diff --git a/.ci/AppImageBuilder.yml b/.ci/AppImageBuilder.yml
index 22db9f151..08d7be1ae 100644
--- a/.ci/AppImageBuilder.yml
+++ b/.ci/AppImageBuilder.yml
@@ -59,6 +59,7 @@ AppDir:
     - libqt5widgets5 # if QT:BOOL=ON
     - libsixel1 # if CLI:BOOL=ON
     - libslirp0
+    - libsndfile1
     - libsndio7.0 # if OPENAL:BOOL=ON
     - libvdeplug-dev # -dev also pulls in libvdeplug2. -dev is required to get the proper .so symlink to the library
     - libx11-6 # if QT:BOOL=ON
@@ -71,6 +72,7 @@ AppDir:
     - libxkbcommon-x11-0 # if QT:BOOL=ON
     - qtwayland5 # if QT:BOOL=ON
     - zlib1g
+    - libserialport0
   files:
     exclude:
     - etc
@@ -94,3 +96,4 @@ AppDir:
 AppImage:
   arch: !ENV '${arch_appimage}'
   file_name: !ENV '${appimage_path}'
+  comp: gzip
diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
index a57d3c715..530349ced 100644
--- a/.ci/Jenkinsfile
+++ b/.ci/Jenkinsfile
@@ -20,11 +20,12 @@ def repository = ['https://github.com/86Box/86Box.git', scm.userRemoteConfigs[0]
 def commitBrowser = ['https://github.com/86Box/86Box/commit/%s', null]
 def branch = ['master', scm.branches[0].name]
 def buildType = ['beta', 'alpha']
+def tarballFlags = ['', '-t']
 def buildBranch = env.JOB_BASE_NAME.contains('-') ? 1 : 0
 
 def osArchs = [
-	'Windows': ['32', '64'],
-	'Linux': ['x86', 'x86_64', 'arm32', 'arm64'],
+	'Windows': ['64'],
+	'Linux': ['x86_64', 'arm64'],
 	'macOS': ['x86_64+x86_64h+arm64']
 ]
 
@@ -238,7 +239,7 @@ pipeline {
 								dir("${env.WORKSPACE_TMP}/output") {
 									/* Run source tarball creation process. */
 									def packageName = "${env.JOB_BASE_NAME}-Source$buildSuffix"
-									if (runBuild("-s \"$packageName\"") == 0) {
+									if (runBuild("-s \"$packageName\" ${tarballFlags[buildBranch]}") == 0) {
 										/* Archive resulting artifacts. */
 										archiveArtifacts artifacts: "$packageName*"
 									} else {
diff --git a/.ci/build.sh b/.ci/build.sh
index 1b1e5825e..d0a4857d9 100755
--- a/.ci/build.sh
+++ b/.ci/build.sh
@@ -48,6 +48,13 @@
 #     architecture when invoking build.sh (either standalone or as part of an universal build)
 #   - port and sed are called through sudo to manage dependencies; make sure those are configured
 #     as NOPASSWD in /etc/sudoers if you're doing unattended builds
+#   - Binaries are ad-hoc signed by default; specify a keychain name in ~/86box-keychain-name.txt
+#     and password in ~/86box-keychain-password.txt to sign binaries with the first developer
+#     certificate found inside that keychain.
+#   - Notarization uses credentials stored in the same keychain used for signing. To save these
+#     credentials, you must find the keychain's file path, run notarytool store-credentials with
+#     --keychain pointed at that path, and specify the profile name you passed to notarytool in
+#     ~/86box-keychain-notarytool.txt
 #
 
 # Define common functions.
@@ -126,6 +133,70 @@ save_buildtag() {
 	return $?
 }
 
+mac_keychain() {
+	keychain_name=$(cat ~/86box-keychain-name.txt)
+	if [ -n "$keychain_name" ]
+	then
+		echo $keychain_name
+		security list-keychains -d user -s $(security list-keychains -d user | grep -Fv "/$keychain_name" | sed -e s/\ \*\"//g) "$keychain_name"
+		security unlock-keychain -p "$(cat ~/86box-keychain-password.txt)" "$keychain_name"
+		return $?
+	fi
+}
+mac_signidentity() {
+	if keychain_name=$(mac_keychain)
+	then
+		if [ -n "$keychain_name" ]
+		then
+			cert_name=$(security find-identity -v -p codesigning "$keychain_name" | perl -nle 'print for /([0-9A-F]+) "Developer ID Application: /')
+			if [ -n "$cert_name" ]
+			then
+				echo [-] Using signing certificate [$cert_name] in keychain [$keychain_name] >&2
+				echo "--keychain $keychain_name -s $cert_name"
+				return 0
+			else
+				err="Keychain [$keychain_name] has no developer certificate"
+			fi
+		else
+			err="No keychain specified"
+		fi
+	else
+		err="Keychain [$keychain_name] failed to unlock"
+	fi
+	echo [!] $err, falling back to ad-hoc signing >&2
+	echo "-s -"
+}
+mac_notarize() {
+	if keychain_name=$(mac_keychain)
+	then
+		if [ -n "$keychain_name" ]
+		then
+			keychain_profile=$(cat ~/86box-keychain-notarytool.txt)
+			if [ -n "$keychain_profile" ]
+			then
+				keychain_path=$(security list-keychains -d user | grep -F "/$keychain_name" | sed -e s/\ \*\"//g)
+				if [ -n "$keychain_path" ]
+				then
+					echo [-] Notarizing with profile [$keychain_profile] in keychain [$keychain_name]
+					# FIXME: needs a stapling system
+					xcrun notarytool submit "$1" --keychain-profile "$keychain_profile" --keychain "$keychain_path" --no-wait
+					return $?
+				else
+					err="File path for keychain [$keychain_name] not found"
+				fi
+			else
+				err="No keychain profile specified"
+			fi
+		else
+			err="No keychain specified"
+		fi
+	else
+		err="Keychain [$keychain_name] failed to unlock"
+	fi
+	echo [!] $err, skipping notarization
+	return 1
+}
+
 # Set common variables.
 project=86Box
 cwd=$(pwd)
@@ -208,7 +279,7 @@ cmake_flags_extra=
 if [ -z "$package_name" -a -z "$tarball_name" ] || [ -n "$package_name" -a -z "$arch" ]
 then
 	echo '[!] Usage: build.sh -b {package_name} {architecture} [-t] [cmake_flags...]'
-	echo '           build.sh -s {source_tarball_name}'
+	echo '           build.sh -s {source_tarball_name} [-t]'
 	echo 'Dep. tree: build.sh -p [archive_tmp/path/to/binary]'
 	exit 100
 fi
@@ -228,7 +299,10 @@ then
 	[ ! -d "$cwd" ] && mkdir -p "$cwd"
 
 	# Save current HEAD commit to VERSION.
-	git log --stat -1 > VERSION || rm -f VERSION
+	if [ $strip -eq 0 ]
+	then
+		git log --stat -1 > VERSION || rm -f VERSION
+	fi
 
 	# Archive source.
 	make_tar "$cwd/$tarball_name.tar"
@@ -469,12 +543,13 @@ then
 		mv "archive_tmp_universal/$merge_src.app" "$app_bundle_name"
 
 		# Sign final app bundle.
-		arch -"$(uname -m)" codesign --force --deep -s - "$app_bundle_name"
+		arch -"$(uname -m)" codesign --force --deep $(mac_signidentity) -o runtime --entitlements src/mac/entitlements.plist --timestamp "$app_bundle_name"
 
 		# Create zip.
 		echo [-] Creating artifact archive
 		cd archive_tmp
-		zip --symlinks -r "$cwd/$package_name.zip" .
+		zip_name="$cwd/$package_name.zip"
+		zip --symlinks -r "$zip_name" .
 		status=$?
 
 		# Check if the archival succeeded.
@@ -484,6 +559,9 @@ then
 			exit 7
 		fi
 
+		# Notarize the compressed app bundle.
+		mac_notarize "$zip_name"
+
 		# All good.
 		echo [-] Universal build of [$package_name] for [$arch] with flags [$cmake_flags] successful
 		exit 0
@@ -522,6 +600,9 @@ then
 		cmake_flags_extra="$cmake_flags_extra -D MOLTENVK=ON -D \"MOLTENVK_INCLUDE_DIR=$macports\""
 	fi
 
+	# Enable Libserialport 
+		cmake_flags_extra="$cmake_flags_extra -D \"LIBSERIALPORT_ROOT=$macports\""
+
 	# Install dependencies only if we're in a new build and/or MacPorts prefix.
 	if check_buildtag "$(basename "$macports")"
 	then
@@ -535,6 +616,21 @@ then
 			sudo sed -i -e 's/-no-feature-vulkan/-feature-vulkan/g' "$qt5_portfile"
 			sudo sed -i -e 's/configure.env-append MAKE=/configure.env-append VULKAN_SDK=${prefix} MAKE=/g' "$qt5_portfile"
 		fi
+
+		# Patch openal-soft to use 1.23.1 on all targets instead of 1.24.2 on >=10.13 only,
+		# to prevent a symlink mismatch from having different versions on x86_64 and arm64.
+		# See: https://github.com/macports/macports-ports/commit/9b4903fc9c76769d476079e404c9a3b8a225f8aa
+		#      https://github.com/macports/macports-ports/commit/788deb64dc0695e8d04afb32ed904947f2a7591b
+		openal_portfile="$macports/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/audio/openal-soft/Portfile"
+		sudo sed -i -e 's/if {${os.platform} ne "darwin" ||/if {0 \&\&/g' "$openal_portfile"
+
+		# Patch wget to remove libproxy support, as it depends on shared-mime-info which
+		# fails to build for a 10.13 target, which we have to do despite wget only being
+		# a host dependency. MacPorts issue 69406 strongly implies this will not be fixed.
+		wget_portfile="$macports/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/net/wget/Portfile"
+		sudo sed -i -e 's/--enable-libproxy/--disable-libproxy/g' "$wget_portfile"
+		sudo sed -i -e 's/port:libproxy//g' "$wget_portfile"
+
 		while :
 		do
 			# Attempt to install dependencies.
@@ -582,7 +678,7 @@ else
         grep -q " bullseye " /etc/apt/sources.list || echo [!] WARNING: System not running the expected Debian version
 
 	# Establish general dependencies.
-	pkgs="cmake ninja-build pkg-config git wget p7zip-full extra-cmake-modules wayland-protocols tar gzip file appstream"
+	pkgs="cmake ninja-build pkg-config git wget p7zip-full extra-cmake-modules wayland-protocols tar gzip file appstream qttranslations5-l10n python3-pip python3-venv squashfs-tools"
 	if [ "$(dpkg --print-architecture)" = "$arch_deb" ]
 	then
 		pkgs="$pkgs build-essential"
@@ -605,7 +701,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
+	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
 	do
 		libpkgs="$libpkgs $pkg:$arch_deb"
 		length=$(echo -n $pkg | sed 's/-dev$//' | sed "s/qtdeclarative/qt/" | wc -c)
@@ -884,7 +980,7 @@ then
 		fi
 
 		# Sign app bundle, unless we're in an universal build.
-		[ $skip_archive -eq 0 ] && codesign --force --deep -s - "archive_tmp/"*".app"
+		[ $skip_archive -eq 0 ] && codesign --force --deep $(mac_signidentity) -o runtime --entitlements src/mac/entitlements.plist --timestamp "archive_tmp/"*".app"
 	elif [ "$BUILD_TAG" = "precondition" ]
 	then
 		# Continue with no app bundle on a dry build.
@@ -1083,7 +1179,8 @@ elif is_mac
 then
 	# Create zip.
 	cd archive_tmp
-	zip --symlinks -r "$cwd/$package_name.zip" .
+	zip_name="$cwd/$package_name.zip"
+	zip --symlinks -r "$zip_name" .
 	status=$?
 else
 	# Determine AppImage runtime architecture.
@@ -1120,55 +1217,32 @@ EOF
 
 		# Copy line.
 		echo "$line" >> AppImageBuilder-generated.yml
-
-		# Workaround for appimage-builder issues 272 and 283 (i686 and armhf are also missing)
-		if [ "$arch_appimage" != "x86_64" -a "$line" = "  files:" ]
-		then
-			# Some mild arbitrary code execution with a dummy package...
-			[ ! -d /runtime ] && sudo apt-get -y -o 'DPkg::Post-Invoke::=mkdir -p /runtime; chmod 777 /runtime' install libsixel1 > /dev/null 2>&1
-
-			echo "    include:" >> AppImageBuilder-generated.yml
-			for loader in "/lib/$libdir/ld-linux"*.so.*
-			do
-				for loader_copy in "$loader" "/lib/$(basename "$loader")"
-				do
-					if [ ! -e "/runtime/compat$loader_copy" ]
-					then
-						mkdir -p "/runtime/compat$(dirname "$loader_copy")"
-						ln -s "$loader" "/runtime/compat$loader_copy"
-					fi
-					echo "    - /runtime/compat$loader_copy" >> AppImageBuilder-generated.yml
-				done
-			done
-		fi
 	done < .ci/AppImageBuilder.yml
 
 	# Download appimage-builder if necessary.
-	appimage_builder_url="https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-$(uname -m).AppImage"
-	appimage_builder_binary="$cache_dir/$(basename "$appimage_builder_url")"
-	if [ ! -e "$appimage_builder_binary" ]
+	appimage_builder_commit=22fefa298f9cee922a651a6f65a46fe0ccbfa34e # from issue 376
+	appimage_builder_dir="$cache_dir/appimage-builder-$appimage_builder_commit"
+	if [ ! -x "$appimage_builder_dir/bin/appimage-builder" ]
 	then
-		rm -rf "$cache_dir/"*".AppImage" # remove old versions
-		wget -qO "$appimage_builder_binary" "$appimage_builder_url"
+		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"
 	fi
 
-	# Symlink appimage-builder binary and global cache directory.
+	# Symlink appimage-builder global cache directory.
 	rm -rf appimage-builder.AppImage appimage-builder-cache "$project-"*".AppImage" # also remove any dangling AppImages which may interfere with the renaming process
-	ln -s "$appimage_builder_binary" appimage-builder.AppImage
-	chmod u+x appimage-builder.AppImage
 	mkdir -p "$cache_dir/appimage-builder-cache"
 	ln -s "$cache_dir/appimage-builder-cache" appimage-builder-cache
 
-	# Run appimage-builder in extract-and-run mode for Docker compatibility.
+	# Run appimage-builder from the virtual environment created above.
 	# --appdir is a workaround for appimage-builder issue 270 reported by us.
 	for retry in 1 2 3 4 5
 	do
 		project="$project" project_id="$project_id" project_version="$project_version" project_icon="$project_icon" arch_deb="$arch_deb" \
-			arch_appimage="$arch_appimage" appimage_path="$cwd/$package_name.AppImage" APPIMAGE_EXTRACT_AND_RUN=1 ./appimage-builder.AppImage \
+			arch_appimage="$arch_appimage" appimage_path="$cwd/$package_name.AppImage" "$appimage_builder_dir/bin/appimage-builder" \
 			--recipe AppImageBuilder-generated.yml --appdir "$(grep -oP '^\s+path: \K(.+)' AppImageBuilder-generated.yml)"
 		status=$?
 		[ $status -eq 0 ] && break
-		[ $status -eq 127 ] && rm -rf /tmp/appimage_extracted_*
 	done
 
 	# Remove appimage-builder binary on failure, just in case it's corrupted.
@@ -1182,6 +1256,9 @@ then
 	exit 7
 fi
 
+# Notarize the compressed app bundle if we're on macOS.
+is_mac && mac_notarize "$zip_name"
+
 # All good.
 echo [-] Build of [$package_name] for [$arch] with flags [$cmake_flags] successful
 exit 0
diff --git a/.ci/dependencies_macports.txt b/.ci/dependencies_macports.txt
index 5ec71d07c..e530871ae 100644
--- a/.ci/dependencies_macports.txt
+++ b/.ci/dependencies_macports.txt
@@ -15,3 +15,5 @@ fluidsynth
 ghostscript
 libslirp
 vde2
+libsndfile
+libserialport
diff --git a/.ci/dependencies_msys.txt b/.ci/dependencies_msys.txt
index 22601b643..b6c0979e2 100644
--- a/.ci/dependencies_msys.txt
+++ b/.ci/dependencies_msys.txt
@@ -12,3 +12,6 @@ libslirp
 fluidsynth
 qt5-static
 qt5-translations
+vulkan-headers
+libsndfile
+libserialport
diff --git a/.editorconfig b/.editorconfig
index 29d9ac0ba..fa7defd57 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,34 +5,11 @@ indent_style = space
 indent_size = 4
 tab_width = 4
 
-# Disabled for now since not all editors support setting a tab_width value different from indent_size
-# Relevant VSCode extension issue: https://github.com/editorconfig/editorconfig-vscode/issues/190
-# [*.rc]
-# indent_style = space
-# indent_size = 4
-# tab_width = 4
-
-# [Makefile.*]
-# indent_style = space
-# indent_size = 4
-# tab_width = 4
-
 [*.manifest]
-indent_style = space
 indent_size = 2
 
 [*.yml]
-indent_style = space
 indent_size = 2
 
-[**/CMakeLists.txt]
-indent_style = space
-indent_size = 4
-
-[*.cmake]
-indent_style = space
-indent_size = 4
-
-[*.json]
-indent_style = space
-indent_size = 4
+[*.ui]
+indent_size = 1
diff --git a/.gitattributes b/.gitattributes
index 32eb262c9..9b39a29c0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,12 +3,28 @@
 
 # Explicitly declare text files you want to always be normalized and converted
 # to native line endings on checkout.
+#  Code
 *.c text
 *.cc text
 *.cpp text
 *.h text
 *.hpp text
+
+#  CMake scripts
+CMakeLists.txt text
+*.cmake text
+
+#  Windows resource scripts and manifests
 *.rc text
+*.manifest text
+
+#  Translation files
+*.po text
+
+#  Qt XML files
+*.ui text
+*.ts text
+*.qrc text
 
 
 # Declare files that will always have CRLF line endings on checkout.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index cdbc0a56f..d805d84a2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -6,7 +6,15 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out this bug report!
+        ## Thanks for taking the time to fill out this bug report!
+  - type: checkboxes
+    attributes:
+      label: Checklist
+      options:
+        - label: I **have searched** the issue tracker and **was unable** to find an [open](../issues?q=is%3Aissue+is%3Aopen) or [closed](../issues?q=is%3Aissue+is%3Aclosed) issue matching what I'm seeing. 
+          required: true
+        - label: I **have verified** that the issue is happening in the **[latest nightly build](https://ci.86box.net/job/86Box/lastSuccessfulBuild/artifact/)**, or the latest commit, if building from source.
+          required: true
   - type: textarea
     attributes:
       label: What happened?
@@ -25,20 +33,13 @@ body:
     attributes:
       label: Operating system
       description: What is your host operating system?
-      placeholder: e.g. Windows 10
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: CPU
-      description: What is your host CPU?
-      placeholder: e.g. AMD Ryzen 5 5600G
+      placeholder: e.g. Windows 11 24H2
     validations:
       required: true
   - type: input
     attributes:
       label: 86Box version
-      description: What version of 86Box are you running? (Saying "Latest from Jenkins" is not helpful.)
+      description: What version of 86Box are you running? (Please ensure you have updated to the [latest build](https://ci.86box.net/job/86Box/lastSuccessfulBuild/artifact/) before reporting. Merely saying "Latest from Jenkins" is not helpful.)
       placeholder: e.g. v4.0 build 5000
     validations:
       required: true
@@ -47,13 +48,13 @@ body:
       label: Build architecture
       description: 86Box for what architecture are you using?
       options: 
-        - Linux - ARM (32-bit) 
-        - Linux - ARM (64-bit) 
-        - Linux - x64 (64-bit) 
-        - Linux - x86 (32-bit) 
-        - macOS - Universal (Intel and Apple Silicon) 
         - Windows - x64 (64-bit) 
+        - macOS - Universal (Intel and Apple Silicon) 
+        - Linux - x64 (64-bit) 
+        - Linux - ARM (64-bit) 
         - Windows - x86 (32-bit)
+        - Linux - ARM (32-bit) 
+        - Linux - x86 (32-bit) 
     validations:
       required: true
   - type: checkboxes
@@ -63,18 +64,7 @@ body:
       options:
         - label: New recompiler
         - label: Debug build
-  - type: dropdown
-    attributes:
-      label: Download source
-      description: Where did you download 86Box from?
-      options:
-        - Official website (Jenkins, GitHub)
-        - Manager auto-update
-        - I built 86Box myself (please tell us more about your build configuration)
-        - I got 86Box from a third party repository (please tell us where)
-    validations:
-      required: true
   - type: textarea
     attributes:
       label: Additional context
-      description: Is there anything else you want to tell us?
+      description: Is there anything else you want to tell us? If you build 86Box from source, please post your build configuration here.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index c03c50764..4ca9bac59 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
   - name: Machine Request
-    url:  https://github.com/86Box/86Box/issues/3577#issue-comment-box
-    about: Please submit machine addition requests under this tracking issue.
+    url:  https://github.com/86Box/86Box/discussions/4823#issue-comment-box
+    about: Please submit machine addition requests in this discussion thread.
   - name: Feature Request or Question
     url:  https://github.com/86Box/86Box/discussions
     about: Please submit feature requests and ask questions here.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
deleted file mode 100644
index 2a22a19cf..000000000
--- a/.github/workflows/c-cpp.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-name: MSYS2 Makefile (Windows, Legacy)
-
-on:
-
-  push:
-    paths:
-    - src/**
-    - .github/workflows/c-cpp.yml
-    - "!**/CMakeLists.txt"
-
-  pull_request:
-    paths:
-    - src/**
-    - .github/workflows/c-cpp.yml
-    - "!**/CMakeLists.txt"
-
-jobs:
-  msys2:
-    # Negative condition disables the job
-    if: false
-    name: "Win32 GUI, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }}"
-
-    runs-on: windows-2022
-
-    defaults:
-      run:
-        shell: msys2 {0}
-
-    strategy:
-      fail-fast: true
-      matrix:
-        build:
-#          - name: Regular
-#            debug: n
-#            dev: n
-          - name: Debug
-            debug: y
-            dev: n
-            slug: -Debug
-          - name: Dev
-            debug: y
-            dev: y
-            slug: -Dev
-        dynarec:
-          - name: ODR
-            new: n
-            slug: -ODR
-          - name: NDR
-            new: y
-            slug: -NDR
-        environment:
-#          - msystem: MSYS
-#            clang: n
-#            x64: y
-          - msystem: MINGW32
-            prefix: mingw-w64-i686
-            clang: n
-            x64: n
-          - msystem: MINGW64
-            prefix: mingw-w64-x86_64
-            clang: n
-            x64: y
-#          - msystem: CLANG32
-#            prefix: mingw-w64-clang-i686
-#            clang: y
-#            x64: n
-#          - msystem: CLANG64
-#            prefix: mingw-w64-clang-x86_64
-#            clang: y
-#            x64: y
-          - msystem: UCRT64
-            prefix: mingw-w64-ucrt-x86_64
-            clang: n
-            x64: y
-
-    steps:
-      - name: Prepare MSYS2 environment
-        uses: msys2/setup-msys2@v2
-        with:
-          release: false
-          update: true
-          msystem: ${{ matrix.environment.msystem }}
-          install: >-
-            make
-          pacboy: >-
-            gcc:p
-            clang:p
-            pkg-config:p
-            freetype:p
-            SDL2:p
-            zlib:p
-            libpng:p
-            openal:p
-            rtmidi:p
-            libslirp:p
-            fluidsynth:p
-            libvncserver:p
-
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: make
-        run: >-
-          make -fwin/Makefile.mingw -j
-          DEV_BUILD=${{ matrix.build.dev }}
-          DEBUG=${{ matrix.build.debug }}
-          NEW_DYNAREC=${{ matrix.dynarec.new }}
-          CLANG=${{ matrix.environment.clang }}
-          X64=${{ matrix.environment.x64 }}
-        working-directory: ./src
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: '86Box${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-Windows-${{ matrix.environment.msystem }}-gha${{ github.run_number }}'
-          path: src/86Box.exe
diff --git a/.github/workflows/cmake_linux.yml b/.github/workflows/cmake_linux.yml
index c09789bfc..5dc0387d8 100644
--- a/.github/workflows/cmake_linux.yml
+++ b/.github/workflows/cmake_linux.yml
@@ -8,7 +8,8 @@ on:
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
-      - .github/workflows/cmake.yml
+      - "!.github/workflows/**"
+      - .github/workflows/cmake_linux.yml
       - vcpkg.json
       - "!**/Makefile*"
 
@@ -18,20 +19,18 @@ on:
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
-      - .github/workflows/**
-      - .github/workflows/cmake.yml
+      - "!.github/workflows/**"
+      - .github/workflows/cmake_linux.yml
       - vcpkg.json
       - "!**/Makefile*"
 
 jobs:
 
   linux:
-    name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64"
 
-    runs-on: ubuntu-22.04
+    name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.arch }}"
 
-    env:
-      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
+    runs-on: ${{ matrix.environment.runner }}
 
     strategy:
       fail-fast: true
@@ -40,10 +39,10 @@ jobs:
 #          - name: Regular
 #            preset: regular
           - name: Debug
-            preset: debug
+            preset: dev_debug
             slug: -Debug
           - name: Dev
-            preset: experimental
+            preset: development
             slug: -Dev
         dynarec:
           - name: ODR
@@ -55,16 +54,47 @@ jobs:
         ui:
           - name: SDL GUI
             qt: off
+            qt6: off
             static: on
-          - name: Qt GUI
+          - name: Qt 5 GUI
             qt: on
-            slug: -Qt
+            qt6: off
+            slug: -Qt5
             packages: >-
               qtbase5-dev
               qtbase5-private-dev
               qttools5-dev
+              qttranslations5-l10n
               libevdev-dev
               libxkbcommon-x11-dev
+          - name: Qt 6 GUI
+            qt: on
+            qt6: on
+            slug: -Qt6
+            packages: >-
+              qt6-base-dev
+              qt6-base-private-dev
+              qt6-tools-dev
+              qt6-tools-dev-tools
+              qt6-l10n-tools
+              qt6-translations-l10n
+              libevdev-dev
+              libxkbcommon-x11-dev
+              libvulkan-dev
+        environment:
+          - arch: x86_64
+            toolchain: ./cmake/flags-gcc-x86_64.cmake
+            slug: "-x86_64"
+            runner: ubuntu-22.04
+          - arch: arm64
+            toolchain: ./cmake/flags-gcc-aarch64.cmake
+            slug: -arm64
+            runner: ubuntu-22.04-arm
+        exclude:
+          - dynarec:
+              new: off
+            environment:
+              arch: arm64
 
     steps:
       - name: Install dependencies
@@ -80,7 +110,8 @@ jobs:
           libopenal-dev
           libslirp-dev
           libfluidsynth-dev
-          libvncserver-dev
+          libvdeplug-dev
+          libserialport-dev
           ${{ matrix.ui.packages }}
 
       - name: Checkout repository
@@ -88,35 +119,25 @@ jobs:
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-      - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v2
-
       - name: Configure CMake
         run: >-
           cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
-          --toolchain ./cmake/flags-gcc-x86_64.cmake
+          --toolchain  ${{ matrix.environment.toolchain }}
           -D NEW_DYNAREC=${{ matrix.dynarec.new }}
           -D CMAKE_INSTALL_PREFIX=./build/artifacts
           -D QT=${{ matrix.ui.qt }}
+          -D USE_QT6=${{ matrix.ui.qt6 }}
 
       - name: Build
         run: |
-          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build build
-
-      - name: Run sonar-scanner
-#        if: 0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
+          cmake --build build
 
       - name: Generate package
         run: |
           cmake --install build
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-UbuntuJammy-x86_64-gha${{ github.run_number }}'
+          name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-UbuntuJammy${{ matrix.environment.slug }}-gha${{ github.run_number }}'
           path: build/artifacts/**
diff --git a/.github/workflows/cmake_macos.yml b/.github/workflows/cmake_macos.yml
index 7a6edcde9..c917932fe 100644
--- a/.github/workflows/cmake_macos.yml
+++ b/.github/workflows/cmake_macos.yml
@@ -8,7 +8,8 @@ on:
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
-      - .github/workflows/cmake.yml
+      - "!.github/workflows/**"
+      - .github/workflows/cmake_macos.yml
       - vcpkg.json
       - "!**/Makefile*"
 
@@ -18,20 +19,18 @@ on:
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
-      - .github/workflows/**
-      - .github/workflows/cmake.yml
+      - "!.github/workflows/**"
+      - .github/workflows/cmake_macos.yml
       - vcpkg.json
       - "!**/Makefile*"
 
 jobs:
 
-  macos12:
+  macos13-x86_64:
+
     name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64"
 
-    runs-on: macos-12
-
-    env:
-      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
+    runs-on: macos-13
 
     strategy:
       fail-fast: true
@@ -40,10 +39,10 @@ jobs:
 #          - name: Regular
 #            preset: regular
           - name: Debug
-            preset: debug
+            preset: dev_debug
             slug: -Debug
           - name: Dev
-            preset: experimental
+            preset: development
             slug: -Dev
         dynarec:
           - name: ODR
@@ -56,33 +55,23 @@ jobs:
           - name: SDL GUI
             qt: off
             static: on
-            src-packages: >-
-              libsndfile
           - name: Qt GUI
             qt: on
             slug: -Qt
             packages: >-
               qt@5
-            src-packages: >-
-              libsndfile
 
     steps:
-      - name: Install source dependencies
-        run: >-
-          brew reinstall -s
-          ${{ matrix.ui.src-packages }}
-
       - name: Install dependencies
         run: >-
           brew install
-          ninja
-          freetype
           sdl2
-          libpng
           rtmidi
           openal-soft
           fluidsynth
-          libvncserver
+          libslirp
+          vde
+          libserialport
           ${{ matrix.ui.packages }}
 
       - name: Checkout repository
@@ -90,9 +79,6 @@ jobs:
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-      - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v2
-
       - name: Configure CMake
         run: >-
           cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
@@ -103,25 +89,93 @@ jobs:
           -D Qt5_ROOT=$(brew --prefix qt@5)
           -D Qt5LinguistTools_ROOT=$(brew --prefix qt@5)
           -D OpenAL_ROOT=$(brew --prefix openal-soft)
+          -D LIBSERIALPORT_ROOT=$(brew --prefix libserialport)
 
       - name: Build
-        run: |
-          build-wrapper-macosx-x86 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build build
-
-      - name: Run sonar-scanner
-        if: 0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
+        run: cmake --build build
 
       - name: Generate package
-        run: |
-          cmake --install build
+        run: cmake --install build
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}'
           path: build/artifacts/**
+
+  macos14-arm64:
+
+    name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, arm64"
+
+    runs-on: macos-14
+
+    strategy:
+      fail-fast: true
+      matrix:
+        build:
+#          - name: Regular
+#            preset: regular
+          - name: Debug
+            preset: dev_debug
+            slug: -Debug
+          - name: Dev
+            preset: development
+            slug: -Dev
+        dynarec:
+#          - name: ODR
+#            new: off
+#            slug: -ODR
+          - name: NDR
+            new: on
+            slug: -NDR
+        ui:
+          - name: SDL GUI
+            qt: off
+            static: on
+          - name: Qt GUI
+            qt: on
+            slug: -Qt
+            packages: >-
+              qt@5
+
+    steps:
+      - name: Install dependencies
+        run: >-
+          brew install
+          sdl2
+          rtmidi
+          openal-soft
+          fluidsynth
+          libslirp
+          vde
+          libserialport
+          ${{ matrix.ui.packages }}
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+      - name: Configure CMake
+        run: >-
+          cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
+          --toolchain ./cmake/llvm-macos-aarch64.cmake
+          -D NEW_DYNAREC=${{ matrix.dynarec.new }}
+          -D CMAKE_INSTALL_PREFIX=./build/artifacts
+          -D QT=${{ matrix.ui.qt }}
+          -D Qt5_ROOT=$(brew --prefix qt@5)
+          -D Qt5LinguistTools_ROOT=$(brew --prefix qt@5)
+          -D OpenAL_ROOT=$(brew --prefix openal-soft)
+          -D LIBSERIALPORT_ROOT=$(brew --prefix libserialport)
+
+      - name: Build
+        run: cmake --build build
+
+      - name: Generate package
+        run: cmake --install build
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-arm64-gha${{ github.run_number }}'
+          path: build/artifacts/**
diff --git a/.github/workflows/cmake_windows_llvm.yml b/.github/workflows/cmake_windows_llvm.yml
deleted file mode 100644
index a49f9488a..000000000
--- a/.github/workflows/cmake_windows_llvm.yml
+++ /dev/null
@@ -1,163 +0,0 @@
-name: CMake (Windows, vcpkg/LLVM)
-
-on:
-
-  push:
-    paths:
-      - src/**
-      - cmake/**
-      - "**/CMakeLists.txt"
-      - "CMakePresets.json"
-      - .github/workflows/cmake.yml
-      - vcpkg.json
-      - "!**/Makefile*"
-
-  pull_request:
-    paths:
-      - src/**
-      - cmake/**
-      - "**/CMakeLists.txt"
-      - "CMakePresets.json"
-      - .github/workflows/**
-      - .github/workflows/cmake.yml
-      - vcpkg.json
-      - "!**/Makefile*"
-
-jobs:
-
-  llvm-windows:
-    name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.target.name }}"
-    if: 0
-
-    runs-on: windows-2022
-
-    env:
-      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
-      VCPKG_BINARY_SOURCES: 'clear;nuget,GitHub,readwrite'
-
-    strategy:
-      fail-fast: true
-      matrix:
-        build:
-#          - name: Regular
-#            preset: regular
-          - name: Debug
-            preset: debug
-            slug: -Debug
-          - name: Dev
-            preset: experimental
-            slug: -Dev
-        dynarec:
-          - name: ODR
-            new: off
-            slug: -ODR
-          - name: NDR
-            new: on
-            slug: -NDR
-        ui:
-          - name: Win32 GUI
-            qt: off
-          - name: Qt GUI
-            qt: on
-            slug: -Qt
-        target:
-          - name: x86
-            triplet: x86-windows-static
-            toolchain: ./cmake/llvm-win32-i686.cmake
-            vcvars: x64_x86
-          - name: x64
-            triplet: x64-windows-static
-            toolchain: ./cmake/llvm-win32-x86_64.cmake
-            vcvars: x64
-#          - name: ARM
-#            triplet: arm-windows-static
-#            toolchain: ./cmake/llvm-win32-arm.cmake
-#            vcvars: x64_arm
-          - name: ARM64
-            triplet: arm64-windows-static
-            toolchain: ./cmake/llvm-win32-aarch64.cmake
-            vcvars: x64_arm64
-        exclude:
-          - dynarec: 
-              new: off
-            target:
-              name: ARM64
-
-    steps:
-      - name: Prepare VS environment
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: ${{ matrix.target.vcvars }}
-
-      - name: Add LLVM to path
-        run: echo "C:/Program Files/LLVM/bin" >> $env:GITHUB_PATH
-
-      - name: Download Ninja
-        run: >
-          Invoke-WebRequest https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip -OutFile ninja-win.zip && 
-          Expand-Archive ninja-win.zip -DestinationPath .
-
-      - name: Setup NuGet Credentials
-        run: >
-          & (C:/vcpkg/vcpkg --vcpkg-root "${{ env.VCPKG_ROOT }}" fetch nuget | tail -n 2)
-          sources add
-          -source "https://nuget.pkg.github.com/86Box/index.json"
-          -storepasswordincleartext
-          -name "GitHub"
-          -username "86Box"
-          -password "${{ secrets.GITHUB_TOKEN }}"
-
-      - name: Fix MSVC atomic headers
-        run: dir "C:/Program Files/Microsoft Visual Studio/2022/*/VC/Tools/MSVC/*/include" -include stdatomic.h -recurse | del
-
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-
-      - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v2
-
-      - name: Configure CMake
-        run: >
-          cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
-          --toolchain C:/vcpkg/scripts/buildsystems/vcpkg.cmake
-          -D NEW_DYNAREC=${{ matrix.dynarec.new }} -D QT=${{ matrix.ui.qt }}
-          -D CMAKE_INSTALL_PREFIX=./build/artifacts
-          -D VCPKG_CHAINLOAD_TOOLCHAIN_FILE=${{ github.workspace }}/${{ matrix.target.toolchain }}
-          -D VCPKG_TARGET_TRIPLET=${{ matrix.target.triplet }}
-          -D VCPKG_HOST_TRIPLET=x64-windows
-          -D VCPKG_USE_HOST_TOOLS=ON
-
-      - name: Fix Qt
-        if: matrix.ui.qt == 'on'
-        run: |
-         $qtTargetsPath = "${{ github.workspace }}/build/vcpkg_installed/${{ matrix.target.triplet }}/share/Qt6/Qt6Targets.cmake"
-         (Get-Content $qtTargetsPath) -replace "^.*-Zc:__cplusplus;-permissive-.*$","#$&" | Set-Content $qtTargetsPath
-
-      - name: Reconfigure CMake
-        if: matrix.ui.qt == 'on'
-        run: |
-          cmake clean build
-
-      - name: Build
-        run: |
-          .sonar/build-wrapper-win-x86/build-wrapper-win-x86-64.exe --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build build
-
-      - name: Run sonar-scanner
-        if: 0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          .sonar/sonar-scanner-5.0.1.3006-windows/bin/sonar-scanner.bat --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
-
-      - name: Generate package
-        run: |
-          cmake --install build
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-Windows-LLVM-${{ matrix.target.name }}-gha${{ github.run_number }}'
-          path: build/artifacts/**
diff --git a/.github/workflows/cmake_windows_msys2.yml b/.github/workflows/cmake_windows_msys2.yml
index 46fc25b67..eb83d4674 100644
--- a/.github/workflows/cmake_windows_msys2.yml
+++ b/.github/workflows/cmake_windows_msys2.yml
@@ -8,7 +8,8 @@ on:
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
-      - .github/workflows/cmake.yml
+      - "!.github/workflows/**"
+      - .github/workflows/cmake_windows_msys2.yml
       - vcpkg.json
       - "!**/Makefile*"
 
@@ -18,20 +19,18 @@ on:
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
-      - .github/workflows/**
-      - .github/workflows/cmake.yml
+      - "!.github/workflows/**"
+      - .github/workflows/cmake_windows_msys2.yml
       - vcpkg.json
       - "!**/Makefile*"
 
 jobs:
 
   msys2:
-    name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }}"
 
-    runs-on: windows-2022
+    name: "${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }}"
 
-    env:
-      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
+    runs-on: ${{ matrix.environment.runner }}
 
     defaults:
       run:
@@ -44,10 +43,10 @@ jobs:
 #          - name: Regular
 #            preset: regular
           - name: Debug
-            preset: debug
+            preset: dev_debug
             slug: -Debug
           - name: Dev
-            preset: experimental
+            preset: development
             slug: -Dev
         dynarec:
           - name: ODR
@@ -62,33 +61,41 @@ jobs:
             static: on
             slug: -Qt
             packages: >-
-              qt5-static:p
-#              qt5-base:p
-#              qt5-tools:p
+              qt5-base:p
+              qt5-tools:p
+              vulkan-headers:p
         environment:
 #          - msystem: MSYS
 #            toolchain: ./cmake/flags-gcc-x86_64.cmake
-          - msystem: MINGW32
-            prefix: mingw-w64-i686
-            toolchain: ./cmake/flags-gcc-i686.cmake
+#            slug: "-MSYS64"
           - msystem: MINGW64
             prefix: mingw-w64-x86_64
             toolchain: ./cmake/flags-gcc-x86_64.cmake
-#          - msystem: CLANG32
-#            prefix: mingw-w64-clang-i686
-#            toolchain: ./cmake/llvm-win32-i686.cmake
+            slug: "-64"
+            runner: windows-2022
 #          - msystem: CLANG64
 #            prefix: mingw-w64-clang-x86_64
 #            toolchain: ./cmake/llvm-win32-x86_64.cmake
-          - msystem: UCRT64
-            prefix: mingw-w64-ucrt-x86_64
-            toolchain: ./cmake/flags-gcc-x86_64.cmake
+#            slug: "CLANG64"
+#          - msystem: UCRT64
+#            prefix: mingw-w64-ucrt-x86_64
+#            toolchain: ./cmake/flags-gcc-x86_64.cmake
+#            slug: "UCRT64"
+          - msystem: CLANGARM64
+            toolchain: ./cmake/flags-gcc-aarch64.cmake
+            slug: -arm64
+            runner: windows-11-arm
+        exclude:
+          - dynarec:
+              new: off
+            environment:
+              msystem: CLANGARM64
 
     steps:
       - name: Prepare MSYS2 environment
         uses: msys2/setup-msys2@v2
         with:
-          release: false
+          release: true
           update: true
           msystem: ${{ matrix.environment.msystem }}
           pacboy: >-
@@ -104,43 +111,31 @@ jobs:
             rtmidi:p
             libslirp:p
             fluidsynth:p
-            libvncserver:p
-            ${{ matrix.ui.packages }}
+            libserialport:p
+            qt5-static:p
+            vulkan-headers:p
+            openmp:p
 
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-      - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v2
-
       - name: Configure CMake
         run: >-
           cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
           --toolchain ${{ matrix.environment.toolchain }}
           -D NEW_DYNAREC=${{ matrix.dynarec.new }}
           -D CMAKE_INSTALL_PREFIX=./build/artifacts
-          -D QT=${{ matrix.ui.qt }}
-          -D STATIC_BUILD=${{ matrix.ui.static }}
 
       - name: Build
-        run: |
-          .sonar/build-wrapper-win-x86/build-wrapper-win-x86-64.exe --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build build
-
-      - name: Run sonar-scanner
-        if: 0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          .sonar/sonar-scanner-5.0.1.3006-windows/bin/sonar-scanner.bat --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
+        run: cmake --build build
 
       - name: Generate package
         run: cmake --install build
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-Windows-${{ matrix.environment.msystem }}-gha${{ github.run_number }}'
+          name: '86Box${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-Windows${{ matrix.environment.slug }}-gha${{ github.run_number }}'
           path: build/artifacts/**
diff --git a/.github/workflows/codeql_linux.yml b/.github/workflows/codeql_linux.yml
index a97951abf..b8fb93ef6 100644
--- a/.github/workflows/codeql_linux.yml
+++ b/.github/workflows/codeql_linux.yml
@@ -3,34 +3,43 @@ name: CodeQL Analysis (Linux)
 on:
 
   push:
+    branches: [ "master" ]
     paths:
       - src/**
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
-      - .github/workflows/codeql.yml
+      - "!.github/workflows/**"
+      - .github/workflows/codeql_linux.yml
       - vcpkg.json
       - "!**/Makefile*"
 
   pull_request:
+    branches: [ "master" ]
     paths:
       - src/**
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
-      - .github/workflows/**
-      - .github/workflows/codeql.yml
+      - "!.github/workflows/**"
+      - .github/workflows/codeql_linux.yml
       - vcpkg.json
       - "!**/Makefile*"
 
+  schedule:
+    - cron: '22 11 * * 0'
+
 jobs:
 
   analyze-linux:
 
-    name: "Analyze Linux GCC 11 (${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)"
+    name: "Analyze (${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)"
 
     runs-on: ubuntu-22.04
 
+    env:
+      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
+
     permissions:
       actions: read
       contents: read
@@ -43,12 +52,12 @@ jobs:
         build:
 #          - name: Regular
 #            preset: regular
-#          - name: Debug
-#            preset: debug
-#            slug: -Debug
-          - name: Dev
-            preset: experimental
-            slug: -Dev
+          - name: Debug
+            preset: dev_debug
+            slug: -Debug
+#          - name: Dev
+#            preset: development
+#            slug: -Dev
         dynarec:
           - name: ODR
             new: off
@@ -59,6 +68,7 @@ jobs:
         ui:
           - name: SDL GUI
             qt: off
+            static: on
           - name: Qt GUI
             qt: on
             slug: -Qt
@@ -66,6 +76,7 @@ jobs:
               qtbase5-dev
               qtbase5-private-dev
               qttools5-dev
+              qttranslations5-l10n
               libevdev-dev
               libxkbcommon-x11-dev
 
@@ -83,14 +94,20 @@ jobs:
           libopenal-dev
           libslirp-dev
           libfluidsynth-dev
-          libvncserver-dev
+          libvdeplug-dev
+          libserialport-dev
           ${{ matrix.ui.packages }}
 
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+      - name: Install Build Wrapper
+        uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v5
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql/codeql-config.yml
@@ -104,9 +121,23 @@ jobs:
           -D QT=${{ matrix.ui.qt }}
 
       - name: Build
-        run: cmake --build build
+        run: |
+          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build build
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{matrix.language}}"
+
+      - name: SonarQube Scan
+        if: matrix.build.preset == 'dev_debug' && matrix.dynarec.new == 'on' && matrix.ui.qt == 'on' && env.SONAR_TOKEN != ''
+#        if: 0
+        uses: SonarSource/sonarqube-scan-action@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+#          SONAR_ROOT_CERT: ${{ secrets.SONAR_ROOT_CERT }}
+        with:
+           # Consult https://docs.sonarsource.com/sonarqube-server/latest/analyzing-source-code/scanners/sonarscanner/ for more information and options
+           args: >
+             --define sonar.cfamily.compile-commands="${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json" 
diff --git a/.github/workflows/codeql_macos.yml b/.github/workflows/codeql_macos.yml
index 724bdc6f6..203f385ff 100644
--- a/.github/workflows/codeql_macos.yml
+++ b/.github/workflows/codeql_macos.yml
@@ -3,33 +3,42 @@ name: CodeQL Analysis (macos)
 on:
 
   push:
+    branches: [ "master" ]
     paths:
       - src/**
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
-      - .github/workflows/codeql.yml
+      - "!.github/workflows/**"
+      - .github/workflows/codeql_macos.yml
       - vcpkg.json
       - "!**/Makefile*"
 
   pull_request:
+    branches: [ "master" ]
     paths:
       - src/**
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
-      - .github/workflows/**
-      - .github/workflows/codeql.yml
+      - "!.github/workflows/**"
+      - .github/workflows/codeql_macos.yml
       - vcpkg.json
       - "!**/Makefile*"
 
+  schedule:
+    - cron: '22 11 * * 0'
+
 jobs:
 
-  analyze-macos12:
+  analyze-macos13-x86_64:
 
-    name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64"
+    name: "Analyze (${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)"
 
-    runs-on: macos-12
+    runs-on: macos-13
+
+    env:
+      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
 
     permissions:
       actions: read
@@ -43,12 +52,12 @@ jobs:
         build:
 #          - name: Regular
 #            preset: regular
-#          - name: Debug
-#            preset: debug
-#            slug: -Debug
-          - name: Dev
-            preset: experimental
-            slug: -Dev
+          - name: Debug
+            preset: dev_debug
+            slug: -Debug
+#          - name: Dev
+#            preset: development
+#            slug: -Dev
         dynarec:
           - name: ODR
             new: off
@@ -69,21 +78,25 @@ jobs:
       - name: Install dependencies
         run: >-
           brew install
-          ninja
-          freetype
           sdl2
-          libpng
           rtmidi
           openal-soft
           fluidsynth
-          libvncserver
+          libslirp
+          vde
+          libserialport
           ${{ matrix.ui.packages }}
 
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+      - name: Install Build Wrapper
+        uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v5
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql/codeql-config.yml
@@ -98,11 +111,26 @@ jobs:
           -D Qt5_ROOT=$(brew --prefix qt@5)
           -D Qt5LinguistTools_ROOT=$(brew --prefix qt@5)
           -D OpenAL_ROOT=$(brew --prefix openal-soft)
+          -D LIBSERIALPORT_ROOT=$(brew --prefix libserialport)
 
       - name: Build
-        run: cmake --build build
+        run: |
+          build-wrapper-macosx-x86 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build build
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{matrix.language}}"
+
+      - name: SonarQube Scan
+#        if: matrix.build.preset == 'dev_debug' && matrix.dynarec.new == 'on' && matrix.ui.qt == 'on' && env.SONAR_TOKEN != ''
+        if: 0
+        uses: SonarSource/sonarqube-scan-action@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+#          SONAR_ROOT_CERT: ${{ secrets.SONAR_ROOT_CERT }}
+        with:
+           # Consult https://docs.sonarsource.com/sonarqube-server/latest/analyzing-source-code/scanners/sonarscanner/ for more information and options
+           args: >
+             --define sonar.cfamily.compile-commands="${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json" 
diff --git a/.github/workflows/codeql_windows_msys2.yml b/.github/workflows/codeql_windows_msys2.yml
index 5b0c2485f..c7edae77f 100644
--- a/.github/workflows/codeql_windows_msys2.yml
+++ b/.github/workflows/codeql_windows_msys2.yml
@@ -3,33 +3,42 @@ name: CodeQL Analysis (Windows, msys2)
 on:
 
   push:
+    branches: [ "master" ]
     paths:
       - src/**
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
-      - .github/workflows/codeql.yml
+      - "!.github/workflows/**"
+      - .github/workflows/codeql_windows_msys2.yml
       - vcpkg.json
       - "!**/Makefile*"
 
   pull_request:
+    branches: [ "master" ]
     paths:
       - src/**
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
-      - .github/workflows/**
-      - .github/workflows/codeql.yml
+      - "!.github/workflows/**"
+      - .github/workflows/codeql_windows_msys2.yml
       - vcpkg.json
       - "!**/Makefile*"
 
+  schedule:
+    - cron: '22 11 * * 0'
+
 jobs:
 
   analyze-msys2:
 
-    name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }}"
+    name: "Analyze (${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }})"
 
-    runs-on: windows-2022
+    runs-on: ${{ matrix.environment.runner }}
+
+    env:
+      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
 
     permissions:
       actions: read
@@ -47,12 +56,12 @@ jobs:
         build:
 #          - name: Regular
 #            preset: regular
-#          - name: Debug
-#            preset: debug
-#            slug: -Debug
-          - name: Dev
-            preset: experimental
-            slug: -Dev
+          - name: Debug
+            preset: dev_debug
+            slug: -Debug
+#          - name: Dev
+#            preset: development
+#            slug: -Dev
         dynarec:
           - name: ODR
             new: off
@@ -61,9 +70,6 @@ jobs:
             new: on
             slug: -NDR
         ui:
-          - name: Win32 GUI
-            qt: off
-            static: on
           - name: Qt GUI
             qt: on
             static: off
@@ -71,30 +77,41 @@ jobs:
             packages: >-
               qt5-base:p
               qt5-tools:p
+              vulkan-headers:p
         environment:
 #          - msystem: MSYS
 #            toolchain: ./cmake/flags-gcc-x86_64.cmake
-          - msystem: MINGW32
-            prefix: mingw-w64-i686
-            toolchain: ./cmake/flags-gcc-i686.cmake
+#            slug: "-MSYS64"
           - msystem: MINGW64
             prefix: mingw-w64-x86_64
             toolchain: ./cmake/flags-gcc-x86_64.cmake
-#          - msystem: CLANG32
-#            prefix: mingw-w64-clang-i686
-#            toolchain: ./cmake/llvm-win32-i686.cmake
+            slug: "-64"
+            runner: windows-2022
 #          - msystem: CLANG64
 #            prefix: mingw-w64-clang-x86_64
 #            toolchain: ./cmake/llvm-win32-x86_64.cmake
-          - msystem: UCRT64
-            prefix: mingw-w64-ucrt-x86_64
-            toolchain: ./cmake/flags-gcc-x86_64.cmake
+#            slug: "CLANG64"
+#            runner: windows-2022
+#          - msystem: UCRT64
+#            prefix: mingw-w64-ucrt-x86_64
+#            toolchain: ./cmake/flags-gcc-x86_64.cmake
+#            slug: "UCRT64"
+#            runner: windows-2022
+#          - msystem: CLANGARM64
+#            toolchain: ./cmake/flags-gcc-aarch64.cmake
+#            slug: -arm64
+#            runner: windows-11-arm
+        exclude:
+          - dynarec:
+              new: off
+            environment:
+              msystem: CLANGARM64
 
     steps:
       - name: Prepare MSYS2 environment
         uses: msys2/setup-msys2@v2
         with:
-          release: false
+          release: true
           update: true
           msystem: ${{ matrix.environment.msystem }}
           pacboy: >-
@@ -110,14 +127,20 @@ jobs:
             rtmidi:p
             libslirp:p
             fluidsynth:p
-            libvncserver:p
+            libserialport:p
             ${{ matrix.ui.packages }}
+            openmp:p
 
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+#      - name: Install Build Wrapper
+#        uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v5
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql/codeql-config.yml
@@ -131,11 +154,27 @@ jobs:
           -D QT=${{ matrix.ui.qt }}
           -D STATIC_BUILD=${{ matrix.ui.static }}
 
+      # - name: Build
+      #   run: |
+      #     .sonar/build-wrapper-win-x86/build-wrapper-win-x86-64.exe --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build build
+
       - name: Build
         run: cmake --build build
 
-
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{matrix.language}}"
+
+      - name: SonarQube Scan
+#        if: matrix.build.preset == 'dev_debug' && matrix.dynarec.new == 'on' && matrix.ui.qt == 'on' && env.SONAR_TOKEN != ''
+        if: 0
+        uses: SonarSource/sonarqube-scan-action@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+#          SONAR_ROOT_CERT: ${{ secrets.SONAR_ROOT_CERT }}
+        with:
+           # Consult https://docs.sonarsource.com/sonarqube-server/latest/analyzing-source-code/scanners/sonarscanner/ for more information and options
+           args: >
+             --define sonar.cfamily.compile-commands="${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json" 
diff --git a/.gitignore b/.gitignore
index 48a5950b9..5935efd38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,9 @@ CMakeLists.txt.user
 
 # MacOS Finder stuff
 .DS_Store
+
+# clangd
+.cache
+
+# Jetbrains CLion
+.idea
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6b50baf3..f91d48ecc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,16 +1,17 @@
 #
-# 86Box     A hypervisor and IBM PC system emulator that specializes in
-#           running old operating systems and software designed for IBM
-#           PC systems and compatibles from 1981 through fairly recent
-#           system designs based on the PCI bus.
+# 86Box    A hypervisor and IBM PC system emulator that specializes in
+#          running old operating systems and software designed for IBM
+#          PC systems and compatibles from 1981 through fairly recent
+#          system designs based on the PCI bus.
 #
-#           This file is part of the 86Box distribution.
+#          This file is part of the 86Box distribution.
 #
-#           CMake build script.
+#          CMake build script.
 #
-# Authors:  David Hrdlička, <hrdlickadavid@outlook.com>
+# Authors: David Hrdlička, <hrdlickadavid@outlook.com>
 #
-#           Copyright 2020-2021 David Hrdlička.
+#          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2021-2025 Jasmine Iwanek.
 #
 
 cmake_minimum_required(VERSION 3.16)
@@ -35,7 +36,7 @@ if(MUNT_EXTERNAL)
 endif()
 
 project(86Box
-    VERSION 4.1
+    VERSION 5.1
     DESCRIPTION "Emulator of x86-based systems"
     HOMEPAGE_URL "https://86box.net"
     LANGUAGES C CXX)
@@ -122,43 +123,68 @@ set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
 
 # Optional features
 #
-#      Option       Description                                                     Def.
-#      ------       -----------                                                     ----
-option(RELEASE      "Release build"                                                 OFF)
-option(DYNAREC      "Dynamic recompiler"                                            ON)
-option(OPENAL       "OpenAL"                                                        ON)
-option(RTMIDI       "RtMidi"                                                        ON)
-option(FLUIDSYNTH   "FluidSynth"                                                    ON)
-option(MUNT         "MUNT"                                                          ON)
-option(VNC          "VNC renderer"                                                  OFF)
-option(DINPUT       "DirectInput"                                                   OFF)
-option(CPPTHREADS   "C++11 threads"                                                 ON)
-option(NEW_DYNAREC  "Use the PCem v15 (\"new\") dynamic recompiler"                 OFF)
-option(MINITRACE    "Enable Chrome tracing using the modified minitrace library"    OFF)
-option(GDBSTUB      "Enable GDB stub server for debugging"                          OFF)
-option(DEV_BRANCH   "Development branch"                                            OFF)
-option(QT           "Qt GUI"                                                        ON)
-option(DISCORD      "Discord Rich Presence support"                                 ON)
+#      Option       Description                                                  Def.
+#      ------       -----------                                                  ----
+option(RELEASE      "Release build"                                              OFF)
+option(DYNAREC      "Dynamic recompiler"                                         ON)
+option(OPENAL       "OpenAL"                                                     ON)
+option(RTMIDI       "RtMidi"                                                     ON)
+option(FLUIDSYNTH   "FluidSynth"                                                 ON)
+option(MUNT         "MUNT"                                                       ON)
+option(VNC          "VNC renderer"                                               OFF)
+option(MINITRACE    "Enable Chrome tracing using the modified minitrace library" OFF)
+option(GDBSTUB      "Enable GDB stub server for debugging"                       OFF)
+option(DEV_BRANCH   "Development branch"                                         OFF)
+option(DISCORD      "Discord Rich Presence support"                              ON)
+option(DEBUGREGS486 "Enable debug register opeartion on 486+ CPUs"               OFF)
+option(LIBASAN      "Enable compilation with the addresss sanitizer"             OFF)
+
+if((ARCH STREQUAL "arm64") OR (ARCH STREQUAL "arm"))
+    set(NEW_DYNAREC ON)
+else()
+    option(NEW_DYNAREC "Use the PCem v15 (\"new\") dynamic recompiler" OFF)
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
+    option(AUDIO4 "Use audio(4) as sound backend" ON)
+else()
+    set(AUDIO4 OFF)
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+    option(SNDIO "Use sndio as sound backend" ON)
+else()
+    set(SNDIO OFF)
+endif()
+
+if(WIN32)
+    set(QT ON)
+    option(CPPTHREADS "C++11 threads" OFF)
+else()
+    option(QT "Qt GUI" ON)
+    option(CPPTHREADS "C++11 threads" ON)
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+    SET(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,wxneeded")
+endif()
 
 # Development branch features
 #
-#                      Option         Description                                   Def.    Condition       Otherwise
-#                      ------         -----------                                   ----    ---------       ---------
-cmake_dependent_option(AMD_K5         "AMD K5"                                      ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(AN430TX        "Intel AN430TX"                               ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(CYRIX_6X86     "Cyrix 6x86"                                  ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(DESKPRO386     "Compaq Deskpro 386"                          ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(GUSMAX         "Gravis UltraSound MAX"                       ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(ISAMEM_RAMPAGE "AST Rampage"                                 ON      "DEV_BRANCH"    OFF)
-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(LASERXT        "VTech Laser XT"                              ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(OLIVETTI       "Olivetti M290"                               ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(OPEN_AT        "OpenAT"                                      ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(PAS16          "Pro Audio Spectrum 16"                       ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(SIO_DETECT     "Super I/O Detection Helper"                  ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(VGAWONDER      "ATI VGA Wonder (ATI-18800)"                  ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(XL24           "ATI VGA Wonder XL24 (ATI-28800-6)"           ON      "DEV_BRANCH"    OFF)
+#                      Option         Description                                Def.  Condition     Otherwise
+#                      ------         -----------                                ----  ------------  ---------
+cmake_dependent_option(AMD_K5         "AMD K5"                                   ON    "DEV_BRANCH"  OFF)
+cmake_dependent_option(CDROM_MITSUMI  "Mitsumi CDROM"                            ON    "DEV_BRANCH"  OFF)
+cmake_dependent_option(G100           "Matrox Productiva G100"                   ON    "DEV_BRANCH"  OFF)
+cmake_dependent_option(ISAMEM_RAMPAGE "AST Rampage"                              ON    "DEV_BRANCH"  OFF)
+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)
+cmake_dependent_option(NETSWITCH      "Network Switch Support"                   ON    "DEV_BRANCH"  OFF)
 
 # Ditto but for Qt
 if(QT)
@@ -196,7 +222,15 @@ if(NOT EMU_BUILD_NUM)
     set(EMU_BUILD_NUM 0)
 endif()
 if(NOT EMU_COPYRIGHT_YEAR)
-    set(EMU_COPYRIGHT_YEAR 2024)
+    set(EMU_COPYRIGHT_YEAR 2025)
 endif()
 
+# Libasan
+if(LIBASAN)
+    add_compile_options(-fsanitize=address)
+    add_link_options(-fsanitize=address)
+endif()
+
+set(CMAKE_TOP_LEVEL_PROCESSED TRUE)
+
 add_subdirectory(src)
diff --git a/CMakePresets.json b/CMakePresets.json
index 0dbaf1988..be6615088 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -43,17 +43,23 @@
             "name": "development",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Release",
-                "DEV_BRANCH": "ON",
-                "NEW_DYNAREC": "OFF"
+                "DEV_BRANCH": "ON"
             },
             "inherits": "base"
         },
         {
-            "name": "experimental",
+            "name": "dev_debug",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Debug",
-                "DEV_BRANCH": "ON",
-                "NEW_DYNAREC": "ON"
+                "DEV_BRANCH": "ON"
+            },
+            "inherits": "base"
+        },
+        {
+            "name": "ultra_debug",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "UltraDebug",
+                "DEV_BRANCH": "ON"
             },
             "inherits": "base"
         },
@@ -70,7 +76,8 @@
                 "Qt5_DIR": "/opt/homebrew/opt/qt@5/lib/cmake/Qt5",
                 "MOLTENVK_DIR": "/opt/homebrew/opt/molten-vk",
                 "Qt5LinguistTools_DIR": "/opt/homebrew/opt/qt@5/lib/cmake/Qt5LinguistTools",
-                "OpenAL_ROOT": "/opt/homebrew/opt/openal-soft"
+                "OpenAL_ROOT": "/opt/homebrew/opt/openal-soft",
+                "LIBSERIALPORT_ROOT": "/opt/homebrew/opt/libserialport"
             },
             "inherits": "regular"
         },
@@ -88,6 +95,7 @@
                 "MOLTENVK_DIR": "/opt/homebrew/opt/molten-vk",
                 "Qt5LinguistTools_DIR": "/opt/homebrew/opt/qt@5/lib/cmake/Qt5LinguistTools",
                 "OpenAL_ROOT": "/opt/homebrew/opt/openal-soft",
+                "LIBSERIALPORT_ROOT": "/opt/homebrew/opt/libserialport",
                 "CMAKE_CXX_FLAGS_DEBUG": "-g -O0 -DENABLE_VDE_LOG",
                 "CMAKE_C_FLAGS_DEBUG": "-g -O0 -DENABLE_VDE_LOG"
             },
diff --git a/README.md b/README.md
index 370bc940e..506eba794 100644
--- a/README.md
+++ b/README.md
@@ -26,15 +26,18 @@ Minimum system requirements and recommendations
 * macOS version: macOS High Sierra 10.13 or newer
 * 4 GB of RAM or higher
 
-Performance may vary depending on both host and guest configuration. Most emulation logic is executed in a single thread; therefore, systems with better IPC (instructions per clock) generally should be able to emulate higher clock speeds.
+Performance may vary depending on host and guest configuration. Most emulation logic is executed in a single thread. Therefore, systems with greater IPC (instructions per clock) capacity should be able to emulate higher clock speeds.
 
-It is also recommended to use a manager application with 86Box for easier handling of multiple virtual machines.
+For easier handling of multiple virtual machines, use a manager application:
 
+* [Avalonia 86](https://github.com/notBald/Avalonia86) by [notBald](https://github.com/notBald) (Windows and Linux)
 * [86Box Manager](https://github.com/86Box/86BoxManager) by [Overdoze](https://github.com/daviunic) (Windows only)
-* [Linbox-qt5](https://github.com/Dungeonseeker/linbox-qt5) by Dungeonseeker (Linux focused, should work on Windows though untested)
+* [86Box Manager X](https://github.com/RetBox/86BoxManagerX) by [xafero](https://github.com/xafero) (Cross platform Port of 86Box Manager using Avalonia)
+* [sl86](https://github.com/DDXofficial/sl86) by [DDX](https://github.com/DDXofficial) (Command-line 86Box machine manager written in Python)
+* [Linbox-qt5](https://github.com/Dungeonseeker/linbox-qt5) by [Dungeonseeker](https://github.com/Dungeonseeker/) (Linux focused, should work on Windows though untested)
 * [MacBox for 86Box](https://github.com/Moonif/MacBox) by [Moonif](https://github.com/Moonif) (MacOS only)
 
-It is also possible to use 86Box on its own with the `--vmpath`/`-P` command line option.
+To use 86Box on its own, use the `--vmpath`/`-P` command line option.
 
 Getting started
 ---------------
@@ -44,17 +47,21 @@ See [our documentation](https://86box.readthedocs.io/en/latest/index.html) for a
 Community
 ---------
 
-We operate an IRC channel and a Discord server for discussing 86Box, its development and anything related to retro computing. We look forward to hearing from you!
+We operate an IRC channel and a Discord server for discussing 86Box, its development, and anything related to retro computing. We look forward to hearing from you!
 
 [![Visit our IRC channel](https://kiwiirc.com/buttons/irc.ringoflightning.net/86Box.png)](https://kiwiirc.com/client/irc.ringoflightning.net/?nick=86box|?#86Box)
 
 [![Visit our Discord server](https://discordapp.com/api/guilds/262614059009048590/embed.png)](https://discord.gg/QXK9XTv)
 
 Contributions
----------
+-------------
 
 We welcome all contributions to the project, as long as the [contribution guidelines](CONTRIBUTING.md) are followed.
 
+Building
+---------
+For instructions on how to build 86Box from source, see the [build guide](https://86box.readthedocs.io/en/latest/dev/buildguide.html).
+
 Licensing
 ---------
 
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..fe8394883
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,18 @@
+# Security Policy
+
+## Supported Versions
+
+| Version   | Supported          |
+| --------- | ------------------ |
+| >= master | :white_check_mark: |
+|  < master | :x:                |
+
+Each version is supported in the form of patch releases until the next version is merged into master.
+
+## Reporting a Vulnerability
+
+To report a vulnerability, either open an issue here on GitHub or join our Discord server. If it is
+accepted, that means we have begun working on it and it will be fixed if it is at all possible. If it
+is declined, then that means we have either determined it to not actually be a vulnerability or we
+have determined it is not feasible to fix it. On GitHub, we are going to notify you when a decision
+taken, and if accepted, when it is fixed. On Discord, you get live updates.
diff --git a/bumpversion.sh b/bumpversion.sh
index 4681e72be..6e2536cbe 100644
--- a/bumpversion.sh
+++ b/bumpversion.sh
@@ -26,12 +26,6 @@ then
 fi
 shift
 
-# Extract version components.
-newversion_maj=$(echo "$newversion" | cut -d. -f1)
-newversion_min=$(echo "$newversion" | cut -d. -f2)
-newversion_patch=$(echo "$newversion" | cut -d. -f3)
-[ -z "$newversion_patch" ] && newversion_patch=0
-
 if [ -z "${romversion}" ]; then
 	# Get the latest ROM release from the GitHub API.
 	romversion=$(curl --silent "https://api.github.com/repos/86Box/roms/releases/latest" |
@@ -62,12 +56,6 @@ patch_file() {
 }
 patch_file CMakeLists.txt VERSION 's/^(\s*VERSION ).+/\1'"$newversion"'/'
 patch_file vcpkg.json version-string 's/(^\s*"version-string"\s*:\s*")[^"]+/\1'"$newversion"'/'
-patch_file src/include_make/*/version.h EMU_VERSION 's/(#\s*define\s+EMU_VERSION\s+")[^"]+/\1'"$newversion"'/'
-patch_file src/include_make/*/version.h EMU_VERSION_MAJ 's/(#\s*define\s+EMU_VERSION_MAJ\s+)[0-9]+/\1'"$newversion_maj"'/'
-patch_file src/include_make/*/version.h EMU_VERSION_MIN 's/(#\s*define\s+EMU_VERSION_MIN\s+)[0-9]+/\1'"$newversion_min"'/'
-patch_file src/include_make/*/version.h EMU_VERSION_PATCH 's/(#\s*define\s+EMU_VERSION_PATCH\s+)[0-9]+/\1'"$newversion_patch"'/'
-patch_file src/include_make/*/version.h COPYRIGHT_YEAR 's/(#\s*define\s+COPYRIGHT_YEAR\s+)[0-9]+/\1'"$(date +%Y)"'/'
-patch_file src/include_make/*/version.h EMU_DOCS_URL 's/(#\s*define\s+EMU_DOCS_URL\s+"https:\/\/[^\/]+\/en\/v)[^\/]+/\1'"$newversion_maj.$newversion_min"'/'
 patch_file src/unix/assets/*.spec Version 's/(Version:\s+)[0-9].+/\1'"$newversion"'/'
 patch_file src/unix/assets/*.spec '%global romver' 's/(^%global\ romver\s+)[0-9]{8}/\1'"$romversion"'/'
 patch_file src/unix/assets/*.spec 'changelog version' 's/(^[*]\s.*>\s+)[0-9].+/\1'"$newversion"-1'/'
diff --git a/cmake/flags-gcc.cmake b/cmake/flags-gcc.cmake
index 885353b87..90eb52cd1 100644
--- a/cmake/flags-gcc.cmake
+++ b/cmake/flags-gcc.cmake
@@ -20,6 +20,8 @@ string(APPEND CMAKE_C_FLAGS_RELEASE_INIT        " -g0 -O3")
 string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT      " -g0 -O3")
 string(APPEND CMAKE_C_FLAGS_DEBUG_INIT          " -ggdb -Og")
 string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT        " -ggdb -Og")
+string(APPEND CMAKE_C_FLAGS_ULTRADEBUG_INIT     " -O0 -ggdb -g3")
+string(APPEND CMAKE_CXX_FLAGS_ULTRADEBUG_INIT   " -O0 -ggdb -g3")
 string(APPEND CMAKE_C_FLAGS_OPTIMIZED_INIT      " -march=native -mtune=native -O3 -ffp-contract=fast -flto")
 string(APPEND CMAKE_CXX_FLAGS_OPTIMIZED_INIT    " -march=native -mtune=native -O3 -ffp-contract=fast -flto")
 
@@ -28,7 +30,7 @@ foreach(LANG C;CXX)
     set(CMAKE_${LANG}_FLAGS "$ENV{${LANG}FLAGS} ${CMAKE_${LANG}_FLAGS_INIT}" CACHE STRING "Flags used by the ${LANG} compiler during all build types.")
     mark_as_advanced(CMAKE_${LANG}_FLAGS)
 
-    foreach(CONFIG RELEASE;DEBUG;OPTIMIZED)
+    foreach(CONFIG RELEASE;DEBUG;ULTRADEBUG;OPTIMIZED)
         set(CMAKE_${LANG}_FLAGS_${CONFIG} "${CMAKE_${LANG}_FLAGS_${CONFIG}_INIT}" CACHE STRING "Flags used by the ${LANG} compiler during ${CONFIG} builds.")
         mark_as_advanced(CMAKE_${LANG}_FLAGS_${CONFIG})
     endforeach()
diff --git a/cmake/intel-linux-x86_64.cmake b/cmake/intel-linux-x86_64.cmake
new file mode 100644
index 000000000..a0c3e5d0b
--- /dev/null
+++ b/cmake/intel-linux-x86_64.cmake
@@ -0,0 +1,20 @@
+#
+# 86Box    A hypervisor and IBM PC system emulator that specializes in
+#          running old operating systems and software designed for IBM
+#          PC systems and compatibles from 1981 through fairly recent
+#          system designs based on the PCI bus.
+#
+#          This file is part of the 86Box distribution.
+#
+#          CMake toolchain file defining GCC compiler flags
+#          for 64-bit x86 targets.
+#
+# Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#
+#          Copyright 2021 David Hrdlička.
+#
+
+include(${CMAKE_CURRENT_LIST_DIR}/flags-gcc-x86_64.cmake)
+
+set(CMAKE_C_COMPILER    icx)
+set(CMAKE_CXX_COMPILER  icpx)
diff --git a/cmake/llvm-linux-x86_64.cmake b/cmake/llvm-linux-x86_64.cmake
new file mode 100644
index 000000000..ccdd7b18e
--- /dev/null
+++ b/cmake/llvm-linux-x86_64.cmake
@@ -0,0 +1,23 @@
+#
+# 86Box    A hypervisor and IBM PC system emulator that specializes in
+#          running old operating systems and software designed for IBM
+#          PC systems and compatibles from 1981 through fairly recent
+#          system designs based on the PCI bus.
+#
+#          This file is part of the 86Box distribution.
+#
+#          CMake toolchain file defining Clang compiler flags
+#          for 64-bit x86 targets.
+#
+# Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          dob205
+#
+#          Copyright 2021 David Hrdlička.
+#          Copyright 2022 dob205.
+#
+
+include(${CMAKE_CURRENT_LIST_DIR}/flags-gcc-x86_64.cmake)
+
+# Use the GCC-compatible Clang executables in order to use our flags
+set(CMAKE_C_COMPILER    clang)
+set(CMAKE_CXX_COMPILER  clang++)
diff --git a/debian/changelog b/debian/changelog
index 29ec6d3af..61a0490ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-86box (4.1) UNRELEASED; urgency=medium
+86box (5.1) UNRELEASED; urgency=medium
 
   * Bump release.
 
- -- Jasmine Iwanek <jriwanek@gmail.com>  Mon, 16 Oct 2023 20:24:46 +0200
+ -- Jasmine Iwanek <jriwanek@gmail.com>  Wed, 27 Aug 2025 19:39:16 +0200
diff --git a/debian/control b/debian/control
index d67f5965b..a11e2af48 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,11 @@ Build-Depends: cmake (>= 3.21),
                libsdl2-dev,
                libslirp-dev,
                libxkbcommon-x11-dev,
+               libsndfile-dev,
                ninja-build,
                qttools5-dev,
-               qtbase5-private-dev
+               qtbase5-private-dev,
+               libserialport-dev
 Standards-Version: 4.6.0
 Homepage: https://86box.net/
 #Vcs-Browser: https://salsa.debian.org/debian/86box
@@ -31,4 +33,4 @@ Recommends: libpcap0.8-dev
 Description: An emulator for classic IBM PC clones
              86Box is a low level x86 emulator that runs older operating systems and software
              designed for IBM PC systems and compatibles from 1981 through
-             fairly recent system designs based on the PCI bus.
\ No newline at end of file
+             fairly recent system designs based on the PCI bus.
diff --git a/src/86box.c b/src/86box.c
index 8218c208c..0b5a26131 100644
--- a/src/86box.c
+++ b/src/86box.c
@@ -11,6 +11,7 @@
  * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
  *          Miran Grca, <mgrca8@gmail.com>
  *          Fred N. van Kempen, <decwiz@yahoo.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
  *          Copyright 2008-2020 Sarah Walker.
  *          Copyright 2016-2020 Miran Grca.
@@ -18,7 +19,7 @@
  *          Copyright 2021      Laci bá'
  *          Copyright 2021      dob205
  *          Copyright 2021      Andreas J. Reichel.
- *          Copyright 2021-2022 Jasmine Iwanek.
+ *          Copyright 2021-2025 Jasmine Iwanek.
  */
 #include <inttypes.h>
 #include <stdarg.h>
@@ -31,6 +32,7 @@
 #include <wchar.h>
 #include <stdatomic.h>
 #include <unistd.h>
+#include <math.h>
 
 #ifndef _WIN32
 #    include <pwd.h>
@@ -66,7 +68,9 @@
 #include <86box/bugger.h>
 #include <86box/postcard.h>
 #include <86box/unittester.h>
+#include <86box/novell_cardkey.h>
 #include <86box/isamem.h>
+#include <86box/isarom.h>
 #include <86box/isartc.h>
 #include <86box/lpt.h>
 #include <86box/serial.h>
@@ -84,7 +88,7 @@
 #include <86box/scsi_device.h>
 #include <86box/cdrom.h>
 #include <86box/cdrom_interface.h>
-#include <86box/zip.h>
+#include <86box/rdisk.h>
 #include <86box/mo.h>
 #include <86box/scsi_disk.h>
 #include <86box/cdrom_image.h>
@@ -102,6 +106,7 @@
 #include <86box/machine_status.h>
 #include <86box/apm.h>
 #include <86box/acpi.h>
+#include <86box/nv/vid_nv_rivatimer.h>
 
 // Disable c99-designator to avoid the warnings about int ng
 #ifdef __clang__
@@ -156,6 +161,7 @@ int      window_remember;
 int      vid_resize;                                              /* (C) allow resizing */
 int      invert_display                         = 0;              /* (C) invert the display */
 int      suppress_overscan                      = 0;              /* (C) suppress overscans */
+int      lang_id                                = 0;              /* (G) language id */
 int      scale                                  = 0;              /* (C) screen scale factor */
 int      dpi_scale                              = 0;              /* (C) DPI scaling of the emulated
                                                                          screen */
@@ -163,26 +169,28 @@ int      vid_api                                = 0;              /* (C) video r
 int      vid_cga_contrast                       = 0;              /* (C) video */
 int      video_fullscreen                       = 0;              /* (C) video */
 int      video_fullscreen_scale                 = 0;              /* (C) video */
-int      video_fullscreen_first                 = 0;              /* (C) video */
 int      enable_overscan                        = 0;              /* (C) video */
 int      force_43                               = 0;              /* (C) video */
 int      video_filter_method                    = 1;              /* (C) video */
 int      video_vsync                            = 0;              /* (C) video */
 int      video_framerate                        = -1;             /* (C) video */
-char     video_shader[512]                      = { '\0' };       /* (C) video */
-bool     serial_passthrough_enabled[SERIAL_MAX] = { 0, 0, 0, 0 }; /* (C) activation and kind of
-                                                                         pass-through for serial ports */
+bool     serial_passthrough_enabled[SERIAL_MAX - 1] = { 0, 0, 0, 0, 0, 0, 0 }; /* (C) activation and kind of
+                                                                                  pass-through for serial ports */
 int      bugger_enabled                         = 0;              /* (C) enable ISAbugger */
+int      novell_keycard_enabled                 = 0;              /* (C) enable Novell NetWare 2.x key card emulation. */
 int      postcard_enabled                       = 0;              /* (C) enable POST card */
 int      unittester_enabled                     = 0;              /* (C) enable unit tester device */
+int      gameport_type[GAMEPORT_MAX]            = { 0, 0 };       /* (C) enable gameports */
 int      isamem_type[ISAMEM_MAX]                = { 0, 0, 0, 0 }; /* (C) enable ISA mem cards */
+int      isarom_type[ISAROM_MAX]                = { 0, 0, 0, 0 }; /* (C) enable ISA ROM cards */
 int      isartc_type                            = 0;              /* (C) enable ISA RTC card */
-int      gfxcard[2]                             = { 0, 0 };       /* (C) graphics/video card */
+int      gfxcard[GFXCARD_MAX]                   = { 0, 0 };       /* (C) graphics/video card */
 int      show_second_monitors                   = 1;              /* (C) show non-primary monitors */
 int      sound_is_float                         = 1;              /* (C) sound uses FP values */
 int      voodoo_enabled                         = 0;              /* (C) video option */
 int      ibm8514_standalone_enabled             = 0;              /* (C) video option */
 int      xga_standalone_enabled                 = 0;              /* (C) video option */
+int      da2_standalone_enabled                 = 0;              /* (C) video option */
 uint32_t mem_size                               = 0;              /* (C) memory size (Installed on
                                                                          system board)*/
 uint32_t isa_mem_size                           = 0;              /* (C) memory size (ISA Memory Cards) */
@@ -191,18 +199,94 @@ int      cpu                                    = 0;              /* (C) cpu typ
 int      fpu_type                               = 0;              /* (C) fpu type */
 int      fpu_softfloat                          = 0;              /* (C) fpu uses softfloat */
 int      time_sync                              = 0;              /* (C) enable time sync */
-int      confirm_reset                          = 1;              /* (C) enable reset confirmation */
-int      confirm_exit                           = 1;              /* (C) enable exit confirmation */
-int      confirm_save                           = 1;              /* (C) enable save confirmation */
+int      confirm_reset                          = 1;              /* (G) enable reset confirmation */
+int      confirm_exit                           = 1;              /* (G) enable exit confirmation */
+int      confirm_save                           = 1;              /* (G) enable save confirmation */
 int      enable_discord                         = 0;              /* (C) enable Discord integration */
 int      pit_mode                               = -1;             /* (C) force setting PIT mode */
 int      fm_driver                              = 0;              /* (C) select FM sound driver */
-int      open_dir_usr_path                      = 0;              /* (C) default file open dialog directory
+int      open_dir_usr_path                      = 0;              /* (G) default file open dialog directory
                                                                          of usr_path */
 int      video_fullscreen_scale_maximized       = 0;              /* (C) Whether fullscreen scaling settings
                                                                          also apply when maximized. */
 int      do_auto_pause                          = 0;              /* (C) Auto-pause the emulator on focus
                                                                          loss */
+int      force_constant_mouse                   = 0;              /* (C) Force constant updating of the mouse */
+int      hook_enabled                           = 1;              /* (C) Keyboard hook is enabled */
+int      test_mode                              = 0;              /* (C) Test mode */
+char     uuid[MAX_UUID_LEN]                     = { '\0' };       /* (C) UUID or machine identifier */
+int      sound_muted                            = 0;              /* (C) Is sound muted? */
+int      jumpered_internal_ecp_dma              = 0;              /* (C) Jumpered internal EPC DMA */
+int      inhibit_multimedia_keys;                                 /* (G) Inhibit multimedia keys on Windows. */
+int      force_10ms;                                              /* (C) Force 10ms CPU frame intervals. */
+int      vmm_disabled                           = 0;              /* (G) disable built-in manager */
+char     vmm_path_cfg[1024]                     = { '\0' };       /* (G) VMs path (unless -E is used)*/
+
+int      other_ide_present = 0;                                   /* IDE controllers from non-IDE cards are
+                                                                     present */
+int      other_scsi_present = 0;                                  /* SCSI controllers from non-SCSI cards are
+                                                                     present */
+
+int      is_pcjr = 0;                                             /* The current machine is PCjr. */
+int      portable_mode = 0;                                       /* We are running in portable mode
+                                                                     (global dirs = exe path) */
+
+int      monitor_edid = 0;                                        /* (C) Which EDID to use. 0=default, 1=custom. */
+char     monitor_edid_path[1024] = { 0 };                         /* (C) Path to custom EDID */
+
+double   video_gl_input_scale = 1.0;                              /* (C) OpenGL 3.x input scale */
+int      video_gl_input_scale_mode = FULLSCR_SCALE_FULL;          /* (C) OpenGL 3.x input stretch mode */
+int      color_scheme = 0;                                        /* (C) Color scheme of UI (Windows-only) */
+
+// Accelerator key array
+struct accelKey acc_keys[NUM_ACCELS];
+
+// Default accelerator key values
+struct accelKey def_acc_keys[NUM_ACCELS] = {
+    {
+        .name="send_ctrl_alt_del",
+        .desc="Send Control+Alt+Del",
+        .seq="Ctrl+F12"
+    },
+    {
+        .name="send_ctrl_alt_esc",
+        .desc="Send Control+Alt+Escape",
+        .seq="Ctrl+F10"
+    },
+    {
+        .name="fullscreen",
+        .desc="Toggle fullscreen",
+        .seq="Ctrl+Alt+PgUp"
+    },
+    {
+        .name="screenshot",
+        .desc="Screenshot",
+        .seq="Ctrl+F11"
+    },
+    {
+        .name="release_mouse",
+        .desc="Release mouse pointer",
+        .seq="Ctrl+End"
+    },
+    {
+        .name="hard_reset",
+        .desc="Hard reset",
+        .seq="Ctrl+Alt+F12"
+    },
+    {
+        .name="pause",
+        .desc="Toggle pause",
+        .seq="Ctrl+Alt+F1"
+    },
+    {
+        .name="mute",
+        .desc="Toggle mute",
+        .seq="Ctrl+Alt+M"
+    }
+};
+
+char vmm_path[1024] = { '\0' }; /* VM manager path to scan for VMs */
+int  start_vmm = 1;
 
 /* Statistics. */
 extern int mmuflush;
@@ -217,9 +301,12 @@ extern int CPUID;
 extern int output;
 int        atfullspeed;
 
+extern double exp_pow_table[0x800];
+
 char  exe_path[2048]; /* path (dir) of executable */
 char  usr_path[1024]; /* path (dir) of user data */
 char  cfg_path[1024]; /* full path of config file */
+char  global_cfg_path[1024]; /* full path of config file */
 FILE *stdlog = NULL;  /* file to log output to */
 #if 0
 int   scrnsz_x = SCREEN_RES_X; /* current screen size, X */
@@ -236,18 +323,44 @@ int unscaled_size_y = SCREEN_RES_Y; /* current unscaled size Y */
 int efscrnsz_y = SCREEN_RES_Y;
 #endif
 
+__thread int is_cpu_thread = 0;
+
 static wchar_t mouse_msg[3][200];
 
 static volatile atomic_int do_pause_ack = 0;
 static volatile atomic_int pause_ack = 0;
 
+#define LOG_SIZE_BUFFER 8192            /* Log size buffer */
+
 #ifndef RELEASE_BUILD
-static char buff[1024];
-static int  seen = 0;
+
+static char buff[LOG_SIZE_BUFFER];
+
+static int seen = 0;
 
 static int suppr_seen = 1;
+
+// Functions only used in this translation unit
+void pclog_ensure_stdlog_open(void);
 #endif
 
+/*
+    Ensures STDLOG is open for pclog_ex and pclog_ex_cyclic
+*/
+void pclog_ensure_stdlog_open(void)
+{
+#ifndef RELEASE_BUILD
+    if (stdlog == NULL) {
+        if (log_path[0] != '\0') {
+            stdlog = plat_fopen(log_path, "w");
+            if (stdlog == NULL)
+                stdlog = stdout;
+        } else
+            stdlog = stdout;
+    }
+#endif
+}
+
 /*
  * Log something to the logfile or stdout.
  *
@@ -256,22 +369,15 @@ static int suppr_seen = 1;
  * being logged, and catch repeating entries.
  */
 void
-pclog_ex(const char *fmt, va_list ap)
+pclog_ex(UNUSED(const char *fmt), UNUSED(va_list ap))
 {
 #ifndef RELEASE_BUILD
-    char temp[1024];
+    char temp[LOG_SIZE_BUFFER];
 
     if (strcmp(fmt, "") == 0)
         return;
 
-    if (stdlog == NULL) {
-        if (log_path[0] != '\0') {
-            stdlog = plat_fopen(log_path, "w");
-            if (stdlog == NULL)
-                stdlog = stdout;
-        } else
-            stdlog = stdout;
-    }
+    pclog_ensure_stdlog_open();
 
     vsprintf(temp, fmt, ap);
     if (suppr_seen && !strcmp(buff, temp))
@@ -298,7 +404,7 @@ pclog_toggle_suppr(void)
 
 /* Log something. We only do this in non-release builds. */
 void
-pclog(const char *fmt, ...)
+pclog(UNUSED(const char *fmt), ...)
 {
 #ifndef RELEASE_BUILD
     va_list ap;
@@ -309,11 +415,35 @@ pclog(const char *fmt, ...)
 #endif
 }
 
+/* Log something even in release builds. */
+void
+always_log(const char *fmt, ...)
+{
+    char    temp[LOG_SIZE_BUFFER];
+    va_list ap;
+
+    va_start(ap, fmt);
+
+    if (stdlog == NULL) {
+        if (log_path[0] != '\0') {
+            stdlog = plat_fopen(log_path, "w");
+            if (stdlog == NULL)
+                stdlog = stdout;
+        } else
+            stdlog = stdout;
+    }
+
+    vsprintf(temp, fmt, ap);
+    fprintf(stdlog, "%s", temp);
+    fflush(stdlog);
+    va_end(ap);
+}
+
 /* Log a fatal error, and display a UI message before exiting. */
 void
 fatal(const char *fmt, ...)
 {
-    char    temp[1024];
+    char    temp[LOG_SIZE_BUFFER];
     va_list ap;
     char   *sp;
 
@@ -345,12 +475,14 @@ fatal(const char *fmt, ...)
     if ((sp = strchr(temp, '\n')) != NULL)
         *sp = '\0';
 
+    do_pause(2);
+
+    ui_msgbox(MBX_ERROR | MBX_FATAL | MBX_ANSI, temp);
+
     /* Cleanly terminate all of the emulator's components so as
        to avoid things like threads getting stuck. */
     do_stop();
 
-    ui_msgbox(MBX_ERROR | MBX_FATAL | MBX_ANSI, temp);
-
     fflush(stdlog);
 
     exit(-1);
@@ -359,7 +491,7 @@ fatal(const char *fmt, ...)
 void
 fatal_ex(const char *fmt, va_list ap)
 {
-    char  temp[1024];
+    char  temp[LOG_SIZE_BUFFER];
     char *sp;
 
     if (stdlog == NULL) {
@@ -387,13 +519,84 @@ fatal_ex(const char *fmt, va_list ap)
     if ((sp = strchr(temp, '\n')) != NULL)
         *sp = '\0';
 
+    do_pause(2);
+
+    ui_msgbox(MBX_ERROR | MBX_FATAL | MBX_ANSI, temp);
+
     /* Cleanly terminate all of the emulator's components so as
        to avoid things like threads getting stuck. */
     do_stop();
 
-    ui_msgbox(MBX_ERROR | MBX_FATAL | MBX_ANSI, temp);
+    fflush(stdlog);
+}
+
+/* Log a warning error, and display a UI message without exiting. */
+void
+warning(const char *fmt, ...)
+{
+    char    temp[LOG_SIZE_BUFFER];
+    va_list ap;
+    char   *sp;
+
+    va_start(ap, fmt);
+
+    if (stdlog == NULL) {
+        if (log_path[0] != '\0') {
+            stdlog = plat_fopen(log_path, "w");
+            if (stdlog == NULL)
+                stdlog = stdout;
+        } else
+            stdlog = stdout;
+    }
+
+    vsprintf(temp, fmt, ap);
+    fprintf(stdlog, "%s", temp);
+    fflush(stdlog);
+    va_end(ap);
+
+    /* Make sure the message does not have a trailing newline. */
+    if ((sp = strchr(temp, '\n')) != NULL)
+        *sp = '\0';
+
+    do_pause(2);
+
+    ui_msgbox(MBX_ERROR | MBX_ANSI, temp);
 
     fflush(stdlog);
+
+    do_pause(0);
+}
+
+void
+warning_ex(const char *fmt, va_list ap)
+{
+    char  temp[LOG_SIZE_BUFFER];
+    char *sp;
+
+    if (stdlog == NULL) {
+        if (log_path[0] != '\0') {
+            stdlog = plat_fopen(log_path, "w");
+            if (stdlog == NULL)
+                stdlog = stdout;
+        } else
+            stdlog = stdout;
+    }
+
+    vsprintf(temp, fmt, ap);
+    fprintf(stdlog, "%s", temp);
+    fflush(stdlog);
+
+    /* Make sure the message does not have a trailing newline. */
+    if ((sp = strchr(temp, '\n')) != NULL)
+        *sp = '\0';
+
+    do_pause(2);
+
+    ui_msgbox(MBX_ERROR | MBX_ANSI, temp);
+
+    fflush(stdlog);
+
+    do_pause(0);
 }
 
 #ifdef ENABLE_PC_LOG
@@ -421,7 +624,7 @@ delete_nvr_file(uint8_t flash)
     int c;
 
     /* Set up the NVR file's name. */
-    c       = strlen(machine_get_internal_name()) + 5;
+    c       = strlen(machine_get_nvr_name()) + 5;
     fn      = (char *) malloc(c + 1);
 
     if (fn == NULL)
@@ -429,9 +632,9 @@ delete_nvr_file(uint8_t flash)
               flash ? "BIOS flash" : "CMOS");
 
     if (flash)
-        sprintf(fn, "%s.bin", machine_get_internal_name());
+        sprintf(fn, "%s.bin", machine_get_nvr_name());
     else
-        sprintf(fn, "%s.nvr", machine_get_internal_name());
+        sprintf(fn, "%s.nvr", machine_get_nvr_name());
 
     remove(nvr_path(fn));
 
@@ -439,6 +642,75 @@ delete_nvr_file(uint8_t flash)
     fn = NULL;
 }
 
+extern void  device_find_all_descs(void);
+
+static void
+pc_show_usage(char *s)
+{
+    char p[8192] = { 0 };
+
+    sprintf(p,
+            "\n%sUsage: 86box [options] [cfg-file]\n\n"
+            "Valid options are:\n\n"
+            "-? or --help\t\t\t- show this information\n"
+#ifdef SHOW_EXTRA_PARAMS
+            "-C or --config path\t\t- set 'path' to be config file\n"
+#endif
+#ifdef _WIN32
+            "-D or --debug\t\t\t- force debug output logging\n"
+#endif
+#ifndef USE_SDL_UI
+            "-E or --vmmpath\t\t- vm manager path\n"
+#endif
+            "-F or --fullscreen\t\t- start in fullscreen mode\n"
+            "-G or --lang langid\t\t- start with specified language\n"
+            "\t\t\t\t   (e.g. en-US, or system)\n"
+#ifdef SHOW_EXTRA_PARAMS
+#ifdef _WIN32
+            "-H or --hwnd id,hwnd\t\t- sends back the main dialog's hwnd\n"
+#endif
+#endif
+            "-I or --image d:path\t\t- load 'path' as floppy image on drive d\n"
+#ifdef USE_INSTRUMENT
+            "-J or --instrument name\t- set 'name' to be the profiling instrument\n"
+#endif
+            "-L or --logfile path\t\t- set 'path' to be the logfile\n"
+            "-M or --missing\t\t- dump missing machines and video cards\n"
+            "-N or --noconfirm\t\t- do not ask for confirmation on quit\n"
+            "-P or --vmpath path\t\t- set 'path' to be root for vm\n"
+            "-O or --global path\t\t- set 'path' to be global config file\n"
+            "-R or --rompath path\t\t- set 'path' to be ROM path\n"
+#ifndef USE_SDL_UI
+            "-S or --settings\t\t\t- show only the settings dialog\n"
+#endif
+#ifdef SHOW_EXTRA_PARAMS
+            "-T or --testmode\t\t- test mode: execute the test mode entry\n"
+            "\t\t\t\t   point on init/hard reset\n"
+#endif
+            "-V or --vmname name\t\t- overrides the name of the running VM\n"
+#ifdef _WIN32
+            "-W or --nohook\t\t- disables keyboard hook\n"
+#else
+            "-W or --nohook\t\t- alters keyboard behavior\n"
+#endif
+            "-X or --clear what\t\t- clears the 'what' (cmos/flash/both)\n"
+#ifdef SHOW_EXTRA_PARAMS
+            "-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);
+
+#ifdef _WIN32
+    ui_msgbox(MBX_ANSI | ((s == NULL) ? MBX_INFO : MBX_WARNING), p);
+#else
+    if (s == NULL)
+        always_log("%s", p);
+    else
+        ui_msgbox(MBX_ANSI | MBX_WARNING, p);
+#endif
+}
+
 /*
  * Perform initial startup of the PC.
  *
@@ -452,6 +724,7 @@ pc_init(int argc, char *argv[])
     char            *ppath = NULL;
     char            *rpath = NULL;
     char            *cfg = NULL;
+    char            *global = NULL;
     char            *p;
     char             temp[2048];
     char            *fn[FDD_NUM] = { NULL };
@@ -469,7 +742,7 @@ pc_init(int argc, char *argv[])
     uint32_t *uid;
     uint32_t *shwnd;
 #endif
-    uint32_t lang_init = 0;
+    int lang_init = 0;
 
     /* Grab the executable's full path. */
     plat_get_exe_name(exe_path, sizeof(exe_path) - 1);
@@ -482,10 +755,6 @@ pc_init(int argc, char *argv[])
         p                = path_get_filename(exe_path);
         *p               = '\0';
     }
-    if (!strncmp(exe_path, "/private/var/folders/", 21)) {
-        ui_msgbox_header(MBX_FATAL, L"App Translocation", EMU_NAME_W L" cannot determine the emulated machine's location due to a macOS security feature. Please move the " EMU_NAME_W L" app to another folder (not /Applications), or make a copy of it and open that copy instead.");
-        return 0;
-    }
 #elif !defined(_WIN32)
     /* Grab the actual path if we are an AppImage. */
     p = getenv("APPIMAGE");
@@ -493,8 +762,23 @@ pc_init(int argc, char *argv[])
         path_get_dirname(exe_path, p);
 #endif
 
+    path_normalize(exe_path);
     path_slash(exe_path);
 
+    /*
+     * Determine if we are running in portable mode.
+     *
+     * We enable portable mode if the EXE path
+     * contains the global config file.
+     */
+    path_append_filename(temp, exe_path, GLOBAL_CONFIG_FILE);
+
+    FILE *fp = fopen(temp, "r");
+    if (fp) {
+        portable_mode = 1;
+        fclose(fp);
+    }
+
     /*
      * Get the current working directory.
      *
@@ -519,39 +803,7 @@ usage:
                 }
             }
 
-            printf("\nUsage: 86box [options] [cfg-file]\n\n");
-            printf("Valid options are:\n\n");
-            printf("-? or --help            - show this information\n");
-            printf("-C or --config path     - set 'path' to be config file\n");
-#ifdef _WIN32
-            printf("-D or --debug           - force debug output logging\n");
-#endif
-#if 0
-            printf("-E or --nographic       - forces the old behavior\n");
-#endif
-            printf("-F or --fullscreen      - start in fullscreen mode\n");
-            printf("-G or --lang langid     - start with specified language (e.g. en-US, or system)\n");
-#ifdef _WIN32
-            printf("-H or --hwnd id,hwnd    - sends back the main dialog's hwnd\n");
-#endif
-            printf("-I or --image d:path    - load 'path' as floppy image on drive d\n");
-#ifdef USE_INSTRUMENT
-            printf("-J or --instrument name - set 'name' to be the profiling instrument\n");
-#endif
-            printf("-K or --keycodes codes  - set 'codes' to be the uncapture combination\n");
-            printf("-L or --logfile path    - set 'path' to be the logfile\n");
-            printf("-M or --missing         - dump missing machines and video cards\n");
-            printf("-N or --noconfirm       - do not ask for confirmation on quit\n");
-            printf("-P or --vmpath path     - set 'path' to be root for vm\n");
-            printf("-R or --rompath path    - set 'path' to be ROM path\n");
-#ifndef USE_SDL_UI
-            printf("-S or --settings        - show only the settings dialog\n");
-#endif
-            printf("-V or --vmname name     - overrides the name of the running VM\n");
-            printf("-X or --clear what      - clears the 'what' (cmos/flash/both)\n");
-            printf("-Y or --donothing       - do not show any UI or run the emulation\n");
-            printf("-Z or --lastvmpath      - the last parameter is VM path rather than config\n");
-            printf("\nA config file can be specified. If none is, the default file will be used.\n");
+            pc_show_usage("");
             return 0;
         } else if (!strcasecmp(argv[c], "--lastvmpath") || !strcasecmp(argv[c], "-Z")) {
             lvmp = 1;
@@ -559,12 +811,17 @@ usage:
         } else if (!strcasecmp(argv[c], "--debug") || !strcasecmp(argv[c], "-D")) {
             force_debug = 1;
 #endif
-#ifdef ENABLE_NG
-        } else if (!strcasecmp(argv[c], "--nographic") || !strcasecmp(argv[c], "-E")) {
-            /* Currently does nothing, but if/when we implement a built-in manager,
-               it's going to force the manager not to run, allowing the old usage
-               without parameter. */
-            ng = 1;
+#ifndef USE_SDL_UI
+        } else if (!strcasecmp(argv[c], "--vmmpath") ||
+                   !strcasecmp(argv[c], "-E")) {
+            /* Using this variable for vm manager path
+               Temporary solution!*/
+            if ((c+1) == argc) goto usage;
+            char *vp = argv[++c];
+            if ((strlen(vp) + 1) >= sizeof(vmm_path))
+                memcpy(vmm_path, vp, sizeof(vmm_path));
+            else
+                memcpy(vmm_path, vp, strlen(vp) + 1);
 #endif
         } else if (!strcasecmp(argv[c], "--fullscreen") || !strcasecmp(argv[c], "-F")) {
             start_in_fullscreen = 1;
@@ -578,6 +835,7 @@ usage:
                 goto usage;
 
             ppath = argv[++c];
+            start_vmm = 0;
         } else if (!strcasecmp(argv[c], "--rompath") || !strcasecmp(argv[c], "-R")) {
             if ((c + 1) == argc)
                 goto usage;
@@ -589,12 +847,22 @@ usage:
                 goto usage;
 
             cfg = argv[++c];
+            start_vmm = 0;
+        } else if (!strcasecmp(argv[c], "--global") || !strcasecmp(argv[c], "-O")) {
+            if ((c + 1) == argc || plat_dir_check(argv[c + 1]))
+                goto usage;
+
+            global = argv[++c];
         } else if (!strcasecmp(argv[c], "--image") || !strcasecmp(argv[c], "-I")) {
             if ((c + 1) == argc)
                 goto usage;
 
             temp2 = (char *) calloc(2048, 1);
-            sscanf(argv[++c], "%c:%s", &drive, temp2);
+            if (sscanf(argv[++c], "%c:%2047s", &drive, temp2) != 2) {
+                fprintf(stderr, "Invalid input format for --image option.\n");
+                free(temp2);
+                goto usage;
+            }
             if (drive > 0x40)
                 drive = (drive & 0x1f) - 1;
             else
@@ -617,20 +885,17 @@ usage:
         } else if (!strcasecmp(argv[c], "--settings") || !strcasecmp(argv[c], "-S")) {
             settings_only = 1;
 #endif
+        } else if (!strcasecmp(argv[c], "--testmode") || !strcasecmp(argv[c], "-T")) {
+            test_mode = 1;
         } else if (!strcasecmp(argv[c], "--noconfirm") || !strcasecmp(argv[c], "-N")) {
             confirm_exit_cmdl = 0;
         } else if (!strcasecmp(argv[c], "--missing") || !strcasecmp(argv[c], "-M")) {
             dump_missing = 1;
         } else if (!strcasecmp(argv[c], "--donothing") || !strcasecmp(argv[c], "-Y")) {
             do_nothing = 1;
-        } else if (!strcasecmp(argv[c], "--keycodes") || !strcasecmp(argv[c], "-K")) {
-            if ((c + 1) == argc)
-                goto usage;
-
-            sscanf(argv[++c], "%03hX,%03hX,%03hX,%03hX,%03hX,%03hX",
-                   &key_prefix_1_1, &key_prefix_1_2, &key_prefix_2_1, &key_prefix_2_2,
-                   &key_uncapture_1, &key_uncapture_2);
-        } else if (!strcasecmp(argv[c], "--clearboth") || !strcasecmp(argv[c], "-X")) {
+        } else if (!strcasecmp(argv[c], "--nohook") || !strcasecmp(argv[c], "-W")) {
+            hook_enabled = 0;
+        } else if (!strcasecmp(argv[c], "--clear") || !strcasecmp(argv[c], "-X")) {
             if ((c + 1) == argc)
                 goto usage;
 
@@ -660,7 +925,7 @@ usage:
 
             lang_init = plat_language_code(argv[++c]);
             if (!lang_init)
-                printf("\nWarning: Invalid language code, ignoring --lang parameter.\n\n");
+                always_log("\nWarning: Invalid language code, ignoring --lang parameter.\n\n");
 
             // The return value of 0 only means that the code is invalid,
             //   not related to that translation is exists or not for the
@@ -690,6 +955,8 @@ usage:
             ppath = argv[c++];
         else
             cfg = argv[c++];
+
+        start_vmm = 0;
     }
 
     if (c != argc)
@@ -808,6 +1075,14 @@ usage:
     /* At this point, we can safely create the full path name. */
     path_append_filename(cfg_path, usr_path, p);
 
+    /* Build the global configuration file path. */
+    if (global == NULL) {
+        plat_get_global_config_dir(global_cfg_path, sizeof(global_cfg_path));
+        path_append_filename(global_cfg_path, global_cfg_path, GLOBAL_CONFIG_FILE);
+    } else {
+        strncpy(global_cfg_path, global, sizeof(global_cfg_path) - 1);
+    }
+
     /*
      * Get the current directory's name
      *
@@ -825,53 +1100,115 @@ usage:
      * This is where we start outputting to the log file,
      * if there is one. Create a little info header first.
      */
+    struct tm time_buf;
+
     (void) time(&now);
-    info = localtime(&now);
-    strftime(temp, sizeof(temp), "%Y/%m/%d %H:%M:%S", info);
+#ifdef _WIN32
+    if (localtime_s(&time_buf, &now) == 0)
+        info = &time_buf;
+    else
+        info = NULL;
+#else
+    info = localtime_r(&now, &time_buf);
+#endif
+
+    if (info)
+        strftime(temp, sizeof(temp), "%Y/%m/%d %H:%M:%S", info);
+    else
+        strcpy(temp, "unknown");
+
     pclog("#\n# %ls v%ls logfile, created %s\n#\n",
           EMU_NAME_W, EMU_VERSION_FULL_W, temp);
-    pclog("# VM: %s\n#\n", vm_name);
+
+    if (portable_mode) {
+        pclog("# Portable mode enabled.\n");
+    }
+
     pclog("# Emulator path: %s\n", exe_path);
-    pclog("# Userfiles path: %s\n", usr_path);
-    for (rom_path_t *rom_path = &rom_paths; rom_path != NULL; rom_path = rom_path->next) {
-        pclog("# ROM path: %s\n", rom_path->path);
+    pclog("# Global configuration file: %s\n", global_cfg_path);
+
+    /* Load the global configuration file. */
+    config_load_global();
+    config_save_global(); // hack
+
+    /* Determine whether to start the VM manager. */
+#ifndef USE_SDL_UI
+    if (vmm_disabled && start_vmm)
+#endif
+    {
+        start_vmm = 0;
+#ifdef __APPLE__
+        if (!strncmp(exe_path, "/private/var/folders/", 21)) {
+            ui_msgbox_header(MBX_FATAL, L"App Translocation", EMU_NAME_W L" cannot determine the emulated machine's location due to a macOS security feature. Please move the " EMU_NAME_W L" app to another folder (not /Applications), or make a copy of it and open that copy instead.");
+            return 0;
+        }
+#endif
     }
 
-    pclog("# Configuration file: %s\n#\n\n", cfg_path);
-    /*
-     * We are about to read the configuration file, which MAY
-     * put data into global variables (the hard- and floppy
-     * disks are an example) so we have to initialize those
-     * modules before we load the config..
-     */
-    hdd_init();
-    network_init();
-    mouse_init();
-    cdrom_global_init();
-    zip_global_init();
-    mo_global_init();
-
-    /* Load the configuration file. */
-    config_load();
-
-    /* Clear the CMOS and/or BIOS flash file, if we were started with
-       the relevant parameter(s). */
-    if (clear_cmos) {
-        delete_nvr_file(0);
-        clear_cmos = 0;
+#ifndef USE_SDL_UI
+    if (strlen(vmm_path) != 0) {
+        /* -E specified on the command line. */
+        start_vmm = 1;
+    } else {
+        strncpy(vmm_path, vmm_path_cfg, sizeof(vmm_path) - 1);
     }
 
-    if (clear_flash) {
-        delete_nvr_file(1);
-        clear_flash = 0;
-    }
+    if (start_vmm) {
+        pclog("# VM Manager enabled. Path: %s\n", vmm_path);
+        strncpy(usr_path, vmm_path, sizeof(usr_path) - 1);
+    } else
+#endif
+    {
+        pclog("# VM: %s\n#\n", vm_name);
+        pclog("# Configuration file: %s\n#\n\n", cfg_path);
+        pclog("# Userfiles path: %s\n", usr_path);
 
-    for (uint8_t i = 0; i < FDD_NUM; i++) {
-        if (fn[i] != NULL) {
-            if (strlen(fn[i]) <= 511)
-                strncpy(floppyfns[i], fn[i], 511);
-            free(fn[i]);
-            fn[i] = NULL;
+        for (rom_path_t *rom_path = &rom_paths; rom_path != NULL; rom_path = rom_path->next) {
+            pclog("# ROM path: %s\n", rom_path->path);
+        }
+
+        /*
+         * We are about to read the configuration file, which MAY
+         * put data into global variables (the hard- and floppy
+         * disks are an example) so we have to initialize those
+         * modules before we load the config..
+         */
+        hdd_init();
+        network_init();
+        mouse_init();
+        cdrom_global_init();
+        rdisk_global_init();
+        mo_global_init();
+
+        /* Initialize the keyboard accelerator list with default values */
+        for (int x = 0; x < NUM_ACCELS; x++) {
+            strcpy(acc_keys[x].name, def_acc_keys[x].name);
+            strcpy(acc_keys[x].desc, def_acc_keys[x].desc);
+            strcpy(acc_keys[x].seq, def_acc_keys[x].seq);
+        }
+
+        /* Load the configuration file. */
+        config_load();
+
+        /* Clear the CMOS and/or BIOS flash file, if we were started with
+           the relevant parameter(s). */
+        if (clear_cmos) {
+            delete_nvr_file(0);
+            clear_cmos = 0;
+        }
+
+        if (clear_flash) {
+            delete_nvr_file(1);
+            clear_flash = 0;
+        }
+
+        for (uint8_t i = 0; i < FDD_NUM; i++) {
+            if (fn[i] != NULL) {
+                if (strlen(fn[i]) <= 511)
+                    strncpy(floppyfns[i], fn[i], 511);
+                free(fn[i]);
+                fn[i] = NULL;
+            }
         }
     }
 
@@ -906,11 +1243,10 @@ pc_full_speed(void)
 
 /* Initialize modules, ran once, after pc_init. */
 int
-pc_init_modules(void)
+pc_init_roms(void)
 {
     int     c;
     int     m;
-    wchar_t temp[512];
     char    tempc[512];
 
     if (dump_missing) {
@@ -949,14 +1285,24 @@ pc_init_modules(void)
     }
     pc_log("A total of %d ROM sets have been loaded.\n", c);
 
+    return 1;
+}
+
+int
+pc_init_modules(void)
+{
+    int     c;
+    wchar_t temp[512];
+    char    tempc[512];
+
     /* Load the ROMs for the selected machine. */
     if (!machine_available(machine)) {
-        swprintf(temp, sizeof_w(temp), plat_get_string(IDS_2063), machine_getname());
+        swprintf(temp, sizeof_w(temp), plat_get_string(STRING_HW_NOT_AVAILABLE_MACHINE), machine_getname());
         c       = 0;
         machine = -1;
         while (machine_get_internal_name_ex(c) != NULL) {
             if (machine_available(c)) {
-                ui_msgbox_header(MBX_INFO, (wchar_t *) IDS_2129, temp);
+                ui_msgbox_header(MBX_INFO, plat_get_string(STRING_HW_NOT_AVAILABLE_TITLE), temp);
                 machine = c;
                 config_save();
                 break;
@@ -973,12 +1319,12 @@ pc_init_modules(void)
     if (!video_card_available(gfxcard[0])) {
         memset(tempc, 0, sizeof(tempc));
         device_get_name(video_card_getdevice(gfxcard[0]), 0, tempc);
-        swprintf(temp, sizeof_w(temp), plat_get_string(IDS_2064), tempc);
+        swprintf(temp, sizeof_w(temp), plat_get_string(STRING_HW_NOT_AVAILABLE_VIDEO), tempc);
         c = 0;
         while (video_get_internal_name(c) != NULL) {
             gfxcard[0] = -1;
             if (video_card_available(c)) {
-                ui_msgbox_header(MBX_INFO, (wchar_t *) IDS_2129, temp);
+                ui_msgbox_header(MBX_INFO, plat_get_string(STRING_HW_NOT_AVAILABLE_TITLE), temp);
                 gfxcard[0] = c;
                 config_save();
                 break;
@@ -991,12 +1337,15 @@ pc_init_modules(void)
         }
     }
 
-    if (!video_card_available(gfxcard[1])) {
-        char tempc[512] = { 0 };
-        device_get_name(video_card_getdevice(gfxcard[1]), 0, tempc);
-        swprintf(temp, sizeof_w(temp), plat_get_string(IDS_2163), tempc);
-        ui_msgbox_header(MBX_INFO, (wchar_t *) IDS_2129, temp);
-        gfxcard[1] = 0;
+    // TODO
+    for (uint8_t i = 1; i < GFXCARD_MAX; i ++) {
+        if (!video_card_available(gfxcard[i])) {
+            char tempc[512] = { 0 };
+            device_get_name(video_card_getdevice(gfxcard[i]), 0, tempc);
+            swprintf(temp, sizeof_w(temp), plat_get_string(STRING_HW_NOT_AVAILABLE_VIDEO2), tempc);
+            ui_msgbox_header(MBX_INFO, plat_get_string(STRING_HW_NOT_AVAILABLE_TITLE), temp);
+            gfxcard[i] = 0;
+        }
     }
 
     atfullspeed = 0;
@@ -1034,6 +1383,16 @@ pc_init_modules(void)
 
     machine_status_init();
 
+    serial_set_next_inst(0);
+
+    lpt_set_3bc_used(0);
+    lpt_set_next_inst(0);
+
+    for (c = 0; c <= 0x7ff; c++) {
+        int64_t exp = c - 1023; /* 1023 = BIAS64 */
+        exp_pow_table[c] = pow(2.0, (double) exp);
+    }
+
     if (do_nothing) {
         do_nothing = 0;
         exit(-1);
@@ -1045,13 +1404,52 @@ pc_init_modules(void)
 void
 pc_send_ca(uint16_t sc)
 {
-    keyboard_input(1, 0x1D); /* Ctrl key pressed */
-    keyboard_input(1, 0x38); /* Alt key pressed */
-    keyboard_input(1, sc);
-    usleep(50000);
-    keyboard_input(0, sc);
-    keyboard_input(0, 0x38); /* Alt key released */
-    keyboard_input(0, 0x1D); /* Ctrl key released */
+    if (keyboard_mode >= 0x81) {
+        /* Use R-Alt because PS/55 DOS and OS/2 assign L-Alt Kanji */
+        keyboard_input(1, 0x1D);  /*  Ctrl key pressed */
+        if (keyboard_get_in_reset())
+            return;
+        keyboard_input(1, 0x138); /* R-Alt key pressed */
+        if (keyboard_get_in_reset())
+            return;
+        keyboard_input(1, sc);
+        if (keyboard_get_in_reset())
+            return;
+        usleep(50000);
+        if (keyboard_get_in_reset())
+            return;
+        keyboard_input(0, sc);
+        if (keyboard_get_in_reset())
+            return;
+        keyboard_input(0, 0x138); /* R-Alt key released */
+        if (keyboard_get_in_reset())
+            return;
+        keyboard_input(0, 0x1D);  /*  Ctrl key released */
+        if (keyboard_get_in_reset())
+            return;
+    } else {
+        keyboard_input(1, 0x1D); /* Ctrl key pressed */
+        if (keyboard_get_in_reset())
+            return;
+        keyboard_input(1, 0x38); /* Alt key pressed */
+        if (keyboard_get_in_reset())
+            return;
+        keyboard_input(1, sc);
+        if (keyboard_get_in_reset())
+            return;
+        usleep(50000);
+        if (keyboard_get_in_reset())
+            return;
+        keyboard_input(0, sc);
+        if (keyboard_get_in_reset())
+            return;
+        keyboard_input(0, 0x38); /* Alt key released */
+        if (keyboard_get_in_reset())
+            return;
+        keyboard_input(0, 0x1D); /* Ctrl key released */
+        if (keyboard_get_in_reset())
+            return;
+    }
 }
 
 /* Send the machine a Control-Alt-DEL sequence. */
@@ -1068,6 +1466,27 @@ pc_send_cae(void)
     pc_send_ca(1);
 }
 
+/*
+   Currently available API:
+
+   extern void     resetx86(void);
+   extern void     softresetx86(void);
+   extern void     hardresetx86(void);
+
+   extern void     prefetch_queue_set_pos(int pos);
+   extern void     prefetch_queue_set_ip(uint16_t ip);
+   extern void     prefetch_queue_set_prefetching(int p);
+   extern int      prefetch_queue_get_pos(void);
+   extern uint16_t prefetch_queue_get_ip(void);
+   extern int      prefetch_queue_get_prefetching(void);
+   extern int      prefetch_queue_get_size(void);
+ */
+static void
+pc_test_mode_entry_point(void)
+{
+    pclog("Test mode entry point\n=====================\n");
+}
+
 void
 pc_reset_hard_close(void)
 {
@@ -1076,18 +1495,18 @@ pc_reset_hard_close(void)
     /* Close all the memory mappings. */
     mem_close();
 
+    suppress_overscan = 0;
+
     /* Turn off timer processing to avoid potential segmentation faults. */
     timer_close();
 
-    suppress_overscan = 0;
+    lpt_devices_close();
 
     nvr_save();
     nvr_close();
 
     mouse_close();
 
-    lpt_devices_close();
-
     device_close_all();
 
     scsi_device_close_all();
@@ -1098,7 +1517,7 @@ pc_reset_hard_close(void)
 
     cdrom_close();
 
-    zip_close();
+    rdisk_close();
 
     mo_close();
 
@@ -1111,6 +1530,9 @@ pc_reset_hard_close(void)
     cpu_close();
 
     serial_set_next_inst(0);
+
+    lpt_set_3bc_used(0);
+    lpt_set_next_inst(0);
 }
 
 /*
@@ -1128,6 +1550,11 @@ pc_reset_hard_init(void)
      * modules that are.
      */
 
+    keyboard_init();
+
+    /* Reset the IDE and SCSI presences */
+    other_ide_present = other_scsi_present = 0;
+
     /* Mark ACPI as unavailable */
     acpi_enabled = 0;
 
@@ -1144,6 +1571,8 @@ pc_reset_hard_init(void)
     scsi_reset();
     scsi_device_init();
 
+    ide_hard_reset();
+
     /* Initialize the actual machine and its basic modules. */
     machine_init();
 
@@ -1165,15 +1594,17 @@ pc_reset_hard_init(void)
 
     /* Initialize parallel devices. */
     /* note: PLIP LPT side has to be initialized before the network side */
+    lpt_standalone_init();
     lpt_devices_init();
 
+    /* Reset and reconfigure the serial ports. */
+    /* note: SLIP COM side has to be initialized before the network side */
+    serial_standalone_init();
+    serial_passthrough_init();
+
     /* Reset and reconfigure the Network Card layer. */
     network_reset();
 
-    /* Reset and reconfigure the serial ports. */
-    serial_standalone_init();
-    serial_passthrough_init();
-
     /*
      * Reset the mouse, this will attach it to any port needed.
      */
@@ -1186,9 +1617,6 @@ pc_reset_hard_init(void)
 
     fdd_reset();
 
-    /* Reset the CD-ROM Controller module. */
-    cdrom_interface_reset();
-
     /* Reset and reconfigure the SCSI layer. */
     scsi_card_init();
 
@@ -1196,9 +1624,16 @@ pc_reset_hard_init(void)
 
     cdrom_hard_reset();
 
+    /* Reset the CD-ROM Controller module. */
+    cdrom_interface_reset();
+
     mo_hard_reset();
 
-    zip_hard_reset();
+    rdisk_hard_reset();
+
+
+    /* Reset any ISA ROM cards. */
+    isarom_reset();
 
     /* Reset any ISA RTC cards. */
     isartc_reset();
@@ -1207,8 +1642,9 @@ pc_reset_hard_init(void)
        the chances of the SCSI controller ending up on the bridge. */
     video_voodoo_init();
 
-    if (joystick_type)
-        gameport_update_joystick_type(); /* installs game port if no device provides one, must be late */
+    /* installs first game port if no device provides one, must be late */
+    if (joystick_type[0])
+        gameport_update_joystick_type(0);
 
     ui_sb_update_panes();
 
@@ -1227,6 +1663,9 @@ pc_reset_hard_init(void)
     if (unittester_enabled)
         device_add(&unittester_device);
 
+    if (novell_keycard_enabled)
+        device_add(&novell_keycard_device);
+
     if (IS_ARCH(machine, MACHINE_BUS_PCI)) {
         pci_register_cards();
         device_reset_all(DEVICE_PCI);
@@ -1255,6 +1694,9 @@ pc_reset_hard_init(void)
 
     update_mouse_msg();
 
+    if (test_mode)
+        pc_test_mode_entry_point();
+
     ui_hard_reset_completed();
 }
 
@@ -1278,19 +1720,19 @@ update_mouse_msg(void)
         *(wcp - 1) = L'\0';
     mbstowcs(wcpu, cpu_s->name, strlen(cpu_s->name) + 1);
 #ifdef _WIN32
-    swprintf(mouse_msg[0], sizeof_w(mouse_msg[0]), L"%%i%%%% - %ls",
-             plat_get_string(IDS_2077));
-    swprintf(mouse_msg[1], sizeof_w(mouse_msg[1]), L"%%i%%%% - %ls",
-             (mouse_get_buttons() > 2) ? plat_get_string(IDS_2078) : plat_get_string(IDS_2079));
-    wcsncpy(mouse_msg[2], L"%i%%", sizeof_w(mouse_msg[2]));
+    swprintf(mouse_msg[0], sizeof_w(mouse_msg[0]), L"%%i.%%i%%%% - %ls",
+             plat_get_string(STRING_MOUSE_CAPTURE));
+    swprintf(mouse_msg[1], sizeof_w(mouse_msg[1]), L"%%i.%%i%%%% - %ls",
+             (mouse_get_buttons() > 2) ? plat_get_string(STRING_MOUSE_RELEASE) : plat_get_string(STRING_MOUSE_RELEASE_MMB));
+    wcsncpy(mouse_msg[2], L"%i.%i%%", sizeof_w(mouse_msg[2]));
 #else
-    swprintf(mouse_msg[0], sizeof_w(mouse_msg[0]), L"%ls v%ls - %%i%%%% - %ls - %ls/%ls - %ls",
+    swprintf(mouse_msg[0], sizeof_w(mouse_msg[0]), L"%ls v%ls - %%i.%%i%%%% - %ls - %ls/%ls - %ls",
              EMU_NAME_W, EMU_VERSION_FULL_W, wmachine, wcpufamily, wcpu,
-             plat_get_string(IDS_2077));
-    swprintf(mouse_msg[1], sizeof_w(mouse_msg[1]), L"%ls v%ls - %%i%%%% - %ls - %ls/%ls - %ls",
+             plat_get_string(STRING_MOUSE_CAPTURE));
+    swprintf(mouse_msg[1], sizeof_w(mouse_msg[1]), L"%ls v%ls - %%i.%%i%%%% - %ls - %ls/%ls - %ls",
              EMU_NAME_W, EMU_VERSION_FULL_W, wmachine, wcpufamily, wcpu,
-             (mouse_get_buttons() > 2) ? plat_get_string(IDS_2078) : plat_get_string(IDS_2079));
-    swprintf(mouse_msg[2], sizeof_w(mouse_msg[2]), L"%ls v%ls - %%i%%%% - %ls - %ls/%ls",
+             (mouse_get_buttons() > 2) ? plat_get_string(STRING_MOUSE_RELEASE) : plat_get_string(STRING_MOUSE_RELEASE_MMB));
+    swprintf(mouse_msg[2], sizeof_w(mouse_msg[2]), L"%ls v%ls - %%i.%%i%%%% - %ls - %ls/%ls",
              EMU_NAME_W, EMU_VERSION_FULL_W, wmachine, wcpufamily, wcpu);
 #endif
 }
@@ -1351,13 +1793,17 @@ pc_close(UNUSED(thread_t *ptr))
 
     cdrom_close();
 
-    zip_close();
+    rdisk_close();
 
     mo_close();
 
     scsi_disk_close();
 
     gdbstub_close();
+
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
+    mem_free();
+#endif
 }
 
 #ifdef __APPLE__
@@ -1391,9 +1837,12 @@ pc_run(void)
         pc_reset_hard_init();
     }
 
+    /* Update the guest-CPU independent timer for devices with independent clock speed */
+    rivatimer_update_all();
+
     /* Run a block of code. */
     startblit();
-    cpu_exec((int32_t) cpu_s->rspeed / 100);
+    cpu_exec((int32_t) cpu_s->rspeed / (force_10ms ? 100 : 1000));
     ack_pause();
 #ifdef USE_GDBSTUB /* avoid a KBC FIFO overflow when CPU emulation is stalled */
     if (gdbstub_step == GDBSTUB_EXEC) {
@@ -1403,19 +1852,19 @@ pc_run(void)
 #ifdef USE_GDBSTUB /* avoid a KBC FIFO overflow when CPU emulation is stalled */
     }
 #endif
-    joystick_process();
+    joystick_process(0); // Gameport 0
     endblit();
 
     /* Done with this frame, update statistics. */
     framecount++;
-    if (++framecountx >= 100) {
+    if (++framecountx >= (force_10ms ? 100 : 1000)) {
         framecountx = 0;
         frames      = 0;
     }
 
     if (title_update) {
         mouse_msg_idx = ((mouse_type == MOUSE_TYPE_NONE) || (mouse_input_mode >= 1)) ? 2 : !!mouse_capture;
-        swprintf(temp, sizeof_w(temp), mouse_msg[mouse_msg_idx], fps);
+        swprintf(temp, sizeof_w(temp), mouse_msg[mouse_msg_idx], fps / (force_10ms ? 1 : 10), force_10ms ? 0 : (fps % 10));
 #ifdef __APPLE__
         /* Needed due to modifying the UI on the non-main thread is a big no-no. */
         dispatch_async_f(dispatch_get_main_queue(), wcsdup((const wchar_t *) temp), _ui_window_title);
@@ -1441,6 +1890,8 @@ set_screen_size_monitor(int x, int y, int monitor_index)
 {
     int    temp_overscan_x = monitors[monitor_index].mon_overscan_x;
     int    temp_overscan_y = monitors[monitor_index].mon_overscan_y;
+    int    is_svga         = (video_get_type_monitor(monitor_index) == VIDEO_FLAG_TYPE_SPECIAL) ||
+                             (video_get_type_monitor(monitor_index) == VIDEO_FLAG_TYPE_8514);
     double dx;
     double dy;
     double dtx;
@@ -1474,19 +1925,19 @@ set_screen_size_monitor(int x, int y, int monitor_index)
         dty = (double) temp_overscan_y;
 
         /* Account for possible overscan. */
-        if (video_get_type_monitor(monitor_index) != VIDEO_FLAG_TYPE_SPECIAL && (temp_overscan_y == 16)) {
+        if (!is_svga && (temp_overscan_y == 16)) {
             /* CGA */
             dy = (((dx - dtx) / 4.0) * 3.0) + dty;
-        } else if (video_get_type_monitor(monitor_index) != VIDEO_FLAG_TYPE_SPECIAL && (temp_overscan_y < 16)) {
+        } else if (!is_svga && (temp_overscan_y < 16)) {
             /* MDA/Hercules */
-            dy = (x / 4.0) * 3.0;
+            dy = (dx / 4.0) * 3.0;
         } else {
             if (enable_overscan) {
                 /* EGA/(S)VGA with overscan */
                 dy = (((dx - dtx) / 4.0) * 3.0) + dty;
             } else {
                 /* EGA/(S)VGA without overscan */
-                dy = (x / 4.0) * 3.0;
+                dy = (dx / 4.0) * 3.0;
             }
         }
         monitors[monitor_index].mon_unscaled_size_y = (int) dy;
@@ -1603,3 +2054,14 @@ do_pause(int p)
     }
     atomic_store(&pause_ack, 0);
 }
+
+// Helper to find an accelerator key and return it's index in acc_keys
+int FindAccelerator(const char *name) {
+    for (int x = 0; x < NUM_ACCELS; x++) {
+        if(strcmp(acc_keys[x].name, name) == 0)
+            return(x);
+    }
+
+    // No key was found
+    return -1;
+}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ec32d7548..724e1fda6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,16 +12,43 @@
 #          dob205
 #
 #          Copyright 2020-2022 David Hrdlička.
-#          Copyright 2021 dob205.
+#          Copyright 2021      dob205.
+#          Copyright 2024      Jasmine Iwanek.
 #
+
+if(NOT CMAKE_TOP_LEVEL_PROCESSED)
+    message(FATAL_ERROR "Incorrect source directory specified. Delete your build directory and retry with the top-level directory instead")
+endif()
+
 if(APPLE)
     set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 endif()
 
-add_executable(86Box 86box.c config.c log.c random.c timer.c io.c acpi.c apm.c
-    dma.c ddma.c nmi.c pic.c pit.c pit_fast.c port_6x.c port_92.c ppi.c pci.c
-    mca.c usb.c fifo.c fifo8.c device.c nvr.c nvr_at.c nvr_ps2.c
-    machine_status.c ini.c)
+add_executable(86Box
+    86box.c
+    config.c
+    timer.c
+    io.c
+    acpi.c
+    apm.c
+    dma.c
+    ddma.c
+    nmi.c
+    pic.c
+    pit.c
+    pit_fast.c
+    port_6x.c
+    port_92.c
+    ppi.c
+    pci.c
+    mca.c
+    usb.c
+    device.c
+    nvr.c
+    nvr_at.c
+    nvr_ps2.c
+    machine_status.c
+)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
     add_compile_definitions(_FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE=1 _LARGEFILE64_SOURCE=1)
@@ -48,21 +75,24 @@ if(DYNAREC)
     add_compile_definitions(USE_DYNAREC)
 endif()
 
-if(DEV_BRANCH)
-    add_compile_definitions(DEV_BRANCH)
-endif()
-
 if(DISCORD)
     add_compile_definitions(DISCORD)
     target_sources(86Box PRIVATE discord.c)
 endif()
 
+if(DEBUGREGS486)
+    add_compile_definitions(USE_DEBUG_REGS_486)
+endif()
+
 if(VNC)
     find_package(LibVNCServer)
     if(LibVNCServer_FOUND)
         add_compile_definitions(USE_VNC)
-        add_library(vnc OBJECT vnc.c vnc_keymap.c)
-            target_link_libraries(86Box vnc LibVNCServer::vncserver)
+        add_library(vnc OBJECT
+            vnc.c
+            vnc_keymap.c
+        )
+        target_link_libraries(86Box vnc LibVNCServer::vncserver)
         if(WIN32)
             target_link_libraries(86Box ws2_32)
         endif()
@@ -73,8 +103,12 @@ if(INSTRUMENT)
     add_compile_definitions(USE_INSTRUMENT)
 endif()
 
-target_link_libraries(86Box cpu chipset mch dev mem fdd game cdrom zip mo hdd
-    net print scsi sio snd vid voodoo plat ui)
+target_link_libraries(86Box cpu chipset mch dev mem fdd game cdrom rdisk mo hdd
+    net print scsi sio snd utils vid voodoo plat ui)
+
+if(HAIKU)
+    target_link_libraries(86Box be)
+endif()
 
 if(WIN32 AND ARCH STREQUAL "i386")
     if(MINGW)
@@ -119,16 +153,6 @@ if(APPLE)
     target_link_libraries(86Box Freetype::Freetype)
 endif()
 
-find_package(SDL2 REQUIRED)
-include_directories(${SDL2_INCLUDE_DIRS})
-if(STATIC_BUILD AND TARGET SDL2::SDL2-static)
-    target_link_libraries(86Box SDL2::SDL2-static)
-elseif(TARGET SDL2::SDL2)
-    target_link_libraries(86Box SDL2::SDL2)
-else()
-    target_link_libraries(86Box ${SDL2_LIBRARIES})
-endif()
-
 find_package(PNG REQUIRED)
 include_directories(${PNG_INCLUDE_DIRS})
 target_link_libraries(86Box PNG::PNG)
@@ -139,8 +163,10 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
 include_directories(include)
 if(NEW_DYNAREC)
     include_directories(cpu codegen_new)
-else()
+elseif(DYNAREC)
     include_directories(cpu codegen)
+else()
+    include_directories(cpu)
 endif()
 
 add_subdirectory(cdrom)
@@ -149,7 +175,7 @@ add_subdirectory(chipset)
 add_subdirectory(cpu)
 if(NEW_DYNAREC)
     add_subdirectory(codegen_new)
-else()
+elseif(DYNAREC)
     add_subdirectory(codegen)
 endif()
 
@@ -189,7 +215,6 @@ elseif(APPLE AND NOT QT)
     COMPONENT Runtime)
 endif()
 
-
 # Install the PDB file on Windows builds
 if(MSVC)
     # CMake fully supports PDB files on MSVC-compatible compilers
@@ -219,16 +244,20 @@ add_subdirectory(printer)
 add_subdirectory(sio)
 add_subdirectory(scsi)
 add_subdirectory(sound)
+add_subdirectory(utils)
 add_subdirectory(video)
+
 if (APPLE)
     add_subdirectory(mac)
 endif()
 
 if (QT)
     add_subdirectory(qt)
-elseif(WIN32)
-    add_subdirectory(win)
 else()
     add_compile_definitions(USE_SDL_UI)
     add_subdirectory(unix)
 endif()
+
+if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
+    add_custom_command(TARGET 86Box POST_BUILD COMMAND paxctl ARGS +m $<TARGET_FILE:86Box> COMMENT "Disable PaX MPROTECT")
+endif()
diff --git a/src/Makefile.local b/src/Makefile.local
deleted file mode 100644
index fdb2dcab3..000000000
--- a/src/Makefile.local
+++ /dev/null
@@ -1,200 +0,0 @@
-#
-# 86Box   A hypervisor and IBM PC system emulator that specializes in
-#         running old operating systems and software designed for IBM
-#         PC systems and compatibles from 1981 through fairly recent
-#         system designs based on the PCI bus.
-#
-#         This file is part of the 86Box distribution.
-#
-#         Prefix for localizing the general Makefile.mingw for local
-#         settings, so we can avoid changing the main one for all of
-#         our local setups.
-#
-# Authors: Fred N. van Kempen, <decwiz@yahoo.com>
-#
-
-#########################################################################
-#         Anything here will override defaults in Makefile.MinGW.       #
-#########################################################################
-
-
-# Name of the executable.
-#PROG := 86box.exe
-
-
-# Various compile-time options.
-# -DROM_TRACE=0xc800 traces ROM access from segment C800
-# -DIO_TRACE=0x66 traces I/O on port 0x66
-# -DIO_CATCH enables I/O range catch logs
-STUFF :=
-
-# Add feature selections here.
-# -DANSI_CFG forces the config file to ANSI encoding.
-# Root logging:
-# -DENABLE_ACPI_LOG=N sets logging level at N.
-# -DENABLE_APM_LOG=N sets logging level at N.
-# -DENABLE_BUGGER_LOG=N sets logging level at N.
-# -DENABLE_CONFIG_LOG=N sets logging level at N.
-# -DENABLE_DDMA_LOG=N sets logging level at N.
-# -DENABLE_DEVICE_LOG=N sets logging level at N.
-# -DENABLE_DMA_LOG=N sets logging level at N.
-# -DENABLE_IO_LOG=N sets logging level at N.
-# -DENABLE_IOAPIC_LOG=N sets logging level at N.
-# -DENABLE_ISAMEM_LOG=N sets logging level at N.
-# -DENABLE_ISARTC_LOG=N sets logging level at N.
-# -DENABLE_KEYBOARD_AT_LOG=N sets logging level at N.
-# -DENABLE_KEYBOARD_XT_LOG=N sets logging level at N.
-# -DENABLE_LM75_LOG=N sets logging level at N.
-# -DENABLE_LM78_LOG=N sets logging level at N.
-# -DENABLE_MEM_LOG=N sets logging level at N.
-# -DENABLE_MOUSE_LOG=N sets logging level at N.
-# -DENABLE_MOUSE_BUS_LOG=N sets logging level at N.
-# -DENABLE_MOUSE_PS2_LOG=N sets logging level at N.
-# -DENABLE_MOUSE_SERIAL_LOG=N sets logging level at N.
-# -DENABLE_NVR_LOG=N sets logging level at N.
-# -DENABLE_PC_LOG=N sets logging level at N.
-# -DENABLE_PCI_LOG=N sets logging level at N.
-# -DENABLE_PIC_LOG=N sets logging level at N.
-# -DENABLE_PIT_LOG=N sets logging level at N.
-# -DENABLE_POSTCARD_LOG=N sets logging level at N.
-# -DENABLE_ROM_LOG=N sets logging level at N.
-# -DENABLE_SERIAL_LOG=N sets logging level at N.
-# -DENABLE_SMBUS_LOG=N sets logging level at N.
-# -DENABLE_SMBUS_PIIX4_LOG=N sets logging level at N.
-# -DENABLE_SPD_LOG=N sets logging level at N.
-# -DENABLE_USB_LOG=N sets logging level at N.
-# -DENABLE_VNC_LOG=N sets logging level at N.
-# -DENABLE_VNC_KEYMAP_LOG=N sets logging level at N.
-# cdrom/ logging:
-# -DENABLE_CDROM_LOG=N sets logging level at N.
-# -DENABLE_CDROM_IMAGE_LOG=N sets logging level at N.
-# -DENABLE_CDROM_IMAGE_BACKEND_LOG=N sets logging level at N.
-# chipset/ logging:
-# -DENABLE_I420EX_LOG=N sets logging level at N.
-# -DENABLE_NEAT_LOG=N sets logging level at N.
-# -DENABLE_OPTI495_LOG=N sets logging level at N.
-# -DENABLE_OPTI895_LOG=N sets logging level at N.
-# -DENABLE_PIIX_LOG=N sets logging level at N.
-# -DENABLE_SIO_LOG=N sets logging level at N.
-# -DENABLE_SIS_85C496_LOG=N sets logging level at N.
-# codegen/, codegen_new/, cpu/ logging:
-# -DENABLE_X86SEG_LOG=N sets logging level at N.
-# cpu/ logging:
-# -DENABLE_386_LOG=N sets logging level at N.
-# -DENABLE_386_COMMON_LOG=N sets logging level at N.
-# -DENABLE_386_DYNAREC_LOG=N sets logging level at N.
-# -DENABLE_808X_LOG=N sets logging level at N.
-# -DENABLE_CPU_LOG=N sets logging level at N.
-# -DENABLE_FPU_LOG=N sets logging level at N.
-# disk/ logging:
-# -DENABLE_ESDI_AT_LOG=N sets logging level at N.
-# -DENABLE_ESDI_MCA_LOG=N sets logging level at N.
-# -DENABLE_HDC_LOG=N sets logging level at N.
-# -DENABLE_HDD_IMAGE_LOG=N sets logging level at N.
-# -DENABLE_IDE_LOG=N sets logging level at N.
-# -DENABLE_MO_LOG=N sets logging level at N.
-# -DENABLE_SFF_LOG=N sets logging level at N.
-# -DENABLE_ST506_AT_LOG=N sets logging level at N.
-# -DENABLE_ST506_XT_LOG=N sets logging level at N.
-# -DENABLE_XTA_LOG=N sets logging level at N.
-# -DENABLE_ZIP_LOG=N sets logging level at N.
-# floppy/ logging:
-# -DENABLE_D86F_LOG=N sets logging level at N.
-# -DENABLE_FDC_LOG=N sets logging level at N.
-# -DENABLE_FDD_LOG=N sets logging level at N.
-# -DENABLE_FDI_LOG=N sets logging level at N.
-# -DENABLE_FDI2RAW_LOG=N sets logging level at N.
-# -DENABLE_IMD_LOG=N sets logging level at N.
-# -DENABLE_IMG_LOG=N sets logging level at N.
-# -DENABLE_JSON_LOG=N sets logging level at N.
-# -DENABLE_MFM_LOG=N sets logging level at N.
-# -DENABLE_TD0_LOG=N sets logging level at N.
-# machine/ logging:
-# -DENABLE_AMSTRAD_LOG=N sets logging level at N.
-# -DENABLE_EUROPC_LOG=N sets logging level at N.
-# -DENABLE_M24VID_LOG=N sets logging level at N.
-# -DENABLE_MACHINE_LOG=N sets logging level at N.
-# -DENABLE_PS1_HDC_LOG=N sets logging level at N.
-# -DENABLE_PS2_MCA_LOG=N sets logging level at N.
-# -DENABLE_TANDY_LOG=N sets logging level at N.
-# -DENABLE_T1000_LOG=N sets logging level at N.
-# -DENABLE_T3100E_LOG=N sets logging level at N.
-# network/ logging:
-# -DENABLE_3COM503_LOG=N sets logging level at N.
-# -DENABLE_DP8390_LOG=N sets logging level at N.
-# -DENABLE_NETWORK_LOG=N sets logging level at N.
-# -DENABLE_NE2K_LOG=N sets logging level at N.
-# -DENABLE_PCAP_LOG=N sets logging level at N.
-# -DENABLE_PCNET_LOG=N sets logging level at N.
-# -DENABLE_SLIRP_LOG=N sets logging level at N.
-# -DENABLE_WD_LOG=N sets logging level at N.
-# printer/ logging:
-# -DENABLE_ESCP_LOG=N sets logging level at N.
-# scsi/ logging:
-# -DENABLE_AHA154X_LOG=N sets logging level at N.
-# -DENABLE_BUSLOGIC_LOG=N sets logging level at N.
-# -DENABLE_NCR5380_LOG=N sets logging level at N.
-# -DENABLE_NCR53C8XX_LOG=N sets logging level at N.
-# -DENABLE_SCSI_CDROM_LOG=N sets logging level at N.
-# -DENABLE_SCSI_DISK_LOG=N sets logging level at N.
-# -DENABLE_SPOCK_LOG=N sets logging level at N.
-# -DENABLE_X54X_LOG=N sets logging level at N.
-# sound/ logging:
-# -DENABLE_ADLIB_LOG=N sets logging level at N.
-# -DENABLE_AUDIOPCI_LOG=N sets logging level at N.
-# -DENABLE_EMU8K_LOG=N sets logging level at N.
-# -DENABLE_MPU401_LOG=N sets logging level at N.
-# -DENABLE_PAS16_LOG=N sets logging level at N.
-# -DENABLE_SB_LOG=N sets logging level at N.
-# -DENABLE_SB_DSP_LOG=N sets logging level at N.
-# -DENABLE_SOUND_LOG=N sets logging level at N.
-# video/ logging:
-# -DENABLE_ATI28800_LOG=N sets logging level at N.
-# -DENABLE_MACH64_LOG=N sets logging level at N.
-# -DENABLE_COMPAQ_CGA_LOG=N sets logging level at N.
-# -DENABLE_ET4000W32_LOG=N sets logging level at N.
-# -DENABLE_HT216_LOG=N sets logging level at N.
-# -DENABLE_ICD2061_LOG=N sets logging level at N.
-# -DENABLE_IM1024_LOG=N sets logging level at N.
-# -DENABLE_PGC_LOG=N sets logging level at N.
-# -DENABLE_S3_VIRGE_LOG=N sets logging level at N.
-# -DENABLE_VID_TABLE_LOG=N sets logging level at N.
-# -DENABLE_VIDEO_LOG=N sets logging level at N.
-# -DENABLE_VOODOO_LOG=N sets logging level at N.
-# win/ logging:
-# -DENABLE_WIN_LOG=N sets logging level at N.
-# -DENABLE_DISCORD_LOG=N sets logging level at N.
-# -DENABLE_DYNLD_LOG=N sets logging level at N.
-# -DENABLE_JOYSTICK_LOG=N sets logging level at N.
-# -DENABLE_SDL_LOG=N sets logging level at N.
-# -DENABLE_SETTINGS_LOG=N sets logging level at N.
-EXTRAS :=
-
-
-AUTODEP    := n
-DEBUG      := n
-OPTIM      := n
-X64        := n
-RELEASE    := n
-USB        := n
-VNC        := n
-RDP        := n
-DEV_BUILD  := n
-DEV_BRANCH := n
-CIRRUS     := n
-NE1000     := n
-NV_RIVA    := n
-OPENAL     := y
-FLUIDSYNTH := y
-MUNT       := y
-PAS16      := n
-DYNAREC    := y
-
-
-#########################################################################
-#              Include the master Makefile.MinGW for the rest.          #
-#########################################################################
-include win/Makefile.mingw
-
-
-# End of Makefile.local.
diff --git a/src/acpi.c b/src/acpi.c
index ddd2ffbe7..6ecca841b 100644
--- a/src/acpi.c
+++ b/src/acpi.c
@@ -36,9 +36,14 @@
 #include <86box/pit.h>
 #include <86box/apm.h>
 #include <86box/acpi.h>
+#include <86box/dma.h>
 #include <86box/machine.h>
 #include <86box/i2c.h>
 #include <86box/video.h>
+#include <86box/smbus.h>
+#include <86box/hdc_ide.h>
+#include <86box/hdc_ide_sff8038i.h>
+#include <86box/sis_55xx.h>
 
 int        acpi_rtc_status     = 0;
 atomic_int acpi_pwrbut_pressed = 0;
@@ -46,7 +51,9 @@ int        acpi_enabled        = 0;
 
 static double cpu_to_acpi;
 
-static int    acpi_power_on    = 0;
+static int      acpi_power_on    = 0;
+static uint64_t acpi_last_clock  = 0ULL;
+static int      acpi_count       = 0;
 
 #ifdef ENABLE_ACPI_LOG
 int acpi_do_log = ENABLE_ACPI_LOG;
@@ -82,65 +89,158 @@ acpi_timer_get(acpi_t *dev)
         return clock & 0xffffff;
 }
 
+static uint8_t
+acpi_gp_timer_get(UNUSED(acpi_t *dev))
+{
+    uint64_t clock = acpi_clock_get();
+    clock -= acpi_last_clock;
+    if (clock >= acpi_count)
+        clock = 0x00;
+    else
+        clock &= 0xff;
+    return clock;
+}
+
 static double
 acpi_get_overflow_period(acpi_t *dev)
 {
     uint64_t timer = acpi_clock_get();
     uint64_t overflow_time;
 
-    if (dev->regs.timer32) {
+    if (dev->regs.timer32)
         overflow_time = (timer + 0x80000000LL) & ~0x7fffffffLL;
-    } else {
+    else
         overflow_time = (timer + 0x800000LL) & ~0x7fffffLL;
-    }
 
     uint64_t time_to_overflow = overflow_time - timer;
 
     return ((double) time_to_overflow / (double) ACPI_TIMER_FREQ) * 1000000.0;
 }
 
+static void
+acpi_timer_update(acpi_t *dev, bool enable)
+{
+    if (enable)
+        timer_on_auto(&dev->timer, acpi_get_overflow_period(dev));
+    else
+        timer_stop(&dev->timer);
+}
+
 static void
 acpi_timer_overflow(void *priv)
 {
     acpi_t *dev = (acpi_t *) priv;
     dev->regs.pmsts |= TMROF_STS;
     acpi_update_irq(dev);
+    acpi_timer_update(dev, (dev->regs.pmen & TMROF_EN) && !(dev->regs.pmsts & TMROF_STS));
 }
 
 static void
-acpi_timer_update(acpi_t *dev, bool enable)
+acpi_gp_timer_update(acpi_t *dev, bool enable, int count)
 {
     if (enable) {
-        timer_on_auto(&dev->timer, acpi_get_overflow_period(dev));
-    } else {
+        acpi_last_clock = acpi_clock_get();
+        acpi_count = count;
+        timer_on_auto(&dev->gp_timer, (1000000.0 / (double) ACPI_TIMER_FREQ) * ((double) count));
+    } else
         timer_stop(&dev->timer);
+}
+
+void
+acpi_sis5595_smi_raise(void *priv)
+{
+    acpi_t *dev = (acpi_t *) priv;
+    if (dev->regs.leg_en & 0x20) {
+        dev->regs.leg_sts |= 0x20;
+        smi_raise();
     }
 }
 
+static void
+acpi_gp_timer(void *priv)
+{
+    acpi_t *dev = (acpi_t *) priv;
+    if (dev->vendor == VEN_SIS_5595_1997) {
+        dev->regs.gpe_sts |= 0x20000000;
+        dev->regs.leg_sts |= 0x20;
+        acpi_gp_timer_update(dev, (dev->regs.gpe_en & 0x20000000), acpi_count);
+        acpi_sis5595_smi_raise(dev);
+    } else if (dev->vendor == VEN_SIS_5595) {
+        dev->regs.gpe_sts |= 0x00000400;
+        dev->regs.leg_sts |= 0x20;
+        acpi_gp_timer_update(dev, (dev->regs.gpe_en & 0x00000400), acpi_count);
+        acpi_sis5595_smi_raise(dev);
+    } else {
+        dev->regs.reg_14 |= 0x2000;
+        acpi_gp_timer_update(dev, (dev->regs.reg_16 & 0x2000), acpi_count);
+        smi_raise();
+    }
+}
+
+static void
+acpi_per_timer(void *priv)
+{
+    acpi_t *dev = (acpi_t *) priv;
+    if (dev->vendor >= VEN_SIS_5595_1997) {
+        dev->regs.leg_sts |= 0x04;
+        acpi_sis5595_smi_raise(dev);
+    } else {
+        dev->regs.reg_25 |= 0x04;
+        smi_raise();
+    }
+    timer_on_auto(&dev->per_timer, 16000000.0);
+}
+
 void
 acpi_update_irq(acpi_t *dev)
 {
     int sci_level = (dev->regs.pmsts & dev->regs.pmen) & (RTC_EN | PWRBTN_EN | GBL_EN | TMROF_EN);
-    if (dev->vendor == VEN_SMC)
-        sci_level |= (dev->regs.pmsts & BM_STS);
+    sis_55xx_common_t *sis = (sis_55xx_common_t *) dev->priv;
 
-    if ((dev->regs.pmcntrl & 0x01) && sci_level) {
-        if (dev->irq_mode == 1)
-            pci_set_irq(dev->slot, dev->irq_pin, &dev->irq_state);
-        else if (dev->irq_mode == 2)
-            pci_set_mirq(5, dev->mirq_is_level, &dev->irq_state);
-        else
-            picintlevel(1 << dev->irq_line, &dev->irq_state);
-    } else {
-        if (dev->irq_mode == 1)
-            pci_clear_irq(dev->slot, dev->irq_pin, &dev->irq_state);
-        else if (dev->irq_mode == 2)
-            pci_clear_mirq(5, dev->mirq_is_level, &dev->irq_state);
-        else
-            picintclevel(1 << dev->irq_line, &dev->irq_state);
+    switch (dev->vendor) {
+        case VEN_SMC:
+            sci_level |= (dev->regs.pmsts & BM_STS);
+            break;
+        case VEN_SIS_5595_1997:
+        case VEN_SIS_5595:
+            if ((sis != NULL) && (sis->pmu_regs != NULL)) {
+                sci_level |= (sis->pmu_regs[0x80] | sis->pmu_regs[0x81] |
+                              sis->pmu_regs[0x82] | sis->pmu_regs[0x83]);
+            }
+            break;
     }
 
-    acpi_timer_update(dev, (dev->regs.pmen & TMROF_EN) && !(dev->regs.pmsts & TMROF_STS));
+    if ((dev->regs.pmcntrl & 0x01) && sci_level)  switch (dev->irq_mode) {
+        default:
+            if (dev->irq_line != 0)
+                picintlevel(1 << dev->irq_line, &dev->irq_state);
+            else
+                dev->irq_state = 1;
+            break;
+        case 1:
+            pci_set_irq(dev->slot, dev->irq_pin, &dev->irq_state);
+            break;
+        case 2:
+            pci_set_mirq(5, dev->mirq_is_level, &dev->irq_state);
+            break;
+        case -1:
+            break;
+    } else  switch (dev->irq_mode) {
+        default:
+            if (dev->irq_line != 0)
+                picintclevel(1 << dev->irq_line, &dev->irq_state);
+            else
+                dev->irq_state = 0;
+            break;
+        case 1:
+            pci_clear_irq(dev->slot, dev->irq_pin, &dev->irq_state);
+            break;
+        case 2:
+            pci_clear_mirq(5, dev->mirq_is_level, &dev->irq_state);
+            break;
+        case -1:
+            break;
+    }
 }
 
 void
@@ -652,6 +752,230 @@ acpi_aux_reg_read_smc(UNUSED(int size), uint16_t addr, void *priv)
     return ret;
 }
 
+static uint32_t
+acpi_reg_read_sis_5582(int size, uint16_t addr, void *priv)
+{
+    const acpi_t  *dev = (acpi_t *) priv;
+    uint32_t       ret = 0x00000000;
+    int            shift16;
+    int            shift32;
+
+    addr &= 0x3f;
+    shift16 = (addr & 1) << 3;
+    shift32 = (addr & 3) << 3;
+
+    switch (addr) {
+        case 0x0c:
+        case 0x0d:
+        case 0x0e:
+        case 0x0f:
+            ret = (dev->regs.reg_0c >> shift32) & 0xff;
+            break;
+        case 0x10:
+            ret = dev->regs.enter_c2_ps;
+            break;
+        case 0x11:
+            ret = dev->regs.enter_c3_ps;
+            break;
+        case 0x12:
+            ret = dev->regs.reg_12;
+            break;
+        case 0x13:
+            ret = acpi_gp_timer_get((acpi_t *) dev) & 0xff;
+#ifdef USE_DYNAREC
+            if (cpu_use_dynarec)
+                update_tsc();
+#endif
+            break;
+        case 0x14:
+        case 0x15:
+            ret = (dev->regs.reg_14 >> shift16) & 0xff;
+            break;
+        case 0x16:
+        case 0x17:
+            ret = (dev->regs.reg_16 >> shift16) & 0xff;
+            break;
+        case 0x18:
+        case 0x19:
+            ret = (dev->regs.reg_18 >> shift16) & 0xff;
+            break;
+        case 0x1a:
+        case 0x1b:
+            ret = (dev->regs.reg_18 >> shift16) & 0xff;
+            break;
+        case 0x1c:
+        case 0x1d:
+            ret = (dev->regs.reg_1c >> shift16) & 0xff;
+            break;
+        case 0x20:
+            ret = dev->regs.smi_cmd;
+            break;
+        case 0x24:
+            ret = dev->regs.reg_24;
+            break;
+        case 0x25:
+            ret = dev->regs.reg_25;
+            break;
+        case 0x26:
+            ret = dev->regs.reg_26;
+            break;
+        case 0x28:
+            ret = dev->regs.smi_en_val;
+            break;
+        case 0x29:
+            ret = dev->regs.smi_dis_val;
+            break;
+        case 0x2a:
+            ret = dev->regs.mail_box;
+            break;
+        case 0x2b:
+            ret = dev->regs.reg_2b;
+            break;
+        default:
+            ret = acpi_reg_read_common_regs(size, addr, priv);
+            break;
+    }
+
+#ifdef ENABLE_ACPI_LOG
+        // if (size != 1)
+        // acpi_log("(%i) ACPI Read  (%i) %02X: %02X\n", in_smm, size, addr, ret);
+#endif
+    return ret;
+}
+
+static uint32_t
+acpi_reg_read_sis_5595(int size, uint16_t addr, void *priv)
+{
+    const acpi_t  *dev = (acpi_t *) priv;
+    uint32_t       ret = 0x00000000;
+    int            shift16;
+    int            shift32;
+
+    addr &= 0x3f;
+    shift16 = (addr & 1) << 3;
+    shift32 = (addr & 3) << 3;
+
+    switch (addr) {
+        case 0x0c:
+        case 0x0d:
+        case 0x0e:
+        case 0x0f:
+            ret = (dev->regs.reg_0c >> shift32) & 0xff;
+            break;
+        case 0x10:
+            ret = dev->regs.enter_c2_ps;
+            break;
+        case 0x11:
+            ret = dev->regs.enter_c3_ps;
+            break;
+        case 0x12:
+            ret = dev->regs.reg_12;
+            break;
+        case 0x13:
+            ret = dev->regs.reg_13;
+            break;
+        case 0x14:
+        case 0x15:
+        case 0x16:
+        case 0x17:
+            ret = (dev->regs.gpe_sts >> shift32) & 0xff;
+            break;
+        case 0x18:
+        case 0x19:
+        case 0x1a:
+        case 0x1b:
+            ret = (dev->regs.gpe_en >> shift32) & 0xff;
+            break;
+        case 0x1c:
+        case 0x1d:
+        case 0x1e:
+            ret = (dev->regs.gpe_pin >> shift32) & 0xff;
+            break;
+        case 0x1f:
+            ret = acpi_gp_timer_get((acpi_t *) dev) & 0xff;
+#ifdef USE_DYNAREC
+            if (cpu_use_dynarec)
+                update_tsc();
+#endif
+            break;
+        case 0x20:
+        case 0x21:
+        case 0x22:
+        case 0x23:
+            ret = (dev->regs.gpe_io >> shift32) & 0xff;
+            break;
+        case 0x24:
+        case 0x25:
+        case 0x26:
+        case 0x27:
+            ret = (dev->regs.gpe_pol >> shift32) & 0xff;
+            break;
+        case 0x28:
+        case 0x29:
+            ret = (dev->regs.gpe_mul >> shift16) & 0xff;
+            break;
+        case 0x2a:
+        case 0x2b:
+            ret = (dev->regs.gpe_ctl >> shift16) & 0xff;
+            break;
+        case 0x2c:
+        case 0x2d:
+            ret = (dev->regs.gpe_smi >> shift16) & 0xff;
+            break;
+        case 0x2e:
+        case 0x2f:
+            ret = (dev->regs.gpe_rl >> shift16) & 0xff;
+            break;
+        case 0x30:
+            ret = dev->regs.leg_sts;
+            break;
+        case 0x31:
+            ret = dev->regs.leg_en;
+            break;
+        case 0x32:
+            if (dev->vendor == VEN_SIS_5595_1997)
+                ret = dev->regs.smi_cmd;
+            else
+                ret = 0x00;
+            break;
+        case 0x33:
+            ret = dev->regs.tst_ctl;
+            break;
+        case 0x34:
+            if (dev->vendor == VEN_SIS_5595_1997)
+                ret = dev->regs.smi_en_val;
+            else
+                ret = dev->regs.reg_34;
+            break;
+        case 0x35:
+            if (dev->vendor == VEN_SIS_5595_1997)
+                ret = dev->regs.smi_dis_val;
+            else
+                ret = dev->regs.smi_cmd;
+            break;
+        case 0x36:
+            ret = dev->regs.mail_box;
+            break;
+        case 0x38:
+            if (dev->vendor == VEN_SIS_5595)
+                ret = smbus_sis5595_read_index(dev->smbus);
+            break;
+        case 0x39:
+            if (dev->vendor == VEN_SIS_5595)
+                ret = smbus_sis5595_read_data(dev->smbus);
+            break;
+        default:
+            ret = acpi_reg_read_common_regs(size, addr, priv);
+            break;
+    }
+
+#ifdef ENABLE_ACPI_LOG
+        // if (size != 1)
+        // acpi_log("(%i) ACPI Read  (%i) %02X: %02X\n", in_smm, size, addr, ret);
+#endif
+    return ret;
+}
+
 static void
 acpi_reg_write_common_regs(UNUSED(int size), uint16_t addr, uint8_t val, void *priv)
 {
@@ -702,8 +1026,13 @@ acpi_reg_write_common_regs(UNUSED(int size), uint16_t addr, uint8_t val, void *p
                         nvr_reg_write(0x000f, 0xff, dev->nvr);
                     }
 
-                    if (sus_typ & SUS_RESET_PCI)
+                    if (sus_typ & SUS_RESET_PCI) {
+                        /* DMA is part of the southbridge so it responds to PCI reset. */
+                        dma_reset();
+                        dma_set_at(1);
+
                         device_reset_all(DEVICE_PCI);
+                    }
 
                     if (sus_typ & SUS_RESET_CPU)
                         cpu_alt_reset = 0;
@@ -1193,22 +1522,408 @@ acpi_aux_reg_write_smc(UNUSED(int size), uint16_t addr, uint8_t val, void *priv)
     }
 }
 
+void
+acpi_sis5582_pmu_event(void *priv)
+{
+    acpi_t *dev = (acpi_t *) priv;
+
+    dev->regs.reg_25 |= 0x02;
+    if (dev->regs.reg_26 & 0x02)
+        smi_raise();
+}
+
+static void
+acpi_reg_write_sis_5582(int size, uint16_t addr, uint8_t val, void *priv)
+{
+    acpi_t *dev = (acpi_t *) priv;
+    int     shift16;
+    int     shift32;
+    uint8_t old;
+
+    addr &= 0x3f;
+#ifdef ENABLE_ACPI_LOG
+    if (size != 1)
+        acpi_log("(%i) ACPI Write (%i) %02X: %02X\n", in_smm, size, addr, val);
+#endif
+    shift16 = (addr & 1) << 3;
+    shift32 = (addr & 3) << 3;
+
+    switch (addr) {
+        case 0x0c:
+        case 0x0d:
+        case 0x0e:
+        case 0x0f:
+            dev->regs.reg_0c &= ~((val << shift32) & 0x007e);
+            break;
+        case 0x10:
+            dev->regs.enter_c2_ps = val;
+            break;
+        case 0x11:
+            dev->regs.enter_c3_ps = val;
+            break;
+        case 0x12:
+            dev->regs.reg_12 = val & 0x01;
+            break;
+        case 0x13:
+            dev->regs.reg_13 = val;
+            acpi_gp_timer_update(dev, (val != 0x00) && (dev->regs.reg_16 & 0x2000), val);
+            break;
+        case 0x14:
+        case 0x15:
+            dev->regs.reg_14 &= ~((val << shift32) & 0xff9f);
+            break;
+        case 0x16:
+        case 0x17:
+            dev->regs.reg_16 = ((dev->regs.reg_16 & ~(0xff << shift16)) | (val << shift16)) & 0xff1f;
+            break;
+        case 0x18:
+        case 0x19:
+            dev->regs.reg_18 = ((dev->regs.reg_18 & ~(0xff << shift16)) | (val << shift16)) & 0x07ff;
+            break;
+        case 0x1a:
+        case 0x1b:
+            dev->regs.reg_1a = ((dev->regs.reg_1a & ~(0xff << shift16)) | (val << shift16)) & 0x0387;
+            break;
+        case 0x1c:
+        case 0x1d:
+            dev->regs.reg_1c = ((dev->regs.reg_1c & ~(0xff << shift16)) | (val << shift16)) & 0x3f7f;
+            /* Setting BIOS_RLS also sets GBL_STS and generates SMI. */
+            if (dev->regs.reg_1c & 0x0400) {
+                dev->regs.pmsts |= 0x20;
+                if (dev->regs.pmen & 0x20)
+                    acpi_update_irq(dev);
+            }
+            break;
+        case 0x20:
+            /* SMI Command Port */
+            dev->regs.smi_cmd = val;
+            if (val == dev->regs.smi_en_val) {
+                dev->regs.reg_25 |= 0x08;
+                if (dev->regs.reg_26 & 0x08)
+                    smi_raise();
+            } else if (val == dev->regs.smi_dis_val) {
+                dev->regs.reg_25 |= 0x10;
+                if (dev->regs.reg_26 & 0x10)
+                    smi_raise();
+            }
+            break;
+        case 0x24:
+            dev->regs.reg_24 = val & 0x43;
+            break;
+        case 0x25:
+            dev->regs.reg_25 &= ~(val & 0x1f);
+            break;
+        case 0x26:
+            old = dev->regs.reg_26;
+            dev->regs.reg_26 = val & 0x3f;
+            if (!(old & 0x04) && (val & 0x04))
+                timer_on_auto(&dev->per_timer, 16000000.0);
+            else if ((old & 0x04) && !(val & 0x04))
+                timer_stop(&dev->per_timer);
+            break;
+        case 0x28:
+            dev->regs.smi_en_val = val;
+            break;
+        case 0x29:
+            dev->regs.smi_dis_val = val;
+            break;
+        case 0x2a:
+            dev->regs.mail_box = val;
+            break;
+        case 0x2b:
+            dev->regs.reg_2b = val & 0x01;
+            break;
+        default:
+            acpi_reg_write_common_regs(size, addr, val, priv);
+            /* Setting GBL_RLS also sets BIOS_STS and generates SMI. */
+            if ((addr == 0x00) && !(dev->regs.pmsts & 0x20))
+                dev->regs.reg_1c &= ~0x0400;
+            else if ((addr == 0x04) && (dev->regs.pmcntrl & 0x0004)) {
+                dev->regs.reg_25 |= 0x01;
+                if (dev->regs.reg_26 & 0x01)
+                    acpi_raise_smi(dev, 1);
+            }
+            break;
+    }
+}
+
+void
+acpi_sis5595_pmu_event(void *priv)
+{
+    acpi_t *dev = (acpi_t *) priv;
+
+    if (dev->vendor == VEN_SIS_5595_1997)
+        acpi_sis5595_smi_raise(dev);
+    else if (dev->regs.gpe_en & 0x00001000) {
+        dev->regs.gpe_sts |= 0x00001000;
+        acpi_sis5595_smi_raise(dev);
+    }
+}
+
+void
+acpi_sis5595_smbus_event(void *priv)
+{
+    acpi_t *dev = (acpi_t *) priv;
+
+    if (dev->regs.gpe_en & 0x00000800) {
+        dev->regs.gpe_sts |= 0x00000800;
+        acpi_sis5595_smi_raise(dev);
+    }
+}
+
+void
+acpi_sis5595_software_smi(void *priv)
+{
+    acpi_t *dev = (acpi_t *) priv;
+
+    if (dev->regs.leg_en & 0x01) {
+        dev->regs.leg_sts |= 0x01;
+        acpi_sis5595_smi_raise(dev);
+    }
+}
+
+static void
+acpi_reg_write_sis_5595(int size, uint16_t addr, uint8_t val, void *priv)
+{
+    acpi_t *dev = (acpi_t *) priv;
+    int     shift16;
+    int     shift32;
+    uint8_t old;
+    uint8_t do_smi = 0;
+
+    addr &= 0x3f;
+#ifdef ENABLE_ACPI_LOG
+    if (size != 1)
+        acpi_log("(%i) ACPI Write (%i) %02X: %02X\n", in_smm, size, addr, val);
+#endif
+    shift16 = (addr & 1) << 3;
+    shift32 = (addr & 3) << 3;
+
+    switch (addr) {
+        case 0x0c:
+        case 0x0d:
+        case 0x0e:
+        case 0x0f:
+            dev->regs.reg_0c &= ~((val << shift32) & 0x001e);
+            break;
+        case 0x10:
+            dev->regs.enter_c2_ps = val;
+            break;
+        case 0x11:
+            dev->regs.enter_c3_ps = val;
+            break;
+        case 0x12:
+            dev->regs.reg_12 = val & 0x01;
+            break;
+        case 0x13:
+            dev->regs.reg_13 = val;
+            /* Setting BIOS_RLS also sets GBL_STS and generates SMI. */
+            if (dev->regs.reg_13 & 0x02) {
+                dev->regs.pmsts |= 0x20;
+                if (dev->regs.pmen & 0x20)
+                    acpi_update_irq(dev);
+            }
+            break;
+        case 0x14:
+        case 0x15:
+        case 0x16:
+        case 0x17:
+            if (dev->vendor == VEN_SIS_5595_1997)
+                dev->regs.gpe_sts &= ~((val << shift32) & 0xff03ffbf);
+            else
+                dev->regs.gpe_sts &= ~((val << shift32) & 0xff83ffff);
+            break;
+        case 0x18:
+        case 0x19:
+        case 0x1a:
+        case 0x1b:
+            if (dev->vendor == VEN_SIS_5595_1997)
+                dev->regs.gpe_en = ((dev->regs.gpe_en & ~(0xff << shift32)) | (val << shift32));
+            else
+                dev->regs.gpe_en = ((dev->regs.gpe_en & ~(0xff << shift32)) |
+                                   (val << shift32)) & 0xff83ffff;
+            break;
+        case 0x1c:
+            dev->regs.gpe_pin = ((dev->regs.gpe_pin & ~(0xff << shift32)) | ((val & 0xff) << shift32));
+            if (!strcmp(machine_get_internal_name(), "m747") && (val & 0x10) &&
+                !(dev->regs.gpe_io & 0x00000010))
+                resetx86();
+            break;
+        case 0x1d:
+            dev->regs.gpe_pin = ((dev->regs.gpe_pin & ~(0x0f << shift32)) | ((val & 0x0f) << shift32));
+            break;
+        case 0x1e:
+            dev->regs.gpe_pin = ((dev->regs.gpe_pin & ~(0x03 << shift32)) | ((val & 0x03) << shift32));
+            break;
+        case 0x1f:
+            dev->regs.gp_tmr = val;
+            acpi_gp_timer_update(dev, (val != 0x00) && (dev->regs.gpe_en & 0x00000400), val);
+            break;
+        case 0x20:
+            dev->regs.gpe_io = ((dev->regs.gpe_io & ~(0x9f << shift32)) | ((val & 0x9f) << shift32));
+            break;
+        case 0x21:
+            dev->regs.gpe_io = ((dev->regs.gpe_io & ~(0x0f << shift32)) | ((val & 0x0f) << shift32));
+            break;
+        case 0x22:
+            dev->regs.gpe_io = ((dev->regs.gpe_io & ~(0x03 << shift32)) | ((val & 0x03) << shift32));
+            break;
+        case 0x24:
+            dev->regs.gpe_pol = ((dev->regs.gpe_pol & ~(0xbf << shift32)) | ((val & 0xbf) << shift32));
+            break;
+        case 0x25:
+            dev->regs.gpe_pol = ((dev->regs.gpe_pol & ~(0x0f << shift32)) | ((val & 0x0f) << shift32));
+            break;
+        case 0x26:
+            dev->regs.gpe_pol = ((dev->regs.gpe_pol & ~(0x03 << shift32)) | ((val & 0x03) << shift32));
+            break;
+        case 0x27:
+            dev->regs.gpe_pol = ((dev->regs.gpe_pol & ~(0x10 << shift32)) | ((val & 0x10) << shift32));
+            break;
+        case 0x28:
+            dev->regs.gpe_mul = ((dev->regs.gpe_mul & ~(0xf9 << shift16)) | ((val & 0xf9) << shift16));
+            break;
+        case 0x29:
+            dev->regs.gpe_mul = ((dev->regs.gpe_mul & ~(0x13 << shift16)) | ((val & 0x13) << shift16));
+            break;
+        case 0x2a:
+        case 0x2b:
+            dev->regs.gpe_ctl = ((dev->regs.gpe_ctl & ~(0xff << shift16)) | ((val & 0xff) << shift16));
+            break;
+        case 0x2c:
+        case 0x2d:
+            dev->regs.gpe_smi = ((dev->regs.gpe_smi & ~(0xff << shift16)) | ((val & 0xff) << shift16));
+            break;
+        case 0x2e:
+        case 0x2f:
+            dev->regs.gpe_rl = ((dev->regs.gpe_rl & ~(0xff << shift16)) | ((val & 0xff) << shift16));
+            break;
+        case 0x30:
+            dev->regs.leg_sts &= ~val;
+            break;
+        case 0x31:
+            old = dev->regs.leg_en;
+            dev->regs.leg_en = val;
+            if (!(old & 0x04) && (val & 0x04))
+                timer_on_auto(&dev->per_timer, 16000000.0);
+            else if ((old & 0x04) && !(val & 0x04))
+                timer_stop(&dev->per_timer);
+            break;
+        case 0x32:
+            if (dev->vendor == VEN_SIS_5595_1997) {
+                /* SMI Command Port */
+                dev->regs.smi_cmd = val;
+                if (val == dev->regs.smi_en_val) {
+                    dev->regs.leg_sts |= 0x08;
+                    if (dev->regs.leg_en & 0x08)
+                        acpi_sis5595_smi_raise(dev);
+                } else if (val == dev->regs.smi_dis_val) {
+                    dev->regs.leg_sts |= 0x10;
+                    if (dev->regs.leg_en & 0x10)
+                        acpi_sis5595_smi_raise(dev);
+                }
+            }
+            break;
+        case 0x33:
+            dev->regs.tst_ctl = val & 0x01;
+            break;
+        case 0x34:
+            if (dev->vendor == VEN_SIS_5595_1997)
+                dev->regs.smi_en_val = val;
+            else
+                dev->regs.reg_34 = val;
+            break;
+        case 0x35:
+            if (dev->vendor == VEN_SIS_5595_1997)
+                dev->regs.smi_dis_val = val;
+            else {
+                /* SMI Command Port */
+                dev->regs.smi_cmd = val;
+                dev->regs.leg_sts |= 0x10;
+                if (dev->regs.leg_en & 0x10)
+                    acpi_sis5595_smi_raise(dev);
+            }
+            break;
+        case 0x36:
+            dev->regs.mail_box = val;
+            break;
+        case 0x38:
+            if (dev->vendor == VEN_SIS_5595) {
+                dev->regs.index = val;
+                smbus_sis5595_write_index(dev->smbus, val);
+            }
+            break;
+        case 0x39:
+            if (dev->vendor == VEN_SIS_5595) {
+                dev->regs.reg_ff = val & 0x3f;
+                smbus_sis5595_write_data(dev->smbus, val);
+                if (val & 0x20) {           /* Set GPIO5_STS of GPE_STS */
+                    dev->regs.gpe_sts |= 0x00000008;
+                    do_smi |= (dev->regs.gpe_en & 0x00000004);
+                } else if (val & 0x10) {    /* Set GPIO10_STS of GPE_STS */
+                    dev->regs.gpe_sts |= 0x00000004;
+                    do_smi |= (dev->regs.gpe_en & 0x00000008);
+                } else if (val & 0x08) {    /* Set RI_STS in GPE_STS */
+                    dev->regs.gpe_sts |= 0x00000002;
+                    do_smi |= (dev->regs.gpe_en & 0x00000002);
+                } else if (val & 0x04)      /* Set WAK_STS of PM1_STS */
+                    dev->regs.pmsts |= 0x8000;
+                else if (val & 0x02) {      /* Set RTC_STS of PM1_STS */
+                    dev->regs.pmsts |= 0x0400;
+                    do_smi |= (dev->regs.pmen & 0x0400);
+                } else if (val & 0x01) {    /* Set PWRBTN_STS of PM1_STS */
+                    dev->regs.pmsts |= 0x0100;
+                    do_smi |= (dev->regs.pmen & 0x0100);
+                }
+
+                if (do_smi)
+                    acpi_sis5595_smi_raise(dev);
+            }
+            break;
+        default:
+            acpi_reg_write_common_regs(size, addr, val, priv);
+            /* Setting GBL_RLS also sets BIOS_STS and generates SMI. */
+            if ((addr == 0x00) && !(dev->regs.pmsts & 0x20))
+                dev->regs.reg_13 &= ~0x02;
+            else if ((addr == 0x04) && (dev->regs.pmcntrl & 0x0004)) {
+                dev->regs.leg_sts |= 0x01;
+                if (dev->regs.leg_en & 0x01)
+                    acpi_sis5595_smi_raise(dev);
+            }
+            break;
+    }
+}
+
 static uint32_t
 acpi_reg_read_common(int size, uint16_t addr, void *priv)
 {
     const acpi_t *dev = (acpi_t *) priv;
     uint8_t ret = 0xff;
 
-    if (dev->vendor == VEN_ALI)
-        ret = acpi_reg_read_ali(size, addr, priv);
-    else if (dev->vendor == VEN_VIA)
-        ret = acpi_reg_read_via(size, addr, priv);
-    else if (dev->vendor == VEN_VIA_596B)
-        ret = acpi_reg_read_via_596b(size, addr, priv);
-    else if (dev->vendor == VEN_INTEL)
-        ret = acpi_reg_read_intel(size, addr, priv);
-    else if (dev->vendor == VEN_SMC)
-        ret = acpi_reg_read_smc(size, addr, priv);
+    switch (dev->vendor) {
+        case VEN_ALI:
+            ret = acpi_reg_read_ali(size, addr, priv);
+            break;
+        case VEN_VIA:
+            ret = acpi_reg_read_via(size, addr, priv);
+            break;
+        case VEN_VIA_596B:
+            ret = acpi_reg_read_via_596b(size, addr, priv);
+            break;
+        case VEN_INTEL:
+            ret = acpi_reg_read_intel(size, addr, priv);
+            break;
+        case VEN_SMC:
+            ret = acpi_reg_read_smc(size, addr, priv);
+            break;
+        case VEN_SIS_5582:
+            ret = acpi_reg_read_sis_5582(size, addr, priv);
+            break;
+        case VEN_SIS_5595_1997:
+        case VEN_SIS_5595:
+            ret = acpi_reg_read_sis_5595(size, addr, priv);
+            break;
+    }
 
     return ret;
 }
@@ -1218,16 +1933,30 @@ acpi_reg_write_common(int size, uint16_t addr, uint8_t val, void *priv)
 {
     const acpi_t *dev = (acpi_t *) priv;
 
-    if (dev->vendor == VEN_ALI)
-        acpi_reg_write_ali(size, addr, val, priv);
-    else if (dev->vendor == VEN_VIA)
-        acpi_reg_write_via(size, addr, val, priv);
-    else if (dev->vendor == VEN_VIA_596B)
-        acpi_reg_write_via_596b(size, addr, val, priv);
-    else if (dev->vendor == VEN_INTEL)
-        acpi_reg_write_intel(size, addr, val, priv);
-    else if (dev->vendor == VEN_SMC)
-        acpi_reg_write_smc(size, addr, val, priv);
+    switch (dev->vendor) {
+        case VEN_ALI:
+            acpi_reg_write_ali(size, addr, val, priv);
+            break;
+        case VEN_VIA:
+            acpi_reg_write_via(size, addr, val, priv);
+            break;
+        case VEN_VIA_596B:
+            acpi_reg_write_via_596b(size, addr, val, priv);
+            break;
+        case VEN_INTEL:
+            acpi_reg_write_intel(size, addr, val, priv);
+            break;
+        case VEN_SMC:
+            acpi_reg_write_smc(size, addr, val, priv);
+            break;
+        case VEN_SIS_5582:
+            acpi_reg_write_sis_5582(size, addr, val, priv);
+            break;
+        case VEN_SIS_5595_1997:
+        case VEN_SIS_5595:
+            acpi_reg_write_sis_5595(size, addr, val, priv);
+            break;
+    }
 }
 
 static uint32_t
@@ -1396,6 +2125,9 @@ acpi_update_io_mapping(acpi_t *dev, uint32_t base, int chipset_en)
         default:
         case VEN_ALI:
         case VEN_INTEL:
+        case VEN_SIS_5582:
+        case VEN_SIS_5595_1997:
+        case VEN_SIS_5595:
             size = 0x040;
             break;
         case VEN_SMC:
@@ -1641,26 +2373,40 @@ acpi_reset(void *priv)
         dev->regs.gporeg[i] = dev->gporeg_default[i];
     if (dev->vendor == VEN_VIA_596B) {
         dev->regs.gpo_val = 0x7fffffff;
-        /* FIC VA-503A:
-           - Bit 11: ATX power (active high)
-           - Bit  4: 80-conductor cable on primary IDE channel (active low)
-           - Bit  3: 80-conductor cable on secondary IDE channel (active low)
-           - Bit  2: password cleared (active low)
-           ASUS P3V4X:
-           - Bit 15: 80-conductor cable on secondary IDE channel (active low)
-           - Bit  5: 80-conductor cable on primary IDE channel (active low)
-           BCM GT694VA:
-           - Bit 19: 80-conductor cable on secondary IDE channel (active low)
-           - Bit 17: 80-conductor cable on primary IDE channel (active low)
-           ASUS CUV4X-LS:
-           - Bit  2: 80-conductor cable on secondary IDE channel (active low)
-           - Bit  1: 80-conductor cable on primary IDE channel (active low)
-           Acorp 6VIA90AP:
-           - Bit  3: 80-conductor cable on secondary IDE channel (active low)
-           - Bit  1: 80-conductor cable on primary IDE channel (active low) */
+        /*
+           - FIC VA-503A:
+               - Bit 11: ATX power (active high);
+               - Bit  4: 80-conductor cable on primary IDE channel (active low);
+               - Bit  3: 80-conductor cable on secondary IDE channel (active low);
+               - Bit  2: password cleared (active low).
+           - ASUS P3V4X:
+               - Bit 15: 80-conductor cable on secondary IDE channel (active low);
+               - Bit  5: 80-conductor cable on primary IDE channel (active low).
+           - BCM GT694VA:
+               - Bit 19: 80-conductor cable on secondary IDE channel (active low);
+               - Bit 17: 80-conductor cable on primary IDE channel (active low).
+           - ASUS CUV4X-LS:
+               - Bit  2: 80-conductor cable on secondary IDE channel (active low);
+               - Bit  1: 80-conductor cable on primary IDE channel (active low).
+           - Acorp 6VIA90AP:
+               - Bit  3: 80-conductor cable on secondary IDE channel (active low);
+               - Bit  1: 80-conductor cable on primary IDE channel (active low).
+           - FIC KA-6130:
+               - Bit 19: password cleared (active low).
+         */
         dev->regs.gpi_val = 0xfff57fc1;
         if (!strcmp(machine_get_internal_name(), "ficva503a") || !strcmp(machine_get_internal_name(), "6via90ap"))
             dev->regs.gpi_val |= 0x00000004;
+        else if (!strcmp(machine_get_internal_name(), "ficka6130"))
+            dev->regs.gpi_val |= 0x00080000;
+         /*
+            TriGem Delhi-III second GPI word:
+                - Bit 7 = Save CMOS (must be set);
+                - Bit 6 = Password jumper (must be set);
+                - Bit 5 = Enable Setup (must be set).
+         */
+        else if (!strcmp(machine_get_internal_name(), "delhi3"))
+            dev->regs.gpi_val |= 0x00008000;
     }
 
     if (acpi_power_on) {
@@ -1677,6 +2423,20 @@ acpi_reset(void *priv)
 
     acpi_update_irq(dev);
     dev->irq_state = 0;
+
+    timer_disable(&dev->gp_timer);
+
+    acpi_last_clock = 0ULL;
+    acpi_count = 0;
+
+    timer_disable(&dev->per_timer);
+
+    if ((dev->vendor == VEN_SIS_5595_1997) || (dev->vendor == VEN_SIS_5595)) {
+        dev->regs.reg_13 = 0x20;
+        dev->regs.gp_tmr = 0xff;
+        dev->regs.gpe_io = 0x00030b9f;
+        dev->regs.gpe_mul = 0x1001;
+    }
 }
 
 static void
@@ -1689,6 +2449,33 @@ acpi_speed_changed(void *priv)
 
     if (timer_enabled)
         timer_on_auto(&dev->timer, acpi_get_overflow_period(dev));
+
+    if ((dev->vendor & 0xffff) == 0x1039) {
+        if (timer_is_on(&dev->gp_timer)) {
+            timer_stop(&dev->gp_timer);
+
+            if (dev->vendor == VEN_SIS_5595_1997)
+                acpi_gp_timer_update(dev, (dev->regs.gpe_en & 0x20000000), acpi_count);
+            else if (dev->vendor == VEN_SIS_5595)
+                acpi_gp_timer_update(dev, (dev->regs.gpe_en & 0x00000400), acpi_count);
+            else
+                acpi_gp_timer_update(dev, (dev->regs.reg_16 & 0x2000), acpi_count);
+        }
+
+        if (timer_is_on(&dev->per_timer)) {
+            timer_stop(&dev->per_timer);
+
+            timer_on_auto(&dev->per_timer, 16000000.0);
+        }
+    }
+}
+
+void *
+acpi_get_smbus(void *priv)
+{
+    acpi_t *dev        = (acpi_t *) priv;
+
+    return dev->smbus;
 }
 
 static void
@@ -1712,10 +2499,9 @@ acpi_init(const device_t *info)
 {
     acpi_t *dev;
 
-    dev = (acpi_t *) malloc(sizeof(acpi_t));
+    dev = (acpi_t *) calloc(1, sizeof(acpi_t));
     if (dev == NULL)
         return NULL;
-    memset(dev, 0x00, sizeof(acpi_t));
 
     cpu_to_acpi = ACPI_TIMER_FREQ / cpuclock;
     dev->vendor = info->local;
@@ -1767,6 +2553,28 @@ acpi_init(const device_t *info)
             dev->suspend_types[4] = SUS_SUSPEND;
             break;
 
+        case VEN_SIS_5582:
+            dev->suspend_types[0] = SUS_SUSPEND;      /* S1 */
+            dev->suspend_types[4] = SUS_POWER_OFF;    /* S5 */
+
+            timer_add(&dev->gp_timer, acpi_gp_timer, dev, 0);
+            timer_add(&dev->per_timer, acpi_per_timer, dev, 0);
+            break;
+
+        case VEN_SIS_5595_1997:
+        case VEN_SIS_5595:
+            dev->suspend_types[1] = SUS_SUSPEND;
+            dev->suspend_types[2] = SUS_SUSPEND;
+            dev->suspend_types[3] = SUS_SUSPEND | SUS_NVR | SUS_RESET_CPU | SUS_RESET_PCI;
+            dev->suspend_types[4] = SUS_POWER_OFF;
+            dev->suspend_types[5] = SUS_POWER_OFF;
+
+            timer_add(&dev->gp_timer, acpi_gp_timer, dev, 0);
+            timer_add(&dev->per_timer, acpi_per_timer, dev, 0);
+
+            dev->smbus = device_add(&sis5595_smbus_device);
+            break;
+
         default:
             break;
     }
@@ -1793,7 +2601,7 @@ const device_t acpi_ali_device = {
     .init          = acpi_init,
     .close         = acpi_close,
     .reset         = acpi_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = acpi_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1807,7 +2615,7 @@ const device_t acpi_intel_device = {
     .init          = acpi_init,
     .close         = acpi_close,
     .reset         = acpi_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = acpi_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1821,7 +2629,7 @@ const device_t acpi_via_device = {
     .init          = acpi_init,
     .close         = acpi_close,
     .reset         = acpi_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = acpi_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1835,7 +2643,7 @@ const device_t acpi_via_596b_device = {
     .init          = acpi_init,
     .close         = acpi_close,
     .reset         = acpi_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = acpi_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1849,7 +2657,49 @@ const device_t acpi_smc_device = {
     .init          = acpi_init,
     .close         = acpi_close,
     .reset         = acpi_reset,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = acpi_speed_changed,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t acpi_sis_5582_device = {
+    .name          = "SiS 5582 ACPI",
+    .internal_name = "acpi_sis_5582",
+    .flags         = DEVICE_PCI,
+    .local         = VEN_SIS_5582,
+    .init          = acpi_init,
+    .close         = acpi_close,
+    .reset         = acpi_reset,
+    .available     = NULL,
+    .speed_changed = acpi_speed_changed,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t acpi_sis_5595_1997_device = {
+    .name          = "SiS 5595 (1997) ACPI",
+    .internal_name = "acpi_sis_5595_1997",
+    .flags         = DEVICE_PCI,
+    .local         = VEN_SIS_5595_1997,
+    .init          = acpi_init,
+    .close         = acpi_close,
+    .reset         = acpi_reset,
+    .available     = NULL,
+    .speed_changed = acpi_speed_changed,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t acpi_sis_5595_device = {
+    .name          = "SiS 5595 ACPI",
+    .internal_name = "acpi_sis_5595",
+    .flags         = DEVICE_PCI,
+    .local         = VEN_SIS_5595,
+    .init          = acpi_init,
+    .close         = acpi_close,
+    .reset         = acpi_reset,
+    .available     = NULL,
     .speed_changed = acpi_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/apm.c b/src/apm.c
index d7ce262a3..3973f2b23 100644
--- a/src/apm.c
+++ b/src/apm.c
@@ -122,7 +122,7 @@ const device_t apm_device = {
     .init          = apm_init,
     .close         = apm_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -136,7 +136,7 @@ const device_t apm_pci_device = {
     .init          = apm_init,
     .close         = apm_close,
     .reset         = apm_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -150,7 +150,7 @@ const device_t apm_pci_acpi_device = {
     .init          = apm_init,
     .close         = apm_close,
     .reset         = apm_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/cdrom/CMakeLists.txt b/src/cdrom/CMakeLists.txt
index 201cee7f6..6208111de 100644
--- a/src/cdrom/CMakeLists.txt
+++ b/src/cdrom/CMakeLists.txt
@@ -9,8 +9,36 @@
 #          CMake build script.
 #
 # Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
 #
 #          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2024      Jasmine Iwanek.
 #
 
-add_library(cdrom OBJECT cdrom.c cdrom_image_backend.c cdrom_image_viso.c cdrom_image.c cdrom_mitsumi.c)
+find_package(PkgConfig REQUIRED)
+
+pkg_check_modules(SNDFILE REQUIRED IMPORTED_TARGET sndfile)
+
+add_library(cdrom OBJECT
+    cdrom.c
+    cdrom_image.c
+    cdrom_image_viso.c
+    cdrom_mke.c
+)
+if(NOT WIN32)
+	target_include_directories(86Box PRIVATE PkgConfig::SNDFILE)
+endif()
+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+	target_include_directories(cdrom PRIVATE /usr/local/include)
+endif()
+target_link_libraries(86Box PkgConfig::SNDFILE)
+
+if(CDROM_MITSUMI)
+    target_compile_definitions(cdrom PRIVATE USE_CDROM_MITSUMI)
+    target_sources(cdrom PRIVATE cdrom_mitsumi.c)
+endif()
+
+if (WIN32)
+    # MSYS2
+    target_link_libraries(86Box -static ${SNDFILE_STATIC_LIBRARIES})
+endif()
diff --git a/src/cdrom/cdrom.c b/src/cdrom/cdrom.c
index ea025de2a..6dd95b5dd 100644
--- a/src/cdrom/cdrom.c
+++ b/src/cdrom/cdrom.c
@@ -15,105 +15,93 @@
  *          Copyright 2018-2021 Miran Grca.
  */
 #include <inttypes.h>
+#ifdef ENABLE_CDROM_LOG
 #include <stdarg.h>
+#endif
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/device.h>
 #include <86box/config.h>
 #include <86box/cdrom.h>
 #include <86box/cdrom_image.h>
 #include <86box/cdrom_interface.h>
+#ifdef USE_CDROM_MITSUMI
 #include <86box/cdrom_mitsumi.h>
+#endif
+#include <86box/cdrom_mke.h>
+#include <86box/log.h>
 #include <86box/plat.h>
+#include <86box/plat_cdrom_ioctl.h>
 #include <86box/scsi.h>
 #include <86box/scsi_device.h>
+#include <86box/scsi_cdrom.h>
 #include <86box/sound.h>
-
-/* The addresses sent from the guest are absolute, ie. a LBA of 0 corresponds to a MSF of 00:00:00. Otherwise, the counter displayed by the guest is wrong:
-   there is a seeming 2 seconds in which audio plays but counter does not move, while a data track before audio jumps to 2 seconds before the actual start
-   of the audio while audio still plays. With an absolute conversion, the counter is fine. */
-#undef MSFtoLBA
-#define MSFtoLBA(m, s, f)  ((((m * 60) + s) * 75) + f)
+#include <86box/ui.h>
 
 #define RAW_SECTOR_SIZE    2352
-#define COOKED_SECTOR_SIZE 2048
 
 #define MIN_SEEK           2000
 #define MAX_SEEK           333333
 
-#pragma pack(push, 1)
-typedef struct {
-    uint8_t user_data[2048],
-        ecc[288];
-} m1_data_t;
-
-typedef struct {
-    uint8_t sub_header[8],
-        user_data[2328];
-} m2_data_t;
-
-typedef union {
-    m1_data_t m1_data;
-    m2_data_t m2_data;
-    uint8_t   raw_data[2336];
-} sector_data_t;
-
-typedef struct {
-    uint8_t       sync[12];
-    uint8_t       header[4];
-    sector_data_t data;
-} sector_raw_data_t;
-
-typedef union {
-    sector_raw_data_t sector_data;
-    uint8_t           raw_data[2352];
-} sector_t;
-
-typedef struct {
-    sector_t sector;
-    uint8_t  c2[296];
-    uint8_t  subchannel_raw[96];
-    uint8_t  subchannel_q[16];
-    uint8_t  subchannel_rw[96];
-} cdrom_sector_t;
-
-typedef union {
-    cdrom_sector_t cdrom_sector;
-    uint8_t        buffer[2856];
-} sector_buffer_t;
-#pragma pack(pop)
-
-static int     cdrom_sector_size;
-static uint8_t raw_buffer[2856]; /* Needs to be the same size as sector_buffer_t in the structs. */
-static uint8_t extra_buffer[296];
-
-cdrom_t cdrom[CDROM_NUM];
+cdrom_t cdrom[CDROM_NUM] = { 0 };
 
 int cdrom_interface_current;
+int cdrom_assigned_letters = 0;
 
 #ifdef ENABLE_CDROM_LOG
 int cdrom_do_log = ENABLE_CDROM_LOG;
 
-void
-cdrom_log(const char *fmt, ...)
+static void
+cdrom_log(void *priv, const char *fmt, ...)
 {
-    va_list ap;
-
     if (cdrom_do_log) {
+        va_list ap;
         va_start(ap, fmt);
-        pclog_ex(fmt, ap);
+        log_out(priv, fmt, ap);
         va_end(ap);
     }
 }
 #else
-#    define cdrom_log(fmt, ...)
+#    define cdrom_log(priv, fmt, ...)
 #endif
 
+static void    process_mode1(cdrom_t *dev, const int cdrom_sector_flags,
+                             uint8_t *b);
+static void    process_mode2_non_xa(cdrom_t *dev, const int cdrom_sector_flags,
+                                    uint8_t *b);
+static void    process_mode2_xa_form1(cdrom_t *dev, const int cdrom_sector_flags,
+                                      uint8_t *b);
+static void    process_mode2_xa_form2(cdrom_t *dev, const int cdrom_sector_flags,
+                                      uint8_t *b);
+
+typedef void (*cdrom_process_data_t)(cdrom_t *dev, const int cdrom_sector_flags,
+                                     uint8_t *b);
+
+static cdrom_process_data_t cdrom_process_data[4] = { process_mode1, process_mode2_non_xa,
+                                                      process_mode2_xa_form1, process_mode2_xa_form2 };
+#ifdef ENABLE_CDROM_LOG
+static char *               cdrom_req_modes[14]   = { "Any", "Audio", "Mode 1", "Mode 2",
+                                                      "CD-I/XA Mode 2 Form 1", "CD-I/XA Mode 2 Form 2", "Unk", "Unk",
+                                                      "Any Data", "Any Data - 4",
+                                                      "CD-I/XA Mode 2 Form 1", "CD-I/XA Mode 2 Form 1 - 4",
+                                                      "Any CD-I/XA Data", "Any CD-I/XA Data - 4" };
+static char *               cdrom_modes[4]        = { "Mode 1", "Mode 2", "CD-I/XA Mode 2 Form 1", "CD-I/XA Mode 2 Form 2" };
+#endif
+static uint8_t              cdrom_mode_masks[14]  = { 0x0f, 0x00, 0x01, 0x02, 0x04, 0x08, 0x00, 0x00,
+                                                      0x05, 0x05, 0x04, 0x04, 0x0c, 0x0c };
+
+static uint8_t              status_codes[2][16]   = { { 0x13, 0x15, 0x15, 0x15, 0x12, 0x11, 0x13, 0x13,
+                                                        0x12, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15 },
+                                                      { 0x00, 0x00, 0x00, 0x00, 0x15, 0x11, 0x00, 0x00,
+                                                        0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } };
+static int                  mult                  = 1;
+static int                  part                  = 0;
+static int                  ecc_diff              = 288;
+
 static const device_t cdrom_interface_none_device = {
     .name          = "None",
     .internal_name = "none",
@@ -122,7 +110,7 @@ static const device_t cdrom_interface_none_device = {
     .init          = NULL,
     .close         = NULL,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -133,150 +121,66 @@ static const struct {
 } controllers[] = {
     // clang-format off
     { &cdrom_interface_none_device  },
+#ifdef USE_CDROM_MITSUMI
+    { &mitsumi_cdrom_device         },
+#endif
+    { &mke_cdrom_noncreative_device },
+    { &mke_cdrom_device             },
     { NULL                          }
     // clang-format on
 };
 
-/* Reset the CD-ROM Interface, whichever one that is. */
-void
-cdrom_interface_reset(void)
+/* Private functions. */
+static void
+cdrom_generate_name(const int type, char *name, const int internal)
 {
-    cdrom_log("CD-ROM Interface: reset(current=%d)\n",
-            cdrom_interface_current);
+    char  elements[3][512] = { 0 };
 
-    /* If we have a valid controller, add its device. */
-    if ((cdrom_interface_current > 0) && controllers[cdrom_interface_current].device)
-        device_add(controllers[cdrom_interface_current].device);
-}
+    memcpy(elements[0], cdrom_drive_types[type].vendor,
+           strlen(cdrom_drive_types[type].vendor) + 1);
+    if (internal)  for (int i = 0; i < strlen(elements[0]); i++)
+        if (elements[0][i] == ' ')
+            elements[0][i] = '_';
 
-const char *
-cdrom_interface_get_internal_name(int cdinterface)
-{
-    return device_get_internal_name(controllers[cdinterface].device);
-}
+    if (internal) {
+        int j = 0;
+        for (int i = 0; i <= strlen(cdrom_drive_types[type].model); i++)
+            if (cdrom_drive_types[type].model[i] != ':')
+                elements[1][j++] = cdrom_drive_types[type].model[i];
+    } else
+        memcpy(elements[1], cdrom_drive_types[type].model,
+               strlen(cdrom_drive_types[type].model) + 1);
+    char *s = strstr(elements[1], "  ");
+    if (s != NULL)
+        s[0] = 0x00;
+    if (internal)  for (int i = 0; i < strlen(elements[1]); i++)
+        if (elements[1][i] == ' ')
+            elements[1][i] = '_';
 
-int
-cdrom_interface_get_from_internal_name(char *s)
-{
-    int c = 0;
+    memcpy(elements[2], cdrom_drive_types[type].revision,
+           strlen(cdrom_drive_types[type].revision) + 1);
+    s = strstr(elements[2], " ");
+    if (s != NULL)
+        s[0] = 0x00;
+    if (internal)  for (int i = 0; i < strlen(elements[2]); i++)
+        if (elements[2][i] == ' ')
+            elements[2][i] = '_';
 
-    while (controllers[c].device != NULL) {
-        if (!strcmp(controllers[c].device->internal_name, s))
-            return c;
-        c++;
-    }
-
-    return 0;
-}
-
-const device_t *
-cdrom_interface_get_device(int cdinterface)
-{
-    return (controllers[cdinterface].device);
-}
-
-int
-cdrom_interface_has_config(int cdinterface)
-{
-    const device_t *dev = cdrom_interface_get_device(cdinterface);
-
-    if (dev == NULL)
-        return 0;
-
-    if (!device_has_config(dev))
-        return 0;
-
-    return 1;
-}
-
-int
-cdrom_interface_get_flags(int cdinterface)
-{
-    return (controllers[cdinterface].device->flags);
-}
-
-int
-cdrom_interface_available(int cdinterface)
-{
-    return (device_available(controllers[cdinterface].device));
-}
-
-char *
-cdrom_getname(int type)
-{
-    return (char *) cdrom_drive_types[type].name;
-}
-
-char *
-cdrom_get_internal_name(int type)
-{
-    return (char *) cdrom_drive_types[type].internal_name;
-}
-
-int
-cdrom_get_from_internal_name(char *s)
-{
-    int c = 0;
-
-    while (strlen(cdrom_drive_types[c].internal_name)) {
-        if (!strcmp((char *) cdrom_drive_types[c].internal_name, s))
-            return c;
-        c++;
-    }
-
-    return 0;
-}
-
-void
-cdrom_set_type(int model, int type)
-{
-    cdrom[model].type = type;
-}
-
-int
-cdrom_get_type(int model)
-{
-    return cdrom[model].type;
-}
-
-static __inline int
-bin2bcd(int x)
-{
-    return (x % 10) | ((x / 10) << 4);
-}
-
-static __inline int
-bcd2bin(int x)
-{
-    return (x >> 4) * 10 + (x & 0x0f);
-}
-
-int
-cdrom_lba_to_msf_accurate(int lba)
-{
-    int pos;
-    int m;
-    int s;
-    int f;
-
-    pos = lba + 150;
-    f   = pos % 75;
-    pos -= f;
-    pos /= 75;
-    s = pos % 60;
-    pos -= s;
-    pos /= 60;
-    m = pos;
-
-    return ((m << 16) | (s << 8) | f);
+    if (internal)
+        sprintf(name, "%s_%s_%s", elements[0], elements[1], elements[2]);
+    else if (cdrom_drive_types[type].speed == -1)
+        sprintf(name, "%s %s %s", elements[0], elements[1], elements[2]);
+    else
+        sprintf(name, "%s %s %s (%ix)", elements[0], elements[1],
+                elements[2], cdrom_drive_types[type].speed);
 }
 
 static double
-cdrom_get_short_seek(cdrom_t *dev)
+cdrom_get_short_seek(const cdrom_t *dev)
 {
     switch (dev->cur_speed) {
         case 0:
-            fatal("CD-ROM %i: 0x speed\n", dev->id);
+            log_fatal(dev->log, "0x speed\n");
             return 0.0;
         case 1:
             return 240.0;
@@ -324,11 +228,11 @@ cdrom_get_short_seek(cdrom_t *dev)
 }
 
 static double
-cdrom_get_long_seek(cdrom_t *dev)
+cdrom_get_long_seek(const cdrom_t *dev)
 {
     switch (dev->cur_speed) {
         case 0:
-            fatal("CD-ROM %i: 0x speed\n", dev->id);
+            log_fatal(dev->log, "0x speed\n");
             return 0.0;
         case 1:
             return 1446.0;
@@ -375,113 +279,6 @@ cdrom_get_long_seek(cdrom_t *dev)
     }
 }
 
-double
-cdrom_seek_time(cdrom_t *dev)
-{
-    uint32_t diff = dev->seek_diff;
-    double   sd   = (double) (MAX_SEEK - MIN_SEEK);
-
-    if (diff < MIN_SEEK)
-        return 0.0;
-    if (diff > MAX_SEEK)
-        diff = MAX_SEEK;
-
-    diff -= MIN_SEEK;
-
-    return cdrom_get_short_seek(dev) + ((cdrom_get_long_seek(dev) * ((double) diff)) / sd);
-}
-
-void
-cdrom_stop(cdrom_t *dev)
-{
-    if (dev->cd_status > CD_STATUS_DATA_ONLY)
-        dev->cd_status = CD_STATUS_STOPPED;
-}
-
-void
-cdrom_seek(cdrom_t *dev, uint32_t pos, uint8_t vendor_type)
-{
-    int      m;
-    int      s;
-    int      f;
-
-    if (!dev)
-        return;
-
-    cdrom_log("CD-ROM %i: Seek to LBA %08X, vendor type = %02x.\n", dev->id, pos, vendor_type);
-
-    switch (vendor_type) {
-        case 0x40:
-            m = bcd2bin((pos >> 24) & 0xff);
-            s = bcd2bin((pos >> 16) & 0xff);
-            f = bcd2bin((pos >> 8) & 0xff);
-            pos = MSFtoLBA(m, s, f) - 150;
-            break;
-        case 0x80:
-            pos = bcd2bin((pos >> 24) & 0xff);
-            break;
-        default:
-            break;
-    }
-
-    dev->seek_pos = pos;
-    cdrom_stop(dev);
-}
-
-int
-cdrom_is_pre(cdrom_t *dev, uint32_t lba)
-{
-    if (dev->ops && dev->ops->is_track_pre)
-        return dev->ops->is_track_pre(dev, lba);
-
-    return 0;
-}
-
-int
-cdrom_audio_callback(cdrom_t *dev, int16_t *output, int len)
-{
-    int ret = 1;
-
-    if (!dev->sound_on || (dev->cd_status != CD_STATUS_PLAYING) || dev->audio_muted_soft) {
-        cdrom_log("CD-ROM %i: Audio callback while not playing\n", dev->id);
-        if (dev->cd_status == CD_STATUS_PLAYING)
-            dev->seek_pos += (len >> 11);
-        memset(output, 0, len * 2);
-        return 0;
-    }
-
-    while (dev->cd_buflen < len) {
-        if (dev->seek_pos < dev->cd_end) {
-            if (dev->ops->read_sector(dev, CD_READ_AUDIO, (uint8_t *) &(dev->cd_buffer[dev->cd_buflen]),
-                                      dev->seek_pos)) {
-                cdrom_log("CD-ROM %i: Read LBA %08X successful\n", dev->id, dev->seek_pos);
-                dev->seek_pos++;
-                dev->cd_buflen += (RAW_SECTOR_SIZE / 2);
-                ret = 1;
-            } else {
-                cdrom_log("CD-ROM %i: Read LBA %08X failed\n", dev->id, dev->seek_pos);
-                memset(&(dev->cd_buffer[dev->cd_buflen]), 0x00, (BUF_SIZE - dev->cd_buflen) * 2);
-                dev->cd_status = CD_STATUS_STOPPED;
-                dev->cd_buflen = len;
-                ret            = 0;
-            }
-        } else {
-            cdrom_log("CD-ROM %i: Playing completed\n", dev->id);
-            memset(&dev->cd_buffer[dev->cd_buflen], 0x00, (BUF_SIZE - dev->cd_buflen) * 2);
-            dev->cd_status = CD_STATUS_PLAYING_COMPLETED;
-            dev->cd_buflen = len;
-            ret            = 0;
-        }
-    }
-
-    memcpy(output, dev->cd_buffer, len * 2);
-    memmove(dev->cd_buffer, &dev->cd_buffer[len], (BUF_SIZE - len) * 2);
-    dev->cd_buflen -= len;
-
-    cdrom_log("CD-ROM %i: Audio callback returning %i\n", dev->id, ret);
-    return ret;
-}
-
 static void
 msf_from_bcd(int *m, int *s, int *f)
 {
@@ -498,398 +295,1724 @@ msf_to_bcd(int *m, int *s, int *f)
     *f = bin2bcd(*f);
 }
 
-uint8_t
-cdrom_audio_play(cdrom_t *dev, uint32_t pos, uint32_t len, int ismsf)
+void
+cdrom_compute_ecc_block(cdrom_t *dev, uint8_t *parity, const uint8_t *data,
+                        uint32_t major_count, uint32_t minor_count,
+                        uint32_t major_mult, uint32_t minor_inc, int m2f1)
 {
-    track_info_t ti;
-    int          m = 0;
-    int          s = 0;
-    int          f = 0;
+    uint32_t size = major_count * minor_count;
 
-    if (dev->cd_status == CD_STATUS_DATA_ONLY)
-        return 0;
+    for (uint32_t major = 0; major < major_count; ++major) {
+        uint32_t index = (major >> 1) * major_mult + (major & 1);
 
-    cdrom_log("CD-ROM %i: Play audio - %08X %08X %i\n", dev->id, pos, len, ismsf);
-    if (ismsf & 0x100) {
-        /* Track-relative audio play. */
-        dev->ops->get_track_info(dev, ismsf & 0xff, 0, &ti);
-        pos += MSFtoLBA(ti.m, ti.s, ti.f) - 150;
-    } else if ((ismsf == 2) || (ismsf == 3)) {
-        dev->ops->get_track_info(dev, pos, 0, &ti);
-        pos = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
-        if (ismsf == 2) {
-            /* We have to end at the *end* of the specified track,
-               not at the beginning. */
-            dev->ops->get_track_info(dev, len, 1, &ti);
-            len = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
+        uint8_t ecc_a = 0;
+        uint8_t ecc_b = 0;
+
+        for (uint32_t minor = 0; minor < minor_count; ++minor) {
+            uint8_t temp = data[index];
+
+            if (m2f1 && (index < 4))
+                temp = 0x00;
+
+            index += minor_inc;
+
+            if (index >= size)
+                index -= size;
+
+            ecc_a ^= temp;
+            ecc_b ^= temp;
+            ecc_a = dev->_F_LUT[ecc_a];
         }
-    } else if (ismsf == 1) {
-        m = (pos >> 16) & 0xff;
-        s = (pos >> 8) & 0xff;
-        f = pos & 0xff;
 
-        /* NEC CDR-260 speaks BCD. */
-        if ((dev->type == CDROM_TYPE_NEC_260_100) || (dev->type == CDROM_TYPE_NEC_260_101)) /*NEC*/
-            msf_from_bcd(&m, &s, &f);
+        parity[major] = dev->_B_LUT[dev->_F_LUT[ecc_a] ^ ecc_b];
+        parity[major + major_count] = parity[major] ^ ecc_b;
+    }
+}
 
-        if (pos == 0xffffff) {
-            cdrom_log("CD-ROM %i: Playing from current position (MSF)\n", dev->id);
-            pos = dev->seek_pos;
-        } else
-            pos = MSFtoLBA(m, s, f) - 150;
+static void
+cdrom_generate_ecc_data(cdrom_t *dev, const uint8_t *data, int m2f1)
+{
+    /* Compute ECC P code. */
+    cdrom_compute_ecc_block(dev, dev->p_parity, data, 86, 24, 2, 86, m2f1);
 
-        m = (len >> 16) & 0xff;
-        s = (len >> 8) & 0xff;
-        f = len & 0xff;
+    /* Compute ECC Q code. */
+    cdrom_compute_ecc_block(dev, dev->q_parity, data, 52, 43, 86, 88, m2f1);
+}
 
-        /* NEC CDR-260 speaks BCD. */
-        if ((dev->type == CDROM_TYPE_NEC_260_100) || (dev->type == CDROM_TYPE_NEC_260_101)) /*NEC*/
-            msf_from_bcd(&m, &s, &f);
+static int
+cdrom_is_sector_good(cdrom_t *dev, const uint8_t *b, const uint8_t mode2, const uint8_t form)
+{
+    int            ret = 1;
 
-        len = MSFtoLBA(m, s, f) - 150;
+    if (!dev->no_check && (dev->cd_status != CD_STATUS_DVD) && (!mode2 || (form == 1))) {
+        if (mode2 && (form == 1)) {
+            const uint32_t crc = cdrom_crc32(0xffffffff, &(b[16]), 2056) ^ 0xffffffff;
 
-        cdrom_log("CD-ROM %i: MSF - pos = %08X len = %08X\n", dev->id, pos, len);
-    } else if (ismsf == 0) {
-        if (pos == 0xffffffff) {
-            cdrom_log("CD-ROM %i: Playing from current position\n", dev->id);
-            pos = dev->seek_pos;
+            ret = ret && (crc == (*(uint32_t *) &(b[2072])));
+        } else if (!mode2) {
+            const uint32_t crc = cdrom_crc32(0xffffffff, b, 2064) ^ 0xffffffff;
+
+            ret = ret && (crc == (*(uint32_t *) &(b[2064])));
         }
-        len += pos;
+
+        cdrom_generate_ecc_data(dev, &(b[12]), mode2 && (form == 1));
+
+        ret = ret && !memcmp(dev->p_parity, &(b[2076]), 172);
+        ret = ret && !memcmp(dev->q_parity, &(b[2248]), 104);
     }
 
-    dev->audio_muted_soft = 0;
-    /* Do this at this point, since it's at this point that we know the
-       actual LBA position to start playing from. */
-    if (!(dev->ops->track_type(dev, pos) & CD_TRACK_AUDIO)) {
-        cdrom_log("CD-ROM %i: LBA %08X not on an audio track\n", dev->id, pos);
-        cdrom_stop(dev);
-        return 0;
-    }
-
-    dev->seek_pos  = pos;
-    dev->cd_end    = len;
-    dev->cd_status = CD_STATUS_PLAYING;
-    dev->cd_buflen = 0;
-    return 1;
+    return ret;
 }
 
-uint8_t
-cdrom_audio_track_search(cdrom_t *dev, uint32_t pos, int type, uint8_t playbit)
+static int
+read_data(cdrom_t *dev, const uint32_t lba, int check)
 {
-    int m = 0;
-    int s = 0;
-    int f = 0;
-    uint32_t pos2 = 0;
+    int ret  = 1;
+    int form = 0;
 
-    if (dev->cd_status == CD_STATUS_DATA_ONLY)
-        return 0;
+    if (dev->cached_sector != lba) {
+        dev->cached_sector = lba;
 
-    cdrom_log("Audio Track Search: MSF = %06x, type = %02x, playbit = %02x\n", pos, type, playbit);
-    switch (type) {
-        case 0x00:
-            if (pos == 0xffffffff) {
-                cdrom_log("CD-ROM %i: (type 0) Search from current position\n", dev->id);
-                pos = dev->seek_pos;
-            }
-            dev->seek_pos = pos;
-            break;
-        case 0x40:
-            m   = bcd2bin((pos >> 24) & 0xff);
-            s   = bcd2bin((pos >> 16) & 0xff);
-            f   = bcd2bin((pos >> 8) & 0xff);
-            if (pos == 0xffffffff) {
-                cdrom_log("CD-ROM %i: (type 1) Search from current position\n", dev->id);
-                pos = dev->seek_pos;
-            } else
-                pos = MSFtoLBA(m, s, f) - 150;
+        ret = dev->ops->read_sector(dev->local,
+                                    dev->raw_buffer[dev->cur_buf ^ 1], lba);
 
-            dev->seek_pos = pos;
-            break;
-        case 0x80:
-            if (pos == 0xffffffff) {
-                cdrom_log("CD-ROM %i: (type 2) Search from current position\n", dev->id);
-                pos = dev->seek_pos;
-            }
-            dev->seek_pos = (pos >> 24) & 0xff;
-            break;
-        default:
-            break;
+        if ((ret > 0) && check) {
+            if (dev->mode2) {
+                if (dev->raw_buffer[dev->cur_buf ^ 1][0x000f] == 0x01)
+                    /*
+                       Use Mode 1, since evidently specification-violating
+                       discs exist.
+                     */
+                    dev->mode2 = 0;
+                else if (dev->raw_buffer[dev->cur_buf ^ 1][0x0012] ==
+                         dev->raw_buffer[dev->cur_buf ^ 1][0x0016])
+                    form = ((dev->raw_buffer[dev->cur_buf ^ 1][0x0012] &
+                            0x20) >> 5) + 1;
+            } else if (dev->raw_buffer[dev->cur_buf ^ 1][0x000f] == 0x02)
+                dev->mode2 = 1;
+
+            if (!cdrom_is_sector_good(dev, dev->raw_buffer[dev->cur_buf ^ 1], dev->mode2, form))
+                ret = -1;
+        }
+
+        if (ret <= 0) {
+            memset(dev->raw_buffer[dev->cur_buf ^ 1], 0x00, 2448);
+            dev->cached_sector = -1;
+        }
+
+        dev->cur_buf ^= 1;
     }
 
-    pos2 = pos - 1;
-    if (pos2 == 0xffffffff)
-        pos2 = pos + 1;
+    return ret;
+}
 
-    /* Do this at this point, since it's at this point that we know the
-       actual LBA position to start playing from. */
-    if (!(dev->ops->track_type(dev, pos2) & CD_TRACK_AUDIO)) {
-        cdrom_log("CD-ROM %i: Track Search: LBA %08X not on an audio track\n", dev->id, pos);
-        dev->audio_muted_soft = 1;
-        if (dev->ops->track_type(dev, pos) & CD_TRACK_AUDIO)
-            dev->audio_muted_soft = 0;
+static void
+cdrom_get_subchannel(cdrom_t *dev, const uint32_t lba,
+                     subchannel_t *subc, const int cooked)
+{
+    uint8_t         q[16]    = { 0 };
+    if (lba != dev->cached_sector)
+        dev->cached_sector = -1;
+
+    (void) read_data(dev, lba, 0);
+
+    for (int i = 0; i < 12; i++)
+        for (int j = 0; j < 8; j++)
+             q[i] |= ((dev->raw_buffer[dev->cur_buf][RAW_SECTOR_SIZE +
+                                       (i << 3) + j] >> 6) & 0x01) << (7 - j);
+
+    if (cooked) {
+        uint8_t temp = (q[0] >> 4) | ((q[0] & 0xf) << 4);
+        q[0] = temp;
+
+        for (int i = 1; i < 10; i++) {
+             temp = bcd2bin(q[i]);
+             q[i] = temp;
+        }
+    }
+
+    subc->attr  = q[0];
+    subc->track = q[1];
+    subc->index = q[2];
+    subc->rel_m = q[3];
+    subc->rel_s = q[4];
+    subc->rel_f = q[5];
+    subc->abs_m = q[7];
+    subc->abs_s = q[8];
+    subc->abs_f = q[9];
+}
+
+static void
+read_toc_identify_sessions(const raw_track_info_t *rti, const int num, unsigned char *b)
+{
+    /* Bytes 2 and 3 = Number of first and last sessions */
+    b[2] = 0xff;
+    b[3] = 0x00;
+
+    for (int i = (num - 1); i >= 0; i--) {
+         if (rti[i].session < b[2])
+             b[2] = rti[i].session;
+    }
+
+    for (int i = 0; i < num; i++) {
+         if (rti[i].session > b[3])
+             b[3] = rti[i].session;
+    }
+}
+
+static int
+find_track(const raw_track_info_t *trti, const int num, const int first)
+{
+    int ret = -1;
+
+    if (first) {
+        for (int i = 0; i < num; i++)
+            if ((trti[i].point >= 1) && (trti[i].point <= 99)) {
+                ret = i;
+                break;
+            }
+    } else {
+        for (int i = (num - 1); i >= 0; i--)
+            if ((trti[i].point >= 1) && (trti[i].point <= 99)) {
+                ret = i;
+                break;
+            }
+    }
+
+    return ret;
+}
+
+static int
+find_last_lead_out(const raw_track_info_t *trti, const int num)
+{
+    int ret = -1;
+
+    for (int i = (num - 1); i >= 0; i--)
+        if (trti[i].point == 0xa2) {
+            ret = i;
+            break;
+        }
+
+    return ret;
+}
+
+static int
+find_specific_track(const raw_track_info_t *trti, const int num, const int track)
+{
+    int ret = -1;
+
+    if ((track >= 1) && (track <= 99)) {
+        for (int i = (num - 1); i >= 0; i--)
+            if (trti[i].point == track) {
+                ret = i;
+                break;
+            }
+    }
+
+    return ret;
+}
+
+static int
+read_toc_normal(const cdrom_t *dev, unsigned char *b,
+                unsigned char start_track, const int msf,
+                const int sony)
+{
+    uint8_t                 rti[65536]  = { 0 };
+    uint8_t                 prti[65536] = { 0 };
+    const raw_track_info_t *trti        = (raw_track_info_t *) rti;
+    raw_track_info_t *      tprti       = (raw_track_info_t *) prti;
+    int                     num         = 0;
+    int                     len         = 4;
+    int                     t           = -1;
+
+    if ((dev->is_bcd || dev->is_chinon) && (start_track < 0xa0))
+        start_track = bcd2bin(start_track);
+
+    cdrom_log(dev->log, "read_toc_normal(%016" PRIXPTR ", %016" PRIXPTR ", %02X, %i, %i)\n",
+              (uintptr_t) dev, (uintptr_t) b, start_track, msf, sony);
+
+    dev->ops->get_raw_track_info(dev->local, &num, rti);
+
+    if (num > 0) {
+        int j = 0;
+        for (int i = 0; i < num; i++) {
+            if ((trti[i].point >= 0x01) && (trti[i].point <= 0x63)) {
+                tprti[j] = trti[i];
+                if ((t == -1) && (tprti[j].point >= start_track))
+                    t = j;
+                cdrom_log(dev->log, "Sorted %03i = Unsorted %03i\n", j, i);
+                j++;
+            }
+        }
+
+        /* Bytes 2 and 3 = Number of first and last tracks found before lead out */
+        b[2] = tprti[0].point;
+        b[3] = tprti[j - 1].point;
+
+        for (int i = (num - 1); i >= 0; i--) {
+            if (trti[i].point == 0xa2) {
+                tprti[j] = trti[i];
+                tprti[j].point = 0xaa;
+                if ((t == -1) && (tprti[j].point >= start_track))
+                    t = j;
+                cdrom_log(dev->log, "Sorted %03i = Unsorted %03i\n", j, i);
+                j++;
+                break;
+            }
+        }
+
+        if (t != -1)  for (int i = t; i < j; i++) {
+#ifdef ENABLE_CDROM_LOG
+            uint8_t *c = &(b[len]);
+#endif
+
+            if (!sony)
+                b[len++] = 0;                /* Reserved */
+            b[len++] = tprti[i].adr_ctl; /* ADR/CTL */
+            if ((dev->is_bcd || dev->is_chinon) && (tprti[i].point >= 1) &&
+                (tprti[i].point <= 99))
+                b[len++] = bin2bcd(tprti[i].point);   /* Track number */
+            else
+                b[len++] = tprti[i].point;   /* Track number */
+            if (!sony)
+                b[len++] = 0;                /* Reserved */
+
+            if (msf) {
+                b[len++] = 0;
+
+                /* NEC CDR-260 speaks BCD. */
+                if (dev->is_bcd) {
+                    int m = tprti[i].pm;
+                    int s = tprti[i].ps;
+                    int f = tprti[i].pf;
+                    msf_to_bcd(&m, &s, &f);
+                    b[len++] = m;
+                    b[len++] = s;
+                    b[len++] = f;
+                } else {
+                    b[len++] = tprti[i].pm;
+                    b[len++] = tprti[i].ps;
+                    b[len++] = tprti[i].pf;
+                }
+            } else {
+                const uint32_t temp = MSFtoLBA(tprti[i].pm, tprti[i].ps,
+                                               tprti[i].pf) - 150;
+
+                b[len++] = temp >> 24;
+                b[len++] = temp >> 16;
+                b[len++] = temp >> 8;
+                b[len++] = temp;
+            }
+
+#ifdef ENABLE_CDROM_LOG
+            cdrom_log(dev->log, "Track %02X: %02X %02X %02X %02X %02X %02X %02X %02X\n",
+                      i, c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7]);
+#endif
+        }
     } else
-        dev->audio_muted_soft = 0;
+        b[2] = b[3] = 0;
 
-    cdrom_log("Track Search Toshiba: Muted?=%d, LBA=%08X.\n", dev->audio_muted_soft, pos);
-    dev->cd_buflen = 0;
-    dev->cd_status = playbit ? CD_STATUS_PLAYING : CD_STATUS_PAUSED;
-    return 1;
+    return len;
 }
 
-uint8_t
-cdrom_audio_track_search_pioneer(cdrom_t *dev, uint32_t pos, uint8_t playbit)
+static int
+read_toc_session(const cdrom_t *dev, unsigned char *b, const int msf)
 {
-    int m = 0;
-    int s = 0;
-    int f = 0;
+    uint8_t                 rti[65536] = { 0 };
+    const raw_track_info_t *t          = (raw_track_info_t *) rti;
+    const raw_track_info_t *first      = NULL;
+    int                     num        = 0;
+    int                     len        = 4;
 
-    if (dev->cd_status == CD_STATUS_DATA_ONLY)
-        return 0;
+    dev->ops->get_raw_track_info(dev->local, &num, rti);
 
-    f   = bcd2bin((pos >> 24) & 0xff);
-    s   = bcd2bin((pos >> 16) & 0xff);
-    m   = bcd2bin((pos >> 8) & 0xff);
-    if (pos == 0xffffffff) {
-        pos = dev->seek_pos;
-    } else
-        pos = MSFtoLBA(m, s, f) - 150;
+    /* Bytes 2 and 3 = Number of first and last sessions */
+    read_toc_identify_sessions((raw_track_info_t *) rti, num, b);
 
-    dev->seek_pos = pos;
+    cdrom_log(dev->log, "read_toc_session(%016" PRIXPTR ", %016" PRIXPTR ", %i)\n",
+              (uintptr_t) dev, (uintptr_t) b, msf);
 
-    dev->audio_muted_soft = 0;
-    /* Do this at this point, since it's at this point that we know the
-       actual LBA position to start playing from. */
-    if (!(dev->ops->track_type(dev, pos) & CD_TRACK_AUDIO)) {
-        cdrom_log("CD-ROM %i: LBA %08X not on an audio track\n", dev->id, pos);
-        cdrom_stop(dev);
-        return 0;
-    }
-
-    dev->cd_buflen = 0;
-    dev->cd_status = playbit ? CD_STATUS_PLAYING : CD_STATUS_PAUSED;
-    return 1;
-}
-
-uint8_t
-cdrom_audio_play_pioneer(cdrom_t *dev, uint32_t pos)
-{
-    int m = 0;
-    int s = 0;
-    int f = 0;
-
-    if (dev->cd_status == CD_STATUS_DATA_ONLY)
-        return 0;
-
-    f   = bcd2bin((pos >> 24) & 0xff);
-    s   = bcd2bin((pos >> 16) & 0xff);
-    m   = bcd2bin((pos >> 8) & 0xff);
-    pos = MSFtoLBA(m, s, f) - 150;
-    dev->cd_end = pos;
-
-    dev->audio_muted_soft = 0;
-    dev->cd_buflen = 0;
-    dev->cd_status = CD_STATUS_PLAYING;
-    return 1;
-}
-
-uint8_t
-cdrom_audio_play_toshiba(cdrom_t *dev, uint32_t pos, int type)
-{
-    int m = 0;
-    int s = 0;
-    int f = 0;
-
-    if (dev->cd_status == CD_STATUS_DATA_ONLY)
-        return 0;
-
-    /*Preliminary support, revert if too incomplete*/
-    switch (type) {
-        case 0x00:
-            dev->cd_end = pos;
-            break;
-        case 0x40:
-            m   = bcd2bin((pos >> 24) & 0xff);
-            s   = bcd2bin((pos >> 16) & 0xff);
-            f   = bcd2bin((pos >> 8) & 0xff);
-            pos = MSFtoLBA(m, s, f) - 150;
-            dev->cd_end = pos;
-            break;
-        case 0x80:
-            dev->cd_end = (pos >> 24) & 0xff;
-            break;
-        case 0xc0:
-            if (pos == 0xffffffff) {
-                cdrom_log("CD-ROM %i: Playing from current position\n", dev->id);
-                pos = dev->cd_end;
+    if (num != 0) {
+        for (int i = 0; i < num; i++) {
+            if ((t[i].session == b[3]) && (t[i].point >= 0x01) && (t[i].point <= 0x63)) {
+                first = &(t[i]);
+                break;
             }
-            dev->cd_end = pos;
-            break;
-        default:
-            break;
+        }
+        if (first != NULL) {
+            b[len++] = 0x00;
+            b[len++] = first->adr_ctl;
+            if ((dev->is_bcd || dev->is_chinon) && (first->point >= 1) &&
+                (first->point <= 99))
+                b[len++] = bin2bcd(first->point);
+            else
+                b[len++] = first->point;
+            b[len++] = 0x00;
+
+            if (msf) {
+                b[len++] = 0x00;
+
+                /* NEC CDR-260 speaks BCD. */
+                if (dev->is_bcd) {
+                    int m = first->pm;
+                    int s = first->ps;
+                    int f = first->pf;
+
+                    msf_to_bcd(&m, &s, &f);
+
+                    b[len++] = m;
+                    b[len++] = s;
+                    b[len++] = f;
+                } else {
+                    b[len++] = first->pm;
+                    b[len++] = first->ps;
+                    b[len++] = first->pf;
+                }
+            } else {
+                const uint32_t temp = MSFtoLBA(first->pm, first->ps,
+                                               first->pf) - 150;
+
+                b[len++] = temp >> 24;
+                b[len++] = temp >> 16;
+                b[len++] = temp >> 8;
+                b[len++] = temp;
+            }
+        }
+    }
+
+    if (len == 4)
+        memset(&(b[len += 8]), 0x00, 8);
+
+    return len;
+}
+
+static int
+read_toc_raw(const cdrom_t *dev, unsigned char *b, const unsigned char start_track)
+{
+    uint8_t                 rti[65536] = { 0 };
+    const raw_track_info_t *t          = (raw_track_info_t *) rti;
+    int                     num        = 0;
+    int                     len        = 4;
+
+    /* Bytes 2 and 3 = Number of first and last sessions */
+    read_toc_identify_sessions((raw_track_info_t *) rti, num, b);
+
+    cdrom_log(dev->log, "read_toc_raw(%016" PRIXPTR ", %016" PRIXPTR ", %02X)\n",
+              (uintptr_t) dev, (uintptr_t) b, start_track);
+
+    dev->ops->get_raw_track_info(dev->local, &num, rti);
+
+    if (num != 0)  for (int i = 0; i < num; i++)
+        if (t[i].session >= start_track) {
+            memcpy(&(b[len]), &(t[i]), 11);
+
+            if ((dev->is_bcd || dev->is_chinon) && (b[3] >= 1) && (b[3] <= 99))
+                b[3] = bin2bcd(b[3]);
+
+            for (int j = 0; j < 3; j++)
+                if (dev->is_bcd) {
+                    b[4 + j] = bin2bcd(b[4 + j]);
+                    b[8 + j] = bin2bcd(b[8 + j]);
+                }
+
+            len += 11;
+        }
+
+    return len;
+}
+
+static int
+track_type_is_valid(UNUSED(const cdrom_t *dev), const int type, const int flags, const int audio,
+                    const int mode2)
+{
+    if (!(flags & 0x70) && (flags & 0xf8)) { /* 0x08/0x80/0x88 are illegal modes */
+        cdrom_log(dev->log, "[Any Mode] 0x08/0x80/0x88 are illegal modes\n");
+        return 0;
+    }
+
+    if ((type != 1) && !audio) {
+        if ((flags & 0x06) == 0x06) {
+            cdrom_log(dev->log, "[Any Data Mode] Invalid error flags\n");
+            return 0;
+        }
+
+        if (((flags & 0x700) == 0x300) || ((flags & 0x700) > 0x400)) {
+            cdrom_log(dev->log, "[Any Data Mode] Invalid subchannel data flags (%02X)\n",
+                      flags & 0x700);
+            return 0;
+        }
+
+        if ((flags & 0x18) == 0x08) { /* EDC/ECC without user data is an illegal mode */
+            cdrom_log(dev->log, "[Any Data Mode] EDC/ECC without user data is an "
+                      "illegal mode\n");
+            return 0;
+        }
+
+        if (((flags & 0xf0) == 0x90) || ((flags & 0xf0) == 0xc0)) { /* 0x90/0x98/0xC0/0xC8 are illegal modes */
+            cdrom_log(dev->log, "[Any Data Mode] 0x90/0x98/0xC0/0xC8 are illegal modes\n");
+            return 0;
+        }
+
+        if (((type > 3) && (type != 8)) || (mode2 && (mode2 & 0x03))) {
+            if ((flags & 0xf0) == 0x30) { /* 0x30/0x38 are illegal modes */
+                cdrom_log(dev->log, "[Any XA Mode 2] 0x30/0x38 are illegal modes\n");
+                return 0;
+            }
+            if (((flags & 0xf0) == 0xb0) || ((flags & 0xf0) == 0xd0)) { /* 0xBx and 0xDx are illegal modes */
+                cdrom_log(dev->log, "[Any XA Mode 2] 0xBx and 0xDx are illegal modes\n");
+                return 0;
+            }
+        }
     }
 
-    cdrom_log("Toshiba Play Audio: Muted?=%d, LBA=%08X.\n", dev->audio_muted_soft, pos);
-    dev->cd_buflen = 0;
-    dev->cd_status = CD_STATUS_PLAYING;
     return 1;
 }
 
-uint8_t
-cdrom_audio_scan(cdrom_t *dev, uint32_t pos, int type)
+static int
+read_audio(cdrom_t *dev, const uint32_t lba, uint8_t *b)
 {
-    int m = 0;
-    int s = 0;
-    int f = 0;
+    const int ret = read_data(dev, lba, 0);
 
-    if (dev->cd_status == CD_STATUS_DATA_ONLY)
-        return 0;
+    memcpy(b, dev->raw_buffer[dev->cur_buf], 2352);
 
-    cdrom_log("Audio Scan: MSF = %06x, type = %02x\n", pos, type);
-    switch (type) {
-        case 0x00:
-            if (pos == 0xffffffff) {
-                cdrom_log("CD-ROM %i: (type 0) Search from current position\n", dev->id);
-                pos = dev->seek_pos;
-            }
-            dev->seek_pos = pos;
-            break;
-        case 0x40:
-            m   = bcd2bin((pos >> 24) & 0xff);
-            s   = bcd2bin((pos >> 16) & 0xff);
-            f   = bcd2bin((pos >> 8) & 0xff);
-            if (pos == 0xffffffff) {
-                cdrom_log("CD-ROM %i: (type 1) Search from current position\n", dev->id);
-                pos = dev->seek_pos;
-            } else
-                pos = MSFtoLBA(m, s, f) - 150;
+    dev->cdrom_sector_size = 2352;
 
-            dev->seek_pos = pos;
-            break;
-        case 0x80:
-            dev->seek_pos = (pos >> 24) & 0xff;
-            break;
-        default:
-            break;
+    return ret;
+}
+
+
+static void
+process_mode1(cdrom_t *dev, const int cdrom_sector_flags, uint8_t *b)
+{
+    dev->cdrom_sector_size = 0;
+
+    if (cdrom_sector_flags & 0x80) {
+        /* Sync */
+        cdrom_log(dev->log, "[Mode 1] Sync\n");
+        memcpy(b, dev->raw_buffer[dev->cur_buf], 12);
+        dev->cdrom_sector_size += 12;
+        b += 12;
     }
 
-    dev->audio_muted_soft = 0;
-    /* Do this at this point, since it's at this point that we know the
-       actual LBA position to start playing from. */
-    if (!(dev->ops->track_type(dev, pos) & CD_TRACK_AUDIO)) {
-        cdrom_log("CD-ROM %i: LBA %08X not on an audio track\n", dev->id, pos);
-        cdrom_stop(dev);
-        return 0;
+    if (cdrom_sector_flags & 0x20) {
+        /* Header */
+        cdrom_log(dev->log, "[Mode 1] Header\n");
+        memcpy(b, dev->raw_buffer[dev->cur_buf] + 12, 4);
+        dev->cdrom_sector_size += 4;
+        b += 4;
     }
 
-    dev->cd_buflen = 0;
+    if (cdrom_sector_flags & 0x40) {
+        /* Sub-header */
+        if (!(cdrom_sector_flags & 0x10)) {
+            /* No user data */
+            cdrom_log(dev->log, "[Mode 1] Sub-header\n");
+            memcpy(b, dev->raw_buffer[dev->cur_buf] + 16, 8);
+            dev->cdrom_sector_size += 8;
+            b += 8;
+        }
+    }
+
+    if (cdrom_sector_flags & 0x10) {
+        /* User data */
+        cdrom_log(dev->log, "[Mode 1] User data\n");
+        if (mult > 1) {
+            memcpy(b, dev->raw_buffer[dev->cur_buf] + 16 +
+                   (part * dev->sector_size), dev->sector_size);
+            dev->cdrom_sector_size += dev->sector_size;
+            b += dev->sector_size;
+        } else {
+            memcpy(b, dev->raw_buffer[dev->cur_buf] + 16, 2048);
+            dev->cdrom_sector_size += 2048;
+            b += 2048;
+        }
+    }
+
+    if (cdrom_sector_flags & 0x08) {
+        /* EDC/ECC */
+        cdrom_log(dev->log, "[Mode 1] EDC/ECC\n");
+        memcpy(b, dev->raw_buffer[dev->cur_buf] + 2064, (288 - ecc_diff));
+        dev->cdrom_sector_size += (288 - ecc_diff);
+    }
+}
+
+static void
+process_mode2_non_xa(cdrom_t *dev, const int cdrom_sector_flags,
+                     uint8_t *b)
+{
+    dev->cdrom_sector_size = 0;
+
+    if (cdrom_sector_flags & 0x80) {
+        /* Sync */
+        cdrom_log(dev->log, "[Mode 2 Formless] Sync\n");
+        memcpy(b, dev->raw_buffer[dev->cur_buf], 12);
+        dev->cdrom_sector_size += 12;
+        b += 12;
+    }
+
+    if (cdrom_sector_flags & 0x20) {
+        /* Header */
+        cdrom_log(dev->log, "[Mode 2 Formless] Header\n");
+        memcpy(b, dev->raw_buffer[dev->cur_buf] + 12, 4);
+        dev->cdrom_sector_size += 4;
+        b += 4;
+    }
+
+    /* Mode 1 sector, expected type is 1 type. */
+    if (cdrom_sector_flags & 0x40) {
+        /* Sub-header */
+        cdrom_log(dev->log, "[Mode 2 Formless] Sub-header\n");
+        memcpy(b, dev->raw_buffer[dev->cur_buf] + 16, 8);
+        dev->cdrom_sector_size += 8;
+        b += 8;
+    }
+
+    if (cdrom_sector_flags & 0x10) {
+        /* User data */
+        cdrom_log(dev->log, "[Mode 2 Formless] User data\n");
+        memcpy(b, dev->raw_buffer[dev->cur_buf] + 24, (2336 - ecc_diff));
+        dev->cdrom_sector_size += (2336 - ecc_diff);
+    }
+}
+
+static void
+process_mode2_xa_form1(cdrom_t *dev, const int cdrom_sector_flags,
+                       uint8_t *b)
+{
+    dev->cdrom_sector_size = 0;
+
+    if (cdrom_sector_flags & 0x80) {
+        /* Sync */
+        cdrom_log(dev->log, "[XA Mode 2 Form 1] Sync\n");
+        memcpy(b, dev->raw_buffer[dev->cur_buf], 12);
+        dev->cdrom_sector_size += 12;
+        b += 12;
+    }
+
+    if (cdrom_sector_flags & 0x20) {
+        /* Header */
+        cdrom_log(dev->log, "[XA Mode 2 Form 1] Header\n");
+        memcpy(b, dev->raw_buffer[dev->cur_buf] + 12, 4);
+        dev->cdrom_sector_size += 4;
+        b += 4;
+    }
+
+    if (cdrom_sector_flags & 0x40) {
+        /* Sub-header */
+        cdrom_log(dev->log, "[XA Mode 2 Form 1] Sub-header\n");
+        memcpy(b, dev->raw_buffer[dev->cur_buf] + 16, 8);
+        dev->cdrom_sector_size += 8;
+        b += 8;
+    }
+
+    if (cdrom_sector_flags & 0x10) {
+        /* User data */
+        cdrom_log(dev->log, "[XA Mode 2 Form 1] User data\n");
+        if (mult > 1) {
+            memcpy(b, dev->raw_buffer[dev->cur_buf] + 24 +
+                   (part * dev->sector_size), dev->sector_size);
+            dev->cdrom_sector_size += dev->sector_size;
+            b += dev->sector_size;
+        } else {
+            memcpy(b, dev->raw_buffer[dev->cur_buf] + 24, 2048);
+            dev->cdrom_sector_size += 2048;
+            b += 2048;
+        }
+    }
+
+    if (cdrom_sector_flags & 0x08) {
+        /* EDC/ECC */
+        cdrom_log(dev->log, "[XA Mode 2 Form 1] EDC/ECC\n");
+        memcpy(b, dev->raw_buffer[dev->cur_buf] + 2072, (280 - ecc_diff));
+        dev->cdrom_sector_size += (280 - ecc_diff);
+    }
+}
+
+static void
+process_mode2_xa_form2(cdrom_t *dev, const int cdrom_sector_flags,
+                       uint8_t *b)
+{
+    dev->cdrom_sector_size = 0;
+
+    if (cdrom_sector_flags & 0x80) {
+        /* Sync */
+        cdrom_log(dev->log, "[XA Mode 2 Form 2] Sync\n");
+        memcpy(b, dev->raw_buffer[dev->cur_buf], 12);
+        dev->cdrom_sector_size += 12;
+        b += 12;
+    }
+
+    if (cdrom_sector_flags & 0x20) {
+        /* Header */
+        cdrom_log(dev->log, "[XA Mode 2 Form 2] Header\n");
+        memcpy(b, dev->raw_buffer[dev->cur_buf] + 12, 4);
+        dev->cdrom_sector_size += 4;
+        b += 4;
+    }
+
+    if (cdrom_sector_flags & 0x40) {
+        /* Sub-header */
+        cdrom_log(dev->log, "[XA Mode 2 Form 2] Sub-header\n");
+        memcpy(b, dev->raw_buffer[dev->cur_buf] + 16, 8);
+        dev->cdrom_sector_size += 8;
+        b += 8;
+    }
+
+    if (cdrom_sector_flags & 0x10) {
+        /* User data */
+        cdrom_log(dev->log, "[XA Mode 2 Form 2] User data\n");
+        memcpy(b, dev->raw_buffer[dev->cur_buf] + 24,
+               (2328 - ecc_diff));
+        dev->cdrom_sector_size += (2328 - ecc_diff);
+    }
+}
+
+static void
+process_c2(cdrom_t *dev, const int cdrom_sector_flags, uint8_t *b)
+{
+    if ((cdrom_sector_flags & 0x06) == 0x02) {
+        /* Add error flags. */
+        cdrom_log(dev->log, "Error flags\n");
+        memcpy(b + dev->cdrom_sector_size, dev->extra_buffer, 294);
+        dev->cdrom_sector_size += 294;
+    } else if ((cdrom_sector_flags & 0x06) == 0x04) {
+        /* Add error flags. */
+        cdrom_log(dev->log, "Full error flags\n");
+        memcpy(b + dev->cdrom_sector_size, dev->extra_buffer, 296);
+        dev->cdrom_sector_size += 296;
+    }
+}
+
+static void
+cdrom_deinterleave_subch(uint8_t *d, const uint8_t *s)
+{
+    for (int i = 0; i < 8 * 12; i++) {
+        int dmask = 0x80;
+        int smask = 1 << (7 - (i / 12));
+
+        (*d) = 0;
+
+        for (int j = 0; j < 8; j++) {
+            (*d) |= (s[(i % 12) * 8 + j] & smask) ? dmask : 0;
+            dmask >>= 1;
+        }
+
+        d++;
+    }
+}
+
+static void
+process_c2_and_subch(cdrom_t *dev, const int cdrom_sector_flags,
+                      uint8_t *b)
+{
+     if (dev->c2_first)
+         process_c2(dev, cdrom_sector_flags, b);
+
+     if ((cdrom_sector_flags & 0x700) == 0x100) {
+         cdrom_log(dev->log, "Raw subchannel data\n");
+         memcpy(b + dev->cdrom_sector_size, dev->raw_buffer[dev->cur_buf] +
+                2352, 96);
+         dev->cdrom_sector_size += 96;
+     } else if ((cdrom_sector_flags & 0x700) == 0x200) {
+         cdrom_log(dev->log, "Q subchannel data\n");
+         memcpy(b + dev->cdrom_sector_size, dev->raw_buffer[dev->cur_buf] +
+                2352, 16);
+         dev->cdrom_sector_size += 16;
+     } else if ((cdrom_sector_flags & 0x700) == 0x400) {
+         cdrom_log(dev->log, "R/W subchannel data\n");
+         cdrom_deinterleave_subch(b + dev->cdrom_sector_size,
+                                  dev->raw_buffer[dev->cur_buf] + 2352);
+         dev->cdrom_sector_size += 96;
+     }
+
+     if (!dev->c2_first)
+         process_c2(dev, cdrom_sector_flags, b);
+}
+
+static void
+cdrom_drive_reset(cdrom_t *dev)
+{
+    dev->priv          = NULL;
+    dev->insert        = NULL;
+    dev->close         = NULL;
+    dev->get_volume    = NULL;
+    dev->get_channel   = NULL;
+
+    dev->cached_sector = -1;
+
+    if (cdrom_drive_types[dev->type].speed == -1)
+        dev->real_speed  = dev->speed;
+    else
+        dev->real_speed  = cdrom_drive_types[dev->type].speed;
+}
+
+static void
+cdrom_unload(cdrom_t *dev)
+{
+    if (dev->log != NULL) {
+        cdrom_log(dev->log, "CDROM: cdrom_unload(%s)\n", dev->image_path);
+    }
+
+    dev->cd_status     = CD_STATUS_EMPTY;
+    dev->cached_sector = -1;
+
+    if (dev->local != NULL) {
+        dev->ops->close(dev->local);
+        dev->local = NULL;
+    }
+
+    dev->ops = NULL;
+}
+
+#ifdef ENABLE_CDROM_LOG
+static void
+cdrom_toc_dump(cdrom_t *dev)
+{
+    uint8_t     b[65536] = { 0 };
+    int         len      = cdrom_read_toc(dev, b, CD_TOC_RAW, 0, 0, 65536);
+    const char *fn2      = "d:\\86boxnew\\toc_cue.dmp";
+    FILE *      fp        = fopen(fn2, "wb");
+    fwrite(b, 1, len, fp);
+    fflush(fp);
+    fclose(fp);
+    cdrom_log(dev->log, "Written TOC of %i bytes to %s\n", len, fn2);
+
+    memset(b, 0x00, 65536);
+    len      = cdrom_read_toc(dev, b, CD_TOC_NORMAL, 0, 0, 65536);
+    fn2      = "d:\\86boxnew\\toc_cue_cooked.dmp";
+    fp        = fopen(fn2, "wb");
+    fwrite(b, 1, len, fp);
+    fflush(fp);
+    fclose(fp);
+    cdrom_log(dev->log, "Written cooked TOC of %i bytes to %s\n", len, fn2);
+
+    memset(b, 0x00, 65536);
+    len      = cdrom_read_toc(dev, b, CD_TOC_SESSION, 0, 0, 65536);
+    fn2      = "d:\\86boxnew\\toc_cue_session.dmp";
+    fp        = fopen(fn2, "wb");
+    fwrite(b, 1, len, fp);
+    fflush(fp);
+    fclose(fp);
+    cdrom_log(dev->log, "Written session TOC of %i bytes to %s\n", len, fn2);
+}
+#endif
+
+/* Reset the CD-ROM Interface, whichever one that is. */
+void
+cdrom_interface_reset(void)
+{
+    /* If we have a valid controller, add its device. */
+    if ((cdrom_interface_current > 0) &&
+        controllers[cdrom_interface_current].device)
+        device_add(controllers[cdrom_interface_current].device);
+}
+
+const char *
+cdrom_interface_get_internal_name(const int cdinterface)
+{
+    return device_get_internal_name(controllers[cdinterface].device);
+}
+
+int
+cdrom_interface_get_from_internal_name(const char *s)
+{
+    int c = 0;
+
+    while (controllers[c].device != NULL) {
+        if (!strcmp(controllers[c].device->internal_name, s))
+            return c;
+        c++;
+    }
+
+    return 0;
+}
+
+const device_t *
+cdrom_interface_get_device(const int cdinterface)
+{
+    return (controllers[cdinterface].device);
+}
+
+int
+cdrom_interface_has_config(const int cdinterface)
+{
+    const device_t *dev = cdrom_interface_get_device(cdinterface);
+
+    if (dev == NULL)
+        return 0;
+
+    if (!device_has_config(dev))
+        return 0;
+
     return 1;
 }
 
+int
+cdrom_interface_get_flags(const int cdinterface)
+{
+    return (controllers[cdinterface].device->flags);
+}
+
+int
+cdrom_interface_available(const int cdinterface)
+{
+    return (device_available(controllers[cdinterface].device));
+}
+
+char *
+cdrom_get_vendor(const int type)
+{
+    return (char *) cdrom_drive_types[type].vendor;
+}
+
 void
-cdrom_audio_pause_resume(cdrom_t *dev, uint8_t resume)
+cdrom_get_model(const int type, char *name, const int id)
 {
-    if ((dev->cd_status == CD_STATUS_PLAYING) || (dev->cd_status == CD_STATUS_PAUSED))
-        dev->cd_status = (dev->cd_status & 0xfe) | (resume & 0x01);
+    if (!strcmp(cdrom_drive_types[type].vendor, EMU_NAME))
+        sprintf(name, "%s%02i", cdrom_drive_types[type].model, id);
+    else
+        sprintf(name, "%s", cdrom_drive_types[type].model);
+}
+
+char *
+cdrom_get_revision(const int type)
+{
+    return (char *) cdrom_drive_types[type].revision;
+}
+
+int
+cdrom_get_scsi_std(const int type)
+{
+    return cdrom_drive_types[type].scsi_std;
+}
+
+int
+cdrom_is_early(const int type)
+{
+    return (cdrom_drive_types[type].scsi_std == 1);
+}
+
+int
+cdrom_is_dvd(const int type)
+{
+    return (cdrom_drive_types[type].is_dvd == 1);
+}
+
+int
+cdrom_is_generic(const int type)
+{
+    return (cdrom_drive_types[type].speed == -1);
+}
+
+int
+cdrom_is_caddy(const int type)
+{
+    return cdrom_drive_types[type].caddy;
+}
+
+int
+cdrom_get_speed(const int type)
+{
+    return cdrom_drive_types[type].speed;
+}
+
+int
+cdrom_get_inquiry_len(const int type)
+{
+    return cdrom_drive_types[type].inquiry_len;
+}
+
+int
+cdrom_get_transfer_max(const int type, const int mode)
+{
+    return cdrom_drive_types[type].transfer_max[mode];
+}
+
+int
+cdrom_has_dma(const int type)
+{
+    return (cdrom_drive_types[type].transfer_max[2] != -1);
+}
+
+int
+cdrom_get_type_count(void)
+{
+    int count = 0;
+
+    while (1) {
+        if (strlen(cdrom_drive_types[count].vendor) == 0)
+            break;
+        else
+            count++;
+    }
+
+    return count;
+}
+
+void
+cdrom_generate_name_mke(const int type, char *name)
+{
+    char  elements[2][512] = { 0 };
+
+    memcpy(elements[0], cdrom_drive_types[type].model,
+           strlen(cdrom_drive_types[type].model) + 1);
+    char *s = strstr(elements[0], "  ");
+    if (s != NULL)
+        s[0] = 0x00;
+
+    memcpy(elements[1], cdrom_drive_types[type].revision,
+           strlen(cdrom_drive_types[type].revision) + 1);
+    s = strstr(elements[1], " ");
+    if (s != NULL)
+        s[0] = 0x00;
+
+    sprintf(name, "%s%s", elements[0], elements[1]);
+}
+
+void
+cdrom_get_identify_model(const int type, char *name, const int id)
+{
+    char  elements[2][512] = { 0 };
+
+    memcpy(elements[0], cdrom_drive_types[type].vendor,
+           strlen(cdrom_drive_types[type].vendor) + 1);
+
+    memcpy(elements[1], cdrom_drive_types[type].model,
+           strlen(cdrom_drive_types[type].model) + 1);
+
+    char *s = strstr(elements[1], "  ");
+
+    if (s != NULL)
+        s[0] = 0x00;
+
+    if (!strcmp(cdrom_drive_types[type].vendor, EMU_NAME))
+        sprintf(name, "%s%02i", elements[1], id);
+    else if (!strcmp(cdrom_drive_types[type].vendor, "ASUS"))
+        sprintf(name, "%s    %s", elements[0], elements[1]);
+    else if (!strcmp(cdrom_drive_types[type].vendor, "NEC"))
+        sprintf(name, "%s                 %s", elements[0], elements[1]);
+    else if (!strcmp(cdrom_drive_types[type].vendor, "LITE-ON"))
+        sprintf(name, "%s", elements[1]);
+    else
+        sprintf(name, "%s %s", elements[0], elements[1]);
+}
+
+void
+cdrom_get_name(const int type, char *name)
+{
+    char n[2048] = { 0 };
+
+    cdrom_generate_name(type, n, 0);
+
+    if (cdrom_drive_types[type].bus_type == BUS_TYPE_SCSI)
+        sprintf(name, "[SCSI-%i] %s", cdrom_drive_types[type].scsi_std, n);
+    else
+        sprintf(name, "%s", n);
+}
+
+char *
+cdrom_get_internal_name(const int type)
+{
+    return (char *) cdrom_drive_types[type].internal_name;
+}
+
+int
+cdrom_get_from_internal_name(const char *s)
+{
+    int  c       = 0;
+    int  found   = 0;
+
+    while (strlen(cdrom_drive_types[c].internal_name) > 0) {
+        if (!strcmp((char *) cdrom_drive_types[c].internal_name, s)) {
+            found = 1;
+            break;
+        }
+        c++;
+    }
+
+    if (!found)
+        c = -1;
+
+    return c;
+}
+
+/* TODO: Configuration migration, remove when no longer needed. */
+int
+cdrom_get_from_name(const char *s)
+{
+    int  c       = 0;
+    int  found   = 0;
+    char n[2048] = { 0 };
+
+    if (strcmp(s, "none")) {
+        while (strlen(cdrom_drive_types[c].internal_name) > 0) {
+            memset(n, 0x00, 2048);
+            cdrom_generate_name(c, n, 1);
+            /* Special case some names. */
+            if ((!strcmp(s, "86BOX_CD-ROM_1.00") && !strcmp(n, "86Box_86B_CD_3.50")) ||
+                (!strcmp(s, "TEAC_CD_532E_2.0A") && !strcmp(n, "TEAC_CD-532E_2.0A")) ||
+                !strcmp(n, s)) {
+                found = 1;
+                break;
+            }
+            c++;
+        }
+    }
+
+    if (!found) {
+        if (strcmp(s, "none")) {
+            wchar_t tempmsg[2048];
+            sprintf(n, "WARNING: CD-ROM \"%s\" not found - contact 86Box support\n", s);
+            swprintf(tempmsg, sizeof_w(tempmsg), L"%hs", n);
+            pclog("%s", n);
+            ui_msgbox_header(MBX_INFO,
+                             plat_get_string(STRING_HW_NOT_AVAILABLE_TITLE),
+                             tempmsg);
+        }
+        c = -1;
+    }
+
+    return c;
+}
+
+void
+cdrom_set_type(const int model, const int type)
+{
+    cdrom[model].type = type;
+}
+
+int
+cdrom_get_type(const int model)
+{
+    return cdrom[model].type;
+}
+
+int
+cdrom_lba_to_msf_accurate(const int lba)
+{
+    int       pos = lba + 150;
+    const int f   = pos % 75;
+    pos -= f;
+    pos /= 75;
+    const int s = pos % 60;
+    pos -= s;
+    pos /= 60;
+    const int m = pos;
+
+    return ((m << 16) | (s << 8) | f);
+}
+
+void
+cdrom_interleave_subch(uint8_t *d, const uint8_t *s)
+{
+    memset(d, 0x00, 96);
+
+    for (int i = 0; i < 8 * 12; i++) {
+        int smask = 0x80;
+        int dmask = 1 << (7 - (i / 12));
+
+        for (int j = 0; j < 8; j++) {
+            d[(i % 12) * 8 + j] |= ((*s) & smask) ? dmask : 0;
+            smask >>= 1;
+        }
+
+        s++;
+    }
+}
+
+double
+cdrom_seek_time(const cdrom_t *dev)
+{
+    uint32_t       diff = dev->seek_diff;
+    const double   sd   = (double) (MAX_SEEK - MIN_SEEK);
+
+    if (diff < MIN_SEEK)
+        return 0.0;
+    if (diff > MAX_SEEK)
+        diff = MAX_SEEK;
+
+    diff -= MIN_SEEK;
+
+    return cdrom_get_short_seek(dev) +
+           ((cdrom_get_long_seek(dev) * ((double) diff)) / sd);
+}
+
+void
+cdrom_stop(cdrom_t *dev)
+{
+    if (dev->cd_status > CD_STATUS_DVD)
+        dev->cd_status = CD_STATUS_STOPPED;
+}
+
+void
+cdrom_seek(cdrom_t *dev, const uint32_t pos, const uint8_t vendor_type)
+{
+    int      m;
+    int      s;
+    int      f;
+    uint32_t real_pos = pos;
+
+    if (dev == NULL)
+        return;
+
+    cdrom_log(dev->log, "Seek to LBA %08X, vendor type = %02x.\n", pos, vendor_type);
+
+    switch (vendor_type) {
+        case 0x40:
+            m = bcd2bin((pos >> 24) & 0xff);
+            s = bcd2bin((pos >> 16) & 0xff);
+            f = bcd2bin((pos >> 8) & 0xff);
+            real_pos = MSFtoLBA(m, s, f) - 150;
+            break;
+        case 0x80:
+            real_pos = bcd2bin((pos >> 24) & 0xff);
+            break;
+        default:
+            break;
+    }
+
+    dev->seek_pos = real_pos;
+    cdrom_stop(dev);
+}
+
+int
+cdrom_is_pre(const cdrom_t *dev, const uint32_t lba)
+{
+    if (dev->ops && dev->ops->is_track_pre)
+        return dev->ops->is_track_pre(dev->local, lba);
+
+    return 0;
+}
+
+#include <86box/filters.h>
+
+static void
+cdrom_audio_deemphasize(int16_t *buffer)
+{
+    for (int i = 0; i < 588; i++)
+        for (int j = 0; j < 2; j++)
+            buffer[(i * 2) + j] = deemph_iir(j, buffer[(i * 2) + j]);
+}
+
+int
+cdrom_audio_callback(cdrom_t *dev, int16_t *output, const int len)
+{
+    int ret = 1;
+
+    while (dev->cd_buflen < len) {
+        if (dev->seek_pos < dev->cd_end) {
+            ret = dev->ops->read_sector(dev->local,
+                                        dev->raw_buffer[dev->cur_buf ^ 1],
+                                        dev->seek_pos);
+            if (!dev->sound_on)
+                memset(dev->raw_buffer[dev->cur_buf ^ 1], 0x00, 2352);
+            dev->cur_buf ^= 1;
+            if (ret) {
+                cdrom_log(dev->log, "Read LBA %08X successful\n", dev->seek_pos);
+                dev->cached_sector = dev->seek_pos;
+                /* Q subchannel data in bit 6: 4-5-6-7-0-1-2-3. */
+                if ((dev->raw_buffer[dev->cur_buf][2353] >> 6) & 0x01)
+                    /* Data sector, copy silence into buffer. */
+                    memset((uint8_t *) &(dev->cd_buffer[dev->cd_buflen]),
+                           0x00, RAW_SECTOR_SIZE);
+                else {
+                    memcpy((uint8_t *) &(dev->cd_buffer[dev->cd_buflen]),
+                           dev->raw_buffer[dev->cur_buf], RAW_SECTOR_SIZE);
+                    if ((dev->raw_buffer[dev->cur_buf][2355] >> 6) & 0x01)
+                        /* De-emphasize pre-emphasized audio. */
+                        cdrom_audio_deemphasize(&(dev->cd_buffer[dev->cd_buflen]));
+                }
+                dev->seek_pos++;
+                dev->cd_buflen += (RAW_SECTOR_SIZE / 2);
+                ret = 1;
+            } else {
+                cdrom_log(dev->log, "Read LBA %08X failed\n", dev->seek_pos);
+                memset(&(dev->cd_buffer[dev->cd_buflen]), 0x00,
+                       (CD_BUF_SIZE - dev->cd_buflen) * 2);
+                dev->cd_status    = CD_STATUS_STOPPED;
+                dev->cd_buflen    = len;
+                ret               = 0;
+            }
+        } else {
+            cdrom_log(dev->log, "Playing completed\n");
+            memset(&dev->cd_buffer[dev->cd_buflen], 0x00, (CD_BUF_SIZE - dev->cd_buflen) * 2);
+            dev->cd_status    = CD_STATUS_PLAYING_COMPLETED;
+            dev->cd_buflen    = len;
+            ret               = 0;
+        }
+    }
+
+    memcpy(output, dev->cd_buffer, len * 2);
+    memmove(dev->cd_buffer, &dev->cd_buffer[len], (CD_BUF_SIZE - len) * 2);
+    dev->cd_buflen -= len;
+
+    if (!dev->sound_on)
+        ret               = 0;
+
+    cdrom_log(dev->log, "Audio callback returning %i\n", ret);
+    return ret;
 }
 
 uint8_t
-cdrom_get_current_subchannel(cdrom_t *dev, uint8_t *b, int msf)
+cdrom_audio_play(cdrom_t *dev, const uint32_t pos, const uint32_t len, const int ismsf)
 {
-    uint8_t      ret;
-    subchannel_t subc;
-    int          pos = 1;
-    int          m;
-    int          s;
-    int          f;
-    uint32_t     dat;
+    track_info_t ti;
+    uint32_t      pos2      = pos;
+    uint32_t      len2      = len;
+    int           ret       = 0;
 
-    dev->ops->get_subchannel(dev, dev->seek_pos, &subc);
+    if (dev->cd_status & CD_STATUS_HAS_AUDIO) {
+        cdrom_log(dev->log, "Play audio - %08X %08X %i\n", pos2, len, ismsf);
 
-    if (dev->cd_status == CD_STATUS_DATA_ONLY)
-        ret = 0x15;
-    else {
-        if (dev->cd_status == CD_STATUS_PLAYING)
-            ret = 0x11;
-        else if (dev->cd_status == CD_STATUS_PAUSED)
-            ret = 0x12;
+        if (ismsf & 0x100) {
+            /* Track-relative audio play. */
+            pos2 = ismsf & 0xff;
+            if ((dev->is_bcd || dev->is_chinon) && (pos2 < 0xa0))
+                pos2 = bcd2bin(pos2);
+            ret = dev->ops->get_track_info(dev->local, ismsf & 0xff, 0, &ti);
+            if (ret)
+               pos2 += MSFtoLBA(ti.m, ti.s, ti.f) - 150;
+            else {
+                cdrom_log(dev->log, "Unable to get the starting position for "
+                          "track %08X\n", ismsf & 0xff);
+                cdrom_stop(dev);
+            }
+        } else if ((ismsf == 2) || (ismsf == 3)) {
+            if ((dev->is_bcd || dev->is_chinon) && (pos2 < 0xa0))
+                pos2 = bcd2bin(pos2);
+            ret = dev->ops->get_track_info(dev->local, pos2, 0, &ti);
+            if (ret) {
+                pos2 = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
+                if (ismsf == 2) {
+                    /* We have to end at the *end* of the specified track,
+                       not at the beginning. */
+                    if ((dev->is_bcd || dev->is_chinon) && (len2 < 0xa0))
+                        len2 = bcd2bin(len2);
+                    ret = dev->ops->get_track_info(dev->local, len2, 1, &ti);
+                    if (ret)
+                        len2 = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
+                    else {
+                        cdrom_log(dev->log, "Unable to get the ending position for "
+                                  "track %08X\n", pos2);
+                        cdrom_stop(dev);
+                    }
+                }
+            } else {
+                cdrom_log(dev->log, "Unable to get the starting position for "
+                          "track %08X\n", pos2);
+                cdrom_stop(dev);
+            }
+        } else if (ismsf == 1) {
+            int m = (pos >> 16) & 0xff;
+            int s = (pos >> 8) & 0xff;
+            int f = pos & 0xff;
+
+            /* NEC CDR-260 speaks BCD. */
+            if (dev->is_bcd)
+                msf_from_bcd(&m, &s, &f);
+
+            if (pos == 0xffffff) {
+                cdrom_log(dev->log, "Playing from current position (MSF)\n");
+                pos2 = dev->seek_pos;
+            } else
+                pos2 = MSFtoLBA(m, s, f) - 150;
+
+            m = (len >> 16) & 0xff;
+            s = (len >> 8) & 0xff;
+            f = len & 0xff;
+
+            /* NEC CDR-260 speaks BCD. */
+            if (dev->is_bcd)
+                msf_from_bcd(&m, &s, &f);
+
+            len2 = MSFtoLBA(m, s, f) - 150;
+
+            ret = 1;
+
+            cdrom_log(dev->log, "MSF - pos = %08X len = %08X\n", pos2, len);
+        } else if (ismsf == 0) {
+            if (pos == 0xffffffff) {
+                cdrom_log(dev->log, "Playing from current position\n");
+                pos2 = dev->seek_pos;
+            }
+            len2 += pos2;
+
+            ret  = 1;
+        }
+    }
+
+    if (ret) {
+        /*
+           Do this at this point, since it's at this point that we know the
+           actual LBA position to start playing from.
+         */
+        ret = (dev->ops->get_track_type(dev->local, pos2) == CD_TRACK_AUDIO);
+
+        if (ret) {
+            dev->seek_diff     = ABS(dev->seek_pos - pos2);
+            dev->seek_pos      = pos2;
+            dev->cd_end        = len2;
+            dev->cd_status     = CD_STATUS_PLAYING;
+            dev->cd_buflen     = 0;
+        } else {
+            cdrom_log(dev->log, "LBA %08X not on an audio track\n", pos);
+            cdrom_stop(dev);
+        }
+    }
+
+    return ret;
+}
+
+uint8_t
+cdrom_audio_track_search(cdrom_t *dev, const uint32_t pos,
+                         const int type, const uint8_t playbit)
+{
+    uint32_t pos2 = pos;
+    uint8_t  ret  = 0;
+
+    if (dev->cd_status & CD_STATUS_HAS_AUDIO) {
+        cdrom_log(dev->log, "Audio Track Search: MSF = %06x, type = %02x, "
+                  "playbit = %02x\n", pos, type, playbit);
+
+        ret = 1;
+
+        switch (type) {
+            case 0x00:
+                if (pos == 0xffffffff) {
+                    cdrom_log(dev->log, "(Type 0) Search from current position\n");
+                    pos2 = dev->seek_pos;
+                }
+                dev->seek_pos = pos2;
+                break;
+            case 0x40: {
+                const int m   = bcd2bin((pos >> 24) & 0xff);
+                const int s   = bcd2bin((pos >> 16) & 0xff);
+                const int f   = bcd2bin((pos >> 8) & 0xff);
+                if (pos == 0xffffffff) {
+                    cdrom_log(dev->log, "(Type 1) Search from current position\n");
+                    pos2 = dev->seek_pos;
+                } else
+                    pos2 = MSFtoLBA(m, s, f) - 150;
+
+                dev->seek_pos = pos2;
+                break;
+            } case 0x80: {
+                track_info_t ti;
+
+                pos2 = (pos2 >> 24) & 0xff;
+                if (pos2 < 0xa0)
+                    pos2 = bcd2bin(pos2);
+                ret = dev->ops->get_track_info(dev->local, pos2, 1, &ti);
+                if (ret)
+                    dev->seek_pos = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
+                else {
+                    cdrom_log(dev->log, "Unable to get the starting position for "
+                              "track %08X\n", pos2 & 0xff);
+                    cdrom_stop(dev);
+                }
+                break;
+            } default:
+                break;
+        }
+
+        if (ret) {
+            if (pos2 != 0x00000000)
+                pos2--;
+
+            cdrom_log(dev->log, "Track Search Toshiba: LBA=%08X.\n", pos);
+
+            dev->cd_end    = dev->cdrom_capacity;
+            dev->cd_buflen = 0;
+
+            dev->cd_status = playbit ? CD_STATUS_PLAYING : CD_STATUS_HOLD;
+
+            ret            = 1;
+        }
+    }
+
+    return ret;
+}
+
+uint8_t
+cdrom_audio_track_search_pioneer(cdrom_t *dev, const uint32_t pos, const uint8_t playbit)
+{
+    uint8_t  ret  = 0;
+
+    if (dev->cd_status &= CD_STATUS_HAS_AUDIO) {
+        const int f    = bcd2bin((pos >> 24) & 0xff);
+        const int s    = bcd2bin((pos >> 16) & 0xff);
+        const int m    = bcd2bin((pos >> 8) & 0xff);
+        uint32_t  pos2;
+
+        if (pos == 0xffffffff)
+            pos2 = dev->seek_pos;
         else
-            ret = 0x13;
+            pos2 = MSFtoLBA(m, s, f) - 150;
+
+        dev->seek_pos = pos2;
+
+        /*
+           Do this at this point, since it's at this point that we know the
+           actual LBA position to start playing from.
+         */
+        if (dev->ops->get_track_type(dev->local, pos2) & CD_TRACK_AUDIO) {
+            dev->cd_end    = dev->cdrom_capacity;
+            dev->cd_buflen = 0;
+
+            dev->cd_status = playbit ? CD_STATUS_PLAYING : CD_STATUS_HOLD;
+
+            ret = 1;
+        } else {
+            cdrom_log(dev->log, "LBA %08X not on an audio track\n", pos);
+            cdrom_stop(dev);
+        }
     }
 
-    cdrom_log("CD-ROM %i: Returned subchannel absolute at %02i:%02i.%02i, relative at %02i:%02i.%02i, ret = %02x, seek pos = %08x, cd_end = %08x.\n", dev->id, subc.abs_m, subc.abs_s, subc.abs_f, subc.rel_m, subc.rel_s, subc.rel_f, ret, dev->seek_pos, dev->cd_end);
+    return ret;
+}
 
-    if (b[pos] > 1) {
-        cdrom_log("B[%i] = %02x, ret = %02x.\n", pos, b[pos], ret);
-        return ret;
+uint8_t
+cdrom_audio_play_pioneer(cdrom_t *dev, const uint32_t pos)
+{
+    uint8_t  ret  = 0;
+
+    if (dev->cd_status & CD_STATUS_HAS_AUDIO) {
+        const int f    = bcd2bin((pos >> 24) & 0xff);
+        const int s    = bcd2bin((pos >> 16) & 0xff);
+        const int m    = bcd2bin((pos >> 8) & 0xff);
+        uint32_t  pos2 = MSFtoLBA(m, s, f) - 150;
+        dev->cd_end = pos2;
+
+        dev->cd_buflen = 0;
+
+        dev->cd_status = CD_STATUS_PLAYING;
+
+        ret = 1;
     }
 
-    b[pos++] = subc.attr;
-    b[pos++] = subc.track;
-    b[pos++] = subc.index;
+    return ret;
+}
 
-    if (msf) {
-        b[pos] = 0;
+uint8_t
+cdrom_audio_play_toshiba(cdrom_t *dev, const uint32_t pos, const int type)
+{
+    uint32_t pos2 = pos;
+    uint8_t  ret  = 0;
 
-        /* NEC CDR-260 speaks BCD. */
-        if ((dev->type == CDROM_TYPE_NEC_260_100) || (dev->type == CDROM_TYPE_NEC_260_101)) { /*NEC*/
-            m = subc.abs_m;
-            s = subc.abs_s;
-            f = subc.abs_f;
-            msf_to_bcd(&m, &s, &f);
-            b[pos + 1] = m;
-            b[pos + 2] = s;
-            b[pos + 3] = f;
-        } else {
-            b[pos + 1] = subc.abs_m;
-            b[pos + 2] = subc.abs_s;
-            b[pos + 3] = subc.abs_f;
+    if (dev->cd_status & CD_STATUS_HAS_AUDIO) {
+        /* Preliminary support, revert if too incomplete. */
+        ret = 1;
+
+        switch (type) {
+            case 0x00:
+                dev->cd_end = pos2;
+                break;
+            case 0x40: {
+                const int m   = bcd2bin((pos >> 24) & 0xff);
+                const int s   = bcd2bin((pos >> 16) & 0xff);
+                const int f   = bcd2bin((pos >> 8) & 0xff);
+                pos2 = MSFtoLBA(m, s, f) - 150;
+                dev->cd_end = pos2;
+                break;
+            } case 0x80: {
+                track_info_t ti;
+
+                pos2 = (pos2 >> 24) & 0xff;
+                if (pos2 < 0xa0)
+                    pos2 = bcd2bin(pos2);
+                ret = dev->ops->get_track_info(dev->local, pos2, 1, &ti);
+                if (ret)
+                    dev->cd_end = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
+                else {
+                    cdrom_log(dev->log, "Unable to get the starting position for "
+                              "track %08X\n", pos2 & 0xff);
+                    cdrom_stop(dev);
+                }
+                break;
+            } case 0xc0:
+                if (pos == 0xffffffff) {
+                    cdrom_log(dev->log, "Playing from current position\n");
+                    pos2 = dev->cd_end;
+                }
+                dev->cd_end = pos2;
+                break;
+            default:
+                break;
         }
 
-        pos += 4;
+        if (ret) {
+            cdrom_log(dev->log, "Toshiba Play Audio: LBA=%08X.\n", pos2);
 
-        b[pos] = 0;
-
-        /* NEC CDR-260 speaks BCD. */
-        if ((dev->type == CDROM_TYPE_NEC_260_100) || (dev->type == CDROM_TYPE_NEC_260_101)) { /*NEC*/
-            m = subc.rel_m;
-            s = subc.rel_s;
-            f = subc.rel_f;
-            msf_to_bcd(&m, &s, &f);
-            b[pos + 1] = m;
-            b[pos + 2] = s;
-            b[pos + 3] = f;
-        } else {
-            b[pos + 1] = subc.rel_m;
-            b[pos + 2] = subc.rel_s;
-            b[pos + 3] = subc.rel_f;
+            dev->cd_status = CD_STATUS_PLAYING;
+            dev->cd_buflen = 0;
         }
+    }
 
-        pos += 4;
-    } else {
-        dat      = MSFtoLBA(subc.abs_m, subc.abs_s, subc.abs_f) - 150;
-        b[pos++] = (dat >> 24) & 0xff;
-        b[pos++] = (dat >> 16) & 0xff;
-        b[pos++] = (dat >> 8) & 0xff;
-        b[pos++] = dat & 0xff;
-        dat      = MSFtoLBA(subc.rel_m, subc.rel_s, subc.rel_f);
-        b[pos++] = (dat >> 24) & 0xff;
-        b[pos++] = (dat >> 16) & 0xff;
-        b[pos++] = (dat >> 8) & 0xff;
-        b[pos++] = dat & 0xff;
+    return ret;
+}
+
+uint8_t
+cdrom_audio_scan(cdrom_t *dev, const uint32_t pos)
+{
+    uint32_t      pos2      = pos;
+    uint8_t       ret       = 0;
+
+    if (dev->cd_status & CD_STATUS_HAS_AUDIO) {
+        cdrom_log(dev->log, "Audio Scan: MSF = %06x\n", pos);
+
+        if (pos == 0xffffffff) {
+            cdrom_log(dev->log, "(Type 0) Search from current position\n");
+            pos2 = dev->seek_pos;
+        }
+        dev->seek_pos = pos2;
+
+        /* Do this at this point, since it's at this point that we know the
+           actual LBA position to start playing from. */
+        if (dev->ops->get_track_type(dev->local, pos) & CD_TRACK_AUDIO) {
+            dev->cd_buflen = 0;
+            ret            = 1;
+        } else {
+            cdrom_log(dev->log, "LBA %08X not on an audio track\n", pos);
+            cdrom_stop(dev);
+        }
     }
 
     return ret;
 }
 
 void
-cdrom_get_current_subchannel_sony(cdrom_t *dev, uint8_t *b, int msf)
+cdrom_audio_pause_resume(cdrom_t *dev, const uint8_t resume)
+{
+    if ((dev->cd_status == CD_STATUS_PLAYING) || (dev->cd_status == CD_STATUS_PAUSED))
+        dev->cd_status = (dev->cd_status & 0xfe) | (resume & 0x01);
+}
+
+uint8_t
+cdrom_get_current_status(const cdrom_t *dev)
+{
+    const uint8_t ret = status_codes[dev->is_chinon]
+                                    [dev->cd_status & CD_STATUS_MASK];
+
+    return ret;
+}
+
+void
+cdrom_get_current_subchannel(cdrom_t *dev, uint8_t *b, const int msf)
+{
+    subchannel_t  subc;
+    int           base      = 0;
+    int           diff      = 4;
+
+    if (dev->cached_sector == -1)
+        cdrom_get_subchannel(dev, dev->seek_pos, &subc, 1);
+    else
+        cdrom_get_subchannel(dev, dev->cached_sector, &subc, 1);
+
+    cdrom_log(dev->log, "Returned subchannel absolute at %02i:%02i.%02i, "
+              "relative at %02i:%02i.%02i, seek pos = %08x, cd_end = %08x.\n",
+              subc.abs_m, subc.abs_s, subc.abs_f, subc.rel_m, subc.rel_s, subc.rel_f,
+              dev->seek_pos, dev->cd_end);
+
+    /* Format code. */
+    switch (b[0]) {
+        /*
+           Mode 0 = Q subchannel mode, first 16 bytes are indentical to mode 1 (current
+                    position), the rest are stuff like ISRC etc., which can be all zeroes.
+         */
+        case 0x00:
+            if (dev->bus_type == CDROM_BUS_ATAPI)
+                break;
+            diff = 0;
+            fallthrough;
+        case 0x01:
+            /* Current position. */
+            b[1] = subc.attr;
+            if ((dev->is_bcd || dev->is_chinon) &&
+                (subc.track >= 1) && (subc.track <= 99))
+                b[2] = bin2bcd(subc.track);
+            else
+                b[2] = subc.track;
+            b[3] = subc.index;
+
+            if (msf) {
+                b[4] = b[8] = 0x00;
+
+                /* NEC CDR-260 speaks BCD. */
+                if (dev->is_bcd) {
+                    b[5]  = bin2bcd(subc.abs_m);
+                    b[6]  = bin2bcd(subc.abs_s);
+                    b[7]  = bin2bcd(subc.abs_f);
+
+                    b[9]  = bin2bcd(subc.rel_m);
+                    b[10] = bin2bcd(subc.rel_s);
+                    b[11] = bin2bcd(subc.rel_f);
+                } else {
+                    b[5]  = subc.abs_m;
+                    b[6]  = subc.abs_s;
+                    b[7]  = subc.abs_f;
+
+                    b[9]  = subc.rel_m;
+                    b[10] = subc.rel_s;
+                    b[11] = subc.rel_f;
+                }
+            } else {
+                uint32_t dat   = MSFtoLBA(subc.abs_m, subc.abs_s, subc.abs_f) - 150;
+                b[4]  = (dat >> 24) & 0xff;
+                b[5]  = (dat >> 16) & 0xff;
+                b[6]  = (dat >> 8) & 0xff;
+                b[7]  = dat & 0xff;
+
+                dat   = MSFtoLBA(subc.rel_m, subc.rel_s, subc.rel_f);
+                b[8]  = (dat >> 24) & 0xff;
+                b[9]  = (dat >> 16) & 0xff;
+                b[10] = (dat >> 8) & 0xff;
+                b[11] = dat & 0xff;
+            }
+            if (b[0] != 0x00)
+                break;
+            base += 12;
+            fallthrough;
+        case 0x02:
+            /* UPC  - TODO: Finding and reporting the actual UPC data. */
+            memset(&(b[base]), 0x00, 20 - diff);
+            base += diff;
+            memset(&(b[base + 1]), 0x30, 13);
+            /* NEC CDR-260 speaks BCD. */
+            if (dev->is_bcd)
+                b[base + 15] = bin2bcd(subc.abs_f);
+            else
+                b[base + 15] = subc.abs_f;
+            if (b[0] != 0x00)
+                break;
+            base += 16;
+            fallthrough;
+        case 0x03:
+            /* ISRC - TODO: Finding and reporting the actual ISRC data. */
+            memset(&(b[base]), 0x00, 20 - diff);
+            base += diff;
+            memset(&(b[base]), 0x30, 12);
+            /* NEC CDR-260 speaks BCD. */
+            if (dev->is_bcd)
+                b[base + 14] = bin2bcd(subc.abs_f);
+            else
+                b[base + 14] = subc.abs_f;
+            break;
+        default:
+            cdrom_log(dev->log, "b[0] = %02X\n", b[0]);
+            break;
+    }
+}
+
+void
+cdrom_get_current_subchannel_sony(cdrom_t *dev, uint8_t *b, const int msf)
 {
     subchannel_t subc;
-    uint32_t     dat;
 
-    dev->ops->get_subchannel(dev, dev->seek_pos, &subc);
+    cdrom_get_subchannel(dev, dev->seek_pos, &subc, 1);
 
-    cdrom_log("CD-ROM %i: Returned subchannel at %02i:%02i.%02i, seek pos = %08x, cd_end = %08x, msf = %x.\n", dev->id, subc.abs_m, subc.abs_s, subc.abs_f, dev->seek_pos, dev->cd_end, msf);
+    cdrom_log(dev->log, "Returned subchannel at %02i:%02i.%02i, seek pos = %08x, "
+              "cd_end = %08x, msf = %x.\n",
+              subc.abs_m, subc.abs_s, subc.abs_f, dev->seek_pos, dev->cd_end, msf);
 
     b[0] = subc.attr;
     b[1] = subc.track;
@@ -903,7 +2026,7 @@ cdrom_get_current_subchannel_sony(cdrom_t *dev, uint8_t *b, int msf)
         b[7] = subc.abs_s;
         b[8] = subc.abs_f;
     } else {
-        dat      = MSFtoLBA(subc.rel_m, subc.rel_s, subc.rel_f);
+        uint32_t dat      = MSFtoLBA(subc.rel_m, subc.rel_s, subc.rel_f);
         b[3] = (dat >> 16) & 0xff;
         b[4] = (dat >> 8) & 0xff;
         b[5] = dat & 0xff;
@@ -920,46 +2043,43 @@ cdrom_get_audio_status_pioneer(cdrom_t *dev, uint8_t *b)
     uint8_t      ret;
     subchannel_t subc;
 
-    dev->ops->get_subchannel(dev, dev->seek_pos, &subc);
+    cdrom_get_subchannel(dev, dev->seek_pos, &subc, 0);
 
-    if (dev->cd_status == CD_STATUS_DATA_ONLY)
-        ret = 0x05;
-    else {
+    if (dev->cd_status & CD_STATUS_HAS_AUDIO) {
         if (dev->cd_status == CD_STATUS_PLAYING)
             ret = dev->sound_on ? 0x00 : 0x02;
         else if (dev->cd_status == CD_STATUS_PAUSED)
             ret = 0x01;
         else
             ret = 0x03;
-    }
+    } else
+        ret = 0x05;
 
     b[0] = 0;
-    b[1] = bin2bcd(subc.abs_m);
-    b[2] = bin2bcd(subc.abs_s);
-    b[3] = bin2bcd(subc.abs_f);
+    b[1] = subc.abs_m;
+    b[2] = subc.abs_s;
+    b[3] = subc.abs_f;
 
     return ret;
 }
 
 uint8_t
-cdrom_get_audio_status_sony(cdrom_t *dev, uint8_t *b, int msf)
+cdrom_get_audio_status_sony(cdrom_t *dev, uint8_t *b, const int msf)
 {
     uint8_t      ret;
     subchannel_t subc;
-    uint32_t     dat;
 
-    dev->ops->get_subchannel(dev, dev->seek_pos, &subc);
+    cdrom_get_subchannel(dev, dev->seek_pos, &subc, 1);
 
-    if (dev->cd_status == CD_STATUS_DATA_ONLY)
-        ret = 0x05;
-    else {
+    if (dev->cd_status & CD_STATUS_HAS_AUDIO) {
         if (dev->cd_status == CD_STATUS_PLAYING)
             ret = dev->sound_on ? 0x00 : 0x02;
         else if (dev->cd_status == CD_STATUS_PAUSED)
             ret = 0x01;
         else
             ret = 0x03;
-    }
+    } else
+        ret = 0x05;
 
     if (msf) {
         b[0] = 0;
@@ -967,7 +2087,7 @@ cdrom_get_audio_status_sony(cdrom_t *dev, uint8_t *b, int msf)
         b[2] = subc.abs_s;
         b[3] = subc.abs_f;
     } else {
-        dat = MSFtoLBA(subc.abs_m, subc.abs_s, subc.abs_f) - 150;
+        const uint32_t dat = MSFtoLBA(subc.abs_m, subc.abs_s, subc.abs_f) - 150;
         b[0] = (dat >> 24) & 0xff;
         b[1] = (dat >> 16) & 0xff;
         b[2] = (dat >> 8) & 0xff;
@@ -982,307 +2102,71 @@ cdrom_get_current_subcodeq(cdrom_t *dev, uint8_t *b)
 {
     subchannel_t subc;
 
-    dev->ops->get_subchannel(dev, dev->seek_pos, &subc);
+    cdrom_get_subchannel(dev, dev->seek_pos, &subc, 0);
 
-    b[0] = subc.attr;
-    b[1] = bin2bcd(subc.track);
-    b[2] = bin2bcd(subc.index);
-    b[3] = bin2bcd(subc.rel_m);
-    b[4] = bin2bcd(subc.rel_s);
-    b[5] = bin2bcd(subc.rel_f);
-    b[6] = bin2bcd(subc.abs_m);
-    b[7] = bin2bcd(subc.abs_s);
-    b[8] = bin2bcd(subc.abs_f);
+    b[0] = (subc.attr >> 4) | ((subc.attr & 0xf) << 4);
+    b[1] = subc.track;
+    b[2] = subc.index;
+    b[3] = subc.rel_m;
+    b[4] = subc.rel_s;
+    b[5] = subc.rel_f;
+    b[6] = subc.abs_m;
+    b[7] = subc.abs_s;
+    b[8] = subc.abs_f;
+
+    cdrom_log(dev->log, "SubCodeQ: %02X %02X %02X %02X %02X %02X %02X %02X "
+              "%02X\n",
+              b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7], b[8]);
 }
 
 uint8_t
 cdrom_get_current_subcodeq_playstatus(cdrom_t *dev, uint8_t *b)
 {
     uint8_t ret;
-    subchannel_t subc;
 
-    dev->ops->get_subchannel(dev, dev->seek_pos, &subc);
+    cdrom_get_current_subcodeq(dev, b);
 
-    if ((dev->cd_status == CD_STATUS_DATA_ONLY) ||
-        (dev->cd_status == CD_STATUS_PLAYING_COMPLETED) ||
-        (dev->cd_status == CD_STATUS_STOPPED))
-        ret = 0x03;
-    else
-        ret = (dev->cd_status == CD_STATUS_PLAYING) ? 0x00 : dev->audio_op;
+    switch (dev->cd_status) {
+        default:                     case CD_STATUS_EMPTY:
+        case CD_STATUS_DATA_ONLY:    case CD_STATUS_DVD:
+        case CD_STATUS_STOPPED:      case CD_STATUS_PLAYING_COMPLETED:
+        case CD_STATUS_DVD_REJECTED:
+            ret = 0x03;
+            break;
+        case CD_STATUS_HOLD:
+            ret = 0x02;
+            break;
+        case CD_STATUS_PAUSED:
+            ret = 0x01;
+            break;
+        case CD_STATUS_PLAYING:
+            ret = 0x00;
+            break;
+    }
 
-    /*If a valid audio track is detected with audio on, unmute it.*/
-    if (dev->ops->track_type(dev, dev->seek_pos) & CD_TRACK_AUDIO)
-        dev->audio_muted_soft = 0;
-
-    cdrom_log("SubCodeQ: Play Status: Seek LBA=%08x, CDEND=%08x, mute=%d.\n", dev->seek_pos, dev->cd_end, dev->audio_muted_soft);
-    b[0] = subc.attr;
-    b[1] = bin2bcd(subc.track);
-    b[2] = bin2bcd(subc.index);
-    b[3] = bin2bcd(subc.rel_m);
-    b[4] = bin2bcd(subc.rel_s);
-    b[5] = bin2bcd(subc.rel_f);
-    b[6] = bin2bcd(subc.abs_m);
-    b[7] = bin2bcd(subc.abs_s);
-    b[8] = bin2bcd(subc.abs_f);
+    cdrom_log(dev->log, "SubCodeQ: Play Status: Seek LBA=%08x, CDEND=%08x.\n",
+              dev->seek_pos, dev->cd_end);
     return ret;
 }
 
-static int
-read_toc_normal(cdrom_t *dev, unsigned char *b, unsigned char start_track, int msf)
-{
-    track_info_t ti;
-    int          i;
-    int          len = 4;
-    int          m;
-    int          s;
-    int          f;
-    int          first_track;
-    int          last_track;
-    uint32_t     temp;
-
-    cdrom_log("read_toc_normal(%08X, %08X, %02X, %i)\n", dev, b, start_track, msf);
-
-    dev->ops->get_tracks(dev, &first_track, &last_track);
-
-    /* Byte 2 = Number of the first track */
-    dev->ops->get_track_info(dev, 1, 0, &ti);
-    b[2] = ti.number;
-    cdrom_log("    b[2] = %02X\n", b[2]);
-
-    /* Byte 3 = Number of the last track before the lead-out track */
-    dev->ops->get_track_info(dev, last_track, 0, &ti);
-    b[3] = ti.number;
-    cdrom_log("    b[3] = %02X\n", b[2]);
-
-    if (start_track == 0x00)
-        first_track = 0;
-    else {
-        first_track = -1;
-        for (i = 0; i <= last_track; i++) {
-            dev->ops->get_track_info(dev, i + 1, 0, &ti);
-            if (ti.number >= start_track) {
-                first_track = i;
-                break;
-            }
-        }
-    }
-    cdrom_log("    first_track = %i, last_track = %i\n", first_track, last_track);
-
-    /* No suitable starting track, return with error. */
-    if (first_track == -1) {
-        cdrom_log("    [ERROR] No suitable track found\n");
-        return -1;
-    }
-
-    for (i = first_track; i <= last_track; i++) {
-        cdrom_log("    tracks(%i) = %02X, %02X, %i:%02i.%02i\n", i, ti.attr, ti.number, ti.m, ti.s, ti.f);
-        dev->ops->get_track_info(dev, i + 1, 0, &ti);
-
-        b[len++] = 0; /* reserved */
-        b[len++] = ti.attr;
-        b[len++] = ti.number; /* track number */
-        b[len++] = 0;         /* reserved */
-
-        if (msf) {
-            b[len++] = 0;
-
-            /* NEC CDR-260 speaks BCD. */
-            if ((dev->type == CDROM_TYPE_NEC_260_100) || (dev->type == CDROM_TYPE_NEC_260_101)) { /*NEC*/
-                m = ti.m;
-                s = ti.s;
-                f = ti.f;
-                msf_to_bcd(&m, &s, &f);
-                b[len++] = m;
-                b[len++] = s;
-                b[len++] = f;
-            } else {
-                b[len++] = ti.m;
-                b[len++] = ti.s;
-                b[len++] = ti.f;
-            }
-        } else {
-            temp     = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
-            b[len++] = temp >> 24;
-            b[len++] = temp >> 16;
-            b[len++] = temp >> 8;
-            b[len++] = temp;
-        }
-    }
-
-    return len;
-}
-
-static int
-read_toc_session(cdrom_t *dev, unsigned char *b, int msf)
-{
-    track_info_t ti;
-    int          len = 4;
-    int          m;
-    int          s;
-    int          f;
-    uint32_t     temp;
-
-    cdrom_log("read_toc_session(%08X, %08X, %i)\n", dev, b, msf);
-
-    /* Bytes 2 and 3 = Number of first and last sessions */
-    b[2] = b[3] = 1;
-
-    dev->ops->get_track_info(dev, 1, 0, &ti);
-
-    cdrom_log("    tracks(0) = %02X, %02X, %i:%02i.%02i\n", ti.attr, ti.number, ti.m, ti.s, ti.f);
-
-    b[len++] = 0; /* reserved */
-    b[len++] = ti.attr;
-    b[len++] = ti.number; /* track number */
-    b[len++] = 0;         /* reserved */
-
-    if (msf) {
-        b[len++] = 0;
-
-        /* NEC CDR-260 speaks BCD. */
-        if ((dev->type == CDROM_TYPE_NEC_260_100) || (dev->type == CDROM_TYPE_NEC_260_101)) { /*NEC*/
-            m = ti.m;
-            s = ti.s;
-            f = ti.f;
-            msf_to_bcd(&m, &s, &f);
-            b[len++] = m;
-            b[len++] = s;
-            b[len++] = f;
-        } else {
-            b[len++] = ti.m;
-            b[len++] = ti.s;
-            b[len++] = ti.f;
-        }
-    } else {
-        temp     = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
-        b[len++] = temp >> 24;
-        b[len++] = temp >> 16;
-        b[len++] = temp >> 8;
-        b[len++] = temp;
-    }
-
-    return len;
-}
-
-static int
-read_toc_raw(cdrom_t *dev, unsigned char *b)
-{
-    track_info_t ti;
-    int          len = 4;
-    int          first_track;
-    int          last_track;
-
-    cdrom_log("read_toc_raw(%08X, %08X)\n", dev, b);
-
-    dev->ops->get_tracks(dev, &first_track, &last_track);
-
-    /* Bytes 2 and 3 = Number of first and last sessions */
-    b[2] = b[3] = 1;
-
-    for (int i = 0; i <= last_track; i++) {
-        dev->ops->get_track_info(dev, i + 1, 0, &ti);
-
-        cdrom_log("    tracks(%i) = %02X, %02X, %i:%02i.%02i\n", i, ti.attr, ti.number, ti.m, ti.s, ti.f);
-
-        b[len++] = 1;         /* Session number */
-        b[len++] = ti.attr;   /* Track ADR and Control */
-        b[len++] = 0;         /* TNO (always 0) */
-        b[len++] = ti.number; /* Point (for track points - track number) */
-        b[len++] = ti.m;      /* M */
-        b[len++] = ti.s;      /* S */
-        b[len++] = ti.f;      /* F */
-        b[len++] = 0;
-        b[len++] = 0;
-        b[len++] = 0;
-    }
-
-    return len;
-}
-
-static int
-read_toc_sony(cdrom_t *dev, unsigned char *b, unsigned char start_track, int msf)
-{
-    track_info_t ti;
-    int          i;
-    int          len = 4;
-    int          first_track;
-    int          last_track;
-    uint32_t     temp;
-
-    cdrom_log("read_toc_sony(%08X, %08X, %02X, %i)\n", dev, b, start_track, msf);
-
-    dev->ops->get_tracks(dev, &first_track, &last_track);
-
-    /* Byte 2 = Number of the first track */
-    dev->ops->get_track_info(dev, 1, 0, &ti);
-    b[2] = ti.number;
-    cdrom_log("    b[2] = %02X\n", b[2]);
-
-    /* Byte 3 = Number of the last track before the lead-out track */
-    dev->ops->get_track_info(dev, last_track, 0, &ti);
-    b[3] = ti.number;
-    cdrom_log("    b[3] = %02X\n", b[2]);
-
-    if (start_track == 0x00)
-        first_track = 0;
-    else {
-        first_track = -1;
-        for (i = 0; i <= last_track; i++) {
-            dev->ops->get_track_info(dev, i + 1, 0, &ti);
-            if (ti.number >= start_track) {
-                first_track = i;
-                break;
-            }
-        }
-    }
-    cdrom_log("    first_track = %i, last_track = %i\n", first_track, last_track);
-
-    /* No suitable starting track, return with error. */
-    if (first_track == -1) {
-        cdrom_log("    [ERROR] No suitable track found\n");
-        return -1;
-    }
-
-    for (i = first_track; i <= last_track; i++) {
-        cdrom_log("    tracks(%i) = %02X, %02X, %i:%02i.%02i\n", i, ti.attr, ti.number, ti.m, ti.s, ti.f);
-        dev->ops->get_track_info(dev, i + 1, 0, &ti);
-
-        b[len++] = ti.number; /* track number */
-        b[len++] = ti.attr;
-
-        if (msf) {
-            b[len++] = 0;
-            b[len++] = ti.m;
-            b[len++] = ti.s;
-            b[len++] = ti.f;
-        } else {
-            temp     = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
-            b[len++] = temp >> 24;
-            b[len++] = temp >> 16;
-            b[len++] = temp >> 8;
-            b[len++] = temp;
-        }
-    }
-    return len;
-}
-
 int
-cdrom_read_toc(cdrom_t *dev, unsigned char *b, int type, unsigned char start_track, int msf, int max_len)
+cdrom_read_toc(const cdrom_t *dev, uint8_t *b, const int type,
+               const uint8_t start_track, const int msf, const int max_len)
 {
     int len;
 
     switch (type) {
         case CD_TOC_NORMAL:
-            len = read_toc_normal(dev, b, start_track, msf);
+            len = read_toc_normal(dev, b, start_track, msf, 0);
             break;
         case CD_TOC_SESSION:
             len = read_toc_session(dev, b, msf);
             break;
         case CD_TOC_RAW:
-            len = read_toc_raw(dev, b);
+            len = read_toc_raw(dev, b, start_track);
             break;
         default:
-            cdrom_log("CD-ROM %i: Unknown TOC read type: %i\n", dev->id, type);
+            cdrom_log(dev->log, "Unknown TOC read type: %i\n", type);
             return 0;
     }
 
@@ -1295,11 +2179,10 @@ cdrom_read_toc(cdrom_t *dev, unsigned char *b, int type, unsigned char start_tra
 }
 
 int
-cdrom_read_toc_sony(cdrom_t *dev, unsigned char *b, unsigned char start_track, int msf, int max_len)
+cdrom_read_toc_sony(const cdrom_t *dev, uint8_t *b, const uint8_t start_track,
+                    const int msf, const int max_len)
 {
-    int len;
-
-    len = read_toc_sony(dev, b, start_track, msf);
+    int len = read_toc_normal(dev, b, start_track, msf, 1);
 
     len = MIN(len, max_len);
 
@@ -1309,611 +2192,875 @@ cdrom_read_toc_sony(cdrom_t *dev, unsigned char *b, unsigned char start_track, i
     return len;
 }
 
+#ifdef USE_CDROM_MITSUMI
 /* New API calls for Mitsumi CD-ROM. */
 void
 cdrom_get_track_buffer(cdrom_t *dev, uint8_t *buf)
 {
-    track_info_t ti;
-    int          first_track;
-    int          last_track;
+    uint8_t           rti[65536]  = { 0 };
+    raw_track_info_t *trti        = (raw_track_info_t *) rti;
+    int               num         = 0;
+    int               first       = -1;
+    int               last        = -1;
 
-    if (dev != NULL) {
-        dev->ops->get_tracks(dev, &first_track, &last_track);
-        buf[0] = 1;
-        buf[1] = last_track + 1;
-        dev->ops->get_track_info(dev, 1, 0, &ti);
-        buf[2] = ti.m;
-        buf[3] = ti.s;
-        buf[4] = ti.f;
-        dev->ops->get_track_info(dev, last_track + 1, 0, &ti);
-        buf[5] = ti.m;
-        buf[6] = ti.s;
-        buf[7] = ti.f;
-        buf[8] = 0x00;
-    } else
-        memset(buf, 0x00, 9);
+    if (dev != NULL)
+        dev->ops->get_raw_track_info(dev->local, &num, rti);
+
+    if (num > 0) {
+        first = find_track(trti, num, 1);
+        last = find_track(trti, num, 0);
+    }
+
+    if (first != -1) {
+        buf[0] = trti[first].point;
+        buf[2] = trti[first].pm;
+        buf[3] = trti[first].ps;
+        buf[4] = trti[first].pf;
+    } else {
+        buf[0] = 0x01;
+        buf[2] = 0x00;
+        buf[3] = 0x02;
+        buf[4] = 0x00;
+    }
+
+    if (last != -1) {
+        buf[1] = trti[last].point;
+        buf[5] = trti[first].pm;
+        buf[6] = trti[first].ps;
+        buf[7] = trti[first].pf;
+    } else {
+        buf[1] = 0x01;
+        buf[5] = 0x00;
+        buf[6] = 0x02;
+        buf[7] = 0x00;
+    }
+
+    buf[8] = 0x00;
 }
 
+/* TODO: Actually implement this properly. */
 void
-cdrom_get_q(cdrom_t *dev, uint8_t *buf, int *curtoctrk, uint8_t mode)
+cdrom_get_q(UNUSED(cdrom_t *dev), uint8_t *buf, UNUSED(int *curtoctrk), UNUSED(uint8_t mode))
 {
-    track_info_t ti;
-    int          first_track;
-    int          last_track;
-
-    if (dev != NULL) {
-        dev->ops->get_tracks(dev, &first_track, &last_track);
-        dev->ops->get_track_info(dev, *curtoctrk, 0, &ti);
-        buf[0] = (ti.attr << 4) & 0xf0;
-        buf[1] = ti.number;
-        buf[2] = bin2bcd(*curtoctrk + 1);
-        buf[3] = ti.m;
-        buf[4] = ti.s;
-        buf[5] = ti.f;
-        buf[6] = 0x00;
-        dev->ops->get_track_info(dev, 1, 0, &ti);
-        buf[7] = ti.m;
-        buf[8] = ti.s;
-        buf[9] = ti.f;
-        if (*curtoctrk >= (last_track + 1))
-            *curtoctrk = 0;
-        else if (mode)
-            *curtoctrk = *curtoctrk + 1;
-    } else
-        memset(buf, 0x00, 10);
+    memset(buf, 0x00, 10);
 }
 
 uint8_t
 cdrom_mitsumi_audio_play(cdrom_t *dev, uint32_t pos, uint32_t len)
 {
     track_info_t ti;
+    int          ret = 0;
 
-    if (dev->cd_status == CD_STATUS_DATA_ONLY)
-        return 0;
+    if (dev->cd_status & CD_STATUS_HAS_AUDIO) {
+        cdrom_log(dev->log, "Play Mitsumi audio - %08X %08X\n", pos, len);
 
-    cdrom_log("CD-ROM 0: Play Mitsumi audio - %08X %08X\n", pos, len);
-    dev->ops->get_track_info(dev, pos, 0, &ti);
-    pos = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
-    dev->ops->get_track_info(dev, len, 1, &ti);
-    len = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
+        ret = dev->ops->get_track_info(dev->local, pos, 0, &ti);
 
-    /* Do this at this point, since it's at this point that we know the
-       actual LBA position to start playing from. */
-    if (!(dev->ops->track_type(dev, pos) & CD_TRACK_AUDIO)) {
-        cdrom_log("CD-ROM %i: LBA %08X not on an audio track\n", dev->id, pos);
-        cdrom_stop(dev);
-        return 0;
+        if (ret) {
+            pos = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
+            ret = dev->ops->get_track_info(dev->local, len, 1, &ti);
+
+            if (ret) {
+                len = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
+
+                /*
+                   Do this at this point, since it's at this point that we know the
+                   actual LBA position to start playing from.
+                 */
+                ret = (dev->ops->get_track_type(dev->local, pos) == CD_TRACK_AUDIO);
+
+                if (ret) {
+                    dev->seek_pos  = pos;
+                    dev->cd_end    = len;
+                    dev->cd_status = CD_STATUS_PLAYING;
+                    dev->cd_buflen = 0;
+                } else {
+                    cdrom_log(dev->log, "LBA %08X not on an audio track\n", pos);
+                    cdrom_stop(dev);
+                }
+            } else {
+                cdrom_log(dev->log, "Unable to get the ending position for track %08X\n",
+                          len);
+                cdrom_stop(dev);
+            }
+        } else {
+            cdrom_log(dev->log, "Unable to get the starting position for track %08X\n", pos);
+            cdrom_stop(dev);
+        }
     }
 
-    dev->seek_pos  = pos;
-    dev->cd_end    = len;
-    dev->cd_status = CD_STATUS_PLAYING;
-    dev->cd_buflen = 0;
-
-    return 1;
+    return ret;
 }
+#endif
 
 uint8_t
-cdrom_read_disc_info_toc(cdrom_t *dev, unsigned char *b, unsigned char track, int type)
+cdrom_read_disc_info_toc(cdrom_t *dev, uint8_t *b,
+                         const uint8_t track, const int type)
 {
-    track_info_t ti;
-    int          first_track;
-    int          last_track;
-    int          m = 0;
-    int          s = 0;
-    int          f = 0;
-    uint32_t     temp;
+    uint8_t                 rti[65536]  = { 0 };
+    const raw_track_info_t *trti        = (raw_track_info_t *) rti;
+    int                     num         = 0;
+    int                     first       = -1;
+    int                     t           = -1;
+    uint8_t                 ret         = 1;
+    uint32_t                temp;
 
-    dev->ops->get_tracks(dev, &first_track, &last_track);
+    cdrom_log(dev->log, "Read DISC Info TOC Type = %d, track = %d\n", type, track);
+
+    dev->inv_field = track;
+    dev->ops->get_raw_track_info(dev->local, &num, rti);
 
-    cdrom_log("Read DISC Info TOC Type = %d, track = %d, first_track = %d, last_track = %d.\n", type, track, first_track, last_track);
     switch (type) {
         case 0:
-            b[0] = bin2bcd(first_track);
-            b[1] = bin2bcd(last_track);
-            b[2] = 0;
-            b[3] = 0;
-            cdrom_log("CD-ROM %i: Returned Toshiba/NEC disc information (type 0) at %02i:%02i\n", dev->id, b[0], b[1]);
+            if (num > 0) {
+                if (num < 4)
+                    ret = 0;
+                else {
+                    b[0] = bin2bcd(trti[0].pm);
+                    b[1] = bin2bcd(trti[1].pm);
+                    b[2] = 0x00;
+                    b[3] = 0x00;
+
+                    cdrom_log(dev->log, "Returned Toshiba/NEC disc information (type 0) "
+                              "at %02i:%02i\n", b[0], b[1]);
+                }
+            } else
+                ret = 0;
             break;
         case 1:
-            dev->ops->get_track_info(dev, 0xaa, 0, &ti);
-            m = ti.m;
-            s = ti.s;
-            f = ti.f;
-            msf_to_bcd(&m, &s, &f);
-            b[0] = m;
-            b[1] = s;
-            b[2] = f;
-            b[3] = 0;
-            cdrom_log("CD-ROM %i: Returned Toshiba/NEC disc information (type 1) at %02i:%02i.%02i, track=%d\n", dev->id, b[0], b[1], b[2], bcd2bin(track));
+            if (num > 0)
+                t = find_last_lead_out(trti, num);
+
+            if (t == -1)
+                ret = 0;
+            else {
+                b[0] = bin2bcd(trti[t].pm);
+                b[1] = bin2bcd(trti[t].ps);
+                b[2] = bin2bcd(trti[t].pf);
+                b[3] = 0x00;
+
+                cdrom_log(dev->log, "Returned Toshiba/NEC disc information (type 1) at "
+                          "%02i:%02i.%02i\n", b[0], b[1], b[2]);
+            }
             break;
         case 2:
-            if (track > bin2bcd(last_track))
-                return 0;
+            if (num > 0)
+                t = find_specific_track(trti, num, bcd2bin(track));
 
-            dev->ops->get_track_info(dev, bcd2bin(track), 0, &ti);
-            m = ti.m;
-            s = ti.s;
-            f = ti.f;
-            msf_to_bcd(&m, &s, &f);
-            b[0] = m;
-            b[1] = s;
-            b[2] = f;
-            b[3] = ti.attr;
-            cdrom_log("CD-ROM %i: Returned Toshiba/NEC disc information (type 2) at %02i:%02i.%02i, track=%d, m=%02i,s=%02i,f=%02i, tno=%02x.\n", dev->id, b[0], b[1], b[2], bcd2bin(track), m, s, f, ti.attr);
+            if (t == -1)
+                ret = 0;
+            else {
+                b[0] = bin2bcd(trti[t].pm);
+                b[1] = bin2bcd(trti[t].ps);
+                b[2] = bin2bcd(trti[t].pf);
+                b[3] = trti[t].adr_ctl;
+ 
+                cdrom_log(dev->log, "Returned Toshiba/NEC disc information (type 2) at "
+                          "%02i:%02i.%02i, track=%d, attr=%02x.\n", b[0], b[1],
+                          b[2], bcd2bin(track), b[3]);
+            }
             break;
         case 3: /* Undocumented on NEC CD-ROM's, from information based on sr_vendor.c from the Linux kernel */
-            switch (dev->type) {
-                case CDROM_TYPE_NEC_25_10a:
-                case CDROM_TYPE_NEC_38_103:
-                case CDROM_TYPE_NEC_75_103:
-                case CDROM_TYPE_NEC_77_106:
-                case CDROM_TYPE_NEC_211_100:
-                case CDROM_TYPE_NEC_464_105:
-                    dev->ops->get_track_info(dev, 1, 0, &ti);
-                    b[0x0e] = 0;
-                    temp    = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
+            if (dev->is_nec) {
+                b[0x0e] = 0x00;
+
+                if (num > 0)
+                    first = find_track(trti, num, 1);
+
+                if (first == -1)
+                    ret = 0;
+                else {
+                    temp    = MSFtoLBA(trti[first].pm, trti[first].ps, trti[first].pf) - 150;
                     b[0x0f] = temp >> 24;
                     b[0x10] = temp >> 16;
                     b[0x11] = temp >> 8;
                     b[0x12] = temp;
-                    break;
+                }
+            } else {
+                b[0] = trti[0].ps;    /* Disc type. */
 
-                default:
-                    dev->ops->get_track_info(dev, 1, 0, &ti);
-                    b[0] = 0;
-                    temp = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
-                    b[1] = temp >> 24;
-                    b[2] = temp >> 16;
-                    b[3] = temp >> 8;
-                    break;
+                if (num > 0)
+                    first = find_track(trti, num, 1);
+
+                if (first == -1)
+                    ret = 0;
+                else {
+                    temp    = MSFtoLBA(trti[first].pm, trti[first].ps, trti[first].pf) - 150;
+                    b[0x1] = temp >> 24;
+                    b[0x2] = temp >> 16;
+                    b[0x3] = temp >> 8;
+                }
             }
             break;
         default:
             break;
     }
 
-    return 1;
+    return ret;
 }
 
-static int
-track_type_is_valid(UNUSED(uint8_t id), int type, int flags, int audio, int mode2)
+static uint32_t
+cdrom_msf_to_lba(const int sector, const int ismsf,
+                 int cdrom_sector_type, const uint8_t vendor_type)
 {
-    if (!(flags & 0x70) && (flags & 0xf8)) { /* 0x08/0x80/0x88 are illegal modes */
-        cdrom_log("CD-ROM %i: [Any Mode] 0x08/0x80/0x88 are illegal modes\n", id);
-        return 0;
+    int      pos = sector;
+    uint32_t lba;
+
+    if ((cdrom_sector_type & 0x0f) >= 0x08) {
+        mult               = cdrom_sector_type >> 4;
+        pos               /= mult;
     }
 
-    if ((type != 1) && !audio) {
-        if ((flags & 0x06) == 0x06) {
-            cdrom_log("CD-ROM %i: [Any Data Mode] Invalid error flags\n", id);
-            return 0;
-        }
+    if (ismsf) {
+        const int m = (pos >> 16) & 0xff;
+        const int s = (pos >> 8) & 0xff;
+        const int f = pos & 0xff;
 
-        if (((flags & 0x700) == 0x300) || ((flags & 0x700) > 0x400)) {
-            cdrom_log("CD-ROM %i: [Any Data Mode] Invalid subchannel data flags (%02X)\n", id, flags & 0x700);
-            return 0;
-        }
+        lba = MSFtoLBA(m, s, f) - 150;
+    } else {
+        switch (vendor_type) {
+            case 0x00:
+                lba = pos;
+                break;
+            case 0x40: {
+                const int m = bcd2bin((pos >> 24) & 0xff);
+                const int s = bcd2bin((pos >> 16) & 0xff);
+                const int f = bcd2bin((pos >> 8) & 0xff);
 
-        if ((flags & 0x18) == 0x08) { /* EDC/ECC without user data is an illegal mode */
-            cdrom_log("CD-ROM %i: [Any Data Mode] EDC/ECC without user data is an illegal mode\n", id);
-            return 0;
+                lba = MSFtoLBA(m, s, f) - 150;
+                break;
+            } case 0x80:
+                lba = bcd2bin((pos >> 24) & 0xff);
+                break;
+            /* Never used values but the compiler complains. */
+            default:
+                lba = 0;
         }
+    }
 
-        if (((flags & 0xf0) == 0x90) || ((flags & 0xf0) == 0xc0)) { /* 0x90/0x98/0xC0/0xC8 are illegal modes */
-            cdrom_log("CD-ROM %i: [Any Data Mode] 0x90/0x98/0xC0/0xC8 are illegal modes\n", id);
+    return lba;
+}
+
+int
+cdrom_is_track_audio(cdrom_t *dev, const int sector,
+                     const int ismsf, int cdrom_sector_type,
+                     const uint8_t vendor_type)
+{
+    int      audio = 0;
+    uint32_t lba   = cdrom_msf_to_lba(sector, ismsf,
+                                      cdrom_sector_type, vendor_type);
+
+    if (dev->ops->get_track_type)
+        audio = dev->ops->get_track_type(dev->local, lba);
+
+    audio        &= CD_TRACK_AUDIO;
+
+    return audio;
+}
+
+int
+cdrom_readsector_raw(cdrom_t *dev, uint8_t *buffer, const int sector, const int ismsf,
+                     int cdrom_sector_type, const int cdrom_sector_flags,
+                     int *len, const uint8_t vendor_type)
+{
+    int       pos      = sector;
+    int       ret      = 0;
+    const int old_type = cdrom_sector_type;
+
+    if ((cdrom_sector_type & 0x0f) >= 0x08) {
+        mult               = cdrom_sector_type >> 4;
+        cdrom_sector_type &= 0x0f;
+        part               = pos % mult;
+        pos               /= mult;
+        ecc_diff           = (cdrom_sector_type & 0x01) ? 4 : 0;
+    } else {
+        mult               = 1;
+        part               = 0;
+        ecc_diff           = 0;
+    }
+
+    if ((dev->cd_status != CD_STATUS_EMPTY) && (dev->cd_status != CD_STATUS_DVD_REJECTED)) {
+        uint8_t *temp_b;
+        uint8_t *b      = temp_b = buffer;
+        int      audio  = 0;
+        uint32_t lba    = cdrom_msf_to_lba(sector, ismsf,
+                                           old_type, vendor_type);
+        int      mode2  = 0;
+
+        *len = 0;
+
+        if (dev->ops->get_track_type)
+            audio = dev->ops->get_track_type(dev->local, lba);
+
+        const int dm  = audio & CD_TRACK_MODE_MASK;
+        audio        &= CD_TRACK_AUDIO;
+
+        if (dm != CD_TRACK_NORMAL)
+            mode2 = 1;
+
+        dev->mode2 = mode2;
+
+        memset(dev->extra_buffer, 0, 296);
+
+        if ((cdrom_sector_flags & 0xf8) == 0x08) {
+            /* 0x08 is an illegal mode */
+            cdrom_log(dev->log, "[Mode 1] 0x08 is an illegal mode\n");
+        } else if ((cdrom_sector_type > 5) && (cdrom_sector_type < 8)) {
+            cdrom_log(dev->log, "Attempting to read an unrecognized sector "
+                      "type from an image\n");
             return 0;
-        }
+        } else {
+            if ((cdrom_sector_type > 1) && audio &&
+                (dev->cd_status & CD_STATUS_HAS_AUDIO)) {
+                cdrom_log(dev->log, "[%s] Attempting to read a data sector "
+                          "from an audio track\n",
+                          cdrom_req_modes[cdrom_sector_type]);
+            } else if ((cdrom_sector_type == 1) &&
+                       (!audio || !(dev->cd_status & CD_STATUS_HAS_AUDIO))) {
+                cdrom_log(dev->log, "[Audio] Attempting to read an audio "
+                          "sector from a data track\n");
+            } else if (audio) {
+                if (!track_type_is_valid(dev, cdrom_sector_type,
+                                         cdrom_sector_flags, 1, 0x00))
+                    ret = 0;
+                else
+                    ret = read_audio(dev, lba, temp_b);
+            } else {
+                ret = read_data(dev, lba, 1);
 
-        if (((type > 3) && (type != 8)) || (mode2 && (mode2 & 0x03))) {
-            if ((flags & 0xf0) == 0x30) { /* 0x30/0x38 are illegal modes */
-                cdrom_log("CD-ROM %i: [Any XA Mode 2] 0x30/0x38 are illegal modes\n", id);
-                return 0;
+                /* Return with error if we had one. */
+                if (ret > 0) {
+                    int form = 0;
+
+                    if ((dev->raw_buffer[dev->cur_buf][0x000f] == 0x00) ||
+                        (dev->raw_buffer[dev->cur_buf][0x000f] > 0x02)) {
+                        cdrom_log(dev->log, "[%s] Unknown mode: %02X\n",
+                                  cdrom_req_modes[cdrom_sector_type],
+                                  dev->raw_buffer[dev->cur_buf][0x000f]);
+                        ret = 0;
+                    } else if (mode2) {
+                        if (dev->raw_buffer[dev->cur_buf][0x000f] == 0x01)
+                            /*
+                               Use Mode 1, since evidently specification-violating
+                               discs exist.
+                             */
+                            mode2 = 0;
+                        else if (dev->raw_buffer[dev->cur_buf][0x0012] !=
+                                 dev->raw_buffer[dev->cur_buf][0x0016]) {
+                            cdrom_log(dev->log, "[%s] XA Mode 2 sector with "
+                                      "malformed sub-header\n",
+                                      cdrom_req_modes[cdrom_sector_type]);
+                            ret = 0;
+                        } else
+                            form = ((dev->raw_buffer[dev->cur_buf][0x0012] &
+                                    0x20) >> 5) + 1;
+                    } else if (dev->raw_buffer[dev->cur_buf][0x000f] == 0x02)
+                        mode2 = 1;
+
+                    if (ret > 0) {
+                        const int mode_id = mode2 + form;
+
+                        cdrom_log(dev->log, "[%s] %s detected\n",
+                                  cdrom_req_modes[cdrom_sector_type],
+                                  cdrom_modes[mode_id]);
+
+                        if (!track_type_is_valid(dev, cdrom_sector_type,
+                                                 cdrom_sector_flags, 0,
+                                                 (mode2 << 2) + form)) {
+                            cdrom_log(dev->log, "[%s] Invalid track type\n",
+                                      cdrom_req_modes[cdrom_sector_type]);
+                            ret = 0;
+                        } else if (cdrom_mode_masks[cdrom_sector_type] &
+                                   (1 << mode_id))
+                            cdrom_process_data[mode_id](dev, cdrom_sector_flags,
+                                                        temp_b);
+                        else {
+                            cdrom_log(dev->log, "[%s] Attempting to read a "
+                                      "%s sector\n",
+                                      cdrom_req_modes[cdrom_sector_type],
+                                      cdrom_modes[mode_id]);
+                            ret = 0;
+                        }
+                    }
+                }
             }
-            if (((flags & 0xf0) == 0xb0) || ((flags & 0xf0) == 0xd0)) { /* 0xBx and 0xDx are illegal modes */
-                cdrom_log("CD-ROM %i: [Any XA Mode 2] 0xBx and 0xDx are illegal modes\n", id);
-                return 0;
+
+            if (ret > 0) {
+                process_c2_and_subch(dev, cdrom_sector_flags, b);
+                *len = dev->cdrom_sector_size;
             }
         }
     }
 
-    return 1;
+    return ret;
 }
 
-static void
-read_sector_to_buffer(cdrom_t *dev, uint8_t *rbuf, uint32_t msf, uint32_t lba, int mode2, int len)
+/*
+   Read DVD Structure
+
+   Yes, +2 instead of +4 is correct, I have verified this via Windows IOCTL, and it also matches
+   the MMC specification.
+ */
+int
+cdrom_read_dvd_structure(const cdrom_t *dev, const uint8_t layer, const uint8_t format,
+                         uint8_t *buffer, uint32_t *info)
 {
-    uint8_t *bb = rbuf;
+    int      max_layer       = 0;
+    int      ret             = 0;
+    uint64_t total_sectors;
 
-    dev->ops->read_sector(dev, CD_READ_DATA, rbuf + 16, lba);
-
-    /* Sync bytes */
-    bb[0] = 0;
-    memset(bb + 1, 0xff, 10);
-    bb[11] = 0;
-    bb += 12;
-
-    /* Sector header */
-    bb[0] = (msf >> 16) & 0xff;
-    bb[1] = (msf >> 8) & 0xff;
-    bb[2] = msf & 0xff;
-
-    bb[3] = 1; /* mode 1 data */
-    bb += mode2 ? 12 : 4;
-    bb += len;
-    if (mode2 && ((mode2 & 0x03) == 1))
-        memset(bb, 0, 280);
-    else if (!mode2)
-        memset(bb, 0, 288);
-}
-
-static void
-read_audio(cdrom_t *dev, uint32_t lba, uint8_t *b)
-{
-    dev->ops->read_sector(dev, CD_READ_RAW, raw_buffer, lba);
-
-    memcpy(b, raw_buffer, 2352);
-
-    cdrom_sector_size = 2352;
-}
-
-static void
-read_mode1(cdrom_t *dev, int cdrom_sector_flags, uint32_t lba, uint32_t msf, int mode2, uint8_t *b)
-{
-    if ((dev->cd_status == CD_STATUS_DATA_ONLY) || (dev->ops->sector_size(dev, lba) == 2048))
-        read_sector_to_buffer(dev, raw_buffer, msf, lba, mode2, 2048);
-    else
-        dev->ops->read_sector(dev, CD_READ_RAW, raw_buffer, lba);
-
-    cdrom_sector_size = 0;
-
-    if (cdrom_sector_flags & 0x80) {
-        /* Sync */
-        cdrom_log("CD-ROM %i: [Mode 1] Sync\n", dev->id);
-        memcpy(b, raw_buffer, 12);
-        cdrom_sector_size += 12;
-        b += 12;
+    if (format < 0xc0) {
+        if (dev->cd_status != CD_STATUS_DVD) {
+            *info = format;
+            ret   = -(SENSE_ILLEGAL_REQUEST << 16) | (ASC_INCOMPATIBLE_FORMAT << 8);
+        } else if ((dev->ops != NULL) && (dev->ops->read_dvd_structure != NULL))
+            ret   = dev->ops->read_dvd_structure(dev->local, layer, format, buffer, info);
     }
 
-    if (cdrom_sector_flags & 0x20) {
-        /* Header */
-        cdrom_log("CD-ROM %i: [Mode 1] Header\n", dev->id);
-        memcpy(b, raw_buffer + 12, 4);
-        cdrom_sector_size += 4;
-        b += 4;
+    if (ret == 0)  switch (format) {
+        case 0x00:    /* Physical format information */
+            total_sectors = (uint64_t) dev->cdrom_capacity;
+
+            if (total_sectors > DVD_LAYER_0_SECTORS)
+                max_layer++;
+
+            if (layer > max_layer) {
+                *info = layer;
+                ret   = -(SENSE_ILLEGAL_REQUEST << 16) | (ASC_INV_FIELD_IN_CMD_PACKET << 8);
+            } else {
+                if (total_sectors == 0) {
+                    *info = 0x00000000;
+                    ret   = -(SENSE_NOT_READY << 16) | (ASC_MEDIUM_NOT_PRESENT << 8);
+                } else {
+                    buffer[4] = 0x01;    /* DVD-ROM, part version 1. */
+                    buffer[5] = 0x0f;    /* 120mm disc, minimum rate unspecified .*/
+                    if (max_layer == 1)
+                        /* Two layers, OTP track path, read-only (per MMC-2 spec). */
+                        buffer[6] = 0x31;
+                    else
+                        /* One layer, read-only (per MMC-2 spec). */
+                        buffer[6] = 0x01;
+                    buffer[7] = 0x10;    /* Default densities. */
+
+                    /* Start sector. */
+                    buffer[8]  = 0x00;
+                    buffer[9]  = (0x030000 >> 16) & 0xff;
+                    buffer[10] = (0x030000 >> 8) & 0xff;
+                    buffer[11] = 0x030000 & 0xff;
+
+                    /* End sector. */
+                    buffer[12] = 0x00;
+                    if (layer == 1) {
+                        buffer[13] = ((total_sectors - DVD_LAYER_0_SECTORS) >> 16) & 0xff;
+                        buffer[14] = ((total_sectors - DVD_LAYER_0_SECTORS) >> 8) & 0xff;
+                        buffer[15] = (total_sectors - DVD_LAYER_0_SECTORS) & 0xff;
+                    } else if (max_layer == 1) {
+                        buffer[13] = (DVD_LAYER_0_SECTORS >> 16) & 0xff;
+                        buffer[14] = (DVD_LAYER_0_SECTORS >> 8) & 0xff;
+                        buffer[15] = DVD_LAYER_0_SECTORS & 0xff;
+                    } else {
+                        buffer[13] = (total_sectors >> 16) & 0xff;
+                        buffer[14] = (total_sectors >> 8) & 0xff;
+                        buffer[15] = total_sectors & 0xff;
+                    }
+
+                    /* Layer 0 end sector. */
+                    buffer[16] = 0x00;
+                    buffer[17] = (total_sectors >> 16) & 0xff;
+                    buffer[18] = (total_sectors >> 8) & 0xff;
+                    buffer[19] = total_sectors & 0xff;
+
+                    buffer[20] = 0x00;    /* No BCA */
+
+                    /* 2048 bytes of data + 2 byte header */
+                    ret = (2048 + 2);
+                }
+            }
+            break;
+
+        case 0x01:    /* DVD copyright information */
+            buffer[4] = 0;    /* No copyright data. */
+            buffer[5] = 0;    /* No region restrictions. */
+
+            /* 4 bytes of data + 2 byte header. */
+            ret = (4 + 2);
+            break;
+
+        case 0x04:    /* DVD disc manufacturing information. */
+            /* 2048 bytes of data + 2 byte header */
+            ret = (2048 + 2);
+            break;
+
+        case 0xff:
+            /*
+             * This lists all the command capabilities above.  Add new ones
+             * in order and update the length and buffer return values.
+             */
+
+            buffer[4]  = 0x00; /* Physical format */
+            buffer[5]  = 0x40; /* Not writable, is readable */
+            buffer[6]  = ((2048 + 4) >> 8) & 0xff;
+            buffer[7]  = (2048 + 4) & 0xff;
+
+            buffer[8]  = 0x01; /* Copyright info */
+            buffer[9]  = 0x40; /* Not writable, is readable */
+            buffer[10] = ((4 + 2) >> 8) & 0xff;
+            buffer[11] = (4 + 2) & 0xff;
+
+            buffer[12] = 0x03; /* BCA info */
+            buffer[13] = 0x40; /* Not writable, is readable */
+            buffer[14] = ((188 + 2) >> 8) & 0xff;
+            buffer[15] = (188 + 2) & 0xff;
+
+            buffer[16] = 0x04; /* Manufacturing info */
+            buffer[17] = 0x40; /* Not writable, is readable */
+            buffer[18] = ((2048 + 2) >> 8) & 0xff;
+            buffer[19] = (2048 + 2) & 0xff;
+
+            /* data written + 4 byte header */
+            ret = (16 + 2);
+            break;
+
+        default:
+            *info = format;
+            ret   = -(SENSE_ILLEGAL_REQUEST << 16) | (ASC_INV_FIELD_IN_CMD_PACKET << 8);
+            break;
     }
 
-    if (cdrom_sector_flags & 0x40) {
-        /* Sub-header */
-        if (!(cdrom_sector_flags & 0x10)) {
-            /* No user data */
-            cdrom_log("CD-ROM %i: [Mode 1] Sub-header\n", dev->id);
-            memcpy(b, raw_buffer + 16, 8);
-            cdrom_sector_size += 8;
-            b += 8;
+    return ret;
+}
+
+void
+cdrom_read_disc_information(const cdrom_t *dev, uint8_t *buffer)
+{
+    uint8_t           rti[65536] = { 0 };
+    raw_track_info_t *t          = (raw_track_info_t *) rti;
+    int               num        = 0;
+    int               first      = 0;
+    int               sessions   = 0;
+    int               ls_first   = 0;
+    int               ls_last    = 0;
+    int               t_b0       = -1;
+
+    dev->ops->get_raw_track_info(dev->local, &num, rti);
+
+    for (int i = 0; i < num; i++)
+        if (t[i].session > sessions)
+            sessions = t[i].session;
+        else if ((first == 0) && (t[i].point >= 1) && (t[i].point <= 99))
+            first    = t[i].point;
+
+    for (int i = 0; i < num; i++)
+        if ((t[i].session == sessions) && (t[i].point >= 1) && (t[i].point <= 99)) {
+            ls_first = t[i].point;
+            break;
         }
-    }
 
-    if (cdrom_sector_flags & 0x10) {
-        /* User data */
-        cdrom_log("CD-ROM %i: [Mode 1] User data\n", dev->id);
-        memcpy(b, raw_buffer + 16, 2048);
-        cdrom_sector_size += 2048;
-        b += 2048;
-    }
+    for (int i = (num - 1); i >= 0; i--)
+        if ((t[i].session == sessions) && (t[i].point >= 1) && (t[i].point <= 99)) {
+            ls_last  = t[i].point;
+            break;
+        }
 
-    if (cdrom_sector_flags & 0x08) {
-        /* EDC/ECC */
-        cdrom_log("CD-ROM %i: [Mode 1] EDC/ECC\n", dev->id);
-        memcpy(b, raw_buffer + 2064, 288);
-        cdrom_sector_size += 288;
-        b += 288;
-    }
-}
+    for (int i = (num - 1); i >= 0; i--)
+        if (t[i].point == 0xb0) {
+            t_b0 = i;
+            break;
+        }
 
-static void
-read_mode2_non_xa(cdrom_t *dev, int cdrom_sector_flags, uint32_t lba, uint32_t msf, int mode2, uint8_t *b)
-{
-    if ((dev->cd_status == CD_STATUS_DATA_ONLY) || (dev->ops->sector_size(dev, lba) == 2336))
-        read_sector_to_buffer(dev, raw_buffer, msf, lba, mode2, 2336);
-    else
-        dev->ops->read_sector(dev, CD_READ_RAW, raw_buffer, lba);
+    memset(buffer, 0x00, 34);
 
-    cdrom_sector_size = 0;
+    buffer[ 0] = 0x00;        /* Disc Information Length (MSB) */
+    buffer[ 1] = 0x20;        /* Disc Information Lenght (LSB) */
+    buffer[ 2] = 0x0e;        /* Last session complete, disc finalized */
+    buffer[ 3] = first;       /* Number of First Track on Disc */
+    buffer[ 4] = sessions;    /* Number of Sessions (LSB) */
+    buffer[ 5] = ls_first;    /* First Track Number in Last Session (LSB) */
+    buffer[ 6] = ls_last;     /* Last Track Number in Last Session (LSB) */
+    buffer[ 7] = 0x20;        /* Unrestricted use */
+    buffer[ 8] = t[0].ps;     /* Disc Type */
+    buffer[ 9] = 0x00;        /* Number Of Sessions (MSB) */
+    buffer[10] = 0x00;        /* First Track Number in Last Session (MSB) */
+    buffer[11] = 0x00;        /* Last Track Number in Last Session (MSB) */
 
-    if (cdrom_sector_flags & 0x80) {
-        /* Sync */
-        cdrom_log("CD-ROM %i: [Mode 2 Formless] Sync\n", dev->id);
-        memcpy(b, raw_buffer, 12);
-        cdrom_sector_size += 12;
-        b += 12;
-    }
+    if (t_b0 == -1) {
+        /* Single-session disc.  */
 
-    if (cdrom_sector_flags & 0x20) {
-        /* Header */
-        cdrom_log("CD-ROM %i: [Mode 2 Formless] Header\n", dev->id);
-        memcpy(b, raw_buffer + 12, 4);
-        cdrom_sector_size += 4;
-        b += 4;
-    }
+        /* Last Session Lead-in Start Time MSF is 00:00:00 */
 
-    /* Mode 1 sector, expected type is 1 type. */
-    if (cdrom_sector_flags & 0x40) {
-        /* Sub-header */
-        cdrom_log("CD-ROM %i: [Mode 2 Formless] Sub-header\n", dev->id);
-        memcpy(b, raw_buffer + 16, 8);
-        cdrom_sector_size += 8;
-        b += 8;
-    }
+        /* Last Possible Start Time for Start of Lead-out */
+        buffer[20] = t[2].pm;
+        buffer[21] = t[2].ps;
+        buffer[22] = t[2].pf;
+    } else {
+        /* Multi-session disc.  */
 
-    if (cdrom_sector_flags & 0x10) {
-        /* User data */
-        cdrom_log("CD-ROM %i: [Mode 2 Formless] User data\n", dev->id);
-        memcpy(b, raw_buffer + 24, 2336);
-        cdrom_sector_size += 2336;
-        b += 2336;
-    }
-}
+        /* Last Session Lead-in Start Time MSF */
+        buffer[17] = t[t_b0].m;
+        buffer[18] = t[t_b0].s;
+        buffer[19] = t[t_b0].f;
 
-static void
-read_mode2_xa_form1(cdrom_t *dev, int cdrom_sector_flags, uint32_t lba, uint32_t msf, int mode2, uint8_t *b)
-{
-    if ((dev->cd_status == CD_STATUS_DATA_ONLY) || (dev->ops->sector_size(dev, lba) == 2048))
-        read_sector_to_buffer(dev, raw_buffer, msf, lba, mode2, 2048);
-    else
-        dev->ops->read_sector(dev, CD_READ_RAW, raw_buffer, lba);
-
-    cdrom_sector_size = 0;
-
-    if (cdrom_sector_flags & 0x80) {
-        /* Sync */
-        cdrom_log("CD-ROM %i: [XA Mode 2 Form 1] Sync\n", dev->id);
-        memcpy(b, raw_buffer, 12);
-        cdrom_sector_size += 12;
-        b += 12;
-    }
-
-    if (cdrom_sector_flags & 0x20) {
-        /* Header */
-        cdrom_log("CD-ROM %i: [XA Mode 2 Form 1] Header\n", dev->id);
-        memcpy(b, raw_buffer + 12, 4);
-        cdrom_sector_size += 4;
-        b += 4;
-    }
-
-    if (cdrom_sector_flags & 0x40) {
-        /* Sub-header */
-        cdrom_log("CD-ROM %i: [XA Mode 2 Form 1] Sub-header\n", dev->id);
-        memcpy(b, raw_buffer + 16, 8);
-        cdrom_sector_size += 8;
-        b += 8;
-    }
-
-    if (cdrom_sector_flags & 0x10) {
-        /* User data */
-        cdrom_log("CD-ROM %i: [XA Mode 2 Form 1] User data\n", dev->id);
-        memcpy(b, raw_buffer + 24, 2048);
-        cdrom_sector_size += 2048;
-        b += 2048;
-    }
-
-    if (cdrom_sector_flags & 0x08) {
-        /* EDC/ECC */
-        cdrom_log("CD-ROM %i: [XA Mode 2 Form 1] EDC/ECC\n", dev->id);
-        memcpy(b, raw_buffer + 2072, 280);
-        cdrom_sector_size += 280;
-        b += 280;
-    }
-}
-
-static void
-read_mode2_xa_form2(cdrom_t *dev, int cdrom_sector_flags, uint32_t lba, uint32_t msf, int mode2, uint8_t *b)
-{
-    if ((dev->cd_status == CD_STATUS_DATA_ONLY) || (dev->ops->sector_size(dev, lba) == 2324))
-        read_sector_to_buffer(dev, raw_buffer, msf, lba, mode2, 2324);
-    else
-        dev->ops->read_sector(dev, CD_READ_RAW, raw_buffer, lba);
-
-    cdrom_sector_size = 0;
-
-    if (cdrom_sector_flags & 0x80) {
-        /* Sync */
-        cdrom_log("CD-ROM %i: [XA Mode 2 Form 2] Sync\n", dev->id);
-        memcpy(b, raw_buffer, 12);
-        cdrom_sector_size += 12;
-        b += 12;
-    }
-
-    if (cdrom_sector_flags & 0x20) {
-        /* Header */
-        cdrom_log("CD-ROM %i: [XA Mode 2 Form 2] Header\n", dev->id);
-        memcpy(b, raw_buffer + 12, 4);
-        cdrom_sector_size += 4;
-        b += 4;
-    }
-
-    if (cdrom_sector_flags & 0x40) {
-        /* Sub-header */
-        cdrom_log("CD-ROM %i: [XA Mode 2 Form 2] Sub-header\n", dev->id);
-        memcpy(b, raw_buffer + 16, 8);
-        cdrom_sector_size += 8;
-        b += 8;
-    }
-
-    if (cdrom_sector_flags & 0x10) {
-        /* User data */
-        cdrom_log("CD-ROM %i: [XA Mode 2 Form 2] User data\n", dev->id);
-        memcpy(b, raw_buffer + 24, 2328);
-        cdrom_sector_size += 2328;
-        b += 2328;
+        /* Last Possible Start Time for Start of Lead-out */
+        buffer[20] = t[t_b0].pm;
+        buffer[21] = t[t_b0].ps;
+        buffer[22] = t[t_b0].pf;
     }
 }
 
 int
-cdrom_readsector_raw(cdrom_t *dev, uint8_t *buffer, int sector, int ismsf, int cdrom_sector_type,
-                     int cdrom_sector_flags, int *len, uint8_t vendor_type)
+cdrom_read_track_information(cdrom_t *dev, const uint8_t *cdb, uint8_t *buffer)
 {
-    uint8_t *b;
-    uint8_t *temp_b;
-    uint32_t msf;
-    uint32_t lba;
-    int      audio = 0;
-    int      mode2 = 0;
-    int      m;
-    int      s;
-    int      f;
+    uint8_t                 rti[65536] = { 0 };
+    const raw_track_info_t *t          = (raw_track_info_t *) rti;
+    const raw_track_info_t *track      = NULL;
+    const raw_track_info_t  lead_in    = { 0 };
+    const uint32_t          pos        = (cdb[2] << 24) | (cdb[3] << 16) |
+                                         (cdb[4] << 8) | cdb[5];
+    uint32_t                real_pos   = pos;
+    int                     num        = 0;
+    int                     ret;
 
-    if (dev->cd_status == CD_STATUS_EMPTY)
-        return 0;
+    dev->ops->get_raw_track_info(dev->local, &num, rti);
 
-    b = temp_b = buffer;
+    switch (cdb[1] & 0x03) {
+        default:
+            ret = -cdb[1];
+            break;
+        case 0x00:
+            if (num < 4)
+                ret = -pos;
+            else {
+                for (int i = 0; i < num; i++) {
+                     const raw_track_info_t *ct    = &(t[i]);
+                     const uint32_t          start = ((ct->pm * 60 * 75) + (ct->ps * 75) +
+                                                      ct->pf) - 150;
+                     if (pos > start) {
+                         track = ct;
+                         break;
+                     }
+                }
 
-    *len = 0;
+                if (track == NULL)
+                    ret = -cdb[1];
+                else
+                    ret = 36;
+            }
+            break;
+        case 0x01:
+            switch (pos) {
+                default:
+                    /*
+                       TODO: Does READ TRACK INFORMATION use track AAh
+                             or the raw A0h, A1h, and A2h?
+                     */
+                    if (pos == 0xaa)
+                        real_pos = 0xa2;
 
-    if (ismsf) {
-        m   = (sector >> 16) & 0xff;
-        s   = (sector >> 8) & 0xff;
-        f   = sector & 0xff;
-        lba = MSFtoLBA(m, s, f) - 150;
-        msf = sector;
+                    for (int i = 0; i < num; i++) {
+                        const raw_track_info_t *ct    = &(t[i]);
+                        if (ct->point == real_pos) {
+                            track = ct;
+                            break;
+                        }
+                    }
+
+                    if (track == NULL)
+                        ret   = -pos;
+                    else
+                        ret   = 36;
+                    break;
+                case 0x00:
+                    track = &lead_in;
+                    ret   = 36;
+                    break;
+                case 0xff:
+                    ret = -pos;
+                    break;
+            }
+            break;
+        case 0x02:
+            for (int i = 0; i < num; i++) {
+                 const raw_track_info_t *ct    = &(t[i]);
+                 if ((ct->session == pos) && (ct->point >= 1) && (ct->point <= 99)) {
+                     track = ct;
+                     break;
+                 }
+             }
+
+             if (track == NULL)
+                 ret   = -pos;
+             else
+                 ret   = 36;
+             break;
+    }
+
+    if (ret == 36) {
+         uint32_t start = ((track->pm * 60 * 75) + (track->ps * 75) +
+                           track->pf) - 150;
+         uint32_t len   = 0x00000000;
+         uint8_t  mode  = 0xf;
+
+         memset(buffer, 0, 36);
+         buffer[0] = 0x00;
+         buffer[1] = 0x22;
+         buffer[2] = track->point;             /* Track number (LSB). */
+         buffer[3] = track->session;           /* Session number (LSB). */
+         /* Not damaged, primary copy. */
+         buffer[5] = track->adr_ctl & 0x04;
+
+         if ((track->point >= 1) && (track->point >= 99)) {
+             for (int i = 0; i < num; i++) {
+                 const raw_track_info_t *ct = &(t[i]);
+                 const uint32_t          ts = ((ct->pm * 60 * 75) + (ct->ps * 75) +
+                                               ct->pf) - 150;
+                 if ((ts > start) && ((ct->point == 0xa2) || ((ct->point >= 1) &&
+                     (ct->point <= 99)))) {
+                     len = ts - start;
+                     break;
+                 }
+             }
+
+             if (track->adr_ctl & 0x04) {
+                 ret  = read_data(dev, start, 0);
+                 mode = dev->raw_buffer[dev->cur_buf][3];
+             }
+         } else if (track->point != 0xa2)
+             start = 0x00000000;
+
+         /* Not reserved track, not blank, not packet writing, not fixed packet. */
+         buffer[ 6] = mode << 0;
+         /* Last recorded address not valid, next recordable address not valid. */
+         buffer[ 7] = 0x00;
+
+         buffer[ 8] = (start >> 24) & 0xff;
+         buffer[ 9] = (start >> 16) & 0xff;
+         buffer[10] = (start >> 8) & 0xff;
+         buffer[11] = start & 0xff;
+
+         buffer[24] = (len >> 24) & 0xff;
+         buffer[25] = (len >> 16) & 0xff;
+         buffer[26] = (len >> 8) & 0xff;
+         buffer[27] = len & 0xff;
+    }
+
+    return ret;
+}
+
+uint8_t
+cdrom_get_current_mode(cdrom_t *dev)
+{
+    if (dev->cached_sector == -1)
+        (void) read_data(dev, dev->seek_pos, 0);
+    else
+        (void) read_data(dev, dev->cached_sector, 0);
+
+    return dev->raw_buffer[dev->cur_buf][3];
+}
+
+void
+cdrom_set_empty(cdrom_t *dev)
+{
+    dev->cd_status      = CD_STATUS_EMPTY;
+    dev->cached_sector  = -1;
+}
+
+void
+cdrom_update_status(cdrom_t *dev)
+{
+    const int  was_empty = (dev->cd_status == CD_STATUS_EMPTY);
+
+    if (dev->ops->load != NULL)
+        dev->ops->load(dev->local);
+
+    /* All good, reset state. */
+    dev->seek_pos       = 0;
+    dev->cd_buflen      = 0;
+
+    if (dev->ops->is_dvd(dev->local)) {
+        if (cdrom_is_dvd(dev->type))
+            dev->cd_status      = CD_STATUS_DVD;
+        else
+            dev->cd_status      = CD_STATUS_DVD_REJECTED;
+    } else
+        dev->cd_status      = dev->ops->has_audio(dev->local) ? CD_STATUS_STOPPED :
+                                                                CD_STATUS_DATA_ONLY;
+
+    dev->cached_sector  = -1;
+    dev->cdrom_capacity = dev->ops->get_last_block(dev->local);
+
+    if ((dev->cd_status != CD_STATUS_EMPTY) && (dev->cd_status != CD_STATUS_DVD_REJECTED)) {
+        /* Signal media change to the emulated machine. */
+        cdrom_insert(dev->id);
+
+        /* The drive was previously empty, transition directly to UNIT ATTENTION. */
+        if (was_empty)
+            cdrom_insert(dev->id);
+    }
+}
+
+int
+cdrom_load(cdrom_t *dev, const char *fn, const int skip_insert)
+{
+    const int  was_empty = cdrom_is_empty(dev->id);
+    int        ret       = 0;
+
+    /* Make sure to not STRCPY if the two are pointing
+       at the same place. */
+    if (fn != dev->image_path)
+        strcpy(dev->image_path, fn);
+
+    /* Open the target. */
+    if ((strlen(dev->image_path) != 0) &&
+        (strstr(dev->image_path, "ioctl://") == dev->image_path))
+        dev->local = ioctl_open(dev, dev->image_path);
+    else
+        dev->local = image_open(dev, dev->image_path);
+
+    dev->cached_sector  = -1;
+
+    if (dev->local == NULL) {
+        dev->ops           = NULL;
+        dev->image_path[0] = 0;
+
+        ret = 1;
     } else {
-        switch (vendor_type) {
-            case 0x00:
-                lba = sector;
-                msf = cdrom_lba_to_msf_accurate(sector);
-                break;
-            case 0x40:
-                m = bcd2bin((sector >> 24) & 0xff);
-                s = bcd2bin((sector >> 16) & 0xff);
-                f = bcd2bin((sector >> 8) & 0xff);
-                lba = MSFtoLBA(m, s, f) - 150;
-                msf = sector;
-                break;
-            case 0x80:
-                lba = bcd2bin((sector >> 24) & 0xff);
-                msf = sector;
-                break;
-            /* Never used values but the compiler complains. */
-            default:
-                lba = msf = 0;
-        }
+        /* All good, reset state. */
+        dev->seek_pos       = 0;
+        dev->cd_buflen      = 0;
+
+        if ((dev->ops->is_empty != NULL) && dev->ops->is_empty(dev->local))
+            dev->cd_status      = CD_STATUS_EMPTY;
+        else if (dev->ops->is_dvd(dev->local)) {
+            if (cdrom_is_dvd(dev->type))
+                dev->cd_status      = CD_STATUS_DVD;
+            else {
+                warning("DVD image \"%s\" in a CD-only drive, reporting as empty\n", fn);
+                dev->cd_status      = CD_STATUS_DVD_REJECTED;
+            }
+        } else
+            dev->cd_status      = dev->ops->has_audio(dev->local) ? CD_STATUS_STOPPED :
+                                                                    CD_STATUS_DATA_ONLY;
+
+        dev->cdrom_capacity = dev->ops->get_last_block(dev->local);
+
+        cdrom_log(dev->log, "CD-ROM capacity: %i sectors (%" PRIi64 " bytes)\n",
+                  dev->cdrom_capacity, ((uint64_t) dev->cdrom_capacity) << 11ULL);
     }
 
-    if (dev->ops->track_type)
-        audio = dev->ops->track_type(dev, lba);
+#ifdef ENABLE_CDROM_LOG
+    cdrom_toc_dump(dev);
+#endif
 
-    mode2 = audio & ~CD_TRACK_AUDIO;
-    audio &= CD_TRACK_AUDIO;
+    if (!skip_insert && (dev->cd_status != CD_STATUS_EMPTY) && (dev->cd_status != CD_STATUS_DVD_REJECTED)) {
+        /* Signal media change to the emulated machine. */
+        cdrom_insert(dev->id);
 
-    memset(raw_buffer, 0, 2448);
-    memset(extra_buffer, 0, 296);
-
-    if ((cdrom_sector_flags & 0xf8) == 0x08) {
-        /* 0x08 is an illegal mode */
-        cdrom_log("CD-ROM %i: [Mode 1] 0x08 is an illegal mode\n", dev->id);
-        return 0;
+        /* The drive was previously empty, transition directly to UNIT ATTENTION. */
+        if (was_empty)
+            cdrom_insert(dev->id);
     }
 
-    if (!track_type_is_valid(dev->id, cdrom_sector_type, cdrom_sector_flags, audio, mode2))
-        return 0;
-
-    if ((cdrom_sector_type > 5) && (cdrom_sector_type != 8)) {
-        cdrom_log("CD-ROM %i: Attempting to read an unrecognized sector type from an image\n", dev->id);
-        return 0;
-    } else if (cdrom_sector_type == 1) {
-        if (!audio || (dev->cd_status == CD_STATUS_DATA_ONLY)) {
-            cdrom_log("CD-ROM %i: [Audio] Attempting to read an audio sector from a data image\n", dev->id);
-            return 0;
-        }
-
-        read_audio(dev, lba, temp_b);
-    } else if (cdrom_sector_type == 2) {
-        if (audio || mode2) {
-            cdrom_log("CD-ROM %i: [Mode 1] Attempting to read a sector of another type\n", dev->id);
-            return 0;
-        }
-
-        read_mode1(dev, cdrom_sector_flags, lba, msf, mode2, temp_b);
-    } else if (cdrom_sector_type == 3) {
-        if (audio || !mode2 || (mode2 & 0x03)) {
-            cdrom_log("CD-ROM %i: [Mode 2 Formless] Attempting to read a sector of another type\n", dev->id);
-            return 0;
-        }
-
-        read_mode2_non_xa(dev, cdrom_sector_flags, lba, msf, mode2, temp_b);
-    } else if (cdrom_sector_type == 4) {
-        if (audio || !mode2 || ((mode2 & 0x03) != 1)) {
-            cdrom_log("CD-ROM %i: [XA Mode 2 Form 1] Attempting to read a sector of another type\n", dev->id);
-            return 0;
-        }
-
-        read_mode2_xa_form1(dev, cdrom_sector_flags, lba, msf, mode2, temp_b);
-    } else if (cdrom_sector_type == 5) {
-        if (audio || !mode2 || ((mode2 & 0x03) != 2)) {
-            cdrom_log("CD-ROM %i: [XA Mode 2 Form 2] Attempting to read a sector of another type\n", dev->id);
-            return 0;
-        }
-
-        read_mode2_xa_form2(dev, cdrom_sector_flags, lba, msf, mode2, temp_b);
-    } else if (cdrom_sector_type == 8) {
-        if (audio) {
-            cdrom_log("CD-ROM %i: [Any Data] Attempting to read a data sector from an audio track\n", dev->id);
-            return 0;
-        }
-
-        if (mode2 && ((mode2 & 0x03) == 1))
-            read_mode2_xa_form1(dev, cdrom_sector_flags, lba, msf, mode2, temp_b);
-        else if (!mode2)
-            read_mode1(dev, cdrom_sector_flags, lba, msf, mode2, temp_b);
-        else {
-            cdrom_log("CD-ROM %i: [Any Data] Attempting to read a data sector whose cooked size is not 2048 bytes\n", dev->id);
-            return 0;
-        }
-    } else {
-        if (mode2) {
-            if ((mode2 & 0x03) == 0x01)
-                read_mode2_xa_form1(dev, cdrom_sector_flags, lba, msf, mode2, temp_b);
-            else if ((mode2 & 0x03) == 0x02)
-                read_mode2_xa_form2(dev, cdrom_sector_flags, lba, msf, mode2, temp_b);
-            else
-                read_mode2_non_xa(dev, cdrom_sector_flags, lba, msf, mode2, temp_b);
-        } else {
-            if (audio)
-                read_audio(dev, lba, temp_b);
-            else
-                read_mode1(dev, cdrom_sector_flags, lba, msf, mode2, temp_b);
-        }
-    }
-
-    if ((cdrom_sector_flags & 0x06) == 0x02) {
-        /* Add error flags. */
-        cdrom_log("CD-ROM %i: Error flags\n", dev->id);
-        memcpy(b + cdrom_sector_size, extra_buffer, 294);
-        cdrom_sector_size += 294;
-    } else if ((cdrom_sector_flags & 0x06) == 0x04) {
-        /* Add error flags. */
-        cdrom_log("CD-ROM %i: Full error flags\n", dev->id);
-        memcpy(b + cdrom_sector_size, extra_buffer, 296);
-        cdrom_sector_size += 296;
-    }
-
-    if ((cdrom_sector_flags & 0x700) == 0x100) {
-        cdrom_log("CD-ROM %i: Raw subchannel data\n", dev->id);
-        memcpy(b + cdrom_sector_size, raw_buffer + 2352, 96);
-        cdrom_sector_size += 96;
-    } else if ((cdrom_sector_flags & 0x700) == 0x200) {
-        cdrom_log("CD-ROM %i: Q subchannel data\n", dev->id);
-        memcpy(b + cdrom_sector_size, raw_buffer + 2352, 16);
-        cdrom_sector_size += 16;
-    } else if ((cdrom_sector_flags & 0x700) == 0x400) {
-        cdrom_log("CD-ROM %i: R/W subchannel data\n", dev->id);
-        memcpy(b + cdrom_sector_size, raw_buffer + 2352, 96);
-        cdrom_sector_size += 96;
-    }
-
-    *len = cdrom_sector_size;
-
-    return 1;
+    return ret;
 }
 
 /* Peform a master init on the entire module. */
@@ -1922,32 +3069,50 @@ cdrom_global_init(void)
 {
     /* Clear the global data. */
     memset(cdrom, 0x00, sizeof(cdrom));
-}
 
-static void
-cdrom_drive_reset(cdrom_t *dev)
-{
-    dev->priv        = NULL;
-    dev->insert      = NULL;
-    dev->close       = NULL;
-    dev->get_volume  = NULL;
-    dev->get_channel = NULL;
+    for (uint8_t i = 0; i < CDROM_NUM; i++)
+        cdrom[i].cached_sector = -1;
 }
 
 void
 cdrom_hard_reset(void)
 {
-    cdrom_t *dev;
+    cdrom_assigned_letters = 0;
 
     for (uint8_t i = 0; i < CDROM_NUM; i++) {
-        dev = &cdrom[i];
-        if (dev->bus_type) {
-            cdrom_log("CD-ROM %i: Hard reset\n", i);
+        cdrom_t *dev = &cdrom[i];
 
-            dev->id = i;
+        if (dev->bus_type) {
+            dev->id       = i;
+
+            const char *vendor = cdrom_drive_types[dev->type].vendor;
+
+            dev->is_early   = cdrom_is_early(dev->type);
+            dev->is_bcd     = !strcmp(vendor, "NEC");
+            dev->is_nec     = (dev->bus_type == CDROM_BUS_SCSI) &&
+                              !strcmp(vendor, "NEC");
+            dev->is_chinon  = !strcmp(vendor, "CHINON");
+            dev->is_pioneer = !strcmp(vendor, "PIONEER");
+            dev->is_plextor = !strcmp(vendor, "PLEXTOR");
+            dev->is_sony    = (dev->bus_type == CDROM_BUS_SCSI) &&
+                              (!strcmp(vendor, "DEC") ||
+                               !strcmp(vendor, "ShinaKen") ||
+                               !strcmp(vendor, "SONY") ||
+                               !strcmp(vendor, "TEXEL"));
+            dev->is_toshiba = !strcmp(vendor, "TOSHIBA");
+
+            dev->c2_first   = !strcmp(vendor, "NEC") ||
+                              !strcmp(vendor, "PLEXTOR");
 
             cdrom_drive_reset(dev);
 
+            char n[1024] = { 0 };
+
+            sprintf(n, "CD-ROM %i      ", i + 1);
+            dev->log = log_open(n);
+
+            cdrom_log(dev->log, "Hard reset\n");
+
             switch (dev->bus_type) {
                 case CDROM_BUS_ATAPI:
                 case CDROM_BUS_SCSI:
@@ -1958,9 +3123,12 @@ cdrom_hard_reset(void)
                     break;
             }
 
-            dev->cd_status = CD_STATUS_EMPTY;
+            dev->cd_status     = CD_STATUS_EMPTY;
+            dev->host_letter = 0xff;
 
-            if (dev->host_drive == 200) {
+            dev->cached_sector = -1;
+
+            if (strlen(dev->image_path) > 0) {
 #ifdef _WIN32
                 if ((strlen(dev->image_path) >= 1) && (dev->image_path[strlen(dev->image_path) - 1] == '/'))
                     dev->image_path[strlen(dev->image_path) - 1] = '\\';
@@ -1970,7 +3138,12 @@ cdrom_hard_reset(void)
                     dev->image_path[strlen(dev->image_path) - 1] = '/';
 #endif
 
-                cdrom_image_open(dev, dev->image_path);
+                cdrom_load(dev, dev->image_path, 0);
+            }
+
+            for (uint32_t j = 0; j < _LUT_SIZE; ++j) {
+                dev->_F_LUT[j] = (j << 1) ^ (j & 0x80 ? 0x11d : 0);
+                dev->_B_LUT[j ^ dev->_F_LUT[j]] = j;
             }
         }
     }
@@ -1981,10 +3154,8 @@ cdrom_hard_reset(void)
 void
 cdrom_close(void)
 {
-    cdrom_t *dev;
-
     for (uint8_t i = 0; i < CDROM_NUM; i++) {
-        dev = &cdrom[i];
+        cdrom_t *dev = &cdrom[i];
 
         if (dev->bus_type == CDROM_BUS_SCSI)
             memset(&scsi_devices[dev->scsi_device_id], 0x00, sizeof(scsi_device_t));
@@ -1992,91 +3163,116 @@ cdrom_close(void)
         if (dev->close)
             dev->close(dev->priv);
 
-        if (dev->ops && dev->ops->exit)
-            dev->ops->exit(dev);
+        cdrom_unload(dev);
 
         dev->ops  = NULL;
         dev->priv = NULL;
 
         cdrom_drive_reset(dev);
+
+        if (dev->log != NULL) {
+            cdrom_log(dev->log, "Log closed\n");
+
+            log_close(dev->log);
+            dev->log = NULL;
+        }
     }
 }
 
 /* Signal disc change to the emulated machine. */
 void
-cdrom_insert(uint8_t id)
+cdrom_insert(const uint8_t id)
 {
-    cdrom_t *dev = &cdrom[id];
+    const cdrom_t *dev = &cdrom[id];
 
     if (dev->bus_type && dev->insert)
         dev->insert(dev->priv);
 }
 
-/* The mechanics of ejecting a CD-ROM from a drive. */
 void
-cdrom_eject(uint8_t id)
+cdrom_exit(const uint8_t id)
 {
     cdrom_t *dev = &cdrom[id];
 
-    /* This entire block should be in cdrom.c/cdrom_eject(dev*) ... */
-    if (dev->host_drive == 0) {
-        /* Switch from empty to empty. Do nothing. */
-        return;
+    strcpy(dev->prev_image_path, dev->image_path);
+
+    dev->cached_sector = -1;
+
+    if (dev->ops) {
+        cdrom_unload(dev);
+
+        dev->ops = NULL;
     }
 
-    if (dev->host_drive == 200)
-        strcpy(dev->prev_image_path, dev->image_path);
-
-    dev->prev_host_drive = dev->host_drive;
-    dev->host_drive      = 0;
-
-    dev->ops->exit(dev);
-    dev->ops = NULL;
     memset(dev->image_path, 0, sizeof(dev->image_path));
 
+    cdrom_log(dev->log, "cdrom_exit(): cdrom_insert()\n");
     cdrom_insert(id);
+}
 
-    plat_cdrom_ui_update(id, 0);
+int
+cdrom_is_empty(const uint8_t id)
+{
+    const cdrom_t *dev = &cdrom[id];
+    int            ret = 0;
 
-    config_save();
+    /* This entire block should be in cdrom.c/cdrom_eject(dev*) ... */
+    if ((strlen(dev->image_path) == 0) || (dev->cd_status == CD_STATUS_EMPTY))
+        /* Switch from empty to empty. Do nothing. */
+        ret = 1;
+
+    return ret;
+}
+
+/* The mechanics of ejecting a CD-ROM from a drive. */
+void
+cdrom_eject(const uint8_t id)
+{
+    const cdrom_t *dev = &cdrom[id];
+
+    if (strlen(dev->image_path) != 0) {
+        cdrom_exit(id);
+
+        plat_cdrom_ui_update(id, 0);
+
+        config_save();
+    }
 }
 
 /* The mechanics of re-loading a CD-ROM drive. */
 void
-cdrom_reload(uint8_t id)
+cdrom_reload(const uint8_t id)
 {
-    cdrom_t *dev = &cdrom[id];
+    cdrom_t   *dev       = &cdrom[id];
 
-    if ((dev->host_drive == dev->prev_host_drive) || (dev->prev_host_drive == 0) || (dev->host_drive != 0)) {
+    if ((strcmp(dev->image_path, dev->prev_image_path) == 0) ||
+        (strlen(dev->prev_image_path) == 0) ||
+        (strlen(dev->image_path) > 0)) {
         /* Switch from empty to empty. Do nothing. */
         return;
     }
 
-    if (dev->ops && dev->ops->exit)
-        dev->ops->exit(dev);
+    cdrom_unload(dev);
+
     dev->ops = NULL;
     memset(dev->image_path, 0, sizeof(dev->image_path));
 
-    if (dev->prev_host_drive == 200) {
+    if (strlen(dev->image_path) > 0) {
         /* Reload a previous image. */
-        strcpy(dev->image_path, dev->prev_image_path);
+        if (strlen(dev->prev_image_path) > 0)
+            strcpy(dev->image_path, dev->prev_image_path);
 
 #ifdef _WIN32
-        if ((strlen(dev->image_path) >= 1) && (dev->image_path[strlen(dev->image_path) - 1] == '/'))
+        if ((strlen(dev->prev_image_path) > 0) && (strlen(dev->image_path) >= 1) &&
+            (dev->image_path[strlen(dev->image_path) - 1] == '/'))
             dev->image_path[strlen(dev->image_path) - 1] = '\\';
 #else
-         if ((strlen(dev->image_path) >= 1) && (dev->image_path[strlen(dev->image_path) - 1] == '\\'))
+        if ((strlen(dev->prev_image_path) > 0) && (strlen(dev->image_path) >= 1) &&
+            (dev->image_path[strlen(dev->image_path) - 1] == '\\'))
             dev->image_path[strlen(dev->image_path) - 1] = '/';
 #endif
 
-        cdrom_image_open(dev, dev->image_path);
-
-        cdrom_insert(id);
-
-        if (strlen(dev->image_path) == 0)
-            dev->host_drive = 0;
-        else
-            dev->host_drive = 200;
+        cdrom_load(dev, dev->image_path, 0);
     }
 
     plat_cdrom_ui_update(id, 1);
diff --git a/src/cdrom/cdrom_image.c b/src/cdrom/cdrom_image.c
index 0c7ee03a0..816a563d8 100644
--- a/src/cdrom/cdrom_image.c
+++ b/src/cdrom/cdrom_image.c
@@ -6,302 +6,2719 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          CD-ROM image support.
+ *          CD-ROM image file handling module.
  *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          RichardG, <richardg867@gmail.com>
+ *          Cacodemon345
  *
- *
- * Authors: RichardG867,
- *          Miran Grca, <mgrca8@gmail.com>
- *          bit,
- *
- *          Copyright 2015-2019 Richardg867.
- *          Copyright 2015-2019 Miran Grca.
- *          Copyright 2017-2019 bit.
+ *          Copyright 2016-2025 Miran Grca.
+ *          Copyright 2016-2025 RichardG.
+ *          Copyright 2024-2025 Cacodemon345.
  */
+#define __STDC_FORMAT_MACROS
+#include <ctype.h>
 #include <inttypes.h>
+#ifdef ENABLE_IMAGE_LOG
 #include <stdarg.h>
-#include <stdio.h>
+#endif
 #include <stdint.h>
-#include <string.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <wchar.h>
-#define HAVE_STDARG_H
+#include <sys/stat.h>
+#ifndef _WIN32
+#    include <libgen.h>
+#endif
 #include <86box/86box.h>
-#include <86box/config.h>
+#include <86box/log.h>
 #include <86box/path.h>
 #include <86box/plat.h>
-#include <86box/scsi_device.h>
-#include <86box/cdrom_image_backend.h>
 #include <86box/cdrom.h>
 #include <86box/cdrom_image.h>
+#include <86box/cdrom_image_viso.h>
 
-#ifdef ENABLE_CDROM_IMAGE_LOG
-int cdrom_image_do_log = ENABLE_CDROM_IMAGE_LOG;
+#include <sndfile.h>
+
+#define MAX_LINE_LENGTH     512
+#define MAX_FILENAME_LENGTH 256
+#define CROSS_LEN           512
+
+static char temp_keyword[1024];
+
+#define INDEX_SPECIAL -2 /* Track A0h onwards. */
+#define INDEX_NONE    -1 /* Empty block. */
+#define INDEX_ZERO     0 /* Block not in the file, return all 0x00's. */
+#define INDEX_NORMAL   1 /* Block in the file. */
+
+typedef struct track_index_t {
+    /*
+       Is the current block in the file? If not, return all 0x00's. -1 means not
+       yet loaded.
+    */
+    int32_t       type;
+    /* The amount of bytes to skip at the beginning of each sector. */
+    int32_t       skip;
+    /*
+       Starting and ending sector LBA - negative in order to accomodate LBA -150 to -1
+       to read the pregap of track 1.
+     */
+    uint64_t      start;
+    uint64_t      length;
+    uint64_t      file_start;
+    uint64_t      file_length;
+    track_file_t *file;
+} track_index_t;
+
+typedef struct track_t {
+    uint8_t       session;
+    uint8_t       attr;
+    uint8_t       tno;
+    uint8_t       point;
+    uint8_t       extra[4];
+    uint8_t       mode;
+    uint8_t       form;
+    uint8_t       subch_type;
+    uint8_t       skip;
+    uint8_t       max_index;
+    uint32_t      sector_size;
+    track_index_t idx[100];
+} track_t;
+
+/*
+   MDS for DVD has the disc structure table - 4 byte pointer to BCA,
+   followed by the copyright, DMI, and layer pages.
+*/
+#pragma pack(push, 1)
+typedef struct
+{
+    uint8_t  f1[4];
+    uint8_t  f4[2048];
+    uint8_t  f0[2048];
+} layer_t;
+
+typedef struct
+{
+    layer_t  layers[2];
+} mds_disc_struct_t;
+#pragma pack(pop)
+
+#define dstruct_t mds_disc_struct_t
+
+typedef struct cd_image_t {
+    cdrom_t      *dev;
+    void         *log;
+    int           is_dvd;
+    int           has_audio;
+    int           has_dstruct;
+    int32_t       tracks_num;
+    uint32_t      bad_sectors_num;
+    track_t      *tracks;
+    uint32_t     *bad_sectors;
+    dstruct_t     dstruct;
+} cd_image_t;
+
+typedef enum
+{
+    CD          = 0x00,    /* CD-ROM */
+    CD_R        = 0x01,    /* CD-R */
+    CD_RW       = 0x02,    /* CD-RW */
+    DVD         = 0x10,    /* DVD-ROM */
+    DVD_MINUS_R = 0x12     /* DVD-R */
+} mds_medium_type_t;
+
+typedef enum
+{
+    UNKNOWN     = 0x00,
+    AUDIO       = 0xa9,    /* sector size = 2352 */
+    MODE1       = 0xaa,    /* sector size = 2048 */
+    MODE2       = 0xab,    /* sector size = 2336 */
+    MODE2_FORM1 = 0xac,    /* sector size = 2048 */
+    MODE2_FORM2 = 0xad     /* sector size = 2324 (+4) */
+} mds_trk_mode_t;
+
+typedef enum
+{
+    NONE           = 0x00,    /* no subchannel */
+    PW_INTERLEAVED = 0x08     /* 96-byte PW subchannel, interleaved */
+} mds_subch_mode_t;
+
+#pragma pack(push, 1)
+typedef struct
+{
+    uint8_t  file_sig[16];
+    uint8_t  file_ver[2];
+    uint16_t medium_type;
+    uint16_t sess_num;
+    uint16_t pad[2];
+    uint16_t bca_data_len;
+    uint32_t pad0[2];
+    uint32_t bca_data_offs_offs;
+    uint32_t pad1[6];
+    uint32_t disc_struct_offs;
+    uint32_t pad2[3];
+    uint32_t sess_blocks_offs;
+    uint32_t dpm_blocks_offs;
+} mds_hdr_t;    /* 88 bytes */
+
+typedef struct
+{
+    int32_t  sess_start;
+    int32_t  sess_end;
+    uint16_t sess_id;
+    uint8_t  all_blocks_num;
+    uint8_t  non_track_blocks_num;
+    uint16_t first_trk;
+    uint16_t last_trk;
+    uint32_t pad;
+    uint32_t trk_blocks_offs;
+} mds_sess_block_t;    /* 24 bytes */
+
+typedef struct
+{
+    uint8_t  trk_mode;
+    /* DiscImageCreator says this is the number of subchannels. */
+    uint8_t  subch_mode;
+    uint8_t  adr_ctl;
+    uint8_t  track_id;
+    uint8_t  point;
+    uint8_t  m;
+    uint8_t  s;
+    uint8_t  f;
+    uint8_t  zero;
+    uint8_t  pm;
+    uint8_t  ps;
+    uint8_t  pf;
+    /* DiscImageCreator calls this the index offset. */
+    uint32_t ex_offs;
+    uint16_t sector_len;
+    /* DiscImageCreator says unknown1 followed by 17x zero. */
+    uint8_t  pad0[18];
+    uint32_t start_sect;
+    uint64_t start_offs;
+    uint32_t files_num;
+    uint32_t footer_offs;
+    uint8_t  pad1[24];
+} mds_trk_block_t;    /* 80 bytes */
+
+/*
+   DiscImageCreator's interpretation here makes sense and essentially
+   matches libmirage's - Index 0 sectors followed by Index 1 sectors.
+ */
+typedef struct
+{
+    uint32_t pregap;
+    uint32_t trk_sectors;
+} mds_trk_ex_block_t;    /* 8 bytes */
+
+typedef struct
+{
+    uint32_t fn_offs;
+    uint32_t fn_is_wide;
+    uint32_t pad;
+    uint32_t pad0;
+} mds_footer_t;    /* 16 bytes */
+
+typedef struct
+{
+    uint32_t type;
+    uint32_t pad[2];
+    uint32_t entries;
+} mds_dpm_block_t;
+#pragma pack(pop)
+
+#ifdef ENABLE_IMAGE_LOG
+int image_do_log = ENABLE_IMAGE_LOG;
 
 void
-cdrom_image_log(const char *fmt, ...)
+image_log(void *priv, const char *fmt, ...)
 {
     va_list ap;
 
-    if (cdrom_image_do_log) {
+    if (image_do_log) {
         va_start(ap, fmt);
-        pclog_ex(fmt, ap);
+        log_out(priv, fmt, ap);
         va_end(ap);
     }
 }
+
+static char   *cit[4]   = { "SPECIAL", "NONE", "ZERO", "NORMAL" };
 #else
-#    define cdrom_image_log(fmt, ...)
+#    define image_log(priv, fmt, ...)
 #endif
 
-/* The addresses sent from the guest are absolute, ie. a LBA of 0 corresponds to a MSF of 00:00:00. Otherwise, the counter displayed by the guest is wrong:
-   there is a seeming 2 seconds in which audio plays but counter does not move, while a data track before audio jumps to 2 seconds before the actual start
-   of the audio while audio still plays. With an absolute conversion, the counter is fine. */
-#define MSFtoLBA(m, s, f) ((((m * 60) + s) * 75) + f)
+typedef struct audio_file_t {
+    SNDFILE *file;
+    SF_INFO  info;
+} audio_file_t;
 
-static void
-image_get_tracks(cdrom_t *dev, int *first, int *last)
+/* Audio file functions */
+static int
+audio_read(void *priv, uint8_t *buffer, const uint64_t seek, const size_t count)
 {
-    cd_img_t *img = (cd_img_t *) dev->image;
-    TMSF      tmsf;
+    const track_file_t *tf            = (track_file_t *) priv;
+    const audio_file_t *audio         = (audio_file_t *) tf->priv;
+    const uint64_t      samples_seek  = seek / 4;
+    const uint64_t      samples_count = count / 4;
 
-    cdi_get_audio_tracks(img, first, last, &tmsf);
+    if ((seek & 3) || (count & 3)) {
+        image_log(tf->log, "CD Audio file: Reading on non-4-aligned boundaries.\n");
+    }
+
+    const sf_count_t res = sf_seek(audio->file, samples_seek, SEEK_SET);
+
+    if (res == -1)
+        return 0;
+
+    return !!sf_readf_short(audio->file, (short *) buffer, samples_count);
+}
+
+static uint64_t
+audio_get_length(void *priv)
+{
+    const track_file_t *tf    = (track_file_t *) priv;
+    const audio_file_t *audio = (audio_file_t *) tf->priv;
+
+    /* Assume 16-bit audio, 2 channel. */
+    return audio->info.frames * 4ull;
 }
 
 static void
-image_get_track_info(cdrom_t *dev, uint32_t track, int end, track_info_t *ti)
+audio_close(void *priv)
 {
-    cd_img_t *img = (cd_img_t *) dev->image;
-    TMSF      tmsf;
+    track_file_t *tf    = (track_file_t *) priv;
+    audio_file_t *audio = (audio_file_t *) tf->priv;
 
-    cdi_get_audio_track_info(img, end, track, &ti->number, &tmsf, &ti->attr);
+    memset(tf->fn, 0x00, sizeof(tf->fn));
+    if (audio && audio->file)
+        sf_close(audio->file);
+    free(audio);
+    free(tf);
+}
 
-    ti->m = tmsf.min;
-    ti->s = tmsf.sec;
-    ti->f = tmsf.fr;
+static track_file_t *
+audio_init(const uint8_t id, const char *filename, int *error)
+{
+    track_file_t *tf    = (track_file_t *) calloc(sizeof(track_file_t), 1);
+    audio_file_t *audio = (audio_file_t *) calloc(sizeof(audio_file_t), 1);
+#ifdef _WIN32
+    wchar_t filename_w[4096];
+#endif
+
+    if (tf == NULL || audio == NULL) {
+        goto cleanup_error;
+    }
+
+    memset(tf->fn, 0x00, sizeof(tf->fn));
+    strncpy(tf->fn, filename, sizeof(tf->fn) - 1);
+#ifdef _WIN32
+    mbstowcs(filename_w, filename, 4096);
+    audio->file = sf_wchar_open(filename_w, SFM_READ, &audio->info);
+#else
+    audio->file = sf_open(filename, SFM_READ, &audio->info);
+#endif
+
+    if (audio->file == NULL) {
+        image_log(tf->log, "Audio file open error!");
+        goto cleanup_error;
+    }
+
+    if (audio->info.channels != 2 || audio->info.samplerate != 44100 || !audio->info.seekable) {
+        image_log(tf->log, "Audio file not seekable or in non-CD format!");
+        sf_close(audio->file);
+        goto cleanup_error;
+    }
+
+    *error         = 0;
+
+    tf->priv       = audio;
+    tf->fp         = NULL;
+    tf->close      = audio_close;
+    tf->get_length = audio_get_length;
+    tf->read       = audio_read;
+
+    char n[1024]        = { 0 };
+
+    sprintf(n, "CD-ROM %i Audio", id + 1);
+    tf->log          = log_open(n);
+
+    return tf;
+cleanup_error:
+    free(tf);
+    free(audio);
+    *error = 1;
+    return NULL;
+}
+
+/* Binary file functions. */
+static int
+bin_read(void *priv, uint8_t *buffer, const uint64_t seek, const size_t count)
+{
+    const track_file_t *tf = (track_file_t *) priv;
+
+    if (tf->fp == NULL)
+        return 0;
+
+    image_log(tf->log, "binary_read(%08lx, pos=%" PRIu64 " count=%lu)\n",
+                    tf->fp, seek, count);
+
+    if (fseeko64(tf->fp, seek, SEEK_SET) == -1) {
+        image_log(tf->log, "binary_read failed during seek!\n");
+
+        return -1;
+    }
+
+    if (fread(buffer, count, 1, tf->fp) != 1) {
+        image_log(tf->log, "binary_read failed during read!\n");
+
+        return -1;
+    }
+
+    if (UNLIKELY(tf->motorola)) {
+        for (uint64_t i = 0; i < count; i += 2) {
+            const uint8_t buffer0 = buffer[i];
+            const uint8_t buffer1 = buffer[i + 1];
+            buffer[i] = buffer1;
+            buffer[i + 1] = buffer0;
+        }
+    }
+
+    return 1;
+}
+
+static uint64_t
+bin_get_length(void *priv)
+{
+    const track_file_t *tf = (track_file_t *) priv;
+
+    if (tf->fp == NULL)
+        return 0;
+
+    fseeko64(tf->fp, 0, SEEK_END);
+    const off64_t len = ftello64(tf->fp);
+    image_log(tf->log, "binary_length(%08lx) = %" PRIu64 "\n", tf->fp, len);
+
+    return len;
 }
 
 static void
-image_get_subchannel(cdrom_t *dev, uint32_t lba, subchannel_t *subc)
+bin_close(void *priv)
 {
-    cd_img_t *img = (cd_img_t *) dev->image;
-    TMSF      rel_pos;
-    TMSF      abs_pos;
+    track_file_t *tf = (track_file_t *) priv;
 
-    cdi_get_audio_sub(img, lba, &subc->attr, &subc->track, &subc->index,
-                      &rel_pos, &abs_pos);
+    if (tf == NULL)
+        return;
 
-    subc->abs_m = abs_pos.min;
-    subc->abs_s = abs_pos.sec;
-    subc->abs_f = abs_pos.fr;
+    if (tf->fp != NULL) {
+        fclose(tf->fp);
+        tf->fp = NULL;
+    }
 
-    subc->rel_m = rel_pos.min;
-    subc->rel_s = rel_pos.sec;
-    subc->rel_f = rel_pos.fr;
+    memset(tf->fn, 0x00, sizeof(tf->fn));
+
+    log_close(tf->log);
+    tf->log = NULL;
+
+    free(priv);
+}
+
+static track_file_t *
+bin_init(const uint8_t id, const char *filename, int *error)
+{
+    track_file_t *tf = (track_file_t *) calloc(1, sizeof(track_file_t));
+    struct stat   stats;
+
+    if (tf == NULL) {
+        *error = 1;
+        return NULL;
+    }
+
+    char n[1024]        = { 0 };
+
+    sprintf(n, "CD-ROM %i Bin  ", id + 1);
+    tf->log          = log_open(n);
+
+    memset(tf->fn, 0x00, sizeof(tf->fn));
+    strncpy(tf->fn, filename, sizeof(tf->fn) - 1);
+    tf->fp = plat_fopen64(tf->fn, "rb");
+    image_log(tf->log, "binary_open(%s) = %08lx\n", tf->fn, tf->fp);
+
+    if (stat(tf->fn, &stats) != 0) {
+        /* Use a blank structure if stat failed. */
+        memset(&stats, 0, sizeof(struct stat));
+    }
+    *error = ((tf->fp == NULL) || ((stats.st_mode & S_IFMT) == S_IFDIR));
+
+    /* Set the function pointers. */
+    if (!*error) {
+        tf->read       = bin_read;
+        tf->get_length = bin_get_length;
+        tf->close      = bin_close;
+    } else {
+        /* From the check above, error may still be non-zero if opening a directory.
+         * The error is set for viso to try and open the directory following this function.
+         * However, we need to make sure the descriptor is closed. */
+        if ((tf->fp != NULL) && ((stats.st_mode & S_IFMT) == S_IFDIR)) {
+            /* tf is freed by bin_close */
+            bin_close(tf);
+        } else {
+            log_close(tf->log);
+            tf->log = NULL;
+
+            free(tf);
+        }
+        tf = NULL;
+    }
+
+    return tf;
+}
+
+static track_file_t *
+index_file_init(const uint8_t id, const char *filename, int *error, int *is_viso)
+{
+    track_file_t *tf = NULL;
+
+    *is_viso = 0;
+
+    /* Current we only support .BIN files, either combined or one per
+       track. In the future, more is planned. */
+    tf = bin_init(id, filename, error);
+
+    if (*error) {
+        if ((tf != NULL) && (tf->close != NULL)) {
+            tf->close(tf);
+            tf = NULL;
+        }
+
+        tf  = viso_init(id, filename, error);
+
+        if (!*error)
+            *is_viso = 1;
+    }
+
+    return tf;
+}
+
+static void
+index_file_close(track_index_t *idx)
+{
+    if ((idx == NULL) || (idx->file == NULL))
+        return;
+
+    image_log(idx->file->log, "Log closed\n");
+
+    if (idx->file->log != NULL) {
+        log_close(idx->file->log);
+        idx->file->log = NULL;
+    }
+
+    if (idx->file->close != NULL)
+        idx->file->close(idx->file);
+
+    idx->file = NULL;
+}
+
+/* Internal functions. */
+static int
+image_get_track(const cd_image_t *img, const uint32_t sector)
+{
+    int ret = -1;
+
+    for (int i = 0; i < img->tracks_num; i++) {
+        track_t *ct = &(img->tracks[i]);
+        for (int j = 0; j <= ct->max_index; j++) {
+            const track_index_t *ci = &(ct->idx[j]);
+            if ((ci->type >= INDEX_ZERO) && (ci->length != 0ULL) &&
+                ((sector + 150) >= ci->start) && ((sector + 150) <= (ci->start + ci->length - 1))) {
+                ret = i;
+                break;
+            }
+        }
+    }
+
+    return ret;
+}
+
+static void
+image_get_track_and_index(const cd_image_t *img, const uint32_t sector,
+                          int *track, int *index)
+{
+    *track = -1;
+    *index = -1;
+
+    for (int i = 0; i < img->tracks_num; i++) {
+        track_t *ct = &(img->tracks[i]);
+        if ((ct->point >= 1) && (ct->point <= 99))  for (int j = 0; j <= ct->max_index; j++) {
+            track_index_t *ci = &(ct->idx[j]);
+            if ((ci->type >= INDEX_ZERO) && (ci->length != 0ULL) &&
+                ((sector + 150) >= ci->start) && ((sector + 150) <= (ci->start + ci->length - 1))) {
+                *track = i;
+                *index = j;
+                break;
+            }
+        }
+    }
 }
 
 static int
-image_get_capacity(cdrom_t *dev)
+image_is_sector_bad(const cd_image_t *img, const uint32_t sector)
 {
-    cd_img_t     *img = (cd_img_t *) dev->image;
-    int           first_track;
-    int           last_track;
-    int           number;
-    unsigned char attr;
-    uint32_t      address = 0;
-    uint32_t      lb = 0;
+    int ret = 0;
 
-    if (!img)
+    if (img->bad_sectors_num > 0)  for (int i = 0; i < img->bad_sectors_num; i++)
+        if (img->bad_sectors[i] == sector) {
+            ret = 1;
+            break;
+        }
+
+    return ret;
+}
+
+static int
+image_is_track_audio(const cd_image_t *img, const uint32_t pos)
+{
+    int ret   = 0;
+
+    if (img->has_audio) {
+        const int track = image_get_track(img, pos);
+
+        if (track >= 0) {
+            const track_t *trk = &(img->tracks[track]);
+
+            ret = (trk->mode == 0);
+        }
+    }
+
+    return ret;
+}
+
+static int
+image_can_read_pvd(track_file_t *file, const uint64_t start,
+                   const uint64_t sector_size, const int xa)
+{
+    uint8_t  buf[2448] = { 0 };
+    /* First VD is located at sector 16. */
+    uint64_t seek = start + (16ULL * sector_size);
+    uint8_t *pvd  = (uint8_t *) buf;
+
+    if (sector_size >= RAW_SECTOR_SIZE) {
+        if (xa)
+            pvd = &(buf[24]);
+        else
+            pvd = &(buf[16]);
+    } else if (sector_size >= 2332) {
+        if (xa)
+            pvd = &(buf[8]);
+    }
+
+    file->read(file, buf, seek, sector_size);
+
+    int ret = (((pvd[0] == 1) &&
+                !strncmp((char *) &(pvd[1]), "CD001", 5) &&
+                (pvd[6] == 1)) ||
+               ((pvd[8] == 1) &&
+                !strncmp((char *) &(pvd[9]), "CDROM", 5) &&
+                (pvd[14] == 1)));
+
+    if (ret) {
+        if (sector_size >= RAW_SECTOR_SIZE) {
+            if (xa)
+                /* Mode 2 XA, Form from the sub-header. */
+                ret = 0x20 | (((buf[18] & 0x20) >> 5) + 1);
+            else
+                /* Mode from header. */
+                ret = buf[15] << 4;
+        } else if (sector_size >= 2332) {
+            if (xa)
+                /* Mode 2 XA, Form from the sub-header. */
+                ret = 0x20 | (((buf[2] & 0x20) >> 5) + 1);
+            else
+                /* Mode 2 non-XA. */
+                ret = 0x20;
+        } else if (sector_size >= 2324)
+            /* Mode 2 XA Form 2. */
+            ret = 0x22;
+        else if (!strncmp((char *) &(pvd[0x400]), "CD-XA001", 8))
+            /* Mode 2 XA Form 1. */
+            ret = 0x21;
+        else
+            /* Mode 1. */
+            ret = 0x10;
+    }
+
+    return ret;
+}
+
+static int
+image_cue_get_buffer(char *str, char **line, const int up)
+{
+    char *s     = *line;
+    char *p     = str;
+    int   quote = 0;
+    int   done  = 0;
+    int   space = 1;
+
+    /* Copy to local buffer until we have end of string or whitespace. */
+    while (!done) {
+        switch (*s) {
+            case '\0':
+                if (quote) {
+                    /* Ouch, unterminated string.. */
+                    return 0;
+                }
+                done = 1;
+                break;
+
+            case '\"':
+                quote ^= 1;
+                break;
+
+            case ' ':
+            case '\t':
+                if (space)
+                    break;
+
+                if (!quote) {
+                    done = 1;
+                    break;
+                }
+                fallthrough;
+
+            default:
+                if (up && islower((int) *s))
+                    *p++ = toupper((int) *s);
+                else
+                    *p++ = *s;
+                space = 0;
+                break;
+        }
+
+        if (!done)
+            s++;
+    }
+    *p = '\0';
+
+    *line = s;
+
+    return 1;
+}
+
+static int
+image_cue_get_keyword(char **dest, char **line)
+{
+    const int success = image_cue_get_buffer(temp_keyword, line, 1);
+
+    if (success)
+        *dest = temp_keyword;
+
+    return success;
+}
+
+/* Get a string from the input line, handling quotes properly. */
+static uint64_t
+image_cue_get_number(char **line)
+{
+    char     temp[128];
+    uint64_t num;
+
+    if (!image_cue_get_buffer(temp, line, 0))
         return 0;
 
-    cdi_get_audio_tracks_lba(img, &first_track, &last_track, &lb);
+    if (sscanf(temp, "%" PRIu64, &num) != 1)
+        return 0;
 
-    for (int c = 0; c <= last_track; c++) {
-        cdi_get_audio_track_info_lba(img, 0, c + 1, &number, &address, &attr);
-        if (address > lb)
-            lb = address;
+    return num;
+}
+
+static int
+image_cue_get_frame(uint64_t *frames, char **line)
+{
+    char temp[128];
+    int  min = 0;
+    int  sec = 0;
+    int  fr  = 0;
+
+    int  success = image_cue_get_buffer(temp, line, 0);
+    if (!success)
+        return 0;
+
+    success = sscanf(temp, "%d:%d:%d", &min, &sec, &fr) == 3;
+    if (!success)
+        return 0;
+
+    *frames = MSF_TO_FRAMES(min, sec, fr);
+
+    return 1;
+}
+
+static int
+image_cue_get_flags(track_t *cur, char **line)
+{
+    char temp[128];
+    char temp2[128];
+
+    int success = image_cue_get_buffer(temp, line, 0);
+    if (!success)
+        return 0;
+
+    memset(temp2, 0x00, sizeof(temp2));
+    success = sscanf(temp, "%s", temp2) == 1;
+    if (!success)
+        return 0;
+
+    if (strstr(temp2, "PRE") != NULL)
+        cur->attr |= 0x01;
+    if (strstr(temp2, "DCP") != NULL)
+        cur->attr |= 0x02;
+    if (strstr(temp2, "4CH") != NULL)
+        cur->attr |= 0x08;
+
+    return 1;
+}
+
+static track_t *
+image_insert_track(cd_image_t *img, const uint8_t session, const uint8_t point)
+{
+    track_t       *ct      = NULL;
+
+    img->tracks_num++;
+    if (img->tracks == NULL) {
+        img->tracks = calloc(1, sizeof(track_t));
+        ct          = &(img->tracks[0]);
+    } else {
+        img->tracks = realloc(img->tracks, img->tracks_num * sizeof(track_t));
+        ct          = &(img->tracks[img->tracks_num - 1]);
+    }
+
+    image_log(img->log, "    [TRACK   ] Insert %02X: img->tracks[%2i]\n",
+              point, img->tracks_num - 1);
+
+    memset(ct, 0x00, sizeof(track_t));
+
+    ct->max_index = 2;
+
+    ct->session   = session;
+    ct->point     = point;
+
+    for (int i = 0; i < 3; i++)
+        ct->idx[i].type = (point > 99) ? INDEX_SPECIAL : INDEX_NONE;
+
+     if (point >= 0xb0)
+         ct->attr = 0x50;
+
+    return ct;
+}
+
+static void
+image_process(cd_image_t *img)
+{
+    track_t       *ct       = NULL;
+    track_t       *lt       = NULL;
+    track_index_t *ci       = NULL;
+    track_file_t  *tf       = NULL;
+    uint64_t       tf_len   = 0ULL;
+    uint64_t       cur_pos  = 0ULL;
+    int            pos      = 0;
+    int            ls       = 0;
+    int            map[256] = { 0 };
+    int            lead[3]  = { 0 };
+    uint64_t       spg[256] = { 0ULL };
+    track_t       *lo[256]  = { 0 };
+
+    /*
+       Pass 2 - adjusting pre-gaps of the first track of every session and creating the
+       map so we can map from <A0/A1/A2> <01-99> <B0/C0> to <01-99> <A0/A1/A2> <B0/C0>
+       so that their times and length can be adjusted correctly in the third and fourth
+       passes - especially important for multi-session Cue files.
+
+       We have to do that because Cue sheets do not explicitly indicate those pre-gaps
+       but they are required so we have the correct frames - the first track of each
+       session always has a pre-gap of at least 0:02:00. We do not adjust it if it is
+       already present.
+     */
+    image_log(img->log, "Pass 2 (adjusting pre-gaps and preparing map)...\n");
+
+    /* Pre-gap of the first track of the first session. */
+    ct = &(img->tracks[3]);
+    ci = &(ct->idx[0]);
+
+    if (ci->type == INDEX_NONE) {
+        ci->type   = INDEX_ZERO;
+        ci->start  = 0ULL;
+        ci->length = 150ULL;
+    }
+
+    image_log(img->log, "    [PREGAP  ] Adjusted pre-gap of track %02X (first in "
+                    "session %i)\n", ct->point, ct->session);
+
+    /* The other pre-gaps and the preparation of the map. */   
+    for (int i = 0; i < img->tracks_num; i++) {
+        ct = &(img->tracks[i]);
+        if (((ct->point >= 1) && (ct->point <= 99)) || (ct->point >= 0xb0)) {
+            if (ct->point == 0xb0) {
+                /* The first track of a session always has a pre-gap of at least 0:02:00. */
+                track_t *ft = &(img->tracks[i + (ct->session == 1) + 4]);
+                ci          = &(ft->idx[0]);
+
+                if (ci->type == INDEX_NONE) {
+                    if (ft->idx[1].type == INDEX_NORMAL) {
+                        ci->type       = INDEX_NORMAL;
+                        ci->file_start = ft->idx[1].file_start - 150ULL;
+                    } else {
+                        ci->type       = INDEX_ZERO;
+                        ci->start      = 0ULL;
+                        ci->length     = 150ULL;
+                    }
+                }
+
+                image_log(img->log, "    [PREGAP  ] Adjusted pre-gap of track %02X "
+                          "(first in session %i)\n", ft->point, ct->session);
+
+                /* Point B0h found, add the previous three lead tracks. */
+                for (int j = 0; j < 3; j++) {
+                    map[pos] = lead[j];
+                    image_log(img->log, "    [REMAP   ] Remap %3i to %3i (%02X)\n", pos,
+                              map[pos], 0xa0 + j);
+                    pos++;
+                }
+            }
+
+            /* Add the current track. */
+            map[pos] = i;
+            image_log(img->log, "    [NORMAL  ] Remap %3i to %3i\n", pos, map[pos]);
+            pos++;
+        } else if ((ct->point >= 0xa0) && (ct->point <= 0xa2)) {
+            /*
+               Collect lead track (A0 = first track in session, A1 = last track in session,
+               A2 = lead out).
+             */
+            lead[ct->point & 0x03] = i;
+
+            image_log(img->log, "    [LEAD    ] Lead %i = %3i (%02X)\n", ct->point & 0x03, i,
+                      ct->point);
+        }
+    }
+
+    /* Add the last three lead tracks. */
+    for (int i = 0; i < 3; i++) {
+         map[pos] = lead[i];
+         image_log(img->log, "    [REMAP   ] Remap %3i to %3i (%02X)\n", pos, map[pos],
+                   0xa0 + i);
+         pos++;
+    }
+
+    /*
+       If these two mismatch, it is a fatal condition since it means something
+       has gone wrong enough that the Cue sheet processing has been messed up.
+     */
+    if (pos != img->tracks_num)
+        log_fatal(img->log, "Something has gone wrong and we have remappped %3i tracks "
+                  "instead of the expected %3i\n", pos, img->tracks_num);
+
+    /*
+       Pass 3 - adjusting the time lengths of each index of track according to the
+       files.
+
+       We have to do that because Cue sheets do not explicitly indicate the lengths
+       of track, so we have to deduce them from what the combination of the Cue sheet
+       and the various files give us.
+     */
+    image_log(img->log, "Pass 3 (adjusting track file lengths according to the files)...\n");
+    for (int i = (img->tracks_num - 1); i >= 0; i--) {
+        ct = &(img->tracks[map[i]]);
+        if (ct->idx[1].type != INDEX_SPECIAL) {
+            for (int j = ct->max_index; j >= 0; j--) {
+                ci = &(ct->idx[j]);
+
+                /*
+                   If the file is not NULL and is different from the previous file,
+                   open it and read its length.
+                 */
+                if ((ci->file != NULL) && (ci->file != tf)) {
+                    tf     = ci->file;
+                    if (tf != NULL) {
+                        tf_len = tf->get_length(tf) / ct->sector_size;
+                        image_log(img->log, "    [FILE    ] File length: %016"
+                                  PRIX64 " sectors\n", tf_len);
+                    }
+                }
+
+                if ((ci->type == INDEX_NORMAL) && (((int64_t) ci->file_start) < 0LL)) {
+                    ci->type        = INDEX_ZERO;
+                    ci->length      = 150;
+                    ci->file_start  = 0ULL;
+                    ci->file_length = 0ULL;
+                }
+
+                if ((ci->type < INDEX_SPECIAL) || (ci->type > INDEX_NORMAL)) {
+                    image_log(img->log, "    [TRACK   ] %02X, INDEX %02X, ATTR %02X,\n",
+                              ci->type, j,
+                              ct->attr);
+                    log_fatal(img->log, "               Unrecognized index type during "
+                              "Pass 3: %2i\n",
+                              ci->type);
+                } else if (ci->type == INDEX_NORMAL) {
+                    /* Index was in the cue sheet and is present in the file. */
+                    ci->file_length = tf_len - ci->file_start;
+                    tf_len -= ci->file_length;
+                } else {
+                    /* Index was not in the cue sheet or is not present in the file,
+                       keep its length at zero. */
+                    ci->file_start = tf_len;
+                }
+
+                image_log(img->log, "    [TRACK   ] %02X/%02X, INDEX %02X, ATTR %02X, "
+                          "MODE %02X/%02X, %8s,\n",
+                          ct->session,
+                          ct->point, j,
+                          ct->attr,
+                          ct->mode, ct->form,
+                          cit[ci->type + 2]);
+                image_log(img->log, "               file_start   = %016"
+                          PRIX64 " (%2i:%02i:%02i),\n",
+                          ci->file_start,
+                          (int) ((ci->file_start / 75) / 60),
+                          (int) ((ci->file_start / 75) % 60),
+                          (int) (ci->file_start % 75));
+                image_log(img->log, "               file_length  = %016"
+                          PRIX64 " (%2i:%02i:%02i),\n",
+                          ci->file_length,
+                          (int) ((ci->file_length / 75) / 60),
+                          (int) ((ci->file_length / 75) % 60),
+                          (int) (ci->file_length % 75));
+                image_log(img->log, "               remaining    = %016"
+                          PRIX64 " (%2i:%02i:%02i)\n",
+                          tf_len,
+                          (int) ((tf_len / 75) / 60),
+                          (int) ((tf_len / 75) % 60),
+                          (int) (tf_len % 75));
+            }
+        }
+    }
+
+    /*
+       Pass 4 - calculating the actual track starts and lengths for the TOC.
+     */
+    image_log(img->log, "Pass 4 (calculating the actual track starts "
+              "and lengths for the TOC)...\n");
+    for (int i = 0; i < img->tracks_num; i++) {
+        ct = &(img->tracks[map[i]]);
+        if (ct->idx[1].type != INDEX_SPECIAL) {
+            int session_changed = 0;
+
+            /*
+               If the session has changed, store the last session
+               and mark that it has changed.
+             */
+            if (ct->session != ls) {
+                ls              = ct->session;
+                session_changed = 1;
+            }
+
+            for (int j = 0; j <= ct->max_index; j++) {
+                ci = &(ct->idx[j]);
+
+                if ((ci->type < INDEX_SPECIAL) || (ci->type > INDEX_NORMAL)) {
+                    image_log(img->log, "    [TRACK   ] %02X, INDEX %02X, ATTR %02X,\n",
+                              ci->type, j,
+                              ct->attr);
+                    log_fatal(img->log, "               Unrecognized index type during "
+                              "Pass 4: %2i\n",
+                              ci->type);
+                } else if (ci->type <= INDEX_NONE)
+                    /* Index was not in the cue sheet, keep its length at zero. */
+                    ci->start   = cur_pos;
+                else if (ci->type == INDEX_ZERO) {
+                    /* Index was in the cue sheet and is not present in the file. */
+                    ci->start   = cur_pos;
+                    cur_pos    += ci->length;
+                } else if (ci->type == INDEX_NORMAL) {
+                    /* Index was in the cue sheet and is present in the file. */
+                    ci->start   = cur_pos;
+                    ci->length  = ci->file_length;
+                    cur_pos    += ci->file_length;
+                }
+
+                image_log(img->log, "    [TRACK   ] %02X/%02X, INDEX %02X, ATTR %02X, "
+                          "MODE %02X/%02X, %8s,\n",
+                          ct->session,
+                          ct->point, j,
+                          ct->attr,
+                          ct->mode, ct->form,
+                          cit[ci->type + 2]);
+                image_log(img->log, "               start       = %016"
+                         PRIX64 " (%2i:%02i:%02i),\n",
+                          ci->start,
+                          (int) ((ci->start / 75) / 60),
+                          (int) ((ci->start / 75) % 60),
+                          (int) (ci->start % 75));
+                image_log(img->log, "               length      = %016"
+                          PRIX64 " (%2i:%02i:%02i),\n",
+                          ci->length,
+                          (int) ((ci->length / 75) / 60),
+                          (int) ((ci->length / 75) % 60),
+                          (int) (ci->length % 75));
+                image_log(img->log, "               cur_pos     = %016"
+                          PRIX64 " (%2i:%02i:%02i)\n",
+                          cur_pos,
+                          (int) ((cur_pos / 75) / 60),
+                          (int) ((cur_pos / 75) % 60),
+                          (int) (cur_pos % 75));
+
+                /* Set the pre-gap of the first track of this session. */
+                if (session_changed)
+                    spg[ct->session] = ct->idx[0].start;
+            }
+        }
+    }
+
+    /*
+       Pass 5 - setting the lead out starts for all sessions.
+     */
+    image_log(img->log, "Pass 5 (setting the lead out starts for all sessions)...\n");
+    for (int i = 0; i <= ls; i++) {
+        lo[i] = NULL;
+        for (int j = (img->tracks_num - 1); j >= 0; j--) {
+            const track_t *jt = &(img->tracks[j]);
+            if ((jt->session == i)  && (jt->point >= 1) && (jt->point <= 99)) {
+                lo[i] = &(img->tracks[j]);
+                image_log(img->log, "    [TRACK   ] %02X/%02X, INDEX %02X, ATTR %02X, "
+                          "MODE %02X/%02X, %8s,\n",
+                          ct->session,
+                          ct->point, j,
+                          ct->attr,
+                          ct->mode, ct->form,
+                          cit[ci->type + 2]);
+                image_log(img->log, "               using to calculate the start of session "
+                          "%02X lead out\n",
+                          ct->session);
+                break;
+            }
+        }
+    }
+
+    /*
+       Pass 6 - refinining modes and forms, and finalizing all the special tracks.
+     */
+    image_log(img->log, "Pass 6 (refinining modes and forms, and finalizing "
+              "all the special tracks)...\n");
+    for (int i = 0; i < img->tracks_num; i++) {
+        ct = &(img->tracks[i]);
+        lt = NULL;
+        switch (ct->point) {
+            default:
+                break;
+            case 1 ... 99:
+                ci = &(ct->idx[1]);
+
+                if ((ci->type == INDEX_NORMAL) && (ct->mode >= 1)) {
+                    image_log(img->log, "    [TRACK   ] %02X/01, INDEX %02X, ATTR %02X, "
+                              "MODE %02X/%02X, %8s,\n",
+                              ct->session,
+                              ct->point,
+                              ct->attr,
+                              ct->mode, ct->form,
+                              cit[ct->idx[1].type + 2]);
+
+                    /* Override the loaded modes with that we determine here. */
+                    int can_read_pvd = image_can_read_pvd(ci->file,
+                                                          ci->file_start * ct->sector_size,
+                                                          ct->sector_size, 0);
+                    ct->skip         = 0;
+                    if (can_read_pvd) {
+                        ct->mode = can_read_pvd >> 4;
+                        ct->form = can_read_pvd & 0xf;
+                        if (((ct->sector_size == 2332) || (ct->sector_size == 2336)) &&
+                            (ct->form >= 1))
+                            ct->skip = 8;
+                    } else if (ct->sector_size >= 2332) {
+                        can_read_pvd = image_can_read_pvd(ci->file,
+                                                          ci->file_start * ct->sector_size,
+                                                          ct->sector_size, 1);
+                        if (can_read_pvd) {
+                            ct->mode = can_read_pvd >> 4;
+                            ct->form = can_read_pvd & 0xf;
+                            if (((ct->sector_size == 2332) || (ct->sector_size == 2336)) &&
+                                (ct->form >= 1))
+                                ct->skip = 8;
+                        }
+                    }
+
+                    image_log(img->log, "             NEW MODE: %02X/%02X\n",
+                              ct->mode, ct->form);
+                }
+                break;
+            case 0xa0:
+                for (int j = 0; j < img->tracks_num; j++) {
+                    track_t *jt = &(img->tracks[j]);
+                    if ((jt->session == ct->session)  &&
+                        (jt->point >= 1) && (jt->point <= 99)) {
+                        lt = jt;
+                        break;
+                    }
+                }
+
+                if (lt != NULL) {
+                    int disc_type = 0x00;
+
+                    ct->attr = lt->attr;
+
+                    ct->mode = lt->mode;
+                    ct->form = lt->form;
+
+                    if (lt->mode == 2)
+                        disc_type = 0x20;
+
+                    for (int j = 0; j <= ct->max_index; j++) {
+                        ci = &(ct->idx[j]);
+                        ci->type   = INDEX_ZERO;
+                        ci->start  = (lt->point * 60 * 75) + (disc_type * 75);
+                        ci->length = 0;
+
+                        image_log(img->log, "    [TRACK   ] %02X/%02X, INDEX %02X, "
+                                  "ATTR %02X, MODE %02X/%02X, %8s,\n",
+                                  ct->session,
+                                  ct->point, j,
+                                  ct->attr,
+                                  ct->mode, ct->form,
+                                  cit[ci->type + 2]);
+                        image_log(img->log, "               first track = %02X, "
+                                  "disc type = %02X\n",
+                                  lt->point, disc_type);
+                    }
+                }
+                break;
+            case 0xa1:
+                for (int j = (img->tracks_num - 1); j >= 0; j--) {
+                    track_t *jt = &(img->tracks[j]);
+                    if ((jt->session == ct->session)  && (jt->point >= 1) && (jt->point <= 99)) {
+                        lt = jt;
+                        break;
+                    }
+                }
+
+                if (lt != NULL) {
+                    ct->attr = lt->attr;
+
+                    ct->mode = lt->mode;
+                    ct->form = lt->form;
+
+                    for (int j = 0; j <= ct->max_index; j++) {
+                        ci = &(ct->idx[j]);
+                        ci->type   = INDEX_ZERO;
+                        ci->start  = (lt->point * 60 * 75);
+                        ci->length = 0;
+
+                        image_log(img->log, "    [TRACK   ] %02X/%02X, INDEX %02X, "
+                                  "ATTR %02X, MODE %02X/%02X, %8s,\n",
+                                  ct->session,
+                                  ct->point, j,
+                                  ct->attr,
+                                  ct->mode, ct->form,
+                                  cit[ci->type + 2]);
+                        image_log(img->log, "               last track  = %02X\n",
+                                  lt->point);
+                    }
+                }
+                break;
+            case 0xa2:
+                if (lo[ct->session] != NULL) {
+                    /*
+                       We have a track to use for the calculation, first adjust the track's
+                       attribute (ADR/Ctrl), mode, and form to match the last non-special track.
+                     */
+                    lt = lo[ct->session];
+
+                    ct->attr = lt->attr;
+
+                    ct->mode = lt->mode;
+                    ct->form = lt->form;
+
+                    if (ct->idx[1].type != INDEX_NORMAL) {
+                        /*
+                           Index not normal, therefore, this is not a lead out track from a
+                           second or afterwards session of a multi-session Cue sheet, calculate
+                           the starting time and update all the indexes accordingly.
+                         */
+                        const track_index_t *li = &(lt->idx[lt->max_index]);
+
+                        for (int j = 0; j <= ct->max_index; j++) {
+                            image_log(img->log, "    [TRACK   ] %02X/%02X, INDEX %02X, "
+                                      "ATTR %02X, MODE %02X/%02X, %8s,\n",
+                                      ct->session,
+                                      ct->point, j,
+                                      ct->attr,
+                                      ct->mode, ct->form,
+                                      cit[ci->type + 2]);
+
+                            ci = &(ct->idx[j]);
+                            ci->type   = INDEX_ZERO;
+                            ci->start  = li->start + li->length;
+                            ci->length = 0;
+
+                            image_log(img->log, "               start       = %016" PRIX64
+                                      " (%2i:%02i:%02i)\n",
+                                      ci->start,
+                                      (int) ((ci->start / 75) / 60),
+                                      (int) ((ci->start / 75) % 60),
+                                      (int) (ci->start % 75));
+                        }
+                    }
+#ifdef ENABLE_IMAGE_LOG
+                    else
+                        image_log(img->log, "               no start calculation done, "
+                                  "already specified\n");
+#endif
+                }
+#ifdef ENABLE_IMAGE_LOG
+                else
+                    image_log(img->log, "               nothing done, no suitable last track "
+                              "found\n");
+#endif
+                break;
+            case 0xb0:
+                /*
+                   B0: MSF points to the beginning of the pre-gap
+                   of the following session's first track.
+                 */
+                ct->extra[0] = (spg[ct->session + 1] / 75) / 60;
+                ct->extra[1] = (spg[ct->session + 1] / 75) % 60;
+                ct->extra[2] = spg[ct->session + 1] % 75;
+
+                image_log(img->log, "    [TRACK   ] %02X/%02X, INDEX 01, "
+                          "ATTR %02X, MODE %02X/%02X, %8s,\n",
+                          ct->session,
+                          ct->point,
+                          ct->attr,
+                          ct->mode, ct->form,
+                          cit[ct->idx[1].type + 2]);
+                image_log(img->log, "               %02X:%02X:%02X, %02X,\n",
+                          ct->extra[0], ct->extra[1], ct->extra[2], ct->extra[3]);
+
+                /*
+                   B0 PMSF points to the start of the lead out track
+                   of the last session.
+                 */
+                if (lo[ls] != NULL) {
+                    lt                      = lo[ls];
+                    const track_index_t *li = &(lt->idx[2]);
+
+                    ct->idx[1].start  = li->start + li->length;
+
+                    image_log(img->log, "               start       = %016" PRIX64
+                              " (%2i:%02i:%02i)\n",
+                              ct->idx[1].start,
+                              (int) ((ct->idx[1].start / 75) / 60),
+                              (int) ((ct->idx[1].start / 75) % 60),
+                              (int) (ct->idx[1].start % 75));
+                }
+#ifdef ENABLE_IMAGE_LOG
+                else
+                    image_log(img->log, "               no start calculation done, "
+                              "no suitable last track found\n");
+#endif
+                break;
+        }
+    }
+
+#ifdef ENABLE_IMAGE_LOG
+    image_log(img->log, "Final tracks list:\n");
+    for (int i = 0; i < img->tracks_num; i++) {
+        ct = &(img->tracks[i]);
+        for (int j = 0; j <= ct->max_index; j++) {
+            ci = &(ct->idx[j]);
+            image_log(img->log, "    [TRACK   ] %02X INDEX %02X: [%8s, %016" PRIX64 "]\n",
+                      ct->point, j,
+                      cit[ci->type + 2], ci->file_start * ct->sector_size);
+            image_log(img->log, "               TOC data: %02X %02X %02X "
+                      "%02X %02X %02X %02X %02X %02X %02X %02X\n",
+                      ct->session, ct->attr, ct->tno, ct->point,
+                      ct->extra[0], ct->extra[1], ct->extra[2], ct->extra[3],
+                      (uint32_t) ((ci->start / 75) / 60),
+                      (uint32_t) ((ci->start / 75) % 60),
+                      (uint32_t) (ci->start % 75));
+        }
+    }
+#endif
+}
+
+static void
+image_set_track_subch_type(track_t *ct)
+{
+    if (ct->sector_size == 2448)
+        ct->subch_type = 0x08;
+    else if (ct->sector_size == 2368)
+        ct->subch_type = 0x10;
+    else
+        ct->subch_type = 0x00;
+}
+
+static int
+image_load_iso(cd_image_t *img, const char *filename)
+{
+    track_t       *ct              = NULL;
+    track_index_t *ci              = NULL;
+    track_file_t  *tf              = NULL;
+    int            success         = 1;
+    int            error           = 1;
+    int            is_viso         = 0;
+    int            sector_sizes[8] = { 2448, 2368, RAW_SECTOR_SIZE, 2336,
+                                       2332, 2328, 2324,            COOKED_SECTOR_SIZE };
+
+    img->tracks     = NULL;
+    /*
+       Pass 1 - loading the ISO image.
+     */
+    image_log(img->log, "Pass 1 (loading the ISO image)...\n");
+    img->tracks_num = 0;
+
+    image_insert_track(img, 1, 0xa0);
+    image_insert_track(img, 1, 0xa1);
+    image_insert_track(img, 1, 0xa2);
+
+    /* Data track (shouldn't there be a lead in track?). */
+    tf = index_file_init(img->dev->id, filename, &error, &is_viso);
+
+    if (error) {
+        if (tf != NULL) {
+            tf->close(tf);
+            tf = NULL;
+        }
+
+        success = 0;
+    } else if (is_viso)
+        success = 3;
+ 
+    if (success) {
+        ct = image_insert_track(img, 1, 1);
+        ci = &(ct->idx[1]);
+
+        ct->form         = 0;
+        ct->mode         = 0;
+
+        for (int i = 0; i < 3; i++)
+            ct->idx[i].type = INDEX_NONE;
+
+        ct->attr         = DATA_TRACK;
+
+        /* Try to detect ISO type. */
+        ct->mode         = 1;
+        ct->form         = 0;
+
+        ci->type         = INDEX_NORMAL;
+        ci->file_start   = 0ULL;
+
+        ci->file         = tf;
+
+        for (int i = 0; i < 8; i++) {
+            ct->sector_size  = sector_sizes[i];
+            int can_read_pvd = image_can_read_pvd(ci->file, 0, ct->sector_size, 0);
+            if (can_read_pvd) {
+                ct->mode = can_read_pvd >> 4;
+                ct->form = can_read_pvd & 0xf;
+                if (((ct->sector_size == 2332) || (ct->sector_size == 2336)) &&
+                    (ct->form >= 1))
+                    ct->skip = 8;
+                break;
+            } else if (ct->sector_size >= 2332) {
+                can_read_pvd = image_can_read_pvd(ci->file, 0, ct->sector_size, 1);
+                if (can_read_pvd) {
+                    ct->mode = can_read_pvd >> 4;
+                    ct->form = can_read_pvd & 0xf;
+                    if (((ct->sector_size == 2332) || (ct->sector_size == 2336)) &&
+                        (ct->form >= 1))
+                        ct->skip = 8;
+                    break;
+                }
+            }
+        }
+
+        image_set_track_subch_type(ct);
+
+        image_log(img->log, "    [TRACK   ] %02X/%02X, ATTR %02X, MODE %02X/%02X,\n",
+                  ct->session,
+                  ct->point,
+                  ct->attr,
+                  ct->mode, ct->form);
+        image_log(img->log, "               %02X:%02X:%02X, %02X, %i\n",
+                  ct->sector_size);
+    }
+
+    if (success)  for (int i = 2; i >= 0; i--) {
+        if (ct->idx[i].file == NULL)
+            ct->idx[i].file = tf;
+        else
+            break;
+    }
+
+    tf = NULL;
+
+    if (success)
+        image_process(img);
+    else {
+#ifdef ENABLE_IMAGE_LOG
+        log_warning(img->log, "Unable to open image or folder \"%s\"\n",
+                    filename);
+#else
+        warning("Unable to open image or folder \"%s\"\n", filename);
+#endif
+        return 0;
+    }
+
+    return success;
+}
+
+static int
+image_load_cue(cd_image_t *img, const char *cuefile)
+{
+    track_t       *ct                            = NULL;
+    track_index_t *ci                            = NULL;
+    track_file_t  *tf                            = NULL;
+    uint64_t       frame                         = 0ULL;
+    uint64_t       last                          = 0ULL;
+    uint8_t        session                       = 1;
+    int            last_t                        = -1;
+    int            is_viso                       = 0;
+    int            lo_cmd                        = 0;
+    int            lead[3]                       = { 0 };
+    int            error;
+    char           pathname[MAX_FILENAME_LENGTH];
+    char           buf[MAX_LINE_LENGTH];
+    char          *line;
+    char          *command;
+    char          *type;
+    char           temp;
+
+    img->tracks     = NULL;
+    img->tracks_num = 0;
+
+    /* Get a copy of the filename into pathname, we need it later. */
+    memset(pathname, 0, MAX_FILENAME_LENGTH * sizeof(char));
+    path_get_dirname(pathname, cuefile);
+
+    /* Open the file. */
+    FILE          *fp = plat_fopen(cuefile, "r");
+    if (fp == NULL)
+        return 0;
+
+    int            success = 0;
+
+    /*
+       Pass 1 - loading the Cue sheet.
+     */
+    image_log(img->log, "Pass 1 (loading the Cue sheet)...\n");
+    img->tracks_num = 0;
+
+    for (int i = 0; i < 3; i++) {
+        lead[i] = img->tracks_num;
+        (void) image_insert_track(img, session, 0xa0 + i);
+    }
+
+    while (1) {
+        line = buf;
+
+        /* Read a line from the cuesheet file. */
+        if (feof(fp) || (fgets(buf, sizeof(buf), fp) == NULL) || ferror(fp))
+            break;
+
+        /* Do two iterations to make sure to nuke even if it's \r\n or \n\r,
+           but do checks to make sure we're not nuking other bytes. */
+        for (uint8_t i = 0; i < 2; i++) {
+            if (strlen(buf) > 0) {
+                if (buf[strlen(buf) - 1] == '\n')
+                    buf[strlen(buf) - 1] = '\0';
+                /* nuke trailing newline */
+                else if (buf[strlen(buf) - 1] == '\r')
+                    buf[strlen(buf) - 1] = '\0';
+                /* nuke trailing newline */
+            }
+        }
+        image_log(img->log, "    [LINE    ] \"%s\"\n", line);
+
+        (void) image_cue_get_keyword(&command, &line);
+
+        if (!strcmp(command, "FILE")) {
+            /* The file for the track. */
+            char filename[MAX_FILENAME_LENGTH];
+            char ansi[MAX_FILENAME_LENGTH];
+
+            tf = NULL;
+
+            memset(ansi, 0, MAX_FILENAME_LENGTH * sizeof(char));
+            memset(filename, 0, MAX_FILENAME_LENGTH * sizeof(char));
+
+            success = image_cue_get_buffer(ansi, &line, 0);
+            if (!success)
+                break;
+            success = image_cue_get_keyword(&type, &line);
+            if (!success)
+                break;
+
+            error    = 1;
+            is_viso  = 0;
+
+            if (!strcmp(type, "BINARY") || !strcmp(type, "MOTOROLA")) {
+                if (!path_abs(ansi))
+                    path_append_filename(filename, pathname, ansi);
+                else
+                    strcpy(filename, ansi);
+
+                tf = index_file_init(img->dev->id, filename, &error, &is_viso);
+                
+                if (tf)
+                    tf->motorola = !strcmp(type, "MOTOROLA");
+            } else if (!strcmp(type, "WAVE") || !strcmp(type, "AIFF") ||
+                       !strcmp(type, "MP3")) {
+                if (!path_abs(ansi))
+                    path_append_filename(filename, pathname, ansi);
+                else
+                    strcpy(filename, ansi);
+                tf = audio_init(img->dev->id, filename, &error);
+            }
+            if (error) {
+                if (tf != NULL) {
+                    tf->close(tf);
+                    tf = NULL;
+                }
+                success = 0;
+            } else if (is_viso)
+                success = 3;
+
+#ifdef ENABLE_IMAGE_LOG
+            if (!success)
+                image_log(img->log, "    [FILE    ] Unable to open file \"%s\" "
+                          "specified in cue sheet\n", filename);
+#endif
+        } else if (!strcmp(command, "TRACK")) {
+            int t            = image_cue_get_number(&line);
+            success          = image_cue_get_keyword(&type, &line);
+
+            if (!success)
+                break;
+
+            if (last_t != -1) {
+                /*
+                   Important: This has to be done like this because pointers
+                              change due to realloc.
+                 */
+                ct = &(img->tracks[img->tracks_num - 1]);
+
+                for (int i = ct->max_index; i >= 0; i--) {
+                    if (ct->idx[i].file == NULL)
+                        ct->idx[i].file = tf;
+                    else
+                        break;
+                }
+            } else if ((t == 0) && (line[strlen(line) - 2] == ' ') &&
+                       (line[strlen(line) - 1] == '0'))
+                t = 1;
+
+            last_t           = t;
+            ct               = image_insert_track(img, session, t);
+
+            for (int i = 2; i >= 0; i--)
+                ct->idx[i].type = INDEX_NONE;
+
+            ct->form         = 0;
+            ct->mode         = 0;
+
+            if (!strcmp(type, "AUDIO")) {
+                ct->sector_size = RAW_SECTOR_SIZE;
+                ct->attr        = AUDIO_TRACK;
+            } else if (!memcmp(type, "MODE", 4)) {
+                uint32_t mode;
+                ct->attr        = DATA_TRACK;
+                sscanf(type, "MODE%" PRIu32 "/%" PRIu32,
+                       &mode, &(ct->sector_size));
+                ct->mode = mode;
+                if (ct->mode == 2)  switch(ct->sector_size) {
+                    default:
+                        break;
+                    case 2324: case 2328:
+                        ct->form = 2;
+                        break;
+                    case 2048: case 2332: case 2336: case 2352: case 2368: case 2448:
+                        ct->form = 1;
+                        break;
+                }
+                if (((ct->sector_size == 2336) || (ct->sector_size == 2332)) && (ct->mode == 2) && (ct->form == 1))
+                    ct->skip        = 8;
+            } else if (!memcmp(type, "CD", 2)) {
+                ct->attr        = DATA_TRACK;
+                ct->mode        = 2;
+                sscanf(type, "CD%c/%i", &temp, &(ct->sector_size));
+            } else
+                success = 0;
+
+            if (success) {
+                image_set_track_subch_type(ct);
+
+                last = ct->sector_size;
+
+                image_log(img->log, "    [TRACK   ] %02X/%02X, ATTR %02X, MODE %02X/%02X,\n",
+                          ct->session,
+                          ct->point,
+                          ct->attr,
+                          ct->mode, ct->form);
+                image_log(img->log, "               %i\n",
+                          ct->sector_size);
+            }
+#ifdef ENABLE_IMAGE_LOG
+            else
+                image_log(img->log, "    [TRACK   ] Unable to initialize track %02X "
+                          "specified in Cue sheet\n", t);
+#endif
+        } else if (!strcmp(command, "INDEX")) {
+            int t            = image_cue_get_number(&line);
+            ci               = &(ct->idx[t]);
+
+            if (t > ct->max_index)
+                ct->max_index    = t;
+
+            ci->type         = INDEX_NORMAL;
+            ci->file         = tf;
+            success          = image_cue_get_frame(&frame, &line);
+            ci->file_start   = frame;
+
+            image_log(img->log, "    [INDEX   ] %02X (%8s): Initialization %s\n",
+                      t, cit[ci->type + 2], success ? "successful" : "failed");
+        } else if (!strcmp(command, "PREGAP")) {
+            ci               = &(ct->idx[0]);
+
+            ci->type         = INDEX_ZERO;
+            ci->file         = tf;
+            success          = image_cue_get_frame(&frame, &line);
+            ci->length       = frame;
+
+            image_log(img->log, "    [INDEX   ] 00 (%8s): Initialization %s\n",
+                      cit[ci->type + 2], success ? "successful" : "failed");
+        } else if (!strcmp(command, "PAUSE") || !strcmp(command, "ZERO")) {
+            ci               = &(ct->idx[1]);
+
+            ci->type         = INDEX_ZERO;
+            ci->file         = tf;
+            success          = image_cue_get_frame(&frame, &line);
+            ci->length       = frame;
+
+            image_log(img->log, "    [INDEX   ] 01 (%8s): Initialization %s\n",
+                      cit[ci->type + 2], success ? "successful" : "failed");
+        } else if (!strcmp(command, "POSTGAP")) {
+            ci               = &(ct->idx[2]);
+
+            ci->type         = INDEX_ZERO;
+            ci->file         = tf;
+            success          = image_cue_get_frame(&frame, &line);
+            ci->length       = frame;
+
+            image_log(img->log, "    [INDEX   ] 02 (%8s): Initialization %s\n",
+                      cit[ci->type + 2], success ? "successful" : "failed");
+        } else if (!strcmp(command, "FLAGS")) {
+            success = image_cue_get_flags(ct, &line);
+
+            image_log(img->log, "    [FLAGS   ] Initialization %s\n",
+                      success ? "successful" : "failed");
+        } else if (!strcmp(command, "REM")) {
+            success = 1;
+            char *space = strstr(line, " ");
+            if (space != NULL) {
+                space++;
+                if (space < (line + strlen(line))) {
+                    (void) image_cue_get_keyword(&command, &space);
+                    if (!strcmp(command, "LEAD-OUT")) {
+                        lo_cmd               = 1;
+                        ct                   = &(img->tracks[lead[2]]);
+                        /*
+                           Mark it this way so file pointers on it are not
+                           going to be adjusted.
+                         */
+                        last_t               = -1;
+                        ct->sector_size      = last;
+                        ci                   = &(ct->idx[1]);
+                        ci->type             = INDEX_NORMAL;
+                        ci->file             = tf;
+                        success              = image_cue_get_frame(&frame, &space);
+                        ci->file_start       = frame;
+
+                        image_log(img->log, "    [LEAD-OUT] Initialization %s\n",
+                                  success ? "successful" : "failed");
+                    } else if (!strcmp(command, "SESSION")) {
+                        session              = image_cue_get_number(&space);
+
+                        if (session > 1) {
+                            if (!lo_cmd) {
+                                ct                   = &(img->tracks[lead[2]]);
+                                /*
+                                   Mark it this way so file pointers on it are not
+                                   going to be adjusted.
+                                 */
+                                last_t               = -1;
+                                ct->sector_size      = last;
+                                ci                   = &(ct->idx[1]);
+                                ci->type             = INDEX_ZERO;
+                                ci->file             = tf;
+                                ci->file_start       = 0;
+                                ci->file_length      = 0;
+                                ci->length           = (2 * 60 * 75) + (30 * 75);
+
+                                image_log(img->log, "    [LEAD-OUT] Initialization successful\n");
+                            }
+
+                            ct = image_insert_track(img, session - 1, 0xb0);
+                            /*
+                               Mark it this way so file pointers on it are not
+                               going to be adjusted.
+                             */
+                            last_t               = -1;
+                            ci                   = &(ct->idx[1]);
+                            ci->start            = (0x40 * 60 * 75) + (0x02 * 75);
+
+                            if (session == 2) {
+                                ct->extra[3]         = 0x02;
+
+                                /*
+                                   00:00:00 on Wembley, C0:00:00 in the spec.
+                                   And what's in PMSF?
+                                 */
+                                ct = image_insert_track(img, session - 1, 0xc0);
+                                /*
+                                   Mark it this way so file pointers on it are not
+                                   going to be adjusted.
+                                 */
+                                last_t               = -1;
+                                ci                   = &(ct->idx[1]);
+                                /* Queen - Live at Wembley '86 CD 1. */
+                                ci->start            = (0x5f * 75 * 60);
+                                /* Optimum recording power. */
+                                ct->extra[0]         = 0x00;
+                            } else
+                                ct->extra[3]         = 0x01;
+
+                            for (int i = 0; i < 3; i++) {
+                                lead[i] = img->tracks_num;
+                                (void) image_insert_track(img, session, 0xa0 + i);
+                            }
+                        }
+
+                        lo_cmd               = 0;
+
+                        image_log(img->log, "    [SESSION ] Initialization successful\n");
+                    }
+                }
+            }
+        } else if (!strcmp(command, "CATALOG") || !strcmp(command, "CDTEXTFILE") ||
+                   !strcmp(command, "ISRC") || !strcmp(command, "PERFORMER") ||
+                   !strcmp(command, "SONGWRITER") || !strcmp(command, "TITLE") ||
+                   !strcmp(command, "")) {
+            /* Ignored commands. */
+            image_log(img->log, "    [CUE   ] Ignored command \"%s\" in Cue sheet\n",
+                      command);
+            success = 1;
+        } else {
+            image_log(img->log, "    [CUE   ] Unsupported command \"%s\" in Cue sheet\n",
+                      command);
+            success = 0;
+        }
+
+        if (!success)
+            break;
+    }
+
+    if (success && (ct != NULL))  for (int i = ct->max_index; i >= 0; i--) {
+        if (ct->idx[i].file == NULL)
+            ct->idx[i].file = tf;
+        else
+            break;
+    }
+
+    tf = NULL;
+
+    fclose(fp);
+
+    if (success)
+        image_process(img);
+    else
+#ifdef ENABLE_IMAGE_LOG
+        log_warning(img->log, "    [CUE   ] Unable to open Cue sheet \"%s\"\n", cuefile);
+#else
+        warning("Unable to open Cue sheet \"%s\"\n", cuefile);
+#endif
+
+    return success;
+}
+
+// Converts UTF-16 string into UTF-8 string.
+// If destination string is NULL returns total number of symbols that would've
+// been written (without null terminator). However, when actually writing into
+// destination string, it does include it. So, be sure to allocate extra byte
+// for destination string.
+// Params:
+// u16_str      - source UTF-16 string
+// u16_str_len  - length of source UTF-16 string
+// u8_str       - destination UTF-8 string
+// u8_str_size  - size of destination UTF-8 string in bytes
+// Return value:
+// 0 on success, -1 if encountered invalid surrogate pair, -2 if
+// encountered buffer overflow or length of destination UTF-8 string in bytes
+// (without including the null terminator).
+long int utf16_to_utf8(const uint16_t *u16_str, size_t u16_str_len,
+                       uint8_t *u8_str, size_t u8_str_size)
+{
+    size_t i = 0, j = 0;
+
+    if (!u8_str) {
+        u8_str_size = u16_str_len * 4;
+    }
+
+    while (i < u16_str_len) {
+        uint32_t codepoint = u16_str[i++];
+
+        // check for surrogate pair
+        if (codepoint >= 0xD800 && codepoint <= 0xDBFF) {
+            uint16_t high_surr = codepoint;
+            uint16_t low_surr  = u16_str[i++];
+
+            if (low_surr < 0xDC00 || low_surr > 0xDFFF)
+                return -1;
+
+            codepoint = ((high_surr - 0xD800) << 10) +
+                        (low_surr - 0xDC00) + 0x10000;
+        }
+
+        if (codepoint < 0x80) {
+            if (j + 1 > u8_str_size) return -2;
+
+            if (u8_str) u8_str[j] = (char)codepoint;
+
+            j++;
+        } else if (codepoint < 0x800) {
+            if (j + 2 > u8_str_size) return -2;
+
+            if (u8_str) {
+                u8_str[j + 0] = 0xC0 | (codepoint >> 6);
+                u8_str[j + 1] = 0x80 | (codepoint & 0x3F);
+            }
+
+            j += 2;
+        } else if (codepoint < 0x10000) {
+            if (j + 3 > u8_str_size) return -2;
+
+            if (u8_str) {
+                u8_str[j + 0] = 0xE0 | (codepoint >> 12);
+                u8_str[j + 1] = 0x80 | ((codepoint >> 6) & 0x3F);
+                u8_str[j + 2] = 0x80 | (codepoint & 0x3F);
+            }
+
+            j += 3;
+        } else {
+            if (j + 4 > u8_str_size) return -2;
+
+            if (u8_str) {
+                u8_str[j + 0] = 0xF0 | (codepoint >> 18);
+                u8_str[j + 1] = 0x80 | ((codepoint >> 12) & 0x3F);
+                u8_str[j + 2] = 0x80 | ((codepoint >> 6) & 0x3F);
+                u8_str[j + 3] = 0x80 | (codepoint & 0x3F);
+            }
+
+            j += 4;
+        }
+    }
+
+    if (u8_str) {
+        if (j >= u8_str_size) return -2;
+        u8_str[j] = '\0';
+    }
+
+    return (long int)j;
+}
+
+static int
+image_load_mds(cd_image_t *img, const char *mdsfile)
+{
+    track_t       *ct                            = NULL;
+    track_index_t *ci                            = NULL;
+    track_file_t  *tf                            = NULL;
+    int            is_viso                       = 0;
+    int            last_t                        = -1;
+    int            error;
+    char           pathname[MAX_FILENAME_LENGTH];
+    char           ofn[2048]                     = { 0 };
+
+    mds_hdr_t             mds_hdr             = { 0 };
+    mds_sess_block_t      mds_sess_block      = { 0 };
+    mds_trk_block_t       mds_trk_block       = { 0 };
+    mds_trk_ex_block_t    mds_trk_ex_block    = { 0 };
+    mds_footer_t          mds_footer          = { 0 };
+    mds_dpm_block_t       mds_dpm_block       = { 0 };
+    uint32_t              mds_dpm_blocks_num  = 0x00000000;
+    uint32_t              mds_dpm_block_offs  = 0x00000000;
+
+    img->tracks     = NULL;
+    img->tracks_num = 0;
+
+    /* Get a copy of the filename into pathname, we need it later. */
+    memset(pathname, 0, MAX_FILENAME_LENGTH * sizeof(char));
+    path_get_dirname(pathname, mdsfile);
+
+    /* Open the file. */
+    FILE          *fp = plat_fopen(mdsfile, "rb");
+    if (fp == NULL)
+        return 0;
+
+    int            success = 0;
+
+    /*
+       Pass 1 - loading the MDS sheet.
+     */
+    image_log(img->log, "Pass 1 (loading the Media Descriptor Sheet)...\n");
+    img->tracks_num = 0;
+    success = 2;
+
+    fseek(fp, 0, SEEK_SET);
+    if (fread(&mds_hdr, 1, sizeof(mds_hdr_t), fp) != sizeof(mds_hdr_t))
+        return 0;
+
+    if (memcmp(mds_hdr.file_sig, "MEDIA DESCRIPTOR", 16)) {
+#ifdef ENABLE_IMAGE_LOG
+        log_warning(img->log, "    [MDS   ] \"%s\"\n is not an actual MDF file",
+                    mdsfile);
+#else
+        warning("\"%s\"\n is not an actual MDF file", mdsfile);
+#endif
+        fclose(fp);
+        return 0;
+    }
+
+    if (mds_hdr.file_ver[0] == 0x02) {
+#ifdef ENABLE_IMAGE_LOG
+        log_warning(img->log, "    [MDS   ] \"%s\" is a Daemon Tools encrypted MDS which is not supported\n",
+                    mdsfile);
+#else
+        warning("\"%s\" is a Daemon Tools encrypted MDS which is not supported\n", mdsfile);
+#endif
+        fclose(fp);
+        return 0;
+    }
+
+    img->is_dvd = (mds_hdr.medium_type >= 0x10);
+
+    if (img->is_dvd) {
+        if (mds_hdr.disc_struct_offs != 0x00) {
+            fseek(fp, mds_hdr.disc_struct_offs, SEEK_SET);
+            if (fread(&(img->dstruct.layers[0]), 1, sizeof(layer_t), fp) != sizeof(layer_t))
+                return 0;
+            img->has_dstruct = 1;
+
+            if (((img->dstruct.layers[0].f0[2] & 0x60) >> 4) == 0x01) {
+                fseek(fp, mds_hdr.disc_struct_offs, SEEK_SET);
+                if (fread(&(img->dstruct.layers[1]), 1, sizeof(layer_t), fp) != sizeof(layer_t))
+                    return 0;
+                img->has_dstruct++;
+            }
+        }
+
+        for (int t = 0; t < 3; t++) {
+            ct = image_insert_track(img, 1, 0xa0 + t);
+
+            ct->attr        = DATA_TRACK;
+            ct->mode        = 0;
+            ct->form        = 0;
+            ct->tno         = 0;
+            ct->subch_type  = 0;
+            memset(ct->extra, 0x00, 4);
+
+            for (int i = 0; i < 3; i++) {
+                ci = &(ct->idx[i]);
+                ci->type = INDEX_NONE;
+                ci->start = 0;
+                ci->length = 0;
+                ci->file_start = 0;
+                ci->file_length = 0;
+                ci->file = NULL;
+            }
+
+            ci = &(ct->idx[1]);
+
+            if (t < 2)
+                ci->start = (0x01 * 60 * 75) + (0 * 75) + 0;
+        }
+    }
+
+    if (mds_hdr.dpm_blocks_offs != 0x00) {
+        fseek(fp, mds_hdr.dpm_blocks_offs, SEEK_SET);
+        if (fread(&mds_dpm_blocks_num, 1, sizeof(uint32_t), fp) != sizeof(uint32_t))
+            return 0;
+
+        if (mds_dpm_blocks_num > 0)  for (int b = 0; b < mds_dpm_blocks_num; b++) {
+            fseek(fp, mds_hdr.dpm_blocks_offs + 4 + (b * 4), SEEK_SET);
+            if (fread(&mds_dpm_block_offs, 1, sizeof(uint32_t), fp) != sizeof(uint32_t))
+                return 0;
+
+            fseek(fp, mds_dpm_block_offs, SEEK_SET);
+            if (fread(&mds_dpm_block, 1, sizeof(mds_dpm_block_t), fp) != sizeof(mds_dpm_block_t))
+                return 0;
+
+            /* We currently only support the bad sectors block and not (yet) actual DPM. */
+            if (mds_dpm_block.type == 0x00000002) {
+                /* Bad sectors. */
+                img->bad_sectors_num = mds_dpm_block.entries;
+                img->bad_sectors     = (uint32_t *) malloc(img->bad_sectors_num * sizeof(uint32_t));
+                fseek(fp, mds_dpm_block_offs + sizeof(mds_dpm_block_t), SEEK_SET);
+                int read_size = img->bad_sectors_num * sizeof(uint32_t);
+                if (fread(img->bad_sectors, 1, read_size, fp) != read_size)
+                    return 0;
+                break;
+            }
+        }
+    }
+
+    for (int s = 0; s < mds_hdr.sess_num; s++) {
+        fseek(fp, mds_hdr.sess_blocks_offs + (s * sizeof(mds_sess_block_t)), SEEK_SET);
+        if (fread(&mds_sess_block, 1, sizeof(mds_sess_block_t), fp) != sizeof(mds_sess_block_t))
+            return 0;
+
+        for (int t = 0; t < mds_sess_block.all_blocks_num; t++) {
+            fseek(fp, mds_sess_block.trk_blocks_offs + (t * sizeof(mds_trk_block_t)), SEEK_SET);
+            if (fread(&mds_trk_block, 1, sizeof(mds_trk_block_t), fp) != sizeof(mds_trk_block_t))
+                return 0;
+
+            if (last_t != -1) {
+                /*
+                   Important: This has to be done like this because pointers
+                              change due to realloc.
+                 */
+                ct = &(img->tracks[img->tracks_num - 1]);
+
+                for (int i = 2; i >= 0; i--) {
+                    if (ct->idx[i].file == NULL)
+                        ct->idx[i].file = tf;
+                    else
+                        break;
+                }
+            }
+
+            last_t           = mds_trk_block.point;
+            ct               = image_insert_track(img, mds_sess_block.sess_id, mds_trk_block.point);
+
+            if (img->is_dvd) {
+                /* DVD images have no extra block - the extra block offset is the track length. */
+                memset(&mds_trk_ex_block, 0x00, sizeof(mds_trk_ex_block_t));
+                mds_trk_ex_block.pregap = 0x00000000;
+                mds_trk_ex_block.trk_sectors = mds_trk_block.ex_offs;
+            } else if (mds_trk_block.ex_offs != 0ULL) {
+                fseek(fp, mds_trk_block.ex_offs, SEEK_SET);
+                if (fread(&mds_trk_ex_block, 1, sizeof(mds_trk_ex_block), fp) != sizeof(mds_trk_ex_block))
+                    return 0;
+            }
+
+            uint32_t astart = mds_trk_block.start_sect - mds_trk_ex_block.pregap;
+            uint32_t aend = astart + mds_trk_ex_block.pregap;
+            uint32_t aend2 = aend + mds_trk_ex_block.trk_sectors;
+            uint32_t astart2 = mds_trk_block.start_sect + mds_trk_ex_block.trk_sectors;
+
+            if (mds_trk_block.footer_offs != 0ULL)  for (uint32_t ff = 0; ff < mds_trk_block.files_num; ff++) {
+                fseek(fp, mds_trk_block.footer_offs + (ff * sizeof(mds_footer_t)), SEEK_SET);
+                if (fread(&mds_footer, 1, sizeof(mds_footer_t), fp) != sizeof(mds_footer_t))
+                    return 0;
+
+                uint16_t wfn[2048] = { 0 };
+                char     fn[2048] = { 0 };
+                fseek(fp, mds_footer.fn_offs, SEEK_SET);
+                if (mds_footer.fn_is_wide) {
+                    for (int i = 0; i < 256; i++) {
+                        if (fread(&(wfn[i]), 1, 2, fp) != 2)
+                            return 0;
+                        if (wfn[i] == 0x0000)
+                            break;
+                    }
+                    (void) utf16_to_utf8(wfn, 2048, (uint8_t *) fn, 2048);
+                } else  for (int i = 0; i < 512; i++) {
+                    if (fread(&fn[i], 1, 1, fp) != 1)
+                        return 0;
+                    if (fn[i] == 0x00)
+                        break;
+                }
+
+                if (!stricmp(fn, "*.mdf")) {
+                    strcpy(fn, mdsfile);
+                    fn[strlen(mdsfile) - 3] = 'm';
+                    fn[strlen(mdsfile) - 2] = 'd';
+                    fn[strlen(mdsfile) - 1] = 'f';
+                }
+
+                char    filename[2048] = { 0 };
+                if (!path_abs(fn))
+                    path_append_filename(filename, pathname, fn);
+                else
+                    strcpy(filename, fn);
+
+                if (strcmp(ofn, filename) != 0) {
+                    tf = index_file_init(img->dev->id, filename, &error, &is_viso);
+                    strcpy(ofn, filename);
+                }
+            }
+
+            ct->sector_size = mds_trk_block.sector_len;
+            ct->form        = 0;
+            ct->tno         = mds_trk_block.track_id;
+            ct->subch_type  = mds_trk_block.subch_mode;
+            ct->extra[0]    = mds_trk_block.m;
+            ct->extra[1]    = mds_trk_block.s;
+            ct->extra[2]    = mds_trk_block.f;
+            ct->extra[3]    = mds_trk_block.zero;
+            /*
+                Note from DiscImageCreator:
+
+                I hexedited the track mode field with various values and fed it to Alchohol;
+                it seemed that high part of byte had no effect at all; only the lower one
+                affected the mode, in the following manner:
+                00: Mode 2, 01: Audio, 02: Mode 1, 03: Mode 2, 04: Mode 2 Form 1,
+                05: Mode 2 Form 2, 06: UKNONOWN, 07: Mode 2
+                08: Mode 2, 09: Audio, 0A: Mode 1, 0B: Mode 2, 0C: Mode 2 Form 1,
+                0D: Mode 2 Form 2, 0E: UKNONOWN, 0F: Mode 2
+             */
+            ct->attr        = ((mds_trk_block.trk_mode & 0x07) == 0x01) ?
+                                  AUDIO_TRACK : DATA_TRACK;
+            ct->mode        = 0;
+            ct->form        = 0;
+            if (((mds_trk_block.trk_mode & 0x07) != 0x01) && 
+                ((mds_trk_block.trk_mode & 0x07) != 0x06))
+                ct->mode        = ((mds_trk_block.trk_mode & 0x07) != 0x02) + 1;
+            if ((mds_trk_block.trk_mode & 0x06) == 0x04)
+                ct->form        = (mds_trk_block.trk_mode & 0x07) - 0x03;
+            if (ct->attr == AUDIO_TRACK)
+                success         = 1;
+
+            if (((ct->sector_size == 2336) || (ct->sector_size == 2332)) && (ct->mode == 2) && (ct->form == 1))
+                ct->skip        = 8;
+
+            ci = &(ct->idx[0]);
+            if (ct->point < 0xa0) {
+                ci->start = astart + 150;
+                ci->length = mds_trk_ex_block.pregap;
+            }
+            ci->type = (ci->length > 0) ? INDEX_ZERO : INDEX_NONE;
+            ci->file_start = 0;
+            ci->file_length = 0;
+            ci->file = NULL;
+
+            ci = &(ct->idx[1]);
+            if ((mds_trk_block.point >= 1) && (mds_trk_block.point <= 99)) {
+                ci->start = aend + 150;
+                ci->length = mds_trk_ex_block.trk_sectors;
+                ci->type = INDEX_NORMAL;
+                ci->file_start = mds_trk_block.start_offs / ct->sector_size;
+                ci->file_length = ci->length;
+                ci->file = tf;
+            } else {
+                ci->start = (mds_trk_block.pm * 60 * 75) + (mds_trk_block.ps * 75) + mds_trk_block.pf;
+                ci->type = INDEX_NONE;
+                ci->file_start = 0;
+                ci->file_length = 0;
+                ci->file = NULL;
+            }
+
+            ci = &(ct->idx[2]);
+            if (ct->point < 0xa0) {
+                ci->start = aend2 + 150;
+                ci->length = astart2 - aend2;
+            }
+            ci->type = (ci->length > 0) ? INDEX_ZERO : INDEX_NONE;
+            ci->file_start = 0;
+            ci->file_length = 0;
+            ci->file = NULL;
+
+            if (img->is_dvd) {
+                ci = &(ct->idx[1]);
+                uint32_t total = ci->start + ci->length;
+
+                ci = &(img->tracks[2].idx[1]);
+                ci->start = total;
+            }
+        }
+
+        for (int i = 2; i >= 0; i--) {
+            if (ct->point >= 0xa0)
+                ci->type = INDEX_SPECIAL;
+
+            if (ct->idx[i].file == NULL)
+                ct->idx[i].file = tf;
+            else
+                break;
+        }
+    }
+
+    tf = NULL;
+
+    fclose(fp);
+
+    if (success) {
+#ifdef ENABLE_IMAGE_LOG
+        image_log(img->log, "Final tracks list:\n");
+        for (int i = 0; i < img->tracks_num; i++) {
+            ct = &(img->tracks[i]);
+            for (int j = 0; j <= ct->max_index; j++) {
+                ci = &(ct->idx[j]);
+                    image_log(img->log, "    [TRACK   ] %02X INDEX %02X: [%8s, %016" PRIX64 "]\n",
+                          ct->point, j,
+                          cit[ci->type + 2], ci->file_start * ct->sector_size);
+                image_log(img->log, "               TOC data: %02X %02X %02X "
+                          "%02X %02X %02X %02X %02X %02X %02X %02X\n",
+                          ct->session, ct->attr, ct->tno, ct->point,
+                          ct->extra[0], ct->extra[1], ct->extra[2], ct->extra[3],
+                          (uint32_t) ((ci->start / 75) / 60),
+                          (uint32_t) ((ci->start / 75) % 60),
+                          (uint32_t) (ci->start % 75));
+            }
+        }
+#endif
+    } else
+#ifdef ENABLE_IMAGE_LOG
+        log_warning(img->log, "    [MDS   ] Unable to open MDS sheet \"%s\"\n", mdsfile);
+#else
+        warning("Unable to open MDS sheet \"%s\"\n", mdsfile);
+#endif
+
+    return success;
+}
+
+/* Root functions. */
+static void
+image_clear_tracks(cd_image_t *img)
+{
+    const track_file_t *last = NULL;
+    track_t            *cur  = NULL;
+    track_index_t      *idx  = NULL;
+
+    if ((img->tracks != NULL) && (img->tracks_num > 0)) {
+        for (int i = 0; i < img->tracks_num; i++) {
+            cur = &img->tracks[i];
+
+            if (((cur->point >= 1) && (cur->point <= 99)) ||
+                (cur->point == 0xa2))  for (int j = 0; j <= cur->max_index; j++) {
+                    idx = &(cur->idx[j]);
+                    /* Make sure we do not attempt to close a NULL file. */
+                    if ((idx->file != NULL) && (idx->type == INDEX_NORMAL)) {
+                        if (idx->file != last) {
+                            last = idx->file;
+                            index_file_close(idx);
+                        } else
+                            idx->file = NULL;
+                    }
+                }
+        }
+
+        /* Now free the array. */
+        free(img->tracks);
+        img->tracks = NULL;
+
+        /* Mark that there's no tracks. */
+        img->tracks_num = 0;
+    }
+}
+
+/* Shared functions. */
+static int
+image_get_track_info(const void *local, const uint32_t track,
+                     const int end, track_info_t *ti)
+{
+    const cd_image_t *img = (const cd_image_t *) local;
+    const track_t    *ct  = NULL;
+    int               ret = 0;
+
+    for (int i = 0; i < img->tracks_num; i++) {
+         ct = &(img->tracks[i]);
+         if (ct->point == track)
+             break;
+    }
+
+    if (ct != NULL) {
+        const uint32_t pos = end ? (ct->idx[1].start + ct->idx[1].length) :
+                                   ct->idx[1].start;
+
+        ti->number = ct->point;
+        ti->attr   = ct->attr;
+        ti->m      = (pos / 75) / 60;
+        ti->s      = (pos / 75) % 60;
+        ti->f      = pos % 75;
+
+        ret        = 1;
+    }
+
+    return ret;
+}
+
+static void
+image_get_raw_track_info(const void *local, int *num, uint8_t *buffer)
+{
+    const cd_image_t *img = (const cd_image_t *) local;
+    int               len = 0;
+
+    image_log(img->log, "img->tracks_num = %i\n", img->tracks_num);
+
+    for (int i = 0; i < img->tracks_num; i++) {
+        const track_t *ct = &(img->tracks[i]);
+#ifdef ENABLE_IMAGE_LOG
+        int old_len = len;
+#endif
+        buffer[len++] = ct->session;                  /* Session number. */
+        buffer[len++] = ct->attr;                     /* Track ADR and Control. */
+        buffer[len++] = ct->tno;                      /* TNO (always 0). */
+        buffer[len++] = ct->point;                    /* Point (track number). */
+        for (int j = 0; j < 4; j++)
+            buffer[len++] = ct->extra[j];
+        buffer[len++] = (ct->idx[1].start / 75) / 60;
+        buffer[len++] = (ct->idx[1].start / 75) % 60;
+        buffer[len++] = ct->idx[1].start % 75;
+        image_log(img->log, "%i: %02X %02X %02X %02X %02X %02X %02X\n", i,
+                  buffer[old_len], buffer[old_len + 1],
+                  buffer[old_len + 2], buffer[old_len + 3],
+                  buffer[old_len + 8], buffer[old_len + 9],
+                  buffer[old_len + 10]);
+    }
+
+    *num = img->tracks_num;
+}
+
+static int
+image_is_track_pre(const void *local, const uint32_t sector)
+{
+    const cd_image_t *img   = (const cd_image_t *) local;
+    int               ret   = 0;
+
+    if (img->has_audio) {
+        const int track = image_get_track(img, sector);
+
+        if (track >= 0) {
+            const track_t *trk = &(img->tracks[track]);
+
+            ret = !!(trk->attr & 0x01);
+        }
+    }
+
+    return ret;
+}
+
+static int
+image_read_sector(const void *local, uint8_t *buffer,
+                  const uint32_t sector)
+{
+    const cd_image_t *img    = (const cd_image_t *) local;
+    cdrom_t          *dev    = (cdrom_t *) img->dev;
+    int               m      = 0;
+    int               s      = 0;
+    int               f      = 0;
+    int               ret    = 0;
+    uint32_t          lba    = sector;
+    int               track;
+    int               index;
+    uint8_t           q[16]  = { 0x00 };
+    uint8_t          *buf    = buffer;
+
+    if (sector == 0xffffffff)
+        lba = img->dev->seek_pos;
+
+    const uint64_t sect   = (uint64_t) lba;
+
+    image_get_track_and_index(img, lba, &track, &index);
+
+    const track_t       *trk          = &(img->tracks[track]);
+    const track_index_t *idx          = &(trk->idx[index]);
+    const int            track_is_raw = ((trk->sector_size == RAW_SECTOR_SIZE) ||
+                                         (trk->sector_size == 2448));
+    const uint64_t       seek         = ((sect + 150 - idx->start + idx->file_start) *
+                                         trk->sector_size) + trk->skip;
+
+    if (track >= 0) {
+        /* Signal CIRC error to the guest if sector is bad. */
+        ret = image_is_sector_bad(img, lba) ? -1 : 1;
+
+        if (ret > 0) {
+            uint64_t       offset = 0ULL;
+
+            image_log(img->log, "cdrom_read_sector(%08X): track %02X, index %02X, %016"
+                      PRIX64 ", %i, %i, %i, %i\n",
+                      lba, track, index, idx->start, trk->sector_size, track_is_raw,
+                      trk->mode, trk->form);
+
+            memset(buffer, 0x00, 2448);
+
+            if ((trk->attr & 0x04) && ((idx->type < INDEX_NORMAL) || !track_is_raw)) {
+                offset += 16ULL;
+
+                /* Construct the header. */
+                memset(buffer + 1, 0xff, 10);
+                buffer += 12;
+                FRAMES_TO_MSF(sector + 150, &m, &s, &f);
+                /* These have to be BCD. */
+                buffer[0] = bin2bcd(m & 0xff);
+                buffer[1] = bin2bcd(s & 0xff);
+                buffer[2] = bin2bcd(f & 0xff);
+                /* Data, should reflect the actual sector type. */
+                buffer[3] = trk->mode;
+                buffer += 4;
+                if (trk->form >= 1) {
+                    offset += 8ULL;
+
+                    /* Construct the CD-I/XA sub-header. */
+                    buffer[2] = buffer[6] = (trk->form - 1) << 5;
+                    buffer += 8;
+                }
+            }
+
+            if (idx->type >= INDEX_NORMAL)
+                /* Read the data from the file. */
+                ret = idx->file->read(idx->file, buffer, seek, trk->sector_size);
+            else
+                /* Index is not in the file, no read to fail here. */
+                ret = 1;
+
+            if ((ret > 0) && (trk->attr & 0x04) && ((idx->type < INDEX_NORMAL) || !track_is_raw)) {
+                uint32_t crc;
+
+                if ((trk->mode == 2) && (trk->form == 1)) {
+                    crc = cdrom_crc32(0xffffffff, &(buf[16]), 2056) ^ 0xffffffff;
+                    memcpy(&(buf[2072]), &crc, 4);
+                } else {
+                    crc = cdrom_crc32(0xffffffff, buf, 2064) ^ 0xffffffff;
+                    memcpy(&(buf[2064]), &crc, 4);
+                }
+
+                int m2f1 = (trk->mode == 2) && (trk->form == 1);
+
+                /* Compute ECC P code. */
+                cdrom_compute_ecc_block(dev, &(buf[2076]), &(buf[12]), 86, 24, 2, 86, m2f1);
+
+                /* Compute ECC Q code. */
+                cdrom_compute_ecc_block(dev, &(buf[2248]), &(buf[12]), 52, 43, 86, 88, m2f1);
+            }
+
+            if ((ret > 0) && ((idx->type < INDEX_NORMAL) || (trk->subch_type != 0x08))) {
+                buffer -= offset;
+
+                if (trk->subch_type == 0x10)
+                    memcpy(q, &(buffer[2352]), 12);
+                else {
+                    /* Construct Q. */
+                    q[0] = (trk->attr >> 4) | ((trk->attr & 0xf) << 4);
+                    q[1] = bin2bcd(trk->point);
+                    q[2] = index;
+                    if (index == 0) {
+                        /*
+                           Pre-gap sector relative frame addresses count from
+                           00:01:74 downwards.
+                         */
+                        FRAMES_TO_MSF((int32_t) (149 - (lba + 150 - idx->start)), &m, &s, &f);
+                    } else {
+                        FRAMES_TO_MSF((int32_t) (lba + 150 - idx->start), &m, &s, &f);
+                    }
+                    q[3] = bin2bcd(m & 0xff);
+                    q[4] = bin2bcd(s & 0xff);
+                    q[5] = bin2bcd(f & 0xff);
+                    FRAMES_TO_MSF(lba + 150, &m, &s, &f);
+                    q[7] = bin2bcd(m & 0xff);
+                    q[8] = bin2bcd(s & 0xff);
+                    q[9] = bin2bcd(f & 0xff);
+                }
+
+                /* Construct raw subchannel data from Q only. */
+                for (int i = 0; i < 12; i++)
+                     for (int j = 0; j < 8; j++)
+                          buffer[2352 + (i << 3) + j] = ((q[i] >> (7 - j)) & 0x01) << 6;
+            }
+        }
+    }
+
+    return ret;
+}
+
+static uint8_t
+image_get_track_type(const void *local, const uint32_t sector)
+{
+    const cd_image_t *img   = (cd_image_t *) local;
+    const int         track = image_get_track(img, sector);
+    const track_t *   trk   = &(img->tracks[track]);
+    int               ret   = 0x00;
+
+    if (image_is_track_audio(img, sector))
+        ret = CD_TRACK_AUDIO;
+    else if (track >= 0)  for (int i = 0; i < img->tracks_num; i++) {
+        const track_t *ct = &(img->tracks[i]);
+        const track_t *nt = &(img->tracks[i + 1]);
+
+        if (ct->point == 0xa0) {
+            const uint8_t first = (ct->idx[1].start / 75 / 60);
+            const uint8_t last  = (nt->idx[1].start / 75 / 60);
+
+            if ((trk->point >= first) && (trk->point <= last)) {
+                ret = (ct->idx[1].start / 75) % 60;
+                break;
+            }
+        }
+    }
+
+    return ret;
+}
+
+static uint32_t
+image_get_last_block(const void *local)
+{
+    const cd_image_t *img = (const cd_image_t *) local;
+    uint32_t          lb  = 0x00000000;
+
+    if (img != NULL) {
+        const track_t    *lo  = NULL;
+
+        for (int i = (img->tracks_num - 1); i >= 0; i--) {
+            if (img->tracks[i].point == 0xa2) {
+                lo = &(img->tracks[i]);
+                break;
+            }
+        }
+
+        if (lo != NULL)
+            lb = lo->idx[1].start - 1;
     }
 
     return lb;
 }
 
 static int
-image_is_track_audio(cdrom_t *dev, uint32_t pos, int ismsf)
+image_read_dvd_structure(const void *local, const uint8_t layer, const uint8_t format,
+                         uint8_t *buffer, uint32_t *info)
 {
-    cd_img_t *img = (cd_img_t *) dev->image;
-    uint8_t   attr;
-    TMSF      tmsf;
-    int       m;
-    int       s;
-    int       f;
-    int       number;
-    int       track;
+    const cd_image_t *img = (const cd_image_t *) local;
+    int               ret = 0;
 
-    if (!img || (dev->cd_status == CD_STATUS_DATA_ONLY))
-        return 0;
-
-    if (ismsf) {
-        m   = (pos >> 16) & 0xff;
-        s   = (pos >> 8) & 0xff;
-        f   = pos & 0xff;
-        pos = MSFtoLBA(m, s, f) - 150;
-    }
-
-    /* GetTrack requires LBA. */
-    track = cdi_get_track(img, pos);
-    if (track == -1)
-        return 0;
-    else {
-        cdi_get_audio_track_info(img, 0, track, &number, &tmsf, &attr);
-        return attr == AUDIO_TRACK;
-    }
-}
-
-static int
-image_is_track_pre(cdrom_t *dev, uint32_t lba)
-{
-    cd_img_t *img = (cd_img_t *) dev->image;
-    int       track;
-
-    /* GetTrack requires LBA. */
-    track = cdi_get_track(img, lba);
-
-    if (track != -1)
-        return cdi_get_audio_track_pre(img, track);
-
-    return 0;
-}
-
-static int
-image_sector_size(struct cdrom *dev, uint32_t lba)
-{
-    cd_img_t *img = (cd_img_t *) dev->image;
-
-    return cdi_get_sector_size(img, lba);
-}
-
-static int
-image_read_sector(struct cdrom *dev, int type, uint8_t *b, uint32_t lba)
-{
-    cd_img_t *img = (cd_img_t *) dev->image;
-
-    switch (type) {
-        case CD_READ_DATA:
-            return cdi_read_sector(img, b, 0, lba);
-        case CD_READ_AUDIO:
-            return cdi_read_sector(img, b, 1, lba);
-        case CD_READ_RAW:
-            if (cdi_get_sector_size(img, lba) == 2352)
-                return cdi_read_sector(img, b, 1, lba);
-            else
-                return cdi_read_sector_sub(img, b, lba);
-        default:
-            cdrom_image_log("CD-ROM %i: Unknown CD read type\n", dev->id);
-            return 0;
-    }
-}
-
-static int
-image_track_type(cdrom_t *dev, uint32_t lba)
-{
-    cd_img_t *img = (cd_img_t *) dev->image;
-
-    if (img) {
-        if (image_is_track_audio(dev, lba, 0))
-            return CD_TRACK_AUDIO;
-        else {
-            if (cdi_is_mode2(img, lba))
-                return CD_TRACK_MODE2 | cdi_get_mode2_form(img, lba);
+    if ((img->has_dstruct > 0) && ((layer + 1) > img->has_dstruct)) {
+        switch (format) {
+            case 0x00:
+                memcpy(buffer + 4, img->dstruct.layers[layer].f0, 2048);
+                ret = 2048 + 2;
+                break;
+            case 0x01:
+                memcpy(buffer + 4, img->dstruct.layers[layer].f1, 4);
+                ret = 4 + 2;
+                break;
+            case 0x04:
+                memcpy(buffer + 4, img->dstruct.layers[layer].f4, 2048);
+                ret = 2048 + 2;
+                break;
         }
     }
 
-    return 0;
+    return ret;
+}
+
+static int
+image_is_dvd(const void *local)
+{
+    const cd_image_t *img = (const cd_image_t *) local;
+
+    return img->is_dvd;
+}
+
+static int
+image_has_audio(const void *local)
+{
+    const cd_image_t *img = (const cd_image_t *) local;
+
+    return img->has_audio;
 }
 
 static void
-image_exit(cdrom_t *dev)
+image_close(void *local)
 {
-    cd_img_t *img = (cd_img_t *) dev->image;
+    cd_image_t *img = (cd_image_t *) local;
 
-    cdrom_image_log("CDROM: image_exit(%s)\n", dev->image_path);
-    dev->cd_status = CD_STATUS_EMPTY;
+    if (img != NULL) {
+        image_clear_tracks(img);
 
-    if (img) {
-        cdi_close(img);
-        dev->image = NULL;
+        image_log(img->log, "Log closed\n");
+
+        log_close(img->log);
+        img->log = NULL;
+
+        if (img->bad_sectors != NULL)
+            free(img->bad_sectors);
+
+        free(img);
     }
-
-    dev->ops = NULL;
 }
 
-static const cdrom_ops_t cdrom_image_ops = {
-    image_get_tracks,
+static const cdrom_ops_t image_ops = {
     image_get_track_info,
-    image_get_subchannel,
+    image_get_raw_track_info,
     image_is_track_pre,
-    image_sector_size,
     image_read_sector,
-    image_track_type,
-    image_exit
+    image_get_track_type,
+    image_get_last_block,
+    image_read_dvd_structure,
+    image_is_dvd,
+    image_has_audio,
+    NULL,
+    image_close,
+    NULL
 };
 
-static int
-image_open_abort(cdrom_t *dev)
+/* Public functions. */
+void *
+image_open(cdrom_t *dev, const char *path)
 {
-    cdrom_image_close(dev);
-    dev->ops           = NULL;
-    dev->host_drive    = 0;
-    dev->image_path[0] = 0;
-    return 1;
-}
-
-int
-cdrom_image_open(cdrom_t *dev, const char *fn)
-{
-    cd_img_t *img;
-
-    /* Make sure to not STRCPY if the two are pointing
-       at the same place. */
-    if (fn != dev->image_path)
-        strcpy(dev->image_path, fn);
-
-    /* Create new instance of the CDROM_Image class. */
-    img = (cd_img_t *) malloc(sizeof(cd_img_t));
-
-    /* This guarantees that if ops is not NULL, then
-       neither is the image pointer. */
-    if (!img)
-        return image_open_abort(dev);
-
-    memset(img, 0, sizeof(cd_img_t));
-    dev->image = img;
-
-    /* Open the image. */
-    int i = cdi_set_device(img, fn);
-    if (!i)
-        return image_open_abort(dev);
-
-    /* All good, reset state. */
-    if (i >= 2)
-        dev->cd_status = CD_STATUS_DATA_ONLY;
-    else
-        dev->cd_status = CD_STATUS_STOPPED;
-    dev->is_dir         = (i == 3);
-    dev->seek_pos       = 0;
-    dev->cd_buflen      = 0;
-    dev->cdrom_capacity = image_get_capacity(dev);
-    cdrom_image_log("CD-ROM capacity: %i sectors (%" PRIi64 " bytes)\n", dev->cdrom_capacity, ((uint64_t) dev->cdrom_capacity) << 11ULL);
-
-    /* Attach this handler to the drive. */
-    dev->ops = &cdrom_image_ops;
-
-    return 0;
-}
-
-void
-cdrom_image_close(cdrom_t *dev)
-{
-    cdrom_image_log("CDROM: image_close(%s)\n", dev->image_path);
-
-    if (dev && dev->ops && dev->ops->exit)
-        dev->ops->exit(dev);
+    const uintptr_t  ext = path + strlen(path) - strrchr(path, '.');
+    cd_image_t      *img = (cd_image_t *) calloc(1, sizeof(cd_image_t));
+
+    if (img != NULL) {
+        int       ret;
+        const int is_cue  = ((ext == 4) && !stricmp(path + strlen(path) - ext + 1, "CUE"));
+        const int is_mds  = ((ext == 4) && !stricmp(path + strlen(path) - ext + 1, "MDS"));
+        char      n[1024] = { 0 };
+
+        sprintf(n, "CD-ROM %i Image", dev->id + 1);
+        img->log          = log_open(n);
+
+        img->dev          = dev;
+
+        if (is_mds) {
+            ret = image_load_mds(img, path);
+
+            if (ret >= 2)
+                img->has_audio = 0;
+            else if (ret)
+                img->has_audio = 1;
+        } else if (is_cue) {
+            ret = image_load_cue(img, path);
+
+            if (ret >= 2)
+                img->has_audio = 0;
+            else if (ret)
+                img->has_audio = 1;
+
+            if (ret >= 1)
+                img->is_dvd = 2;
+        } else {
+            ret = image_load_iso(img, path);
+
+            if (ret) {
+                img->has_audio = 0;
+                img->is_dvd = 2;
+            }
+        }
+
+        if (ret > 0) {
+            if (img->is_dvd == 2) {
+                uint32_t lb = image_get_last_block(img); /* Should be safer than previous way of doing it? */
+                img->is_dvd = (lb >= 524287);    /* Minimum 1 GB total capacity as threshold for DVD. */
+            }
+
+            dev->ops = &image_ops;
+        } else {
+            log_warning(img->log, "Unable to load CD-ROM image: %s\n", path);
+
+            image_close(img);
+            img = NULL;
+        }
+    }
+
+    return img;
 }
diff --git a/src/cdrom/cdrom_image_backend.c b/src/cdrom/cdrom_image_backend.c
deleted file mode 100644
index 151ddfe9f..000000000
--- a/src/cdrom/cdrom_image_backend.c
+++ /dev/null
@@ -1,1087 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          CD-ROM image file handling module, translated to C from
- *          cdrom_dosbox.cpp.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          Fred N. van Kempen, <decwiz@yahoo.com>
- *          The DOSBox Team, <unknown>
- *
- *          Copyright 2016-2020 Miran Grca.
- *          Copyright 2017-2020 Fred N. van Kempen.
- *          Copyright 2002-2020 The DOSBox Team.
- */
-#define __STDC_FORMAT_MACROS
-#include <ctype.h>
-#include <inttypes.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#ifdef _WIN32
-#    include <string.h>
-#    include <sys/types.h>
-#else
-#    include <libgen.h>
-#endif
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include <86box/path.h>
-#include <86box/plat.h>
-#include <86box/cdrom_image_backend.h>
-
-#define CDROM_BCD(x)        (((x) % 10) | (((x) / 10) << 4))
-
-#define MAX_LINE_LENGTH     512
-#define MAX_FILENAME_LENGTH 256
-#define CROSS_LEN           512
-
-static char temp_keyword[1024];
-
-#ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG
-int cdrom_image_backend_do_log = ENABLE_CDROM_IMAGE_BACKEND_LOG;
-
-void
-cdrom_image_backend_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (cdrom_image_backend_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define cdrom_image_backend_log(fmt, ...)
-#endif
-
-/* Binary file functions. */
-static int
-bin_read(void *priv, uint8_t *buffer, uint64_t seek, size_t count)
-{
-    track_file_t *tf = (track_file_t *) priv;
-
-    cdrom_image_backend_log("CDROM: binary_read(%08lx, pos=%" PRIu64 " count=%lu\n",
-                            tf->fp, seek, count);
-
-    if (tf->fp == NULL)
-        return 0;
-
-    if (fseeko64(tf->fp, seek, SEEK_SET) == -1) {
-#ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG
-        cdrom_image_backend_log("CDROM: binary_read failed during seek!\n");
-#endif
-        return 0;
-    }
-
-    if (fread(buffer, count, 1, tf->fp) != 1) {
-#ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG
-        cdrom_image_backend_log("CDROM: binary_read failed during read!\n");
-#endif
-        return 0;
-    }
-
-    return 1;
-}
-
-static uint64_t
-bin_get_length(void *priv)
-{
-    off64_t       len;
-    track_file_t *tf = (track_file_t *) priv;
-
-    cdrom_image_backend_log("CDROM: binary_length(%08lx)\n", tf->fp);
-
-    if (tf->fp == NULL)
-        return 0;
-
-    fseeko64(tf->fp, 0, SEEK_END);
-    len = ftello64(tf->fp);
-    cdrom_image_backend_log("CDROM: binary_length(%08lx) = %" PRIu64 "\n", tf->fp, len);
-
-    return len;
-}
-
-static void
-bin_close(void *priv)
-{
-    track_file_t *tf = (track_file_t *) priv;
-
-    if (tf == NULL)
-        return;
-
-    if (tf->fp != NULL) {
-        fclose(tf->fp);
-        tf->fp = NULL;
-    }
-
-    memset(tf->fn, 0x00, sizeof(tf->fn));
-
-    free(priv);
-}
-
-static track_file_t *
-bin_init(const char *filename, int *error)
-{
-    track_file_t *tf = (track_file_t *) malloc(sizeof(track_file_t));
-    struct stat   stats;
-
-    if (tf == NULL) {
-        *error = 1;
-        return NULL;
-    }
-
-    memset(tf->fn, 0x00, sizeof(tf->fn));
-    strncpy(tf->fn, filename, sizeof(tf->fn) - 1);
-    tf->fp = plat_fopen64(tf->fn, "rb");
-    cdrom_image_backend_log("CDROM: binary_open(%s) = %08lx\n", tf->fn, tf->fp);
-
-    if (stat(tf->fn, &stats) != 0) {
-        /* Use a blank structure if stat failed. */
-        memset(&stats, 0, sizeof(struct stat));
-    }
-    *error = ((tf->fp == NULL) || ((stats.st_mode & S_IFMT) == S_IFDIR));
-
-    /* Set the function pointers. */
-    if (!*error) {
-        tf->read       = bin_read;
-        tf->get_length = bin_get_length;
-        tf->close      = bin_close;
-    } else {
-        /* From the check above, error may still be non-zero if opening a directory.
-         * The error is set for viso to try and open the directory following this function.
-         * However, we need to make sure the descriptor is closed. */
-        if ((tf->fp != NULL) && ((stats.st_mode & S_IFMT) == S_IFDIR)) {
-            /* tf is freed by bin_close */
-            bin_close(tf);
-        } else {
-            free(tf);
-        }
-        tf = NULL;
-    }
-
-    return tf;
-}
-
-static track_file_t *
-track_file_init(const char *filename, int *error)
-{
-    /* Current we only support .BIN files, either combined or one per
-       track. In the future, more is planned. */
-    return bin_init(filename, error);
-}
-
-static void
-track_file_close(track_t *trk)
-{
-    if (trk == NULL)
-        return;
-
-    if (trk->file == NULL)
-        return;
-
-    if (trk->file->close == NULL)
-        return;
-
-    trk->file->close(trk->file);
-    trk->file = NULL;
-}
-
-/* Root functions. */
-static void
-cdi_clear_tracks(cd_img_t *cdi)
-{
-    const track_file_t *last = NULL;
-    track_t            *cur  = NULL;
-
-    if ((cdi->tracks == NULL) || (cdi->tracks_num == 0))
-        return;
-
-    for (int i = 0; i < cdi->tracks_num; i++) {
-        cur = &cdi->tracks[i];
-
-        /* Make sure we do not attempt to close a NULL file. */
-        if (cur->file != last) {
-            last = cur->file;
-            track_file_close(cur);
-        } else
-            cur->file = NULL;
-    }
-
-    /* Now free the array. */
-    free(cdi->tracks);
-    cdi->tracks = NULL;
-
-    /* Mark that there's no tracks. */
-    cdi->tracks_num = 0;
-}
-
-void
-cdi_close(cd_img_t *cdi)
-{
-    cdi_clear_tracks(cdi);
-    free(cdi);
-}
-
-int
-cdi_set_device(cd_img_t *cdi, const char *path)
-{
-    int ret;
-
-    if ((ret = cdi_load_cue(cdi, path)))
-        return ret;
-
-    if ((ret = cdi_load_iso(cdi, path)))
-        return ret;
-
-    return 0;
-}
-
-/* TODO: This never returns anything other than 1, should it even be an int? */
-int
-cdi_get_audio_tracks(cd_img_t *cdi, int *st_track, int *end, TMSF *lead_out)
-{
-    *st_track = 1;
-    *end      = cdi->tracks_num - 1;
-    FRAMES_TO_MSF(cdi->tracks[*end].start + 150, &lead_out->min, &lead_out->sec, &lead_out->fr);
-
-    return 1;
-}
-
-/* TODO: This never returns anything other than 1, should it even be an int? */
-int
-cdi_get_audio_tracks_lba(cd_img_t *cdi, int *st_track, int *end, uint32_t *lead_out)
-{
-    *st_track = 1;
-    *end      = cdi->tracks_num - 1;
-    *lead_out = cdi->tracks[*end].start;
-
-    return 1;
-}
-
-int
-cdi_get_audio_track_pre(cd_img_t *cdi, int track)
-{
-    const track_t *trk = &cdi->tracks[track - 1];
-
-    if ((track < 1) || (track > cdi->tracks_num))
-        return 0;
-
-    return trk->pre;
-}
-
-/* This replaces both Info and EndInfo, they are specified by a variable. */
-int
-cdi_get_audio_track_info(cd_img_t *cdi, UNUSED(int end), int track, int *track_num, TMSF *start, uint8_t *attr)
-{
-    const track_t *trk = &cdi->tracks[track - 1];
-    int      pos = trk->start + 150;
-
-    if ((track < 1) || (track > cdi->tracks_num))
-        return 0;
-
-    pos = trk->start + 150;
-
-    FRAMES_TO_MSF(pos, &start->min, &start->sec, &start->fr);
-
-    *track_num = trk->track_number;
-    *attr      = trk->attr;
-
-    return 1;
-}
-
-int
-cdi_get_audio_track_info_lba(cd_img_t *cdi, UNUSED(int end), int track, int *track_num, uint32_t *start, uint8_t *attr)
-{
-    const track_t *trk = &cdi->tracks[track - 1];
-
-    if ((track < 1) || (track > cdi->tracks_num))
-        return 0;
-
-    *start = (uint32_t) trk->start;
-
-    *track_num = trk->track_number;
-    *attr      = trk->attr;
-
-    return 1;
-}
-
-int
-cdi_get_track(cd_img_t *cdi, uint32_t sector)
-{
-    const track_t *cur;
-    const track_t *next;
-
-    /* There must be at least two tracks - data and lead out. */
-    if (cdi->tracks_num < 2)
-        return -1;
-
-    /* This has a problem - the code skips the last track, which is
-       lead out - is that correct? */
-    for (int i = 0; i < (cdi->tracks_num - 1); i++) {
-        cur  = &cdi->tracks[i];
-        next = &cdi->tracks[i + 1];
-
-        /* Take into account cue sheets that do not start on sector 0. */
-        if ((i == 0) && (sector < cur->start))
-            return cur->number;
-
-        if ((cur->start <= sector) && (sector < next->start))
-            return cur->number;
-    }
-
-    return -1;
-}
-
-/* TODO: See if track start is adjusted by 150 or not. */
-int
-cdi_get_audio_sub(cd_img_t *cdi, uint32_t sector, uint8_t *attr, uint8_t *track, uint8_t *index, TMSF *rel_pos, TMSF *abs_pos)
-{
-    int            cur_track = cdi_get_track(cdi, sector);
-    const track_t *trk;
-
-    if (cur_track < 1)
-        return 0;
-
-    *track = (uint8_t) cur_track;
-    trk    = &cdi->tracks[*track - 1];
-    *attr  = trk->attr;
-    *index = 1;
-
-    FRAMES_TO_MSF(sector + 150, &abs_pos->min, &abs_pos->sec, &abs_pos->fr);
-
-    /* Absolute position should be adjusted by 150, not the relative ones. */
-    FRAMES_TO_MSF(sector - trk->start, &rel_pos->min, &rel_pos->sec, &rel_pos->fr);
-
-    return 1;
-}
-
-int
-cdi_read_sector(cd_img_t *cdi, uint8_t *buffer, int raw, uint32_t sector)
-{
-    size_t   length;
-    int      track = cdi_get_track(cdi, sector) - 1;
-    uint64_t sect  = (uint64_t) sector;
-    uint64_t seek;
-    track_t *trk;
-    int      track_is_raw;
-    int      ret;
-    int      raw_size;
-    int      cooked_size;
-    uint64_t offset = 0ULL;
-    int      m = 0;
-    int      s = 0;
-    int      f = 0;
-
-    if (track < 0)
-        return 0;
-
-    trk          = &cdi->tracks[track];
-    track_is_raw = ((trk->sector_size == RAW_SECTOR_SIZE) || (trk->sector_size == 2448));
-
-    seek = trk->skip + ((sect - trk->start) * trk->sector_size);
-
-    if (track_is_raw)
-        raw_size = trk->sector_size;
-    else
-        raw_size = 2448;
-
-    if (trk->mode2 && (trk->form != 1)) {
-        if (trk->form == 2)
-            cooked_size = (track_is_raw ? 2328 : trk->sector_size); /* Both 2324 + ECC and 2328 variants are valid. */
-        else
-            cooked_size = 2336;
-    } else
-        cooked_size = COOKED_SECTOR_SIZE;
-
-    length = (raw ? raw_size : cooked_size);
-
-    if (trk->mode2 && (trk->form >= 1))
-        offset = 24ULL;
-    else
-        offset = 16ULL;
-
-    if (raw && !track_is_raw) {
-        memset(buffer, 0x00, 2448);
-        ret = trk->file->read(trk->file, buffer + offset, seek, length);
-        if (!ret)
-            return 0;
-        /* Construct the rest of the raw sector. */
-        memset(buffer + 1, 0xff, 10);
-        buffer += 12;
-        FRAMES_TO_MSF(sector + 150, &m, &s, &f);
-        /* These have to be BCD. */
-        buffer[12] = CDROM_BCD(m & 0xff);
-        buffer[13] = CDROM_BCD(s & 0xff);
-        buffer[14] = CDROM_BCD(f & 0xff);
-        /* Data, should reflect the actual sector type. */
-        buffer[15] = trk->mode2 ? 2 : 1;
-        return 1;
-    } else if (!raw && track_is_raw)
-        return trk->file->read(trk->file, buffer, seek + offset, length);
-    else {
-        return trk->file->read(trk->file, buffer, seek, length);
-    }
-}
-
-int
-cdi_read_sectors(cd_img_t *cdi, uint8_t *buffer, int raw, uint32_t sector, uint32_t num)
-{
-    int      sector_size;
-    int      success = 1;
-    uint8_t *buf;
-    uint32_t buf_len;
-
-    /* TODO: This fails to account for Mode 2. Shouldn't we have a function
-             to get sector size? */
-    sector_size = raw ? RAW_SECTOR_SIZE : COOKED_SECTOR_SIZE;
-    buf_len     = num * sector_size;
-    buf         = (uint8_t *) malloc(buf_len * sizeof(uint8_t));
-
-    for (uint32_t i = 0; i < num; i++) {
-        success = cdi_read_sector(cdi, &buf[i * sector_size], raw, sector + i);
-        if (!success)
-            break;
-        /* Based on the DOSBox patch, but check all 8 bytes and makes sure it's not an
-           audio track. */
-        if (raw && sector < cdi->tracks[0].length && !cdi->tracks[0].mode2 && (cdi->tracks[0].attr != AUDIO_TRACK) && *(uint64_t *) &(buf[i * sector_size + 2068]))
-            return 0;
-    }
-
-    memcpy((void *) buffer, buf, buf_len);
-    free(buf);
-    buf = NULL;
-
-    return success;
-}
-
-/* TODO: Do CUE+BIN images with a sector size of 2448 even exist? */
-int
-cdi_read_sector_sub(cd_img_t *cdi, uint8_t *buffer, uint32_t sector)
-{
-    int      track = cdi_get_track(cdi, sector) - 1;
-    track_t *trk;
-    uint64_t s = (uint64_t) sector;
-    uint64_t seek;
-
-    if (track < 0)
-        return 0;
-
-    trk  = &cdi->tracks[track];
-    seek = trk->skip + ((s - trk->start) * trk->sector_size);
-    if (trk->sector_size != 2448)
-        return 0;
-
-    return trk->file->read(trk->file, buffer, seek, 2448);
-}
-
-int
-cdi_get_sector_size(cd_img_t *cdi, uint32_t sector)
-{
-    int            track = cdi_get_track(cdi, sector) - 1;
-    const track_t *trk;
-
-    if (track < 0)
-        return 0;
-
-    trk = &cdi->tracks[track];
-    return trk->sector_size;
-}
-
-int
-cdi_is_mode2(cd_img_t *cdi, uint32_t sector)
-{
-    int            track = cdi_get_track(cdi, sector) - 1;
-    const track_t *trk;
-
-    if (track < 0)
-        return 0;
-
-    trk = &cdi->tracks[track];
-
-    return !!(trk->mode2);
-}
-
-int
-cdi_get_mode2_form(cd_img_t *cdi, uint32_t sector)
-{
-    int            track = cdi_get_track(cdi, sector) - 1;
-    const track_t *trk;
-
-    if (track < 0)
-        return 0;
-
-    trk = &cdi->tracks[track];
-
-    return trk->form;
-}
-
-static int
-cdi_can_read_pvd(track_file_t *file, uint64_t sector_size, int mode2, int form)
-{
-    uint8_t  pvd[COOKED_SECTOR_SIZE];
-    uint64_t seek = 16ULL * sector_size; /* First VD is located at sector 16. */
-
-    if ((!mode2 || (form == 0)) && (sector_size == RAW_SECTOR_SIZE))
-        seek += 16;
-    if (mode2 && (form >= 1))
-        seek += 24;
-
-    file->read(file, pvd, seek, COOKED_SECTOR_SIZE);
-
-    return ((pvd[0] == 1 && !strncmp((char *) (&pvd[1]), "CD001", 5) && pvd[6] == 1) || (pvd[8] == 1 && !strncmp((char *) (&pvd[9]), "CDROM", 5) && pvd[14] == 1));
-}
-
-/* This reallocates the array and returns the pointer to the last track. */
-static void
-cdi_track_push_back(cd_img_t *cdi, track_t *trk)
-{
-    /* This has to be done so situations in which realloc would misbehave
-       can be detected and reported to the user. */
-    if ((cdi->tracks != NULL) && (cdi->tracks_num == 0))
-        fatal("CD-ROM Image: Non-null tracks array at 0 loaded tracks\n");
-    if ((cdi->tracks == NULL) && (cdi->tracks_num != 0))
-        fatal("CD-ROM Image: Null tracks array at non-zero loaded tracks\n");
-
-    cdi->tracks = realloc(cdi->tracks, (cdi->tracks_num + 1) * sizeof(track_t));
-    memcpy(&(cdi->tracks[cdi->tracks_num]), trk, sizeof(track_t));
-    cdi->tracks_num++;
-}
-
-int
-cdi_load_iso(cd_img_t *cdi, const char *filename)
-{
-    int     error;
-    int     ret = 2;
-    track_t trk;
-
-    cdi->tracks     = NULL;
-    cdi->tracks_num = 0;
-
-    memset(&trk, 0, sizeof(track_t));
-
-    /* Data track (shouldn't there be a lead in track?). */
-    trk.file = bin_init(filename, &error);
-    if (error) {
-        if ((trk.file != NULL) && (trk.file->close != NULL))
-            trk.file->close(trk.file);
-        ret      = 3;
-        trk.file = viso_init(filename, &error);
-        if (error) {
-            if ((trk.file != NULL) && (trk.file->close != NULL))
-                trk.file->close(trk.file);
-            return 0;
-        }
-    }
-    trk.number       = 1;
-    trk.track_number = 1;
-    trk.attr         = DATA_TRACK;
-
-    /* Try to detect ISO type. */
-    trk.form  = 0;
-    trk.mode2 = 0;
-    /* TODO: Merge the first and last cases since they result in the same thing. */
-    if (cdi_can_read_pvd(trk.file, RAW_SECTOR_SIZE, 0, 0))
-        trk.sector_size = RAW_SECTOR_SIZE;
-    else if (cdi_can_read_pvd(trk.file, 2336, 1, 0)) {
-        trk.sector_size = 2336;
-        trk.mode2       = 1;
-    } else if (cdi_can_read_pvd(trk.file, 2324, 1, 2)) {
-        trk.sector_size = 2324;
-        trk.mode2       = 1;
-        trk.form        = 2;
-    } else if (cdi_can_read_pvd(trk.file, RAW_SECTOR_SIZE, 1, 0)) {
-        trk.sector_size = RAW_SECTOR_SIZE;
-        trk.mode2       = 1;
-    } else {
-        /* We use 2048 mode 1 as the default. */
-        trk.sector_size = COOKED_SECTOR_SIZE;
-    }
-
-    trk.length = trk.file->get_length(trk.file) / trk.sector_size;
-    cdrom_image_backend_log("ISO: Data track: length = %" PRIu64 ", sector_size = %i\n", trk.length, trk.sector_size);
-    cdi_track_push_back(cdi, &trk);
-
-    /* Lead out track. */
-    trk.number       = 2;
-    trk.track_number = 0xAA;
-    trk.attr         = 0x16; /* Was originally 0x00, but I believe 0x16 is appropriate. */
-    trk.start        = trk.length;
-    trk.length       = 0;
-    trk.file         = NULL;
-    cdi_track_push_back(cdi, &trk);
-
-    return ret;
-}
-
-static int
-cdi_cue_get_buffer(char *str, char **line, int up)
-{
-    char *s     = *line;
-    char *p     = str;
-    int   quote = 0;
-    int   done  = 0;
-    int   space = 1;
-
-    /* Copy to local buffer until we have end of string or whitespace. */
-    while (!done) {
-        switch (*s) {
-            case '\0':
-                if (quote) {
-                    /* Ouch, unterminated string.. */
-                    return 0;
-                }
-                done = 1;
-                break;
-
-            case '\"':
-                quote ^= 1;
-                break;
-
-            case ' ':
-            case '\t':
-                if (space)
-                    break;
-
-                if (!quote) {
-                    done = 1;
-                    break;
-                }
-                fallthrough;
-
-            default:
-                if (up && islower((int) *s))
-                    *p++ = toupper((int) *s);
-                else
-                    *p++ = *s;
-                space = 0;
-                break;
-        }
-
-        if (!done)
-            s++;
-    }
-    *p = '\0';
-
-    *line = s;
-
-    return 1;
-}
-
-static int
-cdi_cue_get_keyword(char **dest, char **line)
-{
-    int success;
-
-    success = cdi_cue_get_buffer(temp_keyword, line, 1);
-    if (success)
-        *dest = temp_keyword;
-
-    return success;
-}
-
-/* Get a string from the input line, handling quotes properly. */
-static uint64_t
-cdi_cue_get_number(char **line)
-{
-    char     temp[128];
-    uint64_t num;
-
-    if (!cdi_cue_get_buffer(temp, line, 0))
-        return 0;
-
-    if (sscanf(temp, "%" PRIu64, &num) != 1)
-        return 0;
-
-    return num;
-}
-
-static int
-cdi_cue_get_frame(uint64_t *frames, char **line)
-{
-    char temp[128];
-    int  min;
-    int  sec;
-    int  fr;
-    int  success;
-
-    success = cdi_cue_get_buffer(temp, line, 0);
-    if (!success)
-        return 0;
-
-    success = sscanf(temp, "%d:%d:%d", &min, &sec, &fr) == 3;
-    if (!success)
-        return 0;
-
-    *frames = MSF_TO_FRAMES(min, sec, fr);
-
-    return 1;
-}
-
-static int
-cdi_cue_get_flags(track_t *cur, char **line)
-{
-    char temp[128];
-    char temp2[128];
-    int  success;
-
-    success = cdi_cue_get_buffer(temp, line, 0);
-    if (!success)
-        return 0;
-
-    memset(temp2, 0x00, sizeof(temp2));
-    success = sscanf(temp, "%s", temp2) == 1;
-    if (!success)
-        return 0;
-
-    cur->pre = (strstr(temp2, "PRE") != NULL);
-
-    return 1;
-}
-
-static int
-cdi_add_track(cd_img_t *cdi, track_t *cur, uint64_t *shift, uint64_t prestart, uint64_t *total_pregap, uint64_t cur_pregap)
-{
-    /* Frames between index 0 (prestart) and 1 (current track start) must be skipped. */
-    uint64_t skip;
-    uint64_t temp;
-    track_t *prev = NULL;
-
-    /* Skip *MUST* be calculated even if prestart is 0. */
-    if (prestart >= 0) {
-        if (prestart > cur->start)
-            return 0;
-        skip = cur->start - prestart;
-    } else
-        skip = 0ULL;
-
-    if ((cdi->tracks != NULL) && (cdi->tracks_num != 0))
-        prev = &cdi->tracks[cdi->tracks_num - 1];
-    else if ((cdi->tracks == NULL) && (cdi->tracks_num != 0)) {
-        fatal("NULL cdi->tracks with non-zero cdi->tracks_num\n");
-        return 0;
-    }
-
-    /* First track (track number must be 1). */
-    if ((prev == NULL) || (cdi->tracks_num == 0)) {
-        /* I guess this makes sure the structure is not filled with invalid data. */
-        if (cur->number != 1)
-            return 0;
-        cur->skip = skip * cur->sector_size;
-        cur->start += cur_pregap;
-        *total_pregap = cur_pregap;
-        cdi_track_push_back(cdi, cur);
-        return 1;
-    }
-
-    /* Current track consumes data from the same file as the previous. */
-    if (prev->file == cur->file) {
-        cur->start += *shift;
-        prev->length = cur->start + *total_pregap - prev->start - skip;
-        cur->skip += prev->skip + (prev->length * prev->sector_size) + (skip * cur->sector_size);
-        *total_pregap += cur_pregap;
-        cur->start += *total_pregap;
-    } else {
-        temp         = prev->file->get_length(prev->file) - (prev->skip);
-        prev->length = temp / ((uint64_t) prev->sector_size);
-        if ((temp % prev->sector_size) != 0)
-            prev->length++;
-        /* Padding. */
-
-        cur->start += prev->start + prev->length + cur_pregap;
-        cur->skip = skip * cur->sector_size;
-        *shift += prev->start + prev->length;
-        *total_pregap = cur_pregap;
-    }
-
-    /* Error checks. */
-    if (cur->number <= 1)
-        return 0;
-    if ((prev->number + 1) != cur->number)
-        return 0;
-    if (cur->start < (prev->start + prev->length))
-        return 0;
-
-    cdi_track_push_back(cdi, cur);
-
-    return 1;
-}
-
-int
-cdi_load_cue(cd_img_t *cdi, const char *cuefile)
-{
-    track_t  trk;
-    char     pathname[MAX_FILENAME_LENGTH];
-    char     filename[MAX_FILENAME_LENGTH];
-    char     temp[MAX_FILENAME_LENGTH];
-    uint64_t shift = 0ULL;
-    uint64_t prestart = 0ULL;
-    uint64_t cur_pregap = 0ULL;
-    uint64_t total_pregap = 0ULL;
-    uint64_t frame = 0ULL;
-    uint64_t index;
-    int      success;
-    int      error;
-    int      can_add_track = 0;
-    FILE    *fp;
-    char     buf[MAX_LINE_LENGTH];
-    char     ansi[MAX_FILENAME_LENGTH];
-    char    *line;
-    char    *command;
-    char    *type;
-
-    cdi->tracks     = NULL;
-    cdi->tracks_num = 0;
-
-    memset(&trk, 0, sizeof(track_t));
-
-    /* Get a copy of the filename into pathname, we need it later. */
-    memset(pathname, 0, MAX_FILENAME_LENGTH * sizeof(char));
-    path_get_dirname(pathname, cuefile);
-
-    /* Open the file. */
-    fp = plat_fopen(cuefile, "r");
-    if (fp == NULL)
-        return 0;
-
-    success = 0;
-
-    for (;;) {
-        line = buf;
-
-        /* Read a line from the cuesheet file. */
-        if (feof(fp) || fgets(buf, sizeof(buf), fp) == NULL || ferror(fp))
-            break;
-
-        /* Do two iterations to make sure to nuke even if it's \r\n or \n\r,
-           but do checks to make sure we're not nuking other bytes. */
-        for (uint8_t i = 0; i < 2; i++) {
-            if (strlen(buf) > 0) {
-                if (buf[strlen(buf) - 1] == '\n')
-                    buf[strlen(buf) - 1] = '\0';
-                /* nuke trailing newline */
-                else if (buf[strlen(buf) - 1] == '\r')
-                    buf[strlen(buf) - 1] = '\0';
-                /* nuke trailing newline */
-            }
-        }
-
-        success = cdi_cue_get_keyword(&command, &line);
-
-        if (!strcmp(command, "TRACK")) {
-            if (can_add_track)
-                success = cdi_add_track(cdi, &trk, &shift, prestart, &total_pregap, cur_pregap);
-            else
-                success = 1;
-            if (!success)
-                break;
-
-            trk.start  = 0;
-            trk.skip   = 0;
-            cur_pregap = 0;
-            prestart   = 0;
-
-            trk.number       = cdi_cue_get_number(&line);
-            trk.track_number = trk.number;
-            success          = cdi_cue_get_keyword(&type, &line);
-            if (!success)
-                break;
-
-            trk.form  = 0;
-            trk.mode2 = 0;
-
-            trk.pre = 0;
-
-            if (!strcmp(type, "AUDIO")) {
-                trk.sector_size = RAW_SECTOR_SIZE;
-                trk.attr        = AUDIO_TRACK;
-            } else if (!strcmp(type, "MODE1/2048")) {
-                trk.sector_size = COOKED_SECTOR_SIZE;
-                trk.attr        = DATA_TRACK;
-            } else if (!strcmp(type, "MODE1/2352")) {
-                trk.sector_size = RAW_SECTOR_SIZE;
-                trk.attr        = DATA_TRACK;
-            } else if (!strcmp(type, "MODE1/2448")) {
-                trk.sector_size = 2448;
-                trk.attr        = DATA_TRACK;
-            } else if (!strcmp(type, "MODE2/2048")) {
-                trk.form        = 1;
-                trk.sector_size = COOKED_SECTOR_SIZE;
-                trk.attr        = DATA_TRACK;
-                trk.mode2       = 1;
-            } else if (!strcmp(type, "MODE2/2324")) {
-                trk.form        = 2;
-                trk.sector_size = 2324;
-                trk.attr        = DATA_TRACK;
-                trk.mode2       = 1;
-            } else if (!strcmp(type, "MODE2/2328")) {
-                trk.form        = 2;
-                trk.sector_size = 2328;
-                trk.attr        = DATA_TRACK;
-                trk.mode2       = 1;
-            } else if (!strcmp(type, "MODE2/2336")) {
-                trk.sector_size = 2336;
-                trk.attr        = DATA_TRACK;
-                trk.mode2       = 1;
-            } else if (!strcmp(type, "MODE2/2352")) {
-                /* Assume this is XA Mode 2 Form 1. */
-                trk.form        = 1;
-                trk.sector_size = RAW_SECTOR_SIZE;
-                trk.attr        = DATA_TRACK;
-                trk.mode2       = 1;
-            } else if (!strcmp(type, "MODE2/2448")) {
-                /* Assume this is XA Mode 2 Form 1. */
-                trk.form        = 1;
-                trk.sector_size = 2448;
-                trk.attr        = DATA_TRACK;
-                trk.mode2       = 1;
-            } else if (!strcmp(type, "CDG/2448")) {
-                trk.sector_size = 2448;
-                trk.attr        = DATA_TRACK;
-                trk.mode2       = 1;
-            } else if (!strcmp(type, "CDI/2336")) {
-                trk.sector_size = 2336;
-                trk.attr        = DATA_TRACK;
-                trk.mode2       = 1;
-            } else if (!strcmp(type, "CDI/2352")) {
-                trk.sector_size = RAW_SECTOR_SIZE;
-                trk.attr        = DATA_TRACK;
-                trk.mode2       = 1;
-            } else
-                success = 0;
-
-            can_add_track = 1;
-        } else if (!strcmp(command, "INDEX")) {
-            index   = cdi_cue_get_number(&line);
-            success = cdi_cue_get_frame(&frame, &line);
-
-            switch (index) {
-                case 0:
-                    prestart = frame;
-                    break;
-
-                case 1:
-                    trk.start = frame;
-                    break;
-
-                default:
-                    /* Ignore other indices. */
-                    break;
-            }
-        } else if (!strcmp(command, "FILE")) {
-            if (can_add_track)
-                success = cdi_add_track(cdi, &trk, &shift, prestart, &total_pregap, cur_pregap);
-            else
-                success = 1;
-            if (!success)
-                break;
-            can_add_track = 0;
-
-            memset(ansi, 0, MAX_FILENAME_LENGTH * sizeof(char));
-            memset(filename, 0, MAX_FILENAME_LENGTH * sizeof(char));
-
-            success = cdi_cue_get_buffer(ansi, &line, 0);
-            if (!success)
-                break;
-            success = cdi_cue_get_keyword(&type, &line);
-            if (!success)
-                break;
-
-            trk.file = NULL;
-            error    = 1;
-
-            if (!strcmp(type, "BINARY")) {
-                memset(temp, 0, MAX_FILENAME_LENGTH * sizeof(char));
-                path_append_filename(filename, pathname, ansi);
-                trk.file = track_file_init(filename, &error);
-            }
-            if (error) {
-#ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG
-                cdrom_image_backend_log("CUE: cannot open fille '%s' in cue sheet!\n",
-                                        filename);
-#endif
-                if (trk.file != NULL) {
-                    trk.file->close(trk.file);
-                    trk.file = NULL;
-                }
-                success = 0;
-            }
-        } else if (!strcmp(command, "PREGAP"))
-            success = cdi_cue_get_frame(&cur_pregap, &line);
-        else if (!strcmp(command, "FLAGS"))
-            success = cdi_cue_get_flags(&trk, &line);
-        else if (!strcmp(command, "CATALOG") || !strcmp(command, "CDTEXTFILE") || !strcmp(command, "ISRC") || !strcmp(command, "PERFORMER") || !strcmp(command, "POSTGAP") || !strcmp(command, "REM") || !strcmp(command, "SONGWRITER") || !strcmp(command, "TITLE") || !strcmp(command, "")) {
-            /* Ignored commands. */
-            success = 1;
-        } else {
-#ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG
-            cdrom_image_backend_log("CUE: unsupported command '%s' in cue sheet!\n", command);
-#endif
-            success = 0;
-        }
-
-        if (!success)
-            break;
-    }
-
-    fclose(fp);
-    if (!success)
-        return 0;
-
-    /* Add last track. */
-    if (!cdi_add_track(cdi, &trk, &shift, prestart, &total_pregap, cur_pregap))
-        return 0;
-
-    /* Add lead out track. */
-    trk.number++;
-    trk.track_number = 0xAA;
-    trk.attr         = 0x16; /* Was 0x00 but I believe 0x16 is appropriate. */
-    trk.start        = 0;
-    trk.length       = 0;
-    trk.file         = NULL;
-    if (!cdi_add_track(cdi, &trk, &shift, 0, &total_pregap, 0))
-        return 0;
-
-    return 1;
-}
-
-int
-cdi_has_data_track(cd_img_t *cdi)
-{
-    if ((cdi == NULL) || (cdi->tracks == NULL))
-        return 0;
-
-    /* Data track has attribute 0x14. */
-    for (int i = 0; i < cdi->tracks_num; i++) {
-        if (cdi->tracks[i].attr == DATA_TRACK)
-            return 1;
-    }
-
-    return 0;
-}
-
-int
-cdi_has_audio_track(cd_img_t *cdi)
-{
-    if ((cdi == NULL) || (cdi->tracks == NULL))
-        return 0;
-
-    /* Audio track has attribute 0x14. */
-    for (int i = 0; i < cdi->tracks_num; i++) {
-        if (cdi->tracks[i].attr == AUDIO_TRACK)
-            return 1;
-    }
-
-    return 0;
-}
diff --git a/src/cdrom/cdrom_image_viso.c b/src/cdrom/cdrom_image_viso.c
index 7ed68cd86..3eec6d5a1 100644
--- a/src/cdrom/cdrom_image_viso.c
+++ b/src/cdrom/cdrom_image_viso.c
@@ -8,9 +8,7 @@
  *
  *          Virtual ISO CD-ROM image back-end.
  *
- *
- *
- * Authors: RichardG <richardg867@gmail.com>
+ * Authors: RichardG, <richardg867@gmail.com>
  *
  *          Copyright 2022 RichardG.
  */
@@ -23,7 +21,9 @@
 #define __STDC_FORMAT_MACROS
 #include <ctype.h>
 #include <inttypes.h>
+#ifdef IMAGE_VISO_LOG
 #include <stdarg.h>
+#endif
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,43 +31,51 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <wchar.h>
-#define HAVE_STDARG_H
 #include <86box/86box.h>
-#include <86box/bswap.h>
-#include <86box/cdrom_image_backend.h>
+#include <86box/cdrom.h>
+#include <86box/cdrom_image.h>
+#include <86box/cdrom_image_viso.h>
+#include <86box/log.h>
 #include <86box/path.h>
 #include <86box/plat.h>
+#include <86box/bswap.h>
 #include <86box/plat_dir.h>
 #include <86box/version.h>
-#include <86box/timer.h>
 #include <86box/nvr.h>
 
 #ifndef S_ISDIR
 #    define S_ISDIR(m) (((m) &S_IFMT) == S_IFDIR)
 #endif
 
-#define VISO_SKIP(p, n)     \
-    {                       \
-        memset(p, 0x00, n); \
-        p += n;             \
+#ifdef _WIN32
+#    define stat _stat64
+typedef struct __stat64 stat_t;
+#else
+typedef struct stat stat_t;
+#endif
+
+#define VISO_SKIP(p, n)         \
+    {                           \
+        memset((p), 0x00, (n)); \
+        (p) += (n);             \
     }
 #define VISO_TIME_VALID(t) ((t) > 0)
 
 /* ISO 9660 defines "both endian" data formats, which
    are stored as little endian followed by big endian. */
-#define VISO_LBE_16(p, x)                   \
-    {                                       \
-        *((uint16_t *) p) = cpu_to_le16(x); \
-        p += 2;                             \
-        *((uint16_t *) p) = cpu_to_be16(x); \
-        p += 2;                             \
+#define VISO_LBE_16(p, x)                       \
+    {                                           \
+        *((uint16_t *) (p)) = cpu_to_le16((x)); \
+        (p) += 2;                               \
+        *((uint16_t *) (p)) = cpu_to_be16((x)); \
+        (p) += 2;                               \
     }
-#define VISO_LBE_32(p, x)                   \
-    {                                       \
-        *((uint32_t *) p) = cpu_to_le32(x); \
-        p += 4;                             \
-        *((uint32_t *) p) = cpu_to_be32(x); \
-        p += 4;                             \
+#define VISO_LBE_32(p, x)                       \
+    {                                           \
+        *((uint32_t *) (p)) = cpu_to_le32((x)); \
+        (p) += 4;                               \
+        *((uint32_t *) (p)) = cpu_to_be32((x)); \
+        (p) += 4;                               \
     }
 
 #define VISO_SECTOR_SIZE COOKED_SECTOR_SIZE
@@ -106,7 +114,7 @@ typedef struct _viso_entry_ {
     };
     uint16_t pt_idx;
 
-    struct stat stats;
+    stat_t stats;
 
     struct _viso_entry_ *parent, *next, *next_dir, *first_child;
 
@@ -131,29 +139,30 @@ static const char rr_eid[]   = "RRIP_1991A"; /* identifiers used in ER field for
 static const char rr_edesc[] = "THE ROCK RIDGE INTERCHANGE PROTOCOL PROVIDES SUPPORT FOR POSIX FILE SYSTEM SEMANTICS.";
 static int8_t     tz_offset  = 0;
 
-#ifdef ENABLE_CDROM_IMAGE_VISO_LOG
-int cdrom_image_viso_do_log = ENABLE_CDROM_IMAGE_VISO_LOG;
+#ifdef IMAGE_VISO_LOG
+int image_viso_do_log = IMAGE_VISO_LOG;
 
 void
-cdrom_image_viso_log(const char *fmt, ...)
+image_viso_log(void *priv, const char *fmt, ...)
 {
     va_list ap;
 
-    if (cdrom_image_viso_do_log) {
+    if (image_viso_do_log) {
         va_start(ap, fmt);
-        pclog_ex(fmt, ap);
+        log_out(priv, fmt, ap);
         va_end(ap);
     }
 }
 #else
-#    define cdrom_image_viso_log(fmt, ...)
+#    define image_viso_log(priv, fmt, ...)
 #endif
 
 static size_t
-viso_pread(void *ptr, uint64_t offset, size_t size, size_t count, FILE *fp)
+viso_pread(void *ptr, const uint64_t offset, const size_t size,
+           const size_t count, FILE *fp)
 {
-    uint64_t cur_pos = ftello64(fp);
-    size_t   ret     = 0;
+    const uint64_t cur_pos = ftello64(fp);
+    size_t         ret     = 0;
     if (fseeko64(fp, offset, SEEK_SET) != -1)
         ret = fread(ptr, size, count, fp);
     fseeko64(fp, cur_pos, SEEK_SET);
@@ -161,10 +170,11 @@ viso_pread(void *ptr, uint64_t offset, size_t size, size_t count, FILE *fp)
 }
 
 static size_t
-viso_pwrite(const void *ptr, uint64_t offset, size_t size, size_t count, FILE *fp)
+viso_pwrite(const void *ptr, const uint64_t offset, const size_t size,
+            const size_t count, FILE *fp)
 {
-    uint64_t cur_pos = ftello64(fp);
-    size_t   ret     = 0;
+    const uint64_t cur_pos = ftello64(fp);
+    size_t         ret     = 0;
     if (fseeko64(fp, offset, SEEK_SET) != -1)
         ret = fwrite(ptr, size, count, fp);
     fseeko64(fp, cur_pos, SEEK_SET);
@@ -436,24 +446,36 @@ static int
 viso_fill_time(uint8_t *data, time_t time, int format, int longform)
 {
     uint8_t   *p      = data;
-    struct tm *time_s = localtime(&time);
-    if (!time_s) {
-        /* localtime will return NULL if the time_t is negative (Windows)
-           or way too far into 64-bit space (Linux). Fall back to epoch. */
-        time_t epoch = 0;
-        time_s       = localtime(&epoch);
-        if (UNLIKELY(!time_s))
-            fatal("VISO: localtime(0) = NULL\n");
+    struct tm time_s_buf;
+    struct tm *time_s = NULL;
+    time_t epoch      = 0;
 
-        /* Force year clamping if the timestamp is known to be outside the supported ranges. */
+#ifdef _WIN32
+    if (localtime_s(&time_s_buf, &time) == 0)
+        time_s = &time_s_buf;
+#else
+    time_s = localtime_r(&time, &time_s_buf);
+#endif
+
+    if (!time_s) {
+        /* localtime may return NULL if time is negative or out of range */
+#ifdef _WIN32
+        if (localtime_s(&time_s_buf, &epoch) == 0)
+            time_s = &time_s_buf;
+#else
+        time_s = localtime_r(&epoch, &time_s_buf);
+#endif
+        if (!time_s)
+            fatal("VISO: localtime fallback to epoch failed\n");
+
+        /* Force year clamping for out-of-range times */
         if (time < (longform ? -62135596800LL : -2208988800LL)) /* 0001-01-01 00:00:00 : 1900-01-01 00:00:00 */
             time_s->tm_year = -1901;
         else if (time > (longform ? 253402300799LL : 5869583999LL)) /* 9999-12-31 23:59:59 : 2155-12-31 23:59:59 */
             time_s->tm_year = 8100;
     }
 
-    /* Clamp year to the supported ranges, and assume the
-       OS returns valid numbers in the other struct fields. */
+    /* Clamp year within supported ranges */
     if (time_s->tm_year < (longform ? -1900 : 0)) {
         time_s->tm_year = longform ? -1900 : 0;
         time_s->tm_mon = time_s->tm_hour = time_s->tm_min = time_s->tm_sec = 0;
@@ -466,18 +488,18 @@ viso_fill_time(uint8_t *data, time_t time, int format, int longform)
         time_s->tm_min = time_s->tm_sec = 59;
     }
 
-    /* Convert timestamp. */
+    /* Convert timestamp */
     if (longform) {
-        p += sprintf((char *) p, "%04u%02u%02u%02u%02u%02u00",
-                     1900 + time_s->tm_year, 1 + time_s->tm_mon, time_s->tm_mday,
+        p += sprintf((char *)p, "%04u%02u%02u%02u%02u%02u00",
+                     1900 + (unsigned)time_s->tm_year, 1 + time_s->tm_mon, time_s->tm_mday,
                      time_s->tm_hour, time_s->tm_min, time_s->tm_sec);
     } else {
-        *p++ = time_s->tm_year;    /* year since 1900 */
-        *p++ = 1 + time_s->tm_mon; /* month */
-        *p++ = time_s->tm_mday;    /* day */
-        *p++ = time_s->tm_hour;    /* hour */
-        *p++ = time_s->tm_min;     /* minute */
-        *p++ = time_s->tm_sec;     /* second */
+        *p++ = (uint8_t)time_s->tm_year;    /* year since 1900 */
+        *p++ = (uint8_t)(1 + time_s->tm_mon); /* month */
+        *p++ = (uint8_t)time_s->tm_mday;    /* day */
+        *p++ = (uint8_t)time_s->tm_hour;    /* hour */
+        *p++ = (uint8_t)time_s->tm_min;     /* minute */
+        *p++ = (uint8_t)time_s->tm_sec;     /* second */
     }
     if (format & VISO_FORMAT_ISO)
         *p++ = tz_offset; /* timezone (ISO only) */
@@ -496,10 +518,6 @@ viso_fill_dir_record(uint8_t *data, viso_entry_t *entry, viso_t *viso, int type)
     *p++ = 0;                             /* extended attribute length */
     VISO_SKIP(p, 8);                      /* sector offset */
     VISO_LBE_32(p, entry->stats.st_size); /* size (filled in later if this is a directory) */
-#ifdef _WIN32
-    if (entry->stats.st_mtime < 0)
-        pclog("VISO: Warning: Windows returned st_mtime %lld on file [%s]\n", (long long) entry->stats.st_mtime, entry->path);
-#endif
     p += viso_fill_time(p, entry->stats.st_mtime, viso->format, 0); /* time */
     *p++ = S_ISDIR(entry->stats.st_mode) ? 0x02 : 0x00;             /* flags */
 
@@ -671,9 +689,9 @@ viso_read(void *priv, uint8_t *buffer, uint64_t seek, size_t count)
     /* Handle reads in a sector by sector basis. */
     while (count > 0) {
         /* Determine the current sector, offset and remainder. */
-        uint32_t sector        = seek / viso->sector_size;
-        uint32_t sector_offset = seek % viso->sector_size;
-        uint32_t sector_remain = MIN(count, viso->sector_size - sector_offset);
+        size_t sector        = seek / viso->sector_size;
+        size_t sector_offset = seek % viso->sector_size;
+        size_t sector_remain = MIN(count, viso->sector_size - sector_offset);
 
         /* Handle sector. */
         if (sector < viso->metadata_sectors) {
@@ -690,22 +708,22 @@ viso_read(void *priv, uint8_t *buffer, uint64_t seek, size_t count)
                     /* Close any existing FIFO entry's file. */
                     viso_entry_t *other_entry = viso->file_fifo[viso->file_fifo_pos];
                     if (other_entry && other_entry->file) {
-                        cdrom_image_viso_log("VISO: Closing [%s]", other_entry->path);
+                        image_viso_log(viso->tf.log, "Closing [%s]...\n", other_entry->path);
                         fclose(other_entry->file);
                         other_entry->file = NULL;
-                        cdrom_image_viso_log("\n");
+                        image_viso_log(viso->tf.log, "Done\n");
                     }
 
                     /* Open file. */
-                    cdrom_image_viso_log("VISO: Opening [%s]", entry->path);
+                    image_viso_log(viso->tf.log, "Opening [%s]...\n", entry->path);
                     if ((entry->file = fopen(entry->path, "rb"))) {
-                        cdrom_image_viso_log("\n");
+                        image_viso_log(viso->tf.log, "Done\n");
 
                         /* Add this entry to the FIFO. */
                         viso->file_fifo[viso->file_fifo_pos++] = entry;
                         viso->file_fifo_pos &= (sizeof(viso->file_fifo) / sizeof(viso->file_fifo[0])) - 1;
                     } else {
-                        cdrom_image_viso_log(" => failed\n");
+                        image_viso_log(viso->tf.log, "Failed\n");
 
                         /* Clear any existing FIFO entry. */
                         viso->file_fifo[viso->file_fifo_pos] = NULL;
@@ -713,8 +731,11 @@ viso_read(void *priv, uint8_t *buffer, uint64_t seek, size_t count)
                 }
 
                 /* Read data. */
-                if (entry->file && (fseeko64(entry->file, seek - entry->data_offset, SEEK_SET) != -1))
-                    read = fread(buffer, 1, sector_remain, entry->file);
+                if (!entry->file || (fseeko64(entry->file, seek - entry->data_offset, SEEK_SET) == -1))
+                    return -1;
+                read = fread(buffer, 1, sector_remain, entry->file);
+                if (sector_remain && !read)
+                    return -1;
             }
 
             /* Fill remainder with 00 bytes if needed. */
@@ -749,12 +770,12 @@ viso_close(void *priv)
     if (viso == NULL)
         return;
 
-    cdrom_image_viso_log("VISO: close()\n");
+    image_viso_log(viso->tf.log, "close()\n");
 
     /* De-allocate everything. */
     if (tf->fp)
         fclose(tf->fp);
-#ifndef ENABLE_CDROM_IMAGE_VISO_LOG
+#ifndef ENABLE_IMAGE_VISO_LOG
     remove(nvr_path(viso->tf.fn));
 #endif
 
@@ -773,21 +794,31 @@ viso_close(void *priv)
     if (viso->entry_map)
         free(viso->entry_map);
 
+    if (tf->log != NULL)
+        log_close(tf->log);
+
     free(viso);
 }
 
 track_file_t *
-viso_init(const char *dirname, int *error)
+viso_init(const uint8_t id, const char *dirname, int *error)
 {
-    cdrom_image_viso_log("VISO: init()\n");
-
     /* Initialize our data structure. */
     viso_t  *viso = (viso_t *) calloc(1, sizeof(viso_t));
     uint8_t *data = NULL;
     uint8_t *p;
     *error        = 1;
+
     if (viso == NULL)
         goto end;
+
+    char n[1024]        = { 0 };
+
+    sprintf(n, "CD-ROM %i VISO ", id + 1);
+    viso->tf.log        = log_open(n);
+
+    image_viso_log(viso->tf.log, "init()\n");
+
     viso->sector_size        = VISO_SECTOR_SIZE;
     viso->format             = VISO_FORMAT_ISO | VISO_FORMAT_JOLIET | VISO_FORMAT_RR;
     viso->use_version_suffix = (viso->format & VISO_FORMAT_ISO); /* cleared later if required */
@@ -798,7 +829,7 @@ viso_init(const char *dirname, int *error)
         goto end;
 
         /* Open temporary file. */
-#ifdef ENABLE_CDROM_IMAGE_VISO_LOG
+#ifdef ENABLE_IMAGE_VISO_LOG
     strcpy(viso->tf.fn, "viso-debug.iso");
 #else
     plat_tempfile(viso->tf.fn, "viso", ".tmp");
@@ -808,7 +839,7 @@ viso_init(const char *dirname, int *error)
         goto end;
 
     /* Set up directory traversal. */
-    cdrom_image_viso_log("VISO: Traversing directories:\n");
+    image_viso_log(viso->tf.log, "Traversing directories:\n");
     viso_entry_t        *entry;
     viso_entry_t        *last_entry;
     viso_entry_t        *dir;
@@ -830,12 +861,12 @@ viso_init(const char *dirname, int *error)
     strcpy(dir->path, dirname);
     if (stat(dirname, &dir->stats) != 0) {
         /* Use a blank structure if stat failed. */
-        memset(&dir->stats, 0x00, sizeof(struct stat));
+        memset(&dir->stats, 0x00, sizeof(stat_t));
     }
     if (!S_ISDIR(dir->stats.st_mode)) /* root is not a directory */
         goto end;
     dir->parent = dir; /* for the root's path table and .. entries */
-    cdrom_image_viso_log("[%08X] %s => [root]\n", dir, dir->path);
+    image_viso_log(viso->tf.log, "[%08X] %s => [root]\n", dir, dir->path);
 
     /* Traverse directories, starting with the root. */
     viso_entry_t **dir_entries     = NULL;
@@ -879,13 +910,14 @@ viso_init(const char *dirname, int *error)
             /* Stat the current directory or parent directory. */
             if (stat(children_count ? dir->parent->path : dir->path, &entry->stats) != 0) {
                 /* Use a blank structure if stat failed. */
-                memset(&entry->stats, 0x00, sizeof(struct stat));
+                memset(&entry->stats, 0x00, sizeof(stat_t));
             }
 
             /* Set basename. */
             strcpy(entry->name_short, children_count ? ".." : ".");
 
-            cdrom_image_viso_log("[%08X] %s => %s\n", entry, dir->path, entry->name_short);
+            image_viso_log(viso->tf.log, "[%08X] %s => %s\n", entry,
+                           dir->path, entry->name_short);
         }
 
         /* Iterate through this directory's children again, making the entries. */
@@ -893,12 +925,16 @@ viso_init(const char *dirname, int *error)
             rewinddir(dirp);
             while ((readdir_entry = readdir(dirp))) {
                 /* Ignore . and .. pseudo-directories. */
-                if ((readdir_entry->d_name[0] == '.') && ((readdir_entry->d_name[1] == '\0') || (*((uint16_t *) &readdir_entry->d_name[1]) == '.')))
+                if ((readdir_entry->d_name[0] == '.') &&
+                    ((readdir_entry->d_name[1] == '\0') ||
+                    (*((uint16_t *) &readdir_entry->d_name[1]) == '.')))
                     continue;
 
                 /* Add and fill entry. */
-                entry = dir_entries[children_count++] = (viso_entry_t *) calloc(1, sizeof(viso_entry_t) + dir_path_len + strlen(readdir_entry->d_name) + 2);
-                if (!entry)
+                entry = dir_entries[children_count++] =
+                    (viso_entry_t *) calloc(1, sizeof(viso_entry_t) +
+                        dir_path_len + strlen(readdir_entry->d_name) + 2);
+                if (entry == NULL)
                     break;
                 entry->parent = dir;
                 strcpy(entry->path, dir->path);
@@ -909,7 +945,7 @@ viso_init(const char *dirname, int *error)
                 /* Stat this child. */
                 if (stat(entry->path, &entry->stats) != 0) {
                     /* Use a blank structure if stat failed. */
-                    memset(&entry->stats, 0x00, sizeof(struct stat));
+                    memset(&entry->stats, 0x00, sizeof(stat_t));
                 }
 
                 /* Handle file size and El Torito boot code. */
@@ -968,10 +1004,12 @@ have_eltorito_entry:
                     continue;
                 }
 
-                cdrom_image_viso_log("[%08X] %s => [%-12s] %s\n", entry, dir->path, entry->name_short, entry->basename);
+                image_viso_log(viso->tf.log, "[%08X] %s => [%-12s] %s\n", entry,
+                               dir->path, entry->name_short, entry->basename);
             }
         } else {
-            cdrom_image_viso_log("VISO: Failed to enumerate [%s], will be empty\n", dir->path);
+            image_viso_log(viso->tf.log, "Failed to enumerate [%s], will be empty\n",
+                           dir->path);
         }
 
         /* Add terminator. */
@@ -1008,8 +1046,15 @@ next_dir:
        the timezone offset for descriptors and file times to use. */
     tzset();
     time_t now = time(NULL);
-    if (viso->format & VISO_FORMAT_ISO) /* timezones are ISO only */
-        tz_offset = (now - mktime(gmtime(&now))) / (3600 / 4);
+    struct tm now_tm;
+    if (viso->format & VISO_FORMAT_ISO) { /* timezones are ISO only */
+#ifdef _WIN32
+        gmtime_s(&now_tm, &now);  // Windows: output first param, input second
+#else
+        gmtime_r(&now, &now_tm);  // POSIX: input first param, output second
+#endif
+        tz_offset = (now - mktime(&now_tm)) / (3600 / 4);
+    }
 
     /* Get root directory basename for the volume ID. */
     const char *basename = path_get_filename(viso->root_dir->path);
@@ -1125,13 +1170,17 @@ next_dir:
         /* Write El Torito boot descriptor. This is an awkward spot for
            that, but the spec requires it to be the second descriptor. */
         if (!i && eltorito_entry) {
-            cdrom_image_viso_log("VISO: Writing El Torito boot descriptor for entry [%08X]\n", eltorito_entry);
+            image_viso_log(viso->tf.log, "Writing El Torito boot descriptor for "
+                           "entry [%08X]\n", eltorito_entry);
 
             p = data;
             if (!(viso->format & VISO_FORMAT_ISO))
-                VISO_LBE_32(p, ftello64(viso->tf.fp) / viso->sector_size);    /* sector offset (HSF only) */
-            *p++ = 0;                                                           /* type */
-            memcpy(p, (viso->format & VISO_FORMAT_ISO) ? "CD001" : "CDROM", 5); /* standard ID */
+                /* Sector offset (HSF only). */
+                VISO_LBE_32(p, ftello64(viso->tf.fp) / viso->sector_size);
+            /* Type. */
+            *p++ = 0;
+            /* Standard ID. */
+            memcpy(p, (viso->format & VISO_FORMAT_ISO) ? "CD001" : "CDROM", 5);
             p += 5;
             *p++ = 1; /* version */
 
@@ -1232,7 +1281,7 @@ next_dir:
 
     /* Write each path table. */
     for (int i = 0; i <= ((max_vd << 1) | 1); i++) {
-        cdrom_image_viso_log("VISO: Generating path table #%d:\n", i);
+        image_viso_log(viso->tf.log, "Generating path table #%d:\n", i);
 
         /* Save this path table's start offset. */
         uint64_t pt_start = ftello64(viso->tf.fp);
@@ -1253,7 +1302,9 @@ next_dir:
                 continue;
             }
 
-            cdrom_image_viso_log("[%08X] %s => %s\n", dir, dir->path, ((i & 2) || (dir == viso->root_dir)) ? dir->basename : dir->name_short);
+            image_viso_log(viso->tf.log, "[%08X] %s => %s\n", dir,
+                           dir->path, ((i & 2) || (dir == viso->root_dir)) ? dir->basename :
+                           dir->name_short);
 
             /* Save this directory's path table index and offset. */
             dir->pt_idx        = pt_idx;
@@ -1321,7 +1372,7 @@ next_dir:
     /* Write directory records for each type. */
     int dir_type = VISO_DIR_CURRENT_ROOT;
     for (int i = 0; i <= max_vd; i++) {
-        cdrom_image_viso_log("VISO: Generating directory record set #%d:\n", i);
+        image_viso_log(viso->tf.log, "Generating directory record set #%d:\n", i);
 
         /* Go through directories. */
         dir = viso->root_dir;
@@ -1364,8 +1415,10 @@ next_dir:
                 if ((entry == eltorito_entry) || (entry == eltorito_dir))
                     goto next_entry;
 
-                cdrom_image_viso_log("[%08X] %s => %s\n", entry, dir->path,
-                                     ((dir_type == VISO_DIR_PARENT) ? ".." : ((dir_type < VISO_DIR_PARENT) ? "." : (i ? entry->basename : entry->name_short))));
+                image_viso_log(viso->tf.log, "[%08X] %s => %s\n", entry, dir->path,
+                               ((dir_type == VISO_DIR_PARENT) ? ".." :
+                               ((dir_type < VISO_DIR_PARENT) ? "." :
+                                (i ? entry->basename : entry->name_short))));
 
                 /* Fill directory record. */
                 viso_fill_dir_record(data, entry, viso, dir_type);
@@ -1432,7 +1485,8 @@ next_entry:
     /* Allocate entry map for sector->file lookups. */
     size_t orig_sector_size = viso->sector_size;
     while (1) {
-        cdrom_image_viso_log("VISO: Allocating entry map for %d %d-byte sectors\n", viso->entry_map_size, viso->sector_size);
+        image_viso_log(viso->tf.log, "Allocating entry map for %zu %zu-byte sectors\n",
+                       viso->entry_map_size, viso->sector_size);
         viso->entry_map = (viso_entry_t **) calloc(viso->entry_map_size, sizeof(viso_entry_t *));
         if (viso->entry_map) {
             /* Successfully allocated. */
@@ -1444,7 +1498,7 @@ next_entry:
 
             /* If we don't have enough memory, double the sector size. */
             viso->sector_size *= 2;
-            if (viso->sector_size == 0) /* give up if sectors become too large */
+            if ((viso->sector_size < VISO_SECTOR_SIZE) || (viso->sector_size > (1 << 30))) /* give up if sectors become too large */
                 goto end;
 
             /* Go through files, recalculating the entry map size. */
@@ -1473,7 +1527,7 @@ next_entry:
     viso->all_sectors      = viso->metadata_sectors;
 
     /* Go through files, assigning sectors to them. */
-    cdrom_image_viso_log("VISO: Assigning sectors to files:\n");
+    image_viso_log(viso->tf.log, "Assigning sectors to files:\n");
     size_t        base_factor  = viso->sector_size / orig_sector_size;
     viso_entry_t *prev_entry   = viso->root_dir;
     viso_entry_t **entry_map_p = viso->entry_map;
@@ -1515,10 +1569,11 @@ next_entry:
         entry->data_offset = ((uint64_t) viso->all_sectors) * viso->sector_size;
 
         /* Determine how many sectors this file will take. */
-        uint32_t size = entry->stats.st_size / viso->sector_size;
+        size_t size = entry->stats.st_size / viso->sector_size;
         if (entry->stats.st_size % viso->sector_size)
             size++; /* round up to the next sector */
-        cdrom_image_viso_log("[%08X] %s => %" PRIu32 " + %" PRIu32 " sectors\n", entry, entry->path, viso->all_sectors, size);
+        image_viso_log(viso->tf.log, "[%08X] %s => %zu + %zu sectors\n", entry,
+                       entry->path, viso->all_sectors, size);
 
         /* Allocate sectors to this file. */
         viso->all_sectors += size;
@@ -1537,20 +1592,21 @@ next_entry:
         viso_pwrite(data, viso->vol_size_offsets[i], 8, 1, viso->tf.fp);
 
     /* Metadata processing is finished, read it back to memory. */
-    cdrom_image_viso_log("VISO: Reading back %d %d-byte sectors of metadata\n", viso->metadata_sectors, viso->sector_size);
+    image_viso_log(viso->tf.log, "Reading back %zu %zu-byte sectors of metadata\n",
+                   viso->metadata_sectors, viso->sector_size);
     viso->metadata = (uint8_t *) calloc(viso->metadata_sectors, viso->sector_size);
-    if (!viso->metadata)
+    if (viso->metadata == NULL)
         goto end;
     fseeko64(viso->tf.fp, 0, SEEK_SET);
-    uint64_t metadata_size = viso->metadata_sectors * viso->sector_size;
-    uint64_t metadata_remain = metadata_size;
+    size_t metadata_size = viso->metadata_sectors * viso->sector_size;
+    size_t metadata_remain = metadata_size;
     while (metadata_remain > 0)
         metadata_remain -= fread(viso->metadata + (metadata_size - metadata_remain), 1, MIN(metadata_remain, viso->sector_size), viso->tf.fp);
 
     /* We no longer need the temporary file; close and delete it. */
     fclose(viso->tf.fp);
     viso->tf.fp = NULL;
-#ifndef ENABLE_CDROM_IMAGE_VISO_LOG
+#ifndef ENABLE_IMAGE_VISO_LOG
     remove(nvr_path(viso->tf.fn));
 #endif
 
@@ -1561,16 +1617,20 @@ end:
     /* Set the function pointers. */
     viso->tf.priv = viso;
     if (!*error) {
-        cdrom_image_viso_log("VISO: Initialized\n");
+        image_viso_log(viso->tf.log, "Initialized\n");
+
         viso->tf.read       = viso_read;
         viso->tf.get_length = viso_get_length;
         viso->tf.close      = viso_close;
+
         return &viso->tf;
     } else {
-        cdrom_image_viso_log("VISO: Initialization failed\n");
-        if (data)
-            free(data);
-        viso_close(&viso->tf);
+        if (viso != NULL) {
+            image_viso_log(viso->tf.log, "Initialization failed\n");
+            if (data)
+                free(data);
+            viso_close(&viso->tf);
+        }
         return NULL;
     }
 }
diff --git a/src/cdrom/cdrom_mitsumi.c b/src/cdrom/cdrom_mitsumi.c
index 7f4d2645b..47501c25c 100644
--- a/src/cdrom/cdrom_mitsumi.c
+++ b/src/cdrom/cdrom_mitsumi.c
@@ -8,11 +8,11 @@
  *
  *          Mitsumi CD-ROM emulation for the ISA bus.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
- *          Copyright 2022 Miran Grca.
+ *          Copyright 2022       Miran Grca.
+ *          Copyright 2024-2025 Jasmine Iwanek.
  */
 #include <inttypes.h>
 #include <stdarg.h>
@@ -33,10 +33,6 @@
 #include <86box/plat.h>
 #include <86box/sound.h>
 
-#define MCD_DEFAULT_IOPORT 0x310
-#define MCD_DEFAULT_IRQ    5
-#define MCD_DEFAULT_DMA    5
-
 #define RAW_SECTOR_SIZE    2352
 #define COOKED_SECTOR_SIZE 2048
 
@@ -116,15 +112,9 @@ typedef struct mcd_t {
     int      cur_toc_track;
     int      pos;
     int      newstat;
-} mcd_t;
 
-/* The addresses sent from the guest are absolute, ie. a LBA of 0 corresponds to a MSF of 00:00:00. Otherwise, the counter displayed by the guest is wrong:
-   there is a seeming 2 seconds in which audio plays but counter does not move, while a data track before audio jumps to 2 seconds before the actual start
-   of the audio while audio still plays. With an absolute conversion, the counter is fine. */
-#ifdef MSFtoLBA
-#undef MSFtoLBA
-#endif
-#define MSFtoLBA(m, s, f) ((((m * 60) + s) * 75) + f)
+    cdrom_t *cdrom_dev;
+} mcd_t;
 
 #define CD_BCD(x)         (((x) % 10) | (((x) / 10) << 4))
 #define CD_DCB(x)         ((((x) &0xf0) >> 4) * 10 + ((x) &0x0f))
@@ -147,14 +137,16 @@ mitsumi_cdrom_log(const char *fmt, ...)
 #    define mitsumi_cdrom_log(fmt, ...)
 #endif
 
+static int
+mitsumi_cdrom_is_ready(const mcd_t *dev)
+{
+    return (dev->cdrom_dev->image_path[0] != 0x00);
+}
+
 static void
 mitsumi_cdrom_reset(mcd_t *dev)
 {
-    cdrom_t cdrom;
-    
-    cdrom.host_drive = 0;
-
-    dev->stat          = cdrom.host_drive ? (STAT_READY | STAT_CHANGE) : 0;
+    dev->stat          = mitsumi_cdrom_is_ready(dev) ? (STAT_READY | STAT_CHANGE) : 0;
     dev->cmdrd_count   = 0;
     dev->cmdbuf_count  = 0;
     dev->buf_count     = 0;
@@ -172,12 +164,11 @@ mitsumi_cdrom_reset(mcd_t *dev)
 static int
 mitsumi_cdrom_read_sector(mcd_t *dev, int first)
 {
-    cdrom_t  cdrom;
     uint8_t  status;
-    int      ret;
+    int      ret = 0;
 
     if (dev->drvmode == DRV_MODE_CDDA) {
-        status = cdrom_mitsumi_audio_play(&cdrom, dev->readmsf, dev->readcount);
+        status = cdrom_mitsumi_audio_play(dev->cdrom_dev, dev->readmsf, dev->readcount);
         if (status == 1)
             return status;
         else
@@ -191,15 +182,15 @@ mitsumi_cdrom_read_sector(mcd_t *dev, int first)
         dev->data = 0;
         return 0;
     }
-    cdrom_stop(&cdrom);
-    ret = cdrom_readsector_raw(&cdrom, dev->buf, cdrom.seek_pos, 0, 2, 0x10, (int *) &dev->readcount, 0);
-    if (!ret)
+    cdrom_stop(dev->cdrom_dev);
+    ret = cdrom_readsector_raw(dev->cdrom_dev, dev->buf, dev->cdrom_dev->seek_pos, 0, 2, 0x10, (int *) &dev->readcount, 0);
+    if (ret <= 0)
         return 0;
     if (dev->mode & 0x40) {
         dev->buf[12] = CD_BCD((dev->readmsf >> 16) & 0xff);
         dev->buf[13] = CD_BCD((dev->readmsf >> 8) & 0xff);
     }
-    dev->readmsf   = cdrom_lba_to_msf_accurate(cdrom.seek_pos + 1);
+    dev->readmsf   = cdrom_lba_to_msf_accurate(dev->cdrom_dev->seek_pos + 1);
     dev->buf_count = dev->dmalen + 1;
     dev->buf_idx   = 0;
     dev->data      = 1;
@@ -220,7 +211,7 @@ static uint8_t
 mitsumi_cdrom_in(uint16_t port, void *priv)
 {
     mcd_t  *dev = (mcd_t *) priv;
-    uint8_t ret;
+    uint8_t ret = 0xff;
 
     pclog("Mitsumi CD-ROM IN=%03x\n", port);
     switch (port & 1) {
@@ -255,14 +246,13 @@ mitsumi_cdrom_in(uint16_t port, void *priv)
             break;
     }
 
-    return 0xff;
+    return ret;
 }
 
 static void
 mitsumi_cdrom_out(uint16_t port, uint8_t val, void *priv)
 {
     mcd_t   *dev   = (mcd_t *) priv;
-    cdrom_t cdrom;
 
     pclog("Mitsumi CD-ROM OUT=%03x, val=%02x\n", port, val);
     switch (port & 1) {
@@ -344,19 +334,19 @@ mitsumi_cdrom_out(uint16_t port, uint8_t val, void *priv)
                         break;
                 }
                 if (!dev->cmdrd_count)
-                    dev->stat = cdrom.host_drive ? (STAT_READY | (dev->change ? STAT_CHANGE : 0)) : 0;
+                    dev->stat = mitsumi_cdrom_is_ready(dev) ? (STAT_READY | (dev->change ? STAT_CHANGE : 0)) : 0;
                 return;
             }
             dev->cmd          = val;
             dev->cmdbuf_idx   = 0;
             dev->cmdrd_count  = 0;
             dev->cmdbuf_count = 1;
-            dev->cmdbuf[0]    = cdrom.host_drive ? (STAT_READY | (dev->change ? STAT_CHANGE : 0)) : 0;
+            dev->cmdbuf[0]    = mitsumi_cdrom_is_ready(dev) ? (STAT_READY | (dev->change ? STAT_CHANGE : 0)) : 0;
             dev->data         = 0;
             switch (val) {
                 case CMD_GET_INFO:
-                    if (cdrom.host_drive) {
-                        cdrom_get_track_buffer(&cdrom, &(dev->cmdbuf[1]));
+                    if (mitsumi_cdrom_is_ready(dev)) {
+                        cdrom_get_track_buffer(dev->cdrom_dev, &(dev->cmdbuf[1]));
                         dev->cmdbuf_count = 10;
                         dev->readcount    = 0;
                     } else {
@@ -365,8 +355,8 @@ mitsumi_cdrom_out(uint16_t port, uint8_t val, void *priv)
                     }
                     break;
                 case CMD_GET_Q:
-                    if (cdrom.host_drive) {
-                        cdrom_get_q(&cdrom, &(dev->cmdbuf[1]), &dev->cur_toc_track, dev->mode & MODE_GET_TOC);
+                    if (mitsumi_cdrom_is_ready(dev)) {
+                        cdrom_get_q(cdrom, &(dev->cmdbuf[1]), &dev->cur_toc_track, dev->mode & MODE_GET_TOC);
                         dev->cmdbuf_count = 11;
                         dev->readcount    = 0;
                     } else {
@@ -382,7 +372,7 @@ mitsumi_cdrom_out(uint16_t port, uint8_t val, void *priv)
                     break;
                 case CMD_STOPCDDA:
                 case CMD_STOP:
-                    cdrom_stop(&cdrom);
+                    cdrom_stop(dev->cdrom_dev);
                     dev->drvmode       = DRV_MODE_STOP;
                     dev->cur_toc_track = 0;
                     break;
@@ -391,7 +381,7 @@ mitsumi_cdrom_out(uint16_t port, uint8_t val, void *priv)
                     break;
                 case CMD_READ1X:
                 case CMD_READ2X:
-                    if (cdrom.host_drive) {
+                    if (mitsumi_cdrom_is_ready(dev)) {
                         dev->readcount   = 0;
                         dev->drvmode     = (val == CMD_READ1X) ? DRV_MODE_CDDA : DRV_MODE_READ;
                         dev->cmdrd_count = 6;
@@ -407,7 +397,7 @@ mitsumi_cdrom_out(uint16_t port, uint8_t val, void *priv)
                     dev->cmdbuf_count = 3;
                     break;
                 case CMD_EJECT:
-                    cdrom_stop(&cdrom);
+                    cdrom_stop(dev->cdrom_dev);
                     cdrom_eject(0);
                     dev->readcount = 0;
                     break;
@@ -436,15 +426,25 @@ mitsumi_cdrom_out(uint16_t port, uint8_t val, void *priv)
 static void *
 mitsumi_cdrom_init(UNUSED(const device_t *info))
 {
-    mcd_t *dev;
+    mcd_t *dev = calloc(1, sizeof(mcd_t));
 
-    dev = malloc(sizeof(mcd_t));
-    memset(dev, 0x00, sizeof(mcd_t));
+    for (uint8_t i = 0; i < CDROM_NUM; i++) {
+        if (cdrom[i].bus_type == CDROM_BUS_MITSUMI) {
+            dev->cdrom_dev = &cdrom[i];
+            break;
+        }
+    }
 
-    dev->irq = MCD_DEFAULT_IRQ;
-    dev->dma = MCD_DEFAULT_DMA;
+    if (!dev->cdrom_dev)
+        return NULL;
 
-    io_sethandler(MCD_DEFAULT_IOPORT, 3,
+    dev->cdrom_dev->priv = &dev;
+
+    uint16_t base = device_get_config_hex16("base");
+    dev->irq  = device_get_config_int("irq");
+    dev->dma  = device_get_config_int("dma");
+
+    io_sethandler(base, 3,
                   mitsumi_cdrom_in, NULL, NULL, mitsumi_cdrom_out, NULL, NULL, dev);
 
     mitsumi_cdrom_reset(dev);
@@ -463,16 +463,74 @@ mitsumi_cdrom_close(void *priv)
     }
 }
 
+static const device_config_t mitsumi_config[] = {
+    // clang-format off
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x310,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "300H", .value = 0x300 },
+            { .description = "310H", .value = 0x310 },
+            { .description = "320H", .value = 0x320 },
+            { .description = "340H", .value = 0x340 },
+            { .description = "350H", .value = 0x350 },
+            { NULL                                  }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 3",  .value =  3 },
+            { .description = "IRQ 5",  .value =  5 },
+            { .description = "IRQ 9",  .value =  9 },
+            { .description = "IRQ 10", .value = 10 },
+            { .description = "IRQ 11", .value = 11 },
+            { .description = ""                    }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "dma",
+        .description    = "DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "DMA 5", .value = 5 },
+            { .description = "DMA 6", .value = 6 },
+            { .description = "DMA 7", .value = 7 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+// clang-format off
+};
+
 const device_t mitsumi_cdrom_device = {
     .name          = "Mitsumi CD-ROM interface",
     .internal_name = "mcd",
-    .flags         = DEVICE_ISA | DEVICE_AT,
-    .local         = 1,
+    .flags         = DEVICE_ISA16,
+    .local         = 0,
     .init          = mitsumi_cdrom_init,
     .close         = mitsumi_cdrom_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
-    .config        = NULL
+    .config        = mitsumi_config
 };
diff --git a/src/cdrom/cdrom_mke.c b/src/cdrom/cdrom_mke.c
new file mode 100644
index 000000000..98ae6c057
--- /dev/null
+++ b/src/cdrom/cdrom_mke.c
@@ -0,0 +1,1078 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Panasonic/MKE CD-ROM emulation for the ISA bus.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          Kevin Moonlight, <me@yyzkevin.com>
+ *          Cacodemon345
+ *
+ *          Copyright (C) 2025 Miran Grca.
+ *          Copyright (C) 2025 Cacodemon345.
+ *          Copyright (C) 2024 Kevin Moonlight.
+ */
+#include <inttypes.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdbool.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/pic.h>
+#include <86box/dma.h>
+#include <86box/cdrom.h>
+#include <86box/cdrom_interface.h>
+#include <86box/cdrom_mke.h>
+#include <86box/plat.h>
+#include <86box/ui.h>
+#include <86box/sound.h>
+#include <86box/fifo8.h>
+#include <86box/timer.h>
+#ifdef ENABLE_MKE_LOG
+#include "cpu.h"
+#endif
+
+/*
+https://elixir.bootlin.com/linux/2.0.29/source/include/linux/sbpcd.h
+CR-562-B is classified as Family1 in this driver, so uses the CMD1_ prefix.
+*/
+#define CDROM_STATUS_DOOR         0x80
+#define CDROM_STATUS_DISC_IN      0x40
+#define CDROM_STATUS_SPIN_UP      0x20
+#define CDROM_STATUS_ERROR        0x10
+#define CDROM_STATUS_DOUBLE_SPEED 0x02
+#define CDROM_STATUS_READY        0x01
+
+// Status returned from device
+#define STAT_READY       0x01
+#define STAT_PLAY        0x08
+#define STAT_ERROR       0x10
+#define STAT_DISK        0x40
+#define STAT_TRAY        0x80 // Seems Correct
+
+#define CMD1_PAUSERESUME 0x0D
+#define CMD1_RESET       0x0a
+#define CMD1_LOCK_CTL    0x0c
+#define CMD1_TRAY_CTL    0x07
+#define CMD1_MULTISESS   0x8d
+#define CMD1_SUBCHANINF  0x11
+#define CMD1_ABORT       0x08
+// #define CMD1_PATH_CHECK 0x???
+#define CMD1_SEEK     0x01
+#define CMD1_READ     0x10
+#define CMD1_SPINUP   0x02
+#define CMD1_SPINDOWN 0x06
+#define CMD1_READ_UPC 0x88
+// #define CMD1_PLAY     0x???
+#define CMD1_PLAY_MSF 0x0e
+#define CMD1_PLAY_TI  0x0f
+#define CMD1_STATUS   0x05
+#define CMD1_READ_ERR 0x82
+#define CMD1_READ_VER 0x83
+#define CMD1_SETMODE  0x09
+#define CMD1_GETMODE  0x84
+#define CMD1_CAPACITY 0x85
+#define CMD1_READSUBQ 0x87
+#define CMD1_DISKINFO 0x8b
+#define CMD1_READTOC  0x8c
+#define CMD1_PAU_RES  0x0d
+#define CMD1_PACKET   0x8e
+#define CMD1_SESSINFO 0x8d
+
+typedef struct mke_t {
+    bool       present;
+    bool       tray_open;
+
+    uint8_t    command_buffer[7];
+    uint8_t    command_buffer_pending;
+
+    uint8_t    medium_changed;
+
+    uint8_t    vol0, vol1, patch0, patch1;
+    uint8_t    mode_select[5];
+
+    uint8_t    media_selected; // temporary hack
+
+    Fifo8      data_fifo;
+    Fifo8      info_fifo;
+
+    cdrom_t *  cdrom_dev;
+
+    uint32_t   sector_type;
+    uint32_t   sector_flags;
+
+    uint32_t   unit_attention;
+
+    uint8_t    cdbuffer[624240 * 2];
+
+    uint32_t   data_to_push;
+
+    pc_timer_t timer;
+
+    char       ver[512];
+
+    uint8_t    is_error;
+    uint8_t    sense[8];
+
+    uint8_t    temp_buf[65536];
+} mke_t;
+
+typedef struct mke_interface_t {
+    mke_t      mke[4];
+
+    uint8_t    is_sb;
+
+    uint8_t    drvsel;
+    uint8_t    data_select;
+} mke_interface_t;
+
+#ifdef ENABLE_MKE_LOG
+int mke_do_log = ENABLE_MKE_LOG;
+
+static void
+mke_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (mke_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define mke_log(fmt, ...)
+#endif
+
+#define CHECK_READY()                                       \
+    {                                                       \
+        if (!mke_pre_execution_check(mke))                  \
+            return;                                         \
+    }
+
+#define REPORT_IF_NOT_READY()                                                   \
+    {                                                                           \
+        if (!mke_pre_execution_check(mke)) {                                    \
+            fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke)); \
+        }                                                                       \
+    }
+
+#define CHECK_READY_READ()                                                      \
+    {                                                                           \
+        if (!mke_pre_execution_check(mke)) {                                    \
+            fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke)); \
+            return;                                                             \
+        }                                                                       \
+    }
+
+static void
+mke_update_sense(mke_t *mke, uint8_t error)
+{
+    /* FreeBSD calls this addrval, but what is it? */
+    mke->sense[0] = 0x00;
+    mke->sense[1] = mke->command_buffer[0];
+    mke->sense[2] = error;
+
+    mke->is_error = 1;
+}
+
+static void
+mke_cdrom_insert(void *priv)
+{
+    mke_t *dev = (mke_t *) priv;
+
+    if ((dev == NULL) || (dev->cdrom_dev == NULL))
+        return;
+
+    if (dev->cdrom_dev->ops == NULL) {
+        dev->medium_changed = 0;
+        dev->cdrom_dev->cd_status = CD_STATUS_EMPTY;
+        if (timer_is_enabled(&dev->timer)) {
+            timer_disable(&dev->timer);
+            dev->data_to_push = 0;
+        }
+        mke_log("Media removal\n");
+    } else if (dev->cdrom_dev->cd_status & CD_STATUS_TRANSITION) {
+        dev->medium_changed = 1;
+        /* Turn off the medium changed status. */
+        dev->cdrom_dev->cd_status &= ~CD_STATUS_TRANSITION;
+        mke_log("Media insert\n");
+    } else {
+        dev->medium_changed = 0;
+        dev->cdrom_dev->cd_status |= CD_STATUS_TRANSITION;
+        mke_log("Media transition\n");
+    }
+}
+
+static int
+mke_pre_execution_check(mke_t *mke)
+{
+    int ready = 1;
+
+    if ((mke->cdrom_dev->cd_status == CD_STATUS_PLAYING) ||
+        (mke->cdrom_dev->cd_status == CD_STATUS_PAUSED)) {
+        ready = 1;
+        goto skip_ready_check;
+    }
+
+    if (mke->cdrom_dev->cd_status & CD_STATUS_TRANSITION) {
+        if (mke->command_buffer[0] == 0x82)
+            ready = 0;
+        else {
+            mke_cdrom_insert(mke);
+
+            ready = ((mke->cdrom_dev->cd_status != CD_STATUS_EMPTY) && (mke->cdrom_dev->cd_status != CD_STATUS_DVD_REJECTED));
+        }
+    } else
+        ready = ((mke->cdrom_dev->cd_status != CD_STATUS_EMPTY) && (mke->cdrom_dev->cd_status != CD_STATUS_DVD_REJECTED));
+
+skip_ready_check:
+    /*
+       If the drive is not ready, there is no reason to keep the
+       UNIT ATTENTION condition present, as we only use it to mark
+       disc changes.
+     */
+    if (!ready && (mke->medium_changed > 0))
+        mke->medium_changed = 0;
+
+    /*
+       If the UNIT ATTENTION condition is set and the command does not allow
+       execution under it, error out and report the condition.
+     */
+    if (mke->medium_changed == 1) {
+        /*
+           Only increment the unit attention phase if the command can
+           not pass through it.
+         */
+        mke_log("Unit attention now 2\n");
+        mke->medium_changed++;
+        mke_update_sense(mke, 0x11);                                        \
+        return 0;
+    } else if (mke->medium_changed == 2) {
+        if (mke->command_buffer[0] != 0x82) {
+            mke_log("Unit attention now 0\n");
+            mke->medium_changed = 0;
+        }
+    }
+
+    /*
+       Unless the command is REQUEST SENSE, clear the sense. This will *NOT* clear
+       the UNIT ATTENTION condition if it's set.
+     */
+    if (mke->command_buffer[0] != 0x82) {
+        memset(mke->sense, 0x00, 8);
+        mke->is_error = 0;
+    }
+
+    if (!ready && (mke->command_buffer[0] != 0x05)) {
+        mke_log("Not ready (%02X)\n", mke->command_buffer[0]);
+        mke_update_sense(mke, 0x03);
+        return 0;
+    }
+
+    return 1;
+}
+
+uint8_t
+mke_cdrom_status(cdrom_t *dev, mke_t *mke)
+{
+    uint8_t status = 0;
+    /*
+       This bit seems to always be set?
+       Bit 4 never set?
+     */
+    status |= 2;
+    if (dev->cd_status == CD_STATUS_PLAYING)
+        status |= STAT_PLAY;
+    if (dev->cd_status == CD_STATUS_PAUSED)
+        status |= STAT_PLAY;
+    if (mke->is_error)
+        status |= 0x10;
+    /* Always set? */
+    status |= 0x20;
+    status |= STAT_TRAY;
+    if (mke->cdrom_dev->cd_status != CD_STATUS_EMPTY) {
+        status |= STAT_DISK;
+        status |= STAT_READY;
+    }
+
+    return status;
+}
+
+void
+mke_get_subq(mke_t *mke, uint8_t *b)
+{
+    cdrom_t *dev = mke->cdrom_dev;
+
+    cdrom_get_current_subchannel_sony(dev, mke->temp_buf, 1);
+    /* ? */
+    b[0]  = 0x80;
+    b[1]  = ((mke->temp_buf[0] & 0xf) << 4) | ((mke->temp_buf[0] & 0xf0) >> 4);
+    b[2]  = mke->temp_buf[1];
+    b[3]  = mke->temp_buf[2];
+    b[4]  = mke->temp_buf[6];
+    b[5]  = mke->temp_buf[7];
+    b[6]  = mke->temp_buf[8];
+    b[7]  = mke->temp_buf[3];
+    b[8]  = mke->temp_buf[4];
+    b[9]  = mke->temp_buf[5];
+    /* ? */
+    b[10] = 0;
+    mke_log("mke_get_subq: 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X\n",
+            b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7], b[8], b[9], b[10]);
+}
+
+/* Lifted from FreeBSD */
+static void
+blk_to_msf(int blk, unsigned char *msf)
+{
+    blk = blk + 150;        /* 2 seconds skip required to
+                               reach ISO data */
+    msf[0] = blk / 4500;
+    blk = blk % 4500;
+    msf[1] = blk / 75;
+    msf[2] = blk % 75;
+
+    return;
+}
+
+uint8_t
+mke_read_toc(mke_t *mke, unsigned char *b, uint8_t track) {
+    cdrom_t      *dev            = mke->cdrom_dev;
+#if 0
+    track_info_t  ti;
+    int           last_track;
+#endif
+    const raw_track_info_t *trti = (raw_track_info_t *) mke->temp_buf;
+    int           num            = 0;
+    int           ret            = 0;
+
+    dev->ops->get_raw_track_info(dev->local, &num, mke->temp_buf);
+
+    if (num > 0) {
+        if (track == 0xaa)
+            track = 0xa2;
+
+        int trk = - 1;
+
+        for (int i = (num - 1); i >= 0; i--) {
+            if (trti[i].point == track) {
+                trk = i;
+                break;
+            }
+        }
+
+        if (trk != -1) {
+            b[0] = 0;
+            b[1] = trti[trk].adr_ctl;
+            b[2] = (trti[trk].point == 0xa2) ? 0xaa : trti[trk].point;
+            b[3] = 0;
+            b[4] = trti[trk].pm;
+            b[5] = trti[trk].ps;
+            b[6] = trti[trk].pf;
+            b[7] = 0;
+
+            ret  = 1;
+        }
+
+        mke_log("mke_read_toc: 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X\n",
+                b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7]);
+    }
+
+    return ret;
+}
+
+
+uint8_t
+mke_disc_info(mke_t *mke, unsigned char *b)
+{
+    cdrom_t *dev               = mke->cdrom_dev;
+    uint8_t  disc_type_buf[34];
+    int      first_track;
+    int      last_track;
+
+    cdrom_read_toc(dev, mke->temp_buf, CD_TOC_NORMAL, 0, 2 << 8, 65536);
+    cdrom_read_disc_information(dev, disc_type_buf);
+    first_track = mke->temp_buf[2];
+    last_track  = mke->temp_buf[3];
+
+    b[0] = disc_type_buf[8];
+    b[1] = first_track;
+    b[2] = last_track;
+    b[3] = 0;
+    b[4] = 0;
+    b[5] = 0;
+    blk_to_msf(dev->cdrom_capacity, &b[3]);
+    mke_log("mke_disc_info: 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X\n",
+            b[0], b[1], b[2], b[3], b[4], b[5]);
+    return 1;
+}
+
+uint8_t
+mke_disc_capacity(cdrom_t *dev, unsigned char *b)
+{
+    b[0] = 0x00;
+    b[1] = 0x00;
+    b[2] = 0x00;
+    b[3] = 0x08;
+    b[4] = 0x00;
+
+    blk_to_msf(dev->cdrom_capacity, &b[0]);
+    mke_log("mke_disc_capacity: 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X\n",
+            b[0], b[1], b[2], b[3], b[4]);
+    return 1;
+}
+
+void
+mke_read_multisess(mke_t *mke)
+{
+    cdrom_t      *dev            = mke->cdrom_dev;
+    uint8_t      *b              = (uint8_t *) &(mke->temp_buf[32768]);
+    const raw_track_info_t *trti = (raw_track_info_t *) mke->temp_buf;
+    int           num            = 0;
+    int           first_sess     = 0;
+    int           last_sess      = 0;
+
+    dev->ops->get_raw_track_info(dev->local, &num, mke->temp_buf);
+
+    if (num > 0) {
+        int trk = - 1;
+
+        for (int i = 0; i < num; i++) {
+            if (trti[i].point == 0xa2) {
+                first_sess = trti[i].session;
+                break;
+            }
+        }
+
+        for (int i = (num - 1); i >= 0; i--) {
+            if (trti[i].point == 0xa2) {
+                last_sess = trti[i].session;
+                break;
+            }
+        }
+
+        for (int i = 0; i < num; i++) {
+            if ((trti[i].point >= 1) && (trti[i].point >= 99) &&
+                (trti[i].session == last_sess)) {
+                trk = i;
+                break;
+            }
+        }
+
+        if ((first_sess > 0) && (last_sess < 0) && (trk != -1)) {
+            b[0] = (first_sess == last_sess) ? 0x00 : 0x80;
+            b[1] = trti[trk].pm;
+            b[2] = trti[trk].ps;
+            b[3] = trti[trk].pf;
+            b[4] = 0;
+            b[5] = 0;
+        }
+
+        fifo8_push_all(&mke->info_fifo, b, 6);
+
+        mke_log("mke_read_multisess: 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X\n",
+                b[0], b[1], b[2], b[3], b[4], b[5]);
+    } else {
+        memset(b, 0x00, 6);
+        fifo8_push_all(&mke->info_fifo, b, 6);
+    }
+}
+
+static void
+mke_reset(mke_t *mke)
+{
+    cdrom_stop(mke->cdrom_dev);
+    timer_disable(&mke->timer);
+    mke->sector_type            = 0x08 | (1 << 4);
+    mke->sector_flags           = 0x10;
+    memset(mke->mode_select, 0, 5);
+    mke->mode_select[2]         = 0x08;
+    mke->patch0                 = 0x01;
+    mke->patch1                 = 0x02;
+    mke->vol0                   = 255;
+    mke->vol1                   = 255;
+    mke->cdrom_dev->sector_size = 2048;
+}
+
+void
+mke_command_callback(void *priv)
+{
+    mke_t *mke = (mke_t *) priv;
+
+    switch (mke->command_buffer[0]) {
+        case CMD1_SEEK: {
+            fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+            break;
+        }
+        case CMD1_READ: {
+            fifo8_push_all(&mke->data_fifo, mke->cdbuffer, mke->data_to_push);
+            fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+            mke->data_to_push = 0;
+            ui_sb_update_icon(SB_CDROM | mke->cdrom_dev->id, 0);
+            break;
+        }
+    }
+}
+
+void
+mke_command(mke_t *mke, uint8_t value)
+{
+    uint16_t     i;
+    /* This is wasteful handling of buffers for compatibility, but will optimize later. */
+    uint8_t      x[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+    int          old_cd_status;
+
+    if (mke->command_buffer_pending) {
+        mke->command_buffer[6 - mke->command_buffer_pending + 1] = value;
+        mke->command_buffer_pending--;
+    }
+
+    if (mke->command_buffer[0] == CMD1_ABORT) {
+        mke_log("CMD_ABORT\n");
+        fifo8_reset(&mke->info_fifo);
+        fifo8_reset(&mke->data_fifo);
+        timer_disable(&mke->timer);
+        mke->command_buffer[0]      = 0;
+        mke->command_buffer_pending = 7;
+        fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+    }
+
+    if (!mke->command_buffer_pending && mke->command_buffer[0]) {
+        mke->command_buffer_pending = 7;
+        mke_log("mke_command: 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X\n",
+                mke->command_buffer[0], mke->command_buffer[1],
+                mke->command_buffer[2], mke->command_buffer[3],
+                mke->command_buffer[4], mke->command_buffer[5],
+                mke->command_buffer[6]);
+        switch (mke->command_buffer[0]) {
+            case 0x03:
+                fifo8_reset(&mke->info_fifo);
+                cdrom_stop(mke->cdrom_dev);
+                fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                break;
+            case 0x06:
+                fifo8_reset(&mke->info_fifo);
+                cdrom_stop(mke->cdrom_dev);
+                cdrom_eject(mke->cdrom_dev->id);
+                fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                break;
+            case 0x07:
+                fifo8_reset(&mke->info_fifo);
+                cdrom_reload(mke->cdrom_dev->id);
+                fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                break;
+            case CMD1_RESET:
+                mke_reset(mke);
+                break;
+            case CMD1_READ: {
+                uint32_t count = mke->command_buffer[6];
+                uint8_t *buf   = mke->cdbuffer;
+                int      res   = 0;
+                uint64_t lba   = MSFtoLBA(mke->command_buffer[1], mke->command_buffer[2],
+                                          mke->command_buffer[3]) - 150;
+                int      len __attribute__((unused)) = 0;
+
+                CHECK_READY_READ();
+                mke->data_to_push = 0;
+
+                while (count) {
+                    if ((res = cdrom_readsector_raw(mke->cdrom_dev, buf, lba, 0,
+                                                    mke->sector_type, mke->sector_flags, &len, 0)) > 0) {
+                        lba++;
+                        buf += mke->cdrom_dev->sector_size;
+                        mke->data_to_push += mke->cdrom_dev->sector_size;
+                    } else {
+                        mke_update_sense(mke, (res == 0) ? 0x10 : 0x05);
+                        fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                        break;
+                    }
+                    count--;
+                }
+                if (count != 0) {
+                    fifo8_reset(&mke->data_fifo);
+                    mke->data_to_push = 0;
+                } else {
+                    ui_sb_update_icon(SB_CDROM | mke->cdrom_dev->id, 1);
+                    timer_on_auto(&mke->timer, (1000000.0 / (176400.0 * 2.)) * mke->data_to_push);
+                }
+                break;
+            } case CMD1_READSUBQ:
+                if (mke_pre_execution_check(mke)) {
+                    mke_get_subq(mke, (uint8_t *) &x);
+                }
+                fifo8_reset(&mke->info_fifo);
+                fifo8_push_all(&mke->info_fifo, x, 11);
+                fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                break;
+            case CMD1_SETMODE:
+                /* Returns 1 */
+                fifo8_reset(&mke->info_fifo);
+                mke_log("CMD: SET MODE:");
+                for (i = 0; i < 6; i++) {
+                    mke_log("%02x ", mke->command_buffer[i + 1]);
+                }
+                mke_log("\n");
+                switch (mke->command_buffer[1]) {
+                    case 0:
+                        switch (mke->command_buffer[2]) {
+                            case 0x00: /* Cooked */
+                                mke->sector_type  = 0x08 | (1 << 4);
+                                mke->sector_flags = 0x10;
+                                mke->cdrom_dev->sector_size = 2048;
+                                break;
+                            case 0x81: /* XA */
+                            case 0x01: /* User */ {
+                                uint32_t sector_size = (mke->command_buffer[3] << 8) |
+                                                       mke->command_buffer[4];
+
+                                if (!sector_size) {
+                                    mke_update_sense(mke, 0x0e);
+                                    fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                                    return;
+                                } else {
+                                    switch (sector_size) {
+                                        case 2048:
+                                            mke->sector_type  = 0x08 | (1 << 4);
+                                            mke->sector_flags = 0x10;
+                                            mke->cdrom_dev->sector_size = 2048;
+                                            break;
+                                        case 2052:
+                                            mke->sector_type  = 0x18;
+                                            mke->sector_flags = 0x30;
+                                            mke->cdrom_dev->sector_size = 2052;
+                                            break;
+                                        case 2324:
+                                            mke->sector_type  = 0x1b;
+                                            mke->sector_flags = 0x18;
+                                            mke->cdrom_dev->sector_size = 2324;
+                                            break;
+                                        case 2336:
+                                            mke->sector_type  = 0x1c;
+                                            mke->sector_flags = 0x58;
+                                            mke->cdrom_dev->sector_size = 2336;
+                                            break;
+                                        case 2340:
+                                            mke->sector_type  = 0x18;
+                                            mke->sector_flags = 0x78;
+                                            mke->cdrom_dev->sector_size = 2340;
+                                            break;
+                                        case 2352:
+                                            mke->sector_type  = 0x00;
+                                            mke->sector_flags = 0xf8;
+                                            mke->cdrom_dev->sector_size = 2352;
+                                            break;
+                                        default:
+                                            mke_update_sense(mke, 0x0e);
+                                            fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                                            return;
+                                    }
+                                }
+                                break;
+                            } case 0x82: /* DA */
+                                mke->sector_type  = 0x00;
+                                mke->sector_flags = 0xf8;
+                                mke->cdrom_dev->sector_size = 2352;
+                                break;
+                            default:
+                                mke_update_sense(mke, 0x0e);
+                                fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                                return;
+                        }
+
+                        memcpy(mke->mode_select, &mke->command_buffer[2], 5);
+                        break;
+                    case 5:
+                        mke->vol0 = mke->command_buffer[4];
+                        mke->vol1 = mke->command_buffer[6];
+                        mke->patch0 = mke->command_buffer[3];
+                        mke->patch1 = mke->command_buffer[5];
+                        break;
+                }
+                fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                break;
+            case CMD1_GETMODE:
+                /* 6 */
+                mke_log("GET MODE\n");
+                if (mke->command_buffer[1] == 5) {
+                    uint8_t volsettings[5] = { 0, mke->patch0, mke->vol0, mke->patch1, mke->vol1 };
+                    fifo8_push_all(&mke->info_fifo, volsettings, 5);
+                } else
+                    fifo8_push_all(&mke->info_fifo, mke->mode_select, 5);
+                fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                break;
+            case CMD1_PAUSERESUME:
+                CHECK_READY_READ();
+                cdrom_audio_pause_resume(mke->cdrom_dev, mke->command_buffer[1] >> 7);
+                fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                break;
+            case CMD1_CAPACITY:
+                /* 6 */
+                mke_log("DISK CAPACITY\n");
+                if (mke_pre_execution_check(mke))
+                    mke_disc_capacity(mke->cdrom_dev, (uint8_t *) &x);
+                fifo8_push_all(&mke->info_fifo, x, 5);
+                fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                break;
+            case CMD1_DISKINFO:
+                /* 7 */
+                mke_log("DISK INFO\n");
+                fifo8_reset(&mke->info_fifo);
+                if (mke_pre_execution_check(mke))
+                    mke_disc_info(mke, (uint8_t *) &x);
+                fifo8_push_all(&mke->info_fifo, x, 6);
+                fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                break;
+            case CMD1_READTOC:
+                fifo8_reset(&mke->info_fifo);
+                if (mke_pre_execution_check(mke))
+                    mke_read_toc(mke, (uint8_t *) &x, mke->command_buffer[2]);
+                fifo8_push_all(&mke->info_fifo, x, 8);
+                fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                break;
+            case CMD1_PLAY_TI:
+                /* Index is ignored for now. */
+                fifo8_reset(&mke->info_fifo);
+                CHECK_READY_READ();
+                if (!cdrom_audio_play(mke->cdrom_dev, mke->command_buffer[1], mke->command_buffer[3], 2))
+                    mke_update_sense(mke, 0x10);
+                fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                break;
+            case CMD1_PLAY_MSF:
+                fifo8_reset(&mke->info_fifo);
+                CHECK_READY_READ();
+                mke_log("PLAY MSF:");
+                for (i = 0; i < 6; i++) {
+                    mke_log("%02x ", mke->command_buffer[i + 1]);
+                }
+                mke_log("\n");
+                {
+                    int msf = 1;
+                    int pos = (mke->command_buffer[1] << 16) | (mke->command_buffer[2] << 8) |
+                              mke->command_buffer[3];
+                    int len = (mke->command_buffer[4] << 16) | (mke->command_buffer[5] << 8) |
+                              mke->command_buffer[6];
+                    if (!cdrom_audio_play(mke->cdrom_dev, pos, len, msf)){
+                        mke_update_sense(mke, 0x10);
+                    }
+                    fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                }
+                break;
+            case CMD1_SEEK:
+                old_cd_status = mke->cdrom_dev->cd_status;
+                fifo8_reset(&mke->info_fifo);
+                CHECK_READY_READ();
+                /* TODO: DOES THIS IMPACT CURRENT PLAY LENGTH? */
+                mke_log("SEEK MSF:");
+                for (i = 0; i < 6; i++) {
+                    mke_log("%02x ", mke->command_buffer[i + 1]);
+                }
+
+                cdrom_stop(mke->cdrom_dev);
+                /* Note for self: Panasonic/MKE drives send seek commands in MSF format. */
+                cdrom_seek(mke->cdrom_dev, MSFtoLBA(mke->command_buffer[1], mke->command_buffer[2],
+                           mke->command_buffer[3]) - 150, 0);
+                if ((old_cd_status == CD_STATUS_PLAYING) || (old_cd_status == CD_STATUS_PAUSED)) {
+                    cdrom_audio_play(mke->cdrom_dev, mke->cdrom_dev->seek_pos, -1, 0);
+                    cdrom_audio_pause_resume(mke->cdrom_dev, old_cd_status == CD_STATUS_PLAYING);
+                }
+                fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                break;
+            case CMD1_SESSINFO:
+                fifo8_reset(&mke->info_fifo);
+                mke_log("CMD: READ SESSION INFO\n");
+                if (mke_pre_execution_check(mke))
+                    mke_read_multisess(mke);
+                else
+                    fifo8_push_all(&mke->info_fifo, x, 6);
+                fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                break;
+            case CMD1_READ_UPC:
+                fifo8_reset(&mke->info_fifo);
+                mke_log("CMD: READ UPC\n");
+                uint8_t upc[8] = { [0] = 80 };
+                fifo8_push_all(&mke->info_fifo, upc, 8);
+                REPORT_IF_NOT_READY();
+                fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                break;
+            case CMD1_READ_ERR:
+                fifo8_reset(&mke->info_fifo);
+                mke_log("CMD: READ ERR\n");
+                mke_log("ERROR: %02X %02X %02X %02X %02X %02X %02X %02X\n",
+                        mke->sense[0], mke->sense[1], mke->sense[2], mke->sense[3],
+                        mke->sense[4], mke->sense[5], mke->sense[6], mke->sense[7]);
+                {
+                    uint8_t temp[8];
+                    memset(temp, mke->sense[2], 8);
+                    fifo8_push_all(&mke->info_fifo, mke->sense, 8);
+                }
+                mke->is_error = 0;
+                fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                break;
+            case CMD1_READ_VER:
+                /* SB2CD Expects 12 bytes, but drive only returns 11. */
+                fifo8_reset(&mke->info_fifo);
+                fifo8_push_all(&mke->info_fifo, (uint8_t *) mke->ver, 10);
+                fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                break;
+            case CMD1_STATUS:
+                fifo8_reset(&mke->info_fifo);
+                CHECK_READY_READ();
+                fifo8_push(&mke->info_fifo, mke_cdrom_status(mke->cdrom_dev, mke));
+                break;
+            default:
+                mke_log("MKE: Unknown Commnad [%02x]\n", mke->command_buffer[0]);
+                break;
+        }
+    } else if (!mke->command_buffer_pending) {
+        /*
+           We are done but not in a command.
+           Should we make sure it is a valid command here?
+         */
+        mke->command_buffer[0]      = value;
+        mke->command_buffer_pending = 6;
+    }
+}
+
+void
+mke_write(uint16_t port, uint8_t val, void *priv)
+{
+    mke_interface_t *mki   = (mke_interface_t *) priv;
+    mke_t           *mke   = &(mki->mke[mki->drvsel & 0x03]);
+    uint8_t          sb[8] = { 0x00, 0x02, 0x01, 0x03 };
+
+    mke_log("[%04X:%08X] [W] %04X = %02X\n", CS, cpu_state.pc, port, val);
+
+    /* if (mke->present || ((port & 0x0003) == 0x0003)) */  switch (port & 0x0003) {
+        case 0:
+            if (mke->present)
+                mke_command(mke, val);
+            break;
+        case 1:
+            if (mki->is_sb)
+                mki->data_select = val;
+            break;
+        case 2:
+            if (mke->present)
+                mke_reset(mke);
+            break;
+        case 3:
+            if (mki->is_sb)
+                mki->drvsel = (val & 0xfc) | sb[val & 0x03];
+            else
+                mki->drvsel = val;
+            break;
+        default:
+            break;
+    }
+}
+
+uint8_t
+mke_read(uint16_t port, void *priv)
+{
+    mke_interface_t *mki = (mke_interface_t *) priv;
+    mke_t           *mke = &(mki->mke[mki->drvsel & 0x03]);
+    uint8_t          ret = 0x00;
+
+    if (mke->present)  switch (port & 0x0003) {
+        case 0:
+            /* Info */
+            if (mki->is_sb && mki->data_select)
+                ret = fifo8_num_used(&mke->data_fifo) ? fifo8_pop(&mke->data_fifo) : 0x00;
+            else
+                ret = fifo8_num_used(&mke->info_fifo) ? fifo8_pop(&mke->info_fifo) : 0x00;
+            break;
+        case 1:
+            /*
+               Status:
+                   - 1 = Status Change;
+                   - 2 = Data Ready;
+                   - 4 = Response Ready;
+                   - 8 = Attention / Issue?
+            */
+            ret = 0xff;
+            if (fifo8_num_used(&mke->data_fifo))
+                /* Data FIFO */
+                ret ^= 2;
+            if (fifo8_num_used(&mke->info_fifo))
+                /* Status FIFO */
+                ret ^= 4;
+            if (mke->is_error)
+                ret ^= 8;
+            break;
+        case 2:
+            /* Data */
+            if (!mki->is_sb)
+                ret = fifo8_num_used(&mke->data_fifo) ? fifo8_pop(&mke->data_fifo) : 0x00;
+            break;
+        default:
+            mke_log("MKE Unknown Read Port: %04X\n", port);
+            ret = 0xff;
+            break;
+    } else if ((port & 0x0003) == 0x0003)
+        /* This is needed for the Windows 95 built-in driver to function correctly. */
+        ret = 0xff;
+
+    mke_log("[%04X:%08X] [R] %04X = %02X\n", CS, cpu_state.pc, port, ret);
+
+    return ret;
+}
+
+uint32_t
+mke_get_volume(void *priv, int channel)
+{
+    mke_t *dev = (mke_t *) priv;
+
+    return channel == 0 ? dev->vol0 : dev->vol1;
+}
+
+uint32_t
+mke_get_channel(void *priv, int channel)
+{
+    mke_t *dev = (mke_t *) priv;
+
+    return channel == 0 ? dev->patch0 : dev->patch1;
+}
+
+void
+mke_close(void *priv)
+{
+    mke_interface_t *mki = (mke_interface_t *) calloc(1, sizeof(mke_interface_t));
+
+    for (uint8_t i = 0; i < 4; i++) {
+        mke_t *mke = &(mki->mke[i]);
+
+        if (mke->present) {
+            timer_disable(&mke->timer);
+
+            fifo8_destroy(&mke->data_fifo);
+            fifo8_destroy(&mke->info_fifo);
+        }
+    }
+
+    free(mki);
+}
+
+void *
+mke_init(const device_t *info)
+{
+    mke_interface_t *mki = (mke_interface_t *) calloc(1, sizeof(mke_interface_t));
+    int              num = 0;
+
+    for (uint8_t i = 0; i < CDROM_NUM; i++) {
+        if (cdrom[i].bus_type == CDROM_BUS_MKE) {
+            cdrom_t *dev = &cdrom[i];
+
+            mke_t *mke = &(mki->mke[dev->mke_channel]);
+
+            mke->present = 1;
+
+            memset(mke->ver, 0x00, 512);
+            cdrom_generate_name_mke(dev->type, mke->ver);
+            mke->ver[10] = 0x00;
+
+            fifo8_create(&mke->info_fifo, 128);
+            fifo8_create(&mke->data_fifo, 624240 * 2);
+            fifo8_reset(&mke->info_fifo);
+            fifo8_reset(&mke->data_fifo);
+            mke->cdrom_dev              = dev;
+            mke->command_buffer_pending = 7;
+            mke->sector_type            = 0x08 | (1 << 4);
+            mke->sector_flags           = 0x10;
+            mke->mode_select[2]         = 0x08;
+            mke->patch0                 = 0x01;
+            mke->patch1                 = 0x02;
+            mke->vol0                   = 255;
+            mke->vol1                   = 255;
+            dev->sector_size            = 2048;
+
+            dev->priv          = mke;
+            dev->insert        = mke_cdrom_insert;
+            dev->get_volume    = mke_get_volume;
+            dev->get_channel   = mke_get_channel;
+            dev->cached_sector = -1;
+
+            timer_add(&mke->timer, mke_command_callback, mke, 0);
+
+            num++;
+
+            if (num == 4)
+                break;
+        }
+    }
+
+    mki->is_sb                  = info->local;
+
+    uint16_t base = device_get_config_hex16("base");
+    io_sethandler(base, 4, mke_read, NULL, NULL, mke_write, NULL, NULL, mki);
+
+    return mki;
+}
+
+static const device_config_t mke_config[] = {
+    // clang-format off
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x250,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "220H", .value = 0x220 },
+            { .description = "230H", .value = 0x230 },
+            { .description = "250H", .value = 0x250 },
+            { .description = "260H", .value = 0x260 },
+            { .description = "270H", .value = 0x270 },
+            { .description = "290H", .value = 0x290 },
+            { .description = "300H", .value = 0x300 },
+            { .description = "310H", .value = 0x310 },
+            { .description = "320H", .value = 0x320 },
+            { .description = "330H", .value = 0x330 },
+            { .description = "340H", .value = 0x340 },
+            { NULL                                  }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+// clang-format off
+};
+
+const device_t mke_cdrom_device = {
+    .name          = "Panasonic/MKE CD-ROM interface (Creative)",
+    .internal_name = "mkecd",
+    .flags         = DEVICE_ISA,
+    .local         = 1,
+    .init          = mke_init,
+    .close         = mke_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = mke_config
+};
+
+const device_t mke_cdrom_noncreative_device = {
+    .name          = "Panasonic/MKE CD-ROM interface",
+    .internal_name = "mkecd_normal",
+    .flags         = DEVICE_ISA,
+    .local         = 0,
+    .init          = mke_init,
+    .close         = mke_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = mke_config
+};
diff --git a/src/chipset/82c100.c b/src/chipset/82c100.c
index 689234ebb..a9d61b3b9 100644
--- a/src/chipset/82c100.c
+++ b/src/chipset/82c100.c
@@ -358,8 +358,7 @@ ct_82c100_init(UNUSED(const device_t *info))
 {
     ct_82c100_t *dev;
 
-    dev = (ct_82c100_t *) malloc(sizeof(ct_82c100_t));
-    memset(dev, 0x00, sizeof(ct_82c100_t));
+    dev = (ct_82c100_t *) calloc(1, sizeof(ct_82c100_t));
 
     ct_82c100_reset(dev);
 
@@ -393,7 +392,7 @@ const device_t ct_82c100_device = {
     .init          = ct_82c100_init,
     .close         = ct_82c100_close,
     .reset         = ct_82c100_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/CMakeLists.txt b/src/chipset/CMakeLists.txt
index 0f3c78c84..9ccba8dc6 100644
--- a/src/chipset/CMakeLists.txt
+++ b/src/chipset/CMakeLists.txt
@@ -9,19 +9,88 @@
 #          CMake build script.
 #
 # Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
 #
 #          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2024      Jasmine Iwanek.
 #
 
-add_library(chipset OBJECT 82c100.c acc2168.c cs8230.c ali1429.c ali1435.c ali1489.c
-    ali1531.c ali1541.c ali1543.c ali1621.c ali6117.c headland.c ims8848.c intel_82335.c
-    compaq_386.c contaq_82c59x.c cs4031.c intel_420ex.c intel_4x0.c intel_i450kx.c
-    intel_sio.c intel_piix.c ../ioapic.c neat.c opti283.c opti291.c opti391.c opti495.c
-    opti602.c opti822.c opti895.c opti5x7.c scamp.c scat.c sis_85c310.c sis_85c4xx.c
-    sis_85c496.c sis_85c50x.c sis_5511.c sis_5571.c via_vt82c49x.c via_vt82c505.c
-    sis_85c310.c sis_85c4xx.c sis_85c496.c sis_85c50x.c gc100.c stpc.c umc_8886.c
-    umc_hb4.c via_apollo.c via_pipc.c vl82c480.c wd76c10.c)
-
-if(OLIVETTI)
-    target_sources(chipset PRIVATE olivetti_eva.c)
-endif()
+add_library(chipset OBJECT
+    82c100.c
+    acc2036.c
+    acc2168.c
+    cs8220.c
+    cs8230.c
+    ali1429.c
+    ali1435.c
+    ali1489.c
+    ali1531.c
+    ali1541.c
+    ali1543.c
+    ali1621.c
+    ali6117.c
+    ali1409.c
+    compaq.c
+    compaq_386.c
+    contaq_82c59x.c
+    cs4031.c
+    grid1520.c
+    gc100.c
+    headland.c
+    ims8848.c
+    intel_82335.c
+    intel_420ex.c
+    intel_4x0.c
+    intel_i450kx.c
+    intel_sio.c
+    intel_piix.c
+    isa486c.c
+    ../ioapic.c
+    laserxt.c
+    neat.c
+    olivetti_eva.c
+    opti283.c
+    opti291.c
+    opti391.c
+    opti495.c
+    opti498.c
+    opti499.c
+    opti602.c
+    opti822.c
+    opti895.c
+    opti5x7.c
+    philips.c
+    sanyo.c
+    scamp.c
+    scat.c
+    sis_85c310.c
+    sis_85c4xx.c
+    sis_85c496.c
+    sis_85c50x.c
+    sis_5511.c
+    sis_5571.c
+    sis_5581.c
+    sis_5591.c
+    sis_5600.c
+    sis_5511_h2p.c
+    sis_5571_h2p.c
+    sis_5581_h2p.c
+    sis_5591_h2p.c
+    sis_5600_h2p.c
+    sis_5513_p2i.c
+    sis_5513_ide.c
+    sis_5572_usb.c
+    sis_5595_pmu.c
+    sis_55xx.c
+    sl82c461.c
+    stpc.c
+    via_vt82c49x.c
+    via_vt82c505.c
+    umc_8886.c
+    umc_hb4.c
+    umc_8890.c
+    via_apollo.c
+    via_pipc.c
+    vl82c480.c
+    wd76c10.c
+)
diff --git a/src/chipset/acc2036.c b/src/chipset/acc2036.c
new file mode 100644
index 000000000..3984f82e0
--- /dev/null
+++ b/src/chipset/acc2036.c
@@ -0,0 +1,346 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the ACC 2036 chipset.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2025 Miran Grca.
+ */
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/machine.h>
+#include <86box/mem.h>
+#include <86box/port_92.h>
+#include <86box/plat_fallthrough.h>
+#include <86box/plat_unused.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/chipset.h>
+
+typedef struct {
+    uint32_t      virt;
+    uint32_t      phys;
+
+    mem_mapping_t mapping;
+} ram_page_t;
+
+typedef struct {
+    uint8_t       reg;
+    uint8_t       regs[32];
+
+    ram_page_t    ram_mid_pages[24];
+    ram_page_t    ems_pages[4];
+} acc2036_t;
+
+static uint8_t
+acc2036_mem_read(uint32_t addr, void *priv)
+{
+    ram_page_t *dev = (ram_page_t *) priv;
+    uint8_t     ret = 0xff;
+
+    addr = (addr - dev->virt) + dev->phys;
+
+    if (addr < (mem_size << 10))
+        ret = ram[addr];
+
+    return ret;
+}
+
+static uint16_t
+acc2036_mem_readw(uint32_t addr, void *priv)
+{
+    ram_page_t *dev = (ram_page_t *) priv;
+    uint16_t    ret = 0xffff;
+
+    addr = (addr - dev->virt) + dev->phys;
+
+    if (addr < (mem_size << 10))
+        ret = *(uint16_t *) &(ram[addr]);
+
+    return ret;
+}
+
+static void
+acc2036_mem_write(uint32_t addr, uint8_t val, void *priv)
+{
+    ram_page_t *dev = (ram_page_t *) priv;
+
+    addr = (addr - dev->virt) + dev->phys;
+
+    if (addr < (mem_size << 10))
+        ram[addr] = val;
+}
+
+static void
+acc2036_mem_writew(uint32_t addr, uint16_t val, void *priv)
+{
+    ram_page_t *dev = (ram_page_t *) priv;
+
+    addr = (addr - dev->virt) + dev->phys;
+
+    if (addr < (mem_size << 10))
+        *(uint16_t *) &(ram[addr]) = val;
+}
+
+static void
+acc2036_recalc(acc2036_t *dev)
+{
+    uint32_t ems_bases[4] = { 0x000c0000, 0x000c8000, 0x000d0000, 0x000e0000 };
+
+    int start_i = (ems_bases[dev->regs[0x0c] & 0x03] - 0x000a0000) >> 14;
+    int end_i   = start_i + 3;
+
+    for (int i = 0; i < 24; i++) {
+        ram_page_t *rp = &dev->ram_mid_pages[i];
+        mem_mapping_disable(&rp->mapping);
+    }
+
+    for (int i = 0; i < 4; i++) {
+        ram_page_t *ep = &dev->ems_pages[i];
+        mem_mapping_disable(&ep->mapping);
+    }
+
+    for (int i = 0; i < 24; i++) {
+        ram_page_t *rp   = &dev->ram_mid_pages[i];
+
+        if ((dev->regs[0x03] & 0x08) && (i >= start_i) && (i <= end_i)) {
+            /* EMS */
+            ram_page_t *ep = &dev->ems_pages[i - start_i];
+
+            mem_mapping_disable(&rp->mapping);
+            mem_mapping_set_addr(&ep->mapping, ep->virt, 0x000040000);
+            mem_mapping_set_exec(&ep->mapping, ram + ep->phys);
+            mem_set_mem_state_both(ep->virt, 0x00004000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+        } else {
+            int     master_write;
+            int     master_read;
+            int     bit;
+            int     ew_flag;
+            int     er_flag;
+            int     flags;
+            uint8_t val;
+
+            mem_mapping_set_addr(&rp->mapping, rp->virt, 0x000040000);
+            mem_mapping_set_exec(&rp->mapping, ram + rp->phys);
+
+            if ((i >= 8) && (i <= 15)) {
+                /* 0C0000-0DFFFF */
+                master_write  = dev->regs[0x02] & 0x08;
+                master_read   = dev->regs[0x02] & 0x04;
+                bit           = ((i - 8) >> 1);
+                val           = dev->regs[0x0d] & (1 << bit);
+                if (i >= 12) {
+                    ew_flag = (dev->regs[0x07] & 0x80) ? MEM_WRITE_EXTANY : MEM_WRITE_EXTERNAL;
+                    er_flag = (dev->regs[0x07] & 0x80) ? MEM_READ_EXTANY : MEM_READ_EXTERNAL;
+                } else {
+                    ew_flag = (dev->regs[0x07] & 0x40) ? MEM_WRITE_EXTANY : MEM_WRITE_EXTERNAL;
+                    er_flag = (dev->regs[0x07] & 0x40) ? MEM_READ_EXTANY : MEM_READ_EXTERNAL;
+                }
+                flags         = (val && master_write) ? MEM_WRITE_INTERNAL : ew_flag;
+                flags        |= (val && master_read) ? MEM_READ_INTERNAL : er_flag;
+                mem_set_mem_state_both(rp->virt, 0x00004000, flags);
+            } else if (i > 15) {
+                /* 0E0000-0FFFFF */
+                master_write = dev->regs[0x02] & 0x02;
+                master_read  = dev->regs[0x02] & 0x01;
+                bit           = ((i - 8) >> 2);
+                val           = dev->regs[0x0c] & (1 << bit);
+                if (i >= 20) {
+                    ew_flag = MEM_WRITE_EXTANY;
+                    er_flag = MEM_READ_EXTANY;
+                } else {
+                    ew_flag = (dev->regs[0x0c] & 0x10) ? MEM_WRITE_EXTANY : MEM_WRITE_EXTERNAL;
+                    er_flag = (dev->regs[0x0c] & 0x10) ? MEM_READ_EXTANY : MEM_READ_EXTERNAL;
+                }
+                flags         = (val && master_write) ? MEM_WRITE_INTERNAL : ew_flag;
+                flags        |= (val && master_read) ? MEM_READ_INTERNAL : er_flag;
+                mem_set_mem_state_both(rp->virt, 0x00004000, flags);
+            }
+        }
+    }
+
+    if (dev->regs[0x00] & 0x40)
+        mem_set_mem_state_both(0x00fe0000, 0x00010000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+    else
+        mem_set_mem_state_both(0x00fe0000, 0x00010000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+
+    for (int i = 0x01; i <= 0x06; i++) {
+        uint32_t base = 0x00fe0000 - (i * 0x00010000);
+
+        if (dev->regs[i] & 0x40)
+            mem_set_mem_state_both(base, 0x00008000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+        else
+            mem_set_mem_state_both(base, 0x00008000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+
+        if (dev->regs[i] & 0x80)
+            mem_set_mem_state_both(base + 0x00008000, 0x00008000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+        else
+            mem_set_mem_state_both(base + 0x00008000, 0x00008000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+    }
+
+    mem_remap_top(0);
+    if (dev->regs[0x03] & 0x10) {
+        if (dev->regs[0x02] & 0x0c)
+            mem_remap_top(128);
+        else if (dev->regs[0x02] & 0x03)
+            mem_remap_top(256);
+        else
+            mem_remap_top(384);
+    }
+
+    flushmmucache_nopc();
+}
+
+static uint8_t
+acc2036_in(uint16_t port, void *priv) {
+    acc2036_t *dev = (acc2036_t *) priv;
+    uint8_t    reg = dev->reg - 0x20;
+    uint8_t    ret = 0xff;
+
+    if (port & 0x0001)  switch (dev->reg) {
+        default:
+            break;
+        case 0x20 ... 0x2e:
+        case 0x31 ... 0x3f:
+            ret = dev->regs[reg];
+            break;
+    } else
+        ret = dev->reg;
+
+    return ret;
+}
+
+static void
+acc2036_out(uint16_t port, uint8_t val, void *priv) {
+    acc2036_t *dev = (acc2036_t *) priv;
+    uint8_t    reg = dev->reg - 0x20;
+
+    if (port & 0x0001)  switch (dev->reg) {
+        default:
+            break;
+        case 0x20 ... 0x23:
+            dev->regs[reg] = val;
+            acc2036_recalc(dev);
+            break;
+        case 0x24 ... 0x2b:
+            dev->regs[reg] = val;
+            dev->ems_pages[(reg - 0x04) >> 1].phys = ((dev->regs[reg & 0xfe] & 0x1f) << 19) |
+                                                     ((dev->regs[reg | 0x01] & 0x1f) << 14);
+            acc2036_recalc(dev);
+            break;
+        case 0x2c: case 0x2d:
+            dev->regs[reg] = val;
+            acc2036_recalc(dev);
+            break;
+        case 0x2e:
+            dev->regs[reg] = val | 0x10;
+            break;
+        case 0x31:
+            dev->regs[reg] = val;
+            mem_a20_alt = (val & 0x01);
+            mem_a20_recalc();
+            flushmmucache();
+            if (val & 0x02) {
+                softresetx86(); /* Pulse reset! */
+                cpu_set_edx();
+                flushmmucache();
+            }
+            break;
+        case 0x32 ... 0x3f:
+            dev->regs[reg] = val;
+            break;
+    } else
+        dev->reg = val;
+}
+
+static void
+acc2036_close(void *priv)
+{
+    acc2036_t *dev = (acc2036_t *) priv;
+
+    free(dev);
+}
+
+static void *
+acc2036_init(UNUSED(const device_t *info))
+{
+    acc2036_t *dev = (acc2036_t *) calloc(1, sizeof(acc2036_t));
+
+    for (int i = 0; i < 24; i++) {
+        ram_page_t *rp = &dev->ram_mid_pages[i];
+
+        rp->virt = 0x000a0000 + (i << 14);
+        rp->phys = 0x000a0000 + (i << 14);
+        mem_mapping_add(&rp->mapping, rp->virt, 0x00004000,
+                        acc2036_mem_read, acc2036_mem_readw, NULL,
+                        acc2036_mem_write, acc2036_mem_writew, NULL,
+                        ram + rp->phys, MEM_MAPPING_INTERNAL, rp);
+    }
+
+    for (int i = 0; i < 4; i++) {
+        ram_page_t *ep = &dev->ems_pages[i];
+
+        ep->virt = 0x000d0000 + (i << 14);
+        ep->phys = 0x00000000 + (i << 14);
+        mem_mapping_add(&ep->mapping, ep->virt, 0x00004000,
+                        acc2036_mem_read, acc2036_mem_readw, NULL,
+                        acc2036_mem_write, acc2036_mem_writew, NULL,
+                        ram + ep->phys, MEM_MAPPING_INTERNAL, ep);
+        mem_mapping_disable(&ep->mapping);
+    }
+
+    mem_mapping_disable(&ram_mid_mapping);
+
+    dev->regs[0x00] = 0x02;
+    dev->regs[0x0e] = 0x10;
+    dev->regs[0x11] = 0x01;
+    dev->regs[0x13] = 0x40;
+    dev->regs[0x15] = 0x40;
+    dev->regs[0x17] = 0x40;
+    dev->regs[0x19] = 0x40;
+    dev->regs[0x1b] = 0x40;
+    dev->regs[0x1c] = 0x22;
+    dev->regs[0x1d] = 0xc4;
+    dev->regs[0x1f] = 0x30;
+    acc2036_recalc(dev);
+
+    mem_a20_alt = 0x01;
+    mem_a20_recalc();
+    flushmmucache();
+
+    io_sethandler(0x00f2, 0x0002,
+                  acc2036_in, NULL, NULL, acc2036_out, NULL, NULL, dev);
+
+    device_add(&port_92_device);
+
+    return dev;
+}
+
+const device_t acc2036_device = {
+    .name          = "ACC 2036",
+    .internal_name = "acc2036",
+    .flags         = 0,
+    .local         = 0,
+    .init          = acc2036_init,
+    .close         = acc2036_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/acc2168.c b/src/chipset/acc2168.c
index 9ce29bdff..dbbdc99f6 100644
--- a/src/chipset/acc2168.c
+++ b/src/chipset/acc2168.c
@@ -184,8 +184,7 @@ acc2168_close(void *priv)
 static void *
 acc2168_init(UNUSED(const device_t *info))
 {
-    acc2168_t *dev = (acc2168_t *) malloc(sizeof(acc2168_t));
-    memset(dev, 0, sizeof(acc2168_t));
+    acc2168_t *dev = (acc2168_t *) calloc(1, sizeof(acc2168_t));
 
     device_add(&port_92_device);
     io_sethandler(0x00f2, 0x0002, acc2168_read, NULL, NULL, acc2168_write, NULL, NULL, dev);
@@ -201,7 +200,7 @@ const device_t acc2168_device = {
     .init          = acc2168_init,
     .close         = acc2168_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/ali1409.c b/src/chipset/ali1409.c
new file mode 100644
index 000000000..619843cda
--- /dev/null
+++ b/src/chipset/ali1409.c
@@ -0,0 +1,343 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the ALi M1409 chipset.
+ *
+ * Note:    This chipset has no datasheet, everything were done via
+ *          reverse engineering.
+ *
+ *
+ *
+ * Authors: Jose Phillips, <jose@latinol.com>
+ *          Sarah Walker, <https://pcem-emulator.co.uk/>
+ *
+ *          Copyright 2024 Jose Phillips.
+ *          Copyright 2008-2018 Sarah Walker.
+ */
+
+
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+
+#include <86box/apm.h>
+#include <86box/mem.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/smram.h>
+#include <86box/chipset.h>
+#include <86box/plat_unused.h>
+ 
+#ifdef ENABLE_ALI1409_LOG 
+int ali1409_do_log = ENABLE_ALI1409_LOG;
+
+static void
+ali1409_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (ali1409_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define ali1409_log(fmt, ...)
+#endif
+
+typedef struct ali_1409_t {
+    uint8_t index;
+    uint8_t cfg_locked;
+    uint8_t regs[256];
+    uint8_t shadow[4];
+    uint8_t last_reg;
+} ali1409_t;
+
+/*
+   This here is because from the two BIOS'es I used to reverse engineer this,
+   it is unclear which of the two interpretations of the shadow RAM register
+   operation is correct.
+   The 16 kB interpretation appears to work fine right now but it may be wrong,
+   so I left the 32 kB interpretation in as well.
+ */
+#ifdef INTERPRETATION_32KB
+#define SHADOW_SIZE 0x00008000
+#else
+#define SHADOW_SIZE 0x00004000
+#endif
+
+static void
+ali1409_shadow_recalc(ali1409_t *dev)
+{
+    uint32_t base = 0x000c0000;
+
+    for (uint8_t i = 0; i < 4; i++) {
+        uint8_t reg = 0x08 + i;
+
+#ifdef INTERPRETATION_32KB
+        for (uint8_t j = 0; j < 4; j += 2) {
+            uint8_t mask = (0x03 << j);
+#else
+        for (uint8_t j = 0; j < 4; j++) {
+            uint8_t mask = (0x01 << j);
+#endif
+            uint8_t r_on  = dev->regs[reg] & 0x10;
+            uint8_t w_on  = dev->regs[reg] & 0x20;
+            uint8_t val   = dev->regs[reg] & mask;
+            uint8_t xor   = (dev->shadow[i] ^ dev->regs[reg]) & (mask | 0x30);
+            int     read  = r_on ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+            int     write = w_on ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+
+            if (xor) {
+#ifdef INTERPRETATION_32KB
+                switch (val >> j) {
+                    case 0x00:
+                        mem_set_mem_state_both(base, SHADOW_SIZE, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+                        break;
+                    case 0x01:
+                        mem_set_mem_state_both(base, SHADOW_SIZE, MEM_READ_EXTANY | write);
+                        break;
+                    case 0x02:
+                        mem_set_mem_state_both(base, SHADOW_SIZE, read | write);
+                        break;
+                    case 0x03:
+                        mem_set_mem_state_both(base, SHADOW_SIZE, read | MEM_WRITE_EXTANY);
+                        break;
+                }
+#else
+                switch (val >> j) {
+                    case 0x00:
+                        mem_set_mem_state_both(base, SHADOW_SIZE, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+                        break;
+                    case 0x01:
+                        mem_set_mem_state_both(base, SHADOW_SIZE, read | write);
+                        break;
+                }
+#endif
+            }
+
+            base += SHADOW_SIZE;
+        }
+
+        dev->shadow[i] = dev->regs[reg];
+    }
+
+    flushmmucache_nopc();
+}
+
+static void
+ali1409_write(uint16_t addr, uint8_t val, void *priv)
+{
+    ali1409_t *dev = (ali1409_t *) priv;
+    ali1409_log("[%04X:%08X] [W] %04X = %02X\n", CS, cpu_state.pc, addr, val);
+
+    if (addr & 0x0001) {
+        if (dev->cfg_locked) {
+            if ((dev->last_reg == 0x14) && (val == 0x09))
+                dev->cfg_locked = 0;
+
+            dev->last_reg = val;
+            return;
+        }
+
+        /* It appears writing anything at all to register 0xFF locks it again. */
+        if (dev->index == 0xff)
+            dev->cfg_locked = 1;
+        else if (dev->index < 0x44) {
+            ali1409_log("[%04X:%08X] [W] Register %02X = %02X\n", CS, cpu_state.pc, dev->index, val);
+
+            if (dev->index < 0x10) { 
+                dev->regs[dev->index] = val;
+
+                /*
+                   There are still a lot of unknown here, but unfortunately, this is
+                   as far as I have been able to come with two BIOS'es that are
+                   available (the Acer 100T and an AMI Color dated 07/07/91).
+                 */
+                switch (dev->index) {
+                    case 0x02:
+                        /*
+                           - Bit 7: The RAS address hold time:
+                               - 0: 1/2 T;
+                               - 1: 1 T.
+                           - Bits 6-4: The RAS precharge time:
+                               - 0, 0, 0: 1.5 T;
+                               - 0, 0, 1: 2 T;
+                               - 0, 1, 0: 2.5 T;
+                               - 0, 1, 1: 3 T;
+                               - 1, 0, 0: 3.5 T;
+                               - 1, 0, 1: 4 T;
+                               - 1, 1, 0: Reserved;
+                               - 1, 1, 1: Reserved.
+                           - Bit 3: Early miss cycle:
+                               - 0: Disabled;
+                               - 1: Enabled.
+                         */
+                        break;
+                    case 0x03:
+                        /*
+                           - Bit 6: CAS pulse for read cycle:
+                               - 0: 1 T;
+                               - 1: 1.5 T or 2 T.
+                               I can not get the 2.5 T or 3 T setting to apply so
+                               I have no idea what bit governs that.
+                           - Bits 5, 4: CAS pulse for write cycle:
+                               - 0, 0: 0.5 T or 1 T;
+                               - 0, 1: 1.5 T or 2 T;
+                               - 1, 0: 2.5 T or 3 T;
+                               - 1, 1: Reserved.
+                           - Bit 3: CAS active for read cycle:
+                               - 0: Disabled;
+                               - 1: Enabled.
+                           - Bit 2: CAS active for write cycle:
+                               - 0: Disabled;
+                               - 1: Enabled.
+                         */
+                        break;
+                    case 0x06:
+                        /*
+                           - Bits 6-4: Clock divider:
+                               - 0, 0, 0: / 2;
+                               - 0, 0, 1: / 4;
+                               - 0, 1, 0: / 8;
+                               - 0, 1, 1: Reserved;
+                               - 1, 0, 0: / 3;
+                               - 1, 0, 1: / 6;
+                               - 1, 1, 0: / 5;
+                               - 1, 1, 1: / 10.
+                         */
+                        switch ((val >> 4) & 7) {
+                            default:
+                            case 3: /* Reserved */
+                                cpu_set_isa_speed(7159091);
+                                break;
+
+                            case 0:
+                                cpu_set_isa_speed(cpu_busspeed / 2);
+                                break;
+
+                            case 1:
+                                cpu_set_isa_speed(cpu_busspeed / 4);
+                                break;
+
+                            case 2:
+                                cpu_set_isa_speed(cpu_busspeed / 8);
+                                break;
+
+                            case 4:
+                                cpu_set_isa_speed(cpu_busspeed / 3);
+                                break;
+
+                            case 5:
+                                cpu_set_isa_speed(cpu_busspeed / 6);
+                                break;
+
+                            case 6:
+                                cpu_set_isa_speed(cpu_busspeed / 5);
+                                break;
+
+                            case 7:
+                                cpu_set_isa_speed(cpu_busspeed / 10);
+                                break;
+                        }
+                        break;
+                    case 0x08 ... 0x0b:
+                        ali1409_shadow_recalc(dev);
+                        break;
+                    case 0x0c:
+                        /*
+                           This appears to be turbo in bit 4 (1 = on, 0 = off),
+                           and bus speed in the rest of the bits.
+                         */
+                        break;
+                    case 0x0d:
+                        cpu_cache_ext_enabled = !!(val & 0x08);
+                        cpu_update_waitstates();
+                        break;
+                }
+            }
+        }
+    } else
+        dev->index = val;
+}
+
+
+static uint8_t
+ali1409_read(uint16_t addr, void *priv)
+{
+    const ali1409_t *dev = (ali1409_t *) priv;
+    uint8_t          ret = 0xff;
+
+    if (dev->cfg_locked)
+         ret = 0xff;
+    else if (addr & 0x0001) {
+        if (dev->index < 0x44)
+            ret = dev->regs[dev->index];
+    } else
+        ret = dev->index;
+
+    ali1409_log("[%04X:%08X] [R] %04X = %02X\n", CS, cpu_state.pc, addr, ret);
+
+    return ret;
+}
+
+
+
+static void
+ali1409_close(void *priv)
+{
+    ali1409_t *dev = (ali1409_t *) priv;
+
+    free(dev);
+}
+
+static void *
+ali1409_init(UNUSED(const device_t *info))
+{
+    ali1409_t *dev = (ali1409_t *) calloc(1, sizeof(ali1409_t));
+
+    dev->cfg_locked = 1;
+
+    ali1409_log("Bus speed: %i\n", cpu_busspeed);
+
+    io_sethandler(0x0022, 0x0002, ali1409_read, NULL, NULL, ali1409_write, NULL, NULL, dev);
+
+    dev->regs[0x0f] = 0x08;
+
+    cpu_set_isa_speed(7159091);
+
+    cpu_cache_ext_enabled = 0;
+    cpu_update_waitstates();
+
+    return dev;
+}
+
+const device_t ali1409_device = {
+    .name          = "ALi M1409",
+    .internal_name = "ali1409",
+    .flags         = 0,
+    .local         = 0,
+    .init          = ali1409_init,
+    .close         = ali1409_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
diff --git a/src/chipset/ali1429.c b/src/chipset/ali1429.c
index 34c3e18c2..e2478078f 100644
--- a/src/chipset/ali1429.c
+++ b/src/chipset/ali1429.c
@@ -331,8 +331,7 @@ ali1429_defaults(ali1429_t *dev)
 static void *
 ali1429_init(const device_t *info)
 {
-    ali1429_t *dev = (ali1429_t *) malloc(sizeof(ali1429_t));
-    memset(dev, 0, sizeof(ali1429_t));
+    ali1429_t *dev = (ali1429_t *) calloc(1, sizeof(ali1429_t));
 
     dev->cfg_locked = 1;
     GREEN           = info->local;
@@ -358,7 +357,7 @@ const device_t ali1429_device = {
     .init          = ali1429_init,
     .close         = ali1429_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -372,7 +371,7 @@ const device_t ali1429g_device = {
     .init          = ali1429_init,
     .close         = ali1429_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/ali1435.c b/src/chipset/ali1435.c
index 9476d2b45..ff096ac55 100644
--- a/src/chipset/ali1435.c
+++ b/src/chipset/ali1435.c
@@ -282,8 +282,7 @@ ali1435_close(void *priv)
 static void *
 ali1435_init(UNUSED(const device_t *info))
 {
-    ali1435_t *dev = (ali1435_t *) malloc(sizeof(ali1435_t));
-    memset(dev, 0, sizeof(ali1435_t));
+    ali1435_t *dev = (ali1435_t *) calloc(1, sizeof(ali1435_t));
 
     dev->cfg_locked = 1;
 
@@ -308,7 +307,7 @@ const device_t ali1435_device = {
     .init          = ali1435_init,
     .close         = ali1435_close,
     .reset         = ali1435_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/ali1489.c b/src/chipset/ali1489.c
index 3550f1da6..80362e244 100644
--- a/src/chipset/ali1489.c
+++ b/src/chipset/ali1489.c
@@ -28,9 +28,10 @@
 #include <86box/timer.h>
 #include <86box/io.h>
 #include <86box/device.h>
-
+#include <86box/keyboard.h>
 #include <86box/hdc_ide.h>
 #include <86box/hdc.h>
+#include <86box/machine.h>
 #include <86box/mem.h>
 #include <86box/nmi.h>
 #include <86box/pic.h>
@@ -470,8 +471,7 @@ ali1489_close(void *priv)
 static void *
 ali1489_init(UNUSED(const device_t *info))
 {
-    ali1489_t *dev = (ali1489_t *) malloc(sizeof(ali1489_t));
-    memset(dev, 0, sizeof(ali1489_t));
+    ali1489_t *dev = (ali1489_t *) calloc(1, sizeof(ali1489_t));
 
     /* M1487/M1489
        22h Index Port
@@ -486,6 +486,9 @@ ali1489_init(UNUSED(const device_t *info))
     dev->port_92 = device_add(&port_92_pci_device);
     dev->smram   = smram_add();
 
+    if (machine_get_kbc_device(machine) == NULL)
+        device_add_params(&kbc_at_device, (void *) KBC_VEN_ALI);
+
     ali1489_defaults(dev);
 
     return dev;
@@ -499,7 +502,7 @@ const device_t ali1489_device = {
     .init          = ali1489_init,
     .close         = ali1489_close,
     .reset         = ali1489_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/ali1531.c b/src/chipset/ali1531.c
index 9eb75f7cd..53324f8e6 100644
--- a/src/chipset/ali1531.c
+++ b/src/chipset/ali1531.c
@@ -22,6 +22,7 @@
 #include <wchar.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
+#include "cpu.h"
 #include <86box/timer.h>
 
 #include <86box/device.h>
@@ -225,12 +226,8 @@ ali1531_write(UNUSED(int func), int addr, uint8_t val, void *priv)
             ali1531_shadow_recalc(val, dev);
             break;
 
-        case 0x50:
-        case 0x51:
-        case 0x52:
-        case 0x54:
-        case 0x55:
-        case 0x56:
+        case 0x50 ... 0x52:
+        case 0x54 ... 0x56:
             dev->pci_conf[addr] = val;
             break;
 
@@ -247,8 +244,7 @@ ali1531_write(UNUSED(int func), int addr, uint8_t val, void *priv)
             dev->pci_conf[addr] = val & 0x86;
             break;
 
-        case 0x59:
-        case 0x5a:
+        case 0x59 ... 0x5a:
         case 0x5c:
             dev->pci_conf[addr] = val;
             break;
@@ -270,8 +266,7 @@ ali1531_write(UNUSED(int func), int addr, uint8_t val, void *priv)
             spd_write_drbs_interleaved(dev->pci_conf, 0x60, 0x6f, 1);
             break;
 
-        case 0x70:
-        case 0x71:
+        case 0x70 ... 0x71:
             dev->pci_conf[addr] = val;
             break;
 
@@ -283,8 +278,7 @@ ali1531_write(UNUSED(int func), int addr, uint8_t val, void *priv)
             dev->pci_conf[addr] = val & 0x2b;
             break;
 
-        case 0x76:
-        case 0x77:
+        case 0x76 ... 0x77:
             dev->pci_conf[addr] = val;
             break;
 
@@ -376,8 +370,7 @@ ali1531_close(void *priv)
 static void *
 ali1531_init(UNUSED(const device_t *info))
 {
-    ali1531_t *dev = (ali1531_t *) malloc(sizeof(ali1531_t));
-    memset(dev, 0, sizeof(ali1531_t));
+    ali1531_t *dev = (ali1531_t *) calloc(1, sizeof(ali1531_t));
 
     pci_add_card(PCI_ADD_NORTHBRIDGE, ali1531_read, ali1531_write, dev, &dev->pci_slot);
 
@@ -396,7 +389,7 @@ const device_t ali1531_device = {
     .init          = ali1531_init,
     .close         = ali1531_close,
     .reset         = ali1531_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/ali1541.c b/src/chipset/ali1541.c
index d57ef51e7..ebbcd7e63 100644
--- a/src/chipset/ali1541.c
+++ b/src/chipset/ali1541.c
@@ -22,6 +22,7 @@
 #include <wchar.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
+#include "cpu.h"
 #include <86box/timer.h>
 
 #include <86box/device.h>
@@ -643,8 +644,7 @@ ali1541_close(void *priv)
 static void *
 ali1541_init(UNUSED(const device_t *info))
 {
-    ali1541_t *dev = (ali1541_t *) malloc(sizeof(ali1541_t));
-    memset(dev, 0, sizeof(ali1541_t));
+    ali1541_t *dev = (ali1541_t *) calloc(1, sizeof(ali1541_t));
 
     pci_add_card(PCI_ADD_NORTHBRIDGE, ali1541_read, ali1541_write, dev, &dev->pci_slot);
 
@@ -665,7 +665,7 @@ const device_t ali1541_device = {
     .init          = ali1541_init,
     .close         = ali1541_close,
     .reset         = ali1541_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/ali1543.c b/src/chipset/ali1543.c
index fe3a0fda3..2f9273736 100644
--- a/src/chipset/ali1543.c
+++ b/src/chipset/ali1543.c
@@ -22,6 +22,7 @@
 #include <wchar.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/device.h>
 #include <86box/io.h>
@@ -197,6 +198,7 @@ ali1533_write(int func, int addr, uint8_t val, void *priv)
         case 0x44: /* Set IRQ Line for Primary IDE if it's on native mode */
             dev->pci_conf[addr] = val & 0xdf;
             soft_reset_pci      = !!(val & 0x80);
+            pci_set_mirq_level(PCI_MIRQ0, !(val & 0x10));
             pci_set_mirq_level(PCI_MIRQ2, !(val & 0x10));
             ali1543_log("INTAJ = IRQ %i\n", ali1533_irq_routing[val & 0x0f]);
             pci_set_mirq_routing(PCI_MIRQ0, ali1533_irq_routing[val & 0x0f]);
@@ -412,11 +414,13 @@ ali1533_write(int func, int addr, uint8_t val, void *priv)
         case 0x74: /* USB IRQ Routing - we cheat and use MIRQ4 */
             dev->pci_conf[addr] = val & 0xdf;
             /* TODO: MIRQ level/edge control - if bit 4 = 1, it's level */
+            pci_set_mirq_level(PCI_MIRQ4, !(val & 0x10));
             pci_set_mirq_routing(PCI_MIRQ4, ali1533_irq_routing[val & 0x0f]);
             break;
 
         case 0x75: /* Set IRQ Line for Secondary IDE if it's on native mode */
             dev->pci_conf[addr] = val & 0x1f;
+            pci_set_mirq_level(PCI_MIRQ1, !(val & 0x10));
             pci_set_mirq_level(PCI_MIRQ3, !(val & 0x10));
             ali1543_log("INTBJ = IRQ %i\n", ali1533_irq_routing[val & 0x0f]);
             pci_set_mirq_routing(PCI_MIRQ1, ali1533_irq_routing[val & 0x0f]);
@@ -704,7 +708,7 @@ ali5229_chip_reset(ali1543_t *dev)
     ali5229_write(0, 0x09, 0xfa, dev);
     ali5229_write(0, 0x52, 0x00, dev);
 
-    ali5229_write(0, 0x50, 0x00, dev);
+    ali5229_write(0, 0x50, 0x02, dev);
 
     sff_set_slot(dev->ide_controller[0], dev->ide_slot);
     sff_set_slot(dev->ide_controller[1], dev->ide_slot);
@@ -717,7 +721,7 @@ static void
 ali5229_write(int func, int addr, uint8_t val, void *priv)
 {
     ali1543_t *dev = (ali1543_t *) priv;
-    ali1543_log("M5229: dev->ide_conf[%02x] = %02x\n", addr, val);
+    ali1543_log("M5229: [W] dev->ide_conf[%02x] = %02x\n", addr, val);
 
     if (func > 0)
         return;
@@ -756,6 +760,10 @@ ali5229_write(int func, int addr, uint8_t val, void *priv)
             ali5229_ide_irq_handler(dev);
             break;
 
+        case 0x0d: /* LT - Latency Timer */
+            dev->ide_conf[addr] = val;
+            break;
+
         /* Primary Base Address */
         case 0x10:
         case 0x11:
@@ -776,9 +784,9 @@ ali5229_write(int func, int addr, uint8_t val, void *priv)
             /* Datasheet erratum: the PCI BAR's actually have different sizes. */
             if (addr == 0x20)
                 dev->ide_conf[addr] = (val & 0xe0) | 0x01;
-            else if ((addr & 0x43) == 0x00)
+            else if ((addr & 0x07) == 0x00)
                 dev->ide_conf[addr] = (val & 0xf8) | 0x01;
-            else if ((addr & 0x43) == 0x40)
+            else if ((addr & 0x07) == 0x04)
                 dev->ide_conf[addr] = (val & 0xfc) | 0x01;
             else
                 dev->ide_conf[addr] = val;
@@ -887,13 +895,15 @@ ali5229_read(int func, int addr, void *priv)
     if (dev->ide_dev_enable && (func == 0)) {
         ret = dev->ide_conf[addr];
         if ((addr == 0x09) && !(dev->ide_conf[0x50] & 0x02))
-            ret &= 0x0f;
+            ret = (ret & 0x0f) | 0x80;
         else if (addr == 0x50)
             ret = (ret & 0xfe) | (dev->ide_dev_enable ? 0x01 : 0x00);
         else if (addr == 0x75)
             ret = ide_read_ali_75();
         else if (addr == 0x76)
             ret = ide_read_ali_76();
+
+        ali1543_log("M5229: [R] dev->ide_conf[%02x] = %02x\n", addr, ret);
     }
 
     return ret;
@@ -1590,8 +1600,7 @@ ali1543_close(void *priv)
 static void *
 ali1543_init(const device_t *info)
 {
-    ali1543_t *dev = (ali1543_t *) malloc(sizeof(ali1543_t));
-    memset(dev, 0, sizeof(ali1543_t));
+    ali1543_t *dev = (ali1543_t *) calloc(1, sizeof(ali1543_t));
 
     /* Device 02: M1533 Southbridge */
     pci_add_card(PCI_ADD_SOUTHBRIDGE, ali1533_read, ali1533_write, dev, &dev->pci_slot);
@@ -1664,7 +1673,7 @@ const device_t ali1543_device = {
     .init  = ali1543_init,
     .close = ali1543_close,
     .reset = ali1543_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1678,7 +1687,7 @@ const device_t ali1543c_device = {
     .init          = ali1543_init,
     .close         = ali1543_close,
     .reset         = ali1543_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/ali1621.c b/src/chipset/ali1621.c
index 6194dce19..d44c0f5a9 100644
--- a/src/chipset/ali1621.c
+++ b/src/chipset/ali1621.c
@@ -669,8 +669,7 @@ ali1621_close(void *priv)
 static void *
 ali1621_init(UNUSED(const device_t *info))
 {
-    ali1621_t *dev = (ali1621_t *) malloc(sizeof(ali1621_t));
-    memset(dev, 0, sizeof(ali1621_t));
+    ali1621_t *dev = (ali1621_t *) calloc(1, sizeof(ali1621_t));
 
     pci_add_card(PCI_ADD_NORTHBRIDGE, ali1621_read, ali1621_write, dev, &dev->pci_slot);
 
@@ -692,7 +691,7 @@ const device_t ali1621_device = {
     .init          = ali1621_init,
     .close         = ali1621_close,
     .reset         = ali1621_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/ali6117.c b/src/chipset/ali6117.c
index c7ada4bc6..88bb4b572 100644
--- a/src/chipset/ali6117.c
+++ b/src/chipset/ali6117.c
@@ -26,6 +26,7 @@
 #include <86box/io.h>
 #include <86box/pci.h>
 #include <86box/pic.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/pit.h>
 #include <86box/device.h>
@@ -466,12 +467,12 @@ ali6117_init(const device_t *info)
 
     ali6117_log("ALI6117: init()\n");
 
-    ali6117_t *dev = (ali6117_t *) malloc(sizeof(ali6117_t));
-    memset(dev, 0, sizeof(ali6117_t));
+    ali6117_t *dev = (ali6117_t *) calloc(1, sizeof(ali6117_t));
 
     dev->local = info->local;
 
-    device_add(&ide_isa_device);
+    if (!(dev->local & 0x08))
+        device_add(&ide_isa_device);
 
     ali6117_setup(dev);
 
@@ -493,12 +494,12 @@ ali6117_init(const device_t *info)
 const device_t ali1217_device = {
     .name          = "ALi M1217",
     .internal_name = "ali1217",
-    .flags         = DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0x8,
     .init          = ali6117_init,
     .close         = ali6117_close,
     .reset         = ali6117_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -507,12 +508,12 @@ const device_t ali1217_device = {
 const device_t ali6117d_device = {
     .name          = "ALi M6117D",
     .internal_name = "ali6117d",
-    .flags         = DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0x2,
     .init          = ali6117_init,
     .close         = ali6117_close,
     .reset         = ali6117_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/compaq.c b/src/chipset/compaq.c
new file mode 100644
index 000000000..7a52c9d36
--- /dev/null
+++ b/src/chipset/compaq.c
@@ -0,0 +1,135 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Emulation of the Compaq 386 memory controller.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2023 Miran Grca.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <math.h>
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/pit.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/device.h>
+#include <86box/keyboard.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/machine.h>
+#include <86box/video.h>
+#include <86box/vid_cga.h>
+#include <86box/vid_cga_comp.h>
+#include <86box/plat_unused.h>
+#include <86box/chipset.h>
+
+/* Compaq Deskpro 386 remaps RAM from 0xA0000-0xFFFFF to 0xFA0000-0xFFFFFF */
+typedef struct cpq_t {
+    mem_mapping_t ram_mapping;
+} cpq_t;
+
+static uint8_t
+read_ram(uint32_t addr, UNUSED(void *priv))
+{
+    addr = (addr & 0x7ffff) + 0x80000;
+    addreadlookup(mem_logical_addr, addr);
+
+    return (ram[addr]);
+}
+
+static uint16_t
+read_ramw(uint32_t addr, UNUSED(void *priv))
+{
+    addr = (addr & 0x7ffff) + 0x80000;
+    addreadlookup(mem_logical_addr, addr);
+
+    return (*(uint16_t *) &ram[addr]);
+}
+
+static uint32_t
+read_raml(uint32_t addr, UNUSED(void *priv))
+{
+    addr = (addr & 0x7ffff) + 0x80000;
+    addreadlookup(mem_logical_addr, addr);
+
+    return (*(uint32_t *) &ram[addr]);
+}
+
+static void
+write_ram(uint32_t addr, uint8_t val, UNUSED(void *priv))
+{
+    addr = (addr & 0x7ffff) + 0x80000;
+    addwritelookup(mem_logical_addr, addr);
+
+    mem_write_ramb_page(addr, val, &pages[addr >> 12]);
+}
+
+static void
+write_ramw(uint32_t addr, uint16_t val, UNUSED(void *priv))
+{
+    addr = (addr & 0x7ffff) + 0x80000;
+    addwritelookup(mem_logical_addr, addr);
+
+    mem_write_ramw_page(addr, val, &pages[addr >> 12]);
+}
+
+static void
+write_raml(uint32_t addr, uint32_t val, UNUSED(void *priv))
+{
+    addr = (addr & 0x7ffff) + 0x80000;
+    addwritelookup(mem_logical_addr, addr);
+
+    mem_write_raml_page(addr, val, &pages[addr >> 12]);
+}
+
+static void
+compaq_close(void *priv)
+{
+    cpq_t *dev = (cpq_t *) priv;
+
+    free(dev);
+}
+
+static void *
+compaq_init(UNUSED(const device_t *info))
+{
+    cpq_t *dev = (cpq_t *) calloc(1, sizeof(cpq_t));
+
+    mem_remap_top(384);
+    mem_mapping_add(&dev->ram_mapping, 0xfa0000, 0x60000,
+                    read_ram, read_ramw, read_raml,
+                    write_ram, write_ramw, write_raml,
+                    0xa0000 + ram, MEM_MAPPING_INTERNAL, NULL);
+
+    return dev;
+}
+
+const device_t compaq_device = {
+    .name          = "Compaq Memory Control",
+    .internal_name = "compaq",
+    .flags         = 0,
+    .local         = 0,
+    .init          = compaq_init,
+    .close         = compaq_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/compaq_386.c b/src/chipset/compaq_386.c
index 7d55bc5a5..bc81c5472 100644
--- a/src/chipset/compaq_386.c
+++ b/src/chipset/compaq_386.c
@@ -37,6 +37,7 @@
 #include <86box/vid_cga.h>
 #include <86box/vid_cga_comp.h>
 #include <86box/plat_unused.h>
+#include <86box/chipset.h>
 
 #define RAM_DIAG_L_BASE_MEM_640KB    0x00
 #define RAM_DIAG_L_BASE_MEM_INV      0x10
@@ -746,6 +747,23 @@ compaq_386_init(UNUSED(const device_t *info))
     return dev;
 }
 
+static void
+compaq_genoa_outw(uint16_t port, uint16_t val, void *priv)
+{
+     if (port == 0x0c02)
+        cpq_write_regs(0x80c00000, val, priv);
+}
+
+static void *
+compaq_genoa_init(UNUSED(const device_t *info))
+{
+    void *cpq = device_add(&compaq_386_device);
+
+    io_sethandler(0x0c02, 2, NULL, NULL, NULL, NULL, compaq_genoa_outw, NULL, cpq);
+
+    return ram;
+}
+
 const device_t compaq_386_device = {
     .name          = "Compaq 386 Memory Control",
     .internal_name = "compaq_386",
@@ -754,7 +772,21 @@ const device_t compaq_386_device = {
     .init          = compaq_386_init,
     .close         = compaq_386_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t compaq_genoa_device = {
+    .name          = "Compaq Genoa Memory Control",
+    .internal_name = "compaq_genoa",
+    .flags         = 0,
+    .local         = 0,
+    .init          = compaq_genoa_init,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/contaq_82c59x.c b/src/chipset/contaq_82c59x.c
index 5c2910227..1981fd11c 100644
--- a/src/chipset/contaq_82c59x.c
+++ b/src/chipset/contaq_82c59x.c
@@ -322,8 +322,7 @@ contaq_82c59x_close(void *priv)
 static void *
 contaq_82c59x_init(const device_t *info)
 {
-    contaq_82c59x_t *dev = (contaq_82c59x_t *) malloc(sizeof(contaq_82c59x_t));
-    memset(dev, 0x00, sizeof(contaq_82c59x_t));
+    contaq_82c59x_t *dev = (contaq_82c59x_t *) calloc(1, sizeof(contaq_82c59x_t));
 
     dev->green = info->local;
 
@@ -359,7 +358,7 @@ const device_t contaq_82c596a_device = {
     .init          = contaq_82c59x_init,
     .close         = contaq_82c59x_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -373,7 +372,7 @@ const device_t contaq_82c597_device = {
     .init          = contaq_82c59x_init,
     .close         = contaq_82c59x_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/cs4031.c b/src/chipset/cs4031.c
index fb439ec3a..cfec9ad30 100644
--- a/src/chipset/cs4031.c
+++ b/src/chipset/cs4031.c
@@ -164,8 +164,7 @@ cs4031_close(void *priv)
 static void *
 cs4031_init(UNUSED(const device_t *info))
 {
-    cs4031_t *dev = (cs4031_t *) malloc(sizeof(cs4031_t));
-    memset(dev, 0, sizeof(cs4031_t));
+    cs4031_t *dev = (cs4031_t *) calloc(1, sizeof(cs4031_t));
 
     dev->port_92 = device_add(&port_92_device);
 
@@ -185,7 +184,7 @@ const device_t cs4031_device = {
     .init          = cs4031_init,
     .close         = cs4031_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/cs8220.c b/src/chipset/cs8220.c
new file mode 100644
index 000000000..4c08ecef5
--- /dev/null
+++ b/src/chipset/cs8220.c
@@ -0,0 +1,289 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Emulation of C&T CS8220 ("PC/AT") chipset.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2025 Miran Grca.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/machine.h>
+#include <86box/mem.h>
+#include <86box/plat_fallthrough.h>
+#include <86box/plat_unused.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/chipset.h>
+
+typedef struct {
+    uint32_t      virt;
+    uint32_t      phys;
+
+    uint32_t      size;
+
+    mem_mapping_t mapping;
+} ram_bank_t;
+
+typedef struct {
+    uint8_t       regs[3];
+
+    ram_bank_t    ram_banks[3];
+} cs8220_t;
+
+static uint8_t
+cs8220_mem_read(uint32_t addr, void *priv)
+{
+    ram_bank_t *dev = (ram_bank_t *) priv;
+    uint8_t     ret = 0xff;
+
+    addr = (addr - dev->virt) + dev->phys;
+
+    if (addr < (mem_size << 10))
+        ret = ram[addr];
+
+    return ret;
+}
+
+static uint16_t
+cs8220_mem_readw(uint32_t addr, void *priv)
+{
+    ram_bank_t *dev = (ram_bank_t *) priv;
+    uint16_t    ret = 0xffff;
+
+    addr = (addr - dev->virt) + dev->phys;
+
+    if (addr < (mem_size << 10))
+        ret = *(uint16_t *) &(ram[addr]);
+
+    return ret;
+}
+
+static void
+cs8220_mem_write(uint32_t addr, uint8_t val, void *priv)
+{
+    ram_bank_t *dev = (ram_bank_t *) priv;
+
+    addr = (addr - dev->virt) + dev->phys;
+
+    if (addr < (mem_size << 10))
+        ram[addr] = val;
+}
+
+static void
+cs8220_mem_writew(uint32_t addr, uint16_t val, void *priv)
+{
+    ram_bank_t *dev = (ram_bank_t *) priv;
+
+    addr = (addr - dev->virt) + dev->phys;
+
+    if (addr < (mem_size << 10))
+        *(uint16_t *) &(ram[addr]) = val;
+}
+
+static uint8_t
+cs8220_in(uint16_t port, void *priv) {
+    cs8220_t *dev = (cs8220_t *) priv;
+    uint8_t   ret = 0xff;
+
+    switch (port) {
+        case 0x00a4 ... 0x00a5:
+            ret = dev->regs[port & 0x0001];
+            break;
+        case 0x00ab:
+            ret = dev->regs[2];
+            break;
+    }
+
+    return ret;
+}
+
+static void
+cs8220_out(uint16_t port, uint8_t val, void *priv) {
+    cs8220_t *dev = (cs8220_t *) priv;
+
+    switch (port) {
+        case 0x00a4:
+            dev->regs[0] = val;
+            mem_a20_alt = val & 0x40;
+            mem_a20_recalc();
+            break;
+        case 0x00a5:
+            dev->regs[1] = val;
+            if (val & 0x01) {
+                mem_mapping_set_addr(&dev->ram_banks[0].mapping, 0, 0x000040000);
+                mem_mapping_disable(&dev->ram_banks[1].mapping);
+                mem_mapping_disable(&dev->ram_banks[2].mapping);
+            } else {
+                mem_mapping_set_addr(&dev->ram_banks[0].mapping, 0, dev->ram_banks[0].size);
+                mem_mapping_enable(&dev->ram_banks[1].mapping);
+                mem_mapping_enable(&dev->ram_banks[2].mapping);
+            }
+            break;
+        case 0x00ab:
+            dev->regs[2] = val;
+            break;
+    }
+}
+
+static void
+cs8220_close(void *priv)
+{
+    cs8220_t *dev = (cs8220_t *) priv;
+
+    free(dev);
+}
+
+static void *
+cs8220_init(UNUSED(const device_t *info))
+{
+    cs8220_t *dev = (cs8220_t *) calloc(1, sizeof(cs8220_t));
+
+    mem_mapping_disable(&ram_low_mapping);
+    mem_mapping_disable(&ram_mid_mapping);
+    mem_mapping_disable(&ram_high_mapping);
+
+    /*
+       Dell System 200: 640 kB soldered on-board, any other RAM is expansion.
+     */
+    if (!strcmp(machine_get_internal_name(), "dells200"))  switch (mem_size) {
+        default:
+            dev->ram_banks[2].virt = 0x00100000;
+            dev->ram_banks[2].phys = 0x000a0000;
+            dev->ram_banks[2].size = (mem_size << 10) - 0x000a0000;
+            fallthrough;
+        case 640:
+            dev->ram_banks[0].virt = 0x00000000;
+            dev->ram_banks[0].phys = 0x00000000;
+            dev->ram_banks[0].size = 0x00080000;
+            dev->ram_banks[1].virt = 0x00080000;
+            dev->ram_banks[1].phys = 0x00080000;
+            dev->ram_banks[1].size = 0x00020000;
+            break;
+    /*
+       We are limited to steps of equal size, so we have to simulate some
+       memory expansions to work around the chipset's limits.
+     */
+    } else  switch (mem_size) {
+        case 256:
+            dev->ram_banks[0].virt = 0x00000000;
+            dev->ram_banks[0].phys = 0x00000000;
+            dev->ram_banks[0].size = 0x00020000;
+            dev->ram_banks[1].virt = 0x00020000;
+            dev->ram_banks[1].phys = 0x00020000;
+            dev->ram_banks[1].size = 0x00020000;
+            break;
+        case 384:
+            dev->ram_banks[0].virt = 0x00000000;
+            dev->ram_banks[0].phys = 0x00000000;
+            dev->ram_banks[0].size = 0x00020000;
+            /* Pretend there's a 128k expansion. */
+            dev->ram_banks[2].virt = 0x00020000;
+            dev->ram_banks[2].phys = 0x00020000;
+            dev->ram_banks[2].size = 0x00040000;
+            break;
+        case 512:
+            dev->ram_banks[0].virt = 0x00000000;
+            dev->ram_banks[0].phys = 0x00000000;
+            dev->ram_banks[0].size = 0x00080000;
+            break;
+        default:
+            dev->ram_banks[2].virt = 0x00100000;
+            dev->ram_banks[2].phys = 0x000a0000;
+            dev->ram_banks[2].size = (mem_size << 10) - 0x000a0000;
+            fallthrough;
+        case 640:
+            dev->ram_banks[0].virt = 0x00000000;
+            dev->ram_banks[0].phys = 0x00000000;
+            dev->ram_banks[0].size = 0x00080000;
+            dev->ram_banks[1].virt = 0x00080000;
+            dev->ram_banks[1].phys = 0x00080000;
+            dev->ram_banks[1].size = 0x00020000;
+            break;
+        case 768:
+            dev->ram_banks[0].virt = 0x00000000;
+            dev->ram_banks[0].phys = 0x00000000;
+            dev->ram_banks[0].size = 0x00080000;
+            dev->ram_banks[1].virt = 0x00080000;
+            dev->ram_banks[1].phys = 0x00080000;
+            dev->ram_banks[1].size = 0x00020000;
+            /* Pretend there's a 128k expansion. */
+            dev->ram_banks[2].virt = 0x00100000;
+            dev->ram_banks[2].phys = 0x00080000;
+            dev->ram_banks[2].size = 0x00020000;
+            break;
+        case 896:
+            dev->ram_banks[0].virt = 0x00000000;
+            dev->ram_banks[0].phys = 0x00000000;
+            dev->ram_banks[0].size = 0x00080000;
+            dev->ram_banks[1].virt = 0x00080000;
+            dev->ram_banks[1].phys = 0x00080000;
+            dev->ram_banks[1].size = 0x00020000;
+            /* Pretend there's a 256k expansion. */
+            dev->ram_banks[2].virt = 0x00100000;
+            dev->ram_banks[2].phys = 0x00080000;
+            dev->ram_banks[2].size = 0x00040000;
+            break;
+        case 1024:
+            dev->ram_banks[0].virt = 0x00000000;
+            dev->ram_banks[0].phys = 0x00000000;
+            dev->ram_banks[0].size = 0x00080000;
+            dev->ram_banks[1].virt = 0x00100000;
+            dev->ram_banks[1].phys = 0x00080000;
+            dev->ram_banks[1].size = 0x00080000;
+            break;
+    }
+
+    if (dev->ram_banks[0].size > 0x00000000)
+        mem_mapping_add(&dev->ram_banks[0].mapping, dev->ram_banks[0].virt, dev->ram_banks[0].size,
+                        cs8220_mem_read, cs8220_mem_readw, NULL,
+                        cs8220_mem_write, cs8220_mem_writew, NULL,
+                        ram + dev->ram_banks[0].phys, MEM_MAPPING_INTERNAL, &(dev->ram_banks[0]));
+
+    if (dev->ram_banks[1].size > 0x00000000)
+        mem_mapping_add(&dev->ram_banks[1].mapping, dev->ram_banks[1].virt, dev->ram_banks[1].size,
+                        cs8220_mem_read, cs8220_mem_readw, NULL,
+                        cs8220_mem_write, cs8220_mem_writew, NULL,
+                        ram + dev->ram_banks[1].phys, MEM_MAPPING_INTERNAL, &(dev->ram_banks[1]));
+
+    if (dev->ram_banks[2].size > 0x00000000)
+        mem_mapping_add(&dev->ram_banks[2].mapping, dev->ram_banks[2].virt, dev->ram_banks[2].size,
+                        cs8220_mem_read, cs8220_mem_readw, NULL,
+                        cs8220_mem_write, cs8220_mem_writew, NULL,
+                        ram + dev->ram_banks[2].phys, MEM_MAPPING_INTERNAL, &(dev->ram_banks[2]));
+
+    io_sethandler(0x00a4, 0x0002,
+                  cs8220_in, NULL, NULL, cs8220_out, NULL, NULL, dev);
+    io_sethandler(0x00ab, 0x0001,
+                  cs8220_in, NULL, NULL, cs8220_out, NULL, NULL, dev);
+
+    return dev;
+}
+
+const device_t cs8220_device = {
+    .name          = "C&T CS8220 (PC/AT)",
+    .internal_name = "cs8220",
+    .flags         = 0,
+    .local         = 0,
+    .init          = cs8220_init,
+    .close         = cs8220_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/cs8230.c b/src/chipset/cs8230.c
index 93a7f1bba..0374a44a6 100644
--- a/src/chipset/cs8230.c
+++ b/src/chipset/cs8230.c
@@ -157,8 +157,7 @@ cs8230_close(void *priv)
 static void *
 cs8230_init(UNUSED(const device_t *info))
 {
-    cs8230_t *cs8230 = (cs8230_t *) malloc(sizeof(cs8230_t));
-    memset(cs8230, 0, sizeof(cs8230_t));
+    cs8230_t *cs8230 = (cs8230_t *) calloc(1, sizeof(cs8230_t));
 
     io_sethandler(0x0022, 0x0002, cs8230_read, NULL, NULL, cs8230_write, NULL, NULL, cs8230);
 
@@ -178,7 +177,7 @@ const device_t cs8230_device = {
     .init          = cs8230_init,
     .close         = cs8230_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/et6000.c b/src/chipset/et6000.c
index f2cffd7f7..14ebf852e 100644
--- a/src/chipset/et6000.c
+++ b/src/chipset/et6000.c
@@ -137,8 +137,7 @@ et6000_close(void *priv)
 static void *
 et6000_init(UNUSED(const device_t *info))
 {
-    et6000_t *dev = (et6000_t *) malloc(sizeof(et6000_t));
-    memset(dev, 0, sizeof(et6000_t));
+    et6000_t *dev = (et6000_t *) calloc(1, sizeof(et6000_t));
 
     /* Port 92h */
     device_add(&port_92_device);
@@ -162,7 +161,7 @@ const device_t et6000_device = {
     .init          = et6000_init,
     .close         = et6000_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/gc100.c b/src/chipset/gc100.c
index 0b4717903..e9eb05ecf 100644
--- a/src/chipset/gc100.c
+++ b/src/chipset/gc100.c
@@ -27,6 +27,7 @@
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/nmi.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/pit.h>
 #include <86box/mem.h>
@@ -208,8 +209,7 @@ gc100_close(void *priv)
 static void *
 gc100_init(const device_t *info)
 {
-    gc100_t *dev = (gc100_t *) malloc(sizeof(gc100_t));
-    memset(dev, 0, sizeof(gc100_t));
+    gc100_t *dev = (gc100_t *) calloc(1, sizeof(gc100_t));
 
     dev->reg[0x2] = 0xff;
     dev->reg[0x3] = 0x0;
@@ -238,7 +238,7 @@ const device_t gc100_device = {
     .init          = gc100_init,
     .close         = gc100_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -252,7 +252,7 @@ const device_t gc100a_device = {
     .init          = gc100_init,
     .close         = gc100_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/grid1520.c b/src/chipset/grid1520.c
new file mode 100644
index 000000000..ce8b1e2a9
--- /dev/null
+++ b/src/chipset/grid1520.c
@@ -0,0 +1,333 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the GRiD GRiDcase 1520
+ *
+ *          The GRiDcase 1520 is a 286-based portable.
+ * These are HDDs supported by GRiD1520 (and probably other 15XX) BIOS
+ * "CP3022",5
+ * "CP3024",5, 615,4,17 BIOS table type 2
+ * "CP344",6,
+ * "CP3044",9, 980,5,17 BIOS table type 17
+ * "CP3042",9
+ * "CP3104",7, 776,8,33 extended type 224 (separate entry outside BIOS table)
+ * The only way to run unpatched BIOS is to run exactly that (or larger)
+ * geometry and report model name correctly in response to IDENTYIFY command.
+ * Alternatively you can use RomBuster to patch the BIOS.
+ * https://classicbits.net/coding-and-software/my-software/rombuster/
+ */
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/device.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/io.h>
+#include <86box/keyboard.h>
+#include <86box/machine.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/vid_cga.h>
+#include <86box/plat_unused.h>
+#include <86box/chipset.h>
+
+#define GRID_APPROM_SELECT 0x440
+#define GRID_APPROM_ENABLE 0x405
+
+/*
+approm mapping regs?
+XXX_7FA         equ     7FAh
+XXX_7F8         equ     7F8h
+XXX_7F9         equ     7F9h
+XXX_BD0         equ     0BD0h
+XXX_BD1         equ     0BD1h
+*/
+
+#define GRID_EMS_PAGE_0 0x0258
+#define GRID_EMS_PAGE_1 0x4258
+#define GRID_EMS_PAGE_2 0x8258
+#define GRID_EMS_PAGE_3 0xC258
+#define GRID_TURBO 0x416
+#define GRID_UNUSED_424 0x424
+#define GRID_426 0x426
+#define GRID_HIGH_ENABLE 0xFFF
+#define GRID_ROM_SUBSYSTEM 0x6F8
+
+// EMS window
+#define GRID_EMS_BASE 0xE0000
+#define GRID_EMS_PAGE_SIZE 0x4000
+#define GRID_EMS_PAGE_MASK 0x3FFF
+#define GRID_EMS_PAGE_SHIFT 14
+// physical base of extended memory
+#define GRID_EXTENDED_BASE 0xA0000
+#define GRID_1M 0x100000
+
+typedef struct {
+    uint8_t grid_unknown;
+    uint8_t grid_unused_424;
+    uint8_t grid_426;
+    uint8_t grid_high_enable;
+    uint8_t grid_ems_page[4];
+    mem_mapping_t grid_ems_mapping[4];
+    uint8_t grid_turbo;
+    uint8_t grid_rom_enable;
+    uint8_t grid_rom_select;
+} grid_t;
+
+
+static uint32_t get_grid_ems_paddr(grid_t *dev, uint32_t addr) {
+    uint32_t slot  = (addr >> GRID_EMS_PAGE_SHIFT) & 0x3;
+    uint32_t paddr = addr;
+
+    if (dev->grid_ems_page[slot] & 0x80)
+        paddr = GRID_EXTENDED_BASE + ((uint32_t)(dev->grid_ems_page[slot] & 0x7F) << GRID_EMS_PAGE_SHIFT) + (addr & GRID_EMS_PAGE_MASK);
+
+    return paddr;
+}
+
+static void grid_ems_mem_write8(uint32_t addr, uint8_t val, void *priv) {
+    grid_t *dev = (grid_t *) priv;
+
+    addr = get_grid_ems_paddr(dev, addr);
+
+    if (addr < (mem_size << 10))
+        ram[addr] = val;                
+}
+
+static uint8_t grid_ems_mem_read8(uint32_t addr, void *priv) {
+    grid_t *dev = (grid_t *) priv;
+    uint8_t val = 0xFF;
+
+    addr = get_grid_ems_paddr(dev, addr);
+
+    if (addr < (mem_size << 10))
+        val = ram[addr];                
+
+    return val;
+}
+
+static void grid_ems_mem_write16(uint32_t addr, uint16_t val, void *priv) {
+    grid_t *dev = (grid_t *) priv;
+
+    addr = get_grid_ems_paddr(dev, addr);
+
+    if (addr < (mem_size << 10))
+        *(uint16_t *)&(ram[addr]) = val;                
+}
+
+static uint16_t grid_ems_mem_read16(uint32_t addr, void *priv) {
+    grid_t  *dev = (grid_t *) priv;
+    uint16_t val = 0xFFFF;
+
+    addr = get_grid_ems_paddr(dev, addr);
+
+    if (addr < (mem_size << 10))
+        val = *(uint16_t *)&(ram[addr]);
+
+    return val;
+}
+
+static void grid_ems_update_mapping(grid_t *dev, uint32_t slot) {
+    uint32_t vaddr = GRID_EMS_BASE + (slot << GRID_EMS_PAGE_SHIFT);
+    if (dev->grid_ems_page[slot] & 0x80) {
+        uint32_t paddr;
+        mem_mapping_enable(&dev->grid_ems_mapping[slot]);
+        paddr = get_grid_ems_paddr(dev, vaddr);
+        mem_mapping_set_exec(&dev->grid_ems_mapping[slot], ram + paddr);
+    } else {
+        mem_mapping_disable(&dev->grid_ems_mapping[slot]);
+    }
+}
+
+static void grid_io_write(uint16_t port, uint8_t val, void *priv) {
+    grid_t *dev = (grid_t *) priv;
+
+    switch (port) {
+        case GRID_426:
+            dev->grid_426 = val;
+            break;
+        case GRID_UNUSED_424:
+            dev->grid_unused_424 = val;
+            break;
+        case GRID_ROM_SUBSYSTEM:
+        case GRID_ROM_SUBSYSTEM+1:
+        case GRID_ROM_SUBSYSTEM+2:
+        case GRID_ROM_SUBSYSTEM+3:
+        case GRID_ROM_SUBSYSTEM+4:
+        case GRID_ROM_SUBSYSTEM+5:
+        case GRID_ROM_SUBSYSTEM+6:
+        case GRID_ROM_SUBSYSTEM+7:
+            break;
+        case GRID_APPROM_SELECT:
+            dev->grid_rom_select = val;
+            break;
+        case GRID_APPROM_ENABLE:
+            dev->grid_rom_enable = val;
+            break;
+        case GRID_TURBO:   
+            if ((dev->grid_turbo ^ val) & 1) {
+                dev->grid_turbo = val;
+                if (dev->grid_turbo)
+                    cpu_dynamic_switch(cpu);
+                else
+                    cpu_dynamic_switch(0); /* 286/6 */        
+            }
+            break;
+        case GRID_EMS_PAGE_0:
+        case GRID_EMS_PAGE_1:
+        case GRID_EMS_PAGE_2:
+        case GRID_EMS_PAGE_3: {
+            uint32_t slot = (port >> 14) & 0x3;
+            if (dev->grid_ems_page[slot] == val)
+                break; // no change
+
+            dev->grid_ems_page[slot] = val;
+            if (dev->grid_high_enable & 0x1)
+                break; // XMS is enabled
+            grid_ems_update_mapping(dev, slot);
+
+            flushmmucache();
+            break;
+        }
+        case GRID_HIGH_ENABLE: {
+            if (((val ^ dev->grid_high_enable) & 0x1) == 0)
+                break; // no change
+            dev->grid_high_enable = val;
+            if (dev->grid_high_enable & 0x1) {
+                for (uint8_t i = 0; i < 4; i++)
+                    mem_mapping_disable(&dev->grid_ems_mapping[i]);
+                mem_mapping_enable(&ram_high_mapping);                
+            } else {
+                mem_mapping_disable(&ram_high_mapping);
+                for (uint8_t i = 0; i < 4; i++)
+                    grid_ems_update_mapping(dev, i);
+            }
+            flushmmucache();
+            break;
+        }
+        default:
+            break;
+    }
+}
+
+static uint8_t grid_io_read(uint16_t port, void *priv) {
+    grid_t *dev = (grid_t *) priv;
+
+    switch (port) {
+        case GRID_426:
+            return dev->grid_426;
+            break;
+        case GRID_UNUSED_424:
+            return dev->grid_unused_424;
+            break;
+        case GRID_ROM_SUBSYSTEM:
+            return 0x99;
+            break;
+        case GRID_ROM_SUBSYSTEM+1:
+        case GRID_ROM_SUBSYSTEM+2:
+        case GRID_ROM_SUBSYSTEM+3:
+        case GRID_ROM_SUBSYSTEM+4:
+        case GRID_ROM_SUBSYSTEM+5:
+        case GRID_ROM_SUBSYSTEM+6:
+        case GRID_ROM_SUBSYSTEM+7:
+            break;
+        case GRID_APPROM_SELECT:
+            return dev->grid_rom_select;
+        case GRID_APPROM_ENABLE:
+            return dev->grid_rom_enable;
+        case GRID_TURBO:   
+            return dev->grid_turbo;
+        case GRID_HIGH_ENABLE:
+            return dev->grid_high_enable;
+        case GRID_EMS_PAGE_0:
+        case GRID_EMS_PAGE_1:
+        case GRID_EMS_PAGE_2:
+        case GRID_EMS_PAGE_3: {
+            uint32_t slot = (port >> 14) & 0x3;
+
+            return dev->grid_ems_page[slot];
+            }
+        default:
+            break;
+    }
+
+    return 0xff;
+}
+
+static void *
+grid_init(UNUSED(const device_t *info))
+{
+    grid_t *dev = calloc(1, sizeof(grid_t));
+
+    io_sethandler(GRID_ROM_SUBSYSTEM, 0x0008, grid_io_read, NULL, NULL, grid_io_write, NULL, NULL, dev);
+    io_sethandler(GRID_UNUSED_424, 0x0001, grid_io_read, NULL, NULL, grid_io_write, NULL, NULL, dev);
+    io_sethandler(GRID_426, 0x0001, grid_io_read, NULL, NULL, grid_io_write, NULL, NULL, dev);
+    io_sethandler(GRID_APPROM_SELECT, 0x0001, grid_io_read, NULL, NULL, grid_io_write, NULL, NULL, dev);
+    io_sethandler(GRID_APPROM_ENABLE, 0x0001, grid_io_read, NULL, NULL, grid_io_write, NULL, NULL, dev);
+    io_sethandler(GRID_TURBO, 0x0001, grid_io_read, NULL, NULL, grid_io_write, NULL, NULL, dev);
+    dev->grid_turbo = 0x1;
+
+    io_sethandler(GRID_HIGH_ENABLE, 0x0001, grid_io_read, NULL, NULL, grid_io_write, NULL, NULL, dev);
+    io_sethandler(GRID_EMS_PAGE_0, 0x0001, grid_io_read, NULL, NULL, grid_io_write, NULL, NULL, dev);
+    io_sethandler(GRID_EMS_PAGE_1, 0x0001, grid_io_read, NULL, NULL, grid_io_write, NULL, NULL, dev);
+    io_sethandler(GRID_EMS_PAGE_2, 0x0001, grid_io_read, NULL, NULL, grid_io_write, NULL, NULL, dev);
+    io_sethandler(GRID_EMS_PAGE_3, 0x0001, grid_io_read, NULL, NULL, grid_io_write, NULL, NULL, dev);
+
+    dev->grid_high_enable = 1;
+    for (uint8_t slot = 0; slot < 4; slot++) {
+        dev->grid_ems_page[slot] = 0;
+        mem_mapping_add(&dev->grid_ems_mapping[slot], GRID_EMS_BASE + (slot << GRID_EMS_PAGE_SHIFT), GRID_EMS_PAGE_SIZE, grid_ems_mem_read8, grid_ems_mem_read16, NULL,
+                        grid_ems_mem_write8, grid_ems_mem_write16, NULL, ram + GRID_EXTENDED_BASE + (slot << GRID_EMS_PAGE_SHIFT), MEM_MAPPING_EXTERNAL, dev);
+        mem_mapping_disable(&dev->grid_ems_mapping[slot]);
+    }
+    flushmmucache();
+    return dev;
+}
+
+static void grid_close(void *priv) {
+    grid_t *dev = (grid_t *) priv;
+
+    free(dev);
+}
+
+static void grid_reset(void *priv) {
+    grid_t  *dev = (grid_t *) priv;
+
+    dev->grid_high_enable = 1;
+    mem_mapping_enable(&ram_high_mapping);
+    dev->grid_turbo = 0x1;
+    for (uint8_t slot = 0; slot < 4; slot++) {
+        dev->grid_ems_page[slot] = 0;
+        mem_mapping_disable(&dev->grid_ems_mapping[slot]);
+    }
+    flushmmucache();
+    dev->grid_unknown = 0;
+    dev->grid_unused_424 = 0;
+    dev->grid_426 = 0;
+    dev->grid_rom_enable = 0;
+    dev->grid_rom_select = 0;
+}
+
+const device_t grid1520_device = {
+    .name          = "GRiDcase 1520 chipset",
+    .internal_name = "grid1520",
+    .flags         = 0,
+    .local         = 0,
+    .init          = grid_init,
+    .close         = grid_close,
+    .reset         = grid_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/headland.c b/src/chipset/headland.c
index db5922470..1172d105d 100644
--- a/src/chipset/headland.c
+++ b/src/chipset/headland.c
@@ -594,8 +594,7 @@ headland_init(const device_t *info)
     headland_t *dev;
     int         ht386 = 0;
 
-    dev = (headland_t *) malloc(sizeof(headland_t));
-    memset(dev, 0x00, sizeof(headland_t));
+    dev = (headland_t *) calloc(1, sizeof(headland_t));
 
     dev->has_cri   = (info->local & HEADLAND_HAS_CRI);
     dev->has_sleep = (info->local & HEADLAND_HAS_SLEEP);
@@ -699,7 +698,7 @@ const device_t headland_gc10x_device = {
     .init          = headland_init,
     .close         = headland_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -713,7 +712,7 @@ const device_t headland_gc113_device = {
     .init          = headland_init,
     .close         = headland_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -727,7 +726,7 @@ const device_t headland_ht18a_device = {
     .init          = headland_init,
     .close         = headland_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -741,7 +740,7 @@ const device_t headland_ht18b_device = {
     .init          = headland_init,
     .close         = headland_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -755,7 +754,7 @@ const device_t headland_ht18c_device = {
     .init          = headland_init,
     .close         = headland_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -769,7 +768,7 @@ const device_t headland_ht21c_d_device = {
     .init          = headland_init,
     .close         = headland_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -783,7 +782,7 @@ const device_t headland_ht21e_device = {
     .init          = headland_init,
     .close         = headland_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/ims8848.c b/src/chipset/ims8848.c
index 3e86a44e1..094ee31f8 100644
--- a/src/chipset/ims8848.c
+++ b/src/chipset/ims8848.c
@@ -381,8 +381,7 @@ ims8848_close(void *priv)
 static void *
 ims8848_init(UNUSED(const device_t *info))
 {
-    ims8848_t *dev = (ims8848_t *) malloc(sizeof(ims8848_t));
-    memset(dev, 0, sizeof(ims8848_t));
+    ims8848_t *dev = (ims8848_t *) calloc(1, sizeof(ims8848_t));
 
     device_add(&port_92_device);
 
@@ -416,7 +415,7 @@ const device_t ims8848_device = {
     .init          = ims8848_init,
     .close         = ims8848_close,
     .reset         = ims8848_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/intel_420ex.c b/src/chipset/intel_420ex.c
index 34335d53c..662fd0509 100644
--- a/src/chipset/intel_420ex.c
+++ b/src/chipset/intel_420ex.c
@@ -533,8 +533,7 @@ i420ex_speed_changed(void *priv)
 static void *
 i420ex_init(const device_t *info)
 {
-    i420ex_t *dev = (i420ex_t *) malloc(sizeof(i420ex_t));
-    memset(dev, 0, sizeof(i420ex_t));
+    i420ex_t *dev = (i420ex_t *) calloc(1, sizeof(i420ex_t));
 
     dev->smram = smram_add();
 
@@ -579,7 +578,7 @@ const device_t i420ex_device = {
     .init          = i420ex_init,
     .close         = i420ex_close,
     .reset         = i420ex_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = i420ex_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -593,7 +592,7 @@ const device_t i420ex_ide_device = {
     .init          = i420ex_init,
     .close         = i420ex_close,
     .reset         = i420ex_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = i420ex_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/intel_4x0.c b/src/chipset/intel_4x0.c
index a1f923e49..8e6ce97c3 100644
--- a/src/chipset/intel_4x0.c
+++ b/src/chipset/intel_4x0.c
@@ -493,16 +493,40 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
             case 0x52: /* Cache Control Register */
                 switch (dev->type) {
                     default:
+                    /*
+                       420TX/ZX:
+                       Bit 7-6: 0, 0 = 64 kB,
+                                0, 1 = 128 kB,
+                                1, 0 = 256 kB,
+                                1, 1 = 512 kB.
+                       Bit 5: 1 = L2 cache present, 0 = L2 cache absent.
+                       Bit 1: 1 = Write back cache, 0 = write through cache.
+                       Bit 0: 1 = L2 cache enable, 0 = L2 cache disable.
+                     */
                     case INTEL_420TX:
                     case INTEL_420ZX:
+                    case INTEL_430NX:
+                        regs[0x52] = (regs[0x52] & 0xe0) | (val & 0x1f);
+                        cpu_cache_ext_enabled = val & 0x01;
+                        cpu_update_waitstates();
+                        break;
                     case INTEL_430LX:
+                        regs[0x52] = (regs[0x52] & 0xe0) | (val & 0x1b);
+                        cpu_cache_ext_enabled = val & 0x01;
+                        cpu_update_waitstates();
+                        break;
                     case INTEL_430FX:
                     case INTEL_430VX:
                     case INTEL_430TX:
-                        regs[0x52] = (val & 0xfb);
+                        regs[0x52] = (regs[0x52] & 0x04) | (val & 0xfb);
+                        cpu_cache_ext_enabled = ((val & 0x03) == 0x01);
+                        cpu_update_waitstates();
                         break;
-                    case INTEL_430NX:
                     case INTEL_430HX:
+                        regs[0x52] = val;
+                        cpu_cache_ext_enabled = ((val & 0x03) == 0x01);
+                        cpu_update_waitstates();
+                        break;
                     case INTEL_440FX:
                         regs[0x52] = val;
                         break;
@@ -989,7 +1013,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_430TX:
                         if (!dev->smram_locked) {
                             i4x0_smram_handler_phase0(dev);
-                            regs[0x71] = (regs[0x71] & 0x20) | (val & 0xdf);
+                            regs[0x71] = (regs[0x71] & 0x60) | (val & 0x9f);
+                            regs[0x71] &= (val & 0x40);
                             i4x0_smram_handler_phase1(dev);
                         }
                         break;
@@ -1017,9 +1042,11 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                             regs[0x72] = (val & 0x7f);
                         else
                             regs[0x72] = (regs[0x72] & 0x87) | (val & 0x78);
-                        dev->smram_locked = (val & 0x10);
-                        if (dev->smram_locked)
-                            regs[0x72] &= 0xbf;
+                        if (val & 0x08) {
+                            dev->smram_locked = (val & 0x10);
+                            if (dev->smram_locked)
+                                regs[0x72] &= 0xbf;
+                        }
                     }
                 } else {
                     if (dev->smram_locked)
@@ -1553,6 +1580,8 @@ i4x0_reset(void *priv)
             dev->regs[0x68 + i] = 0x00;
     }
 
+    dev->smram_locked = 0;
+
     if (dev->type >= INTEL_430FX) {
         dev->regs[0x72] &= 0xef; /* Forcibly unlock the SMRAM register. */
         i4x0_write(0, 0x72, 0x02, priv);
@@ -1584,11 +1613,9 @@ i4x0_close(void *priv)
 static void *
 i4x0_init(const device_t *info)
 {
-    i4x0_t  *dev = (i4x0_t *) malloc(sizeof(i4x0_t));
+    i4x0_t  *dev = (i4x0_t *) calloc(1, sizeof(i4x0_t));
     uint8_t *regs;
 
-    memset(dev, 0, sizeof(i4x0_t));
-
     dev->smram_low  = smram_add();
     dev->smram_high = smram_add();
 
@@ -1630,11 +1657,16 @@ i4x0_init(const device_t *info)
                     0x00 = None, 0x01 = 64 kB, 0x41 = 128 kB, 0x81 = 256 kB, 0xc1 = 512 kB,
                     If bit 0 is set, then if bit 2 is also set, the cache is write back,
                     otherwise it's write through. */
-            regs[0x52] = 0xc3; /* 512 kB writeback cache */
+            regs[0x52] = 0xe0; /* 512 kB writeback cache */
             regs[0x57] = 0x31;
             regs[0x59] = 0x0f;
             regs[0x60] = regs[0x61] = regs[0x62] = regs[0x63] = 0x02;
-            dev->max_drb                                      = 3;
+            /* At the very least the 420ZX seems to read to 0x64, per the SB486PV. */
+            if (dev->type == INTEL_420ZX) {
+                regs[0x64]   = 0x02;
+                dev->max_drb = 4;
+            } else
+                dev->max_drb                                      = 3;
             dev->drb_unit                                     = 1;
             dev->drb_default                                  = 0x02;
             break;
@@ -1943,7 +1975,7 @@ const device_t i420tx_device = {
     .init          = i4x0_init,
     .close         = i4x0_close,
     .reset         = i4x0_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1957,7 +1989,7 @@ const device_t i420zx_device = {
     .init          = i4x0_init,
     .close         = i4x0_close,
     .reset         = i4x0_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1971,7 +2003,7 @@ const device_t i430lx_device = {
     .init          = i4x0_init,
     .close         = i4x0_close,
     .reset         = i4x0_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1985,7 +2017,7 @@ const device_t i430nx_device = {
     .init          = i4x0_init,
     .close         = i4x0_close,
     .reset         = i4x0_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1999,7 +2031,7 @@ const device_t i430fx_device = {
     .init          = i4x0_init,
     .close         = i4x0_close,
     .reset         = i4x0_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2013,7 +2045,7 @@ const device_t i430fx_rev02_device = {
     .init          = i4x0_init,
     .close         = i4x0_close,
     .reset         = i4x0_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2027,7 +2059,7 @@ const device_t i430hx_device = {
     .init          = i4x0_init,
     .close         = i4x0_close,
     .reset         = i4x0_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2041,7 +2073,7 @@ const device_t i430vx_device = {
     .init          = i4x0_init,
     .close         = i4x0_close,
     .reset         = i4x0_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2055,7 +2087,7 @@ const device_t i430tx_device = {
     .init          = i4x0_init,
     .close         = i4x0_close,
     .reset         = i4x0_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2069,7 +2101,7 @@ const device_t i440fx_device = {
     .init          = i4x0_init,
     .close         = i4x0_close,
     .reset         = i4x0_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2083,7 +2115,7 @@ const device_t i440lx_device = {
     .init          = i4x0_init,
     .close         = i4x0_close,
     .reset         = i4x0_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2097,7 +2129,7 @@ const device_t i440ex_device = {
     .init          = i4x0_init,
     .close         = i4x0_close,
     .reset         = i4x0_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2111,7 +2143,7 @@ const device_t i440bx_device = {
     .init          = i4x0_init,
     .close         = i4x0_close,
     .reset         = i4x0_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2125,7 +2157,7 @@ const device_t i440bx_no_agp_device = {
     .init          = i4x0_init,
     .close         = i4x0_close,
     .reset         = i4x0_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2139,7 +2171,7 @@ const device_t i440gx_device = {
     .init          = i4x0_init,
     .close         = i4x0_close,
     .reset         = i4x0_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2153,7 +2185,7 @@ const device_t i440zx_device = {
     .init          = i4x0_init,
     .close         = i4x0_close,
     .reset         = i4x0_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/intel_82335.c b/src/chipset/intel_82335.c
index da0cc30f6..bd53e0d05 100644
--- a/src/chipset/intel_82335.c
+++ b/src/chipset/intel_82335.c
@@ -171,8 +171,7 @@ intel_82335_close(void *priv)
 static void *
 intel_82335_init(UNUSED(const device_t *info))
 {
-    intel_82335_t *dev = (intel_82335_t *) malloc(sizeof(intel_82335_t));
-    memset(dev, 0, sizeof(intel_82335_t));
+    intel_82335_t *dev = (intel_82335_t *) calloc(1, sizeof(intel_82335_t));
 
     memset(dev->regs, 0, sizeof(dev->regs));
 
@@ -209,7 +208,7 @@ const device_t intel_82335_device = {
     .init          = intel_82335_init,
     .close         = intel_82335_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/intel_i450kx.c b/src/chipset/intel_i450kx.c
index 2f6547309..34cc6a62f 100644
--- a/src/chipset/intel_i450kx.c
+++ b/src/chipset/intel_i450kx.c
@@ -799,8 +799,8 @@ i450kx_close(void *priv)
 static void *
 i450kx_init(UNUSED(const device_t *info))
 {
-    i450kx_t *dev = (i450kx_t *) malloc(sizeof(i450kx_t));
-    memset(dev, 0, sizeof(i450kx_t));
+    i450kx_t *dev = (i450kx_t *) calloc(1, sizeof(i450kx_t));
+
     pci_add_card(PCI_ADD_NORTHBRIDGE, pb_read, pb_write, dev, &dev->pb_slot);        /* Device 19h: Intel 450KX PCI Bridge PB */
     pci_add_card(PCI_ADD_NORTHBRIDGE_SEC, mc_read, mc_write, dev, &dev->mc_slot);    /* Device 14h: Intel 450KX Memory Controller MC */
 
@@ -824,7 +824,7 @@ const device_t i450kx_device = {
     .init          = i450kx_init,
     .close         = i450kx_close,
     .reset         = i450kx_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/intel_piix.c b/src/chipset/intel_piix.c
index 1f95c28b3..5d0c18441 100644
--- a/src/chipset/intel_piix.c
+++ b/src/chipset/intel_piix.c
@@ -47,6 +47,7 @@
 #include <86box/hdc_ide.h>
 #include <86box/hdc_ide_sff8038i.h>
 #include <86box/usb.h>
+#include <86box/lpt.h>
 #include <86box/machine.h>
 #include <86box/smbus.h>
 #include <86box/chipset.h>
@@ -59,7 +60,6 @@ typedef struct piix_io_trap_t {
 } piix_io_trap_t;
 
 typedef struct _piix_ {
-    uint8_t        cur_readout_reg;
     uint8_t        rev;
     uint8_t        type;
     uint8_t        func_shift;
@@ -67,7 +67,6 @@ typedef struct _piix_ {
     uint8_t        pci_slot;
     uint8_t        no_mirq0;
     uint8_t        regs[4][256];
-    uint8_t        readout_regs[256];
     uint16_t       func0_id;
     uint16_t       nvr_io_base;
     uint16_t       acpi_io_base;
@@ -157,6 +156,7 @@ piix_ide_handlers(piix_t *dev, int bus)
     uint16_t side;
 
     if (bus & 0x01) {
+        piix_log("Disabling primary IDE...\n");
         ide_pri_disable();
 
         if (dev->type == 5) {
@@ -172,11 +172,14 @@ piix_ide_handlers(piix_t *dev, int bus)
             ide_set_side(0, side);
         }
 
-        if ((dev->regs[1][0x04] & 0x01) && (dev->regs[1][0x41] & 0x80))
+        if ((dev->regs[1][0x04] & 0x01) && (dev->regs[1][0x41] & 0x80)) {
+            piix_log("Enabling primary IDE...\n");
             ide_pri_enable();
+        }
     }
 
     if (bus & 0x02) {
+        piix_log("Disabling secondary IDE...\n");
         ide_sec_disable();
 
         if (dev->type == 5) {
@@ -192,8 +195,10 @@ piix_ide_handlers(piix_t *dev, int bus)
             ide_set_side(1, side);
         }
 
-        if ((dev->regs[1][0x04] & 0x01) && (dev->regs[1][0x43] & 0x80))
+        if ((dev->regs[1][0x04] & 0x01) && (dev->regs[1][0x43] & 0x80)) {
+            piix_log("Enabling secondary IDE...\n");
             ide_sec_enable();
+        }
     }
 }
 
@@ -467,6 +472,13 @@ piix_write(int func, int addr, uint8_t val, void *priv)
     uint8_t *fregs;
     uint16_t base;
 
+    /* Dell OptiPlex Gn+ shows that register 02:FF is aliased in 01:FF. */
+    if ((dev->type == 4) && (func == 1) && (addr == 0xff))
+        func = 2;
+
+    if ((func == 1) || (addr == 0xf8) || (addr == 0xf9))
+        piix_log("[W] %02X:%02X = %02X\n", func, addr, val);
+
     /* Return on unsupported function. */
     if (dev->max_func > 0) {
         if (func > dev->max_func)
@@ -599,14 +611,21 @@ piix_write(int func, int addr, uint8_t val, void *priv)
                         pci_set_mirq_routing(PCI_MIRQ0 + (addr & 0x01), val & 0xf);
                     if (dev->type == 3) {
                         if (val & 0x20)
-                            sff_set_irq_mode(dev->bm[1], IRQ_MODE_MIRQ_0);
-                        else
                             sff_set_irq_mode(dev->bm[1], IRQ_MODE_LEGACY);
+                        else
+                            sff_set_irq_mode(dev->bm[1], IRQ_MODE_MIRQ_0);
                     }
                     piix_log("MIRQ%i is %s\n", addr & 0x01, (val & 0x20) ? "disabled" : "enabled");
                 }
                 break;
             case 0x76:
+                if (dev->type > 1)
+                    fregs[addr] = val & 0x87;
+                else if (dev->type <= 4)
+                    fregs[addr] = val & 0x8f;
+                if ((dev->type == 1) && machine_has_jumpered_ecp_dma(machine, MACHINE_DMA_USE_MBDMA))
+                    lpt1_dma(((val & 0x08) || ((val & 0x07) == 0x04)) ? 0xff : (val & 0x07));
+                break;
             case 0x77:
                 if (dev->type > 1)
                     fregs[addr] = val & 0x87;
@@ -738,6 +757,8 @@ piix_write(int func, int addr, uint8_t val, void *priv)
                     fregs[addr] = val;
                 break;
             case 0xb0:
+                if (val & 0x10)
+                    warning("Write %02X to B0\n", val);
                 if (dev->type == 4)
                     fregs[addr] = (fregs[addr] & 0x8c) | (val & 0x73);
                 else if (dev->type == 5)
@@ -747,6 +768,8 @@ piix_write(int func, int addr, uint8_t val, void *priv)
                     alt_access = !!(val & 0x20);
                 break;
             case 0xb1:
+                if (val & 0x18)
+                    warning("Write %02X to B1\n", val);
                 if (dev->type > 3)
                     fregs[addr] = val & 0xdf;
                 break;
@@ -925,6 +948,12 @@ piix_write(int func, int addr, uint8_t val, void *priv)
                 if (dev->type > 4)
                     fregs[addr] = val;
                 break;
+            case 0xf8:
+            case 0xf9:
+                /* Undocumented! */
+                if (dev->type == 4)
+                    fregs[addr] = val;
+                break;
             default:
                 break;
         }
@@ -1171,6 +1200,10 @@ piix_read(int func, int addr, void *priv)
     uint8_t        ret = 0xff;
     const uint8_t *fregs;
 
+    /* Dell OptiPlex Gn+ shows that register 02:FF is aliased in 01:FF. */
+    if ((dev->type == 4) && (func == 1) && (addr == 0xff))
+        func = 2;
+
     if ((dev->type == 3) && (func == 2) && (dev->max_func == 1) && (addr >= 0x40))
         ret = 0x00;
 
@@ -1185,31 +1218,6 @@ piix_read(int func, int addr, void *priv)
     return ret;
 }
 
-static void
-board_write(uint16_t port, uint8_t val, void *priv)
-{
-    piix_t *dev = (piix_t *) priv;
-
-    if (port == 0x00e0)
-        dev->cur_readout_reg = val;
-    else if (port == 0x00e1)
-        dev->readout_regs[dev->cur_readout_reg] = val;
-}
-
-static uint8_t
-board_read(uint16_t port, void *priv)
-{
-    const piix_t *dev = (piix_t *) priv;
-    uint8_t       ret = 0x64;
-
-    if (port == 0x00e0)
-        ret = dev->cur_readout_reg;
-    else if (port == 0x00e1)
-        ret = dev->readout_regs[dev->cur_readout_reg];
-
-    return ret;
-}
-
 static void
 piix_reset_hard(piix_t *dev)
 {
@@ -1226,7 +1234,7 @@ piix_reset_hard(piix_t *dev)
 
         sff_set_slot(dev->bm[1], dev->pci_slot);
         sff_set_irq_pin(dev->bm[1], PCI_INTA);
-        sff_set_irq_line(dev->bm[1], 14);
+        sff_set_irq_line(dev->bm[1], 15);
         sff_set_irq_mode(dev->bm[1], IRQ_MODE_LEGACY);
     }
 
@@ -1342,6 +1350,10 @@ piix_reset_hard(piix_t *dev)
         fregs[0x45] = 0x55;
         fregs[0x46] = 0x01;
     }
+    if (dev->type == 4) {
+        fregs[0xf8] = 0x30;
+        fregs[0xf9] = 0x0f;
+    }
     if ((dev->type == 1) && (dev->rev == 2))
         dev->max_func = 0; /* It starts with IDE disabled, then enables it. */
     else
@@ -1538,8 +1550,7 @@ piix_speed_changed(void *priv)
 static void *
 piix_init(const device_t *info)
 {
-    piix_t *dev = (piix_t *) malloc(sizeof(piix_t));
-    memset(dev, 0, sizeof(piix_t));
+    piix_t *dev = (piix_t *) calloc(1, sizeof(piix_t));
 
     dev->type = info->local & 0x0f;
     /* If (dev->type == 4) and (dev->rev & 0x08), then this is PIIX4E. */
@@ -1618,47 +1629,16 @@ piix_init(const device_t *info)
     else
         cpu_set_isa_pci_div(3);
 
-    dma_alias_set();
+    if (dev->type > 1)
+        dma_alias_set();
+    else
+        dma_alias_set_piix();
 
     if (dev->type < 4)
         pci_enable_mirq(0);
     if (dev->type < 3)
         pci_enable_mirq(1);
 
-    dev->readout_regs[0] = 0xff;
-    dev->readout_regs[1] = 0x40;
-    dev->readout_regs[2] = 0xff;
-
-    /* Port E1 register 01 (TODO: Find how multipliers > 3.0 are defined):
-
-        Bit 6: 1 = can boot, 0 = no;
-        Bit 7, 1 = multiplier (00 = 2.5, 01 = 2.0, 10 = 3.0, 11 = 1.5);
-        Bit 5, 4 = bus speed (00 = 50 MHz, 01 = 66 MHz, 10 = 60 MHz, 11 = ????):
-        Bit 7, 5, 4, 1: 0000 = 125 MHz, 0010 = 166 MHz, 0100 = 150 MHz, 0110 = ??? MHz;
-                        0001 = 100 MHz, 0011 = 133 MHz, 0101 = 120 MHz, 0111 = ??? MHz;
-                        1000 = 150 MHz, 1010 = 200 MHz, 1100 = 180 MHz, 1110 = ??? MHz;
-                        1001 =  75 MHz, 1011 = 100 MHz, 1101 =  90 MHz, 1111 = ??? MHz */
-
-    if (cpu_busspeed <= 40000000)
-        dev->readout_regs[1] |= 0x30;
-    else if ((cpu_busspeed > 40000000) && (cpu_busspeed <= 50000000))
-        dev->readout_regs[1] |= 0x00;
-    else if ((cpu_busspeed > 50000000) && (cpu_busspeed <= 60000000))
-        dev->readout_regs[1] |= 0x20;
-    else if (cpu_busspeed > 60000000)
-        dev->readout_regs[1] |= 0x10;
-
-    if (cpu_dmulti <= 1.5)
-        dev->readout_regs[1] |= 0x82;
-    else if ((cpu_dmulti > 1.5) && (cpu_dmulti <= 2.0))
-        dev->readout_regs[1] |= 0x02;
-    else if ((cpu_dmulti > 2.0) && (cpu_dmulti <= 2.5))
-        dev->readout_regs[1] |= 0x00;
-    else if (cpu_dmulti > 2.5)
-        dev->readout_regs[1] |= 0x80;
-
-    io_sethandler(0x00e0, 0x0002, board_read, NULL, NULL, board_write, NULL, NULL, dev);
-
 #if 0
     device_add(&i8254_sec_device);
 #endif
@@ -1674,7 +1654,7 @@ const device_t piix_device = {
     .init          = piix_init,
     .close         = piix_close,
     .reset         = piix_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = piix_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1688,7 +1668,7 @@ const device_t piix_no_mirq_device = {
     .init          = piix_init,
     .close         = piix_close,
     .reset         = piix_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = piix_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1702,7 +1682,7 @@ const device_t piix_rev02_device = {
     .init          = piix_init,
     .close         = piix_close,
     .reset         = piix_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = piix_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1716,7 +1696,7 @@ const device_t piix3_device = {
     .init          = piix_init,
     .close         = piix_close,
     .reset         = piix_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = piix_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1730,7 +1710,7 @@ const device_t piix3_ioapic_device = {
     .init          = piix_init,
     .close         = piix_close,
     .reset         = piix_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = piix_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1744,7 +1724,7 @@ const device_t piix4_device = {
     .init          = piix_init,
     .close         = piix_close,
     .reset         = piix_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = piix_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1758,7 +1738,7 @@ const device_t piix4e_device = {
     .init          = piix_init,
     .close         = piix_close,
     .reset         = piix_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = piix_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1772,7 +1752,7 @@ const device_t slc90e66_device = {
     .init          = piix_init,
     .close         = piix_close,
     .reset         = piix_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = piix_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/intel_sio.c b/src/chipset/intel_sio.c
index 03a292da8..b11ec0765 100644
--- a/src/chipset/intel_sio.c
+++ b/src/chipset/intel_sio.c
@@ -355,7 +355,23 @@ sio_config_read(uint16_t port, UNUSED(void *priv))
             ret = 0xff;
             break;
         case 5:
-            ret = 0xd3;
+            /*
+               Dell Dimension XPS P60 jumpers:
+                   - Bit 5: Disable CMOS Setup (1 = yes, 0 = no).
+
+               Dell OptiPlex 560/L jumpers:
+                   - Bit 1: Password (1 = disable, 0 = enable);
+                   - Bit 5: Clear CMOS (1 = no, 0 = yes).
+                   - Bits 7, 6: Board type:
+                       - 0, 0 = L;
+                       - 0, 1 = MT;
+                       - 1, 0 = M;
+                       - 1, 1 = M.
+             */
+            if (!strcmp(machine_get_internal_name(), "opti560l"))
+                ret = 0x20;
+            else
+                ret = 0xd3;
 
             switch (cpu_pci_speed) {
                 case 20000000:
@@ -508,8 +524,7 @@ sio_speed_changed(void *priv)
 static void *
 sio_init(const device_t *info)
 {
-    sio_t *dev = (sio_t *) malloc(sizeof(sio_t));
-    memset(dev, 0, sizeof(sio_t));
+    sio_t *dev = (sio_t *) calloc(1, sizeof(sio_t));
 
     pci_add_card(PCI_ADD_SOUTHBRIDGE, sio_read, sio_write, dev, &dev->pci_slot);
 
@@ -568,7 +583,7 @@ const device_t sio_device = {
     .init          = sio_init,
     .close         = sio_close,
     .reset         = sio_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = sio_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -582,7 +597,7 @@ const device_t sio_zb_device = {
     .init          = sio_init,
     .close         = sio_close,
     .reset         = sio_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = sio_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/isa486c.c b/src/chipset/isa486c.c
new file mode 100644
index 000000000..6494ed1b8
--- /dev/null
+++ b/src/chipset/isa486c.c
@@ -0,0 +1,131 @@
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/mem.h>
+#include <86box/plat_unused.h>
+#include <86box/chipset.h>
+
+typedef struct isa486c_t {
+    uint8_t regs[3];
+} isa486c_t;
+
+static void
+isa486c_recalcmapping(isa486c_t *dev)
+{
+    uint32_t shflags  = 0;
+    uint32_t bases[5] = { 0x000c0000, 0x000c8000, 0x000d0000, 0x000d8000, 0x000e0000 };
+    uint32_t sizes[5] = { 0x00008000, 0x00008000, 0x00008000, 0x00008000, 0x00020000 };
+
+    if (dev->regs[1] & 0x20)
+        shflags = MEM_READ_EXTANY | MEM_WRITE_INTERNAL;
+    else
+        shflags = MEM_READ_INTERNAL | MEM_WRITE_EXTANY;
+
+    shadowbios       = 0;
+    shadowbios_write = 0;
+
+    for (uint8_t i = 0; i < 5; i++)
+        if (dev->regs[1] & (1 << i)) {
+            if (i == 4) {
+                shadowbios       = 1;
+                shadowbios_write = !!(dev->regs[1] & 0x20);
+            }
+
+            mem_set_mem_state_both(bases[i], sizes[i], shflags);
+       } else
+            mem_set_mem_state_both(bases[i], sizes[i], MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+
+    flushmmucache_nopc();
+}
+
+static void
+isa486c_write(uint16_t addr, uint8_t val, void *priv)
+{
+    isa486c_t *dev = (isa486c_t *) priv;
+
+    switch (addr) {
+        case 0x0023:
+            dev->regs[0] = val;
+            break;
+        /*
+           Port 25h:
+               - Bit 0 = Video BIOS (C000-C7FF) shadow enabled;
+               - Bit 1 = C800-C8FF shadow enabled;
+               - Bit 2 = D000-D7FF shadow enabled;
+               - Bit 3 = D800-DFFF shadow enabled;
+               - Bit 4 = E000-FFFF shadow enabled (or F0000-FFFFF?);
+               - Bit 5 = If set, read from ROM, write to shadow;
+               - Bit 6 = KEN Video & BIOS enabled (cacheability!).
+         */
+        case 0x0025:
+            dev->regs[1] = val;
+            isa486c_recalcmapping(dev);
+            break;
+        case 0x0027:
+            dev->regs[2] = val;
+            break;
+    }
+}
+
+static uint8_t
+isa486c_read(uint16_t addr, void *priv)
+{
+    isa486c_t *dev = (isa486c_t *) priv;
+    uint8_t    ret = 0xff;
+
+    switch (addr) {
+        case 0x0023:
+            ret = dev->regs[0];
+            break;
+        case 0x0025:
+            ret = dev->regs[1];
+            break;
+        case 0x0027:
+            ret = dev->regs[2];
+            break;
+    }
+
+    return ret;
+}
+
+static void
+isa486c_close(void *priv)
+{
+    isa486c_t *dev = (isa486c_t *) priv;
+
+    free(dev);
+}
+
+static void *
+isa486c_init(UNUSED(const device_t *info))
+{
+    isa486c_t *dev = (isa486c_t *) calloc(1, sizeof(isa486c_t));
+
+    io_sethandler(0x0023, 0x0001, isa486c_read, NULL, NULL, isa486c_write, NULL, NULL, dev);
+    io_sethandler(0x0025, 0x0001, isa486c_read, NULL, NULL, isa486c_write, NULL, NULL, dev);
+    io_sethandler(0x0027, 0x0001, isa486c_read, NULL, NULL, isa486c_write, NULL, NULL, dev);
+
+    return dev;
+}
+
+const device_t isa486c_device = {
+    .name          = "ASUS ISA-486C Gate Array",
+    .internal_name = "isa486c",
+    .flags         = 0,
+    .local         = 0,
+    .init          = isa486c_init,
+    .close         = isa486c_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/laserxt.c b/src/chipset/laserxt.c
new file mode 100644
index 000000000..a5308e2f0
--- /dev/null
+++ b/src/chipset/laserxt.c
@@ -0,0 +1,473 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the VTech LaserXT chipset.
+ *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *          Fred N. van Kempen, <decwiz@yahoo.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
+ *
+ *          Copyright 2008-2025 Sarah Walker.
+ *          Copyright 2016-2025 Miran Grca.
+ *          Copyright 2017-2025 Fred N. van Kempen.
+ *          Copyright 2025      Jasmine Iwanek.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/io.h>
+#include <86box/mem.h>
+#include <86box/nmi.h>
+#include <86box/timer.h>
+#include <86box/pit.h>
+#include <86box/rom.h>
+#include <86box/machine.h>
+#include <86box/device.h>
+#include <86box/timer.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/gameport.h>
+#include <86box/keyboard.h>
+#include <86box/plat_unused.h>
+
+#define EMS_TOTAL_MAX 0x00100000
+
+typedef struct
+{
+    uint8_t          page;
+    uint8_t          ctrl;
+
+    uint32_t         phys;
+    uint32_t         virt;
+
+    mem_mapping_t    mapping;
+
+    uint8_t         *ram;
+
+    void            *parent;
+} lxt_ems_t;
+
+typedef struct
+{
+    int              ems_base_idx;
+
+    lxt_ems_t        ems[4];
+
+    uint16_t         io_base;
+    uint32_t         base;
+
+    uint32_t         mem_size;
+
+    uint8_t         *ram;
+
+    void            *parent;
+} lxt_ems_board_t;
+
+typedef struct
+{
+    int              is_lxt3;
+
+    lxt_ems_board_t *ems_boards[2];
+} lxt_t;
+
+static void
+ems_update_virt(lxt_ems_t *dev, uint8_t new_page)
+{
+    lxt_ems_board_t *board = (lxt_ems_board_t *) dev->parent;
+    lxt_t           *lxt   = (lxt_t *) board->parent;
+
+    dev->page = new_page;
+
+    if (new_page & 0x80) {
+        if (lxt->is_lxt3) {
+            /* Point invalid pages at 1 MB which is outside the maximum. */
+            if ((new_page & 0x7f) >= 0x40)
+                dev->virt = EMS_TOTAL_MAX;
+           else
+                dev->virt = ((new_page & 0x7f) << 14);
+        } else
+            dev->virt = ((new_page & 0x0f) << 14) + ((new_page & 0x40) << 12);
+
+        if (dev->virt >= board->mem_size)
+            dev->virt = EMS_TOTAL_MAX;
+    } else
+        dev->virt = EMS_TOTAL_MAX;
+
+    dev->ram = board->ram + dev->virt;
+
+    if ((new_page & 0x80) && (dev->virt != EMS_TOTAL_MAX)) {
+        mem_mapping_enable(&dev->mapping);
+
+        mem_mapping_set_exec(&dev->mapping, dev->ram);
+        mem_mapping_set_p(&dev->mapping, dev->ram);
+    } else
+        mem_mapping_disable(&dev->mapping);
+
+    flushmmucache();
+}
+
+static void
+lxt_ems_out(uint16_t port, uint8_t val, void *priv)
+{
+    lxt_ems_board_t *dev       = (lxt_ems_board_t *) priv;
+    uint8_t          reg       = port >> 14;
+    uint32_t         saddrs[8] = { 0xc4000, 0xc8000, 0xcc000, 0xd0000,
+                                   0xd4000, 0xd8000, 0xdc000, 0xe0000 };
+    uint32_t saddr;
+
+    if (port & 0x0001) {
+        dev->ems[reg].ctrl = val;
+
+        if (reg < 0x03) {
+            dev->ems_base_idx  = (dev->ems_base_idx & ~(0x04 >> (2 - reg))) |
+                                 ((dev->ems[reg].ctrl & 0x80) >> (7 - reg));
+
+            saddr = saddrs[dev->ems_base_idx];
+        
+            for (uint8_t i = 0; i < 4; i++) {
+                uint32_t base = saddr + (i * 0x4000);
+                mem_mapping_set_addr(&dev->ems[i].mapping, base, 0x4000);
+                if (!(dev->ems[i].page & 0x80) || (dev->ems[i].virt == EMS_TOTAL_MAX))
+                    mem_mapping_disable(&dev->ems[i].mapping);
+            }
+        }
+
+        flushmmucache();
+    } else if (!(port & 0x0001)) {
+        dev->ems[reg].page = val;
+        ems_update_virt(&dev->ems[reg], val);
+    }
+}
+
+static uint8_t
+lxt_ems_in(uint16_t port, void *priv)
+{
+    lxt_ems_board_t *dev = (lxt_ems_board_t *) priv;
+    uint8_t          reg = port >> 14;
+    uint8_t          ret = 0xff;
+
+    if (port & 0x0001)
+        ret = dev->ems[reg].ctrl;
+    else
+        ret = dev->ems[reg].page;
+
+    return ret;
+}
+
+static void
+lxt_ems_write(uint32_t addr, uint8_t val, void *priv)
+{
+    uint8_t *mem = (uint8_t *) priv;
+
+    mem[addr & 0x3fff] = val;
+}
+
+static void
+lxt_ems_writew(uint32_t addr, uint16_t val, void *priv)
+{
+    uint8_t *mem = (uint8_t *) priv;
+
+    *(uint16_t *) &(mem[addr & 0x3fff]) = val;
+}
+
+static uint8_t
+lxt_ems_read(uint32_t addr, void *priv)
+{
+    uint8_t *mem = (uint8_t *) priv;
+    uint8_t  ret = 0xff;
+
+    ret = mem[addr & 0x3fff];
+
+    return ret;
+}
+
+static uint16_t
+lxt_ems_readw(uint32_t addr, void *priv)
+{
+    uint8_t  *mem = (uint8_t *) priv;
+    uint16_t  ret = 0xff;
+
+    ret = *(uint16_t *) &(mem[addr & 0x3fff]);
+
+    return ret;
+}
+
+static lxt_ems_board_t *
+lxt_ems_init(lxt_t *parent, int en, uint16_t io, uint32_t mem)
+{
+    lxt_ems_board_t *dev = (lxt_ems_board_t *) calloc(1, sizeof(lxt_ems_board_t));
+
+    if (en) {
+        dev->parent = parent;
+
+        if (io != 0x0000) {
+            io_sethandler(io         , 0x0002, lxt_ems_in, NULL, NULL, lxt_ems_out, NULL, NULL, dev);
+            io_sethandler(io | 0x4000, 0x0002, lxt_ems_in, NULL, NULL, lxt_ems_out, NULL, NULL, dev);
+            io_sethandler(io | 0x8000, 0x0002, lxt_ems_in, NULL, NULL, lxt_ems_out, NULL, NULL, dev);
+            io_sethandler(io | 0xc000, 0x0002, lxt_ems_in, NULL, NULL, lxt_ems_out, NULL, NULL, dev);
+        }
+
+        dev->ram      = (uint8_t *) calloc(mem, sizeof(uint8_t));
+        dev->mem_size = mem;
+
+        for (uint8_t i = 0; i < 4; i++) {
+            uint8_t *ptr = dev->ram + (i << 14);
+
+            if (parent->is_lxt3)
+                mem_mapping_add(&dev->ems[i].mapping, 0xe0000 + (i << 14), 0x4000,
+                                lxt_ems_read,  lxt_ems_readw,  NULL,
+                                lxt_ems_write, lxt_ems_writew, NULL,
+                                ptr, 0, ptr);
+            else
+                mem_mapping_add(&dev->ems[i].mapping, 0xe0000 + (i << 14), 0x4000,
+                                lxt_ems_read,  NULL,           NULL,
+                                lxt_ems_write, NULL,           NULL,
+                                ptr, 0, ptr);
+
+            mem_mapping_disable(&dev->ems[i].mapping);
+
+            dev->ems[i].page = 0x7f;
+            dev->ems[i].ctrl = (i == 3) ? 0x00 : 0x80;
+
+            dev->ems[i].parent = dev;
+
+            ems_update_virt(&(dev->ems[i]), dev->ems[i].page);
+        }
+    }
+
+    return dev;
+}
+
+static void
+lxt_close(void *priv)
+{
+    lxt_t *dev        = (lxt_t *) priv;
+    int    ems_boards = (1 - dev->is_lxt3) + 1;
+
+    for (int i = 0; i < ems_boards; i++)
+        if (dev->ems_boards[i] != NULL) {
+            if (dev->ems_boards[i]->ram != NULL)
+                free(dev->ems_boards[i]->ram);
+            free(dev->ems_boards[i]);
+        }
+
+    free(dev);
+}
+
+static void *
+lxt_init(const device_t *info)
+{
+    lxt_t *  dev           = (lxt_t *) calloc(1, sizeof(lxt_t));
+    int      ems_boards    = (1 - info->local) + 1;
+    int      ems_en[2]     = { 0 };
+    uint16_t ems_io[2]     = { 0 };
+    uint32_t ems_mem[2]    = { 0 };
+    char     conf_str[512] = { 0 };
+
+    dev->is_lxt3 = info->local;
+
+    for (int i = 0; i < ems_boards; i++) {
+        sprintf(conf_str, "ems_%i_enable", i + 1);
+        ems_en[i]  = device_get_config_int(conf_str);
+
+        sprintf(conf_str, "ems_%i_base", i + 1);
+        ems_io[i]  = device_get_config_hex16(conf_str);
+
+        sprintf(conf_str, "ems_%i_mem_size", i + 1);
+        ems_mem[i] = device_get_config_int(conf_str) << 10;
+
+        dev->ems_boards[i] = lxt_ems_init(dev, ems_en[i], ems_io[i], ems_mem[i]);
+    }
+
+    mem_set_mem_state(0x0c0000, 0x40000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+
+    return dev;
+}
+
+static const device_config_t laserxt_config[] = {
+    {
+        .name           = "ems_1_base",
+        .description    = "EMS 1 Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled", .value =     0 },
+            { .description = "0x208",    .value = 0x208 },
+            { .description = "0x218",    .value = 0x218 },
+            { .description = "0x258",    .value = 0x258 },
+            { .description = "0x268",    .value = 0x268 },
+            { .description = "0x2A8",    .value = 0x2a8 },
+            { .description = "0x2B8",    .value = 0x2b8 },
+            { .description = "0x2E8",    .value = 0x2e8 },
+            { .description = ""                         }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "ems_2_base",
+        .description    = "EMS 2 Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled", .value =     0 },
+            { .description = "0x208",    .value = 0x208 },
+            { .description = "0x218",    .value = 0x218 },
+            { .description = "0x258",    .value = 0x258 },
+            { .description = "0x268",    .value = 0x268 },
+            { .description = "0x2A8",    .value = 0x2a8 },
+            { .description = "0x2B8",    .value = 0x2b8 },
+            { .description = "0x2E8",    .value = 0x2e8 },
+            { .description = ""                         }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "ems_1_mem_size",
+        .description    = "EMS 1 Memory Size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner = {
+            .min  =    0,
+            .max  =  512,
+            .step =   32
+        },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "ems_2_mem_size",
+        .description    = "EMS 2 Memory Size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner = {
+            .min  =    0,
+            .max  =  512,
+            .step =   32
+        },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "ems_1_enable",
+        .description    = "Enable EMS 1",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "ems_2_enable",
+        .description    = "Enable EMS 2",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+const device_t laserxt_device = {
+    .name          = "VTech Laser Turbo XT",
+    .internal_name = "laserxt",
+    .flags         = 0,
+    .local         = 0,
+    .init          = lxt_init,
+    .close         = lxt_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = laserxt_config
+};
+
+static const device_config_t lxt3_config[] = {
+    {
+        .name           = "ems_1_base",
+        .description    = "EMS Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled", .value =     0 },
+            { .description = "0x208",    .value = 0x208 },
+            { .description = "0x218",    .value = 0x218 },
+            { .description = "0x258",    .value = 0x258 },
+            { .description = "0x268",    .value = 0x268 },
+            { .description = "0x2A8",    .value = 0x2a8 },
+            { .description = "0x2B8",    .value = 0x2b8 },
+            { .description = "0x2E8",    .value = 0x2e8 },
+            { .description = ""                         }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "ems_1_mem_size",
+        .description    = "EMS Memory Size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner = {
+            .min  =    0,
+            .max  = 1024,
+            .step =   32
+        },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "ems_1_enable",
+        .description    = "Enable EMS",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+const device_t lxt3_device = {
+    .name          = "VTech Laser Turbo XT",
+    .internal_name = "laserxt",
+    .flags         = 0,
+    .local         = 1,
+    .init          = lxt_init,
+    .close         = lxt_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = lxt3_config
+};
diff --git a/src/chipset/neat.c b/src/chipset/neat.c
index 3b00b4ffd..0aa6fe5b6 100644
--- a/src/chipset/neat.c
+++ b/src/chipset/neat.c
@@ -27,16 +27,18 @@
 #include <wchar.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
+#include "cpu.h"
 #include <86box/device.h>
 #include <86box/io.h>
 #include <86box/mem.h>
 #include <86box/plat_unused.h>
 #include <86box/chipset.h>
 
-#define NEAT_DEBUG  0
-
 #define EMS_MAXPAGE 4
 #define EMS_PGSIZE  16384
+#define EMS_PGMASK  16383
+
+#define REG_MASK       0x0f
 
 /* CS8221 82C211 controller registers. */
 #define REG_RA0        0x60 /* PROCCLK selector */
@@ -51,6 +53,7 @@
 
 #define REG_RA1        0x61 /* Command Delay */
 #define RA1_MASK       0xff /* 1111 1111 */
+#define RA1_MASK_SX    0xbf /* 1X11 1111 */
 #define RA1_BUSDLY     0x03 /*  AT BUS command delay */
 #define RA1_BUSDLY_SH  0
 #define RA1_BUS8DLY    0x0c /*  AT BUS 8bit command delay */
@@ -79,6 +82,7 @@
 #define ATWS_3         1 /*  3 wait states */
 #define ATWS_4         2 /*  4 wait states */
 #define ATWS_5         4 /*  5 wait states */
+#define RA2_387SX      0x80
 
 /* CS8221 82C212 controller registers. */
 #define REG_RB0        0x64 /* Version ID */
@@ -101,6 +105,9 @@
 
 #define REG_RB2        0x66 /* Memory Enable 1 */
 #define RB2_MASK       0x80 /* 1XXX XXXX */
+#define RB2_MASK_SX    0xe0 /* 111X XXXX */
+#define RB2_BOT256     0x20 /*  bottom 256K is on sysboard (1) */
+#define RB2_MID256     0x40 /*  middle 256K is on sysboard (1) */
 #define RB2_TOP128     0x80 /*  top 128K is on sysboard (1) */
 
 #define REG_RB3        0x67 /* Memory Enable 2 */
@@ -194,37 +201,65 @@
 #define RB10_P0EXT     0xc0 /*  page 0 extension */
 #define RB10_P0EXT_SH  6
 
-#define REG_RB11       0x6f /* Miscellaneous */
-#define RB11_MASK      0xe6 /* 111R R11R */
-#define RB11_GA20      0x02 /*  gate for A20 */
-#define RB11_RASTMO    0x04 /*  enable RAS timeout counter */
-#define RB11_EMSLEN    0xe0 /*  EMS memory chunk size */
-#define RB11_EMSLEN_SH 5
+#define REG_RB12       0x6f /* Miscellaneous */
+#define RB12_MASK      0xe6 /* 111R R11R */
+#define RB12_MASK_SX   0xf6 /* 1111 R11R */
+#define RB12_GA20      0x02 /*  gate for A20 */
+#define RB12_RASTMO    0x04 /*  enable RAS timeout counter */
+#define RB12_EMSLEN    0xe0 /*  EMS memory chunk size */
+#define RB12_EMSLEN_SH 5
 
-typedef struct emspage_t {
-    int8_t        enabled; /* 1=ENABLED */
+#define MEM_FLAG_REMAP      0x10
+#define MEM_FLAG_EMS        0x08
+#define MEM_FLAG_ROMCS      0x04
+#define MEM_FLAG_READ       0x02
+#define MEM_FLAG_WRITE      0x01
+#define MEM_FMASK_REMAP     0x10
+#define MEM_FMASK_EMS       0x08
+#define MEM_FMASK_SHADOW    0x07
+
+typedef struct ram_page_t {
+    int8_t        enabled;              /* 1=ENABLED */
     char          pad;
-    uint16_t      page;    /* selected page in EMS block */
-    uint32_t      start;   /* start of EMS in RAM */
-    uint8_t      *addr;    /* start addr in EMS RAM */
-    mem_mapping_t mapping; /* mapping entry for page */
-} emspage_t;
+    uint32_t      phys_base;
+    uint32_t      virt_base;
+    mem_mapping_t mapping;             /* mapping entry for page */
+} ram_page_t;
 
 typedef struct neat_t {
-    uint8_t regs[128]; /* all the CS8221 registers */
-    uint8_t indx;      /* programmed index into registers */
+    uint8_t       mem_flags[64];
+    uint8_t       regs[128];           /* all the CS8221 registers */
+    uint8_t       indx;                /* programmed index into registers */
+    uint8_t       sx;
 
-    char pad;
+    uint16_t      ems_base;            /* configured base address */
+    uint32_t      ems_frame;           /* configured frame address */
+    uint16_t      ems_size;            /* EMS size in KB */
+    uint16_t      ems_pages;           /* EMS size in pages */
 
-    uint16_t ems_base;          /* configured base address */
-    uint16_t ems_oldbase;
-    uint32_t ems_frame;         /* configured frame address */
-    uint32_t ems_oldframe;
-    uint16_t ems_size;          /* EMS size in KB */
-    uint16_t ems_pages;         /* EMS size in pages */
-    emspage_t ems[EMS_MAXPAGE]; /* EMS page registers */
+    uint32_t      remap_base;
+
+    ram_page_t    ems[EMS_MAXPAGE];    /* EMS page registers */
+    ram_page_t    shadow[32];          /* Shadow RAM pages */
 } neat_t;
 
+static uint8_t defaults[2][16] = { { 0x0a, 0x45, 0xfc, 0x00, 0x00, 0x0e, 0x00, 0x00,
+                                     0x00, 0x00, 0x80, 0x43, 0x10, 0x00, 0x00, 0x12 },
+                                   { 0x0a, 0x45, 0x7c, 0x00, 0x00, 0x0e, 0x00, 0x00,
+                                     0x00, 0x00, 0x80, 0x43, 0x00, 0x00, 0x00, 0x08 } };
+
+static uint8_t reg_masks[2][16] = { {     RA0_MASK,     RA1_MASK,     RA2_MASK,         0x00,
+                                          RB0_MASK,     RB1_MASK,     RB2_MASK,     RB3_MASK,
+                                          RB4_MASK,     RB4_MASK,     RB4_MASK,     RB4_MASK,
+                                          RB8_MASK,     RB9_MASK,    RB10_MASK,    RB12_MASK },
+                                    {     RA0_MASK,  RA1_MASK_SX,     RA2_MASK,         0x00,
+                                          RB0_MASK,     RB1_MASK,  RB2_MASK_SX,     RB3_MASK,
+                                          RB4_MASK,     RB4_MASK,     RB4_MASK,     RB4_MASK,
+                                          RB8_MASK,     RB9_MASK,    RB10_MASK, RB12_MASK_SX } };
+
+static uint8_t masks[4]     = { RB10_P0EXT, RB10_P1EXT, RB10_P2EXT, RB10_P3EXT };
+static uint8_t shifts[4]    = { RB10_P0EXT_SH, RB10_P1EXT_SH, RB10_P2EXT_SH, RB10_P3EXT_SH };
+
 #ifdef ENABLE_NEAT_LOG
 int neat_do_log = ENABLE_NEAT_LOG;
 
@@ -243,16 +278,83 @@ neat_log(const char *fmt, ...)
 #    define neat_log(fmt, ...)
 #endif
 
+static uint8_t
+neat_read_ram(uint32_t addr, void *priv)
+{
+    neat_t *dev = (neat_t *) priv;
+
+    if (dev->regs[REG_RB7] & RB7_EMSEN)
+        addr += (dev->ems_size << 10);
+
+    if (cpu_use_exec)
+        addreadlookup(mem_logical_addr, addr);
+
+    return ram[addr];
+}
+
+static uint16_t
+neat_read_ramw(uint32_t addr, void *priv)
+{
+    neat_t *dev = (neat_t *) priv;
+
+    if (dev->regs[REG_RB7] & RB7_EMSEN)
+        addr += (dev->ems_size << 10);
+
+    if (cpu_use_exec)
+        addreadlookup(mem_logical_addr, addr);
+
+    return *(uint16_t *) &ram[addr];
+}
+
+static void
+neat_write_ram(uint32_t addr, uint8_t val, void *priv)
+{
+    neat_t *dev = (neat_t *) priv;
+
+    if (dev->regs[REG_RB7] & RB7_EMSEN)
+        addr += (dev->ems_size << 10);
+
+    if (cpu_use_exec) {
+        addwritelookup(mem_logical_addr, addr);
+        mem_write_ramb_page(addr, val, &pages[addr >> 12]);
+    } else
+        ram[addr] = val;
+}
+
+static void
+neat_write_ramw(uint32_t addr, uint16_t val, void *priv)
+{
+    neat_t *dev = (neat_t *) priv;
+
+    if (dev->regs[REG_RB7] & RB7_EMSEN)
+        addr += (dev->ems_size << 10);
+
+    if (cpu_use_exec) {
+        addwritelookup(mem_logical_addr, addr);
+        mem_write_ramw_page(addr, val, &pages[addr >> 12]);
+    } else
+        *(uint16_t *) &ram[addr] = val;
+}
+
 /* Read one byte from paged RAM. */
 static uint8_t
 ems_readb(uint32_t addr, void *priv)
 {
-    neat_t *dev = (neat_t *) priv;
-    uint8_t ret = 0xff;
+    ram_page_t *dev = (ram_page_t *) priv;
+    uint8_t     ret = 0xff;
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 3)
+    uint32_t    old = addr;
+#endif
 
     /* Grab the data. */
-    ret = *(uint8_t *) (dev->ems[(addr & 0xffff) >> 14].addr + (addr & 0x3fff));
+    addr = addr - dev->virt_base + dev->phys_base;
 
+    if (addr < (mem_size << 10))
+        ret = *(uint8_t *) &(ram[addr]);
+
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 3)
+    neat_log("[R08] %08X -> %08X (%08X): ret = %02X\n", old, addr, (mem_size << 10), ret);
+#endif
     return ret;
 }
 
@@ -260,12 +362,21 @@ ems_readb(uint32_t addr, void *priv)
 static uint16_t
 ems_readw(uint32_t addr, void *priv)
 {
-    neat_t  *dev = (neat_t *) priv;
-    uint16_t ret = 0xffff;
+    ram_page_t *dev = (ram_page_t *) priv;
+    uint16_t    ret = 0xffff;
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 3)
+    uint32_t    old = addr;
+#endif
 
     /* Grab the data. */
-    ret = *(uint16_t *) (dev->ems[(addr & 0xffff) >> 14].addr + (addr & 0x3fff));
+    addr = addr - dev->virt_base + dev->phys_base;
 
+    if (addr < (mem_size << 10))
+        ret = *(uint16_t *) &(ram[addr]);
+
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 3)
+    neat_log("[R16] %08X -> %08X (%08X): ret = %04X\n", old, addr, (mem_size << 10), ret);
+#endif
     return ret;
 }
 
@@ -273,59 +384,173 @@ ems_readw(uint32_t addr, void *priv)
 static void
 ems_writeb(uint32_t addr, uint8_t val, void *priv)
 {
-    neat_t *dev = (neat_t *) priv;
+    ram_page_t *dev = (ram_page_t *) priv;
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 3)
+    uint32_t    old = addr;
+#endif
 
     /* Write the data. */
-    *(uint8_t *) (dev->ems[(addr & 0xffff) >> 14].addr + (addr & 0x3fff)) = val;
+    addr = addr - dev->virt_base + dev->phys_base;
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 3)
+    neat_log("[W08] %08X -> %08X (%08X): val = %02X\n", old, addr, (mem_size << 10), val);
+#endif
+
+    if (addr < (mem_size << 10))
+        *(uint8_t *) &(ram[addr]) = val;
 }
 
 /* Write one word to paged RAM. */
 static void
 ems_writew(uint32_t addr, uint16_t val, void *priv)
 {
-    neat_t *dev = (neat_t *) priv;
+    ram_page_t *dev = (ram_page_t *) priv;
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 3)
+    uint32_t    old = addr;
+#endif
 
     /* Write the data. */
-    *(uint16_t *) (dev->ems[(addr & 0xffff) >> 14].addr + (addr & 0x3fff)) = val;
+    addr = addr - dev->virt_base + dev->phys_base;
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 3)
+    neat_log("[W16] %08X -> %08X (%08X): val = %04X\n", old, addr, (mem_size << 10), val);
+#endif
+
+    if (addr < (mem_size << 10))
+        *(uint16_t *) &(ram[addr]) = val;
+}
+
+static void
+neat_mem_update_state(neat_t *dev, uint32_t addr, uint32_t size, uint8_t new_flags, uint8_t mask)
+{
+    if ((addr < 0x00100000) &&
+        ((new_flags ^ dev->mem_flags[addr / EMS_PGSIZE]) & mask)) {
+        dev->mem_flags[addr / EMS_PGSIZE] &= ~mask;
+        dev->mem_flags[addr / EMS_PGSIZE] |= new_flags;
+
+        new_flags = dev->mem_flags[addr / EMS_PGSIZE];
+
+        if (new_flags & MEM_FLAG_ROMCS) {
+            neat_log("neat_mem_update_state(): %08X-%08X: %02X (ROMCS)\n", addr, addr + size - 1, new_flags);
+            mem_set_mem_state(addr, size, MEM_READ_ROMCS | MEM_WRITE_ROMCS);
+        } else if (new_flags & MEM_FLAG_REMAP) {
+            neat_log("neat_mem_update_state(): %08X-%08X: %02X (REMAP)\n", addr, addr + size - 1, new_flags);
+            mem_set_mem_state(addr, size, MEM_READ_EXTERNAL | MEM_WRITE_EXTERNAL);
+        } else if (new_flags & MEM_FLAG_EMS) {
+            neat_log("neat_mem_update_state(): %08X-%08X: %02X (EMS)\n", addr, addr + size - 1, new_flags);
+            mem_set_mem_state(addr, size, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+        } else  switch (new_flags & (MEM_FLAG_READ | MEM_FLAG_WRITE)) {
+            case 0:
+                neat_log("neat_mem_update_state(): %08X-%08X: %02X (RE | WE)\n", addr, addr + size - 1, new_flags);
+                mem_set_mem_state(addr, size, MEM_READ_EXTERNAL | MEM_WRITE_EXTERNAL);
+                break;
+            case 1:
+                neat_log("neat_mem_update_state(): %08X-%08X: %02X (RE | WI)\n", addr, addr + size - 1, new_flags);
+                mem_set_mem_state(addr, size, MEM_READ_EXTERNAL | MEM_WRITE_INTERNAL);
+                break;
+            case 2:
+                neat_log("neat_mem_update_state(): %08X-%08X: %02X (RI | WE)\n", addr, addr + size - 1, new_flags);
+                mem_set_mem_state(addr, size, MEM_READ_INTERNAL | MEM_WRITE_EXTERNAL);
+                break;
+            case 3:
+                neat_log("neat_mem_update_state(): %08X-%08X: %02X (RI | WI)\n", addr, addr + size - 1, new_flags);
+                mem_set_mem_state(addr, size, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+                break;
+            default:
+                break;
+        }
+    }
+
+    flushmmucache_nopc();
+}
+
+static void
+shadow_recalc(neat_t *dev)
+{
+    for (uint8_t i = 8; i < 32; i++) {
+        int romcs      = 0;
+        int write      = 1;
+        int shadow_reg = REG_RB3 + ((i - 8) >> 3);
+        int shadow_bit = i & 7;
+        int mem_flags;
+        int read;
+
+        if (i >= 16) {
+            int rb1_romcs_bit = 7 - (i >> 2);
+            int rb1_write_bit = rb1_romcs_bit + 4;
+
+            romcs = !(dev->regs[REG_RB1] & (1 << rb1_romcs_bit));
+            write = !(dev->regs[REG_RB1] & (1 << rb1_write_bit));
+            neat_log("Shadow %08X-%08X: [%02X, %02X] %02X:%02X, %02X, %02X\n",
+                     dev->shadow[i].virt_base, dev->shadow[i].virt_base + EMS_PGSIZE - 1,
+                     dev->regs[REG_RB1], dev->regs[shadow_reg],
+                     shadow_reg, shadow_bit,
+                     rb1_romcs_bit, rb1_write_bit);
+        } else {
+            shadow_bit ^= 4;
+            neat_log("Shadow %08X-%08X: [--, %02X] %02X:%02X, shadow bit ^= 4\n",
+                     dev->shadow[i].virt_base, dev->shadow[i].virt_base + EMS_PGSIZE - 1,
+                     dev->regs[shadow_reg],
+                     shadow_reg, shadow_bit);
+        }
+
+        read  = dev->regs[shadow_reg] & (1 << shadow_bit);
+        write = write && read;
+
+        mem_flags  = romcs ? MEM_FLAG_ROMCS : 0x00;
+        mem_flags |= read  ? MEM_FLAG_READ  : 0x00;
+        mem_flags |= write ? MEM_FLAG_WRITE : 0x00;
+
+        if ((mem_flags > 0x00) && !(mem_flags & MEM_FLAG_ROMCS))
+            mem_mapping_set_addr(&(dev->shadow[i].mapping), dev->shadow[i].virt_base, EMS_PGSIZE);
+        else
+            mem_mapping_disable(&(dev->shadow[i].mapping));
+
+        neat_mem_update_state(dev, dev->shadow[i].virt_base, EMS_PGSIZE, mem_flags, MEM_FMASK_SHADOW);
+    }
 }
 
 /* Re-calculate the active-page physical address. */
 static void
-ems_recalc(neat_t *dev, emspage_t *ems)
+ems_recalc(neat_t *dev, ram_page_t *ems)
 {
-    if (ems->page >= dev->ems_pages) {
-        /* That page does not exist. */
-        ems->enabled = 0;
-    }
+    uint32_t page  = ems->phys_base / EMS_PGSIZE;
 
-    /* Pre-calculate the page address in EMS RAM. */
-    ems->addr = ram + ems->start + (ems->page * EMS_PGSIZE);
+    neat_log("ems_recalc(): %08X, %04X, %04X\n", ems->virt_base, page, dev->ems_pages);
+
+    if ((dev->regs[REG_RB7] & RB7_EMSEN) && ems->enabled && (page < dev->ems_pages)) {
+        neat_log("ems_recalc(): %08X-%08X -> %08X-%08X\n",
+                 ems->virt_base, ems->virt_base + EMS_PGSIZE - 1,
+                 ems->phys_base, ems->phys_base + EMS_PGSIZE - 1);
+        mem_mapping_set_addr(&ems->mapping, ems->virt_base, EMS_PGSIZE);
 
-    if (ems->enabled) {
         /* Update the EMS RAM address for this page. */
-        mem_mapping_set_exec(&ems->mapping, ems->addr);
+        mem_mapping_set_exec(&ems->mapping, ram + ems->phys_base);
 
-        /* Enable this page. */
-        mem_mapping_enable(&ems->mapping);
+        neat_mem_update_state(dev, ems->virt_base, EMS_PGSIZE, MEM_FLAG_EMS, MEM_FMASK_EMS);
 
-#if NEAT_DEBUG > 1
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
         neat_log("NEAT EMS: page %d set to %08lx, %sabled)\n",
                  ems->page, ems->addr - ram, ems->enabled ? "en" : "dis");
 #endif
     } else {
         /* Disable this page. */
         mem_mapping_disable(&ems->mapping);
+
+        neat_mem_update_state(dev, ems->virt_base, EMS_PGSIZE, 0x00, MEM_FMASK_EMS);
     }
 }
 
 static void
 ems_write(uint16_t port, uint8_t val, void *priv)
 {
-    neat_t    *dev = (neat_t *) priv;
-    emspage_t *ems;
-    int        vpage;
+    neat_t     *dev           = (neat_t *) priv;
+    ram_page_t *ems;
+    int         vpage;
+    int8_t      old_enabled;
+    uint32_t    old_phys_base;
+    int8_t      new_enabled;
+    uint32_t    new_phys_base;
 
-#if NEAT_DEBUG > 1
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
     neat_log("NEAT: ems_write(%04x, %02x)\n", port, val);
 #endif
 
@@ -333,13 +558,29 @@ ems_write(uint16_t port, uint8_t val, void *priv)
     vpage = (port / EMS_PGSIZE);
     ems   = &dev->ems[vpage];
 
+    neat_log("Port: %04X, val: %02X\n", port, val);
+
     switch (port & 0x000f) {
         case 0x0008:
         case 0x0009:
-            ems->enabled = !!(val & 0x80);
-            ems->page &= 0x0180;       /* clear lower bits */
-            ems->page |= (val & 0x7f); /* add new bits */
-            ems_recalc(dev, ems);
+            old_enabled    = ems->enabled;
+            old_phys_base  = ems->phys_base;
+            new_enabled    = !!(val & 0x80);
+            new_phys_base  = (ems->phys_base & 0xffe00000) | ((val & 0x7f) * EMS_PGSIZE);
+
+            if ((old_enabled != new_enabled) || (old_phys_base != new_phys_base)) {
+                if (old_enabled && (old_enabled == new_enabled)) {
+                    ems->enabled   = 0;
+                    ems_recalc(dev, ems);
+                }
+
+                ems->enabled   = !!(val & 0x80);
+
+                if (old_phys_base != new_phys_base)
+                    ems->phys_base = (ems->phys_base & 0xffe00000) | ((val & 0x7f) * EMS_PGSIZE);
+
+                ems_recalc(dev, ems);
+            }
             break;
         default:
             break;
@@ -358,7 +599,8 @@ ems_read(uint16_t port, void *priv)
 
     switch (port & 0x000f) {
         case 0x0008: /* page number register */
-            ret = dev->ems[vpage].page & 0x7f;
+        case 0x0009:
+            ret = (dev->ems[vpage].phys_base / EMS_PGSIZE) & 0x7f;
             if (dev->ems[vpage].enabled)
                 ret |= 0x80;
             break;
@@ -366,75 +608,97 @@ ems_read(uint16_t port, void *priv)
             break;
     }
 
-#if NEAT_DEBUG > 1
+    neat_log("Port: %04X, ret: %02X\n", port, ret);
+
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
     neat_log("NEAT: ems_read(%04x) = %02x\n", port, ret);
 #endif
 
     return ret;
 }
 
-/* Initialize the EMS module. */
 static void
-ems_init(neat_t *dev, int en)
+ems_recalc_all(neat_t *dev)
 {
-    uint8_t j;
+    for (uint8_t i = 0; i < EMS_MAXPAGE; i++)
+        ems_recalc(dev, &(dev->ems[i]));
+}
 
-    /* Remove if needed. */
-    if (!en) {
-        if (dev->ems_base > 0)
-            for (uint8_t i = 0; i < EMS_MAXPAGE; i++) {
-                /* Disable for now. */
-                mem_mapping_disable(&dev->ems[i].mapping);
+static void
+ems_update_virt_base(neat_t *dev)
+{
+    for (uint8_t i = 0; i < EMS_MAXPAGE; i++)
+        dev->ems[i].virt_base = dev->ems_frame + (i * EMS_PGSIZE);
+}
 
-                /* Remove I/O handler. */
-                io_removehandler(dev->ems_base + (i * EMS_PGSIZE), 2,
-                                 ems_read, NULL, NULL, ems_write, NULL, NULL, dev);
-            }
-
-#ifdef ENABLE_NEAT_LOG
-        neat_log("NEAT: EMS disabled\n");
-#endif
-
-        return;
-    }
-
-    /* Get configured I/O address. */
-    j             = (dev->regs[REG_RB9] & RB9_BASE) >> RB9_BASE_SH;
-    dev->ems_base = 0x0208 + (0x10 * j);
-
-    /* Get configured frame address. */
-    j              = (dev->regs[REG_RB9] & RB9_FRAME) >> RB9_FRAME_SH;
-    dev->ems_frame = 0xC0000 + (EMS_PGSIZE * j);
-
-    /*
-     * For each supported page (we can have a maximum of 4),
-     * create, initialize and disable the mappings, and set
-     * up the I/O control handler.
-     */
+static void
+ems_remove_handlers(neat_t *dev)
+{
     for (uint8_t i = 0; i < EMS_MAXPAGE; i++) {
-        /* Create and initialize a page mapping. */
-        mem_mapping_add(&dev->ems[i].mapping,
-                        dev->ems_frame + (EMS_PGSIZE * i), EMS_PGSIZE,
-                        ems_readb, ems_readw, NULL,
-                        ems_writeb, ems_writew, NULL,
-                        ram, MEM_MAPPING_EXTERNAL,
-                        dev);
-
-        /* Disable for now. */
-        mem_mapping_disable(&dev->ems[i].mapping);
+        neat_log("Removing I/O handler at %04X-%04X\n",
+                 dev->ems_base + (i * EMS_PGSIZE), dev->ems_base + (i * EMS_PGSIZE) + 1);
+        /* Clean up any previous I/O port handler. */
+        io_removehandler(dev->ems_base + (i * EMS_PGSIZE), 2,
+                         ems_read, NULL, NULL, ems_write, NULL, NULL, dev);
+    }
+}
 
+static void
+ems_set_handlers(neat_t *dev)
+{
+    for (uint8_t i = 0; i < EMS_MAXPAGE; i++) {
+        neat_log("Setting up I/O handler at %04X-%04X\n",
+                 dev->ems_base + (i * EMS_PGSIZE), dev->ems_base + (i * EMS_PGSIZE) + 1);
         /* Set up an I/O port handler. */
         io_sethandler(dev->ems_base + (i * EMS_PGSIZE), 2,
                       ems_read, NULL, NULL, ems_write, NULL, NULL, dev);
-
-        /*
-         * TODO: update the 'high_mem' mapping to reflect that we now
-         * have NN MB less extended memory available..
-         */
     }
 
-    neat_log("NEAT: EMS enabled, I/O=%04xH, Frame=%05XH\n",
-             dev->ems_base, dev->ems_frame);
+    ems_recalc_all(dev);
+}
+
+static void
+remap_update_states(neat_t *dev, uint8_t flag)
+{
+    for (uint8_t i = 0; i < 24; i++)
+         neat_mem_update_state(dev, 0x000a0000 + (i * EMS_PGSIZE), EMS_PGSIZE, flag, MEM_FMASK_REMAP);
+}
+
+static void
+remap_update(neat_t *dev, uint8_t val)
+{
+    if (dev->regs[REG_RB7] & RB7_UMAREL) {
+        mem_remap_top_ex_nomid(0, (dev->remap_base >= 1024) ? dev->remap_base : 1024);
+
+        remap_update_states(dev, 0x00);
+        neat_log("0 kB at %08X\n", ((dev->remap_base >= 1024) ? dev->remap_base : 1024) << 10);
+    }
+
+    if (val & RB7_EMSEN)
+        dev->remap_base = mem_size - dev->ems_size;
+    else
+        dev->remap_base = mem_size;
+    neat_log("Total contiguous memory now: %i kB\n", dev->remap_base);
+
+    if (dev->remap_base >= 640)
+        mem_mapping_set_addr(&ram_low_mapping, 0x00000000, 0x000a0000);
+    else
+        mem_mapping_set_addr(&ram_low_mapping, 0x00000000, dev->remap_base << 10);
+
+    if (dev->remap_base > 1024) {
+        uint32_t base = (val & RB7_EMSEN) ? (0x00100000 + (dev->ems_size << 10)) : 0x00100000;
+
+        mem_mapping_set_addr(&ram_high_mapping, 0x00100000, (dev->remap_base << 10) - 0x00100000);
+        mem_mapping_set_exec(&ram_high_mapping, &(ram[base]));
+    } else
+        mem_mapping_disable(&ram_high_mapping);
+
+    if (val & RB7_UMAREL) {
+        mem_remap_top_ex_nomid(384, (dev->remap_base >= 1024) ? dev->remap_base : 1024);
+
+        remap_update_states(dev, MEM_FLAG_REMAP);
+        neat_log("384 kB at %08X\n", ((dev->remap_base >= 1024) ? dev->remap_base : 1024) << 10);
+    }
 }
 
 static void
@@ -442,10 +706,12 @@ neat_write(uint16_t port, uint8_t val, void *priv)
 {
     neat_t  *dev = (neat_t *) priv;
     uint8_t  xval;
+    uint8_t j;
     uint8_t *reg;
+    uint8_t  mask;
     int      i;
 
-#if NEAT_DEBUG > 2
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
     neat_log("NEAT: write(%04x, %02x)\n", port, val);
 #endif
 
@@ -457,150 +723,209 @@ neat_write(uint16_t port, uint8_t val, void *priv)
         case 0x23:
             reg  = &dev->regs[dev->indx];
             xval = *reg ^ val;
+            mask = reg_masks[dev->sx][dev->indx & REG_MASK];
             switch (dev->indx) {
                 case REG_RA0:
-                    val &= RA0_MASK;
-                    *reg = (*reg & ~RA0_MASK) | val | (RA0_REV_ID << RA0_REV_SH);
-#if NEAT_DEBUG > 1
+                    val &= mask;
+                    *reg = (*reg & ~mask) | val | (RA0_REV_ID << RA0_REV_SH);
+                    if ((xval & 0x20) && (val & 0x20))
+                        outb(0x64, 0xfe);
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
                     neat_log("NEAT: RA0=%02x(%02x)\n", val, *reg);
 #endif
                     break;
 
                 case REG_RA1:
-                    val &= RA1_MASK;
-                    *reg = (*reg & ~RA1_MASK) | val;
-#if NEAT_DEBUG > 1
+                    val &= mask;
+                    *reg = (*reg & ~mask) | val;
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
                     neat_log("NEAT: RA1=%02x(%02x)\n", val, *reg);
 #endif
                     break;
 
                 case REG_RA2:
-                    val &= RA2_MASK;
-                    *reg = (*reg & ~RA2_MASK) | val;
-#if NEAT_DEBUG > 1
+                    val &= mask;
+                    *reg = (*reg & ~mask) | val;
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
                     neat_log("NEAT: RA2=%02x(%02x)\n", val, *reg);
 #endif
                     break;
 
                 case REG_RB0:
-                    val &= RB0_MASK;
-                    *reg = (*reg & ~RB0_MASK) | val | (RB0_REV_ID << RB0_REV_SH);
-#if NEAT_DEBUG > 1
+                    val &= mask;
+                    *reg = (*reg & ~mask) | val | (RB0_REV_ID << RB0_REV_SH);
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
                     neat_log("NEAT: RB0=%02x(%02x)\n", val, *reg);
 #endif
                     break;
 
                 case REG_RB1:
-                    val &= RB1_MASK;
-                    *reg = (*reg & ~RB1_MASK) | val;
-#if NEAT_DEBUG > 1
+                    val &= mask;
+                    *reg = (*reg & ~mask) | val;
+                    shadow_recalc(dev);
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
                     neat_log("NEAT: RB1=%02x(%02x)\n", val, *reg);
 #endif
                     break;
 
                 case REG_RB2:
-                    val &= RB2_MASK;
-                    *reg = (*reg & ~RB2_MASK) | val;
-#if NEAT_DEBUG > 1
+                    val &= mask;
+                    *reg = (*reg & ~mask) | val;
+                    if (dev->sx) {
+                        if (val & RB2_BOT256)
+                            neat_mem_update_state(dev, 0x00000000, 0x00040000,
+                                                  MEM_FLAG_READ | MEM_FLAG_WRITE, MEM_FMASK_SHADOW);
+                        else
+                            neat_mem_update_state(dev, 0x00000000, 0x00040000,
+                                                  0x00, MEM_FMASK_SHADOW);
+
+                        if (val & RB2_MID256)
+                            neat_mem_update_state(dev, 0x00040000, 0x00040000,
+                                                  MEM_FLAG_READ | MEM_FLAG_WRITE, MEM_FMASK_SHADOW);
+                        else
+                            neat_mem_update_state(dev, 0x00040000, 0x00040000,
+                                                  0x00, MEM_FMASK_SHADOW);
+                    }
+                    if (val & RB2_TOP128)
+                        neat_mem_update_state(dev, 0x00080000, 0x00020000,
+                                              MEM_FLAG_READ | MEM_FLAG_WRITE, MEM_FMASK_SHADOW);
+                    else
+                        neat_mem_update_state(dev, 0x00080000, 0x00020000,
+                                              0x00, MEM_FMASK_SHADOW);
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
                     neat_log("NEAT: RB2=%02x(%02x)\n", val, *reg);
 #endif
                     break;
 
                 case REG_RB3:
-                    val &= RB3_MASK;
-                    *reg = (*reg & ~RB3_MASK) | val;
-#if NEAT_DEBUG > 1
+                    val &= mask;
+                    *reg = (*reg & ~mask) | val;
+                    shadow_recalc(dev);
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
                     neat_log("NEAT: RB3=%02x(%02x)\n", val, *reg);
 #endif
                     break;
 
                 case REG_RB4:
-                    val &= RB4_MASK;
-                    *reg = (*reg & ~RB4_MASK) | val;
-#if NEAT_DEBUG > 1
+                    val &= mask;
+                    *reg = (*reg & ~mask) | val;
+                    shadow_recalc(dev);
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
                     neat_log("NEAT: RB4=%02x(%02x)\n", val, *reg);
 #endif
                     break;
 
                 case REG_RB5:
-                    val &= RB5_MASK;
-                    *reg = (*reg & ~RB5_MASK) | val;
-#if NEAT_DEBUG > 1
+                    val &= mask;
+                    *reg = (*reg & ~mask) | val;
+                    shadow_recalc(dev);
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
                     neat_log("NEAT: RB5=%02x(%02x)\n", val, *reg);
 #endif
                     break;
 
                 case REG_RB6:
-                    val &= RB6_MASK;
-                    *reg = (*reg & ~RB6_MASK) | val;
-#if NEAT_DEBUG > 1
+                    val &= mask;
+                    *reg = (*reg & ~mask) | val;
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
                     neat_log("NEAT: RB6=%02x(%02x)\n", val, *reg);
 #endif
                     break;
 
                 case REG_RB7:
-                    val &= RB7_MASK;
-                    *reg = val;
-#if NEAT_DEBUG > 1
+                    val &= mask;
+
+                    if (xval & (RB7_EMSEN | RB7_UMAREL))
+                        remap_update(dev, val);
+
+                    *reg = (*reg & ~mask) | val;
+
+                    if (xval & RB7_EMSEN)
+                        ems_remove_handlers(dev);
+
+                    if ((xval & RB7_EMSEN) && (val & RB7_EMSEN))
+                        ems_set_handlers(dev);
+
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
                     neat_log("NEAT: RB7=%02x(%02x)\n", val, *reg);
 #endif
-                    if (val & RB7_EMSEN)
-                        ems_init(dev, 1);
-                    else if (xval & RB7_EMSEN)
-                        ems_init(dev, 0);
-
-                    if (xval & RB7_UMAREL) {
-                        if (val & RB7_UMAREL)
-                            mem_remap_top(384);
-                        else
-                            mem_remap_top(0);
-                    }
                     break;
 
                 case REG_RB8:
-                    val &= RB8_MASK;
-                    *reg = (*reg & ~RB8_MASK) | val;
-#if NEAT_DEBUG > 1
+                    val &= mask;
+                    *reg = (*reg & ~mask) | val;
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
                     neat_log("NEAT: RB8=%02x(%02x)\n", val, *reg);
 #endif
                     break;
 
                 case REG_RB9:
-                    val &= RB9_MASK;
-                    *reg = (*reg & ~RB9_MASK) | val;
-#if NEAT_DEBUG > 1
+                    val &= mask;
+                    *reg = (*reg & ~mask) | val;
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
                     neat_log("NEAT: RB9=%02x(%02x)\n", val, *reg);
 #endif
-                    if (dev->regs[REG_RB7] & RB7_EMSEN) {
-                        ems_init(dev, 0);
-                        ems_init(dev, 1);
-                    }
+
+                    ems_remove_handlers(dev);
+
+                    /* Get configured I/O address. */
+                    j              = (dev->regs[REG_RB9] & RB9_BASE) >> RB9_BASE_SH;
+                    dev->ems_base  = 0x0208 + (0x10 * j);
+
+                    /* Get configured frame address. */
+                    j              = (dev->regs[REG_RB9] & RB9_FRAME) >> RB9_FRAME_SH;
+                    dev->ems_frame = 0xc0000 + (EMS_PGSIZE * j);
+
+                    ems_update_virt_base(dev);
+
+                    if (dev->regs[REG_RB7] & RB7_EMSEN)
+                        ems_set_handlers(dev);
                     break;
 
                 case REG_RB10:
-                    val &= RB10_MASK;
-                    *reg = (*reg & ~RB10_MASK) | val;
-#if NEAT_DEBUG > 1
+                    val &= mask;
+                    *reg = (*reg & ~mask) | val;
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
                     neat_log("NEAT: RB10=%02x(%02x)\n", val, *reg);
 #endif
 
-                    dev->ems[3].start = ((val & RB10_P3EXT) >> RB10_P3EXT_SH) << 21;
-                    dev->ems[2].start = ((val & RB10_P2EXT) >> RB10_P2EXT_SH) << 21;
-                    dev->ems[1].start = ((val & RB10_P1EXT) >> RB10_P1EXT_SH) << 21;
-                    dev->ems[0].start = ((val & RB10_P0EXT) >> RB10_P0EXT_SH) << 21;
-                    for (i = 0; i < EMS_MAXPAGE; i++)
-                        ems_recalc(dev, &dev->ems[i]);
+                    for (uint8_t i = 0; i < EMS_MAXPAGE; i++) {
+                        ram_page_t *ems = &(dev->ems[i]);
+  
+                        uint32_t old_phys_base = ems->phys_base & 0xffe00000;
+                        uint32_t new_phys_base = (((val & masks[i]) >> shifts[i]) << 21);
+
+                        if (new_phys_base != old_phys_base) {
+                            int8_t old_enabled = ems->enabled;
+
+                            if ((dev->regs[REG_RB7] & RB7_EMSEN) && old_enabled) {
+                                ems->enabled = 0;
+                                ems_recalc(dev, &(dev->ems[i]));
+                            }
+
+                            ems->phys_base = ems->phys_base - old_phys_base + new_phys_base;
+
+                            if ((dev->regs[REG_RB7] & RB7_EMSEN) && old_enabled) {
+                                ems->enabled = old_enabled;
+                                ems_recalc(dev, &(dev->ems[i]));
+                            }
+                        }
+                    }
+
+                    neat_log("%08X, %08X, %08X, %08X\n",
+                             dev->ems[0].phys_base, dev->ems[1].phys_base,
+                             dev->ems[2].phys_base, dev->ems[3].phys_base);
                     break;
 
-                case REG_RB11:
-                    val &= RB11_MASK;
-                    *reg = (*reg & ~RB11_MASK) | val;
-#if NEAT_DEBUG > 1
-                    neat_log("NEAT: RB11=%02x(%02x)\n", val, *reg);
+                case REG_RB12:
+                    val &= mask;
+                    *reg = (*reg & ~mask) | val;
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
+                    neat_log("NEAT: RB12=%02x(%02x)\n", val, *reg);
 #endif
-                    i = (val & RB11_EMSLEN) >> RB11_EMSLEN_SH;
+                    i = (val & RB12_EMSLEN) >> RB12_EMSLEN_SH;
                     switch (i) {
-                        case 0: /* "less than 2MB" */
+                        case 0: /* "less than 1MB" */
                             dev->ems_size = 512;
                             break;
 
@@ -616,11 +941,24 @@ neat_write(uint16_t port, uint8_t val, void *priv)
                         default:
                             break;
                     }
-                    dev->ems_pages = (dev->ems_size << 10) / EMS_PGSIZE;
+
+                    if (mem_size < 1024)
+                        /* No RAM left for EMS at all. */
+                        dev->ems_size = 0;
+                    else if (mem_size < (dev->ems_size + 1024))
+                        /* Limit EMS size to the entirety of the remaining extended memory. */
+                        dev->ems_size = mem_size - 1024;
+
                     if (dev->regs[REG_RB7] & RB7_EMSEN) {
-                        neat_log("NEAT: EMS %iKB (%i pages)\n",
-                                 dev->ems_size, dev->ems_pages);
+                        remap_update(dev, dev->regs[REG_RB7]);
+
+                        neat_log("NEAT: EMS %iKB\n",
+                                 dev->ems_size);
                     }
+
+                    mem_a20_alt = !(val & RB12_GA20);
+                    mem_a20_recalc();
+                    flushmmucache();
                     break;
 
                 default:
@@ -629,6 +967,7 @@ neat_write(uint16_t port, uint8_t val, void *priv)
                     break;
             }
             break;
+
         default:
             break;
     }
@@ -646,14 +985,17 @@ neat_read(uint16_t port, void *priv)
             break;
 
         case 0x23:
-            ret = dev->regs[dev->indx];
+            if ((dev->indx >= 0x60) && (dev->indx <= 0x6e))
+                ret = dev->regs[dev->indx];
+            else if (dev->indx == 0x6f)
+                ret = (dev->regs[dev->indx] & 0xfd) | ((~mem_a20_alt) & 0x02);
             break;
 
         default:
             break;
     }
 
-#if NEAT_DEBUG > 2
+#if defined(ENABLE_NEAT_LOG) && (ENABLE_NEAT_LOG == 2)
     neat_log("NEAT: read(%04x) = %02x\n", port, ret);
 #endif
 
@@ -673,16 +1015,86 @@ neat_init(UNUSED(const device_t *info))
 {
     neat_t *dev;
     uint8_t dram_mode = 0;
-    uint8_t i;
+    uint8_t j;
 
     /* Create an instance. */
-    dev = (neat_t *) malloc(sizeof(neat_t));
-    memset(dev, 0x00, sizeof(neat_t));
+    dev = (neat_t *) calloc(1, sizeof(neat_t));
+
+    dev->sx = info->local;
+
+    if (mem_size > 1024) {
+        mem_mapping_set_handler(&ram_high_mapping, neat_read_ram, neat_read_ramw, NULL,
+                                neat_write_ram, neat_write_ramw, NULL);
+        mem_mapping_set_p(&ram_high_mapping, dev);
+    }
+
+    /* Get configured I/O address. */
+    j              = (dev->regs[REG_RB9] & RB9_BASE) >> RB9_BASE_SH;
+    dev->ems_base  = 0x0208 + (0x10 * j);
+
+    /* Get configured frame address. */
+    j               = (dev->regs[REG_RB9] & RB9_FRAME) >> RB9_FRAME_SH;
+    dev->ems_frame  = 0xc0000 + (EMS_PGSIZE * j);
+
+    ems_update_virt_base(dev);
+
+    dev->ems_pages  = (mem_size << 10) / EMS_PGSIZE;
+    dev->remap_base = mem_size;
+
+    mem_mapping_disable(&ram_mid_mapping);
+
+    for (int i = 0; i < 24; i++) {
+       if (i >= 20)
+           neat_mem_update_state(dev, 0x000a0000 + (i * EMS_PGSIZE), EMS_PGSIZE, MEM_FLAG_ROMCS, MEM_FMASK_SHADOW);
+       else {
+           /* This is needed to actually trigger an update. */
+           dev->mem_flags[i + 40] = MEM_FLAG_ROMCS;
+           neat_mem_update_state(dev, 0x000a0000 + (i * EMS_PGSIZE), EMS_PGSIZE, 0x00, MEM_FMASK_SHADOW);
+       }
+    }
+
+    /*
+     * For each supported page (we can have a maximum of 4),
+     * create, initialize and disable the mappings, and set
+     * up the I/O control handler.
+     */
+    for (uint8_t i = 0; i < EMS_MAXPAGE; i++) {
+        /* Create and initialize a page mapping. */
+        mem_mapping_add(&dev->ems[i].mapping,
+                        0x00000000, 0x00000000,
+                        ems_readb, ems_readw, NULL,
+                        ems_writeb, ems_writew, NULL,
+                        ram + dev->ems[i].virt_base, MEM_MAPPING_INTERNAL,
+                        &(dev->ems[i]));
+
+        /* Disable for now. */
+        mem_mapping_disable(&dev->ems[i].mapping);
+    }
+
+    for (uint8_t i = 0; i < 32; i++) {
+        dev->shadow[i].virt_base = dev->shadow[i].phys_base =
+            (i * EMS_PGSIZE) + 0x00080000;
+        dev->shadow[i].enabled   = 1;
+
+        /* Create and initialize a page mapping. */
+        mem_mapping_add(&dev->shadow[i].mapping,
+                        dev->shadow[i].virt_base, EMS_PGSIZE,
+                        ems_readb, ems_readw, NULL,
+                        ems_writeb, ems_writew, NULL,
+                        ram + dev->shadow[i].virt_base, MEM_MAPPING_INTERNAL,
+                        &(dev->shadow[i]));
+
+        /* Disable for now. */
+        mem_mapping_disable(&dev->shadow[i].mapping);
+    }
 
     /* Initialize some of the registers to specific defaults. */
-    for (i = REG_RA0; i <= REG_RB11; i++) {
+    for (uint8_t i = REG_RA0; i <= REG_RB12; i++) {
         dev->indx = i;
-        neat_write(0x0023, 0x00, dev);
+        uint8_t def = defaults[dev->sx][i & REG_MASK];
+        if ((i == REG_RA2) && (fpu_type == FPU_387))
+            def |= RA2_387SX;
+        neat_write(0x0023, def, dev);
     }
 
     /*
@@ -816,7 +1228,7 @@ neat_init(UNUSED(const device_t *info))
             neat_log("NEAT: **INVALID DRAM SIZE %iKB !**\n", mem_size);
     }
     if (dram_mode > 0) {
-        neat_log("NEAT: using DRAM mode #%i (mem=%iKB)\n", i, mem_size);
+        neat_log("NEAT: using DRAM mode #%i (mem=%iKB)\n", dram_mode, mem_size);
     }
 
     /* Set up an I/O handler for the chipset. */
@@ -827,14 +1239,28 @@ neat_init(UNUSED(const device_t *info))
 }
 
 const device_t neat_device = {
-    .name          = "C&T CS8121 (NEAT)",
+    .name          = "C&T CS8221 (NEAT)",
     .internal_name = "neat",
     .flags         = 0,
     .local         = 0,
     .init          = neat_init,
     .close         = neat_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t neat_sx_device = {
+    .name          = "C&T CS8281 (NEATsx)",
+    .internal_name = "neat_sx",
+    .flags         = 0,
+    .local         = 1,
+    .init          = neat_init,
+    .close         = neat_close,
+    .reset         = NULL,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/olivetti_eva.c b/src/chipset/olivetti_eva.c
index 1f5eacc6c..0dcbdd21f 100644
--- a/src/chipset/olivetti_eva.c
+++ b/src/chipset/olivetti_eva.c
@@ -73,26 +73,24 @@ olivetti_eva_write(uint16_t addr, uint8_t val, void *priv)
             break;
         case 0x069:
             dev->reg_069 = val;
-            /*
-             * Unfortunately, if triggered, the BIOS remapping function fails causing
-             * a fatal error. Therefore, this code section is currently commented.
-             */
-#if 0
-            if (val & 1) {
+            mem_remap_top(0);
+            if (val == 0x01) {
                 /*
                  * Set the register to 7 or above for the BIOS to trigger the
                  * memory remapping function if shadowing is active.
                  */
-                 dev->reg_069 = 0x7;
+                 dev->reg_069 = 0x07;
             }
-            if (val & 8) {
+            if (val & 0x08) {
                 /*
                  * Activate shadowing for region e0000-fffff
                  */
                  mem_remap_top(256);
-                 mem_set_mem_state_both(0xa0000, 0x60000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+                 mem_set_mem_state_both(0xe0000, 0x20000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+            } else {
+                 mem_remap_top(384);
+                 mem_set_mem_state_both(0xe0000, 0x20000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
             }
-#endif
             break;
         default:
             break;
@@ -134,8 +132,7 @@ olivetti_eva_close(void *priv)
 static void *
 olivetti_eva_init(UNUSED(const device_t *info))
 {
-    olivetti_eva_t *dev = (olivetti_eva_t *) malloc(sizeof(olivetti_eva_t));
-    memset(dev, 0, sizeof(olivetti_eva_t));
+    olivetti_eva_t *dev = (olivetti_eva_t *) calloc(1, sizeof(olivetti_eva_t));
 
     /* GA98 registers */
     dev->reg_065 = 0x00;
@@ -144,7 +141,7 @@ olivetti_eva_init(UNUSED(const device_t *info))
     dev->reg_067 = 0x00;
 
     /* RAM enable registers */
-    dev->reg_069 = 0x0;
+    dev->reg_069 = 0x00;
 
     io_sethandler(0x0065, 0x0001, olivetti_eva_read, NULL, NULL, olivetti_eva_write, NULL, NULL, dev);
     io_sethandler(0x0067, 0x0001, olivetti_eva_read, NULL, NULL, olivetti_eva_write, NULL, NULL, dev);
@@ -153,13 +150,6 @@ olivetti_eva_init(UNUSED(const device_t *info))
     /* When shadowing is not enabled in BIOS, all upper memory is available as XMS */
     mem_remap_top(384);
 
-    /*
-     * Default settings when NVRAM is cleared activate shadowing.
-     * Thus, to avoid boot errors, remap only 256k from UMB to XMS.
-     * Remove this block once BIOS memory remapping works.
-     */
-    mem_remap_top(256);
-
     return dev;
 }
 
@@ -171,7 +161,7 @@ const device_t olivetti_eva_device = {
     .init          = olivetti_eva_init,
     .close         = olivetti_eva_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/opti283.c b/src/chipset/opti283.c
index 1fa59f2f0..81780cf10 100644
--- a/src/chipset/opti283.c
+++ b/src/chipset/opti283.c
@@ -16,6 +16,7 @@
  *          Copyright 2021 Tiseno100.
  *          Copyright 2021 Miran Grca.
  */
+#include <math.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -31,6 +32,7 @@
 #include <86box/mem.h>
 #include <86box/plat_fallthrough.h>
 #include <86box/plat_unused.h>
+#include <86box/port_92.h>
 #include <86box/chipset.h>
 
 #ifdef ENABLE_OPTI283_LOG
@@ -157,7 +159,20 @@ opti283_shadow_recalc(opti283_t *dev)
         rom     = dev->regs[0x11] & (1 << ((i >> 2) + 4));
         opti283_log("OPTI 283: %i/%08X: %i, %i, %i\n", i, base, (i >= 4) ? (1 << (i - 4)) : (1 << (i + 4)), (1 << (i >> 2)), (1 << ((i >> 2) + 4)));
 
-        if (sh_enable && rom) {
+        if (sh_copy) {
+            if (base >= 0x000e0000)
+                shadowbios_write |= 1;
+            if (base >= 0x000d0000)
+                dev->shadow_high |= 1;
+
+            if (base >= 0xe0000) {
+                mem_set_mem_state_both(base, 0x4000, MEM_READ_EXTANY | MEM_WRITE_INTERNAL);
+                opti283_log("OPTI 283: %08X-%08X READ_EXTANY, WRITE_INTERNAL\n", base, base + 0x3fff);
+            } else {
+                mem_set_mem_state_both(base, 0x4000, MEM_READ_EXTERNAL | MEM_WRITE_INTERNAL);
+                opti283_log("OPTI 283: %08X-%08X READ_EXTERNAL, WRITE_INTERNAL\n", base, base + 0x3fff);
+            }
+        } else if (sh_enable && rom) {
             if (base >= 0x000e0000)
                 shadowbios |= 1;
             if (base >= 0x000d0000)
@@ -170,13 +185,8 @@ opti283_shadow_recalc(opti283_t *dev)
                 if (base >= 0x000e0000)
                     shadowbios_write |= 1;
 
-                if (sh_copy) {
-                    mem_set_mem_state_both(base, 0x4000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
-                    opti283_log("OPTI 283: %08X-%08X READ_INTERNAL, WRITE_INTERNAL\n", base, base + 0x3fff);
-                } else {
-                    mem_set_mem_state_both(base, 0x4000, MEM_READ_INTERNAL | MEM_WRITE_EXTERNAL);
-                    opti283_log("OPTI 283: %08X-%08X READ_INTERNAL, WRITE_EXTERNAL\n", base, base + 0x3fff);
-                }
+                mem_set_mem_state_both(base, 0x4000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+                opti283_log("OPTI 283: %08X-%08X READ_INTERNAL, WRITE_INTERNAL\n", base, base + 0x3fff);
             }
         } else {
             if (base >= 0xe0000) {
@@ -215,34 +225,53 @@ opti283_write(uint16_t addr, uint8_t val, void *priv)
     opti283_t *dev = (opti283_t *) priv;
 
     switch (addr) {
+        default:
+            break;
+
         case 0x22:
             dev->index = val;
             break;
 
+        case 0x23:
+            if (dev->index == 0x01)
+                dev->regs[dev->index] = val;
+            break;
+
         case 0x24:
             opti283_log("OPTi 283: dev->regs[%02x] = %02x\n", dev->index, val);
 
             switch (dev->index) {
-                case 0x10:
-                    dev->regs[dev->index] = val;
+                default:
                     break;
 
-                case 0x14:
+                case 0x10:
+                    dev->regs[dev->index] = (dev->regs[dev->index] & 0x80) | (val & 0x7f);
+                    break;
+
+                case 0x14: {
+                    double bus_clk;
+                    switch (val & 0x01) {
+                        default:
+                        case 0x00:
+                             bus_clk = cpu_busspeed / 6.0;
+                             break;
+                        case 0x01:
+                             bus_clk = cpu_busspeed / 4.0;
+                             break;
+                    }
+                    cpu_set_isa_speed((int) round(bus_clk));
                     reset_on_hlt = !!(val & 0x40);
                     fallthrough;
+                }
                 case 0x11:
                 case 0x12:
                 case 0x13:
                     dev->regs[dev->index] = val;
                     opti283_shadow_recalc(dev);
                     break;
-
-                default:
-                    break;
             }
-            break;
 
-        default:
+            dev->index = 0xff;
             break;
     }
 }
@@ -250,11 +279,17 @@ opti283_write(uint16_t addr, uint8_t val, void *priv)
 static uint8_t
 opti283_read(uint16_t addr, void *priv)
 {
-    const opti283_t *dev = (opti283_t *) priv;
-    uint8_t          ret = 0xff;
+    opti283_t *dev = (opti283_t *) priv;
+    uint8_t    ret = 0xff;
 
-    if (addr == 0x24)
+    if ((addr == 0x23) && (dev->index == 0x01))
         ret = dev->regs[dev->index];
+    else if (addr == 0x24) {
+        if ((dev->index >= 0x10) && (dev->index <= 0x14))
+            ret = dev->regs[dev->index];
+
+        dev->index = 0xff;
+    }
 
     return ret;
 }
@@ -270,10 +305,10 @@ opti283_close(void *priv)
 static void *
 opti283_init(UNUSED(const device_t *info))
 {
-    opti283_t *dev = (opti283_t *) malloc(sizeof(opti283_t));
-    memset(dev, 0x00, sizeof(opti283_t));
+    opti283_t *dev = (opti283_t *) calloc(1, sizeof(opti283_t));
 
     io_sethandler(0x0022, 0x0001, opti283_read, NULL, NULL, opti283_write, NULL, NULL, dev);
+    io_sethandler(0x0023, 0x0001, opti283_read, NULL, NULL, opti283_write, NULL, NULL, dev);
     io_sethandler(0x0024, 0x0001, opti283_read, NULL, NULL, opti283_write, NULL, NULL, dev);
 
     dev->regs[0x10] = 0x3f;
@@ -296,6 +331,10 @@ opti283_init(UNUSED(const device_t *info))
 
     opti283_shadow_recalc(dev);
 
+    cpu_set_isa_speed((int) round(cpu_busspeed / 6.0));
+
+    device_add(&port_92_device);
+
     return dev;
 }
 
@@ -307,7 +346,7 @@ const device_t opti283_device = {
     .init          = opti283_init,
     .close         = opti283_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/opti291.c b/src/chipset/opti291.c
index 6d2256974..91b9010e2 100644
--- a/src/chipset/opti291.c
+++ b/src/chipset/opti291.c
@@ -138,8 +138,7 @@ opti291_close(void *priv)
 static void *
 opti291_init(UNUSED(const device_t *info))
 {
-    opti291_t *dev = (opti291_t *) malloc(sizeof(opti291_t));
-    memset(dev, 0, sizeof(opti291_t));
+    opti291_t *dev = (opti291_t *) calloc(1, sizeof(opti291_t));
 
     io_sethandler(0x022, 0x0001, opti291_read, NULL, NULL, opti291_write, NULL, NULL, dev);
     io_sethandler(0x024, 0x0001, opti291_read, NULL, NULL, opti291_write, NULL, NULL, dev);
@@ -161,7 +160,7 @@ const device_t opti291_device = {
     .init          = opti291_init,
     .close         = opti291_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/opti391.c b/src/chipset/opti391.c
index 03cbb2ea7..7d3c10c98 100644
--- a/src/chipset/opti391.c
+++ b/src/chipset/opti391.c
@@ -54,10 +54,34 @@ typedef struct mem_remapping_t {
 } mem_remapping_t;
 
 typedef struct opti391_t {
+    uint8_t type;
+    uint8_t reg_base;
+    uint8_t min_reg;
+    uint8_t max_reg;
+
+    uint16_t shadowed;
+    uint16_t old_start;
+
     uint8_t index;
     uint8_t regs[256];
 } opti391_t;
 
+static void
+opti391_recalcremap(opti391_t *dev)
+{
+    if (dev->type < 2) {
+        if ((mem_size > 8192) || (dev->shadowed & 0x0ff0) ||
+            !(dev->regs[0x01] & 0x0f) || !(dev->regs[0x01] & 0x10)) {
+            mem_remap_top_ex(0, dev->old_start);
+            dev->old_start = 1024;
+        } else {
+            mem_remap_top_ex(0, dev->old_start);
+            dev->old_start = (dev->regs[0x01] & 0x0f) * 1024;
+            mem_remap_top_ex(-256, dev->old_start);
+        }
+    }
+}
+
 static void
 opti391_shadow_recalc(opti391_t *dev)
 {
@@ -70,24 +94,25 @@ opti391_shadow_recalc(opti391_t *dev)
     shadowbios = shadowbios_write = 0;
 
     /* F0000-FFFFF */
-    sh_enable = !(dev->regs[0x22] & 0x80);
+    sh_enable = (dev->regs[0x02] & 0x80);
     if (sh_enable)
         mem_set_mem_state_both(0xf0000, 0x10000, MEM_READ_EXTANY | MEM_WRITE_INTERNAL);
     else
         mem_set_mem_state_both(0xf0000, 0x10000, MEM_READ_INTERNAL | MEM_WRITE_DISABLED);
+    dev->shadowed |= 0xf000;
 
-    sh_write_internal = (dev->regs[0x26] & 0x40);
+    sh_write_internal = (dev->regs[0x06] & 0x40);
     /* D0000-EFFFF */
     for (uint8_t i = 0; i < 8; i++) {
         base = 0xd0000 + (i << 14);
         if (base >= 0xe0000) {
-            sh_master = (dev->regs[0x22] & 0x40);
-            sh_wp     = (dev->regs[0x22] & 0x10);
+            sh_master = (dev->regs[0x02] & 0x20);
+            sh_wp     = (dev->regs[0x02] & 0x08);
         } else {
-            sh_master = (dev->regs[0x22] & 0x20);
-            sh_wp     = (dev->regs[0x22] & 0x08);
+            sh_master = (dev->regs[0x02] & 0x40);
+            sh_wp     = (dev->regs[0x02] & 0x10);
         }
-        sh_enable = dev->regs[0x23] & (1 << i);
+        sh_enable = dev->regs[0x03] & (1 << i);
 
         if (sh_master) {
             if (sh_enable) {
@@ -95,22 +120,29 @@ opti391_shadow_recalc(opti391_t *dev)
                     mem_set_mem_state_both(base, 0x4000, MEM_READ_INTERNAL | MEM_WRITE_DISABLED);
                 else
                     mem_set_mem_state_both(base, 0x4000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
-            } else if (sh_write_internal)
+                dev->shadowed |= (1 << (i + 4));
+            } else if (sh_write_internal) {
                 mem_set_mem_state_both(base, 0x4000, MEM_READ_EXTANY | MEM_WRITE_INTERNAL);
-            else
+                dev->shadowed |= (1 << (i + 4));
+            } else {
                 mem_set_mem_state_both(base, 0x4000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
-        } else if (sh_write_internal)
+                dev->shadowed &= ~(1 << (i + 4));
+            }
+        } else if (sh_write_internal) {
             mem_set_mem_state_both(base, 0x4000, MEM_READ_EXTANY | MEM_WRITE_INTERNAL);
-        else
+            dev->shadowed |= (1 << (i + 4));
+        } else {
             mem_set_mem_state_both(base, 0x4000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+            dev->shadowed &= ~(1 << (i + 4));
+        }
     }
 
     /* C0000-CFFFF */
-    sh_master = !(dev->regs[0x26] & 0x10);
-    sh_wp     = (dev->regs[0x26] & 0x20);
+    sh_master = (dev->regs[0x06] & 0x10); /* OPTi 391 datasheet erratum! */
+    sh_wp     = (dev->regs[0x06] & 0x20);
     for (uint8_t i = 0; i < 4; i++) {
         base      = 0xc0000 + (i << 14);
-        sh_enable = dev->regs[0x26] & (1 << i);
+        sh_enable = dev->regs[0x06] & (1 << i);
 
         if (sh_master) {
             if (sh_enable) {
@@ -118,15 +150,24 @@ opti391_shadow_recalc(opti391_t *dev)
                     mem_set_mem_state_both(base, 0x4000, MEM_READ_INTERNAL | MEM_WRITE_DISABLED);
                 else
                     mem_set_mem_state_both(base, 0x4000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
-            } else if (sh_write_internal)
+                dev->shadowed |= (1 << i);
+            } else if (sh_write_internal) {
                 mem_set_mem_state_both(base, 0x4000, MEM_READ_EXTANY | MEM_WRITE_INTERNAL);
-            else
+                dev->shadowed |= (1 << i);
+            } else {
                 mem_set_mem_state_both(base, 0x4000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
-        } else if (sh_write_internal)
+                dev->shadowed &= ~(1 << i);
+            }
+        } else if (sh_write_internal) {
             mem_set_mem_state_both(base, 0x4000, MEM_READ_EXTANY | MEM_WRITE_INTERNAL);
-        else
+            dev->shadowed |= (1 << i);
+        } else {
             mem_set_mem_state_both(base, 0x4000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+            dev->shadowed &= ~(1 << i);
+        }
     }
+
+    opti391_recalcremap(dev);
 }
 
 static void
@@ -134,7 +175,12 @@ opti391_write(uint16_t addr, uint8_t val, void *priv)
 {
     opti391_t *dev = (opti391_t *) priv;
 
+    opti391_log("[W] %04X = %02X\n", addr, val);
+
     switch (addr) {
+        default:
+            break;
+
         case 0x22:
             dev->index = val;
             break;
@@ -142,35 +188,92 @@ opti391_write(uint16_t addr, uint8_t val, void *priv)
         case 0x24:
             opti391_log("OPTi 391: dev->regs[%02x] = %02x\n", dev->index, val);
 
-            switch (dev->index) {
-                case 0x20:
-                    dev->regs[dev->index] = (dev->regs[dev->index] & 0xc0) | (val & 0x3f);
+            if ((dev->index <= 0x01) && (dev->type < 2))  switch (dev->index) {
+                case 0x00:
+                    if (!(dev->regs[0x10] & 0x20) && (val & 0x20)) {
+                        softresetx86(); /* Pulse reset! */
+                        cpu_set_edx();
+                        flushmmucache();
+                    }
+                    dev->regs[dev->index + 0x10] = val;
                     break;
 
-                case 0x21:
-                case 0x24:
-                case 0x25:
-                case 0x27:
-                case 0x28:
-                case 0x29:
-                case 0x2a:
-                case 0x2b:
-                    dev->regs[dev->index] = val;
+                case 0x01:
+                    dev->regs[dev->index + 0x10] = val;
+                    reset_on_hlt = !!(val & 0x02);
                     break;
-
-                case 0x22:
-                case 0x23:
-                case 0x26:
-                    dev->regs[dev->index] = val;
-                    opti391_shadow_recalc(dev);
-                    break;
-
+            } else  switch (dev->index - dev->reg_base) {
                 default:
                     break;
-            }
-            break;
 
-        default:
+                case 0x00:
+                    if (dev->type == 2) {
+                        reset_on_hlt = !!(val & 0x02);
+                        if (!(dev->regs[dev->index - dev->reg_base] & 0x01) && (val & 0x01)) {
+                            softresetx86(); /* Pulse reset! */
+                            cpu_set_edx();
+                            flushmmucache();
+                        }
+                        dev->regs[dev->index - dev->reg_base] =
+                            (dev->regs[dev->index - dev->reg_base] & 0xc0) | (val & 0x3f);
+                    }
+                    break;
+
+                case 0x01:
+                    dev->regs[dev->index - dev->reg_base] = val;
+                    if (dev->type == 2) {
+                        cpu_cache_ext_enabled = !!(dev->regs[0x01] & 0x10);
+                        cpu_update_waitstates();
+                    } else
+                        opti391_recalcremap(dev);
+                    break;
+
+                case 0x05:
+                    if (dev->type == 2)
+                        dev->regs[dev->index - dev->reg_base] = val & 0xf8;
+                    else
+                        dev->regs[dev->index - dev->reg_base] = val;
+                    break;
+
+                case 0x04:
+                case 0x09:
+                case 0x0a:
+                case 0x0b:
+                    dev->regs[dev->index - dev->reg_base] = val;
+                    break;
+
+                case 0x07:
+                    dev->regs[dev->index - dev->reg_base] = val;
+                    if (dev->type < 2) {
+                        mem_a20_alt = val & 0x08;
+                        mem_a20_recalc();
+                    }
+                    break;
+                case 0x08:
+                    if (dev->type == 2)
+                        dev->regs[dev->index - dev->reg_base] = val & 0xe3;
+                    else {
+                        dev->regs[dev->index - dev->reg_base] = val;
+                        cpu_cache_ext_enabled = !!(dev->regs[0x02] & 0x40);
+                        cpu_update_waitstates();
+                    }
+                    break;
+                case 0x0c:
+                case 0x0d:
+                    if (dev->type < 2)
+                        dev->regs[dev->index - dev->reg_base] = val;
+                    break;
+
+                case 0x02:
+                case 0x03:
+                case 0x06:
+                    opti391_log("Write %02X: %02X\n", dev->index - dev->reg_base, val);
+                    dev->regs[dev->index - dev->reg_base] = val;
+                    opti391_shadow_recalc(dev);
+                    break;
+            }
+
+            dev->index = 0xff;
             break;
     }
 }
@@ -178,11 +281,19 @@ opti391_write(uint16_t addr, uint8_t val, void *priv)
 static uint8_t
 opti391_read(uint16_t addr, void *priv)
 {
-    const opti391_t *dev = (opti391_t *) priv;
-    uint8_t          ret = 0xff;
+    opti391_t *dev = (opti391_t *) priv;
+    uint8_t    ret = 0xff;
 
-    if (addr == 0x24)
-        ret = dev->regs[dev->index];
+    if (addr == 0x24) {
+        if ((dev->index <= 0x01) && (dev->type < 2))
+            ret = dev->regs[dev->index + 0x10];
+        else if ((dev->index >= dev->min_reg) && (dev->index <= dev->max_reg))
+            ret = dev->regs[dev->index - dev->reg_base];
+
+        dev->index = 0xff;
+    }
+
+    opti391_log("[R] %04X = %02X\n", addr, ret);
 
     return ret;
 }
@@ -196,38 +307,102 @@ opti391_close(void *priv)
 }
 
 static void *
-opti391_init(UNUSED(const device_t *info))
+opti391_init(const device_t *info)
 {
-    opti391_t *dev = (opti391_t *) malloc(sizeof(opti391_t));
-    memset(dev, 0x00, sizeof(opti391_t));
+    opti391_t *dev = (opti391_t *) calloc(1, sizeof(opti391_t));
 
     io_sethandler(0x0022, 0x0001, opti391_read, NULL, NULL, opti391_write, NULL, NULL, dev);
     io_sethandler(0x0024, 0x0001, opti391_read, NULL, NULL, opti391_write, NULL, NULL, dev);
 
-    dev->regs[0x21] = 0x84;
-    dev->regs[0x24] = 0x07;
-    dev->regs[0x25] = 0xf0;
-    dev->regs[0x26] = 0x30;
-    dev->regs[0x27] = 0x91;
-    dev->regs[0x28] = 0x80;
-    dev->regs[0x29] = 0x10;
-    dev->regs[0x2a] = 0x80;
-    dev->regs[0x2b] = 0x10;
+    dev->type = info->local;
+
+    if (info->local == 2) {
+        dev->reg_base   = 0x20;
+        dev->min_reg    = 0x20;
+        dev->max_reg    = 0x2b;
+
+        dev->regs[0x02] = 0x84;
+        dev->regs[0x04] = 0x07;
+        dev->regs[0x05] = 0xf0;
+        dev->regs[0x06] = 0x30;
+        dev->regs[0x07] = 0x91;
+        dev->regs[0x08] = 0x80;
+        dev->regs[0x09] = 0x10;
+        dev->regs[0x0a] = 0x80;
+        dev->regs[0x0b] = 0x10;
+    } else {
+        dev->reg_base   = 0x0f;
+        dev->min_reg    = 0x10;
+        dev->max_reg    = 0x1c;
+
+        dev->regs[0x01] = 0x01;
+        dev->regs[0x02] = 0xe0;
+        if (info->local == 1)
+            /* Guess due to no OPTi 48x datasheet. */
+            dev->regs[0x04] = 0x07;
+        else
+            dev->regs[0x04] = 0x77;
+        dev->regs[0x05] = 0x60;
+        dev->regs[0x06] = 0x10;
+        dev->regs[0x07] = 0x50;
+        if (info->local == 1) {
+            /* Guess due to no OPTi 48x datasheet. */
+            dev->regs[0x09] = 0x80; /* Non-Cacheable Block 1 */
+            dev->regs[0x0b] = 0x80; /* Non-Cacheable Block 2 */
+            dev->regs[0x0d] = 0x91; /* Cacheable Area */
+        } else {
+            dev->regs[0x09] = 0xe0; /* Non-Cacheable Block 1 */
+            dev->regs[0x0b] = 0x10; /* Non-Cacheable Block 2 */
+            dev->regs[0x0d] = 0x80; /* Cacheable Area */
+        }
+        dev->regs[0x0a] = 0x10;
+        dev->regs[0x0c] = 0x10;
+    }
+
+    dev->old_start = 1024;
 
     opti391_shadow_recalc(dev);
 
     return dev;
 }
 
-const device_t opti391_device = {
-    .name          = "OPTi 82C391",
-    .internal_name = "opti391",
+const device_t opti381_device = {
+    .name          = "OPTi 82C381",
+    .internal_name = "opti381",
     .flags         = 0,
     .local         = 0,
     .init          = opti391_init,
     .close         = opti391_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t opti481_device = {
+    .name          = "OPTi 82C481",
+    .internal_name = "opti481",
+    .flags         = 0,
+    .local         = 1,
+    .init          = opti391_init,
+    .close         = opti391_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t opti391_device = {
+    .name          = "OPTi 82C391",
+    .internal_name = "opti391",
+    .flags         = 0,
+    .local         = 2,
+    .init          = opti391_init,
+    .close         = opti391_close,
+    .reset         = NULL,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/opti495.c b/src/chipset/opti495.c
index 13bc2a124..8521dbd17 100644
--- a/src/chipset/opti495.c
+++ b/src/chipset/opti495.c
@@ -8,14 +8,13 @@
  *
  *          Implementation of the OPTi 82C493/82C495 chipset.
  *
- *
- *
  * Authors: Tiseno100,
  *          Miran Grca, <mgrca8@gmail.com>
  *
  *          Copyright 2008-2020 Tiseno100.
  *          Copyright 2016-2020 Miran Grca.
  */
+#include <math.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -28,10 +27,13 @@
 #include <86box/io.h>
 #include <86box/device.h>
 #include <86box/mem.h>
+#include <86box/plat_fallthrough.h>
 #include <86box/port_92.h>
 #include <86box/chipset.h>
 
 typedef struct opti495_t {
+    uint8_t type;
+    uint8_t max;
     uint8_t idx;
     uint8_t regs[256];
     uint8_t scratch[2];
@@ -55,6 +57,22 @@ opti495_log(const char *fmt, ...)
 #    define opti495_log(fmt, ...)
 #endif
 
+enum {
+    OPTI493 = 0,
+    OPTI495,
+    OPTI495SLC,
+    OPTI495SX,
+    OPTI495XLC,
+    TMAX
+};
+
+/* OPTi 82C493: According to The Last Byte, bit 1 of register 22h, while unused, must still be writable. */
+static uint8_t masks[TMAX][0x1c] = { { 0x3f, 0xff, 0xff, 0xff, 0xf7, 0xfb, 0x7f, 0x9f, 0xe3, 0xff, 0xe3, 0xff },
+                                     { 0x3a, 0x7f, 0xff, 0xff, 0xf0, 0xfb, 0x7f, 0xbf, 0xe3, 0xff, 0x00, 0x00 },
+                                     { 0x3a, 0x7f, 0xfc, 0xff, 0xf0, 0xfb, 0xff, 0xbf, 0xe3, 0xff, 0x00, 0x00 },
+                                     { 0x3a, 0xff, 0xfd, 0xff, 0xf0, 0xfb, 0x7f, 0xbf, 0xe3, 0xff, 0x00, 0x00 },
+                                     { 0x3a, 0xff, 0xfc, 0xff, 0xf0, 0xfb, 0xff, 0xbf, 0xe3, 0xff, 0x00, 0x00 } };
+
 static void
 opti495_recalc(opti495_t *dev)
 {
@@ -119,16 +137,25 @@ opti495_write(uint16_t addr, uint8_t val, void *priv)
     opti495_t *dev = (opti495_t *) priv;
 
     switch (addr) {
+        default:
+            break;
+
         case 0x22:
             opti495_log("[%04X:%08X] [W] dev->idx = %02X\n", CS, cpu_state.pc, val);
             dev->idx = val;
             break;
         case 0x24:
-            if ((dev->idx >= 0x20) && (dev->idx <= 0x2d)) {
-                dev->regs[dev->idx] = val;
+            if ((dev->idx >= 0x20) && (dev->idx <= dev->max)) {
                 opti495_log("[%04X:%08X] [W] dev->regs[%04X] = %02X\n", CS, cpu_state.pc, dev->idx, val);
 
+                dev->regs[dev->idx] = val & masks[dev->type][dev->idx - 0x20];
+                if ((dev->type == OPTI493) && (dev->idx == 0x20))
+                    val |= 0x40;
+
                 switch (dev->idx) {
+                    default:
+                        break;
+
                     case 0x21:
                         cpu_cache_ext_enabled = !!(dev->regs[0x21] & 0x10);
                         cpu_update_waitstates();
@@ -139,36 +166,57 @@ opti495_write(uint16_t addr, uint8_t val, void *priv)
                     case 0x26:
                         opti495_recalc(dev);
                         break;
-                    default:
+
+                    case 0x25: {
+                        double bus_clk;
+                        switch (val & 0x03) {
+                            default:
+                            case 0x00:
+                                 bus_clk = cpu_busspeed / 6.0;
+                                 break;
+                            case 0x01:
+                                 bus_clk = cpu_busspeed / 4.0;
+                                 break;
+                            case 0x02:
+                                 bus_clk = cpu_busspeed / 3.0;
+                                 break;
+                            case 0x03:
+                                 bus_clk = (cpu_busspeed * 2.0) / 5.0;
+                                 break;
+                        }
+                        cpu_set_isa_speed((int) round(bus_clk));
                         break;
+                    }
                 }
             }
+
+            dev->idx = 0xff;
             break;
 
         case 0xe1:
         case 0xe2:
             dev->scratch[~addr & 0x01] = val;
             break;
-        default:
-            break;
     }
 }
 
 static uint8_t
 opti495_read(uint16_t addr, void *priv)
 {
-    uint8_t          ret = 0xff;
-    const opti495_t *dev = (opti495_t *) priv;
+    uint8_t    ret = 0xff;
+    opti495_t *dev = (opti495_t *) priv;
 
     switch (addr) {
         case 0x22:
             opti495_log("[%04X:%08X] [R] dev->idx = %02X\n", CS, cpu_state.pc, ret);
             break;
         case 0x24:
-            if ((dev->idx >= 0x20) && (dev->idx <= 0x2d)) {
+            if ((dev->idx >= 0x20) && (dev->idx <= dev->max)) {
                 ret = dev->regs[dev->idx];
                 opti495_log("[%04X:%08X] [R] dev->regs[%04X] = %02X\n", CS, cpu_state.pc, dev->idx, ret);
             }
+
+            dev->idx = 0xff;
             break;
         case 0xe1:
         case 0xe2:
@@ -192,8 +240,7 @@ opti495_close(void *priv)
 static void *
 opti495_init(const device_t *info)
 {
-    opti495_t *dev = (opti495_t *) malloc(sizeof(opti495_t));
-    memset(dev, 0, sizeof(opti495_t));
+    opti495_t *dev = (opti495_t *) calloc(1, sizeof(opti495_t));
 
     device_add(&port_92_device);
 
@@ -202,8 +249,11 @@ opti495_init(const device_t *info)
 
     dev->scratch[0] = dev->scratch[1] = 0xff;
 
-    if (info->local == 1) {
+    dev->type = info->local;
+
+    if (info->local >= OPTI495) {
         /* 85C495 */
+        dev->max = 0x29;
         dev->regs[0x20] = 0x02;
         dev->regs[0x21] = 0x20;
         dev->regs[0x22] = 0xe4;
@@ -214,6 +264,7 @@ opti495_init(const device_t *info)
         dev->regs[0x29] = 0x10;
     } else {
         /* 85C493 */
+        dev->max = 0x2b;
         dev->regs[0x20] = 0x40;
         dev->regs[0x22] = 0x84;
         dev->regs[0x24] = 0x87;
@@ -229,6 +280,8 @@ opti495_init(const device_t *info)
 
     io_sethandler(0x00e1, 0x0002, opti495_read, NULL, NULL, opti495_write, NULL, NULL, dev);
 
+    cpu_set_isa_speed((int) round(cpu_busspeed / 6.0));
+
     return dev;
 }
 
@@ -236,25 +289,39 @@ const device_t opti493_device = {
     .name          = "OPTi 82C493",
     .internal_name = "opti493",
     .flags         = 0,
-    .local         = 0,
+    .local         = OPTI493,
     .init          = opti495_init,
     .close         = opti495_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
 };
 
-const device_t opti495_device = {
+const device_t opti495slc_device = {
     .name          = "OPTi 82C495",
-    .internal_name = "opti495",
+    .internal_name = "opti495slc",
     .flags         = 0,
-    .local         = 1,
+    .local         = OPTI495SLC,
     .init          = opti495_init,
     .close         = opti495_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t opti495sx_device = {
+    .name          = "OPTi 82C495SX",
+    .internal_name = "opti495sx",
+    .flags         = 0,
+    .local         = OPTI495SX,
+    .init          = opti495_init,
+    .close         = opti495_close,
+    .reset         = NULL,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/opti498.c b/src/chipset/opti498.c
new file mode 100644
index 000000000..2d3dc6709
--- /dev/null
+++ b/src/chipset/opti498.c
@@ -0,0 +1,360 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the OPTi 82C498 chipset.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2025 Miran Grca.
+ */
+#include <math.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/mem.h>
+#include <86box/plat_fallthrough.h>
+#include <86box/plat_unused.h>
+#include <86box/port_92.h>
+#include <86box/chipset.h>
+
+#ifdef ENABLE_OPTI498_LOG
+int opti498_do_log = ENABLE_OPTI498_LOG;
+
+static void
+opti498_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (opti498_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define opti498_log(fmt, ...)
+#endif
+
+typedef struct mem_remapping_t {
+    uint32_t phys;
+    uint32_t virt;
+} mem_remapping_t;
+
+typedef struct opti498_t {
+    uint8_t         index;
+    /* 0x30 for 496/497, 0x70 for 498. */
+    uint8_t         reg_base;
+    uint8_t         shadow_high;
+    uint8_t         regs[256];
+    mem_remapping_t mem_remappings[2];
+    mem_mapping_t   mem_mappings[2];
+} opti498_t;
+
+static uint8_t
+opti498_read_remapped_ram(uint32_t addr, void *priv)
+{
+    const mem_remapping_t *dev = (mem_remapping_t *) priv;
+
+    return mem_read_ram((addr - dev->virt) + dev->phys, priv);
+}
+
+static uint16_t
+opti498_read_remapped_ramw(uint32_t addr, void *priv)
+{
+    const mem_remapping_t *dev = (mem_remapping_t *) priv;
+
+    return mem_read_ramw((addr - dev->virt) + dev->phys, priv);
+}
+
+static uint32_t
+opti498_read_remapped_raml(uint32_t addr, void *priv)
+{
+    const mem_remapping_t *dev = (mem_remapping_t *) priv;
+
+    return mem_read_raml((addr - dev->virt) + dev->phys, priv);
+}
+
+static void
+opti498_write_remapped_ram(uint32_t addr, uint8_t val, void *priv)
+{
+    const mem_remapping_t *dev = (mem_remapping_t *) priv;
+
+    mem_write_ram((addr - dev->virt) + dev->phys, val, priv);
+}
+
+static void
+opti498_write_remapped_ramw(uint32_t addr, uint16_t val, void *priv)
+{
+    const mem_remapping_t *dev = (mem_remapping_t *) priv;
+
+    mem_write_ramw((addr - dev->virt) + dev->phys, val, priv);
+}
+
+static void
+opti498_write_remapped_raml(uint32_t addr, uint32_t val, void *priv)
+{
+    const mem_remapping_t *dev = (mem_remapping_t *) priv;
+
+    mem_write_raml((addr - dev->virt) + dev->phys, val, priv);
+}
+
+static void
+opti498_shadow_recalc(opti498_t *dev)
+{
+    uint32_t base;
+    uint32_t rbase;
+    uint8_t  sh_enable;
+    uint8_t  sh_mode;
+    uint8_t  rom;
+    uint8_t  sh_copy;
+
+    shadowbios = shadowbios_write = 0;
+    dev->shadow_high              = 0;
+
+    opti498_log("OPTI 498: %02X %02X %02X %02X\n", dev->regs[0x02], dev->regs[0x03], dev->regs[0x04], dev->regs[0x05]);
+
+    if (dev->regs[0x02] & 0x80) {
+        if (dev->regs[0x04] & 0x02) {
+            mem_set_mem_state_both(0xf0000, 0x10000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+            opti498_log("OPTI 498: F0000-FFFFF READ_EXTANY, WRITE_EXTANY\n");
+        } else {
+            shadowbios_write = 1;
+            mem_set_mem_state_both(0xf0000, 0x10000, MEM_READ_EXTANY | MEM_WRITE_INTERNAL);
+            opti498_log("OPTI 498: F0000-FFFFF READ_EXTANY, WRITE_INTERNAL\n");
+        }
+    } else {
+        shadowbios = 1;
+        mem_set_mem_state_both(0xf0000, 0x10000, MEM_READ_INTERNAL | MEM_WRITE_DISABLED);
+        opti498_log("OPTI 498: F0000-FFFFF READ_INTERNAL, WRITE_DISABLED\n");
+    }
+
+    sh_copy = dev->regs[0x02] & 0x08;
+    for (uint8_t i = 0; i < 12; i++) {
+        base = 0xc0000 + (i << 14);
+        if (i >= 4)
+            sh_enable = dev->regs[0x03] & (1 << (i - 4));
+        else
+            sh_enable = dev->regs[0x04] & (1 << (i + 4));
+        sh_mode = dev->regs[0x02] & (1 << (i >> 2));
+        rom     = dev->regs[0x02] & (1 << ((i >> 2) + 4));
+        opti498_log("OPTI 498: %i/%08X: %i, %i, %i\n", i, base, (i >= 4) ? (1 << (i - 4)) : (1 << (i + 4)), (1 << (i >> 2)), (1 << ((i >> 2) + 4)));
+
+        if (sh_copy) {
+            if (base >= 0x000e0000)
+                shadowbios_write |= 1;
+            if (base >= 0x000d0000)
+                dev->shadow_high |= 1;
+
+            if (base >= 0xe0000) {
+                mem_set_mem_state_both(base, 0x4000, MEM_READ_EXTANY | MEM_WRITE_INTERNAL);
+                opti498_log("OPTI 498: %08X-%08X READ_EXTANY, WRITE_INTERNAL\n", base, base + 0x3fff);
+            } else {
+                mem_set_mem_state_both(base, 0x4000, MEM_READ_EXTERNAL | MEM_WRITE_INTERNAL);
+                opti498_log("OPTI 498: %08X-%08X READ_EXTERNAL, WRITE_INTERNAL\n", base, base + 0x3fff);
+            }
+        } else if (sh_enable && rom) {
+            if (base >= 0x000e0000)
+                shadowbios |= 1;
+            if (base >= 0x000d0000)
+                dev->shadow_high |= 1;
+
+            if (sh_mode) {
+                mem_set_mem_state_both(base, 0x4000, MEM_READ_INTERNAL | MEM_WRITE_DISABLED);
+                opti498_log("OPTI 498: %08X-%08X READ_INTERNAL, WRITE_DISABLED\n", base, base + 0x3fff);
+            } else {
+                if (base >= 0x000e0000)
+                    shadowbios_write |= 1;
+
+                mem_set_mem_state_both(base, 0x4000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+                opti498_log("OPTI 498: %08X-%08X READ_INTERNAL, WRITE_INTERNAL\n", base, base + 0x3fff);
+            }
+        } else {
+            if (base >= 0xe0000) {
+                mem_set_mem_state_both(base, 0x4000, MEM_READ_EXTANY | MEM_WRITE_DISABLED);
+                opti498_log("OPTI 498: %08X-%08X READ_EXTANY, WRITE_DISABLED\n", base, base + 0x3fff);
+            } else {
+                mem_set_mem_state_both(base, 0x4000, MEM_READ_EXTERNAL | MEM_WRITE_DISABLED);
+                opti498_log("OPTI 498: %08X-%08X READ_EXTERNAL, WRITE_DISABLED\n", base, base + 0x3fff);
+            }
+        }
+    }
+
+    rbase = ((uint32_t) (dev->regs[0x05] & 0x3f)) << 20;
+
+    if (rbase > 0) {
+        dev->mem_remappings[0].virt = rbase;
+        mem_mapping_set_addr(&dev->mem_mappings[0], rbase, 0x00020000);
+
+        if (!dev->shadow_high) {
+            rbase += 0x00020000;
+            dev->mem_remappings[1].virt = rbase;
+            mem_mapping_set_addr(&dev->mem_mappings[1], rbase, 0x00020000);
+        } else
+            mem_mapping_disable(&dev->mem_mappings[1]);
+    } else {
+        mem_mapping_disable(&dev->mem_mappings[0]);
+        mem_mapping_disable(&dev->mem_mappings[1]);
+    }
+
+    flushmmucache_nopc();
+}
+
+static void
+opti498_write(uint16_t addr, uint8_t val, void *priv)
+{
+    opti498_t *dev = (opti498_t *) priv;
+    uint8_t    reg = dev->index - dev->reg_base;
+
+    switch (addr) {
+        default:
+            break;
+
+        case 0x22:
+            dev->index = val;
+            break;
+
+        case 0x24:
+            opti498_log("OPTi 498: dev->regs[%02x] = %02x\n", dev->index, val);
+
+            if ((reg >= 0x00) && (reg <= 0x0b))  switch (reg) {
+                default:
+                    break;
+
+                case 0x00:
+                    dev->regs[reg] = (dev->regs[reg] & 0xc0) | (val & 0x3f);
+                    break;
+
+                case 0x01:
+                case 0x07 ... 0x0b:
+                    dev->regs[reg] = val;
+                    break;
+
+                case 0x02:
+                case 0x03:
+                case 0x04:
+                case 0x05:
+                    dev->regs[reg] = val;
+                    opti498_shadow_recalc(dev);
+                    break;
+
+                case 0x06: {
+                    double bus_clk;
+                    dev->regs[reg] = val;
+                    switch (val & 0x03) {
+                        default:
+                        case 0x00:
+                             bus_clk = cpu_busspeed / 8.0;
+                             break;
+                        case 0x01:
+                             bus_clk = cpu_busspeed / 6.0;
+                             break;
+                        case 0x02:
+                             bus_clk = cpu_busspeed / 5.0;
+                             break;
+                        case 0x03:
+                             bus_clk = cpu_busspeed / 4.0;
+                             break;
+                    }
+                    cpu_set_isa_speed((int) round(bus_clk));
+                    reset_on_hlt = !!(val & 0x40);
+                    break;
+                }
+            }
+
+            dev->index = 0xff;
+            break;
+    }
+}
+
+static uint8_t
+opti498_read(uint16_t addr, void *priv)
+{
+    opti498_t *dev = (opti498_t *) priv;
+    uint8_t    reg = dev->index - dev->reg_base;
+    uint8_t    ret = 0xff;
+
+    if (addr == 0x24) {
+        if ((reg >= 0x00) && (reg <= 0x0b))
+            ret = dev->regs[reg];
+
+        dev->index = 0xff;
+    }
+
+    return ret;
+}
+
+static void
+opti498_close(void *priv)
+{
+    opti498_t *dev = (opti498_t *) priv;
+
+    free(dev);
+}
+
+static void *
+opti498_init(UNUSED(const device_t *info))
+{
+    opti498_t *dev = (opti498_t *) calloc(1, sizeof(opti498_t));
+
+    dev->reg_base = info->local & 0xff;
+
+    io_sethandler(0x0022, 0x0001, opti498_read, NULL, NULL, opti498_write, NULL, NULL, dev);
+    io_sethandler(0x0024, 0x0001, opti498_read, NULL, NULL, opti498_write, NULL, NULL, dev);
+
+    dev->regs[0x00] = 0x1f;
+    dev->regs[0x01] = 0x8f;
+    dev->regs[0x02] = 0xf0;
+    dev->regs[0x07] = 0x70;
+    dev->regs[0x09] = 0x70;
+
+    dev->mem_remappings[0].phys = 0x000a0000;
+    dev->mem_remappings[1].phys = 0x000d0000;
+
+    mem_mapping_add(&dev->mem_mappings[0], 0, 0x00020000,
+                    opti498_read_remapped_ram, opti498_read_remapped_ramw, opti498_read_remapped_raml,
+                    opti498_write_remapped_ram, opti498_write_remapped_ramw, opti498_write_remapped_raml,
+                    &ram[dev->mem_remappings[0].phys], MEM_MAPPING_INTERNAL, &dev->mem_remappings[0]);
+    mem_mapping_disable(&dev->mem_mappings[0]);
+
+    mem_mapping_add(&dev->mem_mappings[1], 0, 0x00020000,
+                    opti498_read_remapped_ram, opti498_read_remapped_ramw, opti498_read_remapped_raml,
+                    opti498_write_remapped_ram, opti498_write_remapped_ramw, opti498_write_remapped_raml,
+                    &ram[dev->mem_remappings[1].phys], MEM_MAPPING_INTERNAL, &dev->mem_remappings[1]);
+    mem_mapping_disable(&dev->mem_mappings[1]);
+
+    opti498_shadow_recalc(dev);
+
+    cpu_set_isa_speed((int) round(cpu_busspeed / 8.0));
+
+    device_add(&port_92_device);
+
+    return dev;
+}
+
+const device_t opti498_device = {
+    .name          = "OPTi 82C498",
+    .internal_name = "opti498",
+    .flags         = 0,
+    .local         = 0x70,
+    .init          = opti498_init,
+    .close         = opti498_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/opti499.c b/src/chipset/opti499.c
index f8b878559..383b8e3e2 100644
--- a/src/chipset/opti499.c
+++ b/src/chipset/opti499.c
@@ -16,6 +16,7 @@
  *          Copyright 2008-2020 Tiseno100.
  *          Copyright 2016-2020 Miran Grca.
  */
+#include <math.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -38,6 +39,9 @@ typedef struct opti499_t {
     uint8_t scratch[2];
 } opti499_t;
 
+/* According to The Last Byte, register 2Dh bit 7 must still be writable, even if it is unused. */
+static uint8_t masks[0x0e] = { 0x3f, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xe3, 0xff, 0xfb, 0xff, 0x00, 0xff };
+
 #ifdef ENABLE_OPTI499_LOG
 int opti499_do_log = ENABLE_OPTI499_LOG;
 
@@ -84,7 +88,7 @@ opti499_recalc(opti499_t *dev)
             shflags = MEM_READ_INTERNAL;
             shflags |= (dev->regs[0x22] & ((base >= 0xe0000) ? 0x08 : 0x10)) ? MEM_WRITE_DISABLED : MEM_WRITE_INTERNAL;
         } else {
-            if (dev->regs[0x2d] && (1 << ((i >> 1) + 2)))
+            if (dev->regs[0x2d] & (1 << ((i >> 1) + 2)))
                 shflags = MEM_READ_EXTANY | MEM_WRITE_EXTANY;
             else
                 shflags = MEM_READ_EXTERNAL | MEM_WRITE_EXTERNAL;
@@ -101,13 +105,13 @@ opti499_recalc(opti499_t *dev)
             shflags |= (dev->regs[0x26] & 0x20) ? MEM_WRITE_DISABLED : MEM_WRITE_INTERNAL;
         } else {
             if (dev->regs[0x26] & 0x40) {
-                if (dev->regs[0x2d] && (1 << (i >> 1)))
+                if (dev->regs[0x2d] & (1 << (i >> 1)))
                     shflags = MEM_READ_EXTANY;
                 else
                     shflags = MEM_READ_EXTERNAL;
                 shflags |= (dev->regs[0x26] & 0x20) ? MEM_WRITE_DISABLED : MEM_WRITE_INTERNAL;
             } else {
-                if (dev->regs[0x2d] && (1 << (i >> 1)))
+                if (dev->regs[0x2d] & (1 << (i >> 1)))
                     shflags = MEM_READ_EXTANY | MEM_WRITE_EXTANY;
                 else
                     shflags = MEM_READ_EXTERNAL | MEM_WRITE_EXTERNAL;
@@ -126,22 +130,47 @@ opti499_write(uint16_t addr, uint8_t val, void *priv)
     opti499_t *dev = (opti499_t *) priv;
 
     switch (addr) {
+        default:
+            break;
+
         case 0x22:
             opti499_log("[%04X:%08X] [W] dev->idx = %02X\n", CS, cpu_state.pc, val);
             dev->idx = val;
             break;
         case 0x24:
-            if ((dev->idx >= 0x20) && (dev->idx <= 0x2d)) {
-                if (dev->idx == 0x20)
-                    dev->regs[dev->idx] = (dev->regs[dev->idx] & 0xc0) | (val & 0x3f);
-                else
-                    dev->regs[dev->idx] = val;
+            if ((dev->idx >= 0x20) && (dev->idx <= 0x2d) && (dev->idx != 0x2c)) {
                 opti499_log("[%04X:%08X] [W] dev->regs[%04X] = %02X\n", CS, cpu_state.pc, dev->idx, val);
 
+                dev->regs[dev->idx] = val & masks[dev->idx - 0x20];
+                if (dev->idx == 0x2a)
+                    dev->regs[dev->idx] |= 0x04;
+
                 switch (dev->idx) {
-                    case 0x20:
+                    default:
+                        break;
+
+                    case 0x20: {
+                        double coeff   = (val & 0x10) ? 1.0 : 2.0;
+                        double bus_clk;
+                        switch (dev->regs[0x25] & 0x03) {
+                            default:
+                            case 0x00:
+                                 bus_clk = (cpu_busspeed * coeff) / 6.0;
+                                 break;
+                            case 0x01:
+                                 bus_clk = (cpu_busspeed * coeff) / 5.0;
+                                 break;
+                            case 0x02:
+                                 bus_clk = (cpu_busspeed * coeff) / 4.0;
+                                 break;
+                            case 0x03:
+                                 bus_clk = (cpu_busspeed * coeff) / 3.0;
+                                 break;
+                        }
+                        cpu_set_isa_speed((int) round(bus_clk));
                         reset_on_hlt = !(val & 0x02);
                         break;
+                    }
 
                     case 0x21:
                         cpu_cache_ext_enabled = !!(dev->regs[0x21] & 0x10);
@@ -155,19 +184,37 @@ opti499_write(uint16_t addr, uint8_t val, void *priv)
                         opti499_recalc(dev);
                         break;
 
-                    default:
+                    case 0x25: {
+                        double coeff   = (dev->regs[0x20] & 0x10) ? 1.0 : 2.0;
+                        double bus_clk;
+                        switch (val & 0x03) {
+                            default:
+                            case 0x00:
+                                 bus_clk = (cpu_busspeed * coeff) / 8.0;
+                                 break;
+                            case 0x01:
+                                 bus_clk = (cpu_busspeed * coeff) / 6.0;
+                                 break;
+                            case 0x02:
+                                 bus_clk = (cpu_busspeed * coeff) / 5.0;
+                                 break;
+                            case 0x03:
+                                 bus_clk = (cpu_busspeed * coeff) / 4.0;
+                                 break;
+                        }
+                        cpu_set_isa_speed((int) round(bus_clk));
                         break;
+                    }
                 }
             }
+
+            dev->idx = 0xff;
             break;
 
         case 0xe1:
         case 0xe2:
             dev->scratch[~addr & 0x01] = val;
             break;
-
-        default:
-            break;
     }
 }
 
@@ -178,25 +225,23 @@ opti499_read(uint16_t addr, void *priv)
     opti499_t *dev = (opti499_t *) priv;
 
     switch (addr) {
+        default:
+            break;
+
         case 0x22:
             opti499_log("[%04X:%08X] [R] dev->idx = %02X\n", CS, cpu_state.pc, ret);
             break;
         case 0x24:
-            if ((dev->idx >= 0x20) && (dev->idx <= 0x2d)) {
-                if (dev->idx == 0x2d)
-                    ret = dev->regs[dev->idx] & 0xbf;
-                else
-                    ret = dev->regs[dev->idx];
+            if ((dev->idx >= 0x20) && (dev->idx <= 0x2d) && (dev->idx != 0x2c)) {
+                ret = dev->regs[dev->idx];
                 opti499_log("[%04X:%08X] [R] dev->regs[%04X] = %02X\n", CS, cpu_state.pc, dev->idx, ret);
             }
+            dev->idx = 0xff;
             break;
         case 0xe1:
         case 0xe2:
             ret = dev->scratch[~addr & 0x01];
             break;
-
-        default:
-            break;
     }
 
     return ret;
@@ -227,7 +272,7 @@ opti499_reset(void *priv)
 
     opti499_recalc(dev);
 
-    free(dev);
+    cpu_set_isa_speed((int) round((cpu_busspeed * 2.0) / 6.0));
 }
 
 static void
@@ -241,8 +286,7 @@ opti499_close(void *priv)
 static void *
 opti499_init(UNUSED(const device_t *info))
 {
-    opti499_t *dev = (opti499_t *) malloc(sizeof(opti499_t));
-    memset(dev, 0, sizeof(opti499_t));
+    opti499_t *dev = (opti499_t *) calloc(1, sizeof(opti499_t));
 
     device_add(&port_92_device);
 
@@ -264,7 +308,7 @@ const device_t opti499_device = {
     .init          = opti499_init,
     .close         = opti499_close,
     .reset         = opti499_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/opti5x7.c b/src/chipset/opti5x7.c
index 64adacde4..03fde4173 100644
--- a/src/chipset/opti5x7.c
+++ b/src/chipset/opti5x7.c
@@ -35,7 +35,7 @@
 typedef struct opti5x7_t {
     uint8_t idx;
     uint8_t is_pci;
-    uint8_t regs[16];
+    uint8_t regs[18];
 } opti5x7_t;
 
 #ifdef ENABLE_OPTI5X7_LOG
@@ -158,7 +158,7 @@ opti5x7_read(uint16_t addr, void *priv)
 {
     const opti5x7_t *dev = (opti5x7_t *) priv;
 
-    return (addr == 0x24) ? dev->regs[dev->idx] : 0xff;
+    return ((addr == 0x24) && (dev->idx < sizeof(dev->regs))) ? dev->regs[dev->idx] : 0xff;
 }
 
 static void
@@ -172,8 +172,7 @@ opti5x7_close(void *priv)
 static void *
 opti5x7_init(const device_t *info)
 {
-    opti5x7_t *dev = (opti5x7_t *) malloc(sizeof(opti5x7_t));
-    memset(dev, 0, sizeof(opti5x7_t));
+    opti5x7_t *dev = (opti5x7_t *) calloc(1, sizeof(opti5x7_t));
 
     dev->is_pci = info->local;
 
@@ -193,7 +192,7 @@ const device_t opti5x7_device = {
     .init          = opti5x7_init,
     .close         = opti5x7_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -207,7 +206,7 @@ const device_t opti5x7_pci_device = {
     .init          = opti5x7_init,
     .close         = opti5x7_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/opti602.c b/src/chipset/opti602.c
index 3b5614ff4..7082408c7 100644
--- a/src/chipset/opti602.c
+++ b/src/chipset/opti602.c
@@ -218,7 +218,7 @@ const device_t opti601_device = {
     .init          = opti602_init,
     .close         = opti602_close,
     .reset         = opti602_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -232,7 +232,7 @@ const device_t opti602_device = {
     .init          = opti602_init,
     .close         = opti602_close,
     .reset         = opti602_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/opti822.c b/src/chipset/opti822.c
index 3e9316f2b..471fbe393 100644
--- a/src/chipset/opti822.c
+++ b/src/chipset/opti822.c
@@ -394,8 +394,7 @@ opti822_close(void *priv)
 static void *
 opti822_init(UNUSED(const device_t *info))
 {
-    opti822_t *dev = (opti822_t *) malloc(sizeof(opti822_t));
-    memset(dev, 0, sizeof(opti822_t));
+    opti822_t *dev = (opti822_t *) calloc(1, sizeof(opti822_t));
 
     pci_add_card(PCI_ADD_NORTHBRIDGE, opti822_pci_read, opti822_pci_write, dev, &dev->pci_slot);
 
@@ -412,7 +411,7 @@ const device_t opti822_device = {
     .init          = opti822_init,
     .close         = opti822_close,
     .reset         = opti822_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/opti895.c b/src/chipset/opti895.c
index 77297ae95..16b324963 100644
--- a/src/chipset/opti895.c
+++ b/src/chipset/opti895.c
@@ -16,6 +16,7 @@
  *          Copyright 2008-2020 Tiseno100.
  *          Copyright 2016-2020 Miran Grca.
  */
+#include <math.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -42,6 +43,9 @@ typedef struct opti895_t {
     smram_t *smram;
 } opti895_t;
 
+static uint8_t masks[0x10] = { 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+                               0xe3, 0xff, 0xe3, 0xff, 0x00, 0xff, 0xff, 0xff };
+
 #ifdef ENABLE_OPTI895_LOG
 int opti895_do_log = ENABLE_OPTI895_LOG;
 
@@ -153,8 +157,12 @@ opti895_write(uint16_t addr, uint8_t val, void *priv)
             }
             break;
         case 0x24:
-            if (((dev->idx >= 0x20) && (dev->idx <= 0x2f)) || ((dev->idx >= 0xe0) && (dev->idx <= 0xef))) {
-                dev->regs[dev->idx] = val;
+            if (((dev->idx >= 0x20) && (dev->idx <= 0x2f) && (dev->idx != 0x2c)) ||
+                ((dev->idx >= 0xe0) && (dev->idx <= 0xef))) {
+                if (dev->idx > 0x2f)
+                    dev->regs[dev->idx] = val;
+                else
+                    dev->regs[dev->idx] = val & masks[dev->idx - 0x20];
                 opti895_log("dev->regs[%04x] = %08x\n", dev->idx, val);
 
                 /* TODO: Registers 0x30-0x3F for OPTi 802GP and 898. */
@@ -175,6 +183,27 @@ opti895_write(uint16_t addr, uint8_t val, void *priv)
                         smram_state_change(dev->smram, 0, !!(val & 0x80));
                         break;
 
+                    case 0x25: {
+                        double bus_clk;
+                        switch (val & 0x03) {
+                            default:
+                            case 0x00:
+                                 bus_clk = cpu_busspeed / 6.0;
+                                 break;
+                            case 0x01:
+                                 bus_clk = cpu_busspeed / 5.0;
+                                 break;
+                            case 0x02:
+                                 bus_clk = cpu_busspeed / 4.0;
+                                 break;
+                            case 0x03:
+                                 bus_clk = cpu_busspeed / 3.0;
+                                 break;
+                        }
+                        cpu_set_isa_speed((int) round(bus_clk));
+                        break;
+                    }
+
                     case 0xe0:
                         if (!(val & 0x01))
                             dev->forced_green = 0;
@@ -217,7 +246,8 @@ opti895_read(uint16_t addr, void *priv)
             break;
         case 0x24:
             /* TODO: Registers 0x30-0x3F for OPTi 802GP and 898. */
-            if (((dev->idx >= 0x20) && (dev->idx <= 0x2f)) || ((dev->idx >= 0xe0) && (dev->idx <= 0xef))) {
+            if (((dev->idx >= 0x20) && (dev->idx <= 0x2f) && (dev->idx != 0x2c)) ||
+                ((dev->idx >= 0xe0) && (dev->idx <= 0xef))) {
                 ret = dev->regs[dev->idx];
                 if (dev->idx == 0xe0)
                     ret = (ret & 0xf6) | (in_smm ? 0x00 : 0x08) | !!dev->forced_green;
@@ -251,8 +281,7 @@ opti895_close(void *priv)
 static void *
 opti895_init(const device_t *info)
 {
-    opti895_t *dev = (opti895_t *) malloc(sizeof(opti895_t));
-    memset(dev, 0, sizeof(opti895_t));
+    opti895_t *dev = (opti895_t *) calloc(1, sizeof(opti895_t));
 
     device_add(&port_92_device);
 
@@ -287,6 +316,8 @@ opti895_init(const device_t *info)
 
     smram_enable(dev->smram, 0x00030000, 0x000b0000, 0x00010000, 0, 1);
 
+    cpu_set_isa_speed((int) round(cpu_busspeed / 6.0));
+
     return dev;
 }
 
@@ -298,7 +329,7 @@ const device_t opti802g_device = {
     .init          = opti895_init,
     .close         = opti895_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -312,7 +343,7 @@ const device_t opti802g_pci_device = {
     .init          = opti895_init,
     .close         = opti895_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -326,7 +357,7 @@ const device_t opti895_device = {
     .init          = opti895_init,
     .close         = opti895_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/machine/m_xt_philips.c b/src/chipset/philips.c
similarity index 73%
rename from src/machine/m_xt_philips.c
rename to src/chipset/philips.c
index 1fc284a46..d6f56c3c5 100644
--- a/src/machine/m_xt_philips.c
+++ b/src/chipset/philips.c
@@ -8,11 +8,9 @@
  *
  *          Emulation of the Philips XT-compatible machines.
  *
- *
- *
  * Authors: EngiNerd <webmaster.crrc@yahoo.it>
  *
- *          Copyright 2020-2021 EngiNerd.
+ *          Copyright 2020-2025 EngiNerd.
  */
 #include <stdarg.h>
 #include <stdint.h>
@@ -23,6 +21,7 @@
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/nmi.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/pit.h>
 #include <86box/mem.h>
@@ -142,65 +141,8 @@ const device_t philips_device = {
     .init          = philips_init,
     .close         = philips_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
 };
-
-void
-machine_xt_philips_common_init(const machine_t *model)
-{
-    machine_common_init(model);
-
-    pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_xt);
-
-    nmi_init();
-
-    standalone_gameport_type = &gameport_device;
-
-    device_add(&keyboard_pc_device);
-
-    device_add(&philips_device);
-
-    device_add(&xta_hd20_device);
-}
-
-int
-machine_xt_p3105_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/p3105/philipsnms9100.bin",
-                           0x000fc000, 16384, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_xt_philips_common_init(model);
-
-    /* On-board FDC cannot be disabled */
-    device_add(&fdc_xt_device);
-
-    return ret;
-}
-
-int
-machine_xt_p3120_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/p3120/philips_p3120.bin",
-                           0x000f8000, 32768, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_xt_philips_common_init(model);
-
-    device_add(&gc100a_device);
-
-    device_add(&fdc_at_device);
-
-    return ret;
-}
diff --git a/src/chipset/sanyo.c b/src/chipset/sanyo.c
new file mode 100644
index 000000000..68d6dac9b
--- /dev/null
+++ b/src/chipset/sanyo.c
@@ -0,0 +1,123 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Emulation of the Philips XT-compatible machines.
+ *
+ * Authors: EngiNerd <webmaster.crrc@yahoo.it>
+ *
+ *          Copyright 2020-2025 EngiNerd.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/nmi.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/pit.h>
+#include <86box/mem.h>
+#include <86box/device.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/hdc.h>
+#include <86box/gameport.h>
+#include <86box/ibm_5161.h>
+#include <86box/keyboard.h>
+#include <86box/rom.h>
+#include <86box/machine.h>
+#include <86box/chipset.h>
+#include <86box/io.h>
+#include <86box/video.h>
+#include <86box/plat_unused.h>
+
+typedef struct sanyo_t {
+    uint8_t reg;
+} sanyo_t;
+
+#ifdef ENABLE_SANYO_LOG
+int sanyo_do_log = ENABLE_SANYO_LOG;
+
+static void
+sanyo_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (sanyo_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define sanyo_log(fmt, ...)
+#endif
+
+static void
+sanyo_write(uint16_t port, uint8_t val, void *priv)
+{
+    sanyo_t *dev = (sanyo_t *) priv;
+
+    dev->reg = val;
+
+    cpu_waitstates = !(val & 0x01);
+    cpu_update_waitstates();
+
+    sanyo_log("Sanyo MBC-17 Mainboard: Write %02x at %02x\n", val, port);
+}
+
+static uint8_t
+sanyo_read(uint16_t port, void *priv)
+{
+    const sanyo_t *dev = (sanyo_t *) priv;
+    uint8_t        ret = 0xff;
+
+    ret = dev->reg;
+
+    sanyo_log("Sanyo MBC-17 Mainboard: Read %02x at %02x\n", ret, port);
+
+    return ret;
+}
+
+static void
+sanyo_close(void *priv)
+{
+    sanyo_t *dev = (sanyo_t *) priv;
+
+    free(dev);
+}
+
+static void *
+sanyo_init(UNUSED(const device_t *info))
+{
+    sanyo_t *dev = (sanyo_t *) calloc(1, sizeof(sanyo_t));
+
+    dev->reg = cpu_waitstates ? 0x00 : 0x01;
+
+    io_sethandler(0x0063, 0x01, sanyo_read, NULL, NULL, sanyo_write, NULL, NULL, dev);
+
+    return dev;
+}
+
+const device_t sanyo_device = {
+    .name          = "Sanyo MBC-17 Mainboard",
+    .internal_name = "sanyo",
+    .flags         = 0,
+    .local         = 0,
+    .init          = sanyo_init,
+    .close         = sanyo_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/scamp.c b/src/chipset/scamp.c
index 122318862..7ad7b3db2 100644
--- a/src/chipset/scamp.c
+++ b/src/chipset/scamp.c
@@ -47,13 +47,35 @@
 
 #define ID_VL82C311    0xd6
 
-#define RAMMAP_REMP386 (1 << 4)
+#define RAMMAP_ROMMOV  0x60
+#define RAMMAP_ROMMOV1 (1 << 6)
+#define RAMMAP_ROMMOV0 (1 << 5)
+#define RAMMAP_REMP384 (1 << 4)
 
 #define EMSEN1_EMSMAP  (1 << 4)
+#define EMSEN1_BFENAB  (1 << 6)
 #define EMSEN1_EMSENAB (1 << 7)
 
 #define NR_ELEMS(x)    (sizeof(x) / sizeof(x[0]))
 
+#define EMS_MAXPAGE 4
+#define EMS_PGSIZE  16384
+#define EMS_PGMASK  16383
+
+#define MEM_FLAG_SLOTBUS    0x40
+#define MEM_FLAG_REMAP      0x20
+#define MEM_FLAG_MEMCARD    0x10
+#define MEM_FLAG_EMS        0x08
+#define MEM_FLAG_ROMCS      0x04
+#define MEM_FLAG_READ       0x02
+#define MEM_FLAG_WRITE      0x01
+#define MEM_FMASK_SLOTBUS   0x40
+#define MEM_FMASK_REMAP     0x20
+#define MEM_FMASK_MEMCARD   0x10
+#define MEM_FMASK_EMS       0x08
+#define MEM_FMASK_ROMCS     0x04
+#define MEM_FMASK_RW        0x03
+
 /*Commodore SL386SX requires proper memory slot decoding to detect memory size.
   Therefore we emulate the SCAMP memory address decoding, and therefore are
   limited to the DRAM combinations supported by the actual chip*/
@@ -72,36 +94,43 @@ typedef struct ram_struct_t {
     int   bank;
 } ram_struct_t;
 
-typedef struct ems_struct_t {
-    void *parent;
-    int   segment;
-} ems_struct_t;
+typedef struct card_mem_t {
+    int       in_ram;
+    uint32_t  virt_addr;
+    uint32_t  phys_addr;
+    uint8_t  *mem;
+} mem_page_t;
 
 typedef struct scamp_t {
-    int     cfg_index;
-    uint8_t cfg_regs[256];
-    int     cfg_enable;
-    int     ram_config;
+    int           cfg_index;
+    uint8_t       cfg_regs[256];
+    int           cfg_enable;
+    int           ram_config;
 
     int           ems_index;
     int           ems_autoinc;
-    uint16_t      ems[0x24];
-    mem_mapping_t ems_mappings[20]; /*a0000-effff*/
-    uint32_t      mappings[20];
+    uint16_t      ems[64];
 
     mem_mapping_t ram_mapping[2];
     ram_struct_t  ram_struct[2];
-    ems_struct_t  ems_struct[20];
 
-    uint32_t ram_virt_base[2];
-    uint32_t ram_phys_base[2];
-    uint32_t ram_mask[2];
-    int      row_virt_shift[2];
-    int      row_phys_shift[2];
-    int      ram_interleaved[2];
-    int      ibank_shift[2];
+    uint32_t      ram_virt_base[2];
+    uint32_t      ram_phys_base[2];
+    uint32_t      ram_mask[2];
+    int           row_virt_shift[2];
+    int           row_phys_shift[2];
+    int           ram_interleaved[2];
+    int           ibank_shift[2];
 
-    port_92_t *port_92;
+    int           mem_flags[64];
+    mem_mapping_t mem_mappings[64]; /* The entire first 1 MB of memory space. */
+    mem_page_t    mem_pages[64];
+
+    uint32_t      card_mem_size;
+    uint8_t      *card_mem;
+    mem_page_t    card_pages[4];
+
+    port_92_t    *port_92;
 } scamp_t;
 
 static const struct {
@@ -147,6 +176,70 @@ static const struct {
     { { BANK_1M_INTERLEAVED, BANK_4M_INTERLEAVED },     0}, /*Undocumented - probably wrong!*/
 };
 
+#ifdef ENABLE_SCAMP_LOG
+int scamp_do_log = ENABLE_SCAMP_LOG;
+
+static void
+scamp_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (scamp_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define scamp_log(fmt, ...)
+#endif
+
+/* Read one byte from paged RAM. */
+static uint8_t
+scamp_mem_readb(uint32_t addr, void *priv)
+{
+    mem_page_t *dev = (mem_page_t *) priv;
+    uint8_t     ret = 0xff;
+
+    if (dev->mem != NULL)
+        ret = *(uint8_t *) &(dev->mem[addr & EMS_PGMASK]);
+
+    return ret;
+}
+
+/* Read one word from paged RAM. */
+static uint16_t
+scamp_mem_readw(uint32_t addr, void *priv)
+{
+    mem_page_t *dev = (mem_page_t *) priv;
+    uint16_t    ret = 0xffff;
+
+    if (dev->mem != NULL)
+        ret = *(uint16_t *) &(dev->mem[addr & EMS_PGMASK]);
+
+    return ret;
+}
+
+/* Write one byte to paged RAM. */
+static void
+scamp_mem_writeb(uint32_t addr, uint8_t val, void *priv)
+{
+    mem_page_t *dev = (mem_page_t *) priv;
+
+    if (dev->mem != NULL)
+        *(uint8_t *) &(dev->mem[addr & EMS_PGMASK]) = val;
+}
+
+/* Write one word to paged RAM. */
+static void
+scamp_mem_writew(uint32_t addr, uint16_t val, void *priv)
+{
+    mem_page_t *dev = (mem_page_t *) priv;
+
+    if (dev->mem != NULL)
+        *(uint16_t *) &(dev->mem[addr & EMS_PGMASK]) = val;
+}
+
 /* The column bits masked when using 256kbit DRAMs in 4Mbit mode aren't contiguous,
    so we use separate routines for that special case */
 static uint8_t
@@ -332,208 +425,193 @@ recalc_mappings(void *priv)
     /* Once the BIOS programs the correct DRAM configuration, switch to regular
        linear memory mapping */
     if (cur_rammap == ram_configs[dev->ram_config].rammap) {
-        mem_mapping_set_handler(&ram_low_mapping,
-                                mem_read_ram, mem_read_ramw, mem_read_raml,
-                                mem_write_ram, mem_write_ramw, mem_write_raml);
-        mem_mapping_set_addr(&ram_low_mapping, 0, 0xa0000);
+        mem_mapping_disable(&ram_low_mapping);
+
+        for (uint8_t i = 0; i < 40; i++)
+            mem_mapping_enable(&(dev->mem_mappings[i]));
+
         if (mem_size > 1024)
             mem_set_mem_state_both((1 << 20), (mem_size - 1024) << 10, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
         mem_mapping_enable(&ram_high_mapping);
-        return;
     } else {
         mem_mapping_set_handler(&ram_low_mapping,
                                 ram_mirrored_read, NULL, NULL,
                                 ram_mirrored_write, NULL, NULL);
+
         mem_mapping_disable(&ram_low_mapping);
-    }
 
-    if (rammap[cur_rammap].bank[0] == BANK_NONE)
-        bank_nr = 1;
+        for (uint8_t i = 0; i < 40; i++)
+            mem_mapping_disable(&(dev->mem_mappings[i]));
 
-    for (; bank_nr < 2; bank_nr++) {
-        old_virt_base = virt_base;
-        phys_bank     = ram_configs[dev->ram_config].bank[bank_nr];
+        if (rammap[cur_rammap].bank[0] == BANK_NONE)
+            bank_nr = 1;
 
-        dev->ram_virt_base[bank_nr] = virt_base;
+        for (; bank_nr < 2; bank_nr++) {
+            old_virt_base = virt_base;
+            phys_bank     = ram_configs[dev->ram_config].bank[bank_nr];
 
-        if (virt_base == 0) {
-            switch (rammap[cur_rammap].bank[bank_nr]) {
-                case BANK_NONE:
-                    fatal("        Bank %i is empty!\n    }\n}\n", bank_nr);
-                    break;
+            dev->ram_virt_base[bank_nr] = virt_base;
 
-                case BANK_256K:
-                    if (phys_bank != BANK_NONE) {
-                        mem_mapping_set_addr(&ram_low_mapping, 0, 0x80000);
-                        mem_mapping_set_p(&ram_low_mapping, (void *) &dev->ram_struct[bank_nr]);
-                    }
-                    virt_base += (1 << 19);
-                    dev->row_virt_shift[bank_nr] = 10;
-                    break;
+            if (virt_base == 0) {
+                switch (rammap[cur_rammap].bank[bank_nr]) {
+                    case BANK_NONE:
+                        fatal("        Bank %i is empty!\n    }\n}\n", bank_nr);
+                        break;
 
-                case BANK_256K_INTERLEAVED:
-                    if (phys_bank != BANK_NONE) {
-                        mem_mapping_set_addr(&ram_low_mapping, 0, 0xa0000);
-                        mem_mapping_set_p(&ram_low_mapping, (void *) &dev->ram_struct[bank_nr]);
-                    }
-                    virt_base += (1 << 20);
-                    dev->row_virt_shift[bank_nr] = 10;
-                    break;
+                    case BANK_256K:
+                        if (phys_bank != BANK_NONE) {
+                            mem_mapping_set_addr(&ram_low_mapping, 0, 0x80000);
+                            mem_mapping_set_p(&ram_low_mapping, (void *) &dev->ram_struct[bank_nr]);
+                        }
+                        virt_base += (1 << 19);
+                        dev->row_virt_shift[bank_nr] = 10;
+                        break;
 
-                case BANK_1M:
-                    if (phys_bank != BANK_NONE) {
-                        mem_mapping_set_addr(&ram_low_mapping, 0, 0xa0000);
-                        mem_mapping_set_p(&ram_low_mapping, (void *) &dev->ram_struct[bank_nr]);
-                        mem_mapping_set_addr(&dev->ram_mapping[bank_nr], 0x100000, 0x100000);
-                        mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr] + 0x100000]);
-                        mem_set_mem_state_both((1 << 20), (1 << 20), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
-                    }
-                    virt_base += (1 << 21);
-                    dev->row_virt_shift[bank_nr] = 11;
-                    break;
+                    case BANK_256K_INTERLEAVED:
+                        if (phys_bank != BANK_NONE) {
+                            mem_mapping_set_addr(&ram_low_mapping, 0, 0xa0000);
+                            mem_mapping_set_p(&ram_low_mapping, (void *) &dev->ram_struct[bank_nr]);
+                        }
+                        virt_base += (1 << 20);
+                        dev->row_virt_shift[bank_nr] = 10;
+                        break;
 
-                case BANK_1M_INTERLEAVED:
-                    if (phys_bank != BANK_NONE) {
-                        mem_mapping_set_addr(&ram_low_mapping, 0, 0xa0000);
-                        mem_mapping_set_p(&ram_low_mapping, (void *) &dev->ram_struct[bank_nr]);
-                        mem_mapping_set_addr(&dev->ram_mapping[bank_nr], 0x100000, 0x300000);
-                        mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr] + 0x100000]);
-                        mem_set_mem_state_both((1 << 20), (3 << 20), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
-                    }
-                    virt_base += (1 << 22);
-                    dev->row_virt_shift[bank_nr] = 11;
-                    break;
+                    case BANK_1M:
+                        if (phys_bank != BANK_NONE) {
+                            mem_mapping_set_addr(&ram_low_mapping, 0, 0xa0000);
+                            mem_mapping_set_p(&ram_low_mapping, (void *) &dev->ram_struct[bank_nr]);
+                            mem_mapping_set_addr(&dev->ram_mapping[bank_nr], 0x100000, 0x100000);
+                            mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr] + 0x100000]);
+                            mem_set_mem_state_both((1 << 20), (1 << 20), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+                        }
+                        virt_base += (1 << 21);
+                        dev->row_virt_shift[bank_nr] = 11;
+                        break;
 
-                case BANK_4M:
-                    if (phys_bank != BANK_NONE) {
-                        mem_mapping_set_addr(&ram_low_mapping, 0, 0xa0000);
-                        mem_mapping_set_p(&ram_low_mapping, (void *) &dev->ram_struct[bank_nr]);
-                        mem_mapping_set_addr(&dev->ram_mapping[bank_nr], 0x100000, 0x700000);
-                        mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr] + 0x100000]);
-                        mem_set_mem_state_both((1 << 20), (7 << 20), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
-                    }
-                    virt_base += (1 << 23);
-                    dev->row_virt_shift[bank_nr] = 12;
-                    break;
+                    case BANK_1M_INTERLEAVED:
+                        if (phys_bank != BANK_NONE) {
+                            mem_mapping_set_addr(&ram_low_mapping, 0, 0xa0000);
+                            mem_mapping_set_p(&ram_low_mapping, (void *) &dev->ram_struct[bank_nr]);
+                            mem_mapping_set_addr(&dev->ram_mapping[bank_nr], 0x100000, 0x300000);
+                            mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr] + 0x100000]);
+                            mem_set_mem_state_both((1 << 20), (3 << 20), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+                        }
+                        virt_base += (1 << 22);
+                        dev->row_virt_shift[bank_nr] = 11;
+                        break;
 
-                case BANK_4M_INTERLEAVED:
-                    if (phys_bank != BANK_NONE) {
-                        mem_mapping_set_addr(&ram_low_mapping, 0, 0xa0000);
-                        mem_mapping_set_p(&ram_low_mapping, (void *) &dev->ram_struct[bank_nr]);
-                        mem_mapping_set_addr(&dev->ram_mapping[bank_nr], 0x100000, 0xf00000);
-                        mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr] + 0x100000]);
-                        mem_set_mem_state_both((1 << 20), (15 << 20), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
-                    }
-                    virt_base += (1 << 24);
-                    dev->row_virt_shift[bank_nr] = 12;
-                    break;
+                    case BANK_4M:
+                        if (phys_bank != BANK_NONE) {
+                            mem_mapping_set_addr(&ram_low_mapping, 0, 0xa0000);
+                            mem_mapping_set_p(&ram_low_mapping, (void *) &dev->ram_struct[bank_nr]);
+                            mem_mapping_set_addr(&dev->ram_mapping[bank_nr], 0x100000, 0x700000);
+                            mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr] + 0x100000]);
+                            mem_set_mem_state_both((1 << 20), (7 << 20), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+                        }
+                        virt_base += (1 << 23);
+                        dev->row_virt_shift[bank_nr] = 12;
+                        break;
 
-                default:
-                    break;
+                    case BANK_4M_INTERLEAVED:
+                        if (phys_bank != BANK_NONE) {
+                            mem_mapping_set_addr(&ram_low_mapping, 0, 0xa0000);
+                            mem_mapping_set_p(&ram_low_mapping, (void *) &dev->ram_struct[bank_nr]);
+                            mem_mapping_set_addr(&dev->ram_mapping[bank_nr], 0x100000, 0xf00000);
+                            mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr] + 0x100000]);
+                            mem_set_mem_state_both((1 << 20), (15 << 20), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+                        }
+                        virt_base += (1 << 24);
+                        dev->row_virt_shift[bank_nr] = 12;
+                        break;
+
+                    default:
+                        break;
+                }
+            } else {
+                switch (rammap[cur_rammap].bank[bank_nr]) {
+                    case BANK_NONE:
+                        break;
+
+                    case BANK_256K:
+                        if (phys_bank != BANK_NONE) {
+                            mem_mapping_set_addr(&dev->ram_mapping[bank_nr], virt_base, 0x80000);
+                            mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr]]);
+                            mem_set_mem_state_both(virt_base, (1 << 19), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+                        }
+                        virt_base += (1 << 19);
+                        dev->row_virt_shift[bank_nr] = 10;
+                        break;
+
+                    case BANK_256K_INTERLEAVED:
+                        if (phys_bank != BANK_NONE) {
+                            mem_mapping_set_addr(&dev->ram_mapping[bank_nr], virt_base, 0x100000);
+                            mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr]]);
+                            mem_set_mem_state_both(virt_base, (1 << 20), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+                        }
+                        virt_base += (1 << 20);
+                        dev->row_virt_shift[bank_nr] = 10;
+                        break;
+
+                    case BANK_1M:
+                        if (phys_bank != BANK_NONE) {
+                            mem_mapping_set_addr(&dev->ram_mapping[bank_nr], virt_base, 0x200000);
+                            mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr]]);
+                            mem_set_mem_state_both(virt_base, (1 << 21), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+                        }
+                        virt_base += (1 << 21);
+                        dev->row_virt_shift[bank_nr] = 11;
+                        break;
+
+                    case BANK_1M_INTERLEAVED:
+                        if (phys_bank != BANK_NONE) {
+                            mem_mapping_set_addr(&dev->ram_mapping[bank_nr], virt_base, 0x400000);
+                            mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr]]);
+                            mem_set_mem_state_both(virt_base, (1 << 22), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+                        }
+                        virt_base += (1 << 22);
+                        dev->row_virt_shift[bank_nr] = 11;
+                        break;
+
+                    case BANK_4M:
+                        if (phys_bank != BANK_NONE) {
+                            mem_mapping_set_addr(&dev->ram_mapping[bank_nr], virt_base, 0x800000);
+                            mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr]]);
+                            mem_set_mem_state_both(virt_base, (1 << 23), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+                        }
+                        virt_base += (1 << 23);
+                        dev->row_virt_shift[bank_nr] = 12;
+                        break;
+
+                    case BANK_4M_INTERLEAVED:
+                        if (phys_bank != BANK_NONE) {
+                            mem_mapping_set_addr(&dev->ram_mapping[bank_nr], virt_base, 0x1000000);
+                            mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr]]);
+                            mem_set_mem_state_both(virt_base, (1 << 24), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+                        }
+                        virt_base += (1 << 24);
+                        dev->row_virt_shift[bank_nr] = 12;
+                        break;
+
+                    default:
+                        break;
+                }
             }
-        } else {
+
             switch (rammap[cur_rammap].bank[bank_nr]) {
-                case BANK_NONE:
-                    break;
-
                 case BANK_256K:
-                    if (phys_bank != BANK_NONE) {
-                        mem_mapping_set_addr(&dev->ram_mapping[bank_nr], virt_base, 0x80000);
-                        mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr]]);
-                        mem_set_mem_state_both(virt_base, (1 << 19), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
-                    }
-                    virt_base += (1 << 19);
-                    dev->row_virt_shift[bank_nr] = 10;
-                    break;
-
-                case BANK_256K_INTERLEAVED:
-                    if (phys_bank != BANK_NONE) {
-                        mem_mapping_set_addr(&dev->ram_mapping[bank_nr], virt_base, 0x100000);
-                        mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr]]);
-                        mem_set_mem_state_both(virt_base, (1 << 20), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
-                    }
-                    virt_base += (1 << 20);
-                    dev->row_virt_shift[bank_nr] = 10;
-                    break;
-
                 case BANK_1M:
-                    if (phys_bank != BANK_NONE) {
-                        mem_mapping_set_addr(&dev->ram_mapping[bank_nr], virt_base, 0x200000);
-                        mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr]]);
-                        mem_set_mem_state_both(virt_base, (1 << 21), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
-                    }
-                    virt_base += (1 << 21);
-                    dev->row_virt_shift[bank_nr] = 11;
-                    break;
-
-                case BANK_1M_INTERLEAVED:
-                    if (phys_bank != BANK_NONE) {
-                        mem_mapping_set_addr(&dev->ram_mapping[bank_nr], virt_base, 0x400000);
-                        mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr]]);
-                        mem_set_mem_state_both(virt_base, (1 << 22), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
-                    }
-                    virt_base += (1 << 22);
-                    dev->row_virt_shift[bank_nr] = 11;
-                    break;
-
                 case BANK_4M:
-                    if (phys_bank != BANK_NONE) {
-                        mem_mapping_set_addr(&dev->ram_mapping[bank_nr], virt_base, 0x800000);
-                        mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr]]);
-                        mem_set_mem_state_both(virt_base, (1 << 23), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
-                    }
-                    virt_base += (1 << 23);
-                    dev->row_virt_shift[bank_nr] = 12;
-                    break;
-
-                case BANK_4M_INTERLEAVED:
-                    if (phys_bank != BANK_NONE) {
-                        mem_mapping_set_addr(&dev->ram_mapping[bank_nr], virt_base, 0x1000000);
-                        mem_mapping_set_exec(&dev->ram_mapping[bank_nr], &ram[dev->ram_phys_base[bank_nr]]);
-                        mem_set_mem_state_both(virt_base, (1 << 24), MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
-                    }
-                    virt_base += (1 << 24);
-                    dev->row_virt_shift[bank_nr] = 12;
-                    break;
-
-                default:
-                    break;
-            }
-        }
-        switch (rammap[cur_rammap].bank[bank_nr]) {
-            case BANK_256K:
-            case BANK_1M:
-            case BANK_4M:
-                mem_mapping_set_handler(&dev->ram_mapping[bank_nr],
-                                        ram_mirrored_read, NULL, NULL,
-                                        ram_mirrored_write, NULL, NULL);
-                if (!old_virt_base)
-                    mem_mapping_set_handler(&ram_low_mapping,
+                    mem_mapping_set_handler(&dev->ram_mapping[bank_nr],
                                             ram_mirrored_read, NULL, NULL,
                                             ram_mirrored_write, NULL, NULL);
-                break;
-
-            case BANK_256K_INTERLEAVED:
-            case BANK_1M_INTERLEAVED:
-                mem_mapping_set_handler(&dev->ram_mapping[bank_nr],
-                                        ram_mirrored_interleaved_read, NULL, NULL,
-                                        ram_mirrored_interleaved_write, NULL, NULL);
-                if (!old_virt_base)
-                    mem_mapping_set_handler(&ram_low_mapping,
-                                            ram_mirrored_interleaved_read, NULL, NULL,
-                                            ram_mirrored_interleaved_write, NULL, NULL);
-                break;
-
-            case BANK_4M_INTERLEAVED:
-                if (phys_bank == BANK_256K || phys_bank == BANK_256K_INTERLEAVED) {
-                    mem_mapping_set_handler(&dev->ram_mapping[bank_nr],
-                                            ram_mirrored_256k_in_4mi_read, NULL, NULL,
-                                            ram_mirrored_256k_in_4mi_write, NULL, NULL);
                     if (!old_virt_base)
                         mem_mapping_set_handler(&ram_low_mapping,
-                                                ram_mirrored_256k_in_4mi_read, NULL, NULL,
-                                                ram_mirrored_256k_in_4mi_write, NULL, NULL);
-                } else {
+                                                ram_mirrored_read, NULL, NULL,
+                                                ram_mirrored_write, NULL, NULL);
+                    break;
+
+                case BANK_256K_INTERLEAVED:
+                case BANK_1M_INTERLEAVED:
                     mem_mapping_set_handler(&dev->ram_mapping[bank_nr],
                                             ram_mirrored_interleaved_read, NULL, NULL,
                                             ram_mirrored_interleaved_write, NULL, NULL);
@@ -541,13 +619,203 @@ recalc_mappings(void *priv)
                         mem_mapping_set_handler(&ram_low_mapping,
                                                 ram_mirrored_interleaved_read, NULL, NULL,
                                                 ram_mirrored_interleaved_write, NULL, NULL);
-                }
-                break;
+                    break;
 
+                case BANK_4M_INTERLEAVED:
+                    if (phys_bank == BANK_256K || phys_bank == BANK_256K_INTERLEAVED) {
+                        mem_mapping_set_handler(&dev->ram_mapping[bank_nr],
+                                                ram_mirrored_256k_in_4mi_read, NULL, NULL,
+                                                ram_mirrored_256k_in_4mi_write, NULL, NULL);
+                        if (!old_virt_base)
+                            mem_mapping_set_handler(&ram_low_mapping,
+                                                    ram_mirrored_256k_in_4mi_read, NULL, NULL,
+                                                    ram_mirrored_256k_in_4mi_write, NULL, NULL);
+                    } else {
+                        mem_mapping_set_handler(&dev->ram_mapping[bank_nr],
+                                                ram_mirrored_interleaved_read, NULL, NULL,
+                                                ram_mirrored_interleaved_write, NULL, NULL);
+                        if (!old_virt_base)
+                            mem_mapping_set_handler(&ram_low_mapping,
+                                                    ram_mirrored_interleaved_read, NULL, NULL,
+                                                    ram_mirrored_interleaved_write, NULL, NULL);
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+    }
+}
+
+static void
+scamp_mem_update_state(scamp_t *dev, uint32_t addr, uint32_t size, uint8_t new_flags, uint8_t mask)
+{
+    int read_ext  = MEM_READ_EXTERNAL;
+    int write_ext = MEM_WRITE_EXTERNAL;
+
+    if ((addr < 0x00100000) && ((new_flags ^ dev->mem_flags[addr / EMS_PGSIZE]) & mask)) {
+        dev->mem_flags[addr / EMS_PGSIZE] &= ~mask;
+        dev->mem_flags[addr / EMS_PGSIZE] |= new_flags;
+
+        new_flags = dev->mem_flags[addr / EMS_PGSIZE];
+
+        if (new_flags & MEM_FLAG_ROMCS) {
+            read_ext  = MEM_READ_ROMCS;
+            write_ext = MEM_WRITE_ROMCS;
+        }
+
+        if (new_flags & (MEM_FLAG_REMAP | MEM_FLAG_SLOTBUS)) {
+            scamp_log("scamp_mem_update_state(): %08X-%08X: %02X (REMAP)\n", addr, addr + size - 1, new_flags);
+            mem_set_mem_state(addr, size, read_ext | write_ext);
+        } else if (new_flags & (MEM_FLAG_EMS | MEM_FLAG_MEMCARD)) {
+            scamp_log("scamp_mem_update_state(): %08X-%08X: %02X (EMS)\n", addr, addr + size - 1, new_flags);
+            mem_set_mem_state(addr, size, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+        } else  switch (new_flags & (MEM_FLAG_READ | MEM_FLAG_WRITE)) {
+            case 0:
+                scamp_log("scamp_mem_update_state(): %08X-%08X: %02X (RE | WE)\n", addr, addr + size - 1, new_flags);
+                mem_set_mem_state(addr, size, read_ext | write_ext);
+                break;
+            case 1:
+                scamp_log("scamp_mem_update_state(): %08X-%08X: %02X (RE | WI)\n", addr, addr + size - 1, new_flags);
+                mem_set_mem_state(addr, size, read_ext | MEM_WRITE_INTERNAL);
+                break;
+            case 2:
+                scamp_log("scamp_mem_update_state(): %08X-%08X: %02X (RI | WE)\n", addr, addr + size - 1, new_flags);
+                mem_set_mem_state(addr, size, MEM_READ_INTERNAL | write_ext);
+                break;
+            case 3:
+                scamp_log("scamp_mem_update_state(): %08X-%08X: %02X (RI | WI)\n", addr, addr + size - 1, new_flags);
+                mem_set_mem_state(addr, size, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+                break;
             default:
                 break;
         }
     }
+
+    flushmmucache_nopc();
+}
+
+static int
+is_seg_in_ram(scamp_t *dev, uint8_t s)
+{
+    mem_page_t *mp  = (mem_page_t *) dev->mem_mappings[s].priv;
+    const int   ret = mp->in_ram;
+
+    return ret;
+}
+
+static void
+recalc_ems(scamp_t *dev)
+{
+    const uint8_t  seg_xlat[12] = { 40, 41, 42, 43, 52, 53, 54, 55, 44, 45, 46, 47 };
+    const uint16_t seg_enable   = dev->cfg_regs[CFG_EMSEN2] | ((dev->cfg_regs[CFG_EMSEN1] & 0xf) << 8);
+
+    for (uint8_t s = 40; s < 60; s++) {
+        dev->mem_pages[s].phys_addr = dev->mem_pages[s].virt_addr;
+        dev->mem_pages[s].mem       = ram + dev->mem_pages[s].phys_addr;
+
+       if (is_seg_in_ram(dev, s))
+           mem_mapping_set_exec(&(dev->mem_mappings[s]), dev->mem_pages[s].mem);
+
+       scamp_mem_update_state(dev, s * EMS_PGSIZE, EMS_PGSIZE, 0x00, MEM_FMASK_EMS);
+    }
+
+    for (uint8_t i = 0; i < 36; i++) {
+        uint8_t  s         = (i < 12) ? (i + 48) : (i + 4);
+        uint8_t  on        = (dev->cfg_regs[CFG_EMSEN1] & EMSEN1_EMSENAB);
+        uint32_t phys_addr = dev->ems[i] << 14;
+
+        if (i < 12) {
+            if (dev->cfg_regs[CFG_EMSEN1] & EMSEN1_EMSMAP)
+                s = seg_xlat[i];
+
+            on = on && (seg_enable & (1 << i));
+        } else
+            on = on && (dev->cfg_regs[CFG_EMSEN1] & EMSEN1_BFENAB);
+
+        if (on) {
+            dev->mem_pages[s].phys_addr = phys_addr;
+            dev->mem_pages[s].mem       = ram + dev->mem_pages[s].phys_addr;
+
+            if (is_seg_in_ram(dev, s))
+                mem_mapping_set_exec(&(dev->mem_mappings[s]), dev->mem_pages[s].mem);
+
+            scamp_mem_update_state(dev, s * EMS_PGSIZE, EMS_PGSIZE, MEM_FLAG_EMS, MEM_FMASK_EMS);
+        } else if (i >= 12) {
+            dev->mem_pages[s].phys_addr = dev->mem_pages[s].virt_addr;
+            dev->mem_pages[s].mem       = ram + dev->mem_pages[s].phys_addr;
+
+            if (is_seg_in_ram(dev, s))
+                mem_mapping_set_exec(&(dev->mem_mappings[s]), dev->mem_pages[s].mem);
+
+            scamp_mem_update_state(dev, s * EMS_PGSIZE, EMS_PGSIZE, 0x00, MEM_FMASK_EMS);
+        }
+    }
+
+    flushmmucache_nopc();
+}
+
+static void
+shadow_control(scamp_t *dev, uint32_t addr, uint32_t size, int state)
+{
+    if (size == 0x8000) {
+        scamp_mem_update_state(dev, addr, EMS_PGSIZE, state, MEM_FMASK_RW);
+        scamp_mem_update_state(dev, addr + EMS_PGSIZE, EMS_PGSIZE, state, MEM_FMASK_RW);
+    } else
+        scamp_mem_update_state(dev, addr, size, state, MEM_FMASK_RW);
+
+    flushmmucache_nopc();
+}
+
+static void
+shadow_recalc(scamp_t *dev)
+{
+    uint8_t  abaxs = (dev->cfg_regs[CFG_RAMMAP] & RAMMAP_REMP384) ? 0 : dev->cfg_regs[CFG_ABAXS];
+    uint8_t  caxs  = (dev->cfg_regs[CFG_RAMMAP] & RAMMAP_REMP384) ? 0 : dev->cfg_regs[CFG_CAXS];
+    uint8_t  daxs  = (dev->cfg_regs[CFG_RAMMAP] & RAMMAP_REMP384) ? 0 : dev->cfg_regs[CFG_DAXS];
+    uint8_t  feaxs = (dev->cfg_regs[CFG_RAMMAP] & RAMMAP_REMP384) ? 0 : dev->cfg_regs[CFG_FEAXS];
+
+    /*Enabling remapping will disable all shadowing*/
+    if (dev->cfg_regs[CFG_RAMMAP] & RAMMAP_REMP384)
+        mem_remap_top_nomid(384);
+    else
+        mem_remap_top_nomid(0);
+
+    for (uint8_t i = 40; i < 64; i++) {
+        if (dev->cfg_regs[CFG_RAMMAP] & RAMMAP_REMP384)
+            scamp_mem_update_state(dev, (i * EMS_PGSIZE), EMS_PGSIZE, MEM_FLAG_REMAP, MEM_FMASK_REMAP);
+        else
+            scamp_mem_update_state(dev, (i * EMS_PGSIZE), EMS_PGSIZE, 0x00, MEM_FMASK_REMAP);
+    }
+
+    shadow_control(dev, 0xa0000, 0x4000, abaxs & 3);
+    shadow_control(dev, 0xa0000, 0x4000, abaxs & 3);
+    shadow_control(dev, 0xa8000, 0x4000, (abaxs >> 2) & 3);
+    shadow_control(dev, 0xa8000, 0x4000, (abaxs >> 2) & 3);
+
+    shadow_control(dev, 0xb0000, 0x4000, (abaxs >> 4) & 3);
+    shadow_control(dev, 0xb0000, 0x4000, (abaxs >> 4) & 3);
+    shadow_control(dev, 0xb8000, 0x4000, (abaxs >> 6) & 3);
+    shadow_control(dev, 0xb8000, 0x4000, (abaxs >> 6) & 3);
+
+    shadow_control(dev, 0xc0000, 0x4000, caxs & 3);
+    shadow_control(dev, 0xc4000, 0x4000, (caxs >> 2) & 3);
+    shadow_control(dev, 0xc8000, 0x4000, (caxs >> 4) & 3);
+    shadow_control(dev, 0xcc000, 0x4000, (caxs >> 6) & 3);
+
+    shadow_control(dev, 0xd0000, 0x4000, daxs & 3);
+    shadow_control(dev, 0xd4000, 0x4000, (daxs >> 2) & 3);
+    shadow_control(dev, 0xd8000, 0x4000, (daxs >> 4) & 3);
+    shadow_control(dev, 0xdc000, 0x4000, (daxs >> 6) & 3);
+
+    shadow_control(dev, 0xe0000, 0x4000, feaxs & 3);
+    shadow_control(dev, 0xe4000, 0x4000, feaxs & 3);
+    shadow_control(dev, 0xe8000, 0x4000, (feaxs >> 2) & 3);
+    shadow_control(dev, 0xec000, 0x4000, (feaxs >> 2) & 3);
+
+    shadow_control(dev, 0xf0000, 0x8000, (feaxs >> 4) & 3);
+    shadow_control(dev, 0xf8000, 0x8000, (feaxs >> 6) & 3);
 }
 
 static void
@@ -561,155 +829,84 @@ recalc_sltptr(scamp_t *dev)
         sltptr = 0xfe0000;
 
     if (sltptr >= 0xa0000) {
-        mem_set_mem_state(0, 0xa0000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+        for (uint8_t i = 0; i < 40; i++)
+            scamp_mem_update_state(dev, i * EMS_PGSIZE, EMS_PGSIZE, 0x00, MEM_FMASK_SLOTBUS);
+
         mem_set_mem_state(0x100000, sltptr - 0x100000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
         mem_set_mem_state(sltptr, 0x1000000 - sltptr, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+
+        if ((sltptr >= 0x40000) && (sltptr <= 0x90000)) {
+            dev->cfg_regs[CFG_EMSEN1] &= ~EMSEN1_BFENAB;
+            recalc_ems(dev);
+        }
     } else {
-        mem_set_mem_state(0, sltptr, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+        for (uint32_t i = 0; i < (sltptr / EMS_PGSIZE); i++)
+            scamp_mem_update_state(dev, i * EMS_PGSIZE, EMS_PGSIZE, 0x00, MEM_FMASK_SLOTBUS);
+
+        for (uint8_t i = (sltptr / EMS_PGSIZE); i < 40; i++)
+            scamp_mem_update_state(dev, i * EMS_PGSIZE, EMS_PGSIZE, MEM_FLAG_SLOTBUS, MEM_FMASK_SLOTBUS);
+
         mem_set_mem_state(sltptr, 0xa0000 - sltptr, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
         mem_set_mem_state(0x100000, 0xf00000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
     }
-}
-
-static uint8_t
-scamp_ems_read(uint32_t addr, void *priv)
-{
-    const ems_struct_t *ems     = (ems_struct_t *) priv;
-    const scamp_t      *dev     = ems->parent;
-    int                 segment = ems->segment;
-
-    addr = (addr & 0x3fff) | dev->mappings[segment];
-    return ram[addr];
-}
-
-static void
-scamp_ems_write(uint32_t addr, uint8_t val, void *priv)
-{
-    const ems_struct_t *ems     = (ems_struct_t *) priv;
-    const scamp_t      *dev     = ems->parent;
-    int                 segment = ems->segment;
-
-    addr      = (addr & 0x3fff) | dev->mappings[segment];
-    ram[addr] = val;
-}
-
-static void
-recalc_ems(scamp_t *dev)
-{
-    const uint32_t ems_base[12] = {
-        0xc0000, 0xc4000, 0xc8000, 0xcc000,
-        0xd0000, 0xd4000, 0xd8000, 0xdc000,
-        0xe0000, 0xe4000, 0xe8000, 0xec000
-    };
-    uint32_t new_mappings[20];
-    uint16_t ems_enable;
-
-    for (int segment = 0; segment < 20; segment++)
-        new_mappings[segment] = 0xa0000 + segment * 0x4000;
-
-    if (dev->cfg_regs[CFG_EMSEN1] & EMSEN1_EMSENAB)
-        ems_enable = dev->cfg_regs[CFG_EMSEN2] | ((dev->cfg_regs[CFG_EMSEN1] & 0xf) << 8);
-    else
-        ems_enable = 0;
-
-    for (int segment = 0; segment < 12; segment++) {
-        if (ems_enable & (1 << segment)) {
-            uint32_t phys_addr = dev->ems[segment] << 14;
-
-            /*If physical address is in remapped memory then adjust down to a0000-fffff range*/
-            if ((dev->cfg_regs[CFG_RAMMAP] & RAMMAP_REMP386) && phys_addr >= (mem_size * 1024)
-                && phys_addr < ((mem_size + 384) * 1024))
-                phys_addr = (phys_addr - mem_size * 1024) + 0xa0000;
-            new_mappings[(ems_base[segment] - 0xa0000) >> 14] = phys_addr;
-        }
-    }
-
-    for (int segment = 0; segment < 20; segment++) {
-        if (new_mappings[segment] != dev->mappings[segment]) {
-            dev->mappings[segment] = new_mappings[segment];
-            if (new_mappings[segment] < (mem_size * 1024)) {
-                mem_mapping_set_exec(&dev->ems_mappings[segment], ram + dev->mappings[segment]);
-                mem_mapping_enable(&dev->ems_mappings[segment]);
-            } else
-                mem_mapping_disable(&dev->ems_mappings[segment]);
-        }
-    }
-}
-
-static void
-shadow_control(uint32_t addr, uint32_t size, int state, int ems_enable)
-{
-    if (ems_enable)
-        mem_set_mem_state(addr, size, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
-    else
-        switch (state) {
-            case 0:
-                mem_set_mem_state(addr, size, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
-                break;
-            case 1:
-                mem_set_mem_state(addr, size, MEM_READ_EXTANY | MEM_WRITE_INTERNAL);
-                break;
-            case 2:
-                mem_set_mem_state(addr, size, MEM_READ_INTERNAL | MEM_WRITE_EXTANY);
-                break;
-            case 3:
-                mem_set_mem_state(addr, size, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
-                break;
-            default:
-                break;
-        }
 
     flushmmucache_nopc();
 }
 
 static void
-shadow_recalc(scamp_t *dev)
+recalc_rommov(scamp_t *dev)
 {
-    uint8_t  abaxs = (dev->cfg_regs[CFG_RAMMAP] & RAMMAP_REMP386) ? 0 : dev->cfg_regs[CFG_ABAXS];
-    uint8_t  caxs  = (dev->cfg_regs[CFG_RAMMAP] & RAMMAP_REMP386) ? 0 : dev->cfg_regs[CFG_CAXS];
-    uint8_t  daxs  = (dev->cfg_regs[CFG_RAMMAP] & RAMMAP_REMP386) ? 0 : dev->cfg_regs[CFG_DAXS];
-    uint8_t  feaxs = (dev->cfg_regs[CFG_RAMMAP] & RAMMAP_REMP386) ? 0 : dev->cfg_regs[CFG_FEAXS];
-    uint32_t ems_enable;
+    switch ((dev->cfg_regs[CFG_RAMMAP] & RAMMAP_ROMMOV) >> 5) {
+        case 0x00:
+            scamp_mem_update_state(dev, 0x000c0000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000c4000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000c8000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000cc000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
 
-    if (dev->cfg_regs[CFG_EMSEN1] & EMSEN1_EMSENAB) {
-        if (dev->cfg_regs[CFG_EMSEN1] & EMSEN1_EMSMAP) /*Axxx/Bxxx/Dxxx*/
-            ems_enable = (dev->cfg_regs[CFG_EMSEN2] & 0xf) | ((dev->cfg_regs[CFG_EMSEN1] & 0xf) << 4) | ((dev->cfg_regs[CFG_EMSEN2] & 0xf0) << 8);
-        else /*Cxxx/Dxxx/Exxx*/
-            ems_enable = (dev->cfg_regs[CFG_EMSEN2] << 8) | ((dev->cfg_regs[CFG_EMSEN1] & 0xf) << 16);
-    } else
-        ems_enable = 0;
+            scamp_mem_update_state(dev, 0x000e0000, EMS_PGSIZE, MEM_FLAG_ROMCS, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000e4000, EMS_PGSIZE, MEM_FLAG_ROMCS, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000e8000, EMS_PGSIZE, MEM_FLAG_ROMCS, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000ec000, EMS_PGSIZE, MEM_FLAG_ROMCS, MEM_FMASK_ROMCS);
+            break;
 
-    /*Enabling remapping will disable all shadowing*/
-    if (dev->cfg_regs[CFG_RAMMAP] & RAMMAP_REMP386)
-        mem_remap_top(384);
+        case 0x01:
+            scamp_mem_update_state(dev, 0x000c0000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000c4000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000c8000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000cc000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
 
-    shadow_control(0xa0000, 0x4000, abaxs & 3, ems_enable & 0x00001);
-    shadow_control(0xa0000, 0x4000, abaxs & 3, ems_enable & 0x00002);
-    shadow_control(0xa8000, 0x4000, (abaxs >> 2) & 3, ems_enable & 0x00004);
-    shadow_control(0xa8000, 0x4000, (abaxs >> 2) & 3, ems_enable & 0x00008);
+            scamp_mem_update_state(dev, 0x000e0000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000e4000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000e8000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000ec000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
+            break;
 
-    shadow_control(0xb0000, 0x4000, (abaxs >> 4) & 3, ems_enable & 0x00010);
-    shadow_control(0xb0000, 0x4000, (abaxs >> 4) & 3, ems_enable & 0x00020);
-    shadow_control(0xb8000, 0x4000, (abaxs >> 6) & 3, ems_enable & 0x00040);
-    shadow_control(0xb8000, 0x4000, (abaxs >> 6) & 3, ems_enable & 0x00080);
+        case 0x02:
+            scamp_mem_update_state(dev, 0x000c0000, EMS_PGSIZE, MEM_FLAG_ROMCS, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000c4000, EMS_PGSIZE, MEM_FLAG_ROMCS, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000c8000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000cc000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
 
-    shadow_control(0xc0000, 0x4000, caxs & 3, ems_enable & 0x00100);
-    shadow_control(0xc4000, 0x4000, (caxs >> 2) & 3, ems_enable & 0x00200);
-    shadow_control(0xc8000, 0x4000, (caxs >> 4) & 3, ems_enable & 0x00400);
-    shadow_control(0xcc000, 0x4000, (caxs >> 6) & 3, ems_enable & 0x00800);
+            scamp_mem_update_state(dev, 0x000e0000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000e4000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000e8000, EMS_PGSIZE, MEM_FLAG_ROMCS, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000ec000, EMS_PGSIZE, MEM_FLAG_ROMCS, MEM_FMASK_ROMCS);
+            break;
 
-    shadow_control(0xd0000, 0x4000, daxs & 3, ems_enable & 0x01000);
-    shadow_control(0xd4000, 0x4000, (daxs >> 2) & 3, ems_enable & 0x02000);
-    shadow_control(0xd8000, 0x4000, (daxs >> 4) & 3, ems_enable & 0x04000);
-    shadow_control(0xdc000, 0x4000, (daxs >> 6) & 3, ems_enable & 0x08000);
+        case 0x03:
+            scamp_mem_update_state(dev, 0x000c0000, EMS_PGSIZE, MEM_FLAG_ROMCS, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000c4000, EMS_PGSIZE, MEM_FLAG_ROMCS, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000c8000, EMS_PGSIZE, MEM_FLAG_ROMCS, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000cc000, EMS_PGSIZE, MEM_FLAG_ROMCS, MEM_FMASK_ROMCS);
 
-    shadow_control(0xe0000, 0x4000, feaxs & 3, ems_enable & 0x10000);
-    shadow_control(0xe4000, 0x4000, feaxs & 3, ems_enable & 0x20000);
-    shadow_control(0xe8000, 0x4000, (feaxs >> 2) & 3, ems_enable & 0x40000);
-    shadow_control(0xec000, 0x4000, (feaxs >> 2) & 3, ems_enable & 0x80000);
+            scamp_mem_update_state(dev, 0x000e0000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000e4000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000e8000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
+            scamp_mem_update_state(dev, 0x000ec000, EMS_PGSIZE,           0x00, MEM_FMASK_ROMCS);
+            break;
+    }
 
-    shadow_control(0xf0000, 0x8000, (feaxs >> 4) & 3, 0);
-    shadow_control(0xf8000, 0x8000, (feaxs >> 6) & 3, 0);
+    flushmmucache_nopc();
 }
 
 static void
@@ -719,7 +916,7 @@ scamp_write(uint16_t addr, uint8_t val, void *priv)
 
     switch (addr) {
         case 0xe8:
-            dev->ems_index   = val & 0x1f;
+            dev->ems_index   = val & 0x3f;
             dev->ems_autoinc = val & 0x40;
             break;
 
@@ -749,12 +946,14 @@ scamp_write(uint16_t addr, uint8_t val, void *priv)
                 switch (dev->cfg_index) {
                     case CFG_SLTPTR:
                         recalc_sltptr(dev);
+                        recalc_ems(dev);
                         break;
 
                     case CFG_RAMMAP:
                         recalc_mappings(dev);
                         mem_mapping_disable(&ram_remapped_mapping);
                         shadow_recalc(dev);
+                        recalc_rommov(dev);
                         break;
 
                     case CFG_EMSEN1:
@@ -847,8 +1046,7 @@ static void *
 scamp_init(UNUSED(const device_t *info))
 {
     uint32_t addr;
-    scamp_t *dev = (scamp_t *) malloc(sizeof(scamp_t));
-    memset(dev, 0x00, sizeof(scamp_t));
+    scamp_t *dev = (scamp_t *) calloc(1, sizeof(scamp_t));
 
     dev->cfg_regs[CFG_ID] = ID_VL82C311;
     dev->cfg_enable       = 1;
@@ -878,9 +1076,8 @@ scamp_init(UNUSED(const device_t *info))
     mem_mapping_set_handler(&ram_low_mapping,
                             ram_mirrored_read, NULL, NULL,
                             ram_mirrored_write, NULL, NULL);
+    mem_mapping_disable(&ram_mid_mapping);
     mem_mapping_disable(&ram_high_mapping);
-    mem_mapping_set_addr(&ram_mid_mapping, 0xf0000, 0x10000);
-    mem_mapping_set_exec(&ram_mid_mapping, ram + 0xf0000);
 
     addr = 0;
     for (uint8_t c = 0; c < 2; c++) {
@@ -952,15 +1149,45 @@ scamp_init(UNUSED(const device_t *info))
 
     mem_set_mem_state(0xfe0000, 0x20000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
 
-    for (uint8_t c = 0; c < 20; c++) {
-        dev->ems_struct[c].parent  = dev;
-        dev->ems_struct[c].segment = c;
-        mem_mapping_add(&dev->ems_mappings[c],
-                        0xa0000 + c * 0x4000, 0x4000,
-                        scamp_ems_read, NULL, NULL,
-                        scamp_ems_write, NULL, NULL,
-                        ram + 0xa0000 + c * 0x4000, MEM_MAPPING_INTERNAL, (void *) &dev->ems_struct[c]);
-        dev->mappings[c] = 0xa0000 + c * 0x4000;
+    for (uint8_t i = 0; i < 12; i++)
+        dev->ems[i]      = (0x000c0000 + (i * EMS_PGSIZE)) >> 14;
+
+    for (uint8_t i = 0; i < 24; i++)
+        dev->ems[i + 12] = (0x00040000 + (i * EMS_PGSIZE)) >> 14;
+
+    for (uint8_t i = 0; i < 64; i++) {
+        dev->mem_pages[i].in_ram    = 1;
+        dev->mem_pages[i].virt_addr = i * EMS_PGSIZE;
+        dev->mem_pages[i].phys_addr = dev->mem_pages[i].virt_addr;
+        dev->mem_pages[i].mem       = ram + dev->mem_pages[i].phys_addr;
+
+        mem_mapping_add(&(dev->mem_mappings[i]),
+                        i * EMS_PGSIZE, EMS_PGSIZE,
+                        scamp_mem_readb, scamp_mem_readw, NULL,
+                        scamp_mem_writeb, scamp_mem_writew, NULL,
+                        dev->mem_pages[i].mem, MEM_MAPPING_INTERNAL,
+                        &(dev->mem_pages[i]));
+
+        if (i < 40) {
+            mem_mapping_disable(&(dev->mem_mappings[i]));
+
+            scamp_mem_update_state(dev, i * EMS_PGSIZE, EMS_PGSIZE, MEM_FLAG_READ | MEM_FLAG_WRITE, MEM_FMASK_RW);
+        } else {
+            /* This is needed to the state update actually occurs. */
+            dev->mem_flags[i] = MEM_FLAG_READ | MEM_FLAG_WRITE;
+            scamp_mem_update_state(dev, i * EMS_PGSIZE, EMS_PGSIZE, 0x00, MEM_FMASK_RW);
+
+            if (i >= 56)
+                scamp_mem_update_state(dev, i * EMS_PGSIZE, EMS_PGSIZE, MEM_FLAG_ROMCS, MEM_FMASK_ROMCS);
+        }
+    }
+
+    dev->card_mem = NULL;
+
+    for (uint8_t i = 0; i < 4; i++) {
+        dev->card_pages[i].virt_addr = i * EMS_PGSIZE;
+        dev->card_pages[i].phys_addr = dev->card_pages[i].virt_addr;
+        dev->card_pages[i].mem       = dev->card_mem + dev->card_pages[i].phys_addr;
     }
 
     dev->port_92 = device_add(&port_92_device);
@@ -976,7 +1203,7 @@ const device_t vlsi_scamp_device = {
     .init          = scamp_init,
     .close         = scamp_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/scat.c b/src/chipset/scat.c
index aa0c5511a..43f93649e 100644
--- a/src/chipset/scat.c
+++ b/src/chipset/scat.c
@@ -66,15 +66,17 @@ typedef struct ems_page_t {
 } ems_page_t;
 
 typedef struct scat_t {
-    int type;
+    uint8_t  max_reg;
+    uint8_t  reg_2xA;
 
-    int     indx;
-    uint8_t regs[256];
-    uint8_t reg_2xA;
+    uint8_t  regs[256];
 
     uint32_t xms_bound;
 
-    int external_is_RAS;
+    int      type;
+    int      indx;
+
+    int      external_is_RAS;
 
     ems_page_t null_page;
     ems_page_t page[32];
@@ -1138,14 +1140,21 @@ scat_out(uint16_t port, uint8_t val, void *priv)
                 if (indx >= 24)
                     base_addr += 0x30000;
 
+                if ((base_addr >= 0x000a0000) && (base_addr < 0x00100000))
+                    mem_set_mem_state(base_addr, 0x00004000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+
                 if ((dev->regs[SCAT_EMS_CONTROL] & 0x80) && (dev->page[indx].regs_2x9 & 0x80)) {
                     virt_addr = get_addr(dev, base_addr, &dev->page[indx]);
                     if (virt_addr < ((uint32_t) mem_size << 10))
                         mem_mapping_set_exec(&dev->ems_mapping[indx], ram + virt_addr);
                     else
                         mem_mapping_set_exec(&dev->ems_mapping[indx], NULL);
-                    flushmmucache();
+
+                    if ((base_addr >= 0x000a0000) && (base_addr < 0x00100000))
+                        mem_set_mem_state(base_addr, 0x00004000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
                 }
+
+                flushmmucache();
             }
             break;
 
@@ -1161,6 +1170,9 @@ scat_out(uint16_t port, uint8_t val, void *priv)
                 if (indx >= 24)
                     base_addr += 0x30000;
 
+                if ((base_addr >= 0x000a0000) && (base_addr < 0x00100000))
+                    mem_set_mem_state(base_addr, 0x00004000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+
                 if (dev->regs[SCAT_EMS_CONTROL] & 0x80) {
                     if (val & 0x80) {
                         virt_addr = get_addr(dev, base_addr, &dev->page[indx]);
@@ -1173,6 +1185,9 @@ scat_out(uint16_t port, uint8_t val, void *priv)
                         else
                             mem_mapping_set_exec(&dev->ems_mapping[indx], NULL);
                         mem_mapping_enable(&dev->ems_mapping[indx]);
+
+                        if ((base_addr >= 0x000a0000) && (base_addr < 0x00100000))
+                            mem_set_mem_state(base_addr, 0x00004000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
                     } else {
                         mem_mapping_set_exec(&dev->ems_mapping[indx], ram + base_addr);
                         mem_mapping_disable(&dev->ems_mapping[indx]);
@@ -1233,7 +1248,8 @@ scat_in(uint16_t port, void *priv)
                     break;
 
                 default:
-                    ret = dev->regs[dev->indx];
+                    if (dev->indx <= dev->max_reg)
+                        ret = dev->regs[dev->indx];
                     break;
             }
             break;
@@ -1387,12 +1403,13 @@ scat_init(const device_t *info)
     uint32_t k;
     int      sx;
 
-    dev = (scat_t *) malloc(sizeof(scat_t));
-    memset(dev, 0x00, sizeof(scat_t));
+    dev = (scat_t *) calloc(1, sizeof(scat_t));
     dev->type = info->local;
 
     sx = (dev->type == 32) ? 1 : 0;
 
+    dev->max_reg = sx ? 0x64 : 0x4f;
+
     for (uint32_t i = 0; i < sizeof(dev->regs); i++)
         dev->regs[i] = 0xff;
 
@@ -1490,7 +1507,7 @@ scat_init(const device_t *info)
             mem_mapping_add(&dev->ems_mapping[i], (i + 28) << 14, 0x04000,
                             mem_read_scatb, mem_read_scatw, mem_read_scatl,
                             mem_write_scatb, mem_write_scatw, mem_write_scatl,
-                            ram + ((i + 28) << 14), 0, &dev->page[i]);
+                            ram + ((i + 28) << 14), MEM_MAPPING_INTERNAL, &dev->page[i]);
             mem_mapping_disable(&dev->ems_mapping[i]);
         }
     } else {
@@ -1503,7 +1520,7 @@ scat_init(const device_t *info)
                             mem_read_scatb, mem_read_scatw, mem_read_scatl,
                             mem_write_scatb, mem_write_scatw, mem_write_scatl,
                             ram + ((i + (i >= 24 ? 28 : 16)) << 14),
-                            0, &dev->page[i]);
+                            MEM_MAPPING_INTERNAL, &dev->page[i]);
         }
     }
 
@@ -1541,7 +1558,7 @@ const device_t scat_device = {
     .init          = scat_init,
     .close         = scat_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1555,7 +1572,7 @@ const device_t scat_4_device = {
     .init          = scat_init,
     .close         = scat_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1569,7 +1586,7 @@ const device_t scat_sx_device = {
     .init          = scat_init,
     .close         = scat_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/sis_5511.c b/src/chipset/sis_5511.c
index e58066c95..38fcfe717 100644
--- a/src/chipset/sis_5511.c
+++ b/src/chipset/sis_5511.c
@@ -25,9 +25,10 @@
 #include <86box/device.h>
 #include <86box/io.h>
 #include <86box/timer.h>
-
 #include <86box/mem.h>
 #include <86box/nvr.h>
+#include <86box/apm.h>
+#include <86box/acpi.h>
 #include <86box/hdd.h>
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
@@ -41,7 +42,7 @@
 #include <86box/port_92.h>
 #include <86box/smram.h>
 #include <86box/spd.h>
-
+#include <86box/sis_55xx.h>
 #include <86box/chipset.h>
 
 #ifdef ENABLE_SIS_5511_LOG
@@ -63,573 +64,53 @@ sis_5511_log(const char *fmt, ...)
 #endif
 
 typedef struct sis_5511_t {
-    uint8_t index;
-    uint8_t nb_slot;
-    uint8_t sb_slot;
-    uint8_t pad;
+    uint8_t            nb_slot;
+    uint8_t            sb_slot;
 
-    uint8_t regs[16];
-    uint8_t states[7];
+    void              *h2p;
 
-    uint8_t slic_regs[4096];   
+    void              *p2i;
+    void              *ide;
 
-    uint8_t pci_conf[256];
-    uint8_t pci_conf_sb[2][256];
-
-    mem_mapping_t slic_mapping;
-
-    sff8038i_t *bm[2];
-    smram_t    *smram;
-    port_92_t  *port_92;
-    void       *pit;
-    nvr_t      *nvr;
-
-   uint8_t (*pit_read_reg)(void *priv, uint8_t reg);
+    sis_55xx_common_t *sis;
 } sis_5511_t;
 
 static void
-sis_5511_shadow_recalc(sis_5511_t *dev)
+sis_5511_write(int func, int addr, uint8_t val, void *priv)
 {
-    int      state;
-    uint32_t base;
-
-    for (uint8_t i = 0x80; i <= 0x86; i++) {
-        if (i == 0x86) {
-            if ((dev->states[i & 0x0f] ^ dev->pci_conf[i]) & 0xa0) {
-                state = (dev->pci_conf[i] & 0x80) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
-                state |= (dev->pci_conf[i] & 0x20) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
-                mem_set_mem_state_both(0xf0000, 0x10000, state);
-                sis_5511_log("000F0000-000FFFFF\n");
-            }
-        } else {
-            base = ((i & 0x07) << 15) + 0xc0000;
-
-            if ((dev->states[i & 0x0f] ^ dev->pci_conf[i]) & 0xa0) {
-                state = (dev->pci_conf[i] & 0x80) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
-                state |= (dev->pci_conf[i] & 0x20) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
-                mem_set_mem_state_both(base, 0x4000, state);
-                sis_5511_log("%08X-%08X\n", base, base + 0x3fff);
-            }
-
-            if ((dev->states[i & 0x0f] ^ dev->pci_conf[i]) & 0x0a) {
-                state = (dev->pci_conf[i] & 0x08) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
-                state |= (dev->pci_conf[i] & 0x02) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
-                mem_set_mem_state_both(base + 0x4000, 0x4000, state);
-                sis_5511_log("%08X-%08X\n", base + 0x4000, base + 0x7fff);
-            }
-        }
-
-        dev->states[i & 0x0f] = dev->pci_conf[i];
-    }
-
-    flushmmucache_nopc();
-}
-
-static void
-sis_5511_smram_recalc(sis_5511_t *dev)
-{
-    smram_disable_all();
-
-    switch (dev->pci_conf[0x65] >> 6) {
-        case 0:
-            smram_enable(dev->smram, 0x000e0000, 0x000e0000, 0x8000, dev->pci_conf[0x65] & 0x10, 1);
-            break;
-        case 1:
-            smram_enable(dev->smram, 0x000e0000, 0x000a0000, 0x8000, dev->pci_conf[0x65] & 0x10, 1);
-            break;
-        case 2:
-            smram_enable(dev->smram, 0x000e0000, 0x000b0000, 0x8000, dev->pci_conf[0x65] & 0x10, 1);
-            break;
-
-        default:
-            break;
-    }
-
-    flushmmucache();
-}
-
-static void
-sis_5511_write(UNUSED(int func), int addr, uint8_t val, void *priv)
-{
-    sis_5511_t *dev = (sis_5511_t *) priv;
+    const sis_5511_t *dev = (sis_5511_t *) priv;
 
     sis_5511_log("SiS 5511: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
 
-    if (func == 0x00)  switch (addr) {
-        case 0x07: /* Status - High Byte */
-            dev->pci_conf[addr] &= 0xb0;
-            break;
-
-        case 0x50:
-            dev->pci_conf[addr]   = val;
-            cpu_cache_ext_enabled = !!(val & 0x40);
-            cpu_update_waitstates();
-            break;
-
-        case 0x51:
-            dev->pci_conf[addr] = val & 0xfe;
-            break;
-
-        case 0x52:
-            dev->pci_conf[addr] = val & 0x3f;
-            break;
-
-        case 0x53:
-        case 0x54:
-            dev->pci_conf[addr] = val;
-            break;
-
-        case 0x55:
-            dev->pci_conf[addr] = val & 0xf8;
-            break;
-
-        case 0x56 ... 0x59:
-            dev->pci_conf[addr] = val;
-            break;
-
-        case 0x5a:
-            /* TODO: Fast Gate A20 Emulation and Fast Reset Emulation on the KBC.
-                     The former (bit 7) means the chipset intercepts D1h to 64h and 00h to 60h.
-                     The latter (bit 6) means the chipset intercepts all odd FXh to 64h.
-                     Bit 5 sets fast reset latency. This should be fixed on the other SiS
-                     chipsets as well. */
-            dev->pci_conf[addr] = val;
-            break;
-
-        case 0x5b:
-            dev->pci_conf[addr] = val & 0xf7;
-            break;
-
-        case 0x5c:
-            dev->pci_conf[addr] = val & 0xcf;
-            break;
-
-        case 0x5d:
-            dev->pci_conf[addr] = val;
-            break;
-
-        case 0x5e:
-            dev->pci_conf[addr] = val & 0xfe;
-            break;
-
-        case 0x5f:
-            dev->pci_conf[addr] = val & 0xfe;
-            break;
-
-        case 0x60:
-            dev->pci_conf[addr] = val & 0x3e;
-            if ((dev->pci_conf[0x68] & 1) && (val & 2)) {
-                smi_raise();
-                dev->pci_conf[0x69] |= 1;
-            }
-            break;
-
-        case 0x61 ... 0x64:
-            dev->pci_conf[addr] = val;
-            break;
-
-        case 0x65:
-            dev->pci_conf[addr] = val & 0xd0;
-            sis_5511_smram_recalc(dev);
-            break;
-
-        case 0x66:
-            dev->pci_conf[addr] = val & 0x7f;
-            break;
-
-        case 0x67:
-        case 0x68:
-            dev->pci_conf[addr] = val;
-            break;
-
-        case 0x69:
-            dev->pci_conf[addr] &= val;
-            break;
-
-        case 0x6a ... 0x6e:
-            dev->pci_conf[addr] = val;
-            break;
-
-        case 0x6f:
-            dev->pci_conf[addr] = val & 0x3f;
-            break;
-
-        case 0x70: /* DRAM Bank Register 0-0 */
-        case 0x72: /* DRAM Bank Register 0-1 */
-        case 0x74: /* DRAM Bank Register 1-0 */
-        case 0x76: /* DRAM Bank Register 1-1 */
-        case 0x78: /* DRAM Bank Register 2-0 */
-        case 0x7a: /* DRAM Bank Register 2-1 */
-        case 0x7c: /* DRAM Bank Register 3-0 */
-        case 0x7e: /* DRAM Bank Register 3-1 */
-            spd_write_drbs(dev->pci_conf, 0x70, 0x7e, 0x82);
-            break;
- 
-        case 0x71: /* DRAM Bank Register 0-0 */
-            dev->pci_conf[addr] = val;
-            break;
-
-        case 0x75: /* DRAM Bank Register 1-0 */
-        case 0x79: /* DRAM Bank Register 2-0 */
-        case 0x7d: /* DRAM Bank Register 3-0 */
-            dev->pci_conf[addr] = val & 0x7f;
-            break;
-
-        case 0x73: /* DRAM Bank Register 0-1 */
-        case 0x77: /* DRAM Bank Register 1-1 */
-        case 0x7b: /* DRAM Bank Register 2-1 */
-        case 0x7f: /* DRAM Bank Register 3-1 */
-            dev->pci_conf[addr] = val & 0x83;
-            break;
-
-        case 0x80 ... 0x85:
-            dev->pci_conf[addr] = val & 0xee;
-            sis_5511_shadow_recalc(dev);
-            break;
-        case 0x86:
-            dev->pci_conf[addr] = val & 0xe8;
-            sis_5511_shadow_recalc(dev);
-            break;
-
-        case 0x90 ... 0x93: /* 5512 General Purpose Register Index */
-            dev->pci_conf[addr] = val;
-            break;
-
-        default:
-            break;
-    }
-}
-
-static void
-sis_5511_slic_write(uint32_t addr, uint8_t val, void *priv)
-{
-    sis_5511_t *dev = (sis_5511_t *) priv;
-
-    addr &= 0x00000fff;
-
-    switch (addr) {
-        case 0x00000000:
-        case 0x00000008:    /* 0x00000008 is a SiS 5512 register. */
-            dev->slic_regs[addr] = val;
-            break;
-        case 0x00000010:
-        case 0x00000018:
-        case 0x00000028:
-        case 0x00000038:
-            dev->slic_regs[addr] = val & 0x01;
-            break;
-        case 0x00000030:
-            dev->slic_regs[addr] = val & 0x0f;
-            mem_mapping_set_addr(&dev->slic_mapping,
-                                 (((uint32_t) (val & 0x0f)) << 28) | 0x0fc00000, 0x00001000);
-            break;
-    }
+    if (func == 0x00)
+        sis_5511_host_to_pci_write(addr, val, dev->h2p);
 }
 
 static uint8_t
-sis_5511_read(UNUSED(int func), int addr, void *priv)
+sis_5511_read(int func, int addr, void *priv)
 {
     const sis_5511_t *dev = (sis_5511_t *) priv;
     uint8_t ret = 0xff;
 
     if (func == 0x00)
-        ret = dev->pci_conf[addr];
+        ret = sis_5511_host_to_pci_read(addr, dev->h2p);
 
     sis_5511_log("SiS 5511: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
 
     return ret;
 }
 
-static uint8_t
-sis_5511_slic_read(uint32_t addr, void *priv)
-{
-    sis_5511_t *dev = (sis_5511_t *) priv;
-    uint8_t ret = 0xff;
-
-    addr &= 0x00000fff;
-
-    switch (addr) {
-        case 0x00000008:    /* 0x00000008 is a SiS 5512 register. */
-            ret = dev->slic_regs[addr];
-            break;
-    }
-
-    return ret;
-}
-
-void
-sis_5513_pci_to_isa_write(int addr, uint8_t val, sis_5511_t *dev)
-{
-    sis_5511_log("SiS 5513 P2I: [W] dev->pci_conf_sb[0][%02X] = %02X\n", addr, val);
-
-    switch (addr) {
-        case 0x04: /* Command */
-            dev->pci_conf_sb[0][addr] = val & 0x0f;
-            break;
-
-        case 0x07: /* Status */
-            dev->pci_conf_sb[0][addr] = (dev->pci_conf_sb[0][addr] & 0x06) & ~(val & 0x30);
-            break;
-
-        case 0x40: /* BIOS Control Register */
-            dev->pci_conf_sb[0][addr] = val & 0x3f;
-            break;
-
-        case 0x41: /* INTA# Remapping Control Register */
-        case 0x42: /* INTB# Remapping Control Register */
-        case 0x43: /* INTC# Remapping Control Register */
-        case 0x44: /* INTD# Remapping Control Register */
-            dev->pci_conf_sb[0][addr] = val & 0x8f;
-            pci_set_irq_routing(addr & 0x07, (val & 0x80) ? PCI_IRQ_DISABLED : (val & 0x0f));
-            break;
-
-        case 0x48: /* ISA Master/DMA Memory Cycle Control Register 1 */
-        case 0x49: /* ISA Master/DMA Memory Cycle Control Register 2 */
-        case 0x4a: /* ISA Master/DMA Memory Cycle Control Register 3 */
-        case 0x4b: /* ISA Master/DMA Memory Cycle Control Register 4 */
-            dev->pci_conf_sb[0][addr] = val;
-            break;
-
-        case 0x60: /* MIRQ0 Remapping Control Register */
-        case 0x61: /* MIRQ1 Remapping Control Register */
-            sis_5511_log("Set MIRQ routing: MIRQ%i -> %02X\n", addr & 0x01, val);
-            dev->pci_conf_sb[0][addr] = val & 0xcf;
-            if (val & 0x80)
-                pci_set_mirq_routing(PCI_MIRQ0 + (addr & 0x01), PCI_IRQ_DISABLED);
-            else
-                pci_set_mirq_routing(PCI_MIRQ0 + (addr & 0x01), val & 0xf);
-            break;
-
-        case 0x62: /* On-board Device DMA Control Register */
-            dev->pci_conf_sb[0][addr] = val;
-            break;
-
-        case 0x63: /* IDEIRQ Remapping Control Register */
-            sis_5511_log("Set MIRQ routing: IDEIRQ -> %02X\n", val);
-            dev->pci_conf_sb[0][addr] = val & 0x8f;
-            if (val & 0x80)
-                pci_set_mirq_routing(PCI_MIRQ2, PCI_IRQ_DISABLED);
-            else
-                pci_set_mirq_routing(PCI_MIRQ2, val & 0xf);
-            break;
-
-        case 0x64: /* GPIO0 Control Register */
-            dev->pci_conf_sb[0][addr] = val & 0xef;
-            break;
-
-        case 0x65:
-            dev->pci_conf_sb[0][addr] = val & 0x80;
-            break;
-
-        case 0x66: /* GPIO0 Output Mode Control Register */
-        case 0x67: /* GPIO0 Output Mode Control Register */
-            dev->pci_conf_sb[0][addr] = val;
-            break;
-
-        case 0x6a: /* GPIO Status Register */
-            dev->pci_conf_sb[0][addr] |= (val & 0x10);
-            dev->pci_conf_sb[0][addr] &= ~(val & 0x01);
-            break;
-
-        default:
-            break;
-    }
-}
-
-static void
-sis_5513_ide_irq_handler(sis_5511_t *dev)
-{
-    if (dev->pci_conf_sb[1][0x09] & 0x01) {
-        /* Primary IDE is native. */
-        sis_5511_log("Primary IDE IRQ mode: Native, Native\n");
-        sff_set_irq_mode(dev->bm[0], IRQ_MODE_SIS_551X);
-    } else {
-        /* Primary IDE is legacy. */
-        sis_5511_log("Primary IDE IRQ mode: IRQ14, IRQ15\n");
-        sff_set_irq_mode(dev->bm[0], IRQ_MODE_LEGACY);
-    }
-
-    if (dev->pci_conf_sb[1][0x09] & 0x04) {
-        /* Secondary IDE is native. */
-        sis_5511_log("Secondary IDE IRQ mode: Native, Native\n");
-        sff_set_irq_mode(dev->bm[1], IRQ_MODE_SIS_551X);
-    } else {
-        /* Secondary IDE is legacy. */
-        sis_5511_log("Secondary IDE IRQ mode: IRQ14, IRQ15\n");
-        sff_set_irq_mode(dev->bm[1], IRQ_MODE_LEGACY);
-    }
-}
-
-static void
-sis_5513_ide_handler(sis_5511_t *dev)
-{
-    uint8_t ide_io_on = dev->pci_conf_sb[1][0x04] & 0x01;
-
-    uint16_t native_base_pri_addr = (dev->pci_conf_sb[1][0x11] | dev->pci_conf_sb[1][0x10] << 8) & 0xfffe;
-    uint16_t native_side_pri_addr = (dev->pci_conf_sb[1][0x15] | dev->pci_conf_sb[1][0x14] << 8) & 0xfffe;
-    uint16_t native_base_sec_addr = (dev->pci_conf_sb[1][0x19] | dev->pci_conf_sb[1][0x18] << 8) & 0xfffe;
-    uint16_t native_side_sec_addr = (dev->pci_conf_sb[1][0x1c] | dev->pci_conf_sb[1][0x1b] << 8) & 0xfffe;
-
-    uint16_t current_pri_base;
-    uint16_t current_pri_side;
-    uint16_t current_sec_base;
-    uint16_t current_sec_side;
-
-    /* Primary Channel Programming */
-    current_pri_base = (!(dev->pci_conf_sb[1][0x09] & 1)) ? 0x01f0 : native_base_pri_addr;
-    current_pri_side = (!(dev->pci_conf_sb[1][0x09] & 1)) ? 0x03f6 : native_side_pri_addr;
-
-    /* Secondary Channel Programming */
-    current_sec_base = (!(dev->pci_conf_sb[1][0x09] & 4)) ? 0x0170 : native_base_sec_addr;
-    current_sec_side = (!(dev->pci_conf_sb[1][0x09] & 4)) ? 0x0376 : native_side_sec_addr;
-
-    sis_5511_log("sis_5513_ide_handler(): Disabling primary IDE...\n");
-    ide_pri_disable();
-    sis_5511_log("sis_5513_ide_handler(): Disabling secondary IDE...\n");
-    ide_sec_disable();
-
-    if (ide_io_on) {
-        /* Primary Channel Setup */
-        if (dev->pci_conf_sb[1][0x4a] & 0x02) {
-            sis_5511_log("sis_5513_ide_handler(): Primary IDE base now %04X...\n", current_pri_base);
-            ide_set_base(0, current_pri_base);
-            sis_5511_log("sis_5513_ide_handler(): Primary IDE side now %04X...\n", current_pri_side);
-            ide_set_side(0, current_pri_side);
-
-            sis_5511_log("sis_5513_ide_handler(): Enabling primary IDE...\n");
-            ide_pri_enable();
-
-            sis_5511_log("SiS 5513 PRI: BASE %04x SIDE %04x\n", current_pri_base, current_pri_side);
-        }
-
-        /* Secondary Channel Setup */
-        if (dev->pci_conf_sb[1][0x4a] & 0x04) {
-            sis_5511_log("sis_5513_ide_handler(): Secondary IDE base now %04X...\n", current_sec_base);
-            ide_set_base(1, current_sec_base);
-            sis_5511_log("sis_5513_ide_handler(): Secondary IDE side now %04X...\n", current_sec_side);
-            ide_set_side(1, current_sec_side);
-
-            sis_5511_log("sis_5513_ide_handler(): Enabling secondary IDE...\n");
-            ide_sec_enable();
-
-            sis_5511_log("SiS 5513: BASE %04x SIDE %04x\n", current_sec_base, current_sec_side);
-        }
-    }
-
-    sff_bus_master_handler(dev->bm[0], ide_io_on,
-                           ((dev->pci_conf_sb[1][0x20] & 0xf0) | (dev->pci_conf_sb[1][0x21] << 8)) + 0);
-    sff_bus_master_handler(dev->bm[1], ide_io_on,
-                           ((dev->pci_conf_sb[1][0x20] & 0xf0) | (dev->pci_conf_sb[1][0x21] << 8)) + 8);
-}
-
-void
-sis_5513_ide_write(int addr, uint8_t val, sis_5511_t *dev)
-{
-    sis_5511_log("SiS 5513 IDE: [W] dev->pci_conf_sb[1][%02X] = %02X\n", addr, val);
-
-    switch (addr) {
-        case 0x04: /* Command low byte */
-            dev->pci_conf_sb[1][addr] = val & 0x05;
-            sis_5513_ide_handler(dev);
-            break;
-        case 0x06: /* Status low byte */
-            dev->pci_conf_sb[1][addr] = val & 0x20;
-            break;
-        case 0x07: /* Status high byte */
-            dev->pci_conf_sb[1][addr] = (dev->pci_conf_sb[1][addr] & 0x06) & ~(val & 0x38);
-            break;
-        case 0x09: /* Programming Interface Byte */
-            dev->pci_conf_sb[1][addr] = (dev->pci_conf_sb[1][addr] & 0x8a) | (val & 0x05);
-            sis_5513_ide_irq_handler(dev);
-            sis_5513_ide_handler(dev);
-            break;
-        case 0x0d: /* Latency Timer */
-            dev->pci_conf_sb[1][addr] = val;
-            break;
-
-        /* Primary Base Address */
-        case 0x10:
-        case 0x11:
-        case 0x14:
-        case 0x15:
-            fallthrough;
-
-        /* Secondary Base Address */
-        case 0x18:
-        case 0x19:
-        case 0x1c:
-        case 0x1d:
-            fallthrough;
-
-        /* Bus Mastering Base Address */
-        case 0x20:
-        case 0x21:
-            if (addr == 0x20)
-                dev->pci_conf_sb[1][addr] = (val & 0xe0) | 0x01;
-            else
-                dev->pci_conf_sb[1][addr] = val;
-            sis_5513_ide_handler(dev);
-            break;
-
-        case 0x30: /* Expansion ROM Base Address */
-        case 0x31: /* Expansion ROM Base Address */
-        case 0x32: /* Expansion ROM Base Address */
-        case 0x33: /* Expansion ROM Base Address */
-            dev->pci_conf_sb[1][addr] = val;
-            break;
-
-        case 0x40: /* IDE Primary Channel/Master Drive Data Recovery Time Control */
-        case 0x42: /* IDE Primary Channel/Slave Drive Data Recovery Time Control */
-        case 0x44: /* IDE Secondary Channel/Master Drive Data Recovery Time Control */
-        case 0x46: /* IDE Secondary Channel/Slave Drive Data Recovery Time Control */
-        case 0x48: /* IDE Command Recovery Time Control */
-            dev->pci_conf_sb[1][addr] = val & 0x0f;
-            break;
-
-        case 0x41: /* IDE Primary Channel/Master Drive DataActive Time Control */
-        case 0x43: /* IDE Primary Channel/Slave Drive Data Active Time Control */
-        case 0x45: /* IDE Secondary Channel/Master Drive Data Active Time Control */
-        case 0x47: /* IDE Secondary Channel/Slave Drive Data Active Time Control */
-        case 0x49: /* IDE Command Active Time Control */
-            dev->pci_conf_sb[1][addr] = val & 0x07;
-            break;
-
-        case 0x4a: /* IDE General Control Register 0 */
-            dev->pci_conf_sb[1][addr] = val & 0x9e;
-            sis_5513_ide_handler(dev);
-            break;
-
-        case 0x4b: /* IDE General Control Register 1 */
-            dev->pci_conf_sb[1][addr] = val & 0xef;
-            break;
-
-        case 0x4c: /* Prefetch Count of Primary Channel (Low Byte) */
-        case 0x4d: /* Prefetch Count of Primary Channel (High Byte) */
-        case 0x4e: /* Prefetch Count of Secondary Channel (Low Byte) */
-        case 0x4f: /* Prefetch Count of Secondary Channel (High Byte) */
-            dev->pci_conf_sb[1][addr] = val;
-            break;
-
-        default:
-            break;
-    }
-}
-
 static void
 sis_5513_write(int func, int addr, uint8_t val, void *priv)
 {
-    sis_5511_t *dev = (sis_5511_t *) priv;
+    const sis_5511_t *dev = (sis_5511_t *) priv;
 
-    switch (func) {
-        default:
-            break;
-        case 0:
-            sis_5513_pci_to_isa_write(addr, val, dev);
-            break;
-        case 1:
-            sis_5513_ide_write(addr, val, dev);
-            break;
-    }
+    sis_5511_log("SiS 5513: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
+
+    if (func == 0x00)
+        sis_5513_pci_to_isa_write(addr, val, dev->p2i);
+    else if (func == 0x01)
+        sis_5513_ide_write(addr, val, dev->ide);
 }
 
 static uint8_t
@@ -638,281 +119,21 @@ sis_5513_read(int func, int addr, void *priv)
     const sis_5511_t *dev = (sis_5511_t *) priv;
     uint8_t ret = 0xff;
 
-    if (func == 0x00) {
-        switch (addr) {
-            default:
-                ret = dev->pci_conf_sb[func][addr];
-                break;
-            case 0x4c ... 0x4f:
-                ret = pic_read_icw(0, addr & 0x03);
-                break;
-            case 0x50 ... 0x53:
-                ret = pic_read_icw(1, addr & 0x03);
-                break;
-            case 0x54 ... 0x55:
-                ret = pic_read_ocw(0, addr & 0x01);
-                break;
-            case 0x56 ... 0x57:
-                ret = pic_read_ocw(1, addr & 0x01);
-                break;
-            case 0x58 ... 0x5f:
-                ret = dev->pit_read_reg(dev->pit, addr & 0x07);
-                break;
-        }
+    if (func == 0x00)
+        ret = sis_5513_pci_to_isa_read(addr, dev->p2i);
+    else if (func == 0x01)
+        ret = sis_5513_ide_read(addr, dev->ide);
 
-        sis_5511_log("SiS 5513 P2I: [R] dev->pci_conf_sb[0][%02X] = %02X\n", addr, ret);
-    } else if (func == 0x01) {
-        if (addr == 0x3d)
-            ret = (((dev->pci_conf_sb[0x01][0x4b] & 0xc0) == 0xc0) ||
-                   (dev->pci_conf_sb[0x01][0x09] & 0x05)) ? PCI_INTA : 0x00;
-        else
-            ret = dev->pci_conf_sb[func][addr];
-
-        sis_5511_log("SiS 5513 IDE: [R] dev->pci_conf_sb[1][%02X] = %02X\n", addr, ret);
-    }
+    sis_5511_log("SiS 5513: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
 
     return ret;
 }
 
-static void
-sis_5513_isa_write(uint16_t addr, uint8_t val, void *priv)
-{
-    sis_5511_t *dev = (sis_5511_t *) priv;
-
-    switch (addr) {
-        case 0x22:
-            dev->index = val - 0x50;
-            break;
-        case 0x23:
-            sis_5511_log("SiS 5513 ISA: [W] dev->regs[%02X] = %02X\n", dev->index + 0x50, val);
-
-            switch (dev->index) {
-                case 0x00:
-                    dev->regs[dev->index] = val & 0xed;
-                    switch (val >> 6) {
-                        case 0:
-                            cpu_set_isa_speed(7159091);
-                            break;
-                        case 1:
-                            cpu_set_isa_pci_div(4);
-                            break;
-                        case 2:
-                            cpu_set_isa_pci_div(3);
-                            break;
-
-                        default:
-                            break;
-                    }
-                    nvr_bank_set(0, !!(val & 0x08), dev->nvr);
-                    break;
-                case 0x01:
-                    dev->regs[dev->index] = val & 0xf4;
-                    break;
-                case 0x03:
-                    dev->regs[dev->index] = val & 3;
-                    break;
-                case 0x04: /* BIOS Register */
-                    dev->regs[dev->index] = val;
-                    break;
-                case 0x05:
-                    dev->regs[dev->index] = val;
-                    outb(0x70, val);
-                    break;
-                case 0x08:
-                case 0x09:
-                case 0x0a:
-                case 0x0b:
-                    dev->regs[dev->index] = val;
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-
-        default:
-            break;
-    }
-}
-
-static uint8_t
-sis_5513_isa_read(uint16_t addr, void *priv)
-{
-    const sis_5511_t *dev = (sis_5511_t *) priv;
-    uint8_t ret = 0xff;
-
-    if (addr == 0x23) {
-        if (dev->index == 0x05)
-            ret = inb(0x70);
-        else
-            ret = dev->regs[dev->index];
-
-        sis_5511_log("SiS 5513 ISA: [R] dev->regs[%02X] = %02X\n", dev->index + 0x50, ret);
-    }
-
-    return ret;
-}
-
-static void
-sis_5511_reset(void *priv)
-{
-    sis_5511_t *dev = (sis_5511_t *) priv;
-
-    /* SiS 5511 */
-    dev->pci_conf[0x00] = 0x39;
-    dev->pci_conf[0x01] = 0x10;
-    dev->pci_conf[0x02] = 0x11;
-    dev->pci_conf[0x03] = 0x55;
-    dev->pci_conf[0x04] = 0x07;
-    dev->pci_conf[0x05] = dev->pci_conf[0x06] = 0x00;
-    dev->pci_conf[0x07]                       = 0x02;
-    dev->pci_conf[0x08]                       = 0x00;
-    dev->pci_conf[0x09] = dev->pci_conf[0x0a] = 0x00;
-    dev->pci_conf[0x0b]                       = 0x06;
-    dev->pci_conf[0x50] = dev->pci_conf[0x51] = 0x00;
-    dev->pci_conf[0x52]                       = 0x20;
-    dev->pci_conf[0x53] = dev->pci_conf[0x54] = 0x00;
-    dev->pci_conf[0x55] = dev->pci_conf[0x56] = 0x00;
-    dev->pci_conf[0x57] = dev->pci_conf[0x58] = 0x00;
-    dev->pci_conf[0x59] = dev->pci_conf[0x5a] = 0x00;
-    dev->pci_conf[0x5b] = dev->pci_conf[0x5c] = 0x00;
-    dev->pci_conf[0x5d] = dev->pci_conf[0x5e] = 0x00;
-    dev->pci_conf[0x5f] = dev->pci_conf[0x60] = 0x00;
-    dev->pci_conf[0x61] = dev->pci_conf[0x62] = 0xff;
-    dev->pci_conf[0x63]                       = 0xff;
-    dev->pci_conf[0x64] = dev->pci_conf[0x65] = 0x00;
-    dev->pci_conf[0x66]                       = 0x00;
-    dev->pci_conf[0x67]                       = 0xff;
-    dev->pci_conf[0x68] = dev->pci_conf[0x69] = 0x00;
-    dev->pci_conf[0x6a]                       = 0x00;
-    dev->pci_conf[0x6b] = dev->pci_conf[0x6c] = 0xff;
-    dev->pci_conf[0x6d] = dev->pci_conf[0x6e] = 0xff;
-    dev->pci_conf[0x6f]                       = 0x00;
-    dev->pci_conf[0x70] = dev->pci_conf[0x72] = 0x04;
-    dev->pci_conf[0x74] = dev->pci_conf[0x76] = 0x04;
-    dev->pci_conf[0x78] = dev->pci_conf[0x7a] = 0x04;
-    dev->pci_conf[0x7c] = dev->pci_conf[0x7e] = 0x04;
-    dev->pci_conf[0x71] = dev->pci_conf[0x75] = 0x00;
-    dev->pci_conf[0x73] = dev->pci_conf[0x77] = 0x80;
-    dev->pci_conf[0x79] = dev->pci_conf[0x7d] = 0x00;
-    dev->pci_conf[0x7b] = dev->pci_conf[0x7f] = 0x80;
-    dev->pci_conf[0x80] = dev->pci_conf[0x81] = 0x00;
-    dev->pci_conf[0x82] = dev->pci_conf[0x83] = 0x00;
-    dev->pci_conf[0x84] = dev->pci_conf[0x85] = 0x00;
-    dev->pci_conf[0x86] = 0x00;
-
-    cpu_cache_ext_enabled = 0;
-    cpu_update_waitstates();
-
-    sis_5511_smram_recalc(dev);
-    sis_5511_shadow_recalc(dev);
-
-    flushmmucache();
-
-    memset(dev->slic_regs, 0x00, 4096 * sizeof(uint8_t));
-    dev->slic_regs[0x18] = 0x0f;
-
-    mem_mapping_set_addr(&dev->slic_mapping, 0xffc00000, 0x00001000);
-
-    /* SiS 5513 */
-    dev->pci_conf_sb[0][0x00] = 0x39;
-    dev->pci_conf_sb[0][0x01] = 0x10;
-    dev->pci_conf_sb[0][0x02] = 0x08;
-    dev->pci_conf_sb[0][0x03] = 0x00;
-    dev->pci_conf_sb[0][0x04] = 0x07;
-    dev->pci_conf_sb[0][0x05] = dev->pci_conf_sb[0][0x06] = 0x00;
-    dev->pci_conf_sb[0][0x07]                             = 0x02;
-    dev->pci_conf_sb[0][0x08] = dev->pci_conf_sb[0][0x09] = 0x00;
-    dev->pci_conf_sb[0][0x0a] = 0x01;
-    dev->pci_conf_sb[0][0x0b] = 0x06;
-    dev->pci_conf_sb[0][0x0e] = 0x80;
-    dev->pci_conf_sb[0][0x40] = 0x00;
-    dev->pci_conf_sb[0][0x41] = dev->pci_conf_sb[0][0x42] = 0x80;
-    dev->pci_conf_sb[0][0x43] = dev->pci_conf_sb[0][0x44] = 0x80;
-    dev->pci_conf_sb[0][0x48] = dev->pci_conf_sb[0][0x49] = 0x00;
-    dev->pci_conf_sb[0][0x4a] = dev->pci_conf_sb[0][0x4b] = 0x00;
-    dev->pci_conf_sb[0][0x60] = dev->pci_conf_sb[0][0x61] = 0x80;
-    dev->pci_conf_sb[0][0x62] = 0x00;
-    dev->pci_conf_sb[0][0x63] = 0x80;
-    dev->pci_conf_sb[0][0x64] = 0x00;
-    dev->pci_conf_sb[0][0x65] = 0x00;
-    dev->pci_conf_sb[0][0x66] = dev->pci_conf_sb[0][0x67] = 0x00;
-    dev->pci_conf_sb[0][0x68] = dev->pci_conf_sb[0][0x69] = 0x00;
-    dev->pci_conf_sb[0][0x6a] = 0x04;
-
-    pci_set_irq_routing(PCI_INTA, PCI_IRQ_DISABLED);
-    pci_set_irq_routing(PCI_INTB, PCI_IRQ_DISABLED);
-    pci_set_irq_routing(PCI_INTC, PCI_IRQ_DISABLED);
-    pci_set_irq_routing(PCI_INTD, PCI_IRQ_DISABLED);
-
-    pci_set_mirq_routing(PCI_MIRQ0, PCI_IRQ_DISABLED);
-    pci_set_mirq_routing(PCI_MIRQ1, PCI_IRQ_DISABLED);
-    pci_set_mirq_routing(PCI_MIRQ2, PCI_IRQ_DISABLED);
-
-    dev->regs[0x00] = dev->regs[0x01] = 0x00;
-    dev->regs[0x03] = dev->regs[0x04] = 0x00;
-    dev->regs[0x05] = 0x00;
-    dev->regs[0x08] = dev->regs[0x09] = 0x00;
-    dev->regs[0x0a] = dev->regs[0x0b] = 0x00;
-
-    cpu_set_isa_speed(7159091);
-    nvr_bank_set(0, 0, dev->nvr);
-
-    /* SiS 5513 IDE Controller */
-    dev->pci_conf_sb[1][0x00] = 0x39;
-    dev->pci_conf_sb[1][0x01] = 0x10;
-    dev->pci_conf_sb[1][0x02] = 0x13;
-    dev->pci_conf_sb[1][0x03] = 0x55;
-    dev->pci_conf_sb[1][0x04] = dev->pci_conf_sb[1][0x05] = 0x00;
-    dev->pci_conf_sb[1][0x06] = dev->pci_conf_sb[1][0x07] = 0x00;
-    dev->pci_conf_sb[1][0x08] = 0x00;
-    dev->pci_conf_sb[1][0x09] = 0x8a;
-    dev->pci_conf_sb[1][0x0a] = dev->pci_conf_sb[1][0x0b] = 0x01;
-    dev->pci_conf_sb[1][0x0c] = dev->pci_conf_sb[1][0x0d] = 0x00;
-    dev->pci_conf_sb[1][0x0e] = 0x80;
-    dev->pci_conf_sb[1][0x0f] = 0x00;
-    dev->pci_conf_sb[1][0x10] = 0xf1;
-    dev->pci_conf_sb[1][0x11] = 0x01;
-    dev->pci_conf_sb[1][0x14] = 0xf5;
-    dev->pci_conf_sb[1][0x15] = 0x03;
-    dev->pci_conf_sb[1][0x18] = 0x71;
-    dev->pci_conf_sb[1][0x19] = 0x01;
-    dev->pci_conf_sb[1][0x1c] = 0x75;
-    dev->pci_conf_sb[1][0x1d] = 0x03;
-    dev->pci_conf_sb[1][0x20] = 0x01;
-    dev->pci_conf_sb[1][0x21] = 0xf0;
-    dev->pci_conf_sb[1][0x22] = dev->pci_conf_sb[1][0x23] = 0x00;
-    dev->pci_conf_sb[1][0x24] = dev->pci_conf_sb[1][0x25] = 0x00;
-    dev->pci_conf_sb[1][0x26] = dev->pci_conf_sb[1][0x27] = 0x00;
-    dev->pci_conf_sb[1][0x28] = dev->pci_conf_sb[1][0x29] = 0x00;
-    dev->pci_conf_sb[1][0x2a] = dev->pci_conf_sb[1][0x2b] = 0x00;
-    dev->pci_conf_sb[1][0x2c] = dev->pci_conf_sb[1][0x2d] = 0x00;
-    dev->pci_conf_sb[1][0x2e] = dev->pci_conf_sb[1][0x2f] = 0x00;
-    dev->pci_conf_sb[1][0x30] = dev->pci_conf_sb[1][0x31] = 0x00;
-    dev->pci_conf_sb[1][0x32] = dev->pci_conf_sb[1][0x33] = 0x00;
-    dev->pci_conf_sb[1][0x40] = dev->pci_conf_sb[1][0x41] = 0x00;
-    dev->pci_conf_sb[1][0x42] = dev->pci_conf_sb[1][0x43] = 0x00;
-    dev->pci_conf_sb[1][0x44] = dev->pci_conf_sb[1][0x45] = 0x00;
-    dev->pci_conf_sb[1][0x46] = dev->pci_conf_sb[1][0x47] = 0x00;
-    dev->pci_conf_sb[1][0x48] = dev->pci_conf_sb[1][0x49] = 0x00;
-    dev->pci_conf_sb[1][0x4a] = 0x06;
-    dev->pci_conf_sb[1][0x4b] = 0x00;
-    dev->pci_conf_sb[1][0x4c] = dev->pci_conf_sb[1][0x4d] = 0x00;
-    dev->pci_conf_sb[1][0x4e] = dev->pci_conf_sb[1][0x4f] = 0x00;
-
-    sis_5513_ide_irq_handler(dev);
-    sis_5513_ide_handler(dev);
-
-    sff_bus_master_reset(dev->bm[0]);
-    sff_bus_master_reset(dev->bm[1]);
-}
-
 static void
 sis_5511_close(void *priv)
 {
     sis_5511_t *dev = (sis_5511_t *) priv;
 
-    smram_del(dev->smram);
     free(dev);
 }
 
@@ -920,53 +141,18 @@ static void *
 sis_5511_init(UNUSED(const device_t *info))
 {
     sis_5511_t *dev = (sis_5511_t *) calloc(1, sizeof(sis_5511_t));
-    uint8_t pit_is_fast = (((pit_mode == -1) && is486) || (pit_mode == 1));
 
     /* Device 0: SiS 5511 */
     pci_add_card(PCI_ADD_NORTHBRIDGE, sis_5511_read, sis_5511_write, dev, &dev->nb_slot);
     /* Device 1: SiS 5513 */
     pci_add_card(PCI_ADD_SOUTHBRIDGE, sis_5513_read, sis_5513_write, dev, &dev->sb_slot);
 
-    /* SLiC Memory Mapped Registers */
-    mem_mapping_add(&dev->slic_mapping,
-                    0xffc00000, 0x00001000,
-                    sis_5511_slic_read,
-                    NULL,
-                    NULL,
-                    sis_5511_slic_write,
-                    NULL,
-                    NULL,
-                    NULL, MEM_MAPPING_EXTERNAL,
-                    dev);
+    dev->sis = device_add(&sis_55xx_common_device);
 
-    /* Ports 22h-23h: SiS 5513 ISA */
-    io_sethandler(0x0022, 0x0002, sis_5513_isa_read, NULL, NULL, sis_5513_isa_write, NULL, NULL, dev);
+    dev->h2p = device_add_linked(&sis_5511_h2p_device, dev->sis);
 
-    /* MIRQ */
-    pci_enable_mirq(0);
-    pci_enable_mirq(1);
-
-    /* IDEIRQ */
-    pci_enable_mirq(2);
-
-    /* Port 92h */
-    dev->port_92 = device_add(&port_92_device);
-
-    /* SFF IDE */
-    dev->bm[0] = device_add_inst(&sff8038i_device, 1);
-    dev->bm[1] = device_add_inst(&sff8038i_device, 2);
-
-    /* SMRAM */
-    dev->smram = smram_add();
-
-    /* PIT */
-    dev->pit = device_find_first_priv(DEVICE_PIT);
-    dev->pit_read_reg = pit_is_fast ? pitf_read_reg : pit_read_reg;
-
-    /* NVR */
-    dev->nvr = device_add(&at_mb_nvr_device);
-
-    sis_5511_reset(dev);
+    dev->p2i = device_add_linked(&sis_5513_p2i_device, dev->sis);
+    dev->ide = device_add_linked(&sis_5513_ide_device, dev->sis);
 
     return dev;
 }
@@ -978,8 +164,8 @@ const device_t sis_5511_device = {
     .local         = 0,
     .init          = sis_5511_init,
     .close         = sis_5511_close,
-    .reset         = sis_5511_reset,
-    { .available = NULL },
+    .reset         = NULL,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/sis_5511_h2p.c b/src/chipset/sis_5511_h2p.c
new file mode 100644
index 000000000..c8cb44a0a
--- /dev/null
+++ b/src/chipset/sis_5511_h2p.c
@@ -0,0 +1,462 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the SiS 5511 Host to PCI bridge.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2024 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/dma.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/hdd.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/hdc_ide_sff8038i.h>
+#include <86box/pci.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/pit_fast.h>
+#include <86box/plat.h>
+#include <86box/plat_unused.h>
+#include <86box/port_92.h>
+#include <86box/smram.h>
+#include <86box/spd.h>
+#include <86box/apm.h>
+#include <86box/ddma.h>
+#include <86box/acpi.h>
+#include <86box/smbus.h>
+#include <86box/spd.h>
+#include <86box/sis_55xx.h>
+#include <86box/chipset.h>
+#include <86box/usb.h>
+#include <86box/agpgart.h>
+
+#ifdef ENABLE_SIS_5511_HOST_TO_PCI_LOG
+int sis_5511_host_to_pci_do_log = ENABLE_SIS_5511_HOST_TO_PCI_LOG;
+
+static void
+sis_5511_host_to_pci_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (sis_5511_host_to_pci_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define sis_5511_host_to_pci_log(fmt, ...)
+#endif
+
+typedef struct sis_5511_host_to_pci_t {
+    uint8_t            pci_conf[256];
+    uint8_t            states[7];
+
+    uint8_t            slic_regs[4096];
+
+    sis_55xx_common_t *sis;
+
+    smram_t           *smram;
+
+    mem_mapping_t      slic_mapping;
+} sis_5511_host_to_pci_t;
+
+static void
+sis_5511_shadow_recalc(sis_5511_host_to_pci_t *dev)
+{
+    int      state;
+    uint32_t base;
+
+    for (uint8_t i = 0x80; i <= 0x86; i++) {
+        if (i == 0x86) {
+            if ((dev->states[i & 0x0f] ^ dev->pci_conf[i]) & 0xa0) {
+                state = (dev->pci_conf[i] & 0x80) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+                state |= (dev->pci_conf[i] & 0x20) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+                mem_set_mem_state_both(0xf0000, 0x10000, state);
+                sis_5511_host_to_pci_log("000F0000-000FFFFF\n");
+            }
+        } else {
+            base = ((i & 0x07) << 15) + 0xc0000;
+
+            if ((dev->states[i & 0x0f] ^ dev->pci_conf[i]) & 0xa0) {
+                state = (dev->pci_conf[i] & 0x80) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+                state |= (dev->pci_conf[i] & 0x20) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+                mem_set_mem_state_both(base, 0x4000, state);
+                sis_5511_host_to_pci_log("%08X-%08X\n", base, base + 0x3fff);
+            }
+
+            if ((dev->states[i & 0x0f] ^ dev->pci_conf[i]) & 0x0a) {
+                state = (dev->pci_conf[i] & 0x08) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+                state |= (dev->pci_conf[i] & 0x02) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+                mem_set_mem_state_both(base + 0x4000, 0x4000, state);
+                sis_5511_host_to_pci_log("%08X-%08X\n", base + 0x4000, base + 0x7fff);
+            }
+        }
+
+        dev->states[i & 0x0f] = dev->pci_conf[i];
+    }
+
+    flushmmucache_nopc();
+}
+
+static void
+sis_5511_smram_recalc(sis_5511_host_to_pci_t *dev)
+{
+    smram_disable_all();
+
+    switch (dev->pci_conf[0x65] >> 6) {
+        case 0:
+            smram_enable(dev->smram, 0x000e0000, 0x000e0000, 0x8000, dev->pci_conf[0x65] & 0x10, 1);
+            break;
+        case 1:
+            smram_enable(dev->smram, 0x000e0000, 0x000a0000, 0x8000, dev->pci_conf[0x65] & 0x10, 1);
+            break;
+        case 2:
+            smram_enable(dev->smram, 0x000e0000, 0x000b0000, 0x8000, dev->pci_conf[0x65] & 0x10, 1);
+            break;
+
+        default:
+            break;
+    }
+
+    flushmmucache();
+}
+
+void
+sis_5511_host_to_pci_write(int addr, uint8_t val, void *priv)
+{
+    sis_5511_host_to_pci_t *dev = (sis_5511_host_to_pci_t *) priv;
+
+    sis_5511_host_to_pci_log("SiS 5511 H2P: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
+
+    switch (addr) {
+        default:
+            break;
+
+        case 0x07: /* Status - High Byte */
+            dev->pci_conf[addr] &= 0xb0;
+            break;
+
+        case 0x50:
+            dev->pci_conf[addr]   = val;
+            cpu_cache_ext_enabled = !!(val & 0x40);
+            cpu_update_waitstates();
+            break;
+
+        case 0x51:
+            dev->pci_conf[addr] = val & 0xfe;
+            break;
+
+        case 0x52:
+            dev->pci_conf[addr] = val & 0x3f;
+            break;
+
+        case 0x53:
+        case 0x54:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x55:
+            dev->pci_conf[addr] = val & 0xf8;
+            break;
+
+        case 0x56 ... 0x59:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x5a:
+            /* TODO: Fast Gate A20 Emulation and Fast Reset Emulation on the KBC.
+                     The former (bit 7) means the chipset intercepts D1h to 64h and 00h to 60h.
+                     The latter (bit 6) means the chipset intercepts all odd FXh to 64h.
+                     Bit 5 sets fast reset latency. This should be fixed on the other SiS
+                     chipsets as well. */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x5b:
+            dev->pci_conf[addr] = val & 0xf7;
+            break;
+
+        case 0x5c:
+            dev->pci_conf[addr] = val & 0xcf;
+            break;
+
+        case 0x5d:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x5e:
+            dev->pci_conf[addr] = val & 0xfe;
+            break;
+
+        case 0x5f:
+            dev->pci_conf[addr] = val & 0xfe;
+            break;
+
+        case 0x60:
+            dev->pci_conf[addr] = val & 0x3e;
+            if ((dev->pci_conf[0x68] & 1) && (val & 2)) {
+                smi_raise();
+                dev->pci_conf[0x69] |= 1;
+            }
+            break;
+
+        case 0x61 ... 0x64:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x65:
+            dev->pci_conf[addr] = val & 0xd0;
+            sis_5511_smram_recalc(dev);
+            break;
+
+        case 0x66:
+            dev->pci_conf[addr] = val & 0x7f;
+            break;
+
+        case 0x67:
+        case 0x68:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x69:
+            dev->pci_conf[addr] &= val;
+            break;
+
+        case 0x6a ... 0x6e:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x6f:
+            dev->pci_conf[addr] = val & 0x3f;
+            break;
+
+        case 0x70: /* DRAM Bank Register 0-0 */
+        case 0x72: /* DRAM Bank Register 0-1 */
+        case 0x74: /* DRAM Bank Register 1-0 */
+        case 0x76: /* DRAM Bank Register 1-1 */
+        case 0x78: /* DRAM Bank Register 2-0 */
+        case 0x7a: /* DRAM Bank Register 2-1 */
+        case 0x7c: /* DRAM Bank Register 3-0 */
+        case 0x7e: /* DRAM Bank Register 3-1 */
+            spd_write_drbs(dev->pci_conf, 0x70, 0x7e, 0x02);
+            break;
+ 
+        case 0x71: /* DRAM Bank Register 0-0 */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x75: /* DRAM Bank Register 1-0 */
+        case 0x79: /* DRAM Bank Register 2-0 */
+        case 0x7d: /* DRAM Bank Register 3-0 */
+            dev->pci_conf[addr] = val & 0x7f;
+            break;
+
+        case 0x73: /* DRAM Bank Register 0-1 */
+        case 0x77: /* DRAM Bank Register 1-1 */
+        case 0x7b: /* DRAM Bank Register 2-1 */
+        case 0x7f: /* DRAM Bank Register 3-1 */
+            dev->pci_conf[addr] = val & 0x83;
+            break;
+
+        case 0x80 ... 0x85:
+            dev->pci_conf[addr] = val & 0xee;
+            sis_5511_shadow_recalc(dev);
+            break;
+        case 0x86:
+            dev->pci_conf[addr] = val & 0xe8;
+            sis_5511_shadow_recalc(dev);
+            break;
+
+        case 0x90 ... 0x93: /* 5512 General Purpose Register Index */
+            dev->pci_conf[addr] = val;
+            break;
+    }
+}
+
+uint8_t
+sis_5511_host_to_pci_read(int addr, void *priv)
+{
+    const sis_5511_host_to_pci_t *dev = (sis_5511_host_to_pci_t *) priv;
+    uint8_t ret = 0xff;
+
+    ret = dev->pci_conf[addr];
+
+    sis_5511_host_to_pci_log("SiS 5511 H2P: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
+
+    return ret;
+}
+
+static void
+sis_5511_slic_write(uint32_t addr, uint8_t val, void *priv)
+{
+    sis_5511_host_to_pci_t *dev = (sis_5511_host_to_pci_t *) priv;
+
+    addr &= 0x00000fff;
+
+    switch (addr) {
+        case 0x00000000:
+        case 0x00000008:    /* 0x00000008 is a SiS 5512 register. */
+            dev->slic_regs[addr] = val;
+            break;
+        case 0x00000010:
+        case 0x00000018:
+        case 0x00000028:
+        case 0x00000038:
+            dev->slic_regs[addr] = val & 0x01;
+            break;
+        case 0x00000030:
+            dev->slic_regs[addr] = val & 0x0f;
+            mem_mapping_set_addr(&dev->slic_mapping,
+                                 (((uint32_t) (val & 0x0f)) << 28) | 0x0fc00000, 0x00001000);
+            break;
+    }
+}
+
+static uint8_t
+sis_5511_slic_read(uint32_t addr, void *priv)
+{
+    sis_5511_host_to_pci_t *dev = (sis_5511_host_to_pci_t *) priv;
+    uint8_t ret = 0xff;
+
+    addr &= 0x00000fff;
+
+    switch (addr) {
+        case 0x00000008:    /* 0x00000008 is a SiS 5512 register. */
+            ret = dev->slic_regs[addr];
+            break;
+    }
+
+    return ret;
+}
+
+static void
+sis_5511_host_to_pci_reset(void *priv)
+{
+    sis_5511_host_to_pci_t *dev = (sis_5511_host_to_pci_t *) priv;
+
+    dev->pci_conf[0x00] = 0x39;
+    dev->pci_conf[0x01] = 0x10;
+    dev->pci_conf[0x02] = 0x11;
+    dev->pci_conf[0x03] = 0x55;
+    dev->pci_conf[0x04] = 0x07;
+    dev->pci_conf[0x05] = dev->pci_conf[0x06] = 0x00;
+    dev->pci_conf[0x07]                       = 0x02;
+    dev->pci_conf[0x08]                       = 0x00;
+    dev->pci_conf[0x09] = dev->pci_conf[0x0a] = 0x00;
+    dev->pci_conf[0x0b]                       = 0x06;
+    dev->pci_conf[0x50] = dev->pci_conf[0x51] = 0x00;
+    dev->pci_conf[0x52]                       = 0x20;
+    dev->pci_conf[0x53] = dev->pci_conf[0x54] = 0x00;
+    dev->pci_conf[0x55] = dev->pci_conf[0x56] = 0x00;
+    dev->pci_conf[0x57] = dev->pci_conf[0x58] = 0x00;
+    dev->pci_conf[0x59] = dev->pci_conf[0x5a] = 0x00;
+    dev->pci_conf[0x5b] = dev->pci_conf[0x5c] = 0x00;
+    dev->pci_conf[0x5d] = dev->pci_conf[0x5e] = 0x00;
+    dev->pci_conf[0x5f] = dev->pci_conf[0x60] = 0x00;
+    dev->pci_conf[0x61] = dev->pci_conf[0x62] = 0xff;
+    dev->pci_conf[0x63]                       = 0xff;
+    dev->pci_conf[0x64] = dev->pci_conf[0x65] = 0x00;
+    dev->pci_conf[0x66]                       = 0x00;
+    dev->pci_conf[0x67]                       = 0xff;
+    dev->pci_conf[0x68] = dev->pci_conf[0x69] = 0x00;
+    dev->pci_conf[0x6a]                       = 0x00;
+    dev->pci_conf[0x6b] = dev->pci_conf[0x6c] = 0xff;
+    dev->pci_conf[0x6d] = dev->pci_conf[0x6e] = 0xff;
+    dev->pci_conf[0x6f]                       = 0x00;
+    dev->pci_conf[0x70] = dev->pci_conf[0x72] = 0x04;
+    dev->pci_conf[0x74] = dev->pci_conf[0x76] = 0x04;
+    dev->pci_conf[0x78] = dev->pci_conf[0x7a] = 0x04;
+    dev->pci_conf[0x7c] = dev->pci_conf[0x7e] = 0x04;
+    dev->pci_conf[0x71] = dev->pci_conf[0x75] = 0x00;
+    dev->pci_conf[0x73] = dev->pci_conf[0x77] = 0x80;
+    dev->pci_conf[0x79] = dev->pci_conf[0x7d] = 0x00;
+    dev->pci_conf[0x7b] = dev->pci_conf[0x7f] = 0x80;
+    dev->pci_conf[0x80] = dev->pci_conf[0x81] = 0x00;
+    dev->pci_conf[0x82] = dev->pci_conf[0x83] = 0x00;
+    dev->pci_conf[0x84] = dev->pci_conf[0x85] = 0x00;
+    dev->pci_conf[0x86] = 0x00;
+
+    cpu_cache_ext_enabled = 0;
+    cpu_update_waitstates();
+
+    sis_5511_smram_recalc(dev);
+    sis_5511_shadow_recalc(dev);
+
+    flushmmucache();
+
+    memset(dev->slic_regs, 0x00, 4096 * sizeof(uint8_t));
+    dev->slic_regs[0x18] = 0x0f;
+
+    mem_mapping_set_addr(&dev->slic_mapping, 0xffc00000, 0x00001000);
+}
+
+static void
+sis_5511_host_to_pci_close(void *priv)
+{
+    sis_5511_host_to_pci_t *dev = (sis_5511_host_to_pci_t *) priv;
+
+    smram_del(dev->smram);
+    free(dev);
+}
+
+static void *
+sis_5511_host_to_pci_init(UNUSED(const device_t *info))
+{
+    sis_5511_host_to_pci_t *dev = (sis_5511_host_to_pci_t *) calloc(1, sizeof(sis_5511_host_to_pci_t));
+
+    dev->sis = device_get_common_priv();
+
+    /* SLiC Memory Mapped Registers */
+    mem_mapping_add(&dev->slic_mapping,
+                    0xffc00000, 0x00001000,
+                    sis_5511_slic_read,
+                    NULL,
+                    NULL,
+                    sis_5511_slic_write,
+                    NULL,
+                    NULL,
+                    NULL, MEM_MAPPING_EXTERNAL,
+                    dev);
+
+    /* SMRAM */
+    dev->smram = smram_add();
+
+    sis_5511_host_to_pci_reset(dev);
+
+    return dev;
+}
+
+const device_t sis_5511_h2p_device = {
+    .name          = "SiS 5511 Host to PCI bridge",
+    .internal_name = "sis_5511_host_to_pci",
+    .flags         = DEVICE_PCI,
+    .local         = 0x00,
+    .init          = sis_5511_host_to_pci_init,
+    .close         = sis_5511_host_to_pci_close,
+    .reset         = sis_5511_host_to_pci_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/sis_5513_ide.c b/src/chipset/sis_5513_ide.c
new file mode 100644
index 000000000..9e3a0ad07
--- /dev/null
+++ b/src/chipset/sis_5513_ide.c
@@ -0,0 +1,505 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the SiS 5513 IDE controller.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2024 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/dma.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/hdd.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/hdc_ide_sff8038i.h>
+#include <86box/pci.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/pit_fast.h>
+#include <86box/plat.h>
+#include <86box/plat_unused.h>
+#include <86box/port_92.h>
+#include <86box/smram.h>
+#include <86box/spd.h>
+#include <86box/apm.h>
+#include <86box/ddma.h>
+#include <86box/acpi.h>
+#include <86box/smbus.h>
+#include <86box/sis_55xx.h>
+#include <86box/chipset.h>
+
+#ifdef ENABLE_SIS_5513_IDE_LOG
+int sis_5513_ide_do_log = ENABLE_SIS_5513_IDE_LOG;
+
+static void
+sis_5513_ide_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (sis_5513_ide_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define sis_5513_ide_log(fmt, ...)
+#endif
+
+typedef struct sis_5513_ide_t {
+    uint8_t            rev;
+
+    uint8_t            pci_conf[256];
+
+    sis_55xx_common_t *sis;
+} sis_5513_ide_t;
+
+static void
+sis_5513_ide_irq_handler(sis_5513_ide_t *dev)
+{
+    if (dev->pci_conf[0x09] & 0x01) {
+        /* Primary IDE is native. */
+        sis_5513_ide_log("Primary IDE IRQ mode: Native, Native\n");
+        sff_set_irq_mode(dev->sis->bm[0], IRQ_MODE_SIS_551X);
+    } else {
+        /* Primary IDE is legacy. */
+        sis_5513_ide_log("Primary IDE IRQ mode: IRQ14, IRQ15\n");
+        sff_set_irq_mode(dev->sis->bm[0], IRQ_MODE_LEGACY);
+    }
+
+    if (dev->pci_conf[0x09] & 0x04) {
+        /* Secondary IDE is native. */
+        sis_5513_ide_log("Secondary IDE IRQ mode: Native, Native\n");
+        sff_set_irq_mode(dev->sis->bm[1], IRQ_MODE_SIS_551X);
+    } else {
+        /* Secondary IDE is legacy. */
+        sis_5513_ide_log("Secondary IDE IRQ mode: IRQ14, IRQ15\n");
+        sff_set_irq_mode(dev->sis->bm[1], IRQ_MODE_LEGACY);
+    }
+}
+
+static void
+sis_5513_ide_handler(sis_5513_ide_t *dev)
+{
+    uint8_t ide_io_on = dev->pci_conf[0x04] & 0x01;
+
+    uint16_t native_base_pri_addr = (dev->pci_conf[0x11] | dev->pci_conf[0x10] << 8) & 0xfffe;
+    uint16_t native_side_pri_addr = (dev->pci_conf[0x15] | dev->pci_conf[0x14] << 8) & 0xfffe;
+    uint16_t native_base_sec_addr = (dev->pci_conf[0x19] | dev->pci_conf[0x18] << 8) & 0xfffe;
+    uint16_t native_side_sec_addr = (dev->pci_conf[0x1c] | dev->pci_conf[0x1b] << 8) & 0xfffe;
+
+    uint16_t current_pri_base;
+    uint16_t current_pri_side;
+    uint16_t current_sec_base;
+    uint16_t current_sec_side;
+
+    /* Primary Channel Programming */
+    current_pri_base = (!(dev->pci_conf[0x09] & 1)) ? 0x01f0 : native_base_pri_addr;
+    current_pri_side = (!(dev->pci_conf[0x09] & 1)) ? 0x03f6 : native_side_pri_addr;
+
+    /* Secondary Channel Programming */
+    current_sec_base = (!(dev->pci_conf[0x09] & 4)) ? 0x0170 : native_base_sec_addr;
+    current_sec_side = (!(dev->pci_conf[0x09] & 4)) ? 0x0376 : native_side_sec_addr;
+
+    sis_5513_ide_log("sis_5513_ide_handler(): Disabling primary IDE...\n");
+    ide_pri_disable();
+    sis_5513_ide_log("sis_5513_ide_handler(): Disabling secondary IDE...\n");
+    ide_sec_disable();
+
+    if (ide_io_on) {
+        /* Primary Channel Setup */
+        if (dev->pci_conf[0x4a] & 0x02) {
+            sis_5513_ide_log("sis_5513_ide_handler(): Primary IDE base now %04X...\n", current_pri_base);
+            ide_set_base(0, current_pri_base);
+            sis_5513_ide_log("sis_5513_ide_handler(): Primary IDE side now %04X...\n", current_pri_side);
+            ide_set_side(0, current_pri_side);
+
+            sis_5513_ide_log("sis_5513_ide_handler(): Enabling primary IDE...\n");
+            ide_pri_enable();
+
+            sis_5513_ide_log("SiS 5513 PRI: BASE %04x SIDE %04x\n", current_pri_base, current_pri_side);
+        }
+
+        /* Secondary Channel Setup */
+        if (dev->pci_conf[0x4a] & 0x04) {
+            sis_5513_ide_log("sis_5513_ide_handler(): Secondary IDE base now %04X...\n", current_sec_base);
+            ide_set_base(1, current_sec_base);
+            sis_5513_ide_log("sis_5513_ide_handler(): Secondary IDE side now %04X...\n", current_sec_side);
+            ide_set_side(1, current_sec_side);
+
+            sis_5513_ide_log("sis_5513_ide_handler(): Enabling secondary IDE...\n");
+            ide_sec_enable();
+
+            sis_5513_ide_log("SiS 5513: BASE %04x SIDE %04x\n", current_sec_base, current_sec_side);
+        }
+    }
+
+    sff_bus_master_handler(dev->sis->bm[0], ide_io_on,
+                           ((dev->pci_conf[0x20] & 0xf0) | (dev->pci_conf[0x21] << 8)) + 0);
+    sff_bus_master_handler(dev->sis->bm[1], ide_io_on,
+                           ((dev->pci_conf[0x20] & 0xf0) | (dev->pci_conf[0x21] << 8)) + 8);
+}
+
+void
+sis_5513_ide_write(int addr, uint8_t val, void *priv)
+{
+    sis_5513_ide_t *dev = (sis_5513_ide_t *) priv;
+
+    sis_5513_ide_log("SiS 5513 IDE: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
+
+    switch (addr) {
+        case 0x04: /* Command low byte */
+            dev->pci_conf[addr] = val & 0x05;
+            sis_5513_ide_handler(dev);
+            break;
+        case 0x06: /* Status low byte */
+            dev->pci_conf[addr] = val & 0x20;
+            break;
+        case 0x07: /* Status high byte */
+            dev->pci_conf[addr] = (dev->pci_conf[addr] & 0x06) & ~(val & 0x38);
+            break;
+        case 0x09: /* Programming Interface Byte */
+            switch (dev->rev) {
+                case 0xd0:
+                    if (dev->sis->ide_bits_1_3_writable)
+                        val |= 0x0a;
+                    fallthrough;
+                case 0x00:
+                case 0xd1:
+                    val &= 0xbf;
+                    fallthrough;
+                case 0xc0:
+                    switch (val & 0x0a) {
+                        case 0x00:
+                            dev->pci_conf[addr] = (dev->pci_conf[addr] & 0x85) | (val & 0x4a);
+                            break;
+                        case 0x02:
+                            dev->pci_conf[addr] = (dev->pci_conf[addr] & 0x84) | (val & 0x4b);
+                            break;
+                        case 0x08:
+                            dev->pci_conf[addr] = (dev->pci_conf[addr] & 0x81) | (val & 0x4e);
+                            break;
+                        case 0x0a:
+                            dev->pci_conf[addr] = (dev->pci_conf[addr] & 0x80) | (val & 0x4f);
+                            break;
+                    }
+                    break;
+            }
+            sis_5513_ide_irq_handler(dev);
+            sis_5513_ide_handler(dev);
+            break;
+        case 0x0d: /* Latency Timer */
+            dev->pci_conf[addr] = val;
+            break;
+
+        /* Primary Base Address */
+        case 0x10 ... 0x11:
+        case 0x14 ... 0x15:
+            fallthrough;
+
+        /* Secondary Base Address */
+        case 0x18 ... 0x19:
+        case 0x1c ... 0x1d:
+            fallthrough;
+
+        /* Bus Mastering Base Address */
+        case 0x20 ... 0x21:
+            if (addr == 0x20)
+                dev->pci_conf[addr] = (val & 0xe0) | 0x01;
+            else if ((addr & 0x07) == 0x00)
+                dev->pci_conf[addr] = (val & 0xf8) | 0x01;
+            else if ((addr & 0x07) == 0x04)
+                dev->pci_conf[addr] = (val & 0xfc) | 0x01;
+            else
+                dev->pci_conf[addr] = val;
+            sis_5513_ide_handler(dev);
+            break;
+
+        case 0x2c ... 0x2f:
+            if (dev->rev >= 0xd0)
+                dev->pci_conf[addr] = val;
+            break;
+
+        case 0x30 ... 0x33: /* Expansion ROM Base Address */
+#ifdef DATASHEET
+            dev->pci_conf[addr] = val;
+#else
+            if (dev->rev == 0x00)
+                dev->pci_conf[addr] = val;
+#endif
+            break;
+
+        case 0x40: /* IDE Primary Channel/Master Drive Data Recovery Time Control */
+            if (dev->rev >= 0xd0)
+                dev->pci_conf[addr] = val & 0xcf;
+            else
+                dev->pci_conf[addr] = val & 0x0f;
+            break;
+
+        case 0x42: /* IDE Primary Channel/Slave Drive Data Recovery Time Control */
+        case 0x44: /* IDE Secondary Channel/Master Drive Data Recovery Time Control */
+        case 0x46: /* IDE Secondary Channel/Slave Drive Data Recovery Time Control */
+        case 0x48: /* IDE Command Recovery Time Control */
+            dev->pci_conf[addr] = val & 0x0f;
+            break;
+
+        case 0x41: /* IDE Primary Channel/Master Drive DataActive Time Control */
+        case 0x43: /* IDE Primary Channel/Slave Drive Data Active Time Control */
+        case 0x45: /* IDE Secondary Channel/Master Drive Data Active Time Control */
+        case 0x47: /* IDE Secondary Channel/Slave Drive Data Active Time Control */
+            if (dev->rev >= 0xd0)
+                dev->pci_conf[addr] = val & 0xe7;
+            else
+                dev->pci_conf[addr] = val & 0x07;
+            break;
+
+        case 0x49: /* IDE Command Active Time Control */
+            dev->pci_conf[addr] = val & 0x07;
+            break;
+
+        case 0x4a: /* IDE General Control Register 0 */
+            switch (dev->rev) {
+                case 0x00:
+                   dev->pci_conf[addr] = val & 0x9e;
+                   break;
+                case 0xc0:
+                   dev->pci_conf[addr] = val & 0xaf;
+                   break;
+                case 0xd0:
+                   dev->pci_conf[addr] = val;
+                   break;
+            }
+            sis_5513_ide_handler(dev);
+            break;
+
+        case 0x4b: /* IDE General Control Register 1 */
+            if (dev->rev >= 0xc0)
+                dev->pci_conf[addr] = val;
+            else
+                dev->pci_conf[addr] = val & 0xef;
+            break;
+
+        case 0x4c: /* Prefetch Count of Primary Channel (Low Byte) */
+        case 0x4d: /* Prefetch Count of Primary Channel (High Byte) */
+        case 0x4e: /* Prefetch Count of Secondary Channel (Low Byte) */
+        case 0x4f: /* Prefetch Count of Secondary Channel (High Byte) */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x50:
+        case 0x51:
+            if (dev->rev >= 0xd0)
+                dev->pci_conf[addr] = val;
+            break;
+
+        case 0x52:
+            if (dev->rev >= 0xd0)
+                dev->pci_conf[addr] = val & 0x0f;
+            break;
+
+        default:
+            break;
+    }
+}
+
+uint8_t
+sis_5513_ide_read(int addr, void *priv)
+{
+    const sis_5513_ide_t *dev = (sis_5513_ide_t *) priv;
+    uint8_t ret = 0xff;
+
+    switch (addr) {
+        default:
+            ret = dev->pci_conf[addr];
+            break;
+        case 0x09:
+            ret = dev->pci_conf[addr];
+            if (dev->rev >= 0xc0) {
+                if (dev->pci_conf[0x09] & 0x40)
+                    ret |= ((dev->pci_conf[0x4a] & 0x06) << 3);
+                if ((dev->rev == 0xd0) && dev->sis->ide_bits_1_3_writable)
+                    ret |= 0x0a;
+            }
+            break;
+        case 0x3d:
+            if (dev->rev >= 0xc0)
+                ret = (dev->pci_conf[0x09] & 0x05) ? PCI_INTA : 0x00;
+            else
+                ret = (((dev->pci_conf[0x4b] & 0xc0) == 0xc0) ||
+                       (dev->pci_conf[0x09] & 0x05)) ? PCI_INTA : 0x00;
+            break;
+    }
+
+    sis_5513_ide_log("SiS 5513 IDE: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
+
+    return ret;
+}
+
+static void
+sis_5513_ide_reset(void *priv)
+{
+    sis_5513_ide_t *dev = (sis_5513_ide_t *) priv;
+
+    dev->pci_conf[0x00] = 0x39;
+    dev->pci_conf[0x01] = 0x10;
+    dev->pci_conf[0x02] = 0x13;
+    dev->pci_conf[0x03] = 0x55;
+    dev->pci_conf[0x04] = dev->pci_conf[0x05] = 0x00;
+    dev->pci_conf[0x06] = dev->pci_conf[0x07] = 0x00;
+    dev->pci_conf[0x08] = (dev->rev == 0xd1) ? 0xd0 : dev->rev;
+    dev->pci_conf[0x09] = 0x8a;
+    dev->pci_conf[0x0a] = dev->pci_conf[0x0b] = 0x01;
+    dev->pci_conf[0x0c] = dev->pci_conf[0x0d] = 0x00;
+    dev->pci_conf[0x0e] = 0x80;
+    dev->pci_conf[0x0f] = 0x00;
+    dev->pci_conf[0x10] = 0xf1;
+    dev->pci_conf[0x11] = 0x01;
+    dev->pci_conf[0x14] = 0xf5;
+    dev->pci_conf[0x15] = 0x03;
+    dev->pci_conf[0x18] = 0x71;
+    dev->pci_conf[0x19] = 0x01;
+    dev->pci_conf[0x1c] = 0x75;
+    dev->pci_conf[0x1d] = 0x03;
+    dev->pci_conf[0x20] = 0x01;
+    dev->pci_conf[0x21] = 0xf0;
+    dev->pci_conf[0x22] = dev->pci_conf[0x23] = 0x00;
+    dev->pci_conf[0x24] = dev->pci_conf[0x25] = 0x00;
+    dev->pci_conf[0x26] = dev->pci_conf[0x27] = 0x00;
+    dev->pci_conf[0x28] = dev->pci_conf[0x29] = 0x00;
+    dev->pci_conf[0x2a] = dev->pci_conf[0x2b] = 0x00;
+    switch (dev->rev) {
+        case 0x00:
+        case 0xd0:
+        case 0xd1:
+            dev->pci_conf[0x2c] = dev->pci_conf[0x2d] = 0x00;
+            break;
+        case 0xc0:
+#ifdef DATASHEET
+            dev->pci_conf[0x2c] = dev->pci_conf[0x2d] = 0x00;
+#else
+            /* The only Linux lspci listing I could find of this chipset,
+               shows a subsystem of 0058:0000. */
+            dev->pci_conf[0x2c] = 0x58;
+            dev->pci_conf[0x2d] = 0x00;
+#endif
+            break;
+    }
+    dev->pci_conf[0x2e] = dev->pci_conf[0x2f] = 0x00;
+    dev->pci_conf[0x30] = dev->pci_conf[0x31] = 0x00;
+    dev->pci_conf[0x32] = dev->pci_conf[0x33] = 0x00;
+    dev->pci_conf[0x40] = dev->pci_conf[0x41] = 0x00;
+    dev->pci_conf[0x42] = dev->pci_conf[0x43] = 0x00;
+    dev->pci_conf[0x44] = dev->pci_conf[0x45] = 0x00;
+    dev->pci_conf[0x46] = dev->pci_conf[0x47] = 0x00;
+    dev->pci_conf[0x48] = dev->pci_conf[0x49] = 0x00;
+    dev->pci_conf[0x4a] = 0x06;
+    dev->pci_conf[0x4b] = 0x00;
+    dev->pci_conf[0x4c] = dev->pci_conf[0x4d] = 0x00;
+    dev->pci_conf[0x4e] = dev->pci_conf[0x4f] = 0x00;
+
+    sis_5513_ide_irq_handler(dev);
+    sis_5513_ide_handler(dev);
+
+    sff_bus_master_reset(dev->sis->bm[0]);
+    sff_bus_master_reset(dev->sis->bm[1]);
+}
+
+static void
+sis_5513_ide_close(void *priv)
+{
+    sis_5513_ide_t *dev = (sis_5513_ide_t *) priv;
+
+    free(dev);
+}
+
+static void *
+sis_5513_ide_init(UNUSED(const device_t *info))
+{
+    sis_5513_ide_t *dev = (sis_5513_ide_t *) calloc(1, sizeof(sis_5513_ide_t));
+
+    dev->rev = info->local;
+
+    dev->sis = device_get_common_priv();
+
+    /* SFF IDE */
+    dev->sis->bm[0] = device_add_inst(&sff8038i_device, 1);
+    dev->sis->bm[1] = device_add_inst(&sff8038i_device, 2);
+
+    sis_5513_ide_reset(dev);
+
+    return dev;
+}
+
+const device_t sis_5513_ide_device = {
+    .name          = "SiS 5513 IDE controller",
+    .internal_name = "sis_5513_ide",
+    .flags         = DEVICE_PCI,
+    .local         = 0x00,
+    .init          = sis_5513_ide_init,
+    .close         = sis_5513_ide_close,
+    .reset         = sis_5513_ide_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t sis_5572_ide_device = {
+    .name          = "SiS 5572 IDE controller",
+    .internal_name = "sis_5572_ide",
+    .flags         = DEVICE_PCI,
+    .local         = 0xc0,
+    .init          = sis_5513_ide_init,
+    .close         = sis_5513_ide_close,
+    .reset         = sis_5513_ide_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t sis_5582_ide_device = {
+    .name          = "SiS 5582 IDE controller",
+    .internal_name = "sis_5582_ide",
+    .flags         = DEVICE_PCI,
+    .local         = 0xd0,
+    .init          = sis_5513_ide_init,
+    .close         = sis_5513_ide_close,
+    .reset         = sis_5513_ide_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t sis_5591_5600_ide_device = {
+    .name          = "SiS 5591/(5)600 IDE controller",
+    .internal_name = "sis_5591_5600_ide",
+    .flags         = DEVICE_PCI,
+    .local         = 0xd1,    /* D0, but we need to distinguish them. */
+    .init          = sis_5513_ide_init,
+    .close         = sis_5513_ide_close,
+    .reset         = sis_5513_ide_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/sis_5513_p2i.c b/src/chipset/sis_5513_p2i.c
new file mode 100644
index 000000000..ac160f337
--- /dev/null
+++ b/src/chipset/sis_5513_p2i.c
@@ -0,0 +1,1387 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the SiS 5513 PCI to ISA bridge.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2024 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/dma.h>
+#include <86box/lpt.h>
+#include <86box/machine.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/hdd.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/hdc_ide_sff8038i.h>
+#include <86box/pci.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/pit_fast.h>
+#include <86box/plat.h>
+#include <86box/plat_unused.h>
+#include <86box/port_92.h>
+#include <86box/smram.h>
+#include <86box/spd.h>
+#include <86box/apm.h>
+#include <86box/ddma.h>
+#include <86box/acpi.h>
+#include <86box/smbus.h>
+#include <86box/sis_55xx.h>
+#include <86box/chipset.h>
+
+#ifdef ENABLE_SIS_5513_PCI_TO_ISA_LOG
+int sis_5513_pci_to_isa_do_log = ENABLE_SIS_5513_PCI_TO_ISA_LOG;
+
+static void
+sis_5513_pci_to_isa_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (sis_5513_pci_to_isa_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define sis_5513_pci_to_isa_log(fmt, ...)
+#endif
+
+typedef struct sis_5513_pci_to_isa_t {
+    uint8_t            rev;
+    uint8_t            index;
+    uint8_t            dam_index;
+    uint8_t            irq_state;
+    uint8_t            dam_enable;
+    uint8_t            dam_irq_enable;
+    uint8_t            ddma_enable;
+    uint8_t            pci_conf[256];
+    uint8_t            regs[16];
+    uint8_t            dam_regs[256];
+    uint8_t            apc_regs[256];
+
+    uint16_t           dam_base;
+    uint16_t           ddma_base;
+    uint16_t           acpi_io_base;
+
+    sis_55xx_common_t *sis;
+    port_92_t         *port_92;
+    void              *pit;
+    nvr_t             *nvr;
+    char              *fn;
+    ddma_t            *ddma;
+    acpi_t            *acpi;
+    void              *smbus;
+
+    uint8_t          (*pit_read_reg)(void *priv, uint8_t reg);
+} sis_5513_pci_to_isa_t;
+
+static void
+sis_5595_acpi_recalc(sis_5513_pci_to_isa_t *dev)
+{
+    dev->acpi_io_base = (dev->pci_conf[0x91] << 8) | (dev->pci_conf[0x90] & 0xc0);
+    acpi_update_io_mapping(dev->sis->acpi, dev->acpi_io_base, (dev->pci_conf[0x40] & 0x80));
+}
+
+static void
+sis_5513_apc_reset(sis_5513_pci_to_isa_t *dev)
+{
+    memset(dev->apc_regs, 0x00, sizeof(dev->apc_regs));
+
+    if (dev->rev == 0xb0) {
+        dev->apc_regs[0x03] = 0x80;
+        dev->apc_regs[0x04] = 0x38;
+        dev->apc_regs[0x07] = 0x01;
+    } else
+        dev->apc_regs[0x04] = 0x08;
+}
+
+static void
+sis_5513_apc_write(UNUSED(uint16_t addr), uint8_t val, void *priv)
+{
+    sis_5513_pci_to_isa_t *dev = (sis_5513_pci_to_isa_t *) priv;
+    uint8_t nvr_index = nvr_get_index(dev->nvr, 0);
+
+    sis_5513_pci_to_isa_log("SiS 5595 APC: [W] %04X = %02X\n", addr, val);
+
+    switch (nvr_index) {
+        case 0x02 ... 0x04:
+            dev->apc_regs[nvr_index] = val;
+            break;
+        case 0x05:
+        case 0x07 ... 0x08:
+            if (dev->rev == 0xb0)
+                dev->apc_regs[nvr_index] = val;
+            break;
+    }
+}
+
+static uint8_t
+sis_5513_apc_read(UNUSED(uint16_t addr), void *priv)
+{
+    sis_5513_pci_to_isa_t *dev = (sis_5513_pci_to_isa_t *) priv;
+    uint8_t nvr_index = nvr_get_index(dev->nvr, 0);
+    uint8_t ret = 0xff;
+
+    ret = dev->apc_regs[nvr_index];
+
+    if (nvr_index == 0x06)
+        dev->apc_regs[nvr_index] = 0x00;
+
+    sis_5513_pci_to_isa_log("SiS 5595 APC: [R] %04X = %02X\n", addr, ret);
+
+    return ret;
+}
+
+void
+sis_5513_apc_recalc(sis_5513_pci_to_isa_t *dev, uint8_t apc_on)
+{
+    nvr_at_data_port(!apc_on, dev->nvr);
+    io_removehandler(0x0071, 0x0001,
+                     sis_5513_apc_read, NULL, NULL, sis_5513_apc_write, NULL, NULL, dev);
+
+    if (apc_on)
+        io_removehandler(0x0071, 0x0001,
+                         sis_5513_apc_read, NULL, NULL, sis_5513_apc_write, NULL, NULL, dev);
+}
+
+static void
+sis_5595_do_nmi(sis_5513_pci_to_isa_t *dev, int set)
+{
+    if (set)
+        nmi_raise();
+
+    dev->irq_state = set;
+}
+
+static void
+sis_5595_dam_reset(sis_5513_pci_to_isa_t *dev)
+{
+    if (dev->irq_state) {
+        if (dev->dam_regs[0x40] & 0x20)
+            sis_5595_do_nmi(dev, 0);
+        else if (dev->dam_irq_enable)
+            pci_clear_mirq(6, 1, &dev->irq_state);
+    }
+
+    memset(dev->dam_regs, 0x00, sizeof(dev->dam_regs));
+
+    dev->dam_regs[0x40] = 0x08;
+    dev->dam_regs[0x47] = 0x50;
+}
+
+static void
+sis_5595_dam_write(uint16_t addr, uint8_t val, void *priv)
+{
+    sis_5513_pci_to_isa_t *dev = (sis_5513_pci_to_isa_t *) priv;
+    uint16_t reg = addr - dev->dam_base;
+    uint8_t old;
+
+    sis_5513_pci_to_isa_log("SiS 5595 DAM: [W] %04X = %02X\n", addr, val);
+
+    switch (reg) {
+        case 0x05:
+            dev->dam_index = (dev->index & 0x80) | (val & 0x7f);
+            break;
+        case 0x06:
+            switch (dev->dam_index) {
+                case 0x40:
+                    old = dev->dam_regs[0x40];
+                    dev->dam_regs[0x40] = val & 0xef;
+                    if (val & 0x80) {
+                        sis_5595_dam_reset(dev);
+                        return;
+                    }
+                    if (dev->irq_state) {
+                        if (!(old & 0x20) && (val & 0x20)) {
+                            if (dev->dam_irq_enable)
+                                pci_clear_mirq(6, 1, &dev->irq_state);
+                            sis_5595_do_nmi(dev, 1);
+                        } else if ((old & 0x20) && !(val & 0x20)) {
+                            sis_5595_do_nmi(dev, 0);
+                            if (dev->dam_irq_enable)
+                                pci_set_mirq(6, 1, &dev->irq_state);
+                        }
+                    }
+                    if ((val & 0x08) && dev->dam_irq_enable)
+                        pci_clear_mirq(6, 1, &dev->irq_state);
+                    break;
+                case 0x43 ... 0x47:
+                    dev->dam_regs[dev->dam_index] = val;
+                    break;
+                case 0x2b ... 0x34:
+                case 0x6b ... 0x74:
+                case 0x3b ... 0x3c:
+                case 0x7b ... 0x7c:
+                    dev->dam_regs[dev->dam_index & 0x3f] = val;
+                    break;
+            }
+            break;
+    }
+}
+
+static uint8_t
+sis_5595_dam_read(uint16_t addr, void *priv)
+{
+    sis_5513_pci_to_isa_t *dev = (sis_5513_pci_to_isa_t *) priv;
+    uint16_t reg = addr - dev->dam_base;
+    uint8_t ret = 0xff;
+
+    switch (reg) {
+        case 0x05:
+            ret = dev->dam_index;
+            break;
+        case 0x06:
+            switch (dev->dam_index) {
+                default:
+                    ret = dev->dam_regs[dev->dam_index];
+                    break;
+                case 0x20 ... 0x29:
+                case 0x2b ... 0x3f:
+                    ret = dev->dam_regs[dev->dam_index & 0x3f];
+                    break;
+                case 0x2a:
+                case 0x6a:
+                    ret = dev->pci_conf[0x78];
+                    break;
+            }
+            break;
+    }
+
+    sis_5513_pci_to_isa_log("SiS 5595 DAM: [R] %04X = %02X\n", addr, ret);
+
+    return ret;
+}
+
+static void
+sis_5595_dam_recalc(sis_5513_pci_to_isa_t *dev)
+{
+    if (dev->dam_enable && (dev->dam_base != 0x0000))
+        io_removehandler(dev->dam_base, 0x0008,
+                         sis_5595_dam_read, NULL, NULL, sis_5595_dam_write, NULL, NULL, dev);
+
+    dev->dam_base = dev->pci_conf[0x68] | (dev->pci_conf[0x69] << 16);
+    dev->dam_enable = !!(dev->pci_conf[0x7b] & 0x80);
+
+    if (dev->dam_enable && (dev->dam_base != 0x0000))
+        io_sethandler(dev->dam_base, 0x0008,
+                      sis_5595_dam_read, NULL, NULL, sis_5595_dam_write, NULL, NULL, dev);
+}
+
+static void
+sis_5595_ddma_recalc(sis_5513_pci_to_isa_t *dev)
+{
+    uint16_t ch_base;
+
+    dev->ddma_base = (dev->pci_conf[0x80] & 0xf0) | (dev->pci_conf[0x81] << 16);
+    dev->ddma_enable = !!(dev->pci_conf[0x80] & 0x01);
+
+    for (uint8_t i = 0; i < 8; i++) {
+        ch_base = dev->ddma_base + (i << 4);
+        ddma_update_io_mapping(dev->ddma, i, ch_base & 0xff, (ch_base >> 8),
+                               dev->ddma_enable && (dev->pci_conf[0x84] & (1 << i)) &&
+                               (dev->ddma_base != 0x0000));
+    }
+}
+
+static void
+sis_5513_00_pci_to_isa_write(int addr, uint8_t val, sis_5513_pci_to_isa_t *dev)
+{
+    switch (addr) {
+        case 0x60: /* MIRQ0 Remapping Control Register */
+        case 0x61: /* MIRQ1 Remapping Control Register */
+            sis_5513_pci_to_isa_log("Set MIRQ routing: MIRQ%i -> %02X\n", addr & 0x01, val);
+            dev->pci_conf[addr] = val & 0xcf;
+            if (val & 0x80)
+                pci_set_mirq_routing(PCI_MIRQ0 + (addr & 0x01), PCI_IRQ_DISABLED);
+            else
+                pci_set_mirq_routing(PCI_MIRQ0 + (addr & 0x01), val & 0xf);
+            break;
+
+        case 0x62: /* On-board Device DMA Control Register */
+            dev->pci_conf[addr] = val;
+            if (machine_has_jumpered_ecp_dma(machine, MACHINE_DMA_USE_MBDMA))
+                lpt1_dma(((val & 0x08) || ((val & 0x07) == 0x04)) ? 0xff : (val & 0x07));
+            break;
+
+        case 0x63: /* IDEIRQ Remapping Control Register */
+            sis_5513_pci_to_isa_log("Set MIRQ routing: IDEIRQ -> %02X\n", val);
+            dev->pci_conf[addr] = val & 0x8f;
+            if (val & 0x80)
+                pci_set_mirq_routing(PCI_MIRQ2, PCI_IRQ_DISABLED);
+            else
+                pci_set_mirq_routing(PCI_MIRQ2, val & 0xf);
+            break;
+
+        case 0x64: /* GPIO0 Control Register */
+            dev->pci_conf[addr] = val & 0xef;
+            break;
+
+        case 0x65:
+            dev->pci_conf[addr] = val & 0x80;
+            break;
+
+        case 0x66: /* GPIO0 Output Mode Control Register */
+        case 0x67: /* GPIO0 Output Mode Control Register */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x6a: /* GPIO Status Register */
+            dev->pci_conf[addr] |= (val & 0x10);
+            dev->pci_conf[addr] &= ~(val & 0x01);
+            break;
+
+        default:
+            break;
+    }
+}
+
+static void
+sis_5513_01_pci_to_isa_write(int addr, uint8_t val, sis_5513_pci_to_isa_t *dev)
+{
+    uint8_t old;
+
+    switch (addr) {
+        /* Simply skip MIRQ0, so we can reuse the SiS 551x IDEIRQ infrastructure. */
+        case 0x61: /* MIRQ Remapping Control Register */
+            sis_5513_pci_to_isa_log("Set MIRQ routing: MIRQ%i -> %02X\n", addr & 0x01, val);
+            dev->pci_conf[addr] = val & 0xcf;
+            if (val & 0x80)
+                pci_set_mirq_routing(PCI_MIRQ0 + (addr & 0x01), PCI_IRQ_DISABLED);
+            else
+                pci_set_mirq_routing(PCI_MIRQ0 + (addr & 0x01), val & 0xf);
+            break;
+
+        case 0x62: /* On-board Device DMA Control Register */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x63: /* IDEIRQ Remapping Control Register */
+            sis_5513_pci_to_isa_log("Set MIRQ routing: IDEIRQ -> %02X\n", val);
+            dev->pci_conf[addr] = val & 0x8f;
+            if (val & 0x80)
+                 pci_set_mirq_routing(PCI_MIRQ2, PCI_IRQ_DISABLED);
+            else
+                pci_set_mirq_routing(PCI_MIRQ2, val & 0xf);
+            break;
+
+        case 0x64: /* GPIO Control Register */
+            dev->pci_conf[addr] = val & 0xef;
+            break;
+
+        case 0x65:
+            dev->pci_conf[addr] = val & 0x1b;
+            break;
+
+        case 0x66: /* GPIO Output Mode Control Register */
+        case 0x67: /* GPIO Output Mode Control Register */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x68: /* USBIRQ Remapping Control Register */
+            sis_5513_pci_to_isa_log("Set MIRQ routing: USBIRQ -> %02X\n", val);
+            dev->pci_conf[addr] = val & 0xcf;
+            if (val & 0x80)
+                 pci_set_mirq_routing(PCI_MIRQ3, PCI_IRQ_DISABLED);
+            else
+                pci_set_mirq_routing(PCI_MIRQ3, val & 0xf);
+            break;
+
+        case 0x69:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x6a:
+            dev->pci_conf[addr] = val & 0xfc;
+            break;
+
+        case 0x6b:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x6c:
+            dev->pci_conf[addr] = val & 0x02;
+            break;
+
+        case 0x6e: /* Software-Controlled Interrupt Request, Channels 7-0 */
+            old = dev->pci_conf[addr];
+            picint((val ^ old) & val);
+            picintc((val ^ old) & ~val);
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x6f: /* Software-Controlled Interrupt Request, channels 15-8 */
+            old = dev->pci_conf[addr];
+            picint(((val ^ old) & val) << 8);
+            picintc(((val ^ old) & ~val) << 8);
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x70:
+            dev->pci_conf[addr] = (dev->pci_conf[addr] & 0x02) | (val & 0xdc);
+            break;
+
+        case 0x71: /* Type-F DMA Control Register */
+            dev->pci_conf[addr] = val & 0xef;
+            break;
+
+        case 0x72: /* SMI Triggered By IRQ/GPIO Control */
+        case 0x73: /* SMI Triggered By IRQ/GPIO Control */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x74: /* System Standby Timer Reload,
+                      System Standby State Exit And Throttling State Exit Control */
+        case 0x75: /* System Standby Timer Reload,
+                      System Standby State Exit And Throttling State Exit Control */
+        case 0x76: /* Monitor Standby Timer Reload And Monitor Standby State ExitControl */
+        case 0x77: /* Monitor Standby Timer Reload And Monitor Standby State ExitControl */
+            dev->pci_conf[addr] = val;
+            break;
+
+        default:
+            break;
+    }
+}
+
+static void
+sis_5513_11_pci_to_isa_write(int addr, uint8_t val, sis_5513_pci_to_isa_t *dev)
+{
+    uint8_t old;
+
+    switch (addr) {
+        case 0x61: /* IDEIRQ Remapping Control Register */
+            sis_5513_pci_to_isa_log("Set MIRQ routing: IDEIRQ -> %02X\n", val);
+            dev->pci_conf[addr] = val & 0xcf;
+            dev->sis->ide_bits_1_3_writable = !!(val & 0x40);
+            if (val & 0x80)
+                pci_set_mirq_routing(PCI_MIRQ2, PCI_IRQ_DISABLED);
+            else
+                pci_set_mirq_routing(PCI_MIRQ2, val & 0xf);
+            break;
+
+        case 0x62: /* USBIRQ Remapping Control Register */
+            sis_5513_pci_to_isa_log("Set MIRQ routing: USBIRQ -> %02X\n", val);
+            dev->pci_conf[addr] = val;
+            dev->sis->usb_enabled = !!(val & 0x40);
+            if (val & 0x80)
+                 pci_set_mirq_routing(PCI_MIRQ3, PCI_IRQ_DISABLED);
+            else
+                pci_set_mirq_routing(PCI_MIRQ3, val & 0xf);
+            break;
+
+        case 0x63: /* GPCS0 Control Register */
+        case 0x64: /* GPCS1 Control Register */
+        case 0x65: /* GPCS0 Output Mode Control Register */
+        case 0x66: /* GPCS0 Output Mode Control Register */
+        case 0x67: /* GPCS1 Output Mode Control Register */
+        case 0x68: /* GPCS1 Output Mode Control Register */
+        case 0x6b:
+        case 0x6c:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x69: /* GPCS0/1 De-Bounce Control Register */
+            dev->pci_conf[addr] = val & 0xdf;
+            if ((dev->apc_regs[0x03] & 0x40) && (val & 0x10)) {
+                plat_power_off();
+                return;
+            }
+            break;
+
+        case 0x6a: /* ACPI/SCI IRQ Remapping Control Register */
+            sis_5513_pci_to_isa_log("Set MIRQ routing: ACPI/SCI IRQ -> %02X\n", val);
+            dev->pci_conf[addr] = val;
+            if (val & 0x80)
+                 pci_set_mirq_routing(PCI_MIRQ5, PCI_IRQ_DISABLED);
+            else
+                pci_set_mirq_routing(PCI_MIRQ5, val & 0xf);
+            break;
+
+        case 0x6d: /* I2C Bus Control Register */
+            dev->pci_conf[addr] = val;
+            /* TODO: Keyboard/mouse swapping and keyboard hot key. */
+            break;
+
+        case 0x6e: /* Software-Controlled Interrupt Request, Channels 7-0 */
+            old = dev->pci_conf[addr];
+            picint((val ^ old) & val);
+            picintc((val ^ old) & ~val);
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x6f: /* Software-Controlled Interrupt Request, channels 15-8 */
+            old = dev->pci_conf[addr];
+            picint(((val ^ old) & val) << 8);
+            picintc(((val ^ old) & ~val) << 8);
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x70: /* Misc. Controller Register */
+            dev->pci_conf[addr] = val;
+            /* TODO: Keyboard Lock Enable/Disable. */
+            break;
+
+        case 0x71: /* Type F DMA Control Register */
+            dev->pci_conf[addr] = val & 0xef;
+            break;
+
+        case 0x72: /* SMI Triggered By IRQ Control */
+            dev->pci_conf[addr] = val & 0xfa;
+            break;
+        case 0x73: /* SMI Triggered By IRQ Control */
+        case 0x75: /* System Standby Timer Reload, System Standby State Exit And Throttling State Exit */
+        case 0x77: /* Monoitor Standby Timer Reload And Monoitor Standby State Exit Control */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x74: /* System Standby Timer Reload, System Standby State Exit And Throttling State Exit */
+        case 0x76: /* Monoitor Standby Timer Reload And Monoitor Standby State Exit Control */
+            dev->pci_conf[addr] = val & 0xfb;
+            break;
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x80: /* Distributed DMA Master Configuration Register */
+        case 0x81: /* Distributed DMA Master Configuration Register */
+            dev->pci_conf[addr] = val;
+            sis_5595_ddma_recalc(dev);
+            break;
+
+        case 0x84: /* Individual Distributed DMA Channel Enable */
+            dev->pci_conf[addr] = val;
+            sis_5595_ddma_recalc(dev);
+            break;
+
+        case 0x88: /* Serial Interrupt Control Register */
+        case 0x89: /* Serial Interrupt Enable Register 1 */
+        case 0x8a: /* Serial Interrupt Enable Register 2 */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x90: /* ACPI Base Address Register */
+            dev->pci_conf[addr] = val & 0xc0;
+            sis_5595_acpi_recalc(dev);
+            break;
+        case 0x91: /* ACPI Base Address Register */
+            dev->pci_conf[addr] = val;
+            sis_5595_acpi_recalc(dev);
+            break;
+
+        default:
+            break;
+    }
+}
+
+static void
+sis_5513_b0_pci_to_isa_write(int addr, uint8_t val, sis_5513_pci_to_isa_t *dev)
+{
+    uint8_t old;
+
+    switch (addr) {
+        case 0x61: /* IDEIRQ Remapping Control Register */
+            sis_5513_pci_to_isa_log("Set MIRQ routing: IDEIRQ -> %02X\n", val);
+            dev->pci_conf[addr] = val & 0xdf;
+            sff_set_mirq(dev->sis->bm[0], (val & 0x10) ? 7 : 2);
+            sff_set_mirq(dev->sis->bm[1], (val & 0x10) ? 2 : 7);
+            pci_set_mirq_routing(PCI_MIRQ7, 14 + (!!(val & 0x10)));
+            if (val & 0x80)
+                pci_set_mirq_routing(PCI_MIRQ2, PCI_IRQ_DISABLED);
+            else
+                pci_set_mirq_routing(PCI_MIRQ2, val & 0xf);
+            break;
+
+        case 0x62: /* USBIRQ Remapping Control Register */
+            sis_5513_pci_to_isa_log("Set MIRQ routing: USBIRQ -> %02X\n", val);
+            dev->pci_conf[addr] = val;
+            dev->sis->usb_enabled = !!(val & 0x40);
+            if (val & 0x80)
+                 pci_set_mirq_routing(PCI_MIRQ3, PCI_IRQ_DISABLED);
+            else
+                 pci_set_mirq_routing(PCI_MIRQ3, val & 0xf);
+            break;
+
+        case 0x63: /* PCI OutputBuffer Current Strength Register */
+            dev->pci_conf[addr] = val;
+            if ((dev->apc_regs[0x03] & 0x40) && (val & 0x04)) {
+                plat_power_off();
+                return;
+            }
+            if ((val & 0x18) == 0x18) {
+                dma_reset();
+                dma_set_at(1);
+
+                device_reset_all(DEVICE_ALL);
+
+                cpu_alt_reset = 0;
+
+                pci_reset();
+
+                mem_a20_alt = 0;
+                mem_a20_recalc();
+
+                flushmmucache();
+
+                resetx86();
+            }
+            break;
+
+        case 0x64: /* INIT Enable Register */
+            dev->pci_conf[addr] = val;
+            cpu_cpurst_on_sr = !(val & 0x20);
+            break;
+
+        case 0x65: /* PHOLD# Timer */
+        case 0x66: /* Priority Timer */
+        case 0x67: /* Respond to C/D Segments Register */
+        case 0x6b: /* Test Mode Register I */
+        case 0x6c: /* Test Mode Register II */
+        case 0x71: /* Reserved */
+        case 0x72: /* Individual PC/PCI DMA Channel Enable */
+        case 0x7c: /* Data Acquisition Module ADC Calibration */
+        case 0x7d: /* Data Acquisition Module ADC Calibration */
+        case 0x88: /* Serial Interrupt Control Register */
+        case 0x89: /* Serial Interrupt Enable Register 1 */
+        case 0x8a: /* Serial Interrupt Enable Register 2 */
+        case 0x8c: /* Serial Interrupt Enable Register 3 */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x68: /* Data Acquistion Module Base Address */
+            dev->pci_conf[addr] = val & 0xf8;
+            sis_5595_dam_recalc(dev);
+            break;
+
+        case 0x6a: /* ACPI/SCI IRQ Remapping Control Register */
+            sis_5513_pci_to_isa_log("Set MIRQ routing: ACPI/SCI IRQ -> %02X\n", val);
+            dev->pci_conf[addr] = val & 0x8f;
+            if (val & 0x80)
+                 pci_set_mirq_routing(PCI_MIRQ5, PCI_IRQ_DISABLED);
+            else
+                pci_set_mirq_routing(PCI_MIRQ5, val & 0xf);
+            break;
+
+        case 0x6d: /* I2C Bus Control Register */
+            dev->pci_conf[addr] = val;
+            /* TODO: Keyboard/mouse swapping and keyboard hot key. */
+            break;
+
+        case 0x6e: /* Software-Controlled Interrupt Request, Channels 7-0 */
+            old = dev->pci_conf[addr];
+            picint((val ^ old) & val);
+            picintc((val ^ old) & ~val);
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x6f: /* Software-Controlled Interrupt Request, channels 15-8 */
+            old = dev->pci_conf[addr];
+            picint(((val ^ old) & val) << 8);
+            picintc(((val ^ old) & ~val) << 8);
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x70: /* Misc. Controller Register */
+            dev->pci_conf[addr] = val;
+            /* TODO: Keyboard Lock Enable/Disable. */
+            break;
+
+        case 0x73:
+        case 0x75 ... 0x79:
+            if (dev->rev == 0x81)
+                dev->pci_conf[addr] = val;
+            break;
+
+        case 0x7a: /* Data Acquisition Module Function Selection Register */
+            if (dev->rev == 0x81)
+                dev->pci_conf[addr] = val;
+            else
+                dev->pci_conf[addr] = val & 0x90;
+            break;
+
+        case 0x7b: /* Data Acquisition Module Control Register */
+            dev->pci_conf[addr] = val;
+            sis_5595_dam_recalc(dev);
+            break;
+
+        case 0x7e: /* Data Acquisition Module and SMBUS IRQ Remapping Control Register */
+            sis_5513_pci_to_isa_log("Set MIRQ routing: DAM/SMBUS IRQ -> %02X\n", val);
+            if (dev->rev == 0x81)
+                dev->pci_conf[addr] = val & 0x8f;
+            else {
+                dev->pci_conf[addr] = (dev->pci_conf[addr] & 0x10) | (val & 0xef);
+
+                dev->dam_irq_enable = ((val & 0xc0) == 0x40);
+                smbus_sis5595_irq_enable(dev->smbus, (val & 0xa0) == 0x20);
+            }
+            if (val & 0x80)
+                 pci_set_mirq_routing(PCI_MIRQ6, PCI_IRQ_DISABLED);
+            else
+                pci_set_mirq_routing(PCI_MIRQ6, val & 0xf);
+            break;
+
+        case 0x80: /* Distributed DMA Master Configuration Register */
+        case 0x81: /* Distributed DMA Master Configuration Register */
+            dev->pci_conf[addr] = val;
+            sis_5595_ddma_recalc(dev);
+            break;
+
+        case 0x84: /* Individual Distributed DMA Channel Enable */
+            dev->pci_conf[addr] = val;
+            sis_5595_ddma_recalc(dev);
+            break;
+
+        case 0x90: /* ACPI Base Address Register */
+            dev->pci_conf[addr] = val & 0xc0;
+            sis_5595_acpi_recalc(dev);
+            break;
+        case 0x91: /* ACPI Base Address Register */
+            dev->pci_conf[addr] = val;
+            sis_5595_acpi_recalc(dev);
+            break;
+
+        default:
+            break;
+    }
+}
+
+void
+sis_5513_pci_to_isa_write(int addr, uint8_t val, void *priv)
+{
+    sis_5513_pci_to_isa_t *dev = (sis_5513_pci_to_isa_t *) priv;
+
+    sis_5513_pci_to_isa_log("SiS 5513 P2I: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
+
+    switch (addr) {
+        case 0x04: /* Command */
+            dev->pci_conf[addr] = val & 0x0f;
+            break;
+
+        case 0x07: /* Status */
+            dev->pci_conf[addr] = (dev->pci_conf[addr] & 0x06) & ~(val & 0x30);
+            break;
+
+        case 0x0d: /* Master Latency Timer */
+            if (dev->rev >= 0x11)
+                dev->pci_conf[addr] = val;
+            break;
+
+        case 0x40: /* BIOS Control Register */
+            if (dev->rev >= 0x11) {
+                dev->pci_conf[addr] = val;
+                sis_5595_acpi_recalc(dev);
+            } else
+                dev->pci_conf[addr] = val & 0x3f;
+            break;
+
+        case 0x41: /* INTA# Remapping Control Register */
+        case 0x42: /* INTB# Remapping Control Register */
+        case 0x43: /* INTC# Remapping Control Register */
+            dev->pci_conf[addr] = val & 0x8f;
+            pci_set_irq_routing(addr & 0x07, (val & 0x80) ? PCI_IRQ_DISABLED : (val & 0x0f));
+            break;
+        case 0x44: /* INTD# Remapping Control Register */
+            if (dev->rev == 0x11) {
+                dev->pci_conf[addr] = val & 0xcf;
+                sis_5513_apc_recalc(dev, val & 0x10);
+            } else
+                dev->pci_conf[addr] = val & 0x8f;
+            pci_set_irq_routing(addr & 0x07, (val & 0x80) ? PCI_IRQ_DISABLED : (val & 0x0f));
+            break;
+
+        case 0x45: /* ISA Bus Control Register I */
+            if (dev->rev >= 0x01) {
+                if (dev->rev == 0x01)
+                    dev->pci_conf[addr] = val & 0xec;
+                else
+                    dev->pci_conf[addr] = val;
+                switch (val >> 6) {
+                    case 0:
+                        cpu_set_isa_speed(7159091);
+                        break;
+                    case 1:
+                        cpu_set_isa_pci_div(4);
+                        break;
+                    case 2:
+                        cpu_set_isa_pci_div(3);
+                        break;
+
+                    default:
+                        break;
+                }
+                nvr_bank_set(0, !!(val & 0x08), dev->nvr);
+                if (dev->rev == 0xb0)
+                    sis_5513_apc_recalc(dev, val & 0x02);
+            }
+            break;
+        case 0x46: /* ISA Bus Control Register II */
+            if (dev->rev >= 0x11)
+                dev->pci_conf[addr] = val;
+            else if (dev->rev == 0x00)
+                dev->pci_conf[addr] = val & 0xec;
+            break;
+        case 0x47: /* DMA Clock and Wait State Control Register */
+            switch (dev->rev) {
+                case 0x01:
+                    dev->pci_conf[addr] = val & 0x3e;
+                    break;
+                case 0x11:
+                    dev->pci_conf[addr] = val & 0x7f;
+                    break;
+                case 0xb0:
+                    dev->pci_conf[addr] = val & 0xfd;
+                    break;
+            }
+            break;
+
+        case 0x48: /* ISA Master/DMA Memory Cycle Control Register 1 */
+        case 0x49: /* ISA Master/DMA Memory Cycle Control Register 2 */
+        case 0x4a: /* ISA Master/DMA Memory Cycle Control Register 3 */
+        case 0x4b: /* ISA Master/DMA Memory Cycle Control Register 4 */
+            dev->pci_conf[addr] = val;
+            break;
+
+        default:
+            switch (dev->rev) {
+                case 0x00:
+                    sis_5513_00_pci_to_isa_write(addr, val, priv);
+                    break;
+                case 0x01:
+                    sis_5513_01_pci_to_isa_write(addr, val, priv);
+                    break;
+                case 0x11:
+                    sis_5513_11_pci_to_isa_write(addr, val, priv);
+                    break;
+                case 0x81:
+                case 0xb0:
+                    sis_5513_b0_pci_to_isa_write(addr, val, priv);
+                    break;
+            }
+            break;
+    }
+}
+
+uint8_t
+sis_5513_pci_to_isa_read(int addr, void *priv)
+{
+    const sis_5513_pci_to_isa_t *dev = (sis_5513_pci_to_isa_t *) priv;
+    uint8_t ret = 0xff;
+
+    switch (addr) {
+        default:
+            ret = dev->pci_conf[addr];
+            break;
+        case 0x4c ... 0x4f:
+            ret = pic_read_icw(0, addr & 0x03);
+            break;
+        case 0x50 ... 0x53:
+            ret = pic_read_icw(1, addr & 0x03);
+            break;
+        case 0x54 ... 0x55:
+            ret = pic_read_ocw(0, addr & 0x01);
+            break;
+        case 0x56 ... 0x57:
+            ret = pic_read_ocw(1, addr & 0x01);
+            break;
+        case 0x58 ... 0x5f:
+            ret = dev->pit_read_reg(dev->pit, addr & 0x07);
+            break;
+        case 0x60:
+            if (dev->rev >= 0x01)
+                ret = inb(0x0070);
+            else
+                ret = dev->pci_conf[addr];
+            break;
+    }
+
+    sis_5513_pci_to_isa_log("SiS 5513 P2I: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
+
+    return ret;
+}
+
+static void
+sis_5513_isa_write(uint16_t addr, uint8_t val, void *priv)
+{
+    sis_5513_pci_to_isa_t *dev = (sis_5513_pci_to_isa_t *) priv;
+
+    switch (addr) {
+        case 0x22:
+            dev->index = val - 0x50;
+            break;
+        case 0x23:
+            sis_5513_pci_to_isa_log("SiS 5513 ISA: [W] dev->regs[%02X] = %02X\n", dev->index + 0x50, val);
+
+            switch (dev->index) {
+                case 0x00:
+                    dev->regs[dev->index] = val & 0xed;
+                    switch (val >> 6) {
+                        case 0:
+                            cpu_set_isa_speed(7159091);
+                            break;
+                        case 1:
+                            cpu_set_isa_pci_div(4);
+                            break;
+                        case 2:
+                            cpu_set_isa_pci_div(3);
+                            break;
+
+                        default:
+                            break;
+                    }
+                    nvr_bank_set(0, !!(val & 0x08), dev->nvr);
+                    break;
+                case 0x01:
+                    dev->regs[dev->index] = val & 0xf4;
+                    break;
+                case 0x03:
+                    dev->regs[dev->index] = val & 3;
+                    break;
+                case 0x04: /* BIOS Register */
+                    dev->regs[dev->index] = val;
+                    break;
+                case 0x05:
+                    dev->regs[dev->index] = val;
+                    outb(0x70, val);
+                    break;
+                case 0x08:
+                case 0x09:
+                case 0x0a:
+                case 0x0b:
+                    dev->regs[dev->index] = val;
+                    break;
+
+                default:
+                    break;
+            }
+            break;
+
+        default:
+            break;
+    }
+}
+
+static uint8_t
+sis_5513_isa_read(uint16_t addr, void *priv)
+{
+    const sis_5513_pci_to_isa_t *dev = (sis_5513_pci_to_isa_t *) priv;
+    uint8_t ret = 0xff;
+
+    if (addr == 0x23) {
+        if (dev->index == 0x05)
+            ret = inb(0x70);
+        else
+            ret = dev->regs[dev->index];
+
+        sis_5513_pci_to_isa_log("SiS 5513 ISA: [R] dev->regs[%02X] = %02X\n", dev->index + 0x50, ret);
+    }
+
+    return ret;
+}
+
+static void
+sis_5513_00_pci_to_isa_reset(sis_5513_pci_to_isa_t *dev)
+{
+    dev->pci_conf[0x60] = dev->pci_conf[0x61] = 0x80;
+    dev->pci_conf[0x62] = 0x00;
+    dev->pci_conf[0x63] = 0x80;
+    dev->pci_conf[0x64] = 0x00;
+    dev->pci_conf[0x65] = 0x00;
+    dev->pci_conf[0x66] = dev->pci_conf[0x67] = 0x00;
+    dev->pci_conf[0x68] = dev->pci_conf[0x69] = 0x00;
+    dev->pci_conf[0x6a] = 0x04;
+
+    pci_set_mirq_routing(PCI_MIRQ0, PCI_IRQ_DISABLED);
+    pci_set_mirq_routing(PCI_MIRQ1, PCI_IRQ_DISABLED);
+
+    dev->regs[0x00] = dev->regs[0x01] = 0x00;
+    dev->regs[0x03] = dev->regs[0x04] = 0x00;
+    dev->regs[0x05] = 0x00;
+    dev->regs[0x08] = dev->regs[0x09] = 0x00;
+    dev->regs[0x0a] = dev->regs[0x0b] = 0x00;
+}
+
+static void
+sis_5513_01_pci_to_isa_reset(sis_5513_pci_to_isa_t *dev)
+{
+    dev->pci_conf[0x45] = dev->pci_conf[0x46] = 0x00;
+    dev->pci_conf[0x47] = 0x00;
+
+    dev->pci_conf[0x61] = 0x80;
+    dev->pci_conf[0x62] = 0x00;
+    dev->pci_conf[0x63] = 0x80;
+    dev->pci_conf[0x64] = dev->pci_conf[0x65] = 0x00;
+    dev->pci_conf[0x66] = dev->pci_conf[0x67] = 0x00;
+    dev->pci_conf[0x68] = 0x80;
+    dev->pci_conf[0x69] = dev->pci_conf[0x6a] = 0x00;
+    dev->pci_conf[0x6b] = 0x00;
+    dev->pci_conf[0x6c] = 0x02;
+    dev->pci_conf[0x6d] = 0x00;
+    dev->pci_conf[0x6e] = dev->pci_conf[0x6f] = 0x00;
+    dev->pci_conf[0x70] = dev->pci_conf[0x71] = 0x00;
+    dev->pci_conf[0x72] = dev->pci_conf[0x73] = 0x00;
+    dev->pci_conf[0x74] = dev->pci_conf[0x75] = 0x00;
+    dev->pci_conf[0x76] = dev->pci_conf[0x77] = 0x00;
+
+    pci_set_mirq_routing(PCI_MIRQ1, PCI_IRQ_DISABLED);
+    pci_set_mirq_routing(PCI_MIRQ3, PCI_IRQ_DISABLED);
+}
+
+static void
+sis_5513_11_pci_to_isa_reset(sis_5513_pci_to_isa_t *dev)
+{
+    dev->pci_conf[0x45] = dev->pci_conf[0x46] = 0x00;
+    dev->pci_conf[0x47] = 0x00;
+
+    dev->pci_conf[0x61] = dev->pci_conf[0x62] = 0x80;
+    dev->pci_conf[0x63] = dev->pci_conf[0x64] = 0x00;
+    dev->pci_conf[0x65] = dev->pci_conf[0x66] = 0x00;
+    dev->pci_conf[0x67] = dev->pci_conf[0x68] = 0x00;
+    dev->pci_conf[0x69] = 0x01;
+    dev->pci_conf[0x6a] = 0x80;
+    dev->pci_conf[0x6b] = 0x00;
+    dev->pci_conf[0x6c] = 0x20;
+    dev->pci_conf[0x6d] = 0x19;
+    dev->pci_conf[0x6e] = dev->pci_conf[0x6f] = 0x00;
+    dev->pci_conf[0x70] = 0x12;
+    dev->pci_conf[0x71] = dev->pci_conf[0x72] = 0x00;
+    dev->pci_conf[0x73] = dev->pci_conf[0x74] = 0x00;
+    dev->pci_conf[0x75] = dev->pci_conf[0x76] = 0x00;
+    dev->pci_conf[0x77] = 0x00;
+    dev->pci_conf[0x80] = dev->pci_conf[0x81] = 0x00;
+    dev->pci_conf[0x84] = dev->pci_conf[0x88] = 0x00;
+    dev->pci_conf[0x89] = dev->pci_conf[0x8a] = 0x00;
+    dev->pci_conf[0x90] = dev->pci_conf[0x91] = 0x00;
+
+    pci_set_mirq_routing(PCI_MIRQ3, PCI_IRQ_DISABLED);
+    pci_set_mirq_routing(PCI_MIRQ5, PCI_IRQ_DISABLED);
+
+    picint_common(0xffff, 0, 0, NULL);
+
+    sis_5595_ddma_recalc(dev);
+    sis_5595_acpi_recalc(dev);
+
+    dev->sis->ide_bits_1_3_writable = 0;
+    dev->sis->usb_enabled = 0;
+
+    sis_5513_apc_recalc(dev, 0);
+}
+
+static void
+sis_5513_b0_pci_to_isa_reset(sis_5513_pci_to_isa_t *dev)
+{
+    dev->pci_conf[0x45] = dev->pci_conf[0x46] = 0x00;
+    dev->pci_conf[0x47] = 0x00;
+
+    dev->pci_conf[0x61] = dev->pci_conf[0x62] = 0x80;
+    dev->pci_conf[0x63] = dev->pci_conf[0x64] = 0x00;
+    dev->pci_conf[0x65] = 0x01;
+    dev->pci_conf[0x66] = dev->pci_conf[0x67] = 0x00;
+    dev->pci_conf[0x68] = 0x90;
+    dev->pci_conf[0x69] = 0x02;
+    dev->pci_conf[0x6a] = 0x80;
+    dev->pci_conf[0x6b] = 0x00;
+    dev->pci_conf[0x6c] = 0x20;
+    dev->pci_conf[0x6d] = 0x19;
+    dev->pci_conf[0x6e] = dev->pci_conf[0x6f] = 0x00;
+    dev->pci_conf[0x70] = 0x12;
+    dev->pci_conf[0x71] = dev->pci_conf[0x72] = 0x00;
+    dev->pci_conf[0x7a] = dev->pci_conf[0x7b] = 0x00;
+    dev->pci_conf[0x7c] = dev->pci_conf[0x7d] = 0x00;
+    dev->pci_conf[0x7e] = 0x80;
+    dev->pci_conf[0x80] = dev->pci_conf[0x81] = 0x00;
+    dev->pci_conf[0x84] = dev->pci_conf[0x88] = 0x00;
+    dev->pci_conf[0x89] = dev->pci_conf[0x8a] = 0x00;
+    dev->pci_conf[0x8b] = dev->pci_conf[0x8c] = 0x00;
+    dev->pci_conf[0x90] = dev->pci_conf[0x91] = 0x00;
+
+    pci_set_mirq_routing(PCI_MIRQ3, PCI_IRQ_DISABLED);
+    pci_set_mirq_routing(PCI_MIRQ5, PCI_IRQ_DISABLED);
+    pci_set_mirq_routing(PCI_MIRQ6, PCI_IRQ_DISABLED);
+    pci_set_mirq_routing(PCI_MIRQ7, 15);
+
+    sff_set_mirq(dev->sis->bm[0], 2);
+    sff_set_mirq(dev->sis->bm[1], 7);
+
+    picint_common(0xffff, 0, 0, NULL);
+
+    sis_5595_ddma_recalc(dev);
+    sis_5595_acpi_recalc(dev);
+
+    /* SiS 5595 Data Acquisition Module */
+    sis_5595_dam_recalc(dev);
+    sis_5595_dam_reset(dev);
+
+    dev->dam_irq_enable = 0;
+
+    cpu_cpurst_on_sr = 1;
+
+    dev->sis->usb_enabled = 0;
+
+    sis_5513_apc_recalc(dev, 0);
+
+    if (dev->rev == 0x81)
+        dev->dam_irq_enable = 1;
+}
+
+static void
+sis_5513_pci_to_isa_reset(void *priv)
+{
+    sis_5513_pci_to_isa_t *dev = (sis_5513_pci_to_isa_t *) priv;
+
+    dev->pci_conf[0x00] = 0x39;
+    dev->pci_conf[0x01] = 0x10;
+    dev->pci_conf[0x02] = 0x08;
+    dev->pci_conf[0x03] = 0x00;
+    dev->pci_conf[0x04] = 0x07;
+    dev->pci_conf[0x05] = dev->pci_conf[0x06] = 0x00;
+    dev->pci_conf[0x07] = 0x02;
+    if ((dev->rev == 0x11) || (dev->rev == 0x81))
+        dev->pci_conf[0x08] = 0x01;
+    else
+        dev->pci_conf[0x08] = dev->rev;
+    dev->pci_conf[0x09] = 0x00;
+    dev->pci_conf[0x0a] = 0x01;
+    dev->pci_conf[0x0b] = 0x06;
+    dev->pci_conf[0x0e] = 0x80;
+    dev->pci_conf[0x40] = 0x00;
+    dev->pci_conf[0x41] = dev->pci_conf[0x42] = 0x80;
+    dev->pci_conf[0x43] = dev->pci_conf[0x44] = 0x80;
+    dev->pci_conf[0x48] = dev->pci_conf[0x49] = 0x00;
+    dev->pci_conf[0x4a] = dev->pci_conf[0x4b] = 0x00;
+
+    switch (dev->rev) {
+        case 0x00:
+            sis_5513_00_pci_to_isa_reset(dev);
+            break;
+        case 0x01:
+            sis_5513_01_pci_to_isa_reset(dev);
+            break;
+        case 0x11:
+            sis_5513_11_pci_to_isa_reset(dev);
+            break;
+        case 0x81:
+        case 0xb0:
+            sis_5513_b0_pci_to_isa_reset(dev);
+            break;
+    }
+
+    pci_set_irq_routing(PCI_INTA, PCI_IRQ_DISABLED);
+    pci_set_irq_routing(PCI_INTB, PCI_IRQ_DISABLED);
+    pci_set_irq_routing(PCI_INTC, PCI_IRQ_DISABLED);
+    pci_set_irq_routing(PCI_INTD, PCI_IRQ_DISABLED);
+
+    pci_set_mirq_routing(PCI_MIRQ2, PCI_IRQ_DISABLED);
+
+    cpu_set_isa_speed(7159091);
+    nvr_bank_set(0, 0, dev->nvr);
+}
+
+static void
+sis_5513_pci_to_isa_close(void *priv)
+{
+    sis_5513_pci_to_isa_t *dev = (sis_5513_pci_to_isa_t *) priv;
+    FILE      *fp  = NULL;
+
+    if (dev->fn != NULL)
+        fp = nvr_fopen(dev->fn, "wb");
+
+    if (fp != NULL) {
+        (void) fwrite(dev->apc_regs, 256, 1, fp);
+        fclose(fp);
+    }
+
+    if (dev->fn != NULL)
+        free(dev->fn);
+
+    free(dev);
+}
+
+static void *
+sis_5513_pci_to_isa_init(UNUSED(const device_t *info))
+{
+    sis_5513_pci_to_isa_t *dev = (sis_5513_pci_to_isa_t *) calloc(1, sizeof(sis_5513_pci_to_isa_t));
+    uint8_t pit_is_fast = (((pit_mode == -1) && is486) || (pit_mode == 1));
+    FILE      *fp = NULL;
+    int        c;
+
+    dev->rev = info->local;
+
+    dev->sis = device_get_common_priv();
+
+    /* IDEIRQ */
+    pci_enable_mirq(2);
+
+    /* Port 92h */
+    dev->port_92 = device_add(&port_92_device);
+
+    /* PIT */
+    dev->pit = device_find_first_priv(DEVICE_PIT);
+    dev->pit_read_reg = pit_is_fast ? pitf_read_reg : pit_read_reg;
+
+    /* NVR */
+    dev->nvr = device_add(&at_mb_nvr_device);
+
+    switch (dev->rev) {
+        case 0x00:
+            /* MIRQ */
+            pci_enable_mirq(0);
+            pci_enable_mirq(1);
+
+            /* Ports 22h-23h: SiS 5513 ISA */
+            io_sethandler(0x0022, 0x0002,
+                          sis_5513_isa_read, NULL, NULL, sis_5513_isa_write, NULL, NULL, dev);
+            break;
+        case 0x01:
+            /* MIRQ */
+            pci_enable_mirq(1);
+            break;
+        case 0x11:
+        case 0x81:
+        case 0xb0:
+            /* USBIRQ */
+            pci_enable_mirq(3);
+
+            /* ACPI/SCI IRQ */
+            pci_enable_mirq(5);
+  
+            if (dev->rev == 0xb0) {
+                /* Data Acquisition Module and SMBUS IRQ */
+                pci_enable_mirq(6);
+
+                /* Non-remapped native IDE IRQ */
+                pci_enable_mirq(7);
+            }
+  
+            dev->ddma = device_add(&ddma_device);
+
+            switch (dev->rev) {
+                case 0x11:
+                    dev->sis->acpi   = device_add(&acpi_sis_5582_device);
+                    break;
+                case 0x81:
+                    dev->sis->acpi   = device_add(&acpi_sis_5595_1997_device);
+                    break;
+                case 0xb0:
+                    dev->sis->acpi   = device_add(&acpi_sis_5595_device);
+                    dev->smbus       = acpi_get_smbus(dev->sis->acpi);
+                    break;
+            }
+
+            dev->sis->acpi->priv = dev->sis;
+            acpi_set_slot(dev->sis->acpi, dev->sis->sb_pci_slot);
+            acpi_set_nvr(dev->sis->acpi, dev->nvr);
+
+            /* Set up the NVR file's name. */
+            c       = strlen(machine_get_nvr_name()) + 9;
+            dev->fn = (char *) malloc(c + 1);
+            sprintf(dev->fn, "%s_apc.nvr", machine_get_nvr_name());
+
+            fp = nvr_fopen(dev->fn, "rb");
+
+            memset(dev->apc_regs, 0x00, sizeof(dev->apc_regs));
+            sis_5513_apc_reset(dev);
+            if (fp != NULL) {
+                if (fread(dev->apc_regs, 1, 256, fp) != 256)
+                    fatal("sis_5513_pci_to_isa_init(): Error reading APC data\n");
+                fclose(fp);
+            }
+
+            acpi_set_irq_mode(dev->sis->acpi, 2);
+            break;
+    }
+
+    sis_5513_pci_to_isa_reset(dev);
+
+    return dev;
+}
+
+const device_t sis_5513_p2i_device = {
+    .name          = "SiS 5513 PCI to ISA bridge",
+    .internal_name = "sis_5513_pci_to_isa",
+    .flags         = DEVICE_PCI,
+    .local         = 0x00,
+    .init          = sis_5513_pci_to_isa_init,
+    .close         = sis_5513_pci_to_isa_close,
+    .reset         = sis_5513_pci_to_isa_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t sis_5572_p2i_device = {
+    .name          = "SiS 5572 PCI to ISA bridge",
+    .internal_name = "sis_5572_pci_to_isa",
+    .flags         = DEVICE_PCI,
+    .local         = 0x01,
+    .init          = sis_5513_pci_to_isa_init,
+    .close         = sis_5513_pci_to_isa_close,
+    .reset         = sis_5513_pci_to_isa_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t sis_5582_p2i_device = {
+    .name          = "SiS 5582 PCI to ISA bridge",
+    .internal_name = "sis_5582_pci_to_isa",
+    .flags         = DEVICE_PCI,
+    .local         = 0x11,    /* Actually, 0x01, but we need to somehow distinguish it
+                                 from SiS 5572 and SiS 5595 1997, which are also revision 0x01. */
+    .init          = sis_5513_pci_to_isa_init,
+    .close         = sis_5513_pci_to_isa_close,
+    .reset         = sis_5513_pci_to_isa_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t sis_5595_1997_p2i_device = {
+    .name          = "SiS 5595 (1997) PCI to ISA bridge",
+    .internal_name = "sis_5595_1997_pci_to_isa",
+    .flags         = DEVICE_PCI,
+    .local         = 0x81,    /* Actually, 0x01, but we need to somehow distinguish it
+                                 from SiS 5572 and SiS 5582, which are also revision 0x01. */
+    .init          = sis_5513_pci_to_isa_init,
+    .close         = sis_5513_pci_to_isa_close,
+    .reset         = sis_5513_pci_to_isa_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t sis_5595_p2i_device = {
+    .name          = "SiS 5595 PCI to ISA bridge",
+    .internal_name = "sis_5595_pci_to_isa",
+    .flags         = DEVICE_PCI,
+    .local         = 0xb0,
+    .init          = sis_5513_pci_to_isa_init,
+    .close         = sis_5513_pci_to_isa_close,
+    .reset         = sis_5513_pci_to_isa_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/sis_5571.c b/src/chipset/sis_5571.c
index 007a96178..02e86a98a 100644
--- a/src/chipset/sis_5571.c
+++ b/src/chipset/sis_5571.c
@@ -6,11 +6,11 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          Implementation of the SiS 5571 Pentium PCI/ISA Chipset.
+ *          Implementation of the SiS 5571/5572 Pentium PCI/ISA Chipset.
  *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2023-2024 Miran Grca.
+ *          Copyright 2021-2023 Miran Grca.
  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -23,10 +23,11 @@
 #include <86box/device.h>
 #include <86box/io.h>
 #include <86box/timer.h>
-
-// #include <86box/dma.h>
 #include <86box/mem.h>
 #include <86box/nvr.h>
+#include <86box/apm.h>
+#include <86box/acpi.h>
+#include <86box/keyboard.h>
 #include <86box/hdd.h>
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
@@ -40,8 +41,7 @@
 #include <86box/port_92.h>
 #include <86box/smram.h>
 #include <86box/spd.h>
-#include <86box/usb.h>
-
+#include <86box/sis_55xx.h>
 #include <86box/chipset.h>
 
 #ifdef ENABLE_SIS_5571_LOG
@@ -63,1128 +63,90 @@ sis_5571_log(const char *fmt, ...)
 #endif
 
 typedef struct sis_5571_t {
-    uint8_t     index;
-    uint8_t     nb_slot;
-    uint8_t     sb_slot;
-    uint8_t     pad;
+    uint8_t            nb_slot;
+    uint8_t            sb_slot;
 
-    uint8_t     regs[16];
-    uint8_t     states[7];
-    uint8_t     pad0;
+    void              *h2p;
+    void              *p2i;
+    void              *ide;
+    void              *usb;
 
-    uint8_t     usb_unk_regs[8];
-
-    uint8_t     pci_conf[256];
-    uint8_t     pci_conf_sb[3][256];
-
-    uint16_t    usb_unk_base;
-
-    sff8038i_t *bm[2];
-    smram_t    *smram;
-    port_92_t  *port_92;
-    void       *pit;
-    nvr_t      *nvr;
-    usb_t      *usb;
-
-   uint8_t    (*pit_read_reg)(void *priv, uint8_t reg);
+    sis_55xx_common_t *sis;
 } sis_5571_t;
 
 static void
-sis_5571_shadow_recalc(sis_5571_t *dev)
+sis_5571_write(int func, int addr, uint8_t val, void *priv)
 {
-    int      state;
-    uint32_t base;
+    const sis_5571_t *dev = (sis_5571_t *) priv;
 
-    for (uint8_t i = 0x70; i <= 0x76; i++) {
-        if (i == 0x76) {
-            if ((dev->states[i & 0x0f] ^ dev->pci_conf[i]) & 0xa0) {
-                state = (dev->pci_conf[i] & 0x80) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
-                state |= (dev->pci_conf[i] & 0x20) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
-                mem_set_mem_state_both(0xf0000, 0x10000, state);
-                sis_5571_log("000F0000-000FFFFF\n");
-            }
-        } else {
-            base = ((i & 0x07) << 15) + 0xc0000;
+    sis_5571_log("SiS 5571: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
 
-            if ((dev->states[i & 0x0f] ^ dev->pci_conf[i]) & 0xa0) {
-                state = (dev->pci_conf[i] & 0x80) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
-                state |= (dev->pci_conf[i] & 0x20) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
-                mem_set_mem_state_both(base, 0x4000, state);
-                sis_5571_log("%08X-%08X\n", base, base + 0x3fff);
-            }
-
-            if ((dev->states[i & 0x0f] ^ dev->pci_conf[i]) & 0x0a) {
-                state = (dev->pci_conf[i] & 0x08) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
-                state |= (dev->pci_conf[i] & 0x02) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
-                mem_set_mem_state_both(base + 0x4000, 0x4000, state);
-                sis_5571_log("%08X-%08X\n", base + 0x4000, base + 0x7fff);
-            }
-        }
-
-        dev->states[i & 0x0f] = dev->pci_conf[i];
-    }
-
-    flushmmucache_nopc();
-}
-
-static void
-sis_5571_smram_recalc(sis_5571_t *dev)
-{
-    smram_disable_all();
-
-    switch (dev->pci_conf[0xa3] >> 6) {
-        case 0:
-            smram_enable(dev->smram, 0x000e0000, 0x000e0000, 0x8000, dev->pci_conf[0xa3] & 0x10, 1);
-            break;
-        case 1:
-            smram_enable(dev->smram, 0x000e0000, 0x000a0000, 0x8000, dev->pci_conf[0xa3] & 0x10, 1);
-            break;
-        case 2:
-            smram_enable(dev->smram, 0x000e0000, 0x000b0000, 0x8000, dev->pci_conf[0xa3] & 0x10, 1);
-            break;
-        case 3:
-            smram_enable(dev->smram, 0x000a0000, 0x000a0000, 0x10000, dev->pci_conf[0xa3] & 0x10, 1);
-            break;
-
-        default:
-            break;
-    }
-
-    flushmmucache();
-}
-
-static void
-sis_5571_mem_to_pci_reset(sis_5571_t *dev)
-{
-    dev->pci_conf[0x00] = 0x39;
-    dev->pci_conf[0x01] = 0x10;
-    dev->pci_conf[0x02] = 0x71;
-    dev->pci_conf[0x03] = 0x55;
-    dev->pci_conf[0x04] = 0x05;
-    dev->pci_conf[0x05] = 0x00;
-    dev->pci_conf[0x06] = 0x00;
-    dev->pci_conf[0x07] = 0x02;
-    dev->pci_conf[0x08] = 0x00;
-    dev->pci_conf[0x09] = 0x00;
-    dev->pci_conf[0x0a] = 0x00;
-    dev->pci_conf[0x0b] = 0x06;
-    dev->pci_conf[0x0c] = 0x00;
-    dev->pci_conf[0x0d] = 0x00;
-    dev->pci_conf[0x0e] = 0x00;
-    dev->pci_conf[0x0f] = 0x00;
-
-    dev->pci_conf[0x50] = 0x00;
-    dev->pci_conf[0x51] = 0x00;
-    dev->pci_conf[0x52] = 0x00;
-    dev->pci_conf[0x53] = 0x00;
-    dev->pci_conf[0x54] = 0x54;
-    dev->pci_conf[0x55] = 0x54;
-    dev->pci_conf[0x56] = 0x03;
-    dev->pci_conf[0x57] = 0x00;
-    dev->pci_conf[0x58] = 0x00;
-    dev->pci_conf[0x59] = 0x00;
-    dev->pci_conf[0x5a] = 0x00;
-
-    /* Undocumented DRAM bank registers. */
-    dev->pci_conf[0x60] = dev->pci_conf[0x62] = 0x04;
-    dev->pci_conf[0x64] = dev->pci_conf[0x66] = 0x04;
-    dev->pci_conf[0x68] = dev->pci_conf[0x6a] = 0x04;
-    dev->pci_conf[0x61] = dev->pci_conf[0x65] = 0x00;
-    dev->pci_conf[0x63] = dev->pci_conf[0x67] = 0x80;
-    dev->pci_conf[0x69]                       = 0x00;
-    dev->pci_conf[0x6b]                       = 0x80;
-
-    dev->pci_conf[0x70] = 0x00;
-    dev->pci_conf[0x71] = 0x00;
-    dev->pci_conf[0x72] = 0x00;
-    dev->pci_conf[0x73] = 0x00;
-    dev->pci_conf[0x74] = 0x00;
-    dev->pci_conf[0x75] = 0x00;
-    dev->pci_conf[0x76] = 0x00;
-
-    dev->pci_conf[0x77] = 0x00;
-    dev->pci_conf[0x78] = 0x00;
-    dev->pci_conf[0x79] = 0x00;
-    dev->pci_conf[0x7a] = 0x00;
-    dev->pci_conf[0x7b] = 0x00;
-
-    dev->pci_conf[0x80] = 0x00;
-    dev->pci_conf[0x81] = 0x00;
-    dev->pci_conf[0x82] = 0x00;
-    dev->pci_conf[0x83] = 0x00;
-    dev->pci_conf[0x84] = 0x00;
-    dev->pci_conf[0x85] = 0x00;
-    dev->pci_conf[0x86] = 0x00;
-    dev->pci_conf[0x87] = 0x00;
-
-    dev->pci_conf[0x8c] = 0x00;
-    dev->pci_conf[0x8d] = 0x00;
-    dev->pci_conf[0x8e] = 0x00;
-    dev->pci_conf[0x8f] = 0x00;
-
-    dev->pci_conf[0x90] = 0x00;
-    dev->pci_conf[0x91] = 0x00;
-    dev->pci_conf[0x92] = 0x00;
-    dev->pci_conf[0x93] = 0x00;
-    dev->pci_conf[0x93] = 0x00;
-    dev->pci_conf[0x94] = 0x00;
-    dev->pci_conf[0x95] = 0x00;
-    dev->pci_conf[0x96] = 0x00;
-    dev->pci_conf[0x97] = 0x00;
-    dev->pci_conf[0x98] = 0x00;
-    dev->pci_conf[0x99] = 0x00;
-    dev->pci_conf[0x9a] = 0x00;
-    dev->pci_conf[0x9b] = 0x00;
-    dev->pci_conf[0x9c] = 0x00;
-    dev->pci_conf[0x9d] = 0x00;
-    dev->pci_conf[0x9e] = 0xff;
-    dev->pci_conf[0x9f] = 0xff;
-
-    dev->pci_conf[0xa0] = 0xff;
-    dev->pci_conf[0xa1] = 0x00;
-    dev->pci_conf[0xa2] = 0xff;
-    dev->pci_conf[0xa3] = 0x00;
-
-    cpu_cache_ext_enabled = 0;
-    cpu_update_waitstates();
-
-    sis_5571_smram_recalc(dev);
-    sis_5571_shadow_recalc(dev);
-
-    flushmmucache();
-}
-
-static void
-sis_5571_mem_to_pci_write(int func, int addr, uint8_t val, void *priv)
-{
-    sis_5571_t *dev = (sis_5571_t *) priv;
-
-    if (func == 0) {
-        sis_5571_log("SiS 5571 M2P: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
-
-        switch (addr) {
-            case 0x04: /* Command - low byte */
-            case 0x05: /* Command - high byte */
-                dev->pci_conf[addr] = (dev->pci_conf[addr] & 0xfd) | (val & 0x02);
-                break;
-
-            case 0x07: /* Status - High Byte */
-                dev->pci_conf[addr] &= ~(val & 0xb8);
-                break;
-
-            case 0x0d: /* Master latency timer */
-                dev->pci_conf[addr] = val;
-                break;
-
-            case 0x50: /* Host Interface and DRAM arbiter */
-                dev->pci_conf[addr] = val & 0xec;
-                break;
-
-            case 0x51: /* CACHE */
-                dev->pci_conf[addr]   = val;
-                cpu_cache_ext_enabled = !!(val & 0x40);
-                cpu_update_waitstates();
-                break;
-
-            case 0x52:
-                dev->pci_conf[addr] = val & 0xd0;
-                break;
-
-            case 0x53: /* DRAM */
-                dev->pci_conf[addr] = val & 0xfe;
-                break;
-
-            case 0x54: /* FP/EDO */
-                dev->pci_conf[addr] = val;
-                break;
-
-            case 0x55:
-                dev->pci_conf[addr] = val & 0xe0;
-                break;
-
-            case 0x56: /* MDLE delay */
-                dev->pci_conf[addr] = val & 0x07;
-                break;
-
-            case 0x57: /* SDRAM */
-                dev->pci_conf[addr] = val & 0xf8;
-                break;
-
-            case 0x59: /* Buffer strength and current rating  */
-                dev->pci_conf[addr] = val;
-                break;
-
-            case 0x5a:
-                dev->pci_conf[addr] = val & 0x03;
-                break;
-
-            /* Undocumented - DRAM bank registers, the exact layout is currently unknown. */
-            case 0x60 ... 0x6b:
-                dev->pci_conf[addr] = val;
-                break;
-
-            case 0x70 ... 0x75:
-                dev->pci_conf[addr] = val & 0xee;
-                sis_5571_shadow_recalc(dev);
-                break;
-            case 0x76:
-                dev->pci_conf[addr] = val & 0xe8;
-                sis_5571_shadow_recalc(dev);
-                break;
-
-            case 0x77: /* Characteristics of non-cacheable area */
-                dev->pci_conf[addr] = val & 0x0f;
-                break;
-
-            case 0x78: /* Allocation of Non-Cacheable area #1 */
-            case 0x79: /* NCA1REG2 */
-            case 0x7a: /* Allocation of Non-Cacheable area #2 */
-            case 0x7b: /* NCA2REG2 */
-                dev->pci_conf[addr] = val;
-                break;
-
-            case 0x80: /* PCI master characteristics */
-                dev->pci_conf[addr] = val & 0xfe;
-                break;
-
-            case 0x81:
-                dev->pci_conf[addr] = val & 0xcc;
-                break;
-
-            case 0x82:
-                dev->pci_conf[addr] = val;
-                break;
-
-            case 0x83: /* CPU to PCI characteristics */
-                dev->pci_conf[addr] = val;
-                /* TODO: Implement Fast A20 and Fast reset stuff on the KBC already! */
-                break;
-
-            case 0x84 ... 0x86:
-                dev->pci_conf[addr] = val;
-                break;
-
-            case 0x87: /* Miscellanea */
-                dev->pci_conf[addr] = val & 0xf8;
-                break;
-
-            case 0x90: /* PMU control register */
-            case 0x91: /* Address trap for green function */
-            case 0x92:
-                dev->pci_conf[addr] = val;
-                break;
-
-            case 0x93: /* STPCLK# and APM SMI control */
-                dev->pci_conf[addr] = val;
-
-                if ((dev->pci_conf[0x9b] & 0x01) && (val & 0x02)) {
-                    smi_raise();
-                    dev->pci_conf[0x9d] |= 0x01;
-                }
-                break;
-
-            case 0x94: /* 6x86 and Green function control */
-                dev->pci_conf[addr] = val & 0xf8;
-                break;
-
-            case 0x95: /* Test mode control */
-            case 0x96: /* Time slot and Programmable 10-bit I/O port definition */
-                dev->pci_conf[addr] = val & 0xfb;
-                break;
-
-            case 0x97: /* programmable 10-bit I/O port address */
-            case 0x98: /* Programmable 16-bit I/O port */
-            case 0x99 ... 0x9c:
-                dev->pci_conf[addr] = val;
-                break;
-
-            case 0x9d:
-                dev->pci_conf[addr] &= val;
-                break;
-
-            case 0x9e: /* STPCLK# Assertion Timer */
-            case 0x9f: /* STPCLK# De-assertion Timer */
-            case 0xa0 ... 0xa2:
-                dev->pci_conf[addr] = val;
-                break;
-
-            case 0xa3: /* SMRAM access control and Power supply control */
-                dev->pci_conf[addr] = val & 0xd0;
-                sis_5571_smram_recalc(dev);
-                break;
-
-            default:
-                break;
-        }
-    }
+    if (func == 0x00)
+        sis_5571_host_to_pci_write(addr, val, dev->h2p);
 }
 
 static uint8_t
-sis_5571_mem_to_pci_read(int func, int addr, void *priv)
+sis_5571_read(int func, int addr, void *priv)
 {
     const sis_5571_t *dev = (sis_5571_t *) priv;
     uint8_t ret = 0xff;
 
-    if (func == 0x00) {
-        ret = dev->pci_conf[addr];
+    if (func == 0x00)
+        ret = sis_5571_host_to_pci_read(addr, dev->h2p);
 
-        sis_5571_log("SiS 5571 M2P: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
-    }
+    sis_5571_log("SiS 5571: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
 
     return ret;
 }
 
 static void
-sis_5571_pci_to_isa_reset(sis_5571_t *dev)
-{
-    /* PCI to ISA Bridge */
-    dev->pci_conf_sb[0][0x00] = 0x39;
-    dev->pci_conf_sb[0][0x01] = 0x10;
-    dev->pci_conf_sb[0][0x02] = 0x08;
-    dev->pci_conf_sb[0][0x03] = 0x00;
-    dev->pci_conf_sb[0][0x04] = 0x07;
-    dev->pci_conf_sb[0][0x05] = 0x00;
-    dev->pci_conf_sb[0][0x06] = 0x00;
-    dev->pci_conf_sb[0][0x07] = 0x02;
-    dev->pci_conf_sb[0][0x08] = 0x01;
-    dev->pci_conf_sb[0][0x09] = 0x00;
-    dev->pci_conf_sb[0][0x0a] = 0x01;
-    dev->pci_conf_sb[0][0x0b] = 0x06;
-    dev->pci_conf_sb[0][0x0e] = 0x80;
-
-    dev->pci_conf_sb[0][0x40] = 0x00;
-    dev->pci_conf_sb[0][0x41] = dev->pci_conf_sb[0][0x42] = 0x80;
-    dev->pci_conf_sb[0][0x43] = dev->pci_conf_sb[0][0x44] = 0x80;
-    dev->pci_conf_sb[0][0x45] = 0x00;
-    dev->pci_conf_sb[0][0x46] = 0x00;
-    dev->pci_conf_sb[0][0x47] = 0x00;
-    dev->pci_conf_sb[0][0x48] = dev->pci_conf_sb[0][0x49] = 0x00;
-    dev->pci_conf_sb[0][0x4a] = dev->pci_conf_sb[0][0x4b] = 0x00;
-    dev->pci_conf_sb[0][0x61] = 0x80;
-    dev->pci_conf_sb[0][0x62] = 0x00;
-    dev->pci_conf_sb[0][0x63] = 0x80;
-    dev->pci_conf_sb[0][0x64] = 0x00;
-    dev->pci_conf_sb[0][0x65] = 0x00;
-    dev->pci_conf_sb[0][0x66] = dev->pci_conf_sb[0][0x67] = 0x00;
-    dev->pci_conf_sb[0][0x68] = 0x80;
-    dev->pci_conf_sb[0][0x69] = dev->pci_conf_sb[0][0x6a] = 0x00;
-    dev->pci_conf_sb[0][0x6b] = 0x00;
-    dev->pci_conf_sb[0][0x6c] = 0x02;
-    dev->pci_conf_sb[0][0x6d] = 0x00;
-    dev->pci_conf_sb[0][0x6e] = dev->pci_conf_sb[0][0x6f] = 0x00;
-    dev->pci_conf_sb[0][0x70] = dev->pci_conf_sb[0][0x71] = 0x00;
-    dev->pci_conf_sb[0][0x72] = dev->pci_conf_sb[0][0x73] = 0x00;
-    dev->pci_conf_sb[0][0x74] = dev->pci_conf_sb[0][0x75] = 0x00;
-    dev->pci_conf_sb[0][0x76] = dev->pci_conf_sb[0][0x77] = 0x00;
-
-    pci_set_irq_routing(PCI_INTA, PCI_IRQ_DISABLED);
-    pci_set_irq_routing(PCI_INTB, PCI_IRQ_DISABLED);
-    pci_set_irq_routing(PCI_INTC, PCI_IRQ_DISABLED);
-    pci_set_irq_routing(PCI_INTD, PCI_IRQ_DISABLED);
-
-    pci_set_mirq_routing(PCI_MIRQ1, PCI_IRQ_DISABLED);
-    pci_set_mirq_routing(PCI_MIRQ2, PCI_IRQ_DISABLED);
-    pci_set_mirq_routing(PCI_MIRQ3, PCI_IRQ_DISABLED);
-
-    cpu_set_isa_speed(7159091);
-    nvr_bank_set(0, 0, dev->nvr);
-}
-
-static void
-sis_5571_pci_to_isa_write(int addr, uint8_t val, void *priv)
-{
-    sis_5571_t *dev = (sis_5571_t *) priv;
-    uint8_t old;
-
-    sis_5571_log("SiS 5571 P2I: [W] dev->pci_conf_sb[0][%02X] = %02X\n", addr, val);
-
-    switch (addr) {
-        default:
-            break;
-
-        case 0x04: /* Command */
-            // dev->pci_conf_sb[0][addr] = val & 0x0f;
-            break;
-
-        case 0x07: /* Status */
-            dev->pci_conf_sb[0][addr] &= ~(val & 0x30);
-            break;
-
-        case 0x40: /* BIOS Control Register */
-            dev->pci_conf_sb[0][addr] = val & 0x3f;
-            break;
-
-        case 0x41: /* INTA# Remapping Control Register */
-        case 0x42: /* INTB# Remapping Control Register */
-        case 0x43: /* INTC# Remapping Control Register */
-        case 0x44: /* INTD# Remapping Control Register */
-            dev->pci_conf_sb[0][addr] = val & 0x8f;
-            pci_set_irq_routing(addr & 0x07, (val & 0x80) ? PCI_IRQ_DISABLED : (val & 0x0f));
-            break;
-
-        case 0x45:
-            dev->pci_conf_sb[0][addr] = val & 0xec;
-            switch (val >> 6) {
-                case 0:
-                    cpu_set_isa_speed(7159091);
-                    break;
-                case 1:
-                    cpu_set_isa_pci_div(4);
-                    break;
-                case 2:
-                    cpu_set_isa_pci_div(3);
-                    break;
-
-                default:
-                    break;
-            }
-            nvr_bank_set(0, !!(val & 0x08), dev->nvr);
-            break;
-
-        case 0x46:
-            dev->pci_conf_sb[0][addr] = val & 0xec;
-            break;
-
-        case 0x47: /* DMA Clock and Wait State Control Register */
-            dev->pci_conf_sb[0][addr] = val & 0x3e;
-            break;
-
-        case 0x48: /* ISA Master/DMA Memory Cycle Control Register 1 */
-        case 0x49: /* ISA Master/DMA Memory Cycle Control Register 2 */
-        case 0x4a: /* ISA Master/DMA Memory Cycle Control Register 3 */
-        case 0x4b: /* ISA Master/DMA Memory Cycle Control Register 4 */
-            dev->pci_conf_sb[0][addr] = val;
-            break;
-
-        case 0x60:
-            outb(0x0070, val);
-            break;
-
-        /* Simply skip MIRQ0, so we can reuse the SiS 551x IDEIRQ infrastructure. */
-        case 0x61: /* MIRQ Remapping Control Register */
-            sis_5571_log("Set MIRQ routing: MIRQ%i -> %02X\n", addr & 0x01, val);
-            dev->pci_conf_sb[0][addr] = val & 0xcf;
-            if (val & 0x80)
-                pci_set_mirq_routing(PCI_MIRQ0 + (addr & 0x01), PCI_IRQ_DISABLED);
-            else
-                pci_set_mirq_routing(PCI_MIRQ0 + (addr & 0x01), val & 0xf);
-            break;
-
-        case 0x62: /* On-board Device DMA Control Register */
-            dev->pci_conf_sb[0][addr] = val;
-            break;
-
-        case 0x63: /* IDEIRQ Remapping Control Register */
-            sis_5571_log("Set MIRQ routing: IDEIRQ -> %02X\n", val);
-            dev->pci_conf_sb[0][addr] = val & 0x8f;
-            if (val & 0x80)
-                 pci_set_mirq_routing(PCI_MIRQ2, PCI_IRQ_DISABLED);
-            else
-                pci_set_mirq_routing(PCI_MIRQ2, val & 0xf);
-            break;
-
-        case 0x64: /* GPIO Control Register */
-            dev->pci_conf_sb[0][addr] = val & 0xef;
-            break;
-
-        case 0x65:
-            dev->pci_conf_sb[0][addr] = val & 0x1b;
-            break;
-
-        case 0x66: /* GPIO Output Mode Control Register */
-        case 0x67: /* GPIO Output Mode Control Register */
-            dev->pci_conf_sb[0][addr] = val;
-            break;
-
-        case 0x68: /* USBIRQ Remapping Control Register */
-            sis_5571_log("Set MIRQ routing: USBIRQ -> %02X\n", val);
-            dev->pci_conf_sb[0][addr] = val & 0xcf;
-            if (val & 0x80)
-                 pci_set_mirq_routing(PCI_MIRQ3, PCI_IRQ_DISABLED);
-            else
-                pci_set_mirq_routing(PCI_MIRQ3, val & 0xf);
-            break;
-
-        case 0x69:
-            dev->pci_conf_sb[0][addr] = val;
-            break;
-
-        case 0x6a:
-            dev->pci_conf_sb[0][addr] = val & 0xfc;
-            break;
-
-        case 0x6b:
-            dev->pci_conf_sb[0][addr] = val;
-            break;
-
-        case 0x6c:
-            dev->pci_conf_sb[0][addr] = val & 0x02;
-            break;
-
-        case 0x6e: /* Software-Controlled Interrupt Request, Channels 7-0 */
-            old = dev->pci_conf_sb[0][addr];
-            picint((val ^ old) & val);
-            picintc((val ^ old) & ~val);
-            dev->pci_conf_sb[0][addr] = val;
-            break;
-
-        case 0x6f: /* Software-Controlled Interrupt Request, channels 15-8 */
-            old = dev->pci_conf_sb[0][addr];
-            picint(((val ^ old) & val) << 8);
-            picintc(((val ^ old) & ~val) << 8);
-            dev->pci_conf_sb[0][addr] = val;
-            break;
-
-        case 0x70:
-            dev->pci_conf_sb[0][addr] = (dev->pci_conf_sb[0][addr] & 0x02) | (val & 0xdc);
-            break;
-
-        case 0x71: /* Type-F DMA Control Register */
-            dev->pci_conf_sb[0][addr] = val & 0xef;
-            break;
-
-        case 0x72: /* SMI Triggered By IRQ/GPIO Control */
-        case 0x73: /* SMI Triggered By IRQ/GPIO Control */
-            dev->pci_conf_sb[0][addr] = val;
-            break;
-
-        case 0x74: /* System Standby Timer Reload,
-                      System Standby State Exit And Throttling State Exit Control */
-        case 0x75: /* System Standby Timer Reload,
-                      System Standby State Exit And Throttling State Exit Control */
-        case 0x76: /* Monitor Standby Timer Reload And Monitor Standby State ExitControl */
-        case 0x77: /* Monitor Standby Timer Reload And Monitor Standby State ExitControl */
-            dev->pci_conf_sb[0][addr] = val;
-            break;
-    }
-}
-
-static uint8_t
-sis_5571_pci_to_isa_read(int addr, void *priv)
+sis_5572_write(int func, int addr, uint8_t val, void *priv)
 {
     const sis_5571_t *dev = (sis_5571_t *) priv;
-    uint8_t ret = 0xff;
 
-    switch (addr) {
-        default:
-            ret = dev->pci_conf_sb[0][addr];
-            break;
-        case 0x4c ... 0x4f:
-            ret = pic_read_icw(0, addr & 0x03);
-            break;
-        case 0x50 ... 0x53:
-            ret = pic_read_icw(1, addr & 0x03);
-            break;
-        case 0x54 ... 0x55:
-            ret = pic_read_ocw(0, addr & 0x01);
-            break;
-        case 0x56 ... 0x57:
-            ret = pic_read_ocw(1, addr & 0x01);
-            break;
-        case 0x58 ... 0x5f:
-            ret = dev->pit_read_reg(dev->pit, addr & 0x07);
-            break;
-        case 0x60:
-            ret = inb(0x0070);
-            break;
-    }
+    sis_5571_log("SiS 5572: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
 
-    sis_5571_log("SiS 5571 P2I: [R] dev->pci_conf_sb[0][%02X] = %02X\n", addr, ret);
-
-    return ret;
-}
-
-static void
-sis_5571_ide_irq_handler(sis_5571_t *dev)
-{
-    if (dev->pci_conf_sb[1][0x09] & 0x01) {
-        /* Primary IDE is native. */
-        sis_5571_log("Primary IDE IRQ mode: Native, Native\n");
-        sff_set_irq_mode(dev->bm[0], IRQ_MODE_SIS_551X);
-    } else {
-        /* Primary IDE is legacy. */
-        sis_5571_log("Primary IDE IRQ mode: IRQ14, IRQ15\n");
-        sff_set_irq_mode(dev->bm[0], IRQ_MODE_LEGACY);
-    }
-
-    if (dev->pci_conf_sb[1][0x09] & 0x04) {
-        /* Secondary IDE is native. */
-        sis_5571_log("Secondary IDE IRQ mode: Native, Native\n");
-        sff_set_irq_mode(dev->bm[1], IRQ_MODE_SIS_551X);
-    } else {
-        /* Secondary IDE is legacy. */
-        sis_5571_log("Secondary IDE IRQ mode: IRQ14, IRQ15\n");
-        sff_set_irq_mode(dev->bm[1], IRQ_MODE_LEGACY);
-    }
-}
-
-static void
-sis_5571_ide_handler(sis_5571_t *dev)
-{
-    uint8_t ide_io_on = dev->pci_conf_sb[1][0x04] & 0x01;
-
-    uint16_t native_base_pri_addr = (dev->pci_conf_sb[1][0x11] | dev->pci_conf_sb[1][0x10] << 8) & 0xfffe;
-    uint16_t native_side_pri_addr = (dev->pci_conf_sb[1][0x15] | dev->pci_conf_sb[1][0x14] << 8) & 0xfffe;
-    uint16_t native_base_sec_addr = (dev->pci_conf_sb[1][0x19] | dev->pci_conf_sb[1][0x18] << 8) & 0xfffe;
-    uint16_t native_side_sec_addr = (dev->pci_conf_sb[1][0x1c] | dev->pci_conf_sb[1][0x1b] << 8) & 0xfffe;
-
-    uint16_t current_pri_base;
-    uint16_t current_pri_side;
-    uint16_t current_sec_base;
-    uint16_t current_sec_side;
-
-    /* Primary Channel Programming */
-    current_pri_base = (!(dev->pci_conf_sb[1][0x09] & 1)) ? 0x01f0 : native_base_pri_addr;
-    current_pri_side = (!(dev->pci_conf_sb[1][0x09] & 1)) ? 0x03f6 : native_side_pri_addr;
-
-    /* Secondary Channel Programming */
-    current_sec_base = (!(dev->pci_conf_sb[1][0x09] & 4)) ? 0x0170 : native_base_sec_addr;
-    current_sec_side = (!(dev->pci_conf_sb[1][0x09] & 4)) ? 0x0376 : native_side_sec_addr;
-
-    sis_5571_log("sis_5571_ide_handler(): Disabling primary IDE...\n");
-    ide_pri_disable();
-    sis_5571_log("sis_5571_ide_handler(): Disabling secondary IDE...\n");
-    ide_sec_disable();
-
-    if (ide_io_on) {
-        /* Primary Channel Setup */
-        if (dev->pci_conf_sb[1][0x4a] & 0x02) {
-            sis_5571_log("sis_5571_ide_handler(): Primary IDE base now %04X...\n", current_pri_base);
-            ide_set_base(0, current_pri_base);
-            sis_5571_log("sis_5571_ide_handler(): Primary IDE side now %04X...\n", current_pri_side);
-            ide_set_side(0, current_pri_side);
-
-            sis_5571_log("sis_5571_ide_handler(): Enabling primary IDE...\n");
-            ide_pri_enable();
-
-            sis_5571_log("SiS 5571 PRI: BASE %04x SIDE %04x\n", current_pri_base, current_pri_side);
-        }
-
-        /* Secondary Channel Setup */
-        if (dev->pci_conf_sb[1][0x4a] & 0x04) {
-            sis_5571_log("sis_5571_ide_handler(): Secondary IDE base now %04X...\n", current_sec_base);
-            ide_set_base(1, current_sec_base);
-            sis_5571_log("sis_5571_ide_handler(): Secondary IDE side now %04X...\n", current_sec_side);
-            ide_set_side(1, current_sec_side);
-
-            sis_5571_log("sis_5571_ide_handler(): Enabling secondary IDE...\n");
-            ide_sec_enable();
-
-            sis_5571_log("SiS 5571: BASE %04x SIDE %04x\n", current_sec_base, current_sec_side);
-        }
-    }
-
-    sff_bus_master_handler(dev->bm[0], ide_io_on,
-                           ((dev->pci_conf_sb[1][0x20] & 0xf0) | (dev->pci_conf_sb[1][0x21] << 8)) + 0);
-    sff_bus_master_handler(dev->bm[1], ide_io_on,
-                           ((dev->pci_conf_sb[1][0x20] & 0xf0) | (dev->pci_conf_sb[1][0x21] << 8)) + 8);
-}
-
-static void
-sis_5571_ide_reset(sis_5571_t *dev)
-{
-    /* PCI IDE */
-    dev->pci_conf_sb[1][0x00] = 0x39;
-    dev->pci_conf_sb[1][0x01] = 0x10;
-    dev->pci_conf_sb[1][0x02] = 0x13;
-    dev->pci_conf_sb[1][0x03] = 0x55;
-    dev->pci_conf_sb[1][0x04] = dev->pci_conf_sb[1][0x05] = 0x00;
-    dev->pci_conf_sb[1][0x06] = dev->pci_conf_sb[1][0x07] = 0x00;
-    dev->pci_conf_sb[1][0x08] = 0xc0;
-    dev->pci_conf_sb[1][0x09] = 0x8a;
-    dev->pci_conf_sb[1][0x0a] = dev->pci_conf_sb[1][0x0b] = 0x01;
-    dev->pci_conf_sb[1][0x0c] = dev->pci_conf_sb[1][0x0d] = 0x00;
-    dev->pci_conf_sb[1][0x0e] = 0x80;
-    dev->pci_conf_sb[1][0x0f] = 0x00;
-    dev->pci_conf_sb[1][0x10] = 0xf1;
-    dev->pci_conf_sb[1][0x11] = 0x01;
-    dev->pci_conf_sb[1][0x14] = 0xf5;
-    dev->pci_conf_sb[1][0x15] = 0x03;
-    dev->pci_conf_sb[1][0x18] = 0x71;
-    dev->pci_conf_sb[1][0x19] = 0x01;
-    dev->pci_conf_sb[1][0x1c] = 0x75;
-    dev->pci_conf_sb[1][0x1d] = 0x03;
-    dev->pci_conf_sb[1][0x20] = 0x01;
-    dev->pci_conf_sb[1][0x21] = 0xf0;
-    dev->pci_conf_sb[1][0x22] = dev->pci_conf_sb[1][0x23] = 0x00;
-    dev->pci_conf_sb[1][0x24] = dev->pci_conf_sb[1][0x25] = 0x00;
-    dev->pci_conf_sb[1][0x26] = dev->pci_conf_sb[1][0x27] = 0x00;
-    dev->pci_conf_sb[1][0x28] = dev->pci_conf_sb[1][0x29] = 0x00;
-    dev->pci_conf_sb[1][0x2a] = dev->pci_conf_sb[1][0x2b] = 0x00;
-#ifdef DATASHEET
-    dev->pci_conf_sb[1][0x2c] = dev->pci_conf_sb[1][0x2d] = 0x00;
-#else
-    /* The only Linux lspci listing I could find of this chipset,
-       shows a subsystem of 0058:0000. */
-    dev->pci_conf_sb[1][0x2c] = 0x58;
-    dev->pci_conf_sb[1][0x2d] = 0x00;
-#endif
-    dev->pci_conf_sb[1][0x2e] = dev->pci_conf_sb[1][0x2f] = 0x00;
-    dev->pci_conf_sb[1][0x30] = dev->pci_conf_sb[1][0x31] = 0x00;
-    dev->pci_conf_sb[1][0x32] = dev->pci_conf_sb[1][0x33] = 0x00;
-    dev->pci_conf_sb[1][0x40] = dev->pci_conf_sb[1][0x41] = 0x00;
-    dev->pci_conf_sb[1][0x42] = dev->pci_conf_sb[1][0x43] = 0x00;
-    dev->pci_conf_sb[1][0x44] = dev->pci_conf_sb[1][0x45] = 0x00;
-    dev->pci_conf_sb[1][0x46] = dev->pci_conf_sb[1][0x47] = 0x00;
-    dev->pci_conf_sb[1][0x48] = dev->pci_conf_sb[1][0x49] = 0x00;
-    dev->pci_conf_sb[1][0x4a] = 0x06;
-    dev->pci_conf_sb[1][0x4b] = 0x00;
-    dev->pci_conf_sb[1][0x4c] = dev->pci_conf_sb[1][0x4d] = 0x00;
-    dev->pci_conf_sb[1][0x4e] = dev->pci_conf_sb[1][0x4f] = 0x00;
-
-    sis_5571_ide_irq_handler(dev);
-    sis_5571_ide_handler(dev);
-
-    sff_bus_master_reset(dev->bm[0]);
-    sff_bus_master_reset(dev->bm[1]);
-}
-
-static void
-sis_5571_ide_write(int addr, uint8_t val, void *priv)
-{
-    sis_5571_t *dev = (sis_5571_t *) priv;
-
-    sis_5571_log("SiS 5571 IDE: [W] dev->pci_conf_sb[1][%02X] = %02X\n", addr, val);
-
-    switch (addr) {
-        default:
-            break;
-
-        case 0x04: /* Command low byte */
-            dev->pci_conf_sb[1][addr] = val & 0x05;
-            sis_5571_ide_handler(dev);
-            break;
-        case 0x06: /* Status low byte */
-            dev->pci_conf_sb[1][addr] = val & 0x20;
-            break;
-        case 0x07: /* Status high byte */
-            dev->pci_conf_sb[1][addr] = (dev->pci_conf_sb[1][addr] & 0x06) & ~(val & 0x38);
-            break;
-        case 0x09: /* Programming Interface Byte */
-            dev->pci_conf_sb[1][addr] = (dev->pci_conf_sb[1][addr] & 0x8a) | (val & 0x45);
-            sis_5571_ide_irq_handler(dev);
-            sis_5571_ide_handler(dev);
-            break;
-        case 0x0d: /* Latency Timer */
-            dev->pci_conf_sb[1][addr] = val;
-            break;
-
-        /* Primary Base Address */
-        case 0x10:
-        case 0x11:
-        case 0x14:
-        case 0x15:
-            fallthrough;
-
-        /* Secondary Base Address */
-        case 0x18:
-        case 0x19:
-        case 0x1c:
-        case 0x1d:
-            fallthrough;
-
-        /* Bus Mastering Base Address */
-        case 0x20:
-        case 0x21:
-            if (addr == 0x20)
-                dev->pci_conf_sb[1][addr] = (val & 0xe0) | 0x01;
-            else
-                dev->pci_conf_sb[1][addr] = val;
-            sis_5571_ide_handler(dev);
-            break;
-
-    /* The only Linux lspci listing I could find of this chipset,
-       does not show any BIOS bar, therefore writes to that are disabled. */
-#ifdef DATASHEET
-        case 0x30: /* Expansion ROM Base Address */
-        case 0x31: /* Expansion ROM Base Address */
-        case 0x32: /* Expansion ROM Base Address */
-        case 0x33: /* Expansion ROM Base Address */
-            dev->pci_conf_sb[1][addr] = val;
-            break;
-#endif
-
-        case 0x40: /* IDE Primary Channel/Master Drive Data Recovery Time Control */
-        case 0x42: /* IDE Primary Channel/Slave Drive Data Recovery Time Control */
-        case 0x44: /* IDE Secondary Channel/Master Drive Data Recovery Time Control */
-        case 0x46: /* IDE Secondary Channel/Slave Drive Data Recovery Time Control */
-        case 0x48: /* IDE Command Recovery Time Control */
-            dev->pci_conf_sb[1][addr] = val & 0x0f;
-            break;
-
-        case 0x41: /* IDE Primary Channel/Master Drive DataActive Time Control */
-        case 0x43: /* IDE Primary Channel/Slave Drive Data Active Time Control */
-        case 0x45: /* IDE Secondary Channel/Master Drive Data Active Time Control */
-        case 0x47: /* IDE Secondary Channel/Slave Drive Data Active Time Control */
-        case 0x49: /* IDE Command Active Time Control */
-            dev->pci_conf_sb[1][addr] = val & 0x07;
-            break;
-
-        case 0x4a: /* IDE General Control Register 0 */
-            dev->pci_conf_sb[1][addr] = val & 0xaf;
-            sis_5571_ide_handler(dev);
-            break;
-
-        case 0x4b: /* IDE General Control register 1 */
-            dev->pci_conf_sb[1][addr] = val;
-            break;
-
-        case 0x4c: /* Prefetch Count of Primary Channel (Low Byte) */
-        case 0x4d: /* Prefetch Count of Primary Channel (High Byte) */
-        case 0x4e: /* Prefetch Count of Secondary Channel (Low Byte) */
-        case 0x4f: /* Prefetch Count of Secondary Channel (High Byte) */
-            dev->pci_conf_sb[1][addr] = val;
-            break;
-    }
-}
-
-static uint8_t
-sis_5571_ide_read(int addr, void *priv)
-{
-    const sis_5571_t *dev = (sis_5571_t *) priv;
-    uint8_t ret = 0xff;
-
-    switch (addr) {
-        default:
-            ret = dev->pci_conf_sb[1][addr];
-            break;
-
-        case 0x09:
-            ret = dev->pci_conf_sb[1][addr];
-            if (dev->pci_conf_sb[1][0x09] & 0x40)
-                ret |= ((dev->pci_conf_sb[1][0x4a] & 0x06) << 3);
-            break;
-
-        case 0x3d:
-            ret = (dev->pci_conf_sb[1][0x09] & 0x05) ? PCI_INTA : 0x00;
-            break;
-    }
-
-    sis_5571_log("SiS 5571 IDE: [R] dev->pci_conf_sb[1][%02X] = %02X\n", addr, ret);
-
-    return ret;
-}
-
-/* SiS 5571 unknown I/O port (second USB PCI BAR). */
-static void
-sis_5571_usb_unk_write(uint16_t addr, uint8_t val, void *priv)
-{
-    sis_5571_t *dev = (sis_5571_t *) priv;
-
-    addr = (addr - dev->usb_unk_base) & 0x07;
-
-    sis_5571_log("SiS 5571 USB UNK: [W] dev->usb_unk_regs[%02X] = %02X\n", addr, val);
-
-    dev->usb_unk_regs[addr] = val;
-}
-
-static uint8_t
-sis_5571_usb_unk_read(uint16_t addr, void *priv)
-{
-    const sis_5571_t *dev = (sis_5571_t *) priv;
-    uint8_t ret = 0xff;
-
-    addr = (addr - dev->usb_unk_base) & 0x07;
-
-    ret = dev->usb_unk_regs[addr & 0x07];
-
-    sis_5571_log("SiS 5571 USB UNK: [R] dev->usb_unk_regs[%02X] = %02X\n", addr, ret);
-
-    return ret;
-}
-
-static void
-sis_5571_usb_reset(sis_5571_t *dev)
-{
-    /* USB */
-    dev->pci_conf_sb[2][0x00] = 0x39;
-    dev->pci_conf_sb[2][0x01] = 0x10;
-    dev->pci_conf_sb[2][0x02] = 0x01;
-    dev->pci_conf_sb[2][0x03] = 0x70;
-    dev->pci_conf_sb[2][0x04] = dev->pci_conf_sb[1][0x05] = 0x00;
-    dev->pci_conf_sb[2][0x06] = 0x00;
-    dev->pci_conf_sb[2][0x07] = 0x02;
-    dev->pci_conf_sb[2][0x08] = 0xb0;
-    dev->pci_conf_sb[2][0x09] = 0x10;
-    dev->pci_conf_sb[2][0x0a] = 0x03;
-    dev->pci_conf_sb[2][0x0b] = 0x0c;
-    dev->pci_conf_sb[2][0x0c] = dev->pci_conf_sb[1][0x0d] = 0x00;
-    dev->pci_conf_sb[2][0x0e] = 0x80 /* 0x10  - Datasheet erratum - header type 0x10 is invalid! */;
-    dev->pci_conf_sb[2][0x0f] = 0x00;
-    dev->pci_conf_sb[2][0x10] = 0x00;
-    dev->pci_conf_sb[2][0x11] = 0x00;
-    dev->pci_conf_sb[2][0x12] = 0x00;
-    dev->pci_conf_sb[2][0x13] = 0x00;
-    dev->pci_conf_sb[2][0x14] = 0x01;
-    dev->pci_conf_sb[2][0x15] = 0x00;
-    dev->pci_conf_sb[2][0x16] = 0x00;
-    dev->pci_conf_sb[2][0x17] = 0x00;
-    dev->pci_conf_sb[2][0x3c] = 0x00;
-    dev->pci_conf_sb[2][0x3d] = PCI_INTA;
-    dev->pci_conf_sb[2][0x3e] = 0x00;
-    dev->pci_conf_sb[2][0x3f] = 0x00;
-
-    ohci_update_mem_mapping(dev->usb,
-                            dev->pci_conf_sb[2][0x11], dev->pci_conf_sb[2][0x12],
-                            dev->pci_conf_sb[2][0x13], dev->pci_conf_sb[2][0x04] & 0x02);
-
-    if (dev->usb_unk_base != 0x0000) {
-        io_removehandler(dev->usb_unk_base, 0x0002,
-                         sis_5571_usb_unk_read, NULL, NULL,
-                         sis_5571_usb_unk_write, NULL, NULL, dev);
-    }
-
-    dev->usb_unk_base = 0x0000;
-
-    memset(dev->usb_unk_regs, 0x00, sizeof(dev->usb_unk_regs));
-}
-
-static void
-sis_5571_usb_write(int addr, uint8_t val, void *priv)
-{
-    sis_5571_t *dev = (sis_5571_t *) priv;
-
-    sis_5571_log("SiS 5571 USB: [W] dev->pci_conf_sb[2][%02X] = %02X\n", addr, val);
-
-    if (dev->pci_conf_sb[0][0x68] & 0x40)  switch (addr) {
-        default:
-            break;
-
-        case 0x04: /* Command - Low Byte */
-            dev->pci_conf_sb[2][addr] = val & 0x47;
-            if (dev->usb_unk_base != 0x0000) {
-                io_removehandler(dev->usb_unk_base, 0x0002,
-                                 sis_5571_usb_unk_read, NULL, NULL,
-                                 sis_5571_usb_unk_write, NULL, NULL, dev);
-                if (dev->pci_conf_sb[2][0x04] & 0x01)
-                    io_sethandler(dev->usb_unk_base, 0x0002,
-                                  sis_5571_usb_unk_read, NULL, NULL,
-                                  sis_5571_usb_unk_write, NULL, NULL, dev);
-            }
-            ohci_update_mem_mapping(dev->usb,
-                                    dev->pci_conf_sb[2][0x11], dev->pci_conf_sb[2][0x12],
-                                    dev->pci_conf_sb[2][0x13], dev->pci_conf_sb[2][0x04] & 0x02);
-            break;
-
-        case 0x05: /* Command - High Byte */
-            dev->pci_conf_sb[2][addr] = val & 0x01;
-            break;
-
-        case 0x07: /* Status - High Byte */
-            dev->pci_conf_sb[2][addr] &= ~(val & 0xf9);
-            break;
-
-        case 0x0d: /* Latency Timer */
-            dev->pci_conf_sb[2][addr] = val;
-            break;
-
-        case 0x11: /* Memory Space Base Address Register */
-        case 0x12: /* Memory Space Base Address Register */
-        case 0x13: /* Memory Space Base Address Register */
-            dev->pci_conf_sb[2][addr] = val & ((addr == 0x11) ? 0xf0 : 0xff);
-            ohci_update_mem_mapping(dev->usb,
-                                    dev->pci_conf_sb[2][0x11], dev->pci_conf_sb[2][0x12],
-                                    dev->pci_conf_sb[2][0x13], dev->pci_conf_sb[2][4] & 0x02);
-            break;
-
-        case 0x14: /* IO Space Base Address Register */
-        case 0x15: /* IO Space Base Address Register */
-            if (dev->usb_unk_base != 0x0000) {
-                io_removehandler(dev->usb_unk_base, 0x0002,
-                                 sis_5571_usb_unk_read, NULL, NULL,
-                                 sis_5571_usb_unk_write, NULL, NULL, dev);
-            }
-            dev->pci_conf_sb[2][addr] = val;
-            dev->usb_unk_base = (dev->pci_conf_sb[2][0x14] & 0xf8) |
-                                (dev->pci_conf_sb[2][0x15] << 8);
-            if (dev->usb_unk_base != 0x0000) {
-                io_sethandler(dev->usb_unk_base, 0x0002,
-                              sis_5571_usb_unk_read, NULL, NULL,
-                              sis_5571_usb_unk_write, NULL, NULL, dev);
-            }
-            break;
-
-        case 0x3c: /* Interrupt Line */
-            dev->pci_conf_sb[2][addr] = val;
-            break;
-    }
-}
-
-static uint8_t
-sis_5571_usb_read(int addr, void *priv)
-{
-    const sis_5571_t *dev = (sis_5571_t *) priv;
-    uint8_t ret = 0xff;
-
-    if (dev->pci_conf_sb[0][0x68] & 0x40) {
-        ret = dev->pci_conf_sb[2][addr];
-
-        sis_5571_log("SiS 5571 USB: [R] dev->pci_conf_sb[2][%02X] = %02X\n", addr, ret);
-    }
-
-    return ret;
-}
-
-static void
-sis_5571_sb_write(int func, int addr, uint8_t val, void *priv)
-{
     switch (func) {
         case 0x00:
-            sis_5571_pci_to_isa_write(addr, val, priv);
+            sis_5513_pci_to_isa_write(addr, val, dev->p2i);
             break;
         case 0x01:
-            sis_5571_ide_write(addr, val, priv);
+            sis_5513_ide_write(addr, val, dev->ide);
             break;
         case 0x02:
-            sis_5571_usb_write(addr, val, priv);
+            sis_5572_usb_write(addr, val, dev->usb);
             break;
     }
 }
 
 static uint8_t
-sis_5571_sb_read(int func, int addr, void *priv)
+sis_5572_read(int func, int addr, void *priv)
 {
+    const sis_5571_t *dev = (sis_5571_t *) priv;
     uint8_t ret = 0xff;
 
     switch (func) {
         case 0x00:
-            ret = sis_5571_pci_to_isa_read(addr, priv);
+            ret = sis_5513_pci_to_isa_read(addr, dev->p2i);
             break;
         case 0x01:
-            ret = sis_5571_ide_read(addr, priv);
+            ret = sis_5513_ide_read(addr, dev->ide);
             break;
         case 0x02:
-            ret = sis_5571_usb_read(addr, priv);
+            ret = sis_5572_usb_read(addr, dev->usb);
             break;
     }
 
+    sis_5571_log("SiS 5572: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
+
     return ret;
 }
 
-static void
-sis_5571_reset(void *priv)
-{
-    sis_5571_t *dev = (sis_5571_t *) priv;
-
-    /* Memory/PCI Bridge */
-    sis_5571_mem_to_pci_reset(dev);
-
-    /* PCI to ISA bridge */
-    sis_5571_pci_to_isa_reset(dev);
-
-    /* IDE Controller */
-    sis_5571_ide_reset(dev);
-
-    /* USB Controller */
-    sis_5571_usb_reset(dev);
-}
-
 static void
 sis_5571_close(void *priv)
 {
     sis_5571_t *dev = (sis_5571_t *) priv;
 
-    smram_del(dev->smram);
     free(dev);
 }
 
@@ -1192,44 +154,20 @@ static void *
 sis_5571_init(UNUSED(const device_t *info))
 {
     sis_5571_t *dev = (sis_5571_t *) calloc(1, sizeof(sis_5571_t));
-    uint8_t pit_is_fast = (((pit_mode == -1) && is486) || (pit_mode == 1));
 
-    /* Device 0: Memory/PCI Bridge */
-    pci_add_card(PCI_ADD_NORTHBRIDGE,
-                 sis_5571_mem_to_pci_read, sis_5571_mem_to_pci_write, dev, &dev->nb_slot);
-    /* Device 1: Southbridge */
-    pci_add_card(PCI_ADD_SOUTHBRIDGE, sis_5571_sb_read, sis_5571_sb_write, dev, &dev->sb_slot);
+    /* Device 0: SiS 5571 */
+    pci_add_card(PCI_ADD_NORTHBRIDGE, sis_5571_read, sis_5571_write, dev, &dev->nb_slot);
+    /* Device 1: SiS 5572 */
+    pci_add_card(PCI_ADD_SOUTHBRIDGE, sis_5572_read, sis_5572_write, dev, &dev->sb_slot);
 
-    /* MIRQ */
-    pci_enable_mirq(1);
+    dev->sis = device_add(&sis_55xx_common_device);
 
-    /* IDEIRQ */
-    pci_enable_mirq(2);
+    dev->h2p = device_add_linked(&sis_5571_h2p_device, dev->sis);
+    dev->p2i = device_add_linked(&sis_5572_p2i_device, dev->sis);
+    dev->ide = device_add_linked(&sis_5572_ide_device, dev->sis);
+    dev->usb = device_add_linked(&sis_5572_usb_device, dev->sis);
 
-    /* USBIRQ */
-    pci_enable_mirq(3);
-
-    /* Port 92h */
-    dev->port_92 = device_add(&port_92_device);
-
-    /* SFF IDE */
-    dev->bm[0] = device_add_inst(&sff8038i_device, 1);
-    dev->bm[1] = device_add_inst(&sff8038i_device, 2);
-
-    /* SMRAM */
-    dev->smram = smram_add();
-
-    /* PIT */
-    dev->pit = device_find_first_priv(DEVICE_PIT);
-    dev->pit_read_reg = pit_is_fast ? pitf_read_reg : pit_read_reg;
-
-    /* NVR */
-    dev->nvr = device_add(&at_mb_nvr_device);
-
-    /* USB */
-    dev->usb = device_add(&usb_device);
-
-    sis_5571_reset(dev);
+    device_add_params(&kbc_at_device, (void *) KBC_VEN_SIS);
 
     return dev;
 }
@@ -1241,8 +179,8 @@ const device_t sis_5571_device = {
     .local         = 0,
     .init          = sis_5571_init,
     .close         = sis_5571_close,
-    .reset         = sis_5571_reset,
-    { .available = NULL },
+    .reset         = NULL,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/sis_5571_h2p.c b/src/chipset/sis_5571_h2p.c
new file mode 100644
index 000000000..a28553487
--- /dev/null
+++ b/src/chipset/sis_5571_h2p.c
@@ -0,0 +1,459 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the SiS 5571 Host to PCI bridge.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2024 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/dma.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/hdd.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/hdc_ide_sff8038i.h>
+#include <86box/pci.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/pit_fast.h>
+#include <86box/plat.h>
+#include <86box/plat_unused.h>
+#include <86box/port_92.h>
+#include <86box/smram.h>
+#include <86box/spd.h>
+#include <86box/apm.h>
+#include <86box/ddma.h>
+#include <86box/acpi.h>
+#include <86box/smbus.h>
+#include <86box/spd.h>
+#include <86box/sis_55xx.h>
+#include <86box/chipset.h>
+#include <86box/usb.h>
+#include <86box/agpgart.h>
+
+#ifdef ENABLE_SIS_5571_HOST_TO_PCI_LOG
+int sis_5571_host_to_pci_do_log = ENABLE_SIS_5571_HOST_TO_PCI_LOG;
+
+static void
+sis_5571_host_to_pci_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (sis_5571_host_to_pci_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define sis_5571_host_to_pci_log(fmt, ...)
+#endif
+
+typedef struct sis_5571_host_to_pci_t {
+    uint8_t            pci_conf[256];
+    uint8_t            states[7];
+
+    sis_55xx_common_t *sis;
+
+    smram_t           *smram;
+} sis_5571_host_to_pci_t;
+
+static void
+sis_5571_shadow_recalc(sis_5571_host_to_pci_t *dev)
+{
+    int      state;
+    uint32_t base;
+
+    for (uint8_t i = 0x70; i <= 0x76; i++) {
+        if (i == 0x76) {
+            if ((dev->states[i & 0x0f] ^ dev->pci_conf[i]) & 0xa0) {
+                state = (dev->pci_conf[i] & 0x80) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+                state |= (dev->pci_conf[i] & 0x20) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+                mem_set_mem_state_both(0xf0000, 0x10000, state);
+                sis_5571_host_to_pci_log("000F0000-000FFFFF\n");
+            }
+        } else {
+            base = ((i & 0x07) << 15) + 0xc0000;
+
+            if ((dev->states[i & 0x0f] ^ dev->pci_conf[i]) & 0xa0) {
+                state = (dev->pci_conf[i] & 0x80) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+                state |= (dev->pci_conf[i] & 0x20) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+                mem_set_mem_state_both(base, 0x4000, state);
+                sis_5571_host_to_pci_log("%08X-%08X\n", base, base + 0x3fff);
+            }
+
+            if ((dev->states[i & 0x0f] ^ dev->pci_conf[i]) & 0x0a) {
+                state = (dev->pci_conf[i] & 0x08) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+                state |= (dev->pci_conf[i] & 0x02) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+                mem_set_mem_state_both(base + 0x4000, 0x4000, state);
+                sis_5571_host_to_pci_log("%08X-%08X\n", base + 0x4000, base + 0x7fff);
+            }
+        }
+
+        dev->states[i & 0x0f] = dev->pci_conf[i];
+    }
+
+    flushmmucache_nopc();
+}
+
+static void
+sis_5571_smram_recalc(sis_5571_host_to_pci_t *dev)
+{
+    smram_disable_all();
+
+    switch (dev->pci_conf[0xa3] >> 6) {
+        case 0:
+            smram_enable(dev->smram, 0x000e0000, 0x000e0000, 0x8000, dev->pci_conf[0xa3] & 0x10, 1);
+            break;
+        case 1:
+            smram_enable(dev->smram, 0x000e0000, 0x000a0000, 0x8000, dev->pci_conf[0xa3] & 0x10, 1);
+            break;
+        case 2:
+            smram_enable(dev->smram, 0x000e0000, 0x000b0000, 0x8000, dev->pci_conf[0xa3] & 0x10, 1);
+            break;
+        case 3:
+            smram_enable(dev->smram, 0x000a0000, 0x000a0000, 0x10000, dev->pci_conf[0xa3] & 0x10, 1);
+            break;
+
+        default:
+            break;
+    }
+
+    flushmmucache();
+}
+
+void
+sis_5571_host_to_pci_write(int addr, uint8_t val, void *priv)
+{
+    sis_5571_host_to_pci_t *dev = (sis_5571_host_to_pci_t *) priv;
+
+    sis_5571_host_to_pci_log("SiS 5571 H2P: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
+
+    switch (addr) {
+        default:
+            break;
+
+        case 0x04: /* Command - low byte */
+        case 0x05: /* Command - high byte */
+            dev->pci_conf[addr] = (dev->pci_conf[addr] & 0xfd) | (val & 0x02);
+            break;
+
+        case 0x07: /* Status - High Byte */
+            dev->pci_conf[addr] &= ~(val & 0xb8);
+            break;
+
+        case 0x0d: /* Master latency timer */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x50: /* Host Interface and DRAM arbiter */
+            dev->pci_conf[addr] = val & 0xec;
+            break;
+
+        case 0x51: /* CACHE */
+            dev->pci_conf[addr]   = val;
+            cpu_cache_ext_enabled = !!(val & 0x40);
+            cpu_update_waitstates();
+            break;
+
+        case 0x52:
+            dev->pci_conf[addr] = val & 0xd0;
+            break;
+
+        case 0x53: /* DRAM */
+            dev->pci_conf[addr] = val & 0xfe;
+            break;
+
+        case 0x54: /* FP/EDO */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x55:
+            dev->pci_conf[addr] = val & 0xe0;
+            break;
+
+        case 0x56: /* MDLE delay */
+            dev->pci_conf[addr] = val & 0x07;
+            break;
+
+        case 0x57: /* SDRAM */
+            dev->pci_conf[addr] = val & 0xf8;
+            break;
+
+        case 0x59: /* Buffer strength and current rating  */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x5a:
+            dev->pci_conf[addr] = val & 0x03;
+            break;
+
+        /* Undocumented - DRAM bank registers, the exact layout is currently unknown. */
+        case 0x60 ... 0x6b:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x70 ... 0x75:
+            dev->pci_conf[addr] = val & 0xee;
+            sis_5571_shadow_recalc(dev);
+            break;
+        case 0x76:
+            dev->pci_conf[addr] = val & 0xe8;
+            sis_5571_shadow_recalc(dev);
+            break;
+
+        case 0x77: /* Characteristics of non-cacheable area */
+            dev->pci_conf[addr] = val & 0x0f;
+            break;
+
+        case 0x78: /* Allocation of Non-Cacheable area #1 */
+        case 0x79: /* NCA1REG2 */
+        case 0x7a: /* Allocation of Non-Cacheable area #2 */
+        case 0x7b: /* NCA2REG2 */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x80: /* PCI master characteristics */
+            dev->pci_conf[addr] = val & 0xfe;
+            break;
+
+        case 0x81:
+            dev->pci_conf[addr] = val & 0xcc;
+            break;
+
+        case 0x82:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x83: /* CPU to PCI characteristics */
+            dev->pci_conf[addr] = val;
+            /* TODO: Implement Fast A20 and Fast reset stuff on the KBC already! */
+            break;
+
+        case 0x84 ... 0x86:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x87: /* Miscellanea */
+            dev->pci_conf[addr] = val & 0xf8;
+            break;
+
+        case 0x90: /* PMU control register */
+        case 0x91: /* Address trap for green function */
+        case 0x92:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x93: /* STPCLK# and APM SMI control */
+            dev->pci_conf[addr] = val;
+
+            if ((dev->pci_conf[0x9b] & 0x01) && (val & 0x02)) {
+                smi_raise();
+                dev->pci_conf[0x9d] |= 0x01;
+            }
+            break;
+
+        case 0x94: /* 6x86 and Green function control */
+            dev->pci_conf[addr] = val & 0xf8;
+            break;
+
+        case 0x95: /* Test mode control */
+        case 0x96: /* Time slot and Programmable 10-bit I/O port definition */
+            dev->pci_conf[addr] = val & 0xfb;
+            break;
+
+        case 0x97: /* programmable 10-bit I/O port address */
+        case 0x98: /* Programmable 16-bit I/O port */
+        case 0x99 ... 0x9c:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x9d:
+            dev->pci_conf[addr] &= val;
+            break;
+
+        case 0x9e: /* STPCLK# Assertion Timer */
+        case 0x9f: /* STPCLK# De-assertion Timer */
+        case 0xa0 ... 0xa2:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0xa3: /* SMRAM access control and Power supply control */
+            dev->pci_conf[addr] = val & 0xd0;
+            sis_5571_smram_recalc(dev);
+            break;
+    }
+}
+
+uint8_t
+sis_5571_host_to_pci_read(int addr, void *priv)
+{
+    const sis_5571_host_to_pci_t *dev = (sis_5571_host_to_pci_t *) priv;
+    uint8_t ret = 0xff;
+
+    ret = dev->pci_conf[addr];
+
+    sis_5571_host_to_pci_log("SiS 5571 H2P: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
+
+    return ret;
+}
+
+static void
+sis_5571_host_to_pci_reset(void *priv)
+{
+    sis_5571_host_to_pci_t *dev = (sis_5571_host_to_pci_t *) priv;
+
+    dev->pci_conf[0x00] = 0x39;
+    dev->pci_conf[0x01] = 0x10;
+    dev->pci_conf[0x02] = 0x71;
+    dev->pci_conf[0x03] = 0x55;
+    dev->pci_conf[0x04] = 0x05;
+    dev->pci_conf[0x05] = 0x00;
+    dev->pci_conf[0x06] = 0x00;
+    dev->pci_conf[0x07] = 0x02;
+    dev->pci_conf[0x08] = 0x00;
+    dev->pci_conf[0x09] = 0x00;
+    dev->pci_conf[0x0a] = 0x00;
+    dev->pci_conf[0x0b] = 0x06;
+    dev->pci_conf[0x0c] = 0x00;
+    dev->pci_conf[0x0d] = 0x00;
+    dev->pci_conf[0x0e] = 0x00;
+    dev->pci_conf[0x0f] = 0x00;
+
+    dev->pci_conf[0x50] = 0x00;
+    dev->pci_conf[0x51] = 0x00;
+    dev->pci_conf[0x52] = 0x00;
+    dev->pci_conf[0x53] = 0x00;
+    dev->pci_conf[0x54] = 0x54;
+    dev->pci_conf[0x55] = 0x54;
+    dev->pci_conf[0x56] = 0x03;
+    dev->pci_conf[0x57] = 0x00;
+    dev->pci_conf[0x58] = 0x00;
+    dev->pci_conf[0x59] = 0x00;
+    dev->pci_conf[0x5a] = 0x00;
+
+    /* Undocumented DRAM bank registers. */
+    dev->pci_conf[0x60] = dev->pci_conf[0x62] = 0x04;
+    dev->pci_conf[0x64] = dev->pci_conf[0x66] = 0x04;
+    dev->pci_conf[0x68] = dev->pci_conf[0x6a] = 0x04;
+    dev->pci_conf[0x61] = dev->pci_conf[0x65] = 0x00;
+    dev->pci_conf[0x63] = dev->pci_conf[0x67] = 0x80;
+    dev->pci_conf[0x69]                       = 0x00;
+    dev->pci_conf[0x6b]                       = 0x80;
+
+    dev->pci_conf[0x70] = 0x00;
+    dev->pci_conf[0x71] = 0x00;
+    dev->pci_conf[0x72] = 0x00;
+    dev->pci_conf[0x73] = 0x00;
+    dev->pci_conf[0x74] = 0x00;
+    dev->pci_conf[0x75] = 0x00;
+    dev->pci_conf[0x76] = 0x00;
+
+    dev->pci_conf[0x77] = 0x00;
+    dev->pci_conf[0x78] = 0x00;
+    dev->pci_conf[0x79] = 0x00;
+    dev->pci_conf[0x7a] = 0x00;
+    dev->pci_conf[0x7b] = 0x00;
+
+    dev->pci_conf[0x80] = 0x00;
+    dev->pci_conf[0x81] = 0x00;
+    dev->pci_conf[0x82] = 0x00;
+    dev->pci_conf[0x83] = 0x00;
+    dev->pci_conf[0x84] = 0x00;
+    dev->pci_conf[0x85] = 0x00;
+    dev->pci_conf[0x86] = 0x00;
+    dev->pci_conf[0x87] = 0x00;
+
+    dev->pci_conf[0x8c] = 0x00;
+    dev->pci_conf[0x8d] = 0x00;
+    dev->pci_conf[0x8e] = 0x00;
+    dev->pci_conf[0x8f] = 0x00;
+
+    dev->pci_conf[0x90] = 0x00;
+    dev->pci_conf[0x91] = 0x00;
+    dev->pci_conf[0x92] = 0x00;
+    dev->pci_conf[0x93] = 0x00;
+    dev->pci_conf[0x93] = 0x00;
+    dev->pci_conf[0x94] = 0x00;
+    dev->pci_conf[0x95] = 0x00;
+    dev->pci_conf[0x96] = 0x00;
+    dev->pci_conf[0x97] = 0x00;
+    dev->pci_conf[0x98] = 0x00;
+    dev->pci_conf[0x99] = 0x00;
+    dev->pci_conf[0x9a] = 0x00;
+    dev->pci_conf[0x9b] = 0x00;
+    dev->pci_conf[0x9c] = 0x00;
+    dev->pci_conf[0x9d] = 0x00;
+    dev->pci_conf[0x9e] = 0xff;
+    dev->pci_conf[0x9f] = 0xff;
+
+    dev->pci_conf[0xa0] = 0xff;
+    dev->pci_conf[0xa1] = 0x00;
+    dev->pci_conf[0xa2] = 0xff;
+    dev->pci_conf[0xa3] = 0x00;
+
+    cpu_cache_ext_enabled = 0;
+    cpu_update_waitstates();
+
+    sis_5571_smram_recalc(dev);
+    sis_5571_shadow_recalc(dev);
+
+    flushmmucache();
+}
+
+static void
+sis_5571_host_to_pci_close(void *priv)
+{
+    sis_5571_host_to_pci_t *dev = (sis_5571_host_to_pci_t *) priv;
+
+    smram_del(dev->smram);
+    free(dev);
+}
+
+static void *
+sis_5571_host_to_pci_init(UNUSED(const device_t *info))
+{
+    sis_5571_host_to_pci_t *dev = (sis_5571_host_to_pci_t *) calloc(1, sizeof(sis_5571_host_to_pci_t));
+
+    dev->sis = device_get_common_priv();
+
+    /* SMRAM */
+    dev->smram = smram_add();
+
+    sis_5571_host_to_pci_reset(dev);
+
+    return dev;
+}
+
+const device_t sis_5571_h2p_device = {
+    .name          = "SiS 5571 Host to PCI bridge",
+    .internal_name = "sis_5571_host_to_pci",
+    .flags         = DEVICE_PCI,
+    .local         = 0x00,
+    .init          = sis_5571_host_to_pci_init,
+    .close         = sis_5571_host_to_pci_close,
+    .reset         = sis_5571_host_to_pci_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/sis_5571_old.c b/src/chipset/sis_5571_old.c
new file mode 100644
index 000000000..495137aed
--- /dev/null
+++ b/src/chipset/sis_5571_old.c
@@ -0,0 +1,771 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the SiS 5571 Chipset.
+ *
+ *
+ *
+ * Authors: Tiseno100,
+ *
+ *          Copyright 2021 Tiseno100.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+
+#include <86box/dma.h>
+#include <86box/mem.h>
+#include <86box/pci.h>
+#include <86box/pic.h>
+#include <86box/plat_unused.h>
+#include <86box/port_92.h>
+#include <86box/hdc_ide.h>
+#include <86box/hdc_ide_sff8038i.h>
+#include <86box/smram.h>
+#include <86box/usb.h>
+
+#include <86box/chipset.h>
+
+/* Shadow RAM */
+#define LSB_READ     ((dev->pci_conf[0x70 + (cur_reg & 0x07)] & 0x08) ? MEM_READ_INTERNAL : MEM_READ_EXTANY)
+#define LSB_WRITE    ((dev->pci_conf[0x70 + (cur_reg & 0x07)] & 0x02) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY)
+#define MSB_READ     ((dev->pci_conf[0x70 + (cur_reg & 0x07)] & 0x80) ? MEM_READ_INTERNAL : MEM_READ_EXTANY)
+#define MSB_WRITE    ((dev->pci_conf[0x70 + (cur_reg & 0x07)] & 0x20) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY)
+#define SYSTEM_READ  ((dev->pci_conf[0x76] & 0x80) ? MEM_READ_INTERNAL : MEM_READ_EXTANY)
+#define SYSTEM_WRITE ((dev->pci_conf[0x76] & 0x20) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY)
+
+/* IDE Flags (1 Native / 0 Compatibility)*/
+#define PRIMARY_COMP_NAT_SWITCH   (dev->pci_conf_sb[1][9] & 1)
+#define SECONDARY_COMP_NAT_SWITCH (dev->pci_conf_sb[1][9] & 4)
+#define PRIMARY_NATIVE_BASE       (dev->pci_conf_sb[1][0x11] << 8) | (dev->pci_conf_sb[1][0x10] & 0xf8)
+#define PRIMARY_NATIVE_SIDE       (((dev->pci_conf_sb[1][0x15] << 8) | (dev->pci_conf_sb[1][0x14] & 0xfc)) + 2)
+#define SECONDARY_NATIVE_BASE     (dev->pci_conf_sb[1][0x19] << 8) | (dev->pci_conf_sb[1][0x18] & 0xf8)
+#define SECONDARY_NATIVE_SIDE     (((dev->pci_conf_sb[1][0x1d] << 8) | (dev->pci_conf_sb[1][0x1c] & 0xfc)) + 2)
+#define BUS_MASTER_BASE           ((dev->pci_conf_sb[1][0x20] & 0xf0) | (dev->pci_conf_sb[1][0x21] << 8))
+
+#ifdef ENABLE_SIS_5571_LOG
+int sis_5571_do_log = ENABLE_SIS_5571_LOG;
+
+static void
+sis_5571_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (sis_5571_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define sis_5571_log(fmt, ...)
+#endif
+
+typedef struct sis_5571_t {
+    uint8_t nb_slot;
+    uint8_t sb_slot;
+    uint8_t pad;
+    uint8_t usb_irq_state;
+
+    uint8_t pci_conf[256];
+    uint8_t pci_conf_sb[3][256];
+
+    port_92_t  *port_92;
+    sff8038i_t *ide_drive[2];
+    smram_t    *smram;
+    usb_t      *usb;
+} sis_5571_t;
+
+static void
+sis_5571_shadow_recalc(int cur_reg, sis_5571_t *dev)
+{
+    if (cur_reg != 0x76) {
+        mem_set_mem_state_both(0xc0000 + (0x8000 * (cur_reg & 0x07)), 0x4000, LSB_READ | LSB_WRITE);
+        mem_set_mem_state_both(0xc4000 + (0x8000 * (cur_reg & 0x07)), 0x4000, MSB_READ | MSB_WRITE);
+    } else
+        mem_set_mem_state_both(0xf0000, 0x10000, SYSTEM_READ | SYSTEM_WRITE);
+
+    flushmmucache_nopc();
+}
+
+static void
+sis_5571_smm_recalc(sis_5571_t *dev)
+{
+    smram_disable_all();
+
+    switch ((dev->pci_conf[0xa3] & 0xc0) >> 6) {
+        case 0x00:
+            smram_enable(dev->smram, 0xe0000, 0xe0000, 0x8000, (dev->pci_conf[0xa3] & 0x10), 1);
+            break;
+        case 0x01:
+            smram_enable(dev->smram, 0xe0000, 0xa0000, 0x8000, (dev->pci_conf[0xa3] & 0x10), 1);
+            break;
+        case 0x02:
+            smram_enable(dev->smram, 0xe0000, 0xb0000, 0x8000, (dev->pci_conf[0xa3] & 0x10), 1);
+            break;
+        case 0x03:
+            smram_enable(dev->smram, 0xa0000, 0xa0000, 0x10000, (dev->pci_conf[0xa3] & 0x10), 1);
+            break;
+
+        default:
+            break;
+    }
+
+    flushmmucache();
+}
+
+void
+sis_5571_ide_handler(sis_5571_t *dev)
+{
+    ide_pri_disable();
+    ide_sec_disable();
+    if (dev->pci_conf_sb[1][4] & 1) {
+        if (dev->pci_conf_sb[1][0x4a] & 4) {
+            ide_set_base(0, PRIMARY_COMP_NAT_SWITCH ? PRIMARY_NATIVE_BASE : 0x1f0);
+            ide_set_side(0, PRIMARY_COMP_NAT_SWITCH ? PRIMARY_NATIVE_SIDE : 0x3f6);
+            ide_pri_enable();
+        }
+        if (dev->pci_conf_sb[1][0x4a] & 2) {
+            ide_set_base(1, SECONDARY_COMP_NAT_SWITCH ? SECONDARY_NATIVE_BASE : 0x170);
+            ide_set_side(1, SECONDARY_COMP_NAT_SWITCH ? SECONDARY_NATIVE_SIDE : 0x376);
+            ide_sec_enable();
+        }
+    }
+}
+
+void
+sis_5571_bm_handler(sis_5571_t *dev)
+{
+    sff_bus_master_handler(dev->ide_drive[0], dev->pci_conf_sb[1][4] & 4, BUS_MASTER_BASE);
+    sff_bus_master_handler(dev->ide_drive[1], dev->pci_conf_sb[1][4] & 4, BUS_MASTER_BASE + 8);
+}
+
+static void
+memory_pci_bridge_write(UNUSED(int func), int addr, uint8_t val, void *priv)
+{
+    sis_5571_t *dev = (sis_5571_t *) priv;
+
+    switch (addr) {
+        case 0x04: /* Command - low byte */
+        case 0x05: /* Command - high byte */
+            dev->pci_conf[addr] |= val;
+            break;
+
+        case 0x06: /* Status - Low Byte */
+            dev->pci_conf[addr] &= val;
+            break;
+
+        case 0x07: /* Status - High Byte */
+            dev->pci_conf[addr] &= val & 0xbe;
+            break;
+
+        case 0x0d: /* Master latency timer */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x50: /* Host Interface and DRAM arbiter */
+            dev->pci_conf[addr] = val & 0xec;
+            break;
+
+        case 0x51: /* CACHE */
+            dev->pci_conf[addr]   = val;
+            cpu_cache_ext_enabled = !!(val & 0x40);
+            cpu_update_waitstates();
+            break;
+
+        case 0x52:
+            dev->pci_conf[addr] = val & 0xd0;
+            break;
+
+        case 0x53: /* DRAM */
+            dev->pci_conf[addr] = val & 0xfe;
+            break;
+
+        case 0x54: /* FP/EDO */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x55:
+            dev->pci_conf[addr] = val & 0xe0;
+            break;
+
+        case 0x56: /* MDLE delay */
+        case 0x57: /* SDRAM */
+            dev->pci_conf[addr] = val & 0xf8;
+            break;
+
+        case 0x59: /* Buffer strength and current rating  */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x5a:
+            dev->pci_conf[addr] = val & 0x03;
+            break;
+
+        case 0x60: /* Undocumented */
+        case 0x61: /* Undocumented */
+        case 0x62: /* Undocumented */
+        case 0x63: /* Undocumented */
+        case 0x64: /* Undocumented */
+        case 0x65: /* Undocumented */
+        case 0x66: /* Undocumented */
+        case 0x67: /* Undocumented */
+        case 0x68: /* Undocumented */
+        case 0x69: /* Undocumented */
+        case 0x6a: /* Undocumented */
+        case 0x6b: /* Undocumented */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x70:
+        case 0x71:
+        case 0x72:
+        case 0x73:
+        case 0x74:
+        case 0x75:
+        case 0x76: /* Attribute of shadow RAM for BIOS area */
+            dev->pci_conf[addr] = val & ((addr != 0x76) ? 0xee : 0xe8);
+            sis_5571_shadow_recalc(addr, dev);
+            sis_5571_smm_recalc(dev);
+            break;
+
+        case 0x77: /* Characteristics of non-cacheable area */
+            dev->pci_conf[addr] = val & 0x0f;
+            break;
+
+        case 0x78: /* Allocation of Non-Cacheable area #1 */
+        case 0x79: /* NCA1REG2 */
+        case 0x7a: /* Allocation of Non-Cacheable area #2 */
+        case 0x7b: /* NCA2REG2 */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x80: /* PCI master characteristics */
+            dev->pci_conf[addr] = val & 0xfe;
+            break;
+
+        case 0x81:
+            dev->pci_conf[addr] = val & 0xcc;
+            break;
+
+        case 0x82:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x83: /* CPU to PCI characteristics */
+            dev->pci_conf[addr] = val;
+            port_92_set_features(dev->port_92, !!(val & 0x40), !!(val & 0x80));
+            break;
+
+        case 0x84:
+        case 0x85:
+        case 0x86:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x87: /* Miscellanea */
+            dev->pci_conf[addr] = val & 0xf8;
+            break;
+
+        case 0x90: /* PMU control register */
+        case 0x91: /* Address trap for green function */
+        case 0x92:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x93: /* STPCLK# and APM SMI control */
+            dev->pci_conf[addr] = val;
+
+            if ((dev->pci_conf[0x9b] & 1) && !!(val & 2)) {
+                smi_raise();
+                dev->pci_conf[0x9d] |= 1;
+            }
+            break;
+
+        case 0x94: /* 6x86 and Green function control */
+            dev->pci_conf[addr] = val & 0xf8;
+            break;
+
+        case 0x95: /* Test mode control */
+        case 0x96: /* Time slot and Programmable 10-bit I/O port definition */
+            dev->pci_conf[addr] = val & 0xfb;
+            break;
+
+        case 0x97: /* programmable 10-bit I/O port address */
+        case 0x98: /* Programmable 16-bit I/O port */
+        case 0x99:
+        case 0x9a:
+        case 0x9b:
+        case 0x9c:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x9d:
+            dev->pci_conf[addr] &= val;
+            break;
+
+        case 0x9e: /* STPCLK# Assertion Timer */
+        case 0x9f: /* STPCLK# De-assertion Timer */
+        case 0xa0:
+        case 0xa1:
+        case 0xa2:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0xa3: /* SMRAM access control and Power supply control */
+            dev->pci_conf[addr] = val & 0xd0;
+            sis_5571_smm_recalc(dev);
+            break;
+
+        default:
+            break;
+    }
+    sis_5571_log("SiS5571: dev->pci_conf[%02x] = %02x\n", addr, val);
+}
+
+static uint8_t
+memory_pci_bridge_read(UNUSED(int func), int addr, void *priv)
+{
+    const sis_5571_t *dev = (sis_5571_t *) priv;
+
+    sis_5571_log("SiS5571: dev->pci_conf[%02x] (%02x)\n", addr, dev->pci_conf[addr]);
+    return dev->pci_conf[addr];
+}
+
+static void
+pci_isa_bridge_write(int func, int addr, uint8_t val, void *priv)
+{
+    sis_5571_t *dev = (sis_5571_t *) priv;
+    switch (func) {
+        case 0: /* Bridge */
+            switch (addr) {
+                case 0x04: /* Command */
+                    dev->pci_conf_sb[0][addr] |= val & 0x0f;
+                    break;
+
+                case 0x06: /* Status */
+                    dev->pci_conf_sb[0][addr] &= val;
+                    break;
+
+                case 0x40: /* BIOS Control Register */
+                    dev->pci_conf_sb[0][addr] = val & 0x3f;
+                    break;
+
+                case 0x41: /* INTA# Remapping Control Register */
+                case 0x42: /* INTB# Remapping Control Register */
+                case 0x43: /* INTC# Remapping Control Register */
+                case 0x44: /* INTD# Remapping Control Register */
+                    dev->pci_conf_sb[0][addr] = val & 0x8f;
+                    pci_set_irq_routing((addr & 0x07), !(val & 0x80) ? (val & 0x0f) : PCI_IRQ_DISABLED);
+                    break;
+
+                case 0x45:
+                    dev->pci_conf_sb[0][addr] = val & 0xec;
+                    switch ((val & 0xc0) >> 6) {
+                        case 0:
+                            cpu_set_isa_speed(7159091);
+                            break;
+                        case 1:
+                            cpu_set_isa_pci_div(4);
+                            break;
+                        case 2:
+                            cpu_set_isa_pci_div(3);
+                            break;
+
+                        default:
+                            break;
+                    }
+                    break;
+
+                case 0x46:
+                    dev->pci_conf_sb[0][addr] = val & 0xec;
+                    break;
+
+                case 0x47: /* DMA Clock and Wait State Control Register */
+                    dev->pci_conf_sb[0][addr] = val & 0x3e;
+                    break;
+
+                case 0x48: /* ISA Master/DMA Memory Cycle Control Register 1 */
+                case 0x49: /* ISA Master/DMA Memory Cycle Control Register 2 */
+                case 0x4a: /* ISA Master/DMA Memory Cycle Control Register 3 */
+                case 0x4b: /* ISA Master/DMA Memory Cycle Control Register 4 */
+                    dev->pci_conf_sb[0][addr] = val;
+                    break;
+
+                case 0x4c:
+                case 0x4d:
+                case 0x4e:
+                case 0x4f:
+                case 0x50:
+                case 0x51:
+                case 0x52:
+                case 0x53:
+                case 0x54:
+                case 0x55:
+                case 0x56:
+                case 0x57:
+                case 0x58:
+                case 0x59:
+                case 0x5a:
+                case 0x5b:
+                case 0x5c:
+                case 0x5d:
+                case 0x5e:
+                    dev->pci_conf_sb[0][addr] = val;
+                    break;
+
+                case 0x5f:
+                    dev->pci_conf_sb[0][addr] = val & 0x3f;
+                    break;
+
+                case 0x60:
+                    dev->pci_conf_sb[0][addr] = val;
+                    break;
+
+                case 0x61: /* MIRQ Remapping Control Register */
+                    dev->pci_conf_sb[0][addr] = val;
+                    pci_set_mirq_routing(PCI_MIRQ0, !(val & 0x80) ? (val & 0x0f) : PCI_IRQ_DISABLED);
+                    break;
+
+                case 0x62: /* On-board Device DMA Control Register */
+                    dev->pci_conf_sb[0][addr] = val & 0x0f;
+                    dma_set_drq((val & 0x07), 1);
+                    break;
+
+                case 0x63: /* IDEIRQ Remapping Control Register */
+                    dev->pci_conf_sb[0][addr] = val & 0x8f;
+                    if (val & 0x80) {
+                        sff_set_irq_line(dev->ide_drive[0], val & 0x0f);
+                        sff_set_irq_line(dev->ide_drive[1], val & 0x0f);
+                    }
+                    break;
+
+                case 0x64: /* GPIO Control Register */
+                    dev->pci_conf_sb[0][addr] = val & 0xef;
+                    break;
+
+                case 0x65:
+                    dev->pci_conf_sb[0][addr] = val & 0x1b;
+                    break;
+
+                case 0x66: /* GPIO Output Mode Control Register */
+                case 0x67: /* GPIO Output Mode Control Register */
+                    dev->pci_conf_sb[0][addr] = val;
+                    break;
+
+                case 0x68: /* USBIRQ Remapping Control Register */
+                    dev->pci_conf_sb[0][addr] = val & 0x1b;
+                    break;
+
+                case 0x69:
+                    dev->pci_conf_sb[0][addr] = val;
+                    break;
+
+                case 0x6a:
+                    dev->pci_conf_sb[0][addr] = val & 0xfc;
+                    break;
+
+                case 0x6b:
+                    dev->pci_conf_sb[0][addr] = val;
+                    break;
+
+                case 0x6c:
+                    dev->pci_conf_sb[0][addr] = val & 0x03;
+                    break;
+
+                case 0x6e: /* Software-Controlled Interrupt Request, Channels 7-0 */
+                case 0x6f: /* Software-Controlled Interrupt Request, channels 15-8 */
+                    dev->pci_conf_sb[0][addr] = val;
+                    break;
+
+                case 0x70:
+                    dev->pci_conf_sb[0][addr] = val & 0xde;
+                    break;
+
+                case 0x71: /* Type-F DMA Control Register */
+                    dev->pci_conf_sb[0][addr] = val & 0xfe;
+                    break;
+
+                case 0x72: /* SMI Triggered By IRQ/GPIO Control */
+                case 0x73: /* SMI Triggered By IRQ/GPIO Control */
+                    dev->pci_conf_sb[0][addr] = (addr == 0x72) ? val & 0xfe : val;
+                    break;
+
+                case 0x74: /* System Standby Timer Reload, System Standby State Exit And Throttling State Exit Control */
+                case 0x75: /* System Standby Timer Reload, System Standby State Exit And Throttling State Exit Control */
+                case 0x76: /* Monitor Standby Timer Reload And Monitor Standby State ExitControl */
+                case 0x77: /* Monitor Standby Timer Reload And Monitor Standby State ExitControl */
+                    dev->pci_conf_sb[0][addr] = val;
+                    break;
+
+                default:
+                    break;
+            }
+            sis_5571_log("SiS5571-SB: dev->pci_conf[%02x] = %02x\n", addr, val);
+            break;
+
+        case 1: /* IDE Controller */
+            switch (addr) {
+                case 0x04: /* Command low byte */
+                    dev->pci_conf_sb[1][addr] = val & 0x05;
+                    sis_5571_ide_handler(dev);
+                    sis_5571_bm_handler(dev);
+                    break;
+
+                case 0x07: /* Status high byte */
+                    dev->pci_conf_sb[1][addr] &= val;
+                    break;
+
+                case 0x09: /* Programming Interface Byte */
+                    dev->pci_conf_sb[1][addr] = val & 0xcf;
+                    sis_5571_ide_handler(dev);
+                    break;
+
+                case 0x0d: /* Latency Time */
+                case 0x10: /* Primary Channel Base Address Register */
+                case 0x11: /* Primary Channel Base Address Register */
+                case 0x12: /* Primary Channel Base Address Register */
+                case 0x13: /* Primary Channel Base Address Register */
+                case 0x14: /* Primary Channel Base Address Register */
+                case 0x15: /* Primary Channel Base Address Register */
+                case 0x16: /* Primary Channel Base Address Register */
+                case 0x17: /* Primary Channel Base Address Register */
+                case 0x18: /* Secondary Channel Base Address Register */
+                case 0x19: /* Secondary Channel Base Address Register */
+                case 0x1a: /* Secondary Channel Base Address Register */
+                case 0x1b: /* Secondary Channel Base Address Register */
+                case 0x1c: /* Secondary Channel Base Address Register */
+                case 0x1d: /* Secondary Channel Base Address Register */
+                case 0x1e: /* Secondary Channel Base Address Register */
+                case 0x1f: /* Secondary Channel Base Address Register */
+                    dev->pci_conf_sb[1][addr] = val;
+                    sis_5571_ide_handler(dev);
+                    break;
+
+                case 0x20: /* Bus Master IDE Control Register Base Address */
+                case 0x21: /* Bus Master IDE Control Register Base Address */
+                case 0x22: /* Bus Master IDE Control Register Base Address */
+                case 0x23: /* Bus Master IDE Control Register Base Address */
+                    dev->pci_conf_sb[1][addr] = val;
+                    sis_5571_bm_handler(dev);
+                    break;
+
+                case 0x30: /* Expansion ROM Base Address */
+                case 0x31: /* Expansion ROM Base Address */
+                case 0x32: /* Expansion ROM Base Address */
+                case 0x33: /* Expansion ROM Base Address */
+                case 0x40: /* IDE Primary Channel/Master Drive Data Recovery Time Control */
+                case 0x41: /* IDE Primary Channel/Master Drive DataActive Time Control */
+                case 0x42: /* IDE Primary Channel/Slave Drive Data Recovery Time Control */
+                case 0x43: /* IDE Primary Channel/Slave Drive Data Active Time Control */
+                case 0x44: /* IDE Secondary Channel/Master Drive Data Recovery Time Control */
+                case 0x45: /* IDE Secondary Channel/Master Drive Data Active Time Control */
+                case 0x46: /* IDE Secondary Channel/Slave Drive Data Recovery Time Control */
+                case 0x47: /* IDE Secondary Channel/Slave Drive Data Active Time Control */
+                case 0x48: /* IDE Command Recovery Time Control */
+                case 0x49: /* IDE Command Active Time Control */
+                    dev->pci_conf_sb[1][addr] = val;
+                    break;
+
+                case 0x4a: /* IDE General Control Register 0 */
+                    dev->pci_conf_sb[1][addr] = val & 0xaf;
+                    sis_5571_ide_handler(dev);
+                    break;
+
+                case 0x4b: /* IDE General Control register 1 */
+                case 0x4c: /* Prefetch Count of Primary Channel (Low Byte) */
+                case 0x4d: /* Prefetch Count of Primary Channel (High Byte) */
+                case 0x4e: /* Prefetch Count of Secondary Channel (Low Byte) */
+                case 0x4f: /* Prefetch Count of Secondary Channel (High Byte) */
+                    dev->pci_conf_sb[1][addr] = val;
+                    break;
+
+                default:
+                    break;
+            }
+            sis_5571_log("SiS5571-IDE: dev->pci_conf[%02x] = %02x\n", addr, val);
+            break;
+
+        case 2: /* USB Controller */
+            switch (addr) {
+                case 0x04: /* Command - Low Byte */
+                    dev->pci_conf_sb[2][addr] = val;
+                    ohci_update_mem_mapping(dev->usb, dev->pci_conf_sb[2][0x11], dev->pci_conf_sb[2][0x12], dev->pci_conf_sb[2][0x13], dev->pci_conf_sb[2][4] & 1);
+                    break;
+
+                case 0x05: /* Command - High Byte */
+                    dev->pci_conf_sb[2][addr] = val & 0x03;
+                    break;
+
+                case 0x06: /* Status - Low Byte */
+                    dev->pci_conf_sb[2][addr] &= val & 0xc0;
+                    break;
+
+                case 0x07: /* Status - High Byte */
+                    dev->pci_conf_sb[2][addr] &= val;
+                    break;
+
+                case 0x10: /* Memory Space Base Address Register */
+                case 0x11: /* Memory Space Base Address Register */
+                case 0x12: /* Memory Space Base Address Register */
+                case 0x13: /* Memory Space Base Address Register */
+                    dev->pci_conf_sb[2][addr] = val & ((addr == 0x11) ? 0x0f : 0xff);
+                    ohci_update_mem_mapping(dev->usb, dev->pci_conf_sb[2][0x11], dev->pci_conf_sb[2][0x12], dev->pci_conf_sb[2][0x13], dev->pci_conf_sb[2][4] & 1);
+                    break;
+
+                case 0x14: /* IO Space Base Address Register */
+                case 0x15: /* IO Space Base Address Register */
+                case 0x16: /* IO Space Base Address Register */
+                case 0x17: /* IO Space Base Address Register */
+                case 0x3c: /* Interrupt Line */
+                    dev->pci_conf_sb[2][addr] = val;
+                    break;
+
+                default:
+                    break;
+            }
+            sis_5571_log("SiS5571-USB: dev->pci_conf[%02x] = %02x\n", addr, val);
+            break;
+
+        default:
+            break;
+    }
+}
+
+static uint8_t
+pci_isa_bridge_read(int func, int addr, void *priv)
+{
+    const sis_5571_t *dev = (sis_5571_t *) priv;
+
+    switch (func) {
+        case 0:
+            sis_5571_log("SiS5571-SB: dev->pci_conf[%02x] (%02x)\n", addr, dev->pci_conf_sb[0][addr]);
+            return dev->pci_conf_sb[0][addr];
+        case 1:
+            sis_5571_log("SiS5571-IDE: dev->pci_conf[%02x] (%02x)\n", addr, dev->pci_conf_sb[1][addr]);
+            return dev->pci_conf_sb[1][addr];
+        case 2:
+            sis_5571_log("SiS5571-USB: dev->pci_conf[%02x] (%02x)\n", addr, dev->pci_conf_sb[2][addr]);
+            return dev->pci_conf_sb[2][addr];
+
+        default:
+            return 0xff;
+    }
+}
+
+static void
+sis_5571_reset(void *priv)
+{
+    sis_5571_t *dev = (sis_5571_t *) priv;
+
+    /* Memory/PCI Bridge */
+    dev->pci_conf[0x00] = 0x39;
+    dev->pci_conf[0x01] = 0x10;
+    dev->pci_conf[0x02] = 0x71;
+    dev->pci_conf[0x03] = 0x55;
+    dev->pci_conf[0x04] = 0xfd;
+    dev->pci_conf[0x0b] = 0x06;
+    dev->pci_conf[0x9e] = 0xff;
+    dev->pci_conf[0x9f] = 0xff;
+    dev->pci_conf[0xa2] = 0xff;
+
+    /* PCI to ISA bridge */
+    dev->pci_conf_sb[0][0x00] = 0x39;
+    dev->pci_conf_sb[0][0x01] = 0x10;
+    dev->pci_conf_sb[0][0x02] = 0x08;
+    dev->pci_conf_sb[0][0x04] = 0xfd;
+    dev->pci_conf_sb[0][0x08] = 0x01;
+    dev->pci_conf_sb[0][0x0a] = 0x01;
+    dev->pci_conf_sb[0][0x0b] = 0x06;
+
+    /* IDE Controller */
+    dev->pci_conf_sb[1][0x00] = 0x39;
+    dev->pci_conf_sb[1][0x01] = 0x10;
+    dev->pci_conf_sb[1][0x02] = 0x13;
+    dev->pci_conf_sb[1][0x03] = 0x55;
+    dev->pci_conf_sb[1][0x08] = 0xc0;
+    dev->pci_conf_sb[1][0x0a] = 0x01;
+    dev->pci_conf_sb[1][0x0b] = 0x01;
+    dev->pci_conf_sb[1][0x0e] = 0x80;
+    dev->pci_conf_sb[1][0x4a] = 0x06;
+    sff_set_slot(dev->ide_drive[0], dev->sb_slot);
+    sff_set_slot(dev->ide_drive[1], dev->sb_slot);
+    sff_bus_master_reset(dev->ide_drive[0]);
+    sff_bus_master_reset(dev->ide_drive[1]);
+
+    /* USB Controller */
+    dev->pci_conf_sb[2][0x00] = 0x39;
+    dev->pci_conf_sb[2][0x01] = 0x10;
+    dev->pci_conf_sb[2][0x02] = 0x01;
+    dev->pci_conf_sb[2][0x03] = 0x70;
+    dev->pci_conf_sb[2][0x08] = 0xb0;
+    dev->pci_conf_sb[2][0x09] = 0x10;
+    dev->pci_conf_sb[2][0x0a] = 0x03;
+    dev->pci_conf_sb[2][0x0b] = 0xc0;
+    dev->pci_conf_sb[2][0x0e] = 0x80;
+    dev->pci_conf_sb[2][0x14] = 0x01;
+    dev->pci_conf_sb[2][0x3d] = 0x01;
+}
+
+static void
+sis_5571_close(void *priv)
+{
+    sis_5571_t *dev = (sis_5571_t *) priv;
+
+    smram_del(dev->smram);
+    free(dev);
+}
+
+static void *
+sis_5571_init(UNUSED(const device_t *info))
+{
+    sis_5571_t *dev = (sis_5571_t *) calloc(1, sizeof(sis_5571_t));
+
+    pci_add_card(PCI_ADD_NORTHBRIDGE, memory_pci_bridge_read, memory_pci_bridge_write, dev, &dev->nb_slot);
+    pci_add_card(PCI_ADD_SOUTHBRIDGE, pci_isa_bridge_read, pci_isa_bridge_write, dev, &dev->sb_slot);
+
+    /* MIRQ */
+    pci_enable_mirq(0);
+
+    /* Port 92 & SMRAM */
+    dev->port_92 = device_add(&port_92_pci_device);
+    dev->smram   = smram_add();
+
+    /* SFF IDE */
+    dev->ide_drive[0] = device_add_inst(&sff8038i_device, 1);
+    dev->ide_drive[1] = device_add_inst(&sff8038i_device, 2);
+
+    /* USB */
+    dev->usb = device_add(&usb_device);
+
+    sis_5571_reset(dev);
+
+    return dev;
+}
+
+const device_t sis_5571_device = {
+    .name          = "SiS 5571",
+    .internal_name = "sis_5571",
+    .flags         = DEVICE_PCI,
+    .local         = 0,
+    .init          = sis_5571_init,
+    .close         = sis_5571_close,
+    .reset         = sis_5571_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/sis_5572_usb.c b/src/chipset/sis_5572_usb.c
new file mode 100644
index 000000000..bc7dc7d38
--- /dev/null
+++ b/src/chipset/sis_5572_usb.c
@@ -0,0 +1,323 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the SiS 5572 USB controller.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2024 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/dma.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/hdd.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/hdc_ide_sff8038i.h>
+#include <86box/pci.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/pit_fast.h>
+#include <86box/plat.h>
+#include <86box/plat_unused.h>
+#include <86box/port_92.h>
+#include <86box/smram.h>
+#include <86box/spd.h>
+#include <86box/apm.h>
+#include <86box/ddma.h>
+#include <86box/acpi.h>
+#include <86box/smbus.h>
+#include <86box/sis_55xx.h>
+#include <86box/chipset.h>
+#include <86box/usb.h>
+
+#ifdef ENABLE_SIS_5572_USB_LOG
+int sis_5572_usb_do_log = ENABLE_SIS_5572_USB_LOG;
+
+static void
+sis_5572_usb_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (sis_5572_usb_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define sis_5572_usb_log(fmt, ...)
+#endif
+
+typedef struct sis_5572_usb_t {
+    uint8_t     rev;
+
+    uint8_t     usb_unk_regs[256];
+    uint8_t     pci_conf[256];
+
+    uint16_t    usb_unk_base;
+
+    usb_t      *usb;
+
+    sis_55xx_common_t *sis;
+} sis_5572_usb_t;
+
+/* SiS 5572 unknown I/O port (second USB PCI BAR). */
+static void
+sis_5572_usb_unk_write(uint16_t addr, uint8_t val, void *priv)
+{
+    sis_5572_usb_t *dev = (sis_5572_usb_t *) priv;
+
+    addr = (addr - dev->usb_unk_base) & 0x07;
+
+    sis_5572_usb_log("SiS 5572 USB UNK: [W] dev->usb_unk_regs[%02X] = %02X\n", addr, val);
+
+    dev->usb_unk_regs[addr] = val;
+}
+
+static uint8_t
+sis_5572_usb_unk_read(uint16_t addr, void *priv)
+{
+    const sis_5572_usb_t *dev = (sis_5572_usb_t *) priv;
+    uint8_t ret = 0xff;
+
+    addr = (addr - dev->usb_unk_base) & 0x07;
+
+    ret = dev->usb_unk_regs[addr & 0x07];
+
+    sis_5572_usb_log("SiS 5572 USB UNK: [R] dev->usb_unk_regs[%02X] = %02X\n", addr, ret);
+
+    return ret;
+}
+
+void
+sis_5572_usb_write(int addr, uint8_t val, void *priv)
+{
+    sis_5572_usb_t *dev = (sis_5572_usb_t *) priv;
+
+    sis_5572_usb_log("SiS 5572 USB: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
+
+    if (dev->sis->usb_enabled)  switch (addr) {
+        default:
+            break;
+
+        case 0x04: /* Command - Low Byte */
+            if (dev->rev == 0xb0)
+                dev->pci_conf[addr] = val & 0x47;
+            else
+                dev->pci_conf[addr] = val & 0x57;
+            if (dev->usb_unk_base != 0x0000) {
+                io_removehandler(dev->usb_unk_base, 0x0002,
+                                 sis_5572_usb_unk_read, NULL, NULL,
+                                 sis_5572_usb_unk_write, NULL, NULL, dev);
+                if (dev->pci_conf[0x04] & 0x01)
+                    io_sethandler(dev->usb_unk_base, 0x0002,
+                                  sis_5572_usb_unk_read, NULL, NULL,
+                                  sis_5572_usb_unk_write, NULL, NULL, dev);
+            }
+            ohci_update_mem_mapping(dev->usb,
+                                    dev->pci_conf[0x11], dev->pci_conf[0x12],
+                                    dev->pci_conf[0x13], dev->pci_conf[0x04] & 0x02);
+            break;
+
+        case 0x05: /* Command - High Byte */
+            dev->pci_conf[addr] = val & 0x01;
+            break;
+
+        case 0x07: /* Status - High Byte */
+            dev->pci_conf[addr] &= ~(val & 0xf9);
+            break;
+
+        case 0x0d: /* Latency Timer */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x11 ... 0x13: /* Memory Space Base Address Register */
+            dev->pci_conf[addr] = val & ((addr == 0x11) ? 0xf0 : 0xff);
+            ohci_update_mem_mapping(dev->usb,
+                                    dev->pci_conf[0x11], dev->pci_conf[0x12],
+                                    dev->pci_conf[0x13], dev->pci_conf[4] & 0x02);
+            break;
+
+        case 0x14 ... 0x15: /* IO Space Base Address Register */
+            if (dev->rev == 0xb0) {
+                if (dev->usb_unk_base != 0x0000) {
+                    io_removehandler(dev->usb_unk_base, 0x0002,
+                                     sis_5572_usb_unk_read, NULL, NULL,
+                                     sis_5572_usb_unk_write, NULL, NULL, dev);
+                }
+                dev->pci_conf[addr] = val;
+                dev->usb_unk_base = (dev->pci_conf[0x14] & 0xf8) |
+                                    (dev->pci_conf[0x15] << 8);
+                if (dev->usb_unk_base != 0x0000) {
+                    io_sethandler(dev->usb_unk_base, 0x0002,
+                                  sis_5572_usb_unk_read, NULL, NULL,
+                                  sis_5572_usb_unk_write, NULL, NULL, dev);
+                }
+            }
+            break;
+
+        case 0x2c ... 0x2f:
+            if (dev->rev == 0x11)
+                dev->pci_conf[addr] = val;
+            break;
+
+        case 0x3c: /* Interrupt Line */
+            dev->pci_conf[addr] = val;
+            break;
+    }
+}
+
+uint8_t
+sis_5572_usb_read(int addr, void *priv)
+{
+    const sis_5572_usb_t *dev = (sis_5572_usb_t *) priv;
+    uint8_t ret = 0xff;
+
+    if (dev->sis->usb_enabled) {
+        ret = dev->pci_conf[addr];
+
+        sis_5572_usb_log("SiS 5572 USB: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
+    }
+
+    return ret;
+}
+
+static void
+sis_5572_usb_reset(void *priv)
+{
+    sis_5572_usb_t *dev = (sis_5572_usb_t *) priv;
+
+    dev->pci_conf[0x00] = 0x39;
+    dev->pci_conf[0x01] = 0x10;
+    dev->pci_conf[0x02] = 0x01;
+    dev->pci_conf[0x03] = 0x70;
+    dev->pci_conf[0x04] = dev->pci_conf[0x05] = 0x00;
+    dev->pci_conf[0x06] = (dev->rev == 0xb0) ? 0x00 : 0x80;
+    dev->pci_conf[0x07] = 0x02;
+    dev->pci_conf[0x08] = dev->rev;
+    dev->pci_conf[0x09] = 0x10;
+    dev->pci_conf[0x0a] = 0x03;
+    dev->pci_conf[0x0b] = 0x0c;
+    dev->pci_conf[0x0c] = dev->pci_conf[0x0d] = 0x00;
+    dev->pci_conf[0x0e] = 0x80 /* 0x10  - Datasheet erratum - header type 0x10 is invalid! */;
+    dev->pci_conf[0x0f] = 0x00;
+    dev->pci_conf[0x10] = 0x00;
+    dev->pci_conf[0x11] = 0x00;
+    dev->pci_conf[0x12] = 0x00;
+    dev->pci_conf[0x13] = 0x00;
+    if (dev->rev == 0xb0) {
+        dev->pci_conf[0x14] = 0x01;
+        dev->pci_conf[0x15] = 0x00;
+        dev->pci_conf[0x16] = 0x00;
+        dev->pci_conf[0x17] = 0x00;
+    } else if (dev->rev == 0x11) {
+        dev->pci_conf[0x2c] = 0x00;
+        dev->pci_conf[0x2d] = 0x00;
+        dev->pci_conf[0x2e] = 0x00;
+        dev->pci_conf[0x2f] = 0x00;
+    }
+    dev->pci_conf[0x3c] = 0x00;
+    dev->pci_conf[0x3d] = PCI_INTA;
+    dev->pci_conf[0x3e] = 0x00;
+    dev->pci_conf[0x3f] = 0x00;
+
+    if (dev->rev == 0xb0) {
+        ohci_update_mem_mapping(dev->usb,
+                                dev->pci_conf[0x11], dev->pci_conf[0x12],
+                                dev->pci_conf[0x13], dev->pci_conf[0x04] & 0x02);
+
+        if (dev->usb_unk_base != 0x0000) {
+            io_removehandler(dev->usb_unk_base, 0x0002,
+                             sis_5572_usb_unk_read, NULL, NULL,
+                             sis_5572_usb_unk_write, NULL, NULL, dev);
+        }
+
+        dev->usb_unk_base = 0x0000;
+
+        memset(dev->usb_unk_regs, 0x00, sizeof(dev->usb_unk_regs));
+    }
+}
+
+static void
+sis_5572_usb_close(void *priv)
+{
+    sis_5572_usb_t *dev = (sis_5572_usb_t *) priv;
+
+    free(dev);
+}
+
+static void *
+sis_5572_usb_init(UNUSED(const device_t *info))
+{
+    sis_5572_usb_t *dev = (sis_5572_usb_t *) calloc(1, sizeof(sis_5572_usb_t));
+
+    dev->rev = info->local;
+
+    dev->sis = device_get_common_priv();
+
+    /* USB */
+    dev->usb = device_add(&usb_device);
+
+    sis_5572_usb_reset(dev);
+
+    return dev;
+}
+
+const device_t sis_5572_usb_device = {
+    .name          = "SiS 5572 USB controller",
+    .internal_name = "sis_5572_usb",
+    .flags         = DEVICE_PCI,
+    .local         = 0xb0,
+    .init          = sis_5572_usb_init,
+    .close         = sis_5572_usb_close,
+    .reset         = sis_5572_usb_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t sis_5582_usb_device = {
+    .name          = "SiS 5582 USB controller",
+    .internal_name = "sis_5582_usb",
+    .flags         = DEVICE_PCI,
+    .local         = 0xe0,
+    .init          = sis_5572_usb_init,
+    .close         = sis_5572_usb_close,
+    .reset         = sis_5572_usb_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t sis_5595_usb_device = {
+    .name          = "SiS 5595 USB controller",
+    .internal_name = "sis_5595_usb",
+    .flags         = DEVICE_PCI,
+    .local         = 0x11,
+    .init          = sis_5572_usb_init,
+    .close         = sis_5572_usb_close,
+    .reset         = sis_5572_usb_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/sis_5581.c b/src/chipset/sis_5581.c
new file mode 100644
index 000000000..525fe6598
--- /dev/null
+++ b/src/chipset/sis_5581.c
@@ -0,0 +1,187 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the SiS 5581/5582 Pentium PCI/ISA Chipset.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2024 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/apm.h>
+#include <86box/acpi.h>
+#include <86box/keyboard.h>
+#include <86box/hdd.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/hdc_ide_sff8038i.h>
+#include <86box/pci.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/pit_fast.h>
+#include <86box/plat.h>
+#include <86box/plat_unused.h>
+#include <86box/port_92.h>
+#include <86box/smram.h>
+#include <86box/spd.h>
+#include <86box/sis_55xx.h>
+#include <86box/chipset.h>
+
+#ifdef ENABLE_SIS_5581_LOG
+int sis_5581_do_log = ENABLE_SIS_5581_LOG;
+
+static void
+sis_5581_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (sis_5581_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define sis_5581_log(fmt, ...)
+#endif
+
+typedef struct sis_5581_t {
+    uint8_t            nb_slot;
+    uint8_t            sb_slot;
+
+    void              *h2p;
+    void              *p2i;
+    void              *ide;
+    void              *usb;
+
+    sis_55xx_common_t *sis;
+} sis_5581_t;
+
+static void
+sis_5581_write(int func, int addr, uint8_t val, void *priv)
+{
+    const sis_5581_t *dev = (sis_5581_t *) priv;
+
+    sis_5581_log("SiS 5581: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
+
+    if (func == 0x00)
+        sis_5581_host_to_pci_write(addr, val, dev->h2p);
+}
+
+static uint8_t
+sis_5581_read(int func, int addr, void *priv)
+{
+    const sis_5581_t *dev = (sis_5581_t *) priv;
+    uint8_t ret = 0xff;
+
+    if (func == 0x00)
+        ret = sis_5581_host_to_pci_read(addr, dev->h2p);
+
+    sis_5581_log("SiS 5581: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
+
+    return ret;
+}
+
+static void
+sis_5582_write(int func, int addr, uint8_t val, void *priv)
+{
+    const sis_5581_t *dev = (sis_5581_t *) priv;
+
+    sis_5581_log("SiS 5582: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
+
+    switch (func) {
+        case 0x00:
+            sis_5513_pci_to_isa_write(addr, val, dev->p2i);
+            break;
+        case 0x01:
+            sis_5513_ide_write(addr, val, dev->ide);
+            break;
+        case 0x02:
+            sis_5572_usb_write(addr, val, dev->usb);
+            break;
+    }
+}
+
+static uint8_t
+sis_5582_read(int func, int addr, void *priv)
+{
+    const sis_5581_t *dev = (sis_5581_t *) priv;
+    uint8_t ret = 0xff;
+
+    switch (func) {
+        case 0x00:
+            ret = sis_5513_pci_to_isa_read(addr, dev->p2i);
+            break;
+        case 0x01:
+            ret = sis_5513_ide_read(addr, dev->ide);
+            break;
+        case 0x02:
+            ret = sis_5572_usb_read(addr, dev->usb);
+            break;
+    }
+
+    sis_5581_log("SiS 5582: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
+
+    return ret;
+}
+
+static void
+sis_5581_close(void *priv)
+{
+    sis_5581_t *dev = (sis_5581_t *) priv;
+
+    free(dev);
+}
+
+static void *
+sis_5581_init(UNUSED(const device_t *info))
+{
+    sis_5581_t *dev = (sis_5581_t *) calloc(1, sizeof(sis_5581_t));
+
+    /* Device 0: SiS 5581 */
+    pci_add_card(PCI_ADD_NORTHBRIDGE, sis_5581_read, sis_5581_write, dev, &dev->nb_slot);
+    /* Device 1: SiS 5582 */
+    pci_add_card(PCI_ADD_SOUTHBRIDGE, sis_5582_read, sis_5582_write, dev, &dev->sb_slot);
+
+    dev->sis = device_add(&sis_55xx_common_device);
+
+    dev->p2i = device_add_linked(&sis_5582_p2i_device, dev->sis);
+    dev->h2p = device_add_linked(&sis_5581_h2p_device, dev->sis);
+    dev->ide = device_add_linked(&sis_5582_ide_device, dev->sis);
+    dev->usb = device_add_linked(&sis_5582_usb_device, dev->sis);
+
+    device_add_params(&kbc_at_device, (void *) KBC_VEN_SIS);
+
+    return dev;
+}
+
+const device_t sis_5581_device = {
+    .name          = "SiS 5581",
+    .internal_name = "sis_5581",
+    .flags         = DEVICE_PCI,
+    .local         = 0,
+    .init          = sis_5581_init,
+    .close         = sis_5581_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/sis_5581_h2p.c b/src/chipset/sis_5581_h2p.c
new file mode 100644
index 000000000..83983376d
--- /dev/null
+++ b/src/chipset/sis_5581_h2p.c
@@ -0,0 +1,553 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the SiS 5581 Host to PCI bridge.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2024 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/dma.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/hdd.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/hdc_ide_sff8038i.h>
+#include <86box/pci.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/pit_fast.h>
+#include <86box/plat.h>
+#include <86box/plat_unused.h>
+#include <86box/port_92.h>
+#include <86box/smram.h>
+#include <86box/spd.h>
+#include <86box/apm.h>
+#include <86box/ddma.h>
+#include <86box/acpi.h>
+#include <86box/smbus.h>
+#include <86box/sis_55xx.h>
+#include <86box/chipset.h>
+#include <86box/usb.h>
+
+#ifdef ENABLE_SIS_5581_HOST_TO_PCI_LOG
+int sis_5581_host_to_pci_do_log = ENABLE_SIS_5581_HOST_TO_PCI_LOG;
+
+static void
+sis_5581_host_to_pci_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (sis_5581_host_to_pci_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define sis_5581_host_to_pci_log(fmt, ...)
+#endif
+
+typedef struct {
+    uint8_t  installed;
+    uint8_t  code;
+    uint32_t phys_size;
+} ram_bank_t;
+
+typedef struct sis_5581_io_trap_t {
+    void          *priv;
+    void          *trap;
+    uint8_t        flags, mask;
+    uint8_t       *sts_reg, sts_mask;
+    uint16_t       addr;
+} sis_5581_io_trap_t;
+
+typedef struct sis_5581_host_to_pci_t {
+    uint8_t            pci_conf[256];
+    uint8_t            states[7];
+
+    ram_bank_t         ram_banks[3];
+
+    sis_5581_io_trap_t io_traps[10];
+
+    sis_55xx_common_t *sis;
+
+    smram_t           *smram;
+} sis_5581_host_to_pci_t;
+
+static uint8_t  bank_codes[7] = { 0x00, 0x20, 0x24, 0x22, 0x26, 0x2a, 0x2b };
+
+static uint32_t bank_sizes[7] = { 0x00800000,      /*   8 MB */
+                                  0x01000000,      /*  16 MB */
+                                  0x02000000,      /*  32 MB */
+                                  0x04000000,      /*  64 MB */
+                                  0x08000000,      /* 128 MB */
+                                  0x10000000,      /* 256 MB */
+                                  0x20000000 };    /* 512 MB */
+
+static void
+sis_5581_shadow_recalc(sis_5581_host_to_pci_t *dev)
+{
+    int      state;
+    uint32_t base;
+
+    for (uint8_t i = 0x70; i <= 0x76; i++) {
+        if (i == 0x76) {
+            if ((dev->states[i & 0x0f] ^ dev->pci_conf[i]) & 0xa0) {
+                state = (dev->pci_conf[i] & 0x80) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+                state |= (dev->pci_conf[i] & 0x20) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+                mem_set_mem_state_both(0xf0000, 0x10000, state);
+                sis_5581_host_to_pci_log("000F0000-000FFFFF\n");
+            }
+        } else {
+            base = ((i & 0x07) << 15) + 0xc0000;
+
+            if ((dev->states[i & 0x0f] ^ dev->pci_conf[i]) & 0xa0) {
+                state = (dev->pci_conf[i] & 0x80) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+                state |= (dev->pci_conf[i] & 0x20) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+                mem_set_mem_state_both(base, 0x4000, state);
+                sis_5581_host_to_pci_log("%08X-%08X\n", base, base + 0x3fff);
+            }
+
+            if ((dev->states[i & 0x0f] ^ dev->pci_conf[i]) & 0x0a) {
+                state = (dev->pci_conf[i] & 0x08) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+                state |= (dev->pci_conf[i] & 0x02) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+                mem_set_mem_state_both(base + 0x4000, 0x4000, state);
+                sis_5581_host_to_pci_log("%08X-%08X\n", base + 0x4000, base + 0x7fff);
+            }
+        }
+
+        dev->states[i & 0x0f] = dev->pci_conf[i];
+    }
+
+    flushmmucache_nopc();
+}
+
+static void
+sis_5581_trap_io(UNUSED(int size), UNUSED(uint16_t addr), UNUSED(uint8_t write), UNUSED(uint8_t val),
+                        void *priv)
+{
+    sis_5581_io_trap_t *trap = (sis_5581_io_trap_t *) priv;
+    sis_5581_host_to_pci_t *dev = (sis_5581_host_to_pci_t *) trap->priv;
+
+    trap->sts_reg[0x04] |= trap->sts_mask;
+
+    if (trap->sts_reg[0x00] & trap->sts_mask)
+        acpi_sis5582_pmu_event(dev->sis->acpi);
+}
+
+static void
+sis_5581_trap_io_mask(int size, uint16_t addr, uint8_t write, uint8_t val, void *priv)
+{
+    sis_5581_io_trap_t *trap = (sis_5581_io_trap_t *) priv;
+
+    if ((addr & trap->mask) == (trap->addr & trap->mask))
+        sis_5581_trap_io(size, addr, write, val, priv);
+}
+
+static void
+sis_5581_trap_update_devctl(sis_5581_host_to_pci_t *dev, uint8_t trap_id, uint8_t enable,
+                            uint8_t flags, uint8_t mask, uint8_t *sts_reg, uint8_t sts_mask,
+                            uint16_t addr, uint16_t size)
+{
+    sis_5581_io_trap_t *trap = &dev->io_traps[trap_id];
+
+    /* Set up Device I/O traps dynamically. */
+    if (enable && !trap->trap) {
+        trap->priv     = (void *) dev;
+        trap->flags    = flags;
+        trap->mask     = mask;
+        trap->addr     = addr;
+        if (flags & 0x08)
+            trap->trap     = io_trap_add(sis_5581_trap_io_mask, trap);
+        else
+            trap->trap     = io_trap_add(sis_5581_trap_io, trap);
+        trap->sts_reg  = sts_reg;
+        trap->sts_mask = sts_mask;
+    }
+
+    /* Remap I/O trap. */
+    io_trap_remap(trap->trap, enable, addr, size);
+}
+
+static void
+sis_5581_trap_update(void *priv)
+{
+    sis_5581_host_to_pci_t *dev     = (sis_5581_host_to_pci_t *) priv;
+    uint8_t                 trap_id = 0;
+    uint8_t                *fregs   = dev->pci_conf;
+    uint16_t                temp;
+    uint8_t                 mask;
+    uint8_t                 on;
+
+    on = fregs[0x9a];
+
+    temp = ((fregs[0x96] & 0x02) | (fregs[0x97] << 2)) & 0x03ff;
+    mask = ~((1 << ((fregs[0x96] >> 3) & 0x07)) - 1);
+
+    sis_5581_trap_update_devctl(dev, trap_id++,
+                                on & 0x40, 0x08, mask, &(fregs[0x9c]), 0x40, temp, 0x80);
+
+    temp = fregs[0x98] | (fregs[0x99] << 8);
+    mask = 0xff;
+
+    sis_5581_trap_update_devctl(dev, trap_id++,
+                                on & 0x20, 0x08, mask, &(fregs[0x9c]), 0x20, temp, 0x80);
+
+    sis_5581_trap_update_devctl(dev, trap_id++,
+                                on & 0x10, 0x00, 0xff, &(fregs[0x9c]), 0x10, 0x378, 0x08);
+    sis_5581_trap_update_devctl(dev, trap_id++,
+                                on & 0x10, 0x00, 0xff, &(fregs[0x9c]), 0x10, 0x278, 0x08);
+
+    sis_5581_trap_update_devctl(dev, trap_id++,
+                                on & 0x08, 0x00, 0xff, &(fregs[0x9c]), 0x08, 0x3f8, 0x08);
+
+    sis_5581_trap_update_devctl(dev, trap_id++,
+                                on & 0x04, 0x00, 0xff, &(fregs[0x9c]), 0x04, 0x2f8, 0x08);
+
+    sis_5581_trap_update_devctl(dev, trap_id++,
+                                on & 0x02, 0x00, 0xff, &(fregs[0x9c]), 0x02, 0x1f0, 0x08);
+
+    sis_5581_trap_update_devctl(dev, trap_id++,
+                                on & 0x01, 0x00, 0xff, &(fregs[0x9c]), 0x01, 0x170, 0x08);
+
+    on = fregs[0x9b];
+    sis_5581_trap_update_devctl(dev, trap_id++,
+                                on & 0x08, 0x00, 0xff, &(fregs[0x9d]), 0x08, 0x064, 0x01);
+    sis_5581_trap_update_devctl(dev, trap_id++,
+                                on & 0x08, 0x00, 0xff, &(fregs[0x9d]), 0x08, 0x060, 0x01);
+}
+
+static void
+sis_5581_smram_recalc(sis_5581_host_to_pci_t *dev)
+{
+    smram_disable_all();
+
+    switch (dev->pci_conf[0xa3] >> 6) {
+        case 0:
+            smram_enable(dev->smram, 0x000e0000, 0x000e0000, 0x8000, dev->pci_conf[0xa3] & 0x10, 1);
+            break;
+        case 1:
+            smram_enable(dev->smram, 0x000e0000, 0x000a0000, 0x8000, dev->pci_conf[0xa3] & 0x10, 1);
+            break;
+        case 2:
+            smram_enable(dev->smram, 0x000e0000, 0x000b0000, 0x8000, dev->pci_conf[0xa3] & 0x10, 1);
+            break;
+        case 3:
+            smram_enable(dev->smram, 0x000a0000, 0x000a0000, 0x10000, dev->pci_conf[0xa3] & 0x10, 1);
+            break;
+
+        default:
+            break;
+    }
+
+    flushmmucache();
+}
+
+void
+sis_5581_host_to_pci_write(int addr, uint8_t val, void *priv)
+{
+    sis_5581_host_to_pci_t *dev = (sis_5581_host_to_pci_t *) priv;
+
+    sis_5581_host_to_pci_log("SiS 5581 H2P: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
+
+    switch (addr) {
+        default:
+            break;
+
+        case 0x04: /* Command - Low Byte */
+            dev->pci_conf[addr] = (dev->pci_conf[addr] & 0xfc) | (val & 0x03);
+            break;
+        case 0x05: /* Command - High Byte */
+            dev->pci_conf[addr] = val & 0x02;
+            break;
+
+        case 0x07: /* Status - High Byte */
+            dev->pci_conf[addr] &= ~(val & 0xb8);
+            break;
+
+        case 0x0d: /* Master latency timer */
+        case 0x50:
+        case 0x54:
+        case 0x56 ... 0x57:
+        case 0x59:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x51:
+            dev->pci_conf[addr] = val;
+            cpu_cache_ext_enabled = !!(val & 0x40);
+            cpu_update_waitstates();
+            break;
+
+        case 0x52:
+            dev->pci_conf[addr] = val & 0xeb;
+            break;
+
+        case 0x53:
+        case 0x55:
+            dev->pci_conf[addr] = val & 0xfe;
+            break;
+
+        case 0x58:
+            dev->pci_conf[addr] = val & 0xfc;
+            break;
+
+        case 0x5a:
+            dev->pci_conf[addr] = val & 0x03;
+            break;
+
+        case 0x60 ... 0x62:
+            dev->pci_conf[addr] = dev->ram_banks[addr & 0x0f].code | 0xc0;
+            break;
+
+        case 0x63:
+            dev->pci_conf[addr] = dev->ram_banks[0].installed |
+                                  (dev->ram_banks[1].installed << 1) |
+                                  (dev->ram_banks[2].installed << 2);
+            break;
+
+        case 0x70 ... 0x75:
+            dev->pci_conf[addr] = val & 0xee;
+            sis_5581_shadow_recalc(dev);
+            break;
+        case 0x76:
+            dev->pci_conf[addr] = val & 0xe8;
+            sis_5581_shadow_recalc(dev);
+            break;
+
+        case 0x77: /* Characteristics of non-cacheable area */
+            dev->pci_conf[addr] = val & 0x0f;
+            break;
+
+        case 0x78: /* Allocation of Non-Cacheable area #1 */
+        case 0x79: /* NCA1REG2 */
+        case 0x7a: /* Allocation of Non-Cacheable area #2 */
+        case 0x7b: /* NCA2REG2 */
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x80: /* PCI master characteristics */
+            dev->pci_conf[addr] = val & 0xfe;
+            break;
+
+        case 0x81:
+            dev->pci_conf[addr] = val & 0xde;
+            break;
+
+        case 0x82:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x83: /* CPU to PCI characteristics */
+            dev->pci_conf[addr] = val;
+            /* TODO: Implement Fast A20 and Fast reset stuff on the KBC already! */
+            break;
+
+        case 0x84 ... 0x86:
+        case 0x88 ... 0x8b:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x87: /* Miscellanea */
+            dev->pci_conf[addr] = val & 0xfe;
+            break;
+
+        case 0x8c ... 0x92:
+        case 0x9e ... 0xa2:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x93:
+            dev->pci_conf[addr] = val;
+            if (val & 0x02) {
+                dev->pci_conf[0x9d] |= 0x01;
+                if (dev->pci_conf[0x9b] & 0x01)
+                    acpi_sis5582_pmu_event(dev->sis->acpi);
+            }
+            break;
+
+        case 0x94:
+            dev->pci_conf[addr] = val & 0xf8;
+            break;
+
+        case 0x95:
+            dev->pci_conf[addr] = val & 0xfb;
+            break;
+
+        case 0x96:
+            dev->pci_conf[addr] = val & 0xfb;
+            sis_5581_trap_update(dev);
+            break;
+        case 0x97 ... 0x9b:
+            dev->pci_conf[addr] = val;
+            sis_5581_trap_update(dev);
+            break;
+
+        case 0x9c ... 0x9d:
+            dev->pci_conf[addr] &= ~val;
+            break;
+
+        case 0xa3:
+            dev->pci_conf[addr] = val;
+            sis_5581_smram_recalc(dev);
+            break;
+    }
+}
+
+uint8_t
+sis_5581_host_to_pci_read(int addr, void *priv)
+{
+    const sis_5581_host_to_pci_t *dev = (sis_5581_host_to_pci_t *) priv;
+    uint8_t ret = 0xff;
+
+    ret = dev->pci_conf[addr];
+
+    sis_5581_host_to_pci_log("SiS 5581 H2P: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
+
+    return ret;
+}
+
+static void
+sis_5581_host_to_pci_reset(void *priv)
+{
+    sis_5581_host_to_pci_t *dev = (sis_5581_host_to_pci_t *) priv;
+
+    dev->pci_conf[0x00] = 0x39;
+    dev->pci_conf[0x01] = 0x10;
+    dev->pci_conf[0x02] = 0x97;
+    dev->pci_conf[0x03] = 0x55;
+    dev->pci_conf[0x04] = 0x05;
+    dev->pci_conf[0x05] = dev->pci_conf[0x06] = 0x00;
+    dev->pci_conf[0x07] = 0x02;
+    dev->pci_conf[0x08] = 0x02;
+    dev->pci_conf[0x09] = dev->pci_conf[0x0a] = 0x00;
+    dev->pci_conf[0x0b] = 0x06;
+    dev->pci_conf[0x0c] = 0x00;
+    dev->pci_conf[0x0d] = 0xff;
+    dev->pci_conf[0x0e] = dev->pci_conf[0x0f] = 0x00;
+    dev->pci_conf[0x50] = dev->pci_conf[0x51] = 0x00;
+    dev->pci_conf[0x52] = 0x00;
+    dev->pci_conf[0x53] = 0x38;
+    dev->pci_conf[0x54] = 0x54;
+    dev->pci_conf[0x55] = 0x00;
+    dev->pci_conf[0x56] = 0x80;
+    dev->pci_conf[0x57] = dev->pci_conf[0x58] = 0x00;
+    dev->pci_conf[0x59] = dev->pci_conf[0x5a] = 0x00;
+    dev->pci_conf[0x60] = dev->pci_conf[0x61] = 0x00;
+    dev->pci_conf[0x62] = 0x00;
+    dev->pci_conf[0x63] = 0xff;
+    dev->pci_conf[0x70] = dev->pci_conf[0x71] = 0x00;
+    dev->pci_conf[0x72] = dev->pci_conf[0x73] = 0x00;
+    dev->pci_conf[0x74] = dev->pci_conf[0x75] = 0x00;
+    dev->pci_conf[0x76] = dev->pci_conf[0x77] = 0x00;
+    dev->pci_conf[0x78] = dev->pci_conf[0x79] = 0x00;
+    dev->pci_conf[0x7a] = dev->pci_conf[0x7b] = 0x00;
+    dev->pci_conf[0x80] = dev->pci_conf[0x81] = 0x00;
+    dev->pci_conf[0x82] = dev->pci_conf[0x83] = 0x00;
+    dev->pci_conf[0x84] = dev->pci_conf[0x85] = 0x00;
+    dev->pci_conf[0x86] = dev->pci_conf[0x87] = 0x00;
+    dev->pci_conf[0x88] = dev->pci_conf[0x89] = 0x00;
+    dev->pci_conf[0x8a] = dev->pci_conf[0x8b] = 0x00;
+    dev->pci_conf[0x90] = dev->pci_conf[0x91] = 0x00;
+    dev->pci_conf[0x92] = dev->pci_conf[0x93] = 0x00;
+    dev->pci_conf[0x94] = dev->pci_conf[0x95] = 0x00;
+    dev->pci_conf[0x96] = dev->pci_conf[0x97] = 0x00;
+    dev->pci_conf[0x98] = dev->pci_conf[0x99] = 0x00;
+    dev->pci_conf[0x9a] = dev->pci_conf[0x9b] = 0x00;
+    dev->pci_conf[0x9c] = dev->pci_conf[0x9d] = 0x00;
+    dev->pci_conf[0x9e] = dev->pci_conf[0x9f] = 0xff;
+    dev->pci_conf[0xa0] = 0xff;
+    dev->pci_conf[0xa1] = 0x00;
+    dev->pci_conf[0xa2] = 0xff;
+    dev->pci_conf[0xa3] = 0x00;
+
+    cpu_cache_ext_enabled = 0;
+    cpu_update_waitstates();
+
+    sis_5581_shadow_recalc(dev);
+
+    sis_5581_trap_update(dev);
+
+    sis_5581_smram_recalc(dev);
+}
+
+static void
+sis_5581_host_to_pci_close(void *priv)
+{
+    sis_5581_host_to_pci_t *dev = (sis_5581_host_to_pci_t *) priv;
+
+    smram_del(dev->smram);
+    free(dev);
+}
+
+static void *
+sis_5581_host_to_pci_init(UNUSED(const device_t *info))
+{
+    sis_5581_host_to_pci_t *dev = (sis_5581_host_to_pci_t *) calloc(1, sizeof(sis_5581_host_to_pci_t));
+    uint32_t total_mem = mem_size << 10;
+    ram_bank_t *rb;
+
+    dev->sis = device_get_common_priv();
+
+    /* Calculate the physical RAM banks. */
+    for (uint8_t i = 0; i < 3; i++) {
+        rb = &(dev->ram_banks[i]);
+        uint32_t size = 0x00000000;
+        uint8_t  index = 0;
+        for (int8_t j = 6; j >= 0; j--) {
+            uint32_t *bs = &(bank_sizes[j]);
+            if (*bs <= total_mem) {
+                size = *bs;
+                index = j;
+                break;
+            }
+        }
+        if (size != 0x00000000) {
+            rb->installed = 1;
+            rb->code = bank_codes[index];
+            rb->phys_size = size;
+            total_mem -= size;
+        } else
+            rb->installed = 0;
+    }
+
+    /* SMRAM */
+    dev->smram = smram_add();
+
+    sis_5581_host_to_pci_reset(dev);
+
+    return dev;
+}
+
+const device_t sis_5581_h2p_device = {
+    .name          = "SiS 5581 Host to PCI bridge",
+    .internal_name = "sis_5581_host_to_pci",
+    .flags         = DEVICE_PCI,
+    .local         = 0x00,
+    .init          = sis_5581_host_to_pci_init,
+    .close         = sis_5581_host_to_pci_close,
+    .reset         = sis_5581_host_to_pci_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/sis_5591.c b/src/chipset/sis_5591.c
new file mode 100644
index 000000000..d814e0f74
--- /dev/null
+++ b/src/chipset/sis_5591.c
@@ -0,0 +1,213 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the SiS 5591/5592 Pentium PCI/ISA Chipset.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2024 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/apm.h>
+#include <86box/acpi.h>
+#include <86box/keyboard.h>
+#include <86box/hdd.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/hdc_ide_sff8038i.h>
+#include <86box/pci.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/pit_fast.h>
+#include <86box/plat.h>
+#include <86box/plat_unused.h>
+#include <86box/port_92.h>
+#include <86box/smram.h>
+#include <86box/spd.h>
+#include <86box/sis_55xx.h>
+#include <86box/chipset.h>
+
+#ifdef ENABLE_SIS_5591_LOG
+int sis_5591_do_log = ENABLE_SIS_5591_LOG;
+
+static void
+sis_5591_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (sis_5591_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define sis_5591_log(fmt, ...)
+#endif
+
+typedef struct sis_5591_t {
+    uint8_t            nb_slot;
+    uint8_t            sb_slot;
+
+    void              *h2p;
+    void              *p2i;
+    void              *ide;
+    void              *usb;
+    void              *pmu;
+
+    sis_55xx_common_t *sis;
+} sis_5591_t;
+
+static void
+sis_5591_write(int func, int addr, uint8_t val, void *priv)
+{
+    const sis_5591_t *dev = (sis_5591_t *) priv;
+
+    sis_5591_log("SiS 5591: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
+
+    if (func == 0x00)
+        sis_5591_host_to_pci_write(addr, val, dev->h2p);
+    else if (func == 0x01)
+        sis_5513_ide_write(addr, val, dev->ide);
+}
+
+static uint8_t
+sis_5591_read(int func, int addr, void *priv)
+{
+    const sis_5591_t *dev = (sis_5591_t *) priv;
+    uint8_t ret = 0xff;
+
+    if (func == 0x00)
+        ret = sis_5591_host_to_pci_read(addr, dev->h2p);
+    else if (func == 0x01)
+        ret = sis_5513_ide_read(addr, dev->ide);
+
+    sis_5591_log("SiS 5591: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
+
+    return ret;
+}
+
+static void
+sis_5595_write(int func, int addr, uint8_t val, void *priv)
+{
+    const sis_5591_t *dev = (sis_5591_t *) priv;
+
+    sis_5591_log("SiS 5595: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
+
+    switch (func) {
+        case 0x00:
+            sis_5513_pci_to_isa_write(addr, val, dev->p2i);
+            break;
+        case 0x01:
+            sis_5595_pmu_write(addr, val, dev->pmu);
+            break;
+        case 0x02:
+            sis_5572_usb_write(addr, val, dev->usb);
+            break;
+    }
+}
+
+static uint8_t
+sis_5595_read(int func, int addr, void *priv)
+{
+    const sis_5591_t *dev = (sis_5591_t *) priv;
+    uint8_t ret = 0xff;
+
+    switch (func) {
+        case 0x00:
+            ret = sis_5513_pci_to_isa_read(addr, dev->p2i);
+            break;
+        case 0x01:
+            ret = sis_5595_pmu_read(addr, dev->pmu);
+            break;
+        case 0x02:
+            ret = sis_5572_usb_read(addr, dev->usb);
+            break;
+    }
+
+    sis_5591_log("SiS 5592: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
+
+    return ret;
+}
+
+static void
+sis_5591_close(void *priv)
+{
+    sis_5591_t *dev = (sis_5591_t *) priv;
+
+    free(dev);
+}
+
+static void *
+sis_5591_init(UNUSED(const device_t *info))
+{
+    sis_5591_t *dev = (sis_5591_t *) calloc(1, sizeof(sis_5591_t));
+
+    /* Device 0: SiS 5591 */
+    pci_add_card(PCI_ADD_NORTHBRIDGE, sis_5591_read, sis_5591_write, dev, &dev->nb_slot);
+    /* Device 1: SiS 5595 */
+    pci_add_card(PCI_ADD_SOUTHBRIDGE, sis_5595_read, sis_5595_write, dev, &dev->sb_slot);
+
+    dev->sis = device_add(&sis_55xx_common_device);
+
+    dev->ide = device_add_linked(&sis_5591_5600_ide_device, dev->sis);
+    if (info->local)
+        dev->p2i = device_add_linked(&sis_5595_1997_p2i_device, dev->sis);
+    else
+        dev->p2i = device_add_linked(&sis_5595_p2i_device, dev->sis);
+    dev->h2p = device_add_linked(&sis_5591_h2p_device, dev->sis);
+    dev->usb = device_add_linked(&sis_5595_usb_device, dev->sis);
+    if (info->local)
+        dev->pmu = device_add_linked(&sis_5595_1997_pmu_device, dev->sis);
+    else
+        dev->pmu = device_add_linked(&sis_5595_pmu_device, dev->sis);
+
+    device_add_params(&kbc_at_device, (void *) KBC_VEN_SIS);
+
+    return dev;
+}
+
+const device_t sis_5591_1997_device = {
+    .name          = "SiS 5591 (1997)",
+    .internal_name = "sis_5591_1997",
+    .flags         = DEVICE_PCI,
+    .local         = 1,
+    .init          = sis_5591_init,
+    .close         = sis_5591_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t sis_5591_device = {
+    .name          = "SiS 5591",
+    .internal_name = "sis_5591",
+    .flags         = DEVICE_PCI,
+    .local         = 0,
+    .init          = sis_5591_init,
+    .close         = sis_5591_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/sis_5591_h2p.c b/src/chipset/sis_5591_h2p.c
new file mode 100644
index 000000000..74dd6dfbd
--- /dev/null
+++ b/src/chipset/sis_5591_h2p.c
@@ -0,0 +1,494 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the SiS 5591 Host to PCI bridge.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2024 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/dma.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/hdd.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/hdc_ide_sff8038i.h>
+#include <86box/pci.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/pit_fast.h>
+#include <86box/plat.h>
+#include <86box/plat_unused.h>
+#include <86box/port_92.h>
+#include <86box/smram.h>
+#include <86box/spd.h>
+#include <86box/apm.h>
+#include <86box/ddma.h>
+#include <86box/acpi.h>
+#include <86box/smbus.h>
+#include <86box/sis_55xx.h>
+#include <86box/chipset.h>
+#include <86box/usb.h>
+#include <86box/agpgart.h>
+
+#ifdef ENABLE_SIS_5591_HOST_TO_PCI_LOG
+int sis_5591_host_to_pci_do_log = ENABLE_SIS_5591_HOST_TO_PCI_LOG;
+
+static void
+sis_5591_host_to_pci_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (sis_5591_host_to_pci_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define sis_5591_host_to_pci_log(fmt, ...)
+#endif
+
+typedef struct {
+    uint8_t  installed;
+    uint8_t  code;
+    uint32_t phys_size;
+} ram_bank_t;
+
+typedef struct sis_5591_host_to_pci_t {
+    uint8_t            pci_conf[256];
+
+    uint8_t            states[7];
+    uint8_t            states_bus[7];
+
+    ram_bank_t         ram_banks[3];
+
+    sis_55xx_common_t *sis;
+
+    smram_t           *smram;
+
+    agpgart_t         *agpgart;
+} sis_5591_host_to_pci_t;
+
+static uint8_t  bank_codes[6] = { 0x00, 0x20, 0x24, 0x22, 0x26, 0x2a };
+
+static uint32_t bank_sizes[6] = { 0x00800000,      /*   8 MB */
+                                  0x01000000,      /*  16 MB */
+                                  0x02000000,      /*  32 MB */
+                                  0x04000000,      /*  64 MB */
+                                  0x08000000,      /* 128 MB */
+                                  0x10000000 };    /* 256 MB */
+
+static void
+sis_5591_shadow_recalc(sis_5591_host_to_pci_t *dev)
+{
+    uint32_t base;
+    uint32_t state;
+    uint8_t  val;
+
+    for (uint8_t i = 0x70; i <= 0x76; i++) {
+        if (i == 0x76) {
+            val = dev->pci_conf[i];
+            if ((dev->states[i & 0x0f] ^ val) & 0xa0) {
+                state = (val & 0x80) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+                state |= (val & 0x20) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+                mem_set_mem_state_cpu_both(0xf0000, 0x10000, state);
+                sis_5591_host_to_pci_log("000F0000-000FFFFF\n");
+
+                dev->states[i & 0x0f] = val;
+            }
+
+            if (!(dev->pci_conf[0x76] & 0x08))
+                val &= 0x5f;
+            if ((dev->states_bus[i & 0x0f] ^ val) & 0xa0) {
+                state = (val & 0x80) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+                state |= (val & 0x20) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+                mem_set_mem_state_bus_both(0xf0000, 0x10000, state);
+                sis_5591_host_to_pci_log("000F0000-000FFFFF\n");
+
+                dev->states_bus[i & 0x0f] = val;
+            }
+        } else {
+            base = ((i & 0x07) << 15) + 0xc0000;
+
+            val = dev->pci_conf[i];
+            if ((dev->states[i & 0x0f] ^ val) & 0xa0) {
+                state = (val & 0x80) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+                state |= (val & 0x20) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+                mem_set_mem_state_cpu_both(base, 0x4000, state);
+                sis_5591_host_to_pci_log("%08X-%08X\n", base, base + 0x3fff);
+
+                dev->states[i & 0x0f] = (dev->states[i & 0x0f] & 0x0f) | (val & 0xf0);
+            }
+            if ((dev->states[i & 0x0f] ^ val) & 0x0a) {
+                state = (val & 0x08) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+                state |= (val & 0x02) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+                mem_set_mem_state_cpu_both(base + 0x4000, 0x4000, state);
+                sis_5591_host_to_pci_log("%08X-%08X\n", base + 0x4000, base + 0x7fff);
+
+                dev->states[i & 0x0f] = (dev->states[i & 0x0f] & 0xf0) | (val & 0x0f);
+            }
+
+            if (!(dev->pci_conf[0x76] & 0x08))
+                val &= 0x55;
+            if ((dev->states_bus[i & 0x0f] ^ val) & 0xa0) {
+                state = (val & 0x80) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+                state |= (val & 0x20) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+                mem_set_mem_state_bus_both(base, 0x4000, state);
+                sis_5591_host_to_pci_log("%08X-%08X\n", base, base + 0x3fff);
+
+                dev->states_bus[i & 0x0f] = (dev->states_bus[i & 0x0f] & 0x0f) | (val & 0xf0);
+            }
+            if ((dev->states_bus[i & 0x0f] ^ val) & 0x0a) {
+                state = (val & 0x08) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+                state |= (val & 0x02) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+                mem_set_mem_state_bus_both(base + 0x4000, 0x4000, state);
+                sis_5591_host_to_pci_log("%08X-%08X\n", base + 0x4000, base + 0x7fff);
+
+                dev->states_bus[i & 0x0f] = (dev->states_bus[i & 0x0f] & 0xf0) | (val & 0x0f);
+            }
+        }
+    }
+
+    flushmmucache_nopc();
+}
+
+static void
+sis_5591_smram_recalc(sis_5591_host_to_pci_t *dev)
+{
+    smram_disable_all();
+
+    switch (dev->pci_conf[0x68] >> 6) {
+        case 0:
+            smram_enable(dev->smram, 0x000e0000, 0x000e0000, 0x8000, dev->pci_conf[0x68] & 0x10, 1);
+            break;
+        case 1:
+            smram_enable(dev->smram, 0x000e0000, 0x000a0000, 0x8000, dev->pci_conf[0x68] & 0x10, 1);
+            break;
+        case 2:
+            smram_enable(dev->smram, 0x000e0000, 0x000b0000, 0x8000, dev->pci_conf[0x68] & 0x10, 1);
+            break;
+        case 3:
+            smram_enable(dev->smram, 0x000a0000, 0x000a0000, 0x10000, dev->pci_conf[0x68] & 0x10, 1);
+            break;
+
+        default:
+            break;
+    }
+
+    flushmmucache();
+}
+
+static void
+sis_5591_mask_bar(uint8_t *regs, void *agpgart)
+{
+    uint32_t bar;
+    uint32_t sizes[8] = { 0x00400000, 0x00800000, 0x01000000, 0x02000000, 0x04000000, 0x08000000,
+                          0x10000000, 0x00000000 } ;
+
+    /* Make sure the aperture's base is aligned to its size. */
+    bar = (regs[0x13] << 24) | (regs[0x12] << 16);
+    bar &= (sizes[(regs[0x94] >> 4) & 0x07] | 0xf0000000);
+    regs[0x12] = (bar >> 16) & 0xff;
+    regs[0x13] = (bar >> 24) & 0xff;
+
+    if (!agpgart)
+        return;
+
+    /* Map aperture and GART. */
+    agpgart_set_aperture(agpgart,
+                         bar,
+                         sizes[(regs[0x94] >> 4) & 0x07],
+                         !!(regs[0x94] & 0x02));
+    if (regs[0x94] & 0x01)
+        agpgart_set_gart(agpgart, (regs[0x91] << 8) | (regs[0x92] << 16) | (regs[0x93] << 24));
+    else
+        agpgart_set_gart(agpgart, 0x00000000);
+}
+
+void
+sis_5591_host_to_pci_write(int addr, uint8_t val, void *priv)
+{
+    sis_5591_host_to_pci_t *dev = (sis_5591_host_to_pci_t *) priv;
+
+    sis_5591_host_to_pci_log("SiS 5591 H2P: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
+
+    switch (addr) {
+        default:
+            break;
+
+        case 0x04: /* Command - Low Byte */
+            dev->pci_conf[addr] = (dev->pci_conf[addr] & 0xfd) | (val & 0x02);
+            break;
+        case 0x05: /* Command - High Byte */
+            dev->pci_conf[addr] = val & 0x03;
+            break;
+
+        case 0x07: /* Status - High Byte */
+            dev->pci_conf[addr] &= ~(val & 0xf0);
+            break;
+
+        case 0x12:
+            dev->pci_conf[addr] = val & 0xc0;
+            sis_5591_mask_bar(dev->pci_conf, dev->agpgart);
+            break;
+        case 0x13:
+            dev->pci_conf[addr] = val;
+            sis_5591_mask_bar(dev->pci_conf, dev->agpgart);
+            break;
+
+        case 0x51:
+            dev->pci_conf[addr] = val;
+            cpu_cache_ext_enabled = !!(val & 0x80);
+            cpu_update_waitstates();
+            break;
+
+        case 0x60 ... 0x62:
+            dev->pci_conf[addr] = dev->ram_banks[addr & 0x0f].code | 0xc0;
+            break;
+
+        case 0x63:
+            dev->pci_conf[addr] = dev->ram_banks[0].installed |
+                                  (dev->ram_banks[1].installed << 1) |
+                                  (dev->ram_banks[2].installed << 2);
+            break;
+
+        case 0x68:
+            dev->pci_conf[addr] = val;
+            sis_5591_smram_recalc(dev);
+            break;
+
+        case 0x70 ... 0x75:
+            dev->pci_conf[addr] = val & 0xee;
+            sis_5591_shadow_recalc(dev);
+            break;
+        case 0x76:
+            dev->pci_conf[addr] = val & 0xe8;
+            sis_5591_shadow_recalc(dev);
+            break;
+
+        case 0x0d: /* Master latency timer */
+        case 0x50:
+        case 0x52:
+        case 0x54 ... 0x5a:
+        case 0x5c ... 0x5f:
+        case 0x64 ... 0x65:
+        case 0x69 ... 0x6c:
+        case 0x77 ... 0x7b:
+        case 0x80 ... 0x8d:
+        case 0x90:
+        case 0x97 ... 0xab:
+        case 0xb0:
+        case 0xc8 ... 0xcb:
+        case 0xd4 ... 0xda:
+        case 0xe0 ... 0xe3:
+        case 0xef:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x91 ... 0x93:
+            dev->pci_conf[addr] = val;
+            sis_5591_mask_bar(dev->pci_conf, dev->agpgart);
+            break;
+        case 0x94:
+            dev->pci_conf[addr] = val & 0x7f;
+            sis_5591_mask_bar(dev->pci_conf, dev->agpgart);
+            break;
+
+        case 0xb2:
+            dev->pci_conf[addr] &= ~(val & 0x01);
+            break;
+    }
+}
+
+uint8_t
+sis_5591_host_to_pci_read(int addr, void *priv)
+{
+    const sis_5591_host_to_pci_t *dev = (sis_5591_host_to_pci_t *) priv;
+    uint8_t ret = 0xff;
+
+    ret = dev->pci_conf[addr];
+
+    sis_5591_host_to_pci_log("SiS 5591 H2P: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
+
+    return ret;
+}
+
+static void
+sis_5591_host_to_pci_reset(void *priv)
+{
+    sis_5591_host_to_pci_t *dev = (sis_5591_host_to_pci_t *) priv;
+
+    dev->pci_conf[0x00] = 0x39;
+    dev->pci_conf[0x01] = 0x10;
+    dev->pci_conf[0x02] = 0x91;
+    dev->pci_conf[0x03] = 0x55;
+    dev->pci_conf[0x04] = 0x05;
+    dev->pci_conf[0x05] = 0x00;
+    dev->pci_conf[0x06] = 0x10;
+    dev->pci_conf[0x07] = 0x02;
+    dev->pci_conf[0x08] = 0x02;
+    dev->pci_conf[0x09] = dev->pci_conf[0x0a] = 0x00;
+    dev->pci_conf[0x0b] = 0x06;
+    dev->pci_conf[0x0c] = 0x00;
+    dev->pci_conf[0x0d] = 0xff;
+    dev->pci_conf[0x0e] = 0x80;
+    dev->pci_conf[0x0f] = 0x00;
+    dev->pci_conf[0x10] = dev->pci_conf[0x11] = 0x00;
+    dev->pci_conf[0x12] = dev->pci_conf[0x13] = 0x00;
+    dev->pci_conf[0x34] = 0xc0;
+    dev->pci_conf[0x50] = 0x00;
+    dev->pci_conf[0x51] = 0x18;
+    dev->pci_conf[0x52] = dev->pci_conf[0x54] = 0x00;
+    dev->pci_conf[0x55] = 0x0e;
+    dev->pci_conf[0x56] = 0x40;
+    dev->pci_conf[0x57] = 0x00;
+    dev->pci_conf[0x58] = 0x50;
+    dev->pci_conf[0x59] = dev->pci_conf[0x5a] = 0x00;
+    dev->pci_conf[0x5c] = dev->pci_conf[0x5d] = 0x00;
+    dev->pci_conf[0x5e] = dev->pci_conf[0x5f] = 0x00;
+    dev->pci_conf[0x60] = dev->pci_conf[0x61] = 0x00;
+    dev->pci_conf[0x62] = 0x00;
+    dev->pci_conf[0x63] = 0xff;
+    dev->pci_conf[0x64] = dev->pci_conf[0x65] = 0x00;
+    dev->pci_conf[0x68] = dev->pci_conf[0x69] = 0x00;
+    dev->pci_conf[0x6a] = dev->pci_conf[0x6b] = 0x00;
+    dev->pci_conf[0x6c] = 0x00;
+    dev->pci_conf[0x70] = dev->pci_conf[0x71] = 0x00;
+    dev->pci_conf[0x72] = dev->pci_conf[0x73] = 0x00;
+    dev->pci_conf[0x74] = dev->pci_conf[0x75] = 0x00;
+    dev->pci_conf[0x76] = dev->pci_conf[0x77] = 0x00;
+    dev->pci_conf[0x78] = dev->pci_conf[0x79] = 0x00;
+    dev->pci_conf[0x7a] = dev->pci_conf[0x7b] = 0x00;
+    dev->pci_conf[0x80] = dev->pci_conf[0x81] = 0x00;
+    dev->pci_conf[0x82] = dev->pci_conf[0x83] = 0x00;
+    dev->pci_conf[0x84] = dev->pci_conf[0x85] = 0xff;
+    dev->pci_conf[0x86] = 0xff;
+    dev->pci_conf[0x87] = 0x00;
+    dev->pci_conf[0x88] = dev->pci_conf[0x89] = 0x00;
+    dev->pci_conf[0x8a] = dev->pci_conf[0x8b] = 0x00;
+    dev->pci_conf[0x8c] = dev->pci_conf[0x8d] = 0x00;
+    dev->pci_conf[0x90] = dev->pci_conf[0x91] = 0x00;
+    dev->pci_conf[0x92] = dev->pci_conf[0x93] = 0x00;
+    dev->pci_conf[0x94] = dev->pci_conf[0x97] = 0x00;
+    dev->pci_conf[0x98] = dev->pci_conf[0x99] = 0x00;
+    dev->pci_conf[0x9a] = dev->pci_conf[0x9b] = 0x00;
+    dev->pci_conf[0x9c] = dev->pci_conf[0x9d] = 0x00;
+    dev->pci_conf[0x9e] = dev->pci_conf[0x9f] = 0x00;
+    dev->pci_conf[0xa0] = dev->pci_conf[0xa1] = 0x00;
+    dev->pci_conf[0xa2] = dev->pci_conf[0xa3] = 0x00;
+    dev->pci_conf[0xa4] = dev->pci_conf[0xa5] = 0x00;
+    dev->pci_conf[0xa6] = dev->pci_conf[0xa7] = 0x00;
+    dev->pci_conf[0xa8] = dev->pci_conf[0xa9] = 0x00;
+    dev->pci_conf[0xaa] = dev->pci_conf[0xab] = 0x00;
+    dev->pci_conf[0xb0] = dev->pci_conf[0xb2] = 0x00;
+    dev->pci_conf[0xc0] = 0x02;
+    dev->pci_conf[0xc1] = 0x00;
+    dev->pci_conf[0xc2] = 0x10;
+    dev->pci_conf[0xc3] = 0x00;
+    dev->pci_conf[0xc4] = 0x03;
+    dev->pci_conf[0xc5] = 0x02;
+    dev->pci_conf[0xc6] = 0x00;
+    dev->pci_conf[0xc7] = 0x1f;
+    dev->pci_conf[0xc8] = dev->pci_conf[0xc9] = 0x00;
+    dev->pci_conf[0xca] = dev->pci_conf[0xcb] = 0x00;
+    dev->pci_conf[0xd4] = dev->pci_conf[0xd5] = 0x00;
+    dev->pci_conf[0xd6] = dev->pci_conf[0xd7] = 0x00;
+    dev->pci_conf[0xd8] = dev->pci_conf[0xd9] = 0x00;
+    dev->pci_conf[0xda] = 0x00;
+    dev->pci_conf[0xe0] = dev->pci_conf[0xe1] = 0x00;
+    dev->pci_conf[0xe2] = dev->pci_conf[0xe3] = 0x00;
+    dev->pci_conf[0xef] = 0x00;
+
+    sis_5591_mask_bar(dev->pci_conf, dev->agpgart);
+
+    cpu_cache_ext_enabled = 0;
+    cpu_update_waitstates();
+
+    sis_5591_shadow_recalc(dev);
+
+    sis_5591_smram_recalc(dev);
+}
+
+static void
+sis_5591_host_to_pci_close(void *priv)
+{
+    sis_5591_host_to_pci_t *dev = (sis_5591_host_to_pci_t *) priv;
+
+    smram_del(dev->smram);
+    free(dev);
+}
+
+static void *
+sis_5591_host_to_pci_init(UNUSED(const device_t *info))
+{
+    sis_5591_host_to_pci_t *dev = (sis_5591_host_to_pci_t *) calloc(1, sizeof(sis_5591_host_to_pci_t));
+    uint32_t total_mem = mem_size << 10;
+    ram_bank_t *rb;
+
+    dev->sis = device_get_common_priv();
+
+    /* Calculate the physical RAM banks. */
+    for (uint8_t i = 0; i < 3; i++) {
+        rb = &(dev->ram_banks[i]);
+        uint32_t size = 0x00000000;
+        uint8_t  index = 0;
+        for (int8_t j = 5; j >= 0; j--) {
+            uint32_t *bs = &(bank_sizes[j]);
+            if (*bs <= total_mem) {
+                size = *bs;
+                index = j;
+                break;
+            }
+        }
+        if (size != 0x00000000) {
+            rb->installed = 1;
+            rb->code = bank_codes[index];
+            rb->phys_size = size;
+            total_mem -= size;
+        } else
+            rb->installed = 0;
+    }
+
+    /* SMRAM */
+    dev->smram = smram_add();
+
+    device_add(&sis_5xxx_agp_device);
+    dev->agpgart = device_add(&agpgart_device);
+
+    sis_5591_host_to_pci_reset(dev);
+
+    return dev;
+}
+
+const device_t sis_5591_h2p_device = {
+    .name          = "SiS 5591 Host to PCI bridge",
+    .internal_name = "sis_5591_host_to_pci",
+    .flags         = DEVICE_PCI,
+    .local         = 0x00,
+    .init          = sis_5591_host_to_pci_init,
+    .close         = sis_5591_host_to_pci_close,
+    .reset         = sis_5591_host_to_pci_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/sis_5595_pmu.c b/src/chipset/sis_5595_pmu.c
new file mode 100644
index 000000000..7de9735f1
--- /dev/null
+++ b/src/chipset/sis_5595_pmu.c
@@ -0,0 +1,454 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the SiS 5572 USB controller.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2024 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/dma.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/hdd.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/hdc_ide_sff8038i.h>
+#include <86box/pci.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/pit_fast.h>
+#include <86box/plat.h>
+#include <86box/plat_unused.h>
+#include <86box/port_92.h>
+#include <86box/smram.h>
+#include <86box/spd.h>
+#include <86box/apm.h>
+#include <86box/ddma.h>
+#include <86box/acpi.h>
+#include <86box/smbus.h>
+#include <86box/sis_55xx.h>
+#include <86box/chipset.h>
+#include <86box/usb.h>
+
+#ifdef ENABLE_SIS_5595_PMU_LOG
+int sis_5595_pmu_do_log = ENABLE_SIS_5595_PMU_LOG;
+
+static void
+sis_5595_pmu_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (sis_5595_pmu_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define sis_5595_pmu_log(fmt, ...)
+#endif
+
+typedef struct sis_5595_pmu_io_trap_t {
+    void          *priv;
+    void          *trap;
+    uint8_t        flags, mask;
+    uint8_t       *sts_reg, sts_mask;
+    uint16_t       addr;
+} sis_5595_pmu_io_trap_t;
+
+typedef struct sis_5595_pmu_t {
+    uint8_t     is_1997;
+
+    uint8_t     pci_conf[256];
+
+    sis_5595_pmu_io_trap_t io_traps[22];
+
+    sis_55xx_common_t *sis;
+} sis_5595_pmu_t;
+
+static void
+sis_5595_pmu_trap_io(UNUSED(int size), UNUSED(uint16_t addr), UNUSED(uint8_t write), UNUSED(uint8_t val),
+                     void *priv)
+{
+    sis_5595_pmu_io_trap_t *trap = (sis_5595_pmu_io_trap_t *) priv;
+    sis_5595_pmu_t *dev = (sis_5595_pmu_t *) trap->priv;
+
+    trap->sts_reg[0x04] |= trap->sts_mask;
+
+    if (trap->sts_reg[0x00] & trap->sts_mask)
+        acpi_sis5595_pmu_event(dev->sis->acpi);
+
+    if (trap->sts_reg[0x20] & trap->sts_mask)
+        acpi_update_irq(dev->sis->acpi);
+}
+
+static void
+sis_5595_pmu_trap_io_ide(int size, uint16_t addr, uint8_t write, uint8_t val, void *priv)
+{
+    sis_5595_pmu_io_trap_t *trap = (sis_5595_pmu_io_trap_t *) priv;
+
+    /* IDE traps are per drive, not per channel. */
+    if (ide_drives[trap->flags & 0x03]->selected)
+        sis_5595_pmu_trap_io(size, addr, write, val, priv);
+}
+
+static void
+sis_5595_pmu_trap_io_mask(int size, uint16_t addr, uint8_t write, uint8_t val, void *priv)
+{
+    sis_5595_pmu_io_trap_t *trap = (sis_5595_pmu_io_trap_t *) priv;
+
+    if ((addr & trap->mask) == (trap->addr & trap->mask))
+        sis_5595_pmu_trap_io(size, addr, write, val, priv);
+}
+
+static void
+sis_5595_pmu_trap_io_ide_bm(UNUSED(int size), UNUSED(uint16_t addr), UNUSED(uint8_t write), UNUSED(uint8_t val), void *priv)
+{
+    sis_5595_pmu_io_trap_t *trap = (sis_5595_pmu_io_trap_t *) priv;
+    sis_5595_pmu_t *dev = (sis_5595_pmu_t *) trap->priv;
+
+    if (trap->flags & 0x01) {
+        dev->pci_conf[0x67] |= 0x01;
+        dev->pci_conf[0x64] |= 0x08;
+    } else {
+        dev->pci_conf[0x67] |= 0x02;
+        dev->pci_conf[0x64] |= 0x10;
+    }
+    acpi_sis5595_pmu_event(dev->sis->acpi);
+}
+
+static void
+sis_5595_pmu_trap_update_devctl(sis_5595_pmu_t *dev, uint8_t trap_id, uint8_t enable,
+                                uint8_t flags, uint8_t mask, uint8_t *sts_reg, uint8_t sts_mask,
+                                uint16_t addr, uint16_t size)
+{
+    sis_5595_pmu_io_trap_t *trap = &dev->io_traps[trap_id];
+
+    /* Set up Device I/O traps dynamically. */
+    if (enable && !trap->trap) {
+        trap->priv     = (void *) dev;
+        trap->flags    = flags;
+        trap->mask     = mask;
+        trap->addr     = addr;
+        if (flags & 0x10)
+            trap->trap     = io_trap_add(sis_5595_pmu_trap_io_ide_bm, trap);
+        else if (flags & 0x08)
+            trap->trap     = io_trap_add(sis_5595_pmu_trap_io_mask, trap);
+        else if (flags & 0x04)
+            trap->trap     = io_trap_add(sis_5595_pmu_trap_io_ide, trap);
+        else
+            trap->trap     = io_trap_add(sis_5595_pmu_trap_io, trap);
+        trap->sts_reg  = sts_reg;
+        trap->sts_mask = sts_mask;
+    }
+
+    /* Remap I/O trap. */
+    io_trap_remap(trap->trap, enable, addr, size);
+}
+
+static void
+sis_5595_pmu_trap_update(void *priv)
+{
+    sis_5595_pmu_t *dev     = (sis_5595_pmu_t *) priv;
+    uint8_t         trap_id = 0;
+    uint8_t        *fregs   = dev->pci_conf;
+    uint16_t        temp;
+    uint8_t         mask;
+    uint8_t         on;
+
+    temp = (fregs[0x7e] | (fregs[0x7f] << 8)) & 0xffe0;
+
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    fregs[0x7e] & 0x08, 0x10, 0xff, NULL, 0xff, temp, 0x08);
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    fregs[0x7e] & 0x04, 0x10, 0xff, NULL, 0xff, temp + 8, 0x08);
+
+    on = fregs[0x63] | fregs[0x83];
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x02, 0x04, 0xff, &(fregs[0x63]), 0x02, 0x1f0, 0x08);
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x01, 0x06, 0xff, &(fregs[0x63]), 0x01, 0x170, 0x08);
+
+    on = fregs[0x62] | fregs[0x82];
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x80, 0x00, 0xff, &(fregs[0x62]), 0x80, 0x064, 0x01);
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x80, 0x00, 0xff, &(fregs[0x62]), 0x80, 0x060, 0x01);
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x40, 0x00, 0xff, &(fregs[0x62]), 0x40, 0x3f8, 0x08);
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x20, 0x00, 0xff, &(fregs[0x62]), 0x20, 0x2f8, 0x08);
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x10, 0x00, 0xff, &(fregs[0x62]), 0x10, 0x378, 0x08);
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x10, 0x00, 0xff, &(fregs[0x62]), 0x10, 0x278, 0x08);
+
+    temp = (fregs[0x5c] | (fregs[0x5d] << 8)) & 0x03ff;
+    mask = fregs[0x5d] >> 2;
+
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x04, 0x08, mask, &(fregs[0x62]), 0x04, temp, 0x40);
+
+    temp = fregs[0x5e] | (fregs[0x5f] << 8);
+
+    if (dev->is_1997) {
+        mask = fregs[0x4d] & 0x1f;
+
+        sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                        on & 0x02, 0x08, mask, &(fregs[0x62]), 0x02, temp, 0x20);
+    } else {
+        mask = fregs[0x4d];
+
+        sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                        on & 0x02, 0x08, mask, &(fregs[0x62]), 0x02, temp, 0x100);
+    }
+
+    on = fregs[0x61] | fregs[0x81];
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x40, 0x00, 0xff, &(fregs[0x61]), 0x40, 0x3b0, 0x30);
+
+    switch ((fregs[0x4c] >> 6) & 0x03) {
+        case 0x00:
+            temp = 0xf40;
+            break;
+        case 0x01:
+            temp = 0xe80;
+            break;
+        case 0x02:
+            temp = 0x604;
+            break;
+        default:
+            temp = 0x530;
+            break;
+    }
+
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x10, 0x00, 0xff, &(fregs[0x61]), 0x10, temp, 0x08);
+
+    switch ((fregs[0x4c] >> 4) & 0x03) {
+        case 0x00:
+            temp = 0x280;
+            break;
+        case 0x01:
+            temp = 0x260;
+            break;
+        case 0x02:
+            temp = 0x240;
+            break;
+        default:
+            temp = 0x220;
+            break;
+    }
+
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x08, 0x00, 0xff, &(fregs[0x61]), 0x08, temp, 0x14);
+
+    switch ((fregs[0x4c] >> 2) & 0x03) {
+        case 0x00:
+            temp = 0x330;
+            break;
+        case 0x01:
+            temp = 0x320;
+            break;
+        case 0x02:
+            temp = 0x310;
+            break;
+        default:
+            temp = 0x300;
+            break;
+    }
+
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x04, 0x00, 0xff, &(fregs[0x61]), 0x04, temp, 0x04);
+
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x02, 0x00, 0xff, &(fregs[0x61]), 0x02, 0x200, 0x08);
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x02, 0x00, 0xff, &(fregs[0x61]), 0x02, 0x388, 0x04);
+
+    on = fregs[0x60] | fregs[0x80];
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x20, 0x00, 0xff, &(fregs[0x60]), 0x20, 0x3f0, 0x08);
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x20, 0x00, 0xff, &(fregs[0x60]), 0x20, 0x370, 0x08);
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x10, 0x05, 0xff, &(fregs[0x60]), 0x10, 0x1f0, 0x08);
+    sis_5595_pmu_trap_update_devctl(dev, trap_id++,
+                                    on & 0x08, 0x07, 0xff, &(fregs[0x60]), 0x08, 0x170, 0x08);
+}
+
+void
+sis_5595_pmu_write(int addr, uint8_t val, void *priv)
+{
+    sis_5595_pmu_t *dev = (sis_5595_pmu_t *) priv;
+
+    sis_5595_pmu_log("SiS 5595 PMU: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
+
+    if (dev->sis->usb_enabled)  switch (addr) {
+        default:
+            break;
+
+        case 0x40 ... 0x4b:
+        case 0x50 ... 0x5b:
+        case 0x68 ... 0x7b:
+        case 0x7d:
+            dev->pci_conf[addr] = val;
+            break;
+        case 0x4c ... 0x4d:
+        case 0x5c ... 0x63:
+        case 0x7e ... 0x7f:
+        case 0x80 ... 0x83:
+            dev->pci_conf[addr] = val;
+            sis_5595_pmu_trap_update(dev);
+            break;
+       case 0x64 ... 0x67:
+            dev->pci_conf[addr] &= ~val;
+            break;
+       case 0x7c:
+            dev->pci_conf[addr] = val;
+            if (val & 0x02) {
+                dev->pci_conf[0x64] |= 0x04;
+                if (dev->pci_conf[0x60] & 0x04)
+                    acpi_sis5595_pmu_event(dev->sis->acpi);
+            }
+            break;
+    }
+}
+
+uint8_t
+sis_5595_pmu_read(int addr, void *priv)
+{
+    const sis_5595_pmu_t *dev = (sis_5595_pmu_t *) priv;
+    uint8_t ret = 0xff;
+
+    ret = dev->pci_conf[addr];
+
+    sis_5595_pmu_log("SiS 5595 PMU: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
+
+    return ret;
+}
+
+static void
+sis_5595_pmu_reset(void *priv)
+{
+    sis_5595_pmu_t *dev = (sis_5595_pmu_t *) priv;
+
+    dev->pci_conf[0x00] = 0x39;
+    dev->pci_conf[0x01] = 0x10;
+    dev->pci_conf[0x02] = 0x09;
+    dev->pci_conf[0x03] = 0x00;
+    dev->pci_conf[0x04] = dev->pci_conf[0x05] = 0x00;
+    dev->pci_conf[0x06] = 0x00;
+    dev->pci_conf[0x07] = 0x02;
+    dev->pci_conf[0x08] = dev->pci_conf[0x09] = 0x00;
+    dev->pci_conf[0x0a] = 0x00;
+    dev->pci_conf[0x0b] = 0xff;
+    dev->pci_conf[0x0c] = dev->pci_conf[0x0d] = 0x00;
+    dev->pci_conf[0x0e] = 0x80;
+    dev->pci_conf[0x0f] = 0x00;
+    dev->pci_conf[0x40] = dev->pci_conf[0x41] = 0x00;
+    dev->pci_conf[0x42] = dev->pci_conf[0x43] = 0x00;
+    dev->pci_conf[0x44] = dev->pci_conf[0x45] = 0x00;
+    dev->pci_conf[0x46] = dev->pci_conf[0x47] = 0x00;
+    dev->pci_conf[0x48] = dev->pci_conf[0x49] = 0x00;
+    dev->pci_conf[0x4a] = dev->pci_conf[0x4b] = 0x00;
+    dev->pci_conf[0x4c] = dev->pci_conf[0x4d] = 0x00;
+    dev->pci_conf[0x4e] = dev->pci_conf[0x4f] = 0x00;
+    dev->pci_conf[0x50] = dev->pci_conf[0x51] = 0x00;
+    dev->pci_conf[0x52] = dev->pci_conf[0x53] = 0x00;
+    dev->pci_conf[0x54] = dev->pci_conf[0x55] = 0x00;
+    dev->pci_conf[0x56] = dev->pci_conf[0x57] = 0x00;
+    dev->pci_conf[0x58] = dev->pci_conf[0x59] = 0x00;
+    dev->pci_conf[0x5a] = dev->pci_conf[0x5b] = 0x00;
+    dev->pci_conf[0x5c] = dev->pci_conf[0x5d] = 0x00;
+    dev->pci_conf[0x5e] = dev->pci_conf[0x5f] = 0x00;
+    dev->pci_conf[0x60] = dev->pci_conf[0x61] = 0x00;
+    dev->pci_conf[0x62] = dev->pci_conf[0x63] = 0x00;
+    dev->pci_conf[0x64] = dev->pci_conf[0x65] = 0x00;
+    dev->pci_conf[0x66] = dev->pci_conf[0x67] = 0x00;
+    dev->pci_conf[0x68] = dev->pci_conf[0x69] = 0x00;
+    dev->pci_conf[0x6a] = dev->pci_conf[0x6b] = 0x00;
+    dev->pci_conf[0x6c] = dev->pci_conf[0x6d] = 0x00;
+    dev->pci_conf[0x6e] = dev->pci_conf[0x6f] = 0x00;
+    dev->pci_conf[0x70] = dev->pci_conf[0x71] = 0x00;
+    dev->pci_conf[0x72] = dev->pci_conf[0x73] = 0x00;
+    dev->pci_conf[0x74] = dev->pci_conf[0x75] = 0x00;
+    dev->pci_conf[0x76] = dev->pci_conf[0x77] = 0x00;
+    dev->pci_conf[0x78] = dev->pci_conf[0x79] = 0x00;
+    dev->pci_conf[0x7a] = dev->pci_conf[0x7b] = 0x00;
+    dev->pci_conf[0x7c] = dev->pci_conf[0x7d] = 0x00;
+    dev->pci_conf[0x7e] = dev->pci_conf[0x7f] = 0x00;
+    dev->pci_conf[0x80] = dev->pci_conf[0x81] = 0x00;
+    dev->pci_conf[0x82] = dev->pci_conf[0x83] = 0x00;
+
+    sis_5595_pmu_trap_update(dev);
+    acpi_update_irq(dev->sis->acpi);
+}
+
+static void
+sis_5595_pmu_close(void *priv)
+{
+    sis_5595_pmu_t *dev = (sis_5595_pmu_t *) priv;
+
+    free(dev);
+}
+
+static void *
+sis_5595_pmu_init(UNUSED(const device_t *info))
+{
+    sis_5595_pmu_t *dev = (sis_5595_pmu_t *) calloc(1, sizeof(sis_5595_pmu_t));
+
+    dev->sis = device_get_common_priv();
+    dev->sis->pmu_regs = dev->pci_conf;
+
+    dev->is_1997 = info->local;
+
+    sis_5595_pmu_reset(dev);
+
+    return dev;
+}
+
+const device_t sis_5595_1997_pmu_device = {
+    .name          = "SiS 5595 (1997) PMU",
+    .internal_name = "sis_5595_1997_pmu",
+    .flags         = DEVICE_PCI,
+    .local         = 0x01,
+    .init          = sis_5595_pmu_init,
+    .close         = sis_5595_pmu_close,
+    .reset         = sis_5595_pmu_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t sis_5595_pmu_device = {
+    .name          = "SiS 5595 PMU",
+    .internal_name = "sis_5595_pmu",
+    .flags         = DEVICE_PCI,
+    .local         = 0x00,
+    .init          = sis_5595_pmu_init,
+    .close         = sis_5595_pmu_close,
+    .reset         = sis_5595_pmu_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/sis_55xx.c b/src/chipset/sis_55xx.c
new file mode 100644
index 000000000..1cb0744eb
--- /dev/null
+++ b/src/chipset/sis_55xx.c
@@ -0,0 +1,96 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the SiS 55xx common structure.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2024 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/dma.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/hdd.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/hdc_ide_sff8038i.h>
+#include <86box/pci.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/pit_fast.h>
+#include <86box/plat.h>
+#include <86box/plat_unused.h>
+#include <86box/port_92.h>
+#include <86box/smram.h>
+#include <86box/spd.h>
+#include <86box/apm.h>
+#include <86box/ddma.h>
+#include <86box/acpi.h>
+#include <86box/smbus.h>
+#include <86box/sis_55xx.h>
+#include <86box/chipset.h>
+#include <86box/usb.h>
+
+#ifdef ENABLE_SIS_55XX_COMMON_LOG
+int sis_55xx_common_do_log = ENABLE_SIS_55XX_COMMON_LOG;
+
+static void
+sis_55xx_common_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (sis_55xx_common_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define sis_55xx_common_log(fmt, ...)
+#endif
+
+static void
+sis_55xx_common_close(void *priv)
+{
+    sis_55xx_common_t *dev = (sis_55xx_common_t *) priv;
+
+    free(dev);
+}
+
+static void *
+sis_55xx_common_init(UNUSED(const device_t *info))
+{
+    sis_55xx_common_t *dev = (sis_55xx_common_t *) calloc(1, sizeof(sis_55xx_common_t));
+
+    return dev;
+}
+
+const device_t sis_55xx_common_device = {
+    .name          = "SiS 55xx Common Structure",
+    .internal_name = "sis_55xx_common",
+    .flags         = DEVICE_PCI,
+    .local         = 0x00,
+    .init          = sis_55xx_common_init,
+    .close         = sis_55xx_common_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/sis_5600.c b/src/chipset/sis_5600.c
new file mode 100644
index 000000000..564243c68
--- /dev/null
+++ b/src/chipset/sis_5600.c
@@ -0,0 +1,213 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the SiS (5)600 Pentium PCI/ISA Chipset.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2024 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/apm.h>
+#include <86box/acpi.h>
+#include <86box/keyboard.h>
+#include <86box/hdd.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/hdc_ide_sff8038i.h>
+#include <86box/pci.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/pit_fast.h>
+#include <86box/plat.h>
+#include <86box/plat_unused.h>
+#include <86box/port_92.h>
+#include <86box/smram.h>
+#include <86box/spd.h>
+#include <86box/sis_55xx.h>
+#include <86box/chipset.h>
+
+#ifdef ENABLE_SIS_5600_LOG
+int sis_5600_do_log = ENABLE_SIS_5600_LOG;
+
+static void
+sis_5600_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (sis_5600_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define sis_5600_log(fmt, ...)
+#endif
+
+typedef struct sis_5600_t {
+    uint8_t            nb_slot;
+    uint8_t            sb_slot;
+
+    void              *h2p;
+    void              *p2i;
+    void              *ide;
+    void              *usb;
+    void              *pmu;
+
+    sis_55xx_common_t *sis;
+} sis_5600_t;
+
+static void
+sis_5600_write(int func, int addr, uint8_t val, void *priv)
+{
+    const sis_5600_t *dev = (sis_5600_t *) priv;
+
+    sis_5600_log("SiS 5600: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
+
+    if (func == 0x00)
+        sis_5600_host_to_pci_write(addr, val, dev->h2p);
+    else if (func == 0x01)
+        sis_5513_ide_write(addr, val, dev->ide);
+}
+
+static uint8_t
+sis_5600_read(int func, int addr, void *priv)
+{
+    const sis_5600_t *dev = (sis_5600_t *) priv;
+    uint8_t ret = 0xff;
+
+    if (func == 0x00)
+        ret = sis_5600_host_to_pci_read(addr, dev->h2p);
+    else if (func == 0x01)
+        ret = sis_5513_ide_read(addr, dev->ide);
+
+    sis_5600_log("SiS 5600: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
+
+    return ret;
+}
+
+static void
+sis_5595_write(int func, int addr, uint8_t val, void *priv)
+{
+    const sis_5600_t *dev = (sis_5600_t *) priv;
+
+    sis_5600_log("SiS 5595: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
+
+    switch (func) {
+        case 0x00:
+            sis_5513_pci_to_isa_write(addr, val, dev->p2i);
+            break;
+        case 0x01:
+            sis_5595_pmu_write(addr, val, dev->pmu);
+            break;
+        case 0x02:
+            sis_5572_usb_write(addr, val, dev->usb);
+            break;
+    }
+}
+
+static uint8_t
+sis_5595_read(int func, int addr, void *priv)
+{
+    const sis_5600_t *dev = (sis_5600_t *) priv;
+    uint8_t ret = 0xff;
+
+    switch (func) {
+        case 0x00:
+            ret = sis_5513_pci_to_isa_read(addr, dev->p2i);
+            break;
+        case 0x01:
+            ret = sis_5595_pmu_read(addr, dev->pmu);
+            break;
+        case 0x02:
+            ret = sis_5572_usb_read(addr, dev->usb);
+            break;
+    }
+
+    sis_5600_log("SiS 5602: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
+
+    return ret;
+}
+
+static void
+sis_5600_close(void *priv)
+{
+    sis_5600_t *dev = (sis_5600_t *) priv;
+
+    free(dev);
+}
+
+static void *
+sis_5600_init(UNUSED(const device_t *info))
+{
+    sis_5600_t *dev = (sis_5600_t *) calloc(1, sizeof(sis_5600_t));
+
+    /* Device 0: SiS 5600 */
+    pci_add_card(PCI_ADD_NORTHBRIDGE, sis_5600_read, sis_5600_write, dev, &dev->nb_slot);
+    /* Device 1: SiS 5595 */
+    pci_add_card(PCI_ADD_SOUTHBRIDGE, sis_5595_read, sis_5595_write, dev, &dev->sb_slot);
+
+    dev->sis = device_add(&sis_55xx_common_device);
+
+    dev->ide = device_add_linked(&sis_5591_5600_ide_device, dev->sis);
+    if (info->local)
+        dev->p2i = device_add_linked(&sis_5595_1997_p2i_device, dev->sis);
+    else
+        dev->p2i = device_add_linked(&sis_5595_p2i_device, dev->sis);
+    dev->h2p = device_add_linked(&sis_5600_h2p_device, dev->sis);
+    dev->usb = device_add_linked(&sis_5595_usb_device, dev->sis);
+    if (info->local)
+        dev->pmu = device_add_linked(&sis_5595_1997_pmu_device, dev->sis);
+    else
+        dev->pmu = device_add_linked(&sis_5595_pmu_device, dev->sis);
+
+    device_add_params(&kbc_at_device, (void *) KBC_VEN_SIS);
+
+    return dev;
+}
+
+const device_t sis_5600_1997_device = {
+    .name          = "SiS (5)600 (1997)",
+    .internal_name = "sis_5600_1997",
+    .flags         = DEVICE_PCI,
+    .local         = 1,
+    .init          = sis_5600_init,
+    .close         = sis_5600_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t sis_5600_device = {
+    .name          = "SiS (5)600",
+    .internal_name = "sis_5600",
+    .flags         = DEVICE_PCI,
+    .local         = 0,
+    .init          = sis_5600_init,
+    .close         = sis_5600_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/sis_5600_h2p.c b/src/chipset/sis_5600_h2p.c
new file mode 100644
index 000000000..c23309de4
--- /dev/null
+++ b/src/chipset/sis_5600_h2p.c
@@ -0,0 +1,435 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the SiS (5)600 Host to PCI bridge.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2024 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/dma.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/hdd.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/hdc_ide_sff8038i.h>
+#include <86box/pci.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/pit_fast.h>
+#include <86box/plat.h>
+#include <86box/plat_unused.h>
+#include <86box/port_92.h>
+#include <86box/smram.h>
+#include <86box/spd.h>
+#include <86box/apm.h>
+#include <86box/ddma.h>
+#include <86box/acpi.h>
+#include <86box/smbus.h>
+#include <86box/sis_55xx.h>
+#include <86box/chipset.h>
+#include <86box/usb.h>
+#include <86box/agpgart.h>
+
+#ifdef ENABLE_SIS_5600_HOST_TO_PCI_LOG
+int sis_5600_host_to_pci_do_log = ENABLE_SIS_5600_HOST_TO_PCI_LOG;
+
+static void
+sis_5600_host_to_pci_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (sis_5600_host_to_pci_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define sis_5600_host_to_pci_log(fmt, ...)
+#endif
+
+typedef struct {
+    uint8_t  installed;
+    uint8_t  code;
+    uint32_t phys_size;
+} ram_bank_t;
+
+typedef struct sis_5600_host_to_pci_t {
+    uint8_t            pci_conf[256];
+    uint8_t            states[7];
+
+    ram_bank_t         ram_banks[3];
+
+    sis_55xx_common_t *sis;
+
+    smram_t           *smram;
+
+    agpgart_t         *agpgart;
+} sis_5600_host_to_pci_t;
+
+static uint8_t  bank_codes[7] = { 0x00, 0x20, 0x24, 0x22, 0x26, 0x2a, 0x2b };
+
+static uint32_t bank_sizes[7] = { 0x00800000,      /*   8 MB */
+                                  0x01000000,      /*  16 MB */
+                                  0x02000000,      /*  32 MB */
+                                  0x04000000,      /*  64 MB */
+                                  0x08000000,      /* 128 MB */
+                                  0x10000000,      /* 256 MB */
+                                  0x20000000 };    /* 512 MB */
+
+static void
+sis_5600_shadow_recalc(sis_5600_host_to_pci_t *dev)
+{
+    int      state;
+    uint32_t base;
+
+    for (uint8_t i = 0; i < 8; i++) {
+        base = 0x000c0000 + (i << 14);
+        state = (dev->pci_conf[0x70] & (1 << i)) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+        state |= (dev->pci_conf[0x72] & (1 << i)) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+        if (((dev->pci_conf[0x70] ^ dev->states[0]) & (1 << i)) ||
+            ((dev->pci_conf[0x72] ^ dev->states[2]) & (1 << i))) {
+            mem_set_mem_state_both(base, 0x4000, state);
+            sis_5600_host_to_pci_log("%08X-%08X\n", base, base + 0x3fff);
+        }
+    }
+
+    for (uint8_t i = 0; i < 4; i++) {
+        base = 0x000e0000 + (i << 14);
+        state = (dev->pci_conf[0x71] & (1 << i)) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+        state |= (dev->pci_conf[0x73] & (1 << i)) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+        if (((dev->pci_conf[0x71] ^ dev->states[1]) & (1 << i)) ||
+            ((dev->pci_conf[0x73] ^ dev->states[3]) & (1 << i))) {
+            mem_set_mem_state_both(base, 0x4000, state);
+            sis_5600_host_to_pci_log("%08X-%08X\n", base, base + 0x3fff);
+        }
+    }
+
+    base = 0x000f0000;
+    state = (dev->pci_conf[0x71] & (1 << 4)) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
+    state |= (dev->pci_conf[0x73] & (1 << 4)) ? MEM_WRITE_INTERNAL : MEM_WRITE_EXTANY;
+    if (((dev->pci_conf[0x71] ^ dev->states[1]) & (1 << 4)) ||
+        ((dev->pci_conf[0x73] ^ dev->states[3]) & (1 << 4))) {
+        mem_set_mem_state_both(base, 0x10000, state);
+        sis_5600_host_to_pci_log("%08X-%08X\n", base, base + 0xffff);
+    }
+
+    for (uint8_t i = 0; i < 4; i++)
+        dev->states[i] = dev->pci_conf[0x70 + i];
+
+    flushmmucache_nopc();
+}
+
+static void
+sis_5600_smram_recalc(sis_5600_host_to_pci_t *dev)
+{
+    smram_disable_all();
+
+    switch (dev->pci_conf[0x6a] >> 6) {
+        case 0:
+            smram_enable(dev->smram, 0x000e0000, 0x000e0000, 0x8000, dev->pci_conf[0x6a] & 0x10, 1);
+            break;
+        case 1:
+            smram_enable(dev->smram, 0x000e0000, 0x000a0000, 0x8000, dev->pci_conf[0x6a] & 0x10, 1);
+            break;
+        case 2:
+            smram_enable(dev->smram, 0x000e0000, 0x000b0000, 0x8000, dev->pci_conf[0x6a] & 0x10, 1);
+            break;
+        case 3:
+            smram_enable(dev->smram, 0x000a0000, 0x000a0000, 0x10000, dev->pci_conf[0x6a] & 0x10, 1);
+            break;
+
+        default:
+            break;
+    }
+
+    flushmmucache();
+}
+
+static void
+sis_5600_mask_bar(uint8_t *regs, void *agpgart)
+{
+    uint32_t bar;
+    uint32_t sizes[8] = { 0x00400000, 0x00800000, 0x01000000, 0x02000000, 0x04000000, 0x08000000,
+                          0x10000000, 0x00000000 } ;
+
+    /* Make sure the aperture's base is aligned to its size. */
+    bar = (regs[0x13] << 24) | (regs[0x12] << 16);
+    bar &= (sizes[(regs[0x94] >> 4) & 0x07] | 0xf0000000);
+    regs[0x12] = (bar >> 16) & 0xff;
+    regs[0x13] = (bar >> 24) & 0xff;
+
+    if (!agpgart)
+        return;
+
+    /* Map aperture and GART. */
+    agpgart_set_aperture(agpgart,
+                         bar,
+                         sizes[(regs[0x94] >> 4) & 0x07],
+                         !!(regs[0x94] & 0x02));
+    if (regs[0x94] & 0x01)
+        agpgart_set_gart(agpgart, (regs[0x91] << 8) | (regs[0x92] << 16) | (regs[0x93] << 24));
+    else
+        agpgart_set_gart(agpgart, 0x00000000);
+}
+
+void
+sis_5600_host_to_pci_write(int addr, uint8_t val, void *priv)
+{
+    sis_5600_host_to_pci_t *dev = (sis_5600_host_to_pci_t *) priv;
+
+    sis_5600_host_to_pci_log("SiS 5600 H2P: [W] dev->pci_conf[%02X] = %02X\n", addr, val);
+
+    switch (addr) {
+        default:
+            break;
+
+        case 0x04: /* Command - Low Byte */
+            dev->pci_conf[addr] = (dev->pci_conf[addr] & 0xfd) | (val & 0x02);
+            break;
+        case 0x05: /* Command - High Byte */
+            dev->pci_conf[addr] = val & 0x03;
+            break;
+
+        case 0x07: /* Status - High Byte */
+            dev->pci_conf[addr] = (dev->pci_conf[addr] & ~(val & 0x70)) | (val & 0x01);
+            break;
+
+        case 0x0d: /* Master latency timer */
+        case 0x50 ... 0x5a:
+        case 0x64 ... 0x69:
+        case 0x6b ... 0x6c:
+        case 0x74 ... 0x75:
+        case 0x77 ... 0x80:
+        case 0x82 ... 0x8f:
+        case 0x97 ... 0x9b:
+        case 0xc8 ... 0xcb:
+        case 0xd4 ... 0xd8:
+        case 0xda:
+        case 0xe0:
+        case 0xe2 ... 0xe3:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x12:
+            dev->pci_conf[addr] = val & 0xc0;
+            sis_5600_mask_bar(dev->pci_conf, dev->agpgart);
+            break;
+        case 0x13:
+            dev->pci_conf[addr] = val;
+            sis_5600_mask_bar(dev->pci_conf, dev->agpgart);
+            break;
+
+        case 0x60 ... 0x62:
+            dev->pci_conf[addr] = dev->ram_banks[addr & 0x0f].code | 0xc0;
+            break;
+
+        case 0x63:
+            dev->pci_conf[addr] = dev->ram_banks[0].installed |
+                                  (dev->ram_banks[1].installed << 1) |
+                                  (dev->ram_banks[2].installed << 2);
+            break;
+
+        case 0x6a:
+            dev->pci_conf[addr] = val;
+            sis_5600_smram_recalc(dev);
+            break;
+
+        case 0x70 ... 0x73:
+            dev->pci_conf[addr] = val;
+            sis_5600_shadow_recalc(dev);
+            break;
+
+        case 0x91 ... 0x93:
+            dev->pci_conf[addr] = val;
+            sis_5600_mask_bar(dev->pci_conf, dev->agpgart);
+            break;
+        case 0x94:
+            dev->pci_conf[addr] = val & 0x7f;
+            sis_5600_mask_bar(dev->pci_conf, dev->agpgart);
+            break;
+    }
+}
+
+uint8_t
+sis_5600_host_to_pci_read(int addr, void *priv)
+{
+    const sis_5600_host_to_pci_t *dev = (sis_5600_host_to_pci_t *) priv;
+    uint8_t ret = 0xff;
+
+    ret = dev->pci_conf[addr];
+
+    sis_5600_host_to_pci_log("SiS 5600 H2P: [R] dev->pci_conf[%02X] = %02X\n", addr, ret);
+
+    return ret;
+}
+
+static void
+sis_5600_host_to_pci_reset(void *priv)
+{
+    sis_5600_host_to_pci_t *dev = (sis_5600_host_to_pci_t *) priv;
+
+    dev->pci_conf[0x00] = 0x39;
+    dev->pci_conf[0x01] = 0x10;
+    dev->pci_conf[0x02] = 0x00;
+    dev->pci_conf[0x03] = 0x56;
+    dev->pci_conf[0x04] = 0x05;
+    dev->pci_conf[0x05] = 0x00;
+    dev->pci_conf[0x06] = 0x10;
+    dev->pci_conf[0x07] = 0x02;
+    dev->pci_conf[0x08] = 0x10;
+    dev->pci_conf[0x09] = dev->pci_conf[0x0a] = 0x00;
+    dev->pci_conf[0x0b] = 0x06;
+    dev->pci_conf[0x0c] = 0x00;
+    dev->pci_conf[0x0d] = 0xff;
+    dev->pci_conf[0x0e] = 0x80;
+    dev->pci_conf[0x0f] = 0x00;
+    dev->pci_conf[0x10] = dev->pci_conf[0x11] = 0x00;
+    dev->pci_conf[0x12] = dev->pci_conf[0x13] = 0x00;
+    dev->pci_conf[0x34] = 0xc0;
+    dev->pci_conf[0x50] = dev->pci_conf[0x51] = 0x02;
+    dev->pci_conf[0x52] = dev->pci_conf[0x53] = 0x00;
+    dev->pci_conf[0x54] = dev->pci_conf[0x55] = 0x00;
+    dev->pci_conf[0x56] = dev->pci_conf[0x57] = 0x00;
+    dev->pci_conf[0x58] = dev->pci_conf[0x59] = 0x00;
+    dev->pci_conf[0x5a] = 0x00;
+    dev->pci_conf[0x60] = dev->pci_conf[0x61] = 0x00;
+    dev->pci_conf[0x62] = 0x00;
+    dev->pci_conf[0x63] = 0xff;
+    dev->pci_conf[0x64] = dev->pci_conf[0x65] = 0x00;
+    dev->pci_conf[0x66] = dev->pci_conf[0x67] = 0x00;
+    dev->pci_conf[0x68] = dev->pci_conf[0x69] = 0x00;
+    dev->pci_conf[0x6a] = dev->pci_conf[0x6b] = 0x00;
+    dev->pci_conf[0x6c] = 0x00;
+    dev->pci_conf[0x70] = dev->pci_conf[0x71] = 0x00;
+    dev->pci_conf[0x72] = dev->pci_conf[0x73] = 0x00;
+    dev->pci_conf[0x74] = dev->pci_conf[0x75] = 0x00;
+    dev->pci_conf[0x77] = 0x00;
+    dev->pci_conf[0x78] = dev->pci_conf[0x79] = 0x00;
+    dev->pci_conf[0x7a] = dev->pci_conf[0x7b] = 0x00;
+    dev->pci_conf[0x7c] = dev->pci_conf[0x7d] = 0x00;
+    dev->pci_conf[0x7e] = dev->pci_conf[0x7f] = 0x00;
+    dev->pci_conf[0x80] = 0x00;
+    dev->pci_conf[0x82] = dev->pci_conf[0x83] = 0x00;
+    dev->pci_conf[0x84] = dev->pci_conf[0x85] = 0xff;
+    dev->pci_conf[0x86] = 0xff;
+    dev->pci_conf[0x87] = 0x00;
+    dev->pci_conf[0x88] = dev->pci_conf[0x89] = 0x00;
+    dev->pci_conf[0x8a] = dev->pci_conf[0x8b] = 0x00;
+    dev->pci_conf[0x8c] = 0x00;
+    dev->pci_conf[0x8d] = 0x62;
+    dev->pci_conf[0x8e] = dev->pci_conf[0x8f] = 0x00;
+    dev->pci_conf[0x90] = dev->pci_conf[0x91] = 0x00;
+    dev->pci_conf[0x92] = dev->pci_conf[0x93] = 0x00;
+    dev->pci_conf[0x94] = dev->pci_conf[0x97] = 0x00;
+    dev->pci_conf[0x98] = dev->pci_conf[0x99] = 0x00;
+    dev->pci_conf[0x9a] = dev->pci_conf[0x9b] = 0x00;
+    dev->pci_conf[0xc0] = 0x02;
+    dev->pci_conf[0xc1] = 0x00;
+    dev->pci_conf[0xc2] = 0x10;
+    dev->pci_conf[0xc3] = 0x00;
+    dev->pci_conf[0xc4] = 0x03;
+    dev->pci_conf[0xc5] = 0x02;
+    dev->pci_conf[0xc6] = 0x00;
+    dev->pci_conf[0xc7] = 0x1f;
+    dev->pci_conf[0xc8] = dev->pci_conf[0xc9] = 0x00;
+    dev->pci_conf[0xca] = dev->pci_conf[0xcb] = 0x00;
+    dev->pci_conf[0xd4] = dev->pci_conf[0xd5] = 0x00;
+    dev->pci_conf[0xd6] = dev->pci_conf[0xd7] = 0x00;
+    dev->pci_conf[0xd8] = dev->pci_conf[0xda] = 0x00;
+    dev->pci_conf[0xe0] = 0x00;
+    dev->pci_conf[0xe2] = dev->pci_conf[0xe3] = 0x00;
+
+    sis_5600_mask_bar(dev->pci_conf, dev->agpgart);
+
+    cpu_cache_ext_enabled = 1;
+    cpu_update_waitstates();
+
+    sis_5600_shadow_recalc(dev);
+
+    sis_5600_smram_recalc(dev);
+}
+
+static void
+sis_5600_host_to_pci_close(void *priv)
+{
+    sis_5600_host_to_pci_t *dev = (sis_5600_host_to_pci_t *) priv;
+
+    smram_del(dev->smram);
+    free(dev);
+}
+
+static void *
+sis_5600_host_to_pci_init(UNUSED(const device_t *info))
+{
+    sis_5600_host_to_pci_t *dev = (sis_5600_host_to_pci_t *) calloc(1, sizeof(sis_5600_host_to_pci_t));
+    uint32_t total_mem = mem_size << 10;
+    ram_bank_t *rb;
+
+    dev->sis = device_get_common_priv();
+
+    /* Calculate the physical RAM banks. */
+    for (uint8_t i = 0; i < 3; i++) {
+        rb = &(dev->ram_banks[i]);
+        uint32_t size = 0x00000000;
+        uint8_t  index = 0;
+        for (int8_t j = 6; j >= 0; j--) {
+            uint32_t *bs = &(bank_sizes[j]);
+            if (*bs <= total_mem) {
+                size = *bs;
+                index = j;
+                break;
+            }
+        }
+        if (size != 0x00000000) {
+            rb->installed = 1;
+            rb->code = bank_codes[index];
+            rb->phys_size = size;
+            total_mem -= size;
+        } else
+            rb->installed = 0;
+    }
+
+    /* SMRAM */
+    dev->smram = smram_add();
+
+    device_add(&sis_5xxx_agp_device);
+    dev->agpgart = device_add(&agpgart_device);
+
+    sis_5600_host_to_pci_reset(dev);
+
+    return dev;
+}
+
+const device_t sis_5600_h2p_device = {
+    .name          = "SiS (5)600 Host to PCI bridge",
+    .internal_name = "sis_5600_host_to_pci",
+    .flags         = DEVICE_PCI,
+    .local         = 0x00,
+    .init          = sis_5600_host_to_pci_init,
+    .close         = sis_5600_host_to_pci_close,
+    .reset         = sis_5600_host_to_pci_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/sis_85c310.c b/src/chipset/sis_85c310.c
index 296307fe1..dfbd4b465 100644
--- a/src/chipset/sis_85c310.c
+++ b/src/chipset/sis_85c310.c
@@ -130,8 +130,7 @@ rabbit_close(void *priv)
 static void *
 rabbit_init(UNUSED(const device_t *info))
 {
-    rabbit_t *dev = (rabbit_t *) malloc(sizeof(rabbit_t));
-    memset(dev, 0, sizeof(rabbit_t));
+    rabbit_t *dev = (rabbit_t *) calloc(1, sizeof(rabbit_t));
 
     io_sethandler(0x0022, 0x0002, rabbit_read, NULL, NULL, rabbit_write, NULL, NULL, dev);
 
@@ -146,7 +145,7 @@ const device_t rabbit_device = {
     .init          = rabbit_init,
     .close         = rabbit_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/sis_85c496.c b/src/chipset/sis_85c496.c
index b9b2544c8..10bccc1c8 100644
--- a/src/chipset/sis_85c496.c
+++ b/src/chipset/sis_85c496.c
@@ -388,8 +388,7 @@ sis_85c49x_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
             break;
         case 0x67: /* Miscellaneous Control */
             dev->pci_conf[addr] = val & 0xf9;
-            if (valxor & 0x60)
-                port_92_set_features(dev->port_92, !!(val & 0x20), !!(val & 0x40));
+            cpu_cpurst_on_sr = ((val & 0xa0) == 0x80) && !(dev->pci_conf[0xc6] & 0x08);
             break;
 
         /* 86C497 Specific Registers (80h ~ FFh) */
@@ -480,6 +479,8 @@ sis_85c49x_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
             break;
         case 0xc6: /* 85C497 Post / INIT Configuration */
             dev->pci_conf[addr] = val & 0x0f;
+            cpu_cpurst_on_sr = ((dev->pci_conf[0x67] & 0xa0) == 0x80) && !(val & 0x08);
+            soft_reset_pci = !!(val & 0x04);
             break;
         case 0xc8:
         case 0xc9:
@@ -608,12 +609,18 @@ sis_85c496_reset(void *priv)
     sis_85c49x_pci_write(0, 0xd0, 0x78, dev);
     sis_85c49x_pci_write(0, 0xd4, 0x00, dev);
 
+    dev->pci_conf[0x67] = 0x00;
+    dev->pci_conf[0xc6] = 0x00;
+
     ide_pri_disable();
     ide_sec_disable();
 
     nvr_bank_set(0, 0, dev->nvr);
 
     sis_85c497_isa_reset(dev);
+
+    cpu_cpurst_on_sr = 0;
+    soft_reset_pci = 0;
 }
 
 static void
@@ -630,8 +637,7 @@ static void
     *
     sis_85c496_init(const device_t *info)
 {
-    sis_85c496_t *dev = malloc(sizeof(sis_85c496_t));
-    memset(dev, 0x00, sizeof(sis_85c496_t));
+    sis_85c496_t *dev = calloc(1, sizeof(sis_85c496_t));
 
     dev->smram = smram_add();
 
@@ -695,7 +701,7 @@ const device_t sis_85c496_device = {
     .init          = sis_85c496_init,
     .close         = sis_85c496_close,
     .reset         = sis_85c496_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -709,7 +715,7 @@ const device_t sis_85c496_ls486e_device = {
     .init          = sis_85c496_init,
     .close         = sis_85c496_close,
     .reset         = sis_85c496_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/sis_85c4xx.c b/src/chipset/sis_85c4xx.c
index cf4ff42d7..49d0418ce 100644
--- a/src/chipset/sis_85c4xx.c
+++ b/src/chipset/sis_85c4xx.c
@@ -15,6 +15,7 @@
  *
  *          Copyright 2019-2020 Miran Grca.
  */
+#include <math.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -33,27 +34,384 @@
 #include <86box/mem.h>
 #include <86box/smram.h>
 #include <86box/pic.h>
+#include <86box/plat_fallthrough.h>
+#include <86box/keyboard.h>
 #include <86box/machine.h>
 #include <86box/chipset.h>
 
+typedef struct ram_bank_t {
+    uint32_t      virt_base;
+    uint32_t      virt_size;
+    uint32_t      phys_base;
+    uint32_t      phys_size;
+
+    mem_mapping_t mapping;
+} ram_bank_t;
+
 typedef struct sis_85c4xx_t {
-    uint8_t    cur_reg;
-    uint8_t    tries;
-    uint8_t    reg_base;
-    uint8_t    reg_last;
-    uint8_t    reg_00;
-    uint8_t    is_471;
-    uint8_t    force_flush;
-    uint8_t    shadowed;
-    uint8_t    smram_enabled;
-    uint8_t    pad;
-    uint8_t    regs[39];
-    uint8_t    scratch[2];
-    uint32_t   mem_state[8];
-    smram_t   *smram;
-    port_92_t *port_92;
+    uint8_t       cur_reg;
+    uint8_t       tries;
+    uint8_t       reg_base;
+    uint8_t       reg_last;
+    uint8_t       reg_00;
+    uint8_t       is_471;
+    uint8_t       ram_banks_val;
+    uint8_t       force_flush;
+    uint8_t       shadowed;
+    uint8_t       smram_enabled;
+    uint8_t       pad;
+    uint8_t       regs[39];
+    uint8_t       scratch[2];
+    uint32_t      mem_state[8];
+    ram_bank_t    ram_banks[8];
+    smram_t *     smram;
+    port_92_t *   port_92;
 } sis_85c4xx_t;
 
+static uint8_t ram_4xx[64] = { 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00,
+                               0x04, 0x00, 0x05, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                               0x19, 0x00, 0x06, 0x00, 0x14, 0x00, 0x00, 0x00,
+                               0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x1b, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00,
+                               0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+static uint8_t ram_471[64] = { 0x00, 0x00, 0x01, 0x01, 0x02, 0x20, 0x09, 0x09,
+                               0x04, 0x04, 0x05, 0x05, 0x0b, 0x0b, 0x0b, 0x0b,
+                               0x13, 0x21, 0x06, 0x06, 0x0d, 0x0d, 0x0d, 0x0d,
+                               0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e,
+                               0x1b, 0x1b, 0x1b, 0x1b, 0x0f, 0x0f, 0x0f, 0x0f,
+                               0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17,
+                               0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d,
+                               0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d };
+static uint8_t ram_asus[64] = { 0x00, 0x00, 0x01, 0x10, 0x10, 0x20, 0x03, 0x11,
+                                0x11, 0x05, 0x05, 0x12, 0x12, 0x13, 0x13, 0x13,
+                                0x13, 0x21, 0x06, 0x14, 0x14, 0x15, 0x15, 0x15,
+                                0x15, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d,
+                                0x1d, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17,
+                                0x17, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e,
+                                0x1e, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f,
+                                0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f };
+static uint8_t ram_tg486g[64] = { 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11,
+                                  0x11, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13,
+                                  0x13, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15,
+                                  0x15, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d,
+                                  0x1d, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17,
+                                  0x17, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e,
+                                  0x1e, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f,
+                                  0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f };
+
+static uint32_t banks_471[64][4] = { { 0x00100000, 0x00000000, 0x00000000, 0x00000000 }, /* 0x00 */
+                                     { 0x00100000, 0x00100000, 0x00000000, 0x00000000 },
+                                     { 0x00100000, 0x00100000, 0x00200000, 0x00000000 },
+                                     { 0x00100000, 0x00100000, 0x00400000, 0x00000000 },
+                                     { 0x00100000, 0x00100000, 0x00200000, 0x00400000 },
+                                     { 0x00100000, 0x00100000, 0x00400000, 0x00400000 },
+                                     { 0x00100000, 0x00100000, 0x01000000, 0x00000000 },
+                                     { 0x00200000, 0x00000000, 0x00000000, 0x00000000 },
+                                     { 0x00200000, 0x00200000, 0x00000000, 0x00000000 }, /* 0x08 */
+                                     { 0x00200000, 0x00400000, 0x00000000, 0x00000000 },
+                                     { 0x00200000, 0x00200000, 0x00400000, 0x00000000 },
+                                     { 0x00200000, 0x00200000, 0x00400000, 0x00400000 },
+                                     { 0x00200000, 0x01000000, 0x00000000, 0x00000000 },
+                                     { 0x00200000, 0x00200000, 0x01000000, 0x00000000 },
+                                     { 0x00200000, 0x00200000, 0x00400000, 0x01000000 },
+                                     { 0x00200000, 0x00200000, 0x01000000, 0x01000000 },
+                                     { 0x00400000, 0x00000000, 0x00000000, 0x00000000 }, /* 0x10 */
+                                     { 0x00400000, 0x00400000, 0x00000000, 0x00000000 },
+                                     { 0x00400000, 0x00400000, 0x00400000, 0x00000000 },
+                                     { 0x00400000, 0x00400000, 0x00400000, 0x00400000 },
+                                     { 0x00400000, 0x01000000, 0x00000000, 0x00000000 },
+                                     { 0x00400000, 0x00400000, 0x01000000, 0x00000000 },
+                                     { 0x00400000, 0x01000000, 0x01000000, 0x00000000 },
+                                     { 0x00400000, 0x00400000, 0x01000000, 0x01000000 },
+                                     { 0x00800000, 0x00000000, 0x00000000, 0x00000000 }, /* 0x18 */
+                                     { 0x00800000, 0x00800000, 0x00000000, 0x00000000 },
+                                     { 0x00800000, 0x00800000, 0x00800000, 0x00000000 },
+                                     { 0x00800000, 0x00800000, 0x00800000, 0x00800000 },
+                                     { 0x01000000, 0x00000000, 0x00000000, 0x00000000 },
+                                     { 0x01000000, 0x01000000, 0x00000000, 0x00000000 },
+                                     { 0x01000000, 0x01000000, 0x01000000, 0x00000000 },
+                                     { 0x01000000, 0x01000000, 0x01000000, 0x01000000 },
+                                     { 0x00100000, 0x00400000, 0x00000000, 0x00000000 }, /* 0x20 */
+                                     { 0x00100000, 0x01000000, 0x00000000, 0x00000000 },
+                                     { 0x00100000, 0x04000000, 0x00000000, 0x00000000 },
+                                     { 0x00400000, 0x00800000, 0x00000000, 0x00000000 },
+                                     { 0x00400000, 0x04000000, 0x00000000, 0x00000000 },
+                                     { 0x00400000, 0x00400000, 0x04000000, 0x00000000 },
+                                     { 0x01000000, 0x04000000, 0x00000000, 0x00000000 },
+                                     { 0x01000000, 0x01000000, 0x04000000, 0x00000000 },
+                                     { 0x04000000, 0x00000000, 0x00000000, 0x00000000 }, /* 0x28 */
+                                     { 0x04000000, 0x04000000, 0x00000000, 0x00000000 },
+                                     { 0x00400000, 0x02000000, 0x00000000, 0x00000000 },
+                                     { 0x00400000, 0x02000000, 0x02000000, 0x00000000 },
+                                     { 0x00400000, 0x00400000, 0x02000000, 0x00000000 },
+                                     { 0x00400000, 0x00400000, 0x02000000, 0x02000000 },
+                                     { 0x01000000, 0x02000000, 0x00000000, 0x00000000 },
+                                     { 0x01000000, 0x02000000, 0x02000000, 0x00000000 },
+                                     { 0x01000000, 0x01000000, 0x02000000, 0x00000000 }, /* 0x30 */
+                                     { 0x01000000, 0x01000000, 0x02000000, 0x02000000 },
+                                     { 0x02000000, 0x00000000, 0x00000000, 0x00000000 },
+                                     { 0x02000000, 0x02000000, 0x00000000, 0x00000000 },
+                                     { 0x02000000, 0x02000000, 0x02000000, 0x00000000 },
+                                     { 0x02000000, 0x02000000, 0x02000000, 0x02000000 },
+                                     { 0x00400000, 0x00800000, 0x00800000, 0x00000000 },
+                                     { 0x00400000, 0x00800000, 0x00800000, 0x00800000 },
+                                     { 0x00400000, 0x00400000, 0x00800000, 0x00000000 }, /* 0x38 */
+                                     { 0x00400000, 0x00400000, 0x00800000, 0x00800000 },
+                                     { 0x00800000, 0x01000000, 0x00000000, 0x00000000 },
+                                     { 0x00800000, 0x00800000, 0x00800000, 0x01000000 },
+                                     { 0x00800000, 0x00800000, 0x01000000, 0x00000000 },
+                                     { 0x00800000, 0x00800000, 0x01000000, 0x01000000 },
+                                     { 0x00800000, 0x00800000, 0x02000000, 0x00000000 },
+                                     { 0x00800000, 0x00800000, 0x02000000, 0x02000000 } };
+
+static uint32_t
+sis_85c471_get_row(ram_bank_t *dev, uint32_t addr)
+{
+    uint32_t ret = 0x00000000;
+
+    switch (dev->virt_size) {
+        case 0x00100000:
+        case 0x00200000:
+            ret |= (addr >> 13) & 0x00000001;
+            ret |= ((addr >> 12) & 0x00000001) << 1;
+            ret |= ((addr >> 14) & 0x0000003f) << 2;
+            ret |= ((addr >> 11) & 0x00000001) << 8;
+            ret |= ((addr >> 20) & 0x00000001) << 9;
+            ret |= ((addr >> 22) & 0x00000001) << 10;
+            ret |= ((addr >> 24) & 0x00000001) << 11;
+            break;
+        case 0x00400000:
+        case 0x00800000:
+            ret |= (addr >> 13) & 0x00000001;
+            ret |= ((addr >> 12) & 0x00000001) << 1;
+            ret |= ((addr >> 14) & 0x000000ff) << 2;
+            ret |= ((addr >> 22) & 0x00000001) << 10;
+            ret |= ((addr >> 24) & 0x00000001) << 11;
+            break;
+        case 0x01000000:
+        case 0x02000000:
+        case 0x04000000:
+            ret |= (addr >> 13) & 0x00000001;
+            ret |= ((addr >> 22) & 0x00000001) << 1;
+            ret |= ((addr >> 14) & 0x000000ff) << 2;
+            ret |= ((addr >> 23) & 0x00000001) << 10;
+            ret |= ((addr >> 24) & 0x00000001) << 11;
+            break;
+    }
+
+    return ret;
+}
+
+static uint32_t
+sis_85c471_get_col(ram_bank_t *dev, uint32_t addr)
+{
+    uint32_t ret = 0x00000000;
+
+    switch (dev->virt_size) {
+        case 0x00100000:
+        case 0x00200000:
+            ret |= (addr >> 3) & 0x00000001;
+            ret |= ((addr >> 2) & 0x00000001) << 1;
+            ret |= ((addr >> 4) & 0x0000003f) << 2;
+            ret |= ((addr >> 10) & 0x00000001) << 8;
+            ret |= ((addr >> 21) & 0x00000001) << 9;
+            ret |= ((addr >> 23) & 0x00000001) << 10;
+            ret |= ((addr >> 25) & 0x00000001) << 11;
+            break;
+        case 0x00400000:
+        case 0x00800000:
+            ret |= (addr >> 3) & 0x00000001;
+            ret |= ((addr >> 2) & 0x00000001) << 1;
+            ret |= ((addr >> 4) & 0x000000ff) << 2;
+            ret |= ((addr >> 23) & 0x00000001) << 10;
+            ret |= ((addr >> 25) & 0x00000001) << 11;
+            break;
+        case 0x01000000:
+        case 0x02000000:
+        case 0x04000000:
+            ret |= (addr >> 3) & 0x00000001;
+            ret |= ((addr >> 2) & 0x00000001) << 1;
+            ret |= ((addr >> 4) & 0x000001ff) << 2;
+            ret |= ((addr >> 25) & 0x00000001) << 11;
+            break;
+    }
+
+    return ret;
+}
+
+static uint32_t
+sis_85c471_set_row(ram_bank_t *dev, uint32_t addr)
+{
+    uint32_t ret = 0x00000000;
+
+    switch (dev->phys_size) {
+        case 0x00100000:
+            ret = (addr & 0x1ff) << 11;
+            break;
+        case 0x00200000:
+            ret = (addr & 0x3ff) << 11;
+            break;
+        case 0x00400000:
+            ret = (addr & 0x3ff) << 12;
+            break;
+        case 0x00800000:
+            ret = (addr & 0x7ff) << 12;
+            break;
+        case 0x01000000:
+            ret = (addr & 0x7ff) << 13;
+            break;
+        case 0x02000000:
+            ret = (addr & 0xfff) << 13;
+            break;
+        case 0x04000000:
+            ret = (addr & 0xfff) << 14;
+            break;
+    }
+
+    return ret;
+}
+
+static uint32_t
+sis_85c471_set_col(ram_bank_t *dev, uint32_t addr)
+{
+    uint32_t ret = 0x00000000;
+
+    switch (dev->phys_size) {
+        case 0x00100000:
+        case 0x00200000:
+            ret = (addr & 0x1ff) << 2;
+            break;
+        case 0x00400000:
+        case 0x00800000:
+            ret = (addr & 0x3ff) << 2;
+            break;
+        case 0x01000000:
+        case 0x02000000:
+            ret = (addr & 0x7ff) << 2;
+            break;
+        case 0x04000000:
+            ret = (addr & 0xfff) << 2;
+            break;
+    }
+
+    return ret;
+}
+
+uint8_t reg09 = 0x00;
+
+static uint8_t
+sis_85c471_read_ram(uint32_t addr, void *priv)
+{
+    ram_bank_t *dev = (ram_bank_t *) priv;
+    uint32_t    rel = addr - dev->virt_base;
+    uint8_t     ret = 0xff;
+
+    uint32_t row = sis_85c471_set_row(dev, sis_85c471_get_row(dev, rel));
+    uint32_t col = sis_85c471_set_col(dev, sis_85c471_get_col(dev, rel));
+    uint32_t dw  = rel & 0x00000003;
+    rel = row | col | dw;
+
+    addr = (rel + dev->phys_base);
+
+    if ((addr < (mem_size << 10)) && (rel < dev->phys_size))
+        ret = ram[addr];
+
+    return ret;
+}
+
+static uint16_t
+sis_85c471_read_ramw(uint32_t addr, void *priv)
+{
+    ram_bank_t *dev = (ram_bank_t *) priv;
+    uint32_t    rel = addr - dev->virt_base;
+    uint16_t    ret = 0xffff;
+
+    uint32_t row = sis_85c471_set_row(dev, sis_85c471_get_row(dev, rel));
+    uint32_t col = sis_85c471_set_col(dev, sis_85c471_get_col(dev, rel));
+    uint32_t dw  = rel & 0x00000003;
+    rel = row | col | dw;
+
+    addr = (rel + dev->phys_base);
+
+    if ((addr < (mem_size << 10)) && (rel < dev->phys_size))
+        ret = *(uint16_t *) &(ram[addr]);
+
+    return ret;
+}
+
+static uint32_t
+sis_85c471_read_raml(uint32_t addr, void *priv)
+{
+    ram_bank_t *dev = (ram_bank_t *) priv;
+    uint32_t    rel = addr - dev->virt_base;
+    uint32_t    ret = 0xffffffff;
+
+    uint32_t row = sis_85c471_set_row(dev, sis_85c471_get_row(dev, rel));
+    uint32_t col = sis_85c471_set_col(dev, sis_85c471_get_col(dev, rel));
+    uint32_t dw  = rel & 0x00000003;
+    rel = row | col | dw;
+
+    addr = (rel + dev->phys_base);
+
+    if ((addr < (mem_size << 10)) && (rel < dev->phys_size))
+        ret = *(uint32_t *) &(ram[addr]);
+
+    return ret;
+}
+
+static void
+sis_85c471_write_ram(uint32_t addr, uint8_t val, void *priv)
+{
+    ram_bank_t *dev = (ram_bank_t *) priv;
+    uint32_t    rel = addr - dev->virt_base;
+
+    uint32_t row = sis_85c471_set_row(dev, sis_85c471_get_row(dev, rel));
+    uint32_t col = sis_85c471_set_col(dev, sis_85c471_get_col(dev, rel));
+    uint32_t dw  = rel & 0x00000003;
+    rel = row | col | dw;
+
+    addr = (rel + dev->phys_base);
+
+    if ((addr < (mem_size << 10)) && (rel < dev->phys_size))
+        ram[addr] = val;
+}
+
+static void
+sis_85c471_write_ramw(uint32_t addr, uint16_t val, void *priv)
+{
+    ram_bank_t *dev = (ram_bank_t *) priv;
+    uint32_t    rel = addr - dev->virt_base;
+
+    uint32_t row = sis_85c471_set_row(dev, sis_85c471_get_row(dev, rel));
+    uint32_t col = sis_85c471_set_col(dev, sis_85c471_get_col(dev, rel));
+    uint32_t dw  = rel & 0x00000003;
+    rel = row | col | dw;
+
+    addr = (rel + dev->phys_base);
+
+    if ((addr < (mem_size << 10)) && (rel < dev->phys_size))
+        *(uint16_t *) &(ram[addr]) = val;
+}
+
+static void
+sis_85c471_write_raml(uint32_t addr, uint32_t val, void *priv)
+{
+    ram_bank_t *dev = (ram_bank_t *) priv;
+    uint32_t    rel = addr - dev->virt_base;
+
+    uint32_t row = sis_85c471_set_row(dev, sis_85c471_get_row(dev, rel));
+    uint32_t col = sis_85c471_set_col(dev, sis_85c471_get_col(dev, rel));
+    uint32_t dw  = rel & 0x00000003;
+    rel = row | col | dw;
+
+    addr = (rel + dev->phys_base);
+
+    if ((addr < (mem_size << 10)) && (rel < dev->phys_size))
+        *(uint32_t *) &(ram[addr]) = val;
+}
+
 static void
 sis_85c4xx_recalcremap(sis_85c4xx_t *dev)
 {
@@ -158,6 +516,62 @@ sis_85c4xx_sw_smi_handler(sis_85c4xx_t *dev)
                NULL, NULL, NULL, sis_85c4xx_sw_smi_out, NULL, NULL, dev);
 }
 
+static void
+sis_85c471_banks_split(uint32_t *b_ex, uint32_t *banks)
+{
+    for (uint8_t i = 0; i < 4; i++) {
+        if ((banks[i] == 0x00200000) || (banks[i] == 0x00800000) ||
+            (banks[i] == 0x02000000))
+            b_ex[i << 1] = b_ex[(i << 1) + 1] = banks[i] >> 1;
+        else {
+            b_ex[i << 1] = banks[i];
+            b_ex[(i << 1) + 1] = 0x00000000;
+        }
+    }
+}
+
+static void
+sis_85c471_banks_recalc(sis_85c4xx_t *dev)
+{
+    reg09 = dev->regs[0x09];
+
+    for (uint8_t i = 0; i < 8; i++)
+        mem_mapping_disable(&dev->ram_banks[i].mapping);
+
+    mem_mapping_disable(&ram_low_mapping);
+    mem_mapping_disable(&ram_high_mapping);
+    mem_set_mem_state_both(1 << 20, 127 << 20, MEM_READ_EXTERNAL | MEM_WRITE_EXTERNAL);
+
+    if ((dev->regs[0x09] & 0x3f) == dev->ram_banks_val) {
+        if (mem_size > 1024) {
+            mem_mapping_enable(&ram_low_mapping);
+            mem_mapping_enable(&ram_high_mapping);
+            mem_set_mem_state_both(1 << 20, (mem_size << 10) - (1 << 20),
+                                   MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+        }
+    } else {
+        uint8_t   banks_val = dev->regs[0x09] & 0x3f;
+        uint32_t *banks     = banks_471[banks_val];
+        uint32_t  b_ex[8]   = { 0x00000000 };
+        uint32_t  size      = 0x00000000;
+
+        sis_85c471_banks_split(b_ex, banks);
+
+        for (uint8_t i = 0; i < 8; i++)  if (b_ex[i] != 0x00000000) {
+            dev->ram_banks[i].virt_base = size;
+            dev->ram_banks[i].virt_size = b_ex[i];
+
+            mem_mapping_set_addr(&dev->ram_banks[i].mapping, size, b_ex[i]);
+
+            size += b_ex[i];
+        }
+
+        mem_set_mem_state_both(1 << 20, 127 << 20, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+    }
+
+    flushmmucache_nopc();
+}
+
 static void
 sis_85c4xx_out(uint16_t port, uint8_t val, void *priv)
 {
@@ -174,14 +588,16 @@ sis_85c4xx_out(uint16_t port, uint8_t val, void *priv)
         case 0x23:
             if ((dev->cur_reg >= dev->reg_base) && (dev->cur_reg <= dev->reg_last)) {
                 valxor = val ^ dev->regs[rel_reg];
-                if (rel_reg == 0x19)
-                    dev->regs[rel_reg] &= ~val;
-                else if (rel_reg == 0x00)
+
+                if (!dev->is_471 && (rel_reg == 0x00))
                     dev->regs[rel_reg] = (dev->regs[rel_reg] & 0x1f) | (val & 0xe0);
                 else
                     dev->regs[rel_reg] = val;
 
                 switch (rel_reg) {
+                    case 0x00:
+                        break;
+
                     case 0x01:
                         cpu_cache_ext_enabled = ((val & 0x84) == 0x84);
                         cpu_update_waitstates();
@@ -192,6 +608,13 @@ sis_85c4xx_out(uint16_t port, uint8_t val, void *priv)
                     case 0x08:
                         if (valxor)
                             sis_85c4xx_recalcmapping(dev);
+                        if ((rel_reg == 0x08) && dev->is_471)
+                            flushmmucache();
+                        break;
+
+                    case 0x09:
+                        if (dev->is_471)
+                            sis_85c471_banks_recalc(dev);
                         break;
 
                     case 0x0b:
@@ -200,6 +623,41 @@ sis_85c4xx_out(uint16_t port, uint8_t val, void *priv)
                             sis_85c4xx_recalcremap(dev);
                         break;
 
+                    case 0x10:
+                        if (dev->reg_base == 0x50) {
+                            double bus_clk;
+
+                            switch (val & 0xe0) {
+                                default:
+                                case 0x00:
+                                     bus_clk = 7159091.0;
+                                     break;
+                                case 0x02:
+                                     bus_clk = cpu_busspeed / 10.0;
+                                     break;
+                                case 0x04:
+                                     bus_clk = cpu_busspeed / 8.0;
+                                     break;
+                                case 0x06:
+                                     bus_clk = cpu_busspeed / 6.0;
+                                     break;
+                                case 0x80:
+                                     bus_clk = cpu_busspeed / 5.0;
+                                     break;
+                                case 0xa0:
+                                     bus_clk = cpu_busspeed / 4.0;
+                                     break;
+                                case 0xc0:
+                                     bus_clk = cpu_busspeed / 3.0;
+                                     break;
+                                case 0xe0:
+                                     bus_clk = cpu_busspeed / 2.0;
+                                     break;
+                            }
+                            cpu_set_isa_speed((int) round(bus_clk));
+                        }
+                        break;
+
                     case 0x13:
                         if (dev->is_471 && (valxor & 0xf0)) {
                             smram_disable(dev->smram);
@@ -299,14 +757,6 @@ sis_85c4xx_reset(void *priv)
 {
     sis_85c4xx_t  *dev         = (sis_85c4xx_t *) priv;
     int            mem_size_mb = mem_size >> 10;
-    static uint8_t ram_4xx[64] = { 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, 0x00, 0x05, 0x00, 0x0b, 0x00, 0x00, 0x00,
-                                   0x19, 0x00, 0x06, 0x00, 0x14, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                   0x1b, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                   0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-    static uint8_t ram_471[64] = { 0x00, 0x00, 0x01, 0x01, 0x02, 0x20, 0x09, 0x09, 0x04, 0x04, 0x05, 0x05, 0x0b, 0x0b, 0x0b, 0x0b,
-                                   0x13, 0x21, 0x06, 0x06, 0x0d, 0x0d, 0x0d, 0x0d, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e,
-                                   0x1b, 0x1b, 0x1b, 0x1b, 0x0f, 0x0f, 0x0f, 0x0f, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17,
-                                   0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e };
 
     memset(dev->regs, 0x00, sizeof(dev->regs));
 
@@ -315,13 +765,44 @@ sis_85c4xx_reset(void *priv)
 
     if (dev->is_471) {
         dev->regs[0x09] = 0x40;
-        if (mem_size_mb >= 64) {
-            if ((mem_size_mb >= 65) && (mem_size_mb < 68))
-                dev->regs[0x09] |= 0x22;
+
+        if (!strcmp(machine_get_internal_name(), "vli486sv2g")) {
+            if (mem_size_mb == 64)
+                dev->regs[0x09] |= 0x1f;
             else
-                dev->regs[0x09] |= 0x24;
-        } else
+                dev->regs[0x09] |= ram_asus[mem_size_mb];
+        } else if (mem_size_mb >= 64) {
+            if ((mem_size_mb >= 64) && (mem_size_mb < 68))
+                dev->regs[0x09] |= 0x33;
+            else if ((mem_size_mb >= 68) && (mem_size_mb < 72))
+                dev->regs[0x09] |= 0x2b;
+            else if ((mem_size_mb >= 72) && (mem_size_mb < 80))
+                dev->regs[0x09] |= 0x2d;
+            else if ((mem_size_mb >= 80) && (mem_size_mb < 96))
+                dev->regs[0x09] |= 0x2f;
+            else if ((mem_size_mb >= 96) && (mem_size_mb < 128))
+                dev->regs[0x09] |= 0x34;
+            else
+                dev->regs[0x09] |= 0x35;
+        } else if (!strcmp(machine_get_internal_name(), "tg486g"))
+            dev->regs[0x09] |= ram_tg486g[mem_size_mb];
+        else
             dev->regs[0x09] |= ram_471[mem_size_mb];
+        dev->ram_banks_val = dev->regs[0x09] & 0x3f;
+        dev->regs[0x09] = 0x00;
+
+        uint32_t *banks   = banks_471[dev->ram_banks_val];
+        uint32_t  b_ex[8] = { 0x00000000 };
+        uint32_t  size    = 0x00000000;
+
+        sis_85c471_banks_split(b_ex, banks);
+
+        for (uint8_t i = 0; i < 8; i++) {
+            dev->ram_banks[i].phys_base = size;
+            dev->ram_banks[i].phys_size = b_ex[i];
+
+            size += b_ex[i];
+        }
 
         dev->regs[0x11] = 0x09;
         dev->regs[0x12] = 0xff;
@@ -334,6 +815,11 @@ sis_85c4xx_reset(void *priv)
         port_92_remove(dev->port_92);
 
         soft_reset_mask = 0;
+
+        sis_85c471_banks_recalc(dev);
+
+        kbc_at_set_fast_reset(1);
+        cpu_cpurst_on_sr = 0;
     } else {
         /* Bits 6 and 7 must be clear on the SiS 40x. */
         if (dev->reg_base == 0x60)
@@ -354,6 +840,9 @@ sis_85c4xx_reset(void *priv)
 
     dev->force_flush = 1;
     sis_85c4xx_recalcmapping(dev);
+
+    if (dev->reg_base == 0x50)
+        cpu_set_isa_speed((int) round(7159091.0));
 }
 
 static void
@@ -370,19 +859,26 @@ sis_85c4xx_close(void *priv)
 static void *
 sis_85c4xx_init(const device_t *info)
 {
-    sis_85c4xx_t *dev = (sis_85c4xx_t *) malloc(sizeof(sis_85c4xx_t));
-    memset(dev, 0, sizeof(sis_85c4xx_t));
+    sis_85c4xx_t *dev = (sis_85c4xx_t *) calloc(1, sizeof(sis_85c4xx_t));
 
     dev->is_471 = (info->local >> 8) & 0xff;
 
     dev->reg_base = info->local & 0xff;
 
     if (dev->is_471) {
-        dev->reg_last = dev->reg_base + 0x76;
+        dev->reg_last = 0x76;
 
         dev->smram = smram_add();
 
         dev->port_92 = device_add(&port_92_device);
+
+        for (uint8_t i = 0; i < 8; i++) {
+            mem_mapping_add(&dev->ram_banks[i].mapping, 0x00000000, 0x00000000,
+                            sis_85c471_read_ram, sis_85c471_read_ramw, sis_85c471_read_raml,
+                            sis_85c471_write_ram, sis_85c471_write_ramw, sis_85c471_write_raml,
+                            NULL, MEM_MAPPING_INTERNAL, &(dev->ram_banks[i]));
+            mem_mapping_disable(&dev->ram_banks[i].mapping);
+        }
     } else
         dev->reg_last = dev->reg_base + 0x11;
 
@@ -405,7 +901,7 @@ const device_t sis_85c401_device = {
     .init          = sis_85c4xx_init,
     .close         = sis_85c4xx_close,
     .reset         = sis_85c4xx_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -419,7 +915,7 @@ const device_t sis_85c460_device = {
     .init          = sis_85c4xx_init,
     .close         = sis_85c4xx_close,
     .reset         = sis_85c4xx_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -434,7 +930,7 @@ const device_t sis_85c461_device = {
     .init          = sis_85c4xx_init,
     .close         = sis_85c4xx_close,
     .reset         = sis_85c4xx_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -448,7 +944,7 @@ const device_t sis_85c471_device = {
     .init          = sis_85c4xx_init,
     .close         = sis_85c4xx_close,
     .reset         = sis_85c4xx_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/sis_85c50x.c b/src/chipset/sis_85c50x.c
index 7f4aebb7c..e932ff6ca 100644
--- a/src/chipset/sis_85c50x.c
+++ b/src/chipset/sis_85c50x.c
@@ -6,15 +6,13 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          Implementation of the SiS 85C50x Chipset.
+ *          Implementation of the SiS 85C50x and 550x Chipsets.
  *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          Tiseno100,
  *
- *
- * Authors: Tiseno100,
- *          Miran Grca, <mgrca8@gmail.com>
- *
- *          Copyright 2020-2021 Tiseno100.
- *          Copyright 2020-2021 Miran Grca.
+ *          Copyright 2020-2024 Miran Grca.
+ *          Copyright 2020-2024 Tiseno100.
  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -26,17 +24,23 @@
 #include <86box/86box.h>
 #include <86box/device.h>
 #include <86box/io.h>
+#include "cpu.h"
 #include <86box/timer.h>
-
 #include <86box/apm.h>
 #include <86box/machine.h>
 #include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/pit_fast.h>
 #include <86box/plat_unused.h>
 #include <86box/mem.h>
+#include <86box/nvr.h>
 #include <86box/smram.h>
 #include <86box/pci.h>
 #include <86box/port_92.h>
-
+#include <86box/spd.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/keyboard.h>
 #include <86box/chipset.h>
 
 #ifdef ENABLE_SIS_85C50X_LOG
@@ -58,17 +62,23 @@ sis_85c50x_log(const char *fmt, ...)
 #endif
 
 typedef struct sis_85c50x_t {
-    uint8_t index;
-    uint8_t nb_slot;
-    uint8_t sb_slot;
-    uint8_t pad;
+    uint8_t    index;
+    uint8_t    nb_slot;
+    uint8_t    sb_slot;
+    uint8_t    type;
 
-    uint8_t pci_conf[256];
-    uint8_t pci_conf_sb[256];
-    uint8_t regs[256];
+    uint8_t    pci_conf[256];
+    uint8_t    pci_conf_sb[256];
+    uint8_t    pci_conf_ide[256];
+    uint8_t    regs[256];
+    uint32_t   states[13];
 
     smram_t   *smram[2];
     port_92_t *port_92;
+    void      *pit;
+    nvr_t     *nvr;
+
+    uint8_t  (*pit_read_reg)(void *priv, uint8_t reg);
 } sis_85c50x_t;
 
 static void
@@ -77,23 +87,59 @@ sis_85c50x_shadow_recalc(sis_85c50x_t *dev)
     uint32_t base;
     uint32_t can_read;
     uint32_t can_write;
+    uint32_t state;
 
     can_read  = (dev->pci_conf[0x53] & 0x40) ? MEM_READ_INTERNAL : MEM_READ_EXTANY;
     can_write = (dev->pci_conf[0x53] & 0x20) ? MEM_WRITE_EXTANY : MEM_WRITE_INTERNAL;
-    if (!can_read)
-        can_write = MEM_WRITE_EXTANY;
 
-    mem_set_mem_state_both(0xf0000, 0x10000, can_read | can_write);
-    shadowbios       = 1;
-    shadowbios_write = 1;
+    state = can_read | can_write;
+    if (dev->states[12] != state) {
+        mem_set_mem_state_both(0x000f0000, 0x00010000, state);
+        sis_85c50x_log("F0000-FFFFF: R%c, W%c\n",
+                       (dev->pci_conf[0x53] & 0x40) ? 'I' : 'E',
+                       (dev->pci_conf[0x53] & 0x20) ? 'P' : 'I');
+        dev->states[12] = state;
+    }
 
     for (uint8_t i = 0; i < 4; i++) {
-        base = 0xe0000 + (i << 14);
-        mem_set_mem_state_both(base, 0x4000, (dev->pci_conf[0x54] & (1 << (7 - i))) ? (can_read | can_write) : (MEM_READ_EXTANY | MEM_WRITE_EXTANY));
-        base = 0xd0000 + (i << 14);
-        mem_set_mem_state_both(base, 0x4000, (dev->pci_conf[0x55] & (1 << (7 - i))) ? (can_read | can_write) : (MEM_READ_EXTANY | MEM_WRITE_EXTANY));
-        base = 0xc0000 + (i << 14);
-        mem_set_mem_state_both(base, 0x4000, (dev->pci_conf[0x56] & (1 << (7 - i))) ? (can_read | can_write) : (MEM_READ_EXTANY | MEM_WRITE_EXTANY));
+        base = 0x000e0000 + (i << 14);
+        state = (dev->pci_conf[0x54] & (0x80 >> i)) ?
+                (can_read | can_write) : (MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+        if (dev->states[8 + i] != state) {
+            mem_set_mem_state_both(base, 0x00004000, state);
+            sis_85c50x_log("%05X-%05X: R%c, W%c\n", base, base + 0x3fff,
+                           (dev->pci_conf[0x54] & (0x80 >> i)) ?
+                           ((dev->pci_conf[0x53] & 0x40) ? 'I' : 'D') : 'E',
+                           (dev->pci_conf[0x54] & (0x80 >> i)) ?
+                           ((dev->pci_conf[0x53] & 0x20) ? 'P' : 'I') : 'E');
+            dev->states[8 + i] = state;
+        }
+
+        base = 0x000d0000 + (i << 14);
+        state = (dev->pci_conf[0x55] & (0x80 >> i)) ?
+                (can_read | can_write) : (MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+        if (dev->states[4 + i] != state) {
+            mem_set_mem_state_both(base, 0x00004000, state);
+            sis_85c50x_log("%05X-%05X: R%c, W%c\n", base, base + 0x3fff,
+                           (dev->pci_conf[0x55] & (0x80 >> i)) ?
+                           ((dev->pci_conf[0x53] & 0x40) ? 'I' : 'D') : 'E',
+                           (dev->pci_conf[0x55] & (0x80 >> i)) ?
+                           ((dev->pci_conf[0x53] & 0x20) ? 'P' : 'I') : 'E');
+            dev->states[4 + i] = state;
+        }
+
+        base = 0x000c0000 + (i << 14);
+        state = (dev->pci_conf[0x56] & (0x80 >> i)) ?
+                (can_read | can_write) : (MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+        if (dev->states[i] != state) {
+            mem_set_mem_state_both(base, 0x00004000, state);
+            sis_85c50x_log("%05X-%05X: R%c, W%c\n", base, base + 0x3fff,
+                           (dev->pci_conf[0x56] & (0x80 >> i)) ?
+                           ((dev->pci_conf[0x53] & 0x40) ? 'I' : 'D') : 'E',
+                           (dev->pci_conf[0x56] & (0x80 >> i)) ?
+                           ((dev->pci_conf[0x53] & 0x20) ? 'P' : 'I') : 'E');
+            dev->states[i] = state;
+        }
     }
 
     flushmmucache_nopc();
@@ -117,27 +163,35 @@ sis_85c50x_smm_recalc(sis_85c50x_t *dev)
             break;
         case 0x01:
             host_base |= 0x000b0000;
-            sis_85c50x_log("SiS 50x SMRAM: %08X-%08X -> 000B0000-000BFFFF\n", host_base, host_base + 0x10000 - 1);
+            sis_85c50x_log("SiS 50x SMRAM: %08X-%08X -> 000B0000-000BFFFF\n",
+                           host_base, host_base + 0x10000 - 1);
             smram_enable(dev->smram[0], host_base, 0xb0000, 0x10000, (dev->pci_conf[0x65] & 0x10), 1);
-            smram_enable(dev->smram[1], host_base ^ 0x00100000, 0xb0000, 0x10000, (dev->pci_conf[0x65] & 0x10), 1);
+            smram_enable(dev->smram[1], host_base ^ 0x00100000, 0xb0000,
+                         0x10000, (dev->pci_conf[0x65] & 0x10), 1);
             break;
         case 0x02:
             host_base |= 0x000a0000;
-            sis_85c50x_log("SiS 50x SMRAM: %08X-%08X -> 000A0000-000AFFFF\n", host_base, host_base + 0x10000 - 1);
+            sis_85c50x_log("SiS 50x SMRAM: %08X-%08X -> 000A0000-000AFFFF\n",
+                           host_base, host_base + 0x10000 - 1);
             smram_enable(dev->smram[0], host_base, 0xa0000, 0x10000, (dev->pci_conf[0x65] & 0x10), 1);
-            smram_enable(dev->smram[1], host_base ^ 0x00100000, 0xa0000, 0x10000, (dev->pci_conf[0x65] & 0x10), 1);
+            smram_enable(dev->smram[1], host_base ^ 0x00100000, 0xa0000,
+                         0x10000, (dev->pci_conf[0x65] & 0x10), 1);
             break;
         case 0x04:
             host_base |= 0x000a0000;
-            sis_85c50x_log("SiS 50x SMRAM: %08X-%08X -> 000A0000-000AFFFF\n", host_base, host_base + 0x8000 - 1);
+            sis_85c50x_log("SiS 50x SMRAM: %08X-%08X -> 000A0000-000AFFFF\n",
+                           host_base, host_base + 0x8000 - 1);
             smram_enable(dev->smram[0], host_base, 0xa0000, 0x8000, (dev->pci_conf[0x65] & 0x10), 1);
-            smram_enable(dev->smram[1], host_base ^ 0x00100000, 0xa0000, 0x8000, (dev->pci_conf[0x65] & 0x10), 1);
+            smram_enable(dev->smram[1], host_base ^ 0x00100000, 0xa0000,
+                         0x8000, (dev->pci_conf[0x65] & 0x10), 1);
             break;
         case 0x06:
             host_base |= 0x000b0000;
-            sis_85c50x_log("SiS 50x SMRAM: %08X-%08X -> 000B0000-000BFFFF\n", host_base, host_base + 0x8000 - 1);
+            sis_85c50x_log("SiS 50x SMRAM: %08X-%08X -> 000B0000-000BFFFF\n",
+                           host_base, host_base + 0x8000 - 1);
             smram_enable(dev->smram[0], host_base, 0xb0000, 0x8000, (dev->pci_conf[0x65] & 0x10), 1);
-            smram_enable(dev->smram[1], host_base ^ 0x00100000, 0xa0000, 0x8000, (dev->pci_conf[0x65] & 0x10), 1);
+            smram_enable(dev->smram[1], host_base ^ 0x00100000, 0xa0000,
+                         0x8000, (dev->pci_conf[0x65] & 0x10), 1);
             break;
         default:
             break;
@@ -160,7 +214,10 @@ sis_85c50x_write(int func, int addr, uint8_t val, void *priv)
                 dev->pci_conf[addr] = ((dev->pci_conf[addr] & 0xf9) & ~(val & 0xf8)) | (val & 0x06);
                 break;
             case 0x50:
-                dev->pci_conf[addr] = val;
+                if (dev->type & 1)
+                    dev->pci_conf[addr] = val & 0xf7;
+                else
+                    dev->pci_conf[addr] = val;
                 break;
             case 0x51: /* Cache */
                 dev->pci_conf[addr]   = val;
@@ -176,8 +233,6 @@ sis_85c50x_write(int func, int addr, uint8_t val, void *priv)
             case 0x56:
                 dev->pci_conf[addr] = val;
                 sis_85c50x_shadow_recalc(dev);
-                if (addr == 0x54)
-                    sis_85c50x_smm_recalc(dev);
                 break;
             case 0x57:
             case 0x58:
@@ -204,6 +259,7 @@ sis_85c50x_write(int func, int addr, uint8_t val, void *priv)
                 break;
             case 0x5b:
                 dev->pci_conf[addr] = val;
+                kbc_at_set_fast_reset(!!(val & 0x40));
                 break;
             case 0x60: /* SMI */
                 if ((dev->pci_conf[0x68] & 0x01) && !(dev->pci_conf[addr] & 0x02) && (val & 0x02)) {
@@ -223,6 +279,31 @@ sis_85c50x_write(int func, int addr, uint8_t val, void *priv)
             case 0x69:
                 dev->pci_conf[addr] &= ~val;
                 break;
+            case 0x70 ... 0x77:
+                if (dev->type & 1)
+                    spd_write_drbs(dev->pci_conf, 0x70, 0x77, 2);
+                break;
+            case 0x78:
+            case 0x7c ... 0x7e:
+                if (dev->type & 1)
+                    dev->pci_conf[addr] = val;
+                break;
+            case 0x79:
+                if (dev->type & 1) {
+                    spd_write_drbs(dev->pci_conf, 0xf8, 0xff, 4);
+                    dev->pci_conf[addr] = 0x00;
+                    for (uint8_t i = 0; i < 8; i++)
+                        if (dev->pci_conf[0xf8 + i] & 0x80)  dev->pci_conf[addr] |= (1 << i);
+                }
+                break;
+            case 0x7a:
+                if (dev->type & 1)
+                    dev->pci_conf[addr] = val & 0xfe;
+                break;
+            case 0x7b:
+                if (dev->type & 1)
+                    dev->pci_conf[addr] = val & 0xe0;
+                break;
 
             default:
                 break;
@@ -235,14 +316,33 @@ sis_85c50x_read(int func, int addr, void *priv)
     const sis_85c50x_t *dev = (sis_85c50x_t *) priv;
     uint8_t             ret = 0xff;
 
-    if (func == 0x00)
-        ret = dev->pci_conf[addr];
+    if (func == 0x00) {
+        if (addr >= 0xf8)
+            ret = 0x00;
+        else
+            ret = dev->pci_conf[addr];
+    }
 
     sis_85c50x_log("85C501: [R] (%02X, %02X) = %02X\n", func, addr, ret);
 
     return ret;
 }
 
+static void
+sis_85c50x_ide_recalc(sis_85c50x_t *dev)
+{
+    ide_pri_disable();
+    ide_set_base(0, (dev->pci_conf_ide[0x40] & 0x80) ? 0x0170 : 0x01f0);
+    ide_set_side(0, (dev->pci_conf_ide[0x40] & 0x80) ? 0x0376 : 0x03f6);
+    ide_pri_enable();
+
+    ide_sec_disable();
+    ide_set_base(1, (dev->pci_conf_ide[0x40] & 0x80) ? 0x01f0 : 0x0170);
+    ide_set_side(1, (dev->pci_conf_ide[0x40] & 0x80) ? 0x03f6 : 0x0376);
+    if (dev->pci_conf_ide[0x41] & 0x01)
+        ide_sec_enable();
+}
+
 static void
 sis_85c50x_sb_write(int func, int addr, uint8_t val, void *priv)
 {
@@ -250,38 +350,46 @@ sis_85c50x_sb_write(int func, int addr, uint8_t val, void *priv)
 
     sis_85c50x_log("85C503: [W] (%02X, %02X) = %02X\n", func, addr, val);
 
-    if (func == 0x00)
-        switch (addr) {
-            case 0x04: /* Command */
-                dev->pci_conf_sb[addr] = val & 0x0f;
-                break;
-            case 0x07: /* Status */
-                dev->pci_conf_sb[addr] &= ~(val & 0x30);
-                break;
-            case 0x40: /* BIOS Control Register */
-                dev->pci_conf_sb[addr] = val & 0x3f;
-                break;
-            case 0x41:
-            case 0x42:
-            case 0x43:
-            case 0x44:
-                /* INTA/B/C/D# Remapping Control Register */
-                dev->pci_conf_sb[addr] = val & 0x8f;
-                if (val & 0x80)
-                    pci_set_irq_routing(PCI_INTA + (addr - 0x41), PCI_IRQ_DISABLED);
-                else
-                    pci_set_irq_routing(PCI_INTA + (addr - 0x41), val & 0xf);
-                break;
-            case 0x48: /* ISA Master/DMA Memory Cycle Control Register 1 */
-            case 0x49: /* ISA Master/DMA Memory Cycle Control Register 2 */
-            case 0x4a: /* ISA Master/DMA Memory Cycle Control Register 3 */
-            case 0x4b: /* ISA Master/DMA Memory Cycle Control Register 4 */
-                dev->pci_conf_sb[addr] = val;
-                break;
+    if (func == 0x00)  switch (addr) {
+        case 0x04: /* Command */
+            dev->pci_conf_sb[addr] = val & 0x0f;
+            break;
+        case 0x07: /* Status */
+            dev->pci_conf_sb[addr] &= ~(val & 0x30);
+            break;
+        case 0x40: /* BIOS Control Register */
+            dev->pci_conf_sb[addr] = val & 0x3f;
+            break;
+        case 0x41:
+        case 0x42:
+        case 0x43:
+        case 0x44:
+            /* INTA/B/C/D# Remapping Control Register */
+            dev->pci_conf_sb[addr] = val & 0x8f;
+            if (val & 0x80)
+                pci_set_irq_routing(PCI_INTA + (addr - 0x41), PCI_IRQ_DISABLED);
+            else
+                pci_set_irq_routing(PCI_INTA + (addr - 0x41), val & 0xf);
+            break;
+        case 0x48: /* ISA Master/DMA Memory Cycle Control Register 1 */
+        case 0x49: /* ISA Master/DMA Memory Cycle Control Register 2 */
+        case 0x4a: /* ISA Master/DMA Memory Cycle Control Register 3 */
+        case 0x4b: /* ISA Master/DMA Memory Cycle Control Register 4 */
+            dev->pci_conf_sb[addr] = val;
+            break;
 
-            default:
-                break;
-        }
+        default:
+            break;
+    } else if ((dev->type & 2) && !(dev->regs[0x81] & 0x02) && (func == 0x01))  switch (addr) {
+        case 0x40:
+        case 0x41:
+            dev->pci_conf_ide[addr] = val;
+            sis_85c50x_ide_recalc(dev);
+            break;
+
+        default:
+            break;
+    }
 }
 
 static uint8_t
@@ -290,8 +398,42 @@ sis_85c50x_sb_read(int func, int addr, void *priv)
     const sis_85c50x_t *dev = (sis_85c50x_t *) priv;
     uint8_t             ret = 0xff;
 
-    if (func == 0x00)
-        ret = dev->pci_conf_sb[addr];
+    if (func == 0x00)  switch (addr) {
+        default:
+            ret = dev->pci_conf_sb[addr];
+            break;
+        case 0x4c ... 0x4f:
+            if (dev->type & 2)
+                ret = pic_read_icw(0, addr & 0x03);
+            else
+                ret = dev->pci_conf_sb[addr];
+            break;
+        case 0x50 ... 0x53:
+            if (dev->type & 2)
+                ret = pic_read_icw(1, addr & 0x03);
+            else
+                ret = dev->pci_conf_sb[addr];
+            break;
+        case 0x54 ... 0x55:
+            if (dev->type & 2)
+                ret = pic_read_ocw(0, addr & 0x01);
+            else
+                ret = dev->pci_conf_sb[addr];
+            break;
+        case 0x56 ... 0x57:
+            if (dev->type & 2)
+                ret = pic_read_ocw(1, addr & 0x01);
+            else
+                ret = dev->pci_conf_sb[addr];
+            break;
+        case 0x58 ... 0x5f:
+            if (dev->type & 2)
+                ret = dev->pit_read_reg(dev->pit, addr & 0x07);
+            else
+                ret = dev->pci_conf_sb[addr];
+            break;
+    } else if ((dev->type & 2) && !(dev->regs[0x81] & 0x02) && (func == 0x01))
+        ret = dev->pci_conf_ide[addr];
 
     sis_85c50x_log("85C503: [W] (%02X, %02X) = %02X\n", func, addr, ret);
 
@@ -313,10 +455,39 @@ sis_85c50x_isa_write(uint16_t addr, uint8_t val, void *priv)
         case 0x23:
             switch (dev->index) {
                 case 0x80:
-                    dev->regs[dev->index] = val & 0xe7;
+                    if (dev->type & 2) {
+                        dev->regs[dev->index] = val;
+                        nvr_bank_set(0, !!(val & 0x08), dev->nvr);
+                    } else
+                        dev->regs[dev->index] = val & 0xe7;
+                    switch (val >> 6) {
+                        case 0:
+                            cpu_set_isa_speed(7159091);
+                            break;
+                        case 1:
+                            cpu_set_isa_pci_div(4);
+                            break;
+                        case 2:
+                            cpu_set_isa_pci_div(3);
+                            break;
+
+                        default:
+                            break;
+                    }
                     break;
                 case 0x81:
-                    dev->regs[dev->index] = val & 0xf4;
+                    if (dev->type & 2)
+                        dev->regs[dev->index] = val & 0xf6;
+                    else
+                        dev->regs[dev->index] = val & 0xf4;
+                    break;
+                case 0x82:
+                    if (dev->type & 2)
+                        dev->regs[dev->index] = val;
+                    break;
+                case 0x83:
+                    if (dev->type & 2)
+                        dev->regs[dev->index] = val & 0x03;
                     break;
                 case 0x84:
                 case 0x88:
@@ -394,6 +565,12 @@ sis_85c50x_reset(void *priv)
     sis_85c50x_write(0, 0x68, 0x00, dev);
     sis_85c50x_write(0, 0x69, 0xff, dev);
 
+    if (dev->type & 1) {
+        for (uint8_t i = 0; i < 8; i++)
+            dev->pci_conf[0x70 + i] = 0x00;
+        dev->pci_conf[0x79] = 0x00;
+    }
+
     /* South Bridge (SiS 85C503) */
     dev->pci_conf_sb[0x00] = 0x39;
     dev->pci_conf_sb[0x01] = 0x10;
@@ -407,10 +584,51 @@ sis_85c50x_reset(void *priv)
     dev->pci_conf_sb[0x09] = 0x00;
     dev->pci_conf_sb[0x0a] = 0x01;
     dev->pci_conf_sb[0x0b] = 0x06;
+    if (dev->type & 2)
+        dev->pci_conf_sb[0x0e] = 0x80;
     sis_85c50x_sb_write(0, 0x41, 0x80, dev);
     sis_85c50x_sb_write(0, 0x42, 0x80, dev);
     sis_85c50x_sb_write(0, 0x43, 0x80, dev);
     sis_85c50x_sb_write(0, 0x44, 0x80, dev);
+
+    if (dev->type & 2) {
+        /* IDE (SiS 5503) */
+        dev->pci_conf_ide[0x00] = 0x39;
+        dev->pci_conf_ide[0x01] = 0x10;
+        dev->pci_conf_ide[0x02] = 0x01;
+        dev->pci_conf_ide[0x03] = 0x06;
+        dev->pci_conf_ide[0x04] = 0x89;
+        dev->pci_conf_ide[0x05] = 0x00;
+        dev->pci_conf_ide[0x06] = 0x00;
+        dev->pci_conf_ide[0x07] = 0x00;
+        dev->pci_conf_ide[0x08] = 0x00;
+        dev->pci_conf_ide[0x09] = 0x00;
+        dev->pci_conf_ide[0x0a] = 0x01;
+        dev->pci_conf_ide[0x0b] = 0x01;
+        dev->pci_conf_ide[0x0c] = 0x00;
+        dev->pci_conf_ide[0x0d] = 0x00;
+        dev->pci_conf_ide[0x0e] = 0x80;
+        dev->pci_conf_ide[0x0f] = 0x00;
+        dev->pci_conf_ide[0x10] = 0x71;
+        dev->pci_conf_ide[0x11] = 0x01;
+        dev->pci_conf_ide[0x14] = 0xf1;
+        dev->pci_conf_ide[0x15] = 0x01;
+        dev->pci_conf_ide[0x18] = 0x71;
+        dev->pci_conf_ide[0x19] = 0x03;
+        dev->pci_conf_ide[0x1c] = 0xf1;
+        dev->pci_conf_ide[0x1d] = 0x03;
+        dev->pci_conf_ide[0x20] = 0x01;
+        dev->pci_conf_ide[0x24] = 0x01;
+        dev->pci_conf_ide[0x40] = 0x00;
+        dev->pci_conf_ide[0x41] = 0x40;
+
+        sis_85c50x_ide_recalc(dev);
+    }
+
+    cpu_set_isa_speed(7159091);
+
+    if (dev->type & 2)
+        nvr_bank_set(0, 0, dev->nvr);
 }
 
 static void
@@ -426,8 +644,10 @@ sis_85c50x_close(void *priv)
 static void *
 sis_85c50x_init(UNUSED(const device_t *info))
 {
-    sis_85c50x_t *dev = (sis_85c50x_t *) malloc(sizeof(sis_85c50x_t));
-    memset(dev, 0x00, sizeof(sis_85c50x_t));
+    sis_85c50x_t *dev = (sis_85c50x_t *) calloc(1, sizeof(sis_85c50x_t));
+    uint8_t pit_is_fast = (((pit_mode == -1) && is486) || (pit_mode == 1));
+
+    dev->type = info->local;
 
     /* 501/502 (Northbridge) */
     pci_add_card(PCI_ADD_NORTHBRIDGE, sis_85c50x_read, sis_85c50x_write, dev, &dev->nb_slot);
@@ -441,6 +661,17 @@ sis_85c50x_init(UNUSED(const device_t *info))
 
     dev->port_92 = device_add(&port_92_device);
 
+    if (dev->type & 2) {
+        /* PIT */
+        dev->pit = device_find_first_priv(DEVICE_PIT);
+        dev->pit_read_reg = pit_is_fast ? pitf_read_reg : pit_read_reg;
+
+        /* NVR */
+        dev->nvr = device_add(&at_mb_nvr_device);
+
+        device_add(&ide_pci_2ch_device);
+    }
+
     sis_85c50x_reset(dev);
 
     return dev;
@@ -454,7 +685,49 @@ const device_t sis_85c50x_device = {
     .init          = sis_85c50x_init,
     .close         = sis_85c50x_close,
     .reset         = sis_85c50x_reset,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t sis_550x_85c503_device = {
+    .name          = "SiS 550x",
+    .internal_name = "sis_550x",
+    .flags         = DEVICE_PCI,
+    .local         = 1,
+    .init          = sis_85c50x_init,
+    .close         = sis_85c50x_close,
+    .reset         = sis_85c50x_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t sis_85c50x_5503_device = {
+    .name          = "SiS 85C50x",
+    .internal_name = "sis_85c50x",
+    .flags         = DEVICE_PCI,
+    .local         = 2,
+    .init          = sis_85c50x_init,
+    .close         = sis_85c50x_close,
+    .reset         = sis_85c50x_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t sis_550x_device = {
+    .name          = "SiS 550x",
+    .internal_name = "sis_550x",
+    .flags         = DEVICE_PCI,
+    .local         = 3,
+    .init          = sis_85c50x_init,
+    .close         = sis_85c50x_close,
+    .reset         = sis_85c50x_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/sl82c461.c b/src/chipset/sl82c461.c
new file mode 100644
index 000000000..f94aa2e99
--- /dev/null
+++ b/src/chipset/sl82c461.c
@@ -0,0 +1,362 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the Symphony SL82C461 (Haydn II) chipset.
+ *
+ * Symphony SL82C461 Configuration Registers (WARNING: May be inaccurate!):
+ *
+ *     - Register 00h:
+ *         - Bit 6: External cache present (if clear, AMI BIOS'es will not
+ *                                          allow enabling external cache).
+ *
+ *     - Register 01h:
+ *         - Bit 0: Fast Gate A20 Enable (Handler mostly).
+ *                  Is it? Enabling/disabling fast gate A20 doesn't appear
+ *                  to do much to any register at all.
+ *
+ *     - Register 02h:
+ *         - Bit 0: Optional Chipset Turbo Pin;
+ *         - Bits 4-2:
+ *             - 000 = CLK2/3;
+ *             - 001 = CLK2/4;
+ *             - 010 = CLK2/5;
+ *             - 011 = 7.159 MHz (ATCLK2);
+ *             - 100 = CLK2/6;
+ *             - 110 = CLK2/2.5;
+ *             - 111 = CLK2/2.
+ *
+ *     - Register 06h:
+ *         - Bit 2: Decoupled Refresh Option.
+ *
+ *     - Register 08h:
+ *         - Bits 3, 2: I/O Recovery Time (SYSCLK):
+ *             - 0, 0 = 0;
+ *             - 1, 1 = 12.
+ *         - Bit 1: Extended ALE.
+ *
+ *     - Register 25h:
+ *       Bit 7 here causes AMI 111192 CMOS Setup to return 7168 KB RAM
+ *       instead of 6912 KB. This is 256 KB off. Relocation?
+ *       Also, returning bit 5 clear instead of set, causes the AMI BIOS
+ *       to set bits 0,1 of register 45h to 1,0 instead of 0,1.
+ *
+ *     - Register 2Dh:
+ *         - Bit 7: Enable 256KB Memory Relocation;
+ *         - Bit 6: Enable 384KB Memory Relocation, bit 7 must also be set.
+ *
+ *     - Register 2Eh:
+ *         - Bit 7: CC000-CFFFF Shadow Read Enable;
+ *         - Bit 6: CC000-CFFFF Shadow Write Enable;
+ *         - Bit 5: C8000-CBFFF Shadow Read Enable;
+ *         - Bit 4: C8000-CBFFF Shadow Write Enable;
+ *         - Bit 3: C4000-C7FFF Shadow Read Enable;
+ *         - Bit 2: C4000-C7FFF Shadow Write Enable;
+ *         - Bit 1: C0000-C3FFF Shadow Read Enable;
+ *         - Bit 0: C0000-C3FFF Shadow Write Enable.
+ *
+ *     - Register 2Fh:
+ *         - Bit 7: DC000-DFFFF Shadow Read Enable;
+ *         - Bit 6: DC000-DFFFF Shadow Write Enable;
+ *         - Bit 5: D8000-DBFFF Shadow Read Enable;
+ *         - Bit 4: D8000-DBFFF Shadow Write Enable;
+ *         - Bit 3: D4000-D7FFF Shadow Read Enable;
+ *         - Bit 2: D4000-D7FFF Shadow Write Enable;
+ *         - Bit 1: D0000-D3FFF Shadow Read Enable;
+ *         - Bit 0: D0000-D3FFF Shadow Write Enable.
+ *
+ *     - Register 30h:
+ *         - Bit 7: E0000-EFFFF Shadow Read Enable;
+ *         - Bit 6: E0000-EFFFF Shadow Write Enable.
+ *
+ *     - Register 31h:
+ *         - Bit 7: F0000-FFFFF Shadow Read Enable;
+ *         - Bit 6: F0000-FFFFF Shadow Write Enable.
+ *
+ *     - Register 33h (NOTE: Waitstates also affect register 32h):
+ *         - Bits 3, 0:
+ *             - 0,0 = 0 W/S;
+ *             - 1,0 = 1 W/S;
+ *             - 1,1 = 2 W/S.
+ *
+ *     - Register 40h:
+ *         - Bit 3: External Cache Enabled (0 = yes, 1 = no);
+ *                  I also see bits 5, 4, 3 of register 44h affected:
+ *                      - 38h (so all 3 set) when cache is disabled;
+ *                      - 00h (all 3 clear) when it's enabled.
+ *
+ *     - Register 45h:
+ *         - Bit 3: Video Shadow RAM Cacheable;
+ *         - Bit 4: Adapter Shadow RAM Cacheable;
+ *         - Bit 5: BIOS Shadow RAM Cacheable.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          Tiseno100,
+ *
+ *          Copyright 2025 Miran Grca.
+ *          Copyright 2021-2025 Tiseno100.
+ */
+#include <math.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/mem.h>
+#include <86box/chipset.h>
+
+typedef struct {
+    uint8_t index;
+    uint8_t regs[256];
+    uint8_t shadow[4];
+} sl82c461_t;
+
+#ifdef ENABLE_SL82C461_LOG
+int sl82c461_do_log = ENABLE_SL82C461_LOG;
+
+static void
+sl82c461_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (sl82c461_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#define sl82c461_log(fmt, ...)
+#endif
+
+static void
+sl82c461_recalcmapping(sl82c461_t *dev)
+{
+    int do_shadow = 0;
+
+    for (uint32_t i = 0; i < 8; i += 2) {
+        if ((dev->regs[0x2e] ^ dev->shadow[0x00]) & (3 << i)) {
+            uint32_t base = 0x000c0000 + ((i >> 1) << 14);
+            uint32_t read  = ((dev->regs[0x2e] >> i) & 0x02) ? MEM_READ_INTERNAL :
+                                                              MEM_READ_EXTANY;
+            uint32_t write = ((dev->regs[0x2e] >> i) & 0x01) ? MEM_WRITE_INTERNAL :
+                                                               MEM_WRITE_EXTANY;
+
+            mem_set_mem_state_both(base, 0x00004000, read | write);
+
+            do_shadow++;
+        }
+
+        if ((dev->regs[0x2f] ^ dev->shadow[0x01]) & (3 << i)) {
+            uint32_t base = 0x000d0000 + ((i >> 1) << 14);
+            uint32_t read  = ((dev->regs[0x2f] >> i) & 0x02) ? MEM_READ_INTERNAL :
+                                                              MEM_READ_EXTANY;
+            uint32_t write = ((dev->regs[0x2f] >> i) & 0x01) ? MEM_WRITE_INTERNAL :
+                                                               MEM_WRITE_EXTANY;
+
+            mem_set_mem_state_both(base, 0x00004000, read | write);
+
+            do_shadow++;
+        }
+    }
+
+    if ((dev->regs[0x30] ^ dev->shadow[0x02]) & 0xc0) {
+        uint32_t base = 0x000e0000;
+        uint32_t read  = ((dev->regs[0x30] >> 6) & 0x02) ? MEM_READ_INTERNAL :
+                                                           MEM_READ_EXTANY;
+        uint32_t write = ((dev->regs[0x30] >> 6) & 0x01) ? MEM_WRITE_INTERNAL :
+                                                           MEM_WRITE_EXTANY;
+
+        mem_set_mem_state_both(base, 0x00010000, read | write);
+
+        do_shadow++;
+    }
+
+    if ((dev->regs[0x31] ^ dev->shadow[0x03]) & 0xc0) {
+        uint32_t base = 0x000f0000;
+        uint32_t read  = ((dev->regs[0x31] >> 6) & 0x02) ? MEM_READ_INTERNAL :
+                                                           MEM_READ_EXTANY;
+        uint32_t write = ((dev->regs[0x31] >> 6) & 0x01) ? MEM_WRITE_INTERNAL :
+                                                           MEM_WRITE_EXTANY;
+
+        shadowbios = !!((dev->regs[0x31] >> 6) & 0x02);
+        shadowbios_write = !!((dev->regs[0x31] >> 6) & 0x01);
+
+        mem_set_mem_state_both(base, 0x00010000, read | write);
+
+        do_shadow++;
+    }
+
+    if (do_shadow) {
+        memcpy(dev->shadow, &(dev->regs[0x2e]), 4 * sizeof(uint8_t));
+        flushmmucache_nopc();
+    }
+}
+
+static void
+sl82c461_write(uint16_t addr, uint8_t val, void *priv)
+{
+    sl82c461_t *dev = (sl82c461_t *) priv;
+
+    sl82c461_log("[%04X:%08X] [W] %04X = %02X\n", CS, cpu_state.pc, addr, val);
+
+    if (addr & 0x0001) {
+        dev->regs[dev->index] = val;
+
+        switch (dev->index) {
+            case 0x01:
+                /* NOTE: This is to be verified. */
+                mem_a20_alt = val & 1;
+                mem_a20_recalc();
+                break;
+            case 0x02: {
+                double bus_clk;
+                switch (val & 0x1c) {
+                    case 0x00:
+                         bus_clk = cpu_busspeed / 3.0;
+                         break;
+                    case 0x04:
+                         bus_clk = cpu_busspeed / 4.0;
+                         break;
+                    case 0x08:
+                         bus_clk = cpu_busspeed / 5.0;
+                         break;
+                    default:
+                    case 0x0c:
+                         bus_clk = 7159091.0;
+                         break;
+                    case 0x10:
+                         bus_clk = cpu_busspeed / 6.0;
+                         break;
+                    case 0x18:
+                         bus_clk = cpu_busspeed / 2.5;
+                         break;
+                    case 0x1c:
+                         bus_clk = cpu_busspeed / 2.0;
+                         break;
+                }
+                cpu_set_isa_speed((int) round(bus_clk));
+                break;
+            } case 0x2d:
+                switch (val & 0xc0) {
+                    case 0xc0:
+                        mem_remap_top(384);
+                        break;
+                    case 0x80:
+                        mem_remap_top(256);
+                        break;
+                    default:
+                    case 0x00:
+                        mem_remap_top(0);
+                        break;
+                }
+                break;
+            case 0x2e ... 0x31:
+                sl82c461_recalcmapping(dev);
+                break;
+            case 0x33:
+                switch (val & 0x09) {
+                    default:
+                    case 0x00:
+                        cpu_waitstates = 0;
+                        break;
+                    case 0x08:
+                        cpu_waitstates = 1;
+                        break;
+                    case 0x09:
+                        cpu_waitstates = 2;
+                        break;
+                }
+                cpu_update_waitstates();
+                break;
+            case 0x40:
+                cpu_cache_ext_enabled = !(val & 0x08);
+                cpu_update_waitstates();
+                break;
+        }
+    } else
+        dev->index = val;
+}
+
+static uint8_t
+sl82c461_read(uint16_t addr, void *priv)
+{
+    sl82c461_t *dev = (sl82c461_t *) priv;
+    uint8_t     ret = 0x00;
+
+    if (addr & 0x0001)
+        if (dev->index == 0x00)
+            ret = dev->regs[dev->index] | 0x40;
+        else
+            ret = dev->regs[dev->index];
+    else
+        ret = dev->index;
+
+    sl82c461_log("[%04X:%08X] [R] %04X = %02X\n", CS, cpu_state.pc, addr, ret);
+
+    return ret;
+}
+
+static void
+sl82c461_close(void *priv)
+{
+    sl82c461_t *dev = (sl82c461_t *) priv;
+
+    free(dev);
+}
+
+static void *
+sl82c461_init(const device_t *info)
+{
+    sl82c461_t *dev = (sl82c461_t *) calloc(1, sizeof(sl82c461_t));
+
+    dev->regs[0x00] = 0x40;
+
+    dev->regs[0x02] = 0x0c;
+    dev->regs[0x40] = 0x08;
+
+    memset(dev->shadow, 0xff, 4 * sizeof(uint8_t));
+
+    mem_a20_alt = 0x00;
+    mem_a20_recalc();
+
+    cpu_set_isa_speed(7159091.0);
+
+    sl82c461_recalcmapping(dev);
+
+    cpu_waitstates = 0;
+    cpu_cache_ext_enabled = 0;
+
+    cpu_update_waitstates();
+
+    io_sethandler(0x00a8, 2,
+                  sl82c461_read, NULL, NULL,
+                  sl82c461_write, NULL, NULL, dev);
+
+    return dev;
+}
+
+const device_t sl82c461_device = {
+    .name          = "Symphony SL82C461 (Haydn II)",
+    .internal_name = "sis_85c471",
+    .flags         = 0,
+    .local         = 0,
+    .init          = sl82c461_init,
+    .close         = sl82c461_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/stpc.c b/src/chipset/stpc.c
index dbe39ec5c..f3075323a 100644
--- a/src/chipset/stpc.c
+++ b/src/chipset/stpc.c
@@ -80,10 +80,12 @@ typedef struct stpc_serial_t {
 } stpc_serial_t;
 
 typedef struct stpc_lpt_t {
-    uint8_t unlocked;
-    uint8_t offset;
-    uint8_t reg1;
-    uint8_t reg4;
+    uint8_t  unlocked;
+    uint8_t  offset;
+    uint8_t  reg1;
+    uint8_t  reg4;
+
+    lpt_t   *lpt;
 } stpc_lpt_t;
 
 #ifdef ENABLE_STPC_LOG
@@ -912,8 +914,7 @@ stpc_init(const device_t *info)
 {
     stpc_log("STPC: init()\n");
 
-    stpc_t *dev = (stpc_t *) malloc(sizeof(stpc_t));
-    memset(dev, 0, sizeof(stpc_t));
+    stpc_t *dev = (stpc_t *) calloc(1, sizeof(stpc_t));
 
     dev->local = info->local;
 
@@ -963,8 +964,7 @@ stpc_serial_init(UNUSED(const device_t *info))
 {
     stpc_log("STPC: serial_init()\n");
 
-    stpc_serial_t *dev = (stpc_serial_t *) malloc(sizeof(stpc_serial_t));
-    memset(dev, 0, sizeof(stpc_serial_t));
+    stpc_serial_t *dev = (stpc_serial_t *) calloc(1, sizeof(stpc_serial_t));
 
     dev->uart[0] = device_add_inst(&ns16550_device, 1);
     dev->uart[1] = device_add_inst(&ns16550_device, 2);
@@ -977,39 +977,24 @@ stpc_serial_init(UNUSED(const device_t *info))
 static void
 stpc_lpt_handlers(stpc_lpt_t *dev, uint8_t val)
 {
-    uint8_t old_addr = (dev->reg1 & 0x03);
-    uint8_t new_addr = (val & 0x03);
+    const uint8_t new_addr = (val & 0x03);
 
-    switch (old_addr) {
-        case 0x1:
-            lpt3_remove();
-            break;
-
-        case 0x2:
-            lpt1_remove();
-            break;
-
-        case 0x3:
-            lpt2_remove();
-            break;
-        default:
-            break;
-    }
+    lpt_port_remove(dev->lpt);
 
     switch (new_addr) {
         case 0x1:
             stpc_log("STPC: Remapping parallel port to LPT3\n");
-            lpt3_init(0x3bc);
+            lpt_port_setup(dev->lpt, LPT_MDA_ADDR);
             break;
 
         case 0x2:
             stpc_log("STPC: Remapping parallel port to LPT1\n");
-            lpt1_init(0x378);
+            lpt_port_setup(dev->lpt, LPT1_ADDR);
             break;
 
         case 0x3:
             stpc_log("STPC: Remapping parallel port to LPT2\n");
-            lpt2_init(0x278);
+            lpt_port_setup(dev->lpt, LPT2_ADDR);
             break;
 
         default:
@@ -1017,9 +1002,11 @@ stpc_lpt_handlers(stpc_lpt_t *dev, uint8_t val)
             break;
     }
 
-    dev->reg1 = (val & 0x08);
-    dev->reg1 |= new_addr;
-    dev->reg1 |= 0x84; /* reserved bits that default to 1; hardwired? */
+    if (dev != NULL) {
+        dev->reg1 = (val & 0x08);
+        dev->reg1 |= new_addr;
+        dev->reg1 |= 0x84; /* reserved bits that default to 1; hardwired? */
+    }
 }
 
 static void
@@ -1076,8 +1063,9 @@ stpc_lpt_init(UNUSED(const device_t *info))
 {
     stpc_log("STPC: lpt_init()\n");
 
-    stpc_lpt_t *dev = (stpc_lpt_t *) malloc(sizeof(stpc_lpt_t));
-    memset(dev, 0, sizeof(stpc_lpt_t));
+    stpc_lpt_t *dev = (stpc_lpt_t *) calloc(1, sizeof(stpc_lpt_t));
+
+    dev->lpt = device_add_inst(&lpt_port_device, 1);
 
     stpc_lpt_reset(dev);
 
@@ -1096,7 +1084,7 @@ const device_t stpc_client_device = {
     .init          = stpc_init,
     .close         = stpc_close,
     .reset         = stpc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1110,7 +1098,7 @@ const device_t stpc_consumer2_device = {
     .init          = stpc_init,
     .close         = stpc_close,
     .reset         = stpc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1124,7 +1112,7 @@ const device_t stpc_elite_device = {
     .init          = stpc_init,
     .close         = stpc_close,
     .reset         = stpc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1138,7 +1126,7 @@ const device_t stpc_atlas_device = {
     .init          = stpc_init,
     .close         = stpc_close,
     .reset         = stpc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1153,7 +1141,7 @@ const device_t stpc_serial_device = {
     .init          = stpc_serial_init,
     .close         = stpc_serial_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1167,7 +1155,7 @@ const device_t stpc_lpt_device = {
     .init          = stpc_lpt_init,
     .close         = stpc_lpt_close,
     .reset         = stpc_lpt_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/umc_8886.c b/src/chipset/umc_8886.c
index f6a923346..29e2d46da 100644
--- a/src/chipset/umc_8886.c
+++ b/src/chipset/umc_8886.c
@@ -79,17 +79,16 @@
 #include <86box/timer.h>
 #include <86box/io.h>
 #include <86box/device.h>
-
 #include <86box/hdd.h>
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
+#include <86box/keyboard.h>
+#include <86box/machine.h>
 #include <86box/pic.h>
 #include <86box/pci.h>
-
+#include <86box/port_92.h>
 #include <86box/chipset.h>
 
-#define IDE_BIT 0x01
-
 #ifdef ENABLE_UMC_8886_LOG
 int umc_8886_do_log = ENABLE_UMC_8886_LOG;
 
@@ -108,18 +107,6 @@ umc_8886_log(const char *fmt, ...)
 #    define umc_8886_log(fmt, ...)
 #endif
 
-/* PCI IRQ Flags */
-#define INTA       (PCI_INTA + (2 * !(addr & 1)))
-#define INTB       (PCI_INTB + (2 * !(addr & 1)))
-#define IRQRECALCA (((val & 0xf0) != 0) ? ((val & 0xf0) >> 4) : PCI_IRQ_DISABLED)
-#define IRQRECALCB (((val & 0x0f) != 0) ? (val & 0x0f) : PCI_IRQ_DISABLED)
-
-/* Disable Internal IDE Flag needed for the AF or BF Southbridge variant */
-#define HAS_IDE dev->has_ide
-
-/* Southbridge Revision */
-#define SB_ID dev->sb_id
-
 typedef struct umc_8886_t {
     uint8_t  max_func;            /* Last function number */
     uint8_t  pci_slot;
@@ -128,22 +115,79 @@ typedef struct umc_8886_t {
 
     uint8_t  pci_conf_sb[2][256]; /* PCI Registers */
 
-    uint16_t sb_id;              /* Southbridge Revision */
-    int      has_ide;            /* Check if Southbridge Revision is AF or F */
+    uint16_t sb_id;               /* Southbridge Revision */
+    uint16_t ide_id;              /* IDE Revision */
+
+    int      has_ide;             /* Check if Southbridge Revision is F, AF, or BF */
 } umc_8886_t;
 
 static void
-umc_8886_ide_handler(int status)
+umc_8886_ide_handler(umc_8886_t *dev)
 {
     ide_pri_disable();
     ide_sec_disable();
 
-    if (status) {
-        ide_pri_enable();
-        ide_sec_enable();
+    if (dev->pci_conf_sb[1][0x04] & 0x01) {
+        if (dev->pci_conf_sb[1][0x41] & 0x80)
+            ide_pri_enable();
+
+        if (dev->pci_conf_sb[1][0x41] & 0x40)
+            ide_sec_enable();
     }
 }
 
+static void
+umc_8886_bus_recalc(umc_8886_t *dev)
+{
+    switch (dev->pci_conf_sb[0x00][0xa4] & 0x03) {
+        case 0x00:
+            cpu_set_pci_speed(cpu_busspeed / 2);
+            break;
+        case 0x01:
+            cpu_set_pci_speed(cpu_busspeed);
+            break;
+        case 0x02:
+            cpu_set_pci_speed((cpu_busspeed * 2) / 3);
+            break;
+    }
+
+    switch (dev->pci_conf_sb[0x00][0x56] & 0x03) {
+        default:
+            break;
+        case 0x00:
+            cpu_set_isa_pci_div(3);
+            break;
+        case 0x01:
+            cpu_set_isa_pci_div(4);
+            break;
+        case 0x02:
+            cpu_set_isa_pci_div(2);
+            break;
+    }
+}
+
+static void
+umc_8886_irq_recalc(umc_8886_t *dev)
+{
+    int irq_routing;
+    uint8_t *conf = dev->pci_conf_sb[0];
+
+    irq_routing = (conf[0x46] & 0x01) ? (conf[0x43] >> 4) : PCI_IRQ_DISABLED;
+    pci_set_irq_routing(PCI_INTA, irq_routing);
+    irq_routing = (conf[0x46] & 0x02) ? (conf[0x43] & 0x0f) : PCI_IRQ_DISABLED;
+    pci_set_irq_routing(PCI_INTB, irq_routing);
+
+    irq_routing = (conf[0x46] & 0x04) ? (conf[0x44] >> 4) : PCI_IRQ_DISABLED;
+    pci_set_irq_routing(PCI_INTC, irq_routing);
+    irq_routing = (conf[0x46] & 0x08) ? (conf[0x44] & 0x0f) : PCI_IRQ_DISABLED;
+    pci_set_irq_routing(PCI_INTD, irq_routing);
+
+    pci_set_irq_level(PCI_INTA, (conf[0x47] & 0x01));
+    pci_set_irq_level(PCI_INTB, (conf[0x47] & 0x02));
+    pci_set_irq_level(PCI_INTC, (conf[0x47] & 0x04));
+    pci_set_irq_level(PCI_INTD, (conf[0x47] & 0x08));
+}
+
 static void
 umc_8886_write(int func, int addr, uint8_t val, void *priv)
 {
@@ -155,8 +199,17 @@ umc_8886_write(int func, int addr, uint8_t val, void *priv)
                 umc_8886_log("UM8886: dev->regs[%02x] = %02x POST %02x\n", addr, val, inb(0x80));
 
                 switch (addr) {
-                    case 0x04:
-                    case 0x05:
+                    case 0x04 ... 0x05:
+                    case 0x0c ... 0x0d:
+                    case 0x40 ... 0x42:
+                    case 0x45:
+                    case 0x50 ... 0x55:
+                    case 0x57:
+                    case 0x70 ... 0x76:
+                    case 0x80 ... 0x83:
+                    case 0x90 ... 0x92:
+                    case 0xa0 ... 0xa1:
+                    case 0xa5 ... 0xa8:
                         dev->pci_conf_sb[func][addr] = val;
                         break;
 
@@ -164,72 +217,18 @@ umc_8886_write(int func, int addr, uint8_t val, void *priv)
                         dev->pci_conf_sb[func][addr] &= ~(val & 0xf9);
                         break;
 
-                    case 0x0c:
-                    case 0x0d:
-                        dev->pci_conf_sb[func][addr] = val;
-                        break;
-
-                    case 0x40:
-                    case 0x41:
-                    case 0x42:
-                        dev->pci_conf_sb[func][addr] = val;
-                        break;
-
                     case 0x43:
                     case 0x44:
-                        dev->pci_conf_sb[func][addr] = val;
-                        pci_set_irq_routing(INTA, IRQRECALCA);
-                        pci_set_irq_routing(INTB, IRQRECALCB);
-                        break;
-
-                    case 0x45:
-                        dev->pci_conf_sb[func][addr] = val;
-                        break;
-
-                    case 0x46:
+                    case 0x46:    /* Bits 3-0 = 0 = IRQ disabled, 1 = IRQ enabled. */
+                    case 0x47:    /* Bits 3-0 = 0 = IRQ edge-triggered, 1 = IRQ level-triggered. */
                         /* Bit 6 seems to be the IRQ/SMI# toggle, 1 = IRQ, 0 = SMI#. */
                         dev->pci_conf_sb[func][addr] = val;
-                        break;
-
-                    case 0x47:
-                        dev->pci_conf_sb[func][addr] = val;
-                        break;
-
-                    case 0x50:
-                    case 0x51:
-                    case 0x52:
-                    case 0x53:
-                    case 0x54:
-                    case 0x55:
-                        dev->pci_conf_sb[func][addr] = val;
+                        umc_8886_irq_recalc(dev);
                         break;
 
                     case 0x56:
                         dev->pci_conf_sb[func][addr] = val;
-
-                        switch (val & 3) {
-                            case 0:
-                                cpu_set_isa_pci_div(3);
-                                break;
-                            case 1:
-                                cpu_set_isa_pci_div(4);
-                                break;
-                            case 2:
-                                cpu_set_isa_pci_div(2);
-                                break;
-                            default:
-                                break;
-                        }
-
-                        break;
-
-                    case 0x57:
-                    case 0x70 ... 0x76:
-                    case 0x80:
-                    case 0x81:
-                    case 0x90 ... 0x92:
-                    case 0xa0 ... 0xa1:
-                        dev->pci_conf_sb[func][addr] = val;
+                        umc_8886_bus_recalc(dev);
                         break;
 
                     case 0xa2:
@@ -243,7 +242,6 @@ umc_8886_write(int func, int addr, uint8_t val, void *priv)
                                 picint(1 << ((dev->pci_conf_sb[0][0x46] & 0x80) ? 15 : 10));
                             else
                                 smi_raise();
-                            dev->pci_conf_sb[0][0xa3] |= 0x04;
                         }
 
                         dev->pci_conf_sb[func][addr] = val;
@@ -251,11 +249,7 @@ umc_8886_write(int func, int addr, uint8_t val, void *priv)
 
                     case 0xa4:
                         dev->pci_conf_sb[func][addr] = val;
-                        cpu_set_pci_speed(cpu_busspeed / ((val & 1) ? 1 : 2));
-                        break;
-
-                    case 0xa5 ... 0xa8:
-                        dev->pci_conf_sb[func][addr] = val;
+                        umc_8886_bus_recalc(dev);
                         break;
 
                     default:
@@ -269,7 +263,8 @@ umc_8886_write(int func, int addr, uint8_t val, void *priv)
                 switch (addr) {
                     case 0x04:
                         dev->pci_conf_sb[func][addr] = val;
-                        umc_8886_ide_handler(val & 1);
+                        if (dev->ide_id == 0x673a)
+                            umc_8886_ide_handler(dev);
                         break;
 
                     case 0x07:
@@ -278,8 +273,16 @@ umc_8886_write(int func, int addr, uint8_t val, void *priv)
 
                     case 0x3c:
                     case 0x40:
+                    case 0x42 ... 0x59:
+                        if (dev->ide_id == 0x673a)
+                            dev->pci_conf_sb[func][addr] = val;
+                        break;
+
                     case 0x41:
-                        dev->pci_conf_sb[func][addr] = val;
+                        if (dev->ide_id == 0x673a) {
+                            dev->pci_conf_sb[func][addr] = val;
+                            umc_8886_ide_handler(dev);
+                        }
                         break;
 
                     default:
@@ -311,54 +314,73 @@ umc_8886_reset(void *priv)
     memset(dev->pci_conf_sb[0], 0x00, sizeof(dev->pci_conf_sb[0]));
     memset(dev->pci_conf_sb[1], 0x00, sizeof(dev->pci_conf_sb[1]));
 
-    dev->pci_conf_sb[0][0] = 0x60; /* UMC */
-    dev->pci_conf_sb[0][1] = 0x10;
-
-    dev->pci_conf_sb[0][2] = (SB_ID & 0xff); /* 8886xx */
-    dev->pci_conf_sb[0][3] = ((SB_ID >> 8) & 0xff);
-
-    dev->pci_conf_sb[0][4] = 0x0f;
-    dev->pci_conf_sb[0][7] = 2;
-
-    dev->pci_conf_sb[0][8] = 0x0e;
-
+    dev->pci_conf_sb[0][0x00] = 0x60; /* UMC */
+    dev->pci_conf_sb[0][0x01] = 0x10;
+    dev->pci_conf_sb[0][0x02] = (dev->sb_id & 0xff); /* 8886xx */
+    dev->pci_conf_sb[0][0x03] = ((dev->sb_id >> 8) & 0xff);
+    dev->pci_conf_sb[0][0x04] = 0x0f;
+    dev->pci_conf_sb[0][0x07] = 0x02;
+    dev->pci_conf_sb[0][0x08] = 0x0e;
     dev->pci_conf_sb[0][0x09] = 0x00;
     dev->pci_conf_sb[0][0x0a] = 0x01;
     dev->pci_conf_sb[0][0x0b] = 0x06;
 
-    dev->pci_conf_sb[0][0x40] = 1;
-    dev->pci_conf_sb[0][0x41] = 6;
-    dev->pci_conf_sb[0][0x42] = 8;
+    dev->pci_conf_sb[0][0x40] = 0x01;
+    dev->pci_conf_sb[0][0x41] = 0x04;
+    dev->pci_conf_sb[0][0x42] = 0x08;
     dev->pci_conf_sb[0][0x43] = 0x9a;
     dev->pci_conf_sb[0][0x44] = 0xbc;
-    dev->pci_conf_sb[0][0x45] = 4;
-    dev->pci_conf_sb[0][0x47] = 0x40;
-    dev->pci_conf_sb[0][0x50] = 1;
-    dev->pci_conf_sb[0][0x51] = 3;
-    dev->pci_conf_sb[0][0xa8] = 0x20;
+    dev->pci_conf_sb[0][0x45] = 0x00;
+    dev->pci_conf_sb[0][0x46] = 0x10;
+    dev->pci_conf_sb[0][0x47] = 0x30;
 
-    if (HAS_IDE) {
-        dev->pci_conf_sb[1][0] = 0x60; /* UMC */
-        dev->pci_conf_sb[1][1] = 0x10;
+    dev->pci_conf_sb[0][0x51] = 0x02;
 
-        dev->pci_conf_sb[1][2] = 0x3a; /* 8886BF IDE */
-        dev->pci_conf_sb[1][3] = 0x67;
+    if (dev->has_ide) {
+        dev->pci_conf_sb[1][0x00] = 0x60; /* UMC */
+        dev->pci_conf_sb[1][0x01] = 0x10;
+        dev->pci_conf_sb[1][0x02] = (dev->ide_id & 0xff); /* 8886xx IDE */
+        dev->pci_conf_sb[1][0x03] = ((dev->ide_id >> 8) & 0xff);
+        dev->pci_conf_sb[1][0x04] = 0x05; /* Start with Internal IDE Enabled */
+        dev->pci_conf_sb[1][0x08] = 0x10;
+        dev->pci_conf_sb[1][0x09] = 0x8f;
+        dev->pci_conf_sb[1][0x0a] = dev->pci_conf_sb[1][0x0b] = 0x01;
+        dev->pci_conf_sb[1][0x10] = 0xf1;
+        dev->pci_conf_sb[1][0x11] = 0x01;
+        dev->pci_conf_sb[1][0x14] = 0xf5;
+        dev->pci_conf_sb[1][0x15] = 0x03;
+        dev->pci_conf_sb[1][0x18] = 0x71;
+        dev->pci_conf_sb[1][0x19] = 0x01;
+        dev->pci_conf_sb[1][0x1c] = 0x75;
+        dev->pci_conf_sb[1][0x1d] = 0x03;
+        dev->pci_conf_sb[1][0x20] = 0x01;
+        dev->pci_conf_sb[1][0x21] = 0x10;
 
-        dev->pci_conf_sb[1][4] = 1; /* Start with Internal IDE Enabled */
+        if (dev->ide_id == 0x673a) {
+            dev->pci_conf_sb[1][0x40] = 0x00;
+            dev->pci_conf_sb[1][0x41] = 0xc0;
+            dev->pci_conf_sb[1][0x42] = dev->pci_conf_sb[1][0x43] = 0x00;
+            dev->pci_conf_sb[1][0x44] = dev->pci_conf_sb[1][0x45] = 0x00;
+            dev->pci_conf_sb[1][0x46] = dev->pci_conf_sb[1][0x47] = 0x00;
+            dev->pci_conf_sb[1][0x48] = dev->pci_conf_sb[1][0x49] = 0x55;
+            dev->pci_conf_sb[1][0x4a] = dev->pci_conf_sb[1][0x4b] = 0x55;
+            dev->pci_conf_sb[1][0x4c] = dev->pci_conf_sb[1][0x4d] = 0x88;
+            dev->pci_conf_sb[1][0x4e] = dev->pci_conf_sb[1][0x4f] = 0xaa;
+            dev->pci_conf_sb[1][0x54] = dev->pci_conf_sb[1][0x55] = 0x00;
+            dev->pci_conf_sb[1][0x56] = dev->pci_conf_sb[1][0x57] = 0x00;
+            dev->pci_conf_sb[1][0x58] = dev->pci_conf_sb[1][0x59] = 0x00;
 
-        dev->pci_conf_sb[1][8] = 0x10;
+            umc_8886_ide_handler(dev);
 
-        dev->pci_conf_sb[1][0x09] = 0x0f;
-        dev->pci_conf_sb[1][0x0a] = dev->pci_conf_sb[1][0x0b] = 1;
-
-        umc_8886_ide_handler(1);
+            picintc(1 << 14);
+            picintc(1 << 15);
+        }
     }
 
     for (uint8_t i = 1; i < 5; i++) /* Disable all IRQ interrupts */
         pci_set_irq_routing(i, PCI_IRQ_DISABLED);
 
-    cpu_set_isa_pci_div(3);
-    cpu_set_pci_speed(cpu_busspeed / 2);
+    umc_8886_bus_recalc(dev);
 }
 
 static void
@@ -372,20 +394,33 @@ umc_8886_close(void *priv)
 static void *
 umc_8886_init(const device_t *info)
 {
-    umc_8886_t *dev = (umc_8886_t *) malloc(sizeof(umc_8886_t));
-    memset(dev, 0, sizeof(umc_8886_t));
+    umc_8886_t *dev = (umc_8886_t *) calloc(1, sizeof(umc_8886_t));
 
-    dev->has_ide = !!(info->local == 0x886a);
-    pci_add_card(PCI_ADD_SOUTHBRIDGE, umc_8886_read, umc_8886_write, dev, &dev->pci_slot); /* Device 12: UMC 8886xx */
-
-    /* Add IDE if UM8886AF variant */
-    if (HAS_IDE)
-        device_add(&ide_pci_2ch_device);
-
-    dev->max_func = (HAS_IDE) ? 1 : 0;
+    /* Device 12: UMC 8886xx */
+    pci_add_card(PCI_ADD_SOUTHBRIDGE, umc_8886_read, umc_8886_write, dev, &dev->pci_slot);
 
     /* Get the Southbridge Revision */
-    SB_ID = info->local;
+    dev->sb_id = info->local & 0xffff;
+
+    /* IDE Revision */
+    dev->ide_id = info->local >> 16;
+
+    dev->has_ide = (dev->ide_id != 0x0000);
+
+    dev->max_func = 0;
+
+    /* Add IDE if this is the UM8886AF or UM8886BF. */
+    if (dev->ide_id == 0x673a) {
+        /* UM8886BF */
+        device_add(&ide_pci_2ch_device);
+        dev->max_func = 1;
+    } else if (dev->ide_id == 0x1001) {
+        /* UM8886AF */
+        device_add(&ide_um8673f_device);
+    }
+
+    if (machine_get_kbc_device(machine) == NULL)
+        device_add_params(&kbc_at_device, (void *) KBC_VEN_UMC);
 
     umc_8886_reset(dev);
 
@@ -396,25 +431,39 @@ const device_t umc_8886f_device = {
     .name          = "UMC 8886F",
     .internal_name = "umc_8886f",
     .flags         = DEVICE_PCI,
-    .local         = 0x8886,
+    .local         = 0x00008886,
     .init          = umc_8886_init,
     .close         = umc_8886_close,
     .reset         = umc_8886_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
 };
 
 const device_t umc_8886af_device = {
-    .name          = "UMC 8886AF/8886BF",
+    .name          = "UMC 8886AF",
     .internal_name = "umc_8886af",
     .flags         = DEVICE_PCI,
-    .local         = 0x886a,
+    .local         = 0x1001886a,
     .init          = umc_8886_init,
     .close         = umc_8886_close,
     .reset         = umc_8886_reset,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t umc_8886bf_device = {
+    .name          = "UMC 8886BF",
+    .internal_name = "umc_8886bf",
+    .flags         = DEVICE_PCI,
+    .local         = 0x673a888a,
+    .init          = umc_8886_init,
+    .close         = umc_8886_close,
+    .reset         = umc_8886_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/umc_8890.c b/src/chipset/umc_8890.c
new file mode 100644
index 000000000..cb69ce6a8
--- /dev/null
+++ b/src/chipset/umc_8890.c
@@ -0,0 +1,242 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Implementation of the UMC 8890 Chipset.
+ *
+ *		Note: This chipset has no datasheet, everything were done via
+ *		reverse engineering the BIOS of various machines using it.
+ *
+ * Authors: Tiseno100,
+ *          Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2021 Tiseno100.
+ *          Copyright 2021-2024 Miran Grca.
+ */
+
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+
+#include <86box/apm.h>
+#include <86box/mem.h>
+#include <86box/pci.h>
+#include <86box/port_92.h>
+#include <86box/smram.h>
+
+#include <86box/chipset.h>
+#include <86box/plat_unused.h>
+
+#ifdef ENABLE_UMC_8890_LOG
+int umc_8890_do_log = ENABLE_UMC_8890_LOG;
+
+static void
+umc_8890_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (umc_8890_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define umc_8890_log(fmt, ...)
+#endif
+
+typedef struct umc_8890_t {
+    uint8_t  pci_slot;
+
+    uint8_t  pci_conf[256]; /* PCI Registers */
+
+    int      mem_state[2];
+
+    uint32_t smram_base;
+
+    smram_t *smram;         /* SMRAM Handler */
+} umc_8890_t;
+
+static void
+um8890_shadow(umc_8890_t *dev)
+{
+    uint8_t flag;
+    uint16_t state;
+
+    flag = (dev->pci_conf[0x5f] & 0x0c) >> 2;
+    state = (flag & 1) ? (MEM_READ_INTERNAL | ((flag & 2) ? MEM_WRITE_DISABLED : MEM_WRITE_INTERNAL)) :
+            (MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+
+    if ((dev->mem_state[1] ^ dev->pci_conf[0x5f]) & 0x0c) {
+        mem_set_mem_state_both(0xe0000, 0x10000, state);
+        dev->mem_state[1] = (dev->mem_state[1] & 0xf0) | (dev->pci_conf[0x5f] & 0x0f);
+    }
+
+    flag = (dev->pci_conf[0x5f] & 0xc0) >> 6;
+    state = (flag & 1) ? (MEM_READ_INTERNAL | ((flag & 2) ? MEM_WRITE_DISABLED : MEM_WRITE_INTERNAL)) :
+            (MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+
+    if ((dev->mem_state[1] ^ dev->pci_conf[0x5f]) & 0xc0) {
+        mem_set_mem_state_both(0xf0000, 0x10000, state);
+        dev->mem_state[1] = (dev->mem_state[1] & 0x0f) | (dev->pci_conf[0x5f] & 0xf0);
+    }
+
+    for (uint8_t i = 0; i < 8; i++) {
+        state = (dev->pci_conf[0x5d] & (1 << i)) ? (MEM_READ_INTERNAL | MEM_WRITE_INTERNAL) :
+                (MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+
+        if ((dev->mem_state[0] ^ dev->pci_conf[0x5d]) & (1 << i)) {
+            mem_set_mem_state_both(0xc0000 + (i << 14), 0x4000, state);
+            dev->mem_state[0] = (dev->mem_state[0] & ~(1 << i)) | (dev->pci_conf[0x5d] & (1 << i));
+        }
+    }
+
+    flushmmucache_nopc();
+}
+
+
+static void
+um8890_smram(umc_8890_t *dev)
+{
+    smram_disable_all();
+
+    /* Bit 4, if set, enables SMRAM access outside SMM. SMRAM appears to be always enabled
+       in SMM, and is always set to A0000-BFFFF. */
+    smram_enable(dev->smram, 0x000a0000, 0x000a0000, 0x20000, dev->pci_conf[0x65] & 0x10, 1);
+}
+
+static void
+um8890_write(int func, int addr, uint8_t val, void *priv)
+{
+    umc_8890_t *dev = (umc_8890_t *)priv;
+
+    if (func == 0)  switch (addr) {
+        case 0x04 ... 0x05:
+        case 0x0c ... 0x0d:
+        case 0x40 ... 0x5b:
+        case 0x60 ... 0x63:
+        case 0x66 ... 0xff:
+            dev->pci_conf[addr] = val;
+            break;
+
+        case 0x07:
+            dev->pci_conf[addr] &= ~(val & 0xf9);
+            break;
+
+        case 0x5c ... 0x5f:
+            dev->pci_conf[addr] = val;
+            um8890_shadow(dev);
+            break;
+
+        /* Register 64h, 16-bit:
+               Bit     12: SMRAM enabled outside SMM (1 = yes, 0 = no);
+               Bit     10: ???? (set by Award BIOS);
+               Bits  7- 0: SMM handler offset to SMBASE, shifted to the right by 14.
+         */
+        case 0x64: case 0x65:
+            dev->pci_conf[addr] = val;
+            if (addr == 0x65)
+                um8890_smram(dev);
+            break;
+    }
+
+    umc_8890_log("UM8890: dev->regs[%02x] = %02x POST: %02x\n", addr, dev->pci_conf[addr], inb(0x80));
+}
+
+
+static uint8_t
+um8890_read(int func, int addr, void *priv)
+{
+    umc_8890_t *dev = (umc_8890_t *)priv;
+    uint8_t ret = 0xff;
+
+    if (func == 0)
+        ret = dev->pci_conf[addr];
+
+    return ret;
+}
+
+static void
+umc_8890_reset(void *priv)
+{
+    umc_8890_t *dev = (umc_8890_t *)priv;
+
+    memset(dev->pci_conf, 0x00, sizeof(dev->pci_conf));
+
+    /* Defaults */
+    dev->pci_conf[0x00] = 0x60; /* UMC */
+    dev->pci_conf[0x01] = 0x10;
+    dev->pci_conf[0x02] = 0x91; /* 8891F */
+    dev->pci_conf[0x03] = 0x88;
+    dev->pci_conf[0x07] = 0x02;
+    dev->pci_conf[0x08] = 0x01;
+    dev->pci_conf[0x09] = 0x00;
+    dev->pci_conf[0x0a] = 0x00;
+    dev->pci_conf[0x0b] = 0x06;
+    dev->pci_conf[0x5c] = 0x00;
+    dev->pci_conf[0x5d] = 0x00;
+    dev->pci_conf[0x5e] = 0x00;
+    dev->pci_conf[0x5f] = 0x00;
+    dev->pci_conf[0x64] = 0x00;
+    dev->pci_conf[0x65] = 0x00;
+
+    um8890_shadow(dev);
+
+    um8890_smram(dev);
+}
+
+
+static void
+umc_8890_close(void *priv)
+{
+    umc_8890_t *dev = (umc_8890_t *)priv;
+
+    smram_del(dev->smram);
+    free(dev);
+}
+
+
+static void *
+umc_8890_init(UNUSED(const device_t *info))
+{
+    umc_8890_t *dev = (umc_8890_t *) calloc(1, sizeof(umc_8890_t));
+
+    /* Device 0: UMC 8890 */
+    pci_add_card(PCI_ADD_NORTHBRIDGE, um8890_read, um8890_write, dev, &dev->pci_slot);
+
+    /* Port 92 */
+    device_add(&port_92_pci_device);
+
+    dev->smram = smram_add();
+
+    umc_8890_reset(dev);
+
+    return dev;
+}
+
+const device_t umc_8890_device = {
+    .name          = "UMC 8890(8891BF/8892BF)",
+    .internal_name = "umc_8890",
+    .flags         = DEVICE_PCI,
+    .local         = 0x886a,
+    .init          = umc_8890_init,
+    .close         = umc_8890_close,
+    .reset         = umc_8890_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/chipset/umc_hb4.c b/src/chipset/umc_hb4.c
index d5cce0fca..55901b32e 100644
--- a/src/chipset/umc_hb4.c
+++ b/src/chipset/umc_hb4.c
@@ -14,13 +14,11 @@
  * Note 2:  Additional information were also used from all
  *          around the web.
  *
- *
- *
  * Authors: Tiseno100,
  *          Miran Grca, <mgrca8@gmail.com>
  *
  *          Copyright 2021 Tiseno100.
- *          Copyright 2021 Miran Grca.
+ *          Copyright 2021-2024 Miran Grca.
  */
 
 /*
@@ -75,15 +73,24 @@
    Bit 3: CC000-CFFFF Read Enable
    Bit 2: C8000-CBFFF Read Enable
    Bit 1: C0000-C7FFF Read Enable
-   Bit 0: Enable C0000-DFFFF Shadow Segment Bits
+   Bit 0: E0000-EFFFF Read Enable
 
    Register 55:
-   Bit 7: E0000-FFFF Read Enable
+   Bit 7: F0000-FFFF Read Enable
    Bit 6: Shadow Write Status (1: Write Protect/0: Write)
 
    Register 56h & 57h: DRAM Bank 0 Configuration
    Register 58h & 59h: DRAM Bank 1 Configuration
 
+   Register 5A:
+   Bit 2: Detrubo
+
+   Register 5C:
+   Bits 7-0: SMRAM base A27-A20
+
+   Register 5D:
+   Bits 3-0: SMRAM base A31-A28
+
    Register 60:
    Bit 5: If set and SMRAM is enabled, data cycles go to PCI and code cycles go to DRAM
    Bit 0: SMRAM Local Access Enable - if set, SMRAM is also enabled outside SMM
@@ -129,14 +136,18 @@ hb4_log(const char *fmt, ...)
 #endif
 
 typedef struct hb4_t {
-    uint8_t  shadow;
-    uint8_t  shadow_read;
-    uint8_t  shadow_write;
+    uint8_t idx;
+    uint8_t access_data;
+
     uint8_t  pci_slot;
 
     uint8_t  pci_conf[256]; /* PCI Registers */
+
     int      mem_state[9];
-    smram_t *smram[3]; /* SMRAM Handlers */
+
+    uint32_t smram_base;
+
+    smram_t *smram;         /* SMRAM Handler */
 } hb4_t;
 
 static int shadow_bios[4]  = { (MEM_READ_EXTANY | MEM_WRITE_INTERNAL), (MEM_READ_EXTANY | MEM_WRITE_EXTANY),
@@ -167,7 +178,10 @@ hb4_shadow_bios_low(hb4_t *dev)
 {
     int state;
 
-    state = shadow_bios[(dev->pci_conf[0x55] >> 6) & (dev->shadow | 0x01)];
+    /* Erratum in Vogons' datasheet: Register 55h bit 7 in fact controls E0000-FFFFF. */
+    state  = (dev->pci_conf[0x55] & 0x80) ? shadow_read[dev->pci_conf[0x54] & 0x01] :
+                                            MEM_READ_EXTANY;
+    state |= shadow_write[(dev->pci_conf[0x55] >> 6) & 0x01];
 
     if (state != dev->mem_state[7]) {
         mem_set_mem_state_both(0xe0000, 0x10000, state);
@@ -185,7 +199,9 @@ hb4_shadow_main(hb4_t *dev)
     int n = 0;
 
     for (uint8_t i = 0; i < 6; i++) {
-        state = shadow_read[dev->shadow && ((dev->pci_conf[0x54] >> (i + 2)) & 0x01)] | shadow_write[(dev->pci_conf[0x55] >> 6) & 0x01];
+        state  = (dev->pci_conf[0x55] & 0x80) ? shadow_read[(dev->pci_conf[0x54] >> (i + 2)) & 0x01] :
+                                                MEM_READ_EXTANY;
+        state |= shadow_write[(dev->pci_conf[0x55] >> 6) & 0x01];
 
         if (state != dev->mem_state[i + 1]) {
             n++;
@@ -202,7 +218,9 @@ hb4_shadow_video(hb4_t *dev)
 {
     int state;
 
-    state = shadow_read[dev->shadow && ((dev->pci_conf[0x54] >> 1) & 0x01)] | shadow_write[(dev->pci_conf[0x55] >> 6) & 0x01];
+    state  = (dev->pci_conf[0x55] & 0x80) ? shadow_read[(dev->pci_conf[0x54] >> 1) & 0x01] :
+                                            MEM_READ_EXTANY;
+    state |= shadow_write[(dev->pci_conf[0x55] >> 6) & 0x01];
 
     if (state != dev->mem_state[0]) {
         mem_set_mem_state_both(0xc0000, 0x8000, state);
@@ -232,22 +250,28 @@ static void
 hb4_smram(hb4_t *dev)
 {
     smram_disable_all();
+    if (dev->smram_base != 0x00000000)
+        umc_smram_recalc(dev->smram_base >> 12, 0);
+
+    dev->smram_base = ((uint32_t) dev->pci_conf[0x5c]) << 20;
+    dev->smram_base |= ((uint32_t) (dev->pci_conf[0x5d] & 0x0f)) << 28;
+    dev->smram_base |= 0x000a0000;
 
     /* Bit 0, if set, enables SMRAM access outside SMM. SMRAM appears to be always enabled
        in SMM, and is always set to A0000-BFFFF. */
-    smram_enable(dev->smram[0], 0x000a0000, 0x000a0000, 0x20000, dev->pci_conf[0x60] & 0x01, 1);
-    /* There's a mirror of the SMRAM at 0E0A0000, mapped to A0000. */
-    smram_enable(dev->smram[1], 0x0e0a0000, 0x000a0000, 0x20000, dev->pci_conf[0x60] & 0x01, 1);
-    /* There's another mirror of the SMRAM at 4E0A0000, mapped to A0000. */
-    smram_enable(dev->smram[2], 0x4e0a0000, 0x000a0000, 0x20000, dev->pci_conf[0x60] & 0x01, 1);
+    smram_enable(dev->smram, dev->smram_base, 0x000a0000, 0x20000, dev->pci_conf[0x60] & 0x01, 1);
 
     /* Bit 5 seems to set data to go to PCI and code to DRAM. The Samsung SPC7700P-LW uses
        this. */
     if (dev->pci_conf[0x60] & 0x20) {
         if (dev->pci_conf[0x60] & 0x01)
-            mem_set_mem_state_smram_ex(0, 0x000a0000, 0x20000, 0x02);
-        mem_set_mem_state_smram_ex(1, 0x000a0000, 0x20000, 0x02);
+            mem_set_mem_state_smram_ex(0, dev->smram_base, 0x20000, 0x02);
+        mem_set_mem_state_smram_ex(1, dev->smram_base, 0x20000, 0x02);
     }
+
+    umc_smram_recalc(dev->smram_base >> 12, 1);
+
+    flushmmucache();
 }
 
 static void
@@ -278,32 +302,21 @@ hb4_write(UNUSED(int func), int addr, uint8_t val, void *priv)
             cpu_update_waitstates();
             break;
 
-        case 0x51:
-        case 0x52:
+        case 0x51 ... 0x53:
             dev->pci_conf[addr] = val;
             break;
 
-        case 0x53:
-            dev->pci_conf[addr] = val;
-            hb4_log("HB53: %02X\n", val);
-            break;
-
-        case 0x55:
-            dev->shadow_read    = (val & 0x80);
-            dev->shadow_write   = (val & 0x40);
-            dev->pci_conf[addr] = val;
-            hb4_shadow(dev);
-            break;
-        case 0x54:
-            dev->shadow         = (val & 0x01) << 1;
+        case 0x54 ... 0x55:
             dev->pci_conf[addr] = val;
             hb4_shadow(dev);
             break;
 
-        case 0x56 ... 0x5f:
+        case 0x56 ... 0x5a:
+        case 0x5e ... 0x5f:
             dev->pci_conf[addr] = val;
             break;
 
+        case 0x5c ... 0x5d:
         case 0x60:
             dev->pci_conf[addr] = val;
             hb4_smram(dev);
@@ -313,6 +326,10 @@ hb4_write(UNUSED(int func), int addr, uint8_t val, void *priv)
             dev->pci_conf[addr] = val;
             break;
 
+        case 0x62:
+            dev->pci_conf[addr] = val & 0x03;
+            break;
+
         default:
             break;
     }
@@ -336,30 +353,37 @@ hb4_reset(void *priv)
     hb4_t *dev = (hb4_t *) priv;
     memset(dev->pci_conf, 0x00, sizeof(dev->pci_conf));
 
-    dev->pci_conf[0] = 0x60; /* UMC */
-    dev->pci_conf[1] = 0x10;
-
-    dev->pci_conf[2] = 0x81; /* 8881x */
-    dev->pci_conf[3] = 0x88;
-
-    dev->pci_conf[7] = 2;
-
-    dev->pci_conf[8] = 4;
-
+    dev->pci_conf[0x00] = 0x60; /* UMC */
+    dev->pci_conf[0x01] = 0x10;
+    dev->pci_conf[0x02] = 0x81; /* 8881x */
+    dev->pci_conf[0x03] = 0x88;
+    dev->pci_conf[0x07] = 0x02;
+    dev->pci_conf[0x08] = 0x04;
     dev->pci_conf[0x09] = 0x00;
     dev->pci_conf[0x0a] = 0x00;
     dev->pci_conf[0x0b] = 0x06;
-
-    dev->pci_conf[0x51] = 1;
-    dev->pci_conf[0x52] = 1;
-    dev->pci_conf[0x5a] = 4;
-    dev->pci_conf[0x5c] = 0xc0;
-    dev->pci_conf[0x5d] = 0x20;
+    dev->pci_conf[0x50] = 0x00;
+    dev->pci_conf[0x51] = 0x00;
+    dev->pci_conf[0x52] = 0x01;
+    dev->pci_conf[0x53] = 0x00;
+    dev->pci_conf[0x54] = 0x00;
+    dev->pci_conf[0x55] = 0x40;
+    dev->pci_conf[0x56] = 0xff;
+    dev->pci_conf[0x57] = 0x0f;
+    dev->pci_conf[0x58] = 0xff;
+    dev->pci_conf[0x59] = 0x0f;
+    dev->pci_conf[0x5a] = 0x00;
+    dev->pci_conf[0x5b] = 0x2c;
+    dev->pci_conf[0x5c] = 0x00;
+    dev->pci_conf[0x5d] = 0x0f;
+    dev->pci_conf[0x5e] = 0x00;
     dev->pci_conf[0x5f] = 0xff;
+    dev->pci_conf[0x60] = 0x00;
+    dev->pci_conf[0x61] = 0x00;
+    dev->pci_conf[0x62] = 0x00;
 
-    hb4_write(0, 0x54, 0x00, dev);
-    hb4_write(0, 0x55, 0x00, dev);
-    hb4_write(0, 0x60, 0x80, dev);
+    hb4_shadow(dev);
+    hb4_smram(dev);
 
     cpu_cache_ext_enabled = 0;
     cpu_update_waitstates();
@@ -372,14 +396,14 @@ hb4_close(void *priv)
 {
     hb4_t *dev = (hb4_t *) priv;
 
+    smram_del(dev->smram);
     free(dev);
 }
 
 static void *
 hb4_init(UNUSED(const device_t *info))
 {
-    hb4_t *dev = (hb4_t *) malloc(sizeof(hb4_t));
-    memset(dev, 0, sizeof(hb4_t));
+    hb4_t *dev = (hb4_t *) calloc(1, sizeof(hb4_t));
 
     pci_add_card(PCI_ADD_NORTHBRIDGE, hb4_read, hb4_write, dev, &dev->pci_slot); /* Device 10: UMC 8881x */
 
@@ -387,10 +411,9 @@ hb4_init(UNUSED(const device_t *info))
     device_add(&port_92_pci_device);
 
     /* SMRAM */
-    dev->smram[0] = smram_add();
-    dev->smram[1] = smram_add();
-    dev->smram[2] = smram_add();
+    dev->smram = smram_add();
 
+    dev->smram_base = 0x000a0000;
     hb4_reset(dev);
 
     return dev;
@@ -404,7 +427,7 @@ const device_t umc_hb4_device = {
     .init          = hb4_init,
     .close         = hb4_close,
     .reset         = hb4_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/via_apollo.c b/src/chipset/via_apollo.c
index 7c1203c3a..110b1f8e1 100644
--- a/src/chipset/via_apollo.c
+++ b/src/chipset/via_apollo.c
@@ -444,7 +444,7 @@ via_apollo_host_bridge_write(int func, int addr, uint8_t val, void *priv)
                         apollo_smram_map(dev, 0, 0x000a0000, 0x00020000, 0);
                         break;
                 }
-            else
+            else if (dev->id == VIA_595)
                 switch (val & 0x03) {
                     case 0x00:
                         apollo_smram_map(dev, 1, 0x000a0000, 0x00020000, 0);
@@ -468,6 +468,12 @@ via_apollo_host_bridge_write(int func, int addr, uint8_t val, void *priv)
                     default:
                         break;
                 }
+            else {
+                smram_enable(dev->smram, 0x000a0000, 0x000a0000, 0x00020000,
+                             (dev->pci_conf[0x6d] & 0x10) && (dev->pci_conf[0x63] & 0x01),
+                             dev->pci_conf[0x63] & 0x01);
+                flushmmucache();
+            }
             break;
         case 0x65:
             if (dev->id == VIA_585)
@@ -532,6 +538,13 @@ via_apollo_host_bridge_write(int func, int addr, uint8_t val, void *priv)
                 dev->pci_conf[0x6d] = (dev->pci_conf[0x6d] & ~0x7f) | (val & 0x7f);
             else
                 dev->pci_conf[0x6d] = val;
+            if (dev->id == VIA_585) {
+                smram_disable_all();
+                smram_enable(dev->smram, 0x000a0000, 0x000a0000, 0x00020000,
+                             (dev->pci_conf[0x6d] & 0x10) && (dev->pci_conf[0x63] & 0x01),
+                             dev->pci_conf[0x63] & 0x01);
+                flushmmucache();
+            }
             break;
         case 0x6e:
             if ((dev->id == VIA_595) || (dev->id == VIA_694))
@@ -712,8 +725,7 @@ via_apollo_reset(void *priv)
 static void *
 via_apollo_init(const device_t *info)
 {
-    via_apollo_t *dev = (via_apollo_t *) malloc(sizeof(via_apollo_t));
-    memset(dev, 0, sizeof(via_apollo_t));
+    via_apollo_t *dev = (via_apollo_t *) calloc(1, sizeof(via_apollo_t));
 
     dev->smram = smram_add();
     if (dev->id != VIA_8601)
@@ -780,7 +792,7 @@ const device_t via_vpx_device = {
     .init          = via_apollo_init,
     .close         = via_apollo_close,
     .reset         = via_apollo_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -794,7 +806,7 @@ const device_t amd640_device = {
     .init          = via_apollo_init,
     .close         = via_apollo_close,
     .reset         = via_apollo_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -808,7 +820,7 @@ const device_t via_vp3_device = {
     .init          = via_apollo_init,
     .close         = via_apollo_close,
     .reset         = via_apollo_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -822,7 +834,7 @@ const device_t via_mvp3_device = {
     .init          = via_apollo_init,
     .close         = via_apollo_close,
     .reset         = via_apollo_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -836,7 +848,7 @@ const device_t via_apro_device = {
     .init          = via_apollo_init,
     .close         = via_apollo_close,
     .reset         = via_apollo_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -850,7 +862,7 @@ const device_t via_apro133_device = {
     .init          = via_apollo_init,
     .close         = via_apollo_close,
     .reset         = via_apollo_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -864,7 +876,7 @@ const device_t via_apro133a_device = {
     .init          = via_apollo_init,
     .close         = via_apollo_close,
     .reset         = via_apollo_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -878,7 +890,7 @@ const device_t via_vt8601_device = {
     .init          = via_apollo_init,
     .close         = via_apollo_close,
     .reset         = via_apollo_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/via_pipc.c b/src/chipset/via_pipc.c
index 1f153092b..7915b199e 100644
--- a/src/chipset/via_pipc.c
+++ b/src/chipset/via_pipc.c
@@ -43,6 +43,7 @@
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
 #include <86box/hdc_ide_sff8038i.h>
+#include <86box/keyboard.h>
 #include <86box/usb.h>
 #include <86box/machine.h>
 #include <86box/smbus.h>
@@ -59,8 +60,10 @@
    listings on forums, as VIA's datasheets are not very helpful regarding those. */
 #define VIA_PIPC_586A         0x05862500
 #define VIA_PIPC_586B         0x05864700
+#define VIA_PIPC_586          0x0586
 #define VIA_PIPC_596A         0x05960900
 #define VIA_PIPC_596B         0x05962300
+#define VIA_PIPC_596          0x0596
 #define VIA_PIPC_686A         0x06861400
 #define VIA_PIPC_686B         0x06864000
 #define VIA_PIPC_8231         0x82311000
@@ -413,7 +416,9 @@ pipc_reset_hard(void *priv)
             dev->power_regs[0x34] = 0x68;
         dev->power_regs[0x40] = 0x20;
 
-        dev->power_regs[0x42] = 0x50;
+        dev->power_regs[0x42] = ((dev->local >> 16) == VIA_PIPC_586) ? 0x00 : 0x50;
+        acpi_set_irq_line(dev->acpi, 0x00);
+
         dev->power_regs[0x48] = 0x01;
 
         if (dev->local == VIA_PIPC_686B) {
@@ -489,14 +494,28 @@ pipc_reset_hard(void *priv)
             }
             dev->ac97_regs[i][0x1c] = 0x01;
 
+            if (i == 0) {
+                dev->ac97_regs[i][0x34] = 0xc0;
+
+                dev->ac97_regs[i][0xc0] = 0x01;
+                dev->ac97_regs[i][0xc1] = 0x00;
+                dev->ac97_regs[i][0xc2] = 0x03;
+                dev->ac97_regs[i][0xc3] = 0x00;
+
+                dev->ac97_regs[i][0xc4] = 0x00;
+                dev->ac97_regs[i][0xc5] = 0x00;
+                dev->ac97_regs[i][0xc6] = 0x00;
+                dev->ac97_regs[i][0xc7] = 0x00;
+            }
+
             dev->ac97_regs[i][0x3d] = 0x03;
 
-            if (i == 0)
+            if (i == 0) {
                 dev->ac97_regs[i][0x40] = 0x01;
-
-            dev->ac97_regs[i][0x43] = 0x1c;
-            dev->ac97_regs[i][0x48] = 0x01;
-            dev->ac97_regs[i][0x4b] = 0x02;
+                dev->ac97_regs[i][0x43] = 0x1c;
+                dev->ac97_regs[i][0x48] = 0x01;
+                dev->ac97_regs[i][0x4b] = 0x00;
+            }
 
             pipc_sgd_handlers(dev, i);
             pipc_codec_handlers(dev, i);
@@ -738,10 +757,12 @@ pipc_codec_handlers(pipc_t *dev, uint8_t modem)
     if (!dev->ac97)
         return;
 
+    uint32_t base = (dev->ac97_regs[modem][0x1d] << 8);
+
     if (modem)
-        ac97_via_remap_modem_codec(dev->ac97, dev->ac97_regs[1][0x1d] << 8, dev->ac97_regs[1][0x04] & PCI_COMMAND_IO);
+        ac97_via_remap_modem_codec(dev->ac97, base, dev->ac97_regs[1][0x04] & PCI_COMMAND_IO);
     else
-        ac97_via_remap_audio_codec(dev->ac97, dev->ac97_regs[0][0x1d] << 8, dev->ac97_regs[0][0x04] & PCI_COMMAND_IO);
+        ac97_via_remap_audio_codec(dev->ac97, base, dev->ac97_regs[0][0x04] & PCI_COMMAND_IO);
 }
 
 static uint8_t
@@ -1200,7 +1221,7 @@ pipc_write(int func, int addr, uint8_t val, void *priv)
 
             case 0x77:
                 if ((dev->local >= VIA_PIPC_686A) && (val & 0x10))
-                    pclog("PIPC: Warning: Internal I/O APIC enabled.\n");
+                    warning("PIPC: Warning: Internal I/O APIC enabled.\n");
                 nvr_via_wp_set(!!(val & 0x04), 0x32, dev->nvr);
                 nvr_via_wp_set(!!(val & 0x02), 0x0d, dev->nvr);
                 break;
@@ -1484,36 +1505,39 @@ pipc_write(int func, int addr, uint8_t val, void *priv)
                 break;
         }
     } else if (func <= pm_func + 2) { /* AC97 / MC97 */
-        /* Read-only addresses. */
-        if ((addr < 0x4) || ((addr >= 0x6) && (addr < 0x9)) || ((addr >= 0xc) && (addr < 0x11)) || (addr == 0x16) || (addr == 0x17) || (addr == 0x1a) || (addr == 0x1b) || ((addr >= 0x1e) && (addr < 0x2c)) || ((addr >= 0x30) && (addr < 0x34)) || ((addr >= 0x35) && (addr < 0x3c)) || ((addr >= 0x3d) && (addr < 0x41)) || ((addr >= 0x45) && (addr < 0x4a)) || (addr >= 0x4c))
-            return;
-
         /* Small shortcut. */
         func = func - pm_func - 1;
 
-        /* Check disable bits and specific read-only addresses for both controllers. */
-        if ((func == 0) && (((addr >= 0x09) && (addr < 0xc)) || (addr == 0x44) || (dev->pci_isa_regs[0x85] & 0x04)))
+        /* Check disable bits. */
+        if ((func == 0) && (dev->pci_isa_regs[0x85] & 0x04))
             return;
 
-        if ((func == 1) && ((addr == 0x14) || (addr == 0x15) || (addr == 0x18) || (addr == 0x19) || (addr == 0x42) || (addr == 0x43) || (addr == 0x48) || (addr == 0x4a) || (addr == 0x4b) || (dev->pci_isa_regs[0x85] & 0x08)))
+        if ((func == 1) && (dev->pci_isa_regs[0x85] & 0x08))
             return;
 
         switch (addr) {
             case 0x04:
-                dev->ac97_regs[func][addr] = val;
+                dev->ac97_regs[func][addr] = val & 0x01;
                 pipc_sgd_handlers(dev, func);
+                if (func == 0) {
+                    pipc_fmnmi_handlers(dev, func);
+                    pipc_sb_handlers(dev, func);
+                }
                 pipc_codec_handlers(dev, func);
-                pipc_fmnmi_handlers(dev, func);
                 break;
 
             case 0x09:
             case 0x0a:
             case 0x0b:
-                if (dev->ac97_regs[func][0x44] & 0x20)
+                /* Not writable on audio, only on modem. */
+                if ((func == 1) && (dev->ac97_regs[func][0x44] & 0x20))
                     dev->ac97_regs[func][addr] = val;
                 break;
 
-            case 0x10:
+            /*
+               The lowest 10 bytes are always 0x01, indicating
+               a 256-byte I/O space.
+             */
             case 0x11:
                 dev->ac97_regs[func][addr] = val;
                 pipc_sgd_handlers(dev, func);
@@ -1521,21 +1545,26 @@ pipc_write(int func, int addr, uint8_t val, void *priv)
 
             case 0x14:
             case 0x15:
-                if (addr == 0x14)
-                    val = (val & 0xfc) | 1;
-                dev->ac97_regs[func][addr] = val;
-                pipc_fmnmi_handlers(dev, func);
+                /* Not present on modem. */
+                if (func == 0) {
+                    if (addr == 0x14)
+                        val = (val & 0xfc) | 1;
+                    dev->ac97_regs[func][addr] = val;
+                    pipc_fmnmi_handlers(dev, func);
+                }
                 break;
 
             case 0x18:
             case 0x19:
-                if (addr == 0x18)
-                    val = (val & 0xfc) | 1;
-                dev->ac97_regs[func][addr] = val;
-                pipc_sb_handlers(dev, func);
+                /* Not present on modem. */
+                if (func == 0) {
+                    if (addr == 0x18)
+                        val = (val & 0xfc) | 1;
+                    dev->ac97_regs[func][addr] = val;
+                    pipc_sb_handlers(dev, func);
+                }
                 break;
 
-            case 0x1c:
             case 0x1d:
                 dev->ac97_regs[func][addr] = val;
                 pipc_codec_handlers(dev, func);
@@ -1545,39 +1574,84 @@ pipc_write(int func, int addr, uint8_t val, void *priv)
             case 0x2d:
             case 0x2e:
             case 0x2f:
-                if ((func == 0) && (dev->ac97_regs[func][0x42] & 0x20))
+                if (((func == 0) && (dev->ac97_regs[func][0x42] & 0x20)) ||
+                    ((func == 1) && (dev->ac97_regs[func][0x44] & 0x10)))
                     dev->ac97_regs[func][addr] = val;
                 break;
 
+            case 0x3c:
+                dev->ac97_regs[func][addr] = val & 0x0f;
+                break;
+
             case 0x41:
                 dev->ac97_regs[func][addr] = val;
                 ac97_via_write_control(dev->ac97, func, val);
                 break;
 
             case 0x42:
-            case 0x4a:
-            case 0x4b:
-                dev->ac97_regs[0][addr] = dev->ac97_regs[1][addr] = val;
-                gameport_remap(dev->gameport, (dev->ac97_regs[0][0x42] & 0x08) ? ((dev->ac97_regs[0][0x4b] << 8) | (dev->ac97_regs[0][0x4a] & 0xf8)) : 0);
-                if (addr == 0x42)
-                    pipc_sb_handlers(dev, func);
+            case 0x4a ... 0x4b:
+                if (func == 0) {
+                    dev->ac97_regs[func][addr] = val;
+                    gameport_remap(dev->gameport, (dev->ac97_regs[func][0x42] & 0x08) ?
+                                                  ((dev->ac97_regs[func][0x4b] << 8) |
+                                                  (dev->ac97_regs[func][0x4a] & 0xf8)) : 0);
+
+                    if (addr == 0x42)
+                        pipc_sb_handlers(dev, func);
+                }
                 break;
 
             case 0x43:
-                dev->ac97_regs[0][addr] = dev->ac97_regs[1][addr] = val;
+                if (func == 0)
+                    dev->ac97_regs[func][addr] = val;
                 break;
 
             case 0x44:
-                dev->ac97_regs[0][addr] = dev->ac97_regs[1][addr] = val & 0xf0;
+                if (func == 1)
+                    dev->ac97_regs[func][addr] = val & 0xf0;
                 break;
 
-            case 0x45:
             case 0x48:
-                dev->ac97_regs[0][addr] = dev->ac97_regs[1][addr] = val & 0x0f;
+                if (func == 0)
+                    dev->ac97_regs[func][addr] = val & 0x0f;
+                break;
+
+            case 0x80:
+            case 0x81:
+            case 0x82:
+                dev->ac97_regs[func][addr] = val;
+                break;
+            case 0x83:
+                dev->ac97_regs[func][addr] = ((dev->ac97_regs[func][addr] & 0x01) |
+                                              (val & 0xc0)) & ~(val & 0x0a);
+                break;
+
+            case 0x88:
+            case 0x89:
+                dev->ac97_regs[func][addr] = val;
+                break;
+            case 0x8a:
+            case 0x8b:
+                dev->ac97_regs[func][addr] &= ~val;
+                break;
+
+            case 0x8e:
+            case 0x8f:
+                dev->ac97_regs[func][addr] = val;
+                break;
+
+            case 0xc4:
+                if (func == 0)
+                    dev->ac97_regs[func][addr] = (dev->ac97_regs[func][addr] & 0x0c) |
+                                                 (val & 0x03);
+                break;
+            case 0xc5:
+                if (func == 0)
+                    dev->ac97_regs[func][addr] = (dev->ac97_regs[func][addr] & 0x60) |
+                                                 (val & 0x9f);
                 break;
 
             default:
-                dev->ac97_regs[func][addr] = val;
                 break;
         }
     }
@@ -1593,6 +1667,9 @@ pipc_reset(void *priv)
     pipc_write(pm_func, 0x48, 0x01, priv);
     pipc_write(pm_func, 0x49, 0x00, priv);
 
+    dev->power_regs[0x42] = ((dev->local >> 16) == VIA_PIPC_586) ? 0x00 : 0x50;
+    acpi_set_irq_line(dev->acpi, 0x00);
+
     pipc_write(1, 0x04, 0x80, priv);
     pipc_write(1, 0x09, 0x85, priv);
     pipc_write(1, 0x10, 0xf1, priv);
@@ -1627,8 +1704,7 @@ pipc_reset(void *priv)
 static void *
 pipc_init(const device_t *info)
 {
-    pipc_t *dev = (pipc_t *) malloc(sizeof(pipc_t));
-    memset(dev, 0, sizeof(pipc_t));
+    pipc_t *dev = (pipc_t *) calloc(1, sizeof(pipc_t));
 
     pipc_log("PIPC: init()\n");
 
@@ -1695,8 +1771,42 @@ pipc_init(const device_t *info)
         acpi_set_nvr(dev->acpi, dev->nvr);
 
         acpi_init_gporeg(dev->acpi, 0xff, 0xbf, 0xff, 0x7f);
+
+        acpi_set_irq_mode(dev->acpi, 0);
     }
 
+    uint32_t kbc_params = 0x00424600;
+    /*
+       NOTE: The VIA VT82C42N returns 0x46 ('F') in command 0xA1 (so it
+             emulates the AMI KF/AMIKey KBC firmware), and 0x42 ('B') in
+             command 0xAF.
+
+            The version on the VIA VT82C686B southbridge also returns
+            'F' in command 0xA1, but 0x45 ('E') in command 0xAF.
+            The version on the VIA VT82C586B southbridge also returns
+            'F' in command 0xA1, but 0x44 ('D') in command 0xAF.
+            The version on the VIA VT82C586A southbridge also returns
+            'F' in command 0xA1, but 0x43 ('C') in command 0xAF.
+     */
+    switch (dev->local) {
+        /* 596A, 596B, 686B, and 8231 are guesses because we have no probes yet. */
+        case VIA_PIPC_586A: case VIA_PIPC_596A:
+            kbc_params = 0x00434600;
+            break;
+        case VIA_PIPC_586B: case VIA_PIPC_596B:
+            kbc_params = 0x00444600;
+            break;
+        case VIA_PIPC_686A: case VIA_PIPC_686B:
+        case VIA_PIPC_8231:
+            kbc_params = 0x00454600;
+            break;
+    }
+
+    kbc_params |= KBC_VEN_VIA;
+
+    if (machine_get_kbc_device(machine) == NULL)
+        device_add_params(&kbc_at_device, (void *) (uintptr_t) kbc_params);
+
     return dev;
 }
 
@@ -1721,7 +1831,7 @@ const device_t via_vt82c586b_device = {
     .init          = pipc_init,
     .close         = pipc_close,
     .reset         = pipc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1735,7 +1845,7 @@ const device_t via_vt82c596a_device = {
     .init          = pipc_init,
     .close         = pipc_close,
     .reset         = pipc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1749,7 +1859,7 @@ const device_t via_vt82c596b_device = {
     .init          = pipc_init,
     .close         = pipc_close,
     .reset         = pipc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1763,7 +1873,7 @@ const device_t via_vt82c686a_device = {
     .init          = pipc_init,
     .close         = pipc_close,
     .reset         = pipc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1777,7 +1887,7 @@ const device_t via_vt82c686b_device = {
     .init          = pipc_init,
     .close         = pipc_close,
     .reset         = pipc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1791,7 +1901,7 @@ const device_t via_vt8231_device = {
     .init          = pipc_init,
     .close         = pipc_close,
     .reset         = pipc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/via_vt82c49x.c b/src/chipset/via_vt82c49x.c
index de55f7060..3a7bbfdda 100644
--- a/src/chipset/via_vt82c49x.c
+++ b/src/chipset/via_vt82c49x.c
@@ -193,6 +193,8 @@ vt82c49x_recalc(vt82c49x_t *dev)
         default:
             break;
     }
+
+    flushmmucache_nopc();
 }
 
 static void
@@ -275,8 +277,8 @@ vt82c49x_write(uint16_t addr, uint8_t val, void *priv)
                 case 0x71:
                     if (dev->has_ide) {
                         ide_pri_disable();
-                        ide_set_base(0, (val & 0x40) ? 0x170 : 0x1f0);
-                        ide_set_side(0, (val & 0x40) ? 0x376 : 0x3f6);
+                        ide_set_base(0, (val & 0x40) ? HDC_SECONDARY_BASE : HDC_PRIMARY_BASE);
+                        ide_set_side(0, (val & 0x40) ? HDC_SECONDARY_SIDE : HDC_PRIMARY_SIDE);
                         if (val & 0x01)
                             ide_pri_enable();
                         vt82c49x_log("VT82C496 IDE now %sabled as %sary\n", (val & 0x01) ? "en" : "dis",
@@ -342,8 +344,7 @@ vt82c49x_close(void *priv)
 static void *
 vt82c49x_init(const device_t *info)
 {
-    vt82c49x_t *dev = (vt82c49x_t *) malloc(sizeof(vt82c49x_t));
-    memset(dev, 0x00, sizeof(vt82c49x_t));
+    vt82c49x_t *dev = (vt82c49x_t *) calloc(1, sizeof(vt82c49x_t));
 
     dev->smram_smm  = smram_add();
     dev->smram_low  = smram_add();
@@ -375,7 +376,7 @@ const device_t via_vt82c49x_device = {
     .init          = vt82c49x_init,
     .close         = vt82c49x_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -389,7 +390,7 @@ const device_t via_vt82c49x_pci_device = {
     .init          = vt82c49x_init,
     .close         = vt82c49x_close,
     .reset         = vt82c49x_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -403,7 +404,7 @@ const device_t via_vt82c49x_ide_device = {
     .init          = vt82c49x_init,
     .close         = vt82c49x_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -417,7 +418,7 @@ const device_t via_vt82c49x_pci_ide_device = {
     .init          = vt82c49x_init,
     .close         = vt82c49x_close,
     .reset         = vt82c49x_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/via_vt82c505.c b/src/chipset/via_vt82c505.c
index 34efbead9..dbbb447c7 100644
--- a/src/chipset/via_vt82c505.c
+++ b/src/chipset/via_vt82c505.c
@@ -167,7 +167,7 @@ vt82c505_in(uint16_t addr, void *priv)
 static void
 vt82c505_reset(void *priv)
 {
-    vt82c505_t *dev = (vt82c505_t *) malloc(sizeof(vt82c505_t));
+    vt82c505_t *dev = (vt82c505_t *) calloc(1, sizeof(vt82c505_t));
 
     dev->pci_conf[0x04] = 0x07;
     dev->pci_conf[0x07] = 0x00;
@@ -204,8 +204,7 @@ vt82c505_close(void *priv)
 static void *
 vt82c505_init(UNUSED(const device_t *info))
 {
-    vt82c505_t *dev = (vt82c505_t *) malloc(sizeof(vt82c505_t));
-    memset(dev, 0, sizeof(vt82c505_t));
+    vt82c505_t *dev = (vt82c505_t *) calloc(1, sizeof(vt82c505_t));
 
     pci_add_card(PCI_ADD_NORTHBRIDGE, vt82c505_read, vt82c505_write, dev, &dev->pci_slot);
 
@@ -232,7 +231,7 @@ const device_t via_vt82c505_device = {
     .init          = vt82c505_init,
     .close         = vt82c505_close,
     .reset         = vt82c505_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/vl82c480.c b/src/chipset/vl82c480.c
index 00adcc2a4..acb3568af 100644
--- a/src/chipset/vl82c480.c
+++ b/src/chipset/vl82c480.c
@@ -24,14 +24,16 @@
 #include <86box/timer.h>
 #include <86box/device.h>
 #include <86box/io.h>
+#include <86box/machine.h>
 #include <86box/mem.h>
 #include <86box/nmi.h>
 #include <86box/port_92.h>
 #include <86box/chipset.h>
 
 typedef struct vl82c480_t {
-    uint8_t idx;
-    uint8_t regs[256];
+    uint8_t  idx;
+    uint8_t  regs[256];
+    uint32_t banks[4];
 } vl82c480_t;
 
 static int
@@ -59,7 +61,7 @@ vl82c480_shflags(uint8_t access)
 }
 
 static void
-vl82c480_recalc(vl82c480_t *dev)
+vl82c480_recalc_shadow(vl82c480_t *dev)
 {
     uint32_t base;
     uint8_t  access;
@@ -69,8 +71,8 @@ vl82c480_recalc(vl82c480_t *dev)
 
     for (uint8_t i = 0; i < 6; i++) {
         for (uint8_t j = 0; j < 8; j += 2) {
-            base   = 0x000a0000 + (i << 16) + (j << 13);
-            access = (dev->regs[0x0d + i] >> j) & 3;
+            base    = 0x000a0000 + (i << 16) + (j << 13);
+            access  = (dev->regs[0x0d + i] >> j) & 3;
             mem_set_mem_state(base, 0x4000, vl82c480_shflags(access));
             shadowbios |= ((base >= 0xe0000) && (access & 0x02));
             shadowbios_write |= ((base >= 0xe0000) && (access & 0x01));
@@ -80,6 +82,37 @@ vl82c480_recalc(vl82c480_t *dev)
     flushmmucache();
 }
 
+static void
+vl82c480_recalc_banks(vl82c480_t *dev)
+{
+    uint32_t sizes[8]  = { 0, 0, 1024, 2048, 4096, 8192, 16384, 32768 };
+    uint8_t  shifts[4] = { 0, 4, 0, 4 };
+    uint8_t  regs[4]   = { 0x02, 0x02, 0x03, 0x03 };
+    uint32_t total     = 0;
+
+    for (uint8_t i = 0; i < 4; i++) {
+        uint8_t  shift = shifts[i];
+        uint8_t  reg   = regs[i];
+        uint8_t  cfg   = (dev->regs[reg] >> shift) & 0x7;
+        uint32_t size  = sizes[cfg];
+
+        total += MIN(dev->banks[i], size);
+    }
+
+    if (total > 1024) {
+        mem_mapping_set_addr(&ram_low_mapping, 0x00000000, 0x000a0000);
+        mem_mapping_set_addr(&ram_high_mapping, 0x00100000, (total - 1024) << 10);
+    } else {
+        if (total >= 1024)
+            mem_mapping_set_addr(&ram_low_mapping, 0x00000000, 0x000a0000);
+        else
+            mem_mapping_disable(&ram_low_mapping);
+        mem_mapping_disable(&ram_high_mapping);
+    }
+
+    flushmmucache();
+}
+
 static void
 vl82c480_write(uint16_t addr, uint8_t val, void *priv)
 {
@@ -91,11 +124,18 @@ vl82c480_write(uint16_t addr, uint8_t val, void *priv)
             break;
 
         case 0xed:
-            if (dev->idx >= 0x01 && dev->idx <= 0x24) {
+            if (((dev->idx >= 0x01) && (dev->idx <= 0x19)) ||
+                ((dev->idx >= 0x20) && (dev->idx <= 0x24))) {
                 switch (dev->idx) {
                     default:
                         dev->regs[dev->idx] = val;
                         break;
+                    case 0x02: case 0x03:
+                        dev->regs[dev->idx] = val;
+                        if (!strcmp(machine_get_internal_name(), "martin") ||
+                            !strcmp(machine_get_internal_name(), "prolineamt"))
+                            vl82c480_recalc_banks(dev);
+                        break;
                     case 0x04:
                         if (dev->regs[0x00] == 0x98)
                             dev->regs[dev->idx] = (dev->regs[dev->idx] & 0x08) | (val & 0xf7);
@@ -108,14 +148,9 @@ vl82c480_write(uint16_t addr, uint8_t val, void *priv)
                     case 0x07:
                         dev->regs[dev->idx] = (dev->regs[dev->idx] & 0x40) | (val & 0xbf);
                         break;
-                    case 0x0d:
-                    case 0x0e:
-                    case 0x0f:
-                    case 0x10:
-                    case 0x11:
-                    case 0x12:
+                    case 0x0d ... 0x12:
                         dev->regs[dev->idx] = val;
-                        vl82c480_recalc(dev);
+                        vl82c480_recalc_shadow(dev);
                         break;
                 }
             }
@@ -124,8 +159,8 @@ vl82c480_write(uint16_t addr, uint8_t val, void *priv)
 /* TODO: This is actually Fast A20 disable. */
 #if 0
         case 0xee:
-            if (mem_a20_alt)
-                outb(0x92, inb(0x92) & ~2);
+            mem_a20_alt = 0x00;
+            mem_a20_recalc();
             break;
 #endif
 
@@ -146,14 +181,16 @@ vl82c480_read(uint16_t addr, void *priv)
             break;
 
         case 0xed:
-            ret = dev->regs[dev->idx];
+            if (((dev->idx >= 0x01) && (dev->idx <= 0x19)) ||
+                ((dev->idx >= 0x20) && (dev->idx <= 0x24)))
+                ret = dev->regs[dev->idx];
             break;
 
 /* TODO: This is actually Fast A20 enable. */
 #if 0
         case 0xee:
-            if (!mem_a20_alt)
-                outb(0x92, inb(0x92) | 2);
+            mem_a20_alt = 0x02;
+            mem_a20_recalc();
             break;
 #endif
 
@@ -180,8 +217,12 @@ vl82c480_close(void *priv)
 static void *
 vl82c480_init(const device_t *info)
 {
-    vl82c480_t *dev = (vl82c480_t *) malloc(sizeof(vl82c480_t));
-    memset(dev, 0, sizeof(vl82c480_t));
+    vl82c480_t *dev      = (vl82c480_t *) calloc(1, sizeof(vl82c480_t));
+    uint32_t    sizes[8] = { 0, 0, 1024, 2048, 4096, 8192, 16384, 32768 };
+    uint32_t    ms       = mem_size;
+    uint8_t     min_i    = !strcmp(machine_get_internal_name(), "prolineamt") ? 1 : 0;
+    uint8_t     min_j    = !strcmp(machine_get_internal_name(), "prolineamt") ? 4 : 2;
+    uint8_t     max_j    = !strcmp(machine_get_internal_name(), "prolineamt") ? 8 : 7;
 
     dev->regs[0x00] = info->local;
     dev->regs[0x01] = 0xff;
@@ -192,9 +233,31 @@ vl82c480_init(const device_t *info)
         dev->regs[0x07] = 0x21;
     dev->regs[0x08] = 0x38;
 
+    if (!strcmp(machine_get_internal_name(), "prolineamt")) {
+        dev->banks[0] = 4096;
+
+        /* Bank 0 is ignored if 64 MB is installed. */
+        if (ms != 65536)
+            ms -= 4096;
+    }
+
+    if (ms > 0)  for (uint8_t i = min_i; i < 4; i++) {
+        for (uint8_t j = min_j; j < max_j; j++) {
+            if (ms >= sizes[j])
+                dev->banks[i] = sizes[j];
+            else
+                break;
+        }
+
+        ms -= dev->banks[i];
+
+        if ((ms == 0) || (dev->banks[i] == 0))
+            break;
+    }
+
     io_sethandler(0x00ec, 0x0004, vl82c480_read, NULL, NULL, vl82c480_write, NULL, NULL, dev);
 
-    device_add(&port_92_device);
+    device_add(&port_92_pci_device);
 
     return dev;
 }
@@ -207,7 +270,7 @@ const device_t vl82c480_device = {
     .init          = vl82c480_init,
     .close         = vl82c480_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -221,7 +284,7 @@ const device_t vl82c486_device = {
     .init          = vl82c480_init,
     .close         = vl82c480_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/chipset/wd76c10.c b/src/chipset/wd76c10.c
index ef076b606..ddde7626e 100644
--- a/src/chipset/wd76c10.c
+++ b/src/chipset/wd76c10.c
@@ -37,6 +37,7 @@
 #include <86box/port_92.h>
 #include <86box/serial.h>
 #include <86box/plat_fallthrough.h>
+#include <86box/plat_unused.h>
 #include <86box/chipset.h>
 
 /* Lock/Unlock Procedures */
@@ -64,9 +65,10 @@ wd76c10_log(const char *fmt, ...)
 #endif
 
 typedef struct {
-    uint32_t enable;
+    uint32_t phys_on, enable;
     uint32_t virt_addr, phys_addr;
     uint32_t virt_size, phys_size;
+    uint32_t adj_virt_addr, adj_virt_size;
 } ram_bank_t;
 
 typedef struct {
@@ -79,11 +81,14 @@ typedef struct {
 typedef struct
 {
     uint8_t ep, p92;
+    uint8_t addr_sel;
 
+    uint8_t addr_regs[8];
     uint8_t vbios_states[4];
     uint8_t bios_states[8];
     uint8_t high_bios_states[8];
     uint8_t mem_pages[1024];
+    uint8_t ram_state[4192];
 
     uint16_t toggle, cpuclk, fpu_ctl, mem_ctl,
              split_sa, sh_wp, hmwpb, npmdmt,
@@ -97,10 +102,12 @@ typedef struct
     };
 
     uint16_t ems_page_regs[40];
+    uint16_t lpt_base;
 
     int locked;
 
     uint32_t mem_top, hmwp_base;
+    uint32_t fast;
 
     ram_bank_t ram_banks[5];
 
@@ -109,9 +116,9 @@ typedef struct
     mem_mapping_t ram_mapping;
 
     nvr_t     *nvr;
-
-    fdc_t *fdc;
-    serial_t *uart[2];
+    fdc_t     *fdc;
+    serial_t  *uart[2];
+    lpt_t     *lpt;
 } wd76c10_t;
 
 static uint32_t bank_sizes[4] = { 0x00020000,      /*  64 Kbit X 16 = 1024 Kbit = 128 kB,  8x 8 */
@@ -119,6 +126,40 @@ static uint32_t bank_sizes[4] = { 0x00020000,      /*  64 Kbit X 16 = 1024 Kbit
                                   0x00200000,      /*   1 Mbit X 16 =   16 Mbit =   2 MB, 10x10 */
                                   0x00800000 };    /*   4 Mbit X 16 =   64 Mbit =   8 MB, 11x11 */
 
+static uint32_t
+wd76c10_calc_phys(uint32_t row, uint32_t col, uint32_t size, uint32_t a0)
+{
+    uint32_t ret = WD76C10_ADDR_INVALID;
+
+    switch (size) {
+        default:
+            ret = WD76C10_ADDR_INVALID;
+            break;
+        case 0x00020000:
+            row = (row & 0x0000ff) << 9;
+            col = (col & 0x0000ff) << 1;
+            ret = row | col | a0;
+            break;
+        case 0x00080000:
+            row = (row & 0x0001ff) << 10;
+            col = (col & 0x0001ff) << 1;
+            ret = row | col | a0;
+            break;
+        case 0x00200000:
+            row = (row & 0x0003ff) << 11;
+            col = (col & 0x0003ff) << 1;
+            ret = row | col | a0;
+            break;
+        case 0x00800000:
+            row = (row & 0x0007ff) << 12;
+            col = (col & 0x0007ff) << 1;
+            ret = row | col | a0;
+            break;
+    }
+
+    return ret;
+}
+
 static uint32_t
 wd76c10_calc_addr(wd76c10_t *dev, uint32_t addr)
 {
@@ -157,20 +198,303 @@ wd76c10_calc_addr(wd76c10_t *dev, uint32_t addr)
         ret = WD76C10_ADDR_INVALID;
 
     /* Then, handle the physical memory banks. */
+    int      ilv4  = (dev->mem_ctl >> 8) & 4;
+    int8_t   add   = 0;
+    uint32_t pg    = (dev->mem_ctl & 0x0800);
+    uint32_t nrt   = WD76C10_ADDR_INVALID;
+
+    if (ret != WD76C10_ADDR_INVALID) {
+        if (dev->fast)  for (int8_t i = 0; i < 4; i++) {
+            rb = &(dev->ram_banks[i]);
+
+            uint32_t ret2  = ret - rb->phys_addr;
+
+            if (rb->phys_on && (ret >= rb->phys_addr) &&
+                (ret < (rb->phys_addr + rb->phys_size))) {
+                if (ret2 < rb->phys_size)
+                    nrt = ret2 + rb->phys_addr;
+                break;
+            }
+        } else  for (int8_t i = 0; i < 4; i++) {
+            rb = &(dev->ram_banks[i]);
+
+            int      ilv2  = (dev->mem_ctl >> 8) & (1 << (i >> 1));
+            uint32_t size  = rb->virt_size;
+            uint32_t ret2  = ret - rb->virt_addr;
+            uint32_t ret4  = ret2;
+            uint32_t row   = WD76C10_ADDR_INVALID;
+            uint32_t col   = WD76C10_ADDR_INVALID;
+            uint32_t rb_or = 0;
+
+            if (ilv4) {
+                size <<= 2;
+                switch (rb->virt_size) {
+                    default:
+                        ret4 = WD76C10_ADDR_INVALID;
+                        break;
+                    case 0x00020000:
+                        if (pg) {
+                            row   = (ret2 >> 9) & 0x0000fc;
+                            row  |= (ret2 >> 17) & 0x000001;
+                            row  |= ((ret2 >> 19) & 0x000001) << 1;
+                            row  |= ((ret2 >> 18) & 0x000001) << 8;
+                            row  |= ((ret2 >> 20) & 0x000001) << 9;
+                            row  |= ((ret2 >> 22) & 0x000001) << 10;
+                            col   = (ret2 >> 1) & 0x000007ff;
+                            rb_or = (ret2 >> 9) & 0x000003;
+                        } else
+                            ret4  = WD76C10_ADDR_INVALID;
+                        break;
+                    case 0x00080000:
+                        if (pg) {
+                            row   = (ret2 >> 9) & 0x0000f8;
+                            row  |= (ret2 >> 17) & 0x000001;
+                            row  |= ((ret2 >> 19) & 0x000001) << 1;
+                            row  |= ((ret2 >> 21) & 0x000001) << 2;
+                            row  |= ((ret2 >> 18) & 0x000001) << 8;
+                            row  |= ((ret2 >> 20) & 0x000001) << 9;
+                            row  |= ((ret2 >> 22) & 0x000001) << 10;
+                            col   = (ret2 >> 1) & 0x000007ff;
+                            rb_or = (ret2 >> 10) & 0x000003;
+                        } else
+                            ret4  = WD76C10_ADDR_INVALID;
+                        break;
+                    case 0x00200000:
+                        if (pg) {
+                            row   = (ret2 >> 9) & 0x0000f0;
+                            row  |= (ret2 >> 17) & 0x000001;
+                            row  |= ((ret2 >> 19) & 0x000001) << 1;
+                            row  |= ((ret2 >> 21) & 0x000001) << 2;
+                            row  |= ((ret2 >> 23) & 0x000001) << 3;
+                            row  |= ((ret2 >> 18) & 0x000001) << 8;
+                            row  |= ((ret2 >> 20) & 0x000001) << 9;
+                            row  |= ((ret2 >> 22) & 0x000001) << 10;
+                            col   = (ret2 >> 1) & 0x000007ff;
+                            rb_or = (ret2 >> 11) & 0x000003;
+                        } else
+                            ret4  = WD76C10_ADDR_INVALID;
+                        break;
+                    case 0x00800000:
+                        if (pg) {
+                            row   = (ret2 >> 9) & 0x0000e0;
+                            row  |= (ret2 >> 17) & 0x000001;
+                            row  |= ((ret2 >> 19) & 0x000001) << 1;
+                            row  |= ((ret2 >> 21) & 0x000001) << 2;
+                            row  |= ((ret2 >> 23) & 0x000001) << 3;
+                            row  |= ((ret2 >> 24) & 0x000001) << 4;
+                            row  |= ((ret2 >> 18) & 0x000001) << 8;
+                            row  |= ((ret2 >> 20) & 0x000001) << 9;
+                            row  |= ((ret2 >> 22) & 0x000001) << 10;
+                            col   = (ret2 >> 1) & 0x000007ff;
+                            rb_or = (ret2 >> 12) & 0x000003;
+                        } else
+                            ret4  = WD76C10_ADDR_INVALID;
+                        break;
+                }
+                add = 3;
+            } else if (ilv2) {
+                size <<= 1;
+                switch (rb->virt_size) {
+                    default:
+                        ret4 = WD76C10_ADDR_INVALID;
+                        break;
+                    case 0x00020000:
+                        if (pg) {
+                            row   = (ret2 >> 9) & 0x0000fe;
+                            row  |= (ret2 >> 17) & 0x000001;
+                            row  |= ((ret2 >> 18) & 0x000001) << 8;
+                            row  |= ((ret2 >> 20) & 0x000001) << 9;
+                            row  |= ((ret2 >> 22) & 0x000001) << 10;
+                            col   = (ret2 >> 1) & 0x000007ff;
+                            rb_or = (ret2 >> 9) & 0x000001;
+                        } else {
+                            row   = (ret2 >> 1) & 0x0007fe;
+                            row  |= (ret2 >> 13) & 0x000001;
+                            col   = (ret2 >> 9) & 0x0000ef;
+                            col  |= ((ret2 >> 17) & 0x000001) << 4;
+                            col  |= ((ret2 >> 18) & 0x000001) << 8;
+                            col  |= ((ret2 >> 20) & 0x000001) << 9;
+                            col  |= ((ret2 >> 22) & 0x000001) << 10;
+                            rb_or = (ret2 >> 1) & 0x000001;
+                        }
+                        break;
+                    case 0x00080000:
+                        if (pg) {
+                            row  = (ret2 >> 9) & 0x0000fc;
+                            row  |= (ret2 >> 17) & 0x000001;
+                            row  |= ((ret2 >> 19) & 0x000001) << 1;
+                            row  |= ((ret2 >> 18) & 0x000001) << 8;
+                            row  |= ((ret2 >> 20) & 0x000001) << 9;
+                            row  |= ((ret2 >> 22) & 0x000001) << 10;
+                            col   = (ret2 >> 1) & 0x000007ff;
+                            rb_or = (ret2 >> 10) & 0x000001;
+                        } else {
+                            row   = (ret2 >> 1) & 0x0007fe;
+                            row  |= (ret2 >> 13) & 0x000001;
+                            col   = (ret2 >> 9) & 0x0000ee;
+                            col  |= (ret2 >> 17) & 0x000001;
+                            col  |= ((ret2 >> 19) & 0x000001) << 4;
+                            col  |= ((ret2 >> 18) & 0x000001) << 8;
+                            col  |= ((ret2 >> 20) & 0x000001) << 9;
+                            col  |= ((ret2 >> 22) & 0x000001) << 10;
+                            rb_or = (ret2 >> 1) & 0x000001;
+                        }
+                        break;
+                    case 0x00200000:
+                        if (pg) {
+                            row   = (ret2 >> 9) & 0x0000f8;
+                            row  |= (ret2 >> 17) & 0x000001;
+                            row  |= ((ret2 >> 19) & 0x000001) << 1;
+                            row  |= ((ret2 >> 21) & 0x000001) << 2;
+                            row  |= ((ret2 >> 18) & 0x000001) << 8;
+                            row  |= ((ret2 >> 20) & 0x000001) << 9;
+                            row  |= ((ret2 >> 22) & 0x000001) << 10;
+                            col   = (ret2 >> 1) & 0x000007ff;
+                            rb_or = (ret2 >> 11) & 0x000001;
+                        } else {
+                            row   = (ret2 >> 1) & 0x0007fe;
+                            row  |= (ret2 >> 13) & 0x000001;
+                            col   = (ret2 >> 9) & 0x0000ec;
+                            col  |= (ret2 >> 17) & 0x000001;
+                            col  |= ((ret2 >> 19) & 0x000001) << 1;
+                            col  |= ((ret2 >> 21) & 0x000001) << 4;
+                            col  |= ((ret2 >> 18) & 0x000001) << 8;
+                            col  |= ((ret2 >> 20) & 0x000001) << 9;
+                            col  |= ((ret2 >> 22) & 0x000001) << 10;
+                            rb_or = (ret2 >> 1) & 0x000001;
+                        }
+                        break;
+                    case 0x00800000:
+                        if (pg) {
+                            row =  (ret2 >> 9) & 0x0000f0;
+                            row  |= (ret2 >> 17) & 0x000001;
+                            row  |= ((ret2 >> 19) & 0x000001) << 1;
+                            row  |= ((ret2 >> 21) & 0x000001) << 2;
+                            row  |= ((ret2 >> 23) & 0x000001) << 3;
+                            row  |= ((ret2 >> 18) & 0x000001) << 8;
+                            row  |= ((ret2 >> 20) & 0x000001) << 9;
+                            row  |= ((ret2 >> 22) & 0x000001) << 10;
+                            col   = (ret2 >> 1) & 0x000007ff;
+                            rb_or = (ret2 >> 12) & 0x000001;
+                        } else {
+                            row   = (ret2 >> 1) & 0x0007fe;
+                            row  |= (ret2 >> 13) & 0x000001;
+                            col   = (ret2 >> 9) & 0x0000e0;
+                            col  |= (ret2 >> 17) & 0x000001;
+                            col  |= ((ret2 >> 19) & 0x000001) << 1;
+                            col  |= ((ret2 >> 21) & 0x000001) << 2;
+                            col  |= ((ret2 >> 23) & 0x000001) << 3;
+                            col  |= ((ret2 >> 12) & 0x000001) << 4;
+                            col  |= ((ret2 >> 18) & 0x000001) << 8;
+                            col  |= ((ret2 >> 20) & 0x000001) << 9;
+                            col  |= ((ret2 >> 22) & 0x000001) << 10;
+                            rb_or = (ret2 >> 1) & 0x000001;
+                        }
+                        break;
+                }
+                add = 1;
+            } else if (pg)  switch (rb->virt_size) {
+                default:
+                    ret4 = WD76C10_ADDR_INVALID;
+                    break;
+                case 0x00020000:
+                    row  = (ret2 >> 9) & 0x0000ff;
+                    row |= ((ret2 >> 18) & 0x000001) << 8;
+                    row |= ((ret2 >> 20) & 0x000001) << 9;
+                    row |= ((ret2 >> 22) & 0x000001) << 10;
+                    col  = (ret2 >> 1) & 0x0007ff;
+                    break;
+                case 0x00080000:
+                    row  = (ret2 >> 9) & 0x0000fe;
+                    row |= (ret2 >> 17) & 0x000001;
+                    row |= ((ret2 >> 18) & 0x000001) << 8;
+                    row |= ((ret2 >> 20) & 0x000001) << 9;
+                    row |= ((ret2 >> 22) & 0x000001) << 10;
+                    col  = (ret2 >> 1) & 0x0007ff;
+                    break;
+                case 0x00200000:
+                    row  = (ret2 >> 9) & 0x0000fc;
+                    row |= (ret2 >> 17) & 0x000001;
+                    row |= ((ret2 >> 19) & 0x000001) << 1;
+                    row |= ((ret2 >> 18) & 0x000001) << 8;
+                    row |= ((ret2 >> 20) & 0x000001) << 9;
+                    row |= ((ret2 >> 22) & 0x000001) << 10;
+                    col  = (ret2 >> 1) & 0x0007ff;
+                    break;
+                case 0x00800000:
+                    row  = (ret2 >> 9) & 0x0000f8;
+                    row |= (ret2 >> 17) & 0x000001;
+                    row |= ((ret2 >> 19) & 0x000001) << 1;
+                    row |= ((ret2 >> 21) & 0x000001) << 2;
+                    row |= ((ret2 >> 18) & 0x000001) << 8;
+                    row |= ((ret2 >> 20) & 0x000001) << 9;
+                    row |= ((ret2 >> 22) & 0x000001) << 10;
+                    col  = (ret2 >> 1) & 0x0007ff;
+                    break;
+            } else  switch (rb->virt_size) {
+                default:
+                    ret4 = WD76C10_ADDR_INVALID;
+                    break;
+                case 0x00020000:
+                    row  = (ret2 >> 1) & 0x0007ff;
+                    col  = (ret2 >> 9) & 0x0000ff;
+                    col |= ((ret2 >> 18) & 0x000001) << 8;
+                    col |= ((ret2 >> 20) & 0x000001) << 9;
+                    col |= ((ret2 >> 22) & 0x000001) << 10;
+                    break;
+                case 0x00080000:
+                    row  = (ret2 >> 1) & 0x0007ff;
+                    col  = (ret2 >> 9) & 0x0000fe;
+                    col |= (ret2 >> 17) & 0x000001;
+                    col |= ((ret2 >> 18) & 0x000001) << 8;
+                    col |= ((ret2 >> 20) & 0x000001) << 9;
+                    col |= ((ret2 >> 22) & 0x000001) << 10;
+                    break;
+                case 0x00200000:
+                    row  = (ret2 >> 1) & 0x0007ff;
+                    col  = (ret2 >> 9) & 0x0000fc;
+                    col |= (ret2 >> 17) & 0x000001;
+                    col |= ((ret2 >> 19) & 0x000001) << 1;
+                    col |= ((ret2 >> 18) & 0x000001) << 8;
+                    col |= ((ret2 >> 20) & 0x000001) << 9;
+                    col |= ((ret2 >> 22) & 0x000001) << 10;
+                    break;
+                case 0x00800000:
+                    row  = (ret2 >> 1) & 0x0007ff;
+                    col  = (ret2 >> 9) & 0x0000f8;
+                    col |= (ret2 >> 17) & 0x000001;
+                    col |= ((ret2 >> 19) & 0x000001) << 1;
+                    col |= ((ret2 >> 21) & 0x000001) << 2;
+                    col |= ((ret2 >> 18) & 0x000001) << 8;
+                    col |= ((ret2 >> 20) & 0x000001) << 9;
+                    col |= ((ret2 >> 22) & 0x000001) << 10;
+                    break;
+            }
+
+            if (row != WD76C10_ADDR_INVALID) {
+                ret4 = wd76c10_calc_phys(row & 0x0007ff, col & 0x0007ff,
+                                         rb->phys_size, ret2 & 0x000001);
+
+                if (ilv4 || ilv2)
+                    rb = &(dev->ram_banks[i | rb_or]);
+
+                i += add;
+            }
+
+            if (rb->enable && (ret >= rb->virt_addr) &&
+                (ret < (rb->virt_addr + size))) {
+                if ((ret4 != WD76C10_ADDR_INVALID) && (rb->phys_size > 0x00000000))
+                    nrt = ret4 + rb->phys_addr;
+                break;
+            }
+        }
+
+        ret = nrt;
+    }
+
     if (ret >= (mem_size << 10))
         /* The physical memory address is too high or disabled, which is invalid. */
         ret = WD76C10_ADDR_INVALID;
-    /* Otherwise, map it to the correct bank so the BIOS can auto-size it correctly. */
-    else for (uint8_t i = 0; i < 4; i++) {
-        rb = &(dev->ram_banks[i]);
-        if (rb->enable && (ret >= rb->virt_addr) && (ret < (rb->virt_addr + rb->virt_size))) {
-            if (rb->phys_size == 0x00000000)
-                ret = WD76C10_ADDR_INVALID;
-            else
-                ret = ((ret - rb->virt_addr) % rb->phys_size) + rb->phys_addr;
-            break;
-        }
-    }
 
     return ret;
 }
@@ -183,8 +507,12 @@ wd76c10_read_ram(uint32_t addr, void *priv)
 
     addr = wd76c10_calc_addr(dev, addr);
 
-    if (addr != WD76C10_ADDR_INVALID)
-        ret = mem_read_ram(addr, priv);
+    if (addr != WD76C10_ADDR_INVALID) {
+        if (dev->fast)
+            ret = mem_read_ram(addr, priv);
+        else
+            ret = ram[addr];
+    }
 
     return ret;
 }
@@ -197,8 +525,12 @@ wd76c10_read_ramw(uint32_t addr, void *priv)
 
     addr = wd76c10_calc_addr(dev, addr);
 
-    if (addr != WD76C10_ADDR_INVALID)
-        ret = mem_read_ramw(addr, priv);
+    if (addr != WD76C10_ADDR_INVALID) {
+        if (dev->fast)
+            ret = mem_read_ramw(addr, priv);
+        else
+            ret = *(uint16_t *) &(ram[addr]);
+    }
 
     return ret;
 }
@@ -210,8 +542,12 @@ wd76c10_write_ram(uint32_t addr, uint8_t val, void *priv)
 
     addr = wd76c10_calc_addr(dev, addr);
 
-    if (addr != WD76C10_ADDR_INVALID)
-        mem_write_ram(addr, val, priv);
+    if (addr != WD76C10_ADDR_INVALID) {
+        if (dev->fast)
+            mem_write_ram(addr, val, priv);
+        else
+            ram[addr] = val;
+    }
 }
 
 static void
@@ -221,13 +557,48 @@ wd76c10_write_ramw(uint32_t addr, uint16_t val, void *priv)
 
     addr = wd76c10_calc_addr(dev, addr);
 
-    if (addr != WD76C10_ADDR_INVALID)
-        mem_write_ramw(addr, val, priv);
+    if (addr != WD76C10_ADDR_INVALID) {
+        if (dev->fast)
+            mem_write_ramw(addr, val, priv);
+        else
+            *(uint16_t *) &(ram[addr]) = val;
+    }
+}
+
+static void
+wd76c10_set_mem_state(wd76c10_t *dev, uint32_t base, uint32_t size, uint32_t access, uint8_t present)
+{
+    mem_set_mem_state_both(base, size, access);
+
+    for (uint32_t i = base; i < (base + size); i += 4096)
+        dev->ram_state[i >> 12] = present;
+}
+
+static void
+wd76c10_recalc_exec(wd76c10_t *dev, uint32_t base, uint32_t size)
+{
+    uint32_t logical_addr = wd76c10_calc_addr(dev, base);
+    void *exec;
+
+    if (logical_addr != WD76C10_ADDR_INVALID)
+        exec = &(ram[logical_addr]);
+    else
+        exec = NULL;
+
+    for (uint32_t i = base; i < (base + size); i += 4096)
+        if (dev->ram_state[i >> 12])
+            _mem_exec[i >> 12] = exec;
+
+    if (cpu_use_exec)
+        flushmmucache_nopc();
 }
 
 static void
 wd76c10_banks_recalc(wd76c10_t *dev)
 {
+    int match = 0;
+    dev->fast = 0;
+
     for (uint8_t i = 0; i < 4; i++) {
         ram_bank_t *rb = &(dev->ram_banks[i]);
         uint8_t bit = i << 1;
@@ -235,6 +606,43 @@ wd76c10_banks_recalc(wd76c10_t *dev)
         bit = i + 12;
         rb->enable = (dev->split_sa >> bit) & 0x01;
         rb->virt_addr = ((uint32_t) dev->bank_bases[i]) << 17;
+
+        if (rb->enable) {
+            rb->adj_virt_addr = rb->virt_addr;
+            rb->adj_virt_size = rb->virt_size;
+
+            if (dev->mem_ctl & 0x0400)
+                rb->adj_virt_addr += (i * rb->adj_virt_size);
+            else if ((dev->mem_ctl >> 8) & (1 << (i >> 1)))
+                rb->adj_virt_addr += ((i & 1) * rb->adj_virt_size);
+        } else {
+            rb->adj_virt_addr = WD76C10_ADDR_INVALID;
+            rb->adj_virt_size = 0x00000000;
+        }
+
+        if ((rb->enable == rb->phys_on) &&
+            (rb->adj_virt_addr == rb->phys_addr) &&
+            (rb->adj_virt_size == rb->phys_size))
+            match++;
+    }
+
+    dev->fast = (match == 4);
+
+    for (uint8_t i = 0; i < 4; i++) {
+        ram_bank_t *rb = &(dev->ram_banks[i]);
+
+        if (cpu_use_exec)
+            wd76c10_recalc_exec(dev, rb->virt_addr, rb->virt_size);
+
+        wd76c10_log("Bank %i (%s), physical: %i, %08X-%08X, "
+                    "virtual: %i, %08X-%08X, adj.: %i, %08X-%08X\n",
+                    i, dev->fast ? "FAST" : "SLOW",
+                    rb->phys_on,
+                    rb->phys_addr, rb->phys_addr + rb->phys_size - 1,
+                    rb->enable,
+                    rb->virt_addr, rb->virt_addr + rb->virt_size - 1,
+                    rb->enable,
+                    rb->adj_virt_addr, rb->adj_virt_addr + rb->adj_virt_size - 1);
     }
 }
 
@@ -245,8 +653,12 @@ wd76c10_split_recalc(wd76c10_t *dev)
     uint32_t split_size = ((sp_size - 1) * 65536);
     ram_bank_t *rb = &(dev->ram_banks[4]);
 
-    if (rb->enable && (rb->virt_size != 0x00000000))
-        mem_set_mem_state(rb->virt_addr, rb->virt_size, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+    if (rb->enable && (rb->virt_size != 0x00000000)) {
+        wd76c10_set_mem_state(dev, rb->virt_addr, rb->virt_size, MEM_READ_EXTANY | MEM_WRITE_EXTANY, 0);
+
+        if (cpu_use_exec)
+            wd76c10_recalc_exec(dev, rb->virt_addr, rb->virt_size);
+    }
     rb->virt_addr = ((uint32_t) ((dev->split_sa >> 2) & 0x3f)) << 19;
     switch (sp_size) {
         case 0x00:
@@ -257,8 +669,12 @@ wd76c10_split_recalc(wd76c10_t *dev)
             break;
     }
     rb->enable = !!sp_size;
-    if (rb->enable && (rb->virt_size != 0x00000000))
-        mem_set_mem_state(rb->virt_addr, rb->virt_size, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+    if (rb->enable && (rb->virt_size != 0x00000000)) {
+        wd76c10_set_mem_state(dev, rb->virt_addr, rb->virt_size, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL, 1);
+
+        if (cpu_use_exec)
+            wd76c10_recalc_exec(dev, rb->virt_addr, rb->virt_size);
+    }
 }
 
 static void
@@ -284,10 +700,13 @@ wd76c10_dis_mem_recalc(wd76c10_t *dev)
     }
 
     dev->mem_top = mem_top;
+
+    if (cpu_use_exec)
+        wd76c10_recalc_exec(dev, 128 * 1024, (640 - 128) * 1024);
 }
 
 static void
-wd76c10_shadow_ram_do_recalc(uint8_t *new_st, uint8_t *old_st, uint8_t min, uint8_t max, uint32_t addr)
+wd76c10_shadow_ram_do_recalc(wd76c10_t *dev, uint8_t *new_st, uint8_t *old_st, uint8_t min, uint8_t max, uint32_t addr)
 {
     uint32_t base = 0x00000000;
     int flags = 0;
@@ -300,7 +719,9 @@ wd76c10_shadow_ram_do_recalc(uint8_t *new_st, uint8_t *old_st, uint8_t min, uint
                     ((new_st[i] & 0x04) ? MEM_READ_ROMCS : MEM_READ_EXTERNAL);
             flags |= (new_st[i] & 0x02) ? MEM_WRITE_INTERNAL :
                      ((new_st[i] & 0x04) ? MEM_WRITE_ROMCS : MEM_WRITE_EXTERNAL);
-            mem_set_mem_state_both(base, 0x00004000, flags);
+            wd76c10_set_mem_state(dev, base, 0x00004000, flags, new_st[i] & 0x01);
+            if (cpu_use_exec)
+                wd76c10_recalc_exec(dev, base, 0x000040000);
         }
     }
 }
@@ -366,11 +787,11 @@ wd76c10_shadow_ram_recalc(wd76c10_t *dev)
             break;
     }
 
-   wd76c10_shadow_ram_do_recalc(vbios_states, dev->vbios_states, 0, 4, 0x000c0000);
-   wd76c10_shadow_ram_do_recalc(bios_states, dev->bios_states, 0, 8, 0x000e0000);
+   wd76c10_shadow_ram_do_recalc(dev, vbios_states, dev->vbios_states, 0, 4, 0x000c0000);
+   wd76c10_shadow_ram_do_recalc(dev, bios_states, dev->bios_states, 0, 8, 0x000e0000);
 
    /* This is not shadowed, but there is a CSPROM# (= ROMCS#) toggle. */
-   wd76c10_shadow_ram_do_recalc(high_bios_states, dev->high_bios_states, 0, 8, 0x00fe0000);
+   wd76c10_shadow_ram_do_recalc(dev, high_bios_states, dev->high_bios_states, 0, 8, 0x00fe0000);
 
    flushmmucache_nopc();
 }
@@ -385,9 +806,15 @@ wd76c10_high_mem_wp_recalc(wd76c10_t *dev)
     /* ACCESS_NORMAL means both ACCESS_BUS and ACCESS_CPU are set. */
     mem_set_wp(dev->hmwp_base, size, ACCESS_NORMAL, 0);
 
+    if (cpu_use_exec)
+        wd76c10_recalc_exec(dev, dev->hmwp_base, size);
+
     size = 0x01000000 - base;
     mem_set_wp(base, size, ACCESS_NORMAL, hm_wp);
 
+    if (cpu_use_exec)
+        wd76c10_recalc_exec(dev, base, size);
+
     dev->hmwp_base = base;
 }
 
@@ -399,7 +826,10 @@ wd76c10_pf_loc_reset(wd76c10_t *dev)
     for (uint8_t i = 0x031; i <= 0x03b; i++) {
         dev->mem_pages[i] = 0xff;
         base = ((uint32_t) i) << 14;
-        mem_set_mem_state(base, 0x00004000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+        wd76c10_set_mem_state(dev, base, 0x00004000, MEM_READ_EXTANY | MEM_WRITE_EXTANY, 0);
+
+        if (cpu_use_exec)
+            wd76c10_recalc_exec(dev, base, 0x00004000);
     }
 
     /* Re-apply any ROMCS#, etc. flags. */
@@ -414,14 +844,18 @@ wd76c10_pf_loc_recalc(wd76c10_t *dev)
     uint8_t ems_page;
     uint32_t base;
 
-    for (uint8_t i = (0x031 + pf_loc); i <= (0x037 + pf_loc); i++) {
+    for (uint16_t i = (0x031 + pf_loc); i <= (0x037 + pf_loc); i++) {
         ems_page = (i - 0x10) & 0xf7;
         dev->mem_pages[i] = ems_page;
         base = ((uint32_t) i) << 14;
         dev->ems_pages[ems_page].virt = base;
-        if ((ems_en >= 0x02) && dev->ems_pages[ems_page].enabled)
-            mem_set_mem_state(dev->ems_pages[ems_page].virt, 0x00004000,
-                              MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+        if ((ems_en >= 0x02) && dev->ems_pages[ems_page].enabled) {
+            wd76c10_set_mem_state(dev, dev->ems_pages[ems_page].virt,
+                                  0x00004000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL, 1);
+
+            if (cpu_use_exec)
+                wd76c10_recalc_exec(dev, dev->ems_pages[ems_page].virt, 0x00004000);
+        }
     }
 }
 
@@ -436,9 +870,98 @@ wd76c10_low_pages_recalc(wd76c10_t *dev)
         dev->mem_pages[i] = ems_page;
         base = ((uint32_t) i) << 14;
         dev->ems_pages[ems_page].virt = base;
+
+        if (cpu_use_exec)
+            wd76c10_recalc_exec(dev, dev->ems_pages[ems_page].virt, 0x00004000);
     }
 }
 
+static void
+wd73c30_reset(wd76c10_t *dev)
+{
+    dev->addr_sel = 0x00;
+
+    dev->addr_regs[0x00] = 0x00;
+    dev->addr_regs[0x01] = 0x00;
+    dev->addr_regs[0x05] = 0x00;
+
+    serial_set_type(dev->uart[0], SERIAL_16450);
+    serial_set_type(dev->uart[1], SERIAL_16450);
+
+    serial_set_clock_src(dev->uart[1], 1843200.0);
+    serial_set_clock_src(dev->uart[0], 1843200.0);
+
+    lpt_set_ext(dev->lpt, 0);
+}
+
+static void
+wd76c30_write(uint16_t port, uint8_t val, void *priv)
+{
+    wd76c10_t *dev = (wd76c10_t *) priv;
+
+    switch (port & 0x0007) {
+        case 0x0003:
+            dev->addr_sel = val;
+            switch (val & 0x60) {
+                case 0x00:
+                    serial_set_clock_src(dev->uart[1], 1843200.0);
+                    break;
+                case 0x20:
+                    serial_set_clock_src(dev->uart[1], 3072000.0);
+                    break;
+                case 0x40:
+                    serial_set_clock_src(dev->uart[1], 6000000.0);    /* What is MSTRX1? */
+                    break;
+                case 0x60:
+                    serial_set_clock_src(dev->uart[1], 8000000.0);
+                    break;
+            }
+            switch (val & 0x18) {
+                case 0x00:
+                    serial_set_clock_src(dev->uart[0], 1843200.0);
+                    break;
+                case 0x08:
+                    serial_set_clock_src(dev->uart[0], 3072000.0);
+                    break;
+                case 0x10:
+                    serial_set_clock_src(dev->uart[0], 6000000.0);    /* What is MSTRX1? */
+                    break;
+                case 0x18:
+                    serial_set_clock_src(dev->uart[0], 8000000.0);
+                    break;
+            }
+            break;
+        case 0x0007:
+            dev->addr_regs[dev->addr_sel & 0x07] = val;
+            switch (dev->addr_sel & 0x07) {
+                case 0x05:
+                    lpt_set_ext(dev->lpt, !!(val & 0x02));
+                    serial_set_type(dev->uart[0], (val & 0x01) ? SERIAL_16550 : SERIAL_16450);
+                    serial_set_type(dev->uart[1], (val & 0x01) ? SERIAL_16550 : SERIAL_16450);
+                    break;
+            }
+            break;
+    }
+}
+
+static uint8_t
+wd76c30_read(uint16_t port, void *priv)
+{
+    wd76c10_t *dev = (wd76c10_t *) priv;
+    uint8_t    ret = 0xff;
+
+    switch (port & 0x0007) {
+        case 0x0003:
+            ret = dev->addr_sel;
+            break;
+        case 0x0007:
+            ret = dev->addr_regs[dev->addr_sel & 0x07];
+            break;
+    }
+
+    return ret;
+}
+
 static void
 wd76c10_ser_par_cs_recalc(wd76c10_t *dev)
 {
@@ -477,21 +1000,24 @@ wd76c10_ser_par_cs_recalc(wd76c10_t *dev)
     }
 
     /* LPT */
-    lpt1_remove();
+    lpt_port_remove(dev->lpt);
+    if (dev->lpt_base != 0x0000)
+        io_removehandler(dev->lpt_base, 0x0008, wd76c30_read, NULL, NULL, wd76c30_write, NULL, NULL, dev);
+    dev->lpt_base = 0x0000;
     switch ((dev->ser_par_cs >> 9) & 0x03) {
         case 1:
-            lpt1_init(0x3bc);
-            lpt1_irq(7);
+            dev->lpt_base = LPT_MDA_ADDR;
             break;
         case 2:
-            lpt1_init(0x378);
-            lpt1_irq(7);
+            dev->lpt_base = LPT1_ADDR;
             break;
         case 3:
-            lpt1_init(0x278);
-            lpt1_irq(7);
+            dev->lpt_base = LPT2_ADDR;
             break;
     }
+    io_sethandler(dev->lpt_base, 0x0008, wd76c30_read, NULL, NULL, wd76c30_write, NULL, NULL, dev);
+    lpt_port_setup(dev->lpt, dev->lpt_base);
+    lpt_port_irq(dev->lpt, LPT1_IRQ);
 }
 
 static void
@@ -739,8 +1265,8 @@ wd76c10_inw(uint16_t port, void *priv)
         case 0xd072:
             ret = (serial_read(0x0002, dev->uart[0]) & 0xc0) << 8;
             ret |= (serial_read(0x0002, dev->uart[1]) & 0xc0) << 6;
-            ret |= (lpt_read_port(0, 0x0002) & 0x0f) << 8;
-            ret |= lpt_read_port(0, 0x0000);
+            ret |= (lpt_read_port(dev->lpt, 0x0002) & 0x0f) << 8;
+            ret |= lpt_read_port(dev->lpt, 0x0000);
             break;
 
         case 0xe072:
@@ -754,7 +1280,7 @@ wd76c10_inw(uint16_t port, void *priv)
             break;
 
         case 0xfc72:
-            ret = ((lpt_read_status(0) & 0x20) >> 2);
+            ret = ((lpt_read_status(dev->lpt) & 0x20) >> 2);
             ret |= (((uint16_t) dma_m) << 4);
             ret |= dev->toggle;
             dev->toggle ^= 0x8000;
@@ -805,6 +1331,8 @@ wd76c10_reset(void *priv)
 
     nvr_lock_set(0x38, 0x08, 0x00, dev->nvr);
 
+    wd73c30_reset(dev);
+
     wd76c10_banks_recalc(dev);
     wd76c10_split_recalc(dev);
     wd76c10_dis_mem_recalc(dev);
@@ -818,12 +1346,12 @@ wd76c10_reset(void *priv)
 
 
 static void *
-wd76c10_init(const device_t *info)
+wd76c10_init(UNUSED(const device_t *info))
 {
     wd76c10_t *dev = (wd76c10_t *) calloc(1, sizeof(wd76c10_t));
     uint32_t total_mem = mem_size << 10;
     uint32_t accum_mem = 0x00000000;
-    ram_bank_t *rb;
+    ram_bank_t *rb = NULL;
 
     /* Calculate the physical RAM banks. */
     for (uint8_t i = 0; i < 4; i++) {
@@ -837,11 +1365,22 @@ wd76c10_init(const device_t *info)
             }
         }
         if (size != 0x00000000) {
+            rb->phys_on   = 1;
             rb->phys_addr = accum_mem;
             rb->phys_size = size;
+            wd76c10_log("Bank %i size: %5i KiB, starting at %5i KiB\n", i, rb->phys_size >> 10, rb->phys_addr >> 10);
             total_mem -= size;
             accum_mem += size;
-        }
+        } else
+            rb->phys_addr = WD76C10_ADDR_INVALID;
+    }
+
+    if (mem_size == 3072) {
+        /* Reorganize the banks a bit so, we have 2048, 0, 512, 512. */
+        ram_bank_t rt = dev->ram_banks[3];
+        dev->ram_banks[3] = dev->ram_banks[2];
+        dev->ram_banks[2] = dev->ram_banks[1];
+        dev->ram_banks[1] = rt;
     }
 
     rb = &(dev->ram_banks[4]);
@@ -858,6 +1397,7 @@ wd76c10_init(const device_t *info)
     dev->nvr = device_add(&amstrad_megapc_nvr_device);
     dev->uart[0] = device_add_inst(&ns16450_device, 1);
     dev->uart[1] = device_add_inst(&ns16450_device, 2);
+    dev->lpt = device_add_inst(&lpt_port_device, 1);
     dev->fdc = device_add(&fdc_at_device);
     device_add(&ide_isa_device);
 
@@ -948,6 +1488,8 @@ wd76c10_init(const device_t *info)
     mem_mapping_disable(&ram_high_mapping);
     mem_mapping_enable(&dev->ram_mapping);
 
+    memset(dev->ram_state, 0x00, sizeof(dev->ram_state));
+
     return dev;
 }
 
@@ -959,7 +1501,7 @@ const device_t wd76c10_device = {
     .init          = wd76c10_init,
     .close         = wd76c10_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/codegen/CMakeLists.txt b/src/codegen/CMakeLists.txt
index 3cb9de6ca..3d000c98d 100644
--- a/src/codegen/CMakeLists.txt
+++ b/src/codegen/CMakeLists.txt
@@ -9,19 +9,28 @@
 #          CMake build script.
 #
 # Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
 #
 #          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2024      Jasmine Iwanek.
 #
 
 if(DYNAREC)
-    add_library(dynarec OBJECT codegen.c codegen_ops.c)
+    add_library(dynarec OBJECT
+        codegen.c
+        codegen_ops.c
+    )
 
     if(ARCH STREQUAL "i386")
-        target_sources(dynarec PRIVATE codegen_x86.c
-            codegen_accumulate_x86.c)
+        target_sources(dynarec PRIVATE
+            codegen_x86.c
+            codegen_accumulate_x86.c
+        )
     elseif(ARCH STREQUAL "x86_64")
-        target_sources(dynarec PRIVATE codegen_x86-64.c
-            codegen_accumulate_x86-64.c)
+        target_sources(dynarec PRIVATE
+            codegen_x86-64.c
+            codegen_accumulate_x86-64.c
+        )
     else()
         message(SEND_ERROR
             "Dynarec is incompatible with target platform ${ARCH}")
diff --git a/src/codegen/codegen.h b/src/codegen/codegen.h
index 6d30211a6..d020fc57f 100644
--- a/src/codegen/codegen.h
+++ b/src/codegen/codegen.h
@@ -311,6 +311,7 @@ extern codegen_timing_t codegen_timing_686;
 extern codegen_timing_t codegen_timing_486;
 extern codegen_timing_t codegen_timing_winchip;
 extern codegen_timing_t codegen_timing_winchip2;
+extern codegen_timing_t codegen_timing_k5;
 extern codegen_timing_t codegen_timing_k6;
 extern codegen_timing_t codegen_timing_p6;
 
diff --git a/src/codegen/codegen_ops.c b/src/codegen/codegen_ops.c
index a81eef67e..c8e258e78 100644
--- a/src/codegen/codegen_ops.c
+++ b/src/codegen/codegen_ops.c
@@ -12,6 +12,7 @@
 #include "x86_flags.h"
 #include "x86seg_common.h"
 #include "x86seg.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include "386_common.h"
 #include "cpu.h"
diff --git a/src/codegen/codegen_ops_arith.h b/src/codegen/codegen_ops_arith.h
index 28ee6d06c..50ef4310f 100644
--- a/src/codegen/codegen_ops_arith.h
+++ b/src/codegen/codegen_ops_arith.h
@@ -1,5 +1,5 @@
 static uint32_t
-ropINC_rw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropINC_rw(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg;
 
@@ -22,7 +22,7 @@ ropINC_rw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
     return op_pc;
 }
 static uint32_t
-ropINC_rl(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropINC_rl(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg;
 
@@ -45,7 +45,7 @@ ropINC_rl(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
     return op_pc;
 }
 static uint32_t
-ropDEC_rw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropDEC_rw(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg;
 
@@ -68,7 +68,7 @@ ropDEC_rw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
     return op_pc;
 }
 static uint32_t
-ropDEC_rl(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropDEC_rl(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg;
 
@@ -93,7 +93,7 @@ ropDEC_rl(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
 
 #define ROP_ARITH_RMW(name, op, writeback)                                                                   \
     static uint32_t                                                                                          \
-    rop##name##_b_rmw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
+    rop##name##_b_rmw(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block)) \
     {                                                                                                        \
         int     src_reg;                                                                                     \
         int     dst_reg;                                                                                     \
@@ -129,7 +129,7 @@ ropDEC_rl(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
         return op_pc + 1;                                                                                    \
     }                                                                                                        \
     static uint32_t                                                                                          \
-    rop##name##_w_rmw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
+    rop##name##_w_rmw(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block)) \
     {                                                                                                        \
         int     src_reg;                                                                                     \
         int     dst_reg;                                                                                     \
@@ -165,7 +165,7 @@ ropDEC_rl(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
         return op_pc + 1;                                                                                    \
     }                                                                                                        \
     static uint32_t                                                                                          \
-    rop##name##_l_rmw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
+    rop##name##_l_rmw(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block)) \
     {                                                                                                        \
         int     src_reg;                                                                                     \
         int     dst_reg;                                                                                     \
@@ -203,7 +203,7 @@ ropDEC_rl(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
 
 #define ROP_ARITH_RM(name, op, writeback)                                                                   \
     static uint32_t                                                                                         \
-    rop##name##_b_rm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
+    rop##name##_b_rm(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block)) \
     {                                                                                                       \
         int src_reg;                                                                                        \
         int dst_reg;                                                                                        \
@@ -233,7 +233,7 @@ ropDEC_rl(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
         return op_pc + 1;                                                                                   \
     }                                                                                                       \
     static uint32_t                                                                                         \
-    rop##name##_w_rm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
+    rop##name##_w_rm(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block)) \
     {                                                                                                       \
         int src_reg;                                                                                        \
         int dst_reg;                                                                                        \
@@ -263,7 +263,7 @@ ropDEC_rl(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
         return op_pc + 1;                                                                                   \
     }                                                                                                       \
     static uint32_t                                                                                         \
-    rop##name##_l_rm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
+    rop##name##_l_rm(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block)) \
     {                                                                                                       \
         int src_reg;                                                                                        \
         int dst_reg;                                                                                        \
@@ -299,7 +299,7 @@ ROP_ARITH_RM(ADD, ADD, 1)
 ROP_ARITH_RM(SUB, SUB, 1)
 
 static uint32_t
-ropCMP_b_rm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropCMP_b_rm(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int src_reg;
     int dst_reg;
@@ -326,7 +326,7 @@ ropCMP_b_rm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, c
     return op_pc + 1;
 }
 static uint32_t
-ropCMP_w_rm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropCMP_w_rm(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int src_reg;
     int dst_reg;
@@ -353,7 +353,7 @@ ropCMP_w_rm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, c
     return op_pc + 1;
 }
 static uint32_t
-ropCMP_l_rm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropCMP_l_rm(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int src_reg;
     int dst_reg;
@@ -381,7 +381,7 @@ ropCMP_l_rm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, c
 }
 
 static uint32_t
-ropCMP_b_rmw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropCMP_b_rmw(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int src_reg;
     int dst_reg;
@@ -408,7 +408,7 @@ ropCMP_b_rmw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 1;
 }
 static uint32_t
-ropCMP_w_rmw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropCMP_w_rmw(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int src_reg;
     int dst_reg;
@@ -435,7 +435,7 @@ ropCMP_w_rmw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 1;
 }
 static uint32_t
-ropCMP_l_rmw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropCMP_l_rmw(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int src_reg;
     int dst_reg;
@@ -463,7 +463,7 @@ ropCMP_l_rmw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
 }
 
 static uint32_t
-ropADD_AL_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropADD_AL_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_B(REG_AL);
 
@@ -478,7 +478,7 @@ ropADD_AL_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 1;
 }
 static uint32_t
-ropADD_AX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropADD_AX_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_W(REG_AX);
 
@@ -493,7 +493,7 @@ ropADD_AX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 2;
 }
 static uint32_t
-ropADD_EAX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropADD_EAX_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_L(REG_EAX);
 
@@ -510,7 +510,7 @@ ropADD_EAX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc
 }
 
 static uint32_t
-ropCMP_AL_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropCMP_AL_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_B(REG_AL);
 
@@ -525,7 +525,7 @@ ropCMP_AL_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 1;
 }
 static uint32_t
-ropCMP_AX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropCMP_AX_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_W(REG_AX);
 
@@ -540,7 +540,7 @@ ropCMP_AX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 2;
 }
 static uint32_t
-ropCMP_EAX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropCMP_EAX_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_L(REG_EAX);
 
@@ -557,7 +557,7 @@ ropCMP_EAX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc
 }
 
 static uint32_t
-ropSUB_AL_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropSUB_AL_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_B(REG_AL);
 
@@ -572,7 +572,7 @@ ropSUB_AL_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 1;
 }
 static uint32_t
-ropSUB_AX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropSUB_AX_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_W(REG_AX);
 
@@ -587,7 +587,7 @@ ropSUB_AX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 2;
 }
 static uint32_t
-ropSUB_EAX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropSUB_EAX_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_L(REG_EAX);
 
@@ -604,7 +604,7 @@ ropSUB_EAX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc
 }
 
 static uint32_t
-rop80(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+rop80(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int      host_reg;
     uint32_t imm;
@@ -679,7 +679,7 @@ rop80(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblo
 }
 
 static uint32_t
-rop81_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+rop81_w(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int      host_reg;
     uint32_t imm;
@@ -753,7 +753,7 @@ rop81_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
     return op_pc + 3;
 }
 static uint32_t
-rop81_l(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+rop81_l(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int      host_reg;
     uint32_t imm;
@@ -827,7 +827,7 @@ rop81_l(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
 }
 
 static uint32_t
-rop83_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+rop83_w(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int      host_reg;
     uint32_t imm;
@@ -904,7 +904,7 @@ rop83_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
     return op_pc + 2;
 }
 static uint32_t
-rop83_l(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+rop83_l(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int      host_reg;
     uint32_t imm;
diff --git a/src/codegen/codegen_ops_fpu.h b/src/codegen/codegen_ops_fpu.h
index 1021cc742..a82b10d82 100644
--- a/src/codegen/codegen_ops_fpu.h
+++ b/src/codegen/codegen_ops_fpu.h
@@ -1,5 +1,5 @@
 static uint32_t
-ropFXCH(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFXCH(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
 
@@ -9,7 +9,7 @@ ropFXCH(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
 }
 
 static uint32_t
-ropFLD(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFLD(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
 
@@ -19,7 +19,7 @@ ropFLD(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codebl
 }
 
 static uint32_t
-ropFST(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFST(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
 
@@ -28,7 +28,7 @@ ropFST(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codebl
     return op_pc;
 }
 static uint32_t
-ropFSTP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFSTP(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
 
@@ -39,7 +39,7 @@ ropFSTP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
 }
 
 static uint32_t
-ropFLDs(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFLDs(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg;
 
@@ -57,7 +57,7 @@ ropFLDs(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
     return op_pc + 1;
 }
 static uint32_t
-ropFLDd(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFLDd(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg;
 
@@ -76,7 +76,7 @@ ropFLDd(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
 }
 
 static uint32_t
-ropFILDw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFILDw(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg;
 
@@ -94,7 +94,7 @@ ropFILDw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
     return op_pc + 1;
 }
 static uint32_t
-ropFILDl(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFILDl(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg;
 
@@ -112,7 +112,7 @@ ropFILDl(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
     return op_pc + 1;
 }
 static uint32_t
-ropFILDq(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFILDq(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg;
 
@@ -133,7 +133,7 @@ ropFILDq(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
 }
 
 static uint32_t
-ropFSTs(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFSTs(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg;
     int     host_reg;
@@ -153,7 +153,7 @@ ropFSTs(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
     return op_pc + 1;
 }
 static uint32_t
-ropFSTd(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFSTd(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg;
     int     host_reg1;
@@ -194,24 +194,28 @@ ropFSTPd(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
     return new_pc;
 }
 
-#define ropFarith(name, size, load, op)                                                                     \
-    static uint32_t                                                                                         \
-    ropF##name##size(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
-    {                                                                                                       \
-        x86seg *target_seg;                                                                                 \
-                                                                                                            \
-        FP_ENTER();                                                                                         \
-        op_pc--;                                                                                            \
-        target_seg = FETCH_EA(op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32);                                \
-                                                                                                            \
-        STORE_IMM_ADDR_L((uintptr_t) &cpu_state.oldpc, op_old_pc);                                          \
-                                                                                                            \
-        CHECK_SEG_READ(target_seg);                                                                         \
-        load(target_seg);                                                                                   \
-                                                                                                            \
-        op(FPU_##name);                                                                                     \
-                                                                                                            \
-        return op_pc + 1;                                                                                   \
+#define ropFarith(name, size, load, op)                                      \
+    static uint32_t                                                          \
+    ropF##name##size(UNUSED(uint8_t opcode),                                 \
+                     uint32_t fetchdat,                                      \
+                     uint32_t op_32,                                         \
+                     uint32_t op_pc,                                         \
+                     UNUSED(codeblock_t *block))                             \
+    {                                                                        \
+        x86seg *target_seg;                                                  \
+                                                                             \
+        FP_ENTER();                                                          \
+        op_pc--;                                                             \
+        target_seg = FETCH_EA(op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32); \
+                                                                             \
+        STORE_IMM_ADDR_L((uintptr_t) &cpu_state.oldpc, op_old_pc);           \
+                                                                             \
+        CHECK_SEG_READ(target_seg);                                          \
+        load(target_seg);                                                    \
+                                                                             \
+        op(FPU_##name);                                                      \
+                                                                             \
+        return op_pc + 1;                                                    \
     }
 
 ropFarith(ADD, s, MEM_LOAD_ADDR_EA_L, FP_OP_S);
@@ -239,32 +243,40 @@ ropFarith(MUL, il, MEM_LOAD_ADDR_EA_L, FP_OP_IL);
 ropFarith(SUB, il, MEM_LOAD_ADDR_EA_L, FP_OP_IL);
 ropFarith(SUBR, il, MEM_LOAD_ADDR_EA_L, FP_OP_IL);
 
-#define ropFcompare(name, size, load, op)                                                                                      \
-    static uint32_t                                                                                                            \
-    ropF##name##size(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)                    \
-    {                                                                                                                          \
-        x86seg *target_seg;                                                                                                    \
-                                                                                                                               \
-        FP_ENTER();                                                                                                            \
-        op_pc--;                                                                                                               \
-        target_seg = FETCH_EA(op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32);                                                   \
-                                                                                                                               \
-        STORE_IMM_ADDR_L((uintptr_t) &cpu_state.oldpc, op_old_pc);                                                             \
-                                                                                                                               \
-        CHECK_SEG_READ(target_seg);                                                                                            \
-        load(target_seg);                                                                                                      \
-                                                                                                                               \
-        op();                                                                                                                  \
-                                                                                                                               \
-        return op_pc + 1;                                                                                                      \
-    }                                                                                                                          \
-    static uint32_t ropF##name##P##size(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
-    {                                                                                                                          \
-        uint32_t new_pc = ropF##name##size(opcode, fetchdat, op_32, op_pc, block);                                             \
-                                                                                                                               \
-        FP_POP();                                                                                                              \
-                                                                                                                               \
-        return new_pc;                                                                                                         \
+#define ropFcompare(name, size, load, op)                                          \
+    static uint32_t                                                                \
+    ropF##name##size(UNUSED(uint8_t opcode),                                       \
+                     uint32_t fetchdat,                                            \
+                     uint32_t op_32,                                               \
+                     uint32_t op_pc,                                               \
+                     UNUSED(codeblock_t *block))                                   \
+    {                                                                              \
+        x86seg *target_seg;                                                        \
+                                                                                   \
+        FP_ENTER();                                                                \
+        op_pc--;                                                                   \
+        target_seg = FETCH_EA(op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32);       \
+                                                                                   \
+        STORE_IMM_ADDR_L((uintptr_t) &cpu_state.oldpc, op_old_pc);                 \
+                                                                                   \
+        CHECK_SEG_READ(target_seg);                                                \
+        load(target_seg);                                                          \
+                                                                                   \
+        op();                                                                      \
+                                                                                   \
+        return op_pc + 1;                                                          \
+    }                                                                              \
+    static uint32_t ropF##name##P##size(uint8_t opcode,                            \
+                                        uint32_t fetchdat,                         \
+                                        uint32_t op_32,                            \
+                                        uint32_t op_pc,                            \
+                                        codeblock_t *block)                        \
+    {                                                                              \
+        uint32_t new_pc = ropF##name##size(opcode, fetchdat, op_32, op_pc, block); \
+                                                                                   \
+        FP_POP();                                                                  \
+                                                                                   \
+        return new_pc;                                                             \
     }
 
 ropFcompare(COM, s, MEM_LOAD_ADDR_EA_L, FP_COMPARE_S);
@@ -348,7 +360,7 @@ ropFSUBs(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
 #endif
 
 static uint32_t
-ropFADD(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFADD(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_OP_REG(FPU_ADD, 0, opcode & 7);
@@ -356,7 +368,7 @@ ropFADD(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
     return op_pc;
 }
 static uint32_t
-ropFCOM(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFCOM(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_COMPARE_REG(0, opcode & 7);
@@ -364,7 +376,7 @@ ropFCOM(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
     return op_pc;
 }
 static uint32_t
-ropFDIV(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFDIV(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_OP_REG(FPU_DIV, 0, opcode & 7);
@@ -372,7 +384,7 @@ ropFDIV(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
     return op_pc;
 }
 static uint32_t
-ropFDIVR(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFDIVR(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_OP_REG(FPU_DIVR, 0, opcode & 7);
@@ -380,7 +392,7 @@ ropFDIVR(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
     return op_pc;
 }
 static uint32_t
-ropFMUL(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFMUL(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_OP_REG(FPU_MUL, 0, opcode & 7);
@@ -388,7 +400,7 @@ ropFMUL(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
     return op_pc;
 }
 static uint32_t
-ropFSUB(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFSUB(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_OP_REG(FPU_SUB, 0, opcode & 7);
@@ -396,7 +408,7 @@ ropFSUB(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
     return op_pc;
 }
 static uint32_t
-ropFSUBR(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFSUBR(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_OP_REG(FPU_SUBR, 0, opcode & 7);
@@ -405,7 +417,7 @@ ropFSUBR(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
 }
 
 static uint32_t
-ropFADDr(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFADDr(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_OP_REG(FPU_ADD, opcode & 7, 0);
@@ -413,7 +425,7 @@ ropFADDr(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
     return op_pc;
 }
 static uint32_t
-ropFDIVr(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFDIVr(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_OP_REG(FPU_DIV, opcode & 7, 0);
@@ -421,7 +433,7 @@ ropFDIVr(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
     return op_pc;
 }
 static uint32_t
-ropFDIVRr(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFDIVRr(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_OP_REG(FPU_DIVR, opcode & 7, 0);
@@ -429,7 +441,7 @@ ropFDIVRr(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
     return op_pc;
 }
 static uint32_t
-ropFMULr(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFMULr(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_OP_REG(FPU_MUL, opcode & 7, 0);
@@ -437,7 +449,7 @@ ropFMULr(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
     return op_pc;
 }
 static uint32_t
-ropFSUBr(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFSUBr(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_OP_REG(FPU_SUB, opcode & 7, 0);
@@ -445,7 +457,7 @@ ropFSUBr(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
     return op_pc;
 }
 static uint32_t
-ropFSUBRr(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFSUBRr(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_OP_REG(FPU_SUBR, opcode & 7, 0);
@@ -454,7 +466,7 @@ ropFSUBRr(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
 }
 
 static uint32_t
-ropFADDP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFADDP(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_OP_REG(FPU_ADD, opcode & 7, 0);
@@ -463,7 +475,7 @@ ropFADDP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
     return op_pc;
 }
 static uint32_t
-ropFCOMP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFCOMP(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_COMPARE_REG(0, opcode & 7);
@@ -472,7 +484,7 @@ ropFCOMP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
     return op_pc;
 }
 static uint32_t
-ropFDIVP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFDIVP(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_OP_REG(FPU_DIV, opcode & 7, 0);
@@ -481,7 +493,7 @@ ropFDIVP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
     return op_pc;
 }
 static uint32_t
-ropFDIVRP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFDIVRP(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_OP_REG(FPU_DIVR, opcode & 7, 0);
@@ -490,7 +502,7 @@ ropFDIVRP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
     return op_pc;
 }
 static uint32_t
-ropFMULP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFMULP(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_OP_REG(FPU_MUL, opcode & 7, 0);
@@ -499,7 +511,7 @@ ropFMULP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
     return op_pc;
 }
 static uint32_t
-ropFSUBP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFSUBP(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_OP_REG(FPU_SUB, opcode & 7, 0);
@@ -508,7 +520,7 @@ ropFSUBP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
     return op_pc;
 }
 static uint32_t
-ropFSUBRP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFSUBRP(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_OP_REG(FPU_SUBR, opcode & 7, 0);
@@ -518,7 +530,7 @@ ropFSUBRP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
 }
 
 static uint32_t
-ropFCOMPP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFCOMPP(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_COMPARE_REG(0, 1);
@@ -528,7 +540,7 @@ ropFCOMPP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
 }
 
 static uint32_t
-ropFSTSW_AX(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFSTSW_AX(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg;
 
@@ -540,7 +552,7 @@ ropFSTSW_AX(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, c
 }
 
 static uint32_t
-ropFISTw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFISTw(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg;
     int     host_reg;
@@ -560,7 +572,7 @@ ropFISTw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
     return op_pc + 1;
 }
 static uint32_t
-ropFISTl(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFISTl(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg;
     int     host_reg;
@@ -599,7 +611,7 @@ ropFISTPl(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
     return new_pc;
 }
 static uint32_t
-ropFISTPq(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFISTPq(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg;
     int     host_reg1;
@@ -623,7 +635,7 @@ ropFISTPq(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
 }
 
 static uint32_t
-ropFLDCW(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFLDCW(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg;
 
@@ -640,7 +652,7 @@ ropFLDCW(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
     return op_pc + 1;
 }
 static uint32_t
-ropFSTCW(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFSTCW(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int     host_reg;
     x86seg *target_seg;
@@ -658,7 +670,7 @@ ropFSTCW(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
 }
 
 static uint32_t
-ropFCHS(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFCHS(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_FCHS();
@@ -666,16 +678,21 @@ ropFCHS(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
     return op_pc;
 }
 
-#define opFLDimm(name, v)                                                                               \
-    static uint32_t                                                                                     \
-    ropFLD##name(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
-    {                                                                                                   \
-        static double fp_imm = v;                                                                       \
-                                                                                                        \
-        FP_ENTER();                                                                                     \
-        FP_LOAD_IMM_Q(*(uint64_t *) &fp_imm);                                                           \
-                                                                                                        \
-        return op_pc;                                                                                   \
+#define opFLDimm(name, v)                             \
+    static uint32_t                                   \
+    ropFLD##name(UNUSED(uint8_t opcode),              \
+                 UNUSED(uint32_t fetchdat),           \
+                 UNUSED(uint32_t op_32),              \
+                 uint32_t op_pc,                      \
+                 UNUSED(codeblock_t *block))          \
+    {                                                 \
+        static double fp_imm = v;                     \
+        static uint64_t *fptr = (uint64_t *) &fp_imm; \
+                                                      \
+        FP_ENTER();                                   \
+        FP_LOAD_IMM_Q(*fptr);                         \
+                                                      \
+        return op_pc;                                 \
     }
 
 // clang-format off
@@ -688,7 +705,7 @@ opFLDimm(Z, 0.0)
 // clang-format on
 
 static uint32_t
-ropFLDLN2(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
+ropFLDLN2(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     FP_ENTER();
     FP_LOAD_IMM_Q(0x3fe62e42fefa39f0ULL);
diff --git a/src/codegen/codegen_ops_jump.h b/src/codegen/codegen_ops_jump.h
index da16ce03e..4572b623b 100644
--- a/src/codegen/codegen_ops_jump.h
+++ b/src/codegen/codegen_ops_jump.h
@@ -1,5 +1,5 @@
 static uint32_t
-ropJMP_r8(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropJMP_r8(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     uint32_t offset = fetchdat & 0xff;
 
@@ -12,7 +12,7 @@ ropJMP_r8(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
 }
 
 static uint32_t
-ropJMP_r16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropJMP_r16(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     uint16_t offset = fetchdat & 0xffff;
 
@@ -22,7 +22,7 @@ ropJMP_r16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, co
 }
 
 static uint32_t
-ropJMP_r32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropJMP_r32(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     uint32_t offset = fastreadl(cs + op_pc);
 
@@ -32,7 +32,7 @@ ropJMP_r32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, co
 }
 
 static uint32_t
-ropJCXZ(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropJCXZ(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     uint32_t offset = fetchdat & 0xff;
 
@@ -51,7 +51,7 @@ ropJCXZ(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
 }
 
 static uint32_t
-ropLOOP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropLOOP(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     uint32_t offset = fetchdat & 0xff;
 
@@ -214,45 +214,51 @@ BRANCH_COND_S(int pc_offset, uint32_t op_pc, uint32_t offset, int not )
     }
 }
 
-#define ropBRANCH(name, func, not )                   \
-    static uint32_t                                   \
-    rop##name(uint8_t opcode, uint32_t fetchdat,      \
-              uint32_t op_32, uint32_t op_pc,         \
-              codeblock_t *block)                     \
-    {                                                 \
-        uint32_t offset = fetchdat & 0xff;            \
-                                                      \
-        if (offset & 0x80)                            \
-            offset |= 0xffffff00;                     \
-                                                      \
-        func(1, op_pc, offset, not );                 \
-                                                      \
-        return op_pc + 1;                             \
-    }                                                 \
-    static uint32_t                                   \
-    rop##name##_w(uint8_t  opcode,                    \
-                  uint32_t fetchdat, uint32_t op_32,  \
-                  uint32_t op_pc, codeblock_t *block) \
-    {                                                 \
-        uint32_t offset = fetchdat & 0xffff;          \
-                                                      \
-        if (offset & 0x8000)                          \
-            offset |= 0xffff0000;                     \
-                                                      \
-        func(2, op_pc, offset, not );                 \
-                                                      \
-        return op_pc + 2;                             \
-    }                                                 \
-    static uint32_t                                   \
-    rop##name##_l(uint8_t  opcode,                    \
-                  uint32_t fetchdat, uint32_t op_32,  \
-                  uint32_t op_pc, codeblock_t *block) \
-    {                                                 \
-        uint32_t offset = fastreadl(cs + op_pc);      \
-                                                      \
-        func(4, op_pc, offset, not );                 \
-                                                      \
-        return op_pc + 4;                             \
+#define ropBRANCH(name, func, not )              \
+    static uint32_t                              \
+    rop##name(UNUSED(uint8_t opcode),            \
+              uint32_t fetchdat,                 \
+              UNUSED(uint32_t op_32),            \
+              uint32_t op_pc,                    \
+              UNUSED(codeblock_t *block))        \
+    {                                            \
+        uint32_t offset = fetchdat & 0xff;       \
+                                                 \
+        if (offset & 0x80)                       \
+            offset |= 0xffffff00;                \
+                                                 \
+        func(1, op_pc, offset, not );            \
+                                                 \
+        return op_pc + 1;                        \
+    }                                            \
+    static uint32_t                              \
+    rop##name##_w(UNUSED(uint8_t opcode),        \
+                  uint32_t fetchdat,             \
+                  UNUSED(uint32_t op_32),        \
+                  uint32_t op_pc,                \
+                  UNUSED(codeblock_t *block))    \
+    {                                            \
+        uint32_t offset = fetchdat & 0xffff;     \
+                                                 \
+        if (offset & 0x8000)                     \
+            offset |= 0xffff0000;                \
+                                                 \
+        func(2, op_pc, offset, not );            \
+                                                 \
+        return op_pc + 2;                        \
+    }                                            \
+    static uint32_t                              \
+    rop##name##_l(UNUSED(uint8_t opcode),        \
+                  UNUSED(uint32_t fetchdat),     \
+                  UNUSED(uint32_t op_32),        \
+                  uint32_t op_pc,                \
+                  UNUSED(codeblock_t *block))    \
+    {                                            \
+        uint32_t offset = fastreadl(cs + op_pc); \
+                                                 \
+        func(4, op_pc, offset, not );            \
+                                                 \
+        return op_pc + 4;                        \
     }
 
 // clang-format off
diff --git a/src/codegen/codegen_ops_logic.h b/src/codegen/codegen_ops_logic.h
index 9f23723e2..2c79c4a2d 100644
--- a/src/codegen/codegen_ops_logic.h
+++ b/src/codegen/codegen_ops_logic.h
@@ -1,6 +1,6 @@
 #define ROP_LOGIC(name, op, writeback)                                                                       \
     static uint32_t                                                                                          \
-    rop##name##_b_rmw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
+    rop##name##_b_rmw(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block)) \
     {                                                                                                        \
         int     src_reg;                                                                                     \
         int     dst_reg;                                                                                     \
@@ -33,7 +33,7 @@
         return op_pc + 1;                                                                                    \
     }                                                                                                        \
     static uint32_t                                                                                          \
-    rop##name##_w_rmw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
+    rop##name##_w_rmw(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block)) \
     {                                                                                                        \
         int     src_reg;                                                                                     \
         int     dst_reg;                                                                                     \
@@ -66,7 +66,7 @@
         return op_pc + 1;                                                                                    \
     }                                                                                                        \
     static uint32_t                                                                                          \
-    rop##name##_l_rmw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
+    rop##name##_l_rmw(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block)) \
     {                                                                                                        \
         int     src_reg;                                                                                     \
         int     dst_reg;                                                                                     \
@@ -99,7 +99,7 @@
         return op_pc + 1;                                                                                    \
     }                                                                                                        \
     static uint32_t                                                                                          \
-    rop##name##_b_rm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)  \
+    rop##name##_b_rm(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block)) \
     {                                                                                                        \
         int src_reg;                                                                                         \
         int dst_reg;                                                                                         \
@@ -126,7 +126,7 @@
         return op_pc + 1;                                                                                    \
     }                                                                                                        \
     static uint32_t                                                                                          \
-    rop##name##_w_rm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)  \
+    rop##name##_w_rm(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block)) \
     {                                                                                                        \
         int src_reg;                                                                                         \
         int dst_reg;                                                                                         \
@@ -153,7 +153,7 @@
         return op_pc + 1;                                                                                    \
     }                                                                                                        \
     static uint32_t                                                                                          \
-    rop##name##_l_rm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)  \
+    rop##name##_l_rm(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block)) \
     {                                                                                                        \
         int src_reg;                                                                                         \
         int dst_reg;                                                                                         \
@@ -185,7 +185,7 @@ ROP_LOGIC(OR, OR, 1)
 ROP_LOGIC(XOR, XOR, 1)
 
 static uint32_t
-ropTEST_b_rm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropTEST_b_rm(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int src_reg;
     int dst_reg;
@@ -209,7 +209,7 @@ ropTEST_b_rm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 1;
 }
 static uint32_t
-ropTEST_w_rm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropTEST_w_rm(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int src_reg;
     int dst_reg;
@@ -233,7 +233,7 @@ ropTEST_w_rm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 1;
 }
 static uint32_t
-ropTEST_l_rm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropTEST_l_rm(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int src_reg;
     int dst_reg;
@@ -258,7 +258,7 @@ ropTEST_l_rm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
 }
 
 static uint32_t
-ropAND_AL_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropAND_AL_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_B(REG_AL);
 
@@ -270,7 +270,7 @@ ropAND_AL_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 1;
 }
 static uint32_t
-ropAND_AX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropAND_AX_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_W(REG_AX);
 
@@ -282,7 +282,7 @@ ropAND_AX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 2;
 }
 static uint32_t
-ropAND_EAX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropAND_EAX_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_L(REG_EAX);
 
@@ -296,7 +296,7 @@ ropAND_EAX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc
 }
 
 static uint32_t
-ropOR_AL_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropOR_AL_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_B(REG_AL);
 
@@ -308,7 +308,7 @@ ropOR_AL_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 1;
 }
 static uint32_t
-ropOR_AX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropOR_AX_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_W(REG_AX);
 
@@ -320,7 +320,7 @@ ropOR_AX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 2;
 }
 static uint32_t
-ropOR_EAX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropOR_EAX_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_L(REG_EAX);
 
@@ -334,7 +334,7 @@ ropOR_EAX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
 }
 
 static uint32_t
-ropTEST_AL_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropTEST_AL_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_B(REG_AL);
 
@@ -346,7 +346,7 @@ ropTEST_AL_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc
     return op_pc + 1;
 }
 static uint32_t
-ropTEST_AX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropTEST_AX_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_W(REG_AX);
 
@@ -358,7 +358,7 @@ ropTEST_AX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc
     return op_pc + 2;
 }
 static uint32_t
-ropTEST_EAX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropTEST_EAX_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_L(REG_EAX);
 
@@ -372,7 +372,7 @@ ropTEST_EAX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_p
 }
 
 static uint32_t
-ropXOR_AL_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropXOR_AL_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_B(REG_AL);
 
@@ -384,7 +384,7 @@ ropXOR_AL_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 1;
 }
 static uint32_t
-ropXOR_AX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropXOR_AX_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_W(REG_AX);
 
@@ -396,7 +396,7 @@ ropXOR_AX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 2;
 }
 static uint32_t
-ropXOR_EAX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropXOR_EAX_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_L(REG_EAX);
 
@@ -410,7 +410,7 @@ ropXOR_EAX_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc
 }
 
 static uint32_t
-ropF6(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropF6(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg;
     int     host_reg;
@@ -458,7 +458,7 @@ ropF6(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblo
     return 0;
 }
 static uint32_t
-ropF7_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropF7_w(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg  *target_seg;
     int      host_reg;
@@ -506,7 +506,7 @@ ropF7_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
     return 0;
 }
 static uint32_t
-ropF7_l(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropF7_l(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg  *target_seg;
     int      host_reg;
diff --git a/src/codegen/codegen_ops_misc.h b/src/codegen/codegen_ops_misc.h
index 61854ab37..db16dc09e 100644
--- a/src/codegen/codegen_ops_misc.h
+++ b/src/codegen/codegen_ops_misc.h
@@ -1,24 +1,24 @@
 static uint32_t
-ropNOP(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropNOP(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     return op_pc;
 }
 
 static uint32_t
-ropCLD(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropCLD(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     CLEAR_BITS((uintptr_t) &cpu_state.flags, D_FLAG);
     return op_pc;
 }
 static uint32_t
-ropSTD(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropSTD(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     SET_BITS((uintptr_t) &cpu_state.flags, D_FLAG);
     return op_pc;
 }
 
 static uint32_t
-ropCLI(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropCLI(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     if (!IOPLp && (cr4 & (CR4_VME | CR4_PVI)))
         return 0;
@@ -29,7 +29,7 @@ ropCLI(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codebl
     return op_pc;
 }
 static uint32_t
-ropSTI(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropSTI(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     if (!IOPLp && (cr4 & (CR4_VME | CR4_PVI)))
         return 0;
@@ -38,7 +38,7 @@ ropSTI(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codebl
 }
 
 static uint32_t
-ropFE(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFE(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg = NULL;
     int     host_reg;
@@ -88,7 +88,7 @@ ropFE(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblo
 }
 static uint32_t codegen_temp;
 static uint32_t
-ropFF_16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFF_16(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg = NULL;
     int     host_reg;
@@ -175,7 +175,7 @@ ropFF_16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
     return 0;
 }
 static uint32_t
-ropFF_32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropFF_32(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg = NULL;
     int     host_reg;
diff --git a/src/codegen/codegen_ops_mmx.h b/src/codegen/codegen_ops_mmx.h
index 4c5a92c8f..2e07bde77 100644
--- a/src/codegen/codegen_ops_mmx.h
+++ b/src/codegen/codegen_ops_mmx.h
@@ -1,5 +1,5 @@
 static uint32_t
-ropMOVQ_q_mm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOVQ_q_mm(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg1;
     int host_reg2 = 0;
@@ -25,7 +25,7 @@ ropMOVQ_q_mm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
 }
 
 static uint32_t
-ropMOVQ_mm_q(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOVQ_mm_q(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     MMX_ENTER();
 
@@ -50,7 +50,7 @@ ropMOVQ_mm_q(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
 }
 
 static uint32_t
-ropMOVD_l_mm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOVD_l_mm(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg;
 
@@ -74,7 +74,7 @@ ropMOVD_l_mm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 1;
 }
 static uint32_t
-ropMOVD_mm_l(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOVD_mm_l(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     MMX_ENTER();
 
@@ -95,36 +95,40 @@ ropMOVD_mm_l(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 1;
 }
 
-#define MMX_OP(name, func)                                                                      \
-    static uint32_t                                                                             \
-    name(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
-    {                                                                                           \
-        int src_reg1;                                                                           \
-        int src_reg2;                                                                           \
-        int xmm_src;                                                                            \
-        int xmm_dst;                                                                            \
-                                                                                                \
-        MMX_ENTER();                                                                            \
-                                                                                                \
-        if ((fetchdat & 0xc0) == 0xc0) {                                                        \
-            xmm_src = LOAD_MMX_Q_MMX(fetchdat & 7);                                             \
-        } else {                                                                                \
-            x86seg *target_seg = FETCH_EA(op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32);        \
-                                                                                                \
-            STORE_IMM_ADDR_L((uintptr_t) &cpu_state.oldpc, op_old_pc);                          \
-                                                                                                \
-            CHECK_SEG_READ(target_seg);                                                         \
-                                                                                                \
-            MEM_LOAD_ADDR_EA_Q(target_seg);                                                     \
-            src_reg1 = LOAD_Q_REG_1;                                                            \
-            src_reg2 = LOAD_Q_REG_2;                                                            \
-            xmm_src  = LOAD_INT_TO_MMX(src_reg1, src_reg2);                                     \
-        }                                                                                       \
-        xmm_dst = LOAD_MMX_Q_MMX((fetchdat >> 3) & 7);                                          \
-        func(xmm_dst, xmm_src);                                                                 \
-        STORE_MMX_Q_MMX((fetchdat >> 3) & 7, xmm_dst);                                          \
-                                                                                                \
-        return op_pc + 1;                                                                       \
+#define MMX_OP(name, func)                                                               \
+    static uint32_t                                                                      \
+    name(UNUSED(uint8_t opcode),                                                         \
+         uint32_t fetchdat,                                                              \
+         uint32_t op_32,                                                                 \
+         uint32_t op_pc,                                                                 \
+         UNUSED(codeblock_t *block))                                                     \
+    {                                                                                    \
+        int src_reg1;                                                                    \
+        int src_reg2;                                                                    \
+        int xmm_src;                                                                     \
+        int xmm_dst;                                                                     \
+                                                                                         \
+        MMX_ENTER();                                                                     \
+                                                                                         \
+        if ((fetchdat & 0xc0) == 0xc0) {                                                 \
+            xmm_src = LOAD_MMX_Q_MMX(fetchdat & 7);                                      \
+        } else {                                                                         \
+            x86seg *target_seg = FETCH_EA(op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32); \
+                                                                                         \
+            STORE_IMM_ADDR_L((uintptr_t) &cpu_state.oldpc, op_old_pc);                   \
+                                                                                         \
+            CHECK_SEG_READ(target_seg);                                                  \
+                                                                                         \
+            MEM_LOAD_ADDR_EA_Q(target_seg);                                              \
+            src_reg1 = LOAD_Q_REG_1;                                                     \
+            src_reg2 = LOAD_Q_REG_2;                                                     \
+            xmm_src  = LOAD_INT_TO_MMX(src_reg1, src_reg2);                              \
+        }                                                                                \
+        xmm_dst = LOAD_MMX_Q_MMX((fetchdat >> 3) & 7);                                   \
+        func(xmm_dst, xmm_src);                                                          \
+        STORE_MMX_Q_MMX((fetchdat >> 3) & 7, xmm_dst);                                   \
+                                                                                         \
+        return op_pc + 1;                                                                \
     }
 
 MMX_OP(ropPAND, MMX_AND)
@@ -179,7 +183,7 @@ MMX_OP(ropPMULHW, MMX_PMULHW);
 MMX_OP(ropPMADDWD, MMX_PMADDWD);
 
 static uint32_t
-ropPSxxW_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropPSxxW_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int xmm_dst;
 
@@ -207,7 +211,7 @@ ropPSxxW_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 2;
 }
 static uint32_t
-ropPSxxD_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropPSxxD_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int xmm_dst;
 
@@ -235,7 +239,7 @@ ropPSxxD_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 2;
 }
 static uint32_t
-ropPSxxQ_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropPSxxQ_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int xmm_dst;
 
@@ -264,7 +268,7 @@ ropPSxxQ_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
 }
 
 static uint32_t
-ropEMMS(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropEMMS(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), UNUSED(uint32_t op_pc), UNUSED(codeblock_t *block))
 {
     codegen_mmx_entered = 0;
 
diff --git a/src/codegen/codegen_ops_mov.h b/src/codegen/codegen_ops_mov.h
index 04c4bf2bc..eb2a0202c 100644
--- a/src/codegen/codegen_ops_mov.h
+++ b/src/codegen/codegen_ops_mov.h
@@ -1,19 +1,19 @@
 static uint32_t
-ropMOV_rb_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_rb_imm(uint8_t opcode, uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     STORE_IMM_REG_B(opcode & 7, fetchdat & 0xff);
 
     return op_pc + 1;
 }
 static uint32_t
-ropMOV_rw_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_rw_imm(uint8_t opcode, uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     STORE_IMM_REG_W(opcode & 7, fetchdat & 0xffff);
 
     return op_pc + 2;
 }
 static uint32_t
-ropMOV_rl_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_rl_imm(uint8_t opcode, uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     fetchdat = fastreadl(cs + op_pc);
 
@@ -23,7 +23,7 @@ ropMOV_rl_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
 }
 
 static uint32_t
-ropMOV_b_r(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_b_r(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_B((fetchdat >> 3) & 7);
 
@@ -44,7 +44,7 @@ ropMOV_b_r(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, co
     return op_pc + 1;
 }
 static uint32_t
-ropMOV_w_r(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_w_r(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg = LOAD_REG_W((fetchdat >> 3) & 7);
 
@@ -66,7 +66,7 @@ ropMOV_w_r(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, co
 }
 
 static uint32_t
-ropMOV_l_r(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_l_r(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg;
 
@@ -90,7 +90,7 @@ ropMOV_l_r(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, co
 }
 
 static uint32_t
-ropMOV_r_b(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_r_b(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     if ((fetchdat & 0xc0) == 0xc0) {
         int host_reg = LOAD_REG_B(fetchdat & 7);
@@ -109,7 +109,7 @@ ropMOV_r_b(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, co
     return op_pc + 1;
 }
 static uint32_t
-ropMOV_r_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_r_w(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     if ((fetchdat & 0xc0) == 0xc0) {
         int host_reg = LOAD_REG_W(fetchdat & 7);
@@ -128,7 +128,7 @@ ropMOV_r_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, co
     return op_pc + 1;
 }
 static uint32_t
-ropMOV_r_l(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_r_l(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     if ((fetchdat & 0xc0) == 0xc0) {
         int host_reg = LOAD_REG_L(fetchdat & 7);
@@ -148,11 +148,17 @@ ropMOV_r_l(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, co
 }
 
 static uint32_t
-ropMOV_b_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_b_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     if ((fetchdat & 0xc0) == 0xc0) {
         STORE_IMM_REG_B(fetchdat & 7, (fetchdat >> 8) & 0xff);
-    } else {
+    }
+/* TODO: Fix the recompilation of that specific case so it no longer breaks NT 3.x NTVDM. */
+#ifndef RECOMPILE_MOVB_IMM_MEM_ALWAYS
+    else if (((fetchdat & 0xfc) == 0x80) && (op_32 & 0x200))
+        return 0;
+#endif
+    else {
         x86seg  *target_seg = FETCH_EA(op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32);
         uint32_t imm        = fastreadb(cs + op_pc + 1);
         int      host_reg   = LOAD_REG_IMM(imm);
@@ -167,7 +173,7 @@ ropMOV_b_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 2;
 }
 static uint32_t
-ropMOV_w_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_w_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     if ((fetchdat & 0xc0) == 0xc0) {
         STORE_IMM_REG_W(fetchdat & 7, (fetchdat >> 8) & 0xffff);
@@ -186,7 +192,7 @@ ropMOV_w_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 3;
 }
 static uint32_t
-ropMOV_l_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_l_imm(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     if ((fetchdat & 0xc0) == 0xc0) {
         uint32_t imm = fastreadl(cs + op_pc + 1);
@@ -208,7 +214,7 @@ ropMOV_l_imm(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
 }
 
 static uint32_t
-ropMOV_AL_a(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_AL_a(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     uint32_t addr;
 
@@ -226,7 +232,7 @@ ropMOV_AL_a(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, c
     return op_pc + ((op_32 & 0x200) ? 4 : 2);
 }
 static uint32_t
-ropMOV_AX_a(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_AX_a(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     uint32_t addr;
 
@@ -244,7 +250,7 @@ ropMOV_AX_a(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, c
     return op_pc + ((op_32 & 0x200) ? 4 : 2);
 }
 static uint32_t
-ropMOV_EAX_a(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_EAX_a(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     uint32_t addr;
 
@@ -263,7 +269,7 @@ ropMOV_EAX_a(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
 }
 
 static uint32_t
-ropMOV_a_AL(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_a_AL(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     uint32_t addr;
     int      host_reg;
@@ -284,7 +290,7 @@ ropMOV_a_AL(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, c
     return op_pc + ((op_32 & 0x200) ? 4 : 2);
 }
 static uint32_t
-ropMOV_a_AX(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_a_AX(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     uint32_t addr;
     int      host_reg;
@@ -305,7 +311,7 @@ ropMOV_a_AX(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, c
     return op_pc + ((op_32 & 0x200) ? 4 : 2);
 }
 static uint32_t
-ropMOV_a_EAX(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_a_EAX(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     uint32_t addr;
     int      host_reg;
@@ -327,7 +333,7 @@ ropMOV_a_EAX(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
 }
 
 static uint32_t
-ropLEA_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropLEA_w(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int dest_reg = (fetchdat >> 3) & 7;
 
@@ -341,7 +347,7 @@ ropLEA_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
     return op_pc + 1;
 }
 static uint32_t
-ropLEA_l(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropLEA_l(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int dest_reg = (fetchdat >> 3) & 7;
 
@@ -356,7 +362,7 @@ ropLEA_l(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, code
 }
 
 static uint32_t
-ropMOVZX_w_b(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOVZX_w_b(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     if ((fetchdat & 0xc0) == 0xc0) {
         int host_reg = LOAD_REG_B(fetchdat & 7);
@@ -377,7 +383,7 @@ ropMOVZX_w_b(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 1;
 }
 static uint32_t
-ropMOVZX_l_b(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOVZX_l_b(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     if ((fetchdat & 0xc0) == 0xc0) {
         int host_reg = LOAD_REG_B(fetchdat & 7);
@@ -398,7 +404,7 @@ ropMOVZX_l_b(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 1;
 }
 static uint32_t
-ropMOVZX_l_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOVZX_l_w(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     if ((fetchdat & 0xc0) == 0xc0) {
         int host_reg = LOAD_REG_W(fetchdat & 7);
@@ -420,7 +426,7 @@ ropMOVZX_l_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
 }
 
 static uint32_t
-ropMOVSX_w_b(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOVSX_w_b(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     if ((fetchdat & 0xc0) == 0xc0) {
         int host_reg = LOAD_REG_B(fetchdat & 7);
@@ -441,7 +447,7 @@ ropMOVSX_w_b(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 1;
 }
 static uint32_t
-ropMOVSX_l_b(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOVSX_l_b(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     if ((fetchdat & 0xc0) == 0xc0) {
         int host_reg = LOAD_REG_B(fetchdat & 7);
@@ -462,7 +468,7 @@ ropMOVSX_l_b(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 1;
 }
 static uint32_t
-ropMOVSX_l_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOVSX_l_w(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     if ((fetchdat & 0xc0) == 0xc0) {
         int host_reg = LOAD_REG_W(fetchdat & 7);
@@ -484,7 +490,7 @@ ropMOVSX_l_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
 }
 
 static uint32_t
-ropMOV_w_seg(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_w_seg(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg;
 
@@ -531,7 +537,7 @@ ropMOV_w_seg(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return op_pc + 1;
 }
 static uint32_t
-ropMOV_seg_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropMOV_seg_w(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg;
 
@@ -578,7 +584,7 @@ ropMOV_seg_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
 }
 
 #define ropLseg(seg, rseg)                                                                                           \
-    static uint32_t ropL##seg(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
+    static uint32_t ropL##seg(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block)) \
     {                                                                                                                \
         int     dest_reg = (fetchdat >> 3) & 7;                                                                      \
         x86seg *target_seg;                                                                                          \
@@ -594,12 +600,12 @@ ropMOV_seg_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
             MEM_LOAD_ADDR_EA_L(target_seg);                                                                          \
             STORE_HOST_REG_ADDR((uintptr_t) &codegen_temp, 0);                                                       \
             LOAD_EA();                                                                                               \
-            MEM_LOAD_ADDR_EA_W_OFFSET(target_seg, 4);                                                                \
+            MEM_LOAD_ADDR_EA_W_OFFSET(target_seg, 4, op_32);                                                         \
         } else {                                                                                                     \
             MEM_LOAD_ADDR_EA_W(target_seg);                                                                          \
             STORE_HOST_REG_ADDR_W((uintptr_t) &codegen_temp, 0);                                                     \
             LOAD_EA();                                                                                               \
-            MEM_LOAD_ADDR_EA_W_OFFSET(target_seg, 2);                                                                \
+            MEM_LOAD_ADDR_EA_W_OFFSET(target_seg, 2, op_32);                                                         \
         }                                                                                                            \
         LOAD_SEG(0, &rseg);                                                                                          \
         if (op_32 & 0x100) {                                                                                         \
diff --git a/src/codegen/codegen_ops_shift.h b/src/codegen/codegen_ops_shift.h
index d750bfcad..a36fb3fdc 100644
--- a/src/codegen/codegen_ops_shift.h
+++ b/src/codegen/codegen_ops_shift.h
@@ -43,7 +43,7 @@
     }
 
 static uint32_t
-ropC0(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropC0(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg = NULL;
     int     count;
@@ -57,7 +57,7 @@ ropC0(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblo
     return op_pc + 2;
 }
 static uint32_t
-ropC1_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropC1_w(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg = NULL;
     int     count;
@@ -71,7 +71,7 @@ ropC1_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
     return op_pc + 2;
 }
 static uint32_t
-ropC1_l(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropC1_l(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg = NULL;
     int     count;
@@ -86,7 +86,7 @@ ropC1_l(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
 }
 
 static uint32_t
-ropD0(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropD0(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg = NULL;
     int     count      = 1;
@@ -100,7 +100,7 @@ ropD0(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblo
     return op_pc + 1;
 }
 static uint32_t
-ropD1_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropD1_w(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg = NULL;
     int     count      = 1;
@@ -114,7 +114,7 @@ ropD1_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeb
     return op_pc + 1;
 }
 static uint32_t
-ropD1_l(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropD1_l(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     x86seg *target_seg = NULL;
     int     count      = 1;
diff --git a/src/codegen/codegen_ops_stack.h b/src/codegen/codegen_ops_stack.h
index 342ddedd4..b7e3d66fe 100644
--- a/src/codegen/codegen_ops_stack.h
+++ b/src/codegen/codegen_ops_stack.h
@@ -1,5 +1,5 @@
 static uint32_t
-ropPUSH_16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropPUSH_16(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg;
 
@@ -12,7 +12,7 @@ ropPUSH_16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, co
     return op_pc;
 }
 static uint32_t
-ropPUSH_32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropPUSH_32(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg;
 
@@ -26,7 +26,7 @@ ropPUSH_32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, co
 }
 
 static uint32_t
-ropPUSH_imm_16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropPUSH_imm_16(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     uint16_t imm = fetchdat & 0xffff;
     int      host_reg;
@@ -40,7 +40,7 @@ ropPUSH_imm_16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc
     return op_pc + 2;
 }
 static uint32_t
-ropPUSH_imm_32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropPUSH_imm_32(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     uint32_t imm = fastreadl(cs + op_pc);
     int      host_reg;
@@ -55,7 +55,7 @@ ropPUSH_imm_32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc
 }
 
 static uint32_t
-ropPUSH_imm_b16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropPUSH_imm_b16(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     uint16_t imm = fetchdat & 0xff;
     int      host_reg;
@@ -72,7 +72,7 @@ ropPUSH_imm_b16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_p
     return op_pc + 1;
 }
 static uint32_t
-ropPUSH_imm_b32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropPUSH_imm_b32(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     uint32_t imm = fetchdat & 0xff;
     int      host_reg;
@@ -90,7 +90,7 @@ ropPUSH_imm_b32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_p
 }
 
 static uint32_t
-ropPOP_16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropPOP_16(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     STORE_IMM_ADDR_L((uintptr_t) &cpu_state.oldpc, op_old_pc);
     LOAD_STACK_TO_EA(0);
@@ -101,7 +101,7 @@ ropPOP_16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
     return op_pc;
 }
 static uint32_t
-ropPOP_32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropPOP_32(uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     STORE_IMM_ADDR_L((uintptr_t) &cpu_state.oldpc, op_old_pc);
     LOAD_STACK_TO_EA(0);
@@ -113,7 +113,7 @@ ropPOP_32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
 }
 
 static uint32_t
-ropRET_16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropRET_16(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), UNUSED(uint32_t op_pc), UNUSED(codeblock_t *block))
 {
     STORE_IMM_ADDR_L((uintptr_t) &cpu_state.oldpc, op_old_pc);
     LOAD_STACK_TO_EA(0);
@@ -124,7 +124,7 @@ ropRET_16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
     return -1;
 }
 static uint32_t
-ropRET_32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropRET_32(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), UNUSED(uint32_t op_pc), UNUSED(codeblock_t *block))
 {
     STORE_IMM_ADDR_L((uintptr_t) &cpu_state.oldpc, op_old_pc);
     LOAD_STACK_TO_EA(0);
@@ -136,7 +136,7 @@ ropRET_32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
 }
 
 static uint32_t
-ropRET_imm_16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropRET_imm_16(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), UNUSED(uint32_t op_pc), UNUSED(codeblock_t *block))
 {
     uint16_t offset = fetchdat & 0xffff;
 
@@ -149,7 +149,7 @@ ropRET_imm_16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
     return -1;
 }
 static uint32_t
-ropRET_imm_32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropRET_imm_32(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), UNUSED(uint32_t op_pc), UNUSED(codeblock_t *block))
 {
     uint16_t offset = fetchdat & 0xffff;
 
@@ -163,7 +163,7 @@ ropRET_imm_32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc,
 }
 
 static uint32_t
-ropCALL_r16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropCALL_r16(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     uint16_t offset = fetchdat & 0xffff;
     int      host_reg;
@@ -178,7 +178,7 @@ ropCALL_r16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, c
     return -1;
 }
 static uint32_t
-ropCALL_r32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropCALL_r32(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     uint32_t offset = fastreadl(cs + op_pc);
     int      host_reg;
@@ -194,7 +194,7 @@ ropCALL_r32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, c
 }
 
 static uint32_t
-ropLEAVE_16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropLEAVE_16(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg;
 
@@ -209,7 +209,7 @@ ropLEAVE_16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, c
     return op_pc;
 }
 static uint32_t
-ropLEAVE_32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropLEAVE_32(UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int host_reg;
 
@@ -224,32 +224,40 @@ ropLEAVE_32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, c
     return op_pc;
 }
 
-#define ROP_PUSH_SEG(seg)                                                                                     \
-    static uint32_t                                                                                           \
-    ropPUSH_##seg##_16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
-    {                                                                                                         \
-        int host_reg;                                                                                         \
-                                                                                                              \
-        STORE_IMM_ADDR_L((uintptr_t) &cpu_state.oldpc, op_old_pc);                                            \
-        LOAD_STACK_TO_EA(-2);                                                                                 \
-        host_reg = LOAD_VAR_W((uintptr_t) &seg);                                                              \
-        MEM_STORE_ADDR_EA_W(&cpu_state.seg_ss, host_reg);                                                     \
-        SP_MODIFY(-2);                                                                                        \
-                                                                                                              \
-        return op_pc;                                                                                         \
-    }                                                                                                         \
-    static uint32_t                                                                                           \
-    ropPUSH_##seg##_32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
-    {                                                                                                         \
-        int host_reg;                                                                                         \
-                                                                                                              \
-        STORE_IMM_ADDR_L((uintptr_t) &cpu_state.oldpc, op_old_pc);                                            \
-        LOAD_STACK_TO_EA(-4);                                                                                 \
-        host_reg = LOAD_VAR_W((uintptr_t) &seg);                                                              \
-        MEM_STORE_ADDR_EA_L(&cpu_state.seg_ss, host_reg);                                                     \
-        SP_MODIFY(-4);                                                                                        \
-                                                                                                              \
-        return op_pc;                                                                                         \
+#define ROP_PUSH_SEG(seg)                                          \
+    static uint32_t                                                \
+    ropPUSH_##seg##_16(UNUSED(uint8_t opcode),                     \
+                       UNUSED(uint32_t fetchdat),                  \
+                       UNUSED(uint32_t op_32),                     \
+                       uint32_t op_pc,                             \
+                       UNUSED(codeblock_t *block))                 \
+    {                                                              \
+        int host_reg;                                              \
+                                                                   \
+        STORE_IMM_ADDR_L((uintptr_t) &cpu_state.oldpc, op_old_pc); \
+        LOAD_STACK_TO_EA(-2);                                      \
+        host_reg = LOAD_VAR_W((uintptr_t) &seg);                   \
+        MEM_STORE_ADDR_EA_W(&cpu_state.seg_ss, host_reg);          \
+        SP_MODIFY(-2);                                             \
+                                                                   \
+        return op_pc;                                              \
+    }                                                              \
+    static uint32_t                                                \
+    ropPUSH_##seg##_32(UNUSED(uint8_t opcode),                     \
+                       UNUSED(uint32_t fetchdat),                  \
+                       UNUSED(uint32_t op_32),                     \
+                       uint32_t op_pc,                             \
+                       UNUSED(codeblock_t *block))                 \
+    {                                                              \
+        int host_reg;                                              \
+                                                                   \
+        STORE_IMM_ADDR_L((uintptr_t) &cpu_state.oldpc, op_old_pc); \
+        LOAD_STACK_TO_EA(-4);                                      \
+        host_reg = LOAD_VAR_W((uintptr_t) &seg);                   \
+        MEM_STORE_ADDR_EA_L(&cpu_state.seg_ss, host_reg);          \
+        SP_MODIFY(-4);                                             \
+                                                                   \
+        return op_pc;                                              \
     }
 
 ROP_PUSH_SEG(CS)
@@ -259,28 +267,36 @@ ROP_PUSH_SEG(FS)
 ROP_PUSH_SEG(GS)
 ROP_PUSH_SEG(SS)
 
-#define ROP_POP_SEG(seg, rseg)                                                                               \
-    static uint32_t                                                                                          \
-    ropPOP_##seg##_16(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
-    {                                                                                                        \
-        STORE_IMM_ADDR_L((uintptr_t) &cpu_state.oldpc, op_old_pc);                                           \
-        LOAD_STACK_TO_EA(0);                                                                                 \
-        MEM_LOAD_ADDR_EA_W(&cpu_state.seg_ss);                                                               \
-        LOAD_SEG(0, &rseg);                                                                                  \
-        SP_MODIFY(2);                                                                                        \
-                                                                                                             \
-        return op_pc;                                                                                        \
-    }                                                                                                        \
-    static uint32_t                                                                                          \
-    ropPOP_##seg##_32(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
-    {                                                                                                        \
-        STORE_IMM_ADDR_L((uintptr_t) &cpu_state.oldpc, op_old_pc);                                           \
-        LOAD_STACK_TO_EA(0);                                                                                 \
-        MEM_LOAD_ADDR_EA_W(&cpu_state.seg_ss);                                                               \
-        LOAD_SEG(0, &rseg);                                                                                  \
-        SP_MODIFY(4);                                                                                        \
-                                                                                                             \
-        return op_pc;                                                                                        \
+#define ROP_POP_SEG(seg, rseg)                                     \
+    static uint32_t                                                \
+    ropPOP_##seg##_16(UNUSED(uint8_t opcode),                      \
+                      UNUSED(uint32_t fetchdat),                   \
+                      UNUSED(uint32_t op_32),                      \
+                      uint32_t op_pc,                              \
+                      UNUSED(codeblock_t *block))                  \
+    {                                                              \
+        STORE_IMM_ADDR_L((uintptr_t) &cpu_state.oldpc, op_old_pc); \
+        LOAD_STACK_TO_EA(0);                                       \
+        MEM_LOAD_ADDR_EA_W(&cpu_state.seg_ss);                     \
+        LOAD_SEG(0, &rseg);                                        \
+        SP_MODIFY(2);                                              \
+                                                                   \
+        return op_pc;                                              \
+    }                                                              \
+    static uint32_t                                                \
+    ropPOP_##seg##_32(UNUSED(uint8_t opcode),                      \
+                      UNUSED(uint32_t fetchdat),                   \
+                      UNUSED(uint32_t op_32),                      \
+                      uint32_t op_pc,                              \
+                      UNUSED(codeblock_t *block))                  \
+    {                                                              \
+        STORE_IMM_ADDR_L((uintptr_t) &cpu_state.oldpc, op_old_pc); \
+        LOAD_STACK_TO_EA(0);                                       \
+        MEM_LOAD_ADDR_EA_W(&cpu_state.seg_ss);                     \
+        LOAD_SEG(0, &rseg);                                        \
+        SP_MODIFY(4);                                              \
+                                                                   \
+        return op_pc;                                              \
     }
 
 ROP_POP_SEG(DS, cpu_state.seg_ds)
diff --git a/src/codegen/codegen_ops_x86-64.h b/src/codegen/codegen_ops_x86-64.h
index bc6293c0b..5d6a62c7a 100644
--- a/src/codegen/codegen_ops_x86-64.h
+++ b/src/codegen/codegen_ops_x86-64.h
@@ -55,7 +55,7 @@ call_long(uintptr_t func)
 }
 
 static __inline void
-load_param_1_32(codeblock_t *block, uint32_t param)
+load_param_1_32(UNUSED(codeblock_t *block), uint32_t param)
 {
 #if _WIN64
     addbyte(0xb9); /*MOVL $fetchdat,%ecx*/
@@ -93,7 +93,7 @@ static __inline void load_param_1_64(codeblock_t *block, uint64_t param)
 #endif
 
 static __inline void
-load_param_2_32(codeblock_t *block, uint32_t param)
+load_param_2_32(UNUSED(codeblock_t *block), uint32_t param)
 {
 #if _WIN64
     addbyte(0xba); /*MOVL $fetchdat,%edx*/
@@ -118,7 +118,7 @@ load_param_2_reg_32(int reg)
 #endif
 }
 static __inline void
-load_param_2_64(codeblock_t *block, uint64_t param)
+load_param_2_64(UNUSED(codeblock_t *block), uint64_t param)
 {
     addbyte(0x48);
 #if _WIN64
@@ -1049,11 +1049,18 @@ MEM_LOAD_ADDR_EA_W(x86seg *seg)
     /*done:*/
 }
 static __inline void
-MEM_LOAD_ADDR_EA_W_OFFSET(x86seg *seg, int offset)
+MEM_LOAD_ADDR_EA_W_OFFSET(x86seg *seg, int offset, int op_32)
 {
     addbyte(0x83); /*ADD EAX, offset*/
     addbyte(0xc0);
     addbyte(offset);
+    if (!(op_32 & 0x200)) {
+        addbyte(0x25); /* AND EAX, ffffh */
+        addbyte(0xff);
+        addbyte(0xff);
+        addbyte(0x00);
+        addbyte(0x00);
+    }
     MEM_LOAD_ADDR_EA_W(seg);
 }
 static __inline void
@@ -1492,7 +1499,7 @@ MEM_STORE_ADDR_EA_L(x86seg *seg, int host_reg)
     /*done:*/
 }
 static __inline void
-MEM_STORE_ADDR_EA_Q(x86seg *seg, int host_reg, int host_reg2)
+MEM_STORE_ADDR_EA_Q(x86seg *seg, int host_reg, UNUSED(int host_reg2))
 {
     if ((seg == &cpu_state.seg_ds && codegen_flat_ds && !(cpu_cur_status & CPU_STATUS_NOTFLATDS)) || (seg == &cpu_state.seg_ss && codegen_flat_ss && !(cpu_cur_status & CPU_STATUS_NOTFLATSS))) {
         addbyte(0x31); /*XOR ECX, ECX*/
@@ -3868,19 +3875,31 @@ FP_LOAD_IMM_Q(uint64_t v)
 static __inline void
 FP_FCHS(void)
 {
+    addbyte(0x48); /* MOVABS RAX, 0x8000000000000000 */
+    addbyte(0xb8);
+    addquad(0x8000000000000000);
+    addbyte(0x66); /* MOVQ XMM15, RAX */
+    addbyte(0x4c);
+    addbyte(0x0f);
+    addbyte(0x6e);
+    addbyte(0xf8);
+    addbyte(0x48); /* XOR RAX, RAX */
+    addbyte(0x31);
+    addbyte(0xc0);
     addbyte(0x8b); /*MOV EAX, TOP*/
     addbyte(0x45);
     addbyte((uint8_t) cpu_state_offset(TOP));
-    addbyte(0xf2); /*SUBSD XMM0, XMM0*/
+    addbyte(0xf3); /*MOVQ XMM0, ST[EAX*8]*/
     addbyte(0x0f);
-    addbyte(0x5c);
-    addbyte(0xc0);
-    addbyte(0xf2); /*SUBSD XMM0, ST[EAX*8]*/
-    addbyte(0x0f);
-    addbyte(0x5c);
+    addbyte(0x7e);
     addbyte(0x44);
     addbyte(0xc5);
     addbyte((uint8_t) cpu_state_offset(ST));
+    addbyte(0x66); /* PXOR XMM0, XMM15 */
+    addbyte(0x41);
+    addbyte(0x0F);
+    addbyte(0xEF);
+    addbyte(0xC7);
     addbyte(0x80); /*AND tag[EAX], ~TAG_UINT64*/
     addbyte(0x64);
     addbyte(0x05);
@@ -3926,7 +3945,7 @@ FP_LOAD_REG(int reg)
     return REG_EBX;
 }
 static __inline void
-FP_LOAD_REG_D(int reg, int *host_reg1, int *host_reg2)
+FP_LOAD_REG_D(int reg, int *host_reg1, UNUSED(int *host_reg2))
 {
     addbyte(0x8b); /*MOV EBX, TOP*/
     addbyte(0x5d);
@@ -4086,7 +4105,7 @@ FP_LOAD_REG_INT(int reg)
     return REG_EBX;
 }
 static __inline void
-FP_LOAD_REG_INT_Q(int reg, int *host_reg1, int *host_reg2)
+FP_LOAD_REG_INT_Q(int reg, int *host_reg1, UNUSED(int *host_reg2))
 {
     addbyte(0x89); /*MOV EBX, EAX*/
     addbyte(0xc3);
@@ -4434,7 +4453,7 @@ FP_COMPARE_REG(int dst, int src)
     addbyte((uint8_t) cpu_state_offset(npxs) + 1);
     addbyte(0x80); /*AND CL, ~(C0|C2|C3)*/
     addbyte(0xe1);
-    addbyte((~(C0 | C2 | C3)) >> 8);
+    addbyte((~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3)) >> 8);
 
     if (src) {
         addbyte(0xf3); /*MOVQ XMM0, ST[RBX*8]*/
@@ -4467,7 +4486,7 @@ FP_COMPARE_REG(int dst, int src)
     addbyte(0x9f); /*LAHF*/
     addbyte(0x80); /*AND AH, (C0|C2|C3)*/
     addbyte(0xe4);
-    addbyte((C0 | C2 | C3) >> 8);
+    addbyte((FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3) >> 8);
     addbyte(0x08); /*OR CL, AH*/
     addbyte(0xe1);
     addbyte(0x88); /*MOV [npxs+1], CL*/
@@ -4493,7 +4512,7 @@ FP_COMPARE_MEM(void)
     addbyte((uint8_t) cpu_state_offset(ST));
     addbyte(0x80); /*AND CL, ~(C0|C2|C3)*/
     addbyte(0xe1);
-    addbyte((~(C0 | C2 | C3)) >> 8);
+    addbyte((~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3)) >> 8);
     addbyte(0x66); /*COMISD XMM0, XMM1*/
     addbyte(0x0f);
     addbyte(0x2f);
@@ -4501,7 +4520,7 @@ FP_COMPARE_MEM(void)
     addbyte(0x9f); /*LAHF*/
     addbyte(0x80); /*AND AH, (C0|C2|C3)*/
     addbyte(0xe4);
-    addbyte((C0 | C2 | C3) >> 8);
+    addbyte((FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3) >> 8);
     addbyte(0x08); /*OR CL, AH*/
     addbyte(0xe1);
     addbyte(0x88); /*MOV [npxs+1], CL*/
@@ -4693,7 +4712,7 @@ LOAD_MMX_D(int guest_reg)
     return host_reg;
 }
 static __inline void
-LOAD_MMX_Q(int guest_reg, int *host_reg1, int *host_reg2)
+LOAD_MMX_Q(int guest_reg, int *host_reg1, UNUSED(int *host_reg2))
 {
     int host_reg = REG_EBX;
 
@@ -4725,7 +4744,7 @@ LOAD_MMX_Q_MMX(int guest_reg)
 }
 
 static __inline int
-LOAD_INT_TO_MMX(int src_reg1, int src_reg2)
+LOAD_INT_TO_MMX(int src_reg1, UNUSED(int src_reg2))
 {
     int dst_reg                   = find_host_xmm_reg();
     host_reg_xmm_mapping[dst_reg] = 100;
@@ -4758,7 +4777,7 @@ STORE_MMX_LQ(int guest_reg, int host_reg1)
     addbyte((uint8_t) cpu_state_offset(MM[guest_reg].l[0]));
 }
 static __inline void
-STORE_MMX_Q(int guest_reg, int host_reg1, int host_reg2)
+STORE_MMX_Q(int guest_reg, int host_reg1, UNUSED(int host_reg2))
 {
     if (host_reg1 & 8)
         addbyte(0x4c);
diff --git a/src/codegen/codegen_ops_x86.h b/src/codegen/codegen_ops_x86.h
index 410ce8e17..3fbefdeaa 100644
--- a/src/codegen/codegen_ops_x86.h
+++ b/src/codegen/codegen_ops_x86.h
@@ -789,7 +789,7 @@ MEM_LOAD_ADDR_EA_W(x86seg *seg)
     host_reg_mapping[0] = 8;
 }
 static __inline void
-MEM_LOAD_ADDR_EA_W_OFFSET(x86seg *seg, int offset)
+MEM_LOAD_ADDR_EA_W_OFFSET(x86seg *seg, int offset, int op_32)
 {
     if ((seg == &cpu_state.seg_ds && codegen_flat_ds && !(cpu_cur_status & CPU_STATUS_NOTFLATDS)) || (seg == &cpu_state.seg_ss && codegen_flat_ss && !(cpu_cur_status & CPU_STATUS_NOTFLATSS))) {
         addbyte(0x31); /*XOR EDX, EDX*/
@@ -802,6 +802,13 @@ MEM_LOAD_ADDR_EA_W_OFFSET(x86seg *seg, int offset)
     addbyte(0x83); /*ADD EAX, offset*/
     addbyte(0xc0);
     addbyte(offset);
+    if (!(op_32 & 0x200)) {
+        addbyte(0x25); /* AND EAX, ffffh */
+        addbyte(0xff);
+        addbyte(0xff);
+        addbyte(0x00);
+        addbyte(0x00);
+    }
     addbyte(0xe8); /*CALL mem_load_addr_ea_w*/
     addlong(mem_load_addr_ea_w - (uint32_t) (&codeblock[block_current].data[block_pos + 4]));
 
@@ -2911,7 +2918,7 @@ FP_COMPARE_S(void)
         addbyte(0xe2);
         addbyte(0x80); /*AND BL, ~(C0|C2|C3)*/
         addbyte(0xe3);
-        addbyte((~(C0 | C2 | C3)) >> 8);
+        addbyte((~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3)) >> 8);
         addbyte(0xd8); /*FCOMP [ESP]*/
         addbyte(0x04 | 0x18);
         addbyte(0x24);
@@ -2919,7 +2926,7 @@ FP_COMPARE_S(void)
         addbyte(0xe0);
         addbyte(0x80); /*AND AH, (C0|C2|C3)*/
         addbyte(0xe4);
-        addbyte((C0 | C2 | C3) >> 8);
+        addbyte((FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3) >> 8);
         addbyte(0x08); /*OR BL, AH*/
         addbyte(0xe3);
         addbyte(0x88); /*MOV [npxs+1], BL*/
@@ -2943,7 +2950,7 @@ FP_COMPARE_S(void)
         addbyte(0xe2);
         addbyte(0x80); /*AND BL, ~(C0|C2|C3)*/
         addbyte(0xe3);
-        addbyte((~(C0 | C2 | C3)) >> 8);
+        addbyte((~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3)) >> 8);
         addbyte(0xd8); /*FCOMP [ESP]*/
         addbyte(0x04 | 0x18);
         addbyte(0x24);
@@ -2951,7 +2958,7 @@ FP_COMPARE_S(void)
         addbyte(0xe0);
         addbyte(0x80); /*AND AH, (C0|C2|C3)*/
         addbyte(0xe4);
-        addbyte((C0 | C2 | C3) >> 8);
+        addbyte((FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3) >> 8);
         addbyte(0x08); /*OR BL, AH*/
         addbyte(0xe3);
         addbyte(0x88); /*MOV [npxs+1], BL*/
@@ -2980,7 +2987,7 @@ FP_COMPARE_D(void)
         addbyte(0xe2);
         addbyte(0x80); /*AND BL, ~(C0|C2|C3)*/
         addbyte(0xe3);
-        addbyte((~(C0 | C2 | C3)) >> 8);
+        addbyte((~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3)) >> 8);
         addbyte(0xdc); /*FCOMP [ESP]*/
         addbyte(0x04 | 0x18);
         addbyte(0x24);
@@ -2988,7 +2995,7 @@ FP_COMPARE_D(void)
         addbyte(0xe0);
         addbyte(0x80); /*AND AH, (C0|C2|C3)*/
         addbyte(0xe4);
-        addbyte((C0 | C2 | C3) >> 8);
+        addbyte((FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3) >> 8);
         addbyte(0x08); /*OR BL, AH*/
         addbyte(0xe3);
         addbyte(0x88); /*MOV [npxs+1], BL*/
@@ -3016,7 +3023,7 @@ FP_COMPARE_D(void)
         addbyte(0xe2);
         addbyte(0x80); /*AND BL, ~(C0|C2|C3)*/
         addbyte(0xe3);
-        addbyte((~(C0 | C2 | C3)) >> 8);
+        addbyte((~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3)) >> 8);
         addbyte(0xdc); /*FCOMP [ESP]*/
         addbyte(0x04 | 0x18);
         addbyte(0x24);
@@ -3024,7 +3031,7 @@ FP_COMPARE_D(void)
         addbyte(0xe0);
         addbyte(0x80); /*AND AH, (C0|C2|C3)*/
         addbyte(0xe4);
-        addbyte((C0 | C2 | C3) >> 8);
+        addbyte((FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3) >> 8);
         addbyte(0x08); /*OR BL, AH*/
         addbyte(0xe3);
         addbyte(0x88); /*MOV [npxs+1], BL*/
@@ -3050,7 +3057,7 @@ FP_COMPARE_IW(void)
         addbyte(0xe2);
         addbyte(0x80); /*AND BL, ~(C0|C2|C3)*/
         addbyte(0xe3);
-        addbyte((~(C0 | C2 | C3)) >> 8);
+        addbyte((~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3)) >> 8);
         addbyte(0xde); /*FCOMP [ESP]*/
         addbyte(0x04 | 0x18);
         addbyte(0x24);
@@ -3058,7 +3065,7 @@ FP_COMPARE_IW(void)
         addbyte(0xe0);
         addbyte(0x80); /*AND AH, (C0|C2|C3)*/
         addbyte(0xe4);
-        addbyte((C0 | C2 | C3) >> 8);
+        addbyte((FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3) >> 8);
         addbyte(0x08); /*OR BL, AH*/
         addbyte(0xe3);
         addbyte(0x88); /*MOV [npxs+1], BL*/
@@ -3082,7 +3089,7 @@ FP_COMPARE_IW(void)
         addbyte(0xe2);
         addbyte(0x80); /*AND BL, ~(C0|C2|C3)*/
         addbyte(0xe3);
-        addbyte((~(C0 | C2 | C3)) >> 8);
+        addbyte((~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3)) >> 8);
         addbyte(0xde); /*FCOMP [ESP]*/
         addbyte(0x04 | 0x18);
         addbyte(0x24);
@@ -3090,7 +3097,7 @@ FP_COMPARE_IW(void)
         addbyte(0xe0);
         addbyte(0x80); /*AND AH, (C0|C2|C3)*/
         addbyte(0xe4);
-        addbyte((C0 | C2 | C3) >> 8);
+        addbyte((FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3) >> 8);
         addbyte(0x08); /*OR BL, AH*/
         addbyte(0xe3);
         addbyte(0x88); /*MOV [npxs+1], BL*/
@@ -3115,7 +3122,7 @@ FP_COMPARE_IL(void)
         addbyte(0xe2);
         addbyte(0x80); /*AND BL, ~(C0|C2|C3)*/
         addbyte(0xe3);
-        addbyte((~(C0 | C2 | C3)) >> 8);
+        addbyte((~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3)) >> 8);
         addbyte(0xda); /*FCOMP [ESP]*/
         addbyte(0x04 | 0x18);
         addbyte(0x24);
@@ -3123,7 +3130,7 @@ FP_COMPARE_IL(void)
         addbyte(0xe0);
         addbyte(0x80); /*AND AH, (C0|C2|C3)*/
         addbyte(0xe4);
-        addbyte((C0 | C2 | C3) >> 8);
+        addbyte((FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3) >> 8);
         addbyte(0x08); /*OR BL, AH*/
         addbyte(0xe3);
         addbyte(0x88); /*MOV [npxs+1], BL*/
@@ -3147,7 +3154,7 @@ FP_COMPARE_IL(void)
         addbyte(0xe2);
         addbyte(0x80); /*AND BL, ~(C0|C2|C3)*/
         addbyte(0xe3);
-        addbyte((~(C0 | C2 | C3)) >> 8);
+        addbyte((~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3)) >> 8);
         addbyte(0xda); /*FCOMP [ESP]*/
         addbyte(0x04 | 0x18);
         addbyte(0x24);
@@ -3155,7 +3162,7 @@ FP_COMPARE_IL(void)
         addbyte(0xe0);
         addbyte(0x80); /*AND AH, (C0|C2|C3)*/
         addbyte(0xe4);
-        addbyte((C0 | C2 | C3) >> 8);
+        addbyte((FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3) >> 8);
         addbyte(0x08); /*OR BL, AH*/
         addbyte(0xe3);
         addbyte(0x88); /*MOV [npxs+1], BL*/
@@ -3250,7 +3257,7 @@ FP_COMPARE_REG(int dst, int src)
         addbyte((uint8_t) cpu_state_offset(ST[(cpu_state.TOP + dst) & 7]));
         addbyte(0x80); /*AND CL, ~(C0|C2|C3)*/
         addbyte(0xe1);
-        addbyte((~(C0 | C2 | C3)) >> 8);
+        addbyte((~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3)) >> 8);
         addbyte(0xdc); /*FCOMP ST[src][EBP]*/
         addbyte(0x5d);
         addbyte((uint8_t) cpu_state_offset(ST[(cpu_state.TOP + src) & 7]));
@@ -3258,7 +3265,7 @@ FP_COMPARE_REG(int dst, int src)
         addbyte(0xe0);
         addbyte(0x80); /*AND AH, (C0|C2|C3)*/
         addbyte(0xe4);
-        addbyte((C0 | C2 | C3) >> 8);
+        addbyte((FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3) >> 8);
         addbyte(0x08); /*OR CL, AH*/
         addbyte(0xe1);
         addbyte(0x88); /*MOV [npxs+1], CL*/
@@ -3286,7 +3293,7 @@ FP_COMPARE_REG(int dst, int src)
         addbyte(0xe2);
         addbyte(0x80); /*AND CL, ~(C0|C2|C3)*/
         addbyte(0xe1);
-        addbyte((~(C0 | C2 | C3)) >> 8);
+        addbyte((~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3)) >> 8);
 
         if (src) {
             addbyte(0xdd); /*FLD ST[EBX*8]*/
@@ -3312,7 +3319,7 @@ FP_COMPARE_REG(int dst, int src)
         addbyte(0xe0);
         addbyte(0x80); /*AND AH, (C0|C2|C3)*/
         addbyte(0xe4);
-        addbyte((C0 | C2 | C3) >> 8);
+        addbyte((FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3) >> 8);
         addbyte(0x08); /*OR CL, AH*/
         addbyte(0xe1);
         addbyte(0x88); /*MOV [npxs+1], CL*/
diff --git a/src/codegen/codegen_ops_xchg.h b/src/codegen/codegen_ops_xchg.h
index 28a558078..467f711e4 100644
--- a/src/codegen/codegen_ops_xchg.h
+++ b/src/codegen/codegen_ops_xchg.h
@@ -1,16 +1,20 @@
-#define OP_XCHG_AX_(reg)                                                                                    \
-    static uint32_t                                                                                         \
-    ropXCHG_AX_##reg(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
-    {                                                                                                       \
-        int ax_reg, host_reg, temp_reg;                                                                     \
-                                                                                                            \
-        ax_reg   = LOAD_REG_W(REG_AX);                                                                      \
-        host_reg = LOAD_REG_W(REG_##reg);                                                                   \
-        temp_reg = COPY_REG(host_reg);                                                                      \
-        STORE_REG_TARGET_W_RELEASE(ax_reg, REG_##reg);                                                      \
-        STORE_REG_TARGET_W_RELEASE(temp_reg, REG_AX);                                                       \
-                                                                                                            \
-        return op_pc;                                                                                       \
+#define OP_XCHG_AX_(reg)                               \
+    static uint32_t                                    \
+    ropXCHG_AX_##reg(UNUSED(uint8_t opcode),           \
+                     UNUSED(uint32_t fetchdat),        \
+                     UNUSED(uint32_t op_32),           \
+                     uint32_t op_pc,                   \
+                     UNUSED(codeblock_t *block))       \
+    {                                                  \
+        int ax_reg, host_reg, temp_reg;                \
+                                                       \
+        ax_reg   = LOAD_REG_W(REG_AX);                 \
+        host_reg = LOAD_REG_W(REG_##reg);              \
+        temp_reg = COPY_REG(host_reg);                 \
+        STORE_REG_TARGET_W_RELEASE(ax_reg, REG_##reg); \
+        STORE_REG_TARGET_W_RELEASE(temp_reg, REG_AX);  \
+                                                       \
+        return op_pc;                                  \
     }
 
 OP_XCHG_AX_(BX)
@@ -21,19 +25,23 @@ OP_XCHG_AX_(DI)
 OP_XCHG_AX_(SP)
 OP_XCHG_AX_(BP)
 
-#define OP_XCHG_EAX_(reg)                                                                                    \
-    static uint32_t                                                                                          \
-    ropXCHG_EAX_##reg(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block) \
-    {                                                                                                        \
-        int eax_reg, host_reg, temp_reg;                                                                     \
-                                                                                                             \
-        eax_reg  = LOAD_REG_L(REG_EAX);                                                                      \
-        host_reg = LOAD_REG_L(REG_##reg);                                                                    \
-        temp_reg = COPY_REG(host_reg);                                                                       \
-        STORE_REG_TARGET_L_RELEASE(eax_reg, REG_##reg);                                                      \
-        STORE_REG_TARGET_L_RELEASE(temp_reg, REG_EAX);                                                       \
-                                                                                                             \
-        return op_pc;                                                                                        \
+#define OP_XCHG_EAX_(reg)                               \
+    static uint32_t                                     \
+    ropXCHG_EAX_##reg(UNUSED(uint8_t opcode),           \
+                      UNUSED(uint32_t fetchdat),        \
+                      UNUSED(uint32_t op_32),           \
+                      uint32_t op_pc,                   \
+                      UNUSED(codeblock_t *block))       \
+    {                                                   \
+        int eax_reg, host_reg, temp_reg;                \
+                                                        \
+        eax_reg  = LOAD_REG_L(REG_EAX);                 \
+        host_reg = LOAD_REG_L(REG_##reg);               \
+        temp_reg = COPY_REG(host_reg);                  \
+        STORE_REG_TARGET_L_RELEASE(eax_reg, REG_##reg); \
+        STORE_REG_TARGET_L_RELEASE(temp_reg, REG_EAX);  \
+                                                        \
+        return op_pc;                                   \
     }
 
 OP_XCHG_EAX_(EBX)
@@ -45,7 +53,7 @@ OP_XCHG_EAX_(ESP)
 OP_XCHG_EAX_(EBP)
 
 static uint32_t
-ropXCHG_b(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropXCHG_b(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int src_reg;
     int dst_reg;
@@ -63,7 +71,7 @@ ropXCHG_b(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
     return op_pc + 1;
 }
 static uint32_t
-ropXCHG_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropXCHG_w(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int src_reg;
     int dst_reg;
@@ -81,7 +89,7 @@ ropXCHG_w(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, cod
     return op_pc + 1;
 }
 static uint32_t
-ropXCHG_l(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)
+ropXCHG_l(UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc, UNUSED(codeblock_t *block))
 {
     int src_reg;
     int dst_reg;
diff --git a/src/codegen/codegen_x86-64.c b/src/codegen/codegen_x86-64.c
index 421f20026..fb775a2d0 100644
--- a/src/codegen/codegen_x86-64.c
+++ b/src/codegen/codegen_x86-64.c
@@ -7,12 +7,14 @@
 #    include <stdlib.h>
 #    define HAVE_STDARG_H
 #    include <86box/86box.h>
+#    include <86box/plat.h>
 #    include "cpu.h"
 #    include "x86.h"
 #    include "x86_flags.h"
 #    include "x86_ops.h"
 #    include "x86seg_common.h"
 #    include "x86seg.h"
+#    include "x87_sf.h"
 #    include "x87.h"
 #    include <86box/mem.h>
 #    include <86box/plat_unused.h>
@@ -24,14 +26,6 @@
 #    include "codegen_ops.h"
 #    include "codegen_ops_x86-64.h"
 
-#    if defined(__unix__) || defined(__APPLE__) || defined(__HAIKU__)
-#        include <sys/mman.h>
-#        include <unistd.h>
-#    endif
-#    if _WIN64
-#        include <windows.h>
-#    endif
-
 int      codegen_flat_ds;
 int      codegen_flat_ss;
 int      codegen_flags_changed = 0;
@@ -67,13 +61,7 @@ static int      last_ssegs;
 void
 codegen_init(void)
 {
-#    if _WIN64
-    codeblock = VirtualAlloc(NULL, BLOCK_SIZE * sizeof(codeblock_t), MEM_COMMIT, PAGE_EXECUTE_READWRITE);
-#    elif defined(__unix__) || defined(__APPLE__) || defined(__HAIKU__)
-    codeblock = mmap(NULL, BLOCK_SIZE * sizeof(codeblock_t), PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE, -1, 0);
-#    else
-    codeblock = malloc(BLOCK_SIZE * sizeof(codeblock_t));
-#    endif
+    codeblock      = plat_mmap(BLOCK_SIZE * sizeof(codeblock_t), 1);
     codeblock_hash = malloc(HASH_SIZE * sizeof(codeblock_t *));
 
     memset(codeblock, 0, BLOCK_SIZE * sizeof(codeblock_t));
@@ -137,7 +125,7 @@ add_to_block_list(codeblock_t *block)
 }
 
 static void
-remove_from_block_list(codeblock_t *block, uint32_t pc)
+remove_from_block_list(codeblock_t *block, UNUSED(uint32_t pc))
 {
     if (!block->page_mask)
         return;
@@ -511,14 +499,14 @@ static int opcode_modrm[256] = {
 
 int opcode_0f_modrm[256] = {
     1, 1, 1, 1,  0, 0, 0, 0,  0, 0, 0, 0,  0, 1, 0, 1, /*00*/
-    0, 0, 0, 0,  0, 0, 0, 0,  1, 1, 1, 1,  1, 1, 1, 1, /*10*/
+    1, 1, 1, 1,  0, 0, 0, 0,  1, 1, 1, 1,  1, 1, 1, 1, /*10*/
     1, 1, 1, 1,  1, 1, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, /*20*/
-    0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 1, /*30*/
+    0, 0, 0, 0,  0, 0, 1, 1,  0, 0, 0, 0,  0, 0, 0, 1, /*30*/
 
     1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1, /*40*/
-    0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, /*50*/
+    1, 1, 1, 0,  1, 1, 0, 0,  1, 1, 1, 1,  1, 1, 1, 0, /*50*/
     1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,  0, 0, 1, 1, /*60*/
-    0, 1, 1, 1,  1, 1, 1, 0,  0, 0, 0, 0,  0, 0, 1, 1, /*70*/
+    0, 1, 1, 1,  1, 1, 1, 0,  1, 1, 1, 1,  1, 1, 1, 1, /*70*/
 
     0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, /*80*/
     1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1, /*90*/
@@ -830,7 +818,9 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
     int          over            = 0;
     int          pc_off          = 0;
     int          test_modrm      = 1;
+    int          in_lock         = 0;
     int          c;
+    uint32_t     op87            = 0x00000000;
 
     op_ea_seg = &cpu_state.seg_ds;
     op_ssegs  = 0;
@@ -884,6 +874,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 break;
 
             case 0xd8:
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_d8_a32 : x86_dynarec_opcodes_d8_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_d8;
                 opcode_shift    = 3;
@@ -894,6 +885,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 block->flags |= CODEBLOCK_HAS_FPU;
                 break;
             case 0xd9:
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_d9_a32 : x86_dynarec_opcodes_d9_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_d9;
                 opcode_mask     = 0xff;
@@ -903,6 +895,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 block->flags |= CODEBLOCK_HAS_FPU;
                 break;
             case 0xda:
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_da_a32 : x86_dynarec_opcodes_da_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_da;
                 opcode_mask     = 0xff;
@@ -912,6 +905,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 block->flags |= CODEBLOCK_HAS_FPU;
                 break;
             case 0xdb:
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_db_a32 : x86_dynarec_opcodes_db_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_db;
                 opcode_mask     = 0xff;
@@ -921,6 +915,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 block->flags |= CODEBLOCK_HAS_FPU;
                 break;
             case 0xdc:
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_dc_a32 : x86_dynarec_opcodes_dc_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_dc;
                 opcode_shift    = 3;
@@ -931,6 +926,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 block->flags |= CODEBLOCK_HAS_FPU;
                 break;
             case 0xdd:
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_dd_a32 : x86_dynarec_opcodes_dd_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_dd;
                 opcode_mask     = 0xff;
@@ -940,6 +936,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 block->flags |= CODEBLOCK_HAS_FPU;
                 break;
             case 0xde:
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_de_a32 : x86_dynarec_opcodes_de_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_de;
                 opcode_mask     = 0xff;
@@ -949,6 +946,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 block->flags |= CODEBLOCK_HAS_FPU;
                 break;
             case 0xdf:
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_df_a32 : x86_dynarec_opcodes_df_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_df;
                 opcode_mask     = 0xff;
@@ -959,6 +957,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 break;
 
             case 0xf0: /*LOCK*/
+                in_lock         = 0;
                 break;
 
             case 0xf2: /*REPNE*/
@@ -1012,6 +1011,13 @@ generate_call:
         recomp_op_table = recomp_opcodes;
     }
 
+    if (op87 != 0x0000) {
+        STORE_IMM_ADDR_L((uintptr_t) &x87_op, op87);
+    }
+
+    if (in_lock && ((opcode == 0x90) || (opcode == 0xec)))
+        goto codegen_skip;
+
     if (recomp_op_table && recomp_op_table[(opcode | op_32) & 0x1ff]) {
         uint32_t new_pc = recomp_op_table[(opcode | op_32) & 0x1ff](opcode, fetchdat, op_32, op_pc, block);
         if (new_pc) {
@@ -1039,7 +1045,13 @@ generate_call:
         }
     }
 
-    op = op_table[((opcode >> opcode_shift) | op_32) & opcode_mask];
+codegen_skip:
+    if (in_lock && ((opcode == 0x90) || (opcode == 0xec)))
+        /* This is always ILLEGAL. */
+        op = x86_dynarec_opcodes_3DNOW[0xff];
+    else
+        op = op_table[((opcode >> opcode_shift) | op_32) & opcode_mask];
+
     if (op_ssegs != last_ssegs) {
         last_ssegs = op_ssegs;
         addbyte(0xC6); /*MOVB $0,(ssegs)*/
diff --git a/src/codegen/codegen_x86.c b/src/codegen/codegen_x86.c
index 456f93ae9..e0b9b633a 100644
--- a/src/codegen/codegen_x86.c
+++ b/src/codegen/codegen_x86.c
@@ -44,6 +44,7 @@
 #    include <stdlib.h>
 #    include <wchar.h>
 #    include <86box/86box.h>
+#    include <86box/plat.h>
 #    include "cpu.h"
 #    include <86box/mem.h>
 #    include "x86.h"
@@ -51,6 +52,7 @@
 #    include "x86_ops.h"
 #    include "x86seg_common.h"
 #    include "x86seg.h"
+#    include "x87_sf.h"
 #    include "x87.h"
 /*ex*/
 #    include <86box/nmi.h>
@@ -63,14 +65,6 @@
 #    include "codegen_ops.h"
 #    include "codegen_ops_x86.h"
 
-#    ifdef __unix__
-#        include <sys/mman.h>
-#        include <unistd.h>
-#    endif
-#    if defined _WIN32
-#        include <windows.h>
-#    endif
-
 int      codegen_flat_ds;
 int      codegen_flat_ss;
 int      mmx_ebx_ecx_loaded;
@@ -1193,13 +1187,7 @@ gen_MEM_CHECK_WRITE_L(void)
 void
 codegen_init(void)
 {
-#    ifdef _WIN32
-    codeblock = VirtualAlloc(NULL, (BLOCK_SIZE + 1) * sizeof(codeblock_t), MEM_COMMIT, PAGE_EXECUTE_READWRITE);
-#    elif defined __unix__
-    codeblock = mmap(NULL, (BLOCK_SIZE + 1) * sizeof(codeblock_t), PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE, 0, 0);
-#    else
-    codeblock = malloc((BLOCK_SIZE + 1) * sizeof(codeblock_t));
-#    endif
+    codeblock      = plat_mmap((BLOCK_SIZE + 1) * sizeof(codeblock_t), 1);
     codeblock_hash = malloc(HASH_SIZE * sizeof(codeblock_t *));
 
     memset(codeblock, 0, (BLOCK_SIZE + 1) * sizeof(codeblock_t));
@@ -1655,14 +1643,14 @@ static int opcode_modrm[256] = {
 
 int opcode_0f_modrm[256] = {
     1, 1, 1, 1,  0, 0, 0, 0,  0, 0, 0, 0,  0, 1, 0, 1, /*00*/
-    0, 0, 0, 0,  0, 0, 0, 0,  1, 1, 1, 1,  1, 1, 1, 1, /*10*/
+    1, 1, 1, 1,  0, 0, 0, 0,  1, 1, 1, 1,  1, 1, 1, 1, /*10*/
     1, 1, 1, 1,  1, 1, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, /*20*/
-    0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 1, /*30*/
+    0, 0, 0, 0,  0, 0, 1, 1,  0, 0, 0, 0,  0, 0, 0, 1, /*30*/
 
     1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1, /*40*/
-    0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, /*50*/
+    1, 1, 1, 0,  1, 1, 0, 0,  1, 1, 1, 1,  1, 1, 1, 0, /*50*/
     1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,  0, 0, 1, 1, /*60*/
-    0, 1, 1, 1,  1, 1, 1, 0,  0, 0, 0, 0,  0, 0, 1, 1, /*70*/
+    0, 1, 1, 1,  1, 1, 1, 0,  1, 1, 1, 1,  1, 1, 1, 1, /*70*/
 
     0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, /*80*/
     1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1, /*90*/
@@ -1869,7 +1857,9 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
     int          over            = 0;
     int          pc_off          = 0;
     int          test_modrm      = 1;
+    int          in_lock         = 0;
     int          c;
+    uint32_t     op87            = 0x00000000;
 
     op_ea_seg = &cpu_state.seg_ds;
     op_ssegs  = 0;
@@ -1924,6 +1914,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 break;
 
             case 0xd8:
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_d8_a32 : x86_dynarec_opcodes_d8_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_d8;
                 opcode_shift    = 3;
@@ -1934,6 +1925,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 block->flags |= CODEBLOCK_HAS_FPU;
                 break;
             case 0xd9:
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_d9_a32 : x86_dynarec_opcodes_d9_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_d9;
                 opcode_mask     = 0xff;
@@ -1943,6 +1935,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 block->flags |= CODEBLOCK_HAS_FPU;
                 break;
             case 0xda:
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_da_a32 : x86_dynarec_opcodes_da_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_da;
                 opcode_mask     = 0xff;
@@ -1952,6 +1945,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 block->flags |= CODEBLOCK_HAS_FPU;
                 break;
             case 0xdb:
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_db_a32 : x86_dynarec_opcodes_db_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_db;
                 opcode_mask     = 0xff;
@@ -1961,6 +1955,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 block->flags |= CODEBLOCK_HAS_FPU;
                 break;
             case 0xdc:
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_dc_a32 : x86_dynarec_opcodes_dc_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_dc;
                 opcode_shift    = 3;
@@ -1971,6 +1966,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 block->flags |= CODEBLOCK_HAS_FPU;
                 break;
             case 0xdd:
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_dd_a32 : x86_dynarec_opcodes_dd_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_dd;
                 opcode_mask     = 0xff;
@@ -1980,6 +1976,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 block->flags |= CODEBLOCK_HAS_FPU;
                 break;
             case 0xde:
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_de_a32 : x86_dynarec_opcodes_de_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_de;
                 opcode_mask     = 0xff;
@@ -1989,6 +1986,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 block->flags |= CODEBLOCK_HAS_FPU;
                 break;
             case 0xdf:
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_df_a32 : x86_dynarec_opcodes_df_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_df;
                 opcode_mask     = 0xff;
@@ -1999,6 +1997,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 break;
 
             case 0xf0: /*LOCK*/
+                in_lock         = 1;
                 break;
 
             case 0xf2: /*REPNE*/
@@ -2053,6 +2052,13 @@ generate_call:
         recomp_op_table = recomp_opcodes;
     }
 
+    if (op87 != 0x0000) {
+        STORE_IMM_ADDR_L((uintptr_t) &x87_op, op87);
+    }
+
+    if (in_lock && ((opcode == 0x90) || (opcode == 0xec)))
+        goto codegen_skip;
+
     if (recomp_op_table && recomp_op_table[(opcode | op_32) & 0x1ff]) {
         uint32_t new_pc = recomp_op_table[(opcode | op_32) & 0x1ff](opcode, fetchdat, op_32, op_pc, block);
         if (new_pc) {
@@ -2079,7 +2085,13 @@ generate_call:
         }
     }
 
-    op = op_table[((opcode >> opcode_shift) | op_32) & opcode_mask];
+codegen_skip:
+    if (in_lock && ((opcode == 0x90) || (opcode == 0xec)))
+        /* This is always ILLEGAL. */
+        op = x86_dynarec_opcodes_3DNOW[0xff];
+    else
+        op = op_table[((opcode >> opcode_shift) | op_32) & opcode_mask];
+
     if (op_ssegs != last_ssegs) {
         last_ssegs = op_ssegs;
 
diff --git a/src/codegen_new/CMakeLists.txt b/src/codegen_new/CMakeLists.txt
index 038f1edd1..cee7d5cb9 100644
--- a/src/codegen_new/CMakeLists.txt
+++ b/src/codegen_new/CMakeLists.txt
@@ -9,39 +9,71 @@
 #          CMake build script.
 #
 # Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
 #
 #          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2024      Jasmine Iwanek.
 #
 
 if(DYNAREC)
-    add_library(dynarec OBJECT codegen.c codegen_accumulate.c
-        codegen_allocator.c codegen_block.c codegen_ir.c codegen_ops.c
-        codegen_ops_3dnow.c codegen_ops_branch.c codegen_ops_arith.c
-        codegen_ops_fpu_arith.c codegen_ops_fpu_constant.c
-        codegen_ops_fpu_loadstore.c codegen_ops_fpu_misc.c
-        codegen_ops_helpers.c codegen_ops_jump.c codegen_ops_logic.c
-        codegen_ops_misc.c codegen_ops_mmx_arith.c codegen_ops_mmx_cmp.c
-        codegen_ops_mmx_loadstore.c codegen_ops_mmx_logic.c
-        codegen_ops_mmx_pack.c codegen_ops_mmx_shift.c codegen_ops_mov.c
-        codegen_ops_shift.c codegen_ops_stack.c codegen_reg.c)
+    add_library(dynarec OBJECT
+        codegen.c
+        codegen_accumulate.c
+        codegen_allocator.c
+        codegen_block.c
+        codegen_ir.c
+        codegen_ops.c
+        codegen_ops_3dnow.c
+        codegen_ops_branch.c
+        codegen_ops_arith.c
+        codegen_ops_fpu_arith.c
+        codegen_ops_fpu_constant.c
+        codegen_ops_fpu_loadstore.c
+        codegen_ops_fpu_misc.c
+        codegen_ops_helpers.c
+        codegen_ops_jump.c
+        codegen_ops_logic.c
+        codegen_ops_misc.c
+        codegen_ops_mmx_arith.c
+        codegen_ops_mmx_cmp.c
+        codegen_ops_mmx_loadstore.c
+        codegen_ops_mmx_logic.c
+        codegen_ops_mmx_pack.c
+        codegen_ops_mmx_shift.c
+        codegen_ops_mov.c
+        codegen_ops_shift.c
+        codegen_ops_stack.c
+        codegen_reg.c
+    )
 
     if(ARCH STREQUAL "i386")
-        target_sources(dynarec PRIVATE codegen_backend_x86.c
-            codegen_backend_x86_ops.c codegen_backend_x86_ops_fpu.c
+        target_sources(dynarec PRIVATE
+            codegen_backend_x86.c
+            codegen_backend_x86_ops.c
+            codegen_backend_x86_ops_fpu.c
             codegen_backend_x86_ops_sse.c
-            codegen_backend_x86_uops.c)
+            codegen_backend_x86_uops.c
+        )
     elseif(ARCH STREQUAL "x86_64")
-        target_sources(dynarec PRIVATE codegen_backend_x86-64.c
+        target_sources(dynarec PRIVATE
+            codegen_backend_x86-64.c
             codegen_backend_x86-64_ops.c
             codegen_backend_x86-64_ops_sse.c
-            codegen_backend_x86-64_uops.c)
+            codegen_backend_x86-64_uops.c
+        )
     elseif(ARCH STREQUAL "arm64")
-        target_sources(dynarec PRIVATE codegen_backend_arm64.c
-            codegen_backend_arm64_ops.c codegen_backend_arm64_uops.c
-            codegen_backend_arm64_imm.c)
+        target_sources(dynarec PRIVATE
+            codegen_backend_arm64.c
+            codegen_backend_arm64_ops.c
+            codegen_backend_arm64_uops.c
+            codegen_backend_arm64_imm.c
+        )
     elseif(ARCH STREQUAL "arm")
-        target_sources(dynarec PRIVATE codegen_backend_arm.c
-            codegen_backend_arm_ops.c codegen_backend_arm_uops.c)
+        target_sources(dynarec PRIVATE
+            codegen_backend_arm.c
+            codegen_backend_arm_ops.c
+            codegen_backend_arm_uops.c
+        )
     else()
         message(SEND_ERROR
             "Dynarec is incompatible with target platform ${ARCH}")
diff --git a/src/codegen_new/codegen.c b/src/codegen_new/codegen.c
index a3f4ede8f..875dd72ca 100644
--- a/src/codegen_new/codegen.c
+++ b/src/codegen_new/codegen.c
@@ -21,8 +21,7 @@
 
 #define MAX_INSTRUCTION_COUNT 50
 
-static struct
-{
+static struct {
     uint32_t pc;
     int      op_ssegs;
     x86seg  *op_ea_seg;
@@ -360,14 +359,14 @@ static uint8_t opcode_modrm[256] = {
 
 static uint8_t opcode_0f_modrm[256] = {
     1, 1, 1, 1,  0, 0, 0, 0,  0, 0, 0, 0,  0, 1, 0, 1, /*00*/
-    0, 0, 0, 0,  0, 0, 0, 0,  1, 1, 1, 1,  1, 1, 1, 1, /*10*/
+    1, 1, 1, 1,  0, 0, 0, 0,  1, 1, 1, 1,  1, 1, 1, 1, /*10*/
     1, 1, 1, 1,  1, 1, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, /*20*/
-    0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 1, /*30*/
+    0, 0, 0, 0,  0, 0, 1, 1,  0, 0, 0, 0,  0, 0, 0, 1, /*30*/
 
     1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1, /*40*/
-    0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, /*50*/
+    1, 1, 1, 0,  1, 1, 0, 0,  1, 1, 1, 1,  1, 1, 1, 0, /*50*/
     1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,  0, 0, 1, 1, /*60*/
-    0, 1, 1, 1,  1, 1, 1, 0,  0, 0, 0, 0,  0, 0, 1, 1, /*70*/
+    0, 1, 1, 1,  1, 1, 1, 0,  1, 1, 1, 1,  1, 1, 1, 1, /*70*/
 
     0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, /*80*/
     1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1, /*90*/
@@ -396,7 +395,9 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
     int          over               = 0;
     int          test_modrm         = 1;
     int          pc_off             = 0;
+    int          in_lock            = 0;
     uint32_t     next_pc            = 0;
+    uint16_t     op87               = 0x0000;
 #ifdef DEBUG_EXTRA
     uint8_t last_prefix = 0;
 #endif
@@ -452,6 +453,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
 #ifdef DEBUG_EXTRA
                 last_prefix = 0xd8;
 #endif
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_d8_a32 : x86_dynarec_opcodes_d8_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_d8;
                 opcode_shift    = 3;
@@ -465,6 +467,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
 #ifdef DEBUG_EXTRA
                 last_prefix = 0xd9;
 #endif
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_d9_a32 : x86_dynarec_opcodes_d9_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_d9;
                 opcode_mask     = 0xff;
@@ -477,6 +480,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
 #ifdef DEBUG_EXTRA
                 last_prefix = 0xda;
 #endif
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_da_a32 : x86_dynarec_opcodes_da_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_da;
                 opcode_mask     = 0xff;
@@ -489,6 +493,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
 #ifdef DEBUG_EXTRA
                 last_prefix = 0xdb;
 #endif
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_db_a32 : x86_dynarec_opcodes_db_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_db;
                 opcode_mask     = 0xff;
@@ -501,6 +506,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
 #ifdef DEBUG_EXTRA
                 last_prefix = 0xdc;
 #endif
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_dc_a32 : x86_dynarec_opcodes_dc_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_dc;
                 opcode_shift    = 3;
@@ -514,6 +520,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
 #ifdef DEBUG_EXTRA
                 last_prefix = 0xdd;
 #endif
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_dd_a32 : x86_dynarec_opcodes_dd_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_dd;
                 opcode_mask     = 0xff;
@@ -526,6 +533,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
 #ifdef DEBUG_EXTRA
                 last_prefix = 0xde;
 #endif
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_de_a32 : x86_dynarec_opcodes_de_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_de;
                 opcode_mask     = 0xff;
@@ -538,6 +546,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
 #ifdef DEBUG_EXTRA
                 last_prefix = 0xdf;
 #endif
+                op87            = (op87 & 0xf800) | ((opcode & 0x07) << 8) | (fetchdat & 0xff);
                 op_table        = (op_32 & 0x200) ? x86_dynarec_opcodes_df_a32 : x86_dynarec_opcodes_df_a16;
                 recomp_op_table = fpu_softfloat ? NULL : recomp_opcodes_df;
                 opcode_mask     = 0xff;
@@ -548,6 +557,7 @@ codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t new_p
                 break;
 
             case 0xf0: /*LOCK*/
+                in_lock         = 1;
                 break;
 
             case 0xf2: /*REPNE*/
@@ -658,12 +668,18 @@ generate_call:
         }
     }
     codegen_mark_code_present(block, cs + old_pc, (op_pc - old_pc) - pc_off);
+    if (op87 != 0x0000) {
+        uop_MOV_IMM(ir, IREG_x87_op, op87);
+    }
     /* It is apparently a prefixed instruction. */
 #if 0
     if ((recomp_op_table == recomp_opcodes) && (opcode == 0x48))
         goto codegen_skip;
 #endif
 
+    if (in_lock && ((opcode == 0x90) || (opcode == 0xec)))
+        goto codegen_skip;
+
     if (recomp_op_table && recomp_op_table[(opcode | op_32) & recomp_opcode_mask]) {
         uint32_t new_pc = recomp_op_table[(opcode | op_32) & recomp_opcode_mask](block, ir, opcode, fetchdat, op_32, op_pc);
         if (new_pc) {
@@ -681,13 +697,17 @@ generate_call:
         }
     }
 
-    // codegen_skip:
+codegen_skip:
     if ((op_table == x86_dynarec_opcodes_REPNE || op_table == x86_dynarec_opcodes_REPE) && !op_table[opcode | op_32]) {
         op_table        = x86_dynarec_opcodes;
         recomp_op_table = recomp_opcodes;
     }
 
-    op = op_table[((opcode >> opcode_shift) | op_32) & opcode_mask];
+    if (in_lock && ((opcode == 0x90) || (opcode == 0xec)))
+        /* This is always ILLEGAL. */
+        op = x86_dynarec_opcodes_3DNOW[0xff];
+    else
+        op = op_table[((opcode >> opcode_shift) | op_32) & opcode_mask];
 
     if (!test_modrm || (op_table == x86_dynarec_opcodes && opcode_modrm[opcode]) || (op_table == x86_dynarec_opcodes_0f && opcode_0f_modrm[opcode]) || (op_table == x86_dynarec_opcodes_3DNOW)) {
         int stack_offset = 0;
@@ -726,8 +746,7 @@ generate_call:
         uop_MOV_PTR(ir, IREG_ea_seg, (void *) op_ea_seg);
     if (op_ssegs != last_op_ssegs)
         uop_MOV_IMM(ir, IREG_ssegs, op_ssegs);
-    uop_LOAD_FUNC_ARG_IMM(ir, 0, fetchdat);
-    uop_CALL_INSTRUCTION_FUNC(ir, op);
+    uop_CALL_INSTRUCTION_FUNC(ir, op, fetchdat);
     codegen_flags_changed = 0;
     codegen_mark_code_present(block, cs + cpu_state.pc, 8);
 
diff --git a/src/codegen_new/codegen.h b/src/codegen_new/codegen.h
index deeeb899c..0ff6a90d6 100644
--- a/src/codegen_new/codegen.h
+++ b/src/codegen_new/codegen.h
@@ -306,6 +306,7 @@ struct ir_data_t;
 x86seg     *codegen_generate_ea(struct ir_data_t *ir, x86seg *op_ea_seg, uint32_t fetchdat, int op_ssegs, uint32_t *op_pc, uint32_t op_32, int stack_offset);
 extern void codegen_check_seg_read(codeblock_t *block, struct ir_data_t *ir, x86seg *seg);
 extern void codegen_check_seg_write(codeblock_t *block, struct ir_data_t *ir, x86seg *seg);
+extern void codegen_check_regs(void);
 
 extern int codegen_purge_purgable_list(void);
 /*Delete a random code block to free memory. This is obviously quite expensive, and
@@ -341,6 +342,7 @@ extern codegen_timing_t codegen_timing_686;
 extern codegen_timing_t codegen_timing_486;
 extern codegen_timing_t codegen_timing_winchip;
 extern codegen_timing_t codegen_timing_winchip2;
+extern codegen_timing_t codegen_timing_k5;
 extern codegen_timing_t codegen_timing_k6;
 extern codegen_timing_t codegen_timing_p6;
 
diff --git a/src/codegen_new/codegen_accumulate.c b/src/codegen_new/codegen_accumulate.c
index 29b05ad77..087d9c797 100644
--- a/src/codegen_new/codegen_accumulate.c
+++ b/src/codegen_new/codegen_accumulate.c
@@ -8,8 +8,7 @@
 #include "codegen_accumulate.h"
 #include "codegen_ir.h"
 
-static struct
-{
+static struct {
     int count;
     int dest_reg;
 } acc_regs[] = {
diff --git a/src/codegen_new/codegen_allocator.c b/src/codegen_new/codegen_allocator.c
index 90e619d70..3cdb731b9 100644
--- a/src/codegen_new/codegen_allocator.c
+++ b/src/codegen_new/codegen_allocator.c
@@ -13,6 +13,7 @@
 #include <86box/86box.h>
 #include "cpu.h"
 #include <86box/mem.h>
+#include <86box/plat.h>
 #include <86box/plat_unused.h>
 
 #include "codegen.h"
@@ -33,15 +34,7 @@ int codegen_allocator_usage = 0;
 void
 codegen_allocator_init(void)
 {
-#if defined WIN32 || defined _WIN32 || defined _WIN32
-    mem_block_alloc = VirtualAlloc(NULL, MEM_BLOCK_NR * MEM_BLOCK_SIZE, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
-    /* TODO: check deployment target: older Intel-based versions of macOS don't play
-       nice with MAP_JIT. */
-#elif defined(__APPLE__) && defined(MAP_JIT)
-    mem_block_alloc = mmap(0, MEM_BLOCK_NR * MEM_BLOCK_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE | MAP_JIT, -1, 0);
-#else
-    mem_block_alloc = mmap(0, MEM_BLOCK_NR * MEM_BLOCK_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE, -1, 0);
-#endif
+    mem_block_alloc = plat_mmap(MEM_BLOCK_NR * MEM_BLOCK_SIZE, 1);
 
     for (uint32_t c = 0; c < MEM_BLOCK_NR; c++) {
         mem_blocks[c].offset     = c * MEM_BLOCK_SIZE;
diff --git a/src/codegen_new/codegen_backend_arm.c b/src/codegen_new/codegen_backend_arm.c
index b1e904096..9c480dccf 100644
--- a/src/codegen_new/codegen_backend_arm.c
+++ b/src/codegen_new/codegen_backend_arm.c
@@ -15,6 +15,7 @@
 #    include "x86.h"
 #    include "x86seg_common.h"
 #    include "x86seg.h"
+#    include "x87_sf.h"
 #    include "x87.h"
 
 #    if defined(__linux__) || defined(__APPLE__)
diff --git a/src/codegen_new/codegen_backend_arm64.c b/src/codegen_new/codegen_backend_arm64.c
index 1eb94a909..5c2233b63 100644
--- a/src/codegen_new/codegen_backend_arm64.c
+++ b/src/codegen_new/codegen_backend_arm64.c
@@ -15,6 +15,7 @@
 #    include "x86.h"
 #    include "x86seg_common.h"
 #    include "x86seg.h"
+#    include "x87_sf.h"
 #    include "x87.h"
 
 #    if defined(__linux__) || defined(__APPLE__)
diff --git a/src/codegen_new/codegen_backend_arm64_uops.c b/src/codegen_new/codegen_backend_arm64_uops.c
index 7514e1f0c..2bb6281ff 100644
--- a/src/codegen_new/codegen_backend_arm64_uops.c
+++ b/src/codegen_new/codegen_backend_arm64_uops.c
@@ -9,6 +9,7 @@
 #    include "x86.h"
 #    include "x86seg_common.h"
 #    include "x86seg.h"
+#    include "x87_sf.h"
 #    include "x87.h"
 #    include "386_common.h"
 #    include "codegen.h"
@@ -217,6 +218,7 @@ codegen_CALL_FUNC_RESULT(codeblock_t *block, uop_t *uop)
 static int
 codegen_CALL_INSTRUCTION_FUNC(codeblock_t *block, uop_t *uop)
 {
+    host_arm64_mov_imm(block, REG_ARG0, uop->imm_data);
     host_arm64_call(block, uop->p);
     host_arm64_CBNZ(block, REG_X0, (uintptr_t) codegen_exit_rout);
 
@@ -648,10 +650,10 @@ codegen_FTST(codeblock_t *block, uop_t *uop)
         host_arm64_FSUB_D(block, REG_V_TEMP, REG_V_TEMP, REG_V_TEMP);
         host_arm64_MOVZ_IMM(block, dest_reg, 0);
         host_arm64_FCMP_D(block, src_reg_a, REG_V_TEMP);
-        host_arm64_ORR_IMM(block, REG_TEMP, dest_reg, C3);
-        host_arm64_ORR_IMM(block, REG_TEMP2, dest_reg, C0);
+        host_arm64_ORR_IMM(block, REG_TEMP, dest_reg, FPU_SW_C3);
+        host_arm64_ORR_IMM(block, REG_TEMP2, dest_reg, FPU_SW_C0);
         host_arm64_CSEL_EQ(block, dest_reg, REG_TEMP, dest_reg);
-        host_arm64_ORR_IMM(block, REG_TEMP, dest_reg, C0 | C2 | C3);
+        host_arm64_ORR_IMM(block, REG_TEMP, dest_reg, FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
         host_arm64_CSEL_CC(block, dest_reg, REG_TEMP2, dest_reg);
         host_arm64_CSEL_VS(block, dest_reg, REG_TEMP, dest_reg);
     } else
@@ -690,10 +692,10 @@ codegen_FCOM(codeblock_t *block, uop_t *uop)
     if (REG_IS_W(dest_size) && REG_IS_D(src_size_a) && REG_IS_D(src_size_b)) {
         host_arm64_MOVZ_IMM(block, dest_reg, 0);
         host_arm64_FCMP_D(block, src_reg_a, src_reg_b);
-        host_arm64_ORR_IMM(block, REG_TEMP, dest_reg, C3);
-        host_arm64_ORR_IMM(block, REG_TEMP2, dest_reg, C0);
+        host_arm64_ORR_IMM(block, REG_TEMP, dest_reg, FPU_SW_C3);
+        host_arm64_ORR_IMM(block, REG_TEMP2, dest_reg, FPU_SW_C0);
         host_arm64_CSEL_EQ(block, dest_reg, REG_TEMP, dest_reg);
-        host_arm64_ORR_IMM(block, REG_TEMP, dest_reg, C0 | C2 | C3);
+        host_arm64_ORR_IMM(block, REG_TEMP, dest_reg, FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
         host_arm64_CSEL_CC(block, dest_reg, REG_TEMP2, dest_reg);
         host_arm64_CSEL_VS(block, dest_reg, REG_TEMP, dest_reg);
     } else
@@ -930,6 +932,8 @@ codegen_MEM_LOAD_REG(codeblock_t *block, uop_t *uop)
     host_arm64_ADD_REG(block, REG_X0, seg_reg, addr_reg, 0);
     if (uop->imm_data)
         host_arm64_ADD_IMM(block, REG_X0, REG_X0, uop->imm_data);
+    if (uop->is_a16)
+        host_arm64_AND_IMM(block, REG_X0, REG_X0, 0xffff);
     if (REG_IS_B(dest_size) || REG_IS_BH(dest_size)) {
         host_arm64_call(block, codegen_mem_load_byte);
     } else if (REG_IS_W(dest_size)) {
diff --git a/src/codegen_new/codegen_backend_arm_uops.c b/src/codegen_new/codegen_backend_arm_uops.c
index 338d3dd54..b186e0e3b 100644
--- a/src/codegen_new/codegen_backend_arm_uops.c
+++ b/src/codegen_new/codegen_backend_arm_uops.c
@@ -10,6 +10,7 @@
 #    include "x86.h"
 #    include "x86seg_common.h"
 #    include "x86seg.h"
+#    include "x87_sf.h"
 #    include "x87.h"
 #    include "386_common.h"
 #    include "codegen.h"
@@ -285,6 +286,7 @@ codegen_CALL_FUNC_RESULT(codeblock_t *block, uop_t *uop)
 static int
 codegen_CALL_INSTRUCTION_FUNC(codeblock_t *block, uop_t *uop)
 {
+    host_arm_MOV_IMM(block, REG_ARG0, uop->imm_data);
     host_arm_call(block, uop->p);
     host_arm_TST_REG(block, REG_R0, REG_R0);
     host_arm_BNE(block, (uintptr_t) codegen_exit_rout);
@@ -718,9 +720,9 @@ codegen_FTST(codeblock_t *block, uop_t *uop)
         host_arm_VCMP_D(block, src_reg_a, REG_D_TEMP);
         host_arm_MOV_IMM(block, dest_reg, 0);
         host_arm_VMRS_APSR(block);
-        host_arm_ORREQ_IMM(block, dest_reg, dest_reg, C3);
-        host_arm_ORRCC_IMM(block, dest_reg, dest_reg, C0);
-        host_arm_ORRVS_IMM(block, dest_reg, dest_reg, C0 | C2 | C3);
+        host_arm_ORREQ_IMM(block, dest_reg, dest_reg, FPU_SW_C3);
+        host_arm_ORRCC_IMM(block, dest_reg, dest_reg, FPU_SW_C0);
+        host_arm_ORRVS_IMM(block, dest_reg, dest_reg, FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
     } else
         fatal("codegen_FTST %02x %02x %02x\n", uop->dest_reg_a_real, uop->src_reg_a_real, uop->src_reg_b_real);
 
@@ -758,9 +760,9 @@ codegen_FCOM(codeblock_t *block, uop_t *uop)
         host_arm_VCMP_D(block, src_reg_a, src_reg_b);
         host_arm_MOV_IMM(block, dest_reg, 0);
         host_arm_VMRS_APSR(block);
-        host_arm_ORREQ_IMM(block, dest_reg, dest_reg, C3);
-        host_arm_ORRCC_IMM(block, dest_reg, dest_reg, C0);
-        host_arm_ORRVS_IMM(block, dest_reg, dest_reg, C0 | C2 | C3);
+        host_arm_ORREQ_IMM(block, dest_reg, dest_reg, FPU_SW_C3);
+        host_arm_ORRCC_IMM(block, dest_reg, dest_reg, FPU_SW_C0);
+        host_arm_ORRVS_IMM(block, dest_reg, dest_reg, FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
     } else
         fatal("codegen_FCOM %02x %02x %02x\n", uop->dest_reg_a_real, uop->src_reg_a_real, uop->src_reg_b_real);
 
@@ -994,6 +996,8 @@ codegen_MEM_LOAD_REG(codeblock_t *block, uop_t *uop)
     host_arm_ADD_REG(block, REG_R0, seg_reg, addr_reg);
     if (uop->imm_data)
         host_arm_ADD_IMM(block, REG_R0, REG_R0, uop->imm_data);
+    if (uop->is_a16)
+        host_arm_AND_IMM(block, REG_R0, REG_R0, 0xffff);
     if (REG_IS_B(dest_size) || REG_IS_BH(dest_size)) {
         host_arm_BL(block, (uintptr_t) codegen_mem_load_byte);
     } else if (REG_IS_W(dest_size)) {
diff --git a/src/codegen_new/codegen_backend_x86-64.c b/src/codegen_new/codegen_backend_x86-64.c
index 3cbca28f8..20d02a8db 100644
--- a/src/codegen_new/codegen_backend_x86-64.c
+++ b/src/codegen_new/codegen_backend_x86-64.c
@@ -315,15 +315,21 @@ codegen_backend_init(void)
 #    endif
     host_x86_CALL(block, (void *) x86gpf);
     codegen_exit_rout = &codeblock[block_current].data[block_pos];
+#ifdef _WIN64
     host_x86_ADD64_REG_IMM(block, REG_RSP, 0x38);
+#else
+    host_x86_ADD64_REG_IMM(block, REG_RSP, 0x48);
+#endif
     host_x86_POP(block, REG_R15);
     host_x86_POP(block, REG_R14);
     host_x86_POP(block, REG_R13);
     host_x86_POP(block, REG_R12);
+#ifdef _WIN64
     host_x86_POP(block, REG_RDI);
     host_x86_POP(block, REG_RSI);
+#endif
     host_x86_POP(block, REG_RBP);
-    host_x86_POP(block, REG_RDX);
+    host_x86_POP(block, REG_RBX);
     host_x86_RET(block);
 
     block_write_data = NULL;
@@ -346,13 +352,19 @@ codegen_backend_prologue(codeblock_t *block)
     block_pos = BLOCK_START; /*Entry code*/
     host_x86_PUSH(block, REG_RBX);
     host_x86_PUSH(block, REG_RBP);
+#ifdef _WIN64
     host_x86_PUSH(block, REG_RSI);
     host_x86_PUSH(block, REG_RDI);
+#endif
     host_x86_PUSH(block, REG_R12);
     host_x86_PUSH(block, REG_R13);
     host_x86_PUSH(block, REG_R14);
     host_x86_PUSH(block, REG_R15);
+#ifdef _WIN64
     host_x86_SUB64_REG_IMM(block, REG_RSP, 0x38);
+#else
+    host_x86_SUB64_REG_IMM(block, REG_RSP, 0x48);
+#endif
     host_x86_MOV64_REG_IMM(block, REG_RBP, ((uintptr_t) &cpu_state) + 128);
     if (block->flags & CODEBLOCK_HAS_FPU) {
         host_x86_MOV32_REG_ABS(block, REG_EAX, &cpu_state.TOP);
@@ -360,21 +372,27 @@ codegen_backend_prologue(codeblock_t *block)
         host_x86_MOV32_BASE_OFFSET_REG(block, REG_RSP, IREG_TOP_diff_stack_offset, REG_EAX);
     }
     if (block->flags & CODEBLOCK_NO_IMMEDIATES)
-        host_x86_MOV64_REG_IMM(block, REG_R12, (uintptr_t) ram);
+        host_x86_MOV64_REG_IMM(block, REG_R12, ((uintptr_t) ram) + 2147483648ULL);
 }
 
 void
 codegen_backend_epilogue(codeblock_t *block)
 {
+#ifdef _WIN64
     host_x86_ADD64_REG_IMM(block, REG_RSP, 0x38);
+#else
+    host_x86_ADD64_REG_IMM(block, REG_RSP, 0x48);
+#endif
     host_x86_POP(block, REG_R15);
     host_x86_POP(block, REG_R14);
     host_x86_POP(block, REG_R13);
     host_x86_POP(block, REG_R12);
+#ifdef _WIN64
     host_x86_POP(block, REG_RDI);
     host_x86_POP(block, REG_RSI);
+#endif
     host_x86_POP(block, REG_RBP);
-    host_x86_POP(block, REG_RDX);
+    host_x86_POP(block, REG_RBX);
     host_x86_RET(block);
 }
 #endif
diff --git a/src/codegen_new/codegen_backend_x86-64_defs.h b/src/codegen_new/codegen_backend_x86-64_defs.h
index 12f05f01c..7c58fec31 100644
--- a/src/codegen_new/codegen_backend_x86-64_defs.h
+++ b/src/codegen_new/codegen_backend_x86-64_defs.h
@@ -1,5 +1,5 @@
 /*RBP = cpu_state + 128
-  R12 = ram (if block->flags & CODEBLOCK_NO_IMMEDIATES)*/
+  R12 = ram + 2147483648 (if block->flags & CODEBLOCK_NO_IMMEDIATES)*/
 #define REG_AX               0
 #define REG_CX               1
 #define REG_DX               2
diff --git a/src/codegen_new/codegen_backend_x86-64_ops.c b/src/codegen_new/codegen_backend_x86-64_ops.c
index 236a86ce7..9f89012c6 100644
--- a/src/codegen_new/codegen_backend_x86-64_ops.c
+++ b/src/codegen_new/codegen_backend_x86-64_ops.c
@@ -68,8 +68,10 @@ jmp(codeblock_t *block, uintptr_t func)
 void
 host_x86_ADD8_REG_IMM(codeblock_t *block, int dst_reg, uint8_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_ADD8_REG_IMM - dst_reg & 8\n");
+#endif
 
     if (dst_reg == REG_EAX) {
         codegen_alloc_bytes(block, 2);
@@ -82,8 +84,10 @@ host_x86_ADD8_REG_IMM(codeblock_t *block, int dst_reg, uint8_t imm_data)
 void
 host_x86_ADD16_REG_IMM(codeblock_t *block, int dst_reg, uint16_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_ADD16_REG_IMM - dst_reg & 8\n");
+#endif
 
     if (is_imm8(imm_data)) {
         codegen_alloc_bytes(block, 4);
@@ -101,8 +105,10 @@ host_x86_ADD16_REG_IMM(codeblock_t *block, int dst_reg, uint16_t imm_data)
 void
 host_x86_ADD32_REG_IMM(codeblock_t *block, int dst_reg, uint32_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_ADD32_REG_IMM - dst_reg & 8\n");
+#endif
 
     if (is_imm8(imm_data)) {
         codegen_alloc_bytes(block, 3);
@@ -120,8 +126,10 @@ host_x86_ADD32_REG_IMM(codeblock_t *block, int dst_reg, uint32_t imm_data)
 void
 host_x86_ADD64_REG_IMM(codeblock_t *block, int dst_reg, uint64_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_ADD64_REG_IMM - dst_reg & 8\n");
+#endif
 
     if (is_imm8(imm_data)) {
         codegen_alloc_bytes(block, 4);
@@ -132,8 +140,10 @@ host_x86_ADD64_REG_IMM(codeblock_t *block, int dst_reg, uint64_t imm_data)
 void
 host_x86_ADD8_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_ADD8_REG_REG - dst_reg & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0x00, 0xc0 | (dst_reg & 7) | ((src_reg & 7) << 3)); /*ADD dst_reg, src_reg*/
@@ -141,8 +151,10 @@ host_x86_ADD8_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 void
 host_x86_ADD16_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_ADD16_REG_REG - dst_reg & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0x66, 0x01, 0xc0 | (dst_reg & 7) | ((src_reg & 7) << 3)); /*ADD dst_reg, src_reg*/
@@ -150,8 +162,10 @@ host_x86_ADD16_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 void
 host_x86_ADD32_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_ADD32_REG_REG - dst_reg & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0x01, 0xc0 | (dst_reg & 7) | ((src_reg & 7) << 3)); /*ADD dst_reg, src_reg*/
@@ -160,8 +174,10 @@ host_x86_ADD32_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 void
 host_x86_AND8_REG_IMM(codeblock_t *block, int dst_reg, uint8_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_AND8_REG_IMM - dst_reg & 8\n");
+#endif
 
     if (dst_reg == REG_EAX) {
         codegen_alloc_bytes(block, 2);
@@ -174,8 +190,10 @@ host_x86_AND8_REG_IMM(codeblock_t *block, int dst_reg, uint8_t imm_data)
 void
 host_x86_AND16_REG_IMM(codeblock_t *block, int dst_reg, uint16_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_AND16_REG_IMM - dst_reg & 8\n");
+#endif
 
     if (is_imm8(imm_data)) {
         codegen_alloc_bytes(block, 4);
@@ -193,8 +211,10 @@ host_x86_AND16_REG_IMM(codeblock_t *block, int dst_reg, uint16_t imm_data)
 void
 host_x86_AND32_REG_IMM(codeblock_t *block, int dst_reg, uint32_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_AND32_REG_IMM - dst_reg & 8\n");
+#endif
 
     if (is_imm8(imm_data)) {
         codegen_alloc_bytes(block, 3);
@@ -212,8 +232,10 @@ host_x86_AND32_REG_IMM(codeblock_t *block, int dst_reg, uint32_t imm_data)
 void
 host_x86_AND8_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_AND8_REG_REG - dst_reg & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0x20, 0xc0 | (dst_reg & 7) | ((src_reg & 7) << 3)); /*AND dst_reg, src_reg*/
@@ -221,8 +243,10 @@ host_x86_AND8_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 void
 host_x86_AND16_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_AND16_REG_REG - dst_reg & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0x66, 0x21, 0xc0 | (dst_reg & 7) | ((src_reg & 7) << 3)); /*AND dst_reg, src_reg*/
@@ -230,8 +254,10 @@ host_x86_AND16_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 void
 host_x86_AND32_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_AND32_REG_REG - dst_reg & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0x21, 0xc0 | (dst_reg & 7) | ((src_reg & 7) << 3)); /*AND dst_reg, src_reg*/
@@ -482,8 +508,10 @@ host_x86_LEA_REG_IMM(codeblock_t *block, int dst_reg, int src_reg, uint32_t offs
 void
 host_x86_LEA_REG_REG(codeblock_t *block, int dst_reg, int src_reg_a, int src_reg_b)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg_a & 8) || (src_reg_b & 8))
         fatal("host_x86_LEA_REG_REG - bad reg\n");
+#endif
 
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0x8d, 0x04 | ((dst_reg & 7) << 3), /*LEA dst_reg, [Rsrc_reg_a + Rsrc_reg_b]*/
@@ -492,8 +520,10 @@ host_x86_LEA_REG_REG(codeblock_t *block, int dst_reg, int src_reg_a, int src_reg
 void
 host_x86_LEA_REG_REG_SHIFT(codeblock_t *block, int dst_reg, int src_reg_a, int src_reg_b, int shift)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg_a & 8) || (src_reg_b & 8))
         fatal("host_x86_LEA_REG_REG_SHIFT - bad reg\n");
+#endif
 
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0x8d, 0x04 | ((dst_reg & 7) << 3), /*LEA dst_reg, [Rsrc_reg_a + Rsrc_reg_b * (1 << shift)]*/
@@ -505,10 +535,15 @@ host_x86_MOV8_ABS_IMM(codeblock_t *block, void *p, uint32_t imm_data)
 {
     int64_t offset = (uintptr_t) p - (((uintptr_t) &cpu_state) + 128);
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         codegen_alloc_bytes(block, 4);
         codegen_addbyte3(block, 0xc6, 0x45, offset); /*MOVB offset[RBP], imm_data*/
         codegen_addbyte(block, imm_data);
+    } else if (offset < (1ULL << 32)) {
+        codegen_alloc_bytes(block, 7);
+        codegen_addbyte2(block, 0xc6, 0x85); /*MOVB offset[RBP], imm_data*/
+        codegen_addlong(block, offset);
+        codegen_addbyte(block, imm_data);
     } else {
         if ((uintptr_t) p >> 32)
             fatal("host_x86_MOV8_ABS_IMM - out of range %p\n", p);
@@ -523,10 +558,15 @@ host_x86_MOV16_ABS_IMM(codeblock_t *block, void *p, uint16_t imm_data)
 {
     int64_t offset = (uintptr_t) p - (((uintptr_t) &cpu_state) + 128);
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         codegen_alloc_bytes(block, 6);
         codegen_addbyte4(block, 0x66, 0xc7, 0x45, offset); /*MOV offset[RBP], imm_data*/
         codegen_addword(block, imm_data);
+    } else if (offset < (1ULL << 32)) {
+        codegen_alloc_bytes(block, 9);
+        codegen_addbyte3(block, 0x66, 0xc7, 0x85); /*MOV offset[RBP], imm_data*/
+        codegen_addlong(block, offset);
+        codegen_addword(block, imm_data);
     } else {
         if ((uintptr_t) p >> 32)
             fatal("host_x86_MOV32_ABS_IMM - out of range %p\n", p);
@@ -541,10 +581,15 @@ host_x86_MOV32_ABS_IMM(codeblock_t *block, void *p, uint32_t imm_data)
 {
     int64_t offset = (uintptr_t) p - (((uintptr_t) &cpu_state) + 128);
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         codegen_alloc_bytes(block, 7);
         codegen_addbyte3(block, 0xc7, 0x45, offset); /*MOV offset[RBP], imm_data*/
         codegen_addlong(block, imm_data);
+    } else if (offset < (1ULL << 32)) {
+        codegen_alloc_bytes(block, 10);
+        codegen_addbyte2(block, 0xc7, 0x85); /*MOV offset[RBP], imm_data*/
+        codegen_addlong(block, offset);
+        codegen_addlong(block, imm_data);
     } else {
         if ((uintptr_t) p >> 32)
             fatal("host_x86_MOV32_ABS_IMM - out of range %p\n", p);
@@ -560,12 +605,18 @@ host_x86_MOV8_ABS_REG(codeblock_t *block, void *p, int src_reg)
 {
     int64_t offset = (uintptr_t) p - (((uintptr_t) &cpu_state) + 128);
 
+#ifdef RECOMPILER_DEBUG
     if (src_reg & 8)
         fatal("host_x86_MOV8_ABS_REG - bad reg\n");
+#endif
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         codegen_alloc_bytes(block, 3);
         codegen_addbyte3(block, 0x88, 0x45 | ((src_reg & 7) << 3), offset); /*MOVB offset[RBP], src_reg*/
+    } else if (offset < (1ULL << 32)) {
+        codegen_alloc_bytes(block, 6);
+        codegen_addbyte2(block, 0x88, 0x85 | ((src_reg & 7) << 3)); /*MOVB offset[RBP], src_reg*/
+        codegen_addlong(block, offset);
     } else {
         if ((uintptr_t) p >> 32)
             fatal("host_x86_MOV8_ABS_REG - out of range %p\n", p);
@@ -580,10 +631,12 @@ host_x86_MOV16_ABS_REG(codeblock_t *block, void *p, int src_reg)
 {
     int64_t offset = (uintptr_t) p - (((uintptr_t) &cpu_state) + 128);
 
+#ifdef RECOMPILER_DEBUG
     if (src_reg & 8)
         fatal("host_x86_MOV16_ABS_REG - bad reg\n");
+#endif
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         codegen_alloc_bytes(block, 4);
         codegen_addbyte4(block, 0x66, 0x89, 0x45 | ((src_reg & 7) << 3), offset); /*MOV offset[RBP], src_reg*/
     } else if (offset < (1ULL << 32)) {
@@ -600,10 +653,12 @@ host_x86_MOV32_ABS_REG(codeblock_t *block, void *p, int src_reg)
 {
     int64_t offset = (uintptr_t) p - (((uintptr_t) &cpu_state) + 128);
 
+#ifdef RECOMPILER_DEBUG
     if (src_reg & 8)
         fatal("host_x86_MOV32_ABS_REG - bad reg\n");
+#endif
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         codegen_alloc_bytes(block, 3);
         codegen_addbyte3(block, 0x89, 0x45 | ((src_reg & 7) << 3), offset); /*MOV offset[RBP], src_reg*/
     } else if (offset < (1ULL << 32)) {
@@ -624,12 +679,18 @@ host_x86_MOV64_ABS_REG(codeblock_t *block, void *p, int src_reg)
 {
     int64_t offset = (uintptr_t) p - (((uintptr_t) &cpu_state) + 128);
 
+#ifdef RECOMPILER_DEBUG
     if (src_reg & 8)
         fatal("host_x86_MOV64_ABS_REG - bad reg\n");
+#endif
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         codegen_alloc_bytes(block, 4);
         codegen_addbyte4(block, 0x48, 0x89, 0x45 | ((src_reg & 7) << 3), offset); /*MOV offset[RBP], src_reg*/
+    } else if (offset < (1ULL << 32)) {
+        codegen_alloc_bytes(block, 7);
+        codegen_addbyte3(block, 0x48, 0x89, 0x85 | ((src_reg & 7) << 3)); /*MOV offset[RBP], src_reg*/
+        codegen_addlong(block, offset);
     } else {
         if ((uintptr_t) p >> 32)
             fatal("host_x86_MOV64_ABS_REG - out of range %p\n", p);
@@ -642,8 +703,11 @@ host_x86_MOV64_ABS_REG(codeblock_t *block, void *p, int src_reg)
 void
 host_x86_MOV8_ABS_REG_REG_SHIFT_REG(codeblock_t *block, uint32_t addr, int base_reg, int index_reg, int shift, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((src_reg & 8) || (base_reg & 8) | (index_reg & 8))
         fatal("host_x86_MOV8_BASE_INDEX_REG reg & 8\n");
+#endif
+
     if (addr < 0x80 || addr >= 0xffffff80) {
         codegen_alloc_bytes(block, 4);
         codegen_addbyte4(block, 0x88, 0x44 | (src_reg << 3), base_reg | (index_reg << 3) | (shift << 6), addr & 0xff); /*MOV addr[base_reg + idx_reg << shift], src_reg*/
@@ -657,24 +721,30 @@ host_x86_MOV8_ABS_REG_REG_SHIFT_REG(codeblock_t *block, uint32_t addr, int base_
 void
 host_x86_MOV8_BASE_INDEX_REG(codeblock_t *block, int base_reg, int index_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((src_reg & 8) || (base_reg & 8) | (index_reg & 8))
         fatal("host_x86_MOV8_BASE_INDEX_REG reg & 8\n");
+#endif
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0x88, 0x04 | (src_reg << 3), (index_reg << 3) | base_reg); /*MOV B[base_reg + index_reg], src_reg*/
 }
 void
 host_x86_MOV16_BASE_INDEX_REG(codeblock_t *block, int base_reg, int index_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((src_reg & 8) || (base_reg & 8) | (index_reg & 8))
         fatal("host_x86_MOV8_BASE_INDEX_REG reg & 8\n");
+#endif
     codegen_alloc_bytes(block, 4);
     codegen_addbyte4(block, 0x66, 0x89, 0x04 | (src_reg << 3), (index_reg << 3) | base_reg); /*MOV W[base_reg + index_reg], src_reg*/
 }
 void
 host_x86_MOV32_BASE_INDEX_REG(codeblock_t *block, int base_reg, int index_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((src_reg & 8) || (base_reg & 8) | (index_reg & 8))
         fatal("host_x86_MOV8_BASE_INDEX_REG reg & 8\n");
+#endif
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0x89, 0x04 | (src_reg << 3), (index_reg << 3) | base_reg); /*MOV L[base_reg + index_reg], src_reg*/
 }
@@ -683,43 +753,51 @@ void
 host_x86_MOV8_REG_ABS(codeblock_t *block, int dst_reg, void *p)
 {
     int64_t offset     = (uintptr_t) p - (((uintptr_t) &cpu_state) + 128);
-    int64_t ram_offset = (uintptr_t) p - (uintptr_t) ram;
+    int64_t ram_offset = (uintptr_t) p - (((uintptr_t) ram) + 2147483648ULL);
 
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_MOV8_REG_ABS reg & 8\n");
+#endif
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         codegen_alloc_bytes(block, 3);
         codegen_addbyte3(block, 0x8a, 0x45 | ((dst_reg & 7) << 3), offset); /*MOV dst_reg, offset[RBP]*/
     } else if (offset < (1ULL << 32)) {
         codegen_alloc_bytes(block, 6);
         codegen_addbyte2(block, 0x8a, 0x85 | ((dst_reg & 7) << 3)); /*MOV dst_reg, offset[RBP]*/
         codegen_addlong(block, offset);
-    } else if ((ram_offset < (1ULL << 32)) && (block->flags & CODEBLOCK_NO_IMMEDIATES)) {
+    } else if ((ram_offset >= -2147483648LL) && (ram_offset <= 2147483647LL) && (block->flags & CODEBLOCK_NO_IMMEDIATES)) {
         codegen_alloc_bytes(block, 8);
         codegen_addbyte4(block, 0x41, 0x8a, 0x84 | ((dst_reg & 7) << 3), 0x24); /*MOV dst_reg, ram_offset[R12]*/
         codegen_addlong(block, ram_offset);
     } else {
-        fatal("host_x86_MOV8_REG_ABS - out of range\n");
+        codegen_alloc_bytes(block, 10);
+        codegen_addbyte2(block, 0x49, 0xb9); /*MOV R9, p*/
+        codegen_addquad(block, (uintptr_t) p);
+        codegen_alloc_bytes(block, 3);
+        codegen_addbyte3(block, 0x41, 0x8a, 0x01 | ((dst_reg & 7) << 3)); /*MOV dst_reg, [R9]*/
     }
 }
 void
 host_x86_MOV16_REG_ABS(codeblock_t *block, int dst_reg, void *p)
 {
     int64_t offset     = (uintptr_t) p - (((uintptr_t) &cpu_state) + 128);
-    int64_t ram_offset = (uintptr_t) p - (uintptr_t) ram;
+    int64_t ram_offset = (uintptr_t) p - (((uintptr_t) ram) + 2147483648ULL);
 
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_MOV16_REG_ABS reg & 8\n");
+#endif
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         codegen_alloc_bytes(block, 4);
         codegen_addbyte4(block, 0x66, 0x8b, 0x45 | ((dst_reg & 7) << 3), offset); /*MOV dst_reg, offset[RBP]*/
     } else if (offset < (1ULL << 32)) {
         codegen_alloc_bytes(block, 7);
         codegen_addbyte3(block, 0x66, 0x8b, 0x85 | ((dst_reg & 7) << 3)); /*MOV dst_reg, offset[RBP]*/
         codegen_addlong(block, offset);
-    } else if ((ram_offset < (1ULL << 32)) && (block->flags & CODEBLOCK_NO_IMMEDIATES)) {
+    } else if ((ram_offset >= -2147483648LL) && (ram_offset <= 2147483647LL) && (block->flags & CODEBLOCK_NO_IMMEDIATES)) {
         codegen_alloc_bytes(block, 9);
         codegen_addbyte4(block, 0x66, 0x41, 0x8b, 0x84 | ((dst_reg & 7) << 3)); /*MOV dst_reg, ram_offset[R12]*/
         codegen_addbyte(block, 0x24);
@@ -737,24 +815,31 @@ void
 host_x86_MOV32_REG_ABS(codeblock_t *block, int dst_reg, void *p)
 {
     int64_t offset     = (uintptr_t) p - (((uintptr_t) &cpu_state) + 128);
-    int64_t ram_offset = (uintptr_t) p - (uintptr_t) ram;
+    int64_t ram_offset = (uintptr_t) p - (((uintptr_t) ram) + 2147483648ULL);
 
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_MOV32_REG_ABS reg & 8\n");
+#endif
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         codegen_alloc_bytes(block, 3);
         codegen_addbyte3(block, 0x8b, 0x45 | ((dst_reg & 7) << 3), offset); /*MOV dst_reg, offset[RBP]*/
     } else if (offset < (1ULL << 32)) {
         codegen_alloc_bytes(block, 6);
         codegen_addbyte2(block, 0x8b, 0x85 | ((dst_reg & 7) << 3)); /*MOV dst_reg, offset[RBP]*/
         codegen_addlong(block, offset);
-    } else if ((ram_offset < (1ULL << 32)) && (block->flags & CODEBLOCK_NO_IMMEDIATES)) {
+    } else if ((ram_offset >= -2147483648LL) && (ram_offset <= 2147483647LL) && (block->flags & CODEBLOCK_NO_IMMEDIATES)) {
         codegen_alloc_bytes(block, 8);
         codegen_addbyte4(block, 0x41, 0x8b, 0x84 | ((dst_reg & 7) << 3), 0x24); /*MOV dst_reg, ram_offset[R12]*/
         codegen_addlong(block, ram_offset);
+    } else if ((ram_offset < -2147483648LL) || (ram_offset > 2147483647LL) || !(block->flags & CODEBLOCK_NO_IMMEDIATES)) {
+        codegen_alloc_bytes(block, 13);
+        codegen_addbyte2(block, 0x49, 0xb9);   /*MOV r9,(uintptr_t) p*/
+        codegen_addquad(block, (uintptr_t) p);
+        codegen_addbyte3(block, 0x41, 0x8b, 0x01 | ((dst_reg & 7) << 3)); /*MOV dst_reg, [R9]*/
     } else {
-        fatal("host_x86_MOV32_REG_ABS - out of range\n");
+        fatal("host_x86_MOV32_REG_ABS - RAM offset = %016" PRIX64 " (p - ram = %016" PRIXPTR ")\n", ram_offset, (uintptr_t) p - (uintptr_t) ram);
         codegen_alloc_bytes(block, 6);
         codegen_addbyte(block, 0x8b); /*MOV [p], src_reg*/
         codegen_addbyte(block, 0x05 | ((dst_reg & 7) << 3));
@@ -766,10 +851,12 @@ host_x86_MOV64_REG_ABS(codeblock_t *block, int dst_reg, void *p)
 {
     int64_t offset = (uintptr_t) p - (((uintptr_t) &cpu_state) + 128);
 
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_MOV64_REG_ABS reg & 8\n");
+#endif
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         codegen_alloc_bytes(block, 4);
         codegen_addbyte4(block, 0x48, 0x8b, 0x45 | ((dst_reg & 7) << 3), offset); /*MOV dst_reg, offset[RBP]*/
     } else if (offset < (1ULL << 32)) {
@@ -783,8 +870,10 @@ host_x86_MOV64_REG_ABS(codeblock_t *block, int dst_reg, void *p)
 void
 host_x86_MOV8_REG_ABS_REG_REG_SHIFT(codeblock_t *block, int dst_reg, uint32_t addr, int base_reg, int index_reg, int shift)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (base_reg & 8) | (index_reg & 8))
         fatal("host_x86_MOV8_REG_ABS_REG_REG_SHIFT reg & 8\n");
+#endif
     if (addr < 0x80 || addr >= 0xffffff80) {
         codegen_alloc_bytes(block, 4);
         codegen_addbyte4(block, 0x8a, 0x44 | (dst_reg << 3), base_reg | (index_reg << 3) | (shift << 6), addr & 0xff); /*MOV addr[base_reg + idx_reg << shift], src_reg*/
@@ -798,8 +887,10 @@ host_x86_MOV8_REG_ABS_REG_REG_SHIFT(codeblock_t *block, int dst_reg, uint32_t ad
 void
 host_x86_MOV32_REG_BASE_INDEX(codeblock_t *block, int dst_reg, int base_reg, int index_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (base_reg & 8) | (index_reg & 8))
         fatal("host_x86_MOV32_REG_BASE_INDEX reg & 8\n");
+#endif
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0x8b, 0x04 | (dst_reg << 3), (index_reg << 3) | base_reg); /*MOV dst_reg, Q[base_reg + index_reg]*/
 }
@@ -807,8 +898,10 @@ host_x86_MOV32_REG_BASE_INDEX(codeblock_t *block, int dst_reg, int base_reg, int
 void
 host_x86_MOV64_REG_BASE_INDEX_SHIFT(codeblock_t *block, int dst_reg, int base_reg, int index_reg, int scale)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (index_reg & 8))
         fatal("host_x86_MOV64_REG_BASE_INDEX_SHIFT reg & 8\n");
+#endif
     codegen_alloc_bytes(block, 4);
     if (base_reg & 8)
         codegen_addbyte4(block, 0x49, 0x8b, 0x04 | ((dst_reg & 7) << 3), (scale << 6) | ((index_reg & 7) << 3) | (base_reg & 7)); /*MOV dst_reg, Q[base_reg + index_reg << scale]*/
@@ -819,17 +912,19 @@ host_x86_MOV64_REG_BASE_INDEX_SHIFT(codeblock_t *block, int dst_reg, int base_re
 void
 host_x86_MOV16_REG_BASE_OFFSET(codeblock_t *block, int dst_reg, int base_reg, int offset)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (base_reg & 8))
         fatal("host_x86_MOV16_REG_BASE_OFFSET reg & 8\n");
+#endif
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         if (base_reg == REG_RSP) {
             codegen_alloc_bytes(block, 5);
-            codegen_addbyte(block, 0x66);
+            codegen_addbyte(block, 0x66); /* MOV dst_reg, [RSP + offset] */
             codegen_addbyte4(block, 0x8b, 0x40 | base_reg | (dst_reg << 3), 0x24, offset);
         } else {
             codegen_alloc_bytes(block, 4);
-            codegen_addbyte4(block, 0x66, 0x8b, 0x40 | base_reg | (dst_reg << 3), offset);
+            codegen_addbyte4(block, 0x66, 0x8b, 0x40 | base_reg | (dst_reg << 3), offset);  /* MOV dst_reg, [base_reg + offset] */
         }
     } else
         fatal("MOV16_REG_BASE_OFFSET - offset %i\n", offset);
@@ -837,16 +932,18 @@ host_x86_MOV16_REG_BASE_OFFSET(codeblock_t *block, int dst_reg, int base_reg, in
 void
 host_x86_MOV32_REG_BASE_OFFSET(codeblock_t *block, int dst_reg, int base_reg, int offset)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (base_reg & 8))
         fatal("host_x86_MOV32_REG_BASE_OFFSET reg & 8\n");
+#endif
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         if (base_reg == REG_RSP) {
             codegen_alloc_bytes(block, 4);
-            codegen_addbyte4(block, 0x8b, 0x40 | base_reg | (dst_reg << 3), 0x24, offset);
+            codegen_addbyte4(block, 0x8b, 0x40 | base_reg | (dst_reg << 3), 0x24, offset); /* MOV dst_reg, [RSP + offset] */
         } else {
             codegen_alloc_bytes(block, 3);
-            codegen_addbyte3(block, 0x8b, 0x40 | base_reg | (dst_reg << 3), offset);
+            codegen_addbyte3(block, 0x8b, 0x40 | base_reg | (dst_reg << 3), offset);  /* MOV dst_reg, [base_reg + offset] */
         }
     } else
         fatal("MOV32_REG_BASE_OFFSET - offset %i\n", offset);
@@ -854,17 +951,19 @@ host_x86_MOV32_REG_BASE_OFFSET(codeblock_t *block, int dst_reg, int base_reg, in
 void
 host_x86_MOV64_REG_BASE_OFFSET(codeblock_t *block, int dst_reg, int base_reg, int offset)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (base_reg & 8))
         fatal("host_x86_MOV64_REG_BASE_OFFSET reg & 8\n");
+#endif
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         if (base_reg == REG_RSP) {
             codegen_alloc_bytes(block, 5);
-            codegen_addbyte(block, 0x48);
+            codegen_addbyte(block, 0x48); /* MOV dst_reg, [RSP + offset] */
             codegen_addbyte4(block, 0x8b, 0x40 | base_reg | (dst_reg << 3), 0x24, offset);
         } else {
             codegen_alloc_bytes(block, 4);
-            codegen_addbyte4(block, 0x48, 0x8b, 0x40 | base_reg | (dst_reg << 3), offset);
+            codegen_addbyte4(block, 0x48, 0x8b, 0x40 | base_reg | (dst_reg << 3), offset);  /* MOV dst_reg, [base_reg + offset] */
         }
     } else
         fatal("MOV32_REG_BASE_OFFSET - offset %i\n", offset);
@@ -873,16 +972,18 @@ host_x86_MOV64_REG_BASE_OFFSET(codeblock_t *block, int dst_reg, int base_reg, in
 void
 host_x86_MOV32_BASE_OFFSET_REG(codeblock_t *block, int base_reg, int offset, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((src_reg & 8) || (base_reg & 8))
         fatal("host_x86_MOV32_BASE_OFFSET_REG reg & 8\n");
+#endif
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         if (base_reg == REG_RSP) {
-            codegen_alloc_bytes(block, 4);
+            codegen_alloc_bytes(block, 4); /* MOV [RSP + offset], src_reg*/
             codegen_addbyte4(block, 0x89, 0x40 | base_reg | (src_reg << 3), 0x24, offset);
         } else {
             codegen_alloc_bytes(block, 3);
-            codegen_addbyte3(block, 0x89, 0x40 | base_reg | (src_reg << 3), offset);
+            codegen_addbyte3(block, 0x89, 0x40 | base_reg | (src_reg << 3), offset);  /* MOV [base_reg + offset], src_reg*/
         }
     } else
         fatal("MOV32_BASE_OFFSET_REG - offset %i\n", offset);
@@ -890,17 +991,19 @@ host_x86_MOV32_BASE_OFFSET_REG(codeblock_t *block, int base_reg, int offset, int
 void
 host_x86_MOV64_BASE_OFFSET_REG(codeblock_t *block, int base_reg, int offset, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((src_reg & 8) || (base_reg & 8))
         fatal("host_x86_MOV64_BASE_OFFSET_REG reg & 8\n");
+#endif
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         if (base_reg == REG_RSP) {
             codegen_alloc_bytes(block, 5);
-            codegen_addbyte(block, 0x48);
+            codegen_addbyte(block, 0x48); /* MOV [RSP + offset], src_reg*/
             codegen_addbyte4(block, 0x89, 0x40 | base_reg | (src_reg << 3), 0x24, offset);
         } else {
             codegen_alloc_bytes(block, 4);
-            codegen_addbyte4(block, 0x48, 0x89, 0x40 | base_reg | (src_reg << 3), offset);
+            codegen_addbyte4(block, 0x48, 0x89, 0x40 | base_reg | (src_reg << 3), offset);  /* MOV [base_reg + offset], src_reg*/
         }
     } else
         fatal("MOV64_BASE_OFFSET_REG - offset %i\n", offset);
@@ -909,17 +1012,19 @@ host_x86_MOV64_BASE_OFFSET_REG(codeblock_t *block, int base_reg, int offset, int
 void
 host_x86_MOV32_BASE_OFFSET_IMM(codeblock_t *block, int base_reg, int offset, uint32_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (base_reg & 8)
         fatal("host_x86_MOV32_BASE_OFFSET_IMM reg & 8\n");
+#endif
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         if (base_reg == REG_RSP) {
             codegen_alloc_bytes(block, 8);
-            codegen_addbyte4(block, 0xc7, 0x40 | base_reg, 0x24, offset);
+            codegen_addbyte4(block, 0xc7, 0x40 | base_reg, 0x24, offset); /* MOV [RSP + offset], imm_data */
             codegen_addlong(block, imm_data);
         } else {
             codegen_alloc_bytes(block, 7);
-            codegen_addbyte3(block, 0xc7, 0x40 | base_reg, offset);
+            codegen_addbyte3(block, 0xc7, 0x40 | base_reg, offset);  /* MOV [base_reg + offset], src_reg*/
             codegen_addlong(block, imm_data);
         }
     } else
@@ -929,16 +1034,21 @@ host_x86_MOV32_BASE_OFFSET_IMM(codeblock_t *block, int base_reg, int offset, uin
 void
 host_x86_MOV8_REG_IMM(codeblock_t *block, int reg, uint16_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (reg >= 8)
         fatal("host_x86_MOV8_REG_IMM reg >= 4\n");
+#endif
+
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0xb0 | reg, imm_data); /*MOV reg, imm_data*/
 }
 void
 host_x86_MOV16_REG_IMM(codeblock_t *block, int reg, uint16_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (reg & 8)
         fatal("host_x86_MOV16_REG_IMM reg & 8\n");
+#endif
     codegen_alloc_bytes(block, 6);
     codegen_addbyte2(block, 0x66, 0xb8 | (reg & 7)); /*MOV reg, imm_data*/
     codegen_addword(block, imm_data);
@@ -946,8 +1056,10 @@ host_x86_MOV16_REG_IMM(codeblock_t *block, int reg, uint16_t imm_data)
 void
 host_x86_MOV32_REG_IMM(codeblock_t *block, int reg, uint32_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (reg & 8)
         fatal("host_x86_MOV32_REG_IMM reg & 8\n");
+#endif
     codegen_alloc_bytes(block, 5);
     codegen_addbyte(block, 0xb8 | (reg & 7)); /*MOV reg, imm_data*/
     codegen_addlong(block, imm_data);
@@ -970,8 +1082,10 @@ host_x86_MOV64_REG_IMM(codeblock_t *block, int reg, uint64_t imm_data)
 void
 host_x86_MOV8_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_MOV8_REG_REG - bad reg\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0x88, 0xc0 | (dst_reg & 7) | ((src_reg & 7) << 3));
@@ -979,8 +1093,10 @@ host_x86_MOV8_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 void
 host_x86_MOV16_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_MOV16_REG_REG - bad reg\n");
+#endif
 
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0x66, 0x89, 0xc0 | (dst_reg & 7) | ((src_reg & 7) << 3));
@@ -988,8 +1104,10 @@ host_x86_MOV16_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 void
 host_x86_MOV32_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_MOV32_REG_REG - bad reg\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0x89, 0xc0 | (dst_reg & 7) | ((src_reg & 7) << 3));
@@ -1036,8 +1154,10 @@ host_x86_MOVSX_REG_32_16(codeblock_t *block, int dst_reg, int src_reg)
 void
 host_x86_MOVZX_BASE_INDEX_32_8(codeblock_t *block, int dst_reg, int base_reg, int index_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (base_reg & 8) | (index_reg & 8))
         fatal("host_x86_MOVZX_BASE_INDEX_32_8 reg & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 4);
     codegen_addbyte4(block, 0x0f, 0xb6, 0x04 | (dst_reg << 3), (index_reg << 3) | base_reg);
@@ -1045,8 +1165,10 @@ host_x86_MOVZX_BASE_INDEX_32_8(codeblock_t *block, int dst_reg, int base_reg, in
 void
 host_x86_MOVZX_BASE_INDEX_32_16(codeblock_t *block, int dst_reg, int base_reg, int index_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (base_reg & 8) | (index_reg & 8))
         fatal("host_x86_MOVZX_BASE_INDEX_32_16 reg & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 4);
     codegen_addbyte4(block, 0x0f, 0xb7, 0x04 | (dst_reg << 3), (index_reg << 3) | base_reg);
@@ -1055,8 +1177,10 @@ host_x86_MOVZX_BASE_INDEX_32_16(codeblock_t *block, int dst_reg, int base_reg, i
 void
 host_x86_MOVZX_REG_16_8(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_MOVZX_REG_16_8 - bad reg\n");
+#endif
 
     codegen_alloc_bytes(block, 4);
     codegen_addbyte4(block, 0x66, 0x0f, 0xb6, 0xc0 | (dst_reg << 3) | src_reg); /*MOVZX dst_reg, src_reg*/
@@ -1064,8 +1188,10 @@ host_x86_MOVZX_REG_16_8(codeblock_t *block, int dst_reg, int src_reg)
 void
 host_x86_MOVZX_REG_32_8(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_MOVZX_REG_32_8 - bad reg\n");
+#endif
 
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0x0f, 0xb6, 0xc0 | (dst_reg << 3) | src_reg); /*MOVZX dst_reg, src_reg*/
@@ -1073,8 +1199,10 @@ host_x86_MOVZX_REG_32_8(codeblock_t *block, int dst_reg, int src_reg)
 void
 host_x86_MOVZX_REG_32_16(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_MOVZX_REG_16_8 - bad reg\n");
+#endif
 
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0x0f, 0xb7, 0xc0 | (dst_reg << 3) | src_reg); /*MOVZX dst_reg, src_reg*/
@@ -1084,16 +1212,18 @@ void
 host_x86_MOVZX_REG_ABS_16_8(codeblock_t *block, int dst_reg, void *p)
 {
     int64_t offset     = (uintptr_t) p - (((uintptr_t) &cpu_state) + 128);
-    int64_t ram_offset = (uintptr_t) p - (uintptr_t) ram;
+    int64_t ram_offset = (uintptr_t) p - (((uintptr_t) ram) + 2147483648ULL);
 
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_MOVZX_REG_ABS_16_8 - bad reg\n");
+#endif
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         codegen_alloc_bytes(block, 5);
         codegen_addbyte(block, 0x66);
         codegen_addbyte4(block, 0x0f, 0xb6, 0x45 | ((dst_reg & 7) << 3), offset); /*MOVZX dst_reg, offset[RBP]*/
-    } else if ((ram_offset < (1ULL << 32)) && (block->flags & CODEBLOCK_NO_IMMEDIATES)) {
+    } else if ((ram_offset >= -2147483648LL) && (ram_offset <= 2147483647LL) && (block->flags & CODEBLOCK_NO_IMMEDIATES)) {
         codegen_alloc_bytes(block, 10);
         codegen_addbyte2(block, 0x66, 0x41);
         codegen_addbyte4(block, 0x0f, 0xb6, 0x84 | ((dst_reg & 7) << 3), 0x24); /*MOVZX dst_reg, ram_offset[R12]*/
@@ -1111,14 +1241,14 @@ void
 host_x86_MOVZX_REG_ABS_32_8(codeblock_t *block, int dst_reg, void *p)
 {
     int64_t offset     = (uintptr_t) p - (((uintptr_t) &cpu_state) + 128);
-    int64_t ram_offset = (uintptr_t) p - (uintptr_t) ram;
+    int64_t ram_offset = (uintptr_t) p - (((uintptr_t) ram) + 2147483648ULL);
 
-#if 0
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_MOVZX_REG_ABS_32_8 - bad reg\n");
 #endif
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         if (dst_reg & 8) {
             codegen_alloc_bytes(block, 5);
             codegen_addbyte(block, 0x44);
@@ -1127,7 +1257,7 @@ host_x86_MOVZX_REG_ABS_32_8(codeblock_t *block, int dst_reg, void *p)
             codegen_alloc_bytes(block, 4);
             codegen_addbyte4(block, 0x0f, 0xb6, 0x45 | ((dst_reg & 7) << 3), offset); /*MOVZX dst_reg, offset[RBP]*/
         }
-    } else if ((ram_offset < (1ULL << 32)) && (block->flags & CODEBLOCK_NO_IMMEDIATES)) {
+    } else if ((ram_offset >= -2147483648LL) && (ram_offset <= 2147483647LL) && (block->flags & CODEBLOCK_NO_IMMEDIATES)) {
         if (dst_reg & 8)
             fatal("host_x86_MOVZX_REG_ABS_32_8 - bad reg\n");
 
@@ -1150,15 +1280,17 @@ void
 host_x86_MOVZX_REG_ABS_32_16(codeblock_t *block, int dst_reg, void *p)
 {
     int64_t offset     = (uintptr_t) p - (((uintptr_t) &cpu_state) + 128);
-    int64_t ram_offset = (uintptr_t) p - (uintptr_t) ram;
+    int64_t ram_offset = (uintptr_t) p - (((uintptr_t) ram) + 2147483648ULL);
 
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_MOVZX_REG_ABS_32_16 - bad reg\n");
+#endif
 
-    if (offset >= -128 && offset < 127) {
+    if (offset >= -128 && offset <= 127) {
         codegen_alloc_bytes(block, 4);
         codegen_addbyte4(block, 0x0f, 0xb7, 0x45 | ((dst_reg & 7) << 3), offset); /*MOVZX dst_reg, offset[RBP]*/
-    } else if ((ram_offset < (1ULL << 32)) && (block->flags & CODEBLOCK_NO_IMMEDIATES)) {
+    } else if ((ram_offset >= -2147483648LL) && (ram_offset <= 2147483647LL) && (block->flags & CODEBLOCK_NO_IMMEDIATES)) {
         codegen_alloc_bytes(block, 9);
         codegen_addbyte(block, 0x41);
         codegen_addbyte4(block, 0x0f, 0xb7, 0x84 | ((dst_reg & 7) << 3), 0x24); /*MOVZX dst_reg, ram_offset[R12]*/
@@ -1182,8 +1314,10 @@ host_x86_NOP(codeblock_t *block)
 void
 host_x86_OR8_REG_IMM(codeblock_t *block, int dst_reg, uint8_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_OR8_REG_IMM - dst_reg & 8\n");
+#endif
 
     if (dst_reg == REG_EAX) {
         codegen_alloc_bytes(block, 2);
@@ -1196,8 +1330,10 @@ host_x86_OR8_REG_IMM(codeblock_t *block, int dst_reg, uint8_t imm_data)
 void
 host_x86_OR16_REG_IMM(codeblock_t *block, int dst_reg, uint16_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_OR16_REG_IMM - dst_reg & 8\n");
+#endif
 
     if (is_imm8(imm_data)) {
         codegen_alloc_bytes(block, 4);
@@ -1215,8 +1351,10 @@ host_x86_OR16_REG_IMM(codeblock_t *block, int dst_reg, uint16_t imm_data)
 void
 host_x86_OR32_REG_IMM(codeblock_t *block, int dst_reg, uint32_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_OR32_REG_IMM - dst_reg & 8\n");
+#endif
 
     if (is_imm8(imm_data)) {
         codegen_alloc_bytes(block, 3);
@@ -1234,8 +1372,10 @@ host_x86_OR32_REG_IMM(codeblock_t *block, int dst_reg, uint32_t imm_data)
 void
 host_x86_OR8_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_OR8_REG_IMM - dst_reg & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0x08, 0xc0 | (dst_reg & 7) | ((src_reg & 7) << 3)); /*OR dst_reg, src_reg*/
@@ -1243,8 +1383,10 @@ host_x86_OR8_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 void
 host_x86_OR16_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_OR16_REG_IMM - dst_reg & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0x66, 0x09, 0xc0 | (dst_reg & 7) | ((src_reg & 7) << 3)); /*OR dst_reg, src_reg*/
@@ -1252,8 +1394,10 @@ host_x86_OR16_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 void
 host_x86_OR32_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_OR32_REG_IMM - dst_reg & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0x09, 0xc0 | (dst_reg & 7) | ((src_reg & 7) << 3)); /*OR dst_reg, src_reg*/
@@ -1293,24 +1437,30 @@ host_x86_RET(codeblock_t *block)
 void
 host_x86_ROL8_CL(codeblock_t *block, int dst_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("ROL8 CL & 8\n");
+#endif
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0xd2, 0xc0 | RM_OP_ROL | dst_reg); /*SHL dst_reg, CL*/
 }
 void
 host_x86_ROL16_CL(codeblock_t *block, int dst_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("ROL16 CL & 8\n");
+#endif
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0x66, 0xd3, 0xc0 | RM_OP_ROL | dst_reg); /*SHL dst_reg, CL*/
 }
 void
 host_x86_ROL32_CL(codeblock_t *block, int dst_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("ROL32 CL & 8\n");
+#endif
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0xd3, 0xc0 | RM_OP_ROL | dst_reg); /*SHL dst_reg, CL*/
 }
@@ -1318,24 +1468,30 @@ host_x86_ROL32_CL(codeblock_t *block, int dst_reg)
 void
 host_x86_ROL8_IMM(codeblock_t *block, int dst_reg, int shift)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("ROL8 imm & 8\n");
+#endif
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0xc0, 0xc0 | RM_OP_ROL | dst_reg, shift); /*SHL dst_reg, shift*/
 }
 void
 host_x86_ROL16_IMM(codeblock_t *block, int dst_reg, int shift)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("ROL16 imm & 8\n");
+#endif
     codegen_alloc_bytes(block, 4);
     codegen_addbyte4(block, 0x66, 0xc1, 0xc0 | RM_OP_ROL | dst_reg, shift); /*SHL dst_reg, shift*/
 }
 void
 host_x86_ROL32_IMM(codeblock_t *block, int dst_reg, int shift)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("ROL32 imm & 8\n");
+#endif
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0xc1, 0xc0 | RM_OP_ROL | dst_reg, shift); /*SHL dst_reg, shift*/
 }
@@ -1343,24 +1499,30 @@ host_x86_ROL32_IMM(codeblock_t *block, int dst_reg, int shift)
 void
 host_x86_ROR8_CL(codeblock_t *block, int dst_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("ROR8 CL & 8\n");
+#endif
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0xd2, 0xc0 | RM_OP_ROR | dst_reg); /*SHR dst_reg, CL*/
 }
 void
 host_x86_ROR16_CL(codeblock_t *block, int dst_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("ROR16 CL & 8\n");
+#endif
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0x66, 0xd3, 0xc0 | RM_OP_ROR | dst_reg); /*SHR dst_reg, CL*/
 }
 void
 host_x86_ROR32_CL(codeblock_t *block, int dst_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("ROR32 CL & 8\n");
+#endif
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0xd3, 0xc0 | RM_OP_ROR | dst_reg); /*SHR dst_reg, CL*/
 }
@@ -1368,24 +1530,30 @@ host_x86_ROR32_CL(codeblock_t *block, int dst_reg)
 void
 host_x86_ROR8_IMM(codeblock_t *block, int dst_reg, int shift)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("ROR8 imm & 8\n");
+#endif
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0xc0, 0xc0 | RM_OP_ROR | dst_reg, shift); /*SHR dst_reg, shift*/
 }
 void
 host_x86_ROR16_IMM(codeblock_t *block, int dst_reg, int shift)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("ROR16 imm & 8\n");
+#endif
     codegen_alloc_bytes(block, 4);
     codegen_addbyte4(block, 0x66, 0xc1, 0xc0 | RM_OP_ROR | dst_reg, shift); /*SHR dst_reg, shift*/
 }
 void
 host_x86_ROR32_IMM(codeblock_t *block, int dst_reg, int shift)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("ROR32 im & 8\n");
+#endif
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0xc1, 0xc0 | RM_OP_ROR | dst_reg, shift); /*SHR dst_reg, shift*/
 }
@@ -1393,8 +1561,10 @@ host_x86_ROR32_IMM(codeblock_t *block, int dst_reg, int shift)
 void
 host_x86_SAR8_CL(codeblock_t *block, int dst_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("SAR8 CL & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0xd2, 0xc0 | RM_OP_SAR | dst_reg); /*SAR dst_reg, CL*/
@@ -1402,8 +1572,10 @@ host_x86_SAR8_CL(codeblock_t *block, int dst_reg)
 void
 host_x86_SAR16_CL(codeblock_t *block, int dst_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("SAR16 CL & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0x66, 0xd3, 0xc0 | RM_OP_SAR | dst_reg); /*SAR dst_reg, CL*/
@@ -1411,8 +1583,10 @@ host_x86_SAR16_CL(codeblock_t *block, int dst_reg)
 void
 host_x86_SAR32_CL(codeblock_t *block, int dst_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("SAR32 CL & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0xd3, 0xc0 | RM_OP_SAR | dst_reg); /*SAR dst_reg, CL*/
@@ -1421,8 +1595,10 @@ host_x86_SAR32_CL(codeblock_t *block, int dst_reg)
 void
 host_x86_SAR8_IMM(codeblock_t *block, int dst_reg, int shift)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("SAR8 imm & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0xc0, 0xc0 | RM_OP_SAR | dst_reg, shift); /*SAR dst_reg, shift*/
@@ -1430,8 +1606,10 @@ host_x86_SAR8_IMM(codeblock_t *block, int dst_reg, int shift)
 void
 host_x86_SAR16_IMM(codeblock_t *block, int dst_reg, int shift)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("SAR16 imm & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 4);
     codegen_addbyte4(block, 0x66, 0xc1, 0xc0 | RM_OP_SAR | dst_reg, shift); /*SAR dst_reg, shift*/
@@ -1439,8 +1617,10 @@ host_x86_SAR16_IMM(codeblock_t *block, int dst_reg, int shift)
 void
 host_x86_SAR32_IMM(codeblock_t *block, int dst_reg, int shift)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("SAR32 imm & 8\n");
+#endif
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0xc1, 0xc0 | RM_OP_SAR | dst_reg, shift); /*SAR dst_reg, shift*/
 }
@@ -1448,8 +1628,10 @@ host_x86_SAR32_IMM(codeblock_t *block, int dst_reg, int shift)
 void
 host_x86_SHL8_CL(codeblock_t *block, int dst_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("SHL8 CL & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0xd2, 0xc0 | RM_OP_SHL | dst_reg); /*SHL dst_reg, CL*/
@@ -1457,8 +1639,10 @@ host_x86_SHL8_CL(codeblock_t *block, int dst_reg)
 void
 host_x86_SHL16_CL(codeblock_t *block, int dst_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("SHL16 CL & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0x66, 0xd3, 0xc0 | RM_OP_SHL | dst_reg); /*SHL dst_reg, CL*/
@@ -1466,8 +1650,10 @@ host_x86_SHL16_CL(codeblock_t *block, int dst_reg)
 void
 host_x86_SHL32_CL(codeblock_t *block, int dst_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("SHL32 CL & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0xd3, 0xc0 | RM_OP_SHL | dst_reg); /*SHL dst_reg, CL*/
@@ -1476,8 +1662,10 @@ host_x86_SHL32_CL(codeblock_t *block, int dst_reg)
 void
 host_x86_SHL8_IMM(codeblock_t *block, int dst_reg, int shift)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("SHL8 imm & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0xc0, 0xc0 | RM_OP_SHL | dst_reg, shift); /*SHL dst_reg, shift*/
@@ -1485,8 +1673,10 @@ host_x86_SHL8_IMM(codeblock_t *block, int dst_reg, int shift)
 void
 host_x86_SHL16_IMM(codeblock_t *block, int dst_reg, int shift)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("SHL16 imm & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 4);
     codegen_addbyte4(block, 0x66, 0xc1, 0xc0 | RM_OP_SHL | dst_reg, shift); /*SHL dst_reg, shift*/
@@ -1494,8 +1684,10 @@ host_x86_SHL16_IMM(codeblock_t *block, int dst_reg, int shift)
 void
 host_x86_SHL32_IMM(codeblock_t *block, int dst_reg, int shift)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("SHL32 imm & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0xc1, 0xc0 | RM_OP_SHL | dst_reg, shift); /*SHL dst_reg, shift*/
@@ -1504,8 +1696,10 @@ host_x86_SHL32_IMM(codeblock_t *block, int dst_reg, int shift)
 void
 host_x86_SHR8_CL(codeblock_t *block, int dst_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("SHR8 CL & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0xd2, 0xc0 | RM_OP_SHR | dst_reg); /*SHR dst_reg, CL*/
@@ -1513,8 +1707,10 @@ host_x86_SHR8_CL(codeblock_t *block, int dst_reg)
 void
 host_x86_SHR16_CL(codeblock_t *block, int dst_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("SHR16 CL & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0x66, 0xd3, 0xc0 | RM_OP_SHR | dst_reg); /*SHR dst_reg, CL*/
@@ -1522,8 +1718,10 @@ host_x86_SHR16_CL(codeblock_t *block, int dst_reg)
 void
 host_x86_SHR32_CL(codeblock_t *block, int dst_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("SHR32 CL & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0xd3, 0xc0 | RM_OP_SHR | dst_reg); /*SHR dst_reg, CL*/
@@ -1532,8 +1730,10 @@ host_x86_SHR32_CL(codeblock_t *block, int dst_reg)
 void
 host_x86_SHR8_IMM(codeblock_t *block, int dst_reg, int shift)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("SHR8 imm & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0xc0, 0xc0 | RM_OP_SHR | dst_reg, shift); /*SHR dst_reg, shift*/
@@ -1541,8 +1741,10 @@ host_x86_SHR8_IMM(codeblock_t *block, int dst_reg, int shift)
 void
 host_x86_SHR16_IMM(codeblock_t *block, int dst_reg, int shift)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("SHR16 imm & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 4);
     codegen_addbyte4(block, 0x66, 0xc1, 0xc0 | RM_OP_SHR | dst_reg, shift); /*SHR dst_reg, shift*/
@@ -1550,8 +1752,10 @@ host_x86_SHR16_IMM(codeblock_t *block, int dst_reg, int shift)
 void
 host_x86_SHR32_IMM(codeblock_t *block, int dst_reg, int shift)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("SHR32 imm & 8\n");
+#endif
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0xc1, 0xc0 | RM_OP_SHR | dst_reg, shift); /*SHR dst_reg, shift*/
 }
@@ -1559,8 +1763,10 @@ host_x86_SHR32_IMM(codeblock_t *block, int dst_reg, int shift)
 void
 host_x86_SUB8_REG_IMM(codeblock_t *block, int dst_reg, uint8_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_SUB8_REG_IMM - dst_reg & 8\n");
+#endif
 
     if (dst_reg == REG_EAX) {
         codegen_alloc_bytes(block, 2);
@@ -1573,8 +1779,10 @@ host_x86_SUB8_REG_IMM(codeblock_t *block, int dst_reg, uint8_t imm_data)
 void
 host_x86_SUB16_REG_IMM(codeblock_t *block, int dst_reg, uint16_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_SUB16_REG_IMM - dst_reg & 8\n");
+#endif
 
     if (is_imm8(imm_data)) {
         codegen_alloc_bytes(block, 4);
@@ -1592,8 +1800,10 @@ host_x86_SUB16_REG_IMM(codeblock_t *block, int dst_reg, uint16_t imm_data)
 void
 host_x86_SUB32_REG_IMM(codeblock_t *block, int dst_reg, uint32_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_SUB32_REG_IMM - dst_reg & 8\n");
+#endif
 
     if (is_imm8(imm_data)) {
         codegen_alloc_bytes(block, 3);
@@ -1611,8 +1821,10 @@ host_x86_SUB32_REG_IMM(codeblock_t *block, int dst_reg, uint32_t imm_data)
 void
 host_x86_SUB64_REG_IMM(codeblock_t *block, int dst_reg, uint64_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_SUB64_REG_IMM - dst_reg & 8\n");
+#endif
 
     if (is_imm8(imm_data)) {
         codegen_alloc_bytes(block, 4);
@@ -1623,8 +1835,10 @@ host_x86_SUB64_REG_IMM(codeblock_t *block, int dst_reg, uint64_t imm_data)
 void
 host_x86_SUB8_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_SUB8_REG_REG - dst_reg & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0x28, 0xc0 | (dst_reg & 7) | ((src_reg & 7) << 3)); /*SUB dst_reg, src_reg*/
@@ -1632,8 +1846,10 @@ host_x86_SUB8_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 void
 host_x86_SUB16_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_SUB16_REG_REG - dst_reg & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0x66, 0x29, 0xc0 | (dst_reg & 7) | ((src_reg & 7) << 3)); /*SUB dst_reg, src_reg*/
@@ -1641,8 +1857,10 @@ host_x86_SUB16_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 void
 host_x86_SUB32_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_SUB32_REG_REG - dst_reg & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0x29, 0xc0 | (dst_reg & 7) | ((src_reg & 7) << 3)); /*SUB dst_reg, src_reg*/
@@ -1665,8 +1883,10 @@ host_x86_TEST16_REG(codeblock_t *block, int src_host_reg, int dst_host_reg)
 void
 host_x86_TEST32_REG(codeblock_t *block, int src_reg, int dst_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_TEST32_REG - bad reg\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0x85, MODRM_MOD_REG(dst_reg, src_reg)); /*TEST dst_host_reg, src_host_reg*/
@@ -1674,8 +1894,10 @@ host_x86_TEST32_REG(codeblock_t *block, int src_reg, int dst_reg)
 void
 host_x86_TEST32_REG_IMM(codeblock_t *block, int dst_reg, uint32_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("TEST32_REG_IMM reg & 8\n");
+#endif
     if (dst_reg == REG_EAX) {
         codegen_alloc_bytes(block, 5);
         codegen_addbyte(block, 0xa9); /*TEST EAX, imm_data*/
@@ -1690,8 +1912,10 @@ host_x86_TEST32_REG_IMM(codeblock_t *block, int dst_reg, uint32_t imm_data)
 void
 host_x86_XOR8_REG_IMM(codeblock_t *block, int dst_reg, uint8_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_XOR8_REG_IMM - dst_reg & 8\n");
+#endif
 
     if (dst_reg == REG_EAX) {
         codegen_alloc_bytes(block, 2);
@@ -1704,8 +1928,10 @@ host_x86_XOR8_REG_IMM(codeblock_t *block, int dst_reg, uint8_t imm_data)
 void
 host_x86_XOR16_REG_IMM(codeblock_t *block, int dst_reg, uint16_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_XOR16_REG_IMM - dst_reg & 8\n");
+#endif
 
     if (is_imm8(imm_data)) {
         codegen_alloc_bytes(block, 4);
@@ -1723,8 +1949,10 @@ host_x86_XOR16_REG_IMM(codeblock_t *block, int dst_reg, uint16_t imm_data)
 void
 host_x86_XOR32_REG_IMM(codeblock_t *block, int dst_reg, uint32_t imm_data)
 {
+#ifdef RECOMPILER_DEBUG
     if (dst_reg & 8)
         fatal("host_x86_XOR32_REG_IMM - dst_reg & 8\n");
+#endif
 
     if (is_imm8(imm_data)) {
         codegen_alloc_bytes(block, 3);
@@ -1742,8 +1970,10 @@ host_x86_XOR32_REG_IMM(codeblock_t *block, int dst_reg, uint32_t imm_data)
 void
 host_x86_XOR8_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_XOR8_REG_IMM - dst_reg & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0x30, 0xc0 | (dst_reg & 7) | ((src_reg & 7) << 3)); /*XOR dst_reg, src_reg*/
@@ -1751,8 +1981,10 @@ host_x86_XOR8_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 void
 host_x86_XOR16_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_XOR16_REG_IMM - dst_reg & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 3);
     codegen_addbyte3(block, 0x66, 0x31, 0xc0 | (dst_reg & 7) | ((src_reg & 7) << 3)); /*XOR dst_reg, src_reg*/
@@ -1760,8 +1992,10 @@ host_x86_XOR16_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 void
 host_x86_XOR32_REG_REG(codeblock_t *block, int dst_reg, int src_reg)
 {
+#ifdef RECOMPILER_DEBUG
     if ((dst_reg & 8) || (src_reg & 8))
         fatal("host_x86_XOR32_REG_IMM - dst_reg & 8\n");
+#endif
 
     codegen_alloc_bytes(block, 2);
     codegen_addbyte2(block, 0x31, 0xc0 | (dst_reg & 7) | ((src_reg & 7) << 3)); /*XOR dst_reg, src_reg*/
diff --git a/src/codegen_new/codegen_backend_x86-64_uops.c b/src/codegen_new/codegen_backend_x86-64_uops.c
index fcab0f3ce..356c8bcde 100644
--- a/src/codegen_new/codegen_backend_x86-64_uops.c
+++ b/src/codegen_new/codegen_backend_x86-64_uops.c
@@ -9,6 +9,7 @@
 #    include "x86.h"
 #    include "x86seg_common.h"
 #    include "x86seg.h"
+#    include "x87_sf.h"
 #    include "x87.h"
 #    include "386_common.h"
 #    include "codegen.h"
@@ -218,6 +219,11 @@ codegen_CALL_FUNC_RESULT(codeblock_t *block, uop_t *uop)
 static int
 codegen_CALL_INSTRUCTION_FUNC(codeblock_t *block, uop_t *uop)
 {
+#    if _WIN64
+    host_x86_MOV32_REG_IMM(block, REG_ECX, uop->imm_data);
+#    else
+    host_x86_MOV32_REG_IMM(block, REG_EDI, uop->imm_data);
+#    endif
     host_x86_CALL(block, uop->p);
     host_x86_TEST32_REG(block, REG_EAX, REG_EAX);
     host_x86_JNZ(block, codegen_exit_rout);
@@ -630,9 +636,10 @@ codegen_FCHS(codeblock_t *block, uop_t *uop)
     int src_size_a = IREG_GET_SIZE(uop->src_reg_a_real);
 
     if (REG_IS_D(dest_size) && REG_IS_D(src_size_a)) {
-        host_x86_MOVQ_XREG_XREG(block, REG_XMM_TEMP, src_reg_a);
-        host_x86_PXOR_XREG_XREG(block, dest_reg, dest_reg);
-        host_x86_SUBSD_XREG_XREG(block, dest_reg, REG_XMM_TEMP);
+        host_x86_MOVQ_XREG_XREG(block, dest_reg, src_reg_a);
+        host_x86_MOV64_REG_IMM(block, REG_RCX, 0x8000000000000000);
+        host_x86_MOVQ_XREG_REG(block, REG_XMM_TEMP, REG_RCX);
+        host_x86_PXOR_XREG_XREG(block, dest_reg, REG_XMM_TEMP);
     }
 #    ifdef RECOMPILER_DEBUG
     else
@@ -672,7 +679,7 @@ codegen_FTST(codeblock_t *block, uop_t *uop)
         host_x86_XOR32_REG_REG(block, REG_EAX, REG_EAX);
         host_x86_COMISD_XREG_XREG(block, src_reg_a, REG_XMM_TEMP);
         host_x86_LAHF(block);
-        host_x86_AND16_REG_IMM(block, REG_EAX, C0 | C2 | C3);
+        host_x86_AND16_REG_IMM(block, REG_EAX, FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
         if (dest_reg != REG_EAX) {
             host_x86_MOV16_REG_REG(block, dest_reg, REG_EAX);
             host_x86_MOV32_REG_REG(block, REG_EAX, REG_ECX);
@@ -720,7 +727,7 @@ codegen_FCOM(codeblock_t *block, uop_t *uop)
         host_x86_XOR32_REG_REG(block, REG_EAX, REG_EAX);
         host_x86_COMISD_XREG_XREG(block, src_reg_a, src_reg_b);
         host_x86_LAHF(block);
-        host_x86_AND16_REG_IMM(block, REG_EAX, C0 | C2 | C3);
+        host_x86_AND16_REG_IMM(block, REG_EAX, FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
         if (dest_reg != REG_EAX) {
             host_x86_MOV16_REG_REG(block, dest_reg, REG_EAX);
             host_x86_MOV32_REG_REG(block, REG_EAX, REG_ECX);
@@ -996,8 +1003,12 @@ codegen_MEM_LOAD_REG(codeblock_t *block, uop_t *uop)
     int dest_size = IREG_GET_SIZE(uop->dest_reg_a_real);
 
     host_x86_LEA_REG_REG(block, REG_ESI, seg_reg, addr_reg);
-    if (uop->imm_data)
+    if (uop->imm_data) {
         host_x86_ADD32_REG_IMM(block, REG_ESI, uop->imm_data);
+        if (uop->is_a16) {
+            host_x86_AND32_REG_IMM(block, REG_ESI, 0x0000ffff);
+        }
+    }
     if (REG_IS_B(dest_size)) {
         host_x86_CALL(block, codegen_mem_load_byte);
     } else if (REG_IS_W(dest_size)) {
diff --git a/src/codegen_new/codegen_backend_x86_uops.c b/src/codegen_new/codegen_backend_x86_uops.c
index 5ef2d97b8..fad088822 100644
--- a/src/codegen_new/codegen_backend_x86_uops.c
+++ b/src/codegen_new/codegen_backend_x86_uops.c
@@ -10,6 +10,7 @@
 #    include "x86_ops.h"
 #    include "x86seg_common.h"
 #    include "x86seg.h"
+#    include "x87_sf.h"
 #    include "386_common.h"
 #    include "codegen.h"
 #    include "codegen_allocator.h"
@@ -220,6 +221,7 @@ codegen_CALL_FUNC_RESULT(codeblock_t *block, uop_t *uop)
 static int
 codegen_CALL_INSTRUCTION_FUNC(codeblock_t *block, uop_t *uop)
 {
+    host_x86_MOV32_STACK_IMM(block, STACK_ARG0, uop->imm_data);
     host_x86_CALL(block, uop->p);
     host_x86_TEST32_REG(block, REG_EAX, REG_EAX);
     host_x86_JNZ(block, codegen_exit_rout);
@@ -677,7 +679,7 @@ codegen_FTST(codeblock_t *block, uop_t *uop)
         host_x86_XOR32_REG_REG(block, REG_EAX, REG_EAX);
         host_x86_COMISD_XREG_XREG(block, src_reg_a, REG_XMM_TEMP);
         host_x86_LAHF(block);
-        host_x86_AND16_REG_IMM(block, REG_EAX, C0 | C2 | C3);
+        host_x86_AND16_REG_IMM(block, REG_EAX, FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
         if (dest_reg != REG_EAX) {
             host_x86_MOV16_REG_REG(block, dest_reg, REG_EAX);
             host_x86_MOV32_REG_REG(block, REG_EAX, REG_ECX);
@@ -725,7 +727,7 @@ codegen_FCOM(codeblock_t *block, uop_t *uop)
         host_x86_XOR32_REG_REG(block, REG_EAX, REG_EAX);
         host_x86_COMISD_XREG_XREG(block, src_reg_a, src_reg_b);
         host_x86_LAHF(block);
-        host_x86_AND16_REG_IMM(block, REG_EAX, C0 | C2 | C3);
+        host_x86_AND16_REG_IMM(block, REG_EAX, FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
         if (dest_reg != REG_EAX) {
             host_x86_MOV16_REG_REG(block, dest_reg, REG_EAX);
             host_x86_MOV32_REG_REG(block, REG_EAX, REG_ECX);
@@ -980,8 +982,12 @@ codegen_MEM_LOAD_REG(codeblock_t *block, uop_t *uop)
     int dest_size = IREG_GET_SIZE(uop->dest_reg_a_real);
 
     host_x86_LEA_REG_REG(block, REG_ESI, seg_reg, addr_reg);
-    if (uop->imm_data)
+    if (uop->imm_data) {
         host_x86_ADD32_REG_IMM(block, REG_ESI, uop->imm_data);
+        if (uop->is_a16) {
+            host_x86_AND32_REG_IMM(block, REG_ESI, 0x0000ffff);
+        }
+    }
     if (REG_IS_B(dest_size)) {
         host_x86_CALL(block, codegen_mem_load_byte);
     } else if (REG_IS_W(dest_size)) {
diff --git a/src/codegen_new/codegen_block.c b/src/codegen_new/codegen_block.c
index ee0a030ba..ff82384be 100644
--- a/src/codegen_new/codegen_block.c
+++ b/src/codegen_new/codegen_block.c
@@ -12,6 +12,7 @@
 #include "x86_ops.h"
 #include "x86seg_common.h"
 #include "x86seg.h"
+#include "x87_sf.h"
 #include "x87.h"
 
 #include "386_common.h"
@@ -216,6 +217,7 @@ block_free_list_get(void)
 void
 codegen_init(void)
 {
+    codegen_check_regs();
     codegen_allocator_init();
 
     codegen_backend_init();
diff --git a/src/codegen_new/codegen_ir.c b/src/codegen_new/codegen_ir.c
index 6345bbe86..d14fa0f23 100644
--- a/src/codegen_new/codegen_ir.c
+++ b/src/codegen_new/codegen_ir.c
@@ -2,6 +2,7 @@
 #include <86box/86box.h>
 #include "cpu.h"
 #include <86box/mem.h>
+#include <86box/plat_unused.h>
 
 #include "codegen.h"
 #include "codegen_allocator.h"
@@ -37,7 +38,7 @@ codegen_ir_set_unroll(int count, int start, int first_instruction)
 static void
 duplicate_uop(ir_data_t *ir, uop_t *uop, int offset)
 {
-    uop_t *new_uop = uop_alloc(ir, uop->type);
+    uop_t *new_uop = uop_alloc_unroll(ir, uop->type);
 
     if (!ir_reg_is_invalid(uop->src_reg_a))
         new_uop->src_reg_a = codegen_reg_read(uop->src_reg_a.reg);
diff --git a/src/codegen_new/codegen_ir_defs.h b/src/codegen_new/codegen_ir_defs.h
index 26a1c3cb4..60f7badea 100644
--- a/src/codegen_new/codegen_ir_defs.h
+++ b/src/codegen_new/codegen_ir_defs.h
@@ -41,8 +41,8 @@
 #define UOP_LOAD_FUNC_ARG_2_IMM (UOP_TYPE_PARAMS_IMM | 0x0a | UOP_TYPE_BARRIER)
 #define UOP_LOAD_FUNC_ARG_3_IMM (UOP_TYPE_PARAMS_IMM | 0x0b | UOP_TYPE_BARRIER)
 #define UOP_CALL_FUNC           (UOP_TYPE_PARAMS_POINTER | 0x10 | UOP_TYPE_BARRIER)
-/*UOP_CALL_INSTRUCTION_FUNC - call instruction handler at p, check return value and exit block if non-zero*/
-#define UOP_CALL_INSTRUCTION_FUNC (UOP_TYPE_PARAMS_POINTER | 0x11 | UOP_TYPE_BARRIER)
+/*UOP_CALL_INSTRUCTION_FUNC - call instruction handler at p with fetchdat, check return value and exit block if non-zero*/
+#define UOP_CALL_INSTRUCTION_FUNC (UOP_TYPE_PARAMS_POINTER | UOP_TYPE_PARAMS_IMM | 0x11 | UOP_TYPE_BARRIER)
 #define UOP_STORE_P_IMM           (UOP_TYPE_PARAMS_IMM | 0x12)
 #define UOP_STORE_P_IMM_8         (UOP_TYPE_PARAMS_IMM | 0x13)
 /*UOP_LOAD_SEG - load segment in src_reg_a to segment p via loadseg(), check return value and exit block if non-zero*/
@@ -340,6 +340,7 @@ typedef struct uop_t {
     void         *p;
     ir_host_reg_t dest_reg_a_real;
     ir_host_reg_t src_reg_a_real, src_reg_b_real, src_reg_c_real;
+    int           is_a16;
     int           jump_dest_uop;
     int           jump_list_next;
     void         *jump_dest;
@@ -364,6 +365,36 @@ uop_alloc(ir_data_t *ir, uint32_t uop_type)
 
     uop = &ir->uops[ir->wr_pos++];
 
+    uop->is_a16     = 0;
+
+    uop->dest_reg_a = invalid_ir_reg;
+    uop->src_reg_a  = invalid_ir_reg;
+    uop->src_reg_b  = invalid_ir_reg;
+    uop->src_reg_c  = invalid_ir_reg;
+
+    uop->pc = cpu_state.oldpc;
+
+    uop->jump_dest_uop  = -1;
+    uop->jump_list_next = -1;
+
+    if (uop_type & (UOP_TYPE_BARRIER | UOP_TYPE_ORDER_BARRIER))
+        dirty_ir_regs[0] = dirty_ir_regs[1] = ~0ULL;
+
+    return uop;
+}
+
+static inline uop_t *
+uop_alloc_unroll(ir_data_t *ir, uint32_t uop_type)
+{
+    uop_t *uop;
+
+    if (ir->wr_pos >= UOP_NR_MAX)
+        fatal("Exceeded uOP max\n");
+
+    uop = &ir->uops[ir->wr_pos++];
+
+    uop->is_a16     = 0;
+
     uop->dest_reg_a = invalid_ir_reg;
     uop->src_reg_a  = invalid_ir_reg;
     uop->src_reg_b  = invalid_ir_reg;
@@ -410,7 +441,7 @@ uop_gen_reg_src1(uint32_t uop_type, ir_data_t *ir, int src_reg_a)
 }
 
 static inline void
-uop_gen_reg_src1_arg(uint32_t uop_type, ir_data_t *ir, int arg, int src_reg_a)
+uop_gen_reg_src1_arg(uint32_t uop_type, ir_data_t *ir, UNUSED(int arg), int src_reg_a)
 {
     uop_t *uop = uop_alloc(ir, uop_type);
 
@@ -488,8 +519,14 @@ uop_gen_reg_dst_src2_imm(uint32_t uop_type, ir_data_t *ir, int dest_reg, int src
     uop_t *uop = uop_alloc(ir, uop_type);
 
     uop->type       = uop_type;
+    uop->is_a16     = 0;    
     uop->src_reg_a  = codegen_reg_read(src_reg_a);
-    uop->src_reg_b  = codegen_reg_read(src_reg_b);
+    if (src_reg_b == IREG_eaa16) {
+        uop->src_reg_b  = codegen_reg_read(IREG_eaaddr);
+        uop->is_a16     = 1;
+    } else
+        uop->src_reg_b  = codegen_reg_read(src_reg_b);
+    uop->is_a16     = 0;    
     uop->dest_reg_a = codegen_reg_write(dest_reg, ir->wr_pos - 1);
     uop->imm_data   = imm;
 }
@@ -653,7 +690,7 @@ uop_gen_reg_src2_pointer(uint32_t uop_type, ir_data_t *ir, int src_reg_a, int sr
 
 #define uop_CALL_FUNC(ir, p)                                     uop_gen_pointer(UOP_CALL_FUNC, ir, p)
 #define uop_CALL_FUNC_RESULT(ir, dst_reg, p)                     uop_gen_reg_dst_pointer(UOP_CALL_FUNC_RESULT, ir, dst_reg, p)
-#define uop_CALL_INSTRUCTION_FUNC(ir, p)                         uop_gen_pointer(UOP_CALL_INSTRUCTION_FUNC, ir, p)
+#define uop_CALL_INSTRUCTION_FUNC(ir, p, imm)                    uop_gen_pointer_imm(UOP_CALL_INSTRUCTION_FUNC, ir, p, imm)
 
 #define uop_CMP_IMM_JZ(ir, src_reg, imm, p)                      uop_gen_reg_src_pointer_imm(UOP_CMP_IMM_JZ, ir, src_reg, p, imm)
 
diff --git a/src/codegen_new/codegen_ops.c b/src/codegen_new/codegen_ops.c
index 59e148659..bb7d1f3ee 100644
--- a/src/codegen_new/codegen_ops.c
+++ b/src/codegen_new/codegen_ops.c
@@ -2,6 +2,7 @@
 #include <86box/86box.h>
 #include "cpu.h"
 #include <86box/mem.h>
+#include <86box/plat_unused.h>
 
 #include "codegen.h"
 #include "codegen_ir.h"
diff --git a/src/codegen_new/codegen_ops_3dnow.c b/src/codegen_new/codegen_ops_3dnow.c
index 8b4d471ba..e827d0d27 100644
--- a/src/codegen_new/codegen_ops_3dnow.c
+++ b/src/codegen_new/codegen_ops_3dnow.c
@@ -16,28 +16,29 @@
 #include "codegen_ops_3dnow.h"
 #include "codegen_ops_helpers.h"
 
-#define ropParith(func)                                                                                                      \
-    uint32_t rop##func(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc) \
-    {                                                                                                                        \
-        int dest_reg = (fetchdat >> 3) & 7;                                                                                  \
-                                                                                                                             \
-        uop_MMX_ENTER(ir);                                                                                                   \
-        codegen_mark_code_present(block, cs + op_pc, 1);                                                                     \
-        if ((fetchdat & 0xc0) == 0xc0) {                                                                                     \
-            int src_reg = fetchdat & 7;                                                                                      \
-            uop_##func(ir, IREG_MM(dest_reg), IREG_MM(dest_reg), IREG_MM(src_reg));                                          \
-        } else {                                                                                                             \
-            x86seg *target_seg;                                                                                              \
-                                                                                                                             \
-            uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                    \
-            target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                           \
-            codegen_check_seg_read(block, ir, target_seg);                                                                   \
-            uop_MEM_LOAD_REG(ir, IREG_temp0_Q, ireg_seg_base(target_seg), IREG_eaaddr);                                      \
-            uop_##func(ir, IREG_MM(dest_reg), IREG_MM(dest_reg), IREG_temp0_Q);                                              \
-        }                                                                                                                    \
-                                                                                                                             \
-        codegen_mark_code_present(block, cs + op_pc + 1, 1);                                                                 \
-        return op_pc + 2;                                                                                                    \
+#define ropParith(func)                                                                            \
+    uint32_t rop##func(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),                  \
+                       uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                          \
+    {                                                                                              \
+        int dest_reg = (fetchdat >> 3) & 7;                                                        \
+                                                                                                   \
+        uop_MMX_ENTER(ir);                                                                         \
+        codegen_mark_code_present(block, cs + op_pc, 1);                                           \
+        if ((fetchdat & 0xc0) == 0xc0) {                                                           \
+            int src_reg = fetchdat & 7;                                                            \
+            uop_##func(ir, IREG_MM(dest_reg), IREG_MM(dest_reg), IREG_MM(src_reg));                \
+        } else {                                                                                   \
+            x86seg *target_seg;                                                                    \
+                                                                                                   \
+            uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+            target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+            codegen_check_seg_read(block, ir, target_seg);                                         \
+            uop_MEM_LOAD_REG(ir, IREG_temp0_Q, ireg_seg_base(target_seg), IREG_eaaddr);            \
+            uop_##func(ir, IREG_MM(dest_reg), IREG_MM(dest_reg), IREG_temp0_Q);                    \
+        }                                                                                          \
+                                                                                                   \
+        codegen_mark_code_present(block, cs + op_pc + 1, 1);                                       \
+        return op_pc + 2;                                                                          \
     }
 
 // clang-format off
@@ -192,7 +193,7 @@ ropPFRSQRT(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t f
 }
 
 uint32_t
-ropPFRSQIT1(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropPFRSQIT1(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_MMX_ENTER(ir);
 
diff --git a/src/codegen_new/codegen_ops_arith.c b/src/codegen_new/codegen_ops_arith.c
index 9e136ace5..c899c13d8 100644
--- a/src/codegen_new/codegen_ops_arith.c
+++ b/src/codegen_new/codegen_ops_arith.c
@@ -22,7 +22,7 @@ get_cf(ir_data_t *ir, int dest_reg)
 }
 
 uint32_t
-ropADC_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropADC_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint8_t imm_data = fastreadb(cs + op_pc);
 
@@ -39,7 +39,7 @@ ropADC_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_
     return op_pc + 1;
 }
 uint32_t
-ropADC_AX_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropADC_AX_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint16_t imm_data = fastreadw(cs + op_pc);
 
@@ -274,7 +274,7 @@ ropADC_l_rmw(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t
 }
 
 uint32_t
-ropADD_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropADD_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint8_t imm_data = fastreadb(cs + op_pc);
 
@@ -289,7 +289,7 @@ ropADD_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_
     return op_pc + 1;
 }
 uint32_t
-ropADD_AX_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropADD_AX_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint16_t imm_data = fastreadw(cs + op_pc);
 
@@ -511,7 +511,7 @@ ropADD_l_rmw(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t
 }
 
 uint32_t
-ropCMP_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropCMP_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint8_t imm_data = fastreadb(cs + op_pc);
 
@@ -526,7 +526,7 @@ ropCMP_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_
     return op_pc + 1;
 }
 uint32_t
-ropCMP_AX_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropCMP_AX_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint16_t imm_data = fastreadw(cs + op_pc);
 
@@ -734,7 +734,7 @@ ropCMP_l_rmw(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t
 }
 
 uint32_t
-ropSBB_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropSBB_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint8_t imm_data = fastreadb(cs + op_pc);
 
@@ -751,7 +751,7 @@ ropSBB_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_
     return op_pc + 1;
 }
 uint32_t
-ropSBB_AX_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropSBB_AX_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint16_t imm_data = fastreadw(cs + op_pc);
 
@@ -988,7 +988,7 @@ ropSBB_l_rmw(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t
 }
 
 uint32_t
-ropSUB_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropSUB_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint8_t imm_data = fastreadb(cs + op_pc);
 
@@ -1003,7 +1003,7 @@ ropSUB_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_
     return op_pc + 1;
 }
 uint32_t
-ropSUB_AX_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropSUB_AX_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint16_t imm_data = fastreadw(cs + op_pc);
 
@@ -2293,7 +2293,7 @@ rebuild_c(ir_data_t *ir)
 }
 
 uint32_t
-ropINC_r16(UNUSED(UNUSED(codeblock_t *block)), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropINC_r16(UNUSED(UNUSED(codeblock_t *block)), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     rebuild_c(ir);
 
@@ -2307,7 +2307,7 @@ ropINC_r16(UNUSED(UNUSED(codeblock_t *block)), ir_data_t *ir, UNUSED(uint8_t opc
     return op_pc;
 }
 uint32_t
-ropINC_r32(UNUSED(UNUSED(codeblock_t *block)), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropINC_r32(UNUSED(UNUSED(codeblock_t *block)), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     rebuild_c(ir);
 
@@ -2322,7 +2322,7 @@ ropINC_r32(UNUSED(UNUSED(codeblock_t *block)), ir_data_t *ir, UNUSED(uint8_t opc
 }
 
 uint32_t
-ropDEC_r16(UNUSED(codeblock_t *block), ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropDEC_r16(UNUSED(codeblock_t *block), ir_data_t *ir, uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     rebuild_c(ir);
 
@@ -2336,7 +2336,7 @@ ropDEC_r16(UNUSED(codeblock_t *block), ir_data_t *ir, uint8_t opcode, uint32_t f
     return op_pc;
 }
 uint32_t
-ropDEC_r32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropDEC_r32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     rebuild_c(ir);
 
diff --git a/src/codegen_new/codegen_ops_branch.c b/src/codegen_new/codegen_ops_branch.c
index cedb54177..2039b6d79 100644
--- a/src/codegen_new/codegen_ops_branch.c
+++ b/src/codegen_new/codegen_ops_branch.c
@@ -815,43 +815,59 @@ ropJNLE_common(codeblock_t *block, ir_data_t *ir, uint32_t dest_addr, uint32_t n
     }
 }
 
-#define ropJ(cond)                                                                                                                 \
-    uint32_t ropJ##cond##_8(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)  \
-    {                                                                                                                              \
-        uint32_t offset    = (int32_t) (int8_t) fastreadb(cs + op_pc);                                                             \
-        uint32_t dest_addr = op_pc + 1 + offset;                                                                                   \
-        int      ret;                                                                                                              \
-                                                                                                                                   \
-        if (!(op_32 & 0x100))                                                                                                      \
-            dest_addr &= 0xffff;                                                                                                   \
-        ret = ropJ##cond##_common(block, ir, dest_addr, op_pc + 1);                                                                \
-                                                                                                                                   \
-        codegen_mark_code_present(block, cs + op_pc, 1);                                                                           \
-        return ret ? dest_addr : (op_pc + 1);                                                                                      \
-    }                                                                                                                              \
-    uint32_t ropJ##cond##_16(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc) \
-    {                                                                                                                              \
-        uint32_t offset    = (int32_t) (int16_t) fastreadw(cs + op_pc);                                                            \
-        uint32_t dest_addr = (op_pc + 2 + offset) & 0xffff;                                                                        \
-        int      ret;                                                                                                              \
-                                                                                                                                   \
-        ret = ropJ##cond##_common(block, ir, dest_addr, op_pc + 2);                                                                \
-                                                                                                                                   \
-        codegen_mark_code_present(block, cs + op_pc, 2);                                                                           \
-        return ret ? dest_addr : (op_pc + 2);                                                                                      \
-    }                                                                                                                              \
-    uint32_t ropJ##cond##_32(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc) \
-    {                                                                                                                              \
-        uint32_t offset    = fastreadl(cs + op_pc);                                                                                \
-        uint32_t dest_addr = op_pc + 4 + offset;                                                                                   \
-        int      ret;                                                                                                              \
-                                                                                                                                   \
-        ret = ropJ##cond##_common(block, ir, dest_addr, op_pc + 4);                                                                \
-                                                                                                                                   \
-        codegen_mark_code_present(block, cs + op_pc, 4);                                                                           \
-        return ret ? dest_addr : (op_pc + 4);                                                                                      \
+#define ropJ(cond)                                                      \
+    uint32_t ropJ##cond##_8(codeblock_t *block,                         \
+                            ir_data_t *ir,                              \
+                            UNUSED(uint8_t opcode),                     \
+                            UNUSED(uint32_t fetchdat),                  \
+                            uint32_t op_32,                             \
+                            uint32_t op_pc)                             \
+    {                                                                   \
+        uint32_t offset    = (int32_t) (int8_t) fastreadb(cs + op_pc);  \
+        uint32_t dest_addr = op_pc + 1 + offset;                        \
+        int      ret;                                                   \
+                                                                        \
+        if (!(op_32 & 0x100))                                           \
+            dest_addr &= 0xffff;                                        \
+        ret = ropJ##cond##_common(block, ir, dest_addr, op_pc + 1);     \
+                                                                        \
+        codegen_mark_code_present(block, cs + op_pc, 1);                \
+        return ret ? dest_addr : (op_pc + 1);                           \
+    }                                                                   \
+    uint32_t ropJ##cond##_16(codeblock_t *block,                        \
+                             ir_data_t *ir,                             \
+                             UNUSED(uint8_t opcode),                    \
+                             UNUSED(uint32_t fetchdat),                 \
+                             UNUSED(uint32_t op_32),                    \
+                             uint32_t op_pc)                            \
+    {                                                                   \
+        uint32_t offset    = (int32_t) (int16_t) fastreadw(cs + op_pc); \
+        uint32_t dest_addr = (op_pc + 2 + offset) & 0xffff;             \
+        int      ret;                                                   \
+                                                                        \
+        ret = ropJ##cond##_common(block, ir, dest_addr, op_pc + 2);     \
+                                                                        \
+        codegen_mark_code_present(block, cs + op_pc, 2);                \
+        return ret ? dest_addr : (op_pc + 2);                           \
+    }                                                                   \
+    uint32_t ropJ##cond##_32(codeblock_t *block,                        \
+                             ir_data_t *ir,                             \
+                             UNUSED(uint8_t opcode),                    \
+                             UNUSED(uint32_t fetchdat),                 \
+                             UNUSED(uint32_t op_32),                    \
+                             uint32_t op_pc)                            \
+    {                                                                   \
+        uint32_t offset    = fastreadl(cs + op_pc);                     \
+        uint32_t dest_addr = op_pc + 4 + offset;                        \
+        int      ret;                                                   \
+                                                                        \
+        ret = ropJ##cond##_common(block, ir, dest_addr, op_pc + 4);     \
+                                                                        \
+        codegen_mark_code_present(block, cs + op_pc, 4);                \
+        return ret ? dest_addr : (op_pc + 4);                           \
     }
 
+// clang-format off
 ropJ(O)
 ropJ(NO)
 ropJ(B)
@@ -868,9 +884,10 @@ ropJ(L)
 ropJ(NL)
 ropJ(LE)
 ropJ(NLE)
+// clang-format on
 
 uint32_t
-ropJCXZ(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
+ropJCXZ(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), uint32_t op_32, uint32_t op_pc)
 {
     uint32_t offset    = (int32_t) (int8_t) fastreadb(cs + op_pc);
     uint32_t dest_addr = op_pc + 1 + offset;
@@ -892,7 +909,7 @@ ropJCXZ(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetc
 }
 
 uint32_t
-ropLOOP(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
+ropLOOP(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), uint32_t op_32, uint32_t op_pc)
 {
     uint32_t offset    = (int32_t) (int8_t) fastreadb(cs + op_pc);
     uint32_t dest_addr = op_pc + 1 + offset;
@@ -932,7 +949,7 @@ ropLOOP(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetc
 }
 
 uint32_t
-ropLOOPE(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
+ropLOOPE(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), uint32_t op_32, uint32_t op_pc)
 {
     uint32_t offset    = (int32_t) (int8_t) fastreadb(cs + op_pc);
     uint32_t dest_addr = op_pc + 1 + offset;
@@ -965,7 +982,7 @@ ropLOOPE(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fet
     return op_pc + 1;
 }
 uint32_t
-ropLOOPNE(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
+ropLOOPNE(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), uint32_t op_32, uint32_t op_pc)
 {
     uint32_t offset    = (int32_t) (int8_t) fastreadb(cs + op_pc);
     uint32_t dest_addr = op_pc + 1 + offset;
diff --git a/src/codegen_new/codegen_ops_fpu_arith.c b/src/codegen_new/codegen_ops_fpu_arith.c
index 3ab7be8ac..1568852df 100644
--- a/src/codegen_new/codegen_ops_fpu_arith.c
+++ b/src/codegen_new/codegen_ops_fpu_arith.c
@@ -9,6 +9,7 @@
 #include "x86seg_common.h"
 #include "x86seg.h"
 #include "386_common.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include "codegen.h"
 #include "codegen_accumulate.h"
@@ -59,7 +60,7 @@ ropFCOM(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint3
 
     uop_FP_ENTER(ir);
     uop_FCOM(ir, IREG_temp0_W, IREG_ST(0), IREG_ST(src_reg));
-    uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(C0 | C2 | C3));
+    uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3));
     uop_OR(ir, IREG_NPXS, IREG_NPXS, IREG_temp0_W);
 
     return op_pc;
@@ -71,18 +72,18 @@ ropFCOMP(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fet
 
     uop_FP_ENTER(ir);
     uop_FCOM(ir, IREG_temp0_W, IREG_ST(0), IREG_ST(src_reg));
-    uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(C0 | C2 | C3));
+    uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3));
     uop_OR(ir, IREG_NPXS, IREG_NPXS, IREG_temp0_W);
     fpu_POP(block, ir);
 
     return op_pc;
 }
 uint32_t
-ropFCOMPP(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropFCOMPP(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_FP_ENTER(ir);
     uop_FCOM(ir, IREG_temp0_W, IREG_ST(0), IREG_ST(1));
-    uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(C0 | C2 | C3));
+    uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3));
     uop_OR(ir, IREG_NPXS, IREG_NPXS, IREG_temp0_W);
     fpu_POP2(block, ir);
 
@@ -269,7 +270,7 @@ ropFUCOM(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint
 
     uop_FP_ENTER(ir);
     uop_FCOM(ir, IREG_temp0_W, IREG_ST(0), IREG_ST(src_reg));
-    uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(C0 | C2 | C3));
+    uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3));
     uop_OR(ir, IREG_NPXS, IREG_NPXS, IREG_temp0_W);
 
     return op_pc;
@@ -281,149 +282,157 @@ ropFUCOMP(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fe
 
     uop_FP_ENTER(ir);
     uop_FCOM(ir, IREG_temp0_W, IREG_ST(0), IREG_ST(src_reg));
-    uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(C0 | C2 | C3));
+    uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3));
     uop_OR(ir, IREG_NPXS, IREG_NPXS, IREG_temp0_W);
     fpu_POP(block, ir);
 
     return op_pc;
 }
 uint32_t
-ropFUCOMPP(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropFUCOMPP(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_FP_ENTER(ir);
     uop_FCOM(ir, IREG_temp0_W, IREG_ST(0), IREG_ST(1));
-    uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(C0 | C2 | C3));
+    uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3));
     uop_OR(ir, IREG_NPXS, IREG_NPXS, IREG_temp0_W);
     fpu_POP2(block, ir);
 
     return op_pc;
 }
 
-#define ropF_arith_mem(name, load_uop)                                                                                            \
-    uint32_t ropFADD##name(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)  \
-    {                                                                                                                             \
-        x86seg *target_seg;                                                                                                       \
-                                                                                                                                  \
-        if ((cpu_state.npxc >> 10) & 3)                                                                                           \
-            return 0;                                                                                                             \
-        uop_FP_ENTER(ir);                                                                                                         \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                             \
-        op_pc--;                                                                                                                  \
-        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                                    \
-        codegen_check_seg_read(block, ir, target_seg);                                                                            \
-        load_uop(ir, IREG_temp0_D, ireg_seg_base(target_seg), IREG_eaaddr);                                                       \
-        uop_FADD(ir, IREG_ST(0), IREG_ST(0), IREG_temp0_D);                                                                       \
-        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                                                                  \
-                                                                                                                                  \
-        return op_pc + 1;                                                                                                         \
-    }                                                                                                                             \
-    uint32_t ropFCOM##name(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)  \
-    {                                                                                                                             \
-        x86seg *target_seg;                                                                                                       \
-                                                                                                                                  \
-        uop_FP_ENTER(ir);                                                                                                         \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                             \
-        op_pc--;                                                                                                                  \
-        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                                    \
-        codegen_check_seg_read(block, ir, target_seg);                                                                            \
-        load_uop(ir, IREG_temp0_D, ireg_seg_base(target_seg), IREG_eaaddr);                                                       \
-        uop_FCOM(ir, IREG_temp1_W, IREG_ST(0), IREG_temp0_D);                                                                     \
-        uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(C0 | C2 | C3));                                                                   \
-        uop_OR(ir, IREG_NPXS, IREG_NPXS, IREG_temp1_W);                                                                           \
-                                                                                                                                  \
-        return op_pc + 1;                                                                                                         \
-    }                                                                                                                             \
-    uint32_t ropFCOMP##name(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc) \
-    {                                                                                                                             \
-        x86seg *target_seg;                                                                                                       \
-                                                                                                                                  \
-        uop_FP_ENTER(ir);                                                                                                         \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                             \
-        op_pc--;                                                                                                                  \
-        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                                    \
-        codegen_check_seg_read(block, ir, target_seg);                                                                            \
-        load_uop(ir, IREG_temp0_D, ireg_seg_base(target_seg), IREG_eaaddr);                                                       \
-        uop_FCOM(ir, IREG_temp1_W, IREG_ST(0), IREG_temp0_D);                                                                     \
-        uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(C0 | C2 | C3));                                                                   \
-        uop_OR(ir, IREG_NPXS, IREG_NPXS, IREG_temp1_W);                                                                           \
-        fpu_POP(block, ir);                                                                                                       \
-                                                                                                                                  \
-        return op_pc + 1;                                                                                                         \
-    }                                                                                                                             \
-    uint32_t ropFDIV##name(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)  \
-    {                                                                                                                             \
-        x86seg *target_seg;                                                                                                       \
-                                                                                                                                  \
-        uop_FP_ENTER(ir);                                                                                                         \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                             \
-        op_pc--;                                                                                                                  \
-        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                                    \
-        codegen_check_seg_read(block, ir, target_seg);                                                                            \
-        load_uop(ir, IREG_temp0_D, ireg_seg_base(target_seg), IREG_eaaddr);                                                       \
-        uop_FDIV(ir, IREG_ST(0), IREG_ST(0), IREG_temp0_D);                                                                       \
-        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                                                                  \
-                                                                                                                                  \
-        return op_pc + 1;                                                                                                         \
-    }                                                                                                                             \
-    uint32_t ropFDIVR##name(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc) \
-    {                                                                                                                             \
-        x86seg *target_seg;                                                                                                       \
-                                                                                                                                  \
-        uop_FP_ENTER(ir);                                                                                                         \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                             \
-        op_pc--;                                                                                                                  \
-        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                                    \
-        codegen_check_seg_read(block, ir, target_seg);                                                                            \
-        load_uop(ir, IREG_temp0_D, ireg_seg_base(target_seg), IREG_eaaddr);                                                       \
-        uop_FDIV(ir, IREG_ST(0), IREG_temp0_D, IREG_ST(0));                                                                       \
-        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                                                                  \
-                                                                                                                                  \
-        return op_pc + 1;                                                                                                         \
-    }                                                                                                                             \
-    uint32_t ropFMUL##name(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)  \
-    {                                                                                                                             \
-        x86seg *target_seg;                                                                                                       \
-                                                                                                                                  \
-        uop_FP_ENTER(ir);                                                                                                         \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                             \
-        op_pc--;                                                                                                                  \
-        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                                    \
-        codegen_check_seg_read(block, ir, target_seg);                                                                            \
-        load_uop(ir, IREG_temp0_D, ireg_seg_base(target_seg), IREG_eaaddr);                                                       \
-        uop_FMUL(ir, IREG_ST(0), IREG_ST(0), IREG_temp0_D);                                                                       \
-        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                                                                  \
-                                                                                                                                  \
-        return op_pc + 1;                                                                                                         \
-    }                                                                                                                             \
-    uint32_t ropFSUB##name(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)  \
-    {                                                                                                                             \
-        x86seg *target_seg;                                                                                                       \
-                                                                                                                                  \
-        uop_FP_ENTER(ir);                                                                                                         \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                             \
-        op_pc--;                                                                                                                  \
-        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                                    \
-        codegen_check_seg_read(block, ir, target_seg);                                                                            \
-        load_uop(ir, IREG_temp0_D, ireg_seg_base(target_seg), IREG_eaaddr);                                                       \
-        uop_FSUB(ir, IREG_ST(0), IREG_ST(0), IREG_temp0_D);                                                                       \
-        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                                                                  \
-                                                                                                                                  \
-        return op_pc + 1;                                                                                                         \
-    }                                                                                                                             \
-    uint32_t ropFSUBR##name(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc) \
-    {                                                                                                                             \
-        x86seg *target_seg;                                                                                                       \
-                                                                                                                                  \
-        uop_FP_ENTER(ir);                                                                                                         \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                             \
-        op_pc--;                                                                                                                  \
-        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                                    \
-        codegen_check_seg_read(block, ir, target_seg);                                                                            \
-        load_uop(ir, IREG_temp0_D, ireg_seg_base(target_seg), IREG_eaaddr);                                                       \
-        uop_FSUB(ir, IREG_ST(0), IREG_temp0_D, IREG_ST(0));                                                                       \
-        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                                                                  \
-                                                                                                                                  \
-        return op_pc + 1;                                                                                                         \
+#define ropF_arith_mem(name, load_uop)                                                         \
+    uint32_t ropFADD##name(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),          \
+                           uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                  \
+    {                                                                                          \
+        x86seg *target_seg;                                                                    \
+                                                                                               \
+        if ((cpu_state.npxc >> 10) & 3)                                                        \
+            return 0;                                                                          \
+        uop_FP_ENTER(ir);                                                                      \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+        op_pc--;                                                                               \
+        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+        codegen_check_seg_read(block, ir, target_seg);                                         \
+        load_uop(ir, IREG_temp0_D, ireg_seg_base(target_seg), IREG_eaaddr);                    \
+        uop_FADD(ir, IREG_ST(0), IREG_ST(0), IREG_temp0_D);                                    \
+        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                               \
+                                                                                               \
+        return op_pc + 1;                                                                      \
+    }                                                                                          \
+    uint32_t ropFCOM##name(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),          \
+                           uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                  \
+    {                                                                                          \
+        x86seg *target_seg;                                                                    \
+                                                                                               \
+        uop_FP_ENTER(ir);                                                                      \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+        op_pc--;                                                                               \
+        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+        codegen_check_seg_read(block, ir, target_seg);                                         \
+        load_uop(ir, IREG_temp0_D, ireg_seg_base(target_seg), IREG_eaaddr);                    \
+        uop_FCOM(ir, IREG_temp1_W, IREG_ST(0), IREG_temp0_D);                                  \
+        uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3));           \
+        uop_OR(ir, IREG_NPXS, IREG_NPXS, IREG_temp1_W);                                        \
+                                                                                               \
+        return op_pc + 1;                                                                      \
+    }                                                                                          \
+    uint32_t ropFCOMP##name(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),         \
+                            uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                 \
+    {                                                                                          \
+        x86seg *target_seg;                                                                    \
+                                                                                               \
+        uop_FP_ENTER(ir);                                                                      \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+        op_pc--;                                                                               \
+        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+        codegen_check_seg_read(block, ir, target_seg);                                         \
+        load_uop(ir, IREG_temp0_D, ireg_seg_base(target_seg), IREG_eaaddr);                    \
+        uop_FCOM(ir, IREG_temp1_W, IREG_ST(0), IREG_temp0_D);                                  \
+        uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3));           \
+        uop_OR(ir, IREG_NPXS, IREG_NPXS, IREG_temp1_W);                                        \
+        fpu_POP(block, ir);                                                                    \
+                                                                                               \
+        return op_pc + 1;                                                                      \
+    }                                                                                          \
+    uint32_t ropFDIV##name(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),          \
+                           uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                  \
+    {                                                                                          \
+        x86seg *target_seg;                                                                    \
+                                                                                               \
+        uop_FP_ENTER(ir);                                                                      \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+        op_pc--;                                                                               \
+        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+        codegen_check_seg_read(block, ir, target_seg);                                         \
+        load_uop(ir, IREG_temp0_D, ireg_seg_base(target_seg), IREG_eaaddr);                    \
+        uop_FDIV(ir, IREG_ST(0), IREG_ST(0), IREG_temp0_D);                                    \
+        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                               \
+                                                                                               \
+        return op_pc + 1;                                                                      \
+    }                                                                                          \
+    uint32_t ropFDIVR##name(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),         \
+                            uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                 \
+    {                                                                                          \
+        x86seg *target_seg;                                                                    \
+                                                                                               \
+        uop_FP_ENTER(ir);                                                                      \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+        op_pc--;                                                                               \
+        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+        codegen_check_seg_read(block, ir, target_seg);                                         \
+        load_uop(ir, IREG_temp0_D, ireg_seg_base(target_seg), IREG_eaaddr);                    \
+        uop_FDIV(ir, IREG_ST(0), IREG_temp0_D, IREG_ST(0));                                    \
+        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                               \
+                                                                                               \
+        return op_pc + 1;                                                                      \
+    }                                                                                          \
+    uint32_t ropFMUL##name(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),          \
+                           uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                  \
+    {                                                                                          \
+        x86seg *target_seg;                                                                    \
+                                                                                               \
+        uop_FP_ENTER(ir);                                                                      \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+        op_pc--;                                                                               \
+        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+        codegen_check_seg_read(block, ir, target_seg);                                         \
+        load_uop(ir, IREG_temp0_D, ireg_seg_base(target_seg), IREG_eaaddr);                    \
+        uop_FMUL(ir, IREG_ST(0), IREG_ST(0), IREG_temp0_D);                                    \
+        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                               \
+                                                                                               \
+        return op_pc + 1;                                                                      \
+    }                                                                                          \
+    uint32_t ropFSUB##name(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),          \
+                           uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                  \
+    {                                                                                          \
+        x86seg *target_seg;                                                                    \
+                                                                                               \
+        uop_FP_ENTER(ir);                                                                      \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+        op_pc--;                                                                               \
+        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+        codegen_check_seg_read(block, ir, target_seg);                                         \
+        load_uop(ir, IREG_temp0_D, ireg_seg_base(target_seg), IREG_eaaddr);                    \
+        uop_FSUB(ir, IREG_ST(0), IREG_ST(0), IREG_temp0_D);                                    \
+        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                               \
+                                                                                               \
+        return op_pc + 1;                                                                      \
+    }                                                                                          \
+    uint32_t ropFSUBR##name(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),         \
+                            uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                 \
+    {                                                                                          \
+        x86seg *target_seg;                                                                    \
+                                                                                               \
+        uop_FP_ENTER(ir);                                                                      \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+        op_pc--;                                                                               \
+        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+        codegen_check_seg_read(block, ir, target_seg);                                         \
+        load_uop(ir, IREG_temp0_D, ireg_seg_base(target_seg), IREG_eaaddr);                    \
+        uop_FSUB(ir, IREG_ST(0), IREG_temp0_D, IREG_ST(0));                                    \
+        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                               \
+                                                                                               \
+        return op_pc + 1;                                                                      \
     }
 
 // clang-format off
@@ -431,144 +440,154 @@ ropF_arith_mem(s, uop_MEM_LOAD_SINGLE)
 ropF_arith_mem(d, uop_MEM_LOAD_DOUBLE)
 // clang-format on
 
-#define ropFI_arith_mem(name, temp_reg)                                                                                            \
-    uint32_t ropFIADD##name(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)  \
-    {                                                                                                                              \
-        x86seg *target_seg;                                                                                                        \
-                                                                                                                                   \
-        uop_FP_ENTER(ir);                                                                                                          \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                              \
-        op_pc--;                                                                                                                   \
-        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                                     \
-        codegen_check_seg_read(block, ir, target_seg);                                                                             \
-        uop_MEM_LOAD_REG(ir, temp_reg, ireg_seg_base(target_seg), IREG_eaaddr);                                                    \
-        uop_MOV_DOUBLE_INT(ir, IREG_temp0_D, temp_reg);                                                                            \
-        uop_FADD(ir, IREG_ST(0), IREG_ST(0), IREG_temp0_D);                                                                        \
-        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                                                                   \
-                                                                                                                                   \
-        return op_pc + 1;                                                                                                          \
-    }                                                                                                                              \
-    uint32_t ropFICOM##name(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)  \
-    {                                                                                                                              \
-        x86seg *target_seg;                                                                                                        \
-                                                                                                                                   \
-        uop_FP_ENTER(ir);                                                                                                          \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                              \
-        op_pc--;                                                                                                                   \
-        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                                     \
-        codegen_check_seg_read(block, ir, target_seg);                                                                             \
-        uop_MEM_LOAD_REG(ir, temp_reg, ireg_seg_base(target_seg), IREG_eaaddr);                                                    \
-        uop_MOV_DOUBLE_INT(ir, IREG_temp0_D, temp_reg);                                                                            \
-        uop_FCOM(ir, IREG_temp1_W, IREG_ST(0), IREG_temp0_D);                                                                      \
-        uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(C0 | C2 | C3));                                                                    \
-        uop_OR(ir, IREG_NPXS, IREG_NPXS, IREG_temp1_W);                                                                            \
-                                                                                                                                   \
-        return op_pc + 1;                                                                                                          \
-    }                                                                                                                              \
-    uint32_t ropFICOMP##name(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc) \
-    {                                                                                                                              \
-        x86seg *target_seg;                                                                                                        \
-                                                                                                                                   \
-        uop_FP_ENTER(ir);                                                                                                          \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                              \
-        op_pc--;                                                                                                                   \
-        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                                     \
-        codegen_check_seg_read(block, ir, target_seg);                                                                             \
-        uop_MEM_LOAD_REG(ir, temp_reg, ireg_seg_base(target_seg), IREG_eaaddr);                                                    \
-        uop_MOV_DOUBLE_INT(ir, IREG_temp0_D, temp_reg);                                                                            \
-        uop_FCOM(ir, IREG_temp1_W, IREG_ST(0), IREG_temp0_D);                                                                      \
-        uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(C0 | C2 | C3));                                                                    \
-        uop_OR(ir, IREG_NPXS, IREG_NPXS, IREG_temp1_W);                                                                            \
-        fpu_POP(block, ir);                                                                                                        \
-                                                                                                                                   \
-        return op_pc + 1;                                                                                                          \
-    }                                                                                                                              \
-    uint32_t ropFIDIV##name(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)  \
-    {                                                                                                                              \
-        x86seg *target_seg;                                                                                                        \
-                                                                                                                                   \
-        uop_FP_ENTER(ir);                                                                                                          \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                              \
-        op_pc--;                                                                                                                   \
-        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                                     \
-        codegen_check_seg_read(block, ir, target_seg);                                                                             \
-        uop_MEM_LOAD_REG(ir, temp_reg, ireg_seg_base(target_seg), IREG_eaaddr);                                                    \
-        uop_MOV_DOUBLE_INT(ir, IREG_temp0_D, temp_reg);                                                                            \
-        uop_FDIV(ir, IREG_ST(0), IREG_ST(0), IREG_temp0_D);                                                                        \
-        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                                                                   \
-                                                                                                                                   \
-        return op_pc + 1;                                                                                                          \
-    }                                                                                                                              \
-    uint32_t ropFIDIVR##name(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc) \
-    {                                                                                                                              \
-        x86seg *target_seg;                                                                                                        \
-                                                                                                                                   \
-        uop_FP_ENTER(ir);                                                                                                          \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                              \
-        op_pc--;                                                                                                                   \
-        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                                     \
-        codegen_check_seg_read(block, ir, target_seg);                                                                             \
-        uop_MEM_LOAD_REG(ir, temp_reg, ireg_seg_base(target_seg), IREG_eaaddr);                                                    \
-        uop_MOV_DOUBLE_INT(ir, IREG_temp0_D, temp_reg);                                                                            \
-        uop_FDIV(ir, IREG_ST(0), IREG_temp0_D, IREG_ST(0));                                                                        \
-        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                                                                   \
-                                                                                                                                   \
-        return op_pc + 1;                                                                                                          \
-    }                                                                                                                              \
-    uint32_t ropFIMUL##name(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)  \
-    {                                                                                                                              \
-        x86seg *target_seg;                                                                                                        \
-                                                                                                                                   \
-        uop_FP_ENTER(ir);                                                                                                          \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                              \
-        op_pc--;                                                                                                                   \
-        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                                     \
-        codegen_check_seg_read(block, ir, target_seg);                                                                             \
-        uop_MEM_LOAD_REG(ir, temp_reg, ireg_seg_base(target_seg), IREG_eaaddr);                                                    \
-        uop_MOV_DOUBLE_INT(ir, IREG_temp0_D, temp_reg);                                                                            \
-        uop_FMUL(ir, IREG_ST(0), IREG_ST(0), IREG_temp0_D);                                                                        \
-        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                                                                   \
-                                                                                                                                   \
-        return op_pc + 1;                                                                                                          \
-    }                                                                                                                              \
-    uint32_t ropFISUB##name(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)  \
-    {                                                                                                                              \
-        x86seg *target_seg;                                                                                                        \
-                                                                                                                                   \
-        uop_FP_ENTER(ir);                                                                                                          \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                              \
-        op_pc--;                                                                                                                   \
-        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                                     \
-        codegen_check_seg_read(block, ir, target_seg);                                                                             \
-        uop_MEM_LOAD_REG(ir, temp_reg, ireg_seg_base(target_seg), IREG_eaaddr);                                                    \
-        uop_MOV_DOUBLE_INT(ir, IREG_temp0_D, temp_reg);                                                                            \
-        uop_FSUB(ir, IREG_ST(0), IREG_ST(0), IREG_temp0_D);                                                                        \
-        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                                                                   \
-                                                                                                                                   \
-        return op_pc + 1;                                                                                                          \
-    }                                                                                                                              \
-    uint32_t ropFISUBR##name(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc) \
-    {                                                                                                                              \
-        x86seg *target_seg;                                                                                                        \
-                                                                                                                                   \
-        uop_FP_ENTER(ir);                                                                                                          \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                              \
-        op_pc--;                                                                                                                   \
-        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                                     \
-        codegen_check_seg_read(block, ir, target_seg);                                                                             \
-        uop_MEM_LOAD_REG(ir, temp_reg, ireg_seg_base(target_seg), IREG_eaaddr);                                                    \
-        uop_MOV_DOUBLE_INT(ir, IREG_temp0_D, temp_reg);                                                                            \
-        uop_FSUB(ir, IREG_ST(0), IREG_temp0_D, IREG_ST(0));                                                                        \
-        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                                                                   \
-                                                                                                                                   \
-        return op_pc + 1;                                                                                                          \
+#define ropFI_arith_mem(name, temp_reg)                                                        \
+    uint32_t ropFIADD##name(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),         \
+                            uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                 \
+    {                                                                                          \
+        x86seg *target_seg;                                                                    \
+                                                                                               \
+        uop_FP_ENTER(ir);                                                                      \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+        op_pc--;                                                                               \
+        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+        codegen_check_seg_read(block, ir, target_seg);                                         \
+        uop_MEM_LOAD_REG(ir, temp_reg, ireg_seg_base(target_seg), IREG_eaaddr);                \
+        uop_MOV_DOUBLE_INT(ir, IREG_temp0_D, temp_reg);                                        \
+        uop_FADD(ir, IREG_ST(0), IREG_ST(0), IREG_temp0_D);                                    \
+        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                               \
+                                                                                               \
+        return op_pc + 1;                                                                      \
+    }                                                                                          \
+    uint32_t ropFICOM##name(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),         \
+                            uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                 \
+    {                                                                                          \
+        x86seg *target_seg;                                                                    \
+                                                                                               \
+        uop_FP_ENTER(ir);                                                                      \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+        op_pc--;                                                                               \
+        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+        codegen_check_seg_read(block, ir, target_seg);                                         \
+        uop_MEM_LOAD_REG(ir, temp_reg, ireg_seg_base(target_seg), IREG_eaaddr);                \
+        uop_MOV_DOUBLE_INT(ir, IREG_temp0_D, temp_reg);                                        \
+        uop_FCOM(ir, IREG_temp1_W, IREG_ST(0), IREG_temp0_D);                                  \
+        uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3));           \
+        uop_OR(ir, IREG_NPXS, IREG_NPXS, IREG_temp1_W);                                        \
+                                                                                               \
+        return op_pc + 1;                                                                      \
+    }                                                                                          \
+    uint32_t ropFICOMP##name(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),        \
+                             uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                \
+    {                                                                                          \
+        x86seg *target_seg;                                                                    \
+                                                                                               \
+        uop_FP_ENTER(ir);                                                                      \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+        op_pc--;                                                                               \
+        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+        codegen_check_seg_read(block, ir, target_seg);                                         \
+        uop_MEM_LOAD_REG(ir, temp_reg, ireg_seg_base(target_seg), IREG_eaaddr);                \
+        uop_MOV_DOUBLE_INT(ir, IREG_temp0_D, temp_reg);                                        \
+        uop_FCOM(ir, IREG_temp1_W, IREG_ST(0), IREG_temp0_D);                                  \
+        uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3));           \
+        uop_OR(ir, IREG_NPXS, IREG_NPXS, IREG_temp1_W);                                        \
+        fpu_POP(block, ir);                                                                    \
+                                                                                               \
+        return op_pc + 1;                                                                      \
+    }                                                                                          \
+    uint32_t ropFIDIV##name(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),         \
+                            uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                 \
+    {                                                                                          \
+        x86seg *target_seg;                                                                    \
+                                                                                               \
+        uop_FP_ENTER(ir);                                                                      \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+        op_pc--;                                                                               \
+        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+        codegen_check_seg_read(block, ir, target_seg);                                         \
+        uop_MEM_LOAD_REG(ir, temp_reg, ireg_seg_base(target_seg), IREG_eaaddr);                \
+        uop_MOV_DOUBLE_INT(ir, IREG_temp0_D, temp_reg);                                        \
+        uop_FDIV(ir, IREG_ST(0), IREG_ST(0), IREG_temp0_D);                                    \
+        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                               \
+                                                                                               \
+        return op_pc + 1;                                                                      \
+    }                                                                                          \
+    uint32_t ropFIDIVR##name(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),        \
+                             uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                \
+    {                                                                                          \
+        x86seg *target_seg;                                                                    \
+                                                                                               \
+        uop_FP_ENTER(ir);                                                                      \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+        op_pc--;                                                                               \
+        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+        codegen_check_seg_read(block, ir, target_seg);                                         \
+        uop_MEM_LOAD_REG(ir, temp_reg, ireg_seg_base(target_seg), IREG_eaaddr);                \
+        uop_MOV_DOUBLE_INT(ir, IREG_temp0_D, temp_reg);                                        \
+        uop_FDIV(ir, IREG_ST(0), IREG_temp0_D, IREG_ST(0));                                    \
+        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                               \
+                                                                                               \
+        return op_pc + 1;                                                                      \
+    }                                                                                          \
+    uint32_t ropFIMUL##name(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),         \
+                            uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                 \
+    {                                                                                          \
+        x86seg *target_seg;                                                                    \
+                                                                                               \
+        uop_FP_ENTER(ir);                                                                      \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+        op_pc--;                                                                               \
+        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+        codegen_check_seg_read(block, ir, target_seg);                                         \
+        uop_MEM_LOAD_REG(ir, temp_reg, ireg_seg_base(target_seg), IREG_eaaddr);                \
+        uop_MOV_DOUBLE_INT(ir, IREG_temp0_D, temp_reg);                                        \
+        uop_FMUL(ir, IREG_ST(0), IREG_ST(0), IREG_temp0_D);                                    \
+        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                               \
+                                                                                               \
+        return op_pc + 1;                                                                      \
+    }                                                                                          \
+    uint32_t ropFISUB##name(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),         \
+                            uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                 \
+    {                                                                                          \
+        x86seg *target_seg;                                                                    \
+                                                                                               \
+        uop_FP_ENTER(ir);                                                                      \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+        op_pc--;                                                                               \
+        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+        codegen_check_seg_read(block, ir, target_seg);                                         \
+        uop_MEM_LOAD_REG(ir, temp_reg, ireg_seg_base(target_seg), IREG_eaaddr);                \
+        uop_MOV_DOUBLE_INT(ir, IREG_temp0_D, temp_reg);                                        \
+        uop_FSUB(ir, IREG_ST(0), IREG_ST(0), IREG_temp0_D);                                    \
+        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                               \
+                                                                                               \
+        return op_pc + 1;                                                                      \
+    }                                                                                          \
+    uint32_t ropFISUBR##name(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),        \
+                             uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                \
+    {                                                                                          \
+        x86seg *target_seg;                                                                    \
+                                                                                               \
+        uop_FP_ENTER(ir);                                                                      \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+        op_pc--;                                                                               \
+        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+        codegen_check_seg_read(block, ir, target_seg);                                         \
+        uop_MEM_LOAD_REG(ir, temp_reg, ireg_seg_base(target_seg), IREG_eaaddr);                \
+        uop_MOV_DOUBLE_INT(ir, IREG_temp0_D, temp_reg);                                        \
+        uop_FSUB(ir, IREG_ST(0), IREG_temp0_D, IREG_ST(0));                                    \
+        uop_MOV_IMM(ir, IREG_tag(0), TAG_VALID);                                               \
+                                                                                               \
+        return op_pc + 1;                                                                      \
     }
 
+// clang-format off
 ropFI_arith_mem(l, IREG_temp0)
 ropFI_arith_mem(w, IREG_temp0_W)
+// clang-format on
 
 uint32_t
-ropFABS(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropFABS(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_FP_ENTER(ir);
     uop_FABS(ir, IREG_ST(0), IREG_ST(0));
@@ -578,7 +597,7 @@ ropFABS(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint3
 }
 
 uint32_t
-ropFCHS(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropFCHS(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_FP_ENTER(ir);
     uop_FCHS(ir, IREG_ST(0), IREG_ST(0));
@@ -587,7 +606,7 @@ ropFCHS(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint3
     return op_pc;
 }
 uint32_t
-ropFSQRT(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropFSQRT(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_FP_ENTER(ir);
     uop_FSQRT(ir, IREG_ST(0), IREG_ST(0));
@@ -596,11 +615,11 @@ ropFSQRT(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint
     return op_pc;
 }
 uint32_t
-ropFTST(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropFTST(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_FP_ENTER(ir);
     uop_FTST(ir, IREG_temp0_W, IREG_ST(0));
-    uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(C0 | C2 | C3));
+    uop_AND_IMM(ir, IREG_NPXS, IREG_NPXS, ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3));
     uop_OR(ir, IREG_NPXS, IREG_NPXS, IREG_temp0_W);
 
     return op_pc;
diff --git a/src/codegen_new/codegen_ops_fpu_constant.c b/src/codegen_new/codegen_ops_fpu_constant.c
index 862845868..6ec2f6888 100644
--- a/src/codegen_new/codegen_ops_fpu_constant.c
+++ b/src/codegen_new/codegen_ops_fpu_constant.c
@@ -9,6 +9,7 @@
 #include "x86seg_common.h"
 #include "x86seg.h"
 #include "386_common.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include "codegen.h"
 #include "codegen_accumulate.h"
@@ -18,7 +19,7 @@
 #include "codegen_ops_helpers.h"
 
 uint32_t
-ropFLD1(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropFLD1(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_FP_ENTER(ir);
     uop_MOV_IMM(ir, IREG_temp0, 1);
@@ -29,7 +30,7 @@ ropFLD1(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetc
     return op_pc;
 }
 uint32_t
-ropFLDZ(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropFLDZ(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_FP_ENTER(ir);
     uop_MOV_IMM(ir, IREG_temp0, 0);
diff --git a/src/codegen_new/codegen_ops_fpu_loadstore.c b/src/codegen_new/codegen_ops_fpu_loadstore.c
index 7635063e8..12babaf49 100644
--- a/src/codegen_new/codegen_ops_fpu_loadstore.c
+++ b/src/codegen_new/codegen_ops_fpu_loadstore.c
@@ -9,6 +9,7 @@
 #include "x86seg_common.h"
 #include "x86seg.h"
 #include "386_common.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include "codegen.h"
 #include "codegen_accumulate.h"
diff --git a/src/codegen_new/codegen_ops_fpu_misc.c b/src/codegen_new/codegen_ops_fpu_misc.c
index 7865e0573..938204a70 100644
--- a/src/codegen_new/codegen_ops_fpu_misc.c
+++ b/src/codegen_new/codegen_ops_fpu_misc.c
@@ -9,6 +9,7 @@
 #include "x86seg_common.h"
 #include "x86seg.h"
 #include "386_common.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include "codegen.h"
 #include "codegen_accumulate.h"
@@ -97,7 +98,7 @@ ropFSTSW(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fet
     return op_pc + 1;
 }
 uint32_t
-ropFSTSW_AX(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropFSTSW_AX(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_FP_ENTER(ir);
     uop_MOV(ir, IREG_AX, IREG_NPXS);
diff --git a/src/codegen_new/codegen_ops_helpers.c b/src/codegen_new/codegen_ops_helpers.c
index f2a4ce41a..037d91469 100644
--- a/src/codegen_new/codegen_ops_helpers.c
+++ b/src/codegen_new/codegen_ops_helpers.c
@@ -18,8 +18,8 @@ void
 LOAD_IMMEDIATE_FROM_RAM_16_unaligned(UNUSED(codeblock_t *block), ir_data_t *ir, int dest_reg, uint32_t addr)
 {
     /*Word access that crosses two pages. Perform reads from both pages, shift and combine*/
-    uop_MOVZX_REG_PTR_8(ir, IREG_temp3_W, get_ram_ptr(addr));
-    uop_MOVZX_REG_PTR_8(ir, dest_reg, get_ram_ptr(addr + 1));
+    uop_MOVZX_REG_PTR_8(ir, IREG_temp3_W, get_ram_ptr(addr + 1));
+    uop_MOVZX_REG_PTR_8(ir, dest_reg, get_ram_ptr(addr));
     uop_SHL_IMM(ir, IREG_temp3_W, IREG_temp3_W, 8);
     uop_OR(ir, dest_reg, dest_reg, IREG_temp3_W);
 }
diff --git a/src/codegen_new/codegen_ops_helpers.h b/src/codegen_new/codegen_ops_helpers.h
index 5a8f1e1c7..92b721099 100644
--- a/src/codegen_new/codegen_ops_helpers.h
+++ b/src/codegen_new/codegen_ops_helpers.h
@@ -71,7 +71,7 @@ fpu_PUSH(codeblock_t *block, ir_data_t *ir)
 }
 
 static inline void
-CHECK_SEG_LIMITS(codeblock_t *block, ir_data_t *ir, x86seg *seg, int addr_reg, int end_offset)
+CHECK_SEG_LIMITS(UNUSED(codeblock_t *block), ir_data_t *ir, x86seg *seg, int addr_reg, int end_offset)
 {
     if ((seg == &cpu_state.seg_ds && codegen_flat_ds && !(cpu_cur_status & CPU_STATUS_NOTFLATDS)) || (seg == &cpu_state.seg_ss && codegen_flat_ss && !(cpu_cur_status & CPU_STATUS_NOTFLATSS)))
         return;
@@ -85,7 +85,7 @@ CHECK_SEG_LIMITS(codeblock_t *block, ir_data_t *ir, x86seg *seg, int addr_reg, i
 }
 
 static inline void
-LOAD_IMMEDIATE_FROM_RAM_8(codeblock_t *block, ir_data_t *ir, int dest_reg, uint32_t addr)
+LOAD_IMMEDIATE_FROM_RAM_8(UNUSED(codeblock_t *block), ir_data_t *ir, int dest_reg, uint32_t addr)
 {
     uop_MOVZX_REG_PTR_8(ir, dest_reg, get_ram_ptr(addr));
 }
diff --git a/src/codegen_new/codegen_ops_jump.c b/src/codegen_new/codegen_ops_jump.c
index fb2f1e5ba..430b16b2b 100644
--- a/src/codegen_new/codegen_ops_jump.c
+++ b/src/codegen_new/codegen_ops_jump.c
@@ -15,7 +15,7 @@
 #include "codegen_ops_mov.h"
 
 uint32_t
-ropJMP_r8(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
+ropJMP_r8(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), uint32_t op_32, uint32_t op_pc)
 {
     uint32_t offset    = (int32_t) (int8_t) fastreadb(cs + op_pc);
     uint32_t dest_addr = op_pc + 1 + offset;
@@ -29,7 +29,7 @@ ropJMP_r8(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fe
     return dest_addr;
 }
 uint32_t
-ropJMP_r16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropJMP_r16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint32_t offset    = (int32_t) (int16_t) fastreadw(cs + op_pc);
     uint32_t dest_addr = op_pc + 2 + offset;
@@ -42,7 +42,7 @@ ropJMP_r16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t f
     return dest_addr;
 }
 uint32_t
-ropJMP_r32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropJMP_r32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint32_t offset    = fastreadl(cs + op_pc);
     uint32_t dest_addr = op_pc + 4 + offset;
@@ -54,7 +54,7 @@ ropJMP_r32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t f
 }
 
 uint32_t
-ropJMP_far_16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropJMP_far_16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint16_t new_pc = fastreadw(cs + op_pc);
     uint16_t new_cs = fastreadw(cs + op_pc + 2);
@@ -69,7 +69,7 @@ ropJMP_far_16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_
     return -1;
 }
 uint32_t
-ropJMP_far_32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropJMP_far_32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint32_t new_pc = fastreadl(cs + op_pc);
     uint16_t new_cs = fastreadw(cs + op_pc + 4);
@@ -85,7 +85,7 @@ ropJMP_far_32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_
 }
 
 uint32_t
-ropCALL_r16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropCALL_r16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint32_t offset    = (int32_t) (int16_t) fastreadw(cs + op_pc);
     uint16_t ret_addr  = op_pc + 2;
@@ -104,7 +104,7 @@ ropCALL_r16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t
     return -1;
 }
 uint32_t
-ropCALL_r32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropCALL_r32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint32_t offset    = fastreadl(cs + op_pc);
     uint32_t ret_addr  = op_pc + 4;
@@ -122,7 +122,7 @@ ropCALL_r32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t
 }
 
 uint32_t
-ropRET_16(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), UNUSED(uint32_t op_pc))
+ropRET_16(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), UNUSED(uint32_t op_pc))
 {
     uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
 
@@ -138,7 +138,7 @@ ropRET_16(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uin
     return -1;
 }
 uint32_t
-ropRET_32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), UNUSED(uint32_t op_pc))
+ropRET_32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), UNUSED(uint32_t op_pc))
 {
     uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
 
@@ -154,7 +154,7 @@ ropRET_32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uin
 }
 
 uint32_t
-ropRET_imm_16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropRET_imm_16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint16_t offset = fastreadw(cs + op_pc);
 
@@ -173,7 +173,7 @@ ropRET_imm_16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_
     return -1;
 }
 uint32_t
-ropRET_imm_32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropRET_imm_32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint16_t offset = fastreadw(cs + op_pc);
 
@@ -192,7 +192,7 @@ ropRET_imm_32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_
 }
 
 uint32_t
-ropRETF_16(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), UNUSED(uint32_t op_pc))
+ropRETF_16(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), UNUSED(uint32_t op_pc))
 {
     if ((msw & 1) && !(cpu_state.eflags & VM_FLAG))
         return 0;
@@ -215,7 +215,7 @@ ropRETF_16(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), ui
     return -1;
 }
 uint32_t
-ropRETF_32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), UNUSED(uint32_t op_pc))
+ropRETF_32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), UNUSED(uint32_t op_pc))
 {
     if ((msw & 1) && !(cpu_state.eflags & VM_FLAG))
         return 0;
@@ -239,7 +239,7 @@ ropRETF_32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), ui
 }
 
 uint32_t
-ropRETF_imm_16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropRETF_imm_16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint16_t offset;
 
@@ -266,7 +266,7 @@ ropRETF_imm_16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32
     return -1;
 }
 uint32_t
-ropRETF_imm_32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropRETF_imm_32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint16_t offset;
 
diff --git a/src/codegen_new/codegen_ops_logic.c b/src/codegen_new/codegen_ops_logic.c
index 684052fea..f289f1cba 100644
--- a/src/codegen_new/codegen_ops_logic.c
+++ b/src/codegen_new/codegen_ops_logic.c
@@ -16,7 +16,7 @@
 #include "codegen_ops_logic.h"
 
 uint32_t
-ropAND_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropAND_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint8_t imm_data = fastreadb(cs + op_pc);
 
@@ -29,7 +29,7 @@ ropAND_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_
     return op_pc + 1;
 }
 uint32_t
-ropAND_AX_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropAND_AX_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint16_t imm_data = fastreadw(cs + op_pc);
 
@@ -226,7 +226,7 @@ ropAND_l_rmw(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t
 }
 
 uint32_t
-ropOR_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropOR_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint8_t imm_data = fastreadb(cs + op_pc);
 
@@ -239,7 +239,7 @@ ropOR_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t
     return op_pc + 1;
 }
 uint32_t
-ropOR_AX_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropOR_AX_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint16_t imm_data = fastreadw(cs + op_pc);
 
@@ -437,7 +437,7 @@ ropOR_l_rmw(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t
 }
 
 uint32_t
-ropTEST_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropTEST_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint8_t imm_data = fastreadb(cs + op_pc);
 
@@ -449,7 +449,7 @@ ropTEST_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32
     return op_pc + 1;
 }
 uint32_t
-ropTEST_AX_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropTEST_AX_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint16_t imm_data = fastreadw(cs + op_pc);
 
@@ -557,7 +557,7 @@ ropTEST_l_rm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t
 }
 
 uint32_t
-ropXOR_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropXOR_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint8_t imm_data = fastreadb(cs + op_pc);
 
@@ -570,7 +570,7 @@ ropXOR_AL_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_
     return op_pc + 1;
 }
 uint32_t
-ropXOR_AX_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropXOR_AX_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint16_t imm_data = fastreadw(cs + op_pc);
 
diff --git a/src/codegen_new/codegen_ops_misc.c b/src/codegen_new/codegen_ops_misc.c
index 545634672..33e01d951 100644
--- a/src/codegen_new/codegen_ops_misc.c
+++ b/src/codegen_new/codegen_ops_misc.c
@@ -485,108 +485,112 @@ ropFF_32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fet
 }
 
 uint32_t
-ropNOP(UNUSED(codeblock_t *block), UNUSED(ir_data_t *ir), UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropNOP(UNUSED(codeblock_t *block), UNUSED(ir_data_t *ir), UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     return op_pc;
 }
 
 uint32_t
-ropCBW(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropCBW(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_MOVSX(ir, IREG_AX, IREG_AL);
 
     return op_pc;
 }
 uint32_t
-ropCDQ(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropCDQ(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_SAR_IMM(ir, IREG_EDX, IREG_EAX, 31);
 
     return op_pc;
 }
 uint32_t
-ropCWD(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropCWD(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_SAR_IMM(ir, IREG_DX, IREG_AX, 15);
 
     return op_pc;
 }
 uint32_t
-ropCWDE(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropCWDE(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_MOVSX(ir, IREG_EAX, IREG_AX);
 
     return op_pc;
 }
 
-#define ropLxS(name, seg)                                                                                                         \
-    uint32_t rop##name##_16(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc) \
-    {                                                                                                                             \
-        x86seg *target_seg = NULL;                                                                                                \
-        int     dest_reg   = (fetchdat >> 3) & 7;                                                                                 \
-                                                                                                                                  \
-        if ((fetchdat & 0xc0) == 0xc0)                                                                                            \
-            return 0;                                                                                                             \
-                                                                                                                                  \
-        codegen_mark_code_present(block, cs + op_pc, 1);                                                                          \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                             \
-        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                                    \
-        codegen_check_seg_read(block, ir, target_seg);                                                                            \
-        uop_MEM_LOAD_REG(ir, IREG_temp0_W, ireg_seg_base(target_seg), IREG_eaaddr);                                               \
-        uop_MEM_LOAD_REG_OFFSET(ir, IREG_temp1_W, ireg_seg_base(target_seg), IREG_eaaddr, 2);                                     \
-        uop_LOAD_SEG(ir, seg, IREG_temp1_W);                                                                                      \
-        uop_MOV(ir, IREG_16(dest_reg), IREG_temp0_W);                                                                             \
-                                                                                                                                  \
-        if (seg == &cpu_state.seg_ss)                                                                                             \
-            CPU_BLOCK_END();                                                                                                      \
-                                                                                                                                  \
-        return op_pc + 1;                                                                                                         \
-    }                                                                                                                             \
-    uint32_t rop##name##_32(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc) \
-    {                                                                                                                             \
-        x86seg *target_seg = NULL;                                                                                                \
-        int     dest_reg   = (fetchdat >> 3) & 7;                                                                                 \
-                                                                                                                                  \
-        if ((fetchdat & 0xc0) == 0xc0)                                                                                            \
-            return 0;                                                                                                             \
-                                                                                                                                  \
-        codegen_mark_code_present(block, cs + op_pc, 1);                                                                          \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                             \
-        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                                    \
-        codegen_check_seg_read(block, ir, target_seg);                                                                            \
-        uop_MEM_LOAD_REG(ir, IREG_temp0, ireg_seg_base(target_seg), IREG_eaaddr);                                                 \
-        uop_MEM_LOAD_REG_OFFSET(ir, IREG_temp1_W, ireg_seg_base(target_seg), IREG_eaaddr, 4);                                     \
-        uop_LOAD_SEG(ir, seg, IREG_temp1_W);                                                                                      \
-        uop_MOV(ir, IREG_32(dest_reg), IREG_temp0);                                                                               \
-                                                                                                                                  \
-        if (seg == &cpu_state.seg_ss)                                                                                             \
-            CPU_BLOCK_END();                                                                                                      \
-                                                                                                                                  \
-        return op_pc + 1;                                                                                                         \
+#define ropLxS(name, seg)                                                                      \
+    uint32_t rop##name##_16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),         \
+                            uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                 \
+    {                                                                                          \
+        x86seg *target_seg = NULL;                                                             \
+        int     dest_reg   = (fetchdat >> 3) & 7;                                              \
+                                                                                               \
+        if ((fetchdat & 0xc0) == 0xc0)                                                         \
+            return 0;                                                                          \
+                                                                                               \
+        codegen_mark_code_present(block, cs + op_pc, 1);                                       \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+        codegen_check_seg_read(block, ir, target_seg);                                         \
+        uop_MEM_LOAD_REG(ir, IREG_temp0_W, ireg_seg_base(target_seg), (op_32 & 0x200) ? IREG_eaaddr : IREG_eaa16); \
+        uop_MEM_LOAD_REG_OFFSET(ir, IREG_temp1_W, ireg_seg_base(target_seg), (op_32 & 0x200) ? IREG_eaaddr : IREG_eaa16, 2); \
+        uop_LOAD_SEG(ir, seg, IREG_temp1_W);                                                   \
+        uop_MOV(ir, IREG_16(dest_reg), IREG_temp0_W);                                          \
+                                                                                               \
+        if (seg == &cpu_state.seg_ss)                                                          \
+            CPU_BLOCK_END();                                                                   \
+                                                                                               \
+        return op_pc + 1;                                                                      \
+    }                                                                                          \
+    uint32_t rop##name##_32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),         \
+                            uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                 \
+    {                                                                                          \
+        x86seg *target_seg = NULL;                                                             \
+        int     dest_reg   = (fetchdat >> 3) & 7;                                              \
+                                                                                               \
+        if ((fetchdat & 0xc0) == 0xc0)                                                         \
+            return 0;                                                                          \
+                                                                                               \
+        codegen_mark_code_present(block, cs + op_pc, 1);                                       \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+        target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+        codegen_check_seg_read(block, ir, target_seg);                                         \
+        uop_MEM_LOAD_REG(ir, IREG_temp0, ireg_seg_base(target_seg), (op_32 & 0x200) ? IREG_eaaddr : IREG_eaa16);              \
+        uop_MEM_LOAD_REG_OFFSET(ir, IREG_temp1_W, ireg_seg_base(target_seg), (op_32 & 0x200) ? IREG_eaaddr : IREG_eaa16, 4);  \
+        uop_LOAD_SEG(ir, seg, IREG_temp1_W);                                                   \
+        uop_MOV(ir, IREG_32(dest_reg), IREG_temp0);                                            \
+                                                                                               \
+        if (seg == &cpu_state.seg_ss)                                                          \
+            CPU_BLOCK_END();                                                                   \
+                                                                                               \
+        return op_pc + 1;                                                                      \
     }
 
+// clang-format off
 ropLxS(LDS, &cpu_state.seg_ds)
 ropLxS(LES, &cpu_state.seg_es)
 ropLxS(LFS, &cpu_state.seg_fs)
 ropLxS(LGS, &cpu_state.seg_gs)
 ropLxS(LSS, &cpu_state.seg_ss)
+// clang-format on
 
 uint32_t
-ropCLC(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropCLC(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_CALL_FUNC(ir, flags_rebuild);
     uop_AND_IMM(ir, IREG_flags, IREG_flags, ~C_FLAG);
     return op_pc;
 }
 uint32_t
-ropCMC(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropCMC(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_CALL_FUNC(ir, flags_rebuild);
     uop_XOR_IMM(ir, IREG_flags, IREG_flags, C_FLAG);
     return op_pc;
 }
 uint32_t
-ropSTC(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropSTC(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_CALL_FUNC(ir, flags_rebuild);
     uop_OR_IMM(ir, IREG_flags, IREG_flags, C_FLAG);
@@ -594,20 +598,20 @@ ropSTC(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32
 }
 
 uint32_t
-ropCLD(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropCLD(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_AND_IMM(ir, IREG_flags, IREG_flags, ~D_FLAG);
     return op_pc;
 }
 uint32_t
-ropSTD(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropSTD(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_OR_IMM(ir, IREG_flags, IREG_flags, D_FLAG);
     return op_pc;
 }
 
 uint32_t
-ropCLI(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropCLI(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     if (!IOPLp && (cr4 & (CR4_VME | CR4_PVI)))
         return 0;
@@ -616,7 +620,7 @@ ropCLI(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32
     return op_pc;
 }
 uint32_t
-ropSTI(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropSTI(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     if (!IOPLp && (cr4 & (CR4_VME | CR4_PVI)))
         return 0;
diff --git a/src/codegen_new/codegen_ops_mmx_arith.c b/src/codegen_new/codegen_ops_mmx_arith.c
index e99b4c56d..f01d64273 100644
--- a/src/codegen_new/codegen_ops_mmx_arith.c
+++ b/src/codegen_new/codegen_ops_mmx_arith.c
@@ -2,6 +2,7 @@
 #include <86box/86box.h>
 #include "cpu.h"
 #include <86box/mem.h>
+#include <86box/plat_unused.h>
 
 #include "x86.h"
 #include "x86_flags.h"
@@ -15,27 +16,28 @@
 #include "codegen_ops_mmx_arith.h"
 #include "codegen_ops_helpers.h"
 
-#define ropParith(func)                                                                                                      \
-    uint32_t rop##func(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc) \
-    {                                                                                                                        \
-        int dest_reg = (fetchdat >> 3) & 7;                                                                                  \
-                                                                                                                             \
-        uop_MMX_ENTER(ir);                                                                                                   \
-        codegen_mark_code_present(block, cs + op_pc, 1);                                                                     \
-        if ((fetchdat & 0xc0) == 0xc0) {                                                                                     \
-            int src_reg = fetchdat & 7;                                                                                      \
-            uop_##func(ir, IREG_MM(dest_reg), IREG_MM(dest_reg), IREG_MM(src_reg));                                          \
-        } else {                                                                                                             \
-            x86seg *target_seg;                                                                                              \
-                                                                                                                             \
-            uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                    \
-            target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                           \
-            codegen_check_seg_read(block, ir, target_seg);                                                                   \
-            uop_MEM_LOAD_REG(ir, IREG_temp0_Q, ireg_seg_base(target_seg), IREG_eaaddr);                                      \
-            uop_##func(ir, IREG_MM(dest_reg), IREG_MM(dest_reg), IREG_temp0_Q);                                              \
-        }                                                                                                                    \
-                                                                                                                             \
-        return op_pc + 1;                                                                                                    \
+#define ropParith(func)                                                                            \
+    uint32_t rop##func(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),                  \
+                       uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                          \
+    {                                                                                              \
+        int dest_reg = (fetchdat >> 3) & 7;                                                        \
+                                                                                                   \
+        uop_MMX_ENTER(ir);                                                                         \
+        codegen_mark_code_present(block, cs + op_pc, 1);                                           \
+        if ((fetchdat & 0xc0) == 0xc0) {                                                           \
+            int src_reg = fetchdat & 7;                                                            \
+            uop_##func(ir, IREG_MM(dest_reg), IREG_MM(dest_reg), IREG_MM(src_reg));                \
+        } else {                                                                                   \
+            x86seg *target_seg;                                                                    \
+                                                                                                   \
+            uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+            target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+            codegen_check_seg_read(block, ir, target_seg);                                         \
+            uop_MEM_LOAD_REG(ir, IREG_temp0_Q, ireg_seg_base(target_seg), IREG_eaaddr);            \
+            uop_##func(ir, IREG_MM(dest_reg), IREG_MM(dest_reg), IREG_temp0_Q);                    \
+        }                                                                                          \
+                                                                                                   \
+        return op_pc + 1;                                                                          \
     }
 
 // clang-format off
@@ -58,4 +60,4 @@ ropParith(PSUBUSW)
 ropParith(PMADDWD)
 ropParith(PMULHW)
 ropParith(PMULLW)
-    // clang-format on
+// clang-format on
diff --git a/src/codegen_new/codegen_ops_mmx_cmp.c b/src/codegen_new/codegen_ops_mmx_cmp.c
index 6f38cba67..cf0cededb 100644
--- a/src/codegen_new/codegen_ops_mmx_cmp.c
+++ b/src/codegen_new/codegen_ops_mmx_cmp.c
@@ -2,6 +2,7 @@
 #include <86box/86box.h>
 #include "cpu.h"
 #include <86box/mem.h>
+#include <86box/plat_unused.h>
 
 #include "x86.h"
 #include "x86_flags.h"
@@ -15,27 +16,28 @@
 #include "codegen_ops_mmx_cmp.h"
 #include "codegen_ops_helpers.h"
 
-#define ropPcmp(func)                                                                                                        \
-    uint32_t rop##func(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc) \
-    {                                                                                                                        \
-        int dest_reg = (fetchdat >> 3) & 7;                                                                                  \
-                                                                                                                             \
-        uop_MMX_ENTER(ir);                                                                                                   \
-        codegen_mark_code_present(block, cs + op_pc, 1);                                                                     \
-        if ((fetchdat & 0xc0) == 0xc0) {                                                                                     \
-            int src_reg = fetchdat & 7;                                                                                      \
-            uop_##func(ir, IREG_MM(dest_reg), IREG_MM(dest_reg), IREG_MM(src_reg));                                          \
-        } else {                                                                                                             \
-            x86seg *target_seg;                                                                                              \
-                                                                                                                             \
-            uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                    \
-            target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                           \
-            codegen_check_seg_read(block, ir, target_seg);                                                                   \
-            uop_MEM_LOAD_REG(ir, IREG_temp0_Q, ireg_seg_base(target_seg), IREG_eaaddr);                                      \
-            uop_##func(ir, IREG_MM(dest_reg), IREG_MM(dest_reg), IREG_temp0_Q);                                              \
-        }                                                                                                                    \
-                                                                                                                             \
-        return op_pc + 1;                                                                                                    \
+#define ropPcmp(func)                                                                              \
+    uint32_t rop##func(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),                  \
+                       uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                          \
+    {                                                                                              \
+        int dest_reg = (fetchdat >> 3) & 7;                                                        \
+                                                                                                   \
+        uop_MMX_ENTER(ir);                                                                         \
+        codegen_mark_code_present(block, cs + op_pc, 1);                                           \
+        if ((fetchdat & 0xc0) == 0xc0) {                                                           \
+            int src_reg = fetchdat & 7;                                                            \
+            uop_##func(ir, IREG_MM(dest_reg), IREG_MM(dest_reg), IREG_MM(src_reg));                \
+        } else {                                                                                   \
+            x86seg *target_seg;                                                                    \
+                                                                                                   \
+            uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+            target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+            codegen_check_seg_read(block, ir, target_seg);                                         \
+            uop_MEM_LOAD_REG(ir, IREG_temp0_Q, ireg_seg_base(target_seg), IREG_eaaddr);            \
+            uop_##func(ir, IREG_MM(dest_reg), IREG_MM(dest_reg), IREG_temp0_Q);                    \
+        }                                                                                          \
+                                                                                                   \
+        return op_pc + 1;                                                                          \
     }
 
 // clang-format off
@@ -45,4 +47,4 @@ ropPcmp(PCMPEQD)
 ropPcmp(PCMPGTB)
 ropPcmp(PCMPGTW)
 ropPcmp(PCMPGTD)
-    // clang-format on
+// clang-format on
diff --git a/src/codegen_new/codegen_ops_mmx_pack.c b/src/codegen_new/codegen_ops_mmx_pack.c
index d25edd52e..c62aa10d0 100644
--- a/src/codegen_new/codegen_ops_mmx_pack.c
+++ b/src/codegen_new/codegen_ops_mmx_pack.c
@@ -2,6 +2,7 @@
 #include <86box/86box.h>
 #include "cpu.h"
 #include <86box/mem.h>
+#include <86box/plat_unused.h>
 
 #include "x86.h"
 #include "x86_flags.h"
@@ -15,27 +16,28 @@
 #include "codegen_ops_mmx_pack.h"
 #include "codegen_ops_helpers.h"
 
-#define ropPpack(func)                                                                                                       \
-    uint32_t rop##func(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc) \
-    {                                                                                                                        \
-        int dest_reg = (fetchdat >> 3) & 7;                                                                                  \
-                                                                                                                             \
-        uop_MMX_ENTER(ir);                                                                                                   \
-        codegen_mark_code_present(block, cs + op_pc, 1);                                                                     \
-        if ((fetchdat & 0xc0) == 0xc0) {                                                                                     \
-            int src_reg = fetchdat & 7;                                                                                      \
-            uop_##func(ir, IREG_MM(dest_reg), IREG_MM(dest_reg), IREG_MM(src_reg));                                          \
-        } else {                                                                                                             \
-            x86seg *target_seg;                                                                                              \
-                                                                                                                             \
-            uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                    \
-            target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);                           \
-            codegen_check_seg_read(block, ir, target_seg);                                                                   \
-            uop_MEM_LOAD_REG(ir, IREG_temp0_Q, ireg_seg_base(target_seg), IREG_eaaddr);                                      \
-            uop_##func(ir, IREG_MM(dest_reg), IREG_MM(dest_reg), IREG_temp0_Q);                                              \
-        }                                                                                                                    \
-                                                                                                                             \
-        return op_pc + 1;                                                                                                    \
+#define ropPpack(func)                                                                             \
+    uint32_t rop##func(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode),                  \
+                       uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)                          \
+    {                                                                                              \
+        int dest_reg = (fetchdat >> 3) & 7;                                                        \
+                                                                                                   \
+        uop_MMX_ENTER(ir);                                                                         \
+        codegen_mark_code_present(block, cs + op_pc, 1);                                           \
+        if ((fetchdat & 0xc0) == 0xc0) {                                                           \
+            int src_reg = fetchdat & 7;                                                            \
+            uop_##func(ir, IREG_MM(dest_reg), IREG_MM(dest_reg), IREG_MM(src_reg));                \
+        } else {                                                                                   \
+            x86seg *target_seg;                                                                    \
+                                                                                                   \
+            uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                          \
+            target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0); \
+            codegen_check_seg_read(block, ir, target_seg);                                         \
+            uop_MEM_LOAD_REG(ir, IREG_temp0_Q, ireg_seg_base(target_seg), IREG_eaaddr);            \
+            uop_##func(ir, IREG_MM(dest_reg), IREG_MM(dest_reg), IREG_temp0_Q);                    \
+        }                                                                                          \
+                                                                                                   \
+        return op_pc + 1;                                                                          \
     }
 
 // clang-format off
@@ -48,4 +50,4 @@ ropPpack(PUNPCKLDQ)
 ropPpack(PUNPCKHBW)
 ropPpack(PUNPCKHWD)
 ropPpack(PUNPCKHDQ)
-    // clang-format on
+// clang-format on
diff --git a/src/codegen_new/codegen_ops_mov.c b/src/codegen_new/codegen_ops_mov.c
index eae7045a8..f79a959a7 100644
--- a/src/codegen_new/codegen_ops_mov.c
+++ b/src/codegen_new/codegen_ops_mov.c
@@ -15,7 +15,7 @@
 #include "codegen_ops_mov.h"
 
 uint32_t
-ropMOV_rb_imm(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropMOV_rb_imm(codeblock_t *block, ir_data_t *ir, uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint8_t imm = fastreadb(cs + op_pc);
 
@@ -25,7 +25,7 @@ ropMOV_rb_imm(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchd
     return op_pc + 1;
 }
 uint32_t
-ropMOV_rw_imm(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropMOV_rw_imm(codeblock_t *block, ir_data_t *ir, uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint16_t imm = fastreadw(cs + op_pc);
 
@@ -172,7 +172,7 @@ ropMOV_r_l(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t f
 }
 
 uint32_t
-ropMOV_AL_abs(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
+ropMOV_AL_abs(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), uint32_t op_32, uint32_t op_pc)
 {
     uint32_t addr;
 
@@ -189,7 +189,7 @@ ropMOV_AL_abs(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_
     return op_pc + ((op_32 & 0x200) ? 4 : 2);
 }
 uint32_t
-ropMOV_AX_abs(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
+ropMOV_AX_abs(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), uint32_t op_32, uint32_t op_pc)
 {
     uint32_t addr;
 
@@ -206,7 +206,7 @@ ropMOV_AX_abs(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_
     return op_pc + ((op_32 & 0x200) ? 4 : 2);
 }
 uint32_t
-ropMOV_EAX_abs(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
+ropMOV_EAX_abs(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), uint32_t op_32, uint32_t op_pc)
 {
     uint32_t addr = 0;
 
@@ -233,7 +233,7 @@ ropMOV_EAX_abs(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32
 }
 
 uint32_t
-ropMOV_abs_AL(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
+ropMOV_abs_AL(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), uint32_t op_32, uint32_t op_pc)
 {
     uint32_t addr;
 
@@ -250,7 +250,7 @@ ropMOV_abs_AL(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_
     return op_pc + ((op_32 & 0x200) ? 4 : 2);
 }
 uint32_t
-ropMOV_abs_AX(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
+ropMOV_abs_AX(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), uint32_t op_32, uint32_t op_pc)
 {
     uint32_t addr;
 
@@ -267,7 +267,7 @@ ropMOV_abs_AX(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_
     return op_pc + ((op_32 & 0x200) ? 4 : 2);
 }
 uint32_t
-ropMOV_abs_EAX(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
+ropMOV_abs_EAX(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), uint32_t op_32, uint32_t op_pc)
 {
     uint32_t addr;
 
@@ -296,7 +296,13 @@ ropMOV_b_imm(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t
 
         imm = fastreadb(cs + op_pc + 1);
         uop_MOV_IMM(ir, IREG_8(dest_reg), imm);
-    } else {
+    }
+/* TODO: Fix the recompilation of that specific case so it no longer breaks NT 3.x NTVDM. */
+#ifndef RECOMPILE_MOVB_IMM_MEM_ALWAYS
+    else if (((fetchdat & 0xfc) == 0x80) && (op_32 & 0x200))
+        return 0;
+#endif
+    else {
         uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
         target_seg = codegen_generate_ea(ir, op_ea_seg, fetchdat, op_ssegs, &op_pc, op_32, 0);
         codegen_check_seg_write(block, ir, target_seg);
@@ -614,7 +620,7 @@ ropMOVZX_32_16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32
 }
 
 uint32_t
-ropXCHG_AX(UNUSED(codeblock_t *block), ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropXCHG_AX(UNUSED(codeblock_t *block), ir_data_t *ir, uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     int reg2 = IREG_16(opcode & 7);
 
@@ -625,7 +631,7 @@ ropXCHG_AX(UNUSED(codeblock_t *block), ir_data_t *ir, uint8_t opcode, uint32_t f
     return op_pc;
 }
 uint32_t
-ropXCHG_EAX(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropXCHG_EAX(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     int reg2 = IREG_32(opcode & 7);
 
@@ -716,7 +722,7 @@ ropXCHG_32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t f
 }
 
 uint32_t
-ropXLAT(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t op_pc)
+ropXLAT(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), uint32_t op_32, uint32_t op_pc)
 {
     uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
 
diff --git a/src/codegen_new/codegen_ops_stack.c b/src/codegen_new/codegen_ops_stack.c
index 92ad9509d..f93289197 100644
--- a/src/codegen_new/codegen_ops_stack.c
+++ b/src/codegen_new/codegen_ops_stack.c
@@ -16,7 +16,7 @@
 #include "codegen_ops_misc.h"
 
 uint32_t
-ropPUSH_r16(UNUSED(codeblock_t *block), ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropPUSH_r16(UNUSED(codeblock_t *block), ir_data_t *ir, uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     int sp_reg;
 
@@ -28,7 +28,7 @@ ropPUSH_r16(UNUSED(codeblock_t *block), ir_data_t *ir, uint8_t opcode, uint32_t
     return op_pc;
 }
 uint32_t
-ropPUSH_r32(UNUSED(codeblock_t *block), ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropPUSH_r32(UNUSED(codeblock_t *block), ir_data_t *ir, uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     int sp_reg;
 
@@ -41,7 +41,7 @@ ropPUSH_r32(UNUSED(codeblock_t *block), ir_data_t *ir, uint8_t opcode, uint32_t
 }
 
 uint32_t
-ropPOP_r16(UNUSED(codeblock_t *block), ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropPOP_r16(UNUSED(codeblock_t *block), ir_data_t *ir, uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
 
@@ -57,7 +57,7 @@ ropPOP_r16(UNUSED(codeblock_t *block), ir_data_t *ir, uint8_t opcode, uint32_t f
     return op_pc;
 }
 uint32_t
-ropPOP_r32(UNUSED(codeblock_t *block), ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropPOP_r32(UNUSED(codeblock_t *block), ir_data_t *ir, uint8_t opcode, UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
 
@@ -74,7 +74,7 @@ ropPOP_r32(UNUSED(codeblock_t *block), ir_data_t *ir, uint8_t opcode, uint32_t f
 }
 
 uint32_t
-ropPUSH_imm_16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropPUSH_imm_16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint16_t imm = fastreadw(cs + op_pc);
     int      sp_reg;
@@ -88,7 +88,7 @@ ropPUSH_imm_16(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32
     return op_pc + 2;
 }
 uint32_t
-ropPUSH_imm_32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropPUSH_imm_32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint32_t imm = fastreadl(cs + op_pc);
     int      sp_reg;
@@ -103,7 +103,7 @@ ropPUSH_imm_32(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32
 }
 
 uint32_t
-ropPUSH_imm_16_8(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropPUSH_imm_16_8(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint16_t imm = (int16_t) (int8_t) fastreadb(cs + op_pc);
     int      sp_reg;
@@ -117,7 +117,7 @@ ropPUSH_imm_16_8(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint
     return op_pc + 1;
 }
 uint32_t
-ropPUSH_imm_32_8(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropPUSH_imm_32_8(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uint32_t imm = (int32_t) (int8_t) fastreadb(cs + op_pc);
     int      sp_reg;
@@ -196,63 +196,68 @@ ropPOP_L(codeblock_t *block, ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fet
     return op_pc + 1;
 }
 
-#define ROP_PUSH_SEG(seg)                                                                                                             \
-    uint32_t ropPUSH_##seg##_16(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc) \
-    {                                                                                                                                 \
-        int sp_reg;                                                                                                                   \
-                                                                                                                                      \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                                 \
-        sp_reg = LOAD_SP_WITH_OFFSET(ir, -2);                                                                                         \
-        uop_MEM_STORE_REG(ir, IREG_SS_base, sp_reg, IREG_##seg##_seg_W);                                                              \
-        SUB_SP(ir, 2);                                                                                                                \
-                                                                                                                                      \
-        return op_pc;                                                                                                                 \
-    }                                                                                                                                 \
-    uint32_t ropPUSH_##seg##_32(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc) \
-    {                                                                                                                                 \
-        int sp_reg;                                                                                                                   \
-                                                                                                                                      \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                                 \
-        sp_reg = LOAD_SP_WITH_OFFSET(ir, -4);                                                                                         \
-        uop_MOVZX(ir, IREG_temp0, IREG_##seg##_seg_W);                                                                                \
-        uop_MEM_STORE_REG(ir, IREG_SS_base, sp_reg, IREG_temp0);                                                                      \
-        SUB_SP(ir, 4);                                                                                                                \
-                                                                                                                                      \
-        return op_pc;                                                                                                                 \
+#define ROP_PUSH_SEG(seg)                                                                          \
+    uint32_t ropPUSH_##seg##_16(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), \
+                                UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc) \
+    {                                                                                              \
+        int sp_reg;                                                                                \
+                                                                                                   \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                              \
+        sp_reg = LOAD_SP_WITH_OFFSET(ir, -2);                                                      \
+        uop_MEM_STORE_REG(ir, IREG_SS_base, sp_reg, IREG_##seg##_seg_W);                           \
+        SUB_SP(ir, 2);                                                                             \
+                                                                                                   \
+        return op_pc;                                                                              \
+    }                                                                                              \
+    uint32_t ropPUSH_##seg##_32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), \
+                                UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc) \
+    {                                                                                              \
+        int sp_reg;                                                                                \
+                                                                                                   \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                              \
+        sp_reg = LOAD_SP_WITH_OFFSET(ir, -4);                                                      \
+        uop_MOVZX(ir, IREG_temp0, IREG_##seg##_seg_W);                                             \
+        uop_MEM_STORE_REG(ir, IREG_SS_base, sp_reg, IREG_temp0);                                   \
+        SUB_SP(ir, 4);                                                                             \
+                                                                                                   \
+        return op_pc;                                                                              \
     }
 
-#define ROP_POP_SEG(seg, rseg)                                                                                                       \
-    uint32_t ropPOP_##seg##_16(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc) \
-    {                                                                                                                                \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                                \
-                                                                                                                                     \
-        if (stack32)                                                                                                                 \
-            uop_MEM_LOAD_REG(ir, IREG_temp0_W, IREG_SS_base, IREG_ESP);                                                              \
-        else {                                                                                                                       \
-            uop_MOVZX(ir, IREG_eaaddr, IREG_SP);                                                                                     \
-            uop_MEM_LOAD_REG(ir, IREG_temp0_W, IREG_SS_base, IREG_eaaddr);                                                           \
-        }                                                                                                                            \
-        uop_LOAD_SEG(ir, &rseg, IREG_temp0_W);                                                                                       \
-        ADD_SP(ir, 2);                                                                                                               \
-                                                                                                                                     \
-        return op_pc;                                                                                                                \
-    }                                                                                                                                \
-    uint32_t ropPOP_##seg##_32(codeblock_t *block, ir_data_t *ir, uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc) \
-    {                                                                                                                                \
-        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                                                                \
-                                                                                                                                     \
-        if (stack32)                                                                                                                 \
-            uop_MEM_LOAD_REG(ir, IREG_temp0_W, IREG_SS_base, IREG_ESP);                                                              \
-        else {                                                                                                                       \
-            uop_MOVZX(ir, IREG_eaaddr, IREG_SP);                                                                                     \
-            uop_MEM_LOAD_REG(ir, IREG_temp0_W, IREG_SS_base, IREG_eaaddr);                                                           \
-        }                                                                                                                            \
-        uop_LOAD_SEG(ir, &rseg, IREG_temp0_W);                                                                                       \
-        ADD_SP(ir, 4);                                                                                                               \
-                                                                                                                                     \
-        return op_pc;                                                                                                                \
+#define ROP_POP_SEG(seg, rseg)                                                                    \
+    uint32_t ropPOP_##seg##_16(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), \
+                               UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc) \
+    {                                                                                             \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                             \
+                                                                                                  \
+        if (stack32)                                                                              \
+            uop_MEM_LOAD_REG(ir, IREG_temp0_W, IREG_SS_base, IREG_ESP);                           \
+        else {                                                                                    \
+            uop_MOVZX(ir, IREG_eaaddr, IREG_SP);                                                  \
+            uop_MEM_LOAD_REG(ir, IREG_temp0_W, IREG_SS_base, IREG_eaaddr);                        \
+        }                                                                                         \
+        uop_LOAD_SEG(ir, &rseg, IREG_temp0_W);                                                    \
+        ADD_SP(ir, 2);                                                                            \
+                                                                                                  \
+        return op_pc;                                                                             \
+    }                                                                                             \
+    uint32_t ropPOP_##seg##_32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), \
+                               UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc) \
+    {                                                                                             \
+        uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);                                             \
+                                                                                                  \
+        if (stack32)                                                                              \
+            uop_MEM_LOAD_REG(ir, IREG_temp0_W, IREG_SS_base, IREG_ESP);                           \
+        else {                                                                                    \
+            uop_MOVZX(ir, IREG_eaaddr, IREG_SP);                                                  \
+            uop_MEM_LOAD_REG(ir, IREG_temp0_W, IREG_SS_base, IREG_eaaddr);                        \
+        }                                                                                         \
+        uop_LOAD_SEG(ir, &rseg, IREG_temp0_W);                                                    \
+        ADD_SP(ir, 4);                                                                            \
+                                                                                                  \
+        return op_pc;                                                                             \
     }
 
+// clang-format off
 ROP_PUSH_SEG(CS)
 ROP_PUSH_SEG(DS)
 ROP_PUSH_SEG(ES)
@@ -263,9 +268,10 @@ ROP_POP_SEG(DS, cpu_state.seg_ds)
 ROP_POP_SEG(ES, cpu_state.seg_es)
 ROP_POP_SEG(FS, cpu_state.seg_fs)
 ROP_POP_SEG(GS, cpu_state.seg_gs)
+// clang-format on
 
 uint32_t
-ropLEAVE_16(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropLEAVE_16(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
 
@@ -281,7 +287,7 @@ ropLEAVE_16(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), u
     return op_pc;
 }
 uint32_t
-ropLEAVE_32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropLEAVE_32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
 
@@ -298,7 +304,7 @@ ropLEAVE_32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), u
 }
 
 uint32_t
-ropPUSHA_16(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropPUSHA_16(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     int sp_reg;
 
@@ -317,7 +323,7 @@ ropPUSHA_16(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), u
     return op_pc;
 }
 uint32_t
-ropPUSHA_32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropPUSHA_32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     int sp_reg;
 
@@ -337,7 +343,7 @@ ropPUSHA_32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), u
 }
 
 uint32_t
-ropPOPA_16(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropPOPA_16(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     int sp_reg;
 
@@ -355,7 +361,7 @@ ropPOPA_16(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), ui
     return op_pc;
 }
 uint32_t
-ropPOPA_32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropPOPA_32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     int sp_reg;
 
@@ -374,7 +380,7 @@ ropPOPA_32(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), ui
 }
 
 uint32_t
-ropPUSHF(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropPUSHF(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     int sp_reg;
 
@@ -384,13 +390,15 @@ ropPUSHF(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint
     uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
     uop_CALL_FUNC(ir, flags_rebuild);
     sp_reg = LOAD_SP_WITH_OFFSET(ir, -2);
+    uop_AND_IMM(ir, IREG_flags, IREG_flags, 0x7fd5);
+    uop_OR_IMM(ir, IREG_flags, IREG_flags, 0x0002);
     uop_MEM_STORE_REG(ir, IREG_SS_base, sp_reg, IREG_flags);
     SUB_SP(ir, 2);
 
     return op_pc;
 }
 uint32_t
-ropPUSHFD(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uint32_t fetchdat, UNUSED(uint32_t op_32), uint32_t op_pc)
+ropPUSHFD(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), UNUSED(uint32_t fetchdat), UNUSED(uint32_t op_32), uint32_t op_pc)
 {
     int sp_reg;
 
@@ -400,6 +408,8 @@ ropPUSHFD(UNUSED(codeblock_t *block), ir_data_t *ir, UNUSED(uint8_t opcode), uin
     uop_MOV_IMM(ir, IREG_oldpc, cpu_state.oldpc);
     uop_CALL_FUNC(ir, flags_rebuild);
 
+    uop_AND_IMM(ir, IREG_flags, IREG_flags, 0x7fd5);
+    uop_OR_IMM(ir, IREG_flags, IREG_flags, 0x0002);
     if (cpu_CR4_mask & CR4_VME)
         uop_AND_IMM(ir, IREG_temp0_W, IREG_eflags, 0x3c);
     else if (CPUID)
diff --git a/src/codegen_new/codegen_reg.c b/src/codegen_new/codegen_reg.c
index a3f000826..f91377df8 100644
--- a/src/codegen_new/codegen_reg.c
+++ b/src/codegen_new/codegen_reg.c
@@ -34,6 +34,8 @@ typedef struct host_reg_set_t {
 static host_reg_set_t host_reg_set;
 static host_reg_set_t host_fp_reg_set;
 
+uint64_t dirty_ir_regs[2] = { 0, 0 };
+
 enum {
     REG_BYTE,
     REG_WORD,
@@ -169,6 +171,9 @@ struct
     [IREG_GS_limit_high] = { REG_DWORD,         &cpu_state.seg_gs.limit_high,       REG_INTEGER, REG_PERMANENT},
     [IREG_SS_limit_high] = { REG_DWORD,         &cpu_state.seg_ss.limit_high,       REG_INTEGER, REG_PERMANENT},
 
+    [IREG_eaa16] = { REG_WORD,         &cpu_state.eaaddr,                  REG_INTEGER, REG_PERMANENT},
+    [IREG_x87_op] = { REG_WORD,         &x87_op,                            REG_INTEGER, REG_PERMANENT},
+
  /*Temporary registers are stored on the stack, and are not guaranteed to
   be preserved across uOPs. They will not be written back if they will
   not be read again.*/
@@ -181,15 +186,36 @@ struct
     [IREG_temp1d] = { REG_DOUBLE,        (void *) 48,                        REG_FP,      REG_VOLATILE },
 };
 
+static const uint8_t native_requested_sizes[9][8] = 
+{
+    [REG_BYTE][IREG_SIZE_B >> IREG_SIZE_SHIFT]          = 1,
+    [REG_FPU_ST_BYTE][IREG_SIZE_B >> IREG_SIZE_SHIFT]   = 1,
+    [REG_WORD][IREG_SIZE_W >> IREG_SIZE_SHIFT]          = 1,
+    [REG_DWORD][IREG_SIZE_L >> IREG_SIZE_SHIFT]         = 1,
+    [REG_QWORD][IREG_SIZE_D >> IREG_SIZE_SHIFT]         = 1,
+    [REG_FPU_ST_QWORD][IREG_SIZE_D >> IREG_SIZE_SHIFT]  = 1,
+    [REG_DOUBLE][IREG_SIZE_D >> IREG_SIZE_SHIFT]        = 1,
+    [REG_FPU_ST_DOUBLE][IREG_SIZE_D >> IREG_SIZE_SHIFT] = 1,
+    [REG_QWORD][IREG_SIZE_Q >> IREG_SIZE_SHIFT]         = 1,
+    [REG_FPU_ST_QWORD][IREG_SIZE_Q >> IREG_SIZE_SHIFT]  = 1,
+    [REG_DOUBLE][IREG_SIZE_Q >> IREG_SIZE_SHIFT]        = 1,
+    [REG_FPU_ST_DOUBLE][IREG_SIZE_Q >> IREG_SIZE_SHIFT] = 1,
+
+    [REG_POINTER][(sizeof(void *) == 4) ? (IREG_SIZE_L >> IREG_SIZE_SHIFT) : (IREG_SIZE_Q >> IREG_SIZE_SHIFT)] = 1
+};
+
 void
 codegen_reg_mark_as_required(void)
 {
-    for (uint8_t reg = 0; reg < IREG_COUNT; reg++) {
+    /* This used to start from IREG_EAX, now only starts from IREG_ESP since the first 4 registers are never optimized out. */
+    /* It also no longer iterates through volatile registers unnecessarily. */
+    for (uint8_t reg = IREG_ESP; reg < IREG_temp0; reg++) {
         int last_version = reg_last_version[reg];
 
-        if (last_version > 0 && ireg_data[reg].is_volatile == REG_PERMANENT)
+        if (last_version > 0)
             reg_version[reg][last_version].flags |= REG_FLAGS_REQUIRED;
     }
+    dirty_ir_regs[0] = dirty_ir_regs[1] = 0;
 }
 
 int
@@ -198,29 +224,21 @@ reg_is_native_size(ir_reg_t ir_reg)
     int native_size    = ireg_data[IREG_GET_REG(ir_reg.reg)].native_size;
     int requested_size = IREG_GET_SIZE(ir_reg.reg);
 
-    switch (native_size) {
-        case REG_BYTE:
-        case REG_FPU_ST_BYTE:
-            return (requested_size == IREG_SIZE_B);
-        case REG_WORD:
-            return (requested_size == IREG_SIZE_W);
-        case REG_DWORD:
-            return (requested_size == IREG_SIZE_L);
-        case REG_QWORD:
-        case REG_FPU_ST_QWORD:
-        case REG_DOUBLE:
-        case REG_FPU_ST_DOUBLE:
-            return ((requested_size == IREG_SIZE_D) || (requested_size == IREG_SIZE_Q));
-        case REG_POINTER:
-            if (sizeof(void *) == 4)
-                return (requested_size == IREG_SIZE_L);
-            return (requested_size == IREG_SIZE_Q);
+    return native_requested_sizes[native_size][requested_size >> IREG_SIZE_SHIFT];
+}
 
-        default:
-            fatal("get_reg_is_native_size: unknown native size %i\n", native_size);
+void
+codegen_check_regs(void)
+{
+    int i = 0;
+    for (i = 0; i < IREG_COUNT; i++) {
+        if (ireg_data[i].is_volatile == REG_VOLATILE)
+            continue;
+
+        if (ireg_data[i].p && ((uintptr_t)ireg_data[i].p - (uintptr_t)&cpu_state) >= sizeof(cpu_state)) {
+            fatal("Register number %d outside cpu_state!\n", i);
+        }
     }
-
-    return 0;
 }
 
 void
@@ -239,6 +257,8 @@ codegen_reg_reset(void)
     host_fp_reg_set.locked   = 0;
     host_fp_reg_set.nr_regs  = CODEGEN_HOST_FP_REGS;
 
+    dirty_ir_regs[0] = dirty_ir_regs[1] = 0;
+
     for (c = 0; c < IREG_COUNT; c++) {
         reg_last_version[c]        = 0;
         reg_version[c][0].refcount = 0;
diff --git a/src/codegen_new/codegen_reg.h b/src/codegen_new/codegen_reg.h
index ebb90b42f..a86bcd1cf 100644
--- a/src/codegen_new/codegen_reg.h
+++ b/src/codegen_new/codegen_reg.h
@@ -16,59 +16,45 @@
 #define IREG_SIZE_Q        (5 << IREG_SIZE_SHIFT)
 
 enum {
-    IREG_EAX = 0,
-    IREG_ECX = 1,
-    IREG_EDX = 2,
-    IREG_EBX = 3,
-    IREG_ESP = 4,
-    IREG_EBP = 5,
-    IREG_ESI = 6,
-    IREG_EDI = 7,
+    IREG_EAX,
+    IREG_ECX,
+    IREG_EDX,
+    IREG_EBX,
+    IREG_ESP,
+    IREG_EBP,
+    IREG_ESI,
+    IREG_EDI,
 
-    IREG_flags_op  = 8,
-    IREG_flags_res = 9,
-    IREG_flags_op1 = 10,
-    IREG_flags_op2 = 11,
+    IREG_flags_op,
+    IREG_flags_res,
+    IREG_flags_op1,
+    IREG_flags_op2,
 
-    IREG_pc    = 12,
-    IREG_oldpc = 13,
+    IREG_pc,
+    IREG_oldpc,
 
-    IREG_eaaddr = 14,
-    IREG_ea_seg = 15,
-    IREG_op32   = 16,
-    IREG_ssegsx = 17,
+    IREG_eaaddr,
+    IREG_ea_seg,
+    IREG_op32,
+    IREG_ssegsx,
 
-    IREG_rm_mod_reg = 18,
+    IREG_rm_mod_reg,
 
-    IREG_acycs  = 19,
-    IREG_cycles = 20,
+    IREG_cycles,
 
-    IREG_CS_base = 21,
-    IREG_DS_base = 22,
-    IREG_ES_base = 23,
-    IREG_FS_base = 24,
-    IREG_GS_base = 25,
-    IREG_SS_base = 26,
+    IREG_CS_base,
+    IREG_DS_base,
+    IREG_ES_base,
+    IREG_FS_base,
+    IREG_GS_base,
+    IREG_SS_base,
 
-    IREG_CS_seg = 27,
-    IREG_DS_seg = 28,
-    IREG_ES_seg = 29,
-    IREG_FS_seg = 30,
-    IREG_GS_seg = 31,
-    IREG_SS_seg = 32,
-
-    /*Temporary registers are stored on the stack, and are not guaranteed to
-      be preserved across uOPs. They will not be written back if they will
-      not be read again.*/
-    IREG_temp0 = 33,
-    IREG_temp1 = 34,
-    IREG_temp2 = 35,
-    IREG_temp3 = 36,
-
-    IREG_FPU_TOP = 37,
-
-    IREG_temp0d = 38,
-    IREG_temp1d = 39,
+    IREG_CS_seg,
+    IREG_DS_seg,
+    IREG_ES_seg,
+    IREG_FS_seg,
+    IREG_GS_seg,
+    IREG_SS_seg,
 
     /*FPU stack registers are physical registers. Use IREG_ST() / IREG_tag()
       to access.
@@ -76,63 +62,79 @@ enum {
       used directly to index the stack. When it is clear, the difference
       between the current value of TOP and the value when the block was
       first compiled will be added to adjust for any changes in TOP.*/
-    IREG_ST0 = 40,
-    IREG_ST1 = 41,
-    IREG_ST2 = 42,
-    IREG_ST3 = 43,
-    IREG_ST4 = 44,
-    IREG_ST5 = 45,
-    IREG_ST6 = 46,
-    IREG_ST7 = 47,
+    IREG_ST0,
+    IREG_ST1,
+    IREG_ST2,
+    IREG_ST3,
+    IREG_ST4,
+    IREG_ST5,
+    IREG_ST6,
+    IREG_ST7,
 
-    IREG_tag0 = 48,
-    IREG_tag1 = 49,
-    IREG_tag2 = 50,
-    IREG_tag3 = 51,
-    IREG_tag4 = 52,
-    IREG_tag5 = 53,
-    IREG_tag6 = 54,
-    IREG_tag7 = 55,
+    IREG_tag0,
+    IREG_tag1,
+    IREG_tag2,
+    IREG_tag3,
+    IREG_tag4,
+    IREG_tag5,
+    IREG_tag6,
+    IREG_tag7,
 
-    IREG_ST0_i64 = 56,
-    IREG_ST1_i64 = 57,
-    IREG_ST2_i64 = 58,
-    IREG_ST3_i64 = 59,
-    IREG_ST4_i64 = 60,
-    IREG_ST5_i64 = 61,
-    IREG_ST6_i64 = 62,
-    IREG_ST7_i64 = 63,
+    IREG_ST0_i64,
+    IREG_ST1_i64,
+    IREG_ST2_i64,
+    IREG_ST3_i64,
+    IREG_ST4_i64,
+    IREG_ST5_i64,
+    IREG_ST6_i64,
+    IREG_ST7_i64,
 
-    IREG_MM0x = 64,
-    IREG_MM1x = 65,
-    IREG_MM2x = 66,
-    IREG_MM3x = 67,
-    IREG_MM4x = 68,
-    IREG_MM5x = 69,
-    IREG_MM6x = 70,
-    IREG_MM7x = 71,
+    IREG_MM0x,
+    IREG_MM1x,
+    IREG_MM2x,
+    IREG_MM3x,
+    IREG_MM4x,
+    IREG_MM5x,
+    IREG_MM6x,
+    IREG_MM7x,
 
-    IREG_NPXCx = 72,
-    IREG_NPXSx = 73,
+    IREG_NPXCx,
+    IREG_NPXSx,
 
-    IREG_flagsx  = 74,
-    IREG_eflagsx = 75,
+    IREG_flagsx,
+    IREG_eflagsx,
 
-    IREG_CS_limit_low = 76,
-    IREG_DS_limit_low = 77,
-    IREG_ES_limit_low = 78,
-    IREG_FS_limit_low = 79,
-    IREG_GS_limit_low = 80,
-    IREG_SS_limit_low = 81,
+    IREG_CS_limit_low,
+    IREG_DS_limit_low,
+    IREG_ES_limit_low,
+    IREG_FS_limit_low,
+    IREG_GS_limit_low,
+    IREG_SS_limit_low,
 
-    IREG_CS_limit_high = 82,
-    IREG_DS_limit_high = 83,
-    IREG_ES_limit_high = 84,
-    IREG_FS_limit_high = 85,
-    IREG_GS_limit_high = 86,
-    IREG_SS_limit_high = 87,
+    IREG_CS_limit_high,
+    IREG_DS_limit_high,
+    IREG_ES_limit_high,
+    IREG_FS_limit_high,
+    IREG_GS_limit_high,
+    IREG_SS_limit_high,
 
-    IREG_COUNT = 88,
+    IREG_eaa16,
+    IREG_x87_op,
+
+    IREG_FPU_TOP,
+
+    /*Temporary registers are stored on the stack, and are not guaranteed to
+      be preserved across uOPs. They will not be written back if they will
+      not be read again.*/
+    IREG_temp0,
+    IREG_temp1,
+    IREG_temp2,
+    IREG_temp3,
+
+    IREG_temp0d,
+    IREG_temp1d,
+
+    IREG_COUNT,
 
     IREG_INVALID = 255,
 
@@ -276,6 +278,7 @@ ireg_seg_limit_high(x86seg *seg)
 }
 
 extern uint8_t reg_last_version[IREG_COUNT];
+extern uint64_t dirty_ir_regs[2];
 
 /*This version of the register must be calculated, regardless of whether it is
   apparently required or not. Do not optimise out.*/
@@ -360,10 +363,12 @@ codegen_reg_write(int reg, int uop_nr)
     int            last_version = reg_last_version[IREG_GET_REG(reg)];
     reg_version_t *version;
 
-#ifndef RELEASE_BUILD
-    if (IREG_GET_REG(reg) == IREG_INVALID)
-        fatal("codegen_reg_write - IREG_INVALID\n");
-#endif
+    if (dirty_ir_regs[(IREG_GET_REG(reg) >> 6) & 3] & (1ull << ((uint64_t)IREG_GET_REG(reg) & 0x3full))) {
+        dirty_ir_regs[(IREG_GET_REG(reg) >> 6) & 3] &= ~(1ull << ((uint64_t)IREG_GET_REG(reg) & 0x3full));
+        if ((IREG_GET_REG(reg) > IREG_EBX && IREG_GET_REG(reg) < IREG_temp0) && last_version > 0) {
+            reg_version[IREG_GET_REG(reg)][last_version].flags |= REG_FLAGS_REQUIRED;
+        }
+    }
     ireg.reg     = reg;
     ireg.version = last_version + 1;
 
@@ -373,12 +378,8 @@ codegen_reg_write(int reg, int uop_nr)
     }
 
     reg_last_version[IREG_GET_REG(reg)]++;
-#ifndef RELEASE_BUILD
-    if (!reg_last_version[IREG_GET_REG(reg)])
-        fatal("codegen_reg_write - version overflow\n");
-    else
-#endif
-        if (reg_last_version[IREG_GET_REG(reg)] > REG_VERSION_MAX)
+
+    if (reg_last_version[IREG_GET_REG(reg)] > REG_VERSION_MAX)
         CPU_BLOCK_END();
     if (reg_last_version[IREG_GET_REG(reg)] > max_version_refcount)
         max_version_refcount = reg_last_version[IREG_GET_REG(reg)];
diff --git a/src/config.c b/src/config.c
index f1807c316..d3bc0c2de 100644
--- a/src/config.c
+++ b/src/config.c
@@ -8,20 +8,19 @@
  *
  *          Configuration file handler.
  *
- *
- *
  * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
  *          Miran Grca, <mgrca8@gmail.com>
  *          Fred N. van Kempen, <decwiz@yahoo.com>
  *          Overdoze,
  *          David Hrdlička, <hrdlickadavid@outlook.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
  *          Copyright 2008-2019 Sarah Walker.
  *          Copyright 2016-2019 Miran Grca.
  *          Copyright 2017-2019 Fred N. van Kempen.
  *          Copyright 2018-2019 David Hrdlička.
  *          Copyright 2021      Andreas J. Reichel.
- *          Copyright 2021-2022 Jasmine Iwanek.
+ *          Copyright 2021-2025 Jasmine Iwanek.
  *
  * NOTE:    Forcing config files to be in Unicode encoding breaks
  *          it on Windows XP, and possibly also Vista. Use the
@@ -29,12 +28,13 @@
  */
 
 #include <inttypes.h>
+#ifdef ENABLE_CONFIG_LOG
 #include <stdarg.h>
+#endif
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-#include <wchar.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include "cpu.h"
@@ -46,6 +46,7 @@
 #include <86box/ini.h>
 #include <86box/config.h>
 #include <86box/isamem.h>
+#include <86box/isarom.h>
 #include <86box/isartc.h>
 #include <86box/lpt.h>
 #include <86box/serial.h>
@@ -53,10 +54,9 @@
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
 #include <86box/fdd.h>
-#include <86box/fdc.h>
 #include <86box/fdc_ext.h>
 #include <86box/gameport.h>
-#include <86box/serial.h>
+#include <86box/keyboard.h>
 #include <86box/serial_passthrough.h>
 #include <86box/machine.h>
 #include <86box/mouse.h>
@@ -66,7 +66,7 @@
 #include <86box/scsi_device.h>
 #include <86box/cdrom.h>
 #include <86box/cdrom_interface.h>
-#include <86box/zip.h>
+#include <86box/rdisk.h>
 #include <86box/mo.h>
 #include <86box/sound.h>
 #include <86box/midi.h>
@@ -77,12 +77,20 @@
 #include <86box/plat_dir.h>
 #include <86box/ui.h>
 #include <86box/snd_opl.h>
+#include <86box/version.h>
+
+#ifndef USE_SDL_UI
+/* Deliberate to not make the 86box.h header kitchen-sink. */
+#include <86box/qt-glsl.h>
+extern char gl3_shader_file[MAX_USER_SHADERS][512];
+#endif
 
 static int   cx;
 static int   cy;
 static int   cw;
 static int   ch;
 static ini_t config;
+static ini_t global;
 
 #ifdef ENABLE_CONFIG_LOG
 int config_do_log = ENABLE_CONFIG_LOG;
@@ -102,6 +110,69 @@ config_log(const char *fmt, ...)
 #    define config_log(fmt, ...)
 #endif
 
+/* Load global configuration */
+static void
+load_global(void)
+{
+    ini_section_t cat = ini_find_section(global, "");
+    char         *p;
+
+    p = ini_section_get_string(cat, "language", NULL);
+    if (p != NULL)
+        lang_id = plat_language_code(p);
+    else
+        lang_id = plat_language_code(DEFAULT_LANGUAGE);
+
+    open_dir_usr_path = ini_section_get_int(cat, "open_dir_usr_path", 0);
+
+    confirm_reset = ini_section_get_int(cat, "confirm_reset", 1);
+    confirm_exit  = ini_section_get_int(cat, "confirm_exit", 1);
+    confirm_save  = ini_section_get_int(cat, "confirm_save", 1);
+    color_scheme  = ini_section_get_int(cat, "color_scheme", 0);
+
+    inhibit_multimedia_keys = ini_section_get_int(cat, "inhibit_multimedia_keys", 0);
+
+    mouse_sensitivity = ini_section_get_double(cat, "mouse_sensitivity", 1.0);
+    if (mouse_sensitivity < 0.1)
+        mouse_sensitivity = 0.1;
+    else if (mouse_sensitivity > 2.0)
+        mouse_sensitivity = 2.0;
+
+    vmm_disabled = ini_section_get_int(cat, "vmm_disabled", 0);
+
+    p = ini_section_get_string(cat, "vmm_path", NULL);
+    if (p != NULL) {
+        /* Convert relative paths to absolute in portable mode */
+        if (portable_mode && !path_abs(p)) {
+            path_append_filename(vmm_path_cfg, exe_path, p);
+            path_normalize(vmm_path_cfg);
+        } else {
+            strncpy(vmm_path_cfg, p, sizeof(vmm_path_cfg) - 1);
+        }
+    } else {
+        plat_get_vmm_dir(vmm_path_cfg, sizeof(vmm_path_cfg));
+    }
+}
+
+/* Load scan code mappings. */
+static void
+load_scan_code_mappings(void)
+{
+    ini_section_t cat = ini_find_section(config, "Scan code mappings");
+    char          temp[512];
+
+    for (int c = 0; c < 768; c++) {
+        sprintf(temp, "%03X", c);
+
+        int mapping = ini_section_get_hex12(cat, temp, c);
+
+        if (mapping == c)
+            ini_section_delete_var(cat, temp);
+        else
+            scancode_config_map[c] = mapping;
+    }
+}
+
 /* Load "General" section. */
 static void
 load_general(void)
@@ -117,12 +188,11 @@ load_general(void)
     memset(temp, '\0', sizeof(temp));
     p       = ini_section_get_string(cat, "vid_renderer", "default");
     vid_api = plat_vidapi(p);
-    ini_section_delete_var(cat, "vid_api");
+    if (!strcmp(p, "default"))
+        ini_section_delete_var(cat, "vid_api");
 
     video_fullscreen_scale = ini_section_get_int(cat, "video_fullscreen_scale", 1);
 
-    video_fullscreen_first = ini_section_get_int(cat, "video_fullscreen_first", 1);
-
     video_filter_method = ini_section_get_int(cat, "video_filter_method", 1);
 
     force_43 = !!ini_section_get_int(cat, "force_43", 0);
@@ -136,10 +206,12 @@ load_general(void)
     video_grayscale  = ini_section_get_int(cat, "video_grayscale", 0);
     video_graytype   = ini_section_get_int(cat, "video_graytype", 0);
 
+    force_10ms = !!ini_section_get_int(cat, "force_10ms", 0);
+
     rctrl_is_lalt = ini_section_get_int(cat, "rctrl_is_lalt", 0);
     update_icons  = ini_section_get_int(cat, "update_icons", 1);
 
-    status_icons_fullscreen = !!ini_section_get_int(cat, "status_icons_fullscreen", 0);
+    start_in_fullscreen |= ini_section_get_int(cat, "start_in_fullscreen", 0);
 
     window_remember = ini_section_get_int(cat, "window_remember", 0);
 
@@ -170,47 +242,35 @@ load_general(void)
     kbd_req_capture = ini_section_get_int(cat, "kbd_req_capture", 0);
     hide_status_bar = ini_section_get_int(cat, "hide_status_bar", 0);
     hide_tool_bar   = ini_section_get_int(cat, "hide_tool_bar", 0);
-
-    confirm_reset = ini_section_get_int(cat, "confirm_reset", 1);
-    confirm_exit  = ini_section_get_int(cat, "confirm_exit", 1);
-    confirm_save  = ini_section_get_int(cat, "confirm_save", 1);
-
-    p = ini_section_get_string(cat, "language", NULL);
-    if (p != NULL)
-        lang_id = plat_language_code(p);
-
-    mouse_sensitivity = ini_section_get_double(cat, "mouse_sensitivity", 1.0);
-    if (mouse_sensitivity < 0.1)
-        mouse_sensitivity = 0.1;
-    else if (mouse_sensitivity > 2.0)
-        mouse_sensitivity = 2.0;
-
-    p = ini_section_get_string(cat, "iconset", NULL);
-    if (p != NULL)
-        strcpy(icon_set, p);
-    else
-        strcpy(icon_set, "");
+    sound_muted     = ini_section_get_int(cat, "sound_muted", 0);
 
     enable_discord = !!ini_section_get_int(cat, "enable_discord", 0);
 
-    open_dir_usr_path = ini_section_get_int(cat, "open_dir_usr_path", 0);
-
     video_framerate = ini_section_get_int(cat, "video_gl_framerate", -1);
     video_vsync     = ini_section_get_int(cat, "video_gl_vsync", 0);
-    strncpy(video_shader, ini_section_get_string(cat, "video_gl_shader", ""), sizeof(video_shader) - 1);
+
+    video_gl_input_scale      = ini_section_get_double(cat, "video_gl_input_scale", 1.0);
+    video_gl_input_scale_mode = ini_section_get_int(cat, "video_gl_input_scale_mode", FULLSCR_SCALE_FULL);
 
     window_remember = ini_section_get_int(cat, "window_remember", 0);
     if (window_remember) {
         p = ini_section_get_string(cat, "window_coordinates", NULL);
         if (p == NULL)
-            p = "0, 0, 0, 0";
+            p = "640, 480, 0, 0";
         sscanf(p, "%i, %i, %i, %i", &cw, &ch, &cx, &cy);
-    } else
+    } else {
         cw = ch = cx = cy = 0;
-
-    ini_section_delete_var(cat, "window_coordinates");
+        ini_section_delete_var(cat, "window_coordinates");
+    }
 
     do_auto_pause = ini_section_get_int(cat, "do_auto_pause", 0);
+    force_constant_mouse = ini_section_get_int(cat, "force_constant_mouse", 0);
+
+    p = ini_section_get_string(cat, "uuid", NULL);
+    if (p != NULL)
+        strncpy(uuid, p, sizeof(uuid) - 1);
+    else
+        strncpy(uuid, "", sizeof(uuid) - 1);
 }
 
 /* Load monitor section. */
@@ -243,6 +303,7 @@ static void
 load_machine(void)
 {
     ini_section_t cat = ini_find_section(config, "Machine");
+    ini_section_t migration_cat;
     const char   *p;
     const char   *migrate_from = NULL;
     int           c;
@@ -251,34 +312,63 @@ load_machine(void)
     int           speed;
     double        multi;
 
+    static const struct {
+        const char *old;
+        const char *new;
+        const char *new_bios;
+    } machine_migrations[] = {
+        { .old = "tandy", .new = "tandy1000sx", .new_bios = NULL },
+        { .old = "mr1217", .new = "325ax", .new_bios = "mr1217" },
+        { .old = "deskpro386_05_1988", .new = "deskpro386", .new_bios = "deskpro386_05_1988" },
+        { .old = "mr495", .new = "ami495", .new_bios = "mr495" },
+        { .old = "403tg_d", .new = "403tg", .new_bios = "403tg_d" },
+        { .old = "403tg_d_mr", .new = "403tg", .new_bios = "403tg_d_mr" },
+        { .old = "aptiva510", .new = "pc330_6573", .new_bios = "aptiva510" },
+        { .old = "ambradp60", .new = "batman", .new_bios = "ambradp60" },
+        { .old = "dellxp60", .new = "batman", .new_bios = "dellxp60" },
+        { .old = "586mc1", .new = "586is", .new_bios = NULL },
+        { .old = "ambradp90", .new = "plato", .new_bios = "ambradp90" },
+        { .old = "dellplato", .new = "plato", .new_bios = "dellplato" },
+        { .old = "430nx", .new = "586ip", .new_bios = NULL },
+        { .old = "p54tp4xe_mr", .new = "p54tp4xe", .new_bios = "p54tp4xe_mr" },
+        { .old = "gw2katx", .new = "thor", .new_bios = "gw2katx" },
+        { .old = "mrthor", .new = "thor", .new_bios = "mrthor" },
+        { .old = "equium5200", .new = "cu430hx", .new_bios = "equium5200" },
+        { .old = "infinia7200", .new = "tc430hx", .new_bios = "infinia7200" },
+        { .old = "dellvenus", .new = "vs440fx", .new_bios = "dellvenus" },
+        { .old = "gw2kvenus", .new = "vs440fx", .new_bios = "gw2kvenus" },
+        { 0 }
+    };
+
     p = ini_section_get_string(cat, "machine", NULL);
     if (p != NULL) {
-        migrate_from = p;
         /* Migrate renamed machines. */
-        if (!strcmp(p, "430nx"))
-            machine = machine_get_machine_from_internal_name("586ip");
-        else if (!strcmp(p, "586mc1"))
-            machine = machine_get_machine_from_internal_name("586is");
-        else {
-            machine      = machine_get_machine_from_internal_name(p);
-            migrate_from = NULL;
+        for (i = 0; machine_migrations[i].old; i++) {
+            if (!strcmp(p, machine_migrations[i].old)) {
+                machine      = machine_get_machine_from_internal_name(machine_migrations[i].new);
+                migrate_from = p;
+                if (machine_migrations[i].new_bios) {
+                    migration_cat = ini_find_or_create_section(config, machine_get_device(machine)->name);
+                    ini_section_set_string(migration_cat, "bios", machine_migrations[i].new_bios);
+                }
+                break;
+            }
         }
-    } else
+        if (!migrate_from)
+            machine = machine_get_machine_from_internal_name(p);
+    } else {
         machine = 0;
+    }
 
     if (machine >= machine_count())
         machine = machine_count() - 1;
 
-    /* Copy NVR files when migrating a machine to a new internal name. */
-    if (migrate_from) {
+    /* Copy NVR files when migrating a machine to a new NVR name. */
+    if (migrate_from && strcmp(migrate_from, machine_get_nvr_name())) {
         char old_fn[256];
-        strcpy(old_fn, migrate_from);
-        strcat(old_fn, ".");
-        c = strlen(old_fn);
+        c = snprintf(old_fn, sizeof(old_fn), "%s.", migrate_from);
         char new_fn[256];
-        strcpy(new_fn, machines[machine].internal_name);
-        strcat(new_fn, ".");
-        i = strlen(new_fn);
+        i = snprintf(new_fn, sizeof(new_fn), "%s.", machine_get_nvr_name());
 
         /* Iterate through NVR files. */
         DIR *dirp = opendir(nvr_path("."));
@@ -294,7 +384,7 @@ load_machine(void)
 
                 /* Only copy if a file with the new name doesn't already exist. */
                 FILE *g = nvr_fopen(new_fn, "rb");
-                if (!g) {
+                if (g == NULL) {
                     FILE *f = nvr_fopen(entry->d_name, "rb");
                     g       = nvr_fopen(new_fn, "wb");
 
@@ -309,9 +399,10 @@ load_machine(void)
         }
     }
 
-    cpu_override = ini_section_get_int(cat, "cpu_override", 0);
-    cpu_f        = NULL;
-    p            = ini_section_get_string(cat, "cpu_family", NULL);
+    cpu_override             = ini_section_get_int(cat, "cpu_override", 0);
+    cpu_override_interpreter = ini_section_get_int(cat, "cpu_override_interpreter", 0);
+    cpu_f                    = NULL;
+    p                        = ini_section_get_string(cat, "cpu_family", NULL);
     if (p) {
         /* Migrate CPU family changes. */
         if ((!strcmp(machines[machine].internal_name, "deskpro386") ||
@@ -354,7 +445,7 @@ load_machine(void)
         while (!cpu_family_is_eligible(&cpu_families[c], machine)) {
             if (cpu_families[c++].package == 0) {
                 /* End of list. */
-                fatal("No eligible CPU families for the selected machine\n");
+                fatal("Configuration: No eligible CPU families for the selected machine\n");
                 return;
             }
         }
@@ -398,7 +489,7 @@ load_machine(void)
         else
             time_sync = TIME_SYNC_ENABLED;
     } else
-        time_sync = !!ini_section_get_int(cat, "enable_sync", 1);
+        time_sync = TIME_SYNC_ENABLED;
 
     pit_mode = ini_section_get_int(cat, "pit_mode", -1);
 }
@@ -425,31 +516,49 @@ load_video(void)
                 strcpy(p, "none");
             }
             free_p = 1;
+        } else if (!strcmp(p, "c&t_69000")) {
+            p = (char *) malloc((strlen("chips_69000") + 1) * sizeof(char));
+            strcpy(p, "chips_69000");
+            free_p = 1;
         }
         gfxcard[0] = video_get_video_from_internal_name(p);
-        if (free_p)
+        if (free_p) {
             free(p);
+            p = NULL;
+        }
     }
 
     if (((gfxcard[0] == VID_INTERNAL) && machine_has_flags(machine, MACHINE_VIDEO_8514A)) ||
         video_card_get_flags(gfxcard[0]) == VIDEO_FLAG_TYPE_8514)
         ini_section_delete_var(cat, "8514a");
-    if (((gfxcard[0] == VID_INTERNAL) && machine_has_flags(machine, MACHINE_VIDEO_XGA)) ||
-        video_card_get_flags(gfxcard[0]) == VIDEO_FLAG_TYPE_XGA)
-        ini_section_delete_var(cat, "xga");
 
     voodoo_enabled                   = !!ini_section_get_int(cat, "voodoo", 0);
     ibm8514_standalone_enabled       = !!ini_section_get_int(cat, "8514a", 0);
     ibm8514_active                   = ibm8514_standalone_enabled;
     xga_standalone_enabled           = !!ini_section_get_int(cat, "xga", 0);
     xga_active                       = xga_standalone_enabled;
+    da2_standalone_enabled           = !!ini_section_get_int(cat, "da2", 0);
     show_second_monitors             = !!ini_section_get_int(cat, "show_second_monitors", 1);
     video_fullscreen_scale_maximized = !!ini_section_get_int(cat, "video_fullscreen_scale_maximized", 0);
 
-    p = ini_section_get_string(cat, "gfxcard_2", NULL);
-    if (!p)
-        p = "none";
-    gfxcard[1] = video_get_video_from_internal_name(p);
+    vid_cga_comp_brightness = ini_section_get_int(cat, "vid_cga_comp_brightness", 0);
+    vid_cga_comp_sharpness  = ini_section_get_int(cat, "vid_cga_comp_sharpness", 0);
+    vid_cga_comp_contrast   = ini_section_get_int(cat, "vid_cga_comp_contrast", 100);
+    vid_cga_comp_hue        = ini_section_get_int(cat, "vid_cga_comp_hue", 0);
+    vid_cga_comp_saturation = ini_section_get_int(cat, "vid_cga_comp_saturation", 100);
+
+    // TODO
+    for (uint8_t i = 1; i < GFXCARD_MAX; i ++) {
+        p = ini_section_get_string(cat, "gfxcard_2", NULL);
+        if (!p)
+            p = "none";
+        gfxcard[i] = video_get_video_from_internal_name(p);
+    }
+
+    monitor_edid = ini_section_get_int(cat, "monitor_edid", 0);
+
+    monitor_edid_path[0] = 0;
+    strncpy(monitor_edid_path, ini_section_get_string(cat, "monitor_edid_path", (char*)""), sizeof(monitor_edid_path) - 1);
 }
 
 /* Load "Input Devices" section. */
@@ -458,77 +567,95 @@ load_input_devices(void)
 {
     ini_section_t cat = ini_find_section(config, "Input devices");
     char          temp[512];
-    int           c;
-    int           d;
     char         *p;
 
+    p = ini_section_get_string(cat, "keyboard_type", NULL);
+    if (p != NULL)
+        keyboard_type = keyboard_get_from_internal_name(p);
+    else if (strstr(machine_get_internal_name(), "pc5086"))
+        keyboard_type = KEYBOARD_TYPE_PC_XT;
+    else if (machine_has_bus(machine, MACHINE_BUS_PS2_PORTS)) {
+        if (machine_has_flags(machine, MACHINE_KEYBOARD_JIS))
+            keyboard_type = KEYBOARD_TYPE_PS55;
+        else
+            keyboard_type = KEYBOARD_TYPE_PS2;
+    } else if (machine_has_bus(machine, MACHINE_BUS_ISA16) ||
+               machine_has_bus(machine, MACHINE_BUS_PCI)) {
+        if (machine_has_flags(machine, MACHINE_KEYBOARD_JIS))
+            keyboard_type = KEYBOARD_TYPE_AX;
+        else
+            keyboard_type = KEYBOARD_TYPE_AT;
+    } else
+        keyboard_type = KEYBOARD_TYPE_PC_XT;
+
     p = ini_section_get_string(cat, "mouse_type", NULL);
     if (p != NULL)
         mouse_type = mouse_get_from_internal_name(p);
     else
         mouse_type = 0;
 
+    uint8_t joy_insn = 0;
     p = ini_section_get_string(cat, "joystick_type", NULL);
     if (p != NULL) {
-        joystick_type = joystick_get_from_internal_name(p);
+        joystick_type[joy_insn] = joystick_get_from_internal_name(p);
 
-        if (!joystick_type) {
+        if (!joystick_type[joy_insn]) {
             /* Try to read an integer for backwards compatibility with old configs */
             if (!strcmp(p, "0"))
                 /* Workaround for ini_section_get_int returning 0 on non-integer data */
-                joystick_type = joystick_get_from_internal_name("2axis_2button");
+                joystick_type[joy_insn] = joystick_get_from_internal_name("2axis_2button");
             else {
-                c = ini_section_get_int(cat, "joystick_type", 8);
-                switch (c) {
+                int js = ini_section_get_int(cat, "joystick_type", 8);
+                switch (js) {
                     case JS_TYPE_2AXIS_4BUTTON:
-                        joystick_type = joystick_get_from_internal_name("2axis_4button");
+                        joystick_type[joy_insn] = joystick_get_from_internal_name("2axis_4button");
                         break;
                     case JS_TYPE_2AXIS_6BUTTON:
-                        joystick_type = joystick_get_from_internal_name("2axis_6button");
+                        joystick_type[joy_insn] = joystick_get_from_internal_name("2axis_6button");
                         break;
                     case JS_TYPE_2AXIS_8BUTTON:
-                        joystick_type = joystick_get_from_internal_name("2axis_8button");
+                        joystick_type[joy_insn] = joystick_get_from_internal_name("2axis_8button");
                         break;
                     case JS_TYPE_4AXIS_4BUTTON:
-                        joystick_type = joystick_get_from_internal_name("4axis_4button");
+                        joystick_type[joy_insn] = joystick_get_from_internal_name("4axis_4button");
                         break;
                     case JS_TYPE_CH_FLIGHTSTICK_PRO:
-                        joystick_type = joystick_get_from_internal_name("ch_flightstick_pro");
+                        joystick_type[joy_insn] = joystick_get_from_internal_name("ch_flightstick_pro");
                         break;
                     case JS_TYPE_SIDEWINDER_PAD:
-                        joystick_type = joystick_get_from_internal_name("sidewinder_pad");
+                        joystick_type[joy_insn] = joystick_get_from_internal_name("sidewinder_pad");
                         break;
                     case JS_TYPE_THRUSTMASTER_FCS:
-                        joystick_type = joystick_get_from_internal_name("thrustmaster_fcs");
+                        joystick_type[joy_insn] = joystick_get_from_internal_name("thrustmaster_fcs");
                         break;
                     default:
-                        joystick_type = JS_TYPE_NONE;
+                        joystick_type[joy_insn] = JS_TYPE_NONE;
                         break;
                 }
             }
         }
     } else
-        joystick_type = JS_TYPE_NONE;
+        joystick_type[joy_insn] = JS_TYPE_NONE;
 
-    for (c = 0; c < joystick_get_max_joysticks(joystick_type); c++) {
-        sprintf(temp, "joystick_%i_nr", c);
-        joystick_state[c].plat_joystick_nr = ini_section_get_int(cat, temp, 0);
+    for (int js = 0; js < joystick_get_max_joysticks(joystick_type[joy_insn]); js++) {
+        sprintf(temp, "joystick_%i_nr", js);
+        joystick_state[0][js].plat_joystick_nr = ini_section_get_int(cat, temp, 0);
 
-        if (joystick_state[c].plat_joystick_nr) {
-            for (d = 0; d < joystick_get_axis_count(joystick_type); d++) {
-                sprintf(temp, "joystick_%i_axis_%i", c, d);
-                joystick_state[c].axis_mapping[d] = ini_section_get_int(cat, temp, d);
+        if (joystick_state[0][js].plat_joystick_nr) {
+            for (int axis_nr = 0; axis_nr < joystick_get_axis_count(joystick_type[joy_insn]); axis_nr++) {
+                sprintf(temp, "joystick_%i_axis_%i", js, axis_nr);
+                joystick_state[0][js].axis_mapping[axis_nr] = ini_section_get_int(cat, temp, axis_nr);
             }
-            for (d = 0; d < joystick_get_button_count(joystick_type); d++) {
-                sprintf(temp, "joystick_%i_button_%i", c, d);
-                joystick_state[c].button_mapping[d] = ini_section_get_int(cat, temp, d);
+            for (int button_nr = 0; button_nr < joystick_get_button_count(joystick_type[joy_insn]); button_nr++) {
+                sprintf(temp, "joystick_%i_button_%i", js, button_nr);
+                joystick_state[0][js].button_mapping[button_nr] = ini_section_get_int(cat, temp, button_nr);
             }
-            for (d = 0; d < joystick_get_pov_count(joystick_type); d++) {
-                sprintf(temp, "joystick_%i_pov_%i", c, d);
+            for (int pov_nr = 0; pov_nr < joystick_get_pov_count(joystick_type[joy_insn]); pov_nr++) {
+                sprintf(temp, "joystick_%i_pov_%i", js, pov_nr);
                 p                                   = ini_section_get_string(cat, temp, "0, 0");
-                joystick_state[c].pov_mapping[d][0] = joystick_state[c].pov_mapping[d][1] = 0;
-                sscanf(p, "%i, %i", &joystick_state[c].pov_mapping[d][0],
-                       &joystick_state[c].pov_mapping[d][1]);
+                joystick_state[0][js].pov_mapping[pov_nr][0] = joystick_state[0][js].pov_mapping[pov_nr][1] = 0;
+                sscanf(p, "%i, %i", &joystick_state[0][js].pov_mapping[pov_nr][0],
+                       &joystick_state[0][js].pov_mapping[pov_nr][1]);
             }
         }
     }
@@ -545,36 +672,24 @@ load_sound(void)
     char         *p;
 
     p = ini_section_get_string(cat, "sndcard", NULL);
-    /* FIXME: Hack to not break configs with the Sound Blaster 128 PCI set. */
-    if ((p != NULL) && (!strcmp(p, "sbpci128") || !strcmp(p, "sb128pci")))
-        p = "es1371";
     if (p != NULL)
         sound_card_current[0] = sound_card_get_from_internal_name(p);
     else
         sound_card_current[0] = 0;
 
     p = ini_section_get_string(cat, "sndcard2", NULL);
-    /* FIXME: Hack to not break configs with the Sound Blaster 128 PCI set. */
-    if ((p != NULL) && (!strcmp(p, "sbpci128") || !strcmp(p, "sb128pci")))
-        p = "es1371";
     if (p != NULL)
         sound_card_current[1] = sound_card_get_from_internal_name(p);
     else
         sound_card_current[1] = 0;
 
     p = ini_section_get_string(cat, "sndcard3", NULL);
-    /* FIXME: Hack to not break configs with the Sound Blaster 128 PCI set. */
-    if ((p != NULL) && (!strcmp(p, "sbpci128") || !strcmp(p, "sb128pci")))
-        p = "es1371";
     if (p != NULL)
         sound_card_current[2] = sound_card_get_from_internal_name(p);
     else
         sound_card_current[2] = 0;
 
     p = ini_section_get_string(cat, "sndcard4", NULL);
-    /* FIXME: Hack to not break configs with the Sound Blaster 128 PCI set. */
-    if ((p != NULL) && (!strcmp(p, "sbpci128") || !strcmp(p, "sb128pci")))
-        p = "es1371";
     if (p != NULL)
         sound_card_current[3] = sound_card_get_from_internal_name(p);
     else
@@ -615,7 +730,7 @@ load_sound(void)
     memset(temp, '\0', sizeof(temp));
     p = ini_section_get_string(cat, "sound_type", "float");
     if (strlen(p) > 511)
-        fatal("load_sound(): strlen(p) > 511\n");
+        fatal("Configuration: Length of sound_type is more than 511\n");
     else
         strncpy(temp, p, 511);
     if (!strcmp(temp, "float") || !strcmp(temp, "1"))
@@ -653,8 +768,14 @@ load_network(void)
                 nc->net_type = NET_TYPE_PCAP;
             else if (!strcmp(p, "slirp") || !strcmp(p, "2"))
                 nc->net_type = NET_TYPE_SLIRP;
-            else if (!strcmp(p, "vde") || !strcmp(p, "2"))
+            else if (!strcmp(p, "vde") || !strcmp(p, "3"))
                 nc->net_type = NET_TYPE_VDE;
+            else if (!strcmp(p, "tap") || !strcmp(p, "4"))
+                nc->net_type = NET_TYPE_TAP;
+            else if (!strcmp(p, "nmswitch") || !strcmp(p, "5"))
+                nc->net_type = NET_TYPE_NMSWITCH;
+            else if (!strcmp(p, "nrswitch") || !strcmp(p, "6"))
+                nc->net_type = NET_TYPE_NRSWITCH;
             else
                 nc->net_type = NET_TYPE_NONE;
         } else
@@ -665,9 +786,9 @@ load_network(void)
             if (nc->net_type == NET_TYPE_PCAP) {
                 if ((network_dev_to_id(p) == -1) || (network_ndev == 1)) {
                     if (network_ndev == 1)
-                        ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2095, (wchar_t *) IDS_2130);
+                        ui_msgbox_header(MBX_ERROR, plat_get_string(STRING_PCAP_ERROR_NO_DEVICES), plat_get_string(STRING_PCAP_ERROR_DESC));
                     else if (network_dev_to_id(p) == -1)
-                        ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2096, (wchar_t *) IDS_2130);
+                        ui_msgbox_header(MBX_ERROR, plat_get_string(STRING_PCAP_ERROR_INVALID_DEVICE), plat_get_string(STRING_PCAP_ERROR_DESC));
                     strcpy(nc->host_dev_name, "none");
                 } else
                     strncpy(nc->host_dev_name, p, sizeof(nc->host_dev_name) - 1);
@@ -699,22 +820,27 @@ load_network(void)
                 nc->net_type = NET_TYPE_PCAP;
             else if (!strcmp(p, "slirp") || !strcmp(p, "2"))
                 nc->net_type = NET_TYPE_SLIRP;
-            else if (!strcmp(p, "vde") || !strcmp(p, "2"))
+            else if (!strcmp(p, "vde") || !strcmp(p, "3"))
                 nc->net_type = NET_TYPE_VDE;
+            else if (!strcmp(p, "tap") || !strcmp(p, "4"))
+                nc->net_type = NET_TYPE_TAP;
+            else if (!strcmp(p, "nmswitch") || !strcmp(p, "5"))
+                nc->net_type = NET_TYPE_NMSWITCH;
+            else if (!strcmp(p, "nrswitch") || !strcmp(p, "6"))
+                nc->net_type = NET_TYPE_NRSWITCH;
             else
                 nc->net_type = NET_TYPE_NONE;
         } else
             nc->net_type = NET_TYPE_NONE;
-
         sprintf(temp, "net_%02i_host_device", c + 1);
         p = ini_section_get_string(cat, temp, NULL);
         if (p != NULL) {
             if (nc->net_type == NET_TYPE_PCAP) {
                 if ((network_dev_to_id(p) == -1) || (network_ndev == 1)) {
                     if (network_ndev == 1)
-                        ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2095, (wchar_t *) IDS_2130);
+                        ui_msgbox_header(MBX_ERROR, plat_get_string(STRING_PCAP_ERROR_NO_DEVICES), plat_get_string(STRING_PCAP_ERROR_DESC));
                     else if (network_dev_to_id(p) == -1)
-                        ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2096, (wchar_t *) IDS_2130);
+                        ui_msgbox_header(MBX_ERROR, plat_get_string(STRING_PCAP_ERROR_INVALID_DEVICE), plat_get_string(STRING_PCAP_ERROR_DESC));
                     strcpy(nc->host_dev_name, "none");
                 } else
                     strncpy(nc->host_dev_name, p, sizeof(nc->host_dev_name) - 1);
@@ -723,6 +849,19 @@ load_network(void)
         } else
             strcpy(nc->host_dev_name, "none");
 
+         sprintf(temp, "net_%02i_switch_group", c + 1);
+         net_cards_conf[c].switch_group = ini_section_get_int(cat, temp, 0);
+
+         sprintf(temp, "net_%02i_promisc", c + 1);
+         net_cards_conf[c].promisc_mode = ini_section_get_int(cat, temp, 0);
+
+         sprintf(temp, "net_%02i_nrs_host", c + 1);
+         p = ini_section_get_string(cat, temp, NULL);
+         if (p != NULL)
+            strncpy(net_cards_conf[c].nrs_hostname, p, sizeof(net_cards_conf[c].nrs_hostname) - 1);
+         else
+            strncpy(net_cards_conf[c].nrs_hostname, "", sizeof(net_cards_conf[c].nrs_hostname) - 1);
+
         sprintf(temp, "net_%02i_link", c + 1);
         nc->link_state = ini_section_get_int(cat, temp,
                                              (NET_LINK_10_HD | NET_LINK_10_FD |
@@ -738,12 +877,21 @@ load_ports(void)
     ini_section_t cat = ini_find_section(config, "Ports (COM & LPT)");
     char         *p;
     char          temp[512];
-    int           c;
-    int           d;
-
     memset(temp, 0, sizeof(temp));
 
-    for (c = 0; c < SERIAL_MAX; c++) {
+    int           has_jumpers = machine_has_jumpered_ecp_dma(machine, DMA_ANY);
+    int           def_jumper  = machine_get_default_jumpered_ecp_dma(machine);
+
+    jumpered_internal_ecp_dma = ini_section_get_int(cat, "jumpered_internal_ecp_dma", def_jumper);
+
+    if (!has_jumpers || (jumpered_internal_ecp_dma == def_jumper))
+        ini_section_delete_var(cat, "jumpered_internal_ecp_dma");
+    else if (has_jumpers && !(machine_has_jumpered_ecp_dma(machine, jumpered_internal_ecp_dma))) {
+        jumpered_internal_ecp_dma = def_jumper;
+        ini_section_delete_var(cat, "jumpered_internal_ecp_dma");
+    }
+
+    for (int c = 0; c < (SERIAL_MAX - 1); c++) {
         sprintf(temp, "serial%d_enabled", c + 1);
         com_ports[c].enabled = !!ini_section_get_int(cat, temp, (c >= 2) ? 0 : 1);
 
@@ -754,22 +902,67 @@ load_ports(void)
             config_log("Serial Port %d: passthrough enabled.\n\n", c + 1);
     }
 
-    for (c = 0; c < PARALLEL_MAX; c++) {
+    for (int c = 0; c < PARALLEL_MAX; c++) {
         sprintf(temp, "lpt%d_enabled", c + 1);
         lpt_ports[c].enabled = !!ini_section_get_int(cat, temp, (c == 0) ? 1 : 0);
 
         sprintf(temp, "lpt%d_device", c + 1);
-        p                   = ini_section_get_string(cat, temp, "none");
-        lpt_ports[c].device = lpt_device_get_from_internal_name(p);
+        p                    = ini_section_get_string(cat, temp, "none");
+        lpt_ports[c].device  = lpt_device_get_from_internal_name(p);
     }
 
-    /* Legacy config compatibility. */
-    d = ini_section_get_int(cat, "lpt_enabled", 2);
-    if (d < 2) {
-        for (c = 0; c < PARALLEL_MAX; c++)
-            lpt_ports[c].enabled = d;
+#if 0
+// TODO: Load
+    for (c = 0; c < GAMEPORT_MAX; c++) {
+        sprintf(temp, "gameport%d_enabled", c + 1);
+        game_ports[c].enabled = !!ini_section_get_int(cat, temp, (c == 0) ? 1 : 0);
+
+        sprintf(temp, "gameport%d_device", c + 1);
+        p                   = ini_section_get_string(cat, temp, "none");
+        game_ports[c].device = gameport_get_from_internal_name(p);
     }
-    ini_section_delete_var(cat, "lpt_enabled");
+
+    for (uint8_t c = 0; c < GAMEPORT_MAX; c++) {
+        sprintf(temp, "gameport%d_type", c);
+
+        p              = ini_section_get_string(cat, temp, "none");
+        gameport_type[c] = gameport_get_from_internal_name(p);
+
+        if (!strcmp(p, "none"))
+            ini_section_delete_var(cat, temp);
+    }
+#endif
+}
+
+static int
+load_image_file(char *dest, char *p, uint8_t *ui_wp)
+{
+    char *prefix = "";
+    int   ret    = 0;
+
+    if (strstr(p, "wp://") == p) {
+       p += 5;
+       prefix = "wp://";
+       if (ui_wp != NULL)
+           *ui_wp = 1;
+    } else if ((ui_wp != NULL) && *ui_wp)
+       prefix = "wp://";
+
+    if (path_abs(p)) {
+        if ((strlen(prefix) + strlen(p)) > (MAX_IMAGE_PATH_LEN - 11))
+            ret = 1;
+        else
+            snprintf(dest, MAX_IMAGE_PATH_LEN, "%s%s", prefix, p);
+    } else {
+        if ((strlen(prefix) + strlen(usr_path) + strlen(path_get_slash(usr_path)) + strlen(p)) > (MAX_IMAGE_PATH_LEN - 11))
+            ret = 1;
+        else
+            snprintf(dest, MAX_IMAGE_PATH_LEN, "%s%s%s%s", prefix, usr_path, path_get_slash(usr_path), p);
+    }
+
+    path_normalize(dest);
+
+    return ret;
 }
 
 /* Load "Storage Controllers" section. */
@@ -780,11 +973,9 @@ load_storage_controllers(void)
     ini_section_t migration_cat;
     char         *p;
     char          temp[512];
-    int           c;
     int           min = 0;
-    int           free_p = 0;
 
-    for (c = min; c < SCSI_BUS_MAX; c++) {
+    for (int c = min; c < SCSI_CARD_MAX; c++) {
         sprintf(temp, "scsicard_%d", c + 1);
 
         p = ini_section_get_string(cat, temp, NULL);
@@ -795,14 +986,16 @@ load_storage_controllers(void)
     }
 
     p = ini_section_get_string(cat, "fdc", NULL);
+#if 1
     if (p != NULL)
-        fdc_type = fdc_card_get_from_internal_name(p);
+        fdc_current[0] = fdc_card_get_from_internal_name(p);
     else
-        fdc_type = FDC_INTERNAL;
+        fdc_current[0] = FDC_INTERNAL;
+#else
+    int free_p = 0;
 
-    p = ini_section_get_string(cat, "hdc", NULL);
     if (p == NULL) {
-        if (machine_has_flags(machine, MACHINE_HDC)) {
+        if (machine_has_flags(machine, MACHINE_FDC)) {
             p = (char *) malloc((strlen("internal") + 1) * sizeof(char));
             strcpy(p, "internal");
         } else {
@@ -811,56 +1004,126 @@ load_storage_controllers(void)
         }
         free_p = 1;
     }
-    /* Migrate renamed and merged cards. */
-    if (!strcmp(p, "xtide_plus")) {
-        hdc_current = hdc_get_from_internal_name("xtide");
-        migration_cat = ini_find_or_create_section(config, "PC/XT XTIDE");
-        ini_section_set_string(migration_cat, "bios", "xt_plus");
-    } else if (!strcmp(p, "xtide_at_386")) {
-        hdc_current = hdc_get_from_internal_name("xtide_at");
-        migration_cat = ini_find_or_create_section(config, "PC/AT XTIDE");
-        ini_section_set_string(migration_cat, "bios", "at_386");
-    } else
-        hdc_current = hdc_get_from_internal_name(p);
+
+    fdc_current[0] = fdc_card_get_from_internal_name(p);
 
     if (free_p) {
         free(p);
         p = NULL;
+        free_p = 0;
     }
+#endif
+
+    for (int c = min; c < HDC_MAX; c++) {
+        sprintf(temp, "hdc_%d", c + 1);
+
+        p = ini_section_get_string(cat, temp, NULL);
+        if (p != NULL)
+            hdc_current[c] = hdc_get_from_internal_name(p);
+        else
+            hdc_current[c] = 0;
+    }
+
+    /* Backwards compatibility for single HDC and standalone tertiary/quaternary IDE from v4.2 and older. */
+    const char *legacy_cards[] = { NULL, "ide_ter", "ide_qua" };
+    p = ini_section_get_string(cat, "hdc", NULL);
+    for (int i = !(p || machine_has_flags(machine, MACHINE_HDC)), j = 0; i < (sizeof(legacy_cards) / sizeof(legacy_cards[0])); i++) {
+        if (!legacy_cards[i] || (ini_section_get_int(cat, legacy_cards[i], 0) == 1)) {
+            /* Migrate to the first available HDC slot. */
+            for (; j < (sizeof(hdc_current) / sizeof(hdc_current[0])); j++) {
+                if (!hdc_current[j]) {
+                    if (!legacy_cards[i]) {
+                        if (!p) {
+                            hdc_current[j] = hdc_get_from_internal_name("internal");
+                        } else if (!strcmp(p, "xtide_plus")) {
+                            hdc_current[j] = hdc_get_from_internal_name("xtide");
+                            sprintf(temp, "PC/XT XTIDE #%i", j + 1);
+                            migration_cat = ini_find_or_create_section(config, temp);
+                            ini_section_set_string(migration_cat, "bios", "xt_plus");
+                        } else if (!strcmp(p, "xtide_at_386")) {
+                            hdc_current[j] = hdc_get_from_internal_name("xtide_at");
+                            sprintf(temp, "PC/AT XTIDE #%i", j + 1);
+                            migration_cat = ini_find_or_create_section(config, temp);
+                            ini_section_set_string(migration_cat, "bios", "at_386");
+                        } else {
+                            hdc_current[j] = hdc_get_from_internal_name(p);
+                        }
+                    } else {
+                        hdc_current[j] = hdc_get_from_internal_name(legacy_cards[i]);
+                    }
+                    break;
+                }
+            }
+        }
+    }
+    ini_section_delete_var(cat, "hdc");
 
     p = ini_section_get_string(cat, "cdrom_interface", NULL);
     if (p != NULL)
         cdrom_interface_current = cdrom_interface_get_from_internal_name(p);
 
-    if (free_p) {
-        free(p);
-        p = NULL;
-    }
-
-    ide_ter_enabled = !!ini_section_get_int(cat, "ide_ter", 0);
-    ide_qua_enabled = !!ini_section_get_int(cat, "ide_qua", 0);
-
     if (machine_has_bus(machine, MACHINE_BUS_CASSETTE))
         cassette_enable = !!ini_section_get_int(cat, "cassette_enabled", 0);
     else
         cassette_enable = 0;
+
+    cassette_ui_writeprot = !!ini_section_get_int(cat, "cassette_writeprot", 0);
+    ini_section_delete_var(cat, "cassette_writeprot");
+
     p = ini_section_get_string(cat, "cassette_file", "");
+
+    if (!strcmp(p, usr_path))
+        p[0] = 0x00;
+
+    if (p[0] != 0x00) {
+        if (load_image_file(cassette_fname, p, (uint8_t *) &cassette_ui_writeprot))
+            fatal("Configuration: Length of cassette_file is more than 511\n");
+    }
+
+    p = ini_section_get_string(cat, "cassette_mode", "load");
     if (strlen(p) > 511)
-        fatal("load_storage_controllers(): strlen(p) > 511\n");
-    else
-        strncpy(cassette_fname, p, 511);
-    p = ini_section_get_string(cat, "cassette_mode", "");
-    if (strlen(p) > 511)
-        fatal("load_storage_controllers(): strlen(p) > 511\n");
+        fatal("Configuration: Length of cassette_mode is more than 511\n");
     else
         strncpy(cassette_mode, p, 511);
-    cassette_pos          = ini_section_get_int(cat, "cassette_position", 0);
-    cassette_srate        = ini_section_get_int(cat, "cassette_srate", 44100);
-    cassette_append       = !!ini_section_get_int(cat, "cassette_append", 0);
-    cassette_pcm          = ini_section_get_int(cat, "cassette_pcm", 0);
-    cassette_ui_writeprot = !!ini_section_get_int(cat, "cassette_writeprot", 0);
 
-    for (c = 0; c < 2; c++) {
+    for (int i = 0; i < MAX_PREV_IMAGES; i++) {
+        cassette_image_history[i] = (char *) calloc((MAX_IMAGE_PATH_LEN + 1) << 1, sizeof(char));
+        sprintf(temp, "cassette_image_history_%02i", i + 1);
+        p = ini_section_get_string(cat, temp, NULL);
+        if (p) {
+            if (load_image_file(cassette_image_history[i], p, NULL))
+                fatal("Configuration: Length of cassette_image_history_%02i is more "
+                      "than %i\n", i + 1, MAX_IMAGE_PATH_LEN - 1);
+        }
+    }
+    cassette_pos          = ini_section_get_int(cat, "cassette_position", 0);
+    if (!cassette_pos)
+        ini_section_delete_var(cat, "cassette_position");
+    cassette_srate        = ini_section_get_int(cat, "cassette_srate", 44100);
+    if (cassette_srate == 44100)
+        ini_section_delete_var(cat, "cassette_srate");
+    cassette_append       = !!ini_section_get_int(cat, "cassette_append", 0);
+    if (!cassette_append)
+        ini_section_delete_var(cat, "cassette_append");
+    cassette_pcm          = ini_section_get_int(cat, "cassette_pcm", 0);
+    if (!cassette_pcm)
+        ini_section_delete_var(cat, "cassette_pcm");
+
+    if (!cassette_enable) {
+        ini_section_delete_var(cat, "cassette_file");
+        ini_section_delete_var(cat, "cassette_mode");
+        for (int i = 0; i < MAX_PREV_IMAGES; i++) {
+            sprintf(temp, "cassette_image_history_%02i", i + 1);
+            ini_section_delete_var(cat, temp);
+        }
+        ini_section_delete_var(cat, "cassette_position");
+        ini_section_delete_var(cat, "cassette_srate");
+        ini_section_delete_var(cat, "cassette_append");
+        ini_section_delete_var(cat, "cassette_pcm");
+        ini_section_delete_var(cat, "cassette_ui_writeprot");
+    }
+
+    for (int c = 0; c < 2; c++) {
         sprintf(temp, "cartridge_%02i_fn", c + 1);
         p = ini_section_get_string(cat, temp, "");
 
@@ -870,13 +1133,32 @@ load_storage_controllers(void)
         if (p[0] != 0x00) {
             if (path_abs(p)) {
                 if (strlen(p) > 511)
-                    fatal("load_storage_controllers(): strlen(p) > 511 (cart_fns[%i])\n", c);
+                    fatal("Configuration: Length of cartridge_%02i_fn is more than 511\n",
+                          c + 1);
                 else
                     strncpy(cart_fns[c], p, 511);
             } else
                 path_append_filename(cart_fns[c], usr_path, p);
             path_normalize(cart_fns[c]);
         }
+
+        for (int i = 0; i < MAX_PREV_IMAGES; i++) {
+            cart_image_history[c][i] = (char *) calloc((MAX_IMAGE_PATH_LEN + 1) << 1, sizeof(char));
+            sprintf(temp, "cartridge_%02i_image_history_%02i", c + 1, i + 1);
+            p = ini_section_get_string(cat, temp, NULL);
+            if (p) {
+                if (path_abs(p)) {
+                    if (strlen(p) > (MAX_IMAGE_PATH_LEN - 1))
+                        fatal("Configuration: Length of cartridge_%02i_image_history_%02i "
+                              "is more than %i\n", c + 1, i + 1, MAX_IMAGE_PATH_LEN - 1);
+                    else
+                        snprintf(cart_image_history[c][i], MAX_IMAGE_PATH_LEN, "%s", p);
+                } else
+                    snprintf(cart_image_history[c][i], MAX_IMAGE_PATH_LEN, "%s%s%s", usr_path,
+                             path_get_slash(usr_path), p);
+                path_normalize(cart_image_history[c][i]);
+            }
+        }
     }
 }
 
@@ -902,8 +1184,8 @@ load_hard_disks(void)
         sscanf(p, "%u, %u, %u, %i, %s",
                &hdd[c].spt, &hdd[c].hpc, &hdd[c].tracks, (int *) &hdd[c].wp, s);
 
-        hdd[c].bus = hdd_string_to_bus(s, 0);
-        switch (hdd[c].bus) {
+        hdd[c].bus_type = hdd_string_to_bus(s, 0);
+        switch (hdd[c].bus_type) {
             default:
             case HDD_BUS_DISABLED:
                 max_spt = max_hpc = max_tracks = 0;
@@ -949,7 +1231,7 @@ load_hard_disks(void)
             hdd[c].tracks = max_tracks;
 
         sprintf(temp, "hdd_%02i_speed", c + 1);
-        switch (hdd[c].bus) {
+        switch (hdd[c].bus_type) {
             case HDD_BUS_IDE:
             case HDD_BUS_ESDI:
             case HDD_BUS_ATAPI:
@@ -965,28 +1247,28 @@ load_hard_disks(void)
 
         /* MFM/RLL */
         sprintf(temp, "hdd_%02i_mfm_channel", c + 1);
-        if (hdd[c].bus == HDD_BUS_MFM)
+        if (hdd[c].bus_type == HDD_BUS_MFM)
             hdd[c].mfm_channel = !!ini_section_get_int(cat, temp, c & 1);
         else
             ini_section_delete_var(cat, temp);
 
         /* XTA */
         sprintf(temp, "hdd_%02i_xta_channel", c + 1);
-        if (hdd[c].bus == HDD_BUS_XTA)
+        if (hdd[c].bus_type == HDD_BUS_XTA)
             hdd[c].xta_channel = !!ini_section_get_int(cat, temp, c & 1);
         else
             ini_section_delete_var(cat, temp);
 
         /* ESDI */
         sprintf(temp, "hdd_%02i_esdi_channel", c + 1);
-        if (hdd[c].bus == HDD_BUS_ESDI)
+        if (hdd[c].bus_type == HDD_BUS_ESDI)
             hdd[c].esdi_channel = !!ini_section_get_int(cat, temp, c & 1);
         else
             ini_section_delete_var(cat, temp);
 
         /* IDE */
         sprintf(temp, "hdd_%02i_ide_channel", c + 1);
-        if ((hdd[c].bus == HDD_BUS_IDE) || (hdd[c].bus == HDD_BUS_ATAPI)) {
+        if ((hdd[c].bus_type == HDD_BUS_IDE) || (hdd[c].bus_type == HDD_BUS_ATAPI)) {
             sprintf(tmp2, "%01u:%01u", c >> 1, c & 1);
             p = ini_section_get_string(cat, temp, tmp2);
             sscanf(p, "%01u:%01u", &board, &dev);
@@ -996,12 +1278,11 @@ load_hard_disks(void)
 
             if (hdd[c].ide_channel > 7)
                 hdd[c].ide_channel = 7;
-        } else {
+        } else
             ini_section_delete_var(cat, temp);
-        }
 
         /* SCSI */
-        if (hdd[c].bus == HDD_BUS_SCSI) {
+        if (hdd[c].bus_type == HDD_BUS_SCSI) {
             sprintf(temp, "hdd_%02i_scsi_location", c + 1);
             sprintf(tmp2, "%01u:%02u", SCSI_BUS_MAX, c + 2);
             p = ini_section_get_string(cat, temp, tmp2);
@@ -1041,7 +1322,8 @@ load_hard_disks(void)
         if (p[0] != 0x00) {
             if (path_abs(p)) {
                 if (strlen(p) > 511)
-                    fatal("load_hard_disks(): strlen(p) > 511 (hdd[%i].fn)\n", c);
+                    fatal("Configuration: Length of hdd_%02i_fn is more "
+                          "than 511\n", c + 1);
                 else
                     strncpy(hdd[c].fn, p, 511);
             } else
@@ -1061,24 +1343,24 @@ load_hard_disks(void)
             sprintf(temp, "hdd_%02i_parameters", c + 1);
             ini_section_delete_var(cat, temp);
 
-            sprintf(temp, "hdd_%02i_preide_channels", c + 1);
+            sprintf(temp, "hdd_%02i_mfm_channel", c + 1);
             ini_section_delete_var(cat, temp);
 
-            sprintf(temp, "hdd_%02i_ide_channels", c + 1);
+            sprintf(temp, "hdd_%02i_xta_channel", c + 1);
             ini_section_delete_var(cat, temp);
 
-            sprintf(temp, "hdd_%02i_scsi_id", c + 1);
+            sprintf(temp, "hdd_%02i_esdi_channel", c + 1);
+            ini_section_delete_var(cat, temp);
+
+            sprintf(temp, "hdd_%02i_ide_channel", c + 1);
+            ini_section_delete_var(cat, temp);
+
+            sprintf(temp, "hdd_%02i_scsi_location", c + 1);
             ini_section_delete_var(cat, temp);
 
             sprintf(temp, "hdd_%02i_fn", c + 1);
             ini_section_delete_var(cat, temp);
         }
-
-        sprintf(temp, "hdd_%02i_mfm_channel", c + 1);
-        ini_section_delete_var(cat, temp);
-
-        sprintf(temp, "hdd_%02i_ide_channel", c + 1);
-        ini_section_delete_var(cat, temp);
     }
 }
 
@@ -1094,16 +1376,28 @@ load_floppy_and_cdrom_drives(void)
     unsigned int  board = 0;
     unsigned int  dev = 0;
     int           c;
-    int           d = 0;
+    int           d;
+    int           count = cdrom_get_type_count();
 
     memset(temp, 0x00, sizeof(temp));
     for (c = 0; c < FDD_NUM; c++) {
         sprintf(temp, "fdd_%02i_type", c + 1);
         p = ini_section_get_string(cat, temp, (c < 2) ? "525_2dd" : "none");
-        fdd_set_type(c, fdd_get_from_internal_name(p));
+        if (!strcmp(p, "525_2hd_ps2"))
+            d = fdd_get_from_internal_name("525_2hd");
+        else if (!strcmp(p, "35_2hd_ps2"))
+            d = fdd_get_from_internal_name("35_2hd");
+        else
+            d = fdd_get_from_internal_name(p);
+        fdd_set_type(c, d);
         if (fdd_get_type(c) > 13)
             fdd_set_type(c, 13);
 
+        sprintf(temp, "fdd_%02i_writeprot", c + 1);
+        ui_writeprot[c] = !!ini_section_get_int(cat, temp, 0);
+        if (ui_writeprot[c] == 0)
+            ini_section_delete_var(cat, temp);
+
         sprintf(temp, "fdd_%02i_fn", c + 1);
         p = ini_section_get_string(cat, temp, "");
 
@@ -1111,22 +1405,14 @@ load_floppy_and_cdrom_drives(void)
             p[0] = 0x00;
 
         if (p[0] != 0x00) {
-            if (path_abs(p)) {
-                if (strlen(p) > 511)
-                    fatal("load_floppy_and_cdrom_drives(): strlen(p) > 511 (floppyfns[%i])\n", c);
-                else
-                    strncpy(floppyfns[c], p, 511);
-            } else
-                path_append_filename(floppyfns[c], usr_path, p);
-            path_normalize(floppyfns[c]);
+            if (load_image_file(floppyfns[c], p, (uint8_t *) &(ui_writeprot[c])))
+                fatal("Configuration: Length of fdd_%02i_fn is more than 511\n", c + 1);
         }
 
 #if defined(ENABLE_CONFIG_LOG) && (ENABLE_CONFIG_LOG == 2)
         if (*p != '\0')
             config_log("Floppy%d: %ls\n", c, floppyfns[c]);
 #endif
-        sprintf(temp, "fdd_%02i_writeprot", c + 1);
-        ui_writeprot[c] = !!ini_section_get_int(cat, temp, 0);
         sprintf(temp, "fdd_%02i_turbo", c + 1);
         fdd_set_turbo(c, !!ini_section_get_int(cat, temp, 0));
         sprintf(temp, "fdd_%02i_check_bpb", c + 1);
@@ -1142,10 +1428,6 @@ load_floppy_and_cdrom_drives(void)
             sprintf(temp, "fdd_%02i_fn", c + 1);
             ini_section_delete_var(cat, temp);
         }
-        if (ui_writeprot[c] == 0) {
-            sprintf(temp, "fdd_%02i_writeprot", c + 1);
-            ini_section_delete_var(cat, temp);
-        }
         if (fdd_get_turbo(c) == 0) {
             sprintf(temp, "fdd_%02i_turbo", c + 1);
             ini_section_delete_var(cat, temp);
@@ -1159,16 +1441,9 @@ load_floppy_and_cdrom_drives(void)
             sprintf(temp, "fdd_%02i_image_history_%02i", c + 1, i + 1);
             p = ini_section_get_string(cat, temp, NULL);
             if (p) {
-                if (path_abs(p)) {
-                    if (strlen(p) > (MAX_IMAGE_PATH_LEN - 1))
-                        fatal("load_floppy_and_cdrom_drives(): strlen(p) > 2047 "
-                              "(fdd_image_history[%i][%i])\n", c, i);
-                    else
-                        snprintf(fdd_image_history[c][i], (MAX_IMAGE_PATH_LEN - 1), "%s", p);
-                } else
-                    snprintf(fdd_image_history[c][i], (MAX_IMAGE_PATH_LEN - 1), "%s%s%s", usr_path,
-                             path_get_slash(usr_path), p);
-                path_normalize(fdd_image_history[c][i]);
+                if (load_image_file(fdd_image_history[c][i], p, NULL))
+                    fatal("Configuration: Length of fdd_%02i_image_history_%02i is more "
+                          "than %i\n", c + 1, i + 1, MAX_IMAGE_PATH_LEN - 1);
             }
         }
     }
@@ -1176,10 +1451,10 @@ load_floppy_and_cdrom_drives(void)
     memset(temp, 0x00, sizeof(temp));
     for (c = 0; c < CDROM_NUM; c++) {
         sprintf(temp, "cdrom_%02i_host_drive", c + 1);
-        cdrom[c].host_drive      = ini_section_get_int(cat, temp, 0);
-        cdrom[c].prev_host_drive = cdrom[c].host_drive;
+        ini_section_delete_var(cat, temp);
 
         sprintf(temp, "cdrom_%02i_parameters", c + 1);
+        d = 0;
         p = ini_section_get_string(cat, temp, NULL);
         if (p != NULL)
             sscanf(p, "%01u, %s", &d, s);
@@ -1194,19 +1469,44 @@ load_floppy_and_cdrom_drives(void)
         sprintf(temp, "cdrom_%02i_speed", c + 1);
         cdrom[c].speed = ini_section_get_int(cat, temp, 8);
 
+        sprintf(temp, "cdrom_%02i_no_check", c + 1);
+        cdrom[c].no_check = ini_section_get_int(cat, temp, 0);
+
         sprintf(temp, "cdrom_%02i_type", c + 1);
-        p = ini_section_get_string(cat, temp, (c == 1) ? "86BOX_CD-ROM_1.00" : "none");
-        cdrom_set_type(c, cdrom_get_from_internal_name(p));
-        if (cdrom_get_type(c) > KNOWN_CDROM_DRIVE_TYPES)
-            cdrom_set_type(c, KNOWN_CDROM_DRIVE_TYPES);
-        ini_section_delete_var(cat, temp);
+        p = ini_section_get_string(cat, temp, cdrom[c].bus_type == CDROM_BUS_MKE ? "cr563" : "86cd");
+        /* TODO: Configuration migration, remove when no longer needed. */
+        int cdrom_type = cdrom_get_from_internal_name(p);
+        if (cdrom_type == -1) {
+            cdrom_type = cdrom_get_from_name(p);
+            if (cdrom_type == -1)
+                cdrom_set_type(c, cdrom_get_from_internal_name("86cd"));
+            else
+                cdrom_set_type(c, cdrom_type);
+        } else
+            cdrom_set_type(c, cdrom_type);
+        if (cdrom_get_type(c) >= count)
+            cdrom_set_type(c, count - 1);
+        if (!strcmp(p, "86cd"))
+            ini_section_delete_var(cat, temp);
 
         /* Default values, needed for proper operation of the Settings dialog. */
-        cdrom[c].ide_channel = cdrom[c].scsi_device_id = c + 2;
+        cdrom[c].mke_channel = cdrom[c].ide_channel = cdrom[c].scsi_device_id = c & 3;
 
-        if (cdrom[c].bus_type == CDROM_BUS_ATAPI) {
+        if (cdrom[c].bus_type == CDROM_BUS_MKE) {
+            char *type = cdrom_get_internal_name(cdrom_get_type(c));
+
+            if (strstr(type, "cr56") == NULL)
+                cdrom_set_type(c, cdrom_get_from_internal_name("cr563_075"));
+
+            sprintf(temp, "cdrom_%02i_mke_channel", c + 1);
+            cdrom[c].mke_channel = ini_section_get_int(cat, temp, c & 3);
+
+            if (cdrom[c].mke_channel > 3)
+                cdrom[c].mke_channel = 3;
+
+        } else if (cdrom[c].bus_type == CDROM_BUS_ATAPI) {
             sprintf(temp, "cdrom_%02i_ide_channel", c + 1);
-            sprintf(tmp2, "%01u:%01u", (c + 2) >> 1, (c + 2) & 1);
+            sprintf(tmp2, "%01u:%01u", (c & 3) >> 1, (c & 3) & 1);
             p = ini_section_get_string(cat, temp, tmp2);
             sscanf(p, "%01u:%01u", &board, &dev);
             board &= 3;
@@ -1217,13 +1517,13 @@ load_floppy_and_cdrom_drives(void)
                 cdrom[c].ide_channel = 7;
         } else if (cdrom[c].bus_type == CDROM_BUS_SCSI) {
             sprintf(temp, "cdrom_%02i_scsi_location", c + 1);
-            sprintf(tmp2, "%01u:%02u", SCSI_BUS_MAX, c + 2);
+            sprintf(tmp2, "%01u:%02u", SCSI_BUS_MAX, c & 3);
             p = ini_section_get_string(cat, temp, tmp2);
             sscanf(p, "%01u:%02u", &board, &dev);
             if (board >= SCSI_BUS_MAX) {
                 /* Invalid bus - check legacy ID */
                 sprintf(temp, "cdrom_%02i_scsi_id", c + 1);
-                cdrom[c].scsi_device_id = ini_section_get_int(cat, temp, c + 2);
+                cdrom[c].scsi_device_id = ini_section_get_int(cat, temp, c & 3);
 
                 if (cdrom[c].scsi_device_id > 15)
                     cdrom[c].scsi_device_id = 15;
@@ -1234,6 +1534,11 @@ load_floppy_and_cdrom_drives(void)
             }
         }
 
+        if (cdrom[c].bus_type != CDROM_BUS_MKE) {
+            sprintf(temp, "cdrom_%02i_mke_channel", c + 1);
+            ini_section_delete_var(cat, temp);
+        }
+
         if (cdrom[c].bus_type != CDROM_BUS_ATAPI) {
             sprintf(temp, "cdrom_%02i_ide_channel", c + 1);
             ini_section_delete_var(cat, temp);
@@ -1256,7 +1561,7 @@ load_floppy_and_cdrom_drives(void)
         if (p[0] != 0x00) {
             if (path_abs(p)) {
                 if (strlen(p) > 511)
-                    fatal("load_floppy_and_cdrom_drives(): strlen(p) > 511 (cdrom[%i].image_path)\n", c);
+                    fatal("Configuration: Length of cdrom_%02i_image_path is more than 511\n", c + 1);
                 else
                     strncpy(cdrom[c].image_path, p, 511);
             } else
@@ -1264,12 +1569,6 @@ load_floppy_and_cdrom_drives(void)
             path_normalize(cdrom[c].image_path);
         }
 
-        if (cdrom[c].host_drive && (cdrom[c].host_drive != 200))
-            cdrom[c].host_drive = 0;
-
-        if ((cdrom[c].host_drive == 0x200) && (strlen(cdrom[c].image_path) == 0))
-            cdrom[c].host_drive = 0;
-
         for (int i = 0; i < MAX_PREV_IMAGES; i++) {
             cdrom[c].image_history[i] = (char *) calloc((MAX_IMAGE_PATH_LEN + 1) << 1, sizeof(char));
             sprintf(temp, "cdrom_%02i_image_history_%02i", c + 1, i + 1);
@@ -1277,12 +1576,12 @@ load_floppy_and_cdrom_drives(void)
             if (p) {
                 if (path_abs(p)) {
                     if (strlen(p) > (MAX_IMAGE_PATH_LEN - 1))
-                        fatal("load_floppy_and_cdrom_drives(): strlen(p) > 2047 "
-                              "(cdrom[%i].image_history[%i])\n", c, i);
+                        fatal("Configuration: Length of cdrom_%02i_image_history_%02i is more "
+                              "than %i\n", c + 1, i + 1, MAX_IMAGE_PATH_LEN - 1);
                     else
-                        snprintf(cdrom[c].image_history[i], (MAX_IMAGE_PATH_LEN - 1), "%s", p);
+                        snprintf(cdrom[c].image_history[i], MAX_IMAGE_PATH_LEN, "%s", p);
                 } else
-                    snprintf(cdrom[c].image_history[i], (MAX_IMAGE_PATH_LEN - 1), "%s%s%s", usr_path,
+                    snprintf(cdrom[c].image_history[i], MAX_IMAGE_PATH_LEN, "%s%s%s", usr_path,
                              path_get_slash(usr_path), p);
                 path_normalize(cdrom[c].image_history[i]);
             }
@@ -1290,16 +1589,19 @@ load_floppy_and_cdrom_drives(void)
 
         /* If the CD-ROM is disabled, delete all its variables. */
         if (cdrom[c].bus_type == CDROM_BUS_DISABLED) {
-            sprintf(temp, "cdrom_%02i_host_drive", c + 1);
+            sprintf(temp, "cdrom_%02i_parameters", c + 1);
             ini_section_delete_var(cat, temp);
 
-            sprintf(temp, "cdrom_%02i_parameters", c + 1);
+            sprintf(temp, "cdrom_%02i_speed", c + 1);
+            ini_section_delete_var(cat, temp);
+
+            sprintf(temp, "cdrom_%02i_type", c + 1);
             ini_section_delete_var(cat, temp);
 
             sprintf(temp, "cdrom_%02i_ide_channel", c + 1);
             ini_section_delete_var(cat, temp);
 
-            sprintf(temp, "cdrom_%02i_scsi_id", c + 1);
+            sprintf(temp, "cdrom_%02i_scsi_location", c + 1);
             ini_section_delete_var(cat, temp);
 
             sprintf(temp, "cdrom_%02i_image_path", c + 1);
@@ -1328,32 +1630,35 @@ load_other_removable_devices(void)
     unsigned int  board = 0;
     unsigned int  dev = 0;
     int           c;
+    int           legacy_zip_drives = 0;
 
     memset(temp, 0x00, sizeof(temp));
-    for (c = 0; c < ZIP_NUM; c++) {
+    for (c = 0; c < RDISK_NUM; c++) {
         sprintf(temp, "zip_%02i_parameters", c + 1);
         p = ini_section_get_string(cat, temp, NULL);
-        if (p != NULL)
-            sscanf(p, "%01u, %s", &zip_drives[c].is_250, s);
-        else
-            sscanf("0, none", "%01u, %s", &zip_drives[c].is_250, s);
-        zip_drives[c].bus_type = hdd_string_to_bus(s, 1);
+        if (p != NULL) {
+            sscanf(p, "%01u, %s", &rdisk_drives[c].type, s);
+            legacy_zip_drives++;
+        } else
+            sscanf("0, none", "%01u, %s", &rdisk_drives[c].type, s);
+        rdisk_drives[c].type++;
+        rdisk_drives[c].bus_type = hdd_string_to_bus(s, 1);
 
         /* Default values, needed for proper operation of the Settings dialog. */
-        zip_drives[c].ide_channel = zip_drives[c].scsi_device_id = c + 2;
+        rdisk_drives[c].ide_channel = rdisk_drives[c].scsi_device_id = c + 2;
 
-        if (zip_drives[c].bus_type == ZIP_BUS_ATAPI) {
+        if (rdisk_drives[c].bus_type == RDISK_BUS_ATAPI) {
             sprintf(temp, "zip_%02i_ide_channel", c + 1);
             sprintf(tmp2, "%01u:%01u", (c + 2) >> 1, (c + 2) & 1);
             p = ini_section_get_string(cat, temp, tmp2);
             sscanf(p, "%01u:%01u", &board, &dev);
             board &= 3;
             dev &= 1;
-            zip_drives[c].ide_channel = (board << 1) + dev;
+            rdisk_drives[c].ide_channel = (board << 1) + dev;
 
-            if (zip_drives[c].ide_channel > 7)
-                zip_drives[c].ide_channel = 7;
-        } else if (zip_drives[c].bus_type == ZIP_BUS_SCSI) {
+            if (rdisk_drives[c].ide_channel > 7)
+                rdisk_drives[c].ide_channel = 7;
+        } else if (rdisk_drives[c].bus_type == RDISK_BUS_SCSI) {
             sprintf(temp, "zip_%02i_scsi_location", c + 1);
             sprintf(tmp2, "%01u:%02u", SCSI_BUS_MAX, c + 2);
             p = ini_section_get_string(cat, temp, tmp2);
@@ -1361,23 +1666,23 @@ load_other_removable_devices(void)
             if (board >= SCSI_BUS_MAX) {
                 /* Invalid bus - check legacy ID */
                 sprintf(temp, "zip_%02i_scsi_id", c + 1);
-                zip_drives[c].scsi_device_id = ini_section_get_int(cat, temp, c + 2);
+                rdisk_drives[c].scsi_device_id = ini_section_get_int(cat, temp, c + 2);
 
-                if (zip_drives[c].scsi_device_id > 15)
-                    zip_drives[c].scsi_device_id = 15;
+                if (rdisk_drives[c].scsi_device_id > 15)
+                    rdisk_drives[c].scsi_device_id = 15;
             } else {
                 board %= SCSI_BUS_MAX;
                 dev &= 15;
-                zip_drives[c].scsi_device_id = (board << 4) + dev;
+                rdisk_drives[c].scsi_device_id = (board << 4) + dev;
             }
         }
 
-        if (zip_drives[c].bus_type != ZIP_BUS_ATAPI) {
+        if (rdisk_drives[c].bus_type != RDISK_BUS_ATAPI) {
             sprintf(temp, "zip_%02i_ide_channel", c + 1);
             ini_section_delete_var(cat, temp);
         }
 
-        if (zip_drives[c].bus_type != ZIP_BUS_SCSI) {
+        if (rdisk_drives[c].bus_type != RDISK_BUS_SCSI) {
             sprintf(temp, "zip_%02i_scsi_location", c + 1);
             ini_section_delete_var(cat, temp);
         }
@@ -1388,63 +1693,155 @@ load_other_removable_devices(void)
         sprintf(temp, "zip_%02i_image_path", c + 1);
         p = ini_section_get_string(cat, temp, "");
 
+        sprintf(temp, "zip_%02i_writeprot", c + 1);
+        rdisk_drives[c].read_only =  ini_section_get_int(cat, temp, 0);
+        ini_section_delete_var(cat, temp);
+
         if (!strcmp(p, usr_path))
             p[0] = 0x00;
 
         if (p[0] != 0x00) {
-            if (path_abs(p)) {
-                if (strlen(p) > 511)
-                    fatal("load_other_removable_devices(): strlen(p) > 511 (zip_drives[%i].image_path)\n",
-                          c);
-                else
-                    strncpy(zip_drives[c].image_path, p, 511);
-            } else
-                path_append_filename(zip_drives[c].image_path, usr_path, p);
-            path_normalize(zip_drives[c].image_path);
+            if (load_image_file(rdisk_drives[c].image_path, p, &(rdisk_drives[c].read_only)))
+                fatal("Configuration: Length of zip_%02i_image_path is more than 511\n", c + 1);
         }
 
         for (int i = 0; i < MAX_PREV_IMAGES; i++) {
-            zip_drives[c].image_history[i] = (char *) calloc((MAX_IMAGE_PATH_LEN + 1) << 1, sizeof(char));
+            rdisk_drives[c].image_history[i] = (char *) calloc((MAX_IMAGE_PATH_LEN + 1) << 1, sizeof(char));
             sprintf(temp, "zip_%02i_image_history_%02i", c + 1, i + 1);
             p = ini_section_get_string(cat, temp, NULL);
             if (p) {
-                if (path_abs(p)) {
-                    if (strlen(p) > (MAX_IMAGE_PATH_LEN - 1))
-                        fatal("load_other_removable_devices(): strlen(p) > 2047 "
-                              "(zip_drives[%i].image_history[%i])\n", c, i);
-                    else
-                        snprintf(zip_drives[c].image_history[i], (MAX_IMAGE_PATH_LEN - 1), "%s", p);
-                } else
-                    snprintf(zip_drives[c].image_history[i], (MAX_IMAGE_PATH_LEN - 1), "%s%s%s", usr_path,
-                             path_get_slash(usr_path), p);
-                path_normalize(zip_drives[c].image_history[i]);
+                if (load_image_file(rdisk_drives[c].image_history[i], p, NULL))
+                    fatal("Configuration: Length of zip_%02i_image_history_%02i is more than %i\n",
+                          c + 1, i + 1, MAX_IMAGE_PATH_LEN - 1);
             }
         }
 
-        /* If the ZIP drive is disabled, delete all its variables. */
-        if (zip_drives[c].bus_type == ZIP_BUS_DISABLED) {
-            sprintf(temp, "zip_%02i_host_drive", c + 1);
+        sprintf(temp, "zip_%02i_parameters", c + 1);
+        ini_section_delete_var(cat, temp);
+
+        sprintf(temp, "zip_%02i_ide_channel", c + 1);
+        ini_section_delete_var(cat, temp);
+
+        sprintf(temp, "zip_%02i_scsi_location", c + 1);
+        ini_section_delete_var(cat, temp);
+
+        sprintf(temp, "zip_%02i_image_path", c + 1);
+        ini_section_delete_var(cat, temp);
+
+        for (int i = 0; i < MAX_PREV_IMAGES; i++) {
+            sprintf(temp, "zip_%02i_image_history_%02i", c + 1, i + 1);
+            ini_section_delete_var(cat, temp);
+        }
+    }
+
+    if (legacy_zip_drives > 0)
+        goto go_to_mo;
+
+    memset(temp, 0x00, sizeof(temp));
+    for (c = 0; c < RDISK_NUM; c++) {
+        sprintf(temp, "rdisk_%02i_parameters", c + 1);
+        p = ini_section_get_string(cat, temp, NULL);
+        if (p != NULL) {
+            sscanf(p, "%01u, %s", &rdisk_drives[c].type, s);
+            legacy_zip_drives++;
+        } else
+            sscanf("0, none", "%01u, %s", &rdisk_drives[c].type, s);
+        rdisk_drives[c].bus_type = hdd_string_to_bus(s, 1);
+
+        /* Default values, needed for proper operation of the Settings dialog. */
+        rdisk_drives[c].ide_channel = rdisk_drives[c].scsi_device_id = c + 2;
+
+        if (rdisk_drives[c].bus_type == RDISK_BUS_ATAPI) {
+            sprintf(temp, "rdisk_%02i_ide_channel", c + 1);
+            sprintf(tmp2, "%01u:%01u", (c + 2) >> 1, (c + 2) & 1);
+            p = ini_section_get_string(cat, temp, tmp2);
+            sscanf(p, "%01u:%01u", &board, &dev);
+            board &= 3;
+            dev &= 1;
+            rdisk_drives[c].ide_channel = (board << 1) + dev;
+
+            if (rdisk_drives[c].ide_channel > 7)
+                rdisk_drives[c].ide_channel = 7;
+        } else if (rdisk_drives[c].bus_type == RDISK_BUS_SCSI) {
+            sprintf(temp, "rdisk_%02i_scsi_location", c + 1);
+            sprintf(tmp2, "%01u:%02u", SCSI_BUS_MAX, c + 2);
+            p = ini_section_get_string(cat, temp, tmp2);
+            sscanf(p, "%01u:%02u", &board, &dev);
+            if (board >= SCSI_BUS_MAX) {
+                /* Invalid bus - check legacy ID */
+                sprintf(temp, "rdisk_%02i_scsi_id", c + 1);
+                rdisk_drives[c].scsi_device_id = ini_section_get_int(cat, temp, c + 2);
+
+                if (rdisk_drives[c].scsi_device_id > 15)
+                    rdisk_drives[c].scsi_device_id = 15;
+            } else {
+                board %= SCSI_BUS_MAX;
+                dev &= 15;
+                rdisk_drives[c].scsi_device_id = (board << 4) + dev;
+            }
+        }
+
+        if (rdisk_drives[c].bus_type != RDISK_BUS_ATAPI) {
+            sprintf(temp, "rdisk_%02i_ide_channel", c + 1);
+            ini_section_delete_var(cat, temp);
+        }
+
+        if (rdisk_drives[c].bus_type != RDISK_BUS_SCSI) {
+            sprintf(temp, "rdisk_%02i_scsi_location", c + 1);
+            ini_section_delete_var(cat, temp);
+        }
+
+        sprintf(temp, "rdisk_%02i_scsi_id", c + 1);
+        ini_section_delete_var(cat, temp);
+
+        sprintf(temp, "rdisk_%02i_image_path", c + 1);
+        p = ini_section_get_string(cat, temp, "");
+
+        sprintf(temp, "rdisk_%02i_writeprot", c + 1);
+        rdisk_drives[c].read_only =  ini_section_get_int(cat, temp, 0);
+        ini_section_delete_var(cat, temp);
+
+        if (!strcmp(p, usr_path))
+            p[0] = 0x00;
+
+        if (p[0] != 0x00) {
+            if (load_image_file(rdisk_drives[c].image_path, p, &(rdisk_drives[c].read_only)))
+                fatal("Configuration: Length of rdisk_%02i_image_path is more than 511\n", c + 1);
+        }
+
+        for (int i = 0; i < MAX_PREV_IMAGES; i++) {
+            rdisk_drives[c].image_history[i] = (char *) calloc((MAX_IMAGE_PATH_LEN + 1) << 1, sizeof(char));
+            sprintf(temp, "rdisk_%02i_image_history_%02i", c + 1, i + 1);
+            p = ini_section_get_string(cat, temp, NULL);
+            if (p) {
+                if (load_image_file(rdisk_drives[c].image_history[i], p, NULL))
+                    fatal("Configuration: Length of rdisk_%02i_image_history_%02i is more than %i\n",
+                          c + 1, i + 1, MAX_IMAGE_PATH_LEN - 1);
+            }
+        }
+
+        /* If the removable disk drive is disabled, delete all its variables. */
+        if (rdisk_drives[c].bus_type == RDISK_BUS_DISABLED) {
+            sprintf(temp, "rdisk_%02i_parameters", c + 1);
             ini_section_delete_var(cat, temp);
 
-            sprintf(temp, "zip_%02i_parameters", c + 1);
+            sprintf(temp, "rdisk_%02i_ide_channel", c + 1);
             ini_section_delete_var(cat, temp);
 
-            sprintf(temp, "zip_%02i_ide_channel", c + 1);
+            sprintf(temp, "rdisk_%02i_scsi_location", c + 1);
             ini_section_delete_var(cat, temp);
 
-            sprintf(temp, "zip_%02i_scsi_id", c + 1);
-            ini_section_delete_var(cat, temp);
-
-            sprintf(temp, "zip_%02i_image_path", c + 1);
+            sprintf(temp, "rdisk_%02i_image_path", c + 1);
             ini_section_delete_var(cat, temp);
 
             for (int i = 0; i < MAX_PREV_IMAGES; i++) {
-                sprintf(temp, "zip_%02i_image_history_%02i", c + 1, i + 1);
+                sprintf(temp, "rdisk_%02i_image_history_%02i", c + 1, i + 1);
                 ini_section_delete_var(cat, temp);
             }
         }
     }
 
+go_to_mo:
     memset(temp, 0x00, sizeof(temp));
     for (c = 0; c < MO_NUM; c++) {
         sprintf(temp, "mo_%02i_parameters", c + 1);
@@ -1504,19 +1901,16 @@ load_other_removable_devices(void)
         sprintf(temp, "mo_%02i_image_path", c + 1);
         p = ini_section_get_string(cat, temp, "");
 
+        sprintf(temp, "mo_%02i_writeprot", c + 1);
+        mo_drives[c].read_only = ini_section_get_int(cat, temp, 0);
+        ini_section_delete_var(cat, temp);
+
         if (!strcmp(p, usr_path))
             p[0] = 0x00;
 
         if (p[0] != 0x00) {
-            if (path_abs(p)) {
-                if (strlen(p) > 511)
-                    fatal("load_other_removable_devices(): strlen(p) > 511 (mo_drives[%i].image_path)\n",
-                          c);
-                else
-                    strncpy(mo_drives[c].image_path, p, 511);
-            } else
-                path_append_filename(mo_drives[c].image_path, usr_path, p);
-            path_normalize(mo_drives[c].image_path);
+            if (load_image_file(mo_drives[c].image_path, p, &(mo_drives[c].read_only)))
+                fatal("Configuration: Length of mo_%02i_image_path is more than 511\n", c + 1);
         }
 
         for (int i = 0; i < MAX_PREV_IMAGES; i++) {
@@ -1524,31 +1918,21 @@ load_other_removable_devices(void)
             sprintf(temp, "mo_%02i_image_history_%02i", c + 1, i + 1);
             p = ini_section_get_string(cat, temp, NULL);
             if (p) {
-                if (path_abs(p)) {
-                    if (strlen(p) > (MAX_IMAGE_PATH_LEN - 1))
-                        fatal("load_other_removable_devices(): strlen(p) > 2047 "
-                              "(mo_drives[%i].image_history[%i])\n", c, i);
-                    else
-                        snprintf(mo_drives[c].image_history[i], (MAX_IMAGE_PATH_LEN - 1), "%s", p);
-                } else
-                    snprintf(mo_drives[c].image_history[i], (MAX_IMAGE_PATH_LEN - 1), "%s%s%s", usr_path,
-                             path_get_slash(usr_path), p);
-                path_normalize(mo_drives[c].image_history[i]);
+                if (load_image_file(mo_drives[c].image_history[i], p, NULL))
+                    fatal("Configuration: Length of mo_%02i_image_history_%02i is more than %i\n",
+                          c + 1, i + 1, MAX_IMAGE_PATH_LEN - 1);
             }
         }
 
         /* If the MO drive is disabled, delete all its variables. */
         if (mo_drives[c].bus_type == MO_BUS_DISABLED) {
-            sprintf(temp, "mo_%02i_host_drive", c + 1);
-            ini_section_delete_var(cat, temp);
-
             sprintf(temp, "mo_%02i_parameters", c + 1);
             ini_section_delete_var(cat, temp);
 
             sprintf(temp, "mo_%02i_ide_channel", c + 1);
             ini_section_delete_var(cat, temp);
 
-            sprintf(temp, "mo_%02i_scsi_id", c + 1);
+            sprintf(temp, "mo_%02i_scsi_location", c + 1);
             ini_section_delete_var(cat, temp);
 
             sprintf(temp, "mo_%02i_image_path", c + 1);
@@ -1570,19 +1954,152 @@ load_other_peripherals(void)
     char         *p;
     char          temp[512];
 
-    bugger_enabled     = !!ini_section_get_int(cat, "bugger_enabled", 0);
-    postcard_enabled   = !!ini_section_get_int(cat, "postcard_enabled", 0);
-    unittester_enabled = !!ini_section_get_int(cat, "unittester_enabled", 0);
+    bugger_enabled         = !!ini_section_get_int(cat, "bugger_enabled", 0);
+    postcard_enabled       = !!ini_section_get_int(cat, "postcard_enabled", 0);
+    unittester_enabled     = !!ini_section_get_int(cat, "unittester_enabled", 0);
+    novell_keycard_enabled = !!ini_section_get_int(cat, "novell_keycard_enabled", 0);
 
+    if (!bugger_enabled)
+        ini_section_delete_var(cat, "bugger_enabled");
+
+    if (!postcard_enabled)
+        ini_section_delete_var(cat, "postcard_enabled");
+
+    if (!unittester_enabled)
+        ini_section_delete_var(cat, "unittester_enabled");
+
+    if (!novell_keycard_enabled)
+        ini_section_delete_var(cat, "novell_keycard_enabled");
+
+    // ISA RAM Boards
     for (uint8_t c = 0; c < ISAMEM_MAX; c++) {
         sprintf(temp, "isamem%d_type", c);
 
         p              = ini_section_get_string(cat, temp, "none");
         isamem_type[c] = isamem_get_from_internal_name(p);
+
+        if (!strcmp(p, "none"))
+            ini_section_delete_var(cat, temp);
+    }
+
+    // ISA ROM Boards
+    for (uint8_t c = 0; c < ISAROM_MAX; c++) {
+        sprintf(temp, "isarom%d_type", c);
+
+        p              = ini_section_get_string(cat, temp, "none");
+        isarom_type[c] = isarom_get_from_internal_name(p);
+
+        if (!strcmp(p, "none"))
+            ini_section_delete_var(cat, temp);
+    }
+
+    /* Backwards compatibility for standalone LBA Enhancer from v4.2 and older. */
+    if (ini_section_get_int(ini_find_section(config, "Storage controllers"), "lba_enhancer_enabled", 0) == 1) {
+        /* Migrate to the first available ISA ROM slot. */
+        for (uint8_t c = 0; c < ISAROM_MAX; c++) {
+            if (!isarom_type[c]) {
+                isarom_type[c] = isarom_get_from_internal_name("lba_enhancer");
+                break;
+            }
+        }
     }
 
     p           = ini_section_get_string(cat, "isartc_type", "none");
     isartc_type = isartc_get_from_internal_name(p);
+
+    if (!strcmp(p, "none"))
+        ini_section_delete_var(cat, temp);
+}
+
+#ifndef USE_SDL_UI
+/* Load OpenGL 3.0 renderer options. */
+static void
+load_gl3_shaders(void)
+{
+    ini_section_t cat = ini_find_section(config, "GL3 Shaders");
+    char         *p;
+    char          temp[512];
+    int           i = 0, shaders = 0;
+    memset(temp, 0, sizeof(temp));
+    memset(gl3_shader_file, 0, sizeof(gl3_shader_file));
+
+    shaders = ini_section_get_int(cat, "shaders", 0);
+    if (shaders > MAX_USER_SHADERS)
+        shaders = MAX_USER_SHADERS;
+
+    if (shaders == 0) {
+        ini_section_t general = ini_find_section(config, "General");
+        if (general) {
+            p = ini_section_get_string(general, "video_gl_shader", NULL);
+            if (p) {
+                if (strlen(p) > 511)
+                    fatal("Configuration: Length of video_gl_shadr is more than 511\n");
+                else
+                    strncpy(gl3_shader_file[0], p, 511);
+                ini_delete_var(config, general, "video_gl_shader");
+                return;
+            }
+        }
+    }
+
+    for (i = 0; i < shaders; i++) {
+        temp[0] = 0;
+        snprintf(temp, 512, "shader%d", i);
+        p = ini_section_get_string(cat, temp, "");
+        if (p[0]) {
+            strncpy(gl3_shader_file[i], p, 512);
+        } else {
+            gl3_shader_file[i][0] = 0;
+            break;
+        }
+    }
+}
+#endif
+
+/* Load "Keybinds" section. */
+static void
+load_keybinds(void)
+{
+    ini_section_t cat = ini_find_section(config, "Keybinds");
+    char         *p;
+    char          temp[512];
+    memset(temp, 0, sizeof(temp));
+
+    /* Now load values from config */
+    for (int x = 0; x < NUM_ACCELS; x++) {
+         p = ini_section_get_string(cat, acc_keys[x].name, "default");
+         /* Check if the binding was marked as cleared */
+         if (strcmp(p, "none") == 0)
+             acc_keys[x].seq[0] = '\0';
+         /* If there's no binding in the file, leave it alone. */
+         else if (strcmp(p, "default") != 0) {
+             /*
+                It would be ideal to validate whether the user entered a
+                valid combo at this point, but the Qt method for testing that is
+                not available from C. Fortunately, if you feed Qt an invalid
+                keysequence string it just assigns nothing, so this won't blow up.
+                However, to improve the user experience, we should validate keys
+                and erase any bad combos from config on mainwindow load.
+              */
+             strcpy(acc_keys[x].seq, p);
+        }
+    }
+}
+
+void
+config_load_global(void)
+{
+    config_log("Loading global config file '%s'...\n", global_cfg_path);
+
+    global = ini_read(global_cfg_path);
+
+    if (global == NULL) {
+        global = ini_new();
+
+        config_log("Global config file not present or invalid!\n");
+    }
+
+    load_global();
 }
 
 /* Load the specified or a default configuration file. */
@@ -1592,44 +2109,54 @@ config_load(void)
     int           i;
     ini_section_t c;
 
-    config_log("Loading config file '%s'..\n", cfg_path);
+    config_log("Loading VM config file '%s'...\n", cfg_path);
 
     memset(hdd, 0, sizeof(hard_disk_t));
     memset(cdrom, 0, sizeof(cdrom_t) * CDROM_NUM);
 #ifdef USE_IOCTL
     memset(cdrom_ioctl, 0, sizeof(cdrom_ioctl_t) * CDROM_NUM);
 #endif
-    memset(zip_drives, 0, sizeof(zip_drive_t));
+    memset(rdisk_drives, 0, sizeof(rdisk_drive_t));
+
+    for (int i = 0; i < 768; i++)
+        scancode_config_map[i] = i;
 
     config = ini_read(cfg_path);
 
-    if (!config) {
-        config         = ini_new();
-        config_changed = 1;
+    if (config == NULL) {
+        config = ini_new();
 
         cpu_f = (cpu_family_t *) &cpu_families[0];
         cpu   = 0;
 
-        kbd_req_capture = 0;
-        hide_status_bar = 0;
-        hide_tool_bar   = 0;
-        scale           = 1;
-        machine         = machine_get_machine_from_internal_name("ibmpc");
-        dpi_scale       = 1;
-        do_auto_pause   = 0;
+        kbd_req_capture      = 0;
+        hide_status_bar      = 0;
+        hide_tool_bar        = 0;
+        scale                = 1;
+        machine              = machine_get_machine_from_internal_name("ibmpc");
+        dpi_scale            = 1;
+        do_auto_pause        = 0;
+        force_constant_mouse = 0;
+
+        cpu_override_interpreter = 0;
 
         fpu_type               = fpu_get_type(cpu_f, cpu, "none");
         gfxcard[0]             = video_get_video_from_internal_name("cga");
         vid_api                = plat_vidapi("default");
         vid_resize             = 0;
-        video_fullscreen_first = 1;
         video_fullscreen_scale = 1;
         time_sync              = TIME_SYNC_ENABLED;
-        hdc_current            = hdc_get_from_internal_name("none");
+
+        keyboard_type          = KEYBOARD_TYPE_PC_XT;
+
+        for (int i = 0; i < HDC_MAX; i++)
+            hdc_current[i]         = hdc_get_from_internal_name("none");
+
+        jumpered_internal_ecp_dma = -1;
 
         com_ports[0].enabled = 1;
         com_ports[1].enabled = 1;
-        for (i = 2; i < SERIAL_MAX; i++)
+        for (i = 2; i < (SERIAL_MAX - 1); i++)
             com_ports[i].enabled = 0;
 
         lpt_ports[0].enabled = 1;
@@ -1651,6 +2178,8 @@ config_load(void)
         cdrom[0].sound_on = 1;
         mem_size          = 64;
         isartc_type       = 0;
+        for (i = 0; i < ISAROM_MAX; i++)
+            isarom_type[i] = 0;
         for (i = 0; i < ISAMEM_MAX; i++)
             isamem_type[i] = 0;
 
@@ -1663,11 +2192,12 @@ config_load(void)
         cassette_pcm          = 0;
         cassette_ui_writeprot = 0;
 
-        config_log("Config file not present or invalid!\n");
+        config_log("VM config file not present or invalid!\n");
     } else {
         load_general();                 /* General */
         for (i = 0; i < MONITORS_NUM; i++)
             load_monitor(i);            /* Monitors */
+        load_scan_code_mappings();      /* Scan code mappings */
         load_machine();                 /* Machine */
         load_video();                   /* Video */
         load_input_devices();           /* Input devices */
@@ -1679,6 +2209,10 @@ config_load(void)
         load_floppy_and_cdrom_drives(); /* Floppy and CD-ROM drives */
         load_other_removable_devices(); /* Other removable devices */
         load_other_peripherals();       /* Other peripherals */
+#ifndef USE_SDL_UI
+        load_gl3_shaders();             /* GL3 Shaders */
+#endif
+        load_keybinds();                /* Load shortcut keybinds */
 
         /* Migrate renamed device configurations. */
         c = ini_find_section(config, "MDA");
@@ -1697,24 +2231,116 @@ config_load(void)
         if (c != NULL)
             ini_rename_section(c, "3Dfx Voodoo Banshee");
 
-        /* Mark the configuration as changed. */
-        config_changed = 1;
-
-        config_log("Config loaded.\n\n");
+        config_log("VM config loaded.\n\n");
     }
 
+    /* Mark the configuration as changed. */
+    config_changed = 1;
+
     video_copy = (video_grayscale || invert_display) ? video_transform_copy : memcpy;
 }
 
+/* Save global configuration */
+static void
+save_global(void)
+{
+    ini_section_t cat = ini_find_or_create_section(global, "");
+    char          buffer[512] = { 0 };
+
+    if (lang_id == plat_language_code(DEFAULT_LANGUAGE))
+        ini_section_delete_var(cat, "language");
+    else {
+        plat_language_code_r(lang_id, buffer, 511);
+        ini_section_set_string(cat, "language", buffer);
+    }
+
+    if (color_scheme)
+        ini_section_set_int(cat, "color_scheme", color_scheme);
+    else
+        ini_section_delete_var(cat, "color_scheme");
+
+    if (open_dir_usr_path)
+        ini_section_set_int(cat, "open_dir_usr_path", open_dir_usr_path);
+    else
+        ini_section_delete_var(cat, "open_dir_usr_path");
+
+    if (confirm_reset != 1)
+        ini_section_set_int(cat, "confirm_reset", confirm_reset);
+    else
+        ini_section_delete_var(cat, "confirm_reset");
+
+    if (confirm_exit != 1)
+        ini_section_set_int(cat, "confirm_exit", confirm_exit);
+    else
+        ini_section_delete_var(cat, "confirm_exit");
+
+    if (confirm_save != 1)
+        ini_section_set_int(cat, "confirm_save", confirm_save);
+    else
+        ini_section_delete_var(cat, "confirm_save");
+
+    if (inhibit_multimedia_keys == 1)
+        ini_section_set_int(cat, "inhibit_multimedia_keys", inhibit_multimedia_keys);
+    else
+        ini_section_delete_var(cat, "inhibit_multimedia_keys");
+
+    if (mouse_sensitivity != 1.0)
+        ini_section_set_double(cat, "mouse_sensitivity", mouse_sensitivity);
+    else
+        ini_section_delete_var(cat, "mouse_sensitivity");
+
+    if (vmm_disabled != 0)
+        ini_section_set_int(cat, "vmm_disabled", vmm_disabled);
+    else
+        ini_section_delete_var(cat, "vmm_disabled");
+
+    if (vmm_path_cfg[0] != 0) {
+        /* Save path as relative to the EXE path in portable mode */
+        if (portable_mode && path_abs(vmm_path_cfg) && !strnicmp(vmm_path_cfg, exe_path, strlen(exe_path))) {
+            ini_section_set_string(cat, "vmm_path", &vmm_path_cfg[strlen(exe_path)]);
+        } else {
+            ini_section_set_string(cat, "vmm_path", vmm_path_cfg);
+        }
+    } else {
+        ini_section_delete_var(cat, "vmm_path");
+    }
+}
+
+/* Save scan code mappings. */
+static void
+save_scan_code_mappings(void)
+{
+    ini_section_t cat = ini_find_section(config, "Scan code mappings");
+    char          temp[512];
+
+    for (int c = 0; c < 768; c++) {
+        sprintf(temp, "%03X", c);
+
+        if (scancode_config_map[c] == c)
+            ini_section_delete_var(cat, temp);
+        else
+            ini_section_set_hex12(cat, temp, scancode_config_map[c]);
+    }
+
+    ini_delete_section_if_empty(config, cat);
+}
+
 /* Save "General" section. */
 static void
 save_general(void)
 {
     ini_section_t cat = ini_find_or_create_section(config, "General");
     char          temp[512];
-    char          buffer[512] = { 0 };
 
-    const char *va_name = NULL;
+    const char *va_name;
+
+    ini_section_set_int(cat, "force_10ms", force_10ms);
+    if (force_10ms == 0)
+        ini_section_delete_var(cat, "force_10ms");
+
+    ini_section_set_int(cat, "sound_muted", sound_muted);
+    if (sound_muted == 0)
+        ini_section_delete_var(cat, "sound_muted");
 
     ini_section_set_int(cat, "vid_resize", vid_resize);
     if (vid_resize == 0)
@@ -1731,11 +2357,6 @@ save_general(void)
     else
         ini_section_set_int(cat, "video_fullscreen_scale", video_fullscreen_scale);
 
-    if (video_fullscreen_first == 1)
-        ini_section_delete_var(cat, "video_fullscreen_first");
-    else
-        ini_section_set_int(cat, "video_fullscreen_first", video_fullscreen_first);
-
     if (video_filter_method == 1)
         ini_section_delete_var(cat, "video_filter_method");
     else
@@ -1791,6 +2412,11 @@ save_general(void)
     else
         ini_section_delete_var(cat, "window_remember");
 
+    if (video_fullscreen)
+        ini_section_set_int(cat, "start_in_fullscreen", video_fullscreen);
+    else
+        ini_section_delete_var(cat, "start_in_fullscreen");
+
     if (vid_resize & 2) {
         sprintf(temp, "%ix%i", fixed_size_x, fixed_size_y);
         ini_section_set_string(cat, "window_fixed_res", temp);
@@ -1817,53 +2443,11 @@ save_general(void)
     else
         ini_section_delete_var(cat, "hide_tool_bar");
 
-    if (confirm_reset != 1)
-        ini_section_set_int(cat, "confirm_reset", confirm_reset);
-    else
-        ini_section_delete_var(cat, "confirm_reset");
-
-    if (confirm_exit != 1)
-        ini_section_set_int(cat, "confirm_exit", confirm_exit);
-    else
-        ini_section_delete_var(cat, "confirm_exit");
-
-    if (confirm_save != 1)
-        ini_section_set_int(cat, "confirm_save", confirm_save);
-    else
-        ini_section_delete_var(cat, "confirm_save");
-
-    if (mouse_sensitivity != 1.0)
-        ini_section_set_double(cat, "mouse_sensitivity", mouse_sensitivity);
-    else
-        ini_section_delete_var(cat, "mouse_sensitivity");
-
-    if (lang_id == DEFAULT_LANGUAGE)
-        ini_section_delete_var(cat, "language");
-    else {
-        plat_language_code_r(lang_id, buffer, 511);
-        ini_section_set_string(cat, "language", buffer);
-    }
-
-    if (!strcmp(icon_set, ""))
-        ini_section_delete_var(cat, "iconset");
-    else
-        ini_section_set_string(cat, "iconset", icon_set);
-
     if (enable_discord)
         ini_section_set_int(cat, "enable_discord", enable_discord);
     else
         ini_section_delete_var(cat, "enable_discord");
 
-    if (open_dir_usr_path)
-        ini_section_set_int(cat, "open_dir_usr_path", open_dir_usr_path);
-    else
-        ini_section_delete_var(cat, "open_dir_usr_path");
-
-    if (status_icons_fullscreen)
-        ini_section_set_int(cat, "status_icons_fullscreen", status_icons_fullscreen);
-    else
-        ini_section_delete_var(cat, "status_icons_fullscreen");
-
     if (video_framerate != -1)
         ini_section_set_int(cat, "video_gl_framerate", video_framerate);
     else
@@ -1872,16 +2456,43 @@ save_general(void)
         ini_section_set_int(cat, "video_gl_vsync", video_vsync);
     else
         ini_section_delete_var(cat, "video_gl_vsync");
-    if (strlen(video_shader) > 0)
-        ini_section_set_string(cat, "video_gl_shader", video_shader);
-    else
-        ini_section_delete_var(cat, "video_gl_shader");
 
     if (do_auto_pause)
         ini_section_set_int(cat, "do_auto_pause", do_auto_pause);
     else
         ini_section_delete_var(cat, "do_auto_pause");
 
+    if (video_gl_input_scale != 1.0) {
+        ini_section_set_double(cat, "video_gl_input_scale", video_gl_input_scale);
+    } else {
+        ini_section_delete_var(cat, "video_gl_input_scale");
+    }
+
+    if (video_gl_input_scale_mode != FULLSCR_SCALE_FULL) {
+        ini_section_set_int(cat, "video_gl_input_scale_mode", video_gl_input_scale_mode);
+    } else {
+        ini_section_delete_var(cat, "video_gl_input_scale_mode");
+    }
+
+    if (force_constant_mouse)
+        ini_section_set_int(cat, "force_constant_mouse", force_constant_mouse);
+    else
+        ini_section_delete_var(cat, "force_constant_mouse");
+
+    char cpu_buf[128] = { 0 };
+    plat_get_cpu_string(cpu_buf, 128);
+    ini_section_set_string(cat, "host_cpu", cpu_buf);
+
+    if (EMU_BUILD_NUM != 0)
+        ini_section_set_int(cat, "emu_build_num", EMU_BUILD_NUM);
+    else
+        ini_section_delete_var(cat, "emu_build_num");
+
+  if (strnlen(uuid, sizeof(uuid) - 1) > 0)
+        ini_section_set_string(cat, "uuid", uuid);
+    else
+        ini_section_delete_var(cat, "uuid");
+
     ini_delete_section_if_empty(config, cat);
 }
 
@@ -1931,6 +2542,10 @@ save_machine(void)
         ini_section_set_int(cat, "cpu_override", cpu_override);
     else
         ini_section_delete_var(cat, "cpu_override");
+    if (cpu_override_interpreter)
+        ini_section_set_int(cat, "cpu_override_interpreter", cpu_override_interpreter);
+    else
+        ini_section_delete_var(cat, "cpu_override_interpreter");
 
     /* Downgrade compatibility with the previous CPU model system. */
     ini_section_delete_var(cat, "cpu_manufacturer");
@@ -1948,17 +2563,20 @@ save_machine(void)
 
     /* Write the mem_size explicitly to the setttings in order to help managers
        to display it without having the actual machine table. */
-    ini_section_delete_var(cat, "mem_size");
     ini_section_set_int(cat, "mem_size", mem_size);
 
     ini_section_set_int(cat, "cpu_use_dynarec", cpu_use_dynarec);
-    ini_section_set_int(cat, "fpu_softfloat", fpu_softfloat);
+
+    if (fpu_softfloat == 0)
+        ini_section_delete_var(cat, "fpu_softfloat");
+    else
+        ini_section_set_int(cat, "fpu_softfloat", fpu_softfloat);
 
     if (time_sync & TIME_SYNC_ENABLED)
         if (time_sync & TIME_SYNC_UTC)
             ini_section_set_string(cat, "time_sync", "utc");
         else
-            ini_section_set_string(cat, "time_sync", "local");
+            ini_section_delete_var(cat, "time_sync");
     else
         ini_section_set_string(cat, "time_sync", "disabled");
 
@@ -1979,6 +2597,41 @@ save_video(void)
     ini_section_set_string(cat, "gfxcard",
                            video_get_internal_name(gfxcard[0]));
 
+    if (monitor_edid)
+        ini_section_set_int(cat, "monitor_edid", monitor_edid);
+    else
+        ini_section_delete_var(cat, "monitor_edid");
+
+    if (monitor_edid_path[0])
+        ini_section_set_string(cat, "monitor_edid_path", monitor_edid_path);
+    else
+        ini_section_delete_var(cat, "monitor_edid_path");
+
+    if (vid_cga_comp_brightness)
+        ini_section_set_int(cat, "vid_cga_comp_brightness", vid_cga_comp_brightness);
+    else
+        ini_section_delete_var(cat, "vid_cga_comp_brightness");
+
+    if (vid_cga_comp_sharpness)
+        ini_section_set_int(cat, "vid_cga_comp_sharpness", vid_cga_comp_sharpness);
+    else
+        ini_section_delete_var(cat, "vid_cga_comp_sharpness");
+
+    if (vid_cga_comp_contrast != 100)
+        ini_section_set_int(cat, "vid_cga_comp_contrast", vid_cga_comp_contrast);
+    else
+        ini_section_delete_var(cat, "vid_cga_comp_contrast");
+
+    if (vid_cga_comp_hue)
+        ini_section_set_int(cat, "vid_cga_comp_hue", vid_cga_comp_hue);
+    else
+        ini_section_delete_var(cat, "vid_cga_comp_hue");
+
+    if (vid_cga_comp_saturation != 100)
+        ini_section_set_int(cat, "vid_cga_comp_saturation", vid_cga_comp_saturation);
+    else
+        ini_section_delete_var(cat, "vid_cga_comp_saturation");
+
     if (voodoo_enabled == 0)
         ini_section_delete_var(cat, "voodoo");
     else
@@ -1994,10 +2647,18 @@ save_video(void)
     else
         ini_section_set_int(cat, "xga", xga_standalone_enabled);
 
-    if (gfxcard[1] == 0)
-        ini_section_delete_var(cat, "gfxcard_2");
+    if (da2_standalone_enabled == 0)
+        ini_section_delete_var(cat, "da2");
     else
-        ini_section_set_string(cat, "gfxcard_2", video_get_internal_name(gfxcard[1]));
+        ini_section_set_int(cat, "da2", da2_standalone_enabled);
+
+    // TODO
+    for (uint8_t i = 1; i < GFXCARD_MAX; i ++) {
+        if (gfxcard[i] == 0)
+            ini_section_delete_var(cat, "gfxcard_2");
+        else
+            ini_section_set_string(cat, "gfxcard_2", video_get_internal_name(gfxcard[i]));
+    }
 
     if (show_second_monitors == 1)
         ini_section_delete_var(cat, "show_second_monitors");
@@ -2019,50 +2680,52 @@ save_input_devices(void)
     ini_section_t cat = ini_find_or_create_section(config, "Input devices");
     char          temp[512];
     char          tmp2[512];
-    int           c;
-    int           d;
+
+    ini_section_set_string(cat, "keyboard_type", keyboard_get_internal_name(keyboard_type));
 
     ini_section_set_string(cat, "mouse_type", mouse_get_internal_name(mouse_type));
 
-    if (!joystick_type) {
+    uint8_t joy_insn = 0;
+    if (!joystick_type[joy_insn]) {
         ini_section_delete_var(cat, "joystick_type");
 
-        for (c = 0; c < 16; c++) {
-            sprintf(tmp2, "joystick_%i_nr", c);
+        for (int js = 0; js < MAX_PLAT_JOYSTICKS; js++) {
+            sprintf(tmp2, "joystick_%i_nr", js);
             ini_section_delete_var(cat, tmp2);
 
-            for (d = 0; d < 16; d++) {
-                sprintf(tmp2, "joystick_%i_axis_%i", c, d);
+            for (int axis_nr = 0; axis_nr < MAX_JOY_AXES; axis_nr++) {
+                sprintf(tmp2, "joystick_%i_axis_%i", js, axis_nr);
                 ini_section_delete_var(cat, tmp2);
             }
-            for (d = 0; d < 16; d++) {
-                sprintf(tmp2, "joystick_%i_button_%i", c, d);
+            for (int button_nr = 0; button_nr < MAX_JOY_BUTTONS; button_nr++) {
+                sprintf(tmp2, "joystick_%i_button_%i", js, button_nr);
                 ini_section_delete_var(cat, tmp2);
             }
-            for (d = 0; d < 16; d++) {
-                sprintf(tmp2, "joystick_%i_pov_%i", c, d);
+            for (int pov_nr = 0; pov_nr < MAX_JOY_POVS; pov_nr++) {
+                sprintf(tmp2, "joystick_%i_pov_%i", js, pov_nr);
                 ini_section_delete_var(cat, tmp2);
             }
         }
     } else {
-        ini_section_set_string(cat, "joystick_type", joystick_get_internal_name(joystick_type));
+        ini_section_set_string(cat, "joystick_type", joystick_get_internal_name(joystick_type[joy_insn]));
 
-        for (c = 0; c < joystick_get_max_joysticks(joystick_type); c++) {
-            sprintf(tmp2, "joystick_%i_nr", c);
-            ini_section_set_int(cat, tmp2, joystick_state[c].plat_joystick_nr);
+        for (int js = 0; js < joystick_get_max_joysticks(joystick_type[joy_insn]); js++) {
+            sprintf(tmp2, "joystick_%i_nr", js);
+            ini_section_set_int(cat, tmp2, joystick_state[0][js].plat_joystick_nr);
 
-            if (joystick_state[c].plat_joystick_nr) {
-                for (d = 0; d < joystick_get_axis_count(joystick_type); d++) {
-                    sprintf(tmp2, "joystick_%i_axis_%i", c, d);
-                    ini_section_set_int(cat, tmp2, joystick_state[c].axis_mapping[d]);
+            if (joystick_state[0][js].plat_joystick_nr) {
+                for (int axis_nr = 0; axis_nr < joystick_get_axis_count(joystick_type[joy_insn]); axis_nr++) {
+                    sprintf(tmp2, "joystick_%i_axis_%i", js, axis_nr);
+                    ini_section_set_int(cat, tmp2, joystick_state[0][js].axis_mapping[axis_nr]);
                 }
-                for (d = 0; d < joystick_get_button_count(joystick_type); d++) {
-                    sprintf(tmp2, "joystick_%i_button_%i", c, d);
-                    ini_section_set_int(cat, tmp2, joystick_state[c].button_mapping[d]);
+                for (int button_nr = 0; button_nr < joystick_get_button_count(joystick_type[joy_insn]); button_nr++) {
+                    sprintf(tmp2, "joystick_%i_button_%i", js, button_nr);
+                    ini_section_set_int(cat, tmp2, joystick_state[0][js].button_mapping[button_nr]);
                 }
-                for (d = 0; d < joystick_get_pov_count(joystick_type); d++) {
-                    sprintf(tmp2, "joystick_%i_pov_%i", c, d);
-                    sprintf(temp, "%i, %i", joystick_state[c].pov_mapping[d][0], joystick_state[c].pov_mapping[d][1]);
+                for (int pov_nr = 0; pov_nr < joystick_get_pov_count(joystick_type[joy_insn]); pov_nr++) {
+                    sprintf(tmp2, "joystick_%i_pov_%i", js, pov_nr);
+                    sprintf(temp, "%i, %i", joystick_state[0][js].pov_mapping[pov_nr][0],
+                            joystick_state[0][js].pov_mapping[pov_nr][1]);
                     ini_section_set_string(cat, tmp2, temp);
                 }
             }
@@ -2145,7 +2808,10 @@ save_sound(void)
     else
         ini_section_set_string(cat, "sound_type", (sound_is_float == 1) ? "float" : "int16");
 
-    ini_section_set_string(cat, "fm_driver", (fm_driver == FM_DRV_NUKED) ? "nuked" : "ymfm");
+    if (fm_driver == FM_DRV_NUKED)
+        ini_section_delete_var(cat, "fm_driver");
+    else
+        ini_section_set_string(cat, "fm_driver", "ymfm");
 
     ini_delete_section_if_empty(config, cat);
 }
@@ -2185,7 +2851,15 @@ save_network(void)
             case NET_TYPE_VDE:
                 ini_section_set_string(cat, temp, "vde");
                 break;
-
+            case NET_TYPE_TAP:
+                ini_section_set_string(cat, temp, "tap");
+                break;
+            case NET_TYPE_NMSWITCH:
+                ini_section_set_string(cat, temp, "nmswitch");
+                break;
+            case NET_TYPE_NRSWITCH:
+                ini_section_set_string(cat, temp, "nrswitch");
+                break;
             default:
                 break;
         }
@@ -2206,6 +2880,28 @@ save_network(void)
             ini_section_delete_var(cat, temp);
         else
             ini_section_set_int(cat, temp, nc->link_state);
+
+        sprintf(temp, "net_%02i_switch_group", c + 1);
+        if (nc->device_num == 0)
+            ini_section_delete_var(cat, temp);
+        else
+            ini_section_set_int(cat, temp, net_cards_conf[c].switch_group);
+
+        sprintf(temp, "net_%02i_promisc", c + 1);
+        if (nc->device_num == 0)
+            ini_section_delete_var(cat, temp);
+        else
+            ini_section_set_int(cat, temp, net_cards_conf[c].promisc_mode);
+
+        sprintf(temp, "net_%02i_nrs_host", c + 1);
+        if (nc->device_num == 0)
+            ini_section_delete_var(cat, temp);
+        else {
+            if (nc->nrs_hostname[0] != '\0')
+                ini_section_set_string(cat, temp, net_cards_conf[c].nrs_hostname);
+            else
+                ini_section_delete_var(cat, temp);
+        }
     }
 
     ini_delete_section_if_empty(config, cat);
@@ -2217,10 +2913,19 @@ save_ports(void)
 {
     ini_section_t cat = ini_find_or_create_section(config, "Ports (COM & LPT)");
     char          temp[512];
-    int           c;
-    int           d;
 
-    for (c = 0; c < SERIAL_MAX; c++) {
+    int           has_jumpers = machine_has_jumpered_ecp_dma(machine, DMA_ANY);
+    int           def_jumper  = machine_get_default_jumpered_ecp_dma(machine);
+
+    if (!has_jumpers || (jumpered_internal_ecp_dma == def_jumper))
+        ini_section_delete_var(cat, "jumpered_internal_ecp_dma");
+    else if (has_jumpers && !(machine_has_jumpered_ecp_dma(machine, jumpered_internal_ecp_dma))) {
+        jumpered_internal_ecp_dma = def_jumper;
+        ini_section_set_int(cat, "jumpered_internal_ecp_dma", jumpered_internal_ecp_dma);
+    } else
+        ini_section_set_int(cat, "jumpered_internal_ecp_dma", jumpered_internal_ecp_dma);
+
+    for (int c = 0; c < (SERIAL_MAX - 1); c++) {
         sprintf(temp, "serial%d_enabled", c + 1);
         if (((c < 2) && com_ports[c].enabled) || ((c >= 2) && !com_ports[c].enabled))
             ini_section_delete_var(cat, temp);
@@ -2228,16 +2933,15 @@ save_ports(void)
             ini_section_set_int(cat, temp, com_ports[c].enabled);
 
         sprintf(temp, "serial%d_passthrough_enabled", c + 1);
-        if (serial_passthrough_enabled[c]) {
+        if (serial_passthrough_enabled[c])
             ini_section_set_int(cat, temp, 1);
-        } else {
+        else
             ini_section_delete_var(cat, temp);
-        }
     }
 
-    for (c = 0; c < PARALLEL_MAX; c++) {
+    for (int c = 0; c < PARALLEL_MAX; c++) {
         sprintf(temp, "lpt%d_enabled", c + 1);
-        d = (c == 0) ? 1 : 0;
+        int d = (c == 0) ? 1 : 0;
         if (lpt_ports[c].enabled == d)
             ini_section_delete_var(cat, temp);
         else
@@ -2246,14 +2950,82 @@ save_ports(void)
         sprintf(temp, "lpt%d_device", c + 1);
         if (lpt_ports[c].device == 0)
             ini_section_delete_var(cat, temp);
+        else
+            ini_section_set_string(cat, temp, lpt_device_get_internal_name(lpt_ports[c].device));
+    }
+
+#if 0
+// TODO: Save
+    for (c = 0; c < GAMEPORT_MAX; c++) {
+        sprintf(temp, "gameport%d_enabled", c + 1);
+        d = (c == 0) ? 1 : 0;
+        if (game_ports[c].enabled == d)
+            ini_section_delete_var(cat, temp);
+        else
+            ini_section_set_int(cat, temp, game_ports[c].enabled);
+
+        sprintf(temp, "gameport%d_device", c + 1);
+        if (game_ports[c].device == 0)
+            ini_section_delete_var(cat, temp);
         else
             ini_section_set_string(cat, temp,
-                                   lpt_device_get_internal_name(lpt_ports[c].device));
+                                   gameport_get_internal_name(game_ports[c].device));
+    }
+
+    for (uint8_t c = 0; c < GAMEPORT_MAX; c++) {
+        sprintf(temp, "gameport%d_enabled", c);
+        if (gameport_type[c] == 0)
+            ini_section_delete_var(cat, temp);
+        else
+            ini_section_set_string(cat, temp,
+                                   gameport_get_internal_name(gameport_type[c]));
+    }
+#endif
+
+    ini_delete_section_if_empty(config, cat);
+}
+
+/* Save "Keybinds" section. */
+static void
+save_keybinds(void)
+{
+    ini_section_t cat = ini_find_or_create_section(config, "Keybinds");
+
+    for (int x = 0; x < NUM_ACCELS; x++) {
+        /* Has accelerator been changed from default? */
+        if (strcmp(def_acc_keys[x].seq, acc_keys[x].seq) == 0)
+            ini_section_delete_var(cat, acc_keys[x].name);
+        /* Check for a cleared binding to avoid saving it as an empty string */
+        else if (acc_keys[x].seq[0] == '\0')
+            ini_section_set_string(cat, acc_keys[x].name, "none");
+        else
+            ini_section_set_string(cat, acc_keys[x].name, acc_keys[x].seq);
     }
 
     ini_delete_section_if_empty(config, cat);
 }
 
+static void
+save_image_file(char *cat, char *var, char *src)
+{
+    char  temp[2048] = { 0 };
+    char *prefix     = "";
+
+    path_normalize(src);
+
+    if (strstr(src, "wp://") == src) {
+        src    += 5;
+        prefix  = "wp://";
+    }
+
+    if (!strnicmp(src, usr_path, strlen(usr_path)))
+        sprintf(temp, "%s%s", prefix, &src[strlen(usr_path)]);
+    else
+        sprintf(temp, "%s%s", prefix, src);
+
+    ini_section_set_string(cat, var, temp);
+}
+
 /* Save "Storage Controllers" section. */
 static void
 save_storage_controllers(void)
@@ -2261,10 +3033,11 @@ save_storage_controllers(void)
     ini_section_t cat = ini_find_or_create_section(config, "Storage controllers");
     char          temp[512];
     int           c;
+    char          *def_hdc;
 
     ini_section_delete_var(cat, "scsicard");
 
-    for (c = 0; c < SCSI_BUS_MAX; c++) {
+    for (c = 0; c < SCSI_CARD_MAX; c++) {
         sprintf(temp, "scsicard_%d", c + 1);
 
         if (scsi_card_current[c] == 0)
@@ -2274,14 +3047,45 @@ save_storage_controllers(void)
                                    scsi_card_get_internal_name(scsi_card_current[c]));
     }
 
-    if (fdc_type == FDC_INTERNAL)
+    if (fdc_current[0] == FDC_INTERNAL)
         ini_section_delete_var(cat, "fdc");
     else
         ini_section_set_string(cat, "fdc",
-                               fdc_card_get_internal_name(fdc_type));
+                               fdc_card_get_internal_name(fdc_current[0]));
 
-    ini_section_set_string(cat, "hdc",
-                           hdc_get_internal_name(hdc_current));
+    ini_section_delete_var(cat, "hdc");
+
+    for (c = 0; c < HDC_MAX; c++) {
+        sprintf(temp, "hdc_%d", c + 1);
+
+        if ((c == 0) && machine_has_flags(machine, MACHINE_HDC))
+            def_hdc = "internal";
+        else
+            def_hdc = "none";
+
+        if (!strcmp(hdc_get_internal_name(hdc_current[c]), def_hdc))
+            ini_section_delete_var(cat, temp);
+        else
+            ini_section_set_string(cat, temp,
+                                   hdc_get_internal_name(hdc_current[c]));
+    }
+
+    /* Downgrade compatibility for standalone tertiary/quaternary IDE from v4.2 and older. */
+    const char *legacy_cards[] = { "ide_ter", "ide_qua" };
+    for (int i = 0; i < (sizeof(legacy_cards) / sizeof(legacy_cards[0])); i++) {
+        int card_id = hdc_get_from_internal_name(legacy_cards[i]);
+        for (int j = 0; j < (sizeof(sound_card_current) / sizeof(sound_card_current[0])); j++) {
+            if (hdc_current[j] == card_id) {
+                /* A special value of 2 still enables the cards on older versions,
+                   but lets newer versions know that they've already been migrated. */
+                ini_section_set_int(cat, legacy_cards[i], 2);
+                card_id = 0; /* mark as found */
+                break;
+            }
+        }
+        if (card_id > 0) /* not found */
+            ini_section_delete_var(cat, legacy_cards[i]);
+    }
 
     if (cdrom_interface_current == 0)
         ini_section_delete_var(cat, "cdrom_interface");
@@ -2289,18 +3093,6 @@ save_storage_controllers(void)
         ini_section_set_string(cat, "cdrom_interface",
                                cdrom_interface_get_internal_name(cdrom_interface_current));
 
-    if (ide_ter_enabled == 0)
-        ini_section_delete_var(cat, "ide_ter");
-    else
-        ini_section_set_int(cat, "ide_ter", ide_ter_enabled);
-
-    if (ide_qua_enabled == 0)
-        ini_section_delete_var(cat, "ide_qua");
-    else
-        ini_section_set_int(cat, "ide_qua", ide_qua_enabled);
-
-    ini_delete_section_if_empty(config, cat);
-
     if (cassette_enable == 0)
         ini_section_delete_var(cat, "cassette_enabled");
     else
@@ -2309,13 +3101,21 @@ save_storage_controllers(void)
     if (strlen(cassette_fname) == 0)
         ini_section_delete_var(cat, "cassette_file");
     else
-        ini_section_set_string(cat, "cassette_file", cassette_fname);
+        save_image_file(cat, "cassette_file", cassette_fname);
 
-    if (strlen(cassette_mode) == 0)
+    if (!strcmp(cassette_mode, "load"))
         ini_section_delete_var(cat, "cassette_mode");
     else
         ini_section_set_string(cat, "cassette_mode", cassette_mode);
 
+    for (int i = 0; i < MAX_PREV_IMAGES; i++) {
+        sprintf(temp, "cassette_image_history_%02i", i + 1);
+        if ((cassette_image_history[i] == 0) || strlen(cassette_image_history[i]) == 0)
+            ini_section_delete_var(cat, temp);
+        else
+            save_image_file(cat, temp, cassette_image_history[i]);
+    }
+
     if (cassette_pos == 0)
         ini_section_delete_var(cat, "cassette_position");
     else
@@ -2336,18 +3136,50 @@ save_storage_controllers(void)
     else
         ini_section_set_int(cat, "cassette_pcm", cassette_pcm);
 
-    if (cassette_ui_writeprot == 0)
-        ini_section_delete_var(cat, "cassette_writeprot");
-    else
-        ini_section_set_int(cat, "cassette_writeprot", cassette_ui_writeprot);
+    ini_section_delete_var(cat, "cassette_writeprot");
 
     for (c = 0; c < 2; c++) {
         sprintf(temp, "cartridge_%02i_fn", c + 1);
+
         if (strlen(cart_fns[c]) == 0)
             ini_section_delete_var(cat, temp);
-        else
-            ini_section_set_string(cat, temp, cart_fns[c]);
+        else {
+            path_normalize(cart_fns[c]);
+            if (!strnicmp(cart_fns[c], usr_path, strlen(usr_path)))
+                ini_section_set_string(cat, temp, &cart_fns[c][strlen(usr_path)]);
+            else
+                ini_section_set_string(cat, temp, cart_fns[c]);
+        }
+
+        for (int i = 0; i < MAX_PREV_IMAGES; i++) {
+            sprintf(temp, "cartridge_%02i_image_history_%02i", c + 1, i + 1);
+            if ((cart_image_history[c][i] == 0) || strlen(cart_image_history[c][i]) == 0)
+                ini_section_delete_var(cat, temp);
+            else {
+                path_normalize(cart_image_history[c][i]);
+                if (!strnicmp(cart_image_history[c][i], usr_path, strlen(usr_path)))
+                    ini_section_set_string(cat, temp, &cart_image_history[c][i][strlen(usr_path)]);
+                else
+                    ini_section_set_string(cat, temp, cart_image_history[c][i]);
+            }
+        }
     }
+
+    /* Downgrade compatibility for standalone LBA Enhancer from v4.2 and older. */
+    int card_id = isarom_get_from_internal_name("lba_enhancer");
+    for (c = 0; c < ISAROM_MAX; c++) {
+        if (isarom_type[c] == card_id) {
+            /* A special value of 2 still enables the cards on older versions,
+               but lets newer versions know that they've already been migrated. */
+            ini_section_set_int(cat, "lba_enhancer_enabled", 2);
+            card_id = 0; /* mark as found */
+            break;
+        }
+    }
+    if (card_id > 0) /* not found */
+        ini_section_delete_var(cat, "lba_enhancer_enabled");
+
+    ini_delete_section_if_empty(config, cat);
 }
 
 /* Save "Other Peripherals" section. */
@@ -2372,6 +3204,12 @@ save_other_peripherals(void)
     else
         ini_section_set_int(cat, "unittester_enabled", unittester_enabled);
 
+    if (novell_keycard_enabled == 0)
+        ini_section_delete_var(cat, "novell_keycard_enabled");
+    else
+        ini_section_set_int(cat, "novell_keycard_enabled", novell_keycard_enabled);
+
+    // ISA RAM Boards
     for (uint8_t c = 0; c < ISAMEM_MAX; c++) {
         sprintf(temp, "isamem%d_type", c);
         if (isamem_type[c] == 0)
@@ -2381,6 +3219,16 @@ save_other_peripherals(void)
                                    isamem_get_internal_name(isamem_type[c]));
     }
 
+    // ISA ROM Boards
+    for (uint8_t c = 0; c < ISAROM_MAX; c++) {
+        sprintf(temp, "isarom%d_type", c);
+        if (isarom_type[c] == 0)
+            ini_section_delete_var(cat, temp);
+        else
+            ini_section_set_string(cat, temp,
+                                   isarom_get_internal_name(isarom_type[c]));
+    }
+
     if (isartc_type == 0)
         ini_section_delete_var(cat, "isartc_type");
     else
@@ -2390,6 +3238,40 @@ save_other_peripherals(void)
     ini_delete_section_if_empty(config, cat);
 }
 
+#ifndef USE_SDL_UI
+/* Save "GL3 Shaders" section. */
+static void
+save_gl3_shaders(void)
+{
+    ini_section_t cat = ini_find_or_create_section(config, "GL3 Shaders");
+    char          temp[512];
+    int shaders = 0, i = 0;
+
+    for (i = 0; i < MAX_USER_SHADERS; i++) {
+        if (gl3_shader_file[i][0] == 0) {
+            temp[0] = 0;
+            snprintf(temp, 512, "shader%d", i);
+            ini_section_delete_var(cat, temp);
+            break;
+        }
+        shaders++;
+    }
+
+    ini_section_set_int(cat, "shaders", shaders);
+    if (shaders == 0) {
+        ini_section_delete_var(cat, "shaders");
+    } else {
+        for (i = 0; i < shaders; i++) {
+            temp[0] = 0;
+            snprintf(temp, 512, "shader%d", i);
+            ini_section_set_string(cat, temp, gl3_shader_file[i]);
+        }
+    }
+
+    ini_delete_section_if_empty(config, cat);
+}
+#endif
+
 /* Save "Hard Disks" section. */
 static void
 save_hard_disks(void)
@@ -2403,34 +3285,34 @@ save_hard_disks(void)
     for (uint8_t c = 0; c < HDD_NUM; c++) {
         sprintf(temp, "hdd_%02i_parameters", c + 1);
         if (hdd_is_valid(c)) {
-            p = hdd_bus_to_string(hdd[c].bus, 0);
+            p = hdd_bus_to_string(hdd[c].bus_type, 0);
             sprintf(tmp2, "%u, %u, %u, %i, %s",
                     hdd[c].spt, hdd[c].hpc, hdd[c].tracks, hdd[c].wp, p);
             ini_section_set_string(cat, temp, tmp2);
-        } else {
+        } else
             ini_section_delete_var(cat, temp);
-        }
 
         sprintf(temp, "hdd_%02i_mfm_channel", c + 1);
-        if (hdd_is_valid(c) && (hdd[c].bus == HDD_BUS_MFM))
+        if (hdd_is_valid(c) && (hdd[c].bus_type == HDD_BUS_MFM))
             ini_section_set_int(cat, temp, hdd[c].mfm_channel);
         else
             ini_section_delete_var(cat, temp);
 
         sprintf(temp, "hdd_%02i_xta_channel", c + 1);
-        if (hdd_is_valid(c) && (hdd[c].bus == HDD_BUS_XTA))
+        if (hdd_is_valid(c) && (hdd[c].bus_type == HDD_BUS_XTA))
             ini_section_set_int(cat, temp, hdd[c].xta_channel);
         else
             ini_section_delete_var(cat, temp);
 
         sprintf(temp, "hdd_%02i_esdi_channel", c + 1);
-        if (hdd_is_valid(c) && (hdd[c].bus == HDD_BUS_ESDI))
+        if (hdd_is_valid(c) && (hdd[c].bus_type == HDD_BUS_ESDI))
             ini_section_set_int(cat, temp, hdd[c].esdi_channel);
         else
             ini_section_delete_var(cat, temp);
 
         sprintf(temp, "hdd_%02i_ide_channel", c + 1);
-        if (!hdd_is_valid(c) || ((hdd[c].bus != HDD_BUS_IDE) && (hdd[c].bus != HDD_BUS_ATAPI)))
+        if (!hdd_is_valid(c) || ((hdd[c].bus_type != HDD_BUS_IDE) &&
+            (hdd[c].bus_type != HDD_BUS_ATAPI)))
             ini_section_delete_var(cat, temp);
         else {
             sprintf(tmp2, "%01u:%01u", hdd[c].ide_channel >> 1, hdd[c].ide_channel & 1);
@@ -2441,7 +3323,7 @@ save_hard_disks(void)
         ini_section_delete_var(cat, temp);
 
         sprintf(temp, "hdd_%02i_scsi_location", c + 1);
-        if (hdd[c].bus != HDD_BUS_SCSI)
+        if (hdd[c].bus_type != HDD_BUS_SCSI)
             ini_section_delete_var(cat, temp);
         else {
             sprintf(tmp2, "%01u:%02u", hdd[c].scsi_id >> 4,
@@ -2473,8 +3355,9 @@ save_hard_disks(void)
             ini_section_delete_var(cat, temp);
 
         sprintf(temp, "hdd_%02i_speed", c + 1);
-        if (!hdd_is_valid(c) || ((hdd[c].bus != HDD_BUS_ESDI) && (hdd[c].bus != HDD_BUS_IDE) &&
-            (hdd[c].bus != HDD_BUS_SCSI) && (hdd[c].bus != HDD_BUS_ATAPI)))
+        if (!hdd_is_valid(c) ||
+            ((hdd[c].bus_type != HDD_BUS_ESDI) && (hdd[c].bus_type != HDD_BUS_IDE) &&
+            (hdd[c].bus_type != HDD_BUS_SCSI) && (hdd[c].bus_type != HDD_BUS_ATAPI)))
             ini_section_delete_var(cat, temp);
         else
             ini_section_set_string(cat, temp, hdd_preset_get_internal_name(hdd[c].speed_preset));
@@ -2508,19 +3391,11 @@ save_floppy_and_cdrom_drives(void)
 
             sprintf(temp, "fdd_%02i_writeprot", c + 1);
             ini_section_delete_var(cat, temp);
-        } else {
-            path_normalize(floppyfns[c]);
-            if (!strnicmp(floppyfns[c], usr_path, strlen(usr_path)))
-                ini_section_set_string(cat, temp, &floppyfns[c][strlen(usr_path)]);
-            else
-                ini_section_set_string(cat, temp, floppyfns[c]);
-        }
+        } else
+            save_image_file(cat, temp, floppyfns[c]);
 
         sprintf(temp, "fdd_%02i_writeprot", c + 1);
-        if (ui_writeprot[c] == 0)
-            ini_section_delete_var(cat, temp);
-        else
-            ini_section_set_int(cat, temp, ui_writeprot[c]);
+        ini_section_delete_var(cat, temp);
 
         sprintf(temp, "fdd_%02i_turbo", c + 1);
         if (fdd_get_turbo(c) == 0)
@@ -2538,22 +3413,20 @@ save_floppy_and_cdrom_drives(void)
             sprintf(temp, "fdd_%02i_image_history_%02i", c + 1, i + 1);
             if ((fdd_image_history[c][i] == 0) || strlen(fdd_image_history[c][i]) == 0)
                 ini_section_delete_var(cat, temp);
-            else {
-                path_normalize(fdd_image_history[c][i]);
-                if (!strnicmp(fdd_image_history[c][i], usr_path, strlen(usr_path)))
-                    ini_section_set_string(cat, temp, &fdd_image_history[c][i][strlen(usr_path)]);
-                else
-                    ini_section_set_string(cat, temp, fdd_image_history[c][i]);
-            }
+            else
+                save_image_file(cat, temp, fdd_image_history[c][i]);
         }
     }
 
     for (c = 0; c < CDROM_NUM; c++) {
         sprintf(temp, "cdrom_%02i_host_drive", c + 1);
-        if ((cdrom[c].bus_type == 0) || (cdrom[c].host_drive != 200))
-            ini_section_delete_var(cat, temp);
+        ini_section_delete_var(cat, temp);
+
+        sprintf(temp, "cdrom_%02i_no_check", c + 1);
+        if (cdrom[c].no_check)
+            ini_section_set_int(cat, temp, cdrom[c].no_check);
         else
-            ini_section_set_int(cat, temp, cdrom[c].host_drive);
+            ini_section_delete_var(cat, temp);
 
         sprintf(temp, "cdrom_%02i_speed", c + 1);
         if ((cdrom[c].bus_type == 0) || (cdrom[c].speed == 8))
@@ -2562,11 +3435,11 @@ save_floppy_and_cdrom_drives(void)
             ini_section_set_int(cat, temp, cdrom[c].speed);
 
         sprintf(temp, "cdrom_%02i_type", c + 1);
-        if ((cdrom[c].bus_type == 0) || (cdrom[c].bus_type == CDROM_BUS_MITSUMI))
+        char *tn = cdrom_get_internal_name(cdrom_get_type(c));
+        if ((cdrom[c].bus_type == 0) || (cdrom[c].bus_type == CDROM_BUS_MITSUMI) || !strcmp(tn, "86cd"))
             ini_section_delete_var(cat, temp);
         else
-            ini_section_set_string(cat, temp,
-                                   cdrom_get_internal_name(cdrom_get_type(c)));
+            ini_section_set_string(cat, temp, tn);
 
         sprintf(temp, "cdrom_%02i_parameters", c + 1);
         if (cdrom[c].bus_type == 0)
@@ -2582,6 +3455,13 @@ save_floppy_and_cdrom_drives(void)
             ini_section_set_string(cat, temp, tmp2);
         }
 
+        sprintf(temp, "cdrom_%02i_mke_channel", c + 1);
+        if (cdrom[c].bus_type != CDROM_BUS_MKE)
+            ini_section_delete_var(cat, temp);
+        else {
+            ini_section_set_int(cat, temp, cdrom[c].mke_channel);
+        }
+
         sprintf(temp, "cdrom_%02i_ide_channel", c + 1);
         if (cdrom[c].bus_type != CDROM_BUS_ATAPI)
             ini_section_delete_var(cat, temp);
@@ -2640,46 +3520,52 @@ save_other_removable_devices(void)
     char          tmp2[512];
     int           c;
 
-    for (c = 0; c < ZIP_NUM; c++) {
-        sprintf(temp, "zip_%02i_parameters", c + 1);
-        if (zip_drives[c].bus_type == 0) {
+    for (c = 0; c < RDISK_NUM; c++) {
+        sprintf(temp, "rdisk_%02i_parameters", c + 1);
+        if (rdisk_drives[c].bus_type == 0) {
             ini_section_delete_var(cat, temp);
         } else {
-            sprintf(tmp2, "%u, %s", zip_drives[c].is_250,
-                    hdd_bus_to_string(zip_drives[c].bus_type, 1));
+            sprintf(tmp2, "%u, %s", rdisk_drives[c].type,
+                    hdd_bus_to_string(rdisk_drives[c].bus_type, 1));
             ini_section_set_string(cat, temp, tmp2);
         }
 
-        sprintf(temp, "zip_%02i_ide_channel", c + 1);
-        if (zip_drives[c].bus_type != ZIP_BUS_ATAPI)
+        sprintf(temp, "rdisk_%02i_ide_channel", c + 1);
+        if (rdisk_drives[c].bus_type != RDISK_BUS_ATAPI)
             ini_section_delete_var(cat, temp);
         else {
-            sprintf(tmp2, "%01u:%01u", zip_drives[c].ide_channel >> 1,
-                    zip_drives[c].ide_channel & 1);
+            sprintf(tmp2, "%01u:%01u", rdisk_drives[c].ide_channel >> 1,
+                    rdisk_drives[c].ide_channel & 1);
             ini_section_set_string(cat, temp, tmp2);
         }
 
-        sprintf(temp, "zip_%02i_scsi_id", c + 1);
+        sprintf(temp, "rdisk_%02i_scsi_id", c + 1);
         ini_section_delete_var(cat, temp);
 
-        sprintf(temp, "zip_%02i_scsi_location", c + 1);
-        if (zip_drives[c].bus_type != ZIP_BUS_SCSI)
+        sprintf(temp, "rdisk_%02i_writeprot", c + 1);
+        ini_section_delete_var(cat, temp);
+
+        sprintf(temp, "rdisk_%02i_scsi_location", c + 1);
+        if (rdisk_drives[c].bus_type != RDISK_BUS_SCSI)
             ini_section_delete_var(cat, temp);
         else {
-            sprintf(tmp2, "%01u:%02u", zip_drives[c].scsi_device_id >> 4,
-                    zip_drives[c].scsi_device_id & 15);
+            sprintf(tmp2, "%01u:%02u", rdisk_drives[c].scsi_device_id >> 4,
+                    rdisk_drives[c].scsi_device_id & 15);
             ini_section_set_string(cat, temp, tmp2);
         }
 
-        sprintf(temp, "zip_%02i_image_path", c + 1);
-        if ((zip_drives[c].bus_type == 0) || (strlen(zip_drives[c].image_path) == 0))
+        sprintf(temp, "rdisk_%02i_image_path", c + 1);
+        if ((rdisk_drives[c].bus_type == 0) || (strlen(rdisk_drives[c].image_path) == 0))
             ini_section_delete_var(cat, temp);
-        else {
-            path_normalize(zip_drives[c].image_path);
-            if (!strnicmp(zip_drives[c].image_path, usr_path, strlen(usr_path)))
-                ini_section_set_string(cat, temp, &zip_drives[c].image_path[strlen(usr_path)]);
+        else
+            save_image_file(cat, temp, rdisk_drives[c].image_path);
+
+        for (int i = 0; i < MAX_PREV_IMAGES; i++) {
+            sprintf(temp, "rdisk_%02i_image_history_%02i", c + 1, i + 1);
+            if ((rdisk_drives[c].image_history[i] == 0) || strlen(rdisk_drives[c].image_history[i]) == 0)
+                ini_section_delete_var(cat, temp);
             else
-                ini_section_set_string(cat, temp, zip_drives[c].image_path);
+                save_image_file(cat, temp, rdisk_drives[c].image_history[i]);
         }
     }
 
@@ -2705,6 +3591,9 @@ save_other_removable_devices(void)
         sprintf(temp, "mo_%02i_scsi_id", c + 1);
         ini_section_delete_var(cat, temp);
 
+        sprintf(temp, "mo_%02i_writeprot", c + 1);
+        ini_section_delete_var(cat, temp);
+
         sprintf(temp, "mo_%02i_scsi_location", c + 1);
         if (mo_drives[c].bus_type != MO_BUS_SCSI)
             ini_section_delete_var(cat, temp);
@@ -2717,24 +3606,36 @@ save_other_removable_devices(void)
         sprintf(temp, "mo_%02i_image_path", c + 1);
         if ((mo_drives[c].bus_type == 0) || (strlen(mo_drives[c].image_path) == 0))
             ini_section_delete_var(cat, temp);
-        else {
-            path_normalize(mo_drives[c].image_path);
-            if (!strnicmp(mo_drives[c].image_path, usr_path, strlen(usr_path)))
-                ini_section_set_string(cat, temp, &mo_drives[c].image_path[strlen(usr_path)]);
+        else
+            save_image_file(cat, temp, mo_drives[c].image_path);
+
+        for (int i = 0; i < MAX_PREV_IMAGES; i++) {
+            sprintf(temp, "mo_%02i_image_history_%02i", c + 1, i + 1);
+            if ((mo_drives[c].image_history[i] == 0) || strlen(mo_drives[c].image_history[i]) == 0)
+                ini_section_delete_var(cat, temp);
             else
-                ini_section_set_string(cat, temp, mo_drives[c].image_path);
+                save_image_file(cat, temp, mo_drives[c].image_history[i]);
         }
     }
 
     ini_delete_section_if_empty(config, cat);
 }
 
+void
+config_save_global(void)
+{
+    save_global();                  /* Global */
+
+    ini_write(global, global_cfg_path);
+}
+
 void
 config_save(void)
 {
     save_general();                 /* General */
     for (uint8_t i = 0; i < MONITORS_NUM; i++)
         save_monitor(i);            /* Monitors */
+    save_scan_code_mappings();      /* Scan code mappings */
     save_machine();                 /* Machine */
     save_video();                   /* Video */
     save_input_devices();           /* Input devices */
@@ -2746,8 +3647,14 @@ config_save(void)
     save_floppy_and_cdrom_drives(); /* Floppy and CD-ROM drives */
     save_other_removable_devices(); /* Other removable devices */
     save_other_peripherals();       /* Other peripherals */
+#ifndef USE_SDL_UI
+    save_gl3_shaders();             /* GL3 Shaders */
+#endif
+    save_keybinds();                /* Key bindings */
 
     ini_write(config, cfg_path);
+
+    config_save_global();
 }
 
 ini_t
diff --git a/src/cpu/386.c b/src/cpu/386.c
index b5a1e61e3..ed4b40ab2 100644
--- a/src/cpu/386.c
+++ b/src/cpu/386.c
@@ -15,6 +15,7 @@
 #include "x86.h"
 #include "x86_ops.h"
 #include "x86seg_common.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include <86box/io.h>
 #include <86box/nmi.h>
@@ -25,6 +26,8 @@
 #include <86box/fdd.h>
 #include <86box/fdc.h>
 #include <86box/machine.h>
+#include <86box/plat_fallthrough.h>
+#include <86box/plat_unused.h>
 #include <86box/gdbstub.h>
 #ifndef OPS_286_386
 #    define OPS_286_386
@@ -210,11 +213,11 @@ fetch_ea_16_long(uint32_t rmdat)
 #define CLOCK_CYCLES_ALWAYS(c) cycles -= (c)
 
 #define CHECK_READ_CS(size)                                                            \
-    if ((cpu_state.pc < cpu_state.seg_cs.limit_low) ||                                 \
-        ((cpu_state.pc + size - 1) > cpu_state.seg_cs.limit_high))                     \
-        x86gpf("Limit check (READ)", 0);                                               \
     if (msw & 1 && !(cpu_state.eflags & VM_FLAG) && !(cpu_state.seg_cs.access & 0x80)) \
         x86np("Read from seg not present", cpu_state.seg_cs.seg & 0xfffc);             \
+    else if ((cpu_state.pc < cpu_state.seg_cs.limit_low) ||                            \
+        ((cpu_state.pc + size - 1) > cpu_state.seg_cs.limit_high))                     \
+        x86gpf("Limit check (READ CS)", 0);
 
 #include "386_ops.h"
 
@@ -259,27 +262,38 @@ exec386_2386(int32_t cycs)
 
             fetchdat = fastreadl_fetch(cs + cpu_state.pc);
             ol = opcode_length[fetchdat & 0xff];
-            CHECK_READ_CS(MIN(ol, 4));
-            ins_fetch_fault = cpu_386_check_instruction_fault();
+            if ((ol == 3) && opcode_has_modrm[fetchdat & 0xff] && (((fetchdat >> 14) & 0x03) == 0x03))
+                ol = 2;
 
-            if (!cpu_state.abrt && ins_fetch_fault) {
+            if (is386)
+                ins_fetch_fault = cpu_386_check_instruction_fault();
+
+            /* Breakpoint fault has priority over other faults. */
+            if ((cpu_state.abrt == 0) & ins_fetch_fault) {
                 x86gen();
                 ins_fetch_fault = 0;
                 /* No instructions executed at this point. */
                 goto block_ended;
+            } else if (cpu_16bitbus) {
+                CHECK_READ_CS(MIN(ol, 2));
+            } else {
+                CHECK_READ_CS(MIN(ol, 4));
             }
 
             if (!cpu_state.abrt) {
 #ifdef ENABLE_386_LOG
                 if (in_smm)
-                    x386_2386_log("[%04X:%08X] %08X\n", CS, cpu_state.pc, fetchdat);
+                    x386_log("[%04X:%08X] %08X\n", CS, cpu_state.pc, fetchdat);
 #endif
                 opcode = fetchdat & 0xFF;
                 fetchdat >>= 8;
                 trap |= !!(cpu_state.flags & T_FLAG);
 
                 cpu_state.pc++;
-                x86_opcodes[(opcode | cpu_state.op32) & 0x3ff](fetchdat);
+                if (opcode == 0xf0)
+                    in_lock = 1;
+                x86_2386_opcodes[(opcode | cpu_state.op32) & 0x3ff](fetchdat);
+                in_lock = 0;
                 if (x86_was_reset)
                     break;
             }
@@ -293,6 +307,13 @@ exec386_2386(int32_t cycs)
                 cpu_state.pc &= 0xffff;
 #endif
 
+            if (cpu_flush_pending == 1)
+                cpu_flush_pending++;
+            else if (cpu_flush_pending == 2) {
+                cpu_flush_pending = 0;
+                flushmmucache_pc();
+            }
+
             if (cpu_end_block_after_ins)
                 cpu_end_block_after_ins--;
 
@@ -319,8 +340,17 @@ block_ended:
 #endif
                     }
                 }
-                if (!x86_was_reset && ins_fetch_fault)
-                    x86gen();   /* This is supposed to be the first one serviced by the processor according to the manual. */
+
+                if (is386 && !x86_was_reset  && ins_fetch_fault)
+                    x86gen();
+            } else if (new_ne) {
+                flags_rebuild();
+                new_ne = 0;
+#ifndef USE_NEW_DYNAREC
+                oldcs = CS;
+#endif
+                cpu_state.oldpc = cpu_state.pc;
+                x86_int(16);
             } else if (trap) {
                 flags_rebuild();
                 if (trap & 2) dr[6] |= 0x8000;
diff --git a/src/cpu/386_common.c b/src/cpu/386_common.c
index 4b4037207..2853e3c9a 100644
--- a/src/cpu/386_common.c
+++ b/src/cpu/386_common.c
@@ -14,6 +14,7 @@
 #include <86box/timer.h>
 #include "x86.h"
 #include "x86seg_common.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include <86box/nmi.h>
 #include <86box/mem.h>
@@ -50,6 +51,8 @@ uint32_t dr[8];
 uint32_t use32;
 int      stack32;
 
+int      cpu_init = 0;
+
 uint32_t *eal_r;
 uint32_t *eal_w;
 
@@ -69,6 +72,7 @@ extern uint8_t *pccache2;
 extern int      optype;
 extern uint32_t pccache;
 
+int      new_ne            = 0;
 int      in_sys            = 0;
 int      unmask_a20_in_smm = 0;
 uint32_t old_rammask       = 0xffffffff;
@@ -103,6 +107,34 @@ uint32_t backupregs[16];
 
 x86seg _oldds;
 
+uint8_t rep_op = 0x00;
+uint8_t is_smint = 0;
+
+uint16_t io_port = 0x0000;
+uint32_t io_val  = 0x00000000;
+
+int opcode_has_modrm[256] = {
+    1, 1, 1, 1,  0, 0, 0, 0,  1, 1, 1, 1,  0, 0, 0, 0, /*00*/
+    1, 1, 1, 1,  0, 0, 0, 0,  1, 1, 1, 1,  0, 0, 0, 0, /*10*/
+    1, 1, 1, 1,  0, 0, 0, 0,  1, 1, 1, 1,  0, 0, 0, 0, /*20*/
+    1, 1, 1, 1,  0, 0, 0, 0,  1, 1, 1, 1,  0, 0, 0, 0, /*30*/
+
+    0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, /*40*/
+    0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, /*50*/
+    0, 0, 1, 1,  0, 0, 0, 0,  0, 1, 0, 1,  0, 0, 0, 0, /*60*/
+    0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, /*70*/
+
+    1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1, /*80*/
+    0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, /*90*/
+    0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, /*a0*/
+    0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, /*b0*/
+
+    1, 1, 0, 0,  1, 1, 1, 1,  0, 0, 0, 0,  0, 0, 0, 0, /*c0*/
+    1, 1, 1, 1,  0, 0, 0, 0,  1, 1, 1, 1,  1, 1, 1, 1, /*d0*/
+    0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, /*e0*/
+    0, 0, 0, 0,  0, 0, 1, 1,  0, 0, 0, 0,  0, 0, 1, 1, /*f0*/
+};
+
 int opcode_length[256] = { 3, 3, 3, 3, 3, 3, 1, 1, 3, 3, 3, 3, 3, 3, 1, 3,   /* 0x0x */
                            3, 3, 3, 3, 3, 3, 1, 1, 3, 3, 3, 3, 3, 3, 1, 1,   /* 0x1x */
                            3, 3, 3, 3, 3, 3, 1, 1, 3, 3, 3, 3, 3, 3, 1, 1,   /* 0x2x */
@@ -120,6 +152,53 @@ int opcode_length[256] = { 3, 3, 3, 3, 3, 3, 1, 1, 3, 3, 3, 3, 3, 3, 1, 3,   /*
                            2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 2, 1, 1, 1, 1,   /* 0xex */
                            1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 3, 3 }; /* 0xfx */
 
+/* 0 = no, 1 = always, 2 = depends on second opcode, 3 = depends on mod/rm */
+int lock_legal[256]    = { 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 2,   /* 0x0x */
+                           1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0,   /* 0x1x */
+                           1, 1, 1, 1, 1, 1, 4, 0, 1, 1, 1, 1, 1, 1, 4, 0,   /* 0x2x */
+                           1, 1, 1, 1, 1, 1, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0,   /* 0x3x */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0x4x */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0x5x */
+                           0, 0, 0, 0, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0x6x */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0x7x */
+                           3, 3, 3, 3, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0x8x */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0x9x */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0xax */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0xbx */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0xcx */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0xdx */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0xex */
+                           0, 0, 0, 0, 0, 0, 3, 3, 0, 0, 0, 0, 0, 0, 3, 3 }; /* 0xfx */
+
+int lock_legal_0f[256] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0x0x */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0x1x */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0x2x */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0x3x */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0x4x */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0x5x */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0x6x */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0x7x */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0x8x */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0x9x */
+                           0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,   /* 0xax */
+                           0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0,   /* 0xbx */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0xcx */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0xdx */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   /* 0xex */
+                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; /* 0xfx */
+
+/* (modrm >> 3) & 0x07 */
+int lock_legal_ba[8]   = { 0, 0, 0, 0, 1, 1, 1, 1 };
+
+/* Also applies to 81, 82, and 83 */
+int lock_legal_80[8]   = { 1, 1, 1, 1, 1, 1, 1, 0 };
+
+/* Also applies to F7 */
+int lock_legal_f6[8]   = { 0, 0, 1, 1, 0, 0, 0, 0 };
+
+/* Also applies to FF */
+int lock_legal_fe[8]   = { 1, 1, 0, 0, 0, 0, 0, 0 };
+
 uint32_t addr64;
 uint32_t addr64_2;
 uint32_t addr64a[8];
@@ -128,9 +207,9 @@ uint32_t addr64a_2[8];
 static pc_timer_t *cpu_fast_off_timer  = NULL;
 static double      cpu_fast_off_period = 0.0;
 
-#define AMD_SYSCALL_EIP (msr.star & 0xFFFFFFFF)
-#define AMD_SYSCALL_SB  ((msr.star >> 32) & 0xFFFF)
-#define AMD_SYSRET_SB   ((msr.star >> 48) & 0xFFFF)
+#define AMD_SYSCALL_EIP (msr.amd_star & 0xFFFFFFFF)
+#define AMD_SYSCALL_SB  ((msr.amd_star >> 32) & 0xFFFF)
+#define AMD_SYSRET_SB   ((msr.amd_star >> 48) & 0xFFFF)
 
 /* These #define's and enum have been borrowed from Bochs. */
 /* SMM feature masks */
@@ -376,6 +455,52 @@ x386_common_log(const char *fmt, ...)
 #    define x386_common_log(fmt, ...)
 #endif
 
+int
+is_lock_legal(uint32_t fetchdat)
+{
+    int legal = 1;
+
+    if (is386) {
+        fetch_dat_t fetch_dat;
+        fetch_dat.fd = fetchdat;
+
+        legal = lock_legal[fetch_dat.b[0]];
+        if (legal == 1)
+            legal = 1; // ((fetch_dat.b[1] >> 6) != 0x03);    /* reg is illegal */
+        else if (legal == 2) {
+            legal = lock_legal_0f[fetch_dat.b[1]];
+            if (legal == 1)
+                legal = ((fetch_dat.b[2] >> 6) != 0x03);    /* reg,reg is illegal */
+            else if (legal == 3) {
+                legal = lock_legal_ba[(fetch_dat.b[2] >> 3) & 0x07];
+                if (legal == 1)
+                    legal = ((fetch_dat.b[2] >> 6) != 0x03);    /* reg,imm is illegal */
+            }
+        } else if (legal == 3)  switch(fetch_dat.b[0]) {
+            case 0x80 ... 0x83:
+                legal = lock_legal_80[(fetch_dat.b[1] >> 3) & 0x07];
+            if (legal == 1)
+                legal = ((fetch_dat.b[1] >> 6) != 0x03);    /* reg is illegal */
+            break;
+            case 0xf6 ... 0xf7:
+                legal = lock_legal_f6[(fetch_dat.b[1] >> 3) & 0x07];
+            if (legal == 1)
+                legal = ((fetch_dat.b[1] >> 6) != 0x03);    /* reg is illegal */
+            break;
+            case 0xfe ... 0xff:
+                legal = lock_legal_fe[(fetch_dat.b[1] >> 3) & 0x07];
+            if (legal == 1)
+                legal = ((fetch_dat.b[1] >> 6) != 0x03);    /* reg is illegal */
+            break;
+            default:
+                legal = 0;
+            break;
+        }
+    }
+
+    return legal;
+}
+
 /*Prefetch emulation is a fairly simplistic model:
   - All instruction bytes must be fetched before it starts.
   - Cycles used for non-instruction memory accesses are counted and subtracted
@@ -898,9 +1023,14 @@ smram_restore_state_p6(uint32_t *saved_state)
     cpu_state.seg_gs.ar_high = (saved_state[SMRAM_FIELD_P6_GS_SELECTOR_AR] >> 24) & 0xff;
     smm_seg_load(&cpu_state.seg_gs);
 
-    mem_a20_alt = 0x00;
-    mem_a20_key = saved_state[SMRAM_FIELD_P6_A20M] ? 0x00 : 0x02;
-    mem_a20_recalc();
+    rammask     = cpu_16bitbus ? 0xFFFFFF : 0xFFFFFFFF;
+    if (is6117)
+        rammask |= 0x3000000;
+
+    if (saved_state[SMRAM_FIELD_P6_A20M] & 0x01)
+        rammask &= 0xffefffff;
+
+    flushmmucache();
 
     if (SMM_REVISION_ID & SMM_SMBASE_RELOCATION)
         smbase = saved_state[SMRAM_FIELD_P6_SMBASE_OFFSET];
@@ -1091,7 +1221,7 @@ smram_restore_state_amd_k(uint32_t *saved_state)
 }
 
 static void
-smram_save_state_cyrix(uint32_t *saved_state, UNUSED(int in_hlt))
+smram_save_state_cyrix(uint32_t *saved_state, int in_hlt)
 {
     saved_state[0] = dr[7];
     saved_state[1] = cpu_state.flags | (cpu_state.eflags << 16);
@@ -1100,6 +1230,35 @@ smram_save_state_cyrix(uint32_t *saved_state, UNUSED(int in_hlt))
     saved_state[4] = cpu_state.pc;
     saved_state[5] = CS | (CPL << 21);
     saved_state[6] = 0x00000000;
+    saved_state[7] = 0x00010000;
+
+    if (((opcode >= 0x6e) && (opcode <= 0x6f)) || ((opcode >= 0xe6) && (opcode <= 0xe7)) ||
+        ((opcode >= 0xee) && (opcode <= 0xef))) {
+        saved_state[6] |= 0x00000002;
+        saved_state[7] = (opcode & 0x01) ? (cpu_state.op32 ? 0x000f0000 : 0x00030000) : 0x00010000;
+    } else if (((opcode == 0xf2) || (opcode == 0xf3)) && (rep_op >= 0x6e) && (rep_op <= 0x6f)) {
+        saved_state[6] |= 0x00000006;
+        saved_state[7] = (rep_op & 0x01) ? (cpu_state.op32 ? 0x000f0000 : 0x00030000) : 0x00010000;
+    } else if (((opcode == 0xf2) || (opcode == 0xf3)) && (rep_op >= 0x6e) && (rep_op <= 0x6f)) {
+        saved_state[6] |= 0x00000004;
+        saved_state[7] = (rep_op & 0x01) ? (cpu_state.op32 ? 0x000f0000 : 0x00030000) : 0x00010000;
+    }
+
+    if (is_smint) {
+        saved_state[6] |= 0x00000008;
+        is_smint = 0;
+    }
+
+    if (in_hlt)
+        saved_state[6] |= 0x00000010;
+
+    saved_state[7] |= io_port;
+    saved_state[8] = io_val;
+
+    if (saved_state[6] & 0x00000002)
+        saved_state[9] = ESI;
+    else
+        saved_state[9] = EDI;
 }
 
 static void
@@ -1110,6 +1269,13 @@ smram_restore_state_cyrix(uint32_t *saved_state)
     cpu_state.eflags = saved_state[1] >> 16;
     cr0              = saved_state[2];
     cpu_state.pc     = saved_state[4];
+    /* Restore CPL. */
+    cpu_state.seg_cs.access = (cpu_state.seg_cs.access & ~0x9f) | (((saved_state[5] >> 21) & 0x03) << 5);
+
+    if (saved_state[6] & 0x00000002)
+        ESI = saved_state[9];
+    else
+        EDI = saved_state[9];
 }
 
 void
@@ -1244,6 +1410,9 @@ enter_smm(int in_hlt)
         writememl(0, smram_state - 0x14, saved_state[4]);
         writememl(0, smram_state - 0x18, saved_state[5]);
         writememl(0, smram_state - 0x24, saved_state[6]);
+        writememl(0, smram_state - 0x28, saved_state[7]);
+        writememl(0, smram_state - 0x2c, saved_state[8]);
+        writememl(0, smram_state - 0x30, saved_state[9]);
     } else {
         for (uint8_t n = 0; n < SMM_SAVE_STATE_MAP_SIZE; n++) {
             smram_state -= 4;
@@ -1280,26 +1449,44 @@ enter_smm(int in_hlt)
 void
 enter_smm_check(int in_hlt)
 {
-    if ((in_smm == 0) && smi_line) {
-#ifdef ENABLE_386_COMMON_LOG
-        x386_common_log("SMI while not in SMM\n");
-#endif
-        enter_smm(in_hlt);
-    } else if ((in_smm == 1) && smi_line) {
-        /* Mark this so that we don't latch more than one SMI. */
-#ifdef ENABLE_386_COMMON_LOG
-        x386_common_log("SMI while in unlatched SMM\n");
-#endif
-        smi_latched = 1;
-    } else if ((in_smm == 2) && smi_line) {
-        /* Mark this so that we don't latch more than one SMI. */
-#ifdef ENABLE_386_COMMON_LOG
-        x386_common_log("SMI while in latched SMM\n");
-#endif
-    }
+    uint8_t ccr1_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SMAC | CCR1_SM3)) ==
+                          (CCR1_USE_SMI | CCR1_SM3)) && (cyrix.arr[3].size > 0);
+
+    if (smi_line) {
+        if (!is_cxsmm || ccr1_check)  switch (in_smm) {
+            default:
+#ifdef ENABLE_386_COMMON_LOG
+                fatal("SMI while in_smm = %i\n", in_smm);
+                break;
+#endif
+            case 0:
+#ifdef ENABLE_386_COMMON_LOG
+                x386_common_log("SMI while not in SMM\n");
+#endif
+                enter_smm(in_hlt);
+                break;
+            case 1:
+                /* Mark this so that we don't latch more than one SMI. */
+#ifdef ENABLE_386_COMMON_LOG
+                x386_common_log("SMI while in unlatched SMM\n");
+#endif
+                smi_latched = 1;
+                break;
+            case 2:
+#ifdef ENABLE_386_COMMON_LOG
+                x386_common_log("SMI while in latched SMM\n");
+#endif
+                break;
+        }
+#ifdef ENABLE_386_COMMON_LOG
+        else {
+            x386_common_log("SMI while in Cyrix disabled mode\n");
+            x386_common_log("lol\n");
+        }
+#endif
 
-    if (smi_line)
         smi_line = 0;
+    }
 }
 
 void
@@ -1328,6 +1515,9 @@ leave_smm(void)
         else
             cyrix_load_seg_descriptor_2386(smram_state - 0x20, &cpu_state.seg_cs);
         saved_state[6] = readmeml(0, smram_state - 0x24);
+        saved_state[7] = readmeml(0, smram_state - 0x28);
+        saved_state[8] = readmeml(0, smram_state - 0x2c);
+        saved_state[9] = readmeml(0, smram_state - 0x30);
     } else {
         for (uint8_t n = 0; n < SMM_SAVE_STATE_MAP_SIZE; n++) {
             smram_state -= 4;
@@ -1412,7 +1602,7 @@ x86_int(int num)
     cpu_state.pc = cpu_state.oldpc;
 
     if (msw & 1)
-        is486 ? pmodeint(num, 0) : pmodeint_2386(num, 0);
+        cpu_use_exec ? pmodeint(num, 0) : pmodeint_2386(num, 0);
     else {
         addr = (num << 2) + idt.base;
 
@@ -1445,7 +1635,7 @@ x86_int(int num)
             oxpc = cpu_state.pc;
 #endif
             cpu_state.pc = readmemw(0, addr);
-            is486 ? loadcs(readmemw(0, addr + 2)) : loadcs_2386(readmemw(0, addr + 2));
+            cpu_use_exec ? loadcs(readmemw(0, addr + 2)) : loadcs_2386(readmemw(0, addr + 2));
         }
     }
 
@@ -1462,7 +1652,7 @@ x86_int_sw(int num)
     cycles -= timing_int;
 
     if (msw & 1)
-        is486 ? pmodeint(num, 1) : pmodeint_2386(num, 1);
+        cpu_use_exec ? pmodeint(num, 1) : pmodeint_2386(num, 1);
     else {
         addr = (num << 2) + idt.base;
 
@@ -1487,12 +1677,15 @@ x86_int_sw(int num)
             oxpc = cpu_state.pc;
 #endif
             cpu_state.pc = readmemw(0, addr);
-            is486 ? loadcs(readmemw(0, addr + 2)) : loadcs_2386(readmemw(0, addr + 2));
+            cpu_use_exec ? loadcs(readmemw(0, addr + 2)) : loadcs_2386(readmemw(0, addr + 2));
             cycles -= timing_int_rm;
         }
     }
 
-    trap &= ~1;
+    if (cpu_use_exec)
+        trap = 0;
+    else
+        trap &= ~1;
     CPU_BLOCK_END();
 }
 
@@ -1529,13 +1722,16 @@ x86_int_sw_rm(int num)
     cpu_state.eflags &= ~VIF_FLAG;
     cpu_state.flags &= ~T_FLAG;
     cpu_state.pc = new_pc;
-    is486 ? loadcs(new_cs) : loadcs_2386(new_cs);
+    cpu_use_exec ? loadcs(new_cs) : loadcs_2386(new_cs);
 #ifndef USE_NEW_DYNAREC
     oxpc = cpu_state.pc;
 #endif
 
     cycles -= timing_int_rm;
-    trap &= ~1;
+    if (cpu_use_exec)
+        trap = 0;
+    else
+        trap &= ~1;
     CPU_BLOCK_END();
 
     return 0;
@@ -1552,6 +1748,13 @@ checkio(uint32_t port, int mask)
 {
     uint32_t t;
 
+    if (!(tr.access & 0x08)) {
+        if ((CPL) > (IOPL))
+            return 1;
+
+        return 0;
+    }
+
     cpl_override = 1;
     t            = readmemw(tr.base, 0x66);
 
@@ -1688,7 +1891,7 @@ cpu_386_check_instruction_fault(void)
 }
 
 int
-sysenter(uint32_t fetchdat)
+sysenter(UNUSED(uint32_t fetchdat))
 {
 #ifdef ENABLE_386_COMMON_LOG
     x386_common_log("SYSENTER called\n");
@@ -1770,7 +1973,7 @@ sysenter(uint32_t fetchdat)
 }
 
 int
-sysexit(uint32_t fetchdat)
+sysexit(UNUSED(uint32_t fetchdat))
 {
 #ifdef ENABLE_386_COMMON_LOG
     x386_common_log("SYSEXIT called\n");
@@ -1857,7 +2060,7 @@ sysexit(uint32_t fetchdat)
 }
 
 int
-syscall_op(uint32_t fetchdat)
+syscall_op(UNUSED(uint32_t fetchdat))
 {
 #ifdef ENABLE_386_COMMON_LOG
     x386_common_log("SYSCALL called\n");
@@ -1909,7 +2112,7 @@ syscall_op(uint32_t fetchdat)
 }
 
 int
-sysret(uint32_t fetchdat)
+sysret(UNUSED(uint32_t fetchdat))
 {
 #ifdef ENABLE_386_COMMON_LOG
     x386_common_log("SYSRET called\n");
@@ -2001,6 +2204,12 @@ cpu_fast_off_reset(void)
 void
 smi_raise(void)
 {
+    uint8_t ccr1_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SMAC | CCR1_SM3)) ==
+                          (CCR1_USE_SMI | CCR1_SM3)) && (cyrix.arr[3].size > 0);
+
+    if (is_cxsmm && !ccr1_check)
+        return;
+
     if (is486 && (cpu_fast_off_flags & 0x80000000))
         cpu_fast_off_advance();
 
diff --git a/src/cpu/386_common.h b/src/cpu/386_common.h
index 35d4f7cc8..83ef4e72b 100644
--- a/src/cpu/386_common.h
+++ b/src/cpu/386_common.h
@@ -49,6 +49,82 @@
 #    define do_mmut_wb(s, a, b)     do_mmutranslate_2386((s) + (a), b, 1, 1)
 #    define do_mmut_ww(s, a, b)     do_mmutranslate_2386((s) + (a), b, 2, 1)
 #    define do_mmut_wl(s, a, b)     do_mmutranslate_2386((s) + (a), b, 4, 1)
+#elif defined(USE_DEBUG_REGS_486)
+#    define readmemb_n(s, a, b) ((readlookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (dr[7] & 0xFF)) ? readmembl_no_mmut((s) + (a), b) : *(uint8_t *) (readlookup2[(uint32_t) ((s) + (a)) >> 12] + (uintptr_t) ((s) + (a))))
+#    define readmemw_n(s, a, b) ((readlookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (dr[7] & 0xFF) || (((s) + (a)) & 1)) ? readmemwl_no_mmut((s) + (a), b) : *(uint16_t *) (readlookup2[(uint32_t) ((s) + (a)) >> 12] + (uint32_t) ((s) + (a))))
+#    define readmeml_n(s, a, b) ((readlookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (dr[7] & 0xFF) || (((s) + (a)) & 3)) ? readmemll_no_mmut((s) + (a), b) : *(uint32_t *) (readlookup2[(uint32_t) ((s) + (a)) >> 12] + (uint32_t) ((s) + (a))))
+#    define readmemb(s, a)      ((readlookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (dr[7] & 0xFF)) ? readmembl((s) + (a)) : *(uint8_t *) (readlookup2[(uint32_t) ((s) + (a)) >> 12] + (uintptr_t) ((s) + (a))))
+#    define readmemw(s, a)      ((readlookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (dr[7] & 0xFF) || (((s) + (a)) & 1)) ? readmemwl((s) + (a)) : *(uint16_t *) (readlookup2[(uint32_t) ((s) + (a)) >> 12] + (uint32_t) ((s) + (a))))
+#    define readmeml(s, a)      ((readlookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (dr[7] & 0xFF) || (((s) + (a)) & 3)) ? readmemll((s) + (a)) : *(uint32_t *) (readlookup2[(uint32_t) ((s) + (a)) >> 12] + (uint32_t) ((s) + (a))))
+#    define readmemq(s, a)      ((readlookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (dr[7] & 0xFF) || (((s) + (a)) & 7)) ? readmemql((s) + (a)) : *(uint64_t *) (readlookup2[(uint32_t) ((s) + (a)) >> 12] + (uintptr_t) ((s) + (a))))
+
+#    define writememb_n(s, a, b, v)                                                                                      \
+        if (writelookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (dr[7] & 0xFF)) \
+            writemembl_no_mmut((s) + (a), b, v);                                                                         \
+        else                                                                                                             \
+            *(uint8_t *) (writelookup2[(uint32_t) ((s) + (a)) >> 12] + (uintptr_t) ((s) + (a))) = v
+#    define writememw_n(s, a, b, v)                                                                                                                   \
+        if (writelookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (((s) + (a)) & 1) || (dr[7] & 0xFF))         \
+            writememwl_no_mmut((s) + (a), b, v);                                                                                                      \
+        else                                                                                                                                          \
+            *(uint16_t *) (writelookup2[(uint32_t) ((s) + (a)) >> 12] + (uintptr_t) ((s) + (a))) = v
+#    define writememl_n(s, a, b, v)                                                                                                           \
+        if (writelookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (((s) + (a)) & 3) || (dr[7] & 0xFF)) \
+            writememll_no_mmut((s) + (a), b, v);                                                                                              \
+        else                                                                                                                                  \
+            *(uint32_t *) (writelookup2[(uint32_t) ((s) + (a)) >> 12] + (uintptr_t) ((s) + (a))) = v
+#    define writememb(s, a, v)                                                                                           \
+        if (writelookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (dr[7] & 0xFF)) \
+            writemembl((s) + (a), v);                                                                                    \
+        else                                                                                                             \
+            *(uint8_t *) (writelookup2[(uint32_t) ((s) + (a)) >> 12] + (uintptr_t) ((s) + (a))) = v
+#    define writememw(s, a, v)                                                                                                                \
+        if (writelookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (((s) + (a)) & 1) || (dr[7] & 0xFF)) \
+            writememwl((s) + (a), v);                                                                                                         \
+        else                                                                                                                                  \
+            *(uint16_t *) (writelookup2[(uint32_t) ((s) + (a)) >> 12] + (uintptr_t) ((s) + (a))) = v
+#    define writememl(s, a, v)                                                                                                                \
+        if (writelookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (((s) + (a)) & 3) || (dr[7] & 0xFF)) \
+            writememll((s) + (a), v);                                                                                                         \
+        else                                                                                                                                  \
+            *(uint32_t *) (writelookup2[(uint32_t) ((s) + (a)) >> 12] + (uintptr_t) ((s) + (a))) = v
+#    define writememq(s, a, v)                                                                                                                \
+        if (writelookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (((s) + (a)) & 7) || (dr[7] & 0xFF)) \
+            writememql((s) + (a), v);                                                                                                         \
+        else                                                                                                                                  \
+            *(uint64_t *) (writelookup2[(uint32_t) ((s) + (a)) >> 12] + (uintptr_t) ((s) + (a))) = v
+
+#    define do_mmut_rb(s, a, b)                                                                                         \
+        if (readlookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (dr[7] & 0xFF)) \
+        do_mmutranslate((s) + (a), b, 1, 0)
+#    define do_mmut_rw(s, a, b)                                                                                                              \
+        if (readlookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (((s) + (a)) & 1) || (dr[7] & 0xFF)) \
+        do_mmutranslate((s) + (a), b, 2, 0)
+#    define do_mmut_rl(s, a, b)                                                                                                              \
+        if (readlookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (((s) + (a)) & 3) || (dr[7] & 0xFF)) \
+        do_mmutranslate((s) + (a), b, 4, 0)
+#    define do_mmut_rb2(s, a, b)                                                      \
+        old_rl2 = readlookup2[(uint32_t) ((s) + (a)) >> 12];                          \
+        if (old_rl2 == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (dr[7] & 0xFF)) \
+        do_mmutranslate((s) + (a), b, 1, 0)
+#    define do_mmut_rw2(s, a, b)                                                                           \
+        old_rl2 = readlookup2[(uint32_t) ((s) + (a)) >> 12];                                               \
+        if (old_rl2 == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (((s) + (a)) & 1) || (dr[7] & 0xFF)) \
+        do_mmutranslate((s) + (a), b, 2, 0)
+#    define do_mmut_rl2(s, a, b)                                                                           \
+        old_rl2 = readlookup2[(uint32_t) ((s) + (a)) >> 12];                                               \
+        if (old_rl2 == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (((s) + (a)) & 3) || (dr[7] & 0xFF)) \
+        do_mmutranslate((s) + (a), b, 4, 0)
+
+#    define do_mmut_wb(s, a, b)                                                                                          \
+        if (writelookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (dr[7] & 0xFF)) \
+        do_mmutranslate((s) + (a), b, 1, 1)
+#    define do_mmut_ww(s, a, b)                                                                                                               \
+        if (writelookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (((s) + (a)) & 1) || (dr[7] & 0xFF)) \
+        do_mmutranslate((s) + (a), b, 2, 1)
+#    define do_mmut_wl(s, a, b)                                                                                                               \
+        if (writelookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (((s) + (a)) & 3) || (dr[7] & 0xFF)) \
+        do_mmutranslate((s) + (a), b, 4, 1)
 #else
 #    define readmemb_n(s, a, b) ((readlookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF) ? readmembl_no_mmut((s) + (a), b) : *(uint8_t *) (readlookup2[(uint32_t) ((s) + (a)) >> 12] + (uintptr_t) ((s) + (a))))
 #    define readmemw_n(s, a, b) ((readlookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (((s) + (a)) & 1)) ? readmemwl_no_mmut((s) + (a), b) : *(uint16_t *) (readlookup2[(uint32_t) ((s) + (a)) >> 12] + (uint32_t) ((s) + (a))))
@@ -201,6 +277,19 @@ int checkio(uint32_t port, int mask);
 #define CHECK_WRITE(chseg, low, high) \
     CHECK_WRITE_COMMON(chseg, low, high)
 
+#define CHECK_WRITE_2OP(chseg, low, high, low2, high2)                                                                                                                             \
+    if ((low < (chseg)->limit_low) || (high > (chseg)->limit_high) || (low2 < (chseg)->limit_low) || (high2 > (chseg)->limit_high) || !((chseg)->access & 2) || ((msw & 1) && !(cpu_state.eflags & VM_FLAG) && ((chseg)->access & 8))) { \
+        x86gpf("Limit check (WRITE)", 0);                                                                                                                                \
+        return 1;                                                                                                                                                        \
+    }                                                                                                                                                                    \
+    if (msw & 1 && !(cpu_state.eflags & VM_FLAG) && !((chseg)->access & 0x80)) {                                                                                         \
+        if ((chseg) == &cpu_state.seg_ss)                                                                                                                                \
+            x86ss(NULL, (chseg)->seg & 0xfffc);                                                                                                                          \
+        else                                                                                                                                                             \
+            x86np("Write to seg not present", (chseg)->seg & 0xfffc);                                                                                                    \
+        return 1;                                                                                                                                                        \
+    }
+
 #define CHECK_WRITE_REP(chseg, low, high)                                        \
     if ((low < (chseg)->limit_low) || (high > (chseg)->limit_high)) {            \
         x86gpf("Limit check (WRITE REP)", 0);                                    \
@@ -225,19 +314,37 @@ int checkio(uint32_t port, int mask);
 static __inline uint8_t
 fastreadb(uint32_t a)
 {
-    return readmembl_2386(a);
+    uint8_t ret;
+    read_type = 1;
+    ret = readmembl_2386(a);
+    read_type = 4;
+    if (cpu_state.abrt)
+        return 0;
+    return ret;
 }
 
 static __inline uint16_t
 fastreadw(uint32_t a)
 {
-    return readmemwl_2386(a);
+    uint16_t ret;
+    read_type = 1;
+    ret = readmemwl_2386(a);
+    read_type = 4;
+    if (cpu_state.abrt)
+        return 0;
+    return ret;
 }
 
 static __inline uint32_t
 fastreadl(uint32_t a)
 {
-    return readmemll_2386(a);
+    uint32_t ret;
+    read_type = 1;
+    ret = readmemll_2386(a);
+    read_type = 4;
+    if (cpu_state.abrt)
+        return 0;
+    return ret;
 }
 #else
 static __inline uint8_t
@@ -245,6 +352,11 @@ fastreadb(uint32_t a)
 {
     uint8_t *t;
 
+#    ifdef USE_DEBUG_REGS_486
+    read_type = 1;
+    mem_debug_check_addr(a, read_type);
+    read_type = 4;
+#    endif
     if ((a >> 12) == pccache)
 #    if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
         return *((uint8_t *) (((uintptr_t) &pccache2[a] & 0x00000000ffffffffULL) | ((uintptr_t) &pccache2[0] & 0xffffffff00000000ULL)));
@@ -268,6 +380,12 @@ fastreadw(uint32_t a)
 {
     uint8_t *t;
     uint16_t val;
+#    ifdef USE_DEBUG_REGS_486
+    read_type = 1;
+    mem_debug_check_addr(a, read_type);
+    mem_debug_check_addr(a + 1, read_type);
+    read_type = 4;
+#    endif
     if ((a & 0xFFF) > 0xFFE) {
         val = fastreadb(a);
         val |= (fastreadb(a + 1) << 8);
@@ -297,6 +415,14 @@ fastreadl(uint32_t a)
 {
     uint8_t *t;
     uint32_t val;
+#    ifdef USE_DEBUG_REGS_486
+    int i;
+    read_type = 1;
+    for (i = 0; i < 4; i++) {
+        mem_debug_check_addr(a + i, read_type);
+    }
+    read_type = 4;
+#    endif
     if ((a & 0xFFF) < 0xFFD) {
         if ((a >> 12) != pccache) {
             t = getpccache(a);
@@ -336,37 +462,52 @@ get_ram_ptr(uint32_t a)
     }
 }
 
+extern int opcode_has_modrm[256];
 extern int opcode_length[256];
 
 #ifdef OPS_286_386
 static __inline uint16_t
 fastreadw_fetch(uint32_t a)
 {
-    uint16_t val;
+    uint16_t ret;
 
+    cpu_old_paging = (cpu_flush_pending == 2);
     if ((a & 0xFFF) > 0xFFE) {
-        val = fastreadb(a);
-        if (opcode_length[val & 0xff] > 1)
-            val |= ((uint16_t) fastreadb(a + 1) << 8);
-        return val;
+        ret = fastreadb(a);
+        if (!cpu_state.abrt && (opcode_length[ret & 0xff] > 1))
+            ret |= ((uint16_t) fastreadb(a + 1) << 8);
+    } else if (cpu_state.abrt)
+        ret = 0;
+    else {
+        read_type = 1;
+        ret = readmemwl_2386(a);
+        read_type = 4;
     }
+    cpu_old_paging = 0;
 
-    return readmemwl_2386(a);
+    return ret;
 }
 
 static __inline uint32_t
 fastreadl_fetch(uint32_t a)
 {
-    uint32_t val;
+    uint32_t ret;
 
     if (cpu_16bitbus || ((a & 0xFFF) > 0xFFC)) {
-        val = fastreadw_fetch(a);
-        if (opcode_length[val & 0xff] > 2)
-            val |= ((uint32_t) fastreadw(a + 2) << 16);
-        return val;
+        ret = fastreadw_fetch(a);
+        if (!cpu_state.abrt && (opcode_length[ret & 0xff] > 2))
+            ret |= ((uint32_t) fastreadw(a + 2) << 16);
+    } else if (cpu_state.abrt)
+        ret = 0;
+    else {
+        read_type = 1;
+        cpu_old_paging = (cpu_flush_pending == 2);
+        ret = readmemll_2386(a);
+        cpu_old_paging = 0;
+        read_type = 4;
     }
 
-    return readmemll_2386(a);
+    return ret;
 }
 #else
 static __inline uint16_t
@@ -374,6 +515,12 @@ fastreadw_fetch(uint32_t a)
 {
     uint8_t *t;
     uint16_t val;
+#    ifdef USE_DEBUG_REGS_486
+    read_type = 1;
+    mem_debug_check_addr(a, read_type);
+    mem_debug_check_addr(a + 1, read_type);
+    read_type = 4;
+#    endif
     if ((a & 0xFFF) > 0xFFE) {
         val = fastreadb(a);
         if (opcode_length[val & 0xff] > 1)
@@ -404,6 +551,14 @@ fastreadl_fetch(uint32_t a)
 {
     uint8_t *t;
     uint32_t val;
+#    ifdef USE_DEBUG_REGS_486
+    int i;
+    read_type = 1;
+    for (i = 0; i < 4; i++) {
+        mem_debug_check_addr(a + i, read_type);
+    }
+    read_type = 4;
+#    endif
     if ((a & 0xFFF) < 0xFFD) {
         if ((a >> 12) != pccache) {
             t = getpccache(a);
@@ -425,35 +580,52 @@ fastreadl_fetch(uint32_t a)
 }
 #endif
 
+#ifdef OPS_286_386
 static __inline uint8_t
 getbyte(void)
 {
+    uint8_t ret;
     cpu_state.pc++;
-    return fastreadb(cs + (cpu_state.pc - 1));
+    cpu_old_paging = (cpu_flush_pending == 2);
+    ret = fastreadb(cs + (cpu_state.pc - 1));
+    cpu_old_paging = 0;
+    return ret;
+
 }
 
 static __inline uint16_t
 getword(void)
 {
+    uint16_t ret;
     cpu_state.pc += 2;
-    return fastreadw(cs + (cpu_state.pc - 2));
+    cpu_old_paging = (cpu_flush_pending == 2);
+    ret = fastreadw(cs + (cpu_state.pc - 2));
+    cpu_old_paging = 0;
+    return ret;
 }
 
 static __inline uint32_t
 getlong(void)
 {
+    uint32_t ret;
     cpu_state.pc += 4;
-    return fastreadl(cs + (cpu_state.pc - 4));
+    cpu_old_paging = (cpu_flush_pending == 2);
+    ret = fastreadl(cs + (cpu_state.pc - 4));
+    cpu_old_paging = 0;
+    return ret;
 }
 
 static __inline uint64_t
 getquad(void)
 {
+    uint64_t ret;
     cpu_state.pc += 8;
-    return fastreadl(cs + (cpu_state.pc - 8)) | ((uint64_t) fastreadl(cs + (cpu_state.pc - 4)) << 32);
+    cpu_old_paging = (cpu_flush_pending == 2);
+    ret = fastreadl(cs + (cpu_state.pc - 8)) | ((uint64_t) fastreadl(cs + (cpu_state.pc - 4)) << 32);
+    cpu_old_paging = 0;
+    return ret;
 }
 
-#ifdef OPS_286_386
 static __inline uint8_t
 geteab(void)
 {
@@ -540,6 +712,34 @@ seteaq(uint64_t v)
 #    define seteaw_mem(v) writememwl_2386(easeg + cpu_state.eaaddr, v);
 #    define seteal_mem(v) writememll_2386(easeg + cpu_state.eaaddr, v);
 #else
+static __inline uint8_t
+getbyte(void)
+{
+    cpu_state.pc++;
+    return fastreadb(cs + (cpu_state.pc - 1));
+}
+
+static __inline uint16_t
+getword(void)
+{
+    cpu_state.pc += 2;
+    return fastreadw(cs + (cpu_state.pc - 2));
+}
+
+static __inline uint32_t
+getlong(void)
+{
+    cpu_state.pc += 4;
+    return fastreadl(cs + (cpu_state.pc - 4));
+}
+
+static __inline uint64_t
+getquad(void)
+{
+    cpu_state.pc += 8;
+    return fastreadl(cs + (cpu_state.pc - 8)) | ((uint64_t) fastreadl(cs + (cpu_state.pc - 4)) << 32);
+}
+
 static __inline uint8_t
 geteab(void)
 {
diff --git a/src/cpu/386_dynarec.c b/src/cpu/386_dynarec.c
index c96e3420d..23f3f1e35 100644
--- a/src/cpu/386_dynarec.c
+++ b/src/cpu/386_dynarec.c
@@ -19,6 +19,7 @@
 #include "x86_ops.h"
 #include "x86seg_common.h"
 #include "x86seg.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include <86box/io.h>
 #include <86box/mem.h>
@@ -28,6 +29,8 @@
 #include <86box/fdd.h>
 #include <86box/fdc.h>
 #include <86box/machine.h>
+#include <86box/plat_fallthrough.h>
+#include <86box/plat_unused.h>
 #include <86box/gdbstub.h>
 #ifdef USE_DYNAREC
 #    include "codegen.h"
@@ -224,7 +227,11 @@ fetch_ea_16_long(uint32_t rmdat)
 
 #include "386_ops.h"
 
-#define CACHE_ON() (!(cr0 & (1 << 30)) && !(cpu_state.flags & T_FLAG))
+#ifdef USE_DEBUG_REGS_486
+#    define CACHE_ON() (!(cr0 & (1 << 30)) && !(cpu_state.flags & T_FLAG) && !(dr[7] & 0xFF))
+#else
+#    define CACHE_ON() (!(cr0 & (1 << 30)) && !(cpu_state.flags & T_FLAG))
+#endif
 
 #ifdef USE_DYNAREC
 int32_t         cycles_main = 0;
@@ -296,9 +303,16 @@ exec386_dynarec_int(void)
             opcode = fetchdat & 0xFF;
             fetchdat >>= 8;
 
+#    ifdef USE_DEBUG_REGS_486
+            trap |= !!(cpu_state.flags & T_FLAG);
+#    else
             trap = cpu_state.flags & T_FLAG;
+#    endif
 
             cpu_state.pc++;
+#    ifdef USE_DEBUG_REGS_486
+            cpu_state.eflags &= ~(RF_FLAG);
+#    endif
             x86_opcodes[(opcode | cpu_state.op32) & 0x3ff](fetchdat);
         }
 
@@ -307,6 +321,16 @@ exec386_dynarec_int(void)
             cpu_state.pc &= 0xffff;
 #    endif
 
+#    ifdef USE_DEBUG_REGS_486
+        if (!cpu_state.abrt) {
+            if (!rf_flag_no_clear) {
+                cpu_state.eflags &= ~RF_FLAG;
+            }
+
+            rf_flag_no_clear = 0;
+        }
+#    endif
+
         if (((cs + cpu_state.pc) >> 12) != pccache)
             CPU_BLOCK_END();
 
@@ -316,10 +340,15 @@ exec386_dynarec_int(void)
                 CPU_BLOCK_END();
         }
 
+        if (cpu_init)
+            CPU_BLOCK_END();
+
         if (cpu_state.abrt)
             CPU_BLOCK_END();
         if (smi_line)
             CPU_BLOCK_END();
+        else if (new_ne)
+            CPU_BLOCK_END();
         else if (trap)
             CPU_BLOCK_END();
         else if (nmi && nmi_enable && nmi_mask)
@@ -329,8 +358,9 @@ exec386_dynarec_int(void)
     }
 
 block_ended:
-    if (!cpu_state.abrt && trap) {
+    if (!cpu_state.abrt && !new_ne && trap) {
         dr[6] |= (trap == 2) ? 0x8000 : 0x4000;
+
         trap = 0;
 #    ifndef USE_NEW_DYNAREC
         oldcs = CS;
@@ -342,7 +372,11 @@ block_ended:
     cpu_end_block_after_ins = 0;
 }
 
+#if defined(__linux__) && !defined(__clang__) && defined(USE_NEW_DYNAREC)
+static inline void __attribute__((optimize("O2")))
+#else
 static __inline void
+#endif
 exec386_dynarec_dyn(void)
 {
     uint32_t start_pc  = 0;
@@ -373,7 +407,8 @@ exec386_dynarec_dyn(void)
             int      byte_offset = (phys_addr >> PAGE_BYTE_MASK_SHIFT) & PAGE_BYTE_MASK_OFFSET_MASK;
             uint64_t byte_mask   = 1ULL << (PAGE_BYTE_MASK_MASK & 0x3f);
 
-            if ((page->code_present_mask & mask) || (page->byte_code_present_mask[byte_offset] & byte_mask))
+            if ((page->code_present_mask & mask) ||
+                ((page->mem != page_ff) && (page->byte_code_present_mask[byte_offset] & byte_mask)))
 #    else
             if (page->code_present_mask[(phys_addr >> PAGE_MASK_INDEX_SHIFT) & PAGE_MASK_INDEX_MASK] & mask)
 #    endif
@@ -550,6 +585,11 @@ exec386_dynarec_dyn(void)
 #    endif
                 CPU_BLOCK_END();
 
+            if (cpu_init)
+                CPU_BLOCK_END();
+
+            if (new_ne)
+                CPU_BLOCK_END();
             if ((cpu_state.flags & T_FLAG) || (trap == 2))
                 CPU_BLOCK_END();
             if (smi_line)
@@ -574,7 +614,7 @@ exec386_dynarec_dyn(void)
 
         cpu_end_block_after_ins = 0;
 
-        if ((!cpu_state.abrt || (cpu_state.abrt & ABRT_EXPECTED)) && !x86_was_reset)
+        if ((!cpu_state.abrt || (cpu_state.abrt & ABRT_EXPECTED)) && !new_ne && !x86_was_reset)
             codegen_block_end_recompile(block);
 
         if (x86_was_reset)
@@ -647,6 +687,11 @@ exec386_dynarec_dyn(void)
 #    endif
                 CPU_BLOCK_END();
 
+            if (cpu_init)
+                CPU_BLOCK_END();
+
+            if (new_ne)
+                CPU_BLOCK_END();
             if (cpu_state.flags & T_FLAG)
                 CPU_BLOCK_END();
             if (smi_line)
@@ -671,7 +716,7 @@ exec386_dynarec_dyn(void)
 
         cpu_end_block_after_ins = 0;
 
-        if ((!cpu_state.abrt || (cpu_state.abrt & ABRT_EXPECTED)) && !x86_was_reset)
+        if ((!cpu_state.abrt || (cpu_state.abrt & ABRT_EXPECTED)) && !new_ne && !x86_was_reset)
             codegen_block_end();
 
         if (x86_was_reset)
@@ -694,7 +739,7 @@ exec386_dynarec(int32_t cycs)
     uint64_t oldtsc;
     uint64_t delta;
 
-    int32_t cyc_period = cycs / 2000; /*5us*/
+    int32_t cyc_period = cycs / (force_10ms ? 2000 : 200); /*5us*/
 
 #    ifdef USE_ACYCS
     acycs = 0;
@@ -726,6 +771,11 @@ exec386_dynarec(int32_t cycs)
                 exec386_dynarec_dyn();
             }
 
+            if (cpu_init) {
+                cpu_init = 0;
+                resetx86();
+            }
+
             if (cpu_state.abrt) {
                 flags_rebuild();
                 tempi          = cpu_state.abrt & ABRT_MASK;
@@ -749,6 +799,15 @@ exec386_dynarec(int32_t cycs)
                 }
             }
 
+            if (new_ne) {
+#    ifndef USE_NEW_DYNAREC
+                oldcs = CS;
+#    endif
+                cpu_state.oldpc = cpu_state.pc;
+                new_ne = 0;
+                x86_int(16);
+            }
+
             if (smi_line)
                 enter_smm_check(0);
             else if (nmi && nmi_enable && nmi_mask) {
@@ -826,6 +885,9 @@ exec386(int32_t cycs)
         cycdiff       = 0;
         oldcyc        = cycles;
         while (cycdiff < cycle_period) {
+#ifdef USE_DEBUG_REGS_486
+            int ins_fetch_fault = 0;
+#endif
             ins_cycles = cycles;
 
 #ifndef USE_NEW_DYNAREC
@@ -842,6 +904,19 @@ exec386(int32_t cycs)
             cpu_state.ea_seg = &cpu_state.seg_ds;
             cpu_state.ssegs  = 0;
 
+#ifdef USE_DEBUG_REGS_486
+            if (is386)
+                ins_fetch_fault = cpu_386_check_instruction_fault();
+
+            /* Breakpoint fault has priority over other faults. */
+            if ((cpu_state.abrt == 0) & ins_fetch_fault) {
+                x86gen();
+                ins_fetch_fault = 0;
+                /* No instructions executed at this point. */
+                goto block_ended;
+            }
+#endif
+
             fetchdat = fastreadl_fetch(cs + cpu_state.pc);
 
             if (!cpu_state.abrt) {
@@ -851,9 +926,16 @@ exec386(int32_t cycs)
 #endif
                 opcode = fetchdat & 0xFF;
                 fetchdat >>= 8;
+#ifdef USE_DEBUG_REGS_486
+                trap |= !!(cpu_state.flags & T_FLAG);
+#else
                 trap = cpu_state.flags & T_FLAG;
+#endif
 
                 cpu_state.pc++;
+#ifdef USE_DEBUG_REGS_486
+                cpu_state.eflags &= ~(RF_FLAG);
+#endif
                 x86_opcodes[(opcode | cpu_state.op32) & 0x3ff](fetchdat);
                 if (x86_was_reset)
                     break;
@@ -863,6 +945,13 @@ exec386(int32_t cycs)
                 x386_dynarec_log("[%04X:%08X] ABRT\n", CS, cpu_state.pc);
 #endif
 
+            if (cpu_flush_pending == 1)
+                cpu_flush_pending++;
+            else if (cpu_flush_pending == 2) {
+                cpu_flush_pending = 0;
+                flushmmucache_pc();
+            }
+
 #ifndef USE_NEW_DYNAREC
             if (!use32)
                 cpu_state.pc &= 0xffff;
@@ -871,12 +960,17 @@ exec386(int32_t cycs)
             if (cpu_end_block_after_ins)
                 cpu_end_block_after_ins--;
 
+#ifdef USE_DEBUG_REGS_486
+block_ended:
+#endif
             if (cpu_state.abrt) {
+                uint8_t oop    = opcode;
                 flags_rebuild();
                 tempi          = cpu_state.abrt & ABRT_MASK;
                 cpu_state.abrt = 0;
                 x86_doabrt(tempi);
                 if (cpu_state.abrt) {
+                    pclog("Double fault - %02X\n", oop);
                     cpu_state.abrt = 0;
 #ifndef USE_NEW_DYNAREC
                     CS = oldcs;
@@ -893,14 +987,31 @@ exec386(int32_t cycs)
 #endif
                     }
                 }
+
+#ifdef USE_DEBUG_REGS_486
+                if (is386 && !x86_was_reset  && ins_fetch_fault)
+                    x86gen();
+#endif
+            } else if (new_ne) {
+                flags_rebuild();
+
+                new_ne = 0;
+#ifndef USE_NEW_DYNAREC
+                oldcs = CS;
+#endif
+                cpu_state.oldpc = cpu_state.pc;
+                x86_int(16);
             } else if (trap) {
                 flags_rebuild();
+#ifdef USE_DEBUG_REGS_486
+                if (trap & 2) dr[6] |= 0x8000;
+                if (trap & 1) dr[6] |= 0x4000;
+#endif
                 trap = 0;
 #ifndef USE_NEW_DYNAREC
                 oldcs = CS;
 #endif
                 cpu_state.oldpc = cpu_state.pc;
-                dr[6] |= 0x4000;
                 x86_int(1);
             }
 
diff --git a/src/cpu/386_dynarec_ops.c b/src/cpu/386_dynarec_ops.c
index 77b72ef59..3d9a7e080 100644
--- a/src/cpu/386_dynarec_ops.c
+++ b/src/cpu/386_dynarec_ops.c
@@ -1,6 +1,7 @@
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
 #include <math.h>
@@ -15,6 +16,7 @@
 #include "x86_ops.h"
 #include "x86seg_common.h"
 #include "x86seg.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include "x86_flags.h"
 #include <86box/io.h>
@@ -24,6 +26,7 @@
 #include <86box/gdbstub.h>
 #include "codegen.h"
 #include <86box/plat_unused.h>
+#include <86box/plat_fallthrough.h>
 
 #define CPU_BLOCK_END() cpu_block_end = 1
 
diff --git a/src/cpu/386_ops.h b/src/cpu/386_ops.h
index 1bb3c167f..73626acd2 100644
--- a/src/cpu/386_ops.h
+++ b/src/cpu/386_ops.h
@@ -186,7 +186,11 @@ extern void x386_dynarec_log(const char *fmt, ...);
 #else
 #    include "x86_ops_flag.h"
 #endif
-#include "x86_ops_fpu.h"
+#ifdef OPS_286_386
+#    include "x86_ops_fpu_2386.h"
+#else
+#    include "x86_ops_fpu.h"
+#endif
 #include "x86_ops_inc_dec.h"
 #include "x86_ops_int.h"
 #include "x86_ops_io.h"
@@ -202,6 +206,7 @@ extern void x386_dynarec_log(const char *fmt, ...);
 #    include "x86_ops_mmx_mov.h"
 #    include "x86_ops_mmx_pack.h"
 #    include "x86_ops_mmx_shift.h"
+#    include "x86_ops_mmx_emmi.h"
 #endif
 #include "x86_ops_mov.h"
 #ifdef OPS_286_386
@@ -216,7 +221,11 @@ extern void x386_dynarec_log(const char *fmt, ...);
 #endif
 #include "x86_ops_mul.h"
 #include "x86_ops_pmode.h"
-#include "x86_ops_prefix.h"
+#ifdef OPS_286_386
+#    include "x86_ops_prefix_2386.h"
+#else
+#    include "x86_ops_prefix.h"
+#endif
 #ifdef IS_DYNAREC
 #    include "x86_ops_rep_dyn.h"
 #else
@@ -255,6 +264,7 @@ opVPCEXT(uint32_t fetchdat)
     uint8_t    b2;
     uint16_t   cent;
     time_t     now;
+    struct tm  tm_buf;
     struct tm *tm = NULL;
 
     if (!is_vpc) /* only emulate this on Virtual PC machines */
@@ -273,7 +283,16 @@ opVPCEXT(uint32_t fetchdat)
     /* 0f 3f 03 xx opcodes are mostly related to the host clock, so fetch it now */
     if (b1 == 0x03) {
         (void) time(&now);
-        tm = localtime(&now);
+
+#ifdef _WIN32
+        if (localtime_s(&tm_buf, &now) == 0)
+            tm = &tm_buf;
+#else
+        tm = localtime_r(&now, &tm_buf);
+#endif
+
+        if (!tm)
+            fatal("localtime() failed for host clock\n");
     }
 
     if ((b1 == 0x07) && (b2 == 0x0b)) {
@@ -641,7 +660,7 @@ const OpFn OP_TABLE(386_0f)[1024] = {
     // clang-format off
         /*16-bit data, 16-bit addr*/
 /*      00              01              02              03              04              05              06              07              08              09              0a              0b              0c              0d              0e              0f*/
-/*00*/  op0F00_a16,     op0F01_w_a16,   opLAR_w_a16,    opLSL_w_a16,    ILLEGAL,        ILLEGAL,        opCLTS,         opLOADALL386,   ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*00*/  op0F00_a16,     op0F01_w_a16,   opLAR_w_a16,    opLSL_w_a16,    ILLEGAL,        ILLEGAL,        opCLTS,         opLOADALL386,   opINVD,         opWBINVD,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*10*/  opMOV_b_r_a16,  opMOV_w_r_a16,  opMOV_r_b_a16,  opMOV_r_w_a16,  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*20*/  opMOV_r_CRx_a16,opMOV_r_DRx_a16,opMOV_CRx_r_a16,opMOV_DRx_r_a16,opMOV_r_TRx_a16,ILLEGAL,        opMOV_TRx_r_a16,ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*30*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
@@ -663,7 +682,7 @@ const OpFn OP_TABLE(386_0f)[1024] = {
 
         /*32-bit data, 16-bit addr*/
 /*      00              01              02              03              04              05              06              07              08              09              0a              0b              0c              0d              0e              0f*/
-/*00*/  op0F00_a16,     op0F01_l_a16,   opLAR_l_a16,    opLSL_l_a16,    ILLEGAL,        ILLEGAL,        opCLTS,         opLOADALL386,   ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*00*/  op0F00_a16,     op0F01_l_a16,   opLAR_l_a16,    opLSL_l_a16,    ILLEGAL,        ILLEGAL,        opCLTS,         opLOADALL386,   opINVD,         opWBINVD,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*10*/  opMOV_b_r_a16,  opMOV_l_r_a16,  opMOV_r_b_a16,  opMOV_r_l_a16,  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*20*/  opMOV_r_CRx_a16,opMOV_r_DRx_a16,opMOV_CRx_r_a16,opMOV_DRx_r_a16,opMOV_r_TRx_a16,ILLEGAL,        opMOV_TRx_r_a16,ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*30*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
@@ -685,7 +704,7 @@ const OpFn OP_TABLE(386_0f)[1024] = {
 
         /*16-bit data, 32-bit addr*/
 /*      00              01              02              03              04              05              06              07              08              09              0a              0b              0c              0d              0e              0f*/
-/*00*/  op0F00_a32,     op0F01_w_a32,   opLAR_w_a32,    opLSL_w_a32,    ILLEGAL,        ILLEGAL,        opCLTS,         opLOADALL386,   ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*00*/  op0F00_a32,     op0F01_w_a32,   opLAR_w_a32,    opLSL_w_a32,    ILLEGAL,        ILLEGAL,        opCLTS,         opLOADALL386,   opINVD,         opWBINVD,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*10*/  opMOV_b_r_a32,  opMOV_w_r_a32,  opMOV_r_b_a32,  opMOV_r_w_a32,  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*20*/  opMOV_r_CRx_a32,opMOV_r_DRx_a32,opMOV_CRx_r_a32,opMOV_DRx_r_a32,opMOV_r_TRx_a32,ILLEGAL,        opMOV_TRx_r_a32,ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*30*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
@@ -707,7 +726,7 @@ const OpFn OP_TABLE(386_0f)[1024] = {
 
         /*32-bit data, 32-bit addr*/
 /*      00              01              02              03              04              05              06              07              08              09              0a              0b              0c              0d              0e              0f*/
-/*00*/  op0F00_a32,     op0F01_l_a32,   opLAR_l_a32,    opLSL_l_a32,    ILLEGAL,        ILLEGAL,        opCLTS,         opLOADALL386,   ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*00*/  op0F00_a32,     op0F01_l_a32,   opLAR_l_a32,    opLSL_l_a32,    ILLEGAL,        ILLEGAL,        opCLTS,         opLOADALL386,   opINVD,         opWBINVD,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*10*/  opMOV_b_r_a32,  opMOV_l_r_a32,  opMOV_r_b_a32,  opMOV_r_l_a32,  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*20*/  opMOV_r_CRx_a32,opMOV_r_DRx_a32,opMOV_CRx_r_a32,opMOV_DRx_r_a32,opMOV_r_TRx_a32,ILLEGAL,        opMOV_TRx_r_a32,ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*30*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
@@ -851,12 +870,12 @@ const OpFn OP_TABLE(c486_0f)[1024] = {
 /*00*/  op0F00_a16,     op0F01_l_a16,   opLAR_l_a16,    opLSL_l_a16,    ILLEGAL,        ILLEGAL,        opCLTS,         opLOADALL386,   opINVD,         opWBINVD,       ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*10*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*20*/  opMOV_r_CRx_a16,opMOV_r_DRx_a16,opMOV_CRx_r_a16,opMOV_DRx_r_a16,opMOV_r_TRx_a16,ILLEGAL,        opMOV_TRx_r_a16,ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
-/*30*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opRDSHR_a16,    opWRSHR_a16,    opSVDC_a16,     opRSDC_a16,     opSVLDT_a16,    opRSLDT_a16,    opSVTS_a16,     opRSTS_a16,     opSMINT,        ILLEGAL,
+/*30*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opRDSHR_a16,    opWRSHR_a16,    ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 
 /*40*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*50*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*60*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
-/*70*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*70*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opSVDC_a16,     opRSDC_a16,     opSVLDT_a16,    opRSLDT_a16,    opSVTS_a16,     opRSTS_a16,     opSMINT,        ILLEGAL,
 
 /*80*/  opJO_l,         opJNO_l,        opJB_l,         opJNB_l,        opJE_l,         opJNE_l,        opJBE_l,        opJNBE_l,       opJS_l,         opJNS_l,        opJP_l,         opJNP_l,        opJL_l,         opJNL_l,        opJLE_l,        opJNLE_l,
 /*90*/  opSETO_a16,     opSETNO_a16,    opSETB_a16,     opSETNB_a16,    opSETE_a16,     opSETNE_a16,    opSETBE_a16,    opSETNBE_a16,   opSETS_a16,     opSETNS_a16,    opSETP_a16,     opSETNP_a16,    opSETL_a16,     opSETNL_a16,    opSETLE_a16,    opSETNLE_a16,
@@ -1376,7 +1395,6 @@ const OpFn OP_TABLE(pentium_0f)[1024] = {
     // clang-format on
 };
 
-#    if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
 const OpFn OP_TABLE(c6x86_0f)[1024] = {
     // clang-format off
         /*16-bit data, 16-bit addr*/
@@ -1384,7 +1402,7 @@ const OpFn OP_TABLE(c6x86_0f)[1024] = {
 /*00*/  op0F00_a16,     op0F01_w_a16,   opLAR_w_a16,    opLSL_w_a16,    ILLEGAL,        ILLEGAL,        opCLTS,         ILLEGAL,        opINVD,         opWBINVD,       ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*10*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*20*/  opMOV_r_CRx_a16,opMOV_r_DRx_a16,opMOV_CRx_r_a16,opMOV_DRx_r_a16,opMOV_r_TRx_a16,ILLEGAL,        opMOV_TRx_r_a16,ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
-/*30*/  opWRMSR,        opRDTSC,        opRDMSR,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*30*/  opWRMSR,        opRDTSC,        opRDMSR,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opRDSHR_a16,    opWRSHR_a16,    ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 
 /*40*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*50*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
@@ -1406,7 +1424,7 @@ const OpFn OP_TABLE(c6x86_0f)[1024] = {
 /*00*/  op0F00_a16,     op0F01_l_a16,   opLAR_l_a16,    opLSL_l_a16,    ILLEGAL,        ILLEGAL,        opCLTS,         ILLEGAL,        opINVD,         opWBINVD,       ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*10*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*20*/  opMOV_r_CRx_a16,opMOV_r_DRx_a16,opMOV_CRx_r_a16,opMOV_DRx_r_a16,opMOV_r_TRx_a16,ILLEGAL,        opMOV_TRx_r_a16,ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
-/*30*/  opWRMSR,        opRDTSC,        opRDMSR,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*30*/  opWRMSR,        opRDTSC,        opRDMSR,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opRDSHR_a16,    opWRSHR_a16,    ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 
 /*40*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*50*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
@@ -1428,7 +1446,7 @@ const OpFn OP_TABLE(c6x86_0f)[1024] = {
 /*00*/  op0F00_a32,     op0F01_w_a32,   opLAR_w_a32,    opLSL_w_a32,    ILLEGAL,        ILLEGAL,        opCLTS,         ILLEGAL,        opINVD,         opWBINVD,       ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*10*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*20*/  opMOV_r_CRx_a32,opMOV_r_DRx_a32,opMOV_CRx_r_a32,opMOV_DRx_r_a32,opMOV_r_TRx_a32,ILLEGAL,        opMOV_TRx_r_a32,ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
-/*30*/  opWRMSR,        opRDTSC,        opRDMSR,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*30*/  opWRMSR,        opRDTSC,        opRDMSR,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opRDSHR_a32,    opWRSHR_a32,    ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 
 /*40*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*50*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
@@ -1450,7 +1468,99 @@ const OpFn OP_TABLE(c6x86_0f)[1024] = {
 /*00*/  op0F00_a32,     op0F01_l_a32,   opLAR_l_a32,    opLSL_l_a32,    ILLEGAL,        ILLEGAL,        opCLTS,         ILLEGAL,        opINVD,         opWBINVD,       ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*10*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*20*/  opMOV_r_CRx_a32,opMOV_r_DRx_a32,opMOV_CRx_r_a32,opMOV_DRx_r_a32,opMOV_r_TRx_a32,ILLEGAL,        opMOV_TRx_r_a32,ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
-/*30*/  opWRMSR,        opRDTSC,        opRDMSR,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*30*/  opWRMSR,        opRDTSC,        opRDMSR,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opRDSHR_a32,    opWRSHR_a32,    ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+
+/*40*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*50*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*60*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*70*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opSVDC_a32,     opRSDC_a32,     opSVLDT_a32,    opRSLDT_a32,    opSVTS_a32,     opRSTS_a32,     opSMINT,        ILLEGAL,
+
+/*80*/  opJO_l,         opJNO_l,        opJB_l,         opJNB_l,        opJE_l,         opJNE_l,        opJBE_l,        opJNBE_l,       opJS_l,         opJNS_l,        opJP_l,         opJNP_l,        opJL_l,         opJNL_l,        opJLE_l,        opJNLE_l,
+/*90*/  opSETO_a32,     opSETNO_a32,    opSETB_a32,     opSETNB_a32,    opSETE_a32,     opSETNE_a32,    opSETBE_a32,    opSETNBE_a32,   opSETS_a32,     opSETNS_a32,    opSETP_a32,     opSETNP_a32,    opSETL_a32,     opSETNL_a32,    opSETLE_a32,    opSETNLE_a32,
+/*a0*/  opPUSH_FS_l,    opPOP_FS_l,     opCPUID,        opBT_l_r_a32,   opSHLD_l_i_a32, opSHLD_l_CL_a32,ILLEGAL,        ILLEGAL,        opPUSH_GS_l,    opPOP_GS_l,     opRSM,          opBTS_l_r_a32,  opSHRD_l_i_a32, opSHRD_l_CL_a32,ILLEGAL,        opIMUL_l_l_a32,
+/*b0*/  opCMPXCHG_b_a32,opCMPXCHG_l_a32,opLSS_l_a32,    opBTR_l_r_a32,  opLFS_l_a32,    opLGS_l_a32,    opMOVZX_l_b_a32,opMOVZX_l_w_a32,ILLEGAL,        ILLEGAL,        opBA_l_a32,     opBTC_l_r_a32,  opBSF_l_a32,    opBSR_l_a32,    opMOVSX_l_b_a32,opMOVSX_l_w_a32,
+
+/*c0*/  opXADD_b_a32,   opXADD_l_a32,   ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opCMPXCHG8B_a32,opBSWAP_EAX,    opBSWAP_ECX,    opBSWAP_EDX,    opBSWAP_EBX,    opBSWAP_ESP,    opBSWAP_EBP,    opBSWAP_ESI,    opBSWAP_EDI,
+/*d0*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*e0*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*f0*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+    // clang-format on
+};
+
+const OpFn OP_TABLE(c6x86l_0f)[1024] = {
+    // clang-format off
+        /*16-bit data, 16-bit addr*/
+/*      00              01              02              03              04              05              06              07              08              09              0a              0b              0c              0d              0e              0f*/
+/*00*/  op0F00_a16,     op0F01_w_a16,   opLAR_w_a16,    opLSL_w_a16,    ILLEGAL,        ILLEGAL,        opCLTS,         ILLEGAL,        opINVD,         opWBINVD,       ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*10*/  opMOV_b_r_a16,  opMOV_w_r_a16,  opMOV_r_b_a16,  opMOV_r_w_a16,  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*20*/  opMOV_r_CRx_a16,opMOV_r_DRx_a16,opMOV_CRx_r_a16,opMOV_DRx_r_a16,opMOV_r_TRx_a16,ILLEGAL,        opMOV_TRx_r_a16,ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*30*/  opWRMSR,        opRDTSC,        opRDMSR,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opRDSHR_a16,    opWRSHR_a16,    ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+
+/*40*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*50*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*60*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*70*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opSVDC_a16,     opRSDC_a16,     opSVLDT_a16,    opRSLDT_a16,    opSVTS_a16,     opRSTS_a16,     opSMINT,        ILLEGAL,
+
+/*80*/  opJO_w,         opJNO_w,        opJB_w,         opJNB_w,        opJE_w,         opJNE_w,        opJBE_w,        opJNBE_w,       opJS_w,         opJNS_w,        opJP_w,         opJNP_w,        opJL_w,         opJNL_w,        opJLE_w,        opJNLE_w,
+/*90*/  opSETO_a16,     opSETNO_a16,    opSETB_a16,     opSETNB_a16,    opSETE_a16,     opSETNE_a16,    opSETBE_a16,    opSETNBE_a16,   opSETS_a16,     opSETNS_a16,    opSETP_a16,     opSETNP_a16,    opSETL_a16,     opSETNL_a16,    opSETLE_a16,    opSETNLE_a16,
+/*a0*/  opPUSH_FS_w,    opPOP_FS_w,     opCPUID,        opBT_w_r_a16,   opSHLD_w_i_a16, opSHLD_w_CL_a16,ILLEGAL,        ILLEGAL,        opPUSH_GS_w,    opPOP_GS_w,     opRSM,          opBTS_w_r_a16,  opSHRD_w_i_a16, opSHRD_w_CL_a16,ILLEGAL,        opIMUL_w_w_a16,
+/*b0*/  opCMPXCHG_b_a16,opCMPXCHG_w_a16,opLSS_w_a16,    opBTR_w_r_a16,  opLFS_w_a16,    opLGS_w_a16,    opMOVZX_w_b_a16,opMOVZX_w_w_a16,ILLEGAL,        ILLEGAL,        opBA_w_a16,     opBTC_w_r_a16,  opBSF_w_a16,    opBSR_w_a16,    opMOVSX_w_b_a16,ILLEGAL,
+
+/*c0*/  opXADD_b_a16,   opXADD_w_a16,   ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opCMPXCHG8B_a16,opBSWAP_EAX,    opBSWAP_ECX,    opBSWAP_EDX,    opBSWAP_EBX,    opBSWAP_ESP,    opBSWAP_EBP,    opBSWAP_ESI,    opBSWAP_EDI,
+/*d0*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*e0*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*f0*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opSVDC_a16,     opRSDC_a16,     opSVLDT_a16,    opRSLDT_a16,    opSVTS_a16,     opRSTS_a16,     opSMINT,        ILLEGAL,
+
+        /*32-bit data, 16-bit addr*/
+/*      00              01              02              03              04              05              06              07              08              09              0a              0b              0c              0d              0e              0f*/
+/*00*/  op0F00_a16,     op0F01_l_a16,   opLAR_l_a16,    opLSL_l_a16,    ILLEGAL,        ILLEGAL,        opCLTS,         ILLEGAL,        opINVD,         opWBINVD,       ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*10*/  opMOV_b_r_a16,  opMOV_l_r_a16,  opMOV_r_b_a16,  opMOV_r_l_a16,  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*20*/  opMOV_r_CRx_a16,opMOV_r_DRx_a16,opMOV_CRx_r_a16,opMOV_DRx_r_a16,opMOV_r_TRx_a16,ILLEGAL,        opMOV_TRx_r_a16,ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*30*/  opWRMSR,        opRDTSC,        opRDMSR,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opRDSHR_a16,    opWRSHR_a16,    ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+
+/*40*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*50*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*60*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*70*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+
+/*80*/  opJO_l,         opJNO_l,        opJB_l,         opJNB_l,        opJE_l,         opJNE_l,        opJBE_l,        opJNBE_l,       opJS_l,         opJNS_l,        opJP_l,         opJNP_l,        opJL_l,         opJNL_l,        opJLE_l,        opJNLE_l,
+/*90*/  opSETO_a16,     opSETNO_a16,    opSETB_a16,     opSETNB_a16,    opSETE_a16,     opSETNE_a16,    opSETBE_a16,    opSETNBE_a16,   opSETS_a16,     opSETNS_a16,    opSETP_a16,     opSETNP_a16,    opSETL_a16,     opSETNL_a16,    opSETLE_a16,    opSETNLE_a16,
+/*a0*/  opPUSH_FS_l,    opPOP_FS_l,     opCPUID,        opBT_l_r_a16,   opSHLD_l_i_a16, opSHLD_l_CL_a16,ILLEGAL,        ILLEGAL,        opPUSH_GS_l,    opPOP_GS_l,     opRSM,          opBTS_l_r_a16,  opSHRD_l_i_a16, opSHRD_l_CL_a16,ILLEGAL,        opIMUL_l_l_a16,
+/*b0*/  opCMPXCHG_b_a16,opCMPXCHG_l_a16,opLSS_l_a16,    opBTR_l_r_a16,  opLFS_l_a16,    opLGS_l_a16,    opMOVZX_l_b_a16,opMOVZX_l_w_a16,ILLEGAL,        ILLEGAL,        opBA_l_a16,     opBTC_l_r_a16,  opBSF_l_a16,    opBSR_l_a16,    opMOVSX_l_b_a16,opMOVSX_l_w_a16,
+
+/*c0*/  opXADD_b_a16,   opXADD_l_a16,   ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opCMPXCHG8B_a16,opBSWAP_EAX,    opBSWAP_ECX,    opBSWAP_EDX,    opBSWAP_EBX,    opBSWAP_ESP,    opBSWAP_EBP,    opBSWAP_ESI,    opBSWAP_EDI,
+/*d0*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*e0*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*f0*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+
+        /*16-bit data, 32-bit addr*/
+/*      00              01              02              03              04              05              06              07              08              09              0a              0b              0c              0d              0e              0f*/
+/*00*/  op0F00_a32,     op0F01_w_a32,   opLAR_w_a32,    opLSL_w_a32,    ILLEGAL,        ILLEGAL,        opCLTS,         ILLEGAL,        opINVD,         opWBINVD,       ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*10*/  opMOV_b_r_a32,  opMOV_w_r_a32,  opMOV_r_b_a32,  opMOV_r_w_a32,  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*20*/  opMOV_r_CRx_a32,opMOV_r_DRx_a32,opMOV_CRx_r_a32,opMOV_DRx_r_a32,opMOV_r_TRx_a32,ILLEGAL,        opMOV_TRx_r_a32,ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*30*/  opWRMSR,        opRDTSC,        opRDMSR,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opRDSHR_a32,    opWRSHR_a32,    ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+
+/*40*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*50*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*60*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*70*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opSVDC_a32,     opRSDC_a32,     opSVLDT_a32,    opRSLDT_a32,    opSVTS_a32,     opRSTS_a32,     opSMINT,        ILLEGAL,
+
+/*80*/  opJO_w,         opJNO_w,        opJB_w,         opJNB_w,        opJE_w,         opJNE_w,        opJBE_w,        opJNBE_w,       opJS_w,         opJNS_w,        opJP_w,         opJNP_w,        opJL_w,         opJNL_w,        opJLE_w,        opJNLE_w,
+/*90*/  opSETO_a32,     opSETNO_a32,    opSETB_a32,     opSETNB_a32,    opSETE_a32,     opSETNE_a32,    opSETBE_a32,    opSETNBE_a32,   opSETS_a32,     opSETNS_a32,    opSETP_a32,     opSETNP_a32,    opSETL_a32,     opSETNL_a32,    opSETLE_a32,    opSETNLE_a32,
+/*a0*/  opPUSH_FS_w,    opPOP_FS_w,     opCPUID,        opBT_w_r_a32,   opSHLD_w_i_a32, opSHLD_w_CL_a32,ILLEGAL,        ILLEGAL,        opPUSH_GS_w,    opPOP_GS_w,     opRSM,          opBTS_w_r_a32,  opSHRD_w_i_a32, opSHRD_w_CL_a32,ILLEGAL,        opIMUL_w_w_a32,
+/*b0*/  opCMPXCHG_b_a32,opCMPXCHG_w_a32,opLSS_w_a32,    opBTR_w_r_a32,  opLFS_w_a32,    opLGS_w_a32,    opMOVZX_w_b_a32,opMOVZX_w_w_a32,ILLEGAL,        ILLEGAL,        opBA_w_a32,     opBTC_w_r_a32,  opBSF_w_a32,    opBSR_w_a32,    opMOVSX_w_b_a32,ILLEGAL,
+
+/*c0*/  opXADD_b_a32,   opXADD_w_a32,   ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opCMPXCHG8B_a32,opBSWAP_EAX,    opBSWAP_ECX,    opBSWAP_EDX,    opBSWAP_EBX,    opBSWAP_ESP,    opBSWAP_EBP,    opBSWAP_ESI,    opBSWAP_EDI,
+/*d0*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*e0*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*f0*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+
+        /*32-bit data, 32-bit addr*/
+/*      00              01              02              03              04              05              06              07              08              09              0a              0b              0c              0d              0e              0f*/
+/*00*/  op0F00_a32,     op0F01_l_a32,   opLAR_l_a32,    opLSL_l_a32,    ILLEGAL,        ILLEGAL,        opCLTS,         ILLEGAL,        opINVD,         opWBINVD,       ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*10*/  opMOV_b_r_a32,  opMOV_l_r_a32,  opMOV_r_b_a32,  opMOV_r_l_a32,  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*20*/  opMOV_r_CRx_a32,opMOV_r_DRx_a32,opMOV_CRx_r_a32,opMOV_DRx_r_a32,opMOV_r_TRx_a32,ILLEGAL,        opMOV_TRx_r_a32,ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*30*/  opWRMSR,        opRDTSC,        opRDMSR,        ILLEGAL,        ILLEGAL,        ILLEGAL,        opRDSHR_a32,    opWRSHR_a32,    ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 
 /*40*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 /*50*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
@@ -1468,7 +1578,6 @@ const OpFn OP_TABLE(c6x86_0f)[1024] = {
 /*f0*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
     // clang-format on
 };
-#    endif
 
 const OpFn OP_TABLE(pentiummmx_0f)[1024] = {
     // clang-format off
@@ -1746,7 +1855,6 @@ const OpFn OP_TABLE(k62_0f)[1024] = {
     // clang-format on
 };
 
-#    if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
 const OpFn OP_TABLE(c6x86mx_0f)[1024] = {
     // clang-format off
         /*16-bit data, 16-bit addr*/
@@ -1757,7 +1865,7 @@ const OpFn OP_TABLE(c6x86mx_0f)[1024] = {
 /*30*/  opWRMSR,        opRDTSC,        opRDMSR,        opRDPMC,        ILLEGAL,        ILLEGAL,        opRDSHR_a16,    opWRSHR_a16,    ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 
 /*40*/  opCMOVO_w_a16,  opCMOVNO_w_a16, opCMOVB_w_a16,  opCMOVNB_w_a16, opCMOVE_w_a16,  opCMOVNE_w_a16, opCMOVBE_w_a16, opCMOVNBE_w_a16,opCMOVS_w_a16,  opCMOVNS_w_a16, opCMOVP_w_a16,  opCMOVNP_w_a16, opCMOVL_w_a16,  opCMOVNL_w_a16, opCMOVLE_w_a16, opCMOVNLE_w_a16,
-/*50*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*50*/  opPAVEB_a16,    opPADDSIW_a16,  opPMAGW_a16,    ILLEGAL,        opPDISTIB_a16,  opPSUBSIW_a16,  ILLEGAL,        ILLEGAL,        opPMVZB_a16,    opPMULHRWC_a16, opPMVNZB_a16,   opPMVLZB_a16,   opPMVGEZB_a16,  opPMULHRIW_a16, opPMACHRIW_a16, ILLEGAL,
 /*60*/  opPUNPCKLBW_a16,opPUNPCKLWD_a16,opPUNPCKLDQ_a16,opPACKSSWB_a16, opPCMPGTB_a16,  opPCMPGTW_a16,  opPCMPGTD_a16,  opPACKUSWB_a16, opPUNPCKHBW_a16,opPUNPCKHWD_a16,opPUNPCKHDQ_a16,opPACKSSDW_a16, ILLEGAL,        ILLEGAL,        opMOVD_l_mm_a16,opMOVQ_q_mm_a16,
 /*70*/  ILLEGAL,        opPSxxW_imm,    opPSxxD_imm,    opPSxxQ_imm,    opPCMPEQB_a16,  opPCMPEQW_a16,  opPCMPEQD_a16,  opEMMS,         opSVDC_a16,     opRSDC_a16,     opSVLDT_a16,    opRSLDT_a16,    opSVTS_a16,     opRSTS_a16,     opMOVD_mm_l_a16_cx,opMOVQ_mm_q_a16,
 
@@ -1779,7 +1887,7 @@ const OpFn OP_TABLE(c6x86mx_0f)[1024] = {
 /*30*/  opWRMSR,        opRDTSC,        opRDMSR,        opRDPMC,        ILLEGAL,        ILLEGAL,        opRDSHR_a16,    opWRSHR_a16,    ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 
 /*40*/  opCMOVO_l_a16,  opCMOVNO_l_a16, opCMOVB_l_a16,  opCMOVNB_l_a16, opCMOVE_l_a16,  opCMOVNE_l_a16, opCMOVBE_l_a16, opCMOVNBE_l_a16,opCMOVS_l_a16,  opCMOVNS_l_a16, opCMOVP_l_a16,  opCMOVNP_l_a16, opCMOVL_l_a16,  opCMOVNL_l_a16, opCMOVLE_l_a16, opCMOVNLE_l_a16,
-/*50*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*50*/  opPAVEB_a16,    opPADDSIW_a16,  opPMAGW_a16,    ILLEGAL,        opPDISTIB_a16,  opPSUBSIW_a16,  ILLEGAL,        ILLEGAL,        opPMVZB_a16,    opPMULHRWC_a16, opPMVNZB_a16,   opPMVLZB_a16,   opPMVGEZB_a16,  opPMULHRIW_a16, opPMACHRIW_a16, ILLEGAL,
 /*60*/  opPUNPCKLBW_a16,opPUNPCKLWD_a16,opPUNPCKLDQ_a16,opPACKSSWB_a16, opPCMPGTB_a16,  opPCMPGTW_a16,  opPCMPGTD_a16,  opPACKUSWB_a16, opPUNPCKHBW_a16,opPUNPCKHWD_a16,opPUNPCKHDQ_a16,opPACKSSDW_a16, ILLEGAL,        ILLEGAL,        opMOVD_l_mm_a16,opMOVQ_q_mm_a16,
 /*70*/  ILLEGAL,        opPSxxW_imm,    opPSxxD_imm,    opPSxxQ_imm,    opPCMPEQB_a16,  opPCMPEQW_a16,  opPCMPEQD_a16,  opEMMS,         opSVDC_a16,     opRSDC_a16,     opSVLDT_a16,    opRSLDT_a16,    opSVTS_a16,     opRSTS_a16,     opMOVD_mm_l_a16_cx,opMOVQ_mm_q_a16,
 
@@ -1801,7 +1909,7 @@ const OpFn OP_TABLE(c6x86mx_0f)[1024] = {
 /*30*/  opWRMSR,        opRDTSC,        opRDMSR,        opRDPMC,        ILLEGAL,        ILLEGAL,        opRDSHR_a32,    opWRSHR_a32,    ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 
 /*40*/  opCMOVO_w_a32,  opCMOVNO_w_a32, opCMOVB_w_a32,  opCMOVNB_w_a32, opCMOVE_w_a32,  opCMOVNE_w_a32, opCMOVBE_w_a32, opCMOVNBE_w_a32,opCMOVS_w_a32,  opCMOVNS_w_a32, opCMOVP_w_a32,  opCMOVNP_w_a32, opCMOVL_w_a32,  opCMOVNL_w_a32, opCMOVLE_w_a32, opCMOVNLE_w_a32,
-/*50*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*50*/  opPAVEB_a32,    opPADDSIW_a32,  opPMAGW_a32,    ILLEGAL,        opPDISTIB_a32,  opPSUBSIW_a32,  ILLEGAL,        ILLEGAL,        opPMVZB_a32,    opPMULHRWC_a32, opPMVNZB_a32,   opPMVLZB_a32,   opPMVGEZB_a32,  opPMULHRIW_a32, opPMACHRIW_a32, ILLEGAL,
 /*60*/  opPUNPCKLBW_a32,opPUNPCKLWD_a32,opPUNPCKLDQ_a32,opPACKSSWB_a32, opPCMPGTB_a32,  opPCMPGTW_a32,  opPCMPGTD_a32,  opPACKUSWB_a32, opPUNPCKHBW_a32,opPUNPCKHWD_a32,opPUNPCKHDQ_a32,opPACKSSDW_a32, ILLEGAL,        ILLEGAL,        opMOVD_l_mm_a32,opMOVQ_q_mm_a32,
 /*70*/  ILLEGAL,        opPSxxW_imm,    opPSxxD_imm,    opPSxxQ_imm,    opPCMPEQB_a32,  opPCMPEQW_a32,  opPCMPEQD_a32,  opEMMS,         opSVDC_a32,     opRSDC_a32,     opSVLDT_a32,    opRSLDT_a32,    opSVTS_a32,     opRSTS_a32,     opMOVD_mm_l_a32_cx,opMOVQ_mm_q_a32,
 
@@ -1823,7 +1931,7 @@ const OpFn OP_TABLE(c6x86mx_0f)[1024] = {
 /*30*/  opWRMSR,        opRDTSC,        opRDMSR,        opRDPMC,        ILLEGAL,        ILLEGAL,        opRDSHR_a32,    opWRSHR_a32,    ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
 
 /*40*/  opCMOVO_l_a32,  opCMOVNO_l_a32, opCMOVB_l_a32,  opCMOVNB_l_a32, opCMOVE_l_a32,  opCMOVNE_l_a32, opCMOVBE_l_a32, opCMOVNBE_l_a32,opCMOVS_l_a32,  opCMOVNS_l_a32, opCMOVP_l_a32,  opCMOVNP_l_a32, opCMOVL_l_a32,  opCMOVNL_l_a32, opCMOVLE_l_a32, opCMOVNLE_l_a32,
-/*50*/  ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,        ILLEGAL,
+/*50*/  opPAVEB_a32,    opPADDSIW_a32,  opPMAGW_a32,    ILLEGAL,        opPDISTIB_a32,  opPSUBSIW_a32,  ILLEGAL,        ILLEGAL,        opPMVZB_a32,    opPMULHRWC_a32, opPMVNZB_a32,   opPMVLZB_a32,   opPMVGEZB_a32,  opPMULHRIW_a32, opPMACHRIW_a32, ILLEGAL,
 /*60*/  opPUNPCKLBW_a32,opPUNPCKLWD_a32,opPUNPCKLDQ_a32,opPACKSSWB_a32, opPCMPGTB_a32,  opPCMPGTW_a32,  opPCMPGTD_a32,  opPACKUSWB_a32, opPUNPCKHBW_a32,opPUNPCKHWD_a32,opPUNPCKHDQ_a32,opPACKSSDW_a32, ILLEGAL,        ILLEGAL,        opMOVD_l_mm_a32,opMOVQ_q_mm_a32,
 /*70*/  ILLEGAL,        opPSxxW_imm,    opPSxxD_imm,    opPSxxQ_imm,    opPCMPEQB_a32,  opPCMPEQW_a32,  opPCMPEQD_a32,  opEMMS,         opSVDC_a16,     opRSDC_a16,     opSVLDT_a16,    opRSLDT_a16,    opSVTS_a16,     opRSTS_a16,     opMOVD_mm_l_a32_cx,opMOVQ_mm_q_a32,
 
@@ -1838,7 +1946,6 @@ const OpFn OP_TABLE(c6x86mx_0f)[1024] = {
 /*f0*/  ILLEGAL,        opPSLLW_a32,    opPSLLD_a32,    opPSLLQ_a32,    ILLEGAL,        opPMADDWD_a32,  ILLEGAL,        ILLEGAL,        opPSUBB_a32,    opPSUBW_a32,    opPSUBD_a32,    ILLEGAL,        opPADDB_a32,    opPADDW_a32,    opPADDD_a32,    ILLEGAL,
     // clang-format on
 };
-#    endif
 
 const OpFn OP_TABLE(pentiumpro_0f)[1024] = {
     // clang-format off
diff --git a/src/cpu/8080.c b/src/cpu/8080.c
deleted file mode 100644
index 7a7e7b96c..000000000
--- a/src/cpu/8080.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          8080 CPU emulation.
- *
- * Authors: Cacodemon345
- *
- *          Copyright 2022 Cacodemon345
- */
-
-#include <stdint.h>
-#include <stdlib.h>
-#include "cpu.h"
-#include <86box/timer.h>
-#include <86box/i8080.h>
-#include <86box/mem.h>
-#include <86box/plat_unused.h>
-
-static int completed  = 1;
-static int in_rep     = 0;
-static int repeating  = 0;
-static int rep_c_flag = 0;
-static int oldc;
-static int cycdiff;
-#ifdef UNUSED_8080_VARS
-static int prefetching = 1;
-static int refresh     = 0;
-static int clear_lock  = 0;
-
-static uint32_t cpu_src  = 0;
-static uint32_t cpu_dest = 0;
-static uint32_t cpu_data = 0;
-#endif
-
-static void
-clock_start(void)
-{
-    cycdiff = cycles;
-}
-
-static void
-clock_end(void)
-{
-    int diff = cycdiff - cycles;
-
-    /* On 808x systems, clock speed is usually crystal frequency divided by an integer. */
-    tsc += (uint64_t) diff * (xt_cpu_multi >> 32ULL); /* Shift xt_cpu_multi by 32 bits to the right and then multiply. */
-    if (TIMER_VAL_LESS_THAN_VAL(timer_target, (uint32_t) tsc))
-        timer_process();
-}
-
-static void
-i8080_wait(int c, int bus)
-{
-    cycles -= c;
-    if (bus < 2) {
-        clock_end();
-        clock_start();
-    }
-}
-
-#ifdef UNUSED_8080_FUNCS
-static uint8_t
-readmemb(uint32_t a)
-{
-    uint8_t ret;
-
-    i8080_wait(4, 1);
-    ret = read_mem_b(a);
-
-    return ret;
-}
-
-static uint8_t
-ins_fetch(i8080 *cpu)
-{
-    uint8_t ret = cpu->readmembyte(cpu->pmembase + cpu->pc);
-
-    cpu->pc++;
-    return ret;
-}
-#endif
-
-void
-transfer_from_808x(i8080 *cpu)
-{
-    cpu->hl       = BX;
-    cpu->bc       = CX;
-    cpu->de       = DX;
-    cpu->a        = AL;
-    cpu->flags    = cpu_state.flags & 0xFF;
-    cpu->sp       = BP;
-    cpu->pc       = cpu_state.pc;
-    cpu->oldpc    = cpu_state.oldpc;
-    cpu->pmembase = cs;
-    cpu->dmembase = ds;
-}
-
-void
-transfer_to_808x(i8080 *cpu)
-{
-    BX = cpu->hl;
-    CX = cpu->bc;
-    DX = cpu->de;
-    AL = cpu->a;
-    cpu_state.flags &= 0xFF00;
-    cpu_state.flags |= cpu->flags & 0xFF;
-    BP           = cpu->sp;
-    cpu_state.pc = cpu->pc;
-}
-
-uint8_t
-getreg_i8080(i8080 *cpu, uint8_t reg)
-{
-    uint8_t ret = 0xFF;
-    switch (reg) {
-        case 0x0:
-            ret = cpu->b;
-            break;
-        case 0x1:
-            ret = cpu->c;
-            break;
-        case 0x2:
-            ret = cpu->d;
-            break;
-        case 0x3:
-            ret = cpu->e;
-            break;
-        case 0x4:
-            ret = cpu->h;
-            break;
-        case 0x5:
-            ret = cpu->l;
-            break;
-        case 0x6:
-            ret = cpu->readmembyte(cpu->dmembase + cpu->sp);
-            break;
-        case 0x7:
-            ret = cpu->a;
-            break;
-    }
-    return ret;
-}
-
-uint8_t
-getreg_i8080_emu(i8080 *cpu, uint8_t reg)
-{
-    uint8_t ret = 0xFF;
-    switch (reg) {
-        case 0x0:
-            ret = CH;
-            break;
-        case 0x1:
-            ret = CL;
-            break;
-        case 0x2:
-            ret = DH;
-            break;
-        case 0x3:
-            ret = DL;
-            break;
-        case 0x4:
-            ret = BH;
-            break;
-        case 0x5:
-            ret = BL;
-            break;
-        case 0x6:
-            ret = cpu->readmembyte(cpu->dmembase + BP);
-            break;
-        case 0x7:
-            ret = AL;
-            break;
-    }
-    return ret;
-}
-
-void
-setreg_i8080_emu(i8080 *cpu, uint8_t reg, uint8_t val)
-{
-    switch (reg) {
-        case 0x0:
-            CH = val;
-            break;
-        case 0x1:
-            CL = val;
-            break;
-        case 0x2:
-            DH = val;
-            break;
-        case 0x3:
-            DL = val;
-            break;
-        case 0x4:
-            BH = val;
-            break;
-        case 0x5:
-            BL = val;
-            break;
-        case 0x6:
-            cpu->writemembyte(cpu->dmembase + BP, val);
-            break;
-        case 0x7:
-            AL = val;
-            break;
-    }
-}
-
-void
-setreg_i8080(i8080 *cpu, uint8_t reg, uint8_t val)
-{
-    switch (reg) {
-        case 0x0:
-            cpu->b = val;
-            break;
-        case 0x1:
-            cpu->c = val;
-            break;
-        case 0x2:
-            cpu->d = val;
-            break;
-        case 0x3:
-            cpu->e = val;
-            break;
-        case 0x4:
-            cpu->h = val;
-            break;
-        case 0x5:
-            cpu->l = val;
-            break;
-        case 0x6:
-            cpu->writemembyte(cpu->dmembase + cpu->sp, val);
-            break;
-        case 0x7:
-            cpu->a = val;
-            break;
-    }
-}
-
-void
-interpret_exec8080(UNUSED(i8080 *cpu), uint8_t opcode)
-{
-    switch (opcode) {
-        case 0x00:
-            {
-                break;
-            }
-    }
-}
-
-/* Actually implement i8080 emulation. */
-void
-exec8080(i8080 *cpu, int cycs)
-{
-#ifdef UNUSED_8080_VARS
-    uint8_t  temp = 0, temp2;
-    uint8_t  old_af;
-    uint8_t  handled = 0;
-    uint16_t addr, tempw;
-    uint16_t new_ip;
-    int      bits;
-#endif
-
-    cycles += cycs;
-
-    while (cycles > 0) {
-        cpu->startclock();
-
-        if (!repeating) {
-            cpu->oldpc = cpu->pc;
-            opcode     = cpu->fetchinstruction(cpu);
-            oldc       = cpu->flags & C_FLAG_I8080;
-            i8080_wait(1, 0);
-        }
-        completed = 1;
-        if (completed) {
-            repeating  = 0;
-            in_rep     = 0;
-            rep_c_flag = 0;
-            cpu->endclock();
-            if (cpu->checkinterrupts)
-                cpu->checkinterrupts();
-        }
-    }
-}
diff --git a/src/cpu/808x.c b/src/cpu/808x.c
index 90563d9ab..14e56f23a 100644
--- a/src/cpu/808x.c
+++ b/src/cpu/808x.c
@@ -18,10 +18,13 @@
 #include <math.h>
 #include <stdarg.h>
 #include <stdint.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <wchar.h>
 
+#include "i8080.h"
+
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include "cpu.h"
@@ -35,6 +38,8 @@
 #include <86box/ppi.h>
 #include <86box/timer.h>
 #include <86box/gdbstub.h>
+#include <86box/plat_fallthrough.h>
+#include <86box/plat_unused.h>
 
 /* Is the CPU 8088 or 8086. */
 int is8086 = 0;
@@ -56,7 +61,6 @@ static uint32_t *opseg[4];
 static x86seg   *_opseg[4];
 
 static int noint   = 0;
-static int in_lock = 0;
 static int cpu_alu_op, pfq_size;
 
 static uint32_t cpu_src = 0, cpu_dest = 0;
@@ -70,6 +74,9 @@ static int       in_rep = 0, repeating = 0, rep_c_flag = 0;
 static int       oldc, clear_lock = 0;
 static int       refresh = 0, cycdiff;
 
+static i8080 emulated_processor;
+static bool cpu_md_write_disable = 1;
+
 /* Various things needed for 8087. */
 #define OP_TABLE(name) ops_##name
 
@@ -83,44 +90,44 @@ static int       refresh = 0, cycdiff;
 #define fetch_ea_32(val)
 #define PREFETCH_RUN(a, b, c, d, e, f, g, h)
 
-#define CYCLES(val)   \
-    {                 \
-        wait(val, 0); \
+#define CYCLES(val)        \
+    {                      \
+        wait_cycs(val, 0); \
     }
 
 #define CLOCK_CYCLES_ALWAYS(val) \
     {                            \
-        wait(val, 0);            \
+        wait_cycs(val, 0);       \
     }
 
 #if 0
 #    define CLOCK_CYCLES_FPU(val) \
         {                         \
-            wait(val, 0);         \
+            wait_cycs(val, 0);    \
         }
 
-#    define CLOCK_CYCLES(val)         \
-        {                             \
-            if (fpu_cycles > 0) {     \
-                fpu_cycles -= (val);  \
-                if (fpu_cycles < 0) { \
-                    wait(val, 0);     \
-                }                     \
-            } else {                  \
-                wait(val, 0);         \
-            }                         \
+#    define CLOCK_CYCLES(val)          \
+        {                              \
+            if (fpu_cycles > 0) {      \
+                fpu_cycles -= (val);   \
+                if (fpu_cycles < 0) {  \
+                    wait_cycs(val, 0); \
+                }                      \
+            } else {                   \
+                wait_cycs(val, 0);     \
+            }                          \
         }
 
 #    define CONCURRENCY_CYCLES(c) fpu_cycles = (c)
 #else
-#    define CLOCK_CYCLES(val) \
-        {                     \
-            wait(val, 0);     \
+#    define CLOCK_CYCLES(val)  \
+        {                      \
+            wait_cycs(val, 0); \
         }
 
 #    define CLOCK_CYCLES_FPU(val) \
         {                         \
-            wait(val, 0);         \
+            wait_cycs(val, 0);    \
         }
 
 #    define CONCURRENCY_CYCLES(c)
@@ -131,10 +138,10 @@ typedef int (*OpFn)(uint32_t fetchdat);
 static int tempc_fpu = 0;
 
 #ifdef ENABLE_808X_LOG
+#if 0
 void dumpregs(int);
-
+#endif
 int x808x_do_log = ENABLE_808X_LOG;
-int indump       = 0;
 
 static void
 x808x_log(const char *fmt, ...)
@@ -154,6 +161,98 @@ x808x_log(const char *fmt, ...)
 static void pfq_add(int c, int add);
 static void set_pzs(int bits);
 
+void
+prefetch_queue_set_pos(int pos)
+{
+    pfq_pos = pos;
+}
+
+void
+prefetch_queue_set_ip(uint16_t ip)
+{
+    pfq_ip = ip;
+}
+
+void
+prefetch_queue_set_prefetching(int p)
+{
+    prefetching = p;
+}
+
+int
+prefetch_queue_get_pos(void)
+{
+    return pfq_pos;
+}
+
+uint16_t
+prefetch_queue_get_ip(void)
+{
+    return pfq_ip;
+}
+
+int
+prefetch_queue_get_prefetching(void)
+{
+    return prefetching;
+}
+
+int
+prefetch_queue_get_size(void)
+{
+    return pfq_size;
+}
+static void set_if(int cond);
+
+void
+sync_from_i8080(void)
+{
+    AL = emulated_processor.a;
+    BH = emulated_processor.h;
+    BL = emulated_processor.l;
+    CH = emulated_processor.b;
+    CL = emulated_processor.c;
+    DH = emulated_processor.d;
+    DL = emulated_processor.e;
+    BP = emulated_processor.sp;
+    
+    cpu_state.pc = emulated_processor.pc;
+    cpu_state.flags &= 0xFF00;
+    cpu_state.flags |= emulated_processor.sf << 7;
+    cpu_state.flags |= emulated_processor.zf << 6;
+    cpu_state.flags |= emulated_processor.hf << 4;
+    cpu_state.flags |= emulated_processor.pf << 2;
+    cpu_state.flags |= 1 << 1;
+    cpu_state.flags |= emulated_processor.cf << 0;
+    set_if(emulated_processor.iff);
+}
+
+void
+sync_to_i8080(void)
+{
+    if (!is_nec)
+        return;
+    emulated_processor.a  = AL;
+    emulated_processor.h  = BH;
+    emulated_processor.l  = BL;
+    emulated_processor.b  = CH;
+    emulated_processor.c  = CL;
+    emulated_processor.d  = DH;
+    emulated_processor.e  = DL;
+    emulated_processor.sp = BP;
+    emulated_processor.pc = cpu_state.pc;
+    emulated_processor.iff = !!(cpu_state.flags & I_FLAG);
+
+    emulated_processor.sf = (cpu_state.flags >> 7) & 1;
+    emulated_processor.zf = (cpu_state.flags >> 6) & 1;
+    emulated_processor.hf = (cpu_state.flags >> 4) & 1;
+    emulated_processor.pf = (cpu_state.flags >> 2) & 1;
+    emulated_processor.cf = (cpu_state.flags >> 0) & 1;
+
+    emulated_processor.interrupt_delay = noint;
+}
+
+
 uint16_t
 get_last_addr(void)
 {
@@ -199,7 +298,7 @@ fetch_and_bus(int c, int bus)
 }
 
 static void
-wait(int c, int bus)
+wait_cycs(int c, int bus)
 {
     cycles -= c;
     fetch_and_bus(c, bus);
@@ -241,13 +340,13 @@ cpu_io(int bits, int out, uint16_t port)
     int old_cycles = cycles;
 
     if (out) {
-        wait(4, 1);
+        wait_cycs(is_mazovia ? 5 : 4, 1);
         if (bits == 16) {
             if (is8086 && !(port & 1)) {
                 old_cycles = cycles;
                 outw(port, AX);
             } else {
-                wait(4, 1);
+                wait_cycs(is_mazovia ? 5 : 4, 1);
                 old_cycles = cycles;
                 outb(port++, AL);
                 outb(port, AH);
@@ -257,13 +356,13 @@ cpu_io(int bits, int out, uint16_t port)
             outb(port, AL);
         }
     } else {
-        wait(4, 1);
+        wait_cycs(is_mazovia ? 5 : 4, 1);
         if (bits == 16) {
             if (is8086 && !(port & 1)) {
                 old_cycles = cycles;
                 AX         = inw(port);
             } else {
-                wait(4, 1);
+                wait_cycs(is_mazovia ? 5 : 4, 1);
                 old_cycles = cycles;
                 AL         = inb(port++);
                 AH         = inb(port);
@@ -283,7 +382,7 @@ readmemb(uint32_t a)
 {
     uint8_t ret;
 
-    wait(4, 1);
+    wait_cycs(4, 1);
     ret = read_mem_b(a);
 
     return ret;
@@ -307,11 +406,11 @@ readmemw(uint32_t s, uint16_t a)
 {
     uint16_t ret;
 
-    wait(4, 1);
+    wait_cycs(4, 1);
     if (is8086 && !(a & 1))
         ret = read_mem_w(s + a);
     else {
-        wait(4, 1);
+        wait_cycs(4, 1);
         ret = read_mem_b(s + a);
         ret |= read_mem_b(s + ((is186 && !is_nec) ? (a + 1) : (a + 1) & 0xffff)) << 8;
     }
@@ -366,7 +465,7 @@ writememb(uint32_t s, uint32_t a, uint8_t v)
 {
     uint32_t addr = s + a;
 
-    wait(4, 1);
+    wait_cycs(4, 1);
     write_mem_b(addr, v);
 
     if ((addr >= 0xf0000) && (addr <= 0xfffff))
@@ -379,12 +478,12 @@ writememw(uint32_t s, uint32_t a, uint16_t v)
 {
     uint32_t addr = s + a;
 
-    wait(4, 1);
+    wait_cycs(4, 1);
     if (is8086 && !(a & 1))
         write_mem_w(addr, v);
     else {
         write_mem_b(addr, v & 0xff);
-        wait(4, 1);
+        wait_cycs(4, 1);
         addr = s + ((is186 && !is_nec) ? (a + 1) : ((a + 1) & 0xffff));
         write_mem_b(addr, v >> 8);
     }
@@ -440,10 +539,9 @@ pfq_write(void)
 static uint8_t
 pfq_read(void)
 {
-    uint8_t temp, i;
+    uint8_t temp = pfq[0];
 
-    temp = pfq[0];
-    for (i = 0; i < (pfq_size - 1); i++)
+    for (int i = 0; i < (pfq_size - 1); i++)
         pfq[i] = pfq[i + 1];
     pfq_pos--;
     cpu_state.pc = (cpu_state.pc + 1) & 0xffff;
@@ -461,7 +559,7 @@ pfq_fetchb_common(void)
         /* Reset prefetch queue internal position. */
         pfq_ip = cpu_state.pc;
         /* Fill the queue. */
-        wait(4 - (biu_cycles & 3), 0);
+        wait_cycs(4 - (biu_cycles & 3), 0);
     }
 
     /* Fetch. */
@@ -475,7 +573,7 @@ pfq_fetchb(void)
     uint8_t ret;
 
     ret = pfq_fetchb_common();
-    wait(1, 0);
+    wait_cycs(1, 0);
     return ret;
 }
 
@@ -487,7 +585,7 @@ pfq_fetchw(void)
     uint16_t temp;
 
     temp = pfq_fetchb_common();
-    wait(1, 0);
+    wait_cycs(1, 0);
     temp |= (pfq_fetchb_common() << 8);
 
     return temp;
@@ -540,12 +638,38 @@ load_seg(uint16_t seg, x86seg *s)
     s->seg  = seg & 0xffff;
 }
 
+uint8_t fetch_i8080_opcode(UNUSED(void* priv), uint16_t addr)
+{
+    return readmemb(cs + addr);
+}
+
+uint8_t fetch_i8080_data(UNUSED(void* priv), uint16_t addr)
+{
+    return readmemb(ds + addr);
+}
+
+void put_i8080_data(UNUSED(void* priv), uint16_t addr, uint8_t val)
+{
+    writememb(ds, addr, val);
+}
+
+static uint8_t i8080_port_in(UNUSED(void* priv), uint8_t port)
+{
+    cpu_io(8, 0, port);
+    return AL;
+}
+
+static void i8080_port_out(UNUSED(void* priv), uint8_t port, uint8_t val)
+{
+    AL = val;
+    cpu_io(8, 1, port);
+}
+
 void
 reset_808x(int hard)
 {
     biu_cycles = 0;
     in_rep     = 0;
-    in_lock    = 0;
     completed  = 1;
     repeating  = 0;
     clear_lock = 0;
@@ -578,6 +702,14 @@ reset_808x(int hard)
 
     use_custom_nmi_vector = 0x00;
     custom_nmi_vector     = 0x00000000;
+
+    cpu_md_write_disable = 1;
+    i8080_init(&emulated_processor);
+    emulated_processor.write_byte    = put_i8080_data;
+    emulated_processor.read_byte     = fetch_i8080_data;
+    emulated_processor.read_byte_seg = fetch_i8080_opcode;
+    emulated_processor.port_in       = i8080_port_in;
+    emulated_processor.port_out      = i8080_port_out;
 }
 
 static void
@@ -627,38 +759,38 @@ do_mod_rm(void)
     if (cpu_mod == 3)
         return;
 
-    wait(1, 0);
+    wait_cycs(1, 0);
     if ((rmdat & 0xc7) == 0x06) {
-        wait(1, 0);
+        wait_cycs(1, 0);
         cpu_state.eaaddr = pfq_fetchw();
         easeg            = ovr_seg ? *ovr_seg : ds;
-        wait(1, 0);
+        wait_cycs(1, 0);
         return;
     } else
         switch (cpu_rm) {
             case 0:
             case 3:
-                wait(2, 0);
+                wait_cycs(2, 0);
                 break;
             case 1:
             case 2:
-                wait(3, 0);
+                wait_cycs(3, 0);
                 break;
         }
     cpu_state.eaaddr = (*mod1add[0][cpu_rm]) + (*mod1add[1][cpu_rm]);
     easeg            = ovr_seg ? *ovr_seg : *mod1seg[cpu_rm];
     switch (rmdat & 0xc0) {
         case 0x40:
-            wait(3, 0);
+            wait_cycs(3, 0);
             cpu_state.eaaddr += sign_extend(pfq_fetchb());
             break;
         case 0x80:
-            wait(3, 0);
+            wait_cycs(3, 0);
             cpu_state.eaaddr += pfq_fetchw();
             break;
     }
     cpu_state.eaaddr &= 0xffff;
-    wait(2, 0);
+    wait_cycs(2, 0);
 }
 
 #undef getr8
@@ -787,6 +919,7 @@ seteaq(uint64_t val)
    complicates compiling. */
 #define FPU_8087
 #define tempc tempc_fpu
+#include "x87_sf.h"
 #include "x87.h"
 #include "x87_ops.h"
 #undef tempc
@@ -816,7 +949,7 @@ pop(void)
 }
 
 static void
-access(int num, int bits)
+access(int num, UNUSED(int bits))
 {
     switch (num) {
         case 0:
@@ -849,7 +982,7 @@ access(int num, int bits)
         case 62:
         case 66:
         case 68:
-            wait(1, 0);
+            wait_cycs(1, 0);
             break;
         case 3:
         case 11:
@@ -865,7 +998,7 @@ access(int num, int bits)
         case 52:
         case 53:
         case 54:
-            wait(2, 0);
+            wait_cycs(2, 0);
             break;
         case 16:
         case 18:
@@ -874,7 +1007,7 @@ access(int num, int bits)
         case 32:
         case 37:
         case 42:
-            wait(3, 0);
+            wait_cycs(3, 0);
             break;
         case 10:
         case 12:
@@ -887,59 +1020,59 @@ access(int num, int bits)
         case 39:
         case 41:
         case 60:
-            wait(4, 0);
+            wait_cycs(4, 0);
             break;
         case 4:
         case 70:
-            wait(5, 0);
+            wait_cycs(5, 0);
             break;
         case 31:
         case 38:
         case 40:
-            wait(6, 0);
+            wait_cycs(6, 0);
             break;
         case 5:
             if (opcode == 0xcc)
-                wait(7, 0);
+                wait_cycs(7, 0);
             else
-                wait(4, 0);
+                wait_cycs(4, 0);
             break;
         case 36:
-            wait(1, 0);
+            wait_cycs(1, 0);
             pfq_clear();
-            wait(1, 0);
+            wait_cycs(1, 0);
             if (cpu_mod != 3)
-                wait(1, 0);
-            wait(3, 0);
+                wait_cycs(1, 0);
+            wait_cycs(3, 0);
             break;
         case 43:
-            wait(2, 0);
+            wait_cycs(2, 0);
             pfq_clear();
-            wait(1, 0);
+            wait_cycs(1, 0);
             break;
         case 57:
             if (cpu_mod != 3)
-                wait(2, 0);
-            wait(4, 0);
+                wait_cycs(2, 0);
+            wait_cycs(4, 0);
             break;
         case 58:
             if (cpu_mod != 3)
-                wait(1, 0);
-            wait(4, 0);
+                wait_cycs(1, 0);
+            wait_cycs(4, 0);
             break;
         case 59:
-            wait(2, 0);
+            wait_cycs(2, 0);
             pfq_clear();
             if (cpu_mod != 3)
-                wait(1, 0);
-            wait(3, 0);
+                wait_cycs(1, 0);
+            wait_cycs(3, 0);
             break;
         case 65:
-            wait(1, 0);
+            wait_cycs(1, 0);
             pfq_clear();
-            wait(2, 0);
+            wait_cycs(2, 0);
             if (cpu_mod != 3)
-                wait(1, 0);
+                wait_cycs(1, 0);
             break;
     }
 }
@@ -952,12 +1085,17 @@ interrupt(uint16_t addr)
     uint16_t new_cs, new_ip;
     uint16_t tempf;
 
+    if (!(cpu_state.flags & MD_FLAG) && is_nec) {
+        sync_from_i8080();
+        x808x_log("CALLN/INT#/NMI#\n");
+    }
+
     addr <<= 2;
     cpu_state.eaaddr = addr;
     old_cs           = CS;
     access(5, 16);
     new_ip = readmemw(0, cpu_state.eaaddr);
-    wait(1, 0);
+    wait_cycs(1, 0);
     cpu_state.eaaddr = (cpu_state.eaaddr + 2) & 0xffff;
     access(6, 16);
     new_cs      = readmemw(0, cpu_state.eaaddr);
@@ -968,6 +1106,8 @@ interrupt(uint16_t addr)
     tempf = cpu_state.flags & (is_nec ? 0x8fd7 : 0x0fd7);
     push(&tempf);
     cpu_state.flags &= ~(I_FLAG | T_FLAG);
+    if (is_nec)
+        cpu_state.flags |= MD_FLAG;
     access(40, 16);
     push(&old_cs);
     old_ip = cpu_state.pc;
@@ -978,6 +1118,65 @@ interrupt(uint16_t addr)
     push(&old_ip);
 }
 
+/* Ditto, but for breaking into emulation mode. */
+static void
+interrupt_brkem(uint16_t addr)
+{
+    uint16_t old_cs, old_ip;
+    uint16_t new_cs, new_ip;
+    uint16_t tempf;
+
+    addr <<= 2;
+    cpu_state.eaaddr = addr;
+    old_cs           = CS;
+    access(5, 16);
+    new_ip = readmemw(0, cpu_state.eaaddr);
+    wait_cycs(1, 0);
+    cpu_state.eaaddr = (cpu_state.eaaddr + 2) & 0xffff;
+    access(6, 16);
+    new_cs      = readmemw(0, cpu_state.eaaddr);
+    prefetching = 0;
+    pfq_clear();
+    ovr_seg = NULL;
+    access(39, 16);
+    tempf = cpu_state.flags & (is_nec ? 0x8fd7 : 0x0fd7);
+    push(&tempf);
+    cpu_state.flags      &= ~(MD_FLAG);
+    cpu_md_write_disable  = 0;
+    access(40, 16);
+    push(&old_cs);
+    old_ip = cpu_state.pc;
+    load_cs(new_cs);
+    access(68, 16);
+    set_ip(new_ip);
+    access(41, 16);
+    push(&old_ip);
+    sync_to_i8080();
+    x808x_log("BRKEM mode\n");
+}
+
+void
+retem_i8080(void)
+{
+    sync_from_i8080();
+
+    prefetching = 0;
+    pfq_clear();
+
+    set_ip(pop());
+    load_cs(pop());
+    cpu_state.flags = pop();
+
+    emulated_processor.iff = !!(cpu_state.flags & I_FLAG);
+
+    cpu_md_write_disable = 1;
+
+    noint      = 1;
+    nmi_enable = 1;
+
+    x808x_log("RETEM mode\n");
+}
+
 void
 interrupt_808x(uint16_t addr)
 {
@@ -991,12 +1190,17 @@ custom_nmi(void)
     uint16_t new_cs, new_ip;
     uint16_t tempf;
 
+    if (!(cpu_state.flags & MD_FLAG) && is_nec) {
+        sync_from_i8080();
+        pclog("NMI# (CUTSOM)\n");
+    }
+
     cpu_state.eaaddr = 0x0002;
     old_cs           = CS;
     access(5, 16);
     (void) readmemw(0, cpu_state.eaaddr);
     new_ip = custom_nmi_vector & 0xffff;
-    wait(1, 0);
+    wait_cycs(1, 0);
     cpu_state.eaaddr = (cpu_state.eaaddr + 2) & 0xffff;
     access(6, 16);
     (void) readmemw(0, cpu_state.eaaddr);
@@ -1008,6 +1212,8 @@ custom_nmi(void)
     tempf = cpu_state.flags & (is_nec ? 0x8fd7 : 0x0fd7);
     push(&tempf);
     cpu_state.flags &= ~(I_FLAG | T_FLAG);
+    if (is_nec)
+        cpu_state.flags |= MD_FLAG;
     access(40, 16);
     push(&old_cs);
     old_ip = cpu_state.pc;
@@ -1019,22 +1225,24 @@ custom_nmi(void)
 }
 
 static int
-irq_pending(void)
+irq_pending(int nec_hlt)
 {
     uint8_t temp;
+    int     i_flag = (cpu_state.flags & I_FLAG) || nec_hlt;
 
-    temp = (nmi && nmi_enable && nmi_mask) || ((cpu_state.flags & T_FLAG) && !noint) || ((cpu_state.flags & I_FLAG) && pic.int_pending && !noint);
+    temp = (nmi && nmi_enable && nmi_mask) || ((cpu_state.flags & T_FLAG) && !noint) || (i_flag && pic.int_pending && !noint);
 
     return temp;
 }
 
 static void
-check_interrupts(void)
+check_interrupts(int nec_hlt)
 {
     int temp;
+    int     i_flag = (cpu_state.flags & I_FLAG) || nec_hlt;
 
-    if (irq_pending()) {
-        if ((cpu_state.flags & T_FLAG) && !noint) {
+    if (irq_pending(nec_hlt)) {
+        if ((cpu_state.flags & T_FLAG) && !(noint & 1)) {
             interrupt(1);
             return;
         }
@@ -1049,24 +1257,24 @@ check_interrupts(void)
 #endif
             return;
         }
-        if ((cpu_state.flags & I_FLAG) && pic.int_pending && !noint) {
+        if (i_flag && pic.int_pending && !noint) {
             repeating = 0;
             completed = 1;
             ovr_seg   = NULL;
-            wait(3, 0);
+            wait_cycs(3, 0);
             /* ACK to PIC */
             temp = pic_irq_ack();
-            wait(4, 1);
-            wait(1, 0);
+            wait_cycs(4, 1);
+            wait_cycs(1, 0);
             /* ACK to PIC */
             temp = pic_irq_ack();
-            wait(4, 1);
-            wait(1, 0);
+            wait_cycs(4, 1);
+            wait_cycs(1, 0);
             in_lock    = 0;
             clear_lock = 0;
-            wait(1, 0);
+            wait_cycs(1, 0);
             /* Here is where temp should be filled, but we cheat. */
-            wait(3, 0);
+            wait_cycs(3, 0);
             opcode = 0x00;
             interrupt(temp);
         }
@@ -1080,9 +1288,9 @@ rep_action(int bits)
 
     if (in_rep == 0)
         return 0;
-    wait(2, 0);
+    wait_cycs(2, 0);
     t = CX;
-    if (irq_pending() && (repeating != 0)) {
+    if (irq_pending(0) && (repeating != 0)) {
         access(71, bits);
         pfq_clear();
         if (is_nec && (ovr_seg != NULL))
@@ -1092,16 +1300,16 @@ rep_action(int bits)
         t = 0;
     }
     if (t == 0) {
-        wait(1, 0);
+        wait_cycs(1, 0);
         completed = 1;
         repeating = 0;
         return 1;
     }
     --CX;
     completed = 0;
-    wait(2, 0);
+    wait_cycs(2, 0);
     if (!repeating)
-        wait(2, 0);
+        wait_cycs(2, 0);
     return 0;
 }
 
@@ -1111,7 +1319,7 @@ jump(uint16_t delta)
     uint16_t old_ip;
     access(67, 8);
     pfq_clear();
-    wait(5, 0);
+    wait_cycs(5, 0);
     old_ip = cpu_state.pc;
     set_ip((cpu_state.pc + delta) & 0xffff);
     return old_ip;
@@ -1135,9 +1343,9 @@ jcc(uint8_t opcode, int cond)
 {
     /* int8_t offset; */
 
-    wait(1, 0);
+    wait_cycs(1, 0);
     cpu_data = pfq_fetchb();
-    wait(1, 0);
+    wait_cycs(1, 0);
     if ((!cond) == !!(opcode & 0x01))
         jump_short();
 }
@@ -1327,32 +1535,32 @@ mul(uint16_t a, uint16_t b)
             bit_count = 16;
             high_bit  = 0x8000;
         } else
-            wait(8, 0);
+            wait_cycs(8, 0);
 
         size_mask = (1 << bit_count) - 1;
 
         if ((rmdat & 0x38) == 0x28) {
             if (!top_bit(a, bit_count)) {
                 if (top_bit(b, bit_count)) {
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     if ((b & size_mask) != ((opcode & 1) ? 0x8000 : 0x80))
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                     b      = ~b + 1;
                     negate = 1;
                 }
             } else {
-                wait(1, 0);
+                wait_cycs(1, 0);
                 a      = ~a + 1;
                 negate = 1;
                 if (top_bit(b, bit_count)) {
                     b      = ~b + 1;
                     negate = 0;
                 } else
-                    wait(4, 0);
+                    wait_cycs(4, 0);
             }
-            wait(10, 0);
+            wait_cycs(10, 0);
         }
-        wait(3, 0);
+        wait_cycs(3, 0);
     }
 
     c = 0;
@@ -1360,13 +1568,13 @@ mul(uint16_t a, uint16_t b)
     carry = (a & 1) != 0;
     a >>= 1;
     for (i = 0; i < bit_count; ++i) {
-        wait(7, 0);
+        wait_cycs(7, 0);
         if (carry) {
             cpu_src  = c;
             cpu_dest = b;
             add(bit_count);
             c = cpu_data & size_mask;
-            wait(1, 0);
+            wait_cycs(1, 0);
             carry = !!(cpu_state.flags & C_FLAG);
         }
         r     = (c >> 1) + (carry ? high_bit : 0);
@@ -1381,7 +1589,7 @@ mul(uint16_t a, uint16_t b)
         a = (~a + 1) & size_mask;
         if (a == 0)
             ++c;
-        wait(9, 0);
+        wait_cycs(9, 0);
     }
     cpu_data = a;
     cpu_dest = c;
@@ -1420,13 +1628,13 @@ set_pzs(int bits)
 }
 
 static void
-set_co_mul(int bits, int carry)
+set_co_mul(UNUSED(int bits), int carry)
 {
     set_cf(carry);
     set_of(carry);
     set_zf_ex(!carry);
     if (!carry)
-        wait(1, 0);
+        wait_cycs(1, 0);
 }
 
 /* Was div(), renamed to avoid conflicts with stdlib div(). */
@@ -1457,28 +1665,28 @@ x86_div(uint16_t l, uint16_t h)
                 h &= size_mask;
                 negative          = 1;
                 dividend_negative = 1;
-                wait(4, 0);
+                wait_cycs(4, 0);
             }
             if (top_bit(cpu_src, bit_count)) {
                 cpu_src  = ~cpu_src + 1;
                 negative = !negative;
             } else
-                wait(1, 0);
-            wait(9, 0);
+                wait_cycs(1, 0);
+            wait_cycs(9, 0);
         }
-        wait(3, 0);
+        wait_cycs(3, 0);
     }
-    wait(8, 0);
+    wait_cycs(8, 0);
     cpu_src &= size_mask;
     if (h >= cpu_src) {
         if (opcode != 0xd4)
-            wait(1, 0);
+            wait_cycs(1, 0);
         interrupt(0);
         return 0;
     }
     if (opcode != 0xd4)
-        wait(1, 0);
-    wait(2, 0);
+        wait_cycs(1, 0);
+    wait_cycs(2, 0);
     carry = 1;
     for (b = 0; b < bit_count; ++b) {
         r     = (l << 1) + (carry ? 1 : 0);
@@ -1487,32 +1695,32 @@ x86_div(uint16_t l, uint16_t h)
         r     = (h << 1) + (carry ? 1 : 0);
         carry = top_bit(h, bit_count);
         h     = r;
-        wait(8, 0);
+        wait_cycs(8, 0);
         if (carry) {
             carry = 0;
             h -= cpu_src;
             if (b == bit_count - 1)
-                wait(2, 0);
+                wait_cycs(2, 0);
         } else {
             carry = cpu_src > h;
             if (!carry) {
                 h -= cpu_src;
-                wait(1, 0);
+                wait_cycs(1, 0);
                 if (b == bit_count - 1)
-                    wait(2, 0);
+                    wait_cycs(2, 0);
             }
         }
     }
     l = ~((l << 1) + (carry ? 1 : 0));
     if (opcode != 0xd4 && (rmdat & 0x38) == 0x38) {
-        wait(4, 0);
+        wait_cycs(4, 0);
         if (top_bit(l, bit_count)) {
             if (cpu_mod == 3)
-                wait(1, 0);
+                wait_cycs(1, 0);
             interrupt(0);
             return 0;
         }
-        wait(7, 0);
+        wait_cycs(7, 0);
         if (negative)
             l = ~l + 1;
         if (dividend_negative)
@@ -1571,7 +1779,7 @@ aa(void)
 {
     set_pzs(8);
     AL = cpu_data & 0x0f;
-    wait(6, 0);
+    wait_cycs(6, 0);
 }
 
 static void
@@ -1635,28 +1843,75 @@ cpu_data_opff_rm(void)
     }
 }
 
+uint8_t
+cpu_inb(uint16_t port)
+{
+    int     old_cycles = cycles;
+    uint8_t ret;
+
+    wait_cycs(is_mazovia ? 5 : 4, 1);
+    old_cycles = cycles;
+
+    ret = inb(port);
+
+    resub_cycles(old_cycles);
+
+    return ret;
+}
+
 uint16_t
 cpu_inw(uint16_t port)
 {
+    int      old_cycles = cycles;
+    uint16_t ret;
+
+    wait_cycs(is_mazovia ? 5 : 4, 1);
     if (is8086 && !(port & 1)) {
-        wait(4, 0);
+        old_cycles = cycles;
+        ret = inw(port);
     } else {
-        wait(8, 0);
+        wait_cycs(is_mazovia ? 5 : 4, 1);
+        old_cycles = cycles;
+        ret = inb(port++);
+        ret |= (inb(port) << 8);
     }
 
-    return inw(port);
+    resub_cycles(old_cycles);
+
+    return ret;
+}
+
+void
+cpu_outb(uint16_t port, uint16_t val)
+{
+    int old_cycles = cycles;
+
+    wait_cycs(is_mazovia ? 5 : 4, 1);
+    old_cycles = cycles;
+
+    outb(port, val);
+
+    resub_cycles(old_cycles);
 }
 
 void
 cpu_outw(uint16_t port, uint16_t val)
 {
+    int old_cycles = cycles;
+
+    wait_cycs(is_mazovia ? 5 : 4, 1);
+
     if (is8086 && !(port & 1)) {
-        wait(4, 0);
+        old_cycles = cycles;
+        outw(port, val);
     } else {
-        wait(8, 0);
+        wait_cycs(is_mazovia ? 5 : 4, 1);
+        old_cycles = cycles;
+        outb(port++, val);
+        outb(port, val >> 8);
     }
 
-    return outw(port, val);
+    resub_cycles(old_cycles);
 }
 
 /* Executes instructions up to the specified number of cycles. */
@@ -1682,6 +1937,15 @@ execx86(int cycs)
     while (cycles > 0) {
         clock_start();
 
+        if (is_nec && !(cpu_state.flags & MD_FLAG)) {
+            i8080_step(&emulated_processor);
+            set_if(emulated_processor.iff);
+            cycles -= emulated_processor.cyc;
+            emulated_processor.cyc = 0;
+            completed = 1;
+            goto exec_completed;
+        }
+
         if (!repeating) {
             cpu_state.oldpc = cpu_state.pc;
             opcode          = pfq_fetchb();
@@ -1691,7 +1955,7 @@ execx86(int cycs)
                 in_lock    = 0;
                 clear_lock = 0;
             }
-            wait(1, 0);
+            wait_cycs(1, 0);
         }
 
         completed = 1;
@@ -1700,7 +1964,7 @@ execx86(int cycs)
             switch (opcode) {
                 case 0x60: /*PUSHA/PUSH R*/
                     orig_sp = SP;
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     push(&AX);
                     push(&CX);
                     push(&DX);
@@ -1712,7 +1976,7 @@ execx86(int cycs)
                     handled = 1;
                     break;
                 case 0x61: /*POPA/POP R*/
-                    wait(9, 0);
+                    wait_cycs(9, 0);
                     DI = pop();
                     SI = pop();
                     BP = pop();
@@ -1744,7 +2008,7 @@ execx86(int cycs)
                 case 0x65:
                     if (is_nec) {
                         /* REPC/REPNC */
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                         in_rep     = (opcode == 0x64 ? 1 : 2);
                         rep_c_flag = 1;
                         completed  = 0;
@@ -1754,7 +2018,7 @@ execx86(int cycs)
 
                 case 0x68:
                     wordtopush = pfq_fetchw();
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     push(&wordtopush);
                     handled = 1;
                     break;
@@ -1794,19 +2058,18 @@ execx86(int cycs)
                     bits    = 8 << (opcode & 1);
                     handled = 1;
                     if (!repeating)
-                        wait(2, 0);
+                        wait_cycs(2, 0);
 
                     if (rep_action(bits))
                         break;
                     else if (!repeating)
-                        wait(7, 0);
+                        wait_cycs(7, 0);
 
                     if (bits == 16) {
                         writememw(es, DI, cpu_inw(DX));
                         DI += (cpu_state.flags & D_FLAG) ? -2 : 2;
                     } else {
-                        wait(4, 0);
-                        writememb(es, DI, inb(DX));
+                        writememb(es, DI, cpu_inb(DX));
                         DI += (cpu_state.flags & D_FLAG) ? -1 : 1;
                     }
 
@@ -1823,19 +2086,18 @@ execx86(int cycs)
                     bits     = 8 << (opcode & 1);
                     handled  = 1;
                     if (!repeating)
-                        wait(2, 0);
+                        wait_cycs(2, 0);
 
                     if (rep_action(bits))
                         break;
                     else if (!repeating)
-                        wait(7, 0);
+                        wait_cycs(7, 0);
 
                     if (bits == 16) {
                         cpu_outw(DX, readmemw(dest_seg, SI));
                         SI += (cpu_state.flags & D_FLAG) ? -2 : 2;
                     } else {
-                        wait(4, 0);
-                        outb(DX, readmemb(dest_seg + SI));
+                        cpu_outb(DX, readmemb(dest_seg + SI));
                         SI += (cpu_state.flags & D_FLAG) ? -1 : 1;
                     }
                     if (in_rep == 0)
@@ -1872,12 +2134,12 @@ execx86(int cycs)
                     bits = 8 << (opcode & 1);
                     do_mod_rm();
                     if (cpu_mod == 3)
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                     access(53, bits);
                     cpu_data = get_ea();
                     cpu_src  = pfq_fetchb();
 
-                    wait((cpu_mod != 3) ? 9 : 6, 0);
+                    wait_cycs((cpu_mod != 3) ? 9 : 6, 0);
 
                     if (!is_nec)
                         cpu_src &= 0x1F;
@@ -1949,7 +2211,7 @@ execx86(int cycs)
                                 break;
                         }
                         if ((opcode & 2) != 0)
-                            wait(4, 0);
+                            wait_cycs(4, 0);
                         --cpu_src;
                     }
                     access(17, bits);
@@ -1983,7 +2245,7 @@ execx86(int cycs)
                         switch (opcode) {
                             case 0x28: /* ROL4 r/m */
                                 do_mod_rm();
-                                wait(21, 0);
+                                wait_cycs(21, 0);
 
                                 temp_val = geteab();
                                 temp_al  = AL;
@@ -2001,7 +2263,7 @@ execx86(int cycs)
 
                             case 0x2a: /* ROR4 r/m */
                                 do_mod_rm();
-                                wait(21, 0);
+                                wait_cycs(21, 0);
 
                                 temp_val = geteab();
                                 temp_al  = AL;
@@ -2020,7 +2282,7 @@ execx86(int cycs)
                             case 0x19: /* TEST1 r16/m16, imm4 */
                                 bits = 8 << (opcode & 0x1);
                                 do_mod_rm();
-                                wait(3, 0);
+                                wait_cycs(3, 0);
 
                                 bit = (opcode & 0x8) ? (pfq_fetchb()) : (CL);
                                 bit &= ((1 << (3 + (opcode & 0x1))) - 1);
@@ -2038,7 +2300,7 @@ execx86(int cycs)
                             case 0x1f: /* NOT1 r16/m16, imm4 */
                                 bits = 8 << (opcode & 0x1);
                                 do_mod_rm();
-                                wait(3, 0);
+                                wait_cycs(3, 0);
 
                                 bit = (opcode & 0x8) ? (pfq_fetchb()) : (CL);
                                 bit &= ((1 << (3 + (opcode & 0x1))) - 1);
@@ -2058,7 +2320,7 @@ execx86(int cycs)
                             case 0x1d: /* SET1 r16/m16, imm4 */
                                 bits = 8 << (opcode & 0x1);
                                 do_mod_rm();
-                                wait(3, 0);
+                                wait_cycs(3, 0);
 
                                 bit = (opcode & 0x8) ? (pfq_fetchb()) : (CL);
                                 bit &= ((1 << (3 + (opcode & 0x1))) - 1);
@@ -2078,7 +2340,7 @@ execx86(int cycs)
                             case 0x1b: /* CLR1 r16/m16, imm4 */
                                 bits = 8 << (opcode & 0x1);
                                 do_mod_rm();
-                                wait(3, 0);
+                                wait_cycs(3, 0);
 
                                 bit = (opcode & 0x8) ? (pfq_fetchb()) : (CL);
                                 bit &= ((1 << (3 + (opcode & 0x1))) - 1);
@@ -2101,9 +2363,9 @@ execx86(int cycs)
                                 nibble        = 0;
                                 srcseg        = ovr_seg ? *ovr_seg : ds;
 
-                                wait(5, 0);
+                                wait_cycs(5, 0);
                                 for (i = 0; i < ((nibbles_count / 2) + odd); i++) {
-                                    wait(19, 0);
+                                    wait_cycs(19, 0);
                                     destcmp = read_mem_b((es) + DI + i);
                                     for (nibble = 0; nibble < 2; nibble++) {
                                         destbyte = destcmp >> (nibble ? 4 : 0);
@@ -2136,9 +2398,9 @@ execx86(int cycs)
                                 nibble        = 0;
                                 srcseg        = ovr_seg ? *ovr_seg : ds;
 
-                                wait(5, 0);
+                                wait_cycs(5, 0);
                                 for (i = 0; i < ((nibbles_count / 2) + odd); i++) {
-                                    wait(19, 0);
+                                    wait_cycs(19, 0);
                                     destcmp = read_mem_b((es) + DI + i);
                                     for (nibble = 0; nibble < 2; nibble++) {
                                         destbyte = destcmp >> (nibble ? 4 : 0);
@@ -2171,9 +2433,9 @@ execx86(int cycs)
                                 nibble        = 0;
                                 srcseg        = ovr_seg ? *ovr_seg : ds;
 
-                                wait(5, 0);
+                                wait_cycs(5, 0);
                                 for (i = 0; i < ((nibbles_count / 2) + odd); i++) {
-                                    wait(19, 0);
+                                    wait_cycs(19, 0);
                                     destcmp = read_mem_b((es) + DI + i);
                                     for (nibble = 0; nibble < 2; nibble++) {
                                         destbyte = destcmp >> (nibble ? 4 : 0);
@@ -2199,7 +2461,7 @@ execx86(int cycs)
                             case 0x31: /* INS reg1, reg2 */
                             case 0x39: /* INS reg8, imm4 */
                                 do_mod_rm();
-                                wait(1, 0);
+                                wait_cycs(1, 0);
 
                                 bit_length = ((opcode & 0x8) ? (pfq_fetchb() & 0xF) : (getr8(cpu_reg) & 0xF)) + 1;
                                 bit_offset = getr8(cpu_rm) & 0xF;
@@ -2228,7 +2490,7 @@ execx86(int cycs)
                             case 0x33: /* EXT reg1, reg2 */
                             case 0x3b: /* EXT reg8, imm4 */
                                 do_mod_rm();
-                                wait(1, 0);
+                                wait_cycs(1, 0);
 
                                 bit_length = ((opcode & 0x8) ? (pfq_fetchb() & 0xF) : (getr8(cpu_reg) & 0xF)) + 1;
                                 bit_offset = getr8(cpu_rm) & 0xF;
@@ -2257,8 +2519,8 @@ execx86(int cycs)
                                 break;
 
                             case 0xFF: /* BRKEM */
-                                /* Unimplemented for now. */
-                                fatal("808x: Unsupported 8080 emulation mode attempted to enter into!");
+                                interrupt_brkem(pfq_fetchb());
+                                handled = 1;
                                 break;
 
                             default:
@@ -2276,7 +2538,7 @@ execx86(int cycs)
                         pfq_pos = 0;
                     } else
                         load_seg(pop(), _opseg[(opcode >> 3) & 0x03]);
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     /* All POP segment instructions suppress interrupts for one instruction. */
                     noint = 1;
                     break;
@@ -2285,7 +2547,7 @@ execx86(int cycs)
                 case 0x2E: /*CS:*/
                 case 0x36: /*SS:*/
                 case 0x3E: /*DS:*/
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     ovr_seg   = opseg[(opcode >> 3) & 0x03];
                     completed = 0;
                     break;
@@ -2336,21 +2598,21 @@ execx86(int cycs)
                         cpu_src  = tempw;
                     }
                     if (cpu_mod != 3)
-                        wait(2, 0);
-                    wait(1, 0);
+                        wait_cycs(2, 0);
+                    wait_cycs(1, 0);
                     alu_op(bits);
                     if (cpu_alu_op != 7) {
                         if ((opcode & 2) == 0) {
                             access(10, bits);
                             set_ea(cpu_data);
                             if (cpu_mod == 3)
-                                wait(1, 0);
+                                wait_cycs(1, 0);
                         } else {
                             set_reg(cpu_reg, cpu_data);
-                            wait(1, 0);
+                            wait_cycs(1, 0);
                         }
                     } else
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                     break;
 
                 case 0x04:
@@ -2371,7 +2633,7 @@ execx86(int cycs)
                 case 0x3d:
                     /* alu A, imm */
                     bits = 8 << (opcode & 1);
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     cpu_data   = pfq_fetch();
                     cpu_dest   = get_accum(bits); /* AX/AL */
                     cpu_src    = cpu_data;
@@ -2379,7 +2641,7 @@ execx86(int cycs)
                     alu_op(bits);
                     if (cpu_alu_op != 7)
                         set_accum(bits, cpu_data);
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     break;
 
                 case 0x27: /*DAA*/
@@ -2402,7 +2664,7 @@ execx86(int cycs)
                     }
                     AL = cpu_dest;
                     set_pzs(8);
-                    wait(3, 0);
+                    wait_cycs(3, 0);
                     break;
                 case 0x2F: /*DAS*/
                     cpu_dest = AL;
@@ -2424,10 +2686,10 @@ execx86(int cycs)
                     }
                     AL = cpu_dest;
                     set_pzs(8);
-                    wait(3, 0);
+                    wait_cycs(3, 0);
                     break;
                 case 0x37: /*AAA*/
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     if ((cpu_state.flags & A_FLAG) || ((AL & 0xf) > 9)) {
                         cpu_src = 6;
                         ++AH;
@@ -2435,7 +2697,7 @@ execx86(int cycs)
                     } else {
                         cpu_src = 0;
                         clear_ca();
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                     }
                     cpu_dest = AL;
                     cpu_data = cpu_dest + cpu_src;
@@ -2443,7 +2705,7 @@ execx86(int cycs)
                     aa();
                     break;
                 case 0x3F: /*AAS*/
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     if ((cpu_state.flags & A_FLAG) || ((AL & 0xf) > 9)) {
                         cpu_src = 6;
                         --AH;
@@ -2451,7 +2713,7 @@ execx86(int cycs)
                     } else {
                         cpu_src = 0;
                         clear_ca();
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                     }
                     cpu_dest = AL;
                     cpu_data = cpu_dest - cpu_src;
@@ -2476,7 +2738,7 @@ execx86(int cycs)
                 case 0x4E:
                 case 0x4F:
                     /* INCDEC rw */
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     cpu_dest = cpu_state.regs[opcode & 7].w;
                     cpu_src  = 1;
                     bits     = 16;
@@ -2513,7 +2775,7 @@ execx86(int cycs)
                 case 0x5F:
                     access(23, 16);
                     cpu_state.regs[opcode & 0x07].w = pop();
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     break;
 
                 case 0x60: /*JO alias*/
@@ -2580,20 +2842,20 @@ execx86(int cycs)
                     cpu_data = get_ea();
                     cpu_dest = cpu_data;
                     if (cpu_mod != 3)
-                        wait(3, 0);
+                        wait_cycs(3, 0);
                     if (opcode == 0x81) {
                         if (cpu_mod == 3)
-                            wait(1, 0);
+                            wait_cycs(1, 0);
                         cpu_src = pfq_fetchw();
                     } else {
                         if (cpu_mod == 3)
-                            wait(1, 0);
+                            wait_cycs(1, 0);
                         if (opcode == 0x83)
                             cpu_src = sign_extend(pfq_fetchb());
                         else
                             cpu_src = pfq_fetchb() | 0xff00;
                     }
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     cpu_alu_op = (rmdat & 0x38) >> 3;
                     alu_op(bits);
                     if (cpu_alu_op != 7) {
@@ -2601,7 +2863,7 @@ execx86(int cycs)
                         set_ea(cpu_data);
                     } else {
                         if (cpu_mod != 3)
-                            wait(1, 0);
+                            wait_cycs(1, 0);
                     }
                     break;
 
@@ -2614,8 +2876,8 @@ execx86(int cycs)
                     cpu_data = get_ea();
                     test(bits, cpu_data, get_reg(cpu_reg));
                     if (cpu_mod == 3)
-                        wait(2, 0);
-                    wait(2, 0);
+                        wait_cycs(2, 0);
+                    wait_cycs(2, 0);
                     break;
                 case 0x86:
                 case 0x87:
@@ -2626,7 +2888,7 @@ execx86(int cycs)
                     cpu_data = get_ea();
                     cpu_src  = get_reg(cpu_reg);
                     set_reg(cpu_reg, cpu_data);
-                    wait(3, 0);
+                    wait_cycs(3, 0);
                     access(12, bits);
                     set_ea(cpu_src);
                     break;
@@ -2636,7 +2898,7 @@ execx86(int cycs)
                     /* MOV rm, reg */
                     bits = 8 << (opcode & 1);
                     do_mod_rm();
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     access(13, bits);
                     set_ea(get_reg(cpu_reg));
                     break;
@@ -2647,15 +2909,15 @@ execx86(int cycs)
                     do_mod_rm();
                     access(50, bits);
                     set_reg(cpu_reg, get_ea());
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     if (cpu_mod != 3)
-                        wait(2, 0);
+                        wait_cycs(2, 0);
                     break;
 
                 case 0x8C: /*MOV w,sreg*/
                     do_mod_rm();
                     if (cpu_mod == 3)
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                     access(14, 16);
                     seteaw(_opseg[(rmdat & 0x18) >> 3]->seg);
                     break;
@@ -2663,9 +2925,9 @@ execx86(int cycs)
                 case 0x8D: /*LEA*/
                     do_mod_rm();
                     cpu_state.regs[cpu_reg].w = cpu_state.eaaddr;
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     if (cpu_mod != 3)
-                        wait(2, 0);
+                        wait_cycs(2, 0);
                     break;
 
                 case 0x8E: /*MOV sreg,w*/
@@ -2677,23 +2939,23 @@ execx86(int cycs)
                         pfq_pos = 0;
                     } else
                         load_seg(tempw, _opseg[(rmdat & 0x18) >> 3]);
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     if (cpu_mod != 3)
-                        wait(2, 0);
+                        wait_cycs(2, 0);
                     if (((rmdat & 0x18) >> 3) == 2)
                         noint = 1;
                     break;
 
                 case 0x8F: /*POPW*/
                     do_mod_rm();
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     cpu_src = cpu_state.eaaddr;
                     access(24, 16);
                     if (cpu_mod != 3)
-                        wait(2, 0);
+                        wait_cycs(2, 0);
                     cpu_data         = pop();
                     cpu_state.eaaddr = cpu_src;
-                    wait(2, 0);
+                    wait_cycs(2, 0);
                     access(15, 16);
                     seteaw(cpu_data);
                     break;
@@ -2707,30 +2969,30 @@ execx86(int cycs)
                 case 0x96:
                 case 0x97:
                     /* XCHG AX, rw */
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     cpu_data                     = cpu_state.regs[opcode & 7].w;
                     cpu_state.regs[opcode & 7].w = AX;
                     AX                           = cpu_data;
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     break;
 
                 case 0x98: /*CBW*/
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     AX = sign_extend(AL);
                     break;
                 case 0x99: /*CWD*/
-                    wait(4, 0);
+                    wait_cycs(4, 0);
                     if (!top_bit(AX, 16))
                         DX = 0;
                     else {
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                         DX = 0xffff;
                     }
                     break;
                 case 0x9A: /*CALL FAR*/
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     new_ip = pfq_fetchw();
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     new_cs = pfq_fetchw();
                     pfq_clear();
                     access(31, 16);
@@ -2744,20 +3006,20 @@ execx86(int cycs)
                     break;
                 case 0x9B: /*WAIT*/
                     if (!repeating)
-                        wait(2, 0);
-                    wait(5, 0);
+                        wait_cycs(2, 0);
+                    wait_cycs(5, 0);
 #ifdef NO_HACK
-                    if (irq_pending()) {
-                        wait(7, 0);
-                        check_interrupts();
+                    if (irq_pending(0)) {
+                        wait_cycs(7, 0);
+                        check_interrupts(0);
                     } else {
                         repeating = 1;
                         completed = 0;
                         clock_end();
                     }
 #else
-                    wait(7, 0);
-                    check_interrupts();
+                    wait_cycs(7, 0);
+                    check_interrupts(0);
 #endif
                     break;
                 case 0x9C: /*PUSHF*/
@@ -2768,21 +3030,25 @@ execx86(int cycs)
                         tempw = (cpu_state.flags & 0x0fd7) | 0xf000;
                     push(&tempw);
                     break;
-                case 0x9D: /*POPF*/
+                case 0x9D: { /*POPF*/
+                    uint16_t old_flags = cpu_state.flags;
                     access(25, 16);
-                    if (is_nec)
+                    if (is_nec && cpu_md_write_disable)
                         cpu_state.flags = pop() | 0x8002;
                     else
                         cpu_state.flags = pop() | 0x0002;
-                    wait(1, 0);
+                    wait_cycs(1, 0);
+                    if ((old_flags ^ cpu_state.flags) & T_FLAG)
+                        noint = 1;
+                    sync_to_i8080();
                     break;
-                case 0x9E: /*SAHF*/
-                    wait(1, 0);
+                } case 0x9E: /*SAHF*/
+                    wait_cycs(1, 0);
                     cpu_state.flags = (cpu_state.flags & 0xff02) | AH;
-                    wait(2, 0);
+                    wait_cycs(2, 0);
                     break;
                 case 0x9F: /*LAHF*/
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     AH = cpu_state.flags & 0xd7;
                     break;
 
@@ -2790,17 +3056,17 @@ execx86(int cycs)
                 case 0xA1:
                     /* MOV A, [iw] */
                     bits = 8 << (opcode & 1);
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     cpu_state.eaaddr = pfq_fetchw();
                     access(1, bits);
                     set_accum(bits, readmem((ovr_seg ? *ovr_seg : ds)));
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     break;
                 case 0xA2:
                 case 0xA3:
                     /* MOV [iw], A */
                     bits = 8 << (opcode & 1);
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     cpu_state.eaaddr = pfq_fetchw();
                     access(7, bits);
                     writemem((ovr_seg ? *ovr_seg : ds), get_accum(bits));
@@ -2812,18 +3078,18 @@ execx86(int cycs)
                 case 0xAD: /* LODS */
                     bits = 8 << (opcode & 1);
                     if (!repeating) {
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                         if ((opcode & 8) == 0 && in_rep != 0)
-                            wait(1, 0);
+                            wait_cycs(1, 0);
                     }
                     if (rep_action(bits)) {
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                         if ((opcode & 8) != 0)
-                            wait(1, 0);
+                            wait_cycs(1, 0);
                         break;
                     }
                     if (in_rep != 0 && (opcode & 8) != 0)
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                     access(20, bits);
                     lods(bits);
                     if ((opcode & 8) == 0) {
@@ -2832,12 +3098,12 @@ execx86(int cycs)
                     } else {
                         set_accum(bits, cpu_data);
                         if (in_rep != 0)
-                            wait(2, 0);
+                            wait_cycs(2, 0);
                     }
                     if (in_rep == 0) {
-                        wait(3, 0);
+                        wait_cycs(3, 0);
                         if ((opcode & 8) != 0)
-                            wait(1, 0);
+                            wait_cycs(1, 0);
                         break;
                     }
                     repeating = 1;
@@ -2850,19 +3116,19 @@ execx86(int cycs)
                 case 0xAF: /* SCAS */
                     bits = 8 << (opcode & 1);
                     if (!repeating)
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                     if (rep_action(bits)) {
-                        wait(2, 0);
+                        wait_cycs(2, 0);
                         break;
                     }
                     if (in_rep != 0)
-                        wait(1, 0);
-                    wait(1, 0);
+                        wait_cycs(1, 0);
+                    wait_cycs(1, 0);
                     cpu_dest = get_accum(bits);
                     if ((opcode & 8) == 0) {
                         access(21, bits);
                         lods(bits);
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                         cpu_dest = cpu_data;
                     }
                     access(2, bits);
@@ -2871,14 +3137,14 @@ execx86(int cycs)
                     DI               = string_increment(bits);
                     cpu_src          = cpu_data;
                     sub(bits);
-                    wait(2, 0);
+                    wait_cycs(2, 0);
                     if (in_rep == 0) {
-                        wait(3, 0);
+                        wait_cycs(3, 0);
                         break;
                     }
                     if ((!!(cpu_state.flags & (rep_c_flag ? C_FLAG : Z_FLAG))) == (in_rep == 1)) {
                         completed = 1;
-                        wait(4, 0);
+                        wait_cycs(4, 0);
                         break;
                     }
                     repeating = 1;
@@ -2889,29 +3155,29 @@ execx86(int cycs)
                 case 0xA9:
                     /* TEST A, imm */
                     bits = 8 << (opcode & 1);
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     cpu_data = pfq_fetch();
                     test(bits, get_accum(bits), cpu_data);
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     break;
 
                 case 0xAA:
                 case 0xAB: /* STOS */
                     bits = 8 << (opcode & 1);
                     if (!repeating) {
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                         if (in_rep != 0)
-                            wait(1, 0);
+                            wait_cycs(1, 0);
                     }
                     if (rep_action(bits)) {
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                         break;
                     }
                     cpu_data = AX;
                     access(28, bits);
                     stos(bits);
                     if (in_rep == 0) {
-                        wait(3, 0);
+                        wait_cycs(3, 0);
                         break;
                     }
                     repeating = 1;
@@ -2926,12 +3192,12 @@ execx86(int cycs)
                 case 0xB5:
                 case 0xB6:
                 case 0xB7:
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     if (opcode & 0x04)
                         cpu_state.regs[opcode & 0x03].b.h = pfq_fetchb();
                     else
                         cpu_state.regs[opcode & 0x03].b.l = pfq_fetchb();
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     break;
 
                 case 0xB8:
@@ -2942,9 +3208,9 @@ execx86(int cycs)
                 case 0xBD:
                 case 0xBE:
                 case 0xBF:
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     cpu_state.regs[opcode & 0x07].w = pfq_fetchw();
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     break;
 
                 case 0xC0:
@@ -2958,28 +3224,28 @@ execx86(int cycs)
                     /* RET */
                     bits = 8 + (opcode & 0x08);
                     if ((opcode & 9) != 1)
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                     if (!(opcode & 1)) {
                         cpu_src = pfq_fetchw();
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                     }
                     if ((opcode & 9) == 9)
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                     pfq_clear();
                     access(26, bits);
                     new_ip = pop();
-                    wait(2, 0);
+                    wait_cycs(2, 0);
                     if ((opcode & 8) == 0)
                         new_cs = CS;
                     else {
                         access(42, bits);
                         new_cs = pop();
                         if (opcode & 1)
-                            wait(1, 0);
+                            wait_cycs(1, 0);
                     }
                     if (!(opcode & 1)) {
                         SP += cpu_src;
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                     }
                     load_cs(new_cs);
                     access(72, bits);
@@ -2997,7 +3263,7 @@ execx86(int cycs)
                     access(57, bits);
                     read_ea2(bits);
                     load_seg(cpu_data, (opcode & 0x01) ? &cpu_state.seg_ds : &cpu_state.seg_es);
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     break;
 
                 case 0xC6:
@@ -3005,12 +3271,12 @@ execx86(int cycs)
                     /* MOV rm, imm */
                     bits = 8 << (opcode & 1);
                     do_mod_rm();
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     if (cpu_mod != 3)
-                        wait(2, 0);
+                        wait_cycs(2, 0);
                     cpu_data = pfq_fetch();
                     if (cpu_mod == 3)
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                     access(16, bits);
                     set_ea(cpu_data);
                     break;
@@ -3019,13 +3285,13 @@ execx86(int cycs)
                     interrupt(3);
                     break;
                 case 0xCD: /*INT*/
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     interrupt(pfq_fetchb());
                     break;
                 case 0xCE: /*INTO*/
-                    wait(3, 0);
+                    wait_cycs(3, 0);
                     if (cpu_state.flags & V_FLAG) {
-                        wait(2, 0);
+                        wait_cycs(2, 0);
                         interrupt(4);
                     }
                     break;
@@ -3033,20 +3299,22 @@ execx86(int cycs)
                 case 0xCF: /*IRET*/
                     access(43, 8);
                     new_ip = pop();
-                    wait(3, 0);
+                    wait_cycs(3, 0);
                     access(44, 8);
                     new_cs = pop();
                     load_cs(new_cs);
                     access(62, 8);
                     set_ip(new_ip);
                     access(45, 8);
-                    if (is_nec)
+                    if (is_nec && cpu_md_write_disable)
                         cpu_state.flags = pop() | 0x8002;
                     else
                         cpu_state.flags = pop() | 0x0002;
-                    wait(5, 0);
-                    noint      = 1;
+                    wait_cycs(5, 0);
+                    noint      = 2;
                     nmi_enable = 1;
+                    if (is_nec && !(cpu_state.flags & MD_FLAG))
+                        sync_to_i8080();
                     break;
 
                 case 0xD0:
@@ -3057,15 +3325,15 @@ execx86(int cycs)
                     bits = 8 << (opcode & 1);
                     do_mod_rm();
                     if (cpu_mod == 3)
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                     access(53, bits);
                     cpu_data = get_ea();
                     if ((opcode & 2) == 0) {
                         cpu_src = 1;
-                        wait((cpu_mod != 3) ? 4 : 0, 0);
+                        wait_cycs((cpu_mod != 3) ? 4 : 0, 0);
                     } else {
                         cpu_src = CL;
-                        wait((cpu_mod != 3) ? 9 : 6, 0);
+                        wait_cycs((cpu_mod != 3) ? 9 : 6, 0);
                     }
                     if (is186 && !is_nec)
                         cpu_src &= 0x1F;
@@ -3137,7 +3405,7 @@ execx86(int cycs)
                                 break;
                         }
                         if ((opcode & 2) != 0)
-                            wait(4, 0);
+                            wait_cycs(4, 0);
                         --cpu_src;
                     }
                     access(17, bits);
@@ -3145,7 +3413,7 @@ execx86(int cycs)
                     break;
 
                 case 0xD4: /*AAM*/
-                    wait(1, 0);
+                    wait_cycs(1, 0);
 #ifdef NO_VARIANT_ON_NEC
                     if (is_nec) {
                         (void) pfq_fetchb();
@@ -3155,11 +3423,13 @@ execx86(int cycs)
 #else
                     cpu_src = pfq_fetchb();
 #endif
-                    if (x86_div(AL, 0))
-                        set_pzs(16);
+                    if (x86_div(AL, 0)) {
+                        cpu_data = AL;
+                        set_pzs(8);
+                    }
                     break;
                 case 0xD5: /*AAD*/
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     if (is_nec) {
                         (void) pfq_fetchb();
                         mul(10, AH);
@@ -3170,17 +3440,21 @@ execx86(int cycs)
                     add(8);
                     AL = cpu_data;
                     AH = 0x00;
+                    set_pzs(8);
                     break;
                 case 0xD6: /*SALC*/
-                    wait(1, 0);
-                    AL = (cpu_state.flags & C_FLAG) ? 0xff : 0x00;
-                    wait(1, 0);
-                    break;
+                    if (!is_nec) {
+                        wait_cycs(1, 0);
+                        AL = (cpu_state.flags & C_FLAG) ? 0xff : 0x00;
+                        wait_cycs(1, 0);
+                        break;
+                    }
+                    fallthrough;
                 case 0xD7: /*XLATB*/
                     cpu_state.eaaddr = (BX + AL) & 0xffff;
                     access(4, 8);
                     AL = readmemb((ovr_seg ? *ovr_seg : ds) + cpu_state.eaaddr);
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     break;
 
                 case 0xD8:
@@ -3198,37 +3472,72 @@ execx86(int cycs)
                     if (!hasfpu)
                         geteaw();
                     else
-                        switch (opcode) {
-                            case 0xD8:
-                                ops_fpu_8087_d8[(rmdat >> 3) & 0x1f]((uint32_t) rmdat);
-                                break;
-                            case 0xD9:
-                                ops_fpu_8087_d9[rmdat & 0xff]((uint32_t) rmdat);
-                                break;
-                            case 0xDA:
-                                ops_fpu_8087_da[rmdat & 0xff]((uint32_t) rmdat);
-                                break;
-                            case 0xDB:
-                                ops_fpu_8087_db[rmdat & 0xff]((uint32_t) rmdat);
-                                break;
-                            case 0xDC:
-                                ops_fpu_8087_dc[(rmdat >> 3) & 0x1f]((uint32_t) rmdat);
-                                break;
-                            case 0xDD:
-                                ops_fpu_8087_dd[rmdat & 0xff]((uint32_t) rmdat);
-                                break;
-                            case 0xDE:
-                                ops_fpu_8087_de[rmdat & 0xff]((uint32_t) rmdat);
-                                break;
-                            case 0xDF:
-                                ops_fpu_8087_df[rmdat & 0xff]((uint32_t) rmdat);
-                                break;
+                        if (fpu_softfloat) {
+                            switch (opcode) {
+                                case 0xD8:
+                                    ops_sf_fpu_8087_d8[(rmdat >> 3) & 0x1f](rmdat);
+                                    break;
+                                case 0xD9:
+                                    ops_sf_fpu_8087_d9[rmdat & 0xff](rmdat);
+                                    break;
+                                case 0xDA:
+                                    ops_sf_fpu_8087_da[rmdat & 0xff](rmdat);
+                                    break;
+                                case 0xDB:
+                                    ops_sf_fpu_8087_db[rmdat & 0xff](rmdat);
+                                    break;
+                                case 0xDC:
+                                    ops_sf_fpu_8087_dc[(rmdat >> 3) & 0x1f](rmdat);
+                                    break;
+                                case 0xDD:
+                                    ops_sf_fpu_8087_dd[rmdat & 0xff](rmdat);
+                                    break;
+                                case 0xDE:
+                                    ops_sf_fpu_8087_de[rmdat & 0xff](rmdat);
+                                    break;
+                                case 0xDF:
+                                    ops_sf_fpu_8087_df[rmdat & 0xff](rmdat);
+                                    break;
+
+                                default:
+                                    break;
+                            }
+                        } else {
+                            switch (opcode) {
+                                case 0xD8:
+                                    ops_fpu_8087_d8[(rmdat >> 3) & 0x1f](rmdat);
+                                    break;
+                                case 0xD9:
+                                    ops_fpu_8087_d9[rmdat & 0xff](rmdat);
+                                    break;
+                                case 0xDA:
+                                    ops_fpu_8087_da[rmdat & 0xff](rmdat);
+                                    break;
+                                case 0xDB:
+                                    ops_fpu_8087_db[rmdat & 0xff](rmdat);
+                                    break;
+                                case 0xDC:
+                                    ops_fpu_8087_dc[(rmdat >> 3) & 0x1f](rmdat);
+                                    break;
+                                case 0xDD:
+                                    ops_fpu_8087_dd[rmdat & 0xff](rmdat);
+                                    break;
+                                case 0xDE:
+                                    ops_fpu_8087_de[rmdat & 0xff](rmdat);
+                                    break;
+                                case 0xDF:
+                                    ops_fpu_8087_df[rmdat & 0xff](rmdat);
+                                    break;
+
+                                default:
+                                    break;
+                            }
                         }
                     cpu_state.pc = tempw; /* Do this as the x87 code advances it, which is needed on
                                              the 286+ core, but not here. */
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     if (cpu_mod != 3)
-                        wait(2, 0);
+                        wait_cycs(2, 0);
                     break;
 
                 case 0xE0:
@@ -3236,10 +3545,10 @@ execx86(int cycs)
                 case 0xE2:
                 case 0xE3:
                     /* LOOP */
-                    wait(3, 0);
+                    wait_cycs(3, 0);
                     cpu_data = pfq_fetchb();
                     if (opcode != 0xe2)
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                     if (opcode != 0xe3) {
                         --CX;
                         oldc = (CX != 0);
@@ -3269,7 +3578,7 @@ execx86(int cycs)
                 case 0xEF:
                     bits = 8 << (opcode & 1);
                     if ((opcode & 0x0e) != 0x0c)
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                     if ((opcode & 8) == 0)
                         cpu_data = pfq_fetchb();
                     else
@@ -3281,7 +3590,7 @@ execx86(int cycs)
                             cpu_io(16, 0, cpu_data);
                         else
                             cpu_io(8, 0, cpu_data);
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                     } else {
                         if ((opcode & 8) == 0)
                             access(8, bits);
@@ -3295,19 +3604,19 @@ execx86(int cycs)
                     break;
 
                 case 0xE8: /*CALL rel 16*/
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     cpu_state.oldpc = jump_near();
                     access(34, 8);
                     push((uint16_t *) &(cpu_state.oldpc));
                     break;
                 case 0xE9: /*JMP rel 16*/
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     jump_near();
                     break;
                 case 0xEA: /*JMP far*/
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     addr = pfq_fetchw();
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     tempw = pfq_fetchw();
                     load_cs(tempw);
                     access(70, 8);
@@ -3315,22 +3624,22 @@ execx86(int cycs)
                     set_ip(addr);
                     break;
                 case 0xEB: /*JMP rel*/
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     cpu_data = (int8_t) pfq_fetchb();
                     jump_short();
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     break;
 
                 case 0xF0:
                 case 0xF1: /*LOCK - F1 is alias*/
                     in_lock = 1;
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     completed = 0;
                     break;
 
                 case 0xF2: /*REPNE*/
                 case 0xF3: /*REPE*/
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     in_rep     = (opcode == 0xf2 ? 1 : 2);
                     completed  = 0;
                     rep_c_flag = 0;
@@ -3338,13 +3647,13 @@ execx86(int cycs)
 
                 case 0xF4: /*HLT*/
                     if (!repeating) {
-                        wait(1, 0);
+                        wait_cycs(1, 0);
                         pfq_clear();
                     }
-                    wait(1, 0);
-                    if (irq_pending()) {
-                        wait(cycles & 1, 0);
-                        check_interrupts();
+                    wait_cycs(1, 0);
+                    if (irq_pending(is_nec)) {
+                        wait_cycs(cycles & 1, 0);
+                        check_interrupts(is_nec);
                     } else {
                         repeating = 1;
                         completed = 0;
@@ -3352,7 +3661,7 @@ execx86(int cycs)
                     }
                     break;
                 case 0xF5: /*CMC*/
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     cpu_state.flags ^= C_FLAG;
                     break;
 
@@ -3366,18 +3675,18 @@ execx86(int cycs)
                         case 0x00:
                         case 0x08:
                             /* TEST */
-                            wait(2, 0);
+                            wait_cycs(2, 0);
                             if (cpu_mod != 3)
-                                wait(1, 0);
+                                wait_cycs(1, 0);
                             cpu_src = pfq_fetch();
-                            wait(1, 0);
+                            wait_cycs(1, 0);
                             test(bits, cpu_data, cpu_src);
                             if (cpu_mod != 3)
-                                wait(1, 0);
+                                wait_cycs(1, 0);
                             break;
                         case 0x10: /* NOT */
                         case 0x18: /* NEG */
-                            wait(2, 0);
+                            wait_cycs(2, 0);
                             if ((rmdat & 0x38) == 0x10)
                                 cpu_data = ~cpu_data;
                             else {
@@ -3391,7 +3700,7 @@ execx86(int cycs)
                         case 0x20: /* MUL */
                         case 0x28: /* IMUL */
                             old_flags = cpu_state.flags;
-                            wait(1, 0);
+                            wait_cycs(1, 0);
                             mul(get_accum(bits), cpu_data);
                             if (opcode & 1) {
                                 AX = cpu_data;
@@ -3408,7 +3717,7 @@ execx86(int cycs)
                             set_sf(bits);
                             set_pf();
                             if (cpu_mod != 3)
-                                wait(1, 0);
+                                wait_cycs(1, 0);
                             /* NOTE: When implementing the V20, care should be taken to not change
                                      the zero flag. */
                             if (is_nec)
@@ -3417,10 +3726,10 @@ execx86(int cycs)
                         case 0x30: /* DIV */
                         case 0x38: /* IDIV */
                             if (cpu_mod != 3)
-                                wait(1, 0);
+                                wait_cycs(1, 0);
                             cpu_src = cpu_data;
                             if (x86_div(AL, AH))
-                                wait(1, 0);
+                                wait_cycs(1, 0);
                             break;
                     }
                     break;
@@ -3428,19 +3737,19 @@ execx86(int cycs)
                 case 0xF8:
                 case 0xF9:
                     /* CLCSTC */
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     set_cf(opcode & 1);
                     break;
                 case 0xFA:
                 case 0xFB:
                     /* CLISTI */
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     set_if(opcode & 1);
                     break;
                 case 0xFC:
                 case 0xFD:
                     /* CLDSTD */
-                    wait(1, 0);
+                    wait_cycs(1, 0);
                     set_df(opcode & 1);
                     break;
 
@@ -3465,22 +3774,22 @@ execx86(int cycs)
                             }
                             do_af();
                             set_pzs(bits);
-                            wait(2, 0);
+                            wait_cycs(2, 0);
                             access(19, bits);
                             set_ea(cpu_data);
                             break;
                         case 0x10: /* CALL rm */
                             cpu_data_opff_rm();
                             access(63, bits);
-                            wait(1, 0);
+                            wait_cycs(1, 0);
                             pfq_clear();
-                            wait(4, 0);
+                            wait_cycs(4, 0);
                             if (cpu_mod != 3)
-                                wait(1, 0);
-                            wait(1, 0); /* Wait. */
+                                wait_cycs(1, 0);
+                            wait_cycs(1, 0); /* Wait. */
                             cpu_state.oldpc = cpu_state.pc;
                             set_ip(cpu_data);
-                            wait(2, 0);
+                            wait_cycs(2, 0);
                             access(35, bits);
                             push((uint16_t *) &(cpu_state.oldpc));
                             break;
@@ -3494,7 +3803,7 @@ execx86(int cycs)
                             access(36, bits);
                             push(&(CS));
                             access(64, bits);
-                            wait(4, 0);
+                            wait_cycs(4, 0);
                             cpu_state.oldpc = cpu_state.pc;
                             load_cs(new_cs);
                             set_ip(new_ip);
@@ -3520,7 +3829,7 @@ execx86(int cycs)
                         case 0x30: /* PUSH rm */
                         case 0x38:
                             if (cpu_mod != 3)
-                                wait(1, 0);
+                                wait_cycs(1, 0);
                             access(38, bits);
                             push((uint16_t *) &(cpu_data));
                             break;
@@ -3530,11 +3839,11 @@ execx86(int cycs)
                 default:
                     x808x_log("Illegal opcode: %02X\n", opcode);
                     pfq_fetchb();
-                    wait(8, 0);
+                    wait_cycs(8, 0);
                     break;
             }
         }
-
+exec_completed:
         if (completed) {
             repeating  = 0;
             ovr_seg    = NULL;
@@ -3543,7 +3852,7 @@ execx86(int cycs)
             if (in_lock)
                 clear_lock = 1;
             clock_end();
-            check_interrupts();
+            check_interrupts(0);
 
             if (noint)
                 noint = 0;
diff --git a/src/cpu/CMakeLists.txt b/src/cpu/CMakeLists.txt
index bd03a5558..dc7f5ac11 100644
--- a/src/cpu/CMakeLists.txt
+++ b/src/cpu/CMakeLists.txt
@@ -9,30 +9,53 @@
 #          CMake build script.
 #
 # Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
 #
 #          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2024      Jasmine Iwanek.
 #
 
-add_library(cpu OBJECT cpu.c cpu_table.c fpu.c x86.c 808x.c 386.c 386_common.c
-    386_dynarec.c x86_ops_mmx.c x86seg_common.c x86seg.c x86seg_2386.c x87.c
-    x87_timings.c 8080.c)
+add_library(cpu OBJECT
+    cpu.c
+    cpu_table.c
+    fpu.c x86.c
+    808x.c
+    386.c
+    386_common.c
+    386_dynarec.c
+    x86_ops_mmx.c
+    x86seg_common.c
+    x86seg.c
+    x86seg_2386.c
+    x87.c
+    x87_timings.c
+    i8080.c
+)
 
 if(AMD_K5)
     target_compile_definitions(cpu PRIVATE USE_AMD_K5)
+
+if(DYNAREC)
+    add_library(ctk5 OBJECT codegen_timing_k5.c)
+    target_link_libraries(86Box ctk5)
 endif()
 
-if(CYRIX_6X86)
-    target_compile_definitions(cpu PRIVATE USE_CYRIX_6X86)
 endif()
 
 if(DYNAREC)
     target_sources(cpu PRIVATE 386_dynarec_ops.c)
 
-    add_library(cgt OBJECT codegen_timing_486.c codegen_timing_686.c
-        codegen_timing_common.c codegen_timing_k6.c
-        codegen_timing_pentium.c codegen_timing_p6.c
-        codegen_timing_winchip.c codegen_timing_winchip2.c)
+    add_library(cgt OBJECT
+        codegen_timing_486.c
+        codegen_timing_686.c
+        codegen_timing_common.c
+        codegen_timing_k6.c
+        codegen_timing_pentium.c
+        codegen_timing_p6.c
+        codegen_timing_winchip.c
+        codegen_timing_winchip2.c
+    )
 endif()
 
-add_subdirectory(softfloat)
-target_link_libraries(86Box softfloat)
+add_subdirectory(softfloat3e)
+target_link_libraries(86Box softfloat3e)
diff --git a/src/cpu/codegen_timing_486.c b/src/cpu/codegen_timing_486.c
index e862b123e..d8f05cfd3 100644
--- a/src/cpu/codegen_timing_486.c
+++ b/src/cpu/codegen_timing_486.c
@@ -9,6 +9,7 @@
 
 #include "x86.h"
 #include "x86_ops.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include "codegen.h"
 #include "codegen_ops.h"
@@ -17,7 +18,7 @@
 #define CYCLES(c)         (int *) c
 #define CYCLES2(c16, c32) (int *) ((-1 & ~0xffff) | c16 | (c32 << 8))
 
-static int *opcode_timings[256] = {
+static int *opcode_timings_486[256] = {
     // clang-format off
 /*00*/  &timing_mr,     &timing_mr,     &timing_rm,     &timing_rm,     &timing_rr,     &timing_rr,     CYCLES(2),      CYCLES(3),      &timing_mr,     &timing_mr,     &timing_rm,     &timing_rm,     &timing_rr,     &timing_rr,     CYCLES(2),      NULL,
 /*10*/  &timing_mr,     &timing_mr,     &timing_rm,     &timing_rm,     &timing_rr,     &timing_rr,     CYCLES(2),      CYCLES(3),      &timing_mr,     &timing_mr,     &timing_rm,     &timing_rm,     &timing_rr,     &timing_rr,     CYCLES(2),      CYCLES(3),
@@ -41,7 +42,7 @@ static int *opcode_timings[256] = {
     // clang-format on
 };
 
-static int *opcode_timings_mod3[256] = {
+static int *opcode_timings_486_mod3[256] = {
     // clang-format off
 /*00*/  &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     CYCLES(2),      CYCLES(3),      &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     CYCLES(2),      NULL,
 /*10*/  &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     CYCLES(2),      CYCLES(3),      &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     CYCLES(2),      CYCLES(3),
@@ -65,7 +66,7 @@ static int *opcode_timings_mod3[256] = {
     // clang-format on
 };
 
-static int *opcode_timings_0f[256] = {
+static int *opcode_timings_486_0f[256] = {
     // clang-format off
 /*00*/  CYCLES(20),     CYCLES(11),     CYCLES(11),     CYCLES(10),     NULL,           CYCLES(195),    CYCLES(7),      NULL,           CYCLES(1000),   CYCLES(10000),  NULL,           NULL,           NULL,           NULL,           NULL,           NULL,
 /*10*/  NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,
@@ -88,7 +89,7 @@ static int *opcode_timings_0f[256] = {
 /*f0*/  NULL,           &timing_rm,     &timing_rm,     &timing_rm,     NULL,           &timing_rm,     NULL,           NULL,           &timing_rm,     &timing_rm,     &timing_rm,     NULL,           &timing_rm,     &timing_rm,     &timing_rm,     NULL,
     // clang-format on
 };
-static int *opcode_timings_0f_mod3[256] = {
+static int *opcode_timings_486_0f_mod3[256] = {
     // clang-format off
 /*00*/  CYCLES(20),     CYCLES(11),     CYCLES(11),     CYCLES(10),     NULL,           CYCLES(195),    CYCLES(7),      NULL,           CYCLES(1000),   CYCLES(10000),  NULL,           NULL,           NULL,           NULL,           NULL,           NULL,
 /*10*/  NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,
@@ -112,65 +113,65 @@ static int *opcode_timings_0f_mod3[256] = {
     // clang-format on
 };
 
-static int *opcode_timings_shift[8] = {
+static int *opcode_timings_486_shift[8] = {
     // clang-format off
         CYCLES(7),      CYCLES(7),      CYCLES(10),     CYCLES(10),     CYCLES(7),      CYCLES(7),      CYCLES(7),      CYCLES(7)
 };
-static int *opcode_timings_shift_mod3[8] = {
+static int *opcode_timings_486_shift_mod3[8] = {
 // clang-format off
         CYCLES(3),      CYCLES(3),      CYCLES(9),      CYCLES(9),      CYCLES(3),      CYCLES(3),      CYCLES(3),      CYCLES(3)
     // clang-format on
 };
 
-static int *opcode_timings_f6[8] = {
+static int *opcode_timings_486_f6[8] = {
     // clang-format off
         &timing_rm,     NULL,           &timing_mm,     &timing_mm,     CYCLES(13),     CYCLES(14),     CYCLES(16),     CYCLES(19)
     // clang-format on
 };
-static int *opcode_timings_f6_mod3[8] = {
+static int *opcode_timings_486_f6_mod3[8] = {
     // clang-format off
         &timing_rr,     NULL,           &timing_rr,     &timing_rr,     CYCLES(13),     CYCLES(14),     CYCLES(16),     CYCLES(19)
     // clang-format on
 };
-static int *opcode_timings_f7[8] = {
+static int *opcode_timings_486_f7[8] = {
     // clang-format off
         &timing_rm,     NULL,           &timing_mm,     &timing_mm,     CYCLES(21),     CYCLES2(22,38), CYCLES2(24,40), CYCLES2(27,43)
     // clang-format on
 };
-static int *opcode_timings_f7_mod3[8] = {
+static int *opcode_timings_486_f7_mod3[8] = {
     // clang-format off
         &timing_rr,     NULL,           &timing_rr,     &timing_rr,     CYCLES(21),     CYCLES2(22,38), CYCLES2(24,40), CYCLES2(27,43)
 };
-static int *opcode_timings_ff[8] = {
+static int *opcode_timings_486_ff[8] = {
 // clang-format off
         &timing_mm,     &timing_mm,     CYCLES(5),      CYCLES(0),      CYCLES(5),      CYCLES(0),      CYCLES(5),      NULL
 };
-static int *opcode_timings_ff_mod3[8] = {
+static int *opcode_timings_486_ff_mod3[8] = {
 // clang-format off
         &timing_rr,     &timing_rr,     CYCLES(5),      CYCLES(0),      CYCLES(5),      CYCLES(0),      CYCLES(5),      NULL
     // clang-format on
 };
 
-static int *opcode_timings_d8[8] = {
+static int *opcode_timings_486_d8[8] = {
     // clang-format off
 /*      FADDil          FMULil          FCOMil          FCOMPil         FSUBil          FSUBRil         FDIVil          FDIVRil*/
         CYCLES(8),      CYCLES(11),     CYCLES(4),      CYCLES(4),      CYCLES(8),      CYCLES(8),      CYCLES(73),     CYCLES(73)
     // clang-format on
 };
-static int *opcode_timings_d8_mod3[8] = {
+static int *opcode_timings_486_d8_mod3[8] = {
     // clang-format off
 /*      FADD            FMUL            FCOM            FCOMP           FSUB            FSUBR           FDIV            FDIVR*/
         CYCLES(8),      CYCLES(16),     CYCLES(4),      CYCLES(4),      CYCLES(8),      CYCLES(8),      CYCLES(73),     CYCLES(73)
     // clang-format on
 };
 
-static int *opcode_timings_d9[8] = {
+static int *opcode_timings_486_d9[8] = {
     // clang-format off
 /*      FLDs                            FSTs            FSTPs           FLDENV          FLDCW           FSTENV          FSTCW*/
         CYCLES(3),      NULL,           CYCLES(7),      CYCLES(7),      CYCLES(34),     CYCLES(4),      CYCLES(67),     CYCLES(3)
     // clang-format on
 };
-static int *opcode_timings_d9_mod3[64] = {
+static int *opcode_timings_486_d9_mod3[64] = {
     // clang-format off
         /*FLD*/
         CYCLES(4),      CYCLES(4),      CYCLES(4),      CYCLES(4),      CYCLES(4),      CYCLES(4),      CYCLES(4),      CYCLES(4),
@@ -191,25 +192,25 @@ static int *opcode_timings_d9_mod3[64] = {
     // clang-format on
 };
 
-static int *opcode_timings_da[8] = {
+static int *opcode_timings_486_da[8] = {
     // clang-format off
 /*      FADDil          FMULil          FCOMil          FCOMPil         FSUBil          FSUBRil         FDIVil          FDIVRil*/
         CYCLES(8),      CYCLES(11),     CYCLES(4),      CYCLES(4),      CYCLES(8),      CYCLES(8),      CYCLES(73),     CYCLES(73)
     // clang-format on
 };
-static int *opcode_timings_da_mod3[8] = {
+static int *opcode_timings_486_da_mod3[8] = {
     // clang-format off
         NULL,           NULL,           NULL,           NULL,           NULL,           CYCLES(5),      NULL,           NULL
     // clang-format on
 };
 
-static int *opcode_timings_db[8] = {
+static int *opcode_timings_486_db[8] = {
     // clang-format off
 /*      FLDil                           FSTil           FSTPil                          FLDe                            FSTPe*/
         CYCLES(9),      NULL,           CYCLES(28),     CYCLES(28),     NULL,           CYCLES(5),      NULL,           CYCLES(6)
     // clang-format on
 };
-static int *opcode_timings_db_mod3[64] = {
+static int *opcode_timings_486_db_mod3[64] = {
     // clang-format off
         NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,
         NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,
@@ -223,74 +224,74 @@ static int *opcode_timings_db_mod3[64] = {
     // clang-format on
 };
 
-static int *opcode_timings_dc[8] = {
+static int *opcode_timings_486_dc[8] = {
     // clang-format off
 /*      opFADDd_a16     opFMULd_a16     opFCOMd_a16     opFCOMPd_a16    opFSUBd_a16     opFSUBRd_a16    opFDIVd_a16     opFDIVRd_a16*/
         CYCLES(8),      CYCLES(11),     CYCLES(4),      CYCLES(4),      CYCLES(8),      CYCLES(8),      CYCLES(73),     CYCLES(73)
     // clang-format on
 };
-static int *opcode_timings_dc_mod3[8] = {
+static int *opcode_timings_486_dc_mod3[8] = {
     // clang-format off
 /*      opFADDr         opFMULr                                         opFSUBRr        opFSUBr         opFDIVRr        opFDIVr*/
         CYCLES(8),      CYCLES(16),     NULL,           NULL,           CYCLES(8),      CYCLES(8),      CYCLES(73),     CYCLES(73)
     // clang-format on
 };
 
-static int *opcode_timings_dd[8] = {
+static int *opcode_timings_486_dd[8] = {
     // clang-format off
 /*      FLDd                            FSTd            FSTPd           FRSTOR                           FSAVE          FSTSW*/
         CYCLES(3),      NULL,           CYCLES(8),      CYCLES(8),      CYCLES(131),     NULL,           CYCLES(154),   CYCLES(3)
     // clang-format on
 };
-static int *opcode_timings_dd_mod3[8] = {
+static int *opcode_timings_486_dd_mod3[8] = {
     // clang-format off
 /*      FFFREE                          FST             FSTP            FUCOM            FUCOMP*/
         CYCLES(3),      NULL,           CYCLES(3),      CYCLES(3),      CYCLES(4),       CYCLES(4),      NULL,          NULL
     // clang-format on
 };
 
-static int *opcode_timings_de[8] = {
+static int *opcode_timings_486_de[8] = {
     // clang-format off
 /*      FADDiw          FMULiw          FCOMiw          FCOMPiw         FSUBil          FSUBRil         FDIVil          FDIVRil*/
         CYCLES(8),      CYCLES(11),     CYCLES(4),      CYCLES(4),      CYCLES(8),      CYCLES(8),      CYCLES(73),     CYCLES(73)
     // clang-format on
 };
-static int *opcode_timings_de_mod3[8] = {
+static int *opcode_timings_486_de_mod3[8] = {
     // clang-format off
 /*      FADD            FMUL                            FCOMPP          FSUB            FSUBR           FDIV            FDIVR*/
         CYCLES(8),      CYCLES(16),     NULL,           CYCLES(5),      CYCLES(8),      CYCLES(8),      CYCLES(73),     CYCLES(73)
     // clang-format on
 };
 
-static int *opcode_timings_df[8] = {
+static int *opcode_timings_486_df[8] = {
     // clang-format off
 /*      FILDiw                          FISTiw          FISTPiw                          FILDiq          FBSTP          FISTPiq*/
         CYCLES(13),     NULL,           CYCLES(29),     CYCLES(29),     NULL,            CYCLES(10),     CYCLES(172),   CYCLES(28)
     // clang-format on
 };
-static int *opcode_timings_df_mod3[8] = {
+static int *opcode_timings_486_df_mod3[8] = {
     // clang-format off
 /*      FFREE                           FST             FSTP            FUCOM            FUCOMP*/
         CYCLES(3),      NULL,           CYCLES(3),      CYCLES(3),      CYCLES(4),       CYCLES(4),      NULL,          NULL
     // clang-format on
 };
 
-static int *opcode_timings_8x[8] = {
+static int *opcode_timings_486_8x[8] = {
     // clang-format off
         &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_rm
     // clang-format on
 };
-static int *opcode_timings_8x_mod3[8] = {
+static int *opcode_timings_486_8x_mod3[8] = {
     // clang-format off
         &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_rm
     // clang-format on
 };
-static int *opcode_timings_81[8] = {
+static int *opcode_timings_486_81[8] = {
     // clang-format off
         &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_rm
     // clang-format on
 };
-static int *opcode_timings_81_mod3[8] = {
+static int *opcode_timings_486_81_mod3[8] = {
     // clang-format off
         &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_rm
     // clang-format on
@@ -327,9 +328,9 @@ codegen_timing_486_start(void)
 }
 
 void
-codegen_timing_486_prefix(uint8_t prefix, uint32_t fetchdat)
+codegen_timing_486_prefix(uint8_t prefix, UNUSED(uint32_t fetchdat))
 {
-    timing_count += COUNT(opcode_timings[prefix], 0);
+    timing_count += COUNT(opcode_timings_486[prefix], 0);
     last_prefix = prefix;
 }
 
@@ -343,47 +344,47 @@ codegen_timing_486_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNUSED(u
 
     switch (last_prefix) {
         case 0x0f:
-            timings = mod3 ? opcode_timings_0f_mod3 : opcode_timings_0f;
+            timings = mod3 ? opcode_timings_486_0f_mod3 : opcode_timings_486_0f;
             deps    = mod3 ? opcode_deps_0f_mod3 : opcode_deps_0f;
             break;
 
         case 0xd8:
-            timings = mod3 ? opcode_timings_d8_mod3 : opcode_timings_d8;
+            timings = mod3 ? opcode_timings_486_d8_mod3 : opcode_timings_486_d8;
             deps    = mod3 ? opcode_deps_d8_mod3 : opcode_deps_d8;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xd9:
-            timings = mod3 ? opcode_timings_d9_mod3 : opcode_timings_d9;
+            timings = mod3 ? opcode_timings_486_d9_mod3 : opcode_timings_486_d9;
             deps    = mod3 ? opcode_deps_d9_mod3 : opcode_deps_d9;
             opcode  = mod3 ? opcode & 0x3f : (opcode >> 3) & 7;
             break;
         case 0xda:
-            timings = mod3 ? opcode_timings_da_mod3 : opcode_timings_da;
+            timings = mod3 ? opcode_timings_486_da_mod3 : opcode_timings_486_da;
             deps    = mod3 ? opcode_deps_da_mod3 : opcode_deps_da;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xdb:
-            timings = mod3 ? opcode_timings_db_mod3 : opcode_timings_db;
+            timings = mod3 ? opcode_timings_486_db_mod3 : opcode_timings_486_db;
             deps    = mod3 ? opcode_deps_db_mod3 : opcode_deps_db;
             opcode  = mod3 ? opcode & 0x3f : (opcode >> 3) & 7;
             break;
         case 0xdc:
-            timings = mod3 ? opcode_timings_dc_mod3 : opcode_timings_dc;
+            timings = mod3 ? opcode_timings_486_dc_mod3 : opcode_timings_486_dc;
             deps    = mod3 ? opcode_deps_dc_mod3 : opcode_deps_dc;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xdd:
-            timings = mod3 ? opcode_timings_dd_mod3 : opcode_timings_dd;
+            timings = mod3 ? opcode_timings_486_dd_mod3 : opcode_timings_486_dd;
             deps    = mod3 ? opcode_deps_dd_mod3 : opcode_deps_dd;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xde:
-            timings = mod3 ? opcode_timings_de_mod3 : opcode_timings_de;
+            timings = mod3 ? opcode_timings_486_de_mod3 : opcode_timings_486_de;
             deps    = mod3 ? opcode_deps_de_mod3 : opcode_deps_de;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xdf:
-            timings = mod3 ? opcode_timings_df_mod3 : opcode_timings_df;
+            timings = mod3 ? opcode_timings_486_df_mod3 : opcode_timings_486_df;
             deps    = mod3 ? opcode_deps_df_mod3 : opcode_deps_df;
             opcode  = (opcode >> 3) & 7;
             break;
@@ -393,12 +394,12 @@ codegen_timing_486_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNUSED(u
                 case 0x80:
                 case 0x82:
                 case 0x83:
-                    timings = mod3 ? opcode_timings_8x_mod3 : opcode_timings_8x;
+                    timings = mod3 ? opcode_timings_486_8x_mod3 : opcode_timings_486_8x;
                     deps    = mod3 ? opcode_deps_8x_mod3 : opcode_deps_8x;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
                 case 0x81:
-                    timings = mod3 ? opcode_timings_81_mod3 : opcode_timings_81;
+                    timings = mod3 ? opcode_timings_486_81_mod3 : opcode_timings_486_81;
                     deps    = mod3 ? opcode_deps_81_mod3 : opcode_deps_81;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
@@ -409,29 +410,29 @@ codegen_timing_486_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNUSED(u
                 case 0xd1:
                 case 0xd2:
                 case 0xd3:
-                    timings = mod3 ? opcode_timings_shift_mod3 : opcode_timings_shift;
+                    timings = mod3 ? opcode_timings_486_shift_mod3 : opcode_timings_486_shift;
                     deps    = mod3 ? opcode_deps_shift_mod3 : opcode_deps_shift;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
 
                 case 0xf6:
-                    timings = mod3 ? opcode_timings_f6_mod3 : opcode_timings_f6;
+                    timings = mod3 ? opcode_timings_486_f6_mod3 : opcode_timings_486_f6;
                     deps    = mod3 ? opcode_deps_f6_mod3 : opcode_deps_f6;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
                 case 0xf7:
-                    timings = mod3 ? opcode_timings_f7_mod3 : opcode_timings_f7;
+                    timings = mod3 ? opcode_timings_486_f7_mod3 : opcode_timings_486_f7;
                     deps    = mod3 ? opcode_deps_f7_mod3 : opcode_deps_f7;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
                 case 0xff:
-                    timings = mod3 ? opcode_timings_ff_mod3 : opcode_timings_ff;
+                    timings = mod3 ? opcode_timings_486_ff_mod3 : opcode_timings_486_ff;
                     deps    = mod3 ? opcode_deps_ff_mod3 : opcode_deps_ff;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
 
                 default:
-                    timings = mod3 ? opcode_timings_mod3 : opcode_timings;
+                    timings = mod3 ? opcode_timings_486_mod3 : opcode_timings_486;
                     deps    = mod3 ? opcode_deps_mod3 : opcode_deps;
                     break;
             }
diff --git a/src/cpu/codegen_timing_686.c b/src/cpu/codegen_timing_686.c
index a6800c5b2..285881956 100644
--- a/src/cpu/codegen_timing_686.c
+++ b/src/cpu/codegen_timing_686.c
@@ -19,6 +19,7 @@
 
 #include "x86.h"
 #include "x86_ops.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include "codegen.h"
 #include "codegen_timing_common.h"
@@ -64,7 +65,7 @@ static uint32_t  prev_fetchdat;
 static uint32_t last_regmask_modified;
 static uint32_t regmask_modified;
 
-static uint32_t opcode_timings[256] = {
+static uint32_t opcode_timings_686[256] = {
     // clang-format off
 /*      ADD                                ADD                                ADD                               ADD*/
 /*00*/  PAIR_XY | CYCLES_RMW,              PAIR_XY | CYCLES_RMW,              PAIR_XY | CYCLES_RM,              PAIR_XY | CYCLES_RM,
@@ -201,7 +202,7 @@ static uint32_t opcode_timings[256] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_mod3[256] = {
+static uint32_t opcode_timings_686_mod3[256] = {
     // clang-format off
 /*      ADD                                ADD                                ADD                               ADD*/
 /*00*/  PAIR_XY | CYCLES_REG,              PAIR_XY | CYCLES_REG,              PAIR_XY | CYCLES_REG,              PAIR_XY | CYCLES_REG,
@@ -339,7 +340,7 @@ static uint32_t opcode_timings_mod3[256] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_0f[256] = {
+static uint32_t opcode_timings_686_0f[256] = {
     // clang-format off
 /*00*/  PAIR_NP | CYCLES(20),   PAIR_NP | CYCLES(11),           PAIR_NP | CYCLES(11),           PAIR_NP | CYCLES(10),
         INVALID,                PAIR_NP | CYCLES(195),          PAIR_NP | CYCLES(7),            INVALID,
@@ -422,7 +423,7 @@ static uint32_t opcode_timings_0f[256] = {
         PAIR_X | CYCLES_RM,     PAIR_X | CYCLES_RM,     PAIR_X | CYCLES_RM,     INVALID,
     // clang-format on
 };
-static uint32_t opcode_timings_0f_mod3[256] = {
+static uint32_t opcode_timings_686_0f_mod3[256] = {
     // clang-format off
 /*00*/  PAIR_NP | CYCLES(20),   PAIR_NP | CYCLES(11),           PAIR_NP | CYCLES(11),           PAIR_NP | CYCLES(10),
         INVALID,                PAIR_NP | CYCLES(195),          PAIR_NP | CYCLES(7),            INVALID,
@@ -505,44 +506,44 @@ static uint32_t opcode_timings_0f_mod3[256] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_shift[8] = {
+static uint32_t opcode_timings_686_shift[8] = {
     // clang-format off
         PAIR_XY | CYCLES_RMW,    PAIR_XY | CYCLES_RMW,    PAIR_XY | CYCLES(3),    PAIR_XY | CYCLES(4),
         PAIR_XY | CYCLES_RMW,    PAIR_XY | CYCLES_RMW,    PAIR_XY | CYCLES_RMW,   PAIR_XY | CYCLES_RMW,
     // clang-format on
 };
-static uint32_t opcode_timings_shift_mod3[8] = {
+static uint32_t opcode_timings_686_shift_mod3[8] = {
     // clang-format off
         PAIR_XY | CYCLES_REG,    PAIR_XY | CYCLES_REG,    PAIR_XY | CYCLES(3),     PAIR_XY | CYCLES(4),
         PAIR_XY | CYCLES_REG,    PAIR_XY | CYCLES_REG,    PAIR_XY | CYCLES_REG,    PAIR_XY | CYCLES_REG,
     // clang-format on
 };
-static uint32_t opcode_timings_shift_imm[8] = {
+static uint32_t opcode_timings_686_shift_imm[8] = {
     // clang-format off
         PAIR_XY | CYCLES_RMW,    PAIR_XY | CYCLES_RMW,    PAIR_XY | CYCLES(8),    PAIR_XY | CYCLES(9),
         PAIR_XY | CYCLES_RMW,    PAIR_XY | CYCLES_RMW,    PAIR_XY | CYCLES_RMW,   PAIR_XY | CYCLES_RMW,
     // clang-format on
 };
-static uint32_t opcode_timings_shift_imm_mod3[8] = {
+static uint32_t opcode_timings_686_shift_imm_mod3[8] = {
     // clang-format off
         PAIR_XY | CYCLES_REG,    PAIR_XY | CYCLES_REG,    PAIR_XY | CYCLES(3),     PAIR_XY | CYCLES(4),
         PAIR_XY | CYCLES_REG,    PAIR_XY | CYCLES_REG,    PAIR_XY | CYCLES_REG,    PAIR_XY | CYCLES_REG,
     // clang-format on
 };
-static uint32_t opcode_timings_shift_cl[8] = {
+static uint32_t opcode_timings_686_shift_cl[8] = {
     // clang-format off
         PAIR_XY | CYCLES(2),     PAIR_XY | CYCLES(2),     PAIR_XY | CYCLES(8),    PAIR_XY | CYCLES(9),
         PAIR_XY | CYCLES(2),     PAIR_XY | CYCLES(2),     PAIR_XY | CYCLES(2),    PAIR_XY | CYCLES(2),
     // clang-format on
 };
-static uint32_t opcode_timings_shift_cl_mod3[8] = {
+static uint32_t opcode_timings_686_shift_cl_mod3[8] = {
     // clang-format off
         PAIR_XY | CYCLES(2),    PAIR_XY | CYCLES(2),    PAIR_XY | CYCLES(8),     PAIR_XY | CYCLES(9),
         PAIR_XY | CYCLES(2),    PAIR_XY | CYCLES(2),    PAIR_XY | CYCLES(2),     PAIR_XY | CYCLES(2),
     // clang-format on
 };
 
-static uint32_t opcode_timings_f6[8] = {
+static uint32_t opcode_timings_686_f6[8] = {
     // clang-format off
 /*      TST                                                                     NOT                     NEG*/
         PAIR_XY | CYCLES_RM,    INVALID,                PAIR_XY | CYCLES(1),    PAIR_XY | CYCLES(1),
@@ -550,7 +551,7 @@ static uint32_t opcode_timings_f6[8] = {
         PAIR_NP | CYCLES(4),    PAIR_NP | CYCLES(4),    PAIR_NP | CYCLES(18),   PAIR_NP | CYCLES(18)
     // clang-format on
 };
-static uint32_t opcode_timings_f6_mod3[8] = {
+static uint32_t opcode_timings_686_f6_mod3[8] = {
     // clang-format off
 /*      TST                                             NOT                     NEG*/
         PAIR_XY | CYCLES_REG,   INVALID,                PAIR_XY | CYCLES(1),    PAIR_XY | CYCLES(1),
@@ -558,7 +559,7 @@ static uint32_t opcode_timings_f6_mod3[8] = {
         PAIR_NP | CYCLES(4),    PAIR_NP | CYCLES(4),    PAIR_NP | CYCLES(18),   PAIR_NP | CYCLES(18)
     // clang-format on
 };
-static uint32_t opcode_timings_f7[8] = {
+static uint32_t opcode_timings_686_f7[8] = {
     // clang-format off
 /*      TST                                                                     NOT                             NEG*/
         PAIR_XY | CYCLES_REG,                   INVALID,                        PAIR_XY | CYCLES(1),            PAIR_XY | CYCLES(1),
@@ -566,7 +567,7 @@ static uint32_t opcode_timings_f7[8] = {
         PAIR_NP | CYCLES_MULTI(4,10),           PAIR_NP | CYCLES_MULTI(4,10),   PAIR_NP | CYCLES_MULTI(19,27),  PAIR_NP | CYCLES_MULTI(22,30)
     // clang-format on
 };
-static uint32_t opcode_timings_f7_mod3[8] = {
+static uint32_t opcode_timings_686_f7_mod3[8] = {
     // clang-format off
 /*      TST                                                                     NOT                             NEG*/
         PAIR_XY | CYCLES_REG,                   INVALID,                        PAIR_XY | CYCLES(1),            PAIR_XY | CYCLES(1),
@@ -574,7 +575,7 @@ static uint32_t opcode_timings_f7_mod3[8] = {
         PAIR_NP | CYCLES_MULTI(4,10),           PAIR_NP | CYCLES_MULTI(4,10),   PAIR_NP | CYCLES_MULTI(19,27),  PAIR_NP | CYCLES_MULTI(22,30)
     // clang-format on
 };
-static uint32_t opcode_timings_ff[8] = {
+static uint32_t opcode_timings_686_ff[8] = {
     // clang-format off
 /*      INC                        DEC                     CALL                       CALL far*/
         PAIR_XY | CYCLES_RMW,      PAIR_XY | CYCLES_RMW,   PAIR_X_BRANCH | CYCLES(3), PAIR_NP | CYCLES(5),
@@ -582,7 +583,7 @@ static uint32_t opcode_timings_ff[8] = {
         PAIR_X_BRANCH | CYCLES(3), PAIR_NP | CYCLES(5),    PAIR_XY | CYCLES(1),       INVALID
     // clang-format on
 };
-static uint32_t opcode_timings_ff_mod3[8] = {
+static uint32_t opcode_timings_686_ff_mod3[8] = {
     // clang-format off
 /*      INC                        DEC                    CALL                       CALL far*/
         PAIR_XY | CYCLES_REG,      PAIR_XY | CYCLES_REG,  PAIR_X_BRANCH | CYCLES(1), PAIR_XY | CYCLES(5),
@@ -591,7 +592,7 @@ static uint32_t opcode_timings_ff_mod3[8] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_d8[8] = {
+static uint32_t opcode_timings_686_d8[8] = {
     // clang-format off
 /*      FADDs                   FMULs                   FCOMs                   FCOMPs*/
         PAIR_X | CYCLES(7),     PAIR_X | CYCLES(6),     PAIR_X | CYCLES(4),     PAIR_X | CYCLES(4),
@@ -599,7 +600,7 @@ static uint32_t opcode_timings_d8[8] = {
         PAIR_X | CYCLES(7),     PAIR_X | CYCLES(7),     PAIR_X | CYCLES(34),    PAIR_X | CYCLES(34)
     // clang-format on
 };
-static uint32_t opcode_timings_d8_mod3[8] = {
+static uint32_t opcode_timings_686_d8_mod3[8] = {
     // clang-format off
 /*      FADD                    FMUL                    FCOM                    FCOMP*/
         PAIR_X | CYCLES(7),     PAIR_X | CYCLES(6),     PAIR_X | CYCLES(4),     PAIR_X | CYCLES(4),
@@ -608,7 +609,7 @@ static uint32_t opcode_timings_d8_mod3[8] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_d9[8] = {
+static uint32_t opcode_timings_686_d9[8] = {
     // clang-format off
 /*      FLDs                                            FSTs                      FSTPs*/
         PAIR_X | CYCLES(2),       INVALID,              PAIR_X | CYCLES(2),       PAIR_X | CYCLES(2),
@@ -616,7 +617,7 @@ static uint32_t opcode_timings_d9[8] = {
         PAIR_X | CYCLES(30),      PAIR_X | CYCLES(4),   PAIR_X | CYCLES(24),      PAIR_X | CYCLES(5)
     // clang-format on
 };
-static uint32_t opcode_timings_d9_mod3[64] = {
+static uint32_t opcode_timings_686_d9_mod3[64] = {
     // clang-format off
         /*FLD*/
         PAIR_X | CYCLES(2),     PAIR_X | CYCLES(2),     PAIR_X | CYCLES(2),     PAIR_X | CYCLES(2),
@@ -649,7 +650,7 @@ static uint32_t opcode_timings_d9_mod3[64] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_da[8] = {
+static uint32_t opcode_timings_686_da[8] = {
     // clang-format off
 /*      FIADDl                  FIMULl                  FICOMl                  FICOMPl*/
         PAIR_X | CYCLES(12),    PAIR_X | CYCLES(11),    PAIR_X | CYCLES(10),    PAIR_X | CYCLES(10),
@@ -657,14 +658,14 @@ static uint32_t opcode_timings_da[8] = {
         PAIR_X | CYCLES(29),    PAIR_X | CYCLES(27),    PAIR_X | CYCLES(38),    PAIR_X | CYCLES(48)
     // clang-format on
 };
-static uint32_t opcode_timings_da_mod3[8] = {
+static uint32_t opcode_timings_686_da_mod3[8] = {
     // clang-format off
         PAIR_X | CYCLES(4),     PAIR_X | CYCLES(4),     PAIR_X | CYCLES(4),     PAIR_X | CYCLES(4),
         INVALID,                PAIR_X | CYCLES(5),     INVALID,                INVALID
     // clang-format on
 };
 
-static uint32_t opcode_timings_db[8] = {
+static uint32_t opcode_timings_686_db[8] = {
     // clang-format off
 /*      FLDil                                           FSTil                   FSTPil*/
         PAIR_X | CYCLES(2),     INVALID,                PAIR_X | CYCLES(2),     PAIR_X | CYCLES(2),
@@ -672,7 +673,7 @@ static uint32_t opcode_timings_db[8] = {
         INVALID,                PAIR_X | CYCLES(2),     INVALID,                PAIR_X | CYCLES(2)
     // clang-format on
 };
-static uint32_t opcode_timings_db_mod3[64] = {
+static uint32_t opcode_timings_686_db_mod3[64] = {
     // clang-format off
         PAIR_X | CYCLES(4),     PAIR_X | CYCLES(4),     PAIR_X | CYCLES(4),     PAIR_X | CYCLES(4),
         PAIR_X | CYCLES(4),     PAIR_X | CYCLES(4),     PAIR_X | CYCLES(4),     PAIR_X | CYCLES(4),
@@ -702,7 +703,7 @@ static uint32_t opcode_timings_db_mod3[64] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_dc[8] = {
+static uint32_t opcode_timings_686_dc[8] = {
     // clang-format off
 /*      FADDd                   FMULd                   FCOMd                   FCOMPd*/
         PAIR_X | CYCLES(7),     PAIR_X | CYCLES(7),     PAIR_X | CYCLES(7),     PAIR_X | CYCLES(7),
@@ -710,7 +711,7 @@ static uint32_t opcode_timings_dc[8] = {
         PAIR_X | CYCLES(7),     PAIR_X | CYCLES(7),     PAIR_X | CYCLES(34),    PAIR_X | CYCLES(34)
     // clang-format on
 };
-static uint32_t opcode_timings_dc_mod3[8] = {
+static uint32_t opcode_timings_686_dc_mod3[8] = {
     // clang-format off
 /*      opFADDr                 opFMULr*/
         PAIR_X | CYCLES(7),     PAIR_X | CYCLES(7),     INVALID,                INVALID,
@@ -719,7 +720,7 @@ static uint32_t opcode_timings_dc_mod3[8] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_dd[8] = {
+static uint32_t opcode_timings_686_dd[8] = {
     // clang-format off
 /*      FLDd                                            FSTd                    FSTPd*/
         PAIR_X | CYCLES(2),     INVALID,                PAIR_X | CYCLES(2),     PAIR_X | CYCLES(2),
@@ -727,7 +728,7 @@ static uint32_t opcode_timings_dd[8] = {
         PAIR_X | CYCLES(72),    INVALID,                PAIR_X | CYCLES(67),    PAIR_X | CYCLES(2)
     // clang-format on
 };
-static uint32_t opcode_timings_dd_mod3[8] = {
+static uint32_t opcode_timings_686_dd_mod3[8] = {
     // clang-format off
 /*      FFFREE                                          FST                     FSTP*/
         PAIR_X | CYCLES(3),     INVALID,                PAIR_X | CYCLES(2),     PAIR_X | CYCLES(2),
@@ -736,14 +737,14 @@ static uint32_t opcode_timings_dd_mod3[8] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_de[8] = {
+static uint32_t opcode_timings_686_de[8] = {
     // clang-format off
 /*      FIADDw                  FIMULw                  FICOMw                  FICOMPw*/
         PAIR_X | CYCLES(12),    PAIR_X | CYCLES(11),    PAIR_X | CYCLES(10),    PAIR_X | CYCLES(10),
 /*      FISUBw                  FISUBRw                 FIDIVw                  FIDIVRw*/
         PAIR_X | CYCLES(27),    PAIR_X | CYCLES(27),    PAIR_X | CYCLES(38),    PAIR_X | CYCLES(38)
 };
-static uint32_t opcode_timings_de_mod3[8] = {
+static uint32_t opcode_timings_686_de_mod3[8] = {
     // clang-format off
 /*      FADD                    FMUL                                            FCOMPP*/
         PAIR_X | CYCLES(7),     PAIR_X | CYCLES(7),     INVALID,                PAIR_X | CYCLES(7),
@@ -752,7 +753,7 @@ static uint32_t opcode_timings_de_mod3[8] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_df[8] = {
+static uint32_t opcode_timings_686_df[8] = {
     // clang-format off
 /*      FILDiw                                          FISTiw                  FISTPiw*/
         PAIR_X | CYCLES(8),     INVALID,                PAIR_X | CYCLES(10),    PAIR_X | CYCLES(13),
@@ -760,7 +761,7 @@ static uint32_t opcode_timings_df[8] = {
         INVALID,                PAIR_X | CYCLES(8),     PAIR_X | CYCLES(63),    PAIR_X | CYCLES(13)
     // clang-format on
 };
-static uint32_t opcode_timings_df_mod3[8] = {
+static uint32_t opcode_timings_686_df_mod3[8] = {
     // clang-format off
         INVALID,                INVALID,                INVALID,                INVALID,
 /*      FSTSW AX*/
@@ -768,25 +769,25 @@ static uint32_t opcode_timings_df_mod3[8] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_8x[8] = {
+static uint32_t opcode_timings_686_8x[8] = {
     // clang-format off
         PAIR_XY | CYCLES_RMW,      PAIR_XY | CYCLES_RMW,      PAIR_XY | CYCLES_RMW,      PAIR_XY | CYCLES_RMW,
         PAIR_XY | CYCLES_RMW,      PAIR_XY | CYCLES_RMW,      PAIR_XY | CYCLES_RMW,      PAIR_XY | CYCLES_RM
     // clang-format on
 };
-static uint32_t opcode_timings_8x_mod3[8] = {
+static uint32_t opcode_timings_686_8x_mod3[8] = {
     // clang-format off
         PAIR_XY | CYCLES_REG,      PAIR_XY | CYCLES_REG,      PAIR_XY | CYCLES_REG,      PAIR_XY | CYCLES_REG,
         PAIR_XY | CYCLES_REG,      PAIR_XY | CYCLES_REG,      PAIR_XY | CYCLES_REG,      PAIR_XY | CYCLES_REG
     // clang-format on
 };
-static uint32_t opcode_timings_81[8] = {
+static uint32_t opcode_timings_686_81[8] = {
     // clang-format off
         PAIR_XY | CYCLES_RMW,      PAIR_XY | CYCLES_RMW,      PAIR_XY | CYCLES_RMW,      PAIR_XY | CYCLES_RMW,
         PAIR_XY | CYCLES_RMW,      PAIR_XY | CYCLES_RMW,      PAIR_XY | CYCLES_RMW,      PAIR_XY | CYCLES_RM
     // clang-format on
 };
-static uint32_t opcode_timings_81_mod3[8] = {
+static uint32_t opcode_timings_686_81_mod3[8] = {
     // clang-format off
         PAIR_XY | CYCLES_REG,      PAIR_XY | CYCLES_REG,      PAIR_XY | CYCLES_REG,      PAIR_XY | CYCLES_REG,
         PAIR_XY | CYCLES_REG,      PAIR_XY | CYCLES_REG,      PAIR_XY | CYCLES_REG,      PAIR_XY | CYCLES_REG
@@ -873,47 +874,47 @@ codegen_timing_686_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNUSED(u
 
     switch (last_prefix) {
         case 0x0f:
-            timings = mod3 ? opcode_timings_0f_mod3 : opcode_timings_0f;
+            timings = mod3 ? opcode_timings_686_0f_mod3 : opcode_timings_686_0f;
             deps    = mod3 ? opcode_deps_0f_mod3 : opcode_deps_0f;
             break;
 
         case 0xd8:
-            timings = mod3 ? opcode_timings_d8_mod3 : opcode_timings_d8;
+            timings = mod3 ? opcode_timings_686_d8_mod3 : opcode_timings_686_d8;
             deps    = mod3 ? opcode_deps_d8_mod3 : opcode_deps_d8;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xd9:
-            timings = mod3 ? opcode_timings_d9_mod3 : opcode_timings_d9;
+            timings = mod3 ? opcode_timings_686_d9_mod3 : opcode_timings_686_d9;
             deps    = mod3 ? opcode_deps_d9_mod3 : opcode_deps_d9;
             opcode  = mod3 ? opcode & 0x3f : (opcode >> 3) & 7;
             break;
         case 0xda:
-            timings = mod3 ? opcode_timings_da_mod3 : opcode_timings_da;
+            timings = mod3 ? opcode_timings_686_da_mod3 : opcode_timings_686_da;
             deps    = mod3 ? opcode_deps_da_mod3 : opcode_deps_da;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xdb:
-            timings = mod3 ? opcode_timings_db_mod3 : opcode_timings_db;
+            timings = mod3 ? opcode_timings_686_db_mod3 : opcode_timings_686_db;
             deps    = mod3 ? opcode_deps_db_mod3 : opcode_deps_db;
             opcode  = mod3 ? opcode & 0x3f : (opcode >> 3) & 7;
             break;
         case 0xdc:
-            timings = mod3 ? opcode_timings_dc_mod3 : opcode_timings_dc;
+            timings = mod3 ? opcode_timings_686_dc_mod3 : opcode_timings_686_dc;
             deps    = mod3 ? opcode_deps_dc_mod3 : opcode_deps_dc;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xdd:
-            timings = mod3 ? opcode_timings_dd_mod3 : opcode_timings_dd;
+            timings = mod3 ? opcode_timings_686_dd_mod3 : opcode_timings_686_dd;
             deps    = mod3 ? opcode_deps_dd_mod3 : opcode_deps_dd;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xde:
-            timings = mod3 ? opcode_timings_de_mod3 : opcode_timings_de;
+            timings = mod3 ? opcode_timings_686_de_mod3 : opcode_timings_686_de;
             deps    = mod3 ? opcode_deps_de_mod3 : opcode_deps_de;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xdf:
-            timings = mod3 ? opcode_timings_df_mod3 : opcode_timings_df;
+            timings = mod3 ? opcode_timings_686_df_mod3 : opcode_timings_686_df;
             deps    = mod3 ? opcode_deps_df_mod3 : opcode_deps_df;
             opcode  = (opcode >> 3) & 7;
             break;
@@ -923,55 +924,55 @@ codegen_timing_686_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNUSED(u
                 case 0x80:
                 case 0x82:
                 case 0x83:
-                    timings = mod3 ? opcode_timings_8x_mod3 : opcode_timings_8x;
+                    timings = mod3 ? opcode_timings_686_8x_mod3 : opcode_timings_686_8x;
                     deps    = mod3 ? opcode_deps_8x_mod3 : opcode_deps_8x;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
                 case 0x81:
-                    timings = mod3 ? opcode_timings_81_mod3 : opcode_timings_81;
+                    timings = mod3 ? opcode_timings_686_81_mod3 : opcode_timings_686_81;
                     deps    = mod3 ? opcode_deps_81_mod3 : opcode_deps_81;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
 
                 case 0xc0:
                 case 0xc1:
-                    timings = mod3 ? opcode_timings_shift_imm_mod3 : opcode_timings_shift_imm;
+                    timings = mod3 ? opcode_timings_686_shift_imm_mod3 : opcode_timings_686_shift_imm;
                     deps    = mod3 ? opcode_deps_shift_mod3 : opcode_deps_shift;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
 
                 case 0xd0:
                 case 0xd1:
-                    timings = mod3 ? opcode_timings_shift_mod3 : opcode_timings_shift;
+                    timings = mod3 ? opcode_timings_686_shift_mod3 : opcode_timings_686_shift;
                     deps    = mod3 ? opcode_deps_shift_mod3 : opcode_deps_shift;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
 
                 case 0xd2:
                 case 0xd3:
-                    timings = mod3 ? opcode_timings_shift_cl_mod3 : opcode_timings_shift_cl;
+                    timings = mod3 ? opcode_timings_686_shift_cl_mod3 : opcode_timings_686_shift_cl;
                     deps    = mod3 ? opcode_deps_shift_cl_mod3 : opcode_deps_shift_cl;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
 
                 case 0xf6:
-                    timings = mod3 ? opcode_timings_f6_mod3 : opcode_timings_f6;
+                    timings = mod3 ? opcode_timings_686_f6_mod3 : opcode_timings_686_f6;
                     deps    = mod3 ? opcode_deps_f6_mod3 : opcode_deps_f6;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
                 case 0xf7:
-                    timings = mod3 ? opcode_timings_f7_mod3 : opcode_timings_f7;
+                    timings = mod3 ? opcode_timings_686_f7_mod3 : opcode_timings_686_f7;
                     deps    = mod3 ? opcode_deps_f7_mod3 : opcode_deps_f7;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
                 case 0xff:
-                    timings = mod3 ? opcode_timings_ff_mod3 : opcode_timings_ff;
+                    timings = mod3 ? opcode_timings_686_ff_mod3 : opcode_timings_686_ff;
                     deps    = mod3 ? opcode_deps_ff_mod3 : opcode_deps_ff;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
 
                 default:
-                    timings = mod3 ? opcode_timings_mod3 : opcode_timings;
+                    timings = mod3 ? opcode_timings_686_mod3 : opcode_timings_686;
                     deps    = mod3 ? opcode_deps_mod3 : opcode_deps;
                     break;
             }
diff --git a/src/cpu/codegen_timing_k5.c b/src/cpu/codegen_timing_k5.c
new file mode 100644
index 000000000..8ce2f4cea
--- /dev/null
+++ b/src/cpu/codegen_timing_k5.c
@@ -0,0 +1,2233 @@
+/*Most of the vector instructions here are a total guess.
+  Some of the timings are based on https://web.archive.org/web/20181122095446/http://users.atw.hu/instlatx64/AuthenticAMD0000502_k5_InstLatX86.txt*/
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/mem.h>
+#include "cpu.h"
+#include <86box/machine.h>
+#include <86box/plat_unused.h>
+
+#include "x86.h"
+#include "x86_ops.h"
+#include "x86seg_common.h"
+#include "x87_sf.h"
+#include "x87.h"
+#include "386_common.h"
+#include "codegen.h"
+#include "codegen_ops.h"
+#include "codegen_timing_common.h"
+
+typedef enum uop_type_t {
+    UOP_ALU = 0,   /*Executes in Integer X or Y units*/
+    UOP_ALUX,      /*Executes in Integer X unit*/
+    UOP_LOAD,      /*Executes in Load unit*/
+    UOP_STORE,     /*Executes in Store unit*/
+    UOP_FLOAD,     /*Executes in Load unit*/
+    UOP_FSTORE,    /*Executes in Store unit*/
+    UOP_MLOAD,     /*Executes in Load unit*/
+    UOP_MSTORE,    /*Executes in Store unit*/
+    UOP_FLOAT,     /*Executes in Floating Point unit*/
+    UOP_MEU,       /*Executes in Multimedia unit*/
+    UOP_MEU_SHIFT, /*Executes in Multimedia unit or ALU X/Y. Uses MMX shifter*/
+    UOP_MEU_MUL,   /*Executes in Multimedia unit or ALU X/Y. Uses MMX/3DNow multiplier*/
+    UOP_MEU_3DN,   /*Executes in Multimedia unit or ALU X/Y. Uses 3DNow ALU*/
+    UOP_BRANCH,    /*Executes in Branch unit*/
+    UOP_LIMM       /*Does not require an execution unit*/
+} uop_type_t;
+
+typedef enum decode_type_t {
+    DECODE_SHORT,
+    DECODE_LONG,
+    DECODE_VECTOR
+} decode_type_t;
+
+#define MAX_UOPS 10
+
+typedef struct risc86_uop_t {
+    uop_type_t type;
+    int        throughput;
+    int        latency;
+} risc86_uop_t;
+
+typedef struct risc86_instruction_t {
+    int           nr_uops;
+    decode_type_t decode_type;
+    risc86_uop_t  uop[MAX_UOPS];
+} risc86_instruction_t;
+
+static const risc86_instruction_t alu_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_ALU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t alux_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_ALUX, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t load_alu_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_LOAD, .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t load_alux_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_LOAD,  .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t alu_store_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_LONG,
+    .uop[0]      = {.type = UOP_LOAD,   .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALU,   .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_STORE, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t alux_store_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_LONG,
+    .uop[0]      = {.type = UOP_LOAD,   .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALUX,  .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_STORE, .throughput = 1, .latency = 1}
+};
+
+static const risc86_instruction_t branch_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_BRANCH, .throughput = 1, .latency = 1}
+};
+
+static const risc86_instruction_t limm_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_LIMM, .throughput = 1, .latency = 1}
+};
+
+static const risc86_instruction_t load_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_LOAD, .throughput = 1, .latency = 2}
+};
+
+static const risc86_instruction_t store_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_STORE, .throughput = 1, .latency = 1}
+};
+
+static const risc86_instruction_t bswap_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_LONG,
+    .uop[0]      = {.type = UOP_ALU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t leave_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_LONG,
+    .uop[0]      = {.type = UOP_LOAD, .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALU, .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_ALU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t lods_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_LONG,
+    .uop[0]      = {.type = UOP_LOAD, .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t loop_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_ALU,     .throughput = 1, .latency = 1},
+    .uop[1]      = { .type = UOP_BRANCH, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t mov_reg_seg_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_LONG,
+    .uop[0]      = {.type = UOP_LOAD, .throughput = 1, .latency = 2},
+};
+static const risc86_instruction_t movs_op = {
+    .nr_uops     = 4,
+    .decode_type = DECODE_LONG,
+    .uop[0]      = {.type = UOP_LOAD,   .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_STORE, .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_ALU,   .throughput = 1, .latency = 1},
+    .uop[3]      = { .type = UOP_ALU,   .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t pop_reg_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_LOAD, .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t pop_mem_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_LONG,
+    .uop[0]      = {.type = UOP_LOAD,   .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_STORE, .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_ALU,   .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t push_imm_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_LONG,
+    .uop[0]      = {.type = UOP_STORE, .throughput = 1, .latency = 2},
+};
+static const risc86_instruction_t push_mem_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_LONG,
+    .uop[0]      = {.type = UOP_LOAD,   .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_STORE, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t push_seg_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_LONG,
+    .uop[0]      = {.type = UOP_LOAD,   .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_STORE, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t stos_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_LONG,
+    .uop[1]      = {.type = UOP_STORE, .throughput = 1, .latency = 1},
+    .uop[3]      = { .type = UOP_ALU,  .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t test_reg_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_LONG,
+    .uop[0]      = {.type = UOP_ALU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t test_reg_b_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_LONG,
+    .uop[0]      = {.type = UOP_ALUX, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t test_mem_imm_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_LONG,
+    .uop[0]      = {.type = UOP_LOAD, .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t test_mem_imm_b_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_LONG,
+    .uop[0]      = {.type = UOP_LOAD,  .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t xchg_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_LONG,
+    .uop[0]      = {.type = UOP_ALU,  .throughput = 1, .latency = 1},
+    .uop[1]      = { .type = UOP_ALU, .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_ALU, .throughput = 1, .latency = 1}
+};
+
+static const risc86_instruction_t m3dn_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_MEU_3DN, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t mmx_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_MEU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t mmx_mul_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_MEU_MUL, .throughput = 1, .latency = 2}
+};
+static const risc86_instruction_t mmx_shift_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_MEU_SHIFT, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t load_3dn_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_LOAD,     .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_MEU_3DN, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t load_mmx_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_LOAD, .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_MEU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t load_mmx_mul_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_LOAD,     .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_MEU_MUL, .throughput = 1, .latency = 2}
+};
+static const risc86_instruction_t load_mmx_shift_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_LOAD,       .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_MEU_SHIFT, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t mload_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_MLOAD, .throughput = 1, .latency = 2}
+};
+
+static const risc86_instruction_t mstore_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_MSTORE, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t pmul_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_MEU_MUL, .throughput = 1, .latency = 2}
+};
+static const risc86_instruction_t pmul_mem_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_LOAD,     .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_MEU_MUL, .throughput = 1, .latency = 2}
+};
+
+static const risc86_instruction_t float_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_FLOAT, .throughput = 2, .latency = 2}
+};
+static const risc86_instruction_t load_float_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_FLOAD,  .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_FLOAT, .throughput = 2, .latency = 2}
+};
+static const risc86_instruction_t fstore_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_FSTORE, .throughput = 1, .latency = 1}
+};
+
+static const risc86_instruction_t fdiv_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_FLOAT, .throughput = 40, .latency = 40}
+};
+static const risc86_instruction_t fdiv_mem_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_FLOAD,  .throughput = 1,  .latency = 2 },
+    .uop[1]      = { .type = UOP_FLOAT, .throughput = 40, .latency = 40}
+};
+static const risc86_instruction_t fsin_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_FLOAT, .throughput = 62, .latency = 62}
+};
+static const risc86_instruction_t fsqrt_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_SHORT,
+    .uop[0]      = {.type = UOP_FLOAT, .throughput = 41, .latency = 41}
+};
+
+static const risc86_instruction_t vector_fldcw_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_FLOAT, .throughput = 8, .latency = 8}
+};
+static const risc86_instruction_t vector_float_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_FLOAT, .throughput = 2, .latency = 2}
+};
+static const risc86_instruction_t vector_float_l_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_FLOAT, .throughput = 50, .latency = 50}
+};
+static const risc86_instruction_t vector_flde_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_FLOAD,  .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_FLOAD, .throughput = 1, .latency = 2},
+    .uop[2]      = { .type = UOP_FLOAT, .throughput = 2, .latency = 2}
+};
+static const risc86_instruction_t vector_fste_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_FLOAT,   .throughput = 2, .latency = 2},
+    .uop[1]      = { .type = UOP_FSTORE, .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_FSTORE, .throughput = 1, .latency = 1}
+};
+
+static const risc86_instruction_t vector_alu1_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_alu2_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALU,  .throughput = 1, .latency = 1},
+    .uop[1]      = { .type = UOP_ALU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_alu3_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALU,  .throughput = 1, .latency = 1},
+    .uop[1]      = { .type = UOP_ALU, .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_ALU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_alu6_op = {
+    .nr_uops     = 6,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALU,  .throughput = 1, .latency = 1},
+    .uop[1]      = { .type = UOP_ALU, .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_ALU, .throughput = 1, .latency = 1},
+    .uop[3]      = { .type = UOP_ALU, .throughput = 1, .latency = 1},
+    .uop[4]      = { .type = UOP_ALU, .throughput = 1, .latency = 1},
+    .uop[5]      = { .type = UOP_ALU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_alux1_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALUX, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_alux3_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALUX,  .throughput = 1, .latency = 1},
+    .uop[1]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_alux6_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALUX,  .throughput = 1, .latency = 1},
+    .uop[1]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1},
+    .uop[3]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1},
+    .uop[4]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1},
+    .uop[5]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_alu_store_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,   .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALU,   .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_STORE, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_alux_store_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,   .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALUX,  .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_STORE, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_arpl_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALU,  .throughput = 3, .latency = 3},
+    .uop[1]      = { .type = UOP_ALU, .throughput = 3, .latency = 3}
+};
+static const risc86_instruction_t vector_bound_op = {
+    .nr_uops     = 4,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,  .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_LOAD, .throughput = 1, .latency = 2},
+    .uop[2]      = { .type = UOP_ALU,  .throughput = 1, .latency = 1},
+    .uop[3]      = { .type = UOP_ALU,  .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_bsx_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALU, .throughput = 10, .latency = 10}
+};
+static const risc86_instruction_t vector_call_far_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALU,     .throughput = 3, .latency = 3},
+    .uop[1]      = { .type = UOP_STORE,  .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_BRANCH, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_cli_sti_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALU, .throughput = 7, .latency = 7}
+};
+static const risc86_instruction_t vector_cmps_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD, .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALU, .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_ALU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_cmpsb_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,  .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_ALU,  .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_cmpxchg_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,   .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALU,   .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_STORE, .throughput = 1, .latency = 1},
+};
+static const risc86_instruction_t vector_cmpxchg_b_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,   .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALUX,  .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_STORE, .throughput = 1, .latency = 1},
+};
+static const risc86_instruction_t vector_cpuid_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALU, .throughput = 22, .latency = 22}
+};
+static const risc86_instruction_t vector_div16_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALUX, .throughput = 10, .latency = 10}
+};
+static const risc86_instruction_t vector_div16_mem_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,  .throughput = 1,  .latency = 2 },
+    .uop[1]      = { .type = UOP_ALUX, .throughput = 10, .latency = 10}
+};
+static const risc86_instruction_t vector_div32_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALUX, .throughput = 18, .latency = 18}
+};
+static const risc86_instruction_t vector_div32_mem_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,  .throughput = 1,  .latency = 2 },
+    .uop[1]      = { .type = UOP_ALUX, .throughput = 18, .latency = 18}
+};
+static const risc86_instruction_t vector_emms_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALU, .throughput = 25, .latency = 25}
+};
+static const risc86_instruction_t vector_enter_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_STORE, .throughput = 1,  .latency = 2 },
+    .uop[1]      = { .type = UOP_ALU,  .throughput = 10, .latency = 10}
+};
+static const risc86_instruction_t vector_femms_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALU, .throughput = 6, .latency = 6}
+};
+static const risc86_instruction_t vector_in_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD, .throughput = 10, .latency = 11}
+};
+static const risc86_instruction_t vector_ins_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,   .throughput = 10, .latency = 11},
+    .uop[1]      = { .type = UOP_STORE, .throughput = 1,  .latency = 1 },
+    .uop[2]      = { .type = UOP_ALU,   .throughput = 1,  .latency = 1 }
+};
+static const risc86_instruction_t vector_int_op = {
+    .nr_uops     = 5,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALU,     .throughput = 20, .latency = 20},
+    .uop[1]      = { .type = UOP_STORE,  .throughput = 1,  .latency = 1 },
+    .uop[2]      = { .type = UOP_STORE,  .throughput = 1,  .latency = 1 },
+    .uop[3]      = { .type = UOP_STORE,  .throughput = 1,  .latency = 1 },
+    .uop[4]      = { .type = UOP_BRANCH, .throughput = 1,  .latency = 1 }
+};
+static const risc86_instruction_t vector_iret_op = {
+    .nr_uops     = 5,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,    .throughput = 1,  .latency = 2 },
+    .uop[1]      = { .type = UOP_LOAD,   .throughput = 1,  .latency = 2 },
+    .uop[2]      = { .type = UOP_LOAD,   .throughput = 1,  .latency = 2 },
+    .uop[3]      = { .type = UOP_ALU,    .throughput = 20, .latency = 20},
+    .uop[4]      = { .type = UOP_BRANCH, .throughput = 1,  .latency = 1 }
+};
+static const risc86_instruction_t vector_invd_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALU, .throughput = 1000, .latency = 1000}
+};
+static const risc86_instruction_t vector_jmp_far_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALU,     .throughput = 3, .latency = 3},
+    .uop[1]      = { .type = UOP_BRANCH, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_load_alu_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD, .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_load_alux_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,  .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_loop_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALU,     .throughput = 1, .latency = 1},
+    .uop[1]      = { .type = UOP_BRANCH, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_lss_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,  .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_LOAD, .throughput = 1, .latency = 2},
+    .uop[2]      = { .type = UOP_ALU,  .throughput = 3, .latency = 3}
+};
+static const risc86_instruction_t vector_mov_mem_seg_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,   .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_STORE, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_mov_seg_mem_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD, .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALU, .throughput = 3, .latency = 3}
+};
+static const risc86_instruction_t vector_mov_seg_reg_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALU, .throughput = 3, .latency = 3}
+};
+static const risc86_instruction_t vector_mul_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALUX,  .throughput = 1, .latency = 1},
+    .uop[1]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_mul_mem_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,  .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_mul64_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALUX,  .throughput = 1, .latency = 1},
+    .uop[1]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_mul64_mem_op = {
+    .nr_uops     = 4,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,  .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1},
+    .uop[3]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_out_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_STORE, .throughput = 10, .latency = 10}
+};
+static const risc86_instruction_t vector_outs_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,   .throughput = 1,  .latency = 1 },
+    .uop[1]      = { .type = UOP_STORE, .throughput = 10, .latency = 10},
+    .uop[2]      = { .type = UOP_ALU,   .throughput = 1,  .latency = 1 }
+};
+static const risc86_instruction_t vector_pusha_op = {
+    .nr_uops     = 8,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_STORE,  .throughput = 1, .latency = 1},
+    .uop[1]      = { .type = UOP_STORE, .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_STORE, .throughput = 1, .latency = 1},
+    .uop[3]      = { .type = UOP_STORE, .throughput = 1, .latency = 1},
+    .uop[4]      = { .type = UOP_STORE, .throughput = 1, .latency = 1},
+    .uop[5]      = { .type = UOP_STORE, .throughput = 1, .latency = 1},
+    .uop[6]      = { .type = UOP_STORE, .throughput = 1, .latency = 1},
+    .uop[7]      = { .type = UOP_STORE, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_popa_op = {
+    .nr_uops     = 8,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,  .throughput = 1, .latency = 1},
+    .uop[1]      = { .type = UOP_LOAD, .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_LOAD, .throughput = 1, .latency = 1},
+    .uop[3]      = { .type = UOP_LOAD, .throughput = 1, .latency = 1},
+    .uop[4]      = { .type = UOP_LOAD, .throughput = 1, .latency = 1},
+    .uop[5]      = { .type = UOP_LOAD, .throughput = 1, .latency = 1},
+    .uop[6]      = { .type = UOP_LOAD, .throughput = 1, .latency = 1},
+    .uop[7]      = { .type = UOP_LOAD, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_popf_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,  .throughput = 1,  .latency = 2 },
+    .uop[1]      = { .type = UOP_ALUX, .throughput = 17, .latency = 17}
+};
+static const risc86_instruction_t vector_push_mem_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_STORE, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_pushf_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALUX,   .throughput = 1, .latency = 1},
+    .uop[1]      = { .type = UOP_STORE, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_ret_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,    .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_BRANCH, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_retf_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,    .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALU,    .throughput = 3, .latency = 3},
+    .uop[2]      = { .type = UOP_BRANCH, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_scas_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD, .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_scasb_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD, .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_setcc_mem_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALUX,    .throughput = 1, .latency = 1},
+    .uop[1]      = { .type = UOP_ALUX,   .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_FSTORE, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_setcc_reg_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALUX,  .throughput = 1, .latency = 1},
+    .uop[1]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_ALU,  .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_test_mem_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD, .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALU, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_test_mem_b_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,  .throughput = 1, .latency = 2},
+    .uop[1]      = { .type = UOP_ALUX, .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_xchg_mem_op = {
+    .nr_uops     = 3,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_LOAD,   .throughput = 1, .latency = 1},
+    .uop[1]      = { .type = UOP_STORE, .throughput = 1, .latency = 1},
+    .uop[2]      = { .type = UOP_ALU,   .throughput = 1, .latency = 1}
+};
+static const risc86_instruction_t vector_xlat_op = {
+    .nr_uops     = 2,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALU,   .throughput = 1, .latency = 1},
+    .uop[1]      = { .type = UOP_LOAD, .throughput = 1, .latency = 2}
+};
+static const risc86_instruction_t vector_wbinvd_op = {
+    .nr_uops     = 1,
+    .decode_type = DECODE_VECTOR,
+    .uop[0]      = {.type = UOP_ALU, .throughput = 10000, .latency = 10000}
+};
+
+#define INVALID NULL
+
+static const risc86_instruction_t *opcode_timings_k5[256] = {
+    // clang-format off
+/*      ADD                    ADD                    ADD                   ADD*/
+/*00*/  &alux_store_op,        &alu_store_op,         &load_alux_op,        &load_alu_op,
+/*      ADD                    ADD                    PUSH ES               POP ES*/
+        &alux_op,              &alu_op,               &push_seg_op,         &vector_mov_seg_mem_op,
+/*      OR                     OR                     OR                    OR*/
+        &alux_store_op,        &alu_store_op,         &load_alux_op,        &load_alu_op,
+/*      OR                     OR                     PUSH CS               */
+        &alux_op,              &alu_op,               &push_seg_op,         INVALID,
+
+/*      ADC                    ADC                    ADC                   ADC*/
+/*10*/  &vector_alux_store_op, &vector_alu_store_op,  &vector_load_alux_op, &vector_load_alu_op,
+/*      ADC                    ADC                    PUSH SS               POP SS*/
+        &vector_alux1_op,      &vector_alu1_op,       &push_seg_op,         &vector_mov_seg_mem_op,
+/*      SBB                    SBB                    SBB                   SBB*/
+/*10*/  &vector_alux_store_op, &vector_alu_store_op,  &vector_load_alux_op, &vector_load_alu_op,
+/*      SBB                    SBB                    PUSH DS               POP DS*/
+        &vector_alux1_op,      &vector_alu1_op,       &push_seg_op,         &vector_mov_seg_mem_op,
+
+/*      AND                    AND                    AND                   AND*/
+/*20*/  &alux_store_op,        &alu_store_op,         &load_alux_op,        &load_alu_op,
+/*      AND                    AND                                          DAA*/
+        &alux_op,              &alu_op,               INVALID,              &vector_alux1_op,
+/*      SUB                    SUB                    SUB                   SUB*/
+        &alux_store_op,        &alu_store_op,         &load_alux_op,        &load_alu_op,
+/*      SUB                    SUB                                          DAS*/
+        &alux_op,              &alu_op,               INVALID,              &vector_alux1_op,
+
+/*      XOR                    XOR                    XOR                   XOR*/
+/*30*/  &alux_store_op,        &alu_store_op,         &load_alux_op,        &load_alu_op,
+/*      XOR                    XOR                                          AAA*/
+        &alux_op,              &alu_op,               INVALID,              &vector_alux6_op,
+/*      CMP                    CMP                    CMP                   CMP*/
+        &load_alux_op,         &load_alu_op,          &load_alux_op,        &load_alu_op,
+/*      CMP                    CMP                                          AAS*/
+        &alux_op,              &alu_op,               INVALID,              &vector_alux6_op,
+
+/*      INC EAX                INC ECX                INC EDX                INC EBX*/
+/*40*/  &alu_op,               &alu_op,               &alu_op,               &alu_op,
+/*      INC ESP                INC EBP                INC ESI                INC EDI*/
+        &alu_op,               &alu_op,               &alu_op,               &alu_op,
+/*      DEC EAX                DEC ECX                DEC EDX                DEC EBX*/
+        &alu_op,               &alu_op,               &alu_op,               &alu_op,
+/*      DEC ESP                DEC EBP                DEC ESI                DEC EDI*/
+        &alu_op,               &alu_op,               &alu_op,               &alu_op,
+
+/*      PUSH EAX               PUSH ECX               PUSH EDX               PUSH EBX*/
+/*50*/  &store_op,             &store_op,             &store_op,             &store_op,
+/*      PUSH ESP               PUSH EBP               PUSH ESI               PUSH EDI*/
+        &store_op,             &store_op,             &store_op,             &store_op,
+/*      POP EAX                POP ECX                POP EDX                POP EBX*/
+        &pop_reg_op,           &pop_reg_op,           &pop_reg_op,           &pop_reg_op,
+/*      POP ESP                POP EBP                POP ESI                POP EDI*/
+        &pop_reg_op,           &pop_reg_op,           &pop_reg_op,           &pop_reg_op,
+
+/*      PUSHA                  POPA                   BOUND                  ARPL*/
+/*60*/  &vector_pusha_op,      &vector_popa_op,       &vector_bound_op,      &vector_arpl_op,
+        INVALID,               INVALID,               INVALID,               INVALID,
+/*      PUSH imm               IMUL                   PUSH imm               IMUL*/
+        &push_imm_op,          &vector_mul_op,        &push_imm_op,          &vector_mul_op,
+/*      INSB                   INSW                   OUTSB                  OUTSW*/
+        &vector_ins_op,        &vector_ins_op,        &vector_outs_op,       &vector_outs_op,
+
+/*      Jxx*/
+/*70*/  &branch_op,     &branch_op,     &branch_op,     &branch_op,
+        &branch_op,     &branch_op,     &branch_op,     &branch_op,
+        &branch_op,     &branch_op,     &branch_op,     &branch_op,
+        &branch_op,     &branch_op,     &branch_op,     &branch_op,
+
+/*80*/  INVALID,                   INVALID,                   INVALID,                   INVALID,
+/*      TEST                       TEST                       XCHG                       XCHG*/
+        &vector_test_mem_b_op,     &vector_test_mem_op,       &vector_xchg_mem_op,       &vector_xchg_mem_op,
+/*      MOV                        MOV                        MOV                        MOV*/
+        &store_op,                 &store_op,                 &load_op,                  &load_op,
+/*      MOV from seg               LEA                        MOV to seg                 POP*/
+        &vector_mov_mem_seg_op,    &store_op,                 &vector_mov_seg_mem_op,    &pop_mem_op,
+
+/*      NOP                        XCHG                       XCHG                       XCHG*/
+/*90*/  &limm_op,                  &xchg_op,                  &xchg_op,                  &xchg_op,
+/*      XCHG                       XCHG                       XCHG                       XCHG*/
+        &xchg_op,                  &xchg_op,                  &xchg_op,                  &xchg_op,
+/*      CBW                        CWD                        CALL far                   WAIT*/
+        &vector_alu1_op,           &vector_alu1_op,           &vector_call_far_op,       &limm_op,
+/*      PUSHF                      POPF                       SAHF                       LAHF*/
+        &vector_pushf_op,          &vector_popf_op,           &vector_alux1_op,          &vector_alux1_op,
+
+/*      MOV                        MOV                        MOV                        MOV*/
+/*a0*/  &load_op,                  &load_op,                  &store_op,                 &store_op,
+/*      MOVSB                      MOVSW                      CMPSB                      CMPSW*/
+        &movs_op,                  &movs_op,                  &vector_cmpsb_op,          &vector_cmps_op,
+/*      TEST                       TEST                       STOSB                      STOSW*/
+        &test_reg_b_op,            &test_reg_op,              &stos_op,                  &stos_op,
+/*      LODSB                      LODSW                      SCASB                      SCASW*/
+        &lods_op,                  &lods_op,                  &vector_scasb_op,          &vector_scas_op,
+
+/*      MOV*/
+/*b0*/  &limm_op,       &limm_op,       &limm_op,       &limm_op,
+        &limm_op,       &limm_op,       &limm_op,       &limm_op,
+        &limm_op,       &limm_op,       &limm_op,       &limm_op,
+        &limm_op,       &limm_op,       &limm_op,       &limm_op,
+
+/*                                                            RET imm                    RET*/
+/*c0*/  INVALID,                   INVALID,                   &vector_ret_op,            &vector_ret_op,
+/*      LES                        LDS                        MOV                        MOV*/
+        &vector_lss_op,            &vector_lss_op,            &store_op,                 &store_op,
+/*      ENTER                      LEAVE                      RETF                       RETF*/
+        &vector_enter_op,          &leave_op,                 &vector_retf_op,           &vector_retf_op,
+/*      INT3                       INT                        INTO                       IRET*/
+        &vector_int_op,            &vector_int_op,            &vector_int_op,            &vector_iret_op,
+
+
+/*d0*/  INVALID,                   INVALID,                   INVALID,                   INVALID,
+/*      AAM                        AAD                        SETALC                     XLAT*/
+        &vector_alux6_op,          &vector_alux3_op,          &vector_alux1_op,          &vector_xlat_op,
+        INVALID,                   INVALID,                   INVALID,                   INVALID,
+        INVALID,                   INVALID,                   INVALID,                   INVALID,
+/*      LOOPNE                     LOOPE                      LOOP                       JCXZ*/
+/*e0*/  &vector_loop_op,           &vector_loop_op,           &loop_op,                  &vector_loop_op,
+/*      IN AL                      IN AX                      OUT_AL                     OUT_AX*/
+        &vector_in_op,             &vector_in_op,             &vector_out_op,            &vector_out_op,
+/*      CALL                       JMP                        JMP                        JMP*/
+        &store_op,                 &branch_op,                &vector_jmp_far_op,           &branch_op,
+/*      IN AL                      IN AX                      OUT_AL                     OUT_AX*/
+        &vector_in_op,             &vector_in_op,             &vector_out_op,            &vector_out_op,
+
+/*                                                            REPNE                      REPE*/
+/*f0*/  INVALID,                   INVALID,                   INVALID,                   INVALID,
+/*      HLT                        CMC*/
+        &vector_alux1_op,          &vector_alu2_op,           INVALID,                   INVALID,
+/*      CLC                        STC                        CLI                        STI*/
+        &vector_alu1_op,           &vector_alu1_op,           &vector_cli_sti_op,        &vector_cli_sti_op,
+/*      CLD                        STD                        INCDEC*/
+        &vector_alu1_op,           &vector_alu1_op,           &alux_store_op,            INVALID
+    // clang-format on
+};
+
+static const risc86_instruction_t *opcode_timings_k5_mod3[256] = {
+    // clang-format off
+/*      ADD                       ADD                       ADD                       ADD*/
+/*00*/  &alux_op,                 &alu_op,                  &alux_op,                 &alu_op,
+/*      ADD                       ADD                       PUSH ES                   POP ES*/
+        &alux_op,                 &alu_op,                  &push_seg_op,             &vector_mov_seg_mem_op,
+/*      OR                        OR                        OR                        OR*/
+        &alux_op,                 &alu_op,                  &alux_op,                 &alu_op,
+/*      OR                        OR                        PUSH CS                   */
+        &alux_op,                 &alu_op,                  &push_seg_op,             INVALID,
+
+/*      ADC                       ADC                       ADC                       ADC*/
+/*10*/  &vector_alux1_op,         &vector_alu1_op,          &vector_alux1_op,         &vector_alu1_op,
+/*      ADC                       ADC                       PUSH SS                   POP SS*/
+        &vector_alux1_op,         &vector_alu1_op,          &push_seg_op,             &vector_mov_seg_mem_op,
+/*      SBB                       SBB                       SBB                       SBB*/
+        &vector_alux1_op,         &vector_alu1_op,          &vector_alux1_op,         &vector_alu1_op,
+/*      SBB                       SBB                       PUSH DS                   POP DS*/
+        &vector_alux1_op,         &vector_alu1_op,          &push_seg_op,             &vector_mov_seg_mem_op,
+
+/*      AND                       AND                       AND                       AND*/
+/*20*/  &alux_op,                 &alu_op,                  &alux_op,                 &alu_op,
+/*      AND                       AND                                                 DAA*/
+        &alux_op,                 &alu_op,                  INVALID,                  &vector_alux1_op,
+/*      SUB                       SUB                       SUB                       SUB*/
+        &alux_op,                 &alu_op,                  &alux_op,                 &alu_op,
+/*      SUB                       SUB                                                 DAS*/
+        &alux_op,                 &alu_op,                  INVALID,                  &vector_alux1_op,
+
+/*      XOR                       XOR                       XOR                       XOR*/
+/*30*/  &alux_op,                 &alu_op,                  &alux_op,                 &alu_op,
+/*      XOR                       XOR                                                 AAA*/
+        &alux_op,                 &alu_op,                  INVALID,                  &vector_alux6_op,
+/*      CMP                       CMP                       CMP                       CMP*/
+        &alux_op,                 &alu_op,                  &alux_op,                 &alu_op,
+/*      CMP                       CMP                                                 AAS*/
+        &alux_op,                 &alu_op,                  INVALID,                  &vector_alux6_op,
+
+/*      INC EAX                INC ECX                INC EDX                INC EBX*/
+/*40*/  &alu_op,               &alu_op,               &alu_op,               &alu_op,
+/*      INC ESP                INC EBP                INC ESI                INC EDI*/
+        &alu_op,               &alu_op,               &alu_op,               &alu_op,
+/*      DEC EAX                DEC ECX                DEC EDX                DEC EBX*/
+        &alu_op,               &alu_op,               &alu_op,               &alu_op,
+/*      DEC ESP                DEC EBP                DEC ESI                DEC EDI*/
+        &alu_op,               &alu_op,               &alu_op,               &alu_op,
+
+/*      PUSH EAX               PUSH ECX               PUSH EDX               PUSH EBX*/
+/*50*/  &store_op,             &store_op,             &store_op,             &store_op,
+/*      PUSH ESP               PUSH EBP               PUSH ESI               PUSH EDI*/
+        &store_op,             &store_op,             &store_op,             &store_op,
+/*      POP EAX                POP ECX                POP EDX                POP EBX*/
+        &pop_reg_op,           &pop_reg_op,           &pop_reg_op,           &pop_reg_op,
+/*      POP ESP                POP EBP                POP ESI                POP EDI*/
+        &pop_reg_op,           &pop_reg_op,           &pop_reg_op,           &pop_reg_op,
+
+/*      PUSHA                  POPA                   BOUND                  ARPL*/
+/*60*/  &vector_pusha_op,      &vector_popa_op,       &vector_bound_op,      &vector_arpl_op,
+        INVALID,               INVALID,               INVALID,               INVALID,
+/*      PUSH imm               IMUL                   PUSH imm               IMUL*/
+        &push_imm_op,          &vector_mul_op,        &push_imm_op,          &vector_mul_op,
+/*      INSB                   INSW                   OUTSB                  OUTSW*/
+        &vector_ins_op,        &vector_ins_op,        &vector_outs_op,       &vector_outs_op,
+
+/*      Jxx*/
+/*70*/  &branch_op,     &branch_op,     &branch_op,     &branch_op,
+        &branch_op,     &branch_op,     &branch_op,     &branch_op,
+        &branch_op,     &branch_op,     &branch_op,     &branch_op,
+        &branch_op,     &branch_op,     &branch_op,     &branch_op,
+
+/*80*/  INVALID,                   INVALID,                   INVALID,                   INVALID,
+/*      TEST                       TEST                       XCHG                       XCHG*/
+        &vector_alu1_op,           &vector_alu1_op,           &vector_alu3_op,           &vector_alu3_op,
+/*      MOV                        MOV                        MOV                        MOV*/
+        &store_op,                 &store_op,                 &load_op,                  &load_op,
+/*      MOV from seg               LEA                        MOV to seg                 POP*/
+        &mov_reg_seg_op,           &store_op,                 &vector_mov_seg_reg_op,    &pop_reg_op,
+
+/*      NOP                        XCHG                       XCHG                       XCHG*/
+/*90*/  &limm_op,                  &xchg_op,                  &xchg_op,                  &xchg_op,
+/*      XCHG                       XCHG                       XCHG                       XCHG*/
+        &xchg_op,                  &xchg_op,                  &xchg_op,                  &xchg_op,
+/*      CBW                        CWD                        CALL far                   WAIT*/
+        &vector_alu1_op,           &vector_alu1_op,           &vector_call_far_op,       &limm_op,
+/*      PUSHF                      POPF                       SAHF                       LAHF*/
+        &vector_pushf_op,          &vector_popf_op,           &vector_alux1_op,          &vector_alux1_op,
+
+/*      MOV                        MOV                        MOV                        MOV*/
+/*a0*/  &load_op,                  &load_op,                  &store_op,                 &store_op,
+/*      MOVSB                      MOVSW                      CMPSB                      CMPSW*/
+        &movs_op,                  &movs_op,                  &vector_cmpsb_op,          &vector_cmps_op,
+/*      TEST                       TEST                       STOSB                      STOSW*/
+        &test_reg_b_op,            &test_reg_op,              &stos_op,                  &stos_op,
+/*      LODSB                      LODSW                      SCASB                      SCASW*/
+        &lods_op,                  &lods_op,                  &vector_scasb_op,          &vector_scas_op,
+
+/*      MOV*/
+/*b0*/  &limm_op,       &limm_op,       &limm_op,       &limm_op,
+        &limm_op,       &limm_op,       &limm_op,       &limm_op,
+        &limm_op,       &limm_op,       &limm_op,       &limm_op,
+        &limm_op,       &limm_op,       &limm_op,       &limm_op,
+
+/*                                                            RET imm                    RET*/
+/*c0*/  INVALID,                   INVALID,                   &vector_ret_op,            &vector_ret_op,
+/*      LES                        LDS                        MOV                        MOV*/
+        &vector_lss_op,            &vector_lss_op,            &store_op,                 &store_op,
+/*      ENTER                      LEAVE                      RETF                       RETF*/
+        &vector_enter_op,          &leave_op,                 &vector_retf_op,           &vector_retf_op,
+/*      INT3                       INT                        INTO                       IRET*/
+        &vector_int_op,            &vector_int_op,            &vector_int_op,            &vector_iret_op,
+
+
+/*d0*/  INVALID,                   INVALID,                   INVALID,                   INVALID,
+/*      AAM                        AAD                        SETALC                     XLAT*/
+        &vector_alux6_op,          &vector_alux3_op,          &vector_alux1_op,          &vector_xlat_op,
+        INVALID,                   INVALID,                   INVALID,                   INVALID,
+        INVALID,                   INVALID,                   INVALID,                   INVALID,
+/*      LOOPNE                     LOOPE                      LOOP                       JCXZ*/
+/*e0*/  &vector_loop_op,           &vector_loop_op,           &loop_op,                  &vector_loop_op,
+/*      IN AL                      IN AX                      OUT_AL                     OUT_AX*/
+        &vector_in_op,             &vector_in_op,             &vector_out_op,            &vector_out_op,
+/*      CALL                       JMP                        JMP                        JMP*/
+        &store_op,                 &branch_op,                &vector_jmp_far_op,        &branch_op,
+/*      IN AL                      IN AX                      OUT_AL                     OUT_AX*/
+        &vector_in_op,             &vector_in_op,             &vector_out_op,            &vector_out_op,
+
+/*                                                            REPNE                      REPE*/
+/*f0*/  INVALID,                   INVALID,                   INVALID,                   INVALID,
+/*      HLT                        CMC*/
+        &vector_alux1_op,          &vector_alu2_op,           INVALID,                   INVALID,
+/*      CLC                        STC                        CLI                        STI*/
+        &vector_alu1_op,           &vector_alu1_op,           &vector_cli_sti_op,        &vector_cli_sti_op,
+/*      CLD                        STD                        INCDEC*/
+        &vector_alu1_op,           &vector_alu1_op,           &vector_alux1_op,          INVALID
+    // clang-format on
+};
+
+static const risc86_instruction_t *opcode_timings_k5_0f[256] = {
+    // clang-format off
+/*00*/  &vector_alu6_op,        &vector_alu6_op,        &vector_alu6_op,        &vector_alu6_op,
+        INVALID,                &vector_alu6_op,        &vector_alu6_op,        INVALID,
+        &vector_invd_op,        &vector_wbinvd_op,      INVALID,                INVALID,
+        INVALID,                &load_op,               &vector_femms_op,       &load_3dn_op,
+
+/*10*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*20*/  &vector_alu6_op,        &vector_alu6_op,        &vector_alu6_op,        &vector_alu6_op,
+        &vector_alu6_op,        &vector_alu6_op,        INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*30*/  &vector_alu6_op,        &vector_alu6_op,        &vector_alu6_op,        INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*40*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*50*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*60*/  &load_mmx_op,           &load_mmx_op,           &load_mmx_op,           &load_mmx_op,
+        &load_mmx_op,           &load_mmx_op,           &load_mmx_op,           &load_mmx_op,
+        &load_mmx_op,           &load_mmx_op,           &load_mmx_op,           &load_mmx_op,
+        INVALID,                INVALID,                &mload_op,              &mload_op,
+
+/*70*/  INVALID,                &load_mmx_shift_op,     &load_mmx_shift_op,     &load_mmx_shift_op,
+        &load_mmx_op,           &load_mmx_op,           &load_mmx_op,           &vector_emms_op,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                &mstore_op,             &mstore_op,
+
+/*80*/  &branch_op,     &branch_op,     &branch_op,     &branch_op,
+        &branch_op,     &branch_op,     &branch_op,     &branch_op,
+        &branch_op,     &branch_op,     &branch_op,     &branch_op,
+        &branch_op,     &branch_op,     &branch_op,     &branch_op,
+
+/*90*/  &vector_setcc_reg_op, &vector_setcc_reg_op, &vector_setcc_reg_op, &vector_setcc_reg_op,
+        &vector_setcc_reg_op, &vector_setcc_reg_op, &vector_setcc_reg_op, &vector_setcc_reg_op,
+        &vector_setcc_reg_op, &vector_setcc_reg_op, &vector_setcc_reg_op, &vector_setcc_reg_op,
+        &vector_setcc_reg_op, &vector_setcc_reg_op, &vector_setcc_reg_op, &vector_setcc_reg_op,
+
+/*a0*/  &push_seg_op,         &vector_mov_seg_mem_op,   &vector_cpuid_op,       &vector_load_alu_op,
+        &vector_alu_store_op, &vector_alu_store_op,     INVALID,                INVALID,
+        &push_seg_op,         &vector_mov_seg_mem_op,   INVALID,                &vector_load_alu_op,
+        &vector_alu_store_op, &vector_alu_store_op,     INVALID,                &vector_mul_op,
+
+/*b0*/  &vector_cmpxchg_b_op,   &vector_cmpxchg_op,     &vector_lss_op,         &vector_load_alu_op,
+        &vector_lss_op,         &vector_lss_op,         &load_alux_op,          &load_alu_op,
+        INVALID,                INVALID,                &vector_load_alu_op,    &vector_load_alu_op,
+        &vector_bsx_op,         &vector_bsx_op,         &load_alux_op,          &load_alu_op,
+
+/*c0*/  &vector_alux_store_op,  &vector_alu_store_op,   INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                &vector_cmpxchg_op,
+        &bswap_op,              &bswap_op,              &bswap_op,              &bswap_op,
+        &bswap_op,              &bswap_op,              &bswap_op,              &bswap_op,
+
+/*d0*/  INVALID,                &load_mmx_shift_op,     &load_mmx_shift_op,     &load_mmx_shift_op,
+        INVALID,                &load_mmx_mul_op,       INVALID,                INVALID,
+        &load_mmx_op,           &load_mmx_op,           INVALID,                &load_mmx_op,
+        &load_mmx_op,           &load_mmx_op,           INVALID,                &load_mmx_op,
+
+/*e0*/  &load_mmx_op,           &load_mmx_shift_op,     &load_mmx_shift_op,     INVALID,
+        INVALID,                &pmul_mem_op,           INVALID,                INVALID,
+        &load_mmx_op,           &load_mmx_op,           INVALID,                &load_mmx_op,
+        &load_mmx_op,           &load_mmx_op,           INVALID,                &load_mmx_op,
+
+/*f0*/  INVALID,                &load_mmx_shift_op,     &load_mmx_shift_op,     &load_mmx_shift_op,
+        INVALID,                &pmul_mem_op,           INVALID,                INVALID,
+        &load_mmx_op,           &load_mmx_op,           &load_mmx_op,           INVALID,
+        &load_mmx_op,           &load_mmx_op,           &load_mmx_op,           INVALID,
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_0f_mod3[256] = {
+    // clang-format off
+/*00*/  &vector_alu6_op,        &vector_alu6_op,        &vector_alu6_op,        &vector_alu6_op,
+        INVALID,                &vector_alu6_op,        &vector_alu6_op,        INVALID,
+        &vector_invd_op,        &vector_wbinvd_op,      INVALID,                INVALID,
+        INVALID,                INVALID,                &vector_femms_op,       &m3dn_op,
+
+/*10*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*20*/  &vector_alu6_op,        &vector_alu6_op,        &vector_alu6_op,        &vector_alu6_op,
+        &vector_alu6_op,        &vector_alu6_op,        INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*30*/  &vector_alu6_op,        &vector_alu6_op,        &vector_alu6_op,        INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*40*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*50*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*60*/  &mmx_op,                &mmx_op,                &mmx_op,                &mmx_op,
+        &mmx_op,                &mmx_op,                &mmx_op,                &mmx_op,
+        &mmx_op,                &mmx_op,                &mmx_op,                &mmx_op,
+        INVALID,                INVALID,                &mmx_op,                &mmx_op,
+
+/*70*/  INVALID,                &mmx_shift_op,          &mmx_shift_op,          &mmx_shift_op,
+        &mmx_op,                &mmx_op,                &mmx_op,                &vector_emms_op,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                &mmx_op,                &mmx_op,
+
+/*80*/  &branch_op,     &branch_op,     &branch_op,     &branch_op,
+        &branch_op,     &branch_op,     &branch_op,     &branch_op,
+        &branch_op,     &branch_op,     &branch_op,     &branch_op,
+        &branch_op,     &branch_op,     &branch_op,     &branch_op,
+
+/*90*/  &vector_setcc_mem_op, &vector_setcc_mem_op, &vector_setcc_mem_op, &vector_setcc_mem_op,
+        &vector_setcc_mem_op, &vector_setcc_mem_op, &vector_setcc_mem_op, &vector_setcc_mem_op,
+        &vector_setcc_mem_op, &vector_setcc_mem_op, &vector_setcc_mem_op, &vector_setcc_mem_op,
+        &vector_setcc_mem_op, &vector_setcc_mem_op, &vector_setcc_mem_op, &vector_setcc_mem_op,
+
+/*a0*/  &push_seg_op,         &vector_mov_seg_mem_op,   &vector_cpuid_op,       &vector_alu1_op,
+        &vector_alu1_op,      &vector_alu1_op,          INVALID,                INVALID,
+        &push_seg_op,         &vector_mov_seg_mem_op,   INVALID,                &vector_alu1_op,
+        &vector_alu1_op,      &vector_alu1_op,          INVALID,                &vector_mul_op,
+
+/*b0*/  &vector_cmpxchg_b_op,   &vector_cmpxchg_op,     &vector_lss_op,         &vector_alu1_op,
+        &vector_lss_op,         &vector_lss_op,         &alux_op,               &alu_op,
+        INVALID,                INVALID,                &vector_alu1_op,        &vector_alu1_op,
+        &vector_bsx_op,         &vector_bsx_op,         &alux_op,               &alu_op,
+
+/*c0*/  &vector_alux1_op,       &vector_alu1_op,        INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        &bswap_op,              &bswap_op,              &bswap_op,              &bswap_op,
+        &bswap_op,              &bswap_op,              &bswap_op,              &bswap_op,
+
+/*d0*/  INVALID,                &mmx_shift_op,          &mmx_shift_op,          &mmx_shift_op,
+        INVALID,                &mmx_mul_op,            INVALID,                INVALID,
+        &mmx_op,                &mmx_op,                INVALID,                &mmx_op,
+        &mmx_op,                &mmx_op,                INVALID,                &mmx_op,
+
+/*e0*/  &mmx_op,                &mmx_shift_op,          &mmx_shift_op,          INVALID,
+        INVALID,                &pmul_op,               INVALID,                INVALID,
+        &mmx_op,                &mmx_op,                INVALID,                &mmx_op,
+        &mmx_op,                &mmx_op,                INVALID,                &mmx_op,
+
+/*f0*/  INVALID,                &mmx_shift_op,          &mmx_shift_op,          &mmx_shift_op,
+        INVALID,                &pmul_op,               INVALID,                INVALID,
+        &mmx_op,                &mmx_op,                &mmx_op,                INVALID,
+        &mmx_op,                &mmx_op,                &mmx_op,                INVALID,
+    // clang-format on
+};
+
+static const risc86_instruction_t *opcode_timings_k5_0f0f[256] = {
+    // clang-format off
+/*00*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                &load_3dn_op,           INVALID,                INVALID,
+
+/*10*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                &load_3dn_op,           INVALID,                INVALID,
+
+/*20*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*30*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*40*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*50*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*60*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*70*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*80*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*90*/  &load_3dn_op,           INVALID,                INVALID,                INVALID,
+        &load_3dn_op,           INVALID,                &load_3dn_op,           &load_3dn_op,
+        INVALID,                INVALID,                &load_3dn_op,           INVALID,
+        INVALID,                INVALID,                &load_3dn_op,           INVALID,
+
+/*a0*/  &load_3dn_op,           INVALID,                INVALID,                INVALID,
+        &load_3dn_op,           INVALID,                &load_mmx_mul_op,       &load_mmx_mul_op,
+        INVALID,                INVALID,                &load_3dn_op,           INVALID,
+        INVALID,                INVALID,                &load_3dn_op,           INVALID,
+
+/*b0*/  &load_3dn_op,           INVALID,                INVALID,                INVALID,
+        &load_mmx_mul_op,       INVALID,                &load_mmx_mul_op,       &load_mmx_mul_op,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                &load_mmx_op,
+
+/*c0*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*d0*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*e0*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*f0*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_0f0f_mod3[256] = {
+    // clang-format off
+/*00*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                &m3dn_op,               INVALID,                INVALID,
+
+/*10*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                &m3dn_op,               INVALID,                INVALID,
+
+/*20*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*30*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*40*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*50*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*60*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*70*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*80*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*90*/  &m3dn_op,               INVALID,                INVALID,                INVALID,
+        &m3dn_op,               INVALID,                &m3dn_op,               &m3dn_op,
+        INVALID,                INVALID,                &m3dn_op,               INVALID,
+        INVALID,                INVALID,                &m3dn_op,               INVALID,
+
+/*a0*/  &m3dn_op,               INVALID,                INVALID,                INVALID,
+        &m3dn_op,               INVALID,                &mmx_mul_op,            &mmx_mul_op,
+        INVALID,                INVALID,                &m3dn_op,               INVALID,
+        INVALID,                INVALID,                &m3dn_op,               INVALID,
+
+/*b0*/  &m3dn_op,               INVALID,                INVALID,                INVALID,
+        &mmx_mul_op,            INVALID,                &mmx_mul_op,            &mmx_mul_op,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                &mmx_op,
+
+/*c0*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*d0*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*e0*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+
+/*f0*/  INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+        INVALID,                INVALID,                INVALID,                INVALID,
+    // clang-format on
+};
+
+static const risc86_instruction_t *opcode_timings_k5_shift[8] = {
+    // clang-format off
+        &vector_alu_store_op,   &vector_alu_store_op,   &vector_alu_store_op,   &vector_alu_store_op,
+        &vector_alu_store_op,   &vector_alu_store_op,   &vector_alu_store_op,   &vector_alu_store_op
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_shift_b[8] = {
+    // clang-format off
+        &vector_alux_store_op,  &vector_alux_store_op,  &vector_alux_store_op,  &vector_alux_store_op,
+        &vector_alux_store_op,  &vector_alux_store_op,  &vector_alux_store_op,  &vector_alux_store_op
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_shift_mod3[8] = {
+    // clang-format off
+        &vector_alu1_op,   &vector_alu1_op,   &vector_alu1_op,   &vector_alu1_op,
+        &alu_op,           &alu_op,           &alu_op,           &alu_op
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_shift_b_mod3[8] = {
+    // clang-format off
+        &vector_alux1_op,  &vector_alux1_op,  &vector_alux1_op,  &vector_alux1_op,
+        &alux_op,          &alux_op,          &alux_op,          &alux_op
+    // clang-format on
+};
+
+static const risc86_instruction_t *opcode_timings_k5_80[8] = {
+    // clang-format off
+        &alux_store_op, &alux_store_op, &vector_alux_store_op,  &vector_alux_store_op,
+        &alux_store_op, &alux_store_op, &alux_store_op,         &alux_store_op,
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_80_mod3[8] = {
+    // clang-format off
+        &alux_op,       &alux_op,       &alux_store_op,         &alux_store_op,
+        &alux_op,       &alux_op,       &alux_op,               &alux_op,
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_8x[8] = {
+    // clang-format off
+        &alu_store_op,  &alu_store_op,  &vector_alu_store_op,   &vector_alu_store_op,
+        &alu_store_op,  &alu_store_op,  &alu_store_op,          &alu_store_op,
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_8x_mod3[8] = {
+    // clang-format off
+        &alu_op,        &alu_op,        &alu_store_op,          &alu_store_op,
+        &alu_op,        &alu_op,        &alu_op,                &alu_op,
+    // clang-format on
+};
+
+static const risc86_instruction_t *opcode_timings_k5_f6[8] = {
+    // clang-format off
+/*      TST                                             NOT                     NEG*/
+        &test_mem_imm_b_op,     INVALID,                &vector_alux_store_op,  &vector_alux_store_op,
+/*      MUL                     IMUL                    DIV                     IDIV*/
+        &vector_mul_mem_op,     &vector_mul_mem_op,     &vector_div16_mem_op,   &vector_div16_mem_op,
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_f6_mod3[8] = {
+    // clang-format off
+/*      TST                                             NOT                     NEG*/
+        &test_reg_b_op,         INVALID,                &alux_op,               &alux_op,
+/*      MUL                     IMUL                    DIV                     IDIV*/
+        &vector_mul_op,         &vector_mul_op,         &vector_div16_op,       &vector_div16_op,
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_f7[8] = {
+    // clang-format off
+/*      TST                                             NOT                     NEG*/
+        &test_mem_imm_op,       INVALID,                &vector_alu_store_op,   &vector_alu_store_op,
+/*      MUL                     IMUL                    DIV                     IDIV*/
+        &vector_mul64_mem_op,   &vector_mul64_mem_op,   &vector_div32_mem_op,   &vector_div32_mem_op,
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_f7_mod3[8] = {
+    // clang-format off
+/*      TST                                             NOT                     NEG*/
+        &test_reg_op,           INVALID,                &alu_op,                &alu_op,
+/*      MUL                     IMUL                    DIV                     IDIV*/
+        &vector_mul64_op,       &vector_mul64_op,       &vector_div32_op,       &vector_div32_op,
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_ff[8] = {
+    // clang-format off
+/*      INC                     DEC                     CALL                    CALL far*/
+        &alu_store_op,          &alu_store_op,          &store_op,              &vector_call_far_op,
+/*      JMP                     JMP far                 PUSH*/
+        &branch_op,             &vector_jmp_far_op,     &push_mem_op,           INVALID
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_ff_mod3[8] = {
+    // clang-format off
+/*      INC                     DEC                     CALL                    CALL far*/
+        &vector_alu1_op,        &vector_alu1_op,        &store_op,              &vector_call_far_op,
+/*      JMP                     JMP far                 PUSH*/
+        &branch_op,             &vector_jmp_far_op,     &vector_push_mem_op,    INVALID
+    // clang-format on
+};
+
+static const risc86_instruction_t *opcode_timings_k5_d8[8] = {
+    // clang-format off
+/*      FADDs            FMULs            FCOMs            FCOMPs*/
+        &load_float_op,  &load_float_op,  &load_float_op,  &load_float_op,
+/*      FSUBs            FSUBRs           FDIVs            FDIVRs*/
+        &load_float_op,  &load_float_op,  &fdiv_mem_op,    &fdiv_mem_op,
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_d8_mod3[8] = {
+    // clang-format off
+/*      FADD             FMUL             FCOM             FCOMP*/
+        &float_op,       &float_op,       &float_op,       &float_op,
+/*      FSUB             FSUBR            FDIV             FDIVR*/
+        &float_op,       &float_op,       &fdiv_op,        &fdiv_op,
+    // clang-format on
+};
+
+static const risc86_instruction_t *opcode_timings_k5_d9[8] = {
+    // clang-format off
+/*      FLDs                                    FSTs                 FSTPs*/
+        &load_float_op,      INVALID,           &fstore_op,          &fstore_op,
+/*      FLDENV               FLDCW              FSTENV               FSTCW*/
+        &vector_float_l_op,  &vector_fldcw_op,  &vector_float_l_op,  &vector_float_op
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_d9_mod3[64] = {
+    // clang-format off
+        /*FLD*/
+        &float_op,    &float_op,    &float_op,    &float_op,
+        &float_op,    &float_op,    &float_op,    &float_op,
+        /*FXCH*/
+        &float_op,    &float_op,    &float_op,    &float_op,
+        &float_op,    &float_op,    &float_op,    &float_op,
+        /*FNOP*/
+        &float_op,    INVALID,      INVALID,      INVALID,
+        INVALID,      INVALID,      INVALID,      INVALID,
+        /*FSTP*/
+        &float_op,    &float_op,    &float_op,    &float_op,
+        &float_op,    &float_op,    &float_op,    &float_op,
+/*      opFCHS        opFABS*/
+        &float_op,    &float_op,    INVALID,      INVALID,
+/*      opFTST        opFXAM*/
+        &float_op,    &float_op,    INVALID,      INVALID,
+/*      opFLD1        opFLDL2T      opFLDL2E      opFLDPI*/
+        &float_op,    &float_op,    &float_op,    &float_op,
+/*      opFLDEG2      opFLDLN2      opFLDZ*/
+        &float_op,    &float_op,    &float_op,    INVALID,
+/*      opF2XM1       opFYL2X       opFPTAN       opFPATAN*/
+        &fsin_op,     &fsin_op,     &fsin_op,     &fsin_op,
+/*                                  opFDECSTP     opFINCSTP,*/
+        INVALID,      INVALID,      &float_op,    &float_op,
+/*      opFPREM                     opFSQRT       opFSINCOS*/
+        &fdiv_op,     INVALID,      &fsqrt_op,    &fsin_op,
+/*      opFRNDINT     opFSCALE      opFSIN        opFCOS*/
+        &float_op,    &fdiv_op,     &fsin_op,     &fsin_op
+    // clang-format on
+};
+
+static const risc86_instruction_t *opcode_timings_k5_da[8] = {
+    // clang-format off
+/*      FIADDl            FIMULl            FICOMl            FICOMPl*/
+        &load_float_op,   &load_float_op,   &load_float_op,   &load_float_op,
+/*      FISUBl            FISUBRl           FIDIVl            FIDIVRl*/
+        &load_float_op,   &load_float_op,   &fdiv_mem_op,     &fdiv_mem_op,
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_da_mod3[8] = {
+    // clang-format off
+        INVALID,          INVALID,          INVALID,          INVALID,
+/*                        FCOMPP*/
+        INVALID,          &float_op,        INVALID,          INVALID
+    // clang-format on
+};
+
+static const risc86_instruction_t *opcode_timings_k5_db[8] = {
+    // clang-format off
+/*      FLDil                               FSTil         FSTPil*/
+        &load_float_op,   INVALID,          &fstore_op,   &fstore_op,
+/*                        FLDe                            FSTPe*/
+        INVALID,          &vector_flde_op,  INVALID,      &vector_fste_op
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_db_mod3[64] = {
+    // clang-format off
+        INVALID,          INVALID,          INVALID,      INVALID,
+        INVALID,          INVALID,          INVALID,      INVALID,
+
+        INVALID,          INVALID,          INVALID,      INVALID,
+        INVALID,          INVALID,          INVALID,      INVALID,
+
+        INVALID,          INVALID,          INVALID,      INVALID,
+        INVALID,          INVALID,          INVALID,      INVALID,
+
+        INVALID,          INVALID,          INVALID,      INVALID,
+        INVALID,          INVALID,          INVALID,      INVALID,
+
+/*                        opFNOP            opFCLEX       opFINIT*/
+        INVALID,          &float_op,        &float_op,    &float_op,
+/*      opFNOP            opFNOP*/
+        &float_op,        &float_op,        INVALID,      INVALID,
+
+        INVALID,          INVALID,          INVALID,      INVALID,
+        INVALID,          INVALID,          INVALID,      INVALID,
+
+        INVALID,          INVALID,          INVALID,      INVALID,
+        INVALID,          INVALID,          INVALID,      INVALID,
+
+        INVALID,          INVALID,          INVALID,      INVALID,
+        INVALID,          INVALID,          INVALID,      INVALID,
+    // clang-format on
+};
+
+static const risc86_instruction_t *opcode_timings_k5_dc[8] = {
+    // clang-format off
+/*      FADDd             FMULd             FCOMd             FCOMPd*/
+        &load_float_op,   &load_float_op,   &load_float_op,   &load_float_op,
+/*      FSUBd             FSUBRd            FDIVd             FDIVRd*/
+        &load_float_op,   &load_float_op,   &fdiv_mem_op,     &fdiv_mem_op,
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_dc_mod3[8] = {
+    // clang-format off
+/*      opFADDr           opFMULr*/
+        &float_op,        &float_op,        INVALID,          INVALID,
+/*      opFSUBRr          opFSUBr           opFDIVRr          opFDIVr*/
+        &float_op,        &float_op,        &fdiv_op,         &fdiv_op
+    // clang-format on
+};
+
+static const risc86_instruction_t *opcode_timings_k5_dd[8] = {
+    // clang-format off
+/*      FLDd                                    FSTd                 FSTPd*/
+        &load_float_op,     INVALID,            &fstore_op,          &fstore_op,
+/*      FRSTOR                                  FSAVE                FSTSW*/
+        &vector_float_l_op, INVALID,            &vector_float_l_op,  &vector_float_l_op
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_dd_mod3[8] = {
+    // clang-format off
+/*      FFFREE                            FST                FSTP*/
+        &float_op,       INVALID,         &float_op,         &float_op,
+/*      FUCOM            FUCOMP*/
+        &float_op,       &float_op,       INVALID,           INVALID
+    // clang-format on
+};
+
+static const risc86_instruction_t *opcode_timings_k5_de[8] = {
+    // clang-format off
+/*      FIADDw            FIMULw            FICOMw            FICOMPw*/
+        &load_float_op,   &load_float_op,   &load_float_op,   &load_float_op,
+/*      FISUBw            FISUBRw           FIDIVw            FIDIVRw*/
+        &load_float_op,   &load_float_op,   &fdiv_mem_op,     &fdiv_mem_op,
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_de_mod3[8] = {
+    // clang-format off
+/*      FADDP            FMULP                          FCOMPP*/
+        &float_op,       &float_op,       INVALID,      &float_op,
+/*      FSUBP            FSUBRP           FDIVP         FDIVRP*/
+        &float_op,       &float_op,       &fdiv_op,     &fdiv_op,
+    // clang-format on
+};
+
+static const risc86_instruction_t *opcode_timings_k5_df[8] = {
+    // clang-format off
+/*      FILDiw                              FISTiw               FISTPiw*/
+        &load_float_op,   INVALID,          &fstore_op,          &fstore_op,
+/*                        FILDiq            FBSTP                FISTPiq*/
+        INVALID,          &load_float_op,   &vector_float_l_op,  &fstore_op,
+    // clang-format on
+};
+static const risc86_instruction_t *opcode_timings_k5_df_mod3[8] = {
+    // clang-format off
+        INVALID,      INVALID,      INVALID,      INVALID,
+/*      FSTSW AX*/
+        &float_op,    INVALID,      INVALID,      INVALID
+    // clang-format on
+};
+
+static uint8_t last_prefix;
+static int     prefixes;
+
+static int decode_timestamp;
+static int last_complete_timestamp;
+
+typedef struct k5_unit_t {
+    uint32_t uop_mask;
+    int      first_available_cycle;
+} k5_unit_t;
+
+static int        nr_units;
+static k5_unit_t *units;
+
+/*k5 has dedicated MMX unit*/
+static k5_unit_t k5_units[] = {
+    { .uop_mask = (1 << UOP_ALU) | (1 << UOP_ALUX) },                           /*Integer X*/
+    { .uop_mask = (1 << UOP_ALU) },                                             /*Integer Y*/
+    { .uop_mask = (1 << UOP_MEU) | (1 << UOP_MEU_SHIFT) | (1 << UOP_MEU_MUL) }, /*Multimedia*/
+    { .uop_mask = (1 << UOP_FLOAT) },                                           /*Floating point*/
+    { .uop_mask = (1 << UOP_LOAD) | (1 << UOP_FLOAD) | (1 << UOP_MLOAD) },      /*Load*/
+    { .uop_mask = (1 << UOP_STORE) | (1 << UOP_FSTORE) | (1 << UOP_MSTORE) },   /*Store*/
+    { .uop_mask = (1 << UOP_BRANCH) }                                           /*Branch*/
+};
+#define NR_k5_UNITS (sizeof(k5_units) / sizeof(k5_unit_t))
+
+/*k5-2 and later integrate MMX into ALU X & Y, sharing multiplier, shifter and
+  3DNow ALU between two execution units*/
+static k5_unit_t k5_2_units[] = {
+    { .uop_mask = (1 << UOP_ALU) | (1 << UOP_ALUX) | (1 << UOP_MEU) | /*Integer X*/
+          (1 << UOP_MEU_SHIFT) | (1 << UOP_MEU_MUL) | (1 << UOP_MEU_3DN) },
+    { .uop_mask = (1 << UOP_ALU) | (1 << UOP_MEU) | /*Integer Y*/
+          (1 << UOP_MEU_SHIFT) | (1 << UOP_MEU_MUL) | (1 << UOP_MEU_3DN) },
+    { .uop_mask = (1 << UOP_FLOAT) },                                         /*Floating point*/
+    { .uop_mask = (1 << UOP_LOAD) | (1 << UOP_FLOAD) | (1 << UOP_MLOAD) },    /*Load*/
+    { .uop_mask = (1 << UOP_STORE) | (1 << UOP_FSTORE) | (1 << UOP_MSTORE) }, /*Store*/
+    { .uop_mask = (1 << UOP_BRANCH) }                                         /*Branch*/
+};
+#define NR_k5_2_UNITS (sizeof(k5_2_units) / sizeof(k5_unit_t))
+
+/*First available cycles of shared execution units. Each of these can be submitted
+  to by ALU X and Y*/
+static int mul_first_available_cycle;
+static int shift_first_available_cycle;
+static int m3dnow_first_available_cycle;
+
+static int
+uop_run(const risc86_uop_t *uop, int decode_time)
+{
+    k5_unit_t *best_unit        = NULL;
+    int        best_start_cycle = 99999;
+
+    /*UOP_LIMM does not require execution*/
+    if (uop->type == UOP_LIMM)
+        return decode_time;
+
+    /*Handle shared units on k5-2 and later*/
+    if (units == k5_2_units) {
+        if (uop->type == UOP_MEU_MUL && decode_time < mul_first_available_cycle)
+            decode_time = mul_first_available_cycle;
+        else if (uop->type == UOP_MEU_SHIFT && decode_time < mul_first_available_cycle)
+            decode_time = shift_first_available_cycle;
+        else if (uop->type == UOP_MEU_3DN && decode_time < mul_first_available_cycle)
+            decode_time = m3dnow_first_available_cycle;
+    }
+
+    /*Find execution unit for this uOP*/
+    for (int c = 0; c < nr_units; c++) {
+        if (units[c].uop_mask & (1 << uop->type)) {
+            if (units[c].first_available_cycle < best_start_cycle) {
+                best_unit        = &units[c];
+                best_start_cycle = units[c].first_available_cycle;
+            }
+        }
+    }
+    if (!best_unit)
+        fatal("uop_run: can not find execution unit\n");
+
+    if (best_start_cycle < decode_time)
+        best_start_cycle = decode_time;
+    best_unit->first_available_cycle = best_start_cycle + uop->throughput;
+
+    if (units == k5_2_units) {
+        if (uop->type == UOP_MEU_MUL)
+            mul_first_available_cycle = best_start_cycle + uop->throughput;
+        else if (uop->type == UOP_MEU_SHIFT)
+            shift_first_available_cycle = best_start_cycle + uop->throughput;
+        else if (uop->type == UOP_MEU_3DN)
+            m3dnow_first_available_cycle = best_start_cycle + uop->throughput;
+    }
+
+    return best_start_cycle + uop->throughput;
+}
+
+/*The k5 decoder can decode, per clock :
+  - 1 or 2 'short' instructions, each up to 2 uOPs and 7 bytes long
+  - 1 'long' instruction, up to 4 uOPs
+  - 1 'vector' instruction, up to 4 uOPs per cycle, plus (I think) 1 cycle startup delay)
+*/
+static struct {
+    int                 nr_uops;
+    const risc86_uop_t *uops[4];
+    /*Earliest time a uop can start. If the timestamp is -1, then the uop is
+      part of a dependency chain and the start time is the completion time of
+      the previous uop*/
+    int earliest_start[4];
+} decode_buffer;
+
+#define NR_OPQUADS 6
+/*Timestamps of when the last six opquads completed. The k5 scheduler retires
+  opquads in order, so this is needed to determine when the next can be scheduled*/
+static int opquad_completion_timestamp[NR_OPQUADS];
+static int next_opquad = 0;
+
+#define NR_REGS 8
+/*Timestamp of when last operation on an integer register completed*/
+static int reg_available_timestamp[NR_REGS];
+/*Timestamp of when last operation on an FPU register completed*/
+static int fpu_st_timestamp[8];
+/*Completion time of the last uop to be processed. Used to calculate timing of
+  dependent uop chains*/
+static int last_uop_timestamp = 0;
+
+void
+decode_flush_k5(void)
+{
+    int uop_timestamp = 0;
+
+    /*Decoded opquad can not be submitted if there are no free spaces in the
+      opquad buffer*/
+    if (decode_timestamp < opquad_completion_timestamp[next_opquad])
+        decode_timestamp = opquad_completion_timestamp[next_opquad];
+
+    /*Ensure that uops can not be submitted before they have been decoded*/
+    if (decode_timestamp > last_uop_timestamp)
+        last_uop_timestamp = decode_timestamp;
+
+    /*Submit uops to execution units, and determine the latest completion time*/
+    for (int c = 0; c < decode_buffer.nr_uops; c++) {
+        int start_timestamp;
+
+        if (decode_buffer.earliest_start[c] == -1)
+            start_timestamp = last_uop_timestamp;
+        else
+            start_timestamp = decode_buffer.earliest_start[c];
+
+        last_uop_timestamp = uop_run(decode_buffer.uops[c], start_timestamp);
+        if (last_uop_timestamp > uop_timestamp)
+            uop_timestamp = last_uop_timestamp;
+    }
+
+    /*Calculate opquad completion time. Since opquads complete in order, it
+      must be after the last completion.*/
+    if (uop_timestamp <= last_complete_timestamp)
+        last_complete_timestamp = last_complete_timestamp + 1;
+    else
+        last_complete_timestamp = uop_timestamp;
+
+    /*Advance to next opquad in buffer*/
+    opquad_completion_timestamp[next_opquad] = last_complete_timestamp;
+    next_opquad++;
+    if (next_opquad == NR_OPQUADS)
+        next_opquad = 0;
+
+    decode_timestamp++;
+    decode_buffer.nr_uops = 0;
+}
+
+/*The instruction is only of interest here if it's longer than 7 bytes, as that's the
+  limit on k5 short decoding*/
+static int
+codegen_timing_instr_length(uint64_t deps, uint32_t fetchdat, int op_32)
+{
+    int len = prefixes + 1; /*Opcode*/
+    if (deps & MODRM) {
+        len++; /*ModR/M*/
+        if (deps & HAS_IMM8)
+            len++;
+        if (deps & HAS_IMM1632)
+            len += (op_32 & 0x100) ? 4 : 2;
+
+        if (op_32 & 0x200) {
+            if ((fetchdat & 7) == 4 && (fetchdat & 0xc0) != 0xc0) {
+                /* Has SIB*/
+                len++;
+                if ((fetchdat & 0xc0) == 0x40)
+                    len++;
+                else if ((fetchdat & 0xc0) == 0x80)
+                    len += 4;
+                else if ((fetchdat & 0x700) == 0x500)
+                    len += 4;
+            } else {
+                if ((fetchdat & 0xc0) == 0x40)
+                    len++;
+                else if ((fetchdat & 0xc0) == 0x80)
+                    len += 4;
+                else if ((fetchdat & 0xc7) == 0x05)
+                    len += 4;
+            }
+        } else {
+            if ((fetchdat & 0xc0) == 0x40)
+                len++;
+            else if ((fetchdat & 0xc0) == 0x80)
+                len += 2;
+            else if ((fetchdat & 0xc7) == 0x06)
+                len += 2;
+        }
+    }
+
+    return len;
+}
+
+static void
+decode_instruction(const risc86_instruction_t *ins, uint64_t deps, uint32_t fetchdat, int op_32, int bit8)
+{
+    uint32_t      regmask_required;
+    uint32_t      regmask_modified;
+    int           c;
+    int           d;
+    int           earliest_start = 0;
+    decode_type_t decode_type    = ins->decode_type;
+    int           instr_length   = codegen_timing_instr_length(deps, fetchdat, op_32);
+
+    /*Generate input register mask, and determine the earliest time this
+      instruction can start. This is not accurate, as this is calculated per
+      x86 instruction when it should be handled per uop*/
+    regmask_required = get_dstdep_mask(deps, fetchdat, bit8);
+    regmask_required |= get_addr_regmask(deps, fetchdat, op_32);
+    for (c = 0; c < 8; c++) {
+        if (regmask_required & (1 << c)) {
+            if (reg_available_timestamp[c] > decode_timestamp)
+                earliest_start = reg_available_timestamp[c];
+        }
+    }
+    if ((deps & FPU_RW_ST0) && fpu_st_timestamp[0] > decode_timestamp)
+        earliest_start = fpu_st_timestamp[0];
+    if ((deps & FPU_RW_ST1) && fpu_st_timestamp[1] > decode_timestamp)
+        earliest_start = fpu_st_timestamp[1];
+    if (deps & FPU_RW_STREG) {
+        int reg = fetchdat & 7;
+
+        if (fpu_st_timestamp[reg] > decode_timestamp)
+            earliest_start = fpu_st_timestamp[reg];
+    }
+
+    /*Short decoders are limited to 7 bytes*/
+    if (decode_type == DECODE_SHORT && instr_length > 7)
+        decode_type = DECODE_LONG;
+    /*Long decoder is limited to 11 bytes*/
+    else if (instr_length > 11)
+        decode_type = DECODE_VECTOR;
+
+    switch (decode_type) {
+        case DECODE_SHORT:
+            if (decode_buffer.nr_uops) {
+                decode_buffer.uops[decode_buffer.nr_uops]           = &ins->uop[0];
+                decode_buffer.earliest_start[decode_buffer.nr_uops] = earliest_start;
+                if (ins->nr_uops > 1) {
+                    decode_buffer.uops[decode_buffer.nr_uops + 1]           = &ins->uop[1];
+                    decode_buffer.earliest_start[decode_buffer.nr_uops + 1] = -1;
+                }
+                decode_buffer.nr_uops += ins->nr_uops;
+
+                decode_flush_k5();
+            } else {
+                decode_buffer.nr_uops           = ins->nr_uops;
+                decode_buffer.uops[0]           = &ins->uop[0];
+                decode_buffer.earliest_start[0] = earliest_start;
+                if (ins->nr_uops > 1) {
+                    decode_buffer.uops[1]           = &ins->uop[1];
+                    decode_buffer.earliest_start[1] = -1;
+                }
+            }
+            break;
+
+        case DECODE_LONG:
+            if (decode_buffer.nr_uops)
+                decode_flush_k5();
+
+            decode_buffer.nr_uops = ins->nr_uops;
+            for (c = 0; c < ins->nr_uops; c++) {
+                decode_buffer.uops[c] = &ins->uop[c];
+                if (c == 0)
+                    decode_buffer.earliest_start[c] = earliest_start;
+                else
+                    decode_buffer.earliest_start[c] = -1;
+            }
+            decode_flush_k5();
+            break;
+
+        case DECODE_VECTOR:
+            if (decode_buffer.nr_uops)
+                decode_flush_k5();
+
+            decode_timestamp++;
+            d = 0;
+
+            for (c = 0; c < ins->nr_uops; c++) {
+                decode_buffer.uops[d] = &ins->uop[c];
+                if (c == 0)
+                    decode_buffer.earliest_start[d] = earliest_start;
+                else
+                    decode_buffer.earliest_start[d] = -1;
+                d++;
+
+                if (d == 4) {
+                    d                     = 0;
+                    decode_buffer.nr_uops = 4;
+                    decode_flush_k5();
+                }
+            }
+            if (d) {
+                decode_buffer.nr_uops = d;
+                decode_flush_k5();
+            }
+            break;
+    }
+
+    /*Update write timestamps for any output registers*/
+    regmask_modified = get_dstdep_mask(deps, fetchdat, bit8);
+    for (c = 0; c < 8; c++) {
+        if (regmask_modified & (1 << c))
+            reg_available_timestamp[c] = last_complete_timestamp;
+    }
+    if (deps & FPU_POP) {
+        for (c = 0; c < 7; c++)
+            fpu_st_timestamp[c] = fpu_st_timestamp[c + 1];
+        fpu_st_timestamp[7] = 0;
+    }
+    if (deps & FPU_POP2) {
+        for (c = 0; c < 6; c++)
+            fpu_st_timestamp[c] = fpu_st_timestamp[c + 2];
+        fpu_st_timestamp[6] = fpu_st_timestamp[7] = 0;
+    }
+    if (deps & FPU_PUSH) {
+        for (c = 0; c < 7; c++)
+            fpu_st_timestamp[c + 1] = fpu_st_timestamp[c];
+        fpu_st_timestamp[0] = 0;
+    }
+    if (deps & FPU_WRITE_ST0)
+        fpu_st_timestamp[0] = last_complete_timestamp;
+    if (deps & FPU_WRITE_ST1)
+        fpu_st_timestamp[1] = last_complete_timestamp;
+    if (deps & FPU_WRITE_STREG) {
+        int reg = fetchdat & 7;
+        if (deps & FPU_POP)
+            reg--;
+        if (reg >= 0 && !(reg == 0 && (deps & FPU_WRITE_ST0)) && !(reg == 1 && (deps & FPU_WRITE_ST1)))
+            fpu_st_timestamp[reg] = last_complete_timestamp;
+    }
+}
+
+void
+codegen_timing_k5_block_start(void)
+{
+    int c;
+
+    for (c = 0; c < nr_units; c++)
+        units[c].first_available_cycle = 0;
+
+    mul_first_available_cycle    = 0;
+    shift_first_available_cycle  = 0;
+    m3dnow_first_available_cycle = 0;
+
+    decode_timestamp        = 0;
+    last_complete_timestamp = 0;
+
+    for (c = 0; c < NR_OPQUADS; c++)
+        opquad_completion_timestamp[c] = 0;
+    next_opquad = 0;
+
+    for (c = 0; c < NR_REGS; c++)
+        reg_available_timestamp[c] = 0;
+    for (c = 0; c < 8; c++)
+        fpu_st_timestamp[c] = 0;
+}
+
+void
+codegen_timing_k5_start(void)
+{
+    if (cpu_s->cpu_type == CPU_K5) {
+        units    = k5_units;
+        nr_units = NR_k5_UNITS;
+    } else {
+        units    = k5_2_units;
+        nr_units = NR_k5_2_UNITS;
+    }
+    last_prefix = 0;
+    prefixes    = 0;
+}
+
+void
+codegen_timing_k5_prefix(uint8_t prefix, UNUSED(uint32_t fetchdat))
+{
+    if (prefix != 0x0f)
+        decode_timestamp++;
+
+    last_prefix = prefix;
+    prefixes++;
+}
+
+void
+codegen_timing_k5_opcode(uint8_t opcode, UNUSED(uint32_t fetchdat), int op_32, uint32_t op_pc)
+{
+    const risc86_instruction_t **ins_table;
+    const uint64_t              *deps;
+    int                          mod3                        = ((fetchdat & 0xc0) == 0xc0);
+    int                          old_last_complete_timestamp = last_complete_timestamp;
+    int                          bit8                        = !(opcode & 1);
+
+    switch (last_prefix) {
+        case 0x0f:
+            if (opcode == 0x0f) {
+                /*3DNow has the actual opcode after ModR/M, SIB and any offset*/
+                uint32_t opcode_pc = op_pc + 1; /*Byte after ModR/M*/
+                uint8_t  modrm     = fetchdat & 0xff;
+                uint8_t  sib       = (fetchdat >> 8) & 0xff;
+
+                if ((modrm & 0xc0) != 0xc0) {
+                    if (op_32 & 0x200) {
+                        if ((modrm & 7) == 4) {
+                            /* Has SIB*/
+                            opcode_pc++;
+                            if ((modrm & 0xc0) == 0x40)
+                                opcode_pc++;
+                            else if ((modrm & 0xc0) == 0x80)
+                                opcode_pc += 4;
+                            else if ((sib & 0x07) == 0x05)
+                                opcode_pc += 4;
+                        } else {
+                            if ((modrm & 0xc0) == 0x40)
+                                opcode_pc++;
+                            else if ((modrm & 0xc0) == 0x80)
+                                opcode_pc += 4;
+                            else if ((modrm & 0xc7) == 0x05)
+                                opcode_pc += 4;
+                        }
+                    } else {
+                        if ((modrm & 0xc0) == 0x40)
+                            opcode_pc++;
+                        else if ((modrm & 0xc0) == 0x80)
+                            opcode_pc += 2;
+                        else if ((modrm & 0xc7) == 0x06)
+                            opcode_pc += 2;
+                    }
+                }
+
+                opcode = fastreadb(cs + opcode_pc);
+
+                ins_table = mod3 ? opcode_timings_k5_0f0f_mod3 : opcode_timings_k5_0f0f;
+                deps      = mod3 ? opcode_deps_0f0f_mod3 : opcode_deps_0f0f;
+            } else {
+                ins_table = mod3 ? opcode_timings_k5_0f_mod3 : opcode_timings_k5_0f;
+                deps      = mod3 ? opcode_deps_0f_mod3 : opcode_deps_0f;
+            }
+            break;
+
+        case 0xd8:
+            ins_table = mod3 ? opcode_timings_k5_d8_mod3 : opcode_timings_k5_d8;
+            deps      = mod3 ? opcode_deps_d8_mod3 : opcode_deps_d8;
+            opcode    = (opcode >> 3) & 7;
+            break;
+        case 0xd9:
+            ins_table = mod3 ? opcode_timings_k5_d9_mod3 : opcode_timings_k5_d9;
+            deps      = mod3 ? opcode_deps_d9_mod3 : opcode_deps_d9;
+            opcode    = mod3 ? opcode & 0x3f : (opcode >> 3) & 7;
+            break;
+        case 0xda:
+            ins_table = mod3 ? opcode_timings_k5_da_mod3 : opcode_timings_k5_da;
+            deps      = mod3 ? opcode_deps_da_mod3 : opcode_deps_da;
+            opcode    = (opcode >> 3) & 7;
+            break;
+        case 0xdb:
+            ins_table = mod3 ? opcode_timings_k5_db_mod3 : opcode_timings_k5_db;
+            deps      = mod3 ? opcode_deps_db_mod3 : opcode_deps_db;
+            opcode    = mod3 ? opcode & 0x3f : (opcode >> 3) & 7;
+            break;
+        case 0xdc:
+            ins_table = mod3 ? opcode_timings_k5_dc_mod3 : opcode_timings_k5_dc;
+            deps      = mod3 ? opcode_deps_dc_mod3 : opcode_deps_dc;
+            opcode    = (opcode >> 3) & 7;
+            break;
+        case 0xdd:
+            ins_table = mod3 ? opcode_timings_k5_dd_mod3 : opcode_timings_k5_dd;
+            deps      = mod3 ? opcode_deps_dd_mod3 : opcode_deps_dd;
+            opcode    = (opcode >> 3) & 7;
+            break;
+        case 0xde:
+            ins_table = mod3 ? opcode_timings_k5_de_mod3 : opcode_timings_k5_de;
+            deps      = mod3 ? opcode_deps_de_mod3 : opcode_deps_de;
+            opcode    = (opcode >> 3) & 7;
+            break;
+        case 0xdf:
+            ins_table = mod3 ? opcode_timings_k5_df_mod3 : opcode_timings_k5_df;
+            deps      = mod3 ? opcode_deps_df_mod3 : opcode_deps_df;
+            opcode    = (opcode >> 3) & 7;
+            break;
+
+        default:
+            switch (opcode) {
+                case 0x80:
+                case 0x82:
+                    ins_table = mod3 ? opcode_timings_k5_80_mod3 : opcode_timings_k5_80;
+                    deps      = mod3 ? opcode_deps_8x_mod3 : opcode_deps_8x;
+                    opcode    = (fetchdat >> 3) & 7;
+                    break;
+                case 0x81:
+                case 0x83:
+                    ins_table = mod3 ? opcode_timings_k5_8x_mod3 : opcode_timings_k5_8x;
+                    deps      = mod3 ? opcode_deps_8x_mod3 : opcode_deps_8x;
+                    opcode    = (fetchdat >> 3) & 7;
+                    break;
+
+                case 0xc0:
+                case 0xd0:
+                case 0xd2:
+                    ins_table = mod3 ? opcode_timings_k5_shift_b_mod3 : opcode_timings_k5_shift_b;
+                    deps      = mod3 ? opcode_deps_shift_mod3 : opcode_deps_shift;
+                    opcode    = (fetchdat >> 3) & 7;
+                    break;
+
+                case 0xc1:
+                case 0xd1:
+                case 0xd3:
+                    ins_table = mod3 ? opcode_timings_k5_shift_mod3 : opcode_timings_k5_shift;
+                    deps      = mod3 ? opcode_deps_shift_mod3 : opcode_deps_shift;
+                    opcode    = (fetchdat >> 3) & 7;
+                    break;
+
+                case 0xf6:
+                    ins_table = mod3 ? opcode_timings_k5_f6_mod3 : opcode_timings_k5_f6;
+                    deps      = mod3 ? opcode_deps_f6_mod3 : opcode_deps_f6;
+                    opcode    = (fetchdat >> 3) & 7;
+                    break;
+                case 0xf7:
+                    ins_table = mod3 ? opcode_timings_k5_f7_mod3 : opcode_timings_k5_f7;
+                    deps      = mod3 ? opcode_deps_f7_mod3 : opcode_deps_f7;
+                    opcode    = (fetchdat >> 3) & 7;
+                    break;
+                case 0xff:
+                    ins_table = mod3 ? opcode_timings_k5_ff_mod3 : opcode_timings_k5_ff;
+                    deps      = mod3 ? opcode_deps_ff_mod3 : opcode_deps_ff;
+                    opcode    = (fetchdat >> 3) & 7;
+                    break;
+
+                default:
+                    ins_table = mod3 ? opcode_timings_k5_mod3 : opcode_timings_k5;
+                    deps      = mod3 ? opcode_deps_mod3 : opcode_deps;
+                    break;
+            }
+    }
+
+    if (ins_table[opcode])
+        decode_instruction(ins_table[opcode], deps[opcode], fetchdat, op_32, bit8);
+    else
+        decode_instruction(&vector_alu1_op, 0, fetchdat, op_32, bit8);
+    codegen_block_cycles += (last_complete_timestamp - old_last_complete_timestamp);
+}
+
+void
+codegen_timing_k5_block_end(void)
+{
+    if (decode_buffer.nr_uops) {
+        int old_last_complete_timestamp = last_complete_timestamp;
+        decode_flush_k5();
+        codegen_block_cycles += (last_complete_timestamp - old_last_complete_timestamp);
+    }
+}
+
+int
+codegen_timing_k5_jump_cycles(void)
+{
+    if (decode_buffer.nr_uops)
+        return 1;
+    return 0;
+}
+
+codegen_timing_t codegen_timing_k5 = {
+    codegen_timing_k5_start,
+    codegen_timing_k5_prefix,
+    codegen_timing_k5_opcode,
+    codegen_timing_k5_block_start,
+    codegen_timing_k5_block_end,
+    codegen_timing_k5_jump_cycles
+};
diff --git a/src/cpu/codegen_timing_k6.c b/src/cpu/codegen_timing_k6.c
index 4a9f23cd8..34297211b 100644
--- a/src/cpu/codegen_timing_k6.c
+++ b/src/cpu/codegen_timing_k6.c
@@ -1,5 +1,5 @@
 /*Most of the vector instructions here are a total guess.
-  Some of the timings are based on http://http://web.archive.org/web/20181122095446/http://users.atw.hu/instlatx64/AuthenticAMD0000562_K6_InstLatX86.txt*/
+  Some of the timings are based on https://web.archive.org/web/20181122095446/http://users.atw.hu/instlatx64/AuthenticAMD0000562_K6_InstLatX86.txt*/
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
@@ -8,10 +8,12 @@
 #include <86box/mem.h>
 #include "cpu.h"
 #include <86box/machine.h>
+#include <86box/plat_unused.h>
 
 #include "x86.h"
 #include "x86_ops.h"
 #include "x86seg_common.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include "386_common.h"
 #include "codegen.h"
@@ -758,7 +760,7 @@ static const risc86_instruction_t vector_wbinvd_op = {
 
 #define INVALID NULL
 
-static const risc86_instruction_t *opcode_timings[256] = {
+static const risc86_instruction_t *opcode_timings_k6[256] = {
     // clang-format off
 /*      ADD                    ADD                    ADD                   ADD*/
 /*00*/  &alux_store_op,        &alu_store_op,         &load_alux_op,        &load_alu_op,
@@ -895,7 +897,7 @@ static const risc86_instruction_t *opcode_timings[256] = {
     // clang-format on
 };
 
-static const risc86_instruction_t *opcode_timings_mod3[256] = {
+static const risc86_instruction_t *opcode_timings_k6_mod3[256] = {
     // clang-format off
 /*      ADD                       ADD                       ADD                       ADD*/
 /*00*/  &alux_op,                 &alu_op,                  &alux_op,                 &alu_op,
@@ -1032,7 +1034,7 @@ static const risc86_instruction_t *opcode_timings_mod3[256] = {
     // clang-format on
 };
 
-static const risc86_instruction_t *opcode_timings_0f[256] = {
+static const risc86_instruction_t *opcode_timings_k6_0f[256] = {
     // clang-format off
 /*00*/  &vector_alu6_op,        &vector_alu6_op,        &vector_alu6_op,        &vector_alu6_op,
         INVALID,                &vector_alu6_op,        &vector_alu6_op,        INVALID,
@@ -1115,7 +1117,7 @@ static const risc86_instruction_t *opcode_timings_0f[256] = {
         &load_mmx_op,           &load_mmx_op,           &load_mmx_op,           INVALID,
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_0f_mod3[256] = {
+static const risc86_instruction_t *opcode_timings_k6_0f_mod3[256] = {
     // clang-format off
 /*00*/  &vector_alu6_op,        &vector_alu6_op,        &vector_alu6_op,        &vector_alu6_op,
         INVALID,                &vector_alu6_op,        &vector_alu6_op,        INVALID,
@@ -1199,7 +1201,7 @@ static const risc86_instruction_t *opcode_timings_0f_mod3[256] = {
     // clang-format on
 };
 
-static const risc86_instruction_t *opcode_timings_0f0f[256] = {
+static const risc86_instruction_t *opcode_timings_k6_0f0f[256] = {
     // clang-format off
 /*00*/  INVALID,                INVALID,                INVALID,                INVALID,
         INVALID,                INVALID,                INVALID,                INVALID,
@@ -1282,7 +1284,7 @@ static const risc86_instruction_t *opcode_timings_0f0f[256] = {
         INVALID,                INVALID,                INVALID,                INVALID,
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_0f0f_mod3[256] = {
+static const risc86_instruction_t *opcode_timings_k6_0f0f_mod3[256] = {
     // clang-format off
 /*00*/  INVALID,                INVALID,                INVALID,                INVALID,
         INVALID,                INVALID,                INVALID,                INVALID,
@@ -1366,57 +1368,57 @@ static const risc86_instruction_t *opcode_timings_0f0f_mod3[256] = {
     // clang-format on
 };
 
-static const risc86_instruction_t *opcode_timings_shift[8] = {
+static const risc86_instruction_t *opcode_timings_k6_shift[8] = {
     // clang-format off
         &vector_alu_store_op,   &vector_alu_store_op,   &vector_alu_store_op,   &vector_alu_store_op,
         &vector_alu_store_op,   &vector_alu_store_op,   &vector_alu_store_op,   &vector_alu_store_op
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_shift_b[8] = {
+static const risc86_instruction_t *opcode_timings_k6_shift_b[8] = {
     // clang-format off
         &vector_alux_store_op,  &vector_alux_store_op,  &vector_alux_store_op,  &vector_alux_store_op,
         &vector_alux_store_op,  &vector_alux_store_op,  &vector_alux_store_op,  &vector_alux_store_op
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_shift_mod3[8] = {
+static const risc86_instruction_t *opcode_timings_k6_shift_mod3[8] = {
     // clang-format off
         &vector_alu1_op,   &vector_alu1_op,   &vector_alu1_op,   &vector_alu1_op,
         &alu_op,           &alu_op,           &alu_op,           &alu_op
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_shift_b_mod3[8] = {
+static const risc86_instruction_t *opcode_timings_k6_shift_b_mod3[8] = {
     // clang-format off
         &vector_alux1_op,  &vector_alux1_op,  &vector_alux1_op,  &vector_alux1_op,
         &alux_op,          &alux_op,          &alux_op,          &alux_op
     // clang-format on
 };
 
-static const risc86_instruction_t *opcode_timings_80[8] = {
+static const risc86_instruction_t *opcode_timings_k6_80[8] = {
     // clang-format off
         &alux_store_op, &alux_store_op, &vector_alux_store_op,  &vector_alux_store_op,
         &alux_store_op, &alux_store_op, &alux_store_op,         &alux_store_op,
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_80_mod3[8] = {
+static const risc86_instruction_t *opcode_timings_k6_80_mod3[8] = {
     // clang-format off
         &alux_op,       &alux_op,       &alux_store_op,         &alux_store_op,
         &alux_op,       &alux_op,       &alux_op,               &alux_op,
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_8x[8] = {
+static const risc86_instruction_t *opcode_timings_k6_8x[8] = {
     // clang-format off
         &alu_store_op,  &alu_store_op,  &vector_alu_store_op,   &vector_alu_store_op,
         &alu_store_op,  &alu_store_op,  &alu_store_op,          &alu_store_op,
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_8x_mod3[8] = {
+static const risc86_instruction_t *opcode_timings_k6_8x_mod3[8] = {
     // clang-format off
         &alu_op,        &alu_op,        &alu_store_op,          &alu_store_op,
         &alu_op,        &alu_op,        &alu_op,                &alu_op,
     // clang-format on
 };
 
-static const risc86_instruction_t *opcode_timings_f6[8] = {
+static const risc86_instruction_t *opcode_timings_k6_f6[8] = {
     // clang-format off
 /*      TST                                             NOT                     NEG*/
         &test_mem_imm_b_op,     INVALID,                &vector_alux_store_op,  &vector_alux_store_op,
@@ -1424,7 +1426,7 @@ static const risc86_instruction_t *opcode_timings_f6[8] = {
         &vector_mul_mem_op,     &vector_mul_mem_op,     &vector_div16_mem_op,   &vector_div16_mem_op,
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_f6_mod3[8] = {
+static const risc86_instruction_t *opcode_timings_k6_f6_mod3[8] = {
     // clang-format off
 /*      TST                                             NOT                     NEG*/
         &test_reg_b_op,         INVALID,                &alux_op,               &alux_op,
@@ -1432,7 +1434,7 @@ static const risc86_instruction_t *opcode_timings_f6_mod3[8] = {
         &vector_mul_op,         &vector_mul_op,         &vector_div16_op,       &vector_div16_op,
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_f7[8] = {
+static const risc86_instruction_t *opcode_timings_k6_f7[8] = {
     // clang-format off
 /*      TST                                             NOT                     NEG*/
         &test_mem_imm_op,       INVALID,                &vector_alu_store_op,   &vector_alu_store_op,
@@ -1440,7 +1442,7 @@ static const risc86_instruction_t *opcode_timings_f7[8] = {
         &vector_mul64_mem_op,   &vector_mul64_mem_op,   &vector_div32_mem_op,   &vector_div32_mem_op,
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_f7_mod3[8] = {
+static const risc86_instruction_t *opcode_timings_k6_f7_mod3[8] = {
     // clang-format off
 /*      TST                                             NOT                     NEG*/
         &test_reg_op,           INVALID,                &alu_op,                &alu_op,
@@ -1448,7 +1450,7 @@ static const risc86_instruction_t *opcode_timings_f7_mod3[8] = {
         &vector_mul64_op,       &vector_mul64_op,       &vector_div32_op,       &vector_div32_op,
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_ff[8] = {
+static const risc86_instruction_t *opcode_timings_k6_ff[8] = {
     // clang-format off
 /*      INC                     DEC                     CALL                    CALL far*/
         &alu_store_op,          &alu_store_op,          &store_op,              &vector_call_far_op,
@@ -1456,7 +1458,7 @@ static const risc86_instruction_t *opcode_timings_ff[8] = {
         &branch_op,             &vector_jmp_far_op,     &push_mem_op,           INVALID
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_ff_mod3[8] = {
+static const risc86_instruction_t *opcode_timings_k6_ff_mod3[8] = {
     // clang-format off
 /*      INC                     DEC                     CALL                    CALL far*/
         &vector_alu1_op,        &vector_alu1_op,        &store_op,              &vector_call_far_op,
@@ -1465,7 +1467,7 @@ static const risc86_instruction_t *opcode_timings_ff_mod3[8] = {
     // clang-format on
 };
 
-static const risc86_instruction_t *opcode_timings_d8[8] = {
+static const risc86_instruction_t *opcode_timings_k6_d8[8] = {
     // clang-format off
 /*      FADDs            FMULs            FCOMs            FCOMPs*/
         &load_float_op,  &load_float_op,  &load_float_op,  &load_float_op,
@@ -1473,7 +1475,7 @@ static const risc86_instruction_t *opcode_timings_d8[8] = {
         &load_float_op,  &load_float_op,  &fdiv_mem_op,    &fdiv_mem_op,
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_d8_mod3[8] = {
+static const risc86_instruction_t *opcode_timings_k6_d8_mod3[8] = {
     // clang-format off
 /*      FADD             FMUL             FCOM             FCOMP*/
         &float_op,       &float_op,       &float_op,       &float_op,
@@ -1482,7 +1484,7 @@ static const risc86_instruction_t *opcode_timings_d8_mod3[8] = {
     // clang-format on
 };
 
-static const risc86_instruction_t *opcode_timings_d9[8] = {
+static const risc86_instruction_t *opcode_timings_k6_d9[8] = {
     // clang-format off
 /*      FLDs                                    FSTs                 FSTPs*/
         &load_float_op,      INVALID,           &fstore_op,          &fstore_op,
@@ -1490,7 +1492,7 @@ static const risc86_instruction_t *opcode_timings_d9[8] = {
         &vector_float_l_op,  &vector_fldcw_op,  &vector_float_l_op,  &vector_float_op
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_d9_mod3[64] = {
+static const risc86_instruction_t *opcode_timings_k6_d9_mod3[64] = {
     // clang-format off
         /*FLD*/
         &float_op,    &float_op,    &float_op,    &float_op,
@@ -1523,7 +1525,7 @@ static const risc86_instruction_t *opcode_timings_d9_mod3[64] = {
     // clang-format on
 };
 
-static const risc86_instruction_t *opcode_timings_da[8] = {
+static const risc86_instruction_t *opcode_timings_k6_da[8] = {
     // clang-format off
 /*      FIADDl            FIMULl            FICOMl            FICOMPl*/
         &load_float_op,   &load_float_op,   &load_float_op,   &load_float_op,
@@ -1531,7 +1533,7 @@ static const risc86_instruction_t *opcode_timings_da[8] = {
         &load_float_op,   &load_float_op,   &fdiv_mem_op,     &fdiv_mem_op,
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_da_mod3[8] = {
+static const risc86_instruction_t *opcode_timings_k6_da_mod3[8] = {
     // clang-format off
         INVALID,          INVALID,          INVALID,          INVALID,
 /*                        FCOMPP*/
@@ -1539,7 +1541,7 @@ static const risc86_instruction_t *opcode_timings_da_mod3[8] = {
     // clang-format on
 };
 
-static const risc86_instruction_t *opcode_timings_db[8] = {
+static const risc86_instruction_t *opcode_timings_k6_db[8] = {
     // clang-format off
 /*      FLDil                               FSTil         FSTPil*/
         &load_float_op,   INVALID,          &fstore_op,   &fstore_op,
@@ -1547,7 +1549,7 @@ static const risc86_instruction_t *opcode_timings_db[8] = {
         INVALID,          &vector_flde_op,  INVALID,      &vector_fste_op
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_db_mod3[64] = {
+static const risc86_instruction_t *opcode_timings_k6_db_mod3[64] = {
     // clang-format off
         INVALID,          INVALID,          INVALID,      INVALID,
         INVALID,          INVALID,          INVALID,      INVALID,
@@ -1577,7 +1579,7 @@ static const risc86_instruction_t *opcode_timings_db_mod3[64] = {
     // clang-format on
 };
 
-static const risc86_instruction_t *opcode_timings_dc[8] = {
+static const risc86_instruction_t *opcode_timings_k6_dc[8] = {
     // clang-format off
 /*      FADDd             FMULd             FCOMd             FCOMPd*/
         &load_float_op,   &load_float_op,   &load_float_op,   &load_float_op,
@@ -1585,7 +1587,7 @@ static const risc86_instruction_t *opcode_timings_dc[8] = {
         &load_float_op,   &load_float_op,   &fdiv_mem_op,     &fdiv_mem_op,
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_dc_mod3[8] = {
+static const risc86_instruction_t *opcode_timings_k6_dc_mod3[8] = {
     // clang-format off
 /*      opFADDr           opFMULr*/
         &float_op,        &float_op,        INVALID,          INVALID,
@@ -1594,7 +1596,7 @@ static const risc86_instruction_t *opcode_timings_dc_mod3[8] = {
     // clang-format on
 };
 
-static const risc86_instruction_t *opcode_timings_dd[8] = {
+static const risc86_instruction_t *opcode_timings_k6_dd[8] = {
     // clang-format off
 /*      FLDd                                    FSTd                 FSTPd*/
         &load_float_op,     INVALID,            &fstore_op,          &fstore_op,
@@ -1602,7 +1604,7 @@ static const risc86_instruction_t *opcode_timings_dd[8] = {
         &vector_float_l_op, INVALID,            &vector_float_l_op,  &vector_float_l_op
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_dd_mod3[8] = {
+static const risc86_instruction_t *opcode_timings_k6_dd_mod3[8] = {
     // clang-format off
 /*      FFFREE                            FST                FSTP*/
         &float_op,       INVALID,         &float_op,         &float_op,
@@ -1611,7 +1613,7 @@ static const risc86_instruction_t *opcode_timings_dd_mod3[8] = {
     // clang-format on
 };
 
-static const risc86_instruction_t *opcode_timings_de[8] = {
+static const risc86_instruction_t *opcode_timings_k6_de[8] = {
     // clang-format off
 /*      FIADDw            FIMULw            FICOMw            FICOMPw*/
         &load_float_op,   &load_float_op,   &load_float_op,   &load_float_op,
@@ -1619,7 +1621,7 @@ static const risc86_instruction_t *opcode_timings_de[8] = {
         &load_float_op,   &load_float_op,   &fdiv_mem_op,     &fdiv_mem_op,
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_de_mod3[8] = {
+static const risc86_instruction_t *opcode_timings_k6_de_mod3[8] = {
     // clang-format off
 /*      FADDP            FMULP                          FCOMPP*/
         &float_op,       &float_op,       INVALID,      &float_op,
@@ -1628,7 +1630,7 @@ static const risc86_instruction_t *opcode_timings_de_mod3[8] = {
     // clang-format on
 };
 
-static const risc86_instruction_t *opcode_timings_df[8] = {
+static const risc86_instruction_t *opcode_timings_k6_df[8] = {
     // clang-format off
 /*      FILDiw                              FISTiw               FISTPiw*/
         &load_float_op,   INVALID,          &fstore_op,          &fstore_op,
@@ -1636,7 +1638,7 @@ static const risc86_instruction_t *opcode_timings_df[8] = {
         INVALID,          &load_float_op,   &vector_float_l_op,  &fstore_op,
     // clang-format on
 };
-static const risc86_instruction_t *opcode_timings_df_mod3[8] = {
+static const risc86_instruction_t *opcode_timings_k6_df_mod3[8] = {
     // clang-format off
         INVALID,      INVALID,      INVALID,      INVALID,
 /*      FSTSW AX*/
@@ -1768,7 +1770,7 @@ static int fpu_st_timestamp[8];
 static int last_uop_timestamp = 0;
 
 void
-decode_flush(void)
+decode_flush_k6(void)
 {
     int uop_timestamp = 0;
 
@@ -1907,7 +1909,7 @@ decode_instruction(const risc86_instruction_t *ins, uint64_t deps, uint32_t fetc
                 }
                 decode_buffer.nr_uops += ins->nr_uops;
 
-                decode_flush();
+                decode_flush_k6();
             } else {
                 decode_buffer.nr_uops           = ins->nr_uops;
                 decode_buffer.uops[0]           = &ins->uop[0];
@@ -1921,7 +1923,7 @@ decode_instruction(const risc86_instruction_t *ins, uint64_t deps, uint32_t fetc
 
         case DECODE_LONG:
             if (decode_buffer.nr_uops)
-                decode_flush();
+                decode_flush_k6();
 
             decode_buffer.nr_uops = ins->nr_uops;
             for (c = 0; c < ins->nr_uops; c++) {
@@ -1931,12 +1933,12 @@ decode_instruction(const risc86_instruction_t *ins, uint64_t deps, uint32_t fetc
                 else
                     decode_buffer.earliest_start[c] = -1;
             }
-            decode_flush();
+            decode_flush_k6();
             break;
 
         case DECODE_VECTOR:
             if (decode_buffer.nr_uops)
-                decode_flush();
+                decode_flush_k6();
 
             decode_timestamp++;
             d = 0;
@@ -1952,12 +1954,12 @@ decode_instruction(const risc86_instruction_t *ins, uint64_t deps, uint32_t fetc
                 if (d == 4) {
                     d                     = 0;
                     decode_buffer.nr_uops = 4;
-                    decode_flush();
+                    decode_flush_k6();
                 }
             }
             if (d) {
                 decode_buffer.nr_uops = d;
-                decode_flush();
+                decode_flush_k6();
             }
             break;
     }
@@ -2036,7 +2038,7 @@ codegen_timing_k6_start(void)
 }
 
 void
-codegen_timing_k6_prefix(uint8_t prefix, uint32_t fetchdat)
+codegen_timing_k6_prefix(uint8_t prefix, UNUSED(uint32_t fetchdat))
 {
     if (prefix != 0x0f)
         decode_timestamp++;
@@ -2046,7 +2048,7 @@ codegen_timing_k6_prefix(uint8_t prefix, uint32_t fetchdat)
 }
 
 void
-codegen_timing_k6_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, uint32_t op_pc)
+codegen_timing_k6_opcode(uint8_t opcode, UNUSED(uint32_t fetchdat), int op_32, uint32_t op_pc)
 {
     const risc86_instruction_t **ins_table;
     const uint64_t              *deps;
@@ -2093,51 +2095,51 @@ codegen_timing_k6_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, uint32_t
 
                 opcode = fastreadb(cs + opcode_pc);
 
-                ins_table = mod3 ? opcode_timings_0f0f_mod3 : opcode_timings_0f0f;
+                ins_table = mod3 ? opcode_timings_k6_0f0f_mod3 : opcode_timings_k6_0f0f;
                 deps      = mod3 ? opcode_deps_0f0f_mod3 : opcode_deps_0f0f;
             } else {
-                ins_table = mod3 ? opcode_timings_0f_mod3 : opcode_timings_0f;
+                ins_table = mod3 ? opcode_timings_k6_0f_mod3 : opcode_timings_k6_0f;
                 deps      = mod3 ? opcode_deps_0f_mod3 : opcode_deps_0f;
             }
             break;
 
         case 0xd8:
-            ins_table = mod3 ? opcode_timings_d8_mod3 : opcode_timings_d8;
+            ins_table = mod3 ? opcode_timings_k6_d8_mod3 : opcode_timings_k6_d8;
             deps      = mod3 ? opcode_deps_d8_mod3 : opcode_deps_d8;
             opcode    = (opcode >> 3) & 7;
             break;
         case 0xd9:
-            ins_table = mod3 ? opcode_timings_d9_mod3 : opcode_timings_d9;
+            ins_table = mod3 ? opcode_timings_k6_d9_mod3 : opcode_timings_k6_d9;
             deps      = mod3 ? opcode_deps_d9_mod3 : opcode_deps_d9;
             opcode    = mod3 ? opcode & 0x3f : (opcode >> 3) & 7;
             break;
         case 0xda:
-            ins_table = mod3 ? opcode_timings_da_mod3 : opcode_timings_da;
+            ins_table = mod3 ? opcode_timings_k6_da_mod3 : opcode_timings_k6_da;
             deps      = mod3 ? opcode_deps_da_mod3 : opcode_deps_da;
             opcode    = (opcode >> 3) & 7;
             break;
         case 0xdb:
-            ins_table = mod3 ? opcode_timings_db_mod3 : opcode_timings_db;
+            ins_table = mod3 ? opcode_timings_k6_db_mod3 : opcode_timings_k6_db;
             deps      = mod3 ? opcode_deps_db_mod3 : opcode_deps_db;
             opcode    = mod3 ? opcode & 0x3f : (opcode >> 3) & 7;
             break;
         case 0xdc:
-            ins_table = mod3 ? opcode_timings_dc_mod3 : opcode_timings_dc;
+            ins_table = mod3 ? opcode_timings_k6_dc_mod3 : opcode_timings_k6_dc;
             deps      = mod3 ? opcode_deps_dc_mod3 : opcode_deps_dc;
             opcode    = (opcode >> 3) & 7;
             break;
         case 0xdd:
-            ins_table = mod3 ? opcode_timings_dd_mod3 : opcode_timings_dd;
+            ins_table = mod3 ? opcode_timings_k6_dd_mod3 : opcode_timings_k6_dd;
             deps      = mod3 ? opcode_deps_dd_mod3 : opcode_deps_dd;
             opcode    = (opcode >> 3) & 7;
             break;
         case 0xde:
-            ins_table = mod3 ? opcode_timings_de_mod3 : opcode_timings_de;
+            ins_table = mod3 ? opcode_timings_k6_de_mod3 : opcode_timings_k6_de;
             deps      = mod3 ? opcode_deps_de_mod3 : opcode_deps_de;
             opcode    = (opcode >> 3) & 7;
             break;
         case 0xdf:
-            ins_table = mod3 ? opcode_timings_df_mod3 : opcode_timings_df;
+            ins_table = mod3 ? opcode_timings_k6_df_mod3 : opcode_timings_k6_df;
             deps      = mod3 ? opcode_deps_df_mod3 : opcode_deps_df;
             opcode    = (opcode >> 3) & 7;
             break;
@@ -2146,13 +2148,13 @@ codegen_timing_k6_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, uint32_t
             switch (opcode) {
                 case 0x80:
                 case 0x82:
-                    ins_table = mod3 ? opcode_timings_80_mod3 : opcode_timings_80;
+                    ins_table = mod3 ? opcode_timings_k6_80_mod3 : opcode_timings_k6_80;
                     deps      = mod3 ? opcode_deps_8x_mod3 : opcode_deps_8x;
                     opcode    = (fetchdat >> 3) & 7;
                     break;
                 case 0x81:
                 case 0x83:
-                    ins_table = mod3 ? opcode_timings_8x_mod3 : opcode_timings_8x;
+                    ins_table = mod3 ? opcode_timings_k6_8x_mod3 : opcode_timings_k6_8x;
                     deps      = mod3 ? opcode_deps_8x_mod3 : opcode_deps_8x;
                     opcode    = (fetchdat >> 3) & 7;
                     break;
@@ -2160,7 +2162,7 @@ codegen_timing_k6_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, uint32_t
                 case 0xc0:
                 case 0xd0:
                 case 0xd2:
-                    ins_table = mod3 ? opcode_timings_shift_b_mod3 : opcode_timings_shift_b;
+                    ins_table = mod3 ? opcode_timings_k6_shift_b_mod3 : opcode_timings_k6_shift_b;
                     deps      = mod3 ? opcode_deps_shift_mod3 : opcode_deps_shift;
                     opcode    = (fetchdat >> 3) & 7;
                     break;
@@ -2168,29 +2170,29 @@ codegen_timing_k6_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, uint32_t
                 case 0xc1:
                 case 0xd1:
                 case 0xd3:
-                    ins_table = mod3 ? opcode_timings_shift_mod3 : opcode_timings_shift;
+                    ins_table = mod3 ? opcode_timings_k6_shift_mod3 : opcode_timings_k6_shift;
                     deps      = mod3 ? opcode_deps_shift_mod3 : opcode_deps_shift;
                     opcode    = (fetchdat >> 3) & 7;
                     break;
 
                 case 0xf6:
-                    ins_table = mod3 ? opcode_timings_f6_mod3 : opcode_timings_f6;
+                    ins_table = mod3 ? opcode_timings_k6_f6_mod3 : opcode_timings_k6_f6;
                     deps      = mod3 ? opcode_deps_f6_mod3 : opcode_deps_f6;
                     opcode    = (fetchdat >> 3) & 7;
                     break;
                 case 0xf7:
-                    ins_table = mod3 ? opcode_timings_f7_mod3 : opcode_timings_f7;
+                    ins_table = mod3 ? opcode_timings_k6_f7_mod3 : opcode_timings_k6_f7;
                     deps      = mod3 ? opcode_deps_f7_mod3 : opcode_deps_f7;
                     opcode    = (fetchdat >> 3) & 7;
                     break;
                 case 0xff:
-                    ins_table = mod3 ? opcode_timings_ff_mod3 : opcode_timings_ff;
+                    ins_table = mod3 ? opcode_timings_k6_ff_mod3 : opcode_timings_k6_ff;
                     deps      = mod3 ? opcode_deps_ff_mod3 : opcode_deps_ff;
                     opcode    = (fetchdat >> 3) & 7;
                     break;
 
                 default:
-                    ins_table = mod3 ? opcode_timings_mod3 : opcode_timings;
+                    ins_table = mod3 ? opcode_timings_k6_mod3 : opcode_timings_k6;
                     deps      = mod3 ? opcode_deps_mod3 : opcode_deps;
                     break;
             }
@@ -2208,7 +2210,7 @@ codegen_timing_k6_block_end(void)
 {
     if (decode_buffer.nr_uops) {
         int old_last_complete_timestamp = last_complete_timestamp;
-        decode_flush();
+        decode_flush_k6();
         codegen_block_cycles += (last_complete_timestamp - old_last_complete_timestamp);
     }
 }
diff --git a/src/cpu/codegen_timing_p6.c b/src/cpu/codegen_timing_p6.c
index 2c087ae86..42db319c3 100644
--- a/src/cpu/codegen_timing_p6.c
+++ b/src/cpu/codegen_timing_p6.c
@@ -13,6 +13,7 @@
 #include "x86.h"
 #include "x86_ops.h"
 #include "x86seg_common.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include "386_common.h"
 #include "codegen.h"
@@ -786,7 +787,7 @@ static const macro_op_t wbinvd_op = {
 };
 #define INVALID NULL
 
-static const macro_op_t *opcode_timings[256] = {
+static const macro_op_t *opcode_timings_p6[256] = {
     // clang-format off
 /*      ADD                    ADD                    ADD                   ADD*/
 /*00*/  &alup0_store_op,       &alu_store_op,         &load_alup0_op,       &load_alu_op,
@@ -923,7 +924,7 @@ static const macro_op_t *opcode_timings[256] = {
     // clang-format on
 };
 
-static const macro_op_t *opcode_timings_mod3[256] = {
+static const macro_op_t *opcode_timings_p6_mod3[256] = {
     // clang-format off
 /*      ADD                       ADD                       ADD                       ADD*/
 /*00*/  &alup0_op,                &alu_op,                  &alup0_op,                &alu_op,
@@ -1061,7 +1062,7 @@ static const macro_op_t *opcode_timings_mod3[256] = {
     // clang-format on
 };
 
-static const macro_op_t *opcode_timings_0f[256] = {
+static const macro_op_t *opcode_timings_p6_0f[256] = {
     // clang-format off
 /*00*/  &alu6_op,               &alu6_op,               &alu6_op,               &alu6_op,
         INVALID,                &alu6_op,               &alu6_op,               INVALID,
@@ -1144,7 +1145,7 @@ static const macro_op_t *opcode_timings_0f[256] = {
         &load_mmx_op,            &load_mmx_op,           &load_mmx_op,           INVALID,
     // clang-format on
 };
-static const macro_op_t *opcode_timings_0f_mod3[256] = {
+static const macro_op_t *opcode_timings_p6_0f_mod3[256] = {
     // clang-format off
 /*00*/  &alu6_op,                &alu6_op,               &alu6_op,               &alu6_op,
         INVALID,                 &alu6_op,               &alu6_op,               INVALID,
@@ -1227,58 +1228,58 @@ static const macro_op_t *opcode_timings_0f_mod3[256] = {
         &mmx_op,                 &mmx_op,                &mmx_op,                INVALID,
 };
 
-static const macro_op_t *opcode_timings_shift[8] =
+static const macro_op_t *opcode_timings_p6_shift[8] =
 {
     // clang-format off
         &alu_store_op,   &alu_store_op,   &alu_store_op,   &alu_store_op,
         &alu_store_op,   &alu_store_op,   &alu_store_op,   &alu_store_op
     // clang-format on
 };
-static const macro_op_t *opcode_timings_shift_b[8] = {
+static const macro_op_t *opcode_timings_p6_shift_b[8] = {
     // clang-format off
         &alup0_store_op,  &alup0_store_op,  &alup0_store_op,  &alup0_store_op,
         &alup0_store_op,  &alup0_store_op,  &alup0_store_op,  &alup0_store_op
     // clang-format on
 };
-static const macro_op_t *opcode_timings_shift_mod3[8] = {
+static const macro_op_t *opcode_timings_p6_shift_mod3[8] = {
     // clang-format off
         &complex_alu1_op,   &complex_alu1_op,   &complex_alu1_op,   &complex_alu1_op,
         &alu_op,            &alu_op,            &alu_op,            &alu_op
     // clang-format on
 };
-static const macro_op_t *opcode_timings_shift_b_mod3[8] = {
+static const macro_op_t *opcode_timings_p6_shift_b_mod3[8] = {
     // clang-format off
         &complex_alup0_1_op,  &complex_alup0_1_op,  &complex_alup0_1_op,  &complex_alup0_1_op,
         &alup0_op,            &alup0_op,            &alup0_op,            &alup0_op
     // clang-format on
 };
 
-static const macro_op_t *opcode_timings_80[8] = {
+static const macro_op_t *opcode_timings_p6_80[8] = {
     // clang-format off
         &alup0_store_op, &alup0_store_op, &alup0_store_op,  &alup0_store_op,
         &alup0_store_op, &alup0_store_op, &alup0_store_op,  &alup0_store_op,
     // clang-format on
 };
-static const macro_op_t *opcode_timings_80_mod3[8] = {
+static const macro_op_t *opcode_timings_p6_80_mod3[8] = {
     // clang-format off
         &alup0_op,       &alup0_op,       &alup0_store_op,  &alup0_store_op,
         &alup0_op,       &alup0_op,       &alup0_op,        &alup0_op,
     // clang-format on
 };
-static const macro_op_t *opcode_timings_8x[8] = {
+static const macro_op_t *opcode_timings_p6_8x[8] = {
     // clang-format off
         &alu_store_op,  &alu_store_op,    &alu_store_op,    &alu_store_op,
         &alu_store_op,  &alu_store_op,    &alu_store_op,    &alu_store_op,
     // clang-format on
 };
-static const macro_op_t *opcode_timings_8x_mod3[8] = {
+static const macro_op_t *opcode_timings_p6_8x_mod3[8] = {
     // clang-format off
         &alu_op,        &alu_op,          &alu_store_op,    &alu_store_op,
         &alu_op,        &alu_op,          &alu_op,          &alu_op,
     // clang-format on
 };
 
-static const macro_op_t *opcode_timings_f6[8] = {
+static const macro_op_t *opcode_timings_p6_f6[8] = {
     // clang-format off
 /*      TST                                             NOT                     NEG*/
         &test_mem_imm_b_op,     INVALID,                &alup0_store_op,        &alup0_store_op,
@@ -1286,7 +1287,7 @@ static const macro_op_t *opcode_timings_f6[8] = {
         &mul_mem_op,            &mul_mem_op,            &div16_mem_op,          &div16_mem_op,
     // clang-format on
 };
-static const macro_op_t *opcode_timings_f6_mod3[8] = {
+static const macro_op_t *opcode_timings_p6_f6_mod3[8] = {
     // clang-format off
 /*      TST                                             NOT                     NEG*/
         &test_reg_b_op,         INVALID,                &alup0_op,              &alup0_op,
@@ -1294,7 +1295,7 @@ static const macro_op_t *opcode_timings_f6_mod3[8] = {
         &mul_op,                &mul_op,                &div16_op,              &div16_op,
     // clang-format on
 };
-static const macro_op_t *opcode_timings_f7[8] = {
+static const macro_op_t *opcode_timings_p6_f7[8] = {
     // clang-format off
 /*      TST                                             NOT                     NEG*/
         &test_mem_imm_op,       INVALID,                &alu_store_op,          &alu_store_op,
@@ -1302,7 +1303,7 @@ static const macro_op_t *opcode_timings_f7[8] = {
         &mul64_mem_op,          &mul64_mem_op,          &div32_mem_op,          &div32_mem_op,
     // clang-format on
 };
-static const macro_op_t *opcode_timings_f7_mod3[8] = {
+static const macro_op_t *opcode_timings_p6_f7_mod3[8] = {
     // clang-format off
 /*      TST                                             NOT                     NEG*/
         &test_reg_op,           INVALID,                &alu_op,                &alu_op,
@@ -1310,7 +1311,7 @@ static const macro_op_t *opcode_timings_f7_mod3[8] = {
         &mul64_op,              &mul64_op,              &div32_op,              &div32_op,
     // clang-format on
 };
-static const macro_op_t *opcode_timings_ff[8] = {
+static const macro_op_t *opcode_timings_p6_ff[8] = {
     // clang-format off
 /*      INC                     DEC                     CALL                    CALL far*/
         &alu_store_op,          &alu_store_op,          &store_op,              &call_far_op,
@@ -1318,7 +1319,7 @@ static const macro_op_t *opcode_timings_ff[8] = {
         &branch_op,             &jmp_far_op,            &push_mem_op,           INVALID
     // clang-format on
 };
-static const macro_op_t *opcode_timings_ff_mod3[8] = {
+static const macro_op_t *opcode_timings_p6_ff_mod3[8] = {
     // clang-format off
 /*      INC                     DEC                     CALL                    CALL far*/
         &complex_alu1_op,       &complex_alu1_op,       &store_op,              &call_far_op,
@@ -1327,7 +1328,7 @@ static const macro_op_t *opcode_timings_ff_mod3[8] = {
     // clang-format on
 };
 
-static const macro_op_t *opcode_timings_d8[8] = {
+static const macro_op_t *opcode_timings_p6_d8[8] = {
     // clang-format off
 /*      FADDs            FMULs            FCOMs            FCOMPs*/
         &load_fadd_op,   &load_fmul_op,   &load_float_op,  &load_float_op,
@@ -1335,7 +1336,7 @@ static const macro_op_t *opcode_timings_d8[8] = {
         &load_float_op,  &load_float_op,  &fdiv_mem_op,    &fdiv_mem_op,
     // clang-format on
 };
-static const macro_op_t *opcode_timings_d8_mod3[8] = {
+static const macro_op_t *opcode_timings_p6_d8_mod3[8] = {
     // clang-format off
 /*      FADD             FMUL             FCOM             FCOMP*/
         &fadd_op,        &fmul_op,        &float_op,       &float_op,
@@ -1344,7 +1345,7 @@ static const macro_op_t *opcode_timings_d8_mod3[8] = {
     // clang-format on
 };
 
-static const macro_op_t *opcode_timings_d9[8] = {
+static const macro_op_t *opcode_timings_p6_d9[8] = {
     // clang-format off
 /*      FLDs                                    FSTs                 FSTPs*/
         &load_float_op,      INVALID,           &fstore_op,          &fstore_op,
@@ -1352,7 +1353,7 @@ static const macro_op_t *opcode_timings_d9[8] = {
         &complex_float_l_op, &fldcw_op,         &complex_float_l_op, &complex_float_op
     // clang-format on
 };
-static const macro_op_t *opcode_timings_d9_mod3[64] = {
+static const macro_op_t *opcode_timings_p6_d9_mod3[64] = {
     // clang-format off
         /*FLD*/
         &float_op,    &float_op,    &float_op,    &float_op,
@@ -1385,7 +1386,7 @@ static const macro_op_t *opcode_timings_d9_mod3[64] = {
     // clang-format on
 };
 
-static const macro_op_t *opcode_timings_da[8] = {
+static const macro_op_t *opcode_timings_p6_da[8] = {
     // clang-format off
 /*      FIADDl            FIMULl            FICOMl            FICOMPl*/
         &load_fadd_op,    &load_fmul_op,    &load_float_op,   &load_float_op,
@@ -1393,7 +1394,7 @@ static const macro_op_t *opcode_timings_da[8] = {
         &load_float_op,   &load_float_op,   &fdiv_mem_op,     &fdiv_mem_op,
     // clang-format on
 };
-static const macro_op_t *opcode_timings_da_mod3[8] = {
+static const macro_op_t *opcode_timings_p6_da_mod3[8] = {
     // clang-format off
         INVALID,          INVALID,          INVALID,          INVALID,
 /*                        FCOMPP*/
@@ -1401,7 +1402,7 @@ static const macro_op_t *opcode_timings_da_mod3[8] = {
     // clang-format on
 };
 
-static const macro_op_t *opcode_timings_db[8] = {
+static const macro_op_t *opcode_timings_p6_db[8] = {
     // clang-format off
 /*      FLDil                               FSTil         FSTPil*/
         &load_float_op,   INVALID,          &fstore_op,   &fstore_op,
@@ -1409,7 +1410,7 @@ static const macro_op_t *opcode_timings_db[8] = {
         INVALID,          &flde_op,         INVALID,      &fste_op
     // clang-format on
 };
-static const macro_op_t *opcode_timings_db_mod3[64] = {
+static const macro_op_t *opcode_timings_p6_db_mod3[64] = {
     // clang-format off
         INVALID,          INVALID,          INVALID,      INVALID,
         INVALID,          INVALID,          INVALID,      INVALID,
@@ -1439,7 +1440,7 @@ static const macro_op_t *opcode_timings_db_mod3[64] = {
     // clang-format on
 };
 
-static const macro_op_t *opcode_timings_dc[8] = {
+static const macro_op_t *opcode_timings_p6_dc[8] = {
     // clang-format off
 /*      FADDd             FMULd             FCOMd             FCOMPd*/
         &load_fadd_op,    &load_fmul_op,    &load_float_op,   &load_float_op,
@@ -1447,7 +1448,7 @@ static const macro_op_t *opcode_timings_dc[8] = {
         &load_float_op,   &load_float_op,   &fdiv_mem_op,     &fdiv_mem_op,
     // clang-format on
 };
-static const macro_op_t *opcode_timings_dc_mod3[8] = {
+static const macro_op_t *opcode_timings_p6_dc_mod3[8] = {
     // clang-format off
 /*      opFADDr           opFMULr*/
         &fadd_op,         &fmul_op,         INVALID,          INVALID,
@@ -1456,7 +1457,7 @@ static const macro_op_t *opcode_timings_dc_mod3[8] = {
     // clang-format on
 };
 
-static const macro_op_t *opcode_timings_dd[8] = {
+static const macro_op_t *opcode_timings_p6_dd[8] = {
     // clang-format off
 /*      FLDd                                    FSTd                 FSTPd*/
         &load_float_op,      INVALID,           &fstore_op,          &fstore_op,
@@ -1464,7 +1465,7 @@ static const macro_op_t *opcode_timings_dd[8] = {
         &complex_float_l_op, INVALID,           &complex_float_l_op, &complex_float_l_op
     // clang-format on
 };
-static const macro_op_t *opcode_timings_dd_mod3[8] = {
+static const macro_op_t *opcode_timings_p6_dd_mod3[8] = {
     // clang-format off
 /*      FFFREE                            FST                FSTP*/
         &float_op,       INVALID,         &float_op,         &float_op,
@@ -1473,7 +1474,7 @@ static const macro_op_t *opcode_timings_dd_mod3[8] = {
     // clang-format on
 };
 
-static const macro_op_t *opcode_timings_de[8] = {
+static const macro_op_t *opcode_timings_p6_de[8] = {
     // clang-format off
 /*      FIADDw            FIMULw            FICOMw            FICOMPw*/
         &load_fiadd_op,   &load_fiadd_op,   &load_fiadd_op,   &load_fiadd_op,
@@ -1481,7 +1482,7 @@ static const macro_op_t *opcode_timings_de[8] = {
         &load_fiadd_op,   &load_fiadd_op,   &load_fiadd_op,   &load_fiadd_op,
     // clang-format on
 };
-static const macro_op_t *opcode_timings_de_mod3[8] = {
+static const macro_op_t *opcode_timings_p6_de_mod3[8] = {
     // clang-format off
 /*      FADDP            FMULP                          FCOMPP*/
         &fadd_op,        &fmul_op,        INVALID,      &float_op,
@@ -1490,7 +1491,7 @@ static const macro_op_t *opcode_timings_de_mod3[8] = {
     // clang-format on
 };
 
-static const macro_op_t *opcode_timings_df[8] = {
+static const macro_op_t *opcode_timings_p6_df[8] = {
     // clang-format off
 /*      FILDiw                              FISTiw               FISTPiw*/
         &load_float_op,   INVALID,          &fstore_op,          &fstore_op,
@@ -1498,7 +1499,7 @@ static const macro_op_t *opcode_timings_df[8] = {
         INVALID,          &load_float_op,   &complex_float_l_op, &fstore_op,
     // clang-format on
 };
-static const macro_op_t *opcode_timings_df_mod3[8] = {
+static const macro_op_t *opcode_timings_p6_df_mod3[8] = {
     // clang-format off
         INVALID,      INVALID,      INVALID,      INVALID,
 /*      FSTSW AX*/
@@ -1844,7 +1845,7 @@ codegen_timing_p6_start(void)
 }
 
 void
-codegen_timing_p6_prefix(uint8_t prefix, uint32_t fetchdat)
+codegen_timing_p6_prefix(uint8_t prefix, UNUSED(uint32_t fetchdat))
 {
     if (prefix != 0x0f)
         decode_timestamp++;
@@ -1854,7 +1855,7 @@ codegen_timing_p6_prefix(uint8_t prefix, uint32_t fetchdat)
 }
 
 void
-codegen_timing_p6_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNUSED(uint32_t op_pc))
+codegen_timing_p6_opcode(uint8_t opcode, UNUSED(uint32_t fetchdat), int op_32, UNUSED(uint32_t op_pc))
 {
     const macro_op_t **ins_table;
     const uint64_t    *deps;
@@ -1864,47 +1865,47 @@ codegen_timing_p6_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNUSED(ui
 
     switch (last_prefix) {
         case 0x0f:
-            ins_table = mod3 ? opcode_timings_0f_mod3 : opcode_timings_0f;
+            ins_table = mod3 ? opcode_timings_p6_0f_mod3 : opcode_timings_p6_0f;
             deps      = mod3 ? opcode_deps_0f_mod3 : opcode_deps_0f;
             break;
 
         case 0xd8:
-            ins_table = mod3 ? opcode_timings_d8_mod3 : opcode_timings_d8;
+            ins_table = mod3 ? opcode_timings_p6_d8_mod3 : opcode_timings_p6_d8;
             deps      = mod3 ? opcode_deps_d8_mod3 : opcode_deps_d8;
             opcode    = (opcode >> 3) & 7;
             break;
         case 0xd9:
-            ins_table = mod3 ? opcode_timings_d9_mod3 : opcode_timings_d9;
+            ins_table = mod3 ? opcode_timings_p6_d9_mod3 : opcode_timings_p6_d9;
             deps      = mod3 ? opcode_deps_d9_mod3 : opcode_deps_d9;
             opcode    = mod3 ? opcode & 0x3f : (opcode >> 3) & 7;
             break;
         case 0xda:
-            ins_table = mod3 ? opcode_timings_da_mod3 : opcode_timings_da;
+            ins_table = mod3 ? opcode_timings_p6_da_mod3 : opcode_timings_p6_da;
             deps      = mod3 ? opcode_deps_da_mod3 : opcode_deps_da;
             opcode    = (opcode >> 3) & 7;
             break;
         case 0xdb:
-            ins_table = mod3 ? opcode_timings_db_mod3 : opcode_timings_db;
+            ins_table = mod3 ? opcode_timings_p6_db_mod3 : opcode_timings_p6_db;
             deps      = mod3 ? opcode_deps_db_mod3 : opcode_deps_db;
             opcode    = mod3 ? opcode & 0x3f : (opcode >> 3) & 7;
             break;
         case 0xdc:
-            ins_table = mod3 ? opcode_timings_dc_mod3 : opcode_timings_dc;
+            ins_table = mod3 ? opcode_timings_p6_dc_mod3 : opcode_timings_p6_dc;
             deps      = mod3 ? opcode_deps_dc_mod3 : opcode_deps_dc;
             opcode    = (opcode >> 3) & 7;
             break;
         case 0xdd:
-            ins_table = mod3 ? opcode_timings_dd_mod3 : opcode_timings_dd;
+            ins_table = mod3 ? opcode_timings_p6_dd_mod3 : opcode_timings_p6_dd;
             deps      = mod3 ? opcode_deps_dd_mod3 : opcode_deps_dd;
             opcode    = (opcode >> 3) & 7;
             break;
         case 0xde:
-            ins_table = mod3 ? opcode_timings_de_mod3 : opcode_timings_de;
+            ins_table = mod3 ? opcode_timings_p6_de_mod3 : opcode_timings_p6_de;
             deps      = mod3 ? opcode_deps_de_mod3 : opcode_deps_de;
             opcode    = (opcode >> 3) & 7;
             break;
         case 0xdf:
-            ins_table = mod3 ? opcode_timings_df_mod3 : opcode_timings_df;
+            ins_table = mod3 ? opcode_timings_p6_df_mod3 : opcode_timings_p6_df;
             deps      = mod3 ? opcode_deps_df_mod3 : opcode_deps_df;
             opcode    = (opcode >> 3) & 7;
             break;
@@ -1913,13 +1914,13 @@ codegen_timing_p6_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNUSED(ui
             switch (opcode) {
                 case 0x80:
                 case 0x82:
-                    ins_table = mod3 ? opcode_timings_80_mod3 : opcode_timings_80;
+                    ins_table = mod3 ? opcode_timings_p6_80_mod3 : opcode_timings_p6_80;
                     deps      = mod3 ? opcode_deps_8x_mod3 : opcode_deps_8x;
                     opcode    = (fetchdat >> 3) & 7;
                     break;
                 case 0x81:
                 case 0x83:
-                    ins_table = mod3 ? opcode_timings_8x_mod3 : opcode_timings_8x;
+                    ins_table = mod3 ? opcode_timings_p6_8x_mod3 : opcode_timings_p6_8x;
                     deps      = mod3 ? opcode_deps_8x_mod3 : opcode_deps_8x;
                     opcode    = (fetchdat >> 3) & 7;
                     break;
@@ -1927,7 +1928,7 @@ codegen_timing_p6_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNUSED(ui
                 case 0xc0:
                 case 0xd0:
                 case 0xd2:
-                    ins_table = mod3 ? opcode_timings_shift_b_mod3 : opcode_timings_shift_b;
+                    ins_table = mod3 ? opcode_timings_p6_shift_b_mod3 : opcode_timings_p6_shift_b;
                     deps      = mod3 ? opcode_deps_shift_mod3 : opcode_deps_shift;
                     opcode    = (fetchdat >> 3) & 7;
                     break;
@@ -1935,29 +1936,29 @@ codegen_timing_p6_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNUSED(ui
                 case 0xc1:
                 case 0xd1:
                 case 0xd3:
-                    ins_table = mod3 ? opcode_timings_shift_mod3 : opcode_timings_shift;
+                    ins_table = mod3 ? opcode_timings_p6_shift_mod3 : opcode_timings_p6_shift;
                     deps      = mod3 ? opcode_deps_shift_mod3 : opcode_deps_shift;
                     opcode    = (fetchdat >> 3) & 7;
                     break;
 
                 case 0xf6:
-                    ins_table = mod3 ? opcode_timings_f6_mod3 : opcode_timings_f6;
+                    ins_table = mod3 ? opcode_timings_p6_f6_mod3 : opcode_timings_p6_f6;
                     deps      = mod3 ? opcode_deps_f6_mod3 : opcode_deps_f6;
                     opcode    = (fetchdat >> 3) & 7;
                     break;
                 case 0xf7:
-                    ins_table = mod3 ? opcode_timings_f7_mod3 : opcode_timings_f7;
+                    ins_table = mod3 ? opcode_timings_p6_f7_mod3 : opcode_timings_p6_f7;
                     deps      = mod3 ? opcode_deps_f7_mod3 : opcode_deps_f7;
                     opcode    = (fetchdat >> 3) & 7;
                     break;
                 case 0xff:
-                    ins_table = mod3 ? opcode_timings_ff_mod3 : opcode_timings_ff;
+                    ins_table = mod3 ? opcode_timings_p6_ff_mod3 : opcode_timings_p6_ff;
                     deps      = mod3 ? opcode_deps_ff_mod3 : opcode_deps_ff;
                     opcode    = (fetchdat >> 3) & 7;
                     break;
 
                 default:
-                    ins_table = mod3 ? opcode_timings_mod3 : opcode_timings;
+                    ins_table = mod3 ? opcode_timings_p6_mod3 : opcode_timings_p6;
                     deps      = mod3 ? opcode_deps_mod3 : opcode_deps;
                     break;
             }
diff --git a/src/cpu/codegen_timing_pentium.c b/src/cpu/codegen_timing_pentium.c
index 3951acc94..aa78ee1c9 100644
--- a/src/cpu/codegen_timing_pentium.c
+++ b/src/cpu/codegen_timing_pentium.c
@@ -21,6 +21,7 @@
 
 #include "x86.h"
 #include "x86_ops.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include "codegen.h"
 #include "codegen_ops.h"
@@ -109,7 +110,7 @@ static uint32_t addr_regmask;
 static int fpu_latency;
 static int fpu_st_latency[8];
 
-static uint64_t opcode_timings[256] = {
+static uint64_t opcode_timings_p6[256] = {
     // clang-format off
 /*      ADD                    ADD                    ADD                   ADD*/
 /*00*/  PAIR_UV | CYCLES_RMW,  PAIR_UV | CYCLES_RMW,  PAIR_UV | CYCLES_RM,  PAIR_UV | CYCLES_RM,
@@ -246,7 +247,7 @@ static uint64_t opcode_timings[256] = {
     // clang-format on
 };
 
-static uint64_t opcode_timings_mod3[256] = {
+static uint64_t opcode_timings_p6_mod3[256] = {
     // clang-format off
 /*      ADD                       ADD                       ADD                       ADD*/
 /*00*/  PAIR_UV | CYCLES_REG,     PAIR_UV | CYCLES_REG,     PAIR_UV | CYCLES_REG,     PAIR_UV | CYCLES_REG,
@@ -384,7 +385,7 @@ static uint64_t opcode_timings_mod3[256] = {
     // clang-format on
 };
 
-static uint64_t opcode_timings_0f[256] = {
+static uint64_t opcode_timings_p6_0f[256] = {
     // clang-format off
 /*00*/  PAIR_NP | CYCLES(20),    PAIR_NP | CYCLES(11),           PAIR_NP | CYCLES(11),           PAIR_NP | CYCLES(10),
         INVALID,                 PAIR_NP | CYCLES(195),          PAIR_NP | CYCLES(7),            INVALID,
@@ -467,7 +468,7 @@ static uint64_t opcode_timings_0f[256] = {
         PAIR_U | CYCLES_RM,     PAIR_U | CYCLES_RM,     PAIR_U | CYCLES_RM,     INVALID,
     // clang-format on
 };
-static uint64_t opcode_timings_0f_mod3[256] = {
+static uint64_t opcode_timings_p6_0f_mod3[256] = {
     // clang-format off
 /*00*/  PAIR_NP | CYCLES(20),   PAIR_NP | CYCLES(11),           PAIR_NP | CYCLES(11),           PAIR_NP | CYCLES(10),
         INVALID,                PAIR_NP | CYCLES(195),          PAIR_NP | CYCLES(7),            INVALID,
@@ -551,20 +552,20 @@ static uint64_t opcode_timings_0f_mod3[256] = {
     // clang-format on
 };
 
-static uint64_t opcode_timings_shift[8] = {
+static uint64_t opcode_timings_p6_shift[8] = {
     // clang-format off
         PAIR_U | CYCLES_RMW,    PAIR_U | CYCLES_RMW,    PAIR_U | CYCLES_RMW,    PAIR_U | CYCLES_RMW,
         PAIR_U | CYCLES_RMW,    PAIR_U | CYCLES_RMW,    PAIR_U | CYCLES_RMW,    PAIR_U | CYCLES_RMW,
     // clang-format on
 };
-static uint64_t opcode_timings_shift_mod3[8] = {
+static uint64_t opcode_timings_p6_shift_mod3[8] = {
     // clang-format off
         PAIR_U | CYCLES_REG,    PAIR_U | CYCLES_REG,    PAIR_U | CYCLES_REG,    PAIR_U | CYCLES_REG,
         PAIR_U | CYCLES_REG,    PAIR_U | CYCLES_REG,    PAIR_U | CYCLES_REG,    PAIR_U | CYCLES_REG,
     // clang-format on
 };
 
-static uint64_t opcode_timings_f6[8] = {
+static uint64_t opcode_timings_p6_f6[8] = {
     // clang-format off
 /*      TST                                             NOT                     NEG*/
         PAIR_UV | CYCLES_RM,    INVALID,                PAIR_NP | CYCLES(3),    PAIR_NP | CYCLES(3),
@@ -572,7 +573,7 @@ static uint64_t opcode_timings_f6[8] = {
         PAIR_NP | CYCLES(11),   PAIR_NP | CYCLES(11),   PAIR_NP | CYCLES(17),   PAIR_NP | CYCLES(22)
     // clang-format on
 };
-static uint64_t opcode_timings_f6_mod3[8] = {
+static uint64_t opcode_timings_p6_f6_mod3[8] = {
     // clang-format off
 /*      TST                                             NOT                     NEG*/
         PAIR_UV | CYCLES_REG,   INVALID,                PAIR_NP | CYCLES(3),    PAIR_NP | CYCLES(3),
@@ -580,7 +581,7 @@ static uint64_t opcode_timings_f6_mod3[8] = {
         PAIR_NP | CYCLES(11),   PAIR_NP | CYCLES(11),   PAIR_NP | CYCLES(17),   PAIR_NP | CYCLES(22)
     // clang-format on
 };
-static uint64_t opcode_timings_f7[8] = {
+static uint64_t opcode_timings_p6_f7[8] = {
     // clang-format off
 /*      TST                                                             NOT                             NEG*/
         PAIR_UV | CYCLES_RM,            INVALID,                        PAIR_NP | CYCLES(3),            PAIR_NP | CYCLES(3),
@@ -588,7 +589,7 @@ static uint64_t opcode_timings_f7[8] = {
         PAIR_NP | CYCLES_MULTI(11,10),  PAIR_NP | CYCLES_MULTI(11,10),  PAIR_NP | CYCLES_MULTI(25,41),  PAIR_NP | CYCLES_MULTI(30,46)
     // clang-format on
 };
-static uint64_t opcode_timings_f7_mod3[8] = {
+static uint64_t opcode_timings_p6_f7_mod3[8] = {
     // clang-format off
 /*      TST                                                             NOT                             NEG*/
         PAIR_UV | CYCLES_REG,           INVALID,                        PAIR_NP | CYCLES(3),            PAIR_NP | CYCLES(3),
@@ -596,7 +597,7 @@ static uint64_t opcode_timings_f7_mod3[8] = {
         PAIR_NP | CYCLES_MULTI(11,10),  PAIR_NP | CYCLES_MULTI(11,10),  PAIR_NP | CYCLES_MULTI(25,41),  PAIR_NP | CYCLES_MULTI(30,46)
     // clang-format on
 };
-static uint64_t opcode_timings_ff[8] = {
+static uint64_t opcode_timings_p6_ff[8] = {
     // clang-format off
 /*      INC                     DEC                     CALL                 CALL far*/
         PAIR_UV | CYCLES_RMW,   PAIR_UV | CYCLES_RMW,   PAIR_NP | CYCLES(4),  PAIR_NP | CYCLES(0),
@@ -604,7 +605,7 @@ static uint64_t opcode_timings_ff[8] = {
         PAIR_NP | CYCLES(2),    PAIR_NP | CYCLES(0),    PAIR_NP | CYCLES(2),  INVALID
     // clang-format on
 };
-static uint64_t opcode_timings_ff_mod3[8] = {
+static uint64_t opcode_timings_p6_ff_mod3[8] = {
     // clang-format off
 /*      INC                     DEC                     CALL                    CALL far*/
         PAIR_UV | CYCLES_REG,   PAIR_UV | CYCLES_REG,   PAIR_NP | CYCLES(4),    PAIR_NP | CYCLES(0),
@@ -613,7 +614,7 @@ static uint64_t opcode_timings_ff_mod3[8] = {
     // clang-format on
 };
 
-static uint64_t opcode_timings_d8[8] = {
+static uint64_t opcode_timings_p6_d8[8] = {
     // clang-format off
 /*      FADDs                         FMULs                         FCOMs                           FCOMPs*/
         PAIR_FX | FPU_CYCLES(3,2,2),  PAIR_FX | FPU_CYCLES(3,2,2),  PAIR_FX | FPU_CYCLES(1,0,0),    PAIR_FX | FPU_CYCLES(1,0,0),
@@ -621,7 +622,7 @@ static uint64_t opcode_timings_d8[8] = {
         PAIR_FX | FPU_CYCLES(3,2,2),  PAIR_FX | FPU_CYCLES(3,2,2),  PAIR_FX | FPU_CYCLES(39,38,2),  PAIR_FX | FPU_CYCLES(39,38,2)
     // clang-format on
 };
-static uint64_t opcode_timings_d8_mod3[8] = {
+static uint64_t opcode_timings_p6_d8_mod3[8] = {
     // clang-format off
 /*      FADD                            FMUL                            FCOM                            FCOMP*/
         PAIR_FX | FPU_CYCLES(3,2,2),    PAIR_FX | FPU_CYCLES(3,2,2),    PAIR_FX | FPU_CYCLES(1,0,0),    PAIR_FX | FPU_CYCLES(1,0,0),
@@ -630,7 +631,7 @@ static uint64_t opcode_timings_d8_mod3[8] = {
     // clang-format on
 };
 
-static uint64_t opcode_timings_d9[8] = {
+static uint64_t opcode_timings_p6_d9[8] = {
     // clang-format off
 /*      FLDs                                                         FSTs                           FSTPs*/
         PAIR_FX | FPU_CYCLES(1,0,0),   INVALID,                      PAIR_NP | FPU_CYCLES(2,0,0),   PAIR_NP | FPU_CYCLES(2,0,0),
@@ -638,7 +639,7 @@ static uint64_t opcode_timings_d9[8] = {
         PAIR_NP | FPU_CYCLES(32,0,0),  PAIR_NP | FPU_CYCLES(8,0,0),  PAIR_NP | FPU_CYCLES(48,0,0),  PAIR_NP | FPU_CYCLES(2,0,0)
     // clang-format on
 };
-static uint64_t opcode_timings_d9_mod3[64] = {
+static uint64_t opcode_timings_p6_d9_mod3[64] = {
     // clang-format off
         /*FLD*/
         PAIR_FX | FPU_CYCLES(1,0,0),  PAIR_FX | FPU_CYCLES(1,0,0),  PAIR_FX | FPU_CYCLES(1,0,0),  PAIR_FX | FPU_CYCLES(1,0,0),
@@ -671,7 +672,7 @@ static uint64_t opcode_timings_d9_mod3[64] = {
     // clang-format on
 };
 
-static uint64_t opcode_timings_da[8] = {
+static uint64_t opcode_timings_p6_da[8] = {
     // clang-format off
 /*      FIADDl                        FIMULl                        FICOMl                          FICOMPl*/
         PAIR_NP | FPU_CYCLES(6,2,2),  PAIR_NP | FPU_CYCLES(6,2,2),  PAIR_NP | FPU_CYCLES(4,0,0),    PAIR_NP | FPU_CYCLES(4,0,0),
@@ -679,7 +680,7 @@ static uint64_t opcode_timings_da[8] = {
         PAIR_NP | FPU_CYCLES(6,2,2),  PAIR_NP | FPU_CYCLES(6,2,2),  PAIR_NP | FPU_CYCLES(42,38,2),  PAIR_NP | FPU_CYCLES(42,38,2)
     // clang-format on
 };
-static uint64_t opcode_timings_da_mod3[8] = {
+static uint64_t opcode_timings_p6_da_mod3[8] = {
     // clang-format off
         INVALID,                INVALID,                        INVALID,                INVALID,
 /*                              FCOMPP*/
@@ -687,7 +688,7 @@ static uint64_t opcode_timings_da_mod3[8] = {
     // clang-format on
 };
 
-static uint64_t opcode_timings_db[8] = {
+static uint64_t opcode_timings_p6_db[8] = {
     // clang-format off
 /*      FLDil                                                       FSTil                         FSTPil*/
         PAIR_NP | FPU_CYCLES(3,2,2),  INVALID,                      PAIR_NP | FPU_CYCLES(6,0,0),  PAIR_NP | FPU_CYCLES(6,0,0),
@@ -695,7 +696,7 @@ static uint64_t opcode_timings_db[8] = {
         INVALID,                      PAIR_NP | FPU_CYCLES(3,0,0),  INVALID,                      PAIR_NP | FPU_CYCLES(3,0,0)
     // clang-format on
 };
-static uint64_t opcode_timings_db_mod3[64] = {
+static uint64_t opcode_timings_p6_db_mod3[64] = {
     // clang-format off
         INVALID,                INVALID,                INVALID,                INVALID,
         INVALID,                INVALID,                INVALID,                INVALID,
@@ -725,7 +726,7 @@ static uint64_t opcode_timings_db_mod3[64] = {
     // clang-format on
 };
 
-static uint64_t opcode_timings_dc[8] = {
+static uint64_t opcode_timings_p6_dc[8] = {
     // clang-format off
 /*      FADDd                         FMULd                         FCOMd                           FCOMPd*/
         PAIR_FX | FPU_CYCLES(3,2,2),  PAIR_FX | FPU_CYCLES(3,2,2),  PAIR_FX | FPU_CYCLES(1,0,0),    PAIR_FX | FPU_CYCLES(1,0,0),
@@ -733,7 +734,7 @@ static uint64_t opcode_timings_dc[8] = {
         PAIR_FX | FPU_CYCLES(3,2,2),  PAIR_FX | FPU_CYCLES(3,2,2),  PAIR_FX | FPU_CYCLES(39,38,2),  PAIR_FX | FPU_CYCLES(39,38,2)
     // clang-format on
 };
-static uint64_t opcode_timings_dc_mod3[8] = {
+static uint64_t opcode_timings_p6_dc_mod3[8] = {
     // clang-format off
 /*      opFADDr                         opFMULr*/
         PAIR_FX | FPU_CYCLES(3,2,2),    PAIR_FX | FPU_CYCLES(3,2,2),    INVALID,                         INVALID,
@@ -742,7 +743,7 @@ static uint64_t opcode_timings_dc_mod3[8] = {
     // clang-format on
 };
 
-static uint64_t opcode_timings_dd[8] = {
+static uint64_t opcode_timings_p6_dd[8] = {
     // clang-format off
 /*      FLDd                                                FSTd                            FSTPd*/
         PAIR_FX | FPU_CYCLES(1,0,0),  INVALID,              PAIR_NP | FPU_CYCLES(2,0,0),    PAIR_NP | FPU_CYCLES(2,0,0),
@@ -750,7 +751,7 @@ static uint64_t opcode_timings_dd[8] = {
         PAIR_NP | FPU_CYCLES(70,0,0), INVALID,              PAIR_NP | FPU_CYCLES(127,0,0),  PAIR_NP | FPU_CYCLES(6,0,0)
     // clang-format on
 };
-static uint64_t opcode_timings_dd_mod3[8] = {
+static uint64_t opcode_timings_p6_dd_mod3[8] = {
     // clang-format off
 /*      FFFREE                                                        FST                             FSTP*/
         PAIR_NP | FPU_CYCLES(2,0,0),    INVALID,                      PAIR_NP | FPU_CYCLES(1,0,0),    PAIR_NP | FPU_CYCLES(1,0,0),
@@ -759,7 +760,7 @@ static uint64_t opcode_timings_dd_mod3[8] = {
     // clang-format on
 };
 
-static uint64_t opcode_timings_de[8] = {
+static uint64_t opcode_timings_p6_de[8] = {
     // clang-format off
 /*      FIADDw                        FIMULw                        FICOMw                          FICOMPw*/
         PAIR_NP | FPU_CYCLES(6,2,2),  PAIR_NP | FPU_CYCLES(6,2,2),  PAIR_NP | FPU_CYCLES(4,0,0),    PAIR_NP | FPU_CYCLES(4,0,0),
@@ -767,7 +768,7 @@ static uint64_t opcode_timings_de[8] = {
         PAIR_NP | FPU_CYCLES(6,2,2),  PAIR_NP | FPU_CYCLES(6,2,2),  PAIR_NP | FPU_CYCLES(42,38,2),  PAIR_NP | FPU_CYCLES(42,38,2)
     // clang-format on
 };
-static uint64_t opcode_timings_de_mod3[8] = {
+static uint64_t opcode_timings_p6_de_mod3[8] = {
     // clang-format off
 /*      FADDP                         FMULP                                                          FCOMPP*/
         PAIR_FX | FPU_CYCLES(3,2,2),  PAIR_FX | FPU_CYCLES(3,2,2),   INVALID,                        PAIR_FX | FPU_CYCLES(1,0,0),
@@ -776,7 +777,7 @@ static uint64_t opcode_timings_de_mod3[8] = {
     // clang-format on
 };
 
-static uint64_t opcode_timings_df[8] = {
+static uint64_t opcode_timings_p6_df[8] = {
     // clang-format off
 /*      FILDiw                                                      FISTiw                          FISTPiw*/
         PAIR_NP | FPU_CYCLES(3,2,2),  INVALID,                      PAIR_NP | FPU_CYCLES(6,0,0),    PAIR_NP | FPU_CYCLES(6,0,0),
@@ -784,7 +785,7 @@ static uint64_t opcode_timings_df[8] = {
         INVALID,                      PAIR_NP | FPU_CYCLES(3,2,2),  PAIR_NP | FPU_CYCLES(148,0,0),  PAIR_NP | FPU_CYCLES(6,0,0)
     // clang-format on
 };
-static uint64_t opcode_timings_df_mod3[8] = {
+static uint64_t opcode_timings_p6_df_mod3[8] = {
     // clang-format off
         INVALID,                        INVALID,                INVALID,                INVALID,
 /*      FSTSW AX*/
@@ -792,25 +793,25 @@ static uint64_t opcode_timings_df_mod3[8] = {
     // clang-format on
 };
 
-static uint64_t opcode_timings_81[8] = {
+static uint64_t opcode_timings_p6_81[8] = {
     // clang-format off
         PAIR_UV | CYCLES_RMW | CYCLES_IMM1632,  PAIR_UV | CYCLES_RMW | CYCLES_IMM1632,  PAIR_UV | CYCLES_RMW | CYCLES_IMM1632,  PAIR_UV | CYCLES_RMW | CYCLES_IMM1632,
         PAIR_UV | CYCLES_RMW | CYCLES_IMM1632,  PAIR_UV | CYCLES_RMW | CYCLES_IMM1632,  PAIR_UV | CYCLES_RMW | CYCLES_IMM1632,  PAIR_UV | CYCLES_RM | CYCLES_IMM1632
     // clang-format on
 };
-static uint64_t opcode_timings_81_mod3[8] = {
+static uint64_t opcode_timings_p6_81_mod3[8] = {
     // clang-format off
         PAIR_UV | CYCLES_REG,  PAIR_UV | CYCLES_REG,  PAIR_UV | CYCLES_REG,  PAIR_UV | CYCLES_REG,
         PAIR_UV | CYCLES_REG,  PAIR_UV | CYCLES_REG,  PAIR_UV | CYCLES_REG,  PAIR_UV | CYCLES_REG
     // clang-format on
 };
-static uint64_t opcode_timings_8x[8] = {
+static uint64_t opcode_timings_p6_8x[8] = {
     // clang-format off
         PAIR_UV | CYCLES_RMW | CYCLES_IMM8,  PAIR_UV | CYCLES_RMW | CYCLES_IMM8,  PAIR_UV | CYCLES_RMW | CYCLES_IMM8,  PAIR_UV | CYCLES_RMW | CYCLES_IMM8,
         PAIR_UV | CYCLES_RMW | CYCLES_IMM8,  PAIR_UV | CYCLES_RMW | CYCLES_IMM8,  PAIR_UV | CYCLES_RMW | CYCLES_IMM8,  PAIR_UV | CYCLES_RM | CYCLES_IMM8
     // clang-format on
 };
-static uint64_t opcode_timings_8x_mod3[8] = {
+static uint64_t opcode_timings_p6_8x_mod3[8] = {
     // clang-format off
         PAIR_UV | CYCLES_REG,  PAIR_UV | CYCLES_REG,  PAIR_UV | CYCLES_REG,  PAIR_UV | CYCLES_REG,
         PAIR_UV | CYCLES_REG,  PAIR_UV | CYCLES_REG,  PAIR_UV | CYCLES_REG,  PAIR_UV | CYCLES_REG
@@ -1096,47 +1097,47 @@ codegen_timing_pentium_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNUS
 
     switch (last_prefix) {
         case 0x0f:
-            timings = mod3 ? opcode_timings_0f_mod3 : opcode_timings_0f;
+            timings = mod3 ? opcode_timings_p6_0f_mod3 : opcode_timings_p6_0f;
             deps    = mod3 ? opcode_deps_0f_mod3 : opcode_deps_0f;
             break;
 
         case 0xd8:
-            timings = mod3 ? opcode_timings_d8_mod3 : opcode_timings_d8;
+            timings = mod3 ? opcode_timings_p6_d8_mod3 : opcode_timings_p6_d8;
             deps    = mod3 ? opcode_deps_d8_mod3 : opcode_deps_d8;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xd9:
-            timings = mod3 ? opcode_timings_d9_mod3 : opcode_timings_d9;
+            timings = mod3 ? opcode_timings_p6_d9_mod3 : opcode_timings_p6_d9;
             deps    = mod3 ? opcode_deps_d9_mod3 : opcode_deps_d9;
             opcode  = mod3 ? opcode & 0x3f : (opcode >> 3) & 7;
             break;
         case 0xda:
-            timings = mod3 ? opcode_timings_da_mod3 : opcode_timings_da;
+            timings = mod3 ? opcode_timings_p6_da_mod3 : opcode_timings_p6_da;
             deps    = mod3 ? opcode_deps_da_mod3 : opcode_deps_da;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xdb:
-            timings = mod3 ? opcode_timings_db_mod3 : opcode_timings_db;
+            timings = mod3 ? opcode_timings_p6_db_mod3 : opcode_timings_p6_db;
             deps    = mod3 ? opcode_deps_db_mod3 : opcode_deps_db;
             opcode  = mod3 ? opcode & 0x3f : (opcode >> 3) & 7;
             break;
         case 0xdc:
-            timings = mod3 ? opcode_timings_dc_mod3 : opcode_timings_dc;
+            timings = mod3 ? opcode_timings_p6_dc_mod3 : opcode_timings_p6_dc;
             deps    = mod3 ? opcode_deps_dc_mod3 : opcode_deps_dc;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xdd:
-            timings = mod3 ? opcode_timings_dd_mod3 : opcode_timings_dd;
+            timings = mod3 ? opcode_timings_p6_dd_mod3 : opcode_timings_p6_dd;
             deps    = mod3 ? opcode_deps_dd_mod3 : opcode_deps_dd;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xde:
-            timings = mod3 ? opcode_timings_de_mod3 : opcode_timings_de;
+            timings = mod3 ? opcode_timings_p6_de_mod3 : opcode_timings_p6_de;
             deps    = mod3 ? opcode_deps_de_mod3 : opcode_deps_de;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xdf:
-            timings = mod3 ? opcode_timings_df_mod3 : opcode_timings_df;
+            timings = mod3 ? opcode_timings_p6_df_mod3 : opcode_timings_p6_df;
             deps    = mod3 ? opcode_deps_df_mod3 : opcode_deps_df;
             opcode  = (opcode >> 3) & 7;
             break;
@@ -1146,12 +1147,12 @@ codegen_timing_pentium_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNUS
                 case 0x80:
                 case 0x82:
                 case 0x83:
-                    timings = mod3 ? opcode_timings_8x_mod3 : opcode_timings_8x;
+                    timings = mod3 ? opcode_timings_p6_8x_mod3 : opcode_timings_p6_8x;
                     deps    = mod3 ? opcode_deps_8x_mod3 : opcode_deps_8x;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
                 case 0x81:
-                    timings = mod3 ? opcode_timings_81_mod3 : opcode_timings_81;
+                    timings = mod3 ? opcode_timings_p6_81_mod3 : opcode_timings_p6_81;
                     deps    = mod3 ? opcode_deps_81_mod3 : opcode_deps_81;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
@@ -1160,36 +1161,36 @@ codegen_timing_pentium_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNUS
                 case 0xc1:
                 case 0xd0:
                 case 0xd1:
-                    timings = mod3 ? opcode_timings_shift_mod3 : opcode_timings_shift;
+                    timings = mod3 ? opcode_timings_p6_shift_mod3 : opcode_timings_p6_shift;
                     deps    = mod3 ? opcode_deps_shift_mod3 : opcode_deps_shift;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
 
                 case 0xd2:
                 case 0xd3:
-                    timings = mod3 ? opcode_timings_shift_mod3 : opcode_timings_shift;
+                    timings = mod3 ? opcode_timings_p6_shift_mod3 : opcode_timings_p6_shift;
                     deps    = mod3 ? opcode_deps_shift_cl_mod3 : opcode_deps_shift_cl;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
 
                 case 0xf6:
-                    timings = mod3 ? opcode_timings_f6_mod3 : opcode_timings_f6;
+                    timings = mod3 ? opcode_timings_p6_f6_mod3 : opcode_timings_p6_f6;
                     deps    = mod3 ? opcode_deps_f6_mod3 : opcode_deps_f6;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
                 case 0xf7:
-                    timings = mod3 ? opcode_timings_f7_mod3 : opcode_timings_f7;
+                    timings = mod3 ? opcode_timings_p6_f7_mod3 : opcode_timings_p6_f7;
                     deps    = mod3 ? opcode_deps_f7_mod3 : opcode_deps_f7;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
                 case 0xff:
-                    timings = mod3 ? opcode_timings_ff_mod3 : opcode_timings_ff;
+                    timings = mod3 ? opcode_timings_p6_ff_mod3 : opcode_timings_p6_ff;
                     deps    = mod3 ? opcode_deps_ff_mod3 : opcode_deps_ff;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
 
                 default:
-                    timings = mod3 ? opcode_timings_mod3 : opcode_timings;
+                    timings = mod3 ? opcode_timings_p6_mod3 : opcode_timings_p6;
                     deps    = mod3 ? opcode_deps_mod3 : opcode_deps;
                     break;
             }
diff --git a/src/cpu/codegen_timing_winchip.c b/src/cpu/codegen_timing_winchip.c
index 11dd912b4..0d39f4151 100644
--- a/src/cpu/codegen_timing_winchip.c
+++ b/src/cpu/codegen_timing_winchip.c
@@ -9,6 +9,7 @@
 
 #include "x86.h"
 #include "x86_ops.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include "codegen.h"
 #include "codegen_ops.h"
@@ -17,7 +18,7 @@
 #define CYCLES(c)         (int *) c
 #define CYCLES2(c16, c32) (int *) ((-1 & ~0xffff) | c16 | (c32 << 8))
 
-static int *opcode_timings[256] = {
+static int *opcode_timings_winchip[256] = {
     // clang-format off
 /*00*/  &timing_mr,     &timing_mr,     &timing_rm,     &timing_rm,     &timing_rr,     &timing_rr,     CYCLES(2),      CYCLES(3),      &timing_mr,     &timing_mr,     &timing_rm,     &timing_rm,     &timing_rr,     &timing_rr,     CYCLES(2),      NULL,
 /*10*/  &timing_mr,     &timing_mr,     &timing_rm,     &timing_rm,     &timing_rr,     &timing_rr,     CYCLES(2),      CYCLES(3),      &timing_mr,     &timing_mr,     &timing_rm,     &timing_rm,     &timing_rr,     &timing_rr,     CYCLES(2),      CYCLES(3),
@@ -41,7 +42,7 @@ static int *opcode_timings[256] = {
     // clang-format on
 };
 
-static int *opcode_timings_mod3[256] = {
+static int *opcode_timings_winchip_mod3[256] = {
     // clang-format off
 /*00*/  &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     CYCLES(2),      CYCLES(3),      &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     CYCLES(2),      NULL,
 /*10*/  &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     CYCLES(2),      CYCLES(3),      &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     &timing_rr,     CYCLES(2),      CYCLES(3),
@@ -65,7 +66,7 @@ static int *opcode_timings_mod3[256] = {
     // clang-format on
 };
 
-static int *opcode_timings_0f[256] = {
+static int *opcode_timings_winchip_0f[256] = {
     // clang-format off
 /*00*/  CYCLES(20),     CYCLES(11),     CYCLES(11),     CYCLES(10),     NULL,           CYCLES(195),    CYCLES(7),      NULL,           CYCLES(1000),   CYCLES(10000),  NULL,           NULL,           NULL,           NULL,           NULL,           NULL,
 /*10*/  NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,
@@ -88,7 +89,7 @@ static int *opcode_timings_0f[256] = {
 /*f0*/  NULL,           &timing_rm,     &timing_rm,     &timing_rm,     NULL,           &timing_rm,     NULL,           NULL,           &timing_rm,     &timing_rm,     &timing_rm,     NULL,           &timing_rm,     &timing_rm,     &timing_rm,     NULL,
     // clang-format on
 };
-static int *opcode_timings_0f_mod3[256] = {
+static int *opcode_timings_winchip_0f_mod3[256] = {
     // clang-format off
 /*00*/  CYCLES(20),     CYCLES(11),     CYCLES(11),     CYCLES(10),     NULL,           CYCLES(195),    CYCLES(7),      NULL,           CYCLES(1000),   CYCLES(10000),  NULL,           NULL,           NULL,           NULL,           NULL,           NULL,
 /*10*/  NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,
@@ -112,68 +113,68 @@ static int *opcode_timings_0f_mod3[256] = {
     // clang-format on
 };
 
-static int *opcode_timings_shift[8] = {
+static int *opcode_timings_winchip_shift[8] = {
     // clang-format off
         CYCLES(7),      CYCLES(7),      CYCLES(10),     CYCLES(10),     CYCLES(7),      CYCLES(7),      CYCLES(7),      CYCLES(7)
     // clang-format on
 };
-static int *opcode_timings_shift_mod3[8] = {
+static int *opcode_timings_winchip_shift_mod3[8] = {
     // clang-format off
         CYCLES(3),      CYCLES(3),      CYCLES(9),      CYCLES(9),      CYCLES(3),      CYCLES(3),      CYCLES(3),      CYCLES(3)
     // clang-format on
 };
 
-static int *opcode_timings_f6[8] = {
+static int *opcode_timings_winchip_f6[8] = {
     // clang-format off
         &timing_rm,     NULL,           &timing_mm,     &timing_mm,     CYCLES(13),     CYCLES(14),     CYCLES(16),     CYCLES(19)
     // clang-format on
 };
-static int *opcode_timings_f6_mod3[8] = {
+static int *opcode_timings_winchip_f6_mod3[8] = {
     // clang-format off
         &timing_rr,     NULL,           &timing_rr,     &timing_rr,     CYCLES(13),     CYCLES(14),     CYCLES(16),     CYCLES(19)
     // clang-format on
 };
-static int *opcode_timings_f7[8] = {
+static int *opcode_timings_winchip_f7[8] = {
     // clang-format off
         &timing_rm,     NULL,           &timing_mm,     &timing_mm,     CYCLES(21),     CYCLES2(22,38), CYCLES2(24,40), CYCLES2(27,43)
     // clang-format on
 };
-static int *opcode_timings_f7_mod3[8] = {
+static int *opcode_timings_winchip_f7_mod3[8] = {
     // clang-format off
         &timing_rr,     NULL,           &timing_rr,     &timing_rr,     CYCLES(21),     CYCLES2(22,38), CYCLES2(24,40), CYCLES2(27,43)
     // clang-format on
 };
-static int *opcode_timings_ff[8] = {
+static int *opcode_timings_winchip_ff[8] = {
     // clang-format off
         &timing_mm,     &timing_mm,     CYCLES(5),      CYCLES(0),      CYCLES(5),      CYCLES(0),      CYCLES(5),      NULL
     // clang-format on
 };
-static int *opcode_timings_ff_mod3[8] = {
+static int *opcode_timings_winchip_ff_mod3[8] = {
     // clang-format off
         &timing_rr,     &timing_rr,     CYCLES(5),      CYCLES(0),      CYCLES(5),      CYCLES(0),      CYCLES(5),      NULL
     // clang-format on
 };
 
-static int *opcode_timings_d8[8] = {
+static int *opcode_timings_winchip_d8[8] = {
     // clang-format off
 /*      FADDil          FMULil          FCOMil          FCOMPil         FSUBil          FSUBRil         FDIVil          FDIVRil*/
         CYCLES(10),     CYCLES(12),     CYCLES(9),      CYCLES(9),      CYCLES(10),     CYCLES(10),     CYCLES(78),     CYCLES(78)
     // clang-format on
 };
-static int *opcode_timings_d8_mod3[8] = {
+static int *opcode_timings_winchip_d8_mod3[8] = {
     // clang-format off
 /*      FADD            FMUL            FCOM            FCOMP           FSUB            FSUBR           FDIV            FDIVR*/
         CYCLES(4),      CYCLES(6),      CYCLES(3),      CYCLES(3),      CYCLES(4),      CYCLES(4),      CYCLES(72),     CYCLES(72)
     // clang-format on
 };
 
-static int *opcode_timings_d9[8] = {
+static int *opcode_timings_winchip_d9[8] = {
     // clang-format off
 /*      FLDs                            FSTs            FSTPs           FLDENV          FLDCW           FSTENV          FSTCW*/
         CYCLES(2),      NULL,           CYCLES(7),      CYCLES(7),      CYCLES(34),     CYCLES(4),      CYCLES(67),     CYCLES(3)
     // clang-format on
 };
-static int *opcode_timings_d9_mod3[64] = {
+static int *opcode_timings_winchip_d9_mod3[64] = {
     // clang-format off
         /*FLD*/
         CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(1),
@@ -194,25 +195,25 @@ static int *opcode_timings_d9_mod3[64] = {
     // clang-format on
 };
 
-static int *opcode_timings_da[8] = {
+static int *opcode_timings_winchip_da[8] = {
     // clang-format off
 /*      FADDil          FMULil          FCOMil          FCOMPil         FSUBil          FSUBRil         FDIVil          FDIVRil*/
         CYCLES(10),     CYCLES(12),     CYCLES(9),      CYCLES(9),      CYCLES(10),     CYCLES(10),     CYCLES(78),     CYCLES(78)
     // clang-format on
 };
-static int *opcode_timings_da_mod3[8] = {
+static int *opcode_timings_winchip_da_mod3[8] = {
     // clang-format off
         NULL,           NULL,           NULL,           NULL,           NULL,           CYCLES(5),      NULL,           NULL
     // clang-format on
 };
 
-static int *opcode_timings_db[8] = {
+static int *opcode_timings_winchip_db[8] = {
     // clang-format off
 /*      FLDil                           FSTil           FSTPil                          FLDe                            FSTPe*/
         CYCLES(6),      NULL,           CYCLES(7),      CYCLES(7),      NULL,           CYCLES(8),      NULL,           CYCLES(8)
     // clang-format on
 };
-static int *opcode_timings_db_mod3[64] = {
+static int *opcode_timings_winchip_db_mod3[64] = {
     // clang-format off
         NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,
         NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,           NULL,
@@ -226,71 +227,71 @@ static int *opcode_timings_db_mod3[64] = {
     // clang-format on
 };
 
-static int *opcode_timings_dc[8] = {
+static int *opcode_timings_winchip_dc[8] = {
     // clang-format off
 /*      opFADDd_a16     opFMULd_a16     opFCOMd_a16     opFCOMPd_a16    opFSUBd_a16     opFSUBRd_a16    opFDIVd_a16     opFDIVRd_a16*/
         CYCLES(6),      CYCLES(8),      CYCLES(5),      CYCLES(5),      CYCLES(6),      CYCLES(6),      CYCLES(74),     CYCLES(74)
     // clang-format on
 };
-static int *opcode_timings_dc_mod3[8] = {
+static int *opcode_timings_winchip_dc_mod3[8] = {
     // clang-format off
 /*      opFADDr         opFMULr                                         opFSUBRr        opFSUBr         opFDIVRr        opFDIVr*/
         CYCLES(4),      CYCLES(6),      NULL,           NULL,           CYCLES(4),      CYCLES(4),      CYCLES(72),     CYCLES(72)
     // clang-format on
 };
 
-static int *opcode_timings_dd[8] = {
+static int *opcode_timings_winchip_dd[8] = {
     // clang-format off
 /*      FLDd                            FSTd            FSTPd           FRSTOR                           FSAVE          FSTSW*/
         CYCLES(2),      NULL,           CYCLES(8),      CYCLES(8),      CYCLES(131),     NULL,           CYCLES(154),   CYCLES(5)
     // clang-format on
 };
-static int *opcode_timings_dd_mod3[8] = {
+static int *opcode_timings_winchip_dd_mod3[8] = {
     // clang-format off
 /*      FFFREE                          FST             FSTP            FUCOM            FUCOMP*/
         CYCLES(3),      NULL,           CYCLES(1),      CYCLES(1),      CYCLES(3),       CYCLES(3),      NULL,          NULL
     // clang-format on
 };
 
-static int *opcode_timings_de[8] = {
+static int *opcode_timings_winchip_de[8] = {
     // clang-format off
 /*      FADDiw          FMULiw          FCOMiw          FCOMPiw         FSUBil          FSUBRil         FDIVil          FDIVRil*/
         CYCLES(10),     CYCLES(12),     CYCLES(9),      CYCLES(9),      CYCLES(10),     CYCLES(10),     CYCLES(78),     CYCLES(78)
     // clang-format on
 };
-static int *opcode_timings_de_mod3[8] = {
+static int *opcode_timings_winchip_de_mod3[8] = {
     // clang-format off
 /*      FADD            FMUL                            FCOMPP          FSUB            FSUBR           FDIV            FDIVR*/
         CYCLES(4),      CYCLES(6),      NULL,           CYCLES(3),      CYCLES(4),      CYCLES(4),      CYCLES(72),     CYCLES(72)
     // clang-format on
 };
 
-static int *opcode_timings_df[8] = {
+static int *opcode_timings_winchip_df[8] = {
     // clang-format off
 /*      FILDiw                          FISTiw          FISTPiw                          FILDiq          FBSTP          FISTPiq*/
         CYCLES(6),      NULL,           CYCLES(7),      CYCLES(7),      NULL,            CYCLES(8),      CYCLES(172),   CYCLES(8)
     // clang-format on
 };
-static int *opcode_timings_df_mod3[8] = {
+static int *opcode_timings_winchip_df_mod3[8] = {
     // clang-format off
 /*      FFREE                           FST             FSTP            FUCOM            FUCOMP*/
         CYCLES(3),      NULL,           CYCLES(1),      CYCLES(1),      CYCLES(3),       CYCLES(3),      NULL,          NULL
     // clang-format on
 };
 
-static int *opcode_timings_8x[8] = {
+static int *opcode_timings_winchip_8x[8] = {
     // clang-format off
         &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_rm
 };
-static int *opcode_timings_8x_mod3[8] =
+static int *opcode_timings_winchip_8x_mod3[8] =
 {
         &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_rm
 };
-static int *opcode_timings_81[8] =
+static int *opcode_timings_winchip_81[8] =
 {
         &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_rm
 };
-static int *opcode_timings_81_mod3[8] =
+static int *opcode_timings_winchip_81_mod3[8] =
 {
         &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_mr,     &timing_rm
     // clang-format on
@@ -327,9 +328,9 @@ codegen_timing_winchip_start(void)
 }
 
 void
-codegen_timing_winchip_prefix(uint8_t prefix, uint32_t fetchdat)
+codegen_timing_winchip_prefix(uint8_t prefix, UNUSED(uint32_t fetchdat))
 {
-    timing_count += COUNT(opcode_timings[prefix], 0);
+    timing_count += COUNT(opcode_timings_winchip[prefix], 0);
     last_prefix = prefix;
 }
 
@@ -343,47 +344,47 @@ codegen_timing_winchip_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNUS
 
     switch (last_prefix) {
         case 0x0f:
-            timings = mod3 ? opcode_timings_0f_mod3 : opcode_timings_0f;
+            timings = mod3 ? opcode_timings_winchip_0f_mod3 : opcode_timings_winchip_0f;
             deps    = mod3 ? opcode_deps_0f_mod3 : opcode_deps_0f;
             break;
 
         case 0xd8:
-            timings = mod3 ? opcode_timings_d8_mod3 : opcode_timings_d8;
+            timings = mod3 ? opcode_timings_winchip_d8_mod3 : opcode_timings_winchip_d8;
             deps    = mod3 ? opcode_deps_d8_mod3 : opcode_deps_d8;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xd9:
-            timings = mod3 ? opcode_timings_d9_mod3 : opcode_timings_d9;
+            timings = mod3 ? opcode_timings_winchip_d9_mod3 : opcode_timings_winchip_d9;
             deps    = mod3 ? opcode_deps_d9_mod3 : opcode_deps_d9;
             opcode  = mod3 ? opcode & 0x3f : (opcode >> 3) & 7;
             break;
         case 0xda:
-            timings = mod3 ? opcode_timings_da_mod3 : opcode_timings_da;
+            timings = mod3 ? opcode_timings_winchip_da_mod3 : opcode_timings_winchip_da;
             deps    = mod3 ? opcode_deps_da_mod3 : opcode_deps_da;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xdb:
-            timings = mod3 ? opcode_timings_db_mod3 : opcode_timings_db;
+            timings = mod3 ? opcode_timings_winchip_db_mod3 : opcode_timings_winchip_db;
             deps    = mod3 ? opcode_deps_db_mod3 : opcode_deps_db;
             opcode  = mod3 ? opcode & 0x3f : (opcode >> 3) & 7;
             break;
         case 0xdc:
-            timings = mod3 ? opcode_timings_dc_mod3 : opcode_timings_dc;
+            timings = mod3 ? opcode_timings_winchip_dc_mod3 : opcode_timings_winchip_dc;
             deps    = mod3 ? opcode_deps_dc_mod3 : opcode_deps_dc;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xdd:
-            timings = mod3 ? opcode_timings_dd_mod3 : opcode_timings_dd;
+            timings = mod3 ? opcode_timings_winchip_dd_mod3 : opcode_timings_winchip_dd;
             deps    = mod3 ? opcode_deps_dd_mod3 : opcode_deps_dd;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xde:
-            timings = mod3 ? opcode_timings_de_mod3 : opcode_timings_de;
+            timings = mod3 ? opcode_timings_winchip_de_mod3 : opcode_timings_winchip_de;
             deps    = mod3 ? opcode_deps_de_mod3 : opcode_deps_de;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xdf:
-            timings = mod3 ? opcode_timings_df_mod3 : opcode_timings_df;
+            timings = mod3 ? opcode_timings_winchip_df_mod3 : opcode_timings_winchip_df;
             deps    = mod3 ? opcode_deps_df_mod3 : opcode_deps_df;
             opcode  = (opcode >> 3) & 7;
             break;
@@ -393,12 +394,12 @@ codegen_timing_winchip_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNUS
                 case 0x80:
                 case 0x82:
                 case 0x83:
-                    timings = mod3 ? opcode_timings_8x_mod3 : opcode_timings_8x;
+                    timings = mod3 ? opcode_timings_winchip_8x_mod3 : opcode_timings_winchip_8x;
                     deps    = mod3 ? opcode_deps_8x_mod3 : opcode_deps_8x;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
                 case 0x81:
-                    timings = mod3 ? opcode_timings_81_mod3 : opcode_timings_81;
+                    timings = mod3 ? opcode_timings_winchip_81_mod3 : opcode_timings_winchip_81;
                     deps    = mod3 ? opcode_deps_81_mod3 : opcode_deps_81;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
@@ -409,29 +410,29 @@ codegen_timing_winchip_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNUS
                 case 0xd1:
                 case 0xd2:
                 case 0xd3:
-                    timings = mod3 ? opcode_timings_shift_mod3 : opcode_timings_shift;
+                    timings = mod3 ? opcode_timings_winchip_shift_mod3 : opcode_timings_winchip_shift;
                     deps    = mod3 ? opcode_deps_shift_mod3 : opcode_deps_shift;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
 
                 case 0xf6:
-                    timings = mod3 ? opcode_timings_f6_mod3 : opcode_timings_f6;
+                    timings = mod3 ? opcode_timings_winchip_f6_mod3 : opcode_timings_winchip_f6;
                     deps    = mod3 ? opcode_deps_f6_mod3 : opcode_deps_f6;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
                 case 0xf7:
-                    timings = mod3 ? opcode_timings_f7_mod3 : opcode_timings_f7;
+                    timings = mod3 ? opcode_timings_winchip_f7_mod3 : opcode_timings_winchip_f7;
                     deps    = mod3 ? opcode_deps_f7_mod3 : opcode_deps_f7;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
                 case 0xff:
-                    timings = mod3 ? opcode_timings_ff_mod3 : opcode_timings_ff;
+                    timings = mod3 ? opcode_timings_winchip_ff_mod3 : opcode_timings_winchip_ff;
                     deps    = mod3 ? opcode_deps_ff_mod3 : opcode_deps_ff;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
 
                 default:
-                    timings = mod3 ? opcode_timings_mod3 : opcode_timings;
+                    timings = mod3 ? opcode_timings_winchip_mod3 : opcode_timings_winchip;
                     deps    = mod3 ? opcode_deps_mod3 : opcode_deps;
                     break;
             }
diff --git a/src/cpu/codegen_timing_winchip2.c b/src/cpu/codegen_timing_winchip2.c
index d4e32611e..696a059cf 100644
--- a/src/cpu/codegen_timing_winchip2.c
+++ b/src/cpu/codegen_timing_winchip2.c
@@ -18,6 +18,7 @@
 
 #include "x86.h"
 #include "x86_ops.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include "codegen.h"
 #include "codegen_ops.h"
@@ -62,7 +63,7 @@
 
 #define INVALID                                     0
 
-static uint32_t opcode_timings[256] = {
+static uint32_t opcode_timings_winchip2[256] = {
     // clang-format off
 /*00*/  CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(1),      CYCLES(1),      CYCLES(2),      CYCLES(3),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(1),      CYCLES(1),      CYCLES(2),      INVALID,
 /*10*/  CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(1),      CYCLES(1),      CYCLES(2),      CYCLES(3),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(1),      CYCLES(1),      CYCLES(2),      CYCLES(3),
@@ -86,7 +87,7 @@ static uint32_t opcode_timings[256] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_mod3[256] = {
+static uint32_t opcode_timings_winchip2_mod3[256] = {
     // clang-format off
 /*00*/  CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(2),      CYCLES(3),      CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(2),      INVALID,
 /*10*/  CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(2),      CYCLES(3),      CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(1),      CYCLES(2),      CYCLES(3),
@@ -110,7 +111,7 @@ static uint32_t opcode_timings_mod3[256] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_0f[256] = {
+static uint32_t opcode_timings_winchip2_0f[256] = {
     // clang-format off
 /*00*/  CYCLES(20),          CYCLES(11),          CYCLES(11),          CYCLES(10),          INVALID,           CYCLES(195),       CYCLES(7),         INVALID,             CYCLES(1000),        CYCLES(10000),       INVALID,             INVALID,             INVALID,           CYCLES_3DNOW(1),   CYCLES(1),         CYCLES_3DNOW(1),
 /*10*/  INVALID,             INVALID,             INVALID,             INVALID,             INVALID,           INVALID,           INVALID,           INVALID,             INVALID,             INVALID,             INVALID,             INVALID,             INVALID,           INVALID,           INVALID,           INVALID,
@@ -133,7 +134,7 @@ static uint32_t opcode_timings_0f[256] = {
 /*f0*/  INVALID,             CYCLES_MMX_SHIFT(2), CYCLES_MMX_SHIFT(2), CYCLES_MMX_SHIFT(2), INVALID,           CYCLES_MMX_MUL(2), INVALID,           INVALID,             CYCLES_MMX_ANY(2),   CYCLES_MMX_ANY(2),   CYCLES_MMX_ANY(2),   INVALID,             CYCLES_MMX_ANY(2), CYCLES_MMX_ANY(2), CYCLES_MMX_ANY(2), INVALID,
     // clang-format on
 };
-static uint32_t opcode_timings_0f_mod3[256] = {
+static uint32_t opcode_timings_winchip2_0f_mod3[256] = {
     // clang-format off
 /*00*/  CYCLES(20),          CYCLES(11),          CYCLES(11),          CYCLES(10),          INVALID,           CYCLES(195),       CYCLES(7),         INVALID,             CYCLES(1000),        CYCLES(10000),       INVALID,             INVALID,             INVALID,           CYCLES_3DNOW(1),   CYCLES(1),         CYCLES_3DNOW(1),
 /*10*/  INVALID,             INVALID,             INVALID,             INVALID,             INVALID,           INVALID,           INVALID,           INVALID,             INVALID,             INVALID,             INVALID,             INVALID,             INVALID,           INVALID,           INVALID,           INVALID,
@@ -157,49 +158,49 @@ static uint32_t opcode_timings_0f_mod3[256] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_shift[8] = {
+static uint32_t opcode_timings_winchip2_shift[8] = {
     // clang-format off
         CYCLES(7),      CYCLES(7),      CYCLES(10),     CYCLES(10),     CYCLES(7),      CYCLES(7),      CYCLES(7),      CYCLES(7)
     // clang-format on
 };
-static uint32_t opcode_timings_shift_mod3[8] = {
+static uint32_t opcode_timings_winchip2_shift_mod3[8] = {
     // clang-format off
         CYCLES(3),      CYCLES(3),      CYCLES(9),      CYCLES(9),      CYCLES(3),      CYCLES(3),      CYCLES(3),      CYCLES(3)
     // clang-format on
 };
 
-static uint32_t opcode_timings_f6[8] = {
+static uint32_t opcode_timings_winchip2_f6[8] = {
     // clang-format off
         CYCLES(2),      INVALID,        CYCLES(2),      CYCLES(2),      CYCLES(13),     CYCLES(14),     CYCLES(16),     CYCLES(19)
     // clang-format on
 };
-static uint32_t opcode_timings_f6_mod3[8] = {
+static uint32_t opcode_timings_winchip2_f6_mod3[8] = {
     // clang-format off
         CYCLES(1),      INVALID,        CYCLES(1),      CYCLES(1),      CYCLES(13),     CYCLES(14),     CYCLES(16),     CYCLES(19)
     // clang-format on
 };
-static uint32_t opcode_timings_f7[8] = {
+static uint32_t opcode_timings_winchip2_f7[8] = {
     // clang-format off
         CYCLES(2),      INVALID,        CYCLES(2),      CYCLES(2),      CYCLES(21),     CYCLES2(22,38), CYCLES2(24,40), CYCLES2(27,43)
     // clang-format on
 };
-static uint32_t opcode_timings_f7_mod3[8] = {
+static uint32_t opcode_timings_winchip2_f7_mod3[8] = {
     // clang-format off
         CYCLES(1),      INVALID,        CYCLES(1),      CYCLES(1),      CYCLES(21),     CYCLES2(22,38), CYCLES2(24,40), CYCLES2(27,43)
     // clang-format on
 };
-static uint32_t opcode_timings_ff[8] = {
+static uint32_t opcode_timings_winchip2_ff[8] = {
     // clang-format off
         CYCLES(2),      CYCLES(2),      CYCLES(5),      CYCLES(0),      CYCLES(5),      CYCLES(0),      CYCLES(5),      INVALID
     // clang-format on
 };
-static uint32_t opcode_timings_ff_mod3[8] = {
+static uint32_t opcode_timings_winchip2_ff_mod3[8] = {
     // clang-format off
         CYCLES(1),      CYCLES(1),      CYCLES(5),      CYCLES(0),      CYCLES(5),      CYCLES(0),      CYCLES(5),      INVALID
     // clang-format on
 };
 
-static uint32_t opcode_timings_d8[8] = {
+static uint32_t opcode_timings_winchip2_d8[8] = {
     // clang-format off
 /*      FADDs               FMULs               FCOMs                 FCOMPs*/
         FPU_CYCLES(3,2,2),  FPU_CYCLES(3,2,2),  FPU_CYCLES(1,0,0),    FPU_CYCLES(1,0,0),
@@ -207,7 +208,7 @@ static uint32_t opcode_timings_d8[8] = {
         FPU_CYCLES(3,2,2),  FPU_CYCLES(3,2,2),  FPU_CYCLES(39,38,2),  FPU_CYCLES(39,38,2)
     // clang-format on
 };
-static uint32_t opcode_timings_d8_mod3[8] = {
+static uint32_t opcode_timings_winchip2_d8_mod3[8] = {
     // clang-format off
 /*      FADD                  FMUL                  FCOM                  FCOMP*/
         FPU_CYCLES(3,2,2),    FPU_CYCLES(3,2,2),    FPU_CYCLES(1,0,0),    FPU_CYCLES(1,0,0),
@@ -216,7 +217,7 @@ static uint32_t opcode_timings_d8_mod3[8] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_d9[8] = {
+static uint32_t opcode_timings_winchip2_d9[8] = {
     // clang-format off
 /*      FLDs                                     FSTs                 FSTPs*/
         FPU_CYCLES(1,0,0),   INVALID,            FPU_CYCLES(2,0,0),   FPU_CYCLES(2,0,0),
@@ -224,7 +225,7 @@ static uint32_t opcode_timings_d9[8] = {
         FPU_CYCLES(32,0,0),  FPU_CYCLES(8,0,0),  FPU_CYCLES(48,0,0),  FPU_CYCLES(2,0,0)
     // clang-format on
 };
-static uint32_t opcode_timings_d9_mod3[64] = {
+static uint32_t opcode_timings_winchip2_d9_mod3[64] = {
     // clang-format off
         /*FLD*/
         FPU_CYCLES(1,0,0),  FPU_CYCLES(1,0,0),  FPU_CYCLES(1,0,0),  FPU_CYCLES(1,0,0),
@@ -257,7 +258,7 @@ static uint32_t opcode_timings_d9_mod3[64] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_da[8] = {
+static uint32_t opcode_timings_winchip2_da[8] = {
     // clang-format off
 /*      FIADDl              FIMULl              FICOMl                FICOMPl*/
         FPU_CYCLES(6,2,2),  FPU_CYCLES(6,2,2),  FPU_CYCLES(4,0,0),    FPU_CYCLES(4,0,0),
@@ -265,7 +266,7 @@ static uint32_t opcode_timings_da[8] = {
         FPU_CYCLES(6,2,2),  FPU_CYCLES(6,2,2),  FPU_CYCLES(42,38,2),  FPU_CYCLES(42,38,2)
     // clang-format on
 };
-static uint32_t opcode_timings_da_mod3[8] = {
+static uint32_t opcode_timings_winchip2_da_mod3[8] = {
     // clang-format off
         INVALID,            INVALID,            INVALID,              INVALID,
 /*                          FCOMPP*/
@@ -273,7 +274,7 @@ static uint32_t opcode_timings_da_mod3[8] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_db[8] = {
+static uint32_t opcode_timings_winchip2_db[8] = {
     // clang-format off
 /*      FLDil                                   FSTil                 FSTPil*/
         FPU_CYCLES(3,2,2),  INVALID,            FPU_CYCLES(6,0,0),    FPU_CYCLES(6,0,0),
@@ -281,7 +282,7 @@ static uint32_t opcode_timings_db[8] = {
         INVALID,            FPU_CYCLES(3,0,0),  INVALID,              FPU_CYCLES(3,0,0)
     // clang-format on
 };
-static uint32_t opcode_timings_db_mod3[64] = {
+static uint32_t opcode_timings_winchip2_db_mod3[64] = {
     // clang-format off
         INVALID,            INVALID,            INVALID,              INVALID,
         INVALID,            INVALID,            INVALID,              INVALID,
@@ -311,7 +312,7 @@ static uint32_t opcode_timings_db_mod3[64] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_dc[8] = {
+static uint32_t opcode_timings_winchip2_dc[8] = {
     // clang-format off
 /*      FADDd               FMULd               FCOMd                 FCOMPd*/
         FPU_CYCLES(3,2,2),  FPU_CYCLES(3,2,2),  FPU_CYCLES(1,0,0),    FPU_CYCLES(1,0,0),
@@ -319,7 +320,7 @@ static uint32_t opcode_timings_dc[8] = {
         FPU_CYCLES(3,2,2),  FPU_CYCLES(3,2,2),  FPU_CYCLES(39,38,2),  FPU_CYCLES(39,38,2)
     // clang-format on
 };
-static uint32_t opcode_timings_dc_mod3[8] = {
+static uint32_t opcode_timings_winchip2_dc_mod3[8] = {
     // clang-format off
 /*      opFADDr               opFMULr*/
         FPU_CYCLES(3,2,2),    FPU_CYCLES(3,2,2),INVALID,              INVALID,
@@ -328,7 +329,7 @@ static uint32_t opcode_timings_dc_mod3[8] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_dd[8] = {
+static uint32_t opcode_timings_winchip2_dd[8] = {
     // clang-format off
 /*      FLDd                                    FSTd                  FSTPd*/
         FPU_CYCLES(1,0,0),    INVALID,          FPU_CYCLES(2,0,0),    FPU_CYCLES(2,0,0),
@@ -336,7 +337,7 @@ static uint32_t opcode_timings_dd[8] = {
         FPU_CYCLES(70,0,0),   INVALID,          FPU_CYCLES(127,0,0),  FPU_CYCLES(6,0,0)
     // clang-format on
 };
-static uint32_t opcode_timings_dd_mod3[8] = {
+static uint32_t opcode_timings_winchip2_dd_mod3[8] = {
     // clang-format off
 /*      FFFREE                                  FST                   FSTP*/
         FPU_CYCLES(2,0,0),    INVALID,          FPU_CYCLES(1,0,0),    FPU_CYCLES(1,0,0),
@@ -345,7 +346,7 @@ static uint32_t opcode_timings_dd_mod3[8] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_de[8] = {
+static uint32_t opcode_timings_winchip2_de[8] = {
     // clang-format off
 /*      FIADDw              FIMULw              FICOMw                FICOMPw*/
         FPU_CYCLES(6,2,2),  FPU_CYCLES(6,2,2),  FPU_CYCLES(4,0,0),    FPU_CYCLES(4,0,0),
@@ -353,7 +354,7 @@ static uint32_t opcode_timings_de[8] = {
         FPU_CYCLES(6,2,2),  FPU_CYCLES(6,2,2),  FPU_CYCLES(42,38,2),  FPU_CYCLES(42,38,2)
     // clang-format on
 };
-static uint32_t opcode_timings_de_mod3[8] = {
+static uint32_t opcode_timings_winchip2_de_mod3[8] = {
     // clang-format off
 /*      FADDP               FMULP                                     FCOMPP*/
         FPU_CYCLES(3,2,2),  FPU_CYCLES(3,2,2),  INVALID,              FPU_CYCLES(1,0,0),
@@ -362,7 +363,7 @@ static uint32_t opcode_timings_de_mod3[8] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_df[8] = {
+static uint32_t opcode_timings_winchip2_df[8] = {
     // clang-format off
 /*      FILDiw                                  FISTiw                FISTPiw*/
         FPU_CYCLES(3,2,2),  INVALID,            FPU_CYCLES(6,0,0),    FPU_CYCLES(6,0,0),
@@ -370,7 +371,7 @@ static uint32_t opcode_timings_df[8] = {
         INVALID,            FPU_CYCLES(3,2,2),  FPU_CYCLES(148,0,0),  FPU_CYCLES(6,0,0)
     // clang-format on
 };
-static uint32_t opcode_timings_df_mod3[8] = {
+static uint32_t opcode_timings_winchip2_df_mod3[8] = {
     // clang-format off
         INVALID,            INVALID,            INVALID,              INVALID,
 /*      FSTSW AX*/
@@ -378,22 +379,22 @@ static uint32_t opcode_timings_df_mod3[8] = {
     // clang-format on
 };
 
-static uint32_t opcode_timings_8x[8] = {
+static uint32_t opcode_timings_winchip2_8x[8] = {
     // clang-format off
         CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2)
     // clang-format on
 };
-static uint32_t opcode_timings_8x_mod3[8] = {
+static uint32_t opcode_timings_winchip2_8x_mod3[8] = {
     // clang-format off
         CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2)
     // clang-format on
 };
-static uint32_t opcode_timings_81[8] = {
+static uint32_t opcode_timings_winchip2_81[8] = {
     // clang-format off
         CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2)
     // clang-format on
 };
-static uint32_t opcode_timings_81_mod3[8] = {
+static uint32_t opcode_timings_winchip2_81_mod3[8] = {
     // clang-format off
         CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2),      CYCLES(2)
     // clang-format on
@@ -588,7 +589,7 @@ codegen_timing_winchip2_start(void)
 }
 
 static void
-codegen_timing_winchip2_prefix(uint8_t prefix, uint32_t fetchdat)
+codegen_timing_winchip2_prefix(uint8_t prefix, UNUSED(uint32_t fetchdat))
 {
     if (prefix == 0x0f) {
         /*0fh prefix is 'free'*/
@@ -612,47 +613,47 @@ codegen_timing_winchip2_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNU
 
     switch (last_prefix) {
         case 0x0f:
-            timings = mod3 ? opcode_timings_0f_mod3 : opcode_timings_0f;
+            timings = mod3 ? opcode_timings_winchip2_0f_mod3 : opcode_timings_winchip2_0f;
             deps    = mod3 ? opcode_deps_0f_mod3 : opcode_deps_0f;
             break;
 
         case 0xd8:
-            timings = mod3 ? opcode_timings_d8_mod3 : opcode_timings_d8;
+            timings = mod3 ? opcode_timings_winchip2_d8_mod3 : opcode_timings_winchip2_d8;
             deps    = mod3 ? opcode_deps_d8_mod3 : opcode_deps_d8;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xd9:
-            timings = mod3 ? opcode_timings_d9_mod3 : opcode_timings_d9;
+            timings = mod3 ? opcode_timings_winchip2_d9_mod3 : opcode_timings_winchip2_d9;
             deps    = mod3 ? opcode_deps_d9_mod3 : opcode_deps_d9;
             opcode  = mod3 ? opcode & 0x3f : (opcode >> 3) & 7;
             break;
         case 0xda:
-            timings = mod3 ? opcode_timings_da_mod3 : opcode_timings_da;
+            timings = mod3 ? opcode_timings_winchip2_da_mod3 : opcode_timings_winchip2_da;
             deps    = mod3 ? opcode_deps_da_mod3 : opcode_deps_da;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xdb:
-            timings = mod3 ? opcode_timings_db_mod3 : opcode_timings_db;
+            timings = mod3 ? opcode_timings_winchip2_db_mod3 : opcode_timings_winchip2_db;
             deps    = mod3 ? opcode_deps_db_mod3 : opcode_deps_db;
             opcode  = mod3 ? opcode & 0x3f : (opcode >> 3) & 7;
             break;
         case 0xdc:
-            timings = mod3 ? opcode_timings_dc_mod3 : opcode_timings_dc;
+            timings = mod3 ? opcode_timings_winchip2_dc_mod3 : opcode_timings_winchip2_dc;
             deps    = mod3 ? opcode_deps_dc_mod3 : opcode_deps_dc;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xdd:
-            timings = mod3 ? opcode_timings_dd_mod3 : opcode_timings_dd;
+            timings = mod3 ? opcode_timings_winchip2_dd_mod3 : opcode_timings_winchip2_dd;
             deps    = mod3 ? opcode_deps_dd_mod3 : opcode_deps_dd;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xde:
-            timings = mod3 ? opcode_timings_de_mod3 : opcode_timings_de;
+            timings = mod3 ? opcode_timings_winchip2_de_mod3 : opcode_timings_winchip2_de;
             deps    = mod3 ? opcode_deps_de_mod3 : opcode_deps_de;
             opcode  = (opcode >> 3) & 7;
             break;
         case 0xdf:
-            timings = mod3 ? opcode_timings_df_mod3 : opcode_timings_df;
+            timings = mod3 ? opcode_timings_winchip2_df_mod3 : opcode_timings_winchip2_df;
             deps    = mod3 ? opcode_deps_df_mod3 : opcode_deps_df;
             opcode  = (opcode >> 3) & 7;
             break;
@@ -662,12 +663,12 @@ codegen_timing_winchip2_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNU
                 case 0x80:
                 case 0x82:
                 case 0x83:
-                    timings = mod3 ? opcode_timings_8x_mod3 : opcode_timings_8x;
+                    timings = mod3 ? opcode_timings_winchip2_8x_mod3 : opcode_timings_winchip2_8x;
                     deps    = mod3 ? opcode_deps_8x_mod3 : opcode_deps_8x;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
                 case 0x81:
-                    timings = mod3 ? opcode_timings_81_mod3 : opcode_timings_81;
+                    timings = mod3 ? opcode_timings_winchip2_81_mod3 : opcode_timings_winchip2_81;
                     deps    = mod3 ? opcode_deps_81_mod3 : opcode_deps_81;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
@@ -678,29 +679,29 @@ codegen_timing_winchip2_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, UNU
                 case 0xd1:
                 case 0xd2:
                 case 0xd3:
-                    timings = mod3 ? opcode_timings_shift_mod3 : opcode_timings_shift;
+                    timings = mod3 ? opcode_timings_winchip2_shift_mod3 : opcode_timings_winchip2_shift;
                     deps    = mod3 ? opcode_deps_shift_mod3 : opcode_deps_shift;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
 
                 case 0xf6:
-                    timings = mod3 ? opcode_timings_f6_mod3 : opcode_timings_f6;
+                    timings = mod3 ? opcode_timings_winchip2_f6_mod3 : opcode_timings_winchip2_f6;
                     deps    = mod3 ? opcode_deps_f6_mod3 : opcode_deps_f6;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
                 case 0xf7:
-                    timings = mod3 ? opcode_timings_f7_mod3 : opcode_timings_f7;
+                    timings = mod3 ? opcode_timings_winchip2_f7_mod3 : opcode_timings_winchip2_f7;
                     deps    = mod3 ? opcode_deps_f7_mod3 : opcode_deps_f7;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
                 case 0xff:
-                    timings = mod3 ? opcode_timings_ff_mod3 : opcode_timings_ff;
+                    timings = mod3 ? opcode_timings_winchip2_ff_mod3 : opcode_timings_winchip2_ff;
                     deps    = mod3 ? opcode_deps_ff_mod3 : opcode_deps_ff;
                     opcode  = (fetchdat >> 3) & 7;
                     break;
 
                 default:
-                    timings = mod3 ? opcode_timings_mod3 : opcode_timings;
+                    timings = mod3 ? opcode_timings_winchip2_mod3 : opcode_timings_winchip2;
                     deps    = mod3 ? opcode_deps_mod3 : opcode_deps;
                     break;
             }
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index e05ec0d9c..ff806297e 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -29,6 +29,8 @@
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include "cpu.h"
+#include "x86.h"
+#include "x87_sf.h"
 #include <86box/device.h>
 #include <86box/machine.h>
 #include <86box/io.h>
@@ -38,44 +40,50 @@
 #include <86box/nmi.h>
 #include <86box/pic.h>
 #include <86box/pci.h>
+#include <86box/smram.h>
+#include <86box/timer.h>
 #include <86box/gdbstub.h>
 #include <86box/plat_fallthrough.h>
 #include <86box/plat_unused.h>
 
 #ifdef USE_DYNAREC
 #    include "codegen.h"
-#endif
+#endif /* USE_DYNAREC */
 #include "x87_timings.h"
 
-#define CCR1_USE_SMI  (1 << 1)
-#define CCR1_SMAC     (1 << 2)
-#define CCR1_SM3      (1 << 7)
-
-#define CCR3_SMI_LOCK (1 << 0)
-#define CCR3_NMI_EN   (1 << 1)
-
 enum {
-    CPUID_FPU       = (1 << 0),
-    CPUID_VME       = (1 << 1),
-    CPUID_PSE       = (1 << 3),
-    CPUID_TSC       = (1 << 4),
-    CPUID_MSR       = (1 << 5),
-    CPUID_PAE       = (1 << 6),
-    CPUID_MCE       = (1 << 7),
-    CPUID_CMPXCHG8B = (1 << 8),
-    CPUID_AMDSEP    = (1 << 10),
-    CPUID_SEP       = (1 << 11),
-    CPUID_MTRR      = (1 << 12),
-    CPUID_PGE       = (1 << 13),
-    CPUID_MCA       = (1 << 14),
-    CPUID_CMOV      = (1 << 15),
-    CPUID_MMX       = (1 << 23),
-    CPUID_FXSR      = (1 << 24)
+    CPUID_FPU       = (1 << 0),  /* On-chip Floating Point Unit */
+    CPUID_VME       = (1 << 1),  /* Virtual 8086 mode extensions */
+    CPUID_DE        = (1 << 2),  /* Debugging extensions */
+    CPUID_PSE       = (1 << 3),  /* Page Size Extension */
+    CPUID_TSC       = (1 << 4),  /* Time Stamp Counter */
+    CPUID_MSR       = (1 << 5),  /* Model-specific registers */
+    CPUID_PAE       = (1 << 6),  /* Physical Address Extension */
+    CPUID_MCE       = (1 << 7),  /* Machine Check Exception */
+    CPUID_CMPXCHG8B = (1 << 8),  /* CMPXCHG8B instruction */
+    CPUID_APIC      = (1 << 9),  /* On-chip APIC */
+    CPUID_AMDPGE    = (1 << 9),  /* Global Page Enable (AMD K5 Model 0 only) */
+    CPUID_AMDSEP    = (1 << 10), /* SYSCALL and SYSRET instructions (AMD K6 only) */
+    CPUID_SEP       = (1 << 11), /* SYSENTER and SYSEXIT instructions (SYSCALL and SYSRET if EAX=80000001h) */
+    CPUID_MTRR      = (1 << 12), /* Memory type range registers */
+    CPUID_PGE       = (1 << 13), /* Page Global Enable */
+    CPUID_MCA       = (1 << 14), /* Machine Check Architecture */
+    CPUID_CMOV      = (1 << 15), /* Conditional move instructions */
+    CPUID_PAT       = (1 << 16), /* Page Attribute Table */
+    CPUID_PSE36     = (1 << 17), /* 36-bit Page Size Extension */
+    CPUID_MMX       = (1 << 23), /* MMX technology */
+    CPUID_FXSR      = (1 << 24)  /* FXSAVE and FXRSTOR instructions */
 };
 
-/*Addition flags returned by CPUID function 0x80000001*/
-#define CPUID_3DNOW  (1UL << 31UL)
-#define CPUID_3DNOWE (1UL << 30UL)
+/* Additional flags returned by CPUID function 0x80000001 */
+#define CPUID_3DNOWE (1UL << 30UL) /* Extended 3DNow! instructions */
+#define CPUID_3DNOW  (1UL << 31UL) /* 3DNow! instructions */
+
+/* Remove the Debugging Extensions CPUID flag if not compiled
+   with debug register support for 486 and later CPUs. */
+#ifndef USE_DEBUG_REGS_486
+#    define CPUID_DE 0
+#endif
 
 /* Make sure this is as low as possible. */
 cpu_state_t cpu_state;
@@ -106,7 +114,7 @@ const OpFn *x86_dynarec_opcodes_df_a32;
 const OpFn *x86_dynarec_opcodes_REPE;
 const OpFn *x86_dynarec_opcodes_REPNE;
 const OpFn *x86_dynarec_opcodes_3DNOW;
-#endif
+#endif /* USE_DYNAREC */
 
 const OpFn *x86_opcodes;
 const OpFn *x86_opcodes_0f;
@@ -169,6 +177,8 @@ int cpu_rom_prefetch_cycles;
 int cpu_waitstates;
 int cpu_cache_int_enabled;
 int cpu_cache_ext_enabled;
+int cpu_flush_pending;
+int cpu_old_paging;
 int cpu_isa_speed;
 int cpu_pci_speed;
 int cpu_isa_pci_div;
@@ -183,14 +193,17 @@ int cpu_64bitbus;
 int cpu_cyrix_alignment;
 int cpu_cpurst_on_sr;
 int cpu_use_exec = 0;
+int cpu_override_interpreter;
 int CPUID;
 
 int is186;
+int is_mazovia;
 int is_nec;
 int is286;
 int is386;
 int is6117;
 int is486 = 1;
+int is586 = 0;
 int cpu_isintel;
 int cpu_iscyrix;
 int hascache;
@@ -244,8 +257,7 @@ uint32_t cache_index = 0;
 uint8_t  _cache[2048];
 
 uint64_t cpu_CR4_mask;
-uint64_t tsc    = 0;
-uint64_t pmc[2] = { 0, 0 };
+uint64_t tsc = 0;
 
 double cpu_dmulti;
 double cpu_busspeed;
@@ -262,13 +274,21 @@ uint8_t do_translate2 = 0;
 
 void (*cpu_exec)(int32_t cycs);
 
-static uint8_t ccr0;
-static uint8_t ccr1;
-static uint8_t ccr2;
-static uint8_t ccr3;
-static uint8_t ccr4;
-static uint8_t ccr5;
-static uint8_t ccr6;
+uint8_t ccr0;
+uint8_t ccr1;
+uint8_t ccr2;
+uint8_t ccr3;
+uint8_t ccr4;
+uint8_t ccr5;
+uint8_t ccr6;
+uint8_t ccr7;
+
+uint8_t reg_30 = 0x00;
+uint8_t arr[24] = { 0 };
+uint8_t rcr[8] = { 0 };
+
+/* Table for FXTRACT. */
+double exp_pow_table[0x800];
 
 static int cyrix_addr;
 
@@ -365,6 +385,14 @@ cpu_is_eligible(const cpu_family_t *cpu_family, int cpu, int machine)
     if (cpu_override)
         return 1;
 
+    /* Cyrix 6x86MX on the NuPRO 592. */
+    if (((cpu_s->cyrix_id & 0xff00) == 0x0400) && (strstr(machine_s->internal_name, "nupro") != NULL))
+        return 0;
+
+    /* Cyrix 6x86MX or MII on the P5MMS98. */
+    if ((cpu_s->cpu_type == CPU_Cx6x86MX) && (strstr(machine_s->internal_name, "p5mms98") != NULL))
+        return 0;
+
     /* Check CPU blocklist. */
     if (machine_s->cpu.block) {
         i = 0;
@@ -491,15 +519,17 @@ cpu_set(void)
 
 #ifdef USE_ACYCS
     acycs = 0;
-#endif
+#endif /* USE_ACYCS */
 
-    soft_reset_pci = 0;
+    soft_reset_pci    = 0;
+    cpu_init          = 0;
 
     cpu_alt_reset     = 0;
     unmask_a20_in_smm = 0;
 
     CPUID       = cpu_s->cpuid_model;
     is8086      = (cpu_s->cpu_type > CPU_8088) && (cpu_s->cpu_type != CPU_V20) && (cpu_s->cpu_type != CPU_188);
+    is_mazovia  = (cpu_s->cpu_type == CPU_8086_MAZOVIA);
     is_nec      = (cpu_s->cpu_type == CPU_V20) || (cpu_s->cpu_type == CPU_V30);
     is186       = (cpu_s->cpu_type == CPU_186) || (cpu_s->cpu_type == CPU_188) || (cpu_s->cpu_type == CPU_V20) || (cpu_s->cpu_type == CPU_V30);
     is286       = (cpu_s->cpu_type >= CPU_286);
@@ -532,13 +562,16 @@ cpu_set(void)
     cpu_16bitbus = (cpu_s->cpu_type == CPU_286) || (cpu_s->cpu_type == CPU_386SX) || (cpu_s->cpu_type == CPU_486SLC) || (cpu_s->cpu_type == CPU_IBM386SLC) || (cpu_s->cpu_type == CPU_IBM486SLC);
     cpu_64bitbus = (cpu_s->cpu_type >= CPU_WINCHIP);
 
+    is586    = cpu_64bitbus || (cpu_s->cpu_type == CPU_P24T);
+
     if (cpu_s->multi)
         cpu_busspeed = cpu_s->rspeed / cpu_s->multi;
     else
         cpu_busspeed = cpu_s->rspeed;
     cpu_multi  = (int) ceil(cpu_s->multi);
     cpu_dmulti = cpu_s->multi;
-    ccr0 = ccr1 = ccr2 = ccr3 = ccr4 = ccr5 = ccr6 = 0;
+    ccr0 = ccr1 = ccr2 = ccr3 = ccr4 = ccr5 = ccr6 = ccr7 = 0;
+    ccr4 = 0x85;
 
     cpu_update_waitstates();
 
@@ -562,7 +595,7 @@ cpu_set(void)
     x86_setopcodes(ops_386, ops_386_0f, dynarec_ops_386, dynarec_ops_386_0f);
 #else
     x86_setopcodes(ops_386, ops_386_0f);
-#endif
+#endif /* USE_DYNAREC */
     x86_setopcodes_2386(ops_2386_386, ops_2386_386_0f);
     x86_opcodes_REPE       = ops_REPE;
     x86_opcodes_REPNE      = ops_REPNE;
@@ -573,7 +606,7 @@ cpu_set(void)
     x86_dynarec_opcodes_REPE  = dynarec_ops_REPE;
     x86_dynarec_opcodes_REPNE = dynarec_ops_REPNE;
     x86_dynarec_opcodes_3DNOW = dynarec_ops_3DNOW;
-#endif
+#endif /* USE_DYNAREC */
 
     if (hasfpu) {
 #ifdef USE_DYNAREC
@@ -612,7 +645,7 @@ cpu_set(void)
             x86_dynarec_opcodes_df_a16 = dynarec_ops_fpu_df_a16;
             x86_dynarec_opcodes_df_a32 = dynarec_ops_fpu_df_a32;
         }
-#endif
+#endif /* USE_DYNAREC */
         if (fpu_softfloat) {
             x86_opcodes_d8_a16 = ops_sf_fpu_d8_a16;
             x86_opcodes_d8_a32 = ops_sf_fpu_d8_a32;
@@ -700,7 +733,7 @@ cpu_set(void)
         x86_dynarec_opcodes_de_a32 = dynarec_ops_nofpu_a32;
         x86_dynarec_opcodes_df_a16 = dynarec_ops_nofpu_a16;
         x86_dynarec_opcodes_df_a32 = dynarec_ops_nofpu_a32;
-#endif
+#endif /* USE_DYNAREC */
         x86_opcodes_d8_a16 = ops_nofpu_a16;
         x86_opcodes_d8_a32 = ops_nofpu_a32;
         x86_opcodes_d9_a16 = ops_nofpu_a16;
@@ -738,7 +771,7 @@ cpu_set(void)
 
 #ifdef USE_DYNAREC
     codegen_timing_set(&codegen_timing_486);
-#endif
+#endif /* USE_DYNAREC */
 
     memset(&msr, 0, sizeof(msr));
 
@@ -750,6 +783,7 @@ cpu_set(void)
     switch (cpu_s->cpu_type) {
         case CPU_8088:
         case CPU_8086:
+        case CPU_8086_MAZOVIA:
             break;
 
         case CPU_V20:
@@ -760,7 +794,7 @@ cpu_set(void)
             x86_setopcodes(ops_186, ops_186_0f, dynarec_ops_186, dynarec_ops_186_0f);
 #else
             x86_setopcodes(ops_186, ops_186_0f);
-#endif
+#endif /* USE_DYNAREC */
             x86_setopcodes_2386(ops_2386_186, ops_2386_186_0f);
             break;
 
@@ -769,7 +803,7 @@ cpu_set(void)
             x86_setopcodes(ops_286, ops_286_0f, dynarec_ops_286, dynarec_ops_286_0f);
 #else
             x86_setopcodes(ops_286, ops_286_0f);
-#endif
+#endif /* USE_DYNAREC */
             x86_setopcodes_2386(ops_2386_286, ops_2386_286_0f);
 
             if (fpu_type == FPU_287) {
@@ -805,7 +839,7 @@ cpu_set(void)
                     x86_dynarec_opcodes_df_a16 = dynarec_ops_fpu_287_df_a16;
                     x86_dynarec_opcodes_df_a32 = dynarec_ops_fpu_287_df_a32;
                 }
-#endif
+#endif /* USE_DYNAREC */
                 if (fpu_softfloat) {
                     x86_opcodes_d9_a16 = ops_sf_fpu_287_d9_a16;
                     x86_opcodes_d9_a32 = ops_sf_fpu_287_d9_a32;
@@ -907,7 +941,7 @@ cpu_set(void)
             x86_setopcodes(ops_386, ops_ibm486_0f, dynarec_ops_386, dynarec_ops_ibm486_0f);
 #else
             x86_setopcodes(ops_386, ops_ibm486_0f);
-#endif
+#endif  /* USE_DYNAREC */
             x86_setopcodes_2386(ops_2386_386, ops_2386_ibm486_0f);
             cpu_features = CPU_FEATURE_MSR;
             fallthrough;
@@ -947,7 +981,7 @@ cpu_set(void)
                     x86_dynarec_opcodes_df_a16 = dynarec_ops_fpu_287_df_a16;
                     x86_dynarec_opcodes_df_a32 = dynarec_ops_fpu_287_df_a32;
                 }
-#endif
+#endif /* USE_DYNAREC */
                 if (fpu_softfloat) {
                     x86_opcodes_d9_a16 = ops_sf_fpu_287_d9_a16;
                     x86_opcodes_d9_a32 = ops_sf_fpu_287_d9_a32;
@@ -1046,6 +1080,9 @@ cpu_set(void)
             timing_jmp_rm             = 12;
             timing_jmp_pm             = 27;
             timing_jmp_pm_gate        = 45;
+
+            if (cpu_s->cpu_type == CPU_386DX)
+                cpu_cache_ext_enabled = 1;
             break;
 
         case CPU_486SLC:
@@ -1053,7 +1090,7 @@ cpu_set(void)
             x86_setopcodes(ops_386, ops_486_0f, dynarec_ops_386, dynarec_ops_486_0f);
 #else
             x86_setopcodes(ops_386, ops_486_0f);
-#endif
+#endif /* USE_DYNAREC */
             x86_setopcodes_2386(ops_2386_386, ops_2386_486_0f);
 
             timing_rr  = 1; /* register dest - register src */
@@ -1093,7 +1130,7 @@ cpu_set(void)
             x86_setopcodes(ops_386, ops_486_0f, dynarec_ops_386, dynarec_ops_486_0f);
 #else
             x86_setopcodes(ops_386, ops_486_0f);
-#endif
+#endif /* USE_DYNAREC */
             x86_setopcodes_2386(ops_2386_386, ops_2386_486_0f);
 
             timing_rr  = 1; /* register dest - register src */
@@ -1127,6 +1164,8 @@ cpu_set(void)
             timing_jmp_pm_gate        = 37;
 
             timing_misaligned = 3;
+
+            cpu_cache_ext_enabled = 1;
             break;
 
         case CPU_i486SX_SLENH:
@@ -1146,7 +1185,7 @@ cpu_set(void)
             x86_setopcodes(ops_386, ops_486_0f, dynarec_ops_386, dynarec_ops_486_0f);
 #else
             x86_setopcodes(ops_386, ops_486_0f);
-#endif
+#endif /* USE_DYNAREC */
             x86_setopcodes_2386(ops_2386_386, ops_2386_486_0f);
 
             timing_rr  = 1; /* register dest - register src */
@@ -1195,7 +1234,7 @@ cpu_set(void)
                 x86_setopcodes(ops_386, ops_stpc_0f);
             else
                 x86_setopcodes(ops_386, ops_c486_0f);
-#endif
+#endif /* USE_DYNAREC */
 
             timing_rr  = 1; /* register dest - register src */
             timing_rm  = 3; /* register dest - memory src */
@@ -1238,7 +1277,7 @@ cpu_set(void)
             x86_setopcodes(ops_386, ops_c486_0f, dynarec_ops_386, dynarec_ops_c486_0f);
 #else
             x86_setopcodes(ops_386, ops_c486_0f);
-#endif
+#endif /* USE_DYNAREC */
 
             timing_rr  = 1; /* register dest - register src */
             timing_rm  = 1; /* register dest - memory src */
@@ -1287,7 +1326,7 @@ cpu_set(void)
                 x86_setopcodes(ops_386, ops_winchip2_0f);
             else
                 x86_setopcodes(ops_386, ops_winchip_0f);
-#endif
+#endif /* USE_DYNAREC */
 
             timing_rr  = 1; /* register dest - register src */
             timing_rm  = 2; /* register dest - memory src */
@@ -1336,7 +1375,7 @@ cpu_set(void)
                 codegen_timing_set(&codegen_timing_winchip2);
             else
                 codegen_timing_set(&codegen_timing_winchip);
-#endif
+#endif /* USE_DYNAREC */
             break;
 
         case CPU_P24T:
@@ -1352,7 +1391,7 @@ cpu_set(void)
                 x86_setopcodes(ops_386, ops_pentiummmx_0f);
             else
                 x86_setopcodes(ops_386, ops_pentium_0f);
-#endif
+#endif /* USE_DYNAREC */
 
             timing_rr  = 1; /* register dest - register src */
             timing_rm  = 2; /* register dest - memory src */
@@ -1395,10 +1434,9 @@ cpu_set(void)
             cpu_CR4_mask = CR4_VME | CR4_PVI | CR4_TSD | CR4_DE | CR4_PSE | CR4_MCE | CR4_PCE;
 #ifdef USE_DYNAREC
             codegen_timing_set(&codegen_timing_pentium);
-#endif
+#endif /* USE_DYNAREC */
             break;
 
-#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
         case CPU_Cx6x86:
         case CPU_Cx6x86L:
         case CPU_CxGX1:
@@ -1420,21 +1458,29 @@ cpu_set(void)
                     x86_dynarec_opcodes_df_a16 = dynarec_ops_fpu_686_df_a16;
                     x86_dynarec_opcodes_df_a32 = dynarec_ops_fpu_686_df_a32;
                 }
-#    endif
+#    endif /* USE_DYNAREC */
                 if (fpu_softfloat) {
+                    x86_opcodes_d9_a16 = ops_sf_fpu_cyrix_d9_a16;
+                    x86_opcodes_d9_a32 = ops_sf_fpu_cyrix_d9_a32;
                     x86_opcodes_da_a16 = ops_sf_fpu_686_da_a16;
                     x86_opcodes_da_a32 = ops_sf_fpu_686_da_a32;
-                    x86_opcodes_db_a16 = ops_sf_fpu_686_db_a16;
-                    x86_opcodes_db_a32 = ops_sf_fpu_686_db_a32;
-                    x86_opcodes_df_a16 = ops_sf_fpu_686_df_a16;
-                    x86_opcodes_df_a32 = ops_sf_fpu_686_df_a32;
+                    x86_opcodes_db_a16 = ops_sf_fpu_cyrix_686_db_a16;
+                    x86_opcodes_db_a32 = ops_sf_fpu_cyrix_686_db_a32;
+                    x86_opcodes_dd_a16 = ops_sf_fpu_cyrix_dd_a16;
+                    x86_opcodes_dd_a32 = ops_sf_fpu_cyrix_dd_a32;
+                    x86_opcodes_df_a16 = ops_sf_fpu_cyrix_686_df_a16;
+                    x86_opcodes_df_a32 = ops_sf_fpu_cyrix_686_df_a32;
                 } else {
+                    x86_opcodes_d9_a16 = ops_fpu_cyrix_d9_a16;
+                    x86_opcodes_d9_a32 = ops_fpu_cyrix_d9_a32;
                     x86_opcodes_da_a16 = ops_fpu_686_da_a16;
                     x86_opcodes_da_a32 = ops_fpu_686_da_a32;
-                    x86_opcodes_db_a16 = ops_fpu_686_db_a16;
-                    x86_opcodes_db_a32 = ops_fpu_686_db_a32;
-                    x86_opcodes_df_a16 = ops_fpu_686_df_a16;
-                    x86_opcodes_df_a32 = ops_fpu_686_df_a32;
+                    x86_opcodes_db_a16 = ops_fpu_cyrix_686_db_a16;
+                    x86_opcodes_db_a32 = ops_fpu_cyrix_686_db_a32;
+                    x86_opcodes_dd_a16 = ops_fpu_cyrix_dd_a16;
+                    x86_opcodes_dd_a32 = ops_fpu_cyrix_dd_a32;
+                    x86_opcodes_df_a16 = ops_fpu_cyrix_686_df_a16;
+                    x86_opcodes_df_a32 = ops_fpu_cyrix_686_df_a32;
                 }
             }
 
@@ -1442,23 +1488,17 @@ cpu_set(void)
             if (cpu_s->cpu_type == CPU_Cx6x86MX)
                 x86_setopcodes(ops_386, ops_c6x86mx_0f, dynarec_ops_386, dynarec_ops_c6x86mx_0f);
             else if (cpu_s->cpu_type == CPU_Cx6x86L)
-                x86_setopcodes(ops_386, ops_pentium_0f, dynarec_ops_386, dynarec_ops_pentium_0f);
+                x86_setopcodes(ops_386, ops_c6x86l_0f, dynarec_ops_386, dynarec_ops_c6x86l_0f);
             else
-                x86_setopcodes(ops_386, ops_c6x86mx_0f, dynarec_ops_386, dynarec_ops_c6x86mx_0f);
-#        if 0
                 x86_setopcodes(ops_386, ops_c6x86_0f, dynarec_ops_386, dynarec_ops_c6x86_0f);
-#        endif
 #    else
             if (cpu_s->cpu_type == CPU_Cx6x86MX)
                 x86_setopcodes(ops_386, ops_c6x86mx_0f);
             else if (cpu_s->cpu_type == CPU_Cx6x86L)
-                x86_setopcodes(ops_386, ops_pentium_0f);
+                x86_setopcodes(ops_386, ops_c6x86l_0f);
             else
-                x86_setopcodes(ops_386, ops_c6x86mx_0f);
-#        if 0
                 x86_setopcodes(ops_386, ops_c6x86_0f);
-#        endif
-#    endif
+#    endif /* USE_DYNAREC */
 
             timing_rr  = 1; /* register dest - register src */
             timing_rm  = 1; /* register dest - memory src */
@@ -1510,19 +1550,64 @@ cpu_set(void)
 
 #    ifdef USE_DYNAREC
             codegen_timing_set(&codegen_timing_686);
-#    endif
+#    endif /* USE_DYNAREC */
 
             if ((cpu_s->cpu_type == CPU_Cx6x86L) || (cpu_s->cpu_type == CPU_Cx6x86MX))
                 ccr4 = 0x80;
             else if (CPU_Cx6x86)
                 CPUID = 0; /* Disabled on powerup by default */
             break;
-#endif
 
-#if defined(DEV_BRANCH) && defined(USE_AMD_K5)
+#ifdef USE_AMD_K5
         case CPU_K5:
         case CPU_5K86:
-#endif
+#ifdef USE_DYNAREC
+            x86_setopcodes(ops_386, ops_pentiummmx_0f, dynarec_ops_386, dynarec_ops_pentiummmx_0f);
+#else
+            x86_setopcodes(ops_386, ops_pentiummmx_0f);
+#endif /* USE_DYNAREC */
+
+            timing_rr  = 1; /* register dest - register src */
+            timing_rm  = 2; /* register dest - memory src */
+            timing_mr  = 3; /* memory dest   - register src */
+            timing_mm  = 3;
+            timing_rml = 2; /* register dest - memory src long */
+            timing_mrl = 3; /* memory dest   - register src long */
+            timing_mml = 3;
+            timing_bt  = 0; /* branch taken */
+            timing_bnt = 1; /* branch not taken */
+
+            timing_int                = 6;
+            timing_int_rm             = 11;
+            timing_int_v86            = 54;
+            timing_int_pm             = 25;
+            timing_int_pm_outer       = 42;
+            timing_iret_rm            = 7;
+            timing_iret_v86           = 27; /* unknown */
+            timing_iret_pm            = 10;
+            timing_iret_pm_outer      = 27;
+            timing_call_rm            = 4;
+            timing_call_pm            = 4;
+            timing_call_pm_gate       = 22;
+            timing_call_pm_gate_inner = 44;
+            timing_retf_rm            = 4;
+            timing_retf_pm            = 4;
+            timing_retf_pm_outer      = 23;
+            timing_jmp_rm             = 3;
+            timing_jmp_pm             = 3;
+            timing_jmp_pm_gate        = 18;
+
+            timing_misaligned = 3;
+
+            cpu_features = CPU_FEATURE_RDTSC | CPU_FEATURE_MSR | CPU_FEATURE_CR4 | CPU_FEATURE_VME | CPU_FEATURE_MMX;
+            cpu_CR4_mask = CR4_TSD | CR4_DE | CR4_MCE | CR4_PGE;
+
+#ifdef USE_DYNAREC
+            codegen_timing_set(&codegen_timing_k5);
+#endif /* USE_DYNAREC */
+            break;
+
+#endif /* USE_AMD_K5 */
         case CPU_K6:
         case CPU_K6_2:
         case CPU_K6_2C:
@@ -1532,34 +1617,20 @@ cpu_set(void)
 #ifdef USE_DYNAREC
             if (cpu_s->cpu_type >= CPU_K6_2)
                 x86_setopcodes(ops_386, ops_k62_0f, dynarec_ops_386, dynarec_ops_k62_0f);
-#    if defined(DEV_BRANCH) && defined(USE_AMD_K5)
-            else if (cpu_s->cpu_type == CPU_K6)
-                x86_setopcodes(ops_386, ops_k6_0f, dynarec_ops_386, dynarec_ops_k6_0f);
-            else
-                x86_setopcodes(ops_386, ops_pentiummmx_0f, dynarec_ops_386, dynarec_ops_pentiummmx_0f);
-#    else
             else
                 x86_setopcodes(ops_386, ops_k6_0f, dynarec_ops_386, dynarec_ops_k6_0f);
-#    endif
 #else
             if (cpu_s->cpu_type >= CPU_K6_2)
                 x86_setopcodes(ops_386, ops_k62_0f);
-#    if defined(DEV_BRANCH) && defined(USE_AMD_K5)
-            else if (cpu_s->cpu_type == CPU_K6)
-                x86_setopcodes(ops_386, ops_k6_0f);
-            else
-                x86_setopcodes(ops_386, ops_pentiummmx_0f);
-#    else
             else
                 x86_setopcodes(ops_386, ops_k6_0f);
-#    endif
-#endif
+#endif /* USE_DYNAREC */
 
             if ((cpu_s->cpu_type == CPU_K6_2P) || (cpu_s->cpu_type == CPU_K6_3P)) {
                 x86_opcodes_3DNOW = ops_3DNOWE;
 #ifdef USE_DYNAREC
                 x86_dynarec_opcodes_3DNOW = dynarec_ops_3DNOWE;
-#endif
+#endif /* USE_DYNAREC */
             }
 
             timing_rr  = 1; /* register dest - register src */
@@ -1599,22 +1670,15 @@ cpu_set(void)
                 cpu_features |= CPU_FEATURE_3DNOW;
             if ((cpu_s->cpu_type == CPU_K6_2P) || (cpu_s->cpu_type == CPU_K6_3P))
                 cpu_features |= CPU_FEATURE_3DNOWE;
-#if defined(DEV_BRANCH) && defined(USE_AMD_K5)
-            cpu_CR4_mask = CR4_TSD | CR4_DE | CR4_MCE;
-            if (cpu_s->cpu_type >= CPU_K6) {
-                cpu_CR4_mask |= (CR4_VME | CR4_PVI | CR4_PSE);
-                if (cpu_s->cpu_type <= CPU_K6)
-                    cpu_CR4_mask |= CR4_PCE;
-            }
-#else
             cpu_CR4_mask = CR4_VME | CR4_PVI | CR4_TSD | CR4_DE | CR4_PSE | CR4_MCE;
             if (cpu_s->cpu_type == CPU_K6)
                 cpu_CR4_mask |= CR4_PCE;
-#endif
+            else if (cpu_s->cpu_type >= CPU_K6_2C)
+                cpu_CR4_mask |= CR4_PGE;
 
 #ifdef USE_DYNAREC
             codegen_timing_set(&codegen_timing_k6);
-#endif
+#endif /* USE_DYNAREC */
             break;
 
         case CPU_PENTIUMPRO:
@@ -1649,7 +1713,7 @@ cpu_set(void)
                 x86_setopcodes(ops_386, ops_pentium2d_0f);
             else
                 x86_setopcodes(ops_386, ops_pentium2_0f);
-#endif
+#endif /* USE_DYNAREC */
             if (fpu_softfloat) {
                 x86_opcodes_da_a16 = ops_sf_fpu_686_da_a16;
                 x86_opcodes_da_a32 = ops_sf_fpu_686_da_a32;
@@ -1702,12 +1766,14 @@ cpu_set(void)
             if (cpu_s->cpu_type >= CPU_PENTIUM2)
                 cpu_features |= CPU_FEATURE_MMX;
             cpu_CR4_mask = CR4_VME | CR4_PVI | CR4_TSD | CR4_DE | CR4_PSE | CR4_MCE | CR4_PAE | CR4_PCE | CR4_PGE;
-            if (cpu_s->cpu_type == CPU_PENTIUM2D)
+            if (cpu_s->cpu_type == CPU_PENTIUM2D) {
                 cpu_CR4_mask |= CR4_OSFXSR;
+                cpu_features |= CPU_FEATURE_PSE36;
+            }
 
 #ifdef USE_DYNAREC
             codegen_timing_set(&codegen_timing_p6);
-#endif
+#endif /* USE_DYNAREC */
             break;
 
         case CPU_CYRIX3S:
@@ -1715,7 +1781,7 @@ cpu_set(void)
             x86_setopcodes(ops_386, ops_winchip2_0f, dynarec_ops_386, dynarec_ops_winchip2_0f);
 #else
             x86_setopcodes(ops_386, ops_winchip2_0f);
-#endif
+#endif /* USE_DYNAREC */
             timing_rr  = 1; /* register dest - register src */
             timing_rm  = 2; /* register dest - memory src */
             timing_mr  = 2; /* memory dest   - register src */
@@ -1755,7 +1821,7 @@ cpu_set(void)
 
 #ifdef USE_DYNAREC
             codegen_timing_set(&codegen_timing_winchip);
-#endif
+#endif /* USE_DYNAREC */
             break;
 
         default:
@@ -1793,9 +1859,10 @@ cpu_set(void)
             cpu_exec = exec386_dynarec;
             cpu_use_exec = 1;
         } else
-#endif
+#endif /* defined(USE_DYNAREC) && !defined(USE_GDBSTUB) */
             /* Use exec386 for CPU_IBM486SLC because it can reach 100 MHz. */
-            if ((cpu_s->cpu_type == CPU_IBM486SLC) || (cpu_s->cpu_type > CPU_486DLC)) {
+            if ((cpu_s->cpu_type == CPU_IBM486SLC) || (cpu_s->cpu_type == CPU_IBM486BL) ||
+                cpu_iscyrix || (cpu_s->cpu_type > CPU_486DLC) || cpu_override_interpreter) {
                 cpu_exec = exec386;
                 cpu_use_exec = 1;
             } else
@@ -1906,7 +1973,7 @@ cpu_CPUID(void)
         case CPU_i486SX_SLENH:
             if (!EAX) {
                 EAX = 0x00000001;
-                EBX = 0x756e6547;
+                EBX = 0x756e6547; /* GenuineIntel */
                 EDX = 0x49656e69;
                 ECX = 0x6c65746e;
             } else if (EAX == 1) {
@@ -1920,7 +1987,7 @@ cpu_CPUID(void)
         case CPU_i486DX_SLENH:
             if (!EAX) {
                 EAX = 0x00000001;
-                EBX = 0x756e6547;
+                EBX = 0x756e6547; /* GenuineIntel */
                 EDX = 0x49656e69;
                 ECX = 0x6c65746e;
             } else if (EAX == 1) {
@@ -1936,21 +2003,21 @@ cpu_CPUID(void)
 
         case CPU_ENH_Am486DX:
             if (!EAX) {
-                EAX = 1;
-                EBX = 0x68747541;
+                EAX = 0x00000001;
+                EBX = 0x68747541;/* AuthenticAMD */
                 ECX = 0x444D4163;
                 EDX = 0x69746E65;
             } else if (EAX == 1) {
                 EAX = CPUID;
                 EBX = ECX = 0;
-                EDX       = CPUID_FPU; /*FPU*/
+                EDX       = CPUID_FPU;
             } else
                 EAX = EBX = ECX = EDX = 0;
             break;
 
         case CPU_WINCHIP:
             if (!EAX) {
-                EAX = 1;
+                EAX = 0x00000001;
                 if (msr.fcr2 & (1 << 14)) {
                     EBX = msr.fcr3 >> 32;
                     ECX = msr.fcr3 & 0xffffffff;
@@ -1961,9 +2028,9 @@ cpu_CPUID(void)
                     EDX = 0x48727561;
                 }
             } else if (EAX == 1) {
-                EAX = 0x540;
+                EAX = ((msr.fcr2 & 0x0ff0) ? ((msr.fcr2 & 0x0ff0) | (CPUID & 0xf00f)) : CPUID);
                 EBX = ECX = 0;
-                EDX       = CPUID_FPU | CPUID_TSC | CPUID_MSR;
+                EDX       = CPUID_FPU | CPUID_DE | CPUID_TSC | CPUID_MSR;
                 if (cpu_has_feature(CPU_FEATURE_CX8))
                     EDX |= CPUID_CMPXCHG8B;
                 if (msr.fcr & (1 << 9))
@@ -1975,7 +2042,7 @@ cpu_CPUID(void)
         case CPU_WINCHIP2:
             switch (EAX) {
                 case 0:
-                    EAX = 1;
+                    EAX = 0x00000001;
                     if (msr.fcr2 & (1 << 14)) {
                         EBX = msr.fcr3 >> 32;
                         ECX = msr.fcr3 & 0xffffffff;
@@ -1987,9 +2054,9 @@ cpu_CPUID(void)
                     }
                     break;
                 case 1:
-                    EAX = CPUID;
+                    EAX = ((msr.fcr2 & 0x0ff0) ? ((msr.fcr2 & 0x0ff0) | (CPUID & 0xf00f)) : CPUID);
                     EBX = ECX = 0;
-                    EDX       = CPUID_FPU | CPUID_TSC | CPUID_MSR;
+                    EDX       = CPUID_FPU | CPUID_DE | CPUID_TSC | CPUID_MSR;
                     if (cpu_has_feature(CPU_FEATURE_CX8))
                         EDX |= CPUID_CMPXCHG8B;
                     if (msr.fcr & (1 << 9))
@@ -2000,7 +2067,7 @@ cpu_CPUID(void)
                     break;
                 case 0x80000001:
                     EAX = CPUID;
-                    EDX = CPUID_FPU | CPUID_TSC | CPUID_MSR;
+                    EDX = CPUID_FPU | CPUID_DE | CPUID_TSC | CPUID_MSR;
                     if (cpu_has_feature(CPU_FEATURE_CX8))
                         EDX |= CPUID_CMPXCHG8B;
                     if (msr.fcr & (1 << 9))
@@ -2032,126 +2099,91 @@ cpu_CPUID(void)
         case CPU_PENTIUM:
             if (!EAX) {
                 EAX = 0x00000001;
-                EBX = 0x756e6547;
+                EBX = 0x756e6547; /* GenuineIntel */
                 EDX = 0x49656e69;
                 ECX = 0x6c65746e;
             } else if (EAX == 1) {
                 EAX = CPUID;
                 EBX = ECX = 0;
-                EDX       = CPUID_FPU | CPUID_VME | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B;
+                EDX       = CPUID_FPU | CPUID_VME | CPUID_DE | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_CMPXCHG8B;
+                if (cpu_s->cpu_type != CPU_P24T)
+                    EDX |= CPUID_MCE;
             } else
                 EAX = EBX = ECX = EDX = 0;
             break;
 
-#if defined(DEV_BRANCH) && defined(USE_AMD_K5)
+#ifdef USE_AMD_K5
         case CPU_K5:
             if (!EAX) {
                 EAX = 0x00000001;
-                EBX = 0x68747541;
+                EBX = 0x68747541; /* AuthenticAMD */
                 EDX = 0x69746E65;
                 ECX = 0x444D4163;
             } else if (EAX == 1) {
                 EAX = CPUID;
                 EBX = ECX = 0;
-                EDX       = CPUID_FPU | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B;
+                EDX       = CPUID_FPU | CPUID_DE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_AMDPGE;
             } else
                 EAX = EBX = ECX = EDX = 0;
             break;
 
         case CPU_5K86:
-            if (!EAX) {
-                EAX = 0x00000001;
-                EBX = 0x68747541;
-                EDX = 0x69746E65;
-                ECX = 0x444D4163;
-            } else if (EAX == 1) {
-                EAX = CPUID;
-                EBX = ECX = 0;
-                EDX       = CPUID_FPU | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B;
-            } else if (EAX == 0x80000000) {
-                EAX = 0x80000005;
-                EBX = ECX = EDX = 0;
-            } else if (EAX == 0x80000001) {
-                EAX = CPUID;
-                EBX = ECX = 0;
-                EDX       = CPUID_FPU | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B;
-            } else if (EAX == 0x80000002) {
-                EAX = 0x2D444D41;
-                EBX = 0x7428354B;
-                ECX = 0x5020296D;
-                EDX = 0x65636F72;
-            } else if (EAX == 0x80000003) {
-                EAX = 0x726F7373;
-                EBX = ECX = EDX = 0;
-            } else if (EAX == 0x80000004)
-                EAX = EBX = ECX = EDX = 0;
-            else if (EAX == 0x80000005) {
-                EAX = 0;
-                EBX = 0x04800000;
-                ECX = 0x08040120;
-                EDX = 0x10040120;
-            } else
-                EAX = EBX = ECX = EDX = 0;
-            break;
-#endif
-
-        case CPU_K6:
-            if (!EAX) {
-                EAX = 0x00000001;
-                EBX = 0x68747541;
-                EDX = 0x69746E65;
-                ECX = 0x444D4163;
-            } else if (EAX == 1) {
-                EAX = CPUID;
-                EBX = ECX = 0;
-                EDX       = CPUID_FPU | CPUID_VME | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_MMX;
-            } else if (EAX == 0x80000000) {
-                EAX = 0x80000005;
-                EBX = ECX = EDX = 0;
-            } else if (EAX == 0x80000001) {
-                EAX = CPUID + 0x100;
-                EBX = ECX = 0;
-                EDX       = CPUID_FPU | CPUID_VME | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_AMDSEP | CPUID_MMX;
-            } else if (EAX == 0x80000002) {
-                EAX = 0x2D444D41;
-                EBX = 0x6D74364B;
-                ECX = 0x202F7720;
-                EDX = 0x746C756D;
-            } else if (EAX == 0x80000003) {
-                EAX = 0x64656D69;
-                EBX = 0x65206169;
-                ECX = 0x6E657478;
-                EDX = 0x6E6F6973;
-            } else if (EAX == 0x80000004) {
-                EAX = 0x73;
-                EBX = ECX = EDX = 0;
-            } else if (EAX == 0x80000005) {
-                EAX = 0;
-                EBX = 0x02800140;
-                ECX = 0x20020220;
-                EDX = 0x20020220;
-            } else if (EAX == 0x8FFFFFFF) {
-                EAX = 0x4778654E;
-                EBX = 0x72656E65;
-                ECX = 0x6F697461;
-                EDX = 0x444D416E;
-            } else
-                EAX = EBX = ECX = EDX = 0;
-            break;
-
-        case CPU_K6_2:
-        case CPU_K6_2C:
             switch (EAX) {
                 case 0:
-                    EAX = 1;
+                    EAX = 0x00000001;
                     EBX = 0x68747541; /* AuthenticAMD */
-                    ECX = 0x444d4163;
-                    EDX = 0x69746e65;
+                    EDX = 0x69746E65;
+                    ECX = 0x444D4163;
                     break;
                 case 1:
                     EAX = CPUID;
                     EBX = ECX = 0;
-                    EDX       = CPUID_FPU | CPUID_VME | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_MMX;
+                    EDX       = CPUID_FPU | CPUID_DE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_PGE;
+                    break;
+                case 0x80000000:
+                    EAX = 0x80000005;
+                    EBX = ECX = EDX = 0;
+                    break;
+                case 0x80000001:
+                    EAX = CPUID;
+                    EBX = ECX = 0;
+                    EDX       = CPUID_FPU | CPUID_DE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_PGE;
+                    break;
+                case 0x80000002:      /* Processor name string */
+                    EAX = 0x2D444D41; /* AMD-K5(tm) Proce */
+                    EBX = 0x7428354B;
+                    ECX = 0x5020296D;
+                    EDX = 0x65636F72;
+                    break;
+                case 0x80000003:      /* Processor name string */
+                    EAX = 0x726F7373; /* ssor */
+                    EBX = ECX = EDX = 0;
+                    break;
+                case 0x80000005:      /* Cache information */
+                    EAX = 0;
+                    EBX = 0x04800000; /* TLBs */
+                    ECX = 0x08040120; /* L1 data cache */
+                    EDX = 0x10040120; /* L1 instruction cache */
+                    break;
+                default:
+                    EAX = EBX = ECX = EDX = 0;
+                    break;
+            }
+            break;
+#endif /* USE_AMD_K5 */
+
+        case CPU_K6:
+            switch (EAX) {
+                case 0:
+                    EAX = 0x00000001;
+                    EBX = 0x68747541; /* AuthenticAMD */
+                    EDX = 0x69746E65;
+                    ECX = 0x444D4163;
+                    break;
+                case 1:
+                    EAX = CPUID;
+                    EBX = ECX = 0;
+                    EDX       = CPUID_FPU | CPUID_VME | CPUID_DE | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_MMX;
                     break;
                 case 0x80000000:
                     EAX = 0x80000005;
@@ -2160,7 +2192,68 @@ cpu_CPUID(void)
                 case 0x80000001:
                     EAX = CPUID + 0x100;
                     EBX = ECX = 0;
-                    EDX       = CPUID_FPU | CPUID_VME | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_AMDSEP | CPUID_MMX | CPUID_3DNOW;
+                    EDX       = CPUID_FPU | CPUID_VME | CPUID_DE | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_AMDSEP | CPUID_MMX;
+                    break;
+                case 0x80000002:      /* Processor name string */
+                    EAX = 0x2D444D41; /* AMD-K6tm w/ mult */
+                    EBX = 0x6D74364B;
+                    ECX = 0x202F7720;
+                    EDX = 0x746C756D;
+                    break;
+                case 0x80000003:      /* Processor name string */
+                    EAX = 0x64656D69; /* imedia extension */
+                    EBX = 0x65206169;
+                    ECX = 0x6E657478;
+                    EDX = 0x6E6F6973;
+                    break;
+                case 0x80000004:      /* Processor name string */
+                    EAX = 0x73;       /* s */
+                    EBX = ECX = EDX = 0;
+                    break;
+                case 0x80000005:      /* Cache information */
+                    EAX = 0;
+                    EBX = 0x02800140; /* TLBs */
+                    ECX = 0x20020220; /* L1 data cache */
+                    EDX = 0x20020220; /* L1 instruction cache */
+                    break;
+                case 0x8FFFFFFF:      /* Easter egg */
+                    EAX = 0x4778654E; /* NexGenerationAMD */
+                    EBX = 0x72656E65;
+                    ECX = 0x6F697461;
+                    EDX = 0x444D416E;
+                    break;
+                default:
+                    EAX = EBX = ECX = EDX = 0;
+                    break;
+            }
+            break;
+
+        case CPU_K6_2:
+        case CPU_K6_2C:
+            switch (EAX) {
+                case 0:
+                    EAX = 0x00000001;
+                    EBX = 0x68747541; /* AuthenticAMD */
+                    ECX = 0x444d4163;
+                    EDX = 0x69746e65;
+                    break;
+                case 1:
+                    EAX = CPUID;
+                    EBX = ECX = 0;
+                    EDX       = CPUID_FPU | CPUID_VME | CPUID_DE | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_MMX;
+                    if (cpu_s->cpu_type == CPU_K6_2C)
+                        EDX |= CPUID_PGE;
+                    break;
+                case 0x80000000:
+                    EAX = 0x80000005;
+                    EBX = ECX = EDX = 0;
+                    break;
+                case 0x80000001:
+                    EAX = CPUID + 0x100;
+                    EBX = ECX = 0;
+                    EDX       = CPUID_FPU | CPUID_VME | CPUID_DE | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_SEP | CPUID_MMX | CPUID_3DNOW;
+                    if (cpu_s->cpu_type == CPU_K6_2C)
+                        EDX |= CPUID_PGE;
                     break;
                 case 0x80000002:      /* Processor name string */
                     EAX = 0x2d444d41; /* AMD-K6(tm) 3D pr */
@@ -2174,11 +2267,11 @@ cpu_CPUID(void)
                     ECX = 0x00000000;
                     EDX = 0x00000000;
                     break;
-                case 0x80000005: /*Cache information*/
+                case 0x80000005: /* Cache information */
                     EAX = 0;
-                    EBX = 0x02800140; /*TLBs*/
-                    ECX = 0x20020220; /*L1 data cache*/
-                    EDX = 0x20020220; /*L1 instruction cache*/
+                    EBX = 0x02800140; /* TLBs */
+                    ECX = 0x20020220; /* L1 data cache */
+                    EDX = 0x20020220; /* L1 instruction cache */
                     break;
                 default:
                     EAX = EBX = ECX = EDX = 0;
@@ -2189,7 +2282,7 @@ cpu_CPUID(void)
         case CPU_K6_3:
             switch (EAX) {
                 case 0:
-                    EAX = 1;
+                    EAX = 0x00000001;
                     EBX = 0x68747541; /* AuthenticAMD */
                     ECX = 0x444d4163;
                     EDX = 0x69746e65;
@@ -2197,7 +2290,7 @@ cpu_CPUID(void)
                 case 1:
                     EAX = CPUID;
                     EBX = ECX = 0;
-                    EDX       = CPUID_FPU | CPUID_VME | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_MMX;
+                    EDX       = CPUID_FPU | CPUID_VME | CPUID_DE | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_PGE | CPUID_MMX;
                     break;
                 case 0x80000000:
                     EAX = 0x80000006;
@@ -2206,7 +2299,7 @@ cpu_CPUID(void)
                 case 0x80000001:
                     EAX = CPUID + 0x100;
                     EBX = ECX = 0;
-                    EDX       = CPUID_FPU | CPUID_VME | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_AMDSEP | CPUID_MMX | CPUID_3DNOW;
+                    EDX       = CPUID_FPU | CPUID_VME | CPUID_DE | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_SEP | CPUID_PGE | CPUID_MMX | CPUID_3DNOW;
                     break;
                 case 0x80000002:      /* Processor name string */
                     EAX = 0x2d444d41; /* AMD-K6(tm) 3D+ P */
@@ -2223,8 +2316,8 @@ cpu_CPUID(void)
                 case 0x80000005: /* Cache information */
                     EAX = 0;
                     EBX = 0x02800140; /* TLBs */
-                    ECX = 0x20020220; /*L1 data cache*/
-                    EDX = 0x20020220; /*L1 instruction cache*/
+                    ECX = 0x20020220; /* L1 data cache */
+                    EDX = 0x20020220; /* L1 instruction cache */
                     break;
                 case 0x80000006: /* L2 Cache information */
                     EAX = EBX = EDX = 0;
@@ -2240,7 +2333,7 @@ cpu_CPUID(void)
         case CPU_K6_3P:
             switch (EAX) {
                 case 0:
-                    EAX = 1;
+                    EAX = 0x00000001;
                     EBX = 0x68747541; /* AuthenticAMD */
                     ECX = 0x444d4163;
                     EDX = 0x69746e65;
@@ -2248,7 +2341,7 @@ cpu_CPUID(void)
                 case 1:
                     EAX = CPUID;
                     EBX = ECX = 0;
-                    EDX       = CPUID_FPU | CPUID_VME | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_MMX;
+                    EDX       = CPUID_FPU | CPUID_VME | CPUID_DE | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_PGE | CPUID_MMX;
                     break;
                 case 0x80000000:
                     EAX = 0x80000007;
@@ -2257,7 +2350,7 @@ cpu_CPUID(void)
                 case 0x80000001:
                     EAX = CPUID + 0x100;
                     EBX = ECX = 0;
-                    EDX       = CPUID_FPU | CPUID_VME | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_AMDSEP | CPUID_MMX | CPUID_3DNOW | CPUID_3DNOWE;
+                    EDX       = CPUID_FPU | CPUID_VME | CPUID_DE | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_SEP | CPUID_MMX | CPUID_PGE | CPUID_3DNOW | CPUID_3DNOWE;
                     break;
                 case 0x80000002:      /* Processor name string */
                     EAX = 0x2d444d41; /* AMD-K6(tm)-III P */
@@ -2297,22 +2390,21 @@ cpu_CPUID(void)
         case CPU_PENTIUMMMX:
             if (!EAX) {
                 EAX = 0x00000001;
-                EBX = 0x756e6547;
+                EBX = 0x756e6547; /* GenuineIntel */
                 EDX = 0x49656e69;
                 ECX = 0x6c65746e;
             } else if (EAX == 1) {
                 EAX = CPUID;
                 EBX = ECX = 0;
-                EDX       = CPUID_FPU | CPUID_VME | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_MMX;
+                EDX       = CPUID_FPU | CPUID_VME | CPUID_DE | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_MMX;
             } else
                 EAX = EBX = ECX = EDX = 0;
             break;
 
-#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
         case CPU_Cx6x86:
             if (!EAX) {
                 EAX = 0x00000001;
-                EBX = 0x69727943;
+                EBX = 0x69727943; /* CyrixInstead */
                 EDX = 0x736e4978;
                 ECX = 0x64616574;
             } else if (EAX == 1) {
@@ -2326,7 +2418,7 @@ cpu_CPUID(void)
         case CPU_Cx6x86L:
             if (!EAX) {
                 EAX = 0x00000001;
-                EBX = 0x69727943;
+                EBX = 0x69727943; /* CyrixInstead */
                 EDX = 0x736e4978;
                 ECX = 0x64616574;
             } else if (EAX == 1) {
@@ -2340,13 +2432,13 @@ cpu_CPUID(void)
         case CPU_CxGX1:
             if (!EAX) {
                 EAX = 0x00000001;
-                EBX = 0x69727943;
+                EBX = 0x69727943; /* CyrixInstead */
                 EDX = 0x736e4978;
                 ECX = 0x64616574;
             } else if (EAX == 1) {
                 EAX = CPUID;
                 EBX = ECX = 0;
-                EDX       = CPUID_FPU | CPUID_TSC | CPUID_MSR | CPUID_CMPXCHG8B;
+                EDX       = CPUID_FPU | CPUID_DE | CPUID_TSC | CPUID_MSR | CPUID_CMPXCHG8B;
             } else
                 EAX = EBX = ECX = EDX = 0;
             break;
@@ -2354,43 +2446,41 @@ cpu_CPUID(void)
         case CPU_Cx6x86MX:
             if (!EAX) {
                 EAX = 0x00000001;
-                EBX = 0x69727943;
+                EBX = 0x69727943; /* CyrixInstead */
                 EDX = 0x736e4978;
                 ECX = 0x64616574;
             } else if (EAX == 1) {
                 EAX = CPUID;
                 EBX = ECX = 0;
-                EDX       = CPUID_FPU | CPUID_TSC | CPUID_MSR | CPUID_CMPXCHG8B | CPUID_CMOV | CPUID_MMX;
+                EDX       = CPUID_FPU | CPUID_DE | CPUID_TSC | CPUID_MSR | CPUID_CMPXCHG8B | CPUID_CMOV | CPUID_MMX;
             } else
                 EAX = EBX = ECX = EDX = 0;
             break;
-#endif
 
         case CPU_PENTIUMPRO:
             if (!EAX) {
                 EAX = 0x00000002;
-                EBX = 0x756e6547;
+                EBX = 0x756e6547; /* GenuineIntel */
                 EDX = 0x49656e69;
                 ECX = 0x6c65746e;
             } else if (EAX == 1) {
                 EAX = CPUID;
                 EBX = ECX = 0;
-                EDX       = CPUID_FPU | CPUID_VME | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_PAE | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_MTRR | CPUID_PGE | CPUID_MCA | CPUID_SEP | CPUID_CMOV;
+                EDX       = CPUID_FPU | CPUID_VME | CPUID_DE | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_PAE | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_MTRR | CPUID_PGE | CPUID_MCA | CPUID_SEP | CPUID_CMOV;
+                /*
+                   Return anything non-zero in bits 32-63 of the BIOS signature MSR
+                   to indicate there has been an update.
+                 */
+                msr.bbl_cr_dx[3] = 0xffffffff00000000ULL;
             } else if (EAX == 2) {
-                /* if (!strcmp(machine_get_internal_name(), "ap61")) {
-                    EAX = 0x00000001;
-                    EDX = 0x00000000;
-                } else */ {
-                    EAX = 0x03020101; /* Instruction TLB: 4 KB pages, 4-way set associative, 32 entries
-                                         Instruction TLB: 4 MB pages, fully associative, 2 entries
-                                         Data TLB: 4 KB pages, 4-way set associative, 64 entries */
-                    EDX       = 0x06040a42; /* 2nd-level cache: 256 KB, 4-way set associative, 32-byte line size
-                                               1st-level data cache: 8 KB, 2-way set associative, 32-byte line size
-                                               Data TLB: 4 MB pages, 4-way set associative, 8 entries
-                                               1st-level instruction cache:8 KB, 4-way set associative, 32-byte line size */
-                }
-
+                EAX = 0x03020101; /* Instruction TLB: 4 KB pages, 4-way set associative, 32 entries
+                                     Instruction TLB: 4 MB pages, fully associative, 2 entries
+                                     Data TLB: 4 KB pages, 4-way set associative, 64 entries */
                 EBX = ECX = 0;
+                EDX       = 0x06040a42; /* 2nd-level cache: 256 KB, 4-way set associative, 32-byte line size
+                                           1st-level data cache: 8 KB, 2-way set associative, 32-byte line size
+                                           Data TLB: 4 MB pages, 4-way set associative, 8 entries
+                                           1st-level instruction cache: 8 KB, 4-way set associative, 32-byte line size */
             } else
                 EAX = EBX = ECX = EDX = 0;
             break;
@@ -2398,13 +2488,18 @@ cpu_CPUID(void)
         case CPU_PENTIUM2:
             if (!EAX) {
                 EAX = 0x00000002;
-                EBX = 0x756e6547;
+                EBX = 0x756e6547; /* GenuineIntel */
                 EDX = 0x49656e69;
                 ECX = 0x6c65746e;
             } else if (EAX == 1) {
                 EAX = CPUID;
                 EBX = ECX = 0;
-                EDX       = CPUID_FPU | CPUID_VME | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_PAE | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_MMX | CPUID_MTRR | CPUID_PGE | CPUID_MCA | CPUID_SEP | CPUID_CMOV;
+                EDX       = CPUID_FPU | CPUID_VME | CPUID_DE | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_PAE | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_MMX | CPUID_MTRR | CPUID_PGE | CPUID_MCA | CPUID_SEP | CPUID_CMOV;
+                /*
+                   Return anything non-zero in bits 32-63 of the BIOS signature MSR
+                   to indicate there has been an update.
+                 */
+                msr.bbl_cr_dx[3] = 0xffffffff00000000ULL;
             } else if (EAX == 2) {
                 EAX = 0x03020101; /* Instruction TLB: 4 KB pages, 4-way set associative, 32 entries
                                      Instruction TLB: 4 MB pages, fully associative, 2 entries
@@ -2421,13 +2516,18 @@ cpu_CPUID(void)
         case CPU_PENTIUM2D:
             if (!EAX) {
                 EAX = 0x00000002;
-                EBX = 0x756e6547;
+                EBX = 0x756e6547; /* GenuineIntel */
                 EDX = 0x49656e69;
                 ECX = 0x6c65746e;
             } else if (EAX == 1) {
                 EAX = CPUID;
                 EBX = ECX = 0;
-                EDX       = CPUID_FPU | CPUID_VME | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_PAE | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_MMX | CPUID_MTRR | CPUID_PGE | CPUID_MCA | CPUID_SEP | CPUID_FXSR | CPUID_CMOV;
+                EDX       = CPUID_FPU | CPUID_VME | CPUID_DE | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_PAE | CPUID_MCE | CPUID_CMPXCHG8B | CPUID_MMX | CPUID_MTRR | CPUID_PGE | CPUID_MCA | CPUID_SEP | CPUID_FXSR | CPUID_CMOV | CPUID_PSE36;
+                /*
+                   Return anything non-zero in bits 32-63 of the BIOS signature MSR
+                   to indicate there has been an update.
+                 */
+                msr.bbl_cr_dx[3] = 0xffffffff00000000ULL;
             } else if (EAX == 2) {
                 EAX = 0x03020101; /* Instruction TLB: 4 KB pages, 4-way set associative, 32 entries
                                      Instruction TLB: 4 MB pages, fully associative, 2 entries
@@ -2452,7 +2552,7 @@ cpu_CPUID(void)
         case CPU_CYRIX3S:
             switch (EAX) {
                 case 0:
-                    EAX = 1;
+                    EAX = 0x00000001;
                     if (msr.fcr2 & (1 << 14)) {
                         EBX = msr.fcr3 >> 32;
                         ECX = msr.fcr3 & 0xffffffff;
@@ -2464,9 +2564,9 @@ cpu_CPUID(void)
                     }
                     break;
                 case 1:
-                    EAX = CPUID;
+                    EAX = ((msr.fcr2 & 0x0ff0) ? ((msr.fcr2 & 0x0ff0) | (CPUID & 0xf00f)) : CPUID);
                     EBX = ECX = 0;
-                    EDX       = CPUID_FPU | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_MMX | CPUID_MTRR;
+                    EDX       = CPUID_FPU | CPUID_DE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_MMX | CPUID_MTRR;
                     if (cpu_has_feature(CPU_FEATURE_CX8))
                         EDX |= CPUID_CMPXCHG8B;
                     if (msr.fcr & (1 << 7))
@@ -2477,7 +2577,7 @@ cpu_CPUID(void)
                     break;
                 case 0x80000001:
                     EAX = CPUID;
-                    EDX = CPUID_FPU | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_MMX | CPUID_MTRR | CPUID_3DNOW;
+                    EDX = CPUID_FPU | CPUID_DE | CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_MMX | CPUID_MTRR | CPUID_3DNOW;
                     if (cpu_has_feature(CPU_FEATURE_CX8))
                         EDX |= CPUID_CMPXCHG8B;
                     if (msr.fcr & (1 << 7))
@@ -2510,9 +2610,12 @@ cpu_ven_reset(void)
     switch (cpu_s->cpu_type) {
         case CPU_WINCHIP:
         case CPU_WINCHIP2:
-            msr.fcr = (1 << 8) | (1 << 9) | (1 << 12) | (1 << 16) | (1 << 19) | (1 << 21);
-            if (cpu_s->cpu_type == CPU_WINCHIP2)
-                msr.fcr |= (1 << 18) | (1 << 20);
+            msr.fcr      = (1 << 8) | (1 << 9) | (1 << 12) | (1 << 16) | (1 << 19) | (1 << 21);
+            msr.mcr_ctrl = 0xf8000000;
+            if (cpu_s->cpu_type == CPU_WINCHIP2) {
+                msr.fcr      |= (1 << 18) | (1 << 20);
+                msr.mcr_ctrl |= (1 << 17);
+            }
             break;
 
         case CPU_K6_2P:
@@ -2522,18 +2625,41 @@ cpu_ven_reset(void)
             msr.amd_psor = (cpu_s->cpu_type >= CPU_K6_3) ? 0x008cULL : 0x018cULL;
             fallthrough;
         case CPU_K6_2:
-#if defined(DEV_BRANCH) && defined(USE_AMD_K5)
+#ifdef USE_AMD_K5
         case CPU_K5:
         case CPU_5K86:
-#endif
+#endif /* USE_AMD_K5 */
         case CPU_K6:
             msr.amd_efer = (cpu_s->cpu_type >= CPU_K6_2C) ? 2ULL : 0ULL;
             break;
 
+        case CPU_Cx6x86MX:
+            ccr0 = 0x00;
+            ccr1 = 0x00;
+            ccr2 = 0x00;
+            ccr3 = 0x00;
+            ccr4 = 0x80;
+            ccr5 = 0x00;
+            ccr6 = 0x00;
+            memset(arr, 0x00, 24);
+            memset(rcr, 0x00, 3);
+            cyrix.arr[3].base = 0x00;
+            cyrix.arr[3].size = 0; /* Disabled */
+            cyrix.smhr &= ~SMHR_VALID;
+            CPUID = cpu_s->cpuid_model;
+            reg_30 = 0xff;
+            break;
+
         case CPU_PENTIUMPRO:
         case CPU_PENTIUM2:
         case CPU_PENTIUM2D:
             msr.mtrr_cap = 0x00000508ULL;
+
+            /* 4 GB cacheable space on Deschutes 651h and later (including the 1632h
+               Overdrive) according to the Pentium II Processor Specification Update.
+               Covington 651h (no L2 cache) reports the same 512 MB value as Klamath. */
+            if (CPUID >= (!strncmp(cpu_f->internal_name, "celeron", 7) ? 0x660 : 0x651))
+                msr.bbl_cr_ctl3 |= 0x00300000;
             break;
 
         case CPU_CYRIX3S:
@@ -2546,24 +2672,36 @@ cpu_ven_reset(void)
 void
 cpu_RDMSR(void)
 {
-    switch (cpu_s->cpu_type) {
+    if ((CPL || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1))
+        x86gpf(NULL, 0);
+    else  switch (cpu_s->cpu_type) {
         case CPU_IBM386SLC:
         case CPU_IBM486SLC:
         case CPU_IBM486BL:
             EAX = EDX = 0;
             switch (ECX) {
+                /* Processor Operation Register */
                 case 0x1000:
                     EAX = msr.ibm_por & ((cpu_s->cpu_type > CPU_IBM386SLC) ? 0xffeff : 0xfeff);
                     break;
 
+                /* Cache Region Control Register */
                 case 0x1001:
-                    EAX = msr.ibm_crcr & 0xffffffffff;
+                    EAX = msr.ibm_crcr & 0xffffffff;
+                    EDX = (msr.ibm_crcr >> 32) & 0x0000ffff;
                     break;
 
+                /* Processor Operation Register */
                 case 0x1002:
                     if ((cpu_s->cpu_type > CPU_IBM386SLC) && cpu_s->multi)
                         EAX = msr.ibm_por2 & 0x3f000000;
                     break;
+
+                /* Processor Control Register */
+                case 0x1004:
+                    if (cpu_s->cpu_type > CPU_IBM486SLC)
+                        EAX = msr.ibm_pcr & 0x00d6001a;
+                    break;
             }
             break;
 
@@ -2571,42 +2709,74 @@ cpu_RDMSR(void)
         case CPU_WINCHIP2:
             EAX = EDX = 0;
             switch (ECX) {
+                /* Pentium Processor Parity Reversal Register */
                 case 0x02:
                     EAX = msr.tr1;
                     break;
+                /* Pentium Processor New Feature Control */
                 case 0x0e:
                     EAX = msr.tr12;
                     break;
+                /* Time Stamp Counter */
                 case 0x10:
                     EAX = tsc & 0xffffffff;
                     EDX = tsc >> 32;
                     break;
+                /* Performance Monitor - Control and Event Select */
                 case 0x11:
                     EAX = msr.cesr;
                     break;
+                /* Performance Monitor - Event Counter 0 */
+                case 0x12:
+                    EAX = msr.pmc[0] & 0xffffffff;
+                    EDX = msr.pmc[0] >> 32;
+                    break;
+                /* Performance Monitor - Event Counter 1 */
+                case 0x13:
+                    EAX = msr.pmc[1] & 0xffffffff;
+                    EDX = msr.pmc[1] >> 32;
+                    break;
+                /* Feature Control Register */
                 case 0x107:
                     EAX = msr.fcr;
                     break;
+                /* Feature Control Register 2 */
                 case 0x108:
                     EAX = msr.fcr2 & 0xffffffff;
                     EDX = msr.fcr2 >> 32;
                     break;
+                /* Feature Control Register 4 */
                 case 0x10a:
                     EAX = cpu_multi & 3;
                     break;
+                /* Memory Configuration Register Control */
+                case 0x120:
+                    EAX = msr.mcr_ctrl;
+                    break;
+                /* Unknown */
+                case 0x131:
+                case 0x142 ... 0x145:
+                case 0x147:
+                case 0x150:
+                case 0x151:
+                    break;
             }
             break;
 
         case CPU_CYRIX3S:
             EAX = EDX = 0;
             switch (ECX) {
+                /* Machine Check Exception Address */
                 case 0x00:
+                /* Machine Check Exception Type */
                 case 0x01:
                     break;
+                /* Time Stamp Counter */
                 case 0x10:
                     EAX = tsc & 0xffffffff;
                     EDX = tsc >> 32;
                     break;
+                /* EBL_CR_POWERON - Processor Hard Power-On Configuration */
                 case 0x2a:
                     EAX = 0xc4000000;
                     EDX = 0;
@@ -2633,29 +2803,41 @@ cpu_RDMSR(void)
                     if (cpu_busspeed >= 84000000)
                         EAX |= (1 << 19);
                     break;
+                /* PERFCTR0 - Performance Counter Register 0 - aliased to TSC */
+                case 0xc1:
+                    EAX = tsc & 0xffffffff;
+                    EDX = (tsc >> 32) & 0xff;
+                    break;
+                /* PERFCTR1 - Performance Counter Register 1 */
+                case 0xc2:
+                    EAX = msr.perfctr[1] & 0xffffffff;
+                    EDX = msr.perfctr[1] >> 32;
+                    break;
+                /* BBL_CR_CTL3 - L2 Cache Control Register 3 */
+                case 0x11e:
+                    EAX = 0x800000; /* L2 cache disabled */
+                    break;
+                /* EVNTSEL0 - Performance Counter Event Select 0 - hardcoded */
+                case 0x186:
+                    EAX = 0x470079;
+                    break;
+                /* EVNTSEL1 - Performance Counter Event Select 1 */
+                case 0x187:
+                    EAX = msr.evntsel[1] & 0xffffffff;
+                    EDX = msr.evntsel[1] >> 32;
+                    break;
+                /* Feature Control Register */
                 case 0x1107:
                     EAX = msr.fcr;
                     break;
+                /* Feature Control Register 2 */
                 case 0x1108:
                     EAX = msr.fcr2 & 0xffffffff;
                     EDX = msr.fcr2 >> 32;
                     break;
-                case 0x200:
-                case 0x201:
-                case 0x202:
-                case 0x203:
-                case 0x204:
-                case 0x205:
-                case 0x206:
-                case 0x207:
-                case 0x208:
-                case 0x209:
-                case 0x20a:
-                case 0x20b:
-                case 0x20c:
-                case 0x20d:
-                case 0x20e:
-                case 0x20f:
+                /* ECX & 0: MTRRphysBase0 ... MTRRphysBase7
+                   ECX & 1: MTRRphysMask0 ... MTRRphysMask7 */
+                case 0x200 ... 0x20f:
                     if (ECX & 1) {
                         EAX = msr.mtrr_physmask[(ECX - 0x200) >> 1] & 0xffffffff;
                         EDX = msr.mtrr_physmask[(ECX - 0x200) >> 1] >> 32;
@@ -2664,29 +2846,27 @@ cpu_RDMSR(void)
                         EDX = msr.mtrr_physbase[(ECX - 0x200) >> 1] >> 32;
                     }
                     break;
+                /* MTRRfix64K_00000 */
                 case 0x250:
                     EAX = msr.mtrr_fix64k_8000 & 0xffffffff;
                     EDX = msr.mtrr_fix64k_8000 >> 32;
                     break;
+                /* MTRRfix16K_80000 */
                 case 0x258:
                     EAX = msr.mtrr_fix16k_8000 & 0xffffffff;
                     EDX = msr.mtrr_fix16k_8000 >> 32;
                     break;
+                /* MTRRfix16K_A0000 */
                 case 0x259:
                     EAX = msr.mtrr_fix16k_a000 & 0xffffffff;
                     EDX = msr.mtrr_fix16k_a000 >> 32;
                     break;
-                case 0x268:
-                case 0x269:
-                case 0x26a:
-                case 0x26b:
-                case 0x26c:
-                case 0x26d:
-                case 0x26e:
-                case 0x26f:
+                /* MTRRfix4K_C0000 ... MTRRfix4K_F8000 */
+                case 0x268 ... 0x26f:
                     EAX = msr.mtrr_fix4k[ECX - 0x268] & 0xffffffff;
                     EDX = msr.mtrr_fix4k[ECX - 0x268] >> 32;
                     break;
+                /* MTRRdefType */
                 case 0x2ff:
                     EAX = msr.mtrr_deftype & 0xffffffff;
                     EDX = msr.mtrr_deftype >> 32;
@@ -2694,47 +2874,85 @@ cpu_RDMSR(void)
             }
             break;
 
-#if defined(DEV_BRANCH) && defined(USE_AMD_K5)
+#ifdef USE_AMD_K5
         case CPU_K5:
         case CPU_5K86:
-#endif
+#endif /* USE_AMD_K5 */
         case CPU_K6:
         case CPU_K6_2:
         case CPU_K6_2C:
         case CPU_K6_3:
         case CPU_K6_2P:
         case CPU_K6_3P:
-            EAX = EDX = 0;
+            EAX = 0;
+            /* EDX is left unchanged when reading this MSR! */
+            if (ECX != 0x82)
+                EDX = 0;
             switch (ECX) {
+                /* Machine Check Address Register */
                 case 0x00000000:
-                case 0x00000001:
+                    EAX = msr.mcar & 0xffffffff;
+                    EDX = msr.mcar >> 32;
                     break;
+                /* Machine Check Type Register */
+                case 0x00000001:
+                    EAX = msr.mctr & 0xffffffff;
+                    EDX = msr.mctr >> 32;
+                    break;
+                /* Test Register 12 */
                 case 0x0000000e:
                     EAX = msr.tr12;
                     break;
+                /* Time Stamp Counter */
                 case 0x00000010:
                     EAX = tsc & 0xffffffff;
                     EDX = tsc >> 32;
                     break;
-                case 0x00000083:
-                    EAX = msr.ecx83 & 0xffffffff;
-                    EDX = msr.ecx83 >> 32;
+                /* Array Access Register */
+                case 0x00000082:
+                    if (cpu_s->cpu_type > CPU_5K86)
+                        goto amd_k_invalid_rdmsr;
+                    EAX = msr.amd_aar & 0xffffffff;
+                    /* EDX is left unchanged! */
                     break;
+                /* Hardware Configuration Register */
+                case 0x00000083:
+                    EAX = msr.amd_hwcr & 0xffffffff;
+                    EDX = msr.amd_hwcr >> 32;
+                    break;
+                /* Write Allocate Top-of-Memory and Control Register */
+                case 0x00000085:
+                    if (cpu_s->cpu_type != CPU_5K86)
+                        goto amd_k_invalid_rdmsr;
+                    EAX = msr.amd_watmcr & 0xffffffff;
+                    EDX = msr.amd_watmcr >> 32;
+                    break;
+                /* Write Allocate Programmable Memory Range Register */
+                case 0x00000086:
+                    if (cpu_s->cpu_type != CPU_5K86)
+                        goto amd_k_invalid_rdmsr;
+                    EAX = msr.amd_wapmrr & 0xffffffff;
+                    EDX = msr.amd_wapmrr >> 32;
+                    break;
+                /* Extended Feature Enable Register */
                 case 0xc0000080:
                     EAX = msr.amd_efer & 0xffffffff;
                     EDX = msr.amd_efer >> 32;
                     break;
+                /* SYSCALL Target Address Register */
                 case 0xc0000081:
                     if (cpu_s->cpu_type < CPU_K6_2)
                         goto amd_k_invalid_rdmsr;
 
-                    EAX = msr.star & 0xffffffff;
-                    EDX = msr.star >> 32;
+                    EAX = msr.amd_star & 0xffffffff;
+                    EDX = msr.amd_star >> 32;
                     break;
+                /* Write-Handling Control Register */
                 case 0xc0000082:
                     EAX = msr.amd_whcr & 0xffffffff;
                     EDX = msr.amd_whcr >> 32;
                     break;
+                /* UC/WC Cacheability Control Register */
                 case 0xc0000085:
                     if (cpu_s->cpu_type < CPU_K6_2C)
                         goto amd_k_invalid_rdmsr;
@@ -2742,6 +2960,7 @@ cpu_RDMSR(void)
                     EAX = msr.amd_uwccr & 0xffffffff;
                     EDX = msr.amd_uwccr >> 32;
                     break;
+                /* Enhanced Power Management Register */
                 case 0xc0000086:
                     if (cpu_s->cpu_type < CPU_K6_2P)
                         goto amd_k_invalid_rdmsr;
@@ -2749,6 +2968,7 @@ cpu_RDMSR(void)
                     EAX = msr.amd_epmr & 0xffffffff;
                     EDX = msr.amd_epmr >> 32;
                     break;
+                /* Processor State Observability Register */
                 case 0xc0000087:
                     if (cpu_s->cpu_type < CPU_K6_2C)
                         goto amd_k_invalid_rdmsr;
@@ -2756,6 +2976,7 @@ cpu_RDMSR(void)
                     EAX = msr.amd_psor & 0xffffffff;
                     EDX = msr.amd_psor >> 32;
                     break;
+                /* Page Flush/Invalidate Register */
                 case 0xc0000088:
                     if (cpu_s->cpu_type < CPU_K6_2C)
                         goto amd_k_invalid_rdmsr;
@@ -2763,6 +2984,7 @@ cpu_RDMSR(void)
                     EAX = msr.amd_pfir & 0xffffffff;
                     EDX = msr.amd_pfir >> 32;
                     break;
+                /* Level-2 Cache Array Access Register */
                 case 0xc0000089:
                     if (cpu_s->cpu_type < CPU_K6_3)
                         goto amd_k_invalid_rdmsr;
@@ -2780,22 +3002,200 @@ amd_k_invalid_rdmsr:
         case CPU_P24T:
         case CPU_PENTIUM:
         case CPU_PENTIUMMMX:
-#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
+            EAX = EDX = 0;
+            /* Filter out the upper 27 bits when ECX value is over 0x80000000, as per:
+               Ralf Brown, Pentium Model-Specific Registers and What They Reveal.
+               https://www.cs.cmu.edu/~ralf/papers/highmsr.html
+               But leave the bit 31 intact to be able to handle both low and high
+               MSRs in a single switch block. */
+            switch (ECX & (ECX > 0x7fffffff ? 0x8000001f : 0x7fffffff)) {
+                /* Machine Check Exception Address */
+                case 0x00000000:
+                case 0x80000000:
+                    EAX = msr.mcar & 0xffffffff;
+                    EDX = msr.mcar >> 32;
+                    break;
+                /* Machine Check Exception Type */
+                case 0x00000001:
+                case 0x80000001:
+                    EAX = msr.mctr & 0xffffffff;
+                    EDX = msr.mctr >> 32;
+                    msr.mctr &= ~0x1; /* clear the machine check pending bit */
+                    break;
+                /* TR1 - Parity Reversal Test Register */
+                case 0x00000002:
+                case 0x80000002:
+                    EAX = msr.tr1;
+                    break;
+                /* TR2 - Instruction Cache End Bit */
+                case 0x00000004:
+                case 0x80000004:
+                    if (cpu_s->cpu_type == CPU_PENTIUMMMX)
+                        goto pentium_invalid_rdmsr;
+                    EAX = msr.tr2;
+                    break;
+                /* TR3 - Cache Test Data */
+                case 0x00000005:
+                case 0x80000005:
+                    EAX = msr.tr3;
+                    break;
+                /* TR4 - Cache Test Tag */
+                case 0x00000006:
+                case 0x80000006:
+                    EAX = msr.tr4;
+                    break;
+                /* TR5 - Cache Test Control */
+                case 0x00000007:
+                case 0x80000007:
+                    EAX = msr.tr5;
+                    break;
+                /* TR6 - TLB Test Command */
+                case 0x00000008:
+                case 0x80000008:
+                    EAX = msr.tr6;
+                    break;
+                /* TR7 - TLB Test Data */
+                case 0x00000009:
+                case 0x80000009:
+                    EAX = msr.tr7;
+                    break;
+                /* TR9 - Branch Target Buffer Tag */
+                case 0x0000000b:
+                case 0x8000000b:
+                    EAX = msr.tr9;
+                    break;
+                /* TR10 - Branch Target Buffer Target */
+                case 0x0000000c:
+                case 0x8000000c:
+                    EAX = msr.tr10;
+                    break;
+                /* TR11 - Branch Target Buffer Control */
+                case 0x0000000d:
+                case 0x8000000d:
+                    EAX = msr.tr11;
+                    break;
+                /* TR12 - New Feature Control */
+                case 0x0000000e:
+                case 0x8000000e:
+                    EAX = msr.tr12;
+                    break;
+                /* Time Stamp Counter */
+                case 0x00000010:
+                case 0x80000010:
+                    EAX = tsc & 0xffffffff;
+                    EDX = tsc >> 32;
+                    break;
+                /* Performance Monitor - Control and Event Select */
+                case 0x00000011:
+                case 0x80000011:
+                    EAX = msr.cesr;
+                    break;
+                /* Performance Monitor - Event Counter 0 */
+                case 0x00000012:
+                case 0x80000012:
+                    EAX = msr.pmc[0] & 0xffffffff;
+                    EDX = msr.pmc[0] >> 32;
+                    break;
+                /* Performance Monitor - Event Counter 1 */
+                case 0x00000013:
+                case 0x80000013:
+                    EAX = msr.pmc[1] & 0xffffffff;
+                    EDX = msr.pmc[1] >> 32;
+                    break;
+                /* Unknown */
+                case 0x00000014:
+                case 0x80000014:
+                    if ((CPUID & 0xfff) <= 0x520)
+                        goto pentium_invalid_rdmsr;
+                    break;
+                /* Unknown, possibly paging-related; initial value is 0004h,
+                   becomes 0008h once paging is enabled */
+                case 0x80000018:
+                        EAX = ((cr0 & (1 << 31)) ? 0x00000008 : 0x00000004);
+                    break;
+                /* Floating point - last prefetched opcode
+                   bits 10-8: low three bits of first byte of FP instruction
+                   bits 7-0: second byte of floating-point instruction */
+                case 0x80000019:
+                    EAX = 0;
+                    break;
+                /* Floating point - last executed non-control opcode */
+                case 0x8000001a:
+                    EAX = 0;
+                    break;
+                /* Floating point - last non-control exception opcode - part
+                   of FSTENV/FSAVE'd environment */
+                case 0x8000001b:
+                    EAX = msr.fp_last_xcpt;
+                    break;
+                /* Unknown */
+                case 0x8000001c:
+                    EAX = 0x00000004;
+                    break;
+                /* Probe Mode Control */
+                case 0x8000001d:
+                    EAX = msr.probe_ctl;
+                    break;
+                /* Unknown, possibly scratchpad register */
+                case 0x8000001e:
+                    EAX = msr.ecx8000001e;
+                    break;
+                /* Unknown, possibly scratchpad register */
+                case 0x8000001f:
+                    EAX = msr.ecx8000001f;
+                    break;
+                /* Reserved/Unimplemented */
+                case 0x80000003:
+                case 0x8000000a:
+                case 0x8000000f:
+                case 0x80000015 ... 0x80000017:
+                    EAX = (ECX & 0x1f) * 2;
+                    break;
+                default:
+pentium_invalid_rdmsr:
+                    cpu_log("RDMSR: Invalid MSR: %08X\n", ECX);
+                    x86gpf(NULL, 0);
+                    break;
+            }
+            cpu_log("RDMSR: ECX = %08X, val = %08X%08X\n", ECX, EDX, EAX);
+            break;
+
         case CPU_Cx6x86:
         case CPU_Cx6x86L:
         case CPU_CxGX1:
         case CPU_Cx6x86MX:
-            if (cpu_s->cpu_type < CPU_Cx6x86)
-#endif
-                EAX = EDX = 0;
             switch (ECX) {
-                case 0x00:
-                case 0x01:
+                /* Test Data */
+                case 0x03:
+                    EAX = msr.tr3;
                     break;
+                /* Test Address */
+                case 0x04:
+                    EAX = msr.tr4;
+                    break;
+                /* Test Command/Status */
+                case 0x05:
+                    EAX = msr.tr5;
+                    break;
+                /* Time Stamp Counter */
                 case 0x10:
                     EAX = tsc & 0xffffffff;
                     EDX = tsc >> 32;
                     break;
+                /* Performance Monitor - Control and Event Select */
+                case 0x11:
+                    EAX = msr.cesr;
+                    break;
+                /* Performance Monitor - Event Counter 0 */
+                case 0x12:
+                    EAX = msr.pmc[0] & 0xffffffff;
+                    EDX = msr.pmc[0] >> 32;
+                    break;
+                /* Performance Monitor - Event Counter 1 */
+                case 0x13:
+                    EAX = msr.pmc[1] & 0xffffffff;
+                    EDX = msr.pmc[1] >> 32;
+                    break;
             }
             cpu_log("RDMSR: ECX = %08X, val = %08X%08X\n", ECX, EDX, EAX);
             break;
@@ -2807,32 +3207,46 @@ amd_k_invalid_rdmsr:
             /* Per RichardG's probing of a real Deschutes using my RDMSR tool,
                we have discovered that the top 18 bits are filtered out. */
             switch (ECX & 0x00003fff) {
+                /* Machine Check Exception Address */
                 case 0x00:
+                /* Machine Check Exception Type */
                 case 0x01:
                     break;
+                /* Time Stamp Counter */
                 case 0x10:
                     EAX = tsc & 0xffffffff;
                     EDX = tsc >> 32;
                     break;
+                /* IA32_PLATFORM_ID - Platform ID */
                 case 0x17:
-                    if (cpu_s->cpu_type != CPU_PENTIUM2D)
+                    if (cpu_s->cpu_type < CPU_PENTIUM2D)
                         goto i686_invalid_rdmsr;
 
                     if (cpu_f->package == CPU_PKG_SLOT2)
-                        EDX |= 0x80000;
+                        EDX |= (1 << 19);
                     else if (cpu_f->package == CPU_PKG_SOCKET370)
-                        EDX |= 0x100000;
+                        EDX |= (1 << 20);
                     break;
+                /* Unknown */
+                case 0x18:
+                    break;
+                /* IA32_APIC_BASE - APIC Base Address */
                 case 0x1B:
                     EAX = msr.apic_base & 0xffffffff;
                     EDX = msr.apic_base >> 32;
                     cpu_log("APIC_BASE read : %08X%08X\n", EDX, EAX);
                     break;
-                /* Unknown (undocumented?) MSR used by the Hyper-V BIOS. */
+                /* Unknown (undocumented?) MSR used by the Hyper-V BIOS */
                 case 0x20:
                     EAX = msr.ecx20 & 0xffffffff;
                     EDX = msr.ecx20 >> 32;
                     break;
+                /* Unknown */
+                case 0x21:
+                    if (cpu_s->cpu_type == CPU_PENTIUMPRO)
+                        goto i686_invalid_rdmsr;
+                    break;
+                /* EBL_CR_POWERON - Processor Hard Power-On Configuration */
                 case 0x2a:
                     EAX = 0xc4000000;
                     EDX = 0;
@@ -2867,111 +3281,143 @@ amd_k_invalid_rdmsr:
                             EAX |= (1 << 19);
                     }
                     break;
+                /* Unknown */
+                case 0x32:
+                    if (cpu_s->cpu_type == CPU_PENTIUMPRO)
+                        goto i686_invalid_rdmsr;
+                    break;
+                /* TEST_CTL - Test Control Register */
+                case 0x33:
+                    EAX = msr.test_ctl;
+                    break;
+                /* Unknown */
+                case 0x34:
+                case 0x3a:
+                case 0x3b:
+                case 0x50 ... 0x54:
+                    break;
+                /* BIOS_UPDT_TRIG - BIOS Update Trigger */
                 case 0x79:
-                    EAX = msr.ecx79 & 0xffffffff;
-                    EDX = msr.ecx79 >> 32;
+                    EAX = msr.bios_updt & 0xffffffff;
+                    EDX = msr.bios_updt >> 32;
                     break;
-                case 0x88:
-                case 0x89:
-                case 0x8a:
-                case 0x8b:
-                    EAX = msr.ecx8x[ECX - 0x88] & 0xffffffff;
-                    EDX = msr.ecx8x[ECX - 0x88] >> 32;
+                /* BBL_CR_D0 ... BBL_CR_D3 - Chunk 0..3 Data Register
+                   8Bh: BIOS_SIGN - BIOS Update Signature */
+                case 0x88 ... 0x8b:
+                    EAX = msr.bbl_cr_dx[ECX - 0x88] & 0xffffffff;
+                    EDX = msr.bbl_cr_dx[ECX - 0x88] >> 32;
                     break;
+                /* Unknown */
+                case 0xae:
+                    break;
+                /* PERFCTR0 - Performance Counter Register 0 */
                 case 0xc1:
+                /* PERFCTR1 - Performance Counter Register 1 */
                 case 0xc2:
-                case 0xc3:
-                case 0xc4:
-                case 0xc5:
-                case 0xc6:
-                case 0xc7:
-                case 0xc8:
-                    EAX = msr.ia32_pmc[ECX - 0xC1] & 0xffffffff;
-                    EDX = msr.ia32_pmc[ECX - 0xC1] >> 32;
+                    EAX = msr.perfctr[ECX - 0xC1] & 0xffffffff;
+                    EDX = msr.perfctr[ECX - 0xC1] >> 32;
                     break;
+                /* MTRRcap */
                 case 0xfe:
                     EAX = msr.mtrr_cap & 0xffffffff;
                     EDX = msr.mtrr_cap >> 32;
                     break;
+                /* BBL_CR_ADDR - L2 Cache Address Register */
                 case 0x116:
-                    EAX = msr.ecx116 & 0xffffffff;
-                    EDX = msr.ecx116 >> 32;
+                    EAX = msr.bbl_cr_addr & 0xffffffff;
+                    EDX = msr.bbl_cr_addr >> 32;
                     break;
+                /* BBL_CR_DECC - L2 Cache Date ECC Register */
                 case 0x118:
+                    EAX = msr.bbl_cr_decc & 0xffffffff;
+                    EDX = msr.bbl_cr_decc >> 32;
+                    break;
+                /* BBL_CR_CTL - L2 Cache Control Register */
                 case 0x119:
+                    EAX = msr.bbl_cr_ctl & 0xffffffff;
+                    EDX = msr.bbl_cr_ctl >> 32;
+                    break;
+                /* BBL_CR_TRIG - L2 Cache Trigger Register */
                 case 0x11a:
+                    EAX = msr.bbl_cr_trig & 0xffffffff;
+                    EDX = msr.bbl_cr_trig >> 32;
+                    break;
+                /* BBL_CR_BUSY - L2 Cache Busy Register */
                 case 0x11b:
-                    EAX = msr.ecx11x[ECX - 0x118] & 0xffffffff;
-                    EDX = msr.ecx11x[ECX - 0x118] >> 32;
+                    EAX = msr.bbl_cr_busy & 0xffffffff;
+                    EDX = msr.bbl_cr_busy >> 32;
                     break;
+                /* BBL_CR_CTL3 - L2 Cache Control Register 3 */
                 case 0x11e:
-                    EAX = msr.ecx11e & 0xffffffff;
-                    EDX = msr.ecx11e >> 32;
+                    EAX = msr.bbl_cr_ctl3 & 0xffffffff;
+                    EDX = msr.bbl_cr_ctl3 >> 32;
                     break;
+                /* Unknown */
+                case 0x131:
+                case 0x14e ... 0x151:
+                case 0x154:
+                case 0x15b:
+                case 0x15f:
+                    break;
+                /* SYSENTER_CS - SYSENTER target CS */
                 case 0x174:
-                    if (cpu_s->cpu_type == CPU_PENTIUMPRO)
-                        goto i686_invalid_rdmsr;
-
                     EAX &= 0xffff0000;
                     EAX |= msr.sysenter_cs;
                     EDX = 0x00000000;
                     break;
+                /* SYSENTER_ESP - SYSENTER target ESP */
                 case 0x175:
-                    if (cpu_s->cpu_type == CPU_PENTIUMPRO)
-                        goto i686_invalid_rdmsr;
-
                     EAX = msr.sysenter_esp;
                     EDX = 0x00000000;
                     break;
+                /* SYSENTER_EIP - SYSENTER target EIP */
                 case 0x176:
-                    if (cpu_s->cpu_type == CPU_PENTIUMPRO)
-                        goto i686_invalid_rdmsr;
-
                     EAX = msr.sysenter_eip;
                     EDX = 0x00000000;
                     break;
+                /* MCG_CAP - Machine Check Global Capability */
                 case 0x179:
                     EAX = 0x00000105;
                     EDX = 0x00000000;
                     break;
+                /* MCG_STATUS - Machine Check Global Status */
                 case 0x17a:
                     break;
+                /* MCG_CTL - Machine Check Global Control */
                 case 0x17b:
                     EAX = msr.mcg_ctl & 0xffffffff;
                     EDX = msr.mcg_ctl >> 32;
                     break;
+                /* EVNTSEL0 - Performance Counter Event Select 0 */
                 case 0x186:
-                    EAX = msr.ecx186 & 0xffffffff;
-                    EDX = msr.ecx186 >> 32;
-                    break;
+                /* EVNTSEL1 - Performance Counter Event Select 1 */
                 case 0x187:
-                    EAX = msr.ecx187 & 0xffffffff;
-                    EDX = msr.ecx187 >> 32;
+                    EAX = msr.evntsel[ECX - 0x186] & 0xffffffff;
+                    EDX = msr.evntsel[ECX - 0x186] >> 32;
                     break;
+                /* Unknown */
+                case 0x1d3:
+                    break;
+                /* DEBUGCTLMSR - Debugging Control Register */
                 case 0x1d9:
-                    EAX = msr.debug_ctl & 0xffffffff;
-                    EDX = msr.debug_ctl >> 32;
+                    EAX = msr.debug_ctl;
                     break;
+                /* LASTBRANCHFROMIP - address from which a branch was last taken */
+                case 0x1db:
+                /* LASTBRANCHTOIP - destination address of the last taken branch instruction */
+                case 0x1dc:
+                /* LASTINTFROMIP - address at which an interrupt last occurred */
+                case 0x1dd:
+                /* LASTINTTOIP - address to which the last interrupt caused a branch */
+                case 0x1de:
+                    break;
+                /* ROB_CR_BKUPTMPDR6 */
                 case 0x1e0:
-                    EAX = msr.ecx1e0 & 0xffffffff;
-                    EDX = msr.ecx1e0 >> 32;
+                    EAX = msr.rob_cr_bkuptmpdr6;
                     break;
-                case 0x200:
-                case 0x201:
-                case 0x202:
-                case 0x203:
-                case 0x204:
-                case 0x205:
-                case 0x206:
-                case 0x207:
-                case 0x208:
-                case 0x209:
-                case 0x20a:
-                case 0x20b:
-                case 0x20c:
-                case 0x20d:
-                case 0x20e:
-                case 0x20f:
+                /* ECX & 0: MTRRphysBase0 ... MTRRphysBase7
+                   ECX & 1: MTRRphysMask0 ... MTRRphysMask7 */
+                case 0x200 ... 0x20f:
                     if (ECX & 1) {
                         EAX = msr.mtrr_physmask[(ECX - 0x200) >> 1] & 0xffffffff;
                         EDX = msr.mtrr_physmask[(ECX - 0x200) >> 1] >> 32;
@@ -2980,60 +3426,88 @@ amd_k_invalid_rdmsr:
                         EDX = msr.mtrr_physbase[(ECX - 0x200) >> 1] >> 32;
                     }
                     break;
+                /* MTRRfix64K_00000 */
                 case 0x250:
                     EAX = msr.mtrr_fix64k_8000 & 0xffffffff;
                     EDX = msr.mtrr_fix64k_8000 >> 32;
                     break;
+                /* MTRRfix16K_80000 */
                 case 0x258:
                     EAX = msr.mtrr_fix16k_8000 & 0xffffffff;
                     EDX = msr.mtrr_fix16k_8000 >> 32;
                     break;
+                /* MTRRfix16K_A0000 */
                 case 0x259:
                     EAX = msr.mtrr_fix16k_a000 & 0xffffffff;
                     EDX = msr.mtrr_fix16k_a000 >> 32;
                     break;
-                case 0x268:
-                case 0x269:
-                case 0x26a:
-                case 0x26b:
-                case 0x26c:
-                case 0x26d:
-                case 0x26e:
-                case 0x26f:
+                /* MTRRfix4K_C0000 ... MTRRfix4K_F8000 */
+                case 0x268 ... 0x26f:
                     EAX = msr.mtrr_fix4k[ECX - 0x268] & 0xffffffff;
                     EDX = msr.mtrr_fix4k[ECX - 0x268] >> 32;
                     break;
+                /* Page Attribute Table */
                 case 0x277:
+                    if (cpu_s->cpu_type < CPU_PENTIUM2D)
+                        goto i686_invalid_rdmsr;
                     EAX = msr.pat & 0xffffffff;
                     EDX = msr.pat >> 32;
                     break;
+                /* Unknown */
+                case 0x280:
+                    if (cpu_s->cpu_type == CPU_PENTIUMPRO)
+                        goto i686_invalid_rdmsr;
+                    break;
+                /* MTRRdefType */
                 case 0x2ff:
                     EAX = msr.mtrr_deftype & 0xffffffff;
                     EDX = msr.mtrr_deftype >> 32;
                     break;
+                /* MC0_CTL - Machine Check 0 Control */
                 case 0x400:
+                /* MC1_CTL - Machine Check 1 Control */
                 case 0x404:
+                /* MC2_CTL - Machine Check 2 Control */
                 case 0x408:
+                /* MC4_CTL - Machine Check 4 Control */
                 case 0x40c:
+                /* MC3_CTL - Machine Check 3 Control */
                 case 0x410:
                     EAX = msr.mca_ctl[(ECX - 0x400) >> 2] & 0xffffffff;
                     EDX = msr.mca_ctl[(ECX - 0x400) >> 2] >> 32;
                     break;
+                /* MC0_STATUS - Machine Check 0 Status */
                 case 0x401:
+                /* MC0_ADDR - Machine Check 0 Address */
                 case 0x402:
+                /* MC1_STATUS - Machine Check 1 Status */
                 case 0x405:
+                /* MC1_ADDR - Machine Check 1 Address */
                 case 0x406:
-                case 0x407:
+                /* MC2_STATUS - Machine Check 2 Status */
                 case 0x409:
+                /* MC2_ADDR - Machine Check 2 Address */
+                case 0x40a:
+                /* MC4_STATUS - Machine Check 4 Status */
                 case 0x40d:
+                /* MC4_ADDR - Machine Check 4 Address */
                 case 0x40e:
+                /* MC3_STATUS - Machine Check 3 Status */
                 case 0x411:
+                /* MC3_ADDR - Machine Check 3 Address */
                 case 0x412:
                     break;
+                /* Unknown */
                 case 0x570:
                     EAX = msr.ecx570 & 0xffffffff;
                     EDX = msr.ecx570 >> 32;
                     break;
+                /* Unknown, possibly debug registers? */
+                case 0x1000 ... 0x1007:
+                /* Unknown, possibly control registers? */
+                case 0x2000:
+                case 0x2002 ... 0x2004:
+                    break;
                 default:
 i686_invalid_rdmsr:
                     cpu_log("RDMSR: Invalid MSR: %08X\n", ECX);
@@ -3053,40 +3527,63 @@ cpu_WRMSR(void)
 
     cpu_log("WRMSR %08X %08X%08X\n", ECX, EDX, EAX);
 
-    switch (cpu_s->cpu_type) {
+    if ((CPL || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1))
+        x86gpf(NULL, 0);
+    else  switch (cpu_s->cpu_type) {
         case CPU_IBM386SLC:
-        case CPU_IBM486BL:
         case CPU_IBM486SLC:
+        case CPU_IBM486BL:
             switch (ECX) {
+                /* Processor Operation Register */
                 case 0x1000:
                     msr.ibm_por           = EAX & ((cpu_s->cpu_type > CPU_IBM386SLC) ? 0xffeff : 0xfeff);
                     cpu_cache_int_enabled = (EAX & (1 << 7));
                     break;
+                /* Cache Region Control Register */
                 case 0x1001:
-                    msr.ibm_crcr = EAX & 0xffffffffff;
+                    msr.ibm_crcr = EAX | ((uint64_t) (EDX & 0x0000ffff) << 32);
                     break;
+                /* Processor Operation Register */
                 case 0x1002:
                     if ((cpu_s->cpu_type > CPU_IBM386SLC) && cpu_s->multi)
                         msr.ibm_por2 = EAX & 0x3f000000;
                     break;
+                /* Processor Control Register */
+                case 0x1004:
+                    if (cpu_s->cpu_type > CPU_IBM486SLC)
+                        msr.ibm_pcr = EAX & 0x00d6001a;
+                    break;
             }
             break;
 
         case CPU_WINCHIP:
         case CPU_WINCHIP2:
             switch (ECX) {
+                /* Pentium Processor Parity Reversal Register */
                 case 0x02:
                     msr.tr1 = EAX & 2;
                     break;
+                /* Pentium Processor New Feature Control */
                 case 0x0e:
-                    msr.tr12 = EAX & 0x228;
+                    msr.tr12 = EAX & 0x248;
                     break;
+                /* Time Stamp Counter */
                 case 0x10:
-                    tsc = EAX | ((uint64_t) EDX << 32);
+                    timer_set_new_tsc(EAX | ((uint64_t) EDX << 32));
                     break;
+                /* Performance Monitor - Control and Event Select */
                 case 0x11:
                     msr.cesr = EAX & 0xff00ff;
                     break;
+                /* Performance Monitor - Event Counter 0 */
+                case 0x12:
+                    msr.pmc[0] = EAX | ((uint64_t) EDX << 32);
+                    break;
+                /* Performance Monitor - Event Counter 1 */
+                case 0x13:
+                    msr.pmc[1] = EAX | ((uint64_t) EDX << 32);
+                    break;
+                /* Feature Control Register */
                 case 0x107:
                     msr.fcr = EAX;
                     if (EAX & (1 << 9))
@@ -3106,23 +3603,67 @@ cpu_WRMSR(void)
                     else
                         CPUID = cpu_s->cpuid_model;
                     break;
+                /* Feature Control Register 2 */
                 case 0x108:
                     msr.fcr2 = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* Feature Control Register 3 */
                 case 0x109:
                     msr.fcr3 = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* Memory Configuration Register 0..7 */
+                case 0x110 ... 0x117:
+                    temp = ECX - 0x110;
+                    if (cpu_s->cpu_type == CPU_WINCHIP2) {
+                        if (EAX & 0x1f)
+                            msr.mcr_ctrl |= (1 << (temp + 9));
+                        else
+                            msr.mcr_ctrl &= ~(1 << (temp + 9));
+                    }
+                    msr.mcr[temp] = EAX | ((uint64_t) EDX << 32);
+                    break;
+                /* Memory Configuration Register Control */
+                case 0x120:
+                    msr.mcr_ctrl = EAX & ((cpu_s->cpu_type == CPU_WINCHIP2) ? 0x1df : 0x1f);
+                    break;
+                /* Unknown */
+                case 0x131:
+                case 0x142 ... 0x145:
+                case 0x147:
+                case 0x150:
+                case 0x151:
+                    break;
             }
             break;
 
         case CPU_CYRIX3S:
             switch (ECX) {
+                /* Machine Check Exception Address */
                 case 0x00:
+                /* Machine Check Exception Type */
                 case 0x01:
                     break;
+                /* Time Stamp Counter */
                 case 0x10:
-                    tsc = EAX | ((uint64_t) EDX << 32);
+                    timer_set_new_tsc(EAX | ((uint64_t) EDX << 32));
                     break;
+                /* PERFCTR0 - Performance Counter Register 0 - aliased to TSC */
+                case 0xc1:
+                    break;
+                /* PERFCTR0 - Performance Counter Register 1 */
+                case 0xc2:
+                    msr.perfctr[1] = EAX | ((uint64_t) EDX << 32);
+                    break;
+                /* BBL_CR_CTL3 - L2 Cache Control Register 3 */
+                case 0x11e:
+                /* EVNTSEL0 - Performance Counter Event Select 0 - hardcoded */
+                case 0x186:
+                    break;
+                /* EVNTSEL1 - Performance Counter Event Select 1 */
+                case 0x187:
+                    msr.evntsel[1] = EAX | ((uint64_t) EDX << 32);
+                    break;
+                /* Feature Control Register */
                 case 0x1107:
                     msr.fcr = EAX;
                     if (EAX & (1 << 1))
@@ -3134,62 +3675,49 @@ cpu_WRMSR(void)
                     else
                         cpu_CR4_mask &= ~CR4_PGE;
                     break;
+                /* Feature Control Register 2 */
                 case 0x1108:
                     msr.fcr2 = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* Feature Control Register 3 */
                 case 0x1109:
                     msr.fcr3 = EAX | ((uint64_t) EDX << 32);
                     break;
-                case 0x200:
-                case 0x201:
-                case 0x202:
-                case 0x203:
-                case 0x204:
-                case 0x205:
-                case 0x206:
-                case 0x207:
-                case 0x208:
-                case 0x209:
-                case 0x20a:
-                case 0x20b:
-                case 0x20c:
-                case 0x20d:
-                case 0x20e:
-                case 0x20f:
+                /* ECX & 0: MTRRphysBase0 ... MTRRphysBase7
+                   ECX & 1: MTRRphysMask0 ... MTRRphysMask7 */
+                case 0x200 ... 0x20f:
                     if (ECX & 1)
                         msr.mtrr_physmask[(ECX - 0x200) >> 1] = EAX | ((uint64_t) EDX << 32);
                     else
                         msr.mtrr_physbase[(ECX - 0x200) >> 1] = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* MTRRfix64K_00000 */
                 case 0x250:
                     msr.mtrr_fix64k_8000 = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* MTRRfix16K_80000 */
                 case 0x258:
                     msr.mtrr_fix16k_8000 = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* MTRRfix16K_A0000 */
                 case 0x259:
                     msr.mtrr_fix16k_a000 = EAX | ((uint64_t) EDX << 32);
                     break;
-                case 0x268:
-                case 0x269:
-                case 0x26A:
-                case 0x26B:
-                case 0x26C:
-                case 0x26D:
-                case 0x26E:
-                case 0x26F:
+                /* MTRRfix4K_C0000 ... MTRRfix4K_F8000 */
+                case 0x268 ... 0x26f:
                     msr.mtrr_fix4k[ECX - 0x268] = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* MTRRdefType */
                 case 0x2ff:
                     msr.mtrr_deftype = EAX | ((uint64_t) EDX << 32);
                     break;
             }
             break;
 
-#if defined(DEV_BRANCH) && defined(USE_AMD_K5)
+#ifdef USE_AMD_K5
         case CPU_K5:
         case CPU_5K86:
-#endif
+#endif /* USE_AMD_K5 */
         case CPU_K6:
         case CPU_K6_2:
         case CPU_K6_2C:
@@ -3197,58 +3725,94 @@ cpu_WRMSR(void)
         case CPU_K6_2P:
         case CPU_K6_3P:
             switch (ECX) {
-                case 0x00:
-                case 0x01:
+                /* Machine Check Address Register */
+                case 0x00000000:
+                    if (cpu_s->cpu_type > CPU_5K86)
+                        msr.mcar = EAX | ((uint64_t) EDX << 32);
                     break;
-                case 0x0e:
-                    msr.tr12 = EAX & 0x228;
+                /* Machine Check Type Register */
+                case 0x00000001:
+                    if (cpu_s->cpu_type > CPU_5K86)
+                        msr.mctr = EAX | ((uint64_t) EDX << 32);
                     break;
-                case 0x10:
-                    tsc = EAX | ((uint64_t) EDX << 32);
+                /* Test Register 12 */
+                case 0x0000000e:
+                    msr.tr12 = EAX & 0x8;
                     break;
-                case 0x83:
-                    msr.ecx83 = EAX | ((uint64_t) EDX << 32);
+                /* Time Stamp Counter */
+                case 0x00000010:
+                    timer_set_new_tsc(EAX | ((uint64_t) EDX << 32));
                     break;
+                /* Array Access Register */
+                case 0x00000082:
+                    if (cpu_s->cpu_type > CPU_5K86)
+                        goto amd_k_invalid_wrmsr;
+                    msr.amd_aar = EAX | ((uint64_t) EDX << 32);
+                    break;
+                /* Hardware Configuration Register */
+                case 0x00000083:
+                    msr.amd_hwcr = EAX | ((uint64_t) EDX << 32);
+                    break;
+                /* Write Allocate Top-of-Memory and Control Register */
+                case 0x00000085:
+                    if (cpu_s->cpu_type != CPU_5K86)
+                        goto amd_k_invalid_wrmsr;
+                    msr.amd_watmcr = EAX | ((uint64_t) EDX << 32);
+                    break;
+                /* Write Allocate Programmable Memory Range Register */
+                case 0x00000086:
+                    if (cpu_s->cpu_type != CPU_5K86)
+                        goto amd_k_invalid_wrmsr;
+                    msr.amd_wapmrr = EAX | ((uint64_t) EDX << 32);
+                    break;
+                /* Extended Feature Enable Register */
                 case 0xc0000080:
                     temp = EAX | ((uint64_t) EDX << 32);
-                    if (temp & ~1ULL)
+                    if (temp & ~0x1fULL)
                         x86gpf(NULL, 0);
                     else
                         msr.amd_efer = temp;
                     break;
+                /* SYSCALL Target Address Register */
                 case 0xc0000081:
                     if (cpu_s->cpu_type < CPU_K6_2)
                         goto amd_k_invalid_wrmsr;
 
-                    msr.star = EAX | ((uint64_t) EDX << 32);
+                    msr.amd_star = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* Write-Handling Control Register */
                 case 0xc0000082:
                     msr.amd_whcr = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* UC/WC Cacheability Control Register */
                 case 0xc0000085:
                     if (cpu_s->cpu_type < CPU_K6_2C)
                         goto amd_k_invalid_wrmsr;
 
                     msr.amd_uwccr = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* Enhanced Power Management Register */
                 case 0xc0000086:
                     if (cpu_s->cpu_type < CPU_K6_2P)
                         goto amd_k_invalid_wrmsr;
 
                     msr.amd_epmr = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* Processor State Observability Register */
                 case 0xc0000087:
                     if (cpu_s->cpu_type < CPU_K6_2C)
                         goto amd_k_invalid_wrmsr;
 
                     msr.amd_psor = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* Page Flush/Invalidate Register */
                 case 0xc0000088:
                     if (cpu_s->cpu_type < CPU_K6_2C)
                         goto amd_k_invalid_wrmsr;
 
                     msr.amd_pfir = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* Level-2 Cache Array Access Register */
                 case 0xc0000089:
                     if (cpu_s->cpu_type < CPU_K6_3)
                         goto amd_k_invalid_wrmsr;
@@ -3265,29 +3829,188 @@ amd_k_invalid_wrmsr:
         case CPU_P24T:
         case CPU_PENTIUM:
         case CPU_PENTIUMMMX:
-#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
+            cpu_log("WRMSR: ECX = %08X, val = %08X%08X\n", ECX, EDX, EAX);
+            /* Filter out the upper 27 bits when ECX value is over 0x80000000, as per:
+               Ralf Brown, Pentium Model-Specific Registers and What They Reveal.
+               https://www.cs.cmu.edu/~ralf/papers/highmsr.html
+               But leave the bit 31 intact to be able to handle both low and high
+               MSRs in a single switch block. */
+            switch (ECX & (ECX > 0x7fffffff ? 0x8000001f : 0x7fffffff)) {
+                /* Machine Check Exception Address */
+                case 0x00000000:
+                case 0x80000000:
+                /* Machine Check Exception Type */
+                case 0x00000001:
+                case 0x80000001:
+                    break;
+                /* TR1 - Parity Reversal Test Register */
+                case 0x00000002:
+                case 0x80000002:
+                    msr.tr1 = EAX & 0x3fff;
+                    break;
+                /* TR2 - Instruction Cache End Bit */
+                case 0x00000004:
+                case 0x80000004:
+                    if (cpu_s->cpu_type == CPU_PENTIUMMMX)
+                        goto pentium_invalid_wrmsr;
+                    msr.tr2 = EAX & 0xf;
+                    break;
+                /* TR3 - Cache Test Data */
+                case 0x00000005:
+                case 0x80000005:
+                    msr.tr3 = EAX;
+                    break;
+                /* TR4 - Cache Test Tag */
+                case 0x00000006:
+                case 0x80000006:
+                    msr.tr4 = EAX & ((cpu_s->cpu_type == CPU_PENTIUMMMX) ? 0xffffff1f : 0xffffff07);
+                    break;
+                /* TR5 - Cache Test Control */
+                case 0x00000007:
+                case 0x80000007:
+                    msr.tr5 = EAX & ((cpu_s->cpu_type == CPU_PENTIUMMMX) ? 0x87fff : 0x7fff);
+                    break;
+                /* TR6 - TLB Test Command */
+                case 0x00000008:
+                case 0x80000008:
+                    msr.tr6 = EAX & 0xffffff07;
+                    break;
+                /* TR7 - TLB Test Data */
+                case 0x00000009:
+                case 0x80000009:
+                    msr.tr7 = EAX & ((cpu_s->cpu_type == CPU_PENTIUMMMX) ? 0xfffffc7f : 0xffffff9c);
+                    break;
+                /* TR9 - Branch Target Buffer Tag */
+                case 0x0000000b:
+                case 0x8000000b:
+                    msr.tr9 = EAX & ((cpu_s->cpu_type == CPU_PENTIUMMMX) ? 0xffffffff : 0xffffffc3);
+                    break;
+                /* TR10 - Branch Target Buffer Target */
+                case 0x0000000c:
+                case 0x8000000c:
+                    msr.tr10 = EAX;
+                    break;
+                /* TR11 - Branch Target Buffer Control */
+                case 0x0000000d:
+                case 0x8000000d:
+                    msr.tr11 = EAX & ((cpu_s->cpu_type >= CPU_PENTIUMMMX) ? 0x3001fcf : 0xfcf);
+                    break;
+                /* TR12 - New Feature Control */
+                case 0x0000000e:
+                case 0x8000000e:
+                    if (cpu_s->cpu_type == CPU_PENTIUMMMX)
+                        temp = EAX & 0x38034f;
+                    else if ((CPUID & 0xfff) >= 0x52b)
+                        temp = EAX & 0x20435f;
+                    else if ((CPUID & 0xfff) >= 0x520)
+                        temp = EAX & 0x20035f;
+                    else
+                        temp = EAX & 0x20030f;
+                    msr.tr12 = temp;
+                    break;
+                /* Time Stamp Counter */
+                case 0x00000010:
+                case 0x80000010:
+                    timer_set_new_tsc(EAX | ((uint64_t) EDX << 32));
+                    break;
+                /* Performance Monitor - Control and Event Select */
+                case 0x00000011:
+                case 0x80000011:
+                    msr.cesr = EAX & 0x3ff03ff;
+                    break;
+                /* Performance Monitor - Event Counter 0 */
+                case 0x00000012:
+                case 0x80000012:
+                    msr.pmc[0] = EAX | ((uint64_t) EDX << 32);
+                    break;
+                /* Performance Monitor - Event Counter 1 */
+                case 0x00000013:
+                case 0x80000013:
+                    msr.pmc[1] = EAX | ((uint64_t) EDX << 32);
+                    break;
+                /* Unknown */
+                case 0x00000014:
+                case 0x80000014:
+                    if ((CPUID & 0xfff) <= 0x520)
+                        goto pentium_invalid_wrmsr;
+                    break;
+                /* Unknown, possibly paging-related; initial value is 0004h,
+                   becomes 0008h once paging is enabled */
+                case 0x80000018:
+                /* Floating point - last prefetched opcode
+                   bits 10-8: low three bits of first byte of FP instruction
+                   bits 7-0: second byte of floating-point instruction */
+                case 0x80000019:
+                /* Floating point - last executed non-control opcode */
+                case 0x8000001a:
+                    break;
+                /* Floating point - last non-control exception opcode - part
+                   of FSTENV/FSAVE'd environment */
+                case 0x8000001b:
+                    EAX = msr.fp_last_xcpt & 0x7ff;
+                    break;
+                /* Unknown */
+                case 0x8000001c:
+                    break;
+                /* Probe Mode Control */
+                case 0x8000001d:
+                    EAX = msr.probe_ctl & 0x7;
+                    break;
+                /* Unknown, possibly scratchpad register */
+                case 0x8000001e:
+                    msr.ecx8000001e = EAX;
+                    break;
+                /* Unknown, possibly scratchpad register */
+                case 0x8000001f:
+                    msr.ecx8000001f = EAX;
+                    break;
+                /* Reserved/Unimplemented */
+                case 0x80000003:
+                case 0x8000000a:
+                case 0x8000000f:
+                case 0x80000015 ... 0x80000017:
+                    break;
+                default:
+pentium_invalid_wrmsr:
+                    cpu_log("WRMSR: Invalid MSR: %08X\n", ECX);
+                    x86gpf(NULL, 0);
+                    break;
+            }
+            break;
+
         case CPU_Cx6x86:
         case CPU_Cx6x86L:
         case CPU_CxGX1:
         case CPU_Cx6x86MX:
-#endif
             cpu_log("WRMSR: ECX = %08X, val = %08X%08X\n", ECX, EDX, EAX);
             switch (ECX) {
-                case 0x00:
-                case 0x01:
+                /* Test Data */
+                case 0x03:
+                    msr.tr3 = EAX;
                     break;
+                /* Test Address */
+                case 0x04:
+                    msr.tr4 = EAX;
+                    break;
+                /* Test Command/Status */
+                case 0x05:
+                    msr.tr5 = EAX & 0x008f0f3b;
+                    break;
+                /* Time Stamp Counter */
                 case 0x10:
-                    tsc = EAX | ((uint64_t) EDX << 32);
+                    timer_set_new_tsc(EAX | ((uint64_t) EDX << 32));
                     break;
-                case 0x8b:
-#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
-                    if (cpu_s->cpu_type < CPU_Cx6x86) {
-#endif
-                        cpu_log("WRMSR: Invalid MSR: 0x8B\n");
-                        x86gpf(NULL, 0); /* Needed for Vista to correctly break on Pentium */
-#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
-                    }
-#endif
+                /* Performance Monitor - Control and Event Select */
+                case 0x11:
+                    msr.cesr = EAX & 0x7ff07ff;
+                    break;
+                /* Performance Monitor - Event Counter 0 */
+                case 0x12:
+                    msr.pmc[0] = EAX | ((uint64_t) EDX << 32);
+                    break;
+                /* Performance Monitor - Event Counter 1 */
+                case 0x13:
+                    msr.pmc[1] = EAX | ((uint64_t) EDX << 32);
                     break;
             }
             break;
@@ -3298,168 +4021,231 @@ amd_k_invalid_wrmsr:
             /* Per RichardG's probing of a real Deschutes using my RDMSR tool,
                we have discovered that the top 18 bits are filtered out. */
             switch (ECX & 0x00003fff) {
+                /* Machine Check Exception Address */
                 case 0x00:
+                /* Machine Check Exception Type */
                 case 0x01:
                     if (EAX || EDX)
                         x86gpf(NULL, 0);
                     break;
+                /* Time Stamp Counter */
                 case 0x10:
-                    tsc = EAX | ((uint64_t) EDX << 32);
+                    timer_set_new_tsc(EAX | ((uint64_t) EDX << 32));
                     break;
+                /* Unknown */
+                case 0x18:
+                    break;
+                /* IA32_APIC_BASE - APIC Base Address */
                 case 0x1b:
                     cpu_log("APIC_BASE write: %08X%08X\n", EDX, EAX);
 #if 0
                     msr.apic_base = EAX | ((uint64_t) EDX << 32);
 #endif
                     break;
-                /* Unknown (undocumented?) MSR used by the Hyper-V BIOS. */
+                /* Unknown (undocumented?) MSR used by the Hyper-V BIOS */
                 case 0x20:
                     msr.ecx20 = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* Unknown */
+                case 0x21:
+                    if (cpu_s->cpu_type == CPU_PENTIUMPRO)
+                        goto i686_invalid_wrmsr;
+                    break;
+                /* EBL_CR_POWERON - Processor Hard Power-On Configuration */
                 case 0x2a:
                     break;
+                /* Unknown */
+                case 0x32:
+                    if (cpu_s->cpu_type == CPU_PENTIUMPRO)
+                        goto i686_invalid_wrmsr;
+                    break;
+                /* TEST_CTL - Test Control Register */
+                case 0x33:
+                    msr.test_ctl = EAX;
+                    break;
+                /* Unknown */
+                case 0x34:
+                case 0x3a:
+                case 0x3b:
+                case 0x50 ... 0x54:
+                    break;
+                /* BIOS_UPDT_TRIG - BIOS Update Trigger */
                 case 0x79:
-                    msr.ecx79 = EAX | ((uint64_t) EDX << 32);
+                    msr.bios_updt = EAX | ((uint64_t) EDX << 32);
                     break;
-                case 0x88:
-                case 0x89:
-                case 0x8a:
-                case 0x8b:
-                    msr.ecx8x[ECX - 0x88] = EAX | ((uint64_t) EDX << 32);
+                /* BBL_CR_D0 ... BBL_CR_D3 - Chunk 0..3 Data Register
+                   8Bh: BIOS_SIGN - BIOS Update Signature */
+                case 0x88 ... 0x8b:
+                    msr.bbl_cr_dx[ECX - 0x88] = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* Unknown */
+                case 0xae:
+                    break;
+                /* PERFCTR0 - Performance Counter Register 0 */
                 case 0xc1:
+                /* PERFCTR1 - Performance Counter Register 1 */
                 case 0xc2:
-                case 0xc3:
-                case 0xc4:
-                case 0xc5:
-                case 0xc6:
-                case 0xc7:
-                case 0xc8:
-                    msr.ia32_pmc[ECX - 0xC1] = EAX | ((uint64_t) EDX << 32);
+                    msr.perfctr[ECX - 0xC1] = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* MTRRcap */
                 case 0xfe:
                     msr.mtrr_cap = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* BBL_CR_ADDR - L2 Cache Address Register */
                 case 0x116:
-                    msr.ecx116 = EAX | ((uint64_t) EDX << 32);
+                    msr.bbl_cr_addr = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* BBL_CR_DECC - L2 Cache Date ECC Register */
                 case 0x118:
+                    msr.bbl_cr_decc = EAX | ((uint64_t) EDX << 32);
+                    break;
+                /* BBL_CR_CTL - L2 Cache Control Register */
                 case 0x119:
+                    msr.bbl_cr_ctl = EAX | ((uint64_t) EDX << 32);
+                    break;
+                /* BBL_CR_TRIG - L2 Cache Trigger Register */
                 case 0x11a:
+                    msr.bbl_cr_trig = EAX | ((uint64_t) EDX << 32);
+                    break;
+                /* BBL_CR_BUSY - L2 Cache Busy Register */
                 case 0x11b:
-                    msr.ecx11x[ECX - 0x118] = EAX | ((uint64_t) EDX << 32);
+                    msr.bbl_cr_busy = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* BBL_CR_CTL3 - L2 Cache Control Register 3 */
                 case 0x11e:
-                    msr.ecx11e = EAX | ((uint64_t) EDX << 32);
+                    msr.bbl_cr_ctl3 = (msr.bbl_cr_ctl3 & 0x02f00000) | (EAX & ~0x02f00000) | ((uint64_t) EDX << 32);
                     break;
+                /* Unknown */
+                case 0x131:
+                case 0x14e ... 0x151:
+                case 0x154:
+                case 0x15b:
+                case 0x15f:
+                    break;
+                /* SYSENTER_CS - SYSENTER target CS */
                 case 0x174:
-                    if (cpu_s->cpu_type == CPU_PENTIUMPRO)
-                        goto i686_invalid_wrmsr;
-
                     msr.sysenter_cs = EAX & 0xFFFF;
                     break;
+                /* SYSENTER_ESP - SYSENTER target ESP */
                 case 0x175:
-                    if (cpu_s->cpu_type == CPU_PENTIUMPRO)
-                        goto i686_invalid_wrmsr;
-
                     msr.sysenter_esp = EAX;
                     break;
+                /* SYSENTER_EIP - SYSENTER target EIP */
                 case 0x176:
-                    if (cpu_s->cpu_type == CPU_PENTIUMPRO)
-                        goto i686_invalid_wrmsr;
-
                     msr.sysenter_eip = EAX;
                     break;
+                /* MCG_CAP - Machine Check Global Capability */
                 case 0x179:
                     break;
+                /* MCG_STATUS - Machine Check Global Status */
                 case 0x17a:
                     if (EAX || EDX)
                         x86gpf(NULL, 0);
                     break;
+                /* MCG_CTL - Machine Check Global Control */
                 case 0x17b:
                     msr.mcg_ctl = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* EVNTSEL0 - Performance Counter Event Select 0 */
                 case 0x186:
-                    msr.ecx186 = EAX | ((uint64_t) EDX << 32);
-                    break;
+                /* EVNTSEL1 - Performance Counter Event Select 1 */
                 case 0x187:
-                    msr.ecx187 = EAX | ((uint64_t) EDX << 32);
+                    msr.evntsel[ECX - 0x186] = EAX | ((uint64_t) EDX << 32);
                     break;
+                case 0x1d3:
+                    break;
+                /* DEBUGCTLMSR - Debugging Control Register */
                 case 0x1d9:
-                    msr.debug_ctl = EAX | ((uint64_t) EDX << 32);
+                    msr.debug_ctl = EAX;
                     break;
+                /* ROB_CR_BKUPTMPDR6 */
                 case 0x1e0:
-                    msr.ecx1e0 = EAX | ((uint64_t) EDX << 32);
+                    msr.rob_cr_bkuptmpdr6 = EAX;
                     break;
-                case 0x200:
-                case 0x201:
-                case 0x202:
-                case 0x203:
-                case 0x204:
-                case 0x205:
-                case 0x206:
-                case 0x207:
-                case 0x208:
-                case 0x209:
-                case 0x20a:
-                case 0x20b:
-                case 0x20c:
-                case 0x20d:
-                case 0x20e:
-                case 0x20f:
+                /* ECX & 0: MTRRphysBase0 ... MTRRphysBase7
+                   ECX & 1: MTRRphysMask0 ... MTRRphysMask7 */
+                case 0x200 ... 0x20f:
                     if (ECX & 1)
                         msr.mtrr_physmask[(ECX - 0x200) >> 1] = EAX | ((uint64_t) EDX << 32);
                     else
                         msr.mtrr_physbase[(ECX - 0x200) >> 1] = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* MTRRfix64K_00000 */
                 case 0x250:
                     msr.mtrr_fix64k_8000 = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* MTRRfix16K_80000 */
                 case 0x258:
                     msr.mtrr_fix16k_8000 = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* MTRRfix16K_A0000 */
                 case 0x259:
                     msr.mtrr_fix16k_a000 = EAX | ((uint64_t) EDX << 32);
                     break;
-                case 0x268:
-                case 0x269:
-                case 0x26a:
-                case 0x26b:
-                case 0x26c:
-                case 0x26d:
-                case 0x26e:
-                case 0x26f:
+                /* MTRRfix4K_C0000 ... MTRRfix4K_F8000 */
+                case 0x268 ... 0x26f:
                     msr.mtrr_fix4k[ECX - 0x268] = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* Page Attribute Table */
                 case 0x277:
+                    if (cpu_s->cpu_type < CPU_PENTIUM2D)
+                        goto i686_invalid_wrmsr;
                     msr.pat = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* Unknown */
+                case 0x280:
+                    if (cpu_s->cpu_type == CPU_PENTIUMPRO)
+                        goto i686_invalid_wrmsr;
+                    break;
+                /* MTRRdefType */
                 case 0x2ff:
                     msr.mtrr_deftype = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* MC0_CTL - Machine Check 0 Control */
                 case 0x400:
+                /* MC1_CTL - Machine Check 1 Control */
                 case 0x404:
+                /* MC2_CTL - Machine Check 2 Control */
                 case 0x408:
+                /* MC4_CTL - Machine Check 4 Control */
                 case 0x40c:
+                /* MC3_CTL - Machine Check 3 Control */
                 case 0x410:
                     msr.mca_ctl[(ECX - 0x400) >> 2] = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* MC0_STATUS - Machine Check 0 Status */
                 case 0x401:
+                /* MC0_ADDR - Machine Check 0 Address */
                 case 0x402:
+                /* MC1_STATUS - Machine Check 1 Status */
                 case 0x405:
+                /* MC1_ADDR - Machine Check 1 Address */
                 case 0x406:
-                case 0x407:
+                /* MC2_STATUS - Machine Check 2 Status */
                 case 0x409:
+                /* MC2_ADDR - Machine Check 2 Address */
+                case 0x40a:
+                /* MC4_STATUS - Machine Check 4 Status */
                 case 0x40d:
+                /* MC4_ADDR - Machine Check 4 Address */
                 case 0x40e:
+                /* MC3_STATUS - Machine Check 3 Status */
                 case 0x411:
+                /* MC3_ADDR - Machine Check 3 Address */
                 case 0x412:
                     if (EAX || EDX)
                         x86gpf(NULL, 0);
                     break;
+                /* Unknown */
                 case 0x570:
                     msr.ecx570 = EAX | ((uint64_t) EDX << 32);
                     break;
+                /* Unknown, possibly debug registers? */
+                case 0x1000 ... 0x1007:
+                /* Unknown, possibly control registers? */
+                case 0x2000:
+                case 0x2002 ... 0x2004:
+                    break;
                 default:
 i686_invalid_wrmsr:
                     cpu_log("WRMSR: Invalid MSR: %08X\n", ECX);
@@ -3479,121 +4265,179 @@ cpu_write(uint16_t addr, uint8_t val, UNUSED(void *priv))
             picintc(1 << 13);
         else
             nmi = 0;
-        return;
-    } else if (addr >= 0xf1)
-        return; /* FPU stuff */
-
-    if (!(addr & 1))
+    } else if ((addr < 0xf1) && !(addr & 1))
         cyrix_addr = val;
-    else
-        switch (cyrix_addr) {
-            case 0xc0: /* CCR0 */
-                ccr0 = val;
-                break;
-            case 0xc1: /* CCR1 */
-                if ((ccr3 & CCR3_SMI_LOCK) && !in_smm)
-                    val = (val & ~(CCR1_USE_SMI | CCR1_SMAC | CCR1_SM3)) | (ccr1 & (CCR1_USE_SMI | CCR1_SMAC | CCR1_SM3));
-                ccr1 = val;
-                break;
-            case 0xc2: /* CCR2 */
-                ccr2 = val;
-                break;
-            case 0xc3: /* CCR3 */
-                if ((ccr3 & CCR3_SMI_LOCK) && !in_smm)
-                    val = (val & ~(CCR3_NMI_EN)) | (ccr3 & CCR3_NMI_EN) | CCR3_SMI_LOCK;
-                ccr3 = val;
-                break;
-            case 0xcd:
-                if (!(ccr3 & CCR3_SMI_LOCK) || in_smm) {
-                    cyrix.arr[3].base = (cyrix.arr[3].base & ~0xff000000) | (val << 24);
-                    cyrix.smhr &= ~SMHR_VALID;
-                }
-                break;
-            case 0xce:
-                if (!(ccr3 & CCR3_SMI_LOCK) || in_smm) {
-                    cyrix.arr[3].base = (cyrix.arr[3].base & ~0x00ff0000) | (val << 16);
-                    cyrix.smhr &= ~SMHR_VALID;
-                }
-                break;
-            case 0xcf:
-                if (!(ccr3 & CCR3_SMI_LOCK) || in_smm) {
-                    cyrix.arr[3].base = (cyrix.arr[3].base & ~0x0000f000) | ((val & 0xf0) << 8);
-                    if ((val & 0xf) == 0xf)
-                        cyrix.arr[3].size = 1ULL << 32; /* 4 GB */
-                    else if (val & 0xf)
-                        cyrix.arr[3].size = 2048 << (val & 0xf);
-                    else
-                        cyrix.arr[3].size = 0; /* Disabled */
-                    cyrix.smhr &= ~SMHR_VALID;
-                }
-                break;
+    else if (addr < 0xf1)  switch (cyrix_addr) {
+        default:
+            if ((cyrix_addr >= 0xc0) && (cyrix_addr != 0xff))
+                fatal("Writing unimplemented Cyrix register %02X\n", cyrix_addr);
+            break;
 
-            case 0xe8: /* CCR4 */
-                if ((ccr3 & 0xf0) == 0x10) {
-                    ccr4 = val;
-#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
-                    if (cpu_s->cpu_type >= CPU_Cx6x86) {
-                        if (val & 0x80)
-                            CPUID = cpu_s->cpuid_model;
-                        else
-                            CPUID = 0;
-                    }
-#endif
+        case 0x30: /* ???? */
+            reg_30 = val;
+            break;
+
+        case 0xc0: /* CCR0 */
+            ccr0 = val;
+            break;
+        case 0xc1: { /* CCR1 */
+            uint8_t old = ccr1;
+            if ((ccr3 & CCR3_SMI_LOCK) && !in_smm)
+                val = (val & ~(CCR1_USE_SMI | CCR1_SMAC | CCR1_SM3)) | (ccr1 & (CCR1_USE_SMI | CCR1_SMAC | CCR1_SM3));
+            ccr1 = val;
+            if ((old ^ ccr1) & (CCR1_SMAC)) {
+                if (ccr1 & CCR1_SMAC)
+                    smram_backup_all();
+                smram_recalc_all(!(ccr1 & CCR1_SMAC));
+            }
+            break;
+        } case 0xc2: /* CCR2 */
+            ccr2 = val;
+            break;
+        case 0xc3: /* CCR3 */
+            if ((ccr3 & CCR3_SMI_LOCK) && !in_smm)
+                val = (val & ~(CCR3_NMI_EN)) | (ccr3 & CCR3_NMI_EN) | CCR3_SMI_LOCK;
+            ccr3 = val;
+            break;
+
+        case 0xc4 ... 0xcc:
+            if (ccr5 & 0x20)
+                arr[cyrix_addr - 0xc4] = val;
+            break;
+        case 0xcd:
+            if ((ccr5 & 0x20) || (!(ccr3 & CCR3_SMI_LOCK) || in_smm)) {
+                arr[cyrix_addr - 0xc4] = val;
+                cyrix.arr[3].base = (cyrix.arr[3].base & ~0xff000000) | (val << 24);
+                cyrix.smhr &= ~SMHR_VALID;
+            }
+            break;
+        case 0xce:
+            if ((ccr5 & 0x20) || (!(ccr3 & CCR3_SMI_LOCK) || in_smm)) {
+                arr[cyrix_addr - 0xc4] = val;
+                cyrix.arr[3].base = (cyrix.arr[3].base & ~0x00ff0000) | (val << 16);
+                cyrix.smhr &= ~SMHR_VALID;
+            }
+            break;
+        case 0xcf:
+            if ((ccr5 & 0x20) || (!(ccr3 & CCR3_SMI_LOCK) || in_smm)) {
+                arr[cyrix_addr - 0xc4] = val;
+                cyrix.arr[3].base = (cyrix.arr[3].base & ~0x0000f000) | ((val & 0xf0) << 8);
+                if ((val & 0xf) == 0xf)
+                    cyrix.arr[3].size = 1ULL << 32; /* 4 GB */
+                else if (val & 0xf)
+                    cyrix.arr[3].size = 2048 << (val & 0xf);
+                else
+                    cyrix.arr[3].size = 0; /* Disabled */
+                cyrix.smhr &= ~SMHR_VALID;
+            }
+            break;
+        case 0xd0 ... 0xdb:
+            if (((ccr3 & 0xf0) == 0x10) && (ccr5 & 0x20))
+                arr[cyrix_addr - 0xc4] = val;
+            break;
+
+        case 0xdc ... 0xe3:
+            if ((ccr3 & 0xf0) == 0x10)
+                rcr[cyrix_addr - 0xdc] = val;
+            break;
+
+        case 0xe8: /* CCR4 */
+            if ((ccr3 & 0xf0) == 0x10) {
+                ccr4 = val;
+                if (cpu_s->cpu_type >= CPU_Cx6x86) {
+                    if (val & 0x80)
+                        CPUID = cpu_s->cpuid_model;
+                    else
+                        CPUID = 0;
                 }
-                break;
-            case 0xe9: /* CCR5 */
-                if ((ccr3 & 0xf0) == 0x10)
-                    ccr5 = val;
-                break;
-            case 0xea: /* CCR6 */
-                if ((ccr3 & 0xf0) == 0x10)
-                    ccr6 = val;
-                break;
-        }
+            }
+            break;
+        case 0xe9: /* CCR5 */
+            if ((ccr3 & 0xf0) == 0x10)
+                ccr5 = val;
+            break;
+        case 0xea: /* CCR6 */
+            if ((ccr3 & 0xf0) == 0x10)
+                ccr6 = val;
+            break;
+        case 0xeb: /* CCR7 */
+            ccr7 = val & 5;
+            break;
+    }
 }
 
 static uint8_t
 cpu_read(uint16_t addr, UNUSED(void *priv))
 {
+    uint8_t ret = 0xff;
+
     if (addr == 0xf007)
-        return 0x7f;
+        ret = 0x7f;
+    else if ((addr < 0xf0) && (addr & 1))  switch (cyrix_addr) {
+        default:
+            if (cyrix_addr >= 0xc0)
+                fatal("Reading unimplemented Cyrix register %02X\n", cyrix_addr);
+            break;
 
-    if (addr >= 0xf0)
-        return 0xff; /* FPU stuff */
+        case 0x30: /* ???? */
+            ret = reg_30;
+            break;
 
-    if (addr & 1) {
-        switch (cyrix_addr) {
-            case 0xc0:
-                return ccr0;
-            case 0xc1:
-                return ccr1;
-            case 0xc2:
-                return ccr2;
-            case 0xc3:
-                return ccr3;
-            case 0xe8:
-                return ((ccr3 & 0xf0) == 0x10) ? ccr4 : 0xff;
-            case 0xe9:
-                return ((ccr3 & 0xf0) == 0x10) ? ccr5 : 0xff;
-            case 0xea:
-                return ((ccr3 & 0xf0) == 0x10) ? ccr6 : 0xff;
-            case 0xfe:
-                return cpu_s->cyrix_id & 0xff;
-            case 0xff:
-                return cpu_s->cyrix_id >> 8;
+        case 0xc0:
+            ret = ccr0;
+            break;
+        case 0xc1:
+            ret = ccr1;
+            break;
+        case 0xc2:
+            ret = ccr2;
+            break;
+        case 0xc3:
+            ret = ccr3;
+            break;
 
-            default:
-                break;
-        }
+        case 0xc4 ... 0xcc:
+            if (ccr5 & 0x20)
+                ret = arr[cyrix_addr - 0xc4];
+            break;
+        case 0xcd ... 0xcf:
+            if ((ccr5 & 0x20) || (!(ccr3 & CCR3_SMI_LOCK) || in_smm))
+                ret = arr[cyrix_addr - 0xc4];
+            break;
+        case 0xd0 ... 0xdb:
+            if (((ccr3 & 0xf0) == 0x10) && (ccr5 & 0x20))
+                ret = arr[cyrix_addr - 0xc4];
+            break;
 
-        if ((cyrix_addr & 0xf0) == 0xc0)
-            return 0xff;
+        case 0xdc ... 0xe3:
+            if ((ccr3 & 0xf0) == 0x10)
+                ret = rcr[cyrix_addr - 0xdc];
+            break;
 
-        if (cyrix_addr == 0x20 && (cpu_s->cpu_type == CPU_Cx5x86))
-            return 0xff;
+        case 0xe8:
+            if ((ccr3 & 0xf0) == 0x10)
+                ret = ccr4;
+            break;
+        case 0xe9:
+            if ((ccr3 & 0xf0) == 0x10)
+                ret = ccr5;
+            break;
+        case 0xea:
+            if ((ccr3 & 0xf0) == 0x10)
+                ret = ccr6;
+            break;
+        case 0xeb:
+            ret = ccr7;
+            break;
+        case 0xfe:
+            ret = cpu_s->cyrix_id & 0xff;
+            break;
+        case 0xff:
+            ret = cpu_s->cyrix_id >> 8;
+            break;
     }
 
-    return 0xff;
+    return ret;
 }
 
 void
@@ -3612,7 +4456,7 @@ x86_setopcodes(const OpFn *opcodes, const OpFn *opcodes_0f)
     x86_opcodes    = opcodes;
     x86_opcodes_0f = opcodes_0f;
 }
-#endif
+#endif /* USE_DYNAREC */
 
 void
 x86_setopcodes_2386(const OpFn *opcodes, const OpFn *opcodes_0f)
@@ -3634,13 +4478,6 @@ cpu_update_waitstates(void)
     if (cpu_cache_int_enabled) {
         /* Disable prefetch emulation */
         cpu_prefetch_cycles = 0;
-    } else if (cpu_waitstates && (cpu_s->cpu_type >= CPU_286 && cpu_s->cpu_type <= CPU_386DX)) {
-        /* Waitstates override */
-        cpu_prefetch_cycles = cpu_waitstates + 1;
-        cpu_cycles_read     = cpu_waitstates + 1;
-        cpu_cycles_read_l   = (cpu_16bitbus ? 2 : 1) * (cpu_waitstates + 1);
-        cpu_cycles_write    = cpu_waitstates + 1;
-        cpu_cycles_write_l  = (cpu_16bitbus ? 2 : 1) * (cpu_waitstates + 1);
     } else if (cpu_cache_ext_enabled) {
         /* Use cache timings */
         cpu_prefetch_cycles = cpu_s->cache_read_cycles;
@@ -3648,6 +4485,13 @@ cpu_update_waitstates(void)
         cpu_cycles_read_l   = (cpu_16bitbus ? 2 : 1) * cpu_s->cache_read_cycles;
         cpu_cycles_write    = cpu_s->cache_write_cycles;
         cpu_cycles_write_l  = (cpu_16bitbus ? 2 : 1) * cpu_s->cache_write_cycles;
+    } else if (cpu_waitstates && (cpu_s->cpu_type >= CPU_286 && cpu_s->cpu_type <= CPU_386DX)) {
+        /* Waitstates override */
+        cpu_prefetch_cycles = cpu_waitstates + 1;
+        cpu_cycles_read     = cpu_waitstates + 1;
+        cpu_cycles_read_l   = (cpu_16bitbus ? 2 : 1) * (cpu_waitstates + 1);
+        cpu_cycles_write    = cpu_waitstates + 1;
+        cpu_cycles_write_l  = (cpu_16bitbus ? 2 : 1) * (cpu_waitstates + 1);
     } else {
         /* Use memory timings */
         cpu_prefetch_cycles = cpu_s->mem_read_cycles;
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index dfde094f0..b9153a291 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -21,8 +21,6 @@
 #ifndef EMU_CPU_H
 #define EMU_CPU_H
 
-#include "softfloat/softfloat.h"
-
 enum {
     FPU_NONE,
     FPU_8087,
@@ -37,6 +35,7 @@ enum {
 enum {
     CPU_8088 = 1, /* 808x class CPUs */
     CPU_8086,
+    CPU_8086_MAZOVIA,
     CPU_V20, /* NEC 808x class CPUs */
     CPU_V30,
     CPU_188, /* 18x class CPUs */
@@ -88,30 +87,33 @@ enum {
 enum {
     CPU_PKG_8088             = (1 << 0),
     CPU_PKG_8088_EUROPC      = (1 << 1),
-    CPU_PKG_8086             = (1 << 2),
-    CPU_PKG_188              = (1 << 3),
-    CPU_PKG_186              = (1 << 4),
-    CPU_PKG_286              = (1 << 5),
-    CPU_PKG_386SX            = (1 << 6),
-    CPU_PKG_386DX            = (1 << 7),
-    CPU_PKG_386DX_DESKPRO386 = (1 << 8),
-    CPU_PKG_M6117            = (1 << 9),
-    CPU_PKG_386SLC_IBM       = (1 << 10),
-    CPU_PKG_486SLC           = (1 << 11),
-    CPU_PKG_486SLC_IBM       = (1 << 12),
-    CPU_PKG_486BL            = (1 << 13),
-    CPU_PKG_486DLC           = (1 << 14),
-    CPU_PKG_SOCKET1          = (1 << 15),
-    CPU_PKG_SOCKET3          = (1 << 16),
-    CPU_PKG_SOCKET3_PC330    = (1 << 17),
-    CPU_PKG_SOCKET6          = (1 << 18),
-    CPU_PKG_STPC             = (1 << 19),
-    CPU_PKG_SOCKET4          = (1 << 20),
-    CPU_PKG_SOCKET5_7        = (1 << 21),
-    CPU_PKG_SOCKET8          = (1 << 22),
-    CPU_PKG_SLOT1            = (1 << 23),
-    CPU_PKG_SLOT2            = (1 << 24),
-    CPU_PKG_SOCKET370        = (1 << 25)
+    CPU_PKG_8088_VTECH       = (1 << 2),
+    CPU_PKG_8086             = (1 << 3),
+    CPU_PKG_8086_MAZOVIA     = (1 << 4),
+    CPU_PKG_8086_VTECH       = (1 << 5),
+    CPU_PKG_188              = (1 << 6),
+    CPU_PKG_186              = (1 << 7),
+    CPU_PKG_286              = (1 << 8),
+    CPU_PKG_386SX            = (1 << 9),
+    CPU_PKG_386DX            = (1 << 10),
+    CPU_PKG_386DX_DESKPRO386 = (1 << 11),
+    CPU_PKG_M6117            = (1 << 12),
+    CPU_PKG_386SLC_IBM       = (1 << 13),
+    CPU_PKG_486SLC           = (1 << 14),
+    CPU_PKG_486SLC_IBM       = (1 << 15),
+    CPU_PKG_486BL            = (1 << 16),
+    CPU_PKG_486DLC           = (1 << 17),
+    CPU_PKG_SOCKET1          = (1 << 18),
+    CPU_PKG_SOCKET3          = (1 << 19),
+    CPU_PKG_SOCKET3_PC330    = (1 << 20),
+    CPU_PKG_SOCKET6          = (1 << 21),
+    CPU_PKG_STPC             = (1 << 22),
+    CPU_PKG_SOCKET4          = (1 << 23),
+    CPU_PKG_SOCKET5_7        = (1 << 24),
+    CPU_PKG_SOCKET8          = (1 << 25),
+    CPU_PKG_SLOT1            = (1 << 26),
+    CPU_PKG_SLOT2            = (1 << 27),
+    CPU_PKG_SOCKET370        = (1 << 28)
 };
 
 #define CPU_SUPPORTS_DYNAREC 1
@@ -119,6 +121,13 @@ enum {
 #define CPU_ALTERNATE_XTAL   4
 #define CPU_FIXED_MULTIPLIER 8
 
+#define CCR1_USE_SMI  (1 << 1)
+#define CCR1_SMAC     (1 << 2)
+#define CCR1_SM3      (1 << 7)
+
+#define CCR3_SMI_LOCK (1 << 0)
+#define CCR3_NMI_EN   (1 << 1)
+
 #if (defined __amd64__ || defined _M_X64)
 #    define LOOKUP_INV -1LL
 #else
@@ -175,6 +184,7 @@ typedef struct {
 #define VIP_FLAG   0x0010 /* in EFLAGS */
 #define VID_FLAG   0x0020 /* in EFLAGS */
 
+#define EM_FLAG    0x00004 /* in CR0 */
 #define WP_FLAG    0x10000 /* in CR0 */
 
 #define CR4_VME    (1 << 0) /* Virtual 8086 Mode Extensions */
@@ -227,101 +237,97 @@ typedef union {
 } MMX_REG;
 
 typedef struct {
-    /* IDT WinChip and WinChip 2 MSR's */
-    uint32_t tr1;  /* 0x00000002, 0x0000000e */
-    uint32_t tr12; /* 0x00000002, 0x0000000e */
-    uint32_t cesr; /* 0x00000011 */
+    /* IBM 386SLC/486SLC/486BL MSRs */
+    uint64_t ibm_por;  /* 0x00001000 - 386SLC and later */
+    uint64_t ibm_crcr; /* 0x00001001 - 386SLC and later */
+    uint64_t ibm_por2; /* 0x00001002 - 486SLC and later */
+    uint64_t ibm_pcr;  /* 0x00001004 - 486BL3 */
 
-    /* Pentium Pro, Pentium II Klamath, and Pentium II Deschutes MSR's */
-    uint64_t apic_base; /* 0x0000001b - Should the Pentium not also have this? */
+    /* IDT WinChip C6/2/VIA Cyrix III MSRs */
+    uint32_t fcr;      /* 0x00000107 (IDT), 0x00001107 (VIA) */
+    uint64_t fcr2;     /* 0x00000108 (IDT), 0x00001108 (VIA) */
+    uint64_t fcr3;     /* 0x00000108 (IDT), 0x00001108 (VIA) */
+    uint64_t mcr[8];   /* 0x00000110 - 0x00000117 (IDT) */
+    uint32_t mcr_ctrl; /* 0x00000120 (IDT) */
 
-    /* Weird long MSR's used by the Hyper-V BIOS. */
-    uint64_t ecx20; /* 0x00000020, really 0x40000020, but we filter out the top 18 bits
-                       like a real Deschutes does. */
+    /* AMD K5/K6 MSRs */
+    uint64_t amd_aar;    /* 0x00000082 - all K5 */
+    uint64_t amd_hwcr;   /* 0x00000083 - all K5 and all K6 */
+    uint64_t amd_watmcr; /* 0x00000085 - K5 Model 1 and later */
+    uint64_t amd_wapmrr; /* 0x00000086 - K5 Model 1 and later */
 
-    /* Pentium Pro, Pentium II Klamath, and Pentium II Deschutes MSR's */
-    uint64_t ecx79;     /* 0x00000079 */
+    uint64_t amd_efer;  /* 0xc0000080 - all K5 and all K6 */
+    uint64_t amd_star;  /* 0xc0000081 - K6-2 and later */
+    uint64_t amd_whcr;  /* 0xc0000082 - all K5 and all K6 */
+    uint64_t amd_uwccr; /* 0xc0000085 - K6-2C and later */
+    uint64_t amd_epmr;  /* 0xc0000086 - K6-III+/2+ only */
+    uint64_t amd_psor;  /* 0xc0000087 - K6-2C and later */
+    uint64_t amd_pfir;  /* 0xc0000088 - K6-2C and later */
+    uint64_t amd_l2aar; /* 0xc0000089 - K6-III and later */
 
-    /* AMD K5, 5k86, K6, K6-2, K6-2C, K6-3, K6-2P, and K6-3P MSR's */
-    uint64_t ecx83; /* 0x00000083 - AMD K5 and K6 MSR's. */
+    /* Pentium/Pentium MMX MSRs */
+    uint64_t mcar;         /* 0x00000000 - also on K5 and (R/W) K6 */
+    uint64_t mctr;         /* 0x00000001 - also on K5 and (R/W) K6 */
+    uint32_t tr1;          /* 0x00000002 - also on WinChip C6/2 */
+    uint32_t tr2;          /* 0x00000004 - reserved on PMMX */
+    uint32_t tr3;          /* 0x00000005 */
+    uint32_t tr4;          /* 0x00000006 */
+    uint32_t tr5;          /* 0x00000007 */
+    uint32_t tr6;          /* 0x00000008 */
+    uint32_t tr7;          /* 0x00000009 */
+    uint32_t tr9;          /* 0x0000000b */
+    uint32_t tr10;         /* 0x0000000c */
+    uint32_t tr11;         /* 0x0000000d */
+    uint32_t tr12;         /* 0x0000000e - also on WinChip C6/2 and K6 */
+    uint32_t cesr;         /* 0x00000011 - also on WinChip C6/2 and Cx6x86MX */
+    uint64_t pmc[2];       /* 0x00000012, 0x00000013 - also on WinChip C6/2 and Cx6x86MX */
+    uint32_t fp_last_xcpt; /* 0x8000001b - undocumented */
+    uint32_t probe_ctl;    /* 0x8000001d - undocumented */
+    uint32_t ecx8000001e;  /* 0x8000001e - undocumented */
+    uint32_t ecx8000001f;  /* 0x8000001f - undocumented */
 
-    /* Pentium Pro, Pentium II Klamath, and Pentium II Deschutes MSR's */
-    uint64_t ecx8x[4];    /* 0x00000088 - 0x0000008b */
-    uint64_t ia32_pmc[8]; /* 0x000000c1 - 0x000000c8 */
-    uint64_t mtrr_cap;    /* 0x000000fe */
+    /* Pentium Pro/II MSRs */
+    uint64_t apic_base; /* 0x0000001b */
+    uint32_t test_ctl;  /* 0x00000033 */
+    uint64_t bios_updt; /* 0x00000079 */
 
-    /* IDT WinChip and WinChip 2 MSR's that are also on the VIA Cyrix III */
-    uint32_t fcr;  /* 0x00000107 (IDT), 0x00001107 (VIA) */
-    uint64_t fcr2; /* 0x00000108 (IDT), 0x00001108 (VIA) */
-    uint64_t fcr3; /* 0x00000108 (IDT), 0x00001108 (VIA) */
+    uint64_t bbl_cr_dx[4]; /* 0x00000088 - 0x0000008b */
+    uint64_t perfctr[2];  /* 0x000000c1, 0x000000c2 */
+    uint64_t mtrr_cap;     /* 0x000000fe */
 
-    /* Pentium Pro, Pentium II Klamath, and Pentium II Deschutes MSR's */
-    uint64_t ecx116;    /* 0x00000116 */
-    uint64_t ecx11x[4]; /* 0x00000118 - 0x0000011b */
-    uint64_t ecx11e;    /* 0x0000011e */
+    uint64_t bbl_cr_addr; /* 0x00000116 */
+    uint64_t bbl_cr_decc; /* 0x00000118 */
+    uint64_t bbl_cr_ctl;  /* 0x00000119 */
+    uint64_t bbl_cr_trig; /* 0x0000011a */
+    uint64_t bbl_cr_busy; /* 0x0000011b */
+    uint64_t bbl_cr_ctl3; /* 0x0000011e */
 
-    /* Pentium II Klamath and Pentium II Deschutes MSR's */
-    uint16_t sysenter_cs;  /* 0x00000174 - SYSENTER/SYSEXIT MSR's */
-    uint32_t sysenter_esp; /* 0x00000175 - SYSENTER/SYSEXIT MSR's */
-    uint32_t sysenter_eip; /* 0x00000176 - SYSENTER/SYSEXIT MSR's */
+    uint16_t sysenter_cs;  /* 0x00000174 - Pentium II and later */
+    uint32_t sysenter_esp; /* 0x00000175 - Pentium II and later */
+    uint32_t sysenter_eip; /* 0x00000176 - Pentium II and later */
 
-    /* Pentium Pro, Pentium II Klamath, and Pentium II Deschutes MSR's */
-    uint64_t mcg_ctl; /* 0x0000017b - Machine Check Architecture */
-    uint64_t ecx186;  /* 0x00000186, 0x00000187 */
-    uint64_t ecx187;  /* 0x00000186, 0x00000187 */
+    uint64_t mcg_ctl;           /* 0x0000017b */
+    uint64_t evntsel[2];        /* 0x00000186, 0x00000187 */
 
-    /* Pentium Pro, Pentium II Klamath, and Pentium II Deschutes MSR's */
-    uint64_t debug_ctl; /* 0x000001d9 - Debug Registers Control */
-    uint64_t ecx1e0;    /* 0x000001e0 */
+    uint32_t debug_ctl;         /* 0x000001d9 */
+    uint32_t rob_cr_bkuptmpdr6; /* 0x000001e0 */
 
-    /* Pentium Pro, Pentium II Klamath, and Pentium II Deschutes MSR's that are also
-       on the VIA Cyrix III */
-    uint64_t mtrr_physbase[8]; /* 0x00000200 - 0x0000020f */
+    /* MTTR-related MSRs also present on the VIA Cyrix III */
+    uint64_t mtrr_physbase[8]; /* 0x00000200 - 0x0000020f (ECX & 0) */
     uint64_t mtrr_physmask[8]; /* 0x00000200 - 0x0000020f (ECX & 1) */
     uint64_t mtrr_fix64k_8000; /* 0x00000250 */
     uint64_t mtrr_fix16k_8000; /* 0x00000258 */
     uint64_t mtrr_fix16k_a000; /* 0x00000259 */
     uint64_t mtrr_fix4k[8];    /* 0x00000268 - 0x0000026f */
+    uint64_t mtrr_deftype;     /* 0x000002ff */
 
-    /* Pentium Pro, Pentium II Klamath, and Pentium II Deschutes MSR's */
-    uint64_t pat; /* 0x00000277 */
-
-    /* Pentium Pro, Pentium II Klamath, and Pentium II Deschutes MSR's that are also
-       on the VIA Cyrix III */
-    uint64_t mtrr_deftype; /* 0x000002ff */
-
-    /* Pentium Pro, Pentium II Klamath, and Pentium II Deschutes MSR's */
-    uint64_t mca_ctl[5]; /* 0x00000400, 0x00000404, 0x00000408, 0x0000040c, 0x00000410 - Machine Check Architecture */
+    uint64_t pat;        /* 0x00000277 - Pentium II Deschutes and later */
+    uint64_t mca_ctl[5]; /* 0x00000400, 0x00000404, 0x00000408, 0x0000040c, 0x00000410 */
     uint64_t ecx570;     /* 0x00000570 */
 
-    /* IBM 386SLC, 486SLC, and 486BL MSR's */
-    uint64_t ibm_por;  /* 0x00001000 - Processor Operation Register */
-    uint64_t ibm_crcr; /* 0x00001001 - Cache Region Control Register */
-
-    /* IBM 486SLC and 486BL MSR's */
-    uint64_t ibm_por2; /* 0x00001002 - Processor Operation Register */
-
-    /* AMD K5, 5k86, K6, K6-2, K6-2C, K6-3, K6-2P, and K6-3P MSR's */
-    uint64_t amd_efer; /* 0xc0000080 */
-
-    /* AMD K6-2, K6-2C, K6-3, K6-2P, and K6-3P MSR's */
-    uint64_t star; /* 0xc0000081 */
-
-    /* AMD K5, 5k86, K6, K6-2, K6-2C, K6-3, K6-2P, and K6-3P MSR's */
-    uint64_t amd_whcr; /* 0xc0000082 */
-
-    /* AMD K6-2C, K6-3, K6-2P, and K6-3P MSR's */
-    uint64_t amd_uwccr; /* 0xc0000085 */
-
-    /* AMD K6-2P and K6-3P MSR's */
-    uint64_t amd_epmr; /* 0xc0000086 */
-
-    /* AMD K6-2C, K6-3, K6-2P, and K6-3P MSR's */
-    uint64_t amd_psor; /* 0xc0000087, 0xc0000088 */
-    uint64_t amd_pfir; /* 0xc0000087, 0xc0000088 */
-
-    /* K6-3, K6-2P, and K6-3P MSR's */
-    uint64_t amd_l2aar; /* 0xc0000089 */
+    /* Other/Unclassified MSRs */
+    uint64_t ecx20; /* 0x00000020, really 0x40000020, but we filter out the top 18 bits
+                       like a real Deschutes does. */
 } msr_t;
 
 typedef struct {
@@ -330,7 +336,10 @@ typedef struct {
     uint8_t tag[8];
 
     x86seg  *ea_seg;
-    uint32_t eaaddr;
+    union {
+        uint32_t eaaddr;
+        uint16_t eaa16[2];
+    };
 
     int      flags_op;
     uint32_t flags_res;
@@ -373,7 +382,7 @@ typedef struct {
     MMX_REG MM[8];
 
 #ifdef USE_NEW_DYNAREC
-#    if defined(__APPLE__) && defined(__aarch64__)
+#    if (defined(__APPLE__) && defined(__aarch64__)) || defined(__aarch64__)
     uint64_t old_fp_control;
     uint64_t new_fp_control;
 #    else
@@ -408,23 +417,9 @@ typedef struct {
     uint16_t eflags;
 
     uint32_t _smbase;
-} cpu_state_t;
 
-typedef struct {
-    uint16_t      cwd;
-    uint16_t      swd;
-    uint16_t      tag;
-    uint16_t      foo;
-    uint32_t      fip;
-    uint32_t      fdp;
-    uint16_t      fcs;
-    uint16_t      fds;
-    floatx80      st_space[8];
-    unsigned char tos;
-    unsigned char align1;
-    unsigned char align2;
-    unsigned char align3;
-} fpu_state_t;
+    uint32_t x87_op;
+} cpu_state_t;
 
 #define in_smm   cpu_state._in_smm
 #define smi_line cpu_state._smi_line
@@ -506,7 +501,6 @@ COMPILE_TIME_ASSERT(sizeof(cpu_state_t) <= 128)
 
 /* Global variables. */
 extern cpu_state_t cpu_state;
-extern fpu_state_t fpu_state;
 
 extern const cpu_family_t         cpu_families[];
 extern cpu_family_t              *cpu_f;
@@ -532,6 +526,7 @@ extern int is286;
 extern int is386;
 extern int is6117;
 extern int is486;
+extern int is586;
 extern int is_am486;
 extern int is_am486dxl;
 extern int is_pentium;
@@ -541,6 +536,7 @@ extern int is_p6;
 extern int is_cxsmm;
 extern int hascache;
 extern int isibm486;
+extern int is_mazovia;
 extern int is_nec;
 extern int is_rapidcad;
 extern int hasfpu;
@@ -553,6 +549,7 @@ extern int hasfpu;
 #define CPU_FEATURE_3DNOW   (1 << 6)
 #define CPU_FEATURE_SYSCALL (1 << 7)
 #define CPU_FEATURE_3DNOWE  (1 << 8)
+#define CPU_FEATURE_PSE36   (1 << 9)
 
 extern uint32_t cpu_features;
 
@@ -587,7 +584,6 @@ extern double   bus_timing;
 extern double   isa_timing;
 extern double   pci_timing;
 extern double   agp_timing;
-extern uint64_t pmc[2];
 extern uint16_t temp_seg_data[4];
 extern uint16_t cs_msr;
 extern uint32_t esp_msr;
@@ -597,8 +593,6 @@ extern uint32_t eip_msr;
 extern uint64_t amd_efer;
 extern uint64_t star;
 
-#define FPU_CW_Reserved_Bits (0xe0c0)
-
 #define cr0                  cpu_state.CR0.l
 #define msw                  cpu_state.CR0.w
 extern uint32_t cr2;
@@ -609,6 +603,16 @@ extern uint32_t _tr[8];
 extern uint32_t cache_index;
 extern uint8_t  _cache[2048];
 
+/* For the Cyrix 6x86(MX) */
+extern uint8_t ccr0;
+extern uint8_t ccr1;
+extern uint8_t ccr2;
+extern uint8_t ccr3;
+extern uint8_t ccr4;
+extern uint8_t ccr5;
+extern uint8_t ccr6;
+extern uint8_t ccr7;
+
 /*Segments -
   _cs,_ds,_es,_ss are the segment structures
   CS,DS,ES,SS is the 16-bit data
@@ -642,6 +646,8 @@ extern int cpu_prefetch_width;
 extern int cpu_mem_prefetch_cycles;
 extern int cpu_rom_prefetch_cycles;
 extern int cpu_waitstates;
+extern int cpu_flush_pending;
+extern int cpu_old_paging;
 extern int cpu_cache_int_enabled;
 extern int cpu_cache_ext_enabled;
 extern int cpu_isa_speed;
@@ -768,6 +774,11 @@ void cyrix_write_seg_descriptor(uint32_t addr, x86seg *seg);
 #define SMHR_VALID     (1 << 0)
 #define SMHR_ADDR_MASK (0xfffffffc)
 
+typedef union {
+    uint32_t fd;
+    uint8_t  b[4];
+} fetch_dat_t;
+
 typedef struct {
     struct {
         uint32_t base;
@@ -776,6 +787,8 @@ typedef struct {
     uint32_t smhr;
 } cyrix_t;
 
+#define x87_op cpu_state.x87_op
+
 extern uint32_t addr64;
 extern uint32_t addr64_2;
 extern uint32_t addr64a[8];
@@ -822,4 +835,29 @@ extern void prefetch_flush(void);
 
 extern void prefetch_run(int instr_cycles, int bytes, int modrm, int reads, int reads_l, int writes, int writes_l, int ea32);
 
+extern int lock_legal[256];
+extern int lock_legal_0f[256];
+extern int lock_legal_ba[8];
+extern int lock_legal_80[8];
+extern int lock_legal_f6[8];
+extern int lock_legal_fe[8];
+
+extern int new_ne;
+
+extern int in_lock;
+extern int cpu_override_interpreter;
+
+extern int is_lock_legal(uint32_t fetchdat);
+
+extern void     prefetch_queue_set_pos(int pos);
+extern void     prefetch_queue_set_ip(uint16_t ip);
+extern void     prefetch_queue_set_prefetching(int p);
+extern int      prefetch_queue_get_pos(void);
+extern uint16_t prefetch_queue_get_ip(void);
+extern int      prefetch_queue_get_prefetching(void);
+extern int      prefetch_queue_get_size(void);
+
+#define prefetch_queue_set_suspended(s) prefetch_queue_set_prefetching(!s)
+#define prefetch_queue_get_suspended !prefetch_queue_get_prefetching
+
 #endif /*EMU_CPU_H*/
diff --git a/src/cpu/cpu_table.c b/src/cpu/cpu_table.c
index dbbf0f397..721d92fa8 100644
--- a/src/cpu/cpu_table.c
+++ b/src/cpu/cpu_table.c
@@ -16,13 +16,15 @@
  *          Fred N. van Kempen, <decwiz@yahoo.com>
  *          RichardG, <richardg867@gmail.com>
  *          dob205,
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
  *          Copyright 2008-2019 Sarah Walker.
  *          Copyright 2016-2019 leilei.
- *          Copyright 2016-2019 Miran Grca.
+ *          Copyright 2016-2024 Miran Grca.
  *          Copyright 2017-2020 Fred N. van Kempen.
  *          Copyright 2020      RichardG.
  *          Copyright 2021      dob205.
+ *          Copyright 2022-2024 Jasmine Iwanek.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -71,1925 +73,8200 @@ FPU fpus_internal[] = {
 const cpu_family_t cpu_families[] = {
   // clang-format off
     {
-    .package = CPU_PKG_8088,
-    .manufacturer = "Intel",
-    .name = "8088",
-    .internal_name = "8088",
-    .cpus = (const CPU[]) {
-        {
-            .name = "4.77",
-            .cpu_type = CPU_8088,
-            .fpus = fpus_8088,
-            .rspeed =  4772728,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "7.16",
-            .cpu_type = CPU_8088,
-            .fpus = fpus_8088,
-            .rspeed =  7159092,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "8",
-            .cpu_type = CPU_8088,
-            .fpus = fpus_8088,
-            .rspeed =  8000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
+        .package       = CPU_PKG_8088,
+        .manufacturer  = "Intel",
+        .name          = "8088",
+        .internal_name = "8088",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "4.77",
+                .cpu_type           = CPU_8088,
+                .fpus               = fpus_8088,
+                .rspeed             = 4772728,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "7.16",
+                .cpu_type           = CPU_8088,
+                .fpus               = fpus_8088,
+                .rspeed             = 7159092,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "8",
+                .cpu_type           = CPU_8088,
+                .fpus               = fpus_8088,
+                .rspeed             = 8000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
 #if 0
-        {
-            .name = "9.54",
-            .cpu_type = CPU_8088,
-            .fpus = fpus_8088,
-            .rspeed =  9545456,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
+            {
+                .name               = "9.54",
+                .cpu_type           = CPU_8088,
+                .fpus               = fpus_8088,
+                .rspeed             = 9545456,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
 #endif
-        {
-            .name = "10",
-            .cpu_type = CPU_8088,
-            .fpus = fpus_8088,
-            .rspeed = 10000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "12",
-            .cpu_type = CPU_8088,
-            .fpus = fpus_8088,
-            .rspeed = 12000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "16",
-            .cpu_type = CPU_8088,
-            .fpus = fpus_8088,
-            .rspeed = 16000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        { .name = "", 0 }
-    }
-    }, {
-    .package = CPU_PKG_8088_EUROPC,
-    .manufacturer = "Intel",
-    .name = "8088",
-    .internal_name = "8088_europc",
-    .cpus = (const CPU[]) {
-        {
-            .name = "4.77",
-            .cpu_type = CPU_8088,
-            .fpus = fpus_8088,
-            .rspeed = 4772728,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = CPU_ALTERNATE_XTAL,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "7.16",
-            .cpu_type = CPU_8088,
-            .fpus = fpus_8088,
-            .rspeed = 7159092,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = CPU_ALTERNATE_XTAL,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "9.54",
-            .cpu_type = CPU_8088,
-            .fpus = fpus_8088,
-            .rspeed = 9545456,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        { .name = "", 0 }
-    }
-    }, {
-    .package = CPU_PKG_8086,
-    .manufacturer = "Intel",
-    .name = "8086",
-    .internal_name = "8086",
-    .cpus = (const CPU[]) {
-        {
-            .name = "7.16",
-            .cpu_type = CPU_8086,
-            .fpus = fpus_8088,
-            .rspeed = 7159092,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = CPU_ALTERNATE_XTAL,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "8",
-            .cpu_type = CPU_8086,
-            .fpus = fpus_8088,
-            .rspeed = 8000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "9.54",
-            .cpu_type = CPU_8086,
-            .fpus = fpus_8088,
-            .rspeed = 9545456,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = CPU_ALTERNATE_XTAL,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "10",
-            .cpu_type = CPU_8086,
-            .fpus = fpus_8088,
-            .rspeed = 10000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "12",
-            .cpu_type = CPU_8086,
-            .fpus = fpus_8088,
-            .rspeed = 12000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "16",
-            .cpu_type = CPU_8086,
-            .fpus = fpus_8088,
-            .rspeed = 16000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 2
-        },
-        { .name = "", 0 }
-    }
-    }, {
-    .package = CPU_PKG_188,
-    .manufacturer = "Intel",
-    .name = "80188",
-    .internal_name = "80188",
-    .cpus = (const CPU[]) {
-        {
-            .name = "6",
-            .cpu_type = CPU_188,
-            .fpus = fpus_8088,
-            .rspeed = 6000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "7.16",
-            .cpu_type = CPU_188,
-            .fpus = fpus_8088,
-            .rspeed = 7159092,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = CPU_ALTERNATE_XTAL,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "8",
-            .cpu_type = CPU_188,
-            .fpus = fpus_8088,
-            .rspeed = 8000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "9.54",
-            .cpu_type = CPU_188,
-            .fpus = fpus_8088,
-            .rspeed = 9545456,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = CPU_ALTERNATE_XTAL,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "10",
-            .cpu_type = CPU_188,
-            .fpus = fpus_8088,
-            .rspeed = 10000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "12",
-            .cpu_type = CPU_188,
-            .fpus = fpus_8088,
-            .rspeed = 12000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "16",
-            .cpu_type = CPU_188,
-            .fpus = fpus_8088,
-            .rspeed = 16000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 2
-        },
-        {
-            .name = "20",
-            .cpu_type = CPU_188,
-            .fpus = fpus_8088,
-            .rspeed = 20000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 3
-        },
-        {
-            .name = "25",
-            .cpu_type = CPU_188,
-            .fpus = fpus_8088,
-            .rspeed = 25000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 3
-        },
-        { .name = "", 0 }
-    }
-    }, {
-    .package = CPU_PKG_8088,
-    .manufacturer = "NEC",
-    .name = "V20",
-    .internal_name = "necv20",
-    .cpus = (const CPU[]) {
-        {
-            .name = "4.77",
-            .cpu_type = CPU_V20,
-            .fpus = fpus_8088,
-            .rspeed = 4772728,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "7.16",
-            .cpu_type = CPU_V20,
-            .fpus = fpus_8088,
-            .rspeed = 7159092,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "10",
-            .cpu_type = CPU_V20,
-            .fpus = fpus_8088,
-            .rspeed = 10000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "12",
-            .cpu_type = CPU_V20,
-            .fpus = fpus_8088,
-            .rspeed = 12000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "16",
-            .cpu_type = CPU_V20,
-            .fpus = fpus_8088,
-            .rspeed = 16000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 2
-        },
-        { .name = "", 0 }
-    }
-    }, {
-    .package = CPU_PKG_186,
-    .manufacturer = "Intel",
-    .name = "80186",
-    .internal_name = "80186",
-    .cpus = (const CPU[]) {
-        {
-            .name = "6",
-            .cpu_type = CPU_186,
-            .fpus = fpus_80186,
-            .rspeed = 6000000,
-            .multi = 1,
-            .voltage = 0,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "7.16",
-            .cpu_type = CPU_186,
-            .fpus = fpus_80186,
-            .rspeed = 7159092,
-            .multi = 1,
-            .voltage = 0,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = CPU_ALTERNATE_XTAL,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "8",
-            .cpu_type = CPU_186,
-            .fpus = fpus_80186,
-            .rspeed = 8000000,
-            .multi = 1,
-            .voltage = 0,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "9.54",
-            .cpu_type = CPU_186,
-            .fpus = fpus_80186,
-            .rspeed = 9545456,
-            .multi = 1,
-            .voltage = 0,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = CPU_ALTERNATE_XTAL,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "10",
-            .cpu_type = CPU_186,
-            .fpus = fpus_80186,
-            .rspeed = 10000000,
-            .multi = 1,
-            .voltage = 0,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "12",
-            .cpu_type = CPU_186,
-            .fpus = fpus_80186,
-            .rspeed = 12000000,
-            .multi = 1,
-            .voltage = 0,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "16",
-            .cpu_type = CPU_186,
-            .fpus = fpus_80186,
-            .rspeed = 16000000,
-            .multi = 1,
-            .voltage = 0,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 2
-        },
-        {
-            .name = "20",
-            .cpu_type = CPU_186,
-            .fpus = fpus_80186,
-            .rspeed = 20000000,
-            .multi = 1,
-            .voltage = 0,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 3
-        },
-        {
-            .name = "25",
-            .cpu_type = CPU_186,
-            .fpus = fpus_80186,
-            .rspeed = 25000000,
-            .multi = 1,
-            .voltage = 0,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 3
-        },
-        { .name = "", 0 }
-    }
-    }, {
-    .package = CPU_PKG_8086,
-    .manufacturer = "NEC",
-    .name = "V30",
-    .internal_name = "necv30",
-    .cpus = (const CPU[]) {
-        {
-            .name = "5",
-            .cpu_type = CPU_V30,
-            .fpus = fpus_80186,
-            .rspeed = 5000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "8",
-            .cpu_type = CPU_V30,
-            .fpus = fpus_80186,
-            .rspeed = 8000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "10",
-            .cpu_type = CPU_V30,
-            .fpus = fpus_80186,
-            .rspeed = 10000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "12",
-            .cpu_type = CPU_V30,
-            .fpus = fpus_80186,
-            .rspeed = 12000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 1
-        },
-        {
-            .name = "16",
-            .cpu_type = CPU_V30,
-            .fpus = fpus_80186,
-            .rspeed = 16000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 0,
-            .mem_write_cycles = 0,
-            .cache_read_cycles = 0,
-            .cache_write_cycles = 0,
-            .atclk_div = 2
-        },
-        { .name = "", 0 }
-    }
-    }, {
-    .package = CPU_PKG_286,
-    .manufacturer = "Intel",
-    .name = "80286",
-    .internal_name = "286",
-    .cpus = (const CPU[]) {
-        {
-            .name = "6",
-            .cpu_type = CPU_286,
-            .fpus = fpus_80286,
-            .rspeed = 6000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 2,
-            .mem_write_cycles = 2,
-            .cache_read_cycles = 2,
-            .cache_write_cycles = 2,
-            .atclk_div = 1
-        },
-        {
-            .name = "8",
-            .cpu_type = CPU_286,
-            .fpus = fpus_80286,
-            .rspeed = 8000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 2,
-            .mem_write_cycles = 2,
-            .cache_read_cycles = 2,
-            .cache_write_cycles = 2,
-            .atclk_div = 1
-        },
-        {
-            .name = "10",
-            .cpu_type = CPU_286,
-            .fpus = fpus_80286,
-            .rspeed = 10000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 2,
-            .mem_write_cycles = 2,
-            .cache_read_cycles = 2,
-            .cache_write_cycles = 2,
-            .atclk_div = 1
-        },
-        {
-            .name = "12",
-            .cpu_type = CPU_286,
-            .fpus = fpus_80286,
-            .rspeed = 12500000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 3,
-            .mem_write_cycles = 3,
-            .cache_read_cycles = 3,
-            .cache_write_cycles = 3,
-            .atclk_div = 2
-        },
-        {
-            .name = "16",
-            .cpu_type = CPU_286,
-            .fpus = fpus_80286,
-            .rspeed = 16000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 3,
-            .mem_write_cycles = 3,
-            .cache_read_cycles = 3,
-            .cache_write_cycles = 3,
-            .atclk_div = 2
-        },
-        {
-            .name = "20",
-            .cpu_type = CPU_286,
-            .fpus = fpus_80286,
-            .rspeed = 20000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 4,
-            .mem_write_cycles = 4,
-            .cache_read_cycles = 4,
-            .cache_write_cycles = 4,
-            .atclk_div = 3
-        },
-        {
-            .name = "25",
-            .cpu_type = CPU_286,
-            .fpus = fpus_80286,
-            .rspeed = 25000000,
-            .multi = 1,
-            .voltage = 5000,
-            .edx_reset = 0,
-            .cpuid_model = 0,
-            .cyrix_id = 0,
-            .cpu_flags = 0,
-            .mem_read_cycles = 4,
-            .mem_write_cycles = 4,
-            .cache_read_cycles = 4,
-            .cache_write_cycles = 4,
-            .atclk_div = 3
-        },
-        { .name = "", 0 }
-    }
-    }, {
-    .package = CPU_PKG_386SX,
-    .manufacturer = "Intel",
-    .name = "i386SX",
-    .internal_name = "i386sx",
-    .cpus = (const CPU[]) {
-        {"16",    CPU_386SX, fpus_80386, 16000000,    1, 5000, 0x2308, 0, 0, 0, 3,3,3,3, 2},
-        {"20",    CPU_386SX, fpus_80386, 20000000,    1, 5000, 0x2308, 0, 0, 0, 4,4,3,3, 3},
-        {"25",    CPU_386SX, fpus_80386, 25000000,    1, 5000, 0x2308, 0, 0, 0, 4,4,3,3, 3},
-        {"33",    CPU_386SX, fpus_80386, 33333333,    1, 5000, 0x2308, 0, 0, 0, 6,6,3,3, 4},
-        {"40",    CPU_386SX, fpus_80386, 40000000,    1, 5000, 0x2308, 0, 0, 0, 7,7,3,3, 5},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_386SX,
-    .manufacturer = "AMD",
-    .name = "Am386SX",
-    .internal_name = "am386sx",
-    .cpus = (const CPU[]) {
-        {"16",   CPU_386SX, fpus_80386,     16000000, 1, 5000, 0x2308, 0, 0, 0, 3,3,3,3, 2},
-        {"20",   CPU_386SX, fpus_80386,     20000000, 1, 5000, 0x2308, 0, 0, 0, 4,4,3,3, 3},
-        {"25",   CPU_386SX, fpus_80386,     25000000, 1, 5000, 0x2308, 0, 0, 0, 4,4,3,3, 3},
-        {"33",   CPU_386SX, fpus_80386,     33333333, 1, 5000, 0x2308, 0, 0, 0, 6,6,3,3, 4},
-        {"40",   CPU_386SX, fpus_80386,     40000000, 1, 5000, 0x2308, 0, 0, 0, 7,7,3,3, 5},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_386DX,
-    .manufacturer = "Intel",
-    .name = "i386DX",
-    .internal_name = "i386dx",
-    .cpus = (const CPU[]) {
-        {"16",    CPU_386DX,      fpus_80386,  16000000, 1, 5000, 0x0308, 0, 0, 0, 3,3,3,3, 2},
-        {"20",    CPU_386DX,      fpus_80386,  20000000, 1, 5000, 0x0308, 0, 0, 0, 4,4,3,3, 3},
-        {"25",    CPU_386DX,      fpus_80386,  25000000, 1, 5000, 0x0308, 0, 0, 0, 4,4,3,3, 3},
-        {"33",    CPU_386DX,      fpus_80386,  33333333, 1, 5000, 0x0308, 0, 0, 0, 6,6,3,3, 4},
-        {"40",    CPU_386DX,      fpus_80386,  40000000, 1, 5000, 0x0308, 0, 0, 0, 7,7,3,3, 5},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_386DX_DESKPRO386,
-    .manufacturer = "Intel",
-    .name = "i386DX",
-    .internal_name = "i386dx_deskpro386",
-    .cpus = (const CPU[]) {
-        {"16",    CPU_386DX,      fpus_80286,  16000000, 1, 5000, 0x0308, 0, 0, 0, 3,3,3,3, 2},
-        {"20",    CPU_386DX,      fpus_80386,  20000000, 1, 5000, 0x0308, 0, 0, 0, 4,4,3,3, 3},
-        {"25",    CPU_386DX,      fpus_80386,  25000000, 1, 5000, 0x0308, 0, 0, 0, 4,4,3,3, 3},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_386DX,
-    .manufacturer = "Intel",
-    .name = "RapidCAD",
-    .internal_name = "rapidcad",
-    .cpus = (const CPU[]) {
-        {"25",  CPU_RAPIDCAD, fpus_internal,  25000000, 1, 5000, 0x0340, 0, 0, CPU_SUPPORTS_DYNAREC, 4,4,3,3, 3},
-        {"33",  CPU_RAPIDCAD, fpus_internal,  33333333, 1, 5000, 0x0340, 0, 0, CPU_SUPPORTS_DYNAREC, 6,6,3,3, 4},
-        {"40",  CPU_RAPIDCAD, fpus_internal,  40000000, 1, 5000, 0x0340, 0, 0, CPU_SUPPORTS_DYNAREC, 7,7,3,3, 5},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_386DX,
-    .manufacturer = "AMD",
-    .name = "Am386DX",
-    .internal_name = "am386dx",
-    .cpus = (const CPU[]) {
-        {"25",   CPU_386DX, fpus_80386,     25000000, 1, 5000, 0x0308, 0, 0, 0, 4,4,3,3, 3},
-        {"33",   CPU_386DX, fpus_80386,     33333333, 1, 5000, 0x0308, 0, 0, 0, 6,6,3,3, 4},
-        {"40",   CPU_386DX, fpus_80386,     40000000, 1, 5000, 0x0308, 0, 0, 0, 7,7,3,3, 5},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_M6117,
-    .manufacturer = "ALi",
-    .name = "M6117",
-    .internal_name = "m6117",
-    .cpus = (const CPU[]) { /* All timings and edx_reset values assumed. */
-        {"33",    CPU_386SX,      fpus_none,  33333333, 1, 5000, 0x2309, 0, 0, 0, 6,6,3,3, 4},
-        {"40",    CPU_386SX,      fpus_none,  40000000, 1, 5000, 0x2309, 0, 0, 0, 7,7,3,3, 5},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_386SLC_IBM,
-    .manufacturer = "IBM",
-    .name = "386SLC",
-    .internal_name = "ibm386slc",
-    .cpus = (const CPU[]) {
-        {"16",  CPU_IBM386SLC, fpus_80386, 16000000, 1, 5000, 0xA301, 0, 0, 0, 3,3,3,3, 2},
-        {"20",  CPU_IBM386SLC, fpus_80386, 20000000, 1, 5000, 0xA301, 0, 0, 0, 4,4,3,3, 3},
-        {"25",  CPU_IBM386SLC, fpus_80386, 25000000, 1, 5000, 0xA301, 0, 0, 0, 4,4,3,3, 3},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_386SX,
-    .manufacturer = "Cyrix",
-    .name = "Cx486SLC",
-    .internal_name = "cx486slc",
-    .cpus = (const CPU[]) {
-        {"20",  CPU_486SLC, fpus_80386, 20000000, 1, 5000, 0x400, 0, 0x0000, 0, 4,4,3,3, 3},
-        {"25",  CPU_486SLC, fpus_80386, 25000000, 1, 5000, 0x400, 0, 0x0000, 0, 4,4,3,3, 3},
-        {"33",  CPU_486SLC, fpus_80386, 33333333, 1, 5000, 0x400, 0, 0x0000, 0, 6,6,3,3, 4},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_386SX,
-    .manufacturer = "Cyrix",
-    .name = "Cx486SRx2",
-    .internal_name = "cx486srx2",
-    .cpus = (const CPU[]) {
-        {"32", CPU_486SLC, fpus_80386, 32000000, 2, 5000, 0x406, 0, 0x0006, 0, 6,6,6,6, 4},
-        {"40", CPU_486SLC, fpus_80386, 40000000, 2, 5000, 0x406, 0, 0x0006, 0, 8,8,6,6, 6},
-        {"50", CPU_486SLC, fpus_80386, 50000000, 2, 5000, 0x406, 0, 0x0006, 0, 8,8,6,6, 6},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_486SLC_IBM,
-    .manufacturer = "IBM",
-    .name = "486SLC",
-    .internal_name = "ibm486slc",
-    .cpus = (const CPU[]) {
-        {"33",   CPU_IBM486SLC, fpus_80386, 33333333,  1, 5000, 0xA401, 0, 0, 0, 6,6,3,3,    4},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_486SLC_IBM,
-    .manufacturer = "IBM",
-    .name = "486SLC2",
-    .internal_name = "ibm486slc2",
-    .cpus = (const CPU[]) {
-        {"40",  CPU_IBM486SLC, fpus_80386, 40000000,  2, 5000, 0xA421, 0, 0, 0, 7,7,6,6,    5},
-        {"50",  CPU_IBM486SLC, fpus_80386, 50000000,  2, 5000, 0xA421, 0, 0, 0, 8,8,6,6,    6},
-        {"66",  CPU_IBM486SLC, fpus_80386, 66666666,  2, 5000, 0xA421, 0, 0, 0, 12,12,6,6,  8},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_486SLC_IBM,
-    .manufacturer = "IBM",
-    .name = "486SLC3",
-    .internal_name = "ibm486slc3",
-    .cpus = (const CPU[]) {
-        {"60",  CPU_IBM486SLC, fpus_80386, 60000000,  3, 5000, 0xA439, 0, 0, 0, 12,12,9,9,  7},
-        {"75",  CPU_IBM486SLC, fpus_80386, 75000000,  3, 5000, 0xA439, 0, 0, 0, 12,12,9,9,  9},
-        {"100", CPU_IBM486SLC, fpus_80386, 100000000, 3, 5000, 0xA439, 0, 0, 0, 18,18,9,9, 12},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_486BL,
-    .manufacturer = "IBM",
-    .name = "486BL2",
-    .internal_name = "ibm486bl2",
-    .cpus = (const CPU[]) {
-        {"50",  CPU_IBM486BL, fpus_80386, 50000000,  2, 5000, 0xA439, 0, 0, 0, 8,8,6,6,    6},
-        {"66",  CPU_IBM486BL, fpus_80386, 66666666,  2, 5000, 0xA439, 0, 0, 0, 12,12,6,6,  8},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_486BL,
-    .manufacturer = "IBM",
-    .name = "486BL3",
-    .internal_name = "ibm486bl3",
-    .cpus = (const CPU[]) {
-        {"75",  CPU_IBM486BL, fpus_80386, 75000000,  3, 5000, 0xA439, 0, 0, 0, 12,12,9,9,  9},
-        {"100", CPU_IBM486BL, fpus_80386, 100000000, 3, 5000, 0xA439, 0, 0, 0, 18,18,9,9, 12},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_386DX,
-    .manufacturer = "Cyrix",
-    .name = "Cx486DLC",
-    .internal_name = "cx486dlc",
-    .cpus = (const CPU[]) {
-        {"25",  CPU_486DLC, fpus_80386, 25000000, 1, 5000, 0x401, 0, 0x0001, 0,  4, 4,3,3, 3},
-        {"33",  CPU_486DLC, fpus_80386, 33333333, 1, 5000, 0x401, 0, 0x0001, 0,  6, 6,3,3, 4},
-        {"40",  CPU_486DLC, fpus_80386, 40000000, 1, 5000, 0x401, 0, 0x0001, 0,  7, 7,3,3, 5},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_386DX,
-    .manufacturer = "Cyrix",
-    .name = "Cx486DRx2",
-    .internal_name = "cx486drx2",
-    .cpus = (const CPU[]) {
-        {"32", CPU_486DLC, fpus_80386, 32000000, 2, 5000, 0x407, 0, 0x0007, 0,  6, 6,6,6, 4},
-        {"40", CPU_486DLC, fpus_80386, 40000000, 2, 5000, 0x407, 0, 0x0007, 0,  8, 8,6,6, 6},
-        {"50", CPU_486DLC, fpus_80386, 50000000, 2, 5000, 0x407, 0, 0x0007, 0,  8, 8,6,6, 6},
-        {"66", CPU_486DLC, fpus_80386, 66666666, 2, 5000, 0x407, 0, 0x0007, 0, 12,12,6,6, 8},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET1,
-    .manufacturer = "Intel",
-    .name = "i486SX",
-    .internal_name = "i486sx",
-    .cpus = (const CPU[]) {
-        {"16",            CPU_i486SX,     fpus_486sx,  16000000, 1,  5000, 0x420,        0, 0, CPU_SUPPORTS_DYNAREC,  3, 3,3,3,  2},
-        {"20",            CPU_i486SX,     fpus_486sx,  20000000, 1,  5000, 0x420,        0, 0, CPU_SUPPORTS_DYNAREC,  4, 4,3,3,  3},
-        {"25",            CPU_i486SX,     fpus_486sx,  25000000, 1,  5000, 0x422,        0, 0, CPU_SUPPORTS_DYNAREC,  4, 4,3,3,  3},
-        {"33",            CPU_i486SX,     fpus_486sx,  33333333, 1,  5000, 0x422,        0, 0, CPU_SUPPORTS_DYNAREC,  6, 6,3,3,  4},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET1,
-    .manufacturer = "Intel",
-    .name = "i486SX-S",
-    .internal_name = "i486sx_slenh",
-    .cpus = (const CPU[]) {
-        {"25",            CPU_i486SX_SLENH,     fpus_486sx,  25000000, 1,  5000, 0x423,    0x423, 0, CPU_SUPPORTS_DYNAREC,  4, 4,3,3,  3},
-        {"33",            CPU_i486SX_SLENH,     fpus_486sx,  33333333, 1,  5000, 0x42a,    0x42a, 0, CPU_SUPPORTS_DYNAREC,  6, 6,3,3,  4},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET1,
-    .manufacturer = "Intel",
-    .name = "i486SX2",
-    .internal_name = "i486sx2",
-    .cpus = (const CPU[]) {
-        {"50",           CPU_i486SX_SLENH,    fpus_486sx,  50000000, 2,  5000, 0x45b,    0x45b, 0, CPU_SUPPORTS_DYNAREC,  8, 8,6,6,  6},
-        {"66 (Q0569)",   CPU_i486SX_SLENH,    fpus_486sx,  66666666, 2,  5000, 0x45b,    0x45b, 0, CPU_SUPPORTS_DYNAREC,  8, 8,6,6,  8},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET1,
-    .manufacturer = "Intel",
-    .name = "i486DX",
-    .internal_name = "i486dx",
-    .cpus = (const CPU[]) {
-        {"25",            CPU_i486DX,  fpus_internal,  25000000, 1,  5000, 0x404,        0, 0, CPU_SUPPORTS_DYNAREC,  4, 4,3,3,  3},
-        {"33",            CPU_i486DX,  fpus_internal,  33333333, 1,  5000, 0x404,        0, 0, CPU_SUPPORTS_DYNAREC,  6, 6,3,3,  4},
-        {"50",            CPU_i486DX,  fpus_internal,  50000000, 1,  5000, 0x411,        0, 0, CPU_SUPPORTS_DYNAREC,  8, 8,4,4,  6},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET1,
-    .manufacturer = "Intel",
-    .name = "i486DX-S",
-    .internal_name = "i486dx_slenh",
-    .cpus = (const CPU[]) {
-        {"33",            CPU_i486DX_SLENH,  fpus_internal,  33333333, 1,  5000, 0x414,    0x414, 0, CPU_SUPPORTS_DYNAREC,  6, 6,3,3,  4},
-        {"50",            CPU_i486DX_SLENH,  fpus_internal,  50000000, 1,  5000, 0x414,    0x414, 0, CPU_SUPPORTS_DYNAREC,  8, 8,4,4,  6},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET1,
-    .manufacturer = "Intel",
-    .name = "i486DX2",
-    .internal_name = "i486dx2",
-    .cpus = (const CPU[]) {
-        {"40",           CPU_i486DX, fpus_internal,  40000000, 2,  5000, 0x430,        0, 0, CPU_SUPPORTS_DYNAREC,  7, 7,6,6,  5},
-        {"50",           CPU_i486DX, fpus_internal,  50000000, 2,  5000, 0x433,        0, 0, CPU_SUPPORTS_DYNAREC,  8, 8,6,6,  6},
-        {"66",           CPU_i486DX, fpus_internal,  66666666, 2,  5000, 0x433,        0, 0, CPU_SUPPORTS_DYNAREC, 12,12,6,6,  8},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET1,
-    .manufacturer = "Intel",
-    .name = "i486DX2-S",
-    .internal_name = "i486dx2_slenh",
-    .cpus = (const CPU[]) {
-        {"40",           CPU_i486DX_SLENH, fpus_internal,  40000000, 2,  5000, 0x435,    0x435, 0, CPU_SUPPORTS_DYNAREC,  7, 7,6,6,  5},
-        {"50",           CPU_i486DX_SLENH, fpus_internal,  50000000, 2,  5000, 0x435,    0x435, 0, CPU_SUPPORTS_DYNAREC,  8, 8,6,6,  6},
-        {"66",           CPU_i486DX_SLENH, fpus_internal,  66666666, 2,  5000, 0x435,    0x435, 0, CPU_SUPPORTS_DYNAREC, 12,12,6,6,  8},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET1 | CPU_PKG_SOCKET3_PC330,
-    .manufacturer = "Intel",
-    .name = "i486DX2 WB",
-    .internal_name = "i486dx2_pc330",
-    .cpus = (const CPU[]) {
-        {"50",           CPU_i486DX_SLENH, fpus_internal,  50000000, 2,  5000, 0x436,    0x436, 0, CPU_SUPPORTS_DYNAREC,  8, 8,6,6,  6},
-        {"66",           CPU_i486DX_SLENH, fpus_internal,  66666666, 2,  5000, 0x436,    0x436, 0, CPU_SUPPORTS_DYNAREC, 12,12,6,6,  8},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET1 | CPU_PKG_SOCKET3_PC330 | CPU_PKG_SOCKET6, /*OEM versions are 3.3V, Retail versions are 3.3V with a 5V regulator for installation in older boards. They are functionally identical*/
-    .manufacturer = "Intel",
-    .name = "iDX4",
-    .internal_name = "idx4",
-    .cpus = (const CPU[]) {
-        {"75",              CPU_i486DX_SLENH,    fpus_internal,  75000000, 3.0, 5000,  0x480,  0x480, 0x0000, CPU_SUPPORTS_DYNAREC, 12,12, 9, 9,  9},
-        {"100",             CPU_i486DX_SLENH,    fpus_internal, 100000000, 3.0, 5000,  0x483,  0x483, 0x0000, CPU_SUPPORTS_DYNAREC, 18,18, 9, 9, 12},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET3 | CPU_PKG_SOCKET3_PC330 | CPU_PKG_SOCKET6,
-    .manufacturer = "Intel",
-    .name = "Pentium OverDrive",
-    .internal_name = "pentium_p24t",
-    .cpus = (const CPU[]) {
-        {"63", CPU_P24T,    fpus_internal,  62500000, 2.5, 5000, 0x1531, 0x1531, 0x0000, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 10,10,7,7, 15/2},
-        {"83", CPU_P24T,    fpus_internal,  83333333, 2.5, 5000, 0x1532, 0x1532, 0x0000, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15,8,8, 10},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET1,
-    .manufacturer = "AMD",
-    .name = "Am486SX",
-    .internal_name = "am486sx",
-    .cpus = (const CPU[]) {
-        {"33",   CPU_Am486SX,     fpus_486sx, 33333333, 1, 5000, 0x422,     0, 0, CPU_SUPPORTS_DYNAREC,  6, 6, 3, 3, 4},
-        {"40",   CPU_Am486SX,     fpus_486sx, 40000000, 1, 5000, 0x422,     0, 0, CPU_SUPPORTS_DYNAREC,  7, 7, 3, 3, 5},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET1,
-    .manufacturer = "AMD",
-    .name = "Am486SX2",
-    .internal_name = "am486sx2",
-    .cpus = (const CPU[]) {
-        {"50",  CPU_Am486SX,    fpus_486sx, 50000000, 2, 5000, 0x45b,     0, 0, CPU_SUPPORTS_DYNAREC,  8, 8, 6, 6, 6},
-        {"66",  CPU_Am486SX,    fpus_486sx, 66666666, 2, 5000, 0x45b,     0, 0, CPU_SUPPORTS_DYNAREC, 12,12, 6, 6, 8},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET1,
-    .manufacturer = "AMD",
-    .name = "Am486DX",
-    .internal_name = "am486dx",
-    .cpus = (const CPU[]) {
-        {"33",   CPU_Am486DX,  fpus_internal, 33333333, 1, 5000, 0x412,     0, 0, CPU_SUPPORTS_DYNAREC,  6, 6, 3, 3, 4},
-        {"40",   CPU_Am486DX,  fpus_internal, 40000000, 1, 5000, 0x412,     0, 0, CPU_SUPPORTS_DYNAREC,  7, 7, 3, 3, 5},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET1,
-    .manufacturer = "AMD",
-    .name = "Am486DX2",
-    .internal_name = "am486dx2",
-    .cpus = (const CPU[]) {
-        {"50",  CPU_Am486DX, fpus_internal, 50000000, 2, 5000, 0x432,     0, 0, CPU_SUPPORTS_DYNAREC,  8, 8, 6, 6, 6},
-        {"66",  CPU_Am486DX, fpus_internal, 66666666, 2, 5000, 0x432,     0, 0, CPU_SUPPORTS_DYNAREC, 12,12, 6, 6, 8},
-        {"80",  CPU_Am486DX, fpus_internal, 80000000, 2, 5000, 0x432,     0, 0, CPU_SUPPORTS_DYNAREC, 14,14, 6, 6, 10},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET1,
-    .manufacturer = "AMD",
-    .name = "Am486DXL",
-    .internal_name = "am486dxl",
-    .cpus = (const CPU[]) {
-        {"33",   CPU_Am486DXL,  fpus_internal, 33333333, 1, 5000, 0x422,     0, 0, CPU_SUPPORTS_DYNAREC,  6, 6, 3, 3, 4},
-        {"40",   CPU_Am486DXL,  fpus_internal, 40000000, 1, 5000, 0x422,     0, 0, CPU_SUPPORTS_DYNAREC,  7, 7, 3, 3, 5},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET1,
-    .manufacturer = "AMD",
-    .name = "Am486DXL2",
-    .internal_name = "am486dxl2",
-    .cpus = (const CPU[]) {
-        {"50",  CPU_Am486DXL, fpus_internal, 50000000, 2, 5000, 0x432,     0, 0, CPU_SUPPORTS_DYNAREC,  8, 8, 6, 6, 6},
-        {"66",  CPU_Am486DXL, fpus_internal, 66666666, 2, 5000, 0x432,     0, 0, CPU_SUPPORTS_DYNAREC, 12,12, 6, 6, 8},
-        {"80",  CPU_Am486DXL, fpus_internal, 80000000, 2, 5000, 0x432,     0, 0, CPU_SUPPORTS_DYNAREC, 14,14, 6, 6, 10},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET3 | CPU_PKG_SOCKET6,
-    .manufacturer = "AMD",
-    .name = "Am486DX4",
-    .internal_name = "am486dx4",
-    .cpus = (const CPU[]) {
-        {"75",  CPU_Am486DX, fpus_internal,   75000000, 3.0, 5000, 0x432,     0, 0, CPU_SUPPORTS_DYNAREC, 12,12, 9, 9, 9},
-        {"90",  CPU_Am486DX, fpus_internal,   90000000, 3.0, 5000, 0x432,     0, 0, CPU_SUPPORTS_DYNAREC, 15,15, 9, 9, 12},
-        {"100", CPU_Am486DX, fpus_internal,  100000000, 3.0, 5000, 0x432,     0, 0, CPU_SUPPORTS_DYNAREC, 15,15, 9, 9, 12},
-        {"120", CPU_Am486DX, fpus_internal,  120000000, 3.0, 5000, 0x432,     0, 0, CPU_SUPPORTS_DYNAREC, 21,21, 9, 9, 15},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET3 | CPU_PKG_SOCKET6,
-    .manufacturer = "AMD",
-    .name = "Am486DX2 (Enhanced)",
-    .internal_name = "am486dx2_slenh",
-    .cpus = (const CPU[]) {
-        {"66",  CPU_ENH_Am486DX, fpus_internal, 66666666, 2, 5000, 0x435, 0x435, 0, CPU_SUPPORTS_DYNAREC, 12,12, 6, 6, 8},
-        {"80",  CPU_ENH_Am486DX, fpus_internal, 80000000, 2, 5000, 0x435, 0x435, 0, CPU_SUPPORTS_DYNAREC, 14,14, 6, 6, 10},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET3 | CPU_PKG_SOCKET6,
-    .manufacturer = "AMD",
-    .name = "Am486DX4 (Enhanced)",
-    .internal_name = "am486dx4_slenh",
-    .cpus = (const CPU[]) {
-        {"75",  CPU_ENH_Am486DX, fpus_internal,   75000000, 3.0, 5000, 0x482, 0x482, 0, CPU_SUPPORTS_DYNAREC, 12,12, 9, 9, 9},
-        {"100", CPU_ENH_Am486DX, fpus_internal,  100000000, 3.0, 5000, 0x482, 0x482, 0, CPU_SUPPORTS_DYNAREC, 15,15, 9, 9, 12},
-        {"120", CPU_ENH_Am486DX, fpus_internal,  120000000, 3.0, 5000, 0x482, 0x482, 0, CPU_SUPPORTS_DYNAREC, 21,21, 9, 9, 15},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET3 | CPU_PKG_SOCKET6,
-    .manufacturer = "AMD",
-    .name = "Am5x86",
-    .internal_name = "am5x86",
-    .cpus = (const CPU[]) {
-        {"P75",   CPU_ENH_Am486DX,   fpus_internal,  133333333, 4.0, 5000, 0x4e0, 0x4e0, 0, CPU_SUPPORTS_DYNAREC, 24,24,12,12, 16},
-        {"P75+",  CPU_ENH_Am486DX,   fpus_internal,  150000000, 3.0, 5000, 0x482, 0x482, 0, CPU_SUPPORTS_DYNAREC, 28,28,12,12, 20},/*The rare P75+ was indeed a triple-clocked 150 MHz according to research*/
-        {"P90",   CPU_ENH_Am486DX,   fpus_internal,  160000000, 4.0, 5000, 0x4e0, 0x4e0, 0, CPU_SUPPORTS_DYNAREC, 28,28,12,12, 20},/*160 MHz on a 40 MHz bus was a common overclock and "5x86/P90" was used by a number of BIOSes to refer to that configuration*/
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET1,
-    .manufacturer = "Cyrix",
-    .name = "Cx486S",
-    .internal_name = "cx486s",
-    .cpus = (const CPU[]) {
-        {"25",            CPU_Cx486S,    fpus_486sx,   25000000, 1.0, 5000,  0x420,      0, 0x0010, CPU_SUPPORTS_DYNAREC,  4, 4, 3, 3,  3},
-        {"33",            CPU_Cx486S,    fpus_486sx,   33333333, 1.0, 5000,  0x420,      0, 0x0010, CPU_SUPPORTS_DYNAREC,  6, 6, 3, 3,  4},
-        {"40",            CPU_Cx486S,    fpus_486sx,   40000000, 1.0, 5000,  0x420,      0, 0x0010, CPU_SUPPORTS_DYNAREC,  7, 7, 3, 3,  5},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET1,
-    .manufacturer = "Cyrix",
-    .name = "Cx486DX",
-    .internal_name = "cx486dx",
-    .cpus = (const CPU[]) {
-        {"33",          CPU_Cx486DX, fpus_internal,   33333333, 1.0, 5000,  0x430,      0, 0x051a, CPU_SUPPORTS_DYNAREC,  6, 6, 3, 3,  4},
-        {"40",          CPU_Cx486DX, fpus_internal,   40000000, 1.0, 5000,  0x430,      0, 0x051a, CPU_SUPPORTS_DYNAREC,  7, 7, 3, 3,  5},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET1,
-    .manufacturer = "Cyrix",
-    .name = "Cx486DX2",
-    .internal_name = "cx486dx2",
-    .cpus = (const CPU[]) {
-        {"50",        CPU_Cx486DX, fpus_internal,   50000000, 2.0, 5000,  0x430,      0, 0x081b, CPU_SUPPORTS_DYNAREC,  8, 8, 6, 6,  6},
-        {"66",        CPU_Cx486DX, fpus_internal,   66666666, 2.0, 5000,  0x430,      0, 0x0b1b, CPU_SUPPORTS_DYNAREC, 12,12, 6, 6,  8},
-        {"80",        CPU_Cx486DX, fpus_internal,   80000000, 2.0, 5000,  0x430,      0, 0x311b, CPU_SUPPORTS_DYNAREC, 14,14, 6, 6, 10},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET6,
-    .manufacturer = "Cyrix",
-    .name = "Cx486DX2",
-    .internal_name = "cx486dx2v",
-    .cpus = (const CPU[]) {
-        {"66",        CPU_Cx486DX, fpus_internal,   66666666, 2.0, 5000,  0x430,      0, 0x0b1b, CPU_SUPPORTS_DYNAREC, 12,12, 6, 6,  8},
-        {"80",        CPU_Cx486DX, fpus_internal,   80000000, 2.0, 5000,  0x430,      0, 0x311b, CPU_SUPPORTS_DYNAREC, 14,14, 6, 6, 10},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET3 | CPU_PKG_SOCKET6,
-    .manufacturer = "Cyrix",
-    .name = "Cx486DX4",
-    .internal_name = "cx486dx4",
-    .cpus = (const CPU[]) {
-        {"75",  CPU_Cx486DX, fpus_internal,  75000000, 3.0, 5000, 0x480, 0, 0x361f, CPU_SUPPORTS_DYNAREC, 12,12, 9, 9,  9},
-        {"100", CPU_Cx486DX, fpus_internal, 100000000, 3.0, 5000, 0x480, 0, 0x361f, CPU_SUPPORTS_DYNAREC, 15,15, 9, 9, 12},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET3 | CPU_PKG_SOCKET6,
-    .manufacturer = "Cyrix",
-    .name = "Cx5x86",
-    .internal_name = "cx5x86",
-    .cpus = (const CPU[]) {
-        {"80",    CPU_Cx5x86,   fpus_internal,  80000000, 2.0, 5000, 0x480, 0, 0x002f, CPU_SUPPORTS_DYNAREC, 14,14, 6, 6, 10}, /*If we're including the Pentium 50, might as well include this*/
-        {"100",   CPU_Cx5x86,   fpus_internal, 100000000, 3.0, 5000, 0x480, 0, 0x002f, CPU_SUPPORTS_DYNAREC, 15,15, 9, 9, 12},
-        {"120",   CPU_Cx5x86,   fpus_internal, 120000000, 3.0, 5000, 0x480, 0, 0x002f, CPU_SUPPORTS_DYNAREC, 21,21, 9, 9, 15},
-        {"133",   CPU_Cx5x86,   fpus_internal, 133333333, 4.0, 5000, 0x480, 0, 0x002f, CPU_SUPPORTS_DYNAREC, 24,24,12,12, 16},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_STPC,
-    .manufacturer = "ST",
-    .name = "STPC-DX",
-    .internal_name = "stpc_dx",
-    .cpus = (const CPU[]) {
-        {"66",     CPU_STPC,    fpus_internal,  66666666, 1.0, 3300, 0x430, 0, 0x051a, CPU_SUPPORTS_DYNAREC, 7, 7, 3, 3,  5},
-        {"75",     CPU_STPC,    fpus_internal,  75000000, 1.0, 3300, 0x430, 0, 0x051a, CPU_SUPPORTS_DYNAREC, 7, 7, 3, 3,  5},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_STPC,
-    .manufacturer = "ST",
-    .name = "STPC-DX2",
-    .internal_name = "stpc_dx2",
-    .cpus = (const CPU[]) {
-        {"133",    CPU_STPC,     fpus_internal, 133333333, 2.0, 3300, 0x430, 0, 0x0b1b, CPU_SUPPORTS_DYNAREC, 14,14, 6, 6, 10},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET4,
-    .manufacturer = "Intel",
-    .name = "Pentium",
-    .internal_name = "pentium_p5",
-    .cpus = (const CPU[]) {
-        {"50 (Q0399)",    CPU_PENTIUM, fpus_internal,  50000000, 1, 5000, 0x513, 0x513, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,  4, 4,3,3,  6},
-        {"60",            CPU_PENTIUM, fpus_internal,  60000000, 1, 5000, 0x517, 0x517, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,  6, 6,3,3,  7},
-        {"66",            CPU_PENTIUM, fpus_internal,  66666666, 1, 5000, 0x517, 0x517, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,  6, 6,3,3,  8},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET4,
-    .manufacturer = "Intel",
-    .name = "Pentium OverDrive",
-    .internal_name = "pentium_p54c_od5v",
-    .cpus = (const CPU[]) {
-        {"100", CPU_PENTIUM, fpus_internal, 100000000, 2, 5000, 0x51A, 0x51A, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,  8, 8,6,6, 12},
-        {"120", CPU_PENTIUM, fpus_internal, 120000000, 2, 5000, 0x51A, 0x51A, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 12,12,6,6, 14},
-        {"133", CPU_PENTIUM, fpus_internal, 133333333, 2, 5000, 0x51A, 0x51A, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 12,12,6,6, 16},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "Intel",
-    .name = "Pentium",
-    .internal_name = "pentium_p54c",
-    .cpus = (const CPU[]) {
-        {"75",                   CPU_PENTIUM,    fpus_internal,  75000000, 1.5, 3520,  0x522,  0x522, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  7, 7,4,4,  9},
-        {"90",                   CPU_PENTIUM,    fpus_internal,  90000000, 1.5, 3520,  0x524,  0x524, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  9, 9,4,4, 21/2},
-        {"100/50",               CPU_PENTIUM,    fpus_internal, 100000000, 2.0, 3520,  0x524,  0x524, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 10,10,6,6, 12},
-        {"100/66",               CPU_PENTIUM,    fpus_internal, 100000000, 1.5, 3520,  0x526,  0x526, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  9, 9,4,4, 12},
-        {"120",                  CPU_PENTIUM,    fpus_internal, 120000000, 2.0, 3520,  0x526,  0x526, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12,6,6, 14},
-        {"133",                  CPU_PENTIUM,    fpus_internal, 133333333, 2.0, 3520,  0x52c,  0x52c, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12,6,6, 16},
-        {"150",                  CPU_PENTIUM,    fpus_internal, 150000000, 2.5, 3520,  0x52c,  0x52c, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15, 7, 7, 35/2},
-        {"166",                  CPU_PENTIUM,    fpus_internal, 166666666, 2.5, 3520,  0x52c,  0x52c, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15, 7, 7, 20},
-        {"200",                  CPU_PENTIUM,    fpus_internal, 200000000, 3.0, 3520,  0x52c,  0x52c, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 18,18, 9, 9, 24},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "Intel",
-    .name = "Pentium MMX",
-    .internal_name = "pentium_p55c",
-    .cpus = (const CPU[]) {
-        {"166",              CPU_PENTIUMMMX, fpus_internal, 166666666, 2.5, 2800,  0x543,  0x543, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15, 7, 7, 20},
-        {"200",              CPU_PENTIUMMMX, fpus_internal, 200000000, 3.0, 2800,  0x543,  0x543, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 18,18, 9, 9, 24},
-        {"233",              CPU_PENTIUMMMX, fpus_internal, 233333333, 3.5, 2800,  0x543,  0x543, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 21,21,10,10, 28},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "Intel",
-    .name = "Mobile Pentium MMX",
-    .internal_name = "pentium_tillamook",
-    .cpus = (const CPU[]) {
-        {"120",       CPU_PENTIUMMMX, fpus_internal, 120000000, 2.0, 2800,  0x543,  0x543, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12, 6, 6, 14},
-        {"133",       CPU_PENTIUMMMX, fpus_internal, 133333333, 2.0, 2800,  0x543,  0x543, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12, 6, 6, 16},
-        {"150",       CPU_PENTIUMMMX, fpus_internal, 150000000, 2.5, 2800,  0x544,  0x544, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15, 7, 7, 35/2},
-        {"166",       CPU_PENTIUMMMX, fpus_internal, 166666666, 2.5, 2800,  0x544,  0x544, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15, 7, 7, 20},
-        {"200",       CPU_PENTIUMMMX, fpus_internal, 200000000, 3.0, 2800,  0x581,  0x581, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 18,18, 9, 9, 24},
-        {"233",       CPU_PENTIUMMMX, fpus_internal, 233333333, 3.5, 2800,  0x581,  0x581, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 21,21,10,10, 28},
-        {"266",       CPU_PENTIUMMMX, fpus_internal, 266666666, 4.0, 2800,  0x582,  0x582, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 24,24,12,12, 32},
-        {"300",       CPU_PENTIUMMMX, fpus_internal, 300000000, 4.5, 2800,  0x582,  0x582, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 27,27,13,13, 36},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "Intel",
-    .name = "Pentium OverDrive",
-    .internal_name = "pentium_p54c_od3v",
-    .cpus = (const CPU[]) {
-        {"125",        CPU_PENTIUM,    fpus_internal, 125000000, 3.0, 3520,  0x52c,  0x52c, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 12,12,7,7, 15},
-        {"150",        CPU_PENTIUM,    fpus_internal, 150000000, 2.5, 3520,  0x52c,  0x52c, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 15,15,7,7, 35/2},
-        {"166",        CPU_PENTIUM,    fpus_internal, 166666666, 2.5, 3520,  0x52c,  0x52c, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 15,15,7,7, 20},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "Intel",
-    .name = "Pentium OverDrive MMX",
-    .internal_name = "pentium_p55c_od",
-    .cpus = (const CPU[]) {
-        {"75",     CPU_PENTIUMMMX, fpus_internal,  75000000, 1.5, 3520, 0x1542, 0x1542, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,  7, 7,4,4,  9},
-        {"125",    CPU_PENTIUMMMX, fpus_internal, 125000000, 2.5, 3520, 0x1542, 0x1542, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 12,12,7,7, 15},
-        {"150/60", CPU_PENTIUMMMX, fpus_internal, 150000000, 2.5, 3520, 0x1542, 0x1542, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 15,15,7,7, 35/2},
-        {"166",    CPU_PENTIUMMMX, fpus_internal, 166000000, 2.5, 3520, 0x1542, 0x1542, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 15,15,7,7, 20},
-        {"180",    CPU_PENTIUMMMX, fpus_internal, 180000000, 3.0, 3520, 0x1542, 0x1542, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 18,18,9,9, 21},
-        {"200",    CPU_PENTIUMMMX, fpus_internal, 200000000, 3.0, 3520, 0x1542, 0x1542, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 18,18,9,9, 24},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "IDT",
-    .name = "WinChip",
-    .internal_name = "winchip",
-    .cpus = (const CPU[]) {
-        {"75",     CPU_WINCHIP,  fpus_internal,  75000000, 1.5,     3520, 0x540, 0x540, 0, CPU_SUPPORTS_DYNAREC,  8,  8,  4,  4,  9},
-        {"90",     CPU_WINCHIP,  fpus_internal,  90000000, 1.5,     3520, 0x540, 0x540, 0, CPU_SUPPORTS_DYNAREC,  9,  9,  4,  4, 21/2},
-        {"100",    CPU_WINCHIP,  fpus_internal, 100000000, 1.5,     3520, 0x540, 0x540, 0, CPU_SUPPORTS_DYNAREC,  9,  9,  4,  4, 12},
-        {"120",    CPU_WINCHIP,  fpus_internal, 120000000, 2.0,     3520, 0x540, 0x540, 0, CPU_SUPPORTS_DYNAREC, 12, 12,  6,  6, 14},
-        {"133",    CPU_WINCHIP,  fpus_internal, 133333333, 2.0,     3520, 0x540, 0x540, 0, CPU_SUPPORTS_DYNAREC, 12, 12,  6,  6, 16},
-        {"150",    CPU_WINCHIP,  fpus_internal, 150000000, 2.5,     3520, 0x540, 0x540, 0, CPU_SUPPORTS_DYNAREC, 15, 15,  7,  7, 35/2},
-        {"166",    CPU_WINCHIP,  fpus_internal, 166666666, 2.5,     3520, 0x540, 0x540, 0, CPU_SUPPORTS_DYNAREC, 15, 15,  7,  7, 40},
-        {"180",    CPU_WINCHIP,  fpus_internal, 180000000, 3.0,     3520, 0x540, 0x540, 0, CPU_SUPPORTS_DYNAREC, 18, 18,  9,  9, 21},
-        {"200",    CPU_WINCHIP,  fpus_internal, 200000000, 3.0,     3520, 0x540, 0x540, 0, CPU_SUPPORTS_DYNAREC, 18, 18,  9,  9, 24},
-        {"225",    CPU_WINCHIP,  fpus_internal, 225000000, 3.0,     3520, 0x540, 0x540, 0, CPU_SUPPORTS_DYNAREC, 18, 18,  9,  9, 27},
-        {"240",    CPU_WINCHIP,  fpus_internal, 240000000, 4.0,     3520, 0x540, 0x540, 0, CPU_SUPPORTS_DYNAREC, 24, 24, 12, 12, 28},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "IDT",
-    .name = "WinChip 2",
-    .internal_name = "winchip2",
-    .cpus = (const CPU[]) {
-        {"200",  CPU_WINCHIP2, fpus_internal, 200000000, 3.0,     3520, 0x580, 0x580, 0, CPU_SUPPORTS_DYNAREC, 18, 18,  9,  9, 3*8},
-        {"225",  CPU_WINCHIP2, fpus_internal, 225000000, 3.0,     3520, 0x580, 0x580, 0, CPU_SUPPORTS_DYNAREC, 18, 18,  9,  9, 3*9},
-        {"240",  CPU_WINCHIP2, fpus_internal, 240000000, 4.0,     3520, 0x580, 0x580, 0, CPU_SUPPORTS_DYNAREC, 24, 24, 12, 12, 30},
-        {"250",  CPU_WINCHIP2, fpus_internal, 250000000, 3.0,     3520, 0x580, 0x580, 0, CPU_SUPPORTS_DYNAREC, 24, 24, 12, 12, 30},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "IDT",
-    .name = "WinChip 2A",
-    .internal_name = "winchip2a",
-    .cpus = (const CPU[]) {
-        {"200", CPU_WINCHIP2, fpus_internal, 200000000, 3.0,     3520, 0x587, 0x587, 0, CPU_SUPPORTS_DYNAREC, 18, 18,  9,  9, 3*8},
-        {"233", CPU_WINCHIP2, fpus_internal, 233333333, 3.5,     3520, 0x587, 0x587, 0, CPU_SUPPORTS_DYNAREC, 21, 21,  9,  9, (7*8)/2},
-        {"266", CPU_WINCHIP2, fpus_internal, 233333333, 7.0/3.0, 3520, 0x587, 0x587, 0, CPU_SUPPORTS_DYNAREC, 21, 21,  7,  7, 28},
-        {"300", CPU_WINCHIP2, fpus_internal, 250000000, 2.5,     3520, 0x587, 0x587, 0, CPU_SUPPORTS_DYNAREC, 24, 24,  8,  8, 30},
-        {"", 0}
-    }
+            {
+                .name               = "10",
+                .cpu_type           = CPU_8088,
+                .fpus               = fpus_8088,
+                .rspeed             = 10000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "12",
+                .cpu_type           = CPU_8088,
+                .fpus               = fpus_8088,
+                .rspeed             = 12000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "16",
+                .cpu_type           = CPU_8088,
+                .fpus               = fpus_8088,
+                .rspeed             = 16000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            { .name = "", 0 }
+        }
     },
-#if defined(DEV_BRANCH) && defined(USE_AMD_K5)
     {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "AMD",
-    .name = "K5 (5k86)",
-    .internal_name = "k5_5k86",
-    .cpus = (const CPU[]) {
-        {"75 (P75)",      CPU_K5,   fpus_internal,  75000000, 1.5, 3520, 0x500, 0x500, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  7, 7,4,4,  9},
-        {"90 (P90)",      CPU_K5,   fpus_internal,  90000000, 1.5, 3520, 0x500, 0x500, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  9, 9,4,4, 21/2},
-        {"100 (P100)",    CPU_K5,   fpus_internal, 100000000, 1.5, 3520, 0x500, 0x500, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  9, 9,4,4, 12},
-        {"90 (PR120)",    CPU_5K86, fpus_internal, 120000000, 2.0, 3520, 0x511, 0x511, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12,6,6, 14},
-        {"100 (PR133)",   CPU_5K86, fpus_internal, 133333333, 2.0, 3520, 0x514, 0x514, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12,6,6, 16},
-        {"105 (PR150)",   CPU_5K86, fpus_internal, 150000000, 2.5, 3520, 0x524, 0x524, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15,7,7, 35/2},
-        {"116.5 (PR166)", CPU_5K86, fpus_internal, 166666666, 2.5, 3520, 0x524, 0x524, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15,7,7, 20},
-        {"133 (PR200)",   CPU_5K86, fpus_internal, 200000000, 3.0, 3520, 0x534, 0x534, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 18,18,9,9, 24},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "AMD",
-    .name = "K5 (SSA/5)",
-    .internal_name = "k5_ssa5",
-    .cpus = (const CPU[]) {
-        {"75 (PR75)",    CPU_K5,   fpus_internal,  75000000, 1.5, 3520, 0x501, 0x501, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  7, 7,4,4,  9},
-        {"90 (PR90)",    CPU_K5,   fpus_internal,  90000000, 1.5, 3520, 0x501, 0x501, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  9, 9,4,4, 21/2},
-        {"100 (PR100)",  CPU_K5,   fpus_internal, 100000000, 1.5, 3520, 0x501, 0x501, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  9, 9,4,4, 12},
-        {"", 0}
-    }
+        .package       = CPU_PKG_8088_EUROPC,
+        .manufacturer  = "Intel",
+        .name          = "8088",
+        .internal_name = "8088_europc",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "4.77",
+                .cpu_type           = CPU_8088,
+                .fpus               = fpus_8088,
+                .rspeed             = 4772728,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_ALTERNATE_XTAL,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "7.16",
+                .cpu_type           = CPU_8088,
+                .fpus               = fpus_8088,
+                .rspeed             = 7159092,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_ALTERNATE_XTAL,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "9.54",
+                .cpu_type           = CPU_8088,
+                .fpus               = fpus_8088,
+                .rspeed             = 9545456,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            { .name = "", 0 }
+        }
     },
-#endif
     {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "AMD",
-    .name = "K6 (Model 6)",
-    .internal_name = "k6_m6",
-    .cpus = (const CPU[]) {
-        {"66",         CPU_K6,    fpus_internal,   66666666, 1.0, 2900, 0x561, 0x561, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 6, 6, 3, 3, 8},     /* out of spec */
-        {"100",        CPU_K6,    fpus_internal,  100000000, 1.5, 2900, 0x561, 0x561, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 9, 9, 4, 4, 12},   /* out of spec */
-        {"133",        CPU_K6,    fpus_internal,  133333333, 2.0, 2900, 0x561, 0x561, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12, 6, 6, 16}, /* out of spec */
-        {"166",        CPU_K6,    fpus_internal,  166666666, 2.5, 2900, 0x561, 0x561, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15, 7, 7, 20},
-        {"200",        CPU_K6,    fpus_internal,  200000000, 3.0, 2900, 0x561, 0x561, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 18,18, 9, 9, 24},
-        {"233",        CPU_K6,    fpus_internal,  233333333, 3.5, 3200, 0x561, 0x561, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 21,21,10,10, 28},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "AMD",
-    .name = "K6 (Model 7)",
-    .internal_name = "k6_m7",
-    .cpus = (const CPU[]) {
-        {"100",        CPU_K6,    fpus_internal,  100000000, 1.5, 2200, 0x570, 0x570, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 9, 9, 4, 4, 12}, /* out of spec */
-        {"133",        CPU_K6,    fpus_internal,  133333333, 2.0, 2200, 0x570, 0x570, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12, 6, 6, 16}, /* out of spec */
-        {"166",        CPU_K6,    fpus_internal,  166666666, 2.5, 2200, 0x570, 0x570, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15, 7, 7, 20}, /* out of spec */
-        {"200",        CPU_K6,    fpus_internal,  200000000, 3.0, 2200, 0x570, 0x570, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 18,18, 9, 9, 24},
-        {"233",        CPU_K6,    fpus_internal,  233333333, 3.5, 2200, 0x570, 0x570, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 21,21,10,10, 28},
-        {"266",        CPU_K6,    fpus_internal,  266666666, 4.0, 2200, 0x570, 0x570, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 24,24,12,12, 32},
-        {"300",        CPU_K6,    fpus_internal,  300000000, 4.5, 2200, 0x570, 0x570, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 27,27,13,13, 36},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "AMD",
-    .name = "K6-2",
-    .internal_name = "k6_2",
-    .cpus = (const CPU[]) {
-        {"100",                CPU_K6_2,  fpus_internal,  100000000, 1.5, 2200, 0x580, 0x580, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    9,     9,   4,   4, 12}, /* out of spec */
-        {"133",                CPU_K6_2,  fpus_internal,  133333333, 2.0, 2200, 0x580, 0x580, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    12,   12,   6,   6, 16}, /* out of spec */
-        {"166",                CPU_K6_2,  fpus_internal,  166666666, 2.5, 2200, 0x580, 0x580, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    15,   15,   7,   7, 20}, /* out of spec */
-        {"200",                CPU_K6_2,  fpus_internal,  200000000, 3.0, 2200, 0x580, 0x580, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    18,   18,   9,   9, 24}, /* out of spec */
-        {"233",                CPU_K6_2,  fpus_internal,  233333333, 3.5, 2200, 0x580, 0x580, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    21,   21,  10,  10, 28},
-        {"266",                CPU_K6_2,  fpus_internal,  266666666, 4.0, 2200, 0x580, 0x580, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    24,   24,  12,  12, 32},
-        {"300",                CPU_K6_2,  fpus_internal,  300000000, 3.0, 2200, 0x580, 0x580, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    27,   27,   9,   9, 36},
-        {"333",                CPU_K6_2,  fpus_internal,  332500000, 3.5, 2200, 0x580, 0x580, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    30,   30,  11,  11, 40},
-        {"350",                CPU_K6_2C, fpus_internal,  350000000, 3.5, 2200, 0x58c, 0x58c, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    32,   32,  11,  11, 42},
-        {"366",                CPU_K6_2C, fpus_internal,  366666666, 5.5, 2200, 0x58c, 0x58c, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    33,   33,  17,  17, 44},
-        {"380",                CPU_K6_2C, fpus_internal,  380000000, 4.0, 2200, 0x58c, 0x58c, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    34,   34,  12,  12, 46},
-        {"400/66",             CPU_K6_2C, fpus_internal,  400000000, 6.0, 2200, 0x58c, 0x58c, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    36,   36,  12,  12, 48},
-        {"400/100",            CPU_K6_2C, fpus_internal,  400000000, 4.0, 2200, 0x58c, 0x58c, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    36,   36,  12,  12, 48},
-        {"450",                CPU_K6_2C, fpus_internal,  450000000, 4.5, 2200, 0x58c, 0x58c, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    41,   41,  14,  14, 54},
-        {"475",                CPU_K6_2C, fpus_internal,  475000000, 5.0, 2400, 0x58c, 0x58c, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    43,   43,  15,  15, 57},
-        {"500",                CPU_K6_2C, fpus_internal,  500000000, 5.0, 2400, 0x58c, 0x58c, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    45,   45,  15,  15, 60},
-        {"533",                CPU_K6_2C, fpus_internal,  533333333, 5.5, 2200, 0x58c, 0x58c, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    48,   48,  17,  17, 64},
-        {"550",                CPU_K6_2C, fpus_internal,  550000000, 5.5, 2300, 0x58c, 0x58c, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    50,   50,  17,  17, 66},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "AMD",
-    .name = "K6-2+",
-    .internal_name = "k6_2p",
-    .cpus = (const CPU[]) {
-        {"100",               CPU_K6_2P,  fpus_internal,  100000000, 1.5, 2000, 0x5d4, 0x5d4, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    9,     9,   4,   4, 12}, /* out of spec */
-        {"133",               CPU_K6_2P,  fpus_internal,  133333333, 2.0, 2000, 0x5d4, 0x5d4, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    12,   12,   6,   6, 16}, /* out of spec */
-        {"166",               CPU_K6_2P,  fpus_internal,  166666666, 2.5, 2000, 0x5d4, 0x5d4, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    15,   15,   7,   7, 20}, /* out of spec */
-        {"200",               CPU_K6_2P,  fpus_internal,  200000000, 3.0, 2000, 0x5d4, 0x5d4, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    18,   18,   9,   9, 24}, /* out of spec */
-        {"233",               CPU_K6_2P,  fpus_internal,  233333333, 3.5, 2000, 0x5d4, 0x5d4, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    21,   21,  10,  10, 28}, /* out of spec */
-        {"266",               CPU_K6_2P,  fpus_internal,  266666666, 4.0, 2000, 0x5d4, 0x5d4, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    24,   24,  12,  12, 32}, /* out of spec */
-        {"300",               CPU_K6_2P,  fpus_internal,  300000000, 3.0, 2000, 0x5d4, 0x5d4, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    27,   27,   9,   9, 36}, /* out of spec */
-        {"333",               CPU_K6_2P,  fpus_internal,  332500000, 3.5, 2000, 0x5d4, 0x5d4, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    30,   30,  11,  11, 40}, /* out of spec */
-        {"350",               CPU_K6_2P,  fpus_internal,  350000000, 3.5, 2000, 0x5d4, 0x5d4, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    32,   32,  11,  11, 42}, /* out of spec */
-        {"366",               CPU_K6_2P,  fpus_internal,  366666666, 5.5, 2000, 0x5d4, 0x5d4, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    33,   33,  17,  17, 44}, /* out of spec */
-        {"380",               CPU_K6_2P,  fpus_internal,  380000000, 4.0, 2000, 0x5d4, 0x5d4, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    34,   34,  12,  12, 46}, /* out of spec */
-        {"400/66",            CPU_K6_2P,  fpus_internal,  400000000, 6.0, 2000, 0x5d4, 0x5d4, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    36,   36,  12,  12, 48}, /* out of spec */
-        {"400/100",           CPU_K6_2P,  fpus_internal,  400000000, 4.0, 2000, 0x5d4, 0x5d4, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    36,   36,  12,  12, 48}, /* out of spec */
-        {"450",               CPU_K6_2P,  fpus_internal,  450000000, 4.5, 2000, 0x5d4, 0x5d4, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    41,   41,  14,  14, 54},
-        {"475",               CPU_K6_2P,  fpus_internal,  475000000, 5.0, 2000, 0x5d4, 0x5d4, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    43,   43,  15,  15, 57},
-        {"500",               CPU_K6_2P,  fpus_internal,  500000000, 5.0, 2000, 0x5d4, 0x5d4, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    45,   45,  15,  15, 60},
-        {"533",               CPU_K6_2P,  fpus_internal,  533333333, 5.5, 2000, 0x5d4, 0x5d4, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    48,   48,  17,  17, 64},
-        {"550",               CPU_K6_2P,  fpus_internal,  550000000, 5.5, 2000, 0x5d4, 0x5d4, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    50,   50,  17,  17, 66},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "AMD",
-    .name = "K6-III",
-    .internal_name = "k6_3",
-    .cpus = (const CPU[]) {
-        {"100",              CPU_K6_3,  fpus_internal,  100000000, 1.5, 2200, 0x591, 0x591, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    9,     9,   4,   4, 12}, /* out of spec */
-        {"133",              CPU_K6_3,  fpus_internal,  133333333, 2.0, 2200, 0x591, 0x591, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    12,   12,   6,   6, 16}, /* out of spec */
-        {"166",              CPU_K6_3,  fpus_internal,  166666666, 2.5, 2200, 0x591, 0x591, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    15,   15,   7,   7, 20}, /* out of spec */
-        {"200",              CPU_K6_3,  fpus_internal,  200000000, 3.0, 2200, 0x591, 0x591, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    18,   18,   9,   9, 24}, /* out of spec */
-        {"233",              CPU_K6_3,  fpus_internal,  233333333, 3.5, 2200, 0x591, 0x591, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    21,   21,  10,  10, 28}, /* out of spec */
-        {"266",              CPU_K6_3,  fpus_internal,  266666666, 4.0, 2200, 0x591, 0x591, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    24,   24,  12,  12, 32}, /* out of spec */
-        {"300",              CPU_K6_3,  fpus_internal,  300000000, 3.0, 2200, 0x591, 0x591, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    27,   27,   9,   9, 36}, /* out of spec */
-        {"333",              CPU_K6_3,  fpus_internal,  332500000, 3.5, 2200, 0x591, 0x591, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    30,   30,  11,  11, 40}, /* out of spec */
-        {"350",              CPU_K6_3,  fpus_internal,  350000000, 3.5, 2200, 0x591, 0x591, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    32,   32,  11,  11, 42}, /* out of spec */
-        {"366",              CPU_K6_3,  fpus_internal,  366666666, 5.5, 2200, 0x591, 0x591, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    33,   33,  17,  17, 44}, /* out of spec */
-        {"380",              CPU_K6_3,  fpus_internal,  380000000, 4.0, 2200, 0x591, 0x591, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    34,   34,  12,  12, 46}, /* out of spec */
-        {"400",              CPU_K6_3,  fpus_internal,  400000000, 4.0, 2200, 0x591, 0x591, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    36,   36,  12,  12, 48},
-        {"450",              CPU_K6_3,  fpus_internal,  450000000, 4.5, 2200, 0x591, 0x591, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    41,   41,  14,  14, 54},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "AMD",
-    .name = "K6-III+",
-    .internal_name = "k6_3p",
-    .cpus = (const CPU[]) {
-        {"100",             CPU_K6_3P, fpus_internal,  100000000, 1.5, 2000, 0x5d0, 0x5d0, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,     7,    7,   4,   4,  9}, /* out of spec */
-        {"133",             CPU_K6_3P, fpus_internal,  133333333, 2.0, 2000, 0x5d0, 0x5d0, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    12,   12,   6,   6, 16}, /* out of spec */
-        {"166",             CPU_K6_3P, fpus_internal,  166666666, 2.5, 2000, 0x5d0, 0x5d0, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    15,   15,   7,   7, 20}, /* out of spec */
-        {"200",             CPU_K6_3P, fpus_internal,  200000000, 3.0, 2000, 0x5d0, 0x5d0, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    18,   18,   9,   9, 24}, /* out of spec */
-        {"233",             CPU_K6_3P, fpus_internal,  233333333, 3.5, 2000, 0x5d0, 0x5d0, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    21,   21,  10,  10, 28}, /* out of spec */
-        {"266",             CPU_K6_3P, fpus_internal,  266666666, 4.0, 2000, 0x5d0, 0x5d0, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    24,   24,  12,  12, 32}, /* out of spec */
-        {"300",             CPU_K6_3P, fpus_internal,  300000000, 3.0, 2000, 0x5d0, 0x5d0, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    27,   27,   9,   9, 36}, /* out of spec */
-        {"333",             CPU_K6_3P, fpus_internal,  332500000, 3.5, 2000, 0x5d0, 0x5d0, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    30,   30,  11,  11, 40}, /* out of spec */
-        {"350",             CPU_K6_3P, fpus_internal,  350000000, 3.5, 2000, 0x5d0, 0x5d0, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    32,   32,  11,  11, 42}, /* out of spec */
-        {"366",             CPU_K6_3P, fpus_internal,  366666666, 5.5, 2000, 0x5d0, 0x5d0, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    33,   33,  17,  17, 44}, /* out of spec */
-        {"380",             CPU_K6_3P, fpus_internal,  380000000, 4.0, 2000, 0x5d0, 0x5d0, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    34,   34,  12,  12, 46}, /* out of spec */
-        {"400",             CPU_K6_3P, fpus_internal,  400000000, 4.0, 2000, 0x5d0, 0x5d0, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    36,   36,  12,  12, 48},
-        {"450",             CPU_K6_3P, fpus_internal,  450000000, 4.5, 2000, 0x5d0, 0x5d0, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    41,   41,  14,  14, 54},
-        {"475",             CPU_K6_3P, fpus_internal,  475000000, 5.0, 2000, 0x5d0, 0x5d0, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    43,   43,  15,  15, 57},
-        {"500",             CPU_K6_3P, fpus_internal,  500000000, 5.0, 2000, 0x5d0, 0x5d0, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,    45,   45,  15,  15, 60},
-        {"", 0}
-    }
+        .package       = CPU_PKG_8088_VTECH,
+        .manufacturer  = "Intel",
+        .name          = "8088",
+        .internal_name = "8088_vtech",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "4.77",
+                .cpu_type           = CPU_8088,
+                .fpus               = fpus_8088,
+                .rspeed             = 4772728,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+
+            {
+                .name               = "10",
+                .cpu_type           = CPU_8088,
+                .fpus               = fpus_8088,
+                .rspeed             = 10000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            { .name = "", 0 }
+        }
     },
-#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
     {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "Cyrix",
-    .name = "Cx6x86",
-    .internal_name = "cx6x86",
-    .cpus = (const CPU[]) {
-        {"P90",     CPU_Cx6x86, fpus_internal,    80000000, 2.0, 3520, 0x520, 0x520, 0x1731, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  8, 8, 6, 6, 10},
-        {"PR120+",  CPU_Cx6x86, fpus_internal,   100000000, 2.0, 3520, 0x520, 0x520, 0x1731, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 10,10, 6, 6, 12},
-        {"PR133+",  CPU_Cx6x86, fpus_internal,   110000000, 2.0, 3520, 0x520, 0x520, 0x1731, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 10,10, 6, 6, 14},
-        {"PR150+",  CPU_Cx6x86, fpus_internal,   120000000, 2.0, 3520, 0x520, 0x520, 0x1731, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12, 6, 6, 14},
-        {"PR166+",  CPU_Cx6x86, fpus_internal,   133333333, 2.0, 3520, 0x520, 0x520, 0x1731, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12, 6, 6, 16},
-        {"PR200+",  CPU_Cx6x86, fpus_internal,   150000000, 2.0, 3520, 0x520, 0x520, 0x1731, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12, 6, 6, 18},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "Cyrix",
-    .name = "Cx6x86L",
-    .internal_name = "cx6x86l",
-    .cpus = (const CPU[]) {
-        {"PR133+", CPU_Cx6x86L,  fpus_internal, 110000000, 2.0, 2800, 0x540, 0x540, 0x2231, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 10,10, 6, 6, 14},
-        {"PR150+", CPU_Cx6x86L,  fpus_internal, 120000000, 2.0, 2800, 0x540, 0x540, 0x2231, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12, 6, 6, 14},
-        {"PR166+", CPU_Cx6x86L,  fpus_internal, 133333333, 2.0, 2800, 0x540, 0x540, 0x2231, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12, 6, 6, 16},
-        {"PR200+", CPU_Cx6x86L,  fpus_internal, 150000000, 2.0, 2800, 0x540, 0x540, 0x2231, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12, 6, 6, 18},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "Cyrix",
-    .name = "Cx6x86MX",
-    .internal_name = "cx6x86mx",
-    .cpus = (const CPU[]) {
-        {"PR166", CPU_Cx6x86MX, fpus_internal, 133333333, 2.0, 2900, 0x600, 0x600, 0x0451, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12, 6, 6,   16},
-        {"PR200", CPU_Cx6x86MX, fpus_internal, 166666666, 2.5, 2900, 0x600, 0x600, 0x0452, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15, 7, 7,   20},
-        {"PR233", CPU_Cx6x86MX, fpus_internal, 187500000, 2.5, 2900, 0x600, 0x600, 0x0452, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15, 7, 7, 45/2},
-        {"PR266", CPU_Cx6x86MX, fpus_internal, 208333333, 2.5, 2700, 0x600, 0x600, 0x0452, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 17,17, 7, 7,   25},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET5_7,
-    .manufacturer = "Cyrix",
-    .name = "MII",
-    .internal_name = "mii",
-    .cpus = (const CPU[]) {
-        {"PR300",      CPU_Cx6x86MX, fpus_internal, 233333333, 3.5, 2900, 0x601, 0x601, 0x0852, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 21,21,11,11,   28},
-        {"PR333",      CPU_Cx6x86MX, fpus_internal, 250000000, 3.0, 2900, 0x601, 0x601, 0x0853, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 23,23, 9, 9,   30},
-        {"PR366",      CPU_Cx6x86MX, fpus_internal, 250000000, 2.5, 2900, 0x601, 0x601, 0x0853, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 23,23, 7, 7,   30},
-        {"PR400",      CPU_Cx6x86MX, fpus_internal, 285000000, 3.0, 2900, 0x601, 0x601, 0x0853, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 27,27, 9, 9,   34},
-        {"PR433",      CPU_Cx6x86MX, fpus_internal, 300000000, 3.0, 2900, 0x601, 0x601, 0x0853, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 27,27, 9, 9,   36},
-        {"", 0}
-    }
+        .package       = CPU_PKG_8086,
+        .manufacturer  = "Intel",
+        .name          = "8086",
+        .internal_name = "8086",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "7.16",
+                .cpu_type           = CPU_8086,
+                .fpus               = fpus_8088,
+                .rspeed             = 7159092,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_ALTERNATE_XTAL,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "8",
+                .cpu_type           = CPU_8086,
+                .fpus               = fpus_8088,
+                .rspeed             = 8000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "9.54",
+                .cpu_type           = CPU_8086,
+                .fpus               = fpus_8088,
+                .rspeed             = 9545456,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_ALTERNATE_XTAL,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "10",
+                .cpu_type           = CPU_8086,
+                .fpus               = fpus_8088,
+                .rspeed             = 10000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "12",
+                .cpu_type           = CPU_8086,
+                .fpus               = fpus_8088,
+                .rspeed             = 12000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "16",
+                .cpu_type           = CPU_8086,
+                .fpus               = fpus_8088,
+                .rspeed             = 16000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 2
+            },
+            { .name = "", 0 }
+        }
     },
-#endif
     {
-    .package = CPU_PKG_SOCKET8,
-    .manufacturer = "Intel",
-    .name = "Pentium Pro",
-    .internal_name = "pentiumpro",
-    .cpus = (const CPU[]) {
-        {"60",              CPU_PENTIUMPRO, fpus_internal,  60000000, 1.0, 3100,  0x612,  0x612, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  6, 6, 1, 1, 7},  /* out of spec */
-        {"66",              CPU_PENTIUMPRO, fpus_internal,  66666666, 1.0, 3300,  0x617,  0x617, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  6, 6, 1, 1, 8},  /* out of spec */
-        {"90",              CPU_PENTIUMPRO, fpus_internal,  90000000, 1.5, 3100,  0x612,  0x612, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  9, 9, 3, 3, 11}, /* out of spec */
-        {"100",             CPU_PENTIUMPRO, fpus_internal, 100000000, 1.5, 3300,  0x617,  0x617, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  9, 9, 3, 3, 12}, /* out of spec */
-        {"120",             CPU_PENTIUMPRO, fpus_internal, 120000000, 2.0, 3100,  0x612,  0x612, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12, 5, 5, 14}, /* out of spec */
-        {"133",             CPU_PENTIUMPRO, fpus_internal, 133333333, 2.0, 3300,  0x617,  0x617, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12, 5, 5, 16}, /* out of spec */
-        {"150",             CPU_PENTIUMPRO, fpus_internal, 150000000, 2.5, 3100,  0x612,  0x612, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15, 7, 7, 35/2},
-        {"166",             CPU_PENTIUMPRO, fpus_internal, 166666666, 2.5, 3300,  0x617,  0x617, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15, 7, 7, 20},
-        {"180",             CPU_PENTIUMPRO, fpus_internal, 180000000, 3.0, 3300,  0x617,  0x617, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 18,18, 9, 9, 21},
-        {"200",             CPU_PENTIUMPRO, fpus_internal, 200000000, 3.0, 3300,  0x617,  0x617, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 18,18, 9, 9, 24},
-        {"", 0}
-    }
+        .package       = CPU_PKG_8086_MAZOVIA,
+        .manufacturer  = "Kyiv Research Institute of Microdevices",
+        .name          = "K1810VM86",
+        .internal_name = "8086_mazovia",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "4.77",
+                .cpu_type           = CPU_8086_MAZOVIA,
+                .fpus               = fpus_8088,
+                .rspeed             = 4772728,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_ALTERNATE_XTAL,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_8086_VTECH,
+        .manufacturer  = "Intel",
+        .name          = "8086",
+        .internal_name = "8086_vtech",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "4.77",
+                .cpu_type           = CPU_8086,
+                .fpus               = fpus_8088,
+                .rspeed             = 4772728,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "10",
+                .cpu_type           = CPU_8086,
+                .fpus               = fpus_8088,
+                .rspeed             = 10000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_188,
+        .manufacturer  = "Intel",
+        .name          = "80188",
+        .internal_name = "80188",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "6",
+                .cpu_type           = CPU_188,
+                .fpus               = fpus_8088,
+                .rspeed             = 6000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "7.16",
+                .cpu_type           = CPU_188,
+                .fpus               = fpus_8088,
+                .rspeed             = 7159092,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_ALTERNATE_XTAL,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "8",
+                .cpu_type           = CPU_188,
+                .fpus               = fpus_8088,
+                .rspeed             = 8000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "9.54",
+                .cpu_type           = CPU_188,
+                .fpus               = fpus_8088,
+                .rspeed             = 9545456,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_ALTERNATE_XTAL,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "10",
+                .cpu_type           = CPU_188,
+                .fpus               = fpus_8088,
+                .rspeed             = 10000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "12",
+                .cpu_type           = CPU_188,
+                .fpus               = fpus_8088,
+                .rspeed             = 12000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "16",
+                .cpu_type           = CPU_188,
+                .fpus               = fpus_8088,
+                .rspeed             = 16000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 2
+            },
+            {
+                .name               = "20",
+                .cpu_type           = CPU_188,
+                .fpus               = fpus_8088,
+                .rspeed             = 20000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "25",
+                .cpu_type           = CPU_188,
+                .fpus               = fpus_8088,
+                .rspeed             = 25000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 3
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_8088,
+        .manufacturer  = "NEC",
+        .name          = "V20",
+        .internal_name = "necv20",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "4.77",
+                .cpu_type           = CPU_V20,
+                .fpus               = fpus_8088,
+                .rspeed             = 4772728,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "7.16",
+                .cpu_type           = CPU_V20,
+                .fpus               = fpus_8088,
+                .rspeed             = 7159092,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "8",
+                .cpu_type           = CPU_V20,
+                .fpus               = fpus_8088,
+                .rspeed             = 8000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "10",
+                .cpu_type           = CPU_V20,
+                .fpus               = fpus_8088,
+                .rspeed             = 10000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "12",
+                .cpu_type           = CPU_V20,
+                .fpus               = fpus_8088,
+                .rspeed             = 12000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "16",
+                .cpu_type           = CPU_V20,
+                .fpus               = fpus_8088,
+                .rspeed             = 16000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 2
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_186,
+        .manufacturer  = "Intel",
+        .name          = "80186",
+        .internal_name = "80186",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "6",
+                .cpu_type           = CPU_186,
+                .fpus               = fpus_80186,
+                .rspeed             = 6000000,
+                .multi              = 1,
+                .voltage            = 0,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "7.16",
+                .cpu_type           = CPU_186,
+                .fpus               = fpus_80186,
+                .rspeed             = 7159092,
+                .multi              = 1,
+                .voltage            = 0,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_ALTERNATE_XTAL,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "8",
+                .cpu_type           = CPU_186,
+                .fpus               = fpus_80186,
+                .rspeed             = 8000000,
+                .multi              = 1,
+                .voltage            = 0,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "9.54",
+                .cpu_type           = CPU_186,
+                .fpus               = fpus_80186,
+                .rspeed             = 9545456,
+                .multi              = 1,
+                .voltage            = 0,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_ALTERNATE_XTAL,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "10",
+                .cpu_type           = CPU_186,
+                .fpus               = fpus_80186,
+                .rspeed             = 10000000,
+                .multi              = 1,
+                .voltage            = 0,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "12",
+                .cpu_type           = CPU_186,
+                .fpus               = fpus_80186,
+                .rspeed             = 12000000,
+                .multi              = 1,
+                .voltage            = 0,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "16",
+                .cpu_type           = CPU_186,
+                .fpus               = fpus_80186,
+                .rspeed             = 16000000,
+                .multi              = 1,
+                .voltage            = 0,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 2
+            },
+            {
+                .name               = "20",
+                .cpu_type           = CPU_186,
+                .fpus               = fpus_80186,
+                .rspeed             = 20000000,
+                .multi              = 1,
+                .voltage            = 0,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "25",
+                .cpu_type           = CPU_186,
+                .fpus               = fpus_80186,
+                .rspeed             = 25000000,
+                .multi              = 1,
+                .voltage            = 0,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 3
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_8086,
+        .manufacturer  = "NEC",
+        .name          = "V30",
+        .internal_name = "necv30",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "7.16",
+                .cpu_type           = CPU_V30,
+                .fpus               = fpus_80186,
+                .rspeed             = 7159092,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "8",
+                .cpu_type           = CPU_V30,
+                .fpus               = fpus_80186,
+                .rspeed             = 8000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "9.54",
+                .cpu_type           = CPU_V30,
+                .fpus               = fpus_80186,
+                .rspeed             = 9545456,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "10",
+                .cpu_type           = CPU_V30,
+                .fpus               = fpus_80186,
+                .rspeed             = 10000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "12",
+                .cpu_type           = CPU_V30,
+                .fpus               = fpus_80186,
+                .rspeed             = 12000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "16",
+                .cpu_type           = CPU_V30,
+                .fpus               = fpus_80186,
+                .rspeed             = 16000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 0,
+                .mem_write_cycles   = 0,
+                .cache_read_cycles  = 0,
+                .cache_write_cycles = 0,
+                .atclk_div          = 2
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_286,
+        .manufacturer  = "Intel",
+        .name          = "80286",
+        .internal_name = "286",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "6",
+                .cpu_type           = CPU_286,
+                .fpus               = fpus_80286,
+                .rspeed             = 6000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 2,
+                .mem_write_cycles   = 2,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "8",
+                .cpu_type           = CPU_286,
+                .fpus               = fpus_80286,
+                .rspeed             = 8000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 2,
+                .mem_write_cycles   = 2,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "10",
+                .cpu_type           = CPU_286,
+                .fpus               = fpus_80286,
+                .rspeed             = 10000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 2,
+                .mem_write_cycles   = 2,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 1
+            },
+            {
+                .name               = "12",
+                .cpu_type           = CPU_286,
+                .fpus               = fpus_80286,
+                .rspeed             = 12500000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 3,
+                .mem_write_cycles   = 3,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 2
+            },
+            {
+                .name               = "16",
+                .cpu_type           = CPU_286,
+                .fpus               = fpus_80286,
+                .rspeed             = 16000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 3,
+                .mem_write_cycles   = 3,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 2
+            },
+            {
+                .name               = "20",
+                .cpu_type           = CPU_286,
+                .fpus               = fpus_80286,
+                .rspeed             = 20000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "25",
+                .cpu_type           = CPU_286,
+                .fpus               = fpus_80286,
+                .rspeed             = 25000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 3
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_386SX,
+        .manufacturer  = "Intel",
+        .name          = "i386SX",
+        .internal_name = "i386sx",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "16",
+                .cpu_type           = CPU_386SX,
+                .fpus               = fpus_80386,
+                .rspeed             = 16000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x2308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 3,
+                .mem_write_cycles   = 3,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 2
+            },
+            {
+                .name               = "20",
+                .cpu_type           = CPU_386SX,
+                .fpus               = fpus_80386,
+                .rspeed             = 20000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x2308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "25",
+                .cpu_type           = CPU_386SX,
+                .fpus               = fpus_80386,
+                .rspeed             = 25000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x2308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "33",
+                .cpu_type           = CPU_386SX,
+                .fpus               = fpus_80386,
+                .rspeed             = 33333333,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x2308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 4
+            },
+            {
+                .name               = "40",
+                .cpu_type           = CPU_386SX,
+                .fpus               = fpus_80386,
+                .rspeed             = 40000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x2308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 5
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_386SX,
+        .manufacturer  = "AMD",
+        .name          = "Am386SX",
+        .internal_name = "am386sx",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "16",
+                .cpu_type           = CPU_386SX,
+                .fpus               = fpus_80386,
+                .rspeed             = 16000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x2308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 3,
+                .mem_write_cycles   = 3,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 2
+            },
+            {
+                .name               = "20",
+                .cpu_type           = CPU_386SX,
+                .fpus               = fpus_80386,
+                .rspeed             = 20000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x2308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "25",
+                .cpu_type           = CPU_386SX,
+                .fpus               = fpus_80386,
+                .rspeed             = 25000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x2308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "33",
+                .cpu_type           = CPU_386SX,
+                .fpus               = fpus_80386,
+                .rspeed             = 33333333,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x2308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 4
+            },
+            {
+                .name               = "40",
+                .cpu_type           = CPU_386SX,
+                .fpus               = fpus_80386,
+                .rspeed             = 40000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x2308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 5
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_386DX,
+        .manufacturer  = "Intel",
+        .name          = "i386DX",
+        .internal_name = "i386dx",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "16",
+                .cpu_type           = CPU_386DX,
+                .fpus               = fpus_80386,
+                .rspeed             = 16000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x0308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 3,
+                .mem_write_cycles   = 3,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 2
+            },
+            {
+                .name               = "20",
+                .cpu_type           = CPU_386DX,
+                .fpus               = fpus_80386,
+                .rspeed             = 20000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x0308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "25",
+                .cpu_type           = CPU_386DX,
+                .fpus               = fpus_80386,
+                .rspeed             = 25000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x0308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "33",
+                .cpu_type           = CPU_386DX,
+                .fpus               = fpus_80386,
+                .rspeed             = 33333333,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x0308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 4
+            },
+            {
+                .name               = "40",
+                .cpu_type           = CPU_386DX,
+                .fpus               = fpus_80386,
+                .rspeed             = 40000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x0308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 5
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_386DX_DESKPRO386,
+        .manufacturer  = "Intel",
+        .name          = "i386DX",
+        .internal_name = "i386dx_deskpro386",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "16",
+                .cpu_type           = CPU_386DX,
+                .fpus               = fpus_80286,
+                .rspeed             = 16000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x0308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 3,
+                .mem_write_cycles   = 3,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 2
+            },
+            {
+                .name               = "20",
+                .cpu_type           = CPU_386DX,
+                .fpus               = fpus_80386,
+                .rspeed             = 20000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x0308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "25",
+                .cpu_type           = CPU_386DX,
+                .fpus               = fpus_80386,
+                .rspeed             = 25000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x0308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 3
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_386DX,
+        .manufacturer  = "Intel",
+        .name          = "RapidCAD",
+        .internal_name = "rapidcad",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "25",
+                .cpu_type           = CPU_RAPIDCAD,
+                .fpus               = fpus_internal,
+                .rspeed             = 25000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x0340,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "33",
+                .cpu_type           = CPU_RAPIDCAD,
+                .fpus               = fpus_internal,
+                .rspeed             = 33333333,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x0340,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 4
+            },
+            {
+                .name               = "40",
+                .cpu_type           = CPU_RAPIDCAD,
+                .fpus               = fpus_internal,
+                .rspeed             = 40000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x0340,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 5
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_386DX,
+        .manufacturer  = "AMD",
+        .name          = "Am386DX",
+        .internal_name = "am386dx",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "25",
+                .cpu_type           = CPU_386DX,
+                .fpus               = fpus_80386,
+                .rspeed             = 25000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x0308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "33",
+                .cpu_type           = CPU_386DX,
+                .fpus               = fpus_80386,
+                .rspeed             = 33333333,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x0308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 4
+            },
+            {
+                .name               = "40",
+                .cpu_type           = CPU_386DX,
+                .fpus               = fpus_80386,
+                .rspeed             = 40000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x0308,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 5
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_M6117,
+        .manufacturer  = "ALi",
+        .name          = "M6117",
+        .internal_name = "m6117",
+        .cpus          = (const CPU[]) { /* All timings and edx_reset values assumed. */
+            {
+                .name               = "33",
+                .cpu_type           = CPU_386SX,
+                .fpus               = fpus_none,
+                .rspeed             = 33333333,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x2309,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 4
+            },
+            {
+                .name               = "40",
+                .cpu_type           = CPU_386SX,
+                .fpus               = fpus_none,
+                .rspeed             = 40000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x2309,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 5
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_386SLC_IBM,
+        .manufacturer  = "IBM",
+        .name          = "386SLC",
+        .internal_name = "ibm386slc",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "16",
+                .cpu_type           = CPU_IBM386SLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 16000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0xA301,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 3,
+                .mem_write_cycles   = 3,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 2
+            },
+            {
+                .name               = "20",
+                .cpu_type           = CPU_IBM386SLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 20000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0xA301,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "25",
+                .cpu_type           = CPU_IBM386SLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 25000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0xA301,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 3
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_386SX,
+        .manufacturer  = "Cyrix",
+        .name          = "Cx486SLC",
+        .internal_name = "cx486slc",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "20",
+                .cpu_type           = CPU_486SLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 20000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x400,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0000,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "25",
+                .cpu_type           = CPU_486SLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 25000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x400,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0000,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "33",
+                .cpu_type           = CPU_486SLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 33333333,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x400,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0000,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 4
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_386SX,
+        .manufacturer  = "Cyrix",
+        .name          = "Cx486SRx2",
+        .internal_name = "cx486srx2",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "32",
+                .cpu_type           = CPU_486SLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 32000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x406,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0006,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 4
+            },
+            {
+                .name               = "40",
+                .cpu_type           = CPU_486SLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 40000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x406,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0006,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 6
+            },
+            {
+                .name               = "50",
+                .cpu_type           = CPU_486SLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 50000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x406,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0006,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 6
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_486SLC_IBM,
+        .manufacturer  = "IBM",
+        .name          = "486SLC",
+        .internal_name = "ibm486slc",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "33",
+                .cpu_type           = CPU_IBM486SLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 33333333,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0xA401,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 4
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_486SLC_IBM,
+        .manufacturer  = "IBM",
+        .name          = "486SLC2",
+        .internal_name = "ibm486slc2",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "40",
+                .cpu_type           = CPU_IBM486SLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 40000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0xA421,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 5
+            },
+            {
+                .name               = "50",
+                .cpu_type           = CPU_IBM486SLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 50000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0xA421,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 6
+            },
+            {
+                .name               = "66",
+                .cpu_type           = CPU_IBM486SLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 66666666,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0xA421,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 8
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_486SLC_IBM,
+        .manufacturer  = "IBM",
+        .name          = "486SLC3",
+        .internal_name = "ibm486slc3",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "60",
+                .cpu_type           = CPU_IBM486SLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 60000000,
+                .multi              = 3,
+                .voltage            = 5000,
+                .edx_reset          = 0xA439,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 7
+            },
+            {
+                .name               = "75",
+                .cpu_type           = CPU_IBM486SLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 75000000,
+                .multi              = 3,
+                .voltage            = 5000,
+                .edx_reset          = 0xA439,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 9
+            },
+            {
+                .name               = "100",
+                .cpu_type           = CPU_IBM486SLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 100000000,
+                .multi              = 3,
+                .voltage            = 5000,
+                .edx_reset          = 0xA439,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 12
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_486BL,
+        .manufacturer  = "IBM",
+        .name          = "486BL2",
+        .internal_name = "ibm486bl2",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "50",
+                .cpu_type           = CPU_IBM486BL,
+                .fpus               = fpus_80386,
+                .rspeed             = 50000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x8439,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 6
+            },
+            {
+                .name               = "66",
+                .cpu_type           = CPU_IBM486BL,
+                .fpus               = fpus_80386,
+                .rspeed             = 66666666,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x8439,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 8
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_486BL,
+        .manufacturer  = "IBM",
+        .name          = "486BL3",
+        .internal_name = "ibm486bl3",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "75",
+                .cpu_type           = CPU_IBM486BL,
+                .fpus               = fpus_80386,
+                .rspeed             = 75000000,
+                .multi              = 3,
+                .voltage            = 5000,
+                .edx_reset          = 0x8439,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 9
+            },
+            {
+                .name               = "100",
+                .cpu_type           = CPU_IBM486BL,
+                .fpus               = fpus_80386,
+                .rspeed             = 100000000,
+                .multi              = 3,
+                .voltage            = 5000,
+                .edx_reset          = 0x8439,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 12
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_386DX,
+        .manufacturer  = "Cyrix",
+        .name          = "Cx486DLC",
+        .internal_name = "cx486dlc",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "25",
+                .cpu_type           = CPU_486DLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 25000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x401,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0001,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 3,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "33",
+                .cpu_type           = CPU_486DLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 33333333,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x401,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0001,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 4
+            },
+            {
+                .name               = "40",
+                .cpu_type           = CPU_486DLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 40000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x401,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0001,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 2,
+                .cache_write_cycles = 2,
+                .atclk_div          = 5
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_386DX,
+        .manufacturer  = "Cyrix",
+        .name          = "Cx486DRx2",
+        .internal_name = "cx486drx2",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "32",
+                .cpu_type           = CPU_486DLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 32000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x407,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0007,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 4
+            },
+            {
+                .name               = "40",
+                .cpu_type           = CPU_486DLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 40000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x407,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0007,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 6
+            },
+            {
+                .name               = "50",
+                .cpu_type           = CPU_486DLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 50000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x407,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0007,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 6
+            },
+            {
+                .name               = "66",
+                .cpu_type           = CPU_486DLC,
+                .fpus               = fpus_80386,
+                .rspeed             = 66666666,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x407,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0007,
+                .cpu_flags          = 0,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 8
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET1,
+        .manufacturer  = "Intel",
+        .name          = "i486SX",
+        .internal_name = "i486sx",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "16",
+                .cpu_type           = CPU_i486SX,
+                .fpus               = fpus_486sx,
+                .rspeed             = 16000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x420,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 3,
+                .mem_write_cycles   = 3,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 2
+            },
+            {
+                .name               = "20",
+                .cpu_type           = CPU_i486SX,
+                .fpus               = fpus_486sx,
+                .rspeed             = 20000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x420,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "25",
+                .cpu_type           = CPU_i486SX,
+                .fpus               = fpus_486sx,
+                .rspeed             = 25000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x422,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "33",
+                .cpu_type           = CPU_i486SX,
+                .fpus               = fpus_486sx,
+                .rspeed             = 33333333,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x422,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 4
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET1,
+        .manufacturer  = "Intel",
+        .name          = "i486SX-S",
+        .internal_name = "i486sx_slenh",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "25",
+                .cpu_type           = CPU_i486SX_SLENH,
+                .fpus               = fpus_486sx,
+                .rspeed             = 25000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x423,
+                .cpuid_model        = 0x423,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "33",
+                .cpu_type           = CPU_i486SX_SLENH,
+                .fpus               = fpus_486sx,
+                .rspeed             = 33333333,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x42a,
+                .cpuid_model        = 0x42a,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 4
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET1,
+        .manufacturer  = "Intel",
+        .name          = "i486SX2",
+        .internal_name = "i486sx2",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "50",
+                .cpu_type           = CPU_i486SX_SLENH,
+                .fpus               = fpus_486sx,
+                .rspeed             = 50000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x45b,
+                .cpuid_model        = 0x45b,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 6
+            },
+            {
+                .name               = "66 (Q0569)",
+                .cpu_type           = CPU_i486SX_SLENH,
+                .fpus               = fpus_486sx,
+                .rspeed             = 66666666,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x45b,
+                .cpuid_model        = 0x45b,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 8
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET1,
+        .manufacturer  = "Intel",
+        .name          = "i486DX",
+        .internal_name = "i486dx",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "25",
+                .cpu_type           = CPU_i486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 25000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x404,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "33",
+                .cpu_type           = CPU_i486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 33333333,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x404,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 4
+            },
+            {
+                .name               = "50",
+                .cpu_type           = CPU_i486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 50000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x411,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 6
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET1,
+        .manufacturer  = "Intel",
+        .name          = "i486DX-S",
+        .internal_name = "i486dx_slenh",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "33",
+                .cpu_type           = CPU_i486DX_SLENH,
+                .fpus               = fpus_internal,
+                .rspeed             = 33333333,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x414,
+                .cpuid_model        = 0x414,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 4
+            },
+            {
+                .name               = "50",
+                .cpu_type           = CPU_i486DX_SLENH,
+                .fpus               = fpus_internal,
+                .rspeed             = 50000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x414,
+                .cpuid_model        = 0x414,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 6
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET1,
+        .manufacturer  = "Intel",
+        .name          = "i486DX2",
+        .internal_name = "i486dx2",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "40",
+                .cpu_type           = CPU_i486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 40000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x430,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 5
+            },
+            {
+                .name               = "50",
+                .cpu_type           = CPU_i486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 50000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x433,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 6
+            },
+            {
+                .name               = "66",
+                .cpu_type           = CPU_i486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 66666666,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x433,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 8
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET1,
+        .manufacturer  = "Intel",
+        .name          = "i486DX2-S",
+        .internal_name = "i486dx2_slenh",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "40",
+                .cpu_type           = CPU_i486DX_SLENH,
+                .fpus               = fpus_internal,
+                .rspeed             = 40000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x435,
+                .cpuid_model        = 0x435,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 5
+            },
+            {
+                .name               = "50",
+                .cpu_type           = CPU_i486DX_SLENH,
+                .fpus               = fpus_internal,
+                .rspeed             = 50000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x435,
+                .cpuid_model        = 0x435,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 6
+            },
+            {
+                .name               = "66",
+                .cpu_type           = CPU_i486DX_SLENH,
+                .fpus               = fpus_internal,
+                .rspeed             = 66666666,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x435,
+                .cpuid_model        = 0x435,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 8
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET1 | CPU_PKG_SOCKET3_PC330,
+        .manufacturer  = "Intel",
+        .name          = "i486DX2 WB",
+        .internal_name = "i486dx2_pc330",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "50",
+                .cpu_type           = CPU_i486DX_SLENH,
+                .fpus               = fpus_internal,
+                .rspeed             = 50000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x436,
+                .cpuid_model        = 0x436,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 6
+            },
+            {
+                .name               = "66",
+                .cpu_type           = CPU_i486DX_SLENH,
+                .fpus               = fpus_internal,
+                .rspeed             = 66666666,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x436,
+                .cpuid_model        = 0x436,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 8
+            },
+            { .name = "", 0 }
+        }
+    },
+    { /*OEM versions are 3.3V, Retail versions are 3.3V with a 5V regulator for installation in older boards. They are functionally identical*/
+        .package       = CPU_PKG_SOCKET1 | CPU_PKG_SOCKET3_PC330 | CPU_PKG_SOCKET6,
+        .manufacturer  = "Intel",
+        .name          = "iDX4",
+        .internal_name = "idx4",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "75",
+                .cpu_type           = CPU_i486DX_SLENH,
+                .fpus               = fpus_internal,
+                .rspeed             = 75000000,
+                .multi              = 3.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x480,
+                .cpuid_model        = 0x480,
+                .cyrix_id           = 0x0000,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 9
+            },
+            {
+                .name               = "100",
+                .cpu_type           = CPU_i486DX_SLENH,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 3.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x483,
+                .cpuid_model        = 0x483,
+                .cyrix_id           = 0x0000,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 12
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET3 | CPU_PKG_SOCKET3_PC330 | CPU_PKG_SOCKET6,
+        .manufacturer  = "Intel",
+        .name          = "Pentium OverDrive",
+        .internal_name = "pentium_p24t",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "63",
+                .cpu_type           = CPU_P24T,
+                .fpus               = fpus_internal,
+                .rspeed             = 62500000,
+                .multi              = 2.5,
+                .voltage            = 5000,
+                .edx_reset          = 0x1531,
+                .cpuid_model        = 0x1531,
+                .cyrix_id           = 0x0000,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 10,
+                .mem_write_cycles   = 10,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 15/2
+            },
+            {
+                .name               = "83",
+                .cpu_type           = CPU_P24T,
+                .fpus               = fpus_internal,
+                .rspeed             = 83333333,
+                .multi              = 2.5,
+                .voltage            = 5000,
+                .edx_reset          = 0x1532,
+                .cpuid_model        = 0x1532,
+                .cyrix_id           = 0x0000,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 8,
+                .cache_write_cycles = 8,
+                .atclk_div          = 10
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET1,
+        .manufacturer  = "AMD",
+        .name          = "Am486SX",
+        .internal_name = "am486sx",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "33",
+                .cpu_type           = CPU_Am486SX,
+                .fpus               = fpus_486sx,
+                .rspeed             = 33333333,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x422,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 4
+            },
+            {
+                .name               = "40",
+                .cpu_type           = CPU_Am486SX,
+                .fpus               = fpus_486sx,
+                .rspeed             = 40000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x422,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 5
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET1,
+        .manufacturer  = "AMD",
+        .name          = "Am486SX2",
+        .internal_name = "am486sx2",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "50",
+                .cpu_type           = CPU_Am486SX,
+                .fpus               = fpus_486sx,
+                .rspeed             = 50000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x45b,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 6
+            },
+            {
+                .name               = "66",
+                .cpu_type           = CPU_Am486SX,
+                .fpus               = fpus_486sx,
+                .rspeed             = 66666666,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x45b,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 8
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET1,
+        .manufacturer  = "AMD",
+        .name          = "Am486DX",
+        .internal_name = "am486dx",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "33",
+                .cpu_type           = CPU_Am486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 33333333,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x412,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 4
+            },
+            {
+                .name               = "40",
+                .cpu_type           = CPU_Am486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 40000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x412,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 5
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET1,
+        .manufacturer  = "AMD",
+        .name          = "Am486DX2",
+        .internal_name = "am486dx2",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "50",
+                .cpu_type           = CPU_Am486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 50000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x432,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 6
+            },
+            {
+                .name               = "66",
+                .cpu_type           = CPU_Am486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 66666666,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x432,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 8
+            },
+            {
+                .name               = "80",
+                .cpu_type           = CPU_Am486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 80000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x432,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 14,
+                .mem_write_cycles   = 14,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 10
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET1,
+        .manufacturer  = "AMD",
+        .name          = "Am486DXL",
+        .internal_name = "am486dxl",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "33",
+                .cpu_type           = CPU_Am486DXL,
+                .fpus               = fpus_internal,
+                .rspeed             = 33333333,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x422,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 4
+            },
+            {
+                .name               = "40",
+                .cpu_type           = CPU_Am486DXL,
+                .fpus               = fpus_internal,
+                .rspeed             = 40000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x422,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 5
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET1,
+        .manufacturer  = "AMD",
+        .name          = "Am486DXL2",
+        .internal_name = "am486dxl2",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "50",
+                .cpu_type           = CPU_Am486DXL,
+                .fpus               = fpus_internal,
+                .rspeed             = 50000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x432,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 6
+            },
+            {
+                .name               = "66",
+                .cpu_type           = CPU_Am486DXL,
+                .fpus               = fpus_internal,
+                .rspeed             = 66666666,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x432,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 8
+            },
+            {
+                .name               = "80",
+                .cpu_type           = CPU_Am486DXL,
+                .fpus               = fpus_internal,
+                .rspeed             = 80000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x432,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 14,
+                .mem_write_cycles   = 14,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 10
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET3 | CPU_PKG_SOCKET6,
+        .manufacturer  = "AMD",
+        .name          = "Am486DX4",
+        .internal_name = "am486dx4",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "75",
+                .cpu_type           = CPU_Am486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 75000000,
+                .multi              = 3.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x432,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 9
+            },
+            {
+                .name               = "90",
+                .cpu_type           = CPU_Am486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 90000000,
+                .multi              = 3.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x432,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 12
+            },
+            {
+                .name               = "100",
+                .cpu_type           = CPU_Am486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 3.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x432,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 12
+            },
+            {
+                .name               = "120",
+                .cpu_type           = CPU_Am486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 120000000,
+                .multi              = 3.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x432,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 15
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET3 | CPU_PKG_SOCKET6,
+        .manufacturer  = "AMD",
+        .name          = "Am486DX2 (Enhanced)",
+        .internal_name = "am486dx2_slenh",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "66",
+                .cpu_type           = CPU_ENH_Am486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 66666666,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x435,
+                .cpuid_model        = 0x435,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 8
+            },
+            {
+                .name               = "80",
+                .cpu_type           = CPU_ENH_Am486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 80000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x435,
+                .cpuid_model        = 0x435,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 14,
+                .mem_write_cycles   = 14,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 10
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET3 | CPU_PKG_SOCKET6,
+        .manufacturer  = "AMD",
+        .name          = "Am486DX4 (Enhanced)",
+        .internal_name = "am486dx4_slenh",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "75",
+                .cpu_type           = CPU_ENH_Am486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 75000000,
+                .multi              = 3.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x482,
+                .cpuid_model        = 0x482,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 9
+            },
+            {
+                .name               = "100",
+                .cpu_type           = CPU_ENH_Am486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 3.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x482,
+                .cpuid_model        = 0x482,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 12
+            },
+            {
+                .name               = "120",
+                .cpu_type           = CPU_ENH_Am486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 120000000,
+                .multi              = 3.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x482,
+                .cpuid_model        = 0x482,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 15
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET3 | CPU_PKG_SOCKET6,
+        .manufacturer  = "AMD",
+        .name          = "Am5x86",
+        .internal_name = "am5x86",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "133 (P75)",
+                .cpu_type           = CPU_ENH_Am486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 4.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x4e0,
+                .cpuid_model        = 0x4e0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 24,
+                .mem_write_cycles   = 24,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 16
+            },
+            { /*The rare P75+ was indeed a triple-clocked 150 MHz according to research*/
+                .name               = "150 (P75+)",
+                .cpu_type           = CPU_ENH_Am486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 150000000,
+                .multi              = 3.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x482,
+                .cpuid_model        = 0x482,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 28,
+                .mem_write_cycles   = 28,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 20
+            },
+            { /*160 MHz on a 40 MHz bus was a common overclock and "5x86/P90" was used by a number of BIOSes to refer to that configuration*/
+                .name               = "160 (P90)",
+                .cpu_type           = CPU_ENH_Am486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 160000000,
+                .multi              = 4.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x4e0,
+                .cpuid_model        = 0x4e0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 28,
+                .mem_write_cycles   = 28,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 20
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET1,
+        .manufacturer  = "Cyrix",
+        .name          = "Cx486S",
+        .internal_name = "cx486s",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "25",
+                .cpu_type           = CPU_Cx486S,
+                .fpus               = fpus_486sx,
+                .rspeed             = 25000000,
+                .multi              = 1.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x420,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0010,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 3
+            },
+            {
+                .name               = "33",
+                .cpu_type           = CPU_Cx486S,
+                .fpus               = fpus_486sx,
+                .rspeed             = 33333333,
+                .multi              = 1.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x420,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0010,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 4
+            },
+            {
+                .name               = "40",
+                .cpu_type           = CPU_Cx486S,
+                .fpus               = fpus_486sx,
+                .rspeed             = 40000000,
+                .multi              = 1.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x420,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0010,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 5
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET1,
+        .manufacturer  = "Cyrix",
+        .name          = "Cx486DX",
+        .internal_name = "cx486dx",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "33",
+                .cpu_type           = CPU_Cx486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 33333333,
+                .multi              = 1.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x430,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x051a,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 4
+            },
+            {
+                .name               = "40",
+                .cpu_type           = CPU_Cx486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 40000000,
+                .multi              = 1.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x430,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x051a,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 5
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET1,
+        .manufacturer  = "Cyrix",
+        .name          = "Cx486DX2",
+        .internal_name = "cx486dx2",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "50",
+                .cpu_type           = CPU_Cx486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 50000000,
+                .multi              = 2.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x430,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x081b,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 6
+            },
+            {
+                .name               = "66",
+                .cpu_type           = CPU_Cx486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 66666666,
+                .multi              = 2.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x430,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0b1b,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 8
+            },
+            {
+                .name               = "80",
+                .cpu_type           = CPU_Cx486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 80000000,
+                .multi              = 2.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x430,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x311b,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 14,
+                .mem_write_cycles   = 14,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 10
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package = CPU_PKG_SOCKET6,
+        .manufacturer = "Cyrix",
+        .name = "Cx486DX2",
+        .internal_name = "cx486dx2v",
+        .cpus = (const CPU[]) {
+            {
+                .name               = "66",
+                .cpu_type           = CPU_Cx486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 66666666,
+                .multi              = 2.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x430,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0b1b,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 8
+            },
+            {
+                .name               = "80",
+                .cpu_type           = CPU_Cx486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 80000000,
+                .multi              = 2.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x430,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x311b,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 14,
+                .mem_write_cycles   = 14,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 10
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET3 | CPU_PKG_SOCKET6,
+        .manufacturer  = "Cyrix",
+        .name          = "Cx486DX4",
+        .internal_name = "cx486dx4",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "75",
+                .cpu_type           = CPU_Cx486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 75000000,
+                .multi              = 3.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x480,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x361f,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 9
+            },
+            {
+                .name               = "100",
+                .cpu_type           = CPU_Cx486DX,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 3.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x480,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x361f,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 12
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET3,
+        .manufacturer  = "Cyrix",
+        .name          = "Cx5x86",
+        .internal_name = "cx5x86",
+        .cpus          = (const CPU[]) {
+            { /*If we're including the Pentium 50, might as well include this*/
+                .name               = "80",
+                .cpu_type           = CPU_Cx5x86,
+                .fpus               = fpus_internal,
+                .rspeed             = 80000000,
+                .multi              = 2.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x480,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x002f,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 14,
+                .mem_write_cycles   = 14,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 10
+            },
+            {
+                .name               = "100",
+                .cpu_type           = CPU_Cx5x86,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 3.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x480,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x002f,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 12
+            },
+            {
+                .name               = "120",
+                .cpu_type           = CPU_Cx5x86,
+                .fpus               = fpus_internal,
+                .rspeed             = 120000000,
+                .multi              = 3.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x480,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x002f,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 15
+            },
+            {
+                .name               = "133",
+                .cpu_type           = CPU_Cx5x86,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 4.0,
+                .voltage            = 5000,
+                .edx_reset          = 0x480,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x002f,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 24,
+                .mem_write_cycles   = 24,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 16
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_STPC,
+        .manufacturer  = "ST",
+        .name          = "STPC-DX",
+        .internal_name = "stpc_dx",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "66",
+                .cpu_type           = CPU_STPC,
+                .fpus               = fpus_internal,
+                .rspeed             = 66666666,
+                .multi              = 1.0,
+                .voltage            = 3300,
+                .edx_reset          = 0x430,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x051a,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 5
+            },
+            {
+                .name               = "75",
+                .cpu_type           = CPU_STPC,
+                .fpus               = fpus_internal,
+                .rspeed             = 75000000,
+                .multi              = 1.0,
+                .voltage            = 3300,
+                .edx_reset          = 0x430,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x051a,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 5
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_STPC,
+        .manufacturer  = "ST",
+        .name          = "STPC-DX2",
+        .internal_name = "stpc_dx2",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "133",
+                .cpu_type           = CPU_STPC,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 3300,
+                .edx_reset          = 0x430,
+                .cpuid_model        = 0,
+                .cyrix_id           = 0x0b1b,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 14,
+                .mem_write_cycles   = 14,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 10
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET4,
+        .manufacturer  = "Intel",
+        .name          = "Pentium",
+        .internal_name = "pentium_p5",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "50 (Q0399)",
+                .cpu_type           = CPU_PENTIUM,
+                .fpus               = fpus_internal,
+                .rspeed             = 50000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x513,
+                .cpuid_model        = 0x513,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 4,
+                .mem_write_cycles   = 4,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 6
+            },
+            {
+                .name               = "60",
+                .cpu_type           = CPU_PENTIUM,
+                .fpus               = fpus_internal,
+                .rspeed             = 60000000,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x517,
+                .cpuid_model        = 0x517,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 7
+            },
+            {
+                .name               = "66",
+                .cpu_type           = CPU_PENTIUM,
+                .fpus               = fpus_internal,
+                .rspeed             = 66666666,
+                .multi              = 1,
+                .voltage            = 5000,
+                .edx_reset          = 0x517,
+                .cpuid_model        = 0x517,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 8
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET4,
+        .manufacturer  = "Intel",
+        .name          = "Pentium OverDrive",
+        .internal_name = "pentium_p54c_od5v",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "100",
+                .cpu_type           = CPU_PENTIUM,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x51A,
+                .cpuid_model        = 0x51A,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 12
+            },
+            {
+                .name               = "120",
+                .cpu_type           = CPU_PENTIUM,
+                .fpus               = fpus_internal,
+                .rspeed             = 120000000,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x51A,
+                .cpuid_model        = 0x51A,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 14
+            },
+            {
+                .name               = "133",
+                .cpu_type           = CPU_PENTIUM,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2,
+                .voltage            = 5000,
+                .edx_reset          = 0x51A,
+                .cpuid_model        = 0x51A,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "Intel",
+        .name          = "Pentium",
+        .internal_name = "pentium_p54c",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "75",
+                .cpu_type           = CPU_PENTIUM,
+                .fpus               = fpus_internal,
+                .rspeed             = 75000000,
+                .multi              = 1.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x522,
+                .cpuid_model        = 0x522,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 9
+            },
+            {
+                .name               = "90",
+                .cpu_type           = CPU_PENTIUM,
+                .fpus               = fpus_internal,
+                .rspeed             = 90000000,
+                .multi              = 1.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x524,
+                .cpuid_model        = 0x524,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 21/2
+            },
+            {
+                .name               = "100/50",
+                .cpu_type           = CPU_PENTIUM,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 2.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x524,
+                .cpuid_model        = 0x524,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 10,
+                .mem_write_cycles   = 10,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 12
+            },
+            {
+                .name               = "100/66",
+                .cpu_type           = CPU_PENTIUM,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 1.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x526,
+                .cpuid_model        = 0x526,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 12
+            },
+            {
+                .name               = "120",
+                .cpu_type           = CPU_PENTIUM,
+                .fpus               = fpus_internal,
+                .rspeed             = 120000000,
+                .multi              = 2.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x526,
+                .cpuid_model        = 0x526,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 14
+            },
+            {
+                .name               = "133",
+                .cpu_type           = CPU_PENTIUM,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x52c,
+                .cpuid_model        = 0x52c,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+            },
+            {
+                .name               = "150",
+                .cpu_type           = CPU_PENTIUM,
+                .fpus               = fpus_internal,
+                .rspeed             = 150000000,
+                .multi              = 2.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x52c,
+                .cpuid_model        = 0x52c,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 35/2
+            },
+            {
+                .name               = "166",
+                .cpu_type           = CPU_PENTIUM,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x52c,
+                .cpuid_model        = 0x52c,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            {
+                .name               = "200",
+                .cpu_type           = CPU_PENTIUM,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x52c,
+                .cpuid_model        = 0x52c,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 24
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "Intel",
+        .name          = "Pentium MMX",
+        .internal_name = "pentium_p55c",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "166",
+                .cpu_type           = CPU_PENTIUMMMX,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 2800,
+                .edx_reset          = 0x543,
+                .cpuid_model        = 0x543,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            {
+                .name               = "200",
+                .cpu_type           = CPU_PENTIUMMMX,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 2800,
+                .edx_reset          = 0x543,
+                .cpuid_model        = 0x543,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 24
+            },
+            {
+                .name               = "233",
+                .cpu_type           = CPU_PENTIUMMMX,
+                .fpus               = fpus_internal,
+                .rspeed             = 233333333,
+                .multi              = 3.5,
+                .voltage            = 2800,
+                .edx_reset          = 0x543,
+                .cpuid_model        = 0x543,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 10,
+                .cache_write_cycles = 10,
+                .atclk_div          = 28
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "Intel",
+        .name          = "Mobile Pentium MMX",
+        .internal_name = "pentium_tillamook",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "120",
+                .cpu_type           = CPU_PENTIUMMMX,
+                .fpus               = fpus_internal,
+                .rspeed             = 120000000,
+                .multi              = 2.0,
+                .voltage            = 2800,
+                .edx_reset          = 0x543,
+                .cpuid_model        = 0x543,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 14
+            },
+            {
+                .name               = "133",
+                .cpu_type           = CPU_PENTIUMMMX,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 2800,
+                .edx_reset          = 0x543,
+                .cpuid_model        = 0x543,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+            },
+            {
+                .name               = "150",
+                .cpu_type           = CPU_PENTIUMMMX,
+                .fpus               = fpus_internal,
+                .rspeed             = 150000000,
+                .multi              = 2.5,
+                .voltage            = 2800,
+                .edx_reset          = 0x544,
+                .cpuid_model        = 0x544,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 35/2
+            },
+            {
+                .name               = "166",
+                .cpu_type           = CPU_PENTIUMMMX,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 2800,
+                .edx_reset          = 0x544,
+                .cpuid_model        = 0x544,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            {
+                .name               = "200",
+                .cpu_type           = CPU_PENTIUMMMX,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 2800,
+                .edx_reset          = 0x581,
+                .cpuid_model        = 0x581,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 24
+            },
+            {
+                .name               = "233",
+                .cpu_type           = CPU_PENTIUMMMX,
+                .fpus               = fpus_internal,
+                .rspeed             = 233333333,
+                .multi              = 3.5,
+                .voltage            = 2800,
+                .edx_reset          = 0x581,
+                .cpuid_model        = 0x581,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 10,
+                .cache_write_cycles = 10,
+                .atclk_div          = 28
+            },
+            {
+                .name               = "266",
+                .cpu_type           = CPU_PENTIUMMMX,
+                .fpus               = fpus_internal,
+                .rspeed             = 266666666,
+                .multi              = 4.0,
+                .voltage            = 2800,
+                .edx_reset          = 0x582,
+                .cpuid_model        = 0x582,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 24,
+                .mem_write_cycles   = 24,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 32
+            },
+            {
+                .name               = "300",
+                .cpu_type           = CPU_PENTIUMMMX,
+                .fpus               = fpus_internal,
+                .rspeed             = 300000000,
+                .multi              = 4.5,
+                .voltage            = 2800,
+                .edx_reset          = 0x582,
+                .cpuid_model        = 0x582,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 27,
+                .mem_write_cycles   = 27,
+                .cache_read_cycles  = 13,
+                .cache_write_cycles = 13,
+                .atclk_div          = 36
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "Intel",
+        .name          = "Pentium OverDrive",
+        .internal_name = "pentium_p54c_od3v",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "125",
+                .cpu_type           = CPU_PENTIUM,
+                .fpus               = fpus_internal,
+                .rspeed             = 125000000,
+                .multi              = 3.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x52c,
+                .cpuid_model        = 0x52c,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 15
+            },
+            {
+                .name               = "150",
+                .cpu_type           = CPU_PENTIUM,
+                .fpus               = fpus_internal,
+                .rspeed             = 150000000,
+                .multi              = 2.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x52c,
+                .cpuid_model        = 0x52c,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 35/2
+            },
+            {
+                .name               = "166",
+                .cpu_type           = CPU_PENTIUM,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x52c,
+                .cpuid_model        = 0x52c,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "Intel",
+        .name          = "Pentium OverDrive MMX",
+        .internal_name = "pentium_p55c_od",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "75",
+                .cpu_type           = CPU_PENTIUMMMX,
+                .fpus               = fpus_internal,
+                .rspeed             = 75000000,
+                .multi              = 1.5,
+                .voltage            = 3520,
+				.edx_reset = 0x1542,
+				.cpuid_model = 0x1542,
+				.cyrix_id = 0,
+				.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+				.mem_read_cycles = 7,
+				.mem_write_cycles = 7,
+				.cache_read_cycles = 4,
+				.cache_write_cycles = 4,
+				.atclk_div = 9
+			},
+            {
+                .name               = "125",
+                .cpu_type           = CPU_PENTIUMMMX,
+                .fpus               = fpus_internal,
+                .rspeed             = 125000000,
+                .multi              = 2.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x1542,
+                .cpuid_model        = 0x1542,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 15
+            },
+            {
+                .name               = "150/60",
+                .cpu_type           = CPU_PENTIUMMMX,
+                .fpus               = fpus_internal,
+                .rspeed             = 150000000,
+                .multi              = 2.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x1542,
+                .cpuid_model        = 0x1542,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 35/2
+            },
+            {
+                .name               = "166",
+                .cpu_type           = CPU_PENTIUMMMX,
+                .fpus               = fpus_internal,
+                .rspeed             = 166000000,
+                .multi              = 2.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x1542,
+                .cpuid_model        = 0x1542,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            {
+                .name               = "180",
+                .cpu_type           = CPU_PENTIUMMMX,
+                .fpus               = fpus_internal,
+                .rspeed             = 180000000,
+                .multi              = 3.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x1542,
+                .cpuid_model        = 0x1542,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 21
+            },
+            {
+                .name               = "200",
+                .cpu_type           = CPU_PENTIUMMMX,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x1542,
+                .cpuid_model        = 0x1542,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 24
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "IDT",
+        .name          = "WinChip",
+        .internal_name = "winchip",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "75",
+                .cpu_type           = CPU_WINCHIP,
+                .fpus               = fpus_internal,
+                .rspeed             = 75000000,
+                .multi              = 1.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x540,
+                .cpuid_model        = 0x540,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 9
+            },
+            {
+                .name               = "90",
+                .cpu_type           = CPU_WINCHIP,
+                .fpus               = fpus_internal,
+                .rspeed             = 90000000,
+                .multi              = 1.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x540,
+                .cpuid_model        = 0x540,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 21/2
+            },
+            {
+                .name               = "100",
+                .cpu_type           = CPU_WINCHIP,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 1.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x540,
+                .cpuid_model        = 0x540,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 12
+            },
+            {
+                .name               = "120",
+                .cpu_type           = CPU_WINCHIP,
+                .fpus               = fpus_internal,
+                .rspeed             = 120000000,
+                .multi              = 2.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x540,
+                .cpuid_model        = 0x540,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 14
+            },
+            {
+                .name               = "133",
+                .cpu_type           = CPU_WINCHIP,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x540,
+                .cpuid_model        = 0x540,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+            },
+            {
+                .name               = "150",
+                .cpu_type           = CPU_WINCHIP,
+                .fpus               = fpus_internal,
+                .rspeed             = 150000000,
+                .multi              = 2.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x540,
+                .cpuid_model        = 0x540,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 35/2
+            },
+            {
+                .name               = "166",
+                .cpu_type           = CPU_WINCHIP,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x540,
+                .cpuid_model        = 0x540,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 40
+            },
+            {
+                .name               = "180",
+                .cpu_type           = CPU_WINCHIP,
+                .fpus               = fpus_internal,
+                .rspeed             = 180000000,
+                .multi              = 3.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x540,
+                .cpuid_model        = 0x540,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 21
+            },
+            {
+                .name               = "200",
+                .cpu_type           = CPU_WINCHIP,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x540,
+                .cpuid_model        = 0x540,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 24
+            },
+            {
+                .name               = "225",
+                .cpu_type           = CPU_WINCHIP,
+                .fpus               = fpus_internal,
+                .rspeed             = 225000000,
+                .multi              = 3.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x540,
+                .cpuid_model        = 0x540,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 27
+            },
+            {
+                .name               = "240",
+                .cpu_type           = CPU_WINCHIP,
+                .fpus               = fpus_internal,
+                .rspeed             = 240000000,
+                .multi              = 4.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x540,
+                .cpuid_model        = 0x540,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 24,
+                .mem_write_cycles   = 24,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 28
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "IDT",
+        .name          = "WinChip 2",
+        .internal_name = "winchip2",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "200",
+                .cpu_type           = CPU_WINCHIP2,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x580,
+                .cpuid_model        = 0x580,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 3*8
+            },
+            {
+                .name               = "225",
+                .cpu_type           = CPU_WINCHIP2,
+                .fpus               = fpus_internal,
+                .rspeed             = 225000000,
+                .multi              = 3.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x580,
+                .cpuid_model        = 0x580,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 3*9
+            },
+            {
+                .name               = "240",
+                .cpu_type           = CPU_WINCHIP2,
+                .fpus               = fpus_internal,
+                .rspeed             = 240000000,
+                .multi              = 4.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x580,
+                .cpuid_model        = 0x580,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 24,
+                .mem_write_cycles   = 24,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 30
+            },
+            {
+                .name               = "250",
+                .cpu_type           = CPU_WINCHIP2,
+                .fpus               = fpus_internal,
+                .rspeed             = 250000000,
+                .multi              = 3.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x580,
+                .cpuid_model        = 0x580,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 24,
+                .mem_write_cycles   = 24,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 30
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "IDT",
+        .name          = "WinChip 2A",
+        .internal_name = "winchip2a",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "200",
+                .cpu_type           = CPU_WINCHIP2,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x587,
+                .cpuid_model        = 0x587,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 3*8
+            },
+            {
+                .name               = "233",
+                .cpu_type           = CPU_WINCHIP2,
+                .fpus               = fpus_internal,
+                .rspeed             = 233333333,
+                .multi              = 3.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x587,
+                .cpuid_model        = 0x587,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = (7*8)/2
+            },
+            {
+                .name               = "266",
+                .cpu_type           = CPU_WINCHIP2,
+                .fpus               = fpus_internal,
+                .rspeed             = 233333333,
+                .multi              = 7.0/3.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x587,
+                .cpuid_model        = 0x587,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 28
+            },
+            {
+                .name               = "300",
+                .cpu_type           = CPU_WINCHIP2,
+                .fpus               = fpus_internal,
+                .rspeed             = 250000000,
+                .multi              = 2.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x587,
+                .cpuid_model        = 0x587,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC,
+                .mem_read_cycles    = 24,
+                .mem_write_cycles   = 24,
+                .cache_read_cycles  = 8,
+                .cache_write_cycles = 8,
+                .atclk_div          = 30
+            },
+            { .name = "", 0 }
+        }
+    },
+#ifdef USE_AMD_K5
+    {
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "AMD",
+        .name          = "K5 (Model 0)",
+        .internal_name = "k5_ssa5",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "75 (PR75)",
+                .cpu_type           = CPU_K5,
+                .fpus               = fpus_internal,
+                .rspeed             = 75000000,
+                .multi              = 1.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x501,
+                .cpuid_model        = 0x501,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 9
+            },
+            {
+                .name               = "90 (PR90)",
+                .cpu_type           = CPU_K5,
+                .fpus               = fpus_internal,
+                .rspeed             = 90000000,
+                .multi              = 1.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x501,
+                .cpuid_model        = 0x501,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 21/2
+            },
+            {
+                .name               = "100 (PR100)",
+                .cpu_type           = CPU_K5,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 1.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x501,
+                .cpuid_model        = 0x501,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 12
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "AMD",
+        .name          = "K5 (Model 1/2/3)",
+        .internal_name = "k5_5k86",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "90 (PR120)",
+                .cpu_type           = CPU_5K86,
+                .fpus               = fpus_internal,
+                .rspeed             = 120000000,
+                .multi              = 2.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x511,
+                .cpuid_model        = 0x511,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 14
+            },
+            {
+                .name               = "100 (PR133)",
+                .cpu_type           = CPU_5K86,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x514,
+                .cpuid_model        = 0x514,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+            },
+            {
+                .name               = "105 (PR150)",
+                .cpu_type           = CPU_5K86,
+                .fpus               = fpus_internal,
+                .rspeed             = 150000000,
+                .multi              = 2.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x524,
+                .cpuid_model        = 0x524,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 35/2
+            },
+            {
+                .name               = "116.7 (PR166)",
+                .cpu_type           = CPU_5K86,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 3520,
+                .edx_reset          = 0x524,
+                .cpuid_model        = 0x524,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            {
+                .name               = "133 (PR200)",
+                .cpu_type           = CPU_5K86,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x534,
+                .cpuid_model        = 0x534,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 24
+            },
+            { .name = "", 0 }
+        }
+    },
+#endif /* USE_AMD_K5 */
+    {
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "AMD",
+        .name          = "K6 (Model 6)",
+        .internal_name = "k6_m6",
+        .cpus          = (const CPU[]) {
+            { /* out of spec */
+                .name               = "66",
+                .cpu_type           = CPU_K6,
+                .fpus               = fpus_internal,
+                .rspeed             = 66666666,
+                .multi              = 1.0,
+                .voltage            = 2900,
+                .edx_reset          = 0x561,
+                .cpuid_model        = 0x561,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 8
+            },
+            { /* out of spec */
+                .name               = "100",
+                .cpu_type           = CPU_K6,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 1.5,
+                .voltage            = 2900,
+                .edx_reset          = 0x561,
+                .cpuid_model        = 0x561,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 12
+            },
+            { /* out of spec */
+                .name               = "133",
+                .cpu_type           = CPU_K6,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 2900,
+                .edx_reset          = 0x561,
+                .cpuid_model        = 0x561,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+                },
+            {
+                .name               = "166",
+                .cpu_type           = CPU_K6,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 2900,
+                .edx_reset          = 0x561,
+                .cpuid_model        = 0x561,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            {
+                .name               = "200",
+                .cpu_type           = CPU_K6,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 2900,
+                .edx_reset          = 0x561,
+                .cpuid_model        = 0x561,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 24
+            },
+            {
+                .name               = "233",
+                .cpu_type           = CPU_K6,
+                .fpus               = fpus_internal,
+                .rspeed             = 233333333,
+                .multi              = 3.5,
+                .voltage            = 3200,
+                .edx_reset          = 0x561,
+                .cpuid_model        = 0x561,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 10,
+                .cache_write_cycles = 10,
+                .atclk_div          = 28
+            },
+            { .name = "", 0 }
+        }
     }, {
-    .package = CPU_PKG_SOCKET8,
-    .manufacturer = "Intel",
-    .name = "Pentium II OverDrive",
-    .internal_name = "pentium2_od",
-    .cpus = (const CPU[]) {
-        {"66",     CPU_PENTIUM2D,  fpus_internal,  66666666, 1.0, 3300, 0x1632, 0x1632, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,  6, 6, 3, 3, 8},  /* out of spec */
-        {"100",    CPU_PENTIUM2D,  fpus_internal, 100000000, 1.5, 3300, 0x1632, 0x1632, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,  9, 9, 4, 4, 12}, /* out of spec */
-        {"133",    CPU_PENTIUM2D,  fpus_internal, 133333333, 2.0, 3300, 0x1632, 0x1632, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 12,12, 6, 6, 16}, /* out of spec */
-        {"166",    CPU_PENTIUM2D,  fpus_internal, 166666666, 2.5, 3300, 0x1632, 0x1632, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 15,15, 7, 7, 20}, /* out of spec */
-        {"200",    CPU_PENTIUM2D,  fpus_internal, 200000000, 3.0, 3300, 0x1632, 0x1632, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 18,18, 9, 9, 24}, /* out of spec */
-        {"233",    CPU_PENTIUM2D,  fpus_internal, 233333333, 3.5, 3300, 0x1632, 0x1632, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 21,21,10,10, 28}, /* out of spec */
-        {"266",    CPU_PENTIUM2D,  fpus_internal, 266666666, 4.0, 3300, 0x1632, 0x1632, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 24,24,12,12, 32}, /* out of spec */
-        {"300",    CPU_PENTIUM2D,  fpus_internal, 300000000, 5.0, 3300, 0x1632, 0x1632, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 27,27,13,13, 36},
-        {"333",    CPU_PENTIUM2D,  fpus_internal, 333333333, 5.0, 3300, 0x1632, 0x1632, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 27,27,13,13, 40},
-        {"", 0}
-    }
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "AMD",
+        .name          = "K6 (Model 7)",
+        .internal_name = "k6_m7",
+        .cpus          = (const CPU[]) {
+            { /* out of spec */
+                .name               = "100",
+                .cpu_type           = CPU_K6,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 1.5,
+                .voltage            = 2200,
+                .edx_reset          = 0x570,
+                .cpuid_model        = 0x570,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 12
+            },
+            { /* out of spec */
+                .name               = "133",
+                .cpu_type           = CPU_K6,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 2200,
+                .edx_reset          = 0x570,
+                .cpuid_model        = 0x570,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+            },
+            { /* out of spec */
+                .name               = "166",
+                .cpu_type           = CPU_K6,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666, .multi = 2.5,
+                .voltage            = 2200, .edx_reset = 0x570,
+                .cpuid_model        = 0x570, .cyrix_id = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            {
+                .name               = "200",
+                .cpu_type           = CPU_K6,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000, .multi = 3.0,
+                .voltage            = 2200, .edx_reset = 0x570,
+                .cpuid_model        = 0x570, .cyrix_id = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 24
+            },
+            {
+                .name               = "233",
+                .cpu_type           = CPU_K6,
+                .fpus               = fpus_internal,
+                .rspeed             = 233333333, .multi = 3.5,
+                .voltage            = 2200, .edx_reset = 0x570,
+                .cpuid_model        = 0x570,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 10,
+                .cache_write_cycles = 10,
+                .atclk_div          = 28
+            },
+            {
+                .name               = "266",
+                .cpu_type           = CPU_K6,
+                .fpus               = fpus_internal,
+                .rspeed             = 266666666,
+                .multi              = 4.0,
+                .voltage            = 2200,
+                .edx_reset          = 0x570,
+                .cpuid_model        = 0x570,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 24,
+                .mem_write_cycles   = 24,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 32
+            },
+            {
+                .name               = "300",
+                .cpu_type           = CPU_K6,
+                .fpus               = fpus_internal,
+                .rspeed             = 300000000,
+                .multi              = 4.5,
+                .voltage            = 2200,
+                .edx_reset          = 0x570,
+                .cpuid_model        = 0x570,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 27,
+                .mem_write_cycles   = 27,
+                .cache_read_cycles  = 13,
+                .cache_write_cycles = 13,
+                .atclk_div          = 36
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "AMD",
+        .name          = "K6-2",
+        .internal_name = "k6_2",
+        .cpus          = (const CPU[]) {
+            { /* out of spec */
+                .name               = "100",
+                .cpu_type           = CPU_K6_2,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 1.5,
+                .voltage            = 2200,
+                .edx_reset          = 0x580,
+                .cpuid_model        = 0x580,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 12
+            },
+            { /* out of spec */
+                .name               = "133",
+                .cpu_type           = CPU_K6_2,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 2200,
+                .edx_reset          = 0x580,
+                .cpuid_model        = 0x580,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+            },
+            { /* out of spec */
+                .name               = "166",
+                .cpu_type           = CPU_K6_2,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 2200,
+                .edx_reset          = 0x580,
+                .cpuid_model        = 0x580,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            { /* out of spec */
+                .name               = "200",
+                .cpu_type           = CPU_K6_2,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 2200,
+                .edx_reset          = 0x580,
+                .cpuid_model        = 0x580,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 24
+            },
+            {
+                .name               = "233",
+                .cpu_type           = CPU_K6_2,
+                .fpus               = fpus_internal,
+                .rspeed             = 233333333,
+                .multi              = 3.5,
+                .voltage            = 2200,
+                .edx_reset          = 0x580,
+                .cpuid_model        = 0x580,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 10,
+                .cache_write_cycles = 10,
+                .atclk_div          = 28
+            },
+            {
+                .name               = "266",
+                .cpu_type           = CPU_K6_2,
+                .fpus               = fpus_internal,
+                .rspeed             = 266666666,
+                .multi              = 4.0,
+                .voltage            = 2200,
+                .edx_reset          = 0x580,
+                .cpuid_model        = 0x580,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 24,
+                .mem_write_cycles   = 24,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 32
+            },
+            {
+                .name               = "300",
+                .cpu_type           = CPU_K6_2,
+                .fpus               = fpus_internal,
+                .rspeed             = 300000000,
+                .multi              = 3.0,
+                .voltage            = 2200,
+                .edx_reset          = 0x580,
+                .cpuid_model        = 0x580,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 27,
+                .mem_write_cycles   = 27,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 36
+            },
+            {
+                .name               = "333",
+                .cpu_type           = CPU_K6_2,
+                .fpus               = fpus_internal,
+                .rspeed             = 332500000,
+                .multi              = 3.5,
+                .voltage            = 2200,
+                .edx_reset          = 0x580,
+                .cpuid_model        = 0x580,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 30,
+                .mem_write_cycles   = 30,
+                .cache_read_cycles  = 11,
+                .cache_write_cycles = 11,
+                .atclk_div          = 40
+            },
+            {
+                .name               = "350",
+                .cpu_type           = CPU_K6_2C,
+                .fpus               = fpus_internal,
+                .rspeed             = 350000000,
+                .multi              = 3.5,
+                .voltage            = 2200,
+                .edx_reset          = 0x58c,
+                .cpuid_model        = 0x58c,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 32,
+                .mem_write_cycles   = 32,
+                .cache_read_cycles  = 11,
+                .cache_write_cycles = 11,
+                .atclk_div          = 42
+            },
+            {
+                .name               = "366",
+                .cpu_type           = CPU_K6_2C,
+                .fpus               = fpus_internal,
+                .rspeed             = 366666666,
+                .multi              = 5.5,
+                .voltage            = 2200,
+                .edx_reset          = 0x58c,
+                .cpuid_model        = 0x58c,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 33,
+                .mem_write_cycles   = 33,
+                .cache_read_cycles  = 17,
+                .cache_write_cycles = 17,
+                .atclk_div          = 44
+            },
+            {
+                .name               = "380",
+                .cpu_type           = CPU_K6_2C,
+                .fpus               = fpus_internal,
+                .rspeed             = 380000000,
+                .multi              = 4.0,
+                .voltage            = 2200,
+                .edx_reset          = 0x58c,
+                .cpuid_model        = 0x58c,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 34,
+                .mem_write_cycles   = 34,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 46
+            },
+            {
+                .name               = "400/66",
+                .cpu_type           = CPU_K6_2C,
+                .fpus               = fpus_internal,
+                .rspeed             = 400000000,
+                .multi              = 6.0,
+                .voltage            = 2200,
+                .edx_reset          = 0x58c,
+                .cpuid_model        = 0x58c,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 36,
+                .mem_write_cycles   = 36,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 48
+                },
+            {
+                .name               = "400/100",
+                .cpu_type           = CPU_K6_2C,
+                .fpus               = fpus_internal,
+                .rspeed             = 400000000,
+                .multi              = 4.0,
+                .voltage            = 2200,
+                .edx_reset          = 0x58c,
+                .cpuid_model        = 0x58c,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 36,
+                .mem_write_cycles   = 36,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 48
+            },
+            {
+                .name               = "450",
+                .cpu_type           = CPU_K6_2C,
+                .fpus               = fpus_internal,
+                .rspeed             = 450000000,
+                .multi              = 4.5,
+                .voltage            = 2200,
+                .edx_reset          = 0x58c,
+                .cpuid_model        = 0x58c,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 41,
+                .mem_write_cycles   = 41,
+                .cache_read_cycles  = 14,
+                .cache_write_cycles = 14,
+                .atclk_div          = 54
+            },
+            {
+                .name               = "475",
+                .cpu_type           = CPU_K6_2C,
+                .fpus               = fpus_internal,
+                .rspeed             = 475000000,
+                .multi              = 5.0,
+                .voltage            = 2400,
+                .edx_reset          = 0x58c,
+                .cpuid_model        = 0x58c,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 43,
+                .mem_write_cycles   = 43,
+                .cache_read_cycles  = 15,
+                .cache_write_cycles = 15,
+                .atclk_div          = 57
+            },
+            {
+                .name               = "500",
+                .cpu_type           = CPU_K6_2C,
+                .fpus               = fpus_internal,
+                .rspeed             = 500000000,
+                .multi              = 5.0,
+                .voltage            = 2400,
+                .edx_reset          = 0x58c,
+                .cpuid_model        = 0x58c,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 45,
+                .mem_write_cycles   = 45,
+                .cache_read_cycles  = 15,
+                .cache_write_cycles = 15,
+                .atclk_div          = 60
+            },
+            {
+                .name               = "533",
+                .cpu_type           = CPU_K6_2C,
+                .fpus               = fpus_internal,
+                .rspeed             = 533333333,
+                .multi              = 5.5,
+                .voltage            = 2200,
+                .edx_reset          = 0x58c,
+                .cpuid_model        = 0x58c,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 48,
+                .mem_write_cycles   = 48,
+                .cache_read_cycles  = 17,
+                .cache_write_cycles = 17,
+                .atclk_div          = 64
+            },
+            {
+                .name               = "550",
+                .cpu_type           = CPU_K6_2C,
+                .fpus               = fpus_internal,
+                .rspeed             = 550000000,
+                .multi              = 5.5,
+                .voltage            = 2300,
+                .edx_reset          = 0x58c,
+                .cpuid_model        = 0x58c,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 50,
+                .mem_write_cycles   = 50,
+                .cache_read_cycles  = 17,
+                .cache_write_cycles = 17,
+                .atclk_div          = 66
+            },
+            { .name = "", 0 }
+        }
     }, {
-    .package = CPU_PKG_SLOT1,
-    .manufacturer = "Intel",
-    .name = "Pentium II (Klamath)",
-    .internal_name = "pentium2_klamath",
-    .cpus = (const CPU[]) {
-        {"66",        CPU_PENTIUM2,  fpus_internal,  66666666, 1.0, 2800,  0x634,  0x634, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  6, 6, 3, 3, 8},  /* out of spec */
-        {"100",       CPU_PENTIUM2,  fpus_internal, 100000000, 1.5, 2800,  0x634,  0x634, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  9, 9, 4, 4, 12}, /* out of spec */
-        {"133",       CPU_PENTIUM2,  fpus_internal, 133333333, 2.0, 2800,  0x634,  0x634, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12, 6, 6, 16}, /* out of spec */
-        {"166",       CPU_PENTIUM2,  fpus_internal, 166666666, 2.5, 2800,  0x634,  0x634, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15, 7, 7, 20}, /* out of spec */
-        {"200",       CPU_PENTIUM2,  fpus_internal, 200000000, 3.0, 2800,  0x634,  0x634, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 18,18, 9, 9, 24}, /* out of spec */
-        {"233",       CPU_PENTIUM2,  fpus_internal, 233333333, 3.5, 2800,  0x634,  0x634, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 21,21,10,10, 28},
-        {"266",       CPU_PENTIUM2,  fpus_internal, 266666666, 4.0, 2800,  0x634,  0x634, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 24,24,12,12, 32},
-        {"300",       CPU_PENTIUM2,  fpus_internal, 300000000, 4.5, 2800,  0x634,  0x634, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 25,25,12,12, 36},
-        {"", 0}
-    }
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "AMD",
+        .name          = "K6-2+",
+        .internal_name = "k6_2p",
+        .cpus          = (const CPU[]) {
+            { /* out of spec */
+                .name               = "100",
+                .cpu_type           = CPU_K6_2P,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 1.5,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d4,
+                .cpuid_model        = 0x5d4,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 12
+            },
+            { /* out of spec */
+                .name               = "133",
+                .cpu_type           = CPU_K6_2P,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d4,
+                .cpuid_model        = 0x5d4,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+            },
+            { /* out of spec */
+                .name               = "166",
+                .cpu_type           = CPU_K6_2P,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d4,
+                .cpuid_model        = 0x5d4,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            { /* out of spec */
+                .name               = "200",
+                .cpu_type           = CPU_K6_2P,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d4,
+                .cpuid_model        = 0x5d4,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 24
+            },
+            { /* out of spec */
+                .name               = "233",
+                .cpu_type           = CPU_K6_2P,
+                .fpus               = fpus_internal,
+                .rspeed             = 233333333,
+                .multi              = 3.5,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d4,
+                .cpuid_model        = 0x5d4,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 10,
+                .cache_write_cycles = 10,
+                .atclk_div          = 28
+            },
+            { /* out of spec */
+                .name               = "266",
+                .cpu_type           = CPU_K6_2P,
+                .fpus               = fpus_internal,
+                .rspeed             = 266666666,
+                .multi              = 4.0,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d4,
+                .cpuid_model        = 0x5d4,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 24,
+                .mem_write_cycles   = 24,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 32
+            },
+            { /* out of spec */
+                .name               = "300",
+                .cpu_type           = CPU_K6_2P,
+                .fpus               = fpus_internal,
+                .rspeed             = 300000000,
+                .multi              = 3.0,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d4,
+                .cpuid_model        = 0x5d4,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 27,
+                .mem_write_cycles   = 27,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 36
+            },
+            { /* out of spec */
+                .name               = "333",
+                .cpu_type           = CPU_K6_2P,
+                .fpus               = fpus_internal,
+                .rspeed             = 332500000,
+                .multi              = 3.5,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d4,
+                .cpuid_model        = 0x5d4,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 30,
+                .mem_write_cycles   = 30,
+                .cache_read_cycles  = 11,
+                .cache_write_cycles = 11,
+                .atclk_div          = 40
+            },
+            { /* out of spec */
+                .name               = "350",
+                .cpu_type           = CPU_K6_2P,
+                .fpus               = fpus_internal,
+                .rspeed             = 350000000,
+                .multi              = 3.5,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d4,
+                .cpuid_model        = 0x5d4,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 32,
+                .mem_write_cycles   = 32,
+                .cache_read_cycles  = 11,
+                .cache_write_cycles = 11,
+                .atclk_div          = 42
+            },
+            { /* out of spec */
+                .name               = "366",
+                .cpu_type           = CPU_K6_2P,
+                .fpus               = fpus_internal,
+                .rspeed             = 366666666,
+                .multi              = 5.5,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d4,
+                .cpuid_model        = 0x5d4,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 33,
+                .mem_write_cycles   = 33,
+                .cache_read_cycles  = 17,
+                .cache_write_cycles = 17,
+                .atclk_div          = 44
+            },
+            { /* out of spec */
+                .name               = "380",
+                .cpu_type           = CPU_K6_2P,
+                .fpus               = fpus_internal,
+                .rspeed             = 380000000,
+                .multi              = 4.0,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d4,
+                .cpuid_model        = 0x5d4,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 34,
+                .mem_write_cycles   = 34,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 46
+            },
+            { /* out of spec */
+                .name               = "400/66",
+                .cpu_type           = CPU_K6_2P,
+                .fpus               = fpus_internal,
+                .rspeed             = 400000000,
+                .multi              = 6.0,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d4,
+                .cpuid_model        = 0x5d4,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 36,
+                .mem_write_cycles   = 36,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 48
+            },
+            { /* out of spec */
+                .name               = "400/100",
+                .cpu_type           = CPU_K6_2P,
+                .fpus               = fpus_internal,
+                .rspeed             = 400000000,
+                .multi              = 4.0,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d4,
+                .cpuid_model        = 0x5d4,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 36,
+                .mem_write_cycles   = 36,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 48
+            },
+            {
+                .name               = "450",
+                .cpu_type           = CPU_K6_2P,
+                .fpus               = fpus_internal,
+                .rspeed             = 450000000,
+                .multi              = 4.5,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d4,
+                .cpuid_model        = 0x5d4,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 41,
+                .mem_write_cycles   = 41,
+                .cache_read_cycles  = 14,
+                .cache_write_cycles = 14,
+                .atclk_div          = 54
+            },
+            {
+                .name               = "475",
+                .cpu_type           = CPU_K6_2P,
+                .fpus               = fpus_internal,
+                .rspeed             = 475000000,
+                .multi              = 5.0,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d4,
+                .cpuid_model        = 0x5d4,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 43,
+                .mem_write_cycles   = 43,
+                .cache_read_cycles  = 15,
+                .cache_write_cycles = 15,
+                .atclk_div          = 57
+            },
+            {
+                .name               = "500",
+                .cpu_type           = CPU_K6_2P,
+                .fpus               = fpus_internal,
+                .rspeed             = 500000000,
+                .multi              = 5.0,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d4,
+                .cpuid_model        = 0x5d4,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 45,
+                .mem_write_cycles   = 45,
+                .cache_read_cycles  = 15,
+                .cache_write_cycles = 15,
+                .atclk_div          = 60
+            },
+            {
+                .name               = "533",
+                .cpu_type           = CPU_K6_2P,
+                .fpus               = fpus_internal,
+                .rspeed             = 533333333,
+                .multi              = 5.5,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d4,
+                .cpuid_model        = 0x5d4,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 48,
+                .mem_write_cycles   = 48,
+                .cache_read_cycles  = 17,
+                .cache_write_cycles = 17,
+                .atclk_div          = 64
+            },
+            {
+                .name               = "550",
+                .cpu_type           = CPU_K6_2P,
+                .fpus               = fpus_internal,
+                .rspeed             = 550000000,
+                .multi              = 5.5,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d4,
+                .cpuid_model        = 0x5d4,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 50,
+                .mem_write_cycles   = 50,
+                .cache_read_cycles  = 17,
+                .cache_write_cycles = 17,
+                .atclk_div          = 66
+            },
+            { .name = "", 0 }
+        }
     }, {
-    .package = CPU_PKG_SLOT1,
-    .manufacturer = "Intel",
-    .name = "Pentium II (Deschutes)",
-    .internal_name = "pentium2_deschutes",
-    .cpus = (const CPU[]) {
-        {"66",     CPU_PENTIUM2D,  fpus_internal,  66666666, 1.0, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  6, 6, 3, 3, 8},  /* out of spec */
-        {"100",    CPU_PENTIUM2D,  fpus_internal, 100000000, 1.5, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  9, 9, 5, 5, 12}, /* out of spec */
-        {"133",    CPU_PENTIUM2D,  fpus_internal, 133333333, 2.0, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12, 6, 6, 16}, /* out of spec */
-        {"166",    CPU_PENTIUM2D,  fpus_internal, 166666666, 2.5, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15, 7, 7, 20}, /* out of spec */
-        {"200",    CPU_PENTIUM2D,  fpus_internal, 200000000, 3.0, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 18,18, 9, 9, 24}, /* out of spec */
-        {"233",    CPU_PENTIUM2D,  fpus_internal, 233333333, 3.5, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 21,21,11,11, 28}, /* out of spec */
-        {"266",    CPU_PENTIUM2D,  fpus_internal, 266666666, 4.0, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 24,24,12,12, 32},
-        {"300",    CPU_PENTIUM2D,  fpus_internal, 300000000, 4.5, 2050,  0x651,  0x651, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 25,25,12,12, 36},
-        {"333",    CPU_PENTIUM2D,  fpus_internal, 333333333, 5.0, 2050,  0x651,  0x651, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 27,27,13,13, 40},
-        {"350",    CPU_PENTIUM2D,  fpus_internal, 350000000, 3.5, 2050,  0x651,  0x651, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 32,32,11,11, 42},
-        {"400",    CPU_PENTIUM2D,  fpus_internal, 400000000, 4.0, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 36,36,12,12, 48},
-        {"450",    CPU_PENTIUM2D,  fpus_internal, 450000000, 4.5, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 41,41,14,14, 54},
-        {"", 0}
-    }
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "AMD",
+        .name          = "K6-III",
+        .internal_name = "k6_3",
+        .cpus          = (const CPU[]) {
+            { /* out of spec */
+                .name               = "100",
+                .cpu_type           = CPU_K6_3,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 1.5,
+                .voltage            = 2200,
+                .edx_reset          = 0x591,
+                .cpuid_model        = 0x591,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 12
+            },
+            { /* out of spec */
+                .name               = "133",
+                .cpu_type           = CPU_K6_3,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 2200,
+                .edx_reset          = 0x591,
+                .cpuid_model        = 0x591,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+            },
+            { /* out of spec */
+                .name               = "166",
+                .cpu_type           = CPU_K6_3,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 2200,
+                .edx_reset          = 0x591,
+                .cpuid_model        = 0x591,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            { /* out of spec */
+                .name               = "200",
+                .cpu_type           = CPU_K6_3,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 2200,
+                .edx_reset          = 0x591,
+                .cpuid_model        = 0x591,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 24
+            },
+            { /* out of spec */
+                .name               = "233",
+                .cpu_type           = CPU_K6_3,
+                .fpus               = fpus_internal,
+                .rspeed             = 233333333,
+                .multi              = 3.5,
+                .voltage            = 2200,
+                .edx_reset          = 0x591,
+                .cpuid_model        = 0x591,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 10,
+                .cache_write_cycles = 10,
+                .atclk_div          = 28
+            },
+            { /* out of spec */
+                .name               = "266",
+                .cpu_type           = CPU_K6_3,
+                .fpus               = fpus_internal,
+                .rspeed             = 266666666,
+                .multi              = 4.0,
+                .voltage            = 2200,
+                .edx_reset          = 0x591,
+                .cpuid_model        = 0x591,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 24,
+                .mem_write_cycles   = 24,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 32
+            },
+            { /* out of spec */
+                .name               = "300",
+                .cpu_type           = CPU_K6_3,
+                .fpus               = fpus_internal,
+                .rspeed             = 300000000,
+                .multi              = 3.0,
+                .voltage            = 2200,
+                .edx_reset          = 0x591,
+                .cpuid_model        = 0x591,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 27,
+                .mem_write_cycles   = 27,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 36
+            },
+            { /* out of spec */
+                .name               = "333",
+                .cpu_type           = CPU_K6_3,
+                .fpus               = fpus_internal,
+                .rspeed             = 332500000,
+                .multi              = 3.5,
+                .voltage            = 2200,
+                .edx_reset          = 0x591,
+                .cpuid_model        = 0x591,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 30,
+                .mem_write_cycles   = 30,
+                .cache_read_cycles  = 11,
+                .cache_write_cycles = 11,
+                .atclk_div          = 40
+            },
+            { /* out of spec */
+                .name               = "350",
+                .cpu_type           = CPU_K6_3,
+                .fpus               = fpus_internal,
+                .rspeed             = 350000000,
+                .multi              = 3.5,
+                .voltage            = 2200,
+                .edx_reset          = 0x591,
+                .cpuid_model        = 0x591,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 32,
+                .mem_write_cycles   = 32,
+                .cache_read_cycles  = 11,
+                .cache_write_cycles = 11,
+                .atclk_div          = 42
+            },
+            { /* out of spec */
+                .name               = "366",
+                .cpu_type           = CPU_K6_3,
+                .fpus               = fpus_internal,
+                .rspeed             = 366666666,
+                .multi              = 5.5,
+                .voltage            = 2200,
+                .edx_reset          = 0x591,
+                .cpuid_model        = 0x591,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 33,
+                .mem_write_cycles   = 33,
+                .cache_read_cycles  = 17,
+                .cache_write_cycles = 17,
+                .atclk_div          = 44
+            },
+            { /* out of spec */
+                .name               = "380",
+                .cpu_type           = CPU_K6_3,
+                .fpus               = fpus_internal,
+                .rspeed             = 380000000,
+                .multi              = 4.0,
+                .voltage            = 2200,
+                .edx_reset          = 0x591,
+                .cpuid_model        = 0x591,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 34,
+                .mem_write_cycles   = 34,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 46
+            },
+            {
+                .name               = "400",
+                .cpu_type           = CPU_K6_3,
+                .fpus               = fpus_internal,
+                .rspeed             = 400000000,
+                .multi              = 4.0,
+                .voltage            = 2200,
+                .edx_reset          = 0x591,
+                .cpuid_model        = 0x591,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 36,
+                .mem_write_cycles   = 36,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 48
+            },
+            {
+                .name               = "450",
+                .cpu_type           = CPU_K6_3,
+                .fpus               = fpus_internal,
+                .rspeed             = 450000000,
+                .multi              = 4.5,
+                .voltage            = 2200,
+                .edx_reset          = 0x591,
+                .cpuid_model        = 0x591,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 41,
+                .mem_write_cycles   = 41,
+                .cache_read_cycles  = 14,
+                .cache_write_cycles = 14,
+                .atclk_div          = 54
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "AMD",
+        .name          = "K6-III+",
+        .internal_name = "k6_3p",
+        .cpus          = (const CPU[]) {
+            { /* out of spec */
+                .name               = "100",
+                .cpu_type           = CPU_K6_3P,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 1.5,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d0,
+                .cpuid_model        = 0x5d0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 7,
+                .mem_write_cycles   = 7,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 9
+            },
+            { /* out of spec */
+                .name               = "133",
+                .cpu_type           = CPU_K6_3P,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d0,
+                .cpuid_model        = 0x5d0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+            },
+            { /* out of spec */
+                .name               = "166",
+                .cpu_type           = CPU_K6_3P,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d0,
+                .cpuid_model        = 0x5d0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            { /* out of spec */
+                .name               = "200",
+                .cpu_type           = CPU_K6_3P,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d0,
+                .cpuid_model        = 0x5d0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 24
+            },
+            { /* out of spec */
+                .name               = "233",
+                .cpu_type           = CPU_K6_3P,
+                .fpus               = fpus_internal,
+                .rspeed             = 233333333,
+                .multi              = 3.5,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d0,
+                .cpuid_model        = 0x5d0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 10,
+                .cache_write_cycles = 10,
+                .atclk_div          = 28
+            },
+            { /* out of spec */
+                .name               = "266",
+                .cpu_type           = CPU_K6_3P,
+                .fpus               = fpus_internal,
+                .rspeed             = 266666666,
+                .multi              = 4.0,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d0,
+                .cpuid_model        = 0x5d0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 24,
+                .mem_write_cycles   = 24,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 32
+            },
+            { /* out of spec */
+                .name               = "300",
+                .cpu_type           = CPU_K6_3P,
+                .fpus               = fpus_internal,
+                .rspeed             = 300000000,
+                .multi              = 3.0,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d0,
+                .cpuid_model        = 0x5d0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 27,
+                .mem_write_cycles   = 27,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 36
+            },
+            { /* out of spec */
+                .name               = "333",
+                .cpu_type           = CPU_K6_3P,
+                .fpus               = fpus_internal,
+                .rspeed             = 332500000,
+                .multi              = 3.5,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d0,
+                .cpuid_model        = 0x5d0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 30,
+                .mem_write_cycles   = 30,
+                .cache_read_cycles  = 11,
+                .cache_write_cycles = 11,
+                .atclk_div          = 40
+            },
+            { /* out of spec */
+                .name               = "350",
+                .cpu_type           = CPU_K6_3P,
+                .fpus               = fpus_internal,
+                .rspeed             = 350000000,
+                .multi              = 3.5,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d0,
+                .cpuid_model        = 0x5d0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 32,
+                .mem_write_cycles   = 32,
+                .cache_read_cycles  = 11,
+                .cache_write_cycles = 11,
+                .atclk_div          = 42
+            },
+            { /* out of spec */
+                .name               = "366",
+                .cpu_type           = CPU_K6_3P,
+                .fpus               = fpus_internal,
+                .rspeed             = 366666666,
+                .multi              = 5.5,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d0,
+                .cpuid_model        = 0x5d0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 33,
+                .mem_write_cycles   = 33,
+                .cache_read_cycles  = 17,
+                .cache_write_cycles = 17,
+                .atclk_div          = 44
+            },
+            { /* out of spec */
+                .name               = "380",
+                .cpu_type           = CPU_K6_3P,
+                .fpus               = fpus_internal,
+                .rspeed             = 380000000,
+                .multi              = 4.0,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d0,
+                .cpuid_model        = 0x5d0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 34,
+                .mem_write_cycles   = 34,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 46
+            },
+            {
+                .name               = "400",
+                .cpu_type           = CPU_K6_3P,
+                .fpus               = fpus_internal,
+                .rspeed             = 400000000,
+                .multi              = 4.0,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d0,
+                .cpuid_model        = 0x5d0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 36,
+                .mem_write_cycles   = 36,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 48
+            },
+            {
+                .name               = "450",
+                .cpu_type           = CPU_K6_3P,
+                .fpus               = fpus_internal,
+                .rspeed             = 450000000,
+                .multi              = 4.5,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d0,
+                .cpuid_model        = 0x5d0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 41,
+                .mem_write_cycles   = 41,
+                .cache_read_cycles  = 14,
+                .cache_write_cycles = 14,
+                .atclk_div          = 54
+            },
+            {
+                .name               = "475",
+                .cpu_type           = CPU_K6_3P,
+                .fpus               = fpus_internal,
+                .rspeed             = 475000000,
+                .multi              = 5.0,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d0,
+                .cpuid_model        = 0x5d0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 43,
+                .mem_write_cycles   = 43,
+                .cache_read_cycles  = 15,
+                .cache_write_cycles = 15,
+                .atclk_div          = 57
+            },
+            {
+                .name               = "500",
+                .cpu_type           = CPU_K6_3P,
+                .fpus               = fpus_internal,
+                .rspeed             = 500000000,
+                .multi              = 5.0,
+                .voltage            = 2000,
+                .edx_reset          = 0x5d0,
+                .cpuid_model        = 0x5d0,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 45,
+                .mem_write_cycles   = 45,
+                .cache_read_cycles  = 15,
+                .cache_write_cycles = 15,
+                .atclk_div          = 60
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "Cyrix",
+        .name          = "Cx6x86",
+        .internal_name = "cx6x86",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "80 (PR90+)",
+                .cpu_type           = CPU_Cx6x86,
+                .fpus               = fpus_internal,
+                .rspeed             = 80000000,
+                .multi              = 2.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x520,
+                .cpuid_model        = 0x520,
+                .cyrix_id           = 0x1731,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 10
+            },
+            {
+                .name               = "100 (PR120+)",
+                .cpu_type           = CPU_Cx6x86,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 2.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x520,
+                .cpuid_model        = 0x520,
+                .cyrix_id           = 0x1731,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 10,
+                .mem_write_cycles   = 10,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 12
+            },
+            {
+                .name               = "110 (PR133+)",
+                .cpu_type           = CPU_Cx6x86,
+                .fpus               = fpus_internal,
+                .rspeed             = 110000000,
+                .multi              = 2.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x520,
+                .cpuid_model        = 0x520,
+                .cyrix_id           = 0x1731,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 10,
+                .mem_write_cycles   = 10,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 14
+            },
+            {
+                .name               = "120 (PR150+)",
+                .cpu_type           = CPU_Cx6x86,
+                .fpus               = fpus_internal,
+                .rspeed             = 120000000,
+                .multi              = 2.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x520,
+                .cpuid_model        = 0x520,
+                .cyrix_id           = 0x1731,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 14
+            },
+            {
+                .name               = "133 (PR166+)",
+                .cpu_type           = CPU_Cx6x86,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x520,
+                .cpuid_model        = 0x520,
+                .cyrix_id           = 0x1731,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+            },
+            {
+                .name               = "150 (PR200+)",
+                .cpu_type           = CPU_Cx6x86,
+                .fpus               = fpus_internal,
+                .rspeed             = 150000000,
+                .multi              = 2.0,
+                .voltage            = 3520,
+                .edx_reset          = 0x520,
+                .cpuid_model        = 0x520,
+                .cyrix_id           = 0x1731,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 18
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "Cyrix",
+        .name          = "Cx6x86L",
+        .internal_name = "cx6x86l",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "110 (PR133+)",
+                .cpu_type           = CPU_Cx6x86L,
+                .fpus               = fpus_internal,
+                .rspeed             = 110000000,
+                .multi              = 2.0,
+                .voltage            = 2800,
+                .edx_reset          = 0x540,
+                .cpuid_model        = 0x540,
+                .cyrix_id           = 0x2231,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 10,
+                .mem_write_cycles   = 10,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 14
+            },
+            {
+                .name               = "120 (PR150+)",
+                .cpu_type           = CPU_Cx6x86L,
+                .fpus               = fpus_internal,
+                .rspeed             = 120000000,
+                .multi              = 2.0,
+                .voltage            = 2800,
+                .edx_reset          = 0x540,
+                .cpuid_model        = 0x540,
+                .cyrix_id           = 0x2231,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 14
+            },
+            {
+                .name               = "133 (PR166+)",
+                .cpu_type           = CPU_Cx6x86L,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 2800,
+                .edx_reset          = 0x540,
+                .cpuid_model        = 0x540,
+                .cyrix_id           = 0x2231,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+            },
+            {
+                .name               = "150 (PR200+)",
+                .cpu_type           = CPU_Cx6x86L,
+                .fpus               = fpus_internal,
+                .rspeed             = 150000000,
+                .multi              = 2.0,
+                .voltage            = 2800,
+                .edx_reset          = 0x540,
+                .cpuid_model        = 0x540,
+                .cyrix_id           = 0x2231,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 18
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "Cyrix",
+        .name          = "Cx6x86MX",
+        .internal_name = "cx6x86mx",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "133 (PR166)",
+                .cpu_type           = CPU_Cx6x86MX,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 2900,
+                .edx_reset          = 0x600,
+                .cpuid_model        = 0x600,
+                .cyrix_id           = 0x0451,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+            },
+            {
+                .name               = "166 (PR200)",
+                .cpu_type           = CPU_Cx6x86MX,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 2900,
+                .edx_reset          = 0x600,
+                .cpuid_model        = 0x600,
+                .cyrix_id           = 0x0452,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            {
+                .name               = "187.5 (PR233)",
+                .cpu_type           = CPU_Cx6x86MX,
+                .fpus               = fpus_internal,
+                .rspeed             = 187500000,
+                .multi              = 2.5,
+                .voltage            = 2900,
+                .edx_reset          = 0x600,
+                .cpuid_model        = 0x600,
+                .cyrix_id           = 0x0452,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 45/2
+            },
+            {
+                .name               = "208.3 (PR266)",
+                .cpu_type           = CPU_Cx6x86MX,
+                .fpus               = fpus_internal,
+                .rspeed             = 208333333,
+                .multi              = 2.5,
+                .voltage            = 2700,
+                .edx_reset          = 0x600,
+                .cpuid_model        = 0x600,
+                .cyrix_id           = 0x0452,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 17,
+                .mem_write_cycles   = 17,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 25
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET5_7,
+        .manufacturer  = "Cyrix",
+        .name          = "MII",
+        .internal_name = "mii",
+        .cpus          = (const CPU[]) {
+            {
+                .name               = "IBM 133 (PR166)",
+                .cpu_type           = CPU_Cx6x86MX,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 2900,
+                .edx_reset          = 0x601,
+                .cpuid_model        = 0x601,
+                .cyrix_id           = 0x0851,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+            },
+            {
+                .name               = "166 (PR200)",
+                .cpu_type           = CPU_Cx6x86MX,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 2900,
+                .edx_reset          = 0x601,
+                .cpuid_model        = 0x601,
+                .cyrix_id           = 0x0852,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            {
+                .name               = "187.5 (PR233)",
+                .cpu_type           = CPU_Cx6x86MX,
+                .fpus               = fpus_internal,
+                .rspeed             = 187500000,
+                .multi              = 2.5,
+                .voltage            = 2900,
+                .edx_reset          = 0x601,
+                .cpuid_model        = 0x601,
+                .cyrix_id           = 0x0852,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 45/2
+            },
+            {
+                .name               = "208.3 (PR266)",
+                .cpu_type           = CPU_Cx6x86MX,
+                .fpus               = fpus_internal,
+                .rspeed             = 208333333,
+                .multi              = 2.5,
+                .voltage            = 2700,
+                .edx_reset          = 0x601,
+                .cpuid_model        = 0x601,
+                .cyrix_id           = 0x0852,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 17,
+                .mem_write_cycles   = 17,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 25
+            },
+            {
+                .name               = "233 (PR300)",
+                .cpu_type           = CPU_Cx6x86MX,
+                .fpus               = fpus_internal,
+                .rspeed             = 233333333,
+                .multi              = 3.5,
+                .voltage            = 2900,
+                .edx_reset          = 0x601,
+                .cpuid_model        = 0x601,
+                .cyrix_id           = 0x0854,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 11,
+                .cache_write_cycles = 11,
+                .atclk_div          = 28
+            },
+            {
+                .name               = "250/83 (PR333)",
+                .cpu_type           = CPU_Cx6x86MX,
+                .fpus               = fpus_internal,
+                .rspeed             = 250000000,
+                .multi              = 3.0,
+                .voltage            = 2900,
+                .edx_reset          = 0x601,
+                .cpuid_model        = 0x601,
+                .cyrix_id           = 0x0853,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 23,
+                .mem_write_cycles   = 23,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 30
+            },
+            {
+                .name               = "250/100 (PR366)",
+                .cpu_type           = CPU_Cx6x86MX,
+                .fpus               = fpus_internal,
+                .rspeed             = 250000000,
+                .multi              = 2.5,
+                .voltage            = 2900,
+                .edx_reset          = 0x601,
+                .cpuid_model        = 0x601,
+                .cyrix_id           = 0x0852,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 23,
+                .mem_write_cycles   = 23,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 30
+            },
+            {
+                .name               = "270 (PR350)",
+                .cpu_type           = CPU_Cx6x86MX,
+                .fpus               = fpus_internal,
+                .rspeed             = 270000000,
+                .multi              = 3.0,
+                .voltage            = 2900,
+                .edx_reset          = 0x601,
+                .cpuid_model        = 0x601,
+                .cyrix_id           = 0x0853,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 25,
+                .mem_write_cycles   = 25,
+                .cache_read_cycles  = 8,
+                .cache_write_cycles = 8,
+                .atclk_div          = 32
+            },
+            {
+                .name               = "285 (PR400)",
+                .cpu_type           = CPU_Cx6x86MX,
+                .fpus               = fpus_internal,
+                .rspeed             = 285000000,
+                .multi              = 3.0,
+                .voltage            = 2900,
+                .edx_reset          = 0x601,
+                .cpuid_model        = 0x601,
+                .cyrix_id           = 0x0853,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 27,
+                .mem_write_cycles   = 27,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 34
+            },
+            {
+                .name               = "300 (PR433)",
+                .cpu_type           = CPU_Cx6x86MX,
+                .fpus               = fpus_internal,
+                .rspeed             = 300000000,
+                .multi              = 3.0,
+                .voltage            = 2900,
+                .edx_reset          = 0x601,
+                .cpuid_model        = 0x601,
+                .cyrix_id           = 0x0853,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 27,
+                .mem_write_cycles   = 27,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 36
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET8,
+        .manufacturer  = "Intel",
+        .name          = "Pentium Pro",
+        .internal_name = "pentiumpro",
+        .cpus          = (const CPU[]) {
+            { /* out of spec */
+                .name               = "60",
+                .cpu_type           = CPU_PENTIUMPRO,
+                .fpus               = fpus_internal,
+                .rspeed             = 60000000,
+                .multi              = 1.0,
+                .voltage            = 3100,
+                .edx_reset          = 0x612,
+                .cpuid_model        = 0x612,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 1,
+                .cache_write_cycles = 1,
+                .atclk_div          = 7
+            },
+            { /* out of spec */
+                .name               = "66",
+                .cpu_type           = CPU_PENTIUMPRO,
+                .fpus               = fpus_internal,
+                .rspeed             = 66666666,
+                .multi              = 1.0,
+                .voltage            = 3300,
+                .edx_reset          = 0x617,
+                .cpuid_model        = 0x617,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 1,
+                .cache_write_cycles = 1,
+                .atclk_div          = 8
+            },
+            { /* out of spec */
+                .name               = "90",
+                .cpu_type           = CPU_PENTIUMPRO,
+                .fpus               = fpus_internal,
+                .rspeed             = 90000000,
+                .multi              = 1.5,
+                .voltage            = 3100,
+                .edx_reset          = 0x612,
+                .cpuid_model        = 0x612,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 11
+            },
+            { /* out of spec */
+                .name               = "100",
+                .cpu_type           = CPU_PENTIUMPRO,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 1.5,
+                .voltage            = 3300,
+                .edx_reset          = 0x617,
+                .cpuid_model        = 0x617,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 12
+            },
+            { /* out of spec */
+                .name               = "120",
+                .cpu_type           = CPU_PENTIUMPRO,
+                .fpus               = fpus_internal,
+                .rspeed             = 120000000,
+                .multi              = 2.0,
+                .voltage            = 3100,
+                .edx_reset          = 0x612,
+                .cpuid_model        = 0x612,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 5,
+                .cache_write_cycles = 5,
+                .atclk_div          = 14
+            },
+            { /* out of spec */
+                .name               = "133",
+                .cpu_type           = CPU_PENTIUMPRO,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 3300,
+                .edx_reset          = 0x617,
+                .cpuid_model        = 0x617,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 5,
+                .cache_write_cycles = 5,
+                .atclk_div          = 16
+            }, /* out of spec */
+            {
+                .name               = "150",
+                .cpu_type           = CPU_PENTIUMPRO,
+                .fpus               = fpus_internal,
+                .rspeed             = 150000000,
+                .multi              = 2.5,
+                .voltage            = 3100,
+                .edx_reset          = 0x612,
+                .cpuid_model        = 0x612,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 35/2
+            },
+            {
+                .name               = "166",
+                .cpu_type           = CPU_PENTIUMPRO,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 3300,
+                .edx_reset          = 0x617,
+                .cpuid_model        = 0x617,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            {
+                .name               = "180",
+                .cpu_type           = CPU_PENTIUMPRO,
+                .fpus               = fpus_internal,
+                .rspeed             = 180000000,
+                .multi              = 3.0,
+                .voltage            = 3300,
+                .edx_reset          = 0x617,
+                .cpuid_model        = 0x617,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 21
+            },
+            {
+                .name               = "200",
+                .cpu_type           = CPU_PENTIUMPRO,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 3300,
+                .edx_reset          = 0x617,
+                .cpuid_model        = 0x617,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 24
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET8,
+        .manufacturer  = "Intel",
+        .name          = "Pentium II OverDrive",
+        .internal_name = "pentium2_od",
+        .cpus          = (const CPU[]) {
+            { /* out of spec */
+                .name               = "66",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 66666666,
+                .multi              = 1.0,
+                .voltage            = 3300,
+                .edx_reset          = 0x1632,
+                .cpuid_model        = 0x1632,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 8
+            },
+            { /* out of spec */
+                .name               = "100",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 1.5,
+                .voltage            = 3300,
+                .edx_reset          = 0x1632,
+                .cpuid_model        = 0x1632,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 12
+            },
+            { /* out of spec */
+                .name               = "133",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 3300,
+                .edx_reset          = 0x1632,
+                .cpuid_model        = 0x1632,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+            },
+            { /* out of spec */
+                .name               = "166",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 3300,
+                .edx_reset          = 0x1632,
+                .cpuid_model        = 0x1632,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            { /* out of spec */
+                .name               = "200",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 3300,
+                .edx_reset          = 0x1632,
+                .cpuid_model        = 0x1632,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 24
+            },
+            { /* out of spec */
+                .name               = "233",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 233333333,
+                .multi              = 3.5,
+                .voltage            = 3300,
+                .edx_reset          = 0x1632,
+                .cpuid_model        = 0x1632,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 10,
+                .cache_write_cycles = 10,
+                .atclk_div          = 28
+            },
+            { /* out of spec */
+                .name               = "266",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 266666666,
+                .multi              = 4.0,
+                .voltage            = 3300,
+                .edx_reset          = 0x1632,
+                .cpuid_model        = 0x1632,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 24,
+                .mem_write_cycles   = 24,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 32
+            },
+            {
+                .name               = "300",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 300000000,
+                .multi              = 5.0,
+                .voltage            = 3300,
+                .edx_reset          = 0x1632,
+                .cpuid_model        = 0x1632,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 27,
+                .mem_write_cycles   = 27,
+                .cache_read_cycles  = 13,
+                .cache_write_cycles = 13,
+                .atclk_div          = 36
+            },
+            {
+                .name               = "333",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 333333333,
+                .multi              = 5.0,
+                .voltage            = 3300,
+                .edx_reset          = 0x1632,
+                .cpuid_model        = 0x1632,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 27,
+                .mem_write_cycles   = 27,
+                .cache_read_cycles  = 13,
+                .cache_write_cycles = 13,
+                .atclk_div          = 40
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SLOT1,
+        .manufacturer  = "Intel",
+        .name          = "Pentium II (Klamath)",
+        .internal_name = "pentium2_klamath",
+        .cpus          = (const CPU[]) {
+            { /* out of spec */
+                .name               = "66",
+                .cpu_type           = CPU_PENTIUM2,
+                .fpus               = fpus_internal,
+                .rspeed             = 66666666,
+                .multi              = 1.0,
+                .voltage            = 2800,
+                .edx_reset          = 0x634,
+                .cpuid_model        = 0x634,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 8
+            },
+            { /* out of spec */
+                .name               = "100",
+                .cpu_type           = CPU_PENTIUM2,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 1.5,
+                .voltage            = 2800,
+                .edx_reset          = 0x634,
+                .cpuid_model        = 0x634,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 12
+            },
+            { /* out of spec */
+                .name               = "133",
+                .cpu_type           = CPU_PENTIUM2,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 2800,
+                .edx_reset          = 0x634,
+                .cpuid_model        = 0x634,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+            },
+            { /* out of spec */
+                .name               = "166",
+                .cpu_type           = CPU_PENTIUM2,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 2800,
+                .edx_reset          = 0x634,
+                .cpuid_model        = 0x634,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            { /* out of spec */
+                .name               = "200",
+                .cpu_type           = CPU_PENTIUM2,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 2800,
+                .edx_reset          = 0x634,
+                .cpuid_model        = 0x634,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 24
+            },
+            {
+                .name               = "233",
+                .cpu_type           = CPU_PENTIUM2,
+                .fpus               = fpus_internal,
+                .rspeed             = 233333333,
+                .multi              = 3.5,
+                .voltage            = 2800,
+                .edx_reset          = 0x634,
+                .cpuid_model        = 0x634,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 10,
+                .cache_write_cycles = 10,
+                .atclk_div          = 28
+            },
+            {
+                .name               = "266",
+                .cpu_type           = CPU_PENTIUM2,
+                .fpus               = fpus_internal,
+                .rspeed             = 266666666,
+                .multi              = 4.0,
+                .voltage            = 2800,
+                .edx_reset          = 0x634,
+                .cpuid_model        = 0x634,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 24,
+                .mem_write_cycles   = 24,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 32
+            },
+            {
+                .name               = "300",
+                .cpu_type           = CPU_PENTIUM2,
+                .fpus               = fpus_internal,
+                .rspeed             = 300000000,
+                .multi              = 4.5,
+                .voltage            = 2800,
+                .edx_reset          = 0x634,
+                .cpuid_model        = 0x634,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 25,
+                .mem_write_cycles   = 25,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 36
+            },
+            { .name = "", 0 }
+        }
     }, {
-    .package = CPU_PKG_SLOT1,
-    .manufacturer = "Intel",
-    .name = "Celeron (Covington)",
-    .internal_name = "celeron_covington",
-    .cpus = (const CPU[]) {
-        {"66",     CPU_PENTIUM2D,  fpus_internal,  66666666, 1.0, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  6, 6, 6, 6, 8},  /* out of spec */
-        {"100",    CPU_PENTIUM2D,  fpus_internal, 100000000, 1.5, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  9, 9, 9, 9, 12}, /* out of spec */
-        {"133",    CPU_PENTIUM2D,  fpus_internal, 133333333, 2.0, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12,12,12, 16}, /* out of spec */
-        {"166",    CPU_PENTIUM2D,  fpus_internal, 166666666, 2.5, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15,15,15, 20}, /* out of spec */
-        {"200",    CPU_PENTIUM2D,  fpus_internal, 200000000, 3.0, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 18,18,18,18, 24}, /* out of spec */
-        {"233",    CPU_PENTIUM2D,  fpus_internal, 233333333, 3.5, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 21,21,21,21, 28}, /* out of spec */
-        {"266",    CPU_PENTIUM2D,  fpus_internal, 266666666, 4.0, 2050,  0x650,  0x650, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 24,24,24,24, 32},
-        {"300",    CPU_PENTIUM2D,  fpus_internal, 300000000, 4.5, 2050,  0x651,  0x651, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 25,25,25,25, 36},
-        {"", 0}
-    }
+        .package       = CPU_PKG_SLOT1,
+        .manufacturer  = "Intel",
+        .name          = "Pentium II (Deschutes)",
+        .internal_name = "pentium2_deschutes",
+        .cpus          = (const CPU[]) {
+            { /* out of spec */
+                .name               = "66",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 66666666,
+                .multi              = 1.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 8
+            },
+            { /* out of spec */
+                .name               = "100",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 1.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 5,
+                .cache_write_cycles = 5,
+                .atclk_div          = 12
+            },
+            { /* out of spec */
+                .name               = "133",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+            },
+            { /* out of spec */
+                .name               = "166",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            { /* out of spec */
+                .name               = "200",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 24
+            },
+            { /* out of spec */
+                .name               = "233",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 233333333,
+                .multi              = 3.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 11,
+                .cache_write_cycles = 11,
+                .atclk_div          = 28
+            },
+            {
+                .name               = "266",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 266666666,
+                .multi              = 4.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 24,
+                .mem_write_cycles   = 24,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 32
+            },
+            {
+                .name               = "300",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 300000000,
+                .multi              = 4.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x651,
+                .cpuid_model        = 0x651,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 25,
+                .mem_write_cycles   = 25,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 36
+            },
+            {
+                .name               = "333",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 333333333,
+                .multi              = 5.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x651,
+                .cpuid_model        = 0x651,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 27,
+                .mem_write_cycles   = 27,
+                .cache_read_cycles  = 13,
+                .cache_write_cycles = 13,
+                .atclk_div          = 40
+            },
+            {
+                .name               = "350",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 350000000,
+                .multi              = 3.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x651,
+                .cpuid_model        = 0x651,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 32,
+                .mem_write_cycles   = 32,
+                .cache_read_cycles  = 11,
+                .cache_write_cycles = 11,
+                .atclk_div          = 42
+            },
+            {
+                .name               = "400",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 400000000,
+                .multi              = 4.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 36,
+                .mem_write_cycles   = 36,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 48
+            },
+            {
+                .name               = "450",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 450000000,
+                .multi              = 4.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 41,
+                .mem_write_cycles   = 41,
+                .cache_read_cycles  = 14,
+                .cache_write_cycles = 14,
+                .atclk_div          = 54
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SLOT1,
+        .manufacturer  = "Intel",
+        .name          = "Celeron (Covington)",
+        .internal_name = "celeron_covington",
+        .cpus          = (const CPU[]) {
+            { /* out of spec */
+                .name               = "66",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 66666666,
+                .multi              = 1.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 8
+            },
+            { /* out of spec */
+                .name               = "100",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 1.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 12
+            },
+            { /* out of spec */
+                .name               = "133",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 16
+            },
+            { /* out of spec */
+                .name               = "166",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 15,
+                .cache_write_cycles = 15,
+                .atclk_div          = 20
+            },
+            { /* out of spec */
+                .name               = "200",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 18,
+                .cache_write_cycles = 18,
+                .atclk_div          = 24
+            },
+            { /* out of spec */
+                .name               = "233",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 233333333,
+                .multi              = 3.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 21,
+                .cache_write_cycles = 21,
+                .atclk_div          = 28
+            },
+            {
+                .name               = "266",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 266666666,
+                .multi              = 4.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x650,
+                .cpuid_model        = 0x650,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 24,
+                .mem_write_cycles   = 24,
+                .cache_read_cycles  = 24,
+                .cache_write_cycles = 24,
+                .atclk_div          = 32
+            },
+            {
+                .name               = "300",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 300000000,
+                .multi              = 4.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x651,
+                .cpuid_model        = 0x651,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 25,
+                .mem_write_cycles   = 25,
+                .cache_read_cycles  = 25,
+                .cache_write_cycles = 25,
+                .atclk_div          = 36
+            },
+            { .name = "", 0 }
+        }
     }, {
-    .package = CPU_PKG_SLOT2,
-    .manufacturer = "Intel",
-    .name = "Pentium II Xeon",
-    .internal_name = "pentium2_xeon",
-    .cpus = (const CPU[]) {
-        {"100",    CPU_PENTIUM2D,  fpus_internal, 100000000, 1.0, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,  9, 9, 3, 3, 12}, /* out of spec */
-        {"150",    CPU_PENTIUM2D,  fpus_internal, 150000000, 1.5, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 14,14, 4, 4, 18}, /* out of spec */
-        {"200",    CPU_PENTIUM2D,  fpus_internal, 200000000, 2.0, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 18,18, 6, 6, 24}, /* out of spec */
-        {"250",    CPU_PENTIUM2D,  fpus_internal, 250000000, 2.5, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 22,22, 7, 7, 30}, /* out of spec */
-        {"300",    CPU_PENTIUM2D,  fpus_internal, 300000000, 3.0, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 27,27, 9, 9, 36}, /* out of spec */
-        {"350",    CPU_PENTIUM2D,  fpus_internal, 350000000, 3.5, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 32,32,10,10, 42}, /* out of spec */
-        {"400",    CPU_PENTIUM2D,  fpus_internal, 400000000, 4.0, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 36,36,12,12, 48},
-        {"450",    CPU_PENTIUM2D,  fpus_internal, 450000000, 4.5, 2050,  0x652,  0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 41,41,14,14, 54},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET370,
-    .manufacturer = "Intel",
-    .name = "Celeron (Mendocino)",
-    .internal_name = "celeron_mendocino",
-    .cpus = (const CPU[]) {
-        {"66",        CPU_PENTIUM2D,  fpus_internal,  66666666, 1.0, 2050,  0x665,  0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,  6, 6, 3, 3, 8},  /* out of spec */
-        {"100",       CPU_PENTIUM2D,  fpus_internal, 100000000, 1.5, 2050,  0x665,  0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,  8, 8, 4, 4, 12}, /* out of spec */
-        {"133",       CPU_PENTIUM2D,  fpus_internal, 133333333, 2.0, 2050,  0x665,  0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 11,11, 5, 5, 16}, /* out of spec */
-        {"166",       CPU_PENTIUM2D,  fpus_internal, 166666666, 2.5, 2050,  0x665,  0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 14,14, 7, 7, 20}, /* out of spec */
-        {"200",       CPU_PENTIUM2D,  fpus_internal, 200000000, 3.0, 2050,  0x665,  0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 17,17, 8, 8, 24}, /* out of spec */
-        {"233",       CPU_PENTIUM2D,  fpus_internal, 233333333, 3.5, 2050,  0x665,  0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 19,19, 9, 9, 28}, /* out of spec */
-        {"266",       CPU_PENTIUM2D,  fpus_internal, 266666666, 4.0, 2050,  0x665,  0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 22,22,11,11, 32}, /* out of spec */
-        {"300A",      CPU_PENTIUM2D,  fpus_internal, 300000000, 4.5, 2050,  0x665,  0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 25,25,12,12, 36},
-        {"333",       CPU_PENTIUM2D,  fpus_internal, 333333333, 5.0, 2050,  0x665,  0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 27,27,13,13, 40},
-        {"366",       CPU_PENTIUM2D,  fpus_internal, 366666666, 5.5, 2050,  0x665,  0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 33,33,17,17, 44},
-        {"400",       CPU_PENTIUM2D,  fpus_internal, 400000000, 6.0, 2050,  0x665,  0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 36,36,12,12, 48},
-        {"433",       CPU_PENTIUM2D,  fpus_internal, 433333333, 6.5, 2050,  0x665,  0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 39,39,13,13, 51},
-        {"466",       CPU_PENTIUM2D,  fpus_internal, 466666666, 7.0, 2050,  0x665,  0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 42,42,14,14, 56},
-        {"500",       CPU_PENTIUM2D,  fpus_internal, 500000000, 7.5, 2050,  0x665,  0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 45,45,15,15, 60},
-        {"533",       CPU_PENTIUM2D,  fpus_internal, 533333333, 8.0, 2050,  0x665,  0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER, 48,48,17,17, 64},
-        {"", 0}
-    }
-    }, {
-    .package = CPU_PKG_SOCKET370,
-    .manufacturer = "VIA",
-    .name = "Cyrix III",
-    .internal_name = "c3_samuel",
-    .cpus = (const CPU[]) {
-        {"66",      CPU_CYRIX3S, fpus_internal,  66666666, 1.0, 2050,   0x660, 0x660, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,  6,  6,  3,  3,  8}, /* out of multiplier range */
-        {"100",     CPU_CYRIX3S, fpus_internal, 100000000, 1.5, 2050,   0x660, 0x660, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,  9,  9,  4,  4, 12}, /* out of multiplier range */
-        {"133",     CPU_CYRIX3S, fpus_internal, 133333333, 2.0, 2050,   0x660, 0x660, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 12, 12,  6,  6, 16}, /* out of multiplier range */
-        {"166",     CPU_CYRIX3S, fpus_internal, 166666666, 2.5, 2050,   0x660, 0x660, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 15, 15,  7,  7, 20}, /* out of multiplier range */
-        {"200",     CPU_CYRIX3S, fpus_internal, 200000000, 3.0, 2050,   0x660, 0x660, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 18, 18,  8,  8, 24}, /* out of multiplier range */
-        {"233",     CPU_CYRIX3S, fpus_internal, 233333333, 3.5, 2050,   0x660, 0x660, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 21, 21,  9,  9, 28}, /* out of multiplier range */
-        {"266",     CPU_CYRIX3S, fpus_internal, 266666666, 4.0, 2050,   0x660, 0x660, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 24, 24, 12, 12, 32}, /* out of multiplier range */
-        {"300",     CPU_CYRIX3S, fpus_internal, 300000000, 4.5, 2050,   0x660, 0x660, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 27, 27, 13, 13, 36}, /* out of spec */
-        {"333",     CPU_CYRIX3S, fpus_internal, 333333333, 5.0, 2050,   0x662, 0x662, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 30, 30, 15, 15, 40}, /* out of spec */
-        {"366",     CPU_CYRIX3S, fpus_internal, 366666666, 5.5, 2050,   0x662, 0x662, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 33, 33, 16, 16, 44}, /* out of spec */
-        {"400",     CPU_CYRIX3S, fpus_internal, 400000000, 6.0, 2050,   0x660, 0x660, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 36, 36, 17, 17, 48},
-        {"433",     CPU_CYRIX3S, fpus_internal, 433333333, 6.5, 2050,   0x660, 0x660, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 39, 39, 18, 18, 52}, /* out of spec */
-        {"450",     CPU_CYRIX3S, fpus_internal, 450000000, 4.5, 2050,   0x660, 0x660, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 41, 41, 14, 14, 54},
-        {"466",     CPU_CYRIX3S, fpus_internal, 466666666, 6.5, 2050,   0x660, 0x660, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 42, 42, 14, 14, 56}, /* out of spec */
-        {"500",     CPU_CYRIX3S, fpus_internal, 500000000, 5.0, 2050,   0x662, 0x662, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 45, 45, 15, 15, 60},
-        {"533",     CPU_CYRIX3S, fpus_internal, 533333333, 8.0, 2050,   0x660, 0x660, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 48, 48, 15, 15, 64}, /* out of spec */
-        {"550",     CPU_CYRIX3S, fpus_internal, 550000000, 5.5, 2050,   0x662, 0x662, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 50, 50, 17, 17, 66},
-        {"600/100", CPU_CYRIX3S, fpus_internal, 600000000, 6.0, 2050,   0x662, 0x662, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 54, 54, 18, 18, 72},
-        {"600/133", CPU_CYRIX3S, fpus_internal, 600000000, 4.5, 2050,   0x663, 0x663, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 54, 54, 13, 13, 72},
-        {"650",     CPU_CYRIX3S, fpus_internal, 650000000, 6.5, 2050,   0x663, 0x663, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 58, 58, 20, 20, 78},
-        {"667",     CPU_CYRIX3S, fpus_internal, 666666667, 5.0, 2050,   0x663, 0x663, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 60, 60, 16, 16, 80},
-        {"700",     CPU_CYRIX3S, fpus_internal, 700000000, 7.0, 2050,   0x663, 0x663, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 63, 63, 21, 21, 84},
-        {"733",     CPU_CYRIX3S, fpus_internal, 733333333, 5.5, 2050,   0x663, 0x663, 0, CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER, 66, 66, 18, 18, 88},
-        {"", 0}
-    }
-    }, {
-    .package = 0,
-    }
+        .package       = CPU_PKG_SLOT2,
+        .manufacturer  = "Intel",
+        .name          = "Pentium II Xeon",
+        .internal_name = "pentium2_xeon",
+        .cpus          = (const CPU[]) {
+            { /* out of spec */
+                .name               = "100",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 1.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 12
+            },
+            { /* out of spec */
+                .name               = "150",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 150000000,
+                .multi              = 1.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 14,
+                .mem_write_cycles   = 14,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 18
+            },
+            { /* out of spec */
+                .name               = "200",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 2.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 24
+            },
+            { /* out of spec */
+                .name               = "250",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 250000000,
+                .multi              = 2.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 22,
+                .mem_write_cycles   = 22,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 30
+            },
+            { /* out of spec */
+                .name               = "300",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 300000000,
+                .multi              = 3.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 27,
+                .mem_write_cycles   = 27,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 36
+            },
+            { /* out of spec */
+                .name               = "350",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 350000000,
+                .multi              = 3.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 32,
+                .mem_write_cycles   = 32,
+                .cache_read_cycles  = 10,
+                .cache_write_cycles = 10,
+                .atclk_div          = 42
+            },
+            {
+                .name               = "400",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 400000000,
+                .multi              = 4.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 36,
+                .mem_write_cycles   = 36,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 48
+            },
+            {
+                .name               = "450",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 450000000,
+                .multi              = 4.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x652,
+                .cpuid_model        = 0x652,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
+                .mem_read_cycles    = 41,
+                .mem_write_cycles   = 41,
+                .cache_read_cycles  = 14,
+                .cache_write_cycles = 14,
+                .atclk_div          = 54
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET370,
+        .manufacturer  = "Intel",
+        .name          = "Celeron (Mendocino)",
+        .internal_name = "celeron_mendocino",
+        .cpus          = (const CPU[]) {
+            { /* out of spec */
+                .name               = "66",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 66666666,
+                .multi              = 1.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x665,
+                .cpuid_model        = 0x665,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 8
+            },
+            { /* out of spec */
+                .name               = "100",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 1.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x665,
+                .cpuid_model        = 0x665,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 8,
+                .mem_write_cycles   = 8,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 12
+            },
+            { /* out of spec */
+                .name               = "133",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x665,
+                .cpuid_model        = 0x665,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 11,
+                .mem_write_cycles   = 11,
+                .cache_read_cycles  = 5,
+                .cache_write_cycles = 5,
+                .atclk_div          = 16
+            },
+            { /* out of spec */
+                .name               = "166",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x665,
+                .cpuid_model        = 0x665,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 14,
+                .mem_write_cycles   = 14,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            { /* out of spec */
+                .name               = "200",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x665,
+                .cpuid_model        = 0x665,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 17,
+                .mem_write_cycles   = 17,
+                .cache_read_cycles  = 8,
+                .cache_write_cycles = 8,
+                .atclk_div          = 24
+            },
+            { /* out of spec */
+                .name               = "233",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 233333333,
+                .multi              = 3.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x665,
+                .cpuid_model        = 0x665,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 19,
+                .mem_write_cycles   = 19,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 28
+            },
+            { /* out of spec */
+                .name               = "266",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 266666666,
+                .multi              = 4.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x665,
+                .cpuid_model        = 0x665,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 22,
+                .mem_write_cycles   = 22,
+                .cache_read_cycles  = 11,
+                .cache_write_cycles = 11,
+                .atclk_div          = 32
+            },
+            {
+                .name               = "300A",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 300000000,
+                .multi              = 4.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x665,
+                .cpuid_model        = 0x665,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 25,
+                .mem_write_cycles   = 25,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 36
+            },
+            {
+                .name               = "333",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 333333333,
+                .multi              = 5.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x665,
+                .cpuid_model        = 0x665,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 27,
+                .mem_write_cycles   = 27,
+                .cache_read_cycles  = 13,
+                .cache_write_cycles = 13,
+                .atclk_div          = 40
+            },
+            {
+                .name               = "366",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 366666666,
+                .multi              = 5.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x665,
+                .cpuid_model        = 0x665,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 33,
+                .mem_write_cycles   = 33,
+                .cache_read_cycles  = 17,
+                .cache_write_cycles = 17,
+                .atclk_div          = 44
+            },
+            {
+                .name               = "400",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 400000000,
+                .multi              = 6.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x665,
+                .cpuid_model        = 0x665,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 36,
+                .mem_write_cycles   = 36,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 48
+            },
+            {
+                .name               = "433",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 433333333,
+                .multi              = 6.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x665,
+                .cpuid_model        = 0x665,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 39,
+                .mem_write_cycles   = 39,
+                .cache_read_cycles  = 13,
+                .cache_write_cycles = 13,
+                .atclk_div          = 51
+            },
+            {
+                .name               = "466",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 466666666,
+                .multi              = 7.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x665,
+                .cpuid_model        = 0x665,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 42,
+                .mem_write_cycles   = 42,
+                .cache_read_cycles  = 14,
+                .cache_write_cycles = 14,
+                .atclk_div          = 56
+            },
+            {
+                .name               = "500",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 500000000,
+                .multi              = 7.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x665,
+                .cpuid_model        = 0x665,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 45,
+                .mem_write_cycles   = 45,
+                .cache_read_cycles  = 15,
+                .cache_write_cycles = 15,
+                .atclk_div          = 60
+            },
+            {
+                .name               = "533",
+                .cpu_type           = CPU_PENTIUM2D,
+                .fpus               = fpus_internal,
+                .rspeed             = 533333333,
+                .multi              = 8.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x665,
+                .cpuid_model        = 0x665,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 48,
+                .mem_write_cycles   = 48,
+                .cache_read_cycles  = 17,
+                .cache_write_cycles = 17,
+                .atclk_div          = 64
+            },
+            { .name = "", 0 }
+        }
+    },
+    {
+        .package       = CPU_PKG_SOCKET370,
+        .manufacturer  = "VIA",
+        .name          = "Cyrix III (Samuel)",
+        .internal_name = "c3_samuel",
+        .cpus          = (const CPU[]) {
+            { /* out of multiplier range */
+                .name               = "66",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 66666666,
+                .multi              = 1.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x660,
+                .cpuid_model        = 0x660,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 6,
+                .mem_write_cycles   = 6,
+                .cache_read_cycles  = 3,
+                .cache_write_cycles = 3,
+                .atclk_div          = 8
+            },
+            { /* out of multiplier range */
+                .name               = "100",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 100000000,
+                .multi              = 1.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x660,
+                .cpuid_model        = 0x660,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 9,
+                .mem_write_cycles   = 9,
+                .cache_read_cycles  = 4,
+                .cache_write_cycles = 4,
+                .atclk_div          = 12
+            },
+            { /* out of multiplier range */
+                .name               = "133",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 133333333,
+                .multi              = 2.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x660,
+                .cpuid_model        = 0x660,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 12,
+                .mem_write_cycles   = 12,
+                .cache_read_cycles  = 6,
+                .cache_write_cycles = 6,
+                .atclk_div          = 16
+            },
+            { /* out of multiplier range */
+                .name               = "166",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 166666666,
+                .multi              = 2.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x660,
+                .cpuid_model        = 0x660,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 15,
+                .mem_write_cycles   = 15,
+                .cache_read_cycles  = 7,
+                .cache_write_cycles = 7,
+                .atclk_div          = 20
+            },
+            { /* out of multiplier range */
+                .name               = "200",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 200000000,
+                .multi              = 3.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x660,
+                .cpuid_model        = 0x660,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 18,
+                .mem_write_cycles   = 18,
+                .cache_read_cycles  = 8,
+                .cache_write_cycles = 8,
+                .atclk_div          = 24
+            },
+            { /* out of multiplier range */
+                .name               = "233",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 233333333,
+                .multi              = 3.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x660,
+                .cpuid_model        = 0x660,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 21,
+                .mem_write_cycles   = 21,
+                .cache_read_cycles  = 9,
+                .cache_write_cycles = 9,
+                .atclk_div          = 28
+            },
+            { /* out of multiplier range */
+                .name               = "266",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 266666666,
+                .multi              = 4.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x660,
+                .cpuid_model        = 0x660,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 24,
+                .mem_write_cycles   = 24,
+                .cache_read_cycles  = 12,
+                .cache_write_cycles = 12,
+                .atclk_div          = 32
+            },
+            { /* out of spec */
+                .name               = "300",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 300000000,
+                .multi              = 4.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x660,
+                .cpuid_model        = 0x660,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 27,
+                .mem_write_cycles   = 27,
+                .cache_read_cycles  = 13,
+                .cache_write_cycles = 13,
+                .atclk_div          = 36
+            },
+            { /* out of spec */
+                .name               = "333",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 333333333,
+                .multi              = 5.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x662,
+                .cpuid_model        = 0x662,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 30,
+                .mem_write_cycles   = 30,
+                .cache_read_cycles  = 15,
+                .cache_write_cycles = 15,
+                .atclk_div          = 40
+            },
+            { /* out of spec */
+                .name               = "366",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 366666666,
+                .multi              = 5.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x662,
+                .cpuid_model        = 0x662,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 33,
+                .mem_write_cycles   = 33,
+                .cache_read_cycles  = 16,
+                .cache_write_cycles = 16,
+                .atclk_div          = 44
+            },
+            {
+                .name               = "400",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 400000000,
+                .multi              = 6.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x660,
+                .cpuid_model        = 0x660,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 36,
+                .mem_write_cycles   = 36,
+                .cache_read_cycles  = 17,
+                .cache_write_cycles = 17,
+                .atclk_div          = 48
+            },
+            { /* out of spec */
+                .name               = "433",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 433333333,
+                .multi              = 6.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x660,
+                .cpuid_model        = 0x660,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 39,
+                .mem_write_cycles   = 39,
+                .cache_read_cycles  = 18,
+                .cache_write_cycles = 18,
+                .atclk_div          = 52
+            },
+            {
+                .name               = "450",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 450000000,
+                .multi              = 4.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x660,
+                .cpuid_model        = 0x660,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 41,
+                .mem_write_cycles   = 41,
+                .cache_read_cycles  = 14,
+                .cache_write_cycles = 14,
+                .atclk_div          = 54
+            },
+            { /* out of spec */
+                .name               = "466",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 466666666,
+                .multi              = 6.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x660,
+                .cpuid_model        = 0x660,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 42,
+                .mem_write_cycles   = 42,
+                .cache_read_cycles  = 14,
+                .cache_write_cycles = 14,
+                .atclk_div          = 56
+            },
+            {
+                .name               = "500",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 500000000,
+                .multi              = 5.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x662,
+                .cpuid_model        = 0x662,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 45,
+                .mem_write_cycles   = 45,
+                .cache_read_cycles  = 15,
+                .cache_write_cycles = 15,
+                .atclk_div          = 60
+            },
+            { /* out of spec */
+                .name               = "533",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 533333333,
+                .multi              = 8.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x660,
+                .cpuid_model        = 0x660,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 48,
+                .mem_write_cycles   = 48,
+                .cache_read_cycles  = 15,
+                .cache_write_cycles = 15,
+                .atclk_div          = 64
+            },
+            {
+                .name               = "550",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 550000000,
+                .multi              = 5.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x662,
+                .cpuid_model        = 0x662,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 50,
+                .mem_write_cycles   = 50,
+                .cache_read_cycles  = 17,
+                .cache_write_cycles = 17,
+                .atclk_div          = 66
+            },
+            {
+                .name               = "600/100",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 600000000,
+                .multi              = 6.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x662,
+                .cpuid_model        = 0x662,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 54,
+                .mem_write_cycles   = 54,
+                .cache_read_cycles  = 18,
+                .cache_write_cycles = 18,
+                .atclk_div          = 72
+            },
+            {
+                .name               = "600/133",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 600000000,
+                .multi              = 4.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x663,
+                .cpuid_model        = 0x663,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 54,
+                .mem_write_cycles   = 54,
+                .cache_read_cycles  = 13,
+                .cache_write_cycles = 13,
+                .atclk_div          = 72
+            },
+            {
+                .name               = "650",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 650000000,
+                .multi              = 6.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x663,
+                .cpuid_model        = 0x663,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 58,
+                .mem_write_cycles   = 58,
+                .cache_read_cycles  = 20,
+                .cache_write_cycles = 20,
+                .atclk_div          = 78
+            },
+            {
+                .name               = "667",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 666666667,
+                .multi              = 5.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x663,
+                .cpuid_model        = 0x663,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 60,
+                .mem_write_cycles   = 60,
+                .cache_read_cycles  = 16,
+                .cache_write_cycles = 16,
+                .atclk_div          = 80
+            },
+            {
+                .name               = "700",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 700000000,
+                .multi              = 7.0,
+                .voltage            = 2050,
+                .edx_reset          = 0x663,
+                .cpuid_model        = 0x663,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 63,
+                .mem_write_cycles   = 63,
+                .cache_read_cycles  = 21,
+                .cache_write_cycles = 21,
+                .atclk_div          = 84
+            },
+            {
+                .name               = "733",
+                .cpu_type           = CPU_CYRIX3S,
+                .fpus               = fpus_internal,
+                .rspeed             = 733333333,
+                .multi              = 5.5,
+                .voltage            = 2050,
+                .edx_reset          = 0x663,
+                .cpuid_model        = 0x663,
+                .cyrix_id           = 0,
+                .cpu_flags          = CPU_SUPPORTS_DYNAREC | CPU_FIXED_MULTIPLIER,
+                .mem_read_cycles    = 66,
+                .mem_write_cycles   = 66,
+                .cache_read_cycles  = 18,
+                .cache_write_cycles = 18,
+                .atclk_div          = 88
+            },
+            { .name = "", 0 }
+        }
+    },
+    { .package = 0, 0 }
   // clang-format on
 };
diff --git a/src/cpu/i8080.c b/src/cpu/i8080.c
new file mode 100644
index 000000000..688923997
--- /dev/null
+++ b/src/cpu/i8080.c
@@ -0,0 +1,826 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Intel 8080 CPU emulation
+ *
+ * Authors: Cacodemon345
+ *          Nicolas Allemand
+ *          
+ *          Copyright (c) 2018 Nicolas Allemand
+ *          Copyright (c) 2024 Cacodemon345
+ *
+ */
+
+#include "i8080.h"
+#include <stdint.h>
+
+// Changes from upstream:
+// Add CALLN and RETEM instructions.
+// Add code for instruction fetches.
+
+// this array defines the number of cycles one opcode takes.
+// note that there are some special cases: conditional RETs and CALLs
+// add +6 cycles if the condition is met
+// clang-format off
+static const uint8_t OPCODES_CYCLES[256] = {
+//  0  1   2   3   4   5   6   7   8  9   A   B   C   D   E  F
+    4, 10, 7,  5,  5,  5,  7,  4,  4, 10, 7,  5,  5,  5,  7, 4,  // 0
+    4, 10, 7,  5,  5,  5,  7,  4,  4, 10, 7,  5,  5,  5,  7, 4,  // 1
+    4, 10, 16, 5,  5,  5,  7,  4,  4, 10, 16, 5,  5,  5,  7, 4,  // 2
+    4, 10, 13, 5,  10, 10, 10, 4,  4, 10, 13, 5,  5,  5,  7, 4,  // 3
+    5, 5,  5,  5,  5,  5,  7,  5,  5, 5,  5,  5,  5,  5,  7, 5,  // 4
+    5, 5,  5,  5,  5,  5,  7,  5,  5, 5,  5,  5,  5,  5,  7, 5,  // 5
+    5, 5,  5,  5,  5,  5,  7,  5,  5, 5,  5,  5,  5,  5,  7, 5,  // 6
+    7, 7,  7,  7,  7,  7,  7,  7,  5, 5,  5,  5,  5,  5,  7, 5,  // 7
+    4, 4,  4,  4,  4,  4,  7,  4,  4, 4,  4,  4,  4,  4,  7, 4,  // 8
+    4, 4,  4,  4,  4,  4,  7,  4,  4, 4,  4,  4,  4,  4,  7, 4,  // 9
+    4, 4,  4,  4,  4,  4,  7,  4,  4, 4,  4,  4,  4,  4,  7, 4,  // A
+    4, 4,  4,  4,  4,  4,  7,  4,  4, 4,  4,  4,  4,  4,  7, 4,  // B
+    5, 10, 10, 10, 11, 11, 7,  11, 5, 10, 10, 10, 11, 17, 7, 11, // C
+    5, 10, 10, 10, 11, 11, 7,  11, 5, 10, 10, 10, 11, 17, 7, 11, // D
+    5, 10, 10, 18, 11, 11, 7,  11, 5, 5,  10, 4,  11, 17, 7, 11, // E
+    5, 10, 10, 4,  11, 11, 7,  11, 5, 5,  10, 4,  11, 17, 7, 11  // F
+};
+// clang-format on
+
+static const char* DISASSEMBLE_TABLE[] = {"nop", "lxi b,#", "stax b", "inx b",
+    "inr b", "dcr b", "mvi b,#", "rlc", "ill", "dad b", "ldax b", "dcx b",
+    "inr c", "dcr c", "mvi c,#", "rrc", "ill", "lxi d,#", "stax d", "inx d",
+    "inr d", "dcr d", "mvi d,#", "ral", "ill", "dad d", "ldax d", "dcx d",
+    "inr e", "dcr e", "mvi e,#", "rar", "ill", "lxi h,#", "shld", "inx h",
+    "inr h", "dcr h", "mvi h,#", "daa", "ill", "dad h", "lhld", "dcx h",
+    "inr l", "dcr l", "mvi l,#", "cma", "ill", "lxi sp,#", "sta $", "inx sp",
+    "inr M", "dcr M", "mvi M,#", "stc", "ill", "dad sp", "lda $", "dcx sp",
+    "inr a", "dcr a", "mvi a,#", "cmc", "mov b,b", "mov b,c", "mov b,d",
+    "mov b,e", "mov b,h", "mov b,l", "mov b,M", "mov b,a", "mov c,b", "mov c,c",
+    "mov c,d", "mov c,e", "mov c,h", "mov c,l", "mov c,M", "mov c,a", "mov d,b",
+    "mov d,c", "mov d,d", "mov d,e", "mov d,h", "mov d,l", "mov d,M", "mov d,a",
+    "mov e,b", "mov e,c", "mov e,d", "mov e,e", "mov e,h", "mov e,l", "mov e,M",
+    "mov e,a", "mov h,b", "mov h,c", "mov h,d", "mov h,e", "mov h,h", "mov h,l",
+    "mov h,M", "mov h,a", "mov l,b", "mov l,c", "mov l,d", "mov l,e", "mov l,h",
+    "mov l,l", "mov l,M", "mov l,a", "mov M,b", "mov M,c", "mov M,d", "mov M,e",
+    "mov M,h", "mov M,l", "hlt", "mov M,a", "mov a,b", "mov a,c", "mov a,d",
+    "mov a,e", "mov a,h", "mov a,l", "mov a,M", "mov a,a", "add b", "add c",
+    "add d", "add e", "add h", "add l", "add M", "add a", "adc b", "adc c",
+    "adc d", "adc e", "adc h", "adc l", "adc M", "adc a", "sub b", "sub c",
+    "sub d", "sub e", "sub h", "sub l", "sub M", "sub a", "sbb b", "sbb c",
+    "sbb d", "sbb e", "sbb h", "sbb l", "sbb M", "sbb a", "ana b", "ana c",
+    "ana d", "ana e", "ana h", "ana l", "ana M", "ana a", "xra b", "xra c",
+    "xra d", "xra e", "xra h", "xra l", "xra M", "xra a", "ora b", "ora c",
+    "ora d", "ora e", "ora h", "ora l", "ora M", "ora a", "cmp b", "cmp c",
+    "cmp d", "cmp e", "cmp h", "cmp l", "cmp M", "cmp a", "rnz", "pop b",
+    "jnz $", "jmp $", "cnz $", "push b", "adi #", "rst 0", "rz", "ret", "jz $",
+    "ill", "cz $", "call $", "aci #", "rst 1", "rnc", "pop d", "jnc $", "out p",
+    "cnc $", "push d", "sui #", "rst 2", "rc", "ill", "jc $", "in p", "cc $",
+    "ill", "sbi #", "rst 3", "rpo", "pop h", "jpo $", "xthl", "cpo $", "push h",
+    "ani #", "rst 4", "rpe", "pchl", "jpe $", "xchg", "cpe $", "ill", "xri #",
+    "rst 5", "rp", "pop psw", "jp $", "di", "cp $", "push psw", "ori #",
+    "rst 6", "rm", "sphl", "jm $", "ei", "cm $", "ill", "cpi #", "rst 7"};
+
+#define SET_ZSP(c, val) \
+  do { \
+    c->zf = (val) == 0; \
+    c->sf = (val) >> 7; \
+    c->pf = parity(val); \
+  } while (0)
+
+// memory helpers (the only four to use `read_byte` and `write_byte` function
+// pointers)
+
+// reads a byte from memory
+static inline uint8_t i8080_rb(i8080* const c, uint16_t addr) {
+  return c->read_byte(c->userdata, addr);
+}
+
+// writes a byte to memory
+static inline void i8080_wb(i8080* const c, uint16_t addr, uint8_t val) {
+  c->write_byte(c->userdata, addr, val);
+}
+
+// reads a word from memory
+static inline uint16_t i8080_rw(i8080* const c, uint16_t addr) {
+  return c->read_byte(c->userdata, addr + 1) << 8 |
+         c->read_byte(c->userdata, addr);
+}
+
+// writes a word to memory
+static inline void i8080_ww(i8080* const c, uint16_t addr, uint16_t val) {
+  c->write_byte(c->userdata, addr, val & 0xFF);
+  c->write_byte(c->userdata, addr + 1, val >> 8);
+}
+
+// returns the next byte in memory (and updates the program counter)
+static inline uint8_t i8080_next_byte(i8080* const c) {
+  return c->read_byte_seg ? (c->read_byte_seg(c->userdata, c->pc++)) :  i8080_rb(c, c->pc++);
+}
+
+// returns the next word in memory (and updates the program counter)
+static inline uint16_t i8080_next_word(i8080* const c) {
+  uint16_t result = 0;
+  if (c->read_byte_seg)
+    result = c->read_byte_seg(c, c->pc) | (c->read_byte_seg(c, c->pc + 1) << 8);
+  else
+    result = i8080_rw(c, c->pc);
+  c->pc += 2;
+  return result;
+}
+
+// paired registers helpers (setters and getters)
+static inline void i8080_set_bc(i8080* const c, uint16_t val) {
+  c->b = val >> 8;
+  c->c = val & 0xFF;
+}
+
+static inline void i8080_set_de(i8080* const c, uint16_t val) {
+  c->d = val >> 8;
+  c->e = val & 0xFF;
+}
+
+static inline void i8080_set_hl(i8080* const c, uint16_t val) {
+  c->h = val >> 8;
+  c->l = val & 0xFF;
+}
+
+static inline uint16_t i8080_get_bc(i8080* const c) {
+  return (c->b << 8) | c->c;
+}
+
+static inline uint16_t i8080_get_de(i8080* const c) {
+  return (c->d << 8) | c->e;
+}
+
+static inline uint16_t i8080_get_hl(i8080* const c) {
+  return (c->h << 8) | c->l;
+}
+
+// stack helpers
+
+// pushes a value into the stack and updates the stack pointer
+static inline void i8080_push_stack(i8080* const c, uint16_t val) {
+  c->sp -= 2;
+  i8080_ww(c, c->sp, val);
+}
+
+// pops a value from the stack and updates the stack pointer
+static inline uint16_t i8080_pop_stack(i8080* const c) {
+  uint16_t val = i8080_rw(c, c->sp);
+  c->sp += 2;
+  return val;
+}
+
+// opcodes
+
+// returns the parity of byte: 0 if number of 1 bits in `val` is odd, else 1
+static inline bool parity(uint8_t val) {
+  uint8_t nb_one_bits = 0;
+  for (int i = 0; i < 8; i++) {
+    nb_one_bits += ((val >> i) & 1);
+  }
+
+  return (nb_one_bits & 1) == 0;
+}
+
+// returns if there was a carry between bit "bit_no" and "bit_no - 1" when
+// executing "a + b + cy"
+static inline bool carry(int bit_no, uint8_t a, uint8_t b, bool cy) {
+  int16_t result = a + b + cy;
+  int16_t carry = result ^ a ^ b;
+  return carry & (1 << bit_no);
+}
+
+// adds a value (+ an optional carry flag) to a register
+static inline void i8080_add(
+    i8080* const c, uint8_t* const reg, uint8_t val, bool cy) {
+  uint8_t result = *reg + val + cy;
+  c->cf = carry(8, *reg, val, cy);
+  c->hf = carry(4, *reg, val, cy);
+  SET_ZSP(c, result);
+  *reg = result;
+}
+
+// substracts a byte (+ an optional carry flag) from a register
+// see https://stackoverflow.com/a/8037485
+static inline void i8080_sub(
+    i8080* const c, uint8_t* const reg, uint8_t val, bool cy) {
+  i8080_add(c, reg, ~val, !cy);
+  c->cf = !c->cf;
+}
+
+// adds a word to HL
+static inline void i8080_dad(i8080* const c, uint16_t val) {
+  c->cf = ((i8080_get_hl(c) + val) >> 16) & 1;
+  i8080_set_hl(c, i8080_get_hl(c) + val);
+}
+
+// increments a byte
+static inline uint8_t i8080_inr(i8080* const c, uint8_t val) {
+  uint8_t result = val + 1;
+  c->hf = (result & 0xF) == 0;
+  SET_ZSP(c, result);
+  return result;
+}
+
+// decrements a byte
+static inline uint8_t i8080_dcr(i8080* const c, uint8_t val) {
+  uint8_t result = val - 1;
+  c->hf = !((result & 0xF) == 0xF);
+  SET_ZSP(c, result);
+  return result;
+}
+
+// executes a logic "and" between register A and a byte, then stores the
+// result in register A
+static inline void i8080_ana(i8080* const c, uint8_t val) {
+  uint8_t result = c->a & val;
+  c->cf = 0;
+  c->hf = ((c->a | val) & 0x08) != 0;
+  SET_ZSP(c, result);
+  c->a = result;
+}
+
+// executes a logic "xor" between register A and a byte, then stores the
+// result in register A
+static inline void i8080_xra(i8080* const c, uint8_t val) {
+  c->a ^= val;
+  c->cf = 0;
+  c->hf = 0;
+  SET_ZSP(c, c->a);
+}
+
+// executes a logic "or" between register A and a byte, then stores the
+// result in register A
+static inline void i8080_ora(i8080* const c, uint8_t val) {
+  c->a |= val;
+  c->cf = 0;
+  c->hf = 0;
+  SET_ZSP(c, c->a);
+}
+
+// compares the register A to another byte
+static inline void i8080_cmp(i8080* const c, uint8_t val) {
+  int16_t result = c->a - val;
+  c->cf = result >> 8;
+  c->hf = ~(c->a ^ result ^ val) & 0x10;
+  SET_ZSP(c, result & 0xFF);
+}
+
+// sets the program counter to a given address
+static inline void i8080_jmp(i8080* const c, uint16_t addr) {
+  c->pc = addr;
+}
+
+// jumps to next address pointed by the next word in memory if a condition
+// is met
+static inline void i8080_cond_jmp(i8080* const c, bool condition) {
+  uint16_t addr = i8080_next_word(c);
+  if (condition) {
+    c->pc = addr;
+  }
+}
+
+// pushes the current pc to the stack, then jumps to an address
+static inline void i8080_call(i8080* const c, uint16_t addr) {
+  i8080_push_stack(c, c->pc);
+  i8080_jmp(c, addr);
+}
+
+// calls to next word in memory if a condition is met
+static inline void i8080_cond_call(i8080* const c, bool condition) {
+  uint16_t addr = i8080_next_word(c);
+  if (condition) {
+    i8080_call(c, addr);
+    c->cyc += 6;
+  }
+}
+
+// returns from subroutine
+static inline void i8080_ret(i8080* const c) {
+  c->pc = i8080_pop_stack(c);
+}
+
+// returns from subroutine if a condition is met
+static inline void i8080_cond_ret(i8080* const c, bool condition) {
+  if (condition) {
+    i8080_ret(c);
+    c->cyc += 6;
+  }
+}
+
+// pushes register A and the flags into the stack
+static inline void i8080_push_psw(i8080* const c) {
+  // note: bit 3 and 5 are always 0
+  uint8_t psw = 0;
+  psw |= c->sf << 7;
+  psw |= c->zf << 6;
+  psw |= c->hf << 4;
+  psw |= c->pf << 2;
+  psw |= 1 << 1; // bit 1 is always 1
+  psw |= c->cf << 0;
+  i8080_push_stack(c, c->a << 8 | psw);
+}
+
+// pops register A and the flags from the stack
+static inline void i8080_pop_psw(i8080* const c) {
+  uint16_t af = i8080_pop_stack(c);
+  c->a = af >> 8;
+  uint8_t psw = af & 0xFF;
+
+  c->sf = (psw >> 7) & 1;
+  c->zf = (psw >> 6) & 1;
+  c->hf = (psw >> 4) & 1;
+  c->pf = (psw >> 2) & 1;
+  c->cf = (psw >> 0) & 1;
+}
+
+// rotate register A left
+static inline void i8080_rlc(i8080* const c) {
+  c->cf = c->a >> 7;
+  c->a = (c->a << 1) | c->cf;
+}
+
+// rotate register A right
+static inline void i8080_rrc(i8080* const c) {
+  c->cf = c->a & 1;
+  c->a = (c->a >> 1) | (c->cf << 7);
+}
+
+// rotate register A left with the carry flag
+static inline void i8080_ral(i8080* const c) {
+  bool cy = c->cf;
+  c->cf = c->a >> 7;
+  c->a = (c->a << 1) | cy;
+}
+
+// rotate register A right with the carry flag
+static inline void i8080_rar(i8080* const c) {
+  bool cy = c->cf;
+  c->cf = c->a & 1;
+  c->a = (c->a >> 1) | (cy << 7);
+}
+
+// Decimal Adjust Accumulator: the eight-bit number in register A is adjusted
+// to form two four-bit binary-coded-decimal digits.
+// For example, if A=$2B and DAA is executed, A becomes $31.
+static inline void i8080_daa(i8080* const c) {
+  bool cy = c->cf;
+  uint8_t correction = 0;
+
+  uint8_t lsb = c->a & 0x0F;
+  uint8_t msb = c->a >> 4;
+
+  if (c->hf || lsb > 9) {
+    correction += 0x06;
+  }
+
+  if (c->cf || msb > 9 || (msb >= 9 && lsb > 9)) {
+    correction += 0x60;
+    cy = 1;
+  }
+
+  i8080_add(c, &c->a, correction, 0);
+  c->cf = cy;
+}
+
+// switches the value of registers DE and HL
+static inline void i8080_xchg(i8080* const c) {
+  uint16_t de = i8080_get_de(c);
+  i8080_set_de(c, i8080_get_hl(c));
+  i8080_set_hl(c, de);
+}
+
+// switches the value of a word at (sp) and HL
+static inline void i8080_xthl(i8080* const c) {
+  uint16_t val = i8080_rw(c, c->sp);
+  i8080_ww(c, c->sp, i8080_get_hl(c));
+  i8080_set_hl(c, val);
+}
+
+extern void interrupt_808x(uint16_t addr);
+extern void retem_i8080(void);
+// executes one opcode
+static inline void i8080_execute(i8080* const c, uint8_t opcode) {
+  c->cyc += OPCODES_CYCLES[opcode];
+
+  // when DI is executed, interrupts won't be serviced
+  // until the end of next instruction:
+  if (c->interrupt_delay > 0) {
+    c->interrupt_delay -= 1;
+  }
+
+  switch (opcode) {
+  case 0x7F: c->a = c->a; break; // MOV A,A
+  case 0x78: c->a = c->b; break; // MOV A,B
+  case 0x79: c->a = c->c; break; // MOV A,C
+  case 0x7A: c->a = c->d; break; // MOV A,D
+  case 0x7B: c->a = c->e; break; // MOV A,E
+  case 0x7C: c->a = c->h; break; // MOV A,H
+  case 0x7D: c->a = c->l; break; // MOV A,L
+  case 0x7E: c->a = i8080_rb(c, i8080_get_hl(c)); break; // MOV A,M
+
+  case 0x0A: c->a = i8080_rb(c, i8080_get_bc(c)); break; // LDAX B
+  case 0x1A: c->a = i8080_rb(c, i8080_get_de(c)); break; // LDAX D
+  case 0x3A: c->a = i8080_rb(c, i8080_next_word(c)); break; // LDA word
+
+  case 0x47: c->b = c->a; break; // MOV B,A
+  case 0x40: c->b = c->b; break; // MOV B,B
+  case 0x41: c->b = c->c; break; // MOV B,C
+  case 0x42: c->b = c->d; break; // MOV B,D
+  case 0x43: c->b = c->e; break; // MOV B,E
+  case 0x44: c->b = c->h; break; // MOV B,H
+  case 0x45: c->b = c->l; break; // MOV B,L
+  case 0x46: c->b = i8080_rb(c, i8080_get_hl(c)); break; // MOV B,M
+
+  case 0x4F: c->c = c->a; break; // MOV C,A
+  case 0x48: c->c = c->b; break; // MOV C,B
+  case 0x49: c->c = c->c; break; // MOV C,C
+  case 0x4A: c->c = c->d; break; // MOV C,D
+  case 0x4B: c->c = c->e; break; // MOV C,E
+  case 0x4C: c->c = c->h; break; // MOV C,H
+  case 0x4D: c->c = c->l; break; // MOV C,L
+  case 0x4E: c->c = i8080_rb(c, i8080_get_hl(c)); break; // MOV C,M
+
+  case 0x57: c->d = c->a; break; // MOV D,A
+  case 0x50: c->d = c->b; break; // MOV D,B
+  case 0x51: c->d = c->c; break; // MOV D,C
+  case 0x52: c->d = c->d; break; // MOV D,D
+  case 0x53: c->d = c->e; break; // MOV D,E
+  case 0x54: c->d = c->h; break; // MOV D,H
+  case 0x55: c->d = c->l; break; // MOV D,L
+  case 0x56: c->d = i8080_rb(c, i8080_get_hl(c)); break; // MOV D,M
+
+  case 0x5F: c->e = c->a; break; // MOV E,A
+  case 0x58: c->e = c->b; break; // MOV E,B
+  case 0x59: c->e = c->c; break; // MOV E,C
+  case 0x5A: c->e = c->d; break; // MOV E,D
+  case 0x5B: c->e = c->e; break; // MOV E,E
+  case 0x5C: c->e = c->h; break; // MOV E,H
+  case 0x5D: c->e = c->l; break; // MOV E,L
+  case 0x5E: c->e = i8080_rb(c, i8080_get_hl(c)); break; // MOV E,M
+
+  case 0x67: c->h = c->a; break; // MOV H,A
+  case 0x60: c->h = c->b; break; // MOV H,B
+  case 0x61: c->h = c->c; break; // MOV H,C
+  case 0x62: c->h = c->d; break; // MOV H,D
+  case 0x63: c->h = c->e; break; // MOV H,E
+  case 0x64: c->h = c->h; break; // MOV H,H
+  case 0x65: c->h = c->l; break; // MOV H,L
+  case 0x66: c->h = i8080_rb(c, i8080_get_hl(c)); break; // MOV H,M
+
+  case 0x6F: c->l = c->a; break; // MOV L,A
+  case 0x68: c->l = c->b; break; // MOV L,B
+  case 0x69: c->l = c->c; break; // MOV L,C
+  case 0x6A: c->l = c->d; break; // MOV L,D
+  case 0x6B: c->l = c->e; break; // MOV L,E
+  case 0x6C: c->l = c->h; break; // MOV L,H
+  case 0x6D: c->l = c->l; break; // MOV L,L
+  case 0x6E: c->l = i8080_rb(c, i8080_get_hl(c)); break; // MOV L,M
+
+  case 0x77: i8080_wb(c, i8080_get_hl(c), c->a); break; // MOV M,A
+  case 0x70: i8080_wb(c, i8080_get_hl(c), c->b); break; // MOV M,B
+  case 0x71: i8080_wb(c, i8080_get_hl(c), c->c); break; // MOV M,C
+  case 0x72: i8080_wb(c, i8080_get_hl(c), c->d); break; // MOV M,D
+  case 0x73: i8080_wb(c, i8080_get_hl(c), c->e); break; // MOV M,E
+  case 0x74: i8080_wb(c, i8080_get_hl(c), c->h); break; // MOV M,H
+  case 0x75: i8080_wb(c, i8080_get_hl(c), c->l); break; // MOV M,L
+
+  case 0x3E: c->a = i8080_next_byte(c); break; // MVI A,byte
+  case 0x06: c->b = i8080_next_byte(c); break; // MVI B,byte
+  case 0x0E: c->c = i8080_next_byte(c); break; // MVI C,byte
+  case 0x16: c->d = i8080_next_byte(c); break; // MVI D,byte
+  case 0x1E: c->e = i8080_next_byte(c); break; // MVI E,byte
+  case 0x26: c->h = i8080_next_byte(c); break; // MVI H,byte
+  case 0x2E: c->l = i8080_next_byte(c); break; // MVI L,byte
+  case 0x36:
+    i8080_wb(c, i8080_get_hl(c), i8080_next_byte(c));
+    break; // MVI M,byte
+
+  case 0x02: i8080_wb(c, i8080_get_bc(c), c->a); break; // STAX B
+  case 0x12: i8080_wb(c, i8080_get_de(c), c->a); break; // STAX D
+  case 0x32: i8080_wb(c, i8080_next_word(c), c->a); break; // STA word
+
+  case 0x01: i8080_set_bc(c, i8080_next_word(c)); break; // LXI B,word
+  case 0x11: i8080_set_de(c, i8080_next_word(c)); break; // LXI D,word
+  case 0x21: i8080_set_hl(c, i8080_next_word(c)); break; // LXI H,word
+  case 0x31: c->sp = i8080_next_word(c); break; // LXI SP,word
+  case 0x2A: i8080_set_hl(c, i8080_rw(c, i8080_next_word(c))); break; // LHLD
+  case 0x22: i8080_ww(c, i8080_next_word(c), i8080_get_hl(c)); break; // SHLD
+  case 0xF9: c->sp = i8080_get_hl(c); break; // SPHL
+
+  case 0xEB: i8080_xchg(c); break; // XCHG
+  case 0xE3: i8080_xthl(c); break; // XTHL
+
+  case 0x87: i8080_add(c, &c->a, c->a, 0); break; // ADD A
+  case 0x80: i8080_add(c, &c->a, c->b, 0); break; // ADD B
+  case 0x81: i8080_add(c, &c->a, c->c, 0); break; // ADD C
+  case 0x82: i8080_add(c, &c->a, c->d, 0); break; // ADD D
+  case 0x83: i8080_add(c, &c->a, c->e, 0); break; // ADD E
+  case 0x84: i8080_add(c, &c->a, c->h, 0); break; // ADD H
+  case 0x85: i8080_add(c, &c->a, c->l, 0); break; // ADD L
+  case 0x86:
+    i8080_add(c, &c->a, i8080_rb(c, i8080_get_hl(c)), 0);
+    break; // ADD M
+  case 0xC6: i8080_add(c, &c->a, i8080_next_byte(c), 0); break; // ADI byte
+
+  case 0x8F: i8080_add(c, &c->a, c->a, c->cf); break; // ADC A
+  case 0x88: i8080_add(c, &c->a, c->b, c->cf); break; // ADC B
+  case 0x89: i8080_add(c, &c->a, c->c, c->cf); break; // ADC C
+  case 0x8A: i8080_add(c, &c->a, c->d, c->cf); break; // ADC D
+  case 0x8B: i8080_add(c, &c->a, c->e, c->cf); break; // ADC E
+  case 0x8C: i8080_add(c, &c->a, c->h, c->cf); break; // ADC H
+  case 0x8D: i8080_add(c, &c->a, c->l, c->cf); break; // ADC L
+  case 0x8E:
+    i8080_add(c, &c->a, i8080_rb(c, i8080_get_hl(c)), c->cf);
+    break; // ADC M
+  case 0xCE: i8080_add(c, &c->a, i8080_next_byte(c), c->cf); break; // ACI byte
+
+  case 0x97: i8080_sub(c, &c->a, c->a, 0); break; // SUB A
+  case 0x90: i8080_sub(c, &c->a, c->b, 0); break; // SUB B
+  case 0x91: i8080_sub(c, &c->a, c->c, 0); break; // SUB C
+  case 0x92: i8080_sub(c, &c->a, c->d, 0); break; // SUB D
+  case 0x93: i8080_sub(c, &c->a, c->e, 0); break; // SUB E
+  case 0x94: i8080_sub(c, &c->a, c->h, 0); break; // SUB H
+  case 0x95: i8080_sub(c, &c->a, c->l, 0); break; // SUB L
+  case 0x96:
+    i8080_sub(c, &c->a, i8080_rb(c, i8080_get_hl(c)), 0);
+    break; // SUB M
+  case 0xD6: i8080_sub(c, &c->a, i8080_next_byte(c), 0); break; // SUI byte
+
+  case 0x9F: i8080_sub(c, &c->a, c->a, c->cf); break; // SBB A
+  case 0x98: i8080_sub(c, &c->a, c->b, c->cf); break; // SBB B
+  case 0x99: i8080_sub(c, &c->a, c->c, c->cf); break; // SBB C
+  case 0x9A: i8080_sub(c, &c->a, c->d, c->cf); break; // SBB D
+  case 0x9B: i8080_sub(c, &c->a, c->e, c->cf); break; // SBB E
+  case 0x9C: i8080_sub(c, &c->a, c->h, c->cf); break; // SBB H
+  case 0x9D: i8080_sub(c, &c->a, c->l, c->cf); break; // SBB L
+  case 0x9E:
+    i8080_sub(c, &c->a, i8080_rb(c, i8080_get_hl(c)), c->cf);
+    break; // SBB M
+  case 0xDE: i8080_sub(c, &c->a, i8080_next_byte(c), c->cf); break; // SBI byte
+
+  case 0x09: i8080_dad(c, i8080_get_bc(c)); break; // DAD B
+  case 0x19: i8080_dad(c, i8080_get_de(c)); break; // DAD D
+  case 0x29: i8080_dad(c, i8080_get_hl(c)); break; // DAD H
+  case 0x39: i8080_dad(c, c->sp); break; // DAD SP
+
+  case 0xF3: c->iff = 0; break; // DI
+  case 0xFB:
+    c->iff = 1;
+    c->interrupt_delay = 1;
+    break; // EI
+  case 0x00: break; // NOP
+  case 0x76: c->halted = 1; break; // HLT
+
+  case 0x3C: c->a = i8080_inr(c, c->a); break; // INR A
+  case 0x04: c->b = i8080_inr(c, c->b); break; // INR B
+  case 0x0C: c->c = i8080_inr(c, c->c); break; // INR C
+  case 0x14: c->d = i8080_inr(c, c->d); break; // INR D
+  case 0x1C: c->e = i8080_inr(c, c->e); break; // INR E
+  case 0x24: c->h = i8080_inr(c, c->h); break; // INR H
+  case 0x2C: c->l = i8080_inr(c, c->l); break; // INR L
+  case 0x34:
+    i8080_wb(c, i8080_get_hl(c), i8080_inr(c, i8080_rb(c, i8080_get_hl(c))));
+    break; // INR M
+
+  case 0x3D: c->a = i8080_dcr(c, c->a); break; // DCR A
+  case 0x05: c->b = i8080_dcr(c, c->b); break; // DCR B
+  case 0x0D: c->c = i8080_dcr(c, c->c); break; // DCR C
+  case 0x15: c->d = i8080_dcr(c, c->d); break; // DCR D
+  case 0x1D: c->e = i8080_dcr(c, c->e); break; // DCR E
+  case 0x25: c->h = i8080_dcr(c, c->h); break; // DCR H
+  case 0x2D: c->l = i8080_dcr(c, c->l); break; // DCR L
+  case 0x35:
+    i8080_wb(c, i8080_get_hl(c), i8080_dcr(c, i8080_rb(c, i8080_get_hl(c))));
+    break; // DCR M
+
+  case 0x03: i8080_set_bc(c, i8080_get_bc(c) + 1); break; // INX B
+  case 0x13: i8080_set_de(c, i8080_get_de(c) + 1); break; // INX D
+  case 0x23: i8080_set_hl(c, i8080_get_hl(c) + 1); break; // INX H
+  case 0x33: c->sp += 1; break; // INX SP
+
+  case 0x0B: i8080_set_bc(c, i8080_get_bc(c) - 1); break; // DCX B
+  case 0x1B: i8080_set_de(c, i8080_get_de(c) - 1); break; // DCX D
+  case 0x2B: i8080_set_hl(c, i8080_get_hl(c) - 1); break; // DCX H
+  case 0x3B: c->sp -= 1; break; // DCX SP
+
+  case 0x27: i8080_daa(c); break; // DAA
+  case 0x2F: c->a = ~c->a; break; // CMA
+  case 0x37: c->cf = 1; break; // STC
+  case 0x3F: c->cf = !c->cf; break; // CMC
+
+  case 0x07: i8080_rlc(c); break; // RLC (rotate left)
+  case 0x0F: i8080_rrc(c); break; // RRC (rotate right)
+  case 0x17: i8080_ral(c); break; // RAL
+  case 0x1F: i8080_rar(c); break; // RAR
+
+  case 0xA7: i8080_ana(c, c->a); break; // ANA A
+  case 0xA0: i8080_ana(c, c->b); break; // ANA B
+  case 0xA1: i8080_ana(c, c->c); break; // ANA C
+  case 0xA2: i8080_ana(c, c->d); break; // ANA D
+  case 0xA3: i8080_ana(c, c->e); break; // ANA E
+  case 0xA4: i8080_ana(c, c->h); break; // ANA H
+  case 0xA5: i8080_ana(c, c->l); break; // ANA L
+  case 0xA6: i8080_ana(c, i8080_rb(c, i8080_get_hl(c))); break; // ANA M
+  case 0xE6: i8080_ana(c, i8080_next_byte(c)); break; // ANI byte
+
+  case 0xAF: i8080_xra(c, c->a); break; // XRA A
+  case 0xA8: i8080_xra(c, c->b); break; // XRA B
+  case 0xA9: i8080_xra(c, c->c); break; // XRA C
+  case 0xAA: i8080_xra(c, c->d); break; // XRA D
+  case 0xAB: i8080_xra(c, c->e); break; // XRA E
+  case 0xAC: i8080_xra(c, c->h); break; // XRA H
+  case 0xAD: i8080_xra(c, c->l); break; // XRA L
+  case 0xAE: i8080_xra(c, i8080_rb(c, i8080_get_hl(c))); break; // XRA M
+  case 0xEE: i8080_xra(c, i8080_next_byte(c)); break; // XRI byte
+
+  case 0xB7: i8080_ora(c, c->a); break; // ORA A
+  case 0xB0: i8080_ora(c, c->b); break; // ORA B
+  case 0xB1: i8080_ora(c, c->c); break; // ORA C
+  case 0xB2: i8080_ora(c, c->d); break; // ORA D
+  case 0xB3: i8080_ora(c, c->e); break; // ORA E
+  case 0xB4: i8080_ora(c, c->h); break; // ORA H
+  case 0xB5: i8080_ora(c, c->l); break; // ORA L
+  case 0xB6: i8080_ora(c, i8080_rb(c, i8080_get_hl(c))); break; // ORA M
+  case 0xF6: i8080_ora(c, i8080_next_byte(c)); break; // ORI byte
+
+  case 0xBF: i8080_cmp(c, c->a); break; // CMP A
+  case 0xB8: i8080_cmp(c, c->b); break; // CMP B
+  case 0xB9: i8080_cmp(c, c->c); break; // CMP C
+  case 0xBA: i8080_cmp(c, c->d); break; // CMP D
+  case 0xBB: i8080_cmp(c, c->e); break; // CMP E
+  case 0xBC: i8080_cmp(c, c->h); break; // CMP H
+  case 0xBD: i8080_cmp(c, c->l); break; // CMP L
+  case 0xBE: i8080_cmp(c, i8080_rb(c, i8080_get_hl(c))); break; // CMP M
+  case 0xFE: i8080_cmp(c, i8080_next_byte(c)); break; // CPI byte
+
+  case 0xC3: i8080_jmp(c, i8080_next_word(c)); break; // JMP
+  case 0xC2: i8080_cond_jmp(c, c->zf == 0); break; // JNZ
+  case 0xCA: i8080_cond_jmp(c, c->zf == 1); break; // JZ
+  case 0xD2: i8080_cond_jmp(c, c->cf == 0); break; // JNC
+  case 0xDA: i8080_cond_jmp(c, c->cf == 1); break; // JC
+  case 0xE2: i8080_cond_jmp(c, c->pf == 0); break; // JPO
+  case 0xEA: i8080_cond_jmp(c, c->pf == 1); break; // JPE
+  case 0xF2: i8080_cond_jmp(c, c->sf == 0); break; // JP
+  case 0xFA: i8080_cond_jmp(c, c->sf == 1); break; // JM
+
+  case 0xE9: c->pc = i8080_get_hl(c); break; // PCHL
+  case 0xCD: i8080_call(c, i8080_next_word(c)); break; // CALL
+
+  case 0xC4: i8080_cond_call(c, c->zf == 0); break; // CNZ
+  case 0xCC: i8080_cond_call(c, c->zf == 1); break; // CZ
+  case 0xD4: i8080_cond_call(c, c->cf == 0); break; // CNC
+  case 0xDC: i8080_cond_call(c, c->cf == 1); break; // CC
+  case 0xE4: i8080_cond_call(c, c->pf == 0); break; // CPO
+  case 0xEC: i8080_cond_call(c, c->pf == 1); break; // CPE
+  case 0xF4: i8080_cond_call(c, c->sf == 0); break; // CP
+  case 0xFC: i8080_cond_call(c, c->sf == 1); break; // CM
+
+  case 0xC9: i8080_ret(c); break; // RET
+  case 0xC0: i8080_cond_ret(c, c->zf == 0); break; // RNZ
+  case 0xC8: i8080_cond_ret(c, c->zf == 1); break; // RZ
+  case 0xD0: i8080_cond_ret(c, c->cf == 0); break; // RNC
+  case 0xD8: i8080_cond_ret(c, c->cf == 1); break; // RC
+  case 0xE0: i8080_cond_ret(c, c->pf == 0); break; // RPO
+  case 0xE8: i8080_cond_ret(c, c->pf == 1); break; // RPE
+  case 0xF0: i8080_cond_ret(c, c->sf == 0); break; // RP
+  case 0xF8: i8080_cond_ret(c, c->sf == 1); break; // RM
+
+  case 0xC7: i8080_call(c, 0x00); break; // RST 0
+  case 0xCF: i8080_call(c, 0x08); break; // RST 1
+  case 0xD7: i8080_call(c, 0x10); break; // RST 2
+  case 0xDF: i8080_call(c, 0x18); break; // RST 3
+  case 0xE7: i8080_call(c, 0x20); break; // RST 4
+  case 0xEF: i8080_call(c, 0x28); break; // RST 5
+  case 0xF7: i8080_call(c, 0x30); break; // RST 6
+  case 0xFF: i8080_call(c, 0x38); break; // RST 7
+
+  case 0xC5: i8080_push_stack(c, i8080_get_bc(c)); break; // PUSH B
+  case 0xD5: i8080_push_stack(c, i8080_get_de(c)); break; // PUSH D
+  case 0xE5: i8080_push_stack(c, i8080_get_hl(c)); break; // PUSH H
+  case 0xF5: i8080_push_psw(c); break; // PUSH PSW
+  case 0xC1: i8080_set_bc(c, i8080_pop_stack(c)); break; // POP B
+  case 0xD1: i8080_set_de(c, i8080_pop_stack(c)); break; // POP D
+  case 0xE1: i8080_set_hl(c, i8080_pop_stack(c)); break; // POP H
+  case 0xF1: i8080_pop_psw(c); break; // POP PSW
+
+  case 0xDB: c->a = c->port_in(c->userdata, i8080_next_byte(c)); break; // IN
+  case 0xD3: c->port_out(c->userdata, i8080_next_byte(c), c->a); break; // OUT
+
+  case 0x08:
+  case 0x10:
+  case 0x18:
+  case 0x20:
+  case 0x28:
+  case 0x30:
+  case 0x38: break; // undocumented NOPs
+
+  case 0xD9: i8080_ret(c); break; // undocumented RET
+
+  case 0xDD:
+  case 0xED:
+  {
+    if (opcode == 0xED) {
+        uint8_t data = i8080_next_byte(c);
+        if (data == 0xED) {
+          interrupt_808x(i8080_next_byte(c));
+          break;
+        } else if (data == 0xFD) {
+          retem_i8080();
+          break;
+        }
+        else {
+          i8080_call(c, (i8080_next_byte(c) << 8) | data); break;
+        }
+    }
+  }
+  case 0xFD: i8080_call(c, i8080_next_word(c)); break; // undocumented CALLs
+
+  case 0xCB: i8080_jmp(c, i8080_next_word(c)); break; // undocumented JMP
+  }
+}
+
+// initialises the emulator with default values
+void i8080_init(i8080* const c) {
+  c->read_byte = NULL;
+  c->write_byte = NULL;
+  c->port_in = NULL;
+  c->port_out = NULL;
+  c->userdata = NULL;
+
+  c->cyc = 0;
+
+  c->pc = 0;
+  c->sp = 0;
+
+  c->a = 0;
+  c->b = 0;
+  c->c = 0;
+  c->d = 0;
+  c->e = 0;
+  c->h = 0;
+  c->l = 0;
+
+  c->sf = 0;
+  c->zf = 0;
+  c->hf = 0;
+  c->pf = 0;
+  c->cf = 0;
+  c->iff = 0;
+
+  c->halted = 0;
+  c->interrupt_pending = 0;
+  c->interrupt_vector = 0;
+  c->interrupt_delay = 0;
+}
+
+// executes one instruction
+void i8080_step(i8080* const c) {
+  // interrupt processing: if an interrupt is pending and IFF is set,
+  // we execute the interrupt vector passed by the user.
+  if (c->interrupt_pending && c->iff && c->interrupt_delay == 0) {
+    c->interrupt_pending = 0;
+    c->iff = 0;
+    c->halted = 0;
+
+    i8080_execute(c, c->interrupt_vector);
+  } else if (!c->halted) {
+    i8080_execute(c, i8080_next_byte(c));
+  }
+}
+
+// asks for an interrupt to be serviced
+void i8080_interrupt(i8080* const c, uint8_t opcode) {
+  c->interrupt_pending = 1;
+  c->interrupt_vector = opcode;
+}
+
+// outputs a debug trace of the emulator state to the standard output,
+// including registers and flags
+void i8080_debug_output(i8080* const c, bool print_disassembly) {
+  uint8_t f = 0;
+  f |= c->sf << 7;
+  f |= c->zf << 6;
+  f |= c->hf << 4;
+  f |= c->pf << 2;
+  f |= 1 << 1; // bit 1 is always 1
+  f |= c->cf << 0;
+
+  printf("PC: %04X, AF: %04X, BC: %04X, DE: %04X, HL: %04X, SP: %04X, CYC: %lu",
+      c->pc, c->a << 8 | f, i8080_get_bc(c), i8080_get_de(c), i8080_get_hl(c),
+      c->sp, c->cyc);
+
+  printf("\t(%02X %02X %02X %02X)", i8080_rb(c, c->pc), i8080_rb(c, c->pc + 1),
+      i8080_rb(c, c->pc + 2), i8080_rb(c, c->pc + 3));
+
+  if (print_disassembly) {
+    printf(" - %s", DISASSEMBLE_TABLE[i8080_rb(c, c->pc)]);
+  }
+
+  printf("\n");
+}
+
+#undef SET_ZSP
diff --git a/src/cpu/i8080.h b/src/cpu/i8080.h
new file mode 100644
index 000000000..43406e43e
--- /dev/null
+++ b/src/cpu/i8080.h
@@ -0,0 +1,35 @@
+#ifndef I8080_I8080_H_
+#define I8080_I8080_H_
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+
+typedef struct i8080 {
+  // memory + io interface
+  uint8_t (*read_byte)(void*, uint16_t); // user function to read from memory
+  void (*write_byte)(void*, uint16_t, uint8_t); // same for writing to memory
+  uint8_t (*read_byte_seg)(void*, uint16_t); // user function to read from memory (Code segment)
+  uint8_t (*port_in)(void*, uint8_t); // user function to read from port
+  void (*port_out)(void*, uint8_t, uint8_t); // same for writing to port
+  void* userdata; // user custom pointer
+
+  unsigned long cyc; // cycle count
+
+  uint16_t pc, sp; // program counter, stack pointer
+  uint8_t a, b, c, d, e, h, l; // registers
+  // flags: sign, zero, half-carry, parity, carry, interrupt flip-flop
+  bool sf : 1, zf : 1, hf : 1, pf : 1, cf : 1, iff : 1;
+  bool halted : 1;
+
+  bool interrupt_pending : 1;
+  uint8_t interrupt_vector;
+  uint8_t interrupt_delay;
+} i8080;
+
+void i8080_init(i8080* const c);
+void i8080_step(i8080* const c);
+void i8080_interrupt(i8080* const c, uint8_t opcode);
+void i8080_debug_output(i8080* const c, bool print_disassembly);
+
+#endif // I8080_I8080_H_
diff --git a/src/cpu/softfloat/config.h b/src/cpu/softfloat/config.h
deleted file mode 100644
index 9e39c2d29..000000000
--- a/src/cpu/softfloat/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef EMU_SF_CONFIG_H
-#define EMU_SF_CONFIG_H
-
-#include <stdint.h>
-
-typedef int8_t flag;
-typedef uint8_t uint8;
-typedef int8_t int8;
-typedef uint16_t uint16;
-typedef int16_t int16;
-typedef uint32_t uint32;
-typedef int32_t int32;
-typedef uint64_t uint64;
-typedef int64_t int64;
-
-/*----------------------------------------------------------------------------
-| Each of the following `typedef's defines a type that holds integers
-| of _exactly_ the number of bits specified.  For instance, for most
-| implementation of C, `bits16' and `sbits16' should be `typedef'ed to
-| `unsigned short int' and `signed short int' (or `short int'), respectively.
-*----------------------------------------------------------------------------*/
-typedef uint8_t bits8;
-typedef int8_t sbits8;
-typedef uint16_t bits16;
-typedef int16_t sbits16;
-typedef uint32_t bits32;
-typedef int32_t sbits32;
-typedef uint64_t bits64;
-typedef int64_t sbits64;
-
-typedef uint8_t Bit8u;
-typedef int8_t Bit8s;
-typedef uint16_t Bit16u;
-typedef int16_t Bit16s;
-typedef uint32_t Bit32u;
-typedef int32_t Bit32s;
-typedef uint64_t Bit64u;
-typedef int64_t Bit64s;
-
-/*----------------------------------------------------------------------------
-| The `LIT64' macro takes as its argument a textual integer literal and
-| if necessary ``marks'' the literal as having a 64-bit integer type.
-| For example, the GNU C Compiler (`gcc') requires that 64-bit literals be
-| appended with the letters `LL' standing for `long long', which is `gcc's
-| name for the 64-bit integer type.  Some compilers may allow `LIT64' to be
-| defined as the identity macro:  `#define LIT64( a ) a'.
-*----------------------------------------------------------------------------*/
-#define BX_CONST64(a) a##LL
-#define BX_CPP_INLINE static __inline
-
-#endif /*EMU_SF_CONFIG_H*/
diff --git a/src/cpu/softfloat/softfloat-compare.h b/src/cpu/softfloat/softfloat-compare.h
deleted file mode 100644
index 8b9821460..000000000
--- a/src/cpu/softfloat/softfloat-compare.h
+++ /dev/null
@@ -1,496 +0,0 @@
-/*============================================================================
-This C header file is part of the SoftFloat IEC/IEEE Floating-point Arithmetic
-Package, Release 2b.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://www.cs.berkeley.edu/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has
-been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES
-RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS
-AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,
-COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE
-EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
-INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
-OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) the source code for the derivative work includes prominent notice that
-the work is derivative, and (2) the source code includes prominent notice with
-these four paragraphs for those parts of this code that are retained.
-=============================================================================*/
-
-/*============================================================================
- * Adapted for Bochs (x86 achitecture simulator) by
- *            Stanislav Shwartsman [sshwarts at sourceforge net]
- * ==========================================================================*/
-
-#ifndef _SOFTFLOAT_COMPARE_H_
-#define _SOFTFLOAT_COMPARE_H_
-
-#include "softfloat.h"
-
-// ======= float32 ======= //
-
-typedef int (*float32_compare_method)(float32, float32, struct float_status_t *status);
-
-// 0x00
-BX_CPP_INLINE int float32_eq_ordered_quiet(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_quiet(a, b, status);
-   return (relation == float_relation_equal);
-}
-
-// 0x01
-BX_CPP_INLINE int float32_lt_ordered_signalling(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_two(a, b, status);
-   return (relation == float_relation_less);
-}
-
-// 0x02
-BX_CPP_INLINE int float32_le_ordered_signalling(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_two(a, b, status);
-   return (relation == float_relation_less) || (relation == float_relation_equal);
-}
-
-// 0x03
-BX_CPP_INLINE int float32_unordered_quiet(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_quiet(a, b, status);
-   return (relation == float_relation_unordered);
-}
-
-// 0x04
-BX_CPP_INLINE int float32_neq_unordered_quiet(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_quiet(a, b, status);
-   return (relation != float_relation_equal);
-}
-
-// 0x05
-BX_CPP_INLINE int float32_nlt_unordered_signalling(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_two(a, b, status);
-   return (relation != float_relation_less);
-}
-
-// 0x06
-BX_CPP_INLINE int float32_nle_unordered_signalling(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_two(a, b, status);
-   return (relation != float_relation_less) && (relation != float_relation_equal);
-}
-
-// 0x07
-BX_CPP_INLINE int float32_ordered_quiet(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_quiet(a, b, status);
-   return (relation != float_relation_unordered);
-}
-
-// 0x08
-BX_CPP_INLINE int float32_eq_unordered_quiet(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_quiet(a, b, status);
-   return (relation == float_relation_equal) || (relation == float_relation_unordered);
-}
-
-// 0x09
-BX_CPP_INLINE int float32_nge_unordered_signalling(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_two(a, b, status);
-   return (relation == float_relation_less) || (relation == float_relation_unordered);
-}
-
-// 0x0a
-BX_CPP_INLINE int float32_ngt_unordered_signalling(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_two(a, b, status);
-   return (relation != float_relation_greater);
-}
-
-// 0x0b
-BX_CPP_INLINE int float32_false_quiet(float32 a, float32 b, struct float_status_t *status)
-{
-   float32_compare_quiet(a, b, status);
-   return 0;
-}
-
-// 0x0c
-BX_CPP_INLINE int float32_neq_ordered_quiet(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_quiet(a, b, status);
-   return (relation != float_relation_equal) && (relation != float_relation_unordered);
-}
-
-// 0x0d
-BX_CPP_INLINE int float32_ge_ordered_signalling(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_two(a, b, status);
-   return (relation == float_relation_greater) || (relation == float_relation_equal);
-}
-
-// 0x0e
-BX_CPP_INLINE int float32_gt_ordered_signalling(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_two(a, b, status);
-   return (relation == float_relation_greater);
-}
-
-// 0x0f
-BX_CPP_INLINE int float32_true_quiet(float32 a, float32 b, struct float_status_t *status)
-{
-   float32_compare_quiet(a, b, status);
-   return 1;
-}
-
-// 0x10
-BX_CPP_INLINE int float32_eq_ordered_signalling(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_two(a, b, status);
-   return (relation == float_relation_equal);
-}
-
-// 0x11
-BX_CPP_INLINE int float32_lt_ordered_quiet(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_quiet(a, b, status);
-   return (relation == float_relation_less);
-}
-
-// 0x12
-BX_CPP_INLINE int float32_le_ordered_quiet(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_quiet(a, b, status);
-   return (relation == float_relation_less) || (relation == float_relation_equal);
-}
-
-// 0x13
-BX_CPP_INLINE int float32_unordered_signalling(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_two(a, b, status);
-   return (relation == float_relation_unordered);
-}
-
-// 0x14
-BX_CPP_INLINE int float32_neq_unordered_signalling(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_two(a, b, status);
-   return (relation != float_relation_equal);
-}
-
-// 0x15
-BX_CPP_INLINE int float32_nlt_unordered_quiet(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_quiet(a, b, status);
-   return (relation != float_relation_less);
-}
-
-// 0x16
-BX_CPP_INLINE int float32_nle_unordered_quiet(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_quiet(a, b, status);
-   return (relation != float_relation_less) && (relation != float_relation_equal);
-}
-
-// 0x17
-BX_CPP_INLINE int float32_ordered_signalling(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_two(a, b, status);
-   return (relation != float_relation_unordered);
-}
-
-// 0x18
-BX_CPP_INLINE int float32_eq_unordered_signalling(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_two(a, b, status);
-   return (relation == float_relation_equal) || (relation == float_relation_unordered);
-}
-
-// 0x19
-BX_CPP_INLINE int float32_nge_unordered_quiet(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_quiet(a, b, status);
-   return (relation == float_relation_less) || (relation == float_relation_unordered);
-}
-
-// 0x1a
-BX_CPP_INLINE int float32_ngt_unordered_quiet(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_quiet(a, b, status);
-   return (relation != float_relation_greater);
-}
-
-// 0x1b
-BX_CPP_INLINE int float32_false_signalling(float32 a, float32 b, struct float_status_t *status)
-{
-   float32_compare_two(a, b, status);
-   return 0;
-}
-
-// 0x1c
-BX_CPP_INLINE int float32_neq_ordered_signalling(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_two(a, b, status);
-   return (relation != float_relation_equal) && (relation != float_relation_unordered);
-}
-
-// 0x1d
-BX_CPP_INLINE int float32_ge_ordered_quiet(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_quiet(a, b, status);
-   return (relation == float_relation_greater) || (relation == float_relation_equal);
-}
-
-// 0x1e
-BX_CPP_INLINE int float32_gt_ordered_quiet(float32 a, float32 b, struct float_status_t *status)
-{
-   int relation = float32_compare_quiet(a, b, status);
-   return (relation == float_relation_greater);
-}
-
-// 0x1f
-BX_CPP_INLINE int float32_true_signalling(float32 a, float32 b, struct float_status_t *status)
-{
-   float32_compare_two(a, b, status);
-   return 1;
-}
-
-// ======= float64 ======= //
-
-typedef int (*float64_compare_method)(float64, float64, struct float_status_t *status);
-
-// 0x00
-BX_CPP_INLINE int float64_eq_ordered_quiet(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_quiet(a, b, status);
-   return (relation == float_relation_equal);
-}
-
-// 0x01
-BX_CPP_INLINE int float64_lt_ordered_signalling(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_two(a, b, status);
-   return (relation == float_relation_less);
-}
-
-// 0x02
-BX_CPP_INLINE int float64_le_ordered_signalling(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_two(a, b, status);
-   return (relation == float_relation_less) || (relation == float_relation_equal);
-}
-
-// 0x03
-BX_CPP_INLINE int float64_unordered_quiet(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_quiet(a, b, status);
-   return (relation == float_relation_unordered);
-}
-
-// 0x04
-BX_CPP_INLINE int float64_neq_unordered_quiet(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_quiet(a, b, status);
-   return (relation != float_relation_equal);
-}
-
-// 0x05
-BX_CPP_INLINE int float64_nlt_unordered_signalling(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_two(a, b, status);
-   return (relation != float_relation_less);
-}
-
-// 0x06
-BX_CPP_INLINE int float64_nle_unordered_signalling(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_two(a, b, status);
-   return (relation != float_relation_less) && (relation != float_relation_equal);
-}
-
-// 0x07
-BX_CPP_INLINE int float64_ordered_quiet(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_quiet(a, b, status);
-   return (relation != float_relation_unordered);
-}
-
-// 0x08
-BX_CPP_INLINE int float64_eq_unordered_quiet(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_quiet(a, b, status);
-   return (relation == float_relation_equal) || (relation == float_relation_unordered);
-}
-
-// 0x09
-BX_CPP_INLINE int float64_nge_unordered_signalling(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_two(a, b, status);
-   return (relation == float_relation_less) || (relation == float_relation_unordered);
-}
-
-// 0x0a
-BX_CPP_INLINE int float64_ngt_unordered_signalling(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_two(a, b, status);
-   return (relation != float_relation_greater);
-}
-
-// 0x0b
-BX_CPP_INLINE int float64_false_quiet(float64 a, float64 b, struct float_status_t *status)
-{
-   float64_compare_quiet(a, b, status);
-   return 0;
-}
-
-// 0x0c
-BX_CPP_INLINE int float64_neq_ordered_quiet(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_quiet(a, b, status);
-   return (relation != float_relation_equal) && (relation != float_relation_unordered);
-}
-
-// 0x0d
-BX_CPP_INLINE int float64_ge_ordered_signalling(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_two(a, b, status);
-   return (relation == float_relation_greater) || (relation == float_relation_equal);
-}
-
-// 0x0e
-BX_CPP_INLINE int float64_gt_ordered_signalling(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_two(a, b, status);
-   return (relation == float_relation_greater);
-}
-
-// 0x0f
-BX_CPP_INLINE int float64_true_quiet(float64 a, float64 b, struct float_status_t *status)
-{
-   float64_compare_quiet(a, b, status);
-   return 1;
-}
-
-// 0x10
-BX_CPP_INLINE int float64_eq_ordered_signalling(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_two(a, b, status);
-   return (relation == float_relation_equal);
-}
-
-// 0x11
-BX_CPP_INLINE int float64_lt_ordered_quiet(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_quiet(a, b, status);
-   return (relation == float_relation_less);
-}
-
-// 0x12
-BX_CPP_INLINE int float64_le_ordered_quiet(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_quiet(a, b, status);
-   return (relation == float_relation_less) || (relation == float_relation_equal);
-}
-
-// 0x13
-BX_CPP_INLINE int float64_unordered_signalling(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_two(a, b, status);
-   return (relation == float_relation_unordered);
-}
-
-// 0x14
-BX_CPP_INLINE int float64_neq_unordered_signalling(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_two(a, b, status);
-   return (relation != float_relation_equal);
-}
-
-// 0x15
-BX_CPP_INLINE int float64_nlt_unordered_quiet(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_quiet(a, b, status);
-   return (relation != float_relation_less);
-}
-
-// 0x16
-BX_CPP_INLINE int float64_nle_unordered_quiet(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_quiet(a, b, status);
-   return (relation != float_relation_less) && (relation != float_relation_equal);
-}
-
-// 0x17
-BX_CPP_INLINE int float64_ordered_signalling(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_two(a, b, status);
-   return (relation != float_relation_unordered);
-}
-
-// 0x18
-BX_CPP_INLINE int float64_eq_unordered_signalling(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_two(a, b, status);
-   return (relation == float_relation_equal) || (relation == float_relation_unordered);
-}
-
-// 0x19
-BX_CPP_INLINE int float64_nge_unordered_quiet(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_quiet(a, b, status);
-   return (relation == float_relation_less) || (relation == float_relation_unordered);
-}
-
-// 0x1a
-BX_CPP_INLINE int float64_ngt_unordered_quiet(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_quiet(a, b, status);
-   return (relation != float_relation_greater);
-}
-
-// 0x1b
-BX_CPP_INLINE int float64_false_signalling(float64 a, float64 b, struct float_status_t *status)
-{
-   float64_compare_two(a, b, status);
-   return 0;
-}
-
-// 0x1c
-BX_CPP_INLINE int float64_neq_ordered_signalling(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_two(a, b, status);
-   return (relation != float_relation_equal) && (relation != float_relation_unordered);
-}
-
-// 0x1d
-BX_CPP_INLINE int float64_ge_ordered_quiet(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_quiet(a, b, status);
-   return (relation == float_relation_greater) || (relation == float_relation_equal);
-}
-
-// 0x1e
-BX_CPP_INLINE int float64_gt_ordered_quiet(float64 a, float64 b, struct float_status_t *status)
-{
-   int relation = float64_compare_quiet(a, b, status);
-   return (relation == float_relation_greater);
-}
-
-// 0x1f
-BX_CPP_INLINE int float64_true_signalling(float64 a, float64 b, struct float_status_t *status)
-{
-   float64_compare_two(a, b, status);
-   return 1;
-}
-
-#endif
diff --git a/src/cpu/softfloat/softfloat-macros.h b/src/cpu/softfloat/softfloat-macros.h
deleted file mode 100644
index cb867bf5d..000000000
--- a/src/cpu/softfloat/softfloat-macros.h
+++ /dev/null
@@ -1,686 +0,0 @@
-/*============================================================================
-This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2b.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://www.cs.berkeley.edu/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has
-been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES
-RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS
-AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,
-COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE
-EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
-INSTITUTE (possibly via similar legal notice) AGAINST ALL LOSSES, COSTS, OR
-OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) the source code for the derivative work includes prominent notice that
-the work is derivative, and (2) the source code includes prominent notice with
-these four paragraphs for those parts of this code that are retained.
-=============================================================================*/
-
-/*============================================================================
- * Adapted for Bochs (x86 achitecture simulator) by
- *            Stanislav Shwartsman [sshwarts at sourceforge net]
- * ==========================================================================*/
-
-#ifndef _SOFTFLOAT_MACROS_H_
-#define _SOFTFLOAT_MACROS_H_
-
-/*----------------------------------------------------------------------------
-| Shifts `a' right by the number of bits given in `count'.  If any nonzero
-| bits are shifted off, they are ``jammed'' into the least significant bit of
-| the result by setting the least significant bit to 1.  The value of `count'
-| can be arbitrarily large; in particular, if `count' is greater than 16, the
-| result will be either 0 or 1, depending on whether `a' is zero or nonzero.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE Bit16u shift16RightJamming(Bit16u a, int count)
-{
-    Bit16u z;
-
-    if (count == 0) {
-        z = a;
-    }
-    else if (count < 16) {
-        z = (a>>count) | ((a<<((-count) & 15)) != 0);
-    }
-    else {
-        z = (a != 0);
-    }
-
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Shifts `a' right by the number of bits given in `count'.  If any nonzero
-| bits are shifted off, they are ``jammed'' into the least significant bit of
-| the result by setting the least significant bit to 1.  The value of `count'
-| can be arbitrarily large; in particular, if `count' is greater than 32, the
-| result will be either 0 or 1, depending on whether `a' is zero or nonzero.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE Bit32u shift32RightJamming(Bit32u a, int count)
-{
-    Bit32u z;
-
-    if (count == 0) {
-        z = a;
-    }
-    else if (count < 32) {
-        z = (a>>count) | ((a<<((-count) & 31)) != 0);
-    }
-    else {
-        z = (a != 0);
-    }
-
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Shifts `a' right by the number of bits given in `count'.  If any nonzero
-| bits are shifted off, they are ``jammed'' into the least significant bit of
-| the result by setting the least significant bit to 1.  The value of `count'
-| can be arbitrarily large; in particular, if `count' is greater than 64, the
-| result will be either 0 or 1, depending on whether `a' is zero or nonzero.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE Bit64u shift64RightJamming(Bit64u a, int count)
-{
-    Bit64u z;
-
-    if (count == 0) {
-        z = a;
-    }
-    else if (count < 64) {
-        z = (a>>count) | ((a << ((-count) & 63)) != 0);
-    }
-    else {
-        z = (a != 0);
-    }
-
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Shifts the 128-bit value formed by concatenating `a0' and `a1' right by 64
-| _plus_ the number of bits given in `count'.  The shifted result is at most
-| 64 nonzero bits; this is stored at the location pointed to by `z0Ptr'.  The
-| bits shifted off form a second 64-bit result as follows:  The _last_ bit
-| shifted off is the most-significant bit of the extra result, and the other
-| 63 bits of the extra result are all zero if and only if _all_but_the_last_
-| bits shifted off were all zero.  This extra result is stored in the location
-| pointed to by `z1Ptr'.  The value of `count' can be arbitrarily large.
-|     (This routine makes more sense if `a0' and `a1' are considered to form
-| a fixed-point value with binary point between `a0' and `a1'.  This fixed-
-| point value is shifted right by the number of bits given in `count', and
-| the integer part of the result is returned at the location pointed to by
-| `z0Ptr'.  The fractional part of the result may be slightly corrupted as
-| described above, and is returned at the location pointed to by `z1Ptr'.)
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE void shift64ExtraRightJamming(Bit64u a0, Bit64u a1, int count, Bit64u *z0Ptr, Bit64u *z1Ptr)
-{
-    Bit64u z0, z1;
-    int negCount = (-count) & 63;
-
-    if (count == 0) {
-        z1 = a1;
-        z0 = a0;
-    }
-    else if (count < 64) {
-        z1 = (a0<<negCount) | (a1 != 0);
-        z0 = a0>>count;
-    }
-    else {
-        if (count == 64) {
-            z1 = a0 | (a1 != 0);
-        }
-        else {
-            z1 = ((a0 | a1) != 0);
-        }
-        z0 = 0;
-    }
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-}
-
-/*----------------------------------------------------------------------------
-| Adds the 128-bit value formed by concatenating `a0' and `a1' to the 128-bit
-| value formed by concatenating `b0' and `b1'.  Addition is modulo 2^128, so
-| any carry out is lost.  The result is broken into two 64-bit pieces which
-| are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE void add128(Bit64u a0, Bit64u a1, Bit64u b0, Bit64u b1, Bit64u *z0Ptr, Bit64u *z1Ptr)
-{
-    Bit64u z1 = a1 + b1;
-    *z1Ptr = z1;
-    *z0Ptr = a0 + b0 + (z1 < a1);
-}
-
-/*----------------------------------------------------------------------------
-| Subtracts the 128-bit value formed by concatenating `b0' and `b1' from the
-| 128-bit value formed by concatenating `a0' and `a1'.  Subtraction is modulo
-| 2^128, so any borrow out (carry out) is lost.  The result is broken into two
-| 64-bit pieces which are stored at the locations pointed to by `z0Ptr' and
-| `z1Ptr'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE void
- sub128(Bit64u a0, Bit64u a1, Bit64u b0, Bit64u b1, Bit64u *z0Ptr, Bit64u *z1Ptr)
-{
-    *z1Ptr = a1 - b1;
-    *z0Ptr = a0 - b0 - (a1 < b1);
-}
-
-/*----------------------------------------------------------------------------
-| Multiplies `a' by `b' to obtain a 128-bit product.  The product is broken
-| into two 64-bit pieces which are stored at the locations pointed to by
-| `z0Ptr' and `z1Ptr'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE void mul64To128(Bit64u a, Bit64u b, Bit64u *z0Ptr, Bit64u *z1Ptr)
-{
-    Bit32u aHigh, aLow, bHigh, bLow;
-    Bit64u z0, zMiddleA, zMiddleB, z1;
-
-    aLow = (Bit32u) a;
-    aHigh = (Bit32u)(a>>32);
-    bLow = (Bit32u) b;
-    bHigh = (Bit32u)(b>>32);
-    z1 = ((Bit64u) aLow) * bLow;
-    zMiddleA = ((Bit64u) aLow) * bHigh;
-    zMiddleB = ((Bit64u) aHigh) * bLow;
-    z0 = ((Bit64u) aHigh) * bHigh;
-    zMiddleA += zMiddleB;
-    z0 += (((Bit64u) (zMiddleA < zMiddleB))<<32) + (zMiddleA>>32);
-    zMiddleA <<= 32;
-    z1 += zMiddleA;
-    z0 += (z1 < zMiddleA);
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-}
-
-/*----------------------------------------------------------------------------
-| Returns an approximation to the 64-bit integer quotient obtained by dividing
-| `b' into the 128-bit value formed by concatenating `a0' and `a1'.  The
-| divisor `b' must be at least 2^63.  If q is the exact quotient truncated
-| toward zero, the approximation returned lies between q and q + 2 inclusive.
-| If the exact quotient q is larger than 64 bits, the maximum positive 64-bit
-| unsigned integer is returned.
-*----------------------------------------------------------------------------*/
-
-#ifdef USE_estimateDiv128To64
-static Bit64u estimateDiv128To64(Bit64u a0, Bit64u a1, Bit64u b)
-{
-    Bit64u b0, b1;
-    Bit64u rem0, rem1, term0, term1;
-    Bit64u z;
-
-    if (b <= a0) return BX_CONST64(0xFFFFFFFFFFFFFFFF);
-    b0 = b>>32;
-    z = (b0<<32 <= a0) ? BX_CONST64(0xFFFFFFFF00000000) : (a0 / b0)<<32;
-    mul64To128(b, z, &term0, &term1);
-    sub128(a0, a1, term0, term1, &rem0, &rem1);
-    while (((Bit64s) rem0) < 0) {
-        z -= BX_CONST64(0x100000000);
-        b1 = b<<32;
-        add128(rem0, rem1, b0, b1, &rem0, &rem1);
-    }
-    rem0 = (rem0<<32) | (rem1>>32);
-    z |= (b0<<32 <= rem0) ? 0xFFFFFFFF : rem0 / b0;
-    return z;
-}
-#endif
-
-/*----------------------------------------------------------------------------
-| Returns an approximation to the square root of the 32-bit significand given
-| by `a'.  Considered as an integer, `a' must be at least 2^31.  If bit 0 of
-| `aExp' (the least significant bit) is 1, the integer returned approximates
-| 2^31*sqrt(`a'/2^31), where `a' is considered an integer.  If bit 0 of `aExp'
-| is 0, the integer returned approximates 2^31*sqrt(`a'/2^30).  In either
-| case, the approximation returned lies strictly within +/-2 of the exact
-| value.
-*----------------------------------------------------------------------------*/
-
-#ifdef USE_estimateSqrt32
-static Bit32u estimateSqrt32(Bit16s aExp, Bit32u a)
-{
-    static const Bit16u sqrtOddAdjustments[] = {
-        0x0004, 0x0022, 0x005D, 0x00B1, 0x011D, 0x019F, 0x0236, 0x02E0,
-        0x039C, 0x0468, 0x0545, 0x0631, 0x072B, 0x0832, 0x0946, 0x0A67
-    };
-    static const Bit16u sqrtEvenAdjustments[] = {
-        0x0A2D, 0x08AF, 0x075A, 0x0629, 0x051A, 0x0429, 0x0356, 0x029E,
-        0x0200, 0x0179, 0x0109, 0x00AF, 0x0068, 0x0034, 0x0012, 0x0002
-    };
-    Bit32u z;
-
-    int index = (a>>27) & 15;
-    if (aExp & 1) {
-        z = 0x4000 + (a>>17) - sqrtOddAdjustments[index];
-        z = ((a / z)<<14) + (z<<15);
-        a >>= 1;
-    }
-    else {
-        z = 0x8000 + (a>>17) - sqrtEvenAdjustments[index];
-        z = a / z + z;
-        z = (0x20000 <= z) ? 0xFFFF8000 : (z<<15);
-        if (z <= a) return (Bit32u) (((Bit32s) a)>>1);
-    }
-    return ((Bit32u) ((((Bit64u) a)<<31) / z)) + (z>>1);
-}
-#endif
-
-static const int countLeadingZeros8[] = {
-  8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
-  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-#ifdef FLOAT16
-
-/*----------------------------------------------------------------------------
-| Returns the number of leading 0 bits before the most-significant 1 bit of
-| `a'.  If `a' is zero, 16 is returned.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int countLeadingZeros16(Bit16u a)
-{
-    int shiftCount = 0;
-    if (a < 0x100) {
-        shiftCount += 8;
-        a <<= 8;
-    }
-    shiftCount += countLeadingZeros8[a>>8];
-    return shiftCount;
-}
-
-#endif
-
-/*----------------------------------------------------------------------------
-| Returns the number of leading 0 bits before the most-significant 1 bit of
-| `a'.  If `a' is zero, 32 is returned.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int countLeadingZeros32(Bit32u a)
-{
-    int shiftCount = 0;
-    if (a < 0x10000) {
-        shiftCount += 16;
-        a <<= 16;
-    }
-    if (a < 0x1000000) {
-        shiftCount += 8;
-        a <<= 8;
-    }
-    shiftCount += countLeadingZeros8[a>>24];
-    return shiftCount;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the number of leading 0 bits before the most-significant 1 bit of
-| `a'.  If `a' is zero, 64 is returned.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int countLeadingZeros64(Bit64u a)
-{
-    int shiftCount = 0;
-    if (a < BX_CONST64(0x100000000)) {
-        shiftCount += 32;
-    }
-    else {
-        a >>= 32;
-    }
-    shiftCount += countLeadingZeros32((Bit32u)(a));
-    return shiftCount;
-}
-
-#ifdef FLOATX80
-
-/*----------------------------------------------------------------------------
-| Shifts the 128-bit value formed by concatenating `a0' and `a1' right by the
-| number of bits given in `count'.  Any bits shifted off are lost.  The value
-| of `count' can be arbitrarily large; in particular, if `count' is greater
-| than 128, the result will be 0.  The result is broken into two 64-bit pieces
-| which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE void shift128Right(Bit64u a0, Bit64u a1, int count, Bit64u *z0Ptr, Bit64u *z1Ptr)
-{
-    Bit64u z0, z1;
-    int negCount = (-count) & 63;
-
-    if (count == 0) {
-        z1 = a1;
-        z0 = a0;
-    }
-    else if (count < 64) {
-        z1 = (a0<<negCount) | (a1>>count);
-        z0 = a0>>count;
-    }
-    else {
-        z1 = (count < 128) ? (a0>>(count & 63)) : 0;
-        z0 = 0;
-    }
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-}
-
-/*----------------------------------------------------------------------------
-| Shifts the 128-bit value formed by concatenating `a0' and `a1' right by the
-| number of bits given in `count'.  If any nonzero bits are shifted off, they
-| are ``jammed'' into the least significant bit of the result by setting the
-| least significant bit to 1.  The value of `count' can be arbitrarily large;
-| in particular, if `count' is greater than 128, the result will be either
-| 0 or 1, depending on whether the concatenation of `a0' and `a1' is zero or
-| nonzero.  The result is broken into two 64-bit pieces which are stored at
-| the locations pointed to by `z0Ptr' and `z1Ptr'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE void shift128RightJamming(Bit64u a0, Bit64u a1, int count, Bit64u *z0Ptr, Bit64u *z1Ptr)
-{
-    Bit64u z0, z1;
-    int negCount = (-count) & 63;
-
-    if (count == 0) {
-        z1 = a1;
-        z0 = a0;
-    }
-    else if (count < 64) {
-        z1 = (a0<<negCount) | (a1>>count) | ((a1<<negCount) != 0);
-        z0 = a0>>count;
-    }
-    else {
-        if (count == 64) {
-            z1 = a0 | (a1 != 0);
-        }
-        else if (count < 128) {
-            z1 = (a0>>(count & 63)) | (((a0<<negCount) | a1) != 0);
-        }
-        else {
-            z1 = ((a0 | a1) != 0);
-        }
-        z0 = 0;
-    }
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-}
-
-/*----------------------------------------------------------------------------
-| Shifts the 128-bit value formed by concatenating `a0' and `a1' left by the
-| number of bits given in `count'.  Any bits shifted off are lost.  The value
-| of `count' must be less than 64.  The result is broken into two 64-bit
-| pieces which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE void shortShift128Left(Bit64u a0, Bit64u a1, int count, Bit64u *z0Ptr, Bit64u *z1Ptr)
-{
-    *z1Ptr = a1<<count;
-    *z0Ptr = (count == 0) ? a0 : (a0<<count) | (a1>>((-count) & 63));
-}
-
-/*----------------------------------------------------------------------------
-| Adds the 192-bit value formed by concatenating `a0', `a1', and `a2' to the
-| 192-bit value formed by concatenating `b0', `b1', and `b2'.  Addition is
-| modulo 2^192, so any carry out is lost.  The result is broken into three
-| 64-bit pieces which are stored at the locations pointed to by `z0Ptr',
-| `z1Ptr', and `z2Ptr'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE void add192(
-     Bit64u a0,
-     Bit64u a1,
-     Bit64u a2,
-     Bit64u b0,
-     Bit64u b1,
-     Bit64u b2,
-     Bit64u *z0Ptr,
-     Bit64u *z1Ptr,
-     Bit64u *z2Ptr
-)
-{
-    Bit64u z0, z1, z2;
-    unsigned carry0, carry1;
-
-    z2 = a2 + b2;
-    carry1 = (z2 < a2);
-    z1 = a1 + b1;
-    carry0 = (z1 < a1);
-    z0 = a0 + b0;
-    z1 += carry1;
-    z0 += (z1 < carry1);
-    z0 += carry0;
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-}
-
-/*----------------------------------------------------------------------------
-| Subtracts the 192-bit value formed by concatenating `b0', `b1', and `b2'
-| from the 192-bit value formed by concatenating `a0', `a1', and `a2'.
-| Subtraction is modulo 2^192, so any borrow out (carry out) is lost.  The
-| result is broken into three 64-bit pieces which are stored at the locations
-| pointed to by `z0Ptr', `z1Ptr', and `z2Ptr'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE void sub192(
-     Bit64u a0,
-     Bit64u a1,
-     Bit64u a2,
-     Bit64u b0,
-     Bit64u b1,
-     Bit64u b2,
-     Bit64u *z0Ptr,
-     Bit64u *z1Ptr,
-     Bit64u *z2Ptr
-)
-{
-    Bit64u z0, z1, z2;
-    unsigned borrow0, borrow1;
-
-    z2 = a2 - b2;
-    borrow1 = (a2 < b2);
-    z1 = a1 - b1;
-    borrow0 = (a1 < b1);
-    z0 = a0 - b0;
-    z0 -= (z1 < borrow1);
-    z1 -= borrow1;
-    z0 -= borrow0;
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-}
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the 128-bit value formed by concatenating `a0' and `a1'
-| is equal to the 128-bit value formed by concatenating `b0' and `b1'.
-| Otherwise, returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int eq128(Bit64u a0, Bit64u a1, Bit64u b0, Bit64u b1)
-{
-    return (a0 == b0) && (a1 == b1);
-}
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the 128-bit value formed by concatenating `a0' and `a1' is less
-| than or equal to the 128-bit value formed by concatenating `b0' and `b1'.
-| Otherwise, returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int le128(Bit64u a0, Bit64u a1, Bit64u b0, Bit64u b1)
-{
-    return (a0 < b0) || ((a0 == b0) && (a1 <= b1));
-}
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the 128-bit value formed by concatenating `a0' and `a1' is less
-| than the 128-bit value formed by concatenating `b0' and `b1'.  Otherwise,
-| returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int lt128(Bit64u a0, Bit64u a1, Bit64u b0, Bit64u b1)
-{
-    return (a0 < b0) || ((a0 == b0) && (a1 < b1));
-}
-
-#endif	/* FLOATX80 */
-
-/*----------------------------------------------------------------------------
-| Multiplies the 128-bit value formed by concatenating `a0' and `a1' by
-| `b' to obtain a 192-bit product.  The product is broken into three 64-bit
-| pieces which are stored at the locations pointed to by `z0Ptr', `z1Ptr', and
-| `z2Ptr'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE void mul128By64To192(
-     Bit64u a0,
-     Bit64u a1,
-     Bit64u b,
-     Bit64u *z0Ptr,
-     Bit64u *z1Ptr,
-     Bit64u *z2Ptr
-)
-{
-    Bit64u z0, z1, z2, more1;
-
-    mul64To128(a1, b, &z1, &z2);
-    mul64To128(a0, b, &z0, &more1);
-    add128(z0, more1, 0, z1, &z0, &z1);
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-}
-
-#ifdef FLOAT128
-
-/*----------------------------------------------------------------------------
-| Multiplies the 128-bit value formed by concatenating `a0' and `a1' to the
-| 128-bit value formed by concatenating `b0' and `b1' to obtain a 256-bit
-| product.  The product is broken into four 64-bit pieces which are stored at
-| the locations pointed to by `z0Ptr', `z1Ptr', `z2Ptr', and `z3Ptr'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE void mul128To256(
-     Bit64u a0,
-     Bit64u a1,
-     Bit64u b0,
-     Bit64u b1,
-     Bit64u *z0Ptr,
-     Bit64u *z1Ptr,
-     Bit64u *z2Ptr,
-     Bit64u *z3Ptr
-)
-{
-    Bit64u z0, z1, z2, z3;
-    Bit64u more1, more2;
-
-    mul64To128(a1, b1, &z2, &z3);
-    mul64To128(a1, b0, &z1, &more2);
-    add128(z1, more2, 0, z2, &z1, &z2);
-    mul64To128(a0, b0, &z0, &more1);
-    add128(z0, more1, 0, z1, &z0, &z1);
-    mul64To128(a0, b1, &more1, &more2);
-    add128(more1, more2, 0, z2, &more1, &z2);
-    add128(z0, z1, 0, more1, &z0, &z1);
-    *z3Ptr = z3;
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-}
-
-
-/*----------------------------------------------------------------------------
-| Shifts the 192-bit value formed by concatenating `a0', `a1', and `a2' right
-| by 64 _plus_ the number of bits given in `count'.  The shifted result is
-| at most 128 nonzero bits; these are broken into two 64-bit pieces which are
-| stored at the locations pointed to by `z0Ptr' and `z1Ptr'.  The bits shifted
-| off form a third 64-bit result as follows:  The _last_ bit shifted off is
-| the most-significant bit of the extra result, and the other 63 bits of the
-| extra result are all zero if and only if _all_but_the_last_ bits shifted off
-| were all zero.  This extra result is stored in the location pointed to by
-| `z2Ptr'.  The value of `count' can be arbitrarily large.
-|     (This routine makes more sense if `a0', `a1', and `a2' are considered
-| to form a fixed-point value with binary point between `a1' and `a2'.  This
-| fixed-point value is shifted right by the number of bits given in `count',
-| and the integer part of the result is returned at the locations pointed to
-| by `z0Ptr' and `z1Ptr'.  The fractional part of the result may be slightly
-| corrupted as described above, and is returned at the location pointed to by
-| `z2Ptr'.)
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE void shift128ExtraRightJamming(
-     Bit64u a0,
-     Bit64u a1,
-     Bit64u a2,
-     int count,
-     Bit64u *z0Ptr,
-     Bit64u *z1Ptr,
-     Bit64u *z2Ptr
-)
-{
-    Bit64u z0, z1, z2;
-    int negCount = (-count) & 63;
-
-    if (count == 0) {
-        z2 = a2;
-        z1 = a1;
-        z0 = a0;
-    }
-    else {
-        if (count < 64) {
-            z2 = a1<<negCount;
-            z1 = (a0<<negCount) | (a1>>count);
-            z0 = a0>>count;
-        }
-        else {
-            if (count == 64) {
-                z2 = a1;
-                z1 = a0;
-            }
-            else {
-                a2 |= a1;
-                if (count < 128) {
-                    z2 = a0<<negCount;
-                    z1 = a0>>(count & 63);
-                }
-                else {
-                    z2 = (count == 128) ? a0 : (a0 != 0);
-                    z1 = 0;
-                }
-            }
-            z0 = 0;
-        }
-        z2 |= (a2 != 0);
-    }
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-}
-
-#endif  /* FLOAT128 */
-
-#endif
diff --git a/src/cpu/softfloat/softfloat-muladd.cc b/src/cpu/softfloat/softfloat-muladd.cc
deleted file mode 100644
index 7c9fec70e..000000000
--- a/src/cpu/softfloat/softfloat-muladd.cc
+++ /dev/null
@@ -1,558 +0,0 @@
-/*============================================================================
-This C source file is part of the SoftFloat IEC/IEEE Floating-point Arithmetic
-Package, Release 2b.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://www.cs.berkeley.edu/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has
-been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES
-RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS
-AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,
-COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE
-EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
-INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
-OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) the source code for the derivative work includes prominent notice that
-the work is derivative, and (2) the source code includes prominent notice with
-these four paragraphs for those parts of this code that are retained.
-=============================================================================*/
-
-/*============================================================================
- * This code is based on QEMU patch by Peter Maydell
- * Adapted for Bochs (x86 achitecture simulator) by
- *            Stanislav Shwartsman [sshwarts at sourceforge net]
- * ==========================================================================*/
-
-#include "softfloat.h"
-#include "softfloat-round-pack.h"
-
-/*----------------------------------------------------------------------------
-| Primitive arithmetic functions, including multi-word arithmetic, and
-| division and square root approximations. (Can be specialized to target
-| if desired).
-*----------------------------------------------------------------------------*/
-#include "softfloat-macros.h"
-
-/*----------------------------------------------------------------------------
-| Functions and definitions to determine:  (1) whether tininess for underflow
-| is detected before or after rounding by default, (2) what (if anything)
-| happens when exceptions are raised, (3) how signaling NaNs are distinguished
-| from quiet NaNs, (4) the default generated quiet NaNs, and (5) how NaNs
-| are propagated from function inputs to output.  These details are target-
-| specific.
-*----------------------------------------------------------------------------*/
-#include "softfloat-specialize.h"
-
-/*----------------------------------------------------------------------------
-| Takes three single-precision floating-point values `a', `b' and `c', one of
-| which is a NaN, and returns the appropriate NaN result.  If any of  `a',
-| `b' or `c' is a signaling NaN, the invalid exception is raised.
-| The input infzero indicates whether a*b was 0*inf or inf*0 (in which case
-| obviously c is a NaN, and whether to propagate c or some other NaN is
-| implementation defined).
-*----------------------------------------------------------------------------*/
-
-static float32 propagateFloat32MulAddNaN(float32 a, float32 b, float32 c, struct float_status_t *status)
-{
-    int aIsNaN = float32_is_nan(a);
-    int bIsNaN = float32_is_nan(b);
-
-    int aIsSignalingNaN = float32_is_signaling_nan(a);
-    int bIsSignalingNaN = float32_is_signaling_nan(b);
-    int cIsSignalingNaN = float32_is_signaling_nan(c);
-
-    a |= 0x00400000;
-    b |= 0x00400000;
-    c |= 0x00400000;
-
-    if (aIsSignalingNaN | bIsSignalingNaN | cIsSignalingNaN)
-        float_raise(status, float_flag_invalid);
-
-    //  operate according to float_first_operand_nan mode
-    if (aIsSignalingNaN | aIsNaN) {
-        return a;
-    }
-    else {
-        return (bIsSignalingNaN | bIsNaN) ? b : c;
-    }
-}
-
-/*----------------------------------------------------------------------------
-| Takes three double-precision floating-point values `a', `b' and `c', one of
-| which is a NaN, and returns the appropriate NaN result.  If any of  `a',
-| `b' or `c' is a signaling NaN, the invalid exception is raised.
-| The input infzero indicates whether a*b was 0*inf or inf*0 (in which case
-| obviously c is a NaN, and whether to propagate c or some other NaN is
-| implementation defined).
-*----------------------------------------------------------------------------*/
-
-static float64 propagateFloat64MulAddNaN(float64 a, float64 b, float64 c, struct float_status_t *status)
-{
-    int aIsNaN = float64_is_nan(a);
-    int bIsNaN = float64_is_nan(b);
-
-    int aIsSignalingNaN = float64_is_signaling_nan(a);
-    int bIsSignalingNaN = float64_is_signaling_nan(b);
-    int cIsSignalingNaN = float64_is_signaling_nan(c);
-
-    a |= BX_CONST64(0x0008000000000000);
-    b |= BX_CONST64(0x0008000000000000);
-    c |= BX_CONST64(0x0008000000000000);
-
-    if (aIsSignalingNaN | bIsSignalingNaN | cIsSignalingNaN)
-        float_raise(status, float_flag_invalid);
-
-    //  operate according to float_first_operand_nan mode
-    if (aIsSignalingNaN | aIsNaN) {
-        return a;
-    }
-    else {
-        return (bIsSignalingNaN | bIsNaN) ? b : c;
-    }
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of multiplying the single-precision floating-point values
-| `a' and `b' then adding 'c', with no intermediate rounding step after the
-| multiplication.  The operation is performed according to the IEC/IEEE
-| Standard for Binary Floating-Point Arithmetic 754-2008.
-| The flags argument allows the caller to select negation of the
-| addend, the intermediate product, or the final result. (The difference
-| between this and having the caller do a separate negation is that negating
-| externally will flip the sign bit on NaNs.)
-*----------------------------------------------------------------------------*/
-
-float32 float32_muladd(float32 a, float32 b, float32 c, int flags, struct float_status_t *status)
-{
-    int aSign, bSign, cSign, zSign;
-    Bit16s aExp, bExp, cExp, pExp, zExp;
-    Bit32u aSig, bSig, cSig;
-    int pInf, pZero, pSign;
-    Bit64u pSig64, cSig64, zSig64;
-    Bit32u pSig;
-    int shiftcount;
-
-    aSig = extractFloat32Frac(a);
-    aExp = extractFloat32Exp(a);
-    aSign = extractFloat32Sign(a);
-    bSig = extractFloat32Frac(b);
-    bExp = extractFloat32Exp(b);
-    bSign = extractFloat32Sign(b);
-    cSig = extractFloat32Frac(c);
-    cExp = extractFloat32Exp(c);
-    cSign = extractFloat32Sign(c);
-
-    /* It is implementation-defined whether the cases of (0,inf,qnan)
-     * and (inf,0,qnan) raise InvalidOperation or not (and what QNaN
-     * they return if they do), so we have to hand this information
-     * off to the target-specific pick-a-NaN routine.
-     */
-    if (((aExp == 0xff) && aSig) ||
-        ((bExp == 0xff) && bSig) ||
-        ((cExp == 0xff) && cSig)) {
-        return propagateFloat32MulAddNaN(a, b, c, status);
-    }
-
-    if (get_denormals_are_zeros(status)) {
-        if (aExp == 0) aSig = 0;
-        if (bExp == 0) bSig = 0;
-        if (cExp == 0) cSig = 0;
-    }
-
-    int infzero = ((aExp == 0 && aSig == 0 && bExp == 0xff && bSig == 0) ||
-                   (aExp == 0xff && aSig == 0 && bExp == 0 && bSig == 0));
-
-    if (infzero) {
-        float_raise(status, float_flag_invalid);
-        return float32_default_nan;
-    }
-
-    if (flags & float_muladd_negate_c) {
-        cSign ^= 1;
-    }
-
-    /* Work out the sign and type of the product */
-    pSign = aSign ^ bSign;
-    if (flags & float_muladd_negate_product) {
-        pSign ^= 1;
-    }
-    pInf = (aExp == 0xff) || (bExp == 0xff);
-    pZero = ((aExp | aSig) == 0) || ((bExp | bSig) == 0);
-
-    if (cExp == 0xff) {
-        if (pInf && (pSign ^ cSign)) {
-            /* addition of opposite-signed infinities => InvalidOperation */
-            float_raise(status, float_flag_invalid);
-            return float32_default_nan;
-        }
-        /* Otherwise generate an infinity of the same sign */
-        if ((aSig && aExp == 0) || (bSig && bExp == 0)) {
-            float_raise(status, float_flag_denormal);
-        }
-        return packFloat32(cSign, 0xff, 0);
-    }
-
-    if (pInf) {
-        if ((aSig && aExp == 0) || (bSig && bExp == 0) || (cSig && cExp == 0)) {
-            float_raise(status, float_flag_denormal);
-        }
-        return packFloat32(pSign, 0xff, 0);
-    }
-
-    if (pZero) {
-        if (cExp == 0) {
-            if (cSig == 0) {
-                /* Adding two exact zeroes */
-                if (pSign == cSign) {
-                    zSign = pSign;
-                } else if (get_float_rounding_mode(status) == float_round_down) {
-                    zSign = 1;
-                } else {
-                    zSign = 0;
-                }
-                return packFloat32(zSign, 0, 0);
-            }
-            /* Exact zero plus a denormal */
-            float_raise(status, float_flag_denormal);
-            if (get_flush_underflow_to_zero(status)) {
-                float_raise(status, float_flag_underflow | float_flag_inexact);
-                return packFloat32(cSign, 0, 0);
-            }
-        }
-        /* Zero plus something non-zero */
-        return packFloat32(cSign, cExp, cSig);
-    }
-
-    if (aExp == 0) {
-        float_raise(status, float_flag_denormal);
-        normalizeFloat32Subnormal(aSig, &aExp, &aSig);
-    }
-    if (bExp == 0) {
-        float_raise(status, float_flag_denormal);
-        normalizeFloat32Subnormal(bSig, &bExp, &bSig);
-    }
-
-    /* Calculate the actual result a * b + c */
-
-    /* Multiply first; this is easy. */
-    /* NB: we subtract 0x7e where float32_mul() subtracts 0x7f
-     * because we want the true exponent, not the "one-less-than"
-     * flavour that roundAndPackFloat32() takes.
-     */
-    pExp = aExp + bExp - 0x7e;
-    aSig = (aSig | 0x00800000) << 7;
-    bSig = (bSig | 0x00800000) << 8;
-    pSig64 = (Bit64u)aSig * bSig;
-    if ((Bit64s)(pSig64 << 1) >= 0) {
-        pSig64 <<= 1;
-        pExp--;
-    }
-
-    zSign = pSign;
-
-    /* Now pSig64 is the significand of the multiply, with the explicit bit in
-     * position 62.
-     */
-    if (cExp == 0) {
-        if (!cSig) {
-            /* Throw out the special case of c being an exact zero now */
-            pSig = (Bit32u) shift64RightJamming(pSig64, 32);
-            return roundAndPackFloat32(zSign, pExp - 1, pSig, status);
-        }
-        float_raise(status, float_flag_denormal);
-        normalizeFloat32Subnormal(cSig, &cExp, &cSig);
-    }
-
-    cSig64 = (Bit64u)cSig << 39;
-    cSig64 |= BX_CONST64(0x4000000000000000);
-    int expDiff = pExp - cExp;
-
-    if (pSign == cSign) {
-        /* Addition */
-        if (expDiff > 0) {
-            /* scale c to match p */
-            cSig64 = shift64RightJamming(cSig64, expDiff);
-            zExp = pExp;
-        } else if (expDiff < 0) {
-            /* scale p to match c */
-            pSig64 = shift64RightJamming(pSig64, -expDiff);
-            zExp = cExp;
-        } else {
-            /* no scaling needed */
-            zExp = cExp;
-        }
-        /* Add significands and make sure explicit bit ends up in posn 62 */
-        zSig64 = pSig64 + cSig64;
-        if ((Bit64s)zSig64 < 0) {
-            zSig64 = shift64RightJamming(zSig64, 1);
-        } else {
-            zExp--;
-        }
-        zSig64 = shift64RightJamming(zSig64, 32);
-        return roundAndPackFloat32(zSign, zExp, zSig64, status);
-    } else {
-        /* Subtraction */
-        if (expDiff > 0) {
-            cSig64 = shift64RightJamming(cSig64, expDiff);
-            zSig64 = pSig64 - cSig64;
-            zExp = pExp;
-        } else if (expDiff < 0) {
-            pSig64 = shift64RightJamming(pSig64, -expDiff);
-            zSig64 = cSig64 - pSig64;
-            zExp = cExp;
-            zSign ^= 1;
-        } else {
-            zExp = pExp;
-            if (cSig64 < pSig64) {
-                zSig64 = pSig64 - cSig64;
-            } else if (pSig64 < cSig64) {
-                zSig64 = cSig64 - pSig64;
-                zSign ^= 1;
-            } else {
-                /* Exact zero */
-                return packFloat32(get_float_rounding_mode(status) == float_round_down, 0, 0);
-            }
-        }
-        --zExp;
-        /* Do the equivalent of normalizeRoundAndPackFloat32() but
-         * starting with the significand in a Bit64u.
-         */
-        shiftcount = countLeadingZeros64(zSig64) - 1;
-        zSig64 <<= shiftcount;
-        zExp -= shiftcount;
-        zSig64 = shift64RightJamming(zSig64, 32);
-        return roundAndPackFloat32(zSign, zExp, zSig64, status);
-    }
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of multiplying the double-precision floating-point values
-| `a' and `b' then adding 'c', with no intermediate rounding step after the
-| multiplication.  The operation is performed according to the IEC/IEEE
-| Standard for Binary Floating-Point Arithmetic 754-2008.
-| The flags argument allows the caller to select negation of the
-| addend, the intermediate product, or the final result. (The difference
-| between this and having the caller do a separate negation is that negating
-| externally will flip the sign bit on NaNs.)
-*----------------------------------------------------------------------------*/
-
-float64 float64_muladd(float64 a, float64 b, float64 c, int flags, struct float_status_t *status)
-{
-    int aSign, bSign, cSign, zSign;
-    Bit16s aExp, bExp, cExp, pExp, zExp;
-    Bit64u aSig, bSig, cSig;
-    int pInf, pZero, pSign;
-    Bit64u pSig0, pSig1, cSig0, cSig1, zSig0, zSig1;
-    int shiftcount;
-
-    aSig = extractFloat64Frac(a);
-    aExp = extractFloat64Exp(a);
-    aSign = extractFloat64Sign(a);
-    bSig = extractFloat64Frac(b);
-    bExp = extractFloat64Exp(b);
-    bSign = extractFloat64Sign(b);
-    cSig = extractFloat64Frac(c);
-    cExp = extractFloat64Exp(c);
-    cSign = extractFloat64Sign(c);
-
-    /* It is implementation-defined whether the cases of (0,inf,qnan)
-     * and (inf,0,qnan) raise InvalidOperation or not (and what QNaN
-     * they return if they do), so we have to hand this information
-     * off to the target-specific pick-a-NaN routine.
-     */
-    if (((aExp == 0x7ff) && aSig) ||
-        ((bExp == 0x7ff) && bSig) ||
-        ((cExp == 0x7ff) && cSig)) {
-        return propagateFloat64MulAddNaN(a, b, c, status);
-    }
-
-    if (get_denormals_are_zeros(status)) {
-        if (aExp == 0) aSig = 0;
-        if (bExp == 0) bSig = 0;
-        if (cExp == 0) cSig = 0;
-    }
-
-    int infzero = ((aExp == 0 && aSig == 0 && bExp == 0x7ff && bSig == 0) ||
-                   (aExp == 0x7ff && aSig == 0 && bExp == 0 && bSig == 0));
-
-    if (infzero) {
-        float_raise(status, float_flag_invalid);
-        return float64_default_nan;
-    }
-
-    if (flags & float_muladd_negate_c) {
-        cSign ^= 1;
-    }
-
-    /* Work out the sign and type of the product */
-    pSign = aSign ^ bSign;
-    if (flags & float_muladd_negate_product) {
-        pSign ^= 1;
-    }
-    pInf = (aExp == 0x7ff) || (bExp == 0x7ff);
-    pZero = ((aExp | aSig) == 0) || ((bExp | bSig) == 0);
-
-    if (cExp == 0x7ff) {
-        if (pInf && (pSign ^ cSign)) {
-            /* addition of opposite-signed infinities => InvalidOperation */
-            float_raise(status, float_flag_invalid);
-            return float64_default_nan;
-        }
-        /* Otherwise generate an infinity of the same sign */
-        if ((aSig && aExp == 0) || (bSig && bExp == 0)) {
-            float_raise(status, float_flag_denormal);
-        }
-        return packFloat64(cSign, 0x7ff, 0);
-    }
-
-    if (pInf) {
-        if ((aSig && aExp == 0) || (bSig && bExp == 0) || (cSig && cExp == 0)) {
-            float_raise(status, float_flag_denormal);
-        }
-        return packFloat64(pSign, 0x7ff, 0);
-    }
-
-    if (pZero) {
-        if (cExp == 0) {
-            if (cSig == 0) {
-                /* Adding two exact zeroes */
-                if (pSign == cSign) {
-                    zSign = pSign;
-                } else if (get_float_rounding_mode(status) == float_round_down) {
-                    zSign = 1;
-                } else {
-                    zSign = 0;
-                }
-                return packFloat64(zSign, 0, 0);
-            }
-            /* Exact zero plus a denormal */
-            float_raise(status, float_flag_denormal);
-            if (get_flush_underflow_to_zero(status)) {
-                float_raise(status, float_flag_underflow | float_flag_inexact);
-                return packFloat64(cSign, 0, 0);
-            }
-        }
-        /* Zero plus something non-zero */
-        return packFloat64(cSign, cExp, cSig);
-    }
-
-    if (aExp == 0) {
-        float_raise(status, float_flag_denormal);
-        normalizeFloat64Subnormal(aSig, &aExp, &aSig);
-    }
-    if (bExp == 0) {
-        float_raise(status, float_flag_denormal);
-        normalizeFloat64Subnormal(bSig, &bExp, &bSig);
-    }
-
-    /* Calculate the actual result a * b + c */
-
-    /* Multiply first; this is easy. */
-    /* NB: we subtract 0x3fe where float64_mul() subtracts 0x3ff
-     * because we want the true exponent, not the "one-less-than"
-     * flavour that roundAndPackFloat64() takes.
-     */
-    pExp = aExp + bExp - 0x3fe;
-    aSig = (aSig | BX_CONST64(0x0010000000000000))<<10;
-    bSig = (bSig | BX_CONST64(0x0010000000000000))<<11;
-    mul64To128(aSig, bSig, &pSig0, &pSig1);
-    if ((Bit64s)(pSig0 << 1) >= 0) {
-        shortShift128Left(pSig0, pSig1, 1, &pSig0, &pSig1);
-        pExp--;
-    }
-
-    zSign = pSign;
-
-    /* Now [pSig0:pSig1] is the significand of the multiply, with the explicit
-     * bit in position 126.
-     */
-    if (cExp == 0) {
-        if (!cSig) {
-            /* Throw out the special case of c being an exact zero now */
-            shift128RightJamming(pSig0, pSig1, 64, &pSig0, &pSig1);
-            return roundAndPackFloat64(zSign, pExp - 1, pSig1, status);
-        }
-        float_raise(status, float_flag_denormal);
-        normalizeFloat64Subnormal(cSig, &cExp, &cSig);
-    }
-
-    cSig0 = cSig << 10;
-    cSig1 = 0;
-    cSig0 |= BX_CONST64(0x4000000000000000);
-    int expDiff = pExp - cExp;
-
-    if (pSign == cSign) {
-        /* Addition */
-        if (expDiff > 0) {
-            /* scale c to match p */
-            shift128RightJamming(cSig0, cSig1, expDiff, &cSig0, &cSig1);
-            zExp = pExp;
-        } else if (expDiff < 0) {
-            /* scale p to match c */
-            shift128RightJamming(pSig0, pSig1, -expDiff, &pSig0, &pSig1);
-            zExp = cExp;
-        } else {
-            /* no scaling needed */
-            zExp = cExp;
-        }
-        /* Add significands and make sure explicit bit ends up in posn 126 */
-        add128(pSig0, pSig1, cSig0, cSig1, &zSig0, &zSig1);
-        if ((Bit64s)zSig0 < 0) {
-            shift128RightJamming(zSig0, zSig1, 1, &zSig0, &zSig1);
-        } else {
-            zExp--;
-        }
-        shift128RightJamming(zSig0, zSig1, 64, &zSig0, &zSig1);
-        return roundAndPackFloat64(zSign, zExp, zSig1, status);
-    } else {
-        /* Subtraction */
-        if (expDiff > 0) {
-            shift128RightJamming(cSig0, cSig1, expDiff, &cSig0, &cSig1);
-            sub128(pSig0, pSig1, cSig0, cSig1, &zSig0, &zSig1);
-            zExp = pExp;
-        } else if (expDiff < 0) {
-            shift128RightJamming(pSig0, pSig1, -expDiff, &pSig0, &pSig1);
-            sub128(cSig0, cSig1, pSig0, pSig1, &zSig0, &zSig1);
-            zExp = cExp;
-            zSign ^= 1;
-        } else {
-            zExp = pExp;
-            if (lt128(cSig0, cSig1, pSig0, pSig1)) {
-                sub128(pSig0, pSig1, cSig0, cSig1, &zSig0, &zSig1);
-            } else if (lt128(pSig0, pSig1, cSig0, cSig1)) {
-                sub128(cSig0, cSig1, pSig0, pSig1, &zSig0, &zSig1);
-                zSign ^= 1;
-            } else {
-                /* Exact zero */
-                return packFloat64(get_float_rounding_mode(status) == float_round_down, 0, 0);
-            }
-        }
-        --zExp;
-        /* Do the equivalent of normalizeRoundAndPackFloat64() but
-         * starting with the significand in a pair of Bit64u.
-         */
-        if (zSig0) {
-            shiftcount = countLeadingZeros64(zSig0) - 1;
-            shortShift128Left(zSig0, zSig1, shiftcount, &zSig0, &zSig1);
-            if (zSig1) {
-                zSig0 |= 1;
-            }
-            zExp -= shiftcount;
-        } else {
-            shiftcount = countLeadingZeros64(zSig1) - 1;
-            zSig0 = zSig1 << shiftcount;
-            zExp -= (shiftcount + 64);
-        }
-        return roundAndPackFloat64(zSign, zExp, zSig0, status);
-    }
-}
diff --git a/src/cpu/softfloat/softfloat-round-pack.cc b/src/cpu/softfloat/softfloat-round-pack.cc
deleted file mode 100644
index 2b3965840..000000000
--- a/src/cpu/softfloat/softfloat-round-pack.cc
+++ /dev/null
@@ -1,896 +0,0 @@
-/*============================================================================
-This C source file is part of the SoftFloat IEC/IEEE Floating-point Arithmetic
-Package, Release 2b.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://www.cs.berkeley.edu/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has
-been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES
-RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS
-AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,
-COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE
-EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
-INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
-OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) the source code for the derivative work includes prominent notice that
-the work is derivative, and (2) the source code includes prominent notice with
-these four paragraphs for those parts of this code that are retained.
-=============================================================================*/
-
-#define FLOAT128
-
-/*============================================================================
- * Adapted for Bochs (x86 achitecture simulator) by
- *            Stanislav Shwartsman [sshwarts at sourceforge net]
- * ==========================================================================*/
-
-#include "softfloat.h"
-#include "softfloat-round-pack.h"
-
-/*----------------------------------------------------------------------------
-| Primitive arithmetic functions, including multi-word arithmetic, and
-| division and square root approximations. (Can be specialized to target
-| if desired).
-*----------------------------------------------------------------------------*/
-#include "softfloat-macros.h"
-
-/*----------------------------------------------------------------------------
-| Functions and definitions to determine:  (1) whether tininess for underflow
-| is detected before or after rounding by default, (2) what (if anything)
-| happens when exceptions are raised, (3) how signaling NaNs are distinguished
-| from quiet NaNs, (4) the default generated quiet NaNs, and (5) how NaNs
-| are propagated from function inputs to output.  These details are target-
-| specific.
-*----------------------------------------------------------------------------*/
-#include "softfloat-specialize.h"
-
-/*----------------------------------------------------------------------------
-| Takes a 64-bit fixed-point value `absZ' with binary point between bits 6
-| and 7, and returns the properly rounded 32-bit integer corresponding to the
-| input.  If `zSign' is 1, the input is negated before being converted to an
-| integer.  Bit 63 of `absZ' must be zero.  Ordinarily, the fixed-point input
-| is simply rounded to an integer, with the inexact exception raised if the
-| input cannot be represented exactly as an integer.  However, if the fixed-
-| point input is too large, the invalid exception is raised and the integer
-| indefinite value is returned.
-*----------------------------------------------------------------------------*/
-
-Bit32s roundAndPackInt32(int zSign, Bit64u exactAbsZ, struct float_status_t *status)
-{
-    int roundingMode = get_float_rounding_mode(status);
-    int roundNearestEven = (roundingMode == float_round_nearest_even);
-    int roundIncrement = 0x40;
-    if (! roundNearestEven) {
-        if (roundingMode == float_round_to_zero) roundIncrement = 0;
-        else {
-            roundIncrement = 0x7F;
-            if (zSign) {
-                if (roundingMode == float_round_up) roundIncrement = 0;
-            }
-            else {
-                if (roundingMode == float_round_down) roundIncrement = 0;
-            }
-        }
-    }
-    int roundBits = (int)(exactAbsZ & 0x7F);
-    Bit64u absZ = (exactAbsZ + roundIncrement)>>7;
-    absZ &= ~(((roundBits ^ 0x40) == 0) & roundNearestEven);
-    Bit32s z = (Bit32s) absZ;
-    if (zSign) z = -z;
-    if ((absZ>>32) || (z && ((z < 0) ^ zSign))) {
-        float_raise(status, float_flag_invalid);
-        return (Bit32s)(int32_indefinite);
-    }
-    if (roundBits) {
-        float_raise(status, float_flag_inexact);
-        if ((absZ << 7) > exactAbsZ)
-            set_float_rounding_up(status);
-    }
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Takes the 128-bit fixed-point value formed by concatenating `absZ0' and
-| `absZ1', with binary point between bits 63 and 64 (between the input words),
-| and returns the properly rounded 64-bit integer corresponding to the input.
-| If `zSign' is 1, the input is negated before being converted to an integer.
-| Ordinarily, the fixed-point input is simply rounded to an integer, with
-| the inexact exception raised if the input cannot be represented exactly as
-| an integer.  However, if the fixed-point input is too large, the invalid
-| exception is raised and the integer indefinite value is returned.
-*----------------------------------------------------------------------------*/
-
-Bit64s roundAndPackInt64(int zSign, Bit64u absZ0, Bit64u absZ1, struct float_status_t *status)
-{
-    Bit64s z;
-    int roundingMode = get_float_rounding_mode(status);
-    int roundNearestEven = (roundingMode == float_round_nearest_even);
-    int increment = ((Bit64s) absZ1 < 0);
-    if (! roundNearestEven) {
-        if (roundingMode == float_round_to_zero) increment = 0;
-        else {
-            if (zSign) {
-                increment = (roundingMode == float_round_down) && absZ1;
-            }
-            else {
-                increment = (roundingMode == float_round_up) && absZ1;
-            }
-        }
-    }
-    Bit64u exactAbsZ0 = absZ0;
-    if (increment) {
-        ++absZ0;
-        if (absZ0 == 0) goto overflow;
-        absZ0 &= ~(((Bit64u) (absZ1<<1) == 0) & roundNearestEven);
-    }
-    z = absZ0;
-    if (zSign) z = -z;
-    if (z && ((z < 0) ^ zSign)) {
- overflow:
-        float_raise(status, float_flag_invalid);
-        return (Bit64s)(int64_indefinite);
-    }
-    if (absZ1) {
-        float_raise(status, float_flag_inexact);
-        if (absZ0 > exactAbsZ0)
-            set_float_rounding_up(status);
-    }
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Takes the 128-bit fixed-point value formed by concatenating `absZ0' and
-| `absZ1', with binary point between bits 63 and 64 (between the input words),
-| and returns the properly rounded 64-bit unsigned integer corresponding to the
-| input.  Ordinarily, the fixed-point input is simply rounded to an integer,
-| with the inexact exception raised if the input cannot be represented exactly
-| as an integer. However, if the fixed-point input is too large, the invalid
-| exception is raised and the largest unsigned integer is returned.
-*----------------------------------------------------------------------------*/
-
-Bit64u roundAndPackUint64(int zSign, Bit64u absZ0, Bit64u absZ1, struct float_status_t *status)
-{
-    int roundingMode = get_float_rounding_mode(status);
-    int roundNearestEven = (roundingMode == float_round_nearest_even);
-    int increment = ((Bit64s) absZ1 < 0);
-    if (!roundNearestEven) {
-        if (roundingMode == float_round_to_zero) {
-            increment = 0;
-        } else if (absZ1) {
-            if (zSign) {
-                increment = (roundingMode == float_round_down) && absZ1;
-            } else {
-                increment = (roundingMode == float_round_up) && absZ1;
-            }
-        }
-    }
-    if (increment) {
-        ++absZ0;
-        if (absZ0 == 0) {
-            float_raise(status, float_flag_invalid);
-            return uint64_indefinite;
-        }
-        absZ0 &= ~(((Bit64u) (absZ1<<1) == 0) & roundNearestEven);
-    }
-
-    if (zSign && absZ0) {
-        float_raise(status, float_flag_invalid);
-        return uint64_indefinite;
-    }
-
-    if (absZ1) {
-        float_raise(status, float_flag_inexact);
-    }
-    return absZ0;
-}
-
-#ifdef FLOAT16
-
-/*----------------------------------------------------------------------------
-| Normalizes the subnormal half-precision floating-point value represented
-| by the denormalized significand `aSig'.  The normalized exponent and
-| significand are stored at the locations pointed to by `zExpPtr' and
-| `zSigPtr', respectively.
-*----------------------------------------------------------------------------*/
-
-void normalizeFloat16Subnormal(Bit16u aSig, Bit16s *zExpPtr, Bit16u *zSigPtr)
-{
-    int shiftCount = countLeadingZeros16(aSig) - 5;
-    *zSigPtr = aSig<<shiftCount;
-    *zExpPtr = 1 - shiftCount;
-}
-
-/*----------------------------------------------------------------------------
-| Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-| and significand `zSig', and returns the proper half-precision floating-
-| point value corresponding to the abstract input.  Ordinarily, the abstract
-| value is simply rounded and packed into the half-precision format, with
-| the inexact exception raised if the abstract input cannot be represented
-| exactly.  However, if the abstract value is too large, the overflow and
-| inexact exceptions are raised and an infinity or maximal finite value is
-| returned.  If the abstract value is too small, the input value is rounded to
-| a subnormal number, and the underflow and inexact exceptions are raised if
-| the abstract input cannot be represented exactly as a subnormal single-
-| precision floating-point number.
-|     The input significand `zSig' has its binary point between bits 14
-| and 13, which is 4 bits to the left of the usual location.  This shifted
-| significand must be normalized or smaller.  If `zSig' is not normalized,
-| `zExp' must be 0; in that case, the result returned is a subnormal number,
-| and it must not require rounding.  In the usual case that `zSig' is
-| normalized, `zExp' must be 1 less than the ``true'' floating-point exponent.
-| The handling of underflow and overflow follows the IEC/IEEE Standard for
-| Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float16 roundAndPackFloat16(int zSign, Bit16s zExp, Bit16u zSig, struct float_status_t *status)
-{
-    Bit16s roundIncrement, roundBits, roundMask;
-
-    int roundingMode = get_float_rounding_mode(status);
-    int roundNearestEven = (roundingMode == float_round_nearest_even);
-    roundIncrement = 8;
-    roundMask = 0xF;
-
-    if (! roundNearestEven) {
-        if (roundingMode == float_round_to_zero) roundIncrement = 0;
-        else {
-            roundIncrement = roundMask;
-            if (zSign) {
-                if (roundingMode == float_round_up) roundIncrement = 0;
-            }
-            else {
-                if (roundingMode == float_round_down) roundIncrement = 0;
-            }
-        }
-    }
-    roundBits = zSig & roundMask;
-    if (0x1D <= (Bit16u) zExp) {
-        if ((0x1D < zExp)
-             || ((zExp == 0x1D) && ((Bit16s) (zSig + roundIncrement) < 0)))
-        {
-            float_raise(status, float_flag_overflow);
-            if (roundBits || float_exception_masked(status, float_flag_overflow)) {
-                float_raise(status, float_flag_inexact);
-            }
-            return packFloat16(zSign, 0x1F, 0) - (roundIncrement == 0);
-        }
-        if (zExp < 0) {
-            int isTiny = (zExp < -1) || (zSig + roundIncrement < 0x8000);
-            zSig = shift16RightJamming(zSig, -zExp);
-            zExp = 0;
-            roundBits = zSig & roundMask;
-            if (isTiny) {
-                if(get_flush_underflow_to_zero(status)) {
-                    float_raise(status, float_flag_underflow | float_flag_inexact);
-                    return packFloat16(zSign, 0, 0);
-                }
-                // signal the #P according to roundBits calculated AFTER denormalization
-                if (roundBits || !float_exception_masked(status, float_flag_underflow)) {
-                    float_raise(status, float_flag_underflow);
-                }
-            }
-        }
-    }
-    if (roundBits) float_raise(status, float_flag_inexact);
-    Bit16u zSigRound = ((zSig + roundIncrement) & ~roundMask) >> 4;
-    zSigRound &= ~(((roundBits ^ 0x10) == 0) & roundNearestEven);
-    if (zSigRound == 0) zExp = 0;
-    return packFloat16(zSign, zExp, zSigRound);
-}
-
-#endif
-
-/*----------------------------------------------------------------------------
-| Normalizes the subnormal single-precision floating-point value represented
-| by the denormalized significand `aSig'.  The normalized exponent and
-| significand are stored at the locations pointed to by `zExpPtr' and
-| `zSigPtr', respectively.
-*----------------------------------------------------------------------------*/
-
-void normalizeFloat32Subnormal(Bit32u aSig, Bit16s *zExpPtr, Bit32u *zSigPtr)
-{
-    int shiftCount = countLeadingZeros32(aSig) - 8;
-    *zSigPtr = aSig<<shiftCount;
-    *zExpPtr = 1 - shiftCount;
-}
-
-/*----------------------------------------------------------------------------
-| Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-| and significand `zSig', and returns the proper single-precision floating-
-| point value corresponding to the abstract input.  Ordinarily, the abstract
-| value is simply rounded and packed into the single-precision format, with
-| the inexact exception raised if the abstract input cannot be represented
-| exactly.  However, if the abstract value is too large, the overflow and
-| inexact exceptions are raised and an infinity or maximal finite value is
-| returned.  If the abstract value is too small, the input value is rounded to
-| a subnormal number, and the underflow and inexact exceptions are raised if
-| the abstract input cannot be represented exactly as a subnormal single-
-| precision floating-point number.
-|     The input significand `zSig' has its binary point between bits 30
-| and 29, which is 7 bits to the left of the usual location.  This shifted
-| significand must be normalized or smaller.  If `zSig' is not normalized,
-| `zExp' must be 0; in that case, the result returned is a subnormal number,
-| and it must not require rounding.  In the usual case that `zSig' is
-| normalized, `zExp' must be 1 less than the ``true'' floating-point exponent.
-| The handling of underflow and overflow follows the IEC/IEEE Standard for
-| Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 roundAndPackFloat32(int zSign, Bit16s zExp, Bit32u zSig, struct float_status_t *status)
-{
-    Bit32s roundIncrement, roundBits;
-    const Bit32s roundMask = 0x7F;
-
-    int roundingMode = get_float_rounding_mode(status);
-    int roundNearestEven = (roundingMode == float_round_nearest_even);
-    roundIncrement = 0x40;
-
-    if (! roundNearestEven) {
-        if (roundingMode == float_round_to_zero) roundIncrement = 0;
-        else {
-            roundIncrement = roundMask;
-            if (zSign) {
-                if (roundingMode == float_round_up) roundIncrement = 0;
-            }
-            else {
-                if (roundingMode == float_round_down) roundIncrement = 0;
-            }
-        }
-    }
-    roundBits = zSig & roundMask;
-    if (0xFD <= (Bit16u) zExp) {
-        if ((0xFD < zExp)
-             || ((zExp == 0xFD) && ((Bit32s) (zSig + roundIncrement) < 0)))
-        {
-            float_raise(status, float_flag_overflow);
-            if (roundBits || float_exception_masked(status, float_flag_overflow)) {
-                float_raise(status, float_flag_inexact);
-                if (roundIncrement != 0) set_float_rounding_up(status);
-            }
-            return packFloat32(zSign, 0xFF, 0) - (roundIncrement == 0);
-        }
-        if (zExp < 0) {
-            int isTiny = (zExp < -1) || (zSig + roundIncrement < 0x80000000);
-            if (isTiny) {
-                if (!float_exception_masked(status, float_flag_underflow)) {
-                    float_raise(status, float_flag_underflow);
-                    zExp += 192; // bias unmasked underflow
-                }
-            }
-            if (zExp < 0) {
-                zSig = shift32RightJamming(zSig, -zExp);
-                zExp = 0;
-                roundBits = zSig & roundMask;
-                if (isTiny) {
-                    // masked underflow
-                    if(get_flush_underflow_to_zero(status)) {
-                        float_raise(status, float_flag_underflow | float_flag_inexact);
-                        return packFloat32(zSign, 0, 0);
-                    }
-                    if (roundBits) float_raise(status, float_flag_underflow);
-                }
-            }
-        }
-    }
-    Bit32u zSigRound = ((zSig + roundIncrement) & ~roundMask) >> 7;
-    zSigRound &= ~(((roundBits ^ 0x40) == 0) & roundNearestEven);
-    if (zSigRound == 0) zExp = 0;
-    if (roundBits) {
-        float_raise(status, float_flag_inexact);
-        if ((zSigRound << 7) > zSig) set_float_rounding_up(status);
-    }
-    return packFloat32(zSign, zExp, zSigRound);
-}
-
-/*----------------------------------------------------------------------------
-| Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-| and significand `zSig', and returns the proper single-precision floating-
-| point value corresponding to the abstract input.  This routine is just like
-| `roundAndPackFloat32' except that `zSig' does not have to be normalized.
-| Bit 31 of `zSig' must be zero, and `zExp' must be 1 less than the ``true''
-| floating-point exponent.
-*----------------------------------------------------------------------------*/
-
-float32 normalizeRoundAndPackFloat32(int zSign, Bit16s zExp, Bit32u zSig, struct float_status_t *status)
-{
-    int shiftCount = countLeadingZeros32(zSig) - 1;
-    return roundAndPackFloat32(zSign, zExp - shiftCount, zSig<<shiftCount, status);
-}
-
-/*----------------------------------------------------------------------------
-| Normalizes the subnormal double-precision floating-point value represented
-| by the denormalized significand `aSig'.  The normalized exponent and
-| significand are stored at the locations pointed to by `zExpPtr' and
-| `zSigPtr', respectively.
-*----------------------------------------------------------------------------*/
-
-void normalizeFloat64Subnormal(Bit64u aSig, Bit16s *zExpPtr, Bit64u *zSigPtr)
-{
-    int shiftCount = countLeadingZeros64(aSig) - 11;
-    *zSigPtr = aSig<<shiftCount;
-    *zExpPtr = 1 - shiftCount;
-}
-
-/*----------------------------------------------------------------------------
-| Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-| and significand `zSig', and returns the proper double-precision floating-
-| point value corresponding to the abstract input.  Ordinarily, the abstract
-| value is simply rounded and packed into the double-precision format, with
-| the inexact exception raised if the abstract input cannot be represented
-| exactly.  However, if the abstract value is too large, the overflow and
-| inexact exceptions are raised and an infinity or maximal finite value is
-| returned.  If the abstract value is too small, the input value is rounded
-| to a subnormal number, and the underflow and inexact exceptions are raised
-| if the abstract input cannot be represented exactly as a subnormal double-
-| precision floating-point number.
-|     The input significand `zSig' has its binary point between bits 62
-| and 61, which is 10 bits to the left of the usual location.  This shifted
-| significand must be normalized or smaller.  If `zSig' is not normalized,
-| `zExp' must be 0; in that case, the result returned is a subnormal number,
-| and it must not require rounding.  In the usual case that `zSig' is
-| normalized, `zExp' must be 1 less than the ``true'' floating-point exponent.
-| The handling of underflow and overflow follows the IEC/IEEE Standard for
-| Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 roundAndPackFloat64(int zSign, Bit16s zExp, Bit64u zSig, struct float_status_t *status)
-{
-    Bit16s roundIncrement, roundBits;
-    const Bit16s roundMask = 0x3FF;
-    int roundingMode = get_float_rounding_mode(status);
-    int roundNearestEven = (roundingMode == float_round_nearest_even);
-    roundIncrement = 0x200;
-    if (! roundNearestEven) {
-        if (roundingMode == float_round_to_zero) roundIncrement = 0;
-        else {
-            roundIncrement = roundMask;
-            if (zSign) {
-                if (roundingMode == float_round_up) roundIncrement = 0;
-            }
-            else {
-                if (roundingMode == float_round_down) roundIncrement = 0;
-            }
-        }
-    }
-    roundBits = (Bit16s)(zSig & roundMask);
-    if (0x7FD <= (Bit16u) zExp) {
-        if ((0x7FD < zExp)
-             || ((zExp == 0x7FD)
-                  && ((Bit64s) (zSig + roundIncrement) < 0)))
-        {
-            float_raise(status, float_flag_overflow);
-            if (roundBits || float_exception_masked(status, float_flag_overflow)) {
-                float_raise(status, float_flag_inexact);
-                if (roundIncrement != 0) set_float_rounding_up(status);
-            }
-            return packFloat64(zSign, 0x7FF, 0) - (roundIncrement == 0);
-        }
-        if (zExp < 0) {
-            int isTiny = (zExp < -1) || (zSig + roundIncrement < BX_CONST64(0x8000000000000000));
-            if (isTiny) {
-                if (!float_exception_masked(status, float_flag_underflow)) {
-                    float_raise(status, float_flag_underflow);
-                    zExp += 1536; // bias unmasked underflow
-                }
-            }
-            if (zExp < 0) {
-                zSig = shift64RightJamming(zSig, -zExp);
-                zExp = 0;
-                roundBits = (Bit16s)(zSig & roundMask);
-                if (isTiny) {
-                    // masked underflow
-                    if(get_flush_underflow_to_zero(status)) {
-                        float_raise(status, float_flag_underflow | float_flag_inexact);
-                        return packFloat64(zSign, 0, 0);
-                    }
-                    if (roundBits) float_raise(status, float_flag_underflow);
-                }
-            }
-        }
-    }
-    Bit64u zSigRound = (zSig + roundIncrement)>>10;
-    zSigRound &= ~(((roundBits ^ 0x200) == 0) & roundNearestEven);
-    if (zSigRound == 0) zExp = 0;
-    if (roundBits) {
-        float_raise(status, float_flag_inexact);
-        if ((zSigRound << 10) > zSig) set_float_rounding_up(status);
-    }
-    return packFloat64(zSign, zExp, zSigRound);
-}
-
-/*----------------------------------------------------------------------------
-| Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-| and significand `zSig', and returns the proper double-precision floating-
-| point value corresponding to the abstract input.  This routine is just like
-| `roundAndPackFloat64' except that `zSig' does not have to be normalized.
-| Bit 63 of `zSig' must be zero, and `zExp' must be 1 less than the ``true''
-| floating-point exponent.
-*----------------------------------------------------------------------------*/
-
-float64 normalizeRoundAndPackFloat64(int zSign, Bit16s zExp, Bit64u zSig, struct float_status_t *status)
-{
-    int shiftCount = countLeadingZeros64(zSig) - 1;
-    return roundAndPackFloat64(zSign, zExp - shiftCount, zSig<<shiftCount, status);
-}
-
-#ifdef FLOATX80
-
-/*----------------------------------------------------------------------------
-| Normalizes the subnormal extended double-precision floating-point value
-| represented by the denormalized significand `aSig'.  The normalized exponent
-| and significand are stored at the locations pointed to by `zExpPtr' and
-| `zSigPtr', respectively.
-*----------------------------------------------------------------------------*/
-
-void normalizeFloatx80Subnormal(Bit64u aSig, Bit32s *zExpPtr, Bit64u *zSigPtr)
-{
-    int shiftCount = countLeadingZeros64(aSig);
-    *zSigPtr = aSig<<shiftCount;
-    *zExpPtr = 1 - shiftCount;
-}
-
-/*----------------------------------------------------------------------------
-| Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-| and extended significand formed by the concatenation of `zSig0' and `zSig1',
-| and returns the proper extended double-precision floating-point value
-| corresponding to the abstract input.  Ordinarily, the abstract value is
-| rounded and packed into the extended double-precision format, with the
-| inexact exception raised if the abstract input cannot be represented
-| exactly.  However, if the abstract value is too large, the overflow and
-| inexact exceptions are raised and an infinity or maximal finite value is
-| returned.  If the abstract value is too small, the input value is rounded to
-| a subnormal number, and the underflow and inexact exceptions are raised if
-| the abstract input cannot be represented exactly as a subnormal extended
-| double-precision floating-point number.
-|     If `roundingPrecision' is 32 or 64, the result is rounded to the same
-| number of bits as single or double precision, respectively.  Otherwise, the
-| result is rounded to the full precision of the extended double-precision
-| format.
-|     The input significand must be normalized or smaller.  If the input
-| significand is not normalized, `zExp' must be 0; in that case, the result
-| returned is a subnormal number, and it must not require rounding.  The
-| handling of underflow and overflow follows the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-floatx80 SoftFloatRoundAndPackFloatx80(int roundingPrecision,
-        int zSign, Bit32s zExp, Bit64u zSig0, Bit64u zSig1, struct float_status_t *status)
-{
-    Bit64u roundIncrement, roundMask, roundBits;
-    int increment;
-    Bit64u zSigExact; /* support rounding-up response */
-
-    Bit8u roundingMode = get_float_rounding_mode(status);
-    int roundNearestEven = (roundingMode == float_round_nearest_even);
-    if (roundingPrecision == 64) {
-        roundIncrement = BX_CONST64(0x0000000000000400);
-        roundMask = BX_CONST64(0x00000000000007FF);
-    }
-    else if (roundingPrecision == 32) {
-        roundIncrement = BX_CONST64(0x0000008000000000);
-        roundMask = BX_CONST64(0x000000FFFFFFFFFF);
-    }
-    else goto precision80;
-
-    zSig0 |= (zSig1 != 0);
-    if (! roundNearestEven) {
-        if (roundingMode == float_round_to_zero) roundIncrement = 0;
-        else {
-            roundIncrement = roundMask;
-            if (zSign) {
-                if (roundingMode == float_round_up) roundIncrement = 0;
-            }
-            else {
-                if (roundingMode == float_round_down) roundIncrement = 0;
-            }
-        }
-    }
-    roundBits = zSig0 & roundMask;
-    if (0x7FFD <= (Bit32u) (zExp - 1)) {
-        if ((0x7FFE < zExp)
-             || ((zExp == 0x7FFE) && (zSig0 + roundIncrement < zSig0)))
-        {
-            goto overflow;
-        }
-        if (zExp <= 0) {
-            int isTiny = (zExp < 0) || (zSig0 <= zSig0 + roundIncrement);
-            zSig0 = shift64RightJamming(zSig0, 1 - zExp);
-            zSigExact = zSig0;
-            zExp = 0;
-            roundBits = zSig0 & roundMask;
-            if (isTiny) {
-                if (roundBits || (zSig0 && !float_exception_masked(status, float_flag_underflow)))
-                    float_raise(status, float_flag_underflow);
-            }
-            zSig0 += roundIncrement;
-            if ((Bit64s) zSig0 < 0) zExp = 1;
-            roundIncrement = roundMask + 1;
-            if (roundNearestEven && (roundBits<<1 == roundIncrement))
-                roundMask |= roundIncrement;
-            zSig0 &= ~roundMask;
-            if (roundBits) {
-                float_raise(status, float_flag_inexact);
-                if (zSig0 > zSigExact) set_float_rounding_up(status);
-            }
-            return packFloatx80(zSign, zExp, zSig0);
-        }
-    }
-    if (roundBits) float_raise(status, float_flag_inexact);
-    zSigExact = zSig0;
-    zSig0 += roundIncrement;
-    if (zSig0 < roundIncrement) {
-        // Basically scale by shifting right and keep overflow
-        ++zExp;
-        zSig0 = BX_CONST64(0x8000000000000000);
-        zSigExact >>= 1; // must scale also, or else later tests will fail
-    }
-    roundIncrement = roundMask + 1;
-    if (roundNearestEven && (roundBits<<1 == roundIncrement))
-        roundMask |= roundIncrement;
-    zSig0 &= ~roundMask;
-    if (zSig0 > zSigExact) set_float_rounding_up(status);
-    if (zSig0 == 0) zExp = 0;
-    return packFloatx80(zSign, zExp, zSig0);
- precision80:
-    increment = ((Bit64s) zSig1 < 0);
-    if (! roundNearestEven) {
-        if (roundingMode == float_round_to_zero) increment = 0;
-        else {
-            if (zSign) {
-                increment = (roundingMode == float_round_down) && zSig1;
-            }
-            else {
-                increment = (roundingMode == float_round_up) && zSig1;
-            }
-        }
-    }
-    if (0x7FFD <= (Bit32u) (zExp - 1)) {
-        if ((0x7FFE < zExp)
-             || ((zExp == 0x7FFE)
-                  && (zSig0 == BX_CONST64(0xFFFFFFFFFFFFFFFF))
-                  && increment))
-        {
-            roundMask = 0;
- overflow:
-            float_raise(status, float_flag_overflow | float_flag_inexact);
-            if ((roundingMode == float_round_to_zero)
-                 || (zSign && (roundingMode == float_round_up))
-                 || (! zSign && (roundingMode == float_round_down)))
-            {
-                return packFloatx80(zSign, 0x7FFE, ~roundMask);
-            }
-            set_float_rounding_up(status);
-            return packFloatx80(zSign, 0x7FFF, BX_CONST64(0x8000000000000000));
-        }
-        if (zExp <= 0) {
-            int isTiny = (zExp < 0) || (! increment)
-                || (zSig0 < BX_CONST64(0xFFFFFFFFFFFFFFFF));
-            shift64ExtraRightJamming(zSig0, zSig1, 1 - zExp, &zSig0, &zSig1);
-            zExp = 0;
-            if (isTiny) {
-                if (zSig1 || (zSig0 && !float_exception_masked(status, float_flag_underflow)))
-                    float_raise(status, float_flag_underflow);
-            }
-            if (zSig1) float_raise(status, float_flag_inexact);
-            if (roundNearestEven) increment = ((Bit64s) zSig1 < 0);
-            else {
-                if (zSign) {
-                    increment = (roundingMode == float_round_down) && zSig1;
-                } else {
-                    increment = (roundingMode == float_round_up) && zSig1;
-                }
-            }
-            if (increment) {
-                zSigExact = zSig0++;
-                zSig0 &= ~(((Bit64u) (zSig1<<1) == 0) & roundNearestEven);
-                if (zSig0 > zSigExact) set_float_rounding_up(status);
-                if ((Bit64s) zSig0 < 0) zExp = 1;
-            }
-            return packFloatx80(zSign, zExp, zSig0);
-        }
-    }
-    if (zSig1) float_raise(status, float_flag_inexact);
-    if (increment) {
-        zSigExact = zSig0++;
-        if (zSig0 == 0) {
-            zExp++;
-            zSig0 = BX_CONST64(0x8000000000000000);
-            zSigExact >>= 1;  // must scale also, or else later tests will fail
-        }
-        else {
-            zSig0 &= ~(((Bit64u) (zSig1<<1) == 0) & roundNearestEven);
-        }
-        if (zSig0 > zSigExact) set_float_rounding_up(status);
-    }
-    else {
-        if (zSig0 == 0) zExp = 0;
-    }
-    return packFloatx80(zSign, zExp, zSig0);
-}
-
-floatx80 roundAndPackFloatx80(int roundingPrecision,
-        int zSign, Bit32s zExp, Bit64u zSig0, Bit64u zSig1, struct float_status_t *status)
-{
-    struct float_status_t *round_status = status;
-    floatx80 result = SoftFloatRoundAndPackFloatx80(roundingPrecision, zSign, zExp, zSig0, zSig1, status);
-
-    // bias unmasked undeflow
-    if (status->float_exception_flags & ~status->float_exception_masks & float_flag_underflow) {
-       float_raise(round_status, float_flag_underflow);
-       return SoftFloatRoundAndPackFloatx80(roundingPrecision, zSign, zExp + 0x6000, zSig0, zSig1, status = round_status);
-    }
-
-    // bias unmasked overflow
-    if (status->float_exception_flags & ~status->float_exception_masks & float_flag_overflow) {
-       float_raise(round_status, float_flag_overflow);
-       return SoftFloatRoundAndPackFloatx80(roundingPrecision, zSign, zExp - 0x6000, zSig0, zSig1, status = round_status);
-    }
-
-    return result;
-}
-
-/*----------------------------------------------------------------------------
-| Takes an abstract floating-point value having sign `zSign', exponent
-| `zExp', and significand formed by the concatenation of `zSig0' and `zSig1',
-| and returns the proper extended double-precision floating-point value
-| corresponding to the abstract input.  This routine is just like
-| `roundAndPackFloatx80' except that the input significand does not have to be
-| normalized.
-*----------------------------------------------------------------------------*/
-
-floatx80 normalizeRoundAndPackFloatx80(int roundingPrecision,
-        int zSign, Bit32s zExp, Bit64u zSig0, Bit64u zSig1, struct float_status_t *status)
-{
-    if (zSig0 == 0) {
-        zSig0 = zSig1;
-        zSig1 = 0;
-        zExp -= 64;
-    }
-    int shiftCount = countLeadingZeros64(zSig0);
-    shortShift128Left(zSig0, zSig1, shiftCount, &zSig0, &zSig1);
-    zExp -= shiftCount;
-    return
-        roundAndPackFloatx80(roundingPrecision, zSign, zExp, zSig0, zSig1, status);
-}
-
-#endif
-
-#ifdef FLOAT128
-
-/*----------------------------------------------------------------------------
-| Normalizes the subnormal quadruple-precision floating-point value
-| represented by the denormalized significand formed by the concatenation of
-| `aSig0' and `aSig1'.  The normalized exponent is stored at the location
-| pointed to by `zExpPtr'.  The most significant 49 bits of the normalized
-| significand are stored at the location pointed to by `zSig0Ptr', and the
-| least significant 64 bits of the normalized significand are stored at the
-| location pointed to by `zSig1Ptr'.
-*----------------------------------------------------------------------------*/
-
-void normalizeFloat128Subnormal(
-     Bit64u aSig0, Bit64u aSig1, Bit32s *zExpPtr, Bit64u *zSig0Ptr, Bit64u *zSig1Ptr)
-{
-    int shiftCount;
-
-    if (aSig0 == 0) {
-        shiftCount = countLeadingZeros64(aSig1) - 15;
-        if (shiftCount < 0) {
-            *zSig0Ptr = aSig1 >>(-shiftCount);
-            *zSig1Ptr = aSig1 << (shiftCount & 63);
-        }
-        else {
-            *zSig0Ptr = aSig1 << shiftCount;
-            *zSig1Ptr = 0;
-        }
-        *zExpPtr = - shiftCount - 63;
-    }
-    else {
-        shiftCount = countLeadingZeros64(aSig0) - 15;
-        shortShift128Left(aSig0, aSig1, shiftCount, zSig0Ptr, zSig1Ptr);
-        *zExpPtr = 1 - shiftCount;
-    }
-}
-
-/*----------------------------------------------------------------------------
-| Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-| and extended significand formed by the concatenation of `zSig0', `zSig1',
-| and `zSig2', and returns the proper quadruple-precision floating-point value
-| corresponding to the abstract input.  Ordinarily, the abstract value is
-| simply rounded and packed into the quadruple-precision format, with the
-| inexact exception raised if the abstract input cannot be represented
-| exactly.  However, if the abstract value is too large, the overflow and
-| inexact exceptions are raised and an infinity or maximal finite value is
-| returned.  If the abstract value is too small, the input value is rounded to
-| a subnormal number, and the underflow and inexact exceptions are raised if
-| the abstract input cannot be represented exactly as a subnormal quadruple-
-| precision floating-point number.
-|     The input significand must be normalized or smaller.  If the input
-| significand is not normalized, `zExp' must be 0; in that case, the result
-| returned is a subnormal number, and it must not require rounding.  In the
-| usual case that the input significand is normalized, `zExp' must be 1 less
-| than the ``true'' floating-point exponent.  The handling of underflow and
-| overflow follows the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float128 roundAndPackFloat128(
-     int zSign, Bit32s zExp, Bit64u zSig0, Bit64u zSig1, Bit64u zSig2, struct float_status_t *status)
-{
-    int increment = ((Bit64s) zSig2 < 0);
-    if (0x7FFD <= (Bit32u) zExp) {
-        if ((0x7FFD < zExp)
-             || ((zExp == 0x7FFD)
-                  && eq128(BX_CONST64(0x0001FFFFFFFFFFFF),
-                         BX_CONST64(0xFFFFFFFFFFFFFFFF), zSig0, zSig1)
-                  && increment))
-        {
-            float_raise(status, float_flag_overflow | float_flag_inexact);
-            return packFloat128Four(zSign, 0x7FFF, 0, 0);
-        }
-        if (zExp < 0) {
-            int isTiny = (zExp < -1)
-                || ! increment
-                || lt128(zSig0, zSig1,
-                       BX_CONST64(0x0001FFFFFFFFFFFF),
-                       BX_CONST64(0xFFFFFFFFFFFFFFFF));
-            shift128ExtraRightJamming(
-                zSig0, zSig1, zSig2, -zExp, &zSig0, &zSig1, &zSig2);
-            zExp = 0;
-            if (isTiny && zSig2) float_raise(status, float_flag_underflow);
-            increment = ((Bit64s) zSig2 < 0);
-        }
-    }
-    if (zSig2) float_raise(status, float_flag_inexact);
-    if (increment) {
-        add128(zSig0, zSig1, 0, 1, &zSig0, &zSig1);
-        zSig1 &= ~((zSig2 + zSig2 == 0) & 1);
-    }
-    else {
-        if ((zSig0 | zSig1) == 0) zExp = 0;
-    }
-    return packFloat128Four(zSign, zExp, zSig0, zSig1);
-}
-
-/*----------------------------------------------------------------------------
-| Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-| and significand formed by the concatenation of `zSig0' and `zSig1', and
-| returns the proper quadruple-precision floating-point value corresponding
-| to the abstract input.  This routine is just like `roundAndPackFloat128'
-| except that the input significand has fewer bits and does not have to be
-| normalized.  In all cases, `zExp' must be 1 less than the ``true'' floating-
-| point exponent.
-*----------------------------------------------------------------------------*/
-
-float128 normalizeRoundAndPackFloat128(
-     int zSign, Bit32s zExp, Bit64u zSig0, Bit64u zSig1, struct float_status_t *status)
-{
-    Bit64u zSig2;
-
-    if (zSig0 == 0) {
-        zSig0 = zSig1;
-        zSig1 = 0;
-        zExp -= 64;
-    }
-    int shiftCount = countLeadingZeros64(zSig0) - 15;
-    if (0 <= shiftCount) {
-        zSig2 = 0;
-        shortShift128Left(zSig0, zSig1, shiftCount, &zSig0, &zSig1);
-    }
-    else {
-        shift128ExtraRightJamming(
-            zSig0, zSig1, 0, -shiftCount, &zSig0, &zSig1, &zSig2);
-    }
-    zExp -= shiftCount;
-    return roundAndPackFloat128(zSign, zExp, zSig0, zSig1, zSig2, status);
-}
-
-#endif
diff --git a/src/cpu/softfloat/softfloat-round-pack.h b/src/cpu/softfloat/softfloat-round-pack.h
deleted file mode 100644
index 1422aaea6..000000000
--- a/src/cpu/softfloat/softfloat-round-pack.h
+++ /dev/null
@@ -1,309 +0,0 @@
-/*============================================================================
-This C source file is part of the SoftFloat IEC/IEEE Floating-point Arithmetic
-Package, Release 2b.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://www.cs.berkeley.edu/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has
-been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES
-RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS
-AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,
-COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE
-EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
-INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
-OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) the source code for the derivative work includes prominent notice that
-the work is derivative, and (2) the source code includes prominent notice with
-these four paragraphs for those parts of this code that are retained.
-=============================================================================*/
-
-/*============================================================================
- * Adapted for Bochs (x86 achitecture simulator) by
- *            Stanislav Shwartsman [sshwarts at sourceforge net]
- * ==========================================================================*/
-
-#ifndef _SOFTFLOAT_ROUND_PACK_H_
-#define _SOFTFLOAT_ROUND_PACK_H_
-
-#include "softfloat.h"
-
-/*----------------------------------------------------------------------------
-| Takes a 64-bit fixed-point value `absZ' with binary point between bits 6
-| and 7, and returns the properly rounded 32-bit integer corresponding to the
-| input.  If `zSign' is 1, the input is negated before being converted to an
-| integer.  Bit 63 of `absZ' must be zero.  Ordinarily, the fixed-point input
-| is simply rounded to an integer, with the inexact exception raised if the
-| input cannot be represented exactly as an integer.  However, if the fixed-
-| point input is too large, the invalid exception is raised and the integer
-| indefinite value is returned.
-*----------------------------------------------------------------------------*/
-
-Bit32s roundAndPackInt32(int zSign, Bit64u absZ, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| Takes the 128-bit fixed-point value formed by concatenating `absZ0' and
-| `absZ1', with binary point between bits 63 and 64 (between the input words),
-| and returns the properly rounded 64-bit integer corresponding to the input.
-| If `zSign' is 1, the input is negated before being converted to an integer.
-| Ordinarily, the fixed-point input is simply rounded to an integer, with
-| the inexact exception raised if the input cannot be represented exactly as
-| an integer.  However, if the fixed-point input is too large, the invalid
-| exception is raised and the integer indefinite value is returned.
-*----------------------------------------------------------------------------*/
-
-Bit64s roundAndPackInt64(int zSign, Bit64u absZ0, Bit64u absZ1, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| Takes the 128-bit fixed-point value formed by concatenating `absZ0' and
-| `absZ1', with binary point between bits 63 and 64 (between the input words),
-| and returns the properly rounded 64-bit unsigned integer corresponding to the
-| input.  Ordinarily, the fixed-point input is simply rounded to an integer,
-| with the inexact exception raised if the input cannot be represented exactly
-| as an integer. However, if the fixed-point input is too large, the invalid
-| exception is raised and the largest unsigned integer is returned.
-*----------------------------------------------------------------------------*/
-
-Bit64u roundAndPackUint64(int zSign, Bit64u absZ0, Bit64u absZ1, struct float_status_t *status);
-
-#ifdef FLOAT16
-
-/*----------------------------------------------------------------------------
-| Normalizes the subnormal half-precision floating-point value represented
-| by the denormalized significand `aSig'.  The normalized exponent and
-| significand are stored at the locations pointed to by `zExpPtr' and
-| `zSigPtr', respectively.
-*----------------------------------------------------------------------------*/
-
-void normalizeFloat16Subnormal(Bit16u aSig, Bit16s *zExpPtr, Bit16u *zSigPtr);
-
-/*----------------------------------------------------------------------------
-| Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-| and significand `zSig', and returns the proper half-precision floating-
-| point value corresponding to the abstract input.  Ordinarily, the abstract
-| value is simply rounded and packed into the half-precision format, with
-| the inexact exception raised if the abstract input cannot be represented
-| exactly.  However, if the abstract value is too large, the overflow and
-| inexact exceptions are raised and an infinity or maximal finite value is
-| returned.  If the abstract value is too small, the input value is rounded to
-| a subnormal number, and the underflow and inexact exceptions are raised if
-| the abstract input cannot be represented exactly as a subnormal single-
-| precision floating-point number.
-|     The input significand `zSig' has its binary point between bits 14
-| and 13, which is 4 bits to the left of the usual location.  This shifted
-| significand must be normalized or smaller.  If `zSig' is not normalized,
-| `zExp' must be 0; in that case, the result returned is a subnormal number,
-| and it must not require rounding.  In the usual case that `zSig' is
-| normalized, `zExp' must be 1 less than the ``true'' floating-point exponent.
-| The handling of underflow and overflow follows the IEC/IEEE Standard for
-| Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float16 roundAndPackFloat16(int zSign, Bit16s zExp, Bit16u zSig, struct float_status_t *status);
-
-#endif
-
-/*----------------------------------------------------------------------------
-| Normalizes the subnormal single-precision floating-point value represented
-| by the denormalized significand `aSig'.  The normalized exponent and
-| significand are stored at the locations pointed to by `zExpPtr' and
-| `zSigPtr', respectively.
-*----------------------------------------------------------------------------*/
-
-void normalizeFloat32Subnormal(Bit32u aSig, Bit16s *zExpPtr, Bit32u *zSigPtr);
-
-/*----------------------------------------------------------------------------
-| Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-| and significand `zSig', and returns the proper single-precision floating-
-| point value corresponding to the abstract input.  Ordinarily, the abstract
-| value is simply rounded and packed into the single-precision format, with
-| the inexact exception raised if the abstract input cannot be represented
-| exactly.  However, if the abstract value is too large, the overflow and
-| inexact exceptions are raised and an infinity or maximal finite value is
-| returned.  If the abstract value is too small, the input value is rounded to
-| a subnormal number, and the underflow and inexact exceptions are raised if
-| the abstract input cannot be represented exactly as a subnormal single-
-| precision floating-point number.
-|     The input significand `zSig' has its binary point between bits 30
-| and 29, which is 7 bits to the left of the usual location.  This shifted
-| significand must be normalized or smaller.  If `zSig' is not normalized,
-| `zExp' must be 0; in that case, the result returned is a subnormal number,
-| and it must not require rounding.  In the usual case that `zSig' is
-| normalized, `zExp' must be 1 less than the ``true'' floating-point exponent.
-| The handling of underflow and overflow follows the IEC/IEEE Standard for
-| Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 roundAndPackFloat32(int zSign, Bit16s zExp, Bit32u zSig, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-| and significand `zSig', and returns the proper single-precision floating-
-| point value corresponding to the abstract input.  This routine is just like
-| `roundAndPackFloat32' except that `zSig' does not have to be normalized.
-| Bit 31 of `zSig' must be zero, and `zExp' must be 1 less than the ``true''
-| floating-point exponent.
-*----------------------------------------------------------------------------*/
-
-float32 normalizeRoundAndPackFloat32(int zSign, Bit16s zExp, Bit32u zSig, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| Normalizes the subnormal double-precision floating-point value represented
-| by the denormalized significand `aSig'.  The normalized exponent and
-| significand are stored at the locations pointed to by `zExpPtr' and
-| `zSigPtr', respectively.
-*----------------------------------------------------------------------------*/
-
-void normalizeFloat64Subnormal(Bit64u aSig, Bit16s *zExpPtr, Bit64u *zSigPtr);
-
-/*----------------------------------------------------------------------------
-| Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-| and significand `zSig', and returns the proper double-precision floating-
-| point value corresponding to the abstract input.  Ordinarily, the abstract
-| value is simply rounded and packed into the double-precision format, with
-| the inexact exception raised if the abstract input cannot be represented
-| exactly.  However, if the abstract value is too large, the overflow and
-| inexact exceptions are raised and an infinity or maximal finite value is
-| returned.  If the abstract value is too small, the input value is rounded
-| to a subnormal number, and the underflow and inexact exceptions are raised
-| if the abstract input cannot be represented exactly as a subnormal double-
-| precision floating-point number.
-|     The input significand `zSig' has its binary point between bits 62
-| and 61, which is 10 bits to the left of the usual location.  This shifted
-| significand must be normalized or smaller.  If `zSig' is not normalized,
-| `zExp' must be 0; in that case, the result returned is a subnormal number,
-| and it must not require rounding.  In the usual case that `zSig' is
-| normalized, `zExp' must be 1 less than the ``true'' floating-point exponent.
-| The handling of underflow and overflow follows the IEC/IEEE Standard for
-| Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 roundAndPackFloat64(int zSign, Bit16s zExp, Bit64u zSig, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-| and significand `zSig', and returns the proper double-precision floating-
-| point value corresponding to the abstract input.  This routine is just like
-| `roundAndPackFloat64' except that `zSig' does not have to be normalized.
-| Bit 63 of `zSig' must be zero, and `zExp' must be 1 less than the ``true''
-| floating-point exponent.
-*----------------------------------------------------------------------------*/
-
-float64 normalizeRoundAndPackFloat64(int zSign, Bit16s zExp, Bit64u zSig, struct float_status_t *status);
-
-#ifdef FLOATX80
-
-/*----------------------------------------------------------------------------
-| Normalizes the subnormal extended double-precision floating-point value
-| represented by the denormalized significand `aSig'.  The normalized exponent
-| and significand are stored at the locations pointed to by `zExpPtr' and
-| `zSigPtr', respectively.
-*----------------------------------------------------------------------------*/
-
-void normalizeFloatx80Subnormal(Bit64u aSig, Bit32s *zExpPtr, Bit64u *zSigPtr);
-
-/*----------------------------------------------------------------------------
-| Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-| and extended significand formed by the concatenation of `zSig0' and `zSig1',
-| and returns the proper extended double-precision floating-point value
-| corresponding to the abstract input.  Ordinarily, the abstract value is
-| rounded and packed into the extended double-precision format, with the
-| inexact exception raised if the abstract input cannot be represented
-| exactly.  However, if the abstract value is too large, the overflow and
-| inexact exceptions are raised and an infinity or maximal finite value is
-| returned.  If the abstract value is too small, the input value is rounded to
-| a subnormal number, and the underflow and inexact exceptions are raised if
-| the abstract input cannot be represented exactly as a subnormal extended
-| double-precision floating-point number.
-|     If `roundingPrecision' is 32 or 64, the result is rounded to the same
-| number of bits as single or double precision, respectively.  Otherwise, the
-| result is rounded to the full precision of the extended double-precision
-| format.
-|     The input significand must be normalized or smaller.  If the input
-| significand is not normalized, `zExp' must be 0; in that case, the result
-| returned is a subnormal number, and it must not require rounding.  The
-| handling of underflow and overflow follows the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-floatx80 roundAndPackFloatx80(int roundingPrecision,
-        int zSign, Bit32s zExp, Bit64u zSig0, Bit64u zSig1, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| Takes an abstract floating-point value having sign `zSign', exponent
-| `zExp', and significand formed by the concatenation of `zSig0' and `zSig1',
-| and returns the proper extended double-precision floating-point value
-| corresponding to the abstract input.  This routine is just like
-| `roundAndPackFloatx80' except that the input significand does not have to be
-| normalized.
-*----------------------------------------------------------------------------*/
-
-floatx80 normalizeRoundAndPackFloatx80(int roundingPrecision,
-        int zSign, Bit32s zExp, Bit64u zSig0, Bit64u zSig1, struct float_status_t *status);
-
-#endif // FLOATX80
-
-#ifdef FLOAT128
-
-/*----------------------------------------------------------------------------
-| Normalizes the subnormal quadruple-precision floating-point value
-| represented by the denormalized significand formed by the concatenation of
-| `aSig0' and `aSig1'.  The normalized exponent is stored at the location
-| pointed to by `zExpPtr'.  The most significant 49 bits of the normalized
-| significand are stored at the location pointed to by `zSig0Ptr', and the
-| least significant 64 bits of the normalized significand are stored at the
-| location pointed to by `zSig1Ptr'.
-*----------------------------------------------------------------------------*/
-
-void normalizeFloat128Subnormal(
-     Bit64u aSig0, Bit64u aSig1, Bit32s *zExpPtr, Bit64u *zSig0Ptr, Bit64u *zSig1Ptr);
-
-/*----------------------------------------------------------------------------
-| Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-| and extended significand formed by the concatenation of `zSig0', `zSig1',
-| and `zSig2', and returns the proper quadruple-precision floating-point value
-| corresponding to the abstract input.  Ordinarily, the abstract value is
-| simply rounded and packed into the quadruple-precision format, with the
-| inexact exception raised if the abstract input cannot be represented
-| exactly.  However, if the abstract value is too large, the overflow and
-| inexact exceptions are raised and an infinity or maximal finite value is
-| returned.  If the abstract value is too small, the input value is rounded to
-| a subnormal number, and the underflow and inexact exceptions are raised if
-| the abstract input cannot be represented exactly as a subnormal quadruple-
-| precision floating-point number.
-|     The input significand must be normalized or smaller.  If the input
-| significand is not normalized, `zExp' must be 0; in that case, the result
-| returned is a subnormal number, and it must not require rounding.  In the
-| usual case that the input significand is normalized, `zExp' must be 1 less
-| than the ``true'' floating-point exponent.  The handling of underflow and
-| overflow follows the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float128 roundAndPackFloat128(
-     int zSign, Bit32s zExp, Bit64u zSig0, Bit64u zSig1, Bit64u zSig2, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-| and significand formed by the concatenation of `zSig0' and `zSig1', and
-| returns the proper quadruple-precision floating-point value corresponding
-| to the abstract input.  This routine is just like `roundAndPackFloat128'
-| except that the input significand has fewer bits and does not have to be
-| normalized.  In all cases, `zExp' must be 1 less than the ``true'' floating-
-| point exponent.
-*----------------------------------------------------------------------------*/
-
-float128 normalizeRoundAndPackFloat128(
-     int zSign, Bit32s zExp, Bit64u zSig0, Bit64u zSig1, struct float_status_t *status);
-
-#endif // FLOAT128
-
-#endif
diff --git a/src/cpu/softfloat/softfloat-specialize.cc b/src/cpu/softfloat/softfloat-specialize.cc
deleted file mode 100644
index bf0d11144..000000000
--- a/src/cpu/softfloat/softfloat-specialize.cc
+++ /dev/null
@@ -1,187 +0,0 @@
-/*============================================================================
-This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2b.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://www.cs.berkeley.edu/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has
-been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES
-RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS
-AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,
-COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE
-EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
-INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
-OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) the source code for the derivative work includes prominent notice that
-the work is derivative, and (2) the source code includes prominent notice with
-these four paragraphs for those parts of this code that are retained.
-=============================================================================*/
-
-#define FLOAT128
-
-/*============================================================================
- * Adapted for Bochs (x86 achitecture simulator) by
- *            Stanislav Shwartsman [sshwarts at sourceforge net]
- * ==========================================================================*/
-
-#include "softfloat.h"
-#include "softfloat-specialize.h"
-
-/*----------------------------------------------------------------------------
-| Takes two single-precision floating-point values `a' and `b', one of which
-| is a NaN, and returns the appropriate NaN result.  If either `a' or `b' is a
-| signaling NaN, the invalid exception is raised.
-*----------------------------------------------------------------------------*/
-
-float32 propagateFloat32NaN(float32 a, float32 b, struct float_status_t *status)
-{
-    int aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = float32_is_nan(a);
-    aIsSignalingNaN = float32_is_signaling_nan(a);
-    bIsNaN = float32_is_nan(b);
-    bIsSignalingNaN = float32_is_signaling_nan(b);
-    a |= 0x00400000;
-    b |= 0x00400000;
-    if (aIsSignalingNaN | bIsSignalingNaN) float_raise(status, float_flag_invalid);
-    if (get_float_nan_handling_mode(status) == float_larger_significand_nan) {
-        if (aIsSignalingNaN) {
-            if (bIsSignalingNaN) goto returnLargerSignificand;
-            return bIsNaN ? b : a;
-        }
-        else if (aIsNaN) {
-            if (bIsSignalingNaN | ! bIsNaN) return a;
-      returnLargerSignificand:
-            if ((Bit32u) (a<<1) < (Bit32u) (b<<1)) return b;
-            if ((Bit32u) (b<<1) < (Bit32u) (a<<1)) return a;
-            return (a < b) ? a : b;
-        }
-        else {
-            return b;
-        }
-    } else {
-        return (aIsSignalingNaN | aIsNaN) ? a : b;
-    }
-}
-
-/*----------------------------------------------------------------------------
-| Takes two double-precision floating-point values `a' and `b', one of which
-| is a NaN, and returns the appropriate NaN result.  If either `a' or `b' is a
-| signaling NaN, the invalid exception is raised.
-*----------------------------------------------------------------------------*/
-
-float64 propagateFloat64NaN(float64 a, float64 b, struct float_status_t *status)
-{
-    int aIsNaN = float64_is_nan(a);
-    int aIsSignalingNaN = float64_is_signaling_nan(a);
-    int bIsNaN = float64_is_nan(b);
-    int bIsSignalingNaN = float64_is_signaling_nan(b);
-    a |= BX_CONST64(0x0008000000000000);
-    b |= BX_CONST64(0x0008000000000000);
-    if (aIsSignalingNaN | bIsSignalingNaN) float_raise(status, float_flag_invalid);
-    if (get_float_nan_handling_mode(status) == float_larger_significand_nan) {
-        if (aIsSignalingNaN) {
-            if (bIsSignalingNaN) goto returnLargerSignificand;
-            return bIsNaN ? b : a;
-        }
-        else if (aIsNaN) {
-            if (bIsSignalingNaN | ! bIsNaN) return a;
-      returnLargerSignificand:
-            if ((Bit64u) (a<<1) < (Bit64u) (b<<1)) return b;
-            if ((Bit64u) (b<<1) < (Bit64u) (a<<1)) return a;
-            return (a < b) ? a : b;
-        }
-        else {
-            return b;
-        }
-    } else {
-        return (aIsSignalingNaN | aIsNaN) ? a : b;
-    }
-}
-
-#ifdef FLOATX80
-
-/*----------------------------------------------------------------------------
-| Takes two extended double-precision floating-point values `a' and `b', one
-| of which is a NaN, and returns the appropriate NaN result.  If either `a' or
-| `b' is a signaling NaN, the invalid exception is raised.
-*----------------------------------------------------------------------------*/
-
-floatx80 propagateFloatx80NaN(floatx80 a, floatx80 b, struct float_status_t *status)
-{
-    int aIsNaN = floatx80_is_nan(a);
-    int aIsSignalingNaN = floatx80_is_signaling_nan(a);
-    int bIsNaN = floatx80_is_nan(b);
-    int bIsSignalingNaN = floatx80_is_signaling_nan(b);
-    a.fraction |= BX_CONST64(0xC000000000000000);
-    b.fraction |= BX_CONST64(0xC000000000000000);
-    if (aIsSignalingNaN | bIsSignalingNaN) float_raise(status, float_flag_invalid);
-    if (aIsSignalingNaN) {
-        if (bIsSignalingNaN) goto returnLargerSignificand;
-        return bIsNaN ? b : a;
-    }
-    else if (aIsNaN) {
-        if (bIsSignalingNaN | ! bIsNaN) return a;
- returnLargerSignificand:
-        if (a.fraction < b.fraction) return b;
-        if (b.fraction < a.fraction) return a;
-        return (a.exp < b.exp) ? a : b;
-    }
-    else {
-        return b;
-    }
-}
-
-#endif /* FLOATX80 */
-
-#ifdef FLOAT128
-
-/*----------------------------------------------------------------------------
-| Takes two quadruple-precision floating-point values `a' and `b', one of
-| which is a NaN, and returns the appropriate NaN result.  If either `a' or
-| `b' is a signaling NaN, the invalid exception is raised.
-*----------------------------------------------------------------------------*/
-
-float128 propagateFloat128NaN(float128 a, float128 b, struct float_status_t *status)
-{
-    int aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-    aIsNaN = float128_is_nan(a);
-    aIsSignalingNaN = float128_is_signaling_nan(a);
-    bIsNaN = float128_is_nan(b);
-    bIsSignalingNaN = float128_is_signaling_nan(b);
-    a.hi |= BX_CONST64(0x0000800000000000);
-    b.hi |= BX_CONST64(0x0000800000000000);
-    if (aIsSignalingNaN | bIsSignalingNaN) float_raise(status, float_flag_invalid);
-    if (aIsSignalingNaN) {
-        if (bIsSignalingNaN) goto returnLargerSignificand;
-        return bIsNaN ? b : a;
-    }
-    else if (aIsNaN) {
-        if (bIsSignalingNaN | !bIsNaN) return a;
- returnLargerSignificand:
-        if (lt128(a.hi<<1, a.lo, b.hi<<1, b.lo)) return b;
-        if (lt128(b.hi<<1, b.lo, a.hi<<1, a.lo)) return a;
-        return (a.hi < b.hi) ? a : b;
-    }
-    else {
-        return b;
-    }
-}
-
-/*----------------------------------------------------------------------------
-| The pattern for a default generated quadruple-precision NaN.
-*----------------------------------------------------------------------------*/
-const float128 float128_default_nan =
-    packFloat128(float128_default_nan_hi, float128_default_nan_lo);
-
-#endif /* FLOAT128 */
diff --git a/src/cpu/softfloat/softfloat-specialize.h b/src/cpu/softfloat/softfloat-specialize.h
deleted file mode 100644
index 302ce53e4..000000000
--- a/src/cpu/softfloat/softfloat-specialize.h
+++ /dev/null
@@ -1,789 +0,0 @@
-/*============================================================================
-This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2b.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://www.cs.berkeley.edu/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has
-been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES
-RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS
-AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,
-COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE
-EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
-INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
-OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) the source code for the derivative work includes prominent notice that
-the work is derivative, and (2) the source code includes prominent notice with
-these four paragraphs for those parts of this code that are retained.
-=============================================================================*/
-
-#ifndef _SOFTFLOAT_SPECIALIZE_H_
-#define _SOFTFLOAT_SPECIALIZE_H_
-
-#include "softfloat.h"
-
-/*============================================================================
- * Adapted for Bochs (x86 achitecture simulator) by
- *            Stanislav Shwartsman [sshwarts at sourceforge net]
- * ==========================================================================*/
-
-#define int16_indefinite ((Bit16s)0x8000)
-#define int32_indefinite ((Bit32s)0x80000000)
-#define int64_indefinite BX_CONST64(0x8000000000000000)
-
-#define uint16_indefinite (0xffff)
-#define uint32_indefinite (0xffffffff)
-#define uint64_indefinite BX_CONST64(0xffffffffffffffff)
-
-/*----------------------------------------------------------------------------
-| Internal canonical NaN format.
-*----------------------------------------------------------------------------*/
-
-typedef struct {
-    int sign;
-    Bit64u hi, lo;
-} commonNaNT;
-
-#ifdef FLOAT16
-
-/*----------------------------------------------------------------------------
-| The pattern for a default generated half-precision NaN.
-*----------------------------------------------------------------------------*/
-extern const float16 float16_default_nan;
-
-#define float16_fraction extractFloat16Frac
-#define float16_exp extractFloat16Exp
-#define float16_sign extractFloat16Sign
-
-/*----------------------------------------------------------------------------
-| Returns the fraction bits of the half-precision floating-point value `a'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE Bit16u extractFloat16Frac(float16 a)
-{
-    return a & 0x3FF;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the exponent bits of the half-precision floating-point value `a'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE Bit16s extractFloat16Exp(float16 a)
-{
-    return (a>>10) & 0x1F;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the sign bit of the half-precision floating-point value `a'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int extractFloat16Sign(float16 a)
-{
-    return a>>15;
-}
-
-/*----------------------------------------------------------------------------
-| Packs the sign `zSign', exponent `zExp', and significand `zSig' into a
-| single-precision floating-point value, returning the result.  After being
-| shifted into the proper positions, the three fields are simply added
-| together to form the result.  This means that any integer portion of `zSig'
-| will be added into the exponent.  Since a properly normalized significand
-| will have an integer portion equal to 1, the `zExp' input should be 1 less
-| than the desired result exponent whenever `zSig' is a complete, normalized
-| significand.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE float16 packFloat16(int zSign, int zExp, Bit16u zSig)
-{
-    return (((Bit16u) zSign)<<15) + (((Bit16u) zExp)<<10) + zSig;
-}
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the half-precision floating-point value `a' is a NaN;
-| otherwise returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int float16_is_nan(float16 a)
-{
-    return (0xF800 < (Bit16u) (a<<1));
-}
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the half-precision floating-point value `a' is a signaling
-| NaN; otherwise returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int float16_is_signaling_nan(float16 a)
-{
-    return (((a>>9) & 0x3F) == 0x3E) && (a & 0x1FF);
-}
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the half-precision floating-point value `a' is denormal;
-| otherwise returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int float16_is_denormal(float16 a)
-{
-   return (extractFloat16Exp(a) == 0) && (extractFloat16Frac(a) != 0);
-}
-
-/*----------------------------------------------------------------------------
-| Convert float16 denormals to zero.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE float16 float16_denormal_to_zero(float16 a)
-{
-  if (float16_is_denormal(a)) a &= 0x8000;
-  return a;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the half-precision floating-point NaN
-| `a' to the canonical NaN format. If `a' is a signaling NaN, the invalid
-| exception is raised.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE commonNaNT float16ToCommonNaN(float16 a, struct float_status_t *status)
-{
-    commonNaNT z;
-    if (float16_is_signaling_nan(a)) float_raise(status, float_flag_invalid);
-    z.sign = a>>15;
-    z.lo = 0;
-    z.hi = ((Bit64u) a)<<54;
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the canonical NaN `a' to the half-
-| precision floating-point format.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE float16 commonNaNToFloat16(commonNaNT a)
-{
-    return (((Bit16u) a.sign)<<15) | 0x7E00 | (Bit16u)(a.hi>>54);
-}
-
-#endif
-
-/*----------------------------------------------------------------------------
-| Commonly used single-precision floating point constants
-*----------------------------------------------------------------------------*/
-extern const float32 float32_negative_inf;
-extern const float32 float32_positive_inf;
-extern const float32 float32_negative_zero;
-extern const float32 float32_positive_zero;
-extern const float32 float32_negative_one;
-extern const float32 float32_positive_one;
-extern const float32 float32_max_float;
-extern const float32 float32_min_float;
-
-/*----------------------------------------------------------------------------
-| The pattern for a default generated single-precision NaN.
-*----------------------------------------------------------------------------*/
-extern const float32 float32_default_nan;
-
-#define float32_fraction extractFloat32Frac
-#define float32_exp extractFloat32Exp
-#define float32_sign extractFloat32Sign
-
-#define FLOAT32_EXP_BIAS 0x7F
-
-/*----------------------------------------------------------------------------
-| Returns the fraction bits of the single-precision floating-point value `a'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE Bit32u extractFloat32Frac(float32 a)
-{
-    return a & 0x007FFFFF;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the exponent bits of the single-precision floating-point value `a'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE Bit16s extractFloat32Exp(float32 a)
-{
-    return (a>>23) & 0xFF;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the sign bit of the single-precision floating-point value `a'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int extractFloat32Sign(float32 a)
-{
-    return a>>31;
-}
-
-/*----------------------------------------------------------------------------
-| Packs the sign `zSign', exponent `zExp', and significand `zSig' into a
-| single-precision floating-point value, returning the result.  After being
-| shifted into the proper positions, the three fields are simply added
-| together to form the result.  This means that any integer portion of `zSig'
-| will be added into the exponent.  Since a properly normalized significand
-| will have an integer portion equal to 1, the `zExp' input should be 1 less
-| than the desired result exponent whenever `zSig' is a complete, normalized
-| significand.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE float32 packFloat32(int zSign, Bit16s zExp, Bit32u zSig)
-{
-    return (((Bit32u) zSign)<<31) + (((Bit32u) zExp)<<23) + zSig;
-}
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the single-precision floating-point value `a' is a NaN;
-| otherwise returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int float32_is_nan(float32 a)
-{
-    return (0xFF000000 < (Bit32u) (a<<1));
-}
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the single-precision floating-point value `a' is a signaling
-| NaN; otherwise returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int float32_is_signaling_nan(float32 a)
-{
-    return (((a>>22) & 0x1FF) == 0x1FE) && (a & 0x003FFFFF);
-}
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the single-precision floating-point value `a' is denormal;
-| otherwise returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int float32_is_denormal(float32 a)
-{
-   return (extractFloat32Exp(a) == 0) && (extractFloat32Frac(a) != 0);
-}
-
-/*----------------------------------------------------------------------------
-| Convert float32 denormals to zero.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE float32 float32_denormal_to_zero(float32 a)
-{
-  if (float32_is_denormal(a)) a &= 0x80000000;
-  return a;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the single-precision floating-point NaN
-| `a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid
-| exception is raised.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE commonNaNT float32ToCommonNaN(float32 a, struct float_status_t *status)
-{
-    commonNaNT z;
-    if (float32_is_signaling_nan(a)) float_raise(status, float_flag_invalid);
-    z.sign = a>>31;
-    z.lo = 0;
-    z.hi = ((Bit64u) a)<<41;
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the canonical NaN `a' to the single-
-| precision floating-point format.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE float32 commonNaNToFloat32(commonNaNT a)
-{
-    return (((Bit32u) a.sign)<<31) | 0x7FC00000 | (Bit32u)(a.hi>>41);
-}
-
-/*----------------------------------------------------------------------------
-| Takes two single-precision floating-point values `a' and `b', one of which
-| is a NaN, and returns the appropriate NaN result.  If either `a' or `b' is a
-| signaling NaN, the invalid exception is raised.
-*----------------------------------------------------------------------------*/
-
-float32 propagateFloat32NaN(float32 a, float32 b, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| Takes single-precision floating-point NaN `a' and returns the appropriate
-| NaN result.  If `a' is a signaling NaN, the invalid exception is raised.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE float32 propagateFloat32NaNOne(float32 a, struct float_status_t *status)
-{
-    if (float32_is_signaling_nan(a))
-        float_raise(status, float_flag_invalid);
-
-    return a | 0x00400000;
-}
-
-/*----------------------------------------------------------------------------
-| Commonly used single-precision floating point constants
-*----------------------------------------------------------------------------*/
-extern const float64 float64_negative_inf;
-extern const float64 float64_positive_inf;
-extern const float64 float64_negative_zero;
-extern const float64 float64_positive_zero;
-extern const float64 float64_negative_one;
-extern const float64 float64_positive_one;
-extern const float64 float64_max_float;
-extern const float64 float64_min_float;
-
-/*----------------------------------------------------------------------------
-| The pattern for a default generated double-precision NaN.
-*----------------------------------------------------------------------------*/
-extern const float64 float64_default_nan;
-
-#define float64_fraction extractFloat64Frac
-#define float64_exp extractFloat64Exp
-#define float64_sign extractFloat64Sign
-
-#define FLOAT64_EXP_BIAS 0x3FF
-
-/*----------------------------------------------------------------------------
-| Returns the fraction bits of the double-precision floating-point value `a'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE Bit64u extractFloat64Frac(float64 a)
-{
-    return a & BX_CONST64(0x000FFFFFFFFFFFFF);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the exponent bits of the double-precision floating-point value `a'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE Bit16s extractFloat64Exp(float64 a)
-{
-    return (Bit16s)(a>>52) & 0x7FF;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the sign bit of the double-precision floating-point value `a'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int extractFloat64Sign(float64 a)
-{
-    return (int)(a>>63);
-}
-
-/*----------------------------------------------------------------------------
-| Packs the sign `zSign', exponent `zExp', and significand `zSig' into a
-| double-precision floating-point value, returning the result.  After being
-| shifted into the proper positions, the three fields are simply added
-| together to form the result.  This means that any integer portion of `zSig'
-| will be added into the exponent.  Since a properly normalized significand
-| will have an integer portion equal to 1, the `zExp' input should be 1 less
-| than the desired result exponent whenever `zSig' is a complete, normalized
-| significand.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE float64 packFloat64(int zSign, Bit16s zExp, Bit64u zSig)
-{
-    return (((Bit64u) zSign)<<63) + (((Bit64u) zExp)<<52) + zSig;
-}
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the double-precision floating-point value `a' is a NaN;
-| otherwise returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int float64_is_nan(float64 a)
-{
-    return (BX_CONST64(0xFFE0000000000000) < (Bit64u) (a<<1));
-}
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the double-precision floating-point value `a' is a signaling
-| NaN; otherwise returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int float64_is_signaling_nan(float64 a)
-{
-    return (((a>>51) & 0xFFF) == 0xFFE) && (a & BX_CONST64(0x0007FFFFFFFFFFFF));
-}
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the double-precision floating-point value `a' is denormal;
-| otherwise returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int float64_is_denormal(float64 a)
-{
-   return (extractFloat64Exp(a) == 0) && (extractFloat64Frac(a) != 0);
-}
-
-/*----------------------------------------------------------------------------
-| Convert float64 denormals to zero.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE float64 float64_denormal_to_zero(float64 a)
-{
-  if (float64_is_denormal(a)) a &= ((Bit64u)(1) << 63);
-  return a;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the double-precision floating-point NaN
-| `a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid
-| exception is raised.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE commonNaNT float64ToCommonNaN(float64 a, struct float_status_t *status)
-{
-    commonNaNT z;
-    if (float64_is_signaling_nan(a)) float_raise(status, float_flag_invalid);
-    z.sign = (int)(a>>63);
-    z.lo = 0;
-    z.hi = a<<12;
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the canonical NaN `a' to the double-
-| precision floating-point format.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE float64 commonNaNToFloat64(commonNaNT a)
-{
-    return (((Bit64u) a.sign)<<63) | BX_CONST64(0x7FF8000000000000) | (a.hi>>12);
-}
-
-/*----------------------------------------------------------------------------
-| Takes two double-precision floating-point values `a' and `b', one of which
-| is a NaN, and returns the appropriate NaN result.  If either `a' or `b' is a
-| signaling NaN, the invalid exception is raised.
-*----------------------------------------------------------------------------*/
-
-float64 propagateFloat64NaN(float64 a, float64 b, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| Takes double-precision floating-point NaN `a' and returns the appropriate
-| NaN result.  If `a' is a signaling NaN, the invalid exception is raised.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE float64 propagateFloat64NaNOne(float64 a, struct float_status_t *status)
-{
-    if (float64_is_signaling_nan(a))
-        float_raise(status, float_flag_invalid);
-
-    return a | BX_CONST64(0x0008000000000000);
-}
-
-#ifdef FLOATX80
-
-/*----------------------------------------------------------------------------
-| The pattern for a default generated extended double-precision NaN.  The
-| `high' and `low' values hold the most- and least-significant bits,
-| respectively.
-*----------------------------------------------------------------------------*/
-#define floatx80_default_nan_exp 0xFFFF
-#define floatx80_default_nan_fraction BX_CONST64(0xC000000000000000)
-
-#define floatx80_fraction extractFloatx80Frac
-#define floatx80_exp extractFloatx80Exp
-#define floatx80_sign extractFloatx80Sign
-
-#define FLOATX80_EXP_BIAS 0x3FFF
-
-/*----------------------------------------------------------------------------
-| Returns the fraction bits of the extended double-precision floating-point
-| value `a'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE Bit64u extractFloatx80Frac(floatx80 a)
-{
-    return a.fraction;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the exponent bits of the extended double-precision floating-point
-| value `a'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE Bit32s extractFloatx80Exp(floatx80 a)
-{
-    return a.exp & 0x7FFF;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the sign bit of the extended double-precision floating-point value
-| `a'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int extractFloatx80Sign(floatx80 a)
-{
-    return a.exp>>15;
-}
-
-/*----------------------------------------------------------------------------
-| Packs the sign `zSign', exponent `zExp', and significand `zSig' into an
-| extended double-precision floating-point value, returning the result.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE floatx80 packFloatx80(int zSign, Bit32s zExp, Bit64u zSig)
-{
-    floatx80 z;
-    z.fraction = zSig;
-    z.exp = (zSign << 15) + zExp;
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the extended double-precision floating-point value `a' is a
-| NaN; otherwise returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int floatx80_is_nan(floatx80 a)
-{
-    // return ((a.exp & 0x7FFF) == 0x7FFF) && (Bit64s) (a.fraction<<1);
-    return ((a.exp & 0x7FFF) == 0x7FFF) && (((Bit64s) (a.fraction<<1)) != 0);
-}
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the extended double-precision floating-point value `a' is a
-| signaling NaN; otherwise returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int floatx80_is_signaling_nan(floatx80 a)
-{
-    Bit64u aLow = a.fraction & ~BX_CONST64(0x4000000000000000);
-    return ((a.exp & 0x7FFF) == 0x7FFF) &&
-            ((Bit64u) (aLow<<1)) && (a.fraction == aLow);
-}
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the extended double-precision floating-point value `a' is an
-| unsupported; otherwise returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int floatx80_is_unsupported(floatx80 a)
-{
-    return ((a.exp & 0x7FFF) && !(a.fraction & BX_CONST64(0x8000000000000000)));
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the extended double-precision floating-
-| point NaN `a' to the canonical NaN format. If `a' is a signaling NaN, the
-| invalid exception is raised.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE commonNaNT floatx80ToCommonNaN(floatx80 a, struct float_status_t *status)
-{
-    commonNaNT z;
-    if (floatx80_is_signaling_nan(a)) float_raise(status, float_flag_invalid);
-    z.sign = a.exp >> 15;
-    z.lo = 0;
-    z.hi = a.fraction << 1;
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the canonical NaN `a' to the extended
-| double-precision floating-point format.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE floatx80 commonNaNToFloatx80(commonNaNT a)
-{
-    floatx80 z;
-    z.fraction = BX_CONST64(0xC000000000000000) | (a.hi>>1);
-    z.exp = (((Bit16u) a.sign)<<15) | 0x7FFF;
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Takes two extended double-precision floating-point values `a' and `b', one
-| of which is a NaN, and returns the appropriate NaN result.  If either `a' or
-| `b' is a signaling NaN, the invalid exception is raised.
-*----------------------------------------------------------------------------*/
-
-floatx80 propagateFloatx80NaN(floatx80 a, floatx80 b, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| Takes extended double-precision floating-point  NaN  `a' and returns the
-| appropriate NaN result. If `a' is a signaling NaN, the invalid exception
-| is raised.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE floatx80 propagateFloatx80NaNOne(floatx80 a, struct float_status_t *status)
-{
-    if (floatx80_is_signaling_nan(a))
-        float_raise(status, float_flag_invalid);
-
-    a.fraction |= BX_CONST64(0xC000000000000000);
-
-    return a;
-}
-
-#endif /* FLOATX80 */
-
-#ifdef FLOAT128
-
-#include "softfloat-macros.h"
-
-/*----------------------------------------------------------------------------
-| The pattern for a default generated quadruple-precision NaN. The `high' and
-| `low' values hold the most- and least-significant bits, respectively.
-*----------------------------------------------------------------------------*/
-#define float128_default_nan_hi BX_CONST64(0xFFFF800000000000)
-#define float128_default_nan_lo BX_CONST64(0x0000000000000000)
-
-#define float128_exp extractFloat128Exp
-
-/*----------------------------------------------------------------------------
-| Returns the least-significant 64 fraction bits of the quadruple-precision
-| floating-point value `a'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE Bit64u extractFloat128Frac1(float128 a)
-{
-    return a.lo;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the most-significant 48 fraction bits of the quadruple-precision
-| floating-point value `a'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE Bit64u extractFloat128Frac0(float128 a)
-{
-    return a.hi & BX_CONST64(0x0000FFFFFFFFFFFF);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the exponent bits of the quadruple-precision floating-point value
-| `a'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE Bit32s extractFloat128Exp(float128 a)
-{
-    return ((Bit32s)(a.hi>>48)) & 0x7FFF;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the sign bit of the quadruple-precision floating-point value `a'.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int extractFloat128Sign(float128 a)
-{
-    return (int)(a.hi >> 63);
-}
-
-/*----------------------------------------------------------------------------
-| Packs the sign `zSign', the exponent `zExp', and the significand formed
-| by the concatenation of `zSig0' and `zSig1' into a quadruple-precision
-| floating-point value, returning the result.  After being shifted into the
-| proper positions, the three fields `zSign', `zExp', and `zSig0' are simply
-| added together to form the most significant 32 bits of the result.  This
-| means that any integer portion of `zSig0' will be added into the exponent.
-| Since a properly normalized significand will have an integer portion equal
-| to 1, the `zExp' input should be 1 less than the desired result exponent
-| whenever `zSig0' and `zSig1' concatenated form a complete, normalized
-| significand.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE float128 packFloat128Four(int zSign, Bit32s zExp, Bit64u zSig0, Bit64u zSig1)
-{
-    float128 z;
-    z.lo = zSig1;
-    z.hi = (((Bit64u) zSign)<<63) + (((Bit64u) zExp)<<48) + zSig0;
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Packs two 64-bit precision integers into into the quadruple-precision
-| floating-point value, returning the result.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE float128 packFloat128(Bit64u zHi, Bit64u zLo)
-{
-    float128 z;
-    z.lo = zLo;
-    z.hi = zHi;
-    return z;
-}
-
-#ifdef _MSC_VER
-#define PACK_FLOAT_128(hi,lo) { lo, hi }
-#else
-#define PACK_FLOAT_128(hi,lo) packFloat128(BX_CONST64(hi),BX_CONST64(lo))
-#endif
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the quadruple-precision floating-point value `a' is a NaN;
-| otherwise returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int float128_is_nan(float128 a)
-{
-    return (BX_CONST64(0xFFFE000000000000) <= (Bit64u) (a.hi<<1))
-        && (a.lo || (a.hi & BX_CONST64(0x0000FFFFFFFFFFFF)));
-}
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the quadruple-precision floating-point value `a' is a
-| signaling NaN; otherwise returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int float128_is_signaling_nan(float128 a)
-{
-    return (((a.hi>>47) & 0xFFFF) == 0xFFFE)
-        && (a.lo || (a.hi & BX_CONST64(0x00007FFFFFFFFFFF)));
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the quadruple-precision floating-point NaN
-| `a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid
-| exception is raised.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE commonNaNT float128ToCommonNaN(float128 a, struct float_status_t *status)
-{
-    commonNaNT z;
-    if (float128_is_signaling_nan(a)) float_raise(status, float_flag_invalid);
-    z.sign = (int)(a.hi>>63);
-    shortShift128Left(a.hi, a.lo, 16, &z.hi, &z.lo);
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the canonical NaN `a' to the quadruple-
-| precision floating-point format.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE float128 commonNaNToFloat128(commonNaNT a)
-{
-    float128 z;
-    shift128Right(a.hi, a.lo, 16, &z.hi, &z.lo);
-    z.hi |= (((Bit64u) a.sign)<<63) | BX_CONST64(0x7FFF800000000000);
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Takes two quadruple-precision floating-point values `a' and `b', one of
-| which is a NaN, and returns the appropriate NaN result.  If either `a' or
-| `b' is a signaling NaN, the invalid exception is raised.
-*----------------------------------------------------------------------------*/
-
-float128 propagateFloat128NaN(float128 a, float128 b, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| The pattern for a default generated quadruple-precision NaN.
-*----------------------------------------------------------------------------*/
-extern const float128 float128_default_nan;
-
-#endif /* FLOAT128 */
-
-#endif
diff --git a/src/cpu/softfloat/softfloat.cc b/src/cpu/softfloat/softfloat.cc
deleted file mode 100644
index 0802089b9..000000000
--- a/src/cpu/softfloat/softfloat.cc
+++ /dev/null
@@ -1,4012 +0,0 @@
-/*============================================================================
-This C source file is part of the SoftFloat IEC/IEEE Floating-point Arithmetic
-Package, Release 2b.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://www.cs.berkeley.edu/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has
-been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES
-RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS
-AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,
-COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE
-EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
-INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
-OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) the source code for the derivative work includes prominent notice that
-the work is derivative, and (2) the source code includes prominent notice with
-these four paragraphs for those parts of this code that are retained.
-=============================================================================*/
-
-#define FLOAT128
-
-/*============================================================================
- * Adapted for Bochs (x86 achitecture simulator) by
- *            Stanislav Shwartsman [sshwarts at sourceforge net]
- * ==========================================================================*/
-
-#include "softfloat.h"
-#include "softfloat-round-pack.h"
-
-/*----------------------------------------------------------------------------
-| Primitive arithmetic functions, including multi-word arithmetic, and
-| division and square root approximations. (Can be specialized to target
-| if desired).
-*----------------------------------------------------------------------------*/
-#define USE_estimateDiv128To64
-#define USE_estimateSqrt32
-#include "softfloat-macros.h"
-
-/*----------------------------------------------------------------------------
-| Functions and definitions to determine:  (1) whether tininess for underflow
-| is detected before or after rounding by default, (2) what (if anything)
-| happens when exceptions are raised, (3) how signaling NaNs are distinguished
-| from quiet NaNs, (4) the default generated quiet NaNs, and (5) how NaNs
-| are propagated from function inputs to output.  These details are target-
-| specific.
-*----------------------------------------------------------------------------*/
-#include "softfloat-specialize.h"
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the 32-bit two's complement integer `a'
-| to the single-precision floating-point format.  The conversion is performed
-| according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-const unsigned float_all_exceptions_mask = 0x3f;
-
-float32 int32_to_float32(Bit32s a, struct float_status_t *status)
-{
-    if (a == 0) return 0;
-    if (a == (Bit32s) 0x80000000) return packFloat32(1, 0x9E, 0);
-    int zSign = (a < 0);
-    return normalizeRoundAndPackFloat32(zSign, 0x9C, zSign ? -a : a, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the 32-bit two's complement integer `a'
-| to the double-precision floating-point format.  The conversion is performed
-| according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 int32_to_float64(Bit32s a)
-{
-    if (a == 0) return 0;
-    int zSign = (a < 0);
-    Bit32u absA = zSign ? -a : a;
-    int shiftCount = countLeadingZeros32(absA) + 21;
-    Bit64u zSig = absA;
-    return packFloat64(zSign, 0x432 - shiftCount, zSig<<shiftCount);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the 64-bit two's complement integer `a'
-| to the single-precision floating-point format.  The conversion is performed
-| according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 int64_to_float32(Bit64s a, struct float_status_t *status)
-{
-    if (a == 0) return 0;
-    int zSign = (a < 0);
-    Bit64u absA = zSign ? -a : a;
-    int shiftCount = countLeadingZeros64(absA) - 40;
-    if (0 <= shiftCount) {
-        return packFloat32(zSign, 0x95 - shiftCount, (Bit32u)(absA<<shiftCount));
-    }
-    else {
-        shiftCount += 7;
-        if (shiftCount < 0) {
-            absA = shift64RightJamming(absA, -shiftCount);
-        }
-        else {
-            absA <<= shiftCount;
-        }
-        return roundAndPackFloat32(zSign, 0x9C - shiftCount, (Bit32u) absA, status);
-    }
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the 64-bit two's complement integer `a'
-| to the double-precision floating-point format.  The conversion is performed
-| according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 int64_to_float64(Bit64s a, struct float_status_t *status)
-{
-    if (a == 0) return 0;
-    if (a == (Bit64s) BX_CONST64(0x8000000000000000)) {
-        return packFloat64(1, 0x43E, 0);
-    }
-    int zSign = (a < 0);
-    return normalizeRoundAndPackFloat64(zSign, 0x43C, zSign ? -a : a, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the 32-bit unsigned integer `a' to the
-| single-precision floating-point format.  The conversion is performed
-| according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 uint32_to_float32(Bit32u a, struct float_status_t *status)
-{
-    if (a == 0) return 0;
-    if (a & 0x80000000) return normalizeRoundAndPackFloat32(0, 0x9D, a >> 1, status);
-    return normalizeRoundAndPackFloat32(0, 0x9C, a, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the 32-bit unsigned integer `a' to the
-| double-precision floating-point format.  The conversion is performed
-| according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 uint32_to_float64(Bit32u a)
-{
-   if (a == 0) return 0;
-   int shiftCount = countLeadingZeros32(a) + 21;
-   Bit64u zSig = a;
-   return packFloat64(0, 0x432 - shiftCount, zSig<<shiftCount);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the 64-bit unsigned integer integer `a'
-| to the single-precision floating-point format.  The conversion is performed
-| according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 uint64_to_float32(Bit64u a, struct float_status_t *status)
-{
-    if (a == 0) return 0;
-    int shiftCount = countLeadingZeros64(a) - 40;
-    if (0 <= shiftCount) {
-        return packFloat32(0, 0x95 - shiftCount, (Bit32u)(a<<shiftCount));
-    }
-    else {
-        shiftCount += 7;
-        if (shiftCount < 0) {
-            a = shift64RightJamming(a, -shiftCount);
-        }
-        else {
-            a <<= shiftCount;
-        }
-        return roundAndPackFloat32(0, 0x9C - shiftCount, (Bit32u) a, status);
-    }
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the 64-bit unsigned integer integer `a'
-| to the double-precision floating-point format.  The conversion is performed
-| according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 uint64_to_float64(Bit64u a, struct float_status_t *status)
-{
-    if (a == 0) return 0;
-    if (a & BX_CONST64(0x8000000000000000))
-        return normalizeRoundAndPackFloat64(0, 0x43D, a >> 1, status);
-    return normalizeRoundAndPackFloat64(0, 0x43C, a, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the single-precision floating-point value
-| `a' to the 32-bit two's complement integer format.  The conversion is
-| performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic - which means in particular that the conversion is rounded
-| according to the current rounding mode.  If `a' is a NaN or the
-| conversion overflows the integer indefinite value is returned.
-*----------------------------------------------------------------------------*/
-
-Bit32s float32_to_int32(float32 a, struct float_status_t *status)
-{
-    Bit32u aSig = extractFloat32Frac(a);
-    Bit16s aExp = extractFloat32Exp(a);
-    int aSign = extractFloat32Sign(a);
-    if ((aExp == 0xFF) && aSig) aSign = 0;
-    if (aExp) aSig |= 0x00800000;
-    else {
-        if (get_denormals_are_zeros(status)) aSig = 0;
-    }
-    int shiftCount = 0xAF - aExp;
-    Bit64u aSig64 = Bit64u(aSig) << 32;
-    if (0 < shiftCount) aSig64 = shift64RightJamming(aSig64, shiftCount);
-    return roundAndPackInt32(aSign, aSig64, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the single-precision floating-point value
-| `a' to the 32-bit two's complement integer format.  The conversion is
-| performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic, except that the conversion is always rounded toward zero.
-| If `a' is a NaN or the conversion overflows, the integer indefinite
-| value is returned.
-*----------------------------------------------------------------------------*/
-
-Bit32s float32_to_int32_round_to_zero(float32 a, struct float_status_t *status)
-{
-    int aSign;
-    Bit16s aExp;
-    Bit32u aSig;
-    Bit32s z;
-
-    aSig = extractFloat32Frac(a);
-    aExp = extractFloat32Exp(a);
-    aSign = extractFloat32Sign(a);
-    int shiftCount = aExp - 0x9E;
-    if (0 <= shiftCount) {
-        if (a != 0xCF000000) {
-            float_raise(status, float_flag_invalid);
-        }
-        return (Bit32s)(int32_indefinite);
-    }
-    else if (aExp <= 0x7E) {
-        if (get_denormals_are_zeros(status) && aExp == 0) aSig = 0;
-        if (aExp | aSig) float_raise(status, float_flag_inexact);
-        return 0;
-    }
-    aSig = (aSig | 0x800000)<<8;
-    z = aSig>>(-shiftCount);
-    if ((Bit32u) (aSig<<(shiftCount & 31))) {
-        float_raise(status, float_flag_inexact);
-    }
-    if (aSign) z = -z;
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the single-precision floating-point value
-| `a' to the 32-bit unsigned integer format.  The conversion is performed
-| according to the IEC/IEEE Standard for Binary Floating-point Arithmetic,
-| except that the conversion is always rounded toward zero.  If `a' is a NaN
-| or conversion overflows, the largest positive integer is returned.
-*----------------------------------------------------------------------------*/
-
-Bit32u float32_to_uint32_round_to_zero(float32 a, struct float_status_t *status)
-{
-    int aSign;
-    Bit16s aExp;
-    Bit32u aSig;
-
-    aSig = extractFloat32Frac(a);
-    aExp = extractFloat32Exp(a);
-    aSign = extractFloat32Sign(a);
-    int shiftCount = aExp - 0x9E;
-
-    if (aExp <= 0x7E) {
-        if (get_denormals_are_zeros(status) && aExp == 0) aSig = 0;
-        if (aExp | aSig) float_raise(status, float_flag_inexact);
-        return 0;
-    }
-    else if (0 < shiftCount || aSign) {
-        float_raise(status, float_flag_invalid);
-        return uint32_indefinite;
-    }
-
-    aSig = (aSig | 0x800000)<<8;
-    Bit32u z = aSig >> (-shiftCount);
-    if (aSig << (shiftCount & 31)) {
-        float_raise(status, float_flag_inexact);
-    }
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the single-precision floating-point value
-| `a' to the 64-bit two's complement integer format.  The conversion is
-| performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic - which means in particular that the conversion is rounded
-| according to the current rounding mode. If `a' is a NaN or the
-| conversion overflows, the integer indefinite value is returned.
-*----------------------------------------------------------------------------*/
-
-Bit64s float32_to_int64(float32 a, struct float_status_t *status)
-{
-    Bit64u aSig64, aSigExtra;
-
-    Bit32u aSig = extractFloat32Frac(a);
-    Bit16s aExp = extractFloat32Exp(a);
-    int aSign = extractFloat32Sign(a);
-
-    int shiftCount = 0xBE - aExp;
-    if (shiftCount < 0) {
-        float_raise(status, float_flag_invalid);
-        return (Bit64s)(int64_indefinite);
-    }
-    if (aExp) aSig |= 0x00800000;
-    else {
-        if (get_denormals_are_zeros(status)) aSig = 0;
-    }
-    aSig64 = aSig;
-    aSig64 <<= 40;
-    shift64ExtraRightJamming(aSig64, 0, shiftCount, &aSig64, &aSigExtra);
-    return roundAndPackInt64(aSign, aSig64, aSigExtra, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the single-precision floating-point value
-| `a' to the 64-bit two's complement integer format.  The conversion is
-| performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic, except that the conversion is always rounded toward zero.
-| If `a' is a NaN or the conversion overflows, the integer indefinite
-| value is returned.
-*----------------------------------------------------------------------------*/
-
-Bit64s float32_to_int64_round_to_zero(float32 a, struct float_status_t *status)
-{
-    int aSign;
-    Bit16s aExp;
-    Bit32u aSig;
-    Bit64u aSig64;
-    Bit64s z;
-
-    aSig = extractFloat32Frac(a);
-    aExp = extractFloat32Exp(a);
-    aSign = extractFloat32Sign(a);
-    int shiftCount = aExp - 0xBE;
-    if (0 <= shiftCount) {
-        if (a != 0xDF000000) {
-            float_raise(status, float_flag_invalid);
-        }
-        return (Bit64s)(int64_indefinite);
-    }
-    else if (aExp <= 0x7E) {
-        if (get_denormals_are_zeros(status) && aExp == 0) aSig = 0;
-        if (aExp | aSig) float_raise(status, float_flag_inexact);
-        return 0;
-    }
-    aSig64 = aSig | 0x00800000;
-    aSig64 <<= 40;
-    z = aSig64>>(-shiftCount);
-    if ((Bit64u) (aSig64<<(shiftCount & 63))) {
-        float_raise(status, float_flag_inexact);
-    }
-    if (aSign) z = -z;
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the single-precision floating-point value
-| `a' to the 64-bit unsigned integer format.  The conversion is performed
-| according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic,
-| except that the conversion is always rounded toward zero. If `a' is a NaN
-| or the conversion overflows, the largest unsigned integer is returned.
-*----------------------------------------------------------------------------*/
-
-Bit64u float32_to_uint64_round_to_zero(float32 a, struct float_status_t *status)
-{
-    int aSign;
-    Bit16s aExp;
-    Bit32u aSig;
-    Bit64u aSig64;
-
-    aSig = extractFloat32Frac(a);
-    aExp = extractFloat32Exp(a);
-    aSign = extractFloat32Sign(a);
-    int shiftCount = aExp - 0xBE;
-
-    if (aExp <= 0x7E) {
-        if (get_denormals_are_zeros(status) && aExp == 0) aSig = 0;
-        if (aExp | aSig) float_raise(status, float_flag_inexact);
-        return 0;
-    }
-    else if (0 < shiftCount || aSign) {
-        float_raise(status, float_flag_invalid);
-        return uint64_indefinite;
-    }
-
-    aSig64 = aSig | 0x00800000;
-    aSig64 <<= 40;
-    Bit64u z = aSig64>>(-shiftCount);
-    if ((Bit64u) (aSig64<<(shiftCount & 63))) {
-        float_raise(status, float_flag_inexact);
-    }
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the single-precision floating-point value
-| `a' to the 64-bit unsigned integer format.  The conversion is
-| performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic---which means in particular that the conversion is rounded
-| according to the current rounding mode.  If `a' is a NaN or the conversion
-| overflows, the largest unsigned integer is returned.
-*----------------------------------------------------------------------------*/
-
-Bit64u float32_to_uint64(float32 a, struct float_status_t *status)
-{
-    int aSign;
-    Bit16s aExp, shiftCount;
-    Bit32u aSig;
-    Bit64u aSig64, aSigExtra;
-
-    aSig = extractFloat32Frac(a);
-    aExp = extractFloat32Exp(a);
-    aSign = extractFloat32Sign(a);
-
-    if (get_denormals_are_zeros(status)) {
-        if (aExp == 0) aSig = 0;
-    }
-
-    if ((aSign) && (aExp > 0x7E)) {
-        float_raise(status, float_flag_invalid);
-        return uint64_indefinite;
-    }
-
-    shiftCount = 0xBE - aExp;
-    if (aExp) aSig |= 0x00800000;
-
-    if (shiftCount < 0) {
-        float_raise(status, float_flag_invalid);
-        return uint64_indefinite;
-    }
-
-    aSig64 = aSig;
-    aSig64 <<= 40;
-    shift64ExtraRightJamming(aSig64, 0, shiftCount, &aSig64, &aSigExtra);
-    return roundAndPackUint64(aSign, aSig64, aSigExtra, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the single-precision floating-point value
-| `a' to the 32-bit unsigned integer format.  The conversion is
-| performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic---which means in particular that the conversion is rounded
-| according to the current rounding mode.  If `a' is a NaN or the conversion
-| overflows, the largest unsigned integer is returned.
-*----------------------------------------------------------------------------*/
-
-Bit32u float32_to_uint32(float32 a, struct float_status_t *status)
-{
-    Bit64u val_64 = float32_to_uint64(a, status);
-
-    if (val_64 > 0xffffffff) {
-        status->float_exception_flags = float_flag_invalid; // throw away other flags
-        return uint32_indefinite;
-    }
-
-    return (Bit32u) val_64;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the single-precision floating-point value
-| `a' to the double-precision floating-point format.  The conversion is
-| performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 float32_to_float64(float32 a, struct float_status_t *status)
-{
-    Bit32u aSig = extractFloat32Frac(a);
-    Bit16s aExp = extractFloat32Exp(a);
-    int  aSign = extractFloat32Sign(a);
-
-    if (aExp == 0xFF) {
-        if (aSig) return commonNaNToFloat64(float32ToCommonNaN(a, status));
-        return packFloat64(aSign, 0x7FF, 0);
-    }
-    if (aExp == 0) {
-        if (aSig == 0 || get_denormals_are_zeros(status))
-            return packFloat64(aSign, 0, 0);
-
-        float_raise(status, float_flag_denormal);
-        normalizeFloat32Subnormal(aSig, &aExp, &aSig);
-        --aExp;
-    }
-    return packFloat64(aSign, aExp + 0x380, ((Bit64u) aSig)<<29);
-}
-
-/*----------------------------------------------------------------------------
-| Rounds the single-precision floating-point value `a' to an integer, and
-| returns the result as a single-precision floating-point value.  The
-| operation is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 float32_round_to_int(float32 a, Bit8u scale, struct float_status_t *status)
-{
-    Bit32u lastBitMask, roundBitsMask;
-    int roundingMode = get_float_rounding_mode(status);
-    Bit16s aExp = extractFloat32Exp(a);
-    scale &= 0xf;
-
-    if ((aExp == 0xFF) && extractFloat32Frac(a)) {
-        return propagateFloat32NaNOne(a, status);
-    }
-
-    aExp += scale; // scale the exponent
-
-    if (0x96 <= aExp) {
-        return a;
-    }
-
-    if (get_denormals_are_zeros(status)) {
-        a = float32_denormal_to_zero(a);
-    }
-
-    if (aExp <= 0x7E) {
-        if ((Bit32u) (a<<1) == 0) return a;
-        float_raise(status, float_flag_inexact);
-        int aSign = extractFloat32Sign(a);
-        switch (roundingMode) {
-         case float_round_nearest_even:
-            if ((aExp == 0x7E) && extractFloat32Frac(a)) {
-                return packFloat32(aSign, 0x7F - scale, 0);
-            }
-            break;
-         case float_round_down:
-            return aSign ? packFloat32(1, 0x7F - scale, 0) : float32_positive_zero;
-         case float_round_up:
-            return aSign ? float32_negative_zero : packFloat32(0, 0x7F - scale, 0);
-        }
-        return packFloat32(aSign, 0, 0);
-    }
-
-    lastBitMask = 1;
-    lastBitMask <<= 0x96 - aExp;
-    roundBitsMask = lastBitMask - 1;
-    float32 z = a;
-    if (roundingMode == float_round_nearest_even) {
-        z += lastBitMask>>1;
-        if ((z & roundBitsMask) == 0) z &= ~lastBitMask;
-    }
-    else if (roundingMode != float_round_to_zero) {
-        if (extractFloat32Sign(z) ^ (roundingMode == float_round_up)) {
-            z += roundBitsMask;
-        }
-    }
-    z &= ~roundBitsMask;
-    if (z != a) float_raise(status, float_flag_inexact);
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Extracts the fractional portion of single-precision floating-point value `a',
-| and returns the result  as a  single-precision  floating-point value. The
-| fractional results are precise. The operation is performed according to the
-| IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 float32_frc(float32 a, struct float_status_t *status)
-{
-    int roundingMode = get_float_rounding_mode(status);
-
-    Bit16s aExp = extractFloat32Exp(a);
-    Bit32u aSig = extractFloat32Frac(a);
-    int aSign = extractFloat32Sign(a);
-
-    if (aExp == 0xFF) {
-        if (aSig) return propagateFloat32NaNOne(a, status);
-        float_raise(status, float_flag_invalid);
-        return float32_default_nan;
-    }
-
-    if (aExp >= 0x96) {
-        return packFloat32(roundingMode == float_round_down, 0, 0);
-    }
-
-    if (aExp < 0x7F) {
-        if (aExp == 0) {
-            if (aSig == 0 || get_denormals_are_zeros(status))
-                return packFloat32(roundingMode == float_round_down, 0, 0);
-
-            float_raise(status, float_flag_denormal);
-            if (! float_exception_masked(status, float_flag_underflow))
-                float_raise(status, float_flag_underflow);
-
-            if(get_flush_underflow_to_zero(status)) {
-                float_raise(status, float_flag_underflow | float_flag_inexact);
-                return packFloat32(aSign, 0, 0);
-            }
-        }
-        return a;
-    }
-
-    Bit32u lastBitMask = 1 << (0x96 - aExp);
-    Bit32u roundBitsMask = lastBitMask - 1;
-
-    aSig &= roundBitsMask;
-    aSig <<= 7;
-    aExp--;
-
-    if (aSig == 0)
-       return packFloat32(roundingMode == float_round_down, 0, 0);
-
-    return normalizeRoundAndPackFloat32(aSign, aExp, aSig, status);
-}
-
-/*----------------------------------------------------------------------------
-| Extracts the exponent portion of single-precision floating-point value 'a',
-| and returns the result as a single-precision floating-point value
-| representing unbiased integer exponent. The operation is performed according
-| to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 float32_getexp(float32 a, struct float_status_t *status)
-{
-    Bit16s aExp = extractFloat32Exp(a);
-    Bit32u aSig = extractFloat32Frac(a);
-
-    if (aExp == 0xFF) {
-        if (aSig) return propagateFloat32NaNOne(a, status);
-        return float32_positive_inf;
-    }
-
-    if (aExp == 0) {
-        if (aSig == 0 || get_denormals_are_zeros(status))
-            return float32_negative_inf;
-
-        float_raise(status, float_flag_denormal);
-        normalizeFloat32Subnormal(aSig, &aExp, &aSig);
-    }
-
-    return int32_to_float32(aExp - 0x7F, status);
-}
-
-/*----------------------------------------------------------------------------
-| Extracts the mantissa of single-precision floating-point value 'a' and
-| returns the result as a single-precision floating-point after applying
-| the mantissa interval normalization and sign control. The operation is
-| performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 float32_getmant(float32 a, struct float_status_t *status, int sign_ctrl, int interv)
-{
-    Bit16s aExp = extractFloat32Exp(a);
-    Bit32u aSig = extractFloat32Frac(a);
-    int aSign = extractFloat32Sign(a);
-
-    if (aExp == 0xFF) {
-        if (aSig) return propagateFloat32NaNOne(a, status);
-        if (aSign) {
-            if (sign_ctrl & 0x2) {
-                float_raise(status, float_flag_invalid);
-                return float32_default_nan;
-            }
-        }
-        return packFloat32(~sign_ctrl & aSign, 0x7F, 0);
-    }
-
-    if (aExp == 0 && (aSig == 0 || get_denormals_are_zeros(status))) {
-        return packFloat32(~sign_ctrl & aSign, 0x7F, 0);
-    }
-
-    if (aSign) {
-        if (sign_ctrl & 0x2) {
-            float_raise(status, float_flag_invalid);
-            return float32_default_nan;
-        }
-    }
-
-    if (aExp == 0) {
-        float_raise(status, float_flag_denormal);
-        normalizeFloat32Subnormal(aSig, &aExp, &aSig);
-//      aExp += 0x7E;
-        aSig &= 0x7FFFFF;
-    }
-
-    switch(interv) {
-    case 0x0: // interval [1,2)
-        aExp = 0x7F;
-        break;
-    case 0x1: // interval [1/2,2)
-        aExp -= 0x7F;
-        aExp  = 0x7F - (aExp & 0x1);
-        break;
-    case 0x2: // interval [1/2,1)
-        aExp = 0x7E;
-        break;
-    case 0x3: // interval [3/4,3/2)
-        aExp = 0x7F - ((aSig >> 22) & 0x1);
-        break;
-    }
-
-    return packFloat32(~sign_ctrl & aSign, aExp, aSig);
-}
-
-/*----------------------------------------------------------------------------
-| Return the result of a floating point scale of the single-precision floating
-| point value `a' by multiplying it by 2 power of the single-precision
-| floating point value 'b' converted to integral value. If the result cannot
-| be represented in single precision, then the proper overflow response (for
-| positive scaling operand), or the proper underflow response (for negative
-| scaling operand) is issued. The operation is performed according to the
-| IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 float32_scalef(float32 a, float32 b, struct float_status_t *status)
-{
-    Bit32u aSig = extractFloat32Frac(a);
-    Bit16s aExp = extractFloat32Exp(a);
-    int aSign = extractFloat32Sign(a);
-    Bit32u bSig = extractFloat32Frac(b);
-    Bit16s bExp = extractFloat32Exp(b);
-    int bSign = extractFloat32Sign(b);
-
-    if (get_denormals_are_zeros(status)) {
-        if (aExp == 0) aSig = 0;
-        if (bExp == 0) bSig = 0;
-    }
-
-    if (bExp == 0xFF) {
-        if (bSig) return propagateFloat32NaN(a, b, status);
-    }
-
-    if (aExp == 0xFF) {
-        if (aSig) {
-            int aIsSignalingNaN = (aSig & 0x00400000) == 0;
-            if (aIsSignalingNaN || bExp != 0xFF || bSig)
-                return propagateFloat32NaN(a, b, status);
-
-            return bSign ? 0 : float32_positive_inf;
-        }
-
-        if (bExp == 0xFF && bSign) {
-            float_raise(status, float_flag_invalid);
-            return float32_default_nan;
-        }
-        return a;
-    }
-
-    if (aExp == 0) {
-        if (aSig == 0) {
-            if (bExp == 0xFF && ! bSign) {
-                float_raise(status, float_flag_invalid);
-                return float32_default_nan;
-            }
-            return a;
-        }
-        float_raise(status, float_flag_denormal);
-    }
-
-    if ((bExp | bSig) == 0) return a;
-
-    if (bExp == 0xFF) {
-        if (bSign) return packFloat32(aSign, 0, 0);
-        return packFloat32(aSign, 0xFF, 0);
-    }
-
-    if (bExp >= 0x8E) {
-        // handle obvious overflow/underflow result
-        return roundAndPackFloat32(aSign, bSign ? -0x7F : 0xFF, aSig, status);
-    }
-
-    int scale = 0;
-
-    if (bExp <= 0x7E) {
-        if (bExp == 0)
-            float_raise(status, float_flag_denormal);
-        scale = -bSign;
-    }
-    else {
-        int shiftCount = bExp - 0x9E;
-        bSig = (bSig | 0x800000)<<8;
-        scale = bSig>>(-shiftCount);
-
-        if (bSign) {
-            if ((Bit32u) (bSig<<(shiftCount & 31))) scale++;
-            scale = -scale;
-        }
-
-        if (scale >  0x200) scale =  0x200;
-        if (scale < -0x200) scale = -0x200;
-    }
-
-    if (aExp != 0) {
-        aSig |= 0x00800000;
-    } else {
-        aExp++;
-    }
-
-    aExp += scale - 1;
-    aSig <<= 7;
-    return normalizeRoundAndPackFloat32(aSign, aExp, aSig, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of adding the absolute values of the single-precision
-| floating-point values `a' and `b'.  If `zSign' is 1, the sum is negated
-| before being returned.  `zSign' is ignored if the result is a NaN.
-| The addition is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-static float32 addFloat32Sigs(float32 a, float32 b, int zSign, struct float_status_t *status)
-{
-    Bit16s aExp, bExp, zExp;
-    Bit32u aSig, bSig, zSig;
-    Bit16s expDiff;
-
-    aSig = extractFloat32Frac(a);
-    aExp = extractFloat32Exp(a);
-    bSig = extractFloat32Frac(b);
-    bExp = extractFloat32Exp(b);
-
-    if (get_denormals_are_zeros(status)) {
-        if (aExp == 0) aSig = 0;
-        if (bExp == 0) bSig = 0;
-    }
-
-    expDiff = aExp - bExp;
-    aSig <<= 6;
-    bSig <<= 6;
-
-    if (0 < expDiff) {
-        if (aExp == 0xFF) {
-            if (aSig) return propagateFloat32NaN(a, b, status);
-            if (bSig && (bExp == 0)) float_raise(status, float_flag_denormal);
-            return a;
-        }
-        if ((aExp == 0) && aSig)
-            float_raise(status, float_flag_denormal);
-
-        if (bExp == 0) {
-            if (bSig) float_raise(status, float_flag_denormal);
-            --expDiff;
-        }
-        else bSig |= 0x20000000;
-
-        bSig = shift32RightJamming(bSig, expDiff);
-        zExp = aExp;
-    }
-    else if (expDiff < 0) {
-        if (bExp == 0xFF) {
-            if (bSig) return propagateFloat32NaN(a, b, status);
-            if (aSig && (aExp == 0)) float_raise(status, float_flag_denormal);
-            return packFloat32(zSign, 0xFF, 0);
-        }
-        if ((bExp == 0) && bSig)
-            float_raise(status, float_flag_denormal);
-
-        if (aExp == 0) {
-            if (aSig) float_raise(status, float_flag_denormal);
-            ++expDiff;
-        }
-        else aSig |= 0x20000000;
-
-        aSig = shift32RightJamming(aSig, -expDiff);
-        zExp = bExp;
-    }
-    else {
-        if (aExp == 0xFF) {
-            if (aSig | bSig) return propagateFloat32NaN(a, b, status);
-            return a;
-        }
-        if (aExp == 0) {
-            zSig = (aSig + bSig) >> 6;
-            if (aSig | bSig) {
-                float_raise(status, float_flag_denormal);
-                if (get_flush_underflow_to_zero(status) && (extractFloat32Frac(zSig) == zSig)) {
-                    float_raise(status, float_flag_underflow | float_flag_inexact);
-                    return packFloat32(zSign, 0, 0);
-                }
-                if (! float_exception_masked(status, float_flag_underflow)) {
-                    if (extractFloat32Frac(zSig) == zSig)
-                        float_raise(status, float_flag_underflow);
-                }
-            }
-            return packFloat32(zSign, 0, zSig);
-        }
-        zSig = 0x40000000 + aSig + bSig;
-        return roundAndPackFloat32(zSign, aExp, zSig, status);
-    }
-    aSig |= 0x20000000;
-    zSig = (aSig + bSig)<<1;
-    --zExp;
-    if ((Bit32s) zSig < 0) {
-        zSig = aSig + bSig;
-        ++zExp;
-    }
-    return roundAndPackFloat32(zSign, zExp, zSig, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of subtracting the absolute values of the single-
-| precision floating-point values `a' and `b'.  If `zSign' is 1, the
-| difference is negated before being returned.  `zSign' is ignored if the
-| result is a NaN.  The subtraction is performed according to the IEC/IEEE
-| Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-static float32 subFloat32Sigs(float32 a, float32 b, int zSign, struct float_status_t *status)
-{
-    Bit16s aExp, bExp, zExp;
-    Bit32u aSig, bSig, zSig;
-    Bit16s expDiff;
-
-    aSig = extractFloat32Frac(a);
-    aExp = extractFloat32Exp(a);
-    bSig = extractFloat32Frac(b);
-    bExp = extractFloat32Exp(b);
-
-    if (get_denormals_are_zeros(status)) {
-        if (aExp == 0) aSig = 0;
-        if (bExp == 0) bSig = 0;
-    }
-
-    expDiff = aExp - bExp;
-    aSig <<= 7;
-    bSig <<= 7;
-    if (0 < expDiff) goto aExpBigger;
-    if (expDiff < 0) goto bExpBigger;
-    if (aExp == 0xFF) {
-        if (aSig | bSig) return propagateFloat32NaN(a, b, status);
-        float_raise(status, float_flag_invalid);
-        return float32_default_nan;
-    }
-    if (aExp == 0) {
-        if (aSig | bSig) float_raise(status, float_flag_denormal);
-        aExp = 1;
-        bExp = 1;
-    }
-    if (bSig < aSig) goto aBigger;
-    if (aSig < bSig) goto bBigger;
-    return packFloat32(get_float_rounding_mode(status) == float_round_down, 0, 0);
- bExpBigger:
-    if (bExp == 0xFF) {
-        if (bSig) return propagateFloat32NaN(a, b, status);
-        if (aSig && (aExp == 0)) float_raise(status, float_flag_denormal);
-        return packFloat32(zSign ^ 1, 0xFF, 0);
-    }
-    if ((bExp == 0) && bSig)
-        float_raise(status, float_flag_denormal);
-
-    if (aExp == 0) {
-        if (aSig) float_raise(status, float_flag_denormal);
-        ++expDiff;
-    }
-    else aSig |= 0x40000000;
-
-    aSig = shift32RightJamming(aSig, -expDiff);
-    bSig |= 0x40000000;
- bBigger:
-    zSig = bSig - aSig;
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aExpBigger:
-    if (aExp == 0xFF) {
-        if (aSig) return propagateFloat32NaN(a, b, status);
-        if (bSig && (bExp == 0)) float_raise(status, float_flag_denormal);
-        return a;
-    }
-    if ((aExp == 0) && aSig)
-        float_raise(status, float_flag_denormal);
-
-    if (bExp == 0) {
-        if (bSig) float_raise(status, float_flag_denormal);
-        --expDiff;
-    }
-    else bSig |= 0x40000000;
-
-    bSig = shift32RightJamming(bSig, expDiff);
-    aSig |= 0x40000000;
- aBigger:
-    zSig = aSig - bSig;
-    zExp = aExp;
- normalizeRoundAndPack:
-    --zExp;
-    return normalizeRoundAndPackFloat32(zSign, zExp, zSig, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of adding the single-precision floating-point values `a'
-| and `b'.  The operation is performed according to the IEC/IEEE Standard for
-| Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 float32_add(float32 a, float32 b, struct float_status_t *status)
-{
-    int aSign = extractFloat32Sign(a);
-    int bSign = extractFloat32Sign(b);
-
-    if (aSign == bSign) {
-        return addFloat32Sigs(a, b, aSign, status);
-    }
-    else {
-        return subFloat32Sigs(a, b, aSign, status);
-    }
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of subtracting the single-precision floating-point values
-| `a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-| for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 float32_sub(float32 a, float32 b, struct float_status_t *status)
-{
-    int aSign = extractFloat32Sign(a);
-    int bSign = extractFloat32Sign(b);
-
-    if (aSign == bSign) {
-        return subFloat32Sigs(a, b, aSign, status);
-    }
-    else {
-        return addFloat32Sigs(a, b, aSign, status);
-    }
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of multiplying the single-precision floating-point values
-| `a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-| for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 float32_mul(float32 a, float32 b, struct float_status_t *status)
-{
-    int aSign, bSign, zSign;
-    Bit16s aExp, bExp, zExp;
-    Bit32u aSig, bSig;
-    Bit64u zSig64;
-    Bit32u zSig;
-
-    aSig = extractFloat32Frac(a);
-    aExp = extractFloat32Exp(a);
-    aSign = extractFloat32Sign(a);
-    bSig = extractFloat32Frac(b);
-    bExp = extractFloat32Exp(b);
-    bSign = extractFloat32Sign(b);
-    zSign = aSign ^ bSign;
-
-    if (get_denormals_are_zeros(status)) {
-        if (aExp == 0) aSig = 0;
-        if (bExp == 0) bSig = 0;
-    }
-
-    if (aExp == 0xFF) {
-        if (aSig || ((bExp == 0xFF) && bSig))
-            return propagateFloat32NaN(a, b, status);
-
-        if ((bExp | bSig) == 0) {
-            float_raise(status, float_flag_invalid);
-            return float32_default_nan;
-        }
-        if (bSig && (bExp == 0)) float_raise(status, float_flag_denormal);
-        return packFloat32(zSign, 0xFF, 0);
-    }
-    if (bExp == 0xFF) {
-        if (bSig) return propagateFloat32NaN(a, b, status);
-        if ((aExp | aSig) == 0) {
-            float_raise(status, float_flag_invalid);
-            return float32_default_nan;
-        }
-        if (aSig && (aExp == 0)) float_raise(status, float_flag_denormal);
-        return packFloat32(zSign, 0xFF, 0);
-    }
-    if (aExp == 0) {
-        if (aSig == 0) {
-            if (bSig && (bExp == 0)) float_raise(status, float_flag_denormal);
-            return packFloat32(zSign, 0, 0);
-        }
-        float_raise(status, float_flag_denormal);
-        normalizeFloat32Subnormal(aSig, &aExp, &aSig);
-    }
-    if (bExp == 0) {
-        if (bSig == 0) return packFloat32(zSign, 0, 0);
-        float_raise(status, float_flag_denormal);
-        normalizeFloat32Subnormal(bSig, &bExp, &bSig);
-    }
-    zExp = aExp + bExp - 0x7F;
-    aSig = (aSig | 0x00800000)<<7;
-    bSig = (bSig | 0x00800000)<<8;
-    zSig64 = shift64RightJamming(((Bit64u) aSig) * bSig, 32);
-    zSig = (Bit32u) zSig64;
-    if (0 <= (Bit32s) (zSig<<1)) {
-        zSig <<= 1;
-        --zExp;
-    }
-    return roundAndPackFloat32(zSign, zExp, zSig, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of dividing the single-precision floating-point value `a'
-| by the corresponding value `b'.  The operation is performed according to the
-| IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 float32_div(float32 a, float32 b, struct float_status_t *status)
-{
-    int aSign, bSign, zSign;
-    Bit16s aExp, bExp, zExp;
-    Bit32u aSig, bSig, zSig;
-
-    aSig = extractFloat32Frac(a);
-    aExp = extractFloat32Exp(a);
-    aSign = extractFloat32Sign(a);
-    bSig = extractFloat32Frac(b);
-    bExp = extractFloat32Exp(b);
-    bSign = extractFloat32Sign(b);
-    zSign = aSign ^ bSign;
-
-    if (get_denormals_are_zeros(status)) {
-        if (aExp == 0) aSig = 0;
-        if (bExp == 0) bSig = 0;
-    }
-
-    if (aExp == 0xFF) {
-        if (aSig) return propagateFloat32NaN(a, b, status);
-        if (bExp == 0xFF) {
-            if (bSig) return propagateFloat32NaN(a, b, status);
-            float_raise(status, float_flag_invalid);
-            return float32_default_nan;
-        }
-        if (bSig && (bExp == 0)) float_raise(status, float_flag_denormal);
-        return packFloat32(zSign, 0xFF, 0);
-    }
-    if (bExp == 0xFF) {
-        if (bSig) return propagateFloat32NaN(a, b, status);
-        if (aSig && (aExp == 0)) float_raise(status, float_flag_denormal);
-        return packFloat32(zSign, 0, 0);
-    }
-    if (bExp == 0) {
-        if (bSig == 0) {
-            if ((aExp | aSig) == 0) {
-                float_raise(status, float_flag_invalid);
-                return float32_default_nan;
-            }
-            float_raise(status, float_flag_divbyzero);
-            return packFloat32(zSign, 0xFF, 0);
-        }
-        float_raise(status, float_flag_denormal);
-        normalizeFloat32Subnormal(bSig, &bExp, &bSig);
-    }
-    if (aExp == 0) {
-        if (aSig == 0) return packFloat32(zSign, 0, 0);
-        float_raise(status, float_flag_denormal);
-        normalizeFloat32Subnormal(aSig, &aExp, &aSig);
-    }
-    zExp = aExp - bExp + 0x7D;
-    aSig = (aSig | 0x00800000)<<7;
-    bSig = (bSig | 0x00800000)<<8;
-    if (bSig <= (aSig + aSig)) {
-        aSig >>= 1;
-        ++zExp;
-    }
-    zSig = (((Bit64u) aSig)<<32) / bSig;
-    if ((zSig & 0x3F) == 0) {
-        zSig |= ((Bit64u) bSig * zSig != ((Bit64u) aSig)<<32);
-    }
-    return roundAndPackFloat32(zSign, zExp, zSig, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the square root of the single-precision floating-point value `a'.
-| The operation is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 float32_sqrt(float32 a, struct float_status_t *status)
-{
-    int aSign;
-    Bit16s aExp, zExp;
-    Bit32u aSig, zSig;
-    Bit64u rem, term;
-
-    aSig = extractFloat32Frac(a);
-    aExp = extractFloat32Exp(a);
-    aSign = extractFloat32Sign(a);
-
-    if (aExp == 0xFF) {
-        if (aSig) return propagateFloat32NaNOne(a, status);
-        if (! aSign) return a;
-        float_raise(status, float_flag_invalid);
-        return float32_default_nan;
-    }
-
-    if (get_denormals_are_zeros(status)) {
-        if (aExp == 0) aSig = 0;
-    }
-
-    if (aSign) {
-        if ((aExp | aSig) == 0) return packFloat32(aSign, 0, 0);
-        float_raise(status, float_flag_invalid);
-        return float32_default_nan;
-    }
-    if (aExp == 0) {
-        if (aSig == 0) return 0;
-        float_raise(status, float_flag_denormal);
-        normalizeFloat32Subnormal(aSig, &aExp, &aSig);
-    }
-    zExp = ((aExp - 0x7F)>>1) + 0x7E;
-    aSig = (aSig | 0x00800000)<<8;
-    zSig = estimateSqrt32(aExp, aSig) + 2;
-    if ((zSig & 0x7F) <= 5) {
-        if (zSig < 2) {
-            zSig = 0x7FFFFFFF;
-            goto roundAndPack;
-        }
-        aSig >>= aExp & 1;
-        term = ((Bit64u) zSig) * zSig;
-        rem = (((Bit64u) aSig)<<32) - term;
-        while ((Bit64s) rem < 0) {
-            --zSig;
-            rem += (((Bit64u) zSig)<<1) | 1;
-        }
-        zSig |= (rem != 0);
-    }
-    zSig = shift32RightJamming(zSig, 1);
- roundAndPack:
-    return roundAndPackFloat32(0, zExp, zSig, status);
-}
-
-/*----------------------------------------------------------------------------
-| Determine single-precision floating-point number class.
-*----------------------------------------------------------------------------*/
-
-float_class_t float32_class(float32 a)
-{
-   Bit16s aExp = extractFloat32Exp(a);
-   Bit32u aSig = extractFloat32Frac(a);
-   int  aSign = extractFloat32Sign(a);
-
-   if(aExp == 0xFF) {
-       if (aSig == 0)
-           return (aSign) ? float_negative_inf : float_positive_inf;
-
-       return (aSig & 0x00400000) ? float_QNaN : float_SNaN;
-   }
-
-   if(aExp == 0) {
-       if (aSig == 0) return float_zero;
-       return float_denormal;
-   }
-
-   return float_normalized;
-}
-
-/*----------------------------------------------------------------------------
-| Compare  between  two  single  precision  floating  point  numbers. Returns
-| 'float_relation_equal'  if the operands are equal, 'float_relation_less' if
-| the    value    'a'   is   less   than   the   corresponding   value   `b',
-| 'float_relation_greater' if the value 'a' is greater than the corresponding
-| value `b', or 'float_relation_unordered' otherwise.
-*----------------------------------------------------------------------------*/
-
-int float32_compare(float32 a, float32 b, int quiet, struct float_status_t *status)
-{
-    if (get_denormals_are_zeros(status)) {
-        a = float32_denormal_to_zero(a);
-        b = float32_denormal_to_zero(b);
-    }
-
-    float_class_t aClass = float32_class(a);
-    float_class_t bClass = float32_class(b);
-
-    if (aClass == float_SNaN || bClass == float_SNaN) {
-        float_raise(status, float_flag_invalid);
-        return float_relation_unordered;
-    }
-
-    if (aClass == float_QNaN || bClass == float_QNaN) {
-        if (! quiet) float_raise(status, float_flag_invalid);
-        return float_relation_unordered;
-    }
-
-    if (aClass == float_denormal || bClass == float_denormal) {
-        float_raise(status, float_flag_denormal);
-    }
-
-    if ((a == b) || ((Bit32u) ((a | b)<<1) == 0)) return float_relation_equal;
-
-    int aSign = extractFloat32Sign(a);
-    int bSign = extractFloat32Sign(b);
-    if (aSign != bSign)
-        return (aSign) ? float_relation_less : float_relation_greater;
-
-    if (aSign ^ (a < b)) return float_relation_less;
-    return float_relation_greater;
-}
-
-/*----------------------------------------------------------------------------
-| Compare between two single precision floating point numbers and return the
-| smaller of them.
-*----------------------------------------------------------------------------*/
-
-float32 float32_min(float32 a, float32 b, struct float_status_t *status)
-{
-  if (get_denormals_are_zeros(status)) {
-    a = float32_denormal_to_zero(a);
-    b = float32_denormal_to_zero(b);
-  }
-
-  return (float32_compare_two(a, b, status) == float_relation_less) ? a : b;
-}
-
-/*----------------------------------------------------------------------------
-| Compare between two single precision floating point numbers and return the
-| larger of them.
-*----------------------------------------------------------------------------*/
-
-float32 float32_max(float32 a, float32 b, struct float_status_t *status)
-{
-  if (get_denormals_are_zeros(status)) {
-    a = float32_denormal_to_zero(a);
-    b = float32_denormal_to_zero(b);
-  }
-
-  return (float32_compare_two(a, b, status) == float_relation_greater) ? a : b;
-}
-
-/*----------------------------------------------------------------------------
-| Compare between two  single precision  floating point numbers and  return the
-| smaller/larger of them. The operation  is performed according to the IEC/IEEE
-| Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 float32_minmax(float32 a, float32 b, int is_max, int is_abs, struct float_status_t *status)
-{
-    if (get_denormals_are_zeros(status)) {
-        a = float32_denormal_to_zero(a);
-        b = float32_denormal_to_zero(b);
-    }
-
-    if (float32_is_nan(a) || float32_is_nan(b)) {
-        if (float32_is_signaling_nan(a)) {
-            return propagateFloat32NaNOne(a, status);
-        }
-        if (float32_is_signaling_nan(b) ) {
-            return propagateFloat32NaNOne(b, status);
-        }
-        if (! float32_is_nan(b)) {
-            if (float32_is_denormal(b))
-                float_raise(status, float_flag_denormal);
-            return b;
-        }
-        if (! float32_is_nan(a)) {
-            if (float32_is_denormal(a))
-                float_raise(status, float_flag_denormal);
-            return a;
-        }
-        return propagateFloat32NaN(a, b, status);
-    }
-
-    float32 tmp_a = a, tmp_b = b;
-    if (is_abs) {
-        tmp_a &= ~0x80000000; // clear the sign bit
-        tmp_b &= ~0x80000000;
-    }
-
-    int aSign = extractFloat32Sign(tmp_a);
-    int bSign = extractFloat32Sign(tmp_b);
-
-    if (float32_is_denormal(a) || float32_is_denormal(b))
-        float_raise(status, float_flag_denormal);
-
-    if (aSign != bSign) {
-        if (! is_max) {
-            return aSign ? a : b;
-        } else {
-            return aSign ? b : a;
-        }
-    } else {
-        if (! is_max) {
-            return (aSign ^ (tmp_a < tmp_b)) ? a : b;
-        } else {
-            return (aSign ^ (tmp_a < tmp_b)) ? b : a;
-        }
-    }
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the double-precision floating-point value
-| `a' to the 32-bit two's complement integer format.  The conversion is
-| performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic - which means in particular that the conversion is rounded
-| according to the current rounding mode. If `a' is a NaN or the
-| conversion overflows, the integer indefinite value is returned.
-*----------------------------------------------------------------------------*/
-
-Bit32s float64_to_int32(float64 a, struct float_status_t *status)
-{
-    Bit64u aSig = extractFloat64Frac(a);
-    Bit16s aExp = extractFloat64Exp(a);
-    int aSign = extractFloat64Sign(a);
-    if ((aExp == 0x7FF) && aSig) aSign = 0;
-    if (aExp) aSig |= BX_CONST64(0x0010000000000000);
-    else {
-        if (get_denormals_are_zeros(status)) aSig = 0;
-    }
-    int shiftCount = 0x42C - aExp;
-    if (0 < shiftCount) aSig = shift64RightJamming(aSig, shiftCount);
-    return roundAndPackInt32(aSign, aSig, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the double-precision floating-point value
-| `a' to the 32-bit two's complement integer format.  The conversion is
-| performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic, except that the conversion is always rounded toward zero.
-| If `a' is a NaN or the conversion overflows, the integer indefinite
-| value  is returned.
-*----------------------------------------------------------------------------*/
-
-Bit32s float64_to_int32_round_to_zero(float64 a, struct float_status_t *status)
-{
-    int aSign;
-    Bit16s aExp;
-    Bit64u aSig, savedASig;
-    Bit32s z;
-    int shiftCount;
-
-    aSig = extractFloat64Frac(a);
-    aExp = extractFloat64Exp(a);
-    aSign = extractFloat64Sign(a);
-    if (0x41E < aExp) {
-        float_raise(status, float_flag_invalid);
-        return (Bit32s)(int32_indefinite);
-    }
-    else if (aExp < 0x3FF) {
-        if (get_denormals_are_zeros(status) && aExp == 0) aSig = 0;
-        if (aExp || aSig) float_raise(status, float_flag_inexact);
-        return 0;
-    }
-    aSig |= BX_CONST64(0x0010000000000000);
-    shiftCount = 0x433 - aExp;
-    savedASig = aSig;
-    aSig >>= shiftCount;
-    z = (Bit32s) aSig;
-    if (aSign) z = -z;
-    if ((z < 0) ^ aSign) {
-        float_raise(status, float_flag_invalid);
-        return (Bit32s)(int32_indefinite);
-    }
-    if ((aSig<<shiftCount) != savedASig) {
-        float_raise(status, float_flag_inexact);
-    }
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the double-precision floating-point value
-| `a' to the 32-bit unsigned integer format.  The conversion is performed
-| according to the IEC/IEEE Standard for Binary Floating-point Arithmetic,
-| except that the conversion is always rounded toward zero.  If `a' is a NaN
-| or conversion overflows, the largest positive integer is returned.
-*----------------------------------------------------------------------------*/
-
-Bit32u float64_to_uint32_round_to_zero(float64 a, struct float_status_t *status)
-{
-    Bit64u aSig = extractFloat64Frac(a);
-    Bit16s aExp = extractFloat64Exp(a);
-    int aSign = extractFloat64Sign(a);
-
-    if (aExp < 0x3FF) {
-        if (get_denormals_are_zeros(status) && aExp == 0) aSig = 0;
-        if (aExp || aSig) float_raise(status, float_flag_inexact);
-        return 0;
-    }
-
-    if (0x41E < aExp || aSign) {
-        float_raise(status, float_flag_invalid);
-        return uint32_indefinite;
-    }
-
-    aSig |= BX_CONST64(0x0010000000000000);
-    int shiftCount = 0x433 - aExp;
-    Bit64u savedASig = aSig;
-    aSig >>= shiftCount;
-    if ((aSig<<shiftCount) != savedASig) {
-        float_raise(status, float_flag_inexact);
-    }
-    return (Bit32u) aSig;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the double-precision floating-point value
-| `a' to the 64-bit two's complement integer format.  The conversion is
-| performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic - which means in particular that the conversion is rounded
-| according to the current rounding mode.  If `a' is a NaN, the largest
-| positive integer is returned.  Otherwise, if the conversion overflows, the
-| largest integer with the same sign as `a' is returned.
-*----------------------------------------------------------------------------*/
-
-Bit64s float64_to_int64(float64 a, struct float_status_t *status)
-{
-    int aSign;
-    Bit16s aExp;
-    Bit64u aSig, aSigExtra;
-
-    aSig = extractFloat64Frac(a);
-    aExp = extractFloat64Exp(a);
-    aSign = extractFloat64Sign(a);
-    if (aExp) aSig |= BX_CONST64(0x0010000000000000);
-    else {
-        if (get_denormals_are_zeros(status)) aSig = 0;
-    }
-    int shiftCount = 0x433 - aExp;
-    if (shiftCount <= 0) {
-        if (0x43E < aExp) {
-            float_raise(status, float_flag_invalid);
-            return (Bit64s)(int64_indefinite);
-        }
-        aSigExtra = 0;
-        aSig <<= -shiftCount;
-    }
-    else {
-        shift64ExtraRightJamming(aSig, 0, shiftCount, &aSig, &aSigExtra);
-    }
-    return roundAndPackInt64(aSign, aSig, aSigExtra, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the double-precision floating-point value
-| `a' to the 64-bit two's complement integer format.  The conversion is
-| performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic, except that the conversion is always rounded toward zero.
-| If `a' is a NaN or the conversion overflows, the integer indefinite
-| value  is returned.
-*----------------------------------------------------------------------------*/
-
-Bit64s float64_to_int64_round_to_zero(float64 a, struct float_status_t *status)
-{
-    int aSign;
-    Bit16s aExp;
-    Bit64u aSig;
-    Bit64s z;
-
-    aSig = extractFloat64Frac(a);
-    aExp = extractFloat64Exp(a);
-    aSign = extractFloat64Sign(a);
-    if (aExp) aSig |= BX_CONST64(0x0010000000000000);
-    int shiftCount = aExp - 0x433;
-    if (0 <= shiftCount) {
-        if (0x43E <= aExp) {
-            if (a != BX_CONST64(0xC3E0000000000000)) {
-                float_raise(status, float_flag_invalid);
-            }
-            return (Bit64s)(int64_indefinite);
-        }
-        z = aSig<<shiftCount;
-    }
-    else {
-        if (aExp < 0x3FE) {
-            if (get_denormals_are_zeros(status) && aExp == 0) aSig = 0;
-            if (aExp | aSig) float_raise(status, float_flag_inexact);
-            return 0;
-        }
-        z = aSig>>(-shiftCount);
-        if ((Bit64u) (aSig<<(shiftCount & 63))) {
-             float_raise(status, float_flag_inexact);
-        }
-    }
-    if (aSign) z = -z;
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the double-precision floating-point value
-| `a' to the 64-bit unsigned integer format.  The conversion is performed
-| according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic,
-| except that the conversion is always rounded toward zero. If `a' is a NaN
-| or the conversion overflows, the largest unsigned integer is returned.
-*----------------------------------------------------------------------------*/
-
-Bit64u float64_to_uint64_round_to_zero(float64 a, struct float_status_t *status)
-{
-    int aSign;
-    Bit16s aExp;
-    Bit64u aSig, z;
-
-    aSig = extractFloat64Frac(a);
-    aExp = extractFloat64Exp(a);
-    aSign = extractFloat64Sign(a);
-
-    if (aExp < 0x3FE) {
-        if (get_denormals_are_zeros(status) && aExp == 0) aSig = 0;
-        if (aExp | aSig) float_raise(status, float_flag_inexact);
-        return 0;
-    }
-
-    if (0x43E <= aExp || aSign) {
-        float_raise(status, float_flag_invalid);
-        return uint64_indefinite;
-    }
-
-    if (aExp) aSig |= BX_CONST64(0x0010000000000000);
-    int shiftCount = aExp - 0x433;
-
-    if (0 <= shiftCount) {
-        z = aSig<<shiftCount;
-    }
-    else {
-        z = aSig>>(-shiftCount);
-        if ((Bit64u) (aSig<<(shiftCount & 63))) {
-             float_raise(status, float_flag_inexact);
-        }
-    }
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the double-precision floating-point value
-| `a' to the 32-bit unsigned integer format.  The conversion is
-| performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic---which means in particular that the conversion is rounded
-| according to the current rounding mode.  If `a' is a NaN or the conversion
-| overflows, the largest unsigned integer is returned.
-*----------------------------------------------------------------------------*/
-
-Bit32u float64_to_uint32(float64 a, struct float_status_t *status)
-{
-    Bit64u val_64 = float64_to_uint64(a, status);
-
-    if (val_64 > 0xffffffff) {
-        status->float_exception_flags = float_flag_invalid; // throw away other flags
-        return uint32_indefinite;
-    }
-
-    return (Bit32u) val_64;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the double-precision floating-point value
-| `a' to the 64-bit unsigned integer format.  The conversion is
-| performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic---which means in particular that the conversion is rounded
-| according to the current rounding mode.  If `a' is a NaN or the conversion
-| overflows, the largest unsigned integer is returned.
-*----------------------------------------------------------------------------*/
-
-Bit64u float64_to_uint64(float64 a, struct float_status_t *status)
-{
-    int aSign;
-    Bit16s aExp, shiftCount;
-    Bit64u aSig, aSigExtra;
-
-    aSig = extractFloat64Frac(a);
-    aExp = extractFloat64Exp(a);
-    aSign = extractFloat64Sign(a);
-
-    if (get_denormals_are_zeros(status)) {
-        if (aExp == 0) aSig = 0;
-    }
-
-    if (aSign && (aExp > 0x3FE)) {
-        float_raise(status, float_flag_invalid);
-        return uint64_indefinite;
-    }
-
-    if (aExp) {
-        aSig |= BX_CONST64(0x0010000000000000);
-    }
-    shiftCount = 0x433 - aExp;
-    if (shiftCount <= 0) {
-        if (0x43E < aExp) {
-            float_raise(status, float_flag_invalid);
-            return uint64_indefinite;
-        }
-        aSigExtra = 0;
-        aSig <<= -shiftCount;
-    } else {
-        shift64ExtraRightJamming(aSig, 0, shiftCount, &aSig, &aSigExtra);
-    }
-
-    return roundAndPackUint64(aSign, aSig, aSigExtra, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the double-precision floating-point value
-| `a' to the single-precision floating-point format.  The conversion is
-| performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 float64_to_float32(float64 a, struct float_status_t *status)
-{
-    int aSign;
-    Bit16s aExp;
-    Bit64u aSig;
-    Bit32u zSig;
-
-    aSig = extractFloat64Frac(a);
-    aExp = extractFloat64Exp(a);
-    aSign = extractFloat64Sign(a);
-    if (aExp == 0x7FF) {
-        if (aSig) return commonNaNToFloat32(float64ToCommonNaN(a, status));
-        return packFloat32(aSign, 0xFF, 0);
-    }
-    if (aExp == 0) {
-        if (aSig == 0 || get_denormals_are_zeros(status))
-            return packFloat32(aSign, 0, 0);
-        float_raise(status, float_flag_denormal);
-    }
-    aSig = shift64RightJamming(aSig, 22);
-    zSig = (Bit32u) aSig;
-    if (aExp || zSig) {
-        zSig |= 0x40000000;
-        aExp -= 0x381;
-    }
-    return roundAndPackFloat32(aSign, aExp, zSig, status);
-}
-
-/*----------------------------------------------------------------------------
-| Rounds the double-precision floating-point value `a' to an integer, and
-| returns the result as a double-precision floating-point value.  The
-| operation is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 float64_round_to_int(float64 a, Bit8u scale, struct float_status_t *status)
-{
-    Bit64u lastBitMask, roundBitsMask;
-    int roundingMode = get_float_rounding_mode(status);
-    Bit16s aExp = extractFloat64Exp(a);
-    scale &= 0xf;
-
-    if ((aExp == 0x7FF) && extractFloat64Frac(a)) {
-        return propagateFloat64NaNOne(a, status);
-    }
-
-    aExp += scale; // scale the exponent
-
-    if (0x433 <= aExp) {
-        return a;
-    }
-
-    if (get_denormals_are_zeros(status)) {
-        a = float64_denormal_to_zero(a);
-    }
-
-    if (aExp < 0x3FF) {
-        if ((Bit64u) (a<<1) == 0) return a;
-        float_raise(status, float_flag_inexact);
-        int aSign = extractFloat64Sign(a);
-        switch (roundingMode) {
-         case float_round_nearest_even:
-            if ((aExp == 0x3FE) && extractFloat64Frac(a)) {
-              return packFloat64(aSign, 0x3FF - scale, 0);
-            }
-            break;
-         case float_round_down:
-            return aSign ? packFloat64(1, 0x3FF - scale, 0) : float64_positive_zero;
-         case float_round_up:
-            return aSign ? float64_negative_zero : packFloat64(0, 0x3FF - scale, 0);
-        }
-        return packFloat64(aSign, 0, 0);
-    }
-
-    lastBitMask = 1;
-    lastBitMask <<= 0x433 - aExp;
-    roundBitsMask = lastBitMask - 1;
-    float64 z = a;
-    if (roundingMode == float_round_nearest_even) {
-        z += lastBitMask>>1;
-        if ((z & roundBitsMask) == 0) z &= ~lastBitMask;
-    }
-    else if (roundingMode != float_round_to_zero) {
-        if (extractFloat64Sign(z) ^ (roundingMode == float_round_up)) {
-            z += roundBitsMask;
-        }
-    }
-    z &= ~roundBitsMask;
-    if (z != a) float_raise(status, float_flag_inexact);
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Extracts the fractional portion of double-precision floating-point value `a',
-| and returns the result  as a  double-precision  floating-point value. The
-| fractional results are precise. The operation is performed according to the
-| IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 float64_frc(float64 a, struct float_status_t *status)
-{
-    int roundingMode = get_float_rounding_mode(status);
-
-    Bit64u aSig = extractFloat64Frac(a);
-    Bit16s aExp = extractFloat64Exp(a);
-    int aSign = extractFloat64Sign(a);
-
-    if (aExp == 0x7FF) {
-        if (aSig) return propagateFloat64NaNOne(a, status);
-        float_raise(status, float_flag_invalid);
-        return float64_default_nan;
-    }
-
-    if (aExp >= 0x433) {
-        return packFloat64(roundingMode == float_round_down, 0, 0);
-    }
-
-    if (aExp < 0x3FF) {
-        if (aExp == 0) {
-            if (aSig == 0 || get_denormals_are_zeros(status))
-                return packFloat64(roundingMode == float_round_down, 0, 0);
-
-            float_raise(status, float_flag_denormal);
-            if (! float_exception_masked(status, float_flag_underflow))
-                float_raise(status, float_flag_underflow);
-
-            if(get_flush_underflow_to_zero(status)) {
-                float_raise(status, float_flag_underflow | float_flag_inexact);
-                return packFloat64(aSign, 0, 0);
-            }
-        }
-        return a;
-    }
-
-    Bit64u lastBitMask = BX_CONST64(1) << (0x433 - aExp);
-    Bit64u roundBitsMask = lastBitMask - 1;
-
-    aSig &= roundBitsMask;
-    aSig <<= 10;
-    aExp--;
-
-    if (aSig == 0)
-       return packFloat64(roundingMode == float_round_down, 0, 0);
-
-    return normalizeRoundAndPackFloat64(aSign, aExp, aSig, status);
-}
-
-/*----------------------------------------------------------------------------
-| Extracts the exponent portion of double-precision floating-point value 'a',
-| and returns the result as a double-precision floating-point value
-| representing unbiased integer exponent. The operation is performed according
-| to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 float64_getexp(float64 a, struct float_status_t *status)
-{
-    Bit16s aExp = extractFloat64Exp(a);
-    Bit64u aSig = extractFloat64Frac(a);
-
-    if (aExp == 0x7FF) {
-        if (aSig) return propagateFloat64NaNOne(a, status);
-        return float64_positive_inf;
-    }
-
-    if (aExp == 0) {
-        if (aSig == 0 || get_denormals_are_zeros(status))
-            return float64_negative_inf;
-
-        float_raise(status, float_flag_denormal);
-        normalizeFloat64Subnormal(aSig, &aExp, &aSig);
-    }
-
-    return int32_to_float64(aExp - 0x3FF);
-}
-
-/*----------------------------------------------------------------------------
-| Extracts the mantissa of double-precision floating-point value 'a' and
-| returns the result as a double-precision floating-point after applying
-| the mantissa interval normalization and sign control. The operation is
-| performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 float64_getmant(float64 a, struct float_status_t *status, int sign_ctrl, int interv)
-{
-    Bit16s aExp = extractFloat64Exp(a);
-    Bit64u aSig = extractFloat64Frac(a);
-    int aSign = extractFloat64Sign(a);
-
-    if (aExp == 0x7FF) {
-        if (aSig) return propagateFloat64NaNOne(a, status);
-        if (aSign) {
-            if (sign_ctrl & 0x2) {
-                float_raise(status, float_flag_invalid);
-                return float64_default_nan;
-            }
-        }
-        return packFloat64(~sign_ctrl & aSign, 0x3FF, 0);
-    }
-
-    if (aExp == 0 && (aSig == 0 || get_denormals_are_zeros(status))) {
-        return packFloat64(~sign_ctrl & aSign, 0x3FF, 0);
-    }
-
-    if (aSign) {
-        if (sign_ctrl & 0x2) {
-            float_raise(status, float_flag_invalid);
-            return float64_default_nan;
-        }
-    }
-
-    if (aExp == 0) {
-        float_raise(status, float_flag_denormal);
-        normalizeFloat64Subnormal(aSig, &aExp, &aSig);
-//      aExp += 0x3FE;
-        aSig &= BX_CONST64(0xFFFFFFFFFFFFFFFF);
-    }
-
-    switch(interv) {
-    case 0x0: // interval [1,2)
-        aExp = 0x3FF;
-        break;
-    case 0x1: // interval [1/2,2)
-        aExp -= 0x3FF;
-        aExp  = 0x3FF - (aExp & 0x1);
-        break;
-    case 0x2: // interval [1/2,1)
-        aExp = 0x3FE;
-        break;
-    case 0x3: // interval [3/4,3/2)
-        aExp = 0x3FF - ((aSig >> 51) & 0x1);
-        break;
-    }
-
-    return packFloat64(~sign_ctrl & aSign, aExp, aSig);
-}
-
-/*----------------------------------------------------------------------------
-| Return the result of a floating point scale of the double-precision floating
-| point value `a' by multiplying it by 2 power of the double-precision
-| floating point value 'b' converted to integral value. If the result cannot
-| be represented in double precision, then the proper overflow response (for
-| positive scaling operand), or the proper underflow response (for negative
-| scaling operand) is issued. The operation is performed according to the
-| IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 float64_scalef(float64 a, float64 b, struct float_status_t *status)
-{
-    Bit64u aSig = extractFloat64Frac(a);
-    Bit16s aExp = extractFloat64Exp(a);
-    int aSign = extractFloat64Sign(a);
-    Bit64u bSig = extractFloat64Frac(b);
-    Bit16s bExp = extractFloat64Exp(b);
-    int bSign = extractFloat64Sign(b);
-
-    if (get_denormals_are_zeros(status)) {
-        if (aExp == 0) aSig = 0;
-        if (bExp == 0) bSig = 0;
-    }
-
-    if (bExp == 0x7FF) {
-        if (bSig) return propagateFloat64NaN(a, b, status);
-    }
-
-    if (aExp == 0x7FF) {
-        if (aSig) {
-            int aIsSignalingNaN = (aSig & BX_CONST64(0x0008000000000000)) == 0;
-            if (aIsSignalingNaN || bExp != 0x7FF || bSig)
-                return propagateFloat64NaN(a, b, status);
-
-            return bSign ? 0 : float64_positive_inf;
-        }
-
-        if (bExp == 0x7FF && bSign) {
-            float_raise(status, float_flag_invalid);
-            return float64_default_nan;
-        }
-        return a;
-    }
-
-    if (aExp == 0) {
-        if (aSig == 0) {
-            if (bExp == 0x7FF && ! bSign) {
-                float_raise(status, float_flag_invalid);
-                return float64_default_nan;
-            }
-            return a;
-        }
-        float_raise(status, float_flag_denormal);
-    }
-
-    if ((bExp | bSig) == 0) return a;
-
-    if (bExp == 0x7FF) {
-        if (bSign) return packFloat64(aSign, 0, 0);
-        return packFloat64(aSign, 0x7FF, 0);
-    }
-
-    if (0x40F <= bExp) {
-        // handle obvious overflow/underflow result
-        return roundAndPackFloat64(aSign, bSign ? -0x3FF : 0x7FF, aSig, status);
-    }
-
-    int scale = 0;
-
-    if (bExp < 0x3FF) {
-        if (bExp == 0)
-            float_raise(status, float_flag_denormal);
-        scale = -bSign;
-    }
-    else {
-        bSig |= BX_CONST64(0x0010000000000000);
-        int shiftCount = 0x433 - bExp;
-        Bit64u savedBSig = bSig;
-        bSig >>= shiftCount;
-        scale = (Bit32s) bSig;
-        if (bSign) {
-            if ((bSig<<shiftCount) != savedBSig) scale++;
-            scale = -scale;
-        }
-
-        if (scale >  0x1000) scale =  0x1000;
-        if (scale < -0x1000) scale = -0x1000;
-    }
-
-    if (aExp != 0) {
-        aSig |= BX_CONST64(0x0010000000000000);
-    } else {
-        aExp++;
-    }
-
-    aExp += scale - 1;
-    aSig <<= 10;
-    return normalizeRoundAndPackFloat64(aSign, aExp, aSig, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of adding the absolute values of the double-precision
-| floating-point values `a' and `b'.  If `zSign' is 1, the sum is negated
-| before being returned.  `zSign' is ignored if the result is a NaN.
-| The addition is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-static float64 addFloat64Sigs(float64 a, float64 b, int zSign, struct float_status_t *status)
-{
-    Bit16s aExp, bExp, zExp;
-    Bit64u aSig, bSig, zSig;
-    Bit16s expDiff;
-
-    aSig = extractFloat64Frac(a);
-    aExp = extractFloat64Exp(a);
-    bSig = extractFloat64Frac(b);
-    bExp = extractFloat64Exp(b);
-
-    if (get_denormals_are_zeros(status)) {
-        if (aExp == 0) aSig = 0;
-        if (bExp == 0) bSig = 0;
-    }
-
-    expDiff = aExp - bExp;
-    aSig <<= 9;
-    bSig <<= 9;
-    if (0 < expDiff) {
-        if (aExp == 0x7FF) {
-            if (aSig) return propagateFloat64NaN(a, b, status);
-            if (bSig && (bExp == 0)) float_raise(status, float_flag_denormal);
-            return a;
-        }
-        if ((aExp == 0) && aSig)
-            float_raise(status, float_flag_denormal);
-
-        if (bExp == 0) {
-            if (bSig) float_raise(status, float_flag_denormal);
-            --expDiff;
-        }
-        else bSig |= BX_CONST64(0x2000000000000000);
-
-        bSig = shift64RightJamming(bSig, expDiff);
-        zExp = aExp;
-    }
-    else if (expDiff < 0) {
-        if (bExp == 0x7FF) {
-            if (bSig) return propagateFloat64NaN(a, b, status);
-            if (aSig && (aExp == 0)) float_raise(status, float_flag_denormal);
-            return packFloat64(zSign, 0x7FF, 0);
-        }
-        if ((bExp == 0) && bSig)
-            float_raise(status, float_flag_denormal);
-
-        if (aExp == 0) {
-            if (aSig) float_raise(status, float_flag_denormal);
-            ++expDiff;
-        }
-        else aSig |= BX_CONST64(0x2000000000000000);
-
-        aSig = shift64RightJamming(aSig, -expDiff);
-        zExp = bExp;
-    }
-    else {
-        if (aExp == 0x7FF) {
-            if (aSig | bSig) return propagateFloat64NaN(a, b, status);
-            return a;
-        }
-        if (aExp == 0) {
-            zSig = (aSig + bSig) >> 9;
-            if (aSig | bSig) {
-                float_raise(status, float_flag_denormal);
-                if (get_flush_underflow_to_zero(status) && (extractFloat64Frac(zSig) == zSig)) {
-                    float_raise(status, float_flag_underflow | float_flag_inexact);
-                    return packFloat64(zSign, 0, 0);
-                }
-                if (! float_exception_masked(status, float_flag_underflow)) {
-                    if (extractFloat64Frac(zSig) == zSig)
-                        float_raise(status, float_flag_underflow);
-                }
-            }
-            return packFloat64(zSign, 0, zSig);
-        }
-        zSig = BX_CONST64(0x4000000000000000) + aSig + bSig;
-        return roundAndPackFloat64(zSign, aExp, zSig, status);
-    }
-    aSig |= BX_CONST64(0x2000000000000000);
-    zSig = (aSig + bSig)<<1;
-    --zExp;
-    if ((Bit64s) zSig < 0) {
-        zSig = aSig + bSig;
-        ++zExp;
-    }
-    return roundAndPackFloat64(zSign, zExp, zSig, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of subtracting the absolute values of the double-
-| precision floating-point values `a' and `b'.  If `zSign' is 1, the
-| difference is negated before being returned.  `zSign' is ignored if the
-| result is a NaN.  The subtraction is performed according to the IEC/IEEE
-| Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-static float64 subFloat64Sigs(float64 a, float64 b, int zSign, struct float_status_t *status)
-{
-    Bit16s aExp, bExp, zExp;
-    Bit64u aSig, bSig, zSig;
-    Bit16s expDiff;
-
-    aSig = extractFloat64Frac(a);
-    aExp = extractFloat64Exp(a);
-    bSig = extractFloat64Frac(b);
-    bExp = extractFloat64Exp(b);
-
-    if (get_denormals_are_zeros(status)) {
-        if (aExp == 0) aSig = 0;
-        if (bExp == 0) bSig = 0;
-    }
-
-    expDiff = aExp - bExp;
-    aSig <<= 10;
-    bSig <<= 10;
-    if (0 < expDiff) goto aExpBigger;
-    if (expDiff < 0) goto bExpBigger;
-    if (aExp == 0x7FF) {
-        if (aSig | bSig) return propagateFloat64NaN(a, b, status);
-        float_raise(status, float_flag_invalid);
-        return float64_default_nan;
-    }
-    if (aExp == 0) {
-        if (aSig | bSig) float_raise(status, float_flag_denormal);
-        aExp = 1;
-        bExp = 1;
-    }
-    if (bSig < aSig) goto aBigger;
-    if (aSig < bSig) goto bBigger;
-    return packFloat64(get_float_rounding_mode(status) == float_round_down, 0, 0);
- bExpBigger:
-    if (bExp == 0x7FF) {
-        if (bSig) return propagateFloat64NaN(a, b, status);
-        if (aSig && (aExp == 0)) float_raise(status, float_flag_denormal);
-        return packFloat64(zSign ^ 1, 0x7FF, 0);
-    }
-    if ((bExp == 0) && bSig)
-        float_raise(status, float_flag_denormal);
-
-    if (aExp == 0) {
-        if (aSig) float_raise(status, float_flag_denormal);
-        ++expDiff;
-    }
-    else aSig |= BX_CONST64(0x4000000000000000);
-
-    aSig = shift64RightJamming(aSig, -expDiff);
-    bSig |= BX_CONST64(0x4000000000000000);
- bBigger:
-    zSig = bSig - aSig;
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aExpBigger:
-    if (aExp == 0x7FF) {
-        if (aSig) return propagateFloat64NaN(a, b, status);
-        if (bSig && (bExp == 0)) float_raise(status, float_flag_denormal);
-        return a;
-    }
-    if ((aExp == 0) && aSig)
-        float_raise(status, float_flag_denormal);
-
-    if (bExp == 0) {
-        if (bSig) float_raise(status, float_flag_denormal);
-        --expDiff;
-    }
-    else bSig |= BX_CONST64(0x4000000000000000);
-
-    bSig = shift64RightJamming(bSig, expDiff);
-    aSig |= BX_CONST64(0x4000000000000000);
- aBigger:
-    zSig = aSig - bSig;
-    zExp = aExp;
- normalizeRoundAndPack:
-    --zExp;
-    return normalizeRoundAndPackFloat64(zSign, zExp, zSig, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of adding the double-precision floating-point values `a'
-| and `b'.  The operation is performed according to the IEC/IEEE Standard for
-| Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 float64_add(float64 a, float64 b, struct float_status_t *status)
-{
-    int aSign = extractFloat64Sign(a);
-    int bSign = extractFloat64Sign(b);
-
-    if (aSign == bSign) {
-        return addFloat64Sigs(a, b, aSign, status);
-    }
-    else {
-        return subFloat64Sigs(a, b, aSign, status);
-    }
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of subtracting the double-precision floating-point values
-| `a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-| for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 float64_sub(float64 a, float64 b, struct float_status_t *status)
-{
-    int aSign = extractFloat64Sign(a);
-    int bSign = extractFloat64Sign(b);
-
-    if (aSign == bSign) {
-        return subFloat64Sigs(a, b, aSign, status);
-    }
-    else {
-        return addFloat64Sigs(a, b, aSign, status);
-    }
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of multiplying the double-precision floating-point values
-| `a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-| for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 float64_mul(float64 a, float64 b, struct float_status_t *status)
-{
-    int aSign, bSign, zSign;
-    Bit16s aExp, bExp, zExp;
-    Bit64u aSig, bSig, zSig0, zSig1;
-
-    aSig = extractFloat64Frac(a);
-    aExp = extractFloat64Exp(a);
-    aSign = extractFloat64Sign(a);
-    bSig = extractFloat64Frac(b);
-    bExp = extractFloat64Exp(b);
-    bSign = extractFloat64Sign(b);
-    zSign = aSign ^ bSign;
-
-    if (get_denormals_are_zeros(status)) {
-        if (aExp == 0) aSig = 0;
-        if (bExp == 0) bSig = 0;
-    }
-
-    if (aExp == 0x7FF) {
-        if (aSig || ((bExp == 0x7FF) && bSig)) {
-            return propagateFloat64NaN(a, b, status);
-        }
-        if ((bExp | bSig) == 0) {
-            float_raise(status, float_flag_invalid);
-            return float64_default_nan;
-        }
-        if (bSig && (bExp == 0)) float_raise(status, float_flag_denormal);
-        return packFloat64(zSign, 0x7FF, 0);
-    }
-    if (bExp == 0x7FF) {
-        if (bSig) return propagateFloat64NaN(a, b, status);
-        if ((aExp | aSig) == 0) {
-            float_raise(status, float_flag_invalid);
-            return float64_default_nan;
-        }
-        if (aSig && (aExp == 0)) float_raise(status, float_flag_denormal);
-        return packFloat64(zSign, 0x7FF, 0);
-    }
-    if (aExp == 0) {
-        if (aSig == 0) {
-            if (bSig && (bExp == 0)) float_raise(status, float_flag_denormal);
-            return packFloat64(zSign, 0, 0);
-        }
-        float_raise(status, float_flag_denormal);
-        normalizeFloat64Subnormal(aSig, &aExp, &aSig);
-    }
-    if (bExp == 0) {
-        if (bSig == 0) return packFloat64(zSign, 0, 0);
-        float_raise(status, float_flag_denormal);
-        normalizeFloat64Subnormal(bSig, &bExp, &bSig);
-    }
-    zExp = aExp + bExp - 0x3FF;
-    aSig = (aSig | BX_CONST64(0x0010000000000000))<<10;
-    bSig = (bSig | BX_CONST64(0x0010000000000000))<<11;
-    mul64To128(aSig, bSig, &zSig0, &zSig1);
-    zSig0 |= (zSig1 != 0);
-    if (0 <= (Bit64s) (zSig0<<1)) {
-        zSig0 <<= 1;
-        --zExp;
-    }
-    return roundAndPackFloat64(zSign, zExp, zSig0, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of dividing the double-precision floating-point value `a'
-| by the corresponding value `b'.  The operation is performed according to
-| the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 float64_div(float64 a, float64 b, struct float_status_t *status)
-{
-    int aSign, bSign, zSign;
-    Bit16s aExp, bExp, zExp;
-    Bit64u aSig, bSig, zSig;
-    Bit64u rem0, rem1;
-    Bit64u term0, term1;
-
-    aSig = extractFloat64Frac(a);
-    aExp = extractFloat64Exp(a);
-    aSign = extractFloat64Sign(a);
-    bSig = extractFloat64Frac(b);
-    bExp = extractFloat64Exp(b);
-    bSign = extractFloat64Sign(b);
-    zSign = aSign ^ bSign;
-
-    if (get_denormals_are_zeros(status)) {
-        if (aExp == 0) aSig = 0;
-        if (bExp == 0) bSig = 0;
-    }
-
-    if (aExp == 0x7FF) {
-        if (aSig) return propagateFloat64NaN(a, b, status);
-        if (bExp == 0x7FF) {
-            if (bSig) return propagateFloat64NaN(a, b, status);
-            float_raise(status, float_flag_invalid);
-            return float64_default_nan;
-        }
-        if (bSig && (bExp == 0)) float_raise(status, float_flag_denormal);
-        return packFloat64(zSign, 0x7FF, 0);
-    }
-    if (bExp == 0x7FF) {
-        if (bSig) return propagateFloat64NaN(a, b, status);
-        if (aSig && (aExp == 0)) float_raise(status, float_flag_denormal);
-        return packFloat64(zSign, 0, 0);
-    }
-    if (bExp == 0) {
-        if (bSig == 0) {
-            if ((aExp | aSig) == 0) {
-                float_raise(status, float_flag_invalid);
-                return float64_default_nan;
-            }
-            float_raise(status, float_flag_divbyzero);
-            return packFloat64(zSign, 0x7FF, 0);
-        }
-        float_raise(status, float_flag_denormal);
-        normalizeFloat64Subnormal(bSig, &bExp, &bSig);
-    }
-    if (aExp == 0) {
-        if (aSig == 0) return packFloat64(zSign, 0, 0);
-        float_raise(status, float_flag_denormal);
-        normalizeFloat64Subnormal(aSig, &aExp, &aSig);
-    }
-    zExp = aExp - bExp + 0x3FD;
-    aSig = (aSig | BX_CONST64(0x0010000000000000))<<10;
-    bSig = (bSig | BX_CONST64(0x0010000000000000))<<11;
-    if (bSig <= (aSig + aSig)) {
-        aSig >>= 1;
-        ++zExp;
-    }
-    zSig = estimateDiv128To64(aSig, 0, bSig);
-    if ((zSig & 0x1FF) <= 2) {
-        mul64To128(bSig, zSig, &term0, &term1);
-        sub128(aSig, 0, term0, term1, &rem0, &rem1);
-        while ((Bit64s) rem0 < 0) {
-            --zSig;
-            add128(rem0, rem1, 0, bSig, &rem0, &rem1);
-        }
-        zSig |= (rem1 != 0);
-    }
-    return roundAndPackFloat64(zSign, zExp, zSig, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the square root of the double-precision floating-point value `a'.
-| The operation is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 float64_sqrt(float64 a, struct float_status_t *status)
-{
-    int aSign;
-    Bit16s aExp, zExp;
-    Bit64u aSig, zSig, doubleZSig;
-    Bit64u rem0, rem1, term0, term1;
-
-    aSig = extractFloat64Frac(a);
-    aExp = extractFloat64Exp(a);
-    aSign = extractFloat64Sign(a);
-
-    if (aExp == 0x7FF) {
-        if (aSig) return propagateFloat64NaNOne(a, status);
-        if (! aSign) return a;
-        float_raise(status, float_flag_invalid);
-        return float64_default_nan;
-    }
-
-    if (get_denormals_are_zeros(status)) {
-        if (aExp == 0) aSig = 0;
-    }
-
-    if (aSign) {
-        if ((aExp | aSig) == 0) return packFloat64(aSign, 0, 0);
-        float_raise(status, float_flag_invalid);
-        return float64_default_nan;
-    }
-    if (aExp == 0) {
-        if (aSig == 0) return 0;
-        float_raise(status, float_flag_denormal);
-        normalizeFloat64Subnormal(aSig, &aExp, &aSig);
-    }
-    zExp = ((aExp - 0x3FF)>>1) + 0x3FE;
-    aSig |= BX_CONST64(0x0010000000000000);
-    zSig = estimateSqrt32(aExp, (Bit32u)(aSig>>21));
-    aSig <<= 9 - (aExp & 1);
-    zSig = estimateDiv128To64(aSig, 0, zSig<<32) + (zSig<<30);
-    if ((zSig & 0x1FF) <= 5) {
-        doubleZSig = zSig<<1;
-        mul64To128(zSig, zSig, &term0, &term1);
-        sub128(aSig, 0, term0, term1, &rem0, &rem1);
-        while ((Bit64s) rem0 < 0) {
-            --zSig;
-            doubleZSig -= 2;
-            add128(rem0, rem1, zSig>>63, doubleZSig | 1, &rem0, &rem1);
-        }
-        zSig |= ((rem0 | rem1) != 0);
-    }
-    return roundAndPackFloat64(0, zExp, zSig, status);
-}
-
-/*----------------------------------------------------------------------------
-| Determine double-precision floating-point number class
-*----------------------------------------------------------------------------*/
-
-float_class_t float64_class(float64 a)
-{
-   Bit16s aExp = extractFloat64Exp(a);
-   Bit64u aSig = extractFloat64Frac(a);
-   int  aSign = extractFloat64Sign(a);
-
-   if(aExp == 0x7FF) {
-       if (aSig == 0)
-           return (aSign) ? float_negative_inf : float_positive_inf;
-
-       return (aSig & BX_CONST64(0x0008000000000000)) ? float_QNaN : float_SNaN;
-   }
-
-   if(aExp == 0) {
-       if (aSig == 0)
-           return float_zero;
-       return float_denormal;
-   }
-
-   return float_normalized;
-}
-
-/*----------------------------------------------------------------------------
-| Compare  between  two  double  precision  floating  point  numbers. Returns
-| 'float_relation_equal'  if the operands are equal, 'float_relation_less' if
-| the    value    'a'   is   less   than   the   corresponding   value   `b',
-| 'float_relation_greater' if the value 'a' is greater than the corresponding
-| value `b', or 'float_relation_unordered' otherwise.
-*----------------------------------------------------------------------------*/
-
-int float64_compare(float64 a, float64 b, int quiet, struct float_status_t *status)
-{
-    if (get_denormals_are_zeros(status)) {
-        a = float64_denormal_to_zero(a);
-        b = float64_denormal_to_zero(b);
-    }
-
-    float_class_t aClass = float64_class(a);
-    float_class_t bClass = float64_class(b);
-
-    if (aClass == float_SNaN || bClass == float_SNaN) {
-        float_raise(status, float_flag_invalid);
-        return float_relation_unordered;
-    }
-
-    if (aClass == float_QNaN || bClass == float_QNaN) {
-        if (! quiet) float_raise(status, float_flag_invalid);
-        return float_relation_unordered;
-    }
-
-    if (aClass == float_denormal || bClass == float_denormal) {
-        float_raise(status, float_flag_denormal);
-    }
-
-    if ((a == b) || ((Bit64u) ((a | b)<<1) == 0)) return float_relation_equal;
-
-    int aSign = extractFloat64Sign(a);
-    int bSign = extractFloat64Sign(b);
-    if (aSign != bSign)
-        return (aSign) ? float_relation_less : float_relation_greater;
-
-    if (aSign ^ (a < b)) return float_relation_less;
-    return float_relation_greater;
-}
-
-/*----------------------------------------------------------------------------
-| Compare between two double precision floating point numbers and return the
-| smaller of them.
-*----------------------------------------------------------------------------*/
-
-float64 float64_min(float64 a, float64 b, struct float_status_t *status)
-{
-  if (get_denormals_are_zeros(status)) {
-    a = float64_denormal_to_zero(a);
-    b = float64_denormal_to_zero(b);
-  }
-
-  return (float64_compare_two(a, b, status) == float_relation_less) ? a : b;
-}
-
-/*----------------------------------------------------------------------------
-| Compare between two double precision floating point numbers and return the
-| larger of them.
-*----------------------------------------------------------------------------*/
-
-float64 float64_max(float64 a, float64 b, struct float_status_t *status)
-{
-  if (get_denormals_are_zeros(status)) {
-    a = float64_denormal_to_zero(a);
-    b = float64_denormal_to_zero(b);
-  }
-
-  return (float64_compare_two(a, b, status) == float_relation_greater) ? a : b;
-}
-
-/*----------------------------------------------------------------------------
-| Compare between two  double precision  floating point numbers and  return the
-| smaller/larger of them. The operation  is performed according to the IEC/IEEE
-| Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 float64_minmax(float64 a, float64 b, int is_max, int is_abs, struct float_status_t *status)
-{
-    if (get_denormals_are_zeros(status)) {
-        a = float64_denormal_to_zero(a);
-        b = float64_denormal_to_zero(b);
-    }
-
-    if (float64_is_nan(a) || float64_is_nan(b)) {
-        if (float64_is_signaling_nan(a)) {
-            return propagateFloat64NaNOne(a, status);
-        }
-        if (float64_is_signaling_nan(b)) {
-            return propagateFloat64NaNOne(b, status);
-        }
-        if (! float64_is_nan(b)) {
-            if (float64_is_denormal(b))
-                float_raise(status, float_flag_denormal);
-            return b;
-        }
-        if (! float64_is_nan(a)) {
-            if (float64_is_denormal(a))
-                float_raise(status, float_flag_denormal);
-            return a;
-        }
-        return propagateFloat64NaN(a, b, status);
-    }
-
-    float64 tmp_a = a, tmp_b = b;
-    if (is_abs) {
-        tmp_a &= ~BX_CONST64(0x8000000000000000); // clear the sign bit
-        tmp_b &= ~BX_CONST64(0x8000000000000000);
-    }
-
-    int aSign = extractFloat64Sign(tmp_a);
-    int bSign = extractFloat64Sign(tmp_b);
-
-    if (float64_is_denormal(a) || float64_is_denormal(b))
-        float_raise(status, float_flag_denormal);
-
-    if (aSign != bSign) {
-        if (! is_max) {
-            return aSign ? a : b;
-        } else {
-            return aSign ? b : a;
-        }
-    } else {
-        if (! is_max) {
-            return (aSign ^ (tmp_a < tmp_b)) ? a : b;
-        } else {
-            return (aSign ^ (tmp_a < tmp_b)) ? b : a;
-        }
-    }
-}
-
-#ifdef FLOATX80
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the 32-bit two's complement integer `a'
-| to the extended double-precision floating-point format.  The conversion
-| is performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic.
-*----------------------------------------------------------------------------*/
-
-floatx80 int32_to_floatx80(Bit32s a)
-{
-    if (a == 0) return packFloatx80(0, 0, 0);
-    int   zSign = (a < 0);
-    Bit32u absA = zSign ? -a : a;
-    int    shiftCount = countLeadingZeros32(absA) + 32;
-    Bit64u zSig = absA;
-    return packFloatx80(zSign, 0x403E - shiftCount, zSig<<shiftCount);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the 64-bit two's complement integer `a'
-| to the extended double-precision floating-point format.  The conversion
-| is performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic.
-*----------------------------------------------------------------------------*/
-
-floatx80 int64_to_floatx80(Bit64s a)
-{
-    if (a == 0) return packFloatx80(0, 0, 0);
-    int   zSign = (a < 0);
-    Bit64u absA = zSign ? -a : a;
-    int    shiftCount = countLeadingZeros64(absA);
-    return packFloatx80(zSign, 0x403E - shiftCount, absA<<shiftCount);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the single-precision floating-point value
-| `a' to the extended double-precision floating-point format.  The conversion
-| is performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic.
-*----------------------------------------------------------------------------*/
-
-floatx80 float32_to_floatx80(float32 a, struct float_status_t *status)
-{
-    Bit32u aSig = extractFloat32Frac(a);
-    Bit16s aExp = extractFloat32Exp(a);
-    int aSign = extractFloat32Sign(a);
-    if (aExp == 0xFF) {
-        if (aSig) return commonNaNToFloatx80(float32ToCommonNaN(a, status));
-        return packFloatx80(aSign, 0x7FFF, BX_CONST64(0x8000000000000000));
-    }
-    if (aExp == 0) {
-        if (aSig == 0) return packFloatx80(aSign, 0, 0);
-        float_raise(status, float_flag_denormal);
-        normalizeFloat32Subnormal(aSig, &aExp, &aSig);
-    }
-    aSig |= 0x00800000;
-    return packFloatx80(aSign, aExp + 0x3F80, ((Bit64u) aSig)<<40);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the double-precision floating-point value
-| `a' to the extended double-precision floating-point format.  The conversion
-| is performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic.
-*----------------------------------------------------------------------------*/
-
-floatx80 float64_to_floatx80(float64 a, struct float_status_t *status)
-{
-    Bit64u aSig = extractFloat64Frac(a);
-    Bit16s aExp = extractFloat64Exp(a);
-    int aSign = extractFloat64Sign(a);
-
-    if (aExp == 0x7FF) {
-        if (aSig) return commonNaNToFloatx80(float64ToCommonNaN(a, status));
-        return packFloatx80(aSign, 0x7FFF, BX_CONST64(0x8000000000000000));
-    }
-    if (aExp == 0) {
-        if (aSig == 0) return packFloatx80(aSign, 0, 0);
-        float_raise(status, float_flag_denormal);
-        normalizeFloat64Subnormal(aSig, &aExp, &aSig);
-    }
-    return
-        packFloatx80(
-            aSign, aExp + 0x3C00, (aSig | BX_CONST64(0x0010000000000000))<<11);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the extended double-precision floating-
-| point value `a' to the 32-bit two's complement integer format.  The
-| conversion is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic - which means in particular that the conversion
-| is rounded according to the current rounding mode. If `a' is a NaN or the
-| conversion overflows, the integer indefinite value is returned.
-*----------------------------------------------------------------------------*/
-
-Bit32s floatx80_to_int32(floatx80 a, struct float_status_t *status)
-{
-    Bit64u aSig = extractFloatx80Frac(a);
-    Bit32s aExp = extractFloatx80Exp(a);
-    int aSign = extractFloatx80Sign(a);
-
-    // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a))
-    {
-        float_raise(status, float_flag_invalid);
-        return int32_indefinite;
-    }
-
-    if ((aExp == 0x7FFF) && (Bit64u) (aSig<<1)) aSign = 0;
-    int shiftCount = 0x4037 - aExp;
-    if (shiftCount <= 0) shiftCount = 1;
-    aSig = shift64RightJamming(aSig, shiftCount);
-    return roundAndPackInt32(aSign, aSig, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the extended double-precision floating-
-| point value `a' to the 32-bit two's complement integer format.  The
-| conversion is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic, except that the conversion is always rounded
-| toward zero.  If `a' is a NaN or the conversion overflows, the integer
-| indefinite value is returned.
-*----------------------------------------------------------------------------*/
-
-Bit32s floatx80_to_int32_round_to_zero(floatx80 a, struct float_status_t *status)
-{
-    Bit32s aExp;
-    Bit64u aSig, savedASig;
-    Bit32s z;
-    int shiftCount;
-
-    // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a))
-    {
-        float_raise(status, float_flag_invalid);
-        return int32_indefinite;
-    }
-
-    aSig = extractFloatx80Frac(a);
-    aExp = extractFloatx80Exp(a);
-    int aSign = extractFloatx80Sign(a);
-
-    if (aExp > 0x401E) {
-        float_raise(status, float_flag_invalid);
-        return (Bit32s)(int32_indefinite);
-    }
-    if (aExp < 0x3FFF) {
-        if (aExp || aSig) float_raise(status, float_flag_inexact);
-        return 0;
-    }
-    shiftCount = 0x403E - aExp;
-    savedASig = aSig;
-    aSig >>= shiftCount;
-    z = (Bit32s) aSig;
-    if (aSign) z = -z;
-    if ((z < 0) ^ aSign) {
-        float_raise(status, float_flag_invalid);
-        return (Bit32s)(int32_indefinite);
-    }
-    if ((aSig<<shiftCount) != savedASig)
-    {
-        float_raise(status, float_flag_inexact);
-    }
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the extended double-precision floating-
-| point value `a' to the 64-bit two's complement integer format.  The
-| conversion is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic - which means in particular that the conversion
-| is rounded according to the current rounding mode. If `a' is a NaN or the
-| conversion overflows, the integer indefinite value is returned.
-*----------------------------------------------------------------------------*/
-
-Bit64s floatx80_to_int64(floatx80 a, struct float_status_t *status)
-{
-    Bit32s aExp;
-    Bit64u aSig, aSigExtra;
-
-    // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a))
-    {
-        float_raise(status, float_flag_invalid);
-        return int64_indefinite;
-    }
-
-    aSig = extractFloatx80Frac(a);
-    aExp = extractFloatx80Exp(a);
-    int aSign = extractFloatx80Sign(a);
-
-    int shiftCount = 0x403E - aExp;
-    if (shiftCount <= 0)
-    {
-        if (shiftCount)
-        {
-            float_raise(status, float_flag_invalid);
-            return (Bit64s)(int64_indefinite);
-        }
-        aSigExtra = 0;
-    }
-    else {
-        shift64ExtraRightJamming(aSig, 0, shiftCount, &aSig, &aSigExtra);
-    }
-
-    return roundAndPackInt64(aSign, aSig, aSigExtra, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the extended double-precision floating-
-| point value `a' to the 64-bit two's complement integer format.  The
-| conversion is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic, except that the conversion is always rounded
-| toward zero.  If `a' is a NaN or the conversion overflows, the integer
-| indefinite value is returned.
-*----------------------------------------------------------------------------*/
-
-Bit64s floatx80_to_int64_round_to_zero(floatx80 a, struct float_status_t *status)
-{
-    int aSign;
-    Bit32s aExp;
-    Bit64u aSig;
-    Bit64s z;
-
-    // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a))
-    {
-        float_raise(status, float_flag_invalid);
-        return int64_indefinite;
-    }
-
-    aSig = extractFloatx80Frac(a);
-    aExp = extractFloatx80Exp(a);
-    aSign = extractFloatx80Sign(a);
-    int shiftCount = aExp - 0x403E;
-    if (0 <= shiftCount) {
-        aSig &= BX_CONST64(0x7FFFFFFFFFFFFFFF);
-        if ((a.exp != 0xC03E) || aSig) {
-            float_raise(status, float_flag_invalid);
-        }
-        return (Bit64s)(int64_indefinite);
-    }
-    else if (aExp < 0x3FFF) {
-        if (aExp | aSig) float_raise(status, float_flag_inexact);
-        return 0;
-    }
-    z = aSig>>(-shiftCount);
-    if ((Bit64u) (aSig<<(shiftCount & 63))) {
-        float_raise(status, float_flag_inexact);
-    }
-    if (aSign) z = -z;
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the extended double-precision floating-
-| point value `a' to the single-precision floating-point format.  The
-| conversion is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 floatx80_to_float32(floatx80 a, struct float_status_t *status)
-{
-    Bit64u aSig = extractFloatx80Frac(a);
-    Bit32s aExp = extractFloatx80Exp(a);
-    int aSign = extractFloatx80Sign(a);
-
-    // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a))
-    {
-        float_raise(status, float_flag_invalid);
-        return float32_default_nan;
-    }
-
-    if (aExp == 0x7FFF) {
-        if ((Bit64u) (aSig<<1))
-            return commonNaNToFloat32(floatx80ToCommonNaN(a, status));
-
-        return packFloat32(aSign, 0xFF, 0);
-    }
-    aSig = shift64RightJamming(aSig, 33);
-    if (aExp || aSig) aExp -= 0x3F81;
-    return roundAndPackFloat32(aSign, aExp, (Bit32u) aSig, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the extended double-precision floating-
-| point value `a' to the double-precision floating-point format.  The
-| conversion is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float64 floatx80_to_float64(floatx80 a, struct float_status_t *status)
-{
-    Bit32s aExp;
-    Bit64u aSig, zSig;
-
-    // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a))
-    {
-        float_raise(status, float_flag_invalid);
-        return float64_default_nan;
-    }
-
-    aSig = extractFloatx80Frac(a);
-    aExp = extractFloatx80Exp(a);
-    int aSign = extractFloatx80Sign(a);
-
-    if (aExp == 0x7FFF) {
-        if ((Bit64u) (aSig<<1)) {
-            return commonNaNToFloat64(floatx80ToCommonNaN(a, status));
-        }
-        return packFloat64(aSign, 0x7FF, 0);
-    }
-    zSig = shift64RightJamming(aSig, 1);
-    if (aExp || aSig) aExp -= 0x3C01;
-    return roundAndPackFloat64(aSign, aExp, zSig, status);
-}
-
-/*----------------------------------------------------------------------------
-| Rounds the extended double-precision floating-point value `a' to an integer,
-| and returns the result as an extended double-precision floating-point
-| value.  The operation is performed according to the IEC/IEEE Standard for
-| Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-floatx80 floatx80_round_to_int(floatx80 a, struct float_status_t *status)
-{
-/*----------------------------------------------------------------------------
-| The pattern for a default generated extended double-precision NaN.
-*----------------------------------------------------------------------------*/
-    const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
-
-    int aSign;
-    Bit64u lastBitMask, roundBitsMask;
-    int roundingMode = get_float_rounding_mode(status);
-    floatx80 z;
-
-    // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a))
-    {
-        float_raise(status, float_flag_invalid);
-        return floatx80_default_nan;
-    }
-
-    Bit32s aExp = extractFloatx80Exp(a);
-    Bit64u aSig = extractFloatx80Frac(a);
-    if (0x403E <= aExp) {
-        if ((aExp == 0x7FFF) && (Bit64u) (aSig<<1)) {
-            return propagateFloatx80NaNOne(a, status);
-        }
-        return a;
-    }
-    if (aExp < 0x3FFF) {
-        if (aExp == 0) {
-            if ((aSig<<1) == 0) return a;
-            float_raise(status, float_flag_denormal);
-        }
-        float_raise(status, float_flag_inexact);
-        aSign = extractFloatx80Sign(a);
-        switch (roundingMode) {
-         case float_round_nearest_even:
-            if ((aExp == 0x3FFE) && (Bit64u) (aSig<<1)) {
-                set_float_rounding_up(status);
-                return packFloatx80(aSign, 0x3FFF, BX_CONST64(0x8000000000000000));
-            }
-            break;
-         case float_round_down:
-            if (aSign) {
-                set_float_rounding_up(status);
-                return packFloatx80(1, 0x3FFF, BX_CONST64(0x8000000000000000));
-            }
-            else {
-                return packFloatx80(0, 0, 0);
-            }
-         case float_round_up:
-            if (aSign) {
-                return packFloatx80(1, 0, 0);
-            }
-            else {
-                set_float_rounding_up(status);
-                return packFloatx80(0, 0x3FFF, BX_CONST64(0x8000000000000000));
-            }
-        }
-        return packFloatx80(aSign, 0, 0);
-    }
-    lastBitMask = 1;
-    lastBitMask <<= 0x403E - aExp;
-    roundBitsMask = lastBitMask - 1;
-    z = a;
-    if (roundingMode == float_round_nearest_even) {
-        z.fraction += lastBitMask>>1;
-        if ((z.fraction & roundBitsMask) == 0) z.fraction &= ~lastBitMask;
-    }
-    else if (roundingMode != float_round_to_zero) {
-        if (extractFloatx80Sign(z) ^ (roundingMode == float_round_up))
-            z.fraction += roundBitsMask;
-    }
-    z.fraction &= ~roundBitsMask;
-    if (z.fraction == 0) {
-        z.exp++;
-        z.fraction = BX_CONST64(0x8000000000000000);
-    }
-    if (z.fraction != a.fraction) {
-        float_raise(status, float_flag_inexact);
-        if (z.fraction > a.fraction || z.exp > a.exp)
-            set_float_rounding_up(status);
-    }
-    return z;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of adding the absolute values of the extended double-
-| precision floating-point values `a' and `b'.  If `zSign' is 1, the sum is
-| negated before being returned.  `zSign' is ignored if the result is a NaN.
-| The addition is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-static floatx80 addFloatx80Sigs(floatx80 a, floatx80 b, int zSign, struct float_status_t *status)
-{
-/*----------------------------------------------------------------------------
-| The pattern for a default generated extended double-precision NaN.
-*----------------------------------------------------------------------------*/
-    const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
-
-    Bit32s aExp, bExp, zExp;
-    Bit64u aSig, bSig, zSig0, zSig1;
-
-    // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a) || floatx80_is_unsupported(b))
-    {
-        float_raise(status, float_flag_invalid);
-        return floatx80_default_nan;
-    }
-
-    aSig = extractFloatx80Frac(a);
-    aExp = extractFloatx80Exp(a);
-    bSig = extractFloatx80Frac(b);
-    bExp = extractFloatx80Exp(b);
-
-    if (aExp == 0x7FFF) {
-        if ((Bit64u) (aSig<<1) || ((bExp == 0x7FFF) && (Bit64u) (bSig<<1)))
-            return propagateFloatx80NaN(a, b, status);
-        if (bSig && (bExp == 0)) float_raise(status, float_flag_denormal);
-        return a;
-    }
-    if (bExp == 0x7FFF) {
-        if ((Bit64u) (bSig<<1)) return propagateFloatx80NaN(a, b, status);
-        if (aSig && (aExp == 0)) float_raise(status, float_flag_denormal);
-        return packFloatx80(zSign, 0x7FFF, BX_CONST64(0x8000000000000000));
-    }
-    if (aExp == 0) {
-        if (aSig == 0) {
-            if ((bExp == 0) && bSig) {
-                float_raise(status, float_flag_denormal);
-                normalizeFloatx80Subnormal(bSig, &bExp, &bSig);
-            }
-            return roundAndPackFloatx80(get_float_rounding_precision(status),
-                    zSign, bExp, bSig, 0, status);
-        }
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(aSig, &aExp, &aSig);
-    }
-    if (bExp == 0) {
-        if (bSig == 0)
-            return roundAndPackFloatx80(get_float_rounding_precision(status),
-                    zSign, aExp, aSig, 0, status);
-
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(bSig, &bExp, &bSig);
-    }
-    Bit32s expDiff = aExp - bExp;
-    zExp = aExp;
-    if (0 < expDiff) {
-        shift64ExtraRightJamming(bSig, 0,  expDiff, &bSig, &zSig1);
-    }
-    else if (expDiff < 0) {
-        shift64ExtraRightJamming(aSig, 0, -expDiff, &aSig, &zSig1);
-        zExp = bExp;
-    }
-    else {
-        zSig0 = aSig + bSig;
-        zSig1 = 0;
-        goto shiftRight1;
-    }
-    zSig0 = aSig + bSig;
-    if ((Bit64s) zSig0 < 0) goto roundAndPack;
- shiftRight1:
-    shift64ExtraRightJamming(zSig0, zSig1, 1, &zSig0, &zSig1);
-    zSig0 |= BX_CONST64(0x8000000000000000);
-    zExp++;
- roundAndPack:
-    return
-        roundAndPackFloatx80(get_float_rounding_precision(status),
-            zSign, zExp, zSig0, zSig1, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of subtracting the absolute values of the extended
-| double-precision floating-point values `a' and `b'.  If `zSign' is 1, the
-| difference is negated before being returned.  `zSign' is ignored if the
-| result is a NaN.  The subtraction is performed according to the IEC/IEEE
-| Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-static floatx80 subFloatx80Sigs(floatx80 a, floatx80 b, int zSign, struct float_status_t *status)
-{
-/*----------------------------------------------------------------------------
-| The pattern for a default generated extended double-precision NaN.
-*----------------------------------------------------------------------------*/
-    const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
-
-    Bit32s aExp, bExp, zExp;
-    Bit64u aSig, bSig, zSig0, zSig1;
-
-    // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a) || floatx80_is_unsupported(b))
-    {
-        float_raise(status, float_flag_invalid);
-        return floatx80_default_nan;
-    }
-
-    aSig = extractFloatx80Frac(a);
-    aExp = extractFloatx80Exp(a);
-    bSig = extractFloatx80Frac(b);
-    bExp = extractFloatx80Exp(b);
-
-    if (aExp == 0x7FFF) {
-        if ((Bit64u) (aSig<<1)) return propagateFloatx80NaN(a, b, status);
-        if (bExp == 0x7FFF) {
-            if ((Bit64u) (bSig<<1)) return propagateFloatx80NaN(a, b, status);
-            float_raise(status, float_flag_invalid);
-            return floatx80_default_nan;
-        }
-        if (bSig && (bExp == 0)) float_raise(status, float_flag_denormal);
-        return a;
-    }
-    if (bExp == 0x7FFF) {
-        if ((Bit64u) (bSig<<1)) return propagateFloatx80NaN(a, b, status);
-        if (aSig && (aExp == 0)) float_raise(status, float_flag_denormal);
-        return packFloatx80(zSign ^ 1, 0x7FFF, BX_CONST64(0x8000000000000000));
-    }
-    if (aExp == 0) {
-        if (aSig == 0) {
-            if (bExp == 0) {
-                if (bSig) {
-                    float_raise(status, float_flag_denormal);
-                    normalizeFloatx80Subnormal(bSig, &bExp, &bSig);
-                    return roundAndPackFloatx80(get_float_rounding_precision(status),
-                        zSign ^ 1, bExp, bSig, 0, status);
-                }
-                return packFloatx80(get_float_rounding_mode(status) == float_round_down, 0, 0);
-            }
-            return roundAndPackFloatx80(get_float_rounding_precision(status),
-                    zSign ^ 1, bExp, bSig, 0, status);
-        }
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(aSig, &aExp, &aSig);
-    }
-    if (bExp == 0) {
-        if (bSig == 0)
-            return roundAndPackFloatx80(get_float_rounding_precision(status),
-                    zSign, aExp, aSig, 0, status);
-
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(bSig, &bExp, &bSig);
-    }
-    Bit32s expDiff = aExp - bExp;
-    if (0 < expDiff) {
-        shift128RightJamming(bSig, 0, expDiff, &bSig, &zSig1);
-        goto aBigger;
-    }
-    if (expDiff < 0) {
-        shift128RightJamming(aSig, 0, -expDiff, &aSig, &zSig1);
-        goto bBigger;
-    }
-    zSig1 = 0;
-    if (bSig < aSig) goto aBigger;
-    if (aSig < bSig) goto bBigger;
-    return packFloatx80(get_float_rounding_mode(status) == float_round_down, 0, 0);
- bBigger:
-    sub128(bSig, 0, aSig, zSig1, &zSig0, &zSig1);
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aBigger:
-    sub128(aSig, 0, bSig, zSig1, &zSig0, &zSig1);
-    zExp = aExp;
- normalizeRoundAndPack:
-    return
-        normalizeRoundAndPackFloatx80(get_float_rounding_precision(status),
-            zSign, zExp, zSig0, zSig1, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of adding the extended double-precision floating-point
-| values `a' and `b'.  The operation is performed according to the IEC/IEEE
-| Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-floatx80 floatx80_add(floatx80 a, floatx80 b, struct float_status_t *status)
-{
-    int aSign = extractFloatx80Sign(a);
-    int bSign = extractFloatx80Sign(b);
-
-    if (aSign == bSign)
-        return addFloatx80Sigs(a, b, aSign, status);
-    else
-        return subFloatx80Sigs(a, b, aSign, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of subtracting the extended double-precision floating-
-| point values `a' and `b'.  The operation is performed according to the
-| IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-floatx80 floatx80_sub(floatx80 a, floatx80 b, struct float_status_t *status)
-{
-    int aSign = extractFloatx80Sign(a);
-    int bSign = extractFloatx80Sign(b);
-
-    if (aSign == bSign)
-        return subFloatx80Sigs(a, b, aSign, status);
-    else
-        return addFloatx80Sigs(a, b, aSign, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of multiplying the extended double-precision floating-
-| point values `a' and `b'.  The operation is performed according to the
-| IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-floatx80 floatx80_mul(floatx80 a, floatx80 b, struct float_status_t *status)
-{
-/*----------------------------------------------------------------------------
-| The pattern for a default generated extended double-precision NaN.
-*----------------------------------------------------------------------------*/
-    const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
-
-    int aSign, bSign, zSign;
-    Bit32s aExp, bExp, zExp;
-    Bit64u aSig, bSig, zSig0, zSig1;
-
-    // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a) || floatx80_is_unsupported(b))
-    {
- invalid:
-        float_raise(status, float_flag_invalid);
-        return floatx80_default_nan;
-    }
-
-    aSig = extractFloatx80Frac(a);
-    aExp = extractFloatx80Exp(a);
-    aSign = extractFloatx80Sign(a);
-    bSig = extractFloatx80Frac(b);
-    bExp = extractFloatx80Exp(b);
-    bSign = extractFloatx80Sign(b);
-    zSign = aSign ^ bSign;
-
-    if (aExp == 0x7FFF) {
-        if ((Bit64u) (aSig<<1) || ((bExp == 0x7FFF) && (Bit64u) (bSig<<1))) {
-            return propagateFloatx80NaN(a, b, status);
-        }
-        if (bExp == 0) {
-            if (bSig == 0) goto invalid;
-            float_raise(status, float_flag_denormal);
-        }
-        return packFloatx80(zSign, 0x7FFF, BX_CONST64(0x8000000000000000));
-    }
-    if (bExp == 0x7FFF) {
-        if ((Bit64u) (bSig<<1)) return propagateFloatx80NaN(a, b, status);
-        if (aExp == 0) {
-            if (aSig == 0) goto invalid;
-            float_raise(status, float_flag_denormal);
-        }
-        return packFloatx80(zSign, 0x7FFF, BX_CONST64(0x8000000000000000));
-    }
-    if (aExp == 0) {
-        if (aSig == 0) {
-            if (bSig && (bExp == 0)) float_raise(status, float_flag_denormal);
-            return packFloatx80(zSign, 0, 0);
-        }
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(aSig, &aExp, &aSig);
-    }
-    if (bExp == 0) {
-        if (bSig == 0) return packFloatx80(zSign, 0, 0);
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(bSig, &bExp, &bSig);
-    }
-    zExp = aExp + bExp - 0x3FFE;
-    mul64To128(aSig, bSig, &zSig0, &zSig1);
-    if (0 < (Bit64s) zSig0) {
-        shortShift128Left(zSig0, zSig1, 1, &zSig0, &zSig1);
-        --zExp;
-    }
-    return
-        roundAndPackFloatx80(get_float_rounding_precision(status),
-             zSign, zExp, zSig0, zSig1, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of dividing the extended double-precision floating-point
-| value `a' by the corresponding value `b'.  The operation is performed
-| according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-floatx80 floatx80_div(floatx80 a, floatx80 b, struct float_status_t *status)
-{
-/*----------------------------------------------------------------------------
-| The pattern for a default generated extended double-precision NaN.
-*----------------------------------------------------------------------------*/
-    const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
-
-    int aSign, bSign, zSign;
-    Bit32s aExp, bExp, zExp;
-    Bit64u aSig, bSig, zSig0, zSig1;
-    Bit64u rem0, rem1, rem2, term0, term1, term2;
-
-    // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a) || floatx80_is_unsupported(b))
-    {
-        float_raise(status, float_flag_invalid);
-        return floatx80_default_nan;
-    }
-
-    aSig = extractFloatx80Frac(a);
-    aExp = extractFloatx80Exp(a);
-    aSign = extractFloatx80Sign(a);
-    bSig = extractFloatx80Frac(b);
-    bExp = extractFloatx80Exp(b);
-    bSign = extractFloatx80Sign(b);
-
-    zSign = aSign ^ bSign;
-    if (aExp == 0x7FFF) {
-        if ((Bit64u) (aSig<<1)) return propagateFloatx80NaN(a, b, status);
-        if (bExp == 0x7FFF) {
-            if ((Bit64u) (bSig<<1)) return propagateFloatx80NaN(a, b, status);
-            float_raise(status, float_flag_invalid);
-            return floatx80_default_nan;
-        }
-        if (bSig && (bExp == 0)) float_raise(status, float_flag_denormal);
-        return packFloatx80(zSign, 0x7FFF, BX_CONST64(0x8000000000000000));
-    }
-    if (bExp == 0x7FFF) {
-        if ((Bit64u) (bSig<<1)) return propagateFloatx80NaN(a, b, status);
-        if (aSig && (aExp == 0)) float_raise(status, float_flag_denormal);
-        return packFloatx80(zSign, 0, 0);
-    }
-    if (bExp == 0) {
-        if (bSig == 0) {
-            if ((aExp | aSig) == 0) {
-                float_raise(status, float_flag_invalid);
-                return floatx80_default_nan;
-            }
-            float_raise(status, float_flag_divbyzero);
-            return packFloatx80(zSign, 0x7FFF, BX_CONST64(0x8000000000000000));
-        }
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(bSig, &bExp, &bSig);
-    }
-    if (aExp == 0) {
-        if (aSig == 0) return packFloatx80(zSign, 0, 0);
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(aSig, &aExp, &aSig);
-    }
-    zExp = aExp - bExp + 0x3FFE;
-    rem1 = 0;
-    if (bSig <= aSig) {
-        shift128Right(aSig, 0, 1, &aSig, &rem1);
-        ++zExp;
-    }
-    zSig0 = estimateDiv128To64(aSig, rem1, bSig);
-    mul64To128(bSig, zSig0, &term0, &term1);
-    sub128(aSig, rem1, term0, term1, &rem0, &rem1);
-    while ((Bit64s) rem0 < 0) {
-        --zSig0;
-        add128(rem0, rem1, 0, bSig, &rem0, &rem1);
-    }
-    zSig1 = estimateDiv128To64(rem1, 0, bSig);
-    if ((Bit64u) (zSig1<<1) <= 8) {
-        mul64To128(bSig, zSig1, &term1, &term2);
-        sub128(rem1, 0, term1, term2, &rem1, &rem2);
-        while ((Bit64s) rem1 < 0) {
-            --zSig1;
-            add128(rem1, rem2, 0, bSig, &rem1, &rem2);
-        }
-        zSig1 |= ((rem1 | rem2) != 0);
-    }
-    return
-        roundAndPackFloatx80(get_float_rounding_precision(status),
-            zSign, zExp, zSig0, zSig1, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the square root of the extended double-precision floating-point
-| value `a'.  The operation is performed according to the IEC/IEEE Standard
-| for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-floatx80 floatx80_sqrt(floatx80 a, struct float_status_t *status)
-{
-/*----------------------------------------------------------------------------
-| The pattern for a default generated extended double-precision NaN.
-*----------------------------------------------------------------------------*/
-    const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
-
-    int aSign;
-    Bit32s aExp, zExp;
-    Bit64u aSig0, aSig1, zSig0, zSig1, doubleZSig0;
-    Bit64u rem0, rem1, rem2, rem3, term0, term1, term2, term3;
-
-    // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a))
-    {
-        float_raise(status, float_flag_invalid);
-        return floatx80_default_nan;
-    }
-
-    aSig0 = extractFloatx80Frac(a);
-    aExp = extractFloatx80Exp(a);
-    aSign = extractFloatx80Sign(a);
-    if (aExp == 0x7FFF) {
-        if ((Bit64u) (aSig0<<1)) return propagateFloatx80NaNOne(a, status);
-        if (! aSign) return a;
-        float_raise(status, float_flag_invalid);
-        return floatx80_default_nan;
-    }
-    if (aSign) {
-        if ((aExp | aSig0) == 0) return a;
-        float_raise(status, float_flag_invalid);
-        return floatx80_default_nan;
-    }
-    if (aExp == 0) {
-        if (aSig0 == 0) return packFloatx80(0, 0, 0);
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(aSig0, &aExp, &aSig0);
-    }
-    zExp = ((aExp - 0x3FFF)>>1) + 0x3FFF;
-    zSig0 = estimateSqrt32(aExp, aSig0>>32);
-    shift128Right(aSig0, 0, 2 + (aExp & 1), &aSig0, &aSig1);
-    zSig0 = estimateDiv128To64(aSig0, aSig1, zSig0<<32) + (zSig0<<30);
-    doubleZSig0 = zSig0<<1;
-    mul64To128(zSig0, zSig0, &term0, &term1);
-    sub128(aSig0, aSig1, term0, term1, &rem0, &rem1);
-    while ((Bit64s) rem0 < 0) {
-        --zSig0;
-        doubleZSig0 -= 2;
-        add128(rem0, rem1, zSig0>>63, doubleZSig0 | 1, &rem0, &rem1);
-    }
-    zSig1 = estimateDiv128To64(rem1, 0, doubleZSig0);
-    if ((zSig1 & BX_CONST64(0x3FFFFFFFFFFFFFFF)) <= 5) {
-        if (zSig1 == 0) zSig1 = 1;
-        mul64To128(doubleZSig0, zSig1, &term1, &term2);
-        sub128(rem1, 0, term1, term2, &rem1, &rem2);
-        mul64To128(zSig1, zSig1, &term2, &term3);
-        sub192(rem1, rem2, 0, 0, term2, term3, &rem1, &rem2, &rem3);
-        while ((Bit64s) rem1 < 0) {
-            --zSig1;
-            shortShift128Left(0, zSig1, 1, &term2, &term3);
-            term3 |= 1;
-            term2 |= doubleZSig0;
-            add192(rem1, rem2, rem3, 0, term2, term3, &rem1, &rem2, &rem3);
-        }
-        zSig1 |= ((rem1 | rem2 | rem3) != 0);
-    }
-    shortShift128Left(0, zSig1, 1, &zSig0, &zSig1);
-    zSig0 |= doubleZSig0;
-    return
-        roundAndPackFloatx80(get_float_rounding_precision(status),
-            0, zExp, zSig0, zSig1, status);
-}
-
-#endif
-
-#ifdef FLOAT128
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the extended double-precision floating-
-| point value `a' to the quadruple-precision floating-point format. The
-| conversion is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float128 floatx80_to_float128(floatx80 a, struct float_status_t *status)
-{
-    Bit64u zSig0, zSig1;
-
-    Bit64u aSig = extractFloatx80Frac(a);
-    Bit32s aExp = extractFloatx80Exp(a);
-    int   aSign = extractFloatx80Sign(a);
-
-    if ((aExp == 0x7FFF) && (Bit64u) (aSig<<1))
-        return commonNaNToFloat128(floatx80ToCommonNaN(a, status));
-
-    shift128Right(aSig<<1, 0, 16, &zSig0, &zSig1);
-    return packFloat128Four(aSign, aExp, zSig0, zSig1);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the quadruple-precision floating-point
-| value `a' to the extended double-precision floating-point format.  The
-| conversion is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-floatx80 float128_to_floatx80(float128 a, struct float_status_t *status)
-{
-    Bit32s aExp;
-    Bit64u aSig0, aSig1;
-
-    aSig1 = extractFloat128Frac1(a);
-    aSig0 = extractFloat128Frac0(a);
-    aExp = extractFloat128Exp(a);
-    int aSign = extractFloat128Sign(a);
-
-    if (aExp == 0x7FFF) {
-        if (aSig0 | aSig1)
-            return commonNaNToFloatx80(float128ToCommonNaN(a, status));
-
-        return packFloatx80(aSign, 0x7FFF, BX_CONST64(0x8000000000000000));
-    }
-
-    if (aExp == 0) {
-        if ((aSig0 | aSig1) == 0) return packFloatx80(aSign, 0, 0);
-        float_raise(status, float_flag_denormal);
-        normalizeFloat128Subnormal(aSig0, aSig1, &aExp, &aSig0, &aSig1);
-    }
-    else aSig0 |= BX_CONST64(0x0001000000000000);
-
-    shortShift128Left(aSig0, aSig1, 15, &aSig0, &aSig1);
-    return roundAndPackFloatx80(80, aSign, aExp, aSig0, aSig1, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of multiplying the extended double-precision floating-
-| point value `a' and quadruple-precision floating point value `b'. The
-| operation is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-floatx80 floatx80_128_mul(floatx80 a, float128 b, struct float_status_t *status)
-{
-/*----------------------------------------------------------------------------
-| The pattern for a default generated extended double-precision NaN.
-*----------------------------------------------------------------------------*/
-    const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
-
-    Bit32s aExp, bExp, zExp;
-    Bit64u aSig, bSig0, bSig1, zSig0, zSig1, zSig2;
-    int aSign, bSign, zSign;
-
-    // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a))
-    {
- invalid:
-        float_raise(status, float_flag_invalid);
-        return floatx80_default_nan;
-    }
-
-    aSig = extractFloatx80Frac(a);
-    aExp = extractFloatx80Exp(a);
-    aSign = extractFloatx80Sign(a);
-    bSig0 = extractFloat128Frac0(b);
-    bSig1 = extractFloat128Frac1(b);
-    bExp = extractFloat128Exp(b);
-    bSign = extractFloat128Sign(b);
-
-    zSign = aSign ^ bSign;
-
-    if (aExp == 0x7FFF) {
-        if ((Bit64u) (aSig<<1)
-             || ((bExp == 0x7FFF) && (bSig0 | bSig1)))
-        {
-            floatx80 r = commonNaNToFloatx80(float128ToCommonNaN(b, status));
-            return propagateFloatx80NaN(a, r, status);
-        }
-        if (bExp == 0) {
-            if ((bSig0 | bSig1) == 0) goto invalid;
-            float_raise(status, float_flag_denormal);
-        }
-        return packFloatx80(zSign, 0x7FFF, BX_CONST64(0x8000000000000000));
-    }
-    if (bExp == 0x7FFF) {
-        if (bSig0 | bSig1) {
-            floatx80 r = commonNaNToFloatx80(float128ToCommonNaN(b, status));
-            return propagateFloatx80NaN(a, r, status);
-        }
-        if (aExp == 0) {
-            if (aSig == 0) goto invalid;
-            float_raise(status, float_flag_denormal);
-        }
-        return packFloatx80(zSign, 0x7FFF, BX_CONST64(0x8000000000000000));
-    }
-    if (aExp == 0) {
-        if (aSig == 0) {
-            if ((bExp == 0) && (bSig0 | bSig1)) float_raise(status, float_flag_denormal);
-            return packFloatx80(zSign, 0, 0);
-        }
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(aSig, &aExp, &aSig);
-    }
-    if (bExp == 0) {
-        if ((bSig0 | bSig1) == 0) return packFloatx80(zSign, 0, 0);
-        float_raise(status, float_flag_denormal);
-        normalizeFloat128Subnormal(bSig0, bSig1, &bExp, &bSig0, &bSig1);
-    }
-    else bSig0 |= BX_CONST64(0x0001000000000000);
-
-    zExp = aExp + bExp - 0x3FFE;
-    shortShift128Left(bSig0, bSig1, 15, &bSig0, &bSig1);
-    mul128By64To192(bSig0, bSig1, aSig, &zSig0, &zSig1, &zSig2);
-    if (0 < (Bit64s) zSig0) {
-        shortShift128Left(zSig0, zSig1, 1, &zSig0, &zSig1);
-        --zExp;
-    }
-    return
-        roundAndPackFloatx80(get_float_rounding_precision(status),
-             zSign, zExp, zSig0, zSig1, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of adding the absolute values of the quadruple-precision
-| floating-point values `a' and `b'. If `zSign' is 1, the sum is negated
-| before being returned. `zSign' is ignored if the result is a NaN.
-| The addition is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-static float128 addFloat128Sigs(float128 a, float128 b, int zSign, struct float_status_t *status)
-{
-    Bit32s aExp, bExp, zExp;
-    Bit64u aSig0, aSig1, bSig0, bSig1, zSig0, zSig1, zSig2;
-    Bit32s expDiff;
-
-    aSig1 = extractFloat128Frac1(a);
-    aSig0 = extractFloat128Frac0(a);
-    aExp = extractFloat128Exp(a);
-    bSig1 = extractFloat128Frac1(b);
-    bSig0 = extractFloat128Frac0(b);
-    bExp = extractFloat128Exp(b);
-    expDiff = aExp - bExp;
-
-    if (0 < expDiff) {
-        if (aExp == 0x7FFF) {
-            if (aSig0 | aSig1) return propagateFloat128NaN(a, b, status);
-            return a;
-        }
-        if (bExp == 0) --expDiff;
-        else bSig0 |= BX_CONST64(0x0001000000000000);
-        shift128ExtraRightJamming(bSig0, bSig1, 0, expDiff, &bSig0, &bSig1, &zSig2);
-        zExp = aExp;
-    }
-    else if (expDiff < 0) {
-        if (bExp == 0x7FFF) {
-            if (bSig0 | bSig1) return propagateFloat128NaN(a, b, status);
-            return packFloat128Four(zSign, 0x7FFF, 0, 0);
-        }
-        if (aExp == 0) ++expDiff;
-        else aSig0 |= BX_CONST64(0x0001000000000000);
-        shift128ExtraRightJamming(aSig0, aSig1, 0, -expDiff, &aSig0, &aSig1, &zSig2);
-        zExp = bExp;
-    }
-    else {
-        if (aExp == 0x7FFF) {
-            if (aSig0 | aSig1 | bSig0 | bSig1)
-                return propagateFloat128NaN(a, b, status);
-
-            return a;
-        }
-        add128(aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1);
-        if (aExp == 0) return packFloat128Four(zSign, 0, zSig0, zSig1);
-        zSig2 = 0;
-        zSig0 |= BX_CONST64(0x0002000000000000);
-        zExp = aExp;
-        goto shiftRight1;
-    }
-    aSig0 |= BX_CONST64(0x0001000000000000);
-    add128(aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1);
-    --zExp;
-    if (zSig0 < BX_CONST64(0x0002000000000000)) goto roundAndPack;
-    ++zExp;
- shiftRight1:
-    shift128ExtraRightJamming(zSig0, zSig1, zSig2, 1, &zSig0, &zSig1, &zSig2);
- roundAndPack:
-    return roundAndPackFloat128(zSign, zExp, zSig0, zSig1, zSig2, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of subtracting the absolute values of the quadruple-
-| precision floating-point values `a' and `b'.  If `zSign' is 1, the
-| difference is negated before being returned.  `zSign' is ignored if the
-| result is a NaN.  The subtraction is performed according to the IEC/IEEE
-| Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-static float128 subFloat128Sigs(float128 a, float128 b, int zSign, struct float_status_t *status)
-{
-    Bit32s aExp, bExp, zExp;
-    Bit64u aSig0, aSig1, bSig0, bSig1, zSig0, zSig1;
-    Bit32s expDiff;
-
-    aSig1 = extractFloat128Frac1(a);
-    aSig0 = extractFloat128Frac0(a);
-    aExp = extractFloat128Exp(a);
-    bSig1 = extractFloat128Frac1(b);
-    bSig0 = extractFloat128Frac0(b);
-    bExp = extractFloat128Exp(b);
-
-    expDiff = aExp - bExp;
-    shortShift128Left(aSig0, aSig1, 14, &aSig0, &aSig1);
-    shortShift128Left(bSig0, bSig1, 14, &bSig0, &bSig1);
-    if (0 < expDiff) goto aExpBigger;
-    if (expDiff < 0) goto bExpBigger;
-    if (aExp == 0x7FFF) {
-        if (aSig0 | aSig1 | bSig0 | bSig1)
-            return propagateFloat128NaN(a, b, status);
-
-        float_raise(status, float_flag_invalid);
-        return float128_default_nan;
-    }
-    if (aExp == 0) {
-        aExp = 1;
-        bExp = 1;
-    }
-    if (bSig0 < aSig0) goto aBigger;
-    if (aSig0 < bSig0) goto bBigger;
-    if (bSig1 < aSig1) goto aBigger;
-    if (aSig1 < bSig1) goto bBigger;
-    return packFloat128(0, 0);
-
- bExpBigger:
-    if (bExp == 0x7FFF) {
-        if (bSig0 | bSig1) return propagateFloat128NaN(a, b, status);
-        return packFloat128Four(zSign ^ 1, 0x7FFF, 0, 0);
-    }
-    if (aExp == 0) ++expDiff;
-    else {
-        aSig0 |= BX_CONST64(0x4000000000000000);
-    }
-    shift128RightJamming(aSig0, aSig1, - expDiff, &aSig0, &aSig1);
-    bSig0 |= BX_CONST64(0x4000000000000000);
- bBigger:
-    sub128(bSig0, bSig1, aSig0, aSig1, &zSig0, &zSig1);
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aExpBigger:
-    if (aExp == 0x7FFF) {
-        if (aSig0 | aSig1) return propagateFloat128NaN(a, b, status);
-        return a;
-    }
-    if (bExp == 0) --expDiff;
-    else {
-        bSig0 |= BX_CONST64(0x4000000000000000);
-    }
-    shift128RightJamming(bSig0, bSig1, expDiff, &bSig0, &bSig1);
-    aSig0 |= BX_CONST64(0x4000000000000000);
- aBigger:
-    sub128(aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1);
-    zExp = aExp;
- normalizeRoundAndPack:
-    --zExp;
-    return normalizeRoundAndPackFloat128(zSign, zExp - 14, zSig0, zSig1, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of adding the quadruple-precision floating-point values
-| `a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-| for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float128 float128_add(float128 a, float128 b, struct float_status_t *status)
-{
-    int aSign = extractFloat128Sign(a);
-    int bSign = extractFloat128Sign(b);
-
-    if (aSign == bSign) {
-        return addFloat128Sigs(a, b, aSign, status);
-    }
-    else {
-        return subFloat128Sigs(a, b, aSign, status);
-    }
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of subtracting the quadruple-precision floating-point
-| values `a' and `b'.  The operation is performed according to the IEC/IEEE
-| Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float128 float128_sub(float128 a, float128 b, struct float_status_t *status)
-{
-    int aSign = extractFloat128Sign(a);
-    int bSign = extractFloat128Sign(b);
-
-    if (aSign == bSign) {
-        return subFloat128Sigs(a, b, aSign, status);
-    }
-    else {
-        return addFloat128Sigs(a, b, aSign, status);
-    }
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of multiplying the quadruple-precision floating-point
-| values `a' and `b'.  The operation is performed according to the IEC/IEEE
-| Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float128 float128_mul(float128 a, float128 b, struct float_status_t *status)
-{
-    int aSign, bSign, zSign;
-    Bit32s aExp, bExp, zExp;
-    Bit64u aSig0, aSig1, bSig0, bSig1, zSig0, zSig1, zSig2, zSig3;
-
-    aSig1 = extractFloat128Frac1(a);
-    aSig0 = extractFloat128Frac0(a);
-    aExp = extractFloat128Exp(a);
-    aSign = extractFloat128Sign(a);
-    bSig1 = extractFloat128Frac1(b);
-    bSig0 = extractFloat128Frac0(b);
-    bExp = extractFloat128Exp(b);
-    bSign = extractFloat128Sign(b);
-
-    zSign = aSign ^ bSign;
-    if (aExp == 0x7FFF) {
-        if ((aSig0 | aSig1) || ((bExp == 0x7FFF) && (bSig0 | bSig1))) {
-            return propagateFloat128NaN(a, b, status);
-        }
-        if ((bExp | bSig0 | bSig1) == 0) {
-            float_raise(status, float_flag_invalid);
-            return float128_default_nan;
-        }
-        return packFloat128Four(zSign, 0x7FFF, 0, 0);
-    }
-    if (bExp == 0x7FFF) {
-        if (bSig0 | bSig1) return propagateFloat128NaN(a, b, status);
-        if ((aExp | aSig0 | aSig1) == 0) {
-            float_raise(status, float_flag_invalid);
-            return float128_default_nan;
-        }
-        return packFloat128Four(zSign, 0x7FFF, 0, 0);
-    }
-    if (aExp == 0) {
-        if ((aSig0 | aSig1) == 0) return packFloat128Four(zSign, 0, 0, 0);
-        float_raise(status, float_flag_denormal);
-        normalizeFloat128Subnormal(aSig0, aSig1, &aExp, &aSig0, &aSig1);
-    }
-    if (bExp == 0) {
-        if ((bSig0 | bSig1) == 0) return packFloat128Four(zSign, 0, 0, 0);
-        float_raise(status, float_flag_denormal);
-        normalizeFloat128Subnormal(bSig0, bSig1, &bExp, &bSig0, &bSig1);
-    }
-    zExp = aExp + bExp - 0x4000;
-    aSig0 |= BX_CONST64(0x0001000000000000);
-    shortShift128Left(bSig0, bSig1, 16, &bSig0, &bSig1);
-    mul128To256(aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1, &zSig2, &zSig3);
-    add128(zSig0, zSig1, aSig0, aSig1, &zSig0, &zSig1);
-    zSig2 |= (zSig3 != 0);
-    if (BX_CONST64(0x0002000000000000) <= zSig0) {
-        shift128ExtraRightJamming(zSig0, zSig1, zSig2, 1, &zSig0, &zSig1, &zSig2);
-        ++zExp;
-    }
-    return roundAndPackFloat128(zSign, zExp, zSig0, zSig1, zSig2, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of dividing the quadruple-precision floating-point value
-| `a' by the corresponding value `b'.  The operation is performed according to
-| the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float128 float128_div(float128 a, float128 b, struct float_status_t *status)
-{
-    int aSign, bSign, zSign;
-    Bit32s aExp, bExp, zExp;
-    Bit64u aSig0, aSig1, bSig0, bSig1, zSig0, zSig1, zSig2;
-    Bit64u rem0, rem1, rem2, rem3, term0, term1, term2, term3;
-
-    aSig1 = extractFloat128Frac1(a);
-    aSig0 = extractFloat128Frac0(a);
-    aExp = extractFloat128Exp(a);
-    aSign = extractFloat128Sign(a);
-    bSig1 = extractFloat128Frac1(b);
-    bSig0 = extractFloat128Frac0(b);
-    bExp = extractFloat128Exp(b);
-    bSign = extractFloat128Sign(b);
-
-    zSign = aSign ^ bSign;
-    if (aExp == 0x7FFF) {
-        if (aSig0 | aSig1) return propagateFloat128NaN(a, b, status);
-        if (bExp == 0x7FFF) {
-            if (bSig0 | bSig1) return propagateFloat128NaN(a, b, status);
-            float_raise(status, float_flag_invalid);
-            return float128_default_nan;
-        }
-        return packFloat128Four(zSign, 0x7FFF, 0, 0);
-    }
-    if (bExp == 0x7FFF) {
-        if (bSig0 | bSig1) return propagateFloat128NaN(a, b, status);
-        return packFloat128Four(zSign, 0, 0, 0);
-    }
-    if (bExp == 0) {
-        if ((bSig0 | bSig1) == 0) {
-            if ((aExp | aSig0 | aSig1) == 0) {
-                float_raise(status, float_flag_invalid);
-                return float128_default_nan;
-            }
-            float_raise(status, float_flag_divbyzero);
-            return packFloat128Four(zSign, 0x7FFF, 0, 0);
-        }
-        float_raise(status, float_flag_denormal);
-        normalizeFloat128Subnormal(bSig0, bSig1, &bExp, &bSig0, &bSig1);
-    }
-    if (aExp == 0) {
-        if ((aSig0 | aSig1) == 0) return packFloat128Four(zSign, 0, 0, 0);
-        float_raise(status, float_flag_denormal);
-        normalizeFloat128Subnormal(aSig0, aSig1, &aExp, &aSig0, &aSig1);
-    }
-    zExp = aExp - bExp + 0x3FFD;
-    shortShift128Left(
-        aSig0 | BX_CONST64(0x0001000000000000), aSig1, 15, &aSig0, &aSig1);
-    shortShift128Left(
-        bSig0 | BX_CONST64(0x0001000000000000), bSig1, 15, &bSig0, &bSig1);
-    if (le128(bSig0, bSig1, aSig0, aSig1)) {
-        shift128Right(aSig0, aSig1, 1, &aSig0, &aSig1);
-        ++zExp;
-    }
-    zSig0 = estimateDiv128To64(aSig0, aSig1, bSig0);
-    mul128By64To192(bSig0, bSig1, zSig0, &term0, &term1, &term2);
-    sub192(aSig0, aSig1, 0, term0, term1, term2, &rem0, &rem1, &rem2);
-    while ((Bit64s) rem0 < 0) {
-        --zSig0;
-        add192(rem0, rem1, rem2, 0, bSig0, bSig1, &rem0, &rem1, &rem2);
-    }
-    zSig1 = estimateDiv128To64(rem1, rem2, bSig0);
-    if ((zSig1 & 0x3FFF) <= 4) {
-        mul128By64To192(bSig0, bSig1, zSig1, &term1, &term2, &term3);
-        sub192(rem1, rem2, 0, term1, term2, term3, &rem1, &rem2, &rem3);
-        while ((Bit64s) rem1 < 0) {
-            --zSig1;
-            add192(rem1, rem2, rem3, 0, bSig0, bSig1, &rem1, &rem2, &rem3);
-        }
-        zSig1 |= ((rem1 | rem2 | rem3) != 0);
-    }
-    shift128ExtraRightJamming(zSig0, zSig1, 0, 15, &zSig0, &zSig1, &zSig2);
-    return roundAndPackFloat128(zSign, zExp, zSig0, zSig1, zSig2, status);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the 64-bit two's complement integer `a' to
-| the quadruple-precision floating-point format.  The conversion is performed
-| according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float128 int64_to_float128(Bit64s a)
-{
-    Bit64u zSig0, zSig1;
-
-    if (a == 0) return packFloat128Four(0, 0, 0, 0);
-    int zSign = (a < 0);
-    Bit64u absA = zSign ? - a : a;
-    Bit8u shiftCount = countLeadingZeros64(absA) + 49;
-    Bit32s zExp = 0x406E - shiftCount;
-    if (64 <= shiftCount) {
-        zSig1 = 0;
-        zSig0 = absA;
-        shiftCount -= 64;
-    }
-    else {
-        zSig1 = absA;
-        zSig0 = 0;
-    }
-    shortShift128Left(zSig0, zSig1, shiftCount, &zSig0, &zSig1);
-    return packFloat128Four(zSign, zExp, zSig0, zSig1);
-}
-
-#endif
diff --git a/src/cpu/softfloat/softfloat.h b/src/cpu/softfloat/softfloat.h
deleted file mode 100644
index 1d1b0f08f..000000000
--- a/src/cpu/softfloat/softfloat.h
+++ /dev/null
@@ -1,488 +0,0 @@
-/*============================================================================
-This C header file is part of the SoftFloat IEC/IEEE Floating-point Arithmetic
-Package, Release 2b.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://www.cs.berkeley.edu/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has
-been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES
-RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS
-AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,
-COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE
-EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
-INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
-OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) the source code for the derivative work includes prominent notice that
-the work is derivative, and (2) the source code includes prominent notice with
-these four paragraphs for those parts of this code that are retained.
-=============================================================================*/
-
-/*============================================================================
- * Adapted for Bochs (x86 achitecture simulator) by
- *            Stanislav Shwartsman [sshwarts at sourceforge net]
- * ==========================================================================*/
-
-#include "config.h"      /* generated by configure script from config.h.in */
-
-#ifndef _SOFTFLOAT_H_
-#define _SOFTFLOAT_H_
-
-#define FLOAT16
-#define FLOATX80
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE floating-point types.
-*----------------------------------------------------------------------------*/
-#ifdef FLOAT16
-typedef Bit16u float16;
-#endif
-typedef Bit32u float32;
-typedef Bit64u float64;
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE floating-point class.
-*----------------------------------------------------------------------------*/
-typedef enum {
-    float_zero,
-    float_SNaN,
-    float_QNaN,
-    float_negative_inf,
-    float_positive_inf,
-    float_denormal,
-    float_normalized
-} float_class_t;
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE floating-point NaN operands handling mode.
-*----------------------------------------------------------------------------*/
-enum float_nan_handling_mode_t {
-    float_larger_significand_nan = 0,   // this mode used by x87 FPU
-    float_first_operand_nan = 1	        // this mode used by SSE
-};
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE floating-point rounding mode.
-*----------------------------------------------------------------------------*/
-enum float_round_t {
-    float_round_nearest_even = 0,
-    float_round_down         = 1,
-    float_round_up           = 2,
-    float_round_to_zero      = 3
-};
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE floating-point exception flags.
-*----------------------------------------------------------------------------*/
-enum float_exception_flag_t {
-    float_flag_invalid   = 0x01,
-    float_flag_denormal  = 0x02,
-    float_flag_divbyzero = 0x04,
-    float_flag_overflow  = 0x08,
-    float_flag_underflow = 0x10,
-    float_flag_inexact   = 0x20
-};
-
-extern const unsigned float_all_exceptions_mask;
-
-#ifdef FLOATX80
-#define RAISE_SW_C1 0x0200
-#endif
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE floating-point ordering relations
-*----------------------------------------------------------------------------*/
-enum {
-    float_relation_less      = -1,
-    float_relation_equal     =  0,
-    float_relation_greater   =  1,
-    float_relation_unordered =  2
-};
-
-/*----------------------------------------------------------------------------
-| Options to indicate which negations to perform in float*_muladd()
-| Using these differs from negating an input or output before calling
-| the muladd function in that this means that a NaN doesn't have its
-| sign bit inverted before it is propagated.
-*----------------------------------------------------------------------------*/
-enum {
-    float_muladd_negate_c       = 1,
-    float_muladd_negate_product = 2,
-    float_muladd_negate_result  = float_muladd_negate_c | float_muladd_negate_product
-};
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE floating-point status structure.
-*----------------------------------------------------------------------------*/
-struct float_status_t
-{
-#ifdef FLOATX80
-    int float_rounding_precision;	/* floatx80 only */
-#endif
-    int float_rounding_mode;
-    int float_exception_flags;
-    int float_exception_masks;
-    int float_suppress_exception;
-    int float_nan_handling_mode;	/* flag register */
-    int flush_underflow_to_zero;	/* flag register */
-    int denormals_are_zeros;            /* flag register */
-};
-
-/*----------------------------------------------------------------------------
-| Routine to raise any or all of the software IEC/IEEE floating-point
-| exception flags.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE void float_raise(struct float_status_t *status, int flags)
-{
-    status->float_exception_flags |= flags;
-}
-
-/*----------------------------------------------------------------------------
-| Returns raised IEC/IEEE floating-point exception flags.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int get_exception_flags(const struct float_status_t *status)
-{
-    return status->float_exception_flags & ~status->float_suppress_exception;
-}
-
-/*----------------------------------------------------------------------------
-| Routine to check if any or all of the software IEC/IEEE floating-point
-| exceptions are masked.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int float_exception_masked(const struct float_status_t *status, int flag)
-{
-    return status->float_exception_masks & flag;
-}
-
-/*----------------------------------------------------------------------------
-| Returns current floating point rounding mode specified by status word.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int get_float_rounding_mode(const struct float_status_t *status)
-{
-    return status->float_rounding_mode;
-}
-
-/*----------------------------------------------------------------------------
-| Returns current floating point precision (floatx80 only).
-*----------------------------------------------------------------------------*/
-
-#ifdef FLOATX80
-BX_CPP_INLINE int get_float_rounding_precision(const struct float_status_t *status)
-{
-    return status->float_rounding_precision;
-}
-#endif
-
-/*----------------------------------------------------------------------------
-| Returns current floating point NaN operands handling mode specified
-| by status word.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int get_float_nan_handling_mode(const struct float_status_t *status)
-{
-    return status->float_nan_handling_mode;
-}
-
-/*----------------------------------------------------------------------------
-| Raise floating point precision lost up flag (floatx80 only).
-*----------------------------------------------------------------------------*/
-
-#ifdef FLOATX80
-BX_CPP_INLINE void set_float_rounding_up(struct float_status_t *status)
-{
-    status->float_exception_flags |= RAISE_SW_C1;
-}
-#endif
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the <denormals-are-zeros> feature is supported;
-| otherwise returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int get_denormals_are_zeros(const struct float_status_t *status)
-{
-    return status->denormals_are_zeros;
-}
-
-/*----------------------------------------------------------------------------
-| Returns 1 if the <flush-underflow-to-zero> feature is supported;
-| otherwise returns 0.
-*----------------------------------------------------------------------------*/
-
-BX_CPP_INLINE int get_flush_underflow_to_zero(const struct float_status_t *status)
-{
-    return status->flush_underflow_to_zero;
-}
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE integer-to-floating-point conversion routines.
-*----------------------------------------------------------------------------*/
-float32 int32_to_float32(Bit32s, struct float_status_t *status);
-float64 int32_to_float64(Bit32s);
-float32 int64_to_float32(Bit64s, struct float_status_t *status);
-float64 int64_to_float64(Bit64s, struct float_status_t *status);
-
-float32 uint32_to_float32(Bit32u, struct float_status_t *status);
-float64 uint32_to_float64(Bit32u);
-float32 uint64_to_float32(Bit64u, struct float_status_t *status);
-float64 uint64_to_float64(Bit64u, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE single-precision conversion routines.
-*----------------------------------------------------------------------------*/
-Bit32s float32_to_int32(float32, struct float_status_t *status);
-Bit32s float32_to_int32_round_to_zero(float32, struct float_status_t *status);
-Bit64s float32_to_int64(float32, struct float_status_t *status);
-Bit64s float32_to_int64_round_to_zero(float32, struct float_status_t *status);
-Bit32u float32_to_uint32(float32, struct float_status_t *status);
-Bit32u float32_to_uint32_round_to_zero(float32, struct float_status_t *status);
-Bit64u float32_to_uint64(float32, struct float_status_t *status);
-Bit64u float32_to_uint64_round_to_zero(float32, struct float_status_t *status);
-float64 float32_to_float64(float32, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE single-precision operations.
-*----------------------------------------------------------------------------*/
-float32 float32_round_to_int(float32, Bit8u scale, struct float_status_t *status);
-float32 float32_add(float32, float32, struct float_status_t *status);
-float32 float32_sub(float32, float32, struct float_status_t *status);
-float32 float32_mul(float32, float32, struct float_status_t *status);
-float32 float32_div(float32, float32, struct float_status_t *status);
-float32 float32_sqrt(float32, struct float_status_t *status);
-float32 float32_frc(float32, struct float_status_t *status);
-float32 float32_muladd(float32, float32, float32, int flags, struct float_status_t *status);
-float32 float32_scalef(float32, float32, struct float_status_t *status);
-int float32_compare(float32, float32, int quiet, struct float_status_t *status);
-
-BX_CPP_INLINE float32 float32_round_to_int_one(float32 a, struct float_status_t *status)
-{
-  return float32_round_to_int(a, 0, status);
-}
-
-BX_CPP_INLINE float32 float32_fmadd(float32 a, float32 b, float32 c, struct float_status_t *status)
-{
-  return float32_muladd(a, b, c, 0, status);
-}
-
-BX_CPP_INLINE float32 float32_fmsub(float32 a, float32 b, float32 c, struct float_status_t *status)
-{
-  return float32_muladd(a, b, c, float_muladd_negate_c, status);
-}
-
-BX_CPP_INLINE float32 float32_fnmadd(float32 a, float32 b, float32 c, struct float_status_t *status)
-{
-  return float32_muladd(a, b, c, float_muladd_negate_product, status);
-}
-
-BX_CPP_INLINE float32 float32_fnmsub(float32 a, float32 b, float32 c, struct float_status_t *status)
-{
-  return float32_muladd(a, b, c, float_muladd_negate_result, status);
-}
-
-BX_CPP_INLINE int float32_compare_two(float32 a, float32 b, struct float_status_t *status)
-{
-  return float32_compare(a, b, 0, status);
-}
-
-BX_CPP_INLINE int float32_compare_quiet(float32 a, float32 b, struct float_status_t *status)
-{
-  return float32_compare(a, b, 1, status);
-}
-
-float_class_t float32_class(float32);
-
-float32 float32_min(float32 a, float32 b, struct float_status_t *status);
-float32 float32_max(float32 a, float32 b, struct float_status_t *status);
-
-float32 float32_minmax(float32 a, float32 b, int is_max, int is_abs, struct float_status_t *status);
-float32 float32_getexp(float32 a, struct float_status_t *status);
-float32 float32_getmant(float32 a, struct float_status_t *status, int sign_ctrl, int interv);
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE double-precision conversion routines.
-*----------------------------------------------------------------------------*/
-Bit32s float64_to_int32(float64, struct float_status_t *status);
-Bit32s float64_to_int32_round_to_zero(float64, struct float_status_t *status);
-Bit64s float64_to_int64(float64, struct float_status_t *status);
-Bit64s float64_to_int64_round_to_zero(float64, struct float_status_t *status);
-Bit32u float64_to_uint32(float64, struct float_status_t *status);
-Bit32u float64_to_uint32_round_to_zero(float64, struct float_status_t *status);
-Bit64u float64_to_uint64(float64, struct float_status_t *status);
-Bit64u float64_to_uint64_round_to_zero(float64, struct float_status_t *status);
-float32 float64_to_float32(float64, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE double-precision operations.
-*----------------------------------------------------------------------------*/
-float64 float64_round_to_int(float64, Bit8u scale, struct float_status_t *status);
-float64 float64_add(float64, float64, struct float_status_t *status);
-float64 float64_sub(float64, float64, struct float_status_t *status);
-float64 float64_mul(float64, float64, struct float_status_t *status);
-float64 float64_div(float64, float64, struct float_status_t *status);
-float64 float64_sqrt(float64, struct float_status_t *status);
-float64 float64_frc(float64, struct float_status_t *status);
-float64 float64_muladd(float64, float64, float64, int flags, struct float_status_t *status);
-float64 float64_scalef(float64, float64, struct float_status_t *status);
-int float64_compare(float64, float64, int quiet, struct float_status_t *status);
-
-BX_CPP_INLINE float64 float64_round_to_int_one(float64 a, struct float_status_t *status)
-{
-  return float64_round_to_int(a, 0, status);
-}
-
-BX_CPP_INLINE float64 float64_fmadd(float64 a, float64 b, float64 c, struct float_status_t *status)
-{
-  return float64_muladd(a, b, c, 0, status);
-}
-
-BX_CPP_INLINE float64 float64_fmsub(float64 a, float64 b, float64 c, struct float_status_t *status)
-{
-  return float64_muladd(a, b, c, float_muladd_negate_c, status);
-}
-
-BX_CPP_INLINE float64 float64_fnmadd(float64 a, float64 b, float64 c, struct float_status_t *status)
-{
-  return float64_muladd(a, b, c, float_muladd_negate_product, status);
-}
-
-BX_CPP_INLINE float64 float64_fnmsub(float64 a, float64 b, float64 c, struct float_status_t *status)
-{
-  return float64_muladd(a, b, c, float_muladd_negate_result, status);
-}
-
-BX_CPP_INLINE int float64_compare_two(float64 a, float64 b, struct float_status_t *status)
-{
-  return float64_compare(a, b, 0, status);
-}
-
-BX_CPP_INLINE int float64_compare_quiet(float64 a, float64 b, struct float_status_t *status)
-{
-  return float64_compare(a, b, 1, status);
-}
-
-float_class_t float64_class(float64);
-
-float64 float64_min(float64 a, float64 b, struct float_status_t *status);
-float64 float64_max(float64 a, float64 b, struct float_status_t *status);
-
-float64 float64_minmax(float64 a, float64 b, int is_max, int is_abs, struct float_status_t *status);
-float64 float64_getexp(float64 a, struct float_status_t *status);
-float64 float64_getmant(float64 a, struct float_status_t *status, int sign_ctrl, int interv);
-
-#ifdef FLOAT16
-float32 float16_to_float32(float16, struct float_status_t *status);
-float16 float32_to_float16(float32, struct float_status_t *status);
-
-float_class_t float16_class(float16);
-#endif
-
-#ifdef FLOATX80
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE floating-point types.
-*----------------------------------------------------------------------------*/
-
-#ifdef BX_BIG_ENDIAN
-typedef struct floatx80 {	// leave alignment to compiler
-    Bit16u exp;
-    Bit64u fraction;
-}; floatx80
-#else
-typedef struct floatx80 {
-    Bit64u fraction;
-    Bit16u exp;
-} floatx80;
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE integer-to-floating-point conversion routines.
-*----------------------------------------------------------------------------*/
-floatx80 int32_to_floatx80(Bit32s);
-floatx80 int64_to_floatx80(Bit64s);
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE extended double-precision conversion routines.
-*----------------------------------------------------------------------------*/
-floatx80 float32_to_floatx80(float32, struct float_status_t *status);
-floatx80 float64_to_floatx80(float64, struct float_status_t *status);
-
-Bit32s floatx80_to_int32(floatx80, struct float_status_t *status);
-Bit32s floatx80_to_int32_round_to_zero(floatx80, struct float_status_t *status);
-Bit64s floatx80_to_int64(floatx80, struct float_status_t *status);
-Bit64s floatx80_to_int64_round_to_zero(floatx80, struct float_status_t *status);
-
-float32 floatx80_to_float32(floatx80, struct float_status_t *status);
-float64 floatx80_to_float64(floatx80, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE extended double-precision operations.
-*----------------------------------------------------------------------------*/
-floatx80 floatx80_round_to_int(floatx80, struct float_status_t *status);
-floatx80 floatx80_add(floatx80, floatx80, struct float_status_t *status);
-floatx80 floatx80_sub(floatx80, floatx80, struct float_status_t *status);
-floatx80 floatx80_mul(floatx80, floatx80, struct float_status_t *status);
-floatx80 floatx80_div(floatx80, floatx80, struct float_status_t *status);
-floatx80 floatx80_sqrt(floatx80, struct float_status_t *status);
-
-float_class_t floatx80_class(floatx80);
-#ifdef __cplusplus
-}
-#endif
-#endif  /* FLOATX80 */
-
-#ifdef FLOAT128
-
-#ifdef BX_BIG_ENDIAN
-typedef struct float128 {
-    Bit64u hi, lo;
-} float128;
-#else
-typedef struct float128 {
-    Bit64u lo, hi;
-} float128;
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE quadruple-precision conversion routines.
-*----------------------------------------------------------------------------*/
-float128 floatx80_to_float128(floatx80 a, struct float_status_t *status);
-floatx80 float128_to_floatx80(float128 a, struct float_status_t *status);
-
-float128 int64_to_float128(Bit64s a);
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE extended double-precision operations.
-*----------------------------------------------------------------------------*/
-floatx80 floatx80_128_mul(floatx80 a, float128 b, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE quadruple-precision operations.
-*----------------------------------------------------------------------------*/
-float128 float128_add(float128 a, float128 b, struct float_status_t *status);
-float128 float128_sub(float128 a, float128 b, struct float_status_t *status);
-float128 float128_mul(float128 a, float128 b, struct float_status_t *status);
-float128 float128_div(float128 a, float128 b, struct float_status_t *status);
-#ifdef __cplusplus
-}
-#endif
-#endif  /* FLOAT128 */
-
-#endif
diff --git a/src/cpu/softfloat/softfloat16.cc b/src/cpu/softfloat/softfloat16.cc
deleted file mode 100644
index 8c17d3a86..000000000
--- a/src/cpu/softfloat/softfloat16.cc
+++ /dev/null
@@ -1,129 +0,0 @@
-/*============================================================================
-This C source file is part of the SoftFloat IEC/IEEE Floating-point Arithmetic
-Package, Release 2b.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://www.cs.berkeley.edu/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has
-been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES
-RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS
-AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,
-COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE
-EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
-INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
-OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) the source code for the derivative work includes prominent notice that
-the work is derivative, and (2) the source code includes prominent notice with
-these four paragraphs for those parts of this code that are retained.
-=============================================================================*/
-
-/*============================================================================
- * Adapted for Bochs (x86 achitecture simulator) by
- *            Stanislav Shwartsman [sshwarts at sourceforge net]
- * ==========================================================================*/
-
-#include "softfloat.h"
-
-#ifdef FLOAT16
-
-#include "softfloat-round-pack.h"
-#include "softfloat-specialize.h"
-#include "softfloat-macros.h"
-
-/*----------------------------------------------------------------------------
-| Determine half-precision floating-point number class
-*----------------------------------------------------------------------------*/
-
-float_class_t float16_class(float16 a)
-{
-   Bit16s aExp = extractFloat16Exp(a);
-   Bit16u aSig = extractFloat16Frac(a);
-   int  aSign = extractFloat16Sign(a);
-
-   if(aExp == 0x1F) {
-       if (aSig == 0)
-           return (aSign) ? float_negative_inf : float_positive_inf;
-
-       return (aSig & 0x200) ? float_QNaN : float_SNaN;
-   }
-
-   if(aExp == 0) {
-       if (aSig == 0) return float_zero;
-       return float_denormal;
-   }
-
-   return float_normalized;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the half-precision floating-point value
-| `a' to the single-precision floating-point format.  The conversion is
-| performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float32 float16_to_float32(float16 a, struct float_status_t *status)
-{
-    Bit16u aSig = extractFloat16Frac(a);
-    Bit16s aExp = extractFloat16Exp(a);
-    int aSign = extractFloat16Sign(a);
-
-    if (aExp == 0x1F) {
-        if (aSig) return commonNaNToFloat32(float16ToCommonNaN(a, status));
-        return packFloat32(aSign, 0xFF, 0);
-    }
-    if (aExp == 0) {
-        // ignore denormals_are_zeros flag
-        if (aSig == 0) return packFloat32(aSign, 0, 0);
-        float_raise(status, float_flag_denormal);
-        normalizeFloat16Subnormal(aSig, &aExp, &aSig);
-        --aExp;
-    }
-
-    return packFloat32(aSign, aExp + 0x70, ((Bit32u) aSig)<<13);
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the single-precision floating-point value
-| `a' to the half-precision floating-point format.  The conversion is
-| performed according to the IEC/IEEE Standard for Binary Floating-Point
-| Arithmetic.
-*----------------------------------------------------------------------------*/
-
-float16 float32_to_float16(float32 a, struct float_status_t *status)
-{
-    Bit32u aSig = extractFloat32Frac(a);
-    Bit16s aExp = extractFloat32Exp(a);
-    int aSign = extractFloat32Sign(a);
-
-    if (aExp == 0xFF) {
-        if (aSig) return commonNaNToFloat16(float32ToCommonNaN(a, status));
-        return packFloat16(aSign, 0x1F, 0);
-    }
-    if (aExp == 0) {
-        if (get_denormals_are_zeros(status)) aSig = 0;
-        if (aSig == 0) return packFloat16(aSign, 0, 0);
-        float_raise(status, float_flag_denormal);
-    }
-
-    aSig = shift32RightJamming(aSig, 9);
-    Bit16u zSig = (Bit16u) aSig;
-    if (aExp || zSig) {
-        zSig |= 0x4000;
-        aExp -= 0x71;
-    }
-
-    return roundAndPackFloat16(aSign, aExp, zSig, status);
-}
-
-#endif
diff --git a/src/cpu/softfloat/softfloatx80.cc b/src/cpu/softfloat/softfloatx80.cc
deleted file mode 100644
index 3ac3e61b3..000000000
--- a/src/cpu/softfloat/softfloatx80.cc
+++ /dev/null
@@ -1,367 +0,0 @@
-/*============================================================================
-This source file is an extension to the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2b, written for Bochs (x86 achitecture simulator)
-floating point emulation.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has
-been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES
-RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS
-AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,
-COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE
-EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
-INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
-OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) the source code for the derivative work includes prominent notice that
-the work is derivative, and (2) the source code includes prominent notice with
-these four paragraphs for those parts of this code that are retained.
-=============================================================================*/
-
-/*============================================================================
- * Written for Bochs (x86 achitecture simulator) by
- *            Stanislav Shwartsman [sshwarts at sourceforge net]
- * ==========================================================================*/
-
-#include "softfloatx80.h"
-#include "softfloat-round-pack.h"
-#include "softfloat-macros.h"
-
-const floatx80 Const_QNaN = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
-const floatx80 Const_Z    = packFloatx80(0, 0x0000, 0);
-const floatx80 Const_1    = packFloatx80(0, 0x3fff, BX_CONST64(0x8000000000000000));
-const floatx80 Const_L2T  = packFloatx80(0, 0x4000, BX_CONST64(0xd49a784bcd1b8afe));
-const floatx80 Const_L2E  = packFloatx80(0, 0x3fff, BX_CONST64(0xb8aa3b295c17f0bc));
-const floatx80 Const_PI   = packFloatx80(0, 0x4000, BX_CONST64(0xc90fdaa22168c235));
-const floatx80 Const_LG2  = packFloatx80(0, 0x3ffd, BX_CONST64(0x9a209a84fbcff799));
-const floatx80 Const_LN2  = packFloatx80(0, 0x3ffe, BX_CONST64(0xb17217f7d1cf79ac));
-const floatx80 Const_INF  = packFloatx80(0, 0x7fff, BX_CONST64(0x8000000000000000));
-
-/*----------------------------------------------------------------------------
-| Commonly used single-precision floating point constants
-*----------------------------------------------------------------------------*/
-const float32 float32_negative_inf  = 0xff800000;
-const float32 float32_positive_inf  = 0x7f800000;
-const float32 float32_negative_zero = 0x80000000;
-const float32 float32_positive_zero = 0x00000000;
-const float32 float32_negative_one  = 0xbf800000;
-const float32 float32_positive_one  = 0x3f800000;
-const float32 float32_max_float     = 0x7f7fffff;
-const float32 float32_min_float     = 0xff7fffff;
-
-/*----------------------------------------------------------------------------
-| The pattern for a default generated single-precision NaN.
-*----------------------------------------------------------------------------*/
-const float32 float32_default_nan   = 0xffc00000;
-
-/*----------------------------------------------------------------------------
-| Commonly used single-precision floating point constants
-*----------------------------------------------------------------------------*/
-const float64 float64_negative_inf  = BX_CONST64(0xfff0000000000000);
-const float64 float64_positive_inf  = BX_CONST64(0x7ff0000000000000);
-const float64 float64_negative_zero = BX_CONST64(0x8000000000000000);
-const float64 float64_positive_zero = BX_CONST64(0x0000000000000000);
-const float64 float64_negative_one  = BX_CONST64(0xbff0000000000000);
-const float64 float64_positive_one  = BX_CONST64(0x3ff0000000000000);
-const float64 float64_max_float     = BX_CONST64(0x7fefffffffffffff);
-const float64 float64_min_float     = BX_CONST64(0xffefffffffffffff);
-
-/*----------------------------------------------------------------------------
-| The pattern for a default generated double-precision NaN.
-*----------------------------------------------------------------------------*/
-const float64 float64_default_nan = BX_CONST64(0xFFF8000000000000);
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the extended double-precision floating-
-| point value `a' to the 16-bit two's complement integer format.  The
-| conversion is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic - which means in particular that the conversion
-| is rounded according to the current rounding mode. If `a' is a NaN or the
-| conversion overflows, the integer indefinite value is returned.
-*----------------------------------------------------------------------------*/
-
-Bit16s floatx80_to_int16(floatx80 a, struct float_status_t *status)
-{
-   if (floatx80_is_unsupported(a)) {
-        float_raise(status, float_flag_invalid);
-        return int16_indefinite;
-   }
-
-   Bit32s v32 = floatx80_to_int32(a, status);
-
-   if ((v32 > 32767) || (v32 < -32768)) {
-        status->float_exception_flags = float_flag_invalid; // throw away other flags
-        return int16_indefinite;
-   }
-
-   return (Bit16s) v32;
-}
-
-/*----------------------------------------------------------------------------
-| Returns the result of converting the extended double-precision floating-
-| point value `a' to the 16-bit two's complement integer format.  The
-| conversion is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic, except that the conversion is always rounded
-| toward zero.  If `a' is a NaN or the conversion overflows, the integer
-| indefinite value is returned.
-*----------------------------------------------------------------------------*/
-
-Bit16s floatx80_to_int16_round_to_zero(floatx80 a, struct float_status_t *status)
-{
-   if (floatx80_is_unsupported(a)) {
-        float_raise(status, float_flag_invalid);
-        return int16_indefinite;
-   }
-
-   Bit32s v32 = floatx80_to_int32_round_to_zero(a, status);
-
-   if ((v32 > 32767) || (v32 < -32768)) {
-        status->float_exception_flags = float_flag_invalid; // throw away other flags
-        return int16_indefinite;
-   }
-
-   return (Bit16s) v32;
-}
-
-/*----------------------------------------------------------------------------
-| Separate the source extended double-precision floating point value `a'
-| into its exponent and significand, store the significant back to the
-| 'a' and return the exponent. The operation performed is a superset of
-| the IEC/IEEE recommended logb(x) function.
-*----------------------------------------------------------------------------*/
-
-floatx80 floatx80_extract(floatx80 *a, struct float_status_t *status)
-{
-/*----------------------------------------------------------------------------
-| The pattern for a default generated extended double-precision NaN.
-*----------------------------------------------------------------------------*/
-    const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
-
-    Bit64u aSig = extractFloatx80Frac(*a);
-    Bit32s aExp = extractFloatx80Exp(*a);
-    int   aSign = extractFloatx80Sign(*a);
-
-    if (floatx80_is_unsupported(*a))
-    {
-        float_raise(status, float_flag_invalid);
-        *a = floatx80_default_nan;
-        return *a;
-    }
-
-    if (aExp == 0x7FFF) {
-        if ((Bit64u) (aSig<<1))
-        {
-            *a = propagateFloatx80NaNOne(*a, status);
-            return *a;
-        }
-        return packFloatx80(0, 0x7FFF, BX_CONST64(0x8000000000000000));
-    }
-    if (aExp == 0)
-    {
-        if (aSig == 0) {
-            float_raise(status, float_flag_divbyzero);
-            *a = packFloatx80(aSign, 0, 0);
-            return packFloatx80(1, 0x7FFF, BX_CONST64(0x8000000000000000));
-        }
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(aSig, &aExp, &aSig);
-    }
-
-    a->exp = (aSign << 15) + 0x3FFF;
-    a->fraction = aSig;
-    return int32_to_floatx80(aExp - 0x3FFF);
-}
-
-/*----------------------------------------------------------------------------
-| Scales extended double-precision floating-point value in operand `a' by
-| value `b'. The function truncates the value in the second operand 'b' to
-| an integral value and adds that value to the exponent of the operand 'a'.
-| The operation performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-floatx80 floatx80_scale(floatx80 a, floatx80 b, struct float_status_t *status)
-{
-/*----------------------------------------------------------------------------
-| The pattern for a default generated extended double-precision NaN.
-*----------------------------------------------------------------------------*/
-    const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
-
-    Bit32s aExp, bExp;
-    Bit64u aSig, bSig;
-
-    // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a) || floatx80_is_unsupported(b))
-    {
-        float_raise(status, float_flag_invalid);
-        return floatx80_default_nan;
-    }
-
-    aSig = extractFloatx80Frac(a);
-    aExp = extractFloatx80Exp(a);
-    int aSign = extractFloatx80Sign(a);
-    bSig = extractFloatx80Frac(b);
-    bExp = extractFloatx80Exp(b);
-    int bSign = extractFloatx80Sign(b);
-
-    if (aExp == 0x7FFF) {
-        if ((Bit64u) (aSig<<1) || ((bExp == 0x7FFF) && (Bit64u) (bSig<<1)))
-        {
-            return propagateFloatx80NaN(a, b, status);
-        }
-        if ((bExp == 0x7FFF) && bSign) {
-            float_raise(status, float_flag_invalid);
-            return floatx80_default_nan;
-        }
-        if (bSig && (bExp == 0)) float_raise(status, float_flag_denormal);
-        return a;
-    }
-    if (bExp == 0x7FFF) {
-        if ((Bit64u) (bSig<<1)) return propagateFloatx80NaN(a, b, status);
-        if ((aExp | aSig) == 0) {
-            if (! bSign) {
-                float_raise(status, float_flag_invalid);
-                return floatx80_default_nan;
-            }
-            return a;
-        }
-        if (aSig && (aExp == 0)) float_raise(status, float_flag_denormal);
-        if (bSign) return packFloatx80(aSign, 0, 0);
-        return packFloatx80(aSign, 0x7FFF, BX_CONST64(0x8000000000000000));
-    }
-    if (aExp == 0) {
-        if (bSig && (bExp == 0)) float_raise(status, float_flag_denormal);
-        if (aSig == 0) return a;
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(aSig, &aExp, &aSig);
-        if (bExp < 0x3FFF)
-            return normalizeRoundAndPackFloatx80(80, aSign, aExp, aSig, 0, status);
-    }
-    if (bExp == 0) {
-        if (bSig == 0) return a;
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(bSig, &bExp, &bSig);
-    }
-
-    if (bExp > 0x400E) {
-        /* generate appropriate overflow/underflow */
-        return roundAndPackFloatx80(80, aSign,
-                          bSign ? -0x3FFF : 0x7FFF, aSig, 0, status);
-    }
-
-    if (bExp < 0x3FFF) return a;
-
-    int shiftCount = 0x403E - bExp;
-    bSig >>= shiftCount;
-    Bit32s scale = (Bit32s) bSig;
-    if (bSign) scale = -scale; /* -32768..32767 */
-    return
-        roundAndPackFloatx80(80, aSign, aExp+scale, aSig, 0, status);
-}
-
-/*----------------------------------------------------------------------------
-| Determine extended-precision floating-point number class.
-*----------------------------------------------------------------------------*/
-
-float_class_t floatx80_class(floatx80 a)
-{
-   Bit32s aExp = extractFloatx80Exp(a);
-   Bit64u aSig = extractFloatx80Frac(a);
-
-   if(aExp == 0) {
-       if (aSig == 0)
-           return float_zero;
-
-       /* denormal or pseudo-denormal */
-       return float_denormal;
-   }
-
-   /* valid numbers have the MS bit set */
-   if (!(aSig & BX_CONST64(0x8000000000000000)))
-       return float_SNaN; /* report unsupported as SNaNs */
-
-   if(aExp == 0x7fff) {
-       int aSign = extractFloatx80Sign(a);
-
-       if (((Bit64u) (aSig<< 1)) == 0)
-           return (aSign) ? float_negative_inf : float_positive_inf;
-
-       return (aSig & BX_CONST64(0x4000000000000000)) ? float_QNaN : float_SNaN;
-   }
-
-   return float_normalized;
-}
-
-/*----------------------------------------------------------------------------
-| Compare  between  two extended precision  floating  point  numbers. Returns
-| 'float_relation_equal'  if the operands are equal, 'float_relation_less' if
-| the    value    'a'   is   less   than   the   corresponding   value   `b',
-| 'float_relation_greater' if the value 'a' is greater than the corresponding
-| value `b', or 'float_relation_unordered' otherwise.
-*----------------------------------------------------------------------------*/
-
-int floatx80_compare(floatx80 a, floatx80 b, int quiet, struct float_status_t *status)
-{
-    float_class_t aClass = floatx80_class(a);
-    float_class_t bClass = floatx80_class(b);
-
-    if (aClass == float_SNaN || bClass == float_SNaN)
-    {
-        /* unsupported reported as SNaN */
-        float_raise(status, float_flag_invalid);
-        return float_relation_unordered;
-    }
-
-    if (aClass == float_QNaN || bClass == float_QNaN) {
-        if (! quiet) float_raise(status, float_flag_invalid);
-        return float_relation_unordered;
-    }
-
-    if (aClass == float_denormal || bClass == float_denormal) {
-        float_raise(status, float_flag_denormal);
-    }
-
-    int aSign = extractFloatx80Sign(a);
-    int bSign = extractFloatx80Sign(b);
-
-    if (aClass == float_zero) {
-        if (bClass == float_zero) return float_relation_equal;
-        return bSign ? float_relation_greater : float_relation_less;
-    }
-
-    if (bClass == float_zero || aSign != bSign) {
-        return aSign ? float_relation_less : float_relation_greater;
-    }
-
-    Bit64u aSig = extractFloatx80Frac(a);
-    Bit32s aExp = extractFloatx80Exp(a);
-    Bit64u bSig = extractFloatx80Frac(b);
-    Bit32s bExp = extractFloatx80Exp(b);
-
-    if (aClass == float_denormal)
-        normalizeFloatx80Subnormal(aSig, &aExp, &aSig);
-
-    if (bClass == float_denormal)
-        normalizeFloatx80Subnormal(bSig, &bExp, &bSig);
-
-    if (aExp == bExp && aSig == bSig)
-        return float_relation_equal;
-
-    int less_than =
-        aSign ? ((bExp < aExp) || ((bExp == aExp) && (bSig < aSig)))
-              : ((aExp < bExp) || ((aExp == bExp) && (aSig < bSig)));
-
-    if (less_than) return float_relation_less;
-    return float_relation_greater;
-}
-
-
-int floatx80_compare_two(floatx80 a, floatx80 b, struct float_status_t *status)
-{
-    return floatx80_compare(a, b, 0, status);
-}
-
-int floatx80_compare_quiet(floatx80 a, floatx80 b, struct float_status_t *status)
-{
-    return floatx80_compare(a, b, 1, status);
-}
diff --git a/src/cpu/softfloat/softfloatx80.h b/src/cpu/softfloat/softfloatx80.h
deleted file mode 100644
index 1f96141b4..000000000
--- a/src/cpu/softfloat/softfloatx80.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*============================================================================
-This source file is an extension to the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2b, written for Bochs (x86 achitecture simulator)
-floating point emulation.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has
-been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES
-RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS
-AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,
-COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE
-EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
-INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
-OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) the source code for the derivative work includes prominent notice that
-the work is derivative, and (2) the source code includes prominent notice with
-these four paragraphs for those parts of this code that are retained.
-=============================================================================*/
-
-/*============================================================================
- * Written for Bochs (x86 achitecture simulator) by
- *            Stanislav Shwartsman [sshwarts at sourceforge net]
- * ==========================================================================*/
-
-#ifndef _SOFTFLOATX80_EXTENSIONS_H_
-#define _SOFTFLOATX80_EXTENSIONS_H_
-
-#include "softfloat.h"
-#include "softfloat-specialize.h"
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE integer-to-floating-point conversion routines.
-*----------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-Bit16s floatx80_to_int16(floatx80, struct float_status_t *status);
-Bit16s floatx80_to_int16_round_to_zero(floatx80, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE extended double-precision operations.
-*----------------------------------------------------------------------------*/
-
-floatx80 floatx80_extract(floatx80 *a, struct float_status_t *status);
-floatx80 floatx80_scale(floatx80 a, floatx80 b, struct float_status_t *status);
-int floatx80_remainder(floatx80 a, floatx80 b, floatx80 *r, Bit64u *q, struct float_status_t *status);
-int floatx80_ieee754_remainder(floatx80 a, floatx80 b, floatx80 *r, Bit64u *q, struct float_status_t *status);
-floatx80 f2xm1(floatx80 a, struct float_status_t *status);
-floatx80 fyl2x(floatx80 a, floatx80 b, struct float_status_t *status);
-floatx80 fyl2xp1(floatx80 a, floatx80 b, struct float_status_t *status);
-floatx80 fpatan(floatx80 a, floatx80 b, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE extended double-precision trigonometric functions.
-*----------------------------------------------------------------------------*/
-
-int fsincos(floatx80 a, floatx80 *sin_a, floatx80 *cos_a, struct float_status_t *status);
-int fsin(floatx80 *a, struct float_status_t *status);
-int fcos(floatx80 *a, struct float_status_t *status);
-int ftan(floatx80 *a, struct float_status_t *status);
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE extended double-precision compare.
-*----------------------------------------------------------------------------*/
-
-int floatx80_compare(floatx80, floatx80, int quiet, struct float_status_t *status);
-int floatx80_compare_two(floatx80 a, floatx80 b, struct float_status_t *status);
-int floatx80_compare_quiet(floatx80 a, floatx80 b, struct float_status_t *status);
-
-#ifdef __cplusplus
-}
-#endif
-
-/*-----------------------------------------------------------------------------
-| Calculates the absolute value of the extended double-precision floating-point
-| value `a'.  The operation is performed according to the IEC/IEEE Standard
-| for Binary Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-BX_CPP_INLINE floatx80& floatx80_abs(floatx80 &reg)
-#else
-BX_CPP_INLINE floatx80 floatx80_abs(floatx80 reg)
-#endif
-{
-    reg.exp &= 0x7FFF;
-    return reg;
-}
-
-/*-----------------------------------------------------------------------------
-| Changes the sign of the extended double-precision floating-point value 'a'.
-| The operation is performed according to the IEC/IEEE Standard for Binary
-| Floating-Point Arithmetic.
-*----------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-BX_CPP_INLINE floatx80& floatx80_chs(floatx80 &reg)
-#else
-BX_CPP_INLINE floatx80 floatx80_chs(floatx80 reg)
-#endif
-{
-    reg.exp ^= 0x8000;
-    return reg;
-}
-
-/*-----------------------------------------------------------------------------
-| Commonly used extended double-precision floating-point constants.
-*----------------------------------------------------------------------------*/
-
-extern const floatx80 Const_Z;
-extern const floatx80 Const_1;
-extern const floatx80 Const_L2T;
-extern const floatx80 Const_L2E;
-extern const floatx80 Const_PI;
-extern const floatx80 Const_LG2;
-extern const floatx80 Const_LN2;
-extern const floatx80 Const_INF;
-#endif
diff --git a/src/cpu/softfloat3e/CMakeLists.txt b/src/cpu/softfloat3e/CMakeLists.txt
new file mode 100644
index 000000000..9f9ae0679
--- /dev/null
+++ b/src/cpu/softfloat3e/CMakeLists.txt
@@ -0,0 +1,57 @@
+#
+# 86Box    A hypervisor and IBM PC system emulator that specializes in
+#          running old operating systems and software designed for IBM
+#          PC systems and compatibles from 1981 through fairly recent
+#          system designs based on the PCI bus.
+#
+#          This file is part of the 86Box distribution.
+#
+#          CMake build script.
+#
+# Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#
+#          Copyright 2020-2021 David Hrdlička.
+#
+
+add_library(softfloat3e OBJECT primitives.c softfloat-specialize.c
+    extF80_addsub.cc extF80_class.cc extF80_compare.cc
+    extF80_div.cc extF80_extract.cc extF80_mul.cc extF80_rem.cc extF80_roundToInt.cc
+    extF80_scale.cc extF80_sqrt.cc extF80_to_f16.cc extF80_to_f32.cc extF80_to_f64.cc
+    extF80_to_f128.cc extF80_to_i32.cc extF80_to_i32_r_minMag.cc extF80_to_i64.cc
+    extF80_to_i64_r_minMag.cc extF80_to_ui32.cc extF80_to_ui32_r_minMag.cc extF80_to_ui64.cc
+    extF80_to_ui64_r_minMag.cc f16_addsub.c f16_class.c f16_compare.c f16_div.c f16_getExp.c
+    f16_getMant.c f16_minmax.c f16_mul.c f16_mulAdd.c f16_range.c f16_roundToInt.c
+    f16_sqrt.c f16_to_extF80.cc f16_to_f32.c f16_to_f64.c f16_to_i32.c f16_to_i32_r_minMag.c
+    f16_to_i64.c f16_to_i64_r_minMag.c f16_to_ui32.c f16_to_ui32_r_minMag.c f16_to_ui64.c
+    f16_to_ui64_r_minMag.c f32_addsub.c f32_class.c f32_compare.c f32_div.c f32_frc.c
+    f32_getExp.c f32_getMant.c f32_minmax.c f32_mul.c f32_mulAdd.c f32_range.c
+    f32_roundToInt.c f32_scalef.c f32_sqrt.c f32_to_extF80.cc f32_to_f16.c f32_to_f64.c
+    f32_to_f128.cc f32_to_i32.c f32_to_i32_r_minMag.c f32_to_i64.c f32_to_i64_r_minMag.c
+    f32_to_ui32.c f32_to_ui32_r_minMag.c f32_to_ui64.c f32_to_ui64_r_minMag.c f64_addsub.c
+    f64_class.c f64_compare.c f64_div.c f64_frc.c f64_getExp.c f64_getMant.c f64_minmax.c
+    f64_mul.c f64_mulAdd.c f64_range.c f64_roundToInt.c f64_scalef.c f64_sqrt.c f64_to_extF80.cc
+    f64_to_f16.c f64_to_f32.c f64_to_f128.cc f64_to_i32.c f64_to_i32_r_minMag.c f64_to_i64.c
+    f64_to_i64_r_minMag.c f64_to_ui32.c f64_to_ui32_r_minMag.c f64_to_ui64.c f64_to_ui64_r_minMag.c
+    f128_addsub.cc f128_div.cc f128_mul.cc f128_mulAdd.cc f128_roundToInt.cc f128_to_extF80.cc
+    f128_to_f32.cc f128_to_f64.cc f128_to_i32.cc f128_to_i32_r_minMag.cc f128_to_i64.cc
+    f128_to_i64_r_minMag.cc f128_to_ui32.cc f128_to_ui32_r_minMag.cc f128_to_ui64.cc 
+    f128_to_ui64_r_minMag.cc i32_to_extF80.cc i32_to_f16.c i32_to_f32.c i32_to_f64.c
+    i32_to_f128.cc i64_to_extF80.cc i64_to_f16.c i64_to_f32.c i64_to_f64.c i64_to_f128.cc
+    isNaN.cc isSignalingNaN.cc s_add128.cc s_add256M.c s_addMagsExtF80.cc s_addMagsF16.c
+    s_addMagsF32.c s_addMagsF64.c s_addMagsF128.cc s_approxRecip_1Ks.c s_approxRecipSqrt_1Ks.c
+    s_approxRecipSqrt32_1.c s_commonNaNToExtF80UI.cc s_commonNaNToF16UI.c s_commonNaNToF32UI.c
+    s_commonNaNToF64UI.c s_commonNaNToF128UI.cc s_countLeadingZeros8.c s_countLeadingZeros16.c
+    s_countLeadingZeros32.c s_countLeadingZeros64.c s_eq128.c s_le128.c s_lt128.c
+    s_mul64ByShifted32To128.cc s_mul64To128.cc s_mul128By32.cc s_mul128To256M.cc
+    s_normRoundPackToExtF80.cc s_normRoundPackToF16.c s_normRoundPackToF32.c s_normRoundPackToF64.c
+    s_normRoundPackToF128.cc s_normSubnormalExtF80Sig.cc s_normSubnormalF16Sig.c
+    s_normSubnormalF32Sig.c s_normSubnormalF64Sig.c s_normSubnormalF128Sig.cc s_packToExtF80.cc
+    s_propagateNaNExtF80UI.cc s_propagateNaNF16UI.c s_propagateNaNF32UI.c s_propagateNaNF64UI.c
+    s_propagateNaNF128UI.cc s_roundPackToExtF80.cc s_roundPackToF16.c s_roundPackToF32.c
+    s_roundPackToF64.c s_roundPackToF128.cc s_roundToI32.c s_roundToI64.c s_roundToUI32.c
+    s_roundToUI64.c s_shiftRightJam32.c s_shiftRightJam64.c s_shiftRightJam64Extra.c
+    s_shiftRightJam256M.c s_shortShiftLeft128.cc s_shortShiftRight128.cc s_shortShiftRightJam64.c 
+    s_shortShiftRightJam64Extra.c s_sub128.cc s_sub256M.c s_subMagsExtF80.cc s_subMagsF16.c
+    s_subMagsF32.c s_subMagsF64.c s_subMagsF128.cc ui32_to_extF80.cc ui32_to_f16.c ui32_to_f32.c
+    ui32_to_f64.c ui32_to_f128.cc ui64_to_extF80.cc ui64_to_f16.c ui64_to_f32.c ui64_to_f64.c
+    ui64_to_f128.cc f2xm1.cc fpatan.cc fprem.cc fsincos.cc fyl2x.cc poly.cc consts.cc)
\ No newline at end of file
diff --git a/src/cpu/softfloat3e/COPYING.txt b/src/cpu/softfloat3e/COPYING.txt
new file mode 100644
index 000000000..b5690face
--- /dev/null
+++ b/src/cpu/softfloat3e/COPYING.txt
@@ -0,0 +1,37 @@
+
+License for Berkeley SoftFloat Release 3e
+
+John R. Hauser
+2018 January 20
+
+The following applies to the whole of SoftFloat Release 3e as well as to
+each source file individually.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/src/cpu/softfloat3e/README.html b/src/cpu/softfloat3e/README.html
new file mode 100644
index 000000000..e695c2bd8
--- /dev/null
+++ b/src/cpu/softfloat3e/README.html
@@ -0,0 +1,49 @@
+
+<HTML>
+
+<HEAD>
+<TITLE>Berkeley SoftFloat Package Overview</TITLE>
+</HEAD>
+
+<BODY>
+
+<H1>Package Overview for Berkeley SoftFloat Release 3e</H1>
+
+<P>
+John R. Hauser<BR>
+2018 January 20<BR>
+</P>
+
+<P>
+Berkeley SoftFloat is a software implementation of binary floating-point that
+conforms to the IEEE Standard for Floating-Point Arithmetic.
+SoftFloat is distributed in the form of C source code.
+Building the SoftFloat sources generates a library file (typically
+<CODE>softfloat.a</CODE> or <CODE>libsoftfloat.a</CODE>) containing the
+floating-point subroutines.
+</P>
+
+<P>
+The SoftFloat package is documented in the following files in the
+<CODE>doc</CODE> subdirectory:
+<BLOCKQUOTE>
+<TABLE>
+<TR>
+<TD><A HREF="doc/SoftFloat.html"><NOBR><CODE>SoftFloat.html</CODE></NOBR></A></TD>
+<TD>Documentation for using the SoftFloat functions.</TD>
+</TR>
+<TR>
+<TD><A HREF="doc/SoftFloat-source.html"><NOBR><CODE>SoftFloat-source.html</CODE></NOBR></A></TD>
+<TD>Documentation for building SoftFloat.</TD>
+</TR>
+<TR>
+<TD><A HREF="doc/SoftFloat-history.html"><NOBR><CODE>SoftFloat-history.html</CODE></A><CODE>&nbsp;&nbsp;&nbsp;</CODE></NOBR></TD>
+<TD>History of the major changes to SoftFloat.</TD>
+</TR>
+</TABLE>
+</BLOCKQUOTE>
+Other files in the package comprise the source code for SoftFloat.
+</P>
+
+</BODY>
+
diff --git a/src/cpu/softfloat3e/README.txt b/src/cpu/softfloat3e/README.txt
new file mode 100644
index 000000000..1613c7671
--- /dev/null
+++ b/src/cpu/softfloat3e/README.txt
@@ -0,0 +1,21 @@
+
+Package Overview for Berkeley SoftFloat Release 3e
+
+John R. Hauser
+2018 January 20
+
+Berkeley SoftFloat is a software implementation of binary floating-point
+that conforms to the IEEE Standard for Floating-Point Arithmetic.  SoftFloat
+is distributed in the form of C source code.  Building the SoftFloat sources
+generates a library file (typically "softfloat.a" or "libsoftfloat.a")
+containing the floating-point subroutines.
+
+The SoftFloat package is documented in the following files in the "doc"
+subdirectory:
+
+    SoftFloat.html          Documentation for using the SoftFloat functions.
+    SoftFloat-source.html   Documentation for building SoftFloat.
+    SoftFloat-history.html  History of the major changes to SoftFloat.
+
+Other files in the package comprise the source code for SoftFloat.
+
diff --git a/src/cpu/softfloat3e/config.h b/src/cpu/softfloat3e/config.h
new file mode 100644
index 000000000..9febce242
--- /dev/null
+++ b/src/cpu/softfloat3e/config.h
@@ -0,0 +1,14 @@
+#ifndef EMU_SF_CONFIG_H
+#define EMU_SF_CONFIG_H
+
+/*----------------------------------------------------------------------------
+| The `LIT64' macro takes as its argument a textual integer literal and
+| if necessary ``marks'' the literal as having a 64-bit integer type.
+| For example, the GNU C Compiler (`gcc') requires that 64-bit literals be
+| appended with the letters `LL' standing for `long long', which is `gcc's
+| name for the 64-bit integer type.  Some compilers may allow `LIT64' to be
+| defined as the identity macro:  `#define LIT64( a ) a'.
+*----------------------------------------------------------------------------*/
+#define BX_CONST64(a) a##LL
+
+#endif /*EMU_SF_CONFIG_H*/
diff --git a/src/cpu/softfloat3e/consts.cc b/src/cpu/softfloat3e/consts.cc
new file mode 100644
index 000000000..235a03996
--- /dev/null
+++ b/src/cpu/softfloat3e/consts.cc
@@ -0,0 +1,51 @@
+/*============================================================================
+
+This C header file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2017 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdio.h>
+#include <stdint.h>
+#include <86box/86box.h>
+#include "../cpu.h"
+
+#include "softfloat-specialize.h"
+
+const floatx80 Const_QNaN = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
+const floatx80 Const_Z    = packFloatx80(0, 0x0000, 0);
+const floatx80 Const_1    = packFloatx80(0, 0x3fff, BX_CONST64(0x8000000000000000));
+const floatx80 Const_L2T  = packFloatx80(0, 0x4000, BX_CONST64(0xd49a784bcd1b8afe));
+const floatx80 Const_L2E  = packFloatx80(0, 0x3fff, BX_CONST64(0xb8aa3b295c17f0bc));
+const floatx80 Const_PI   = packFloatx80(0, 0x4000, BX_CONST64(0xc90fdaa22168c235));
+const floatx80 Const_LG2  = packFloatx80(0, 0x3ffd, BX_CONST64(0x9a209a84fbcff799));
+const floatx80 Const_LN2  = packFloatx80(0, 0x3ffe, BX_CONST64(0xb17217f7d1cf79ac));
+const floatx80 Const_INF  = packFloatx80(0, 0x7fff, BX_CONST64(0x8000000000000000));
diff --git a/src/cpu/softfloat3e/doc/SoftFloat-history.html b/src/cpu/softfloat3e/doc/SoftFloat-history.html
new file mode 100644
index 000000000..d81c6bc5a
--- /dev/null
+++ b/src/cpu/softfloat3e/doc/SoftFloat-history.html
@@ -0,0 +1,258 @@
+
+<HTML>
+
+<HEAD>
+<TITLE>Berkeley SoftFloat History</TITLE>
+</HEAD>
+
+<BODY>
+
+<H1>History of Berkeley SoftFloat, to Release 3e</H1>
+
+<P>
+John R. Hauser<BR>
+2018 January 20<BR>
+</P>
+
+
+<H3>Release 3e (2018 January)</H3>
+
+<UL>
+
+<LI>
+Changed the default numeric code for optional rounding mode <CODE>odd</CODE>
+(round to odd, also known as <EM>jamming</EM>) from 5 to 6.
+
+<LI>
+Modified the behavior of rounding mode <CODE>odd</CODE> when rounding to an
+integer value (either conversion to an integer format or a
+&lsquo;<CODE>roundToInt</CODE>&rsquo; function).
+Previously, for those cases only, rounding mode <CODE>odd</CODE> acted the same
+as rounding to minimum magnitude.
+Now all operations are rounded consistently.
+
+<LI>
+Fixed some errors in the specialization code modeling Intel x86 floating-point,
+specifically the integers returned on invalid operations and the propagation of
+NaN payloads in a few rare cases.
+
+<LI>
+Added specialization code modeling ARM floating-point, conforming to VFPv2 or
+later.
+
+<LI>
+Added an example target for ARM processors.
+
+<LI>
+Fixed a minor bug whereby function <CODE>f16_to_ui64</CODE> might return a
+different integer than expected in the case that the floating-point operand is
+negative.
+
+<LI>
+Added example target-specific optimization for GCC, employing GCC instrinsics
+and support for <NOBR>128-bit</NOBR> integer arithmetic.
+
+<LI>
+Made other minor improvements.
+
+</UL>
+
+
+<H3>Release 3d (2017 August)</H3>
+
+<UL>
+
+<LI>
+Fixed bugs in the square root functions for <NOBR>64-bit</NOBR>
+double-precision, <NOBR>80-bit</NOBR> double-extended-precision, and
+<NOBR>128-bit</NOBR> quadruple-precision.
+For <NOBR>64-bit</NOBR> double-precision (<CODE>f64_sqrt</CODE>), the result
+could sometimes be off by <NOBR>1 unit</NOBR> in the last place
+(<NOBR>1 ulp</NOBR>) from what it should be.
+For the larger formats, the square root could be wrong in a large portion of
+the less-significant bits.
+(A bug in <CODE>f128_sqrt</CODE> was first reported by Alexei Sibidanov.)
+
+</UL>
+
+
+<H3>Release 3c (2017 February)</H3>
+
+<UL>
+
+<LI>
+Added optional rounding mode <CODE>odd</CODE> (round to odd, also known as
+<EM>jamming</EM>).
+
+<LI>
+Corrected the documentation concerning non-canonical representations in
+<NOBR>80-bit</NOBR> double-extended-precision.
+
+</UL>
+
+
+<H3>Release 3b (2016 July)</H3>
+
+<UL>
+
+<LI>
+Implemented the common <NOBR>16-bit</NOBR> &ldquo;half-precision&rdquo;
+floating-point format (<CODE>float16_t</CODE>).
+
+<LI>
+Made the integer values returned on invalid conversions to integer formats
+be determined by the port-specific specialization instead of being the same for
+all ports.
+
+<LI>
+Added preprocessor macro <CODE>THREAD_LOCAL</CODE> to allow the floating-point
+state (modes and exception flags) to be made per-thread.
+
+<LI>
+Modified the provided Makefiles to allow some options to be overridden from the
+<CODE>make</CODE> command.
+
+<LI>
+Made other minor improvements.
+
+</UL>
+
+
+<H3>Release 3a (2015 October)</H3>
+
+<UL>
+
+<LI>
+Replaced the license text supplied by the University of California, Berkeley.
+
+</UL>
+
+
+<H3>Release 3 (2015 February)</H3>
+
+<UL>
+
+<LI>
+Complete rewrite, funded by the University of California, Berkeley, and
+consequently having a different use license than earlier releases.
+Major changes included renaming most types and functions, upgrading some
+algorithms, restructuring the source files, and making SoftFloat into a true
+library.
+
+<LI>
+Added functions to convert between floating-point and unsigned integers, both
+<NOBR>32-bit</NOBR> and <NOBR>64-bit</NOBR> (<CODE>uint32_t</CODE> and
+<CODE>uint64_t</CODE>).
+
+<LI>
+Added functions for fused multiply-add, for all supported floating-point
+formats except <NOBR>80-bit</NOBR> double-extended-precision.
+
+<LI>
+Added support for a fifth rounding mode, <CODE>near_maxMag</CODE> (round to
+nearest, with ties to maximum magnitude, away from zero).
+
+<LI>
+Dropped the <CODE>timesoftfloat</CODE> program (now part of the Berkeley
+TestFloat package).
+
+</UL>
+
+
+<H3>Release 2c (2015 January)</H3>
+
+<UL>
+
+<LI>
+Fixed mistakes affecting some <NOBR>64-bit</NOBR> processors.
+
+<LI>
+Further improved the documentation and the wording for the legal restrictions
+on using SoftFloat releases <NOBR>through 2c</NOBR> (not applicable to
+<NOBR>Release 3</NOBR> or later).
+
+</UL>
+
+
+<H3>Release 2b (2002 May)</H3>
+
+<UL>
+
+<LI>
+Made minor updates to the documentation, including improved wording for the
+legal restrictions on using SoftFloat.
+
+</UL>
+
+
+<H3>Release 2a (1998 December)</H3>
+
+<UL>
+
+<LI>
+Added functions to convert between <NOBR>64-bit</NOBR> integers
+(<CODE>int64</CODE>) and all supported floating-point formats.
+
+<LI>
+Fixed a bug in all <NOBR>64-bit</NOBR>-version square root functions except
+<CODE>float32_sqrt</CODE> that caused the result sometimes to be off by
+<NOBR>1 unit</NOBR> in the last place (<NOBR>1 ulp</NOBR>) from what it should
+be.
+(Bug discovered by Paul Donahue.)
+
+<LI>
+Improved the Makefiles.
+</UL>
+
+
+<H3>Release 2 (1997 June)</H3>
+
+<UL>
+
+<LI>
+Created the <NOBR>64-bit</NOBR> (<CODE>bits64</CODE>) version, adding the
+<CODE>floatx80</CODE> and <CODE>float128</CODE> formats.
+
+<LI>
+Changed the source directory structure, splitting the sources into a
+<CODE>bits32</CODE> and a <CODE>bits64</CODE> version.
+Renamed <CODE>environment.h</CODE> to <CODE>milieu.h</CODE> to avoid confusion
+with environment variables.
+
+<LI>
+Fixed a small error that caused <CODE>float64_round_to_int</CODE> often to
+round the wrong way in nearest/even mode when the operand was between
+2<SUP>20</SUP> and 2<SUP>21</SUP> and halfway between two integers.
+
+</UL>
+
+
+<H3>Release 1a (1996 July)</H3>
+
+<UL>
+
+<LI>
+Corrected a mistake that caused borderline underflow cases not to raise the
+underflow flag when they should have.
+(Problem reported by Doug Priest.)
+
+<LI>
+Added the <CODE>float_detect_tininess</CODE> variable to control whether
+tininess is detected before or after rounding.
+
+</UL>
+
+
+<H3>Release 1 (1996 July)</H3>
+
+<UL>
+
+<LI>
+Original release, based on work done for the International Computer Science
+Institute (ICSI) in Berkeley, California.
+
+</UL>
+
+
+</BODY>
+
diff --git a/src/cpu/softfloat3e/doc/SoftFloat-source.html b/src/cpu/softfloat3e/doc/SoftFloat-source.html
new file mode 100644
index 000000000..4ff9d4c45
--- /dev/null
+++ b/src/cpu/softfloat3e/doc/SoftFloat-source.html
@@ -0,0 +1,686 @@
+
+<HTML>
+
+<HEAD>
+<TITLE>Berkeley SoftFloat Source Documentation</TITLE>
+</HEAD>
+
+<BODY>
+
+<H1>Berkeley SoftFloat Release 3e: Source Documentation</H1>
+
+<P>
+John R. Hauser<BR>
+2018 January 20<BR>
+</P>
+
+
+<H2>Contents</H2>
+
+<BLOCKQUOTE>
+<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0>
+<COL WIDTH=25>
+<COL WIDTH=*>
+<TR><TD COLSPAN=2>1. Introduction</TD></TR>
+<TR><TD COLSPAN=2>2. Limitations</TD></TR>
+<TR><TD COLSPAN=2>3. Acknowledgments and License</TD></TR>
+<TR><TD COLSPAN=2>4. SoftFloat Package Directory Structure</TD></TR>
+<TR><TD COLSPAN=2>5. Issues for Porting SoftFloat to a New Target</TD></TR>
+<TR>
+  <TD></TD>
+  <TD>5.1. Standard Headers <CODE>&lt;stdbool.h&gt;</CODE> and
+    <CODE>&lt;stdint.h&gt;</CODE></TD>
+</TR>
+<TR><TD></TD><TD>5.2. Specializing Floating-Point Behavior</TD></TR>
+<TR><TD></TD><TD>5.3. Macros for Build Options</TD></TR>
+<TR><TD></TD><TD>5.4. Adapting a Template Target Directory</TD></TR>
+<TR>
+  <TD></TD><TD>5.5. Target-Specific Optimization of Primitive Functions</TD>
+</TR>
+<TR><TD COLSPAN=2>6. Testing SoftFloat</TD></TR>
+<TR>
+  <TD COLSPAN=2>7. Providing SoftFloat as a Common Library for Applications</TD>
+</TR>
+<TR><TD COLSPAN=2>8. Contact Information</TD></TR>
+</TABLE>
+</BLOCKQUOTE>
+
+
+<H2>1. Introduction</H2>
+
+<P>
+This document gives information needed for compiling and/or porting Berkeley
+SoftFloat, a library of C functions implementing binary floating-point
+conforming to the IEEE Standard for Floating-Point Arithmetic.
+For basic documentation about SoftFloat refer to
+<A HREF="SoftFloat.html"><NOBR><CODE>SoftFloat.html</CODE></NOBR></A>.
+</P>
+
+<P>
+The source code for SoftFloat is intended to be relatively machine-independent
+and should be compilable with any ISO-Standard C compiler that also supports
+<NOBR>64-bit</NOBR> integers.
+SoftFloat has been successfully compiled with the GNU C Compiler
+(<CODE>gcc</CODE>) for several platforms.
+</P>
+
+<P>
+<NOBR>Release 3</NOBR> of SoftFloat was a complete rewrite relative to
+<NOBR>Release 2</NOBR> or earlier.
+Changes to the interface of SoftFloat functions are documented in
+<A HREF="SoftFloat.html"><NOBR><CODE>SoftFloat.html</CODE></NOBR></A>.
+The current version of SoftFloat is <NOBR>Release 3e</NOBR>.
+</P>
+
+
+<H2>2. Limitations</H2>
+
+<P>
+SoftFloat assumes the computer has an addressable byte size of either 8 or
+<NOBR>16 bits</NOBR>.
+(Nearly all computers in use today have <NOBR>8-bit</NOBR> bytes.)
+</P>
+
+<P>
+SoftFloat is written in C and is designed to work with other C code.
+The C compiler used must conform at a minimum to the 1989 ANSI standard for the
+C language (same as the 1990 ISO standard) and must in addition support basic
+arithmetic on <NOBR>64-bit</NOBR> integers.
+Earlier releases of SoftFloat included implementations of <NOBR>32-bit</NOBR>
+single-precision and <NOBR>64-bit</NOBR> double-precision floating-point that
+did not require <NOBR>64-bit</NOBR> integers, but this option is not supported
+starting with <NOBR>Release 3</NOBR>.
+Since 1999, ISO standards for C have mandated compiler support for
+<NOBR>64-bit</NOBR> integers.
+A compiler conforming to the 1999 C Standard or later is recommended but not
+strictly required.
+</P>
+
+<P>
+<NOBR>C Standard</NOBR> header files <CODE>&lt;stdbool.h&gt;</CODE> and
+<CODE>&lt;stdint.h&gt;</CODE> are required for defining standard Boolean and
+integer types.
+If these headers are not supplied with the C compiler, minimal substitutes must
+be provided.
+SoftFloat&rsquo;s dependence on these headers is detailed later in
+<NOBR>section 5.1</NOBR>, <I>Standard Headers <CODE>&lt;stdbool.h&gt;</CODE>
+and <CODE>&lt;stdint.h&gt;</CODE></I>.
+</P>
+
+
+<H2>3. Acknowledgments and License</H2>
+
+<P>
+The SoftFloat package was written by me, <NOBR>John R.</NOBR> Hauser.
+<NOBR>Release 3</NOBR> of SoftFloat was a completely new implementation
+supplanting earlier releases.
+The project to create <NOBR>Release 3</NOBR> (now <NOBR>through 3e</NOBR>) was
+done in the employ of the University of California, Berkeley, within the
+Department of Electrical Engineering and Computer Sciences, first for the
+Parallel Computing Laboratory (Par Lab) and then for the ASPIRE Lab.
+The work was officially overseen by Prof. Krste Asanovic, with funding provided
+by these sources:
+<BLOCKQUOTE>
+<TABLE>
+<COL>
+<COL WIDTH=10>
+<COL>
+<TR>
+<TD VALIGN=TOP><NOBR>Par Lab:</NOBR></TD>
+<TD></TD>
+<TD>
+Microsoft (Award #024263), Intel (Award #024894), and U.C. Discovery
+(Award #DIG07-10227), with additional support from Par Lab affiliates Nokia,
+NVIDIA, Oracle, and Samsung.
+</TD>
+</TR>
+<TR>
+<TD VALIGN=TOP><NOBR>ASPIRE Lab:</NOBR></TD>
+<TD></TD>
+<TD>
+DARPA PERFECT program (Award #HR0011-12-2-0016), with additional support from
+ASPIRE industrial sponsor Intel and ASPIRE affiliates Google, Nokia, NVIDIA,
+Oracle, and Samsung.
+</TD>
+</TR>
+</TABLE>
+</BLOCKQUOTE>
+</P>
+
+<P>
+The following applies to the whole of SoftFloat <NOBR>Release 3e</NOBR> as well
+as to each source file individually.
+</P>
+
+<P>
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the
+University of California.
+All rights reserved.
+</P>
+
+<P>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+<OL>
+
+<LI>
+<P>
+Redistributions of source code must retain the above copyright notice, this
+list of conditions, and the following disclaimer.
+</P>
+
+<LI>
+<P>
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions, and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+</P>
+
+<LI>
+<P>
+Neither the name of the University nor the names of its contributors may be
+used to endorse or promote products derived from this software without specific
+prior written permission.
+</P>
+
+</OL>
+</P>
+
+<P>
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS &ldquo;AS IS&rdquo;,
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.
+IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</P>
+
+
+<H2>4. SoftFloat Package Directory Structure</H2>
+
+<P>
+Because SoftFloat is targeted to multiple platforms, its source code is
+slightly scattered between target-specific and target-independent directories
+and files.
+The supplied directory structure is as follows:
+<BLOCKQUOTE>
+<PRE>
+doc
+source
+    include
+    8086
+    8086-SSE
+    ARM-VFPv2
+    ARM-VFPv2-defaultNaN
+build
+    template-FAST_INT64
+    template-not-FAST_INT64
+    Linux-386-GCC
+    Linux-386-SSE2-GCC
+    Linux-x86_64-GCC
+    Linux-ARM-VFPv2-GCC
+    Win32-MinGW
+    Win32-SSE2-MinGW
+    Win64-MinGW-w64
+</PRE>
+</BLOCKQUOTE>
+The majority of the SoftFloat sources are provided in the <CODE>source</CODE>
+directory.
+The <CODE>include</CODE> subdirectory contains several header files
+(unsurprisingly), while the other subdirectories of <CODE>source</CODE> contain
+source files that specialize the floating-point behavior to match particular
+processor families:
+<BLOCKQUOTE>
+<DL>
+<DT><CODE>8086</CODE></DT>
+<DD>
+Intel&rsquo;s older, 8087-derived floating-point, extended to all supported
+floating-point types
+</DD>
+<DT><CODE>8086-SSE</CODE></DT>
+<DD>
+Intel&rsquo;s x86 processors with Streaming SIMD Extensions (SSE) and later
+compatible extensions, having 8087 behavior for <NOBR>80-bit</NOBR>
+double-extended-precision (<CODE>extFloat80_t</CODE>) and SSE behavior for
+other floating-point types
+</DD>
+<DT><CODE>ARM-VFPv2</CODE></DT>
+<DD>
+ARM&rsquo;s VFPv2 or later floating-point, with NaN payload propagation
+</DD>
+<DT><CODE>ARM-VFPv2-defaultNaN</CODE></DT>
+<DD>
+ARM&rsquo;s VFPv2 or later floating-point, with the &ldquo;default NaN&rdquo;
+option
+</DD>
+</DL>
+</BLOCKQUOTE>
+If other specializations are attempted, these would be expected to be other
+subdirectories of <CODE>source</CODE> alongside the ones listed above.
+Specialization is covered later, in <NOBR>section 5.2</NOBR>, <I>Specializing
+Floating-Point Behavior</I>.
+</P>
+
+<P>
+The <CODE>build</CODE> directory is intended to contain a subdirectory for each
+target platform for which a build of the SoftFloat library may be created.
+For each build target, the target&rsquo;s subdirectory is where all derived
+object files and the completed SoftFloat library (typically
+<CODE>softfloat.a</CODE> or <CODE>libsoftfloat.a</CODE>) are created.
+The two <CODE>template</CODE> subdirectories are not actual build targets but
+contain sample files for creating new target directories.
+(The meaning of <CODE>FAST_INT64</CODE> will be explained later.)
+</P>
+
+<P>
+Ignoring the <CODE>template</CODE> directories, the supplied target directories
+are intended to follow a naming system of
+<NOBR><CODE>&lt;<I>execution-environment</I>&gt;-&lt;<I>compiler</I>&gt;</CODE></NOBR>.
+For the example targets,
+<NOBR><CODE>&lt;<I>execution-environment</I>&gt;</CODE></NOBR> is
+<NOBR><CODE>Linux-386</CODE></NOBR>, <NOBR><CODE>Linux-386-SSE2</CODE></NOBR>,
+<NOBR><CODE>Linux-x86_64</CODE></NOBR>,
+<NOBR><CODE>Linux-ARM-VFPv2</CODE></NOBR>, <CODE>Win32</CODE>,
+<NOBR><CODE>Win32-SSE2</CODE></NOBR>, or <CODE>Win64</CODE>, and
+<NOBR><CODE>&lt;<I>compiler</I>&gt;</CODE></NOBR> is <CODE>GCC</CODE>,
+<CODE>MinGW</CODE>, or <NOBR><CODE>MinGW-w64</CODE></NOBR>.
+</P>
+
+<P>
+All of the supplied target directories are merely examples that may or may not
+be correct for compiling on any particular system.
+Despite requests, there are currently no plans to include and maintain in the
+SoftFloat package the build files needed for a great many users&rsquo;
+compilation environments, which can span a huge range of operating systems,
+compilers, and other tools.
+</P>
+
+<P>
+As supplied, each target directory contains two files:
+<BLOCKQUOTE>
+<PRE>
+Makefile
+platform.h
+</PRE>
+</BLOCKQUOTE>
+The provided <CODE>Makefile</CODE> is written for GNU <CODE>make</CODE>.
+A build of SoftFloat for the specific target is begun by executing the
+<CODE>make</CODE> command with the target directory as the current directory.
+A completely different build tool can be used if an appropriate
+<CODE>Makefile</CODE> equivalent is created.
+</P>
+
+<P>
+The <CODE>platform.h</CODE> header file exists to provide a location for
+additional C declarations specific to the build target.
+Every C source file of SoftFloat contains a <CODE>#include</CODE> for
+<CODE>platform.h</CODE>.
+In many cases, the contents of <CODE>platform.h</CODE> can be as simple as one
+or two lines of code.
+At the other extreme, to get maximal performance from SoftFloat, it may be
+desirable to include in header <CODE>platform.h</CODE> (directly or via
+<CODE>#include</CODE>) declarations for numerous target-specific optimizations.
+Such possibilities are discussed in the next section, <I>Issues for Porting
+SoftFloat to a New Target</I>.
+If the target&rsquo;s compiler or library has bugs or other shortcomings,
+workarounds for these issues may also be possible with target-specific
+declarations in <CODE>platform.h</CODE>, avoiding the need to modify the main
+SoftFloat sources.
+</P>
+
+
+<H2>5. Issues for Porting SoftFloat to a New Target</H2>
+
+<H3>5.1. Standard Headers <CODE>&lt;stdbool.h&gt;</CODE> and <CODE>&lt;stdint.h&gt;</CODE></H3>
+
+<P>
+The SoftFloat sources make use of standard headers
+<CODE>&lt;stdbool.h&gt;</CODE> and <CODE>&lt;stdint.h&gt;</CODE>, which have
+been part of the ISO C Standard Library since 1999.
+With any recent compiler, these standard headers are likely to be supported,
+even if the compiler does not claim complete conformance to the latest ISO C
+Standard.
+For older or nonstandard compilers, substitutes for
+<CODE>&lt;stdbool.h&gt;</CODE> and <CODE>&lt;stdint.h&gt;</CODE> may need to be
+created.
+SoftFloat depends on these names from <CODE>&lt;stdbool.h&gt;</CODE>:
+<BLOCKQUOTE>
+<PRE>
+bool
+true
+false
+</PRE>
+</BLOCKQUOTE>
+and on these names from <CODE>&lt;stdint.h&gt;</CODE>:
+<BLOCKQUOTE>
+<PRE>
+uint16_t
+uint32_t
+uint64_t
+int32_t
+int64_t
+UINT64_C
+INT64_C
+uint_least8_t
+uint_fast8_t
+uint_fast16_t
+uint_fast32_t
+uint_fast64_t
+int_fast8_t
+int_fast16_t
+int_fast32_t
+int_fast64_t
+</PRE>
+</BLOCKQUOTE>
+</P>
+
+
+<H3>5.2. Specializing Floating-Point Behavior</H3>
+
+<P>
+The IEEE Floating-Point Standard allows for some flexibility in a conforming
+implementation, particularly concerning NaNs.
+The SoftFloat <CODE>source</CODE> directory is supplied with some
+<I>specialization</I> subdirectories containing possible definitions for this
+implementation-specific behavior.
+For example, the <CODE>8086</CODE> and <NOBR><CODE>8086-SSE</CODE></NOBR>
+subdirectories have source files that specialize SoftFloat&rsquo;s behavior to
+match that of Intel&rsquo;s x86 line of processors.
+The files in a specialization subdirectory must determine:
+<UL>
+<LI>
+whether tininess for underflow is detected before or after rounding by default;
+<LI>
+how signaling NaNs are distinguished from quiet NaNs;
+<LI>
+what (if anything) special happens when exceptions are raised;
+<LI>
+the default generated quiet NaNs;
+<LI>
+how NaNs are propagated from function inputs to output; and
+<LI>
+the integer results returned when conversions to integer type raise the
+<I>invalid</I> exception.
+</UL>
+</P>
+
+<P>
+As provided, the build process for a target expects to involve exactly
+<EM>one</EM> specialization directory that defines <EM>all</EM> of these
+implementation-specific details for the target.
+A specialization directory such as <CODE>8086</CODE> is expected to contain a
+header file called <CODE>specialize.h</CODE>, together with whatever other
+source files are needed to complete the specialization.
+</P>
+
+<P>
+A new build target may use an existing specialization, such as the ones
+provided by the <CODE>8086</CODE> and <NOBR><CODE>8086-SSE</CODE></NOBR>
+subdirectories.
+If a build target needs a new specialization, different from any existing ones,
+it is recommended that a new specialization directory be created for this
+purpose.
+The <CODE>specialize.h</CODE> header file from any of the provided
+specialization subdirectories can be used as a model for what definitions are
+needed.
+</P>
+
+
+<H3>5.3. Macros for Build Options</H3>
+
+<P>
+The SoftFloat source files adapt the floating-point implementation according to
+several C preprocessor macros:
+<BLOCKQUOTE>
+<DL>
+<DT><CODE>LITTLEENDIAN</CODE>
+<DD>
+Must be defined for little-endian machines; must not be defined for big-endian
+machines.
+<DT><CODE>INLINE</CODE>
+<DD>
+Specifies the sequence of tokens used to indicate that a C function should be
+inlined.
+If macro <CODE>INLINE_LEVEL</CODE> is defined with a value of 1 or higher, this
+macro must be defined; otherwise, this macro is ignored and need not be
+defined.
+For compilers that conform to the C Standard&rsquo;s rules for inline
+functions, this macro can be defined as the single keyword <CODE>inline</CODE>.
+For other compilers that follow a convention pre-dating the standardization of
+<CODE>inline</CODE>, this macro may need to be defined to <CODE>extern</CODE>
+<CODE>inline</CODE>.
+<DT><CODE>THREAD_LOCAL</CODE>
+<DD>
+Can be defined to a sequence of tokens that, when appearing at the start of a
+variable declaration, indicates to the C compiler that the variable is
+<I>per-thread</I>, meaning that each execution thread gets its own separate
+instance of the variable.
+This macro is used in header <CODE>softfloat.h</CODE> in the declarations of
+variables <CODE>softfloat_roundingMode</CODE>,
+<CODE>softfloat_detectTininess</CODE>, <CODE>extF80_roundingPrecision</CODE>,
+and <CODE>softfloat_exceptionFlags</CODE>.
+If macro <CODE>THREAD_LOCAL</CODE> is left undefined, these variables will
+default to being ordinary global variables.
+Depending on the compiler, possible valid definitions of this macro include
+<CODE>_Thread_local</CODE> and <CODE>__thread</CODE>.
+</DL>
+<DL>
+<DT><CODE>SOFTFLOAT_ROUND_ODD</CODE>
+<DD>
+Can be defined to enable support for optional rounding mode
+<CODE>softfloat_round_odd</CODE>.
+</DL>
+<DL>
+<DT><CODE>INLINE_LEVEL</CODE>
+<DD>
+Can be defined to an integer to determine the degree of inlining requested of
+the compiler.
+Larger numbers request that more inlining be done.
+If this macro is not defined or is defined to a value less <NOBR>than 1</NOBR>
+(zero or negative), no inlining is requested.
+The maximum effective value is no higher <NOBR>than 5</NOBR>.
+Defining this macro to a value greater than 5 is the same as defining it
+<NOBR>to 5</NOBR>.
+<DT><CODE>SOFTFLOAT_FAST_INT64</CODE>
+<DD>
+Can be defined to indicate that the build target&rsquo;s implementation of
+<NOBR>64-bit</NOBR> arithmetic is efficient.
+For newer <NOBR>64-bit</NOBR> processors, this macro should usually be defined.
+For very small microprocessors whose buses and registers are <NOBR>8-bit</NOBR>
+or <NOBR>16-bit</NOBR> in size, this macro should usually not be defined.
+Whether this macro should be defined for a <NOBR>32-bit</NOBR> processor may
+depend on the target machine and the applications that will use SoftFloat.
+<DT><CODE>SOFTFLOAT_FAST_DIV32TO16</CODE>
+<DD>
+Can be defined to indicate that the target&rsquo;s division operator
+<NOBR>in C</NOBR> (written as <CODE>/</CODE>) is reasonably efficient for
+dividing a <NOBR>32-bit</NOBR> unsigned integer by a <NOBR>16-bit</NOBR>
+unsigned integer.
+Setting this macro may affect the performance of function <CODE>f16_div</CODE>.
+<DT><CODE>SOFTFLOAT_FAST_DIV64TO32</CODE>
+<DD>
+Can be defined to indicate that the target&rsquo;s division operator
+<NOBR>in C</NOBR> (written as <CODE>/</CODE>) is reasonably efficient for
+dividing a <NOBR>64-bit</NOBR> unsigned integer by a <NOBR>32-bit</NOBR>
+unsigned integer.
+Setting this macro may affect the performance of division, remainder, and
+square root operations other than <CODE>f16_div</CODE>.
+</DL>
+</BLOCKQUOTE>
+</P>
+
+<P>
+Following the usual custom <NOBR>for C</NOBR>, for most of these macros (all
+except <CODE>INLINE</CODE>, <CODE>THREAD_LOCAL</CODE>, and
+<CODE>INLINE_LEVEL</CODE>), the content of any definition is irrelevant;
+what matters is a macro&rsquo;s effect on <CODE>#ifdef</CODE> directives.
+</P>
+
+<P>
+It is recommended that any definitions of macros <CODE>LITTLEENDIAN</CODE>,
+<CODE>INLINE</CODE>, and <CODE>THREAD_LOCAL</CODE> be made in a build
+target&rsquo;s <CODE>platform.h</CODE> header file, because these macros are
+expected to be determined inflexibly by the target machine and compiler.
+The other five macros select options and control optimization, and thus might
+be better located in the target&rsquo;s Makefile (or its equivalent).
+</P>
+
+
+<H3>5.4. Adapting a Template Target Directory</H3>
+
+<P>
+In the <CODE>build</CODE> directory, two <CODE>template</CODE> subdirectories
+provide models for new target directories.
+Two different templates exist because different functions are needed in the
+SoftFloat library depending on whether macro <CODE>SOFTFLOAT_FAST_INT64</CODE>
+is defined.
+If macro <CODE>SOFTFLOAT_FAST_INT64</CODE> will be defined,
+<NOBR><CODE>template-FAST_INT64</CODE></NOBR> is the template to use;
+otherwise, <NOBR><CODE>template-not-FAST_INT64</CODE></NOBR> is the appropriate
+template.
+A new target directory can be created by copying the correct template directory
+and editing the files inside.
+To avoid confusion, it would be wise to refrain from editing the files within a
+template directory directly.
+</P>
+
+
+<H3>5.5. Target-Specific Optimization of Primitive Functions</H3>
+
+<P>
+Header file <CODE>primitives.h</CODE> (in directory
+<CODE>source/include</CODE>) declares macros and functions for numerous
+underlying arithmetic operations upon which many of SoftFloat&rsquo;s
+floating-point functions are ultimately built.
+The SoftFloat sources include implementations of all of these functions/macros,
+written as standard C code, so a complete and correct SoftFloat library can be
+created using only the supplied code for all functions.
+However, for many targets, SoftFloat&rsquo;s performance can be improved by
+substituting target-specific implementations of some of the functions/macros
+declared in <CODE>primitives.h</CODE>.
+</P>
+
+<P>
+For example, <CODE>primitives.h</CODE> declares a function called
+<CODE>softfloat_countLeadingZeros32</CODE> that takes an unsigned
+<NOBR>32-bit</NOBR> integer as an argument and returns the number of the
+integer&rsquo;s most-significant bits that are zeros.
+While the SoftFloat sources include an implementation of this function written
+in <NOBR>standard C</NOBR>, many processors can perform this same function
+directly in only one or two machine instructions.
+An alternative, target-specific implementation that maps to those instructions
+is likely to be more efficient than the generic C code from the SoftFloat
+package.
+</P>
+
+<P>
+A build target can replace the supplied version of any function or macro of
+<CODE>primitives.h</CODE> by defining a macro with the same name in the
+target&rsquo;s <CODE>platform.h</CODE> header file.
+For this purpose, it may be helpful for <CODE>platform.h</CODE> to
+<CODE>#include</CODE> header file <CODE>primitiveTypes.h</CODE>, which defines
+types used for arguments and results of functions declared in
+<CODE>primitives.h</CODE>.
+When a desired replacement implementation is a function, not a macro, it is
+sufficient for <CODE>platform.h</CODE> to include the line
+<BLOCKQUOTE>
+<PRE>
+#define &lt;<I>function-name</I>&gt; &lt;<I>function-name</I>&gt;
+</PRE>
+</BLOCKQUOTE>
+where <NOBR><CODE>&lt;<I>function-name</I>&gt;</CODE></NOBR> is the name of the
+function.
+This technically defines <NOBR><CODE>&lt;<I>function-name</I>&gt;</CODE></NOBR>
+as a macro, but one that resolves to the same name, which may then be a
+function.
+(A preprocessor that conforms to the C Standard is required to limit recursive
+macro expansion from being applied more than once.)
+</P>
+
+<P>
+The supplied header file <CODE>opts-GCC.h</CODE> (in directory
+<CODE>source/include</CODE>) provides an example of target-specific
+optimization for the GCC compiler.
+Each GCC target example in the <CODE>build</CODE> directory has
+<BLOCKQUOTE>
+<CODE>#include "opts-GCC.h"</CODE>
+</BLOCKQUOTE>
+in its <CODE>platform.h</CODE> header file.
+Before <CODE>opts-GCC.h</CODE> is included, the following macros must be
+defined (or not) to control which features are invoked:
+<BLOCKQUOTE>
+<DL>
+<DT><CODE>SOFTFLOAT_BUILTIN_CLZ</CODE></DT>
+<DD>
+If defined, SoftFloat&rsquo;s internal
+&lsquo;<CODE>countLeadingZeros</CODE>&rsquo; functions use intrinsics
+<CODE>__builtin_clz</CODE> and <CODE>__builtin_clzll</CODE>.
+</DD>
+<DT><CODE>SOFTFLOAT_INTRINSIC_INT128</CODE></DT>
+<DD>
+If defined, SoftFloat makes use of GCC&rsquo;s nonstandard <NOBR>128-bit</NOBR>
+integer type <CODE>__int128</CODE>.
+</DD>
+</DL>
+</BLOCKQUOTE>
+On some machines, these improvements are observed to increase the speeds of
+<CODE>f64_mul</CODE> and <CODE>f128_mul</CODE> by around 20 to 25%, although
+other functions receive less dramatic boosts, or none at all.
+Results can vary greatly across different platforms.
+</P>
+
+
+<H2>6. Testing SoftFloat</H2>
+
+<P>
+SoftFloat can be tested using the <CODE>testsoftfloat</CODE> program by the
+same author.
+This program is part of the Berkeley TestFloat package available at the Web
+page
+<A HREF="http://www.jhauser.us/arithmetic/TestFloat.html"><NOBR><CODE>http://www.jhauser.us/arithmetic/TestFloat.html</CODE></NOBR></A>.
+The TestFloat package also has a program called <CODE>timesoftfloat</CODE> that
+measures the speed of SoftFloat&rsquo;s floating-point functions.
+</P>
+
+
+<H2>7. Providing SoftFloat as a Common Library for Applications</H2>
+
+<P>
+Header file <CODE>softfloat.h</CODE> defines the SoftFloat interface as seen by
+clients.
+If the SoftFloat library will be made a common library for programs on a
+system, the supplied <CODE>softfloat.h</CODE> has a couple of deficiencies for
+this purpose:
+<UL>
+<LI>
+As supplied, <CODE>softfloat.h</CODE> depends on another header,
+<CODE>softfloat_types.h</CODE>, that is not intended for public use but which
+must also be visible to the programmer&rsquo;s compiler.
+<LI>
+More troubling, at the time <CODE>softfloat.h</CODE> is included in a C source
+file, macros <CODE>SOFTFLOAT_FAST_INT64</CODE> and <CODE>THREAD_LOCAL</CODE>
+must be defined, or not defined, consistent with how these macro were defined
+when the SoftFloat library was built.
+</UL>
+In the situation that new programs may regularly <CODE>#include</CODE> header
+file <CODE>softfloat.h</CODE>, it is recommended that a custom, self-contained
+version of this header file be created that eliminates these issues.
+</P>
+
+
+<H2>8. Contact Information</H2>
+
+<P>
+At the time of this writing, the most up-to-date information about SoftFloat
+and the latest release can be found at the Web page
+<A HREF="http://www.jhauser.us/arithmetic/SoftFloat.html"><NOBR><CODE>http://www.jhauser.us/arithmetic/SoftFloat.html</CODE></NOBR></A>.
+</P>
+
+
+</BODY>
+
diff --git a/src/cpu/softfloat3e/doc/SoftFloat.html b/src/cpu/softfloat3e/doc/SoftFloat.html
new file mode 100644
index 000000000..b72b407f4
--- /dev/null
+++ b/src/cpu/softfloat3e/doc/SoftFloat.html
@@ -0,0 +1,1527 @@
+
+<HTML>
+
+<HEAD>
+<TITLE>Berkeley SoftFloat Library Interface</TITLE>
+</HEAD>
+
+<BODY>
+
+<H1>Berkeley SoftFloat Release 3e: Library Interface</H1>
+
+<P>
+John R. Hauser<BR>
+2018 January 20<BR>
+</P>
+
+
+<H2>Contents</H2>
+
+<BLOCKQUOTE>
+<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0>
+<COL WIDTH=25>
+<COL WIDTH=*>
+<TR><TD COLSPAN=2>1. Introduction</TD></TR>
+<TR><TD COLSPAN=2>2. Limitations</TD></TR>
+<TR><TD COLSPAN=2>3. Acknowledgments and License</TD></TR>
+<TR><TD COLSPAN=2>4. Types and Functions</TD></TR>
+<TR><TD></TD><TD>4.1. Boolean and Integer Types</TD></TR>
+<TR><TD></TD><TD>4.2. Floating-Point Types</TD></TR>
+<TR><TD></TD><TD>4.3. Supported Floating-Point Functions</TD></TR>
+<TR>
+  <TD></TD>
+  <TD>4.4. Non-canonical Representations in <CODE>extFloat80_t</CODE></TD>
+</TR>
+<TR><TD></TD><TD>4.5. Conventions for Passing Arguments and Results</TD></TR>
+<TR><TD COLSPAN=2>5. Reserved Names</TD></TR>
+<TR><TD COLSPAN=2>6. Mode Variables</TD></TR>
+<TR><TD></TD><TD>6.1. Rounding Mode</TD></TR>
+<TR><TD></TD><TD>6.2. Underflow Detection</TD></TR>
+<TR>
+  <TD></TD>
+  <TD>6.3. Rounding Precision for the <NOBR>80-Bit</NOBR> Extended Format</TD>
+</TR>
+<TR><TD COLSPAN=2>7. Exceptions and Exception Flags</TD></TR>
+<TR><TD COLSPAN=2>8. Function Details</TD></TR>
+<TR><TD></TD><TD>8.1. Conversions from Integer to Floating-Point</TD></TR>
+<TR><TD></TD><TD>8.2. Conversions from Floating-Point to Integer</TD></TR>
+<TR><TD></TD><TD>8.3. Conversions Among Floating-Point Types</TD></TR>
+<TR><TD></TD><TD>8.4. Basic Arithmetic Functions</TD></TR>
+<TR><TD></TD><TD>8.5. Fused Multiply-Add Functions</TD></TR>
+<TR><TD></TD><TD>8.6. Remainder Functions</TD></TR>
+<TR><TD></TD><TD>8.7. Round-to-Integer Functions</TD></TR>
+<TR><TD></TD><TD>8.8. Comparison Functions</TD></TR>
+<TR><TD></TD><TD>8.9. Signaling NaN Test Functions</TD></TR>
+<TR><TD></TD><TD>8.10. Raise-Exception Function</TD></TR>
+<TR><TD COLSPAN=2>9. Changes from SoftFloat <NOBR>Release 2</NOBR></TD></TR>
+<TR><TD></TD><TD>9.1. Name Changes</TD></TR>
+<TR><TD></TD><TD>9.2. Changes to Function Arguments</TD></TR>
+<TR><TD></TD><TD>9.3. Added Capabilities</TD></TR>
+<TR><TD></TD><TD>9.4. Better Compatibility with the C Language</TD></TR>
+<TR><TD></TD><TD>9.5. New Organization as a Library</TD></TR>
+<TR><TD></TD><TD>9.6. Optimization Gains (and Losses)</TD></TR>
+<TR><TD COLSPAN=2>10. Future Directions</TD></TR>
+<TR><TD COLSPAN=2>11. Contact Information</TD></TR>
+</TABLE>
+</BLOCKQUOTE>
+
+
+<H2>1. Introduction</H2>
+
+<P>
+Berkeley SoftFloat is a software implementation of binary floating-point that
+conforms to the IEEE Standard for Floating-Point Arithmetic.
+The current release supports five binary formats:  <NOBR>16-bit</NOBR>
+half-precision, <NOBR>32-bit</NOBR> single-precision, <NOBR>64-bit</NOBR>
+double-precision, <NOBR>80-bit</NOBR> double-extended-precision, and
+<NOBR>128-bit</NOBR> quadruple-precision.
+The following functions are supported for each format:
+<UL>
+<LI>
+addition, subtraction, multiplication, division, and square root;
+<LI>
+fused multiply-add as defined by the IEEE Standard, except for
+<NOBR>80-bit</NOBR> double-extended-precision;
+<LI>
+remainder as defined by the IEEE Standard;
+<LI>
+round to integral value;
+<LI>
+comparisons;
+<LI>
+conversions to/from other supported formats; and
+<LI>
+conversions to/from <NOBR>32-bit</NOBR> and <NOBR>64-bit</NOBR> integers,
+signed and unsigned.
+</UL>
+All operations required by the original 1985 version of the IEEE Floating-Point
+Standard are implemented, except for conversions to and from decimal.
+</P>
+
+<P>
+This document gives information about the types defined and the routines
+implemented by SoftFloat.
+It does not attempt to define or explain the IEEE Floating-Point Standard.
+Information about the standard is available elsewhere.
+</P>
+
+<P>
+The current version of SoftFloat is <NOBR>Release 3e</NOBR>.
+This release modifies the behavior of the rarely used <I>odd</I> rounding mode
+(<I>round to odd</I>, also known as <I>jamming</I>), and also adds some new
+specialization and optimization examples for those compiling SoftFloat.
+</P>
+
+<P>
+The previous <NOBR>Release 3d</NOBR> fixed bugs that were found in the square
+root functions for the <NOBR>64-bit</NOBR>, <NOBR>80-bit</NOBR>, and
+<NOBR>128-bit</NOBR> floating-point formats.
+(Thanks to Alexei Sibidanov at the University of Victoria for reporting an
+incorrect result.)
+The bugs affected all prior <NOBR>Release-3</NOBR> versions of SoftFloat
+<NOBR>through 3c</NOBR>.
+The flaw in the <NOBR>64-bit</NOBR> floating-point square root function was of
+very minor impact, causing a <NOBR>1-ulp</NOBR> error (<NOBR>1 unit</NOBR> in
+the last place) a few times out of a billion.
+The bugs in the <NOBR>80-bit</NOBR> and <NOBR>128-bit</NOBR> square root
+functions were more serious.
+Although incorrect results again occurred only a few times out of a billion,
+when they did occur a large portion of the less-significant bits could be
+wrong.
+</P>
+
+<P>
+Among earlier releases, 3b was notable for adding support for the
+<NOBR>16-bit</NOBR> half-precision format.
+For more about the evolution of SoftFloat releases, see
+<A HREF="SoftFloat-history.html"><NOBR><CODE>SoftFloat-history.html</CODE></NOBR></A>.
+</P>
+
+<P>
+The functional interface of SoftFloat <NOBR>Release 3</NOBR> and later differs
+in many details from the releases that came before.
+For specifics of these differences, see <NOBR>section 9</NOBR> below,
+<I>Changes from SoftFloat <NOBR>Release 2</NOBR></I>.
+</P>
+
+
+<H2>2. Limitations</H2>
+
+<P>
+SoftFloat assumes the computer has an addressable byte size of 8 or
+<NOBR>16 bits</NOBR>.
+(Nearly all computers in use today have <NOBR>8-bit</NOBR> bytes.)
+</P>
+
+<P>
+SoftFloat is written in C and is designed to work with other C code.
+The C compiler used must conform at a minimum to the 1989 ANSI standard for the
+C language (same as the 1990 ISO standard) and must in addition support basic
+arithmetic on <NOBR>64-bit</NOBR> integers.
+Earlier releases of SoftFloat included implementations of <NOBR>32-bit</NOBR>
+single-precision and <NOBR>64-bit</NOBR> double-precision floating-point that
+did not require <NOBR>64-bit</NOBR> integers, but this option is not supported
+starting with <NOBR>Release 3</NOBR>.
+Since 1999, ISO standards for C have mandated compiler support for
+<NOBR>64-bit</NOBR> integers.
+A compiler conforming to the 1999 C Standard or later is recommended but not
+strictly required.
+</P>
+
+<P>
+Most operations not required by the original 1985 version of the IEEE
+Floating-Point Standard but added in the 2008 version are not yet supported in
+SoftFloat <NOBR>Release 3e</NOBR>.
+</P>
+
+
+<H2>3. Acknowledgments and License</H2>
+
+<P>
+The SoftFloat package was written by me, <NOBR>John R.</NOBR> Hauser.
+<NOBR>Release 3</NOBR> of SoftFloat was a completely new implementation
+supplanting earlier releases.
+The project to create <NOBR>Release 3</NOBR> (now <NOBR>through 3e</NOBR>) was
+done in the employ of the University of California, Berkeley, within the
+Department of Electrical Engineering and Computer Sciences, first for the
+Parallel Computing Laboratory (Par Lab) and then for the ASPIRE Lab.
+The work was officially overseen by Prof. Krste Asanovic, with funding provided
+by these sources:
+<BLOCKQUOTE>
+<TABLE>
+<COL>
+<COL WIDTH=10>
+<COL>
+<TR>
+<TD VALIGN=TOP><NOBR>Par Lab:</NOBR></TD>
+<TD></TD>
+<TD>
+Microsoft (Award #024263), Intel (Award #024894), and U.C. Discovery
+(Award #DIG07-10227), with additional support from Par Lab affiliates Nokia,
+NVIDIA, Oracle, and Samsung.
+</TD>
+</TR>
+<TR>
+<TD VALIGN=TOP><NOBR>ASPIRE Lab:</NOBR></TD>
+<TD></TD>
+<TD>
+DARPA PERFECT program (Award #HR0011-12-2-0016), with additional support from
+ASPIRE industrial sponsor Intel and ASPIRE affiliates Google, Nokia, NVIDIA,
+Oracle, and Samsung.
+</TD>
+</TR>
+</TABLE>
+</BLOCKQUOTE>
+</P>
+
+<P>
+The following applies to the whole of SoftFloat <NOBR>Release 3e</NOBR> as well
+as to each source file individually.
+</P>
+
+<P>
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the
+University of California.
+All rights reserved.
+</P>
+
+<P>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+<OL>
+
+<LI>
+<P>
+Redistributions of source code must retain the above copyright notice, this
+list of conditions, and the following disclaimer.
+</P>
+
+<LI>
+<P>
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions, and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+</P>
+
+<LI>
+<P>
+Neither the name of the University nor the names of its contributors may be
+used to endorse or promote products derived from this software without specific
+prior written permission.
+</P>
+
+</OL>
+</P>
+
+<P>
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS &ldquo;AS IS&rdquo;,
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.
+IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</P>
+
+
+<H2>4. Types and Functions</H2>
+
+<P>
+The types and functions of SoftFloat are declared in header file
+<CODE>softfloat.h</CODE>.
+</P>
+
+<H3>4.1. Boolean and Integer Types</H3>
+
+<P>
+Header file <CODE>softfloat.h</CODE> depends on standard headers
+<CODE>&lt;stdbool.h&gt;</CODE> and <CODE>&lt;stdint.h&gt;</CODE> to define type
+<CODE>bool</CODE> and several integer types.
+These standard headers have been part of the ISO C Standard Library since 1999.
+With any recent compiler, they are likely to be supported, even if the compiler
+does not claim complete conformance to the latest ISO C Standard.
+For older or nonstandard compilers, a port of SoftFloat may have substitutes
+for these headers.
+Header <CODE>softfloat.h</CODE> depends only on the name <CODE>bool</CODE> from
+<CODE>&lt;stdbool.h&gt;</CODE> and on these type names from
+<CODE>&lt;stdint.h&gt;</CODE>:
+<BLOCKQUOTE>
+<PRE>
+uint16_t
+uint32_t
+uint64_t
+int32_t
+int64_t
+uint_fast8_t
+uint_fast32_t
+uint_fast64_t
+int_fast32_t
+int_fast64_t
+</PRE>
+</BLOCKQUOTE>
+</P>
+
+
+<H3>4.2. Floating-Point Types</H3>
+
+<P>
+The <CODE>softfloat.h</CODE> header defines five floating-point types:
+<BLOCKQUOTE>
+<TABLE CELLSPACING=0 CELLPADDING=0>
+<TR>
+<TD><CODE>float16_t</CODE></TD>
+<TD><NOBR>16-bit</NOBR> half-precision binary format</TD>
+</TR>
+<TR>
+<TD><CODE>float32_t</CODE></TD>
+<TD><NOBR>32-bit</NOBR> single-precision binary format</TD>
+</TR>
+<TR>
+<TD><CODE>float64_t</CODE></TD>
+<TD><NOBR>64-bit</NOBR> double-precision binary format</TD>
+</TR>
+<TR>
+<TD><CODE>extFloat80_t&nbsp;&nbsp;&nbsp;</CODE></TD>
+<TD><NOBR>80-bit</NOBR> double-extended-precision binary format (old Intel or
+Motorola format)</TD>
+</TR>
+<TR>
+<TD><CODE>float128_t</CODE></TD>
+<TD><NOBR>128-bit</NOBR> quadruple-precision binary format</TD>
+</TR>
+</TABLE>
+</BLOCKQUOTE>
+The non-extended types are each exactly the size specified:
+<NOBR>16 bits</NOBR> for <CODE>float16_t</CODE>, <NOBR>32 bits</NOBR> for
+<CODE>float32_t</CODE>, <NOBR>64 bits</NOBR> for <CODE>float64_t</CODE>, and
+<NOBR>128 bits</NOBR> for <CODE>float128_t</CODE>.
+Aside from these size requirements, the definitions of all these types may
+differ for different ports of SoftFloat to specific systems.
+A given port of SoftFloat may or may not define some of the floating-point
+types as aliases for the C standard types <CODE>float</CODE>,
+<CODE>double</CODE>, and <CODE>long</CODE> <CODE>double</CODE>.
+</P>
+
+<P>
+Header file <CODE>softfloat.h</CODE> also defines a structure,
+<CODE>struct</CODE> <CODE>extFloat80M</CODE>, for the representation of
+<NOBR>80-bit</NOBR> double-extended-precision floating-point values in memory.
+This structure is the same size as type <CODE>extFloat80_t</CODE> and contains
+at least these two fields (not necessarily in this order):
+<BLOCKQUOTE>
+<PRE>
+uint16_t signExp;
+uint64_t signif;
+</PRE>
+</BLOCKQUOTE>
+Field <CODE>signExp</CODE> contains the sign and exponent of the floating-point
+value, with the sign in the most significant bit (<NOBR>bit 15</NOBR>) and the
+encoded exponent in the other <NOBR>15 bits</NOBR>.
+Field <CODE>signif</CODE> is the complete <NOBR>64-bit</NOBR> significand of
+the floating-point value.
+(In the usual encoding for <NOBR>80-bit</NOBR> extended floating-point, the
+leading <NOBR>1 bit</NOBR> of normalized numbers is not implicit but is stored
+in the most significant bit of the significand.)
+</P>
+
+<H3>4.3. Supported Floating-Point Functions</H3>
+
+<P>
+SoftFloat implements these arithmetic operations for its floating-point types:
+<UL>
+<LI>
+conversions between any two floating-point formats;
+<LI>
+for each floating-point format, conversions to and from signed and unsigned
+<NOBR>32-bit</NOBR> and <NOBR>64-bit</NOBR> integers;
+<LI>
+for each format, the usual addition, subtraction, multiplication, division, and
+square root operations;
+<LI>
+for each format except <CODE>extFloat80_t</CODE>, the fused multiply-add
+operation defined by the IEEE Standard;
+<LI>
+for each format, the floating-point remainder operation defined by the IEEE
+Standard;
+<LI>
+for each format, a &ldquo;round to integer&rdquo; operation that rounds to the
+nearest integer value in the same format; and
+<LI>
+comparisons between two values in the same floating-point format.
+</UL>
+</P>
+
+<P>
+The following operations required by the 2008 IEEE Floating-Point Standard are
+not supported in SoftFloat <NOBR>Release 3e</NOBR>:
+<UL>
+<LI>
+<B>nextUp</B>, <B>nextDown</B>, <B>minNum</B>, <B>maxNum</B>, <B>minNumMag</B>,
+<B>maxNumMag</B>, <B>scaleB</B>, and <B>logB</B>;
+<LI>
+conversions between floating-point formats and decimal or hexadecimal character
+sequences;
+<LI>
+all &ldquo;quiet-computation&rdquo; operations (<B>copy</B>, <B>negate</B>,
+<B>abs</B>, and <B>copySign</B>, which all involve only simple copying and/or
+manipulation of the floating-point sign bit); and
+<LI>
+all &ldquo;non-computational&rdquo; operations other than <B>isSignaling</B>
+(which is supported).
+</UL>
+</P>
+
+<H3>4.4. Non-canonical Representations in <CODE>extFloat80_t</CODE></H3>
+
+<P>
+Because the <NOBR>80-bit</NOBR> double-extended-precision format,
+<CODE>extFloat80_t</CODE>, stores an explicit leading significand bit, many
+finite floating-point numbers are encodable in this type in multiple equivalent
+forms.
+Of these multiple encodings, there is always a unique one with the least
+encoded exponent value, and this encoding is considered the <I>canonical</I>
+representation of the floating-point number.
+Any other equivalent representations (having a higher encoded exponent value)
+are <I>non-canonical</I>.
+For a value in the subnormal range (including zero), the canonical
+representation always has an encoded exponent of zero and a leading significand
+bit <NOBR>of 0</NOBR>.
+For finite values outside the subnormal range, the canonical representation
+always has an encoded exponent that is nonzero and a leading significand bit
+<NOBR>of 1</NOBR>.
+</P>
+
+<P>
+For an infinity or NaN, the leading significand bit is similarly expected to
+<NOBR>be 1</NOBR>.
+An infinity or NaN with a leading significand bit <NOBR>of 0</NOBR> is again
+considered non-canonical.
+Hence, altogether, to be canonical, a value of type <CODE>extFloat80_t</CODE>
+must have a leading significand bit <NOBR>of 1</NOBR>, unless the value is
+subnormal or zero, in which case the leading significand bit and the encoded
+exponent must both be zero.
+</P>
+
+<P>
+SoftFloat&rsquo;s functions are not guaranteed to operate as expected when
+inputs of type <CODE>extFloat80_t</CODE> are non-canonical.
+Assuming all of a function&rsquo;s <CODE>extFloat80_t</CODE> inputs (if any)
+are canonical, function outputs of type <CODE>extFloat80_t</CODE> will always
+be canonical.
+</P>
+
+<H3>4.5. Conventions for Passing Arguments and Results</H3>
+
+<P>
+Values that are at most <NOBR>64 bits</NOBR> in size (i.e., not the
+<NOBR>80-bit</NOBR> or <NOBR>128-bit</NOBR> floating-point formats) are in all
+cases passed as function arguments by value.
+Likewise, when an output of a function is no more than <NOBR>64 bits</NOBR>, it
+is always returned directly as the function result.
+Thus, for example, the SoftFloat function for adding two <NOBR>64-bit</NOBR>
+floating-point values has this simple signature:
+<BLOCKQUOTE>
+<CODE>float64_t f64_add( float64_t, float64_t );</CODE>
+</BLOCKQUOTE>
+</P>
+
+<P>
+The story is more complex when function inputs and outputs are
+<NOBR>80-bit</NOBR> and <NOBR>128-bit</NOBR> floating-point.
+For these types, SoftFloat always provides a function that passes these larger
+values into or out of the function indirectly, via pointers.
+For example, for adding two <NOBR>128-bit</NOBR> floating-point values,
+SoftFloat supplies this function:
+<BLOCKQUOTE>
+<CODE>void f128M_add( const float128_t *, const float128_t *, float128_t * );</CODE>
+</BLOCKQUOTE>
+The first two arguments point to the values to be added, and the last argument
+points to the location where the sum will be stored.
+The <CODE>M</CODE> in the name <CODE>f128M_add</CODE> is mnemonic for the fact
+that the <NOBR>128-bit</NOBR> inputs and outputs are &ldquo;in memory&rdquo;,
+pointed to by pointer arguments.
+</P>
+
+<P>
+All ports of SoftFloat implement these <I>pass-by-pointer</I> functions for
+types <CODE>extFloat80_t</CODE> and <CODE>float128_t</CODE>.
+At the same time, SoftFloat ports may also implement alternate versions of
+these same functions that pass <CODE>extFloat80_t</CODE> and
+<CODE>float128_t</CODE> by value, like the smaller formats.
+Thus, besides the function with name <CODE>f128M_add</CODE> shown above, a
+SoftFloat port may also supply an equivalent function with this signature:
+<BLOCKQUOTE>
+<CODE>float128_t f128_add( float128_t, float128_t );</CODE>
+</BLOCKQUOTE>
+</P>
+
+<P>
+As a general rule, on computers where the machine word size is
+<NOBR>32 bits</NOBR> or smaller, only the pass-by-pointer versions of functions
+(e.g., <CODE>f128M_add</CODE>) are provided for types <CODE>extFloat80_t</CODE>
+and <CODE>float128_t</CODE>, because passing such large types directly can have
+significant extra cost.
+On computers where the word size is <NOBR>64 bits</NOBR> or larger, both
+function versions (<CODE>f128M_add</CODE> and <CODE>f128_add</CODE>) are
+provided, because the cost of passing by value is then more reasonable.
+Applications that must be portable accross both classes of computers must use
+the pointer-based functions, as these are always implemented.
+However, if it is known that SoftFloat includes the by-value functions for all
+platforms of interest, programmers can use whichever version they prefer.
+</P>
+
+
+<H2>5. Reserved Names</H2>
+
+<P>
+In addition to the variables and functions documented here, SoftFloat defines
+some symbol names for its own private use.
+These private names always begin with the prefix
+&lsquo;<CODE>softfloat_</CODE>&rsquo;.
+When a program includes header <CODE>softfloat.h</CODE> or links with the
+SoftFloat library, all names with prefix &lsquo;<CODE>softfloat_</CODE>&rsquo;
+are reserved for possible use by SoftFloat.
+Applications that use SoftFloat should not define their own names with this
+prefix, and should reference only such names as are documented.
+</P>
+
+
+<H2>6. Mode Variables</H2>
+
+<P>
+The following global variables control rounding mode, underflow detection, and
+the <NOBR>80-bit</NOBR> extended format&rsquo;s rounding precision:
+<BLOCKQUOTE>
+<CODE>softfloat_roundingMode</CODE><BR>
+<CODE>softfloat_detectTininess</CODE><BR>
+<CODE>extF80_roundingPrecision</CODE>
+</BLOCKQUOTE>
+These mode variables are covered in the next several subsections.
+For some SoftFloat ports, these variables may be <I>per-thread</I> (declared
+<CODE>thread_local</CODE>), meaning that different execution threads have their
+own separate copies of the variables.
+</P>
+
+<H3>6.1. Rounding Mode</H3>
+
+<P>
+All five rounding modes defined by the 2008 IEEE Floating-Point Standard are
+implemented for all operations that require rounding.
+Some ports of SoftFloat may also implement the <I>round-to-odd</I> mode.
+</P>
+
+<P>
+The rounding mode is selected by the global variable
+<BLOCKQUOTE>
+<CODE>uint_fast8_t softfloat_roundingMode;</CODE>
+</BLOCKQUOTE>
+This variable may be set to one of the values
+<BLOCKQUOTE>
+<TABLE CELLSPACING=0 CELLPADDING=0>
+<TR>
+<TD><CODE>softfloat_round_near_even</CODE></TD>
+<TD>round to nearest, with ties to even</TD>
+</TR>
+<TR>
+<TD><CODE>softfloat_round_near_maxMag&nbsp;&nbsp;</CODE></TD>
+<TD>round to nearest, with ties to maximum magnitude (away from zero)</TD>
+</TR>
+<TR>
+<TD><CODE>softfloat_round_minMag</CODE></TD>
+<TD>round to minimum magnitude (toward zero)</TD>
+</TR>
+<TR>
+<TD><CODE>softfloat_round_min</CODE></TD>
+<TD>round to minimum (down)</TD>
+</TR>
+<TR>
+<TD><CODE>softfloat_round_max</CODE></TD>
+<TD>round to maximum (up)</TD>
+</TR>
+<TR>
+<TD><CODE>softfloat_round_odd</CODE></TD>
+<TD>round to odd (jamming), if supported by the SoftFloat port</TD>
+</TR>
+</TABLE>
+</BLOCKQUOTE>
+Variable <CODE>softfloat_roundingMode</CODE> is initialized to
+<CODE>softfloat_round_near_even</CODE>.
+</P>
+
+<P>
+When <CODE>softfloat_round_odd</CODE> is the rounding mode for a function that
+rounds to an integer value (either conversion to an integer format or a
+&lsquo;<CODE>roundToInt</CODE>&rsquo; function), if the input is not already an
+integer, the rounded result is the closest <EM>odd</EM> integer.
+For other operations, this rounding mode acts as though the floating-point
+result is first rounded to minimum magnitude, the same as
+<CODE>softfloat_round_minMag</CODE>, and then, if the result is inexact, the
+least-significant bit of the result is set <NOBR>to 1</NOBR>.
+Rounding to odd is also known as <EM>jamming</EM>.
+</P>
+
+<H3>6.2. Underflow Detection</H3>
+
+<P>
+In the terminology of the IEEE Standard, SoftFloat can detect tininess for
+underflow either before or after rounding.
+The choice is made by the global variable
+<BLOCKQUOTE>
+<CODE>uint_fast8_t softfloat_detectTininess;</CODE>
+</BLOCKQUOTE>
+which can be set to either
+<BLOCKQUOTE>
+<CODE>softfloat_tininess_beforeRounding</CODE><BR>
+<CODE>softfloat_tininess_afterRounding</CODE>
+</BLOCKQUOTE>
+Detecting tininess after rounding is usually better because it results in fewer
+spurious underflow signals.
+The other option is provided for compatibility with some systems.
+Like most systems (and as required by the newer 2008 IEEE Standard), SoftFloat
+always detects loss of accuracy for underflow as an inexact result.
+</P>
+
+<H3>6.3. Rounding Precision for the <NOBR>80-Bit</NOBR> Extended Format</H3>
+
+<P>
+For <CODE>extFloat80_t</CODE> only, the rounding precision of the basic
+arithmetic operations is controlled by the global variable
+<BLOCKQUOTE>
+<CODE>uint_fast8_t extF80_roundingPrecision;</CODE>
+</BLOCKQUOTE>
+The operations affected are:
+<BLOCKQUOTE>
+<CODE>extF80_add</CODE><BR>
+<CODE>extF80_sub</CODE><BR>
+<CODE>extF80_mul</CODE><BR>
+<CODE>extF80_div</CODE><BR>
+<CODE>extF80_sqrt</CODE>
+</BLOCKQUOTE>
+When <CODE>extF80_roundingPrecision</CODE> is set to its default value of 80,
+these operations are rounded to the full precision of the <NOBR>80-bit</NOBR>
+double-extended-precision format, like occurs for other formats.
+Setting <CODE>extF80_roundingPrecision</CODE> to 32 or to 64 causes the
+operations listed to be rounded to <NOBR>32-bit</NOBR> precision (equivalent to
+<CODE>float32_t</CODE>) or to <NOBR>64-bit</NOBR> precision (equivalent to
+<CODE>float64_t</CODE>), respectively.
+When rounding to reduced precision, additional bits in the result significand
+beyond the rounding point are set to zero.
+The consequences of setting <CODE>extF80_roundingPrecision</CODE> to a value
+other than 32, 64, or 80 is not specified.
+Operations other than the ones listed above are not affected by
+<CODE>extF80_roundingPrecision</CODE>.
+</P>
+
+
+<H2>7. Exceptions and Exception Flags</H2>
+
+<P>
+All five exception flags required by the IEEE Floating-Point Standard are
+implemented.
+Each flag is stored as a separate bit in the global variable
+<BLOCKQUOTE>
+<CODE>uint_fast8_t softfloat_exceptionFlags;</CODE>
+</BLOCKQUOTE>
+The positions of the exception flag bits within this variable are determined by
+the bit masks
+<BLOCKQUOTE>
+<CODE>softfloat_flag_inexact</CODE><BR>
+<CODE>softfloat_flag_underflow</CODE><BR>
+<CODE>softfloat_flag_overflow</CODE><BR>
+<CODE>softfloat_flag_infinite</CODE><BR>
+<CODE>softfloat_flag_invalid</CODE>
+</BLOCKQUOTE>
+Variable <CODE>softfloat_exceptionFlags</CODE> is initialized to all zeros,
+meaning no exceptions.
+</P>
+
+<P>
+For some SoftFloat ports, <CODE>softfloat_exceptionFlags</CODE> may be
+<I>per-thread</I> (declared <CODE>thread_local</CODE>), meaning that different
+execution threads have their own separate instances of it.
+</P>
+
+<P>
+An individual exception flag can be cleared with the statement
+<BLOCKQUOTE>
+<CODE>softfloat_exceptionFlags &= ~softfloat_flag_&lt;<I>exception</I>&gt;;</CODE>
+</BLOCKQUOTE>
+where <CODE>&lt;<I>exception</I>&gt;</CODE> is the appropriate name.
+To raise a floating-point exception, function <CODE>softfloat_raiseFlags</CODE>
+should normally be used.
+</P>
+
+<P>
+When SoftFloat detects an exception other than <I>inexact</I>, it calls
+<CODE>softfloat_raiseFlags</CODE>.
+The default version of this function simply raises the corresponding exception
+flags.
+Particular ports of SoftFloat may support alternate behavior, such as exception
+traps, by modifying the default <CODE>softfloat_raiseFlags</CODE>.
+A program may also supply its own <CODE>softfloat_raiseFlags</CODE> function to
+override the one from the SoftFloat library.
+</P>
+
+<P>
+Because inexact results occur frequently under most circumstances (and thus are
+hardly exceptional), SoftFloat does not ordinarily call
+<CODE>softfloat_raiseFlags</CODE> for <I>inexact</I> exceptions.
+It does always raise the <I>inexact</I> exception flag as required.
+</P>
+
+
+<H2>8. Function Details</H2>
+
+<P>
+In this section, <CODE>&lt;<I>float</I>&gt;</CODE> appears in function names as
+a substitute for one of these abbreviations:
+<BLOCKQUOTE>
+<TABLE CELLSPACING=0 CELLPADDING=0>
+<TR>
+<TD><CODE>f16</CODE></TD>
+<TD>indicates <CODE>float16_t</CODE>, passed by value</TD>
+</TR>
+<TR>
+<TD><CODE>f32</CODE></TD>
+<TD>indicates <CODE>float32_t</CODE>, passed by value</TD>
+</TR>
+<TR>
+<TD><CODE>f64</CODE></TD>
+<TD>indicates <CODE>float64_t</CODE>, passed by value</TD>
+</TR>
+<TR>
+<TD><CODE>extF80M&nbsp;&nbsp;&nbsp;</CODE></TD>
+<TD>indicates <CODE>extFloat80_t</CODE>, passed indirectly via pointers</TD>
+</TR>
+<TR>
+<TD><CODE>extF80</CODE></TD>
+<TD>indicates <CODE>extFloat80_t</CODE>, passed by value</TD>
+</TR>
+<TR>
+<TD><CODE>f128M</CODE></TD>
+<TD>indicates <CODE>float128_t</CODE>, passed indirectly via pointers</TD>
+</TR>
+<TR>
+<TD><CODE>f128</CODE></TD>
+<TD>indicates <CODE>float128_t</CODE>, passed by value</TD>
+</TR>
+</TABLE>
+</BLOCKQUOTE>
+The circumstances under which values of floating-point types
+<CODE>extFloat80_t</CODE> and <CODE>float128_t</CODE> may be passed either by
+value or indirectly via pointers was discussed earlier in
+<NOBR>section 4.5</NOBR>, <I>Conventions for Passing Arguments and Results</I>.
+</P>
+
+<H3>8.1. Conversions from Integer to Floating-Point</H3>
+
+<P>
+All conversions from a <NOBR>32-bit</NOBR> or <NOBR>64-bit</NOBR> integer,
+signed or unsigned, to a floating-point format are supported.
+Functions performing these conversions have these names:
+<BLOCKQUOTE>
+<CODE>ui32_to_&lt;<I>float</I>&gt;</CODE><BR>
+<CODE>ui64_to_&lt;<I>float</I>&gt;</CODE><BR>
+<CODE>i32_to_&lt;<I>float</I>&gt;</CODE><BR>
+<CODE>i64_to_&lt;<I>float</I>&gt;</CODE>
+</BLOCKQUOTE>
+Conversions from <NOBR>32-bit</NOBR> integers to <NOBR>64-bit</NOBR>
+double-precision and larger formats are always exact, and likewise conversions
+from <NOBR>64-bit</NOBR> integers to <NOBR>80-bit</NOBR>
+double-extended-precision and <NOBR>128-bit</NOBR> quadruple-precision are also
+always exact.
+</P>
+
+<P>
+Each conversion function takes one input of the appropriate type and generates
+one output.
+The following illustrates the signatures of these functions in cases when the
+floating-point result is passed either by value or via pointers:
+<BLOCKQUOTE>
+<PRE>
+float64_t i32_to_f64( int32_t <I>a</I> );
+</PRE>
+<PRE>
+void i32_to_f128M( int32_t <I>a</I>, float128_t *<I>destPtr</I> );
+</PRE>
+</BLOCKQUOTE>
+</P>
+
+<H3>8.2. Conversions from Floating-Point to Integer</H3>
+
+<P>
+Conversions from a floating-point format to a <NOBR>32-bit</NOBR> or
+<NOBR>64-bit</NOBR> integer, signed or unsigned, are supported with these
+functions:
+<BLOCKQUOTE>
+<CODE>&lt;<I>float</I>&gt;_to_ui32</CODE><BR>
+<CODE>&lt;<I>float</I>&gt;_to_ui64</CODE><BR>
+<CODE>&lt;<I>float</I>&gt;_to_i32</CODE><BR>
+<CODE>&lt;<I>float</I>&gt;_to_i64</CODE>
+</BLOCKQUOTE>
+The functions have signatures as follows, depending on whether the
+floating-point input is passed by value or via pointers:
+<BLOCKQUOTE>
+<PRE>
+int_fast32_t f64_to_i32( float64_t <I>a</I>, uint_fast8_t <I>roundingMode</I>, bool <I>exact</I> );
+</PRE>
+<PRE>
+int_fast32_t
+ f128M_to_i32( const float128_t *<I>aPtr</I>, uint_fast8_t <I>roundingMode</I>, bool <I>exact</I> );
+</PRE>
+</BLOCKQUOTE>
+</P>
+
+<P>
+The <CODE><I>roundingMode</I></CODE> argument specifies the rounding mode for
+the conversion.
+The variable that usually indicates rounding mode,
+<CODE>softfloat_roundingMode</CODE>, is ignored.
+Argument <CODE><I>exact</I></CODE> determines whether the <I>inexact</I>
+exception flag is raised if the conversion is not exact.
+If <CODE><I>exact</I></CODE> is <CODE>true</CODE>, the <I>inexact</I> flag may
+be raised;
+otherwise, it will not be, even if the conversion is inexact.
+</P>
+
+<P>
+A conversion from floating-point to integer format raises the <I>invalid</I>
+exception if the source value cannot be rounded to a representable integer of
+the desired size (32 or 64 bits).
+In such circumstances, the integer result returned is determined by the
+particular port of SoftFloat, although typically this value will be either the
+maximum or minimum value of the integer format.
+The functions that convert to integer types never raise the floating-point
+<I>overflow</I> exception.
+</P>
+
+<P>
+Because languages such <NOBR>as C</NOBR> require that conversions to integers
+be rounded toward zero, the following functions are provided for improved speed
+and convenience:
+<BLOCKQUOTE>
+<CODE>&lt;<I>float</I>&gt;_to_ui32_r_minMag</CODE><BR>
+<CODE>&lt;<I>float</I>&gt;_to_ui64_r_minMag</CODE><BR>
+<CODE>&lt;<I>float</I>&gt;_to_i32_r_minMag</CODE><BR>
+<CODE>&lt;<I>float</I>&gt;_to_i64_r_minMag</CODE>
+</BLOCKQUOTE>
+These functions round only toward zero (to minimum magnitude).
+The signatures for these functions are the same as above without the redundant
+<CODE><I>roundingMode</I></CODE> argument:
+<BLOCKQUOTE>
+<PRE>
+int_fast32_t f64_to_i32_r_minMag( float64_t <I>a</I>, bool <I>exact</I> );
+</PRE>
+<PRE>
+int_fast32_t f128M_to_i32_r_minMag( const float128_t *<I>aPtr</I>, bool <I>exact</I> );
+</PRE>
+</BLOCKQUOTE>
+</P>
+
+<H3>8.3. Conversions Among Floating-Point Types</H3>
+
+<P>
+Conversions between floating-point formats are done by functions with these
+names:
+<BLOCKQUOTE>
+<CODE>&lt;<I>float</I>&gt;_to_&lt;<I>float</I>&gt;</CODE>
+</BLOCKQUOTE>
+All combinations of source and result type are supported where the source and
+result are different formats.
+There are four different styles of signature for these functions, depending on
+whether the input and the output floating-point values are passed by value or
+via pointers:
+<BLOCKQUOTE>
+<PRE>
+float32_t f64_to_f32( float64_t <I>a</I> );
+</PRE>
+<PRE>
+float32_t f128M_to_f32( const float128_t *<I>aPtr</I> );
+</PRE>
+<PRE>
+void f32_to_f128M( float32_t <I>a</I>, float128_t *<I>destPtr</I> );
+</PRE>
+<PRE>
+void extF80M_to_f128M( const extFloat80_t *<I>aPtr</I>, float128_t *<I>destPtr</I> );
+</PRE>
+</BLOCKQUOTE>
+</P>
+
+<P>
+Conversions from a smaller to a larger floating-point format are always exact
+and so require no rounding.
+</P>
+
+<H3>8.4. Basic Arithmetic Functions</H3>
+
+<P>
+The following basic arithmetic functions are provided:
+<BLOCKQUOTE>
+<CODE>&lt;<I>float</I>&gt;_add</CODE><BR>
+<CODE>&lt;<I>float</I>&gt;_sub</CODE><BR>
+<CODE>&lt;<I>float</I>&gt;_mul</CODE><BR>
+<CODE>&lt;<I>float</I>&gt;_div</CODE><BR>
+<CODE>&lt;<I>float</I>&gt;_sqrt</CODE>
+</BLOCKQUOTE>
+Each floating-point operation takes two operands, except for <CODE>sqrt</CODE>
+(square root) which takes only one.
+The operands and result are all of the same floating-point format.
+Signatures for these functions take the following forms:
+<BLOCKQUOTE>
+<PRE>
+float64_t f64_add( float64_t <I>a</I>, float64_t <I>b</I> );
+</PRE>
+<PRE>
+void
+ f128M_add(
+     const float128_t *<I>aPtr</I>, const float128_t *<I>bPtr</I>, float128_t *<I>destPtr</I> );
+</PRE>
+<PRE>
+float64_t f64_sqrt( float64_t <I>a</I> );
+</PRE>
+<PRE>
+void f128M_sqrt( const float128_t *<I>aPtr</I>, float128_t *<I>destPtr</I> );
+</PRE>
+</BLOCKQUOTE>
+When floating-point values are passed indirectly through pointers, arguments
+<CODE><I>aPtr</I></CODE> and <CODE><I>bPtr</I></CODE> point to the input
+operands, and the last argument, <CODE><I>destPtr</I></CODE>, points to the
+location where the result is stored.
+</P>
+
+<P>
+Rounding of the <NOBR>80-bit</NOBR> double-extended-precision
+(<CODE>extFloat80_t</CODE>) functions is affected by variable
+<CODE>extF80_roundingPrecision</CODE>, as explained earlier in
+<NOBR>section 6.3</NOBR>,
+<I>Rounding Precision for the <NOBR>80-Bit</NOBR> Extended Format</I>.
+</P>
+
+<H3>8.5. Fused Multiply-Add Functions</H3>
+
+<P>
+The 2008 version of the IEEE Floating-Point Standard defines a <I>fused
+multiply-add</I> operation that does a combined multiplication and addition
+with only a single rounding.
+SoftFloat implements fused multiply-add with functions
+<BLOCKQUOTE>
+<CODE>&lt;<I>float</I>&gt;_mulAdd</CODE>
+</BLOCKQUOTE>
+Unlike other operations, fused multiple-add is not supported for the
+<NOBR>80-bit</NOBR> double-extended-precision format,
+<CODE>extFloat80_t</CODE>.
+</P>
+
+<P>
+Depending on whether floating-point values are passed by value or via pointers,
+the fused multiply-add functions have signatures of these forms:
+<BLOCKQUOTE>
+<PRE>
+float64_t f64_mulAdd( float64_t <I>a</I>, float64_t <I>b</I>, float64_t <I>c</I> );
+</PRE>
+<PRE>
+void
+ f128M_mulAdd(
+     const float128_t *<I>aPtr</I>,
+     const float128_t *<I>bPtr</I>,
+     const float128_t *<I>cPtr</I>,
+     float128_t *<I>destPtr</I>
+ );
+</PRE>
+</BLOCKQUOTE>
+The functions compute
+<NOBR>(<CODE><I>a</I></CODE> &times; <CODE><I>b</I></CODE>)
+ + <CODE><I>c</I></CODE></NOBR>
+with a single rounding.
+When floating-point values are passed indirectly through pointers, arguments
+<CODE><I>aPtr</I></CODE>, <CODE><I>bPtr</I></CODE>, and
+<CODE><I>cPtr</I></CODE> point to operands <CODE><I>a</I></CODE>,
+<CODE><I>b</I></CODE>, and <CODE><I>c</I></CODE> respectively, and
+<CODE><I>destPtr</I></CODE> points to the location where the result is stored.
+</P>
+
+<P>
+If one of the multiplication operands <CODE><I>a</I></CODE> and
+<CODE><I>b</I></CODE> is infinite and the other is zero, these functions raise
+the invalid exception even if operand <CODE><I>c</I></CODE> is a quiet NaN.
+</P>
+
+<H3>8.6. Remainder Functions</H3>
+
+<P>
+For each format, SoftFloat implements the remainder operation defined by the
+IEEE Floating-Point Standard.
+The remainder functions have names
+<BLOCKQUOTE>
+<CODE>&lt;<I>float</I>&gt;_rem</CODE>
+</BLOCKQUOTE>
+Each remainder operation takes two floating-point operands of the same format
+and returns a result in the same format.
+Depending on whether floating-point values are passed by value or via pointers,
+the remainder functions have signatures of these forms:
+<BLOCKQUOTE>
+<PRE>
+float64_t f64_rem( float64_t <I>a</I>, float64_t <I>b</I> );
+</PRE>
+<PRE>
+void
+ f128M_rem(
+     const float128_t *<I>aPtr</I>, const float128_t *<I>bPtr</I>, float128_t *<I>destPtr</I> );
+</PRE>
+</BLOCKQUOTE>
+When floating-point values are passed indirectly through pointers, arguments
+<CODE><I>aPtr</I></CODE> and <CODE><I>bPtr</I></CODE> point to operands
+<CODE><I>a</I></CODE> and <CODE><I>b</I></CODE> respectively, and
+<CODE><I>destPtr</I></CODE> points to the location where the result is stored.
+</P>
+
+<P>
+The IEEE Standard remainder operation computes the value
+<NOBR><CODE><I>a</I></CODE>
+ &minus; <I>n</I> &times; <CODE><I>b</I></CODE></NOBR>,
+where <I>n</I> is the integer closest to
+<NOBR><CODE><I>a</I></CODE> &divide; <CODE><I>b</I></CODE></NOBR>.
+If <NOBR><CODE><I>a</I></CODE> &divide; <CODE><I>b</I></CODE></NOBR> is exactly
+halfway between two integers, <I>n</I> is the <EM>even</EM> integer closest to
+<NOBR><CODE><I>a</I></CODE> &divide; <CODE><I>b</I></CODE></NOBR>.
+The IEEE Standard&rsquo;s remainder operation is always exact and so requires
+no rounding.
+</P>
+
+<P>
+Depending on the relative magnitudes of the operands, the remainder
+functions can take considerably longer to execute than the other SoftFloat
+functions.
+This is an inherent characteristic of the remainder operation itself and is not
+a flaw in the SoftFloat implementation.
+</P>
+
+<H3>8.7. Round-to-Integer Functions</H3>
+
+<P>
+For each format, SoftFloat implements the round-to-integer operation specified
+by the IEEE Floating-Point Standard.
+These functions are named
+<BLOCKQUOTE>
+<CODE>&lt;<I>float</I>&gt;_roundToInt</CODE>
+</BLOCKQUOTE>
+Each round-to-integer operation takes a single floating-point operand.
+This operand is rounded to an integer according to a specified rounding mode,
+and the resulting integer value is returned in the same floating-point format.
+(Note that the result is not an integer type.)
+</P>
+
+<P>
+The signatures of the round-to-integer functions are similar to those for
+conversions to an integer type:
+<BLOCKQUOTE>
+<PRE>
+float64_t f64_roundToInt( float64_t <I>a</I>, uint_fast8_t <I>roundingMode</I>, bool <I>exact</I> );
+</PRE>
+<PRE>
+void
+ f128M_roundToInt(
+     const float128_t *<I>aPtr</I>,
+     uint_fast8_t <I>roundingMode</I>,
+     bool <I>exact</I>,
+     float128_t *<I>destPtr</I>
+ );
+</PRE>
+</BLOCKQUOTE>
+When floating-point values are passed indirectly through pointers,
+<CODE><I>aPtr</I></CODE> points to the input operand and
+<CODE><I>destPtr</I></CODE> points to the location where the result is stored.
+</P>
+
+<P>
+The <CODE><I>roundingMode</I></CODE> argument specifies the rounding mode to
+apply.
+The variable that usually indicates rounding mode,
+<CODE>softfloat_roundingMode</CODE>, is ignored.
+Argument <CODE><I>exact</I></CODE> determines whether the <I>inexact</I>
+exception flag is raised if the conversion is not exact.
+If <CODE><I>exact</I></CODE> is <CODE>true</CODE>, the <I>inexact</I> flag may
+be raised;
+otherwise, it will not be, even if the conversion is inexact.
+</P>
+
+<H3>8.8. Comparison Functions</H3>
+
+<P>
+For each format, the following floating-point comparison functions are
+provided:
+<BLOCKQUOTE>
+<CODE>&lt;<I>float</I>&gt;_eq</CODE><BR>
+<CODE>&lt;<I>float</I>&gt;_le</CODE><BR>
+<CODE>&lt;<I>float</I>&gt;_lt</CODE>
+</BLOCKQUOTE>
+Each comparison takes two operands of the same type and returns a Boolean.
+The abbreviation <CODE>eq</CODE> stands for &ldquo;equal&rdquo; (=);
+<CODE>le</CODE> stands for &ldquo;less than or equal&rdquo; (&le;);
+and <CODE>lt</CODE> stands for &ldquo;less than&rdquo; (&lt;).
+Depending on whether the floating-point operands are passed by value or via
+pointers, the comparison functions have signatures of these forms:
+<BLOCKQUOTE>
+<PRE>
+bool f64_eq( float64_t <I>a</I>, float64_t <I>b</I> );
+</PRE>
+<PRE>
+bool f128M_eq( const float128_t *<I>aPtr</I>, const float128_t *<I>bPtr</I> );
+</PRE>
+</BLOCKQUOTE>
+</P>
+
+<P>
+The usual greater-than (&gt;), greater-than-or-equal (&ge;), and not-equal
+(&ne;) comparisons are easily obtained from the functions provided.
+The not-equal function is just the logical complement of the equal function.
+The greater-than-or-equal function is identical to the less-than-or-equal
+function with the arguments in reverse order, and likewise the greater-than
+function is identical to the less-than function with the arguments reversed.
+</P>
+
+<P>
+The IEEE Floating-Point Standard specifies that the less-than-or-equal and
+less-than comparisons by default raise the <I>invalid</I> exception if either
+operand is any kind of NaN.
+Equality comparisons, on the other hand, are defined by default to raise the
+<I>invalid</I> exception only for signaling NaNs, not quiet NaNs.
+For completeness, SoftFloat provides these complementary functions:
+<BLOCKQUOTE>
+<CODE>&lt;<I>float</I>&gt;_eq_signaling</CODE><BR>
+<CODE>&lt;<I>float</I>&gt;_le_quiet</CODE><BR>
+<CODE>&lt;<I>float</I>&gt;_lt_quiet</CODE>
+</BLOCKQUOTE>
+The <CODE>signaling</CODE> equality comparisons are identical to the default
+equality comparisons except that the <I>invalid</I> exception is raised for any
+NaN input, not just for signaling NaNs.
+Similarly, the <CODE>quiet</CODE> comparison functions are identical to their
+default counterparts except that the <I>invalid</I> exception is not raised for
+quiet NaNs.
+</P>
+
+<H3>8.9. Signaling NaN Test Functions</H3>
+
+<P>
+Functions for testing whether a floating-point value is a signaling NaN are
+provided with these names:
+<BLOCKQUOTE>
+<CODE>&lt;<I>float</I>&gt;_isSignalingNaN</CODE>
+</BLOCKQUOTE>
+The functions take one floating-point operand and return a Boolean indicating
+whether the operand is a signaling NaN.
+Accordingly, the functions have the forms
+<BLOCKQUOTE>
+<PRE>
+bool f64_isSignalingNaN( float64_t <I>a</I> );
+</PRE>
+<PRE>
+bool f128M_isSignalingNaN( const float128_t *<I>aPtr</I> );
+</PRE>
+</BLOCKQUOTE>
+</P>
+
+<H3>8.10. Raise-Exception Function</H3>
+
+<P>
+SoftFloat provides a single function for raising floating-point exceptions:
+<BLOCKQUOTE>
+<PRE>
+void softfloat_raiseFlags( uint_fast8_t <I>exceptions</I> );
+</PRE>
+</BLOCKQUOTE>
+The <CODE><I>exceptions</I></CODE> argument is a mask indicating the set of
+exceptions to raise.
+(See earlier section 7, <I>Exceptions and Exception Flags</I>.)
+In addition to setting the specified exception flags in variable
+<CODE>softfloat_exceptionFlags</CODE>, the <CODE>softfloat_raiseFlags</CODE>
+function may cause a trap or abort appropriate for the current system.
+</P>
+
+
+<H2>9. Changes from SoftFloat <NOBR>Release 2</NOBR></H2>
+
+<P>
+Apart from a change in the legal use license, <NOBR>Release 3</NOBR> of
+SoftFloat introduced numerous technical differences compared to earlier
+releases.
+</P>
+
+<H3>9.1. Name Changes</H3>
+
+<P>
+The most obvious and pervasive difference compared to <NOBR>Release 2</NOBR>
+is that the names of most functions and variables have changed, even when the
+behavior has not.
+First, the floating-point types, the mode variables, the exception flags
+variable, the function to raise exceptions, and various associated constants
+have been renamed as follows:
+<BLOCKQUOTE>
+<TABLE>
+<TR>
+<TD>old name, Release 2:</TD>
+<TD>new name, Release 3:</TD>
+</TR>
+<TR>
+<TD><CODE>float32</CODE></TD>
+<TD><CODE>float32_t</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>float64</CODE></TD>
+<TD><CODE>float64_t</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>floatx80</CODE></TD>
+<TD><CODE>extFloat80_t</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>float128</CODE></TD>
+<TD><CODE>float128_t</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>float_rounding_mode</CODE></TD>
+<TD><CODE>softfloat_roundingMode</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>float_round_nearest_even</CODE></TD>
+<TD><CODE>softfloat_round_near_even</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>float_round_to_zero</CODE></TD>
+<TD><CODE>softfloat_round_minMag</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>float_round_down</CODE></TD>
+<TD><CODE>softfloat_round_min</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>float_round_up</CODE></TD>
+<TD><CODE>softfloat_round_max</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>float_detect_tininess</CODE></TD>
+<TD><CODE>softfloat_detectTininess</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>float_tininess_before_rounding&nbsp;&nbsp;&nbsp;&nbsp;</CODE></TD>
+<TD><CODE>softfloat_tininess_beforeRounding</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>float_tininess_after_rounding</CODE></TD>
+<TD><CODE>softfloat_tininess_afterRounding</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>floatx80_rounding_precision</CODE></TD>
+<TD><CODE>extF80_roundingPrecision</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>float_exception_flags</CODE></TD>
+<TD><CODE>softfloat_exceptionFlags</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>float_flag_inexact</CODE></TD>
+<TD><CODE>softfloat_flag_inexact</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>float_flag_underflow</CODE></TD>
+<TD><CODE>softfloat_flag_underflow</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>float_flag_overflow</CODE></TD>
+<TD><CODE>softfloat_flag_overflow</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>float_flag_divbyzero</CODE></TD>
+<TD><CODE>softfloat_flag_infinite</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>float_flag_invalid</CODE></TD>
+<TD><CODE>softfloat_flag_invalid</CODE></TD>
+</TR>
+<TR>
+<TD><CODE>float_raise</CODE></TD>
+<TD><CODE>softfloat_raiseFlags</CODE></TD>
+</TR>
+</TABLE>
+</BLOCKQUOTE>
+</P>
+
+<P>
+Furthermore, <NOBR>Release 3</NOBR> adopted the following new abbreviations for
+function names:
+<BLOCKQUOTE>
+<TABLE>
+<TR>
+<TD>used in names in Release 2:<CODE>&nbsp;&nbsp;&nbsp;&nbsp;</CODE></TD>
+<TD>used in names in Release 3:</TD>
+</TR>
+<TR> <TD><CODE>int32</CODE></TD>    <TD><CODE>i32</CODE></TD>    </TR>
+<TR> <TD><CODE>int64</CODE></TD>    <TD><CODE>i64</CODE></TD>    </TR>
+<TR> <TD><CODE>float32</CODE></TD>  <TD><CODE>f32</CODE></TD>    </TR>
+<TR> <TD><CODE>float64</CODE></TD>  <TD><CODE>f64</CODE></TD>    </TR>
+<TR> <TD><CODE>floatx80</CODE></TD> <TD><CODE>extF80</CODE></TD> </TR>
+<TR> <TD><CODE>float128</CODE></TD> <TD><CODE>f128</CODE></TD>   </TR>
+</TABLE>
+</BLOCKQUOTE>
+Thus, for example, the function to add two <NOBR>32-bit</NOBR> floating-point
+numbers, previously called <CODE>float32_add</CODE> in <NOBR>Release 2</NOBR>,
+is now <CODE>f32_add</CODE>.
+Lastly, there have been a few other changes to function names:
+<BLOCKQUOTE>
+<TABLE>
+<TR>
+<TD>used in names in Release 2:<CODE>&nbsp;&nbsp;&nbsp;</CODE></TD>
+<TD>used in names in Release 3:<CODE>&nbsp;&nbsp;&nbsp;</CODE></TD>
+<TD>relevant functions:</TD>
+</TR>
+<TR>
+<TD><CODE>_round_to_zero</CODE></TD>
+<TD><CODE>_r_minMag</CODE></TD>
+<TD>conversions from floating-point to integer (<NOBR>section 8.2</NOBR>)</TD>
+</TR>
+<TR>
+<TD><CODE>round_to_int</CODE></TD>
+<TD><CODE>roundToInt</CODE></TD>
+<TD>round-to-integer functions (<NOBR>section 8.7</NOBR>)</TD>
+</TR>
+<TR>
+<TD><CODE>is_signaling_nan&nbsp;&nbsp;&nbsp;&nbsp;</CODE></TD>
+<TD><CODE>isSignalingNaN</CODE></TD>
+<TD>signaling NaN test functions (<NOBR>section 8.9</NOBR>)</TD>
+</TR>
+</TABLE>
+</BLOCKQUOTE>
+</P>
+
+<H3>9.2. Changes to Function Arguments</H3>
+
+<P>
+Besides simple name changes, some operations were given a different interface
+in <NOBR>Release 3</NOBR> than they had in <NOBR>Release 2</NOBR>:
+<UL>
+
+<LI>
+<P>
+Since <NOBR>Release 3</NOBR>, integer arguments and results of functions have
+standard types from header <CODE>&lt;stdint.h&gt;</CODE>, such as
+<CODE>uint32_t</CODE>, whereas previously their types could be defined
+differently for each port of SoftFloat, usually using traditional C types such
+as <CODE>unsigned</CODE> <CODE>int</CODE>.
+Likewise, functions in <NOBR>Release 3</NOBR> and later pass Booleans as
+standard type <CODE>bool</CODE> from <CODE>&lt;stdbool.h&gt;</CODE>, whereas
+previously these were again passed as a port-specific type (usually
+<CODE>int</CODE>).
+</P>
+
+<LI>
+<P>
+As explained earlier in <NOBR>section 4.5</NOBR>, <I>Conventions for Passing
+Arguments and Results</I>, SoftFloat functions in <NOBR>Release 3</NOBR> and
+later may pass <NOBR>80-bit</NOBR> and <NOBR>128-bit</NOBR> floating-point
+values through pointers, meaning that functions take pointer arguments and then
+read or write floating-point values at the locations indicated by the pointers.
+In <NOBR>Release 2</NOBR>, floating-point arguments and results were always
+passed by value, regardless of their size.
+</P>
+
+<LI>
+<P>
+Functions that round to an integer have additional
+<CODE><I>roundingMode</I></CODE> and <CODE><I>exact</I></CODE> arguments that
+they did not have in <NOBR>Release 2</NOBR>.
+Refer to sections 8.2 <NOBR>and 8.7</NOBR> for descriptions of these functions
+since <NOBR>Release 3</NOBR>.
+For <NOBR>Release 2</NOBR>, the rounding mode, when needed, was taken from the
+same global variable that affects the basic arithmetic operations (now called
+<CODE>softfloat_roundingMode</CODE> but previously known as
+<CODE>float_rounding_mode</CODE>).
+Also, for <NOBR>Release 2</NOBR>, if the original floating-point input was not
+an exact integer value, and if the <I>invalid</I> exception was not raised by
+the function, the <I>inexact</I> exception was always raised.
+<NOBR>Release 2</NOBR> had no option to suppress raising <I>inexact</I> in this
+case.
+Applications using SoftFloat <NOBR>Release 3</NOBR> or later can get the same
+effect as <NOBR>Release 2</NOBR> by passing variable
+<CODE>softfloat_roundingMode</CODE> for argument
+<CODE><I>roundingMode</I></CODE> and <CODE>true</CODE> for argument
+<CODE><I>exact</I></CODE>.
+</P>
+
+</UL>
+</P>
+
+<H3>9.3. Added Capabilities</H3>
+
+<P>
+With <NOBR>Release 3</NOBR>, some new features have been added that were not
+present in <NOBR>Release 2</NOBR>:
+<UL>
+
+<LI>
+<P>
+A port of SoftFloat can now define any of the floating-point types
+<CODE>float32_t</CODE>, <CODE>float64_t</CODE>, <CODE>extFloat80_t</CODE>, and
+<CODE>float128_t</CODE> as aliases for C&rsquo;s standard floating-point types
+<CODE>float</CODE>, <CODE>double</CODE>, and <CODE>long</CODE>
+<CODE>double</CODE>, using either <CODE>#define</CODE> or <CODE>typedef</CODE>.
+This potential convenience was not supported under <NOBR>Release 2</NOBR>.
+</P>
+
+<P>
+(Note, however, that there may be a performance cost to defining
+SoftFloat&rsquo;s floating-point types this way, depending on the platform and
+the applications using SoftFloat.
+Ports of SoftFloat may choose to forgo the convenience in favor of better
+speed.)
+</P>
+
+<P>
+<LI>
+As of <NOBR>Release 3b</NOBR>, <NOBR>16-bit</NOBR> half-precision,
+<CODE>float16_t</CODE>, is supported.
+</P>
+
+<P>
+<LI>
+Functions have been added for converting between the floating-point types and
+unsigned integers.
+<NOBR>Release 2</NOBR> supported only signed integers, not unsigned.
+</P>
+
+<P>
+<LI>
+Fused multiply-add functions have been added for all floating-point formats
+except <NOBR>80-bit</NOBR> double-extended-precision,
+<CODE>extFloat80_t</CODE>.
+</P>
+
+<P>
+<LI>
+New rounding modes are supported:
+<CODE>softfloat_round_near_maxMag</CODE> (round to nearest, with ties to
+maximum magnitude, away from zero), and, as of <NOBR>Release 3c</NOBR>,
+optional <CODE>softfloat_round_odd</CODE> (round to odd, also known as
+jamming).
+</P>
+
+</UL>
+</P>
+
+<H3>9.4. Better Compatibility with the C Language</H3>
+
+<P>
+<NOBR>Release 3</NOBR> of SoftFloat was written to conform better to the ISO C
+Standard&rsquo;s rules for portability.
+For example, older releases of SoftFloat employed type conversions in ways
+that, while commonly practiced, are not fully defined by the C Standard.
+Such problematic type conversions have generally been replaced by the use of
+unions, the behavior around which is more strictly regulated these days.
+</P>
+
+<H3>9.5. New Organization as a Library</H3>
+
+<P>
+Starting with <NOBR>Release 3</NOBR>, SoftFloat now builds as a library.
+Previously, SoftFloat compiled into a single, monolithic object file containing
+all the SoftFloat functions, with the consequence that a program linking with
+SoftFloat would get every SoftFloat function in its binary file even if only a
+few functions were actually used.
+With SoftFloat in the form of a library, a program that is linked by a standard
+linker will include only those functions of SoftFloat that it needs and no
+others.
+</P>
+
+<H3>9.6. Optimization Gains (and Losses)</H3>
+
+<P>
+Individual SoftFloat functions have been variously improved in
+<NOBR>Release 3</NOBR> compared to earlier releases.
+In particular, better, faster algorithms have been deployed for the operations
+of division, square root, and remainder.
+For functions operating on the larger <NOBR>80-bit</NOBR> and
+<NOBR>128-bit</NOBR> formats, <CODE>extFloat80_t</CODE> and
+<CODE>float128_t</CODE>, code size has also generally been reduced.
+</P>
+
+<P>
+However, because <NOBR>Release 2</NOBR> compiled all of SoftFloat together as a
+single object file, compilers could make optimizations across function calls
+when one SoftFloat function calls another.
+Now that the functions of SoftFloat are compiled separately and only afterward
+linked together into a program, there is not usually the same opportunity to
+optimize across function calls.
+Some loss of speed has been observed due to this change.
+</P>
+
+
+<H2>10. Future Directions</H2>
+
+<P>
+The following improvements are anticipated for future releases of SoftFloat:
+<UL>
+<LI>
+more functions from the 2008 version of the IEEE Floating-Point Standard;
+<LI>
+consistent, defined behavior for non-canonical representations of extended
+format <CODE>extFloat80_t</CODE> (discussed in <NOBR>section 4.4</NOBR>,
+<I>Non-canonical Representations in <CODE>extFloat80_t</CODE></I>).
+
+</UL>
+</P>
+
+
+<H2>11. Contact Information</H2>
+
+<P>
+At the time of this writing, the most up-to-date information about SoftFloat
+and the latest release can be found at the Web page
+<A HREF="http://www.jhauser.us/arithmetic/SoftFloat.html"><NOBR><CODE>http://www.jhauser.us/arithmetic/SoftFloat.html</CODE></NOBR></A>.
+</P>
+
+
+</BODY>
+
diff --git a/src/cpu/softfloat3e/extF80_addsub.cc b/src/cpu/softfloat3e/extF80_addsub.cc
new file mode 100644
index 000000000..a60d2c6be
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_addsub.cc
@@ -0,0 +1,106 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+extern extFloat80_t softfloat_addMagsExtF80(uint16_t, uint64_t, uint16_t, uint64_t, bool, struct softfloat_status_t *);
+extern extFloat80_t softfloat_subMagsExtF80(uint16_t, uint64_t, uint16_t, uint64_t, bool, struct softfloat_status_t *);
+
+extFloat80_t extF80_add(extFloat80_t a, extFloat80_t b, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    uint64_t uiA0;
+    bool signA;
+    uint16_t uiB64;
+    uint64_t uiB0;
+    bool signB;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a) || extF80_isUnsupported(b)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        a.signExp = defaultNaNExtF80UI64;
+        a.signif = defaultNaNExtF80UI0;
+        return a;
+    }
+
+    uiA64 = a.signExp;
+    uiA0  = a.signif;
+    signA = signExtF80UI64(uiA64);
+
+    uiB64 = b.signExp;
+    uiB0  = b.signif;
+    signB = signExtF80UI64(uiB64);
+
+    if (signA == signB) {
+        return softfloat_addMagsExtF80(uiA64, uiA0, uiB64, uiB0, signA, status);
+    } else {
+        return softfloat_subMagsExtF80(uiA64, uiA0, uiB64, uiB0, signA, status);
+    }
+}
+
+extFloat80_t extF80_sub(extFloat80_t a, extFloat80_t b, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    uint64_t uiA0;
+    bool signA;
+    uint16_t uiB64;
+    uint64_t uiB0;
+    bool signB;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a) || extF80_isUnsupported(b)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        a.signExp = defaultNaNExtF80UI64;
+        a.signif = defaultNaNExtF80UI0;
+        return a;
+    }
+
+    uiA64 = a.signExp;
+    uiA0  = a.signif;
+    signA = signExtF80UI64(uiA64);
+
+    uiB64 = b.signExp;
+    uiB0  = b.signif;
+    signB = signExtF80UI64(uiB64);
+
+    if (signA == signB) {
+        return softfloat_subMagsExtF80(uiA64, uiA0, uiB64, uiB0, signA, status);
+    } else {
+        return softfloat_addMagsExtF80(uiA64, uiA0, uiB64, uiB0, signA, status);
+    }
+}
diff --git a/src/cpu/softfloat3e/extF80_class.cc b/src/cpu/softfloat3e/extF80_class.cc
new file mode 100644
index 000000000..155dc51a2
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_class.cc
@@ -0,0 +1,71 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "softfloat.h"
+
+softfloat_class_t extF80_class(extFloat80_t a)
+{
+    uint16_t uiA64;
+    uint64_t uiA0;
+    bool signA;
+    int32_t expA;
+    uint64_t sigA;
+
+    uiA64 = a.signExp;
+    uiA0  = a.signif;
+    signA = signExtF80UI64(uiA64);
+    expA  = expExtF80UI64(uiA64);
+    sigA  = uiA0;
+
+    if (! expA) {
+        if (! sigA) return softfloat_zero;
+        return softfloat_denormal; /* denormal or pseudo-denormal */
+    }
+
+    /* valid numbers have the MS bit set */
+    if (!(sigA & UINT64_C(0x8000000000000000)))
+        return softfloat_SNaN; /* report unsupported as SNaNs */
+
+    if (expA == 0x7FFF) {
+        if ((sigA<<1) == 0)
+            return (signA) ? softfloat_negative_inf : softfloat_positive_inf;
+
+        return (sigA & UINT64_C(0x4000000000000000)) ? softfloat_QNaN : softfloat_SNaN;
+    }
+
+    return softfloat_normalized;
+}
diff --git a/src/cpu/softfloat3e/extF80_compare.cc b/src/cpu/softfloat3e/extF80_compare.cc
new file mode 100644
index 000000000..f8a360a41
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_compare.cc
@@ -0,0 +1,147 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdio.h>
+#include <stdint.h>
+#include <86box/86box.h>
+#include "../cpu.h"
+
+#include "internals.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Compare  between  two extended precision  floating  point  numbers. Returns
+| 'float_relation_equal'  if the operands are equal, 'float_relation_less' if
+| the    value    'a'   is   less   than   the   corresponding   value   `b',
+| 'float_relation_greater' if the value 'a' is greater than the corresponding
+| value `b', or 'float_relation_unordered' otherwise.
+*----------------------------------------------------------------------------*/
+
+int extF80_compare(extFloat80_t a, extFloat80_t b, int quiet, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    uint64_t uiA0;
+    bool signA;
+    int32_t expA;
+    uint64_t sigA;
+
+    uint16_t uiB64;
+    uint64_t uiB0;
+    bool signB;
+    int32_t expB;
+    uint64_t sigB;
+
+    struct exp32_sig64 normExpSig;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    softfloat_class_t aClass = extF80_class(a);
+    softfloat_class_t bClass = extF80_class(b);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (fpu_type < FPU_287XL) {
+        if ((aClass == softfloat_positive_inf) && (bClass == softfloat_negative_inf))
+        {
+            return softfloat_relation_equal;
+        }
+
+        if ((aClass == softfloat_negative_inf) && (bClass == softfloat_positive_inf))
+        {
+            return softfloat_relation_equal;
+        }
+    }
+
+    if (aClass == softfloat_SNaN || bClass == softfloat_SNaN)
+    {
+        /* unsupported reported as SNaN */
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return softfloat_relation_unordered;
+    }
+
+    if (aClass == softfloat_QNaN || bClass == softfloat_QNaN) {
+        if (! quiet) softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return softfloat_relation_unordered;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (aClass == softfloat_denormal || bClass == softfloat_denormal) {
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.signExp;
+    uiA0  = a.signif;
+    signA = signExtF80UI64(uiA64);
+    expA  = expExtF80UI64(uiA64);
+    sigA  = uiA0;
+
+    uiB64 = b.signExp;
+    uiB0  = b.signif;
+    signB = signExtF80UI64(uiB64);
+    expB  = expExtF80UI64(uiB64);
+    sigB  = uiB0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (aClass == softfloat_zero) {
+        if (bClass == softfloat_zero) return softfloat_relation_equal;
+        return signB ? softfloat_relation_greater : softfloat_relation_less;
+    }
+
+    if (bClass == softfloat_zero || signA != signB) {
+        return signA ? softfloat_relation_less : softfloat_relation_greater;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (aClass == softfloat_denormal) {
+        normExpSig = softfloat_normSubnormalExtF80Sig(sigA);
+        expA += normExpSig.exp + 1;
+        sigA = normExpSig.sig;
+    }
+    if (bClass == softfloat_denormal) {
+        normExpSig = softfloat_normSubnormalExtF80Sig(sigB);
+        expB += normExpSig.exp + 1;
+        sigB = normExpSig.sig;
+    }
+
+    if (expA == expB && sigA == sigB)
+        return softfloat_relation_equal;
+
+    int less_than =
+        signA ? ((expB < expA) || ((expB == expA) && (sigB < sigA)))
+              : ((expA < expB) || ((expA == expB) && (sigA < sigB)));
+
+    if (less_than) return softfloat_relation_less;
+    return softfloat_relation_greater;
+}
diff --git a/src/cpu/softfloat3e/extF80_div.cc b/src/cpu/softfloat3e/extF80_div.cc
new file mode 100644
index 000000000..e4b1fbb24
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_div.cc
@@ -0,0 +1,188 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+extFloat80_t extF80_div(extFloat80_t a, extFloat80_t b, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    uint64_t uiA0;
+    bool signA;
+    int32_t expA;
+    uint64_t sigA;
+    uint16_t uiB64;
+    uint64_t uiB0;
+    bool signB;
+    int32_t expB;
+    uint64_t sigB;
+    bool signZ;
+    struct exp32_sig64 normExpSig;
+    int32_t expZ;
+    struct uint128 rem;
+    uint32_t recip32;
+    uint64_t sigZ;
+    int ix;
+    uint64_t q64;
+    uint32_t q;
+    struct uint128 term;
+    uint64_t sigZExtra;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a) || extF80_isUnsupported(b))
+        goto invalid;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.signExp;
+    uiA0  = a.signif;
+    signA = signExtF80UI64(uiA64);
+    expA  = expExtF80UI64(uiA64);
+    sigA  = uiA0;
+    uiB64 = b.signExp;
+    uiB0  = b.signif;
+    signB = signExtF80UI64(uiB64);
+    expB  = expExtF80UI64(uiB64);
+    sigB  = uiB0;
+    signZ = signA ^ signB;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x7FFF) {
+        if (sigA & UINT64_C(0x7FFFFFFFFFFFFFFF)) goto propagateNaN;
+        if (expB == 0x7FFF) {
+            if (sigB & UINT64_C(0x7FFFFFFFFFFFFFFF)) goto propagateNaN;
+            goto invalid;
+        }
+        if (! expB && sigB)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        return packToExtF80(signZ, 0x7FFF, UINT64_C(0x8000000000000000));
+    }
+    if (expB == 0x7FFF) {
+        if (sigB & UINT64_C(0x7FFFFFFFFFFFFFFF)) goto propagateNaN;
+        if (! expA && sigA)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        return packToExtF80(signZ, 0, 0);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expB) {
+        expB = 1;
+        if (sigB)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+    if (! (sigB & UINT64_C(0x8000000000000000))) {
+        if (! sigB) {
+            if (! sigA) goto invalid;
+            softfloat_raiseFlags(status, softfloat_flag_infinite);
+            return packToExtF80(signZ, 0x7FFF, UINT64_C(0x8000000000000000));
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalExtF80Sig(sigB);
+        expB += normExpSig.exp;
+        sigB = normExpSig.sig;
+    }
+    if (! expA) {
+        expA = 1;
+        if (sigA)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+    if (! (sigA & UINT64_C(0x8000000000000000))) {
+        if (! sigA) return packToExtF80(signZ, 0, 0);
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalExtF80Sig(sigA);
+        expA += normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expZ = expA - expB + 0x3FFF;
+    if (sigA < sigB) {
+        --expZ;
+        rem = softfloat_shortShiftLeft128(0, sigA, 32);
+    } else {
+        rem = softfloat_shortShiftLeft128(0, sigA, 31);
+    }
+    recip32 = softfloat_approxRecip32_1(sigB>>32);
+    sigZ = 0;
+    ix = 2;
+    for (;;) {
+        q64 = (uint64_t) (uint32_t) (rem.v64>>2) * recip32;
+        q = (q64 + 0x80000000)>>32;
+        --ix;
+        if (ix < 0) break;
+        rem = softfloat_shortShiftLeft128(rem.v64, rem.v0, 29);
+        term = softfloat_mul64ByShifted32To128(sigB, q);
+        rem = softfloat_sub128(rem.v64, rem.v0, term.v64, term.v0);
+        if (rem.v64 & UINT64_C(0x8000000000000000)) {
+            --q;
+            rem = softfloat_add128(rem.v64, rem.v0, sigB>>32, sigB<<32);
+        }
+        sigZ = (sigZ<<29) + q;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (((q + 1) & 0x3FFFFF) < 2) {
+        rem = softfloat_shortShiftLeft128(rem.v64, rem.v0, 29);
+        term = softfloat_mul64ByShifted32To128(sigB, q);
+        rem = softfloat_sub128(rem.v64, rem.v0, term.v64, term.v0);
+        term = softfloat_shortShiftLeft128(0, sigB, 32);
+        if (rem.v64 & UINT64_C(0x8000000000000000)) {
+            --q;
+            rem = softfloat_add128(rem.v64, rem.v0, term.v64, term.v0);
+        } else if (softfloat_le128(term.v64, term.v0, rem.v64, rem.v0)) {
+            ++q;
+            rem = softfloat_sub128(rem.v64, rem.v0, term.v64, term.v0);
+        }
+        if (rem.v64 | rem.v0) q |= 1;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sigZ = (sigZ<<6) + (q>>23);
+    sigZExtra = (uint64_t) ((uint64_t) q<<41);
+    return
+        softfloat_roundPackToExtF80(signZ, expZ, sigZ, sigZExtra, softfloat_extF80_roundingPrecision(status), status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    return softfloat_propagateNaNExtF80UI(uiA64, uiA0, uiB64, uiB0, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ invalid:
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    return packToExtF80_twoargs(defaultNaNExtF80UI64, defaultNaNExtF80UI0);
+}
diff --git a/src/cpu/softfloat3e/extF80_extract.cc b/src/cpu/softfloat3e/extF80_extract.cc
new file mode 100644
index 000000000..692190a47
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_extract.cc
@@ -0,0 +1,97 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Separate the source extended double-precision floating point value `a'
+| into its exponent and significand, store the significant back to the
+| 'a' and return the exponent. The operation performed is a superset of
+| the IEC/IEEE recommended logb(x) function.
+*----------------------------------------------------------------------------*/
+
+extFloat80_t extF80_extract(extFloat80_t *a, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    uint64_t uiA0;
+    bool signA;
+    int32_t expA;
+    uint64_t sigA;
+    struct exp32_sig64 normExpSig;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(*a)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        *a = packToExtF80_twoargs(defaultNaNExtF80UI64, defaultNaNExtF80UI0);
+        return *a;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a->signExp;
+    uiA0  = a->signif;
+    signA = signExtF80UI64(uiA64);
+    expA  = expExtF80UI64(uiA64);
+    sigA  = uiA0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x7FFF) {
+        if (sigA<<1) {
+            *a = softfloat_propagateNaNExtF80UI(uiA64, uiA0, 0, 0, status);
+            return *a;
+        }
+        return packToExtF80(0, 0x7FFF, BX_CONST64(0x8000000000000000));
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA) {
+        if (! sigA) {
+            softfloat_raiseFlags(status, softfloat_flag_divbyzero);
+            *a = packToExtF80(signA, 0, 0);
+            return packToExtF80(1, 0x7FFF, BX_CONST64(0x8000000000000000));
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalExtF80Sig(sigA);
+        expA = normExpSig.exp + 1;
+        sigA = normExpSig.sig;
+    }
+
+    *a = packToExtF80(signA, 0x3FFF, sigA);
+    return i32_to_extF80(expA - 0x3FFF);
+}
diff --git a/src/cpu/softfloat3e/extF80_mul.cc b/src/cpu/softfloat3e/extF80_mul.cc
new file mode 100644
index 000000000..d38e97f02
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_mul.cc
@@ -0,0 +1,153 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+extFloat80_t extF80_mul(extFloat80_t a, extFloat80_t b, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    uint64_t uiA0;
+    bool signA;
+    int32_t expA;
+    uint64_t sigA;
+    uint16_t uiB64;
+    uint64_t uiB0;
+    bool signB;
+    int32_t expB;
+    uint64_t sigB;
+    bool signZ;
+    uint64_t magBits;
+    struct exp32_sig64 normExpSig;
+    int32_t expZ;
+    struct uint128 sig128Z;
+    uint16_t uiZ64;
+    uint64_t uiZ0;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a) || extF80_isUnsupported(b)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return packToExtF80_twoargs(defaultNaNExtF80UI64, defaultNaNExtF80UI0);
+    }
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.signExp;
+    uiA0  = a.signif;
+    signA = signExtF80UI64(uiA64);
+    expA  = expExtF80UI64(uiA64);
+    sigA  = uiA0;
+    uiB64 = b.signExp;
+    uiB0  = b.signif;
+    signB = signExtF80UI64(uiB64);
+    expB  = expExtF80UI64(uiB64);
+    sigB  = uiB0;
+    signZ = signA ^ signB;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x7FFF) {
+        if ((sigA & UINT64_C(0x7FFFFFFFFFFFFFFF)) || ((expB == 0x7FFF) && (sigB & UINT64_C(0x7FFFFFFFFFFFFFFF)))) {
+            goto propagateNaN;
+        }
+        magBits = expB | sigB;
+        goto infArg;
+    }
+    if (expB == 0x7FFF) {
+        if (sigB & UINT64_C(0x7FFFFFFFFFFFFFFF)) goto propagateNaN;
+        magBits = expA | sigA;
+        goto infArg;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA) {
+        expA = 1;
+        if (sigA)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+    if (! (sigA & UINT64_C(0x8000000000000000))) {
+        if (! sigA) {
+            if (! expB && sigB)
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+            return packToExtF80(signZ, 0, 0);
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalExtF80Sig(sigA);
+        expA += normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    if (! expB) {
+        expB = 1;
+        if (sigB)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+    if (! (sigB & UINT64_C(0x8000000000000000))) {
+        if (! sigB) return packToExtF80(signZ, 0, 0);
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalExtF80Sig(sigB);
+        expB += normExpSig.exp;
+        sigB = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expZ = expA + expB - 0x3FFE;
+    sig128Z = softfloat_mul64To128(sigA, sigB);
+    if (sig128Z.v64 < UINT64_C(0x8000000000000000)) {
+        --expZ;
+        sig128Z = softfloat_add128(sig128Z.v64, sig128Z.v0, sig128Z.v64, sig128Z.v0);
+    }
+    return
+        softfloat_roundPackToExtF80(signZ, expZ, sig128Z.v64, sig128Z.v0, softfloat_extF80_roundingPrecision(status), status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    return softfloat_propagateNaNExtF80UI(uiA64, uiA0, uiB64, uiB0, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ infArg:
+    if (! magBits) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        uiZ64 = defaultNaNExtF80UI64;
+        uiZ0  = defaultNaNExtF80UI0;
+    } else {
+        if ((! expA && sigA) || (! expB && sigB))
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        uiZ64 = packToExtF80UI64(signZ, 0x7FFF);
+        uiZ0  = UINT64_C(0x8000000000000000);
+    }
+    return packToExtF80_twoargs(uiZ64, uiZ0);
+}
diff --git a/src/cpu/softfloat3e/extF80_rem.cc b/src/cpu/softfloat3e/extF80_rem.cc
new file mode 100644
index 000000000..39d233a7e
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_rem.cc
@@ -0,0 +1,199 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+extFloat80_t extF80_rem(extFloat80_t a, extFloat80_t b, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    uint64_t uiA0;
+    bool signA;
+    int32_t expA;
+    uint64_t sigA;
+    uint16_t uiB64;
+    uint64_t uiB0;
+    int32_t expB;
+    uint64_t sigB;
+    struct exp32_sig64 normExpSig;
+    int32_t expDiff;
+    struct uint128 rem, shiftedSigB;
+    uint32_t q, recip32;
+    uint64_t q64;
+    struct uint128 term, altRem, meanRem;
+    bool signRem;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a) || extF80_isUnsupported(b))
+        goto invalid;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.signExp;
+    uiA0  = a.signif;
+    signA = signExtF80UI64(uiA64);
+    expA  = expExtF80UI64(uiA64);
+    sigA  = uiA0;
+    uiB64 = b.signExp;
+    uiB0  = b.signif;
+    expB  = expExtF80UI64(uiB64);
+    sigB  = uiB0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x7FFF) {
+        if ((sigA & UINT64_C(0x7FFFFFFFFFFFFFFF)) || ((expB == 0x7FFF) && (sigB & UINT64_C(0x7FFFFFFFFFFFFFFF)))) {
+            goto propagateNaN;
+        }
+        goto invalid;
+    }
+    if (expB == 0x7FFF) {
+        if (sigB & UINT64_C(0x7FFFFFFFFFFFFFFF)) goto propagateNaN;
+        /*--------------------------------------------------------------------
+        | Argument b is an infinity.  Doubling `expB' is an easy way to ensure
+        | that `expDiff' later is less than -1, which will result in returning
+        | a canonicalized version of argument a.
+        *--------------------------------------------------------------------*/
+        expB += expB;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expB) {
+        expB = 1;
+        if (sigB)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+    if (! (sigB & UINT64_C(0x8000000000000000))) {
+        if (! sigB) goto invalid;
+        normExpSig = softfloat_normSubnormalExtF80Sig(sigB);
+        expB += normExpSig.exp;
+        sigB = normExpSig.sig;
+    }
+    if (! expA) {
+        expA = 1;
+        if (sigA)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+    if (! (sigA & UINT64_C(0x8000000000000000))) {
+        if (! sigA) {
+            expA = 0;
+            goto copyA;
+        }
+        normExpSig = softfloat_normSubnormalExtF80Sig(sigA);
+        expA += normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expDiff = expA - expB;
+    if (expDiff < -1) goto copyA;
+    rem = softfloat_shortShiftLeft128(0, sigA, 32);
+    shiftedSigB = softfloat_shortShiftLeft128(0, sigB, 32);
+    if (expDiff < 1) {
+        if (expDiff) {
+            --expB;
+            shiftedSigB = softfloat_shortShiftLeft128(0, sigB, 33);
+            q = 0;
+        } else {
+            q = (sigB <= sigA);
+            if (q) {
+                rem = softfloat_sub128(rem.v64, rem.v0, shiftedSigB.v64, shiftedSigB.v0);
+            }
+        }
+    } else {
+        recip32 = softfloat_approxRecip32_1(sigB>>32);
+        expDiff -= 30;
+        for (;;) {
+            q64 = (uint64_t) (uint32_t) (rem.v64>>2) * recip32;
+            if (expDiff < 0) break;
+            q = (q64 + 0x80000000)>>32;
+            rem = softfloat_shortShiftLeft128(rem.v64, rem.v0, 29);
+            term = softfloat_mul64ByShifted32To128(sigB, q);
+            rem = softfloat_sub128(rem.v64, rem.v0, term.v64, term.v0);
+            if (rem.v64 & UINT64_C(0x8000000000000000)) {
+                rem = softfloat_add128(rem.v64, rem.v0, shiftedSigB.v64, shiftedSigB.v0);
+            }
+            expDiff -= 29;
+        }
+        /*--------------------------------------------------------------------
+        | (`expDiff' cannot be less than -29 here.)
+        *--------------------------------------------------------------------*/
+        q = (uint32_t) (q64>>32)>>(~expDiff & 31);
+        rem = softfloat_shortShiftLeft128(rem.v64, rem.v0, expDiff + 30);
+        term = softfloat_mul64ByShifted32To128(sigB, q);
+        rem = softfloat_sub128(rem.v64, rem.v0, term.v64, term.v0);
+        if (rem.v64 & UINT64_C(0x8000000000000000)) {
+            altRem = softfloat_add128(rem.v64, rem.v0, shiftedSigB.v64, shiftedSigB.v0);
+            goto selectRem;
+        }
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    do {
+        altRem = rem;
+        ++q;
+        rem = softfloat_sub128(rem.v64, rem.v0, shiftedSigB.v64, shiftedSigB.v0);
+    } while (! (rem.v64 & UINT64_C(0x8000000000000000)));
+ selectRem:
+    meanRem = softfloat_add128(rem.v64, rem.v0, altRem.v64, altRem.v0);
+    if ((meanRem.v64 & UINT64_C(0x8000000000000000)) || (! (meanRem.v64 | meanRem.v0) && (q & 1))) {
+        rem = altRem;
+    }
+    signRem = signA;
+    if (rem.v64 & UINT64_C(0x8000000000000000)) {
+        signRem = ! signRem;
+        rem = softfloat_sub128(0, 0, rem.v64, rem.v0);
+    }
+    return softfloat_normRoundPackToExtF80(signRem, rem.v64 | rem.v0 ? expB + 32 : 0, rem.v64, rem.v0, 80, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    return softfloat_propagateNaNExtF80UI(uiA64, uiA0, uiB64, uiB0, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ invalid:
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    return packToExtF80_twoargs(defaultNaNExtF80UI64, defaultNaNExtF80UI0);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ copyA:
+    if (expA < 1) {
+        sigA >>= 1 - expA;
+        expA = 0;
+    }
+    return packToExtF80(signA, expA, sigA);
+}
diff --git a/src/cpu/softfloat3e/extF80_roundToInt.cc b/src/cpu/softfloat3e/extF80_roundToInt.cc
new file mode 100644
index 000000000..f71cdfc50
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_roundToInt.cc
@@ -0,0 +1,123 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2017 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+extFloat80_t
+ extF80_roundToInt(extFloat80_t a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    uint16_t uiA64, signUI64;
+    int32_t exp;
+    uint64_t sigA;
+    uint16_t uiZ64;
+    uint64_t sigZ;
+    uint64_t lastBitMask, roundBitsMask;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return packToExtF80_twoargs(defaultNaNExtF80UI64, defaultNaNExtF80UI0);
+    }
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.signExp;
+    signUI64 = uiA64 & packToExtF80UI64(1, 0);
+    exp = expExtF80UI64(uiA64);
+    sigA = a.signif;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (0x403E <= exp) {
+        if ((exp == 0x7FFF) && (uint64_t) (sigA<<1)) {
+            return softfloat_propagateNaNExtF80UI(uiA64, sigA, 0, 0, status);
+        }
+        return a;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp <= 0x3FFE) {
+        if (! exp) {
+            if ((sigA<<1) == 0) return a;
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        }
+        if (exact) softfloat_raiseFlags(status, softfloat_flag_inexact);
+        switch (roundingMode) {
+         case softfloat_round_near_even:
+            if (!(sigA & UINT64_C(0x7FFFFFFFFFFFFFFF))) break;
+         case softfloat_round_near_maxMag:
+            if (exp == 0x3FFE) goto mag1;
+            break;
+         case softfloat_round_min:
+            if (signUI64) goto mag1;
+            break;
+         case softfloat_round_max:
+            if (!signUI64) goto mag1;
+            break;
+        }
+        return packToExtF80(signUI64, 0, 0);
+     mag1:
+        softfloat_setRoundingUp(status);
+        return packToExtF80(signUI64, 0x3FFF, UINT64_C(0x8000000000000000));
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiZ64 = signUI64 | exp;
+    lastBitMask = (uint64_t) 1<<(0x403E - exp);
+    roundBitsMask = lastBitMask - 1;
+    sigZ = sigA;
+    if (roundingMode == softfloat_round_near_maxMag) {
+        sigZ += lastBitMask>>1;
+    } else if (roundingMode == softfloat_round_near_even) {
+        sigZ += lastBitMask>>1;
+        if (!(sigZ & roundBitsMask)) sigZ &= ~lastBitMask;
+    } else if (roundingMode == (signUI64 ? softfloat_round_min : softfloat_round_max)) {
+        sigZ += roundBitsMask;
+    }
+    sigZ &= ~roundBitsMask;
+    if (!sigZ) {
+        ++uiZ64;
+        sigZ = UINT64_C(0x8000000000000000);
+        softfloat_setRoundingUp(status);
+    }
+    if (sigZ != sigA) {
+        if (exact) softfloat_raiseFlags(status, softfloat_flag_inexact);
+        if (sigZ > sigA)
+            softfloat_setRoundingUp(status);
+    }
+    return packToExtF80_twoargs(uiZ64, sigZ);
+}
diff --git a/src/cpu/softfloat3e/extF80_scale.cc b/src/cpu/softfloat3e/extF80_scale.cc
new file mode 100644
index 000000000..48bd53afd
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_scale.cc
@@ -0,0 +1,136 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Scales extended double-precision floating-point value in operand `a' by
+| value `b'. The function truncates the value in the second operand 'b' to
+| an integral value and adds that value to the exponent of the operand 'a'.
+| The operation performed according to the IEC/IEEE Standard for Binary
+| Floating-Point Arithmetic.
+*----------------------------------------------------------------------------*/
+
+extFloat80_t extF80_scale(extFloat80_t a, extFloat80_t b, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    uint64_t uiA0;
+    bool signA;
+    int32_t expA;
+    uint64_t sigA;
+    uint16_t uiB64;
+    uint64_t uiB0;
+    bool signB;
+    int32_t expB;
+    uint64_t sigB;
+    struct exp32_sig64 normExpSig;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a) || extF80_isUnsupported(b)) {
+invalid:
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return packToExtF80_twoargs(defaultNaNExtF80UI64, defaultNaNExtF80UI0);
+    }
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.signExp;
+    uiA0  = a.signif;
+    signA = signExtF80UI64(uiA64);
+    expA  = expExtF80UI64(uiA64);
+    sigA  = uiA0;
+    uiB64 = b.signExp;
+    uiB0  = b.signif;
+    signB = signExtF80UI64(uiB64);
+    expB  = expExtF80UI64(uiB64);
+    sigB  = uiB0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+
+    if (expA == 0x7FFF) {
+        if ((sigA<<1) || ((expB == 0x7FFF) && (sigB<<1))) {
+            return softfloat_propagateNaNExtF80UI(uiA64, uiA0, uiB64, uiB0, status);
+        }
+        if ((expB == 0x7FFF) && signB) goto invalid;
+        if (sigB && !expB) softfloat_raiseFlags(status, softfloat_flag_denormal);
+        return a;
+    }
+    if (expB == 0x7FFF) {
+        if (sigB<<1) {
+            return softfloat_propagateNaNExtF80UI(uiA64, uiA0, uiB64, uiB0, status);
+        }
+        if ((expA | sigA) == 0) {
+            if (! signB) goto invalid;
+            return a;
+        }
+        if (sigA && !expA) softfloat_raiseFlags(status, softfloat_flag_denormal);
+        if (signB) return packToExtF80(signA, 0, 0);
+        return packToExtF80(signA, 0x7FFF, BX_CONST64(0x8000000000000000));
+    }
+    if (! expA) {
+        if (sigB && !expB) softfloat_raiseFlags(status, softfloat_flag_denormal);
+        if (! sigA) return a;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalExtF80Sig(sigA);
+        expA = normExpSig.exp + 1;
+        sigA = normExpSig.sig;
+        if (expB < 0x3FFF)
+            return softfloat_normRoundPackToExtF80(signA, expA, sigA, 0, 80, status);
+    }
+    if (!expB) {
+        if (!sigB) return a;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalExtF80Sig(sigB);
+        expB = normExpSig.exp + 1;
+        sigB = normExpSig.sig;
+    }
+
+    if (expB > 0x400E) {
+        /* generate appropriate overflow/underflow */
+        return softfloat_roundPackToExtF80(signA, signB ? -0x3FFF : 0x7FFF, sigA, 0, 80, status);
+    }
+
+    if (expB < 0x3FFF) return a;
+
+    int shiftCount = 0x403E - expB;
+    sigB >>= shiftCount;
+    int32_t scale = (int32_t) sigB;
+    if (signB) scale = -scale; /* -32768..32767 */
+
+    return softfloat_roundPackToExtF80(signA, expA + scale, sigA, 0, 80, status);
+}
diff --git a/src/cpu/softfloat3e/extF80_sqrt.cc b/src/cpu/softfloat3e/extF80_sqrt.cc
new file mode 100644
index 000000000..1a5d52e5d
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_sqrt.cc
@@ -0,0 +1,159 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+extFloat80_t extF80_sqrt(extFloat80_t a, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    uint64_t uiA0;
+    bool signA;
+    int32_t expA;
+    uint64_t sigA;
+    struct exp32_sig64 normExpSig;
+    int32_t expZ;
+    uint32_t sig32A, recipSqrt32, sig32Z;
+    struct uint128 rem;
+    uint64_t q, x64, sigZ;
+    struct uint128 y, term;
+    uint64_t sigZExtra;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a))
+        goto invalid;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.signExp;
+    uiA0  = a.signif;
+    signA = signExtF80UI64(uiA64);
+    expA  = expExtF80UI64(uiA64);
+    sigA  = uiA0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x7FFF) {
+        if (sigA & UINT64_C(0x7FFFFFFFFFFFFFFF)) {
+            return softfloat_propagateNaNExtF80UI(uiA64, uiA0, 0, 0, status);
+        }
+        if (! signA) return a;
+        goto invalid;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (signA) {
+        if ((expA | sigA) == 0) return packToExtF80(signA, 0, 0);
+        goto invalid;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA) {
+        expA = 1;
+        if (sigA)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+    if (! (sigA & UINT64_C(0x8000000000000000))) {
+        if (! sigA) return packToExtF80(signA, 0, 0);
+        normExpSig = softfloat_normSubnormalExtF80Sig(sigA);
+        expA += normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    | (`sig32Z' is guaranteed to be a lower bound on the square root of
+    | `sig32A', which makes `sig32Z' also a lower bound on the square root of
+    | `sigA'.)
+    *------------------------------------------------------------------------*/
+    expZ = ((expA - 0x3FFF)>>1) + 0x3FFF;
+    expA &= 1;
+    sig32A = sigA>>32;
+    recipSqrt32 = softfloat_approxRecipSqrt32_1(expA, sig32A);
+    sig32Z = ((uint64_t) sig32A * recipSqrt32)>>32;
+    if (expA) {
+        sig32Z >>= 1;
+        rem = softfloat_shortShiftLeft128(0, sigA, 61);
+    } else {
+        rem = softfloat_shortShiftLeft128(0, sigA, 62);
+    }
+    rem.v64 -= (uint64_t) sig32Z * sig32Z;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    q = ((uint32_t) (rem.v64>>2) * (uint64_t) recipSqrt32)>>32;
+    x64 = (uint64_t) sig32Z<<32;
+    sigZ = x64 + (q<<3);
+    y = softfloat_shortShiftLeft128(rem.v64, rem.v0, 29);
+    /*------------------------------------------------------------------------
+    | (Repeating this loop is a rare occurrence.)
+    *------------------------------------------------------------------------*/
+    for (;;) {
+        term = softfloat_mul64ByShifted32To128(x64 + sigZ, q);
+        rem = softfloat_sub128(y.v64, y.v0, term.v64, term.v0);
+        if (! (rem.v64 & UINT64_C(0x8000000000000000))) break;
+        --q;
+        sigZ -= 1<<3;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    q = (((rem.v64>>2) * recipSqrt32)>>32) + 2;
+    x64 = sigZ;
+    sigZ = (sigZ<<1) + (q>>25);
+    sigZExtra = (uint64_t) (q<<39);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if ((q & 0xFFFFFF) <= 2) {
+        q &= ~(uint64_t) 0xFFFF;
+        sigZExtra = (uint64_t) (q<<39);
+        term = softfloat_mul64ByShifted32To128(x64 + (q>>27), q);
+        x64 = (uint32_t) (q<<5) * (uint64_t) (uint32_t) q;
+        term = softfloat_add128(term.v64, term.v0, 0, x64);
+        rem = softfloat_shortShiftLeft128(rem.v64, rem.v0, 28);
+        rem = softfloat_sub128(rem.v64, rem.v0, term.v64, term.v0);
+        if (rem.v64 & UINT64_C(0x8000000000000000)) {
+            if (! sigZExtra) --sigZ;
+            --sigZExtra;
+        } else {
+            if (rem.v64 | rem.v0) sigZExtra |= 1;
+        }
+    }
+    return
+        softfloat_roundPackToExtF80(0, expZ, sigZ, sigZExtra, softfloat_extF80_roundingPrecision(status), status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ invalid:
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    return packToExtF80_twoargs(defaultNaNExtF80UI64, defaultNaNExtF80UI0);
+}
diff --git a/src/cpu/softfloat3e/extF80_to_f128.cc b/src/cpu/softfloat3e/extF80_to_f128.cc
new file mode 100644
index 000000000..24e523cac
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_to_f128.cc
@@ -0,0 +1,75 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float128_t extF80_to_f128(extFloat80_t a, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    uint64_t uiA0;
+    uint16_t exp;
+    uint64_t frac;
+    struct commonNaN commonNaN;
+    struct uint128 uiZ;
+    bool sign;
+    struct uint128 frac128;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        uiZ.v64 = defaultNaNF128UI64;
+        uiZ.v0  = defaultNaNF128UI0;
+        return uiZ;
+    }
+
+    uiA64 = a.signExp;
+    uiA0  = a.signif;
+    exp = expExtF80UI64(uiA64);
+    frac = uiA0 & UINT64_C(0x7FFFFFFFFFFFFFFF);
+    if ((exp == 0x7FFF) && frac) {
+        softfloat_extF80UIToCommonNaN(uiA64, uiA0, &commonNaN, status);
+        uiZ = softfloat_commonNaNToF128UI(&commonNaN);
+    } else {
+        sign = signExtF80UI64(uiA64);
+        frac128 = softfloat_shortShiftLeft128(0, frac, 49);
+        uiZ.v64 = packToF128UI64(sign, exp, frac128.v64);
+        uiZ.v0  = frac128.v0;
+    }
+    return uiZ;
+}
diff --git a/src/cpu/softfloat3e/extF80_to_f16.cc b/src/cpu/softfloat3e/extF80_to_f16.cc
new file mode 100644
index 000000000..5078e689c
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_to_f16.cc
@@ -0,0 +1,89 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float16 extF80_to_f16(extFloat80_t a, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    uint64_t uiA0;
+    bool sign;
+    int32_t exp;
+    uint64_t sig;
+    struct commonNaN commonNaN;
+    uint16_t uiZ, sig16;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return defaultNaNF16UI;
+    }
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.signExp;
+    uiA0  = a.signif;
+    sign = signExtF80UI64(uiA64);
+    exp  = expExtF80UI64(uiA64);
+    sig  = uiA0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0x7FFF) {
+        if (sig & UINT64_C(0x7FFFFFFFFFFFFFFF)) {
+            softfloat_extF80UIToCommonNaN(uiA64, uiA0, &commonNaN, status);
+            uiZ = softfloat_commonNaNToF16UI(&commonNaN);
+        } else {
+            uiZ = packToF16UI(sign, 0x1F, 0);
+        }
+        return uiZ;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sig16 = softfloat_shortShiftRightJam64(sig, 49);
+    if (! (exp | sig16)) {
+        return packToF16UI(sign, 0, 0);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    exp -= 0x3FF1;
+    if (sizeof (int16_t) < sizeof (int32_t)) {
+        if (exp < -0x40) exp = -0x40;
+    }
+    return softfloat_roundPackToF16(sign, exp, sig16, status);
+}
diff --git a/src/cpu/softfloat3e/extF80_to_f32.cc b/src/cpu/softfloat3e/extF80_to_f32.cc
new file mode 100644
index 000000000..558df4c23
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_to_f32.cc
@@ -0,0 +1,89 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float32 extF80_to_f32(extFloat80_t a, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    uint64_t uiA0;
+    bool sign;
+    int32_t exp;
+    uint64_t sig;
+    struct commonNaN commonNaN;
+    uint32_t uiZ, sig32;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return defaultNaNF32UI;
+    }
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.signExp;
+    uiA0  = a.signif;
+    sign = signExtF80UI64(uiA64);
+    exp  = expExtF80UI64(uiA64);
+    sig  = uiA0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0x7FFF) {
+        if (sig & UINT64_C(0x7FFFFFFFFFFFFFFF)) {
+            softfloat_extF80UIToCommonNaN(uiA64, uiA0, &commonNaN, status);
+            uiZ = softfloat_commonNaNToF32UI(&commonNaN);
+        } else {
+            uiZ = packToF32UI(sign, 0xFF, 0);
+        }
+        return uiZ;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sig32 = softfloat_shortShiftRightJam64(sig, 33);
+    if (! (exp | sig32)) {
+        return packToF32UI(sign, 0, 0);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    exp -= 0x3F81;
+    if (sizeof (int16_t) < sizeof (int32_t)) {
+        if (exp < -0x1000) exp = -0x1000;
+    }
+    return softfloat_roundPackToF32(sign, exp, sig32, status);
+}
diff --git a/src/cpu/softfloat3e/extF80_to_f64.cc b/src/cpu/softfloat3e/extF80_to_f64.cc
new file mode 100644
index 000000000..4ba4174e3
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_to_f64.cc
@@ -0,0 +1,89 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float64 extF80_to_f64(extFloat80_t a, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    uint64_t uiA0;
+    bool sign;
+    int32_t exp;
+    uint64_t sig;
+    struct commonNaN commonNaN;
+    uint64_t uiZ;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return defaultNaNF64UI;
+    }
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.signExp;
+    uiA0  = a.signif;
+    sign = signExtF80UI64(uiA64);
+    exp  = expExtF80UI64(uiA64);
+    sig  = uiA0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! (exp | sig)) {
+        return packToF64UI(sign, 0, 0);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0x7FFF) {
+        if (sig & UINT64_C(0x7FFFFFFFFFFFFFFF)) {
+            softfloat_extF80UIToCommonNaN(uiA64, uiA0, &commonNaN, status);
+            uiZ = softfloat_commonNaNToF64UI(&commonNaN);
+        } else {
+            uiZ = packToF64UI(sign, 0x7FF, 0);
+        }
+        return uiZ;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sig = softfloat_shortShiftRightJam64(sig, 1);
+    exp -= 0x3C01;
+    if (sizeof (int16_t) < sizeof (int32_t)) {
+        if (exp < -0x1000) exp = -0x1000;
+    }
+    return softfloat_roundPackToF64(sign, exp, sig, status);
+}
diff --git a/src/cpu/softfloat3e/extF80_to_i32.cc b/src/cpu/softfloat3e/extF80_to_i32.cc
new file mode 100644
index 000000000..ea6c94484
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_to_i32.cc
@@ -0,0 +1,82 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int32_t extF80_to_i32(extFloat80_t a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    bool sign;
+    int32_t exp;
+    uint64_t sig;
+    int32_t shiftDist;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return i32_fromNaN;
+    }
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.signExp;
+    sign = signExtF80UI64(uiA64);
+    exp  = expExtF80UI64(uiA64);
+    sig = a.signif;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+#if (i32_fromNaN != i32_fromPosOverflow) || (i32_fromNaN != i32_fromNegOverflow)
+    if ((exp == 0x7FFF) && (sig & UINT64_C(0x7FFFFFFFFFFFFFFF))) {
+#if (i32_fromNaN == i32_fromPosOverflow)
+        sign = 0;
+#elif (i32_fromNaN == i32_fromNegOverflow)
+        sign = 1;
+#else
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return i32_fromNaN;
+#endif
+    }
+#endif
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x4032 - exp;
+    if (shiftDist <= 0) shiftDist = 1;
+    sig = softfloat_shiftRightJam64(sig, shiftDist);
+    return softfloat_roundToI32(sign, sig, roundingMode, exact, status);
+}
diff --git a/src/cpu/softfloat3e/extF80_to_i32_r_minMag.cc b/src/cpu/softfloat3e/extF80_to_i32_r_minMag.cc
new file mode 100644
index 000000000..42415c459
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_to_i32_r_minMag.cc
@@ -0,0 +1,93 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int32_t extF80_to_i32_r_minMag(extFloat80_t a, bool exact, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    int32_t exp;
+    uint64_t sig;
+    int32_t shiftDist;
+    bool sign;
+    int32_t absZ;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return i32_fromNaN;
+    }
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.signExp;
+    exp = expExtF80UI64(uiA64);
+    sig = a.signif;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x403E - exp;
+    if (64 <= shiftDist) {
+        if (exact && (exp | sig)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+        return 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signExtF80UI64(uiA64);
+    if (shiftDist < 33) {
+        if ((uiA64 == packToExtF80UI64(1, 0x401E)) && (sig < UINT64_C(0x8000000100000000))) {
+            if (exact && (sig & UINT64_C(0x00000000FFFFFFFF))) {
+                softfloat_raiseFlags(status, softfloat_flag_inexact);
+            }
+            return -0x7FFFFFFF - 1;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return
+            (exp == 0x7FFF) && (sig & UINT64_C(0x7FFFFFFFFFFFFFFF))
+                ? i32_fromNaN
+                : sign ? i32_fromNegOverflow : i32_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    absZ = sig>>shiftDist;
+    if (exact && ((uint64_t) (uint32_t) absZ<<shiftDist != sig)) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    return sign ? -absZ : absZ;
+}
diff --git a/src/cpu/softfloat3e/extF80_to_i64.cc b/src/cpu/softfloat3e/extF80_to_i64.cc
new file mode 100644
index 000000000..34f110e5b
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_to_i64.cc
@@ -0,0 +1,88 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int64_t extF80_to_i64(extFloat80_t a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    bool sign;
+    int32_t exp;
+    uint64_t sig;
+    int32_t shiftDist;
+    uint64_t sigExtra;
+    struct uint64_extra sig64Extra;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return i64_fromNaN;
+    }
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.signExp;
+    sign = signExtF80UI64(uiA64);
+    exp  = expExtF80UI64(uiA64);
+    sig = a.signif;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x403E - exp;
+    if (shiftDist <= 0) {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (shiftDist) {
+            softfloat_raiseFlags(status, softfloat_flag_invalid);
+            return
+                (exp == 0x7FFF) && (sig & UINT64_C(0x7FFFFFFFFFFFFFFF))
+                    ? i64_fromNaN
+                    : sign ? i64_fromNegOverflow : i64_fromPosOverflow;
+        }
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        sigExtra = 0;
+    } else {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        sig64Extra = softfloat_shiftRightJam64Extra(sig, 0, shiftDist);
+        sig = sig64Extra.v;
+        sigExtra = sig64Extra.extra;
+    }
+    return softfloat_roundToI64(sign, sig, sigExtra, roundingMode, exact, status);
+}
diff --git a/src/cpu/softfloat3e/extF80_to_i64_r_minMag.cc b/src/cpu/softfloat3e/extF80_to_i64_r_minMag.cc
new file mode 100644
index 000000000..3500b20d2
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_to_i64_r_minMag.cc
@@ -0,0 +1,90 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int64_t extF80_to_i64_r_minMag(extFloat80_t a, bool exact, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    int32_t exp;
+    uint64_t sig;
+    int32_t shiftDist;
+    bool sign;
+    int64_t absZ;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return i64_fromNaN;
+    }
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.signExp;
+    exp = expExtF80UI64(uiA64);
+    sig = a.signif;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x403E - exp;
+    if (64 <= shiftDist) {
+        if (exact && (exp | sig)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+        return 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signExtF80UI64(uiA64);
+    if (shiftDist <= 0) {
+        if ((uiA64 == packToExtF80UI64(1, 0x403E)) && (sig == UINT64_C(0x8000000000000000))) {
+            return -INT64_C(0x7FFFFFFFFFFFFFFF) - 1;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return
+            (exp == 0x7FFF) && (sig & UINT64_C(0x7FFFFFFFFFFFFFFF))
+                ? i64_fromNaN
+                : sign ? i64_fromNegOverflow : i64_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    absZ = sig>>shiftDist;
+    if (exact && (uint64_t) (sig<<(-shiftDist & 63))) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    return sign ? -absZ : absZ;
+}
diff --git a/src/cpu/softfloat3e/extF80_to_ui32.cc b/src/cpu/softfloat3e/extF80_to_ui32.cc
new file mode 100644
index 000000000..449cafa88
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_to_ui32.cc
@@ -0,0 +1,83 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint32_t
+ extF80_to_ui32(extFloat80_t a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    bool sign;
+    int32_t exp;
+    uint64_t sig;
+    int32_t shiftDist;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return ui32_fromNaN;
+    }
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.signExp;
+    sign = signExtF80UI64(uiA64);
+    exp  = expExtF80UI64(uiA64);
+    sig = a.signif;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+#if (ui32_fromNaN != ui32_fromPosOverflow) || (ui32_fromNaN != ui32_fromNegOverflow)
+    if ((exp == 0x7FFF) && (sig & UINT64_C(0x7FFFFFFFFFFFFFFF))) {
+#if (ui32_fromNaN == ui32_fromPosOverflow)
+        sign = 0;
+#elif (ui32_fromNaN == ui32_fromNegOverflow)
+        sign = 1;
+#else
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return ui32_fromNaN;
+#endif
+    }
+#endif
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x4032 - exp;
+    if (shiftDist <= 0) shiftDist = 1;
+    sig = softfloat_shiftRightJam64(sig, shiftDist);
+    return softfloat_roundToUI32(sign, sig, roundingMode, exact, status);
+}
diff --git a/src/cpu/softfloat3e/extF80_to_ui32_r_minMag.cc b/src/cpu/softfloat3e/extF80_to_ui32_r_minMag.cc
new file mode 100644
index 000000000..7ef100139
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_to_ui32_r_minMag.cc
@@ -0,0 +1,87 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint32_t extF80_to_ui32_r_minMag(extFloat80_t a, bool exact, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    int32_t exp;
+    uint64_t sig;
+    int32_t shiftDist;
+    bool sign;
+    uint32_t z;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return ui32_fromNaN;
+    }
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.signExp;
+    exp = expExtF80UI64(uiA64);
+    sig = a.signif;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x403E - exp;
+    if (64 <= shiftDist) {
+        if (exact && (exp | sig)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+        return 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signExtF80UI64(uiA64);
+    if (sign || (shiftDist < 32)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return
+            (exp == 0x7FFF) && (sig & UINT64_C(0x7FFFFFFFFFFFFFFF))
+                ? ui32_fromNaN
+                : sign ? ui32_fromNegOverflow : ui32_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    z = sig>>shiftDist;
+    if (exact && ((uint64_t) z<<shiftDist != sig)) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    return z;
+}
diff --git a/src/cpu/softfloat3e/extF80_to_ui64.cc b/src/cpu/softfloat3e/extF80_to_ui64.cc
new file mode 100644
index 000000000..70d4ad703
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_to_ui64.cc
@@ -0,0 +1,83 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint64_t extF80_to_ui64(extFloat80_t a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    bool sign;
+    int32_t exp;
+    uint64_t sig;
+    int32_t shiftDist;
+    uint64_t sigExtra;
+    struct uint64_extra sig64Extra;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return ui64_fromNaN;
+    }
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.signExp;
+    sign = signExtF80UI64(uiA64);
+    exp  = expExtF80UI64(uiA64);
+    sig = a.signif;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x403E - exp;
+    if (shiftDist < 0) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return
+            (exp == 0x7FFF) && (sig & UINT64_C(0x7FFFFFFFFFFFFFFF))
+                ? ui64_fromNaN
+                : sign ? ui64_fromNegOverflow : ui64_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sigExtra = 0;
+    if (shiftDist) {
+        sig64Extra = softfloat_shiftRightJam64Extra(sig, 0, shiftDist);
+        sig = sig64Extra.v;
+        sigExtra = sig64Extra.extra;
+    }
+    return softfloat_roundToUI64(sign, sig, sigExtra, roundingMode, exact, status);
+}
diff --git a/src/cpu/softfloat3e/extF80_to_ui64_r_minMag.cc b/src/cpu/softfloat3e/extF80_to_ui64_r_minMag.cc
new file mode 100644
index 000000000..78b058754
--- /dev/null
+++ b/src/cpu/softfloat3e/extF80_to_ui64_r_minMag.cc
@@ -0,0 +1,87 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint64_t extF80_to_ui64_r_minMag(extFloat80_t a, bool exact, struct softfloat_status_t *status)
+{
+    uint16_t uiA64;
+    int32_t exp;
+    uint64_t sig;
+    int32_t shiftDist;
+    bool sign;
+    uint64_t z;
+
+    // handle unsupported extended double-precision floating encodings
+    if (extF80_isUnsupported(a)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return ui64_fromNaN;
+    }
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.signExp;
+    exp = expExtF80UI64(uiA64);
+    sig = a.signif;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x403E - exp;
+    if (64 <= shiftDist) {
+        if (exact && (exp | sig)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+        return 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signExtF80UI64(uiA64);
+    if (sign || (shiftDist < 0)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return
+            (exp == 0x7FFF) && (sig & UINT64_C(0x7FFFFFFFFFFFFFFF))
+                ? ui64_fromNaN
+                : sign ? ui64_fromNegOverflow : ui64_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    z = sig>>shiftDist;
+    if (exact && (z<<shiftDist != sig)) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    return z;
+}
diff --git a/src/cpu/softfloat3e/f128_addsub.cc b/src/cpu/softfloat3e/f128_addsub.cc
new file mode 100644
index 000000000..ad65cfdf7
--- /dev/null
+++ b/src/cpu/softfloat3e/f128_addsub.cc
@@ -0,0 +1,88 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "softfloat.h"
+
+extern float128_t
+ softfloat_addMagsF128(uint64_t, uint64_t, uint64_t, uint64_t, bool, struct softfloat_status_t *);
+extern float128_t
+ softfloat_subMagsF128(uint64_t, uint64_t, uint64_t, uint64_t, bool, struct softfloat_status_t *);
+
+float128_t f128_add(float128_t a, float128_t b, struct softfloat_status_t *status)
+{
+    uint64_t uiA64, uiA0;
+    bool signA;
+    uint64_t uiB64, uiB0;
+    bool signB;
+
+    uiA64 = a.v64;
+    uiA0  = a.v0;
+    signA = signF128UI64(uiA64);
+
+    uiB64 = b.v64;
+    uiB0  = b.v0;
+    signB = signF128UI64(uiB64);
+
+    if (signA == signB) {
+        return softfloat_addMagsF128(uiA64, uiA0, uiB64, uiB0, signA, status);
+    } else {
+        return softfloat_subMagsF128(uiA64, uiA0, uiB64, uiB0, signA, status);
+    }
+}
+
+float128_t f128_sub(float128_t a, float128_t b, struct softfloat_status_t *status)
+{
+    uint64_t uiA64, uiA0;
+    bool signA;
+    uint64_t uiB64, uiB0;
+    bool signB;
+
+    uiA64 = a.v64;
+    uiA0  = a.v0;
+    signA = signF128UI64(uiA64);
+
+    uiB64 = b.v64;
+    uiB0  = b.v0;
+    signB = signF128UI64(uiB64);
+
+    if (signA == signB) {
+        return softfloat_subMagsF128(uiA64, uiA0, uiB64, uiB0, signA, status);
+    } else {
+        return softfloat_addMagsF128(uiA64, uiA0, uiB64, uiB0, signA, status);
+    }
+}
diff --git a/src/cpu/softfloat3e/f128_div.cc b/src/cpu/softfloat3e/f128_div.cc
new file mode 100644
index 000000000..837eb15aa
--- /dev/null
+++ b/src/cpu/softfloat3e/f128_div.cc
@@ -0,0 +1,187 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float128_t f128_div(float128_t a, float128_t b, struct softfloat_status_t *status)
+{
+    uint64_t uiA64, uiA0;
+    bool signA;
+    int32_t expA;
+    struct uint128 sigA;
+    uint64_t uiB64, uiB0;
+    bool signB;
+    int32_t expB;
+    struct uint128 sigB;
+    bool signZ;
+    struct exp32_sig128 normExpSig;
+    int32_t expZ;
+    struct uint128 rem;
+    uint32_t recip32;
+    int ix;
+    uint64_t q64;
+    uint32_t q;
+    struct uint128 term;
+    uint32_t qs[3];
+    uint64_t sigZExtra;
+    struct uint128 sigZ, uiZ;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.v64;
+    uiA0  = a.v0;
+    signA = signF128UI64(uiA64);
+    expA  = expF128UI64(uiA64);
+    sigA.v64 = fracF128UI64(uiA64);
+    sigA.v0  = uiA0;
+    uiB64 = b.v64;
+    uiB0  = b.v0;
+    signB = signF128UI64(uiB64);
+    expB  = expF128UI64(uiB64);
+    sigB.v64 = fracF128UI64(uiB64);
+    sigB.v0  = uiB0;
+    signZ = signA ^ signB;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x7FFF) {
+        if (sigA.v64 | sigA.v0) goto propagateNaN;
+        if (expB == 0x7FFF) {
+            if (sigB.v64 | sigB.v0) goto propagateNaN;
+            goto invalid;
+        }
+        goto infinity;
+    }
+    if (expB == 0x7FFF) {
+        if (sigB.v64 | sigB.v0) goto propagateNaN;
+        goto zero;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expB) {
+        if (! (sigB.v64 | sigB.v0)) {
+            if (! (expA | sigA.v64 | sigA.v0)) goto invalid;
+            softfloat_raiseFlags(status, softfloat_flag_infinite);
+            goto infinity;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF128Sig(sigB.v64, sigB.v0);
+        expB = normExpSig.exp;
+        sigB = normExpSig.sig;
+    }
+    if (! expA) {
+        if (! (sigA.v64 | sigA.v0)) goto zero;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF128Sig(sigA.v64, sigA.v0);
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expZ = expA - expB + 0x3FFE;
+    sigA.v64 |= UINT64_C(0x0001000000000000);
+    sigB.v64 |= UINT64_C(0x0001000000000000);
+    rem = sigA;
+    if (softfloat_lt128(sigA.v64, sigA.v0, sigB.v64, sigB.v0)) {
+        --expZ;
+        rem = softfloat_add128(sigA.v64, sigA.v0, sigA.v64, sigA.v0);
+    }
+    recip32 = softfloat_approxRecip32_1(sigB.v64>>17);
+    ix = 3;
+    for (;;) {
+        q64 = (uint64_t) (uint32_t) (rem.v64>>19) * recip32;
+        q = (q64 + 0x80000000)>>32;
+        --ix;
+        if (ix < 0) break;
+        rem = softfloat_shortShiftLeft128(rem.v64, rem.v0, 29);
+        term = softfloat_mul128By32(sigB.v64, sigB.v0, q);
+        rem = softfloat_sub128(rem.v64, rem.v0, term.v64, term.v0);
+        if (rem.v64 & UINT64_C(0x8000000000000000)) {
+            --q;
+            rem = softfloat_add128(rem.v64, rem.v0, sigB.v64, sigB.v0);
+        }
+        qs[ix] = q;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (((q + 1) & 7) < 2) {
+        rem = softfloat_shortShiftLeft128(rem.v64, rem.v0, 29);
+        term = softfloat_mul128By32(sigB.v64, sigB.v0, q);
+        rem = softfloat_sub128(rem.v64, rem.v0, term.v64, term.v0);
+        if (rem.v64 & UINT64_C(0x8000000000000000)) {
+            --q;
+            rem = softfloat_add128(rem.v64, rem.v0, sigB.v64, sigB.v0);
+        } else if (softfloat_le128(sigB.v64, sigB.v0, rem.v64, rem.v0)) {
+            ++q;
+            rem = softfloat_sub128(rem.v64, rem.v0, sigB.v64, sigB.v0);
+        }
+        if (rem.v64 | rem.v0) q |= 1;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sigZExtra = (uint64_t) ((uint64_t) q<<60);
+    term = softfloat_shortShiftLeft128(0, qs[1], 54);
+    sigZ = softfloat_add128((uint64_t) qs[2]<<19, ((uint64_t) qs[0]<<25) + (q>>4), term.v64, term.v0);
+    return
+        softfloat_roundPackToF128(signZ, expZ, sigZ.v64, sigZ.v0, sigZExtra, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    uiZ = softfloat_propagateNaNF128UI(uiA64, uiA0, uiB64, uiB0, status);
+    return uiZ;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ invalid:
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    uiZ.v64 = defaultNaNF128UI64;
+    uiZ.v0  = defaultNaNF128UI0;
+    return uiZ;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ infinity:
+    uiZ.v64 = packToF128UI64(signZ, 0x7FFF, 0);
+    uiZ.v0 = 0;
+    return uiZ;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ zero:
+    uiZ.v64 = packToF128UI64(signZ, 0, 0);
+    uiZ.v0 = 0;
+    return uiZ;
+}
diff --git a/src/cpu/softfloat3e/f128_mul.cc b/src/cpu/softfloat3e/f128_mul.cc
new file mode 100644
index 000000000..fd63a4590
--- /dev/null
+++ b/src/cpu/softfloat3e/f128_mul.cc
@@ -0,0 +1,148 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "primitiveTypes.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float128_t f128_mul(float128_t a, float128_t b, struct softfloat_status_t *status)
+{
+    uint64_t uiA64, uiA0;
+    bool signA;
+    int32_t expA;
+    struct uint128 sigA;
+    uint64_t uiB64, uiB0;
+    bool signB;
+    int32_t expB;
+    struct uint128 sigB;
+    bool signZ;
+    uint64_t magBits;
+    struct exp32_sig128 normExpSig;
+    int32_t expZ;
+    uint64_t sig256Z[4];
+    uint64_t sigZExtra;
+    struct uint128 sigZ;
+    struct uint128_extra sig128Extra;
+    struct uint128 uiZ;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.v64;
+    uiA0  = a.v0;
+    signA = signF128UI64(uiA64);
+    expA  = expF128UI64(uiA64);
+    sigA.v64 = fracF128UI64(uiA64);
+    sigA.v0  = uiA0;
+    uiB64 = b.v64;
+    uiB0  = b.v0;
+    signB = signF128UI64(uiB64);
+    expB  = expF128UI64(uiB64);
+    sigB.v64 = fracF128UI64(uiB64);
+    sigB.v0  = uiB0;
+    signZ = signA ^ signB;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x7FFF) {
+        if ((sigA.v64 | sigA.v0) || ((expB == 0x7FFF) && (sigB.v64 | sigB.v0))) {
+            goto propagateNaN;
+        }
+        magBits = expB | sigB.v64 | sigB.v0;
+        goto infArg;
+    }
+    if (expB == 0x7FFF) {
+        if (sigB.v64 | sigB.v0) goto propagateNaN;
+        magBits = expA | sigA.v64 | sigA.v0;
+        goto infArg;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA) {
+        if (! (sigA.v64 | sigA.v0)) goto zero;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF128Sig(sigA.v64, sigA.v0);
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    if (! expB) {
+        if (! (sigB.v64 | sigB.v0)) goto zero;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF128Sig(sigB.v64, sigB.v0);
+        expB = normExpSig.exp;
+        sigB = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expZ = expA + expB - 0x4000;
+    sigA.v64 |= UINT64_C(0x0001000000000000);
+    sigB = softfloat_shortShiftLeft128(sigB.v64, sigB.v0, 16);
+    softfloat_mul128To256M(sigA.v64, sigA.v0, sigB.v64, sigB.v0, sig256Z);
+    sigZExtra = sig256Z[indexWord(4, 1)] | (sig256Z[indexWord(4, 0)] != 0);
+    sigZ = softfloat_add128(sig256Z[indexWord(4, 3)], sig256Z[indexWord(4, 2)], sigA.v64, sigA.v0);
+    if (UINT64_C(0x0002000000000000) <= sigZ.v64) {
+        ++expZ;
+        sig128Extra = softfloat_shortShiftRightJam128Extra(sigZ.v64, sigZ.v0, sigZExtra, 1);
+        sigZ = sig128Extra.v;
+        sigZExtra = sig128Extra.extra;
+    }
+    return
+        softfloat_roundPackToF128(signZ, expZ, sigZ.v64, sigZ.v0, sigZExtra, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    uiZ = softfloat_propagateNaNF128UI(uiA64, uiA0, uiB64, uiB0, status);
+    return uiZ;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ infArg:
+    if (! magBits) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        uiZ.v64 = defaultNaNF128UI64;
+        uiZ.v0  = defaultNaNF128UI0;
+        return uiZ;
+    }
+    uiZ.v64 = packToF128UI64(signZ, 0x7FFF, 0);
+    uiZ.v0 = 0;
+    return uiZ;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ zero:
+    uiZ.v64 = packToF128UI64(signZ, 0, 0);
+    uiZ.v0 = 0;
+    return uiZ;
+}
diff --git a/src/cpu/softfloat3e/f128_mulAdd.cc b/src/cpu/softfloat3e/f128_mulAdd.cc
new file mode 100644
index 000000000..749342f5f
--- /dev/null
+++ b/src/cpu/softfloat3e/f128_mulAdd.cc
@@ -0,0 +1,332 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "primitiveTypes.h"
+#include "softfloat.h"
+#include "specialize.h"
+
+float128_t f128_mulAdd(float128_t a, float128_t b, float128_t c, uint8_t op, struct softfloat_status_t *status)
+{
+    bool signA;
+    int32_t expA;
+    struct uint128 sigA;
+    bool signB;
+    int32_t expB;
+    struct uint128 sigB;
+    bool signC;
+    int32_t expC;
+    struct uint128 sigC;
+    bool signZ;
+    uint64_t magBits;
+    struct uint128 uiZ;
+    struct exp32_sig128 normExpSig;
+    int32_t expZ;
+    uint64_t sig256Z[4];
+    struct uint128 sigZ;
+    int32_t shiftDist, expDiff;
+    struct uint128 x128;
+    uint64_t sig256C[4];
+    static uint64_t zero256[4] = INIT_UINTM4(0, 0, 0, 0);
+    uint64_t sigZExtra, sig256Z0;
+    uint64_t uiA64, uiA0;
+    uint64_t uiB64, uiB0;
+    uint64_t uiC64, uiC0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.v64;
+    uiA0  = a.v0;
+    uiB64 = b.v64;
+    uiB0  = b.v0;
+    uiC64 = c.v64;
+    uiC0  = c.v0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    signA = signF128UI64(uiA64);
+    expA  = expF128UI64(uiA64);
+    sigA.v64 = fracF128UI64(uiA64);
+    sigA.v0  = uiA0;
+    signB = signF128UI64(uiB64);
+    expB  = expF128UI64(uiB64);
+    sigB.v64 = fracF128UI64(uiB64);
+    sigB.v0  = uiB0;
+    signC = signF128UI64(uiC64) ^ ((op & softfloat_mulAdd_subC) != 0);
+    expC  = expF128UI64(uiC64);
+    sigC.v64 = fracF128UI64(uiC64);
+    sigC.v0  = uiC0;
+    signZ = signA ^ signB ^ ((op & softfloat_mulAdd_subProd) != 0);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x7FFF) {
+        if ((sigA.v64 | sigA.v0) || ((expB == 0x7FFF) && (sigB.v64 | sigB.v0))) {
+            goto propagateNaN_ABC;
+        }
+        magBits = expB | sigB.v64 | sigB.v0;
+        goto infProdArg;
+    }
+    if (expB == 0x7FFF) {
+        if (sigB.v64 | sigB.v0) goto propagateNaN_ABC;
+        magBits = expA | sigA.v64 | sigA.v0;
+        goto infProdArg;
+    }
+    if (expC == 0x7FFF) {
+        if (sigC.v64 | sigC.v0) {
+            uiZ.v64 = 0;
+            uiZ.v0  = 0;
+            goto propagateNaN_ZC;
+        }
+        uiZ.v64 = uiC64;
+        uiZ.v0  = uiC0;
+        return uiZ;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA) {
+        if (! (sigA.v64 | sigA.v0)) goto zeroProd;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF128Sig(sigA.v64, sigA.v0);
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    if (! expB) {
+        if (! (sigB.v64 | sigB.v0)) goto zeroProd;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF128Sig(sigB.v64, sigB.v0);
+        expB = normExpSig.exp;
+        sigB = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expZ = expA + expB - 0x3FFE;
+    sigA.v64 |= UINT64_C(0x0001000000000000);
+    sigB.v64 |= UINT64_C(0x0001000000000000);
+    sigA = softfloat_shortShiftLeft128(sigA.v64, sigA.v0, 8);
+    sigB = softfloat_shortShiftLeft128(sigB.v64, sigB.v0, 15);
+    softfloat_mul128To256M(sigA.v64, sigA.v0, sigB.v64, sigB.v0, sig256Z);
+    sigZ.v64 = sig256Z[indexWord(4, 3)];
+    sigZ.v0  = sig256Z[indexWord(4, 2)];
+    shiftDist = 0;
+    if (! (sigZ.v64 & UINT64_C(0x0100000000000000))) {
+        --expZ;
+        shiftDist = -1;
+    }
+    if (! expC) {
+        if (! (sigC.v64 | sigC.v0)) {
+            shiftDist += 8;
+            goto sigZ;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF128Sig(sigC.v64, sigC.v0);
+        expC = normExpSig.exp;
+        sigC = normExpSig.sig;
+    }
+    sigC.v64 |= UINT64_C(0x0001000000000000);
+    sigC = softfloat_shortShiftLeft128(sigC.v64, sigC.v0, 8);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expDiff = expZ - expC;
+    if (expDiff < 0) {
+        expZ = expC;
+        if ((signZ == signC) || (expDiff < -1)) {
+            shiftDist -= expDiff;
+            if (shiftDist) {
+                sigZ = softfloat_shiftRightJam128(sigZ.v64, sigZ.v0, shiftDist);
+            }
+        } else {
+            if (! shiftDist) {
+                x128 = softfloat_shortShiftRight128(sig256Z[indexWord(4, 1)], sig256Z[indexWord(4, 0)], 1);
+                sig256Z[indexWord(4, 1)] = (sigZ.v0<<63) | x128.v64;
+                sig256Z[indexWord(4, 0)] = x128.v0;
+                sigZ = softfloat_shortShiftRight128(sigZ.v64, sigZ.v0, 1);
+                sig256Z[indexWord(4, 3)] = sigZ.v64;
+                sig256Z[indexWord(4, 2)] = sigZ.v0;
+            }
+        }
+    } else {
+        if (shiftDist) softfloat_add256M(sig256Z, sig256Z, sig256Z);
+        if (! expDiff) {
+            sigZ.v64 = sig256Z[indexWord(4, 3)];
+            sigZ.v0  = sig256Z[indexWord(4, 2)];
+        } else {
+            sig256C[indexWord(4, 3)] = sigC.v64;
+            sig256C[indexWord(4, 2)] = sigC.v0;
+            sig256C[indexWord(4, 1)] = 0;
+            sig256C[indexWord(4, 0)] = 0;
+            softfloat_shiftRightJam256M(sig256C, expDiff, sig256C);
+        }
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 8;
+    if (signZ == signC) {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (expDiff <= 0) {
+            sigZ = softfloat_add128(sigC.v64, sigC.v0, sigZ.v64, sigZ.v0);
+        } else {
+            softfloat_add256M(sig256Z, sig256C, sig256Z);
+            sigZ.v64 = sig256Z[indexWord(4, 3)];
+            sigZ.v0  = sig256Z[indexWord(4, 2)];
+        }
+        if (sigZ.v64 & UINT64_C(0x0200000000000000)) {
+            ++expZ;
+            shiftDist = 9;
+        }
+    } else {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (expDiff < 0) {
+            signZ = signC;
+            if (expDiff < -1) {
+                sigZ = softfloat_sub128(sigC.v64, sigC.v0, sigZ.v64, sigZ.v0);
+                sigZExtra = sig256Z[indexWord(4, 1)] | sig256Z[indexWord(4, 0)];
+                if (sigZExtra) {
+                    sigZ = softfloat_sub128(sigZ.v64, sigZ.v0, 0, 1);
+                }
+                if (! (sigZ.v64 & UINT64_C(0x0100000000000000))) {
+                    --expZ;
+                    shiftDist = 7;
+                }
+                goto shiftRightRoundPack;
+            } else {
+                sig256C[indexWord(4, 3)] = sigC.v64;
+                sig256C[indexWord(4, 2)] = sigC.v0;
+                sig256C[indexWord(4, 1)] = 0;
+                sig256C[indexWord(4, 0)] = 0;
+                softfloat_sub256M(sig256C, sig256Z, sig256Z);
+            }
+        } else if (! expDiff) {
+            sigZ = softfloat_sub128(sigZ.v64, sigZ.v0, sigC.v64, sigC.v0);
+            if (! (sigZ.v64 | sigZ.v0) && ! sig256Z[indexWord(4, 1)] && ! sig256Z[indexWord(4, 0)]) {
+                goto completeCancellation;
+            }
+            sig256Z[indexWord(4, 3)] = sigZ.v64;
+            sig256Z[indexWord(4, 2)] = sigZ.v0;
+            if (sigZ.v64 & UINT64_C(0x8000000000000000)) {
+                signZ = ! signZ;
+                softfloat_sub256M(zero256, sig256Z, sig256Z);
+            }
+        } else {
+            softfloat_sub256M(sig256Z, sig256C, sig256Z);
+            if (1 < expDiff) {
+                sigZ.v64 = sig256Z[indexWord(4, 3)];
+                sigZ.v0  = sig256Z[indexWord(4, 2)];
+                if (! (sigZ.v64 & UINT64_C(0x0100000000000000))) {
+                    --expZ;
+                    shiftDist = 7;
+                }
+                goto sigZ;
+            }
+        }
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        sigZ.v64  = sig256Z[indexWord(4, 3)];
+        sigZ.v0   = sig256Z[indexWord(4, 2)];
+        sigZExtra = sig256Z[indexWord(4, 1)];
+        sig256Z0  = sig256Z[indexWord(4, 0)];
+        if (sigZ.v64) {
+            if (sig256Z0) sigZExtra |= 1;
+        } else {
+            expZ -= 64;
+            sigZ.v64  = sigZ.v0;
+            sigZ.v0   = sigZExtra;
+            sigZExtra = sig256Z0;
+            if (! sigZ.v64) {
+                expZ -= 64;
+                sigZ.v64  = sigZ.v0;
+                sigZ.v0   = sigZExtra;
+                sigZExtra = 0;
+                if (! sigZ.v64) {
+                    expZ -= 64;
+                    sigZ.v64 = sigZ.v0;
+                    sigZ.v0  = 0;
+                }
+            }
+        }
+        shiftDist = softfloat_countLeadingZeros64(sigZ.v64);
+        expZ += 7 - shiftDist;
+        shiftDist = 15 - shiftDist;
+        if (0 < shiftDist) goto shiftRightRoundPack;
+        if (shiftDist) {
+            shiftDist = -shiftDist;
+            sigZ = softfloat_shortShiftLeft128(sigZ.v64, sigZ.v0, shiftDist);
+            x128 = softfloat_shortShiftLeft128(0, sigZExtra, shiftDist);
+            sigZ.v0 |= x128.v64;
+            sigZExtra = x128.v0;
+        }
+        goto roundPack;
+    }
+ sigZ:
+    sigZExtra = sig256Z[indexWord(4, 1)] | sig256Z[indexWord(4, 0)];
+ shiftRightRoundPack:
+    sigZExtra = (uint64_t) (sigZ.v0<<(64 - shiftDist)) | (sigZExtra != 0);
+    sigZ = softfloat_shortShiftRight128(sigZ.v64, sigZ.v0, shiftDist);
+ roundPack:
+    return softfloat_roundPackToF128(signZ, expZ - 1, sigZ.v64, sigZ.v0, sigZExtra, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN_ABC:
+    uiZ = softfloat_propagateNaNF128UI(uiA64, uiA0, uiB64, uiB0, status);
+    goto propagateNaN_ZC;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ infProdArg:
+    if ((sigC.v64 | sigC.v0) && expC == 0x7FFF) goto propagateNaN_ZC;
+    if (magBits) {
+        uiZ.v64 = packToF128UI64(signZ, 0x7FFF, 0);
+        uiZ.v0 = 0;
+        if (expC != 0x7FFF) return uiZ;
+        if (signZ == signC) return uiZ;
+    }
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    uiZ.v64 = defaultNaNF128UI64;
+    uiZ.v0  = defaultNaNF128UI0;
+ propagateNaN_ZC:
+    uiZ = softfloat_propagateNaNF128UI(uiZ.v64, uiZ.v0, uiC64, uiC0, status);
+    return uiZ;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ zeroProd:
+    uiZ.v64 = uiC64;
+    uiZ.v0  = uiC0;
+    if (! (expC | sigC.v64 | sigC.v0) && (signZ != signC)) {
+ completeCancellation:
+        uiZ.v64 = packToF128UI64((softfloat_getRoundingMode(status) == softfloat_round_min), 0, 0);
+        uiZ.v0 = 0;
+    }
+    return uiZ;
+}
diff --git a/src/cpu/softfloat3e/f128_roundToInt.cc b/src/cpu/softfloat3e/f128_roundToInt.cc
new file mode 100644
index 000000000..c3b728704
--- /dev/null
+++ b/src/cpu/softfloat3e/f128_roundToInt.cc
@@ -0,0 +1,142 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2017 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float128_t
+ f128_roundToInt(float128_t a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    uint64_t uiA64, uiA0;
+    int32_t exp;
+    struct uint128 uiZ;
+    uint64_t lastBitMask0, roundBitsMask;
+    bool roundNearEven;
+    uint64_t lastBitMask64;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.v64;
+    uiA0  = a.v0;
+    exp = expF128UI64(uiA64);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (0x402F <= exp) {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (0x406F <= exp) {
+            if ((exp == 0x7FFF) && (fracF128UI64(uiA64) | uiA0)) {
+                uiZ = softfloat_propagateNaNF128UI(uiA64, uiA0, 0, 0, status);
+                return uiZ;
+            }
+            return a;
+        }
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        lastBitMask0 = (uint64_t) 2<<(0x406E - exp);
+        roundBitsMask = lastBitMask0 - 1;
+        uiZ.v64 = uiA64;
+        uiZ.v0  = uiA0;
+        roundNearEven = (roundingMode == softfloat_round_near_even);
+        if (roundNearEven || (roundingMode == softfloat_round_near_maxMag)) {
+            if (exp == 0x402F) {
+                if (UINT64_C(0x8000000000000000) <= uiZ.v0) {
+                    ++uiZ.v64;
+                    if (roundNearEven && (uiZ.v0 == UINT64_C(0x8000000000000000))) {
+                        uiZ.v64 &= ~1;
+                    }
+                }
+            } else {
+                uiZ = softfloat_add128(uiZ.v64, uiZ.v0, 0, lastBitMask0>>1);
+                if (roundNearEven && !(uiZ.v0 & roundBitsMask)) {
+                    uiZ.v0 &= ~lastBitMask0;
+                }
+            }
+        } else if (roundingMode == (signF128UI64(uiZ.v64) ? softfloat_round_min : softfloat_round_max)) {
+            uiZ = softfloat_add128(uiZ.v64, uiZ.v0, 0, roundBitsMask);
+        }
+        uiZ.v0 &= ~roundBitsMask;
+        lastBitMask64 = !lastBitMask0;
+    } else {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (exp < 0x3FFF) {
+            if (!((uiA64 & UINT64_C(0x7FFFFFFFFFFFFFFF)) | uiA0)) return a;
+            if (exact) softfloat_raiseFlags(status, softfloat_flag_inexact);
+            uiZ.v64 = uiA64 & packToF128UI64(1, 0, 0);
+            uiZ.v0  = 0;
+            switch (roundingMode) {
+             case softfloat_round_near_even:
+                if (!(fracF128UI64(uiA64) | uiA0)) break;
+             case softfloat_round_near_maxMag:
+                if (exp == 0x3FFE) uiZ.v64 |= packToF128UI64(0, 0x3FFF, 0);
+                break;
+             case softfloat_round_min:
+                if (uiZ.v64) uiZ.v64 = packToF128UI64(1, 0x3FFF, 0);
+                break;
+             case softfloat_round_max:
+                if (!uiZ.v64) uiZ.v64 = packToF128UI64(0, 0x3FFF, 0);
+                break;
+            }
+            return uiZ;
+        }
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        uiZ.v64 = uiA64;
+        uiZ.v0  = 0;
+        lastBitMask64 = (uint64_t) 1<<(0x402F - exp);
+        roundBitsMask = lastBitMask64 - 1;
+        if (roundingMode == softfloat_round_near_maxMag) {
+            uiZ.v64 += lastBitMask64>>1;
+        } else if (roundingMode == softfloat_round_near_even) {
+            uiZ.v64 += lastBitMask64>>1;
+            if (!((uiZ.v64 & roundBitsMask) | uiA0)) {
+                uiZ.v64 &= ~lastBitMask64;
+            }
+        } else if (roundingMode == (signF128UI64(uiZ.v64) ? softfloat_round_min : softfloat_round_max)) {
+            uiZ.v64 = (uiZ.v64 | (uiA0 != 0)) + roundBitsMask;
+        }
+        uiZ.v64 &= ~roundBitsMask;
+        lastBitMask0 = 0;
+    }
+    if ((uiZ.v64 != uiA64) || (uiZ.v0 != uiA0)) {
+        if (exact) softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    return uiZ;
+}
diff --git a/src/cpu/softfloat3e/f128_to_extF80.cc b/src/cpu/softfloat3e/f128_to_extF80.cc
new file mode 100644
index 000000000..916820bc9
--- /dev/null
+++ b/src/cpu/softfloat3e/f128_to_extF80.cc
@@ -0,0 +1,94 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+extFloat80_t f128_to_extF80(float128_t a, struct softfloat_status_t *status)
+{
+    uint64_t uiA64, uiA0;
+    bool sign;
+    int32_t exp;
+    uint64_t frac64, frac0;
+    struct commonNaN commonNaN;
+    struct uint128 uiZ;
+    uint16_t uiZ64;
+    uint64_t uiZ0;
+    struct exp32_sig128 normExpSig;
+    struct uint128 sig128;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.v64;
+    uiA0  = a.v0;
+    sign   = signF128UI64(uiA64);
+    exp    = expF128UI64(uiA64);
+    frac64 = fracF128UI64(uiA64);
+    frac0  = uiA0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0x7FFF) {
+        if (frac64 | frac0) {
+            softfloat_f128UIToCommonNaN(uiA64, uiA0, &commonNaN, status);
+            uiZ = softfloat_commonNaNToExtF80UI(&commonNaN);
+            uiZ64 = uiZ.v64;
+            uiZ0  = uiZ.v0;
+        } else {
+            uiZ64 = packToExtF80UI64(sign, 0x7FFF);
+            uiZ0  = UINT64_C(0x8000000000000000);
+        }
+        return packToExtF80_twoargs(uiZ64, uiZ0);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! exp) {
+        if (! (frac64 | frac0)) {
+            return packToExtF80(sign, 0, 0);
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF128Sig(frac64, frac0);
+        exp   = normExpSig.exp;
+        frac64 = normExpSig.sig.v64;
+        frac0  = normExpSig.sig.v0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sig128 = softfloat_shortShiftLeft128(frac64 | UINT64_C(0x0001000000000000), frac0, 15);
+    return softfloat_roundPackToExtF80(sign, exp, sig128.v64, sig128.v0, 80, status);
+}
diff --git a/src/cpu/softfloat3e/f128_to_f32.cc b/src/cpu/softfloat3e/f128_to_f32.cc
new file mode 100644
index 000000000..485d68a0c
--- /dev/null
+++ b/src/cpu/softfloat3e/f128_to_f32.cc
@@ -0,0 +1,83 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float32 f128_to_f32(float128_t a, struct softfloat_status_t *status)
+{
+    uint64_t uiA64, uiA0;
+    bool sign;
+    int32_t exp;
+    uint64_t frac64;
+    struct commonNaN commonNaN;
+    uint32_t uiZ, frac32;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.v64;
+    uiA0  = a.v0;
+    sign  = signF128UI64(uiA64);
+    exp   = expF128UI64(uiA64);
+    frac64 = fracF128UI64(uiA64) | (uiA0 != 0);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0x7FFF) {
+        if (frac64) {
+            softfloat_f128UIToCommonNaN(uiA64, uiA0, &commonNaN, status);
+            uiZ = softfloat_commonNaNToF32UI(&commonNaN);
+        } else {
+            uiZ = packToF32UI(sign, 0xFF, 0);
+        }
+        return uiZ;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    frac32 = softfloat_shortShiftRightJam64(frac64, 18);
+    if (! (exp | frac32)) {
+        return packToF32UI(sign, 0, 0);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    exp -= 0x3F81;
+    if (sizeof (int16_t) < sizeof (int32_t)) {
+        if (exp < -0x1000) exp = -0x1000;
+    }
+    return softfloat_roundPackToF32(sign, exp, frac32 | 0x40000000, status);
+}
diff --git a/src/cpu/softfloat3e/f128_to_f64.cc b/src/cpu/softfloat3e/f128_to_f64.cc
new file mode 100644
index 000000000..0809c7102
--- /dev/null
+++ b/src/cpu/softfloat3e/f128_to_f64.cc
@@ -0,0 +1,87 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float64 f128_to_f64(float128_t a, struct softfloat_status_t *status)
+{
+    uint64_t uiA64, uiA0;
+    bool sign;
+    int32_t exp;
+    uint64_t frac64, frac0;
+    struct commonNaN commonNaN;
+    uint64_t uiZ;
+    struct uint128 frac128;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.v64;
+    uiA0  = a.v0;
+    sign  = signF128UI64(uiA64);
+    exp   = expF128UI64(uiA64);
+    frac64 = fracF128UI64(uiA64);
+    frac0  = uiA0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0x7FFF) {
+        if (frac64 | frac0) {
+            softfloat_f128UIToCommonNaN(uiA64, uiA0, &commonNaN, status);
+            uiZ = softfloat_commonNaNToF64UI(&commonNaN);
+        } else {
+            uiZ = packToF64UI(sign, 0x7FF, 0);
+        }
+        return uiZ;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    frac128 = softfloat_shortShiftLeft128(frac64, frac0, 14);
+    frac64 = frac128.v64 | (frac128.v0 != 0);
+    if (! (exp | frac64)) {
+        return packToF64UI(sign, 0, 0);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    exp -= 0x3C01;
+    if (sizeof (int16_t) < sizeof (int32_t)) {
+        if (exp < -0x1000) exp = -0x1000;
+    }
+    return
+        softfloat_roundPackToF64(sign, exp, frac64 | UINT64_C(0x4000000000000000), status);
+}
diff --git a/src/cpu/softfloat3e/f128_to_i32.cc b/src/cpu/softfloat3e/f128_to_i32.cc
new file mode 100644
index 000000000..68cf2b3a7
--- /dev/null
+++ b/src/cpu/softfloat3e/f128_to_i32.cc
@@ -0,0 +1,80 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int32_t f128_to_i32(float128_t a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    uint64_t uiA64, uiA0;
+    bool sign;
+    int32_t exp;
+    uint64_t sig64, sig0;
+    int32_t shiftDist;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.v64;
+    uiA0  = a.v0;
+    sign  = signF128UI64(uiA64);
+    exp   = expF128UI64(uiA64);
+    sig64 = fracF128UI64(uiA64);
+    sig0  = uiA0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+#if (i32_fromNaN != i32_fromPosOverflow) || (i32_fromNaN != i32_fromNegOverflow)
+    if ((exp == 0x7FFF) && (sig64 | sig0)) {
+#if (i32_fromNaN == i32_fromPosOverflow)
+        sign = 0;
+#elif (i32_fromNaN == i32_fromNegOverflow)
+        sign = 1;
+#else
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return i32_fromNaN;
+#endif
+    }
+#endif
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp) sig64 |= UINT64_C(0x0001000000000000);
+    sig64 |= (sig0 != 0);
+    shiftDist = 0x4023 - exp;
+    if (0 < shiftDist) sig64 = softfloat_shiftRightJam64(sig64, shiftDist);
+    return softfloat_roundToI32(sign, sig64, roundingMode, exact, status);
+}
diff --git a/src/cpu/softfloat3e/f128_to_i32_r_minMag.cc b/src/cpu/softfloat3e/f128_to_i32_r_minMag.cc
new file mode 100644
index 000000000..a62233d4d
--- /dev/null
+++ b/src/cpu/softfloat3e/f128_to_i32_r_minMag.cc
@@ -0,0 +1,89 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int32_t f128_to_i32_r_minMag(float128_t a, bool exact, struct softfloat_status_t *status)
+{
+    uint64_t uiA64, uiA0;
+    int32_t exp;
+    uint64_t sig64;
+    int32_t shiftDist;
+    bool sign;
+    int32_t absZ;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.v64;
+    uiA0  = a.v0;
+    exp   = expF128UI64(uiA64);
+    sig64 = fracF128UI64(uiA64) | (uiA0 != 0);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x402F - exp;
+    if (49 <= shiftDist) {
+        if (exact && (exp | sig64)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+        return 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF128UI64(uiA64);
+    if (shiftDist < 18) {
+        if (sign && (shiftDist == 17) && (sig64 < UINT64_C(0x0000000000020000))) {
+            if (exact && sig64) {
+                softfloat_raiseFlags(status, softfloat_flag_inexact);
+            }
+            return -0x7FFFFFFF - 1;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return
+            (exp == 0x7FFF) && sig64 ? i32_fromNaN
+                : sign ? i32_fromNegOverflow : i32_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sig64 |= UINT64_C(0x0001000000000000);
+    absZ = sig64>>shiftDist;
+    if (exact && ((uint64_t) (uint32_t) absZ<<shiftDist != sig64)) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    return sign ? -absZ : absZ;
+}
diff --git a/src/cpu/softfloat3e/f128_to_i64.cc b/src/cpu/softfloat3e/f128_to_i64.cc
new file mode 100644
index 000000000..288117561
--- /dev/null
+++ b/src/cpu/softfloat3e/f128_to_i64.cc
@@ -0,0 +1,90 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int64_t f128_to_i64(float128_t a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    uint64_t uiA64, uiA0;
+    bool sign;
+    int32_t exp;
+    uint64_t sig64, sig0;
+    int32_t shiftDist;
+    struct uint128 sig128;
+    struct uint64_extra sigExtra;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.v64;
+    uiA0  = a.v0;
+    sign  = signF128UI64(uiA64);
+    exp   = expF128UI64(uiA64);
+    sig64 = fracF128UI64(uiA64);
+    sig0  = uiA0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x402F - exp;
+    if (shiftDist <= 0) {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (shiftDist < -15) {
+            softfloat_raiseFlags(status, softfloat_flag_invalid);
+            return
+                (exp == 0x7FFF) && (sig64 | sig0) ? i64_fromNaN
+                    : sign ? i64_fromNegOverflow : i64_fromPosOverflow;
+        }
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        sig64 |= UINT64_C(0x0001000000000000);
+        if (shiftDist) {
+            sig128 = softfloat_shortShiftLeft128(sig64, sig0, -shiftDist);
+            sig64 = sig128.v64;
+            sig0  = sig128.v0;
+        }
+    } else {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (exp) sig64 |= UINT64_C(0x0001000000000000);
+        sigExtra = softfloat_shiftRightJam64Extra(sig64, sig0, shiftDist);
+        sig64 = sigExtra.v;
+        sig0  = sigExtra.extra;
+    }
+    return softfloat_roundToI64(sign, sig64, sig0, roundingMode, exact, status);
+}
diff --git a/src/cpu/softfloat3e/f128_to_i64_r_minMag.cc b/src/cpu/softfloat3e/f128_to_i64_r_minMag.cc
new file mode 100644
index 000000000..edeccf182
--- /dev/null
+++ b/src/cpu/softfloat3e/f128_to_i64_r_minMag.cc
@@ -0,0 +1,104 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int64_t f128_to_i64_r_minMag(float128_t a, bool exact, struct softfloat_status_t *status)
+{
+    uint64_t uiA64, uiA0;
+    bool sign;
+    int32_t exp;
+    uint64_t sig64, sig0;
+    int32_t shiftDist;
+    int8_t negShiftDist;
+    uint64_t absZ;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.v64;
+    uiA0  = a.v0;
+    sign  = signF128UI64(uiA64);
+    exp   = expF128UI64(uiA64);
+    sig64 = fracF128UI64(uiA64);
+    sig0  = uiA0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x402F - exp;
+    if (shiftDist < 0) {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (shiftDist < -14) {
+            if ((uiA64 == UINT64_C(0xC03E000000000000)) && (sig0 < UINT64_C(0x0002000000000000))) {
+                if (exact && sig0) {
+                    softfloat_raiseFlags(status, softfloat_flag_inexact);
+                }
+                return -INT64_C(0x7FFFFFFFFFFFFFFF) - 1;
+            }
+            softfloat_raiseFlags(status, softfloat_flag_invalid);
+            return (exp == 0x7FFF) && (sig64 | sig0) 
+                    ? i64_fromNaN
+                    : sign ? i64_fromNegOverflow : i64_fromPosOverflow;
+        }
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        sig64 |= UINT64_C(0x0001000000000000);
+        negShiftDist = -shiftDist;
+        absZ = sig64<<negShiftDist | sig0>>(shiftDist & 63);
+        if (exact && (uint64_t) (sig0<<negShiftDist)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+    } else {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (49 <= shiftDist) {
+            if (exact && (exp | sig64 | sig0)) {
+                softfloat_raiseFlags(status, softfloat_flag_inexact);
+            }
+            return 0;
+        }
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        sig64 |= UINT64_C(0x0001000000000000);
+        absZ = sig64>>shiftDist;
+        if (exact && (sig0 || (absZ<<shiftDist != sig64))) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+    }
+    return sign ? -absZ : absZ;
+}
diff --git a/src/cpu/softfloat3e/f128_to_ui32.cc b/src/cpu/softfloat3e/f128_to_ui32.cc
new file mode 100644
index 000000000..7195d743f
--- /dev/null
+++ b/src/cpu/softfloat3e/f128_to_ui32.cc
@@ -0,0 +1,81 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint32_t f128_to_ui32(float128_t a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    uint64_t uiA64, uiA0;
+    bool sign;
+    int32_t exp;
+    uint64_t sig64;
+    int32_t shiftDist;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.v64;
+    uiA0  = a.v0;
+    sign  = signF128UI64(uiA64);
+    exp   = expF128UI64(uiA64);
+    sig64 = fracF128UI64(uiA64) | (uiA0 != 0);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+#if (ui32_fromNaN != ui32_fromPosOverflow) || (ui32_fromNaN != ui32_fromNegOverflow)
+    if ((exp == 0x7FFF) && sig64) {
+#if (ui32_fromNaN == ui32_fromPosOverflow)
+        sign = 0;
+#elif (ui32_fromNaN == ui32_fromNegOverflow)
+        sign = 1;
+#else
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return ui32_fromNaN;
+#endif
+    }
+#endif
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp) sig64 |= UINT64_C(0x0001000000000000);
+    shiftDist = 0x4023 - exp;
+    if (0 < shiftDist) {
+        sig64 = softfloat_shiftRightJam64(sig64, shiftDist);
+    }
+    return softfloat_roundToUI32(sign, sig64, roundingMode, exact, status);
+}
+
diff --git a/src/cpu/softfloat3e/f128_to_ui32_r_minMag.cc b/src/cpu/softfloat3e/f128_to_ui32_r_minMag.cc
new file mode 100644
index 000000000..96007f6a1
--- /dev/null
+++ b/src/cpu/softfloat3e/f128_to_ui32_r_minMag.cc
@@ -0,0 +1,83 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint32_t f128_to_ui32_r_minMag(float128_t a, bool exact, struct softfloat_status_t *status)
+{
+    uint64_t uiA64, uiA0;
+    int32_t exp;
+    uint64_t sig64;
+    int32_t shiftDist;
+    bool sign;
+    uint32_t z;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.v64;
+    uiA0  = a.v0;
+    exp   = expF128UI64(uiA64);
+    sig64 = fracF128UI64(uiA64) | (uiA0 != 0);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x402F - exp;
+    if (49 <= shiftDist) {
+        if (exact && (exp | sig64)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+        return 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF128UI64(uiA64);
+    if (sign || (shiftDist < 17)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return
+            (exp == 0x7FFF) && sig64 ? ui32_fromNaN
+                : sign ? ui32_fromNegOverflow : ui32_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sig64 |= UINT64_C(0x0001000000000000);
+    z = sig64>>shiftDist;
+    if (exact && ((uint64_t) z<<shiftDist != sig64)) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    return z;
+}
diff --git a/src/cpu/softfloat3e/f128_to_ui64.cc b/src/cpu/softfloat3e/f128_to_ui64.cc
new file mode 100644
index 000000000..989bbc046
--- /dev/null
+++ b/src/cpu/softfloat3e/f128_to_ui64.cc
@@ -0,0 +1,90 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint64_t f128_to_ui64(float128_t a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    uint64_t uiA64, uiA0;
+    bool sign;
+    int32_t exp;
+    uint64_t sig64, sig0;
+    int32_t shiftDist;
+    struct uint128 sig128;
+    struct uint64_extra sigExtra;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.v64;
+    uiA0  = a.v0;
+    sign  = signF128UI64(uiA64);
+    exp   = expF128UI64(uiA64);
+    sig64 = fracF128UI64(uiA64);
+    sig0  = uiA0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x402F - exp;
+    if (shiftDist <= 0) {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (shiftDist < -15) {
+            softfloat_raiseFlags(status, softfloat_flag_invalid);
+            return
+                (exp == 0x7FFF) && (sig64 | sig0) ? ui64_fromNaN
+                    : sign ? ui64_fromNegOverflow : ui64_fromPosOverflow;
+        }
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        sig64 |= UINT64_C(0x0001000000000000);
+        if (shiftDist) {
+            sig128 = softfloat_shortShiftLeft128(sig64, sig0, -shiftDist);
+            sig64 = sig128.v64;
+            sig0  = sig128.v0;
+        }
+    } else {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (exp) sig64 |= UINT64_C(0x0001000000000000);
+        sigExtra = softfloat_shiftRightJam64Extra(sig64, sig0, shiftDist);
+        sig64 = sigExtra.v;
+        sig0  = sigExtra.extra;
+    }
+    return softfloat_roundToUI64(sign, sig64, sig0, roundingMode, exact, status);
+}
diff --git a/src/cpu/softfloat3e/f128_to_ui64_r_minMag.cc b/src/cpu/softfloat3e/f128_to_ui64_r_minMag.cc
new file mode 100644
index 000000000..8d30420b0
--- /dev/null
+++ b/src/cpu/softfloat3e/f128_to_ui64_r_minMag.cc
@@ -0,0 +1,99 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint64_t f128_to_ui64_r_minMag(float128_t a, bool exact, struct softfloat_status_t *status)
+{
+    uint64_t uiA64, uiA0;
+    bool sign;
+    int32_t exp;
+    uint64_t sig64, sig0;
+    int32_t shiftDist;
+    int8_t negShiftDist;
+    uint64_t z;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA64 = a.v64;
+    uiA0  = a.v0;
+    sign  = signF128UI64(uiA64);
+    exp   = expF128UI64(uiA64);
+    sig64 = fracF128UI64(uiA64);
+    sig0  = uiA0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x402F - exp;
+    if (shiftDist < 0) {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (sign || (shiftDist < -15)) goto invalid;
+        sig64 |= UINT64_C(0x0001000000000000);
+        negShiftDist = -shiftDist;
+        z = sig64<<negShiftDist | sig0>>(shiftDist & 63);
+        if (exact && (uint64_t) (sig0<<negShiftDist)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+    } else {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (49 <= shiftDist) {
+            if (exact && (exp | sig64 | sig0)) {
+                softfloat_raiseFlags(status, softfloat_flag_inexact);
+            }
+            return 0;
+        }
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (sign) goto invalid;
+        sig64 |= UINT64_C(0x0001000000000000);
+        z = sig64>>shiftDist;
+        if (exact && (sig0 || (z<<shiftDist != sig64))) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+    }
+    return z;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ invalid:
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    return
+        (exp == 0x7FFF) && (sig64 | sig0) ? ui64_fromNaN
+            : sign ? ui64_fromNegOverflow : ui64_fromPosOverflow;
+}
diff --git a/src/cpu/softfloat3e/f16_addsub.c b/src/cpu/softfloat3e/f16_addsub.c
new file mode 100644
index 000000000..0353e054c
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_addsub.c
@@ -0,0 +1,60 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "softfloat.h"
+
+extern float16 softfloat_addMagsF16(uint16_t, uint16_t, struct softfloat_status_t *);
+extern float16 softfloat_subMagsF16(uint16_t, uint16_t, struct softfloat_status_t *);
+
+float16 f16_add(float16 a, float16 b, struct softfloat_status_t *status)
+{
+    if (signF16UI((uint16_t) a ^ (uint16_t) b)) {
+        return softfloat_subMagsF16(a, b, status);
+    } else {
+        return softfloat_addMagsF16(a, b, status);
+    }
+}
+
+float16 f16_sub(float16 a, float16 b, struct softfloat_status_t *status)
+{
+    if (signF16UI((uint16_t) a ^ (uint16_t) b)) {
+        return softfloat_addMagsF16(a, b, status);
+    } else {
+        return softfloat_subMagsF16(a, b, status);
+    }
+}
diff --git a/src/cpu/softfloat3e/f16_class.c b/src/cpu/softfloat3e/f16_class.c
new file mode 100644
index 000000000..b375c1544
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_class.c
@@ -0,0 +1,64 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "softfloat.h"
+
+softfloat_class_t f16_class(float16 a)
+{
+    bool signA;
+    int8_t expA;
+    uint16_t sigA;
+
+    signA = signF16UI(a);
+    expA  = expF16UI(a);
+    sigA  = fracF16UI(a);
+
+    if (expA == 0x1F) {
+        if (sigA == 0)
+            return (signA) ? softfloat_negative_inf : softfloat_positive_inf;
+
+        return (sigA & 0x200) ? softfloat_QNaN : softfloat_SNaN;
+    }
+
+    if (expA == 0) {
+       if (sigA == 0) return softfloat_zero;
+       return softfloat_denormal;
+   }
+
+   return softfloat_normalized;
+}
diff --git a/src/cpu/softfloat3e/f16_compare.c b/src/cpu/softfloat3e/f16_compare.c
new file mode 100644
index 000000000..1cfd56bec
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_compare.c
@@ -0,0 +1,92 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Compare  between  two  half  precision  floating   point   numbers. Returns
+| 'float_relation_equal'  if the operands are equal, 'float_relation_less' if
+| the    value    'a'   is   less   than   the   corresponding   value   `b',
+| 'float_relation_greater' if the value 'a' is greater than the corresponding
+| value `b', or 'float_relation_unordered' otherwise.
+*----------------------------------------------------------------------------*/
+
+int f16_compare(float16 a, float16 b, bool quiet, struct softfloat_status_t *status)
+{
+    softfloat_class_t aClass;
+    softfloat_class_t bClass;
+    bool signA;
+    bool signB;
+
+    aClass = f16_class(a);
+    bClass = f16_class(b);
+
+    if (aClass == softfloat_SNaN || bClass == softfloat_SNaN) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return softfloat_relation_unordered;
+    }
+
+    if (aClass == softfloat_QNaN || bClass == softfloat_QNaN) {
+        if (! quiet) softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return softfloat_relation_unordered;
+    }
+
+    if (aClass == softfloat_denormal) {
+        if (softfloat_denormalsAreZeros(status))
+            a = a & 0x8000;
+        else
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+
+    if (bClass == softfloat_denormal) {
+        if (softfloat_denormalsAreZeros(status))
+            b = b & 0x8000;
+        else
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+
+    if ((a == b) || ((uint16_t) ((a | b)<<1) == 0)) return softfloat_relation_equal;
+
+    signA = signF16UI(a);
+    signB = signF16UI(b);
+    if (signA != signB)
+        return (signA) ? softfloat_relation_less : softfloat_relation_greater;
+
+    if (signA ^ (a < b)) return softfloat_relation_less;
+    return softfloat_relation_greater;
+}
diff --git a/src/cpu/softfloat3e/f16_div.c b/src/cpu/softfloat3e/f16_div.c
new file mode 100644
index 000000000..c91760b03
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_div.c
@@ -0,0 +1,149 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+#define SOFTFLOAT_FAST_DIV32TO16 1
+
+extern const uint16_t softfloat_approxRecip_1k0s[];
+extern const uint16_t softfloat_approxRecip_1k1s[];
+
+float16 f16_div(float16 a, float16 b, struct softfloat_status_t *status)
+{
+    bool signA;
+    int8_t expA;
+    uint16_t sigA;
+    bool signB;
+    int8_t expB;
+    uint16_t sigB;
+    bool signZ;
+    struct exp8_sig16 normExpSig;
+    int8_t expZ;
+#ifdef SOFTFLOAT_FAST_DIV32TO16
+    uint32_t sig32A;
+    uint16_t sigZ;
+#endif
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    signA = signF16UI(a);
+    expA  = expF16UI(a);
+    sigA  = fracF16UI(a);
+    signB = signF16UI(b);
+    expB  = expF16UI(b);
+    sigB  = fracF16UI(b);
+    signZ = signA ^ signB;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) sigA = 0;
+        if (!expB) sigB = 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x1F) {
+        if (sigA) goto propagateNaN;
+        if (expB == 0x1F) {
+            if (sigB) goto propagateNaN;
+            goto invalid;
+        }
+        if (sigB && !expB)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        goto infinity;
+    }
+    if (expB == 0x1F) {
+        if (sigB) goto propagateNaN;
+        if (sigA && !expA)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        goto zero;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expB) {
+        if (! sigB) {
+            if (! (expA | sigA)) goto invalid;
+            softfloat_raiseFlags(status, softfloat_flag_infinite);
+            goto infinity;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF16Sig(sigB);
+        expB = normExpSig.exp;
+        sigB = normExpSig.sig;
+    }
+    if (! expA) {
+        if (! sigA) goto zero;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF16Sig(sigA);
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expZ = expA - expB + 0xE;
+    sigA |= 0x0400;
+    sigB |= 0x0400;
+#ifdef SOFTFLOAT_FAST_DIV32TO16
+    if (sigA < sigB) {
+        --expZ;
+        sig32A = (uint32_t) sigA<<15;
+    } else {
+        sig32A = (uint32_t) sigA<<14;
+    }
+    sigZ = sig32A / sigB;
+    if (! (sigZ & 7)) sigZ |= ((uint32_t) sigB * sigZ != sig32A);
+#endif
+    return softfloat_roundPackToF16(signZ, expZ, sigZ, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    return softfloat_propagateNaNF16UI(a, b, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ invalid:
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    return defaultNaNF16UI;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ infinity:
+    return packToF16UI(signZ, 0x1F, 0);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ zero:
+    return packToF16UI(signZ, 0, 0);
+}
diff --git a/src/cpu/softfloat3e/f16_getExp.c b/src/cpu/softfloat3e/f16_getExp.c
new file mode 100644
index 000000000..dfade995f
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_getExp.c
@@ -0,0 +1,73 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Extracts the exponent portion of half-precision floating-point value 'a',
+| and returns the result as a half-precision floating-point value
+| representing unbiased integer exponent. The operation is performed according
+| to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
+*----------------------------------------------------------------------------*/
+
+float16 f16_getExp(float16 a, struct softfloat_status_t *status)
+{
+    int8_t expA;
+    uint16_t sigA;
+    struct exp8_sig16 normExpSig;
+
+    expA  = expF16UI(a);
+    sigA  = fracF16UI(a);
+
+    if (expA == 0x1F) {
+        if (sigA) return softfloat_propagateNaNF16UI(a, 0, status);
+        return (float16)packToF32UI(0, 0x1F, 0);
+    }
+
+    if (! expA) {
+        if (! sigA || softfloat_denormalsAreZeros(status))
+            return (float16)packToF32UI(1, 0x1F, 0);
+
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF16Sig(sigA);
+        expA = normExpSig.exp;
+    }
+
+    return i32_to_f16((int32_t)(expA) - 0xF, status);
+}
diff --git a/src/cpu/softfloat3e/f16_getMant.c b/src/cpu/softfloat3e/f16_getMant.c
new file mode 100644
index 000000000..f0d8d5482
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_getMant.c
@@ -0,0 +1,108 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Extracts the mantissa of half-precision floating-point value 'a' and
+| returns the result as a half-precision floating-point after applying
+| the mantissa interval normalization and sign control. The operation is
+| performed according to the IEC/IEEE Standard for Binary Floating-Point
+| Arithmetic.
+*----------------------------------------------------------------------------*/
+
+float16 f16_getMant(float16 a, struct softfloat_status_t *status, int sign_ctrl, int interv)
+{
+    bool signA;
+    int8_t expA;
+    uint16_t sigA;
+    struct exp8_sig16 normExpSig;
+
+    signA = signF16UI(a);
+    expA  = expF16UI(a);
+    sigA  = fracF16UI(a);
+
+    if (expA == 0x1F) {
+        if (sigA) return softfloat_propagateNaNF16UI(a, 0, status);
+        if (signA) {
+            if (sign_ctrl & 0x2) {
+                softfloat_raiseFlags(status, softfloat_flag_invalid);
+                return defaultNaNF16UI;
+            }
+        }
+        return packToF16UI(~sign_ctrl & signA, 0x1F, 0);
+    }
+
+    if (! expA && (! sigA || softfloat_denormalsAreZeros(status))) {
+        return packToF16UI(~sign_ctrl & signA, 0x1F, 0);
+    }
+
+    if (signA) {
+        if (sign_ctrl & 0x2) {
+            softfloat_raiseFlags(status, softfloat_flag_invalid);
+            return defaultNaNF16UI;
+        }
+    }
+
+    if (expA == 0) {
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF16Sig(sigA);
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+        sigA &= 0x3ff;
+    }
+
+    switch(interv) {
+    case 0x0: // interval [1,2)
+        expA = 0xF;
+        break;
+    case 0x1: // interval [1/2,2)
+        expA -= 0xF;
+        expA  = 0xF - (expA & 0x1);
+        break;
+    case 0x2: // interval [1/2,1)
+        expA = 0xE;
+        break;
+    case 0x3: // interval [3/4,3/2)
+        expA = 0xF - ((sigA >> 9) & 0x1);
+        break;
+    }
+
+    return packToF16UI(~sign_ctrl & signA, expA, sigA);
+}
diff --git a/src/cpu/softfloat3e/f16_minmax.c b/src/cpu/softfloat3e/f16_minmax.c
new file mode 100644
index 000000000..11922a1ba
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_minmax.c
@@ -0,0 +1,69 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Compare between two half precision floating point numbers and return the
+| smaller of them.
+*----------------------------------------------------------------------------*/
+
+float16 f16_min(float16 a, float16 b, struct softfloat_status_t *status)
+{
+    if (softfloat_denormalsAreZeros(status)) {
+        a = f16_denormal_to_zero(a);
+        b = f16_denormal_to_zero(b);
+    }
+
+    return (f16_compare_normal(a, b, status) == softfloat_relation_less) ? a : b;
+}
+
+/*----------------------------------------------------------------------------
+| Compare between two half precision floating point numbers and return the
+| larger of them.
+*----------------------------------------------------------------------------*/
+
+float16 f16_max(float16 a, float16 b, struct softfloat_status_t *status)
+{
+    if (softfloat_denormalsAreZeros(status)) {
+        a = f16_denormal_to_zero(a);
+        b = f16_denormal_to_zero(b);
+    }
+
+    return (f16_compare_normal(a, b, status) == softfloat_relation_greater) ? a : b;
+}
diff --git a/src/cpu/softfloat3e/f16_mul.c b/src/cpu/softfloat3e/f16_mul.c
new file mode 100644
index 000000000..2e7e74826
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_mul.c
@@ -0,0 +1,139 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float16 f16_mul(float16 a, float16 b, struct softfloat_status_t *status)
+{
+    bool signA;
+    int8_t expA;
+    uint16_t sigA;
+    bool signB;
+    int8_t expB;
+    uint16_t sigB;
+    bool signZ;
+    uint16_t magBits;
+    struct exp8_sig16 normExpSig;
+    int8_t expZ;
+    uint32_t sig32Z;
+    uint16_t sigZ, uiZ;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    signA = signF16UI(a);
+    expA  = expF16UI(a);
+    sigA  = fracF16UI(a);
+    signB = signF16UI(b);
+    expB  = expF16UI(b);
+    sigB  = fracF16UI(b);
+    signZ = signA ^ signB;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) sigA = 0;
+        if (!expB) sigB = 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x1F) {
+        if (sigA || ((expB == 0x1F) && sigB)) goto propagateNaN;
+        magBits = expB | sigB;
+        if (sigB && !expB) softfloat_raiseFlags(status, softfloat_flag_denormal);
+        goto infArg;
+    }
+    if (expB == 0x1F) {
+        if (sigB) goto propagateNaN;
+        magBits = expA | sigA;
+        if (sigA && !expA) softfloat_raiseFlags(status, softfloat_flag_denormal);
+        goto infArg;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA) {
+        if (! sigA) {
+            if (sigB && !expB) softfloat_raiseFlags(status, softfloat_flag_denormal);
+            goto zero;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF16Sig(sigA);
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    if (! expB) {
+        if (! sigB) {
+            if (sigB && !expB) softfloat_raiseFlags(status, softfloat_flag_denormal);
+            goto zero;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF16Sig(sigB);
+        expB = normExpSig.exp;
+        sigB = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expZ = expA + expB - 0xF;
+    sigA = (sigA | 0x0400)<<4;
+    sigB = (sigB | 0x0400)<<5;
+    sig32Z = (uint32_t) sigA * sigB;
+    sigZ = sig32Z>>16;
+    if (sig32Z & 0xFFFF) sigZ |= 1;
+    if (sigZ < 0x4000) {
+        --expZ;
+        sigZ <<= 1;
+    }
+    return softfloat_roundPackToF16(signZ, expZ, sigZ, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    return softfloat_propagateNaNF16UI(a, b, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ infArg:
+    if (! magBits) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        uiZ = defaultNaNF16UI;
+    } else {
+        uiZ = packToF16UI(signZ, 0x1F, 0);
+    }
+    return uiZ;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ zero:
+    return packToF16UI(signZ, 0, 0);
+}
diff --git a/src/cpu/softfloat3e/f16_mulAdd.c b/src/cpu/softfloat3e/f16_mulAdd.c
new file mode 100644
index 000000000..0e630a9b7
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_mulAdd.c
@@ -0,0 +1,232 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+#include "specialize.h"
+
+float16 f16_mulAdd(float16 a, float16 b, float16 c, uint8_t op, struct softfloat_status_t *status)
+{
+    bool signA;
+    int8_t expA;
+    uint16_t sigA;
+    bool signB;
+    int8_t expB;
+    uint16_t sigB;
+    bool signC;
+    int8_t expC;
+    uint16_t sigC;
+    bool signProd;
+    uint16_t magBits, uiA, uiB, uiC, uiZ;
+    struct exp8_sig16 normExpSig;
+    int8_t expProd;
+    uint32_t sigProd;
+    bool signZ;
+    int8_t expZ;
+    uint16_t sigZ;
+    int8_t expDiff;
+    uint32_t sig32Z, sig32C;
+    int8_t shiftDist;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA = a;
+    uiB = b;
+    uiC = c;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    signA = signF16UI(uiA);
+    expA  = expF16UI(uiA);
+    sigA  = fracF16UI(uiA);
+    signB = signF16UI(uiB);
+    expB  = expF16UI(uiB);
+    sigB  = fracF16UI(uiB);
+    signC = signF16UI(uiC) ^ ((op & softfloat_mulAdd_subC) != 0);
+    expC  = expF16UI(uiC);
+    sigC  = fracF16UI(uiC);
+    signProd = signA ^ signB ^ ((op & softfloat_mulAdd_subProd) != 0);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    bool aisNaN = (expA == 0x1F) && sigA;
+    bool bisNaN = (expB == 0x1F) && sigB;
+    bool cisNaN = (expC == 0x1F) && sigC;
+    if (aisNaN | bisNaN | cisNaN) {
+        uiZ = (aisNaN | bisNaN) ? softfloat_propagateNaNF16UI(uiA, uiB, status) : 0;
+        return softfloat_propagateNaNF16UI(uiZ, uiC, status);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) sigA = 0;
+        if (!expB) sigB = 0;
+        if (!expC) sigC = 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x1F) {
+        magBits = expB | sigB;
+        goto infProdArg;
+    }
+    if (expB == 0x1F) {
+        magBits = expA | sigA;
+        goto infProdArg;
+    }
+    if (expC == 0x1F) {
+        if ((sigA && !expA) || (sigB && !expB)) {
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        }
+        return packToF16UI(signC, 0x1F, 0);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA) {
+        if (! sigA) goto zeroProd;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF16Sig(sigA);
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    if (! expB) {
+        if (! sigB) goto zeroProd;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF16Sig(sigB);
+        expB = normExpSig.exp;
+        sigB = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expProd = expA + expB - 0xE;
+    sigA = (sigA | 0x0400)<<4;
+    sigB = (sigB | 0x0400)<<4;
+    sigProd = (uint32_t) sigA * sigB;
+    if (sigProd < 0x20000000) {
+        --expProd;
+        sigProd <<= 1;
+    }
+    signZ = signProd;
+    if (! expC) {
+        if (! sigC) {
+            expZ = expProd - 1;
+            sigZ = sigProd>>15 | ((sigProd & 0x7FFF) != 0);
+            goto roundPack;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF16Sig(sigC);
+        expC = normExpSig.exp;
+        sigC = normExpSig.sig;
+    }
+    sigC = (sigC | 0x0400)<<3;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expDiff = expProd - expC;
+    if (signProd == signC) {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (expDiff <= 0) {
+            expZ = expC;
+            sigZ = sigC + softfloat_shiftRightJam32(sigProd, 16 - expDiff);
+        } else {
+            expZ = expProd;
+            sig32Z = sigProd + softfloat_shiftRightJam32((uint32_t) sigC<<16, expDiff);
+            sigZ = sig32Z>>16 | ((sig32Z & 0xFFFF) != 0);
+        }
+        if (sigZ < 0x4000) {
+            --expZ;
+            sigZ <<= 1;
+        }
+    } else {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        sig32C = (uint32_t) sigC<<16;
+        if (expDiff < 0) {
+            signZ = signC;
+            expZ = expC;
+            sig32Z = sig32C - softfloat_shiftRightJam32(sigProd, -expDiff);
+        } else if (! expDiff) {
+            expZ = expProd;
+            sig32Z = sigProd - sig32C;
+            if (! sig32Z) goto completeCancellation;
+            if (sig32Z & 0x80000000) {
+                signZ = ! signZ;
+                sig32Z = -sig32Z;
+            }
+        } else {
+            expZ = expProd;
+            sig32Z = sigProd - softfloat_shiftRightJam32(sig32C, expDiff);
+        }
+        shiftDist = softfloat_countLeadingZeros32(sig32Z) - 1;
+        expZ -= shiftDist;
+        shiftDist -= 16;
+        if (shiftDist < 0) {
+            sigZ = sig32Z>>(-shiftDist) | ((uint32_t) (sig32Z<<(shiftDist & 31)) != 0);
+        } else {
+            sigZ = (uint16_t) sig32Z<<shiftDist;
+        }
+    }
+ roundPack:
+    return softfloat_roundPackToF16(signZ, expZ, sigZ, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ infProdArg:
+    if (magBits) {
+        uiZ = packToF16UI(signProd, 0x1F, 0);
+        if (signProd == signC || expC != 0x1F) {
+            if ((sigA && !expA) || (sigB && !expB) || (sigC && !expC))
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+            return uiZ;
+        }
+    }
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    uiZ = defaultNaNF16UI;
+    return softfloat_propagateNaNF16UI(uiZ, uiC, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ zeroProd:
+    uiZ = packToF16UI(signC, expC, sigC);
+    if (!expC && sigC) {
+        /* Exact zero plus a denormal */
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        if (softfloat_flushUnderflowToZero(status)) {
+            softfloat_raiseFlags(status, softfloat_flag_underflow | softfloat_flag_inexact);
+            return packToF16UI(signC, 0, 0);
+        }
+    }
+    if (! (expC | sigC) && (signProd != signC)) {
+ completeCancellation:
+        uiZ = packToF16UI((softfloat_getRoundingMode(status) == softfloat_round_min), 0, 0);
+    }
+    return uiZ;
+}
diff --git a/src/cpu/softfloat3e/f16_range.c b/src/cpu/softfloat3e/f16_range.c
new file mode 100644
index 000000000..57bc35d98
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_range.c
@@ -0,0 +1,135 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float16 f16_range(float16 a, float16 b, bool is_max, bool is_abs, int sign_ctrl, struct softfloat_status_t *status)
+{
+    bool signA;
+    int8_t expA;
+    uint16_t sigA;
+    bool signB;
+    int8_t expB;
+    uint16_t sigB;
+    bool aIsNaN, bIsNaN;
+    uint16_t z;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    signA = signF16UI(a);
+    expA  = expF16UI(a);
+    sigA  = fracF16UI(a);
+    signB = signF16UI(b);
+    expB  = expF16UI(b);
+    sigB  = fracF16UI(b);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_isSigNaNF16UI(a)) {
+        return softfloat_propagateNaNF16UI(a, 0, status);
+    }
+    if (softfloat_isSigNaNF16UI(b)) {
+        return softfloat_propagateNaNF16UI(b, 0, status);
+    }
+
+    aIsNaN = isNaNF16UI(a);
+    bIsNaN = isNaNF16UI(b);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA && sigA) {
+        if (softfloat_denormalsAreZeros(status)) {
+            a = packToF16UI(signA, 0, 0);
+        }
+        else if (! bIsNaN) {
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        }
+    }
+
+    if (! expB && sigB) {
+        if (softfloat_denormalsAreZeros(status)) {
+            b = packToF16UI(signB, 0, 0);
+        }
+        else if (! aIsNaN) {
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        }
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (bIsNaN) {
+        z = a;
+    }
+    else if (aIsNaN) {
+        z = b;
+    }
+    else if (signA != signB && ! is_abs) {
+        if (! is_max) {
+            z = signA ? a : b;
+        } else {
+            z = signA ? b : a;
+        }
+    } else {
+        float16 tmp_a = a, tmp_b = b;
+        if (is_abs) {
+            tmp_a = tmp_a & ~0x8000; // clear the sign bit
+            tmp_b = tmp_b & ~0x8000;
+            signA = 0;
+        }
+
+        if (! is_max) {
+            z = (signA ^ (tmp_a < tmp_b)) ? a : b;
+        } else {
+            z = (signA ^ (tmp_a < tmp_b)) ? b : a;
+        }
+    }
+
+    switch(sign_ctrl) {
+    case 0:
+        z = (z & ~0x8000) | (a & 0x8000); // keep sign of a
+        break;
+    case 1:
+        break; // preserve sign of compare result
+    case 2:
+        z = z & ~0x8000; // zero out the sign bit
+        break;
+    case 3:
+        z = z | 0x8000;  // set the sign bit
+        break;
+    }
+
+    return z;
+}
diff --git a/src/cpu/softfloat3e/f16_roundToInt.c b/src/cpu/softfloat3e/f16_roundToInt.c
new file mode 100644
index 000000000..ee9be0c0b
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_roundToInt.c
@@ -0,0 +1,112 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2017 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float16 f16_roundToInt(float16 a, uint8_t scale, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    int8_t exp;
+    uint16_t frac;
+    bool sign;
+    uint16_t uiZ, lastBitMask, roundBitsMask;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    scale &= 0xF;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    exp = expF16UI(a);
+    frac = fracF16UI(a);
+    sign = signF16UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (0x19 <= (exp + scale)) {
+        if ((exp == 0x1F) && frac) {
+            return softfloat_propagateNaNF16UI(a, 0, status);
+        }
+        return a;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!exp) {
+            frac = 0;
+            a = packToF16UI(sign, 0, 0);
+        }
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if ((exp + scale) <= 0xE) {
+        if (!(exp | frac)) return a;
+        if (exact) softfloat_raiseFlags(status, softfloat_flag_inexact);
+        uiZ = packToF16UI(sign, 0, 0);
+        switch (roundingMode) {
+         case softfloat_round_near_even:
+            if (!frac) break;
+         case softfloat_round_near_maxMag:
+            if ((exp + scale) == 0xE) uiZ |= packToF16UI(0, 0xF - scale, 0);
+            break;
+         case softfloat_round_min:
+            if (uiZ) uiZ = packToF16UI(1, 0xF - scale, 0);
+            break;
+         case softfloat_round_max:
+            if (!uiZ) uiZ = packToF16UI(0, 0xF - scale, 0);
+            break;
+        }
+        return uiZ;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiZ = a;
+    lastBitMask = (uint16_t) 1<<(0x19 - exp - scale);
+    roundBitsMask = lastBitMask - 1;
+    if (roundingMode == softfloat_round_near_maxMag) {
+        uiZ += lastBitMask>>1;
+    } else if (roundingMode == softfloat_round_near_even) {
+        uiZ += lastBitMask>>1;
+        if (!(uiZ & roundBitsMask)) uiZ &= ~lastBitMask;
+    } else if (roundingMode == (signF16UI(uiZ) ? softfloat_round_min : softfloat_round_max)) {
+        uiZ += roundBitsMask;
+    }
+    uiZ &= ~roundBitsMask;
+    if (uiZ != a) {
+        if (exact) softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    return uiZ;
+}
diff --git a/src/cpu/softfloat3e/f16_sqrt.c b/src/cpu/softfloat3e/f16_sqrt.c
new file mode 100644
index 000000000..f0f8afef1
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_sqrt.c
@@ -0,0 +1,130 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+extern const uint16_t softfloat_approxRecipSqrt_1k0s[];
+extern const uint16_t softfloat_approxRecipSqrt_1k1s[];
+
+float16 f16_sqrt(float16 a, struct softfloat_status_t *status)
+{
+    bool signA;
+    int8_t expA;
+    uint16_t sigA;
+    struct exp8_sig16 normExpSig;
+    int8_t expZ;
+    int index;
+    uint16_t r0;
+    uint32_t ESqrR0;
+    uint16_t sigma0;
+    uint16_t recipSqrt16, sigZ, shiftedSigZ;
+    uint16_t negRem;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    signA = signF16UI(a);
+    expA  = expF16UI(a);
+    sigA  = fracF16UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x1F) {
+        if (sigA) {
+            return softfloat_propagateNaNF16UI(a, 0, status);
+        }
+        if (! signA) return a;
+        goto invalid;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) {
+            sigA = 0;
+            a = packToF16UI(signA, 0, 0);
+        }
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (signA) {
+        if (! (expA | sigA)) return a;
+        goto invalid;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA) {
+        if (! sigA) return a;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF16Sig(sigA);
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expZ = ((expA - 0xF)>>1) + 0xE;
+    expA &= 1;
+    sigA |= 0x0400;
+    index = (sigA>>6 & 0xE) + expA;
+    r0 = softfloat_approxRecipSqrt_1k0s[index]
+             - (((uint32_t) softfloat_approxRecipSqrt_1k1s[index] * (sigA & 0x7F)) >>11);
+    ESqrR0 = ((uint32_t) r0 * r0)>>1;
+    if (expA) ESqrR0 >>= 1;
+    sigma0 = ~(uint16_t) ((ESqrR0 * sigA)>>16);
+    recipSqrt16 = r0 + (((uint32_t) r0 * sigma0)>>25);
+    if (! (recipSqrt16 & 0x8000)) recipSqrt16 = 0x8000;
+    sigZ = ((uint32_t) (sigA<<5) * recipSqrt16)>>16;
+    if (expA) sigZ >>= 1;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    ++sigZ;
+    if (! (sigZ & 7)) {
+        shiftedSigZ = sigZ>>1;
+        negRem = shiftedSigZ * shiftedSigZ;
+        sigZ &= ~1;
+        if (negRem & 0x8000) {
+            sigZ |= 1;
+        } else {
+            if (negRem) --sigZ;
+        }
+    }
+    return softfloat_roundPackToF16(0, expZ, sigZ, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ invalid:
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    return defaultNaNF16UI;
+}
diff --git a/src/cpu/softfloat3e/f16_to_extF80.cc b/src/cpu/softfloat3e/f16_to_extF80.cc
new file mode 100644
index 000000000..418be8083
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_to_extF80.cc
@@ -0,0 +1,88 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+extFloat80_t f16_to_extF80(float16 a, struct softfloat_status_t *status)
+{
+    bool sign;
+    int8_t exp;
+    uint16_t frac;
+    struct commonNaN commonNaN;
+    struct uint128 uiZ;
+    uint16_t uiZ64;
+    uint64_t uiZ0;
+    struct exp8_sig16 normExpSig;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF16UI(a);
+    exp  = expF16UI(a);
+    frac = fracF16UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0x1F) {
+        if (frac) {
+            softfloat_f16UIToCommonNaN(a, &commonNaN, status);
+            uiZ = softfloat_commonNaNToExtF80UI(&commonNaN);
+            uiZ64 = uiZ.v64;
+            uiZ0  = uiZ.v0;
+        } else {
+            uiZ64 = packToExtF80UI64(sign, 0x7FFF);
+            uiZ0  = UINT64_C(0x8000000000000000);
+        }
+        return packToExtF80_twoargs(uiZ64, uiZ0);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! exp) {
+        if (! frac) {
+            return packToExtF80(sign, 0, 0);
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF16Sig(frac);
+        exp = normExpSig.exp;
+        frac = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiZ64 = packToExtF80UI64(sign, exp + 0x3FF0);
+    uiZ0  = (uint64_t) (frac | 0x0400)<<53;
+    return packToExtF80_twoargs(uiZ64, uiZ0);
+}
diff --git a/src/cpu/softfloat3e/f16_to_f32.c b/src/cpu/softfloat3e/f16_to_f32.c
new file mode 100644
index 000000000..4d862161d
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_to_f32.c
@@ -0,0 +1,81 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float32 f16_to_f32(float16 a, struct softfloat_status_t *status)
+{
+    bool sign;
+    int8_t exp;
+    uint16_t frac;
+    struct commonNaN commonNaN;
+    uint32_t uiZ;
+    struct exp8_sig16 normExpSig;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF16UI(a);
+    exp  = expF16UI(a);
+    frac = fracF16UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0x1F) {
+        if (frac) {
+            softfloat_f16UIToCommonNaN(a, &commonNaN, status);
+            uiZ = softfloat_commonNaNToF32UI(&commonNaN);
+        } else {
+            uiZ = packToF32UI(sign, 0xFF, 0);
+        }
+        return uiZ;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! exp) {
+        if (! frac || softfloat_denormalsAreZeros(status)) {
+            return packToF32UI(sign, 0, 0);
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF16Sig(frac);
+        exp = normExpSig.exp - 1;
+        frac = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    return packToF32UI(sign, exp + 0x70, (uint32_t) frac<<13);
+}
diff --git a/src/cpu/softfloat3e/f16_to_f64.c b/src/cpu/softfloat3e/f16_to_f64.c
new file mode 100644
index 000000000..7d61b6357
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_to_f64.c
@@ -0,0 +1,81 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float64 f16_to_f64(float16 a, struct softfloat_status_t *status)
+{
+    bool sign;
+    int8_t exp;
+    uint16_t frac;
+    struct commonNaN commonNaN;
+    uint64_t uiZ;
+    struct exp8_sig16 normExpSig;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF16UI(a);
+    exp  = expF16UI(a);
+    frac = fracF16UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0x1F) {
+        if (frac) {
+            softfloat_f16UIToCommonNaN(a, &commonNaN, status);
+            uiZ = softfloat_commonNaNToF64UI(&commonNaN);
+        } else {
+            uiZ = packToF64UI(sign, 0x7FF, 0);
+        }
+        return uiZ;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! exp) {
+        if (! frac || softfloat_denormalsAreZeros(status)) {
+            return packToF64UI(sign, 0, 0);
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF16Sig(frac);
+        exp = normExpSig.exp - 1;
+        frac = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    return packToF64UI(sign, exp + 0x3F0, (uint64_t) frac<<42);
+}
diff --git a/src/cpu/softfloat3e/f16_to_i32.c b/src/cpu/softfloat3e/f16_to_i32.c
new file mode 100644
index 000000000..d00cfe236
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_to_i32.c
@@ -0,0 +1,81 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int32_t f16_to_i32(float16 a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    bool sign;
+    int8_t exp;
+    uint16_t frac;
+    int32_t sig32;
+    int8_t shiftDist;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF16UI(a);
+    exp  = expF16UI(a);
+    frac = fracF16UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0x1F) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return
+            frac ? i32_fromNaN
+                : sign ? i32_fromNegOverflow : i32_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sig32 = frac;
+    if (exp) {
+        sig32 |= 0x0400;
+        shiftDist = exp - 0x19;
+        if (0 <= shiftDist) {
+            sig32 <<= shiftDist;
+            return sign ? -sig32 : sig32;
+        }
+        shiftDist = exp - 0x0D;
+        if (0 < shiftDist) sig32 <<= shiftDist;
+    }
+    else {
+        if (softfloat_denormalsAreZeros(status)) sig32 = 0;
+    }
+    return softfloat_roundToI32(sign, (uint32_t) sig32, roundingMode, exact, status);
+}
+
diff --git a/src/cpu/softfloat3e/f16_to_i32_r_minMag.c b/src/cpu/softfloat3e/f16_to_i32_r_minMag.c
new file mode 100644
index 000000000..9a6bbdf83
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_to_i32_r_minMag.c
@@ -0,0 +1,82 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int32_t f16_to_i32_r_minMag(float16 a, bool exact, struct softfloat_status_t *status)
+{
+    int8_t exp;
+    uint16_t frac;
+    int8_t shiftDist;
+    bool sign;
+    int32_t alignedSig;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    exp  = expF16UI(a);
+    frac = fracF16UI(a);
+    if (softfloat_denormalsAreZeros(status))
+        if (!exp && frac) frac = 0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = exp - 0x0F;
+    if (shiftDist < 0) {
+        if (exact && (exp | frac)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+        return 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF16UI(a);
+    if (exp == 0x1F) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return (exp == 0x1F) && frac
+                ? i32_fromNaN
+                : sign ? i32_fromNegOverflow : i32_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    alignedSig = (int32_t) (frac | 0x0400)<<shiftDist;
+    if (exact && (alignedSig & 0x3FF)) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    alignedSig >>= 10;
+    return sign ? -alignedSig : alignedSig;
+}
diff --git a/src/cpu/softfloat3e/f16_to_i64.c b/src/cpu/softfloat3e/f16_to_i64.c
new file mode 100644
index 000000000..7dcbeaad8
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_to_i64.c
@@ -0,0 +1,80 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int64_t f16_to_i64(float16 a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    bool sign;
+    int8_t exp;
+    uint16_t frac;
+    int32_t sig32;
+    int8_t shiftDist;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF16UI(a);
+    exp  = expF16UI(a);
+    frac = fracF16UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0x1F) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return
+            frac ? i64_fromNaN
+                : sign ? i64_fromNegOverflow : i64_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sig32 = frac;
+    if (exp) {
+        sig32 |= 0x0400;
+        shiftDist = exp - 0x19;
+        if (0 <= shiftDist) {
+            sig32 <<= shiftDist;
+            return sign ? -sig32 : sig32;
+        }
+        shiftDist = exp - 0x0D;
+        if (0 < shiftDist) sig32 <<= shiftDist;
+    }
+    else {
+        if (softfloat_denormalsAreZeros(status)) sig32 = 0;
+    }
+    return softfloat_roundToI32(sign, (uint32_t) sig32, roundingMode, exact, status);
+}
diff --git a/src/cpu/softfloat3e/f16_to_i64_r_minMag.c b/src/cpu/softfloat3e/f16_to_i64_r_minMag.c
new file mode 100644
index 000000000..4289c5352
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_to_i64_r_minMag.c
@@ -0,0 +1,82 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int64_t f16_to_i64_r_minMag(float16 a, bool exact, struct softfloat_status_t *status)
+{
+    int8_t exp;
+    uint16_t frac;
+    int8_t shiftDist;
+    bool sign;
+    int32_t alignedSig;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    exp  = expF16UI(a);
+    frac = fracF16UI(a);
+    if (softfloat_denormalsAreZeros(status))
+        if (!exp && frac) frac = 0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = exp - 0x0F;
+    if (shiftDist < 0) {
+        if (exact && (exp | frac)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+        return 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF16UI(a);
+    if (exp == 0x1F) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return (exp == 0x1F) && frac
+                ? i64_fromNaN
+                : sign ? i64_fromNegOverflow : i64_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    alignedSig = (int32_t) (frac | 0x0400)<<shiftDist;
+    if (exact && (alignedSig & 0x3FF)) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    alignedSig >>= 10;
+    return sign ? -alignedSig : alignedSig;
+}
diff --git a/src/cpu/softfloat3e/f16_to_ui32.c b/src/cpu/softfloat3e/f16_to_ui32.c
new file mode 100644
index 000000000..d217b2627
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_to_ui32.c
@@ -0,0 +1,79 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint32_t f16_to_ui32(float16 a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    bool sign;
+    int8_t exp;
+    uint16_t frac;
+    uint32_t sig32;
+    int8_t shiftDist;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF16UI(a);
+    exp  = expF16UI(a);
+    frac = fracF16UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0x1F) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return
+            frac ? ui32_fromNaN
+                : sign ? ui32_fromNegOverflow : ui32_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sig32 = frac;
+    if (exp) {
+        sig32 |= 0x0400;
+        shiftDist = exp - 0x19;
+        if ((0 <= shiftDist) && ! sign) {
+            return sig32<<shiftDist;
+        }
+        shiftDist = exp - 0x0D;
+        if (0 < shiftDist) sig32 <<= shiftDist;
+    }
+    else {
+        if (softfloat_denormalsAreZeros(status)) sig32 = 0;
+    }
+    return softfloat_roundToUI32(sign, sig32, roundingMode, exact, status);
+}
diff --git a/src/cpu/softfloat3e/f16_to_ui32_r_minMag.c b/src/cpu/softfloat3e/f16_to_ui32_r_minMag.c
new file mode 100644
index 000000000..c5b8aae5a
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_to_ui32_r_minMag.c
@@ -0,0 +1,81 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint32_t f16_to_ui32_r_minMag(float16 a, bool exact, struct softfloat_status_t *status)
+{
+    int8_t exp;
+    uint16_t frac;
+    int8_t shiftDist;
+    bool sign;
+    uint32_t alignedSig;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    exp  = expF16UI(a);
+    frac = fracF16UI(a);
+    if (softfloat_denormalsAreZeros(status))
+        if (!exp && frac) frac = 0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = exp - 0x0F;
+    if (shiftDist < 0) {
+        if (exact && (exp | frac)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+        return 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF16UI(a);
+    if (sign || (exp == 0x1F)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return (exp == 0x1F) && frac
+                ? ui32_fromNaN
+                : sign ? ui32_fromNegOverflow : ui32_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    alignedSig = (uint32_t) (frac | 0x0400)<<shiftDist;
+    if (exact && (alignedSig & 0x3FF)) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    return alignedSig>>10;
+}
diff --git a/src/cpu/softfloat3e/f16_to_ui64.c b/src/cpu/softfloat3e/f16_to_ui64.c
new file mode 100644
index 000000000..351edb32c
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_to_ui64.c
@@ -0,0 +1,79 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint64_t f16_to_ui64(float16 a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    bool sign;
+    int8_t exp;
+    uint16_t frac;
+    uint32_t sig32;
+    int8_t shiftDist;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF16UI(a);
+    exp  = expF16UI(a);
+    frac = fracF16UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0x1F) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return
+            frac ? ui64_fromNaN
+                : sign ? ui64_fromNegOverflow : ui64_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sig32 = frac;
+    if (exp) {
+        sig32 |= 0x0400;
+        shiftDist = exp - 0x19;
+        if ((0 <= shiftDist) && ! sign) {
+            return sig32<<shiftDist;
+        }
+        shiftDist = exp - 0x0D;
+        if (0 < shiftDist) sig32 <<= shiftDist;
+    }
+    else {
+        if (softfloat_denormalsAreZeros(status)) sig32 = 0;
+    }
+    return softfloat_roundToUI64(sign, sig32>>12, (uint64_t) sig32<<52, roundingMode, exact, status);
+}
diff --git a/src/cpu/softfloat3e/f16_to_ui64_r_minMag.c b/src/cpu/softfloat3e/f16_to_ui64_r_minMag.c
new file mode 100644
index 000000000..d80d6e8f5
--- /dev/null
+++ b/src/cpu/softfloat3e/f16_to_ui64_r_minMag.c
@@ -0,0 +1,81 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint64_t f16_to_ui64_r_minMag(float16 a, bool exact, struct softfloat_status_t *status)
+{
+    int8_t exp;
+    uint16_t frac;
+    int8_t shiftDist;
+    bool sign;
+    uint32_t alignedSig;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    exp  = expF16UI(a);
+    frac = fracF16UI(a);
+    if (softfloat_denormalsAreZeros(status))
+        if (!exp && frac) frac = 0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = exp - 0x0F;
+    if (shiftDist < 0) {
+        if (exact && (exp | frac)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+        return 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF16UI(a);
+    if (sign || (exp == 0x1F)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return (exp == 0x1F) && frac
+                ? ui64_fromNaN
+                : sign ? ui64_fromNegOverflow : ui64_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    alignedSig = (uint32_t) (frac | 0x0400)<<shiftDist;
+    if (exact && (alignedSig & 0x3FF)) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    return alignedSig>>10;
+}
diff --git a/src/cpu/softfloat/f2xm1.cc b/src/cpu/softfloat3e/f2xm1.cc
similarity index 77%
rename from src/cpu/softfloat/f2xm1.cc
rename to src/cpu/softfloat3e/f2xm1.cc
index ed4af1d12..16daec1d3 100644
--- a/src/cpu/softfloat/f2xm1.cc
+++ b/src/cpu/softfloat3e/f2xm1.cc
@@ -25,12 +25,15 @@ these four paragraphs for those parts of this code that are retained.
 
 #define FLOAT128
 
-#include "softfloatx80.h"
-#include "softfloat-round-pack.h"
+#include "config.h"
+#include "specialize.h"
+
+#include "fpu_trans.h"
+#include "softfloat-helpers.h"
 
 static const floatx80 floatx80_negone  = packFloatx80(1, 0x3fff, BX_CONST64(0x8000000000000000));
 static const floatx80 floatx80_neghalf = packFloatx80(1, 0x3ffe, BX_CONST64(0x8000000000000000));
-static const float128 float128_ln2     =
+static const float128_t float128_ln2   =
     packFloat128(BX_CONST64(0x3ffe62e42fefa39e), BX_CONST64(0xf35793c7673007e6));
 
 #ifdef BETTER_THAN_PENTIUM
@@ -47,7 +50,7 @@ static const float128 float128_ln2     =
 
 #define EXP_ARR_SIZE 15
 
-static float128 exp_arr[EXP_ARR_SIZE] =
+static float128_t exp_arr[EXP_ARR_SIZE] =
 {
     PACK_FLOAT_128(0x3fff000000000000, 0x0000000000000000), /*  1 */
     PACK_FLOAT_128(0x3ffe000000000000, 0x0000000000000000), /*  2 */
@@ -66,10 +69,10 @@ static float128 exp_arr[EXP_ARR_SIZE] =
     PACK_FLOAT_128(0x3fd6ae7f3e733b81, 0xf11d8656b0ee8cb0)  /* 15 */
 };
 
-extern float128 EvalPoly(float128 x, float128 *arr, int n, struct float_status_t *status);
+extern float128_t EvalPoly(float128_t x, const float128_t *arr, int n, struct softfloat_status_t *status);
 
 /* required -1 < x < 1 */
-static float128 poly_exp(float128 x, struct float_status_t *status)
+static float128_t poly_exp(float128_t x, struct softfloat_status_t *status)
 {
 /*
     //               2     3     4     5     6     7     8     9
@@ -92,8 +95,8 @@ static float128 poly_exp(float128 x, struct float_status_t *status)
     //   e  - 1 ~ x * [ p(x) + x * q(x) ]
     //
 */
-    float128 t = EvalPoly(x, exp_arr, EXP_ARR_SIZE, status);
-    return float128_mul(t, x, status);
+    float128_t t = EvalPoly(x, (const float128_t*) exp_arr, EXP_ARR_SIZE, status);
+    return f128_mul(t, x, status);
 }
 
 // =================================================
@@ -114,49 +117,51 @@ static float128 poly_exp(float128 x, struct float_status_t *status)
 //     e  = 1 + --- + --- + --- + --- + --- + ... + --- + ...
 //               1!    2!    3!    4!    5!          n!
 //
-
-floatx80 f2xm1(floatx80 a, struct float_status_t *status)
+floatx80 f2xm1(floatx80 a, struct softfloat_status_t *status)
 {
 /*----------------------------------------------------------------------------
 | The pattern for a default generated extended double-precision NaN.
 *----------------------------------------------------------------------------*/
-    const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
-    Bit64u zSig0, zSig1, zSig2;
+    static const floatx80 floatx80_default_nan =
+        packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
+
+    uint64_t zSig0, zSig1, zSig2;
+    struct exp32_sig64 normExpSig;
 
     // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a))
-    {
-        float_raise(status, float_flag_invalid);
+    if (extF80_isUnsupported(a)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
         return floatx80_default_nan;
     }
 
-    Bit64u aSig = extractFloatx80Frac(a);
-    Bit32s aExp = extractFloatx80Exp(a);
-    int aSign = extractFloatx80Sign(a);
+    uint64_t aSig = extF80_fraction(a);
+    int32_t aExp = extF80_exp(a);
+    int aSign = extF80_sign(a);
 
     if (aExp == 0x7FFF) {
-        if ((Bit64u) (aSig<<1))
-            return propagateFloatx80NaNOne(a, status);
+        if (aSig << 1)
+            return softfloat_propagateNaNExtF80UI(a.signExp, aSig, 0, 0, status);
 
         return (aSign) ? floatx80_negone : a;
     }
 
-    if (aExp == 0) {
-        if (aSig == 0) return a;
-        float_raise(status, float_flag_denormal | float_flag_inexact);
-        normalizeFloatx80Subnormal(aSig, &aExp, &aSig);
+    if (! aExp) {
+        if (! aSig) return a;
+        softfloat_raiseFlags(status, softfloat_flag_denormal | softfloat_flag_inexact);
+        normExpSig = softfloat_normSubnormalExtF80Sig(aSig);
+        aExp = normExpSig.exp + 1;
+        aSig = normExpSig.sig;
 
     tiny_argument:
         mul128By64To192(LN2_SIG_HI, LN2_SIG_LO, aSig, &zSig0, &zSig1, &zSig2);
-        if (0 < (Bit64s) zSig0) {
+        if (0 < (int64_t) zSig0) {
             shortShift128Left(zSig0, zSig1, 1, &zSig0, &zSig1);
             --aExp;
         }
-        return
-            roundAndPackFloatx80(80, aSign, aExp, zSig0, zSig1, status);
+        return softfloat_roundPackToExtF80(aSign, aExp, zSig0, zSig1, 80, status);
     }
 
-    float_raise(status, float_flag_inexact);
+    softfloat_raiseFlags(status, softfloat_flag_inexact);
 
     if (aExp < 0x3FFF)
     {
@@ -167,14 +172,14 @@ floatx80 f2xm1(floatx80 a, struct float_status_t *status)
         /* using float128 for approximation */
         /* ******************************** */
 
-        float128 x = floatx80_to_float128(a, status);
-        x = float128_mul(x, float128_ln2, status);
+        float128_t x = extF80_to_f128(a, status);
+        x = f128_mul(x, float128_ln2, status);
         x = poly_exp(x, status);
-        return float128_to_floatx80(x, status);
+        return f128_to_extF80(x, status);
     }
     else
     {
-        if (a.exp == 0xBFFF && ! (aSig<<1))
+        if (a.signExp == 0xBFFF && ! (aSig<<1))
            return floatx80_neghalf;
 
         return a;
diff --git a/src/cpu/softfloat3e/f32_addsub.c b/src/cpu/softfloat3e/f32_addsub.c
new file mode 100644
index 000000000..0b12d0e76
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_addsub.c
@@ -0,0 +1,60 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "softfloat.h"
+
+extern float32 softfloat_addMagsF32(uint32_t, uint32_t, struct softfloat_status_t *);
+extern float32 softfloat_subMagsF32(uint32_t, uint32_t, struct softfloat_status_t *);
+
+float32 f32_add(float32 a, float32 b, struct softfloat_status_t *status)
+{
+    if (signF32UI((uint32_t) a ^ (uint32_t) b)) {
+        return softfloat_subMagsF32(a, b, status);
+    } else {
+        return softfloat_addMagsF32(a, b, status);
+    }
+}
+
+float32 f32_sub(float32 a, float32 b, struct softfloat_status_t *status)
+{
+    if (signF32UI((uint32_t) a ^ (uint32_t) b)) {
+        return softfloat_addMagsF32(a, b, status);
+    } else {
+        return softfloat_subMagsF32(a, b, status);
+    }
+}
diff --git a/src/cpu/softfloat3e/f32_class.c b/src/cpu/softfloat3e/f32_class.c
new file mode 100644
index 000000000..84c337d0e
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_class.c
@@ -0,0 +1,64 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "softfloat.h"
+
+softfloat_class_t f32_class(float32 a)
+{
+    bool signA;
+    int16_t expA;
+    uint32_t sigA;
+
+    signA = signF32UI(a);
+    expA  = expF32UI(a);
+    sigA  = fracF32UI(a);
+
+    if (expA == 0xFF) {
+        if (sigA == 0)
+            return (signA) ? softfloat_negative_inf : softfloat_positive_inf;
+
+        return (sigA & 0x00400000) ? softfloat_QNaN : softfloat_SNaN;
+   }
+
+    if (expA == 0) {
+       if (sigA == 0) return softfloat_zero;
+       return softfloat_denormal;
+   }
+
+   return softfloat_normalized;
+}
diff --git a/src/cpu/softfloat3e/f32_compare.c b/src/cpu/softfloat3e/f32_compare.c
new file mode 100644
index 000000000..6c8ecfaae
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_compare.c
@@ -0,0 +1,92 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Compare  between  two  single  precision  floating  point  numbers. Returns
+| 'float_relation_equal'  if the operands are equal, 'float_relation_less' if
+| the    value    'a'   is   less   than   the   corresponding   value   `b',
+| 'float_relation_greater' if the value 'a' is greater than the corresponding
+| value `b', or 'float_relation_unordered' otherwise.
+*----------------------------------------------------------------------------*/
+
+int f32_compare(float32 a, float32 b, bool quiet, struct softfloat_status_t *status)
+{
+    softfloat_class_t aClass;
+    softfloat_class_t bClass;
+    bool signA;
+    bool signB;
+
+    aClass = f32_class(a);
+    bClass = f32_class(b);
+
+    if (aClass == softfloat_SNaN || bClass == softfloat_SNaN) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return softfloat_relation_unordered;
+    }
+
+    if (aClass == softfloat_QNaN || bClass == softfloat_QNaN) {
+        if (! quiet) softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return softfloat_relation_unordered;
+    }
+
+    if (aClass == softfloat_denormal) {
+        if (softfloat_denormalsAreZeros(status))
+            a = a & 0x80000000;
+        else
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+
+    if (bClass == softfloat_denormal) {
+        if (softfloat_denormalsAreZeros(status))
+            b = b & 0x80000000;
+        else
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+
+    if ((a == b) || ((uint32_t) ((a | b)<<1) == 0)) return softfloat_relation_equal;
+
+    signA = signF32UI(a);
+    signB = signF32UI(b);
+    if (signA != signB)
+        return (signA) ? softfloat_relation_less : softfloat_relation_greater;
+
+    if (signA ^ (a < b)) return softfloat_relation_less;
+    return softfloat_relation_greater;
+}
diff --git a/src/cpu/softfloat3e/f32_div.c b/src/cpu/softfloat3e/f32_div.c
new file mode 100644
index 000000000..a9ccfcfd4
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_div.c
@@ -0,0 +1,146 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+#define SOFTFLOAT_FAST_DIV64TO32
+
+float32 f32_div(float32 a, float32 b, struct softfloat_status_t *status)
+{
+    bool signA;
+    int16_t expA;
+    uint32_t sigA;
+    bool signB;
+    int16_t expB;
+    uint32_t sigB;
+    bool signZ;
+    struct exp16_sig32 normExpSig;
+    int16_t expZ;
+#ifdef SOFTFLOAT_FAST_DIV64TO32
+    uint64_t sig64A;
+    uint32_t sigZ;
+#endif
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    signA = signF32UI(a);
+    expA  = expF32UI(a);
+    sigA  = fracF32UI(a);
+    signB = signF32UI(b);
+    expB  = expF32UI(b);
+    sigB  = fracF32UI(b);
+    signZ = signA ^ signB;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) sigA = 0;
+        if (!expB) sigB = 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0xFF) {
+        if (sigA) goto propagateNaN;
+        if (expB == 0xFF) {
+            if (sigB) goto propagateNaN;
+            goto invalid;
+        }
+        if (sigB && !expB)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        goto infinity;
+    }
+    if (expB == 0xFF) {
+        if (sigB) goto propagateNaN;
+        if (sigA && !expA)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        goto zero;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expB) {
+        if (! sigB) {
+            if (! (expA | sigA)) goto invalid;
+            softfloat_raiseFlags(status, softfloat_flag_infinite);
+            goto infinity;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF32Sig(sigB);
+        expB = normExpSig.exp;
+        sigB = normExpSig.sig;
+    }
+    if (! expA) {
+        if (! sigA) goto zero;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF32Sig(sigA);
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expZ = expA - expB + 0x7E;
+    sigA |= 0x00800000;
+    sigB |= 0x00800000;
+#ifdef SOFTFLOAT_FAST_DIV64TO32
+    if (sigA < sigB) {
+        --expZ;
+        sig64A = (uint64_t) sigA<<31;
+    } else {
+        sig64A = (uint64_t) sigA<<30;
+    }
+    sigZ = sig64A / sigB;
+    if (! (sigZ & 0x3F)) sigZ |= ((uint64_t) sigB * sigZ != sig64A);
+#endif
+    return softfloat_roundPackToF32(signZ, expZ, sigZ, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    return softfloat_propagateNaNF32UI(a, b, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ invalid:
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    return defaultNaNF32UI;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ infinity:
+    return packToF32UI(signZ, 0xFF, 0);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ zero:
+    return packToF32UI(signZ, 0, 0);
+}
diff --git a/src/cpu/softfloat3e/f32_frc.c b/src/cpu/softfloat3e/f32_frc.c
new file mode 100644
index 000000000..fc1b02460
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_frc.c
@@ -0,0 +1,101 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Extracts the fractional portion of single-precision floating-point value `a',
+| and returns the result  as a  single-precision  floating-point value. The
+| fractional results are precise. The operation is performed according to the
+| IEC/IEEE Standard for Binary Floating-Point Arithmetic.
+*----------------------------------------------------------------------------*/
+
+float32 f32_frc(float32 a, struct softfloat_status_t *status)
+{
+    int roundingMode = softfloat_getRoundingMode(status);
+
+    bool signA;
+    int16_t expA;
+    uint32_t sigA;
+    uint32_t lastBitMask;
+    uint32_t roundBitsMask;
+
+    signA = signF32UI(a);
+    expA  = expF32UI(a);
+    sigA  = fracF32UI(a);
+
+    if (expA == 0xFF) {
+        if (sigA) return softfloat_propagateNaNF32UI(a, 0, status);
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return defaultNaNF32UI;
+    }
+
+    if (expA >= 0x96) {
+        return packToF32UI(roundingMode == softfloat_round_down, 0, 0);
+    }
+
+    if (expA < 0x7F) {
+        if (! expA) {
+            if (! sigA || softfloat_denormalsAreZeros(status))
+                return packToF32UI(roundingMode == softfloat_round_down, 0, 0);
+
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+            if (! softfloat_isMaskedException(status, softfloat_flag_underflow))
+                softfloat_raiseFlags(status, softfloat_flag_underflow);
+
+            if (softfloat_flushUnderflowToZero(status)) {
+                softfloat_raiseFlags(status, softfloat_flag_underflow | softfloat_flag_inexact);
+                return packToF32UI(signA, 0, 0);
+            }
+        }
+        return a;
+    }
+
+    lastBitMask = 1 << (0x96 - expA);
+    roundBitsMask = lastBitMask - 1;
+
+    sigA &= roundBitsMask;
+    sigA <<= 7;
+    expA--;
+
+    if (! sigA)
+       return packToF32UI(roundingMode == softfloat_round_down, 0, 0);
+
+    return softfloat_normRoundPackToF32(signA, expA, sigA, status);
+}
diff --git a/src/cpu/softfloat3e/f32_getExp.c b/src/cpu/softfloat3e/f32_getExp.c
new file mode 100644
index 000000000..66b00ac7c
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_getExp.c
@@ -0,0 +1,73 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Extracts the exponent portion of single-precision floating-point value 'a',
+| and returns the result as a single-precision floating-point value
+| representing unbiased integer exponent. The operation is performed according
+| to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
+*----------------------------------------------------------------------------*/
+
+float32 f32_getExp(float32 a, struct softfloat_status_t *status)
+{
+    int16_t expA;
+    uint32_t sigA;
+    struct exp16_sig32 normExpSig;
+
+    expA  = expF32UI(a);
+    sigA  = fracF32UI(a);
+
+    if (expA == 0xFF) {
+        if (sigA) return softfloat_propagateNaNF32UI(a, 0, status);
+        return packToF32UI(0, 0xFF, 0);
+    }
+
+    if (! expA) {
+        if (! sigA || softfloat_denormalsAreZeros(status))
+            return packToF32UI(1, 0xFF, 0);
+
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF32Sig(sigA);
+        expA = normExpSig.exp;
+    }
+
+    return i32_to_f32((int32_t)(expA) - 0x7F, status);
+}
diff --git a/src/cpu/softfloat3e/f32_getMant.c b/src/cpu/softfloat3e/f32_getMant.c
new file mode 100644
index 000000000..9dfa58a63
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_getMant.c
@@ -0,0 +1,108 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Extracts the mantissa of single-precision floating-point value 'a' and
+| returns the result as a single-precision floating-point after applying
+| the mantissa interval normalization and sign control. The operation is
+| performed according to the IEC/IEEE Standard for Binary Floating-Point
+| Arithmetic.
+*----------------------------------------------------------------------------*/
+
+float32 f32_getMant(float32 a, struct softfloat_status_t *status, int sign_ctrl, int interv)
+{
+    bool signA;
+    int16_t expA;
+    uint32_t sigA;
+    struct exp16_sig32 normExpSig;
+
+    signA = signF32UI(a);
+    expA  = expF32UI(a);
+    sigA  = fracF32UI(a);
+
+    if (expA == 0xFF) {
+        if (sigA) return softfloat_propagateNaNF32UI(a, 0, status);
+        if (signA) {
+            if (sign_ctrl & 0x2) {
+                softfloat_raiseFlags(status, softfloat_flag_invalid);
+                return defaultNaNF32UI;
+            }
+        }
+        return packToF32UI(~sign_ctrl & signA, 0x7F, 0);
+    }
+
+    if (! expA && (! sigA || softfloat_denormalsAreZeros(status))) {
+        return packToF32UI(~sign_ctrl & signA, 0x7F, 0);
+    }
+
+    if (signA) {
+        if (sign_ctrl & 0x2) {
+            softfloat_raiseFlags(status, softfloat_flag_invalid);
+            return defaultNaNF32UI;
+        }
+    }
+
+    if (! expA) {
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF32Sig(sigA);
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+        sigA &= 0x7FFFFF;
+    }
+
+    switch(interv) {
+    case 0x0: // interval [1,2)
+        expA = 0x7F;
+        break;
+    case 0x1: // interval [1/2,2)
+        expA -= 0x7F;
+        expA  = 0x7F - (expA & 0x1);
+        break;
+    case 0x2: // interval [1/2,1)
+        expA = 0x7E;
+        break;
+    case 0x3: // interval [3/4,3/2)
+        expA = 0x7F - ((sigA >> 22) & 0x1);
+        break;
+    }
+
+    return packToF32UI(~sign_ctrl & signA, expA, sigA);
+}
diff --git a/src/cpu/softfloat3e/f32_minmax.c b/src/cpu/softfloat3e/f32_minmax.c
new file mode 100644
index 000000000..e36c297ae
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_minmax.c
@@ -0,0 +1,69 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Compare between two single precision floating point numbers and return the
+| smaller of them.
+*----------------------------------------------------------------------------*/
+
+float32 f32_min(float32 a, float32 b, struct softfloat_status_t *status)
+{
+    if (softfloat_denormalsAreZeros(status)) {
+        a = f32_denormal_to_zero(a);
+        b = f32_denormal_to_zero(b);
+    }
+
+    return (f32_compare_normal(a, b, status) == softfloat_relation_less) ? a : b;
+}
+
+/*----------------------------------------------------------------------------
+| Compare between two single precision floating point numbers and return the
+| larger of them.
+*----------------------------------------------------------------------------*/
+
+float32 f32_max(float32 a, float32 b, struct softfloat_status_t *status)
+{
+    if (softfloat_denormalsAreZeros(status)) {
+        a = f32_denormal_to_zero(a);
+        b = f32_denormal_to_zero(b);
+    }
+
+    return (f32_compare_normal(a, b, status) == softfloat_relation_greater) ? a : b;
+}
diff --git a/src/cpu/softfloat3e/f32_mul.c b/src/cpu/softfloat3e/f32_mul.c
new file mode 100644
index 000000000..db96e0db7
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_mul.c
@@ -0,0 +1,137 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float32 f32_mul(float32 a, float32 b, struct softfloat_status_t *status)
+{
+    bool signA;
+    int16_t expA;
+    uint32_t sigA;
+    bool signB;
+    int16_t expB;
+    uint32_t sigB;
+    bool signZ;
+    uint32_t magBits;
+    struct exp16_sig32 normExpSig;
+    int16_t expZ;
+    uint32_t sigZ, uiZ;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    signA = signF32UI(a);
+    expA  = expF32UI(a);
+    sigA  = fracF32UI(a);
+    signB = signF32UI(b);
+    expB  = expF32UI(b);
+    sigB  = fracF32UI(b);
+    signZ = signA ^ signB;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) sigA = 0;
+        if (!expB) sigB = 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0xFF) {
+        if (sigA || ((expB == 0xFF) && sigB)) goto propagateNaN;
+        magBits = expB | sigB;
+        if (sigB && !expB) softfloat_raiseFlags(status, softfloat_flag_denormal);
+        goto infArg;
+    }
+    if (expB == 0xFF) {
+        if (sigB) goto propagateNaN;
+        magBits = expA | sigA;
+        if (sigA && !expA) softfloat_raiseFlags(status, softfloat_flag_denormal);
+        goto infArg;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA) {
+        if (! sigA) {
+            if (sigB && !expB) softfloat_raiseFlags(status, softfloat_flag_denormal);
+            goto zero;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF32Sig(sigA);
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    if (! expB) {
+        if (! sigB) {
+            if (sigA && !expA) softfloat_raiseFlags(status, softfloat_flag_denormal);
+            goto zero;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF32Sig(sigB);
+        expB = normExpSig.exp;
+        sigB = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expZ = expA + expB - 0x7F;
+    sigA = (sigA | 0x00800000)<<7;
+    sigB = (sigB | 0x00800000)<<8;
+    sigZ = softfloat_shortShiftRightJam64((uint64_t) sigA * sigB, 32);
+    if (sigZ < 0x40000000) {
+        --expZ;
+        sigZ <<= 1;
+    }
+    return softfloat_roundPackToF32(signZ, expZ, sigZ, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    return softfloat_propagateNaNF32UI(a, b, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ infArg:
+    if (! magBits) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        uiZ = defaultNaNF32UI;
+    } else {
+        uiZ = packToF32UI(signZ, 0xFF, 0);
+    }
+    return uiZ;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ zero:
+    return packToF32UI(signZ, 0, 0);
+}
diff --git a/src/cpu/softfloat3e/f32_mulAdd.c b/src/cpu/softfloat3e/f32_mulAdd.c
new file mode 100644
index 000000000..101b20f18
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_mulAdd.c
@@ -0,0 +1,233 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+#include "specialize.h"
+
+float32 f32_mulAdd(float32 a, float32 b, float32 c, uint8_t op, struct softfloat_status_t *status)
+{
+    bool signA;
+    int16_t expA;
+    uint32_t sigA;
+    bool signB;
+    int16_t expB;
+    uint32_t sigB;
+    bool signC;
+    int16_t expC;
+    uint32_t sigC;
+    bool signProd;
+    uint32_t magBits, uiA, uiB, uiC, uiZ;
+    struct exp16_sig32 normExpSig;
+    int16_t expProd;
+    uint64_t sigProd;
+    bool signZ;
+    int16_t expZ;
+    uint32_t sigZ;
+    int16_t expDiff;
+    uint64_t sig64Z, sig64C;
+    int8_t shiftDist;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA = a;
+    uiB = b;
+    uiC = c;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    signA = signF32UI(uiA);
+    expA  = expF32UI(uiA);
+    sigA  = fracF32UI(uiA);
+    signB = signF32UI(uiB);
+    expB  = expF32UI(uiB);
+    sigB  = fracF32UI(uiB);
+    signC = signF32UI(uiC) ^ ((op & softfloat_mulAdd_subC) != 0);
+    expC  = expF32UI(uiC);
+    sigC  = fracF32UI(uiC);
+    signProd = signA ^ signB ^ ((op & softfloat_mulAdd_subProd) != 0);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    bool aisNaN = (expA == 0xFF) && sigA;
+    bool bisNaN = (expB == 0xFF) && sigB;
+    bool cisNaN = (expC == 0xFF) && sigC;
+    if (aisNaN | bisNaN | cisNaN) {
+        uiZ = (aisNaN | bisNaN) ? softfloat_propagateNaNF32UI(uiA, uiB, status) : 0;
+        return softfloat_propagateNaNF32UI(uiZ, uiC, status);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) sigA = 0;
+        if (!expB) sigB = 0;
+        if (!expC) sigC = 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0xFF) {
+        magBits = expB | sigB;
+        goto infProdArg;
+    }
+    if (expB == 0xFF) {
+        magBits = expA | sigA;
+        goto infProdArg;
+    }
+    if (expC == 0xFF) {
+        if ((sigA && !expA) || (sigB && !expB)) {
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        }
+        return packToF32UI(signC, 0xFF, 0);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA) {
+        if (! sigA) goto zeroProd;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF32Sig(sigA);
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    if (! expB) {
+        if (! sigB) goto zeroProd;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF32Sig(sigB);
+        expB = normExpSig.exp;
+        sigB = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expProd = expA + expB - 0x7E;
+    sigA = (sigA | 0x00800000)<<7;
+    sigB = (sigB | 0x00800000)<<7;
+    sigProd = (uint64_t) sigA * sigB;
+    if (sigProd < UINT64_C(0x2000000000000000)) {
+        --expProd;
+        sigProd <<= 1;
+    }
+    signZ = signProd;
+    if (! expC) {
+        if (! sigC) {
+            expZ = expProd - 1;
+            sigZ = softfloat_shortShiftRightJam64(sigProd, 31);
+            goto roundPack;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF32Sig(sigC);
+        expC = normExpSig.exp;
+        sigC = normExpSig.sig;
+    }
+    sigC = (sigC | 0x00800000)<<6;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expDiff = expProd - expC;
+    if (signProd == signC) {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (expDiff <= 0) {
+            expZ = expC;
+            sigZ = sigC + softfloat_shiftRightJam64(sigProd, 32 - expDiff);
+        } else {
+            expZ = expProd;
+            sig64Z = sigProd + softfloat_shiftRightJam64((uint64_t) sigC<<32, expDiff);
+            sigZ = softfloat_shortShiftRightJam64(sig64Z, 32);
+        }
+        if (sigZ < 0x40000000) {
+            --expZ;
+            sigZ <<= 1;
+        }
+    } else {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        sig64C = (uint64_t) sigC<<32;
+        if (expDiff < 0) {
+            signZ = signC;
+            expZ = expC;
+            sig64Z = sig64C - softfloat_shiftRightJam64(sigProd, -expDiff);
+        } else if (! expDiff) {
+            expZ = expProd;
+            sig64Z = sigProd - sig64C;
+            if (! sig64Z) goto completeCancellation;
+            if (sig64Z & UINT64_C(0x8000000000000000)) {
+                signZ = ! signZ;
+                sig64Z = -sig64Z;
+            }
+        } else {
+            expZ = expProd;
+            sig64Z = sigProd - softfloat_shiftRightJam64(sig64C, expDiff);
+        }
+        shiftDist = softfloat_countLeadingZeros64(sig64Z) - 1;
+        expZ -= shiftDist;
+        shiftDist -= 32;
+        if (shiftDist < 0) {
+            sigZ = softfloat_shortShiftRightJam64(sig64Z, -shiftDist);
+        } else {
+            sigZ = (uint32_t) sig64Z<<shiftDist;
+        }
+    }
+ roundPack:
+    return softfloat_roundPackToF32(signZ, expZ, sigZ, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ infProdArg:
+    if (magBits) {
+        uiZ = packToF32UI(signProd, 0xFF, 0);
+        if (signProd == signC || expC != 0xFF) {
+            if ((sigA && !expA) || (sigB && !expB) || (sigC && !expC))
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+            return uiZ;
+        }
+    }
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    uiZ = defaultNaNF32UI;
+    return softfloat_propagateNaNF32UI(uiZ, uiC, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ zeroProd:
+    uiZ = packToF32UI(signC, expC, sigC);
+    if (!expC && sigC) {
+        /* Exact zero plus a denormal */
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        if (softfloat_flushUnderflowToZero(status)) {
+            softfloat_raiseFlags(status, softfloat_flag_underflow | softfloat_flag_inexact);
+            return packToF32UI(signC, 0, 0);
+        }
+    }
+    if (! (expC | sigC) && (signProd != signC)) {
+ completeCancellation:
+        uiZ = packToF32UI((softfloat_getRoundingMode(status) == softfloat_round_min), 0, 0);
+    }
+    return uiZ;
+}
diff --git a/src/cpu/softfloat3e/f32_range.c b/src/cpu/softfloat3e/f32_range.c
new file mode 100644
index 000000000..48e94e43e
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_range.c
@@ -0,0 +1,134 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float32 f32_range(float32 a, float32 b, bool is_max, bool is_abs, int sign_ctrl, struct softfloat_status_t *status)
+{
+    bool signA;
+    int16_t expA;
+    uint32_t sigA;
+    bool signB;
+    int16_t expB;
+    uint32_t sigB;
+    bool aIsNaN, bIsNaN;
+    uint32_t z;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    signA = signF32UI(a);
+    expA  = expF32UI(a);
+    sigA  = fracF32UI(a);
+    signB = signF32UI(b);
+    expB  = expF32UI(b);
+    sigB  = fracF32UI(b);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_isSigNaNF32UI(a)) {
+        return softfloat_propagateNaNF32UI(a, 0, status);
+    }
+    if (softfloat_isSigNaNF32UI(b)) {
+        return softfloat_propagateNaNF32UI(b, 0, status);
+    }
+
+    aIsNaN = isNaNF32UI(a);
+    bIsNaN = isNaNF32UI(b);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA && sigA) {
+        if (softfloat_denormalsAreZeros(status)) {
+            a = packToF32UI(signA, 0, 0);
+        }
+        else if (! bIsNaN) {
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        }
+    }
+
+    if (! expB && sigB) {
+        if (softfloat_denormalsAreZeros(status)) {
+            b = packToF32UI(signB, 0, 0);
+        }
+        else if (! aIsNaN) {
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        }
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (bIsNaN) {
+        z = a;
+    }
+    else if (aIsNaN) {
+        z = b;
+    }
+    else if (signA != signB && ! is_abs) {
+        if (! is_max) {
+            z = signA ? a : b;
+        } else {
+            z = signA ? b : a;
+        }
+    } else {
+        float32 tmp_a = a, tmp_b = b;
+        if (is_abs) {
+            tmp_a = tmp_a & ~0x80000000; // clear the sign bit
+            tmp_b = tmp_b & ~0x80000000;
+            signA = 0;
+        }
+        if (! is_max) {
+            z = (signA ^ (tmp_a < tmp_b)) ? a : b;
+        } else {
+            z = (signA ^ (tmp_a < tmp_b)) ? b : a;
+        }
+    }
+
+    switch(sign_ctrl) {
+    case 0:
+        z = (z & ~0x80000000) | (a & 0x80000000); // keep sign of a
+        break;
+    case 1:
+        break; // preserve sign of compare result
+    case 2:
+        z = z & ~0x80000000; // zero out the sign bit
+        break;
+    case 3:
+        z = z | 0x80000000;  // set the sign bit
+        break;
+    }
+
+    return z;
+}
diff --git a/src/cpu/softfloat3e/f32_roundToInt.c b/src/cpu/softfloat3e/f32_roundToInt.c
new file mode 100644
index 000000000..7791fbbf4
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_roundToInt.c
@@ -0,0 +1,112 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2017 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float32 f32_roundToInt(float32 a, uint8_t scale, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    int16_t exp;
+    int32_t frac;
+    uint32_t uiZ, lastBitMask, roundBitsMask;
+    bool sign;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    scale &= 0xF;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    exp = expF32UI(a);
+    frac = fracF32UI(a);
+    sign = signF32UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (0x96 <= (exp + scale)) {
+        if ((exp == 0xFF) && frac) {
+            return softfloat_propagateNaNF32UI(a, 0, status);
+        }
+        return a;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!exp) {
+            frac = 0;
+            a = packToF32UI(sign, 0, 0);
+        }
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if ((exp + scale) <= 0x7E) {
+        if (!(exp | frac)) return a;
+        if (exact) softfloat_raiseFlags(status, softfloat_flag_inexact);
+        uiZ = packToF32UI(sign, 0, 0);
+        switch (roundingMode) {
+         case softfloat_round_near_even:
+            if (!frac) break;
+         case softfloat_round_near_maxMag:
+            if ((exp + scale) == 0x7E) uiZ |= packToF32UI(0, 0x7F - scale, 0);
+            break;
+         case softfloat_round_min:
+            if (uiZ) uiZ = packToF32UI(1, 0x7F - scale, 0);
+            break;
+         case softfloat_round_max:
+            if (!uiZ) uiZ = packToF32UI(0, 0x7F - scale, 0);
+            break;
+        }
+        return uiZ;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiZ = a;
+    lastBitMask = (uint32_t) 1<<(0x96 - exp - scale);
+    roundBitsMask = lastBitMask - 1;
+    if (roundingMode == softfloat_round_near_maxMag) {
+        uiZ += lastBitMask>>1;
+    } else if (roundingMode == softfloat_round_near_even) {
+        uiZ += lastBitMask>>1;
+        if (!(uiZ & roundBitsMask)) uiZ &= ~lastBitMask;
+    } else if (roundingMode == (signF32UI(uiZ) ? softfloat_round_min : softfloat_round_max)) {
+        uiZ += roundBitsMask;
+    }
+    uiZ &= ~roundBitsMask;
+    if (uiZ != a) {
+        if (exact) softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    return uiZ;
+}
diff --git a/src/cpu/softfloat3e/f32_scalef.c b/src/cpu/softfloat3e/f32_scalef.c
new file mode 100644
index 000000000..320baff30
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_scalef.c
@@ -0,0 +1,155 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Return the result of a floating point scale of the single-precision floating
+| point value `a' by multiplying it by 2 power of the single-precision
+| floating point value 'b' converted to integral value. If the result cannot
+| be represented in single precision, then the proper overflow response (for
+| positive scaling operand), or the proper underflow response (for negative
+| scaling operand) is issued. The operation is performed according to the
+| IEC/IEEE Standard for Binary Floating-Point Arithmetic.
+*----------------------------------------------------------------------------*/
+
+float32 f32_scalef(float32 a, float32 b, struct softfloat_status_t *status)
+{
+    bool signA;
+    int16_t expA;
+    uint32_t sigA;
+    bool signB;
+    int16_t expB;
+    uint32_t sigB;
+    int shiftCount;
+    int scale = 0;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    signA = signF32UI(a);
+    expA  = expF32UI(a);
+    sigA  = fracF32UI(a);
+    signB = signF32UI(b);
+    expB  = expF32UI(b);
+    sigB  = fracF32UI(b);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expB == 0xFF) {
+        if (sigB) return softfloat_propagateNaNF32UI(a, b, status);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) sigA = 0;
+        if (!expB) sigB = 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0xFF) {
+        if (sigA) {
+            int aIsSignalingNaN = (sigA & 0x00400000) == 0;
+            if (aIsSignalingNaN || expB != 0xFF || sigB)
+                return softfloat_propagateNaNF32UI(a, b, status);
+
+            return signB ? 0 : packToF32UI(0, 0xFF, 0);
+        }
+
+        if (expB == 0xFF && signB) {
+            softfloat_raiseFlags(status, softfloat_flag_invalid);
+            return defaultNaNF32UI;
+        }
+
+        return a;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA) {
+        if (! sigA) {
+            if (expB == 0xFF && ! signB) {
+                softfloat_raiseFlags(status, softfloat_flag_invalid);
+                return defaultNaNF32UI;
+            }
+            return packToF32UI(signA, 0, 0);
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if ((expB | sigB) == 0) return a;
+
+    if (expB == 0xFF) {
+        if (signB) return packToF32UI(signA, 0, 0);
+        return packToF32UI(signA, 0xFF, 0);
+    }
+
+    if (expB >= 0x8E) {
+        // handle obvious overflow/underflow result
+        return softfloat_roundPackToF32(signA, signB ? -0x7F : 0xFF, sigA, status);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expB <= 0x7E) {
+        if (! expB)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        scale = -signB;
+    }
+    else {
+        shiftCount = expB - 0x9E;
+        sigB = (sigB | 0x800000)<<8;
+        scale = sigB>>(-shiftCount);
+
+        if (signB) {
+            if ((uint32_t) (sigB<<(shiftCount & 31))) scale++;
+            scale = -scale;
+        }
+
+        if (scale >  0x200) scale =  0x200;
+        if (scale < -0x200) scale = -0x200;
+    }
+
+    if (expA != 0) {
+        sigA |= 0x00800000;
+    } else {
+        expA++;
+    }
+
+    expA += scale - 1;
+    sigA <<= 7;
+    return softfloat_normRoundPackToF32(signA, expA, sigA, status);
+}
diff --git a/src/cpu/softfloat3e/f32_sqrt.c b/src/cpu/softfloat3e/f32_sqrt.c
new file mode 100644
index 000000000..fc2ef8f76
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_sqrt.c
@@ -0,0 +1,117 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float32 f32_sqrt(float32 a, struct softfloat_status_t *status)
+{
+    bool signA;
+    int16_t expA;
+    uint32_t sigA;
+    struct exp16_sig32 normExpSig;
+    int16_t expZ;
+    uint32_t sigZ, shiftedSigZ;
+    uint32_t negRem;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    signA = signF32UI(a);
+    expA  = expF32UI(a);
+    sigA  = fracF32UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0xFF) {
+        if (sigA) {
+            return softfloat_propagateNaNF32UI(a, 0, status);
+        }
+        if (! signA) return a;
+        goto invalid;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) {
+            sigA = 0;
+            a = packToF32UI(signA, 0, 0);
+        }
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (signA) {
+        if (! (expA | sigA)) return a;
+        goto invalid;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA) {
+        if (! sigA) return a;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF32Sig(sigA);
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expZ = ((expA - 0x7F)>>1) + 0x7E;
+    expA &= 1;
+    sigA = (sigA | 0x00800000)<<8;
+    sigZ =
+        ((uint64_t) sigA * softfloat_approxRecipSqrt32_1(expA, sigA))>>32;
+    if (expA) sigZ >>= 1;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sigZ += 2;
+    if ((sigZ & 0x3F) < 2) {
+        shiftedSigZ = sigZ>>2;
+        negRem = shiftedSigZ * shiftedSigZ;
+        sigZ &= ~3;
+        if (negRem & 0x80000000) {
+            sigZ |= 1;
+        } else {
+            if (negRem) --sigZ;
+        }
+    }
+    return softfloat_roundPackToF32(0, expZ, sigZ, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ invalid:
+    softfloat_raiseFlags(status,  softfloat_flag_invalid);
+    return defaultNaNF32UI;
+}
diff --git a/src/cpu/softfloat3e/f32_to_extF80.cc b/src/cpu/softfloat3e/f32_to_extF80.cc
new file mode 100644
index 000000000..73b8bedfd
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_to_extF80.cc
@@ -0,0 +1,88 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+extFloat80_t f32_to_extF80(float32 a, struct softfloat_status_t *status)
+{
+    bool sign;
+    int16_t exp;
+    uint32_t frac;
+    struct commonNaN commonNaN;
+    struct uint128 uiZ;
+    uint16_t uiZ64;
+    uint64_t uiZ0;
+    struct exp16_sig32 normExpSig;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF32UI(a);
+    exp  = expF32UI(a);
+    frac = fracF32UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0xFF) {
+        if (frac) {
+            softfloat_f32UIToCommonNaN(a, &commonNaN, status);
+            uiZ = softfloat_commonNaNToExtF80UI(&commonNaN);
+            uiZ64 = uiZ.v64;
+            uiZ0  = uiZ.v0;
+        } else {
+            uiZ64 = packToExtF80UI64(sign, 0x7FFF);
+            uiZ0  = UINT64_C(0x8000000000000000);
+        }
+        return packToExtF80_twoargs(uiZ64, uiZ0);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! exp) {
+        if (! frac) {
+            return packToExtF80(sign, 0, 0);
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF32Sig(frac);
+        exp = normExpSig.exp;
+        frac = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiZ64 = packToExtF80UI64(sign, exp + 0x3F80);
+    uiZ0  = (uint64_t) (frac | 0x00800000)<<40;
+    return packToExtF80_twoargs(uiZ64, uiZ0);
+}
diff --git a/src/cpu/softfloat3e/f32_to_f128.cc b/src/cpu/softfloat3e/f32_to_f128.cc
new file mode 100644
index 000000000..6d3fafec2
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_to_f128.cc
@@ -0,0 +1,86 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float128_t f32_to_f128(float32 a, struct softfloat_status_t *status)
+{
+    bool sign;
+    int16_t exp;
+    uint32_t frac;
+    struct commonNaN commonNaN;
+    struct uint128 uiZ;
+    struct exp16_sig32 normExpSig;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF32UI(a);
+    exp  = expF32UI(a);
+    frac = fracF32UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0xFF) {
+        if (frac) {
+            softfloat_f32UIToCommonNaN(a, &commonNaN, status);
+            uiZ = softfloat_commonNaNToF128UI(&commonNaN);
+        } else {
+            uiZ.v64 = packToF128UI64(sign, 0x7FFF, 0);
+            uiZ.v0  = 0;
+        }
+        return uiZ;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! exp) {
+        if (! frac) {
+            uiZ.v64 = packToF128UI64(sign, 0, 0);
+            uiZ.v0  = 0;
+            return uiZ;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF32Sig(frac);
+        exp = normExpSig.exp - 1;
+        frac = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiZ.v64 = packToF128UI64(sign, exp + 0x3F80, (uint64_t) frac<<25);
+    uiZ.v0  = 0;
+    return uiZ;
+}
diff --git a/src/cpu/softfloat3e/f32_to_f16.c b/src/cpu/softfloat3e/f32_to_f16.c
new file mode 100644
index 000000000..9253a958a
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_to_f16.c
@@ -0,0 +1,82 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float16 f32_to_f16(float32 a, struct softfloat_status_t *status)
+{
+    bool sign;
+    int16_t exp;
+    uint32_t frac;
+    struct commonNaN commonNaN;
+    uint16_t uiZ, frac16;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF32UI(a);
+    exp  = expF32UI(a);
+    frac = fracF32UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0xFF) {
+        if (frac) {
+            softfloat_f32UIToCommonNaN(a, &commonNaN, status);
+            uiZ = softfloat_commonNaNToF16UI(&commonNaN);
+        } else {
+            uiZ = packToF16UI(sign, 0x1F, 0);
+        }
+        return uiZ;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (!exp && frac) {
+        if (softfloat_denormalsAreZeros(status))
+            return packToF16UI(sign, 0, 0);
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    frac16 = frac>>9 | ((frac & 0x1FF) != 0);
+    if (! (exp | frac16)) {
+        return packToF16UI(sign, 0, 0);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    return softfloat_roundPackToF16(sign, exp - 0x71, frac16 | 0x4000, status);
+}
diff --git a/src/cpu/softfloat3e/f32_to_f64.c b/src/cpu/softfloat3e/f32_to_f64.c
new file mode 100644
index 000000000..28ebb61b6
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_to_f64.c
@@ -0,0 +1,81 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float64 f32_to_f64(float32 a, struct softfloat_status_t *status)
+{
+    bool sign;
+    int16_t exp;
+    uint32_t frac;
+    struct commonNaN commonNaN;
+    uint64_t uiZ;
+    struct exp16_sig32 normExpSig;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF32UI(a);
+    exp  = expF32UI(a);
+    frac = fracF32UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0xFF) {
+        if (frac) {
+            softfloat_f32UIToCommonNaN(a, &commonNaN, status);
+            uiZ = softfloat_commonNaNToF64UI(&commonNaN);
+        } else {
+            uiZ = packToF64UI(sign, 0x7FF, 0);
+        }
+        return uiZ;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! exp) {
+        if (! frac || softfloat_denormalsAreZeros(status)) {
+            return packToF64UI(sign, 0, 0);
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF32Sig(frac);
+        exp = normExpSig.exp - 1;
+        frac = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    return packToF64UI(sign, exp + 0x380, (uint64_t) frac<<29);
+}
diff --git a/src/cpu/softfloat3e/f32_to_i32.c b/src/cpu/softfloat3e/f32_to_i32.c
new file mode 100644
index 000000000..2b3df52a3
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_to_i32.c
@@ -0,0 +1,78 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int32_t f32_to_i32(float32 a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    bool sign;
+    int16_t exp;
+    uint32_t sig;
+    uint64_t sig64;
+    int16_t shiftDist;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF32UI(a);
+    exp  = expF32UI(a);
+    sig  = fracF32UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+#if (i32_fromNaN != i32_fromPosOverflow) || (i32_fromNaN != i32_fromNegOverflow)
+    if ((exp == 0xFF) && sig) {
+#if (i32_fromNaN == i32_fromPosOverflow)
+        sign = 0;
+#elif (i32_fromNaN == i32_fromNegOverflow)
+        sign = 1;
+#else
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return i32_fromNaN;
+#endif
+    }
+#endif
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp) sig |= 0x00800000;
+    else if (softfloat_denormalsAreZeros(status)) sig = 0;
+    sig64 = (uint64_t) sig<<32;
+    shiftDist = 0xAA - exp;
+    if (0 < shiftDist) sig64 = softfloat_shiftRightJam64(sig64, shiftDist);
+    return softfloat_roundToI32(sign, sig64, roundingMode, exact, status);
+}
diff --git a/src/cpu/softfloat3e/f32_to_i32_r_minMag.c b/src/cpu/softfloat3e/f32_to_i32_r_minMag.c
new file mode 100644
index 000000000..abe782d3b
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_to_i32_r_minMag.c
@@ -0,0 +1,83 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int32_t f32_to_i32_r_minMag(float32 a, bool exact, struct softfloat_status_t *status)
+{
+    int16_t exp;
+    uint32_t sig;
+    int16_t shiftDist;
+    bool sign;
+    int32_t absZ;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    exp = expF32UI(a);
+    sig = fracF32UI(a);
+    if (softfloat_denormalsAreZeros(status))
+        if (!exp && sig) sig = 0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x9E - exp;
+    if (32 <= shiftDist) {
+        if (exact && (exp | sig)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+        return 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF32UI(a);
+    if (shiftDist <= 0) {
+        if (a == packToF32UI(1, 0x9E, 0)) return -0x7FFFFFFF - 1;
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return (exp == 0xFF) && sig
+                ? i32_fromNaN
+                : sign ? i32_fromNegOverflow : i32_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sig = (sig | 0x00800000)<<8;
+    absZ = sig>>shiftDist;
+    if (exact && ((uint32_t) absZ<<shiftDist != sig)) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    return sign ? -absZ : absZ;
+}
diff --git a/src/cpu/softfloat3e/f32_to_i64.c b/src/cpu/softfloat3e/f32_to_i64.c
new file mode 100644
index 000000000..982b5db25
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_to_i64.c
@@ -0,0 +1,79 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int64_t f32_to_i64(float32 a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    bool sign;
+    int16_t exp;
+    uint32_t sig;
+    int16_t shiftDist;
+    uint64_t sig64, extra;
+    struct uint64_extra sig64Extra;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF32UI(a);
+    exp  = expF32UI(a);
+    sig  = fracF32UI(a);
+    if (softfloat_denormalsAreZeros(status))
+        if (!exp && sig) sig = 0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0xBE - exp;
+    if (shiftDist < 0) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return (exp == 0xFF) && sig
+                ? i64_fromNaN
+                : sign ? i64_fromNegOverflow : i64_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp) sig |= 0x00800000;
+    sig64 = (uint64_t) sig<<40;
+    extra = 0;
+    if (shiftDist) {
+        sig64Extra = softfloat_shiftRightJam64Extra(sig64, 0, shiftDist);
+        sig64 = sig64Extra.v;
+        extra = sig64Extra.extra;
+    }
+    return softfloat_roundToI64(sign, sig64, extra, roundingMode, exact, status);
+}
diff --git a/src/cpu/softfloat3e/f32_to_i64_r_minMag.c b/src/cpu/softfloat3e/f32_to_i64_r_minMag.c
new file mode 100644
index 000000000..2ccabd09d
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_to_i64_r_minMag.c
@@ -0,0 +1,88 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int64_t f32_to_i64_r_minMag(float32 a, bool exact, struct softfloat_status_t *status)
+{
+    int16_t exp;
+    uint32_t sig;
+    int16_t shiftDist;
+    bool sign;
+    uint64_t sig64;
+    int64_t absZ;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    exp = expF32UI(a);
+    sig = fracF32UI(a);
+    if (softfloat_denormalsAreZeros(status))
+        if (!exp && sig) sig = 0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0xBE - exp;
+    if (64 <= shiftDist) {
+        if (exact && (exp | sig)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+        return 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF32UI(a);
+    if (shiftDist <= 0) {
+        if (a == packToF32UI(1, 0xBE, 0)) {
+            return -INT64_C(0x7FFFFFFFFFFFFFFF) - 1;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return (exp == 0xFF) && sig
+                ? i64_fromNaN
+                : sign ? i64_fromNegOverflow : i64_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sig |= 0x00800000;
+    sig64 = (uint64_t) sig<<40;
+    absZ = sig64>>shiftDist;
+    shiftDist = 40 - shiftDist;
+    if (exact && (shiftDist < 0) && (uint32_t) (sig<<(shiftDist & 31))) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    return sign ? -absZ : absZ;
+}
diff --git a/src/cpu/softfloat3e/f32_to_ui32.c b/src/cpu/softfloat3e/f32_to_ui32.c
new file mode 100644
index 000000000..5a8d57414
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_to_ui32.c
@@ -0,0 +1,80 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint32_t f32_to_ui32(float32 a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    bool sign;
+    int16_t exp;
+    uint32_t sig;
+    uint64_t sig64;
+    int16_t shiftDist;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF32UI(a);
+    exp  = expF32UI(a);
+    sig  = fracF32UI(a);
+    if (softfloat_denormalsAreZeros(status))
+        if (!exp && sig) sig = 0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+#if (ui32_fromNaN != ui32_fromPosOverflow) || (ui32_fromNaN != ui32_fromNegOverflow)
+    if ((exp == 0xFF) && sig) {
+#if (ui32_fromNaN == ui32_fromPosOverflow)
+        sign = 0;
+#elif (ui32_fromNaN == ui32_fromNegOverflow)
+        sign = 1;
+#else
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return ui32_fromNaN;
+#endif
+    }
+#endif
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp) sig |= 0x00800000;
+    else if (softfloat_denormalsAreZeros(status)) sig = 0;
+    sig64 = (uint64_t) sig<<32;
+    shiftDist = 0xAA - exp;
+    if (0 < shiftDist) sig64 = softfloat_shiftRightJam64(sig64, shiftDist);
+    return softfloat_roundToUI32(sign, sig64, roundingMode, exact, status);
+}
diff --git a/src/cpu/softfloat3e/f32_to_ui32_r_minMag.c b/src/cpu/softfloat3e/f32_to_ui32_r_minMag.c
new file mode 100644
index 000000000..4b37708b0
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_to_ui32_r_minMag.c
@@ -0,0 +1,83 @@
+
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint32_t f32_to_ui32_r_minMag(float32 a, bool exact, struct softfloat_status_t *status)
+{
+    int16_t exp;
+    uint32_t sig;
+    int16_t shiftDist;
+    bool sign;
+    uint32_t z;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    exp = expF32UI(a);
+    sig = fracF32UI(a);
+    if (softfloat_denormalsAreZeros(status))
+        if (!exp && sig) sig = 0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x9E - exp;
+    if (32 <= shiftDist) {
+        if (exact && (exp | sig)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+        return 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF32UI(a);
+    if (sign || (shiftDist < 0)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return (exp == 0xFF) && sig
+                ? ui32_fromNaN
+                : sign ? ui32_fromNegOverflow : ui32_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sig = (sig | 0x00800000)<<8;
+    z = sig>>shiftDist;
+    if (exact && (z<<shiftDist != sig)) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    return z;
+}
diff --git a/src/cpu/softfloat3e/f32_to_ui64.c b/src/cpu/softfloat3e/f32_to_ui64.c
new file mode 100644
index 000000000..db59dab16
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_to_ui64.c
@@ -0,0 +1,79 @@
+
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint64_t f32_to_ui64(float32 a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    bool sign;
+    int16_t exp;
+    uint32_t sig;
+    int16_t shiftDist;
+    uint64_t sig64, extra;
+    struct uint64_extra sig64Extra;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF32UI(a);
+    exp  = expF32UI(a);
+    sig  = fracF32UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0xBE - exp;
+    if (shiftDist < 0) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return (exp == 0xFF) && sig
+                ? ui64_fromNaN
+                : sign ? ui64_fromNegOverflow : ui64_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp) sig |= 0x00800000;
+    else if (softfloat_denormalsAreZeros(status)) sig = 0;
+    sig64 = (uint64_t) sig<<40;
+    extra = 0;
+    if (shiftDist) {
+        sig64Extra = softfloat_shiftRightJam64Extra(sig64, 0, shiftDist);
+        sig64 = sig64Extra.v;
+        extra = sig64Extra.extra;
+    }
+    return softfloat_roundToUI64(sign, sig64, extra, roundingMode, exact, status);
+}
diff --git a/src/cpu/softfloat3e/f32_to_ui64_r_minMag.c b/src/cpu/softfloat3e/f32_to_ui64_r_minMag.c
new file mode 100644
index 000000000..111c50e7f
--- /dev/null
+++ b/src/cpu/softfloat3e/f32_to_ui64_r_minMag.c
@@ -0,0 +1,84 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint64_t f32_to_ui64_r_minMag(float32 a, bool exact, struct softfloat_status_t *status)
+{
+    int16_t exp;
+    uint32_t sig;
+    int16_t shiftDist;
+    bool sign;
+    uint64_t sig64, z;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    exp = expF32UI(a);
+    sig = fracF32UI(a);
+    if (softfloat_denormalsAreZeros(status))
+        if (!exp && sig) sig = 0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0xBE - exp;
+    if (64 <= shiftDist) {
+        if (exact && (exp | sig)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+        return 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF32UI(a);
+    if (sign || (shiftDist < 0)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return (exp == 0xFF) && sig
+            ? ui64_fromNaN
+            : sign ? ui64_fromNegOverflow : ui64_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sig |= 0x00800000;
+    sig64 = (uint64_t) sig<<40;
+    z = sig64>>shiftDist;
+    shiftDist = 40 - shiftDist;
+    if (exact && (shiftDist < 0) && (uint32_t) (sig<<(shiftDist & 31))) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    return z;
+}
diff --git a/src/cpu/softfloat3e/f64_addsub.c b/src/cpu/softfloat3e/f64_addsub.c
new file mode 100644
index 000000000..6c5acb4f7
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_addsub.c
@@ -0,0 +1,70 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "softfloat.h"
+
+extern float64 softfloat_addMagsF64(uint64_t, uint64_t, bool, struct softfloat_status_t *);
+extern float64 softfloat_subMagsF64(uint64_t, uint64_t, bool, struct softfloat_status_t *);
+
+float64 f64_add(float64 a, float64 b, struct softfloat_status_t *status)
+{
+    bool signA;
+    bool signB;
+
+    signA = signF64UI(a);
+    signB = signF64UI(b);
+    if (signA == signB) {
+        return softfloat_addMagsF64(a, b, signA, status);
+    } else {
+        return softfloat_subMagsF64(a, b, signA, status);
+    }
+}
+
+float64 f64_sub(float64 a, float64 b, struct softfloat_status_t *status)
+{
+    bool signA;
+    bool signB;
+
+    signA = signF64UI(a);
+    signB = signF64UI(b);
+    if (signA == signB) {
+        return softfloat_subMagsF64(a, b, signA, status);
+    } else {
+        return softfloat_addMagsF64(a, b, signA, status);
+    }
+}
diff --git a/src/cpu/softfloat3e/f64_class.c b/src/cpu/softfloat3e/f64_class.c
new file mode 100644
index 000000000..1d44a6351
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_class.c
@@ -0,0 +1,64 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "softfloat.h"
+
+softfloat_class_t f64_class(float64 a)
+{
+    bool signA;
+    int16_t expA;
+    uint64_t sigA;
+
+    signA = signF64UI(a);
+    expA  = expF64UI(a);
+    sigA  = fracF64UI(a);
+
+    if (expA == 0x7FF) {
+        if (sigA == 0)
+            return (signA) ? softfloat_negative_inf : softfloat_positive_inf;
+
+        return (sigA & UINT64_C(0x0008000000000000)) ? softfloat_QNaN : softfloat_SNaN;
+    }
+
+    if (expA == 0) {
+       if (sigA == 0) return softfloat_zero;
+       return softfloat_denormal;
+   }
+
+   return softfloat_normalized;
+}
diff --git a/src/cpu/softfloat3e/f64_compare.c b/src/cpu/softfloat3e/f64_compare.c
new file mode 100644
index 000000000..aed250768
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_compare.c
@@ -0,0 +1,92 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Compare  between  two  double  precision  floating  point  numbers. Returns
+| 'float_relation_equal'  if the operands are equal, 'float_relation_less' if
+| the    value    'a'   is   less   than   the   corresponding   value   `b',
+| 'float_relation_greater' if the value 'a' is greater than the corresponding
+| value `b', or 'float_relation_unordered' otherwise.
+*----------------------------------------------------------------------------*/
+
+int f64_compare(float64 a, float64 b, bool quiet, struct softfloat_status_t *status)
+{
+    softfloat_class_t aClass;
+    softfloat_class_t bClass;
+    bool signA;
+    bool signB;
+
+    aClass = f64_class(a);
+    bClass = f64_class(b);
+
+    if (aClass == softfloat_SNaN || bClass == softfloat_SNaN) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return softfloat_relation_unordered;
+    }
+
+    if (aClass == softfloat_QNaN || bClass == softfloat_QNaN) {
+        if (! quiet) softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return softfloat_relation_unordered;
+    }
+
+    if (aClass == softfloat_denormal) {
+        if (softfloat_denormalsAreZeros(status))
+            a = a & UINT64_C(0x8000000000000000);
+        else
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+
+    if (bClass == softfloat_denormal) {
+        if (softfloat_denormalsAreZeros(status))
+            b = b & UINT64_C(0x8000000000000000);
+        else
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+
+    if ((a == b) || ((uint64_t) ((a | b)<<1) == 0)) return softfloat_relation_equal;
+
+    signA = signF64UI(a);
+    signB = signF64UI(b);
+    if (signA != signB)
+        return (signA) ? softfloat_relation_less : softfloat_relation_greater;
+
+    if (signA ^ (a < b)) return softfloat_relation_less;
+    return softfloat_relation_greater;
+}
diff --git a/src/cpu/softfloat3e/f64_div.c b/src/cpu/softfloat3e/f64_div.c
new file mode 100644
index 000000000..89f74f1b1
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_div.c
@@ -0,0 +1,165 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float64 f64_div(float64 a, float64 b, struct softfloat_status_t *status)
+{
+    bool signA;
+    int16_t expA;
+    uint64_t sigA;
+    bool signB;
+    int16_t expB;
+    uint64_t sigB;
+    bool signZ;
+    struct exp16_sig64 normExpSig;
+    int16_t expZ;
+    uint32_t recip32, sig32Z, doubleTerm;
+    uint64_t rem;
+    uint32_t q;
+    uint64_t sigZ;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    signA = signF64UI(a);
+    expA  = expF64UI(a);
+    sigA  = fracF64UI(a);
+    signB = signF64UI(b);
+    expB  = expF64UI(b);
+    sigB  = fracF64UI(b);
+    signZ = signA ^ signB;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) sigA = 0;
+        if (!expB) sigB = 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x7FF) {
+        if (sigA) goto propagateNaN;
+        if (expB == 0x7FF) {
+            if (sigB) goto propagateNaN;
+            goto invalid;
+        }
+        if (sigB && !expB)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        goto infinity;
+    }
+    if (expB == 0x7FF) {
+        if (sigB) goto propagateNaN;
+        if (sigA && !expA)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        goto zero;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expB) {
+        if (! sigB) {
+            if (! (expA | sigA)) goto invalid;
+            softfloat_raiseFlags(status, softfloat_flag_infinite);
+            goto infinity;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF64Sig(sigB);
+        expB = normExpSig.exp;
+        sigB = normExpSig.sig;
+    }
+    if (! expA) {
+        if (! sigA) goto zero;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF64Sig(sigA);
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expZ = expA - expB + 0x3FE;
+    sigA |= UINT64_C(0x0010000000000000);
+    sigB |= UINT64_C(0x0010000000000000);
+    if (sigA < sigB) {
+        --expZ;
+        sigA <<= 11;
+    } else {
+        sigA <<= 10;
+    }
+    sigB <<= 11;
+    recip32 = softfloat_approxRecip32_1(sigB>>32) - 2;
+    sig32Z = ((uint32_t) (sigA>>32) * (uint64_t) recip32)>>32;
+    doubleTerm = sig32Z<<1;
+    rem =
+        ((sigA - (uint64_t) doubleTerm * (uint32_t) (sigB>>32))<<28)
+            - (uint64_t) doubleTerm * ((uint32_t) sigB>>4);
+    q = (((uint32_t) (rem>>32) * (uint64_t) recip32)>>32) + 4;
+    sigZ = ((uint64_t) sig32Z<<32) + ((uint64_t) q<<4);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if ((sigZ & 0x1FF) < 4<<4) {
+        q &= ~7;
+        sigZ &= ~(uint64_t) 0x7F;
+        doubleTerm = q<<1;
+        rem =
+            ((rem - (uint64_t) doubleTerm * (uint32_t) (sigB>>32))<<28)
+                - (uint64_t) doubleTerm * ((uint32_t) sigB>>4);
+        if (rem & UINT64_C(0x8000000000000000)) {
+            sigZ -= 1<<7;
+        } else {
+            if (rem) sigZ |= 1;
+        }
+    }
+    return softfloat_roundPackToF64(signZ, expZ, sigZ, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    return softfloat_propagateNaNF64UI(a, b, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ invalid:
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    return defaultNaNF64UI;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ infinity:
+    return packToF64UI(signZ, 0x7FF, 0);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ zero:
+    return packToF64UI(signZ, 0, 0);
+}
diff --git a/src/cpu/softfloat3e/f64_frc.c b/src/cpu/softfloat3e/f64_frc.c
new file mode 100644
index 000000000..46c21ac4f
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_frc.c
@@ -0,0 +1,101 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Extracts the fractional portion of double-precision floating-point value `a',
+| and returns the result  as a  double-precision  floating-point value. The
+| fractional results are precise. The operation is performed according to the
+| IEC/IEEE Standard for Binary Floating-Point Arithmetic.
+*----------------------------------------------------------------------------*/
+
+float64 f64_frc(float64 a, struct softfloat_status_t *status)
+{
+    int roundingMode = softfloat_getRoundingMode(status);
+
+    bool signA;
+    int16_t expA;
+    uint64_t sigA;
+    uint64_t lastBitMask;
+    uint64_t roundBitsMask;
+
+    signA = signF64UI(a);
+    expA  = expF64UI(a);
+    sigA  = fracF64UI(a);
+
+    if (expA == 0x7FF) {
+        if (sigA) return softfloat_propagateNaNF64UI(a, 0, status);
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return defaultNaNF64UI;
+    }
+
+    if (expA >= 0x433) {
+        return packToF64UI(roundingMode == softfloat_round_down, 0, 0);
+    }
+
+    if (expA < 0x3FF) {
+        if (! expA) {
+            if (! sigA || softfloat_denormalsAreZeros(status))
+                return packToF64UI(roundingMode == softfloat_round_down, 0, 0);
+
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+            if (! softfloat_isMaskedException(status, softfloat_flag_underflow))
+                softfloat_raiseFlags(status, softfloat_flag_underflow);
+
+            if (softfloat_flushUnderflowToZero(status)) {
+                softfloat_raiseFlags(status, softfloat_flag_underflow | softfloat_flag_inexact);
+                return packToF64UI(signA, 0, 0);
+            }
+        }
+        return a;
+    }
+
+    lastBitMask = UINT64_C(1) << (0x433 - expA);
+    roundBitsMask = lastBitMask - 1;
+
+    sigA &= roundBitsMask;
+    sigA <<= 10;
+    expA--;
+
+    if (! sigA)
+       return packToF64UI(roundingMode == softfloat_round_down, 0, 0);
+
+    return softfloat_normRoundPackToF64(signA, expA, sigA, status);
+}
diff --git a/src/cpu/softfloat3e/f64_getExp.c b/src/cpu/softfloat3e/f64_getExp.c
new file mode 100644
index 000000000..b76cc996d
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_getExp.c
@@ -0,0 +1,73 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Extracts the exponent portion of double-precision floating-point value 'a',
+| and returns the result as a double-precision floating-point value
+| representing unbiased integer exponent. The operation is performed according
+| to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
+*----------------------------------------------------------------------------*/
+
+float64 f64_getExp(float64 a, struct softfloat_status_t *status)
+{
+    int16_t expA;
+    uint64_t sigA;
+    struct exp16_sig64 normExpSig;
+
+    expA  = expF64UI(a);
+    sigA  = fracF64UI(a);
+
+    if (expA == 0x7FF) {
+        if (sigA) return softfloat_propagateNaNF64UI(a, 0, status);
+        return packToF64UI(0, 0x7FF, 0);
+    }
+
+    if (! expA) {
+        if (! sigA || softfloat_denormalsAreZeros(status))
+            return packToF64UI(1, 0x7FF, 0);
+
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF64Sig(sigA);
+        expA = normExpSig.exp;
+    }
+
+    return i32_to_f64((int32_t)(expA) - 0x3FF);
+}
diff --git a/src/cpu/softfloat3e/f64_getMant.c b/src/cpu/softfloat3e/f64_getMant.c
new file mode 100644
index 000000000..84077e314
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_getMant.c
@@ -0,0 +1,108 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Extracts the mantissa of double-precision floating-point value 'a' and
+| returns the result as a double-precision floating-point after applying
+| the mantissa interval normalization and sign control. The operation is
+| performed according to the IEC/IEEE Standard for Binary Floating-Point
+| Arithmetic.
+*----------------------------------------------------------------------------*/
+
+float64 f64_getMant(float64 a, struct softfloat_status_t *status, int sign_ctrl, int interv)
+{
+    bool signA;
+    int16_t expA;
+    uint64_t sigA;
+    struct exp16_sig64 normExpSig;
+
+    signA = signF64UI(a);
+    expA  = expF64UI(a);
+    sigA  = fracF64UI(a);
+
+    if (expA == 0x7FF) {
+        if (sigA) return softfloat_propagateNaNF64UI(a, 0, status);
+        if (signA) {
+            if (sign_ctrl & 0x2) {
+                softfloat_raiseFlags(status, softfloat_flag_invalid);
+                return defaultNaNF64UI;
+            }
+        }
+        return packToF64UI(~sign_ctrl & signA, 0x3FF, 0);
+    }
+
+    if (! expA && (! sigA || softfloat_denormalsAreZeros(status))) {
+        return packToF64UI(~sign_ctrl & signA, 0x3FF, 0);
+    }
+
+    if (signA) {
+        if (sign_ctrl & 0x2) {
+            softfloat_raiseFlags(status, softfloat_flag_invalid);
+            return defaultNaNF64UI;
+        }
+    }
+
+    if (expA == 0) {
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF64Sig(sigA);
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+        sigA &= UINT64_C(0xFFFFFFFFFFFFF);
+    }
+
+    switch(interv) {
+    case 0x0: // interval [1,2)
+        expA = 0x3FF;
+        break;
+    case 0x1: // interval [1/2,2)
+        expA -= 0x3FF;
+        expA  = 0x3FF - (expA & 0x1);
+        break;
+    case 0x2: // interval [1/2,1)
+        expA = 0x3FE;
+        break;
+    case 0x3: // interval [3/4,3/2)
+        expA = 0x3FF - ((sigA >> 51) & 0x1);
+        break;
+    }
+
+    return packToF64UI(~sign_ctrl & signA, expA, sigA);
+}
diff --git a/src/cpu/softfloat3e/f64_minmax.c b/src/cpu/softfloat3e/f64_minmax.c
new file mode 100644
index 000000000..3c927410a
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_minmax.c
@@ -0,0 +1,69 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Compare between two double precision floating point numbers and return the
+| smaller of them.
+*----------------------------------------------------------------------------*/
+
+float64 f64_min(float64 a, float64 b, struct softfloat_status_t *status)
+{
+    if (softfloat_denormalsAreZeros(status)) {
+        a = f64_denormal_to_zero(a);
+        b = f64_denormal_to_zero(b);
+    }
+
+    return (f64_compare_normal(a, b, status) == softfloat_relation_less) ? a : b;
+}
+
+/*----------------------------------------------------------------------------
+| Compare between two double precision floating point numbers and return the
+| larger of them.
+*----------------------------------------------------------------------------*/
+
+float64 f64_max(float64 a, float64 b, struct softfloat_status_t *status)
+{
+    if (softfloat_denormalsAreZeros(status)) {
+        a = f64_denormal_to_zero(a);
+        b = f64_denormal_to_zero(b);
+    }
+
+    return (f64_compare_normal(a, b, status) == softfloat_relation_greater) ? a : b;
+}
diff --git a/src/cpu/softfloat3e/f64_mul.c b/src/cpu/softfloat3e/f64_mul.c
new file mode 100644
index 000000000..c1e98f2b6
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_mul.c
@@ -0,0 +1,139 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float64 f64_mul(float64 a, float64 b, struct softfloat_status_t *status)
+{
+    bool signA;
+    int16_t expA;
+    uint64_t sigA;
+    bool signB;
+    int16_t expB;
+    uint64_t sigB;
+    bool signZ;
+    uint64_t magBits;
+    struct exp16_sig64 normExpSig;
+    int16_t expZ;
+    struct uint128 sig128Z;
+    uint64_t sigZ, uiZ;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    signA = signF64UI(a);
+    expA  = expF64UI(a);
+    sigA  = fracF64UI(a);
+    signB = signF64UI(b);
+    expB  = expF64UI(b);
+    sigB  = fracF64UI(b);
+    signZ = signA ^ signB;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) sigA = 0;
+        if (!expB) sigB = 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x7FF) {
+        if (sigA || ((expB == 0x7FF) && sigB)) goto propagateNaN;
+        magBits = expB | sigB;
+        if (sigB && !expB) softfloat_raiseFlags(status, softfloat_flag_denormal);
+        goto infArg;
+    }
+    if (expB == 0x7FF) {
+        if (sigB) goto propagateNaN;
+        magBits = expA | sigA;
+        if (sigA && !expA) softfloat_raiseFlags(status, softfloat_flag_denormal);
+        goto infArg;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA) {
+        if (! sigA) {
+            if (sigB && !expB) softfloat_raiseFlags(status, softfloat_flag_denormal);
+            goto zero;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF64Sig(sigA);
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    if (! expB) {
+        if (! sigB) {
+            if (sigA && !expA) softfloat_raiseFlags(status, softfloat_flag_denormal);
+            goto zero;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF64Sig(sigB);
+        expB = normExpSig.exp;
+        sigB = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expZ = expA + expB - 0x3FF;
+    sigA = (sigA | UINT64_C(0x0010000000000000))<<10;
+    sigB = (sigB | UINT64_C(0x0010000000000000))<<11;
+    sig128Z = softfloat_mul64To128(sigA, sigB);
+    sigZ = sig128Z.v64 | (sig128Z.v0 != 0);
+    if (sigZ < UINT64_C(0x4000000000000000)) {
+        --expZ;
+        sigZ <<= 1;
+    }
+    return softfloat_roundPackToF64(signZ, expZ, sigZ, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    return softfloat_propagateNaNF64UI(a, b, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ infArg:
+    if (! magBits) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        uiZ = defaultNaNF64UI;
+    } else {
+        uiZ = packToF64UI(signZ, 0x7FF, 0);
+    }
+    return uiZ;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ zero:
+    return packToF64UI(signZ, 0, 0);
+}
diff --git a/src/cpu/softfloat3e/f64_mulAdd.c b/src/cpu/softfloat3e/f64_mulAdd.c
new file mode 100644
index 000000000..9623b4980
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_mulAdd.c
@@ -0,0 +1,243 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+#include "specialize.h"
+
+float64 f64_mulAdd(float64 a, float64 b, float64 c, uint8_t op, struct softfloat_status_t *status)
+{
+    bool signA;
+    int16_t expA;
+    uint64_t sigA;
+    bool signB;
+    int16_t expB;
+    uint64_t sigB;
+    bool signC;
+    int16_t expC;
+    uint64_t sigC;
+    bool signZ;
+    uint64_t magBits, uiA, uiB, uiC, uiZ;
+    struct exp16_sig64 normExpSig;
+    int16_t expZ;
+    struct uint128 sig128Z;
+    uint64_t sigZ;
+    int16_t expDiff;
+    struct uint128 sig128C;
+    int8_t shiftDist;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiA = a;
+    uiB = b;
+    uiC = c;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    signA = signF64UI(uiA);
+    expA  = expF64UI(uiA);
+    sigA  = fracF64UI(uiA);
+    signB = signF64UI(uiB);
+    expB  = expF64UI(uiB);
+    sigB  = fracF64UI(uiB);
+    signC = signF64UI(uiC) ^ ((op & softfloat_mulAdd_subC) != 0);
+    expC  = expF64UI(uiC);
+    sigC  = fracF64UI(uiC);
+    signZ = signA ^ signB ^ ((op & softfloat_mulAdd_subProd) != 0);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    bool aisNaN = (expA == 0x7FF) && sigA;
+    bool bisNaN = (expB == 0x7FF) && sigB;
+    bool cisNaN = (expC == 0x7FF) && sigC;
+    if (aisNaN | bisNaN | cisNaN) {
+        uiZ = (aisNaN | bisNaN) ? softfloat_propagateNaNF64UI(uiA, uiB, status) : 0;
+        return softfloat_propagateNaNF64UI(uiZ, uiC, status);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) sigA = 0;
+        if (!expB) sigB = 0;
+        if (!expC) sigC = 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x7FF) {
+        magBits = expB | sigB;
+        goto infProdArg;
+    }
+    if (expB == 0x7FF) {
+        magBits = expA | sigA;
+        goto infProdArg;
+    }
+    if (expC == 0x7FF) {
+        if ((sigA && !expA) || (sigB && !expB)) {
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        }
+        return packToF64UI(signC, 0x7FF, 0);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA) {
+        if (! sigA) goto zeroProd;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF64Sig(sigA);
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    if (! expB) {
+        if (! sigB) goto zeroProd;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF64Sig(sigB);
+        expB = normExpSig.exp;
+        sigB = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expZ = expA + expB - 0x3FE;
+    sigA = (sigA | UINT64_C(0x0010000000000000))<<10;
+    sigB = (sigB | UINT64_C(0x0010000000000000))<<10;
+    sig128Z = softfloat_mul64To128(sigA, sigB);
+    if (sig128Z.v64 < UINT64_C(0x2000000000000000)) {
+        --expZ;
+        sig128Z = softfloat_add128(sig128Z.v64, sig128Z.v0, sig128Z.v64, sig128Z.v0);
+    }
+    if (! expC) {
+        if (! sigC) {
+            --expZ;
+            sigZ = sig128Z.v64<<1 | (sig128Z.v0 != 0);
+            goto roundPack;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF64Sig(sigC);
+        expC = normExpSig.exp;
+        sigC = normExpSig.sig;
+    }
+    sigC = (sigC | UINT64_C(0x0010000000000000))<<9;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expDiff = expZ - expC;
+    if (expDiff < 0) {
+        expZ = expC;
+        if ((signZ == signC) || (expDiff < -1)) {
+            sig128Z.v64 = softfloat_shiftRightJam64(sig128Z.v64, -expDiff);
+        } else {
+            sig128Z = softfloat_shortShiftRightJam128(sig128Z.v64, sig128Z.v0, 1);
+        }
+    } else if (expDiff) {
+        sig128C = softfloat_shiftRightJam128(sigC, 0, expDiff);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (signZ == signC) {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (expDiff <= 0) {
+            sigZ = (sigC + sig128Z.v64) | (sig128Z.v0 != 0);
+        } else {
+            sig128Z = softfloat_add128(sig128Z.v64, sig128Z.v0, sig128C.v64, sig128C.v0);
+            sigZ = sig128Z.v64 | (sig128Z.v0 != 0);
+        }
+        if (sigZ < UINT64_C(0x4000000000000000)) {
+            --expZ;
+            sigZ <<= 1;
+        }
+    } else {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (expDiff < 0) {
+            signZ = signC;
+            sig128Z = softfloat_sub128(sigC, 0, sig128Z.v64, sig128Z.v0);
+        } else if (! expDiff) {
+            sig128Z.v64 = sig128Z.v64 - sigC;
+            if (! (sig128Z.v64 | sig128Z.v0)) goto completeCancellation;
+            if (sig128Z.v64 & UINT64_C(0x8000000000000000)) {
+                signZ = ! signZ;
+                sig128Z = softfloat_sub128(0, 0, sig128Z.v64, sig128Z.v0);
+            }
+        } else {
+            sig128Z = softfloat_sub128(sig128Z.v64, sig128Z.v0, sig128C.v64, sig128C.v0);
+        }
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (! sig128Z.v64) {
+            expZ -= 64;
+            sig128Z.v64 = sig128Z.v0;
+            sig128Z.v0 = 0;
+        }
+        shiftDist = softfloat_countLeadingZeros64(sig128Z.v64) - 1;
+        expZ -= shiftDist;
+        if (shiftDist < 0) {
+            sigZ = softfloat_shortShiftRightJam64(sig128Z.v64, -shiftDist);
+        } else {
+            sig128Z = softfloat_shortShiftLeft128(sig128Z.v64, sig128Z.v0, shiftDist);
+            sigZ = sig128Z.v64;
+        }
+        sigZ |= (sig128Z.v0 != 0);
+    }
+ roundPack:
+    return softfloat_roundPackToF64(signZ, expZ, sigZ, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ infProdArg:
+    if (magBits) {
+        uiZ = packToF64UI(signZ, 0x7FF, 0);
+        if (signZ == signC || expC != 0x7FF) {
+            if ((sigA && !expA) || (sigB && !expB) || (sigC && !expC))
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+            return uiZ;
+        }
+    }
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    uiZ = defaultNaNF64UI;
+    return softfloat_propagateNaNF64UI(uiZ, uiC, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ zeroProd:
+    uiZ = packToF64UI(signC, expC, sigC);
+    if (!expC && sigC) {
+        /* Exact zero plus a denormal */
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        if (softfloat_flushUnderflowToZero(status)) {
+            softfloat_raiseFlags(status, softfloat_flag_underflow | softfloat_flag_inexact);
+            return packToF64UI(signC, 0, 0);
+        }
+    }
+    if (! (expC | sigC) && (signZ != signC)) {
+ completeCancellation:
+        uiZ = packToF64UI((softfloat_getRoundingMode(status) == softfloat_round_min), 0, 0);
+    }
+    return uiZ;
+}
diff --git a/src/cpu/softfloat3e/f64_range.c b/src/cpu/softfloat3e/f64_range.c
new file mode 100644
index 000000000..6f01c84cc
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_range.c
@@ -0,0 +1,135 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float64 f64_range(float64 a, float64 b, bool is_max, bool is_abs, int sign_ctrl, struct softfloat_status_t *status)
+{
+    bool signA;
+    int16_t expA;
+    uint64_t sigA;
+    bool signB;
+    int16_t expB;
+    uint64_t sigB;
+    bool aIsNaN, bIsNaN;
+    uint64_t z;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    signA = signF64UI(a);
+    expA  = expF64UI(a);
+    sigA  = fracF64UI(a);
+    signB = signF64UI(b);
+    expB  = expF64UI(b);
+    sigB  = fracF64UI(b);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_isSigNaNF64UI(a)) {
+        return softfloat_propagateNaNF64UI(a, 0, status);
+    }
+    if (softfloat_isSigNaNF64UI(b)) {
+        return softfloat_propagateNaNF64UI(b, 0, status);
+    }
+
+    aIsNaN = isNaNF64UI(a);
+    bIsNaN = isNaNF64UI(b);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA && sigA) {
+        if (softfloat_denormalsAreZeros(status)) {
+            a = packToF64UI(signA, 0, 0);
+        }
+        else if (! bIsNaN) {
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        }
+    }
+
+    if (! expB && sigB) {
+        if (softfloat_denormalsAreZeros(status)) {
+            b = packToF64UI(signB, 0, 0);
+        }
+        else if (! aIsNaN) {
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        }
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (bIsNaN) {
+        z = a;
+    }
+    else if (aIsNaN) {
+        z = b;
+    }
+    else if (signA != signB && ! is_abs) {
+        if (! is_max) {
+            z = signA ? a : b;
+        } else {
+            z = signA ? b : a;
+        }
+    } else {
+        float64 tmp_a = a, tmp_b = b;
+        if (is_abs) {
+            tmp_a = tmp_a & ~UINT64_C(0x8000000000000000); // clear the sign bit
+            tmp_b = tmp_b & ~UINT64_C(0x8000000000000000);
+            signA = 0;
+        }
+
+        if (! is_max) {
+            z = (signA ^ (tmp_a < tmp_b)) ? a : b;
+        } else {
+            z = (signA ^ (tmp_a < tmp_b)) ? b : a;
+        }
+    }
+
+    switch(sign_ctrl) {
+    case 0:
+        z = (z & ~UINT64_C(0x8000000000000000)) | (a & UINT64_C(0x8000000000000000)); // keep sign of a
+        break;
+    case 1:
+        break; // preserve sign of compare result
+    case 2:
+        z = z & ~UINT64_C(0x8000000000000000); // zero out the sign bit
+        break;
+    case 3:
+        z = z | UINT64_C(0x8000000000000000);  // set the sign bit
+        break;
+    }
+
+    return z;
+}
diff --git a/src/cpu/softfloat3e/f64_roundToInt.c b/src/cpu/softfloat3e/f64_roundToInt.c
new file mode 100644
index 000000000..3c5f7fb8c
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_roundToInt.c
@@ -0,0 +1,112 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2017 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float64 f64_roundToInt(float64 a, uint8_t scale, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    int16_t exp;
+    int64_t frac;
+    bool sign;
+    uint64_t uiZ, lastBitMask, roundBitsMask;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    scale &= 0xF;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    exp = expF64UI(a);
+    frac = fracF64UI(a);
+    sign = signF64UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (0x433 <= (exp + scale)) {
+        if ((exp == 0x7FF) && frac) {
+            return softfloat_propagateNaNF64UI(a, 0, status);
+        }
+        return a;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!exp) {
+            frac = 0;
+            a = packToF64UI(sign, 0, 0);
+        }
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if ((exp + scale) <= 0x3FE) {
+        if (!(exp | frac)) return a;
+        if (exact) softfloat_raiseFlags(status, softfloat_flag_inexact);
+        uiZ = packToF64UI(sign, 0, 0);
+        switch (roundingMode) {
+         case softfloat_round_near_even:
+            if (!frac) break;
+         case softfloat_round_near_maxMag:
+            if ((exp + scale) == 0x3FE) uiZ |= packToF64UI(0, 0x3FF - scale, 0);
+            break;
+         case softfloat_round_min:
+            if (uiZ) uiZ = packToF64UI(1, 0x3FF - scale, 0);
+            break;
+         case softfloat_round_max:
+            if (!uiZ) uiZ = packToF64UI(0, 0x3FF - scale, 0);
+            break;
+        }
+        return uiZ;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiZ = a;
+    lastBitMask = (uint64_t) 1<<(0x433 - exp - scale);
+    roundBitsMask = lastBitMask - 1;
+    if (roundingMode == softfloat_round_near_maxMag) {
+        uiZ += lastBitMask>>1;
+    } else if (roundingMode == softfloat_round_near_even) {
+        uiZ += lastBitMask>>1;
+        if (!(uiZ & roundBitsMask)) uiZ &= ~lastBitMask;
+    } else if (roundingMode == (signF64UI(uiZ) ? softfloat_round_min : softfloat_round_max)) {
+        uiZ += roundBitsMask;
+    }
+    uiZ &= ~roundBitsMask;
+    if (uiZ != a) {
+        if (exact) softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    return uiZ;
+}
diff --git a/src/cpu/softfloat3e/f64_scalef.c b/src/cpu/softfloat3e/f64_scalef.c
new file mode 100644
index 000000000..7a552ccc3
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_scalef.c
@@ -0,0 +1,156 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Return the result of a floating point scale of the double-precision floating
+| point value `a' by multiplying it by 2 power of the double-precision
+| floating point value 'b' converted to integral value. If the result cannot
+| be represented in double precision, then the proper overflow response (for
+| positive scaling operand), or the proper underflow response (for negative
+| scaling operand) is issued. The operation is performed according to the
+| IEC/IEEE Standard for Binary Floating-Point Arithmetic.
+*----------------------------------------------------------------------------*/
+
+float64 f64_scalef(float64 a, float64 b, struct softfloat_status_t *status)
+{
+    bool signA;
+    int16_t expA;
+    uint64_t sigA;
+    bool signB;
+    int16_t expB;
+    uint64_t sigB;
+    int shiftCount;
+    int scale = 0;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    signA = signF64UI(a);
+    expA  = expF64UI(a);
+    sigA  = fracF64UI(a);
+    signB = signF64UI(b);
+    expB  = expF64UI(b);
+    sigB  = fracF64UI(b);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expB == 0x7FF) {
+        if (sigB) return softfloat_propagateNaNF64UI(a, b, status);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) sigA = 0;
+        if (!expB) sigB = 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x7FF) {
+        if (sigA) {
+            int aIsSignalingNaN = (sigA & UINT64_C(0x0008000000000000)) == 0;
+            if (aIsSignalingNaN || expB != 0x7FF || sigB)
+                return softfloat_propagateNaNF64UI(a, b, status);
+
+            return signB ? 0 : packToF64UI(0, 0x7FF, 0);
+        }
+
+        if (expB == 0x7FF && signB) {
+            softfloat_raiseFlags(status, softfloat_flag_invalid);
+            return defaultNaNF64UI;
+        }
+
+        return a;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA) {
+        if (! sigA) {
+            if (expB == 0x7FF && ! signB) {
+                softfloat_raiseFlags(status, softfloat_flag_invalid);
+                return defaultNaNF64UI;
+            }
+            return packToF64UI(signA, 0, 0);
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if ((expB | sigB) == 0) return a;
+
+    if (expB == 0x7FF) {
+        if (signB) return packToF64UI(signA, 0, 0);
+        return packToF64UI(signA, 0x7FF, 0);
+    }
+
+    if (0x40F <= expB) {
+        // handle obvious overflow/underflow result
+        return softfloat_roundPackToF64(signA, signB ? -0x3FF : 0x7FF, sigA, status);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expB < 0x3FF) {
+        if (expB == 0)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        scale = -signB;
+    }
+    else {
+        sigB |= UINT64_C(0x0010000000000000);
+        shiftCount = 0x433 - expB;
+        uint64_t prev_sigB = sigB;
+        sigB >>= shiftCount;
+        scale = (int32_t) sigB;
+        if (signB) {
+            if ((sigB<<shiftCount) != prev_sigB) scale++;
+            scale = -scale;
+        }
+
+        if (scale >  0x1000) scale =  0x1000;
+        if (scale < -0x1000) scale = -0x1000;
+    }
+
+    if (expA != 0) {
+        sigA |= UINT64_C(0x0010000000000000);
+    } else {
+        expA++;
+    }
+
+    expA += scale - 1;
+    sigA <<= 10;
+    return softfloat_normRoundPackToF64(signA, expA, sigA, status);
+}
diff --git a/src/cpu/softfloat3e/f64_sqrt.c b/src/cpu/softfloat3e/f64_sqrt.c
new file mode 100644
index 000000000..d3ea81af8
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_sqrt.c
@@ -0,0 +1,130 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2017 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float64 f64_sqrt(float64 a, struct softfloat_status_t *status)
+{
+    bool signA;
+    int16_t expA;
+    uint64_t sigA;
+    struct exp16_sig64 normExpSig;
+    int16_t expZ;
+    uint32_t sig32A, recipSqrt32, sig32Z;
+    uint64_t rem;
+    uint32_t q;
+    uint64_t sigZ, shiftedSigZ;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    signA = signF64UI(a);
+    expA  = expF64UI(a);
+    sigA  = fracF64UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x7FF) {
+        if (sigA) {
+            return softfloat_propagateNaNF64UI(a, 0, status);
+        }
+        if (! signA) return a;
+        goto invalid;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) {
+            sigA = 0;
+            a = packToF64UI(signA, 0, 0);
+        }
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (signA) {
+        if (! (expA | sigA)) return a;
+        goto invalid;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA) {
+        if (! sigA) return a;
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF64Sig(sigA);
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    | (`sig32Z' is guaranteed to be a lower bound on the square root of
+    | `sig32A', which makes `sig32Z' also a lower bound on the square root of
+    | `sigA'.)
+    *------------------------------------------------------------------------*/
+    expZ = ((expA - 0x3FF)>>1) + 0x3FE;
+    expA &= 1;
+    sigA |= UINT64_C(0x0010000000000000);
+    sig32A = sigA>>21;
+    recipSqrt32 = softfloat_approxRecipSqrt32_1(expA, sig32A);
+    sig32Z = ((uint64_t) sig32A * recipSqrt32)>>32;
+    if (expA) {
+        sigA <<= 8;
+        sig32Z >>= 1;
+    } else {
+        sigA <<= 9;
+    }
+    rem = sigA - (uint64_t) sig32Z * sig32Z;
+    q = ((uint32_t) (rem>>2) * (uint64_t) recipSqrt32)>>32;
+    sigZ = ((uint64_t) sig32Z<<32 | 1<<5) + ((uint64_t) q<<3);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if ((sigZ & 0x1FF) < 0x22) {
+        sigZ &= ~(uint64_t) 0x3F;
+        shiftedSigZ = sigZ>>6;
+        rem = (sigA<<52) - shiftedSigZ * shiftedSigZ;
+        if (rem & UINT64_C(0x8000000000000000)) {
+            --sigZ;
+        } else {
+            if (rem) sigZ |= 1;
+        }
+    }
+    return softfloat_roundPackToF64(0, expZ, sigZ, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ invalid:
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    return defaultNaNF64UI;
+}
diff --git a/src/cpu/softfloat3e/f64_to_extF80.cc b/src/cpu/softfloat3e/f64_to_extF80.cc
new file mode 100644
index 000000000..88b27f9d3
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_to_extF80.cc
@@ -0,0 +1,88 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+extFloat80_t f64_to_extF80(float64 a, struct softfloat_status_t *status)
+{
+    bool sign;
+    int16_t exp;
+    uint64_t frac;
+    struct commonNaN commonNaN;
+    struct uint128 uiZ;
+    uint16_t uiZ64;
+    uint64_t uiZ0;
+    struct exp16_sig64 normExpSig;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF64UI(a);
+    exp  = expF64UI(a);
+    frac = fracF64UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0x7FF) {
+        if (frac) {
+            softfloat_f64UIToCommonNaN(a, &commonNaN, status);
+            uiZ = softfloat_commonNaNToExtF80UI(&commonNaN);
+            uiZ64 = uiZ.v64;
+            uiZ0  = uiZ.v0;
+        } else {
+            uiZ64 = packToExtF80UI64(sign, 0x7FFF);
+            uiZ0  = UINT64_C(0x8000000000000000);
+        }
+        return packToExtF80_twoargs(uiZ64, uiZ0);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! exp) {
+        if (! frac) {
+            return packToExtF80(sign, 0, 0);
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF64Sig(frac);
+        exp = normExpSig.exp;
+        frac = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uiZ64 = packToExtF80UI64(sign, exp + 0x3C00);
+    uiZ0  = (frac | UINT64_C(0x0010000000000000))<<11;
+    return packToExtF80_twoargs(uiZ64, uiZ0);
+}
diff --git a/src/cpu/softfloat3e/f64_to_f128.cc b/src/cpu/softfloat3e/f64_to_f128.cc
new file mode 100644
index 000000000..cfae72824
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_to_f128.cc
@@ -0,0 +1,89 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float128_t f64_to_f128(float64 a, struct softfloat_status_t *status)
+{
+    bool sign;
+    int16_t exp;
+    uint64_t frac;
+    struct commonNaN commonNaN;
+    struct uint128 uiZ;
+    struct exp16_sig64 normExpSig;
+    struct uint128 frac128;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF64UI(a);
+    exp  = expF64UI(a);
+    frac = fracF64UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0x7FF) {
+        if (frac) {
+            softfloat_f64UIToCommonNaN(a, &commonNaN, status);
+            uiZ = softfloat_commonNaNToF128UI(&commonNaN);
+        } else {
+            uiZ.v64 = packToF128UI64(sign, 0x7FFF, 0);
+            uiZ.v0  = 0;
+        }
+        return uiZ;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! exp) {
+        if (! frac) {
+            uiZ.v64 = packToF128UI64(sign, 0, 0);
+            uiZ.v0  = 0;
+            return uiZ;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalF64Sig(frac);
+        exp = normExpSig.exp - 1;
+        frac = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    frac128 = softfloat_shortShiftLeft128(0, frac, 60);
+    uiZ.v64 = packToF128UI64(sign, exp + 0x3C00, frac128.v64);
+    uiZ.v0  = frac128.v0;
+    return uiZ;
+}
diff --git a/src/cpu/softfloat3e/f64_to_f16.c b/src/cpu/softfloat3e/f64_to_f16.c
new file mode 100644
index 000000000..fe8dea057
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_to_f16.c
@@ -0,0 +1,83 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float16 f64_to_f16(float64 a, struct softfloat_status_t *status)
+{
+    bool sign;
+    int16_t exp;
+    uint64_t frac;
+    struct commonNaN commonNaN;
+    uint16_t uiZ, frac16;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF64UI(a);
+    exp  = expF64UI(a);
+    frac = fracF64UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0x7FF) {
+        if (frac) {
+            softfloat_f64UIToCommonNaN(a, &commonNaN, status);
+            uiZ = softfloat_commonNaNToF16UI(&commonNaN);
+        } else {
+            uiZ = packToF16UI(sign, 0x1F, 0);
+        }
+        return uiZ;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (!exp && frac) {
+        if (softfloat_denormalsAreZeros(status))
+            return packToF16UI(sign, 0, 0);
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    frac16 = softfloat_shortShiftRightJam64(frac, 38);
+    if (! (exp | frac16)) {
+        return packToF16UI(sign, 0, 0);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    return softfloat_roundPackToF16(sign, exp - 0x3F1, frac16 | 0x4000, status);
+}
diff --git a/src/cpu/softfloat3e/f64_to_f32.c b/src/cpu/softfloat3e/f64_to_f32.c
new file mode 100644
index 000000000..7ebbf428f
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_to_f32.c
@@ -0,0 +1,83 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float32 f64_to_f32(float64 a, struct softfloat_status_t *status)
+{
+    bool sign;
+    int16_t exp;
+    uint64_t frac;
+    struct commonNaN commonNaN;
+    uint32_t uiZ, frac32;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF64UI(a);
+    exp  = expF64UI(a);
+    frac = fracF64UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp == 0x7FF) {
+        if (frac) {
+            softfloat_f64UIToCommonNaN(a, &commonNaN, status);
+            uiZ = softfloat_commonNaNToF32UI(&commonNaN);
+        } else {
+            uiZ = packToF32UI(sign, 0xFF, 0);
+        }
+        return uiZ;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (!exp && frac) {
+        if (softfloat_denormalsAreZeros(status))
+            return packToF32UI(sign, 0, 0);
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    frac32 = softfloat_shortShiftRightJam64(frac, 22);
+    if (! (exp | frac32)) {
+        return packToF32UI(sign, 0, 0);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    return softfloat_roundPackToF32(sign, exp - 0x381, frac32 | 0x40000000, status);
+}
diff --git a/src/cpu/softfloat3e/f64_to_i32.c b/src/cpu/softfloat3e/f64_to_i32.c
new file mode 100644
index 000000000..c296e0bd5
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_to_i32.c
@@ -0,0 +1,77 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int32_t f64_to_i32(float64 a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    bool sign;
+    int16_t exp;
+    uint64_t sig;
+    int16_t shiftDist;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF64UI(a);
+    exp  = expF64UI(a);
+    sig  = fracF64UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+#if (i32_fromNaN != i32_fromPosOverflow) || (i32_fromNaN != i32_fromNegOverflow)
+    if ((exp == 0x7FF) && sig) {
+#if (i32_fromNaN == i32_fromPosOverflow)
+        sign = 0;
+#elif (i32_fromNaN == i32_fromNegOverflow)
+        sign = 1;
+#else
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return i32_fromNaN;
+#endif
+    }
+#endif
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp) sig |= UINT64_C(0x0010000000000000);
+    else if (softfloat_denormalsAreZeros(status)) sig = 0;
+    shiftDist = 0x427 - exp;
+    if (0 < shiftDist) sig = softfloat_shiftRightJam64(sig, shiftDist);
+    return softfloat_roundToI32(sign, sig, roundingMode, exact, status);
+}
+
diff --git a/src/cpu/softfloat3e/f64_to_i32_r_minMag.c b/src/cpu/softfloat3e/f64_to_i32_r_minMag.c
new file mode 100644
index 000000000..80e2d6bc3
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_to_i32_r_minMag.c
@@ -0,0 +1,89 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int32_t f64_to_i32_r_minMag(float64 a, bool exact, struct softfloat_status_t *status)
+{
+    int16_t exp;
+    uint64_t sig;
+    int16_t shiftDist;
+    bool sign;
+    int32_t absZ;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    exp = expF64UI(a);
+    sig = fracF64UI(a);
+    if (softfloat_denormalsAreZeros(status))
+        if (!exp && sig) sig = 0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x433 - exp;
+    if (53 <= shiftDist) {
+        if (exact && (exp | sig)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+        return 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF64UI(a);
+    if (shiftDist < 22) {
+        if (sign && (exp == 0x41E) && (sig < UINT64_C(0x0000000000200000))) {
+            if (exact && sig) {
+                softfloat_raiseFlags(status, softfloat_flag_inexact);
+            }
+            return -0x7FFFFFFF - 1;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return (exp == 0x7FF) && sig
+            ? i32_fromNaN
+            : sign ? i32_fromNegOverflow : i32_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sig |= UINT64_C(0x0010000000000000);
+    absZ = sig>>shiftDist;
+    if (exact && ((uint64_t) (uint32_t) absZ<<shiftDist != sig)) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    return sign ? -absZ : absZ;
+}
+
diff --git a/src/cpu/softfloat3e/f64_to_i64.c b/src/cpu/softfloat3e/f64_to_i64.c
new file mode 100644
index 000000000..ebe1c787b
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_to_i64.c
@@ -0,0 +1,78 @@
+
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int64_t f64_to_i64(float64 a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    bool sign;
+    int16_t exp;
+    uint64_t sig;
+    int16_t shiftDist;
+    struct uint64_extra sigExtra;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF64UI(a);
+    exp  = expF64UI(a);
+    sig  = fracF64UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp) sig |= UINT64_C(0x0010000000000000);
+    else if (softfloat_denormalsAreZeros(status)) sig = 0;
+    shiftDist = 0x433 - exp;
+    if (shiftDist <= 0) {
+        if (shiftDist < -11) goto invalid;
+        sigExtra.v = sig<<-shiftDist;
+        sigExtra.extra = 0;
+    } else {
+        sigExtra = softfloat_shiftRightJam64Extra(sig, 0, shiftDist);
+    }
+    return softfloat_roundToI64(sign, sigExtra.v, sigExtra.extra, roundingMode, exact, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ invalid:
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    return (exp == 0x7FF) && fracF64UI(a)
+            ? i64_fromNaN
+            : sign ? i64_fromNegOverflow : i64_fromPosOverflow;
+}
+
diff --git a/src/cpu/softfloat3e/f64_to_i64_r_minMag.c b/src/cpu/softfloat3e/f64_to_i64_r_minMag.c
new file mode 100644
index 000000000..eb633eb22
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_to_i64_r_minMag.c
@@ -0,0 +1,95 @@
+
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int64_t f64_to_i64_r_minMag(float64 a, bool exact, struct softfloat_status_t *status)
+{
+    bool sign;
+    int16_t exp;
+    uint64_t sig;
+    int16_t shiftDist;
+    uint64_t absZ;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF64UI(a);
+    exp  = expF64UI(a);
+    sig  = fracF64UI(a);
+    if (softfloat_denormalsAreZeros(status))
+        if (!exp && sig) sig = 0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x433 - exp;
+    if (shiftDist <= 0) {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (shiftDist < -10) {
+            if (a == packToF64UI(1, 0x43E, 0)) {
+                return -INT64_C(0x7FFFFFFFFFFFFFFF) - 1;
+            }
+            softfloat_raiseFlags(status, softfloat_flag_invalid);
+            return (exp == 0x7FF) && sig
+                    ? i64_fromNaN
+                    : sign ? i64_fromNegOverflow : i64_fromPosOverflow;
+        }
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        sig |= UINT64_C(0x0010000000000000);
+        absZ = sig<<-shiftDist;
+    } else {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (53 <= shiftDist) {
+            if (exact && (exp | sig)) {
+                softfloat_raiseFlags(status, softfloat_flag_inexact);
+            }
+            return 0;
+        }
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        sig |= UINT64_C(0x0010000000000000);
+        absZ = sig>>shiftDist;
+        if (exact && (absZ<<shiftDist != sig)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+    }
+    return sign ? -absZ : absZ;
+}
diff --git a/src/cpu/softfloat3e/f64_to_ui32.c b/src/cpu/softfloat3e/f64_to_ui32.c
new file mode 100644
index 000000000..1dad1bc32
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_to_ui32.c
@@ -0,0 +1,77 @@
+
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint32_t f64_to_ui32(float64 a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    bool sign;
+    int16_t exp;
+    uint64_t sig;
+    int16_t shiftDist;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF64UI(a);
+    exp  = expF64UI(a);
+    sig  = fracF64UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+#if (ui32_fromNaN != ui32_fromPosOverflow) || (ui32_fromNaN != ui32_fromNegOverflow)
+    if ((exp == 0x7FF) && sig) {
+#if (ui32_fromNaN == ui32_fromPosOverflow)
+        sign = 0;
+#elif (ui32_fromNaN == ui32_fromNegOverflow)
+        sign = 1;
+#else
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return ui32_fromNaN;
+#endif
+    }
+#endif
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp) sig |= UINT64_C(0x0010000000000000);
+    else if (softfloat_denormalsAreZeros(status)) sig = 0;
+    shiftDist = 0x427 - exp;
+    if (0 < shiftDist) sig = softfloat_shiftRightJam64(sig, shiftDist);
+    return softfloat_roundToUI32(sign, sig, roundingMode, exact, status);
+}
diff --git a/src/cpu/softfloat3e/f64_to_ui32_r_minMag.c b/src/cpu/softfloat3e/f64_to_ui32_r_minMag.c
new file mode 100644
index 000000000..7610d7c37
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_to_ui32_r_minMag.c
@@ -0,0 +1,83 @@
+
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint32_t f64_to_ui32_r_minMag(float64 a, bool exact, struct softfloat_status_t *status)
+{
+    int16_t exp;
+    uint64_t sig;
+    int16_t shiftDist;
+    bool sign;
+    uint32_t z;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    exp = expF64UI(a);
+    sig = fracF64UI(a);
+    if (softfloat_denormalsAreZeros(status))
+        if (!exp && sig) sig = 0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x433 - exp;
+    if (53 <= shiftDist) {
+        if (exact && (exp | sig)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+        return 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF64UI(a);
+    if (sign || (shiftDist < 21)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        return (exp == 0x7FF) && sig
+                ? ui32_fromNaN
+                : sign ? ui32_fromNegOverflow : ui32_fromPosOverflow;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sig |= UINT64_C(0x0010000000000000);
+    z = sig>>shiftDist;
+    if (exact && ((uint64_t) z<<shiftDist != sig)) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    return z;
+}
diff --git a/src/cpu/softfloat3e/f64_to_ui64.c b/src/cpu/softfloat3e/f64_to_ui64.c
new file mode 100644
index 000000000..81eef526a
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_to_ui64.c
@@ -0,0 +1,76 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint64_t f64_to_ui64(float64 a, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    bool sign;
+    int16_t exp;
+    uint64_t sig;
+    int16_t shiftDist;
+    struct uint64_extra sigExtra;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF64UI(a);
+    exp  = expF64UI(a);
+    sig  = fracF64UI(a);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (exp) sig |= UINT64_C(0x0010000000000000);
+    else if (softfloat_denormalsAreZeros(status)) sig = 0;
+    shiftDist = 0x433 - exp;
+    if (shiftDist <= 0) {
+        if (shiftDist < -11) goto invalid;
+        sigExtra.v = sig<<-shiftDist;
+        sigExtra.extra = 0;
+    } else {
+        sigExtra = softfloat_shiftRightJam64Extra(sig, 0, shiftDist);
+    }
+    return softfloat_roundToUI64(sign, sigExtra.v, sigExtra.extra, roundingMode, exact, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ invalid:
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    return (exp == 0x7FF) && fracF64UI(a)
+            ? ui64_fromNaN
+            : sign ? ui64_fromNegOverflow : ui64_fromPosOverflow;
+}
diff --git a/src/cpu/softfloat3e/f64_to_ui64_r_minMag.c b/src/cpu/softfloat3e/f64_to_ui64_r_minMag.c
new file mode 100644
index 000000000..e7bda4c67
--- /dev/null
+++ b/src/cpu/softfloat3e/f64_to_ui64_r_minMag.c
@@ -0,0 +1,87 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint64_t f64_to_ui64_r_minMag(float64 a, bool exact, struct softfloat_status_t *status)
+{
+    int16_t exp;
+    uint64_t sig;
+    int16_t shiftDist;
+    bool sign;
+    uint64_t z;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    exp = expF64UI(a);
+    sig = fracF64UI(a);
+    if (softfloat_denormalsAreZeros(status))
+        if (!exp && sig) sig = 0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    shiftDist = 0x433 - exp;
+    if (53 <= shiftDist) {
+        if (exact && (exp | sig)) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+        return 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sign = signF64UI(a);
+    if (sign) goto invalid;
+    if (shiftDist <= 0) {
+        if (shiftDist < -11) goto invalid;
+        z = (sig | UINT64_C(0x0010000000000000))<<-shiftDist;
+    } else {
+        sig |= UINT64_C(0x0010000000000000);
+        z = sig>>shiftDist;
+        if (exact && (uint64_t) (sig<<(-shiftDist & 63))) {
+            softfloat_raiseFlags(status, softfloat_flag_inexact);
+        }
+    }
+    return z;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ invalid:
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    return
+        (exp == 0x7FF) && sig ? ui64_fromNaN
+            : sign ? ui64_fromNegOverflow : ui64_fromPosOverflow;
+}
diff --git a/src/cpu/softfloat/fpatan.cc b/src/cpu/softfloat3e/fpatan.cc
similarity index 59%
rename from src/cpu/softfloat/fpatan.cc
rename to src/cpu/softfloat3e/fpatan.cc
index f33a3ff66..207dc320a 100644
--- a/src/cpu/softfloat/fpatan.cc
+++ b/src/cpu/softfloat3e/fpatan.cc
@@ -25,27 +25,31 @@ these four paragraphs for those parts of this code that are retained.
 
 #define FLOAT128
 
-#include "softfloatx80.h"
-#include "softfloat-round-pack.h"
+#include "config.h"
+#include "softfloat.h"
+#include "specialize.h"
+
+#include "fpu_trans.h"
 #include "fpu_constant.h"
+#include "poly.h"
 
 #define FPATAN_ARR_SIZE 11
 
-static const float128 float128_one =
+static const float128_t float128_one =
         packFloat128(BX_CONST64(0x3fff000000000000), BX_CONST64(0x0000000000000000));
-static const float128 float128_sqrt3 =
+static const float128_t float128_sqrt3 =
         packFloat128(BX_CONST64(0x3fffbb67ae8584ca), BX_CONST64(0xa73b25742d7078b8));
 static const floatx80 floatx80_pi  =
         packFloatx80(0, 0x4000, BX_CONST64(0xc90fdaa22168c235));
 
-static const float128 float128_pi2 =
+static const float128_t float128_pi2 =
         packFloat128(BX_CONST64(0x3fff921fb54442d1), BX_CONST64(0x8469898CC5170416));
-static const float128 float128_pi4 =
+static const float128_t float128_pi4 =
         packFloat128(BX_CONST64(0x3ffe921fb54442d1), BX_CONST64(0x8469898CC5170416));
-static const float128 float128_pi6 =
+static const float128_t float128_pi6 =
         packFloat128(BX_CONST64(0x3ffe0c152382d736), BX_CONST64(0x58465BB32E0F580F));
 
-static float128 atan_arr[FPATAN_ARR_SIZE] =
+static float128_t atan_arr[FPATAN_ARR_SIZE] =
 {
     PACK_FLOAT_128(0x3fff000000000000, 0x0000000000000000), /*  1 */
     PACK_FLOAT_128(0xbffd555555555555, 0x5555555555555555), /*  3 */
@@ -60,10 +64,10 @@ static float128 atan_arr[FPATAN_ARR_SIZE] =
     PACK_FLOAT_128(0x3ffa861861861861, 0x8618618618618618)  /* 21 */
 };
 
-extern float128 OddPoly(float128 x, float128 *arr, int n, struct float_status_t *status);
+extern float128_t OddPoly(float128_t x, const float128_t *arr, int n, softfloat_status_t &status);
 
 /* |x| < 1/4 */
-static float128 poly_atan(float128 x1, struct float_status_t *status)
+static float128_t poly_atan(float128_t x1, softfloat_status_t &status)
 {
 /*
     //                 3     5     7     9     11     13     15     17
@@ -86,12 +90,11 @@ static float128 poly_atan(float128 x1, struct float_status_t *status)
     //    atan(x) ~ x * [ p(x) + x * q(x) ]
     //
 */
-    return OddPoly(x1, atan_arr, FPATAN_ARR_SIZE, status);
+    return OddPoly(x1, (const float128_t*) atan_arr, FPATAN_ARR_SIZE, status);
 }
 
 // =================================================
-// FPATAN                  Compute y * log (x)
-//                                        2
+// FPATAN                  Compute arctan(y/x)
 // =================================================
 
 //
@@ -134,125 +137,129 @@ static float128 poly_atan(float128 x1, struct float_status_t *status)
 //                  3     5     7     9                 2n+1
 //
 
-floatx80 fpatan(floatx80 a, floatx80 b, struct float_status_t *status)
+floatx80 fpatan(floatx80 a, floatx80 b, softfloat_status_t &status)
 {
 /*----------------------------------------------------------------------------
 | The pattern for a default generated extended double-precision NaN.
 *----------------------------------------------------------------------------*/
-    const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
+    const floatx80 floatx80_default_nan =
+        packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
 
     // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a) || floatx80_is_unsupported(b)) {
-        float_raise(status, float_flag_invalid);
+    if (extF80_isUnsupported(a) || extF80_isUnsupported(b)) {
+        softfloat_raiseFlags(&status, softfloat_flag_invalid);
         return floatx80_default_nan;
     }
 
-    Bit64u aSig = extractFloatx80Frac(a);
-    Bit32s aExp = extractFloatx80Exp(a);
-    int aSign = extractFloatx80Sign(a);
-    Bit64u bSig = extractFloatx80Frac(b);
-    Bit32s bExp = extractFloatx80Exp(b);
-    int bSign = extractFloatx80Sign(b);
+    uint64_t aSig = extF80_fraction(a);
+    int32_t aExp = extF80_exp(a);
+    int aSign = extF80_sign(a);
+    uint64_t bSig = extF80_fraction(b);
+    int32_t bExp = extF80_exp(b);
+    int bSign = extF80_sign(b);
 
     int zSign = aSign ^ bSign;
 
     if (bExp == 0x7FFF)
     {
-        if ((Bit64u) (bSig<<1))
-            return propagateFloatx80NaN(a, b, status);
+        if (bSig<<1)
+            return softfloat_propagateNaNExtF80UI(a.signExp, aSig, b.signExp, bSig, &status);
 
         if (aExp == 0x7FFF) {
-            if ((Bit64u) (aSig<<1))
-                return propagateFloatx80NaN(a, b, status);
+            if (aSig<<1)
+                return softfloat_propagateNaNExtF80UI(a.signExp, aSig, b.signExp, bSig, &status);
 
-            if (aSign) {   /* return 3PI/4 */
-                return roundAndPackFloatx80(80, bSign,
-                        FLOATX80_3PI4_EXP, FLOAT_3PI4_HI, FLOAT_3PI4_LO, status);
-            }
-            else {         /* return  PI/4 */
-                return roundAndPackFloatx80(80, bSign,
-                        FLOATX80_PI4_EXP, FLOAT_PI_HI, FLOAT_PI_LO, status);
-            }
+            if (aSign)     /* return 3PI/4 */
+                return softfloat_roundPackToExtF80(bSign, FLOATX80_3PI4_EXP, FLOAT_3PI4_HI, FLOAT_3PI4_LO, 80, &status);
+            else           /* return  PI/4 */
+                return softfloat_roundPackToExtF80(bSign, FLOATX80_PI4_EXP, FLOAT_PI_HI, FLOAT_PI_LO, 80, &status);
         }
 
-        if (aSig && (aExp == 0))
-            float_raise(status, float_flag_denormal);
+        if (aSig && ! aExp)
+            softfloat_raiseFlags(&status, softfloat_flag_denormal);
 
         /* return PI/2 */
-        return roundAndPackFloatx80(80, bSign, FLOATX80_PI2_EXP, FLOAT_PI_HI, FLOAT_PI_LO, status);
+        return softfloat_roundPackToExtF80(bSign, FLOATX80_PI2_EXP, FLOAT_PI_HI, FLOAT_PI_LO, 80, &status);
     }
     if (aExp == 0x7FFF)
     {
-        if ((Bit64u) (aSig<<1))
-            return propagateFloatx80NaN(a, b, status);
+        if (aSig<<1)
+            return softfloat_propagateNaNExtF80UI(a.signExp, aSig, b.signExp, bSig, &status);
 
-        if (bSig && (bExp == 0))
-            float_raise(status, float_flag_denormal);
+        if (bSig && ! bExp)
+            softfloat_raiseFlags(&status, softfloat_flag_denormal);
 
 return_PI_or_ZERO:
 
-        if (aSign) {   /* return PI */
-            return roundAndPackFloatx80(80, bSign, FLOATX80_PI_EXP, FLOAT_PI_HI, FLOAT_PI_LO, status);
-        } else {       /* return  0 */
-            return packFloatx80(bSign, 0, 0);
-        }
+        if (aSign)   /* return PI */
+            return softfloat_roundPackToExtF80(bSign, FLOATX80_PI_EXP, FLOAT_PI_HI, FLOAT_PI_LO, 80, &status);
+        else         /* return  0 */
+            return packToExtF80(bSign, 0, 0);
     }
-    if (bExp == 0)
+    if (! bExp)
     {
-        if (bSig == 0) {
-             if (aSig && (aExp == 0)) float_raise(status, float_flag_denormal);
+        if (! bSig) {
+             if (aSig && ! aExp) softfloat_raiseFlags(&status, softfloat_flag_denormal);
              goto return_PI_or_ZERO;
         }
 
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(bSig, &bExp, &bSig);
+        softfloat_raiseFlags(&status, softfloat_flag_denormal);
+        struct exp32_sig64 normExpSig = softfloat_normSubnormalExtF80Sig(bSig);
+        bExp = normExpSig.exp + 1;
+        bSig = normExpSig.sig;
     }
-    if (aExp == 0)
+    if (! aExp)
     {
-        if (aSig == 0)   /* return PI/2 */
-            return roundAndPackFloatx80(80, bSign, FLOATX80_PI2_EXP, FLOAT_PI_HI, FLOAT_PI_LO, status);
+        if (! aSig)   /* return PI/2 */
+            return softfloat_roundPackToExtF80(bSign, FLOATX80_PI2_EXP, FLOAT_PI_HI, FLOAT_PI_LO, 80, &status);
 
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(aSig, &aExp, &aSig);
+        softfloat_raiseFlags(&status, softfloat_flag_denormal);
+        struct exp32_sig64 normExpSig = softfloat_normSubnormalExtF80Sig(aSig);
+        aExp = normExpSig.exp + 1;
+        aSig = normExpSig.sig;
     }
 
-    float_raise(status, float_flag_inexact);
+    softfloat_raiseFlags(&status, softfloat_flag_inexact);
 
     /* |a| = |b| ==> return PI/4 */
-    if (aSig == bSig && aExp == bExp)
-        return roundAndPackFloatx80(80, bSign, FLOATX80_PI4_EXP, FLOAT_PI_HI, FLOAT_PI_LO, status);
+    if (aSig == bSig && aExp == bExp) {
+        if (aSign)
+            return softfloat_roundPackToExtF80(bSign, FLOATX80_3PI4_EXP, FLOAT_3PI4_HI, FLOAT_3PI4_LO, 80, &status);
+        else
+            return softfloat_roundPackToExtF80(bSign, FLOATX80_PI4_EXP, FLOAT_PI_HI, FLOAT_PI_LO, 80, &status);
+    }
 
     /* ******************************** */
     /* using float128 for approximation */
     /* ******************************** */
 
-    float128 a128 = normalizeRoundAndPackFloat128(0, aExp-0x10, aSig, 0, status);
-    float128 b128 = normalizeRoundAndPackFloat128(0, bExp-0x10, bSig, 0, status);
-    float128 x;
+    float128_t a128 = softfloat_normRoundPackToF128(0, aExp-0x10, aSig, 0, &status);
+    float128_t b128 = softfloat_normRoundPackToF128(0, bExp-0x10, bSig, 0, &status);
+    float128_t x;
     int swap = 0, add_pi6 = 0, add_pi4 = 0;
 
     if (aExp > bExp || (aExp == bExp && aSig > bSig))
     {
-        x = float128_div(b128, a128, status);
+        x = f128_div(b128, a128, &status);
     }
     else {
-        x = float128_div(a128, b128, status);
+        x = f128_div(a128, b128, &status);
         swap = 1;
     }
 
-    Bit32s xExp = extractFloat128Exp(x);
+    int32_t xExp = expF128UI64(x.v64);
 
     if (xExp <= FLOATX80_EXP_BIAS-40)
         goto approximation_completed;
 
-    if (x.hi >= BX_CONST64(0x3ffe800000000000))        // 3/4 < x < 1
+    if (x.v64 >= BX_CONST64(0x3ffe800000000000))        // 3/4 < x < 1
     {
         /*
         arctan(x) = arctan((x-1)/(x+1)) + pi/4
         */
-        float128 t1 = float128_sub(x, float128_one, status);
-        float128 t2 = float128_add(x, float128_one, status);
-        x = float128_div(t1, t2, status);
+        float128_t t1 = f128_sub(x, float128_one, &status);
+        float128_t t2 = f128_add(x, float128_one, &status);
+        x = f128_div(t1, t2, &status);
         add_pi4 = 1;
     }
     else
@@ -263,26 +270,26 @@ return_PI_or_ZERO:
             /*
             arctan(x) = arctan((x*sqrt(3)-1)/(x+sqrt(3))) + pi/6
             */
-            float128 t1 = float128_mul(x, float128_sqrt3, status);
-            float128 t2 = float128_add(x, float128_sqrt3, status);
-            x = float128_sub(t1, float128_one, status);
-            x = float128_div(x, t2, status);
+            float128_t t1 = f128_mul(x, float128_sqrt3, &status);
+            float128_t t2 = f128_add(x, float128_sqrt3, &status);
+            x = f128_sub(t1, float128_one, &status);
+            x = f128_div(x, t2, &status);
             add_pi6 = 1;
         }
     }
 
     x = poly_atan(x, status);
-    if (add_pi6) x = float128_add(x, float128_pi6, status);
-    if (add_pi4) x = float128_add(x, float128_pi4, status);
+    if (add_pi6) x = f128_add(x, float128_pi6, &status);
+    if (add_pi4) x = f128_add(x, float128_pi4, &status);
 
 approximation_completed:
-    if (swap) x = float128_sub(float128_pi2, x, status);
-    floatx80 result = float128_to_floatx80(x, status);
+    if (swap) x = f128_sub(float128_pi2, x, &status);
+    floatx80 result = f128_to_extF80(x, &status);
     if (zSign) floatx80_chs(result);
-    int rSign = extractFloatx80Sign(result);
+    int rSign = extF80_sign(result);
     if (!bSign && rSign)
-        return floatx80_add(result, floatx80_pi, status);
+        return extF80_add(result, floatx80_pi, &status);
     if (bSign && !rSign)
-        return floatx80_sub(result, floatx80_pi, status);
+        return extF80_sub(result, floatx80_pi, &status);
     return result;
 }
diff --git a/src/cpu/softfloat/fprem.cc b/src/cpu/softfloat3e/fprem.cc
similarity index 53%
rename from src/cpu/softfloat/fprem.cc
rename to src/cpu/softfloat3e/fprem.cc
index 26637c5c5..2252f1230 100644
--- a/src/cpu/softfloat/fprem.cc
+++ b/src/cpu/softfloat3e/fprem.cc
@@ -23,100 +23,109 @@ these four paragraphs for those parts of this code that are retained.
  *            Stanislav Shwartsman [sshwarts at sourceforge net]
  * ==========================================================================*/
 
-#include "softfloatx80.h"
-#include "softfloat-round-pack.h"
+#include "fpu_trans.h"
 #define USE_estimateDiv128To64
-#include "softfloat-macros.h"
+#include "softfloat-helpers.h"
+
+#include "specialize.h"  // for softfloat_propagateNaNExtF80UI
 
 /* executes single exponent reduction cycle */
-static Bit64u remainder_kernel(Bit64u aSig0, Bit64u bSig, int expDiff, Bit64u *zSig0, Bit64u *zSig1)
+static uint64_t remainder_kernel(uint64_t aSig0, uint64_t bSig, int expDiff, uint64_t *zSig0, uint64_t *zSig1)
 {
-    Bit64u term0, term1;
-    Bit64u aSig1 = 0;
-
+    uint128 term, z;
+    uint64_t aSig1 = 0;
     shortShift128Left(aSig1, aSig0, expDiff, &aSig1, &aSig0);
-    Bit64u q = estimateDiv128To64(aSig1, aSig0, bSig);
-    mul64To128(bSig, q, &term0, &term1);
-    sub128(aSig1, aSig0, term0, term1, zSig1, zSig0);
-    while ((Bit64s)(*zSig1) < 0) {
+    uint64_t q = estimateDiv128To64(aSig1, aSig0, bSig);
+    term = softfloat_mul64To128(bSig, q);
+    z = softfloat_sub128(aSig1, aSig0, term.v64, term.v0);
+    while ((int64_t) z.v64 < 0) {
         --q;
-        add128(*zSig1, *zSig0, 0, bSig, zSig1, zSig0);
+        z = softfloat_add128(z.v64, z.v0, 0, bSig);
     }
+    *zSig0 = z.v0;
+    *zSig1 = z.v64;
     return q;
 }
 
-static int do_fprem(floatx80 a, floatx80 b, floatx80 *r, Bit64u *q, int rounding_mode, struct float_status_t *status)
+static int do_fprem(floatx80 a, floatx80 b, floatx80 *r, uint64_t *q, int rounding_mode, struct softfloat_status_t *status)
 {
 /*----------------------------------------------------------------------------
 | The pattern for a default generated extended double-precision NaN.
 *----------------------------------------------------------------------------*/
-    const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
+    static const floatx80 floatx80_default_nan =
+        packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
 
-    Bit32s aExp, bExp, zExp, expDiff;
-    Bit64u aSig0, aSig1, bSig;
+    int32_t aExp, bExp, zExp, expDiff;
+    uint64_t aSig0, aSig1 = 0, bSig;
     int aSign;
+    struct exp32_sig64 normExpSig;
+    uint128 term;
+
     *q = 0;
 
     // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a) || floatx80_is_unsupported(b))
-    {
-        float_raise(status, float_flag_invalid);
+    if (extF80_isUnsupported(a) || extF80_isUnsupported(b)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
         *r = floatx80_default_nan;
         return -1;
     }
 
-    aSig0 = extractFloatx80Frac(a);
-    aExp = extractFloatx80Exp(a);
-    aSign = extractFloatx80Sign(a);
-    bSig = extractFloatx80Frac(b);
-    bExp = extractFloatx80Exp(b);
+    aSig0 = extF80_fraction(a);
+    aExp = extF80_exp(a);
+    aSign = extF80_sign(a);
+    bSig = extF80_fraction(b);
+    bExp = extF80_exp(b);
 
     if (aExp == 0x7FFF) {
-        if ((Bit64u) (aSig0<<1) || ((bExp == 0x7FFF) && (Bit64u) (bSig<<1))) {
-            *r = propagateFloatx80NaN(a, b, status);
+        if ((aSig0<<1) || ((bExp == 0x7FFF) && (bSig<<1))) {
+            *r = softfloat_propagateNaNExtF80UI(a.signExp, a.signif, b.signExp, b.signif, status);
             return -1;
         }
-        float_raise(status, float_flag_invalid);
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
         *r = floatx80_default_nan;
         return -1;
     }
     if (bExp == 0x7FFF) {
-        if ((Bit64u) (bSig<<1)) {
-            *r = propagateFloatx80NaN(a, b, status);
+        if (bSig << 1) {
+            *r = softfloat_propagateNaNExtF80UI(a.signExp, a.signif, b.signExp, b.signif, status);
             return -1;
         }
-        if (aExp == 0 && aSig0) {
-            float_raise(status, float_flag_denormal);
-            normalizeFloatx80Subnormal(aSig0, &aExp, &aSig0);
-            *r = (a.fraction & BX_CONST64(0x8000000000000000)) ?
-                    packFloatx80(aSign, aExp, aSig0) : a;
+        if (! aExp && aSig0) {
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+            normExpSig = softfloat_normSubnormalExtF80Sig(aSig0);
+            aExp = normExpSig.exp + 1;
+            aSig0 = normExpSig.sig;
+            *r = (a.signif & BX_CONST64(0x8000000000000000)) ? packToExtF80(aSign, aExp, aSig0) : a;
             return 0;
         }
         *r = a;
         return 0;
 
     }
-    if (bExp == 0) {
-        if (bSig == 0) {
-            float_raise(status, float_flag_invalid);
+    if (! bExp) {
+        if (! bSig) {
+            softfloat_raiseFlags(status, softfloat_flag_invalid);
             *r = floatx80_default_nan;
             return -1;
         }
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(bSig, &bExp, &bSig);
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalExtF80Sig(bSig);
+        bExp = normExpSig.exp + 1;
+        bSig = normExpSig.sig;
     }
-    if (aExp == 0) {
-        if (aSig0 == 0) {
+    if (! aExp) {
+        if (! aSig0) {
             *r = a;
             return 0;
         }
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(aSig0, &aExp, &aSig0);
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalExtF80Sig(aSig0);
+        aExp = normExpSig.exp + 1;
+        aSig0 = normExpSig.sig;
     }
-    expDiff = aExp - bExp;
-    aSig1 = 0;
 
-    Bit32u overflow = 0;
+    expDiff = aExp - bExp;
+    int overflow = 0;
 
     if (expDiff >= 64) {
         int n = (expDiff & 0x1f) | 0x20;
@@ -129,11 +138,10 @@ static int do_fprem(floatx80 a, floatx80 b, floatx80 *r, Bit64u *q, int rounding
 
         if (expDiff < 0) {
             if (expDiff < -1) {
-               *r = (a.fraction & BX_CONST64(0x8000000000000000)) ?
-                    packFloatx80(aSign, aExp, aSig0) : a;
+               *r = (a.signif & BX_CONST64(0x8000000000000000)) ? packToExtF80(aSign, aExp, aSig0) : a;
                return 0;
             }
-            shift128Right(aSig0, 0, 1, &aSig0, &aSig1);
+            shortShift128Right(aSig0, 0, 1, &aSig0, &aSig1);
             expDiff = 0;
         }
 
@@ -147,26 +155,28 @@ static int do_fprem(floatx80 a, floatx80 b, floatx80 *r, Bit64u *q, int rounding
             }
         }
 
-        if (rounding_mode == float_round_nearest_even)
-        {
-            Bit64u term0, term1;
-            shift128Right(bSig, 0, 1, &term0, &term1);
+        if (rounding_mode == softfloat_round_near_even) {
+            uint64_t term0, term1;
+            shortShift128Right(bSig, 0, 1, &term0, &term1);
 
-            if (! lt128(aSig0, aSig1, term0, term1))
-            {
-               int lt = lt128(term0, term1, aSig0, aSig1);
-               int eq = eq128(aSig0, aSig1, term0, term1);
+            if (! softfloat_lt128(aSig0, aSig1, term0, term1)) {
+                int lt = softfloat_lt128(term0, term1, aSig0, aSig1);
+                int eq = softfloat_eq128(aSig0, aSig1, term0, term1);
 
-               if ((eq && ((*q) & 1)) || lt) {
-                  aSign = !aSign;
-                  ++(*q);
-               }
-               if (lt) sub128(bSig, 0, aSig0, aSig1, &aSig0, &aSig1);
+                if ((eq && ((*q) & 1)) || lt) {
+                    aSign = !aSign;
+                    ++(*q);
+                }
+                if (lt) {
+                    term = softfloat_sub128(bSig, 0, aSig0, aSig1);
+                    aSig0 = term.v64;
+                    aSig1 = term.v0;
+                }
             }
         }
     }
 
-    *r = normalizeRoundAndPackFloatx80(80, aSign, zExp, aSig0, aSig1, status);
+    *r = softfloat_normRoundPackToExtF80(aSign, zExp, aSig0, aSig1, 80, status);
     return overflow;
 }
 
@@ -176,9 +186,9 @@ static int do_fprem(floatx80 a, floatx80 b, floatx80 *r, Bit64u *q, int rounding
 | according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
 *----------------------------------------------------------------------------*/
 
-int floatx80_ieee754_remainder(floatx80 a, floatx80 b, floatx80 *r, Bit64u *q, struct float_status_t *status)
+int floatx80_ieee754_remainder(floatx80 a, floatx80 b, floatx80 *r, uint64_t *q, struct softfloat_status_t *status)
 {
-    return do_fprem(a, b, r, q, float_round_nearest_even, status);
+    return do_fprem(a, b, r, q, softfloat_round_near_even, status);
 }
 
 /*----------------------------------------------------------------------------
@@ -190,7 +200,7 @@ int floatx80_ieee754_remainder(floatx80 a, floatx80 b, floatx80 *r, Bit64u *q, s
 | quotient of 'a' divided by 'b' to an integer.
 *----------------------------------------------------------------------------*/
 
-int floatx80_remainder(floatx80 a, floatx80 b, floatx80 *r, Bit64u *q, struct float_status_t *status)
+int floatx80_remainder(floatx80 a, floatx80 b, floatx80 *r, uint64_t *q, struct softfloat_status_t *status)
 {
-    return do_fprem(a, b, r, q, float_round_to_zero, status);
+    return do_fprem(a, b, r, q, softfloat_round_to_zero, status);
 }
diff --git a/src/cpu/softfloat/fpu_constant.h b/src/cpu/softfloat3e/fpu_constant.h
similarity index 98%
rename from src/cpu/softfloat/fpu_constant.h
rename to src/cpu/softfloat3e/fpu_constant.h
index 7a7fc6f1a..d7d44ee3c 100644
--- a/src/cpu/softfloat/fpu_constant.h
+++ b/src/cpu/softfloat3e/fpu_constant.h
@@ -24,7 +24,7 @@ these four paragraphs for those parts of this code that are retained.
 #include "config.h"
 
 // Pentium CPU uses only 68-bit precision M_PI approximation
-//#define BETTER_THAN_PENTIUM
+// #define BETTER_THAN_PENTIUM
 
 /*============================================================================
  * Written for Bochs (x86 achitecture simulator) by
diff --git a/src/cpu/softfloat3e/fpu_trans.h b/src/cpu/softfloat3e/fpu_trans.h
new file mode 100644
index 000000000..bd3d3cecb
--- /dev/null
+++ b/src/cpu/softfloat3e/fpu_trans.h
@@ -0,0 +1,117 @@
+/////////////////////////////////////////////////////////////////////////
+// $Id$
+/////////////////////////////////////////////////////////////////////////
+//
+//   Copyright (c) 2003-2018 Stanislav Shwartsman
+//          Written by Stanislav Shwartsman [sshwarts at sourceforge net]
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+//
+/////////////////////////////////////////////////////////////////////////
+
+#ifndef _FPU_TRANS_H_
+#define _FPU_TRANS_H_
+
+#include "softfloat.h"
+#include "softfloat-specialize.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*----------------------------------------------------------------------------
+| Software IEC/IEEE extended double-precision operations.
+*----------------------------------------------------------------------------*/
+
+int floatx80_remainder(floatx80 a, floatx80 b, floatx80 *r, uint64_t *q, struct softfloat_status_t *status);
+int floatx80_ieee754_remainder(floatx80 a, floatx80 b, floatx80 *r, uint64_t *q, struct softfloat_status_t *status);
+
+floatx80 f2xm1(floatx80 a, struct softfloat_status_t *status);
+#ifdef __cplusplus
+floatx80 fyl2x(floatx80 a, floatx80 b, softfloat_status_t &status);
+floatx80 fyl2xp1(floatx80 a, floatx80 b, softfloat_status_t &status);
+floatx80 fpatan(floatx80 a, floatx80 b, softfloat_status_t &status);
+
+/*----------------------------------------------------------------------------
+| Software IEC/IEEE extended double-precision trigonometric functions.
+*----------------------------------------------------------------------------*/
+
+int fsincos(floatx80 a, floatx80 *sin_a, floatx80 *cos_a, softfloat_status_t &status);
+int fsin(floatx80 &a, softfloat_status_t &status);
+int fcos(floatx80 &a, softfloat_status_t &status);
+int ftan(floatx80 &a, softfloat_status_t &status);
+#else
+floatx80 fyl2x(floatx80 a, floatx80 b, struct softfloat_status_t *status);
+floatx80 fyl2xp1(floatx80 a, floatx80 b, struct softfloat_status_t *status);
+floatx80 fpatan(floatx80 a, floatx80 b, struct softfloat_status_t *status);
+
+/*----------------------------------------------------------------------------
+| Software IEC/IEEE extended double-precision trigonometric functions.
+*----------------------------------------------------------------------------*/
+
+int fsincos(floatx80 a, floatx80 *sin_a, floatx80 *cos_a, struct softfloat_status_t *status);
+int fsin(floatx80 *a, struct softfloat_status_t *status);
+int fcos(floatx80 *a, struct softfloat_status_t *status);
+int ftan(floatx80 *a, struct softfloat_status_t *status);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+/*-----------------------------------------------------------------------------
+| Calculates the absolute value of the extended double-precision floating-point
+| value `a'.  The operation is performed according to the IEC/IEEE Standard
+| for Binary Floating-Point Arithmetic.
+*----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+static __inline floatx80 &floatx80_abs(floatx80 &reg)
+#else
+static __inline floatx80 floatx80_abs(floatx80 reg)
+#endif
+{
+    reg.signExp &= 0x7FFF;
+    return reg;
+}
+
+/*-----------------------------------------------------------------------------
+| Changes the sign of the extended double-precision floating-point value 'a'.
+| The operation is performed according to the IEC/IEEE Standard for Binary
+| Floating-Point Arithmetic.
+*----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+static __inline floatx80 &floatx80_chs(floatx80 &reg)
+#else
+static __inline floatx80 floatx80_chs(floatx80 reg)
+#endif
+{
+    reg.signExp ^= 0x8000;
+    return reg;
+}
+
+#ifdef __cplusplus
+static __inline floatx80 FPU_round_const(const floatx80 &a, int adj)
+#else
+static __inline floatx80 FPU_round_const(const floatx80 a, int adj)
+#endif
+{
+  floatx80 result = a;
+  result.signif += adj;
+  return result;
+}
+
+#endif
diff --git a/src/cpu/softfloat/fsincos.cc b/src/cpu/softfloat3e/fsincos.cc
similarity index 68%
rename from src/cpu/softfloat/fsincos.cc
rename to src/cpu/softfloat3e/fsincos.cc
index f5b33a823..1a2a018de 100644
--- a/src/cpu/softfloat/fsincos.cc
+++ b/src/cpu/softfloat3e/fsincos.cc
@@ -26,24 +26,29 @@ these four paragraphs for those parts of this code that are retained.
 #define FLOAT128
 
 #define USE_estimateDiv128To64
-#include "softfloatx80.h"
-#include "softfloat-round-pack.h"
+#include "config.h"
+#include "specialize.h"
+
+#include "fpu_trans.h"
+#include "softfloat-helpers.h"
 #include "fpu_constant.h"
+#include "poly.h"
+
 
 static const floatx80 floatx80_one = packFloatx80(0, 0x3fff, BX_CONST64(0x8000000000000000));
 
 /* reduce trigonometric function argument using 128-bit precision
    M_PI approximation */
-static Bit64u argument_reduction_kernel(Bit64u aSig0, int Exp, Bit64u *zSig0, Bit64u *zSig1)
+static uint64_t argument_reduction_kernel(uint64_t aSig0, int Exp, uint64_t *zSig0, uint64_t *zSig1)
 {
-    Bit64u term0, term1, term2;
-    Bit64u aSig1 = 0;
+    uint64_t term0, term1, term2;
+    uint64_t aSig1 = 0;
 
     shortShift128Left(aSig1, aSig0, Exp, &aSig1, &aSig0);
-    Bit64u q = estimateDiv128To64(aSig1, aSig0, FLOAT_PI_HI);
+    uint64_t q = estimateDiv128To64(aSig1, aSig0, FLOAT_PI_HI);
     mul128By64To192(FLOAT_PI_HI, FLOAT_PI_LO, q, &term0, &term1, &term2);
     sub128(aSig1, aSig0, term0, term1, zSig1, zSig0);
-    while ((Bit64s)(*zSig1) < 0) {
+    while ((int64_t)(*zSig1) < 0) {
         --q;
         add192(*zSig1, *zSig0, term2, 0, FLOAT_PI_HI, FLOAT_PI_LO, zSig1, zSig0, &term2);
     }
@@ -51,35 +56,35 @@ static Bit64u argument_reduction_kernel(Bit64u aSig0, int Exp, Bit64u *zSig0, Bi
     return q;
 }
 
-static int reduce_trig_arg(int expDiff, int *zSign, Bit64u *aSig0, Bit64u *aSig1)
+static int reduce_trig_arg(int expDiff, int &zSign, uint64_t &aSig0, uint64_t &aSig1)
 {
-    Bit64u term0, term1, q = 0;
+    uint64_t term0, term1, q = 0;
 
     if (expDiff < 0) {
-        shift128Right(*aSig0, 0, 1, aSig0, aSig1);
+        shortShift128Right(aSig0, 0, 1, &aSig0, &aSig1);
         expDiff = 0;
     }
     if (expDiff > 0) {
-        q = argument_reduction_kernel(*aSig0, expDiff, aSig0, aSig1);
+        q = argument_reduction_kernel(aSig0, expDiff, &aSig0, &aSig1);
     }
     else {
-        if (FLOAT_PI_HI <= *aSig0) {
-            *aSig0 -= FLOAT_PI_HI;
+        if (FLOAT_PI_HI <= aSig0) {
+            aSig0 -= FLOAT_PI_HI;
             q = 1;
         }
     }
 
-    shift128Right(FLOAT_PI_HI, FLOAT_PI_LO, 1, &term0, &term1);
-    if (! lt128(*aSig0, *aSig1, term0, term1))
+    shortShift128Right(FLOAT_PI_HI, FLOAT_PI_LO, 1, &term0, &term1);
+    if (! softfloat_lt128(aSig0, aSig1, term0, term1))
     {
-        int lt = lt128(term0, term1, *aSig0, *aSig1);
-        int eq = eq128(*aSig0, *aSig1, term0, term1);
+        int lt = softfloat_lt128(term0, term1, aSig0, aSig1);
+        int eq = softfloat_eq128(aSig0, aSig1, term0, term1);
 
         if ((eq && (q & 1)) || lt) {
-            *zSign = !(*zSign);
+            zSign = !zSign;
             ++q;
         }
-        if (lt) sub128(FLOAT_PI_HI, FLOAT_PI_LO, *aSig0, *aSig1, aSig0, aSig1);
+        if (lt) sub128(FLOAT_PI_HI, FLOAT_PI_LO, aSig0, aSig1, &aSig0, &aSig1);
     }
 
     return (int)(q & 3);
@@ -88,7 +93,7 @@ static int reduce_trig_arg(int expDiff, int *zSign, Bit64u *aSig0, Bit64u *aSig1
 #define SIN_ARR_SIZE 11
 #define COS_ARR_SIZE 11
 
-static float128 sin_arr[SIN_ARR_SIZE] =
+static float128_t sin_arr[SIN_ARR_SIZE] =
 {
     PACK_FLOAT_128(0x3fff000000000000, 0x0000000000000000), /*  1 */
     PACK_FLOAT_128(0xbffc555555555555, 0x5555555555555555), /*  3 */
@@ -103,7 +108,7 @@ static float128 sin_arr[SIN_ARR_SIZE] =
     PACK_FLOAT_128(0x3fbd71b8ef6dcf57, 0x18bef146fcee6e45)  /* 21 */
 };
 
-static float128 cos_arr[COS_ARR_SIZE] =
+static float128_t cos_arr[COS_ARR_SIZE] =
 {
     PACK_FLOAT_128(0x3fff000000000000, 0x0000000000000000), /*  0 */
     PACK_FLOAT_128(0xbffe000000000000, 0x0000000000000000), /*  2 */
@@ -118,10 +123,8 @@ static float128 cos_arr[COS_ARR_SIZE] =
     PACK_FLOAT_128(0x3fc1e542ba402022, 0x507a9cad2bf8f0bb)  /* 20 */
 };
 
-extern float128 OddPoly (float128 x, float128 *arr, int n, struct float_status_t *status);
-
 /* 0 <= x <= pi/4 */
-BX_CPP_INLINE float128 poly_sin(float128 x, struct float_status_t *status)
+static __inline float128_t poly_sin(float128_t x, softfloat_status_t &status)
 {
     //                 3     5     7     9     11     13     15
     //                x     x     x     x     x      x      x
@@ -143,13 +146,11 @@ BX_CPP_INLINE float128 poly_sin(float128 x, struct float_status_t *status)
     //   sin(x) ~ x * [ p(x) + x * q(x) ]
     //
 
-    return OddPoly(x, sin_arr, SIN_ARR_SIZE, status);
+    return OddPoly(x, (const float128_t*) sin_arr, SIN_ARR_SIZE, status);
 }
 
-extern float128 EvenPoly(float128 x, float128 *arr, int n, struct float_status_t *status);
-
 /* 0 <= x <= pi/4 */
-BX_CPP_INLINE float128 poly_cos(float128 x, struct float_status_t *status)
+static __inline float128_t poly_cos(float128_t x, softfloat_status_t &status)
 {
     //                 2     4     6     8     10     12     14
     //                x     x     x     x     x      x      x
@@ -166,22 +167,22 @@ BX_CPP_INLINE float128 poly_cos(float128 x, struct float_status_t *status)
     //   cos(x) ~ [ p(x) + x * q(x) ]
     //
 
-    return EvenPoly(x, cos_arr, COS_ARR_SIZE, status);
+    return EvenPoly(x, (const float128_t*) cos_arr, COS_ARR_SIZE, status);
 }
 
-BX_CPP_INLINE void sincos_invalid(floatx80 *sin_a, floatx80 *cos_a, floatx80 a)
+static __inline void sincos_invalid(floatx80 *sin_a, floatx80 *cos_a, floatx80 a)
 {
     if (sin_a) *sin_a = a;
     if (cos_a) *cos_a = a;
 }
 
-BX_CPP_INLINE void sincos_tiny_argument(floatx80 *sin_a, floatx80 *cos_a, floatx80 a)
+static __inline void sincos_tiny_argument(floatx80 *sin_a, floatx80 *cos_a, floatx80 a)
 {
     if (sin_a) *sin_a = a;
     if (cos_a) *cos_a = floatx80_one;
 }
 
-static floatx80 sincos_approximation(int neg, float128 r, Bit64u quotient, struct float_status_t *status)
+static floatx80 sincos_approximation(int neg, float128_t r, uint64_t quotient, softfloat_status_t &status)
 {
     if (quotient & 0x1) {
         r = poly_cos(r, status);
@@ -190,7 +191,7 @@ static floatx80 sincos_approximation(int neg, float128 r, Bit64u quotient, struc
         r = poly_sin(r, status);
     }
 
-    floatx80 result = float128_to_floatx80(r, status);
+    floatx80 result = f128_to_extF80(r, &status);
     if (quotient & 0x2)
         neg = ! neg;
 
@@ -220,59 +221,62 @@ static floatx80 sincos_approximation(int neg, float128 r, Bit64u quotient, struc
 //  sin(x+2pi)    =  sin(x)
 //
 
-int fsincos(floatx80 a, floatx80 *sin_a, floatx80 *cos_a, struct float_status_t *status)
+int fsincos(floatx80 a, floatx80 *sin_a, floatx80 *cos_a, softfloat_status_t &status)
 {
 /*----------------------------------------------------------------------------
 | The pattern for a default generated extended double-precision NaN.
 *----------------------------------------------------------------------------*/
-    const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
+    const floatx80 floatx80_default_nan =
+        packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
 
-    Bit64u aSig0, aSig1 = 0;
-    Bit32s aExp, zExp, expDiff;
+    uint64_t aSig0, aSig1 = 0;
+    int32_t aExp, zExp, expDiff;
     int aSign, zSign;
     int q = 0;
 
     // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a)) {
+    if (extF80_isUnsupported(a)) {
         goto invalid;
     }
 
-    aSig0 = extractFloatx80Frac(a);
-    aExp = extractFloatx80Exp(a);
-    aSign = extractFloatx80Sign(a);
+    aSig0 = extF80_fraction(a);
+    aExp = extF80_exp(a);
+    aSign = extF80_sign(a);
 
     /* invalid argument */
     if (aExp == 0x7FFF) {
-        if ((Bit64u) (aSig0<<1)) {
-            sincos_invalid(sin_a, cos_a, propagateFloatx80NaNOne(a, status));
+        if (aSig0 << 1) {
+            sincos_invalid(sin_a, cos_a, softfloat_propagateNaNExtF80UI(a.signExp, aSig0, 0, 0, &status));
             return 0;
         }
 
     invalid:
-        float_raise(status, float_flag_invalid);
+        softfloat_raiseFlags(&status, softfloat_flag_invalid);
         sincos_invalid(sin_a, cos_a, floatx80_default_nan);
         return 0;
     }
 
-    if (aExp == 0) {
-        if (aSig0 == 0) {
+    if (! aExp) {
+        if (! aSig0) {
             sincos_tiny_argument(sin_a, cos_a, a);
             return 0;
         }
 
-        float_raise(status, float_flag_denormal);
+        softfloat_raiseFlags(&status, softfloat_flag_denormal);
 
         /* handle pseudo denormals */
         if (! (aSig0 & BX_CONST64(0x8000000000000000)))
         {
-            float_raise(status, float_flag_inexact);
+            softfloat_raiseFlags(&status, softfloat_flag_inexact);
             if (sin_a)
-                float_raise(status, float_flag_underflow);
+                softfloat_raiseFlags(&status, softfloat_flag_underflow);
             sincos_tiny_argument(sin_a, cos_a, a);
             return 0;
         }
 
-        normalizeFloatx80Subnormal(aSig0, &aExp, &aSig0);
+        struct exp32_sig64 normExpSig = softfloat_normSubnormalExtF80Sig(aSig0);
+        aExp = normExpSig.exp + 1;
+        aSig0 = normExpSig.sig;
     }
 
     zSign = aSign;
@@ -283,7 +287,7 @@ int fsincos(floatx80 a, floatx80 *sin_a, floatx80 *cos_a, struct float_status_t
     if (expDiff >= 63)
         return -1;
 
-    float_raise(status, float_flag_inexact);
+    softfloat_raiseFlags(&status, softfloat_flag_inexact);
 
     if (expDiff < -1) {    // doesn't require reduction
         if (expDiff <= -68) {
@@ -294,7 +298,7 @@ int fsincos(floatx80 a, floatx80 *sin_a, floatx80 *cos_a, struct float_status_t
         zExp = aExp;
     }
     else {
-        q = reduce_trig_arg(expDiff, &zSign, &aSig0, &aSig1);
+        q = reduce_trig_arg(expDiff, zSign, aSig0, aSig1);
     }
 
     /* **************************** */
@@ -302,7 +306,7 @@ int fsincos(floatx80 a, floatx80 *sin_a, floatx80 *cos_a, struct float_status_t
     /* **************************** */
 
     /* using float128 for approximation */
-    float128 r = normalizeRoundAndPackFloat128(0, zExp-0x10, aSig0, aSig1, status);
+    float128_t r = softfloat_normRoundPackToF128(0, zExp-0x10, aSig0, aSig1, &status);
 
     if (aSign) q = -q;
     if (sin_a) *sin_a = sincos_approximation(zSign, r,   q, status);
@@ -311,14 +315,14 @@ int fsincos(floatx80 a, floatx80 *sin_a, floatx80 *cos_a, struct float_status_t
     return 0;
 }
 
-int fsin(floatx80 *a, struct float_status_t *status)
+int fsin(floatx80 &a, softfloat_status_t &status)
 {
-    return fsincos(*a, a, 0, status);
+    return fsincos(a, &a, 0, status);
 }
 
-int fcos(floatx80 *a, struct float_status_t *status)
+int fcos(floatx80 &a, softfloat_status_t &status)
 {
-    return fsincos(*a, 0, a, status);
+    return fsincos(a, 0, &a, status);
 }
 
 // =================================================
@@ -348,51 +352,55 @@ int fcos(floatx80 *a, struct float_status_t *status)
 //           cos(x)
 //
 
-int ftan(floatx80 *a, struct float_status_t *status)
+int ftan(floatx80 &a, softfloat_status_t &status)
 {
 /*----------------------------------------------------------------------------
 | The pattern for a default generated extended double-precision NaN.
 *----------------------------------------------------------------------------*/
-    const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
+    const floatx80 floatx80_default_nan =
+        packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
 
-    Bit64u aSig0, aSig1 = 0;
-    Bit32s aExp, zExp, expDiff;
+    uint64_t aSig0, aSig1 = 0;
+    int32_t aExp, zExp, expDiff;
     int aSign, zSign;
     int q = 0;
 
     // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(*a)) {
+    if (extF80_isUnsupported(a)) {
         goto invalid;
     }
 
-    aSig0 = extractFloatx80Frac(*a);
-    aExp = extractFloatx80Exp(*a);
-    aSign = extractFloatx80Sign(*a);
+    aSig0 = extF80_fraction(a);
+    aExp = extF80_exp(a);
+    aSign = extF80_sign(a);
 
     /* invalid argument */
     if (aExp == 0x7FFF) {
-        if ((Bit64u) (aSig0<<1))
+        if (aSig0 << 1)
         {
-            *a = propagateFloatx80NaNOne(*a, status);
+            a = softfloat_propagateNaNExtF80UI(a.signExp, aSig0, 0, 0, &status);
             return 0;
         }
 
     invalid:
-        float_raise(status, float_flag_invalid);
-        *a = floatx80_default_nan;
+        softfloat_raiseFlags(&status, softfloat_flag_invalid);
+        a = floatx80_default_nan;
         return 0;
     }
 
-    if (aExp == 0) {
-        if (aSig0 == 0) return 0;
-        float_raise(status, float_flag_denormal);
+    if (! aExp) {
+        if (! aSig0) return 0;
+        softfloat_raiseFlags(&status, softfloat_flag_denormal);
         /* handle pseudo denormals */
         if (! (aSig0 & BX_CONST64(0x8000000000000000)))
         {
-            float_raise(status, float_flag_inexact | float_flag_underflow);
+            softfloat_raiseFlags(&status, softfloat_flag_inexact | softfloat_flag_underflow);
             return 0;
         }
-        normalizeFloatx80Subnormal(aSig0, &aExp, &aSig0);
+
+        struct exp32_sig64 normExpSig = softfloat_normSubnormalExtF80Sig(aSig0);
+        aExp = normExpSig.exp + 1;
+        aSig0 = normExpSig.sig;
     }
 
     zSign = aSign;
@@ -403,17 +411,17 @@ int ftan(floatx80 *a, struct float_status_t *status)
     if (expDiff >= 63)
         return -1;
 
-    float_raise(status, float_flag_inexact);
+    softfloat_raiseFlags(&status, softfloat_flag_inexact);
 
     if (expDiff < -1) {    // doesn't require reduction
         if (expDiff <= -68) {
-            *a = packFloatx80(aSign, aExp, aSig0);
+            a = packFloatx80(aSign, aExp, aSig0);
             return 0;
         }
         zExp = aExp;
     }
     else {
-        q = reduce_trig_arg(expDiff, &zSign, &aSig0, &aSig1);
+        q = reduce_trig_arg(expDiff, zSign, aSig0, aSig1);
     }
 
     /* **************************** */
@@ -421,21 +429,21 @@ int ftan(floatx80 *a, struct float_status_t *status)
     /* **************************** */
 
     /* using float128 for approximation */
-    float128 r = normalizeRoundAndPackFloat128(0, zExp-0x10, aSig0, aSig1, status);
+    float128_t r = softfloat_normRoundPackToF128(0, zExp-0x10, aSig0, aSig1, &status);
 
-    float128 sin_r = poly_sin(r, status);
-    float128 cos_r = poly_cos(r, status);
+    float128_t sin_r = poly_sin(r, status);
+    float128_t cos_r = poly_cos(r, status);
 
     if (q & 0x1) {
-        r = float128_div(cos_r, sin_r, status);
+        r = f128_div(cos_r, sin_r, &status);
         zSign = ! zSign;
     } else {
-        r = float128_div(sin_r, cos_r, status);
+        r = f128_div(sin_r, cos_r, &status);
     }
 
-    *a = float128_to_floatx80(r, status);
+    a = f128_to_extF80(r, &status);
     if (zSign)
-        floatx80_chs(*a);
+        floatx80_chs(a);
 
     return 0;
 }
diff --git a/src/cpu/softfloat/fyl2x.cc b/src/cpu/softfloat3e/fyl2x.cc
similarity index 61%
rename from src/cpu/softfloat/fyl2x.cc
rename to src/cpu/softfloat3e/fyl2x.cc
index 875f866a9..7c90e6207 100644
--- a/src/cpu/softfloat/fyl2x.cc
+++ b/src/cpu/softfloat3e/fyl2x.cc
@@ -24,29 +24,28 @@ these four paragraphs for those parts of this code that are retained.
  * ==========================================================================*/
 
 #define FLOAT128
-
-#include "softfloatx80.h"
-#include "softfloat-round-pack.h"
+#include "config.h"
+#include "fpu_trans.h"
+#include "specialize.h"
+#include "softfloat-helpers.h"
 #include "fpu_constant.h"
+#include "poly.h"
 
-static const floatx80 floatx80_one =
-    packFloatx80(0, 0x3fff, BX_CONST64(0x8000000000000000));
+static const floatx80 floatx80_one = packFloatx80(0, 0x3fff, BX_CONST64(0x8000000000000000));
 
-static const float128 float128_one =
+static const float128_t float128_one =
     packFloat128(BX_CONST64(0x3fff000000000000), BX_CONST64(0x0000000000000000));
-static const float128 float128_two =
+static const float128_t float128_two =
     packFloat128(BX_CONST64(0x4000000000000000), BX_CONST64(0x0000000000000000));
 
-static const float128 float128_ln2inv2 =
+static const float128_t float128_ln2inv2 =
     packFloat128(BX_CONST64(0x400071547652b82f), BX_CONST64(0xe1777d0ffda0d23a));
 
 #define SQRT2_HALF_SIG 	BX_CONST64(0xb504f333f9de6484)
 
-extern float128 OddPoly(float128 x, float128 *arr, int n, struct float_status_t *status);
-
 #define L2_ARR_SIZE 9
 
-static float128 ln_arr[L2_ARR_SIZE] =
+static float128_t ln_arr[L2_ARR_SIZE] =
 {
     PACK_FLOAT_128(0x3fff000000000000, 0x0000000000000000), /*  1 */
     PACK_FLOAT_128(0x3ffd555555555555, 0x5555555555555555), /*  3 */
@@ -59,7 +58,7 @@ static float128 ln_arr[L2_ARR_SIZE] =
     PACK_FLOAT_128(0x3ffae1e1e1e1e1e1, 0xe1e1e1e1e1e1e1e2)  /* 17 */
 };
 
-static float128 poly_ln(float128 x1, struct float_status_t *status)
+static float128_t poly_ln(float128_t x1, softfloat_status_t &status)
 {
 /*
     //
@@ -84,28 +83,28 @@ static float128 poly_ln(float128 x1, struct float_status_t *status)
     //          1-u
     //
 */
-    return OddPoly(x1, ln_arr, L2_ARR_SIZE, status);
+    return OddPoly(x1, (const float128_t*) ln_arr, L2_ARR_SIZE, status);
 }
 
 /* required sqrt(2)/2 < x < sqrt(2) */
-static float128 poly_l2(float128 x, struct float_status_t *status)
+static float128_t poly_l2(float128_t x, softfloat_status_t &status)
 {
     /* using float128 for approximation */
-    float128 x_p1 = float128_add(x, float128_one, status);
-    float128 x_m1 = float128_sub(x, float128_one, status);
-    x = float128_div(x_m1, x_p1, status);
+    float128_t x_p1 = f128_add(x, float128_one, &status);
+    float128_t x_m1 = f128_sub(x, float128_one, &status);
+    x = f128_div(x_m1, x_p1, &status);
     x = poly_ln(x, status);
-    x = float128_mul(x, float128_ln2inv2, status);
+    x = f128_mul(x, float128_ln2inv2, &status);
     return x;
 }
 
-static float128 poly_l2p1(float128 x, struct float_status_t *status)
+static float128_t poly_l2p1(float128_t x, softfloat_status_t &status)
 {
     /* using float128 for approximation */
-    float128 x_p2 = float128_add(x, float128_two, status);
-    x = float128_div(x, x_p2, status);
+    float128_t x_plus2 = f128_add(x, float128_two, &status);
+    x = f128_div(x, x_plus2, &status);
     x = poly_ln(x, status);
-    x = float128_mul(x, float128_ln2inv2, status);
+    x = f128_mul(x, float128_ln2inv2, &status);
     return x;
 }
 
@@ -134,7 +133,7 @@ static float128 poly_l2p1(float128 x, struct float_status_t *status)
 //       1-u             3     5     7           2n+1
 //
 
-floatx80 fyl2x(floatx80 a, floatx80 b, struct float_status_t *status)
+floatx80 fyl2x(floatx80 a, floatx80 b, softfloat_status_t &status)
 {
 /*----------------------------------------------------------------------------
 | The pattern for a default generated extended double-precision NaN.
@@ -142,71 +141,73 @@ floatx80 fyl2x(floatx80 a, floatx80 b, struct float_status_t *status)
     const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
 
     // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a) || floatx80_is_unsupported(b)) {
+    if (extF80_isUnsupported(a) || extF80_isUnsupported(b)) {
 invalid:
-        float_raise(status, float_flag_invalid);
+        softfloat_raiseFlags(&status, softfloat_flag_invalid);
         return floatx80_default_nan;
     }
 
-    Bit64u aSig = extractFloatx80Frac(a);
-    Bit32s aExp = extractFloatx80Exp(a);
-    int aSign = extractFloatx80Sign(a);
-    Bit64u bSig = extractFloatx80Frac(b);
-    Bit32s bExp = extractFloatx80Exp(b);
-    int bSign = extractFloatx80Sign(b);
+    uint64_t aSig = extF80_fraction(a);
+    int32_t aExp = extF80_exp(a);
+    int aSign = extF80_sign(a);
+    uint64_t bSig = extF80_fraction(b);
+    int32_t bExp = extF80_exp(b);
+    int bSign = extF80_sign(b);
 
     int zSign = bSign ^ 1;
 
     if (aExp == 0x7FFF) {
-        if ((Bit64u) (aSig<<1)
-             || ((bExp == 0x7FFF) && (Bit64u) (bSig<<1)))
-        {
-            return propagateFloatx80NaN(a, b, status);
+        if ((aSig<<1) || ((bExp == 0x7FFF) && (bSig<<1))) {
+            return softfloat_propagateNaNExtF80UI(a.signExp, aSig, b.signExp, bSig, &status);
         }
         if (aSign) goto invalid;
         else {
-            if (bExp == 0) {
-                if (bSig == 0) goto invalid;
-                float_raise(status, float_flag_denormal);
+            if (! bExp) {
+                if (! bSig) goto invalid;
+                softfloat_raiseFlags(&status, softfloat_flag_denormal);
             }
             return packFloatx80(bSign, 0x7FFF, BX_CONST64(0x8000000000000000));
         }
     }
-    if (bExp == 0x7FFF)
-    {
-        if ((Bit64u) (bSig<<1)) return propagateFloatx80NaN(a, b, status);
-        if (aSign && (Bit64u)(aExp | aSig)) goto invalid;
-        if (aSig && (aExp == 0))
-            float_raise(status, float_flag_denormal);
+    if (bExp == 0x7FFF) {
+        if (bSig << 1)
+            return softfloat_propagateNaNExtF80UI(a.signExp, aSig, b.signExp, bSig, &status);
+        if (aSign && (uint64_t)(aExp | aSig)) goto invalid;
+        if (aSig && ! aExp)
+            softfloat_raiseFlags(&status, softfloat_flag_denormal);
         if (aExp < 0x3FFF) {
             return packFloatx80(zSign, 0x7FFF, BX_CONST64(0x8000000000000000));
         }
-        if (aExp == 0x3FFF && ((Bit64u) (aSig<<1) == 0)) goto invalid;
+        if (aExp == 0x3FFF && ! (aSig<<1)) goto invalid;
         return packFloatx80(bSign, 0x7FFF, BX_CONST64(0x8000000000000000));
     }
-    if (aExp == 0) {
-        if (aSig == 0) {
+    if (! aExp) {
+        if (! aSig) {
             if ((bExp | bSig) == 0) goto invalid;
-            float_raise(status, float_flag_divbyzero);
+            softfloat_raiseFlags(&status, softfloat_flag_divbyzero);
             return packFloatx80(zSign, 0x7FFF, BX_CONST64(0x8000000000000000));
         }
         if (aSign) goto invalid;
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(aSig, &aExp, &aSig);
+        softfloat_raiseFlags(&status, softfloat_flag_denormal);
+        struct exp32_sig64 normExpSig = softfloat_normSubnormalExtF80Sig(aSig);
+        aExp = normExpSig.exp + 1;
+        aSig = normExpSig.sig;
     }
     if (aSign) goto invalid;
-    if (bExp == 0) {
-        if (bSig == 0) {
+    if (! bExp) {
+        if (! bSig) {
             if (aExp < 0x3FFF) return packFloatx80(zSign, 0, 0);
             return packFloatx80(bSign, 0, 0);
         }
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(bSig, &bExp, &bSig);
+        softfloat_raiseFlags(&status, softfloat_flag_denormal);
+        struct exp32_sig64 normExpSig = softfloat_normSubnormalExtF80Sig(bSig);
+        bExp = normExpSig.exp + 1;
+        bSig = normExpSig.sig;
     }
-    if (aExp == 0x3FFF && ((Bit64u) (aSig<<1) == 0))
+    if (aExp == 0x3FFF && ! (aSig<<1))
         return packFloatx80(bSign, 0, 0);
 
-    float_raise(status, float_flag_inexact);
+    softfloat_raiseFlags(&status, softfloat_flag_inexact);
 
     int ExpDiff = aExp - 0x3FFF;
     aExp = 0;
@@ -219,12 +220,15 @@ invalid:
     /* using float128 for approximation */
     /* ******************************** */
 
-    Bit64u zSig0, zSig1;
-    shift128Right(aSig<<1, 0, 16, &zSig0, &zSig1);
-    float128 x = packFloat128Four(0, aExp+0x3FFF, zSig0, zSig1);
+    float128_t b128 = softfloat_normRoundPackToF128(bSign, bExp-0x10, bSig, 0, &status);
+
+    uint64_t zSig0, zSig1;
+    shortShift128Right(aSig<<1, 0, 16, &zSig0, &zSig1);
+    float128_t x = packFloat128(0, aExp+0x3FFF, zSig0, zSig1);
     x = poly_l2(x, status);
-    x = float128_add(x, int64_to_float128((Bit64s) ExpDiff), status);
-    return floatx80_128_mul(b, x, status);
+    x = f128_add(x, i32_to_f128(ExpDiff), &status);
+    x = f128_mul(x, b128, &status);
+    return f128_to_extF80(x, &status);
 }
 
 // =================================================
@@ -252,112 +256,117 @@ invalid:
 //       1-u             3     5     7           2n+1
 //
 
-floatx80 fyl2xp1(floatx80 a, floatx80 b, struct float_status_t *status)
+floatx80 fyl2xp1(floatx80 a, floatx80 b, softfloat_status_t &status)
 {
+    int32_t aExp, bExp;
+    uint64_t aSig, bSig, zSig0, zSig1, zSig2;
+    int aSign, bSign;
+
 /*----------------------------------------------------------------------------
 | The pattern for a default generated extended double-precision NaN.
 *----------------------------------------------------------------------------*/
     const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
 
-    Bit32s aExp, bExp;
-    Bit64u aSig, bSig, zSig0, zSig1, zSig2;
-    int aSign, bSign;
-
     // handle unsupported extended double-precision floating encodings
-    if (floatx80_is_unsupported(a) || floatx80_is_unsupported(b)) {
+    if (extF80_isUnsupported(a) || extF80_isUnsupported(b)) {
 invalid:
-        float_raise(status, float_flag_invalid);
+        softfloat_raiseFlags(&status, softfloat_flag_invalid);
         return floatx80_default_nan;
     }
 
-    aSig = extractFloatx80Frac(a);
-    aExp = extractFloatx80Exp(a);
-    aSign = extractFloatx80Sign(a);
-    bSig = extractFloatx80Frac(b);
-    bExp = extractFloatx80Exp(b);
-    bSign = extractFloatx80Sign(b);
+
+    aSig = extF80_fraction(a);
+    aExp = extF80_exp(a);
+    aSign = extF80_sign(a);
+    bSig = extF80_fraction(b);
+    bExp = extF80_exp(b);
+    bSign = extF80_sign(b);
     int zSign = aSign ^ bSign;
 
     if (aExp == 0x7FFF) {
-        if ((Bit64u) (aSig<<1)
-             || ((bExp == 0x7FFF) && (Bit64u) (bSig<<1)))
-        {
-            return propagateFloatx80NaN(a, b, status);
+        if ((aSig<<1) != 0 || ((bExp == 0x7FFF) && (bSig<<1) != 0)) {
+            return softfloat_propagateNaNExtF80UI(a.signExp, aSig, b.signExp, bSig, &status);
         }
         if (aSign) goto invalid;
         else {
-            if (bExp == 0) {
-                if (bSig == 0) goto invalid;
-                float_raise(status, float_flag_denormal);
+            if (! bExp) {
+                if (! bSig) goto invalid;
+                softfloat_raiseFlags(&status, softfloat_flag_denormal);
             }
             return packFloatx80(bSign, 0x7FFF, BX_CONST64(0x8000000000000000));
         }
     }
     if (bExp == 0x7FFF)
     {
-        if ((Bit64u) (bSig<<1))
-            return propagateFloatx80NaN(a, b, status);
+        if (bSig << 1)
+            return softfloat_propagateNaNExtF80UI(a.signExp, aSig, b.signExp, bSig, &status);
 
-        if (aExp == 0) {
-            if (aSig == 0) goto invalid;
-            float_raise(status, float_flag_denormal);
+        if (! aExp) {
+            if (! aSig) goto invalid;
+            softfloat_raiseFlags(&status, softfloat_flag_denormal);
         }
 
         return packFloatx80(zSign, 0x7FFF, BX_CONST64(0x8000000000000000));
     }
-    if (aExp == 0) {
-        if (aSig == 0) {
-            if (bSig && (bExp == 0)) float_raise(status, float_flag_denormal);
+    if (! aExp) {
+        if (! aSig) {
+            if (bSig && ! bExp) softfloat_raiseFlags(&status, softfloat_flag_denormal);
             return packFloatx80(zSign, 0, 0);
         }
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(aSig, &aExp, &aSig);
+        softfloat_raiseFlags(&status, softfloat_flag_denormal);
+        struct exp32_sig64 normExpSig = softfloat_normSubnormalExtF80Sig(aSig);
+        aExp = normExpSig.exp + 1;
+        aSig = normExpSig.sig;
     }
-    if (bExp == 0) {
-        if (bSig == 0) return packFloatx80(zSign, 0, 0);
-        float_raise(status, float_flag_denormal);
-        normalizeFloatx80Subnormal(bSig, &bExp, &bSig);
+    if (! bExp) {
+        if (! bSig) return packFloatx80(zSign, 0, 0);
+        softfloat_raiseFlags(&status, softfloat_flag_denormal);
+        struct exp32_sig64 normExpSig = softfloat_normSubnormalExtF80Sig(bSig);
+        bExp = normExpSig.exp + 1;
+        bSig = normExpSig.sig;
     }
 
-    float_raise(status, float_flag_inexact);
+    softfloat_raiseFlags(&status, softfloat_flag_inexact);
 
     if (aSign && aExp >= 0x3FFF)
         return a;
 
     if (aExp >= 0x3FFC) // big argument
     {
-        return fyl2x(floatx80_add(a, floatx80_one, status), b, status);
+        return fyl2x(extF80_add(a, floatx80_one, &status), b, status);
     }
 
     // handle tiny argument
     if (aExp < FLOATX80_EXP_BIAS-70)
     {
         // first order approximation, return (a*b)/ln(2)
-        Bit32s zExp = aExp + FLOAT_LN2INV_EXP - 0x3FFE;
+        int32_t zExp = aExp + FLOAT_LN2INV_EXP - 0x3FFE;
 
-	mul128By64To192(FLOAT_LN2INV_HI, FLOAT_LN2INV_LO, aSig, &zSig0, &zSig1, &zSig2);
-        if (0 < (Bit64s) zSig0) {
+        mul128By64To192(FLOAT_LN2INV_HI, FLOAT_LN2INV_LO, aSig, &zSig0, &zSig1, &zSig2);
+        if (0 < (int64_t) zSig0) {
             shortShift128Left(zSig0, zSig1, 1, &zSig0, &zSig1);
             --zExp;
         }
 
         zExp = zExp + bExp - 0x3FFE;
-	mul128By64To192(zSig0, zSig1, bSig, &zSig0, &zSig1, &zSig2);
-        if (0 < (Bit64s) zSig0) {
+        mul128By64To192(zSig0, zSig1, bSig, &zSig0, &zSig1, &zSig2);
+        if (0 < (int64_t) zSig0) {
             shortShift128Left(zSig0, zSig1, 1, &zSig0, &zSig1);
             --zExp;
         }
 
-        return
-            roundAndPackFloatx80(80, aSign ^ bSign, zExp, zSig0, zSig1, status);
+        return softfloat_roundPackToExtF80(aSign ^ bSign, zExp, zSig0, zSig1, 80, &status);
     }
 
     /* ******************************** */
     /* using float128 for approximation */
     /* ******************************** */
 
-    shift128Right(aSig<<1, 0, 16, &zSig0, &zSig1);
-    float128 x = packFloat128Four(aSign, aExp, zSig0, zSig1);
+    float128_t b128 = softfloat_normRoundPackToF128(bSign, bExp-0x10, bSig, 0, &status);
+
+    shortShift128Right(aSig<<1, 0, 16, &zSig0, &zSig1);
+    float128_t x = packFloat128(aSign, aExp, zSig0, zSig1);
     x = poly_l2p1(x, status);
-    return floatx80_128_mul(b, x, status);
+    x = f128_mul(x, b128, &status);
+    return f128_to_extF80(x, &status);
 }
diff --git a/src/cpu/softfloat3e/i32_to_extF80.cc b/src/cpu/softfloat3e/i32_to_extF80.cc
new file mode 100644
index 000000000..edd92ced0
--- /dev/null
+++ b/src/cpu/softfloat3e/i32_to_extF80.cc
@@ -0,0 +1,62 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+extFloat80_t i32_to_extF80(int32_t a)
+{
+    uint16_t uiZ64;
+    uint32_t absA;
+    bool sign;
+    int8_t shiftDist;
+    extFloat80_t z;
+
+    uiZ64 = 0;
+    absA = 0;
+    if (a) {
+        sign = (a < 0);
+        absA = sign ? -(uint32_t) a : (uint32_t) a;
+        shiftDist = softfloat_countLeadingZeros32(absA);
+        uiZ64 = packToExtF80UI64(sign, 0x401E - shiftDist);
+        absA <<= shiftDist;
+    }
+    z.signExp = uiZ64;
+    z.signif = (uint64_t) absA<<32;
+    return z;
+}
diff --git a/src/cpu/softfloat3e/i32_to_f128.cc b/src/cpu/softfloat3e/i32_to_f128.cc
new file mode 100644
index 000000000..1ae64e46b
--- /dev/null
+++ b/src/cpu/softfloat3e/i32_to_f128.cc
@@ -0,0 +1,59 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+float128_t i32_to_f128(int32_t a)
+{
+    uint64_t uiZ64;
+    bool sign;
+    uint32_t absA;
+    int8_t shiftDist;
+    float128_t z;
+
+    uiZ64 = 0;
+    if (a) {
+        sign = (a < 0);
+        absA = sign ? -(uint32_t) a : (uint32_t) a;
+        shiftDist = softfloat_countLeadingZeros32(absA) + 17;
+        uiZ64 = packToF128UI64(sign, 0x402E - shiftDist, (uint64_t) absA<<shiftDist);
+    }
+    z.v64 = uiZ64;
+    z.v0  = 0;
+    return z;
+}
diff --git a/src/cpu/softfloat3e/i32_to_f16.c b/src/cpu/softfloat3e/i32_to_f16.c
new file mode 100644
index 000000000..3d017a7b7
--- /dev/null
+++ b/src/cpu/softfloat3e/i32_to_f16.c
@@ -0,0 +1,61 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+float16 i32_to_f16(int32_t a, struct softfloat_status_t *status)
+{
+    bool sign;
+    uint32_t absA;
+    int8_t shiftDist;
+    uint16_t sig;
+
+    sign = (a < 0);
+    absA = sign ? -(uint32_t) a : (uint32_t) a;
+    shiftDist = softfloat_countLeadingZeros32(absA) - 21;
+    if (0 <= shiftDist) {
+        return a ? packToF16UI(sign, 0x18 - shiftDist, (uint16_t) absA<<shiftDist) : 0;
+    } else {
+        shiftDist += 4;
+        sig = (shiftDist < 0)
+                ? absA>>(-shiftDist) | ((uint32_t) (absA<<(shiftDist & 31)) != 0)
+                : (uint16_t) absA<<shiftDist;
+        return softfloat_roundPackToF16(sign, 0x1C - shiftDist, sig, status);
+    }
+}
diff --git a/src/cpu/softfloat3e/i32_to_f32.c b/src/cpu/softfloat3e/i32_to_f32.c
new file mode 100644
index 000000000..f2742d24d
--- /dev/null
+++ b/src/cpu/softfloat3e/i32_to_f32.c
@@ -0,0 +1,52 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "softfloat.h"
+
+float32 i32_to_f32(int32_t a, struct softfloat_status_t *status)
+{
+    bool sign;
+    uint32_t absA;
+
+    sign = (a < 0);
+    if (! (a & 0x7FFFFFFF)) {
+        return sign ? packToF32UI(1, 0x9E, 0) : 0;
+    }
+    absA = sign ? -(uint32_t) a : (uint32_t) a;
+    return softfloat_normRoundPackToF32(sign, 0x9C, absA, status);
+}
diff --git a/src/cpu/softfloat3e/i32_to_f64.c b/src/cpu/softfloat3e/i32_to_f64.c
new file mode 100644
index 000000000..7aaa4e1c2
--- /dev/null
+++ b/src/cpu/softfloat3e/i32_to_f64.c
@@ -0,0 +1,56 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+float64 i32_to_f64(int32_t a)
+{
+    bool sign;
+    uint32_t absA;
+    int8_t shiftDist;
+
+    if (! a) {
+        return 0;
+    } else {
+        sign = (a < 0);
+        absA = sign ? -(uint32_t) a : (uint32_t) a;
+        shiftDist = softfloat_countLeadingZeros32(absA) + 21;
+        return packToF64UI(sign, 0x432 - shiftDist, (uint64_t) absA<<shiftDist);
+    }
+}
diff --git a/src/cpu/softfloat3e/i64_to_extF80.cc b/src/cpu/softfloat3e/i64_to_extF80.cc
new file mode 100644
index 000000000..4ac8fefc3
--- /dev/null
+++ b/src/cpu/softfloat3e/i64_to_extF80.cc
@@ -0,0 +1,62 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+extFloat80_t i64_to_extF80(int64_t a)
+{
+    uint16_t uiZ64;
+    uint64_t absA;
+    bool sign;
+    int8_t shiftDist;
+    extFloat80_t z;
+
+    uiZ64 = 0;
+    absA = 0;
+    if (a) {
+        sign = (a < 0);
+        absA = sign ? -(uint64_t) a : (uint64_t) a;
+        shiftDist = softfloat_countLeadingZeros64(absA);
+        uiZ64 = packToExtF80UI64(sign, 0x403E - shiftDist);
+        absA <<= shiftDist;
+    }
+    z.signExp = uiZ64;
+    z.signif  = absA;
+    return z;
+}
diff --git a/src/cpu/softfloat3e/i64_to_f128.cc b/src/cpu/softfloat3e/i64_to_f128.cc
new file mode 100644
index 000000000..4d80a9e7a
--- /dev/null
+++ b/src/cpu/softfloat3e/i64_to_f128.cc
@@ -0,0 +1,69 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+float128_t i64_to_f128(int64_t a)
+{
+    uint64_t uiZ64, uiZ0;
+    bool sign;
+    uint64_t absA;
+    int8_t shiftDist;
+    struct uint128 zSig;
+    float128_t z;
+
+    if (! a) {
+        uiZ64 = 0;
+        uiZ0  = 0;
+    } else {
+        sign = (a < 0);
+        absA = sign ? -(uint64_t) a : (uint64_t) a;
+        shiftDist = softfloat_countLeadingZeros64(absA) + 49;
+        if (64 <= shiftDist) {
+            zSig.v64 = absA<<(shiftDist - 64);
+            zSig.v0  = 0;
+        } else {
+            zSig = softfloat_shortShiftLeft128(0, absA, shiftDist);
+        }
+        uiZ64 = packToF128UI64(sign, 0x406E - shiftDist, zSig.v64);
+        uiZ0  = zSig.v0;
+    }
+    z.v64 = uiZ64;
+    z.v0  = uiZ0;
+    return z;
+}
diff --git a/src/cpu/softfloat3e/i64_to_f16.c b/src/cpu/softfloat3e/i64_to_f16.c
new file mode 100644
index 000000000..43873610a
--- /dev/null
+++ b/src/cpu/softfloat3e/i64_to_f16.c
@@ -0,0 +1,61 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+float16 i64_to_f16(int64_t a, struct softfloat_status_t *status)
+{
+    bool sign;
+    uint64_t absA;
+    int8_t shiftDist;
+    uint16_t sig;
+
+    sign = (a < 0);
+    absA = sign ? -(uint64_t) a : (uint64_t) a;
+    shiftDist = softfloat_countLeadingZeros64(absA) - 53;
+    if (0 <= shiftDist) {
+        return a ? packToF16UI(sign, 0x18 - shiftDist, (uint16_t) absA<<shiftDist) : 0;
+    } else {
+        shiftDist += 4;
+        sig = (shiftDist < 0)
+                ? softfloat_shortShiftRightJam64(absA, -shiftDist)
+                : (uint16_t) absA<<shiftDist;
+        return softfloat_roundPackToF16(sign, 0x1C - shiftDist, sig, status);
+    }
+}
diff --git a/src/cpu/softfloat3e/i64_to_f32.c b/src/cpu/softfloat3e/i64_to_f32.c
new file mode 100644
index 000000000..ae929be2d
--- /dev/null
+++ b/src/cpu/softfloat3e/i64_to_f32.c
@@ -0,0 +1,61 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+float32 i64_to_f32(int64_t a, struct softfloat_status_t *status)
+{
+    bool sign;
+    uint64_t absA;
+    int8_t shiftDist;
+    uint32_t sig;
+
+    sign = (a < 0);
+    absA = sign ? -(uint64_t) a : (uint64_t) a;
+    shiftDist = softfloat_countLeadingZeros64(absA) - 40;
+    if (0 <= shiftDist) {
+        return a ? packToF32UI(sign, 0x95 - shiftDist, (uint32_t) absA<<shiftDist) : 0;
+    } else {
+        shiftDist += 7;
+        sig = (shiftDist < 0)
+                ? softfloat_shortShiftRightJam64(absA, -shiftDist)
+                : (uint32_t) absA<<shiftDist;
+        return softfloat_roundPackToF32(sign, 0x9C - shiftDist, sig, status);
+    }
+}
diff --git a/src/cpu/softfloat3e/i64_to_f64.c b/src/cpu/softfloat3e/i64_to_f64.c
new file mode 100644
index 000000000..b217354af
--- /dev/null
+++ b/src/cpu/softfloat3e/i64_to_f64.c
@@ -0,0 +1,53 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+float64 i64_to_f64(int64_t a, struct softfloat_status_t *status)
+{
+    bool sign;
+    uint64_t absA;
+
+    sign = (a < 0);
+    if (! (a & UINT64_C(0x7FFFFFFFFFFFFFFF))) {
+        return sign ? packToF64UI(1, 0x43E, 0) : 0;
+    }
+    absA = sign ? -(uint64_t) a : (uint64_t) a;
+    return softfloat_normRoundPackToF64(sign, 0x43C, absA, status);
+}
diff --git a/src/cpu/softfloat3e/internals.h b/src/cpu/softfloat3e/internals.h
new file mode 100644
index 000000000..3b5d7aa4d
--- /dev/null
+++ b/src/cpu/softfloat3e/internals.h
@@ -0,0 +1,150 @@
+/*============================================================================
+
+This C header file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#ifndef _INTERNALS_H_
+#define _INTERNALS_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+//#include "primitives.h"
+#include "softfloat_types.h"
+
+struct softfloat_status_t;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*----------------------------------------------------------------------------
+*----------------------------------------------------------------------------*/
+uint32_t softfloat_roundToUI32(bool, uint64_t, uint8_t, bool, struct softfloat_status_t *);
+uint64_t softfloat_roundToUI64(bool, uint64_t, uint64_t, uint8_t, bool, struct softfloat_status_t *);
+
+int32_t softfloat_roundToI32(bool, uint64_t, uint8_t, bool, struct softfloat_status_t *);
+int64_t softfloat_roundToI64(bool, uint64_t, uint64_t, uint8_t, bool, struct softfloat_status_t *);
+
+/*----------------------------------------------------------------------------
+*----------------------------------------------------------------------------*/
+
+
+#define signF16UI(a) ((bool) ((uint16_t) (a)>>15))
+#define expF16UI(a) ((int8_t) ((a)>>10) & 0x1F)
+#define fracF16UI(a) ((a) & 0x03FF)
+#define packToF16UI(sign, exp, sig) (((uint16_t) (sign)<<15) + ((uint16_t) (exp)<<10) + (sig))
+
+#define isNaNF16UI(a) (((~(a) & 0x7C00) == 0) && ((a) & 0x03FF))
+
+struct exp8_sig16 { int8_t exp; uint16_t sig; };
+struct exp8_sig16 softfloat_normSubnormalF16Sig(uint16_t);
+
+float16 softfloat_roundPackToF16(bool, int16_t, uint16_t, struct softfloat_status_t *);
+float16 softfloat_normRoundPackToF16(bool, int16_t, uint16_t, struct softfloat_status_t *);
+
+/*----------------------------------------------------------------------------
+*----------------------------------------------------------------------------*/
+#define signF32UI(a) ((bool) ((uint32_t) (a)>>31))
+#define expF32UI(a) ((int16_t) ((a)>>23) & 0xFF)
+#define fracF32UI(a) ((a) & 0x007FFFFF)
+#define packToF32UI(sign, exp, sig) (((uint32_t) (sign)<<31) + ((uint32_t) (exp)<<23) + (sig))
+
+#define isNaNF32UI(a) (((~(a) & 0x7F800000) == 0) && ((a) & 0x007FFFFF))
+
+struct exp16_sig32 { int16_t exp; uint32_t sig; };
+struct exp16_sig32 softfloat_normSubnormalF32Sig(uint32_t);
+
+float32 softfloat_roundPackToF32(bool, int16_t, uint32_t, struct softfloat_status_t *);
+float32 softfloat_normRoundPackToF32(bool, int16_t, uint32_t, struct softfloat_status_t *);
+
+/*----------------------------------------------------------------------------
+*----------------------------------------------------------------------------*/
+#define signF64UI(a) ((bool) ((uint64_t) (a)>>63))
+#define expF64UI(a) ((int16_t) ((a)>>52) & 0x7FF)
+#define fracF64UI(a) ((a) & UINT64_C(0x000FFFFFFFFFFFFF))
+#define packToF64UI(sign, exp, sig) ((uint64_t) (((uint64_t) (sign)<<63) + ((uint64_t) (exp)<<52) + (sig)))
+
+#define isNaNF64UI(a) (((~(a) & UINT64_C(0x7FF0000000000000)) == 0) && ((a) & UINT64_C(0x000FFFFFFFFFFFFF)))
+
+struct exp16_sig64 { int16_t exp; uint64_t sig; };
+struct exp16_sig64 softfloat_normSubnormalF64Sig(uint64_t);
+
+float64 softfloat_roundPackToF64(bool, int16_t, uint64_t, struct softfloat_status_t *);
+float64 softfloat_normRoundPackToF64(bool, int16_t, uint64_t, struct softfloat_status_t *);
+
+/*----------------------------------------------------------------------------
+*----------------------------------------------------------------------------*/
+
+extFloat80_t softfloat_addMagsExtF80(uint16_t uiA64, uint64_t uiA0, uint16_t uiB64, uint64_t uiB0, bool signZ, struct softfloat_status_t *status);
+extFloat80_t softfloat_subMagsExtF80(uint16_t uiA64, uint64_t uiA0, uint16_t uiB64, uint64_t uiB0, bool signZ, struct softfloat_status_t *status);
+
+#define signExtF80UI64(a64) ((bool) ((uint16_t) (a64)>>15))
+#define expExtF80UI64(a64) ((a64) & 0x7FFF)
+#define packToExtF80UI64(sign, exp) ((uint16_t) (sign)<<15 | (exp))
+
+#define isNaNExtF80UI(a64, a0) ((((a64) & 0x7FFF) == 0x7FFF) && ((a0) & UINT64_C(0x7FFFFFFFFFFFFFFF)))
+
+extFloat80_t packToExtF80(bool, uint16_t, uint64_t);
+extFloat80_t packToExtF80_twoargs(uint16_t, uint64_t);
+/*----------------------------------------------------------------------------
+*----------------------------------------------------------------------------*/
+
+struct exp32_sig64 { int32_t exp; uint64_t sig; };
+struct exp32_sig64 softfloat_normSubnormalExtF80Sig(uint64_t);
+
+extFloat80_t
+ softfloat_roundPackToExtF80(bool, int32_t, uint64_t, uint64_t, uint8_t, struct softfloat_status_t *);
+extFloat80_t
+ softfloat_normRoundPackToExtF80(bool, int32_t, uint64_t, uint64_t, uint8_t, struct softfloat_status_t *);
+
+/*----------------------------------------------------------------------------
+*----------------------------------------------------------------------------*/
+#define signF128UI64(a64) ((bool) ((uint64_t) (a64)>>63))
+#define expF128UI64(a64) ((int32_t) ((a64)>>48) & 0x7FFF)
+#define fracF128UI64(a64) ((a64) & UINT64_C(0x0000FFFFFFFFFFFF))
+#define packToF128UI64(sign, exp, sig64) (((uint64_t) (sign)<<63) + ((uint64_t) (exp)<<48) + (sig64))
+
+#define isNaNF128UI(a64, a0) (((~(a64) & UINT64_C(0x7FFF000000000000)) == 0) && (a0 || ((a64) & UINT64_C(0x0000FFFFFFFFFFFF))))
+
+struct exp32_sig128 { int32_t exp; struct uint128 sig; };
+struct exp32_sig128 softfloat_normSubnormalF128Sig(uint64_t, uint64_t);
+
+float128_t
+ softfloat_roundPackToF128(bool, int32_t, uint64_t, uint64_t, uint64_t, struct softfloat_status_t *);
+float128_t
+ softfloat_normRoundPackToF128(bool, int32_t, uint64_t, uint64_t, struct softfloat_status_t *);
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/cpu/softfloat3e/isNaN.cc b/src/cpu/softfloat3e/isNaN.cc
new file mode 100644
index 000000000..8c0bd1912
--- /dev/null
+++ b/src/cpu/softfloat3e/isNaN.cc
@@ -0,0 +1,63 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+bool f16_isNaN(float16 a)
+{
+    return isNaNF16UI(a);
+}
+
+bool f32_isNaN(float32 a)
+{
+    return isNaNF32UI(a);
+}
+
+bool f64_isNaN(float64 a)
+{
+    return isNaNF64UI(a);
+}
+
+bool extF80_isNaN(extFloat80_t a)
+{
+    return isNaNExtF80UI(a.signExp, a.signif);
+}
+
+bool f128_isNaN(float128_t a)
+{
+    return isNaNF128UI(a.v64, a.v0);
+}
diff --git a/src/cpu/softfloat3e/isSignalingNaN.cc b/src/cpu/softfloat3e/isSignalingNaN.cc
new file mode 100644
index 000000000..994ac3784
--- /dev/null
+++ b/src/cpu/softfloat3e/isSignalingNaN.cc
@@ -0,0 +1,63 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+bool f16_isSignalingNaN(float16 a)
+{
+    return softfloat_isSigNaNF16UI(a);
+}
+
+bool f32_isSignalingNaN(float32 a)
+{
+    return softfloat_isSigNaNF32UI(a);
+}
+
+bool f64_isSignalingNaN(float64 a)
+{
+    return softfloat_isSigNaNF64UI(a);
+}
+
+bool extF80_isSignalingNaN(extFloat80_t a)
+{
+    return softfloat_isSigNaNExtF80UI(a.signExp, a.signif);
+}
+
+bool f128_isSignalingNaN(float128_t a)
+{
+    return softfloat_isSigNaNF128UI(a.v64, a.v0);
+}
diff --git a/src/cpu/softfloat3e/opts-GCC.h b/src/cpu/softfloat3e/opts-GCC.h
new file mode 100644
index 000000000..dd6c0ab64
--- /dev/null
+++ b/src/cpu/softfloat3e/opts-GCC.h
@@ -0,0 +1,110 @@
+
+/*============================================================================
+
+This C header file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2017 The Regents of the University of California.  All rights
+reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#ifndef _OPTS_GCC_H_
+#define _OPTS_GCC_H_
+
+#include <stdint.h>
+#include "primitiveTypes.h"
+
+#ifdef SOFTFLOAT_BUILTIN_CLZ
+
+static __inline uint8_t softfloat_countLeadingZeros16(uint16_t a)
+    { return a ? __builtin_clz(a) - 16 : 16; }
+#define softfloat_countLeadingZeros16 softfloat_countLeadingZeros16
+
+static __inline uint8_t softfloat_countLeadingZeros32(uint32_t a)
+    { return a ? __builtin_clz(a) : 32; }
+#define softfloat_countLeadingZeros32 softfloat_countLeadingZeros32
+
+static __inline uint8_t softfloat_countLeadingZeros64(uint64_t a)
+    { return a ? __builtin_clzll(a) : 64; }
+#define softfloat_countLeadingZeros64 softfloat_countLeadingZeros64
+
+#endif
+
+#ifdef SOFTFLOAT_INTRINSIC_INT128
+
+static __inline struct uint128 softfloat_mul64ByShifted32To128(uint64_t a, uint32_t b)
+{
+    union { unsigned __int128 ui; struct uint128 s; } uZ;
+    uZ.ui = (unsigned __int128) a * ((uint64_t) b<<32);
+    return uZ.s;
+}
+#define softfloat_mul64ByShifted32To128 softfloat_mul64ByShifted32To128
+
+static __inline struct uint128 softfloat_mul64To128(uint64_t a, uint64_t b)
+{
+    union { unsigned __int128 ui; struct uint128 s; } uZ;
+    uZ.ui = (unsigned __int128) a * b;
+    return uZ.s;
+}
+#define softfloat_mul64To128 softfloat_mul64To128
+
+static __inline
+struct uint128 softfloat_mul128By32(uint64_t a64, uint64_t a0, uint32_t b)
+{
+    union { unsigned __int128 ui; struct uint128 s; } uZ;
+    uZ.ui = ((unsigned __int128) a64<<64 | a0) * b;
+    return uZ.s;
+}
+#define softfloat_mul128By32 softfloat_mul128By32
+
+static __inline
+void
+ softfloat_mul128To256M(uint64_t a64, uint64_t a0, uint64_t b64, uint64_t b0, uint64_t *zPtr)
+{
+    unsigned __int128 z0, mid1, mid, z128;
+    z0 = (unsigned __int128) a0 * b0;
+    mid1 = (unsigned __int128) a64 * b0;
+    mid = mid1 + (unsigned __int128) a0 * b64;
+    z128 = (unsigned __int128) a64 * b64;
+    z128 += (unsigned __int128) (mid < mid1)<<64 | mid>>64;
+    mid <<= 64;
+    z0 += mid;
+    z128 += (z0 < mid);
+    zPtr[indexWord(4, 0)] = z0;
+    zPtr[indexWord(4, 1)] = z0>>64;
+    zPtr[indexWord(4, 2)] = z128;
+    zPtr[indexWord(4, 3)] = z128>>64;
+}
+#define softfloat_mul128To256M softfloat_mul128To256M
+
+#endif
+
+#endif
+
+#endif
diff --git a/src/cpu/softfloat/softfloat_poly.cc b/src/cpu/softfloat3e/poly.cc
similarity index 84%
rename from src/cpu/softfloat/softfloat_poly.cc
rename to src/cpu/softfloat3e/poly.cc
index 5c7079353..a89d7f03f 100644
--- a/src/cpu/softfloat/softfloat_poly.cc
+++ b/src/cpu/softfloat3e/poly.cc
@@ -23,10 +23,10 @@ these four paragraphs for those parts of this code that are retained.
  *            Stanislav Shwartsman [sshwarts at sourceforge net]
  * ==========================================================================*/
 
-#define FLOAT128
-
 #include <assert.h>
+
 #include "softfloat.h"
+#include "poly.h"
 
 //                            2         3         4               n
 // f(x) ~ C + (C * x) + (C * x) + (C * x) + (C * x) + ... + (C * x)
@@ -39,13 +39,15 @@ these four paragraphs for those parts of this code that are retained.
 //   f(x) ~ [ p(x) + x * q(x) ]
 //
 
-float128 EvalPoly(float128 x, float128 *arr, int n, struct float_status_t *status)
+float128_t EvalPoly(float128_t x, const float128_t *arr, int n, struct softfloat_status_t *status)
 {
-    float128 r = arr[--n];
+    float128_t r = arr[--n];
 
     do {
-        r = float128_mul(r, x, status);
-        r = float128_add(r, arr[--n], status);
+        r = f128_mulAdd(r, x, arr[--n], 0, status);
+//      r = f128_mul(r, x, &status);
+//      r = f128_add(r, arr[--n], &status);
+
     } while (n > 0);
 
     return r;
@@ -63,9 +65,9 @@ float128 EvalPoly(float128 x, float128 *arr, int n, struct float_status_t *statu
 //   f(x) ~ [ p(x) + x * q(x) ]
 //
 
-float128 EvenPoly(float128 x, float128 *arr, int n, struct float_status_t *status)
+float128_t EvenPoly(float128_t x, const float128_t *arr, int n, softfloat_status_t &status)
 {
-     return EvalPoly(float128_mul(x, x, status), arr, n, status);
+     return EvalPoly(f128_mul(x, x, &status), arr, n, &status);
 }
 
 //                        3         5         7         9               2n+1
@@ -83,7 +85,7 @@ float128 EvenPoly(float128 x, float128 *arr, int n, struct float_status_t *statu
 //   f(x) ~ x * [ p(x) + x * q(x) ]
 //
 
-float128 OddPoly(float128 x, float128 *arr, int n, struct float_status_t *status)
+float128_t OddPoly(float128_t x, const float128_t *arr, int n, softfloat_status_t &status)
 {
-     return float128_mul(x, EvenPoly(x, arr, n, status), status);
+     return f128_mul(x, EvenPoly(x, arr, n, status), &status);
 }
diff --git a/src/cpu/softfloat3e/poly.h b/src/cpu/softfloat3e/poly.h
new file mode 100644
index 000000000..1d6c3170c
--- /dev/null
+++ b/src/cpu/softfloat3e/poly.h
@@ -0,0 +1,43 @@
+/////////////////////////////////////////////////////////////////////////
+// $Id$
+/////////////////////////////////////////////////////////////////////////
+//
+//   Copyright (c) 2003-2018 Stanislav Shwartsman
+//          Written by Stanislav Shwartsman [sshwarts at sourceforge net]
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+//
+/////////////////////////////////////////////////////////////////////////
+
+#ifndef _POLY_H_
+#define _POLY_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+float128_t EvenPoly(float128_t x, const float128_t *arr, int n, softfloat_status_t &status);
+float128_t OddPoly(float128_t x, const float128_t *arr, int n, softfloat_status_t &status);
+#else
+float128_t EvenPoly(float128_t x, const float128_t *arr, int n, struct softfloat_status_t *status);
+float128_t OddPoly(float128_t x, const float128_t *arr, int n, struct float_status_t *status);
+#endif // __cplusplus
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // _POLY_H_
diff --git a/src/cpu/softfloat3e/primitiveTypes.h b/src/cpu/softfloat3e/primitiveTypes.h
new file mode 100644
index 000000000..67751372f
--- /dev/null
+++ b/src/cpu/softfloat3e/primitiveTypes.h
@@ -0,0 +1,54 @@
+/*============================================================================
+
+This C header file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#ifndef primitiveTypes_h
+#define primitiveTypes_h
+
+/*----------------------------------------------------------------------------
+| These macros are used to isolate the differences in word order between big-
+| endian and little-endian platforms.
+*----------------------------------------------------------------------------*/
+#define wordIncr 1
+#define indexWord(total, n) (n)
+#define indexWordHi(total) ((total) - 1)
+#define indexWordLo(total) 0
+#define indexMultiword(total, m, n) (n)
+#define indexMultiwordHi(total, n) ((total) - (n))
+#define indexMultiwordLo(total, n) 0
+#define indexMultiwordHiBut(total, n) (n)
+#define indexMultiwordLoBut(total, n) 0
+#define INIT_UINTM4(v3, v2, v1, v0) { v0, v1, v2, v3 }
+
+#endif
diff --git a/src/cpu/softfloat3e/primitives.c b/src/cpu/softfloat3e/primitives.c
new file mode 100644
index 000000000..ba5afb76a
--- /dev/null
+++ b/src/cpu/softfloat3e/primitives.c
@@ -0,0 +1,50 @@
+/*============================================================================
+
+This C header file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include "primitives.h"
+
+/*----------------------------------------------------------------------------
+| This function is the same as 'softfloat_shiftRightJam128Extra' (below),
+| except that 'dist' must be in the range 1 to 63.
+*----------------------------------------------------------------------------*/
+struct uint128_extra softfloat_shortShiftRightJam128Extra(uint64_t a64, uint64_t a0, uint64_t extra, uint8_t dist)
+{
+    uint8_t negDist = -dist;
+    struct uint128_extra z;
+    z.v.v64 = a64>>dist;
+    z.v.v0 = a64<<(negDist & 63) | a0>>dist;
+    z.extra = a0<<(negDist & 63) | (extra != 0);
+    return z;
+}
diff --git a/src/cpu/softfloat3e/primitives.h b/src/cpu/softfloat3e/primitives.h
new file mode 100644
index 000000000..3c811838e
--- /dev/null
+++ b/src/cpu/softfloat3e/primitives.h
@@ -0,0 +1,527 @@
+/*============================================================================
+
+This C header file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#ifndef _PRIMITIVES_H_
+#define _PRIMITIVES_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "softfloat_types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define SOFTFLOAT_FAST_DIV64TO32
+
+#ifndef softfloat_shortShiftRightJam64
+/*----------------------------------------------------------------------------
+| Shifts 'a' right by the number of bits given in 'dist', which must be in
+| the range 1 to 63.  If any nonzero bits are shifted off, they are "jammed"
+| into the least-significant bit of the shifted value by setting the least-
+| significant bit to 1.  This shifted-and-jammed value is returned.
+*----------------------------------------------------------------------------*/
+static __inline
+uint64_t softfloat_shortShiftRightJam64(uint64_t a, uint8_t dist)
+{
+    return a>>dist | ((a & (((uint64_t) 1<<dist) - 1)) != 0);
+}
+#endif
+
+#ifndef softfloat_shiftRightJam32
+/*----------------------------------------------------------------------------
+| Shifts 'a' right by the number of bits given in 'dist', which must not
+| be zero.  If any nonzero bits are shifted off, they are "jammed" into the
+| least-significant bit of the shifted value by setting the least-significant
+| bit to 1.  This shifted-and-jammed value is returned.
+|   The value of 'dist' can be arbitrarily large.  In particular, if 'dist' is
+| greater than 32, the result will be either 0 or 1, depending on whether 'a'
+| is zero or nonzero.
+*----------------------------------------------------------------------------*/
+static __inline uint32_t softfloat_shiftRightJam32(uint32_t a, uint16_t dist)
+{
+    return (dist < 31) ? a>>dist | ((uint32_t) (a<<(-dist & 31)) != 0) : (a != 0);
+}
+#endif
+
+#ifndef softfloat_shiftRightJam64
+/*----------------------------------------------------------------------------
+| Shifts 'a' right by the number of bits given in 'dist', which must not
+| be zero.  If any nonzero bits are shifted off, they are "jammed" into the
+| least-significant bit of the shifted value by setting the least-significant
+| bit to 1.  This shifted-and-jammed value is returned.
+|   The value of 'dist' can be arbitrarily large.  In particular, if 'dist' is
+| greater than 64, the result will be either 0 or 1, depending on whether 'a'
+| is zero or nonzero.
+*----------------------------------------------------------------------------*/
+static __inline uint64_t softfloat_shiftRightJam64(uint64_t a, uint32_t dist)
+{
+    return (dist < 63) ? a>>dist | ((uint64_t) (a<<(-dist & 63)) != 0) : (a != 0);
+}
+#endif
+
+/*----------------------------------------------------------------------------
+| A constant table that translates an 8-bit unsigned integer (the array index)
+| into the number of leading 0 bits before the most-significant 1 of that
+| integer.  For integer zero (index 0), the corresponding table element is 8.
+*----------------------------------------------------------------------------*/
+extern const uint_least8_t softfloat_countLeadingZeros8[256];
+
+#ifndef softfloat_countLeadingZeros16
+/*----------------------------------------------------------------------------
+| Returns the number of leading 0 bits before the most-significant 1 bit of
+| 'a'.  If 'a' is zero, 16 is returned.
+*----------------------------------------------------------------------------*/
+static __inline uint8_t softfloat_countLeadingZeros16(uint16_t a)
+{
+    uint8_t count = 8;
+    if (0x100 <= a) {
+        count = 0;
+        a >>= 8;
+    }
+    count += softfloat_countLeadingZeros8[a];
+    return count;
+}
+#endif
+
+#ifndef softfloat_countLeadingZeros32
+/*----------------------------------------------------------------------------
+| Returns the number of leading 0 bits before the most-significant 1 bit of
+| 'a'.  If 'a' is zero, 32 is returned.
+*----------------------------------------------------------------------------*/
+static __inline uint8_t softfloat_countLeadingZeros32(uint32_t a)
+{
+    uint8_t count = 0;
+    if (a < 0x10000) {
+        count = 16;
+        a <<= 16;
+    }
+    if (a < 0x1000000) {
+        count += 8;
+        a <<= 8;
+    }
+    count += softfloat_countLeadingZeros8[a>>24];
+    return count;
+}
+#endif
+
+#ifndef softfloat_countLeadingZeros64
+/*----------------------------------------------------------------------------
+| Returns the number of leading 0 bits before the most-significant 1 bit of
+| 'a'.  If 'a' is zero, 64 is returned.
+*----------------------------------------------------------------------------*/
+uint8_t softfloat_countLeadingZeros64(uint64_t a);
+#endif
+
+extern const uint16_t softfloat_approxRecip_1k0s[16];
+extern const uint16_t softfloat_approxRecip_1k1s[16];
+
+#ifndef softfloat_approxRecip32_1
+/*----------------------------------------------------------------------------
+| Returns an approximation to the reciprocal of the number represented by 'a',
+| where 'a' is interpreted as an unsigned fixed-point number with one integer
+| bit and 31 fraction bits.  The 'a' input must be "normalized", meaning that
+| its most-significant bit (bit 31) must be 1.  Thus, if A is the value of
+| the fixed-point interpretation of 'a', then 1 <= A < 2.  The returned value
+| is interpreted as a pure unsigned fraction, having no integer bits and 32
+| fraction bits.  The approximation returned is never greater than the true
+| reciprocal 1/A, and it differs from the true reciprocal by at most 2.006 ulp
+| (units in the last place).
+*----------------------------------------------------------------------------*/
+#ifdef SOFTFLOAT_FAST_DIV64TO32
+#define softfloat_approxRecip32_1(a) ((uint32_t) (UINT64_C(0x7FFFFFFFFFFFFFFF) / (uint32_t) (a)))
+#endif
+#endif
+
+extern const uint16_t softfloat_approxRecipSqrt_1k0s[16];
+extern const uint16_t softfloat_approxRecipSqrt_1k1s[16];
+
+/*----------------------------------------------------------------------------
+| Returns an approximation to the reciprocal of the square root of the number
+| represented by 'a', where 'a' is interpreted as an unsigned fixed-point
+| number either with one integer bit and 31 fraction bits or with two integer
+| bits and 30 fraction bits.  The format of 'a' is determined by 'oddExpA',
+| which must be either 0 or 1.  If 'oddExpA' is 1, 'a' is interpreted as
+| having one integer bit, and if 'oddExpA' is 0, 'a' is interpreted as having
+| two integer bits.  The 'a' input must be "normalized", meaning that its
+| most-significant bit (bit 31) must be 1.  Thus, if A is the value of the
+| fixed-point interpretation of 'a', it follows that 1 <= A < 2 when 'oddExpA'
+| is 1, and 2 <= A < 4 when 'oddExpA' is 0.
+|   The returned value is interpreted as a pure unsigned fraction, having
+| no integer bits and 32 fraction bits.  The approximation returned is never
+| greater than the true reciprocal 1/sqrt(A), and it differs from the true
+| reciprocal by at most 2.06 ulp (units in the last place).  The approximation
+| returned is also always within the range 0.5 to 1; thus, the most-
+| significant bit of the result is always set.
+*----------------------------------------------------------------------------*/
+uint32_t softfloat_approxRecipSqrt32_1(unsigned int oddExpA, uint32_t a);
+
+/*----------------------------------------------------------------------------
+| Returns true if the 128-bit unsigned integer formed by concatenating 'a64'
+| and 'a0' is equal to the 128-bit unsigned integer formed by concatenating
+| 'b64' and 'b0'.
+*----------------------------------------------------------------------------*/
+static __inline
+bool softfloat_eq128(uint64_t a64, uint64_t a0, uint64_t b64, uint64_t b0)
+{
+    return (a64 == b64) && (a0 == b0);
+}
+
+/*----------------------------------------------------------------------------
+| Returns true if the 128-bit unsigned integer formed by concatenating 'a64'
+| and 'a0' is less than or equal to the 128-bit unsigned integer formed by
+| concatenating 'b64' and 'b0'.
+*----------------------------------------------------------------------------*/
+static __inline
+bool softfloat_le128(uint64_t a64, uint64_t a0, uint64_t b64, uint64_t b0)
+{
+    return (a64 < b64) || ((a64 == b64) && (a0 <= b0));
+}
+
+/*----------------------------------------------------------------------------
+| Returns true if the 128-bit unsigned integer formed by concatenating 'a64'
+| and 'a0' is less than the 128-bit unsigned integer formed by concatenating
+| 'b64' and 'b0'.
+*----------------------------------------------------------------------------*/
+static __inline
+bool softfloat_lt128(uint64_t a64, uint64_t a0, uint64_t b64, uint64_t b0)
+{
+    return (a64 < b64) || ((a64 == b64) && (a0 < b0));
+}
+
+/*----------------------------------------------------------------------------
+| Shifts the 128 bits formed by concatenating 'a64' and 'a0' left by the
+| number of bits given in 'dist', which must be in the range 1 to 63.
+*----------------------------------------------------------------------------*/
+static __inline
+struct uint128 softfloat_shortShiftLeft128(uint64_t a64, uint64_t a0, uint8_t dist)
+{
+    struct uint128 z;
+    z.v64 = a64<<dist | a0>>(-dist & 63);
+    z.v0 = a0<<dist;
+    return z;
+}
+
+/*----------------------------------------------------------------------------
+| Shifts the 128 bits formed by concatenating 'a64' and 'a0' right by the
+| number of bits given in 'dist', which must be in the range 1 to 63.
+*----------------------------------------------------------------------------*/
+static __inline
+struct uint128 softfloat_shortShiftRight128(uint64_t a64, uint64_t a0, uint8_t dist)
+{
+    struct uint128 z;
+    z.v64 = a64>>dist;
+    z.v0 = a64<<(-dist & 63) | a0>>dist;
+    return z;
+}
+
+/*----------------------------------------------------------------------------
+| This function is the same as 'softfloat_shiftRightJam64Extra' (below),
+| except that 'dist' must be in the range 1 to 63.
+*----------------------------------------------------------------------------*/
+static __inline
+struct uint64_extra softfloat_shortShiftRightJam64Extra(uint64_t a, uint64_t extra, uint8_t dist)
+{
+    struct uint64_extra z;
+    z.v = a>>dist;
+    z.extra = a<<(-dist & 63) | (extra != 0);
+    return z;
+}
+
+/*----------------------------------------------------------------------------
+| Shifts the 128 bits formed by concatenating 'a64' and 'a0' right by the
+| number of bits given in 'dist', which must be in the range 1 to 63.  If any
+| nonzero bits are shifted off, they are "jammed" into the least-significant
+| bit of the shifted value by setting the least-significant bit to 1.  This
+| shifted-and-jammed value is returned.
+*----------------------------------------------------------------------------*/
+static __inline
+struct uint128 softfloat_shortShiftRightJam128(uint64_t a64, uint64_t a0, uint8_t dist)
+{
+    uint8_t negDist = -dist;
+    struct uint128 z;
+    z.v64 = a64>>dist;
+    z.v0 =
+        a64<<(negDist & 63) | a0>>dist
+            | ((uint64_t) (a0<<(negDist & 63)) != 0);
+    return z;
+}
+
+/*----------------------------------------------------------------------------
+| This function is the same as 'softfloat_shiftRightJam128Extra' (below),
+| except that 'dist' must be in the range 1 to 63.
+*----------------------------------------------------------------------------*/
+extern struct uint128_extra softfloat_shortShiftRightJam128Extra(uint64_t a64, uint64_t a0, uint64_t extra, uint8_t dist);
+
+/*----------------------------------------------------------------------------
+| Shifts the 128 bits formed by concatenating 'a' and 'extra' right by 64
+| _plus_ the number of bits given in 'dist', which must not be zero.  This
+| shifted value is at most 64 nonzero bits and is returned in the 'v' field
+| of the 'struct uint64_extra' result.  The 64-bit 'extra' field of the result
+| contains a value formed as follows from the bits that were shifted off:  The
+| _last_ bit shifted off is the most-significant bit of the 'extra' field, and
+| the other 63 bits of the 'extra' field are all zero if and only if _all_but_
+| _the_last_ bits shifted off were all zero.
+|   (This function makes more sense if 'a' and 'extra' are considered to form
+| an unsigned fixed-point number with binary point between 'a' and 'extra'.
+| This fixed-point value is shifted right by the number of bits given in
+| 'dist', and the integer part of this shifted value is returned in the 'v'
+| field of the result.  The fractional part of the shifted value is modified
+| as described above and returned in the 'extra' field of the result.)
+*----------------------------------------------------------------------------*/
+static __inline
+struct uint64_extra
+ softfloat_shiftRightJam64Extra(uint64_t a, uint64_t extra, uint32_t dist)
+{
+    struct uint64_extra z;
+    if (dist < 64) {
+        z.v = a>>dist;
+        z.extra = a<<(-dist & 63);
+    } else {
+        z.v = 0;
+        z.extra = (dist == 64) ? a : (a != 0);
+    }
+    z.extra |= (extra != 0);
+    return z;
+}
+
+/*----------------------------------------------------------------------------
+| Shifts the 128 bits formed by concatenating 'a64' and 'a0' right by the
+| number of bits given in 'dist', which must not be zero.  If any nonzero bits
+| are shifted off, they are "jammed" into the least-significant bit of the
+| shifted value by setting the least-significant bit to 1.  This shifted-and-
+| jammed value is returned.
+|   The value of 'dist' can be arbitrarily large.  In particular, if 'dist' is
+| greater than 128, the result will be either 0 or 1, depending on whether the
+| original 128 bits are all zeros.
+*----------------------------------------------------------------------------*/
+static __inline
+struct uint128
+ softfloat_shiftRightJam128(uint64_t a64, uint64_t a0, uint32_t dist)
+{
+    uint8_t u8NegDist;
+    struct uint128 z;
+
+    if (dist < 64) {
+        u8NegDist = -dist;
+        z.v64 = a64>>dist;
+        z.v0 =
+            a64<<(u8NegDist & 63) | a0>>dist
+                | ((uint64_t) (a0<<(u8NegDist & 63)) != 0);
+    } else {
+        z.v64 = 0;
+        z.v0 =
+            (dist < 127)
+                ? a64>>(dist & 63)
+                      | (((a64 & (((uint64_t) 1<<(dist & 63)) - 1)) | a0)
+                             != 0)
+                : ((a64 | a0) != 0);
+    }
+    return z;
+}
+
+/*----------------------------------------------------------------------------
+| Shifts the 192 bits formed by concatenating 'a64', 'a0', and 'extra' right
+| by 64 _plus_ the number of bits given in 'dist', which must not be zero.
+| This shifted value is at most 128 nonzero bits and is returned in the 'v'
+| field of the 'struct uint128_extra' result.  The 64-bit 'extra' field of the
+| result contains a value formed as follows from the bits that were shifted
+| off:  The _last_ bit shifted off is the most-significant bit of the 'extra'
+| field, and the other 63 bits of the 'extra' field are all zero if and only
+| if _all_but_the_last_ bits shifted off were all zero.
+|   (This function makes more sense if 'a64', 'a0', and 'extra' are considered
+| to form an unsigned fixed-point number with binary point between 'a0' and
+| 'extra'.  This fixed-point value is shifted right by the number of bits
+| given in 'dist', and the integer part of this shifted value is returned
+| in the 'v' field of the result.  The fractional part of the shifted value
+| is modified as described above and returned in the 'extra' field of the
+| result.)
+*----------------------------------------------------------------------------*/
+static __inline
+struct uint128_extra
+ softfloat_shiftRightJam128Extra(uint64_t a64, uint64_t a0, uint64_t extra, uint32_t dist)
+{
+    uint8_t u8NegDist;
+    struct uint128_extra z;
+
+    u8NegDist = -dist;
+    if (dist < 64) {
+        z.v.v64 = a64>>dist;
+        z.v.v0 = a64<<(u8NegDist & 63) | a0>>dist;
+        z.extra = a0<<(u8NegDist & 63);
+    } else {
+        z.v.v64 = 0;
+        if (dist == 64) {
+            z.v.v0 = a64;
+            z.extra = a0;
+        } else {
+            extra |= a0;
+            if (dist < 128) {
+                z.v.v0 = a64>>(dist & 63);
+                z.extra = a64<<(u8NegDist & 63);
+            } else {
+                z.v.v0 = 0;
+                z.extra = (dist == 128) ? a64 : (a64 != 0);
+            }
+        }
+    }
+    z.extra |= (extra != 0);
+    return z;
+
+}
+
+/*----------------------------------------------------------------------------
+| Shifts the 256-bit unsigned integer pointed to by 'aPtr' right by the number
+| of bits given in 'dist', which must not be zero.  If any nonzero bits are
+| shifted off, they are "jammed" into the least-significant bit of the shifted
+| value by setting the least-significant bit to 1.  This shifted-and-jammed
+| value is stored at the location pointed to by 'zPtr'.  Each of 'aPtr' and
+| 'zPtr' points to an array of four 64-bit elements that concatenate in the
+| platform's normal endian order to form a 256-bit integer.
+|   The value of 'dist' can be arbitrarily large.  In particular, if 'dist'
+| is greater than 256, the stored result will be either 0 or 1, depending on
+| whether the original 256 bits are all zeros.
+*----------------------------------------------------------------------------*/
+void
+ softfloat_shiftRightJam256M(const uint64_t *aPtr, uint32_t dist, uint64_t *zPtr);
+
+#ifndef softfloat_add128
+/*----------------------------------------------------------------------------
+| Returns the sum of the 128-bit integer formed by concatenating 'a64' and
+| 'a0' and the 128-bit integer formed by concatenating 'b64' and 'b0'.  The
+| addition is modulo 2^128, so any carry out is lost.
+*----------------------------------------------------------------------------*/
+static __inline
+struct uint128 softfloat_add128(uint64_t a64, uint64_t a0, uint64_t b64, uint64_t b0)
+{
+    struct uint128 z;
+    z.v0 = a0 + b0;
+    z.v64 = a64 + b64 + (z.v0 < a0);
+    return z;
+}
+#endif
+
+#ifndef softfloat_add256M
+/*----------------------------------------------------------------------------
+| Adds the two 256-bit integers pointed to by 'aPtr' and 'bPtr'.  The addition
+| is modulo 2^256, so any carry out is lost.  The sum is stored at the
+| location pointed to by 'zPtr'.  Each of 'aPtr', 'bPtr', and 'zPtr' points to
+| an array of four 64-bit elements that concatenate in the platform's normal
+| endian order to form a 256-bit integer.
+*----------------------------------------------------------------------------*/
+void
+ softfloat_add256M(const uint64_t *aPtr, const uint64_t *bPtr, uint64_t *zPtr);
+#endif
+
+#ifndef softfloat_sub128
+/*----------------------------------------------------------------------------
+| Returns the difference of the 128-bit integer formed by concatenating 'a64'
+| and 'a0' and the 128-bit integer formed by concatenating 'b64' and 'b0'.
+| The subtraction is modulo 2^128, so any borrow out (carry out) is lost.
+*----------------------------------------------------------------------------*/
+static __inline
+struct uint128 softfloat_sub128(uint64_t a64, uint64_t a0, uint64_t b64, uint64_t b0)
+{
+    struct uint128 z;
+    z.v0 = a0 - b0;
+    z.v64 = a64 - b64;
+    z.v64 -= (a0 < b0);
+    return z;
+}
+#endif
+
+#ifndef softfloat_sub256M
+/*----------------------------------------------------------------------------
+| Subtracts the 256-bit integer pointed to by 'bPtr' from the 256-bit integer
+| pointed to by 'aPtr'.  The addition is modulo 2^256, so any borrow out
+| (carry out) is lost.  The difference is stored at the location pointed to
+| by 'zPtr'.  Each of 'aPtr', 'bPtr', and 'zPtr' points to an array of four
+| 64-bit elements that concatenate in the platform's normal endian order to
+| form a 256-bit integer.
+*----------------------------------------------------------------------------*/
+void
+ softfloat_sub256M(const uint64_t *aPtr, const uint64_t *bPtr, uint64_t *zPtr);
+#endif
+
+/*----------------------------------------------------------------------------
+| Returns the 128-bit product of 'a', 'b', and 2^32.
+*----------------------------------------------------------------------------*/
+static __inline struct uint128 softfloat_mul64ByShifted32To128(uint64_t a, uint32_t b)
+{
+    uint64_t mid;
+    struct uint128 z;
+    mid = (uint64_t) (uint32_t) a * b;
+    z.v0 = mid<<32;
+    z.v64 = (uint64_t) (uint32_t) (a>>32) * b + (mid>>32);
+    return z;
+}
+
+/*----------------------------------------------------------------------------
+| Returns the 128-bit product of 'a' and 'b'.
+*----------------------------------------------------------------------------*/
+struct uint128 softfloat_mul64To128(uint64_t a, uint64_t b);
+
+/*----------------------------------------------------------------------------
+| Returns the product of the 128-bit integer formed by concatenating 'a64' and
+| 'a0', multiplied by 'b'.  The multiplication is modulo 2^128; any overflow
+| bits are discarded.
+*----------------------------------------------------------------------------*/
+static __inline
+struct uint128 softfloat_mul128By32(uint64_t a64, uint64_t a0, uint32_t b)
+{
+    struct uint128 z;
+    uint64_t mid;
+    uint32_t carry;
+    z.v0 = a0 * b;
+    mid = (uint64_t) (uint32_t) (a0>>32) * b;
+    carry = (uint32_t) ((uint32_t) (z.v0>>32) - (uint32_t) mid);
+    z.v64 = a64 * b + (uint32_t) ((mid + carry)>>32);
+    return z;
+}
+
+/*----------------------------------------------------------------------------
+| Multiplies the 128-bit unsigned integer formed by concatenating 'a64' and
+| 'a0' by the 128-bit unsigned integer formed by concatenating 'b64' and
+| 'b0'.  The 256-bit product is stored at the location pointed to by 'zPtr'.
+| Argument 'zPtr' points to an array of four 64-bit elements that concatenate
+| in the platform's normal endian order to form a 256-bit integer.
+*----------------------------------------------------------------------------*/
+void
+ softfloat_mul128To256M(uint64_t a64, uint64_t a0, uint64_t b64, uint64_t b0, uint64_t *zPtr);
+#ifdef __cplusplus
+}
+#endif
+
+#endif // _PRIMITIVES_H_
diff --git a/src/cpu/softfloat3e/s_add128.cc b/src/cpu/softfloat3e/s_add128.cc
new file mode 100644
index 000000000..8efabb850
--- /dev/null
+++ b/src/cpu/softfloat3e/s_add128.cc
@@ -0,0 +1,51 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "softfloat_types.h"
+
+#ifndef softfloat_add128
+
+struct uint128 softfloat_add128(uint64_t a64, uint64_t a0, uint64_t b64, uint64_t b0)
+{
+    struct uint128 z;
+
+    z.v0 = a0 + b0;
+    z.v64 = a64 + b64 + (z.v0 < a0);
+    return z;
+}
+
+#endif
+
diff --git a/src/cpu/softfloat3e/s_add256M.c b/src/cpu/softfloat3e/s_add256M.c
new file mode 100644
index 000000000..32fdf122f
--- /dev/null
+++ b/src/cpu/softfloat3e/s_add256M.c
@@ -0,0 +1,60 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "primitiveTypes.h"
+
+#ifndef softfloat_add256M
+
+void softfloat_add256M(const uint64_t *aPtr, const uint64_t *bPtr, uint64_t *zPtr)
+{
+    unsigned int index;
+    uint8_t carry;
+    uint64_t wordA, wordZ;
+
+    index = indexWordLo(4);
+    carry = 0;
+    for (;;) {
+        wordA = aPtr[index];
+        wordZ = wordA + bPtr[index] + carry;
+        zPtr[index] = wordZ;
+        if (index == indexWordHi(4)) break;
+        if (wordZ != wordA) carry = (wordZ < wordA);
+        index += wordIncr;
+    }
+}
+
+#endif
+
diff --git a/src/cpu/softfloat3e/s_addMagsExtF80.cc b/src/cpu/softfloat3e/s_addMagsExtF80.cc
new file mode 100644
index 000000000..5cc969198
--- /dev/null
+++ b/src/cpu/softfloat3e/s_addMagsExtF80.cc
@@ -0,0 +1,146 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+extFloat80_t softfloat_addMagsExtF80(uint16_t uiA64, uint64_t uiA0, uint16_t uiB64, uint64_t uiB0, bool signZ, struct softfloat_status_t *status)
+{
+    int32_t expA;
+    uint64_t sigA;
+    int32_t expB;
+    uint64_t sigB;
+    int32_t expDiff;
+    uint64_t sigZ, sigZExtra;
+    struct exp32_sig64 normExpSig;
+    int32_t expZ;
+    struct uint64_extra sig64Extra;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expA = expExtF80UI64(uiA64);
+    sigA = uiA0;
+    expB = expExtF80UI64(uiB64);
+    sigB = uiB0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x7FFF) {
+        if ((sigA << 1) || ((expB == 0x7FFF) && (sigB << 1)))
+            goto propagateNaN;
+        if (sigB && ! expB)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        return packToExtF80_twoargs(uiA64, uiA0);
+    }
+    if (expB == 0x7FFF) {
+        if (sigB << 1) goto propagateNaN;
+        if (sigA && ! expA)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        return packToExtF80(signZ, 0x7FFF, UINT64_C(0x8000000000000000));
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA) {
+        if (! sigA) {
+            if (! expB && sigB) {
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+                normExpSig = softfloat_normSubnormalExtF80Sig(sigB);
+                expB = normExpSig.exp + 1;
+                sigB = normExpSig.sig;
+            }
+            expZ = expB;
+            sigZ = sigB;
+            sigZExtra = 0;
+            goto roundAndPack;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalExtF80Sig(sigA);
+        expA = normExpSig.exp + 1;
+        sigA = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expB == 0) {
+        if (sigB == 0) {
+            expZ = expA;
+            sigZ = sigA;
+            sigZExtra = 0;
+            goto roundAndPack;
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalExtF80Sig(sigB);
+        expB = normExpSig.exp + 1;
+        sigB = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expDiff = expA - expB;
+    if (! expDiff) {
+        sigZ = sigA + sigB;
+        sigZExtra = 0;
+        expZ = expA;
+        goto shiftRight1;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expDiff < 0) {
+        expZ = expB;
+        sig64Extra = softfloat_shiftRightJam64Extra(sigA, 0, -expDiff);
+        sigA = sig64Extra.v;
+        sigZExtra = sig64Extra.extra;
+    } else {
+        expZ = expA;
+        sig64Extra = softfloat_shiftRightJam64Extra(sigB, 0, expDiff);
+        sigB = sig64Extra.v;
+        sigZExtra = sig64Extra.extra;
+    }
+    sigZ = sigA + sigB;
+    if (sigZ & UINT64_C(0x8000000000000000)) goto roundAndPack;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ shiftRight1:
+    sig64Extra = softfloat_shortShiftRightJam64Extra(sigZ, sigZExtra, 1);
+    sigZ = sig64Extra.v | UINT64_C(0x8000000000000000);
+    sigZExtra = sig64Extra.extra;
+    ++expZ;
+ roundAndPack:
+    return softfloat_roundPackToExtF80(signZ, expZ, sigZ, sigZExtra, softfloat_extF80_roundingPrecision(status), status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    return softfloat_propagateNaNExtF80UI(uiA64, uiA0, uiB64, uiB0, status);
+}
diff --git a/src/cpu/softfloat3e/s_addMagsF128.cc b/src/cpu/softfloat3e/s_addMagsF128.cc
new file mode 100644
index 000000000..b831796cc
--- /dev/null
+++ b/src/cpu/softfloat3e/s_addMagsF128.cc
@@ -0,0 +1,138 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+
+float128_t softfloat_addMagsF128(uint64_t uiA64, uint64_t uiA0, uint64_t uiB64, uint64_t uiB0, bool signZ, struct softfloat_status_t *status)
+{
+    int32_t expA;
+    struct uint128 sigA;
+    int32_t expB;
+    struct uint128 sigB;
+    int32_t expDiff;
+    struct uint128 uiZ, sigZ;
+    int32_t expZ;
+    uint64_t sigZExtra;
+    struct uint128_extra sig128Extra;
+
+    expA = expF128UI64(uiA64);
+    sigA.v64 = fracF128UI64(uiA64);
+    sigA.v0  = uiA0;
+    expB = expF128UI64(uiB64);
+    sigB.v64 = fracF128UI64(uiB64);
+    sigB.v0  = uiB0;
+    expDiff = expA - expB;
+    if (! expDiff) {
+        if (expA == 0x7FFF) {
+            if (sigA.v64 | sigA.v0 | sigB.v64 | sigB.v0) goto propagateNaN;
+            uiZ.v64 = uiA64;
+            uiZ.v0  = uiA0;
+            return uiZ;
+        }
+        sigZ = softfloat_add128(sigA.v64, sigA.v0, sigB.v64, sigB.v0);
+        if (! expA) {
+            uiZ.v64 = packToF128UI64(signZ, 0, sigZ.v64);
+            uiZ.v0  = sigZ.v0;
+            return uiZ;
+        }
+        expZ = expA;
+        sigZ.v64 |= UINT64_C(0x0002000000000000);
+        sigZExtra = 0;
+        goto shiftRight1;
+    }
+    if (expDiff < 0) {
+        if (expB == 0x7FFF) {
+            if (sigB.v64 | sigB.v0) goto propagateNaN;
+            uiZ.v64 = packToF128UI64(signZ, 0x7FFF, 0);
+            uiZ.v0  = 0;
+            return uiZ;
+        }
+        expZ = expB;
+        if (expA) {
+            sigA.v64 |= UINT64_C(0x0001000000000000);
+        } else {
+            ++expDiff;
+            sigZExtra = 0;
+            if (! expDiff) goto newlyAligned;
+        }
+        sig128Extra =
+            softfloat_shiftRightJam128Extra(sigA.v64, sigA.v0, 0, -expDiff);
+        sigA = sig128Extra.v;
+        sigZExtra = sig128Extra.extra;
+    } else {
+        if (expA == 0x7FFF) {
+            if (sigA.v64 | sigA.v0) goto propagateNaN;
+            uiZ.v64 = uiA64;
+            uiZ.v0  = uiA0;
+            return uiZ;
+        }
+        expZ = expA;
+        if (expB) {
+            sigB.v64 |= UINT64_C(0x0001000000000000);
+        } else {
+            --expDiff;
+            sigZExtra = 0;
+            if (! expDiff) goto newlyAligned;
+        }
+        sig128Extra = softfloat_shiftRightJam128Extra(sigB.v64, sigB.v0, 0, expDiff);
+        sigB = sig128Extra.v;
+        sigZExtra = sig128Extra.extra;
+    }
+ newlyAligned:
+    sigZ =
+        softfloat_add128(
+            sigA.v64 | UINT64_C(0x0001000000000000),
+            sigA.v0,
+            sigB.v64,
+            sigB.v0
+       );
+    --expZ;
+    if (sigZ.v64 < UINT64_C(0x0002000000000000)) goto roundAndPack;
+    ++expZ;
+ shiftRight1:
+    sig128Extra = softfloat_shortShiftRightJam128Extra(sigZ.v64, sigZ.v0, sigZExtra, 1);
+    sigZ = sig128Extra.v;
+    sigZExtra = sig128Extra.extra;
+ roundAndPack:
+    return
+        softfloat_roundPackToF128(signZ, expZ, sigZ.v64, sigZ.v0, sigZExtra, status);
+ propagateNaN:
+    uiZ = softfloat_propagateNaNF128UI(uiA64, uiA0, uiB64, uiB0, status);
+    return uiZ;
+}
diff --git a/src/cpu/softfloat3e/s_addMagsF16.c b/src/cpu/softfloat3e/s_addMagsF16.c
new file mode 100644
index 000000000..022f254a8
--- /dev/null
+++ b/src/cpu/softfloat3e/s_addMagsF16.c
@@ -0,0 +1,192 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float16 softfloat_addMagsF16(uint16_t uiA, uint16_t uiB, struct softfloat_status_t *status)
+{
+    int8_t expA;
+    uint16_t sigA;
+    int8_t expB;
+    uint16_t sigB;
+    int8_t expDiff;
+    uint16_t uiZ;
+    bool signZ;
+    int8_t expZ;
+    uint16_t sigZ;
+    uint16_t sigX, sigY;
+    int8_t shiftDist;
+    uint32_t sig32Z;
+    int8_t roundingMode;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expA = expF16UI(uiA);
+    sigA = fracF16UI(uiA);
+    expB = expF16UI(uiB);
+    sigB = fracF16UI(uiB);
+    signZ = signF16UI(uiA);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) {
+            sigA = 0;
+            uiA = packToF16UI(signZ, 0, 0);
+        }
+        if (!expB) sigB = 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expDiff = expA - expB;
+    if (! expDiff) {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (! expA) {
+            uiZ = uiA + sigB;
+            if (sigA | sigB) {
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+                bool isTiny = (expF16UI(uiZ) == 0);
+                if (isTiny) {
+                    if (softfloat_flushUnderflowToZero(status)) {
+                        softfloat_raiseFlags(status, softfloat_flag_underflow | softfloat_flag_inexact);
+                        return packToF16UI(signZ, 0, 0);
+                    }
+                    if (! softfloat_isMaskedException(status, softfloat_flag_underflow)) {
+                        softfloat_raiseFlags(status, softfloat_flag_underflow);
+                    }
+                }
+            }
+            return uiZ;
+        }
+        if (expA == 0x1F) {
+            if (sigA | sigB) goto propagateNaN;
+            return uiA;
+        }
+        expZ = expA;
+        sigZ = 0x0800 + sigA + sigB;
+        if (! (sigZ & 1) && (expZ < 0x1E)) {
+            sigZ >>= 1;
+            goto pack;
+        }
+        sigZ <<= 3;
+    } else {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (expDiff < 0) {
+            /*----------------------------------------------------------------
+            *----------------------------------------------------------------*/
+            if (expB == 0x1F) {
+                if (sigB) goto propagateNaN;
+                if (sigA && !expA) softfloat_raiseFlags(status, softfloat_flag_denormal);
+                return packToF16UI(signZ, 0x1F, 0);
+            }
+
+            if ((!expA && sigA) || (!expB && sigB))
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+
+            if (expDiff <= -13) {
+                uiZ = packToF16UI(signZ, expB, sigB);
+                if (expA | sigA) goto addEpsilon;
+                return uiZ;
+            }
+            expZ = expB;
+            sigX = sigB | 0x0400;
+            sigY = sigA + (expA ? 0x0400 : sigA);
+            shiftDist = 19 + expDiff;
+        } else {
+            /*----------------------------------------------------------------
+            *----------------------------------------------------------------*/
+            uiZ = uiA;
+            if (expA == 0x1F) {
+                if (sigA) goto propagateNaN;
+                if (sigB && !expB) softfloat_raiseFlags(status, softfloat_flag_denormal);
+                return uiZ;
+            }
+
+            if ((!expA && sigA) || (!expB && sigB))
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+
+            if (13 <= expDiff) {
+                if (expB | sigB) goto addEpsilon;
+                return uiZ;
+            }
+            expZ = expA;
+            sigX = sigA | 0x0400;
+            sigY = sigB + (expB ? 0x0400 : sigB);
+            shiftDist = 19 - expDiff;
+        }
+        sig32Z = ((uint32_t) sigX<<19) + ((uint32_t) sigY<<shiftDist);
+        if (sig32Z < 0x40000000) {
+            --expZ;
+            sig32Z <<= 1;
+        }
+        sigZ = sig32Z>>16;
+        if (sig32Z & 0xFFFF) {
+            sigZ |= 1;
+        } else {
+            if (! (sigZ & 0xF) && (expZ < 0x1E)) {
+                sigZ >>= 4;
+                goto pack;
+            }
+        }
+    }
+    return softfloat_roundPackToF16(signZ, expZ, sigZ, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    return softfloat_propagateNaNF16UI(uiA, uiB, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ addEpsilon:
+    roundingMode = softfloat_getRoundingMode(status);
+    if (roundingMode != softfloat_round_near_even) {
+        if (roundingMode == (signF16UI(uiZ) ? softfloat_round_min : softfloat_round_max)) {
+            ++uiZ;
+            if ((uint16_t) (uiZ<<1) == 0xF800) {
+                softfloat_raiseFlags(status, softfloat_flag_overflow | softfloat_flag_inexact);
+            }
+        }
+    }
+    softfloat_raiseFlags(status, softfloat_flag_inexact);
+    return uiZ;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ pack:
+    return packToF16UI(signZ, expZ, sigZ);
+}
diff --git a/src/cpu/softfloat3e/s_addMagsF32.c b/src/cpu/softfloat3e/s_addMagsF32.c
new file mode 100644
index 000000000..df902348a
--- /dev/null
+++ b/src/cpu/softfloat3e/s_addMagsF32.c
@@ -0,0 +1,147 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+
+float32 softfloat_addMagsF32(uint32_t uiA, uint32_t uiB, struct softfloat_status_t *status)
+{
+    int16_t expA;
+    uint32_t sigA;
+    int16_t expB;
+    uint32_t sigB;
+    int16_t expDiff;
+    uint32_t uiZ;
+    bool signZ;
+    int16_t expZ;
+    uint32_t sigZ;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expA = expF32UI(uiA);
+    sigA = fracF32UI(uiA);
+    expB = expF32UI(uiB);
+    sigB = fracF32UI(uiB);
+    signZ = signF32UI(uiA);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) {
+            sigA = 0;
+            uiA = packToF32UI(signZ, 0, 0);
+        }
+        if (!expB) sigB = 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expDiff = expA - expB;
+    if (! expDiff) {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (! expA) {
+            uiZ = uiA + sigB;
+            if (sigA | sigB) {
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+                bool isTiny = (expF32UI(uiZ) == 0);
+                if (isTiny) {
+                    if (softfloat_flushUnderflowToZero(status)) {
+                        softfloat_raiseFlags(status, softfloat_flag_underflow | softfloat_flag_inexact);
+                        return packToF32UI(signZ, 0, 0);
+                    }
+                    if (! softfloat_isMaskedException(status, softfloat_flag_underflow)) {
+                        softfloat_raiseFlags(status, softfloat_flag_underflow);
+                    }
+                }
+            }
+            return uiZ;
+        }
+        if (expA == 0xFF) {
+            if (sigA | sigB) goto propagateNaN;
+            return uiA;
+        }
+        expZ = expA;
+        sigZ = 0x01000000 + sigA + sigB;
+        if (! (sigZ & 1) && (expZ < 0xFE)) {
+            return packToF32UI(signZ, expZ, sigZ>>1);
+        }
+        sigZ <<= 6;
+    } else {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        signZ = signF32UI(uiA);
+        sigA <<= 6;
+        sigB <<= 6;
+        if (expDiff < 0) {
+            if (expB == 0xFF) {
+                if (sigB) goto propagateNaN;
+                if (sigA && !expA) softfloat_raiseFlags(status, softfloat_flag_denormal);
+                return packToF32UI(signZ, 0xFF, 0);
+            }
+
+            if ((!expA && sigA) || (!expB && sigB))
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+
+            expZ = expB;
+            sigA += expA ? 0x20000000 : sigA;
+            sigA = softfloat_shiftRightJam32(sigA, -expDiff);
+        } else {
+            if (expA == 0xFF) {
+                if (sigA) goto propagateNaN;
+                if (sigB && !expB) softfloat_raiseFlags(status, softfloat_flag_denormal);
+                return uiA;
+            }
+
+            if ((!expA && sigA) || (!expB && sigB))
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+
+            expZ = expA;
+            sigB += expB ? 0x20000000 : sigB;
+            sigB = softfloat_shiftRightJam32(sigB, expDiff);
+        }
+        sigZ = 0x20000000 + sigA + sigB;
+        if (sigZ < 0x40000000) {
+            --expZ;
+            sigZ <<= 1;
+        }
+    }
+    return softfloat_roundPackToF32(signZ, expZ, sigZ, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    return softfloat_propagateNaNF32UI(uiA, uiB, status);
+}
diff --git a/src/cpu/softfloat3e/s_addMagsF64.c b/src/cpu/softfloat3e/s_addMagsF64.c
new file mode 100644
index 000000000..a315860f6
--- /dev/null
+++ b/src/cpu/softfloat3e/s_addMagsF64.c
@@ -0,0 +1,149 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+
+float64 softfloat_addMagsF64(uint64_t uiA, uint64_t uiB, bool signZ, struct softfloat_status_t *status)
+{
+    int16_t expA;
+    uint64_t sigA;
+    int16_t expB;
+    uint64_t sigB;
+    int16_t expDiff;
+    uint64_t uiZ;
+    int16_t expZ;
+    uint64_t sigZ;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expA = expF64UI(uiA);
+    sigA = fracF64UI(uiA);
+    expB = expF64UI(uiB);
+    sigB = fracF64UI(uiB);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) {
+            sigA = 0;
+            uiA = packToF64UI(signZ, 0, 0);
+        }
+        if (!expB) sigB = 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expDiff = expA - expB;
+    if (! expDiff) {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (! expA) {
+            uiZ = uiA + sigB;
+            if (sigA | sigB) {
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+                bool isTiny = (expF64UI(uiZ) == 0);
+                if (isTiny) {
+                    if (softfloat_flushUnderflowToZero(status)) {
+                        softfloat_raiseFlags(status, softfloat_flag_underflow | softfloat_flag_inexact);
+                        return packToF64UI(signZ, 0, 0);
+                    }
+                    if (! softfloat_isMaskedException(status, softfloat_flag_underflow)) {
+                        softfloat_raiseFlags(status, softfloat_flag_underflow);
+                    }
+                }
+            }
+            return uiZ;
+        }
+        if (expA == 0x7FF) {
+            if (sigA | sigB) goto propagateNaN;
+            return uiA;
+        }
+        expZ = expA;
+        sigZ = UINT64_C(0x0020000000000000) + sigA + sigB;
+        sigZ <<= 9;
+    } else {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        sigA <<= 9;
+        sigB <<= 9;
+        if (expDiff < 0) {
+            if (expB == 0x7FF) {
+                if (sigB) goto propagateNaN;
+                if (sigA && !expA) softfloat_raiseFlags(status, softfloat_flag_denormal);
+                return packToF64UI(signZ, 0x7FF, 0);
+            }
+
+            if ((!expA && sigA) || (!expB && sigB))
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+
+            expZ = expB;
+            if (expA) {
+                sigA += UINT64_C(0x2000000000000000);
+            } else {
+                sigA <<= 1;
+            }
+            sigA = softfloat_shiftRightJam64(sigA, -expDiff);
+        } else {
+            if (expA == 0x7FF) {
+                if (sigA) goto propagateNaN;
+                if (sigB && !expB) softfloat_raiseFlags(status, softfloat_flag_denormal);
+                return uiA;
+            }
+
+            if ((!expA && sigA) || (!expB && sigB))
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+
+            expZ = expA;
+            if (expB) {
+                sigB += UINT64_C(0x2000000000000000);
+            } else {
+                sigB <<= 1;
+            }
+            sigB = softfloat_shiftRightJam64(sigB, expDiff);
+        }
+        sigZ = UINT64_C(0x2000000000000000) + sigA + sigB;
+        if (sigZ < UINT64_C(0x4000000000000000)) {
+            --expZ;
+            sigZ <<= 1;
+        }
+    }
+    return softfloat_roundPackToF64(signZ, expZ, sigZ, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    return softfloat_propagateNaNF64UI(uiA, uiB, status);
+}
diff --git a/src/cpu/softfloat3e/s_approxRecipSqrt32_1.c b/src/cpu/softfloat3e/s_approxRecipSqrt32_1.c
new file mode 100644
index 000000000..776c146ef
--- /dev/null
+++ b/src/cpu/softfloat3e/s_approxRecipSqrt32_1.c
@@ -0,0 +1,63 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "primitives.h"
+
+extern const uint16_t softfloat_approxRecipSqrt_1k0s[];
+extern const uint16_t softfloat_approxRecipSqrt_1k1s[];
+
+uint32_t softfloat_approxRecipSqrt32_1(unsigned int oddExpA, uint32_t a)
+{
+    int index;
+    uint16_t eps, r0;
+    uint32_t ESqrR0;
+    uint32_t sigma0;
+    uint32_t r;
+    uint32_t sqrSigma0;
+
+    index = (a>>27 & 0xE) + oddExpA;
+    eps = (uint16_t) (a>>12);
+    r0 = softfloat_approxRecipSqrt_1k0s[index] - ((softfloat_approxRecipSqrt_1k1s[index] * (uint32_t) eps) >>20);
+    ESqrR0 = (uint32_t) r0 * r0;
+    if (! oddExpA) ESqrR0 <<= 1;
+    sigma0 = ~(uint32_t) (((uint32_t) ESqrR0 * (uint64_t) a)>>23);
+    r = ((uint32_t) r0<<16) + ((r0 * (uint64_t) sigma0)>>25);
+    sqrSigma0 = ((uint64_t) sigma0 * sigma0)>>32;
+    r += ((uint32_t) ((r>>1) + (r>>3) - ((uint32_t) r0<<14)) * (uint64_t) sqrSigma0) >>48;
+    if (! (r & 0x80000000)) r = 0x80000000;
+    return r;
+}
+
diff --git a/src/cpu/softfloat3e/s_approxRecipSqrt_1Ks.c b/src/cpu/softfloat3e/s_approxRecipSqrt_1Ks.c
new file mode 100644
index 000000000..56965c541
--- /dev/null
+++ b/src/cpu/softfloat3e/s_approxRecipSqrt_1Ks.c
@@ -0,0 +1,46 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "primitives.h"
+
+const uint16_t softfloat_approxRecipSqrt_1k0s[16] = {
+    0xB4C9, 0xFFAB, 0xAA7D, 0xF11C, 0xA1C5, 0xE4C7, 0x9A43, 0xDA29,
+    0x93B5, 0xD0E5, 0x8DED, 0xC8B7, 0x88C6, 0xC16D, 0x8424, 0xBAE1
+};
+const uint16_t softfloat_approxRecipSqrt_1k1s[16] = {
+    0xA5A5, 0xEA42, 0x8C21, 0xC62D, 0x788F, 0xAA7F, 0x6928, 0x94B6,
+    0x5CC7, 0x8335, 0x52A6, 0x74E2, 0x4A3E, 0x68FE, 0x432B, 0x5EFD
+};
diff --git a/src/cpu/softfloat3e/s_approxRecip_1Ks.c b/src/cpu/softfloat3e/s_approxRecip_1Ks.c
new file mode 100644
index 000000000..aadcd235c
--- /dev/null
+++ b/src/cpu/softfloat3e/s_approxRecip_1Ks.c
@@ -0,0 +1,46 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "primitives.h"
+
+const uint16_t softfloat_approxRecip_1k0s[16] = {
+    0xFFC4, 0xF0BE, 0xE363, 0xD76F, 0xCCAD, 0xC2F0, 0xBA16, 0xB201,
+    0xAA97, 0xA3C6, 0x9D7A, 0x97A6, 0x923C, 0x8D32, 0x887E, 0x8417
+};
+const uint16_t softfloat_approxRecip_1k1s[16] = {
+    0xF0F1, 0xD62C, 0xBFA1, 0xAC77, 0x9C0A, 0x8DDB, 0x8185, 0x76BA,
+    0x6D3B, 0x64D4, 0x5D5C, 0x56B1, 0x50B6, 0x4B55, 0x4679, 0x4211
+};
diff --git a/src/cpu/softfloat3e/s_commonNaNToExtF80UI.cc b/src/cpu/softfloat3e/s_commonNaNToExtF80UI.cc
new file mode 100644
index 000000000..7afca6270
--- /dev/null
+++ b/src/cpu/softfloat3e/s_commonNaNToExtF80UI.cc
@@ -0,0 +1,69 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "primitives.h"
+#include "specialize.h"
+
+/*----------------------------------------------------------------------------
+| Converts the common NaN pointed to by `aPtr' into an 80-bit extended
+| floating-point NaN, and returns the bit pattern of this value as an unsigned
+| integer.
+*----------------------------------------------------------------------------*/
+struct uint128 softfloat_commonNaNToExtF80UI(const struct commonNaN *aPtr)
+{
+    struct uint128 uiZ;
+
+    uiZ.v64 = (uint16_t) aPtr->sign<<15 | 0x7FFF;
+    uiZ.v0 = UINT64_C(0xC000000000000000) | aPtr->v64>>1;
+    return uiZ;
+}
+
+/*----------------------------------------------------------------------------
+| Assuming the unsigned integer formed from concatenating `uiA64' and `uiA0'
+| has the bit pattern of an 80-bit extended floating-point NaN, converts
+| this NaN to the common NaN form, and stores the resulting common NaN at the
+| location pointed to by `zPtr'.  If the NaN is a signaling NaN, the invalid
+| exception is raised.
+*----------------------------------------------------------------------------*/
+void softfloat_extF80UIToCommonNaN(uint16_t uiA64, uint64_t uiA0, struct commonNaN *zPtr, struct softfloat_status_t *status)
+{
+    if (softfloat_isSigNaNExtF80UI(uiA64, uiA0)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+    }
+    zPtr->sign = uiA64>>15;
+    zPtr->v64  = uiA0<<1;
+    zPtr->v0   = 0;
+}
diff --git a/src/cpu/softfloat3e/s_commonNaNToF128UI.cc b/src/cpu/softfloat3e/s_commonNaNToF128UI.cc
new file mode 100644
index 000000000..a0bb93dd3
--- /dev/null
+++ b/src/cpu/softfloat3e/s_commonNaNToF128UI.cc
@@ -0,0 +1,72 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "primitives.h"
+#include "specialize.h"
+
+/*----------------------------------------------------------------------------
+| Converts the common NaN pointed to by `aPtr' into a 128-bit floating-point
+| NaN, and returns the bit pattern of this value as an unsigned integer.
+*----------------------------------------------------------------------------*/
+struct uint128 softfloat_commonNaNToF128UI(const struct commonNaN *aPtr)
+{
+    struct uint128 uiZ;
+
+    uiZ = softfloat_shortShiftRight128(aPtr->v64, aPtr->v0, 16);
+    uiZ.v64 |= (uint64_t) aPtr->sign<<63 | UINT64_C(0x7FFF800000000000);
+    return uiZ;
+}
+
+/*----------------------------------------------------------------------------
+| Assuming the unsigned integer formed from concatenating `uiA64' and `uiA0'
+| has the bit pattern of a 128-bit floating-point NaN, converts this NaN to
+| the common NaN form, and stores the resulting common NaN at the location
+| pointed to by `zPtr'.  If the NaN is a signaling NaN, the invalid exception
+| is raised.
+*----------------------------------------------------------------------------*/
+void
+ softfloat_f128UIToCommonNaN(uint64_t uiA64, uint64_t uiA0, struct commonNaN *zPtr, struct softfloat_status_t *status)
+{
+    struct uint128 NaNSig;
+
+    if (softfloat_isSigNaNF128UI(uiA64, uiA0)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+    }
+    NaNSig = softfloat_shortShiftLeft128(uiA64, uiA0, 16);
+    zPtr->sign = uiA64>>63;
+    zPtr->v64  = NaNSig.v64;
+    zPtr->v0   = NaNSig.v0;
+}
diff --git a/src/cpu/softfloat3e/s_commonNaNToF16UI.c b/src/cpu/softfloat3e/s_commonNaNToF16UI.c
new file mode 100644
index 000000000..20da6a04f
--- /dev/null
+++ b/src/cpu/softfloat3e/s_commonNaNToF16UI.c
@@ -0,0 +1,62 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "specialize.h"
+
+/*----------------------------------------------------------------------------
+| Converts the common NaN pointed to by `aPtr' into a 16-bit floating-point
+| NaN, and returns the bit pattern of this value as an unsigned integer.
+*----------------------------------------------------------------------------*/
+uint16_t softfloat_commonNaNToF16UI(const struct commonNaN *aPtr)
+{
+    return (uint16_t) aPtr->sign<<15 | 0x7E00 | aPtr->v64>>54;
+}
+
+/*----------------------------------------------------------------------------
+| Assuming `uiA' has the bit pattern of a 16-bit floating-point NaN, converts
+| this NaN to the common NaN form, and stores the resulting common NaN at the
+| location pointed to by `zPtr'.  If the NaN is a signaling NaN, the invalid
+| exception is raised.
+*----------------------------------------------------------------------------*/
+void softfloat_f16UIToCommonNaN(uint16_t uiA, struct commonNaN *zPtr, struct softfloat_status_t *status)
+{
+    if (softfloat_isSigNaNF16UI(uiA)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+    }
+    zPtr->sign = uiA>>15;
+    zPtr->v64  = (uint64_t) uiA<<54;
+    zPtr->v0   = 0;
+}
diff --git a/src/cpu/softfloat3e/s_commonNaNToF32UI.c b/src/cpu/softfloat3e/s_commonNaNToF32UI.c
new file mode 100644
index 000000000..866ebb8f8
--- /dev/null
+++ b/src/cpu/softfloat3e/s_commonNaNToF32UI.c
@@ -0,0 +1,62 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "specialize.h"
+
+/*----------------------------------------------------------------------------
+| Converts the common NaN pointed to by `aPtr' into a 32-bit floating-point
+| NaN, and returns the bit pattern of this value as an unsigned integer.
+*----------------------------------------------------------------------------*/
+uint32_t softfloat_commonNaNToF32UI(const struct commonNaN *aPtr)
+{
+    return (uint32_t) aPtr->sign<<31 | 0x7FC00000 | aPtr->v64>>41;
+}
+
+/*----------------------------------------------------------------------------
+| Assuming `uiA' has the bit pattern of a 32-bit floating-point NaN, converts
+| this NaN to the common NaN form, and stores the resulting common NaN at the
+| location pointed to by `zPtr'.  If the NaN is a signaling NaN, the invalid
+| exception is raised.
+*----------------------------------------------------------------------------*/
+void softfloat_f32UIToCommonNaN(uint32_t uiA, struct commonNaN *zPtr, struct softfloat_status_t *status)
+{
+    if (softfloat_isSigNaNF32UI(uiA)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+    }
+    zPtr->sign = uiA>>31;
+    zPtr->v64  = (uint64_t) uiA<<41;
+    zPtr->v0   = 0;
+}
diff --git a/src/cpu/softfloat3e/s_commonNaNToF64UI.c b/src/cpu/softfloat3e/s_commonNaNToF64UI.c
new file mode 100644
index 000000000..8e73f68f4
--- /dev/null
+++ b/src/cpu/softfloat3e/s_commonNaNToF64UI.c
@@ -0,0 +1,62 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "specialize.h"
+
+/*----------------------------------------------------------------------------
+| Converts the common NaN pointed to by `aPtr' into a 64-bit floating-point
+| NaN, and returns the bit pattern of this value as an unsigned integer.
+*----------------------------------------------------------------------------*/
+uint64_t softfloat_commonNaNToF64UI(const struct commonNaN *aPtr)
+{
+    return (uint64_t) aPtr->sign<<63 | UINT64_C(0x7FF8000000000000) | aPtr->v64>>12;
+}
+
+/*----------------------------------------------------------------------------
+| Assuming `uiA' has the bit pattern of a 64-bit floating-point NaN, converts
+| this NaN to the common NaN form, and stores the resulting common NaN at the
+| location pointed to by `zPtr'.  If the NaN is a signaling NaN, the invalid
+| exception is raised.
+*----------------------------------------------------------------------------*/
+void softfloat_f64UIToCommonNaN(uint64_t uiA, struct commonNaN *zPtr, struct softfloat_status_t *status)
+{
+    if (softfloat_isSigNaNF64UI(uiA)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+    }
+    zPtr->sign = uiA>>63;
+    zPtr->v64  = uiA<<12;
+    zPtr->v0   = 0;
+}
diff --git a/src/cpu/softfloat3e/s_countLeadingZeros16.c b/src/cpu/softfloat3e/s_countLeadingZeros16.c
new file mode 100644
index 000000000..ffbb9c943
--- /dev/null
+++ b/src/cpu/softfloat3e/s_countLeadingZeros16.c
@@ -0,0 +1,56 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+
+#ifndef softfloat_countLeadingZeros16
+
+#define softfloat_countLeadingZeros16 softfloat_countLeadingZeros16
+#include "primitives.h"
+
+uint8_t softfloat_countLeadingZeros16(uint16_t a)
+{
+    uint8_t count;
+
+    count = 8;
+    if (0x100 <= a) {
+        count = 0;
+        a >>= 8;
+    }
+    count += softfloat_countLeadingZeros8[a];
+    return count;
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_countLeadingZeros32.c b/src/cpu/softfloat3e/s_countLeadingZeros32.c
new file mode 100644
index 000000000..3f594137f
--- /dev/null
+++ b/src/cpu/softfloat3e/s_countLeadingZeros32.c
@@ -0,0 +1,61 @@
+
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+
+#ifndef softfloat_countLeadingZeros32
+
+#define softfloat_countLeadingZeros32 softfloat_countLeadingZeros32
+#include "primitives.h"
+
+uint8_t softfloat_countLeadingZeros32(uint32_t a)
+{
+    uint8_t count;
+
+    count = 0;
+    if (a < 0x10000) {
+        count = 16;
+        a <<= 16;
+    }
+    if (a < 0x1000000) {
+        count += 8;
+        a <<= 8;
+    }
+    count += softfloat_countLeadingZeros8[a>>24];
+    return count;
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_countLeadingZeros64.c b/src/cpu/softfloat3e/s_countLeadingZeros64.c
new file mode 100644
index 000000000..c96c4ec8c
--- /dev/null
+++ b/src/cpu/softfloat3e/s_countLeadingZeros64.c
@@ -0,0 +1,70 @@
+
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+
+#ifndef softfloat_countLeadingZeros64
+
+#define softfloat_countLeadingZeros64 softfloat_countLeadingZeros64
+#include "primitives.h"
+
+uint8_t softfloat_countLeadingZeros64(uint64_t a)
+{
+    uint8_t count;
+    uint32_t a32;
+
+    count = 0;
+    a32 = a>>32;
+    if (! a32) {
+        count = 32;
+        a32 = a;
+    }
+    /*------------------------------------------------------------------------
+    | From here, result is current count + count leading zeros of `a32'.
+    *------------------------------------------------------------------------*/
+    if (a32 < 0x10000) {
+        count += 16;
+        a32 <<= 16;
+    }
+    if (a32 < 0x1000000) {
+        count += 8;
+        a32 <<= 8;
+    }
+    count += softfloat_countLeadingZeros8[a32>>24];
+    return count;
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_countLeadingZeros8.c b/src/cpu/softfloat3e/s_countLeadingZeros8.c
new file mode 100644
index 000000000..873ab81ef
--- /dev/null
+++ b/src/cpu/softfloat3e/s_countLeadingZeros8.c
@@ -0,0 +1,57 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "primitives.h"
+
+const uint_least8_t softfloat_countLeadingZeros8[256] = {
+    8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
diff --git a/src/cpu/softfloat3e/s_eq128.c b/src/cpu/softfloat3e/s_eq128.c
new file mode 100644
index 000000000..45495dd92
--- /dev/null
+++ b/src/cpu/softfloat3e/s_eq128.c
@@ -0,0 +1,46 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifndef softfloat_eq128
+
+bool softfloat_eq128(uint64_t a64, uint64_t a0, uint64_t b64, uint64_t b0)
+{
+    return (a64 == b64) && (a0 == b0);
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_le128.c b/src/cpu/softfloat3e/s_le128.c
new file mode 100644
index 000000000..d299b5e92
--- /dev/null
+++ b/src/cpu/softfloat3e/s_le128.c
@@ -0,0 +1,46 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifndef softfloat_le128
+
+bool softfloat_le128(uint64_t a64, uint64_t a0, uint64_t b64, uint64_t b0)
+{
+    return (a64 < b64) || ((a64 == b64) && (a0 <= b0));
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_lt128.c b/src/cpu/softfloat3e/s_lt128.c
new file mode 100644
index 000000000..225c23356
--- /dev/null
+++ b/src/cpu/softfloat3e/s_lt128.c
@@ -0,0 +1,46 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifndef softfloat_lt128
+
+bool softfloat_lt128(uint64_t a64, uint64_t a0, uint64_t b64, uint64_t b0)
+{
+    return (a64 < b64) || ((a64 == b64) && (a0 < b0));
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_mul128By32.cc b/src/cpu/softfloat3e/s_mul128By32.cc
new file mode 100644
index 000000000..920ad5733
--- /dev/null
+++ b/src/cpu/softfloat3e/s_mul128By32.cc
@@ -0,0 +1,54 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "softfloat_types.h"
+
+#ifndef softfloat_mul128By32
+
+struct uint128 softfloat_mul128By32(uint64_t a64, uint64_t a0, uint32_t b)
+{
+    struct uint128 z;
+    uint64_t mid;
+    uint32_t carry;
+
+    z.v0 = a0 * b;
+    mid = (uint64_t) (uint32_t) (a0>>32) * b;
+    carry = (uint32_t) ((uint32_t) (z.v0>>32) - (uint32_t) mid);
+    z.v64 = a64 * b + (uint32_t) ((mid + carry)>>32);
+    return z;
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_mul128To256M.cc b/src/cpu/softfloat3e/s_mul128To256M.cc
new file mode 100644
index 000000000..04b25a575
--- /dev/null
+++ b/src/cpu/softfloat3e/s_mul128To256M.cc
@@ -0,0 +1,62 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+
+#include "primitives.h"
+#include "primitiveTypes.h"
+
+void softfloat_mul128To256M(uint64_t a64, uint64_t a0, uint64_t b64, uint64_t b0, uint64_t *zPtr)
+{
+    struct uint128 p0, p64, p128;
+    uint64_t z64, z128, z192;
+
+    p0 = softfloat_mul64To128(a0, b0);
+    zPtr[indexWord(4, 0)] = p0.v0;
+    p64 = softfloat_mul64To128(a64, b0);
+    z64 = p64.v0 + p0.v64;
+    z128 = p64.v64 + (z64 < p64.v0);
+    p128 = softfloat_mul64To128(a64, b64);
+    z128 += p128.v0;
+    z192 = p128.v64 + (z128 < p128.v0);
+    p64 = softfloat_mul64To128(a0, b64);
+    z64 += p64.v0;
+    zPtr[indexWord(4, 1)] = z64;
+    p64.v64 += (z64 < p64.v0);
+    z128 += p64.v64;
+    zPtr[indexWord(4, 2)] = z128;
+    zPtr[indexWord(4, 3)] = z192 + (z128 < p64.v64);
+}
+
diff --git a/src/cpu/softfloat3e/s_mul64ByShifted32To128.cc b/src/cpu/softfloat3e/s_mul64ByShifted32To128.cc
new file mode 100644
index 000000000..90938ac79
--- /dev/null
+++ b/src/cpu/softfloat3e/s_mul64ByShifted32To128.cc
@@ -0,0 +1,52 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "softfloat_types.h"
+
+#ifndef softfloat_mul64ByShifted32To128
+
+struct uint128 softfloat_mul64ByShifted32To128(uint64_t a, uint32_t b)
+{
+    uint64_t mid;
+    struct uint128 z;
+
+    mid = (uint64_t) (uint32_t) a * b;
+    z.v0 = mid<<32;
+    z.v64 = (uint64_t) (uint32_t) (a>>32) * b + (mid>>32);
+    return z;
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_mul64To128.cc b/src/cpu/softfloat3e/s_mul64To128.cc
new file mode 100644
index 000000000..d1ab9296a
--- /dev/null
+++ b/src/cpu/softfloat3e/s_mul64To128.cc
@@ -0,0 +1,63 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "softfloat_types.h"
+#include "primitives.h"
+
+#ifndef softfloat_mul64To128
+
+struct uint128 softfloat_mul64To128(uint64_t a, uint64_t b)
+{
+    uint32_t a32, a0, b32, b0;
+    struct uint128 z;
+    uint64_t mid1, mid;
+
+    a32 = a>>32;
+    a0 = a;
+    b32 = b>>32;
+    b0 = b;
+    z.v0 = (uint64_t) a0 * b0;
+    mid1 = (uint64_t) a32 * b0;
+    mid = mid1 + (uint64_t) a0 * b32;
+    z.v64 = (uint64_t) a32 * b32;
+    z.v64 += (uint64_t) (mid < mid1)<<32 | mid>>32;
+    mid <<= 32;
+    z.v0 += mid;
+    z.v64 += (z.v0 < mid);
+    return z;
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_normRoundPackToExtF80.cc b/src/cpu/softfloat3e/s_normRoundPackToExtF80.cc
new file mode 100644
index 000000000..753f76184
--- /dev/null
+++ b/src/cpu/softfloat3e/s_normRoundPackToExtF80.cc
@@ -0,0 +1,62 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+
+extFloat80_t softfloat_normRoundPackToExtF80(bool sign, int32_t exp,
+     uint64_t sig,
+     uint64_t sigExtra,
+     uint8_t roundingPrecision,
+     struct softfloat_status_t *status)
+{
+    int8_t shiftDist;
+    struct uint128 sig128;
+
+    if (! sig) {
+        exp -= 64;
+        sig = sigExtra;
+        sigExtra = 0;
+    }
+    shiftDist = softfloat_countLeadingZeros64(sig);
+    exp -= shiftDist;
+    if (shiftDist) {
+        sig128 = softfloat_shortShiftLeft128(sig, sigExtra, shiftDist);
+        sig = sig128.v64;
+        sigExtra = sig128.v0;
+    }
+    return softfloat_roundPackToExtF80(sign, exp, sig, sigExtra, roundingPrecision, status);
+}
diff --git a/src/cpu/softfloat3e/s_normRoundPackToF128.cc b/src/cpu/softfloat3e/s_normRoundPackToF128.cc
new file mode 100644
index 000000000..14db1ce9b
--- /dev/null
+++ b/src/cpu/softfloat3e/s_normRoundPackToF128.cc
@@ -0,0 +1,75 @@
+
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+
+float128_t softfloat_normRoundPackToF128(bool sign, int32_t exp, uint64_t sig64, uint64_t sig0, struct softfloat_status_t *status)
+{
+    int8_t shiftDist;
+    struct uint128 sig128;
+    uint64_t sigExtra;
+    struct uint128_extra sig128Extra;
+    float128_t z;
+
+    if (! sig64) {
+        exp -= 64;
+        sig64 = sig0;
+        sig0 = 0;
+    }
+    shiftDist = softfloat_countLeadingZeros64(sig64) - 15;
+    exp -= shiftDist;
+    if (0 <= shiftDist) {
+        if (shiftDist) {
+            sig128 = softfloat_shortShiftLeft128(sig64, sig0, shiftDist);
+            sig64 = sig128.v64;
+            sig0  = sig128.v0;
+        }
+        if ((uint32_t) exp < 0x7FFD) {
+            z.v64 = packToF128UI64(sign, sig64 | sig0 ? exp : 0, sig64);
+            z.v0  = sig0;
+            return z;
+        }
+        sigExtra = 0;
+    } else {
+        sig128Extra = softfloat_shortShiftRightJam128Extra(sig64, sig0, 0, -shiftDist);
+        sig64 = sig128Extra.v.v64;
+        sig0  = sig128Extra.v.v0;
+        sigExtra = sig128Extra.extra;
+    }
+    return softfloat_roundPackToF128(sign, exp, sig64, sig0, sigExtra, status);
+}
diff --git a/src/cpu/softfloat3e/s_normRoundPackToF16.c b/src/cpu/softfloat3e/s_normRoundPackToF16.c
new file mode 100644
index 000000000..36ae237fa
--- /dev/null
+++ b/src/cpu/softfloat3e/s_normRoundPackToF16.c
@@ -0,0 +1,49 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+
+float16 softfloat_normRoundPackToF16(bool sign, int16_t exp, uint16_t sig, struct softfloat_status_t *status)
+{
+    int8_t shiftDist = softfloat_countLeadingZeros16(sig) - 1;
+    exp -= shiftDist;
+    if ((4 <= shiftDist) && ((unsigned int) exp < 0x1D)) {
+        return packToF16UI(sign, sig ? exp : 0, sig<<(shiftDist - 4));
+    } else {
+        return softfloat_roundPackToF16(sign, exp, sig<<shiftDist, status);
+    }
+}
diff --git a/src/cpu/softfloat3e/s_normRoundPackToF32.c b/src/cpu/softfloat3e/s_normRoundPackToF32.c
new file mode 100644
index 000000000..a85474382
--- /dev/null
+++ b/src/cpu/softfloat3e/s_normRoundPackToF32.c
@@ -0,0 +1,49 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+
+float32 softfloat_normRoundPackToF32(bool sign, int16_t exp, uint32_t sig, struct softfloat_status_t *status)
+{
+    int8_t shiftDist = softfloat_countLeadingZeros32(sig) - 1;
+    exp -= shiftDist;
+    if ((7 <= shiftDist) && ((unsigned int) exp < 0xFD)) {
+        return packToF32UI(sign, sig ? exp : 0, sig<<(shiftDist - 7));
+    } else {
+        return softfloat_roundPackToF32(sign, exp, sig<<shiftDist, status);
+    }
+}
diff --git a/src/cpu/softfloat3e/s_normRoundPackToF64.c b/src/cpu/softfloat3e/s_normRoundPackToF64.c
new file mode 100644
index 000000000..f0efd680c
--- /dev/null
+++ b/src/cpu/softfloat3e/s_normRoundPackToF64.c
@@ -0,0 +1,49 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+
+float64 softfloat_normRoundPackToF64(bool sign, int16_t exp, uint64_t sig, struct softfloat_status_t *status)
+{
+    int8_t shiftDist = softfloat_countLeadingZeros64(sig) - 1;
+    exp -= shiftDist;
+    if ((10 <= shiftDist) && ((unsigned int) exp < 0x7FD)) {
+        return packToF64UI(sign, sig ? exp : 0, sig<<(shiftDist - 10));
+    } else {
+        return softfloat_roundPackToF64(sign, exp, sig<<shiftDist, status);
+    }
+}
diff --git a/src/cpu/softfloat3e/s_normSubnormalExtF80Sig.cc b/src/cpu/softfloat3e/s_normSubnormalExtF80Sig.cc
new file mode 100644
index 000000000..a8a958575
--- /dev/null
+++ b/src/cpu/softfloat3e/s_normSubnormalExtF80Sig.cc
@@ -0,0 +1,50 @@
+
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+
+struct exp32_sig64 softfloat_normSubnormalExtF80Sig(uint64_t sig)
+{
+    int8_t shiftDist;
+    struct exp32_sig64 z;
+
+    shiftDist = softfloat_countLeadingZeros64(sig);
+    z.exp = -shiftDist;
+    z.sig = sig<<shiftDist;
+    return z;
+}
diff --git a/src/cpu/softfloat3e/s_normSubnormalF128Sig.cc b/src/cpu/softfloat3e/s_normSubnormalF128Sig.cc
new file mode 100644
index 000000000..362739747
--- /dev/null
+++ b/src/cpu/softfloat3e/s_normSubnormalF128Sig.cc
@@ -0,0 +1,61 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+
+struct exp32_sig128 softfloat_normSubnormalF128Sig(uint64_t sig64, uint64_t sig0)
+{
+    int8_t shiftDist;
+    struct exp32_sig128 z;
+
+    if (! sig64) {
+        shiftDist = softfloat_countLeadingZeros64(sig0) - 15;
+        z.exp = -63 - shiftDist;
+        if (shiftDist < 0) {
+            z.sig.v64 = sig0>>-shiftDist;
+            z.sig.v0  = sig0<<(shiftDist & 63);
+        } else {
+            z.sig.v64 = sig0<<shiftDist;
+            z.sig.v0  = 0;
+        }
+    } else {
+        shiftDist = softfloat_countLeadingZeros64(sig64) - 15;
+        z.exp = 1 - shiftDist;
+        z.sig = softfloat_shortShiftLeft128(sig64, sig0, shiftDist);
+    }
+    return z;
+}
diff --git a/src/cpu/softfloat3e/s_normSubnormalF16Sig.c b/src/cpu/softfloat3e/s_normSubnormalF16Sig.c
new file mode 100644
index 000000000..84c86715a
--- /dev/null
+++ b/src/cpu/softfloat3e/s_normSubnormalF16Sig.c
@@ -0,0 +1,50 @@
+
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+
+struct exp8_sig16 softfloat_normSubnormalF16Sig(uint16_t sig)
+{
+    int8_t shiftDist;
+    struct exp8_sig16 z;
+
+    shiftDist = softfloat_countLeadingZeros16(sig) - 5;
+    z.exp = 1 - shiftDist;
+    z.sig = sig<<shiftDist;
+    return z;
+}
diff --git a/src/cpu/softfloat3e/s_normSubnormalF32Sig.c b/src/cpu/softfloat3e/s_normSubnormalF32Sig.c
new file mode 100644
index 000000000..1ae4ec74c
--- /dev/null
+++ b/src/cpu/softfloat3e/s_normSubnormalF32Sig.c
@@ -0,0 +1,51 @@
+
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+
+struct exp16_sig32 softfloat_normSubnormalF32Sig(uint32_t sig)
+{
+    int8_t shiftDist;
+    struct exp16_sig32 z;
+
+    shiftDist = softfloat_countLeadingZeros32(sig) - 8;
+    z.exp = 1 - shiftDist;
+    z.sig = sig<<shiftDist;
+    return z;
+}
+
diff --git a/src/cpu/softfloat3e/s_normSubnormalF64Sig.c b/src/cpu/softfloat3e/s_normSubnormalF64Sig.c
new file mode 100644
index 000000000..d1429ae80
--- /dev/null
+++ b/src/cpu/softfloat3e/s_normSubnormalF64Sig.c
@@ -0,0 +1,49 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+
+struct exp16_sig64 softfloat_normSubnormalF64Sig(uint64_t sig)
+{
+    int8_t shiftDist;
+    struct exp16_sig64 z;
+
+    shiftDist = softfloat_countLeadingZeros64(sig) - 11;
+    z.exp = 1 - shiftDist;
+    z.sig = sig<<shiftDist;
+    return z;
+}
diff --git a/src/cpu/softfloat3e/s_packToExtF80.cc b/src/cpu/softfloat3e/s_packToExtF80.cc
new file mode 100644
index 000000000..d476179a1
--- /dev/null
+++ b/src/cpu/softfloat3e/s_packToExtF80.cc
@@ -0,0 +1,54 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2017 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "softfloat.h"
+
+extFloat80_t packToExtF80_twoargs(uint16_t signExp, uint64_t sig)
+{
+    extFloat80_t z;
+    z.signExp = signExp;
+    z.signif  = sig;
+    return z;
+}
+
+extFloat80_t packToExtF80(bool sign, uint16_t exp, uint64_t sig)
+{
+    extFloat80_t z;
+    z.signExp = packToExtF80UI64(sign, exp);
+    z.signif = sig;
+    return z;
+}
diff --git a/src/cpu/softfloat3e/s_propagateNaNExtF80UI.cc b/src/cpu/softfloat3e/s_propagateNaNExtF80UI.cc
new file mode 100644
index 000000000..77d699bb0
--- /dev/null
+++ b/src/cpu/softfloat3e/s_propagateNaNExtF80UI.cc
@@ -0,0 +1,96 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2018 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Interpreting the unsigned integer formed from concatenating 'uiA64' and
+| 'uiA0' as an 80-bit extended floating-point value, and likewise interpreting
+| the unsigned integer formed from concatenating 'uiB64' and 'uiB0' as another
+| 80-bit extended floating-point value, and assuming at least on of these
+| floating-point values is a NaN, returns the bit pattern of the combined NaN
+| result.  If either original floating-point value is a signaling NaN, the
+| invalid exception is raised.
+*----------------------------------------------------------------------------*/
+extFloat80_t
+softfloat_propagateNaNExtF80UI(uint16_t uiA64, uint64_t uiA0, uint16_t uiB64, uint64_t uiB0, struct softfloat_status_t *status)
+{
+    bool isSigNaNA, isSigNaNB;
+    uint64_t uiNonsigA0, uiNonsigB0;
+    uint16_t uiMagA64, uiMagB64;
+    extFloat80_t z;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    isSigNaNA = softfloat_isSigNaNExtF80UI(uiA64, uiA0);
+    isSigNaNB = softfloat_isSigNaNExtF80UI(uiB64, uiB0);
+    /*------------------------------------------------------------------------
+    | Make NaNs non-signaling.
+    *------------------------------------------------------------------------*/
+    uiNonsigA0 = uiA0 | UINT64_C(0xC000000000000000);
+    uiNonsigB0 = uiB0 | UINT64_C(0xC000000000000000);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (isSigNaNA | isSigNaNB) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        if (isSigNaNA) {
+            if (isSigNaNB) goto returnLargerMag;
+            if (isNaNExtF80UI(uiB64, uiB0)) goto returnB;
+            goto returnA;
+        } else {
+            if (isNaNExtF80UI(uiA64, uiA0)) goto returnA;
+            goto returnB;
+        }
+    }
+ returnLargerMag:
+    uiMagA64 = uiA64 & 0x7FFF;
+    uiMagB64 = uiB64 & 0x7FFF;
+    if (uiMagA64 < uiMagB64) goto returnB;
+    if (uiMagB64 < uiMagA64) goto returnA;
+    if (uiA0 < uiB0) goto returnB;
+    if (uiB0 < uiA0) goto returnA;
+    if (uiA64 < uiB64) goto returnA;
+ returnB:
+    z.signExp = uiB64;
+    z.signif  = uiNonsigB0;
+    return z;
+ returnA:
+    z.signExp = uiA64;
+    z.signif  = uiNonsigA0;
+    return z;
+}
diff --git a/src/cpu/softfloat3e/s_propagateNaNF128UI.cc b/src/cpu/softfloat3e/s_propagateNaNF128UI.cc
new file mode 100644
index 000000000..83a7c2413
--- /dev/null
+++ b/src/cpu/softfloat3e/s_propagateNaNF128UI.cc
@@ -0,0 +1,78 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Interpreting the unsigned integer formed from concatenating `uiA64' and
+| `uiA0' as a 128-bit floating-point value, and likewise interpreting the
+| unsigned integer formed from concatenating `uiB64' and `uiB0' as another
+| 128-bit floating-point value, and assuming at least on of these floating-
+| point values is a NaN, returns the bit pattern of the combined NaN result.
+| If either original floating-point value is a signaling NaN, the invalid
+| exception is raised.
+*----------------------------------------------------------------------------*/
+struct uint128
+ softfloat_propagateNaNF128UI(
+     uint64_t uiA64,
+     uint64_t uiA0,
+     uint64_t uiB64,
+     uint64_t uiB0,
+     struct softfloat_status_t *status
+)
+{
+    bool isSigNaNA;
+    struct uint128 uiZ;
+
+    isSigNaNA = softfloat_isSigNaNF128UI(uiA64, uiA0);
+    if (isSigNaNA || softfloat_isSigNaNF128UI(uiB64, uiB0)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        if (isSigNaNA) goto returnNonsigA;
+    }
+    if (isNaNF128UI(uiA64, uiA0)) {
+ returnNonsigA:
+        uiZ.v64 = uiA64;
+        uiZ.v0  = uiA0;
+    } else {
+        uiZ.v64 = uiB64;
+        uiZ.v0  = uiB0;
+    }
+    uiZ.v64 |= UINT64_C(0x0000800000000000);
+    return uiZ;
+}
diff --git a/src/cpu/softfloat3e/s_propagateNaNF16UI.c b/src/cpu/softfloat3e/s_propagateNaNF16UI.c
new file mode 100644
index 000000000..0a92c57f0
--- /dev/null
+++ b/src/cpu/softfloat3e/s_propagateNaNF16UI.c
@@ -0,0 +1,57 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Interpreting `uiA' and `uiB' as the bit patterns of two 16-bit floating-
+| point values, at least one of which is a NaN, returns the bit pattern of
+| the combined NaN result.  If either `uiA' or `uiB' has the pattern of a
+| signaling NaN, the invalid exception is raised.
+*----------------------------------------------------------------------------*/
+uint16_t softfloat_propagateNaNF16UI(uint16_t uiA, uint16_t uiB, struct softfloat_status_t *status)
+{
+    bool isSigNaNA;
+
+    isSigNaNA = softfloat_isSigNaNF16UI(uiA);
+    if (isSigNaNA || softfloat_isSigNaNF16UI(uiB)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        if (isSigNaNA) return uiA | 0x0200;
+    }
+    return (isNaNF16UI(uiA) ? uiA : uiB) | 0x0200;
+}
diff --git a/src/cpu/softfloat3e/s_propagateNaNF32UI.c b/src/cpu/softfloat3e/s_propagateNaNF32UI.c
new file mode 100644
index 000000000..d5db3d24e
--- /dev/null
+++ b/src/cpu/softfloat3e/s_propagateNaNF32UI.c
@@ -0,0 +1,57 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Interpreting `uiA' and `uiB' as the bit patterns of two 32-bit floating-
+| point values, at least one of which is a NaN, returns the bit pattern of
+| the combined NaN result.  If either `uiA' or `uiB' has the pattern of a
+| signaling NaN, the invalid exception is raised.
+*----------------------------------------------------------------------------*/
+uint32_t softfloat_propagateNaNF32UI(uint32_t uiA, uint32_t uiB, struct softfloat_status_t *status)
+{
+    bool isSigNaNA;
+
+    isSigNaNA = softfloat_isSigNaNF32UI(uiA);
+    if (isSigNaNA || softfloat_isSigNaNF32UI(uiB)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        if (isSigNaNA) return uiA | 0x00400000;
+    }
+    return (isNaNF32UI(uiA) ? uiA : uiB) | 0x00400000;
+}
diff --git a/src/cpu/softfloat3e/s_propagateNaNF64UI.c b/src/cpu/softfloat3e/s_propagateNaNF64UI.c
new file mode 100644
index 000000000..3bb2ead86
--- /dev/null
+++ b/src/cpu/softfloat3e/s_propagateNaNF64UI.c
@@ -0,0 +1,57 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Interpreting `uiA' and `uiB' as the bit patterns of two 64-bit floating-
+| point values, at least one of which is a NaN, returns the bit pattern of
+| the combined NaN result.  If either `uiA' or `uiB' has the pattern of a
+| signaling NaN, the invalid exception is raised.
+*----------------------------------------------------------------------------*/
+uint64_t softfloat_propagateNaNF64UI(uint64_t uiA, uint64_t uiB, struct softfloat_status_t *status)
+{
+    bool isSigNaNA;
+
+    isSigNaNA = softfloat_isSigNaNF64UI(uiA);
+    if (isSigNaNA || softfloat_isSigNaNF64UI(uiB)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        if (isSigNaNA) return uiA | UINT64_C(0x0008000000000000);
+    }
+    return (isNaNF64UI(uiA) ? uiA : uiB) | UINT64_C(0x0008000000000000);
+}
diff --git a/src/cpu/softfloat3e/s_roundPackToExtF80.cc b/src/cpu/softfloat3e/s_roundPackToExtF80.cc
new file mode 100644
index 000000000..ec63283e1
--- /dev/null
+++ b/src/cpu/softfloat3e/s_roundPackToExtF80.cc
@@ -0,0 +1,224 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2017 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+extFloat80_t
+ softfloat_roundPackToExtF80(bool sign, int32_t exp, uint64_t sig, uint64_t sigExtra, uint8_t roundingPrecision, struct softfloat_status_t *status)
+{
+    uint8_t roundingMode;
+    bool roundNearEven;
+    uint64_t roundIncrement, roundMask, roundBits;
+    bool isTiny, doIncrement;
+    struct uint64_extra sig64Extra;
+    uint64_t sigExact;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    roundingMode = softfloat_getRoundingMode(status);
+    roundNearEven = (roundingMode == softfloat_round_near_even);
+    if (roundingPrecision == 80) goto precision80;
+    if (roundingPrecision == 64) {
+        roundIncrement = UINT64_C(0x0000000000000400);
+        roundMask = UINT64_C(0x00000000000007FF);
+    } else if (roundingPrecision == 32) {
+        roundIncrement = UINT64_C(0x0000008000000000);
+        roundMask = UINT64_C(0x000000FFFFFFFFFF);
+    } else {
+        goto precision80;
+    }
+    sig |= (sigExtra != 0);
+    if (! roundNearEven && (roundingMode != softfloat_round_near_maxMag)) {
+        roundIncrement =
+            (roundingMode == (sign ? softfloat_round_min : softfloat_round_max)) ? roundMask : 0;
+    }
+    roundBits = sig & roundMask;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (0x7FFD <= (uint32_t) (exp - 1)) {
+        if (exp <= 0) {
+            /*----------------------------------------------------------------
+            *----------------------------------------------------------------*/
+            isTiny = (exp < 0) || (sig <= (uint64_t) (sig + roundIncrement));
+            if (isTiny && sig && ! softfloat_isMaskedException(status, softfloat_flag_underflow)) {
+                softfloat_raiseFlags(status, softfloat_flag_underflow);
+                exp += 0x6000;
+            }
+            else {
+                sig = softfloat_shiftRightJam64(sig, 1 - exp);
+                roundBits = sig & roundMask;
+                sigExact = sig;
+                sig += roundIncrement;
+                exp = ((sig & UINT64_C(0x8000000000000000)) != 0);
+                roundIncrement = roundMask + 1;
+                if (roundNearEven && (roundBits<<1 == roundIncrement)) {
+                    roundMask |= roundIncrement;
+                }
+                sig &= ~roundMask;
+                if (roundBits) {
+                    softfloat_raiseFlags(status, softfloat_flag_inexact);
+                    if (sig > sigExact) softfloat_setRoundingUp(status);
+                    if (isTiny)
+                        softfloat_raiseFlags(status, softfloat_flag_underflow);
+                }
+                return packToExtF80(sign, exp, sig);
+            }
+        }
+        if ((0x7FFE < exp) || ((exp == 0x7FFE) && ((uint64_t) (sig + roundIncrement) < sig))) {
+            if (! softfloat_isMaskedException(status, softfloat_flag_overflow)) {
+                softfloat_raiseFlags(status, softfloat_flag_overflow);
+                exp -= 0x6000;
+            }
+            if ((0x7FFE < exp) || ((exp == 0x7FFE) && ((uint64_t) (sig + roundIncrement) < sig))) {
+                goto overflow;
+            }
+        }
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sigExact = sig;
+    sig = (uint64_t) (sig + roundIncrement);
+    if (sig < roundIncrement) {
+        ++exp;
+        sig = UINT64_C(0x8000000000000000);
+        sigExact >>= 1; // must scale also, or else later tests will fail
+    }
+    roundIncrement = roundMask + 1;
+    if (roundNearEven && (roundBits<<1 == roundIncrement)) {
+        roundMask |= roundIncrement;
+    }
+    sig &= ~roundMask;
+    if (roundBits) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+        if (sig > sigExact) softfloat_setRoundingUp(status);
+    }
+    return packToExtF80(sign, exp, sig);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ precision80:
+    doIncrement = (UINT64_C(0x8000000000000000) <= sigExtra);
+    if (! roundNearEven && (roundingMode != softfloat_round_near_maxMag)) {
+        doIncrement =
+            (roundingMode == (sign ? softfloat_round_min : softfloat_round_max)) && sigExtra;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (0x7FFD <= (uint32_t) (exp - 1)) {
+        if (exp <= 0) {
+            /*----------------------------------------------------------------
+            *----------------------------------------------------------------*/
+            isTiny = (exp < 0) || ! doIncrement || (sig < UINT64_C(0xFFFFFFFFFFFFFFFF));
+            if (isTiny && sig && ! softfloat_isMaskedException(status, softfloat_flag_underflow)) {
+                softfloat_raiseFlags(status, softfloat_flag_underflow);
+                exp += 0x6000;
+            }
+            else {
+                sig64Extra = softfloat_shiftRightJam64Extra(sig, sigExtra, 1 - exp);
+                exp = 0;
+                sig = sig64Extra.v;
+                sigExtra = sig64Extra.extra;
+                if (sigExtra) {
+                    softfloat_raiseFlags(status, softfloat_flag_inexact);
+                    if (isTiny)
+                        softfloat_raiseFlags(status, softfloat_flag_underflow);
+                }
+                doIncrement = (UINT64_C(0x8000000000000000) <= sigExtra);
+                if (! roundNearEven && (roundingMode != softfloat_round_near_maxMag)) {
+                    doIncrement =
+                        (roundingMode == (sign ? softfloat_round_min : softfloat_round_max)) && sigExtra;
+                }
+                if (doIncrement) {
+                    sigExact = sig;
+                    ++sig;
+                    sig &= ~(uint64_t) (! (sigExtra & UINT64_C(0x7FFFFFFFFFFFFFFF)) & roundNearEven);
+                    exp = ((sig & UINT64_C(0x8000000000000000)) != 0);
+                    if (sig > sigExact)
+                        softfloat_setRoundingUp(status);
+                }
+                return packToExtF80(sign, exp, sig);
+            }
+        }
+        if ((0x7FFE < exp) || ((exp == 0x7FFE) && (sig == UINT64_C(0xFFFFFFFFFFFFFFFF)) && doIncrement)) {
+            if (! softfloat_isMaskedException(status, softfloat_flag_overflow)) {
+                softfloat_raiseFlags(status, softfloat_flag_overflow);
+                exp -= 0x6000;
+            }
+            if ((0x7FFE < exp) || ((exp == 0x7FFE) && (sig == UINT64_C(0xFFFFFFFFFFFFFFFF)) && doIncrement)) {
+                /*----------------------------------------------------------------
+                *----------------------------------------------------------------*/
+                roundMask = 0;
+ overflow:
+                softfloat_raiseFlags(status, softfloat_flag_overflow | softfloat_flag_inexact);
+                if (roundNearEven
+                    || (roundingMode == softfloat_round_near_maxMag)
+                    || (roundingMode == (sign ? softfloat_round_min : softfloat_round_max))
+                ) {
+                    exp = 0x7FFF;
+                    sig = UINT64_C(0x8000000000000000);
+                    softfloat_setRoundingUp(status);
+                } else {
+                    exp = 0x7FFE;
+                    sig = ~roundMask;
+                }
+                return packToExtF80(sign, exp, sig);
+            }
+        }
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (sigExtra) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    if (doIncrement) {
+        sigExact = sig;
+        ++sig;
+        if (! sig) {
+            ++exp;
+            sig = UINT64_C(0x8000000000000000);
+            sigExact >>= 1;  // must scale also, or else later tests will fail
+        } else {
+            sig &= ~(uint64_t) (! (sigExtra & UINT64_C(0x7FFFFFFFFFFFFFFF)) & roundNearEven);
+        }
+        if (sig > sigExact)
+            softfloat_setRoundingUp(status);
+    }
+    else {
+        if (! sig) exp = 0;
+    }
+    return packToExtF80(sign, exp, sig);
+}
diff --git a/src/cpu/softfloat3e/s_roundPackToF128.cc b/src/cpu/softfloat3e/s_roundPackToF128.cc
new file mode 100644
index 000000000..46741e5e9
--- /dev/null
+++ b/src/cpu/softfloat3e/s_roundPackToF128.cc
@@ -0,0 +1,102 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2017 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+// trimmed for Bochs to support only 'softfloat_round_nearest_even' rounding mode
+float128_t
+ softfloat_roundPackToF128(bool sign, int32_t exp, uint64_t sig64, uint64_t sig0, uint64_t sigExtra, struct softfloat_status_t *status)
+{
+    bool doIncrement, isTiny;
+    struct uint128_extra sig128Extra;
+    struct uint128 sig128;
+    float128_t z;
+
+    sigExtra = 0; // artificially reduce precision to match hardware x86 which uses only 67-bit
+    sig0 &= UINT64_C(0xFFFFFFFF00000000); // do 80 bits for now
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    doIncrement = (UINT64_C(0x8000000000000000) <= sigExtra);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (0x7FFD <= (uint32_t) exp) {
+        if (exp < 0) {
+            /*----------------------------------------------------------------
+            *----------------------------------------------------------------*/
+            isTiny = (exp < -1) || ! doIncrement ||
+                softfloat_lt128(sig64, sig0, UINT64_C(0x0001FFFFFFFFFFFF), UINT64_C(0xFFFFFFFFFFFFFFFF));
+            sig128Extra = softfloat_shiftRightJam128Extra(sig64, sig0, sigExtra, -exp);
+            sig64 = sig128Extra.v.v64;
+            sig0  = sig128Extra.v.v0;
+            sigExtra = sig128Extra.extra;
+            exp = 0;
+            if (isTiny && sigExtra) {
+                softfloat_raiseFlags(status, softfloat_flag_underflow);
+            }
+            doIncrement = (UINT64_C(0x8000000000000000) <= sigExtra);
+        } else if ((0x7FFD < exp) || ((exp == 0x7FFD)
+                    && softfloat_eq128(sig64, sig0, UINT64_C(0x0001FFFFFFFFFFFF), UINT64_C(0xFFFFFFFFFFFFFFFF))
+                    && doIncrement)
+       ) {
+            /*----------------------------------------------------------------
+            *----------------------------------------------------------------*/
+            softfloat_raiseFlags(status, softfloat_flag_overflow | softfloat_flag_inexact);
+            z.v64 = packToF128UI64(sign, 0x7FFF, 0);
+            z.v0  = 0;
+            return z;
+        }
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (sigExtra) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+    }
+    if (doIncrement) {
+        sig128 = softfloat_add128(sig64, sig0, 0, 1);
+        sig64 = sig128.v64;
+        sig0 = sig128.v0 & ~(uint64_t) (! (sigExtra & UINT64_C(0x7FFFFFFFFFFFFFFF)));
+    } else {
+        if (! (sig64 | sig0)) exp = 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    z.v64 = packToF128UI64(sign, exp, sig64);
+    z.v0  = sig0;
+    return z;
+}
diff --git a/src/cpu/softfloat3e/s_roundPackToF16.c b/src/cpu/softfloat3e/s_roundPackToF16.c
new file mode 100644
index 000000000..c262d00b1
--- /dev/null
+++ b/src/cpu/softfloat3e/s_roundPackToF16.c
@@ -0,0 +1,104 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2017 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+float16 softfloat_roundPackToF16(bool sign, int16_t exp, uint16_t sig, struct softfloat_status_t *status)
+{
+    uint8_t roundingMode;
+    bool roundNearEven;
+    uint8_t roundIncrement, roundBits;
+    bool isTiny;
+    uint16_t uiZ;
+    uint16_t sigRef;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    roundingMode = softfloat_getRoundingMode(status);
+    roundNearEven = (roundingMode == softfloat_round_near_even);
+    roundIncrement = 0x8;
+    if (! roundNearEven && (roundingMode != softfloat_round_near_maxMag)) {
+        roundIncrement =
+            (roundingMode == (sign ? softfloat_round_min : softfloat_round_max)) ? 0xF : 0;
+    }
+    roundBits = sig & 0xF;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (0x1D <= (unsigned int) exp) {
+        if (exp < 0) {
+            /*----------------------------------------------------------------
+            *----------------------------------------------------------------*/
+            isTiny = (exp < -1) || (sig + roundIncrement < 0x8000);
+            sig = softfloat_shiftRightJam32(sig, -exp);
+            exp = 0;
+            roundBits = sig & 0xF;
+            if (isTiny) {
+                if (! softfloat_isMaskedException(status, softfloat_flag_underflow) || roundBits) {
+                    softfloat_raiseFlags(status, softfloat_flag_underflow);
+                }
+                if (softfloat_flushUnderflowToZero(status)) {
+                    softfloat_raiseFlags(status, softfloat_flag_underflow | softfloat_flag_inexact);
+                    return packToF16UI(sign, 0, 0);
+                }
+            }
+        } else if ((0x1D < exp) || (0x8000 <= sig + roundIncrement)) {
+            /*----------------------------------------------------------------
+            *----------------------------------------------------------------*/
+            softfloat_raiseFlags(status, softfloat_flag_overflow);
+            if (roundBits || softfloat_isMaskedException(status, softfloat_flag_overflow)) {
+                softfloat_raiseFlags(status, softfloat_flag_inexact);
+                if (roundIncrement != 0) softfloat_setRoundingUp(status);
+            }
+            uiZ = packToF16UI(sign, 0x1F, 0) - ! roundIncrement;
+            return uiZ;
+        }
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sigRef = sig;
+    sig = (sig + roundIncrement)>>4;
+    sig &= ~(uint16_t) (! (roundBits ^ 8) & roundNearEven);
+    if (! sig) exp = 0;
+    if (roundBits) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+        if ((sig << 4) > sigRef) softfloat_setRoundingUp(status);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    return packToF16UI(sign, exp, sig);
+}
diff --git a/src/cpu/softfloat3e/s_roundPackToF32.c b/src/cpu/softfloat3e/s_roundPackToF32.c
new file mode 100644
index 000000000..03a4e36a0
--- /dev/null
+++ b/src/cpu/softfloat3e/s_roundPackToF32.c
@@ -0,0 +1,108 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2017 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+float32 softfloat_roundPackToF32(bool sign, int16_t exp, uint32_t sig, struct softfloat_status_t *status)
+{
+    uint8_t roundingMode;
+    bool roundNearEven;
+    uint8_t roundIncrement, roundBits;
+    bool isTiny;
+    uint32_t uiZ;
+    uint32_t sigRef;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    roundingMode = softfloat_getRoundingMode(status);
+    roundNearEven = (roundingMode == softfloat_round_near_even);
+    roundIncrement = 0x40;
+    if (! roundNearEven && (roundingMode != softfloat_round_near_maxMag)) {
+        roundIncrement =
+            (roundingMode == (sign ? softfloat_round_min : softfloat_round_max)) ? 0x7F : 0;
+    }
+    roundBits = sig & 0x7F;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (0xFD <= (unsigned int) exp) {
+        if (exp < 0) {
+            /*----------------------------------------------------------------
+            *----------------------------------------------------------------*/
+            isTiny = (exp < -1) || (sig + roundIncrement < 0x80000000);
+            if (isTiny && ! softfloat_isMaskedException(status, softfloat_flag_underflow)) {
+                softfloat_raiseFlags(status, softfloat_flag_underflow);
+                exp += 192;
+            }
+            else {
+                sig = softfloat_shiftRightJam32(sig, -exp);
+                exp = 0;
+                roundBits = sig & 0x7F;
+                if (isTiny) {
+                    if (softfloat_flushUnderflowToZero(status)) {
+                        softfloat_raiseFlags(status, softfloat_flag_underflow | softfloat_flag_inexact);
+                        return packToF32UI(sign, 0, 0);
+                    }
+                    if (roundBits) softfloat_raiseFlags(status, softfloat_flag_underflow);
+                }
+            }
+        } else if ((0xFD < exp) || (0x80000000 <= sig + roundIncrement)) {
+            /*----------------------------------------------------------------
+            *----------------------------------------------------------------*/
+            softfloat_raiseFlags(status, softfloat_flag_overflow);
+            if (roundBits || softfloat_isMaskedException(status, softfloat_flag_overflow)) {
+                softfloat_raiseFlags(status, softfloat_flag_inexact);
+                if (roundIncrement != 0) softfloat_setRoundingUp(status);
+            }
+            uiZ = packToF32UI(sign, 0xFF, 0) - ! roundIncrement;
+            return uiZ;
+        }
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sigRef = sig;
+    sig = (sig + roundIncrement)>>7;
+    sig &= ~(uint32_t) (! (roundBits ^ 0x40) & roundNearEven);
+    if (! sig) exp = 0;
+    if (roundBits) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+        if ((sig << 7) > sigRef) softfloat_setRoundingUp(status);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    return packToF32UI(sign, exp, sig);
+}
diff --git a/src/cpu/softfloat3e/s_roundPackToF64.c b/src/cpu/softfloat3e/s_roundPackToF64.c
new file mode 100644
index 000000000..713fd6940
--- /dev/null
+++ b/src/cpu/softfloat3e/s_roundPackToF64.c
@@ -0,0 +1,108 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2017 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+float64 softfloat_roundPackToF64(bool sign, int16_t exp, uint64_t sig, struct softfloat_status_t *status)
+{
+    uint8_t roundingMode;
+    bool roundNearEven;
+    uint16_t roundIncrement, roundBits;
+    bool isTiny;
+    uint64_t uiZ;
+    uint64_t sigRef;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    roundingMode = softfloat_getRoundingMode(status);
+    roundNearEven = (roundingMode == softfloat_round_near_even);
+    roundIncrement = 0x200;
+    if (! roundNearEven && (roundingMode != softfloat_round_near_maxMag)) {
+        roundIncrement =
+            (roundingMode == (sign ? softfloat_round_min : softfloat_round_max)) ? 0x3FF : 0;
+    }
+    roundBits = sig & 0x3FF;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (0x7FD <= (uint16_t) exp) {
+        if (exp < 0) {
+            /*----------------------------------------------------------------
+            *----------------------------------------------------------------*/
+            isTiny = (exp < -1) || (sig + roundIncrement < UINT64_C(0x8000000000000000));
+            if (isTiny && ! softfloat_isMaskedException(status, softfloat_flag_underflow)) {
+                softfloat_raiseFlags(status, softfloat_flag_underflow);
+                exp += 1536;
+            }
+            else {
+                sig = softfloat_shiftRightJam64(sig, -exp);
+                exp = 0;
+                roundBits = sig & 0x3FF;
+                if (isTiny) {
+                    if (softfloat_flushUnderflowToZero(status)) {
+                        softfloat_raiseFlags(status, softfloat_flag_underflow | softfloat_flag_inexact);
+                        return packToF64UI(sign, 0, 0);
+                    }
+                    if (roundBits) softfloat_raiseFlags(status, softfloat_flag_underflow);
+                }
+            }
+        } else if ((0x7FD < exp) || (UINT64_C(0x8000000000000000) <= sig + roundIncrement)) {
+            /*----------------------------------------------------------------
+            *----------------------------------------------------------------*/
+            softfloat_raiseFlags(status, softfloat_flag_overflow);
+            if (roundBits || softfloat_isMaskedException(status, softfloat_flag_overflow)) {
+                softfloat_raiseFlags(status, softfloat_flag_inexact);
+                if (roundIncrement != 0) softfloat_setRoundingUp(status);
+            }
+            uiZ = packToF64UI(sign, 0x7FF, 0) - ! roundIncrement;
+            return uiZ;
+        }
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    sigRef = sig;
+    sig = (sig + roundIncrement)>>10;
+    sig &= ~(uint64_t) (! (roundBits ^ 0x200) & roundNearEven);
+    if (! sig) exp = 0;
+    if (roundBits) {
+        softfloat_raiseFlags(status, softfloat_flag_inexact);
+        if ((sig << 10) > sigRef) softfloat_setRoundingUp(status);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    return packToF64UI(sign, exp, sig);
+}
diff --git a/src/cpu/softfloat3e/s_roundToI32.c b/src/cpu/softfloat3e/s_roundToI32.c
new file mode 100644
index 000000000..a7a0b13d7
--- /dev/null
+++ b/src/cpu/softfloat3e/s_roundToI32.c
@@ -0,0 +1,79 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int32_t softfloat_roundToI32(bool sign, uint64_t sig, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    uint16_t roundIncrement, roundBits;
+    uint32_t sig32;
+    union { uint32_t ui; int32_t i; } uZ;
+    int32_t z;
+    uint64_t absSigExact = sig;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    roundIncrement = 0x800;
+    if ((roundingMode != softfloat_round_near_maxMag) && (roundingMode != softfloat_round_near_even)) {
+        roundIncrement = 0;
+        if (sign ? (roundingMode == softfloat_round_min) : (roundingMode == softfloat_round_max)) {
+            roundIncrement = 0xFFF;
+        }
+    }
+    roundBits = sig & 0xFFF;
+    sig += roundIncrement;
+    if (sig & UINT64_C(0xFFFFF00000000000)) goto invalid;
+    sig32 = sig>>12;
+    if ((roundBits == 0x800) && (roundingMode == softfloat_round_near_even)) {
+        sig32 &= ~(uint32_t) 1;
+    }
+    uZ.ui = sign ? -sig32 : sig32;
+    z = uZ.i;
+    if (z && ((z < 0) ^ sign)) goto invalid;
+    if (roundBits) {
+        if (exact) softfloat_raiseFlags(status, softfloat_flag_inexact);
+        if (((uint64_t)sig32 << 12) > absSigExact)
+            softfloat_setRoundingUp(status);
+    }
+    return z;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ invalid:
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    return sign ? i32_fromNegOverflow : i32_fromPosOverflow;
+}
diff --git a/src/cpu/softfloat3e/s_roundToI64.c b/src/cpu/softfloat3e/s_roundToI64.c
new file mode 100644
index 000000000..72d421889
--- /dev/null
+++ b/src/cpu/softfloat3e/s_roundToI64.c
@@ -0,0 +1,77 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+int64_t
+ softfloat_roundToI64(bool sign, uint64_t sig, uint64_t sigExtra, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    union { uint64_t ui; int64_t i; } uZ;
+    int64_t z;
+    uint64_t absSigExact = sig;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if ((roundingMode == softfloat_round_near_maxMag) || (roundingMode == softfloat_round_near_even)) {
+        if (UINT64_C(0x8000000000000000) <= sigExtra) goto increment;
+    } else {
+        if (sigExtra
+                && (sign ? (roundingMode == softfloat_round_min) : (roundingMode == softfloat_round_max))) {
+ increment:
+            ++sig;
+            if (!sig) goto invalid;
+            if ((sigExtra == UINT64_C(0x8000000000000000)) && (roundingMode == softfloat_round_near_even)) {
+                sig &= ~(uint64_t) 1;
+            }
+        }
+    }
+    uZ.ui = sign ? -sig : sig;
+    z = uZ.i;
+    if (z && ((z < 0) ^ sign)) goto invalid;
+    if (sigExtra) {
+        if (exact) softfloat_raiseFlags(status, softfloat_flag_inexact);
+        if (sig > absSigExact)
+            softfloat_setRoundingUp(status);
+    }
+    return z;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ invalid:
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    return sign ? i64_fromNegOverflow : i64_fromPosOverflow;
+}
diff --git a/src/cpu/softfloat3e/s_roundToUI32.c b/src/cpu/softfloat3e/s_roundToUI32.c
new file mode 100644
index 000000000..d2956b0ac
--- /dev/null
+++ b/src/cpu/softfloat3e/s_roundToUI32.c
@@ -0,0 +1,79 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint32_t
+ softfloat_roundToUI32(bool sign, uint64_t sig, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    uint16_t roundIncrement, roundBits;
+    uint32_t z;
+    uint64_t absSigExact = sig;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    roundIncrement = 0x800;
+    if ((roundingMode != softfloat_round_near_maxMag) && (roundingMode != softfloat_round_near_even)) {
+        roundIncrement = 0;
+        if (sign) {
+            if (!sig) return 0;
+            if (roundingMode == softfloat_round_min) goto invalid;
+        } else {
+            if (roundingMode == softfloat_round_max) roundIncrement = 0xFFF;
+        }
+    }
+    roundBits = sig & 0xFFF;
+    sig += roundIncrement;
+    if (sig & UINT64_C(0xFFFFF00000000000)) goto invalid;
+    z = sig>>12;
+    if ((roundBits == 0x800) && (roundingMode == softfloat_round_near_even)) {
+        z &= ~(uint32_t) 1;
+    }
+    if (sign && z) goto invalid;
+    if (roundBits) {
+        if (exact) softfloat_raiseFlags(status, softfloat_flag_inexact);
+        if (((uint64_t)z << 12) > absSigExact)
+            softfloat_setRoundingUp(status);
+    }
+    return z;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ invalid:
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    return sign ? ui32_fromNegOverflow : ui32_fromPosOverflow;
+}
diff --git a/src/cpu/softfloat3e/s_roundToUI64.c b/src/cpu/softfloat3e/s_roundToUI64.c
new file mode 100644
index 000000000..75120a7fe
--- /dev/null
+++ b/src/cpu/softfloat3e/s_roundToUI64.c
@@ -0,0 +1,76 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+uint64_t
+ softfloat_roundToUI64(bool sign, uint64_t sig, uint64_t sigExtra, uint8_t roundingMode, bool exact, struct softfloat_status_t *status)
+{
+    uint64_t absSigExact = sig;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if ((roundingMode == softfloat_round_near_maxMag) || (roundingMode == softfloat_round_near_even)) {
+        if (UINT64_C(0x8000000000000000) <= sigExtra) goto increment;
+    } else {
+        if (sign) {
+            if (!(sig | sigExtra)) return 0;
+            if (roundingMode == softfloat_round_min) goto invalid;
+        } else {
+            if ((roundingMode == softfloat_round_max) && sigExtra) {
+ increment:
+                ++sig;
+                if (!sig) goto invalid;
+                if ((sigExtra == UINT64_C(0x8000000000000000)) && (roundingMode == softfloat_round_near_even)) {
+                    sig &= ~(uint64_t) 1;
+                }
+            }
+        }
+    }
+    if (sign && sig) goto invalid;
+    if (sigExtra) {
+        if (exact) softfloat_raiseFlags(status, softfloat_flag_inexact);
+        if (sig > absSigExact)
+            softfloat_setRoundingUp(status);
+    }
+    return sig;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ invalid:
+    softfloat_raiseFlags(status, softfloat_flag_invalid);
+    return sign ? ui64_fromNegOverflow : ui64_fromPosOverflow;
+}
diff --git a/src/cpu/softfloat3e/s_shiftRightJam128.cc b/src/cpu/softfloat3e/s_shiftRightJam128.cc
new file mode 100644
index 000000000..11fb26abf
--- /dev/null
+++ b/src/cpu/softfloat3e/s_shiftRightJam128.cc
@@ -0,0 +1,65 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "softfloat_types.h"
+
+#ifndef softfloat_shiftRightJam128
+
+struct uint128
+ softfloat_shiftRightJam128(uint64_t a64, uint64_t a0, uint32_t dist)
+{
+    uint8_t u8NegDist;
+    struct uint128 z;
+
+    if (dist < 64) {
+        u8NegDist = -dist;
+        z.v64 = a64>>dist;
+        z.v0 =
+            a64<<(u8NegDist & 63) | a0>>dist
+                | ((uint64_t) (a0<<(u8NegDist & 63)) != 0);
+    } else {
+        z.v64 = 0;
+        z.v0 =
+            (dist < 127)
+                ? a64>>(dist & 63)
+                      | (((a64 & (((uint64_t) 1<<(dist & 63)) - 1)) | a0)
+                             != 0)
+                : ((a64 | a0) != 0);
+    }
+    return z;
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_shiftRightJam128Extra.cc b/src/cpu/softfloat3e/s_shiftRightJam128Extra.cc
new file mode 100644
index 000000000..7f4b3fa82
--- /dev/null
+++ b/src/cpu/softfloat3e/s_shiftRightJam128Extra.cc
@@ -0,0 +1,73 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "softfloat_types.h"
+
+#ifndef softfloat_shiftRightJam128Extra
+
+struct uint128_extra
+ softfloat_shiftRightJam128Extra(uint64_t a64, uint64_t a0, uint64_t extra, uint32_t dist)
+{
+    uint8_t u8NegDist;
+    struct uint128_extra z;
+
+    u8NegDist = -dist;
+    if (dist < 64) {
+        z.v.v64 = a64>>dist;
+        z.v.v0 = a64<<(u8NegDist & 63) | a0>>dist;
+        z.extra = a0<<(u8NegDist & 63);
+    } else {
+        z.v.v64 = 0;
+        if (dist == 64) {
+            z.v.v0 = a64;
+            z.extra = a0;
+        } else {
+            extra |= a0;
+            if (dist < 128) {
+                z.v.v0 = a64>>(dist & 63);
+                z.extra = a64<<(u8NegDist & 63);
+            } else {
+                z.v.v0 = 0;
+                z.extra = (dist == 128) ? a64 : (a64 != 0);
+            }
+        }
+    }
+    z.extra |= (extra != 0);
+    return z;
+
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_shiftRightJam256M.c b/src/cpu/softfloat3e/s_shiftRightJam256M.c
new file mode 100644
index 000000000..c92204c4d
--- /dev/null
+++ b/src/cpu/softfloat3e/s_shiftRightJam256M.c
@@ -0,0 +1,114 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stddef.h>
+#include <stdint.h>
+#include "primitiveTypes.h"
+
+#ifndef softfloat_shiftRightJam256M
+
+static void softfloat_shortShiftRightJamM(uint8_t size_words, const uint64_t *aPtr, uint8_t dist, uint64_t *zPtr)
+{
+    uint8_t uNegDist;
+    unsigned int index, lastIndex;
+    uint64_t partWordZ, wordA;
+
+    uNegDist = -dist;
+    index = indexWordLo(size_words);
+    lastIndex = indexWordHi(size_words);
+    wordA = aPtr[index];
+    partWordZ = wordA>>dist;
+    if (partWordZ<<dist != wordA) partWordZ |= 1;
+    while (index != lastIndex) {
+        wordA = aPtr[index + wordIncr];
+        zPtr[index] = wordA<<(uNegDist & 63) | partWordZ;
+        index += wordIncr;
+        partWordZ = wordA>>dist;
+    }
+    zPtr[index] = partWordZ;
+
+}
+
+void softfloat_shiftRightJam256M(const uint64_t *aPtr, uint32_t dist, uint64_t *zPtr)
+{
+    uint64_t wordJam;
+    uint32_t wordDist;
+    uint64_t *ptr = NULL;
+    uint8_t i, innerDist;
+
+    wordJam = 0;
+    wordDist = dist>>6;
+    if (wordDist) {
+        if (4 < wordDist) wordDist = 4;
+        ptr = (uint64_t *) (aPtr + indexMultiwordLo(4, wordDist));
+        i = wordDist;
+        do {
+            wordJam = *ptr++;
+            if (wordJam) break;
+            --i;
+        } while (i);
+        ptr = zPtr;
+    }
+    if (wordDist < 4) {
+        aPtr += indexMultiwordHiBut(4, wordDist);
+        innerDist = dist & 63;
+        if (innerDist) {
+            softfloat_shortShiftRightJamM(
+                4 - wordDist,
+                aPtr,
+                innerDist,
+                zPtr + indexMultiwordLoBut(4, wordDist)
+            );
+            if (! wordDist) goto wordJam;
+        } else {
+            aPtr += indexWordLo(4 - wordDist);
+            ptr = zPtr + indexWordLo(4);
+            for (i = 4 - wordDist; i; --i) {
+                *ptr = *aPtr;
+                aPtr += wordIncr;
+                ptr += wordIncr;
+            }
+        }
+        ptr = zPtr + indexMultiwordHi(4, wordDist);
+    }
+    do {
+        *ptr++ = 0;
+        --wordDist;
+    } while (wordDist);
+ wordJam:
+    if (wordJam) zPtr[indexWordLo(4)] |= 1;
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_shiftRightJam32.c b/src/cpu/softfloat3e/s_shiftRightJam32.c
new file mode 100644
index 000000000..638aa0294
--- /dev/null
+++ b/src/cpu/softfloat3e/s_shiftRightJam32.c
@@ -0,0 +1,45 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+
+#ifndef softfloat_shiftRightJam32
+
+uint32_t softfloat_shiftRightJam32(uint32_t a, uint16_t dist)
+{
+    return (dist < 31) ? a>>dist | ((uint32_t) (a<<(-dist & 31)) != 0) : (a != 0);
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_shiftRightJam64.c b/src/cpu/softfloat3e/s_shiftRightJam64.c
new file mode 100644
index 000000000..03cf5e692
--- /dev/null
+++ b/src/cpu/softfloat3e/s_shiftRightJam64.c
@@ -0,0 +1,46 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+
+#ifndef softfloat_shiftRightJam64
+
+uint64_t softfloat_shiftRightJam64(uint64_t a, uint32_t dist)
+{
+    return (dist < 63) ? a>>dist | ((uint64_t) (a<<(-dist & 63)) != 0) : (a != 0);
+}
+
+#endif
+
diff --git a/src/cpu/softfloat3e/s_shiftRightJam64Extra.c b/src/cpu/softfloat3e/s_shiftRightJam64Extra.c
new file mode 100644
index 000000000..a80bafb35
--- /dev/null
+++ b/src/cpu/softfloat3e/s_shiftRightJam64Extra.c
@@ -0,0 +1,57 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "softfloat_types.h"
+
+#ifndef softfloat_shiftRightJam64Extra
+
+struct uint64_extra
+ softfloat_shiftRightJam64Extra(uint64_t a, uint64_t extra, uint32_t dist)
+{
+    struct uint64_extra z;
+
+    if (dist < 64) {
+        z.v = a>>dist;
+        z.extra = a<<(-dist & 63);
+    } else {
+        z.v = 0;
+        z.extra = (dist == 64) ? a : (a != 0);
+    }
+    z.extra |= (extra != 0);
+    return z;
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_shortShiftLeft128.cc b/src/cpu/softfloat3e/s_shortShiftLeft128.cc
new file mode 100644
index 000000000..dc24172cd
--- /dev/null
+++ b/src/cpu/softfloat3e/s_shortShiftLeft128.cc
@@ -0,0 +1,51 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "softfloat_types.h"
+
+#ifndef softfloat_shortShiftLeft128
+
+struct uint128
+ softfloat_shortShiftLeft128(uint64_t a64, uint64_t a0, uint8_t dist)
+{
+    struct uint128 z;
+
+    z.v64 = a64<<dist | a0>>(-dist & 63);
+    z.v0 = a0<<dist;
+    return z;
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_shortShiftRight128.cc b/src/cpu/softfloat3e/s_shortShiftRight128.cc
new file mode 100644
index 000000000..8b48b1486
--- /dev/null
+++ b/src/cpu/softfloat3e/s_shortShiftRight128.cc
@@ -0,0 +1,51 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "softfloat_types.h"
+
+#ifndef softfloat_shortShiftRight128
+
+struct uint128
+ softfloat_shortShiftRight128(uint64_t a64, uint64_t a0, uint8_t dist)
+{
+    struct uint128 z;
+
+    z.v64 = a64>>dist;
+    z.v0 = a64<<(-dist & 63) | a0>>dist;
+    return z;
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_shortShiftRightJam64.c b/src/cpu/softfloat3e/s_shortShiftRightJam64.c
new file mode 100644
index 000000000..cfee2a679
--- /dev/null
+++ b/src/cpu/softfloat3e/s_shortShiftRightJam64.c
@@ -0,0 +1,46 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+
+#ifndef softfloat_shortShiftRightJam64
+
+uint64_t softfloat_shortShiftRightJam64(uint64_t a, uint8_t dist)
+{
+    return a>>dist | ((a & (((uint64_t) 1<<dist) - 1)) != 0);
+}
+
+#endif
+
diff --git a/src/cpu/softfloat3e/s_shortShiftRightJam64Extra.c b/src/cpu/softfloat3e/s_shortShiftRightJam64Extra.c
new file mode 100644
index 000000000..0bf9afde3
--- /dev/null
+++ b/src/cpu/softfloat3e/s_shortShiftRightJam64Extra.c
@@ -0,0 +1,51 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "softfloat_types.h"
+
+#ifndef softfloat_shortShiftRightJam64Extra
+
+struct uint64_extra
+ softfloat_shortShiftRightJam64Extra(uint64_t a, uint64_t extra, uint8_t dist)
+{
+    struct uint64_extra z;
+
+    z.v = a>>dist;
+    z.extra = a<<(-dist & 63) | (extra != 0);
+    return z;
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_sub128.cc b/src/cpu/softfloat3e/s_sub128.cc
new file mode 100644
index 000000000..d5d5f941b
--- /dev/null
+++ b/src/cpu/softfloat3e/s_sub128.cc
@@ -0,0 +1,50 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "softfloat_types.h"
+
+#ifndef softfloat_sub128
+
+struct uint128 softfloat_sub128(uint64_t a64, uint64_t a0, uint64_t b64, uint64_t b0)
+{
+    struct uint128 z;
+
+    z.v0 = a0 - b0;
+    z.v64 = a64 - b64 - (a0 < b0);
+    return z;
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_sub256M.c b/src/cpu/softfloat3e/s_sub256M.c
new file mode 100644
index 000000000..8b2f6e2fd
--- /dev/null
+++ b/src/cpu/softfloat3e/s_sub256M.c
@@ -0,0 +1,59 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "primitiveTypes.h"
+
+#ifndef softfloat_sub256M
+
+void softfloat_sub256M(const uint64_t *aPtr, const uint64_t *bPtr, uint64_t *zPtr)
+{
+    unsigned int index;
+    uint8_t borrow;
+    uint64_t wordA, wordB;
+
+    index = indexWordLo(4);
+    borrow = 0;
+    for (;;) {
+        wordA = aPtr[index];
+        wordB = bPtr[index];
+        zPtr[index] = wordA - wordB - borrow;
+        if (index == indexWordHi(4)) break;
+        borrow = borrow ? (wordA <= wordB) : (wordA < wordB);
+        index += wordIncr;
+    }
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/s_subMagsExtF80.cc b/src/cpu/softfloat3e/s_subMagsExtF80.cc
new file mode 100644
index 000000000..3a75cd768
--- /dev/null
+++ b/src/cpu/softfloat3e/s_subMagsExtF80.cc
@@ -0,0 +1,154 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+extFloat80_t
+ softfloat_subMagsExtF80(uint16_t uiA64, uint64_t uiA0, uint16_t uiB64, uint64_t uiB0, bool signZ, struct softfloat_status_t *status)
+{
+    int32_t expA;
+    uint64_t sigA;
+    int32_t expB;
+    uint64_t sigB;
+    int32_t expDiff;
+    int32_t expZ;
+    uint64_t sigExtra;
+    struct uint128 sig128;
+    struct exp32_sig64 normExpSig;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expA = expExtF80UI64(uiA64);
+    sigA = uiA0;
+    expB = expExtF80UI64(uiB64);
+    sigB = uiB0;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (expA == 0x7FFF) {
+        if ((sigA<<1)) goto propagateNaN;
+        if (expB == 0x7FFF) {
+            if ((sigB<<1)) goto propagateNaN;
+            softfloat_raiseFlags(status, softfloat_flag_invalid);
+            return packToExtF80_twoargs(defaultNaNExtF80UI64, defaultNaNExtF80UI0);
+        }
+        if (sigB && ! expB)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        return packToExtF80_twoargs(uiA64, uiA0);
+    }
+    if (expB == 0x7FFF) {
+        if ((sigB<<1)) goto propagateNaN;
+        if (sigA && ! expA)
+            softfloat_raiseFlags(status, softfloat_flag_denormal);
+        return packToExtF80(signZ ^ 1, 0x7FFF, UINT64_C(0x8000000000000000));
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expA) {
+        if (! sigA) {
+            if (! expB) {
+                if (sigB) {
+                    softfloat_raiseFlags(status, softfloat_flag_denormal);
+                    normExpSig = softfloat_normSubnormalExtF80Sig(sigB);
+                    expB = normExpSig.exp + 1;
+                    sigB = normExpSig.sig;
+                    return softfloat_roundPackToExtF80(signZ ^ 1, expB, sigB, 0, softfloat_extF80_roundingPrecision(status), status);
+                }
+                return packToExtF80((softfloat_getRoundingMode(status) == softfloat_round_min), 0, 0);
+            }
+            return softfloat_roundPackToExtF80(signZ ^ 1, expB, sigB, 0, softfloat_extF80_roundingPrecision(status), status);
+        }
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalExtF80Sig(sigA);
+        expA = normExpSig.exp + 1;
+        sigA = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (! expB) {
+        if (! sigB)
+            return softfloat_roundPackToExtF80(signZ, expA, sigA, 0, softfloat_extF80_roundingPrecision(status), status);
+
+        softfloat_raiseFlags(status, softfloat_flag_denormal);
+        normExpSig = softfloat_normSubnormalExtF80Sig(sigB);
+        expB = normExpSig.exp + 1;
+        sigB = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expDiff = expA - expB;
+    if (0 < expDiff) goto expABigger;
+    if (expDiff < 0) goto expBBigger;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expZ = expA;
+    sigExtra = 0;
+    if (sigB < sigA) goto aBigger;
+    if (sigA < sigB) goto bBigger;
+    return packToExtF80((softfloat_getRoundingMode(status) == softfloat_round_min), 0, 0);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ expBBigger:
+    sig128 = softfloat_shiftRightJam128(sigA, 0, -expDiff);
+    sigA = sig128.v64;
+    sigExtra = sig128.v0;
+    expZ = expB;
+ bBigger:
+    signZ = ! signZ;
+    sig128 = softfloat_sub128(sigB, 0, sigA, sigExtra);
+    goto normRoundPack;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ expABigger:
+    sig128 = softfloat_shiftRightJam128(sigB, 0, expDiff);
+    sigB = sig128.v64;
+    sigExtra = sig128.v0;
+    expZ = expA;
+ aBigger:
+    sig128 = softfloat_sub128(sigA, 0, sigB, sigExtra);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ normRoundPack:
+    return
+        softfloat_normRoundPackToExtF80(
+            signZ, expZ, sig128.v64, sig128.v0, softfloat_extF80_roundingPrecision(status), status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    return softfloat_propagateNaNExtF80UI(uiA64, uiA0, uiB64, uiB0, status);
+}
diff --git a/src/cpu/softfloat3e/s_subMagsF128.cc b/src/cpu/softfloat3e/s_subMagsF128.cc
new file mode 100644
index 000000000..f39e6c02d
--- /dev/null
+++ b/src/cpu/softfloat3e/s_subMagsF128.cc
@@ -0,0 +1,131 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float128_t
+ softfloat_subMagsF128(
+     uint64_t uiA64,
+     uint64_t uiA0,
+     uint64_t uiB64,
+     uint64_t uiB0,
+     bool signZ,
+     struct softfloat_status_t *status
+)
+{
+    int32_t expA;
+    struct uint128 sigA;
+    int32_t expB;
+    struct uint128 sigB, sigZ;
+    int32_t expDiff, expZ;
+    struct uint128 uiZ;
+
+    expA = expF128UI64(uiA64);
+    sigA.v64 = fracF128UI64(uiA64);
+    sigA.v0  = uiA0;
+    expB = expF128UI64(uiB64);
+    sigB.v64 = fracF128UI64(uiB64);
+    sigB.v0  = uiB0;
+    sigA = softfloat_shortShiftLeft128(sigA.v64, sigA.v0, 4);
+    sigB = softfloat_shortShiftLeft128(sigB.v64, sigB.v0, 4);
+    expDiff = expA - expB;
+    if (0 < expDiff) goto expABigger;
+    if (expDiff < 0) goto expBBigger;
+    if (expA == 0x7FFF) {
+        if (sigA.v64 | sigA.v0 | sigB.v64 | sigB.v0) goto propagateNaN;
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
+        uiZ.v64 = defaultNaNF128UI64;
+        uiZ.v0  = defaultNaNF128UI0;
+        return uiZ;
+    }
+    expZ = expA;
+    if (! expZ) expZ = 1;
+    if (sigB.v64 < sigA.v64) goto aBigger;
+    if (sigA.v64 < sigB.v64) goto bBigger;
+    if (sigB.v0 < sigA.v0) goto aBigger;
+    if (sigA.v0 < sigB.v0) goto bBigger;
+    uiZ.v64 = packToF128UI64((softfloat_getRoundingMode(status) == softfloat_round_min), 0, 0);
+    uiZ.v0 = 0;
+    return uiZ;
+ expBBigger:
+    if (expB == 0x7FFF) {
+        if (sigB.v64 | sigB.v0) goto propagateNaN;
+        uiZ.v64 = packToF128UI64(signZ ^ 1, 0x7FFF, 0);
+        uiZ.v0  = 0;
+        return uiZ;
+    }
+    if (expA) {
+        sigA.v64 |= UINT64_C(0x0010000000000000);
+    } else {
+        ++expDiff;
+        if (! expDiff) goto newlyAlignedBBigger;
+    }
+    sigA = softfloat_shiftRightJam128(sigA.v64, sigA.v0, -expDiff);
+ newlyAlignedBBigger:
+    expZ = expB;
+    sigB.v64 |= UINT64_C(0x0010000000000000);
+ bBigger:
+    signZ = ! signZ;
+    sigZ = softfloat_sub128(sigB.v64, sigB.v0, sigA.v64, sigA.v0);
+    goto normRoundPack;
+ expABigger:
+    if (expA == 0x7FFF) {
+        if (sigA.v64 | sigA.v0) goto propagateNaN;
+        uiZ.v64 = uiA64;
+        uiZ.v0  = uiA0;
+        return uiZ;
+    }
+    if (expB) {
+        sigB.v64 |= UINT64_C(0x0010000000000000);
+    } else {
+        --expDiff;
+        if (! expDiff) goto newlyAlignedABigger;
+    }
+    sigB = softfloat_shiftRightJam128(sigB.v64, sigB.v0, expDiff);
+ newlyAlignedABigger:
+    expZ = expA;
+    sigA.v64 |= UINT64_C(0x0010000000000000);
+ aBigger:
+    sigZ = softfloat_sub128(sigA.v64, sigA.v0, sigB.v64, sigB.v0);
+ normRoundPack:
+    return softfloat_normRoundPackToF128(signZ, expZ - 5, sigZ.v64, sigZ.v0, status);
+ propagateNaN:
+    uiZ = softfloat_propagateNaNF128UI(uiA64, uiA0, uiB64, uiB0, status);
+    return uiZ;
+}
diff --git a/src/cpu/softfloat3e/s_subMagsF16.c b/src/cpu/softfloat3e/s_subMagsF16.c
new file mode 100644
index 000000000..6241d0ee5
--- /dev/null
+++ b/src/cpu/softfloat3e/s_subMagsF16.c
@@ -0,0 +1,190 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float16 softfloat_subMagsF16(uint16_t uiA, uint16_t uiB, struct softfloat_status_t *status)
+{
+    int8_t expA;
+    uint16_t sigA;
+    int8_t expB;
+    uint16_t sigB;
+    int8_t expDiff;
+    uint16_t uiZ;
+    int16_t sigDiff;
+    bool signZ;
+    int8_t shiftDist, expZ;
+    uint16_t sigZ, sigX, sigY;
+    uint32_t sig32Z;
+    int8_t roundingMode;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expA = expF16UI(uiA);
+    sigA = fracF16UI(uiA);
+    expB = expF16UI(uiB);
+    sigB = fracF16UI(uiB);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) sigA = 0;
+        if (!expB) sigB = 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expDiff = expA - expB;
+    if (! expDiff) {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (expA == 0x1F) {
+            if (sigA | sigB) goto propagateNaN;
+            softfloat_raiseFlags(status, softfloat_flag_invalid);
+            return defaultNaNF16UI;
+        }
+        if (!expA && (sigA | sigB)) softfloat_raiseFlags(status, softfloat_flag_denormal);
+        sigDiff = sigA - sigB;
+        if (! sigDiff) {
+            return packToF16UI((softfloat_getRoundingMode(status) == softfloat_round_min), 0, 0);
+        }
+        if (expA) --expA;
+        signZ = signF16UI(uiA);
+        if (sigDiff < 0) {
+            signZ = ! signZ;
+            sigDiff = -sigDiff;
+        }
+        shiftDist = softfloat_countLeadingZeros16(sigDiff) - 5;
+        expZ = expA - shiftDist;
+        if (expZ < 0) {
+            shiftDist = expA;
+            expZ = 0;
+        }
+        sigZ = sigDiff<<shiftDist;
+        if (!expZ && sigDiff) {
+            if (softfloat_flushUnderflowToZero(status)) {
+                softfloat_raiseFlags(status, softfloat_flag_underflow | softfloat_flag_inexact);
+                return packToF16UI(signZ, 0, 0);
+            }
+            if (! softfloat_isMaskedException(status, softfloat_flag_underflow)) {
+                softfloat_raiseFlags(status, softfloat_flag_underflow);
+            }
+        }
+        goto pack;
+    } else {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        signZ = signF16UI(uiA);
+        if (expDiff < 0) {
+            /*----------------------------------------------------------------
+            *----------------------------------------------------------------*/
+            signZ = ! signZ;
+            if (expB == 0x1F) {
+                if (sigB) goto propagateNaN;
+                if (sigA && !expA) softfloat_raiseFlags(status, softfloat_flag_denormal);
+                return packToF16UI(signZ, 0x1F, 0);
+            }
+
+            if ((sigA && !expA) || (sigB && !expB))
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+
+            if (expDiff <= -13) {
+                uiZ = packToF16UI(signZ, expB, sigB);
+                if (expA | sigA) goto subEpsilon;
+                return uiZ;
+            }
+            expZ = expA + 19;
+            sigX = sigB | 0x0400;
+            sigY = sigA + (expA ? 0x0400 : sigA);
+            expDiff = -expDiff;
+        } else {
+            /*----------------------------------------------------------------
+            *----------------------------------------------------------------*/
+            uiZ = uiA;
+            if (expA == 0x1F) {
+                if (sigA) goto propagateNaN;
+                if (sigB && !expB) softfloat_raiseFlags(status, softfloat_flag_denormal);
+                return uiZ;
+            }
+
+            if ((sigA && !expA) || (sigB && !expB))
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+
+            if (13 <= expDiff) {
+                if (expB | sigB) goto subEpsilon;
+                return uiZ;
+            }
+            expZ = expB + 19;
+            sigX = sigA | 0x0400;
+            sigY = sigB + (expB ? 0x0400 : sigB);
+        }
+        sig32Z = ((uint32_t) sigX<<expDiff) - sigY;
+        shiftDist = softfloat_countLeadingZeros32(sig32Z) - 1;
+        sig32Z <<= shiftDist;
+        expZ -= shiftDist;
+        sigZ = sig32Z>>16;
+        if (sig32Z & 0xFFFF) {
+            sigZ |= 1;
+        } else {
+            if (! (sigZ & 0xF) && ((unsigned int) expZ < 0x1E)) {
+                sigZ >>= 4;
+                goto pack;
+            }
+        }
+        return softfloat_roundPackToF16(signZ, expZ, sigZ, status);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    return softfloat_propagateNaNF16UI(uiA, uiB, status);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ subEpsilon:
+    roundingMode = softfloat_getRoundingMode(status);
+    if (roundingMode != softfloat_round_near_even) {
+        if ((roundingMode == softfloat_round_minMag)
+                || (roundingMode == (signF16UI(uiZ) ? softfloat_round_max : softfloat_round_min))) {
+            --uiZ;
+        }
+    }
+    softfloat_raiseFlags(status, softfloat_flag_inexact);
+    return uiZ;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ pack:
+    return packToF16UI(signZ, expZ, sigZ);
+}
diff --git a/src/cpu/softfloat3e/s_subMagsF32.c b/src/cpu/softfloat3e/s_subMagsF32.c
new file mode 100644
index 000000000..115e2906c
--- /dev/null
+++ b/src/cpu/softfloat3e/s_subMagsF32.c
@@ -0,0 +1,151 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float32 softfloat_subMagsF32(uint32_t uiA, uint32_t uiB, struct softfloat_status_t *status)
+{
+    int16_t expA;
+    uint32_t sigA;
+    int16_t expB;
+    uint32_t sigB;
+    int16_t expDiff;
+    int32_t sigDiff;
+    bool signZ;
+    int8_t shiftDist;
+    int16_t expZ;
+    uint32_t sigX, sigY;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expA = expF32UI(uiA);
+    sigA = fracF32UI(uiA);
+    expB = expF32UI(uiB);
+    sigB = fracF32UI(uiB);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) sigA = 0;
+        if (!expB) sigB = 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expDiff = expA - expB;
+    if (! expDiff) {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (expA == 0xFF) {
+            if (sigA | sigB) goto propagateNaN;
+            softfloat_raiseFlags(status, softfloat_flag_invalid);
+            return defaultNaNF32UI;
+        }
+        if (!expA && (sigA | sigB)) softfloat_raiseFlags(status, softfloat_flag_denormal);
+        sigDiff = sigA - sigB;
+        if (! sigDiff) {
+            return packToF32UI((softfloat_getRoundingMode(status) == softfloat_round_min), 0, 0);
+        }
+        if (expA) --expA;
+        signZ = signF32UI(uiA);
+        if (sigDiff < 0) {
+            signZ = ! signZ;
+            sigDiff = -sigDiff;
+        }
+        shiftDist = softfloat_countLeadingZeros32(sigDiff) - 8;
+        expZ = expA - shiftDist;
+        if (expZ < 0) {
+            shiftDist = expA;
+            expZ = 0;
+        }
+        if (!expZ && sigDiff) {
+            if (softfloat_flushUnderflowToZero(status)) {
+                softfloat_raiseFlags(status, softfloat_flag_underflow | softfloat_flag_inexact);
+                return packToF32UI(signZ, 0, 0);
+            }
+            if (! softfloat_isMaskedException(status, softfloat_flag_underflow)) {
+                softfloat_raiseFlags(status, softfloat_flag_underflow);
+            }
+        }
+        return packToF32UI(signZ, expZ, sigDiff<<shiftDist);
+    } else {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        signZ = signF32UI(uiA);
+        sigA <<= 7;
+        sigB <<= 7;
+        if (expDiff < 0) {
+            /*----------------------------------------------------------------
+            *----------------------------------------------------------------*/
+            signZ = ! signZ;
+            if (expB == 0xFF) {
+                if (sigB) goto propagateNaN;
+                if (sigA && !expA) softfloat_raiseFlags(status, softfloat_flag_denormal);
+                return packToF32UI(signZ, 0xFF, 0);
+            }
+
+            if ((sigA && !expA) || (sigB && !expB))
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+
+            expZ = expB - 1;
+            sigX = sigB | 0x40000000;
+            sigY = sigA + (expA ? 0x40000000 : sigA);
+            expDiff = -expDiff;
+        } else {
+            /*----------------------------------------------------------------
+            *----------------------------------------------------------------*/
+            if (expA == 0xFF) {
+                if (sigA) goto propagateNaN;
+                if (sigB && !expB) softfloat_raiseFlags(status, softfloat_flag_denormal);
+                return uiA;
+            }
+
+            if ((sigA && !expA) || (sigB && !expB))
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+
+            expZ = expA - 1;
+            sigX = sigA | 0x40000000;
+            sigY = sigB + (expB ? 0x40000000 : sigB);
+        }
+        return
+            softfloat_normRoundPackToF32(signZ, expZ, sigX - softfloat_shiftRightJam32(sigY, expDiff), status);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    return softfloat_propagateNaNF32UI(uiA, uiB, status);
+}
diff --git a/src/cpu/softfloat3e/s_subMagsF64.c b/src/cpu/softfloat3e/s_subMagsF64.c
new file mode 100644
index 000000000..27bb72a93
--- /dev/null
+++ b/src/cpu/softfloat3e/s_subMagsF64.c
@@ -0,0 +1,150 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+float64 softfloat_subMagsF64(uint64_t uiA, uint64_t uiB, bool signZ, struct softfloat_status_t *status)
+{
+    int16_t expA;
+    uint64_t sigA;
+    int16_t expB;
+    uint64_t sigB;
+    int16_t expDiff;
+    int64_t sigDiff;
+    int8_t shiftDist;
+    int16_t expZ;
+    uint64_t sigZ;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expA = expF64UI(uiA);
+    sigA = fracF64UI(uiA);
+    expB = expF64UI(uiB);
+    sigB = fracF64UI(uiB);
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if (softfloat_denormalsAreZeros(status)) {
+        if (!expA) sigA = 0;
+        if (!expB) sigB = 0;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expDiff = expA - expB;
+    if (! expDiff) {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if (expA == 0x7FF) {
+            if (sigA | sigB) goto propagateNaN;
+            softfloat_raiseFlags(status, softfloat_flag_invalid);
+            return defaultNaNF64UI;
+        }
+        if (!expA && (sigA | sigB)) softfloat_raiseFlags(status, softfloat_flag_denormal);
+        sigDiff = sigA - sigB;
+        if (! sigDiff) {
+            return packToF64UI((softfloat_getRoundingMode(status) == softfloat_round_min), 0, 0);
+        }
+        if (expA) --expA;
+        if (sigDiff < 0) {
+            signZ = ! signZ;
+            sigDiff = -sigDiff;
+        }
+        shiftDist = softfloat_countLeadingZeros64(sigDiff) - 11;
+        expZ = expA - shiftDist;
+        if (expZ < 0) {
+            shiftDist = expA;
+            expZ = 0;
+        }
+        if (!expZ && sigDiff) {
+            if (softfloat_flushUnderflowToZero(status)) {
+                softfloat_raiseFlags(status, softfloat_flag_underflow | softfloat_flag_inexact);
+                return packToF64UI(signZ, 0, 0);
+            }
+            if (! softfloat_isMaskedException(status, softfloat_flag_underflow)) {
+                softfloat_raiseFlags(status, softfloat_flag_underflow);
+            }
+        }
+        return packToF64UI(signZ, expZ, sigDiff<<shiftDist);
+    } else {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        sigA <<= 10;
+        sigB <<= 10;
+        if (expDiff < 0) {
+            /*----------------------------------------------------------------
+            *----------------------------------------------------------------*/
+            signZ = ! signZ;
+            if (expB == 0x7FF) {
+                if (sigB) goto propagateNaN;
+                if (sigA && !expA) softfloat_raiseFlags(status, softfloat_flag_denormal);
+                return packToF64UI(signZ, 0x7FF, 0);
+            }
+
+            if ((sigA && !expA) || (sigB && !expB))
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+
+            sigA += expA ? UINT64_C(0x4000000000000000) : sigA;
+            sigA = softfloat_shiftRightJam64(sigA, -expDiff);
+            sigB |= UINT64_C(0x4000000000000000);
+            expZ = expB;
+            sigZ = sigB - sigA;
+        } else {
+            /*----------------------------------------------------------------
+            *----------------------------------------------------------------*/
+            if (expA == 0x7FF) {
+                if (sigA) goto propagateNaN;
+                if (sigB && !expB) softfloat_raiseFlags(status, softfloat_flag_denormal);
+                return uiA;
+            }
+
+            if ((sigA && !expA) || (sigB && !expB))
+                softfloat_raiseFlags(status, softfloat_flag_denormal);
+
+            sigB += expB ? UINT64_C(0x4000000000000000) : sigB;
+            sigB = softfloat_shiftRightJam64(sigB, expDiff);
+            sigA |= UINT64_C(0x4000000000000000);
+            expZ = expA;
+            sigZ = sigA - sigB;
+        }
+        return softfloat_normRoundPackToF64(signZ, expZ - 1, sigZ, status);
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    return softfloat_propagateNaNF64UI(uiA, uiB, status);
+}
diff --git a/src/cpu/softfloat3e/softfloat-compare.h b/src/cpu/softfloat3e/softfloat-compare.h
new file mode 100644
index 000000000..5b70bc217
--- /dev/null
+++ b/src/cpu/softfloat3e/softfloat-compare.h
@@ -0,0 +1,725 @@
+/*============================================================================
+
+This C header file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#ifndef _SOFTFLOAT_COMPARE_H_
+#define _SOFTFLOAT_COMPARE_H_
+
+#include "softfloat.h"
+
+// ======= float16 ======= //
+
+typedef int (*float16_compare_method)(float16, float16, struct softfloat_status_t *status);
+
+// 0x00
+static __inline int f16_eq_ordered_quiet(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_equal);
+}
+
+// 0x01
+static __inline int f16_lt_ordered_signalling(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare(a, b, status);
+   return (relation == softfloat_relation_less);
+}
+
+// 0x02
+static __inline int f16_le_ordered_signalling(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare(a, b, status);
+   return (relation == softfloat_relation_less) || (relation == softfloat_relation_equal);
+}
+
+// 0x03
+static __inline int f16_unordered_quiet(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_unordered);
+}
+
+// 0x04
+static __inline int f16_neq_unordered_quiet(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare_quiet(a, b, status);
+   return (relation != softfloat_relation_equal);
+}
+
+// 0x05
+static __inline int f16_nlt_unordered_signalling(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare(a, b, status);
+   return (relation != softfloat_relation_less);
+}
+
+// 0x06
+static __inline int f16_nle_unordered_signalling(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare(a, b, status);
+   return (relation != softfloat_relation_less) && (relation != softfloat_relation_equal);
+}
+
+// 0x07
+static __inline int f16_ordered_quiet(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare_quiet(a, b, status);
+   return (relation != softfloat_relation_unordered);
+}
+
+// 0x08
+static __inline int f16_eq_unordered_quiet(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_equal) || (relation == softfloat_relation_unordered);
+}
+
+// 0x09
+static __inline int f16_nge_unordered_signalling(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare(a, b, status);
+   return (relation == softfloat_relation_less) || (relation == softfloat_relation_unordered);
+}
+
+// 0x0a
+static __inline int f16_ngt_unordered_signalling(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare(a, b, status);
+   return (relation != softfloat_relation_greater);
+}
+
+// 0x0b
+static __inline int f16_false_quiet(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   f16_compare_quiet(a, b, status);
+   return 0;
+}
+
+// 0x0c
+static __inline int f16_neq_ordered_quiet(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare_quiet(a, b, status);
+   return (relation != softfloat_relation_equal) && (relation != softfloat_relation_unordered);
+}
+
+// 0x0d
+static __inline int f16_ge_ordered_signalling(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare(a, b, status);
+   return (relation == softfloat_relation_greater) || (relation == softfloat_relation_equal);
+}
+
+// 0x0e
+static __inline int f16_gt_ordered_signalling(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare(a, b, status);
+   return (relation == softfloat_relation_greater);
+}
+
+// 0x0f
+static __inline int f16_true_quiet(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   f16_compare_quiet(a, b, status);
+   return 1;
+}
+
+// 0x10
+static __inline int f16_eq_ordered_signalling(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare(a, b, status);
+   return (relation == softfloat_relation_equal);
+}
+
+// 0x11
+static __inline int f16_lt_ordered_quiet(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_less);
+}
+
+// 0x12
+static __inline int f16_le_ordered_quiet(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_less) || (relation == softfloat_relation_equal);
+}
+
+// 0x13
+static __inline int f16_unordered_signalling(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare(a, b, status);
+   return (relation == softfloat_relation_unordered);
+}
+
+// 0x14
+static __inline int f16_neq_unordered_signalling(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare(a, b, status);
+   return (relation != softfloat_relation_equal);
+}
+
+// 0x15
+static __inline int f16_nlt_unordered_quiet(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare_quiet(a, b, status);
+   return (relation != softfloat_relation_less);
+}
+
+// 0x16
+static __inline int f16_nle_unordered_quiet(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare_quiet(a, b, status);
+   return (relation != softfloat_relation_less) && (relation != softfloat_relation_equal);
+}
+
+// 0x17
+static __inline int f16_ordered_signalling(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare(a, b, status);
+   return (relation != softfloat_relation_unordered);
+}
+
+// 0x18
+static __inline int f16_eq_unordered_signalling(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare(a, b, status);
+   return (relation == softfloat_relation_equal) || (relation == softfloat_relation_unordered);
+}
+
+// 0x19
+static __inline int f16_nge_unordered_quiet(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_less) || (relation == softfloat_relation_unordered);
+}
+
+// 0x1a
+static __inline int f16_ngt_unordered_quiet(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare_quiet(a, b, status);
+   return (relation != softfloat_relation_greater);
+}
+
+// 0x1b
+static __inline int f16_false_signalling(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   f16_compare(a, b, status);
+   return 0;
+}
+
+// 0x1c
+static __inline int f16_neq_ordered_signalling(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare(a, b, status);
+   return (relation != softfloat_relation_equal) && (relation != softfloat_relation_unordered);
+}
+
+// 0x1d
+static __inline int f16_ge_ordered_quiet(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_greater) || (relation == softfloat_relation_equal);
+}
+
+// 0x1e
+static __inline int f16_gt_ordered_quiet(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   int relation = f16_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_greater);
+}
+
+// 0x1f
+static __inline int f16_true_signalling(float16 a, float16 b, struct softfloat_status_t *status)
+{
+   f16_compare(a, b, status);
+   return 1;
+}
+
+// ======= float32 ======= //
+
+typedef int (*float32_compare_method)(float32, float32, struct softfloat_status_t *status);
+
+// 0x00
+static __inline int f32_eq_ordered_quiet(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_equal);
+}
+
+// 0x01
+static __inline int f32_lt_ordered_signalling(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare(a, b, status);
+   return (relation == softfloat_relation_less);
+}
+
+// 0x02
+static __inline int f32_le_ordered_signalling(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare(a, b, status);
+   return (relation == softfloat_relation_less) || (relation == softfloat_relation_equal);
+}
+
+// 0x03
+static __inline int f32_unordered_quiet(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_unordered);
+}
+
+// 0x04
+static __inline int f32_neq_unordered_quiet(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare_quiet(a, b, status);
+   return (relation != softfloat_relation_equal);
+}
+
+// 0x05
+static __inline int f32_nlt_unordered_signalling(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare(a, b, status);
+   return (relation != softfloat_relation_less);
+}
+
+// 0x06
+static __inline int f32_nle_unordered_signalling(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare(a, b, status);
+   return (relation != softfloat_relation_less) && (relation != softfloat_relation_equal);
+}
+
+// 0x07
+static __inline int f32_ordered_quiet(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare_quiet(a, b, status);
+   return (relation != softfloat_relation_unordered);
+}
+
+// 0x08
+static __inline int f32_eq_unordered_quiet(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_equal) || (relation == softfloat_relation_unordered);
+}
+
+// 0x09
+static __inline int f32_nge_unordered_signalling(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare(a, b, status);
+   return (relation == softfloat_relation_less) || (relation == softfloat_relation_unordered);
+}
+
+// 0x0a
+static __inline int f32_ngt_unordered_signalling(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare(a, b, status);
+   return (relation != softfloat_relation_greater);
+}
+
+// 0x0b
+static __inline int f32_false_quiet(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   f32_compare_quiet(a, b, status);
+   return 0;
+}
+
+// 0x0c
+static __inline int f32_neq_ordered_quiet(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare_quiet(a, b, status);
+   return (relation != softfloat_relation_equal) && (relation != softfloat_relation_unordered);
+}
+
+// 0x0d
+static __inline int f32_ge_ordered_signalling(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare(a, b, status);
+   return (relation == softfloat_relation_greater) || (relation == softfloat_relation_equal);
+}
+
+// 0x0e
+static __inline int f32_gt_ordered_signalling(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare(a, b, status);
+   return (relation == softfloat_relation_greater);
+}
+
+// 0x0f
+static __inline int f32_true_quiet(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   f32_compare_quiet(a, b, status);
+   return 1;
+}
+
+// 0x10
+static __inline int f32_eq_ordered_signalling(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare(a, b, status);
+   return (relation == softfloat_relation_equal);
+}
+
+// 0x11
+static __inline int f32_lt_ordered_quiet(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_less);
+}
+
+// 0x12
+static __inline int f32_le_ordered_quiet(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_less) || (relation == softfloat_relation_equal);
+}
+
+// 0x13
+static __inline int f32_unordered_signalling(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare(a, b, status);
+   return (relation == softfloat_relation_unordered);
+}
+
+// 0x14
+static __inline int f32_neq_unordered_signalling(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare(a, b, status);
+   return (relation != softfloat_relation_equal);
+}
+
+// 0x15
+static __inline int f32_nlt_unordered_quiet(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare_quiet(a, b, status);
+   return (relation != softfloat_relation_less);
+}
+
+// 0x16
+static __inline int f32_nle_unordered_quiet(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare_quiet(a, b, status);
+   return (relation != softfloat_relation_less) && (relation != softfloat_relation_equal);
+}
+
+// 0x17
+static __inline int f32_ordered_signalling(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare(a, b, status);
+   return (relation != softfloat_relation_unordered);
+}
+
+// 0x18
+static __inline int f32_eq_unordered_signalling(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare(a, b, status);
+   return (relation == softfloat_relation_equal) || (relation == softfloat_relation_unordered);
+}
+
+// 0x19
+static __inline int f32_nge_unordered_quiet(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_less) || (relation == softfloat_relation_unordered);
+}
+
+// 0x1a
+static __inline int f32_ngt_unordered_quiet(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare_quiet(a, b, status);
+   return (relation != softfloat_relation_greater);
+}
+
+// 0x1b
+static __inline int f32_false_signalling(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   f32_compare(a, b, status);
+   return 0;
+}
+
+// 0x1c
+static __inline int f32_neq_ordered_signalling(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare(a, b, status);
+   return (relation != softfloat_relation_equal) && (relation != softfloat_relation_unordered);
+}
+
+// 0x1d
+static __inline int f32_ge_ordered_quiet(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_greater) || (relation == softfloat_relation_equal);
+}
+
+// 0x1e
+static __inline int f32_gt_ordered_quiet(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   int relation = f32_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_greater);
+}
+
+// 0x1f
+static __inline int f32_true_signalling(float32 a, float32 b, struct softfloat_status_t *status)
+{
+   f32_compare(a, b, status);
+   return 1;
+}
+
+// ======= float64 ======= //
+
+typedef int (*float64_compare_method)(float64, float64, struct softfloat_status_t *status);
+
+// 0x00
+static __inline int f64_eq_ordered_quiet(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_equal);
+}
+
+// 0x01
+static __inline int f64_lt_ordered_signalling(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare(a, b, status);
+   return (relation == softfloat_relation_less);
+}
+
+// 0x02
+static __inline int f64_le_ordered_signalling(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare(a, b, status);
+   return (relation == softfloat_relation_less) || (relation == softfloat_relation_equal);
+}
+
+// 0x03
+static __inline int f64_unordered_quiet(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_unordered);
+}
+
+// 0x04
+static __inline int f64_neq_unordered_quiet(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare_quiet(a, b, status);
+   return (relation != softfloat_relation_equal);
+}
+
+// 0x05
+static __inline int f64_nlt_unordered_signalling(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare(a, b, status);
+   return (relation != softfloat_relation_less);
+}
+
+// 0x06
+static __inline int f64_nle_unordered_signalling(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare(a, b, status);
+   return (relation != softfloat_relation_less) && (relation != softfloat_relation_equal);
+}
+
+// 0x07
+static __inline int f64_ordered_quiet(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare_quiet(a, b, status);
+   return (relation != softfloat_relation_unordered);
+}
+
+// 0x08
+static __inline int f64_eq_unordered_quiet(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_equal) || (relation == softfloat_relation_unordered);
+}
+
+// 0x09
+static __inline int f64_nge_unordered_signalling(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare(a, b, status);
+   return (relation == softfloat_relation_less) || (relation == softfloat_relation_unordered);
+}
+
+// 0x0a
+static __inline int f64_ngt_unordered_signalling(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare(a, b, status);
+   return (relation != softfloat_relation_greater);
+}
+
+// 0x0b
+static __inline int f64_false_quiet(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   f64_compare_quiet(a, b, status);
+   return 0;
+}
+
+// 0x0c
+static __inline int f64_neq_ordered_quiet(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare_quiet(a, b, status);
+   return (relation != softfloat_relation_equal) && (relation != softfloat_relation_unordered);
+}
+
+// 0x0d
+static __inline int f64_ge_ordered_signalling(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare(a, b, status);
+   return (relation == softfloat_relation_greater) || (relation == softfloat_relation_equal);
+}
+
+// 0x0e
+static __inline int f64_gt_ordered_signalling(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare(a, b, status);
+   return (relation == softfloat_relation_greater);
+}
+
+// 0x0f
+static __inline int f64_true_quiet(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   f64_compare_quiet(a, b, status);
+   return 1;
+}
+
+// 0x10
+static __inline int f64_eq_ordered_signalling(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare(a, b, status);
+   return (relation == softfloat_relation_equal);
+}
+
+// 0x11
+static __inline int f64_lt_ordered_quiet(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_less);
+}
+
+// 0x12
+static __inline int f64_le_ordered_quiet(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_less) || (relation == softfloat_relation_equal);
+}
+
+// 0x13
+static __inline int f64_unordered_signalling(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare(a, b, status);
+   return (relation == softfloat_relation_unordered);
+}
+
+// 0x14
+static __inline int f64_neq_unordered_signalling(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare(a, b, status);
+   return (relation != softfloat_relation_equal);
+}
+
+// 0x15
+static __inline int f64_nlt_unordered_quiet(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare_quiet(a, b, status);
+   return (relation != softfloat_relation_less);
+}
+
+// 0x16
+static __inline int f64_nle_unordered_quiet(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare_quiet(a, b, status);
+   return (relation != softfloat_relation_less) && (relation != softfloat_relation_equal);
+}
+
+// 0x17
+static __inline int f64_ordered_signalling(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare(a, b, status);
+   return (relation != softfloat_relation_unordered);
+}
+
+// 0x18
+static __inline int f64_eq_unordered_signalling(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare(a, b, status);
+   return (relation == softfloat_relation_equal) || (relation == softfloat_relation_unordered);
+}
+
+// 0x19
+static __inline int f64_nge_unordered_quiet(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_less) || (relation == softfloat_relation_unordered);
+}
+
+// 0x1a
+static __inline int f64_ngt_unordered_quiet(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare_quiet(a, b, status);
+   return (relation != softfloat_relation_greater);
+}
+
+// 0x1b
+static __inline int f64_false_signalling(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   f64_compare(a, b, status);
+   return 0;
+}
+
+// 0x1c
+static __inline int f64_neq_ordered_signalling(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare(a, b, status);
+   return (relation != softfloat_relation_equal) && (relation != softfloat_relation_unordered);
+}
+
+// 0x1d
+static __inline int f64_ge_ordered_quiet(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_greater) || (relation == softfloat_relation_equal);
+}
+
+// 0x1e
+static __inline int f64_gt_ordered_quiet(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   int relation = f64_compare_quiet(a, b, status);
+   return (relation == softfloat_relation_greater);
+}
+
+// 0x1f
+static __inline int f64_true_signalling(float64 a, float64 b, struct softfloat_status_t *status)
+{
+   f64_compare(a, b, status);
+   return 1;
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/softfloat-extra.h b/src/cpu/softfloat3e/softfloat-extra.h
new file mode 100644
index 000000000..80b4d26d4
--- /dev/null
+++ b/src/cpu/softfloat3e/softfloat-extra.h
@@ -0,0 +1,141 @@
+/*============================================================================
+
+This C header file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#ifndef _SOFTFLOAT_EXTRA_H_
+#define _SOFTFLOAT_EXTRA_H_
+
+#include "config.h"
+#include "internals.h"
+
+// ======= float16 ======= //
+
+static __inline bool f16_sign(float16 a)
+{
+    return signF16UI(a);
+}
+
+static __inline int8_t f16_exp(float16 a)
+{
+    return expF16UI(a);
+}
+
+static __inline uint16_t f16_fraction(float16 a)
+{
+    return fracF16UI(a);
+}
+
+static __inline float16 f16_denormal_to_zero(float16 a)
+{
+    if (! expF16UI(a) && fracF16UI(a))
+        return a & 0x8000;
+    return a;
+}
+
+// ======= float32 ======= //
+
+static __inline bool f32_sign(float32 a)
+{
+    return signF32UI(a);
+}
+
+static __inline int16_t f32_exp(float32 a)
+{
+    return expF32UI(a);
+}
+
+static __inline uint32_t f32_fraction(float32 a)
+{
+    return fracF32UI(a);
+}
+
+static __inline float32 f32_denormal_to_zero(float32 a)
+{
+    if (! expF32UI(a) && fracF32UI(a))
+        return a & 0x80000000;
+    return a;
+}
+
+// ======= float64 ======= //
+
+static __inline bool f64_sign(float64 a)
+{
+    return signF64UI(a);
+}
+
+static __inline int16_t f64_exp(float64 a)
+{
+    return expF64UI(a);
+}
+
+static __inline uint64_t f64_fraction(float64 a)
+{
+    return fracF64UI(a);
+}
+
+static __inline float64 f64_denormal_to_zero(float64 a)
+{
+    if (! expF64UI(a) && fracF64UI(a))
+        return a & ((uint64_t)(1) << 63);
+    return a;
+}
+
+// ======= floatx80 ======= //
+#ifdef __cplusplus
+extern "C" {
+#endif
+static __inline bool extF80_isUnsupported(extFloat80_t a)
+{
+    return ((a.signExp & 0x7FFF) && !(a.signif & BX_CONST64(0x8000000000000000)));
+}
+
+static __inline bool extF80_sign(extFloat80_t a)
+{
+    return signExtF80UI64(a.signExp);
+}
+
+static __inline int16_t extF80_exp(extFloat80_t a)
+{
+    return expExtF80UI64(a.signExp);
+}
+
+static __inline uint64_t extF80_fraction(extFloat80_t a)
+{
+    return a.signif;
+}
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/cpu/softfloat3e/softfloat-helpers.h b/src/cpu/softfloat3e/softfloat-helpers.h
new file mode 100644
index 000000000..49ffeb96f
--- /dev/null
+++ b/src/cpu/softfloat3e/softfloat-helpers.h
@@ -0,0 +1,158 @@
+/*============================================================================
+This source file is an extension to the SoftFloat IEC/IEEE Floating-point
+Arithmetic Package, Release 2b, written for Bochs (x86 achitecture simulator)
+floating point emulation.
+
+THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has
+been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES
+RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS
+AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,
+COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE
+EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
+INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
+OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
+
+Derivative works are acceptable, even for commercial purposes, so long as
+(1) the source code for the derivative work includes prominent notice that
+the work is derivative, and (2) the source code includes prominent notice with
+these four paragraphs for those parts of this code that are retained.
+=============================================================================*/
+
+/*============================================================================
+ * Adapted for Bochs (x86 achitecture simulator) by
+ *            Stanislav Shwartsman [sshwarts at sourceforge net]
+ * ==========================================================================*/
+
+#ifndef _SOFTFLOAT_HELPERS_H_
+#define _SOFTFLOAT_HELPERS_H_
+
+#include <assert.h>
+
+#include "primitives.h"
+#include "primitiveTypes.h"
+
+/*----------------------------------------------------------------------------
+| Multiplies the 128-bit value formed by concatenating `a0' and `a1' by
+| `b' to obtain a 192-bit product.  The product is broken into three 64-bit
+| pieces which are stored at the locations pointed to by `z0Ptr', `z1Ptr', and
+| `z2Ptr'.
+*----------------------------------------------------------------------------*/
+
+static __inline void mul128By64To192(uint64_t a64, uint64_t a0, uint64_t b, uint64_t *z0Ptr, uint64_t *z1Ptr, uint64_t *z2Ptr)
+{
+    uint64_t zPtr[4];
+
+    softfloat_mul128To256M(a64, a0, 0, b, (uint64_t*) zPtr);
+
+    assert(zPtr[indexWord(4, 3)] == 0);
+
+    *z0Ptr = zPtr[indexWord(4, 2)];
+    *z1Ptr = zPtr[indexWord(4, 1)];
+    *z2Ptr = zPtr[indexWord(4, 0)];
+}
+
+/*----------------------------------------------------------------------------
+| Shifts the 128-bit value formed by concatenating `a0' and `a1' left by the
+| number of bits given in `count'.  Any bits shifted off are lost.  The value
+| of `count' must be less than 64.  The result is broken into two 64-bit
+| pieces which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
+*----------------------------------------------------------------------------*/
+
+static __inline void shortShift128Left(uint64_t a0, uint64_t a1, int count, uint64_t *z0Ptr, uint64_t *z1Ptr)
+{
+    *z1Ptr = a1<<count;
+    *z0Ptr = (count == 0) ? a0 : (a0<<count) | (a1>>((-count) & 63));
+}
+
+/*----------------------------------------------------------------------------
+| Shifts the 128-bit value formed by concatenating `a0' and `a1' right by the
+| number of bits given in `count'.  Any bits shifted off are lost.  The value
+| of `count' must be less than 64. The result is broken into two 64-bit pieces
+| which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
+*----------------------------------------------------------------------------*/
+
+static __inline void shortShift128Right(uint64_t a0, uint64_t a1, int count, uint64_t *z0Ptr, uint64_t *z1Ptr)
+{
+    uint64_t z0 = a0, z1 = a1;
+    int negCount = (-count) & 63;
+
+    if (count != 0) {
+        z1 = (a0<<negCount) | (a1>>count);
+        z0 = a0>>count;
+    }
+    *z1Ptr = z1;
+    *z0Ptr = z0;
+}
+
+/*----------------------------------------------------------------------------
+| Returns an approximation to the 64-bit integer quotient obtained by dividing
+| `b' into the 128-bit value formed by concatenating `a0' and `a1'.  The
+| divisor `b' must be at least 2^63.  If q is the exact quotient truncated
+| toward zero, the approximation returned lies between q and q + 2 inclusive.
+| If the exact quotient q is larger than 64 bits, the maximum positive 64-bit
+| unsigned integer is returned.
+*----------------------------------------------------------------------------*/
+
+#ifdef USE_estimateDiv128To64
+static uint64_t estimateDiv128To64(uint64_t a0, uint64_t a1, uint64_t b)
+{
+    uint128 term, rem;
+    uint64_t b0, b1;
+    uint64_t z;
+    if (b <= a0) return BX_CONST64(0xFFFFFFFFFFFFFFFF);
+    b0 = b>>32;
+    z = (b0<<32 <= a0) ? BX_CONST64(0xFFFFFFFF00000000) : (a0 / b0)<<32;
+    term = softfloat_mul64To128(b, z);
+    rem = softfloat_sub128(a0, a1, term.v64, term.v0);
+    while (((int64_t) rem.v64) < 0) {
+        z -= UINT64_C(0x100000000);
+        b1 = b<<32;
+        rem = softfloat_add128(rem.v64, rem.v0, b0, b1);
+    }
+    rem.v64 = (rem.v64<<32) | (rem.v0>>32);
+    z |= (b0<<32 <= rem.v64) ? 0xFFFFFFFF : rem.v64 / b0;
+    return z;
+}
+#endif
+
+/*----------------------------------------------------------------------------
+| Adds the 192-bit value formed by concatenating `a0', `a1', and `a2' to the
+| 192-bit value formed by concatenating `b0', `b1', and `b2'.  Addition is
+| modulo 2^192, so any carry out is lost.  The result is broken into three
+| 64-bit pieces which are stored at the locations pointed to by `z0Ptr',
+| `z1Ptr', and `z2Ptr'.
+*----------------------------------------------------------------------------*/
+
+static __inline void add192(uint64_t a0, uint64_t a1, uint64_t a2, uint64_t b0, uint64_t b1, uint64_t b2, uint64_t *z0Ptr, uint64_t *z1Ptr, uint64_t *z2Ptr)
+{
+    uint64_t z0, z1, z2;
+    unsigned carry0, carry1;
+
+    z2 = a2 + b2;
+    carry1 = (z2 < a2);
+    z1 = a1 + b1;
+    carry0 = (z1 < a1);
+    z0 = a0 + b0;
+    z1 += carry1;
+    z0 += (z1 < carry1);
+    z0 += carry0;
+    *z2Ptr = z2;
+    *z1Ptr = z1;
+    *z0Ptr = z0;
+}
+
+/*----------------------------------------------------------------------------
+| Subtracts the 128-bit value formed by concatenating `b0' and `b1' from the
+| 128-bit value formed by concatenating `a0' and `a1'.  Subtraction is modulo
+| 2^128, so any borrow out (carry out) is lost.  The result is broken into two
+| 64-bit pieces which are stored at the locations pointed to by `z0Ptr' and
+| `z1Ptr'.
+*----------------------------------------------------------------------------*/
+
+static __inline void sub128(uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1, uint64_t *z0Ptr, uint64_t *z1Ptr)
+{
+    *z1Ptr = a1 - b1;
+    *z0Ptr = a0 - b0 - (a1 < b1);
+}
+
+#endif
diff --git a/src/cpu/softfloat3e/softfloat-specialize.c b/src/cpu/softfloat3e/softfloat-specialize.c
new file mode 100644
index 000000000..5bc57e565
--- /dev/null
+++ b/src/cpu/softfloat3e/softfloat-specialize.c
@@ -0,0 +1,90 @@
+/*============================================================================
+This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
+Arithmetic Package, Release 2b.
+
+Written by John R. Hauser.  This work was made possible in part by the
+International Computer Science Institute, located at Suite 600, 1947 Center
+Street, Berkeley, California 94704.  Funding was partially provided by the
+National Science Foundation under grant MIP-9311980.  The original version
+of this code was written as part of a project to build a fixed-point vector
+processor in collaboration with the University of California at Berkeley,
+overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
+is available through the Web page `http://www.cs.berkeley.edu/~jhauser/
+arithmetic/SoftFloat.html'.
+
+THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has
+been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES
+RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS
+AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,
+COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE
+EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
+INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
+OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
+
+Derivative works are acceptable, even for commercial purposes, so long as
+(1) the source code for the derivative work includes prominent notice that
+the work is derivative, and (2) the source code includes prominent notice with
+these four paragraphs for those parts of this code that are retained.
+=============================================================================*/
+
+#include "softfloat-specialize.h"
+
+/*============================================================================
+ * Adapted for Bochs (x86 achitecture simulator) by
+ *            Stanislav Shwartsman [sshwarts at sourceforge net]
+ * ==========================================================================*/
+
+const int16_t int16_indefinite = (int16_t) 0x8000;
+const int32_t int32_indefinite = (int32_t) 0x80000000;
+const int64_t int64_indefinite = (int64_t) BX_CONST64(0x8000000000000000);
+
+const uint16_t uint16_indefinite = 0xffff;
+const uint32_t uint32_indefinite = 0xffffffff;
+const uint64_t uint64_indefinite = BX_CONST64(0xffffffffffffffff);
+
+/*----------------------------------------------------------------------------
+| Commonly used half-precision floating point constants
+*----------------------------------------------------------------------------*/
+const float16 float16_negative_inf  = 0xfc00;
+const float16 float16_positive_inf  = 0x7c00;
+const float16 float16_negative_zero = 0x8000;
+const float16 float16_positive_zero = 0x0000;
+
+/*----------------------------------------------------------------------------
+| The pattern for a default generated half-precision NaN.
+*----------------------------------------------------------------------------*/
+const float16 float16_default_nan = 0xFE00;
+
+/*----------------------------------------------------------------------------
+| Commonly used single-precision floating point constants
+*----------------------------------------------------------------------------*/
+const float32 float32_negative_inf  = 0xff800000;
+const float32 float32_positive_inf  = 0x7f800000;
+const float32 float32_negative_zero = 0x80000000;
+const float32 float32_positive_zero = 0x00000000;
+const float32 float32_negative_one  = 0xbf800000;
+const float32 float32_positive_one  = 0x3f800000;
+const float32 float32_max_float     = 0x7f7fffff;
+const float32 float32_min_float     = 0xff7fffff;
+
+/*----------------------------------------------------------------------------
+| The pattern for a default generated single-precision NaN.
+*----------------------------------------------------------------------------*/
+const float32 float32_default_nan   = 0xffc00000;
+
+/*----------------------------------------------------------------------------
+| Commonly used single-precision floating point constants
+*----------------------------------------------------------------------------*/
+const float64 float64_negative_inf  = BX_CONST64(0xfff0000000000000);
+const float64 float64_positive_inf  = BX_CONST64(0x7ff0000000000000);
+const float64 float64_negative_zero = BX_CONST64(0x8000000000000000);
+const float64 float64_positive_zero = BX_CONST64(0x0000000000000000);
+const float64 float64_negative_one  = BX_CONST64(0xbff0000000000000);
+const float64 float64_positive_one  = BX_CONST64(0x3ff0000000000000);
+const float64 float64_max_float     = BX_CONST64(0x7fefffffffffffff);
+const float64 float64_min_float     = BX_CONST64(0xffefffffffffffff);
+
+/*----------------------------------------------------------------------------
+| The pattern for a default generated double-precision NaN.
+*----------------------------------------------------------------------------*/
+const float64 float64_default_nan = BX_CONST64(0xFFF8000000000000);
diff --git a/src/cpu/softfloat3e/softfloat-specialize.h b/src/cpu/softfloat3e/softfloat-specialize.h
new file mode 100644
index 000000000..587f0d345
--- /dev/null
+++ b/src/cpu/softfloat3e/softfloat-specialize.h
@@ -0,0 +1,224 @@
+/*============================================================================
+This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
+Arithmetic Package, Release 2b.
+
+Written by John R. Hauser.  This work was made possible in part by the
+International Computer Science Institute, located at Suite 600, 1947 Center
+Street, Berkeley, California 94704.  Funding was partially provided by the
+National Science Foundation under grant MIP-9311980.  The original version
+of this code was written as part of a project to build a fixed-point vector
+processor in collaboration with the University of California at Berkeley,
+overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
+is available through the Web page `http://www.cs.berkeley.edu/~jhauser/
+arithmetic/SoftFloat.html'.
+
+THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has
+been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES
+RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS
+AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,
+COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE
+EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
+INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
+OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
+
+Derivative works are acceptable, even for commercial purposes, so long as
+(1) the source code for the derivative work includes prominent notice that
+the work is derivative, and (2) the source code includes prominent notice with
+these four paragraphs for those parts of this code that are retained.
+=============================================================================*/
+
+#ifndef _SOFTFLOAT_SPECIALIZE_H_
+#define _SOFTFLOAT_SPECIALIZE_H_
+
+#include "config.h"
+#include "softfloat.h"
+#include "softfloat_types.h"
+
+/*============================================================================
+ * Adapted for Bochs (x86 achitecture simulator) by
+ *            Stanislav Shwartsman [sshwarts at sourceforge net]
+ * ==========================================================================*/
+
+extern const int16_t int16_indefinite;
+extern const int32_t int32_indefinite;
+extern const int64_t int64_indefinite;
+
+extern const uint16_t uint16_indefinite;
+extern const uint32_t uint32_indefinite;
+extern const uint64_t uint64_indefinite;
+
+/*----------------------------------------------------------------------------
+| Commonly used half-precision floating point constants
+*----------------------------------------------------------------------------*/
+extern const float16 float16_negative_inf;
+extern const float16 float16_positive_inf;
+extern const float16 float16_negative_zero;
+extern const float16 float16_positive_zero;
+
+/*----------------------------------------------------------------------------
+| The pattern for a default generated half-precision NaN.
+*----------------------------------------------------------------------------*/
+extern const float16 float16_default_nan;
+
+#define FLOAT16_EXP_BIAS 0xF
+
+/*----------------------------------------------------------------------------
+| Packs the sign `zSign', exponent `zExp', and significand `zSig' into a
+| single-precision floating-point value, returning the result.  After being
+| shifted into the proper positions, the three fields are simply added
+| together to form the result.  This means that any integer portion of `zSig'
+| will be added into the exponent.  Since a properly normalized significand
+| will have an integer portion equal to 1, the `zExp' input should be 1 less
+| than the desired result exponent whenever `zSig' is a complete, normalized
+| significand.
+*----------------------------------------------------------------------------*/
+
+static __inline float16 packFloat16(int zSign, int zExp, uint16_t zSig)
+{
+    return (((uint16_t) zSign)<<15) + (((uint16_t) zExp)<<10) + zSig;
+}
+
+/*----------------------------------------------------------------------------
+| Commonly used single-precision floating point constants
+*----------------------------------------------------------------------------*/
+extern const float32 float32_negative_inf;
+extern const float32 float32_positive_inf;
+extern const float32 float32_negative_zero;
+extern const float32 float32_positive_zero;
+extern const float32 float32_negative_one;
+extern const float32 float32_positive_one;
+extern const float32 float32_max_float;
+extern const float32 float32_min_float;
+
+/*----------------------------------------------------------------------------
+| The pattern for a default generated single-precision NaN.
+*----------------------------------------------------------------------------*/
+extern const float32 float32_default_nan;
+
+#define FLOAT32_EXP_BIAS 0x7F
+
+/*----------------------------------------------------------------------------
+| Packs the sign `zSign', exponent `zExp', and significand `zSig' into a
+| single-precision floating-point value, returning the result.  After being
+| shifted into the proper positions, the three fields are simply added
+| together to form the result.  This means that any integer portion of `zSig'
+| will be added into the exponent.  Since a properly normalized significand
+| will have an integer portion equal to 1, the `zExp' input should be 1 less
+| than the desired result exponent whenever `zSig' is a complete, normalized
+| significand.
+*----------------------------------------------------------------------------*/
+
+static __inline float32 packFloat32(int zSign, int16_t zExp, uint32_t zSig)
+{
+    return (((uint32_t) zSign)<<31) + (((uint32_t) zExp)<<23) + zSig;
+}
+
+/*----------------------------------------------------------------------------
+| Commonly used single-precision floating point constants
+*----------------------------------------------------------------------------*/
+extern const float64 float64_negative_inf;
+extern const float64 float64_positive_inf;
+extern const float64 float64_negative_zero;
+extern const float64 float64_positive_zero;
+extern const float64 float64_negative_one;
+extern const float64 float64_positive_one;
+extern const float64 float64_max_float;
+extern const float64 float64_min_float;
+
+/*----------------------------------------------------------------------------
+| The pattern for a default generated double-precision NaN.
+*----------------------------------------------------------------------------*/
+extern const float64 float64_default_nan;
+
+#define FLOAT64_EXP_BIAS 0x3FF
+
+/*----------------------------------------------------------------------------
+| Packs the sign `zSign', exponent `zExp', and significand `zSig' into a
+| double-precision floating-point value, returning the result.  After being
+| shifted into the proper positions, the three fields are simply added
+| together to form the result.  This means that any integer portion of `zSig'
+| will be added into the exponent.  Since a properly normalized significand
+| will have an integer portion equal to 1, the `zExp' input should be 1 less
+| than the desired result exponent whenever `zSig' is a complete, normalized
+| significand.
+*----------------------------------------------------------------------------*/
+
+static __inline float64 packFloat64(int zSign, int16_t zExp, uint64_t zSig)
+{
+    return (((uint64_t) zSign)<<63) + (((uint64_t) zExp)<<52) + zSig;
+}
+
+/*-----------------------------------------------------------------------------
+| Commonly used extended double-precision floating-point constants.
+*----------------------------------------------------------------------------*/
+extern const floatx80 Const_Z;
+extern const floatx80 Const_1;
+extern const floatx80 Const_L2T;
+extern const floatx80 Const_L2E;
+extern const floatx80 Const_PI;
+extern const floatx80 Const_LG2;
+extern const floatx80 Const_LN2;
+extern const floatx80 Const_INF;
+/*----------------------------------------------------------------------------
+| The pattern for a default generated extended double-precision NaN.  The
+| `high' and `low' values hold the most- and least-significant bits,
+| respectively.
+*----------------------------------------------------------------------------*/
+#define floatx80_default_nan_exp 0xFFFF
+#define floatx80_default_nan_fraction BX_CONST64(0xC000000000000000)
+
+#define FLOATX80_EXP_BIAS 0x3FFF
+
+/*----------------------------------------------------------------------------
+| Packs the sign `zSign', exponent `zExp', and significand `zSig' into an
+| extended double-precision floating-point value, returning the result.
+*----------------------------------------------------------------------------*/
+
+static __inline floatx80 packFloatx80(int zSign, int32_t zExp, uint64_t zSig)
+{
+    floatx80 z;
+    z.signif = zSig;
+    z.signExp = (zSign << 15) + zExp;
+    return z;
+}
+
+#ifdef FLOAT128
+
+/*----------------------------------------------------------------------------
+| Packs the sign `zSign', the exponent `zExp', and the significand formed
+| by the concatenation of `zSig0' and `zSig1' into a quadruple-precision
+| floating-point value, returning the result.  After being shifted into the
+| proper positions, the three fields `zSign', `zExp', and `zSig0' are simply
+| added together to form the most significant 32 bits of the result.  This
+| means that any integer portion of `zSig0' will be added into the exponent.
+| Since a properly normalized significand will have an integer portion equal
+| to 1, the `zExp' input should be 1 less than the desired result exponent
+| whenever `zSig0' and `zSig1' concatenated form a complete, normalized
+| significand.
+*----------------------------------------------------------------------------*/
+
+static __inline float128_t packFloat128(int zSign, int32_t zExp, uint64_t zSig0, uint64_t zSig1)
+{
+    float128_t z;
+    z.v0  = zSig1;
+    z.v64 = (((uint64_t) zSign)<<63) + (((uint64_t) zExp)<<48) + zSig0;
+    return z;
+}
+
+/*----------------------------------------------------------------------------
+| Packs two 64-bit precision integers into into the quadruple-precision
+| floating-point value, returning the result.
+*----------------------------------------------------------------------------*/
+
+static __inline float128_t packFloat128(uint64_t zHi, uint64_t zLo)
+{
+    float128_t z;
+    z.v0  = zLo;
+    z.v64 = zHi;
+    return z;
+}
+
+#define PACK_FLOAT_128(hi,lo) packFloat128(BX_CONST64(hi),BX_CONST64(lo))
+
+#endif
+#endif
diff --git a/src/cpu/softfloat3e/softfloat.h b/src/cpu/softfloat3e/softfloat.h
new file mode 100644
index 000000000..40253a2a9
--- /dev/null
+++ b/src/cpu/softfloat3e/softfloat.h
@@ -0,0 +1,702 @@
+/*============================================================================
+
+This C header file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+/*============================================================================
+| Note:  If SoftFloat is made available as a general library for programs to
+| use, it is strongly recommended that a platform-specific version of this
+| header, "softfloat.h", be created that folds in "softfloat_types.h" and that
+| eliminates all dependencies on compile-time macros.
+*============================================================================*/
+
+#ifndef _SOFTFLOAT_H_
+#define _SOFTFLOAT_H_
+
+#include <stdint.h>
+
+#include "softfloat_types.h"
+#include "softfloat-extra.h"
+
+struct softfloat_status_t
+{
+    uint8_t softfloat_roundingMode;
+    int softfloat_exceptionFlags;
+    int softfloat_exceptionMasks;
+    int softfloat_suppressException;
+
+    bool softfloat_denormals_are_zeros;
+    bool softfloat_flush_underflow_to_zero;
+
+    /*----------------------------------------------------------------------------
+    | Rounding precision for 80-bit extended double-precision floating-point.
+    | Valid values are 32, 64, and 80.
+    *----------------------------------------------------------------------------*/
+    uint8_t extF80_roundingPrecision;
+};
+
+/*----------------------------------------------------------------------------
+| Software floating-point rounding mode.
+*----------------------------------------------------------------------------*/
+enum {
+    softfloat_round_near_even   = 0,
+    softfloat_round_min         = 1,
+    softfloat_round_down        = softfloat_round_min,
+    softfloat_round_max         = 2,
+    softfloat_round_up          = softfloat_round_max,
+    softfloat_round_minMag      = 3,
+    softfloat_round_to_zero     = softfloat_round_minMag,
+    softfloat_round_near_maxMag = 4
+};
+
+/*----------------------------------------------------------------------------
+| Software floating-point exception flags.
+*----------------------------------------------------------------------------*/
+enum softfloat_exception_flag_t {
+    softfloat_flag_invalid   = 0x01,
+    softfloat_flag_denormal  = 0x02,
+    softfloat_flag_divbyzero = 0x04,
+    softfloat_flag_infinite  = softfloat_flag_divbyzero,
+    softfloat_flag_overflow  = 0x08,
+    softfloat_flag_underflow = 0x10,
+    softfloat_flag_inexact   = 0x20
+};
+
+static const unsigned softfloat_all_exceptions_mask = 0x3f;
+
+#define FLOATX80
+
+#ifdef FLOATX80
+#define RAISE_SW_C1 0x0200
+#endif
+
+/*----------------------------------------------------------------------------
+| Software IEC/IEEE floating-point ordering relations
+*----------------------------------------------------------------------------*/
+enum {
+    softfloat_relation_less      = -1,
+    softfloat_relation_equal     =  0,
+    softfloat_relation_greater   =  1,
+    softfloat_relation_unordered =  2
+};
+
+/*----------------------------------------------------------------------------
+| Software IEC/IEEE floating-point class.
+*----------------------------------------------------------------------------*/
+typedef enum {
+    softfloat_zero,
+    softfloat_SNaN,
+    softfloat_QNaN,
+    softfloat_negative_inf,
+    softfloat_positive_inf,
+    softfloat_denormal,
+    softfloat_normalized
+} softfloat_class_t;
+
+/*----------------------------------------------------------------------------
+| Options to indicate which negations to perform in f*_muladd()
+| Using these differs from negating an input or output before calling
+| the muladd function in that this means that a NaN doesn't have its
+| sign bit inverted before it is propagated.
+*----------------------------------------------------------------------------*/
+enum {
+    softfloat_mulAdd_subC           = 1,
+    softfloat_muladd_negate_c       = softfloat_mulAdd_subC,
+    softfloat_mulAdd_subProd        = 2,
+    softfloat_muladd_negate_product = softfloat_mulAdd_subProd,
+    softfloat_muladd_negate_result  = softfloat_muladd_negate_c | softfloat_muladd_negate_product
+};
+
+static __inline void softfloat_setFlags(struct softfloat_status_t *status, int flags) {
+    status->softfloat_exceptionFlags = flags;
+}
+
+/*----------------------------------------------------------------------------
+| Routine to raise any or all of the software floating-point exception flags.
+*----------------------------------------------------------------------------*/
+static __inline void softfloat_raiseFlags(struct softfloat_status_t *status, int flags) {
+    status->softfloat_exceptionFlags |= flags;
+}
+
+/*----------------------------------------------------------------------------
+| Check if exception is masked.
+*----------------------------------------------------------------------------*/
+static __inline int softfloat_isMaskedException(const struct softfloat_status_t *status, int flags) {
+    return status->softfloat_exceptionMasks & flags;
+}
+
+/*----------------------------------------------------------------------------
+| Suppress generation of these exceptions.
+*----------------------------------------------------------------------------*/
+static __inline void softfloat_suppressException(struct softfloat_status_t *status, int flags) {
+    status->softfloat_suppressException |= flags;
+}
+
+/*----------------------------------------------------------------------------
+| Obtain current rounding mode.
+*----------------------------------------------------------------------------*/
+static __inline uint8_t softfloat_getRoundingMode(const struct softfloat_status_t *status) {
+    return status->softfloat_roundingMode;
+}
+
+/*----------------------------------------------------------------------------
+| Read denormals-are-zeroes flag.
+*----------------------------------------------------------------------------*/
+static __inline bool softfloat_denormalsAreZeros(const struct softfloat_status_t *status) {
+    return status->softfloat_denormals_are_zeros;
+}
+
+/*----------------------------------------------------------------------------
+| Read flush-underflow-to-zero flag.
+*----------------------------------------------------------------------------*/
+static __inline bool softfloat_flushUnderflowToZero(const struct softfloat_status_t *status) {
+    return status->softfloat_flush_underflow_to_zero;
+}
+
+/*----------------------------------------------------------------------------
+| Obtain current rounding precision for F80.
+*----------------------------------------------------------------------------*/
+static __inline uint8_t softfloat_extF80_roundingPrecision(const struct softfloat_status_t *status) {
+    return status->extF80_roundingPrecision;
+}
+
+/*----------------------------------------------------------------------------
+| Returns raised IEC/IEEE floating-point exception flags.
+*----------------------------------------------------------------------------*/
+static __inline int softfloat_getExceptionFlags(const struct softfloat_status_t *status) {
+    return status->softfloat_exceptionFlags & ~status->softfloat_suppressException;
+}
+
+/*----------------------------------------------------------------------------
+| Raise floating point precision lost up flag (floatx80 only).
+*----------------------------------------------------------------------------*/
+#ifdef FLOATX80
+static __inline void softfloat_setRoundingUp(struct softfloat_status_t *status) {
+    status->softfloat_exceptionFlags |= RAISE_SW_C1;
+}
+#endif
+
+/*----------------------------------------------------------------------------
+| Integer-to-floating-point conversion routines.
+*----------------------------------------------------------------------------*/
+float16 ui32_to_f16(uint32_t, struct softfloat_status_t *);
+float32 ui32_to_f32(uint32_t, struct softfloat_status_t *);
+float64 ui32_to_f64(uint32_t);
+float16 ui64_to_f16(uint64_t, struct softfloat_status_t *);
+float32 ui64_to_f32(uint64_t, struct softfloat_status_t *);
+float64 ui64_to_f64(uint64_t, struct softfloat_status_t *);
+float16 i32_to_f16(int32_t, struct softfloat_status_t *);
+float32 i32_to_f32(int32_t, struct softfloat_status_t *);
+float64 i32_to_f64(int32_t);
+float16 i64_to_f16(int64_t, struct softfloat_status_t *);
+float32 i64_to_f32(int64_t, struct softfloat_status_t *);
+float64 i64_to_f64(int64_t, struct softfloat_status_t *);
+
+static __inline float16 i16_to_f16(int16_t a, struct softfloat_status_t *status) {
+  return i32_to_f16((int32_t)(a), status);
+}
+
+static __inline float16 ui16_to_f16(uint16_t a, struct softfloat_status_t *status) {
+  return ui32_to_f16((uint32_t)(a), status);
+}
+
+/*----------------------------------------------------------------------------
+| 16-bit (half-precision) floating-point operations.
+*----------------------------------------------------------------------------*/
+uint32_t f16_to_ui32(float16, uint8_t, bool, struct softfloat_status_t *);
+uint64_t f16_to_ui64(float16, uint8_t, bool, struct softfloat_status_t *);
+int32_t f16_to_i32(float16, uint8_t, bool, struct softfloat_status_t *);
+int64_t f16_to_i64(float16, uint8_t, bool, struct softfloat_status_t *);
+uint32_t f16_to_ui32_r_minMag(float16, bool, struct softfloat_status_t *);
+uint64_t f16_to_ui64_r_minMag(float16, bool, struct softfloat_status_t *);
+int32_t f16_to_i32_r_minMag(float16, bool, struct softfloat_status_t *);
+int64_t f16_to_i64_r_minMag(float16, bool, struct softfloat_status_t *);
+float32 f16_to_f32(float16, struct softfloat_status_t *);
+float64 f16_to_f64(float16, struct softfloat_status_t *);
+float16 f16_roundToInt(float16, uint8_t, uint8_t, bool, struct softfloat_status_t *);
+float16 f16_add(float16, float16, struct softfloat_status_t *);
+float16 f16_sub(float16, float16, struct softfloat_status_t *);
+float16 f16_mul(float16, float16, struct softfloat_status_t *);
+float16 f16_mulAdd(float16, float16, float16, uint8_t op, struct softfloat_status_t *);
+float16 f16_div(float16, float16, struct softfloat_status_t *);
+float16 f16_min(float16, float16, struct softfloat_status_t *);
+float16 f16_max(float16, float16, struct softfloat_status_t *);
+float16 f16_getExp(float16, struct softfloat_status_t *);
+float16 f16_getMant(float16, struct softfloat_status_t *, int, int);
+float16 f16_range(float16, float16, bool is_max, bool is_abs, int sign_ctrl, struct softfloat_status_t *);
+int f16_compare(float16, float16, bool, struct softfloat_status_t *);
+float16 f16_sqrt(float16, struct softfloat_status_t *);
+softfloat_class_t f16_class(float16);
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+bool f16_isSignalingNaN(float16);
+bool f16_isNaN(float16);
+#ifdef __cplusplus
+}
+#endif
+
+bool f16_sign(float16);
+int8_t f16_exp(float16);
+uint16_t f16_fraction(float16);
+float16 f16_denormal_to_zero(float16);
+
+static __inline int f16_compare_normal(float16 a, float16 b, struct softfloat_status_t *status) {
+  return f16_compare(a, b, 0, status);
+}
+
+static __inline int f16_compare_quiet(float16 a, float16 b, struct softfloat_status_t *status) {
+  return f16_compare(a, b, 1, status);
+}
+
+static __inline float16 f16_roundToInt_normal(float16 a, uint8_t scale, struct softfloat_status_t *status) {
+    return f16_roundToInt(a, scale, softfloat_getRoundingMode(status), true, status);
+}
+static __inline float16 f16_roundToInt_noscale(float16 a, struct softfloat_status_t *status) {
+    return f16_roundToInt(a, 0, softfloat_getRoundingMode(status), true, status);
+}
+
+static __inline int64_t f16_to_i64_normal(float16 a, struct softfloat_status_t *status) {
+    return f16_to_i64(a, softfloat_getRoundingMode(status), true, status);
+}
+static __inline int32_t f16_to_i32_normal(float16 a, struct softfloat_status_t *status) {
+    return f16_to_i32(a, softfloat_getRoundingMode(status), true, status);
+}
+
+static __inline int16_t f16_to_i16(float16 a, struct softfloat_status_t *status)
+{
+    int32_t val_32 = f16_to_i32_normal(a, status);
+    int16_t val_16 = (int16_t) val_32;
+    if ((int32_t)(val_16) != val_32) {
+        softfloat_setFlags(status, softfloat_flag_invalid);
+        return (int16_t) 0x8000;
+    }
+    return val_16;
+}
+
+static __inline int64_t f16_to_i64_round_to_zero(float16 a, struct softfloat_status_t *status) {
+    return f16_to_i64_r_minMag(a, true, status);
+}
+static __inline int32_t f16_to_i32_round_to_zero(float16 a, struct softfloat_status_t *status) {
+    return f16_to_i32_r_minMag(a, true, status);
+}
+
+static __inline int16_t f16_to_i16_round_to_zero(float16 a, struct softfloat_status_t *status)
+{
+    int32_t val_32 = f16_to_i32_round_to_zero(a, status);
+    int16_t val_16 = (int16_t) val_32;
+    if ((int32_t)(val_16) != val_32) {
+        softfloat_setFlags(status, softfloat_flag_invalid);
+        return (int16_t) 0x8000;
+    }
+    return val_16;
+}
+
+static __inline uint64_t f16_to_ui64_normal(float16 a, struct softfloat_status_t *status) {
+    return f16_to_ui64(a, softfloat_getRoundingMode(status), true, status);
+}
+static __inline uint32_t f16_to_ui32_normal(float16 a, struct softfloat_status_t *status) {
+    return f16_to_ui32(a, softfloat_getRoundingMode(status), true, status);
+}
+
+static __inline uint16_t f16_to_ui16(float16 a, struct softfloat_status_t *status)
+{
+    uint32_t val_32 = f16_to_ui32_normal(a, status);
+    if (val_32 > 0xFFFF) {
+        softfloat_setFlags(status, softfloat_flag_invalid);
+        return 0xFFFF;
+    }
+    return (uint16_t) val_32;
+}
+
+static __inline uint64_t f16_to_ui64_round_to_zero(float16 a, struct softfloat_status_t *status) {
+    return f16_to_ui64_r_minMag(a, true, status);
+}
+static __inline uint32_t f16_to_ui32_round_to_zero(float16 a, struct softfloat_status_t *status) {
+    return f16_to_ui32_r_minMag(a, true, status);
+}
+
+static __inline uint16_t f16_to_ui16_round_to_zero(float16 a, struct softfloat_status_t *status)
+{
+    uint32_t val_32 = f16_to_ui32_round_to_zero(a, status);
+    if (val_32 > 0xFFFF) {
+        softfloat_setFlags(status, softfloat_flag_invalid);
+        return 0xFFFF;
+    }
+    return (uint16_t) val_32;
+}
+
+static __inline float16 f16_fmadd(float16 a, float16 b, float16 c, struct softfloat_status_t *status) {
+    return f16_mulAdd(a, b, c, 0, status);
+}
+static __inline float16 f16_fmsub(float16 a, float16 b, float16 c, struct softfloat_status_t *status) {
+    return f16_mulAdd(a, b, c, softfloat_muladd_negate_c, status);
+}
+static __inline float16 f16_fnmadd(float16 a, float16 b, float16 c, struct softfloat_status_t *status) {
+    return f16_mulAdd(a, b, c, softfloat_muladd_negate_product, status);
+}
+static __inline float16 f16_fnmsub(float16 a, float16 b, float16 c, struct softfloat_status_t *status) {
+    return f16_mulAdd(a, b, c, softfloat_muladd_negate_result, status);
+}
+
+/*----------------------------------------------------------------------------
+| 32-bit (single-precision) floating-point operations.
+*----------------------------------------------------------------------------*/
+uint32_t f32_to_ui32(float32, uint8_t, bool, struct softfloat_status_t *);
+uint64_t f32_to_ui64(float32, uint8_t, bool, struct softfloat_status_t *);
+int32_t f32_to_i32(float32, uint8_t, bool, struct softfloat_status_t *);
+int64_t f32_to_i64(float32, uint8_t, bool, struct softfloat_status_t *);
+uint32_t f32_to_ui32_r_minMag(float32, bool, struct softfloat_status_t *);
+uint64_t f32_to_ui64_r_minMag(float32, bool, struct softfloat_status_t *);
+int32_t f32_to_i32_r_minMag(float32, bool, struct softfloat_status_t *);
+int64_t f32_to_i64_r_minMag(float32, bool, struct softfloat_status_t *);
+float16 f32_to_f16(float32, struct softfloat_status_t *);
+float64 f32_to_f64(float32, struct softfloat_status_t *);
+float32 f32_roundToInt(float32, uint8_t, uint8_t, bool, struct softfloat_status_t *);
+float32 f32_add(float32, float32, struct softfloat_status_t *);
+float32 f32_sub(float32, float32, struct softfloat_status_t *);
+float32 f32_mul(float32, float32, struct softfloat_status_t *);
+float32 f32_mulAdd(float32, float32, float32, uint8_t op, struct softfloat_status_t *);
+float32 f32_div(float32, float32, struct softfloat_status_t *);
+float32 f32_min(float32, float32, struct softfloat_status_t *);
+float32 f32_max(float32, float32, struct softfloat_status_t *);
+float32 f32_scalef(float32, float32, struct softfloat_status_t *);
+float32 f32_getExp(float32, struct softfloat_status_t *);
+float32 f32_getMant(float32, struct softfloat_status_t *, int, int);
+float32 f32_range(float32, float32, bool is_max, bool is_abs, int sign_ctrl, struct softfloat_status_t *);
+float32 f32_frc(float32, struct softfloat_status_t *);
+int f32_compare(float32, float32, bool, struct softfloat_status_t *);
+float32 f32_sqrt(float32, struct softfloat_status_t *);
+softfloat_class_t f32_class(float32);
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+bool f32_isSignalingNaN(float32);
+bool f32_isNaN(float32);
+#ifdef __cplusplus
+}
+#endif
+
+bool f32_sign(float32);
+int16_t f32_exp(float32);
+uint32_t f32_fraction(float32);
+float32 f32_denormal_to_zero(float32);
+
+static __inline int f32_compare_normal(float32 a, float32 b, struct softfloat_status_t *status) {
+    return f32_compare(a, b, 0, status);
+}
+
+static __inline int f32_compare_quiet(float32 a, float32 b, struct softfloat_status_t *status) {
+    return f32_compare(a, b, 1, status);
+}
+
+static __inline float32 f32_roundToInt_normal(float32 a, uint8_t scale, struct softfloat_status_t *status) {
+    return f32_roundToInt(a, scale, softfloat_getRoundingMode(status), true, status);
+}
+static __inline float32 f32_roundToInt_noscale(float32 a, struct softfloat_status_t *status) {
+    return f32_roundToInt(a, 0, softfloat_getRoundingMode(status), true, status);
+}
+
+static __inline int32_t f32_to_i32_normal(float32 a, struct softfloat_status_t *status) {
+    return f32_to_i32(a, softfloat_getRoundingMode(status), true, status);
+}
+static __inline int64_t f32_to_i64_normal(float32 a, struct softfloat_status_t *status) {
+    return f32_to_i64(a, softfloat_getRoundingMode(status), true, status);
+}
+
+static __inline int32_t f32_to_i32_round_to_zero(float32 a, struct softfloat_status_t *status) {
+    return f32_to_i32_r_minMag(a, true, status);
+}
+static __inline int64_t f32_to_i64_round_to_zero(float32 a, struct softfloat_status_t *status) {
+    return f32_to_i64_r_minMag(a, true, status);
+}
+
+static __inline uint32_t f32_to_ui32_normal(float32 a, struct softfloat_status_t *status) {
+    return f32_to_ui32(a, softfloat_getRoundingMode(status), true, status);
+}
+static __inline uint64_t f32_to_ui64_normal(float32 a, struct softfloat_status_t *status) {
+    return f32_to_ui64(a, softfloat_getRoundingMode(status), true, status);
+}
+
+static __inline uint32_t f32_to_ui32_round_to_zero(float32 a, struct softfloat_status_t *status) {
+    return f32_to_ui32_r_minMag(a, true, status);
+}
+static __inline uint64_t f32_to_ui64_round_to_zero(float32 a, struct softfloat_status_t *status) {
+    return f32_to_ui64_r_minMag(a, true, status);
+}
+
+static __inline float32 f32_fmadd(float32 a, float32 b, float32 c, struct softfloat_status_t *status) {
+    return f32_mulAdd(a, b, c, 0, status);
+}
+static __inline float32 f32_fmsub(float32 a, float32 b, float32 c, struct softfloat_status_t *status) {
+    return f32_mulAdd(a, b, c, softfloat_muladd_negate_c, status);
+}
+static __inline float32 f32_fnmadd(float32 a, float32 b, float32 c, struct softfloat_status_t *status) {
+    return f32_mulAdd(a, b, c, softfloat_muladd_negate_product, status);
+}
+static __inline float32 f32_fnmsub(float32 a, float32 b, float32 c, struct softfloat_status_t *status) {
+    return f32_mulAdd(a, b, c, softfloat_muladd_negate_result, status);
+}
+
+/*----------------------------------------------------------------------------
+| 64-bit (double-precision) floating-point operations.
+*----------------------------------------------------------------------------*/
+uint32_t f64_to_ui32(float64, uint8_t, bool, struct softfloat_status_t *);
+uint64_t f64_to_ui64(float64, uint8_t, bool, struct softfloat_status_t *);
+int32_t f64_to_i32(float64, uint8_t, bool, struct softfloat_status_t *);
+int64_t f64_to_i64(float64, uint8_t, bool, struct softfloat_status_t *);
+uint32_t f64_to_ui32_r_minMag(float64, bool, struct softfloat_status_t *);
+uint64_t f64_to_ui64_r_minMag(float64, bool, struct softfloat_status_t *);
+int32_t f64_to_i32_r_minMag(float64, bool, struct softfloat_status_t *);
+int64_t f64_to_i64_r_minMag(float64, bool, struct softfloat_status_t *);
+float16 f64_to_f16(float64, struct softfloat_status_t *);
+float32 f64_to_f32(float64, struct softfloat_status_t *);
+float64 f64_roundToInt(float64, uint8_t, uint8_t, bool, struct softfloat_status_t *);
+float64 f64_add(float64, float64, struct softfloat_status_t *);
+float64 f64_sub(float64, float64, struct softfloat_status_t *);
+float64 f64_mul(float64, float64, struct softfloat_status_t *);
+float64 f64_mulAdd(float64, float64, float64, uint8_t op, struct softfloat_status_t *);
+float64 f64_div(float64, float64, struct softfloat_status_t *);
+float64 f64_min(float64, float64, struct softfloat_status_t *);
+float64 f64_max(float64, float64, struct softfloat_status_t *);
+float64 f64_scalef(float64, float64, struct softfloat_status_t *);
+float64 f64_getExp(float64, struct softfloat_status_t *);
+float64 f64_getMant(float64, struct softfloat_status_t *, int, int);
+float64 f64_range(float64, float64, bool is_max, bool is_abs, int sign_ctrl, struct softfloat_status_t *);
+float64 f64_frc(float64, struct softfloat_status_t *);
+int f64_compare(float64, float64, bool, struct softfloat_status_t *);
+float64 f64_sqrt(float64, struct softfloat_status_t *);
+softfloat_class_t f64_class(float64);
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+bool f64_isSignalingNaN(float64);
+bool f64_isNaN(float64);
+#ifdef __cplusplus
+}
+#endif
+
+bool f64_sign(float64);
+int16_t f64_exp(float64);
+uint64_t f64_fraction(float64);
+float64 f64_denormal_to_zero(float64);
+
+static __inline int f64_compare_normal(float64 a, float64 b, struct softfloat_status_t *status) {
+    return f64_compare(a, b, 0, status);
+}
+
+static __inline int f64_compare_quiet(float64 a, float64 b, struct softfloat_status_t *status) {
+    return f64_compare(a, b, 1, status);
+}
+
+static __inline float64 f64_roundToInt_normal(float64 a, uint8_t scale, struct softfloat_status_t *status) {
+    return f64_roundToInt(a, scale, softfloat_getRoundingMode(status), true, status);
+}
+static __inline float64 f64_roundToInt_noscale(float64 a, struct softfloat_status_t *status) {
+    return f64_roundToInt(a, 0, softfloat_getRoundingMode(status), true, status);
+}
+
+static __inline int32_t f64_to_i32_normal(float64 a, struct softfloat_status_t *status) {
+    return f64_to_i32(a, softfloat_getRoundingMode(status), true, status);
+}
+static __inline int64_t f64_to_i64_normal(float64 a, struct softfloat_status_t *status) {
+    return f64_to_i64(a, softfloat_getRoundingMode(status), true, status);
+}
+
+static __inline int32_t f64_to_i32_round_to_zero(float64 a, struct softfloat_status_t *status) {
+    return f64_to_i32_r_minMag(a, true, status);
+}
+static __inline int64_t f64_to_i64_round_to_zero(float64 a, struct softfloat_status_t *status) {
+    return f64_to_i64_r_minMag(a, true, status);
+}
+
+static __inline uint32_t f64_to_ui32_normal(float64 a, struct softfloat_status_t *status) {
+    return f64_to_ui32(a, softfloat_getRoundingMode(status), true, status);
+}
+static __inline uint64_t f64_to_ui64_normal(float64 a, struct softfloat_status_t *status) {
+    return f64_to_ui64(a, softfloat_getRoundingMode(status), true, status);
+}
+
+static __inline uint32_t f64_to_ui32_round_to_zero(float64 a, struct softfloat_status_t *status) {
+    return f64_to_ui32_r_minMag(a, true, status);
+}
+static __inline uint64_t f64_to_ui64_round_to_zero(float64 a, struct softfloat_status_t *status) {
+    return f64_to_ui64_r_minMag(a, true, status);
+}
+
+static __inline float64 f64_fmadd(float64 a, float64 b, float64 c, struct softfloat_status_t *status) {
+    return f64_mulAdd(a, b, c, 0, status);
+}
+static __inline float64 f64_fmsub(float64 a, float64 b, float64 c, struct softfloat_status_t *status) {
+    return f64_mulAdd(a, b, c, softfloat_muladd_negate_c, status);
+}
+static __inline float64 f64_fnmadd(float64 a, float64 b, float64 c, struct softfloat_status_t *status) {
+    return f64_mulAdd(a, b, c, softfloat_muladd_negate_product, status);
+}
+static __inline float64 f64_fnmsub(float64 a, float64 b, float64 c, struct softfloat_status_t *status) {
+    return f64_mulAdd(a, b, c, softfloat_muladd_negate_result, status);
+}
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*----------------------------------------------------------------------------
+| 80-bit extended double-precision floating-point operations.
+*----------------------------------------------------------------------------*/
+extFloat80_t f16_to_extF80(float16, struct softfloat_status_t *);
+extFloat80_t f32_to_extF80(float32, struct softfloat_status_t *);
+extFloat80_t f64_to_extF80(float64, struct softfloat_status_t *);
+extFloat80_t i32_to_extF80(int32_t);
+extFloat80_t i64_to_extF80(int64_t);
+extFloat80_t ui32_to_extF80(uint32_t);
+extFloat80_t ui64_to_extF80(uint64_t);
+
+uint32_t extF80_to_ui32(extFloat80_t, uint8_t, bool, struct softfloat_status_t *);
+uint64_t extF80_to_ui64(extFloat80_t, uint8_t, bool, struct softfloat_status_t *);
+int32_t extF80_to_i32(extFloat80_t, uint8_t, bool, struct softfloat_status_t *);
+int64_t extF80_to_i64(extFloat80_t, uint8_t, bool, struct softfloat_status_t *);
+uint32_t extF80_to_ui32_r_minMag(extFloat80_t, bool, struct softfloat_status_t *);
+uint64_t extF80_to_ui64_r_minMag(extFloat80_t, bool, struct softfloat_status_t *);
+int32_t extF80_to_i32_r_minMag(extFloat80_t, bool, struct softfloat_status_t *);
+int64_t extF80_to_i64_r_minMag(extFloat80_t, bool, struct softfloat_status_t *);
+float16 extF80_to_f16(extFloat80_t, struct softfloat_status_t *);
+float32 extF80_to_f32(extFloat80_t, struct softfloat_status_t *);
+float64 extF80_to_f64(extFloat80_t, struct softfloat_status_t *);
+float128_t extF80_to_f128(extFloat80_t, struct softfloat_status_t *);
+extFloat80_t extF80_roundToInt(extFloat80_t, uint8_t, bool, struct softfloat_status_t *);
+extFloat80_t extF80_add(extFloat80_t, extFloat80_t, struct softfloat_status_t *);
+extFloat80_t extF80_sub(extFloat80_t, extFloat80_t, struct softfloat_status_t *);
+extFloat80_t extF80_mul(extFloat80_t, extFloat80_t, struct softfloat_status_t *);
+extFloat80_t extF80_div(extFloat80_t, extFloat80_t, struct softfloat_status_t *);
+extFloat80_t extF80_rem(extFloat80_t, extFloat80_t, struct softfloat_status_t *);
+extFloat80_t extF80_scale(extFloat80_t, extFloat80_t, struct softfloat_status_t *);
+extFloat80_t extF80_sqrt(extFloat80_t, struct softfloat_status_t *);
+extFloat80_t extF80_extract(extFloat80_t *, struct softfloat_status_t *);
+int extF80_compare(extFloat80_t, extFloat80_t, int, struct softfloat_status_t *);
+softfloat_class_t extF80_class(extFloat80_t);
+
+static __inline int extF80_compare_normal(extFloat80_t a, extFloat80_t b, struct softfloat_status_t *status) {
+    return extF80_compare(a, b, 0, status);
+}
+
+static __inline int extF80_compare_quiet(extFloat80_t a, extFloat80_t b, struct softfloat_status_t *status) {
+    return extF80_compare(a, b, 1, status);
+}
+
+static __inline extFloat80_t extF80_roundToInt_normal(extFloat80_t a, struct softfloat_status_t *status) {
+    return extF80_roundToInt(a, softfloat_getRoundingMode(status), true, status);
+}
+
+static __inline int64_t extF80_to_i64_normal(extFloat80_t a, struct softfloat_status_t *status) {
+    return extF80_to_i64(a, softfloat_getRoundingMode(status), true, status);
+}
+static __inline int32_t extF80_to_i32_normal(extFloat80_t a, struct softfloat_status_t *status) {
+    return extF80_to_i32(a, softfloat_getRoundingMode(status), true, status);
+}
+
+static __inline int16_t extF80_to_i16(extFloat80_t a, struct softfloat_status_t *status)
+{
+    int32_t v32 = extF80_to_i32_normal(a, status);
+    int16_t v16 = (int16_t) v32;
+
+    if ((int32_t)(v16) != v32) {
+        softfloat_setFlags(status, softfloat_flag_invalid);
+        return (int16_t) 0x8000;
+    }
+    return v16;
+}
+
+static __inline int64_t extF80_to_i64_round_to_zero(extFloat80_t a, struct softfloat_status_t *status) {
+    return extF80_to_i64_r_minMag(a, true, status);
+}
+static __inline int32_t extF80_to_i32_round_to_zero(extFloat80_t a, struct softfloat_status_t *status) {
+    return extF80_to_i32_r_minMag(a, true, status);
+}
+
+static __inline int16_t extF80_to_i16_round_to_zero(extFloat80_t a, struct softfloat_status_t *status)
+{
+    int32_t v32 = extF80_to_i32_round_to_zero(a, status);
+    int16_t v16 = (int16_t) v32;
+
+    if ((int32_t)(v16) != v32) {
+        softfloat_setFlags(status, softfloat_flag_invalid);
+        return (int16_t) 0x8000;
+    }
+    return v16;
+}
+
+bool extF80_isUnsupported(extFloat80_t);
+bool extF80_isSignalingNaN(extFloat80_t);
+bool extF80_isNaN(extFloat80_t);
+
+bool extF80_sign(extFloat80_t);
+int16_t extF80_exp(extFloat80_t);
+uint64_t extF80_fraction(extFloat80_t);
+
+/*----------------------------------------------------------------------------
+| 128-bit (quadruple-precision) floating-point operations.
+*----------------------------------------------------------------------------*/
+float128_t f32_to_f128(float32, struct softfloat_status_t *);
+float128_t f64_to_f128(float64, struct softfloat_status_t *);
+float128_t i32_to_f128(int32_t);
+float128_t i64_to_f128(int64_t);
+float128_t ui32_to_f128(uint32_t);
+float128_t ui64_to_f128(uint64_t);
+
+uint32_t f128_to_ui32(float128_t, uint8_t, bool, struct softfloat_status_t *);
+uint64_t f128_to_ui64(float128_t, uint8_t, bool, struct softfloat_status_t *);
+int32_t f128_to_i32(float128_t, uint8_t, bool, struct softfloat_status_t *);
+int64_t f128_to_i64(float128_t, uint8_t, bool, struct softfloat_status_t *);
+uint32_t f128_to_ui32_r_minMag(float128_t, bool, struct softfloat_status_t *);
+uint64_t f128_to_ui64_r_minMag(float128_t, bool, struct softfloat_status_t *);
+int32_t f128_to_i32_r_minMag(float128_t, bool, struct softfloat_status_t *);
+int64_t f128_to_i64_r_minMag(float128_t, bool, struct softfloat_status_t *);
+float32 f128_to_f32(float128_t, struct softfloat_status_t *);
+float64 f128_to_f64(float128_t, struct softfloat_status_t *);
+extFloat80_t f128_to_extF80(float128_t, struct softfloat_status_t *);
+float128_t f128_roundToInt(float128_t, uint8_t, bool, struct softfloat_status_t *);
+float128_t f128_add(float128_t, float128_t, struct softfloat_status_t *);
+float128_t f128_sub(float128_t, float128_t, struct softfloat_status_t *);
+float128_t f128_mul(float128_t, float128_t, struct softfloat_status_t *);
+float128_t f128_mulAdd(float128_t, float128_t, float128_t, uint8_t op, struct softfloat_status_t *);
+float128_t f128_div(float128_t, float128_t, struct softfloat_status_t *);
+float128_t f128_sqrt(float128_t, struct softfloat_status_t *);
+bool f128_isSignalingNaN(float128_t);
+bool f128_isNaN(float128_t);
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/cpu/softfloat3e/softfloat_types.h b/src/cpu/softfloat3e/softfloat_types.h
new file mode 100644
index 000000000..001f8e0c6
--- /dev/null
+++ b/src/cpu/softfloat3e/softfloat_types.h
@@ -0,0 +1,87 @@
+/*============================================================================
+
+This C header file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2017 The Regents of the University of
+California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#ifndef _SOFTFLOAT_TYPES_H_
+#define _SOFTFLOAT_TYPES_H_
+
+#include <stdint.h>
+
+/*----------------------------------------------------------------------------
+| Software IEC/IEEE floating-point types.
+*----------------------------------------------------------------------------*/
+typedef uint16_t float16, bfloat16;
+typedef uint32_t float32;
+typedef uint64_t float64;
+
+struct uint128 { uint64_t v0, v64; };
+struct uint64_extra { uint64_t extra, v; };
+struct uint128_extra { uint64_t extra; struct uint128 v; };
+
+/*----------------------------------------------------------------------------
+| Types used to pass 16-bit, 32-bit, 64-bit, and 128-bit floating-point
+| arguments and results to/from functions.  These types must be exactly
+| 16 bits, 32 bits, 64 bits, and 128 bits in size, respectively.
+*----------------------------------------------------------------------------*/
+typedef struct f16_t { uint16_t v; } float16_t;
+typedef struct f32_t { uint32_t v; } float32_t;
+typedef struct f64_t { uint64_t v; } float64_t;
+typedef struct uint128 float128_t;
+
+/*----------------------------------------------------------------------------
+| The format of an 80-bit extended floating-point number in memory.  This
+| structure must contain a 16-bit field named 'signExp' and a 64-bit field
+| named 'signif'.
+*----------------------------------------------------------------------------*/
+
+struct extFloat80M {
+  uint64_t signif;
+  uint16_t signExp;
+};
+
+/*----------------------------------------------------------------------------
+| The type used to pass 80-bit extended floating-point arguments and
+| results to/from functions.  This type must have size identical to
+| 'struct extFloat80M'.  Type 'extFloat80_t' can be defined as an alias for
+| 'struct extFloat80M'.  Alternatively, if a platform has "native" support
+| for IEEE-Standard 80-bit extended floating-point, it may be possible,
+| if desired, to define 'extFloat80_t' as an alias for the native type
+| (presumably either 'long double' or a nonstandard compiler-intrinsic type).
+| In that case, the 'signif' and 'signExp' fields of 'struct extFloat80M'
+| must align exactly with the locations in memory of the sign, exponent, and
+| significand of the native type.
+*----------------------------------------------------------------------------*/
+typedef struct extFloat80M extFloat80_t, floatx80;
+
+#endif
diff --git a/src/cpu/softfloat3e/specialize.h b/src/cpu/softfloat3e/specialize.h
new file mode 100644
index 000000000..90d4a2caa
--- /dev/null
+++ b/src/cpu/softfloat3e/specialize.h
@@ -0,0 +1,280 @@
+/*============================================================================
+
+This C header file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2018 The Regents of the
+University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#ifndef _SPECIALIZE_H_
+#define _SPECIALIZE_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| The values to return on conversions to 32-bit integer formats that raise an
+| invalid exception.
+*----------------------------------------------------------------------------*/
+#define ui32_fromPosOverflow 0xFFFFFFFF
+#define ui32_fromNegOverflow 0xFFFFFFFF
+#define ui32_fromNaN         0xFFFFFFFF
+#define i32_fromPosOverflow  (-0x7FFFFFFF - 1)
+#define i32_fromNegOverflow  (-0x7FFFFFFF - 1)
+#define i32_fromNaN          (-0x7FFFFFFF - 1)
+
+/*----------------------------------------------------------------------------
+| The values to return on conversions to 64-bit integer formats that raise an
+| invalid exception.
+*----------------------------------------------------------------------------*/
+#define ui64_fromPosOverflow UINT64_C(0xFFFFFFFFFFFFFFFF)
+#define ui64_fromNegOverflow UINT64_C(0xFFFFFFFFFFFFFFFF)
+#define ui64_fromNaN         UINT64_C(0xFFFFFFFFFFFFFFFF)
+#define i64_fromPosOverflow  (-INT64_C(0x7FFFFFFFFFFFFFFF) - 1)
+#define i64_fromNegOverflow  (-INT64_C(0x7FFFFFFFFFFFFFFF) - 1)
+#define i64_fromNaN          (-INT64_C(0x7FFFFFFFFFFFFFFF) - 1)
+
+/*----------------------------------------------------------------------------
+| "Common NaN" structure, used to transfer NaN representations from one format
+| to another.
+*----------------------------------------------------------------------------*/
+struct commonNaN {
+    bool sign;
+    uint64_t v0, v64;
+};
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*----------------------------------------------------------------------------
+| The bit pattern for a default generated 16-bit floating-point NaN.
+*----------------------------------------------------------------------------*/
+#define defaultNaNF16UI 0xFE00
+
+/*----------------------------------------------------------------------------
+| Returns true when 16-bit unsigned integer 'uiA' has the bit pattern of a
+| 16-bit floating-point signaling NaN.
+| Note:  This macro evaluates its argument more than once.
+*----------------------------------------------------------------------------*/
+#define softfloat_isSigNaNF16UI(uiA) ((((uiA) & 0x7E00) == 0x7C00) && ((uiA) & 0x01FF))
+
+/*----------------------------------------------------------------------------
+| Assuming 'uiA' has the bit pattern of a 16-bit floating-point NaN, converts
+| this NaN to the common NaN form, and stores the resulting common NaN at the
+| location pointed to by 'zPtr'.  If the NaN is a signaling NaN, the invalid
+| exception is raised.
+*----------------------------------------------------------------------------*/
+void softfloat_f16UIToCommonNaN(uint16_t uiA, struct commonNaN *zPtr, struct softfloat_status_t *status);
+
+/*----------------------------------------------------------------------------
+| Converts the common NaN pointed to by 'aPtr' into a 16-bit floating-point
+| NaN, and returns the bit pattern of this value as an unsigned integer.
+*----------------------------------------------------------------------------*/
+uint16_t softfloat_commonNaNToF16UI(const struct commonNaN *aPtr);
+
+/*----------------------------------------------------------------------------
+| Interpreting 'uiA' and 'uiB' as the bit patterns of two 16-bit floating-
+| point values, at least one of which is a NaN, returns the bit pattern of
+| the combined NaN result.  If either 'uiA' or 'uiB' has the pattern of a
+| signaling NaN, the invalid exception is raised.
+*----------------------------------------------------------------------------*/
+uint16_t
+ softfloat_propagateNaNF16UI(uint16_t uiA, uint16_t uiB, struct softfloat_status_t *status);
+
+/*----------------------------------------------------------------------------
+| The bit pattern for a default generated 32-bit floating-point NaN.
+*----------------------------------------------------------------------------*/
+#define defaultNaNF32UI 0xFFC00000
+
+/*----------------------------------------------------------------------------
+| Returns true when 32-bit unsigned integer 'uiA' has the bit pattern of a
+| 32-bit floating-point signaling NaN.
+| Note:  This macro evaluates its argument more than once.
+*----------------------------------------------------------------------------*/
+#define softfloat_isSigNaNF32UI(uiA) ((((uiA) & 0x7FC00000) == 0x7F800000) && ((uiA) & 0x003FFFFF))
+
+/*----------------------------------------------------------------------------
+| Assuming 'uiA' has the bit pattern of a 32-bit floating-point NaN, converts
+| this NaN to the common NaN form, and stores the resulting common NaN at the
+| location pointed to by 'zPtr'.  If the NaN is a signaling NaN, the invalid
+| exception is raised.
+*----------------------------------------------------------------------------*/
+void softfloat_f32UIToCommonNaN(uint32_t uiA, struct commonNaN *zPtr, struct softfloat_status_t *status);
+
+/*----------------------------------------------------------------------------
+| Converts the common NaN pointed to by 'aPtr' into a 32-bit floating-point
+| NaN, and returns the bit pattern of this value as an unsigned integer.
+*----------------------------------------------------------------------------*/
+uint32_t softfloat_commonNaNToF32UI(const struct commonNaN *aPtr);
+
+/*----------------------------------------------------------------------------
+| Interpreting 'uiA' and 'uiB' as the bit patterns of two 32-bit floating-
+| point values, at least one of which is a NaN, returns the bit pattern of
+| the combined NaN result.  If either 'uiA' or 'uiB' has the pattern of a
+| signaling NaN, the invalid exception is raised.
+*----------------------------------------------------------------------------*/
+uint32_t
+ softfloat_propagateNaNF32UI(uint32_t uiA, uint32_t uiB, struct softfloat_status_t *status);
+
+/*----------------------------------------------------------------------------
+| The bit pattern for a default generated 64-bit floating-point NaN.
+*----------------------------------------------------------------------------*/
+#define defaultNaNF64UI UINT64_C(0xFFF8000000000000)
+
+/*----------------------------------------------------------------------------
+| Returns true when 64-bit unsigned integer 'uiA' has the bit pattern of a
+| 64-bit floating-point signaling NaN.
+| Note:  This macro evaluates its argument more than once.
+*----------------------------------------------------------------------------*/
+#define softfloat_isSigNaNF64UI(uiA) ((((uiA) & UINT64_C(0x7FF8000000000000)) == UINT64_C(0x7FF0000000000000)) && ((uiA) & UINT64_C(0x0007FFFFFFFFFFFF)))
+
+/*----------------------------------------------------------------------------
+| Assuming 'uiA' has the bit pattern of a 64-bit floating-point NaN, converts
+| this NaN to the common NaN form, and stores the resulting common NaN at the
+| location pointed to by 'zPtr'.  If the NaN is a signaling NaN, the invalid
+| exception is raised.
+*----------------------------------------------------------------------------*/
+void softfloat_f64UIToCommonNaN(uint64_t uiA, struct commonNaN *zPtr, struct softfloat_status_t *status);
+
+/*----------------------------------------------------------------------------
+| Converts the common NaN pointed to by 'aPtr' into a 64-bit floating-point
+| NaN, and returns the bit pattern of this value as an unsigned integer.
+*----------------------------------------------------------------------------*/
+uint64_t softfloat_commonNaNToF64UI(const struct commonNaN *aPtr);
+
+/*----------------------------------------------------------------------------
+| Interpreting 'uiA' and 'uiB' as the bit patterns of two 64-bit floating-
+| point values, at least one of which is a NaN, returns the bit pattern of
+| the combined NaN result.  If either 'uiA' or 'uiB' has the pattern of a
+| signaling NaN, the invalid exception is raised.
+*----------------------------------------------------------------------------*/
+uint64_t
+ softfloat_propagateNaNF64UI(uint64_t uiA, uint64_t uiB, struct softfloat_status_t *status);
+
+/*----------------------------------------------------------------------------
+| The bit pattern for a default generated 80-bit extended floating-point NaN.
+*----------------------------------------------------------------------------*/
+#define defaultNaNExtF80UI64 0xFFFF
+#define defaultNaNExtF80UI0  UINT64_C(0xC000000000000000)
+
+/*----------------------------------------------------------------------------
+| Returns true when the 80-bit unsigned integer formed from concatenating
+| 16-bit 'uiA64' and 64-bit 'uiA0' has the bit pattern of an 80-bit extended
+| floating-point signaling NaN.
+| Note:  This macro evaluates its arguments more than once.
+*----------------------------------------------------------------------------*/
+#define softfloat_isSigNaNExtF80UI(uiA64, uiA0) ((((uiA64) & 0x7FFF) == 0x7FFF) && ! ((uiA0) & UINT64_C(0x4000000000000000)) && ((uiA0) & UINT64_C(0x3FFFFFFFFFFFFFFF)))
+
+/*----------------------------------------------------------------------------
+| Assuming the unsigned integer formed from concatenating 'uiA64' and 'uiA0'
+| has the bit pattern of an 80-bit extended floating-point NaN, converts
+| this NaN to the common NaN form, and stores the resulting common NaN at the
+| location pointed to by 'zPtr'.  If the NaN is a signaling NaN, the invalid
+| exception is raised.
+*----------------------------------------------------------------------------*/
+void softfloat_extF80UIToCommonNaN(uint16_t uiA64, uint64_t uiA0, struct commonNaN *zPtr, struct softfloat_status_t *status);
+
+/*----------------------------------------------------------------------------
+| Converts the common NaN pointed to by 'aPtr' into an 80-bit extended
+| floating-point NaN, and returns the bit pattern of this value as an unsigned
+| integer.
+*----------------------------------------------------------------------------*/
+struct uint128 softfloat_commonNaNToExtF80UI(const struct commonNaN *aPtr);
+
+/*----------------------------------------------------------------------------
+| Interpreting the unsigned integer formed from concatenating 'uiA64' and
+| 'uiA0' as an 80-bit extended floating-point value, and likewise interpreting
+| the unsigned integer formed from concatenating 'uiB64' and 'uiB0' as another
+| 80-bit extended floating-point value, and assuming at least on of these
+| floating-point values is a NaN, returns the bit pattern of the combined NaN
+| result.  If either original floating-point value is a signaling NaN, the
+| invalid exception is raised.
+*----------------------------------------------------------------------------*/
+extFloat80_t
+ softfloat_propagateNaNExtF80UI(
+     uint16_t uiA64,
+     uint64_t uiA0,
+     uint16_t uiB64,
+     uint64_t uiB0,
+     struct softfloat_status_t *status);
+
+/*----------------------------------------------------------------------------
+| The bit pattern for a default generated 128-bit floating-point NaN.
+*----------------------------------------------------------------------------*/
+#define defaultNaNF128UI64 UINT64_C(0xFFFF800000000000)
+#define defaultNaNF128UI0  UINT64_C(0)
+
+/*----------------------------------------------------------------------------
+| Returns true when the 128-bit unsigned integer formed from concatenating
+| 64-bit 'uiA64' and 64-bit 'uiA0' has the bit pattern of a 128-bit floating-
+| point signaling NaN.
+| Note:  This macro evaluates its arguments more than once.
+*----------------------------------------------------------------------------*/
+#define softfloat_isSigNaNF128UI(uiA64, uiA0) ((((uiA64) & UINT64_C(0x7FFF800000000000)) == UINT64_C(0x7FFF000000000000)) && ((uiA0) || ((uiA64) & UINT64_C(0x00007FFFFFFFFFFF))))
+
+/*----------------------------------------------------------------------------
+| Assuming the unsigned integer formed from concatenating 'uiA64' and 'uiA0'
+| has the bit pattern of a 128-bit floating-point NaN, converts this NaN to
+| the common NaN form, and stores the resulting common NaN at the location
+| pointed to by 'zPtr'.  If the NaN is a signaling NaN, the invalid exception
+| is raised.
+*----------------------------------------------------------------------------*/
+void softfloat_f128UIToCommonNaN(uint64_t uiA64, uint64_t uiA0, struct commonNaN *zPtr, struct softfloat_status_t *status);
+
+/*----------------------------------------------------------------------------
+| Converts the common NaN pointed to by 'aPtr' into a 128-bit floating-point
+| NaN, and returns the bit pattern of this value as an unsigned integer.
+*----------------------------------------------------------------------------*/
+struct uint128 softfloat_commonNaNToF128UI(const struct commonNaN *);
+
+/*----------------------------------------------------------------------------
+| Interpreting the unsigned integer formed from concatenating 'uiA64' and
+| 'uiA0' as a 128-bit floating-point value, and likewise interpreting the
+| unsigned integer formed from concatenating 'uiB64' and 'uiB0' as another
+| 128-bit floating-point value, and assuming at least on of these floating-
+| point values is a NaN, returns the bit pattern of the combined NaN result.
+| If either original floating-point value is a signaling NaN, the invalid
+| exception is raised.
+*----------------------------------------------------------------------------*/
+struct uint128
+ softfloat_propagateNaNF128UI(
+     uint64_t uiA64,
+     uint64_t uiA0,
+     uint64_t uiB64,
+     uint64_t uiB0,
+     struct softfloat_status_t *status
+);
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/cpu/softfloat3e/ui32_to_extF80.cc b/src/cpu/softfloat3e/ui32_to_extF80.cc
new file mode 100644
index 000000000..80c6d86b0
--- /dev/null
+++ b/src/cpu/softfloat3e/ui32_to_extF80.cc
@@ -0,0 +1,56 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+extFloat80_t ui32_to_extF80(uint32_t a)
+{
+    uint16_t uiZ64;
+    int8_t shiftDist;
+    extFloat80_t z;
+
+    uiZ64 = 0;
+    if (a) {
+        shiftDist = softfloat_countLeadingZeros32(a);
+        uiZ64 = 0x401E - shiftDist;
+        a <<= shiftDist;
+    }
+    z.signExp = uiZ64;
+    z.signif = (uint64_t) a<<32;
+    return z;
+}
diff --git a/src/cpu/softfloat3e/ui32_to_f128.cc b/src/cpu/softfloat3e/ui32_to_f128.cc
new file mode 100644
index 000000000..6ef8214a8
--- /dev/null
+++ b/src/cpu/softfloat3e/ui32_to_f128.cc
@@ -0,0 +1,55 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+float128_t ui32_to_f128(uint32_t a)
+{
+    uint64_t uiZ64;
+    int8_t shiftDist;
+    float128_t z;
+
+    uiZ64 = 0;
+    if (a) {
+        shiftDist = softfloat_countLeadingZeros32(a) + 17;
+        uiZ64 = packToF128UI64(0, 0x402E - shiftDist, (uint64_t) a<<shiftDist);
+    }
+    z.v64 = uiZ64;
+    z.v0  = 0;
+    return z;
+}
diff --git a/src/cpu/softfloat3e/ui32_to_f16.c b/src/cpu/softfloat3e/ui32_to_f16.c
new file mode 100644
index 000000000..bda5b0b6f
--- /dev/null
+++ b/src/cpu/softfloat3e/ui32_to_f16.c
@@ -0,0 +1,57 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+float16 ui32_to_f16(uint32_t a, struct softfloat_status_t *status)
+{
+    int8_t shiftDist;
+    uint16_t sig;
+
+    shiftDist = softfloat_countLeadingZeros32(a) - 21;
+    if (0 <= shiftDist) {
+        return a ? packToF16UI(0, 0x18 - shiftDist, (uint16_t) a<<shiftDist) : 0;
+    } else {
+        shiftDist += 4;
+        sig =
+            (shiftDist < 0)
+                ? a>>(-shiftDist) | ((uint32_t) (a<<(shiftDist & 31)) != 0)
+                : (uint16_t) a<<shiftDist;
+        return softfloat_roundPackToF16(0, 0x1C - shiftDist, sig, status);
+    }
+}
diff --git a/src/cpu/softfloat3e/ui32_to_f32.c b/src/cpu/softfloat3e/ui32_to_f32.c
new file mode 100644
index 000000000..ee6d80346
--- /dev/null
+++ b/src/cpu/softfloat3e/ui32_to_f32.c
@@ -0,0 +1,50 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "softfloat.h"
+
+float32 ui32_to_f32(uint32_t a, struct softfloat_status_t *status)
+{
+    if (! a) {
+        return 0;
+    }
+    if (a & 0x80000000) {
+        return softfloat_roundPackToF32(0, 0x9D, a>>1 | (a & 1), status);
+    } else {
+        return softfloat_normRoundPackToF32(0, 0x9C, a, status);
+    }
+}
diff --git a/src/cpu/softfloat3e/ui32_to_f64.c b/src/cpu/softfloat3e/ui32_to_f64.c
new file mode 100644
index 000000000..524d64eed
--- /dev/null
+++ b/src/cpu/softfloat3e/ui32_to_f64.c
@@ -0,0 +1,49 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+float64 ui32_to_f64(uint32_t a)
+{
+    if (! a) {
+        return 0;
+    } else {
+        int8_t shiftDist = softfloat_countLeadingZeros32(a) + 21;
+        return packToF64UI(0, 0x432 - shiftDist, (uint64_t) a<<shiftDist);
+    }
+}
diff --git a/src/cpu/softfloat3e/ui64_to_extF80.cc b/src/cpu/softfloat3e/ui64_to_extF80.cc
new file mode 100644
index 000000000..5bf754920
--- /dev/null
+++ b/src/cpu/softfloat3e/ui64_to_extF80.cc
@@ -0,0 +1,56 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+extFloat80_t ui64_to_extF80(uint64_t a)
+{
+    uint16_t uiZ64;
+    int8_t shiftDist;
+    extFloat80_t z;
+
+    uiZ64 = 0;
+    if (a) {
+        shiftDist = softfloat_countLeadingZeros64(a);
+        uiZ64 = 0x403E - shiftDist;
+        a <<= shiftDist;
+    }
+    z.signExp = uiZ64;
+    z.signif  = a;
+    return z;
+}
diff --git a/src/cpu/softfloat3e/ui64_to_f128.cc b/src/cpu/softfloat3e/ui64_to_f128.cc
new file mode 100644
index 000000000..91be29f37
--- /dev/null
+++ b/src/cpu/softfloat3e/ui64_to_f128.cc
@@ -0,0 +1,65 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+float128_t ui64_to_f128(uint64_t a)
+{
+    uint64_t uiZ64, uiZ0;
+    int8_t shiftDist;
+    struct uint128 zSig;
+    float128_t z;
+
+    if (! a) {
+        uiZ64 = 0;
+        uiZ0  = 0;
+    } else {
+        shiftDist = softfloat_countLeadingZeros64(a) + 49;
+        if (64 <= shiftDist) {
+            zSig.v64 = a<<(shiftDist - 64);
+            zSig.v0  = 0;
+        } else {
+            zSig = softfloat_shortShiftLeft128(0, a, shiftDist);
+        }
+        uiZ64 = packToF128UI64(0, 0x406E - shiftDist, zSig.v64);
+        uiZ0  = zSig.v0;
+    }
+    z.v64 = uiZ64;
+    z.v0  = uiZ0;
+    return z;
+}
diff --git a/src/cpu/softfloat3e/ui64_to_f16.c b/src/cpu/softfloat3e/ui64_to_f16.c
new file mode 100644
index 000000000..f2339e905
--- /dev/null
+++ b/src/cpu/softfloat3e/ui64_to_f16.c
@@ -0,0 +1,55 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+float16 ui64_to_f16(uint64_t a, struct softfloat_status_t *status)
+{
+    int8_t shiftDist;
+    uint16_t sig;
+
+    shiftDist = softfloat_countLeadingZeros64(a) - 53;
+    if (0 <= shiftDist) {
+        return a ? packToF16UI(0, 0x18 - shiftDist, (uint16_t) a<<shiftDist) : 0;
+    } else {
+        shiftDist += 4;
+        sig = (shiftDist < 0) ? softfloat_shortShiftRightJam64(a, -shiftDist)
+                : (uint16_t) a<<shiftDist;
+        return softfloat_roundPackToF16(0, 0x1C - shiftDist, sig, status);
+    }
+}
diff --git a/src/cpu/softfloat3e/ui64_to_f32.c b/src/cpu/softfloat3e/ui64_to_f32.c
new file mode 100644
index 000000000..62db84783
--- /dev/null
+++ b/src/cpu/softfloat3e/ui64_to_f32.c
@@ -0,0 +1,55 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Regents of the University of
+California.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+float32 ui64_to_f32(uint64_t a, struct softfloat_status_t *status)
+{
+    int8_t shiftDist;
+    uint32_t sig;
+
+    shiftDist = softfloat_countLeadingZeros64(a) - 40;
+    if (0 <= shiftDist) {
+        return a ? packToF32UI(0, 0x95 - shiftDist, (uint32_t) a<<shiftDist) : 0;
+    } else {
+        shiftDist += 7;
+        sig = (shiftDist < 0) ? softfloat_shortShiftRightJam64(a, -shiftDist)
+                : (uint32_t) a<<shiftDist;
+        return softfloat_roundPackToF32(0, 0x9C - shiftDist, sig, status);
+    }
+}
diff --git a/src/cpu/softfloat3e/ui64_to_f64.c b/src/cpu/softfloat3e/ui64_to_f64.c
new file mode 100644
index 000000000..05f849a1a
--- /dev/null
+++ b/src/cpu/softfloat3e/ui64_to_f64.c
@@ -0,0 +1,51 @@
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "internals.h"
+#include "primitives.h"
+#include "softfloat.h"
+
+float64 ui64_to_f64(uint64_t a, struct softfloat_status_t *status)
+{
+    if (! a) {
+        return 0;
+    }
+    if (a & UINT64_C(0x8000000000000000)) {
+        return softfloat_roundPackToF64(0, 0x43D, softfloat_shortShiftRightJam64(a, 1), status);
+    } else {
+        return softfloat_normRoundPackToF64(0, 0x43C, a, status);
+    }
+}
diff --git a/src/cpu/x86.c b/src/cpu/x86.c
index 64ff6be4c..1090f22a1 100644
--- a/src/cpu/x86.c
+++ b/src/cpu/x86.c
@@ -80,8 +80,12 @@ int hlt_reset_pending;
 
 int fpu_cycles = 0;
 
+int in_lock = 0;
+
 #ifdef ENABLE_X86_LOG
+#if 0
 void dumpregs(int);
+#endif
 
 int x86_do_log = ENABLE_X86_LOG;
 int indump     = 0;
@@ -91,13 +95,14 @@ x86_log(const char *fmt, ...)
 {
     va_list ap;
 
-    if (x808x_do_log) {
+    if (x86_do_log) {
         va_start(ap, fmt);
         pclog_ex(fmt, ap);
         va_end(ap);
     }
 }
 
+#if 0
 void
 dumpregs(int force)
 {
@@ -142,6 +147,7 @@ dumpregs(int force)
     x87_dumpregs();
     indump = 0;
 }
+#endif
 #else
 #    define x86_log(fmt, ...)
 #endif
@@ -238,7 +244,6 @@ reset_common(int hard)
 
     if (!hard && reset_on_hlt) {
         hlt_reset_pending++;
-        pclog("hlt_reset_pending = %i\n", hlt_reset_pending);
         if (hlt_reset_pending == 2)
             hlt_reset_pending = 0;
         else
@@ -266,15 +271,35 @@ reset_common(int hard)
     stack32        = 0;
     msr.fcr        = (1 << 8) | (1 << 9) | (1 << 12) | (1 << 16) | (1 << 19) | (1 << 21);
     msw            = 0;
+    new_ne         = 0;
+    x87_op         = 0;
+
+    ccr0 = ccr1 = ccr2 = ccr3 = ccr4 = ccr5 = ccr6 = ccr7 = 0;
+    ccr4 = 0x85;
+    cyrix.arr[3].base = 0x30000;
+    cyrix.arr[3].size = 65536;
+
     if (hascache)
         cr0 = 1 << 30;
     else
         cr0 = 0;
-    cpu_cache_int_enabled = 0;
+    if (is386 && !is486 && ((fpu_type == FPU_387) || (fpu_type == FPU_NONE)))
+        cr0 |= 0x10;
+    cpu_cache_int_enabled = 0;  
     cpu_update_waitstates();
     cr4              = 0;
     cpu_state.eflags = 0;
     cgate32          = 0;
+#ifdef USE_DEBUG_REGS_486
+    if (is386) {
+#else
+    if (is386 && !is486) {
+#endif
+        for (uint8_t i = 0; i < 4; i++)
+            dr[i] = 0x00000000;
+        dr[6] = 0xffff1ff0;
+        dr[7] = 0x00000400;
+    }
     if (is286) {
         if (is486)
             loadcs(0xF000);
@@ -301,13 +326,14 @@ reset_common(int hard)
         resetreadlookup();
         makemod1table();
         cpu_set_edx();
-        mmu_perm = 4;
     }
     x86seg_reset();
 #ifdef USE_DYNAREC
     if (hard)
         codegen_reset();
 #endif
+    cpu_flush_pending = 0;
+    cpu_old_paging = 0;
     if (!hard)
         flushmmucache();
     x86_was_reset = 1;
@@ -338,11 +364,14 @@ reset_common(int hard)
         /* If we have an AT or PS/2 keyboard controller, make sure the A20 state
            is correct. */
         device_reset_all(DEVICE_KBC);
-    }
+    } else
+        device_reset_all(DEVICE_SOFTRESET);
 
     if (!is286)
         reset_808x(hard);
 
+    in_lock    = 0;
+
     cpu_cpurst_on_sr = 0;
 }
 
@@ -362,9 +391,6 @@ softresetx86(void)
     if (soft_reset_mask)
         return;
 
-    if (ibm8514_active || xga_active)
-        vga_on = 1;
-
     reset_common(0);
 }
 
diff --git a/src/cpu/x86.h b/src/cpu/x86.h
index f52e430ac..ccfeadea0 100644
--- a/src/cpu/x86.h
+++ b/src/cpu/x86.h
@@ -59,6 +59,8 @@ extern int nmi_enable;
 extern int oddeven;
 extern int inttype;
 
+extern int cpu_init;
+
 extern uint32_t  use32;
 extern uint32_t  rmdat;
 extern uint32_t  easeg;
@@ -101,4 +103,10 @@ extern int fpu_cycles;
 
 extern void x86illegal(void);
 
+extern uint8_t rep_op;
+extern uint8_t is_smint;
+
+extern uint16_t io_port;
+extern uint32_t io_val;
+
 #endif /*EMU_X86_H*/
diff --git a/src/cpu/x86_flags.h b/src/cpu/x86_flags.h
index e82041783..7d5c41ca8 100644
--- a/src/cpu/x86_flags.h
+++ b/src/cpu/x86_flags.h
@@ -741,7 +741,7 @@ setadc8(uint8_t a, uint8_t b)
         cpu_state.flags |= C_FLAG;
     if (!((a ^ b) & 0x80) && ((a ^ c) & 0x80))
         cpu_state.flags |= V_FLAG;
-    if (((a & 0xF) + (b & 0xF)) & 0x10)
+    if (((a & 0xF) + (b & 0xF) + tempc) & 0x10)
         cpu_state.flags |= A_FLAG;
 }
 static __inline void
@@ -755,7 +755,7 @@ setadc16(uint16_t a, uint16_t b)
         cpu_state.flags |= C_FLAG;
     if (!((a ^ b) & 0x8000) && ((a ^ c) & 0x8000))
         cpu_state.flags |= V_FLAG;
-    if (((a & 0xF) + (b & 0xF)) & 0x10)
+    if (((a & 0xF) + (b & 0xF) + tempc) & 0x10)
         cpu_state.flags |= A_FLAG;
 }
 static __inline void
@@ -785,7 +785,7 @@ setsbc8(uint8_t a, uint8_t b)
         cpu_state.flags |= C_FLAG;
     if ((a ^ b) & (a ^ c) & 0x80)
         cpu_state.flags |= V_FLAG;
-    if (((a & 0xF) - (b & 0xF)) & 0x10)
+    if (((a & 0xF) - ((b & 0xF) + tempc)) & 0x10)
         cpu_state.flags |= A_FLAG;
 }
 static __inline void
@@ -800,7 +800,7 @@ setsbc16(uint16_t a, uint16_t b)
         cpu_state.flags |= C_FLAG;
     if ((a ^ b) & (a ^ c) & 0x8000)
         cpu_state.flags |= V_FLAG;
-    if (((a & 0xF) - (b & 0xF)) & 0x10)
+    if (((a & 0xF) - ((b & 0xF) + tempc)) & 0x10)
         cpu_state.flags |= A_FLAG;
 }
 
diff --git a/src/cpu/x86_ops.h b/src/cpu/x86_ops.h
index 6fb9b7a22..ed95d04d9 100644
--- a/src/cpu/x86_ops.h
+++ b/src/cpu/x86_ops.h
@@ -90,10 +90,9 @@ extern const OpFn dynarec_ops_winchip2_0f[1024];
 extern const OpFn dynarec_ops_pentium_0f[1024];
 extern const OpFn dynarec_ops_pentiummmx_0f[1024];
 
-#    if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
 extern const OpFn dynarec_ops_c6x86_0f[1024];
+extern const OpFn dynarec_ops_c6x86l_0f[1024];
 extern const OpFn dynarec_ops_c6x86mx_0f[1024];
-#    endif
 
 extern const OpFn dynarec_ops_k6_0f[1024];
 extern const OpFn dynarec_ops_k62_0f[1024];
@@ -232,10 +231,9 @@ extern const OpFn ops_winchip2_0f[1024];
 extern const OpFn ops_pentium_0f[1024];
 extern const OpFn ops_pentiummmx_0f[1024];
 
-#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
 extern const OpFn ops_c6x86_0f[1024];
+extern const OpFn ops_c6x86l_0f[1024];
 extern const OpFn ops_c6x86mx_0f[1024];
-#endif
 
 extern const OpFn ops_k6_0f[1024];
 extern const OpFn ops_k62_0f[1024];
@@ -263,14 +261,20 @@ extern const OpFn ops_sf_fpu_d8_a16[32];
 extern const OpFn ops_sf_fpu_d8_a32[32];
 extern const OpFn ops_sf_fpu_d9_a16[256];
 extern const OpFn ops_sf_fpu_d9_a32[256];
+extern const OpFn ops_sf_fpu_cyrix_d9_a16[256];
+extern const OpFn ops_sf_fpu_cyrix_d9_a32[256];
 extern const OpFn ops_sf_fpu_da_a16[256];
 extern const OpFn ops_sf_fpu_da_a32[256];
 extern const OpFn ops_sf_fpu_db_a16[256];
 extern const OpFn ops_sf_fpu_db_a32[256];
+extern const OpFn ops_sf_fpu_cyrix_686_db_a16[256];
+extern const OpFn ops_sf_fpu_cyrix_686_db_a32[256];
 extern const OpFn ops_sf_fpu_dc_a16[32];
 extern const OpFn ops_sf_fpu_dc_a32[32];
 extern const OpFn ops_sf_fpu_dd_a16[256];
 extern const OpFn ops_sf_fpu_dd_a32[256];
+extern const OpFn ops_sf_fpu_cyrix_dd_a16[256];
+extern const OpFn ops_sf_fpu_cyrix_dd_a32[256];
 extern const OpFn ops_sf_fpu_de_a16[256];
 extern const OpFn ops_sf_fpu_de_a32[256];
 extern const OpFn ops_sf_fpu_df_a16[256];
@@ -295,6 +299,8 @@ extern const OpFn ops_fpu_d8_a16[32];
 extern const OpFn ops_fpu_d8_a32[32];
 extern const OpFn ops_fpu_d9_a16[256];
 extern const OpFn ops_fpu_d9_a32[256];
+extern const OpFn ops_fpu_cyrix_d9_a16[256];
+extern const OpFn ops_fpu_cyrix_d9_a32[256];
 extern const OpFn ops_fpu_da_a16[256];
 extern const OpFn ops_fpu_da_a32[256];
 extern const OpFn ops_fpu_db_a16[256];
@@ -303,6 +309,8 @@ extern const OpFn ops_fpu_dc_a16[32];
 extern const OpFn ops_fpu_dc_a32[32];
 extern const OpFn ops_fpu_dd_a16[256];
 extern const OpFn ops_fpu_dd_a32[256];
+extern const OpFn ops_fpu_cyrix_dd_a16[256];
+extern const OpFn ops_fpu_cyrix_dd_a32[256];
 extern const OpFn ops_fpu_de_a16[256];
 extern const OpFn ops_fpu_de_a32[256];
 extern const OpFn ops_fpu_df_a16[256];
@@ -314,15 +322,23 @@ extern const OpFn ops_sf_fpu_686_da_a16[256];
 extern const OpFn ops_sf_fpu_686_da_a32[256];
 extern const OpFn ops_sf_fpu_686_db_a16[256];
 extern const OpFn ops_sf_fpu_686_db_a32[256];
+extern const OpFn ops_sf_fpu_cyrix_686_db_a16[256];
+extern const OpFn ops_sf_fpu_cyrix_686_db_a32[256];
 extern const OpFn ops_sf_fpu_686_df_a16[256];
 extern const OpFn ops_sf_fpu_686_df_a32[256];
+extern const OpFn ops_sf_fpu_cyrix_686_df_a16[256];
+extern const OpFn ops_sf_fpu_cyrix_686_df_a32[256];
 
 extern const OpFn ops_fpu_686_da_a16[256];
 extern const OpFn ops_fpu_686_da_a32[256];
 extern const OpFn ops_fpu_686_db_a16[256];
 extern const OpFn ops_fpu_686_db_a32[256];
+extern const OpFn ops_fpu_cyrix_686_db_a16[256];
+extern const OpFn ops_fpu_cyrix_686_db_a32[256];
 extern const OpFn ops_fpu_686_df_a16[256];
 extern const OpFn ops_fpu_686_df_a32[256];
+extern const OpFn ops_fpu_cyrix_686_df_a16[256];
+extern const OpFn ops_fpu_cyrix_686_df_a32[256];
 
 extern const OpFn ops_REPE[1024];
 extern const OpFn ops_REPNE[1024];
@@ -434,9 +450,9 @@ extern const OpFn ops_2386_REPE[1024];
 extern const OpFn ops_2386_REPNE[1024];
 extern const OpFn ops_2386_3DNOW[256];
 
-#define C0 (1 << 8)
-#define C1 (1 << 9)
-#define C2 (1 << 10)
-#define C3 (1 << 14)
+#define FPU_SW_C3              (0x4000)  /* condition bit 3 */
+#define FPU_SW_C2              (0x0400)  /* condition bit 2 */
+#define FPU_SW_C1              (0x0200)  /* condition bit 1 */
+#define FPU_SW_C0              (0x0100)  /* condition bit 0 */
 
 #endif /*_X86_OPS_H*/
diff --git a/src/cpu/x86_ops_3dnow.h b/src/cpu/x86_ops_3dnow.h
index b72cbc06c..2b4ed1a6d 100644
--- a/src/cpu/x86_ops_3dnow.h
+++ b/src/cpu/x86_ops_3dnow.h
@@ -20,7 +20,7 @@ opPREFETCH_a32(uint32_t fetchdat)
 }
 
 static int
-opFEMMS(uint32_t fetchdat)
+opFEMMS(UNUSED(uint32_t fetchdat))
 {
     ILLEGAL_ON(!cpu_has_feature(CPU_FEATURE_MMX));
     if (cr0 & 0xc) {
@@ -33,7 +33,7 @@ opFEMMS(uint32_t fetchdat)
 }
 
 static int
-opPAVGUSB(uint32_t fetchdat)
+opPAVGUSB(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -54,7 +54,7 @@ opPAVGUSB(uint32_t fetchdat)
     return 0;
 }
 static int
-opPF2ID(uint32_t fetchdat)
+opPF2ID(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -69,7 +69,7 @@ opPF2ID(uint32_t fetchdat)
     return 0;
 }
 static int
-opPF2IW(uint32_t fetchdat)
+opPF2IW(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -84,7 +84,7 @@ opPF2IW(uint32_t fetchdat)
     return 0;
 }
 static int
-opPFACC(uint32_t fetchdat)
+opPFACC(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -101,7 +101,7 @@ opPFACC(uint32_t fetchdat)
     return 0;
 }
 static int
-opPFNACC(uint32_t fetchdat)
+opPFNACC(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -118,7 +118,7 @@ opPFNACC(uint32_t fetchdat)
     return 0;
 }
 static int
-opPFPNACC(uint32_t fetchdat)
+opPFPNACC(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -135,7 +135,7 @@ opPFPNACC(uint32_t fetchdat)
     return 0;
 }
 static int
-opPSWAPD(uint32_t fetchdat)
+opPSWAPD(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -155,7 +155,7 @@ opPSWAPD(uint32_t fetchdat)
     return 0;
 }
 static int
-opPFADD(uint32_t fetchdat)
+opPFADD(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -170,7 +170,7 @@ opPFADD(uint32_t fetchdat)
     return 0;
 }
 static int
-opPFCMPEQ(uint32_t fetchdat)
+opPFCMPEQ(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -185,7 +185,7 @@ opPFCMPEQ(uint32_t fetchdat)
     return 0;
 }
 static int
-opPFCMPGE(uint32_t fetchdat)
+opPFCMPGE(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -200,7 +200,7 @@ opPFCMPGE(uint32_t fetchdat)
     return 0;
 }
 static int
-opPFCMPGT(uint32_t fetchdat)
+opPFCMPGT(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -215,7 +215,7 @@ opPFCMPGT(uint32_t fetchdat)
     return 0;
 }
 static int
-opPFMAX(uint32_t fetchdat)
+opPFMAX(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -232,7 +232,7 @@ opPFMAX(uint32_t fetchdat)
     return 0;
 }
 static int
-opPFMIN(uint32_t fetchdat)
+opPFMIN(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -249,7 +249,7 @@ opPFMIN(uint32_t fetchdat)
     return 0;
 }
 static int
-opPFMUL(uint32_t fetchdat)
+opPFMUL(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -264,7 +264,7 @@ opPFMUL(uint32_t fetchdat)
     return 0;
 }
 static int
-opPFRCP(uint32_t fetchdat)
+opPFRCP(UNUSED(uint32_t fetchdat))
 {
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
 
@@ -293,7 +293,7 @@ opPFRCP(uint32_t fetchdat)
 }
 /*Since opPFRCP() calculates a full precision reciprocal, treat the followup iterations as MOVs*/
 static int
-opPFRCPIT1(uint32_t fetchdat)
+opPFRCPIT1(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -308,7 +308,7 @@ opPFRCPIT1(uint32_t fetchdat)
     return 0;
 }
 static int
-opPFRCPIT2(uint32_t fetchdat)
+opPFRCPIT2(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -323,7 +323,7 @@ opPFRCPIT2(uint32_t fetchdat)
     return 0;
 }
 static int
-opPFRSQRT(uint32_t fetchdat)
+opPFRSQRT(UNUSED(uint32_t fetchdat))
 {
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
 
@@ -352,7 +352,7 @@ opPFRSQRT(uint32_t fetchdat)
 }
 /*Since opPFRSQRT() calculates a full precision inverse square root, treat the followup iteration as a NOP*/
 static int
-opPFRSQIT1(uint32_t fetchdat)
+opPFRSQIT1(UNUSED(uint32_t fetchdat))
 {
     MMX_REG src;
 
@@ -362,7 +362,7 @@ opPFRSQIT1(uint32_t fetchdat)
     return 0;
 }
 static int
-opPFSUB(uint32_t fetchdat)
+opPFSUB(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -377,7 +377,7 @@ opPFSUB(uint32_t fetchdat)
     return 0;
 }
 static int
-opPFSUBR(uint32_t fetchdat)
+opPFSUBR(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -392,7 +392,7 @@ opPFSUBR(uint32_t fetchdat)
     return 0;
 }
 static int
-opPI2FD(uint32_t fetchdat)
+opPI2FD(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -407,7 +407,7 @@ opPI2FD(uint32_t fetchdat)
     return 0;
 }
 static int
-opPI2FW(uint32_t fetchdat)
+opPI2FW(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
@@ -422,7 +422,7 @@ opPI2FW(uint32_t fetchdat)
     return 0;
 }
 static int
-opPMULHRW(uint32_t fetchdat)
+opPMULHRW(UNUSED(uint32_t fetchdat))
 {
     MMX_REG  src;
     MMX_REG *dst = MMX_GETREGP(cpu_reg);
diff --git a/src/cpu/x86_ops_amd.h b/src/cpu/x86_ops_amd.h
index 9e6bcce55..54da4a79d 100644
--- a/src/cpu/x86_ops_amd.h
+++ b/src/cpu/x86_ops_amd.h
@@ -22,12 +22,8 @@ opSYSCALL(uint32_t fetchdat)
 
     ret = syscall_op(fetchdat);
 
-    if (ret <= 1) {
-        CLOCK_CYCLES(20);
-        PREFETCH_RUN(20, 7, -1, 0, 0, 0, 0, 0);
-        PREFETCH_FLUSH();
+    if (ret <= 1)
         CPU_BLOCK_END();
-    }
 
     return ret;
 }
@@ -41,12 +37,8 @@ opSYSRET(uint32_t fetchdat)
 
     ret = sysret(fetchdat);
 
-    if (ret <= 1) {
-        CLOCK_CYCLES(20);
-        PREFETCH_RUN(20, 7, -1, 0, 0, 0, 0, 0);
-        PREFETCH_FLUSH();
+    if (ret <= 1)
         CPU_BLOCK_END();
-    }
 
     return ret;
 }
diff --git a/src/cpu/x86_ops_arith.h b/src/cpu/x86_ops_arith.h
index 4e3f74e36..0764877a4 100644
--- a/src/cpu/x86_ops_arith.h
+++ b/src/cpu/x86_ops_arith.h
@@ -313,7 +313,7 @@
         return 0;                                                                                           \
     }                                                                                                       \
                                                                                                             \
-    static int op##name##_EAX_imm(uint32_t fetchdat)                                                        \
+    static int op##name##_EAX_imm(UNUSED(uint32_t fetchdat))                                                \
     {                                                                                                       \
         uint32_t dst = EAX;                                                                                 \
         uint32_t src = getlong();                                                                           \
@@ -581,7 +581,7 @@ opCMP_AX_imm(uint32_t fetchdat)
 }
 
 static int
-opCMP_EAX_imm(uint32_t fetchdat)
+opCMP_EAX_imm(UNUSED(uint32_t fetchdat))
 {
     uint32_t src = getlong();
 
@@ -747,7 +747,7 @@ opTEST_AX(uint32_t fetchdat)
     return 0;
 }
 static int
-opTEST_EAX(uint32_t fetchdat)
+opTEST_EAX(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp = getlong();
     if (cpu_state.abrt)
diff --git a/src/cpu/x86_ops_bcd.h b/src/cpu/x86_ops_bcd.h
index b4779ab3e..a0d18875d 100644
--- a/src/cpu/x86_ops_bcd.h
+++ b/src/cpu/x86_ops_bcd.h
@@ -1,5 +1,5 @@
 static int
-opAAA(uint32_t fetchdat)
+opAAA(UNUSED(uint32_t fetchdat))
 {
     flags_rebuild();
     if ((cpu_state.flags & A_FLAG) || ((AL & 0xF) > 9)) {
@@ -24,7 +24,7 @@ opAAD(uint32_t fetchdat)
         base = 10;
     AL = (AH * base) + AL;
     AH = 0;
-    setznp16(AX);
+    setznp8(AL);
     CLOCK_CYCLES((is486) ? 14 : 19);
     PREFETCH_RUN(is486 ? 14 : 19, 2, -1, 0, 0, 0, 0, 0);
     return 0;
@@ -39,14 +39,14 @@ opAAM(uint32_t fetchdat)
         base = 10;
     AH = AL / base;
     AL %= base;
-    setznp16(AX);
+    setznp8(AL);
     CLOCK_CYCLES((is486) ? 15 : 17);
     PREFETCH_RUN(is486 ? 15 : 17, 2, -1, 0, 0, 0, 0, 0);
     return 0;
 }
 
 static int
-opAAS(uint32_t fetchdat)
+opAAS(UNUSED(uint32_t fetchdat))
 {
     flags_rebuild();
     if ((cpu_state.flags & A_FLAG) || ((AL & 0xF) > 9)) {
@@ -63,7 +63,7 @@ opAAS(uint32_t fetchdat)
 }
 
 static int
-opDAA(uint32_t fetchdat)
+opDAA(UNUSED(uint32_t fetchdat))
 {
     uint16_t tempw;
     uint16_t old_AL;
@@ -100,7 +100,7 @@ opDAA(uint32_t fetchdat)
 }
 
 static int
-opDAS(uint32_t fetchdat)
+opDAS(UNUSED(uint32_t fetchdat))
 {
     uint16_t tempw;
     uint16_t old_AL;
diff --git a/src/cpu/x86_ops_call.h b/src/cpu/x86_ops_call.h
index 9d52a2764..ee54dceff 100644
--- a/src/cpu/x86_ops_call.h
+++ b/src/cpu/x86_ops_call.h
@@ -209,7 +209,7 @@ opCALL_far_w(uint32_t fetchdat)
     return 0;
 }
 static int
-opCALL_far_l(uint32_t fetchdat)
+opCALL_far_l(UNUSED(uint32_t fetchdat))
 {
     uint32_t old_cs;
     uint32_t old_pc;
diff --git a/src/cpu/x86_ops_cyrix.h b/src/cpu/x86_ops_cyrix.h
index 672ebd08e..c95d4b038 100644
--- a/src/cpu/x86_ops_cyrix.h
+++ b/src/cpu/x86_ops_cyrix.h
@@ -35,7 +35,13 @@ opSVDC_common(uint32_t fetchdat)
 static int
 opSVDC_a16(uint32_t fetchdat)
 {
-    if (in_smm) {
+    uint8_t ins_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SM3)) ==
+                         (CCR1_USE_SMI | CCR1_SM3)) &&
+                        ((ccr1 & CCR1_SMAC) || in_smm) &&
+                        (cyrix.arr[3].size > 0) &&
+                        (CPL == 0);
+
+    if (ins_check) {
         fetch_ea_16(fetchdat);
         SEG_CHECK_WRITE(cpu_state.ea_seg);
         opSVDC_common(fetchdat);
@@ -47,7 +53,13 @@ opSVDC_a16(uint32_t fetchdat)
 static int
 opSVDC_a32(uint32_t fetchdat)
 {
-    if (in_smm) {
+    uint8_t ins_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SM3)) ==
+                         (CCR1_USE_SMI | CCR1_SM3)) &&
+                        ((ccr1 & CCR1_SMAC) || in_smm) &&
+                        (cyrix.arr[3].size > 0) &&
+                        (CPL == 0);
+
+    if (ins_check) {
         fetch_ea_32(fetchdat);
         SEG_CHECK_WRITE(cpu_state.ea_seg);
         opSVDC_common(fetchdat);
@@ -63,18 +75,23 @@ opRSDC_common(uint32_t fetchdat)
     switch (rmdat & 0x38) {
         case 0x00: /*ES*/
             cyrix_load_seg_descriptor(easeg + cpu_state.eaaddr, &cpu_state.seg_es);
+            ES = readmemw(0, easeg + cpu_state.eaaddr + 8);
             break;
         case 0x18: /*DS*/
             cyrix_load_seg_descriptor(easeg + cpu_state.eaaddr, &cpu_state.seg_ds);
+            DS = readmemw(0, easeg + cpu_state.eaaddr + 8);
             break;
         case 0x10: /*SS*/
             cyrix_load_seg_descriptor(easeg + cpu_state.eaaddr, &cpu_state.seg_ss);
+            SS = readmemw(0, easeg + cpu_state.eaaddr + 8);
             break;
         case 0x20: /*FS*/
             cyrix_load_seg_descriptor(easeg + cpu_state.eaaddr, &cpu_state.seg_fs);
+            FS = readmemw(0, easeg + cpu_state.eaaddr + 8);
             break;
         case 0x28: /*GS*/
             cyrix_load_seg_descriptor(easeg + cpu_state.eaaddr, &cpu_state.seg_gs);
+            GS = readmemw(0, easeg + cpu_state.eaaddr + 8);
             break;
         default:
             x86illegal();
@@ -83,7 +100,13 @@ opRSDC_common(uint32_t fetchdat)
 static int
 opRSDC_a16(uint32_t fetchdat)
 {
-    if (in_smm) {
+    uint8_t ins_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SM3)) ==
+                         (CCR1_USE_SMI | CCR1_SM3)) &&
+                        ((ccr1 & CCR1_SMAC) || in_smm) &&
+                        (cyrix.arr[3].size > 0) &&
+                        (CPL == 0);
+
+    if (ins_check) {
         fetch_ea_16(fetchdat);
         SEG_CHECK_READ(cpu_state.ea_seg);
         opRSDC_common(fetchdat);
@@ -95,7 +118,13 @@ opRSDC_a16(uint32_t fetchdat)
 static int
 opRSDC_a32(uint32_t fetchdat)
 {
-    if (in_smm) {
+    uint8_t ins_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SM3)) ==
+                         (CCR1_USE_SMI | CCR1_SM3)) &&
+                        ((ccr1 & CCR1_SMAC) || in_smm) &&
+                        (cyrix.arr[3].size > 0) &&
+                        (CPL == 0);
+
+    if (ins_check) {
         fetch_ea_32(fetchdat);
         SEG_CHECK_READ(cpu_state.ea_seg);
         opRSDC_common(fetchdat);
@@ -108,7 +137,13 @@ opRSDC_a32(uint32_t fetchdat)
 static int
 opSVLDT_a16(uint32_t fetchdat)
 {
-    if (in_smm) {
+    uint8_t ins_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SM3)) ==
+                         (CCR1_USE_SMI | CCR1_SM3)) &&
+                        ((ccr1 & CCR1_SMAC) || in_smm) &&
+                        (cyrix.arr[3].size > 0) &&
+                        (CPL == 0);
+
+    if (ins_check) {
         fetch_ea_16(fetchdat);
         SEG_CHECK_WRITE(cpu_state.ea_seg);
         cyrix_write_seg_descriptor(easeg + cpu_state.eaaddr, &ldt);
@@ -121,7 +156,13 @@ opSVLDT_a16(uint32_t fetchdat)
 static int
 opSVLDT_a32(uint32_t fetchdat)
 {
-    if (in_smm) {
+    uint8_t ins_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SM3)) ==
+                         (CCR1_USE_SMI | CCR1_SM3)) &&
+                        ((ccr1 & CCR1_SMAC) || in_smm) &&
+                        (cyrix.arr[3].size > 0) &&
+                        (CPL == 0);
+
+    if (ins_check) {
         fetch_ea_32(fetchdat);
         SEG_CHECK_WRITE(cpu_state.ea_seg);
         cyrix_write_seg_descriptor(easeg + cpu_state.eaaddr, &ldt);
@@ -135,7 +176,13 @@ opSVLDT_a32(uint32_t fetchdat)
 static int
 opRSLDT_a16(uint32_t fetchdat)
 {
-    if (in_smm) {
+    uint8_t ins_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SM3)) ==
+                         (CCR1_USE_SMI | CCR1_SM3)) &&
+                        ((ccr1 & CCR1_SMAC) || in_smm) &&
+                        (cyrix.arr[3].size > 0) &&
+                        (CPL == 0);
+
+    if (ins_check) {
         fetch_ea_16(fetchdat);
         SEG_CHECK_READ(cpu_state.ea_seg);
         cyrix_load_seg_descriptor(easeg + cpu_state.eaaddr, &ldt);
@@ -147,7 +194,13 @@ opRSLDT_a16(uint32_t fetchdat)
 static int
 opRSLDT_a32(uint32_t fetchdat)
 {
-    if (in_smm) {
+    uint8_t ins_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SM3)) ==
+                         (CCR1_USE_SMI | CCR1_SM3)) &&
+                        ((ccr1 & CCR1_SMAC) || in_smm) &&
+                        (cyrix.arr[3].size > 0) &&
+                        (CPL == 0);
+
+    if (ins_check) {
         fetch_ea_32(fetchdat);
         SEG_CHECK_READ(cpu_state.ea_seg);
         cyrix_load_seg_descriptor(easeg + cpu_state.eaaddr, &ldt);
@@ -160,7 +213,13 @@ opRSLDT_a32(uint32_t fetchdat)
 static int
 opSVTS_a16(uint32_t fetchdat)
 {
-    if (in_smm) {
+    uint8_t ins_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SM3)) ==
+                         (CCR1_USE_SMI | CCR1_SM3)) &&
+                        ((ccr1 & CCR1_SMAC) || in_smm) &&
+                        (cyrix.arr[3].size > 0) &&
+                        (CPL == 0);
+
+    if (ins_check) {
         fetch_ea_16(fetchdat);
         SEG_CHECK_WRITE(cpu_state.ea_seg);
         cyrix_write_seg_descriptor(easeg + cpu_state.eaaddr, &tr);
@@ -173,7 +232,13 @@ opSVTS_a16(uint32_t fetchdat)
 static int
 opSVTS_a32(uint32_t fetchdat)
 {
-    if (in_smm) {
+    uint8_t ins_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SM3)) ==
+                         (CCR1_USE_SMI | CCR1_SM3)) &&
+                        ((ccr1 & CCR1_SMAC) || in_smm) &&
+                        (cyrix.arr[3].size > 0) &&
+                        (CPL == 0);
+
+    if (ins_check) {
         fetch_ea_32(fetchdat);
         SEG_CHECK_WRITE(cpu_state.ea_seg);
         cyrix_write_seg_descriptor(easeg + cpu_state.eaaddr, &tr);
@@ -187,7 +252,13 @@ opSVTS_a32(uint32_t fetchdat)
 static int
 opRSTS_a16(uint32_t fetchdat)
 {
-    if (in_smm) {
+    uint8_t ins_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SM3)) ==
+                         (CCR1_USE_SMI | CCR1_SM3)) &&
+                        ((ccr1 & CCR1_SMAC) || in_smm) &&
+                        (cyrix.arr[3].size > 0) &&
+                        (CPL == 0);
+
+    if (ins_check) {
         fetch_ea_16(fetchdat);
         SEG_CHECK_WRITE(cpu_state.ea_seg);
         cyrix_write_seg_descriptor(easeg + cpu_state.eaaddr, &tr);
@@ -200,7 +271,13 @@ opRSTS_a16(uint32_t fetchdat)
 static int
 opRSTS_a32(uint32_t fetchdat)
 {
-    if (in_smm) {
+    uint8_t ins_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SM3)) ==
+                         (CCR1_USE_SMI | CCR1_SM3)) &&
+                        ((ccr1 & CCR1_SMAC) || in_smm) &&
+                        (cyrix.arr[3].size > 0) &&
+                        (CPL == 0);
+
+    if (ins_check) {
         fetch_ea_32(fetchdat);
         SEG_CHECK_WRITE(cpu_state.ea_seg);
         cyrix_write_seg_descriptor(easeg + cpu_state.eaaddr, &tr);
@@ -212,32 +289,72 @@ opRSTS_a32(uint32_t fetchdat)
 }
 
 static int
-opSMINT(uint32_t fetchdat)
+opSMINT(UNUSED(uint32_t fetchdat))
 {
+    uint8_t ccr1_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SMAC | CCR1_SM3)) ==
+                          (CCR1_USE_SMI | CCR1_SMAC | CCR1_SM3)) &&
+                          (cyrix.arr[3].size > 0);
+
     if (in_smm)
         fatal("opSMINT\n");
-    else
-        x86illegal();
+    else if (ccr1_check) {
+        is_smint = 1;
+        enter_smm(0);
+    }
 
     return 1;
 }
 
 static int
-opRDSHR_a16(uint32_t fetchdat)
+opRDSHR_a16(UNUSED(uint32_t fetchdat))
 {
-    if (in_smm)
-        fatal("opRDSHR_a16\n");
-    else
+    uint8_t ins_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SM3)) ==
+                         (CCR1_USE_SMI | CCR1_SM3)) &&
+                        ((ccr1 & CCR1_SMAC) || in_smm) &&
+                        (cyrix.arr[3].size > 0) &&
+                        (CPL == 0);
+
+    if (ins_check) {
+        fetch_ea_16(fetchdat);
+        if (cpu_mod == 3) {
+            cpu_state.regs[cpu_rm].l = cyrix.smhr;
+            CLOCK_CYCLES(timing_rr);
+            PREFETCH_RUN(timing_rr, 2, rmdat, 0, 0, 0, 0, 0);
+        } else {
+            SEG_CHECK_WRITE(cpu_state.ea_seg);
+            seteal(cyrix.smhr);
+            CLOCK_CYCLES(is486 ? 1 : 2);
+            PREFETCH_RUN(2, 2, rmdat, 0, 0, 0, 1, 0);
+        }
+        return cpu_state.abrt;
+    } else
         x86illegal();
 
     return 1;
 }
 static int
-opRDSHR_a32(uint32_t fetchdat)
+opRDSHR_a32(UNUSED(uint32_t fetchdat))
 {
-    if (in_smm)
-        fatal("opRDSHR_a32\n");
-    else
+    uint8_t ins_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SM3)) ==
+                         (CCR1_USE_SMI | CCR1_SM3)) &&
+                        ((ccr1 & CCR1_SMAC) || in_smm) &&
+                        (cyrix.arr[3].size > 0) &&
+                        (CPL == 0);
+
+    if (ins_check) {
+        fetch_ea_32(fetchdat);
+        if (cpu_mod == 3) {
+            cpu_state.regs[cpu_rm].l = cyrix.smhr;
+            CLOCK_CYCLES(timing_rr);
+            PREFETCH_RUN(timing_rr, 2, rmdat, 0, 0, 0, 0, 1);
+        } else {
+            SEG_CHECK_WRITE(cpu_state.ea_seg);
+            seteal(cyrix.smhr);
+            CLOCK_CYCLES(is486 ? 1 : 2);
+            PREFETCH_RUN(2, 2, rmdat, 0, 0, 0, 1, 1);
+        }
+        return cpu_state.abrt;
+    } else
         x86illegal();
 
     return 1;
@@ -246,9 +363,31 @@ opRDSHR_a32(uint32_t fetchdat)
 static int
 opWRSHR_a16(uint32_t fetchdat)
 {
-    if (in_smm)
-        fatal("opWRSHR_a16\n");
-    else
+    uint8_t ins_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SM3)) ==
+                         (CCR1_USE_SMI | CCR1_SM3)) &&
+                        ((ccr1 & CCR1_SMAC) || in_smm) &&
+                        (cyrix.arr[3].size > 0) &&
+                        (CPL == 0);
+
+    if (ins_check) {
+        fetch_ea_16(fetchdat);
+        if (cpu_mod == 3) {
+            cyrix.smhr = cpu_state.regs[cpu_rm].l;
+            CLOCK_CYCLES(timing_rr);
+            PREFETCH_RUN(timing_rr, 2, rmdat, 0, 0, 0, 0, 0);
+        } else {
+            uint32_t temp;
+            SEG_CHECK_READ(cpu_state.ea_seg);
+            CHECK_READ(cpu_state.ea_seg, cpu_state.eaaddr, cpu_state.eaaddr + 3);
+            temp = geteal();
+            if (cpu_state.abrt)
+                return 1;
+            cyrix.smhr = temp;
+            CLOCK_CYCLES(is486 ? 1 : 4);
+            PREFETCH_RUN(4, 2, rmdat, 0, 1, 0, 0, 0);
+        }
+        return 0;
+    } else
         x86illegal();
 
     return 1;
@@ -256,9 +395,31 @@ opWRSHR_a16(uint32_t fetchdat)
 static int
 opWRSHR_a32(uint32_t fetchdat)
 {
-    if (in_smm)
-        fatal("opWRSHR_a32\n");
-    else
+    uint8_t ins_check = ((ccr1 & (CCR1_USE_SMI | CCR1_SM3)) ==
+                         (CCR1_USE_SMI | CCR1_SM3)) &&
+                        ((ccr1 & CCR1_SMAC) || in_smm) &&
+                        (cyrix.arr[3].size > 0) &&
+                        (CPL == 0);
+
+    if (ins_check) {
+        fetch_ea_32(fetchdat);
+        if (cpu_mod == 3) {
+            cyrix.smhr = cpu_state.regs[cpu_rm].l;
+            CLOCK_CYCLES(timing_rr);
+            PREFETCH_RUN(timing_rr, 2, rmdat, 0, 0, 0, 0, 1);
+        } else {
+            uint32_t temp;
+            SEG_CHECK_READ(cpu_state.ea_seg);
+            CHECK_READ(cpu_state.ea_seg, cpu_state.eaaddr, cpu_state.eaaddr + 3);
+            temp = geteal();
+            if (cpu_state.abrt)
+                return 1;
+            cyrix.smhr = temp;
+            CLOCK_CYCLES(is486 ? 1 : 4);
+            PREFETCH_RUN(4, 2, rmdat, 0, 1, 0, 0, 1);
+        }
+        return 0;
+    } else
         x86illegal();
 
     return 1;
diff --git a/src/cpu/x86_ops_flag.h b/src/cpu/x86_ops_flag.h
index f08b30fce..7e7324341 100644
--- a/src/cpu/x86_ops_flag.h
+++ b/src/cpu/x86_ops_flag.h
@@ -1,5 +1,5 @@
 static int
-opCMC(uint32_t fetchdat)
+opCMC(UNUSED(uint32_t fetchdat))
 {
     flags_rebuild();
     cpu_state.flags ^= C_FLAG;
@@ -9,7 +9,7 @@ opCMC(uint32_t fetchdat)
 }
 
 static int
-opCLC(uint32_t fetchdat)
+opCLC(UNUSED(uint32_t fetchdat))
 {
     flags_rebuild();
     cpu_state.flags &= ~C_FLAG;
@@ -18,7 +18,7 @@ opCLC(uint32_t fetchdat)
     return 0;
 }
 static int
-opCLD(uint32_t fetchdat)
+opCLD(UNUSED(uint32_t fetchdat))
 {
     cpu_state.flags &= ~D_FLAG;
     CLOCK_CYCLES(2);
@@ -26,7 +26,7 @@ opCLD(uint32_t fetchdat)
     return 0;
 }
 static int
-opCLI(uint32_t fetchdat)
+opCLI(UNUSED(uint32_t fetchdat))
 {
     if (!IOPLp) {
         if ((!(cpu_state.eflags & VM_FLAG) && (cr4 & CR4_PVI)) || ((cpu_state.eflags & VM_FLAG) && (cr4 & CR4_VME))) {
@@ -44,7 +44,7 @@ opCLI(uint32_t fetchdat)
 }
 
 static int
-opSTC(uint32_t fetchdat)
+opSTC(UNUSED(uint32_t fetchdat))
 {
     flags_rebuild();
     cpu_state.flags |= C_FLAG;
@@ -53,7 +53,7 @@ opSTC(uint32_t fetchdat)
     return 0;
 }
 static int
-opSTD(uint32_t fetchdat)
+opSTD(UNUSED(uint32_t fetchdat))
 {
     cpu_state.flags |= D_FLAG;
     CLOCK_CYCLES(2);
@@ -61,7 +61,7 @@ opSTD(uint32_t fetchdat)
     return 0;
 }
 static int
-opSTI(uint32_t fetchdat)
+opSTI(UNUSED(uint32_t fetchdat))
 {
     if (!IOPLp) {
         if ((!(cpu_state.eflags & VM_FLAG) && (cr4 & CR4_PVI)) || ((cpu_state.eflags & VM_FLAG) && (cr4 & CR4_VME))) {
@@ -87,7 +87,7 @@ opSTI(uint32_t fetchdat)
 }
 
 static int
-opSAHF(uint32_t fetchdat)
+opSAHF(UNUSED(uint32_t fetchdat))
 {
     flags_rebuild();
     cpu_state.flags = (cpu_state.flags & 0xff00) | (AH & 0xd5) | 2;
@@ -101,7 +101,7 @@ opSAHF(uint32_t fetchdat)
     return 0;
 }
 static int
-opLAHF(uint32_t fetchdat)
+opLAHF(UNUSED(uint32_t fetchdat))
 {
     flags_rebuild();
     AH = cpu_state.flags & 0xff;
@@ -111,7 +111,7 @@ opLAHF(uint32_t fetchdat)
 }
 
 static int
-opPUSHF(uint32_t fetchdat)
+opPUSHF(UNUSED(uint32_t fetchdat))
 {
     if ((cpu_state.eflags & VM_FLAG) && (IOPL < 3)) {
         if (cr4 & CR4_VME) {
@@ -121,6 +121,7 @@ opPUSHF(uint32_t fetchdat)
             temp = (cpu_state.flags & ~I_FLAG) | 0x3000;
             if (cpu_state.eflags & VIF_FLAG)
                 temp |= I_FLAG;
+            temp = (temp & 0x7fd5) | 2;
             PUSH_W(temp);
         } else {
             x86gpf(NULL, 0);
@@ -128,6 +129,7 @@ opPUSHF(uint32_t fetchdat)
         }
     } else {
         flags_rebuild();
+        cpu_state.flags = (cpu_state.flags & 0x7fd5) | 2;
         PUSH_W(cpu_state.flags);
     }
     CLOCK_CYCLES(4);
@@ -135,7 +137,7 @@ opPUSHF(uint32_t fetchdat)
     return cpu_state.abrt;
 }
 static int
-opPUSHFD(uint32_t fetchdat)
+opPUSHFD(UNUSED(uint32_t fetchdat))
 {
     uint16_t tempw;
     if ((cpu_state.eflags & VM_FLAG) && (IOPL < 3)) {
@@ -149,6 +151,7 @@ opPUSHFD(uint32_t fetchdat)
     else
         tempw = cpu_state.eflags & 4;
     flags_rebuild();
+    cpu_state.flags = (cpu_state.flags & 0x7fd5) | 2;
     PUSH_L(cpu_state.flags | (tempw << 16));
     CLOCK_CYCLES(4);
     PREFETCH_RUN(4, 1, -1, 0, 0, 0, 1, 0);
@@ -156,7 +159,31 @@ opPUSHFD(uint32_t fetchdat)
 }
 
 static int
-opPOPF_186(uint32_t fetchdat)
+opPOPF_186(UNUSED(uint32_t fetchdat))
+{
+    uint16_t tempw;
+
+    tempw = POP_W();
+    if (cpu_state.abrt)
+        return 1;
+
+    cpu_state.flags = (cpu_state.flags & 0x7000) | (tempw & 0x0fd5) | 2;
+    flags_extract();
+#ifdef USE_DEBUG_REGS_486
+    rf_flag_no_clear = 1;
+#endif
+
+    CLOCK_CYCLES(5);
+    PREFETCH_RUN(5, 1, -1, 1, 0, 0, 0, 0);
+
+#if (defined(USE_DYNAREC) && defined(USE_NEW_DYNAREC))
+    codegen_flags_changed = 0;
+#endif
+
+    return 0;
+}
+static int
+opPOPF_286(UNUSED(uint32_t fetchdat))
 {
     uint16_t tempw;
 
@@ -178,6 +205,9 @@ opPOPF_186(uint32_t fetchdat)
     else
         cpu_state.flags = (cpu_state.flags & 0x3200) | (tempw & 0x4dd5) | 2;
     flags_extract();
+#ifdef USE_DEBUG_REGS_486
+    rf_flag_no_clear = 1;
+#endif
 
     CLOCK_CYCLES(5);
     PREFETCH_RUN(5, 1, -1, 1, 0, 0, 0, 0);
@@ -189,40 +219,7 @@ opPOPF_186(uint32_t fetchdat)
     return 0;
 }
 static int
-opPOPF_286(uint32_t fetchdat)
-{
-    uint16_t tempw;
-
-    if ((cpu_state.eflags & VM_FLAG) && (IOPL < 3)) {
-        x86gpf(NULL, 0);
-        return 1;
-    }
-
-    tempw = POP_W();
-    if (cpu_state.abrt)
-        return 1;
-
-    if (!(msw & 1))
-        cpu_state.flags = (cpu_state.flags & 0x7000) | (tempw & 0x0fd5) | 2;
-    else if (!(CPL))
-        cpu_state.flags = (tempw & 0x7fd5) | 2;
-    else if (IOPLp)
-        cpu_state.flags = (cpu_state.flags & 0x3000) | (tempw & 0x4fd5) | 2;
-    else
-        cpu_state.flags = (cpu_state.flags & 0x3200) | (tempw & 0x4dd5) | 2;
-    flags_extract();
-
-    CLOCK_CYCLES(5);
-    PREFETCH_RUN(5, 1, -1, 1, 0, 0, 0, 0);
-
-#if (defined(USE_DYNAREC) && defined(USE_NEW_DYNAREC))
-    codegen_flags_changed = 0;
-#endif
-
-    return 0;
-}
-static int
-opPOPF(uint32_t fetchdat)
+opPOPF(UNUSED(uint32_t fetchdat))
 {
     uint16_t tempw;
 
@@ -264,6 +261,9 @@ opPOPF(uint32_t fetchdat)
             cpu_state.flags = (cpu_state.flags & 0x3200) | (tempw & 0x4dd5) | 2;
     }
     flags_extract();
+#ifdef USE_DEBUG_REGS_486
+    rf_flag_no_clear = 1;
+#endif
 
     CLOCK_CYCLES(5);
     PREFETCH_RUN(5, 1, -1, 1, 0, 0, 0, 0);
@@ -275,7 +275,7 @@ opPOPF(uint32_t fetchdat)
     return 0;
 }
 static int
-opPOPFD(uint32_t fetchdat)
+opPOPFD(UNUSED(uint32_t fetchdat))
 {
     uint32_t templ;
 
@@ -307,6 +307,9 @@ opPOPFD(uint32_t fetchdat)
         cpu_state.eflags = (templ >> 16) & 3;
 
     flags_extract();
+#ifdef USE_DEBUG_REGS_486
+    rf_flag_no_clear = 1;
+#endif
 
     CLOCK_CYCLES(5);
     PREFETCH_RUN(5, 1, -1, 0, 1, 0, 0, 0);
diff --git a/src/cpu/x86_ops_flag_2386.h b/src/cpu/x86_ops_flag_2386.h
index ba34ae5e7..787b268dc 100644
--- a/src/cpu/x86_ops_flag_2386.h
+++ b/src/cpu/x86_ops_flag_2386.h
@@ -1,5 +1,5 @@
 static int
-opCMC(uint32_t fetchdat)
+opCMC(UNUSED(uint32_t fetchdat))
 {
     flags_rebuild();
     cpu_state.flags ^= C_FLAG;
@@ -9,7 +9,7 @@ opCMC(uint32_t fetchdat)
 }
 
 static int
-opCLC(uint32_t fetchdat)
+opCLC(UNUSED(uint32_t fetchdat))
 {
     flags_rebuild();
     cpu_state.flags &= ~C_FLAG;
@@ -18,7 +18,7 @@ opCLC(uint32_t fetchdat)
     return 0;
 }
 static int
-opCLD(uint32_t fetchdat)
+opCLD(UNUSED(uint32_t fetchdat))
 {
     cpu_state.flags &= ~D_FLAG;
     CLOCK_CYCLES(2);
@@ -26,7 +26,7 @@ opCLD(uint32_t fetchdat)
     return 0;
 }
 static int
-opCLI(uint32_t fetchdat)
+opCLI(UNUSED(uint32_t fetchdat))
 {
     if (!IOPLp) {
         if ((!(cpu_state.eflags & VM_FLAG) && (cr4 & CR4_PVI)) || ((cpu_state.eflags & VM_FLAG) && (cr4 & CR4_VME))) {
@@ -44,7 +44,7 @@ opCLI(uint32_t fetchdat)
 }
 
 static int
-opSTC(uint32_t fetchdat)
+opSTC(UNUSED(uint32_t fetchdat))
 {
     flags_rebuild();
     cpu_state.flags |= C_FLAG;
@@ -53,7 +53,7 @@ opSTC(uint32_t fetchdat)
     return 0;
 }
 static int
-opSTD(uint32_t fetchdat)
+opSTD(UNUSED(uint32_t fetchdat))
 {
     cpu_state.flags |= D_FLAG;
     CLOCK_CYCLES(2);
@@ -61,7 +61,7 @@ opSTD(uint32_t fetchdat)
     return 0;
 }
 static int
-opSTI(uint32_t fetchdat)
+opSTI(UNUSED(uint32_t fetchdat))
 {
     if (!IOPLp) {
         if ((!(cpu_state.eflags & VM_FLAG) && (cr4 & CR4_PVI)) || ((cpu_state.eflags & VM_FLAG) && (cr4 & CR4_VME))) {
@@ -87,7 +87,7 @@ opSTI(uint32_t fetchdat)
 }
 
 static int
-opSAHF(uint32_t fetchdat)
+opSAHF(UNUSED(uint32_t fetchdat))
 {
     flags_rebuild();
     cpu_state.flags = (cpu_state.flags & 0xff00) | (AH & 0xd5) | 2;
@@ -101,7 +101,7 @@ opSAHF(uint32_t fetchdat)
     return 0;
 }
 static int
-opLAHF(uint32_t fetchdat)
+opLAHF(UNUSED(uint32_t fetchdat))
 {
     flags_rebuild();
     AH = cpu_state.flags & 0xff;
@@ -111,7 +111,7 @@ opLAHF(uint32_t fetchdat)
 }
 
 static int
-opPUSHF(uint32_t fetchdat)
+opPUSHF(UNUSED(uint32_t fetchdat))
 {
     if ((cpu_state.eflags & VM_FLAG) && (IOPL < 3)) {
         if (cr4 & CR4_VME) {
@@ -121,6 +121,7 @@ opPUSHF(uint32_t fetchdat)
             temp = (cpu_state.flags & ~I_FLAG) | 0x3000;
             if (cpu_state.eflags & VIF_FLAG)
                 temp |= I_FLAG;
+            temp = (temp & 0x7fd5) | 2;
             PUSH_W(temp);
         } else {
             x86gpf(NULL, 0);
@@ -128,6 +129,7 @@ opPUSHF(uint32_t fetchdat)
         }
     } else {
         flags_rebuild();
+        cpu_state.flags = (cpu_state.flags & 0x7fd5) | 2;
         PUSH_W(cpu_state.flags);
     }
     CLOCK_CYCLES(4);
@@ -135,7 +137,7 @@ opPUSHF(uint32_t fetchdat)
     return cpu_state.abrt;
 }
 static int
-opPUSHFD(uint32_t fetchdat)
+opPUSHFD(UNUSED(uint32_t fetchdat))
 {
     uint16_t tempw;
     if ((cpu_state.eflags & VM_FLAG) && (IOPL < 3)) {
@@ -149,6 +151,7 @@ opPUSHFD(uint32_t fetchdat)
     else
         tempw = cpu_state.eflags & 4;
     flags_rebuild();
+    cpu_state.flags = (cpu_state.flags & 0x7fd5) | 2;
     PUSH_L(cpu_state.flags | (tempw << 16));
     CLOCK_CYCLES(4);
     PREFETCH_RUN(4, 1, -1, 0, 0, 0, 1, 0);
@@ -156,7 +159,29 @@ opPUSHFD(uint32_t fetchdat)
 }
 
 static int
-opPOPF_186(uint32_t fetchdat)
+opPOPF_186(UNUSED(uint32_t fetchdat))
+{
+    uint16_t tempw;
+
+    tempw = POP_W();
+    if (cpu_state.abrt)
+        return 1;
+
+    cpu_state.flags = (cpu_state.flags & 0x7000) | (tempw & 0x0fd5) | 2;
+    flags_extract();
+    rf_flag_no_clear = 1;
+
+    CLOCK_CYCLES(5);
+    PREFETCH_RUN(5, 1, -1, 1, 0, 0, 0, 0);
+
+#if (defined(USE_DYNAREC) && defined(USE_NEW_DYNAREC))
+    codegen_flags_changed = 0;
+#endif
+
+    return 0;
+}
+static int
+opPOPF_286(UNUSED(uint32_t fetchdat))
 {
     uint16_t tempw;
 
@@ -190,41 +215,7 @@ opPOPF_186(uint32_t fetchdat)
     return 0;
 }
 static int
-opPOPF_286(uint32_t fetchdat)
-{
-    uint16_t tempw;
-
-    if ((cpu_state.eflags & VM_FLAG) && (IOPL < 3)) {
-        x86gpf(NULL, 0);
-        return 1;
-    }
-
-    tempw = POP_W();
-    if (cpu_state.abrt)
-        return 1;
-
-    if (!(msw & 1))
-        cpu_state.flags = (cpu_state.flags & 0x7000) | (tempw & 0x0fd5) | 2;
-    else if (!(CPL))
-        cpu_state.flags = (tempw & 0x7fd5) | 2;
-    else if (IOPLp)
-        cpu_state.flags = (cpu_state.flags & 0x3000) | (tempw & 0x4fd5) | 2;
-    else
-        cpu_state.flags = (cpu_state.flags & 0x3200) | (tempw & 0x4dd5) | 2;
-    flags_extract();
-    rf_flag_no_clear = 1;
-
-    CLOCK_CYCLES(5);
-    PREFETCH_RUN(5, 1, -1, 1, 0, 0, 0, 0);
-
-#if (defined(USE_DYNAREC) && defined(USE_NEW_DYNAREC))
-    codegen_flags_changed = 0;
-#endif
-
-    return 0;
-}
-static int
-opPOPF(uint32_t fetchdat)
+opPOPF(UNUSED(uint32_t fetchdat))
 {
     uint16_t tempw;
 
@@ -278,7 +269,7 @@ opPOPF(uint32_t fetchdat)
     return 0;
 }
 static int
-opPOPFD(uint32_t fetchdat)
+opPOPFD(UNUSED(uint32_t fetchdat))
 {
     uint32_t templ;
 
diff --git a/src/cpu/x86_ops_fpu.h b/src/cpu/x86_ops_fpu.h
index 849e24e3d..afc79dd42 100644
--- a/src/cpu/x86_ops_fpu.h
+++ b/src/cpu/x86_ops_fpu.h
@@ -4,108 +4,122 @@
 static int
 opESCAPE_d8_a16(uint32_t fetchdat)
 {
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
     return x86_opcodes_d8_a16[(fetchdat >> 3) & 0x1f](fetchdat);
 }
 static int
 opESCAPE_d8_a32(uint32_t fetchdat)
 {
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
     return x86_opcodes_d8_a32[(fetchdat >> 3) & 0x1f](fetchdat);
 }
 
 static int
 opESCAPE_d9_a16(uint32_t fetchdat)
 {
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
     return x86_opcodes_d9_a16[fetchdat & 0xff](fetchdat);
 }
 static int
 opESCAPE_d9_a32(uint32_t fetchdat)
 {
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
     return x86_opcodes_d9_a32[fetchdat & 0xff](fetchdat);
 }
 
 static int
 opESCAPE_da_a16(uint32_t fetchdat)
 {
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
     return x86_opcodes_da_a16[fetchdat & 0xff](fetchdat);
 }
 static int
 opESCAPE_da_a32(uint32_t fetchdat)
 {
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
     return x86_opcodes_da_a32[fetchdat & 0xff](fetchdat);
 }
 
 static int
 opESCAPE_db_a16(uint32_t fetchdat)
 {
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
     return x86_opcodes_db_a16[fetchdat & 0xff](fetchdat);
 }
 static int
 opESCAPE_db_a32(uint32_t fetchdat)
 {
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
     return x86_opcodes_db_a32[fetchdat & 0xff](fetchdat);
 }
 
 static int
 opESCAPE_dc_a16(uint32_t fetchdat)
 {
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
     return x86_opcodes_dc_a16[(fetchdat >> 3) & 0x1f](fetchdat);
 }
 static int
 opESCAPE_dc_a32(uint32_t fetchdat)
 {
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
     return x86_opcodes_dc_a32[(fetchdat >> 3) & 0x1f](fetchdat);
 }
 
 static int
 opESCAPE_dd_a16(uint32_t fetchdat)
 {
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
     return x86_opcodes_dd_a16[fetchdat & 0xff](fetchdat);
 }
 static int
 opESCAPE_dd_a32(uint32_t fetchdat)
 {
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
     return x86_opcodes_dd_a32[fetchdat & 0xff](fetchdat);
 }
 
 static int
 opESCAPE_de_a16(uint32_t fetchdat)
 {
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
     return x86_opcodes_de_a16[fetchdat & 0xff](fetchdat);
 }
 static int
 opESCAPE_de_a32(uint32_t fetchdat)
 {
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
     return x86_opcodes_de_a32[fetchdat & 0xff](fetchdat);
 }
 
 static int
 opESCAPE_df_a16(uint32_t fetchdat)
 {
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
     return x86_opcodes_df_a16[fetchdat & 0xff](fetchdat);
 }
 static int
 opESCAPE_df_a32(uint32_t fetchdat)
 {
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
     return x86_opcodes_df_a32[fetchdat & 0xff](fetchdat);
 }
 
 static int
-opWAIT(uint32_t fetchdat)
+opWAIT(UNUSED(uint32_t fetchdat))
 {
     if ((cr0 & 0xa) == 0xa) {
         x86_int(7);
         return 1;
     }
 
-#if 0
-    if (!cpu_use_dynarec && fpu_softfloat) {
-#endif
     if (fpu_softfloat) {
         if (fpu_state.swd & FPU_SW_Summary) {
-            if (cr0 & 0x20) {
-                x86_int(16);
-                return 1;
-            }
+            if (cr0 & 0x20)
+                new_ne = 1;
+            else
+                picint(1 << 13);
+            return 1;
         }
     }
     CLOCK_CYCLES(4);
diff --git a/src/cpu/x86_ops_fpu_2386.h b/src/cpu/x86_ops_fpu_2386.h
new file mode 100644
index 000000000..7488a3d85
--- /dev/null
+++ b/src/cpu/x86_ops_fpu_2386.h
@@ -0,0 +1,127 @@
+/* Copyright holders: Sarah Walker
+   see COPYING for more details
+*/
+static int
+opESCAPE_d8_a16(uint32_t fetchdat)
+{
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
+    return x86_2386_opcodes_d8_a16[(fetchdat >> 3) & 0x1f](fetchdat);
+}
+static int
+opESCAPE_d8_a32(uint32_t fetchdat)
+{
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
+    return x86_2386_opcodes_d8_a32[(fetchdat >> 3) & 0x1f](fetchdat);
+}
+
+static int
+opESCAPE_d9_a16(uint32_t fetchdat)
+{
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
+    return x86_2386_opcodes_d9_a16[fetchdat & 0xff](fetchdat);
+}
+static int
+opESCAPE_d9_a32(uint32_t fetchdat)
+{
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
+    return x86_2386_opcodes_d9_a32[fetchdat & 0xff](fetchdat);
+}
+
+static int
+opESCAPE_da_a16(uint32_t fetchdat)
+{
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
+    return x86_2386_opcodes_da_a16[fetchdat & 0xff](fetchdat);
+}
+static int
+opESCAPE_da_a32(uint32_t fetchdat)
+{
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
+    return x86_2386_opcodes_da_a32[fetchdat & 0xff](fetchdat);
+}
+
+static int
+opESCAPE_db_a16(uint32_t fetchdat)
+{
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
+    return x86_2386_opcodes_db_a16[fetchdat & 0xff](fetchdat);
+}
+static int
+opESCAPE_db_a32(uint32_t fetchdat)
+{
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
+    return x86_2386_opcodes_db_a32[fetchdat & 0xff](fetchdat);
+}
+
+static int
+opESCAPE_dc_a16(uint32_t fetchdat)
+{
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
+    return x86_2386_opcodes_dc_a16[(fetchdat >> 3) & 0x1f](fetchdat);
+}
+static int
+opESCAPE_dc_a32(uint32_t fetchdat)
+{
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
+    return x86_2386_opcodes_dc_a32[(fetchdat >> 3) & 0x1f](fetchdat);
+}
+
+static int
+opESCAPE_dd_a16(uint32_t fetchdat)
+{
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
+    return x86_2386_opcodes_dd_a16[fetchdat & 0xff](fetchdat);
+}
+static int
+opESCAPE_dd_a32(uint32_t fetchdat)
+{
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
+    return x86_2386_opcodes_dd_a32[fetchdat & 0xff](fetchdat);
+}
+
+static int
+opESCAPE_de_a16(uint32_t fetchdat)
+{
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
+    return x86_2386_opcodes_de_a16[fetchdat & 0xff](fetchdat);
+}
+static int
+opESCAPE_de_a32(uint32_t fetchdat)
+{
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
+    return x86_2386_opcodes_de_a32[fetchdat & 0xff](fetchdat);
+}
+
+static int
+opESCAPE_df_a16(uint32_t fetchdat)
+{
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
+    return x86_2386_opcodes_df_a16[fetchdat & 0xff](fetchdat);
+}
+static int
+opESCAPE_df_a32(uint32_t fetchdat)
+{
+    x87_op = ((opcode & 0x07) << 8) | (fetchdat & 0xff);
+    return x86_2386_opcodes_df_a32[fetchdat & 0xff](fetchdat);
+}
+
+static int
+opWAIT(UNUSED(uint32_t fetchdat))
+{
+    if ((cr0 & 0xa) == 0xa) {
+        x86_int(7);
+        return 1;
+    }
+
+    if (fpu_softfloat) {
+        if (fpu_state.swd & FPU_SW_Summary) {
+            if (cr0 & 0x20)
+                new_ne = 1;
+            else
+                picint(1 << 13);
+            return 1;
+        }
+    }
+    CLOCK_CYCLES(4);
+    return 0;
+}
diff --git a/src/cpu/x86_ops_i686.h b/src/cpu/x86_ops_i686.h
index ab9d02d25..0809fac74 100644
--- a/src/cpu/x86_ops_i686.h
+++ b/src/cpu/x86_ops_i686.h
@@ -18,12 +18,8 @@ opSYSENTER(uint32_t fetchdat)
 {
     int ret = sysenter(fetchdat);
 
-    if (ret <= 1) {
-        CLOCK_CYCLES(20);
-        PREFETCH_RUN(20, 7, -1, 0, 0, 0, 0, 0);
-        PREFETCH_FLUSH();
+    if (ret <= 1)
         CPU_BLOCK_END();
-    }
 
     return ret;
 }
@@ -33,12 +29,8 @@ opSYSEXIT(uint32_t fetchdat)
 {
     int ret = sysexit(fetchdat);
 
-    if (ret <= 1) {
-        CLOCK_CYCLES(20);
-        PREFETCH_RUN(20, 7, -1, 0, 0, 0, 0, 0);
-        PREFETCH_FLUSH();
+    if (ret <= 1)
         CPU_BLOCK_END();
-    }
 
     return ret;
 }
@@ -54,8 +46,6 @@ sf_fx_save_stor_common(uint32_t fetchdat, int bits)
     if (CPUID < 0x650)
         return ILLEGAL(fetchdat);
 
-    FP_ENTER();
-
     if (bits == 32) {
         fetch_ea_32(fetchdat);
     } else {
@@ -90,18 +80,24 @@ sf_fx_save_stor_common(uint32_t fetchdat, int bits)
         /* The lower 11 bits contain the FPU opcode, upper 5 bits are reserved */
         fpu_state.foo = readmemw(easeg, cpu_state.eaaddr + 6) & 0x7FF;
 
-        fpu_state.fip = readmeml(easeg, cpu_state.eaaddr + 8);
+        if (bits == 32)
+            fpu_state.fip = readmeml(easeg, cpu_state.eaaddr + 8);
+        else
+            fpu_state.fip = readmemw(easeg, cpu_state.eaaddr + 8);
         fpu_state.fcs = readmemw(easeg, cpu_state.eaaddr + 12);
 
         tag_byte = readmemb(easeg, cpu_state.eaaddr + 4);
 
-        fpu_state.fdp = readmeml(easeg, cpu_state.eaaddr + 16);
+        if (bits == 32)
+            fpu_state.fdp = readmeml(easeg, cpu_state.eaaddr + 16);
+        else
+            fpu_state.fdp = readmemw(easeg, cpu_state.eaaddr + 16);
         fpu_state.fds = readmemw(easeg, cpu_state.eaaddr + 20);
 
         /* load i387 register file */
         for (index = 0; index < 8; index++) {
-            reg.fraction = readmemq(easeg, cpu_state.eaaddr + (index * 16) + 32);
-            reg.exp      = readmemw(easeg, cpu_state.eaaddr + (index * 16) + 40);
+            reg.signif  = readmemq(easeg, cpu_state.eaaddr + (index * 16) + 32);
+            reg.signExp = readmemw(easeg, cpu_state.eaaddr + (index * 16) + 40);
 
             // update tag only if it is not empty
             FPU_save_regi_tag(reg, IS_TAG_EMPTY(index) ? X87_TAG_EMPTY : FPU_tagof(reg), index);
@@ -118,7 +114,7 @@ sf_fx_save_stor_common(uint32_t fetchdat, int bits)
             fpu_state.swd &= ~(FPU_SW_Summary | FPU_SW_Backward);
         }
 
-        CLOCK_CYCLES((cr0 & 1) ? 34 : 44);
+        CLOCK_CYCLES(1);
     } else {
         /* FXSAVE */
         writememw(easeg, cpu_state.eaaddr, i387_get_control_word());
@@ -139,7 +135,10 @@ sf_fx_save_stor_common(uint32_t fetchdat, int bits)
          * x87 CS FPU IP Selector
          *   + 16 bit, in 16/32 bit mode only
          */
-        writememl(easeg, cpu_state.eaaddr + 8, fpu_state.fip);
+        if (bits == 32)
+            writememl(easeg, cpu_state.eaaddr + 8, fpu_state.fip);
+        else
+            writememl(easeg, cpu_state.eaaddr + 8, fpu_state.fip & 0xffff);
         writememl(easeg, cpu_state.eaaddr + 12, fpu_state.fcs);
 
         /*
@@ -152,18 +151,21 @@ sf_fx_save_stor_common(uint32_t fetchdat, int bits)
          * x87 DS FPU Instruction Operand (Data) Pointer Selector
          *   + 16 bit, in 16/32 bit mode only
          */
-        writememl(easeg, cpu_state.eaaddr + 16, fpu_state.fdp);
+        if (bits == 32)
+            writememl(easeg, cpu_state.eaaddr + 16, fpu_state.fdp);
+        else
+            writememl(easeg, cpu_state.eaaddr + 16, fpu_state.fdp & 0xffff);
         writememl(easeg, cpu_state.eaaddr + 20, fpu_state.fds);
 
         /* store i387 register file */
         for (index = 0; index < 8; index++) {
             const floatx80 fp = FPU_read_regi(index);
 
-            writememq(easeg, cpu_state.eaaddr + (index * 16) + 32, fp.fraction);
-            writememw(easeg, cpu_state.eaaddr + (index * 16) + 40, fp.exp);
+            writememq(easeg, cpu_state.eaaddr + (index * 16) + 32, fp.signif);
+            writememw(easeg, cpu_state.eaaddr + (index * 16) + 40, fp.signExp);
         }
 
-        CLOCK_CYCLES((cr0 & 1) ? 56 : 67);
+        CLOCK_CYCLES(1);
     }
 
     return cpu_state.abrt;
@@ -263,8 +265,6 @@ fx_save_stor_common(uint32_t fetchdat, int bits)
         return cpu_state.abrt;
     }
 
-    FP_ENTER();
-
     old_eaaddr = cpu_state.eaaddr;
 
     if (fxinst == 1) {
@@ -276,13 +276,19 @@ fx_save_stor_common(uint32_t fetchdat, int bits)
         cpu_state.TOP = (fpus >> 11) & 7;
         cpu_state.npxs &= fpus & ~0x3800;
 
-        x87_pc_off = readmeml(easeg, cpu_state.eaaddr + 8);
+        if (bits == 32)
+            x87_pc_off = readmeml(easeg, cpu_state.eaaddr + 8);
+        else
+            x87_pc_off = readmemw(easeg, cpu_state.eaaddr + 8);
         x87_pc_seg = readmemw(easeg, cpu_state.eaaddr + 12);
 
         ftwb = readmemb(easeg, cpu_state.eaaddr + 4);
+        x87_op = readmemw(easeg, cpu_state.eaaddr + 6) & 0x07ff;
 
-        x87_op_off = readmeml(easeg, cpu_state.eaaddr + 16);
-        x87_op_off |= (readmemw(easeg, cpu_state.eaaddr + 6) >> 12) << 16;
+        if (bits == 32)
+            x87_op_off = readmeml(easeg, cpu_state.eaaddr + 16);
+        else
+            x87_op_off = readmemw(easeg, cpu_state.eaaddr +16);
         x87_op_seg = readmemw(easeg, cpu_state.eaaddr + 20);
 
         for (i = 0; i <= 7; i++) {
@@ -327,7 +333,7 @@ fx_save_stor_common(uint32_t fetchdat, int bits)
             }
         }
 
-        CLOCK_CYCLES((cr0 & 1) ? 34 : 44);
+        CLOCK_CYCLES(1);
     } else {
         /* FXSAVE */
         if ((twd & 0x0003) != 0x0003)
@@ -351,11 +357,17 @@ fx_save_stor_common(uint32_t fetchdat, int bits)
         writememw(easeg, cpu_state.eaaddr + 2, cpu_state.npxs);
         writememb(easeg, cpu_state.eaaddr + 4, ftwb);
 
-        writememw(easeg, cpu_state.eaaddr + 6, (x87_op_off >> 16) << 12);
-        writememl(easeg, cpu_state.eaaddr + 8, x87_pc_off);
+        writememw(easeg, cpu_state.eaaddr + 6, x87_op);
+        if (bits == 32)
+            writememl(easeg, cpu_state.eaaddr + 8, x87_pc_off);
+        else
+            writememl(easeg, cpu_state.eaaddr + 8, x87_pc_off & 0xffff);
         writememw(easeg, cpu_state.eaaddr + 12, x87_pc_seg);
 
-        writememl(easeg, cpu_state.eaaddr + 16, x87_op_off);
+        if (bits == 32)
+            writememl(easeg, cpu_state.eaaddr + 16, x87_op_off);
+        else
+            writememl(easeg, cpu_state.eaaddr + 16, x87_op_off & 0xffff);
         writememw(easeg, cpu_state.eaaddr + 20, x87_op_seg);
 
         if (cpu_state.ismmx) {
@@ -372,7 +384,7 @@ fx_save_stor_common(uint32_t fetchdat, int bits)
 
         cpu_state.eaaddr = old_eaaddr;
 
-        CLOCK_CYCLES((cr0 & 1) ? 56 : 67);
+        CLOCK_CYCLES(1);
     }
 
     return cpu_state.abrt;
@@ -400,8 +412,7 @@ static int
 opHINT_NOP_a16(uint32_t fetchdat)
 {
     fetch_ea_16(fetchdat);
-    CLOCK_CYCLES((is486) ? 1 : 3);
-    PREFETCH_RUN(3, 1, -1, 0, 0, 0, 0, 0);
+    CLOCK_CYCLES(1);
     return 0;
 }
 
@@ -409,7 +420,6 @@ static int
 opHINT_NOP_a32(uint32_t fetchdat)
 {
     fetch_ea_32(fetchdat);
-    CLOCK_CYCLES((is486) ? 1 : 3);
-    PREFETCH_RUN(3, 1, -1, 0, 0, 0, 0, 0);
+    CLOCK_CYCLES(1);
     return 0;
 }
diff --git a/src/cpu/x86_ops_inc_dec.h b/src/cpu/x86_ops_inc_dec.h
index 3eb908c57..b33d02f45 100644
--- a/src/cpu/x86_ops_inc_dec.h
+++ b/src/cpu/x86_ops_inc_dec.h
@@ -1,5 +1,5 @@
 #define INC_DEC_OP(name, reg, inc, setflags)           \
-    static int op##name(uint32_t fetchdat)             \
+    static int op##name(UNUSED(uint32_t fetchdat))     \
     {                                                  \
         setflags(reg, 1);                              \
         reg += inc;                                    \
diff --git a/src/cpu/x86_ops_int.h b/src/cpu/x86_ops_int.h
index a73ed62e0..1ed5e6c2f 100644
--- a/src/cpu/x86_ops_int.h
+++ b/src/cpu/x86_ops_int.h
@@ -1,5 +1,5 @@
 static int
-opINT3(uint32_t fetchdat)
+opINT3(UNUSED(uint32_t fetchdat))
 {
     int cycles_old = cycles;
     UN_USED(cycles_old);
@@ -18,7 +18,7 @@ opINT3(uint32_t fetchdat)
 }
 
 static int
-opINT1(uint32_t fetchdat)
+opINT1(UNUSED(uint32_t fetchdat))
 {
     int cycles_old = cycles;
     UN_USED(cycles_old);
@@ -75,7 +75,7 @@ opINT(uint32_t fetchdat)
 }
 
 static int
-opINTO(uint32_t fetchdat)
+opINTO(UNUSED(uint32_t fetchdat))
 {
     int cycles_old = cycles;
     UN_USED(cycles_old);
diff --git a/src/cpu/x86_ops_io.h b/src/cpu/x86_ops_io.h
index 8a99b8668..36bf05cd3 100644
--- a/src/cpu/x86_ops_io.h
+++ b/src/cpu/x86_ops_io.h
@@ -75,7 +75,7 @@ opOUT_EAX_imm(uint32_t fetchdat)
 }
 
 static int
-opIN_AL_DX(uint32_t fetchdat)
+opIN_AL_DX(UNUSED(uint32_t fetchdat))
 {
     check_io_perm(DX, 1);
     AL = inb(DX);
@@ -86,7 +86,7 @@ opIN_AL_DX(uint32_t fetchdat)
     return 0;
 }
 static int
-opIN_AX_DX(uint32_t fetchdat)
+opIN_AX_DX(UNUSED(uint32_t fetchdat))
 {
     check_io_perm(DX, 2);
     AX = inw(DX);
@@ -97,7 +97,7 @@ opIN_AX_DX(uint32_t fetchdat)
     return 0;
 }
 static int
-opIN_EAX_DX(uint32_t fetchdat)
+opIN_EAX_DX(UNUSED(uint32_t fetchdat))
 {
     check_io_perm(DX, 4);
     EAX = inl(DX);
@@ -109,7 +109,7 @@ opIN_EAX_DX(uint32_t fetchdat)
 }
 
 static int
-opOUT_AL_DX(uint32_t fetchdat)
+opOUT_AL_DX(UNUSED(uint32_t fetchdat))
 {
     check_io_perm(DX, 1);
     outb(DX, AL);
@@ -120,7 +120,7 @@ opOUT_AL_DX(uint32_t fetchdat)
     return x86_was_reset;
 }
 static int
-opOUT_AX_DX(uint32_t fetchdat)
+opOUT_AX_DX(UNUSED(uint32_t fetchdat))
 {
     check_io_perm(DX, 2);
     outw(DX, AX);
@@ -131,7 +131,7 @@ opOUT_AX_DX(uint32_t fetchdat)
     return 0;
 }
 static int
-opOUT_EAX_DX(uint32_t fetchdat)
+opOUT_EAX_DX(UNUSED(uint32_t fetchdat))
 {
     check_io_perm(DX, 4);
     outl(DX, EAX);
diff --git a/src/cpu/x86_ops_jump.h b/src/cpu/x86_ops_jump.h
index 97ca673d7..fc99fc5fd 100644
--- a/src/cpu/x86_ops_jump.h
+++ b/src/cpu/x86_ops_jump.h
@@ -51,7 +51,7 @@
         return 0;                                                       \
     }                                                                   \
                                                                         \
-    static int opJ##condition##_l(uint32_t fetchdat)                    \
+    static int opJ##condition##_l(UNUSED(uint32_t fetchdat))            \
     {                                                                   \
         uint32_t offset = getlong();                                    \
         if (cpu_state.abrt)                                             \
@@ -256,7 +256,7 @@ opJMP_r16(uint32_t fetchdat)
     return 0;
 }
 static int
-opJMP_r32(uint32_t fetchdat)
+opJMP_r32(UNUSED(uint32_t fetchdat))
 {
     int32_t offset = (int32_t) getlong();
     if (cpu_state.abrt)
@@ -289,7 +289,7 @@ opJMP_far_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opJMP_far_a32(uint32_t fetchdat)
+opJMP_far_a32(UNUSED(uint32_t fetchdat))
 {
     uint16_t seg;
     uint32_t addr;
@@ -323,7 +323,7 @@ opCALL_r16(uint32_t fetchdat)
     return 0;
 }
 static int
-opCALL_r32(uint32_t fetchdat)
+opCALL_r32(UNUSED(uint32_t fetchdat))
 {
     int32_t addr = getlong();
 
@@ -339,7 +339,7 @@ opCALL_r32(uint32_t fetchdat)
 }
 
 static int
-opRET_w(uint32_t fetchdat)
+opRET_w(UNUSED(uint32_t fetchdat))
 {
     uint16_t ret;
 
@@ -355,7 +355,7 @@ opRET_w(uint32_t fetchdat)
     return 0;
 }
 static int
-opRET_l(uint32_t fetchdat)
+opRET_l(UNUSED(uint32_t fetchdat))
 {
     uint32_t ret;
 
diff --git a/src/cpu/x86_ops_misc.h b/src/cpu/x86_ops_misc.h
index cbd2b3fbe..5ae28abc4 100644
--- a/src/cpu/x86_ops_misc.h
+++ b/src/cpu/x86_ops_misc.h
@@ -1,5 +1,5 @@
 static int
-opCBW(uint32_t fetchdat)
+opCBW(UNUSED(uint32_t fetchdat))
 {
     AH = (AL & 0x80) ? 0xff : 0;
     CLOCK_CYCLES(3);
@@ -7,7 +7,7 @@ opCBW(uint32_t fetchdat)
     return 0;
 }
 static int
-opCWDE(uint32_t fetchdat)
+opCWDE(UNUSED(uint32_t fetchdat))
 {
     EAX = (AX & 0x8000) ? (0xffff0000 | AX) : AX;
     CLOCK_CYCLES(3);
@@ -15,7 +15,7 @@ opCWDE(uint32_t fetchdat)
     return 0;
 }
 static int
-opCWD(uint32_t fetchdat)
+opCWD(UNUSED(uint32_t fetchdat))
 {
     DX = (AX & 0x8000) ? 0xFFFF : 0;
     CLOCK_CYCLES(2);
@@ -23,7 +23,7 @@ opCWD(uint32_t fetchdat)
     return 0;
 }
 static int
-opCDQ(uint32_t fetchdat)
+opCDQ(UNUSED(uint32_t fetchdat))
 {
     EDX = (EAX & 0x80000000) ? 0xffffffff : 0;
     CLOCK_CYCLES(2);
@@ -32,7 +32,7 @@ opCDQ(uint32_t fetchdat)
 }
 
 static int
-opNOP(uint32_t fetchdat)
+opNOP(UNUSED(uint32_t fetchdat))
 {
     CLOCK_CYCLES((is486) ? 1 : 3);
     PREFETCH_RUN(3, 1, -1, 0, 0, 0, 0, 0);
@@ -40,7 +40,7 @@ opNOP(uint32_t fetchdat)
 }
 
 static int
-opSETALC(uint32_t fetchdat)
+opSETALC(UNUSED(uint32_t fetchdat))
 {
     AL = (CF_SET()) ? 0xff : 0;
     CLOCK_CYCLES(timing_rr);
@@ -701,7 +701,7 @@ opF7_l_a32(uint32_t fetchdat)
 }
 
 static int
-opHLT(uint32_t fetchdat)
+opHLT(UNUSED(uint32_t fetchdat))
 {
     if ((CPL || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
         x86gpf(NULL, 0);
@@ -726,6 +726,25 @@ opHLT(uint32_t fetchdat)
     return 0;
 }
 
+#ifdef OPS_286_386
+static int
+opLOCK(uint32_t fetchdat)
+{
+    int legal;
+    fetchdat = fastreadl_fetch(cs + cpu_state.pc);
+    if (cpu_state.abrt)
+        return 0;
+    cpu_state.pc++;
+
+    legal = is_lock_legal(fetchdat);
+
+    ILLEGAL_ON(legal == 0);
+
+    CLOCK_CYCLES(4);
+    PREFETCH_PREFIX();
+    return x86_2386_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+}
+#else
 static int
 opLOCK(uint32_t fetchdat)
 {
@@ -734,12 +753,13 @@ opLOCK(uint32_t fetchdat)
         return 0;
     cpu_state.pc++;
 
-    ILLEGAL_ON((fetchdat & 0xff) == 0x90);
+    ILLEGAL_ON(((fetchdat & 0xff) == 0x90) || ((fetchdat & 0xff) == 0xec));
 
     CLOCK_CYCLES(4);
     PREFETCH_PREFIX();
     return x86_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
 }
+#endif
 
 static int
 opBOUND_w_a16(uint32_t fetchdat)
@@ -836,7 +856,7 @@ opBOUND_l_a32(uint32_t fetchdat)
 }
 
 static int
-opCLTS(uint32_t fetchdat)
+opCLTS(UNUSED(uint32_t fetchdat))
 {
     if ((CPL || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
         x86gpf(NULL, 0);
@@ -849,22 +869,26 @@ opCLTS(uint32_t fetchdat)
 }
 
 static int
-opINVD(uint32_t fetchdat)
+opINVD(UNUSED(uint32_t fetchdat))
 {
     CLOCK_CYCLES(1000);
     CPU_BLOCK_END();
     return 0;
 }
 static int
-opWBINVD(uint32_t fetchdat)
+opWBINVD(UNUSED(uint32_t fetchdat))
 {
+    if ((CPL || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
+        x86gpf(NULL, 0);
+        return 1;
+    }
     CLOCK_CYCLES(10000);
     CPU_BLOCK_END();
     return 0;
 }
 
 static int
-opLOADALL(uint32_t fetchdat)
+opLOADALL(UNUSED(uint32_t fetchdat))
 {
     if (CPL && (cr0 & 1)) {
         x86gpf(NULL, 0);
@@ -974,7 +998,7 @@ loadall_load_segment(uint32_t addr, x86seg *s)
 }
 
 static int
-opLOADALL386(uint32_t fetchdat)
+opLOADALL386(UNUSED(uint32_t fetchdat))
 {
     uint32_t la_addr = es + EDI;
 
@@ -1022,7 +1046,7 @@ opLOADALL386(uint32_t fetchdat)
 }
 
 static int
-opCPUID(uint32_t fetchdat)
+opCPUID(UNUSED(uint32_t fetchdat))
 {
     if (CPUID) {
         cpu_CPUID();
@@ -1035,7 +1059,7 @@ opCPUID(uint32_t fetchdat)
 }
 
 static int
-opRDMSR(uint32_t fetchdat)
+opRDMSR(UNUSED(uint32_t fetchdat))
 {
     if (cpu_has_feature(CPU_FEATURE_MSR)) {
         cpu_RDMSR();
@@ -1048,7 +1072,7 @@ opRDMSR(uint32_t fetchdat)
 }
 
 static int
-opWRMSR(uint32_t fetchdat)
+opWRMSR(UNUSED(uint32_t fetchdat))
 {
     if (cpu_has_feature(CPU_FEATURE_MSR)) {
         cpu_WRMSR();
@@ -1061,7 +1085,7 @@ opWRMSR(uint32_t fetchdat)
 }
 
 static int
-opRSM(uint32_t fetchdat)
+opRSM(UNUSED(uint32_t fetchdat))
 {
     if (in_smm) {
         leave_smm();
diff --git a/src/cpu/x86_ops_mmx.c b/src/cpu/x86_ops_mmx.c
index f26c903f9..2737ac8fa 100644
--- a/src/cpu/x86_ops_mmx.c
+++ b/src/cpu/x86_ops_mmx.c
@@ -13,6 +13,7 @@
 #include "cpu.h"
 #include <86box/timer.h>
 #include "x86.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include <86box/nmi.h>
 #include <86box/mem.h>
@@ -33,7 +34,7 @@ uint16_t *MMEP[8];
 
 static uint16_t MME[8];
 
-#define MMX_GETREGP(r) fpu_softfloat ? ((MMX_REG *) &fpu_state.st_space[r].fraction) : &(cpu_state.MM[r])
+#define MMX_GETREGP(r) fpu_softfloat ? ((MMX_REG *) &fpu_state.st_space[r].signif) : &(cpu_state.MM[r])
 void
 mmx_init(void)
 {
@@ -41,8 +42,8 @@ mmx_init(void)
 
     for (uint8_t i = 0; i < 8; i++) {
         if (fpu_softfloat) {
-            MMP[i]  = (MMX_REG *) &fpu_state.st_space[i].fraction;
-            MMEP[i] = (uint16_t *) &fpu_state.st_space[i].exp;
+            MMP[i]  = (MMX_REG *) &fpu_state.st_space[i].signif;
+            MMEP[i] = (uint16_t *) &fpu_state.st_space[i].signExp;
         } else {
             MMP[i]  = &(cpu_state.MM[i]);
             MMEP[i] = &(MME[i]);
diff --git a/src/cpu/x86_ops_mmx.h b/src/cpu/x86_ops_mmx.h
index ab5e19762..9a2d797a8 100644
--- a/src/cpu/x86_ops_mmx.h
+++ b/src/cpu/x86_ops_mmx.h
@@ -22,19 +22,19 @@
     }
 
 #define MMX_ENTER()                          \
-    if (!cpu_has_feature(CPU_FEATURE_MMX)) { \
+    if (!cpu_has_feature(CPU_FEATURE_MMX) || (cr0 & 0x4)) { \
         cpu_state.pc = cpu_state.oldpc;      \
         x86illegal();                        \
         return 1;                            \
     }                                        \
-    if (cr0 & 0xc) {                         \
+    if (cr0 & 0x8) {                         \
         x86_int(7);                          \
         return 1;                            \
     }                                        \
     x87_set_mmx()
 
 static int
-opEMMS(uint32_t fetchdat)
+opEMMS(UNUSED(uint32_t fetchdat))
 {
     if (!cpu_has_feature(CPU_FEATURE_MMX)) {
         cpu_state.pc = cpu_state.oldpc;
diff --git a/src/cpu/x86_ops_mmx_emmi.h b/src/cpu/x86_ops_mmx_emmi.h
new file mode 100644
index 000000000..4c994be0f
--- /dev/null
+++ b/src/cpu/x86_ops_mmx_emmi.h
@@ -0,0 +1,807 @@
+/* Notes: "src2" means "first operand" */
+
+static int
+opPMULHRWC_a16(UNUSED(uint32_t fetchdat))
+{
+    MMX_REG  src;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_16(fetchdat);
+
+    dst = MMX_GETREGP(cpu_reg);
+
+    MMX_GETSRC();
+
+    dst->w[0] = ((int32_t) (dst->sw[0] * (int32_t) src.sw[0]) + 0x4000) >> 15;
+    dst->w[1] = ((int32_t) (dst->sw[1] * (int32_t) src.sw[1]) + 0x4000) >> 15;
+    dst->w[2] = ((int32_t) (dst->sw[2] * (int32_t) src.sw[2]) + 0x4000) >> 15;
+    dst->w[3] = ((int32_t) (dst->sw[3] * (int32_t) src.sw[3]) + 0x4000) >> 15;
+
+    MMX_SETEXP(cpu_reg);
+
+    return 0;
+}
+
+static int
+opPMULHRWC_a32(UNUSED(uint32_t fetchdat))
+{
+    MMX_REG  src;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_32(fetchdat);
+
+    dst = MMX_GETREGP(cpu_reg);
+
+    MMX_GETSRC();
+
+    dst->w[0] = ((int32_t) (dst->sw[0] * (int32_t) src.sw[0]) + 0x4000) >> 15;
+    dst->w[1] = ((int32_t) (dst->sw[1] * (int32_t) src.sw[1]) + 0x4000) >> 15;
+    dst->w[2] = ((int32_t) (dst->sw[2] * (int32_t) src.sw[2]) + 0x4000) >> 15;
+    dst->w[3] = ((int32_t) (dst->sw[3] * (int32_t) src.sw[3]) + 0x4000) >> 15;
+
+    MMX_SETEXP(cpu_reg);
+
+    return 0;
+}
+
+static int
+opPMULHRIW_a16(uint32_t fetchdat)
+{
+    MMX_REG  src, src2;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_16(fetchdat);
+
+    src2 = MMX_GETREG(cpu_reg);
+    dst  = MMX_GETREGP(cpu_reg ^ 1);
+
+    MMX_GETSRC();
+
+    dst->w[0] = (((int32_t) src2.sw[0] * (int32_t) src.sw[0]) + 0x4000) >> 15;
+    dst->w[1] = (((int32_t) src2.sw[1] * (int32_t) src.sw[1]) + 0x4000) >> 15;
+    dst->w[2] = (((int32_t) src2.sw[2] * (int32_t) src.sw[2]) + 0x4000) >> 15;
+    dst->w[3] = (((int32_t) src2.sw[3] * (int32_t) src.sw[3]) + 0x4000) >> 15;
+    
+    MMX_SETEXP(cpu_reg ^ 1);
+    return 0;
+}
+
+static int
+opPMULHRIW_a32(uint32_t fetchdat)
+{
+    MMX_REG  src, src2;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_32(fetchdat);
+
+    src2 = MMX_GETREG(cpu_reg);
+    dst  = MMX_GETREGP(cpu_reg ^ 1);
+
+    MMX_GETSRC();
+
+    dst->w[0] = (((int32_t) src2.sw[0] * (int32_t) src.sw[0]) + 0x4000) >> 15;
+    dst->w[1] = (((int32_t) src2.sw[1] * (int32_t) src.sw[1]) + 0x4000) >> 15;
+    dst->w[2] = (((int32_t) src2.sw[2] * (int32_t) src.sw[2]) + 0x4000) >> 15;
+    dst->w[3] = (((int32_t) src2.sw[3] * (int32_t) src.sw[3]) + 0x4000) >> 15;
+    
+    MMX_SETEXP(cpu_reg ^ 1);
+    return 0;
+}
+
+static int
+opPDISTIB_a16(uint32_t fetchdat)
+{
+    MMX_REG  src, src2;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_16(fetchdat);
+
+    if (cpu_mod == 3) {
+        x86illegal();
+        return 1;
+    }
+
+    src2 = MMX_GETREG(cpu_reg);
+    dst  = MMX_GETREGP(cpu_reg ^ 1);
+
+    MMX_GETSRC();
+
+    dst->b[0] = USATB(dst->b[0] + abs(src2.b[0] - src.b[0]));
+    dst->b[1] = USATB(dst->b[1] + abs(src2.b[1] - src.b[1]));
+    dst->b[2] = USATB(dst->b[2] + abs(src2.b[2] - src.b[2]));
+    dst->b[3] = USATB(dst->b[3] + abs(src2.b[3] - src.b[3]));
+    dst->b[4] = USATB(dst->b[4] + abs(src2.b[4] - src.b[4]));
+    dst->b[5] = USATB(dst->b[5] + abs(src2.b[5] - src.b[5]));
+    dst->b[6] = USATB(dst->b[6] + abs(src2.b[6] - src.b[6]));
+    dst->b[7] = USATB(dst->b[7] + abs(src2.b[7] - src.b[7]));
+
+    MMX_SETEXP(cpu_reg ^ 1);
+    return 0;
+}
+
+static int
+opPDISTIB_a32(uint32_t fetchdat)
+{
+    MMX_REG  src, src2;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_32(fetchdat);
+
+    if (cpu_mod == 3) {
+        x86illegal();
+        return 1;
+    }
+
+    src2 = MMX_GETREG(cpu_reg);
+    dst  = MMX_GETREGP(cpu_reg ^ 1);
+
+    MMX_GETSRC();
+
+    dst->b[0] = USATB(dst->b[0] + abs(src2.b[0] - src.b[0]));
+    dst->b[1] = USATB(dst->b[1] + abs(src2.b[1] - src.b[1]));
+    dst->b[2] = USATB(dst->b[2] + abs(src2.b[2] - src.b[2]));
+    dst->b[3] = USATB(dst->b[3] + abs(src2.b[3] - src.b[3]));
+    dst->b[4] = USATB(dst->b[4] + abs(src2.b[4] - src.b[4]));
+    dst->b[5] = USATB(dst->b[5] + abs(src2.b[5] - src.b[5]));
+    dst->b[6] = USATB(dst->b[6] + abs(src2.b[6] - src.b[6]));
+    dst->b[7] = USATB(dst->b[7] + abs(src2.b[7] - src.b[7]));
+
+    MMX_SETEXP(cpu_reg ^ 1);
+    return 0;
+}
+
+static int
+opPMACHRIW_a16(uint32_t fetchdat)
+{
+    MMX_REG  src, src2;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_16(fetchdat);
+
+    if (cpu_mod == 3) {
+        x86illegal();
+        return 1;
+    }
+
+    src2 = MMX_GETREG(cpu_reg);
+    dst  = MMX_GETREGP(cpu_reg ^ 1);
+
+    MMX_GETSRC();
+
+    dst->w[0] += (((int32_t) src2.sw[0] * (int32_t) src.sw[0]) + 0x4000) >> 15;
+    dst->w[1] += (((int32_t) src2.sw[1] * (int32_t) src.sw[1]) + 0x4000) >> 15;
+    dst->w[2] += (((int32_t) src2.sw[2] * (int32_t) src.sw[2]) + 0x4000) >> 15;
+    dst->w[3] += (((int32_t) src2.sw[3] * (int32_t) src.sw[3]) + 0x4000) >> 15;
+    
+    MMX_SETEXP(cpu_reg ^ 1);
+    return 0;
+}
+
+static int
+opPMACHRIW_a32(uint32_t fetchdat)
+{
+    MMX_REG  src, src2;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_32(fetchdat);
+
+    if (cpu_mod == 3) {
+        x86illegal();
+        return 1;
+    }
+
+    src2 = MMX_GETREG(cpu_reg);
+    dst  = MMX_GETREGP(cpu_reg ^ 1);
+
+    MMX_GETSRC();
+
+    dst->w[0] += (((int32_t) src2.sw[0] * (int32_t) src.sw[0]) + 0x4000) >> 15;
+    dst->w[1] += (((int32_t) src2.sw[1] * (int32_t) src.sw[1]) + 0x4000) >> 15;
+    dst->w[2] += (((int32_t) src2.sw[2] * (int32_t) src.sw[2]) + 0x4000) >> 15;
+    dst->w[3] += (((int32_t) src2.sw[3] * (int32_t) src.sw[3]) + 0x4000) >> 15;
+    
+    MMX_SETEXP(cpu_reg ^ 1);
+    return 0;
+}
+
+static int
+opPADDSIW_a16(uint32_t fetchdat)
+{
+    MMX_REG  src, src2;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_16(fetchdat);
+
+    src2 = MMX_GETREG(cpu_reg);
+    dst  = MMX_GETREGP(cpu_reg ^ 1);
+
+    MMX_GETSRC();
+
+    dst->sw[0] = SSATW(src2.sw[0] + src.sw[0]);
+    dst->sw[1] = SSATW(src2.sw[1] + src.sw[1]);
+    dst->sw[2] = SSATW(src2.sw[2] + src.sw[2]);
+    dst->sw[3] = SSATW(src2.sw[3] + src.sw[3]);
+
+    MMX_SETEXP(cpu_reg ^ 1);
+
+    return 0;
+}
+
+static int
+opPADDSIW_a32(uint32_t fetchdat)
+{
+    MMX_REG  src, src2;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_32(fetchdat);
+
+    src2 = MMX_GETREG(cpu_reg);
+    dst  = MMX_GETREGP(cpu_reg ^ 1);
+
+    MMX_GETSRC();
+
+    dst->sw[0] = SSATW(src2.sw[0] + src.sw[0]);
+    dst->sw[1] = SSATW(src2.sw[1] + src.sw[1]);
+    dst->sw[2] = SSATW(src2.sw[2] + src.sw[2]);
+    dst->sw[3] = SSATW(src2.sw[3] + src.sw[3]);
+
+    MMX_SETEXP(cpu_reg ^ 1);
+
+    return 0;
+}
+
+static int
+opPSUBSIW_a16(uint32_t fetchdat)
+{
+    MMX_REG  src, src2;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_16(fetchdat);
+
+    src2 = MMX_GETREG(cpu_reg);
+    dst  = MMX_GETREGP(cpu_reg ^ 1);
+
+    MMX_GETSRC();
+
+    dst->sw[0] = SSATW(src2.sw[0] - src.sw[0]);
+    dst->sw[1] = SSATW(src2.sw[1] - src.sw[1]);
+    dst->sw[2] = SSATW(src2.sw[2] - src.sw[2]);
+    dst->sw[3] = SSATW(src2.sw[3] - src.sw[3]);
+
+    MMX_SETEXP(cpu_reg);
+
+    return 0;
+}
+
+static int
+opPSUBSIW_a32(uint32_t fetchdat)
+{
+    MMX_REG  src, src2;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_32(fetchdat);
+
+    src2 = MMX_GETREG(cpu_reg);
+    dst  = MMX_GETREGP(cpu_reg ^ 1);
+
+    MMX_GETSRC();
+
+    dst->sw[0] = SSATW(src2.sw[0] - src.sw[0]);
+    dst->sw[1] = SSATW(src2.sw[1] - src.sw[1]);
+    dst->sw[2] = SSATW(src2.sw[2] - src.sw[2]);
+    dst->sw[3] = SSATW(src2.sw[3] - src.sw[3]);
+
+    MMX_SETEXP(cpu_reg);
+
+    return 0;
+}
+
+static int
+opPAVEB_a16(uint32_t fetchdat)
+{
+    MMX_REG  src;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_16(fetchdat);
+
+    dst = MMX_GETREGP(cpu_reg);
+
+    MMX_GETSRC();
+
+    dst->b[0] = (dst->b[0] + src.b[0]) >> 1;
+    dst->b[1] = (dst->b[1] + src.b[1]) >> 1;
+    dst->b[2] = (dst->b[2] + src.b[2]) >> 1;
+    dst->b[3] = (dst->b[3] + src.b[3]) >> 1;
+    dst->b[4] = (dst->b[4] + src.b[4]) >> 1;
+    dst->b[5] = (dst->b[5] + src.b[5]) >> 1;
+    dst->b[6] = (dst->b[6] + src.b[6]) >> 1;
+    dst->b[7] = (dst->b[7] + src.b[7]) >> 1;
+
+    MMX_SETEXP(cpu_reg);
+    return 0;
+}
+
+static int
+opPAVEB_a32(uint32_t fetchdat)
+{
+    MMX_REG  src;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_32(fetchdat);
+
+    dst = MMX_GETREGP(cpu_reg);
+
+    MMX_GETSRC();
+
+    dst->b[0] = (dst->b[0] + src.b[0]) >> 1;
+    dst->b[1] = (dst->b[1] + src.b[1]) >> 1;
+    dst->b[2] = (dst->b[2] + src.b[2]) >> 1;
+    dst->b[3] = (dst->b[3] + src.b[3]) >> 1;
+    dst->b[4] = (dst->b[4] + src.b[4]) >> 1;
+    dst->b[5] = (dst->b[5] + src.b[5]) >> 1;
+    dst->b[6] = (dst->b[6] + src.b[6]) >> 1;
+    dst->b[7] = (dst->b[7] + src.b[7]) >> 1;
+
+    MMX_SETEXP(cpu_reg);
+    return 0;
+}
+
+static int
+opPMAGW_a16(uint32_t fetchdat)
+{
+    MMX_REG  src;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_16(fetchdat);
+
+    dst = MMX_GETREGP(cpu_reg);
+
+    MMX_GETSRC();
+
+    if (abs(src.sw[0]) > abs(dst->sw[0])) dst->sw[0] = src.sw[0];
+    if (abs(src.sw[1]) > abs(dst->sw[1])) dst->sw[1] = src.sw[1];
+    if (abs(src.sw[2]) > abs(dst->sw[2])) dst->sw[2] = src.sw[2];
+    if (abs(src.sw[3]) > abs(dst->sw[3])) dst->sw[3] = src.sw[3];
+
+    MMX_SETEXP(cpu_reg);
+
+    return 0;
+}
+
+static int
+opPMAGW_a32(uint32_t fetchdat)
+{
+    MMX_REG  src;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_32(fetchdat);
+
+    dst = MMX_GETREGP(cpu_reg);
+
+    MMX_GETSRC();
+
+    if (abs(src.sw[0]) > abs(dst->sw[0])) dst->sw[0] = src.sw[0];
+    if (abs(src.sw[1]) > abs(dst->sw[1])) dst->sw[1] = src.sw[1];
+    if (abs(src.sw[2]) > abs(dst->sw[2])) dst->sw[2] = src.sw[2];
+    if (abs(src.sw[3]) > abs(dst->sw[3])) dst->sw[3] = src.sw[3];
+
+    MMX_SETEXP(cpu_reg);
+
+    return 0;
+}
+
+static int
+opPMVZB_a16(uint32_t fetchdat)
+{
+    MMX_REG  src, src2;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_16(fetchdat);
+
+    if (cpu_mod == 3) {
+        x86illegal();
+        return 1;
+    }
+
+    dst = MMX_GETREGP(cpu_reg);
+    src2 = MMX_GETREG(cpu_reg ^ 1);
+
+    MMX_GETSRC();
+
+    if (src2.b[0] == 0) dst->b[0] = src.b[0];
+    if (src2.b[1] == 0) dst->b[1] = src.b[1];
+    if (src2.b[2] == 0) dst->b[2] = src.b[2];
+    if (src2.b[3] == 0) dst->b[3] = src.b[3];
+    if (src2.b[4] == 0) dst->b[4] = src.b[4];
+    if (src2.b[5] == 0) dst->b[5] = src.b[5];
+    if (src2.b[6] == 0) dst->b[6] = src.b[6];
+    if (src2.b[7] == 0) dst->b[7] = src.b[7];
+
+    MMX_SETEXP(cpu_reg);
+    return 0;
+}
+
+static int
+opPMVZB_a32(uint32_t fetchdat)
+{
+    MMX_REG  src, src2;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_32(fetchdat);
+
+    if (cpu_mod == 3) {
+        x86illegal();
+        return 1;
+    }
+
+    dst = MMX_GETREGP(cpu_reg);
+    src2 = MMX_GETREG(cpu_reg ^ 1);
+
+    MMX_GETSRC();
+
+    if (src2.b[0] == 0) dst->b[0] = src.b[0];
+    if (src2.b[1] == 0) dst->b[1] = src.b[1];
+    if (src2.b[2] == 0) dst->b[2] = src.b[2];
+    if (src2.b[3] == 0) dst->b[3] = src.b[3];
+    if (src2.b[4] == 0) dst->b[4] = src.b[4];
+    if (src2.b[5] == 0) dst->b[5] = src.b[5];
+    if (src2.b[6] == 0) dst->b[6] = src.b[6];
+    if (src2.b[7] == 0) dst->b[7] = src.b[7];
+
+    MMX_SETEXP(cpu_reg);
+    return 0;
+}
+
+static int
+opPMVNZB_a16(uint32_t fetchdat)
+{
+    MMX_REG  src, src2;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_16(fetchdat);
+
+    if (cpu_mod == 3) {
+        x86illegal();
+        return 1;
+    }
+
+    dst = MMX_GETREGP(cpu_reg);
+    src2 = MMX_GETREG(cpu_reg ^ 1);
+
+    MMX_GETSRC();
+
+    if (src2.b[0] != 0) dst->b[0] = src.b[0];
+    if (src2.b[1] != 0) dst->b[1] = src.b[1];
+    if (src2.b[2] != 0) dst->b[2] = src.b[2];
+    if (src2.b[3] != 0) dst->b[3] = src.b[3];
+    if (src2.b[4] != 0) dst->b[4] = src.b[4];
+    if (src2.b[5] != 0) dst->b[5] = src.b[5];
+    if (src2.b[6] != 0) dst->b[6] = src.b[6];
+    if (src2.b[7] != 0) dst->b[7] = src.b[7];
+
+    MMX_SETEXP(cpu_reg);
+    return 0;
+}
+
+static int
+opPMVNZB_a32(uint32_t fetchdat)
+{
+    MMX_REG  src, src2;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_32(fetchdat);
+
+    if (cpu_mod == 3) {
+        x86illegal();
+        return 1;
+    }
+
+    dst = MMX_GETREGP(cpu_reg);
+    src2 = MMX_GETREG(cpu_reg ^ 1);
+
+    MMX_GETSRC();
+
+    if (src2.b[0] != 0) dst->b[0] = src.b[0];
+    if (src2.b[1] != 0) dst->b[1] = src.b[1];
+    if (src2.b[2] != 0) dst->b[2] = src.b[2];
+    if (src2.b[3] != 0) dst->b[3] = src.b[3];
+    if (src2.b[4] != 0) dst->b[4] = src.b[4];
+    if (src2.b[5] != 0) dst->b[5] = src.b[5];
+    if (src2.b[6] != 0) dst->b[6] = src.b[6];
+    if (src2.b[7] != 0) dst->b[7] = src.b[7];
+
+    MMX_SETEXP(cpu_reg);
+    return 0;
+}
+
+static int
+opPMVLZB_a16(uint32_t fetchdat)
+{
+    MMX_REG  src, src2;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_16(fetchdat);
+
+    if (cpu_mod == 3) {
+        x86illegal();
+        return 1;
+    }
+
+    dst = MMX_GETREGP(cpu_reg);
+    src2 = MMX_GETREG(cpu_reg ^ 1);
+
+    MMX_GETSRC();
+
+    if (src2.sb[0] < 0) dst->b[0] = src.b[0];
+    if (src2.sb[1] < 0) dst->b[1] = src.b[1];
+    if (src2.sb[2] < 0) dst->b[2] = src.b[2];
+    if (src2.sb[3] < 0) dst->b[3] = src.b[3];
+    if (src2.sb[4] < 0) dst->b[4] = src.b[4];
+    if (src2.sb[5] < 0) dst->b[5] = src.b[5];
+    if (src2.sb[6] < 0) dst->b[6] = src.b[6];
+    if (src2.sb[7] < 0) dst->b[7] = src.b[7];
+
+    MMX_SETEXP(cpu_reg);
+    return 0;
+}
+
+static int
+opPMVLZB_a32(uint32_t fetchdat)
+{
+    MMX_REG  src, src2;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_32(fetchdat);
+
+    if (cpu_mod == 3) {
+        x86illegal();
+        return 1;
+    }
+
+    dst = MMX_GETREGP(cpu_reg);
+    src2 = MMX_GETREG(cpu_reg ^ 1);
+
+    MMX_GETSRC();
+
+    if (src2.sb[0] < 0) dst->b[0] = src.b[0];
+    if (src2.sb[1] < 0) dst->b[1] = src.b[1];
+    if (src2.sb[2] < 0) dst->b[2] = src.b[2];
+    if (src2.sb[3] < 0) dst->b[3] = src.b[3];
+    if (src2.sb[4] < 0) dst->b[4] = src.b[4];
+    if (src2.sb[5] < 0) dst->b[5] = src.b[5];
+    if (src2.sb[6] < 0) dst->b[6] = src.b[6];
+    if (src2.sb[7] < 0) dst->b[7] = src.b[7];
+
+    MMX_SETEXP(cpu_reg);
+    return 0;
+}
+
+static int
+opPMVGEZB_a16(uint32_t fetchdat)
+{
+    MMX_REG  src, src2;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_16(fetchdat);
+
+    if (cpu_mod == 3) {
+        x86illegal();
+        return 1;
+    }
+
+    dst = MMX_GETREGP(cpu_reg);
+    src2 = MMX_GETREG(cpu_reg ^ 1);
+
+    MMX_GETSRC();
+
+    if (src2.sb[0] >= 0) dst->b[0] = src.b[0];
+    if (src2.sb[1] >= 0) dst->b[1] = src.b[1];
+    if (src2.sb[2] >= 0) dst->b[2] = src.b[2];
+    if (src2.sb[3] >= 0) dst->b[3] = src.b[3];
+    if (src2.sb[4] >= 0) dst->b[4] = src.b[4];
+    if (src2.sb[5] >= 0) dst->b[5] = src.b[5];
+    if (src2.sb[6] >= 0) dst->b[6] = src.b[6];
+    if (src2.sb[7] >= 0) dst->b[7] = src.b[7];
+
+    MMX_SETEXP(cpu_reg);
+    return 0;
+}
+
+static int
+opPMVGEZB_a32(uint32_t fetchdat)
+{
+    MMX_REG  src, src2;
+    MMX_REG *dst;
+
+    if (!(ccr7 & 1)) {
+        x86illegal();
+        return 1;
+    }
+
+    MMX_ENTER();
+
+    fetch_ea_32(fetchdat);
+
+    if (cpu_mod == 3) {
+        x86illegal();
+        return 1;
+    }
+
+    dst = MMX_GETREGP(cpu_reg);
+    src2 = MMX_GETREG(cpu_reg ^ 1);
+
+    MMX_GETSRC();
+
+    if (src2.sb[0] >= 0) dst->b[0] = src.b[0];
+    if (src2.sb[1] >= 0) dst->b[1] = src.b[1];
+    if (src2.sb[2] >= 0) dst->b[2] = src.b[2];
+    if (src2.sb[3] >= 0) dst->b[3] = src.b[3];
+    if (src2.sb[4] >= 0) dst->b[4] = src.b[4];
+    if (src2.sb[5] >= 0) dst->b[5] = src.b[5];
+    if (src2.sb[6] >= 0) dst->b[6] = src.b[6];
+    if (src2.sb[7] >= 0) dst->b[7] = src.b[7];
+
+    MMX_SETEXP(cpu_reg);
+    return 0;
+}
\ No newline at end of file
diff --git a/src/cpu/x86_ops_mmx_mov.h b/src/cpu/x86_ops_mmx_mov.h
index c72c8143d..0bf928198 100644
--- a/src/cpu/x86_ops_mmx_mov.h
+++ b/src/cpu/x86_ops_mmx_mov.h
@@ -110,7 +110,6 @@ opMOVD_mm_l_a32(uint32_t fetchdat)
     return 0;
 }
 
-#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
 /*Cyrix maps both MOVD and SMINT to the same opcode*/
 static int
 opMOVD_mm_l_a16_cx(uint32_t fetchdat)
@@ -170,7 +169,6 @@ opMOVD_mm_l_a32_cx(uint32_t fetchdat)
 
     return 0;
 }
-#endif
 
 static int
 opMOVQ_q_mm_a16(uint32_t fetchdat)
diff --git a/src/cpu/x86_ops_mov.h b/src/cpu/x86_ops_mov.h
index e77876d5c..787a727d3 100644
--- a/src/cpu/x86_ops_mov.h
+++ b/src/cpu/x86_ops_mov.h
@@ -129,7 +129,7 @@ opMOV_SP_imm(uint32_t fetchdat)
 }
 
 static int
-opMOV_EAX_imm(uint32_t fetchdat)
+opMOV_EAX_imm(UNUSED(uint32_t fetchdat))
 {
     uint32_t templ = getlong();
     if (cpu_state.abrt)
@@ -140,7 +140,7 @@ opMOV_EAX_imm(uint32_t fetchdat)
     return 0;
 }
 static int
-opMOV_EBX_imm(uint32_t fetchdat)
+opMOV_EBX_imm(UNUSED(uint32_t fetchdat))
 {
     uint32_t templ = getlong();
     if (cpu_state.abrt)
@@ -151,7 +151,7 @@ opMOV_EBX_imm(uint32_t fetchdat)
     return 0;
 }
 static int
-opMOV_ECX_imm(uint32_t fetchdat)
+opMOV_ECX_imm(UNUSED(uint32_t fetchdat))
 {
     uint32_t templ = getlong();
     if (cpu_state.abrt)
@@ -162,7 +162,7 @@ opMOV_ECX_imm(uint32_t fetchdat)
     return 0;
 }
 static int
-opMOV_EDX_imm(uint32_t fetchdat)
+opMOV_EDX_imm(UNUSED(uint32_t fetchdat))
 {
     uint32_t templ = getlong();
     if (cpu_state.abrt)
@@ -173,7 +173,7 @@ opMOV_EDX_imm(uint32_t fetchdat)
     return 0;
 }
 static int
-opMOV_ESI_imm(uint32_t fetchdat)
+opMOV_ESI_imm(UNUSED(uint32_t fetchdat))
 {
     uint32_t templ = getlong();
     if (cpu_state.abrt)
@@ -184,7 +184,7 @@ opMOV_ESI_imm(uint32_t fetchdat)
     return 0;
 }
 static int
-opMOV_EDI_imm(uint32_t fetchdat)
+opMOV_EDI_imm(UNUSED(uint32_t fetchdat))
 {
     uint32_t templ = getlong();
     if (cpu_state.abrt)
@@ -195,7 +195,7 @@ opMOV_EDI_imm(uint32_t fetchdat)
     return 0;
 }
 static int
-opMOV_EBP_imm(uint32_t fetchdat)
+opMOV_EBP_imm(UNUSED(uint32_t fetchdat))
 {
     uint32_t templ = getlong();
     if (cpu_state.abrt)
@@ -206,7 +206,7 @@ opMOV_EBP_imm(uint32_t fetchdat)
     return 0;
 }
 static int
-opMOV_ESP_imm(uint32_t fetchdat)
+opMOV_ESP_imm(UNUSED(uint32_t fetchdat))
 {
     uint32_t templ = getlong();
     if (cpu_state.abrt)
@@ -326,7 +326,7 @@ opMOV_AL_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opMOV_AL_a32(uint32_t fetchdat)
+opMOV_AL_a32(UNUSED(uint32_t fetchdat))
 {
     uint8_t  temp;
     uint32_t addr = getlong();
@@ -356,7 +356,7 @@ opMOV_AX_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opMOV_AX_a32(uint32_t fetchdat)
+opMOV_AX_a32(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
     uint32_t addr = getlong();
@@ -386,7 +386,7 @@ opMOV_EAX_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opMOV_EAX_a32(uint32_t fetchdat)
+opMOV_EAX_a32(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
     uint32_t addr = getlong();
@@ -413,7 +413,7 @@ opMOV_a16_AL(uint32_t fetchdat)
     return cpu_state.abrt;
 }
 static int
-opMOV_a32_AL(uint32_t fetchdat)
+opMOV_a32_AL(UNUSED(uint32_t fetchdat))
 {
     uint32_t addr = getlong();
     SEG_CHECK_WRITE(cpu_state.ea_seg);
@@ -435,7 +435,7 @@ opMOV_a16_AX(uint32_t fetchdat)
     return cpu_state.abrt;
 }
 static int
-opMOV_a32_AX(uint32_t fetchdat)
+opMOV_a32_AX(UNUSED(uint32_t fetchdat))
 {
     uint32_t addr = getlong();
     if (cpu_state.abrt)
@@ -459,7 +459,7 @@ opMOV_a16_EAX(uint32_t fetchdat)
     return cpu_state.abrt;
 }
 static int
-opMOV_a32_EAX(uint32_t fetchdat)
+opMOV_a32_EAX(UNUSED(uint32_t fetchdat))
 {
     uint32_t addr = getlong();
     if (cpu_state.abrt)
@@ -515,7 +515,7 @@ opLEA_l_a32(uint32_t fetchdat)
 }
 
 static int
-opXLAT_a16(uint32_t fetchdat)
+opXLAT_a16(UNUSED(uint32_t fetchdat))
 {
     uint32_t addr = (BX + AL) & 0xFFFF;
     uint8_t  temp;
@@ -530,7 +530,7 @@ opXLAT_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opXLAT_a32(uint32_t fetchdat)
+opXLAT_a32(UNUSED(uint32_t fetchdat))
 {
     uint32_t addr = EBX + AL;
     uint8_t  temp;
diff --git a/src/cpu/x86_ops_mov_ctrl.h b/src/cpu/x86_ops_mov_ctrl.h
index eafe3cdde..3f5d6a4d7 100644
--- a/src/cpu/x86_ops_mov_ctrl.h
+++ b/src/cpu/x86_ops_mov_ctrl.h
@@ -9,6 +9,8 @@ opMOV_r_CRx_a16(uint32_t fetchdat)
     switch (cpu_reg) {
         case 0:
             cpu_state.regs[cpu_rm].l = cr0;
+            if (cpu_flush_pending)
+                cpu_state.regs[cpu_rm].l ^= 0x80000000;
             if (is486 || isibm486)
                 cpu_state.regs[cpu_rm].l |= 0x10; /*ET hardwired on 486*/
             else {
@@ -49,6 +51,8 @@ opMOV_r_CRx_a32(uint32_t fetchdat)
     switch (cpu_reg) {
         case 0:
             cpu_state.regs[cpu_rm].l = cr0;
+            if (cpu_flush_pending)
+                cpu_state.regs[cpu_rm].l ^= 0x80000000;
             if (is486 || isibm486)
                 cpu_state.regs[cpu_rm].l |= 0x10; /*ET hardwired on 486*/
             else {
@@ -82,12 +86,43 @@ opMOV_r_CRx_a32(uint32_t fetchdat)
 static int
 opMOV_r_DRx_a16(uint32_t fetchdat)
 {
-    if ((CPL || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
+    if ((CPL > 0) && (cr0 & 1)) {
         x86gpf(NULL, 0);
         return 1;
     }
+#ifdef USE_DEBUG_REGS_486
+    if ((dr[7] & 0x2000) && !(cpu_state.eflags & RF_FLAG)) {
+        trap |= 1;
+        return 1;
+    }
+#endif
     fetch_ea_16(fetchdat);
-    cpu_state.regs[cpu_rm].l = dr[cpu_reg] | (cpu_reg == 6 ? 0xffff0ff0u : 0);
+    switch (cpu_reg) {
+        case 0 ... 3:
+            cpu_state.regs[cpu_rm].l = dr[cpu_reg];
+            break;
+        case 4:
+            if (cr4 & 0x8) {
+                x86illegal();
+                return 1;
+            }
+            fallthrough;
+        case 6:
+            cpu_state.regs[cpu_rm].l = dr[6];
+            break;
+        case 5:
+            if (cr4 & 0x8) {
+                x86illegal();
+                return 1;
+            }
+            fallthrough;
+        case 7:
+            cpu_state.regs[cpu_rm].l = dr[7];
+            break;
+        default:
+            x86illegal();
+            return 1;
+    }
     CLOCK_CYCLES(6);
     PREFETCH_RUN(6, 2, rmdat, 0, 0, 0, 0, 0);
     return 0;
@@ -95,12 +130,43 @@ opMOV_r_DRx_a16(uint32_t fetchdat)
 static int
 opMOV_r_DRx_a32(uint32_t fetchdat)
 {
-    if ((CPL || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
+    if ((CPL > 0) && (cr0 & 1)) {
         x86gpf(NULL, 0);
         return 1;
     }
+#ifdef USE_DEBUG_REGS_486
+    if ((dr[7] & 0x2000) && !(cpu_state.eflags & RF_FLAG)) {
+        trap |= 1;
+        return 1;
+    }
+#endif
     fetch_ea_32(fetchdat);
-    cpu_state.regs[cpu_rm].l = dr[cpu_reg] | (cpu_reg == 6 ? 0xffff0ff0u : 0);
+    switch (cpu_reg) {
+        case 0 ... 3:
+            cpu_state.regs[cpu_rm].l = dr[cpu_reg];
+            break;
+        case 4:
+            if (cr4 & 0x8) {
+                x86illegal();
+                return 1;
+            }
+            fallthrough;
+        case 6:
+            cpu_state.regs[cpu_rm].l = dr[6];
+            break;
+        case 5:
+            if (cr4 & 0x8) {
+                x86illegal();
+                return 1;
+            }
+            fallthrough;
+        case 7:
+            cpu_state.regs[cpu_rm].l = dr[7];
+            break;
+        default:
+            x86illegal();
+            return 1;
+    }
     CLOCK_CYCLES(6);
     PREFETCH_RUN(6, 2, rmdat, 0, 0, 0, 0, 1);
     return 0;
@@ -118,16 +184,23 @@ opMOV_CRx_r_a16(uint32_t fetchdat)
     fetch_ea_16(fetchdat);
     switch (cpu_reg) {
         case 0:
-            if ((cpu_state.regs[cpu_rm].l ^ cr0) & 0x80000001)
+            if ((cpu_state.regs[cpu_rm].l ^ cr0) & 0x00000001)
                 flushmmucache();
+            else if ((cpu_state.regs[cpu_rm].l ^ cr0) & 0x80000000) {
+                if (is_p6 || cpu_use_dynarec)
+                    flushmmucache();
+                else {
+                    flushmmucache_nopc();
+                    cpu_flush_pending = 1;
+                }
+            } else if ((cpu_state.regs[cpu_rm].l ^ cr0) & WP_FLAG)
+                flushmmucache_write();
             /* Make sure CPL = 0 when switching from real mode to protected mode. */
             if ((cpu_state.regs[cpu_rm].l & 0x01) && !(cr0 & 0x01))
                 cpu_state.seg_cs.access &= 0x9f;
             cr0 = cpu_state.regs[cpu_rm].l;
-            if ((cpu_s->cpu_type != CPU_386DX) || (fpu_type == FPU_387))
+            if (cpu_16bitbus)
                 cr0 |= 0x10;
-            if (!(cr0 & 0x80000000))
-                mmu_perm = 4;
             if (hascache && !(cr0 & (1 << 30)))
                 cpu_cache_int_enabled = 1;
             else
@@ -148,7 +221,7 @@ opMOV_CRx_r_a16(uint32_t fetchdat)
             break;
         case 4:
             if (cpu_has_feature(CPU_FEATURE_CR4)) {
-                if (((cpu_state.regs[cpu_rm].l ^ cr4) & cpu_CR4_mask) & (CR4_PAE | CR4_PGE))
+                if (((cpu_state.regs[cpu_rm].l ^ cr4) & cpu_CR4_mask) & (CR4_PSE | CR4_PAE | CR4_PGE))
                     flushmmucache();
                 cr4 = cpu_state.regs[cpu_rm].l & cpu_CR4_mask;
                 break;
@@ -175,16 +248,23 @@ opMOV_CRx_r_a32(uint32_t fetchdat)
     fetch_ea_32(fetchdat);
     switch (cpu_reg) {
         case 0:
-            if ((cpu_state.regs[cpu_rm].l ^ cr0) & 0x80000001)
+            if ((cpu_state.regs[cpu_rm].l ^ cr0) & 0x00000001)
                 flushmmucache();
+            else if ((cpu_state.regs[cpu_rm].l ^ cr0) & 0x80000000) {
+                if (is_p6 || cpu_use_dynarec)
+                    flushmmucache();
+                else {
+                    flushmmucache_nopc();
+                    cpu_flush_pending = 1;
+                }
+            } else if ((cpu_state.regs[cpu_rm].l ^ cr0) & WP_FLAG)
+                flushmmucache_write();
             /* Make sure CPL = 0 when switching from real mode to protected mode. */
             if ((cpu_state.regs[cpu_rm].l & 0x01) && !(cr0 & 0x01))
                 cpu_state.seg_cs.access &= 0x9f;
             cr0 = cpu_state.regs[cpu_rm].l;
-            if ((cpu_s->cpu_type != CPU_386DX) || (fpu_type == FPU_387))
+            if (cpu_16bitbus)
                 cr0 |= 0x10;
-            if (!(cr0 & 0x80000000))
-                mmu_perm = 4;
             if (hascache && !(cr0 & (1 << 30)))
                 cpu_cache_int_enabled = 1;
             else
@@ -205,7 +285,7 @@ opMOV_CRx_r_a32(uint32_t fetchdat)
             break;
         case 4:
             if (cpu_has_feature(CPU_FEATURE_CR4)) {
-                if (((cpu_state.regs[cpu_rm].l ^ cr4) & cpu_CR4_mask) & (CR4_PAE | CR4_PGE))
+                if (((cpu_state.regs[cpu_rm].l ^ cr4) & cpu_CR4_mask) & (CR4_PSE | CR4_PAE | CR4_PGE))
                     flushmmucache();
                 cr4 = cpu_state.regs[cpu_rm].l & cpu_CR4_mask;
                 break;
@@ -224,27 +304,96 @@ opMOV_CRx_r_a32(uint32_t fetchdat)
 static int
 opMOV_DRx_r_a16(uint32_t fetchdat)
 {
-    if ((CPL || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
+    if ((CPL > 0) && (cr0 & 1)) {
         x86gpf(NULL, 0);
         return 1;
     }
+#ifdef USE_DEBUG_REGS_486
+    if ((dr[7] & 0x2000) && !(cpu_state.eflags & RF_FLAG)) {
+        trap |= 1;
+        x86gen();
+        return 1;
+    }
+#endif
     fetch_ea_16(fetchdat);
-    dr[cpu_reg] = cpu_state.regs[cpu_rm].l;
+    switch (cpu_reg) {
+        case 0 ... 3:
+            dr[cpu_reg] = cpu_state.regs[cpu_rm].l;
+            break;
+        case 4:
+            if (cr4 & 0x8) {
+                x86illegal();
+                return 1;
+            }
+            fallthrough;
+        case 6:
+            dr[6] = (dr[6] & 0xffff0ff0) | (cpu_state.regs[cpu_rm].l & 0x0000f00f);
+            break;
+        case 5:
+            if (cr4 & 0x8) {
+                x86illegal();
+                return 1;
+            }
+            fallthrough;
+        case 7:
+            dr[7] = cpu_state.regs[cpu_rm].l | 0x00000400;
+            break;
+        default:
+            x86illegal();
+            return 1;
+    }
     CLOCK_CYCLES(6);
     PREFETCH_RUN(6, 2, rmdat, 0, 0, 0, 0, 0);
+#ifdef USE_DEBUG_REGS_486
+    CPU_BLOCK_END();
+#endif
     return 0;
 }
 static int
 opMOV_DRx_r_a32(uint32_t fetchdat)
 {
-    if ((CPL || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
+    if ((CPL > 0) && (cr0 & 1)) {
         x86gpf(NULL, 0);
         return 1;
     }
+#ifdef USE_DEBUG_REGS_486
+    if ((dr[7] & 0x2000) && !(cpu_state.eflags & RF_FLAG)) {
+        trap |= 1;
+        return 1;
+    }
+#endif
     fetch_ea_16(fetchdat);
-    dr[cpu_reg] = cpu_state.regs[cpu_rm].l;
+    switch (cpu_reg) {
+        case 0 ... 3:
+            dr[cpu_reg] = cpu_state.regs[cpu_rm].l;
+            break;
+        case 4:
+            if (cr4 & 0x8) {
+                x86illegal();
+                return 1;
+            }
+            fallthrough;
+        case 6:
+            dr[6] = (dr[6] & 0xffff0ff0) | (cpu_state.regs[cpu_rm].l & 0x0000f00f);
+            break;
+        case 5:
+            if (cr4 & 0x8) {
+                x86illegal();
+                return 1;
+            }
+            fallthrough;
+        case 7:
+            dr[7] = cpu_state.regs[cpu_rm].l | 0x00000400;
+            break;
+        default:
+            x86illegal();
+            return 1;
+    }
     CLOCK_CYCLES(6);
     PREFETCH_RUN(6, 2, rmdat, 0, 0, 0, 0, 1);
+#ifdef USE_DEBUG_REGS_486
+    CPU_BLOCK_END();
+#endif
     return 0;
 }
 
diff --git a/src/cpu/x86_ops_mov_ctrl_2386.h b/src/cpu/x86_ops_mov_ctrl_2386.h
index c57dc8226..0d13cc833 100644
--- a/src/cpu/x86_ops_mov_ctrl_2386.h
+++ b/src/cpu/x86_ops_mov_ctrl_2386.h
@@ -9,6 +9,8 @@ opMOV_r_CRx_a16(uint32_t fetchdat)
     switch (cpu_reg) {
         case 0:
             cpu_state.regs[cpu_rm].l = cr0;
+            if (cpu_flush_pending)
+                cpu_state.regs[cpu_rm].l ^= 0x80000000;
             if (is486 || isibm486)
                 cpu_state.regs[cpu_rm].l |= 0x10; /*ET hardwired on 486*/
             else {
@@ -49,6 +51,8 @@ opMOV_r_CRx_a32(uint32_t fetchdat)
     switch (cpu_reg) {
         case 0:
             cpu_state.regs[cpu_rm].l = cr0;
+            if (cpu_flush_pending)
+                cpu_state.regs[cpu_rm].l ^= 0x80000000;
             if (is486 || isibm486)
                 cpu_state.regs[cpu_rm].l |= 0x10; /*ET hardwired on 486*/
             else {
@@ -82,18 +86,41 @@ opMOV_r_CRx_a32(uint32_t fetchdat)
 static int
 opMOV_r_DRx_a16(uint32_t fetchdat)
 {
-    if ((CPL || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
+    if ((CPL > 0) && (cr0 & 1)) {
         x86gpf(NULL, 0);
         return 1;
     }
-    fetch_ea_16(fetchdat);
-    if (cpu_reg == 4 || cpu_reg == 5) {
-        if (cr4 & 0x8)
-            x86illegal();
-        else
-            cpu_reg += 2;
+    if ((dr[7] & 0x2000) && !(cpu_state.eflags & RF_FLAG)) {
+        trap |= 1;
+        return 1;
+    }
+    fetch_ea_16(fetchdat);
+    switch (cpu_reg) {
+        case 0 ... 3:
+            cpu_state.regs[cpu_rm].l = dr[cpu_reg];
+            break;
+        case 4:
+            if (cr4 & 0x8) {
+                x86illegal();
+                return 1;
+            }
+            fallthrough;
+        case 6:
+            cpu_state.regs[cpu_rm].l = dr[6];
+            break;
+        case 5:
+            if (cr4 & 0x8) {
+                x86illegal();
+                return 1;
+            }
+            fallthrough;
+        case 7:
+            cpu_state.regs[cpu_rm].l = dr[7];
+            break;
+        default:
+            x86illegal();
+            return 1;
     }
-    cpu_state.regs[cpu_rm].l = dr[cpu_reg] | (cpu_reg == 6 ? 0xffff0ff0u : 0);
     CLOCK_CYCLES(6);
     PREFETCH_RUN(6, 2, rmdat, 0, 0, 0, 0, 0);
     return 0;
@@ -101,18 +128,41 @@ opMOV_r_DRx_a16(uint32_t fetchdat)
 static int
 opMOV_r_DRx_a32(uint32_t fetchdat)
 {
-    if ((CPL || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
+    if ((CPL > 0) && (cr0 & 1)) {
         x86gpf(NULL, 0);
         return 1;
     }
-    fetch_ea_32(fetchdat);
-    if (cpu_reg == 4 || cpu_reg == 5) {
-        if (cr4 & 0x8)
-            x86illegal();
-        else
-            cpu_reg += 2;
+    if ((dr[7] & 0x2000) && !(cpu_state.eflags & RF_FLAG)) {
+        trap |= 1;
+        return 1;
+    }
+    fetch_ea_32(fetchdat);
+    switch (cpu_reg) {
+        case 0 ... 3:
+            cpu_state.regs[cpu_rm].l = dr[cpu_reg];
+            break;
+        case 4:
+            if (cr4 & 0x8) {
+                x86illegal();
+                return 1;
+            }
+            fallthrough;
+        case 6:
+            cpu_state.regs[cpu_rm].l = dr[6];
+            break;
+        case 5:
+            if (cr4 & 0x8) {
+                x86illegal();
+                return 1;
+            }
+            fallthrough;
+        case 7:
+            cpu_state.regs[cpu_rm].l = dr[7];
+            break;
+        default:
+            x86illegal();
+            return 1;
     }
-    cpu_state.regs[cpu_rm].l = dr[cpu_reg] | (cpu_reg == 6 ? 0xffff0ff0u : 0);
     CLOCK_CYCLES(6);
     PREFETCH_RUN(6, 2, rmdat, 0, 0, 0, 0, 1);
     return 0;
@@ -130,16 +180,19 @@ opMOV_CRx_r_a16(uint32_t fetchdat)
     fetch_ea_16(fetchdat);
     switch (cpu_reg) {
         case 0:
-            if ((cpu_state.regs[cpu_rm].l ^ cr0) & 0x80000001)
+            if ((cpu_state.regs[cpu_rm].l ^ cr0) & 0x00000001)
                 flushmmucache();
+            else if ((cpu_state.regs[cpu_rm].l ^ cr0) & 0x80000000) {
+                flushmmucache_nopc();
+                cpu_flush_pending = 1;
+            } else if ((cpu_state.regs[cpu_rm].l ^ cr0) & WP_FLAG)
+                flushmmucache_write();
             /* Make sure CPL = 0 when switching from real mode to protected mode. */
             if ((cpu_state.regs[cpu_rm].l & 0x01) && !(cr0 & 0x01))
                 cpu_state.seg_cs.access &= 0x9f;
             cr0 = cpu_state.regs[cpu_rm].l;
             if (cpu_16bitbus)
                 cr0 |= 0x10;
-            if (!(cr0 & 0x80000000))
-                mmu_perm = 4;
             if (hascache && !(cr0 & (1 << 30)))
                 cpu_cache_int_enabled = 1;
             else
@@ -160,7 +213,7 @@ opMOV_CRx_r_a16(uint32_t fetchdat)
             break;
         case 4:
             if (cpu_has_feature(CPU_FEATURE_CR4)) {
-                if (((cpu_state.regs[cpu_rm].l ^ cr4) & cpu_CR4_mask) & (CR4_PAE | CR4_PGE))
+                if (((cpu_state.regs[cpu_rm].l ^ cr4) & cpu_CR4_mask) & (CR4_PSE | CR4_PAE | CR4_PGE))
                     flushmmucache();
                 cr4 = cpu_state.regs[cpu_rm].l & cpu_CR4_mask;
                 break;
@@ -187,16 +240,19 @@ opMOV_CRx_r_a32(uint32_t fetchdat)
     fetch_ea_32(fetchdat);
     switch (cpu_reg) {
         case 0:
-            if ((cpu_state.regs[cpu_rm].l ^ cr0) & 0x80000001)
+            if ((cpu_state.regs[cpu_rm].l ^ cr0) & 0x00000001)
                 flushmmucache();
+            else if ((cpu_state.regs[cpu_rm].l ^ cr0) & 0x80000000) {
+                flushmmucache_nopc();
+                cpu_flush_pending = 1;
+            } else if ((cpu_state.regs[cpu_rm].l ^ cr0) & WP_FLAG)
+                flushmmucache_write();
             /* Make sure CPL = 0 when switching from real mode to protected mode. */
             if ((cpu_state.regs[cpu_rm].l & 0x01) && !(cr0 & 0x01))
                 cpu_state.seg_cs.access &= 0x9f;
             cr0 = cpu_state.regs[cpu_rm].l;
             if (cpu_16bitbus)
                 cr0 |= 0x10;
-            if (!(cr0 & 0x80000000))
-                mmu_perm = 4;
             if (hascache && !(cr0 & (1 << 30)))
                 cpu_cache_int_enabled = 1;
             else
@@ -217,7 +273,7 @@ opMOV_CRx_r_a32(uint32_t fetchdat)
             break;
         case 4:
             if (cpu_has_feature(CPU_FEATURE_CR4)) {
-                if (((cpu_state.regs[cpu_rm].l ^ cr4) & cpu_CR4_mask) & (CR4_PAE | CR4_PGE))
+                if (((cpu_state.regs[cpu_rm].l ^ cr4) & cpu_CR4_mask) & (CR4_PSE | CR4_PAE | CR4_PGE))
                     flushmmucache();
                 cr4 = cpu_state.regs[cpu_rm].l & cpu_CR4_mask;
                 break;
@@ -236,24 +292,41 @@ opMOV_CRx_r_a32(uint32_t fetchdat)
 static int
 opMOV_DRx_r_a16(uint32_t fetchdat)
 {
-    if ((CPL || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
+    if ((CPL > 0) && (cr0 & 1)) {
         x86gpf(NULL, 0);
         return 1;
     }
-    if ((dr[6] & 0x2000) && !(cpu_state.eflags & RF_FLAG)) {
-        dr[7] |= 0x2000;
-        dr[6] &= ~0x2000;
-        x86gen();
+    if ((dr[7] & 0x2000) && !(cpu_state.eflags & RF_FLAG)) {
+        trap |= 1;
         return 1;
     }
     fetch_ea_16(fetchdat);
-    if (cpu_reg == 4 || cpu_reg == 5) {
-        if (cr4 & 0x8)
+    switch (cpu_reg) {
+        case 0 ... 3:
+            dr[cpu_reg] = cpu_state.regs[cpu_rm].l;
+            break;
+        case 4:
+            if (cr4 & 0x8) {
+                x86illegal();
+                return 1;
+            }
+            fallthrough;
+        case 6:
+            dr[6] = (dr[6] & 0xffff0ff0) | (cpu_state.regs[cpu_rm].l & 0x0000f00f);
+            break;
+        case 5:
+            if (cr4 & 0x8) {
+                x86illegal();
+                return 1;
+            }
+            fallthrough;
+        case 7:
+            dr[7] = cpu_state.regs[cpu_rm].l | 0x00000400;
+            break;
+        default:
             x86illegal();
-        else
-            cpu_reg += 2;
+            return 1;
     }
-    dr[cpu_reg] = cpu_state.regs[cpu_rm].l;
     CLOCK_CYCLES(6);
     PREFETCH_RUN(6, 2, rmdat, 0, 0, 0, 0, 0);
     CPU_BLOCK_END();
@@ -262,18 +335,41 @@ opMOV_DRx_r_a16(uint32_t fetchdat)
 static int
 opMOV_DRx_r_a32(uint32_t fetchdat)
 {
-    if ((CPL || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
+    if ((CPL > 0) && (cr0 & 1)) {
         x86gpf(NULL, 0);
         return 1;
     }
-    fetch_ea_16(fetchdat);
-    if (cpu_reg == 4 || cpu_reg == 5) {
-        if (cr4 & 0x8)
-            x86illegal();
-        else
-            cpu_reg += 2;
+    if ((dr[7] & 0x2000) && !(cpu_state.eflags & RF_FLAG)) {
+        trap |= 1;
+        return 1;
+    }
+    fetch_ea_32(fetchdat);
+    switch (cpu_reg) {
+        case 0 ... 3:
+            dr[cpu_reg] = cpu_state.regs[cpu_rm].l;
+            break;
+        case 4:
+            if (cr4 & 0x8) {
+                x86illegal();
+                return 1;
+            }
+            fallthrough;
+        case 6:
+            dr[6] = (dr[6] & 0xffff0ff0) | (cpu_state.regs[cpu_rm].l & 0x0000f00f);
+            break;
+        case 5:
+            if (cr4 & 0x8) {
+                x86illegal();
+                return 1;
+            }
+            fallthrough;
+        case 7:
+            dr[7] = cpu_state.regs[cpu_rm].l | 0x00000400;
+            break;
+        default:
+            x86illegal();
+            return 1;
     }
-    dr[cpu_reg] = cpu_state.regs[cpu_rm].l;
     CLOCK_CYCLES(6);
     PREFETCH_RUN(6, 2, rmdat, 0, 0, 0, 0, 1);
     CPU_BLOCK_END();
diff --git a/src/cpu/x86_ops_mov_seg.h b/src/cpu/x86_ops_mov_seg.h
index 2a798db5c..f5bd02923 100644
--- a/src/cpu/x86_ops_mov_seg.h
+++ b/src/cpu/x86_ops_mov_seg.h
@@ -195,7 +195,11 @@ opMOV_seg_w_a16(uint32_t fetchdat)
             cpu_state.pc++;
             if (cpu_state.abrt)
                 return 1;
+#ifdef OPS_286_386
+            x86_2386_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+#else
             x86_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+#endif
             return 1;
         case 0x20: /*FS*/
             op_loadseg(new_seg, &cpu_state.seg_fs);
@@ -240,7 +244,11 @@ opMOV_seg_w_a32(uint32_t fetchdat)
             cpu_state.pc++;
             if (cpu_state.abrt)
                 return 1;
+#ifdef OPS_286_386
+            x86_2386_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+#else
             x86_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+#endif
             return 1;
         case 0x20: /*FS*/
             op_loadseg(new_seg, &cpu_state.seg_fs);
@@ -264,9 +272,13 @@ opLDS_w_a16(uint32_t fetchdat)
     fetch_ea_16(fetchdat);
     ILLEGAL_ON(cpu_mod == 3);
     SEG_CHECK_READ(cpu_state.ea_seg);
-    CHECK_READ(cpu_state.ea_seg, cpu_state.eaaddr, cpu_state.eaaddr + 3);
-    addr = readmemw(easeg, cpu_state.eaaddr);
-    seg  = readmemw(easeg, cpu_state.eaaddr + 2);
+    CHECK_READ(cpu_state.ea_seg, cpu_state.eaa16[0], ((cpu_state.eaa16[0] + 1) & 0xffff));
+    addr = readmemw(easeg, cpu_state.eaa16[0]);
+    if (cpu_state.abrt)
+        return 1;
+    cpu_state.eaa16[0] += 2;
+    CHECK_READ(cpu_state.ea_seg, cpu_state.eaa16[0], ((cpu_state.eaa16[0] + 1) & 0xffff));
+    seg = readmemw(easeg, cpu_state.eaa16[0]);
     if (cpu_state.abrt)
         return 1;
     op_loadseg(seg, &cpu_state.seg_ds);
@@ -310,9 +322,13 @@ opLDS_l_a16(uint32_t fetchdat)
     fetch_ea_16(fetchdat);
     ILLEGAL_ON(cpu_mod == 3);
     SEG_CHECK_READ(cpu_state.ea_seg);
-    CHECK_READ(cpu_state.ea_seg, cpu_state.eaaddr, cpu_state.eaaddr + 5);
-    addr = readmeml(easeg, cpu_state.eaaddr);
-    seg  = readmemw(easeg, cpu_state.eaaddr + 4);
+    CHECK_READ(cpu_state.ea_seg, cpu_state.eaa16[0], ((cpu_state.eaa16[0] + 3) & 0xffff));
+    addr = readmeml(easeg, cpu_state.eaa16[0]);
+    if (cpu_state.abrt)
+        return 1;
+    cpu_state.eaa16[0] += 4;
+    CHECK_READ(cpu_state.ea_seg, cpu_state.eaa16[0], ((cpu_state.eaa16[0] + 1) & 0xffff));
+    seg = readmemw(easeg, cpu_state.eaa16[0]);
     if (cpu_state.abrt)
         return 1;
     op_loadseg(seg, &cpu_state.seg_ds);
@@ -357,9 +373,13 @@ opLSS_w_a16(uint32_t fetchdat)
     fetch_ea_16(fetchdat);
     ILLEGAL_ON(cpu_mod == 3);
     SEG_CHECK_READ(cpu_state.ea_seg);
-    CHECK_READ(cpu_state.ea_seg, cpu_state.eaaddr, cpu_state.eaaddr + 3);
-    addr = readmemw(easeg, cpu_state.eaaddr);
-    seg  = readmemw(easeg, cpu_state.eaaddr + 2);
+    CHECK_READ(cpu_state.ea_seg, cpu_state.eaa16[0], ((cpu_state.eaa16[0] + 1) & 0xffff));
+    addr = readmemw(easeg, cpu_state.eaa16[0]);
+    if (cpu_state.abrt)
+        return 1;
+    cpu_state.eaa16[0] += 2;
+    CHECK_READ(cpu_state.ea_seg, cpu_state.eaa16[0], ((cpu_state.eaa16[0] + 1) & 0xffff));
+    seg = readmemw(easeg, cpu_state.eaa16[0]);
     if (cpu_state.abrt)
         return 1;
     op_loadseg(seg, &cpu_state.seg_ss);
@@ -403,9 +423,13 @@ opLSS_l_a16(uint32_t fetchdat)
     fetch_ea_16(fetchdat);
     ILLEGAL_ON(cpu_mod == 3);
     SEG_CHECK_READ(cpu_state.ea_seg);
-    CHECK_READ(cpu_state.ea_seg, cpu_state.eaaddr, cpu_state.eaaddr + 5);
-    addr = readmeml(easeg, cpu_state.eaaddr);
-    seg  = readmemw(easeg, cpu_state.eaaddr + 4);
+    CHECK_READ(cpu_state.ea_seg, cpu_state.eaa16[0], ((cpu_state.eaa16[0] + 3) & 0xffff));
+    addr = readmeml(easeg, cpu_state.eaa16[0]);
+    if (cpu_state.abrt)
+        return 1;
+    cpu_state.eaa16[0] += 4;
+    CHECK_READ(cpu_state.ea_seg, cpu_state.eaa16[0], ((cpu_state.eaa16[0] + 1) & 0xffff));
+    seg = readmemw(easeg, cpu_state.eaa16[0]);
     if (cpu_state.abrt)
         return 1;
     op_loadseg(seg, &cpu_state.seg_ss);
@@ -449,9 +473,13 @@ opLSS_l_a32(uint32_t fetchdat)
         fetch_ea_16(fetchdat);                                                \
         SEG_CHECK_READ(cpu_state.ea_seg);                                     \
         ILLEGAL_ON(cpu_mod == 3);                                             \
-        CHECK_READ(cpu_state.ea_seg, cpu_state.eaaddr, cpu_state.eaaddr + 3); \
-        addr = readmemw(easeg, cpu_state.eaaddr);                             \
-        seg  = readmemw(easeg, cpu_state.eaaddr + 2);                         \
+        CHECK_READ(cpu_state.ea_seg, cpu_state.eaa16[0], ((cpu_state.eaa16[0] + 1) & 0xffff)); \
+        addr = readmemw(easeg, cpu_state.eaa16[0]);                           \
+        if (cpu_state.abrt)                                                   \
+            return 1;                                                         \
+        cpu_state.eaa16[0] += 2;                                              \
+        CHECK_READ(cpu_state.ea_seg, cpu_state.eaa16[0], ((cpu_state.eaa16[0] + 1) & 0xffff)); \
+        seg  = readmemw(easeg, cpu_state.eaa16[0]);                           \
         if (cpu_state.abrt)                                                   \
             return 1;                                                         \
         op_loadseg(seg, &sel);                                                \
@@ -494,9 +522,13 @@ opLSS_l_a32(uint32_t fetchdat)
         fetch_ea_16(fetchdat);                                                \
         SEG_CHECK_READ(cpu_state.ea_seg);                                     \
         ILLEGAL_ON(cpu_mod == 3);                                             \
-        CHECK_READ(cpu_state.ea_seg, cpu_state.eaaddr, cpu_state.eaaddr + 5); \
-        addr = readmeml(easeg, cpu_state.eaaddr);                             \
-        seg  = readmemw(easeg, cpu_state.eaaddr + 4);                         \
+        CHECK_READ(cpu_state.ea_seg, cpu_state.eaa16[0], ((cpu_state.eaa16[0] + 3) & 0xffff)); \
+        addr = readmeml(easeg, cpu_state.eaa16[0]);                           \
+        if (cpu_state.abrt)                                                   \
+            return 1;                                                         \
+        cpu_state.eaa16[0] += 4;                                              \
+        CHECK_READ(cpu_state.ea_seg, cpu_state.eaa16[0], ((cpu_state.eaa16[0] + 1) & 0xffff)); \
+        seg  = readmemw(easeg, cpu_state.eaa16[0]);                           \
         if (cpu_state.abrt)                                                   \
             return 1;                                                         \
         op_loadseg(seg, &sel);                                                \
diff --git a/src/cpu/x86_ops_msr.h b/src/cpu/x86_ops_msr.h
index daae01d84..a59cecdd4 100644
--- a/src/cpu/x86_ops_msr.h
+++ b/src/cpu/x86_ops_msr.h
@@ -1,5 +1,5 @@
 static int
-opRDTSC(uint32_t fetchdat)
+opRDTSC(UNUSED(uint32_t fetchdat))
 {
     if (!cpu_has_feature(CPU_FEATURE_RDTSC)) {
         cpu_state.pc = cpu_state.oldpc;
@@ -21,7 +21,7 @@ opRDTSC(uint32_t fetchdat)
 }
 
 static int
-opRDPMC(uint32_t fetchdat)
+opRDPMC(UNUSED(uint32_t fetchdat))
 {
     if (ECX > 1 || (!(cr4 & CR4_PCE) && (cr0 & 1) && CPL)) {
         x86gpf("RDPMC not allowed", 0);
diff --git a/src/cpu/x86_ops_pmode.h b/src/cpu/x86_ops_pmode.h
index e84847a7b..81f194f14 100644
--- a/src/cpu/x86_ops_pmode.h
+++ b/src/cpu/x86_ops_pmode.h
@@ -172,12 +172,12 @@ opLAR(w_a16, fetch_ea_16, 0, 0)
         return cpu_state.abrt;                                                                                              \
     }
 
-                opLSL(w_a16, fetch_ea_16, 0, 0)
-                    opLSL(w_a32, fetch_ea_32, 0, 1)
-                        opLSL(l_a16, fetch_ea_16, 1, 0)
-                            opLSL(l_a32, fetch_ea_32, 1, 1)
+opLSL(w_a16, fetch_ea_16, 0, 0)
+opLSL(w_a32, fetch_ea_32, 0, 1)
+opLSL(l_a16, fetch_ea_16, 1, 0)
+opLSL(l_a32, fetch_ea_32, 1, 1)
 
-                                static int op0F00_common(uint32_t fetchdat, int ea32)
+static int op0F00_common(uint32_t fetchdat, UNUSED(int ea32))
 {
     int      dpl;
     int      valid;
@@ -359,7 +359,7 @@ op0F00_a32(uint32_t fetchdat)
 }
 
 static int
-op0F01_common(uint32_t fetchdat, int is32, int is286, int ea32)
+op0F01_common(UNUSED(uint32_t fetchdat), int is32, int is286, UNUSED(int ea32))
 {
     uint32_t base;
     uint16_t limit;
@@ -430,12 +430,21 @@ op0F01_common(uint32_t fetchdat, int is32, int is286, int ea32)
         case 0x20: /*SMSW*/
             if (cpu_mod != 3)
                 SEG_CHECK_WRITE(cpu_state.ea_seg);
-            if (is486 || isibm486)
-                seteaw(msw);
-            else if (is386)
-                seteaw(msw | /* 0xFF00 */ 0xFFE0);
-            else
-                seteaw(msw | 0xFFF0);
+            if (is386 && is32 && (cpu_mod == 3)) {
+                if (is486 || isibm486)
+                    seteaw(cr0);
+                else if (is386 && !cpu_16bitbus)
+                    seteaw(cr0 | /* 0x7FFFFF00 */ 0x7FFFFFE0);
+                else
+                    seteaw(cr0 | 0x7FFFFFF0);
+            } else {
+                if (is486 || isibm486)
+                    seteaw(msw);
+                else if (is386 && !cpu_16bitbus)
+                    seteaw(msw | /* 0xFF00 */ 0xFFE0);
+                else
+                    seteaw(msw | 0xFFF0);
+            }
             CLOCK_CYCLES(2);
             PREFETCH_RUN(2, 2, rmdat, 0, 0, (cpu_mod == 3) ? 0 : 1, 0, ea32);
             break;
diff --git a/src/cpu/x86_ops_prefix_2386.h b/src/cpu/x86_ops_prefix_2386.h
new file mode 100644
index 000000000..87d114944
--- /dev/null
+++ b/src/cpu/x86_ops_prefix_2386.h
@@ -0,0 +1,292 @@
+#define op_seg(name, seg, opcode_table, normal_opcode_table)                  \
+    static int op##name##_w_a16(uint32_t fetchdat)                            \
+    {                                                                         \
+        int legal;                                                            \
+        fetchdat = fastreadl(cs + cpu_state.pc);                              \
+        if (cpu_state.abrt)                                                   \
+            return 1;                                                         \
+        cpu_state.pc++;                                                       \
+                                                                              \
+        if (in_lock) {                                                        \
+            legal = is_lock_legal(fetchdat);                                  \
+                                                                              \
+            ILLEGAL_ON(legal == 0);                                           \
+        }                                                                     \
+                                                                              \
+        cpu_state.ea_seg = &seg;                                              \
+        cpu_state.ssegs  = 1;                                                 \
+        CLOCK_CYCLES(4);                                                      \
+        PREFETCH_PREFIX();                                                    \
+                                                                              \
+        if (opcode_table[fetchdat & 0xff])                                    \
+            return opcode_table[fetchdat & 0xff](fetchdat >> 8);              \
+        return normal_opcode_table[fetchdat & 0xff](fetchdat >> 8);           \
+    }                                                                         \
+                                                                              \
+    static int op##name##_l_a16(uint32_t fetchdat)                            \
+    {                                                                         \
+        int legal;                                                            \
+        fetchdat = fastreadl(cs + cpu_state.pc);                              \
+        if (cpu_state.abrt)                                                   \
+            return 1;                                                         \
+        cpu_state.pc++;                                                       \
+                                                                              \
+        if (in_lock) {                                                        \
+            legal = is_lock_legal(fetchdat);                                  \
+                                                                              \
+            ILLEGAL_ON(legal == 0);                                           \
+        }                                                                     \
+                                                                              \
+        cpu_state.ea_seg = &seg;                                              \
+        cpu_state.ssegs  = 1;                                                 \
+        CLOCK_CYCLES(4);                                                      \
+        PREFETCH_PREFIX();                                                    \
+                                                                              \
+        if (opcode_table[(fetchdat & 0xff) | 0x100])                          \
+            return opcode_table[(fetchdat & 0xff) | 0x100](fetchdat >> 8);    \
+        return normal_opcode_table[(fetchdat & 0xff) | 0x100](fetchdat >> 8); \
+    }                                                                         \
+                                                                              \
+    static int op##name##_w_a32(uint32_t fetchdat)                            \
+    {                                                                         \
+        int legal;                                                            \
+        fetchdat = fastreadl(cs + cpu_state.pc);                              \
+        if (cpu_state.abrt)                                                   \
+            return 1;                                                         \
+        cpu_state.pc++;                                                       \
+                                                                              \
+        if (in_lock) {                                                        \
+            legal = is_lock_legal(fetchdat);                                  \
+                                                                              \
+            ILLEGAL_ON(legal == 0);                                           \
+        }                                                                     \
+                                                                              \
+        cpu_state.ea_seg = &seg;                                              \
+        cpu_state.ssegs  = 1;                                                 \
+        CLOCK_CYCLES(4);                                                      \
+        PREFETCH_PREFIX();                                                    \
+                                                                              \
+        if (opcode_table[(fetchdat & 0xff) | 0x200])                          \
+            return opcode_table[(fetchdat & 0xff) | 0x200](fetchdat >> 8);    \
+        return normal_opcode_table[(fetchdat & 0xff) | 0x200](fetchdat >> 8); \
+    }                                                                         \
+                                                                              \
+    static int op##name##_l_a32(uint32_t fetchdat)                            \
+    {                                                                         \
+        int legal;                                                            \
+        fetchdat = fastreadl(cs + cpu_state.pc);                              \
+        if (cpu_state.abrt)                                                   \
+            return 1;                                                         \
+        cpu_state.pc++;                                                       \
+                                                                              \
+        if (in_lock) {                                                        \
+            legal = is_lock_legal(fetchdat);                                  \
+                                                                              \
+            ILLEGAL_ON(legal == 0);                                           \
+        }                                                                     \
+                                                                              \
+        cpu_state.ea_seg = &seg;                                              \
+        cpu_state.ssegs  = 1;                                                 \
+        CLOCK_CYCLES(4);                                                      \
+        PREFETCH_PREFIX();                                                    \
+                                                                              \
+        if (opcode_table[(fetchdat & 0xff) | 0x300])                          \
+            return opcode_table[(fetchdat & 0xff) | 0x300](fetchdat >> 8);    \
+        return normal_opcode_table[(fetchdat & 0xff) | 0x300](fetchdat >> 8); \
+    }
+
+// clang-format off
+op_seg(CS, cpu_state.seg_cs, x86_2386_opcodes, x86_2386_opcodes)
+op_seg(DS, cpu_state.seg_ds, x86_2386_opcodes, x86_2386_opcodes)
+op_seg(ES, cpu_state.seg_es, x86_2386_opcodes, x86_2386_opcodes)
+op_seg(FS, cpu_state.seg_fs, x86_2386_opcodes, x86_2386_opcodes)
+op_seg(GS, cpu_state.seg_gs, x86_2386_opcodes, x86_2386_opcodes)
+op_seg(SS, cpu_state.seg_ss, x86_2386_opcodes, x86_2386_opcodes)
+    // clang-format on
+
+#define op_srp(name, seg, opcode_table, normal_opcode_table)                  \
+    static int op##name##_w_a16(uint32_t fetchdat)                            \
+    {                                                                         \
+        fetchdat = fastreadl(cs + cpu_state.pc);                              \
+        if (cpu_state.abrt)                                                   \
+            return 1;                                                         \
+        cpu_state.pc++;                                                       \
+                                                                              \
+        cpu_state.ea_seg = &seg;                                              \
+        cpu_state.ssegs  = 1;                                                 \
+        CLOCK_CYCLES(4);                                                      \
+        PREFETCH_PREFIX();                                                    \
+                                                                              \
+        if (opcode_table[fetchdat & 0xff])                                    \
+            return opcode_table[fetchdat & 0xff](fetchdat >> 8);              \
+        return normal_opcode_table[fetchdat & 0xff](fetchdat >> 8);           \
+    }                                                                         \
+                                                                              \
+    static int op##name##_l_a16(uint32_t fetchdat)                            \
+    {                                                                         \
+        fetchdat = fastreadl(cs + cpu_state.pc);                              \
+        if (cpu_state.abrt)                                                   \
+            return 1;                                                         \
+        cpu_state.pc++;                                                       \
+                                                                              \
+        cpu_state.ea_seg = &seg;                                              \
+        cpu_state.ssegs  = 1;                                                 \
+        CLOCK_CYCLES(4);                                                      \
+        PREFETCH_PREFIX();                                                    \
+                                                                              \
+        if (opcode_table[(fetchdat & 0xff) | 0x100])                          \
+            return opcode_table[(fetchdat & 0xff) | 0x100](fetchdat >> 8);    \
+        return normal_opcode_table[(fetchdat & 0xff) | 0x100](fetchdat >> 8); \
+    }                                                                         \
+                                                                              \
+    static int op##name##_w_a32(uint32_t fetchdat)                            \
+    {                                                                         \
+        fetchdat = fastreadl(cs + cpu_state.pc);                              \
+        if (cpu_state.abrt)                                                   \
+            return 1;                                                         \
+        cpu_state.pc++;                                                       \
+                                                                              \
+        cpu_state.ea_seg = &seg;                                              \
+        cpu_state.ssegs  = 1;                                                 \
+        CLOCK_CYCLES(4);                                                      \
+        PREFETCH_PREFIX();                                                    \
+                                                                              \
+        if (opcode_table[(fetchdat & 0xff) | 0x200])                          \
+            return opcode_table[(fetchdat & 0xff) | 0x200](fetchdat >> 8);    \
+        return normal_opcode_table[(fetchdat & 0xff) | 0x200](fetchdat >> 8); \
+    }                                                                         \
+                                                                              \
+    static int op##name##_l_a32(uint32_t fetchdat)                            \
+    {                                                                         \
+        fetchdat = fastreadl(cs + cpu_state.pc);                              \
+        if (cpu_state.abrt)                                                   \
+            return 1;                                                         \
+        cpu_state.pc++;                                                       \
+                                                                              \
+        cpu_state.ea_seg = &seg;                                              \
+        cpu_state.ssegs  = 1;                                                 \
+        CLOCK_CYCLES(4);                                                      \
+        PREFETCH_PREFIX();                                                    \
+                                                                              \
+        if (opcode_table[(fetchdat & 0xff) | 0x300])                          \
+            return opcode_table[(fetchdat & 0xff) | 0x300](fetchdat >> 8);    \
+        return normal_opcode_table[(fetchdat & 0xff) | 0x300](fetchdat >> 8); \
+    }
+
+// clang-format off
+op_srp(CS_REPE, cpu_state.seg_cs, x86_2386_opcodes_REPE, x86_2386_opcodes)
+op_srp(DS_REPE, cpu_state.seg_ds, x86_2386_opcodes_REPE, x86_2386_opcodes)
+op_srp(ES_REPE, cpu_state.seg_es, x86_2386_opcodes_REPE, x86_2386_opcodes)
+op_srp(FS_REPE, cpu_state.seg_fs, x86_2386_opcodes_REPE, x86_2386_opcodes)
+op_srp(GS_REPE, cpu_state.seg_gs, x86_2386_opcodes_REPE, x86_2386_opcodes)
+op_srp(SS_REPE, cpu_state.seg_ss, x86_2386_opcodes_REPE, x86_2386_opcodes)
+
+op_srp(CS_REPNE, cpu_state.seg_cs, x86_2386_opcodes_REPNE, x86_2386_opcodes)
+op_srp(DS_REPNE, cpu_state.seg_ds, x86_2386_opcodes_REPNE, x86_2386_opcodes)
+op_srp(ES_REPNE, cpu_state.seg_es, x86_2386_opcodes_REPNE, x86_2386_opcodes)
+op_srp(FS_REPNE, cpu_state.seg_fs, x86_2386_opcodes_REPNE, x86_2386_opcodes)
+op_srp(GS_REPNE, cpu_state.seg_gs, x86_2386_opcodes_REPNE, x86_2386_opcodes)
+op_srp(SS_REPNE, cpu_state.seg_ss, x86_2386_opcodes_REPNE, x86_2386_opcodes)
+    // clang-format on
+
+static int
+op_66(uint32_t fetchdat) /*Data size select*/
+{
+    int legal;
+    fetchdat = fastreadl(cs + cpu_state.pc);
+    if (cpu_state.abrt)
+        return 1;
+    cpu_state.pc++;
+
+    if (in_lock) {
+        legal = is_lock_legal(fetchdat);
+
+        ILLEGAL_ON(legal == 0);
+    }
+
+    cpu_state.op32 = ((use32 & 0x100) ^ 0x100) | (cpu_state.op32 & 0x200);
+    CLOCK_CYCLES(2);
+    PREFETCH_PREFIX();
+    return x86_2386_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+}
+static int
+op_67(uint32_t fetchdat) /*Address size select*/
+{
+    int legal;
+    fetchdat = fastreadl(cs + cpu_state.pc);
+    if (cpu_state.abrt)
+        return 1;
+    cpu_state.pc++;
+
+    if (in_lock) {
+        legal = is_lock_legal(fetchdat);
+
+        ILLEGAL_ON(legal == 0);
+    }
+
+    cpu_state.op32 = ((use32 & 0x200) ^ 0x200) | (cpu_state.op32 & 0x100);
+    CLOCK_CYCLES(2);
+    PREFETCH_PREFIX();
+    return x86_2386_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+}
+
+static int
+op_66_REPE(uint32_t fetchdat) /*Data size select*/
+{
+    fetchdat = fastreadl(cs + cpu_state.pc);
+    if (cpu_state.abrt)
+        return 1;
+    cpu_state.pc++;
+
+    cpu_state.op32 = ((use32 & 0x100) ^ 0x100) | (cpu_state.op32 & 0x200);
+    CLOCK_CYCLES(2);
+    PREFETCH_PREFIX();
+    if (x86_2386_opcodes_REPE[(fetchdat & 0xff) | cpu_state.op32])
+        return x86_2386_opcodes_REPE[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+    return x86_2386_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+}
+static int
+op_67_REPE(uint32_t fetchdat) /*Address size select*/
+{
+    fetchdat = fastreadl(cs + cpu_state.pc);
+    if (cpu_state.abrt)
+        return 1;
+    cpu_state.pc++;
+
+    cpu_state.op32 = ((use32 & 0x200) ^ 0x200) | (cpu_state.op32 & 0x100);
+    CLOCK_CYCLES(2);
+    PREFETCH_PREFIX();
+    if (x86_2386_opcodes_REPE[(fetchdat & 0xff) | cpu_state.op32])
+        return x86_2386_opcodes_REPE[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+    return x86_2386_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+}
+static int
+op_66_REPNE(uint32_t fetchdat) /*Data size select*/
+{
+    fetchdat = fastreadl(cs + cpu_state.pc);
+    if (cpu_state.abrt)
+        return 1;
+    cpu_state.pc++;
+
+    cpu_state.op32 = ((use32 & 0x100) ^ 0x100) | (cpu_state.op32 & 0x200);
+    CLOCK_CYCLES(2);
+    PREFETCH_PREFIX();
+    if (x86_2386_opcodes_REPNE[(fetchdat & 0xff) | cpu_state.op32])
+        return x86_2386_opcodes_REPNE[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+    return x86_2386_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+}
+static int
+op_67_REPNE(uint32_t fetchdat) /*Address size select*/
+{
+    fetchdat = fastreadl(cs + cpu_state.pc);
+    if (cpu_state.abrt)
+        return 1;
+    cpu_state.pc++;
+
+    cpu_state.op32 = ((use32 & 0x200) ^ 0x200) | (cpu_state.op32 & 0x100);
+    CLOCK_CYCLES(2);
+    PREFETCH_PREFIX();
+    if (x86_2386_opcodes_REPNE[(fetchdat & 0xff) | cpu_state.op32])
+        return x86_2386_opcodes_REPNE[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+    return x86_2386_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+}
diff --git a/src/cpu/x86_ops_rep.h b/src/cpu/x86_ops_rep.h
index a49db7e81..6449912e9 100644
--- a/src/cpu/x86_ops_rep.h
+++ b/src/cpu/x86_ops_rep.h
@@ -1,5 +1,5 @@
 #define REP_OPS(size, CNT_REG, SRC_REG, DEST_REG)                                                                 \
-    static int opREP_INSB_##size(uint32_t fetchdat)                                                               \
+    static int opREP_INSB_##size(UNUSED(uint32_t fetchdat))                                                       \
     {                                                                                                             \
         int reads = 0, writes = 0, total_cycles = 0;                                                              \
                                                                                                                   \
@@ -38,7 +38,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_INSW_##size(uint32_t fetchdat)                                                               \
+    static int opREP_INSW_##size(UNUSED(uint32_t fetchdat))                                                       \
     {                                                                                                             \
         int reads = 0, writes = 0, total_cycles = 0;                                                              \
                                                                                                                   \
@@ -77,7 +77,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_INSL_##size(uint32_t fetchdat)                                                               \
+    static int opREP_INSL_##size(UNUSED(uint32_t fetchdat))                                                       \
     {                                                                                                             \
         int reads = 0, writes = 0, total_cycles = 0;                                                              \
                                                                                                                   \
@@ -117,7 +117,7 @@
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
                                                                                                                   \
-    static int opREP_OUTSB_##size(uint32_t fetchdat)                                                              \
+    static int opREP_OUTSB_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, writes = 0, total_cycles = 0;                                                              \
                                                                                                                   \
@@ -148,7 +148,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_OUTSW_##size(uint32_t fetchdat)                                                              \
+    static int opREP_OUTSW_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, writes = 0, total_cycles = 0;                                                              \
                                                                                                                   \
@@ -179,7 +179,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_OUTSL_##size(uint32_t fetchdat)                                                              \
+    static int opREP_OUTSL_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, writes = 0, total_cycles = 0;                                                              \
                                                                                                                   \
@@ -211,7 +211,7 @@
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
                                                                                                                   \
-    static int opREP_MOVSB_##size(uint32_t fetchdat)                                                              \
+    static int opREP_MOVSB_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, writes = 0, total_cycles = 0;                                                              \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -264,7 +264,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_MOVSW_##size(uint32_t fetchdat)                                                              \
+    static int opREP_MOVSW_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, writes = 0, total_cycles = 0;                                                              \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -318,7 +318,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_MOVSL_##size(uint32_t fetchdat)                                                              \
+    static int opREP_MOVSL_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, writes = 0, total_cycles = 0;                                                              \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -373,7 +373,7 @@
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
                                                                                                                   \
-    static int opREP_STOSB_##size(uint32_t fetchdat)                                                              \
+    static int opREP_STOSB_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int writes = 0, total_cycles = 0;                                                                         \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -405,7 +405,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_STOSW_##size(uint32_t fetchdat)                                                              \
+    static int opREP_STOSW_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int writes = 0, total_cycles = 0;                                                                         \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -437,7 +437,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_STOSL_##size(uint32_t fetchdat)                                                              \
+    static int opREP_STOSL_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int writes = 0, total_cycles = 0;                                                                         \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -470,7 +470,7 @@
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
                                                                                                                   \
-    static int opREP_LODSB_##size(uint32_t fetchdat)                                                              \
+    static int opREP_LODSB_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, total_cycles = 0;                                                                          \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -502,7 +502,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_LODSW_##size(uint32_t fetchdat)                                                              \
+    static int opREP_LODSW_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, total_cycles = 0;                                                                          \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -534,7 +534,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_LODSL_##size(uint32_t fetchdat)                                                              \
+    static int opREP_LODSL_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, total_cycles = 0;                                                                          \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -570,7 +570,7 @@
 #define CHEK_READ(a, b, c)
 
 #define REP_OPS_CMPS_SCAS(size, CNT_REG, SRC_REG, DEST_REG, FV)                                                   \
-    static int opREP_CMPSB_##size(uint32_t fetchdat)                                                              \
+    static int opREP_CMPSB_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, total_cycles = 0, tempz;                                                                   \
                                                                                                                   \
@@ -623,7 +623,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_CMPSW_##size(uint32_t fetchdat)                                                              \
+    static int opREP_CMPSW_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, total_cycles = 0, tempz;                                                                   \
                                                                                                                   \
@@ -677,7 +677,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_CMPSL_##size(uint32_t fetchdat)                                                              \
+    static int opREP_CMPSL_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, total_cycles = 0, tempz;                                                                   \
                                                                                                                   \
@@ -732,7 +732,7 @@
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
                                                                                                                   \
-    static int opREP_SCASB_##size(uint32_t fetchdat)                                                              \
+    static int opREP_SCASB_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, total_cycles = 0, tempz;                                                                   \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -767,7 +767,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_SCASW_##size(uint32_t fetchdat)                                                              \
+    static int opREP_SCASW_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, total_cycles = 0, tempz;                                                                   \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -802,7 +802,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_SCASL_##size(uint32_t fetchdat)                                                              \
+    static int opREP_SCASL_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, total_cycles = 0, tempz;                                                                   \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -855,6 +855,7 @@ opREPNE(uint32_t fetchdat)
 
     CLOCK_CYCLES(2);
     PREFETCH_PREFIX();
+    rep_op = fetchdat & 0xff;
     if (x86_opcodes_REPNE[(fetchdat & 0xff) | cpu_state.op32])
         return x86_opcodes_REPNE[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
     return x86_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
@@ -869,6 +870,7 @@ opREPE(uint32_t fetchdat)
 
     CLOCK_CYCLES(2);
     PREFETCH_PREFIX();
+    rep_op = fetchdat & 0xff;
     if (x86_opcodes_REPE[(fetchdat & 0xff) | cpu_state.op32])
         return x86_opcodes_REPE[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
     return x86_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
diff --git a/src/cpu/x86_ops_rep_2386.h b/src/cpu/x86_ops_rep_2386.h
index b6f64e90d..3b96d54e3 100644
--- a/src/cpu/x86_ops_rep_2386.h
+++ b/src/cpu/x86_ops_rep_2386.h
@@ -1,5 +1,5 @@
 #define REP_OPS(size, CNT_REG, SRC_REG, DEST_REG)                                                                 \
-    static int opREP_INSB_##size(uint32_t fetchdat)                                                               \
+    static int opREP_INSB_##size(UNUSED(uint32_t fetchdat))                                                       \
     {                                                                                                             \
         int reads = 0, writes = 0, total_cycles = 0;                                                              \
                                                                                                                   \
@@ -38,7 +38,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_INSW_##size(uint32_t fetchdat)                                                               \
+    static int opREP_INSW_##size(UNUSED(uint32_t fetchdat))                                                       \
     {                                                                                                             \
         int reads = 0, writes = 0, total_cycles = 0;                                                              \
                                                                                                                   \
@@ -77,7 +77,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_INSL_##size(uint32_t fetchdat)                                                               \
+    static int opREP_INSL_##size(UNUSED(uint32_t fetchdat))                                                       \
     {                                                                                                             \
         int reads = 0, writes = 0, total_cycles = 0;                                                              \
                                                                                                                   \
@@ -117,7 +117,7 @@
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
                                                                                                                   \
-    static int opREP_OUTSB_##size(uint32_t fetchdat)                                                              \
+    static int opREP_OUTSB_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, writes = 0, total_cycles = 0;                                                              \
                                                                                                                   \
@@ -148,7 +148,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_OUTSW_##size(uint32_t fetchdat)                                                              \
+    static int opREP_OUTSW_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, writes = 0, total_cycles = 0;                                                              \
                                                                                                                   \
@@ -179,7 +179,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_OUTSL_##size(uint32_t fetchdat)                                                              \
+    static int opREP_OUTSL_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, writes = 0, total_cycles = 0;                                                              \
                                                                                                                   \
@@ -211,7 +211,7 @@
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
                                                                                                                   \
-    static int opREP_MOVSB_##size(uint32_t fetchdat)                                                              \
+    static int opREP_MOVSB_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, writes = 0, total_cycles = 0;                                                              \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -264,7 +264,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_MOVSW_##size(uint32_t fetchdat)                                                              \
+    static int opREP_MOVSW_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, writes = 0, total_cycles = 0;                                                              \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -318,7 +318,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_MOVSL_##size(uint32_t fetchdat)                                                              \
+    static int opREP_MOVSL_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, writes = 0, total_cycles = 0;                                                              \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -373,7 +373,7 @@
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
                                                                                                                   \
-    static int opREP_STOSB_##size(uint32_t fetchdat)                                                              \
+    static int opREP_STOSB_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int writes = 0, total_cycles = 0;                                                                         \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -405,7 +405,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_STOSW_##size(uint32_t fetchdat)                                                              \
+    static int opREP_STOSW_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int writes = 0, total_cycles = 0;                                                                         \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -437,7 +437,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_STOSL_##size(uint32_t fetchdat)                                                              \
+    static int opREP_STOSL_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int writes = 0, total_cycles = 0;                                                                         \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -470,7 +470,7 @@
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
                                                                                                                   \
-    static int opREP_LODSB_##size(uint32_t fetchdat)                                                              \
+    static int opREP_LODSB_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, total_cycles = 0;                                                                          \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -502,7 +502,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_LODSW_##size(uint32_t fetchdat)                                                              \
+    static int opREP_LODSW_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, total_cycles = 0;                                                                          \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -534,7 +534,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_LODSL_##size(uint32_t fetchdat)                                                              \
+    static int opREP_LODSL_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, total_cycles = 0;                                                                          \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -570,7 +570,7 @@
 #define CHEK_READ(a, b, c)
 
 #define REP_OPS_CMPS_SCAS(size, CNT_REG, SRC_REG, DEST_REG, FV)                                                   \
-    static int opREP_CMPSB_##size(uint32_t fetchdat)                                                              \
+    static int opREP_CMPSB_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, total_cycles = 0, tempz;                                                                   \
                                                                                                                   \
@@ -619,7 +619,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_CMPSW_##size(uint32_t fetchdat)                                                              \
+    static int opREP_CMPSW_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, total_cycles = 0, tempz;                                                                   \
                                                                                                                   \
@@ -669,7 +669,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_CMPSL_##size(uint32_t fetchdat)                                                              \
+    static int opREP_CMPSL_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, total_cycles = 0, tempz;                                                                   \
                                                                                                                   \
@@ -720,7 +720,7 @@
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
                                                                                                                   \
-    static int opREP_SCASB_##size(uint32_t fetchdat)                                                              \
+    static int opREP_SCASB_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, total_cycles = 0, tempz;                                                                   \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -755,7 +755,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_SCASW_##size(uint32_t fetchdat)                                                              \
+    static int opREP_SCASW_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, total_cycles = 0, tempz;                                                                   \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -790,7 +790,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_SCASL_##size(uint32_t fetchdat)                                                              \
+    static int opREP_SCASL_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int reads = 0, total_cycles = 0, tempz;                                                                   \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
@@ -836,13 +836,14 @@ REP_OPS_CMPS_SCAS(a32_E, ECX, ESI, EDI, 1)
 static int
 opREPNE(uint32_t fetchdat)
 {
-    fetchdat = fastreadl(cs + cpu_state.pc);
+    fetchdat = fastreadl_fetch(cs + cpu_state.pc);
     if (cpu_state.abrt)
         return 1;
     cpu_state.pc++;
 
     CLOCK_CYCLES(2);
     PREFETCH_PREFIX();
+    rep_op = fetchdat & 0xff;
     if (x86_2386_opcodes_REPNE[(fetchdat & 0xff) | cpu_state.op32])
         return x86_2386_opcodes_REPNE[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
     return x86_2386_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
@@ -850,13 +851,14 @@ opREPNE(uint32_t fetchdat)
 static int
 opREPE(uint32_t fetchdat)
 {
-    fetchdat = fastreadl(cs + cpu_state.pc);
+    fetchdat = fastreadl_fetch(cs + cpu_state.pc);
     if (cpu_state.abrt)
         return 1;
     cpu_state.pc++;
 
     CLOCK_CYCLES(2);
     PREFETCH_PREFIX();
+    rep_op = fetchdat & 0xff;
     if (x86_2386_opcodes_REPE[(fetchdat & 0xff) | cpu_state.op32])
         return x86_2386_opcodes_REPE[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
     return x86_2386_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
diff --git a/src/cpu/x86_ops_rep_dyn.h b/src/cpu/x86_ops_rep_dyn.h
index cf32209cc..1220c0da3 100644
--- a/src/cpu/x86_ops_rep_dyn.h
+++ b/src/cpu/x86_ops_rep_dyn.h
@@ -1,5 +1,5 @@
 #define REP_OPS(size, CNT_REG, SRC_REG, DEST_REG)                                                                 \
-    static int opREP_INSB_##size(uint32_t fetchdat)                                                               \
+    static int opREP_INSB_##size(UNUSED(uint32_t fetchdat))                                                       \
     {                                                                                                             \
         addr64 = 0x00000000;                                                                                      \
                                                                                                                   \
@@ -32,7 +32,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_INSW_##size(uint32_t fetchdat)                                                               \
+    static int opREP_INSW_##size(UNUSED(uint32_t fetchdat))                                                       \
     {                                                                                                             \
         addr64a[0] = addr64a[1] = 0x00000000;                                                                     \
                                                                                                                   \
@@ -65,7 +65,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_INSL_##size(uint32_t fetchdat)                                                               \
+    static int opREP_INSL_##size(UNUSED(uint32_t fetchdat))                                                       \
     {                                                                                                             \
         addr64a[0] = addr64a[1] = addr64a[2] = addr64a[3] = 0x00000000;                                           \
                                                                                                                   \
@@ -99,7 +99,7 @@
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
                                                                                                                   \
-    static int opREP_OUTSB_##size(uint32_t fetchdat)                                                              \
+    static int opREP_OUTSB_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         if (CNT_REG > 0) {                                                                                        \
             uint8_t temp;                                                                                         \
@@ -124,7 +124,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_OUTSW_##size(uint32_t fetchdat)                                                              \
+    static int opREP_OUTSW_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         if (CNT_REG > 0) {                                                                                        \
             uint16_t temp;                                                                                        \
@@ -149,7 +149,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_OUTSL_##size(uint32_t fetchdat)                                                              \
+    static int opREP_OUTSL_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         if (CNT_REG > 0) {                                                                                        \
             uint32_t temp;                                                                                        \
@@ -175,7 +175,7 @@
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
                                                                                                                   \
-    static int opREP_MOVSB_##size(uint32_t fetchdat)                                                              \
+    static int opREP_MOVSB_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
         addr64 = addr64_2 = 0x00000000;                                                                           \
@@ -223,7 +223,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_MOVSW_##size(uint32_t fetchdat)                                                              \
+    static int opREP_MOVSW_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
         addr64a[0] = addr64a[1] = 0x00000000;                                                                     \
@@ -272,7 +272,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_MOVSL_##size(uint32_t fetchdat)                                                              \
+    static int opREP_MOVSL_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
         addr64a[0] = addr64a[1] = addr64a[2] = addr64a[3] = 0x00000000;                                           \
@@ -322,7 +322,7 @@
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
                                                                                                                   \
-    static int opREP_STOSB_##size(uint32_t fetchdat)                                                              \
+    static int opREP_STOSB_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
         if (trap)                                                                                                 \
@@ -350,7 +350,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_STOSW_##size(uint32_t fetchdat)                                                              \
+    static int opREP_STOSW_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
         if (trap)                                                                                                 \
@@ -378,7 +378,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_STOSL_##size(uint32_t fetchdat)                                                              \
+    static int opREP_STOSL_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
         if (trap)                                                                                                 \
@@ -407,7 +407,7 @@
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
                                                                                                                   \
-    static int opREP_LODSB_##size(uint32_t fetchdat)                                                              \
+    static int opREP_LODSB_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
         if (trap)                                                                                                 \
@@ -435,7 +435,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_LODSW_##size(uint32_t fetchdat)                                                              \
+    static int opREP_LODSW_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
         if (trap)                                                                                                 \
@@ -463,7 +463,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_LODSL_##size(uint32_t fetchdat)                                                              \
+    static int opREP_LODSL_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int cycles_end = cycles - ((is386 && cpu_use_dynarec) ? 1000 : 100);                                      \
         if (trap)                                                                                                 \
@@ -495,7 +495,7 @@
 #define CHEK_READ(a, b, c)
 
 #define REP_OPS_CMPS_SCAS(size, CNT_REG, SRC_REG, DEST_REG, FV)                                                   \
-    static int opREP_CMPSB_##size(uint32_t fetchdat)                                                              \
+    static int opREP_CMPSB_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int tempz;                                                                                                \
                                                                                                                   \
@@ -545,7 +545,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_CMPSW_##size(uint32_t fetchdat)                                                              \
+    static int opREP_CMPSW_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int tempz;                                                                                                \
                                                                                                                   \
@@ -596,7 +596,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_CMPSL_##size(uint32_t fetchdat)                                                              \
+    static int opREP_CMPSL_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int tempz;                                                                                                \
                                                                                                                   \
@@ -648,7 +648,7 @@
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
                                                                                                                   \
-    static int opREP_SCASB_##size(uint32_t fetchdat)                                                              \
+    static int opREP_SCASB_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int tempz;                                                                                                \
         int cycles_end = cycles - 1000;                                                                           \
@@ -680,7 +680,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_SCASW_##size(uint32_t fetchdat)                                                              \
+    static int opREP_SCASW_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int tempz;                                                                                                \
         int cycles_end = cycles - 1000;                                                                           \
@@ -712,7 +712,7 @@
         }                                                                                                         \
         return cpu_state.abrt;                                                                                    \
     }                                                                                                             \
-    static int opREP_SCASL_##size(uint32_t fetchdat)                                                              \
+    static int opREP_SCASL_##size(UNUSED(uint32_t fetchdat))                                                      \
     {                                                                                                             \
         int tempz;                                                                                                \
         int cycles_end = cycles - 1000;                                                                           \
@@ -761,6 +761,7 @@ opREPNE(uint32_t fetchdat)
     cpu_state.pc++;
 
     CLOCK_CYCLES(2);
+    rep_op = fetchdat & 0xff;
     if (x86_opcodes_REPNE[(fetchdat & 0xff) | cpu_state.op32])
         return x86_opcodes_REPNE[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
     return x86_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
@@ -774,6 +775,7 @@ opREPE(uint32_t fetchdat)
     cpu_state.pc++;
 
     CLOCK_CYCLES(2);
+    rep_op = fetchdat & 0xff;
     if (x86_opcodes_REPE[(fetchdat & 0xff) | cpu_state.op32])
         return x86_opcodes_REPE[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
     return x86_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
diff --git a/src/cpu/x86_ops_ret.h b/src/cpu/x86_ops_ret.h
index 0d9a6370b..8bf72e9ed 100644
--- a/src/cpu/x86_ops_ret.h
+++ b/src/cpu/x86_ops_ret.h
@@ -15,7 +15,7 @@
         op_loadcs(readmemw(ss, ESP + 2));             \
     } else {                                          \
         cpu_state.pc = readmemw(ss, SP);              \
-        op_loadcs(readmemw(ss, SP + 2));              \
+        op_loadcs(readmemw(ss, (SP + 2) & 0xffff));   \
     }                                                 \
     if (cpu_state.abrt)                               \
         return 1;                                     \
@@ -47,7 +47,7 @@
     cycles -= timing_retf_rm;
 
 static int
-opRETF_a16(uint32_t fetchdat)
+opRETF_a16(UNUSED(uint32_t fetchdat))
 {
     int cycles_old = cycles;
     UN_USED(cycles_old);
@@ -60,7 +60,7 @@ opRETF_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opRETF_a32(uint32_t fetchdat)
+opRETF_a32(UNUSED(uint32_t fetchdat))
 {
     int cycles_old = cycles;
     UN_USED(cycles_old);
@@ -103,7 +103,7 @@ opRETF_a32_imm(uint32_t fetchdat)
 }
 
 static int
-opIRET_186(uint32_t fetchdat)
+opIRET_186(UNUSED(uint32_t fetchdat))
 {
     int cycles_old = cycles;
     UN_USED(cycles_old);
@@ -135,6 +135,9 @@ opIRET_186(uint32_t fetchdat)
     }
     flags_extract();
     nmi_enable = 1;
+#ifdef USE_DEBUG_REGS_486
+    rf_flag_no_clear = 1;
+#endif
     CPU_BLOCK_END();
 
     PREFETCH_RUN(cycles_old - cycles, 1, -1, 2, 0, 0, 0, 0);
@@ -143,7 +146,7 @@ opIRET_186(uint32_t fetchdat)
 }
 
 static int
-opIRET_286(uint32_t fetchdat)
+opIRET_286(UNUSED(uint32_t fetchdat))
 {
     int cycles_old = cycles;
     UN_USED(cycles_old);
@@ -175,6 +178,9 @@ opIRET_286(uint32_t fetchdat)
     }
     flags_extract();
     nmi_enable = 1;
+#ifdef USE_DEBUG_REGS_486
+    rf_flag_no_clear = 1;
+#endif
     CPU_BLOCK_END();
 
     PREFETCH_RUN(cycles_old - cycles, 1, -1, 2, 0, 0, 0, 0);
@@ -183,7 +189,7 @@ opIRET_286(uint32_t fetchdat)
 }
 
 static int
-opIRET(uint32_t fetchdat)
+opIRET(UNUSED(uint32_t fetchdat))
 {
     int cycles_old = cycles;
     UN_USED(cycles_old);
@@ -243,6 +249,9 @@ opIRET(uint32_t fetchdat)
     }
     flags_extract();
     nmi_enable = 1;
+#ifdef USE_DEBUG_REGS_486
+    rf_flag_no_clear = 1;
+#endif
     CPU_BLOCK_END();
 
     PREFETCH_RUN(cycles_old - cycles, 1, -1, 2, 0, 0, 0, 0);
@@ -251,7 +260,7 @@ opIRET(uint32_t fetchdat)
 }
 
 static int
-opIRETD(uint32_t fetchdat)
+opIRETD(UNUSED(uint32_t fetchdat))
 {
     int cycles_old = cycles;
     UN_USED(cycles_old);
@@ -285,6 +294,9 @@ opIRETD(uint32_t fetchdat)
     }
     flags_extract();
     nmi_enable = 1;
+#ifdef USE_DEBUG_REGS_486
+    rf_flag_no_clear = 1;
+#endif
     CPU_BLOCK_END();
 
     PREFETCH_RUN(cycles_old - cycles, 1, -1, 0, 2, 0, 0, 1);
diff --git a/src/cpu/x86_ops_ret_2386.h b/src/cpu/x86_ops_ret_2386.h
index ca85bf2b0..02233fd1d 100644
--- a/src/cpu/x86_ops_ret_2386.h
+++ b/src/cpu/x86_ops_ret_2386.h
@@ -15,7 +15,7 @@
         op_loadcs(readmemw(ss, ESP + 2));             \
     } else {                                          \
         cpu_state.pc = readmemw(ss, SP);              \
-        op_loadcs(readmemw(ss, SP + 2));              \
+        op_loadcs(readmemw(ss, (SP + 2) & 0xffff));   \
     }                                                 \
     if (cpu_state.abrt)                               \
         return 1;                                     \
@@ -47,7 +47,7 @@
     cycles -= timing_retf_rm;
 
 static int
-opRETF_a16(uint32_t fetchdat)
+opRETF_a16(UNUSED(uint32_t fetchdat))
 {
     int cycles_old = cycles;
     UN_USED(cycles_old);
@@ -60,7 +60,7 @@ opRETF_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opRETF_a32(uint32_t fetchdat)
+opRETF_a32(UNUSED(uint32_t fetchdat))
 {
     int cycles_old = cycles;
     UN_USED(cycles_old);
@@ -103,7 +103,7 @@ opRETF_a32_imm(uint32_t fetchdat)
 }
 
 static int
-opIRET_186(uint32_t fetchdat)
+opIRET_186(UNUSED(uint32_t fetchdat))
 {
     int cycles_old = cycles;
     UN_USED(cycles_old);
@@ -144,7 +144,7 @@ opIRET_186(uint32_t fetchdat)
 }
 
 static int
-opIRET_286(uint32_t fetchdat)
+opIRET_286(UNUSED(uint32_t fetchdat))
 {
     int cycles_old = cycles;
     UN_USED(cycles_old);
@@ -185,7 +185,7 @@ opIRET_286(uint32_t fetchdat)
 }
 
 static int
-opIRET(uint32_t fetchdat)
+opIRET(UNUSED(uint32_t fetchdat))
 {
     int cycles_old = cycles;
     UN_USED(cycles_old);
@@ -254,7 +254,7 @@ opIRET(uint32_t fetchdat)
 }
 
 static int
-opIRETD(uint32_t fetchdat)
+opIRETD(UNUSED(uint32_t fetchdat))
 {
     int cycles_old = cycles;
     UN_USED(cycles_old);
diff --git a/src/cpu/x86_ops_stack.h b/src/cpu/x86_ops_stack.h
index 13eb883d3..f5d608fbb 100644
--- a/src/cpu/x86_ops_stack.h
+++ b/src/cpu/x86_ops_stack.h
@@ -1,5 +1,5 @@
 #define PUSH_W_OP(reg)                         \
-    static int opPUSH_##reg(uint32_t fetchdat) \
+    static int opPUSH_##reg(UNUSED(uint32_t fetchdat)) \
     {                                          \
         PUSH_W(reg);                           \
         CLOCK_CYCLES((is486) ? 1 : 2);         \
@@ -8,7 +8,7 @@
     }
 
 #define PUSH_L_OP(reg)                         \
-    static int opPUSH_##reg(uint32_t fetchdat) \
+    static int opPUSH_##reg(UNUSED(uint32_t fetchdat)) \
     {                                          \
         PUSH_L(reg);                           \
         CLOCK_CYCLES((is486) ? 1 : 2);         \
@@ -17,7 +17,7 @@
     }
 
 #define POP_W_OP(reg)                          \
-    static int opPOP_##reg(uint32_t fetchdat)  \
+    static int opPOP_##reg(UNUSED(uint32_t fetchdat)) \
     {                                          \
         reg = POP_W();                         \
         CLOCK_CYCLES((is486) ? 1 : 4);         \
@@ -26,7 +26,7 @@
     }
 
 #define POP_L_OP(reg)                          \
-    static int opPOP_##reg(uint32_t fetchdat)  \
+    static int opPOP_##reg(UNUSED(uint32_t fetchdat)) \
     {                                          \
         reg = POP_L();                         \
         CLOCK_CYCLES((is486) ? 1 : 4);         \
@@ -71,7 +71,7 @@ POP_L_OP(EBP)
 POP_L_OP(ESP)
 
 static int
-opPUSHA_w(uint32_t fetchdat)
+opPUSHA_w(UNUSED(uint32_t fetchdat))
 {
     if (stack32) {
         writememw(ss, ESP - 2, AX);
@@ -101,7 +101,7 @@ opPUSHA_w(uint32_t fetchdat)
     return cpu_state.abrt;
 }
 static int
-opPUSHA_l(uint32_t fetchdat)
+opPUSHA_l(UNUSED(uint32_t fetchdat))
 {
     if (stack32) {
         writememl(ss, ESP - 4, EAX);
@@ -132,7 +132,7 @@ opPUSHA_l(uint32_t fetchdat)
 }
 
 static int
-opPOPA_w(uint32_t fetchdat)
+opPOPA_w(UNUSED(uint32_t fetchdat))
 {
     if (stack32) {
         DI = readmemw(ss, ESP);
@@ -186,7 +186,7 @@ opPOPA_w(uint32_t fetchdat)
     return 0;
 }
 static int
-opPOPA_l(uint32_t fetchdat)
+opPOPA_l(UNUSED(uint32_t fetchdat))
 {
     if (stack32) {
         EDI = readmeml(ss, ESP);
@@ -250,7 +250,7 @@ opPUSH_imm_w(uint32_t fetchdat)
     return cpu_state.abrt;
 }
 static int
-opPUSH_imm_l(uint32_t fetchdat)
+opPUSH_imm_l(UNUSED(uint32_t fetchdat))
 {
     uint32_t val = getlong();
     if (cpu_state.abrt)
@@ -550,7 +550,7 @@ opENTER_l(uint32_t fetchdat)
 }
 
 static int
-opLEAVE_w(uint32_t fetchdat)
+opLEAVE_w(UNUSED(uint32_t fetchdat))
 {
     uint32_t tempESP = ESP;
     uint16_t temp;
@@ -568,7 +568,7 @@ opLEAVE_w(uint32_t fetchdat)
     return 0;
 }
 static int
-opLEAVE_l(uint32_t fetchdat)
+opLEAVE_l(UNUSED(uint32_t fetchdat))
 {
     uint32_t tempESP = ESP;
     uint32_t temp;
@@ -587,14 +587,14 @@ opLEAVE_l(uint32_t fetchdat)
 }
 
 #define PUSH_SEG_OPS(seg)                          \
-    static int opPUSH_##seg##_w(uint32_t fetchdat) \
+    static int opPUSH_##seg##_w(UNUSED(uint32_t fetchdat)) \
     {                                              \
         PUSH_W(seg);                               \
         CLOCK_CYCLES(2);                           \
         PREFETCH_RUN(2, 1, -1, 0, 0, 1, 0, 0);     \
         return cpu_state.abrt;                     \
     }                                              \
-    static int opPUSH_##seg##_l(uint32_t fetchdat) \
+    static int opPUSH_##seg##_l(UNUSED(uint32_t fetchdat)) \
     {                                              \
         PUSH_L(seg);                               \
         CLOCK_CYCLES(2);                           \
@@ -603,7 +603,7 @@ opLEAVE_l(uint32_t fetchdat)
     }
 
 #define POP_SEG_OPS(seg, realseg)                          \
-    static int opPOP_##seg##_w(uint32_t fetchdat)          \
+    static int opPOP_##seg##_w(UNUSED(uint32_t fetchdat))  \
     {                                                      \
         uint16_t temp_seg;                                 \
         uint32_t temp_esp = ESP;                           \
@@ -617,7 +617,7 @@ opLEAVE_l(uint32_t fetchdat)
         PREFETCH_RUN(is486 ? 3 : 7, 1, -1, 0, 0, 1, 0, 0); \
         return cpu_state.abrt;                             \
     }                                                      \
-    static int opPOP_##seg##_l(uint32_t fetchdat)          \
+    static int opPOP_##seg##_l(UNUSED(uint32_t fetchdat))  \
     {                                                      \
         uint32_t temp_seg;                                 \
         uint32_t temp_esp = ESP;                           \
@@ -667,7 +667,11 @@ opPOP_SS_w(uint32_t fetchdat)
     cpu_state.pc++;
     if (cpu_state.abrt)
         return 1;
+#ifdef OPS_286_386
+    x86_2386_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+#else
     x86_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+#endif
 
     return 1;
 }
@@ -695,7 +699,11 @@ opPOP_SS_l(uint32_t fetchdat)
     cpu_state.pc++;
     if (cpu_state.abrt)
         return 1;
+#ifdef OPS_286_386
+    x86_2386_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+#else
     x86_opcodes[(fetchdat & 0xff) | cpu_state.op32](fetchdat >> 8);
+#endif
 
     return 1;
 }
diff --git a/src/cpu/x86_ops_string.h b/src/cpu/x86_ops_string.h
index 619386fcb..d3a7d89a9 100644
--- a/src/cpu/x86_ops_string.h
+++ b/src/cpu/x86_ops_string.h
@@ -1,5 +1,5 @@
 static int
-opMOVSB_a16(uint32_t fetchdat)
+opMOVSB_a16(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -35,7 +35,7 @@ opMOVSB_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opMOVSB_a32(uint32_t fetchdat)
+opMOVSB_a32(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -71,7 +71,7 @@ opMOVSB_a32(uint32_t fetchdat)
 }
 
 static int
-opMOVSW_a16(uint32_t fetchdat)
+opMOVSW_a16(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -107,7 +107,7 @@ opMOVSW_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opMOVSW_a32(uint32_t fetchdat)
+opMOVSW_a32(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -144,7 +144,7 @@ opMOVSW_a32(uint32_t fetchdat)
 }
 
 static int
-opMOVSL_a16(uint32_t fetchdat)
+opMOVSL_a16(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
@@ -180,7 +180,7 @@ opMOVSL_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opMOVSL_a32(uint32_t fetchdat)
+opMOVSL_a32(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
@@ -217,7 +217,7 @@ opMOVSL_a32(uint32_t fetchdat)
 }
 
 static int
-opCMPSB_a16(uint32_t fetchdat)
+opCMPSB_a16(UNUSED(uint32_t fetchdat))
 {
     uint8_t src;
     uint8_t dst;
@@ -258,7 +258,7 @@ opCMPSB_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opCMPSB_a32(uint32_t fetchdat)
+opCMPSB_a32(UNUSED(uint32_t fetchdat))
 {
     uint8_t src;
     uint8_t dst;
@@ -300,7 +300,7 @@ opCMPSB_a32(uint32_t fetchdat)
 }
 
 static int
-opCMPSW_a16(uint32_t fetchdat)
+opCMPSW_a16(UNUSED(uint32_t fetchdat))
 {
     uint16_t src;
     uint16_t dst;
@@ -342,7 +342,7 @@ opCMPSW_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opCMPSW_a32(uint32_t fetchdat)
+opCMPSW_a32(UNUSED(uint32_t fetchdat))
 {
     uint16_t src;
     uint16_t dst;
@@ -385,7 +385,7 @@ opCMPSW_a32(uint32_t fetchdat)
 }
 
 static int
-opCMPSL_a16(uint32_t fetchdat)
+opCMPSL_a16(UNUSED(uint32_t fetchdat))
 {
     uint32_t src;
     uint32_t dst;
@@ -427,7 +427,7 @@ opCMPSL_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opCMPSL_a32(uint32_t fetchdat)
+opCMPSL_a32(UNUSED(uint32_t fetchdat))
 {
     uint32_t src;
     uint32_t dst;
@@ -470,7 +470,7 @@ opCMPSL_a32(uint32_t fetchdat)
 }
 
 static int
-opSTOSB_a16(uint32_t fetchdat)
+opSTOSB_a16(UNUSED(uint32_t fetchdat))
 {
     SEG_CHECK_WRITE(&cpu_state.seg_es);
     CHECK_WRITE(&cpu_state.seg_es, DI, DI);
@@ -486,7 +486,7 @@ opSTOSB_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opSTOSB_a32(uint32_t fetchdat)
+opSTOSB_a32(UNUSED(uint32_t fetchdat))
 {
     SEG_CHECK_WRITE(&cpu_state.seg_es);
     CHECK_WRITE(&cpu_state.seg_es, EDI, EDI);
@@ -503,7 +503,7 @@ opSTOSB_a32(uint32_t fetchdat)
 }
 
 static int
-opSTOSW_a16(uint32_t fetchdat)
+opSTOSW_a16(UNUSED(uint32_t fetchdat))
 {
     SEG_CHECK_WRITE(&cpu_state.seg_es);
     CHECK_WRITE(&cpu_state.seg_es, DI, DI + 1UL);
@@ -519,7 +519,7 @@ opSTOSW_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opSTOSW_a32(uint32_t fetchdat)
+opSTOSW_a32(UNUSED(uint32_t fetchdat))
 {
     SEG_CHECK_WRITE(&cpu_state.seg_es);
     CHECK_WRITE(&cpu_state.seg_es, EDI, EDI + 1UL);
@@ -536,7 +536,7 @@ opSTOSW_a32(uint32_t fetchdat)
 }
 
 static int
-opSTOSL_a16(uint32_t fetchdat)
+opSTOSL_a16(UNUSED(uint32_t fetchdat))
 {
     SEG_CHECK_WRITE(&cpu_state.seg_es);
     CHECK_WRITE(&cpu_state.seg_es, DI, DI + 3UL);
@@ -552,7 +552,7 @@ opSTOSL_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opSTOSL_a32(uint32_t fetchdat)
+opSTOSL_a32(UNUSED(uint32_t fetchdat))
 {
     SEG_CHECK_WRITE(&cpu_state.seg_es);
     CHECK_WRITE(&cpu_state.seg_es, EDI, EDI + 3UL);
@@ -569,7 +569,7 @@ opSTOSL_a32(uint32_t fetchdat)
 }
 
 static int
-opLODSB_a16(uint32_t fetchdat)
+opLODSB_a16(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -588,7 +588,7 @@ opLODSB_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opLODSB_a32(uint32_t fetchdat)
+opLODSB_a32(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -608,7 +608,7 @@ opLODSB_a32(uint32_t fetchdat)
 }
 
 static int
-opLODSW_a16(uint32_t fetchdat)
+opLODSW_a16(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -627,7 +627,7 @@ opLODSW_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opLODSW_a32(uint32_t fetchdat)
+opLODSW_a32(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -647,7 +647,7 @@ opLODSW_a32(uint32_t fetchdat)
 }
 
 static int
-opLODSL_a16(uint32_t fetchdat)
+opLODSL_a16(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
@@ -666,7 +666,7 @@ opLODSL_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opLODSL_a32(uint32_t fetchdat)
+opLODSL_a32(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
@@ -686,7 +686,7 @@ opLODSL_a32(uint32_t fetchdat)
 }
 
 static int
-opSCASB_a16(uint32_t fetchdat)
+opSCASB_a16(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -705,7 +705,7 @@ opSCASB_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opSCASB_a32(uint32_t fetchdat)
+opSCASB_a32(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -725,7 +725,7 @@ opSCASB_a32(uint32_t fetchdat)
 }
 
 static int
-opSCASW_a16(uint32_t fetchdat)
+opSCASW_a16(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -744,7 +744,7 @@ opSCASW_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opSCASW_a32(uint32_t fetchdat)
+opSCASW_a32(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -764,7 +764,7 @@ opSCASW_a32(uint32_t fetchdat)
 }
 
 static int
-opSCASL_a16(uint32_t fetchdat)
+opSCASL_a16(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
@@ -783,7 +783,7 @@ opSCASL_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opSCASL_a32(uint32_t fetchdat)
+opSCASL_a32(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
@@ -803,7 +803,7 @@ opSCASL_a32(uint32_t fetchdat)
 }
 
 static int
-opINSB_a16(uint32_t fetchdat)
+opINSB_a16(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -829,7 +829,7 @@ opINSB_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opINSB_a32(uint32_t fetchdat)
+opINSB_a32(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -856,7 +856,7 @@ opINSB_a32(uint32_t fetchdat)
 }
 
 static int
-opINSW_a16(uint32_t fetchdat)
+opINSW_a16(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -882,7 +882,7 @@ opINSW_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opINSW_a32(uint32_t fetchdat)
+opINSW_a32(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -909,7 +909,7 @@ opINSW_a32(uint32_t fetchdat)
 }
 
 static int
-opINSL_a16(uint32_t fetchdat)
+opINSL_a16(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
@@ -935,7 +935,7 @@ opINSL_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opINSL_a32(uint32_t fetchdat)
+opINSL_a32(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
@@ -962,7 +962,7 @@ opINSL_a32(uint32_t fetchdat)
 }
 
 static int
-opOUTSB_a16(uint32_t fetchdat)
+opOUTSB_a16(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -982,7 +982,7 @@ opOUTSB_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opOUTSB_a32(uint32_t fetchdat)
+opOUTSB_a32(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -1003,7 +1003,7 @@ opOUTSB_a32(uint32_t fetchdat)
 }
 
 static int
-opOUTSW_a16(uint32_t fetchdat)
+opOUTSW_a16(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -1023,7 +1023,7 @@ opOUTSW_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opOUTSW_a32(uint32_t fetchdat)
+opOUTSW_a32(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -1044,7 +1044,7 @@ opOUTSW_a32(uint32_t fetchdat)
 }
 
 static int
-opOUTSL_a16(uint32_t fetchdat)
+opOUTSL_a16(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
@@ -1064,7 +1064,7 @@ opOUTSL_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opOUTSL_a32(uint32_t fetchdat)
+opOUTSL_a32(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
diff --git a/src/cpu/x86_ops_string_2386.h b/src/cpu/x86_ops_string_2386.h
index 98875e54f..32d69d4b2 100644
--- a/src/cpu/x86_ops_string_2386.h
+++ b/src/cpu/x86_ops_string_2386.h
@@ -1,5 +1,5 @@
 static int
-opMOVSB_a16(uint32_t fetchdat)
+opMOVSB_a16(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -35,7 +35,7 @@ opMOVSB_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opMOVSB_a32(uint32_t fetchdat)
+opMOVSB_a32(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -71,7 +71,7 @@ opMOVSB_a32(uint32_t fetchdat)
 }
 
 static int
-opMOVSW_a16(uint32_t fetchdat)
+opMOVSW_a16(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -107,7 +107,7 @@ opMOVSW_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opMOVSW_a32(uint32_t fetchdat)
+opMOVSW_a32(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -144,7 +144,7 @@ opMOVSW_a32(uint32_t fetchdat)
 }
 
 static int
-opMOVSL_a16(uint32_t fetchdat)
+opMOVSL_a16(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
@@ -180,7 +180,7 @@ opMOVSL_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opMOVSL_a32(uint32_t fetchdat)
+opMOVSL_a32(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
@@ -217,7 +217,7 @@ opMOVSL_a32(uint32_t fetchdat)
 }
 
 static int
-opCMPSB_a16(uint32_t fetchdat)
+opCMPSB_a16(UNUSED(uint32_t fetchdat))
 {
     uint8_t src;
     uint8_t dst;
@@ -254,7 +254,7 @@ opCMPSB_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opCMPSB_a32(uint32_t fetchdat)
+opCMPSB_a32(UNUSED(uint32_t fetchdat))
 {
     uint8_t src;
     uint8_t dst;
@@ -292,7 +292,7 @@ opCMPSB_a32(uint32_t fetchdat)
 }
 
 static int
-opCMPSW_a16(uint32_t fetchdat)
+opCMPSW_a16(UNUSED(uint32_t fetchdat))
 {
     uint16_t src;
     uint16_t dst;
@@ -330,7 +330,7 @@ opCMPSW_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opCMPSW_a32(uint32_t fetchdat)
+opCMPSW_a32(UNUSED(uint32_t fetchdat))
 {
     uint16_t src;
     uint16_t dst;
@@ -369,7 +369,7 @@ opCMPSW_a32(uint32_t fetchdat)
 }
 
 static int
-opCMPSL_a16(uint32_t fetchdat)
+opCMPSL_a16(UNUSED(uint32_t fetchdat))
 {
     uint32_t src;
     uint32_t dst;
@@ -407,7 +407,7 @@ opCMPSL_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opCMPSL_a32(uint32_t fetchdat)
+opCMPSL_a32(UNUSED(uint32_t fetchdat))
 {
     uint32_t src;
     uint32_t dst;
@@ -446,7 +446,7 @@ opCMPSL_a32(uint32_t fetchdat)
 }
 
 static int
-opSTOSB_a16(uint32_t fetchdat)
+opSTOSB_a16(UNUSED(uint32_t fetchdat))
 {
     SEG_CHECK_WRITE(&cpu_state.seg_es);
     CHECK_WRITE(&cpu_state.seg_es, DI, DI);
@@ -462,7 +462,7 @@ opSTOSB_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opSTOSB_a32(uint32_t fetchdat)
+opSTOSB_a32(UNUSED(uint32_t fetchdat))
 {
     SEG_CHECK_WRITE(&cpu_state.seg_es);
     CHECK_WRITE(&cpu_state.seg_es, EDI, EDI);
@@ -479,7 +479,7 @@ opSTOSB_a32(uint32_t fetchdat)
 }
 
 static int
-opSTOSW_a16(uint32_t fetchdat)
+opSTOSW_a16(UNUSED(uint32_t fetchdat))
 {
     SEG_CHECK_WRITE(&cpu_state.seg_es);
     CHECK_WRITE(&cpu_state.seg_es, DI, DI + 1UL);
@@ -495,7 +495,7 @@ opSTOSW_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opSTOSW_a32(uint32_t fetchdat)
+opSTOSW_a32(UNUSED(uint32_t fetchdat))
 {
     SEG_CHECK_WRITE(&cpu_state.seg_es);
     CHECK_WRITE(&cpu_state.seg_es, EDI, EDI + 1UL);
@@ -512,7 +512,7 @@ opSTOSW_a32(uint32_t fetchdat)
 }
 
 static int
-opSTOSL_a16(uint32_t fetchdat)
+opSTOSL_a16(UNUSED(uint32_t fetchdat))
 {
     SEG_CHECK_WRITE(&cpu_state.seg_es);
     CHECK_WRITE(&cpu_state.seg_es, DI, DI + 3UL);
@@ -528,7 +528,7 @@ opSTOSL_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opSTOSL_a32(uint32_t fetchdat)
+opSTOSL_a32(UNUSED(uint32_t fetchdat))
 {
     SEG_CHECK_WRITE(&cpu_state.seg_es);
     CHECK_WRITE(&cpu_state.seg_es, EDI, EDI + 3UL);
@@ -545,7 +545,7 @@ opSTOSL_a32(uint32_t fetchdat)
 }
 
 static int
-opLODSB_a16(uint32_t fetchdat)
+opLODSB_a16(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -564,7 +564,7 @@ opLODSB_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opLODSB_a32(uint32_t fetchdat)
+opLODSB_a32(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -584,7 +584,7 @@ opLODSB_a32(uint32_t fetchdat)
 }
 
 static int
-opLODSW_a16(uint32_t fetchdat)
+opLODSW_a16(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -603,7 +603,7 @@ opLODSW_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opLODSW_a32(uint32_t fetchdat)
+opLODSW_a32(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -623,7 +623,7 @@ opLODSW_a32(uint32_t fetchdat)
 }
 
 static int
-opLODSL_a16(uint32_t fetchdat)
+opLODSL_a16(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
@@ -642,7 +642,7 @@ opLODSL_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opLODSL_a32(uint32_t fetchdat)
+opLODSL_a32(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
@@ -662,7 +662,7 @@ opLODSL_a32(uint32_t fetchdat)
 }
 
 static int
-opSCASB_a16(uint32_t fetchdat)
+opSCASB_a16(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -681,7 +681,7 @@ opSCASB_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opSCASB_a32(uint32_t fetchdat)
+opSCASB_a32(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -701,7 +701,7 @@ opSCASB_a32(uint32_t fetchdat)
 }
 
 static int
-opSCASW_a16(uint32_t fetchdat)
+opSCASW_a16(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -720,7 +720,7 @@ opSCASW_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opSCASW_a32(uint32_t fetchdat)
+opSCASW_a32(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -740,7 +740,7 @@ opSCASW_a32(uint32_t fetchdat)
 }
 
 static int
-opSCASL_a16(uint32_t fetchdat)
+opSCASL_a16(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
@@ -759,7 +759,7 @@ opSCASL_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opSCASL_a32(uint32_t fetchdat)
+opSCASL_a32(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
@@ -779,7 +779,7 @@ opSCASL_a32(uint32_t fetchdat)
 }
 
 static int
-opINSB_a16(uint32_t fetchdat)
+opINSB_a16(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -805,7 +805,7 @@ opINSB_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opINSB_a32(uint32_t fetchdat)
+opINSB_a32(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -832,7 +832,7 @@ opINSB_a32(uint32_t fetchdat)
 }
 
 static int
-opINSW_a16(uint32_t fetchdat)
+opINSW_a16(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -858,7 +858,7 @@ opINSW_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opINSW_a32(uint32_t fetchdat)
+opINSW_a32(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -885,7 +885,7 @@ opINSW_a32(uint32_t fetchdat)
 }
 
 static int
-opINSL_a16(uint32_t fetchdat)
+opINSL_a16(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
@@ -911,7 +911,7 @@ opINSL_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opINSL_a32(uint32_t fetchdat)
+opINSL_a32(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
@@ -938,7 +938,7 @@ opINSL_a32(uint32_t fetchdat)
 }
 
 static int
-opOUTSB_a16(uint32_t fetchdat)
+opOUTSB_a16(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -958,7 +958,7 @@ opOUTSB_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opOUTSB_a32(uint32_t fetchdat)
+opOUTSB_a32(UNUSED(uint32_t fetchdat))
 {
     uint8_t temp;
 
@@ -979,7 +979,7 @@ opOUTSB_a32(uint32_t fetchdat)
 }
 
 static int
-opOUTSW_a16(uint32_t fetchdat)
+opOUTSW_a16(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -999,7 +999,7 @@ opOUTSW_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opOUTSW_a32(uint32_t fetchdat)
+opOUTSW_a32(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp;
 
@@ -1020,7 +1020,7 @@ opOUTSW_a32(uint32_t fetchdat)
 }
 
 static int
-opOUTSL_a16(uint32_t fetchdat)
+opOUTSL_a16(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
@@ -1040,7 +1040,7 @@ opOUTSL_a16(uint32_t fetchdat)
     return 0;
 }
 static int
-opOUTSL_a32(uint32_t fetchdat)
+opOUTSL_a32(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp;
 
diff --git a/src/cpu/x86_ops_xchg.h b/src/cpu/x86_ops_xchg.h
index 70e7be58c..826181a8e 100644
--- a/src/cpu/x86_ops_xchg.h
+++ b/src/cpu/x86_ops_xchg.h
@@ -116,7 +116,7 @@ opXCHG_l_a32(uint32_t fetchdat)
 }
 
 static int
-opXCHG_AX_BX(uint32_t fetchdat)
+opXCHG_AX_BX(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp = AX;
     AX            = BX;
@@ -126,7 +126,7 @@ opXCHG_AX_BX(uint32_t fetchdat)
     return 0;
 }
 static int
-opXCHG_AX_CX(uint32_t fetchdat)
+opXCHG_AX_CX(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp = AX;
     AX            = CX;
@@ -136,7 +136,7 @@ opXCHG_AX_CX(uint32_t fetchdat)
     return 0;
 }
 static int
-opXCHG_AX_DX(uint32_t fetchdat)
+opXCHG_AX_DX(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp = AX;
     AX            = DX;
@@ -146,7 +146,7 @@ opXCHG_AX_DX(uint32_t fetchdat)
     return 0;
 }
 static int
-opXCHG_AX_SI(uint32_t fetchdat)
+opXCHG_AX_SI(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp = AX;
     AX            = SI;
@@ -156,7 +156,7 @@ opXCHG_AX_SI(uint32_t fetchdat)
     return 0;
 }
 static int
-opXCHG_AX_DI(uint32_t fetchdat)
+opXCHG_AX_DI(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp = AX;
     AX            = DI;
@@ -166,7 +166,7 @@ opXCHG_AX_DI(uint32_t fetchdat)
     return 0;
 }
 static int
-opXCHG_AX_BP(uint32_t fetchdat)
+opXCHG_AX_BP(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp = AX;
     AX            = BP;
@@ -176,7 +176,7 @@ opXCHG_AX_BP(uint32_t fetchdat)
     return 0;
 }
 static int
-opXCHG_AX_SP(uint32_t fetchdat)
+opXCHG_AX_SP(UNUSED(uint32_t fetchdat))
 {
     uint16_t temp = AX;
     AX            = SP;
@@ -187,7 +187,7 @@ opXCHG_AX_SP(uint32_t fetchdat)
 }
 
 static int
-opXCHG_EAX_EBX(uint32_t fetchdat)
+opXCHG_EAX_EBX(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp = EAX;
     EAX           = EBX;
@@ -197,7 +197,7 @@ opXCHG_EAX_EBX(uint32_t fetchdat)
     return 0;
 }
 static int
-opXCHG_EAX_ECX(uint32_t fetchdat)
+opXCHG_EAX_ECX(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp = EAX;
     EAX           = ECX;
@@ -207,7 +207,7 @@ opXCHG_EAX_ECX(uint32_t fetchdat)
     return 0;
 }
 static int
-opXCHG_EAX_EDX(uint32_t fetchdat)
+opXCHG_EAX_EDX(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp = EAX;
     EAX           = EDX;
@@ -217,7 +217,7 @@ opXCHG_EAX_EDX(uint32_t fetchdat)
     return 0;
 }
 static int
-opXCHG_EAX_ESI(uint32_t fetchdat)
+opXCHG_EAX_ESI(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp = EAX;
     EAX           = ESI;
@@ -227,7 +227,7 @@ opXCHG_EAX_ESI(uint32_t fetchdat)
     return 0;
 }
 static int
-opXCHG_EAX_EDI(uint32_t fetchdat)
+opXCHG_EAX_EDI(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp = EAX;
     EAX           = EDI;
@@ -237,7 +237,7 @@ opXCHG_EAX_EDI(uint32_t fetchdat)
     return 0;
 }
 static int
-opXCHG_EAX_EBP(uint32_t fetchdat)
+opXCHG_EAX_EBP(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp = EAX;
     EAX           = EBP;
@@ -247,7 +247,7 @@ opXCHG_EAX_EBP(uint32_t fetchdat)
     return 0;
 }
 static int
-opXCHG_EAX_ESP(uint32_t fetchdat)
+opXCHG_EAX_ESP(UNUSED(uint32_t fetchdat))
 {
     uint32_t temp = EAX;
     EAX           = ESP;
@@ -258,7 +258,7 @@ opXCHG_EAX_ESP(uint32_t fetchdat)
 }
 
 #define opBSWAP(reg)                                                                                      \
-    static int opBSWAP_##reg(uint32_t fetchdat)                                                           \
+    static int opBSWAP_##reg(UNUSED(uint32_t fetchdat))                                                   \
     {                                                                                                     \
         reg = (reg >> 24) | ((reg >> 8) & 0xff00) | ((reg << 8) & 0xff0000) | ((reg << 24) & 0xff000000); \
         CLOCK_CYCLES(1);                                                                                  \
@@ -275,4 +275,4 @@ opBSWAP(ESI)
 opBSWAP(EDI)
 opBSWAP(EBP)
 opBSWAP(ESP)
-    // clang-format on
+// clang-format on
diff --git a/src/cpu/x86seg.c b/src/cpu/x86seg.c
index 245f3fa65..145752237 100644
--- a/src/cpu/x86seg.c
+++ b/src/cpu/x86seg.c
@@ -48,12 +48,12 @@
 #define  seg_writememwl writememwl_2386
 #define  seg_writememll writememll_2386
 #else
-#define  seg_readmembl  readmembl_2386
-#define  seg_readmemwl  readmemwl_2386
-#define  seg_readmemll  readmemll_2386
-#define  seg_writemembl writemembl_2386
-#define  seg_writememwl writememwl_2386
-#define  seg_writememll writememll_2386
+#define  seg_readmembl  readmembl
+#define  seg_readmemwl  readmemwl
+#define  seg_readmemll  readmemll
+#define  seg_writemembl writemembl
+#define  seg_writememwl writememwl
+#define  seg_writememll writememll
 #endif
 
 #define DPL  ((segdat[2] >> 13) & 3)
@@ -798,6 +798,27 @@ PUSHL(uint32_t v)
     }
 }
 
+static void
+PUSHL_SEL(uint32_t v)
+{
+    if (cpu_16bitbus) {
+        PUSHW(v >> 16);
+        PUSHW(v & 0xffff);
+    } else {
+        if (stack32) {
+            writememw(ss, ESP - 4, v);
+            if (cpu_state.abrt)
+                return;
+            ESP -= 4;
+        } else {
+            writememw(ss, ((SP - 4) & 0xffff), v);
+            if (cpu_state.abrt)
+                return;
+            SP -= 4;
+        }
+    }
+}
+
 static uint16_t
 POPW(void)
 {
@@ -875,7 +896,7 @@ loadcscall(uint16_t seg)
     uint32_t      oldsp;
     uint32_t      newsp;
     uint32_t      oldsp2;
-    uint16_t      tempw;
+    uint32_t      oldss_limit_high = cpu_state.seg_ss.limit_high;
     const x86seg *dt;
 
     if ((msw & 1) && !(cpu_state.eflags & VM_FLAG)) {
@@ -1092,7 +1113,7 @@ loadcscall(uint16_t seg)
 
                                 x86seg_log("Type %04X\n", type);
                                 if (type == 0x0c00) {
-                                    PUSHL(oldss);
+                                    is586 ? PUSHL(oldss) : PUSHL_SEL(oldss);
                                     PUSHL(oldsp2);
                                     if (cpu_state.abrt) {
                                         SS  = oldss;
@@ -1104,7 +1125,31 @@ loadcscall(uint16_t seg)
                                     }
                                     if (count) {
                                         while (count--) {
-                                            PUSHL(readmeml(oldssbase, oldsp + (count << 2)));
+                                            uint32_t temp_val;
+                                            switch (oldss_limit_high - oldsp - (count << 2)) {
+                                                default:
+                                                case 3:
+                                                    /* We are at least an entire DWORD away from the limit,
+                                                       read long. */
+                                                    PUSHL(readmeml(oldssbase, oldsp + (count << 2)));
+                                                    break;
+                                                case 2:
+                                                    /* We are 3 bytes away from the limit,
+                                                       read word + byte. */
+                                                    temp_val = readmemw(oldssbase, oldsp + (count << 2));
+                                                    temp_val |= (readmemb(oldssbase, oldsp +
+                                                                          (count << 2) + 2) << 16);
+                                                    PUSHL(temp_val);
+                                                    break;
+                                                case 1:
+                                                    /* We are a WORD away from the limit, read word. */
+                                                    PUSHL(readmemw(oldssbase, oldsp + (count << 2)));
+                                                    break;
+                                                case 0:
+                                                    /* We are a BYTE away from the limit, read byte. */
+                                                    PUSHL(readmemb(oldssbase, oldsp + (count << 2)));
+                                                    break;
+                                            }
                                             if (cpu_state.abrt) {
                                                 SS  = oldss;
                                                 ESP = oldsp2;
@@ -1131,9 +1176,20 @@ loadcscall(uint16_t seg)
                                     x86seg_log("Write SP to %04X:%04X\n", SS, SP);
                                     if (count) {
                                         while (count--) {
-                                            tempw = readmemw(oldssbase, (oldsp & 0xffff) + (count << 1));
-                                            x86seg_log("PUSH %04X\n", tempw);
-                                            PUSHW(tempw);
+                                            switch (oldss_limit_high - (oldsp & 0xffff) - (count << 1)) {
+                                                default:
+                                                case 1:
+                                                    /* We are at least an entire WORD away from the limit,
+                                                       read word. */
+                                                    PUSHW(readmemw(oldssbase, (oldsp & 0xffff) +
+                                                          (count << 1)));
+                                                    break;
+                                                case 0:
+                                                    /* We are a BYTE away from the limit, read byte. */
+                                                    PUSHW(readmemb(oldssbase, (oldsp & 0xffff) +
+                                                          (count << 1)));
+                                                    break;
+                                            }
                                             if (cpu_state.abrt) {
                                                 SS  = oldss;
                                                 ESP = oldsp2;
@@ -1278,6 +1334,12 @@ pmoderetf(int is32, uint16_t off)
     if (CPL == (seg & 0x0003)) {
         x86seg_log("RETF CPL = RPL  %04X\n", segdat[2]);
         switch (segdat[2] & 0x1f00) {
+            case 0x1000:
+            case 0x1100:
+            case 0x1200:
+            case 0x1300:
+                 /* Data segment, apparently valid when CPL is the same, used by MS LINK for DOS. */
+                 fallthrough;
             case 0x1800:
             case 0x1900:
             case 0x1a00:
@@ -1328,6 +1390,12 @@ pmoderetf(int is32, uint16_t off)
         cycles -= timing_retf_pm;
     } else {
         switch (segdat[2] & 0x1f00) {
+            case 0x1000:
+            case 0x1100:
+            case 0x1200:
+            case 0x1300:
+                 /* Data segment, apparently valid when CPL is the same, used by MS LINK for DOS. */
+                 fallthrough;
             case 0x1800:
             case 0x1900:
             case 0x1a00:
@@ -1549,6 +1617,12 @@ pmodeint(int num, int soft)
                 return;
             }
             switch (segdat2[2] & 0x1f00) {
+                case 0x1000:
+                case 0x1100:
+                case 0x1200:
+                case 0x1300:
+                     /* Data segment, apparently valid when CPL is the same, used by MS CodeView for DOS. */
+                     fallthrough;
                 case 0x1800:
                 case 0x1900:
                 case 0x1a00:
@@ -1622,10 +1696,17 @@ pmodeint(int num, int soft)
                         cpl_override = 1;
                         if (type >= 0x0800) {
                             if (cpu_state.eflags & VM_FLAG) {
-                                PUSHL(GS);
-                                PUSHL(FS);
-                                PUSHL(DS);
-                                PUSHL(ES);
+                                if (is586) {
+                                    PUSHL(GS);
+                                    PUSHL(FS);
+                                    PUSHL(DS);
+                                    PUSHL(ES);
+                                } else {
+                                    PUSHL_SEL(GS);
+                                    PUSHL_SEL(FS);
+                                    PUSHL_SEL(DS);
+                                    PUSHL_SEL(ES);
+                                }
                                 if (cpu_state.abrt)
                                     return;
                                 op_loadseg(0, &cpu_state.seg_ds);
@@ -1633,10 +1714,10 @@ pmodeint(int num, int soft)
                                 op_loadseg(0, &cpu_state.seg_fs);
                                 op_loadseg(0, &cpu_state.seg_gs);
                             }
-                            PUSHL(oldss);
+                            is586 ? PUSHL(oldss) : PUSHL_SEL(oldss);
                             PUSHL(oldsp);
                             PUSHL(cpu_state.flags | (cpu_state.eflags << 16));
-                            PUSHL(CS);
+                            is586 ? PUSHL(CS) : PUSHL_SEL(CS);
                             PUSHL(cpu_state.pc);
                             if (cpu_state.abrt)
                                 return;
@@ -1672,7 +1753,7 @@ pmodeint(int num, int soft)
                     }
                     if (type > 0x0800) {
                         PUSHL(cpu_state.flags | (cpu_state.eflags << 16));
-                        PUSHL(CS);
+                        is586 ? PUSHL(CS) : PUSHL_SEL(CS);
                         PUSHL(cpu_state.pc);
                         if (cpu_state.abrt)
                             return;
@@ -1920,6 +2001,12 @@ pmodeiret(int is32)
     }
 
     switch (segdat[2] & 0x1f00) {
+        case 0x1000:
+        case 0x1100:
+        case 0x1200:
+        case 0x1300:
+             /* Data segment, apparently valid when CPL is the same, used by MS CodeView for DOS. */
+             fallthrough;
         case 0x1800:
         case 0x1900:
         case 0x1a00:
@@ -2286,10 +2373,14 @@ taskswitch286(uint16_t seg, uint16_t *segdat, int is32)
         op_loadseg(new_fs, &cpu_state.seg_fs);
         op_loadseg(new_gs, &cpu_state.seg_gs);
 
-        rf_flag_no_clear = 1;
+        if (!cpu_use_exec)
+            rf_flag_no_clear = 1;
 
         if (t_bit) {
-            trap |= 2;
+            if (cpu_use_exec)
+                trap = 2;
+            else
+                trap |= 2;
 #ifdef USE_DYNAREC
             cpu_block_end = 1;
 #endif
@@ -2397,7 +2488,7 @@ taskswitch286(uint16_t seg, uint16_t *segdat, int is32)
             ldt.base |= (readmemb(0, templ + 7) << 24);
         }
 
-        if (!(new_cs & 0xfff8)) {
+        if (!(new_cs & 0xfff8) && !(new_cs & 0x0004)) {
             x86ts(NULL, 0);
             return;
         }
@@ -2469,7 +2560,8 @@ taskswitch286(uint16_t seg, uint16_t *segdat, int is32)
     tr.limit   = limit;
     tr.access  = segdat[2] >> 8;
     tr.ar_high = segdat[3] & 0xff;
-    dr[7] &= 0xFFFFFFAA;
+    if (!cpu_use_exec)
+        dr[7] &= 0xFFFFFFAA;
 }
 
 void
@@ -2513,19 +2605,17 @@ cyrix_load_seg_descriptor(uint32_t addr, x86seg *seg)
                 cpu_cur_status &= ~CPU_STATUS_NOTFLATDS;
             else
                 cpu_cur_status |= CPU_STATUS_NOTFLATDS;
-#ifdef USE_DYNAREC
-            codegen_flat_ds = 0;
-#endif
         }
+
+        if (seg == &cpu_state.seg_cs)
+            set_use32(segdat[3] & 0x40);
+
         if (seg == &cpu_state.seg_ss) {
             if (seg->base == 0 && seg->limit_low == 0 && seg->limit_high == 0xffffffff)
                 cpu_cur_status &= ~CPU_STATUS_NOTFLATSS;
             else
                 cpu_cur_status |= CPU_STATUS_NOTFLATSS;
             set_stack32((segdat[3] & 0x40) ? 1 : 0);
-#ifdef USE_DYNAREC
-            codegen_flat_ss = 0;
-#endif
         }
     }
 }
diff --git a/src/cpu/x87.c b/src/cpu/x87.c
index 1f7643453..fecca0772 100644
--- a/src/cpu/x87.c
+++ b/src/cpu/x87.c
@@ -14,31 +14,35 @@
 #include "x86_flags.h"
 #include "x86_ops.h"
 #include "x86seg_common.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include "386_common.h"
-#include "softfloat/softfloat-specialize.h"
+#include "softfloat3e/config.h"
+#include "softfloat3e/fpu_trans.h"
+#include "softfloat3e/specialize.h"
+#include <86box/plat_unused.h>
 
 uint32_t x87_pc_off;
 uint32_t x87_op_off;
 uint16_t x87_pc_seg;
 uint16_t x87_op_seg;
 
-#ifdef ENABLE_FPU_LOG
-int fpu_do_log = ENABLE_FPU_LOG;
+#ifdef ENABLE_FPU_X87_LOG
+int fpu_x87_do_log = ENABLE_FPU_X87_LOG;
 
 void
-fpu_log(const char *fmt, ...)
+fpu_x87_log(const char *fmt, ...)
 {
     va_list ap;
 
-    if (fpu_do_log) {
+    if (fpu_x87_do_log) {
         va_start(ap, fmt);
         pclog_ex(fmt, ap);
         va_end(ap);
     }
 }
 #else
-#    define fpu_log(fmt, ...)
+#    define fpu_x87_log(fmt, ...)
 #endif
 
 #ifdef USE_NEW_DYNAREC
@@ -106,24 +110,24 @@ x87_settag(uint16_t new_tag)
 }
 #endif
 
-static floatx80
-FPU_handle_NaN32_Func(floatx80 a, int aIsNaN, float32 b32, int bIsNaN, struct float_status_t *status)
+static extFloat80_t
+FPU_handle_NaN32_Func(extFloat80_t a, int aIsNaN, float32 b32, int bIsNaN, struct softfloat_status_t *status)
 {
-    int aIsSignalingNaN = floatx80_is_signaling_nan(a);
-    int bIsSignalingNaN = float32_is_signaling_nan(b32);
+    int aIsSignalingNaN = extF80_isSignalingNaN(a);
+    int bIsSignalingNaN = f32_isSignalingNaN(b32);
 
     if (aIsSignalingNaN | bIsSignalingNaN)
-        float_raise(status, float_flag_invalid);
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
 
     // propagate QNaN to SNaN
-    a = propagateFloatx80NaNOne(a, status);
+    a = softfloat_propagateNaNExtF80UI(a.signExp, a.signif, 0, 0, status);
 
     if (aIsNaN & !bIsNaN)
         return a;
 
     // float32 is NaN so conversion will propagate SNaN to QNaN and raise
     // appropriate exception flags
-    floatx80 b = float32_to_floatx80(b32, status);
+    extFloat80_t b = f32_to_extF80(b32, status);
 
     if (aIsSignalingNaN) {
         if (bIsSignalingNaN)
@@ -133,29 +137,33 @@ FPU_handle_NaN32_Func(floatx80 a, int aIsNaN, float32 b32, int bIsNaN, struct fl
         if (bIsSignalingNaN)
             return a;
 returnLargerSignificand:
-        if (a.fraction < b.fraction)
+        if (a.signif < b.signif)
             return b;
-        if (b.fraction < a.fraction)
+        if (b.signif < a.signif)
             return a;
-        return (a.exp < b.exp) ? a : b;
+        return (a.signExp < b.signExp) ? a : b;
     } else {
         return b;
     }
 }
 
 int
-FPU_handle_NaN32(floatx80 a, float32 b, floatx80 *r, struct float_status_t *status)
+FPU_handle_NaN32(extFloat80_t a, float32 b, extFloat80_t *r, struct softfloat_status_t *status)
 {
-    const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
+/*----------------------------------------------------------------------------
+| The pattern for a default generated extended double-precision NaN.
+*----------------------------------------------------------------------------*/
+    const floatx80 floatx80_default_nan =
+        packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
 
-    if (floatx80_is_unsupported(a)) {
-        float_raise(status, float_flag_invalid);
+    if (extF80_isUnsupported(a)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
         *r = floatx80_default_nan;
         return 1;
     }
 
-    int aIsNaN = floatx80_is_nan(a);
-    int bIsNaN = float32_is_nan(b);
+    int aIsNaN = extF80_isNaN(a);
+    int bIsNaN = f32_isNaN(b);
     if (aIsNaN | bIsNaN) {
         *r = FPU_handle_NaN32_Func(a, aIsNaN, b, bIsNaN, status);
         return 1;
@@ -163,24 +171,24 @@ FPU_handle_NaN32(floatx80 a, float32 b, floatx80 *r, struct float_status_t *stat
     return 0;
 }
 
-static floatx80
-FPU_handle_NaN64_Func(floatx80 a, int aIsNaN, float64 b64, int bIsNaN, struct float_status_t *status)
+static extFloat80_t
+FPU_handle_NaN64_Func(extFloat80_t a, int aIsNaN, float64 b64, int bIsNaN, struct softfloat_status_t *status)
 {
-    int aIsSignalingNaN = floatx80_is_signaling_nan(a);
-    int bIsSignalingNaN = float64_is_signaling_nan(b64);
+    int aIsSignalingNaN = extF80_isSignalingNaN(a);
+    int bIsSignalingNaN = f64_isSignalingNaN(b64);
 
     if (aIsSignalingNaN | bIsSignalingNaN)
-        float_raise(status, float_flag_invalid);
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
 
     // propagate QNaN to SNaN
-    a = propagateFloatx80NaNOne(a, status);
+    a = softfloat_propagateNaNExtF80UI(a.signExp, a.signif, 0, 0, status);
 
     if (aIsNaN & !bIsNaN)
         return a;
 
     // float64 is NaN so conversion will propagate SNaN to QNaN and raise
     // appropriate exception flags
-    floatx80 b = float64_to_floatx80(b64, status);
+    extFloat80_t b = f64_to_extF80(b64, status);
 
     if (aIsSignalingNaN) {
         if (bIsSignalingNaN)
@@ -190,29 +198,33 @@ FPU_handle_NaN64_Func(floatx80 a, int aIsNaN, float64 b64, int bIsNaN, struct fl
         if (bIsSignalingNaN)
             return a;
 returnLargerSignificand:
-        if (a.fraction < b.fraction)
+        if (a.signif < b.signif)
             return b;
-        if (b.fraction < a.fraction)
+        if (b.signif < a.signif)
             return a;
-        return (a.exp < b.exp) ? a : b;
+        return (a.signExp < b.signExp) ? a : b;
     } else {
         return b;
     }
 }
 
 int
-FPU_handle_NaN64(floatx80 a, float64 b, floatx80 *r, struct float_status_t *status)
+FPU_handle_NaN64(extFloat80_t a, float64 b, extFloat80_t *r, struct softfloat_status_t *status)
 {
-    const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
+/*----------------------------------------------------------------------------
+| The pattern for a default generated extended double-precision NaN.
+*----------------------------------------------------------------------------*/
+    const extFloat80_t floatx80_default_nan =
+        packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
 
-    if (floatx80_is_unsupported(a)) {
-        float_raise(status, float_flag_invalid);
+    if (extF80_isUnsupported(a)) {
+        softfloat_raiseFlags(status, softfloat_flag_invalid);
         *r = floatx80_default_nan;
         return 1;
     }
 
-    int aIsNaN = floatx80_is_nan(a);
-    int bIsNaN = float64_is_nan(b);
+    int aIsNaN = extF80_isNaN(a);
+    int bIsNaN = f64_isNaN(b);
     if (aIsNaN | bIsNaN) {
         *r = FPU_handle_NaN64_Func(a, aIsNaN, b, bIsNaN, status);
         return 1;
@@ -220,37 +232,36 @@ FPU_handle_NaN64(floatx80 a, float64 b, floatx80 *r, struct float_status_t *stat
     return 0;
 }
 
-struct float_status_t
+struct softfloat_status_t
 i387cw_to_softfloat_status_word(uint16_t control_word)
 {
-    struct float_status_t status;
+    struct softfloat_status_t status;
     int                   precision = control_word & FPU_CW_PC;
 
     switch (precision) {
         case FPU_PR_32_BITS:
-            status.float_rounding_precision = 32;
+            status.extF80_roundingPrecision = 32;
             break;
         case FPU_PR_64_BITS:
-            status.float_rounding_precision = 64;
+            status.extF80_roundingPrecision = 64;
             break;
         case FPU_PR_80_BITS:
-            status.float_rounding_precision = 80;
+            status.extF80_roundingPrecision = 80;
             break;
         default:
             /* With the precision control bits set to 01 "(reserved)", a
                real CPU behaves as if the precision control bits were
                set to 11 "80 bits" */
-            status.float_rounding_precision = 80;
+            status.extF80_roundingPrecision = 80;
             break;
     }
 
-    status.float_exception_flags    = 0; // clear exceptions before execution
-    status.float_nan_handling_mode  = float_first_operand_nan;
-    status.float_rounding_mode      = (control_word & FPU_CW_RC) >> 10;
-    status.flush_underflow_to_zero  = 0;
-    status.float_suppress_exception = 0;
-    status.float_exception_masks    = control_word & FPU_CW_Exceptions_Mask;
-    status.denormals_are_zeros      = 0;
+    status.softfloat_exceptionFlags             = 0; // clear exceptions before execution
+    status.softfloat_roundingMode               = (control_word & FPU_CW_RC) >> 10;
+    status.softfloat_flush_underflow_to_zero    = 0;
+    status.softfloat_suppressException          = 0;
+    status.softfloat_exceptionMasks             = control_word & FPU_CW_Exceptions_Mask;
+    status.softfloat_denormals_are_zeros        = 0;
     return status;
 }
 
@@ -258,17 +269,20 @@ int
 FPU_status_word_flags_fpu_compare(int float_relation)
 {
     switch (float_relation) {
-        case float_relation_unordered:
-            return (C0 | C2 | C3);
+        case softfloat_relation_unordered:
+            return (FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
 
-        case float_relation_greater:
+        case softfloat_relation_greater:
             return 0;
 
-        case float_relation_less:
-            return C0;
+        case softfloat_relation_less:
+            return FPU_SW_C0;
 
-        case float_relation_equal:
-            return C3;
+        case softfloat_relation_equal:
+            return FPU_SW_C3;
+
+        default:
+            break;
     }
 
     return (-1); // should never get here
@@ -278,18 +292,18 @@ void
 FPU_write_eflags_fpu_compare(int float_relation)
 {
     switch (float_relation) {
-        case float_relation_unordered:
+        case softfloat_relation_unordered:
             cpu_state.flags |= (Z_FLAG | P_FLAG | C_FLAG);
             break;
 
-        case float_relation_greater:
+        case softfloat_relation_greater:
             break;
 
-        case float_relation_less:
+        case softfloat_relation_less:
             cpu_state.flags |= C_FLAG;
             break;
 
-        case float_relation_equal:
+        case softfloat_relation_equal:
             cpu_state.flags |= Z_FLAG;
             break;
 
@@ -299,7 +313,7 @@ FPU_write_eflags_fpu_compare(int float_relation)
 }
 
 uint16_t
-FPU_exception(uint32_t fetchdat, uint16_t exceptions, int store)
+FPU_exception(UNUSED(uint32_t fetchdat), uint16_t exceptions, int store)
 {
     uint16_t status;
     uint16_t unmasked;
@@ -324,10 +338,10 @@ FPU_exception(uint32_t fetchdat, uint16_t exceptions, int store)
         // FPU_EX_Invalid cannot come with any other exception but x87 stack fault
         fpu_state.swd |= exceptions;
         if (exceptions & FPU_SW_Stack_Fault) {
-            if (!(exceptions & C1)) {
+            if (!(exceptions & FPU_SW_C1)) {
                 /* This bit distinguishes over- from underflow for a stack fault,
                    and roundup from round-down for precision loss. */
-                fpu_state.swd &= ~C1;
+                fpu_state.swd &= ~FPU_SW_C1;
             }
         }
         return unmasked;
@@ -342,7 +356,10 @@ FPU_exception(uint32_t fetchdat, uint16_t exceptions, int store)
                 nmi = 1;
             }
 #else
-            picint(1 << 13);
+           if (cr0 & 0x20)
+               new_ne = 1;
+           else
+               picint(1 << 13);
 #endif // FPU_8087
         }
         return unmasked;
@@ -359,10 +376,10 @@ FPU_exception(uint32_t fetchdat, uint16_t exceptions, int store)
     fpu_state.swd |= exceptions;
 
     if (exceptions & FPU_EX_Precision) {
-        if (!(exceptions & C1)) {
+        if (!(exceptions & FPU_SW_C1)) {
             /* This bit distinguishes over- from underflow for a stack fault,
                  and roundup from round-down for precision loss. */
-            fpu_state.swd &= ~C1;
+            fpu_state.swd &= ~FPU_SW_C1;
         }
     }
 
@@ -380,7 +397,7 @@ FPU_exception(uint32_t fetchdat, uint16_t exceptions, int store)
         if (!store)
             unmasked &= ~(FPU_EX_Underflow | FPU_EX_Overflow);
         else {
-            fpu_state.swd &= ~C1;
+            fpu_state.swd &= ~FPU_SW_C1;
             if (!(status & FPU_EX_Precision))
                 fpu_state.swd &= ~FPU_EX_Precision;
         }
@@ -391,7 +408,11 @@ FPU_exception(uint32_t fetchdat, uint16_t exceptions, int store)
 void
 FPU_stack_overflow(uint32_t fetchdat)
 {
-    const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
+/*----------------------------------------------------------------------------
+| The pattern for a default generated extended double-precision NaN.
+*----------------------------------------------------------------------------*/
+    const floatx80 floatx80_default_nan =
+        packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
 
     /* The masked response */
     if (is_IA_masked()) {
@@ -404,7 +425,11 @@ FPU_stack_overflow(uint32_t fetchdat)
 void
 FPU_stack_underflow(uint32_t fetchdat, int stnr, int pop_stack)
 {
-    const floatx80 floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
+/*----------------------------------------------------------------------------
+| The pattern for a default generated extended double-precision NaN.
+*----------------------------------------------------------------------------*/
+    const floatx80 floatx80_default_nan =
+        packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
 
     /* The masked response */
     if (is_IA_masked()) {
@@ -420,11 +445,11 @@ FPU_stack_underflow(uint32_t fetchdat, int stnr, int pop_stack)
  * rather than a kernel (ported by Kevin Lawton)
  * ------------------------------------------------------------ */
 int
-FPU_tagof(const floatx80 reg)
+FPU_tagof(const extFloat80_t reg)
 {
-    int32_t exp = floatx80_exp(reg);
+    int32_t exp = extF80_exp(reg);
     if (exp == 0) {
-        if (!floatx80_fraction(reg))
+        if (!extF80_fraction(reg))
             return X87_TAG_ZERO;
 
         /* The number is a de-normal or pseudodenormal. */
@@ -436,7 +461,7 @@ FPU_tagof(const floatx80 reg)
         return X87_TAG_INVALID;
     }
 
-    if (!(reg.fraction & BX_CONST64(0x8000000000000000))) {
+    if (!(reg.signif & BX_CONST64(0x8000000000000000))) {
         /* Unsupported data type. */
         /* Valid numbers have the ms bit set to 1. */
         return X87_TAG_INVALID;
@@ -516,28 +541,26 @@ unpack_FPU_TW(uint16_t tag_byte)
      */
 
     for (int index = 7; index >= 0; index--, twd <<= 2, tag_byte <<= 1) {
-        if (tag_byte & 0x80) {
-            const floatx80 *fpu_reg = &fpu_state.st_space[index & 7];
-            twd |= FPU_tagof(*fpu_reg);
-        } else {
+        if (tag_byte & 0x80)
+            twd |= FPU_tagof(fpu_state.st_space[index & 7]);
+        else
             twd |= X87_TAG_EMPTY;
-        }
     }
 
     return (twd >> 2);
 }
 
-#ifdef ENABLE_808X_LOG
+#ifdef ENABLE_FPU_X87_LOG
 void
 x87_dumpregs(void)
 {
     if (cpu_state.ismmx) {
-        fpu_log("MM0=%016llX\tMM1=%016llX\tMM2=%016llX\tMM3=%016llX\n", cpu_state.MM[0].q, cpu_state.MM[1].q, cpu_state.MM[2].q, cpu_state.MM[3].q);
-        fpu_log("MM4=%016llX\tMM5=%016llX\tMM6=%016llX\tMM7=%016llX\n", cpu_state.MM[4].q, cpu_state.MM[5].q, cpu_state.MM[6].q, cpu_state.MM[7].q);
+        fpu_x87_log("MM0=%016llX\tMM1=%016llX\tMM2=%016llX\tMM3=%016llX\n", cpu_state.MM[0].q, cpu_state.MM[1].q, cpu_state.MM[2].q, cpu_state.MM[3].q);
+        fpu_x87_log("MM4=%016llX\tMM5=%016llX\tMM6=%016llX\tMM7=%016llX\n", cpu_state.MM[4].q, cpu_state.MM[5].q, cpu_state.MM[6].q, cpu_state.MM[7].q);
     } else {
-        fpu_log("ST(0)=%f\tST(1)=%f\tST(2)=%f\tST(3)=%f\t\n", cpu_state.ST[cpu_state.TOP], cpu_state.ST[(cpu_state.TOP + 1) & 7], cpu_state.ST[(cpu_state.TOP + 2) & 7], cpu_state.ST[(cpu_state.TOP + 3) & 7]);
-        fpu_log("ST(4)=%f\tST(5)=%f\tST(6)=%f\tST(7)=%f\t\n", cpu_state.ST[(cpu_state.TOP + 4) & 7], cpu_state.ST[(cpu_state.TOP + 5) & 7], cpu_state.ST[(cpu_state.TOP + 6) & 7], cpu_state.ST[(cpu_state.TOP + 7) & 7]);
+        fpu_x87_log("ST(0)=%f\tST(1)=%f\tST(2)=%f\tST(3)=%f\t\n", cpu_state.ST[cpu_state.TOP], cpu_state.ST[(cpu_state.TOP + 1) & 7], cpu_state.ST[(cpu_state.TOP + 2) & 7], cpu_state.ST[(cpu_state.TOP + 3) & 7]);
+        fpu_x87_log("ST(4)=%f\tST(5)=%f\tST(6)=%f\tST(7)=%f\t\n", cpu_state.ST[(cpu_state.TOP + 4) & 7], cpu_state.ST[(cpu_state.TOP + 5) & 7], cpu_state.ST[(cpu_state.TOP + 6) & 7], cpu_state.ST[(cpu_state.TOP + 7) & 7]);
     }
-    fpu_log("Status = %04X  Control = %04X  Tag = %04X\n", cpu_state.npxs, cpu_state.npxc, x87_gettag());
+    fpu_x87_log("Status = %04X  Control = %04X  Tag = %04X\n", cpu_state.npxs, cpu_state.npxc, x87_gettag());
 }
 #endif
diff --git a/src/cpu/x87.h b/src/cpu/x87.h
index f4e24f1ca..4d53725c9 100644
--- a/src/cpu/x87.h
+++ b/src/cpu/x87.h
@@ -60,89 +60,80 @@ void     x87_settag(uint16_t new_tag);
 void codegen_set_rounding_mode(int mode);
 
 /* Status Word */
-#define FPU_SW_Backward        (0x8000) /* backward compatibility */
-#define FPU_SW_C3              (0x4000) /* condition bit 3 */
-#define FPU_SW_Top             (0x3800) /* top of stack */
-#define FPU_SW_C2              (0x0400) /* condition bit 2 */
-#define FPU_SW_C1              (0x0200) /* condition bit 1 */
-#define FPU_SW_C0              (0x0100) /* condition bit 0 */
-#define FPU_SW_Summary         (0x0080) /* exception summary */
-#define FPU_SW_Stack_Fault     (0x0040) /* stack fault */
-#define FPU_SW_Precision       (0x0020) /* loss of precision */
-#define FPU_SW_Underflow       (0x0010) /* underflow */
-#define FPU_SW_Overflow        (0x0008) /* overflow */
-#define FPU_SW_Zero_Div        (0x0004) /* divide by zero */
-#define FPU_SW_Denormal_Op     (0x0002) /* denormalized operand */
-#define FPU_SW_Invalid         (0x0001) /* invalid operation */
+#define FPU_SW_Backward        (0x8000)  /* backward compatibility */
+#define FPU_SW_C3              (0x4000)  /* condition bit 3 */
+#define FPU_SW_Top             (0x3800)  /* top of stack */
+#define FPU_SW_C2              (0x0400)  /* condition bit 2 */
+#define FPU_SW_C1              (0x0200)  /* condition bit 1 */
+#define FPU_SW_C0              (0x0100)  /* condition bit 0 */
+#define FPU_SW_Summary         (0x0080)  /* exception summary */
+#define FPU_SW_Stack_Fault     (0x0040)  /* stack fault */
+#define FPU_SW_Precision       (0x0020)  /* loss of precision */
+#define FPU_SW_Underflow       (0x0010)  /* underflow */
+#define FPU_SW_Overflow        (0x0008)  /* overflow */
+#define FPU_SW_Zero_Div        (0x0004)  /* divide by zero */
+#define FPU_SW_Denormal_Op     (0x0002)  /* denormalized operand */
+#define FPU_SW_Invalid         (0x0001)  /* invalid operation */
 
-#define C0                     (1 << 8)
-#define C1                     (1 << 9)
-#define C2                     (1 << 10)
-#define C3                     (1 << 14)
+#define FPU_SW_CC (FPU_SW_C0|FPU_SW_C1|FPU_SW_C2|FPU_SW_C3)
 
-#define FPU_SW_CC              (C0 | C1 | C2 | C3)
-
-#define FPU_SW_Exceptions_Mask (0x027f) /* status word exceptions bit mask */
+#define FPU_SW_Exceptions_Mask (0x027f)  /* status word exceptions bit mask */
 
 /* Exception flags: */
-#define FPU_EX_Precision (0x0020) /* loss of precision */
-#define FPU_EX_Underflow (0x0010) /* underflow */
-#define FPU_EX_Overflow  (0x0008) /* overflow */
-#define FPU_EX_Zero_Div  (0x0004) /* divide by zero */
-#define FPU_EX_Denormal  (0x0002) /* denormalized operand */
-#define FPU_EX_Invalid   (0x0001) /* invalid operation */
+#define FPU_EX_Precision    (0x0020)  /* loss of precision */
+#define FPU_EX_Underflow    (0x0010)  /* underflow */
+#define FPU_EX_Overflow     (0x0008)  /* overflow */
+#define FPU_EX_Zero_Div     (0x0004)  /* divide by zero */
+#define FPU_EX_Denormal     (0x0002)  /* denormalized operand */
+#define FPU_EX_Invalid      (0x0001)  /* invalid operation */
 
 /* Special exceptions: */
-#define FPU_EX_Stack_Overflow  (0x0041 | C1) /* stack overflow */
-#define FPU_EX_Stack_Underflow (0x0041)      /* stack underflow */
+#define FPU_EX_Stack_Overflow    (0x0041|FPU_SW_C1)     /* stack overflow */
+#define FPU_EX_Stack_Underflow   (0x0041)        /* stack underflow */
 
 /* precision control */
-#define FPU_EX_Precision_Lost_Up (EX_Precision | C1)
-#define FPU_EX_Precision_Lost_Dn (EX_Precision)
+#define FPU_EX_Precision_Lost_Up    (EX_Precision | SW_C1)
+#define FPU_EX_Precision_Lost_Dn    (EX_Precision)
 
-#define setcc(cc) \
-    fpu_state.swd = (fpu_state.swd & ~(FPU_SW_CC)) | ((cc) &FPU_SW_CC)
+#define setcc(cc)  \
+  fpu_state.swd = (fpu_state.swd & ~(FPU_SW_CC)) | ((cc) & FPU_SW_CC)
 
-#define clear_C1()            \
-    {                         \
-        fpu_state.swd &= ~C1; \
-    }
-#define clear_C2()            \
-    {                         \
-        fpu_state.swd &= ~C2; \
-    }
+#define clear_C1() { fpu_state.swd &= ~FPU_SW_C1; }
+#define clear_C2() { fpu_state.swd &= ~FPU_SW_C2; }
 
 /* ************ */
 /* Control Word */
 /* ************ */
 
-#define FPU_CW_Inf             (0x1000) /* infinity control, legacy */
+#define FPU_CW_Reserved_Bits    (0xe0c0)  /* reserved bits */
 
-#define FPU_CW_RC              (0x0C00) /* rounding control */
-#define FPU_CW_PC              (0x0300) /* precision control */
+#define FPU_CW_Inf		(0x1000)  /* infinity control, legacy */
 
-#define FPU_RC_RND             (0x0000) /* rounding control */
-#define FPU_RC_DOWN            (0x0400)
-#define FPU_RC_UP              (0x0800)
-#define FPU_RC_CHOP            (0x0C00)
+#define FPU_CW_RC		(0x0C00)  /* rounding control */
+#define FPU_CW_PC		(0x0300)  /* precision control */
 
-#define FPU_CW_Precision       (0x0020) /* loss of precision mask */
-#define FPU_CW_Underflow       (0x0010) /* underflow mask */
-#define FPU_CW_Overflow        (0x0008) /* overflow mask */
-#define FPU_CW_Zero_Div        (0x0004) /* divide by zero mask */
-#define FPU_CW_Denormal        (0x0002) /* denormalized operand mask */
-#define FPU_CW_Invalid         (0x0001) /* invalid operation mask */
+#define FPU_RC_RND		(0x0000)  /* rounding control */
+#define FPU_RC_DOWN		(0x0400)
+#define FPU_RC_UP		(0x0800)
+#define FPU_RC_CHOP		(0x0C00)
 
-#define FPU_CW_Exceptions_Mask (0x003f) /* all masks */
+#define FPU_CW_Precision	(0x0020)  /* loss of precision mask */
+#define FPU_CW_Underflow	(0x0010)  /* underflow mask */
+#define FPU_CW_Overflow		(0x0008)  /* overflow mask */
+#define FPU_CW_Zero_Div		(0x0004)  /* divide by zero mask */
+#define FPU_CW_Denormal		(0x0002)  /* denormalized operand mask */
+#define FPU_CW_Invalid		(0x0001)  /* invalid operation mask */
+
+#define FPU_CW_Exceptions_Mask 	(0x003f)  /* all masks */
 
 /* Precision control bits affect only the following:
    ADD, SUB(R), MUL, DIV(R), and SQRT */
-#define FPU_PR_32_BITS       (0x000)
-#define FPU_PR_RESERVED_BITS (0x100)
-#define FPU_PR_64_BITS       (0x200)
-#define FPU_PR_80_BITS       (0x300)
+#define FPU_PR_32_BITS          (0x000)
+#define FPU_PR_RESERVED_BITS    (0x100)
+#define FPU_PR_64_BITS          (0x200)
+#define FPU_PR_80_BITS          (0x300)
 
-#include "softfloat/softfloatx80.h"
+#include "softfloat3e/softfloat.h"
 
 static __inline int
 is_IA_masked(void)
@@ -150,15 +141,15 @@ is_IA_masked(void)
     return (fpu_state.cwd & FPU_CW_Invalid);
 }
 
-struct float_status_t i387cw_to_softfloat_status_word(uint16_t control_word);
+struct softfloat_status_t i387cw_to_softfloat_status_word(uint16_t control_word);
 uint16_t              FPU_exception(uint32_t fetchdat, uint16_t exceptions, int store);
 int                   FPU_status_word_flags_fpu_compare(int float_relation);
 void                  FPU_write_eflags_fpu_compare(int float_relation);
 void                  FPU_stack_overflow(uint32_t fetchdat);
 void                  FPU_stack_underflow(uint32_t fetchdat, int stnr, int pop_stack);
-int                   FPU_handle_NaN32(floatx80 a, float32 b, floatx80 *r, struct float_status_t *status);
-int                   FPU_handle_NaN64(floatx80 a, float64 b, floatx80 *r, struct float_status_t *status);
-int                   FPU_tagof(const floatx80 reg);
+int                   FPU_handle_NaN32(extFloat80_t a, float32 b, extFloat80_t *r, struct softfloat_status_t *status);
+int                   FPU_handle_NaN64(extFloat80_t a, float64 b, extFloat80_t *r, struct softfloat_status_t *status);
+int                   FPU_tagof(const extFloat80_t reg);
 uint8_t               pack_FPU_TW(uint16_t twd);
 uint16_t              unpack_FPU_TW(uint16_t tag_byte);
 
@@ -207,11 +198,11 @@ FPU_push(void)
 static __inline void
 FPU_pop(void)
 {
-    fpu_state.tag |= 3 << (fpu_state.tos * 2);
+    fpu_state.tag |= (3 << (fpu_state.tos * 2));
     fpu_state.tos = (fpu_state.tos + 1) & 7;
 }
 
-static __inline floatx80
+static __inline extFloat80_t
 FPU_read_regi(int stnr)
 {
     return fpu_state.st_space[(stnr + fpu_state.tos) & 7];
@@ -221,14 +212,14 @@ FPU_read_regi(int stnr)
 // instructions like FNSAVE, and they update tag word to its
 // real value anyway
 static __inline void
-FPU_save_regi(floatx80 reg, int stnr)
+FPU_save_regi(extFloat80_t reg, int stnr)
 {
     fpu_state.st_space[(stnr + fpu_state.tos) & 7] = reg;
     FPU_settagi_valid(stnr);
 }
 
 static __inline void
-FPU_save_regi_tag(floatx80 reg, int tag, int stnr)
+FPU_save_regi_tag(extFloat80_t reg, int tag, int stnr)
 {
     fpu_state.st_space[(stnr + fpu_state.tos) & 7] = reg;
     FPU_settagi(tag, stnr);
@@ -237,12 +228,10 @@ FPU_save_regi_tag(floatx80 reg, int tag, int stnr)
 #define FPU_check_pending_exceptions()        \
     do {                                      \
         if (fpu_state.swd & FPU_SW_Summary) { \
-            if (cr0 & 0x20) {                 \
-                x86_int(16);                  \
-                return 1;                     \
-            } else {                          \
+            if (cr0 & 0x20)                   \
+                new_ne = 1;                   \
+            else                              \
                 picint(1 << 13);              \
-                return 1;                     \
-            }                                 \
+            return 1;                         \
         }                                     \
     } while (0)
diff --git a/src/cpu/x87_ops.h b/src/cpu/x87_ops.h
index 1d9220255..1e4504949 100644
--- a/src/cpu/x87_ops.h
+++ b/src/cpu/x87_ops.h
@@ -22,6 +22,20 @@
  */
 #include <math.h>
 #include <fenv.h>
+#if defined(_MSC_VER) && !defined(__clang__)
+#    if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86
+#        define X87_INLINE_ASM
+#    endif
+#else
+#    if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86 || defined _M_X64 || defined __amd64__
+#        define X87_INLINE_ASM
+#    endif
+#endif
+
+#ifdef X87_INLINE_ASM
+#include <immintrin.h>
+#endif
+
 #include "x87_timings.h"
 #ifdef _MSC_VER
 #    include <intrin.h>
@@ -36,21 +50,25 @@ extern void fpu_log(const char *fmt, ...);
 #    endif
 #endif
 
+extern double exp_pow_table[0x800];
+
+#ifndef X87_INLINE_ASM
 static int rounding_modes[4] = { FE_TONEAREST, FE_DOWNWARD, FE_UPWARD, FE_TOWARDZERO };
+#endif
 
 #define ST(x)             cpu_state.ST[((cpu_state.TOP + (x)) & 7)]
 
-#define C0                (1 << 8)
-#define C1                (1 << 9)
-#define C2                (1 << 10)
-#define C3                (1 << 14)
+#define FPU_SW_C3         (0x4000)  /* condition bit 3 */
+#define FPU_SW_C2         (0x0400)  /* condition bit 2 */
+#define FPU_SW_C1         (0x0200)  /* condition bit 1 */
+#define FPU_SW_C0         (0x0100)  /* condition bit 0 */
 
 #define X87_TAG_VALID     0
 #define X87_TAG_ZERO      1
 #define X87_TAG_INVALID   2
 #define X87_TAG_EMPTY     3
 
-#define STATUS_ZERODIVIDE 4
+#define FPU_SW_Zero_Div   (0x0004)  /* divide by zero */
 
 typedef union {
     double d;
@@ -62,22 +80,12 @@ typedef union {
     };
 } double_decompose_t;
 
-#if defined(_MSC_VER) && !defined(__clang__)
-#    if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86
-#        define X87_INLINE_ASM
-#    endif
-#else
-#    if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86 || defined _M_X64 || defined __amd64__
-#        define X87_INLINE_ASM
-#    endif
-#endif
-
 #ifdef FPU_8087
 #    define x87_div(dst, src1, src2)                    \
         do {                                            \
             if (((double) src2) == 0.0) {               \
-                cpu_state.npxs |= STATUS_ZERODIVIDE;    \
-                if (cpu_state.npxc & STATUS_ZERODIVIDE) \
+                cpu_state.npxs |= FPU_SW_Zero_Div;      \
+                if (cpu_state.npxc & FPU_SW_Zero_Div)   \
                     dst = src1 / (double) src2;         \
                 else {                                  \
                     fpu_log("FPU : divide by zero\n");  \
@@ -94,12 +102,15 @@ typedef union {
 #    define x87_div(dst, src1, src2)                    \
         do {                                            \
             if (((double) src2) == 0.0) {               \
-                cpu_state.npxs |= STATUS_ZERODIVIDE;    \
-                if (cpu_state.npxc & STATUS_ZERODIVIDE) \
+                cpu_state.npxs |= FPU_SW_Zero_Div;      \
+                if (cpu_state.npxc & FPU_SW_Zero_Div)   \
                     dst = src1 / (double) src2;         \
                 else {                                  \
                     fpu_log("FPU : divide by zero\n");  \
-                    picint(1 << 13);                    \
+                    if (cr0 & 0x20)                     \
+                        new_ne = 1;                     \
+                    else                                \
+                        picint(1 << 13);                \
                     return 1;                           \
                 }                                       \
             } else                                      \
@@ -107,12 +118,6 @@ typedef union {
         } while (0)
 #endif
 
-static __inline void
-x87_checkexceptions(void)
-{
-    //
-}
-
 static __inline void
 x87_push(double i)
 {
@@ -244,6 +249,24 @@ x87_fround32_64(double b)
     return (int64_t) x87_fround32(b);
 }
 
+static __inline int64_t
+x87_fround_nearest(double b)
+{
+    double da, dc;
+    int64_t a, c;
+    
+    da = floor(b);
+    dc = floor(b + 1.0);
+    a = (int64_t) da;
+    c = (int64_t) dc;
+    if ((b - a) < (c - b))
+        return a;
+    else if ((b - a) > (c - b))
+        return c;
+    else
+        return (a & 1) ? c : a;
+}
+
 static __inline int64_t
 x87_fround(double b)
 {
@@ -366,7 +389,7 @@ x87_compare(double a, double b)
 
     /* Hack to make CHKCOP happy. */
     if (!memcmp(&ea, &ia, 8) && !memcmp(&eb, &ib, 8))
-        return C3;
+        return FPU_SW_C3;
 
     if ((fpu_type < FPU_287XL) && !(cpu_state.npxc & 0x1000) && ((a == INFINITY) || (a == -INFINITY)) && ((b == INFINITY) || (b == -INFINITY)))
         eb = ea;
@@ -399,20 +422,28 @@ x87_compare(double a, double b)
     }
 #    endif
 
-    return result & (C0 | C2 | C3);
+    return result & (FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
 #else
     /* Generic C version is known to give incorrect results in some
      * situations, eg comparison of infinity (Unreal) */
     uint32_t result = 0;
     double   ea = a, eb = b;
+    const uint64_t ia = 0x3fec1a6ff866a936ULL;
+    const uint64_t ib = 0x3fec1a6ff866a938ULL;
+
+    /* Hack to make CHKCOP happy. */
+    if (!memcmp(&ea, &ia, 8) && !memcmp(&eb, &ib, 8))
+        return FPU_SW_C3;
 
     if ((fpu_type < FPU_287XL) && !(cpu_state.npxc & 0x1000) && ((a == INFINITY) || (a == -INFINITY)) && ((b == INFINITY) || (b == -INFINITY)))
         eb = ea;
 
-    if (ea == eb)
-        result |= C3;
+    if ((isnan(a) || isnan(b)))
+        result |= FPU_SW_C3 | FPU_SW_C2 | FPU_SW_C0;
+    else if (ea == eb)
+        result |= FPU_SW_C3;
     else if (ea < eb)
-        result |= C0;
+        result |= FPU_SW_C0;
 
     return result;
 #endif
@@ -452,16 +483,18 @@ x87_ucompare(double a, double b)
     }
 #    endif
 
-    return result & (C0 | C2 | C3);
+    return result & (FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
 #else
     /* Generic C version is known to give incorrect results in some
      * situations, eg comparison of infinity (Unreal) */
     uint32_t result = 0;
 
-    if (a == b)
-        result |= C3;
+    if ((isnan(a) || isnan(b)))
+        result |= FPU_SW_C3 | FPU_SW_C2 | FPU_SW_C0;
+    else if (a == b)
+        result |= FPU_SW_C3;
     else if (a < b)
-        result |= C0;
+        result |= FPU_SW_C0;
 
     return result;
 #endif
@@ -503,7 +536,8 @@ typedef union {
 #    define FP_TAG_VALID_N cpu_state.tag[(cpu_state.TOP + 1) & 7] &= ~TAG_UINT64
 #endif
 
-#include "softfloat/softfloat-specialize.h"
+#include "softfloat3e/softfloat-specialize.h"
+#include "softfloat3e/fpu_trans.h"
 
 #include "x87_ops_sf_arith.h"
 #include "x87_ops_sf_compare.h"
@@ -544,10 +578,10 @@ op_nofpu_a32(uint32_t fetchdat)
 
 #ifdef FPU_8087
 static int
-FPU_ILLEGAL_a16(uint32_t fetchdat)
+FPU_ILLEGAL_a16(UNUSED(uint32_t fetchdat))
 {
     geteaw();
-    wait(timing_rr, 0);
+    wait_cycs(timing_rr, 0);
     return 0;
 }
 #else
@@ -797,7 +831,7 @@ const OpFn OP_TABLE(sf_fpu_8087_df)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,
         sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,
         sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,
         sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,
         sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,
@@ -806,7 +840,7 @@ const OpFn OP_TABLE(sf_fpu_8087_df)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,
         sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,
         sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,
         sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,
         sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,
@@ -815,7 +849,7 @@ const OpFn OP_TABLE(sf_fpu_8087_df)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,
         sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,
         sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,
         sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,
         sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,
@@ -1055,7 +1089,7 @@ const OpFn OP_TABLE(fpu_8087_df)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,
         opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,
         opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,
         FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,
         FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,
@@ -1064,7 +1098,7 @@ const OpFn OP_TABLE(fpu_8087_df)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,
         opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,
         opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,
         FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,
         FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,
@@ -1073,7 +1107,7 @@ const OpFn OP_TABLE(fpu_8087_df)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,
         opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,
         opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,
         FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,
         FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,
@@ -1093,10 +1127,10 @@ const OpFn OP_TABLE(fpu_8087_df)[256] = {
 
 const OpFn OP_TABLE(sf_fpu_d8_a16)[32] = {
     // clang-format off
-        sf_FADDs_a16, sf_FMULs_a16, sf_FCOMs_a16, sf_FCOMPs_a16, sf_FSUBs_a16, sf_FSUBRs_a16, sf_FDIVs_a16, sf_FDIVRs_a16,
-        sf_FADDs_a16, sf_FMULs_a16, sf_FCOMs_a16, sf_FCOMPs_a16, sf_FSUBs_a16, sf_FSUBRs_a16, sf_FDIVs_a16, sf_FDIVRs_a16,
-        sf_FADDs_a16, sf_FMULs_a16, sf_FCOMs_a16, sf_FCOMPs_a16, sf_FSUBs_a16, sf_FSUBRs_a16, sf_FDIVs_a16, sf_FDIVRs_a16,
-        sf_FADD_st0_stj,      sf_FMUL_st0_stj,      sf_FCOM_sti,      sf_FCOMP_sti,      sf_FSUB_st0_stj,      sf_FSUBR_st0_stj,      sf_FDIV_st0_stj,      sf_FDIVR_st0_stj,
+    /*0x00*/    sf_FADDs_a16, sf_FMULs_a16, sf_FCOMs_a16, sf_FCOMPs_a16, sf_FSUBs_a16, sf_FSUBRs_a16, sf_FDIVs_a16, sf_FDIVRs_a16,
+    /*0x08*/    sf_FADDs_a16, sf_FMULs_a16, sf_FCOMs_a16, sf_FCOMPs_a16, sf_FSUBs_a16, sf_FSUBRs_a16, sf_FDIVs_a16, sf_FDIVRs_a16,
+    /*0x10*/    sf_FADDs_a16, sf_FMULs_a16, sf_FCOMs_a16, sf_FCOMPs_a16, sf_FSUBs_a16, sf_FSUBRs_a16, sf_FDIVs_a16, sf_FDIVRs_a16,
+    /*0x18*/    sf_FADD_st0_stj,      sf_FMUL_st0_stj,      sf_FCOM_sti,      sf_FCOMP_sti,      sf_FSUB_st0_stj,      sf_FSUBR_st0_stj,      sf_FDIV_st0_stj,      sf_FDIVR_st0_stj,
     // clang-format on
 };
 
@@ -1191,41 +1225,41 @@ const OpFn OP_TABLE(sf_fpu_287_d9_a32)[256] = {
 
 const OpFn OP_TABLE(sf_fpu_d9_a16)[256] = {
     // clang-format off
-        sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,
-        sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,
-        sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16,
-        sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,
-        sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16,
-        sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,
+    /*0x00*/    sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,
+    /*0x08*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x10*/    sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,
+    /*0x18*/    sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,
+    /*0x20*/    sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16,
+    /*0x28*/    sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,
+    /*0x30*/    sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16,
+    /*0x38*/    sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,
 
-        sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,
-        sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,
-        sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16,
-        sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,
-        sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16,
-        sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,
+    /*0x40*/    sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,
+    /*0x48*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x50*/    sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,
+    /*0x58*/    sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,
+    /*0x60*/    sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16,
+    /*0x68*/    sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,
+    /*0x70*/    sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16,
+    /*0x78*/    sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,
 
-        sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,
-        sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,
-        sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16,
-        sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,
-        sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16,
-        sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,
+    /*0x80*/    sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,
+    /*0x88*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x90*/    sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,
+    /*0x98*/    sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,
+    /*0xa0*/    sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16,
+    /*0xa8*/    sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,
+    /*0xb0*/    sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16,
+    /*0xb8*/    sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,
 
-        sf_FLD_sti,        sf_FLD_sti,        sf_FLD_sti,        sf_FLD_sti,        sf_FLD_sti,        sf_FLD_sti,        sf_FLD_sti,        sf_FLD_sti,
-        sf_FXCH_sti,       sf_FXCH_sti,       sf_FXCH_sti,       sf_FXCH_sti,       sf_FXCH_sti,       sf_FXCH_sti,       sf_FXCH_sti,       sf_FXCH_sti,
-        sf_FNOP,       ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FSTP_sti,       sf_FSTP_sti,       sf_FSTP_sti,       sf_FSTP_sti,       sf_FSTP_sti,       sf_FSTP_sti,       sf_FSTP_sti,       sf_FSTP_sti,  /*Invalid*/
-        sf_FCHS,       sf_FABS,       ILLEGAL_a16,  ILLEGAL_a16,  sf_FTST,       sf_FXAM,       ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FLD1,       sf_FLDL2T,     sf_FLDL2E,     sf_FLDPI,      sf_FLDEG2,     sf_FLDLN2,     sf_FLDZ,       ILLEGAL_a16,
-        sf_F2XM1,      sf_FYL2X,      sf_FPTAN,      sf_FPATAN,     sf_FXTRACT,  sf_FPREM1,     sf_FDECSTP,    sf_FINCSTP,
-        sf_FPREM,      sf_FYL2XP1,    sf_FSQRT,      sf_FSINCOS,    sf_FRNDINT,    sf_FSCALE,     sf_FSIN,       sf_FCOS,
+    /*0xc0*/    sf_FLD_sti,    sf_FLD_sti,    sf_FLD_sti,   sf_FLD_sti,    sf_FLD_sti,   sf_FLD_sti,   sf_FLD_sti,  sf_FLD_sti,
+    /*0xc8*/    sf_FXCH_sti,   sf_FXCH_sti,   sf_FXCH_sti,  sf_FXCH_sti,   sf_FXCH_sti,  sf_FXCH_sti,  sf_FXCH_sti, sf_FXCH_sti,
+    /*0xd0*/    sf_FNOP,       ILLEGAL_a16,   ILLEGAL_a16,  ILLEGAL_a16,   ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16, ILLEGAL_a16,
+    /*0xd8*/    sf_FSTP_sti,   sf_FSTP_sti,   sf_FSTP_sti,  sf_FSTP_sti,   sf_FSTP_sti,  sf_FSTP_sti,  sf_FSTP_sti, sf_FSTP_sti,  /*Invalid*/
+    /*0xe0*/    sf_FCHS,       sf_FABS,       ILLEGAL_a16,  ILLEGAL_a16,   sf_FTST,      sf_FXAM,      ILLEGAL_a16, ILLEGAL_a16,
+    /*0xe8*/    sf_FLD1,       sf_FLDL2T,     sf_FLDL2E,    sf_FLDPI,      sf_FLDEG2,    sf_FLDLN2,    sf_FLDZ,     ILLEGAL_a16,
+    /*0xf0*/    sf_F2XM1,      sf_FYL2X,      sf_FPTAN,     sf_FPATAN,     sf_FXTRACT,   sf_FPREM1,    sf_FDECSTP,  sf_FINCSTP,
+    /*0xf8*/    sf_FPREM,      sf_FYL2XP1,    sf_FSQRT,     sf_FSINCOS,    sf_FRNDINT,   sf_FSCALE,    sf_FSIN,     sf_FCOS,
     // clang-format on
 };
 
@@ -1269,6 +1303,86 @@ const OpFn OP_TABLE(sf_fpu_d9_a32)[256] = {
     // clang-format on
 };
 
+const OpFn OP_TABLE(sf_fpu_cyrix_d9_a16)[256] = {
+    // clang-format off
+    /*0x00*/    sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,
+    /*0x08*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x10*/    sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,
+    /*0x18*/    sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,
+    /*0x20*/    sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16,
+    /*0x28*/    sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,
+    /*0x30*/    sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16,
+    /*0x38*/    sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,
+
+    /*0x40*/    sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,
+    /*0x48*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x50*/    sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,
+    /*0x58*/    sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,
+    /*0x60*/    sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16,
+    /*0x68*/    sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,
+    /*0x70*/    sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16,
+    /*0x78*/    sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,
+
+    /*0x80*/    sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,   sf_FLDs_a16,
+    /*0x88*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x90*/    sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,   sf_FSTs_a16,
+    /*0x98*/    sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,  sf_FSTPs_a16,
+    /*0xa0*/    sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16, sf_FLDENV_a16,
+    /*0xa8*/    sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,  sf_FLDCW_a16,
+    /*0xb0*/    sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16, sf_FNSTENV_a16,
+    /*0xb8*/    sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,  sf_FNSTCW_a16,
+
+    /*0xc0*/    sf_FLD_sti,    sf_FLD_sti,    sf_FLD_sti,   sf_FLD_sti,    sf_FLD_sti,   sf_FLD_sti,   sf_FLD_sti,  sf_FLD_sti,
+    /*0xc8*/    sf_FXCH_sti,   sf_FXCH_sti,   sf_FXCH_sti,  sf_FXCH_sti,   sf_FXCH_sti,  sf_FXCH_sti,  sf_FXCH_sti, sf_FXCH_sti,
+    /*0xd0*/    sf_FNOP,       ILLEGAL_a16,   ILLEGAL_a16,  ILLEGAL_a16,   ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16, ILLEGAL_a16,
+    /*0xd8*/    sf_FSTP_sti,   sf_FSTP_sti,   sf_FSTP_sti,  sf_FSTP_sti,   sf_FSTP_sti,  sf_FSTP_sti,  sf_FSTP_sti, sf_FSTP_sti,  /*Invalid*/
+    /*0xe0*/    sf_FCHS,       sf_FABS,       ILLEGAL_a16,  ILLEGAL_a16,   sf_FTST,      sf_FXAM,      sf_FTSTP,    ILLEGAL_a16,
+    /*0xe8*/    sf_FLD1,       sf_FLDL2T,     sf_FLDL2E,    sf_FLDPI,      sf_FLDEG2,    sf_FLDLN2,    sf_FLDZ,     ILLEGAL_a16,
+    /*0xf0*/    sf_F2XM1,      sf_FYL2X,      sf_FPTAN,     sf_FPATAN,     sf_FXTRACT,   sf_FPREM1,    sf_FDECSTP,  sf_FINCSTP,
+    /*0xf8*/    sf_FPREM,      sf_FYL2XP1,    sf_FSQRT,     sf_FSINCOS,    sf_FRNDINT,   sf_FSCALE,    sf_FSIN,     sf_FCOS,
+    // clang-format on
+};
+
+const OpFn OP_TABLE(sf_fpu_cyrix_d9_a32)[256] = {
+    // clang-format off
+        sf_FLDs_a32,   sf_FLDs_a32,   sf_FLDs_a32,   sf_FLDs_a32,   sf_FLDs_a32,   sf_FLDs_a32,   sf_FLDs_a32,   sf_FLDs_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FSTs_a32,   sf_FSTs_a32,   sf_FSTs_a32,   sf_FSTs_a32,   sf_FSTs_a32,   sf_FSTs_a32,   sf_FSTs_a32,   sf_FSTs_a32,
+        sf_FSTPs_a32,  sf_FSTPs_a32,  sf_FSTPs_a32,  sf_FSTPs_a32,  sf_FSTPs_a32,  sf_FSTPs_a32,  sf_FSTPs_a32,  sf_FSTPs_a32,
+        sf_FLDENV_a32, sf_FLDENV_a32, sf_FLDENV_a32, sf_FLDENV_a32, sf_FLDENV_a32, sf_FLDENV_a32, sf_FLDENV_a32, sf_FLDENV_a32,
+        sf_FLDCW_a32,  sf_FLDCW_a32,  sf_FLDCW_a32,  sf_FLDCW_a32,  sf_FLDCW_a32,  sf_FLDCW_a32,  sf_FLDCW_a32,  sf_FLDCW_a32,
+        sf_FNSTENV_a32, sf_FNSTENV_a32, sf_FNSTENV_a32, sf_FNSTENV_a32, sf_FNSTENV_a32, sf_FNSTENV_a32, sf_FNSTENV_a32, sf_FNSTENV_a32,
+        sf_FNSTCW_a32,  sf_FNSTCW_a32,  sf_FNSTCW_a32,  sf_FNSTCW_a32,  sf_FNSTCW_a32,  sf_FNSTCW_a32,  sf_FNSTCW_a32,  sf_FNSTCW_a32,
+
+        sf_FLDs_a32,   sf_FLDs_a32,   sf_FLDs_a32,   sf_FLDs_a32,   sf_FLDs_a32,   sf_FLDs_a32,   sf_FLDs_a32,   sf_FLDs_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FSTs_a32,   sf_FSTs_a32,   sf_FSTs_a32,   sf_FSTs_a32,   sf_FSTs_a32,   sf_FSTs_a32,   sf_FSTs_a32,   sf_FSTs_a32,
+        sf_FSTPs_a32,  sf_FSTPs_a32,  sf_FSTPs_a32,  sf_FSTPs_a32,  sf_FSTPs_a32,  sf_FSTPs_a32,  sf_FSTPs_a32,  sf_FSTPs_a32,
+        sf_FLDENV_a32, sf_FLDENV_a32, sf_FLDENV_a32, sf_FLDENV_a32, sf_FLDENV_a32, sf_FLDENV_a32, sf_FLDENV_a32, sf_FLDENV_a32,
+        sf_FLDCW_a32,  sf_FLDCW_a32,  sf_FLDCW_a32,  sf_FLDCW_a32,  sf_FLDCW_a32,  sf_FLDCW_a32,  sf_FLDCW_a32,  sf_FLDCW_a32,
+        sf_FNSTENV_a32, sf_FNSTENV_a32, sf_FNSTENV_a32, sf_FNSTENV_a32, sf_FNSTENV_a32, sf_FNSTENV_a32, sf_FNSTENV_a32, sf_FNSTENV_a32,
+        sf_FNSTCW_a32,  sf_FNSTCW_a32,  sf_FNSTCW_a32,  sf_FNSTCW_a32,  sf_FNSTCW_a32,  sf_FNSTCW_a32,  sf_FNSTCW_a32,  sf_FNSTCW_a32,
+
+        sf_FLDs_a32,   sf_FLDs_a32,   sf_FLDs_a32,   sf_FLDs_a32,   sf_FLDs_a32,   sf_FLDs_a32,   sf_FLDs_a32,   sf_FLDs_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FSTs_a32,   sf_FSTs_a32,   sf_FSTs_a32,   sf_FSTs_a32,   sf_FSTs_a32,   sf_FSTs_a32,   sf_FSTs_a32,   sf_FSTs_a32,
+        sf_FSTPs_a32,  sf_FSTPs_a32,  sf_FSTPs_a32,  sf_FSTPs_a32,  sf_FSTPs_a32,  sf_FSTPs_a32,  sf_FSTPs_a32,  sf_FSTPs_a32,
+        sf_FLDENV_a32, sf_FLDENV_a32, sf_FLDENV_a32, sf_FLDENV_a32, sf_FLDENV_a32, sf_FLDENV_a32, sf_FLDENV_a32, sf_FLDENV_a32,
+        sf_FLDCW_a32,  sf_FLDCW_a32,  sf_FLDCW_a32,  sf_FLDCW_a32,  sf_FLDCW_a32,  sf_FLDCW_a32,  sf_FLDCW_a32,  sf_FLDCW_a32,
+        sf_FNSTENV_a32, sf_FNSTENV_a32, sf_FNSTENV_a32, sf_FNSTENV_a32, sf_FNSTENV_a32, sf_FNSTENV_a32, sf_FNSTENV_a32, sf_FNSTENV_a32,
+        sf_FNSTCW_a32,  sf_FNSTCW_a32,  sf_FNSTCW_a32,  sf_FNSTCW_a32,  sf_FNSTCW_a32,  sf_FNSTCW_a32,  sf_FNSTCW_a32,  sf_FNSTCW_a32,
+
+        sf_FLD_sti,        sf_FLD_sti,        sf_FLD_sti,        sf_FLD_sti,        sf_FLD_sti,        sf_FLD_sti,        sf_FLD_sti,        sf_FLD_sti,
+        sf_FXCH_sti,       sf_FXCH_sti,       sf_FXCH_sti,       sf_FXCH_sti,       sf_FXCH_sti,       sf_FXCH_sti,       sf_FXCH_sti,       sf_FXCH_sti,
+        sf_FNOP,       ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FSTP_sti,       sf_FSTP_sti,       sf_FSTP_sti,       sf_FSTP_sti,       sf_FSTP_sti,       sf_FSTP_sti,       sf_FSTP_sti,       sf_FSTP_sti,  /*Invalid*/
+        sf_FCHS,       sf_FABS,       ILLEGAL_a32,  ILLEGAL_a32,  sf_FTST,       sf_FXAM,       sf_FTSTP,        ILLEGAL_a32,
+        sf_FLD1,       sf_FLDL2T,     sf_FLDL2E,     sf_FLDPI,      sf_FLDEG2,     sf_FLDLN2,     sf_FLDZ,       ILLEGAL_a32,
+        sf_F2XM1,      sf_FYL2X,      sf_FPTAN,      sf_FPATAN,     sf_FXTRACT,  sf_FPREM1,     sf_FDECSTP,    sf_FINCSTP,
+        sf_FPREM,      sf_FYL2XP1,    sf_FSQRT,      sf_FSINCOS,    sf_FRNDINT,    sf_FSCALE,     sf_FSIN,       sf_FCOS,
+    // clang-format on
+};
+
 const OpFn OP_TABLE(sf_fpu_287_da_a16)[256] = {
     // clang-format off
         sf_FADDil_a16,  sf_FADDil_a16,  sf_FADDil_a16,  sf_FADDil_a16,  sf_FADDil_a16,  sf_FADDil_a16,  sf_FADDil_a16,  sf_FADDil_a16,
@@ -1593,41 +1707,41 @@ const OpFn OP_TABLE(sf_fpu_287_db_a32)[256] = {
 
 const OpFn OP_TABLE(sf_fpu_db_a16)[256] = {
     // clang-format off
-        sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,
-        sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,
+    /*0x00*/    sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,
+    /*0x08*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x10*/    sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,
+    /*0x18*/    sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16,
+    /*0x20*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x28*/    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,
+    /*0x30*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x38*/    sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,
 
-        sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,
-        sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,
+    /*0x40*/    sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,
+    /*0x48*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x50*/    sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,
+    /*0x58*/    sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16,
+    /*0x60*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x68*/    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,
+    /*0x70*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x78*/    sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,
 
-        sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,
-        sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,
+    /*0x80*/    sf_FILDil_a16, sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,
+    /*0x88*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x90*/    sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,
+    /*0x98*/    sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16,
+    /*0xa0*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xa8*/    sf_FLDe_a16,  sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,
+    /*0xb0*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xb8*/    sf_FSTPe_a16, sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,
 
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FNOP,        sf_FNOP,        sf_FNCLEX,       sf_FNINIT,       sf_FNOP,        sf_FNOP,        ILLEGAL_a16,       ILLEGAL_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xc0*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xc8*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xd0*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xd8*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xe0*/    sf_FNOP,      sf_FNOP,      sf_FNCLEX,    sf_FNINIT,    sf_FNOP,      sf_FNOP,      ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xe8*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xf0*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xf8*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
     // clang-format on
 };
 
@@ -1752,6 +1866,87 @@ const OpFn OP_TABLE(sf_fpu_686_db_a32)[256] = {
 };
 #    endif
 
+#    ifndef OPS_286_386
+const OpFn OP_TABLE(sf_fpu_cyrix_686_db_a16)[256] = {
+    // clang-format off
+        sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,
+        sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,
+
+        sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,
+        sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,
+
+        sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,  sf_FILDil_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,  sf_FISTil_a16,
+        sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16, sf_FISTPil_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,    sf_FLDe_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,   sf_FSTPe_a16,
+
+        sf_FCMOVNB,     sf_FCMOVNB,     sf_FCMOVNB,     sf_FCMOVNB,     sf_FCMOVNB,     sf_FCMOVNB,     sf_FCMOVNB,     sf_FCMOVNB,
+        sf_FCMOVNE,     sf_FCMOVNE,     sf_FCMOVNE,     sf_FCMOVNE,     sf_FCMOVNE,     sf_FCMOVNE,     sf_FCMOVNE,     sf_FCMOVNE,
+        sf_FCMOVNBE,    sf_FCMOVNBE,    sf_FCMOVNBE,    sf_FCMOVNBE,    sf_FCMOVNBE,    sf_FCMOVNBE,    sf_FCMOVNBE,    sf_FCMOVNBE,
+        sf_FCMOVNU,     sf_FCMOVNU,     sf_FCMOVNU,     sf_FCMOVNU,     sf_FCMOVNU,     sf_FCMOVNU,     sf_FCMOVNU,     sf_FCMOVNU,
+        sf_FNOP,        sf_FNOP,        sf_FNCLEX,       sf_FNINIT,       sf_FNOP,        sf_FNOP,        ILLEGAL_a16,       ILLEGAL_a16,
+        sf_FUCOMI_st0_stj,      sf_FUCOMI_st0_stj,      sf_FUCOMI_st0_stj,      sf_FUCOMI_st0_stj,      sf_FUCOMI_st0_stj,      sf_FUCOMI_st0_stj,      sf_FUCOMI_st0_stj,      sf_FUCOMI_st0_stj,
+        sf_FCOMI_st0_stj,       sf_FCOMI_st0_stj,       sf_FCOMI_st0_stj,       sf_FCOMI_st0_stj,       sf_FCOMI_st0_stj,       sf_FCOMI_st0_stj,       sf_FCOMI_st0_stj,       sf_FCOMI_st0_stj,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  sf_FRINT2,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    // clang-format on
+};
+const OpFn OP_TABLE(sf_fpu_cyrix_686_db_a32)[256] = {
+    // clang-format off
+        sf_FILDil_a32,  sf_FILDil_a32,  sf_FILDil_a32,  sf_FILDil_a32,  sf_FILDil_a32,  sf_FILDil_a32,  sf_FILDil_a32,  sf_FILDil_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FISTil_a32,  sf_FISTil_a32,  sf_FISTil_a32,  sf_FISTil_a32,  sf_FISTil_a32,  sf_FISTil_a32,  sf_FISTil_a32,  sf_FISTil_a32,
+        sf_FISTPil_a32, sf_FISTPil_a32, sf_FISTPil_a32, sf_FISTPil_a32, sf_FISTPil_a32, sf_FISTPil_a32, sf_FISTPil_a32, sf_FISTPil_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FLDe_a32,    sf_FLDe_a32,    sf_FLDe_a32,    sf_FLDe_a32,    sf_FLDe_a32,    sf_FLDe_a32,    sf_FLDe_a32,    sf_FLDe_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FSTPe_a32,   sf_FSTPe_a32,   sf_FSTPe_a32,   sf_FSTPe_a32,   sf_FSTPe_a32,   sf_FSTPe_a32,   sf_FSTPe_a32,   sf_FSTPe_a32,
+
+        sf_FILDil_a32,  sf_FILDil_a32,  sf_FILDil_a32,  sf_FILDil_a32,  sf_FILDil_a32,  sf_FILDil_a32,  sf_FILDil_a32,  sf_FILDil_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FISTil_a32,  sf_FISTil_a32,  sf_FISTil_a32,  sf_FISTil_a32,  sf_FISTil_a32,  sf_FISTil_a32,  sf_FISTil_a32,  sf_FISTil_a32,
+        sf_FISTPil_a32, sf_FISTPil_a32, sf_FISTPil_a32, sf_FISTPil_a32, sf_FISTPil_a32, sf_FISTPil_a32, sf_FISTPil_a32, sf_FISTPil_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FLDe_a32,    sf_FLDe_a32,    sf_FLDe_a32,    sf_FLDe_a32,    sf_FLDe_a32,    sf_FLDe_a32,    sf_FLDe_a32,    sf_FLDe_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FSTPe_a32,   sf_FSTPe_a32,   sf_FSTPe_a32,   sf_FSTPe_a32,   sf_FSTPe_a32,   sf_FSTPe_a32,   sf_FSTPe_a32,   sf_FSTPe_a32,
+
+        sf_FILDil_a32,  sf_FILDil_a32,  sf_FILDil_a32,  sf_FILDil_a32,  sf_FILDil_a32,  sf_FILDil_a32,  sf_FILDil_a32,  sf_FILDil_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FISTil_a32,  sf_FISTil_a32,  sf_FISTil_a32,  sf_FISTil_a32,  sf_FISTil_a32,  sf_FISTil_a32,  sf_FISTil_a32,  sf_FISTil_a32,
+        sf_FISTPil_a32, sf_FISTPil_a32, sf_FISTPil_a32, sf_FISTPil_a32, sf_FISTPil_a32, sf_FISTPil_a32, sf_FISTPil_a32, sf_FISTPil_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FLDe_a32,    sf_FLDe_a32,    sf_FLDe_a32,    sf_FLDe_a32,    sf_FLDe_a32,    sf_FLDe_a32,    sf_FLDe_a32,    sf_FLDe_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FSTPe_a32,   sf_FSTPe_a32,   sf_FSTPe_a32,   sf_FSTPe_a32,   sf_FSTPe_a32,   sf_FSTPe_a32,   sf_FSTPe_a32,   sf_FSTPe_a32,
+
+        sf_FCMOVNB,     sf_FCMOVNB,     sf_FCMOVNB,     sf_FCMOVNB,     sf_FCMOVNB,     sf_FCMOVNB,     sf_FCMOVNB,     sf_FCMOVNB,
+        sf_FCMOVNE,     sf_FCMOVNE,     sf_FCMOVNE,     sf_FCMOVNE,     sf_FCMOVNE,     sf_FCMOVNE,     sf_FCMOVNE,     sf_FCMOVNE,
+        sf_FCMOVNBE,    sf_FCMOVNBE,    sf_FCMOVNBE,    sf_FCMOVNBE,    sf_FCMOVNBE,    sf_FCMOVNBE,    sf_FCMOVNBE,    sf_FCMOVNBE,
+        sf_FCMOVNU,     sf_FCMOVNU,     sf_FCMOVNU,     sf_FCMOVNU,     sf_FCMOVNU,     sf_FCMOVNU,     sf_FCMOVNU,     sf_FCMOVNU,
+        sf_FNOP,        sf_FNOP,        sf_FNCLEX,       sf_FNINIT,       sf_FNOP,        sf_FNOP,        ILLEGAL_a32,       ILLEGAL_a32,
+        sf_FUCOMI_st0_stj,      sf_FUCOMI_st0_stj,      sf_FUCOMI_st0_stj,      sf_FUCOMI_st0_stj,      sf_FUCOMI_st0_stj,      sf_FUCOMI_st0_stj,      sf_FUCOMI_st0_stj,      sf_FUCOMI_st0_stj,
+        sf_FCOMI_st0_stj,       sf_FCOMI_st0_stj,       sf_FCOMI_st0_stj,       sf_FCOMI_st0_stj,       sf_FCOMI_st0_stj,       sf_FCOMI_st0_stj,       sf_FCOMI_st0_stj,       sf_FCOMI_st0_stj,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  sf_FRINT2,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+    // clang-format on
+};
+#    endif
+
 const OpFn OP_TABLE(sf_fpu_287_dc_a16)[32] = {
     // clang-format off
         sf_FADDd_a16, sf_FMULd_a16, sf_FCOMd_a16, sf_FCOMPd_a16, sf_FSUBd_a16, sf_FSUBRd_a16, sf_FDIVd_a16, sf_FDIVRd_a16,
@@ -1870,41 +2065,41 @@ const OpFn OP_TABLE(sf_fpu_287_dd_a32)[256] = {
 
 const OpFn OP_TABLE(sf_fpu_dd_a16)[256] = {
     // clang-format off
-        sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,
-        sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,
-        sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,
-        sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,
+    /*0x00*/    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,
+    /*0x08*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x10*/    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,
+    /*0x18*/    sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,
+    /*0x20*/    sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,
+    /*0x28*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x30*/    sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,
+    /*0x38*/    sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,
 
-        sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,
-        sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,
-        sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,
-        sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,
+    /*0x40*/    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,
+    /*0x48*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x50*/    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,
+    /*0x58*/    sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,
+    /*0x60*/    sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,
+    /*0x68*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x70*/    sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,
+    /*0x78*/    sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,
 
-        sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,
-        sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,
-        sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,
-        sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,
+    /*0x80*/    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,
+    /*0x88*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x90*/    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,
+    /*0x98*/    sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,
+    /*0xa0*/    sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,
+    /*0xa8*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xb0*/    sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,
+    /*0xb8*/    sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,
 
-        sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,
-        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,
-        sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,
-        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,
-        sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,
-        sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xc0*/    sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,
+    /*0xc8*/    sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,
+    /*0xd0*/    sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,
+    /*0xd8*/    sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,
+    /*0xe0*/    sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,
+    /*0xe8*/    sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,
+    /*0xf0*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xf8*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
     // clang-format on
 };
 
@@ -1948,6 +2143,86 @@ const OpFn OP_TABLE(sf_fpu_dd_a32)[256] = {
     // clang-format on
 };
 
+const OpFn OP_TABLE(sf_fpu_cyrix_dd_a16)[256] = {
+    // clang-format off
+    /*0x00*/    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,
+    /*0x08*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x10*/    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,
+    /*0x18*/    sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,
+    /*0x20*/    sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,
+    /*0x28*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x30*/    sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,
+    /*0x38*/    sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,
+
+    /*0x40*/    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,
+    /*0x48*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x50*/    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,
+    /*0x58*/    sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,
+    /*0x60*/    sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,
+    /*0x68*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x70*/    sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,
+    /*0x78*/    sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,
+
+    /*0x80*/    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,    sf_FLDd_a16,
+    /*0x88*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x90*/    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,    sf_FSTd_a16,
+    /*0x98*/    sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,   sf_FSTPd_a16,
+    /*0xa0*/    sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,   sf_FRSTOR_a16,
+    /*0xa8*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xb0*/    sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,   sf_FNSAVE_a16,
+    /*0xb8*/    sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,   sf_FNSTSW_a16,
+
+    /*0xc0*/    sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,
+    /*0xc8*/    sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,
+    /*0xd0*/    sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,
+    /*0xd8*/    sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,
+    /*0xe0*/    sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,
+    /*0xe8*/    sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,
+    /*0xf0*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xf8*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  sf_FRICHOP,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    // clang-format on
+};
+
+const OpFn OP_TABLE(sf_fpu_cyrix_dd_a32)[256] = {
+    // clang-format off
+        sf_FLDd_a32,    sf_FLDd_a32,    sf_FLDd_a32,    sf_FLDd_a32,    sf_FLDd_a32,    sf_FLDd_a32,    sf_FLDd_a32,    sf_FLDd_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FSTd_a32,    sf_FSTd_a32,    sf_FSTd_a32,    sf_FSTd_a32,    sf_FSTd_a32,    sf_FSTd_a32,    sf_FSTd_a32,    sf_FSTd_a32,
+        sf_FSTPd_a32,   sf_FSTPd_a32,   sf_FSTPd_a32,   sf_FSTPd_a32,   sf_FSTPd_a32,   sf_FSTPd_a32,   sf_FSTPd_a32,   sf_FSTPd_a32,
+        sf_FRSTOR_a32,   sf_FRSTOR_a32,   sf_FRSTOR_a32,   sf_FRSTOR_a32,   sf_FRSTOR_a32,   sf_FRSTOR_a32,   sf_FRSTOR_a32,   sf_FRSTOR_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FNSAVE_a32,   sf_FNSAVE_a32,   sf_FNSAVE_a32,   sf_FNSAVE_a32,   sf_FNSAVE_a32,   sf_FNSAVE_a32,   sf_FNSAVE_a32,   sf_FNSAVE_a32,
+        sf_FNSTSW_a32,   sf_FNSTSW_a32,   sf_FNSTSW_a32,   sf_FNSTSW_a32,   sf_FNSTSW_a32,   sf_FNSTSW_a32,   sf_FNSTSW_a32,   sf_FNSTSW_a32,
+
+        sf_FLDd_a32,    sf_FLDd_a32,    sf_FLDd_a32,    sf_FLDd_a32,    sf_FLDd_a32,    sf_FLDd_a32,    sf_FLDd_a32,    sf_FLDd_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FSTd_a32,    sf_FSTd_a32,    sf_FSTd_a32,    sf_FSTd_a32,    sf_FSTd_a32,    sf_FSTd_a32,    sf_FSTd_a32,    sf_FSTd_a32,
+        sf_FSTPd_a32,   sf_FSTPd_a32,   sf_FSTPd_a32,   sf_FSTPd_a32,   sf_FSTPd_a32,   sf_FSTPd_a32,   sf_FSTPd_a32,   sf_FSTPd_a32,
+        sf_FRSTOR_a32,   sf_FRSTOR_a32,   sf_FRSTOR_a32,   sf_FRSTOR_a32,   sf_FRSTOR_a32,   sf_FRSTOR_a32,   sf_FRSTOR_a32,   sf_FRSTOR_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FNSAVE_a32,   sf_FNSAVE_a32,   sf_FNSAVE_a32,   sf_FNSAVE_a32,   sf_FNSAVE_a32,   sf_FNSAVE_a32,   sf_FNSAVE_a32,   sf_FNSAVE_a32,
+        sf_FNSTSW_a32,   sf_FNSTSW_a32,   sf_FNSTSW_a32,   sf_FNSTSW_a32,   sf_FNSTSW_a32,   sf_FNSTSW_a32,   sf_FNSTSW_a32,   sf_FNSTSW_a32,
+
+        sf_FLDd_a32,    sf_FLDd_a32,    sf_FLDd_a32,    sf_FLDd_a32,    sf_FLDd_a32,    sf_FLDd_a32,    sf_FLDd_a32,    sf_FLDd_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FSTd_a32,    sf_FSTd_a32,    sf_FSTd_a32,    sf_FSTd_a32,    sf_FSTd_a32,    sf_FSTd_a32,    sf_FSTd_a32,    sf_FSTd_a32,
+        sf_FSTPd_a32,   sf_FSTPd_a32,   sf_FSTPd_a32,   sf_FSTPd_a32,   sf_FSTPd_a32,   sf_FSTPd_a32,   sf_FSTPd_a32,   sf_FSTPd_a32,
+        sf_FRSTOR_a32,   sf_FRSTOR_a32,   sf_FRSTOR_a32,   sf_FRSTOR_a32,   sf_FRSTOR_a32,   sf_FRSTOR_a32,   sf_FRSTOR_a32,   sf_FRSTOR_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FNSAVE_a32,   sf_FNSAVE_a32,   sf_FNSAVE_a32,   sf_FNSAVE_a32,   sf_FNSAVE_a32,   sf_FNSAVE_a32,   sf_FNSAVE_a32,   sf_FNSAVE_a32,
+        sf_FNSTSW_a32,   sf_FNSTSW_a32,   sf_FNSTSW_a32,   sf_FNSTSW_a32,   sf_FNSTSW_a32,   sf_FNSTSW_a32,   sf_FNSTSW_a32,   sf_FNSTSW_a32,
+
+        sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,       sf_FFREE_sti,
+        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,
+        sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,         sf_FST_sti,
+        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,
+        sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,       sf_FUCOM_sti,
+        sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,      sf_FUCOMP_sti,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  sf_FRICHOP,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+    // clang-format on
+};
+
 const OpFn OP_TABLE(sf_fpu_287_de_a16)[256] = {
     // clang-format off
         sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,
@@ -2030,41 +2305,41 @@ const OpFn OP_TABLE(sf_fpu_287_de_a32)[256] = {
 
 const OpFn OP_TABLE(sf_fpu_de_a16)[256] = {
     // clang-format off
-        sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,
-        sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,
-        sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,
-        sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16,
-        sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,
-        sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16,
-        sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,
-        sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16,
+    /*0x00*/    sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,
+    /*0x08*/    sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,
+    /*0x10*/    sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,
+    /*0x18*/    sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16,
+    /*0x20*/    sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,
+    /*0x28*/    sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16,
+    /*0x30*/    sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,
+    /*0x38*/    sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16,
 
-        sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,
-        sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,
-        sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,
-        sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16,
-        sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,
-        sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16,
-        sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,
-        sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16,
+    /*0x40*/    sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,
+    /*0x48*/    sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,
+    /*0x50*/    sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,
+    /*0x58*/    sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16,
+    /*0x60*/    sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,
+    /*0x68*/    sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16,
+    /*0x70*/    sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,
+    /*0x78*/    sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16,
 
-        sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,
-        sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,
-        sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,
-        sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16,
-        sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,
-        sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16,
-        sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,
-        sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16,
+    /*0x80*/    sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,  sf_FADDiw_a16,
+    /*0x88*/    sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,  sf_FMULiw_a16,
+    /*0x90*/    sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,  sf_FCOMiw_a16,
+    /*0x98*/    sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16, sf_FCOMPiw_a16,
+    /*0xa0*/    sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,  sf_FSUBiw_a16,
+    /*0xa8*/    sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16, sf_FSUBRiw_a16,
+    /*0xb0*/    sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,  sf_FDIViw_a16,
+    /*0xb8*/    sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16, sf_FDIVRiw_a16,
 
-        sf_FADDP_sti_st0,       sf_FADDP_sti_st0,       sf_FADDP_sti_st0,       sf_FADDP_sti_st0,       sf_FADDP_sti_st0,       sf_FADDP_sti_st0,       sf_FADDP_sti_st0,       sf_FADDP_sti_st0,
-        sf_FMULP_sti_st0,       sf_FMULP_sti_st0,       sf_FMULP_sti_st0,       sf_FMULP_sti_st0,       sf_FMULP_sti_st0,       sf_FMULP_sti_st0,       sf_FMULP_sti_st0,       sf_FMULP_sti_st0,
-        sf_FCOMP_sti,       sf_FCOMP_sti,       sf_FCOMP_sti,       sf_FCOMP_sti,       sf_FCOMP_sti,       sf_FCOMP_sti,       sf_FCOMP_sti,       sf_FCOMP_sti,
-        ILLEGAL_a16,  sf_FCOMPP,     ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FSUBRP_sti_st0,      sf_FSUBRP_sti_st0,      sf_FSUBRP_sti_st0,      sf_FSUBRP_sti_st0,      sf_FSUBRP_sti_st0,      sf_FSUBRP_sti_st0,      sf_FSUBRP_sti_st0,      sf_FSUBRP_sti_st0,
-        sf_FSUBP_sti_st0,       sf_FSUBP_sti_st0,       sf_FSUBP_sti_st0,       sf_FSUBP_sti_st0,       sf_FSUBP_sti_st0,       sf_FSUBP_sti_st0,       sf_FSUBP_sti_st0,       sf_FSUBP_sti_st0,
-        sf_FDIVRP_sti_st0,      sf_FDIVRP_sti_st0,      sf_FDIVRP_sti_st0,      sf_FDIVRP_sti_st0,      sf_FDIVRP_sti_st0,      sf_FDIVRP_sti_st0,      sf_FDIVRP_sti_st0,      sf_FDIVRP_sti_st0,
-        sf_FDIVP_sti_st0,       sf_FDIVP_sti_st0,       sf_FDIVP_sti_st0,       sf_FDIVP_sti_st0,       sf_FDIVP_sti_st0,       sf_FDIVP_sti_st0,       sf_FDIVP_sti_st0,       sf_FDIVP_sti_st0,
+    /*0xc0*/    sf_FADDP_sti_st0,       sf_FADDP_sti_st0,       sf_FADDP_sti_st0,       sf_FADDP_sti_st0,       sf_FADDP_sti_st0,       sf_FADDP_sti_st0,       sf_FADDP_sti_st0,       sf_FADDP_sti_st0,
+    /*0xc8*/    sf_FMULP_sti_st0,       sf_FMULP_sti_st0,       sf_FMULP_sti_st0,       sf_FMULP_sti_st0,       sf_FMULP_sti_st0,       sf_FMULP_sti_st0,       sf_FMULP_sti_st0,       sf_FMULP_sti_st0,
+    /*0xd0*/    sf_FCOMP_sti,       sf_FCOMP_sti,       sf_FCOMP_sti,       sf_FCOMP_sti,       sf_FCOMP_sti,       sf_FCOMP_sti,       sf_FCOMP_sti,       sf_FCOMP_sti,
+    /*0xd8*/    ILLEGAL_a16,  sf_FCOMPP,     ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xe0*/    sf_FSUBRP_sti_st0,      sf_FSUBRP_sti_st0,      sf_FSUBRP_sti_st0,      sf_FSUBRP_sti_st0,      sf_FSUBRP_sti_st0,      sf_FSUBRP_sti_st0,      sf_FSUBRP_sti_st0,      sf_FSUBRP_sti_st0,
+    /*0xe8*/    sf_FSUBP_sti_st0,       sf_FSUBP_sti_st0,       sf_FSUBP_sti_st0,       sf_FSUBP_sti_st0,       sf_FSUBP_sti_st0,       sf_FSUBP_sti_st0,       sf_FSUBP_sti_st0,       sf_FSUBP_sti_st0,
+    /*0xf0*/    sf_FDIVRP_sti_st0,      sf_FDIVRP_sti_st0,      sf_FDIVRP_sti_st0,      sf_FDIVRP_sti_st0,      sf_FDIVRP_sti_st0,      sf_FDIVRP_sti_st0,      sf_FDIVRP_sti_st0,      sf_FDIVRP_sti_st0,
+    /*0xf8*/    sf_FDIVP_sti_st0,       sf_FDIVP_sti_st0,       sf_FDIVP_sti_st0,       sf_FDIVP_sti_st0,       sf_FDIVP_sti_st0,       sf_FDIVP_sti_st0,       sf_FDIVP_sti_st0,       sf_FDIVP_sti_st0,
     // clang-format on
 };
 
@@ -2114,7 +2389,7 @@ const OpFn OP_TABLE(sf_fpu_287_df_a16)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,
         sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,
         sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,
         sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,
         sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,
@@ -2123,7 +2398,7 @@ const OpFn OP_TABLE(sf_fpu_287_df_a16)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,
         sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,
         sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,
         sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,
         sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,
@@ -2132,7 +2407,7 @@ const OpFn OP_TABLE(sf_fpu_287_df_a16)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,
         sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,
         sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,
         sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,
         sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,
@@ -2154,7 +2429,7 @@ const OpFn OP_TABLE(sf_fpu_287_df_a32)[256] = {
         ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
         sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,
         sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32,
-        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,
         sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,
         sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,
         sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,
@@ -2163,7 +2438,7 @@ const OpFn OP_TABLE(sf_fpu_287_df_a32)[256] = {
         ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
         sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,
         sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32,
-        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,
         sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,
         sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,
         sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,
@@ -2172,7 +2447,7 @@ const OpFn OP_TABLE(sf_fpu_287_df_a32)[256] = {
         ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
         sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,
         sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32,
-        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,
         sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,
         sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,
         sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,
@@ -2190,41 +2465,41 @@ const OpFn OP_TABLE(sf_fpu_287_df_a32)[256] = {
 
 const OpFn OP_TABLE(sf_fpu_df_a16)[256] = {
     // clang-format off
-        sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,
-        sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,
-        sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,
-        sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,
+    /*0x00*/    sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,
+    /*0x08*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x10*/    sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,
+    /*0x18*/    sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16,
+    /*0x20*/    sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,
+    /*0x28*/    sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,
+    /*0x30*/    sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,
+    /*0x38*/    sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,
 
-        sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,
-        sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,
-        sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,
-        sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,
+    /*0x40*/    sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,
+    /*0x48*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x50*/    sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,
+    /*0x58*/    sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16,
+    /*0x60*/    sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,
+    /*0x68*/    sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,
+    /*0x70*/    sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,
+    /*0x78*/    sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,
 
-        sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,
-        sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,
-        sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,
-        sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,
+    /*0x80*/    sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,
+    /*0x88*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0x90*/    sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,
+    /*0x98*/    sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16,
+    /*0xa0*/    sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,
+    /*0xa8*/    sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,
+    /*0xb0*/    sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,
+    /*0xb8*/    sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,
 
-        sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,
-        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,
-        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,
-        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,
-        sf_FNSTSW_AX,   ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xc0*/    sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,
+    /*0xc8*/    sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,
+    /*0xd0*/    sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,
+    /*0xd8*/    sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,
+    /*0xe0*/    sf_FNSTSW_AX,   ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xe8*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xf0*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    /*0xf8*/    ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
     // clang-format on
 };
 
@@ -2234,7 +2509,7 @@ const OpFn OP_TABLE(sf_fpu_df_a32)[256] = {
         ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
         sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,
         sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32,
-        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,
         sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,
         sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,
         sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,
@@ -2243,7 +2518,7 @@ const OpFn OP_TABLE(sf_fpu_df_a32)[256] = {
         ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
         sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,
         sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32,
-        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,
         sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,
         sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,
         sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,
@@ -2252,7 +2527,7 @@ const OpFn OP_TABLE(sf_fpu_df_a32)[256] = {
         ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
         sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,
         sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32,
-        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,
         sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,
         sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,
         sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,
@@ -2275,7 +2550,7 @@ const OpFn OP_TABLE(sf_fpu_686_df_a16)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,
         sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,
         sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,
         sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,
         sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,
@@ -2284,7 +2559,7 @@ const OpFn OP_TABLE(sf_fpu_686_df_a16)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,
         sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,
         sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,
         sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,
         sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,
@@ -2293,7 +2568,7 @@ const OpFn OP_TABLE(sf_fpu_686_df_a16)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,
         sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,
         sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,
         sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,
         sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,
@@ -2315,7 +2590,7 @@ const OpFn OP_TABLE(sf_fpu_686_df_a32)[256] = {
         ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
         sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,
         sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32,
-        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,
         sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,
         sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,
         sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,
@@ -2324,7 +2599,7 @@ const OpFn OP_TABLE(sf_fpu_686_df_a32)[256] = {
         ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
         sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,
         sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32,
-        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,
         sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,
         sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,
         sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,
@@ -2333,7 +2608,7 @@ const OpFn OP_TABLE(sf_fpu_686_df_a32)[256] = {
         ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
         sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,
         sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32,
-        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,
         sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,
         sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,
         sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,
@@ -2350,6 +2625,88 @@ const OpFn OP_TABLE(sf_fpu_686_df_a32)[256] = {
 };
 #    endif
 
+#    ifndef OPS_286_386
+const OpFn OP_TABLE(sf_fpu_cyrix_686_df_a16)[256] = {
+    // clang-format off
+        sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,
+        sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16,
+        sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,
+        sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,
+        sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,
+        sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,
+
+        sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,
+        sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16,
+        sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,
+        sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,
+        sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,
+        sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,
+
+        sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,  sf_FILDiw_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,  sf_FISTiw_a16,
+        sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16, sf_FISTPiw_a16,
+        sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,     sf_FBLD_PACKED_BCD_a16,
+        sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,  sf_FILDiq_a16,
+        sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,     sf_FBSTP_PACKED_BCD_a16,
+        sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,   sf_FISTPiq_a16,
+
+        sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,
+        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,
+        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,
+        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,
+        sf_FNSTSW_AX,   ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        sf_FUCOMIP_st0_stj,     sf_FUCOMIP_st0_stj,     sf_FUCOMIP_st0_stj,     sf_FUCOMIP_st0_stj,     sf_FUCOMIP_st0_stj,     sf_FUCOMIP_st0_stj,     sf_FUCOMIP_st0_stj,     sf_FUCOMIP_st0_stj,
+        sf_FCOMIP_st0_stj,      sf_FCOMIP_st0_stj,      sf_FCOMIP_st0_stj,      sf_FCOMIP_st0_stj,      sf_FCOMIP_st0_stj,      sf_FCOMIP_st0_stj,      sf_FCOMIP_st0_stj,      sf_FCOMIP_st0_stj,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  sf_FRINEAR,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    // clang-format on
+};
+
+const OpFn OP_TABLE(sf_fpu_cyrix_686_df_a32)[256] = {
+    // clang-format off
+        sf_FILDiw_a32,  sf_FILDiw_a32,  sf_FILDiw_a32,  sf_FILDiw_a32,  sf_FILDiw_a32,  sf_FILDiw_a32,  sf_FILDiw_a32,  sf_FILDiw_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,
+        sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32,
+        sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,
+        sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,
+        sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,
+        sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,
+
+        sf_FILDiw_a32,  sf_FILDiw_a32,  sf_FILDiw_a32,  sf_FILDiw_a32,  sf_FILDiw_a32,  sf_FILDiw_a32,  sf_FILDiw_a32,  sf_FILDiw_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,
+        sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32,
+        sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,
+        sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,
+        sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,
+        sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,
+
+        sf_FILDiw_a32,  sf_FILDiw_a32,  sf_FILDiw_a32,  sf_FILDiw_a32,  sf_FILDiw_a32,  sf_FILDiw_a32,  sf_FILDiw_a32,  sf_FILDiw_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,  sf_FISTiw_a32,
+        sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32, sf_FISTPiw_a32,
+        sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,     sf_FBLD_PACKED_BCD_a32,
+        sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,  sf_FILDiq_a32,
+        sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,     sf_FBSTP_PACKED_BCD_a32,
+        sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,   sf_FISTPiq_a32,
+
+        sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,      sf_FFREEP_sti,
+        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,        sf_FXCH_sti,
+        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,
+        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,        sf_FSTP_sti,
+        sf_FNSTSW_AX,   ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        sf_FUCOMIP_st0_stj,     sf_FUCOMIP_st0_stj,     sf_FUCOMIP_st0_stj,     sf_FUCOMIP_st0_stj,     sf_FUCOMIP_st0_stj,     sf_FUCOMIP_st0_stj,     sf_FUCOMIP_st0_stj,     sf_FUCOMIP_st0_stj,
+        sf_FCOMIP_st0_stj,      sf_FCOMIP_st0_stj,      sf_FCOMIP_st0_stj,      sf_FCOMIP_st0_stj,      sf_FCOMIP_st0_stj,      sf_FCOMIP_st0_stj,      sf_FCOMIP_st0_stj,      sf_FCOMIP_st0_stj,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  sf_FRINEAR,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+    // clang-format on
+};
+#    endif
+
 const OpFn OP_TABLE(fpu_d8_a16)[32] = {
     // clang-format off
         opFADDs_a16, opFMULs_a16, opFCOMs_a16, opFCOMPs_a16, opFSUBs_a16, opFSUBRs_a16, opFDIVs_a16, opFDIVRs_a16,
@@ -2528,6 +2885,86 @@ const OpFn OP_TABLE(fpu_d9_a32)[256] = {
     // clang-format on
 };
 
+const OpFn OP_TABLE(fpu_cyrix_d9_a16)[256] = {
+    // clang-format off
+        opFLDs_a16,   opFLDs_a16,   opFLDs_a16,   opFLDs_a16,   opFLDs_a16,   opFLDs_a16,   opFLDs_a16,   opFLDs_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFSTs_a16,   opFSTs_a16,   opFSTs_a16,   opFSTs_a16,   opFSTs_a16,   opFSTs_a16,   opFSTs_a16,   opFSTs_a16,
+        opFSTPs_a16,  opFSTPs_a16,  opFSTPs_a16,  opFSTPs_a16,  opFSTPs_a16,  opFSTPs_a16,  opFSTPs_a16,  opFSTPs_a16,
+        opFLDENV_a16, opFLDENV_a16, opFLDENV_a16, opFLDENV_a16, opFLDENV_a16, opFLDENV_a16, opFLDENV_a16, opFLDENV_a16,
+        opFLDCW_a16,  opFLDCW_a16,  opFLDCW_a16,  opFLDCW_a16,  opFLDCW_a16,  opFLDCW_a16,  opFLDCW_a16,  opFLDCW_a16,
+        opFSTENV_a16, opFSTENV_a16, opFSTENV_a16, opFSTENV_a16, opFSTENV_a16, opFSTENV_a16, opFSTENV_a16, opFSTENV_a16,
+        opFSTCW_a16,  opFSTCW_a16,  opFSTCW_a16,  opFSTCW_a16,  opFSTCW_a16,  opFSTCW_a16,  opFSTCW_a16,  opFSTCW_a16,
+
+        opFLDs_a16,   opFLDs_a16,   opFLDs_a16,   opFLDs_a16,   opFLDs_a16,   opFLDs_a16,   opFLDs_a16,   opFLDs_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFSTs_a16,   opFSTs_a16,   opFSTs_a16,   opFSTs_a16,   opFSTs_a16,   opFSTs_a16,   opFSTs_a16,   opFSTs_a16,
+        opFSTPs_a16,  opFSTPs_a16,  opFSTPs_a16,  opFSTPs_a16,  opFSTPs_a16,  opFSTPs_a16,  opFSTPs_a16,  opFSTPs_a16,
+        opFLDENV_a16, opFLDENV_a16, opFLDENV_a16, opFLDENV_a16, opFLDENV_a16, opFLDENV_a16, opFLDENV_a16, opFLDENV_a16,
+        opFLDCW_a16,  opFLDCW_a16,  opFLDCW_a16,  opFLDCW_a16,  opFLDCW_a16,  opFLDCW_a16,  opFLDCW_a16,  opFLDCW_a16,
+        opFSTENV_a16, opFSTENV_a16, opFSTENV_a16, opFSTENV_a16, opFSTENV_a16, opFSTENV_a16, opFSTENV_a16, opFSTENV_a16,
+        opFSTCW_a16,  opFSTCW_a16,  opFSTCW_a16,  opFSTCW_a16,  opFSTCW_a16,  opFSTCW_a16,  opFSTCW_a16,  opFSTCW_a16,
+
+        opFLDs_a16,   opFLDs_a16,   opFLDs_a16,   opFLDs_a16,   opFLDs_a16,   opFLDs_a16,   opFLDs_a16,   opFLDs_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFSTs_a16,   opFSTs_a16,   opFSTs_a16,   opFSTs_a16,   opFSTs_a16,   opFSTs_a16,   opFSTs_a16,   opFSTs_a16,
+        opFSTPs_a16,  opFSTPs_a16,  opFSTPs_a16,  opFSTPs_a16,  opFSTPs_a16,  opFSTPs_a16,  opFSTPs_a16,  opFSTPs_a16,
+        opFLDENV_a16, opFLDENV_a16, opFLDENV_a16, opFLDENV_a16, opFLDENV_a16, opFLDENV_a16, opFLDENV_a16, opFLDENV_a16,
+        opFLDCW_a16,  opFLDCW_a16,  opFLDCW_a16,  opFLDCW_a16,  opFLDCW_a16,  opFLDCW_a16,  opFLDCW_a16,  opFLDCW_a16,
+        opFSTENV_a16, opFSTENV_a16, opFSTENV_a16, opFSTENV_a16, opFSTENV_a16, opFSTENV_a16, opFSTENV_a16, opFSTENV_a16,
+        opFSTCW_a16,  opFSTCW_a16,  opFSTCW_a16,  opFSTCW_a16,  opFSTCW_a16,  opFSTCW_a16,  opFSTCW_a16,  opFSTCW_a16,
+
+        opFLD,        opFLD,        opFLD,        opFLD,        opFLD,        opFLD,        opFLD,        opFLD,
+        opFXCH,       opFXCH,       opFXCH,       opFXCH,       opFXCH,       opFXCH,       opFXCH,       opFXCH,
+        opFNOP,       ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFSTP,       opFSTP,       opFSTP,       opFSTP,       opFSTP,       opFSTP,       opFSTP,       opFSTP,  /*Invalid*/
+        opFCHS,       opFABS,       ILLEGAL_a16,  ILLEGAL_a16,  opFTST,       opFXAM,       opFTSTP,      ILLEGAL_a16,
+        opFLD1,       opFLDL2T,     opFLDL2E,     opFLDPI,      opFLDEG2,     opFLDLN2,     opFLDZ,       ILLEGAL_a16,
+        opF2XM1,      opFYL2X,      opFPTAN,      opFPATAN,     opFXTRACT,  opFPREM1,     opFDECSTP,    opFINCSTP,
+        opFPREM,      opFYL2XP1,    opFSQRT,      opFSINCOS,    opFRNDINT,    opFSCALE,     opFSIN,       opFCOS
+    // clang-format on
+};
+
+const OpFn OP_TABLE(fpu_cyrix_d9_a32)[256] = {
+    // clang-format off
+        opFLDs_a32,   opFLDs_a32,   opFLDs_a32,   opFLDs_a32,   opFLDs_a32,   opFLDs_a32,   opFLDs_a32,   opFLDs_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFSTs_a32,   opFSTs_a32,   opFSTs_a32,   opFSTs_a32,   opFSTs_a32,   opFSTs_a32,   opFSTs_a32,   opFSTs_a32,
+        opFSTPs_a32,  opFSTPs_a32,  opFSTPs_a32,  opFSTPs_a32,  opFSTPs_a32,  opFSTPs_a32,  opFSTPs_a32,  opFSTPs_a32,
+        opFLDENV_a32, opFLDENV_a32, opFLDENV_a32, opFLDENV_a32, opFLDENV_a32, opFLDENV_a32, opFLDENV_a32, opFLDENV_a32,
+        opFLDCW_a32,  opFLDCW_a32,  opFLDCW_a32,  opFLDCW_a32,  opFLDCW_a32,  opFLDCW_a32,  opFLDCW_a32,  opFLDCW_a32,
+        opFSTENV_a32, opFSTENV_a32, opFSTENV_a32, opFSTENV_a32, opFSTENV_a32, opFSTENV_a32, opFSTENV_a32, opFSTENV_a32,
+        opFSTCW_a32,  opFSTCW_a32,  opFSTCW_a32,  opFSTCW_a32,  opFSTCW_a32,  opFSTCW_a32,  opFSTCW_a32,  opFSTCW_a32,
+
+        opFLDs_a32,   opFLDs_a32,   opFLDs_a32,   opFLDs_a32,   opFLDs_a32,   opFLDs_a32,   opFLDs_a32,   opFLDs_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFSTs_a32,   opFSTs_a32,   opFSTs_a32,   opFSTs_a32,   opFSTs_a32,   opFSTs_a32,   opFSTs_a32,   opFSTs_a32,
+        opFSTPs_a32,  opFSTPs_a32,  opFSTPs_a32,  opFSTPs_a32,  opFSTPs_a32,  opFSTPs_a32,  opFSTPs_a32,  opFSTPs_a32,
+        opFLDENV_a32, opFLDENV_a32, opFLDENV_a32, opFLDENV_a32, opFLDENV_a32, opFLDENV_a32, opFLDENV_a32, opFLDENV_a32,
+        opFLDCW_a32,  opFLDCW_a32,  opFLDCW_a32,  opFLDCW_a32,  opFLDCW_a32,  opFLDCW_a32,  opFLDCW_a32,  opFLDCW_a32,
+        opFSTENV_a32, opFSTENV_a32, opFSTENV_a32, opFSTENV_a32, opFSTENV_a32, opFSTENV_a32, opFSTENV_a32, opFSTENV_a32,
+        opFSTCW_a32,  opFSTCW_a32,  opFSTCW_a32,  opFSTCW_a32,  opFSTCW_a32,  opFSTCW_a32,  opFSTCW_a32,  opFSTCW_a32,
+
+        opFLDs_a32,   opFLDs_a32,   opFLDs_a32,   opFLDs_a32,   opFLDs_a32,   opFLDs_a32,   opFLDs_a32,   opFLDs_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFSTs_a32,   opFSTs_a32,   opFSTs_a32,   opFSTs_a32,   opFSTs_a32,   opFSTs_a32,   opFSTs_a32,   opFSTs_a32,
+        opFSTPs_a32,  opFSTPs_a32,  opFSTPs_a32,  opFSTPs_a32,  opFSTPs_a32,  opFSTPs_a32,  opFSTPs_a32,  opFSTPs_a32,
+        opFLDENV_a32, opFLDENV_a32, opFLDENV_a32, opFLDENV_a32, opFLDENV_a32, opFLDENV_a32, opFLDENV_a32, opFLDENV_a32,
+        opFLDCW_a32,  opFLDCW_a32,  opFLDCW_a32,  opFLDCW_a32,  opFLDCW_a32,  opFLDCW_a32,  opFLDCW_a32,  opFLDCW_a32,
+        opFSTENV_a32, opFSTENV_a32, opFSTENV_a32, opFSTENV_a32, opFSTENV_a32, opFSTENV_a32, opFSTENV_a32, opFSTENV_a32,
+        opFSTCW_a32,  opFSTCW_a32,  opFSTCW_a32,  opFSTCW_a32,  opFSTCW_a32,  opFSTCW_a32,  opFSTCW_a32,  opFSTCW_a32,
+
+        opFLD,        opFLD,        opFLD,        opFLD,        opFLD,        opFLD,        opFLD,        opFLD,
+        opFXCH,       opFXCH,       opFXCH,       opFXCH,       opFXCH,       opFXCH,       opFXCH,       opFXCH,
+        opFNOP,       ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFSTP,       opFSTP,       opFSTP,       opFSTP,       opFSTP,       opFSTP,       opFSTP,       opFSTP,  /*Invalid*/
+        opFCHS,       opFABS,       ILLEGAL_a32,  ILLEGAL_a32,  opFTST,       opFXAM,       opFTSTP,      ILLEGAL_a32,
+        opFLD1,       opFLDL2T,     opFLDL2E,     opFLDPI,      opFLDEG2,     opFLDLN2,     opFLDZ,       ILLEGAL_a32,
+        opF2XM1,      opFYL2X,      opFPTAN,      opFPATAN,     opFXTRACT,    opFPREM1,     opFDECSTP,    opFINCSTP,
+        opFPREM,      opFYL2XP1,    opFSQRT,      opFSINCOS,    opFRNDINT,    opFSCALE,     opFSIN,       opFCOS
+    // clang-format on
+};
+
 const OpFn OP_TABLE(fpu_287_da_a16)[256] = {
     // clang-format off
         opFADDil_a16,  opFADDil_a16,  opFADDil_a16,  opFADDil_a16,  opFADDil_a16,  opFADDil_a16,  opFADDil_a16,  opFADDil_a16,
@@ -3011,6 +3448,87 @@ const OpFn OP_TABLE(fpu_686_db_a32)[256] = {
 };
 #    endif
 
+#    ifndef OPS_286_386
+const OpFn OP_TABLE(fpu_cyrix_686_db_a16)[256] = {
+    // clang-format off
+        opFILDil_a16,  opFILDil_a16,  opFILDil_a16,  opFILDil_a16,  opFILDil_a16,  opFILDil_a16,  opFILDil_a16,  opFILDil_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFISTil_a16,  opFISTil_a16,  opFISTil_a16,  opFISTil_a16,  opFISTil_a16,  opFISTil_a16,  opFISTil_a16,  opFISTil_a16,
+        opFISTPil_a16, opFISTPil_a16, opFISTPil_a16, opFISTPil_a16, opFISTPil_a16, opFISTPil_a16, opFISTPil_a16, opFISTPil_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFLDe_a16,    opFLDe_a16,    opFLDe_a16,    opFLDe_a16,    opFLDe_a16,    opFLDe_a16,    opFLDe_a16,    opFLDe_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFSTPe_a16,   opFSTPe_a16,   opFSTPe_a16,   opFSTPe_a16,   opFSTPe_a16,   opFSTPe_a16,   opFSTPe_a16,   opFSTPe_a16,
+
+        opFILDil_a16,  opFILDil_a16,  opFILDil_a16,  opFILDil_a16,  opFILDil_a16,  opFILDil_a16,  opFILDil_a16,  opFILDil_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFISTil_a16,  opFISTil_a16,  opFISTil_a16,  opFISTil_a16,  opFISTil_a16,  opFISTil_a16,  opFISTil_a16,  opFISTil_a16,
+        opFISTPil_a16, opFISTPil_a16, opFISTPil_a16, opFISTPil_a16, opFISTPil_a16, opFISTPil_a16, opFISTPil_a16, opFISTPil_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFLDe_a16,    opFLDe_a16,    opFLDe_a16,    opFLDe_a16,    opFLDe_a16,    opFLDe_a16,    opFLDe_a16,    opFLDe_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFSTPe_a16,   opFSTPe_a16,   opFSTPe_a16,   opFSTPe_a16,   opFSTPe_a16,   opFSTPe_a16,   opFSTPe_a16,   opFSTPe_a16,
+
+        opFILDil_a16,  opFILDil_a16,  opFILDil_a16,  opFILDil_a16,  opFILDil_a16,  opFILDil_a16,  opFILDil_a16,  opFILDil_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFISTil_a16,  opFISTil_a16,  opFISTil_a16,  opFISTil_a16,  opFISTil_a16,  opFISTil_a16,  opFISTil_a16,  opFISTil_a16,
+        opFISTPil_a16, opFISTPil_a16, opFISTPil_a16, opFISTPil_a16, opFISTPil_a16, opFISTPil_a16, opFISTPil_a16, opFISTPil_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFLDe_a16,    opFLDe_a16,    opFLDe_a16,    opFLDe_a16,    opFLDe_a16,    opFLDe_a16,    opFLDe_a16,    opFLDe_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFSTPe_a16,   opFSTPe_a16,   opFSTPe_a16,   opFSTPe_a16,   opFSTPe_a16,   opFSTPe_a16,   opFSTPe_a16,   opFSTPe_a16,
+
+        opFCMOVNB,     opFCMOVNB,     opFCMOVNB,     opFCMOVNB,     opFCMOVNB,     opFCMOVNB,     opFCMOVNB,     opFCMOVNB,
+        opFCMOVNE,     opFCMOVNE,     opFCMOVNE,     opFCMOVNE,     opFCMOVNE,     opFCMOVNE,     opFCMOVNE,     opFCMOVNE,
+        opFCMOVNBE,    opFCMOVNBE,    opFCMOVNBE,    opFCMOVNBE,    opFCMOVNBE,    opFCMOVNBE,    opFCMOVNBE,    opFCMOVNBE,
+        opFCMOVNU,     opFCMOVNU,     opFCMOVNU,     opFCMOVNU,     opFCMOVNU,     opFCMOVNU,     opFCMOVNU,     opFCMOVNU,
+        opFNOP,        opFNOP,        opFCLEX,       opFINIT,       opFNOP,        opFNOP,        ILLEGAL_a16,       ILLEGAL_a16,
+        opFUCOMI,      opFUCOMI,      opFUCOMI,      opFUCOMI,      opFUCOMI,      opFUCOMI,      opFUCOMI,      opFUCOMI,
+        opFCOMI,       opFCOMI,       opFCOMI,       opFCOMI,       opFCOMI,       opFCOMI,       opFCOMI,       opFCOMI,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,      opFRINT2,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    // clang-format on
+};
+const OpFn OP_TABLE(fpu_cyrix_686_db_a32)[256] = {
+    // clang-format off
+        opFILDil_a32,  opFILDil_a32,  opFILDil_a32,  opFILDil_a32,  opFILDil_a32,  opFILDil_a32,  opFILDil_a32,  opFILDil_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFISTil_a32,  opFISTil_a32,  opFISTil_a32,  opFISTil_a32,  opFISTil_a32,  opFISTil_a32,  opFISTil_a32,  opFISTil_a32,
+        opFISTPil_a32, opFISTPil_a32, opFISTPil_a32, opFISTPil_a32, opFISTPil_a32, opFISTPil_a32, opFISTPil_a32, opFISTPil_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFLDe_a32,    opFLDe_a32,    opFLDe_a32,    opFLDe_a32,    opFLDe_a32,    opFLDe_a32,    opFLDe_a32,    opFLDe_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFSTPe_a32,   opFSTPe_a32,   opFSTPe_a32,   opFSTPe_a32,   opFSTPe_a32,   opFSTPe_a32,   opFSTPe_a32,   opFSTPe_a32,
+
+        opFILDil_a32,  opFILDil_a32,  opFILDil_a32,  opFILDil_a32,  opFILDil_a32,  opFILDil_a32,  opFILDil_a32,  opFILDil_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFISTil_a32,  opFISTil_a32,  opFISTil_a32,  opFISTil_a32,  opFISTil_a32,  opFISTil_a32,  opFISTil_a32,  opFISTil_a32,
+        opFISTPil_a32, opFISTPil_a32, opFISTPil_a32, opFISTPil_a32, opFISTPil_a32, opFISTPil_a32, opFISTPil_a32, opFISTPil_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFLDe_a32,    opFLDe_a32,    opFLDe_a32,    opFLDe_a32,    opFLDe_a32,    opFLDe_a32,    opFLDe_a32,    opFLDe_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFSTPe_a32,   opFSTPe_a32,   opFSTPe_a32,   opFSTPe_a32,   opFSTPe_a32,   opFSTPe_a32,   opFSTPe_a32,   opFSTPe_a32,
+
+        opFILDil_a32,  opFILDil_a32,  opFILDil_a32,  opFILDil_a32,  opFILDil_a32,  opFILDil_a32,  opFILDil_a32,  opFILDil_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFISTil_a32,  opFISTil_a32,  opFISTil_a32,  opFISTil_a32,  opFISTil_a32,  opFISTil_a32,  opFISTil_a32,  opFISTil_a32,
+        opFISTPil_a32, opFISTPil_a32, opFISTPil_a32, opFISTPil_a32, opFISTPil_a32, opFISTPil_a32, opFISTPil_a32, opFISTPil_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFLDe_a32,    opFLDe_a32,    opFLDe_a32,    opFLDe_a32,    opFLDe_a32,    opFLDe_a32,    opFLDe_a32,    opFLDe_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFSTPe_a32,   opFSTPe_a32,   opFSTPe_a32,   opFSTPe_a32,   opFSTPe_a32,   opFSTPe_a32,   opFSTPe_a32,   opFSTPe_a32,
+
+        opFCMOVNB,     opFCMOVNB,     opFCMOVNB,     opFCMOVNB,     opFCMOVNB,     opFCMOVNB,     opFCMOVNB,     opFCMOVNB,
+        opFCMOVNE,     opFCMOVNE,     opFCMOVNE,     opFCMOVNE,     opFCMOVNE,     opFCMOVNE,     opFCMOVNE,     opFCMOVNE,
+        opFCMOVNBE,    opFCMOVNBE,    opFCMOVNBE,    opFCMOVNBE,    opFCMOVNBE,    opFCMOVNBE,    opFCMOVNBE,    opFCMOVNBE,
+        opFCMOVNU,     opFCMOVNU,     opFCMOVNU,     opFCMOVNU,     opFCMOVNU,     opFCMOVNU,     opFCMOVNU,     opFCMOVNU,
+        opFNOP,        opFNOP,        opFCLEX,       opFINIT,       opFNOP,        opFNOP,        ILLEGAL_a32,       ILLEGAL_a32,
+        opFUCOMI,      opFUCOMI,      opFUCOMI,      opFUCOMI,      opFUCOMI,      opFUCOMI,      opFUCOMI,      opFUCOMI,
+        opFCOMI,       opFCOMI,       opFCOMI,       opFCOMI,       opFCOMI,       opFCOMI,       opFCOMI,       opFCOMI,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,      opFRINT2,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+    // clang-format on
+};
+#    endif
+
 const OpFn OP_TABLE(fpu_287_dc_a16)[32] = {
     // clang-format off
         opFADDd_a16, opFMULd_a16, opFCOMd_a16, opFCOMPd_a16, opFSUBd_a16, opFSUBRd_a16, opFDIVd_a16, opFDIVRd_a16,
@@ -3207,6 +3725,86 @@ const OpFn OP_TABLE(fpu_dd_a32)[256] = {
     // clang-format on
 };
 
+const OpFn OP_TABLE(fpu_cyrix_dd_a16)[256] = {
+    // clang-format off
+        opFLDd_a16,    opFLDd_a16,    opFLDd_a16,    opFLDd_a16,    opFLDd_a16,    opFLDd_a16,    opFLDd_a16,    opFLDd_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFSTd_a16,    opFSTd_a16,    opFSTd_a16,    opFSTd_a16,    opFSTd_a16,    opFSTd_a16,    opFSTd_a16,    opFSTd_a16,
+        opFSTPd_a16,   opFSTPd_a16,   opFSTPd_a16,   opFSTPd_a16,   opFSTPd_a16,   opFSTPd_a16,   opFSTPd_a16,   opFSTPd_a16,
+        opFSTOR_a16,   opFSTOR_a16,   opFSTOR_a16,   opFSTOR_a16,   opFSTOR_a16,   opFSTOR_a16,   opFSTOR_a16,   opFSTOR_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFSAVE_a16,   opFSAVE_a16,   opFSAVE_a16,   opFSAVE_a16,   opFSAVE_a16,   opFSAVE_a16,   opFSAVE_a16,   opFSAVE_a16,
+        opFSTSW_a16,   opFSTSW_a16,   opFSTSW_a16,   opFSTSW_a16,   opFSTSW_a16,   opFSTSW_a16,   opFSTSW_a16,   opFSTSW_a16,
+
+        opFLDd_a16,    opFLDd_a16,    opFLDd_a16,    opFLDd_a16,    opFLDd_a16,    opFLDd_a16,    opFLDd_a16,    opFLDd_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFSTd_a16,    opFSTd_a16,    opFSTd_a16,    opFSTd_a16,    opFSTd_a16,    opFSTd_a16,    opFSTd_a16,    opFSTd_a16,
+        opFSTPd_a16,   opFSTPd_a16,   opFSTPd_a16,   opFSTPd_a16,   opFSTPd_a16,   opFSTPd_a16,   opFSTPd_a16,   opFSTPd_a16,
+        opFSTOR_a16,   opFSTOR_a16,   opFSTOR_a16,   opFSTOR_a16,   opFSTOR_a16,   opFSTOR_a16,   opFSTOR_a16,   opFSTOR_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFSAVE_a16,   opFSAVE_a16,   opFSAVE_a16,   opFSAVE_a16,   opFSAVE_a16,   opFSAVE_a16,   opFSAVE_a16,   opFSAVE_a16,
+        opFSTSW_a16,   opFSTSW_a16,   opFSTSW_a16,   opFSTSW_a16,   opFSTSW_a16,   opFSTSW_a16,   opFSTSW_a16,   opFSTSW_a16,
+
+        opFLDd_a16,    opFLDd_a16,    opFLDd_a16,    opFLDd_a16,    opFLDd_a16,    opFLDd_a16,    opFLDd_a16,    opFLDd_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFSTd_a16,    opFSTd_a16,    opFSTd_a16,    opFSTd_a16,    opFSTd_a16,    opFSTd_a16,    opFSTd_a16,    opFSTd_a16,
+        opFSTPd_a16,   opFSTPd_a16,   opFSTPd_a16,   opFSTPd_a16,   opFSTPd_a16,   opFSTPd_a16,   opFSTPd_a16,   opFSTPd_a16,
+        opFSTOR_a16,   opFSTOR_a16,   opFSTOR_a16,   opFSTOR_a16,   opFSTOR_a16,   opFSTOR_a16,   opFSTOR_a16,   opFSTOR_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFSAVE_a16,   opFSAVE_a16,   opFSAVE_a16,   opFSAVE_a16,   opFSAVE_a16,   opFSAVE_a16,   opFSAVE_a16,   opFSAVE_a16,
+        opFSTSW_a16,   opFSTSW_a16,   opFSTSW_a16,   opFSTSW_a16,   opFSTSW_a16,   opFSTSW_a16,   opFSTSW_a16,   opFSTSW_a16,
+
+        opFFREE,       opFFREE,       opFFREE,       opFFREE,       opFFREE,       opFFREE,       opFFREE,       opFFREE,
+        opFXCH,        opFXCH,        opFXCH,        opFXCH,        opFXCH,        opFXCH,        opFXCH,        opFXCH,
+        opFST,         opFST,         opFST,         opFST,         opFST,         opFST,         opFST,         opFST,
+        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,
+        opFUCOM,       opFUCOM,       opFUCOM,       opFUCOM,       opFUCOM,       opFUCOM,       opFUCOM,       opFUCOM,
+        opFUCOMP,      opFUCOMP,      opFUCOMP,      opFUCOMP,      opFUCOMP,      opFUCOMP,      opFUCOMP,      opFUCOMP,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,    opFRICHOP,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    // clang-format on
+};
+
+const OpFn OP_TABLE(fpu_cyrix_dd_a32)[256] = {
+    // clang-format off
+        opFLDd_a32,    opFLDd_a32,    opFLDd_a32,    opFLDd_a32,    opFLDd_a32,    opFLDd_a32,    opFLDd_a32,    opFLDd_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFSTd_a32,    opFSTd_a32,    opFSTd_a32,    opFSTd_a32,    opFSTd_a32,    opFSTd_a32,    opFSTd_a32,    opFSTd_a32,
+        opFSTPd_a32,   opFSTPd_a32,   opFSTPd_a32,   opFSTPd_a32,   opFSTPd_a32,   opFSTPd_a32,   opFSTPd_a32,   opFSTPd_a32,
+        opFSTOR_a32,   opFSTOR_a32,   opFSTOR_a32,   opFSTOR_a32,   opFSTOR_a32,   opFSTOR_a32,   opFSTOR_a32,   opFSTOR_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFSAVE_a32,   opFSAVE_a32,   opFSAVE_a32,   opFSAVE_a32,   opFSAVE_a32,   opFSAVE_a32,   opFSAVE_a32,   opFSAVE_a32,
+        opFSTSW_a32,   opFSTSW_a32,   opFSTSW_a32,   opFSTSW_a32,   opFSTSW_a32,   opFSTSW_a32,   opFSTSW_a32,   opFSTSW_a32,
+
+        opFLDd_a32,    opFLDd_a32,    opFLDd_a32,    opFLDd_a32,    opFLDd_a32,    opFLDd_a32,    opFLDd_a32,    opFLDd_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFSTd_a32,    opFSTd_a32,    opFSTd_a32,    opFSTd_a32,    opFSTd_a32,    opFSTd_a32,    opFSTd_a32,    opFSTd_a32,
+        opFSTPd_a32,   opFSTPd_a32,   opFSTPd_a32,   opFSTPd_a32,   opFSTPd_a32,   opFSTPd_a32,   opFSTPd_a32,   opFSTPd_a32,
+        opFSTOR_a32,   opFSTOR_a32,   opFSTOR_a32,   opFSTOR_a32,   opFSTOR_a32,   opFSTOR_a32,   opFSTOR_a32,   opFSTOR_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFSAVE_a32,   opFSAVE_a32,   opFSAVE_a32,   opFSAVE_a32,   opFSAVE_a32,   opFSAVE_a32,   opFSAVE_a32,   opFSAVE_a32,
+        opFSTSW_a32,   opFSTSW_a32,   opFSTSW_a32,   opFSTSW_a32,   opFSTSW_a32,   opFSTSW_a32,   opFSTSW_a32,   opFSTSW_a32,
+
+        opFLDd_a32,    opFLDd_a32,    opFLDd_a32,    opFLDd_a32,    opFLDd_a32,    opFLDd_a32,    opFLDd_a32,    opFLDd_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFSTd_a32,    opFSTd_a32,    opFSTd_a32,    opFSTd_a32,    opFSTd_a32,    opFSTd_a32,    opFSTd_a32,    opFSTd_a32,
+        opFSTPd_a32,   opFSTPd_a32,   opFSTPd_a32,   opFSTPd_a32,   opFSTPd_a32,   opFSTPd_a32,   opFSTPd_a32,   opFSTPd_a32,
+        opFSTOR_a32,   opFSTOR_a32,   opFSTOR_a32,   opFSTOR_a32,   opFSTOR_a32,   opFSTOR_a32,   opFSTOR_a32,   opFSTOR_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFSAVE_a32,   opFSAVE_a32,   opFSAVE_a32,   opFSAVE_a32,   opFSAVE_a32,   opFSAVE_a32,   opFSAVE_a32,   opFSAVE_a32,
+        opFSTSW_a32,   opFSTSW_a32,   opFSTSW_a32,   opFSTSW_a32,   opFSTSW_a32,   opFSTSW_a32,   opFSTSW_a32,   opFSTSW_a32,
+
+        opFFREE,       opFFREE,       opFFREE,       opFFREE,       opFFREE,       opFFREE,       opFFREE,       opFFREE,
+        opFXCH,        opFXCH,        opFXCH,        opFXCH,        opFXCH,        opFXCH,        opFXCH,        opFXCH,
+        opFST,         opFST,         opFST,         opFST,         opFST,         opFST,         opFST,         opFST,
+        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,
+        opFUCOM,       opFUCOM,       opFUCOM,       opFUCOM,       opFUCOM,       opFUCOM,       opFUCOM,       opFUCOM,
+        opFUCOMP,      opFUCOMP,      opFUCOMP,      opFUCOMP,      opFUCOMP,      opFUCOMP,      opFUCOMP,      opFUCOMP,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,    opFRICHOP,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+    // clang-format on
+};
+
 const OpFn OP_TABLE(fpu_287_de_a16)[256] = {
     // clang-format off
         opFADDiw_a16,  opFADDiw_a16,  opFADDiw_a16,  opFADDiw_a16,  opFADDiw_a16,  opFADDiw_a16,  opFADDiw_a16,  opFADDiw_a16,
@@ -3373,7 +3971,7 @@ const OpFn OP_TABLE(fpu_287_df_a16)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,
         opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,
         opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,
         FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,
         FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,
@@ -3382,7 +3980,7 @@ const OpFn OP_TABLE(fpu_287_df_a16)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,
         opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,
         opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,
         FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,
         FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,
@@ -3391,7 +3989,7 @@ const OpFn OP_TABLE(fpu_287_df_a16)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,
         opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,
         opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,
         FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,
         FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,
@@ -3413,7 +4011,7 @@ const OpFn OP_TABLE(fpu_287_df_a32)[256] = {
         ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
         opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,
         opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32,
-        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,
         opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,
         FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,
         FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,
@@ -3422,7 +4020,7 @@ const OpFn OP_TABLE(fpu_287_df_a32)[256] = {
         ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
         opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,
         opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32,
-        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,
         opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,
         FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,
         FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,
@@ -3431,7 +4029,7 @@ const OpFn OP_TABLE(fpu_287_df_a32)[256] = {
         ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
         opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,
         opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32,
-        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,
         opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,
         FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,
         FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,
@@ -3453,7 +4051,7 @@ const OpFn OP_TABLE(fpu_df_a16)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,
         opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,
         opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,
         FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,
         FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,
@@ -3462,7 +4060,7 @@ const OpFn OP_TABLE(fpu_df_a16)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,
         opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,
         opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,
         FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,
         FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,
@@ -3471,7 +4069,7 @@ const OpFn OP_TABLE(fpu_df_a16)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,
         opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,
         opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,
         FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,
         FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,
@@ -3493,7 +4091,7 @@ const OpFn OP_TABLE(fpu_df_a32)[256] = {
         ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
         opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,
         opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32,
-        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,
         opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,
         FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,
         FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,
@@ -3502,7 +4100,7 @@ const OpFn OP_TABLE(fpu_df_a32)[256] = {
         ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
         opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,
         opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32,
-        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,
         opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,
         FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,
         FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,
@@ -3511,7 +4109,7 @@ const OpFn OP_TABLE(fpu_df_a32)[256] = {
         ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
         opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,
         opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32,
-        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,
         opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,
         FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,
         FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,
@@ -3534,7 +4132,7 @@ const OpFn OP_TABLE(fpu_686_df_a16)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,
         opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,
         opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,
         FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,
         FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,
@@ -3543,7 +4141,7 @@ const OpFn OP_TABLE(fpu_686_df_a16)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,
         opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,
         opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,
         FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,
         FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,
@@ -3552,7 +4150,7 @@ const OpFn OP_TABLE(fpu_686_df_a16)[256] = {
         ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
         opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,
         opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16,
-        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,
         opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,
         FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,
         FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,
@@ -3574,7 +4172,7 @@ const OpFn OP_TABLE(fpu_686_df_a32)[256] = {
         ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
         opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,
         opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32,
-        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,
         opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,
         FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,
         FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,
@@ -3583,7 +4181,7 @@ const OpFn OP_TABLE(fpu_686_df_a32)[256] = {
         ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
         opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,
         opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32,
-        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,
         opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,
         FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,
         FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,
@@ -3592,7 +4190,7 @@ const OpFn OP_TABLE(fpu_686_df_a32)[256] = {
         ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
         opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,
         opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32,
-        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,
         opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,
         FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,
         FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,
@@ -3609,6 +4207,88 @@ const OpFn OP_TABLE(fpu_686_df_a32)[256] = {
 };
 #    endif
 
+#    ifndef OPS_286_386
+const OpFn OP_TABLE(fpu_cyrix_686_df_a16)[256] = {
+    // clang-format off
+        opFILDiw_a16,  opFILDiw_a16,  opFILDiw_a16,  opFILDiw_a16,  opFILDiw_a16,  opFILDiw_a16,  opFILDiw_a16,  opFILDiw_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,
+        opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16,
+        FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,
+        opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,
+        FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,
+        FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,
+
+        opFILDiw_a16,  opFILDiw_a16,  opFILDiw_a16,  opFILDiw_a16,  opFILDiw_a16,  opFILDiw_a16,  opFILDiw_a16,  opFILDiw_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,
+        opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16,
+        FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,
+        opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,
+        FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,
+        FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,
+
+        opFILDiw_a16,  opFILDiw_a16,  opFILDiw_a16,  opFILDiw_a16,  opFILDiw_a16,  opFILDiw_a16,  opFILDiw_a16,  opFILDiw_a16,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,  opFISTiw_a16,
+        opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16, opFISTPiw_a16,
+        FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,     FBLD_a16,
+        opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,  opFILDiq_a16,
+        FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,     FBSTP_a16,
+        FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,   FISTPiq_a16,
+
+        opFFREEP,      opFFREEP,      opFFREEP,      opFFREEP,      opFFREEP,      opFFREEP,      opFFREEP,      opFFREEP,
+        opFXCH,        opFXCH,        opFXCH,        opFXCH,        opFXCH,        opFXCH,        opFXCH,        opFXCH,
+        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,
+        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,
+        opFSTSW_AX,   ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+        opFUCOMIP,     opFUCOMIP,     opFUCOMIP,     opFUCOMIP,     opFUCOMIP,     opFUCOMIP,     opFUCOMIP,     opFUCOMIP,
+        opFCOMIP,      opFCOMIP,      opFCOMIP,      opFCOMIP,      opFCOMIP,      opFCOMIP,      opFCOMIP,      opFCOMIP,
+        ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,      opFRINEAR,  ILLEGAL_a16,  ILLEGAL_a16,  ILLEGAL_a16,
+    // clang-format on
+};
+
+const OpFn OP_TABLE(fpu_cyrix_686_df_a32)[256] = {
+    // clang-format off
+        opFILDiw_a32,  opFILDiw_a32,  opFILDiw_a32,  opFILDiw_a32,  opFILDiw_a32,  opFILDiw_a32,  opFILDiw_a32,  opFILDiw_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,
+        opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32,
+        FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,
+        opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,
+        FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,
+        FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,
+
+        opFILDiw_a32,  opFILDiw_a32,  opFILDiw_a32,  opFILDiw_a32,  opFILDiw_a32,  opFILDiw_a32,  opFILDiw_a32,  opFILDiw_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,
+        opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32,
+        FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,
+        opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,
+        FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,
+        FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,
+
+        opFILDiw_a32,  opFILDiw_a32,  opFILDiw_a32,  opFILDiw_a32,  opFILDiw_a32,  opFILDiw_a32,  opFILDiw_a32,  opFILDiw_a32,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,  opFISTiw_a32,
+        opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32, opFISTPiw_a32,
+        FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,     FBLD_a32,
+        opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,  opFILDiq_a32,
+        FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,     FBSTP_a32,
+        FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,   FISTPiq_a32,
+
+        opFFREEP,      opFFREEP,      opFFREEP,      opFFREEP,      opFFREEP,      opFFREEP,      opFFREEP,      opFFREEP,
+        opFXCH,        opFXCH,        opFXCH,        opFXCH,        opFXCH,        opFXCH,        opFXCH,        opFXCH,
+        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,
+        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,        opFSTP,
+        opFSTSW_AX,   ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+        opFUCOMIP,     opFUCOMIP,     opFUCOMIP,     opFUCOMIP,     opFUCOMIP,     opFUCOMIP,     opFUCOMIP,     opFUCOMIP,
+        opFCOMIP,      opFCOMIP,      opFCOMIP,      opFCOMIP,      opFCOMIP,      opFCOMIP,      opFCOMIP,      opFCOMIP,
+        ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,      opFRINEAR,  ILLEGAL_a32,  ILLEGAL_a32,  ILLEGAL_a32,
+    // clang-format on
+};
+#    endif
+
 const OpFn OP_TABLE(nofpu_a16)[256] = {
     // clang-format off
         op_nofpu_a16, op_nofpu_a16, op_nofpu_a16, op_nofpu_a16, op_nofpu_a16, op_nofpu_a16, op_nofpu_a16, op_nofpu_a16,
diff --git a/src/cpu/x87_ops_arith.h b/src/cpu/x87_ops_arith.h
index 808a15051..bf3fbf253 100644
--- a/src/cpu/x87_ops_arith.h
+++ b/src/cpu/x87_ops_arith.h
@@ -1,5 +1,48 @@
+
+#ifdef X87_INLINE_ASM
+static inline double float_add(double src, double val, int round)
+{
+    int rounding_mode_orig;
+
+    __m128d xmm_src = _mm_load_sd(&src);
+    __m128d xmm_dst = _mm_load_sd(&val);
+    __m128d xmm_res;
+
+    rounding_mode_orig = _MM_GET_ROUNDING_MODE();
+    if (round == 0) _MM_SET_ROUNDING_MODE(_MM_ROUND_NEAREST);
+    if (round == 1) _MM_SET_ROUNDING_MODE(_MM_ROUND_DOWN);
+    if (round == 2) _MM_SET_ROUNDING_MODE(_MM_ROUND_UP);
+    if (round == 3) _MM_SET_ROUNDING_MODE(_MM_ROUND_TOWARD_ZERO);
+
+    xmm_res = _mm_add_sd(xmm_src, xmm_dst);
+
+    _MM_SET_ROUNDING_MODE(rounding_mode_orig);
+
+    return _mm_cvtsd_f64(xmm_res);
+}
+
+#define DO_FADD(use_var)                                               \
+    do                                                                 \
+    {                                                                  \
+        ST(0) = float_add(ST(0), use_var, (cpu_state.npxc >> 10) & 3); \
+    }                                                                  \
+    while (0)
+
+#else
+#define DO_FADD(use_var)                                               \
+    do                                                                 \
+    {                                                                  \
+        if ((cpu_state.npxc >> 10) & 3)                                \
+            fesetround(rounding_modes[(cpu_state.npxc >> 10) & 3]);    \
+        ST(0) += use_var;                                              \
+        if ((cpu_state.npxc >> 10) & 3)                                \
+            fesetround(FE_TONEAREST);                                  \
+    }                                                                  \
+    while (0)
+#endif
+
 #define opFPU(name, optype, a_size, load_var, get, use_var, cycle_postfix)                                                                         \
-    static int opFADD##name##_a##a_size(uint32_t fetchdat)                                                                                         \
+    static int opFADD##name##_a##a_size(UNUSED(uint32_t fetchdat))                                                                                 \
     {                                                                                                                                              \
         optype t;                                                                                                                                  \
         FP_ENTER();                                                                                                                                \
@@ -8,17 +51,13 @@
         load_var = get();                                                                                                                          \
         if (cpu_state.abrt)                                                                                                                        \
             return 1;                                                                                                                              \
-        if ((cpu_state.npxc >> 10) & 3)                                                                                                            \
-            fesetround(rounding_modes[(cpu_state.npxc >> 10) & 3]);                                                                                \
-        ST(0) += use_var;                                                                                                                          \
-        if ((cpu_state.npxc >> 10) & 3)                                                                                                            \
-            fesetround(FE_TONEAREST);                                                                                                              \
+        DO_FADD(use_var);                                                                                                                          \
         FP_TAG_VALID;                                                                                                                              \
         CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fadd##cycle_postfix) : ((x87_timings.fadd##cycle_postfix) * cpu_multi));           \
         CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fadd##cycle_postfix) : ((x87_concurrency.fadd##cycle_postfix) * cpu_multi)); \
         return 0;                                                                                                                                  \
     }                                                                                                                                              \
-    static int opFCOM##name##_a##a_size(uint32_t fetchdat)                                                                                         \
+    static int opFCOM##name##_a##a_size(UNUSED(uint32_t fetchdat))                                                                                 \
     {                                                                                                                                              \
         optype t;                                                                                                                                  \
         FP_ENTER();                                                                                                                                \
@@ -27,13 +66,13 @@
         load_var = get();                                                                                                                          \
         if (cpu_state.abrt)                                                                                                                        \
             return 1;                                                                                                                              \
-        cpu_state.npxs &= ~(C0 | C2 | C3);                                                                                                         \
+        cpu_state.npxs &= ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);                                                                                    \
         cpu_state.npxs |= x87_compare(ST(0), (double) use_var);                                                                                    \
         CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fcom##cycle_postfix) : ((x87_timings.fcom##cycle_postfix) * cpu_multi));           \
         CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fcom##cycle_postfix) : ((x87_concurrency.fcom##cycle_postfix) * cpu_multi)); \
         return 0;                                                                                                                                  \
     }                                                                                                                                              \
-    static int opFCOMP##name##_a##a_size(uint32_t fetchdat)                                                                                        \
+    static int opFCOMP##name##_a##a_size(UNUSED(uint32_t fetchdat))                                                                                \
     {                                                                                                                                              \
         optype t;                                                                                                                                  \
         FP_ENTER();                                                                                                                                \
@@ -42,14 +81,14 @@
         load_var = get();                                                                                                                          \
         if (cpu_state.abrt)                                                                                                                        \
             return 1;                                                                                                                              \
-        cpu_state.npxs &= ~(C0 | C2 | C3);                                                                                                         \
+        cpu_state.npxs &= ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);                                                                                    \
         cpu_state.npxs |= x87_compare(ST(0), (double) use_var);                                                                                    \
         x87_pop();                                                                                                                                 \
         CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fcom##cycle_postfix) : ((x87_timings.fcom##cycle_postfix) * cpu_multi));           \
         CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fcom##cycle_postfix) : ((x87_concurrency.fcom##cycle_postfix) * cpu_multi)); \
         return 0;                                                                                                                                  \
     }                                                                                                                                              \
-    static int opFDIV##name##_a##a_size(uint32_t fetchdat)                                                                                         \
+    static int opFDIV##name##_a##a_size(UNUSED(uint32_t fetchdat))                                                                                 \
     {                                                                                                                                              \
         optype t;                                                                                                                                  \
         FP_ENTER();                                                                                                                                \
@@ -64,7 +103,7 @@
         CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fadd##cycle_postfix) : ((x87_concurrency.fadd##cycle_postfix) * cpu_multi)); \
         return 0;                                                                                                                                  \
     }                                                                                                                                              \
-    static int opFDIVR##name##_a##a_size(uint32_t fetchdat)                                                                                        \
+    static int opFDIVR##name##_a##a_size(UNUSED(uint32_t fetchdat))                                                                                \
     {                                                                                                                                              \
         optype t;                                                                                                                                  \
         FP_ENTER();                                                                                                                                \
@@ -79,7 +118,7 @@
         CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fdiv##cycle_postfix) : ((x87_concurrency.fdiv##cycle_postfix) * cpu_multi)); \
         return 0;                                                                                                                                  \
     }                                                                                                                                              \
-    static int opFMUL##name##_a##a_size(uint32_t fetchdat)                                                                                         \
+    static int opFMUL##name##_a##a_size(UNUSED(uint32_t fetchdat))                                                                                 \
     {                                                                                                                                              \
         optype t;                                                                                                                                  \
         FP_ENTER();                                                                                                                                \
@@ -94,7 +133,7 @@
         CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fmul##cycle_postfix) : ((x87_concurrency.fmul##cycle_postfix) * cpu_multi)); \
         return 0;                                                                                                                                  \
     }                                                                                                                                              \
-    static int opFSUB##name##_a##a_size(uint32_t fetchdat)                                                                                         \
+    static int opFSUB##name##_a##a_size(UNUSED(uint32_t fetchdat))                                                                                 \
     {                                                                                                                                              \
         optype t;                                                                                                                                  \
         FP_ENTER();                                                                                                                                \
@@ -109,7 +148,7 @@
         CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fadd##cycle_postfix) : ((x87_concurrency.fadd##cycle_postfix) * cpu_multi)); \
         return 0;                                                                                                                                  \
     }                                                                                                                                              \
-    static int opFSUBR##name##_a##a_size(uint32_t fetchdat)                                                                                        \
+    static int opFSUBR##name##_a##a_size(UNUSED(uint32_t fetchdat))                                                                                        \
     {                                                                                                                                              \
         optype t;                                                                                                                                  \
         FP_ENTER();                                                                                                                                \
@@ -128,24 +167,24 @@
 // clang-format off
 opFPU(s, x87_ts, 16, t.i, geteal, t.s, _32)
 #ifndef FPU_8087
-    opFPU(s, x87_ts, 32, t.i, geteal, t.s, _32)
+opFPU(s, x87_ts, 32, t.i, geteal, t.s, _32)
 #endif
 opFPU(d, x87_td, 16, t.i, geteaq, t.d, _64)
 #ifndef FPU_8087
-    opFPU(d, x87_td, 32, t.i, geteaq, t.d, _64)
+opFPU(d, x87_td, 32, t.i, geteaq, t.d, _64)
 #endif
 
 opFPU(iw, uint16_t, 16, t, geteaw, (double) (int16_t) t, _i16)
 #ifndef FPU_8087
-    opFPU(iw, uint16_t, 32, t, geteaw, (double) (int16_t) t, _i16)
+opFPU(iw, uint16_t, 32, t, geteaw, (double) (int16_t) t, _i16)
 #endif
 opFPU(il, uint32_t, 16, t, geteal, (double) (int32_t) t, _i32)
 #ifndef FPU_8087
-    opFPU(il, uint32_t, 32, t, geteal, (double) (int32_t) t, _i32)
+opFPU(il, uint32_t, 32, t, geteal, (double) (int32_t) t, _i32)
 #endif
-    // clang-format on
+// clang-format on
 
-    static int opFADD(uint32_t fetchdat)
+static int opFADD(uint32_t fetchdat)
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -184,11 +223,11 @@ opFCOM(uint32_t fetchdat)
 {
     FP_ENTER();
     cpu_state.pc++;
-    cpu_state.npxs &= ~(C0 | C2 | C3);
+    cpu_state.npxs &= ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
     if (ST(0) == ST(fetchdat & 7))
-        cpu_state.npxs |= C3;
+        cpu_state.npxs |= FPU_SW_C3;
     else if (ST(0) < ST(fetchdat & 7))
-        cpu_state.npxs |= C0;
+        cpu_state.npxs |= FPU_SW_C0;
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fcom) : (x87_timings.fcom * cpu_multi));
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fcom) : (x87_concurrency.fcom * cpu_multi));
     return 0;
@@ -199,7 +238,7 @@ opFCOMP(uint32_t fetchdat)
 {
     FP_ENTER();
     cpu_state.pc++;
-    cpu_state.npxs &= ~(C0 | C2 | C3);
+    cpu_state.npxs &= ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
     cpu_state.npxs |= x87_compare(ST(0), ST(fetchdat & 7));
     x87_pop();
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fcom) : (x87_timings.fcom * cpu_multi));
@@ -208,16 +247,16 @@ opFCOMP(uint32_t fetchdat)
 }
 
 static int
-opFCOMPP(uint32_t fetchdat)
+opFCOMPP(UNUSED(uint32_t fetchdat))
 {
     uint64_t *p, *q;
     FP_ENTER();
     cpu_state.pc++;
-    cpu_state.npxs &= ~(C0 | C2 | C3);
+    cpu_state.npxs &= ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
     p = (uint64_t *) &ST(0);
     q = (uint64_t *) &ST(1);
     if ((*p == ((uint64_t) 1 << 63) && *q == 0) && (fpu_type >= FPU_287XL))
-        cpu_state.npxs |= C0; /*Nasty hack to fix 80387 detection*/
+        cpu_state.npxs |= FPU_SW_C0; /*Nasty hack to fix 80387 detection*/
     else
         cpu_state.npxs |= x87_compare(ST(0), ST(1));
 
@@ -229,11 +268,11 @@ opFCOMPP(uint32_t fetchdat)
 }
 #ifndef FPU_8087
 static int
-opFUCOMPP(uint32_t fetchdat)
+opFUCOMPP(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
-    cpu_state.npxs &= ~(C0 | C2 | C3);
+    cpu_state.npxs &= ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
     cpu_state.npxs |= x87_ucompare(ST(0), ST(1));
     x87_pop();
     x87_pop();
@@ -458,7 +497,7 @@ opFUCOM(uint32_t fetchdat)
 {
     FP_ENTER();
     cpu_state.pc++;
-    cpu_state.npxs &= ~(C0 | C2 | C3);
+    cpu_state.npxs &= ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
     cpu_state.npxs |= x87_ucompare(ST(0), ST(fetchdat & 7));
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fucom) : (x87_timings.fucom * cpu_multi));
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fucom) : (x87_concurrency.fucom * cpu_multi));
@@ -470,7 +509,7 @@ opFUCOMP(uint32_t fetchdat)
 {
     FP_ENTER();
     cpu_state.pc++;
-    cpu_state.npxs &= ~(C0 | C2 | C3);
+    cpu_state.npxs &= ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
     cpu_state.npxs |= x87_ucompare(ST(0), ST(fetchdat & 7));
     x87_pop();
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fucom) : (x87_timings.fucom * cpu_multi));
@@ -478,7 +517,7 @@ opFUCOMP(uint32_t fetchdat)
     return 0;
 }
 
-#    ifndef OPS_286_386
+#ifndef OPS_286_386
 static int
 opFUCOMI(uint32_t fetchdat)
 {
diff --git a/src/cpu/x87_ops_loadstore.h b/src/cpu/x87_ops_loadstore.h
index d77c0ca2b..d0b31ac85 100644
--- a/src/cpu/x87_ops_loadstore.h
+++ b/src/cpu/x87_ops_loadstore.h
@@ -17,7 +17,7 @@
  *          Copyright 2016-2019 Miran Grca.
  */
 static int
-opFILDiw_a16(uint32_t fetchdat)
+opFILDiw_a16(UNUSED(uint32_t fetchdat))
 {
     int16_t temp;
     FP_ENTER();
@@ -50,7 +50,7 @@ opFILDiw_a32(uint32_t fetchdat)
 #endif
 
 static int
-opFISTiw_a16(uint32_t fetchdat)
+opFISTiw_a16(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     fetch_ea_16(fetchdat);
@@ -75,7 +75,7 @@ opFISTiw_a32(uint32_t fetchdat)
 #endif
 
 static int
-opFISTPiw_a16(uint32_t fetchdat)
+opFISTPiw_a16(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     fetch_ea_16(fetchdat);
@@ -106,7 +106,7 @@ opFISTPiw_a32(uint32_t fetchdat)
 #endif
 
 static int
-opFILDiq_a16(uint32_t fetchdat)
+opFILDiq_a16(UNUSED(uint32_t fetchdat))
 {
     int64_t temp64;
     FP_ENTER();
@@ -145,7 +145,90 @@ opFILDiq_a32(uint32_t fetchdat)
 #endif
 
 static int
-FBSTP_a16(uint32_t fetchdat)
+FBLD_a16(UNUSED(uint32_t fetchdat))
+{
+    uint16_t              load_reg_hi = 0xffff;
+    uint64_t              load_reg_lo = BX_CONST64(0xC000000000000000);
+    int64_t               load_val = 0ULL;
+    uint64_t              power;
+    int                   sign;
+
+    FP_ENTER();
+    fetch_ea_16(fetchdat);
+    SEG_CHECK_READ(cpu_state.ea_seg);
+    load_reg_lo = readmemq(easeg, cpu_state.eaaddr);
+    load_reg_hi = readmemw(easeg, cpu_state.eaaddr + 8);
+    if (cpu_state.abrt)
+        return 1;
+    clear_C1();
+    sign     = (load_reg_hi & 0x8000) != 0;
+    load_val = 0ULL;
+    power    = 1;
+    for (int i = 0; i < 16; i++) {
+        load_val += ((uint64_t) (load_reg_lo & 0xf)) * power;
+        load_reg_lo >>= 4;
+        power *= 10;
+    }
+    for (int i = 0; i < 2; i++) {
+        load_val += ((uint64_t) (load_reg_hi & 0xf)) * power;
+        load_reg_hi >>= 4;
+        power *= 10;
+    }
+    if (sign)
+        load_val = -load_val;
+    x87_push((double) load_val);
+    cpu_state.MM[cpu_state.TOP & 7].q = load_val;
+    FP_TAG_DEFAULT;
+
+    CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fild_64) : (x87_timings.fild_64 * cpu_multi));
+    CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fild_64) : (x87_concurrency.fild_64 * cpu_multi));
+    return 0;
+}
+#ifndef FPU_8087
+static int
+FBLD_a32(uint32_t fetchdat)
+{
+    uint16_t              load_reg_hi = 0xffff;
+    uint64_t              load_reg_lo = BX_CONST64(0xC000000000000000);
+    int64_t               load_val = 0ULL;
+    uint64_t              power;
+    int                   sign;
+
+    FP_ENTER();
+    fetch_ea_32(fetchdat);
+    SEG_CHECK_READ(cpu_state.ea_seg);
+    load_reg_lo = readmemq(easeg, cpu_state.eaaddr);
+    load_reg_hi = readmemw(easeg, cpu_state.eaaddr + 8);
+    if (cpu_state.abrt)
+        return 1;
+    clear_C1();
+    sign     = (load_reg_hi & 0x8000) != 0;
+    load_val = 0ULL;
+    power    = 1;
+    for (int i = 0; i < 16; i++) {
+        load_val += ((uint64_t) (load_reg_lo & 0xf)) * power;
+        load_reg_lo >>= 4;
+        power *= 10;
+    }
+    for (int i = 0; i < 2; i++) {
+        load_val += ((uint64_t) (load_reg_hi & 0xf)) * power;
+        load_reg_hi >>= 4;
+        power *= 10;
+    }
+    if (sign)
+        load_val = -load_val;
+    x87_push((double) load_val);
+    cpu_state.MM[cpu_state.TOP & 7].q = load_val;
+    FP_TAG_DEFAULT;
+
+    CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fild_64) : (x87_timings.fild_64 * cpu_multi));
+    CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fild_64) : (x87_concurrency.fild_64 * cpu_multi));
+    return 0;
+}
+#endif
+
+static int
+FBSTP_a16(UNUSED(uint32_t fetchdat))
 {
     double  dt;
     double tempd;
@@ -213,7 +296,7 @@ FBSTP_a32(uint32_t fetchdat)
 #endif
 
 static int
-FISTPiq_a16(uint32_t fetchdat)
+FISTPiq_a16(UNUSED(uint32_t fetchdat))
 {
     int64_t temp64;
     FP_ENTER();
@@ -254,7 +337,7 @@ FISTPiq_a32(uint32_t fetchdat)
 #endif
 
 static int
-opFILDil_a16(uint32_t fetchdat)
+opFILDil_a16(UNUSED(uint32_t fetchdat))
 {
     int32_t templ;
     FP_ENTER();
@@ -287,7 +370,7 @@ opFILDil_a32(uint32_t fetchdat)
 #endif
 
 static int
-opFISTil_a16(uint32_t fetchdat)
+opFISTil_a16(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     fetch_ea_16(fetchdat);
@@ -312,7 +395,7 @@ opFISTil_a32(uint32_t fetchdat)
 #endif
 
 static int
-opFISTPil_a16(uint32_t fetchdat)
+opFISTPil_a16(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     fetch_ea_16(fetchdat);
@@ -343,7 +426,7 @@ opFISTPil_a32(uint32_t fetchdat)
 #endif
 
 static int
-opFLDe_a16(uint32_t fetchdat)
+opFLDe_a16(UNUSED(uint32_t fetchdat))
 {
     double t;
     FP_ENTER();
@@ -376,7 +459,7 @@ opFLDe_a32(uint32_t fetchdat)
 #endif
 
 static int
-opFSTPe_a16(uint32_t fetchdat)
+opFSTPe_a16(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     fetch_ea_16(fetchdat);
@@ -407,7 +490,7 @@ opFSTPe_a32(uint32_t fetchdat)
 #endif
 
 static int
-opFLDd_a16(uint32_t fetchdat)
+opFLDd_a16(UNUSED(uint32_t fetchdat))
 {
     x87_td t;
     FP_ENTER();
@@ -440,7 +523,7 @@ opFLDd_a32(uint32_t fetchdat)
 #endif
 
 static int
-opFSTd_a16(uint32_t fetchdat)
+opFSTd_a16(UNUSED(uint32_t fetchdat))
 {
     x87_td t;
     FP_ENTER();
@@ -469,7 +552,7 @@ opFSTd_a32(uint32_t fetchdat)
 #endif
 
 static int
-opFSTPd_a16(uint32_t fetchdat)
+opFSTPd_a16(UNUSED(uint32_t fetchdat))
 {
     x87_td t;
     FP_ENTER();
@@ -504,7 +587,7 @@ opFSTPd_a32(uint32_t fetchdat)
 #endif
 
 static int
-opFLDs_a16(uint32_t fetchdat)
+opFLDs_a16(UNUSED(uint32_t fetchdat))
 {
     x87_ts ts;
     FP_ENTER();
@@ -537,7 +620,7 @@ opFLDs_a32(uint32_t fetchdat)
 #endif
 
 static int
-opFSTs_a16(uint32_t fetchdat)
+opFSTs_a16(UNUSED(uint32_t fetchdat))
 {
     x87_ts ts;
     FP_ENTER();
@@ -566,7 +649,7 @@ opFSTs_a32(uint32_t fetchdat)
 #endif
 
 static int
-opFSTPs_a16(uint32_t fetchdat)
+opFSTPs_a16(UNUSED(uint32_t fetchdat))
 {
     x87_ts ts;
     FP_ENTER();
diff --git a/src/cpu/x87_ops_misc.h b/src/cpu/x87_ops_misc.h
index d854f83db..417beea62 100644
--- a/src/cpu/x87_ops_misc.h
+++ b/src/cpu/x87_ops_misc.h
@@ -7,12 +7,12 @@ opFI(uint32_t fetchdat)
     cpu_state.npxc &= ~0x80;
     if (rmdat == 0xe1)
         cpu_state.npxc |= 0x80;
-    wait(3, 0);
+    wait_cycs(3, 0);
     return 0;
 }
 #else
 static int
-opFSTSW_AX(uint32_t fetchdat)
+opFSTSW_AX(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -24,7 +24,7 @@ opFSTSW_AX(uint32_t fetchdat)
 #endif
 
 static int
-opFNOP(uint32_t fetchdat)
+opFNOP(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -34,7 +34,7 @@ opFNOP(uint32_t fetchdat)
 }
 
 static int
-opFXTRACT(uint32_t fetchdat)
+opFXTRACT(UNUSED(uint32_t fetchdat))
 {
     x87_conv_t test;
     int64_t    exp80;
@@ -46,7 +46,7 @@ opFXTRACT(uint32_t fetchdat)
     test.eind.d = ST(0);
     exp80       = test.eind.ll & 0x7ff0000000000000LL;
     exp80final  = (exp80 >> 52) - BIAS64;
-    mant        = test.eind.d / (pow(2.0, (double) exp80final));
+    mant        = test.eind.d / exp_pow_table[exp80 >> 52];
     ST(0)       = (double) exp80final;
     FP_TAG_VALID;
     x87_push(mant);
@@ -56,7 +56,7 @@ opFXTRACT(uint32_t fetchdat)
 }
 
 static int
-opFCLEX(uint32_t fetchdat)
+opFCLEX(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -67,7 +67,7 @@ opFCLEX(uint32_t fetchdat)
 }
 
 static int
-opFINIT(uint32_t fetchdat)
+opFINIT(UNUSED(uint32_t fetchdat))
 {
     uint64_t *p;
     FP_ENTER();
@@ -78,7 +78,11 @@ opFINIT(uint32_t fetchdat)
     cpu_state.npxc                                = 0x37F;
 #endif
     codegen_set_rounding_mode(X87_ROUNDING_NEAREST);
+#ifdef FPU_8087
+    cpu_state.npxs &= 0x4700;
+#else
     cpu_state.npxs = 0;
+#endif
     p              = (uint64_t *) cpu_state.tag;
 #ifdef USE_NEW_DYNAREC
     *p = 0;
@@ -204,7 +208,7 @@ FSTOR(void)
     return cpu_state.abrt;
 }
 static int
-opFSTOR_a16(uint32_t fetchdat)
+opFSTOR_a16(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     fetch_ea_16(fetchdat);
@@ -406,7 +410,11 @@ FSAVE(void)
 
     cpu_state.npxc = 0x37F;
     codegen_set_rounding_mode(X87_ROUNDING_NEAREST);
+#ifdef FPU_8087
+    cpu_state.npxs &= 0x4700;
+#else
     cpu_state.npxs = 0;
+#endif
     p              = (uint64_t *) cpu_state.tag;
 #ifdef USE_NEW_DYNAREC
     *p = 0;
@@ -421,7 +429,7 @@ FSAVE(void)
     return cpu_state.abrt;
 }
 static int
-opFSAVE_a16(uint32_t fetchdat)
+opFSAVE_a16(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     fetch_ea_16(fetchdat);
@@ -442,7 +450,7 @@ opFSAVE_a32(uint32_t fetchdat)
 #endif
 
 static int
-opFSTSW_a16(uint32_t fetchdat)
+opFSTSW_a16(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     fetch_ea_16(fetchdat);
@@ -508,7 +516,7 @@ opFXCH(uint32_t fetchdat)
 }
 
 static int
-opFCHS(uint32_t fetchdat)
+opFCHS(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -520,7 +528,7 @@ opFCHS(uint32_t fetchdat)
 }
 
 static int
-opFABS(uint32_t fetchdat)
+opFABS(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -532,46 +540,78 @@ opFABS(uint32_t fetchdat)
 }
 
 static int
-opFTST(uint32_t fetchdat)
+opFTST(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
-    cpu_state.npxs &= ~(C0 | C2 | C3);
+    cpu_state.npxs &= ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
     if (ST(0) == 0.0)
-        cpu_state.npxs |= C3;
+        cpu_state.npxs |= FPU_SW_C3;
     else if (ST(0) < 0.0)
-        cpu_state.npxs |= C0;
+        cpu_state.npxs |= FPU_SW_C0;
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.ftst) : (x87_timings.ftst * cpu_multi));
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.ftst) : (x87_concurrency.ftst * cpu_multi));
     return 0;
 }
 
+#ifndef FPU_8087
 static int
-opFXAM(uint32_t fetchdat)
+opFTSTP(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
-    cpu_state.npxs &= ~(C0 | C1 | C2 | C3);
+    cpu_state.npxs &= ~(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
+    if (ST(0) == 0.0)
+        cpu_state.npxs |= FPU_SW_C3;
+    else if (ST(0) < 0.0)
+        cpu_state.npxs |= FPU_SW_C0;
+    x87_pop();
+    CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.ftst) : (x87_timings.ftst * cpu_multi));
+    CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.ftst) : (x87_concurrency.ftst * cpu_multi));
+    return 0;
+}
+#endif
+
+static int
+opFXAM(UNUSED(uint32_t fetchdat))
+{
+    FP_ENTER();
+    cpu_state.pc++;
+    cpu_state.npxs &= ~(FPU_SW_C0 | FPU_SW_C1 | FPU_SW_C2 | FPU_SW_C3);
 #ifdef USE_NEW_DYNAREC
     if (cpu_state.tag[cpu_state.TOP & 7] == TAG_EMPTY)
-        cpu_state.npxs |= (C0 | C3);
+        cpu_state.npxs |= (FPU_SW_C0 | FPU_SW_C3);
 #else
     if (cpu_state.tag[cpu_state.TOP & 7] == 3)
-        cpu_state.npxs |= (C0 | C3);
+        cpu_state.npxs |= (FPU_SW_C0 | FPU_SW_C3);
 #endif
-    else if (ST(0) == 0.0)
-        cpu_state.npxs |= C3;
-    else
-        cpu_state.npxs |= C2;
+    else switch (fpclassify(ST(0)))
+    {
+        case FP_SUBNORMAL:
+            cpu_state.npxs |= FPU_SW_C2 | FPU_SW_C3;
+            break;
+        case FP_NAN:
+            cpu_state.npxs |= FPU_SW_C0;
+            break;
+        case FP_INFINITE:
+            cpu_state.npxs |= FPU_SW_C0 | FPU_SW_C2;
+            break;
+        case FP_ZERO:
+            cpu_state.npxs |= FPU_SW_C3;
+            break;
+        case FP_NORMAL:
+            cpu_state.npxs |= FPU_SW_C2;
+            break;
+    }
     if (ST(0) < 0.0)
-        cpu_state.npxs |= C1;
+        cpu_state.npxs |= FPU_SW_C1;
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fxam) : (x87_timings.fxam * cpu_multi));
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fxam) : (x87_concurrency.fxam * cpu_multi));
     return 0;
 }
 
 static int
-opFLD1(uint32_t fetchdat)
+opFLD1(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -582,7 +622,7 @@ opFLD1(uint32_t fetchdat)
 }
 
 static int
-opFLDL2T(uint32_t fetchdat)
+opFLDL2T(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -593,7 +633,7 @@ opFLDL2T(uint32_t fetchdat)
 }
 
 static int
-opFLDL2E(uint32_t fetchdat)
+opFLDL2E(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -604,7 +644,7 @@ opFLDL2E(uint32_t fetchdat)
 }
 
 static int
-opFLDPI(uint32_t fetchdat)
+opFLDPI(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -615,7 +655,7 @@ opFLDPI(uint32_t fetchdat)
 }
 
 static int
-opFLDEG2(uint32_t fetchdat)
+opFLDEG2(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -626,7 +666,7 @@ opFLDEG2(uint32_t fetchdat)
 }
 
 static int
-opFLDLN2(uint32_t fetchdat)
+opFLDLN2(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -637,7 +677,7 @@ opFLDLN2(uint32_t fetchdat)
 }
 
 static int
-opFLDZ(uint32_t fetchdat)
+opFLDZ(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -649,7 +689,7 @@ opFLDZ(uint32_t fetchdat)
 }
 
 static int
-opF2XM1(uint32_t fetchdat)
+opF2XM1(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -661,7 +701,7 @@ opF2XM1(uint32_t fetchdat)
 }
 
 static int
-opFYL2X(uint32_t fetchdat)
+opFYL2X(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -674,7 +714,7 @@ opFYL2X(uint32_t fetchdat)
 }
 
 static int
-opFYL2XP1(uint32_t fetchdat)
+opFYL2XP1(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -687,21 +727,21 @@ opFYL2XP1(uint32_t fetchdat)
 }
 
 static int
-opFPTAN(uint32_t fetchdat)
+opFPTAN(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
     ST(0) = tan(ST(0));
     FP_TAG_VALID;
     x87_push(1.0);
-    cpu_state.npxs &= ~C2;
+    cpu_state.npxs &= ~FPU_SW_C2;
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fptan) : (x87_timings.fptan * cpu_multi));
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fptan) : (x87_concurrency.fptan * cpu_multi));
     return 0;
 }
 
 static int
-opFPATAN(uint32_t fetchdat)
+opFPATAN(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -714,7 +754,7 @@ opFPATAN(uint32_t fetchdat)
 }
 
 static int
-opFDECSTP(uint32_t fetchdat)
+opFDECSTP(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -729,7 +769,7 @@ opFDECSTP(uint32_t fetchdat)
 }
 
 static int
-opFINCSTP(uint32_t fetchdat)
+opFINCSTP(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -744,7 +784,7 @@ opFINCSTP(uint32_t fetchdat)
 }
 
 static int
-opFPREM(uint32_t fetchdat)
+opFPREM(UNUSED(uint32_t fetchdat))
 {
     int64_t temp64;
     FP_ENTER();
@@ -752,20 +792,20 @@ opFPREM(uint32_t fetchdat)
     temp64 = (int64_t) (ST(0) / ST(1));
     ST(0)  = ST(0) - (ST(1) * (double) temp64);
     FP_TAG_VALID;
-    cpu_state.npxs &= ~(C0 | C1 | C2 | C3);
+    cpu_state.npxs &= ~(FPU_SW_C0 | FPU_SW_C1 | FPU_SW_C2 | FPU_SW_C3);
     if (temp64 & 4)
-        cpu_state.npxs |= C0;
+        cpu_state.npxs |= FPU_SW_C0;
     if (temp64 & 2)
-        cpu_state.npxs |= C3;
+        cpu_state.npxs |= FPU_SW_C3;
     if (temp64 & 1)
-        cpu_state.npxs |= C1;
+        cpu_state.npxs |= FPU_SW_C1;
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fprem) : (x87_timings.fprem * cpu_multi));
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fprem) : (x87_concurrency.fprem * cpu_multi));
     return 0;
 }
 
 static int
-opFPREM1(uint32_t fetchdat)
+opFPREM1(UNUSED(uint32_t fetchdat))
 {
     int64_t temp64;
     FP_ENTER();
@@ -773,20 +813,20 @@ opFPREM1(uint32_t fetchdat)
     temp64 = (int64_t) (ST(0) / ST(1));
     ST(0)  = ST(0) - (ST(1) * (double) temp64);
     FP_TAG_VALID;
-    cpu_state.npxs &= ~(C0 | C1 | C2 | C3);
+    cpu_state.npxs &= ~(FPU_SW_C0 | FPU_SW_C1 | FPU_SW_C2 | FPU_SW_C3);
     if (temp64 & 4)
-        cpu_state.npxs |= C0;
+        cpu_state.npxs |= FPU_SW_C0;
     if (temp64 & 2)
-        cpu_state.npxs |= C3;
+        cpu_state.npxs |= FPU_SW_C3;
     if (temp64 & 1)
-        cpu_state.npxs |= C1;
+        cpu_state.npxs |= FPU_SW_C1;
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fprem1) : (x87_timings.fprem1 * cpu_multi));
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fprem1) : (x87_concurrency.fprem1 * cpu_multi));
     return 0;
 }
 
 static int
-opFSQRT(uint32_t fetchdat)
+opFSQRT(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -799,7 +839,7 @@ opFSQRT(uint32_t fetchdat)
 
 #ifndef FPU_8087
 static int
-opFSINCOS(uint32_t fetchdat)
+opFSINCOS(UNUSED(uint32_t fetchdat))
 {
     double td;
     FP_ENTER();
@@ -808,7 +848,7 @@ opFSINCOS(uint32_t fetchdat)
     ST(0) = sin(td);
     FP_TAG_VALID;
     x87_push(cos(td));
-    cpu_state.npxs &= ~C2;
+    cpu_state.npxs &= ~FPU_SW_C2;
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fsincos) : (x87_timings.fsincos * cpu_multi));
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fsincos) : (x87_concurrency.fsincos * cpu_multi));
     return 0;
@@ -816,7 +856,7 @@ opFSINCOS(uint32_t fetchdat)
 #endif
 
 static int
-opFRNDINT(uint32_t fetchdat)
+opFRNDINT(UNUSED(uint32_t fetchdat))
 {
     double dst0;
 
@@ -830,8 +870,71 @@ opFRNDINT(uint32_t fetchdat)
     return 0;
 }
 
+#ifndef FPU_8087
+#ifndef OPS_286_386
 static int
-opFSCALE(uint32_t fetchdat)
+opFRINT2(UNUSED(uint32_t fetchdat))
+{
+    double dst0, st0, integral, frac;
+    int prevRound;
+
+    FP_ENTER();
+    cpu_state.pc++;
+    prevRound = fegetround();
+    fesetround(FE_TONEAREST);
+    st0 = ST(0);
+    frac = modf(st0, &integral);
+    if (frac == 0.5 || frac == -0.5) {
+        dst0 = (st0 < 0) ? floor(st0) : ceil(st0);
+    } else {
+        dst0 = round(st0);
+    }
+    fesetround(prevRound);
+    ST(0) = (double) dst0;
+    FP_TAG_VALID;
+    CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.frndint) : (x87_timings.frndint * cpu_multi));
+    CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.frndint) : (x87_concurrency.frndint * cpu_multi));
+    return 0;
+}
+
+static int
+opFRINEAR(UNUSED(uint32_t fetchdat))
+{
+    int prevRound;
+
+    FP_ENTER();
+    cpu_state.pc++;
+    prevRound = fegetround();
+    fesetround(FE_TONEAREST);
+    ST(0) = (double) x87_fround_nearest(ST(0));
+    fesetround(prevRound);
+    FP_TAG_VALID;
+    CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.frndint) : (x87_timings.frndint * cpu_multi));
+    CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.frndint) : (x87_concurrency.frndint * cpu_multi));
+    return 0;
+}
+#endif
+
+static int
+opFRICHOP(UNUSED(uint32_t fetchdat))
+{
+    int prevRound;
+
+    FP_ENTER();
+    cpu_state.pc++;
+    prevRound = fegetround();
+    fesetround(FE_TONEAREST);
+    ST(0) = (double) ((int64_t)(ST(0)));
+    fesetround(prevRound);
+    FP_TAG_VALID;
+    CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.frndint) : (x87_timings.frndint * cpu_multi));
+    CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.frndint) : (x87_concurrency.frndint * cpu_multi));
+    return 0;
+}
+#endif
+
+static int
+opFSCALE(UNUSED(uint32_t fetchdat))
 {
     int64_t temp64;
     FP_ENTER();
@@ -847,26 +950,26 @@ opFSCALE(uint32_t fetchdat)
 
 #ifndef FPU_8087
 static int
-opFSIN(uint32_t fetchdat)
+opFSIN(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
     ST(0) = sin(ST(0));
     FP_TAG_VALID;
-    cpu_state.npxs &= ~C2;
+    cpu_state.npxs &= ~FPU_SW_C2;
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fsin_cos) : (x87_timings.fsin_cos * cpu_multi));
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fsin_cos) : (x87_concurrency.fsin_cos * cpu_multi));
     return 0;
 }
 
 static int
-opFCOS(uint32_t fetchdat)
+opFCOS(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
     ST(0) = cos(ST(0));
     FP_TAG_VALID;
-    cpu_state.npxs &= ~C2;
+    cpu_state.npxs &= ~FPU_SW_C2;
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fsin_cos) : (x87_timings.fsin_cos * cpu_multi));
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fsin_cos) : (x87_concurrency.fsin_cos * cpu_multi));
     return 0;
@@ -901,7 +1004,7 @@ FLDENV(void)
 }
 
 static int
-opFLDENV_a16(uint32_t fetchdat)
+opFLDENV_a16(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     fetch_ea_16(fetchdat);
@@ -922,7 +1025,7 @@ opFLDENV_a32(uint32_t fetchdat)
 #endif
 
 static int
-opFLDCW_a16(uint32_t fetchdat)
+opFLDCW_a16(UNUSED(uint32_t fetchdat))
 {
     uint16_t tempw;
     FP_ENTER();
@@ -1003,7 +1106,7 @@ FSTENV(void)
 }
 
 static int
-opFSTENV_a16(uint32_t fetchdat)
+opFSTENV_a16(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     fetch_ea_16(fetchdat);
@@ -1024,7 +1127,7 @@ opFSTENV_a32(uint32_t fetchdat)
 #endif
 
 static int
-opFSTCW_a16(uint32_t fetchdat)
+opFSTCW_a16(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     fetch_ea_16(fetchdat);
diff --git a/src/cpu/x87_ops_sf.h b/src/cpu/x87_ops_sf.h
index 137919fa9..adbaa2003 100644
--- a/src/cpu/x87_ops_sf.h
+++ b/src/cpu/x87_ops_sf.h
@@ -235,11 +235,12 @@ fpu_load_environment(void)
 }
 
 static int
-sf_FLDCW_a16(uint32_t fetchdat)
+sf_FLDCW_a16(UNUSED(uint32_t fetchdat))
 {
     uint16_t tempw;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     fetch_ea_16(fetchdat);
     SEG_CHECK_READ(cpu_state.ea_seg);
     tempw = geteaw();
@@ -265,6 +266,7 @@ sf_FLDCW_a32(uint32_t fetchdat)
     uint16_t tempw;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     fetch_ea_32(fetchdat);
     SEG_CHECK_READ(cpu_state.ea_seg);
     tempw = geteaw();
@@ -286,7 +288,7 @@ sf_FLDCW_a32(uint32_t fetchdat)
 #endif
 
 static int
-sf_FNSTCW_a16(uint32_t fetchdat)
+sf_FNSTCW_a16(UNUSED(uint32_t fetchdat))
 {
     uint16_t cwd = i387_get_control_word();
 
@@ -315,7 +317,7 @@ sf_FNSTCW_a32(uint32_t fetchdat)
 #endif
 
 static int
-sf_FNSTSW_a16(uint32_t fetchdat)
+sf_FNSTSW_a16(UNUSED(uint32_t fetchdat))
 {
     uint16_t swd = i387_get_status_word();
 
@@ -352,12 +354,12 @@ sf_FI(uint32_t fetchdat)
     fpu_state.cwd &= ~FPU_SW_Summary;
     if (rmdat == 0xe1)
         fpu_state.cwd |= FPU_SW_Summary;
-    wait(3, 0);
+    wait_cycs(3, 0);
     return 0;
 }
 #else
 static int
-sf_FNSTSW_AX(uint32_t fetchdat)
+sf_FNSTSW_AX(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -369,18 +371,19 @@ sf_FNSTSW_AX(uint32_t fetchdat)
 #endif
 
 static int
-sf_FRSTOR_a16(uint32_t fetchdat)
+sf_FRSTOR_a16(UNUSED(uint32_t fetchdat))
 {
     floatx80 tmp;
     int      offset;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     fetch_ea_16(fetchdat);
     SEG_CHECK_READ(cpu_state.ea_seg);
     offset = fpu_load_environment();
     for (int n = 0; n < 8; n++) {
-        tmp.fraction = readmemq(easeg, offset + (n * 10));
-        tmp.exp      = readmemw(easeg, offset + (n * 10) + 8);
+        tmp.signif  = readmemq(easeg, offset + (n * 10));
+        tmp.signExp = readmemw(easeg, offset + (n * 10) + 8);
         FPU_save_regi_tag(tmp, IS_TAG_EMPTY(n) ? X87_TAG_EMPTY : FPU_tagof(tmp), n);
     }
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.frstor) : (x87_timings.frstor * cpu_multi));
@@ -395,12 +398,13 @@ sf_FRSTOR_a32(uint32_t fetchdat)
     int      offset;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     fetch_ea_32(fetchdat);
     SEG_CHECK_READ(cpu_state.ea_seg);
     offset = fpu_load_environment();
     for (int n = 0; n < 8; n++) {
-        tmp.fraction = readmemq(easeg, offset + (n * 10));
-        tmp.exp      = readmemw(easeg, offset + (n * 10) + 8);
+        tmp.signif   = readmemq(easeg, offset + (n * 10));
+        tmp.signExp  = readmemw(easeg, offset + (n * 10) + 8);
         FPU_save_regi_tag(tmp, IS_TAG_EMPTY(n) ? X87_TAG_EMPTY : FPU_tagof(tmp), n);
     }
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.frstor) : (x87_timings.frstor * cpu_multi));
@@ -410,7 +414,7 @@ sf_FRSTOR_a32(uint32_t fetchdat)
 #endif
 
 static int
-sf_FNSAVE_a16(uint32_t fetchdat)
+sf_FNSAVE_a16(UNUSED(uint32_t fetchdat))
 {
     floatx80 stn;
     int      offset;
@@ -422,16 +426,17 @@ sf_FNSAVE_a16(uint32_t fetchdat)
     /* save all registers in stack order. */
     for (int m = 0; m < 8; m++) {
         stn = FPU_read_regi(m);
-        writememq(easeg, offset + (m * 10), stn.fraction);
-        writememw(easeg, offset + (m * 10) + 8, stn.exp);
+        writememq(easeg, offset + (m * 10), stn.signif);
+        writememw(easeg, offset + (m * 10) + 8, stn.signExp);
     }
 
 #ifdef FPU_8087
-    fpu_state.swd = 0x3FF;
+    fpu_state.cwd = 0x3FF;
+    fpu_state.swd  &= 0x4700;
 #else
     fpu_state.cwd = 0x37F;
-#endif
     fpu_state.swd   = 0;
+#endif
     fpu_state.tos   = 0;
     fpu_state.tag   = 0xffff;
     cpu_state.ismmx = 0;
@@ -458,12 +463,12 @@ sf_FNSAVE_a32(uint32_t fetchdat)
     /* save all registers in stack order. */
     for (int m = 0; m < 8; m++) {
         stn = FPU_read_regi(m);
-        writememq(easeg, offset + (m * 10), stn.fraction);
-        writememw(easeg, offset + (m * 10) + 8, stn.exp);
+        writememq(easeg, offset + (m * 10), stn.signif);
+        writememw(easeg, offset + (m * 10) + 8, stn.signExp);
     }
 
 #    ifdef FPU_8087
-    fpu_state.swd = 0x3FF;
+    fpu_state.cwd = 0x3FF;
 #    else
     fpu_state.cwd = 0x37F;
 #    endif
@@ -483,7 +488,7 @@ sf_FNSAVE_a32(uint32_t fetchdat)
 #endif
 
 static int
-sf_FNCLEX(uint32_t fetchdat)
+sf_FNCLEX(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
@@ -494,16 +499,17 @@ sf_FNCLEX(uint32_t fetchdat)
 }
 
 static int
-sf_FNINIT(uint32_t fetchdat)
+sf_FNINIT(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     cpu_state.pc++;
 #ifdef FPU_8087
     fpu_state.cwd = 0x3FF;
+    fpu_state.swd  &= 0x4700;
 #else
     fpu_state.cwd = 0x37F;
-#endif
     fpu_state.swd   = 0;
+#endif
     fpu_state.tos   = 0;
     fpu_state.tag   = 0xffff;
     fpu_state.foo   = 0;
@@ -519,11 +525,12 @@ sf_FNINIT(uint32_t fetchdat)
 }
 
 static int
-sf_FLDENV_a16(uint32_t fetchdat)
+sf_FLDENV_a16(UNUSED(uint32_t fetchdat))
 {
     int tag;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     fetch_ea_16(fetchdat);
     SEG_CHECK_READ(cpu_state.ea_seg);
     fpu_load_environment();
@@ -546,6 +553,7 @@ sf_FLDENV_a32(uint32_t fetchdat)
     int tag;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     fetch_ea_32(fetchdat);
     SEG_CHECK_READ(cpu_state.ea_seg);
     fpu_load_environment();
@@ -564,7 +572,7 @@ sf_FLDENV_a32(uint32_t fetchdat)
 #endif
 
 static int
-sf_FNSTENV_a16(uint32_t fetchdat)
+sf_FNSTENV_a16(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     fetch_ea_16(fetchdat);
@@ -597,9 +605,10 @@ sf_FNSTENV_a32(uint32_t fetchdat)
 #endif
 
 static int
-sf_FNOP(uint32_t fetchdat)
+sf_FNOP(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fnop) : (x87_timings.fnop * cpu_multi));
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fnop) : (x87_concurrency.fnop * cpu_multi));
diff --git a/src/cpu/x87_ops_sf_arith.h b/src/cpu/x87_ops_sf_arith.h
index 5144062bb..7abde322b 100644
--- a/src/cpu/x87_ops_sf_arith.h
+++ b/src/cpu/x87_ops_sf_arith.h
@@ -1,8 +1,8 @@
 #define sf_FPU(name, optype, a_size, load_var, rw, use_var, is_nan, cycle_postfix)                                                                 \
     static int sf_FADD##name##_a##a_size(uint32_t fetchdat)                                                                                        \
     {                                                                                                                                              \
-        floatx80              a, result;                                                                                                           \
-        struct float_status_t status;                                                                                                              \
+        floatx80           a, result;                                                                                                              \
+        struct softfloat_status_t status;                                                                                                          \
         optype                temp;                                                                                                                \
         FP_ENTER();                                                                                                                                \
         FPU_check_pending_exceptions();                                                                                                            \
@@ -19,9 +19,9 @@
         status = i387cw_to_softfloat_status_word(i387_get_control_word());                                                                         \
         a      = FPU_read_regi(0);                                                                                                                 \
         if (!is_nan)                                                                                                                               \
-            result = floatx80_add(a, use_var, &status);                                                                                            \
+            result = extF80_add(a, use_var, &status);                                                                                              \
                                                                                                                                                    \
-        if (!FPU_exception(fetchdat, status.float_exception_flags, 0))                                                                             \
+        if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))                                                                          \
             FPU_save_regi(result, 0);                                                                                                              \
                                                                                                                                                    \
 next_ins:                                                                                                                                          \
@@ -31,8 +31,8 @@ next_ins:
     }                                                                                                                                              \
     static int sf_FDIV##name##_a##a_size(uint32_t fetchdat)                                                                                        \
     {                                                                                                                                              \
-        floatx80              a, result;                                                                                                           \
-        struct float_status_t status;                                                                                                              \
+        floatx80           a, result;                                                                                                              \
+        struct softfloat_status_t status;                                                                                                          \
         optype                temp;                                                                                                                \
         FP_ENTER();                                                                                                                                \
         FPU_check_pending_exceptions();                                                                                                            \
@@ -49,9 +49,9 @@ next_ins:
         status = i387cw_to_softfloat_status_word(i387_get_control_word());                                                                         \
         a      = FPU_read_regi(0);                                                                                                                 \
         if (!is_nan) {                                                                                                                             \
-            result = floatx80_div(a, use_var, &status);                                                                                            \
+            result = extF80_div(a, use_var, &status);                                                                                              \
         }                                                                                                                                          \
-        if (!FPU_exception(fetchdat, status.float_exception_flags, 0))                                                                             \
+        if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))                                                                          \
             FPU_save_regi(result, 0);                                                                                                              \
                                                                                                                                                    \
 next_ins:                                                                                                                                          \
@@ -61,8 +61,8 @@ next_ins:
     }                                                                                                                                              \
     static int sf_FDIVR##name##_a##a_size(uint32_t fetchdat)                                                                                       \
     {                                                                                                                                              \
-        floatx80              a, result;                                                                                                           \
-        struct float_status_t status;                                                                                                              \
+        floatx80           a, result;                                                                                                              \
+        struct softfloat_status_t status;                                                                                                          \
         optype                temp;                                                                                                                \
         FP_ENTER();                                                                                                                                \
         FPU_check_pending_exceptions();                                                                                                            \
@@ -79,9 +79,9 @@ next_ins:
         status = i387cw_to_softfloat_status_word(i387_get_control_word());                                                                         \
         a      = FPU_read_regi(0);                                                                                                                 \
         if (!is_nan) {                                                                                                                             \
-            result = floatx80_div(use_var, a, &status);                                                                                            \
+            result = extF80_div(use_var, a, &status);                                                                                              \
         }                                                                                                                                          \
-        if (!FPU_exception(fetchdat, status.float_exception_flags, 0))                                                                             \
+        if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))                                                                          \
             FPU_save_regi(result, 0);                                                                                                              \
                                                                                                                                                    \
 next_ins:                                                                                                                                          \
@@ -91,8 +91,8 @@ next_ins:
     }                                                                                                                                              \
     static int sf_FMUL##name##_a##a_size(uint32_t fetchdat)                                                                                        \
     {                                                                                                                                              \
-        floatx80              a, result;                                                                                                           \
-        struct float_status_t status;                                                                                                              \
+        floatx80           a, result;                                                                                                              \
+        struct softfloat_status_t status;                                                                                                          \
         optype                temp;                                                                                                                \
         FP_ENTER();                                                                                                                                \
         FPU_check_pending_exceptions();                                                                                                            \
@@ -109,9 +109,9 @@ next_ins:
         status = i387cw_to_softfloat_status_word(i387_get_control_word());                                                                         \
         a      = FPU_read_regi(0);                                                                                                                 \
         if (!is_nan) {                                                                                                                             \
-            result = floatx80_mul(a, use_var, &status);                                                                                            \
+            result = extF80_mul(a, use_var, &status);                                                                                              \
         }                                                                                                                                          \
-        if (!FPU_exception(fetchdat, status.float_exception_flags, 0))                                                                             \
+        if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))                                                                          \
             FPU_save_regi(result, 0);                                                                                                              \
                                                                                                                                                    \
 next_ins:                                                                                                                                          \
@@ -121,8 +121,8 @@ next_ins:
     }                                                                                                                                              \
     static int sf_FSUB##name##_a##a_size(uint32_t fetchdat)                                                                                        \
     {                                                                                                                                              \
-        floatx80              a, result;                                                                                                           \
-        struct float_status_t status;                                                                                                              \
+        floatx80           a, result;                                                                                                              \
+        struct softfloat_status_t status;                                                                                                          \
         optype                temp;                                                                                                                \
         FP_ENTER();                                                                                                                                \
         FPU_check_pending_exceptions();                                                                                                            \
@@ -139,9 +139,9 @@ next_ins:
         status = i387cw_to_softfloat_status_word(i387_get_control_word());                                                                         \
         a      = FPU_read_regi(0);                                                                                                                 \
         if (!is_nan)                                                                                                                               \
-            result = floatx80_sub(a, use_var, &status);                                                                                            \
+            result = extF80_sub(a, use_var, &status);                                                                                              \
                                                                                                                                                    \
-        if (!FPU_exception(fetchdat, status.float_exception_flags, 0))                                                                             \
+        if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))                                                                          \
             FPU_save_regi(result, 0);                                                                                                              \
                                                                                                                                                    \
 next_ins:                                                                                                                                          \
@@ -151,8 +151,8 @@ next_ins:
     }                                                                                                                                              \
     static int sf_FSUBR##name##_a##a_size(uint32_t fetchdat)                                                                                       \
     {                                                                                                                                              \
-        floatx80              a, result;                                                                                                           \
-        struct float_status_t status;                                                                                                              \
+        floatx80           a, result;                                                                                                              \
+        struct softfloat_status_t status;                                                                                                          \
         optype                temp;                                                                                                                \
         FP_ENTER();                                                                                                                                \
         FPU_check_pending_exceptions();                                                                                                            \
@@ -169,9 +169,9 @@ next_ins:
         status = i387cw_to_softfloat_status_word(i387_get_control_word());                                                                         \
         a      = FPU_read_regi(0);                                                                                                                 \
         if (!is_nan)                                                                                                                               \
-            result = floatx80_sub(use_var, a, &status);                                                                                            \
+            result = extF80_sub(use_var, a, &status);                                                                                              \
                                                                                                                                                    \
-        if (!FPU_exception(fetchdat, status.float_exception_flags, 0))                                                                             \
+        if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))                                                                          \
             FPU_save_regi(result, 0);                                                                                                              \
                                                                                                                                                    \
 next_ins:                                                                                                                                          \
@@ -181,31 +181,31 @@ next_ins:
     }
 
 // clang-format off
-sf_FPU(s, float32, 16, temp, geteal(), float32_to_floatx80(temp, &status), FPU_handle_NaN32(a, temp, &result, &status), _32)
+sf_FPU(s, float32, 16, temp, geteal(), f32_to_extF80(temp, &status), FPU_handle_NaN32(a, temp, &result, &status), _32)
 #ifndef FPU_8087
-sf_FPU(s, float32, 32, temp, geteal(), float32_to_floatx80(temp, &status), FPU_handle_NaN32(a, temp, &result, &status), _32)
+sf_FPU(s, float32, 32, temp, geteal(), f32_to_extF80(temp, &status), FPU_handle_NaN32(a, temp, &result, &status), _32)
 #endif
-sf_FPU(d, float64, 16, temp, geteaq(), float64_to_floatx80(temp, &status), FPU_handle_NaN64(a, temp, &result, &status), _64)
+sf_FPU(d, float64, 16, temp, geteaq(), f64_to_extF80(temp, &status), FPU_handle_NaN64(a, temp, &result, &status), _64)
 #ifndef FPU_8087
-sf_FPU(d, float64, 32, temp, geteaq(), float64_to_floatx80(temp, &status), FPU_handle_NaN64(a, temp, &result, &status), _64)
+sf_FPU(d, float64, 32, temp, geteaq(), f64_to_extF80(temp, &status), FPU_handle_NaN64(a, temp, &result, &status), _64)
 #endif
 
-sf_FPU(iw, uint16_t, 16, temp, geteaw(), int32_to_floatx80((int16_t)temp), 0, _i16)
+sf_FPU(iw, uint16_t, 16, temp, geteaw(), i32_to_extF80((int16_t)temp), 0, _i16)
 #ifndef FPU_8087
-sf_FPU(iw, uint16_t, 32, temp, geteaw(), int32_to_floatx80((int16_t)temp), 0, _i16)
+sf_FPU(iw, uint16_t, 32, temp, geteaw(), i32_to_extF80((int16_t)temp), 0, _i16)
 #endif
-sf_FPU(il, uint32_t, 16, temp, geteal(), int32_to_floatx80((int32_t)temp), 0, _i32)
+sf_FPU(il, uint32_t, 16, temp, geteal(), i32_to_extF80((int32_t)temp), 0, _i32)
 #ifndef FPU_8087
-sf_FPU(il, uint32_t, 32, temp, geteal(), int32_to_floatx80((int32_t)temp), 0, _i32)
+sf_FPU(il, uint32_t, 32, temp, geteal(), i32_to_extF80((int32_t)temp), 0, _i32)
 #endif
-    // clang-format on
+// clang-format on
 
-    static int sf_FADD_st0_stj(uint32_t fetchdat)
+static int sf_FADD_st0_stj(uint32_t fetchdat)
 {
     floatx80              a;
     floatx80              b;
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -218,9 +218,9 @@ sf_FPU(il, uint32_t, 32, temp, geteal(), int32_to_floatx80((int32_t)temp), 0, _i
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(fetchdat & 7);
-    result = floatx80_add(a, b, &status);
+    result = extF80_add(a, b, &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0))
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))
         FPU_save_regi(result, 0);
 
 next_ins:
@@ -234,7 +234,7 @@ sf_FADD_sti_st0(uint32_t fetchdat)
     floatx80              a;
     floatx80              b;
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -247,9 +247,9 @@ sf_FADD_sti_st0(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(fetchdat & 7);
     b      = FPU_read_regi(0);
-    result = floatx80_add(a, b, &status);
+    result = extF80_add(a, b, &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0))
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))
         FPU_save_regi(result, fetchdat & 7);
 
 next_ins:
@@ -264,7 +264,7 @@ sf_FADDP_sti_st0(uint32_t fetchdat)
     floatx80              a;
     floatx80              b;
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -277,9 +277,9 @@ sf_FADDP_sti_st0(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(fetchdat & 7);
     b      = FPU_read_regi(0);
-    result = floatx80_add(a, b, &status);
+    result = extF80_add(a, b, &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_save_regi(result, fetchdat & 7);
         FPU_pop();
     }
@@ -296,9 +296,10 @@ sf_FDIV_st0_stj(uint32_t fetchdat)
     floatx80              a;
     floatx80              b;
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
@@ -308,9 +309,9 @@ sf_FDIV_st0_stj(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(fetchdat & 7);
-    result = floatx80_div(a, b, &status);
+    result = extF80_div(a, b, &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0))
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))
         FPU_save_regi(result, 0);
 
 next_ins:
@@ -325,9 +326,10 @@ sf_FDIV_sti_st0(uint32_t fetchdat)
     floatx80              a;
     floatx80              b;
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
@@ -337,9 +339,9 @@ sf_FDIV_sti_st0(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(fetchdat & 7);
     b      = FPU_read_regi(0);
-    result = floatx80_div(a, b, &status);
+    result = extF80_div(a, b, &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0))
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))
         FPU_save_regi(result, fetchdat & 7);
 
 next_ins:
@@ -353,9 +355,10 @@ sf_FDIVP_sti_st0(uint32_t fetchdat)
     floatx80              a;
     floatx80              b;
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
@@ -365,9 +368,9 @@ sf_FDIVP_sti_st0(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(fetchdat & 7);
     b      = FPU_read_regi(0);
-    result = floatx80_div(a, b, &status);
+    result = extF80_div(a, b, &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_save_regi(result, fetchdat & 7);
         FPU_pop();
     }
@@ -384,9 +387,10 @@ sf_FDIVR_st0_stj(uint32_t fetchdat)
     floatx80              a;
     floatx80              b;
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
@@ -396,9 +400,9 @@ sf_FDIVR_st0_stj(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(fetchdat & 7);
     b      = FPU_read_regi(0);
-    result = floatx80_div(a, b, &status);
+    result = extF80_div(a, b, &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0))
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))
         FPU_save_regi(result, 0);
 
 next_ins:
@@ -412,9 +416,10 @@ sf_FDIVR_sti_st0(uint32_t fetchdat)
     floatx80              a;
     floatx80              b;
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
@@ -424,9 +429,9 @@ sf_FDIVR_sti_st0(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(fetchdat & 7);
-    result = floatx80_div(a, b, &status);
+    result = extF80_div(a, b, &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0))
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))
         FPU_save_regi(result, fetchdat & 7);
 
 next_ins:
@@ -440,9 +445,10 @@ sf_FDIVRP_sti_st0(uint32_t fetchdat)
     floatx80              a;
     floatx80              b;
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
@@ -452,9 +458,9 @@ sf_FDIVRP_sti_st0(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(fetchdat & 7);
-    result = floatx80_div(a, b, &status);
+    result = extF80_div(a, b, &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_save_regi(result, fetchdat & 7);
         FPU_pop();
     }
@@ -471,9 +477,10 @@ sf_FMUL_st0_stj(uint32_t fetchdat)
     floatx80              a;
     floatx80              b;
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
@@ -483,9 +490,9 @@ sf_FMUL_st0_stj(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(fetchdat & 7);
-    result = floatx80_mul(a, b, &status);
+    result = extF80_mul(a, b, &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_save_regi(result, 0);
     }
 
@@ -500,9 +507,10 @@ sf_FMUL_sti_st0(uint32_t fetchdat)
     floatx80              a;
     floatx80              b;
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
@@ -512,9 +520,9 @@ sf_FMUL_sti_st0(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(fetchdat & 7);
-    result = floatx80_mul(a, b, &status);
+    result = extF80_mul(a, b, &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_save_regi(result, fetchdat & 7);
     }
 
@@ -529,9 +537,10 @@ sf_FMULP_sti_st0(uint32_t fetchdat)
     floatx80              a;
     floatx80              b;
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
@@ -541,9 +550,9 @@ sf_FMULP_sti_st0(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(fetchdat & 7);
     b      = FPU_read_regi(0);
-    result = floatx80_mul(a, b, &status);
+    result = extF80_mul(a, b, &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_save_regi(result, fetchdat & 7);
         FPU_pop();
     }
@@ -560,9 +569,10 @@ sf_FSUB_st0_stj(uint32_t fetchdat)
     floatx80              a;
     floatx80              b;
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
@@ -572,9 +582,9 @@ sf_FSUB_st0_stj(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(fetchdat & 7);
-    result = floatx80_sub(a, b, &status);
+    result = extF80_sub(a, b, &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_save_regi(result, 0);
     }
 
@@ -589,9 +599,10 @@ sf_FSUB_sti_st0(uint32_t fetchdat)
     floatx80              a;
     floatx80              b;
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
@@ -601,9 +612,9 @@ sf_FSUB_sti_st0(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(fetchdat & 7);
     b      = FPU_read_regi(0);
-    result = floatx80_sub(a, b, &status);
+    result = extF80_sub(a, b, &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_save_regi(result, fetchdat & 7);
     }
 
@@ -618,9 +629,10 @@ sf_FSUBP_sti_st0(uint32_t fetchdat)
     floatx80              a;
     floatx80              b;
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
@@ -630,9 +642,9 @@ sf_FSUBP_sti_st0(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(fetchdat & 7);
     b      = FPU_read_regi(0);
-    result = floatx80_sub(a, b, &status);
+    result = extF80_sub(a, b, &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_save_regi(result, fetchdat & 7);
         FPU_pop();
     }
@@ -649,9 +661,10 @@ sf_FSUBR_st0_stj(uint32_t fetchdat)
     floatx80              a;
     floatx80              b;
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
@@ -661,9 +674,9 @@ sf_FSUBR_st0_stj(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(fetchdat & 7);
     b      = FPU_read_regi(0);
-    result = floatx80_sub(a, b, &status);
+    result = extF80_sub(a, b, &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_save_regi(result, 0);
     }
 
@@ -678,9 +691,10 @@ sf_FSUBR_sti_st0(uint32_t fetchdat)
     floatx80              a;
     floatx80              b;
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
@@ -690,9 +704,9 @@ sf_FSUBR_sti_st0(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(fetchdat & 7);
-    result = floatx80_sub(a, b, &status);
+    result = extF80_sub(a, b, &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_save_regi(result, fetchdat & 7);
     }
 
@@ -707,9 +721,10 @@ sf_FSUBRP_sti_st0(uint32_t fetchdat)
     floatx80              a;
     floatx80              b;
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
@@ -719,9 +734,9 @@ sf_FSUBRP_sti_st0(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(fetchdat & 7);
-    result = floatx80_sub(a, b, &status);
+    result = extF80_sub(a, b, &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_save_regi(result, fetchdat & 7);
         FPU_pop();
     }
@@ -736,9 +751,10 @@ static int
 sf_FSQRT(uint32_t fetchdat)
 {
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0)) {
@@ -746,9 +762,9 @@ sf_FSQRT(uint32_t fetchdat)
         goto next_ins;
     }
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
-    result = floatx80_sqrt(FPU_read_regi(0), &status);
+    result = extF80_sqrt(FPU_read_regi(0), &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_save_regi(result, 0);
     }
 
@@ -762,9 +778,10 @@ static int
 sf_FRNDINT(uint32_t fetchdat)
 {
     floatx80              result;
-    struct float_status_t status;
+    struct softfloat_status_t status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0)) {
@@ -772,9 +789,9 @@ sf_FRNDINT(uint32_t fetchdat)
         goto next_ins;
     }
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
-    result = floatx80_round_to_int(FPU_read_regi(0), &status);
+    result = extF80_roundToInt_normal(FPU_read_regi(0), &status);
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_save_regi(result, 0);
     }
 
@@ -783,3 +800,88 @@ next_ins:
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.frndint) : (x87_concurrency.frndint * cpu_multi));
     return 0;
 }
+
+#ifndef FPU_8087
+#ifndef OPS_286_386
+static int
+sf_FRINT2(uint32_t fetchdat)
+{
+    floatx80              result;
+    struct softfloat_status_t status;
+
+    FP_ENTER();
+    FPU_check_pending_exceptions();
+    cpu_state.pc++;
+    clear_C1();
+    if (IS_TAG_EMPTY(0)) {
+        FPU_stack_underflow(fetchdat, 0, 0);
+        goto next_ins;
+    }
+    status = i387cw_to_softfloat_status_word(i387_get_control_word());
+    result = extF80_roundToInt(FPU_read_regi(0), softfloat_round_near_maxMag, true, &status);
+
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
+        FPU_save_regi(result, 0);
+    }
+
+next_ins:
+    CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.frndint) : (x87_timings.frndint * cpu_multi));
+    CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.frndint) : (x87_concurrency.frndint * cpu_multi));
+    return 0;
+}
+
+static int
+sf_FRINEAR(uint32_t fetchdat)
+{
+    floatx80              result;
+    struct softfloat_status_t status;
+
+    FP_ENTER();
+    FPU_check_pending_exceptions();
+    cpu_state.pc++;
+    clear_C1();
+    if (IS_TAG_EMPTY(0)) {
+        FPU_stack_underflow(fetchdat, 0, 0);
+        goto next_ins;
+    }
+    status = i387cw_to_softfloat_status_word(i387_get_control_word());
+    result = extF80_roundToInt(FPU_read_regi(0), softfloat_round_near_even, true, &status);
+
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
+        FPU_save_regi(result, 0);
+    }
+
+next_ins:
+    CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.frndint) : (x87_timings.frndint * cpu_multi));
+    CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.frndint) : (x87_concurrency.frndint * cpu_multi));
+    return 0;
+}
+#endif
+
+static int
+sf_FRICHOP(uint32_t fetchdat)
+{
+    floatx80              result;
+    struct softfloat_status_t status;
+
+    FP_ENTER();
+    FPU_check_pending_exceptions();
+    cpu_state.pc++;
+    clear_C1();
+    if (IS_TAG_EMPTY(0)) {
+        FPU_stack_underflow(fetchdat, 0, 0);
+        goto next_ins;
+    }
+    status = i387cw_to_softfloat_status_word(i387_get_control_word());
+    result = extF80_roundToInt(FPU_read_regi(0), softfloat_round_to_zero, true, &status);
+
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
+        FPU_save_regi(result, 0);
+    }
+
+next_ins:
+    CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.frndint) : (x87_timings.frndint * cpu_multi));
+    CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.frndint) : (x87_concurrency.frndint * cpu_multi));
+    return 0;
+}
+#endif
diff --git a/src/cpu/x87_ops_sf_compare.h b/src/cpu/x87_ops_sf_compare.h
index 6b4c1cb62..d90526b82 100644
--- a/src/cpu/x87_ops_sf_compare.h
+++ b/src/cpu/x87_ops_sf_compare.h
@@ -1,11 +1,12 @@
 #define cmp_FPU(name, optype, a_size, load_var, rw, use_var, is_nan, cycle_postfix)                                                                \
     static int sf_FCOM##name##_a##a_size(uint32_t fetchdat)                                                                                        \
     {                                                                                                                                              \
-        floatx80              a;                                                                                                                   \
-        int                   rc;                                                                                                                  \
-        struct float_status_t status;                                                                                                              \
-        optype                temp;                                                                                                                \
+        floatx80                  a;                                                                                                               \
+        int                       rc;                                                                                                              \
+        struct softfloat_status_t status;                                                                                                          \
+        optype                    temp;                                                                                                            \
         FP_ENTER();                                                                                                                                \
+        FPU_check_pending_exceptions();                                                                                                            \
         fetch_ea_##a_size(fetchdat);                                                                                                               \
         SEG_CHECK_READ(cpu_state.ea_seg);                                                                                                          \
         load_var = rw;                                                                                                                             \
@@ -14,19 +15,19 @@
         clear_C1();                                                                                                                                \
         if (IS_TAG_EMPTY(0)) {                                                                                                                     \
             FPU_exception(fetchdat, FPU_EX_Stack_Underflow, 0);                                                                                    \
-            setcc(C0 | C2 | C3);                                                                                                                   \
+            setcc(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);                                                                                              \
             goto next_ins;                                                                                                                         \
         }                                                                                                                                          \
         status = i387cw_to_softfloat_status_word(i387_get_control_word());                                                                         \
         a      = FPU_read_regi(0);                                                                                                                 \
         if (is_nan) {                                                                                                                              \
-            rc = float_relation_unordered;                                                                                                         \
-            float_raise(&status, float_flag_invalid);                                                                                              \
+            rc = softfloat_relation_unordered;                                                                                                     \
+            softfloat_raiseFlags(&status, softfloat_flag_invalid);                                                                                 \
         } else {                                                                                                                                   \
-            rc = floatx80_compare_two(a, use_var, &status);                                                                                        \
+            rc = extF80_compare_normal(a, use_var, &status);                                                                                       \
         }                                                                                                                                          \
         setcc(FPU_status_word_flags_fpu_compare(rc));                                                                                              \
-        FPU_exception(fetchdat, status.float_exception_flags, 0);                                                                                  \
+        FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0);                                                                               \
                                                                                                                                                    \
 next_ins:                                                                                                                                          \
         CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fcom##cycle_postfix) : ((x87_timings.fcom##cycle_postfix) * cpu_multi));           \
@@ -35,11 +36,12 @@ next_ins:
     }                                                                                                                                              \
     static int sf_FCOMP##name##_a##a_size(uint32_t fetchdat)                                                                                       \
     {                                                                                                                                              \
-        floatx80              a;                                                                                                                   \
-        int                   rc;                                                                                                                  \
-        struct float_status_t status;                                                                                                              \
-        optype                temp;                                                                                                                \
+        floatx80                  a;                                                                                                               \
+        int                       rc;                                                                                                              \
+        struct softfloat_status_t status;                                                                                                          \
+        optype                    temp;                                                                                                            \
         FP_ENTER();                                                                                                                                \
+        FPU_check_pending_exceptions();                                                                                                            \
         fetch_ea_##a_size(fetchdat);                                                                                                               \
         SEG_CHECK_READ(cpu_state.ea_seg);                                                                                                          \
         load_var = rw;                                                                                                                             \
@@ -48,7 +50,7 @@ next_ins:
         clear_C1();                                                                                                                                \
         if (IS_TAG_EMPTY(0)) {                                                                                                                     \
             FPU_exception(fetchdat, FPU_EX_Stack_Underflow, 0);                                                                                    \
-            setcc(C0 | C2 | C3);                                                                                                                   \
+            setcc(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);                                                                                              \
             if (is_IA_masked())                                                                                                                    \
                 FPU_pop();                                                                                                                         \
                                                                                                                                                    \
@@ -57,13 +59,13 @@ next_ins:
         status = i387cw_to_softfloat_status_word(i387_get_control_word());                                                                         \
         a      = FPU_read_regi(0);                                                                                                                 \
         if (is_nan) {                                                                                                                              \
-            rc = float_relation_unordered;                                                                                                         \
-            float_raise(&status, float_flag_invalid);                                                                                              \
+            rc = softfloat_relation_unordered;                                                                                                     \
+            softfloat_raiseFlags(&status, softfloat_flag_invalid);                                                                                 \
         } else {                                                                                                                                   \
-            rc = floatx80_compare_two(a, use_var, &status);                                                                                        \
+            rc = extF80_compare_normal(a, use_var, &status);                                                                                       \
         }                                                                                                                                          \
         setcc(FPU_status_word_flags_fpu_compare(rc));                                                                                              \
-        if (!FPU_exception(fetchdat, status.float_exception_flags, 0))                                                                             \
+        if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))                                                                          \
             FPU_pop();                                                                                                                             \
                                                                                                                                                    \
 next_ins:                                                                                                                                          \
@@ -73,46 +75,48 @@ next_ins:
     }
 
 // clang-format off
-cmp_FPU(s, float32, 16, temp, geteal(), float32_to_floatx80(temp, &status), floatx80_is_nan(a) || floatx80_is_unsupported(a) || float32_is_nan(temp), _32)
+cmp_FPU(s, float32, 16, temp, geteal(), f32_to_extF80(temp, &status), extF80_isNaN(a) || extF80_isUnsupported(a) || f32_isNaN(temp), _32)
 #ifndef FPU_8087
-cmp_FPU(s, float32, 32, temp, geteal(), float32_to_floatx80(temp, &status), floatx80_is_nan(a) || floatx80_is_unsupported(a) || float32_is_nan(temp), _32)
+cmp_FPU(s, float32, 32, temp, geteal(), f32_to_extF80(temp, &status), extF80_isNaN(a) || extF80_isUnsupported(a) || f32_isNaN(temp), _32)
 #endif
-cmp_FPU(d, float64, 16, temp, geteaq(), float64_to_floatx80(temp, &status), floatx80_is_nan(a) || floatx80_is_unsupported(a) || float64_is_nan(temp), _64)
+cmp_FPU(d, float64, 16, temp, geteaq(), f64_to_extF80(temp, &status), extF80_isNaN(a) || extF80_isUnsupported(a) || f64_isNaN(temp), _64)
 #ifndef FPU_8087
-cmp_FPU(d, float64, 32, temp, geteaq(), float64_to_floatx80(temp, &status), floatx80_is_nan(a) || floatx80_is_unsupported(a) || float64_is_nan(temp), _64)
+cmp_FPU(d, float64, 32, temp, geteaq(), f64_to_extF80(temp, &status), extF80_isNaN(a) || extF80_isUnsupported(a) || f64_isNaN(temp), _64)
 #endif
 
-cmp_FPU(iw, int16_t, 16, temp, (int16_t)geteaw(), int32_to_floatx80((int32_t)temp), 0, _i16)
+cmp_FPU(iw, int16_t, 16, temp, (int16_t)geteaw(), i32_to_extF80((int32_t)temp), 0, _i16)
 #ifndef FPU_8087
-cmp_FPU(iw, int16_t, 32, temp, (int16_t)geteaw(), int32_to_floatx80((int32_t)temp), 0, _i16)
+cmp_FPU(iw, int16_t, 32, temp, (int16_t)geteaw(), i32_to_extF80((int32_t)temp), 0, _i16)
 #endif
-cmp_FPU(il, int32_t, 16, temp, (int32_t)geteal(), int32_to_floatx80(temp), 0, _i32)
+cmp_FPU(il, int32_t, 16, temp, (int32_t)geteal(), i32_to_extF80(temp), 0, _i32)
 #ifndef FPU_8087
-cmp_FPU(il, int32_t, 32, temp, (int32_t)geteal(), int32_to_floatx80(temp), 0, _i32)
+cmp_FPU(il, int32_t, 32, temp, (int32_t)geteal(), i32_to_extF80(temp), 0, _i32)
 #endif
-    // clang-format on
+// clang-format on
 
-    static int sf_FCOM_sti(uint32_t fetchdat)
+static int
+sf_FCOM_sti(uint32_t fetchdat)
 {
-    floatx80              a;
-    floatx80              b;
-    struct float_status_t status;
-    int                   rc;
+    floatx80                  a;
+    floatx80                  b;
+    struct softfloat_status_t status;
+    int                       rc;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
         FPU_exception(fetchdat, FPU_EX_Stack_Underflow, 0);
-        setcc(C0 | C2 | C3);
+        setcc(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
         goto next_ins;
     }
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(fetchdat & 7);
-    rc     = floatx80_compare_two(a, b, &status);
+    rc     = extF80_compare_normal(a, b, &status);
     setcc(FPU_status_word_flags_fpu_compare(rc));
-    FPU_exception(fetchdat, status.float_exception_flags, 0);
+    FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0);
 
 next_ins:
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fcom) : (x87_timings.fcom * cpu_multi));
@@ -123,17 +127,18 @@ next_ins:
 static int
 sf_FCOMP_sti(uint32_t fetchdat)
 {
-    floatx80              a;
-    floatx80              b;
-    struct float_status_t status;
-    int                   rc;
+    floatx80                  a;
+    floatx80                  b;
+    struct softfloat_status_t status;
+    int                       rc;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
         FPU_exception(fetchdat, FPU_EX_Stack_Underflow, 0);
-        setcc(C0 | C2 | C3);
+        setcc(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
         if (is_IA_masked()) {
             FPU_pop();
         }
@@ -142,9 +147,9 @@ sf_FCOMP_sti(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(fetchdat & 7);
-    rc     = floatx80_compare_two(a, b, &status);
+    rc     = extF80_compare_normal(a, b, &status);
     setcc(FPU_status_word_flags_fpu_compare(rc));
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_pop();
     }
 
@@ -157,17 +162,18 @@ next_ins:
 static int
 sf_FCOMPP(uint32_t fetchdat)
 {
-    floatx80              a;
-    floatx80              b;
-    struct float_status_t status;
-    int                   rc;
+    floatx80                  a;
+    floatx80                  b;
+    struct softfloat_status_t status;
+    int                       rc;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(1)) {
         FPU_exception(fetchdat, FPU_EX_Stack_Underflow, 0);
-        setcc(C0 | C2 | C3);
+        setcc(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
         if (is_IA_masked()) {
             FPU_pop();
             FPU_pop();
@@ -177,9 +183,9 @@ sf_FCOMPP(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(1);
-    rc     = floatx80_compare_two(a, b, &status);
+    rc     = extF80_compare_normal(a, b, &status);
     setcc(FPU_status_word_flags_fpu_compare(rc));
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_pop();
         FPU_pop();
     }
@@ -194,17 +200,18 @@ next_ins:
 static int
 sf_FUCOMPP(uint32_t fetchdat)
 {
-    floatx80              a;
-    floatx80              b;
-    struct float_status_t status;
-    int                   rc;
+    floatx80                  a;
+    floatx80                  b;
+    struct softfloat_status_t status;
+    int                       rc;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(1)) {
         FPU_exception(fetchdat, FPU_EX_Stack_Underflow, 0);
-        setcc(C0 | C2 | C3);
+        setcc(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
         if (is_IA_masked()) {
             FPU_pop();
             FPU_pop();
@@ -214,9 +221,9 @@ sf_FUCOMPP(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(1);
-    rc     = floatx80_compare_quiet(a, b, &status);
+    rc     = extF80_compare_quiet(a, b, &status);
     setcc(FPU_status_word_flags_fpu_compare(rc));
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_pop();
         FPU_pop();
     }
@@ -227,16 +234,17 @@ next_ins:
     return 0;
 }
 
-#    ifndef OPS_286_386
+#ifndef OPS_286_386
 static int
 sf_FCOMI_st0_stj(uint32_t fetchdat)
 {
-    floatx80              a;
-    floatx80              b;
-    struct float_status_t status;
-    int                   rc;
+    floatx80                  a;
+    floatx80                  b;
+    struct softfloat_status_t status;
+    int                       rc;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     flags_rebuild();
     clear_C1();
@@ -248,9 +256,9 @@ sf_FCOMI_st0_stj(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(fetchdat & 7);
-    rc     = floatx80_compare_two(a, b, &status);
+    rc     = extF80_compare_normal(a, b, &status);
     FPU_write_eflags_fpu_compare(rc);
-    FPU_exception(fetchdat, status.float_exception_flags, 0);
+    FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0);
 
 next_ins:
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fcom) : (x87_timings.fcom * cpu_multi));
@@ -260,12 +268,13 @@ next_ins:
 static int
 sf_FCOMIP_st0_stj(uint32_t fetchdat)
 {
-    floatx80              a;
-    floatx80              b;
-    struct float_status_t status;
-    int                   rc;
+    floatx80                  a;
+    floatx80                  b;
+    struct softfloat_status_t status;
+    int                       rc;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     flags_rebuild();
     clear_C1();
@@ -280,9 +289,9 @@ sf_FCOMIP_st0_stj(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(fetchdat & 7);
-    rc     = floatx80_compare_two(a, b, &status);
+    rc     = extF80_compare_normal(a, b, &status);
     FPU_write_eflags_fpu_compare(rc);
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_pop();
     }
 
@@ -291,30 +300,31 @@ next_ins:
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fcom) : (x87_concurrency.fcom * cpu_multi));
     return 0;
 }
-#    endif
+#endif
 
 static int
 sf_FUCOM_sti(uint32_t fetchdat)
 {
-    floatx80              a;
-    floatx80              b;
-    struct float_status_t status;
-    int                   rc;
+    floatx80                  a;
+    floatx80                  b;
+    struct softfloat_status_t status;
+    int                       rc;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
         FPU_exception(fetchdat, FPU_EX_Stack_Underflow, 0);
-        setcc(C0 | C2 | C3);
+        setcc(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
         goto next_ins;
     }
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(fetchdat & 7);
-    rc     = floatx80_compare_quiet(a, b, &status);
+    rc     = extF80_compare_quiet(a, b, &status);
     setcc(FPU_status_word_flags_fpu_compare(rc));
-    FPU_exception(fetchdat, status.float_exception_flags, 0);
+    FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0);
 
 next_ins:
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fucom) : (x87_timings.fucom * cpu_multi));
@@ -325,17 +335,18 @@ next_ins:
 static int
 sf_FUCOMP_sti(uint32_t fetchdat)
 {
-    floatx80              a;
-    floatx80              b;
-    struct float_status_t status;
-    int                   rc;
+    floatx80                  a;
+    floatx80                  b;
+    struct softfloat_status_t status;
+    int                       rc;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(fetchdat & 7)) {
         FPU_exception(fetchdat, FPU_EX_Stack_Underflow, 0);
-        setcc(C0 | C2 | C3);
+        setcc(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
         if (is_IA_masked())
             FPU_pop();
 
@@ -344,9 +355,9 @@ sf_FUCOMP_sti(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(fetchdat & 7);
-    rc     = floatx80_compare_quiet(a, b, &status);
+    rc     = extF80_compare_quiet(a, b, &status);
     setcc(FPU_status_word_flags_fpu_compare(rc));
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0))
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))
         FPU_pop();
 
 next_ins:
@@ -359,12 +370,13 @@ next_ins:
 static int
 sf_FUCOMI_st0_stj(uint32_t fetchdat)
 {
-    floatx80              a;
-    floatx80              b;
-    struct float_status_t status;
-    int                   rc;
+    floatx80                  a;
+    floatx80                  b;
+    struct softfloat_status_t status;
+    int                       rc;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     flags_rebuild();
     clear_C1();
@@ -376,9 +388,9 @@ sf_FUCOMI_st0_stj(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(fetchdat & 7);
-    rc     = floatx80_compare_quiet(a, b, &status);
+    rc     = extF80_compare_quiet(a, b, &status);
     FPU_write_eflags_fpu_compare(rc);
-    FPU_exception(fetchdat, status.float_exception_flags, 0);
+    FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0);
 
 next_ins:
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fucom) : (x87_timings.fucom * cpu_multi));
@@ -388,12 +400,13 @@ next_ins:
 static int
 sf_FUCOMIP_st0_stj(uint32_t fetchdat)
 {
-    floatx80              a;
-    floatx80              b;
-    struct float_status_t status;
-    int                   rc;
+    floatx80                  a;
+    floatx80                  b;
+    struct softfloat_status_t status;
+    int                       rc;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     flags_rebuild();
     clear_C1();
@@ -408,9 +421,9 @@ sf_FUCOMIP_st0_stj(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(fetchdat & 7);
-    rc     = floatx80_compare_quiet(a, b, &status);
+    rc     = extF80_compare_quiet(a, b, &status);
     FPU_write_eflags_fpu_compare(rc);
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0))
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))
         FPU_pop();
 
 next_ins:
@@ -418,74 +431,104 @@ next_ins:
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fucom) : (x87_concurrency.fucom * cpu_multi));
     return 0;
 }
-#    endif
+#endif
 #endif
 
 static int
 sf_FTST(uint32_t fetchdat)
 {
-    int                   rc;
-    struct float_status_t status;
+    const floatx80            Const_Z = packFloatx80(0, 0x0000, 0);
+    struct softfloat_status_t status;
+    int                       rc;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0)) {
         FPU_exception(fetchdat, FPU_EX_Stack_Underflow, 0);
-        setcc(C0 | C2 | C3);
+        setcc(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
     } else {
         status = i387cw_to_softfloat_status_word(i387_get_control_word());
-        rc     = floatx80_compare_two(FPU_read_regi(0), Const_Z, &status);
+        rc     = extF80_compare_normal(FPU_read_regi(0), Const_Z, &status);
         setcc(FPU_status_word_flags_fpu_compare(rc));
-        FPU_exception(fetchdat, status.float_exception_flags, 0);
+        FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0);
     }
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.ftst) : (x87_timings.ftst * cpu_multi));
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.ftst) : (x87_concurrency.ftst * cpu_multi));
     return 0;
 }
 
+#ifndef FPU_8087
 static int
-sf_FXAM(uint32_t fetchdat)
+sf_FTSTP(uint32_t fetchdat)
 {
-    floatx80      reg;
-    int           sign;
-    float_class_t aClass;
+    const floatx80            Const_Z = packFloatx80(0, 0x0000, 0);
+    struct softfloat_status_t status;
+    int                       rc;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
+    cpu_state.pc++;
+    clear_C1();
+    if (IS_TAG_EMPTY(0)) {
+        FPU_exception(fetchdat, FPU_EX_Stack_Underflow, 0);
+        setcc(FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
+    } else {
+        status = i387cw_to_softfloat_status_word(i387_get_control_word());
+        rc     = extF80_compare_normal(FPU_read_regi(0), Const_Z, &status);
+        setcc(FPU_status_word_flags_fpu_compare(rc));
+        FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0);
+        FPU_pop();
+    }
+    CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.ftst) : (x87_timings.ftst * cpu_multi));
+    CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.ftst) : (x87_concurrency.ftst * cpu_multi));
+    return 0;
+}
+#endif
+
+static int
+sf_FXAM(UNUSED(uint32_t fetchdat))
+{
+    floatx80            reg;
+    int                 sign;
+    softfloat_class_t   aClass;
+
+    FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     reg  = FPU_read_regi(0);
-    sign = floatx80_sign(reg);
+    sign = extF80_sign(reg);
     /*
      * Examine the contents of the ST(0) register and sets the condition
      * code flags C0, C2 and C3 in the FPU status word to indicate the
      * class of value or number in the register.
      */
     if (IS_TAG_EMPTY(0)) {
-        setcc(C3 | C1 | C0);
+        setcc(FPU_SW_C0 | FPU_SW_C1 | FPU_SW_C3);
     } else {
-        aClass = floatx80_class(reg);
+        aClass = extF80_class(reg);
         switch (aClass) {
-            case float_zero:
-                setcc(C3 | C1);
+            case softfloat_zero:
+                setcc(FPU_SW_C1 | FPU_SW_C3);
                 break;
-            case float_SNaN:
-            case float_QNaN:
+            case softfloat_SNaN:
+            case softfloat_QNaN:
                 // unsupported handled as NaNs
-                if (floatx80_is_unsupported(reg)) {
-                    setcc(C1);
-                } else {
-                    setcc(C1 | C0);
-                }
+                if (extF80_isUnsupported(reg))
+                    setcc(FPU_SW_C1);
+                else
+                    setcc(FPU_SW_C0 | FPU_SW_C1);
                 break;
-            case float_negative_inf:
-            case float_positive_inf:
-                setcc(C2 | C1 | C0);
+            case softfloat_negative_inf:
+            case softfloat_positive_inf:
+                setcc(FPU_SW_C0 | FPU_SW_C1 | FPU_SW_C2);
                 break;
-            case float_denormal:
-                setcc(C3 | C2 | C1);
+            case softfloat_denormal:
+                setcc(FPU_SW_C1 | FPU_SW_C2 | FPU_SW_C3);
                 break;
-            case float_normalized:
-                setcc(C2 | C1);
+            case softfloat_normalized:
+                setcc(FPU_SW_C1 | FPU_SW_C2);
                 break;
         }
     }
diff --git a/src/cpu/x87_ops_sf_const.h b/src/cpu/x87_ops_sf_const.h
index 0808cbae8..19cc401f5 100644
--- a/src/cpu/x87_ops_sf_const.h
+++ b/src/cpu/x87_ops_sf_const.h
@@ -3,18 +3,11 @@
    */
 #define DOWN_OR_CHOP() (fpu_state.cwd & FPU_CW_RC & FPU_RC_DOWN)
 
-static __inline floatx80
-FPU_round_const(const floatx80 a, int adj)
-{
-    floatx80 result = a;
-    result.fraction += adj;
-    return result;
-}
-
 static int
 sf_FLDL2T(uint32_t fetchdat)
 {
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (!IS_TAG_EMPTY(-1))
@@ -32,6 +25,7 @@ static int
 sf_FLDL2E(uint32_t fetchdat)
 {
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (!IS_TAG_EMPTY(-1))
@@ -49,6 +43,7 @@ static int
 sf_FLDPI(uint32_t fetchdat)
 {
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (!IS_TAG_EMPTY(-1))
@@ -66,6 +61,7 @@ static int
 sf_FLDEG2(uint32_t fetchdat)
 {
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (!IS_TAG_EMPTY(-1))
@@ -83,6 +79,7 @@ static int
 sf_FLDLN2(uint32_t fetchdat)
 {
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (!IS_TAG_EMPTY(-1))
@@ -100,6 +97,7 @@ static int
 sf_FLD1(uint32_t fetchdat)
 {
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (!IS_TAG_EMPTY(-1))
@@ -117,6 +115,7 @@ static int
 sf_FLDZ(uint32_t fetchdat)
 {
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (!IS_TAG_EMPTY(-1))
diff --git a/src/cpu/x87_ops_sf_load_store.h b/src/cpu/x87_ops_sf_load_store.h
index 383a7ee52..69249016e 100644
--- a/src/cpu/x87_ops_sf_load_store.h
+++ b/src/cpu/x87_ops_sf_load_store.h
@@ -38,10 +38,10 @@ sf_FILDiw_a16(uint32_t fetchdat)
     if (cpu_state.abrt)
         return 1;
     clear_C1();
-    if (!IS_TAG_EMPTY(-1)) {
+    if (!IS_TAG_EMPTY(-1))
         FPU_stack_overflow(fetchdat);
-    } else {
-        result = int32_to_floatx80(temp);
+    else {
+        result = i32_to_extF80(temp);
         FPU_push();
         FPU_save_regi(result, 0);
     }
@@ -67,7 +67,7 @@ sf_FILDiw_a32(uint32_t fetchdat)
     if (!IS_TAG_EMPTY(-1)) {
         FPU_stack_overflow(fetchdat);
     } else {
-        result = int32_to_floatx80(temp);
+        result = i32_to_extF80(temp);
         FPU_push();
         FPU_save_regi(result, 0);
     }
@@ -94,7 +94,7 @@ sf_FILDil_a16(uint32_t fetchdat)
     if (!IS_TAG_EMPTY(-1)) {
         FPU_stack_overflow(fetchdat);
     } else {
-        result = int32_to_floatx80(templ);
+        result = i32_to_extF80(templ);
         FPU_push();
         FPU_save_regi(result, 0);
     }
@@ -120,7 +120,7 @@ sf_FILDil_a32(uint32_t fetchdat)
     if (!IS_TAG_EMPTY(-1)) {
         FPU_stack_overflow(fetchdat);
     } else {
-        result = int32_to_floatx80(templ);
+        result = i32_to_extF80(templ);
         FPU_push();
         FPU_save_regi(result, 0);
     }
@@ -147,7 +147,7 @@ sf_FILDiq_a16(uint32_t fetchdat)
     if (!IS_TAG_EMPTY(-1)) {
         FPU_stack_overflow(fetchdat);
     } else {
-        result = int64_to_floatx80(temp64);
+        result = i64_to_extF80(temp64);
         FPU_push();
         FPU_save_regi(result, 0);
     }
@@ -173,7 +173,92 @@ sf_FILDiq_a32(uint32_t fetchdat)
     if (!IS_TAG_EMPTY(-1)) {
         FPU_stack_overflow(fetchdat);
     } else {
-        result = int64_to_floatx80(temp64);
+        result = i64_to_extF80(temp64);
+        FPU_push();
+        FPU_save_regi(result, 0);
+    }
+    CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fild_64) : (x87_timings.fild_64 * cpu_multi));
+    CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fild_64) : (x87_concurrency.fild_64 * cpu_multi));
+    return 0;
+}
+#endif
+
+static int
+sf_FBLD_PACKED_BCD_a16(uint32_t fetchdat)
+{
+    floatx80              result;
+    uint16_t              load_reg_hi;
+    uint64_t              load_reg_lo;
+    int64_t               val64 = 0;
+    int64_t               scale = 1;
+
+    FP_ENTER();
+    FPU_check_pending_exceptions();
+    fetch_ea_16(fetchdat);
+    SEG_CHECK_READ(cpu_state.ea_seg);
+    load_reg_hi = readmemw(easeg, (cpu_state.eaaddr + 8) & 0xffff);
+    load_reg_lo = readmemq(easeg, cpu_state.eaaddr);
+    if (cpu_state.abrt)
+        return 1;
+    clear_C1();
+    if (!IS_TAG_EMPTY(-1)) {
+        FPU_stack_overflow(fetchdat);
+    } else {
+        for (int n = 0; n < 16; n++) {
+            val64 += ((load_reg_lo & 0x0f) * scale);
+            load_reg_lo >>= 4;
+            scale *= 10;
+        }
+        val64 += ((load_reg_hi & 0x0f) * scale);
+        val64 += (((load_reg_hi >> 4) & 0x0f) * scale * 10);
+
+        result = (floatx80) i64_to_extF80(val64);
+
+        if (load_reg_hi & 0x8000)
+            floatx80_chs(result);
+
+        FPU_push();
+        FPU_save_regi(result, 0);
+    }
+    CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.fild_64) : (x87_timings.fild_64 * cpu_multi));
+    CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.fild_64) : (x87_concurrency.fild_64 * cpu_multi));
+    return 0;
+}
+#ifndef FPU_8087
+static int
+sf_FBLD_PACKED_BCD_a32(uint32_t fetchdat)
+{
+    floatx80              result;
+    uint16_t              load_reg_hi;
+    uint64_t              load_reg_lo;
+    int64_t               val64 = 0;
+    int64_t               scale = 1;
+
+    FP_ENTER();
+    FPU_check_pending_exceptions();
+    fetch_ea_16(fetchdat);
+    SEG_CHECK_READ(cpu_state.ea_seg);
+    load_reg_hi = readmemw(easeg, (cpu_state.eaaddr + 8) & 0xffff);
+    load_reg_lo = readmemq(easeg, cpu_state.eaaddr);
+    if (cpu_state.abrt)
+        return 1;
+    clear_C1();
+    if (!IS_TAG_EMPTY(-1)) {
+        FPU_stack_overflow(fetchdat);
+    } else {
+        for (int n = 0; n < 16; n++) {
+            val64 += ((load_reg_lo & 0x0f) * scale);
+            load_reg_lo >>= 4;
+            scale *= 10;
+        }
+        val64 += ((load_reg_hi & 0x0f) * scale);
+        val64 += (((load_reg_hi >> 4) & 0x0f) * scale * 10);
+
+        result = (floatx80) i64_to_extF80(val64);
+
+        if (load_reg_hi & 0x8000)
+            floatx80_chs(result);
+
         FPU_push();
         FPU_save_regi(result, 0);
     }
@@ -186,10 +271,10 @@ sf_FILDiq_a32(uint32_t fetchdat)
 static int
 sf_FLDs_a16(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    floatx80              result;
-    float32               load_reg;
-    unsigned              unmasked;
+    struct softfloat_status_t   status;
+    floatx80                    result;
+    float32                     load_reg;
+    unsigned                    unmasked;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -204,8 +289,8 @@ sf_FLDs_a16(uint32_t fetchdat)
         goto next_ins;
     }
     status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-    result   = float32_to_floatx80(load_reg, &status);
-    unmasked = FPU_exception(fetchdat, status.float_exception_flags, 0);
+    result   = f32_to_extF80(load_reg, &status);
+    unmasked = FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0);
     if (!(unmasked & FPU_CW_Invalid)) {
         FPU_push();
         FPU_save_regi(result, 0);
@@ -220,10 +305,10 @@ next_ins:
 static int
 sf_FLDs_a32(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    floatx80              result;
-    float32               load_reg;
-    unsigned              unmasked;
+    struct softfloat_status_t   status;
+    floatx80                    result;
+    float32                     load_reg;
+    unsigned                    unmasked;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -238,8 +323,8 @@ sf_FLDs_a32(uint32_t fetchdat)
         goto next_ins;
     }
     status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-    result   = float32_to_floatx80(load_reg, &status);
-    unmasked = FPU_exception(fetchdat, status.float_exception_flags, 0);
+    result   = f32_to_extF80(load_reg, &status);
+    unmasked = FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0);
     if (!(unmasked & FPU_CW_Invalid)) {
         FPU_push();
         FPU_save_regi(result, 0);
@@ -255,10 +340,10 @@ next_ins:
 static int
 sf_FLDd_a16(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    floatx80              result;
-    float64               load_reg;
-    unsigned              unmasked;
+    struct softfloat_status_t   status;
+    floatx80                    result;
+    float64                     load_reg;
+    unsigned                    unmasked;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -273,8 +358,8 @@ sf_FLDd_a16(uint32_t fetchdat)
         goto next_ins;
     }
     status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-    result   = float64_to_floatx80(load_reg, &status);
-    unmasked = FPU_exception(fetchdat, status.float_exception_flags, 0);
+    result   = f64_to_extF80(load_reg, &status);
+    unmasked = FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0);
     if (!(unmasked & FPU_CW_Invalid)) {
         FPU_push();
         FPU_save_regi(result, 0);
@@ -289,10 +374,10 @@ next_ins:
 static int
 sf_FLDd_a32(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    floatx80              result;
-    float64               load_reg;
-    unsigned              unmasked;
+    struct softfloat_status_t   status;
+    floatx80                    result;
+    float64                     load_reg;
+    unsigned                    unmasked;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -307,8 +392,8 @@ sf_FLDd_a32(uint32_t fetchdat)
         goto next_ins;
     }
     status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-    result   = float64_to_floatx80(load_reg, &status);
-    unmasked = FPU_exception(fetchdat, status.float_exception_flags, 0);
+    result   = f64_to_extF80(load_reg, &status);
+    unmasked = FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0);
     if (!(unmasked & FPU_CW_Invalid)) {
         FPU_push();
         FPU_save_regi(result, 0);
@@ -330,10 +415,11 @@ sf_FLDe_a16(uint32_t fetchdat)
     FPU_check_pending_exceptions();
     fetch_ea_16(fetchdat);
     SEG_CHECK_READ(cpu_state.ea_seg);
-    result.fraction = readmemq(easeg, cpu_state.eaaddr);
-    result.exp      = readmemw(easeg, cpu_state.eaaddr + 8);
+    result.signif  = readmemq(easeg, cpu_state.eaaddr);
+    result.signExp = readmemw(easeg, cpu_state.eaaddr + 8);
     if (cpu_state.abrt)
         return 1;
+
     clear_C1();
     if (!IS_TAG_EMPTY(-1)) {
         FPU_stack_overflow(fetchdat);
@@ -355,10 +441,11 @@ sf_FLDe_a32(uint32_t fetchdat)
     FPU_check_pending_exceptions();
     fetch_ea_32(fetchdat);
     SEG_CHECK_READ(cpu_state.ea_seg);
-    result.fraction = readmemq(easeg, cpu_state.eaaddr);
-    result.exp      = readmemw(easeg, cpu_state.eaaddr + 8);
+    result.signif  = readmemq(easeg, cpu_state.eaaddr);
+    result.signExp = readmemw(easeg, cpu_state.eaaddr + 8);
     if (cpu_state.abrt)
         return 1;
+
     clear_C1();
     if (!IS_TAG_EMPTY(-1)) {
         FPU_stack_overflow(fetchdat);
@@ -391,9 +478,8 @@ sf_FLD_sti(uint32_t fetchdat)
         FPU_exception(fetchdat, FPU_EX_Stack_Underflow, 0);
         if (!is_IA_masked())
             goto next_ins;
-    } else {
+    } else
         sti_reg = FPU_read_regi(fetchdat & 7);
-    }
 
     FPU_push();
     FPU_save_regi(sti_reg, 0);
@@ -407,9 +493,9 @@ next_ins:
 static int
 sf_FISTiw_a16(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw       = fpu_state.swd;
-    int16_t               save_reg = int16_indefinite;
+    struct softfloat_status_t status;
+    uint16_t                  sw       = fpu_state.swd;
+    int16_t                   save_reg = int16_indefinite;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -423,8 +509,8 @@ sf_FISTiw_a16(uint32_t fetchdat)
         }
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-        save_reg = floatx80_to_int16(FPU_read_regi(0), &status);
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1)) {
+        save_reg = extF80_to_i16(FPU_read_regi(0), &status);
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1)) {
             goto next_ins;
         }
     }
@@ -442,9 +528,9 @@ next_ins:
 static int
 sf_FISTiw_a32(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw       = fpu_state.swd;
-    int16_t               save_reg = int16_indefinite;
+    struct softfloat_status_t status;
+    uint16_t                  sw       = fpu_state.swd;
+    int16_t                   save_reg = int16_indefinite;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -457,8 +543,8 @@ sf_FISTiw_a32(uint32_t fetchdat)
             goto next_ins;
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-        save_reg = floatx80_to_int16(FPU_read_regi(0), &status);
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1))
+        save_reg = extF80_to_i16(FPU_read_regi(0), &status);
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1))
             goto next_ins;
     }
     // store to the memory might generate an exception, in this case original FPU_SW must be kept
@@ -476,9 +562,9 @@ next_ins:
 static int
 sf_FISTPiw_a16(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw       = fpu_state.swd;
-    int16_t               save_reg = int16_indefinite;
+    struct softfloat_status_t status;
+    uint16_t                  sw       = fpu_state.swd;
+    int16_t                   save_reg = int16_indefinite;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -491,8 +577,8 @@ sf_FISTPiw_a16(uint32_t fetchdat)
             goto next_ins;
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-        save_reg = floatx80_to_int16(FPU_read_regi(0), &status);
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1)) {
+        save_reg = extF80_to_i16(FPU_read_regi(0), &status);
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1)) {
             goto next_ins;
         }
     }
@@ -513,9 +599,9 @@ next_ins:
 static int
 sf_FISTPiw_a32(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw       = fpu_state.swd;
-    int16_t               save_reg = int16_indefinite;
+    struct softfloat_status_t status;
+    uint16_t                  sw       = fpu_state.swd;
+    int16_t                   save_reg = int16_indefinite;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -528,8 +614,8 @@ sf_FISTPiw_a32(uint32_t fetchdat)
             goto next_ins;
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-        save_reg = floatx80_to_int16(FPU_read_regi(0), &status);
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1))
+        save_reg = extF80_to_i16(FPU_read_regi(0), &status);
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1))
             goto next_ins;
     }
     // store to the memory might generate an exception, in this case original FPU_SW must be kept
@@ -550,9 +636,9 @@ next_ins:
 static int
 sf_FISTil_a16(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw       = fpu_state.swd;
-    int32_t               save_reg = int32_indefinite;
+    struct softfloat_status_t status;
+    uint16_t                  sw       = fpu_state.swd;
+    int32_t                   save_reg = int32_indefinite;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -565,8 +651,8 @@ sf_FISTil_a16(uint32_t fetchdat)
             goto next_ins;
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-        save_reg = floatx80_to_int32(FPU_read_regi(0), &status);
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1)) {
+        save_reg = extF80_to_i32_normal(FPU_read_regi(0), &status);
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1)) {
             goto next_ins;
         }
     }
@@ -584,9 +670,9 @@ next_ins:
 static int
 sf_FISTil_a32(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw       = fpu_state.swd;
-    int32_t               save_reg = int32_indefinite;
+    struct softfloat_status_t status;
+    uint16_t                  sw       = fpu_state.swd;
+    int32_t                   save_reg = int32_indefinite;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -599,8 +685,8 @@ sf_FISTil_a32(uint32_t fetchdat)
             goto next_ins;
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-        save_reg = floatx80_to_int32(FPU_read_regi(0), &status);
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1))
+        save_reg = extF80_to_i32_normal(FPU_read_regi(0), &status);
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1))
             goto next_ins;
     }
     // store to the memory might generate an exception, in this case original FPU_SW must be kept
@@ -618,9 +704,9 @@ next_ins:
 static int
 sf_FISTPil_a16(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw       = fpu_state.swd;
-    int32_t               save_reg = int32_indefinite;
+    struct softfloat_status_t status;
+    uint16_t                  sw       = fpu_state.swd;
+    int32_t                   save_reg = int32_indefinite;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -633,8 +719,8 @@ sf_FISTPil_a16(uint32_t fetchdat)
             goto next_ins;
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-        save_reg = floatx80_to_int32(FPU_read_regi(0), &status);
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1)) {
+        save_reg = extF80_to_i32_normal(FPU_read_regi(0), &status);
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1)) {
             goto next_ins;
         }
     }
@@ -655,9 +741,9 @@ next_ins:
 static int
 sf_FISTPil_a32(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw       = fpu_state.swd;
-    int32_t               save_reg = int32_indefinite;
+    struct softfloat_status_t status;
+    uint16_t                  sw       = fpu_state.swd;
+    int32_t                   save_reg = int32_indefinite;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -670,8 +756,8 @@ sf_FISTPil_a32(uint32_t fetchdat)
             goto next_ins;
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-        save_reg = floatx80_to_int32(FPU_read_regi(0), &status);
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1))
+        save_reg = extF80_to_i32_normal(FPU_read_regi(0), &status);
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1))
             goto next_ins;
     }
     // store to the memory might generate an exception, in this case original FPU_SW must be kept
@@ -692,9 +778,9 @@ next_ins:
 static int
 sf_FISTPiq_a16(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw       = fpu_state.swd;
-    int64_t               save_reg = int64_indefinite;
+    struct softfloat_status_t status;
+    uint16_t                  sw       = fpu_state.swd;
+    int64_t                   save_reg = int64_indefinite;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -707,8 +793,8 @@ sf_FISTPiq_a16(uint32_t fetchdat)
             goto next_ins;
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-        save_reg = floatx80_to_int64(FPU_read_regi(0), &status);
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1)) {
+        save_reg = extF80_to_i64_normal(FPU_read_regi(0), &status);
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1)) {
             goto next_ins;
         }
     }
@@ -729,9 +815,9 @@ next_ins:
 static int
 sf_FISTPiq_a32(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw       = fpu_state.swd;
-    int64_t               save_reg = int64_indefinite;
+    struct softfloat_status_t status;
+    uint16_t                  sw       = fpu_state.swd;
+    int64_t                   save_reg = int64_indefinite;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -744,8 +830,8 @@ sf_FISTPiq_a32(uint32_t fetchdat)
             goto next_ins;
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-        save_reg = floatx80_to_int64(FPU_read_regi(0), &status);
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1))
+        save_reg = extF80_to_i64_normal(FPU_read_regi(0), &status);
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1))
             goto next_ins;
     }
     // store to the memory might generate an exception, in this case origial FPU_SW must be kept
@@ -766,13 +852,13 @@ next_ins:
 static int
 sf_FBSTP_PACKED_BCD_a16(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw          = fpu_state.swd;
-    uint16_t              save_reg_hi = 0xffff;
-    uint64_t              save_reg_lo = BX_CONST64(0xC000000000000000);
-    floatx80              reg;
-    int64_t               save_val;
-    int                   sign;
+    struct softfloat_status_t status;
+    uint16_t                  sw          = fpu_state.swd;
+    uint16_t                  save_reg_hi = 0xffff;
+    uint64_t                  save_reg_lo = BX_CONST64(0xC000000000000000);
+    floatx80                  reg;
+    int64_t                   save_val;
+    int                       sign;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -786,15 +872,15 @@ sf_FBSTP_PACKED_BCD_a16(uint32_t fetchdat)
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
         reg      = FPU_read_regi(0);
-        save_val = floatx80_to_int64(reg, &status);
-        sign     = (reg.exp & 0x8000) != 0;
+        save_val = extF80_to_i64_normal(reg, &status);
+        sign     = extF80_sign(reg);
         if (sign)
             save_val = -save_val;
 
         if (save_val > BX_CONST64(999999999999999999))
-            status.float_exception_flags = float_flag_invalid; // throw away other flags
+            softfloat_setFlags(&status, softfloat_flag_invalid); // throw away other flags
 
-        if (!(status.float_exception_flags & float_flag_invalid)) {
+        if (!(status.softfloat_exceptionFlags & softfloat_flag_invalid)) {
             save_reg_hi = sign ? 0x8000 : 0;
             save_reg_lo = 0;
             for (int i = 0; i < 16; i++) {
@@ -806,7 +892,7 @@ sf_FBSTP_PACKED_BCD_a16(uint32_t fetchdat)
             save_reg_hi += (uint16_t) (save_val % 10) << 4;
         }
         /* check for fpu arithmetic exceptions */
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1)) {
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1)) {
             goto next_ins;
         }
     }
@@ -830,13 +916,13 @@ next_ins:
 static int
 sf_FBSTP_PACKED_BCD_a32(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw          = fpu_state.swd;
-    uint16_t              save_reg_hi = 0xffff;
-    uint64_t              save_reg_lo = BX_CONST64(0xC000000000000000);
-    floatx80              reg;
-    int64_t               save_val;
-    int                   sign;
+    struct softfloat_status_t status;
+    uint16_t                  sw          = fpu_state.swd;
+    uint16_t                  save_reg_hi = 0xffff;
+    uint64_t                  save_reg_lo = BX_CONST64(0xC000000000000000);
+    floatx80                  reg;
+    int64_t                   save_val;
+    int                       sign;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -850,15 +936,15 @@ sf_FBSTP_PACKED_BCD_a32(uint32_t fetchdat)
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
         reg      = FPU_read_regi(0);
-        save_val = floatx80_to_int64(reg, &status);
-        sign     = (reg.exp & 0x8000) != 0;
+        save_val = extF80_to_i64_normal(reg, &status);
+        sign     = extF80_sign(reg);
         if (sign)
             save_val = -save_val;
 
         if (save_val > BX_CONST64(999999999999999999))
-            status.float_exception_flags = float_flag_invalid; // throw away other flags
+            softfloat_setFlags(&status, softfloat_flag_invalid); // throw away other flags
 
-        if (!(status.float_exception_flags & float_flag_invalid)) {
+        if (!(status.softfloat_exceptionFlags & softfloat_flag_invalid)) {
             save_reg_hi = sign ? 0x8000 : 0;
             save_reg_lo = 0;
             for (int i = 0; i < 16; i++) {
@@ -870,7 +956,7 @@ sf_FBSTP_PACKED_BCD_a32(uint32_t fetchdat)
             save_reg_hi += (uint16_t) (save_val % 10) << 4;
         }
         /* check for fpu arithmetic exceptions */
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1)) {
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1)) {
             goto next_ins;
         }
     }
@@ -895,9 +981,9 @@ next_ins:
 static int
 sf_FSTs_a16(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw       = fpu_state.swd;
-    float32               save_reg = float32_default_nan;
+    struct softfloat_status_t   status;
+    uint16_t                    sw       = fpu_state.swd;
+    float32                     save_reg = float32_default_nan;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -910,8 +996,8 @@ sf_FSTs_a16(uint32_t fetchdat)
             goto next_ins;
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-        save_reg = floatx80_to_float32(FPU_read_regi(0), &status);
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1)) {
+        save_reg = extF80_to_f32(FPU_read_regi(0), &status);
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1)) {
             goto next_ins;
         }
     }
@@ -929,9 +1015,9 @@ next_ins:
 static int
 sf_FSTs_a32(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw       = fpu_state.swd;
-    float32               save_reg = float32_default_nan;
+    struct softfloat_status_t   status;
+    uint16_t                    sw       = fpu_state.swd;
+    float32                     save_reg = float32_default_nan;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -944,8 +1030,8 @@ sf_FSTs_a32(uint32_t fetchdat)
             goto next_ins;
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-        save_reg = floatx80_to_float32(FPU_read_regi(0), &status);
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1))
+        save_reg = extF80_to_f32(FPU_read_regi(0), &status);
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1))
             goto next_ins;
     }
     // store to the memory might generate an exception, in this case original FPU_SW must be kept
@@ -963,9 +1049,9 @@ next_ins:
 static int
 sf_FSTPs_a16(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw       = fpu_state.swd;
-    float32               save_reg = float32_default_nan;
+    struct softfloat_status_t   status;
+    uint16_t                    sw       = fpu_state.swd;
+    float32                     save_reg = float32_default_nan;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -978,17 +1064,17 @@ sf_FSTPs_a16(uint32_t fetchdat)
             goto next_ins;
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-        save_reg = floatx80_to_float32(FPU_read_regi(0), &status);
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1)) {
+        save_reg = extF80_to_f32(FPU_read_regi(0), &status);
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1)) {
             goto next_ins;
         }
     }
     // store to the memory might generate an exception, in this case original FPU_SW must be kept
     swap_values16u(sw, fpu_state.swd);
     seteal(save_reg);
-    if (cpu_state.abrt) {
+    if (cpu_state.abrt)
         return 1;
-    }
+
     fpu_state.swd = sw;
     FPU_pop();
 
@@ -1001,9 +1087,9 @@ next_ins:
 static int
 sf_FSTPs_a32(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw       = fpu_state.swd;
-    float32               save_reg = float32_default_nan;
+    struct softfloat_status_t   status;
+    uint16_t                    sw       = fpu_state.swd;
+    float32                     save_reg = float32_default_nan;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -1016,8 +1102,8 @@ sf_FSTPs_a32(uint32_t fetchdat)
             goto next_ins;
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-        save_reg = floatx80_to_float32(FPU_read_regi(0), &status);
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1))
+        save_reg = extF80_to_f32(FPU_read_regi(0), &status);
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1))
             goto next_ins;
     }
     // store to the memory might generate an exception, in this case original FPU_SW must be kept
@@ -1025,6 +1111,7 @@ sf_FSTPs_a32(uint32_t fetchdat)
     seteal(save_reg);
     if (cpu_state.abrt)
         return 1;
+
     fpu_state.swd = sw;
     FPU_pop();
 
@@ -1038,9 +1125,9 @@ next_ins:
 static int
 sf_FSTd_a16(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw       = fpu_state.swd;
-    float64               save_reg = float64_default_nan;
+    struct softfloat_status_t   status;
+    uint16_t                    sw       = fpu_state.swd;
+    float64                     save_reg = float64_default_nan;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -1053,8 +1140,8 @@ sf_FSTd_a16(uint32_t fetchdat)
             goto next_ins;
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-        save_reg = floatx80_to_float64(FPU_read_regi(0), &status);
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1)) {
+        save_reg = extF80_to_f64(FPU_read_regi(0), &status);
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1)) {
             goto next_ins;
         }
     }
@@ -1072,9 +1159,9 @@ next_ins:
 static int
 sf_FSTd_a32(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw       = fpu_state.swd;
-    float64               save_reg = float64_default_nan;
+    struct softfloat_status_t   status;
+    uint16_t                    sw       = fpu_state.swd;
+    float64                     save_reg = float64_default_nan;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -1087,8 +1174,8 @@ sf_FSTd_a32(uint32_t fetchdat)
             goto next_ins;
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-        save_reg = floatx80_to_float64(FPU_read_regi(0), &status);
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1))
+        save_reg = extF80_to_f64(FPU_read_regi(0), &status);
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1))
             goto next_ins;
     }
     // store to the memory might generate an exception, in this case original FPU_SW must be kept
@@ -1106,9 +1193,9 @@ next_ins:
 static int
 sf_FSTPd_a16(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw       = fpu_state.swd;
-    float64               save_reg = float64_default_nan;
+    struct softfloat_status_t   status;
+    uint16_t                    sw       = fpu_state.swd;
+    float64                     save_reg = float64_default_nan;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -1122,8 +1209,8 @@ sf_FSTPd_a16(uint32_t fetchdat)
         }
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-        save_reg = floatx80_to_float64(FPU_read_regi(0), &status);
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1)) {
+        save_reg = extF80_to_f64(FPU_read_regi(0), &status);
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1)) {
             goto next_ins;
         }
     }
@@ -1132,6 +1219,7 @@ sf_FSTPd_a16(uint32_t fetchdat)
     seteaq(save_reg);
     if (cpu_state.abrt)
         return 1;
+
     fpu_state.swd = sw;
     FPU_pop();
 
@@ -1144,9 +1232,9 @@ next_ins:
 static int
 sf_FSTPd_a32(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    uint16_t              sw       = fpu_state.swd;
-    float64               save_reg = float64_default_nan;
+    struct softfloat_status_t   status;
+    uint16_t                    sw       = fpu_state.swd;
+    float64                     save_reg = float64_default_nan;
 
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -1159,8 +1247,8 @@ sf_FSTPd_a32(uint32_t fetchdat)
             goto next_ins;
     } else {
         status   = i387cw_to_softfloat_status_word(i387_get_control_word());
-        save_reg = floatx80_to_float64(FPU_read_regi(0), &status);
-        if (FPU_exception(fetchdat, status.float_exception_flags, 1))
+        save_reg = extF80_to_f64(FPU_read_regi(0), &status);
+        if (FPU_exception(fetchdat, status.softfloat_exceptionFlags, 1))
             goto next_ins;
     }
     // store to the memory might generate an exception, in this case original FPU_SW must be kept
@@ -1168,6 +1256,7 @@ sf_FSTPd_a32(uint32_t fetchdat)
     seteaq(save_reg);
     if (cpu_state.abrt)
         return 1;
+
     fpu_state.swd = sw;
     FPU_pop();
 
@@ -1200,8 +1289,8 @@ sf_FSTPe_a16(uint32_t fetchdat)
     } else {
         save_reg = FPU_read_regi(0);
     }
-    writememq(easeg, cpu_state.eaaddr, save_reg.fraction);
-    writememw(easeg, cpu_state.eaaddr + 8, save_reg.exp);
+    writememq(easeg, cpu_state.eaaddr, save_reg.signif);
+    writememw(easeg, cpu_state.eaaddr + 8, save_reg.signExp);
     FPU_pop();
 
 next_ins:
@@ -1231,8 +1320,8 @@ sf_FSTPe_a32(uint32_t fetchdat)
     } else {
         save_reg = FPU_read_regi(0);
     }
-    writememq(easeg, cpu_state.eaaddr, save_reg.fraction);
-    writememw(easeg, cpu_state.eaaddr + 8, save_reg.exp);
+    writememq(easeg, cpu_state.eaaddr, save_reg.signif);
+    writememw(easeg, cpu_state.eaaddr + 8, save_reg.signExp);
     FPU_pop();
 
 next_ins:
@@ -1272,7 +1361,7 @@ sf_FSTP_sti(uint32_t fetchdat)
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0)) {
-        FPU_stack_underflow(fetchdat, fetchdat & 7, 1);
+        FPU_pop();
     } else {
         st0_reg = FPU_read_regi(0);
         FPU_save_regi(st0_reg, fetchdat & 7);
diff --git a/src/cpu/x87_ops_sf_misc.h b/src/cpu/x87_ops_sf_misc.h
index 85f42e6d5..746e85c6f 100644
--- a/src/cpu/x87_ops_sf_misc.h
+++ b/src/cpu/x87_ops_sf_misc.h
@@ -81,7 +81,7 @@ sf_FABS(uint32_t fetchdat)
 }
 
 static int
-sf_FDECSTP(uint32_t fetchdat)
+sf_FDECSTP(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -94,7 +94,7 @@ sf_FDECSTP(uint32_t fetchdat)
 }
 
 static int
-sf_FINCSTP(uint32_t fetchdat)
+sf_FINCSTP(UNUSED(uint32_t fetchdat))
 {
     FP_ENTER();
     FPU_check_pending_exceptions();
@@ -129,6 +129,7 @@ sf_FFREEP_sti(uint32_t fetchdat)
     FPU_settagi(X87_TAG_EMPTY, fetchdat & 7);
     if (cpu_state.abrt)
         return 1;
+
     FPU_pop();
     CLOCK_CYCLES_FPU((fpu_type >= FPU_487SX) ? (x87_timings.ffree) : (x87_timings.ffree * cpu_multi));
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.ffree) : (x87_concurrency.ffree * cpu_multi));
diff --git a/src/cpu/x87_ops_sf_trans.h b/src/cpu/x87_ops_sf_trans.h
index 5a99abb4c..d5aec0110 100644
--- a/src/cpu/x87_ops_sf_trans.h
+++ b/src/cpu/x87_ops_sf_trans.h
@@ -1,10 +1,11 @@
 static int
 sf_F2XM1(uint32_t fetchdat)
 {
-    floatx80              result;
-    struct float_status_t status;
+    floatx80                    result;
+    struct softfloat_status_t   status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0)) {
@@ -13,7 +14,7 @@ sf_F2XM1(uint32_t fetchdat)
     }
     status = i387cw_to_softfloat_status_word(i387_get_control_word() | FPU_PR_80_BITS);
     result = f2xm1(FPU_read_regi(0), &status);
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0))
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))
         FPU_save_regi(result, 0);
 
 next_ins:
@@ -25,10 +26,11 @@ next_ins:
 static int
 sf_FYL2X(uint32_t fetchdat)
 {
-    floatx80              result;
-    struct float_status_t status;
+    floatx80                    result;
+    struct softfloat_status_t   status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(1)) {
@@ -37,7 +39,7 @@ sf_FYL2X(uint32_t fetchdat)
     }
     status = i387cw_to_softfloat_status_word(i387_get_control_word() | FPU_PR_80_BITS);
     result = fyl2x(FPU_read_regi(0), FPU_read_regi(1), &status);
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_pop();
         FPU_save_regi(result, 0);
     }
@@ -51,11 +53,12 @@ next_ins:
 static int
 sf_FPTAN(uint32_t fetchdat)
 {
-    const floatx80        floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
-    floatx80              y;
-    struct float_status_t status;
+    const floatx80              floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
+    floatx80                    y;
+    struct softfloat_status_t   status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     clear_C2();
@@ -76,12 +79,12 @@ sf_FPTAN(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word() | FPU_PR_80_BITS);
     y      = FPU_read_regi(0);
     if (ftan(&y, &status) == -1) {
-        fpu_state.swd |= C2;
+        fpu_state.swd |= FPU_SW_C2;
         goto next_ins;
     }
 
-    if (floatx80_is_nan(y)) {
-        if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (extF80_isNaN(y)) {
+        if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
             FPU_save_regi(y, 0);
             FPU_push();
             FPU_save_regi(y, 0);
@@ -89,7 +92,7 @@ sf_FPTAN(uint32_t fetchdat)
         goto next_ins;
     }
 
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_save_regi(y, 0);
         FPU_push();
         FPU_save_regi(Const_1, 0);
@@ -104,12 +107,13 @@ next_ins:
 static int
 sf_FPATAN(uint32_t fetchdat)
 {
-    floatx80              a;
-    floatx80              b;
-    floatx80              result;
-    struct float_status_t status;
+    floatx80                    a;
+    floatx80                    b;
+    floatx80                    result;
+    struct softfloat_status_t   status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(1)) {
         FPU_stack_underflow(fetchdat, 1, 1);
@@ -119,7 +123,7 @@ sf_FPATAN(uint32_t fetchdat)
     b      = FPU_read_regi(1);
     status = i387cw_to_softfloat_status_word(i387_get_control_word() | FPU_PR_80_BITS);
     result = fpatan(a, b, &status);
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_pop();
         FPU_save_regi(result, 0);
     }
@@ -133,11 +137,15 @@ next_ins:
 static int
 sf_FXTRACT(uint32_t fetchdat)
 {
-    struct float_status_t status;
-    floatx80              a;
-    floatx80              b;
+    struct softfloat_status_t   status;
+    floatx80                    a;
+    floatx80                    b;
+#if 0
+    const floatx80              floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
+#endif
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
 
@@ -160,8 +168,8 @@ sf_FXTRACT(uint32_t fetchdat)
 
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
     a      = FPU_read_regi(0);
-    b      = floatx80_extract(&a, &status);
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    b      = extF80_extract(&a, &status);
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_save_regi(b, 0); // exponent
         FPU_push();
         FPU_save_regi(a, 0); // fraction
@@ -178,15 +186,16 @@ next_ins:
 static int
 sf_FPREM1(uint32_t fetchdat)
 {
-    floatx80              a;
-    floatx80              b;
-    floatx80              result;
-    struct float_status_t status;
-    uint64_t              quotient = 0;
-    int                   flags;
-    int                   cc;
+    floatx80                    a;
+    floatx80                    b;
+    floatx80                    result;
+    struct softfloat_status_t   status;
+    uint64_t                    quotient = 0;
+    int                         flags;
+    int                         cc;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     clear_C2();
@@ -198,18 +207,18 @@ sf_FPREM1(uint32_t fetchdat)
     a      = FPU_read_regi(0);
     b      = FPU_read_regi(1);
     flags  = floatx80_ieee754_remainder(a, b, &result, &quotient, &status);
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         if (flags >= 0) {
             cc = 0;
             if (flags)
-                cc = C2;
+                cc = FPU_SW_C2;
             else {
                 if (quotient & 1)
-                    cc |= C1;
+                    cc |= FPU_SW_C1;
                 if (quotient & 2)
-                    cc |= C3;
+                    cc |= FPU_SW_C3;
                 if (quotient & 4)
-                    cc |= C0;
+                    cc |= FPU_SW_C0;
             }
             setcc(cc);
         }
@@ -225,15 +234,16 @@ next_ins:
 static int
 sf_FPREM(uint32_t fetchdat)
 {
-    floatx80              a;
-    floatx80              b;
-    floatx80              result;
-    struct float_status_t status;
-    uint64_t              quotient = 0;
-    int                   flags;
-    int                   cc;
+    floatx80                    a;
+    floatx80                    b;
+    floatx80                    result;
+    struct softfloat_status_t   status;
+    uint64_t                    quotient = 0;
+    int                         flags;
+    int                         cc;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     clear_C2();
@@ -246,18 +256,18 @@ sf_FPREM(uint32_t fetchdat)
     b      = FPU_read_regi(1);
     // handle unsupported extended double-precision floating encodings
     flags = floatx80_remainder(a, b, &result, &quotient, &status);
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         if (flags >= 0) {
             cc = 0;
             if (flags)
-                cc = C2;
+                cc = FPU_SW_C2;
             else {
                 if (quotient & 1)
-                    cc |= C1;
+                    cc |= FPU_SW_C1;
                 if (quotient & 2)
-                    cc |= C3;
+                    cc |= FPU_SW_C3;
                 if (quotient & 4)
-                    cc |= C0;
+                    cc |= FPU_SW_C0;
             }
             setcc(cc);
         }
@@ -273,10 +283,11 @@ next_ins:
 static int
 sf_FYL2XP1(uint32_t fetchdat)
 {
-    floatx80              result;
-    struct float_status_t status;
+    floatx80                    result;
+    struct softfloat_status_t   status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(1)) {
@@ -285,7 +296,7 @@ sf_FYL2XP1(uint32_t fetchdat)
     }
     status = i387cw_to_softfloat_status_word(i387_get_control_word() | FPU_PR_80_BITS);
     result = fyl2xp1(FPU_read_regi(0), FPU_read_regi(1), &status);
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_save_regi(result, 1);
         FPU_pop();
     }
@@ -300,13 +311,14 @@ next_ins:
 static int
 sf_FSINCOS(uint32_t fetchdat)
 {
-    const floatx80        floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
-    struct float_status_t status;
-    floatx80              y;
-    floatx80              sin_y;
-    floatx80              cos_y;
+    const floatx80              floatx80_default_nan = packFloatx80(0, floatx80_default_nan_exp, floatx80_default_nan_fraction);
+    struct softfloat_status_t   status;
+    floatx80                    y;
+    floatx80                    sin_y;
+    floatx80                    cos_y;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     clear_C2();
@@ -327,10 +339,10 @@ sf_FSINCOS(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word() | FPU_PR_80_BITS);
     y      = FPU_read_regi(0);
     if (fsincos(y, &sin_y, &cos_y, &status) == -1) {
-        fpu_state.swd |= C2;
+        fpu_state.swd |= FPU_SW_C2;
         goto next_ins;
     }
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0)) {
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0)) {
         FPU_save_regi(sin_y, 0);
         FPU_push();
         FPU_save_regi(cos_y, 0);
@@ -346,10 +358,11 @@ next_ins:
 static int
 sf_FSCALE(uint32_t fetchdat)
 {
-    floatx80              result;
-    struct float_status_t status;
+    floatx80                    result;
+    struct softfloat_status_t   status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     if (IS_TAG_EMPTY(0) || IS_TAG_EMPTY(1)) {
@@ -357,8 +370,8 @@ sf_FSCALE(uint32_t fetchdat)
         goto next_ins;
     }
     status = i387cw_to_softfloat_status_word(i387_get_control_word());
-    result = floatx80_scale(FPU_read_regi(0), FPU_read_regi(1), &status);
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0))
+    result = extF80_scale(FPU_read_regi(0), FPU_read_regi(1), &status);
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))
         FPU_save_regi(result, 0);
 
 next_ins:
@@ -371,10 +384,11 @@ next_ins:
 static int
 sf_FSIN(uint32_t fetchdat)
 {
-    floatx80              y;
-    struct float_status_t status;
+    floatx80                    y;
+    struct softfloat_status_t   status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     clear_C2();
@@ -385,10 +399,10 @@ sf_FSIN(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word() | FPU_PR_80_BITS);
     y      = FPU_read_regi(0);
     if (fsin(&y, &status) == -1) {
-        fpu_state.swd |= C2;
+        fpu_state.swd |= FPU_SW_C2;
         goto next_ins;
     }
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0))
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))
         FPU_save_regi(y, 0);
 
 next_ins:
@@ -400,10 +414,11 @@ next_ins:
 static int
 sf_FCOS(uint32_t fetchdat)
 {
-    floatx80              y;
-    struct float_status_t status;
+    floatx80                    y;
+    struct softfloat_status_t   status;
 
     FP_ENTER();
+    FPU_check_pending_exceptions();
     cpu_state.pc++;
     clear_C1();
     clear_C2();
@@ -414,10 +429,10 @@ sf_FCOS(uint32_t fetchdat)
     status = i387cw_to_softfloat_status_word(i387_get_control_word() | FPU_PR_80_BITS);
     y      = FPU_read_regi(0);
     if (fcos(&y, &status) == -1) {
-        fpu_state.swd |= C2;
+        fpu_state.swd |= FPU_SW_C2;
         goto next_ins;
     }
-    if (!FPU_exception(fetchdat, status.float_exception_flags, 0))
+    if (!FPU_exception(fetchdat, status.softfloat_exceptionFlags, 0))
         FPU_save_regi(y, 0);
 
 next_ins:
diff --git a/src/cpu/x87_sf.h b/src/cpu/x87_sf.h
new file mode 100644
index 000000000..0388442bd
--- /dev/null
+++ b/src/cpu/x87_sf.h
@@ -0,0 +1,40 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          CPU type handler.
+ *
+ *
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2016-2024 Miran Grca.
+ */
+#ifndef EMU_X87_SF_H
+#define EMU_X87_SF_H
+
+#include "softfloat3e/softfloat.h"
+
+typedef struct {
+    uint16_t      cwd;
+    uint16_t      swd;
+    uint16_t      tag;
+    uint16_t      foo;
+    uint32_t      fip;
+    uint32_t      fdp;
+    uint16_t      fcs;
+    uint16_t      fds;
+    floatx80      st_space[8];
+    unsigned char tos;
+    unsigned char align1;
+    unsigned char align2;
+    unsigned char align3;
+} fpu_state_t;
+
+extern fpu_state_t fpu_state;
+
+#endif /*EMU_X87_SF_H*/
diff --git a/src/ddma.c b/src/ddma.c
index 7cbe2831e..0ca1bb879 100644
--- a/src/ddma.c
+++ b/src/ddma.c
@@ -193,7 +193,7 @@ const device_t ddma_device = {
     .init          = ddma_init,
     .close         = ddma_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/device.c b/src/device.c
index 6125674db..07e193ead 100644
--- a/src/device.c
+++ b/src/device.c
@@ -19,7 +19,7 @@
  *          Copyright 2016-2019 Miran Grca.
  *          Copyright 2008-2019 Sarah Walker.
  *          Copyright 2021      Andreas J. Reichel.
- *          Copyright 2021-2022 Jasmine Iwanek.
+ *          Copyright 2021-2025 Jasmine Iwanek.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,8 +53,10 @@
 #include <86box/device.h>
 #include <86box/machine.h>
 #include <86box/mem.h>
+#include <86box/plat.h>
 #include <86box/rom.h>
 #include <86box/sound.h>
+#include <86box/ui.h>
 
 #define DEVICE_MAX 256 /* max # of devices */
 
@@ -62,6 +64,7 @@ static device_t        *devices[DEVICE_MAX];
 static void            *device_priv[DEVICE_MAX];
 static device_context_t device_current;
 static device_context_t device_prev;
+static void            *device_common_priv;
 
 #ifdef ENABLE_DEVICE_LOG
 int device_do_log = ENABLE_DEVICE_LOG;
@@ -89,27 +92,38 @@ device_init(void)
 }
 
 void
-device_set_context(device_context_t *c, const device_t *dev, int inst)
+device_set_context(device_context_t *ctx, const device_t *dev, int inst)
 {
-    const void *sec;
-    void       *single_sec;
-
-    memset(c, 0, sizeof(device_context_t));
-    c->dev      = dev;
-    c->instance = inst;
+    memset(ctx, 0, sizeof(device_context_t));
+    ctx->dev      = dev;
+    ctx->instance = inst;
     if (inst) {
-        sprintf(c->name, "%s #%i", dev->name, inst);
+        sprintf(ctx->name, "%s #%i", dev->name, inst);
 
-        /* If this is the first instance and a numbered section is not present, but a non-numbered
-           section of the same name is, rename the non-numbered section to numbered. */
-        if (inst == 1) {
-            sec        = config_find_section(c->name);
-            single_sec = config_find_section((char *) dev->name);
-            if ((sec == NULL) && (single_sec != NULL))
-                config_rename_section(single_sec, c->name);
-        }
+        /* If a numbered section is not present, but a non-numbered of the same name
+           is, rename the non-numbered section to numbered. */
+        const void *sec        = config_find_section(ctx->name);
+        void *      single_sec = config_find_section((char *) dev->name);
+        if ((sec == NULL) && (single_sec != NULL))
+            config_rename_section(single_sec, ctx->name);
+    } else if (!strcmp(dev->name, "PS/2 Mouse")) {
+        sprintf(ctx->name, "%s", dev->name);
+
+        /* Migrate the old "Standard PS/2 Mouse" section */
+        const void *sec        = config_find_section(ctx->name);
+        void *      old_sec    = config_find_section("Standard PS/2 Mouse");
+        if ((sec == NULL) && (old_sec != NULL))
+            config_rename_section(old_sec, ctx->name);
+    } else if (!strcmp(dev->name, "Microsoft RAMCard")) {
+        sprintf(ctx->name, "%s", dev->name);
+
+        /* Migrate the old "Microsoft RAMCard for IBM PC" section */
+        const void *sec        = config_find_section(ctx->name);
+        void *      old_sec    = config_find_section("Microsoft RAMCard for IBM PC");
+        if ((sec == NULL) && (old_sec != NULL))
+            config_rename_section(old_sec, ctx->name);
     } else
-        sprintf(c->name, "%s", dev->name);
+        sprintf(ctx->name, "%s", dev->name);
 }
 
 static void
@@ -138,12 +152,38 @@ device_context_restore(void)
 }
 
 static void *
-device_add_common(const device_t *dev, const device_t *cd, void *p, void *params, int inst)
+device_add_common(const device_t *dev, void *p, void *params, int inst)
 {
-    void *priv = NULL;
-    int   c;
+    device_t *init_dev = NULL;
+    void     *priv     = NULL;
+    int16_t   c;
 
-    for (c = 0; c < 256; c++) {
+    /*
+       IMPORTANT: This is needed to gracefully handle machine
+                  device addition if the relevant device is NULL.
+     */
+    if (dev == NULL)
+        return NULL;
+
+    if (!device_available(dev)) {
+        wchar_t temp[512] = { 0 };
+        swprintf(temp, sizeof_w(temp),
+                 plat_get_string(STRING_HW_NOT_AVAILABLE_DEVICE),
+                 dev->name);
+        ui_msgbox_header(MBX_INFO,
+                         plat_get_string(STRING_HW_NOT_AVAILABLE_TITLE),
+                         temp);
+        return ((void *) dev->name);
+    }
+
+    if (params != NULL) {
+        init_dev = calloc(1, sizeof(device_t));
+        memcpy(init_dev, dev, sizeof(device_t));
+        init_dev->local |= (uintptr_t) params;
+    } else
+        init_dev = (device_t *) dev;
+
+    for (c = 0; c < DEVICE_MAX; c++) {
         if (!inst && (devices[c] == dev)) {
             device_log("DEVICE: device already exists!\n");
             return (NULL);
@@ -151,8 +191,9 @@ device_add_common(const device_t *dev, const device_t *cd, void *p, void *params
         if (devices[c] == NULL)
             break;
     }
-    if ((c >= DEVICE_MAX) || (c >= 256)) {
-        fatal("DEVICE: too many devices\n");
+    if (c >= DEVICE_MAX) {
+        fatal("Attempting to initialize more than the maximum "
+              "limit of %i devices\n", DEVICE_MAX);
         return NULL;
     }
 
@@ -164,33 +205,45 @@ device_add_common(const device_t *dev, const device_t *cd, void *p, void *params
 
     if (p == NULL) {
         memcpy(&device_prev, &device_current, sizeof(device_context_t));
-        device_set_context(&device_current, cd, inst);
+        device_set_context(&device_current, dev, inst);
 
         if (dev->init != NULL) {
-            priv = (dev->flags & DEVICE_EXTPARAMS) ? dev->init_ext(dev, params) : dev->init(dev);
+            /* Give it our temporary device in case we have dynamically changed info->local. */
+            priv = dev->init(init_dev);
+
             if (priv == NULL) {
+#ifdef ENABLE_DEVICE_LOG
                 if (dev->name)
                     device_log("DEVICE: device '%s' init failed\n", dev->name);
                 else
                     device_log("DEVICE: device init failed\n");
+#endif
 
                 devices[c]     = NULL;
                 device_priv[c] = NULL;
 
+                if ((init_dev != NULL) && (init_dev != (device_t *) dev))
+                    free(init_dev);
+
                 return (NULL);
             }
         }
 
+#ifdef ENABLE_DEVICE_LOG
         if (dev->name)
             device_log("DEVICE: device '%s' init successful\n", dev->name);
         else
             device_log("DEVICE: device init successful\n");
+#endif
 
         memcpy(&device_current, &device_prev, sizeof(device_context_t));
         device_priv[c] = priv;
     } else
         device_priv[c] = p;
 
+    if (init_dev != dev)
+        free(init_dev);
+
     return priv;
 }
 
@@ -206,103 +259,68 @@ device_get_internal_name(const device_t *dev)
 void *
 device_add(const device_t *dev)
 {
-    return device_add_common(dev, dev, NULL, NULL, 0);
+    return device_add_common(dev, NULL, NULL, 0);
 }
 
 void *
-device_add_parameters(const device_t *dev, void *params)
+device_add_linked(const device_t *dev, void *priv)
 {
-    return device_add_common(dev, dev, NULL, params, 0);
+    void *ret;
+
+    device_common_priv = priv;
+    ret = device_add_common(dev, NULL, NULL, 0);
+    device_common_priv = NULL;
+    return ret;
+}
+
+void *
+device_add_params(const device_t *dev, void *params)
+{
+    return device_add_common(dev, NULL, params, 0);
 }
 
 /* For devices that do not have an init function (internal video etc.) */
 void
 device_add_ex(const device_t *dev, void *priv)
 {
-    device_add_common(dev, dev, priv, NULL, 0);
+    device_add_common(dev, priv, NULL, 0);
 }
 
 void
-device_add_ex_parameters(const device_t *dev, void *priv, void *params)
+device_add_ex_params(const device_t *dev, void *priv, void *params)
 {
-    device_add_common(dev, dev, priv, params, 0);
+    device_add_common(dev, priv, params, 0);
 }
 
 void *
 device_add_inst(const device_t *dev, int inst)
 {
-    return device_add_common(dev, dev, NULL, NULL, inst);
+    return device_add_common(dev, NULL, NULL, inst);
 }
 
 void *
-device_add_inst_parameters(const device_t *dev, int inst, void *params)
+device_add_inst_params(const device_t *dev, int inst, void *params)
 {
-    return device_add_common(dev, dev, NULL, params, inst);
+    return device_add_common(dev, NULL, params, inst);
 }
 
 /* For devices that do not have an init function (internal video etc.) */
 void
 device_add_inst_ex(const device_t *dev, void *priv, int inst)
 {
-    device_add_common(dev, dev, priv, NULL, inst);
+    device_add_common(dev, priv, NULL, inst);
 }
 
 void
-device_add_inst_ex_parameters(const device_t *dev, void *priv, int inst, void *params)
+device_add_inst_ex_params(const device_t *dev, void *priv, int inst, void *params)
 {
-    device_add_common(dev, dev, priv, params, inst);
-}
-
-/* These eight are to add a device with another device's context - will be
-   used to add machines' internal devices. */
-void *
-device_cadd(const device_t *dev, const device_t *cd)
-{
-    return device_add_common(dev, cd, NULL, NULL, 0);
+    device_add_common(dev, priv, params, inst);
 }
 
 void *
-device_cadd_parameters(const device_t *dev, const device_t *cd, void *params)
+device_get_common_priv(void)
 {
-    return device_add_common(dev, cd, NULL, params, 0);
-}
-
-/* For devices that do not have an init function (internal video etc.) */
-void
-device_cadd_ex(const device_t *dev, const device_t *cd, void *priv)
-{
-    device_add_common(dev, cd, priv, NULL, 0);
-}
-
-void
-device_cadd_ex_parameters(const device_t *dev, const device_t *cd, void *priv, void *params)
-{
-    device_add_common(dev, cd, priv, params, 0);
-}
-
-void *
-device_cadd_inst(const device_t *dev, const device_t *cd, int inst)
-{
-    return device_add_common(dev, cd, NULL, NULL, inst);
-}
-
-void *
-device_cadd_inst_parameters(const device_t *dev, const device_t *cd, int inst, void *params)
-{
-    return device_add_common(dev, cd, NULL, params, inst);
-}
-
-/* For devices that do not have an init function (internal video etc.) */
-void
-device_cadd_inst_ex(const device_t *dev, const device_t *cd, void *priv, int inst)
-{
-    device_add_common(dev, cd, priv, NULL, inst);
-}
-
-void
-device_cadd_inst_ex_parameters(const device_t *dev, const device_t *cd, void *priv, int inst, void *params)
-{
-    device_add_common(dev, cd, priv, params, inst);
+    return device_common_priv;
 }
 
 void
@@ -310,11 +328,14 @@ device_close_all(void)
 {
     for (int16_t c = (DEVICE_MAX - 1); c >= 0; c--) {
         if (devices[c] != NULL) {
+#ifdef ENABLE_DEVICE_LOG
             if (devices[c]->name)
                 device_log("Closing device: \"%s\"...\n", devices[c]->name);
+#endif
             if (devices[c]->close != NULL)
                 devices[c]->close(device_priv[c]);
-            devices[c] = device_priv[c] = NULL;
+            devices[c]     = NULL;
+            device_priv[c] = NULL;
         }
     }
 }
@@ -363,60 +384,141 @@ device_get_priv(const device_t *dev)
 int
 device_available(const device_t *dev)
 {
-    const device_config_t      *config = NULL;
-    const device_config_bios_t *bios   = NULL;
-    int                         roms_present = 0;
-    int                         i = 0;
+    int ret = machine_device_available(dev);
 
+    if (ret == 0) {
+        /* No CONFIG_BIOS field present, use the classic available(). */
+        if (dev->available != NULL)
+            ret = (dev->available());
+        else
+            ret = (dev != NULL);
+    } else
+        ret = (ret == -1);
+
+    return ret;
+}
+
+uint8_t
+device_get_bios_type(const device_t *dev, const char *internal_name)
+{
     if (dev != NULL) {
-        config = dev->config;
+        const device_config_t *config = dev->config;
         if (config != NULL) {
-            while (config->type != -1) {
+            while (config->type != CONFIG_END) {
                 if (config->type == CONFIG_BIOS) {
-                    bios = (const device_config_bios_t *) config->bios;
-
-                    /* Go through the ROM's in the device configuration. */
-                    while (bios->files_no != 0) {
-                        i = 0;
-                        for (int bf = 0; bf < bios->files_no; bf++)
-                            i += !!rom_present(bios->files[bf]);
-                        if (i == bios->files_no)
-                            roms_present++;
+                    const device_config_bios_t *bios = (const device_config_bios_t *) config->bios;
+                    while ((bios != NULL) &&
+                           (bios->name != NULL) &&
+                           (bios->internal_name != NULL) &&
+                           (bios->files_no != 0)) {
+                        if (!strcmp(internal_name, bios->internal_name))
+                            return bios->bios_type;
+                        bios++;
+                    }
+                }
+                config++;
+            }
+        }
+    }
+
+    return 0;
+}
+
+uint8_t
+device_get_bios_num_files(const device_t *dev, const char *internal_name)
+{
+    if (dev != NULL) {
+        const device_config_t *config = dev->config;
+        if (config != NULL) {
+            while (config->type != CONFIG_END) {
+                if (config->type == CONFIG_BIOS) {
+                    const device_config_bios_t *bios = (const device_config_bios_t *) config->bios;
+                    while ((bios != NULL) &&
+                           (bios->name != NULL) &&
+                           (bios->internal_name != NULL) &&
+                           (bios->files_no != 0)) {
+                        if (!strcmp(internal_name, bios->internal_name))
+                            return bios->files_no;
+                        bios++;
+                    }
+                }
+                config++;
+            }
+        }
+    }
+
+    return 0;
+}
+
+uint32_t
+device_get_bios_local(const device_t *dev, const char *internal_name)
+{
+    if (dev != NULL) {
+        const device_config_t *config = dev->config;
+        if (config != NULL) {
+            while (config->type != CONFIG_END) {
+                if (config->type == CONFIG_BIOS) {
+                    const device_config_bios_t *bios = (const device_config_bios_t *) config->bios;
+                    while ((bios != NULL) &&
+                           (bios->name != NULL) &&
+                           (bios->internal_name != NULL) &&
+                           (bios->files_no != 0)) {
+                        if (!strcmp(internal_name, bios->internal_name))
+                            return bios->local;
+                        bios++;
+                    }
+                }
+                config++;
+            }
+        }
+    }
+
+    return 0;
+}
+
+uint32_t
+device_get_bios_file_size(const device_t *dev, const char *internal_name)
+{
+    if (dev != NULL) {
+        const device_config_t *config = dev->config;
+        if (config != NULL) {
+            while (config->type != CONFIG_END) {
+                if (config->type == CONFIG_BIOS) {
+                    const device_config_bios_t *bios = (const device_config_bios_t *) config->bios;
+
+                    /* Go through the ROM's in the device configuration. */
+                    while ((bios != NULL) &&
+                           (bios->name != NULL) &&
+                           (bios->internal_name != NULL) &&
+                           (bios->files_no != 0)) {
+                        if (!strcmp(internal_name, bios->internal_name))
+                            return bios->size;
                         bios++;
                     }
-
-                    return (roms_present ? -1 : 0);
                 }
                 config++;
             }
         }
-
-        /* No CONFIG_BIOS field present, use the classic available(). */
-        if (dev->available != NULL)
-            return (dev->available());
-        else
-            return 1;
     }
 
-    /* A NULL device is never available. */
     return 0;
 }
 
 const char *
 device_get_bios_file(const device_t *dev, const char *internal_name, int file_no)
 {
-    const device_config_t      *config = NULL;
-    const device_config_bios_t *bios   = NULL;
-
     if (dev != NULL) {
-        config = dev->config;
+        const device_config_t *config = dev->config;
         if (config != NULL) {
-            while (config->type != -1) {
+            while (config->type != CONFIG_END) {
                 if (config->type == CONFIG_BIOS) {
-                    bios = config->bios;
+                    const device_config_bios_t *bios = (const device_config_bios_t *) config->bios;
 
                     /* Go through the ROM's in the device configuration. */
-                    while (bios->files_no != 0) {
+                    while ((bios != NULL) &&
+                           (bios->name != NULL) &&
+                           (bios->internal_name != NULL) &&
+                           (bios->files_no != 0)) {
                         if (!strcmp(internal_name, bios->internal_name)) {
                             if (file_no < bios->files_no)
                                 return bios->files[file_no];
@@ -449,37 +551,21 @@ device_has_config(const device_t *dev)
 
     config = dev->config;
 
-    while (config->type != -1) {
-        if (config->type != CONFIG_MAC)
-            c++;
+    while (config->type != CONFIG_END) {
+        c++;
         config++;
     }
 
     return (c > 0) ? 1 : 0;
 }
 
-int
-device_poll(const device_t *dev)
-{
-    for (uint16_t c = 0; c < DEVICE_MAX; c++) {
-        if (devices[c] != NULL) {
-            if (devices[c] == dev) {
-                if (devices[c]->poll)
-                    return (devices[c]->poll(device_priv[c]));
-            }
-        }
-    }
-
-    return 0;
-}
-
 void
 device_get_name(const device_t *dev, int bus, char *name)
 {
     const char *sbus = NULL;
     const char *fbus;
     char       *tname;
-    char        pbus[8] = { 0 };
+    char        pbus[16] = { 0 };
 
     if (dev == NULL)
         return;
@@ -487,18 +573,45 @@ device_get_name(const device_t *dev, int bus, char *name)
     name[0] = 0x00;
 
     if (bus) {
-        if (dev->flags & DEVICE_ISA)
-            sbus = (dev->flags & DEVICE_AT) ? "ISA16" : "ISA";
+        if ((dev->flags & (DEVICE_SIDECAR | DEVICE_ISA)) ==
+            (DEVICE_SIDECAR | DEVICE_ISA))
+            sbus = "ISA/Sidecar";
+        else if (dev->flags & DEVICE_SIDECAR)
+            sbus = "Sidecar";
+        else if (dev->flags & DEVICE_XT_KBC)
+            sbus = "XT KBC";
+        else if (dev->flags & DEVICE_ISA16)
+            sbus = "ISA16";
+        else if (dev->flags & DEVICE_AT_KBC)
+            sbus = "AT KBC";
+        else if (dev->flags & DEVICE_PS2_KBC)
+            sbus = "PS/2 KBC";
+        else if (dev->flags & DEVICE_ISA)
+            sbus = "ISA";
         else if (dev->flags & DEVICE_CBUS)
             sbus = "C-BUS";
+        else if (dev->flags & DEVICE_PCMCIA)
+            sbus = "PCMCIA";
         else if (dev->flags & DEVICE_MCA)
             sbus = "MCA";
+        else if (dev->flags & DEVICE_MCA32)
+            sbus = "MCA32";
+        else if (dev->flags & DEVICE_HIL)
+            sbus = "HP HIL";
         else if (dev->flags & DEVICE_EISA)
             sbus = "EISA";
+        else if (dev->flags & DEVICE_AT32)
+            sbus = "AT/32";
+        else if (dev->flags & DEVICE_OLB)
+            sbus = "OLB";
         else if (dev->flags & DEVICE_VLB)
             sbus = "VLB";
         else if (dev->flags & DEVICE_PCI)
             sbus = "PCI";
+        else if (dev->flags & DEVICE_CARDBUS)
+            sbus = "CardBus";
+        else if (dev->flags & DEVICE_USB)
+            sbus = "USB";
         else if (dev->flags & DEVICE_AGP)
             sbus = "AGP";
         else if (dev->flags & DEVICE_AC97)
@@ -529,8 +642,7 @@ device_get_name(const device_t *dev, int bus, char *name)
             strcat(pbus, ")");
 
             /* Allocate the temporary device name string and set it to all zeroes. */
-            tname = (char *) malloc(strlen(dev->name) + 1);
-            memset(tname, 0x00, strlen(dev->name) + 1);
+            tname = (char *) calloc(1, strlen(dev->name) + 1);
 
             /* First strip the bus string with parentheses. */
             fbus = strstr(dev->name, pbus);
@@ -547,9 +659,9 @@ device_get_name(const device_t *dev, int bus, char *name)
             fbus = strstr(tname, sbus);
             if (fbus == tname)
                 strcat(name, tname + strlen(sbus) + 1);
-            /* Special case to not strip the "oPCI" from "Ensoniq AudioPCI" or
-               the "-ISA" from "AMD PCnet-ISA". */
-            else if ((fbus == NULL) || (*(fbus - 1) == 'o') || (*(fbus - 1) == '-'))
+            /* Special case to not strip the "oPCI" from "Ensoniq AudioPCI",
+               the "-ISA" from "AMD PCnet-ISA" or the " PCI" from "CMD PCI-064x". */
+            else if ((fbus == NULL) || (*(fbus - 1) == 'o') || (*(fbus - 1) == '-') || (*(fbus - 2) == 'r') || ((fbus[0] == 'P') && (fbus[1] == 'C') && (fbus[2] == 'I') && (fbus[3] == '-')))
                 strcat(name, tname);
             else {
                 strncat(name, tname, fbus - tname - 1);
@@ -591,267 +703,307 @@ device_force_redraw(void)
     }
 }
 
-const int
+int
 device_get_instance(void)
 {
     return device_current.instance;
 }
 
 const char *
-device_get_config_string(const char *s)
+device_get_config_string(const char *str)
 {
-    const device_config_t *c = device_current.dev->config;
+    const char *ret = "";
 
-    while (c && c->type != -1) {
-        if (!strcmp(s, c->name))
-            return (config_get_string((char *) device_current.name, (char *) s, (char *) c->default_string));
+    if (device_current.dev != NULL) {
+        const device_config_t *cfg = device_current.dev->config;
 
-        c++;
+        while ((cfg != NULL) && (cfg->type != CONFIG_END)) {
+            if (!strcmp(str, cfg->name)) {
+                const char *s = (config_get_string((char *) device_current.name,
+                                 (char *) str, (char *) cfg->default_string));
+                ret = (s == NULL) ? "" : s;
+                break;
+            }
+
+            cfg++;
+        }
     }
 
-    return (NULL);
+    return ret;
 }
 
 int
-device_get_config_int(const char *s)
+device_get_config_int(const char *str)
 {
-    const device_config_t *c = device_current.dev->config;
+    if (device_current.dev != NULL) {
+        const device_config_t *cfg = device_current.dev->config;
 
-    while (c && c->type != -1) {
-        if (!strcmp(s, c->name))
-            return (config_get_int((char *) device_current.name, (char *) s, c->default_int));
+        while ((cfg != NULL) && (cfg->type != CONFIG_END)) {
+            if (!strcmp(str, cfg->name))
+                return (config_get_int((char *) device_current.name, (char *) str, cfg->default_int));
 
-        c++;
+            cfg++;
+        }
     }
 
     return 0;
 }
 
 int
-device_get_config_int_ex(const char *s, int def)
+device_get_config_int_ex(const char *str, int def)
 {
-    const device_config_t *c = device_current.dev->config;
+    if (device_current.dev != NULL) {
+        const device_config_t *cfg = device_current.dev->config;
 
-    while (c && c->type != -1) {
-        if (!strcmp(s, c->name))
-            return (config_get_int((char *) device_current.name, (char *) s, def));
+        while ((cfg != NULL) && (cfg->type != CONFIG_END)) {
+            if (!strcmp(str, cfg->name))
+                return (config_get_int((char *) device_current.name, (char *) str, def));
 
-        c++;
+            cfg++;
+        }
     }
 
     return def;
 }
 
 int
-device_get_config_hex16(const char *s)
+device_get_config_hex16(const char *str)
 {
-    const device_config_t *c = device_current.dev->config;
+    if (device_current.dev != NULL) {
+        const device_config_t *cfg = device_current.dev->config;
 
-    while (c && c->type != -1) {
-        if (!strcmp(s, c->name))
-            return (config_get_hex16((char *) device_current.name, (char *) s, c->default_int));
+        while ((cfg != NULL) && (cfg->type != CONFIG_END)) {
+            if (!strcmp(str, cfg->name))
+                return (config_get_hex16((char *) device_current.name, (char *) str, cfg->default_int));
 
-        c++;
+            cfg++;
+        }
     }
 
     return 0;
 }
 
 int
-device_get_config_hex20(const char *s)
+device_get_config_hex20(const char *str)
 {
-    const device_config_t *c = device_current.dev->config;
+    if (device_current.dev != NULL) {
+        const device_config_t *cfg = device_current.dev->config;
 
-    while (c && c->type != -1) {
-        if (!strcmp(s, c->name))
-            return (config_get_hex20((char *) device_current.name, (char *) s, c->default_int));
+        while ((cfg != NULL) && (cfg->type != CONFIG_END)) {
+            if (!strcmp(str, cfg->name))
+                return (config_get_hex20((char *) device_current.name, (char *) str, cfg->default_int));
 
-        c++;
+            cfg++;
+        }
     }
 
     return 0;
 }
 
 int
-device_get_config_mac(const char *s, int def)
+device_get_config_mac(const char *str, int def)
 {
-    const device_config_t *c = device_current.dev->config;
+    if (device_current.dev != NULL) {
+        const device_config_t *cfg = device_current.dev->config;
 
-    while (c && c->type != -1) {
-        if (!strcmp(s, c->name))
-            return (config_get_mac((char *) device_current.name, (char *) s, def));
+        while ((cfg != NULL) && (cfg->type != CONFIG_END)) {
+            if (!strcmp(str, cfg->name))
+                return (config_get_mac((char *) device_current.name, (char *) str, def));
 
-        c++;
+            cfg++;
+        }
     }
 
     return def;
 }
 
 void
-device_set_config_int(const char *s, int val)
+device_set_config_int(const char *str, int val)
 {
-    const device_config_t *c = device_current.dev->config;
+    if (device_current.dev != NULL) {
+        const device_config_t *cfg = device_current.dev->config;
 
-    while (c && c->type != -1) {
-        if (!strcmp(s, c->name)) {
-            config_set_int((char *) device_current.name, (char *) s, val);
-            break;
+        while ((cfg != NULL) && (cfg->type != CONFIG_END)) {
+            if (!strcmp(str, cfg->name)) {
+                config_set_int((char *) device_current.name, (char *) str, val);
+                break;
+            }
+
+            cfg++;
         }
-
-        c++;
     }
 }
 
 void
-device_set_config_hex16(const char *s, int val)
+device_set_config_hex16(const char *str, int val)
 {
-    const device_config_t *c = device_current.dev->config;
+    if (device_current.dev != NULL) {
+        const device_config_t *cfg = device_current.dev->config;
 
-    while (c && c->type != -1) {
-        if (!strcmp(s, c->name)) {
-            config_set_hex16((char *) device_current.name, (char *) s, val);
-            break;
+        while ((cfg != NULL) && (cfg->type != CONFIG_END)) {
+            if (!strcmp(str, cfg->name)) {
+                config_set_hex16((char *) device_current.name, (char *) str, val);
+                break;
+            }
+
+            cfg++;
         }
-
-        c++;
     }
 }
 
 void
-device_set_config_hex20(const char *s, int val)
+device_set_config_hex20(const char *str, int val)
 {
-    const device_config_t *c = device_current.dev->config;
+    if (device_current.dev != NULL) {
+        const device_config_t *cfg = device_current.dev->config;
 
-    while (c && c->type != -1) {
-        if (!strcmp(s, c->name)) {
-            config_set_hex20((char *) device_current.name, (char *) s, val);
-            break;
+        while ((cfg != NULL) && (cfg->type != CONFIG_END)) {
+            if (!strcmp(str, cfg->name)) {
+                config_set_hex20((char *) device_current.name, (char *) str, val);
+                break;
+            }
+
+        cfg++;
         }
-
-        c++;
     }
 }
 
 void
-device_set_config_mac(const char *s, int val)
+device_set_config_mac(const char *str, int val)
 {
-    const device_config_t *c = device_current.dev->config;
+    if (device_current.dev != NULL) {
+        const device_config_t *cfg = device_current.dev->config;
 
-    while (c && c->type != -1) {
-        if (!strcmp(s, c->name)) {
-            config_set_mac((char *) device_current.name, (char *) s, val);
-            break;
+        while ((cfg != NULL) && (cfg->type != CONFIG_END)) {
+            if (!strcmp(str, cfg->name)) {
+                config_set_mac((char *) device_current.name, (char *) str, val);
+                break;
+            }
+
+            cfg++;
         }
-
-        c++;
     }
 }
 
 int
-device_is_valid(const device_t *device, int m)
+device_is_valid(const device_t *device, int mch)
 {
-    if (device == NULL)
-        return 1;
+    int ret = 1;
 
-    if ((device->flags & DEVICE_PCJR) && !machine_has_bus(m, MACHINE_BUS_PCJR))
-        return 0;
+    if ((device != NULL) && ((device->flags & DEVICE_BUS) != 0)) {
+        /* Hide PCI devices on machines with only an internal PCI bus. */
+        if ((device->flags & DEVICE_PCI) &&
+            machine_has_flags(mch, MACHINE_PCI_INTERNAL))
+            ret = 0;
+        else
+            ret = machine_has_bus(mch, device->flags & DEVICE_BUS);
+    }
 
-    if ((device->flags & DEVICE_XTKBC) && machine_has_bus(m, MACHINE_BUS_ISA16) && !machine_has_bus(m, MACHINE_BUS_DM_KBC))
-        return 0;
-
-    if ((device->flags & DEVICE_AT) && !machine_has_bus(m, MACHINE_BUS_ISA16))
-        return 0;
-
-    if ((device->flags & DEVICE_ATKBC) && !machine_has_bus(m, MACHINE_BUS_ISA16) && !machine_has_bus(m, MACHINE_BUS_DM_KBC))
-        return 0;
-
-    if ((device->flags & DEVICE_ISA) && !machine_has_bus(m, MACHINE_BUS_ISA))
-        return 0;
-
-    if ((device->flags & DEVICE_CBUS) && !machine_has_bus(m, MACHINE_BUS_CBUS))
-        return 0;
-
-    if ((device->flags & DEVICE_PCMCIA) && !machine_has_bus(m, MACHINE_BUS_PCMCIA))
-        return 0;
-
-    if ((device->flags & DEVICE_MCA) && !machine_has_bus(m, MACHINE_BUS_MCA))
-        return 0;
-
-    if ((device->flags & DEVICE_HIL) && !machine_has_bus(m, MACHINE_BUS_HIL))
-        return 0;
-
-    if ((device->flags & DEVICE_EISA) && !machine_has_bus(m, MACHINE_BUS_EISA))
-        return 0;
-
-    if ((device->flags & DEVICE_OLB) && !machine_has_bus(m, MACHINE_BUS_OLB))
-        return 0;
-
-    if ((device->flags & DEVICE_VLB) && !machine_has_bus(m, MACHINE_BUS_VLB))
-        return 0;
-
-    if ((device->flags & DEVICE_PCI) && !machine_has_bus(m, MACHINE_BUS_PCI))
-        return 0;
-
-    if ((device->flags & DEVICE_CARDBUS) && !machine_has_bus(m, MACHINE_BUS_CARDBUS))
-        return 0;
-
-    if ((device->flags & DEVICE_USB) && !machine_has_bus(m, MACHINE_BUS_USB))
-        return 0;
-
-    if ((device->flags & DEVICE_AGP) && !machine_has_bus(m, MACHINE_BUS_AGP))
-        return 0;
-
-    if ((device->flags & DEVICE_PS2) && !machine_has_bus(m, MACHINE_BUS_PS2_PORTS))
-        return 0;
-
-    if ((device->flags & DEVICE_AC97) && !machine_has_bus(m, MACHINE_BUS_AC97))
-        return 0;
-
-    return 1;
+    return ret;
 }
 
 int
-machine_get_config_int(char *s)
+machine_get_config_int(char *str)
 {
-    const device_t        *d = machine_get_device(machine);
-    const device_config_t *c;
+    const device_t *dev = machine_get_device(machine);
 
-    if (d == NULL)
-        return 0;
+    if (dev != NULL) {
+        const device_config_t *cfg = dev->config;
 
-    c = d->config;
-    while (c && c->type != -1) {
-        if (!strcmp(s, c->name))
-            return (config_get_int((char *) d->name, s, c->default_int));
+        while ((cfg != NULL) && (cfg->type != CONFIG_END)) {
+            if (!strcmp(str, cfg->name))
+                return (config_get_int((char *) dev->name, str, cfg->default_int));
 
-        c++;
+            cfg++;
+        }
     }
-
     return 0;
 }
 
-char *
-machine_get_config_string(char *s)
+const char *
+machine_get_config_string(char *str)
 {
-    const device_t        *d = machine_get_device(machine);
-    const device_config_t *c;
+    const device_t *dev = machine_get_device(machine);
+    const char     *ret = "";
 
-    if (d == NULL)
-        return 0;
+    if (dev != NULL) {
+        const device_config_t *cfg = dev->config;
 
-    c = d->config;
-    while (c && c->type != -1) {
-        if (!strcmp(s, c->name))
-            return (config_get_string((char *) d->name, s, (char *) c->default_string));
+        while ((cfg != NULL) && (cfg->type != CONFIG_END)) {
+            if (!strcmp(str, cfg->name)) {
+                const char *s = config_get_string((char *) dev->name, str,
+                                                  (char *) cfg->default_string);
+                ret = (s == NULL) ? "" : s;
+                break;
+            }
 
-        c++;
+            cfg++;
+        }
     }
 
-    return NULL;
+    return ret;
 }
 
-const device_t*
+int
+machine_device_available(const device_t *dev)
+{
+    if (dev != NULL) {
+        const device_config_t *config = dev->config;
+        if ((config != NULL) && (config->type == CONFIG_BIOS)) {
+            int roms_present = 0;
+            const device_config_bios_t *bios = (const device_config_bios_t *) config->bios;
+
+            /* Go through the ROM's in the device configuration. */
+            while ((bios != NULL) &&
+                   (bios->name != NULL) &&
+                   (bios->internal_name != NULL) &&
+                   (bios->files_no != 0)) {
+                int i = 0;
+                for (uint8_t bf = 0; bf < bios->files_no; bf++)
+                    i += !!rom_present(bios->files[bf]);
+                if (i == bios->files_no)
+                    roms_present++;
+                bios++;
+            }
+
+            return (roms_present ? -1 : -2);
+        }
+    }
+
+    /* NULL device or no CONFIG_BIOS field, return 0. */
+    return 0;
+}
+
+const device_t *
 device_context_get_device(void)
 {
     return device_current.dev;
 }
+
+const device_t device_none = {
+    .name          = "None",
+    .internal_name = "none",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t device_internal = {
+    .name          = "Internal",
+    .internal_name = "internal",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt
index 24a9d7ac4..12835e909 100644
--- a/src/device/CMakeLists.txt
+++ b/src/device/CMakeLists.txt
@@ -9,22 +9,63 @@
 #          CMake build script.
 #
 # Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
 #
 #          Copyright 2020-2021 David Hrdlička.
 #          Copyright 2021      Andreas J. Reichel.
-#          Copyright 2021-2022 Jasmine Iwanek.
+#          Copyright 2021-2025 Jasmine Iwanek.
 #
 
-add_library(dev OBJECT bugger.c cassette.c cartridge.c hasp.c hwm.c hwm_lm75.c hwm_lm78.c hwm_gl518sm.c
-    hwm_vt82c686.c ibm_5161.c isamem.c isartc.c ../lpt.c pci_bridge.c
-    postcard.c serial.c unittester.c clock_ics9xxx.c isapnp.c i2c.c i2c_gpio.c
-    smbus_piix4.c smbus_ali7101.c keyboard.c keyboard_xt.c
-    kbc_at.c kbc_at_dev.c
+add_library(dev OBJECT
+    access_bus.c
+    bugger.c
+    cartridge.c
+    cassette.c
+    clock_ics9xxx.c
+    dell_jumper.c
+    hasp.c
+    hwm.c
+    hwm_gl518sm.c
+    hwm_lm75.c
+    hwm_lm78.c
+    hwm_vt82c686.c
+    i2c.c
+    i2c_gpio.c
+    ibm_5161.c
+    isamem.c
+    isarom.c
+    isartc.c
+    isapnp.c
+    kbc_at.c
+    kbc_at_dev.c
+    kbc_xt.c
+    keyboard.c
     keyboard_at.c
-    mouse.c mouse_bus.c mouse_serial.c mouse_ps2.c nec_mate_unk.c phoenix_486_jumper.c
-    serial_passthrough.c)
+    keyboard_xt.c
+    lpt.c
+    mouse.c
+    mouse_bus.c
+    mouse_microtouch_touchscreen.c
+    mouse_ps2.c
+    mouse_serial.c
+    mouse_upc.c
+    nec_mate_unk.c
+    novell_cardkey.c
+    pci_bridge.c
+    phoenix_486_jumper.c
+    postcard.c
+    radisys_config.c
+    serial.c
+    serial_passthrough.c
+    smbus_ali7101.c
+    smbus_piix4.c
+    smbus_sis5595.c
+    tulip_jumper.c
+    unittester.c
+    zenith_scratchpad.c
+)
 
-if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT MSVC)
     target_link_libraries(86Box atomic)
 endif()
 
@@ -43,3 +84,12 @@ endif()
 if(LASERXT)
     target_compile_definitions(dev PRIVATE USE_LASERXT)
 endif()
+
+if(PCL)
+    target_compile_definitions(dev PRIVATE USE_PCL)
+endif()
+
+if(WACOM)
+    target_compile_definitions(dev PRIVATE USE_WACOM)
+    target_sources(dev PRIVATE mouse_wacom_tablet.c)
+endif()
diff --git a/src/device/access_bus.c b/src/device/access_bus.c
new file mode 100644
index 000000000..951454e19
--- /dev/null
+++ b/src/device/access_bus.c
@@ -0,0 +1,122 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the ACCESS.bus.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2024-2025 Miran Grca.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/access_bus.h>
+#include <86box/plat_unused.h>
+
+static uint8_t
+access_bus_in(uint16_t port, void *priv)
+{
+    const access_bus_t *dev = (access_bus_t *) priv;
+    uint8_t             ret = 0xff;
+
+    switch (port & 3) {
+        case 0:
+            ret = (dev->status & 0xbf);
+            break;
+        case 1:
+            ret = (dev->own_addr & 0x7f);
+            break;
+        case 2:
+            ret = dev->data;
+            break;
+        case 3:
+            ret = (dev->clock & 0x87);
+            break;
+
+        default:
+            break;
+    }
+
+    return ret;
+}
+
+static void
+access_bus_out(uint16_t port, uint8_t val, void *priv)
+{
+    access_bus_t *dev = (access_bus_t *) priv;
+
+    switch (port & 3) {
+        case 0:
+            dev->control = (val & 0xcf);
+            break;
+        case 1:
+            dev->own_addr = (val & 0x7f);
+            break;
+        case 2:
+            dev->data = val;
+            break;
+        case 3:
+            dev->clock &= 0x80;
+            dev->clock |= (val & 0x07);
+            break;
+
+        default:
+            break;
+    }
+}
+
+void
+access_bus_handler(access_bus_t *dev, uint8_t enable, uint16_t base)
+{
+    if (dev->enable && (dev->base >= 0x0100) && (dev->base <= 0x0ffc))
+        io_removehandler(dev->base, 0x0004,
+                         access_bus_in, NULL, NULL, access_bus_out, NULL, NULL, dev);
+
+    dev->enable = enable;
+    dev->base   = base;
+
+    if (dev->enable && (dev->base >= 0x0100) && (dev->base <= 0x0ffc))
+        io_sethandler(dev->base, 0x0004,
+                      access_bus_in, NULL, NULL, access_bus_out, NULL, NULL, dev);
+}
+
+
+static void
+access_bus_close(void *priv)
+{
+    access_bus_t *dev = (access_bus_t *) priv;
+
+    free(dev);
+}
+
+static void *
+access_bus_init(UNUSED(const device_t *info))
+{
+    access_bus_t *dev = (access_bus_t *) calloc(1, sizeof(access_bus_t));
+
+    return dev;
+}
+
+const device_t access_bus_device = {
+    .name          = "ACCESS.bus",
+    .internal_name = "access_bus",
+    .flags         = 0,
+    .local         = 0,
+    .init          = access_bus_init,
+    .close         = access_bus_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/device/bugger.c b/src/device/bugger.c
index c2678d66a..6a30df7be 100644
--- a/src/device/bugger.c
+++ b/src/device/bugger.c
@@ -84,7 +84,10 @@ static uint8_t bug_spcfg; /* serial port configuration */
 #define FIFO_LEN 256
 static uint8_t  bug_buff[FIFO_LEN]; /* serial port data buffer */
 static uint8_t *bug_bptr;
-#define UISTR_LEN 24
+
+static char LED_R[] = "<font color=\"#EE0000\">R</font>";
+static char LED_G[] = "<font color=\"#00CC00\">G</font>";
+#define UISTR_LEN (17 + 8 * sizeof(LED_G) + 8 * sizeof(LED_R))
 static char bug_str[UISTR_LEN]; /* UI output string */
 
 extern void ui_sb_bugui(char *__str);
@@ -112,16 +115,16 @@ static void
 bug_setui(void)
 {
     /* Format all current info in a string. */
-    sprintf(bug_str, "%02X:%02X %c%c%c%c%c%c%c%c-%c%c%c%c%c%c%c%c",
+    sprintf(bug_str, "<tt>%02X:%02X %s%s%s%s%s%s%s%s-%s%s%s%s%s%s%s%s</tt>",
             bug_seg2, bug_seg1,
-            (bug_ledg & 0x80) ? 'G' : 'g', (bug_ledg & 0x40) ? 'G' : 'g',
-            (bug_ledg & 0x20) ? 'G' : 'g', (bug_ledg & 0x10) ? 'G' : 'g',
-            (bug_ledg & 0x08) ? 'G' : 'g', (bug_ledg & 0x04) ? 'G' : 'g',
-            (bug_ledg & 0x02) ? 'G' : 'g', (bug_ledg & 0x01) ? 'G' : 'g',
-            (bug_ledr & 0x80) ? 'R' : 'r', (bug_ledr & 0x40) ? 'R' : 'r',
-            (bug_ledr & 0x20) ? 'R' : 'r', (bug_ledr & 0x10) ? 'R' : 'r',
-            (bug_ledr & 0x08) ? 'R' : 'r', (bug_ledr & 0x04) ? 'R' : 'r',
-            (bug_ledr & 0x02) ? 'R' : 'r', (bug_ledr & 0x01) ? 'R' : 'r');
+            (bug_ledg & 0x80) ? LED_G : "g", (bug_ledg & 0x40) ? LED_G : "g",
+            (bug_ledg & 0x20) ? LED_G : "g", (bug_ledg & 0x10) ? LED_G : "g",
+            (bug_ledg & 0x08) ? LED_G : "g", (bug_ledg & 0x04) ? LED_G : "g",
+            (bug_ledg & 0x02) ? LED_G : "g", (bug_ledg & 0x01) ? LED_G : "g",
+            (bug_ledr & 0x80) ? LED_R : "r", (bug_ledr & 0x40) ? LED_R : "r",
+            (bug_ledr & 0x20) ? LED_R : "r", (bug_ledr & 0x10) ? LED_R : "r",
+            (bug_ledr & 0x08) ? LED_R : "r", (bug_ledr & 0x04) ? LED_R : "r",
+            (bug_ledr & 0x02) ? LED_R : "r", (bug_ledr & 0x01) ? LED_R : "r");
 
     /* Send formatted string to the UI. */
     ui_sb_bugui(bug_str);
@@ -346,12 +349,12 @@ bug_close(UNUSED(void *priv))
 const device_t bugger_device = {
     .name          = "ISA/PCI Bus Bugger",
     .internal_name = "bugger",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0,
     .init          = bug_init,
     .close         = bug_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/device/cartridge.c b/src/device/cartridge.c
index edabd3ed0..00464026a 100644
--- a/src/device/cartridge.c
+++ b/src/device/cartridge.c
@@ -22,6 +22,7 @@
 #include <wchar.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/plat.h>
 #include <86box/ui.h>
@@ -35,6 +36,7 @@ typedef struct cart_t {
 } cart_t;
 
 char cart_fns[2][512];
+char *cart_image_history[2][CART_IMAGE_HISTORY];
 
 static cart_t carts[2];
 
@@ -103,6 +105,7 @@ cart_image_load(int drive, char *fn)
     if (size < 0x1200) {
         cartridge_log("cart_image_load(): File size %i is too small\n", size);
         cart_load_error(drive, fn);
+        fclose(fp);
         return;
     }
     if (size & 0x00000fff) {
@@ -111,8 +114,7 @@ cart_image_load(int drive, char *fn)
         (void) !fread(&base, 1, 2, fp);
         base <<= 4;
         fseek(fp, 0x00000200, SEEK_SET);
-        carts[drive].buf = (uint8_t *) malloc(size);
-        memset(carts[drive].buf, 0x00, size);
+        carts[drive].buf = (uint8_t *) calloc(1, size);
         (void) !fread(carts[drive].buf, 1, size, fp);
         fclose(fp);
     } else {
@@ -120,8 +122,7 @@ cart_image_load(int drive, char *fn)
         if (size == 32768)
             base += 0x8000;
         fseek(fp, 0x00000000, SEEK_SET);
-        carts[drive].buf = (uint8_t *) malloc(size);
-        memset(carts[drive].buf, 0x00, size);
+        carts[drive].buf = (uint8_t *) calloc(1, size);
         (void) !fread(carts[drive].buf, 1, size, fp);
         fclose(fp);
     }
@@ -169,6 +170,7 @@ cart_close(int drive)
     cart_image_close(drive);
     cart_fns[drive][0] = 0;
     ui_sb_update_icon_state(SB_CARTRIDGE | drive, 1);
+    resetx86();
 }
 
 void
diff --git a/src/device/cassette.c b/src/device/cassette.c
index 1d0b88531..0577ae06f 100644
--- a/src/device/cassette.c
+++ b/src/device/cassette.c
@@ -45,6 +45,7 @@ pc_cassette_t *cassette;
 
 char          cassette_fname[512];
 char          cassette_mode[512];
+char *        cassette_image_history[CASSETTE_IMAGE_HISTORY];
 unsigned long cassette_pos;
 unsigned long cassette_srate;
 int           cassette_enable;
@@ -130,9 +131,7 @@ pc_cas_free(pc_cassette_t *cas)
 pc_cassette_t *
 pc_cas_new(void)
 {
-    pc_cassette_t *cas;
-
-    cas = malloc(sizeof(pc_cassette_t));
+    pc_cassette_t *cas = calloc(1, sizeof( pc_cassette_t));
 
     if (cas == NULL) {
         return (NULL);
@@ -153,10 +152,11 @@ pc_cas_del(pc_cassette_t *cas)
 }
 
 int
-pc_cas_set_fname(pc_cassette_t *cas, const char *fname)
+pc_cas_set_fname(pc_cassette_t *cas, char *fname)
 {
     unsigned    n;
     const char *ext;
+    int         offs = 0;
 
     if (cas->close)
         fclose(cas->fp);
@@ -177,6 +177,13 @@ pc_cas_set_fname(pc_cassette_t *cas, const char *fname)
         return 0;
     }
 
+    if (strstr(fname, "wp://") == fname) {
+        offs                  = 5;
+        cassette_ui_writeprot = 1;
+    }
+
+    fname += offs;
+
     cas->fp = plat_fopen(fname, "r+b");
 
     if (cas->fp == NULL)
@@ -198,10 +205,10 @@ pc_cas_set_fname(pc_cassette_t *cas, const char *fname)
 
     n = strlen(fname);
 
-    cas->fname = malloc((n + 1) * sizeof(char));
+    cas->fname = malloc((n + offs + 1) * sizeof(char));
 
     if (cas->fname != NULL)
-        memcpy(cas->fname, fname, (n + 1) * sizeof(char));
+        memcpy(cas->fname, fname - offs, (n + offs + 1) * sizeof(char));
 
     if (n > 4) {
         ext = fname + (n - 4);
@@ -217,6 +224,8 @@ pc_cas_set_fname(pc_cassette_t *cas, const char *fname)
             pc_cas_set_pcm(cas, 0);
     }
 
+    ui_sb_update_icon_wp(SB_CASSETTE, cassette_ui_writeprot);
+
     return 0;
 }
 
@@ -716,12 +725,12 @@ cassette_init(UNUSED(const device_t *info))
 const device_t cassette_device = {
     .name          = "IBM PC/PCjr Cassette Device",
     .internal_name = "cassette",
-    .flags         = 0,
+    .flags         = DEVICE_CASETTE,
     .local         = 0,
     .init          = cassette_init,
     .close         = cassette_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/device/clock_ics9xxx.c b/src/device/clock_ics9xxx.c
index 263170741..02f033e9b 100644
--- a/src/device/clock_ics9xxx.c
+++ b/src/device/clock_ics9xxx.c
@@ -1181,8 +1181,7 @@ ics9xxx_find_bus_match(ics9xxx_t *dev, uint32_t bus, uint8_t preset_mask, uint8_
 static void *
 ics9xxx_init(const device_t *info)
 {
-    ics9xxx_t *dev = (ics9xxx_t *) malloc(sizeof(ics9xxx_t));
-    memset(dev, 0, sizeof(ics9xxx_t));
+    ics9xxx_t *dev = (ics9xxx_t *) calloc(1, sizeof(ics9xxx_t));
 
     dev->model_idx  = info->local;
     dev->model      = (ics9xxx_model_t *) &ics9xxx_models[dev->model_idx];
@@ -1267,8 +1266,7 @@ ics9xxx_close(void *priv)
 device_t *
 ics9xxx_get(uint8_t model)
 {
-    device_t *dev = (device_t *) malloc(sizeof(device_t));
-    memset(dev, 0, sizeof(device_t));
+    device_t *dev = (device_t *) calloc(1, sizeof(device_t));
 
     dev->name  = "ICS9xxx-xx Clock Generator";
     dev->local = model;
diff --git a/src/device/dell_jumper.c b/src/device/dell_jumper.c
new file mode 100644
index 000000000..12fc3d13b
--- /dev/null
+++ b/src/device/dell_jumper.c
@@ -0,0 +1,175 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the Dell 486 and 586 Jumper Readout.
+ *
+ *          Register 0x02:
+ *              - Bit 0: ATX power: 1 = off, 0 = on.
+ *
+ *          Register 0x05:
+ *              - Appears to be: 0x02 = On-board audio enabled;
+ *                               0x07 = On-board audio disabled.
+ *
+ *          Register 0x07:
+ *              - Bit 0: On-board NIC: 1 = present, 0 = absent;
+ *              - Bit 1: On-board audio: 1 = present, 0 = absent;
+ *              - Bits 4-2:
+ *                  - 0, 0, 0 = GXL;
+ *                  - 0, 0, 1 = GL+;
+ *                  - 0, 1, 0 = GXMT;
+ *                  - 0, 1, 1 = GMT+;
+ *                  - 1, 0, 0 = GXM;
+ *                  - 1, 0, 1 = GM+;
+ *                  - 1, 1, 0 = WS;
+ *                  - 1, 1, 1 = GWS+.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2025 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/machine.h>
+#include <86box/sound.h>
+#include <86box/chipset.h>
+#include <86box/plat.h>
+#include <86box/plat_unused.h>
+
+typedef struct dell_jumper_t {
+    uint8_t index;
+    uint8_t regs[256];
+} dell_jumper_t;
+
+#ifdef ENABLE_DELL_JUMPER_LOG
+int dell_jumper_do_log = ENABLE_DELL_JUMPER_LOG;
+
+static void
+dell_jumper_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (dell_jumper_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define dell_jumper_log(fmt, ...)
+#endif
+
+static void
+dell_jumper_write(uint16_t addr, uint8_t val, void *priv)
+{
+    dell_jumper_t *dev = (dell_jumper_t *) priv;
+
+    dell_jumper_log("Dell Jumper: Write %02x\n", val);
+
+    if (addr & 1)  switch (dev->index) {
+        default:
+            dev->regs[dev->index] = val;
+            break;
+        case 0x02:
+            dev->regs[dev->index] = val;
+            if (val & 0x04)
+                /* Soft power off. */
+                plat_power_off();
+            break;
+        case 0x05:
+            dev->regs[dev->index] = (dev->regs[dev->index] & 0x02) | (val & 0xfd);
+            if (machine_snd != NULL)  switch (val & 0x05) {
+                default:
+                case 0x05:
+                    sb_vibra16s_onboard_relocate_base(0x0000, machine_snd);
+                    break;
+                case 0x00:
+                    sb_vibra16s_onboard_relocate_base(0x0220, machine_snd);
+                    break;
+            }
+            break;
+        case 0x07:
+            break;
+    } else
+        dev->index = val;
+}
+
+static uint8_t
+dell_jumper_read(uint16_t addr, void *priv)
+{
+    const dell_jumper_t *dev = (dell_jumper_t *) priv;
+    uint8_t                  ret = 0xff;
+
+    dell_jumper_log("Dell Jumper: Read %02x\n", dev->jumper);
+
+    if (addr & 1)
+        ret = dev->regs[dev->index];
+    else
+        ret = dev->index;
+
+    return ret;
+}
+
+static void
+dell_jumper_reset(void *priv)
+{
+    dell_jumper_t *dev = (dell_jumper_t *) priv;
+
+    dev->index = 0x00;
+    memset(dev->regs, 0x00, 256);
+
+    if (sound_card_current[0] == SOUND_INTERNAL)
+        /* GXL, on-board audio present, on-board NIC absent. */
+        dev->regs[0x07] = 0x02;
+    else
+        /* GXL, on-board audio absent, on-board NIC absent. */
+        dev->regs[0x07] = 0x00;
+}
+
+static void
+dell_jumper_close(void *priv)
+{
+    dell_jumper_t *dev = (dell_jumper_t *) priv;
+
+    free(dev);
+}
+
+static void *
+dell_jumper_init(const device_t *info)
+{
+    dell_jumper_t *dev = (dell_jumper_t *) calloc(1, sizeof(dell_jumper_t));
+
+    dell_jumper_reset(dev);
+
+    io_sethandler(0x00e8, 0x0002, dell_jumper_read, NULL, NULL, dell_jumper_write, NULL, NULL, dev);
+
+    return dev;
+}
+
+const device_t dell_jumper_device = {
+    .name          = "Dell Jumper Readout",
+    .internal_name = "dell_jumper",
+    .flags         = 0,
+    .local         = 0,
+    .init          = dell_jumper_init,
+    .close         = dell_jumper_close,
+    .reset         = dell_jumper_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/device/hasp.c b/src/device/hasp.c
index 9873c3460..07e9ac636 100644
--- a/src/device/hasp.c
+++ b/src/device/hasp.c
@@ -27,8 +27,9 @@
 #include <stdarg.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
-#include <86box/lpt.h>
+#include <86box/timer.h>
 #include <86box/device.h>
+#include <86box/lpt.h>
 
 #define HASP_BYTEARRAY(...) \
     {                       \
@@ -305,8 +306,7 @@ hasp_read_status(void *priv)
 static void *
 hasp_init(void *lpt, int type)
 {
-    hasp_t *dev = malloc(sizeof(hasp_t));
-    memset(dev, 0, sizeof(hasp_t));
+    hasp_t *dev = calloc(1, sizeof(hasp_t));
 
     hasp_log("HASP: init(%d)\n", type);
 
@@ -335,13 +335,15 @@ hasp_close(void *priv)
 }
 
 const lpt_device_t lpt_hasp_savquest_device = {
-    .name          = "Protection Dongle for Savage Quest",
-    .internal_name = "dongle_savquest",
-    .init          = hasp_init_savquest,
-    .close         = hasp_close,
-    .write_data    = hasp_write_data,
-    .write_ctrl    = NULL,
-    .read_data     = NULL,
-    .read_status   = hasp_read_status,
-    .read_ctrl     = NULL
+    .name             = "Protection Dongle for Savage Quest",
+    .internal_name    = "dongle_savquest",
+    .init             = hasp_init_savquest,
+    .close            = hasp_close,
+    .write_data       = hasp_write_data,
+    .write_ctrl       = NULL,
+    .strobe           = NULL,
+    .read_status      = hasp_read_status,
+    .read_ctrl        = NULL,
+    .epp_write_data   = NULL,
+    .epp_request_read = NULL
 };
diff --git a/src/device/hwm_gl518sm.c b/src/device/hwm_gl518sm.c
index 6ba1083d9..cfc16664a 100644
--- a/src/device/hwm_gl518sm.c
+++ b/src/device/hwm_gl518sm.c
@@ -282,8 +282,7 @@ gl518sm_close(void *priv)
 static void *
 gl518sm_init(const device_t *info)
 {
-    gl518sm_t *dev = (gl518sm_t *) malloc(sizeof(gl518sm_t));
-    memset(dev, 0, sizeof(gl518sm_t));
+    gl518sm_t *dev = (gl518sm_t *) calloc(1, sizeof(gl518sm_t));
 
     dev->local = info->local;
 
@@ -325,7 +324,7 @@ const device_t gl518sm_2c_device = {
     .init          = gl518sm_init,
     .close         = gl518sm_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -340,7 +339,7 @@ const device_t gl518sm_2d_device = {
     .init          = gl518sm_init,
     .close         = gl518sm_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -355,7 +354,7 @@ const device_t gl520sm_2c_device = {
     .init          = gl518sm_init,
     .close         = gl518sm_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -371,7 +370,7 @@ const device_t gl520sm_2d_device = {
     .init          = gl518sm_init,
     .close         = gl518sm_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/device/hwm_lm75.c b/src/device/hwm_lm75.c
index 14b638365..29fe2024f 100644
--- a/src/device/hwm_lm75.c
+++ b/src/device/hwm_lm75.c
@@ -216,8 +216,7 @@ lm75_close(void *priv)
 static void *
 lm75_init(const device_t *info)
 {
-    lm75_t *dev = (lm75_t *) malloc(sizeof(lm75_t));
-    memset(dev, 0, sizeof(lm75_t));
+    lm75_t *dev = (lm75_t *) calloc(1, sizeof(lm75_t));
 
     dev->local = info->local;
 
@@ -243,7 +242,7 @@ const device_t lm75_1_4a_device = {
     .init          = lm75_init,
     .close         = lm75_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -259,7 +258,7 @@ const device_t lm75_w83781d_device = {
     .init          = lm75_init,
     .close         = lm75_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/device/hwm_lm78.c b/src/device/hwm_lm78.c
index f3003db26..909713833 100644
--- a/src/device/hwm_lm78.c
+++ b/src/device/hwm_lm78.c
@@ -102,9 +102,9 @@ lm78_log(const char *fmt, ...)
 void
 lm78_nvram(lm78_t *dev, uint8_t save)
 {
-    size_t l        = strlen(machine_get_internal_name_ex(machine)) + 14;
+    size_t l        = strlen(machine_get_nvr_name_ex(machine)) + 14;
     char  *nvr_path = (char *) malloc(l);
-    sprintf(nvr_path, "%s_as99127f.nvr", machine_get_internal_name_ex(machine));
+    sprintf(nvr_path, "%s_as99127f.nvr", machine_get_nvr_name_ex(machine));
 
     FILE *fp = nvr_fopen(nvr_path, save ? "wb" : "rb");
     if (fp) {
@@ -771,8 +771,7 @@ lm78_close(void *priv)
 static void *
 lm78_init(const device_t *info)
 {
-    lm78_t *dev = (lm78_t *) malloc(sizeof(lm78_t));
-    memset(dev, 0, sizeof(lm78_t));
+    lm78_t *dev = (lm78_t *) calloc(1, sizeof(lm78_t));
 
     dev->local = info->local;
 
@@ -857,7 +856,7 @@ const device_t lm78_device = {
     .init          = lm78_init,
     .close         = lm78_close,
     .reset         = lm78_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -872,7 +871,7 @@ const device_t w83781d_device = {
     .init          = lm78_init,
     .close         = lm78_close,
     .reset         = lm78_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -887,7 +886,7 @@ const device_t w83781d_p5a_device = {
     .init          = lm78_init,
     .close         = lm78_close,
     .reset         = lm78_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -903,7 +902,7 @@ const device_t as99127f_device = {
     .init          = lm78_init,
     .close         = lm78_close,
     .reset         = lm78_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -918,7 +917,7 @@ const device_t as99127f_rev2_device = {
     .init          = lm78_init,
     .close         = lm78_close,
     .reset         = lm78_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -933,7 +932,7 @@ const device_t w83782d_device = {
     .init          = lm78_init,
     .close         = lm78_close,
     .reset         = lm78_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/device/hwm_vt82c686.c b/src/device/hwm_vt82c686.c
index b6a0dddda..8623a9f6b 100644
--- a/src/device/hwm_vt82c686.c
+++ b/src/device/hwm_vt82c686.c
@@ -183,8 +183,7 @@ vt82c686_close(void *priv)
 static void *
 vt82c686_init(UNUSED(const device_t *info))
 {
-    vt82c686_t *dev = (vt82c686_t *) malloc(sizeof(vt82c686_t));
-    memset(dev, 0, sizeof(vt82c686_t));
+    vt82c686_t *dev = (vt82c686_t *) calloc(1, sizeof(vt82c686_t));
 
     /* Set default values. Since this hardware monitor has a complex voltage factor system,
        the values struct contains voltage values *before* applying their respective factors. */
@@ -222,7 +221,7 @@ const device_t via_vt82c686_hwm_device = {
     .init          = vt82c686_init,
     .close         = vt82c686_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/device/i2c.c b/src/device/i2c.c
index 56e6f8f4c..eb80f413b 100644
--- a/src/device/i2c.c
+++ b/src/device/i2c.c
@@ -67,8 +67,7 @@ i2c_log(const char *fmt, ...)
 void *
 i2c_addbus(char *name)
 {
-    i2c_bus_t *bus = (i2c_bus_t *) malloc(sizeof(i2c_bus_t));
-    memset(bus, 0, sizeof(i2c_bus_t));
+    i2c_bus_t *bus = (i2c_bus_t *) calloc(1, sizeof(i2c_bus_t));
 
     bus->name = name;
 
@@ -127,8 +126,7 @@ i2c_sethandler(void *bus_handle, uint8_t base, int size,
 
     for (int c = 0; c < size; c++) {
         p = bus->last[base + c];
-        q = (i2c_t *) malloc(sizeof(i2c_t));
-        memset(q, 0, sizeof(i2c_t));
+        q = (i2c_t *) calloc(1, sizeof(i2c_t));
         if (p) {
             p->next = q;
             q->prev = p;
diff --git a/src/device/i2c_gpio.c b/src/device/i2c_gpio.c
index 22bdaffd3..61a3dbe05 100644
--- a/src/device/i2c_gpio.c
+++ b/src/device/i2c_gpio.c
@@ -59,8 +59,7 @@ i2c_gpio_log(int level, const char *fmt, ...)
 void *
 i2c_gpio_init(char *bus_name)
 {
-    i2c_gpio_t *dev = (i2c_gpio_t *) malloc(sizeof(i2c_gpio_t));
-    memset(dev, 0, sizeof(i2c_gpio_t));
+    i2c_gpio_t *dev = (i2c_gpio_t *) calloc(1, sizeof(i2c_gpio_t));
 
     i2c_gpio_log(1, "I2C GPIO %s: init()\n", bus_name);
 
diff --git a/src/device/ibm_5161.c b/src/device/ibm_5161.c
index 762a379a1..456227676 100644
--- a/src/device/ibm_5161.c
+++ b/src/device/ibm_5161.c
@@ -116,7 +116,7 @@ const device_t ibm_5161_device = {
     .init          = ibm_5161_init,
     .close         = ibm_5161_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/device/isamem.c b/src/device/isamem.c
index 5b880d6eb..f89512779 100644
--- a/src/device/isamem.c
+++ b/src/device/isamem.c
@@ -27,14 +27,20 @@
  *          modern boards even have multiple 'copies' of those registers,
  *          which can be switched very fast, to allow for multitasking.
  *
- * TODO:    The EV159 is supposed to support 16b EMS transfers, but the
+ * TODO:    The EV-159 is supposed to support 16b EMS transfers, but the
  *          EMM.sys driver for it doesn't seem to want to do that..
  *
+ *          EV-125 (It supports backfill)
+ *              https://theretroweb.com/expansioncard/documentation/50250.pdf
  *
+ *          EV-158 (RAM 10000)
+ *              http://web.archive.org/web/19961104093221/http://www.everex.com/supp/techlib/memmem.html
  *
  * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
+ *          Jasmine Iwanek <jriwanek@gmail.com>
  *
- *          Copyright 2018 Fred N. van Kempen.
+ *          Copyright 2018      Fred N. van Kempen.
+ *          Copyright 2022-2025 Jasmine Iwanek.
  *
  *          Redistribution and  use  in source  and binary forms, with
  *          or  without modification, are permitted  provided that the
@@ -88,15 +94,20 @@
 #define ISAMEM_GENXT_CARD      1
 #define ISAMEM_RAMCARD_CARD    2
 #define ISAMEM_SYSTEMCARD_CARD 3
-#define ISAMEM_IBMAT_CARD      4
-#define ISAMEM_GENAT_CARD      5
-#define ISAMEM_P5PAK_CARD      6
-#define ISAMEM_A6PAK_CARD      7
-#define ISAMEM_EMS5150_CARD    8
+#define ISAMEM_IBMAT_128K_CARD 4
+#define ISAMEM_IBMAT_CARD      5
+#define ISAMEM_GENAT_CARD      6
+#define ISAMEM_P5PAK_CARD      7
+#define ISAMEM_A6PAK_CARD      8
+#define ISAMEM_EMS5150_CARD    9
 #define ISAMEM_EV159_CARD      10
 #define ISAMEM_RAMPAGEXT_CARD  11
 #define ISAMEM_ABOVEBOARD_CARD 12
-#define ISAMEM_BRAT_CARD       13
+#define ISAMEM_BRXT_CARD       13
+#define ISAMEM_BRAT_CARD       14
+#define ISAMEM_EV165A_CARD     15
+#define ISAMEM_LOTECH_EMS_CARD 16
+#define ISAMEM_MPLUS2_CARD     17
 
 #define ISAMEM_DEBUG           0
 
@@ -105,6 +116,8 @@
 #define RAM_EXTMEM             (1024 << 10) /* start of high memory */
 
 #define EMS_MAXSIZE            (2048 << 10) /* max EMS memory size */
+#define EMS_EV159_MAXSIZE      (3072 << 10) /* max EMS memory size for EV-159 cards */
+#define EMS_LOTECH_MAXSIZE     (4096 << 10) /* max EMS memory size for lotech cards */
 #define EMS_PGSIZE             (16 << 10)   /* one page is this big */
 #define EMS_MAXPAGE            4            /* number of viewport pages */
 
@@ -119,6 +132,11 @@ typedef struct emsreg_t {
     char          pad;
     uint8_t      *addr;    /* start addr in EMS RAM */
     mem_mapping_t mapping; /* mapping entry for page */
+    uint8_t      *ram;
+    uint8_t      *frame_val;
+    uint16_t     *ems_size;
+    uint16_t     *ems_pages;
+    uint32_t     *frame_addr;
 } emsreg_t;
 
 typedef struct ext_ram_t {
@@ -131,20 +149,23 @@ typedef struct memdev_t {
     uint8_t     board    : 6; /* board type */
     uint8_t     reserved : 2;
 
-    uint8_t flags;
+    uint8_t  flags;
 #define FLAG_CONFIG 0x01 /* card is configured */
 #define FLAG_WIDE   0x10 /* card uses 16b mode */
 #define FLAG_FAST   0x20 /* fast (<= 120ns) chips */
 #define FLAG_EMS    0x40 /* card has EMS mode enabled */
 
-    uint16_t total_size; /* configured size in KB */
-    uint32_t base_addr;  /* configured I/O address */
-    uint32_t start_addr; /* configured memory start */
-    uint32_t frame_addr; /* configured frame address */
+    uint8_t  frame_val[2];
 
-    uint16_t ems_size;  /* EMS size in KB */
-    uint16_t ems_pages; /* EMS size in pages */
-    uint32_t ems_start; /* start of EMS in RAM */
+    uint16_t total_size;    /* configured size in KB */
+    uint16_t base_addr[2];  /* configured I/O address */
+
+    uint32_t start_addr;    /* configured memory start */
+    uint32_t frame_addr[2]; /* configured frame address */
+
+    uint16_t ems_size[2];   /* EMS size in KB */
+    uint16_t ems_pages[2];  /* EMS size in pages */
+    uint32_t ems_start[2];  /* start of EMS in RAM */
 
     uint8_t *ram; /* allocated RAM buffer */
 
@@ -153,7 +174,7 @@ typedef struct memdev_t {
     mem_mapping_t low_mapping;  /* mapping for low mem */
     mem_mapping_t high_mapping; /* mapping for high mem */
 
-    emsreg_t ems[EMS_MAXPAGE]; /* EMS controller registers */
+    emsreg_t ems[EMS_MAXPAGE * 2]; /* EMS controller registers */
 } memdev_t;
 
 #ifdef ENABLE_ISAMEM_LOG
@@ -226,14 +247,14 @@ ram_writew(uint32_t addr, uint16_t val, void *priv)
 static uint8_t
 ems_readb(uint32_t addr, void *priv)
 {
-    memdev_t *dev = (memdev_t *) priv;
+    emsreg_t *dev = (emsreg_t *) priv;
     uint8_t   ret = 0xff;
 
     /* Grab the data. */
-    ret = *(uint8_t *) (dev->ems[(addr & 0xffff) >> 14].addr + (addr & 0x3fff));
+    ret = *(uint8_t *) (dev->addr + (addr & 0x3fff));
 #if ISAMEM_DEBUG
     if ((addr % 4096) == 0)
-        isamem_log("EMS readb(%06x) = %02x\n", addr - dev & 0x3fff, ret);
+        isamem_log("EMS readb(%06x) = %02x\n", addr & 0x3fff, ret);
 #endif
 
     return ret;
@@ -243,14 +264,14 @@ ems_readb(uint32_t addr, void *priv)
 static uint16_t
 ems_readw(uint32_t addr, void *priv)
 {
-    memdev_t *dev = (memdev_t *) priv;
+    emsreg_t *dev = (emsreg_t *) priv;
     uint16_t  ret = 0xffff;
 
     /* Grab the data. */
-    ret = *(uint16_t *) (dev->ems[(addr & 0xffff) >> 14].addr + (addr & 0x3fff));
+    ret = *(uint16_t *) (dev->addr + (addr & 0x3fff));
 #if ISAMEM_DEBUG
     if ((addr % 4096) == 0)
-        isamem_log("EMS readw(%06x) = %04x\n", addr - dev & 0x3fff, ret);
+        isamem_log("EMS readw(%06x) = %04x\n", addr & 0x3fff, ret);
 #endif
 
     return ret;
@@ -260,46 +281,47 @@ ems_readw(uint32_t addr, void *priv)
 static void
 ems_writeb(uint32_t addr, uint8_t val, void *priv)
 {
-    memdev_t *dev = (memdev_t *) priv;
+    emsreg_t *dev = (emsreg_t *) priv;
 
     /* Write the data. */
 #if ISAMEM_DEBUG
     if ((addr % 4096) == 0)
-        isamem_log("EMS writeb(%06x, %02x)\n", addr - dev & 0x3fff, val);
+        isamem_log("EMS writeb(%06x, %02x)\n", addr & 0x3fff, val);
 #endif
-    *(uint8_t *) (dev->ems[(addr & 0xffff) >> 14].addr + (addr & 0x3fff)) = val;
+    *(uint8_t *) (dev->addr + (addr & 0x3fff)) = val;
 }
 
 /* Write one word to onboard paged RAM. */
 static void
 ems_writew(uint32_t addr, uint16_t val, void *priv)
 {
-    memdev_t *dev = (memdev_t *) priv;
+    emsreg_t *dev = (emsreg_t *) priv;
 
     /* Write the data. */
 #if ISAMEM_DEBUG
     if ((addr % 4096) == 0)
         isamem_log("EMS writew(%06x, %04x)\n", addr & 0x3fff, val);
 #endif
-    *(uint16_t *) (dev->ems[(addr & 0xffff) >> 14].addr + (addr & 0x3fff)) = val;
+    *(uint16_t *) (dev->addr + (addr & 0x3fff)) = val;
 }
 
 /* Handle a READ operation from one of our registers. */
 static uint8_t
-ems_read(uint16_t port, void *priv)
+ems_in(uint16_t port, void *priv)
 {
-    const memdev_t *dev = (memdev_t *) priv;
-    uint8_t         ret = 0xff;
-    int             vpage;
-
+    const emsreg_t *dev   = (emsreg_t *) priv;
+    uint8_t         ret   = 0xff;
     /* Get the viewport page number. */
-    vpage = (port / EMS_PGSIZE);
+#ifdef ENABLE_ISAMEM_LOG
+    int             vpage = (port / EMS_PGSIZE);
+#endif
+
     port &= (EMS_PGSIZE - 1);
 
-    switch (port - dev->base_addr) {
+    switch (port & 0x0001) {
         case 0x0000: /* page number register */
-            ret = dev->ems[vpage].page;
-            if (dev->ems[vpage].enabled)
+            ret = dev->page;
+            if (dev->enabled)
                 ret |= 0x80;
             break;
 
@@ -310,88 +332,140 @@ ems_read(uint16_t port, void *priv)
             break;
     }
 
-#if ISAMEM_DEBUG
-    isamem_log("ISAMEM: read(%04x) = %02x)\n", port, ret);
-#endif
+    isamem_log("ISAMEM: read(%04x) = %02x) page=%d\n", port, ret, vpage);
+
+    return ret;
+}
+
+/* Handle a READ operation from one of our registers. */
+static uint8_t
+consecutive_ems_in(uint16_t port, void *priv)
+{
+    const memdev_t *dev   = (memdev_t *) priv;
+    uint8_t         ret   = 0xff;
+    /* Get the viewport page number. */
+    int             vpage = (port - dev->base_addr[0]);
+
+    ret = dev->ems[vpage].page;
+    if (dev->ems[vpage].enabled)
+        ret |= 0x80;
+
+    isamem_log("ISAMEM: read(%04x) = %02x) page=%d\n", port, ret, vpage);
 
     return ret;
 }
 
 /* Handle a WRITE operation to one of our registers. */
 static void
-ems_write(uint16_t port, uint8_t val, void *priv)
+ems_out(uint16_t port, uint8_t val, void *priv)
 {
-    memdev_t *dev = (memdev_t *) priv;
-    int       vpage;
-
+    emsreg_t *dev   = (emsreg_t *) priv;
     /* Get the viewport page number. */
-    vpage = (port / EMS_PGSIZE);
+    int       vpage = (port / EMS_PGSIZE);
+
     port &= (EMS_PGSIZE - 1);
 
-#if ISAMEM_DEBUG
-    isamem_log("ISAMEM: write(%04x, %02x) page=%d\n", port, val, vpage);
-#endif
-
-    switch (port - dev->base_addr) {
+    switch (port & 0x0001) {
         case 0x0000: /* page mapping registers */
             /* Set the page number. */
-            dev->ems[vpage].enabled = (val & 0x80);
-            dev->ems[vpage].page    = (val & 0x7f);
+            dev->enabled = (val & 0x80);
+            dev->page    = (val & 0x7f);
 
-            /* Make sure we can do that.. */
-            if (dev->flags & FLAG_CONFIG) {
-                if (dev->ems[vpage].page < dev->ems_pages) {
-                    /* Pre-calculate the page address in EMS RAM. */
-                    dev->ems[vpage].addr = dev->ram + dev->ems_start + ((val & 0x7f) * EMS_PGSIZE);
-                } else {
-                    /* That page does not exist. */
-                    dev->ems[vpage].enabled = 0;
-                }
+            if (dev->enabled && (dev->page < *dev->ems_pages)) {
+                /* Pre-calculate the page address in EMS RAM. */
+                dev->addr = dev->ram + ((val & 0x7f) * EMS_PGSIZE);
 
-                if (dev->ems[vpage].enabled) {
-                    /* Update the EMS RAM address for this page. */
-                    mem_mapping_set_exec(&dev->ems[vpage].mapping,
-                                         dev->ems[vpage].addr);
+                isamem_log("ISAMEM: map port %04X, page %i, starting at %08X: %08X -> %08X\n", port,
+                           vpage, *dev->frame_addr,
+                           *dev->frame_addr + (EMS_PGSIZE * (vpage & 3)), dev->addr - dev->ram);
+                mem_mapping_set_addr(&dev->mapping, *dev->frame_addr + (EMS_PGSIZE * vpage), EMS_PGSIZE);
 
-                    /* Enable this page. */
-                    mem_mapping_enable(&dev->ems[vpage].mapping);
-                } else {
-                    /* Disable this page. */
-                    mem_mapping_disable(&dev->ems[vpage].mapping);
-                }
+                /* Update the EMS RAM address for this page. */
+                mem_mapping_set_exec(&dev->mapping, dev->addr);
+
+                /* Enable this page. */
+                mem_mapping_enable(&dev->mapping);
+            } else {
+                isamem_log("ISAMEM: map port %04X, page %i, starting at %08X: %08X -> N/A\n",
+                           port, vpage, *dev->frame_addr, *dev->frame_addr + (EMS_PGSIZE * vpage));
+
+                /* Disable this page. */
+                mem_mapping_disable(&dev->mapping);
             }
             break;
 
         case 0x0001: /* page frame registers */
-                     /*
-                      * The EV-159 EMM driver configures the frame address
-                      * by setting bits in these registers. The information
-                      * in their manual is unclear, but here is what was
-                      * found out by repeatedly changing EMM's config:
-                      *
-                      * 00 04 08  Address
-                      * -----------------
-                      * 80 c0 e0  C0000
-                      * 80 c0 e0  C4000
-                      * 80 c0 e0  C8000
-                      * 80 c0 e0  CC000
-                      * 80 c0 e0  D0000
-                      * 80 c0 e0  D4000
-                      * 80 c0 e0  D8000
-                      * 80 c0 e0  DC000
-                      * 80 c0 e0  E0000
-                      */
-            isamem_log("EMS: write(%02x) to register 1 !\n");
-            dev->ems[vpage].frame = val;
-            if (val)
-                dev->flags |= FLAG_CONFIG;
+            /*
+             * The EV-159 EMM driver configures the frame address
+             * by setting bits in these registers. The information
+             * in their manual is unclear, but here is what was
+             * found out by repeatedly changing EMM's config:
+             *
+             * 08 04 00  Address
+             * -----------------
+             * 00 00 00  C4000
+             * 00 00 80  C8000
+             * 00 80 00  CC000
+             * 00 80 80  D0000
+             * 80 00 00  D4000
+             * 80 00 80  D8000
+             * 80 80 00  DC000
+             * 80 80 80  E0000
+             */
+            dev->frame = val;
+            *dev->frame_val = (*dev->frame_val & ~(1 << vpage)) | ((val >> 7) << vpage);
+            *dev->frame_addr = 0x000c4000 + (*dev->frame_val << 14);
+            isamem_log("ISAMEM: map port %04X page %i: frame_addr = %08X\n", port, vpage, *dev->frame_addr);
+            /* Destroy the page registers. */
+            for (uint8_t i = 0; i < 4; i ++) {
+                isamem_log("    ");
+                outb((port & 0x3ffe) + (i << 14), 0x00);
+            }
             break;
-        
+
         default:
             break;
     }
 }
 
+/* Handle a WRITE operation to one of our registers. */
+static void
+consecutive_ems_out(uint16_t port, uint8_t val, void *priv)
+{
+    memdev_t *dev   = (memdev_t *) priv;
+    /* Get the viewport page number. */
+    int       vpage = (port - dev->base_addr[0]);
+
+    isamem_log("ISAMEM: write(%04x, %02x) to page mapping registers! (page=%d)\n", port, val, vpage);
+
+    /* Set the page number. */
+    dev->ems[vpage].enabled = 1;
+    dev->ems[vpage].page    = val;
+
+    /* Make sure we can do that.. */
+    if (dev->flags & FLAG_CONFIG) {
+        if (dev->ems[vpage].page < dev->ems_pages[0]) {
+            /* Pre-calculate the page address in EMS RAM. */
+            dev->ems[vpage].addr = dev->ram + dev->ems_start[0] + (val * EMS_PGSIZE);
+        } else {
+            /* That page does not exist. */
+            dev->ems[vpage].enabled = 0;
+        }
+
+        if (dev->ems[vpage].enabled) {
+            /* Update the EMS RAM address for this page. */
+            mem_mapping_set_exec(&dev->ems[vpage].mapping,
+                                 dev->ems[vpage].addr);
+
+            /* Enable this page. */
+            mem_mapping_enable(&dev->ems[vpage].mapping);
+        } else {
+            /* Disable this page. */
+            mem_mapping_disable(&dev->ems[vpage].mapping);
+        }
+    }
+}
+
 /* Initialize the device for use. */
 static void *
 isamem_init(const device_t *info)
@@ -401,14 +475,18 @@ isamem_init(const device_t *info)
     uint32_t  t;
     uint32_t  addr;
     uint32_t  tot;
+    /* EMS 3.2 cannot have more than 2048KB per board. */
+    uint32_t  ems_max = EMS_MAXSIZE;
     uint8_t  *ptr;
 
     /* Find our device and create an instance. */
-    dev = (memdev_t *) malloc(sizeof(memdev_t));
-    memset(dev, 0x00, sizeof(memdev_t));
+    dev = (memdev_t *) calloc(1, sizeof(memdev_t));
     dev->name  = info->name;
     dev->board = info->local;
 
+    dev->base_addr[1]  = 0x0000;
+    dev->frame_addr[1] = 0x00000000;
+
     /* Do per-board initialization. */
     tot = 0;
     switch (dev->board) {
@@ -418,11 +496,19 @@ isamem_init(const device_t *info)
         case ISAMEM_SYSTEMCARD_CARD: /* Microsoft SystemCard */
         case ISAMEM_P5PAK_CARD:      /* Paradise Systems 5-PAK */
         case ISAMEM_A6PAK_CARD:      /* AST SixPakPlus */
+        case ISAMEM_MPLUS2_CARD:     /* AST MegaPlus II */
             dev->total_size = device_get_config_int("size");
             dev->start_addr = device_get_config_int("start");
             tot             = dev->total_size;
             break;
 
+        case ISAMEM_IBMAT_128K_CARD: /* IBM PC/AT 128K Memory Expansion Option */
+            dev->total_size = 128;
+            dev->start_addr = 512;
+            tot             = dev->total_size;
+            dev->flags |= FLAG_WIDE;
+            break;
+
         case ISAMEM_IBMAT_CARD: /* IBM PC/AT Memory Expansion Card */
         case ISAMEM_GENAT_CARD: /* Generic PC/AT Memory Expansion Card */
             dev->total_size = device_get_config_int("size");
@@ -432,37 +518,74 @@ isamem_init(const device_t *info)
             break;
 
         case ISAMEM_EMS5150_CARD: /* Micro Mainframe EMS-5150(T) */
-            dev->base_addr  = device_get_config_hex16("base");
-            dev->total_size = device_get_config_int("size");
-            dev->frame_addr = 0xD0000;
-            dev->flags |= (FLAG_EMS | FLAG_CONFIG);
+            dev->base_addr[0]  = device_get_config_hex16("base");
+            dev->total_size    = device_get_config_int("size");
+            dev->start_addr    = 0;
+            dev->frame_addr[0] = 0xd0000;
+            dev->flags        |= (FLAG_EMS | FLAG_CONFIG);
             break;
 
         case ISAMEM_EV159_CARD: /* Everex EV-159 RAM 3000 */
-            dev->base_addr  = device_get_config_hex16("base");
-            dev->total_size = device_get_config_int("size");
-            dev->start_addr = device_get_config_int("start");
-            tot             = device_get_config_int("length");
+            /* The EV-159 cannot have more than 3072KB per board. */
+            ems_max = EMS_EV159_MAXSIZE;
+            dev->base_addr[0]  = device_get_config_hex16("base");
+            dev->base_addr[1]  = device_get_config_hex16("base2");
+            dev->total_size    = device_get_config_int("size");
+            dev->start_addr    = device_get_config_int("start");
+            tot                = device_get_config_int("length");
             if (!!device_get_config_int("width"))
-                dev->flags |= FLAG_WIDE;
+                dev->flags    |= FLAG_WIDE;
             if (!!device_get_config_int("speed"))
-                dev->flags |= FLAG_FAST;
+                dev->flags    |= FLAG_FAST;
             if (!!device_get_config_int("ems"))
-                dev->flags |= FLAG_EMS;
-            dev->frame_addr = 0xE0000;
+                dev->flags    |= FLAG_EMS;
+            dev->frame_addr[0] = 0xd0000;
+            dev->frame_addr[1] = 0xe0000;
+            break;
+
+        case ISAMEM_EV165A_CARD: /* Everex Maxi Magic EV-165A */
+            dev->base_addr[0]  = device_get_config_hex16("base");
+            dev->total_size    = device_get_config_int("size");
+            dev->start_addr    = device_get_config_int("start");
+            tot                = device_get_config_int("length");
+            if (!!device_get_config_int("ems"))
+                dev->flags    |= FLAG_EMS;
+            dev->frame_addr[0] = 0xe0000;
             break;
 
         case ISAMEM_RAMPAGEXT_CARD:  /* AST RAMpage/XT */
+            dev->base_addr[0]  = device_get_config_hex16("base");
+            dev->total_size    = device_get_config_int("size");
+            dev->start_addr    = device_get_config_int("start");
+            tot                = dev->total_size;
+            dev->flags        |= FLAG_EMS;
+            dev->frame_addr[0] = 0xe0000;
+            break;
+
         case ISAMEM_ABOVEBOARD_CARD: /* Intel AboveBoard */
         case ISAMEM_BRAT_CARD:       /* BocaRAM/AT */
-            dev->base_addr  = device_get_config_hex16("base");
-            dev->total_size = device_get_config_int("size");
-            dev->start_addr = device_get_config_int("start");
-            dev->frame_addr = device_get_config_hex20("frame");
+            dev->base_addr[0]   = device_get_config_hex16("base");
+            dev->total_size     = device_get_config_int("size");
+            if (!!device_get_config_int("start"))
+                dev->start_addr = device_get_config_int("start");
+            dev->frame_addr[0]  = device_get_config_hex20("frame");
+            dev->flags         |= FLAG_EMS;
             if (!!device_get_config_int("width"))
-                dev->flags |= FLAG_WIDE;
+                dev->flags     |= FLAG_WIDE;
             if (!!device_get_config_int("speed"))
-                dev->flags |= FLAG_FAST;
+                dev->flags     |= FLAG_FAST;
+            break;
+
+        case ISAMEM_LOTECH_EMS_CARD: /* Lotech EMS */
+            /* The Lotech EMS cannot have more than 4096KB per board. */
+            ems_max = EMS_LOTECH_MAXSIZE;
+            fallthrough;
+        case ISAMEM_BRXT_CARD:   /* BocaRAM/XT */
+            dev->base_addr[0]   = device_get_config_hex16("base");
+            dev->total_size     = device_get_config_int("size");
+            dev->start_addr     = 0;
+            dev->frame_addr[0]  = device_get_config_hex20("frame");
+            dev->flags         |= (FLAG_EMS | FLAG_CONFIG);
             break;
 
         default:
@@ -614,31 +737,54 @@ isamem_init(const device_t *info)
 
     /* If EMS is enabled, use the remainder for EMS. */
     if (dev->flags & FLAG_EMS) {
-        /* EMS 3.2 cannot have more than 2048KB per board. */
         t = k;
-        if (t > EMS_MAXSIZE)
-            t = EMS_MAXSIZE;
+
+        if (t > ems_max)
+            t = ems_max;
 
         /* Set up where EMS begins in local RAM, and how much we have. */
-        dev->ems_start = ptr - dev->ram;
-        dev->ems_size  = t >> 10;
-        dev->ems_pages = t / EMS_PGSIZE;
-        isamem_log("ISAMEM: EMS enabled, I/O=%04XH, %iKB (%i pages)",
-                   dev->base_addr, dev->ems_size, dev->ems_pages);
-        if (dev->frame_addr > 0)
-            isamem_log(", Frame=%05XH", dev->frame_addr);
+        dev->ems_start[0]     = ptr - dev->ram;
+        if ((dev->board == ISAMEM_EV159_CARD) && (t > (2 << 20))) {
+            dev->ems_size[0]  = 2 << 10;
+            dev->ems_pages[0] = (2 << 20) / EMS_PGSIZE;
+        } else {
+            dev->ems_size[0]  = t >> 10;
+            dev->ems_pages[0] = t / EMS_PGSIZE;
+        }
+        isamem_log("ISAMEM: EMS #1 enabled, I/O=%04XH, %iKB (%i pages)",
+                   dev->base_addr[0], dev->ems_size[0], dev->ems_pages[0]);
+        if (dev->frame_addr[0] > 0)
+            isamem_log(", Frame[0]=%05XH", dev->frame_addr[0]);
 
         isamem_log("\n");
 
+        if ((dev->board == ISAMEM_EV159_CARD) && (t > (2 << 20))) {
+            dev->ems_start[1] = dev->ems_start[0] + (2 << 20);
+            dev->ems_size[1]  = (t - (2 << 20)) >> 10;
+            dev->ems_pages[1] = (t - (2 << 20)) / EMS_PGSIZE;
+            isamem_log("ISAMEM: EMS #2 enabled, I/O=%04XH, %iKB (%i pages)",
+                       dev->base_addr[1], dev->ems_size[1], dev->ems_pages[1]);
+            if (dev->frame_addr[1] > 0)
+                isamem_log(", Frame[1]=%05XH", dev->frame_addr[1]);
+
+            isamem_log("\n");
+        }
+
         /*
          * For each supported page (we can have a maximum of 4),
          * create, initialize and disable the mappings, and set
          * up the I/O control handler.
          */
         for (uint8_t i = 0; i < EMS_MAXPAGE; i++) {
+            dev->ems[i].ram        = dev->ram + dev->ems_start[0];
+            dev->ems[i].frame_val  = &dev->frame_val[0];
+            dev->ems[i].ems_size   = &dev->ems_size[0];
+            dev->ems[i].ems_pages  = &dev->ems_pages[0];
+            dev->ems[i].frame_addr = &dev->frame_addr[0];
+
             /* Create and initialize a page mapping. */
             mem_mapping_add(&dev->ems[i].mapping,
-                            dev->frame_addr + (EMS_PGSIZE * i), EMS_PGSIZE,
+                            dev->frame_addr[0] + (EMS_PGSIZE * i), EMS_PGSIZE,
                             ems_readb,
                             (dev->flags & FLAG_WIDE) ? ems_readw : NULL,
                             NULL,
@@ -646,15 +792,46 @@ isamem_init(const device_t *info)
                             (dev->flags & FLAG_WIDE) ? ems_writew : NULL,
                             NULL,
                             ptr, MEM_MAPPING_EXTERNAL,
-                            dev);
+                            &(dev->ems[i]));
 
             /* For now, disable it. */
             mem_mapping_disable(&dev->ems[i].mapping);
 
             /* Set up an I/O port handler. */
-            io_sethandler(dev->base_addr + (EMS_PGSIZE * i), 2,
-                          ems_read, NULL, NULL, ems_write, NULL, NULL, dev);
+            if (dev->board != ISAMEM_LOTECH_EMS_CARD)
+                io_sethandler(dev->base_addr[0] + (EMS_PGSIZE * i), 2,
+                              ems_in, NULL, NULL, ems_out, NULL, NULL, &(dev->ems[i]));
+
+            if ((dev->board == ISAMEM_EV159_CARD) && (t > (2 << 20))) {
+                dev->ems[i | 4].ram        = dev->ram + dev->ems_start[1];
+                dev->ems[i | 4].frame_val  = &dev->frame_val[1];
+                dev->ems[i | 4].ems_size   = &dev->ems_size[1];
+                dev->ems[i | 4].ems_pages  = &dev->ems_pages[1];
+                dev->ems[i | 4].frame_addr = &dev->frame_addr[1];
+
+                /* Create and initialize a page mapping. */
+                mem_mapping_add(&dev->ems[i | 4].mapping,
+                                dev->frame_addr[1] + (EMS_PGSIZE * i), EMS_PGSIZE,
+                                ems_readb,
+                                (dev->flags & FLAG_WIDE) ? ems_readw : NULL,
+                                NULL,
+                                ems_writeb,
+                                (dev->flags & FLAG_WIDE) ? ems_writew : NULL,
+                                NULL,
+                                ptr + (2 << 20), MEM_MAPPING_EXTERNAL,
+                                &(dev->ems[i | 4]));
+
+                /* For now, disable it. */
+                mem_mapping_disable(&dev->ems[i | 4].mapping);
+
+                io_sethandler(dev->base_addr[1] + (EMS_PGSIZE * i), 2,
+                              ems_in, NULL, NULL, ems_out, NULL, NULL, &(dev->ems[i | 4]));
+            }
         }
+
+        if (dev->board == ISAMEM_LOTECH_EMS_CARD)
+            io_sethandler(dev->base_addr[0], 4,
+                          consecutive_ems_in, NULL, NULL, consecutive_ems_out, NULL, NULL, dev);
     }
 
     /* Let them know our device instance. */
@@ -667,62 +844,157 @@ isamem_close(void *priv)
 {
     memdev_t *dev = (memdev_t *) priv;
 
-    if (dev->flags & FLAG_EMS) {
-        for (uint8_t i = 0; i < EMS_MAXPAGE; i++) {
-            io_removehandler(dev->base_addr + (EMS_PGSIZE * i), 2,
-                             ems_read, NULL, NULL, ems_write, NULL, NULL, dev);
-        }
-    }
-
     if (dev->ram != NULL)
         free(dev->ram);
 
     free(dev);
 }
 
+static const device_config_t ibmxt_32k_config[] = {
+  // clang-format off
+    {
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 32,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =  32,
+            .max  = 576,
+            .step =  32
+        },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "start",
+        .description    = "Start Address",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 64,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =   0,
+            .max  = 608,
+            .step =  32
+        },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
+static const device_t ibmxt_32k_device = {
+    .name          = "IBM PC/XT 32K Memory Expansion Option",
+    .internal_name = "ibmxt_32k",
+    .flags         = DEVICE_ISA,
+    .local         = ISAMEM_IBMXT_CARD,
+    .init          = isamem_init,
+    .close         = isamem_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ibmxt_32k_config
+};
+
+static const device_config_t ibmxt_64k_config[] = {
+  // clang-format off
+    {
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 64,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =  64,
+            .max  = 576,
+            .step =  64
+        },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "start",
+        .description    = "Start Address",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 64,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =   0,
+            .max  = 576,
+            .step =  64
+        },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
+static const device_t ibmxt_64k_device = {
+    .name          = "IBM PC/XT 64K Memory Expansion Option",
+    .internal_name = "ibmxt_64k",
+    .flags         = DEVICE_ISA,
+    .local         = ISAMEM_IBMXT_CARD,
+    .init          = isamem_init,
+    .close         = isamem_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ibmxt_64k_config
+};
+
 static const device_config_t ibmxt_config[] = {
   // clang-format off
     {
-        .name = "size",
-        .description = "Memory Size",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 128,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 512,
-            .step = 16
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 128,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =  64,
+            .max  = 576,
+            .step =  64
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "start",
-        .description = "Start Address",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 256,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 576,
-            .step = 64
+        .name           = "start",
+        .description    = "Start Address",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 256,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =   0,
+            .max  = 576,
+            .step =  64
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
 static const device_t ibmxt_device = {
-    .name          = "IBM PC/XT Memory Expansion",
+    .name          = "IBM PC/XT 64/256K Memory Expansion Option",
     .internal_name = "ibmxt",
     .flags         = DEVICE_ISA,
     .local         = ISAMEM_IBMXT_CARD,
     .init          = isamem_init,
     .close         = isamem_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = ibmxt_config
@@ -731,37 +1003,40 @@ static const device_t ibmxt_device = {
 static const device_config_t genericxt_config[] = {
   // clang-format off
     {
-        .name = "size",
-        .description = "Memory Size",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 16,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 640,
-            .step = 16
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 16,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =   0,
+            .max  = 640,
+            .step =  16
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "start",
-        .description = "Start Address",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 624,
-            .step = 16
+        .name           = "start",
+        .description    = "Start Address",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =   0,
+            .max  = 640,
+            .step =  16
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
+// This also nicely accounts for the Everex EV-138
 static const device_t genericxt_device = {
     .name          = "Generic PC/XT Memory Expansion",
     .internal_name = "genericxt",
@@ -770,7 +1045,7 @@ static const device_t genericxt_device = {
     .init          = isamem_init,
     .close         = isamem_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = genericxt_config
@@ -779,46 +1054,48 @@ static const device_t genericxt_device = {
 static const device_config_t msramcard_config[] = {
   // clang-format off
     {
-        .name = "size",
-        .description = "Memory Size",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 64,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 256,
-            .step = 64
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 64,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =   0,
+            .max  = 256,
+            .step =  64
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "start",
-        .description = "Start Address",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 624,
-            .step = 64
+        .name           = "start",
+        .description    = "Start Address",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =   0,
+            .max  = 624,
+            .step =  64
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
 static const device_t msramcard_device = {
-    .name          = "Microsoft RAMCard for IBM PC",
+    .name          = "Microsoft RAMCard",
     .internal_name = "msramcard",
     .flags         = DEVICE_ISA,
     .local         = ISAMEM_RAMCARD_CARD,
     .init          = isamem_init,
     .close         = isamem_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = msramcard_config
@@ -827,32 +1104,34 @@ static const device_t msramcard_device = {
 static const device_config_t mssystemcard_config[] = {
   // clang-format off
     {
-        .name = "size",
-        .description = "Memory Size",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 64,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 256,
-            .step = 64
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 64,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =   0,
+            .max  = 256,
+            .step =  64
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "start",
-        .description = "Start Address",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 624,
-            .step = 64
+        .name           = "start",
+        .description    = "Start Address",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =   0,
+            .max  = 624,
+            .step =  64
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -866,41 +1145,57 @@ static const device_t mssystemcard_device = {
     .init          = isamem_init,
     .close         = isamem_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = mssystemcard_config
 };
 
+static const device_t ibmat_128k_device = {
+    .name          = "IBM PC/AT 128KB Memory Expansion Option",
+    .internal_name = "ibmat_128k",
+    .flags         = DEVICE_ISA,
+    .local         = ISAMEM_IBMAT_128K_CARD,
+    .init          = isamem_init,
+    .close         = isamem_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
 static const device_config_t ibmat_config[] = {
   // clang-format off
     {
-        .name = "size",
-        .description = "Memory Size",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 512,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 12288,
-            .step = 512
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =     0,
+            .max  = 12288,
+            .step =   512
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "start",
-        .description = "Start Address",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 512,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 15872,
-            .step = 512
+        .name           = "start",
+        .description    = "Start Address",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 1024,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =     0,
+            .max  = 15872,
+            .step =   512
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -914,7 +1209,7 @@ static const device_t ibmat_device = {
     .init          = isamem_init,
     .close         = isamem_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = ibmat_config
@@ -923,37 +1218,40 @@ static const device_t ibmat_device = {
 static const device_config_t genericat_config[] = {
   // clang-format off
     {
-        .name = "size",
-        .description = "Memory Size",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 512,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 16384,
-            .step = 512
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =     0,
+            .max  = 16384,
+            .step =   128
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "start",
-        .description = "Start Address",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 512,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 15872,
-            .step = 128
+        .name           = "start",
+        .description    = "Start Address",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 1024,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =     0,
+            .max  = 15872,
+            .step =   128
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
+// This also nicely accounts for the Everex EV-135
 static const device_t genericat_device = {
     .name          = "Generic PC/AT Memory Expansion",
     .internal_name = "genericat",
@@ -962,7 +1260,7 @@ static const device_t genericat_device = {
     .init          = isamem_init,
     .close         = isamem_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = genericat_config
@@ -971,32 +1269,34 @@ static const device_t genericat_device = {
 static const device_config_t p5pak_config[] = {
   // clang-format off
     {
-        .name = "size",
-        .description = "Memory Size",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 128,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 384,
-            .step = 64
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 128,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =   0,
+            .max  = 384,
+            .step =  64
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "start",
-        .description = "Start Address",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 512,
-        .file_filter = "",
-        .spinner = {
-            .min = 64,
-            .max = 576,
-            .step = 64
+        .name           = "start",
+        .description    = "Start Address",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =  64,
+            .max  = 576,
+            .step =  64
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -1010,7 +1310,7 @@ static const device_t p5pak_device = {
     .init          = isamem_init,
     .close         = isamem_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = p5pak_config
@@ -1019,32 +1319,34 @@ static const device_t p5pak_device = {
 static const device_config_t a6pak_config[] = {
   // clang-format off
     {
-        .name = "size",
-        .description = "Memory Size",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 64,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 576,
-            .step = 64
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 64,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =   0,
+            .max  = 384,
+            .step =  64
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "start",
-        .description = "Start Address",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 256,
-        .file_filter = "",
-        .spinner = {
-            .min = 64,
-            .max = 512,
-            .step = 64
+        .name           = "start",
+        .description    = "Start Address",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 256,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =  64,
+            .max  = 512,
+            .step =  64
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -1058,7 +1360,7 @@ static const device_t a6pak_device = {
     .init          = isamem_init,
     .close         = isamem_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = a6pak_config
@@ -1067,35 +1369,37 @@ static const device_t a6pak_device = {
 static const device_config_t ems5150_config[] = {
   // clang-format off
     {
-        .name = "size",
-        .description = "Memory Size",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 256,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 2048,
-            .step = 64
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 256,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =    0,
+            .max  = 2048,
+            .step =   64
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Disabled", .value = 0x0000 },
-            { .description = "Board 1",  .value = 0x0208 },
-            { .description = "Board 2",  .value = 0x020a },
-            { .description = "Board 3",  .value = 0x020c },
-            { .description = "Board 4",  .value = 0x020e },
+            { .description = "208H",     .value = 0x0208 },
+            { .description = "20AH",     .value = 0x020a },
+            { .description = "20CH",     .value = 0x020c },
+            { .description = "20EH",     .value = 0x020e },
             { .description = ""                          }
         },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -1109,7 +1413,7 @@ static const device_t ems5150_device = {
     .init          = isamem_init,
     .close         = isamem_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = ems5150_config
@@ -1118,98 +1422,104 @@ static const device_t ems5150_device = {
 static const device_config_t ev159_config[] = {
   // clang-format off
     {
-        .name = "size",
-        .description = "Memory Size",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 512,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 3072,
-            .step = 512
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =    0,
+            .max  = 3072,
+            .step =  512
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "start",
-        .description = "Start Address",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 16128,
-            .step = 128
+        .name           = "start",
+        .description    = "Start Address",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =     0,
+            .max  = 16128,
+            .step =   128
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "length",
-        .description = "Contiguous Size",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 16384,
-            .step = 128
+        .name           = "length",
+        .description    = "Contiguous Size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =     0,
+            .max  = 16384,
+            .step =   128
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "width",
-        .description = "I/O Width",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "width",
+        .description    = "I/O Width",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "8-bit",  .value = 0 },
             { .description = "16-bit", .value = 1 },
             { .description = ""                   }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "speed",
-        .description = "Transfer Speed",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "speed",
+        .description    = "Transfer Speed",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Standard (150ns)",   .value = 0 },
             { .description = "High-Speed (120ns)", .value = 1 },
             { .description = ""                               }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "ems",
-        .description = "EMS mode",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "ems",
+        .description    = "EMS mode",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Disabled", .value = 0 },
             { .description = "Enabled",  .value = 1 },
             { .description = ""                     }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x0258,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0258,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "208H", .value = 0x0208 },
             { .description = "218H", .value = 0x0218 },
             { .description = "258H", .value = 0x0258 },
@@ -1219,6 +1529,27 @@ static const device_config_t ev159_config[] = {
             { .description = "2E8H", .value = 0x02E8 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "base2",
+        .description    = "Address for > 2 MB",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0268,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "208H", .value = 0x0208 },
+            { .description = "218H", .value = 0x0218 },
+            { .description = "258H", .value = 0x0258 },
+            { .description = "268H", .value = 0x0268 },
+            { .description = "2A8H", .value = 0x02A8 },
+            { .description = "2B8H", .value = 0x02B8 },
+            { .description = "2E8H", .value = 0x02E8 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -1232,87 +1563,273 @@ static const device_t ev159_device = {
     .init          = isamem_init,
     .close         = isamem_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = ev159_config
 };
 
-#if defined(DEV_BRANCH) && defined(USE_ISAMEM_BRAT)
-static const device_config_t brat_config[] = {
+static const device_config_t ev165a_config[] = {
   // clang-format off
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x0258,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 256,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =    0,
+            .max  = 2048,
+            .step =  256
+        },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "start",
+        .description    = "Start Address",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 64,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =  64,
+            .max  = 640,
+            .step =  64
+        },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name = "length",
+        .description = "Contiguous Size",
+        .type = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =    0,
+            .max  = 2048,
+            .step =  256
+        },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "ems",
+        .description    = "EMS mode",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled", .value = 0 },
+            { .description = "Enabled",  .value = 1 },
+            { .description = ""                     }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0258,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "208H", .value = 0x0208 },
+            { .description = "218H", .value = 0x0218 },
+            { .description = "258H", .value = 0x0258 },
+            { .description = "268H", .value = 0x0268 },
+            { .description = "2A8H", .value = 0x02A8 },
+            { .description = "2B8H", .value = 0x02B8 },
+            { .description = "2E8H", .value = 0x02E8 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
+static const device_t ev165a_device = {
+    .name          = "Everex Maxi Magic EV-165A",
+    .internal_name = "ev165a",
+    .flags         = DEVICE_ISA,
+    .local         = ISAMEM_EV165A_CARD,
+    .init          = isamem_init,
+    .close         = isamem_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ev165a_config
+};
+
+static const device_config_t brxt_config[] = {
+  // clang-format off
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0268,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "208H", .value = 0x0208 },
             { .description = "218H", .value = 0x0218 },
             { .description = "258H", .value = 0x0258 },
             { .description = "268H", .value = 0x0268 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "frame",
-        .description = "Frame Address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "Disabled", .value = 0x00000 },
+        .name           = "frame",
+        .description    = "Frame Address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xD0000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "D000H", .value = 0xD0000 },
+            { .description = "E000H", .value = 0xE0000 },
+            { .description = ""                        }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =    0,
+            .max  = 2048,
+            .step =  512
+        },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
+static const device_t brxt_device = {
+    .name          = "BocaRAM/XT",
+    .internal_name = "brxt",
+    .flags         = DEVICE_ISA,
+    .local         = ISAMEM_BRXT_CARD,
+    .init          = isamem_init,
+    .close         = isamem_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = brxt_config
+};
+
+#ifdef USE_ISAMEM_BRAT
+static const device_config_t brat_config[] = {
+  // clang-format off
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0268,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "208H", .value = 0x0208 },
+            { .description = "218H", .value = 0x0218 },
+            { .description = "258H", .value = 0x0258 },
+            { .description = "268H", .value = 0x0268 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "frame",
+        .description    = "Frame Address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xD0000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "D000H",    .value = 0xD0000 },
             { .description = "E000H",    .value = 0xE0000 },
             { .description = ""                           }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "width",
-        .description = "I/O Width",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 8,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "width",
+        .description    = "I/O Width",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 8,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "8-bit",  .value =  8 },
             { .description = "16-bit", .value = 16 },
             { .description = ""                    }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "speed",
-        .description = "Transfer Speed",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "speed",
+        .description    = "Transfer Speed",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Standard",   .value = 0 },
             { .description = "High-Speed", .value = 1 },
             { .description = ""                       }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "size",
-        .description = "Memory Size",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 128,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 8192,
-            .step = 512
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =    0,
+            .max  = 4096,
+            .step =  512
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "start",
+        .description    = "Start Address",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =     0,
+            .max  = 14336,
+            .step =   512
+        },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -1326,25 +1843,95 @@ static const device_t brat_device = {
     .init          = isamem_init,
     .close         = isamem_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = brat_config
 };
-#endif
+#endif /* USE_ISAMEM_BRAT */
 
-#if defined(DEV_BRANCH) && defined(USE_ISAMEM_RAMPAGE)
+static const device_config_t lotech_config[] = {
+// clang-format off
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0260,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "260H", .value = 0x0260 },
+            { .description = "264H", .value = 0x0264 },
+            { .description = "268H", .value = 0x0268 },
+            { .description = "26CH", .value = 0x026C },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "frame",
+        .description    = "Frame Address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xe0000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "C000H",    .value = 0xC0000 },
+            { .description = "D000H",    .value = 0xD0000 },
+            { .description = "E000H",    .value = 0xE0000 },
+            { .description = ""                           }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 2048,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =  512,
+            .max  = 4096,
+            .step =  512
+        },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+// clang-format on
+};
+
+static const device_t lotech_ems_device = {
+    .name          = "Lo-tech EMS Board",
+    .internal_name = "lotechems",
+    .flags         = DEVICE_ISA,
+    .local         = ISAMEM_LOTECH_EMS_CARD,
+    .init          = isamem_init,
+    .close         = isamem_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = lotech_config
+};
+
+#ifdef USE_ISAMEM_RAMPAGE
+// TODO: Dual Paging support
+// TODO: Conventional memory suppport
 static const device_config_t rampage_config[] = {
   // clang-format off
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x0258,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0218,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "208H", .value = 0x0208 },
             { .description = "218H", .value = 0x0218 },
             { .description = "258H", .value = 0x0258 },
@@ -1354,64 +1941,37 @@ static const device_config_t rampage_config[] = {
             { .description = "2E8H", .value = 0x02E8 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "frame",
-        .description = "Frame Address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "Disabled", .value = 0x00000 },
-            { .description = "C000H",    .value = 0xC0000 },
-            { .description = "D000H",    .value = 0xD0000 },
-            { .description = "E000H",    .value = 0xE0000 },
-            { .description = ""                           }
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 256, /* Technically 128k, but banks 2-7 must be 256, headaches elsewise */
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =  256,
+            .max  = 2048,
+            .step =  256
         },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "width",
-        .description = "I/O Width",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 8,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "8-bit",  .value =  8 },
-            { .description = "16-bit", .value = 16 },
-            { .description = ""                    }
+        .name           = "start",
+        .description    = "Start Address",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 640,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =   0,
+            .max  = 640,
+            .step =  64
         },
-    },
-    {
-        .name = "speed",
-        .description = "Transfer Speed",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "Standard",   .value = 0 },
-            { .description = "High-Speed", .value = 1 },
-            { .description = ""                       }
-        }
-    },
-    {
-        .name = "size",
-        .description = "Memory Size",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 128,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 8192,
-            .step = 128
-        },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -1425,25 +1985,25 @@ static const device_t rampage_device = {
     .init          = isamem_init,
     .close         = isamem_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = rampage_config
 };
-#endif
+#endif /* USE_ISAMEM_RAMPAGE */
 
-#if defined(DEV_BRANCH) && defined(USE_ISAMEM_IAB)
+#ifdef USE_ISAMEM_IAB
 static const device_config_t iab_config[] = {
   // clang-format off
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x0258,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0258,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "208H", .value = 0x0208 },
             { .description = "218H", .value = 0x0218 },
             { .description = "258H", .value = 0x0258 },
@@ -1453,64 +2013,69 @@ static const device_config_t iab_config[] = {
             { .description = "2E8H", .value = 0x02E8 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "frame",
-        .description = "Frame Address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "frame",
+        .description    = "Frame Address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Disabled", .value = 0x00000 },
             { .description = "C000H",    .value = 0xC0000 },
             { .description = "D000H",    .value = 0xD0000 },
             { .description = "E000H",    .value = 0xE0000 },
             { .description = ""                           }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "width",
-        .description = "I/O Width",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 8,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "width",
+        .description    = "I/O Width",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 8,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "8-bit",  .value =  8 },
             { .description = "16-bit", .value = 16 },
             { .description = ""                    }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "speed",
-        .description = "Transfer Speed",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "speed",
+        .description    = "Transfer Speed",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Standard",   .value = 0 },
             { .description = "High-Speed", .value = 1 },
             { .description = ""                       }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "size",
-        .description = "Memory Size",
-        .type = CONFIG_SPINNER,
-        .default_string = "",
-        .default_int = 128,
-        .file_filter = "",
-        .spinner = {
-            .min = 0,
-            .max = 8192,
-            .step = 128
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 128,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min  =    0,
+            .max  = 8192,
+            .step =  128
         },
-        .selection = { { 0 } }
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -1524,51 +2089,95 @@ static const device_t iab_device = {
     .init          = isamem_init,
     .close         = isamem_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = iab_config
 };
-#endif
+#endif /* USE_ISAMEM_IAB */
 
-static const device_t isa_none_device = {
-    .name          = "None",
-    .internal_name = "none",
-    .flags         = 0,
-    .local         = 0,
-    .init          = NULL,
-    .close         = NULL,
+static const device_config_t mplus2_config[] = {
+  // clang-format off
+    {
+        .name           = "size",
+        .description    = "Memory size",
+        .type           = CONFIG_SPINNER,
+        .default_string = "",
+        .default_int    = 64,
+        .file_filter    = "",
+        .spinner        = {
+            .min  = 0,
+            .max  = 512,
+            .step = 64
+        },
+        .selection      = { { 0 } }
+    },
+    {
+        .name           = "start",
+        .description    = "Start Address",
+        .type           = CONFIG_SPINNER,
+        .default_string = "",
+        .default_int    = 256,
+        .file_filter    = "",
+        .spinner        = {
+            .min  = 64,
+            .max  = 576,
+            .step = 64
+        },
+        .selection      = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
+static const device_t mplus2_device = {
+    .name          = "AST MegaPlus II",
+    .internal_name = "mplus2",
+    .flags         = DEVICE_ISA,
+    .local         = ISAMEM_MPLUS2_CARD,
+    .init          = isamem_init,
+    .close         = isamem_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
-    .config        = NULL
+    .config        = mplus2_config
 };
 
 static const struct {
     const device_t *dev;
 } boards[] = {
     // clang-format off
-    { &isa_none_device     },
+    { &device_none         },
+    // XT Ram Expansion Cards
+    { &ibmxt_32k_device    },
+    { &ibmxt_64k_device    },
     { &ibmxt_device        },
     { &genericxt_device    },
     { &msramcard_device    },
     { &mssystemcard_device },
+    // AT RAM Expansion Cards
+    { &ibmat_128k_device   },
     { &ibmat_device        },
     { &genericat_device    },
+    // EMS Cards
     { &p5pak_device        },
     { &a6pak_device        },
     { &ems5150_device      },
     { &ev159_device        },
-#if defined(DEV_BRANCH) && defined(USE_ISAMEM_BRAT)
+    { &ev165a_device       },
+    { &brxt_device         },
+#ifdef USE_ISAMEM_BRAT
     { &brat_device         },
-#endif
-#if defined(DEV_BRANCH) && defined(USE_ISAMEM_RAMPAGE)
+#endif /* USE_ISAMEM_BRAT */
+#ifdef USE_ISAMEM_RAMPAGE
     { &rampage_device      },
-#endif
-#if defined(DEV_BRANCH) && defined(USE_ISAMEM_IAB)
+#endif /* USE_ISAMEM_RAMPAGE */
+#ifdef USE_ISAMEM_IAB
     { &iab_device          },
-#endif
+#endif /* USE_ISAMEM_IAB */
+    { &lotech_ems_device   },
+    { &mplus2_device       },
     { NULL                 }
     // clang-format on
 };
@@ -1607,12 +2216,12 @@ isamem_get_internal_name(int board)
 }
 
 int
-isamem_get_from_internal_name(const char *s)
+isamem_get_from_internal_name(const char *str)
 {
     int c = 0;
 
     while (boards[c].dev != NULL) {
-        if (!strcmp(boards[c].dev->internal_name, s))
+        if (!strcmp(boards[c].dev->internal_name, str))
             return c;
         c++;
     }
@@ -1627,3 +2236,12 @@ isamem_get_device(int board)
     /* Add the instance to the system. */
     return boards[board].dev;
 }
+
+int
+isamem_has_config(int board)
+{
+    if (boards[board].dev == NULL)
+        return 0;
+
+    return (boards[board].dev->config ? 1 : 0);
+}
diff --git a/src/device/isapnp.c b/src/device/isapnp.c
index f9d10b380..ce8f7817f 100644
--- a/src/device/isapnp.c
+++ b/src/device/isapnp.c
@@ -110,6 +110,7 @@ typedef struct _isapnp_card_ {
 } isapnp_card_t;
 
 typedef struct {
+    uint8_t  in_isolation;
     uint8_t  reg;
     uint8_t  key_pos : 5;
     uint16_t read_data_addr;
@@ -120,6 +121,25 @@ typedef struct {
     isapnp_device_t *current_ld;
 } isapnp_t;
 
+static isapnp_device_t *
+isapnp_create_ld(isapnp_card_t *card)
+{
+    /* Allocate logical device. */
+    isapnp_device_t *ld = calloc(1, sizeof(isapnp_device_t));
+
+    /* Add to the end of the card's logical device list. */
+    isapnp_device_t *prev_ld = card->first_ld;
+    if (prev_ld) {
+        while (prev_ld->next)
+            prev_ld = prev_ld->next;
+        prev_ld->next = ld;
+    } else {
+        card->first_ld = ld;
+    }
+
+    return ld;
+}
+
 static void
 isapnp_device_config_changed(isapnp_card_t *card, isapnp_device_t *ld)
 {
@@ -136,6 +156,8 @@ isapnp_device_config_changed(isapnp_card_t *card, isapnp_device_t *ld)
         card->config.mem[i].size = (ld->regs[reg_base + 3] << 16) | (ld->regs[reg_base + 4] << 8);
         if (ld->regs[reg_base + 2] & 0x01) /* upper limit */
             card->config.mem[i].size -= card->config.mem[i].base;
+        else
+            card->config.mem[i].size = (card->config.mem[i].size | 0xff) ^ 0xffffffff;
     }
     for (uint8_t i = 0; i < 4; i++) {
         reg_base                   = (i == 0) ? 0x76 : (0x80 + (16 * i));
@@ -313,6 +335,8 @@ isapnp_read_common(isapnp_t *dev, isapnp_card_t *card, isapnp_device_t *ld, uint
 
         case 0x05: /* Status */
             ret = 0x00;
+            if (dev->in_isolation)
+                ret = 0x01;
             CHECK_CURRENT_CARD();
 
             isapnp_log("ISAPnP: Query status for CSN %02X\n", card->csn);
@@ -485,15 +509,16 @@ isapnp_write_common(isapnp_t *dev, isapnp_card_t *card, isapnp_device_t *ld, uin
         case 0x03: /* Wake[CSN] */
             isapnp_log("ISAPnP: Wake[%02X]\n", val);
             card = dev->first_card;
+            if (val == 0)
+                dev->in_isolation |= 1;
             while (card) {
                 if (card->csn == val) {
                     card->rom_pos     = 0;
                     card->id_checksum = isapnp_init_key[0];
                     if (card->state == PNP_STATE_SLEEP)
                         card->state = (val == 0) ? PNP_STATE_ISOLATION : PNP_STATE_CONFIG;
-                } else {
+                } else
                     card->state = PNP_STATE_SLEEP;
-                }
 
                 card = card->next;
             }
@@ -505,6 +530,7 @@ isapnp_write_common(isapnp_t *dev, isapnp_card_t *card, isapnp_device_t *ld, uin
                 isapnp_set_csn(dev->isolated_card, val);
                 dev->isolated_card->state = PNP_STATE_CONFIG;
                 dev->isolated_card        = NULL;
+                dev->in_isolation         = 0;
             } else {
                 isapnp_log("ISAPnP: Set CSN %02X but no card is isolated\n", val);
             }
@@ -525,8 +551,12 @@ isapnp_write_common(isapnp_t *dev, isapnp_card_t *card, isapnp_device_t *ld, uin
                 ld = ld->next;
             }
 
-            if (!ld)
-                isapnp_log("ISAPnP: CSN %02X has no device %02X\n", card->csn, val);
+            if (!ld) {
+                isapnp_log("ISAPnP: CSN %02X has no device %02X, creating one\n", card->csn, val);
+                dev->current_ld_card    = card;
+                dev->current_ld         = isapnp_create_ld(card);
+                dev->current_ld->number = val;
+            }
 
             break;
 
@@ -649,7 +679,7 @@ isapnp_write_data(UNUSED(uint16_t addr), uint8_t val, void *priv)
 static void *
 isapnp_init(UNUSED(const device_t *info))
 {
-    isapnp_t *dev = (isapnp_t *) malloc(sizeof(isapnp_t));
+    isapnp_t *dev = (isapnp_t *) calloc(1, sizeof(isapnp_t));
     memset(dev, 0, sizeof(isapnp_t));
 
     io_sethandler(0x279, 1, NULL, NULL, NULL, isapnp_write_addr, NULL, NULL, dev);
@@ -698,8 +728,7 @@ isapnp_add_card(uint8_t *rom, uint16_t rom_size,
     if (!dev)
         dev = (isapnp_t *) device_add(&isapnp_device);
 
-    isapnp_card_t *card = (isapnp_card_t *) malloc(sizeof(isapnp_card_t));
-    memset(card, 0, sizeof(isapnp_card_t));
+    isapnp_card_t *card = (isapnp_card_t *) calloc(1, sizeof(isapnp_card_t));
 
     card->enable           = 1;
     card->priv             = priv;
@@ -737,7 +766,7 @@ isapnp_update_card_rom(void *priv, uint8_t *rom, uint16_t rom_size)
     isapnp_log("ISAPnP: Parsing ROM resources for card %c%c%c%02X%02X (serial %08X)\n", '@' + ((vendor >> 10) & 0x1f), '@' + ((vendor >> 5) & 0x1f), '@' + (vendor & 0x1f), card->rom[2], card->rom[3], (card->rom[7] << 24) | (card->rom[6] << 16) | (card->rom[5] << 8) | card->rom[4]);
     const char *df_priority[]  = { "good", "acceptable", "sub-optimal", "unknown priority" };
     const char *mem_control[]  = { "8-bit", "16-bit", "8/16-bit", "32-bit" };
-    const char *dma_transfer[] = { "8-bit", "8/16-bit", "16-bit", "unknown" };
+    const char *dma_transfer[] = { "8-bit", "8/16-bit", "16-bit", "Reserved" };
     const char *dma_speed[]    = { "compatibility", "Type A", "Type B", "Type F" };
 #endif
     uint16_t         i        = 9;
@@ -756,8 +785,7 @@ isapnp_update_card_rom(void *priv, uint8_t *rom, uint16_t rom_size)
     uint8_t          mem_range_df    = 0;
     uint8_t          mem_range_32_df = 0;
     uint32_t         len;
-    isapnp_device_t *ld      = NULL;
-    isapnp_device_t *prev_ld = NULL;
+    isapnp_device_t *ld = NULL;
 
     /* Check if this is an existing card which already has logical devices.
        Any new logical devices will be added to the list after existing ones.
@@ -784,10 +812,25 @@ isapnp_update_card_rom(void *priv, uint8_t *rom, uint16_t rom_size)
                             break;
                         }
 
-                        isapnp_log("ISAPnP: >>%s Memory range %d with %d bytes at %06X-%06X, align %d",
-                                   in_df ? ">" : "", mem_range,
-                                   *((uint16_t *) &card->rom[i + 10]) << 8, *((uint16_t *) &card->rom[i + 4]) << 8, ((card->rom[i + 3] & 0x4) ? 0 : (*((uint16_t *) &card->rom[i + 4]) << 8)) + (*((uint16_t *) &card->rom[i + 6]) << 8),
-                                   (*((uint16_t *) &card->rom[i + 8]) + 1) << 16);
+                        isapnp_log("ISAPnP: >>%s Memory range %d with %d bytes at %06X-%06X to %06X-%06X, align %d",
+                                   /* %s   */ in_df ? ">" : "",
+                                   /* %d   */ mem_range,
+                                   /* %d   */ *((uint16_t *) &card->rom[i + 8]),
+                                   /* %06X */ *((uint16_t *) &card->rom[i + 4]) << 8,
+                                   /* %06X */ ((card->rom[i + 3] & 0x4) ?
+                                              /* High address. */
+                                              (*((uint16_t *) &card->rom[i + 10]) << 8) :
+                                              /* Range. */
+                                              (*((uint16_t *) &card->rom[i + 4]) << 8)) +
+                                              (*((uint16_t *) &card->rom[i + 10]) << 8),
+                                   /* %06X */ *((uint16_t *) &card->rom[i + 6]) << 8,
+                                   /* %06X */ ((card->rom[i + 3] & 0x4) ?
+                                              /* High address. */
+                                              (*((uint16_t *) &card->rom[i + 10]) << 8) :
+                                              /* Range. */
+                                              (*((uint16_t *) &card->rom[i + 6]) << 8)) +
+                                              (*((uint16_t *) &card->rom[i + 10]) << 8),
+                                   /* %d   */ *((uint16_t *) &card->rom[i + 8]));
                         res = 1 << mem_range;
                         mem_range++;
                     } else {
@@ -801,9 +844,25 @@ isapnp_update_card_rom(void *priv, uint8_t *rom, uint16_t rom_size)
                             break;
                         }
 
-                        isapnp_log("ISAPnP: >>%s 32-bit memory range %d with %d bytes at %08X-%08X, align %d", in_df ? ">" : "", mem_range_32,
-                                   *((uint32_t *) &card->rom[i + 16]) << 8, *((uint32_t *) &card->rom[i + 4]) << 8, ((card->rom[i + 3] & 0x4) ? 0 : (*((uint32_t *) &card->rom[i + 4]) << 8)) + (*((uint32_t *) &card->rom[i + 8]) << 8),
-                                   *((uint32_t *) &card->rom[i + 12]));
+                        isapnp_log("ISAPnP: >>%s 32-bit memory range %d with %d bytes at %08X-%08X, align %d",
+                                   /* %s   */ in_df ? ">" : "",
+                                   /* %d   */ mem_range_32,
+                                   /* %d   */ *((uint32_t *) &card->rom[i + 12]),
+                                   /* %08X */ *((uint32_t *) &card->rom[i + 4]),
+                                   /* %08X */ ((card->rom[i + 3] & 0x4) ?
+                                              /* High address. */
+                                              *((uint32_t *) &card->rom[i + 16]) :
+                                              /* Range. */
+                                              *((uint32_t *) &card->rom[i + 4])) +
+                                              *((uint32_t *) &card->rom[i + 16]),
+                                   /* %08X */ *((uint32_t *) &card->rom[i + 8]),
+                                   /* %08X */ ((card->rom[i + 3] & 0x4) ?
+                                              /* High address. */
+                                              *((uint32_t *) &card->rom[i + 16]) :
+                                              /* Range. */
+                                              *((uint32_t *) &card->rom[i + 8])) +
+                                              *((uint32_t *) &card->rom[i + 16]),
+                                   /* %d   */ *((uint32_t *) &card->rom[i + 12]));
                         res = 1 << (4 + mem_range_32);
                         mem_range_32++;
                     }
@@ -874,18 +933,7 @@ isapnp_update_card_rom(void *priv, uint8_t *rom, uint16_t rom_size)
                         memset(ld->io_len, 0, sizeof(ld->io_len));
                     } else {
                         /* Create logical device. */
-                        ld = (isapnp_device_t *) malloc(sizeof(isapnp_device_t));
-                        memset(ld, 0, sizeof(isapnp_device_t));
-
-                        /* Add to end of list. */
-                        prev_ld = card->first_ld;
-                        if (prev_ld) {
-                            while (prev_ld->next)
-                                prev_ld = prev_ld->next;
-                            prev_ld->next = ld;
-                        } else {
-                            card->first_ld = ld;
-                        }
+                        ld = isapnp_create_ld(card);
                     }
 
                     /* Set and increment logical device number. */
@@ -937,9 +985,9 @@ isapnp_update_card_rom(void *priv, uint8_t *rom, uint16_t rom_size)
                 case 0x05: /* DMA */
                     isapnp_log("ISAPnP: >>%s DMA index %d with mask %02X, %s, %sbus master, %scount by byte, %scount by word, %s speed\n", in_df ? ">" : "", dma++, card->rom[i + 1],
                                dma_transfer[card->rom[i + 2] & 3],
-                               (card->rom[i + 2] & 0x04) ? "not " : "",
-                               (card->rom[i + 2] & 0x08) ? "not " : "",
-                               (card->rom[i + 2] & 0x10) ? "not " : "",
+                               (card->rom[i + 2] & 0x04) ? "" : "not ",
+                               (card->rom[i + 2] & 0x08) ? "" : "not ",
+                               (card->rom[i + 2] & 0x10) ? "" : "not ",
                                dma_speed[(card->rom[i + 2] >> 5) & 3]);
                     break;
 #endif
@@ -1004,6 +1052,29 @@ isapnp_update_card_rom(void *priv, uint8_t *rom, uint16_t rom_size)
 
                     break;
 
+                case 0x09: /* Fixed I/O port */
+                    if (!ld) {
+                        isapnp_log("ISAPnP: >>%s Fixed I/O descriptor with no logical device\n", in_df ? ">" : "");
+                        break;
+                    }
+
+                    if (io > 7) {
+                        isapnp_log("ISAPnP: >>%s Fixed I/O descriptor overflow (%d)\n", in_df ? ">" : "", io++);
+                        break;
+                    }
+
+                    isapnp_log("ISAPnP: >>%s Fixed I/O range %d with %d ports at %04X\n", in_df ? ">" : "", io, card->rom[i + 3], *((uint16_t *) &card->rom[i + 1]));
+
+                    /* Fixed I/O port ranges of this kind are always 10-bit. */
+                    ld->io_16bit &= ~(1 << io);
+
+                    if (card->rom[i + 3] > ld->io_len[io])
+                        ld->io_len[io] = card->rom[i + 3];
+
+                    io++;
+
+                    break;
+
                 case 0x0f: /* end tag */
                     /* Calculate checksum. */
                     res = 0x00;
@@ -1046,13 +1117,17 @@ isapnp_enable_card(void *priv, uint8_t enable)
             /* Enable or disable the card. */
             if (!!enable ^ !!card->enable)
                 card->state = (enable == ISAPNP_CARD_FORCE_CONFIG) ? PNP_STATE_CONFIG : PNP_STATE_WAIT_FOR_KEY;
+            int old_enable = card->enable;
             card->enable = enable;
 
             /* Invalidate other references if we're disabling this card. */
-            if (!card->enable) {
+            if ((card->enable) && (dev->current_ld_card != NULL) && (dev->current_ld_card != card)) {
+                dev->current_ld      = NULL;
+                dev->current_ld_card = NULL;
+            } if (!card->enable) {
                 if (dev->isolated_card == card)
                     dev->isolated_card = NULL;
-                if (dev->current_ld_card == card) {
+                if ((dev->current_ld_card == card) && (old_enable != ISAPNP_CARD_FORCE_CONFIG)) {
                     dev->current_ld      = NULL;
                     dev->current_ld_card = NULL;
                 }
@@ -1159,7 +1234,7 @@ static const device_t isapnp_device = {
     .init          = isapnp_init,
     .close         = isapnp_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/device/isarom.c b/src/device/isarom.c
new file mode 100644
index 000000000..bfdaecacf
--- /dev/null
+++ b/src/device/isarom.c
@@ -0,0 +1,706 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of ISA ROM card Expansions.
+ *
+ * Authors: Jasmine Iwanek, <jriwanek@gmail.com>
+ *
+ *          Copyright 2025 Jasmine Iwanek.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/nvr.h>
+#include <86box/isarom.h>
+
+enum {
+    ISAROM_CARD = 0,
+    ISAROM_CARD_DUAL,
+    ISAROM_CARD_QUAD,
+    ISAROM_CARD_LBA_ENHANCER
+};
+
+#define BIOS_LBA_ENHANCER  "roms/hdd/misc/lbaenhancer.bin"
+
+#ifdef ENABLE_ISAROM_LOG
+int isarom_do_log = ENABLE_ISAROM_LOG;
+
+static void
+isarom_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (isarom_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define isarom_log(fmt, ...)
+#endif
+
+typedef struct isarom_t {
+    struct {
+        rom_t       rom;
+        uint32_t    addr;
+        const char *fn;
+        uint32_t    size;
+        uint32_t    len;
+        char        nvr_path[64];
+        uint8_t     writable;
+    } socket[4];
+    uint8_t inst;
+    uint8_t type;
+} isarom_t;
+
+static inline uint8_t
+get_limit(uint8_t type)
+{
+    switch (type) {
+        case ISAROM_CARD_DUAL:
+            return 2;
+        case ISAROM_CARD_QUAD:
+            return 4;
+        default:
+            return 1;
+    }
+}
+
+static inline void
+isarom_save_nvr(char *path, uint8_t *data, size_t size)
+{
+    if (path[0] == 0x00)
+        return;
+
+    FILE *fp = nvr_fopen(path, "wb");
+    if (fp) {
+        fwrite(data, 1, size, fp);
+        fclose(fp);
+    }
+}
+
+void
+isarom_close(void *priv)
+{
+    isarom_t *dev = (isarom_t *) priv;
+    if (!priv)
+        return;
+
+    for (uint8_t i = 0; i < get_limit(dev->type); i++) {
+        if (dev->socket[i].writable) {
+            isarom_log("isarom[%u]: saving NVR for socket %u -> %s (%u bytes)\n",
+                       dev->inst, i, dev->socket[i].nvr_path, dev->socket[i].size);
+            isarom_save_nvr(dev->socket[i].nvr_path, dev->socket[i].rom.rom, dev->socket[i].size);
+        }
+    }
+
+    free(dev);
+}
+
+static void *
+isarom_init(const device_t *info)
+{
+    isarom_t *dev = (isarom_t *) calloc(1, sizeof(isarom_t));
+    if (!dev)
+        return NULL;
+
+    dev->inst = device_get_instance();
+    dev->type = (uint8_t) info->local;
+
+    isarom_log("isarom[%u]: initializing device (type=%u)\n", dev->inst, dev->type);
+
+    for (uint8_t i = 0; i < get_limit(dev->type); i++) {
+        char str[22];
+        char suffix[4] = "";
+        if (i > 0)
+            snprintf(suffix, sizeof(suffix), "%d", i + 1);
+
+        snprintf(str, sizeof(str), "bios_addr%s", suffix);
+        dev->socket[i].addr = device_get_config_hex20(str);
+
+        switch (dev->type) {
+            case ISAROM_CARD_LBA_ENHANCER:
+                dev->socket[i].fn   = BIOS_LBA_ENHANCER;
+                dev->socket[i].size = 0x4000;
+                break;
+
+            default:
+                snprintf(str, sizeof(str), "bios_fn%s", suffix);
+                dev->socket[i].fn = device_get_config_string(str);
+
+                snprintf(str, sizeof(str), "bios_size%s", suffix);
+                dev->socket[i].size = device_get_config_int(str);
+
+                snprintf(str, sizeof(str), "rom_writes_enabled%s", suffix);
+                if (device_get_config_int(str))
+                    dev->socket[i].writable = 1;
+                break;
+        }
+
+        /* Note: 2K is the smallest ROM I've found, but 86Box's memory granularity is 4K, the number
+           below is fine as we'll end up allocating no less than 4K due to the device config limits. */
+        dev->socket[i].len = (dev->socket[i].size > 0) ? ((dev->socket[i].size - 1) | MEM_GRANULARITY_MASK) : 0;
+
+        isarom_log("isarom[%u]: socket %u: addr=0x%05X size=%u writable=%u fn=%s\n",
+                   dev->inst, i, dev->socket[i].addr, dev->socket[i].size,
+                   dev->socket[i].writable, dev->socket[i].fn ? dev->socket[i].fn : "(null)");
+
+        if ((dev->socket[i].addr != 0) && (dev->socket[i].fn != NULL)) {
+            rom_init(&dev->socket[i].rom,
+                     dev->socket[i].fn,
+                     dev->socket[i].addr,
+                     dev->socket[i].size,
+                     dev->socket[i].len,
+                     0,
+                     MEM_MAPPING_EXTERNAL);
+
+            isarom_log("isarom[%u]: ROM initialized for socket %u\n", dev->inst, i);
+
+            if (dev->socket[i].writable) {
+                mem_mapping_set_write_handler(&dev->socket[i].rom.mapping, rom_write, rom_writew, rom_writel);
+                snprintf(dev->socket[i].nvr_path, sizeof(dev->socket[i].nvr_path), "isarom_%i_%i.nvr", dev->inst, i + 1);
+                FILE *fp = nvr_fopen(dev->socket[i].nvr_path, "rb");
+                if (fp != NULL) {
+                    (void) !fread(dev->socket[i].rom.rom, 1, dev->socket[i].size, fp);
+                    fclose(fp);
+                    isarom_log("isarom[%u]: loaded %zu bytes from %s\n", dev->inst, read_bytes, dev->socket[i].nvr_path);
+                } else
+                    isarom_log("isarom[%u]: NVR not found, skipping load (%s)\n", dev->inst, dev->socket[i].nvr_path);
+            }
+        }
+    }
+
+    return dev;
+}
+
+static int
+isarom_lba_enhancer_available(void)
+{
+    return rom_present(BIOS_LBA_ENHANCER);
+}
+
+#define BIOS_FILE_FILTER "ROM files (*.bin *.rom)|*.bin,*.rom"
+
+#define BIOS_ADDR_SELECTION { \
+    { "Disabled", 0x00000 },  \
+    { "C000H",    0xc0000 },  \
+    { "C200H",    0xc2000 },  \
+    { "C400H",    0xc4000 },  \
+    { "C600H",    0xc6000 },  \
+    { "C800H",    0xc8000 },  \
+    { "CA00H",    0xca000 },  \
+    { "CC00H",    0xcc000 },  \
+    { "CE00H",    0xce000 },  \
+    { "D000H",    0xd0000 },  \
+    { "D200H",    0xd2000 },  \
+    { "D400H",    0xd4000 },  \
+    { "D600H",    0xd6000 },  \
+    { "D800H",    0xd8000 },  \
+    { "DA00H",    0xda000 },  \
+    { "DC00H",    0xdc000 },  \
+    { "DE00H",    0xde000 },  \
+    { "E000H",    0xe0000 },  \
+    { "E200H",    0xe2000 },  \
+    { "E400H",    0xe4000 },  \
+    { "E600H",    0xe6000 },  \
+    { "E800H",    0xe8000 },  \
+    { "EA00H",    0xea000 },  \
+    { "EC00H",    0xec000 },  \
+    { "EE00H",    0xee000 },  \
+    { "",         0       }   \
+}
+
+#define BIOS_SIZE_SELECTION { \
+    { "4K",   4096 },         \
+    { "8K",   8192 },         \
+    { "16K", 16384 },         \
+    { "32K", 32768 },         \
+    { "64K", 65536 },         \
+    { "",        0 }          \
+}
+
+// clang-format off
+static const device_config_t isarom_config[] = {
+    {
+        .name           = "bios_fn",
+        .description    = "BIOS file",
+        .type           = CONFIG_FNAME,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = BIOS_FILE_FILTER,
+        .spinner        = { 0 },
+        .selection      = { },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0x00000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = BIOS_ADDR_SELECTION,
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_size",
+        .description    = "BIOS size",
+        .type           = CONFIG_INT,
+        .default_string = NULL,
+        .default_int    = 8192,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = BIOS_SIZE_SELECTION,
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "rom_writes_enabled",
+        .description    = "Enable BIOS extension ROM Writes",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t isarom_dual_config[] = {
+    {
+        .name           = "bios_fn",
+        .description    = "BIOS file (ROM #1)",
+        .type           = CONFIG_FNAME,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = BIOS_FILE_FILTER,
+        .spinner        = { 0 },
+        .selection      = { },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_addr",
+        .description    = "BIOS address (ROM #1)",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0x00000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = BIOS_ADDR_SELECTION,
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_size",
+        .description    = "BIOS size (ROM #1)",
+        .type           = CONFIG_INT,
+        .default_string = NULL,
+        .default_int    = 8192,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = BIOS_SIZE_SELECTION,
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "rom_writes_enabled",
+        .description    = "Enable BIOS extension ROM Writes (ROM #1)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_fn2",
+        .description    = "BIOS file (ROM #2)",
+        .type           = CONFIG_FNAME,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = BIOS_FILE_FILTER,
+        .spinner        = { 0 },
+        .selection      = { },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_addr2",
+        .description    = "BIOS address (ROM #2)",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0x00000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = BIOS_ADDR_SELECTION,
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_size2",
+        .description    = "BIOS size (ROM #2)",
+        .type           = CONFIG_INT,
+        .default_string = NULL,
+        .default_int    = 8192,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = BIOS_SIZE_SELECTION,
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "rom_writes_enabled2",
+        .description    = "Enable BIOS extension ROM Writes (ROM #2)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t isarom_quad_config[] = {
+    {
+        .name           = "bios_fn",
+        .description    = "BIOS file (ROM #1)",
+        .type           = CONFIG_FNAME,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = BIOS_FILE_FILTER,
+        .spinner        = { 0 },
+        .selection      = { },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_addr",
+        .description    = "BIOS address (ROM #1)",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0x00000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = BIOS_ADDR_SELECTION,
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_size",
+        .description    = "BIOS size (ROM #1)",
+        .type           = CONFIG_INT,
+        .default_string = NULL,
+        .default_int    = 8192,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = BIOS_SIZE_SELECTION,
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "rom_writes_enabled",
+        .description    = "Enable BIOS extension ROM Writes (ROM #1)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_fn2",
+        .description    = "BIOS file (ROM #2)",
+        .type           = CONFIG_FNAME,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = BIOS_FILE_FILTER,
+        .spinner        = { 0 },
+        .selection      = { },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_addr2",
+        .description    = "BIOS address (ROM #2)",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0x00000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = BIOS_ADDR_SELECTION,
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_size2",
+        .description    = "BIOS size (ROM #2)",
+        .type           = CONFIG_INT,
+        .default_string = NULL,
+        .default_int    = 8192,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = BIOS_SIZE_SELECTION,
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "rom_writes_enabled2",
+        .description    = "Enable BIOS extension ROM Writes (ROM #2)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_fn3",
+        .description    = "BIOS file (ROM #3)",
+        .type           = CONFIG_FNAME,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = BIOS_FILE_FILTER,
+        .spinner        = { 0 },
+        .selection      = { },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_addr3",
+        .description    = "BIOS address (ROM #3)",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0x00000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = BIOS_ADDR_SELECTION,
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_size3",
+        .description    = "BIOS size (ROM #3)",
+        .type           = CONFIG_INT,
+        .default_string = NULL,
+        .default_int    = 8192,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = BIOS_SIZE_SELECTION,
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "rom_writes_enabled3",
+        .description    = "Enable BIOS extension ROM Writes (ROM #3)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_fn4",
+        .description    = "BIOS file (ROM #4)",
+        .type           = CONFIG_FNAME,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = BIOS_FILE_FILTER,
+        .spinner        = { 0 },
+        .selection      = { },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_addr4",
+        .description    = "BIOS address (ROM #4)",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0x00000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = BIOS_ADDR_SELECTION,
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_size4",
+        .description    = "BIOS size (ROM #4)",
+        .type           = CONFIG_INT,
+        .default_string = NULL,
+        .default_int    = 8192,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = BIOS_SIZE_SELECTION,
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "rom_writes_enabled4",
+        .description    = "Enable BIOS extension ROM Writes (ROM #4)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t lba_enhancer_config[] = {
+    {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xc8000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "C800H", .value = 0xc8000 },
+            { .description = "CC00H", .value = 0xcc000 },
+            { .description = "D000H", .value = 0xd0000 },
+            { .description = "D400H", .value = 0xd4000 },
+            { .description = "D800H", .value = 0xd8000 },
+            { .description = "DC00H", .value = 0xdc000 },
+            { .description = ""                        }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+// clang-format on
+
+static const device_t isarom_device = {
+    .name          = "Generic ISA ROM Board",
+    .internal_name = "isarom",
+    .flags         = DEVICE_ISA,
+    .local         = ISAROM_CARD,
+    .init          = isarom_init,
+    .close         = isarom_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = isarom_config
+};
+
+static const device_t isarom_dual_device = {
+    .name          = "Generic Dual ISA ROM Board",
+    .internal_name = "isarom_dual",
+    .flags         = DEVICE_ISA,
+    .local         = ISAROM_CARD_DUAL,
+    .init          = isarom_init,
+    .close         = isarom_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = isarom_dual_config
+};
+
+static const device_t isarom_quad_device = {
+    .name          = "Generic Quad ISA ROM Board",
+    .internal_name = "isarom_quad",
+    .flags         = DEVICE_ISA,
+    .local         = ISAROM_CARD_QUAD,
+    .init          = isarom_init,
+    .close         = isarom_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = isarom_quad_config
+};
+
+static const device_t lba_enhancer_device = {
+    .name          = "Vision Systems LBA Enhancer",
+    .internal_name = "lba_enhancer",
+    .flags         = DEVICE_ISA,
+    .local         = ISAROM_CARD_LBA_ENHANCER,
+    .init          = isarom_init,
+    .close         = isarom_close,
+    .reset         = NULL,
+    .available     = isarom_lba_enhancer_available,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = lba_enhancer_config
+};
+
+static const struct {
+    const device_t *dev;
+} boards[] = {
+    // clang-format off
+    { &device_none         },
+    { &isarom_device       },
+    { &isarom_dual_device  },
+    { &isarom_quad_device  },
+    { &lba_enhancer_device },
+    { NULL                 }
+    // clang-format on
+};
+
+void
+isarom_reset(void)
+{
+    for (uint8_t i = 0; i < ISAROM_MAX; i++) {
+        if (isarom_type[i] == 0)
+            continue;
+
+        /* Add the device instance to the system. */
+        device_add_inst(boards[isarom_type[i]].dev, i + 1);
+    }
+}
+
+const char *
+isarom_get_name(int board)
+{
+    if (boards[board].dev == NULL)
+        return NULL;
+
+    return (boards[board].dev->name);
+}
+
+const char *
+isarom_get_internal_name(int board)
+{
+    return device_get_internal_name(boards[board].dev);
+}
+
+int
+isarom_get_from_internal_name(const char *str)
+{
+    int c = 0;
+
+    while (boards[c].dev != NULL) {
+        if (!strcmp(boards[c].dev->internal_name, str))
+            return c;
+        c++;
+    }
+
+    /* Not found. */
+    return 0;
+}
+
+const device_t *
+isarom_get_device(int board)
+{
+    /* Add the device instance to the system. */
+    return boards[board].dev;
+}
+
+int
+isarom_has_config(int board)
+{
+    if (boards[board].dev == NULL)
+        return 0;
+
+    return (boards[board].dev->config ? 1 : 0);
+}
diff --git a/src/device/isartc.c b/src/device/isartc.c
index 46f31c137..664793db3 100644
--- a/src/device/isartc.c
+++ b/src/device/isartc.c
@@ -76,17 +76,24 @@
 #include <86box/machine.h>
 #include <86box/io.h>
 #include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/nvr.h>
+#include <86box/rom.h>
 #include <86box/ui.h>
 #include <86box/plat.h>
 #include <86box/pic.h>
 #include <86box/isartc.h>
 
-#define ISARTC_EV170  0
-#define ISARTC_DTK    1
-#define ISARTC_P5PAK  2
-#define ISARTC_A6PAK  3
-#define ISARTC_VENDEX 4
+#define ISARTC_EV170   0
+#define ISARTC_DTK     1
+#define ISARTC_P5PAK   2
+#define ISARTC_A6PAK   3
+#define ISARTC_VENDEX  4
+#define ISARTC_MPLUS2  5
+#define ISARTC_MM58167 10
+
+#define ISARTC_ROM_MM58167_1 "roms/rtc/glatick/GLaTICK_0.8.8_NS_86B.ROM"  /* Generic 58167, AST or EV-170 */
+#define ISARTC_ROM_MM58167_2 "roms/rtc/glatick/GLaTICK_0.8.8_NS_86B2.ROM" /* PII-147 */
 
 #define ISARTC_DEBUG  0
 
@@ -101,6 +108,7 @@ typedef struct rtcdev_t {
     int8_t   irq; /* configured IRQ channel */
     int8_t   base_addrsz;
     uint32_t base_addr; /* configured I/O address */
+    rom_t    rom; /* BIOS ROM, If configured */
 
     /* Fields for the specific driver. */
     void    (*f_wr)(uint16_t, uint8_t, void *);
@@ -402,6 +410,7 @@ mm67_read(uint16_t port, void *priv)
             break;
 
         case MM67_AL_MSEC:
+        case MM67_MSEC:
             ret                = dev->nvr.regs[reg] & 0xf0;
             break;
 
@@ -409,6 +418,10 @@ mm67_read(uint16_t port, void *priv)
             ret                = dev->nvr.regs[reg] & 0x0f;
             break;
 
+        case MM67_DOW:
+            ret                = dev->nvr.regs[reg] & 0x07;
+            break;
+
         default:
             ret = dev->nvr.regs[reg];
             break;
@@ -513,8 +526,7 @@ isartc_init(const device_t *info)
     is_at           = is_at || !strcmp(machine_get_internal_name(), "xi8088");
 
     /* Create a device instance. */
-    dev = (rtcdev_t *) malloc(sizeof(rtcdev_t));
-    memset(dev, 0x00, sizeof(rtcdev_t));
+    dev = (rtcdev_t *) calloc(1, sizeof(rtcdev_t));
     dev->name     = info->name;
     dev->board    = info->local;
     dev->irq      = -1;
@@ -524,6 +536,14 @@ isartc_init(const device_t *info)
 
     /* Do per-board initialization. */
     switch (dev->board) {
+        case ISARTC_MM58167: /* Generic MM58167 RTC */
+            {
+                uint32_t rom_addr = device_get_config_hex20("bios_addr");
+                if (rom_addr != 0)
+                    rom_init(&dev->rom, ISARTC_ROM_MM58167_1,
+                             rom_addr, 0x0800, 0x7ff, 0, MEM_MAPPING_EXTERNAL);
+
+            }
         case ISARTC_EV170: /* Everex EV-170 Magic I/O */
             dev->flags |= FLAG_YEAR80;
             dev->base_addr   = device_get_config_hex16("base");
@@ -549,8 +569,9 @@ isartc_init(const device_t *info)
             dev->year        = MM67_AL_HUNTEN; /* year, NON STANDARD */
             break;
 
-        case ISARTC_P5PAK: /* Paradise Systems 5PAK */
-        case ISARTC_A6PAK: /* AST SixPakPlus */
+        case ISARTC_P5PAK:  /* Paradise Systems 5PAK */
+        case ISARTC_A6PAK:  /* AST SixPakPlus */
+        case ISARTC_MPLUS2: /* AST MegaPlus II */
             dev->flags |= FLAG_YEAR80;
             dev->base_addr   = 0x02c0;
             dev->base_addrsz = 32;
@@ -614,24 +635,38 @@ isartc_close(void *priv)
 static const device_config_t ev170_config[] = {
   // clang-format off
     {
-        "base", "Address", CONFIG_HEX16, "", 0x02C0, "", { 0 },
-        {
-            { "240H", 0x0240 },
-            { "2C0H", 0x02c0 },
-            { ""             }
+        .name           = "base",
+		.description    = "Address",
+		.type           = CONFIG_HEX16,
+		.default_string = NULL,
+		.default_int    = 0x02C0,
+		.file_filter    = NULL,
+		.spinner        = { 0 },
+        .selection      = {
+            { .description = "240H", .value = 0x0240 },
+            { .description = "2C0H", .value = 0x02c0 },
+            { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
     {
-        "irq", "IRQ", CONFIG_SELECTION, "", -1, "", { 0 },
-        {
-            { "Disabled", -1 },
-            { "IRQ2",      2 },
-            { "IRQ5",      5 },
-            { "IRQ7",      7 },
-            { ""             }
+        .name           = "irq",
+		.description    = "IRQ",
+		.type           = CONFIG_SELECTION,
+		.default_string = NULL,
+		.default_int    = -1,
+		.file_filter    = NULL,
+		.spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled", .value = -1 },
+            { .description = "IRQ2",     .value =  2 },
+            { .description = "IRQ5",     .value =  5 },
+            { .description = "IRQ7",     .value =  7 },
+            { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
-    { "", "", -1 }
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
@@ -643,7 +678,7 @@ static const device_t ev170_device = {
     .init          = isartc_init,
     .close         = isartc_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = ev170_config
@@ -652,14 +687,21 @@ static const device_t ev170_device = {
 static const device_config_t pii147_config[] = {
   // clang-format off
     {
-        "base", "Address", CONFIG_HEX16, "", 0x0240, "", { 0 },
-        {
-            { "Clock 1", 0x0240 },
-            { "Clock 2", 0x0340 },
-            { "" }
+        .name           = "base",
+		.description    = "Address",
+		.type           = CONFIG_HEX16,
+		.default_string = NULL,
+		.default_int    = 0x0240,
+		.file_filter    = NULL,
+		.spinner        = { 0 },
+        .selection      = {
+            { .description = "Clock 1", .value = 0x0240 },
+            { .description = "Clock 2", .value = 0x0340 },
+            { .description = ""                         }
         },
+        .bios           = { { 0 } }
     },
-    { "", "", -1 }
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
@@ -671,7 +713,7 @@ static const device_t pii147_device = {
     .init          = isartc_init,
     .close         = isartc_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = pii147_config
@@ -680,16 +722,23 @@ static const device_t pii147_device = {
 static const device_config_t p5pak_config[] = {
   // clang-format off
     {
-        "irq", "IRQ", CONFIG_SELECTION, "", -1, "", { 0 },
-        {
-            { "Disabled", -1 },
-            { "IRQ2",      2 },
-            { "IRQ3",      3 },
-            { "IRQ5",      5 },
-            { ""             }
+        .name           = "irq",
+		.description    = "IRQ",
+		.type           = CONFIG_SELECTION,
+		.default_string = NULL,
+		.default_int    = -1,
+		.file_filter    = NULL,
+		.spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled", -1 },
+            { .description = "IRQ2",      2 },
+            { .description = "IRQ3",      3 },
+            { .description = "IRQ5",      5 },
+            { .description = ""             }
         },
+        .bios           = { { 0 } }
     },
-    { "", "", -1 }
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
@@ -701,7 +750,7 @@ static const device_t p5pak_device = {
     .init          = isartc_init,
     .close         = isartc_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = p5pak_config
@@ -710,16 +759,23 @@ static const device_t p5pak_device = {
 static const device_config_t a6pak_config[] = {
   // clang-format off
     {
-        "irq", "IRQ", CONFIG_SELECTION, "", -1, "", { 0 },
-        {
-            { "Disabled", -1 },
-            { "IRQ2",      2 },
-            { "IRQ3",      3 },
-            { "IRQ5",      5 },
-            { ""             }
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled", .value = -1 },
+            { .description = "IRQ2",     .value =  2 },
+            { .description = "IRQ3",     .value =  3 },
+            { .description = "IRQ5",     .value =  5 },
+            { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
-    { "", "", -1 }
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
@@ -731,12 +787,135 @@ static const device_t a6pak_device = {
     .init          = isartc_init,
     .close         = isartc_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = a6pak_config
 };
 
+static const device_config_t mplus2_config[] = {
+  // clang-format off
+    {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = "",
+        .default_int    = -1,
+        .file_filter    = "",
+        .spinner        = { 0 },
+        .selection      = {
+            { "Disabled", -1 },
+            { "IRQ2",      2 },
+            { "IRQ3",      3 },
+            { "IRQ5",      5 },
+            { ""             }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
+static const device_t mplus2_device = {
+    .name          = "AST MegaPlus II",
+    .internal_name = "mplus2",
+    .flags         = DEVICE_ISA,
+    .local         = ISARTC_MPLUS2,
+    .init          = isartc_init,
+    .close         = isartc_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = mplus2_config
+};
+
+static const device_config_t mm58167_config[] = {
+  // clang-format off
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x02C0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "240H", .value = 0x0240 },
+            { .description = "2C0H", .value = 0x02c0 },
+            { .description = "340H", .value = 0x0340 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled", .value = -1 },
+            { .description = "IRQ2",     .value =  2 },
+            { .description = "IRQ5",     .value =  5 },
+            { .description = "IRQ7",     .value =  7 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xcc000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled", .value = 0x00000 },
+            { .description = "C800H",    .value = 0xc8000 },
+            { .description = "CA00H",    .value = 0xca000 },
+            { .description = "CC00H",    .value = 0xcc000 },
+            { .description = "CE00H",    .value = 0xce000 },
+            { .description = "D000H",    .value = 0xd0000 },
+            { .description = "D200H",    .value = 0xd2000 },
+            { .description = "D400H",    .value = 0xd4000 },
+            { .description = "D600H",    .value = 0xd6000 },
+            { .description = "D800H",    .value = 0xd8000 },
+            { .description = "DA00H",    .value = 0xda000 },
+            { .description = "DC00H",    .value = 0xdc000 },
+            { .description = "DE00H",    .value = 0xde000 },
+            { .description = "E000H",    .value = 0xe0000 },
+            { .description = "E200H",    .value = 0xe2000 },
+            { .description = "E400H",    .value = 0xe4000 },
+            { .description = "E600H",    .value = 0xe6000 },
+            { .description = "E800H",    .value = 0xe8000 },
+            { .description = "EA00H",    .value = 0xea000 },
+            { .description = "EC00H",    .value = 0xec000 },
+            { .description = "EE00H",    .value = 0xee000 },
+            { .description = ""                           }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
+static const device_t mm58167_device = {
+    .name          = "Generic MM58167 RTC",
+    .internal_name = "rtc_mm58167",
+    .flags         = DEVICE_ISA | DEVICE_SIDECAR,
+    .local         = ISARTC_MM58167,
+    .init          = isartc_init,
+    .close         = isartc_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = mm58167_config
+};
+
 /* Onboard RTC devices */
 const device_t vendex_xt_rtc_onboard_device = {
     .name          = "National Semiconductor MM58167 (Vendex)",
@@ -746,21 +925,7 @@ const device_t vendex_xt_rtc_onboard_device = {
     .init          = isartc_init,
     .close         = isartc_close,
     .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-static const device_t isartc_none_device = {
-    .name          = "None",
-    .internal_name = "none",
-    .flags         = 0,
-    .local         = 0,
-    .init          = NULL,
-    .close         = NULL,
-    .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -770,12 +935,14 @@ static const struct {
     const device_t *dev;
 } boards[] = {
     // clang-format off
-    { &isartc_none_device },
-    { &ev170_device       },
-    { &pii147_device      },
-    { &p5pak_device       },
-    { &a6pak_device       },
-    { NULL                },
+    { &device_none    },
+    { &ev170_device   },
+    { &pii147_device  },
+    { &p5pak_device   },
+    { &a6pak_device   },
+    { &mplus2_device  },
+    { &mm58167_device },
+    { NULL            }
     // clang-format on
 };
 
@@ -796,12 +963,12 @@ isartc_get_internal_name(int board)
 }
 
 int
-isartc_get_from_internal_name(char *s)
+isartc_get_from_internal_name(const char *str)
 {
     int c = 0;
 
     while (boards[c].dev != NULL) {
-        if (!strcmp(boards[c].dev->internal_name, s))
+        if (!strcmp(boards[c].dev->internal_name, str))
             return c;
         c++;
     }
@@ -815,3 +982,12 @@ isartc_get_device(int board)
 {
     return (boards[board].dev);
 }
+
+int
+isartc_has_config(int board)
+{
+    if (boards[board].dev == NULL)
+        return 0;
+
+    return (boards[board].dev->config ? 1 : 0);
+}
diff --git a/src/device/kbc_at.c b/src/device/kbc_at.c
index bc4a1f366..186804e22 100644
--- a/src/device/kbc_at.c
+++ b/src/device/kbc_at.c
@@ -8,13 +8,11 @@
  *
  *          Intel 8042 (AT keyboard controller) emulation.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *          EngiNerd, <webmaster.crrc@yahoo.it>
  *
- *          Copyright 2023 Miran Grca.
- *          Copyright 2023 EngiNerd.
+ *          Copyright 2023-2025 Miran Grca.
+ *          Copyright 2023-2025 EngiNerd.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -29,24 +27,19 @@
 #include <86box/timer.h>
 #include <86box/io.h>
 #include <86box/pic.h>
-#include <86box/pit.h>
 #include <86box/plat_fallthrough.h>
 #include <86box/plat_unused.h>
-#include <86box/ppi.h>
 #include <86box/mem.h>
 #include <86box/device.h>
+#include <86box/dma.h>
 #include <86box/machine.h>
 #include <86box/m_at_t3100e.h>
 #include <86box/fdd.h>
 #include <86box/fdc.h>
-#include <86box/sound.h>
-#include <86box/snd_speaker.h>
+#include <86box/pci.h>
 #include <86box/video.h>
 #include <86box/keyboard.h>
 
-#include <86box/dma.h>
-#include <86box/pci.h>
-
 #define STAT_PARITY        0x80
 #define STAT_RTIMEOUT      0x40
 #define STAT_TTIMEOUT      0x20
@@ -69,27 +62,6 @@
 #define CCB_MASK           0x68
 #define MODE_MASK          0x6c
 
-#define KBC_TYPE_ISA       0x00 /* AT ISA-based chips */
-#define KBC_TYPE_PS2_1     0x01 /* PS2 on PS/2, type 1 */
-#define KBC_TYPE_PS2_2     0x02 /* PS2 on PS/2, type 2 */
-#define KBC_TYPE_GREEN     0x03 /* PS2 green controller */
-#define KBC_TYPE_MASK      0x03
-
-#define KBC_VEN_GENERIC    0x00
-#define KBC_VEN_IBM_PS1    0x04
-#define KBC_VEN_TOSHIBA    0x08
-#define KBC_VEN_OLIVETTI   0x0c
-#define KBC_VEN_AMI        0x10
-#define KBC_VEN_TRIGEM_AMI 0x14
-#define KBC_VEN_QUADTEL    0x18
-#define KBC_VEN_PHOENIX    0x1c
-#define KBC_VEN_ACER       0x20
-#define KBC_VEN_NCR        0x24
-#define KBC_VEN_ALI        0x28
-#define KBC_VEN_SIEMENS    0x2c
-#define KBC_VEN_COMPAQ     0x30
-#define KBC_VEN_MASK       0x7c
-
 #define FLAG_CLOCK         0x01
 #define FLAG_CACHE         0x02
 #define FLAG_PS2           0x04
@@ -133,15 +105,22 @@ typedef struct atkbc_t {
     uint8_t stat_hi;
     uint8_t pending;
     uint8_t irq_state;
-    uint8_t pad;
-    uint8_t pad0;
-    uint8_t pad1;
+    uint8_t do_irq;
+    uint8_t is_asic;
+    uint8_t is_green;
+    uint8_t kblock_switch;
+    uint8_t is_type2;
 
     uint8_t mem[0x100];
 
     /* Internal FIFO for the purpose of commands with multi-byte output. */
     uint8_t key_ctrl_queue[64];
 
+    uint8_t handler_enable[2];
+
+    uint16_t base_addr[2];
+    uint16_t irq[2];
+
     uint32_t flags;
 
     /* Main timers. */
@@ -154,15 +133,26 @@ typedef struct atkbc_t {
     /* Local copies of the pointers to both ports for easier swapping (AMI '5' MegaKey). */
     kbc_at_port_t     *ports[2];
 
-    uint8_t (*write60_ven)(void *priv, uint8_t val);
-    uint8_t (*write64_ven)(void *priv, uint8_t val);
+    struct {
+        uint8_t (*read)(uint16_t port, void *priv);
+        void    (*write)(uint16_t port, uint8_t val, void *priv);
+    } handlers[2];
+
+    uint8_t (*write_cmd_data_ven)(void *priv, uint8_t val);
+    uint8_t (*write_cmd_ven)(void *priv, uint8_t val);
 } atkbc_t;
 
 /* Keyboard controller ports. */
 kbc_at_port_t  *kbc_at_ports[2] = { NULL, NULL };
 
-static uint8_t kbc_ami_revision   = '8';
-static uint8_t kbc_award_revision = 0x42;
+static uint8_t  kbc_ami_revision    = '8';
+static uint8_t  kbc_ami_is_clone    = 0;
+
+static uint8_t  kbc_award_revision  = 0x42;
+
+static uint8_t  kbc_chips_revision  = 0xa6;
+
+static uint16_t kbc_phoenix_version = 0x0416;
 
 static void (*kbc_at_do_poll)(atkbc_t *dev);
 
@@ -202,6 +192,19 @@ static const uint8_t nont_to_t[256] = {
     0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
 };
 
+static const uint8_t multikey_vars[0x0b] = {
+    0x0a,
+    0x03, 0x1e, 0x27, 0x28, 0x29, 0x38, 0x39, 0x18, 0x19, 0x35
+};
+
+static uint8_t fast_reset = 0x00;
+
+void
+kbc_at_set_fast_reset(const uint8_t new_fast_reset)
+{
+    fast_reset = new_fast_reset;
+}
+
 #ifdef ENABLE_KBC_AT_LOG
 int kbc_at_do_log = ENABLE_KBC_AT_LOG;
 
@@ -241,7 +244,7 @@ kbc_translate(atkbc_t *dev, uint8_t val)
 {
     int      xt_mode   = (dev->mem[0x20] & 0x20) && !(dev->misc_flags & FLAG_PS2);
     /* The IBM AT keyboard controller firmware does not apply translation in XT mode. */
-    int      translate = !xt_mode && ((dev->mem[0x20] & 0x40) || ((dev->flags & KBC_TYPE_MASK) == KBC_TYPE_PS2_2));
+    int      translate = !xt_mode && ((dev->mem[0x20] & 0x40) || (dev->is_type2));
     uint8_t  kbc_ven   = dev->flags & KBC_VEN_MASK;
     int      ret       = - 1;
 
@@ -259,9 +262,26 @@ kbc_translate(atkbc_t *dev, uint8_t val)
         return ret;
     }
 
+    kbc_at_log("ATkbc: translate is %s, ", translate ? "on" : "off");
+#ifdef ENABLE_KEYBOARD_AT_LOG
+    kbc_at_log("scan code: ");
+    if (translate) {
+        kbc_at_log("%02X (original: ", (nont_to_t[val] | dev->sc_or));
+        if (dev->sc_or == 0x80)
+            kbc_at_log("F0 ");
+        kbc_at_log("%02X)\n", val);
+    } else
+        kbc_at_log("%02X\n", val);
+#endif
+
+    ret = translate ? (nont_to_t[val] | dev->sc_or) : val;
+
+    if (dev->sc_or == 0x80)
+        dev->sc_or = 0;
+
     /* Test for T3100E 'Fn' key (Right Alt / Right Ctrl) */
     if ((dev != NULL) && (kbc_ven == KBC_VEN_TOSHIBA) &&
-        (keyboard_recv(0x138) || keyboard_recv(0x11d)))  switch (val) {
+        (keyboard_recv(0x138) || keyboard_recv(0x11d)))  switch (ret) {
         case 0x4f:
             t3100e_notify_set(0x01);
             break; /* End */
@@ -311,26 +331,40 @@ kbc_translate(atkbc_t *dev, uint8_t val)
             break;
     }
 
-    kbc_at_log("ATkbc: translate is %s, ", translate ? "on" : "off");
-#ifdef ENABLE_KEYBOARD_AT_LOG
-    kbc_at_log("scan code: ");
-    if (translate) {
-        kbc_at_log("%02X (original: ", (nont_to_t[val] | dev->sc_or));
-        if (dev->sc_or == 0x80)
-            kbc_at_log("F0 ");
-        kbc_at_log("%02X)\n", val);
-    } else
-        kbc_at_log("%02X\n", val);
-#endif
-
-    ret = translate ? (nont_to_t[val] | dev->sc_or) : val;
-
-    if (dev->sc_or == 0x80)
-        dev->sc_or = 0;
-
     return ret;
 }
 
+static void
+kbc_set_do_irq(atkbc_t *dev, uint8_t channel)
+{
+    dev->channel = channel;
+    dev->do_irq  = 1;
+}
+
+static void
+kbc_do_irq(atkbc_t *dev)
+{
+    if (dev->do_irq) {
+        /* WARNING: On PS/2, all IRQ's are level-triggered, but the IBM PS/2 KBC firmware is explicitly
+                    written to pulse its P2 IRQ bits, so they should be kept as as edge-triggered here. */
+        if (dev->irq[0] != 0xffff)
+            picint_common(1 << dev->irq[0], 0, 0, NULL);
+
+        if (dev->irq[1] != 0xffff)
+            picint_common(1 << dev->irq[1], 0, 0, NULL);
+
+        if (dev->channel >= 2) {
+            if (dev->irq[1] != 0xffff)
+                picint_common(1 << dev->irq[1], 0, 1, NULL);
+        } else {
+            if (dev->irq[0] != 0xffff)
+                picint_common(1 << dev->irq[0], 0, 1, NULL);
+        }
+
+        dev->do_irq = 0;
+    }
+}
+
 static void
 kbc_send_to_ob(atkbc_t *dev, uint8_t val, uint8_t channel, uint8_t stat_hi)
 {
@@ -340,7 +374,8 @@ kbc_send_to_ob(atkbc_t *dev, uint8_t val, uint8_t channel, uint8_t stat_hi)
     if (temp == -1)
         return;
 
-    if ((kbc_ven == KBC_VEN_AMI) || (kbc_ven == KBC_VEN_TRIGEM_AMI) ||
+    if ((kbc_ven == KBC_VEN_AMI) || (kbc_ven == KBC_VEN_AMI_TRIGEM) ||
+        (kbc_ven == KBC_VEN_HOLTEK) || (kbc_ven == KBC_VEN_UMC) ||
         (dev->misc_flags & FLAG_PS2))
         stat_hi |= ((dev->p1 & 0x80) ? 0x10 : 0x00);
     else
@@ -349,6 +384,8 @@ kbc_send_to_ob(atkbc_t *dev, uint8_t val, uint8_t channel, uint8_t stat_hi)
     kbc_at_log("ATkbc: Sending %02X to the output buffer on channel %i...\n", temp, channel);
     dev->status = (dev->status & ~0xf0) | STAT_OFULL | stat_hi;
 
+    dev->do_irq = 0;
+
     /* WARNING: On PS/2, all IRQ's are level-triggered, but the IBM PS/2 KBC firmware is explicitly
                 written to pulse its P2 IRQ bits, so they should be kept as as edge-triggered here. */
     if (dev->misc_flags & FLAG_PS2) {
@@ -356,15 +393,15 @@ kbc_send_to_ob(atkbc_t *dev, uint8_t val, uint8_t channel, uint8_t stat_hi)
             dev->status |= STAT_MFULL;
 
             if (dev->mem[0x20] & 0x02)
-                picint_common(1 << 12, 0, 1, NULL);
-            picint_common(1 << 1, 0, 0, NULL);
-        } else {
-            if (dev->mem[0x20] & 0x01)
-                picint_common(1 << 1, 0, 1, NULL);
-            picint_common(1 << 12, 0, 0, NULL);
-        }
+                kbc_set_do_irq(dev, channel);
+        } else if (dev->mem[0x20] & 0x01)
+            kbc_set_do_irq(dev, channel);
     } else if (dev->mem[0x20] & 0x01)
-        picintlevel(1 << 1, &dev->irq_state); /* AT KBC: IRQ 1 is level-triggered because it is tied to OBF. */
+        /* AT KBC: IRQ 1 is level-triggered because it is tied to OBF. */
+        if (dev->irq[0] != 0xffff)
+            picintlevel(1 << dev->irq[0], &dev->irq_state);
+
+    kbc_do_irq(dev);
 
     dev->ob = temp;
 }
@@ -377,6 +414,14 @@ kbc_delay_to_ob(atkbc_t *dev, uint8_t val, uint8_t channel, uint8_t stat_hi)
     dev->stat_hi = stat_hi;
     dev->pending = 1;
     dev->state = STATE_KBC_DELAY_OUT;
+
+    if (dev->is_asic && (channel == 0) && (dev->status & STAT_OFULL)) {
+        /* Expedite the sending to the output buffer to prevent the wrong
+           data from being accidentally read. */
+        kbc_send_to_ob(dev, dev->val, dev->channel, dev->stat_hi);
+        dev->state = STATE_MAIN_IBF;
+        dev->pending = 0;
+    }
 }
 
 static void kbc_at_process_cmd(void *priv);
@@ -456,9 +501,6 @@ kbc_scan_kbd_at(atkbc_t *dev)
     }
 }
 
-static void
-write_p2(atkbc_t *dev, uint8_t val);
-
 static void
 kbc_at_poll_at(atkbc_t *dev)
 {
@@ -584,6 +626,8 @@ kbc_scan_aux_ps2(atkbc_t *dev)
 static void
 kbc_at_poll_ps2(atkbc_t *dev)
 {
+    kbc_do_irq(dev);
+
     switch (dev->state) {
         case STATE_RESET:
             if (dev->status & STAT_IFULL) {
@@ -598,7 +642,6 @@ kbc_at_poll_ps2(atkbc_t *dev)
             fallthrough;
         case STATE_MAIN_IBF:
         default:
-ps2_main_ibf:
             if (dev->status & STAT_IFULL)
                 kbc_ibf_process(dev);
             else if (!(dev->status & STAT_OFULL)) {
@@ -649,7 +692,8 @@ ps2_main_ibf:
 #endif
             dev->state = STATE_MAIN_IBF;
             dev->pending = 0;
-            goto ps2_main_ibf;
+            // goto ps2_main_ibf;
+            break;
         case STATE_KBC_OUT:
             /* Keyboard controller command want to output multiple bytes. */
             if (dev->status & STAT_IFULL) {
@@ -723,6 +767,7 @@ static void
 write_p2(atkbc_t *dev, uint8_t val)
 {
     uint8_t old = dev->p2;
+
     kbc_at_log("ATkbc: write P2: %02X (old: %02X)\n", val, dev->p2);
 
     uint8_t kbc_ven = dev->flags & KBC_VEN_MASK;
@@ -731,10 +776,12 @@ write_p2(atkbc_t *dev, uint8_t val)
     /* PS/2: Handle IRQ's. */
     if (dev->misc_flags & FLAG_PS2) {
         /* IRQ 12 */
-        picint_common(1 << 12, 0, val & 0x20, NULL);
+        if (dev->irq[1] != 0xffff)
+            picint_common(1 << dev->irq[1], 0, val & 0x20, NULL);
 
         /* IRQ 1 */
-        picint_common(1 << 1, 0, val & 0x10, NULL);
+        if (dev->irq[0] != 0xffff)
+            picint_common(1 << dev->irq[0], 0, val & 0x10, NULL);
     }
 #endif
 
@@ -748,40 +795,37 @@ write_p2(atkbc_t *dev, uint8_t val)
     /* AT, PS/2: Handle reset. */
     /* 0 holds the CPU in the RESET state, 1 releases it. To simplify this,
        we just do everything on release. */
-    if (!cpu_cpurst_on_sr && ((old ^ val) & 0x01)) { /*Reset*/
+    /* TODO: The fast reset flag's condition should be reversed - the BCM SQ-588
+             enables the flag and the CPURST on soft reset flag but expects this
+             to still soft reset instead. */
+    if ((fast_reset || !cpu_cpurst_on_sr) && ((old ^ val) & 0x01)) { /*Reset*/
         if (!(val & 0x01)) {  /* Pin 0 selected. */
             /* Pin 0 selected. */
             kbc_at_log("write_p2(): Pulse reset!\n");
-            if (machines[machine].flags & MACHINE_COREBOOT) {
-                /* The SeaBIOS hard reset code attempts a KBC reset if ACPI RESET_REG
-                   is not available. However, the KBC reset is normally a soft reset, so
-                   SeaBIOS gets caught in a soft reset loop as it tries to hard reset the
-                   machine. Hack around this by making the KBC reset a hard reset only on
-                   coreboot machines. */
-                pc_reset_hard();
-            } else {
-                softresetx86(); /* Pulse reset! */
-                cpu_set_edx();
-                flushmmucache();
-                if (kbc_ven == KBC_VEN_ALI)
-                    smbase = 0x00030000;
-                /* Yes, this is a hack, but until someone gets ahold of the real PCD-2L
-                   and can find out what they actually did to make it boot from FFFFF0
-                   correctly despite A20 being gated when the CPU is reset, this will
-                   have to do. */
-                else if (kbc_ven == KBC_VEN_SIEMENS)
-                    is486 ? loadcs(0xf000) : loadcs_2386(0xf000);
-            }
+            softresetx86(); /* Pulse reset! */
+            cpu_set_edx();
+            flushmmucache();
+            if ((kbc_ven == KBC_VEN_ALI) ||
+                !strcmp(machine_get_internal_name(), "spc7700plw") ||
+                !strcmp(machine_get_internal_name(), "pl4600c"))
+                smbase = 0x00030000;
+
+            /* Yes, this is a hack, but until someone gets ahold of the real PCD-2L
+               and can find out what they actually did to make it boot from FFFFF0
+               correctly despite A20 being gated when the CPU is reset, this will
+               have to do. */
+            if ((kbc_ven == KBC_VEN_SIEMENS) || !strcmp(machine_get_internal_name(), "acera1g"))
+                is486 ? loadcs(0xf000) : loadcs_2386(0xf000);
         }
     }
 
     /* Do this here to avoid an infinite reset loop. */
     dev->p2 = val;
 
-    if (cpu_cpurst_on_sr && ((old ^ val) & 0x01)) { /*Reset*/
+    if (!fast_reset && cpu_cpurst_on_sr && ((old ^ val) & 0x01)) { /*Reset*/
         if (!(val & 0x01)) {  /* Pin 0 selected. */
             /* Pin 0 selected. */
-            pclog("write_p2(): Pulse reset!\n");
+            kbc_at_log("write_p2(): Pulse reset!\n");
             dma_reset();
             dma_set_at(1);
 
@@ -801,6 +845,25 @@ write_p2(atkbc_t *dev, uint8_t val)
     }
 }
 
+uint8_t
+kbc_at_read_p(void *priv, uint8_t port, uint8_t mask)
+{
+    atkbc_t *dev = (atkbc_t *) priv;
+    uint8_t *p   = (port == 2) ? &dev->p2 : &dev->p1;
+    uint8_t  ret = *p & mask;
+
+    return ret;
+}
+
+void
+kbc_at_write_p(void *priv, uint8_t port, uint8_t mask, uint8_t val)
+{
+    atkbc_t *dev = (atkbc_t *) priv;
+    uint8_t *p   = (port == 2) ? &dev->p2 : &dev->p1;
+
+    *p = (*p & mask) | val;
+}
+
 static void
 write_p2_fast_a20(atkbc_t *dev, uint8_t val)
 {
@@ -824,7 +887,7 @@ write_cmd(atkbc_t *dev, uint8_t val)
     kbc_at_log("ATkbc: write command byte: %02X (old: %02X)\n", val, dev->mem[0x20]);
 
     /* PS/2 type 2 keyboard controllers always force the XLAT bit to 0. */
-    if ((dev->flags & KBC_TYPE_MASK) == KBC_TYPE_PS2_2) {
+    if (dev->is_type2) {
         val &= ~CCB_TRANSLATE;
         dev->mem[0x20] &= ~CCB_TRANSLATE;
     } else if (!(dev->misc_flags & FLAG_PS2)) {
@@ -865,220 +928,27 @@ pulse_poll(void *priv)
 }
 
 static uint8_t
-write64_generic(void *priv, uint8_t val)
+write_cmd_acer(void *priv, uint8_t val)
 {
     atkbc_t *dev = (atkbc_t *) priv;
-    uint8_t  current_drive;
-    uint8_t  fixed_bits;
-    uint8_t  kbc_ven = 0x0;
-    kbc_ven          = dev->flags & KBC_VEN_MASK;
+    uint8_t  ret     = 1;
 
     switch (val) {
-        case 0xa4: /* check if password installed */
-            if (dev->misc_flags & FLAG_PS2) {
-                kbc_at_log("ATkbc: check if password installed\n");
-                kbc_delay_to_ob(dev, 0xf1, 0, 0x00);
-                return 0;
-            }
-            break;
-
-        case 0xa5: /* load security */
-            kbc_at_log("ATkbc: load security\n");
-            dev->wantdata = 1;
-            dev->state = STATE_KBC_PARAM;
-            return 0;
-
-        case 0xa7: /* disable auxiliary port */
-            if (dev->misc_flags & FLAG_PS2) {
-                kbc_at_log("ATkbc: disable auxiliary port\n");
-                set_enable_aux(dev, 0);
-                return 0;
-            }
-            break;
-
-        case 0xa8: /* Enable auxiliary port */
-            if (dev->misc_flags & FLAG_PS2) {
-                kbc_at_log("ATkbc: enable auxiliary port\n");
-                set_enable_aux(dev, 1);
-                return 0;
-            }
-            break;
-
-        case 0xa9: /* Test auxiliary port */
-            kbc_at_log("ATkbc: test auxiliary port\n");
-            if (dev->misc_flags & FLAG_PS2) {
-                kbc_delay_to_ob(dev, 0x00, 0, 0x00); /* no error, this is testing the channel 2 interface */
-                return 0;
-            }
-            break;
-
-        /* TODO: Make this command do nothing on the Regional HT6542,
-                 or else, Efflixi's Award OPTi 495 BIOS gets a stuck key
-                 in Norton Commander 3.0. */
-        case 0xaf: /* read keyboard version */
-            kbc_at_log("ATkbc: read keyboard version\n");
-            kbc_delay_to_ob(dev, kbc_award_revision, 0, 0x00);
-            return 0;
-
-        /*
-                                                                                P1 bits: 76543210
-                                                                                -----------------
-           IBM PS/1:                                                                     xxxxxxxx
-           IBM PS/2 MCA:                                                                 xxxxx1xx
-           Intel AMI Pentium BIOS'es with AMI MegaKey KB-5 keyboard controller:          x1x1xxxx
-           Acer:                                                                         xxxxx0xx
-           Packard Bell PB450:                                                           xxxxx1xx
-           P6RP4:                                                                        xx1xx1xx
-           Epson Action Tower 2600:                                                      xxxx01xx
-           TriGem Hawk:                                                                  xxxx11xx
-
-           Machine input based on current code:                                          11111111
-           Everything non-Green:    Pull down bit 7 if not PS/2 and keyboard is inhibited.
-                                    Pull down bit 6 if primary display is CGA.
-           Xi8088:                  Pull down bit 6 if primary display is MDA.
-           Acer:                    Pull down bit 6 if primary display is MDA.
-                                    Pull down bit 2 always (must be so to enable CMOS Setup).
-           IBM PS/1:                Pull down bit 6 if current floppy drive is 3.5".
-           Epson Action Tower 2600: Pull down bit 3 always (for Epson logo).
-           NCR:                     Pull down bit 5 always (power-on default speed = high).
-                                    Pull down bit 3 if there is no FPU.
-                                    Pull down bits 1 and 0 always?
-           Compaq:                  Pull down bit 6 if Compaq dual-scan display is in use.
-                                    Pull down bit 5 if system board DIP switch is ON.
-                                    Pull down bit 4 if CPU speed selected is auto.
-                                    Pull down bit 3 if CPU speed selected is slow (4 MHz).
-                                    Pull down bit 2 if FPU is present.
-                                    Pull down bits 1 and 0 always?
-
-           Bit 7: AT KBC only - keyboard inhibited (often physical lock): 0 = yes, 1 = no (also Compaq);
-           Bit 6: Mostly, display: 0 = CGA, 1 = MDA, inverted on Xi8088 and Acer KBC's;
-                  Intel AMI MegaKey KB-5: Used for green features, SMM handler expects it to be set;
-                  IBM PS/1 Model 2011: 0 = current FDD is 3.5", 1 = current FDD is 5.25";
-                  Compaq: 0 = Compaq dual-scan display, 1 = non-Compaq display.
-           Bit 5: Mostly, manufacturing jumper: 0 = installed (infinite loop at POST), 1 = not installed;
-                  NCR: power-on default speed: 0 = high, 1 = low;
-                  Compaq: System board DIP switch 5: 0 = ON, 1 = OFF.
-           Bit 4: (Which board?): RAM on motherboard: 0 = 512 kB, 1 = 256 kB;
-                  NCR: RAM on motherboard: 0 = unsupported, 1 = 512 kB;
-                  Intel AMI MegaKey KB-5: Must be 1;
-                  IBM PS/1: Ignored;
-                  Compaq: 0 = Auto speed selected, 1 = High speed selected.
-           Bit 3: TriGem AMIKey: most significant bit of 2-bit OEM ID;
-                  NCR: Coprocessor detect (1 = yes, 0 = no);
-                  Compaq: 0 = Slow (4 MHz), 1 = Fast (8 MHz);
-                  Sometimes configured for clock switching;
-           Bit 2: TriGem AMIKey: least significant bit of 2-bit OEM ID;
-                  Bit 3, 2:
-                      1, 1: TriGem logo;
-                      1, 0: Garbled logo;
-                      0, 1: Epson logo;
-                      0, 0: Generic AMI logo.
-                  NCR: Unused;
-                  IBM PS/2: Keyboard power: 0 = no power (fuse error), 1 = OK
-                  (for some reason, www.win.tue.nl has this in reverse);
-                  Compaq: FPU: 0 = 80287, 1 = none;
-                  Sometimes configured for clock switching;
-           Bit 1: PS/2: Auxiliary device data in;
-                  Compaq: Reserved;
-                  NCR: High/auto speed.
-           Bit 0: PS/2: Keyboard device data in;
-                  Compaq: Reserved;
-                  NCR: DMA mode.
-         */
-        case 0xc0: /* read P1 */
-            kbc_at_log("ATkbc: read P1\n");
-            fixed_bits = 4;
-            /* The SMM handlers of Intel AMI Pentium BIOS'es expect bit 6 to be set. */
-            if ((kbc_ven == KBC_VEN_AMI) && ((dev->flags & KBC_TYPE_MASK) == KBC_TYPE_GREEN))
-                fixed_bits |= 0x40;
-            if (kbc_ven == KBC_VEN_IBM_PS1) {
-                current_drive = fdc_get_current_drive();
-                /* (B0 or F0) | (fdd_is_525(current_drive) on bit 6) */
-                kbc_delay_to_ob(dev, dev->p1 | fixed_bits | (fdd_is_525(current_drive) ? 0x40 : 0x00),
-                                0, 0x00);
-            } else if (kbc_ven == KBC_VEN_NCR) {
-                /* switch settings
-                 * bit 7: keyboard disable
-                 * bit 6: display type (0 color, 1 mono)
-                 * bit 5: power-on default speed (0 high, 1 low)
-                 * bit 4: sense RAM size (0 unsupported, 1 512k on system board)
-                 * bit 3: coprocessor detect
-                 * bit 2: unused
-                 * bit 1: high/auto speed
-                 * bit 0: dma mode
-                 */
-                /* (B0 or F0) | 0x04 | (display on bit 6) | (fpu on bit 3) */
-                kbc_delay_to_ob(dev, (dev->p1 | fixed_bits | (video_is_mda() ? 0x40 : 0x00) | (hasfpu ? 0x08 : 0x00)) & 0xdf,
-                                0, 0x00);
-            } else if (kbc_ven == KBC_VEN_TRIGEM_AMI) {
-                /* Bit 3, 2:
-                       1, 1: TriGem logo;
-                       1, 0: Garbled logo;
-                       0, 1: Epson logo;
-                       0, 0: Generic AMI logo. */
-                if (dev->misc_flags & FLAG_PCI)
-                    fixed_bits |= 8;
-                /* (B0 or F0) | (0x04 or 0x0c) */
-                kbc_delay_to_ob(dev, dev->p1 | fixed_bits, 0, 0x00);
-            } else if (((dev->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1) && ((dev->flags & KBC_TYPE_MASK) < KBC_TYPE_GREEN))
-                /* (B0 or F0) | (0x08 or 0x0c) */
-                kbc_delay_to_ob(dev, ((dev->p1 | fixed_bits) & 0xf0) | (((dev->flags & KBC_VEN_MASK) == KBC_VEN_ACER) ? 0x08 : 0x0c), 0, 0x00);
-            else if (kbc_ven == KBC_VEN_COMPAQ)
-                kbc_delay_to_ob(dev, dev->p1 | (hasfpu ? 0x00 : 0x04), 0, 0x00);
-            else
-                /* (B0 or F0) | (0x04 or 0x44) */
-                kbc_delay_to_ob(dev, dev->p1 | fixed_bits, 0, 0x00);
-            dev->p1 = ((dev->p1 + 1) & 3) | (dev->p1 & 0xfc);
-            return 0;
-
-        case 0xc1: /*Copy bits 0 to 3 of P1 to status bits 4 to 7*/
-            if (dev->misc_flags & FLAG_PS2) {
-                kbc_at_log("ATkbc: copy bits 0 to 3 of P1 to status bits 4 to 7\n");
-                dev->status &= 0x0f;
-                dev->status |= (dev->p1 << 4);
-                return 0;
-            }
-            break;
-
-        case 0xc2: /*Copy bits 4 to 7 of P1 to status bits 4 to 7*/
-            if (dev->misc_flags & FLAG_PS2) {
-                kbc_at_log("ATkbc: copy bits 4 to 7 of P1 to status bits 4 to 7\n");
-                dev->status &= 0x0f;
-                dev->status |= (dev->p1 & 0xf0);
-                return 0;
-            }
-            break;
-
-        case 0xd3: /* write auxiliary output buffer */
-            if (dev->misc_flags & FLAG_PS2) {
-                kbc_at_log("ATkbc: write auxiliary output buffer\n");
-                dev->wantdata = 1;
-                dev->state = STATE_KBC_PARAM;
-                return 0;
-            }
-            break;
-
-        case 0xd4: /* write to auxiliary port */
-            kbc_at_log("ATkbc: write to auxiliary port\n");
-            dev->wantdata = 1;
-            dev->state = STATE_KBC_PARAM;
-            return 0;
-
-        case 0xf0 ... 0xff:
-            kbc_at_log("ATkbc: pulse %01X\n", val & 0x0f);
-            pulse_output(dev, val & 0x0f);
-            return 0;
-
         default:
             break;
+
+        case 0xaf:
+            kbc_at_log("ATkbc: ??? - appears in the probes of the real controller\n");
+            kbc_delay_to_ob(dev, 0x00, 0, 0x00);
+            ret = 0;
+            break;
     }
 
-    kbc_at_log("ATkbc: bad command %02X\n", val);
-    return 1;
+    return ret;
 }
 
 static uint8_t
-write60_ami(void *priv, uint8_t val)
+write_cmd_data_ami(void *priv, uint8_t val)
 {
     atkbc_t *dev = (atkbc_t *) priv;
 
@@ -1105,7 +975,7 @@ write60_ami(void *priv, uint8_t val)
             return 0;
 
         case 0xc1:
-            kbc_at_log("ATkbc: AMI MegaKey - write %02X to P1\n", val);
+            kbc_at_log("ATkbc: AMI - write %02X to P1\n", val);
             dev->p1 = val;
             return 0;
 
@@ -1130,40 +1000,104 @@ write60_ami(void *priv, uint8_t val)
     return 1;
 }
 
+void
+kbc_at_set_ps2(void *priv, const uint8_t ps2)
+{
+    atkbc_t *dev = (atkbc_t *) priv;
+
+    dev->ami_flags = (dev->ami_flags & 0xfe) | (!!ps2);
+    dev->misc_flags &= ~FLAG_PS2;
+    if (ps2) {
+        dev->misc_flags |= FLAG_PS2;
+        kbc_at_do_poll = kbc_at_poll_ps2;
+    } else
+        kbc_at_do_poll = kbc_at_poll_at;
+
+    write_cmd(dev, ~dev->mem[0x20]);
+    write_cmd(dev, dev->mem[0x20]);
+}
+
 static uint8_t
-write64_ami(void *priv, uint8_t val)
+write_cmd_ami(void *priv, uint8_t val)
 {
     atkbc_t *dev     = (atkbc_t *) priv;
     uint8_t  kbc_ven = dev->flags & KBC_VEN_MASK;
+    uint8_t  ret     = 1;
+    char    *copr    = NULL;
+    int      coprlen = 0;
 
     switch (val) {
+        default:
+            break;
+
         case 0x00 ... 0x1f:
             kbc_at_log("ATkbc: AMI - alias read from %08X\n", val);
             kbc_delay_to_ob(dev, dev->mem[val + 0x20], 0, 0x00);
-            return 0;
+            ret = 0;
+            break;
 
         case 0x40 ... 0x5f:
             kbc_at_log("ATkbc: AMI - alias write to %08X\n", dev->command);
             dev->wantdata = 1;
             dev->state    = STATE_KBC_PARAM;
-            return 0;
+            ret = 0;
+            break;
 
         case 0xa0: /* copyright message */
-            kbc_at_queue_add(dev, 0x28);
-            kbc_at_queue_add(dev, 0x00);
-            return 0;
+            switch (kbc_ami_revision) {
+                case 0x35:
+                    copr    = "(C)1994 AMI";
+                    coprlen = strlen(copr) + 1;
+                    break;
+                case 0x38:
+                case 0x42: case 0x44:
+                case 0x45:
+                    copr    = "(C) AMERICAN MEGATRENDS INC.";
+                    coprlen = strlen(copr);    /* No trailing zero. */
+                    break;
+                case 0x46:
+                    copr    = "(C)1990 AMERICAN MEGATRENDS INC";
+                    coprlen = strlen(copr) + 1;
+                    break;
+                case 0x48:
+                    copr    = "(C)1992 AMERICAN MEGATRENDS INC";
+                    coprlen = strlen(copr) + 1;
+                    break;
+                case 0x50: case 0x52:
+                    copr    = "(C)1993 AMI";
+                    coprlen = strlen(copr) + 1;
+                    break;
+                case 0x5a:
+                    if (dev->is_green)
+                        /*
+                                      (   C   )   1   9   9   0       A   M   I
+                           But TriGem forgot to reencrypt it.
+                                                                                */
+                        copr    = "\xFA\x97\xDA\xD9\xD8\xD8\xF9\xFB\xD7\x56\xD6";
+                    else
+                        copr    = "(C)1990 AMERICAN MEGATRENDS INC";
+                    coprlen = strlen(copr) + 1;
+                    break;
+            }
+
+            for (int i = 0; i < coprlen; i++)
+                kbc_at_queue_add(dev, copr[i]);
+
+            ret = 0;
+            break;
 
         case 0xa1: /* get controller version */
             kbc_at_log("ATkbc: AMI - get controller version\n");
             kbc_delay_to_ob(dev, kbc_ami_revision, 0, 0x00);
-            return 0;
+            ret = 0;
+            break;
 
         case 0xa2: /* clear keyboard controller lines P22/P23 */
             if (!(dev->misc_flags & FLAG_PS2)) {
                 kbc_at_log("ATkbc: AMI - clear KBC lines P22 and P23\n");
                 write_p2(dev, dev->p2 & 0xf3);
                 kbc_delay_to_ob(dev, 0x00, 0, 0x00);
-                return 0;
+                ret = 0;
             }
             break;
 
@@ -1172,7 +1106,7 @@ write64_ami(void *priv, uint8_t val)
                 kbc_at_log("ATkbc: AMI - set KBC lines P22 and P23\n");
                 write_p2(dev, dev->p2 | 0x0c);
                 kbc_delay_to_ob(dev, 0x00, 0, 0x00);
-                return 0;
+                ret = 0;
             }
             break;
 
@@ -1180,7 +1114,7 @@ write64_ami(void *priv, uint8_t val)
             if (!(dev->misc_flags & FLAG_PS2)) {
                 kbc_at_log("ATkbc: AMI - write clock = low\n");
                 dev->misc_flags &= ~FLAG_CLOCK;
-                return 0;
+                ret = 0;
             }
             break;
 
@@ -1188,14 +1122,15 @@ write64_ami(void *priv, uint8_t val)
             if (!(dev->misc_flags & FLAG_PS2)) {
                 kbc_at_log("ATkbc: AMI - write clock = high\n");
                 dev->misc_flags |= FLAG_CLOCK;
-                return 0;
+                ret = 0;
             }
+            break;
 
         case 0xa6: /* read clock */
             if (!(dev->misc_flags & FLAG_PS2)) {
                 kbc_at_log("ATkbc: AMI - read clock\n");
                 kbc_delay_to_ob(dev, (dev->misc_flags & FLAG_CLOCK) ? 0xff : 0x00, 0, 0x00);
-                return 0;
+                ret = 0;
             }
             break;
 
@@ -1203,7 +1138,7 @@ write64_ami(void *priv, uint8_t val)
             if (!(dev->misc_flags & FLAG_PS2)) {
                 kbc_at_log("ATkbc: AMI - write cache bad\n");
                 dev->misc_flags &= FLAG_CACHE;
-                return 0;
+                ret = 0;
             }
             break;
 
@@ -1211,7 +1146,7 @@ write64_ami(void *priv, uint8_t val)
             if (!(dev->misc_flags & FLAG_PS2)) {
                 kbc_at_log("ATkbc: AMI - write cache good\n");
                 dev->misc_flags |= FLAG_CACHE;
-                return 0;
+                ret = 0;
             }
             break;
 
@@ -1219,17 +1154,20 @@ write64_ami(void *priv, uint8_t val)
             if (!(dev->misc_flags & FLAG_PS2)) {
                 kbc_at_log("ATkbc: AMI - read cache\n");
                 kbc_delay_to_ob(dev, (dev->misc_flags & FLAG_CACHE) ? 0xff : 0x00, 0, 0x00);
-                return 0;
+                ret = 0;
             }
             break;
 
         case 0xaf: /* set extended controller RAM */
             if ((kbc_ven != KBC_VEN_SIEMENS) && (kbc_ven != KBC_VEN_ALI)) {
-                kbc_at_log("ATkbc: set extended controller RAM\n");
-                dev->wantdata      = 1;
-                dev->state         = STATE_KBC_PARAM;
-                dev->command_phase = 1;
-                return 0;
+                if (((kbc_ami_revision >= 'H') && (kbc_ami_revision < 'X')) ||
+                    (kbc_ami_revision = '5')) {
+                    kbc_at_log("ATkbc: set extended controller RAM\n");
+                    dev->wantdata      = 1;
+                    dev->state         = STATE_KBC_PARAM;
+                    dev->command_phase = 1;
+                    ret = 0;
+                }
             }
             break;
 
@@ -1240,7 +1178,8 @@ write64_ami(void *priv, uint8_t val)
                 dev->p1 &= ~(1 << (val & 0x03));
             kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
             dev->pending++;
-            return 0;
+            ret = 0;
+            break;
 
         /* TODO: The ICS SB486PV sends command B4 but expects to read *TWO* bytes. */
         case 0xb4: case 0xb5:
@@ -1248,9 +1187,13 @@ write64_ami(void *priv, uint8_t val)
             kbc_at_log("ATkbc: set KBC lines P22-P23 (P2 bits 2-3) low\n");
             if (!(dev->flags & DEVICE_PCI))
                 write_p2(dev, dev->p2 & ~(4 << (val & 0x01)));
-            kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
+            if (strstr(machine_get_internal_name(), "sb486pv") != NULL)
+                kbc_delay_to_ob(dev, 0x03, 0, 0x00);
+            else
+                kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
             dev->pending++;
-            return 0;
+            ret = 0;
+            break;
 
         case 0xb8 ... 0xbb:
             /* set KBC lines P10-P13 (P1 bits 0-3) high */
@@ -1260,7 +1203,8 @@ write64_ami(void *priv, uint8_t val)
                 kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
                 dev->pending++;
             }
-            return 0;
+            ret = 0;
+            break;
 
         case 0xbc: case 0xbd:
             /* set KBC lines P22-P23 (P2 bits 2-3) high */
@@ -1269,28 +1213,38 @@ write64_ami(void *priv, uint8_t val)
                 write_p2(dev, dev->p2 | (4 << (val & 0x01)));
             kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
             dev->pending++;
-            return 0;
+            ret = 0;
+            break;
 
         case 0xc1: /* write P1 */
-            kbc_at_log("ATkbc: AMI MegaKey - write P1\n");
+            kbc_at_log("ATkbc: AMI - write P1\n");
             dev->wantdata  = 1;
             dev->state     = STATE_KBC_PARAM;
-            return 0;
+            ret = 0;
+            break;
 
         case 0xc4:
-            /* set KBC line P14 low */
-            kbc_at_log("ATkbc: set KBC line P14 (P1 bit 4) low\n");
-            dev->p1 &= 0xef;
-            kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
-            dev->pending++;
-            return 0;
+            if (((kbc_ami_revision >= 'P') && (kbc_ami_revision < 'X')) ||
+                (kbc_ami_revision = '5')) {
+                /* set KBC line P14 low */
+                kbc_at_log("ATkbc: set KBC line P14 (P1 bit 4) low\n");
+                dev->p1 &= 0xef;
+                kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
+                dev->pending++;
+                ret = 0;
+            }
+            break;
         case 0xc5:
-            /* set KBC line P15 low */
-            kbc_at_log("ATkbc: set KBC line P15 (P1 bit 5) low\n");
-            dev->p1 &= 0xdf;
-            kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
-            dev->pending++;
-            return 0;
+            if (((kbc_ami_revision >= 'P') && (kbc_ami_revision < 'X')) ||
+                (kbc_ami_revision = '5')) {
+                /* set KBC line P15 low */
+                kbc_at_log("ATkbc: set KBC line P15 (P1 bit 5) low\n");
+                dev->p1 &= 0xdf;
+                kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
+                dev->pending++;
+                ret = 0;
+            }
+            break;
 
         case 0xc8:
             /*
@@ -1299,7 +1253,8 @@ write64_ami(void *priv, uint8_t val)
              */
             kbc_at_log("ATkbc: AMI - unblock KBC lines P22 and P23\n");
             dev->ami_flags &= 0xfb;
-            return 0;
+            ret = 0;
+            break;
 
         case 0xc9:
             /*
@@ -1308,75 +1263,80 @@ write64_ami(void *priv, uint8_t val)
              */
             kbc_at_log("ATkbc: AMI - block KBC lines P22 and P23\n");
             dev->ami_flags |= 0x04;
-            return 0;
+            ret = 0;
+            break;
+
+        case 0xca: /* read keyboard mode */
+            kbc_at_log("ATkbc: AMI - read keyboard mode\n");
+            kbc_delay_to_ob(dev, dev->ami_flags, 0, 0x00);
+            ret = 0;
+            break;
+
+        case 0xcb: /* set keyboard mode */
+            kbc_at_log("ATkbc: AMI - set keyboard mode\n");
+            dev->wantdata  = 1;
+            dev->state     = STATE_KBC_PARAM;
+            ret = 0;
+            break;
 
         case 0xcc:
-            /* set KBC line P14 high */
-            kbc_at_log("ATkbc: set KBC line P14 (P1 bit 4) high\n");
-            dev->p1 |= 0x10;
-            kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
-            dev->pending++;
-            return 0;
+            if (((kbc_ami_revision >= 'P') && (kbc_ami_revision < 'X')) ||
+                (kbc_ami_revision = '5')) {
+                /* set KBC line P14 high */
+                kbc_at_log("ATkbc: set KBC line P14 (P1 bit 4) high\n");
+                dev->p1 |= 0x10;
+                kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
+                dev->pending++;
+                ret = 0;
+            }
+            break;
         case 0xcd:
             /* set KBC line P15 high */
-            kbc_at_log("ATkbc: set KBC line P15 (P1 bit 5) high\n");
-            dev->p1 |= 0x20;
-            kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
-            dev->pending++;
-            return 0;
+            if (((kbc_ami_revision >= 'P') && (kbc_ami_revision < 'X')) ||
+                (kbc_ami_revision = '5')) {
+                kbc_at_log("ATkbc: set KBC line P15 (P1 bit 5) high\n");
+                dev->p1 |= 0x20;
+                kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
+                dev->pending++;
+                ret = 0;
+            }
+            break;
 
         case 0xef: /* ??? - sent by AMI486 */
             kbc_at_log("ATkbc: ??? - sent by AMI486\n");
-            return 0;
-
-        default:
+            ret = 0;
             break;
     }
 
-    return write64_generic(dev, val);
+    return ret;
 }
 
 static uint8_t
-write64_siemens(void *priv, uint8_t val)
+write_cmd_data_sis(void *priv, uint8_t val)
 {
-    atkbc_t *dev     = (atkbc_t *) priv;
-
-    switch (val) {
-        case 0x92: /*Siemens Award - 92 sent by PCD-2L BIOS*/
-            kbc_at_log("Siemens Award - 92 sent by PCD-2L BIOS\n");
-            return 0;
-
-        case 0x94: /*Siemens Award - 94 sent by PCD-2L BIOS*/
-            kbc_at_log("Siemens Award - 94 sent by PCD-2L BIOS\n");
-            return 0;
-
-        case 0x9a: /*Siemens Award - 9A sent by PCD-2L BIOS*/
-            kbc_at_log("Siemens Award - 9A sent by PCD-2L BIOS\n");
-            return 0;
-
-        case 0x9c: /*Siemens Award - 9C sent by PCD-2L BIOS*/
-            kbc_at_log("Siemens Award - 9C sent by PCD-2L BIOS\n");
-            return 0;
-
-        case 0xa9: /*Siemens Award - A9 sent by PCD-2L BIOS*/
-            kbc_at_log("Siemens Award - A9 sent by PCD-2L BIOS\n");
-            return 0;
-
-        default:
-            break;
-    }
-
-    return write64_ami(dev, val);
-}
-
-static uint8_t
-write60_quadtel(void *priv, UNUSED(uint8_t val))
-{
-    const atkbc_t *dev = (atkbc_t *) priv;
+    atkbc_t *dev = (atkbc_t *) priv;
 
     switch (dev->command) {
-        case 0xcf: /*??? - sent by MegaPC BIOS*/
-            kbc_at_log("ATkbc: ??? - sent by MegaPC BIOS\n");
+        /* 0x40 - 0x5F are aliases for 0x60-0x7F */
+        case 0x40 ... 0x5f:
+            kbc_at_log("ATkbc: SIS - alias write to %02X\n", dev->command & 0x1f);
+            dev->mem[(dev->command & 0x1f) + 0x20] = val;
+            if (dev->command == 0x60)
+                write_cmd(dev, val);
+            return 0;
+
+        case 0xcb: /* set keyboard mode */
+            kbc_at_log("ATkbc: SIS - set keyboard mode\n");
+            dev->ami_flags = val;
+            dev->misc_flags &= ~FLAG_PS2;
+            if (val & 0x01) {
+                kbc_at_log("ATkbc: SIS: Emulate PS/2 keyboard\n");
+                dev->misc_flags |= FLAG_PS2;
+                kbc_at_do_poll = kbc_at_poll_ps2;
+            } else {
+                kbc_at_log("ATkbc: SIS: Emulate AT keyboard\n");
+                kbc_at_do_poll = kbc_at_poll_at;
+            }
             return 0;
 
         default:
@@ -1387,11 +1347,689 @@ write60_quadtel(void *priv, UNUSED(uint8_t val))
 }
 
 static uint8_t
-write64_olivetti(void *priv, uint8_t val)
+write_cmd_sis(void *priv, uint8_t val)
 {
-    atkbc_t *dev = (atkbc_t *) priv;
+    atkbc_t *dev     = (atkbc_t *) priv;
+    uint8_t  ret     = 1;
 
     switch (val) {
+        default:
+            break;
+
+        case 0x00 ... 0x1f:
+            kbc_at_log("ATkbc: SIS - alias read from %08X\n", val);
+            kbc_delay_to_ob(dev, dev->mem[val + 0x20], 0, 0x00);
+            ret = 0;
+            break;
+
+        case 0x40 ... 0x5f:
+            kbc_at_log("ATkbc: SIS - alias write to %08X\n", dev->command);
+            dev->wantdata = 1;
+            dev->state    = STATE_KBC_PARAM;
+            ret = 0;
+            break;
+
+        case 0xa0: /* copyright message */
+            kbc_at_queue_add(dev, 0x28);
+            kbc_at_queue_add(dev, 0x00);
+            ret = 0;
+            break;
+
+        case 0xa1: /* get controller version */
+            kbc_at_log("ATkbc: SIS - get controller version\n");
+            kbc_delay_to_ob(dev, 'H', 0, 0x00);
+            ret = 0;
+            break;
+
+        case 0xa4: /* write clock = low */
+            if (!(dev->misc_flags & FLAG_PS2)) {
+                kbc_at_log("ATkbc: SIS - write clock = low\n");
+                dev->misc_flags &= ~FLAG_CLOCK;
+                ret = 0;
+            }
+            break;
+
+        case 0xa5: /* write clock = high */
+            if (!(dev->misc_flags & FLAG_PS2)) {
+                kbc_at_log("ATkbc: SIS - write clock = high\n");
+                dev->misc_flags |= FLAG_CLOCK;
+                ret = 0;
+            }
+            break;
+
+        case 0xa6: /* read clock */
+            if (!(dev->misc_flags & FLAG_PS2)) {
+                kbc_at_log("ATkbc: SIS - read clock\n");
+                kbc_delay_to_ob(dev, (dev->misc_flags & FLAG_CLOCK) ? 0xff : 0x00, 0, 0x00);
+                ret = 0;
+            }
+            break;
+
+        case 0xa7: /* write cache bad */
+            if (!(dev->misc_flags & FLAG_PS2)) {
+                kbc_at_log("ATkbc: SIS - write cache bad\n");
+                dev->misc_flags &= FLAG_CACHE;
+                ret = 0;
+            }
+            break;
+
+        case 0xa8: /* write cache good */
+            if (!(dev->misc_flags & FLAG_PS2)) {
+                kbc_at_log("ATkbc: SIS - write cache good\n");
+                dev->misc_flags |= FLAG_CACHE;
+                ret = 0;
+            }
+            break;
+
+        case 0xa9: /* read cache */
+            if (!(dev->misc_flags & FLAG_PS2)) {
+                kbc_at_log("ATkbc: SIS - read cache\n");
+                kbc_delay_to_ob(dev, (dev->misc_flags & FLAG_CACHE) ? 0xff : 0x00, 0, 0x00);
+                ret = 0;
+            }
+            break;
+
+        case 0xb0 ... 0xb1:
+            /* set KBC lines P10-P11 (P1 bits 0-1) low */
+            if (!(dev->misc_flags & FLAG_PS2)) {
+                kbc_at_log("ATkbc: set KBC lines P10-P11 (P1 bits 0-3) low\n");
+                dev->p1 &= ~(1 << (val & 0x03));
+                kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
+                dev->pending++;
+                ret = 0;
+            }
+            break;
+
+        case 0xb8 ... 0xb9:
+            /* set KBC lines P10-P11 (P1 bits 0-1) high */
+            kbc_at_log("ATkbc: set KBC lines P10-P11 (P1 bits 0-3) high\n");
+            if (!(dev->misc_flags & FLAG_PS2)) {
+                dev->p1 |= (1 << (val & 0x03));
+                kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
+                dev->pending++;
+            }
+            ret = 0;
+            break;
+
+        case 0xc1: /* set port P17 to 0 & KBLOCK disabled */
+            kbc_at_log("ATkbc: SIS - set port P17 to 0 & KBLOCK disabled\n");
+            if (!dev->kblock_switch)
+                dev->p1 &= 0x7f;
+            ret = 0;
+            break;
+        case 0xc7: /* set port P17 to 1 */
+            kbc_at_log("ATkbc: SIS - set port P17 to 1\n");
+            if (!dev->kblock_switch)
+                dev->p1 |= 0x80;
+            ret = 0;
+            break;
+
+        case 0xca: /* read keyboard mode */
+            kbc_at_log("ATkbc: AMI - read keyboard mode\n");
+            kbc_delay_to_ob(dev, dev->ami_flags, 0, 0x00);
+            ret = 0;
+            break;
+
+        case 0xcb: /* set keyboard mode */
+            kbc_at_log("ATkbc: AMI - set keyboard mode\n");
+            dev->wantdata  = 1;
+            dev->state     = STATE_KBC_PARAM;
+            ret = 0;
+            break;
+
+        case 0xd6: /* enable KBLOCK switch */
+            kbc_at_log("ATkbc: SIS - enable KBLOCK switch\n");
+            dev->kblock_switch = 1;
+            ret = 0;
+            break;
+        case 0xd7: /* disable KBLOCK switch */
+            kbc_at_log("ATkbc: SIS - disable KBLOCK switch\n");
+            dev->kblock_switch = 0;
+            ret = 0;
+            break;
+    }
+
+    return ret;
+}
+
+static uint8_t
+write_cmd_umc(void *priv, uint8_t val)
+{
+    atkbc_t *dev     = (atkbc_t *) priv;
+    uint8_t  ret     = 1;
+
+    switch (val) {
+        default:
+            break;
+
+        case 0xa0: /* copyright message */
+            kbc_at_queue_add(dev, 0x28);
+            kbc_at_queue_add(dev, 0x28);
+            kbc_at_queue_add(dev, 0x28);
+            kbc_at_queue_add(dev, 0x00);
+            ret = 0;
+            break;
+
+        case 0xa1: /* get controller version */
+            kbc_at_log("ATkbc: UMC - get controller version\n");
+            kbc_delay_to_ob(dev, kbc_ami_revision, 0, 0x00);
+            ret = 0;
+            break;
+    }
+
+    return ret;
+}
+
+static uint8_t
+write_cmd_data_award(void *priv, uint8_t val)
+{
+    atkbc_t *dev = (atkbc_t *) priv;
+    uint8_t  ret = 1;
+
+    switch (val) {
+        default:
+            break;
+
+        case 0xcb: /* set keyboard mode */
+            kbc_at_log("ATkbc: AMI - set keyboard mode\n");
+            dev->ami_flags = val;
+            dev->misc_flags &= ~FLAG_PS2;
+            if (val & 0x01) {
+                kbc_at_log("ATkbc: AMI: Emulate PS/2 keyboard\n");
+                dev->misc_flags |= FLAG_PS2;
+                kbc_at_do_poll = kbc_at_poll_ps2;
+            } else {
+                kbc_at_log("ATkbc: AMI: Emulate AT keyboard\n");
+                kbc_at_do_poll = kbc_at_poll_at;
+            }
+            ret = 0;
+            break;
+    }
+
+    return ret;
+}
+
+static uint8_t
+write_cmd_award(void *priv, uint8_t val)
+{
+    atkbc_t *dev = (atkbc_t *) priv;
+    uint8_t  ret = 1;
+
+    switch (val) {
+        default:
+            break;
+
+        case 0x90 ... 0x9f: /* Write low nibble to (Port13-Port10) */
+            kbc_at_log("ATkbc: Award - write low nibble to (Port13-Port10)\n");
+            dev->p1 = (dev->p1 & 0xf0) | (val & 0x0f);
+            ret = 0;
+            break;
+
+        case 0xa1: /* get controller version */
+            kbc_at_log("ATkbc: AMI - get controller version\n");
+            kbc_delay_to_ob(dev, kbc_ami_revision, 0, 0x00);
+            ret = 0;
+            break;
+
+        case 0xa4: /* check if password installed */
+            kbc_at_log("ATkbc: check if password installed\n");
+            kbc_delay_to_ob(dev, 0xf1, 0, 0x00);
+            ret = 0;
+            break;
+
+        case 0xa5: /* do nothing */
+            kbc_at_log("ATkbc: do nothing\n");
+            ret = 0;
+            break;
+
+        /* TODO: Make this command do nothing on the Regional HT6542,
+                 or else, Efflixi's Award OPTi 495 BIOS gets a stuck key
+                 in Norton Commander 3.0. */
+        case 0xaf: /* read keyboard version */
+            kbc_at_log("ATkbc: read keyboard version\n");
+            kbc_delay_to_ob(dev, kbc_award_revision, 0, 0x00);
+            ret = 0;
+            break;
+
+        case 0xb0 ... 0xb3:
+            /* set KBC lines P10-P13 (P1 bits 0-3) low */
+            kbc_at_log("ATkbc: set KBC lines P10-P13 (P1 bits 0-3) low\n");
+            dev->p1 &= ~(1 << (val & 0x03));
+            kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
+            ret = 0;
+            break;
+
+        /* TODO: The ICS SB486PV sends command B4 but expects to read *TWO* bytes. */
+        case 0xb4: case 0xb5:
+            /* set KBC lines P22-P23 (P2 bits 2-3) low */
+            kbc_at_log("ATkbc: set KBC lines P22-P23 (P2 bits 2-3) low\n");
+            write_p2(dev, dev->p2 & ~(4 << (val & 0x01)));
+            kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
+            ret = 0;
+            break;
+
+        case 0xb6 ... 0xb7:
+            /* set KBC lines P14-P15 (P1 bits 4-5) low */
+            kbc_at_log("ATkbc: set KBC lines P14-P15 (P1 bits 4-5) low\n");
+            dev->p1 &= ~(0x10 << (val & 0x01));
+            kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
+            ret = 0;
+            break;
+
+        case 0xb8 ... 0xbb:
+            /* set KBC lines P10-P13 (P1 bits 0-3) high */
+            kbc_at_log("ATkbc: set KBC lines P10-P13 (P1 bits 0-3) high\n");
+            dev->p1 |= (1 << (val & 0x03));
+            kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
+            ret = 0;
+            break;
+
+        case 0xbc: case 0xbd:
+            /* set KBC lines P22-P23 (P2 bits 2-3) high */
+            kbc_at_log("ATkbc: set KBC lines P22-P23 (P2 bits 2-3) high\n");
+            write_p2(dev, dev->p2 | (4 << (val & 0x01)));
+            kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
+            ret = 0;
+            break;
+
+        case 0xbe ... 0xbf:
+            /* set KBC lines P14-P15 (P1 bits 4-5) high */
+            kbc_at_log("ATkbc: set KBC lines P14-P15 (P1 bits 4-5) high\n");
+            dev->p1 |= (0x10 << (val & 0x01));
+            kbc_delay_to_ob(dev, dev->ob, 0, 0x00);
+            ret = 0;
+            break;
+
+        case 0xc8:
+            /*
+             * unblock KBC lines P22/P23
+             * (allow command D1 to change bits 2/3 of P2)
+             */
+            kbc_at_log("ATkbc: AMI - unblock KBC lines P22 and P23\n");
+            dev->ami_flags &= 0xfb;
+            ret = 0;
+            break;
+
+        case 0xc9:
+            /*
+             * block KBC lines P22/P23
+             * (disallow command D1 from changing bits 2/3 of the port)
+             */
+            kbc_at_log("ATkbc: AMI - block KBC lines P22 and P23\n");
+            dev->ami_flags |= 0x04;
+            ret = 0;
+            break;
+
+        case 0xca: /* read keyboard mode */
+            kbc_at_log("ATkbc: AMI - read keyboard mode\n");
+            kbc_delay_to_ob(dev, dev->ami_flags, 0, 0x00);
+            ret = 0;
+            break;
+
+        case 0xcb: /* set keyboard mode */
+            kbc_at_log("ATkbc: AMI - set keyboard mode\n");
+            dev->wantdata  = 1;
+            dev->state     = STATE_KBC_PARAM;
+            ret = 0;
+            break;
+
+        case 0xe1 ... 0xef: /* Active output ports */
+            kbc_at_log("ATkbc: Award - active output ports\n");
+            write_p2(dev, (dev->p2 & 0xf1) | (val & 0x0e));
+            ret = 0;
+            break;
+    }
+
+    return ret;
+}
+
+static uint8_t
+write_cmd_data_chips(void *priv, uint8_t val)
+{
+    atkbc_t *dev = (atkbc_t *) priv;
+    uint8_t  ret = 1;
+
+    switch (val) {
+        default:
+            break;
+
+        case 0xa1: /* CHIPS extensions */
+            kbc_at_log("ATkbc: C&T - CHIPS extensions\n");
+            if (dev->command_phase == 1) {
+                switch (val) {
+                    default:
+                        break;
+                    case 0x00: /* return ID  */
+                        kbc_at_log("ATkbc: C&T - return ID\n");
+                        kbc_delay_to_ob(dev, kbc_chips_revision, 0, 0x00);
+                        break;
+                    case 0x02: /* write input port */
+                        kbc_at_log("ATkbc: C&T - write input port\n");
+                        dev->mem_addr      = val;
+                        dev->wantdata      = 1;
+                        dev->state         = STATE_KBC_PARAM;
+                        dev->command_phase = 2;
+                        break;
+                    case 0x04: /* select turbo switch input */
+                        kbc_at_log("ATkbc: C&T - select turbo switch input\n");
+                        dev->mem_addr      = val;
+                        dev->wantdata      = 1;
+                        dev->state         = STATE_KBC_PARAM;
+                        dev->command_phase = 2;
+                        break;
+                    case 0x05: /* select turbo LED output */
+                        kbc_at_log("ATkbc: Cselect turbo LED output\n");
+                        dev->mem_addr      = val;
+                        dev->wantdata      = 1;
+                        dev->state         = STATE_KBC_PARAM;
+                        dev->command_phase = 2;
+                        break;
+                }
+            } else if (dev->command_phase == 2) {
+                switch (dev->mem_addr) {
+                    default:
+                        break;
+                    case 0x02: /* write input port  */
+                        kbc_at_log("ATkbc: C&T - write iput port\n");
+                        dev->p1 = val;
+                        break;
+                }
+                dev->command_phase      = 0;
+            }
+            ret = 0;
+            break;
+    }
+
+    return ret;
+}
+
+static uint8_t
+write_cmd_chips(void *priv, uint8_t val)
+{
+    atkbc_t *dev = (atkbc_t *) priv;
+    uint8_t  ret = 1;
+
+    switch (val) {
+        default:
+            break;
+
+        case 0xa1: /* CHIPS extensions */
+            kbc_at_log("ATkbc: C&T - CHIPS extensions\n");
+            dev->wantdata  = 1;
+            dev->state     = STATE_KBC_PARAM;
+            ret = 0;
+            break;
+    }
+
+    return ret;
+}
+
+static uint8_t
+write_cmd_data_phoenix(void *priv, uint8_t val)
+{
+    atkbc_t *dev = (atkbc_t *) priv;
+    uint8_t  ret = 1;
+
+    switch (dev->command) {
+        default:
+            break;
+
+        /* TODO: Make this actually load the password. */
+        case 0xa3: /* Load Extended Password */
+            kbc_at_log("ATkbc: Phoenix - Load Extended Password\n");
+            if (val == 0x00)
+                dev->command_phase = 0;
+            else {
+                dev->wantdata      = 1;
+                dev->state         = STATE_KBC_PARAM;
+            }
+            ret = 0;
+            break;
+
+        case 0xaf: /* Set Inactivity Timer */
+            kbc_at_log("ATkbc: Phoenix - Set Inactivity Timer\n");
+            dev->mem[0x3a]    = val;
+            dev->command_phase = 0;
+            ret = 0;
+            break;
+
+        case 0xb8: /* Set Extended Memory Access Index */
+            kbc_at_log("ATkbc: Phoenix - Set Extended Memory Access Index\n");
+            dev->mem_addr      = val;
+            dev->command_phase = 0;
+            ret = 0;
+            break;
+
+        case 0xbb: /* Set Extended Memory */
+            kbc_at_log("ATkbc: Phoenix - Set Extended Memory\n");
+            dev->mem[dev->mem_addr] = val;
+            dev->command_phase      = 0;
+            ret = 0;
+            break;
+
+        case 0xbd: /* Set MultiKey Variable */
+            kbc_at_log("ATkbc: Phoenix - Set MultiKey Variable\n");
+            if ((dev->mem_addr > 0) && (dev->mem_addr <= multikey_vars[0x00]))
+                dev->mem[multikey_vars[dev->mem_addr]] = val;
+            dev->command_phase      = 0;
+            ret = 0;
+            break;
+
+        case 0xc7: /* Set Port1 bits */
+            kbc_at_log("ATkbc: Phoenix - Set Port1 bits\n");
+            dev->p1           |= val;
+            dev->command_phase = 0;
+            ret = 0;
+            break;
+
+        case 0xc8: /* Clear Port1 bits */
+            kbc_at_log("ATkbc: Phoenix - Clear Port1 bits\n");
+            dev->p1           &= ~val;
+            dev->command_phase = 0;
+            ret = 0;
+            break;
+
+        case 0xc9: /* Set Port2 bits */
+            kbc_at_log("ATkbc: Phoenix - Set Port2 bits\n");
+            write_p2(dev, dev->p2 | val);
+            dev->command_phase = 0;
+            ret = 0;
+            break;
+
+        case 0xca: /* Clear Port2 bits */
+            kbc_at_log("ATkbc: Phoenix - Clear Port2 bits\n");
+            write_p2(dev, dev->p2 & ~val);
+            dev->command_phase = 0;
+            ret = 0;
+            break;
+    }
+
+    return ret;
+}
+
+static uint8_t
+write_cmd_phoenix(void *priv, uint8_t val)
+{
+    atkbc_t *dev     = (atkbc_t *) priv;
+    uint8_t  ret     = 1;
+
+    switch (val) {
+        default:
+            break;
+
+        case 0x00 ... 0x1f:
+            kbc_at_log("ATkbc: Phoenix - alias read from %08X\n", val);
+            kbc_delay_to_ob(dev, dev->mem[val + 0x20], 0, 0x00);
+            ret = 0;
+            break;
+
+        case 0x40 ... 0x5f:
+            kbc_at_log("ATkbc: Phoenix - alias write to %08X\n", dev->command);
+            dev->wantdata = 1;
+            dev->state    = STATE_KBC_PARAM;
+            ret = 0;
+            break;
+
+        case 0xa2: /* Test Extended Password */
+            kbc_at_log("ATkbc: Phoenix - Test Extended Password\n");
+            kbc_at_queue_add(dev, 0xf1); /* Extended Password not loaded */
+            ret = 0;
+            break;
+
+        /* TODO: Make this actually load the password. */
+        case 0xa3: /* Load Extended Password */
+            kbc_at_log("ATkbc: Phoenix - Load Extended Password\n");
+            dev->wantdata = 1;
+            dev->state    = STATE_KBC_PARAM;
+            ret = 0;
+            break;
+
+        case 0xaf: /* Set Inactivity Timer */
+            kbc_at_log("ATkbc: Phoenix - Set Inactivity Timer\n");
+            dev->wantdata = 1;
+            dev->state    = STATE_KBC_PARAM;
+            ret = 0;
+            break;
+
+        case 0xb8: /* Set Extended Memory Access Index */
+            kbc_at_log("ATkbc: Phoenix - Set Extended Memory Access Index\n");
+            dev->wantdata = 1;
+            dev->state    = STATE_KBC_PARAM;
+            ret = 0;
+            break;
+
+        case 0xb9: /* Get Extended Memory Access Index */
+            kbc_at_log("ATkbc: Phoenix - Get Extended Memory Access Index\n");
+            kbc_at_queue_add(dev, dev->mem_addr);
+            ret = 0;
+            break;
+
+        case 0xba: /* Get Extended Memory */
+            kbc_at_log("ATkbc: Phoenix - Get Extended Memory\n");
+            kbc_at_queue_add(dev, dev->mem[dev->mem_addr]);
+            ret = 0;
+            break;
+
+        case 0xbb: /* Set Extended Memory */
+            kbc_at_log("ATkbc: Phoenix - Set Extended Memory\n");
+            dev->wantdata = 1;
+            dev->state    = STATE_KBC_PARAM;
+            ret = 0;
+            break;
+
+        case 0xbc: /* Get MultiKey Variable */
+            kbc_at_log("ATkbc: Phoenix - Get MultiKey Variable\n");
+            if (dev->mem_addr == 0)
+                kbc_at_queue_add(dev, multikey_vars[dev->mem_addr]);
+            else if (dev->mem_addr <= multikey_vars[dev->mem_addr])
+                kbc_at_queue_add(dev, dev->mem[multikey_vars[dev->mem_addr]]);
+            else
+                kbc_at_queue_add(dev, 0xff);
+            ret = 0;
+            break;
+
+        case 0xbd: /* Set MultiKey Variable */
+            kbc_at_log("ATkbc: Phoenix - Set MultiKey Variable\n");
+            dev->wantdata = 1;
+            dev->state    = STATE_KBC_PARAM;
+            ret = 0;
+            break;
+
+        case 0xc7: /* Set Port1 bits */
+            kbc_at_log("ATkbc: Phoenix - Set Port1 bits\n");
+            dev->wantdata  = 1;
+            dev->state     = STATE_KBC_PARAM;
+            ret = 0;
+            break;
+
+        case 0xc8: /* Clear Port1 bits */
+            kbc_at_log("ATkbc: Phoenix - Clear Port1 bits\n");
+            dev->wantdata  = 1;
+            dev->state     = STATE_KBC_PARAM;
+            ret = 0;
+            break;
+
+        case 0xc9: /* Set Port2 bits */
+            kbc_at_log("ATkbc: Phoenix - Set Port2 bits\n");
+            dev->wantdata  = 1;
+            dev->state     = STATE_KBC_PARAM;
+            ret = 0;
+            break;
+
+        case 0xca: /* Clear Port2 bits */
+            kbc_at_log("ATkbc: Phoenix - Clear Port2 bits\n");
+            dev->wantdata  = 1;
+            dev->state     = STATE_KBC_PARAM;
+            ret = 0;
+            break;
+
+        /* TODO: Handle these three commands properly - configurable
+                 revision level and proper CPU bits. */
+        case 0xd5: /* Read MultiKey code revision level */
+            kbc_at_log("ATkbc: Phoenix - Read MultiKey code revision level\n");
+            kbc_at_queue_add(dev, kbc_phoenix_version >> 8);
+            kbc_at_queue_add(dev, kbc_phoenix_version & 0xff);
+            ret = 0;
+            break;
+
+        case 0xd6: /* Read Version Information */
+            kbc_at_log("ATkbc: Phoenix - Read Version Information\n");
+            kbc_at_queue_add(dev, 0x81);
+            if (dev->misc_flags & FLAG_PS2)
+                kbc_at_queue_add(dev, 0xac);
+            else
+                kbc_at_queue_add(dev, 0xaa);
+            ret = 0;
+            break;
+
+        case 0xd7: /* Read MultiKey model numbers */
+            kbc_at_log("ATkbc: Phoenix - Read MultiKey model numbers\n");
+            if (dev->misc_flags & FLAG_PS2) {
+                if (dev->flags & DEVICE_PCI) {
+                    kbc_at_queue_add(dev, 0x02);
+                    kbc_at_queue_add(dev, 0x87);
+                    kbc_at_queue_add(dev, 0x02);
+                } else {
+                    kbc_at_queue_add(dev, 0x99);
+                    kbc_at_queue_add(dev, 0x75);
+                    kbc_at_queue_add(dev, 0x01);
+                }
+            } else {
+                kbc_at_queue_add(dev, 0x90);
+                kbc_at_queue_add(dev, 0x88);
+                kbc_at_queue_add(dev, 0xd0);
+            }
+            ret = 0;
+            break;
+
+        /* NOTE: The MultiKey/42i reference does not document these at all.
+                 The ADI 386SX BIOS uses these commands but it also uses
+                 commands B8 and BB with a parameters, which clearly indicates a
+                 Phoenix KBC. So either these are undocumented or were present
+                 in an early Phoenix MultiKey variant but later removed - the
+                 MultiKey/42i reference does say a number of features were
+                 removed, so these may have been among them, and we have no
+                 earlier MultiKey reference to look at. */
+        case 0xe1 ... 0xef: /* Active output ports */
+            kbc_at_log("ATkbc: Phoenix - active output ports\n");
+            write_p2(dev, (dev->p2 & 0xf1) | (val & 0x0e));
+            ret = 0;
+            break;
+    }
+
+    return ret;
+}
+
+static uint8_t
+write_cmd_olivetti(void *priv, uint8_t val)
+{
+    atkbc_t *dev = (atkbc_t *) priv;
+    uint8_t  ret = 1;
+
+    switch (val) {
+        default:
+            break;
+
         case 0x80: /* Olivetti-specific command */
             /*
              * bit 7: bus expansion board present (M300) / keyboard unlocked (M290)
@@ -1402,101 +2040,133 @@ write64_olivetti(void *priv, uint8_t val)
              */
             kbc_delay_to_ob(dev, (0x0c | (is386 ? 0x00 : 0x80)) & 0xdf, 0, 0x00);
             dev->p1 = ((dev->p1 + 1) & 3) | (dev->p1 & 0xfc);
-            return 0;
-
-        default:
+            ret = 0;
             break;
     }
 
-    return write64_generic(dev, val);
+    return ret;
 }
 
 static uint8_t
-write64_quadtel(void *priv, uint8_t val)
+write_cmd_data_quadtel(void *priv, UNUSED(uint8_t val))
+{
+    const atkbc_t *dev = (atkbc_t *) priv;
+    uint8_t        ret = 1;
+
+    switch (dev->command) {
+        default:
+            break;
+
+        case 0xcf: /*??? - sent by MegaPC BIOS*/
+            kbc_at_log("ATkbc: ??? - sent by MegaPC BIOS\n");
+            ret = 0;
+            break;
+    }
+
+    return ret;
+}
+
+static uint8_t
+write_cmd_quadtel(void *priv, uint8_t val)
 {
     atkbc_t *dev = (atkbc_t *) priv;
+    uint8_t  ret = 1;
 
     switch (val) {
+        default:
+            break;
+
         case 0xaf:
             kbc_at_log("ATkbc: bad KBC command AF\n");
-            return 1;
+            break;
 
         case 0xcf: /*??? - sent by MegaPC BIOS*/
             kbc_at_log("ATkbc: ??? - sent by MegaPC BIOS\n");
             dev->wantdata  = 1;
             dev->state     = STATE_KBC_PARAM;
-            return 0;
-
-        default:
+            ret = 0;
             break;
     }
 
-    return write64_generic(dev, val);
+    return ret;
 }
 
 static uint8_t
-write60_toshiba(void *priv, uint8_t val)
+write_cmd_data_toshiba(void *priv, uint8_t val)
 {
     const atkbc_t *dev = (atkbc_t *) priv;
+    uint8_t        ret = 1;
 
     switch (dev->command) {
+        default:
+            break;
+
         case 0xb6: /* T3100e - set color/mono switch */
             kbc_at_log("ATkbc: T3100e - set color/mono switch\n");
             t3100e_mono_set(val);
-            return 0;
-
-        default:
+            ret = 0;
             break;
     }
 
-    return 1;
+    return ret;
 }
 
 static uint8_t
-write64_toshiba(void *priv, uint8_t val)
+write_cmd_toshiba(void *priv, uint8_t val)
 {
     atkbc_t *dev = (atkbc_t *) priv;
+    uint8_t  ret = 1;
 
     switch (val) {
+        default:
+            break;
+
         case 0xaf:
             kbc_at_log("ATkbc: bad KBC command AF\n");
-            return 1;
+            break;
 
         case 0xb0: /* T3100e: Turbo on */
             kbc_at_log("ATkbc: T3100e: Turbo on\n");
             t3100e_turbo_set(1);
-            return 0;
+            ret = 0;
+            break;
 
         case 0xb1: /* T3100e: Turbo off */
             kbc_at_log("ATkbc: T3100e: Turbo off\n");
             t3100e_turbo_set(0);
-            return 0;
+            ret = 0;
+            break;
 
         case 0xb2: /* T3100e: Select external display */
             kbc_at_log("ATkbc: T3100e: Select external display\n");
             t3100e_display_set(0x00);
-            return 0;
+            ret = 0;
+            break;
 
         case 0xb3: /* T3100e: Select internal display */
             kbc_at_log("ATkbc: T3100e: Select internal display\n");
             t3100e_display_set(0x01);
-            return 0;
+            ret = 0;
+            break;
 
         case 0xb4: /* T3100e: Get configuration / status */
             kbc_at_log("ATkbc: T3100e: Get configuration / status\n");
             kbc_delay_to_ob(dev, t3100e_config_get(), 0, 0x00);
-            return 0;
+            ret = 0;
+            break;
 
         case 0xb5: /* T3100e: Get colour / mono byte */
             kbc_at_log("ATkbc: T3100e: Get colour / mono byte\n");
             kbc_delay_to_ob(dev, t3100e_mono_get(), 0, 0x00);
-            return 0;
+            ret = 0;
+            break;
 
         case 0xb6: /* T3100e: Set colour / mono byte */
             kbc_at_log("ATkbc: T3100e: Set colour / mono byte\n");
             dev->wantdata  = 1;
             dev->state     = STATE_KBC_PARAM;
-            return 0;
+            ret = 0;
+            break;
 
         /* TODO: Toshiba KBC mode switching. */
         case 0xb7: /* T3100e: Emulate PS/2 keyboard */
@@ -1510,7 +2180,8 @@ write64_toshiba(void *priv, uint8_t val)
                 kbc_at_log("ATkbc: T3100e: Emulate AT keyboard\n");
                 kbc_at_do_poll = kbc_at_poll_at;
             }
-            return 0;
+            ret = 0;
+            break;
 
         case 0xbb: /* T3100e: Read 'Fn' key.
                       Return it for right Ctrl and right Alt; on the real
@@ -1522,12 +2193,14 @@ write64_toshiba(void *priv, uint8_t val)
                 kbc_delay_to_ob(dev, 0x04, 0, 0x00);
             else
                 kbc_delay_to_ob(dev, 0x00, 0, 0x00);
-            return 0;
+            ret = 0;
+            break;
 
         case 0xbc: /* T3100e: Reset Fn+Key notification */
             kbc_at_log("ATkbc: T3100e: Reset Fn+Key notification\n");
             t3100e_notify_set(0x00);
-            return 0;
+            ret = 0;
+            break;
 
         case 0xc0: /* Read P1 */
             kbc_at_log("ATkbc: read P1\n");
@@ -1536,13 +2209,86 @@ write64_toshiba(void *priv, uint8_t val)
              * is set by t3100e_mono_set() */
             dev->p1 = (t3100e_mono_get() & 1) ? 0xff : 0xbf;
             kbc_delay_to_ob(dev, dev->p1, 0, 0x00);
-            return 0;
-
-        default:
+            ret = 0;
             break;
     }
 
-    return write64_generic(dev, val);
+    return ret;
+}
+
+static uint8_t
+read_p1(atkbc_t *dev)
+{
+    /*
+                                                                            P1 bits: 76543210
+                                                                            -----------------
+       IBM PS/1:                                                                     xxxxxxxx
+       IBM PS/2 MCA:                                                                 xxxxx1xx
+       Intel AMI Pentium BIOS'es with AMI MegaKey KB-5 keyboard controller:          x1x1xxxx
+       Acer:                                                                         xxxxx0xx
+       Packard Bell PB450:                                                           xxxxx1xx
+       P6RP4:                                                                        xx1xx1xx
+       Epson Action Tower 2600:                                                      xxxx01xx
+       TriGem Hawk:                                                                  xxxx11xx
+
+       Machine input based on current code:                                          11111111
+       Everything non-Green:    Pull down bit 7 if not PS/2 and keyboard is inhibited.
+                                Pull down bit 6 if primary display is CGA.
+       Xi8088:                  Pull down bit 6 if primary display is MDA.
+       Acer:                    Pull down bit 6 if primary display is MDA.
+                                Pull down bit 2 always (must be so to enable CMOS Setup).
+       IBM PS/1:                Pull down bit 6 if current floppy drive is 3.5".
+       Epson Action Tower 2600: Pull down bit 3 always (for Epson logo).
+       NCR:                     Pull down bit 5 always (power-on default speed = high).
+                                Pull down bit 3 if there is no FPU.
+                                Pull down bits 1 and 0 always?
+       Compaq:                  Pull down bit 6 if Compaq dual-scan display is in use.
+                                Pull down bit 5 if system board DIP switch is ON.
+                                Pull down bit 4 if CPU speed selected is auto.
+                                Pull down bit 3 if CPU speed selected is slow (4 MHz).
+                                Pull down bit 2 if FPU is present.
+                                Pull down bits 1 and 0 always?
+
+       Bit 7: AT KBC only - keyboard inhibited (often physical lock): 0 = yes, 1 = no (also Compaq);
+       Bit 6: Mostly, display: 0 = CGA, 1 = MDA, inverted on Xi8088 and Acer KBC's;
+              Intel AMI MegaKey KB-5: Used for green features, SMM handler expects it to be set;
+              IBM PS/1 Model 2011: 0 = current FDD is 3.5", 1 = current FDD is 5.25";
+              Compaq: 0 = Compaq dual-scan display, 1 = non-Compaq display.
+       Bit 5: Mostly, manufacturing jumper: 0 = installed (infinite loop at POST), 1 = not installed;
+              NCR: power-on default speed: 0 = high, 1 = low;
+              Compaq: System board DIP switch 5: 0 = ON, 1 = OFF.
+       Bit 4: (Which board?): RAM on motherboard: 0 = 512 kB, 1 = 256 kB;
+              NCR: RAM on motherboard: 0 = unsupported, 1 = 512 kB;
+              Intel AMI MegaKey KB-5: Must be 1;
+              IBM PS/1: Ignored;
+              Compaq: 0 = Auto speed selected, 1 = High speed selected.
+       Bit 3: TriGem AMIKey: most significant bit of 2-bit OEM ID;
+              NCR: Coprocessor detect (1 = yes, 0 = no);
+              Compaq: 0 = Slow (4 MHz), 1 = Fast (8 MHz);
+              Sometimes configured for clock switching;
+       Bit 2: TriGem AMIKey: least significant bit of 2-bit OEM ID;
+              Bit 3, 2:
+                  1, 1: TriGem logo;
+                  1, 0: Garbled logo;
+                  0, 1: Epson logo;
+                  0, 0: Generic AMI logo.
+              NCR: Unused;
+              IBM PS/2: Keyboard power: 0 = no power (fuse error), 1 = OK
+              (for some reason, www.win.tue.nl has this in reverse);
+              Compaq: FPU: 0 = 80287, 1 = none;
+              Sometimes configured for clock switching;
+       Bit 1: PS/2: Auxiliary device data in;
+              Compaq: Reserved;
+              NCR: High/auto speed.
+       Bit 0: PS/2: Keyboard device data in;
+              Compaq: Reserved;
+              NCR: DMA mode.
+     */
+    uint8_t ret = machine_get_p1(dev->p1) | (dev->p1 & 0x03);
+
+    dev->p1 = ((dev->p1 + 1) & 0x03) | (dev->p1 & 0xfc);
+
+    return ret;
 }
 
 static void
@@ -1562,7 +2308,18 @@ kbc_at_process_cmd(void *priv)
         /* Clear the keyboard controller queue. */
         kbc_at_queue_reset(dev);
 
-        switch (dev->ib) {
+        /*
+           If we have a vendor-specific handler, run that. Otherwise, or if
+           that handler fails, attempt to process it as a generic command.
+         */
+        if (dev->write_cmd_ven)
+            bad = dev->write_cmd_ven(dev, dev->ib);
+
+        if (bad)  switch (dev->ib) {
+            default:
+                kbc_at_log(bad ? "ATkbc: bad controller command %02X\n" : "", dev->ib);
+                break;
+
             /* Read data from KBC memory. */
             case 0x20 ... 0x3f:
                 kbc_delay_to_ob(dev, dev->mem[dev->ib], 0, 0x00);
@@ -1576,18 +2333,63 @@ kbc_at_process_cmd(void *priv)
                 dev->state     = STATE_KBC_PARAM;
                 break;
 
+            /* TODO: Are these undocmented VL82C113 commands? */
+            case 0x80: /* Tulip command */
+                kbc_at_log("ATkbc: Tulip command\n");
+                kbc_delay_to_ob(dev, 0xff, 0, 0x00);
+                break;
+
+            case 0x8c: /* Tulip reset command */
+                kbc_at_log("ATkbc: Tulip reset command\n");
+                dev->wantdata = 1;
+                dev->state = STATE_KBC_PARAM;
+                break;
+
+            case 0xa4: /* check if password installed */
+                if (dev->misc_flags & FLAG_PS2) {
+                    kbc_at_log("ATkbc: check if password installed\n");
+                    kbc_delay_to_ob(dev, 0xf1, 0, 0x00);
+                }
+                break;
+
+            case 0xa5: /* load security */
+                kbc_at_log("ATkbc: load security\n");
+                dev->wantdata = 1;
+                dev->state = STATE_KBC_PARAM;
+                break;
+
+            case 0xa7: /* disable auxiliary port */
+                if (dev->misc_flags & FLAG_PS2) {
+                    kbc_at_log("ATkbc: disable auxiliary port\n");
+                    set_enable_aux(dev, 0);
+                }
+                break;
+
+            case 0xa8: /* Enable auxiliary port */
+                if (dev->misc_flags & FLAG_PS2) {
+                    kbc_at_log("ATkbc: enable auxiliary port\n");
+                    set_enable_aux(dev, 1);
+                }
+                break;
+
+            case 0xa9: /* Test auxiliary port */
+                kbc_at_log("ATkbc: test auxiliary port\n");
+                if (dev->misc_flags & FLAG_PS2)
+                    kbc_delay_to_ob(dev, 0x00, 0, 0x00); /* no error, this is testing the channel 2 interface */
+                break;
+
             case 0xaa: /* self-test */
                 kbc_at_log("ATkbc: self-test\n");
 
-                if ((dev->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1) {
+                if (machine_has_flags_ex(MACHINE_PS2_KBC)) {
                     if (dev->state != STATE_RESET) {
                         kbc_at_log("ATkbc: self-test reinitialization\n");
-                        /* Yes, the firmware has an OR, but we need to make sure to keep any forcibly lowered bytes lowered. */
-                        /* TODO: Proper P1 implementation, with OR and AND flags in the machine table. */
-                        dev->p1 = dev->p1 & 0xff;
+                        dev->p1 |= 0xff;
                         write_p2(dev, 0x4b);
-                        picintc(0x1000);
-                        picintc(0x0002);
+                        if (dev->irq[1] != 0xffff)
+                            picintc(1 << dev->irq[1]);
+                        if (dev->irq[0] != 0xffff)
+                            picintc(1 << dev->irq[0]);
                     }
 
                     dev->status = (dev->status & 0x0f) | 0x60;
@@ -1602,11 +2404,10 @@ kbc_at_process_cmd(void *priv)
                 } else {
                     if (dev->state != STATE_RESET) {
                         kbc_at_log("ATkbc: self-test reinitialization\n");
-                        /* Yes, the firmware has an OR, but we need to make sure to keep any forcibly lowered bytes lowered. */
-                        /* TODO: Proper P1 implementation, with OR and AND flags in the machine table. */
-                        dev->p1 = dev->p1 & 0xff;
+                        dev->p1 |= 0xff;
                         write_p2(dev, 0xcf);
-                        picintclevel(0x0002, &dev->irq_state);
+                        if (dev->irq[0] != 0xffff)
+                            picintclevel(1 << dev->irq[0], &dev->irq_state);
                         dev->irq_state = 0;
                     }
 
@@ -1640,12 +2441,13 @@ kbc_at_process_cmd(void *priv)
                 break;
 
             case 0xac: /* diagnostic dump */
-                if (dev->misc_flags & FLAG_PS2) {
+                if (!(dev->misc_flags & FLAG_PS2)) {
                     kbc_at_log("ATkbc: diagnostic dump\n");
                     dev->mem[0x30] = (dev->p1 & 0xf0) | 0x80;
                     dev->mem[0x31] = dev->p2;
                     dev->mem[0x32] = 0x00;    /* T0 and T1. */
-                    dev->mem[0x33] = 0x00;    /* PSW - Program Status Word - always return 0x00 because we do not emulate this byte. */
+                    /* PSW - Program Status Word - always return 0x00 because we do not emulate this byte. */
+                    dev->mem[0x33] = 0x00;
                     /* 20 bytes in high nibble in set 1, low nibble in set 1, set 1 space format = 60 bytes. */
                     for (uint8_t i = 0; i < 20; i++) {
                         kbc_at_queue_add(dev, cmd_ac_conv[dev->mem[i + 0x20] >> 4]);
@@ -1665,21 +2467,25 @@ kbc_at_process_cmd(void *priv)
                 set_enable_kbd(dev, 1);
                 break;
 
-            case 0xc7: /* set port1 bits */
-                kbc_at_log("ATkbc: Phoenix - set port1 bits\n");
-                dev->wantdata  = 1;
-                dev->state     = STATE_KBC_PARAM;
+            case 0xc0: /* read P1 */
+                kbc_at_log("ATkbc: read P1\n");
+                kbc_delay_to_ob(dev, read_p1(dev), 0, 0x00);
                 break;
 
-            case 0xca: /* read keyboard mode */
-                kbc_at_log("ATkbc: AMI - read keyboard mode\n");
-                kbc_delay_to_ob(dev, dev->ami_flags, 0, 0x00);
+            case 0xc1: /*Copy bits 0 to 3 of P1 to status bits 4 to 7*/
+                if (dev->misc_flags & FLAG_PS2) {
+                    kbc_at_log("ATkbc: copy bits 0 to 3 of P1 to status bits 4 to 7\n");
+                    dev->status &= 0x0f;
+                    dev->status |= (dev->p1 << 4);
+                }
                 break;
 
-            case 0xcb: /* set keyboard mode */
-                kbc_at_log("ATkbc: AMI - set keyboard mode\n");
-                dev->wantdata  = 1;
-                dev->state     = STATE_KBC_PARAM;
+            case 0xc2: /*Copy bits 4 to 7 of P1 to status bits 4 to 7*/
+                if (dev->misc_flags & FLAG_PS2) {
+                    kbc_at_log("ATkbc: copy bits 4 to 7 of P1 to status bits 4 to 7\n");
+                    dev->status &= 0x0f;
+                    dev->status |= (dev->p1 & 0xf0);
+                }
                 break;
 
             case 0xd0: /* read P2 */
@@ -1702,6 +2508,22 @@ kbc_at_process_cmd(void *priv)
                 dev->state     = STATE_KBC_PARAM;
                 break;
 
+            case 0xd3: /* write auxiliary output buffer */
+                if (dev->misc_flags & FLAG_PS2) {
+                    kbc_at_log("ATkbc: write auxiliary output buffer\n");
+                    dev->wantdata = 1;
+                    dev->state = STATE_KBC_PARAM;
+                }
+                break;
+
+            case 0xd4: /* write to auxiliary port */
+                if (dev->misc_flags & FLAG_PS2) {
+                    kbc_at_log("ATkbc: write to auxiliary port\n");
+                    dev->wantdata = 1;
+                    dev->state = STATE_KBC_PARAM;
+                }
+                break;
+
             case 0xdd: /* disable A20 address line */
             case 0xdf: /* enable A20 address line */
                 kbc_at_log("ATkbc: %sable A20\n", (dev->ib == 0xdd) ? "dis" : "en");
@@ -1713,18 +2535,10 @@ kbc_at_process_cmd(void *priv)
                 kbc_delay_to_ob(dev, 0x00, 0, 0x00);
                 break;
 
-            default:
-                /*
-                 * Unrecognized controller command.
-                 *
-                 * If we have a vendor-specific handler, run
-                 * that. Otherwise, or if that handler fails,
-                 * log a bad command.
-                 */
-                if (dev->write64_ven)
-                    bad = dev->write64_ven(dev, dev->ib);
-
-                kbc_at_log(bad ? "ATkbc: bad controller command %02X\n" : "", dev->ib);
+            case 0xf0 ... 0xff: /* pulse P2 */
+                kbc_at_log("ATkbc: pulse %01X\n", dev->ib & 0x0f);
+                pulse_output(dev, dev->ib & 0x0f);
+                break;
         }
 
         /* If the command needs data, remember the command. */
@@ -1735,13 +2549,44 @@ kbc_at_process_cmd(void *priv)
         dev->wantdata = 0;
         dev->state    = STATE_MAIN_IBF;
 
-        switch (dev->command) {
+        /*
+           Run the vendor-specific handler if we have one. Otherwise, or if it
+           returns an error, log a bad controller command.
+         */
+        if (dev->write_cmd_data_ven)
+            bad = dev->write_cmd_data_ven(dev, dev->ib);
+
+        if (bad)  switch (dev->command) {
+            default:
+                kbc_at_log("ATkbc: bad controller command %02x data %02x\n", dev->command, dev->ib);
+                break;
+
             case 0x60 ... 0x7f:
                 dev->mem[(dev->command & 0x1f) + 0x20] = dev->ib;
                 if (dev->command == 0x60)
                     write_cmd(dev, dev->ib);
                 break;
 
+            case 0x8c: /* Tulip reset command */
+                kbc_at_log("ATkbc: Tulip rset command\n");
+
+                dma_reset();
+                dma_set_at(1);
+
+                device_reset_all(DEVICE_ALL);
+
+                cpu_alt_reset = 0;
+
+                pci_reset();
+
+                mem_a20_alt = 0;
+                mem_a20_recalc();
+
+                flushmmucache();
+
+                resetx86();
+                break;
+
             case 0xa5: /* load security */
                 if (dev->misc_flags & FLAG_PS2) {
                     kbc_at_log("ATkbc: load security (%02X)\n", dev->ib);
@@ -1753,11 +2598,6 @@ kbc_at_process_cmd(void *priv)
                 }
                 break;
 
-            case 0xc7: /* set port1 bits */
-                kbc_at_log("ATkbc: Phoenix - set port1 bits\n");
-                dev->p1 |= dev->ib;
-                break;
-
             case 0xd1: /* write P2 */
                 kbc_at_log("ATkbc: write P2\n");
                 /* Bit 2 of AMI flags is P22-P23 blocked (1 = yes, 0 = no),
@@ -1787,7 +2627,7 @@ kbc_at_process_cmd(void *priv)
                 if (dev->ib == 0xbb)
                     break;
 
-                if (strstr(machine_get_internal_name(), "pb") != NULL)
+                if (strstr(machine_get_internal_name(), "pb41") != NULL)
                     cpu_override_dynarec = 1;
 
                 if (dev->misc_flags & FLAG_PS2) {
@@ -1800,26 +2640,12 @@ kbc_at_process_cmd(void *priv)
                         kbc_delay_to_ob(dev, 0xfe, 2, 0x40);
                 }
                 break;
-
-            default:
-                /*
-                 * Run the vendor-specific handler
-                 * if we have one. Otherwise, or if
-                 * it returns an error, log a bad
-                 * controller command.
-                 */
-                if (dev->write60_ven)
-                    bad = dev->write60_ven(dev, dev->ib);
-
-                if (bad) {
-                    kbc_at_log("ATkbc: bad controller command %02x data %02x\n", dev->command, dev->ib);
-                }
         }
     }
 }
 
 static void
-kbc_at_write(uint16_t port, uint8_t val, void *priv)
+kbc_at_port_1_write(uint16_t port, uint8_t val, void *priv)
 {
     atkbc_t *dev = (atkbc_t *) priv;
     uint8_t kbc_ven = dev->flags & KBC_VEN_MASK;
@@ -1827,50 +2653,89 @@ kbc_at_write(uint16_t port, uint8_t val, void *priv)
 
     kbc_at_log("ATkbc: [%04X:%08X] write(%04X) = %02X\n", CS, cpu_state.pc, port, val);
 
-    switch (port) {
-        case 0x60:
-            dev->status &= ~STAT_CD;
-            if (fast_a20 && dev->wantdata && (dev->command == 0xd1)) {
-                kbc_at_log("ATkbc: write P2\n");
+    dev->status &= ~STAT_CD;
 
-#if 0
-                /* Fast A20 - ignore all other bits. */
-                val = (val & 0x02) | (dev->p2 & 0xfd);
+    if (fast_a20 && dev->wantdata && (dev->command == 0xd1)) {
+        kbc_at_log("ATkbc: write P2\n");
 
-                /* Bit 2 of AMI flags is P22-P23 blocked (1 = yes, 0 = no),
-                   discovered by reverse-engineering the AOpeN Vi15G BIOS. */
-                if (dev->ami_flags & 0x04) {
-                    /* If keyboard controller lines P22-P23 are blocked,
-                       we force them to remain unchanged. */
-                    val &= ~0x0c;
-                    val |= (dev->p2 & 0x0c);
-                }
+        /* Fast A20 - ignore all other bits. */
+        write_p2_fast_a20(dev, (dev->p2 & 0xfd) | (val & 0x02));
 
-                write_p2_fast_a20(dev, val | 0x01);
-#else
-                /* Fast A20 - ignore all other bits. */
-                write_p2_fast_a20(dev, (dev->p2 & 0xfd) | (val & 0x02));
-#endif
+        dev->wantdata  = 0;
+        dev->state     = STATE_MAIN_IBF;
 
-                dev->wantdata  = 0;                
-                dev->state     = STATE_MAIN_IBF;
-                return;
-            }
-            break;
+        /*
+           Explicitly clear IBF so that any preceding
+           command is not executed.
+         */
+        dev->status   &= ~STAT_IFULL;
+        return;
+    }
 
-        case 0x64:
-            dev->status |= STAT_CD;
-            if (fast_a20 && (val == 0xd1)) {
-                kbc_at_log("ATkbc: write P2\n");
-                dev->wantdata  = 1;
-                dev->state     = STATE_KBC_PARAM;
-                dev->command = 0xd1;
-                return;
-            }
-            break;
+    dev->ib = val;
+    dev->status |= STAT_IFULL;
+}
 
-        default:
-            break;
+static void
+kbc_at_port_2_write(uint16_t port, uint8_t val, void *priv)
+{
+    atkbc_t *dev = (atkbc_t *) priv;
+    uint8_t kbc_ven = dev->flags & KBC_VEN_MASK;
+    uint8_t fast_a20 = (kbc_ven != KBC_VEN_SIEMENS);
+
+    kbc_at_log("ATkbc: [%04X:%08X] write(%04X) = %02X\n", CS, cpu_state.pc, port, val);
+
+    dev->status |= STAT_CD;
+
+    if (fast_a20 && (val == 0xd1)) {
+        kbc_at_log("ATkbc: write P2\n");
+        dev->wantdata  = 1;
+        dev->state     = STATE_KBC_PARAM;
+        dev->command = 0xd1;
+
+        /*
+           Explicitly clear IBF so that any preceding
+           command is not executed.
+         */
+        dev->status   &= ~STAT_IFULL;
+        return;
+    } else if (fast_reset && ((val & 0xf0) == 0xf0)) {
+        pulse_output(dev, val & 0x0f);
+
+        dev->state     = STATE_MAIN_IBF;
+
+        /*
+           Explicitly clear IBF so that any preceding
+           command is not executed.
+         */
+        dev->status   &= ~STAT_IFULL;
+        return;
+    } else if (val == 0xad) {
+        /* Fast track it because of the Bochs BIOS. */
+        kbc_at_log("ATkbc: disable keyboard\n");
+        set_enable_kbd(dev, 0);
+
+        dev->state     = STATE_MAIN_IBF;
+
+        /*
+           Explicitly clear IBF so that any preceding
+           command is not executed.
+         */
+        dev->status   &= ~STAT_IFULL;
+        return;
+    } else if (val == 0xae) {
+        /* Fast track it because of the LG MultiNet. */
+        kbc_at_log("ATkbc: enable keyboard\n");
+        set_enable_kbd(dev, 1);
+
+        dev->state     = STATE_MAIN_IBF;
+
+        /*
+           Explicitly clear IBF so that any preceding
+           command is not executed.
+         */
+        dev->status   &= ~STAT_IFULL;
+        return;
     }
 
     dev->ib = val;
@@ -1878,34 +2743,40 @@ kbc_at_write(uint16_t port, uint8_t val, void *priv)
 }
 
 static uint8_t
-kbc_at_read(uint16_t port, void *priv)
+kbc_at_port_1_read(uint16_t port, void *priv)
 {
     atkbc_t *dev     = (atkbc_t *) priv;
     uint8_t  ret     = 0xff;
 
-    if ((dev->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1)
+    if (machine_has_flags_ex(MACHINE_PS2_KBC))
         cycles -= ISA_CYCLES(8);
 
-    switch (port) {
-        case 0x60:
-            ret = dev->ob;
-            dev->status &= ~STAT_OFULL;
-            /* TODO: IRQ is only tied to OBF on the AT KBC, on the PS/2 KBC, it is controlled by a P2 bit.
-                     This also means that in AT mode, the IRQ is level-triggered. */
-            if (!(dev->misc_flags & FLAG_PS2))
-                picintclevel(1 << 1, &dev->irq_state);
-            if ((strstr(machine_get_internal_name(), "pb") != NULL) && (cpu_override_dynarec == 1))
-                cpu_override_dynarec = 0;
-            break;
+    ret = dev->ob;
+    dev->status &= ~STAT_OFULL;
+    /*
+       TODO: IRQ is only tied to OBF on the AT KBC, on the PS/2 KBC, it is controlled by a P2 bit.
+       This also means that in AT mode, the IRQ is level-triggered.
+     */
+    if (!(dev->misc_flags & FLAG_PS2) && (dev->irq[0] != 0xffff))
+        picintclevel(1 << dev->irq[0], &dev->irq_state);
+    if ((strstr(machine_get_internal_name(), "pb41") != NULL) && (cpu_override_dynarec == 1))
+        cpu_override_dynarec = 0;
 
-        case 0x64:
-            ret = dev->status;
-            break;
+    kbc_at_log("ATkbc: [%04X:%08X] read (%04X) = %02X\n",  CS, cpu_state.pc, port, ret);
 
-        default:
-            kbc_at_log("ATkbc: read(%04x) invalid!\n",port);
-            break;
-    }
+    return ret;
+}
+
+static uint8_t
+kbc_at_port_2_read(uint16_t port, void *priv)
+{
+    atkbc_t *dev     = (atkbc_t *) priv;
+    uint8_t  ret     = 0xff;
+
+    if (machine_has_flags_ex(MACHINE_PS2_KBC))
+        cycles -= ISA_CYCLES(8);
+
+    ret = dev->status;
 
     kbc_at_log("ATkbc: [%04X:%08X] read (%04X) = %02X\n",  CS, cpu_state.pc, port, ret);
 
@@ -1938,24 +2809,27 @@ kbc_at_reset(void *priv)
 
     dev->sc_or = 0;
 
-    dev->ami_flags = ((dev->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1) ? 0x01 : 0x00;
+    dev->ami_flags = (machine_has_flags_ex(MACHINE_PS2_KBC)) ? 0x01 : 0x00;
     dev->misc_flags &= FLAG_PCI;
 
-    if ((dev->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1) {
+    if (machine_has_flags_ex(MACHINE_PS2_KBC)) {
         dev->misc_flags |= FLAG_PS2;
         kbc_at_do_poll = kbc_at_poll_ps2;
-        picintc(0x1000);
-        picintc(0x0002);
+        if (dev->irq[1] != 0xffff)
+            picintc(1 << dev->irq[1]);
+        if (dev->irq[0] != 0xffff)
+            picintc(1 << dev->irq[0]);
     } else {
         kbc_at_do_poll = kbc_at_poll_at;
-        picintclevel(0x0002, &dev->irq_state);
+        if (dev->irq[0] != 0xffff)
+            picintclevel(1 << dev->irq[0], &dev->irq_state);
         dev->irq_state = 0;
     }
 
     dev->misc_flags |= FLAG_CACHE;
 
     dev->p2 = 0xcd;
-    if ((dev->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1) {
+    if (machine_has_flags_ex(MACHINE_PS2_KBC)) {
         write_p2(dev, 0x4b);
     } else {
         /* The real thing writes CF and then AND's it with BF. */
@@ -1970,7 +2844,11 @@ static void
 kbc_at_close(void *priv)
 {
     atkbc_t *dev = (atkbc_t *) priv;
-    int max_ports = ((dev->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1) ? 2 : 1;
+#ifdef OLD_CODE
+    int max_ports = machine_has_flags_ex(MACHINE_PS2_KBC) ? 2 : 1;
+#else
+    int max_ports = 2;
+#endif
 
     /* Stop timers. */
     timer_disable(&dev->kbc_dev_poll_timer);
@@ -1986,113 +2864,185 @@ kbc_at_close(void *priv)
     free(dev);
 }
 
+void
+kbc_at_port_handler(int num, int set, uint16_t port, void *priv)
+{
+    atkbc_t *dev = (atkbc_t *) priv;
+
+    if (dev->handler_enable[num] && (dev->base_addr[num] != 0x0000))
+        io_removehandler(dev->base_addr[num], 1,
+                         dev->handlers[num].read, NULL, NULL,
+                         dev->handlers[num].write, NULL, NULL, priv);
+
+    dev->handler_enable[num] = set;
+    dev->base_addr[num]      = port;
+
+    if (dev->handler_enable[num] && (dev->base_addr[num] != 0x0000))
+        io_sethandler(dev->base_addr[num], 1,
+                      dev->handlers[num].read, NULL, NULL,
+                      dev->handlers[num].write, NULL, NULL, priv);
+}
+
+void
+kbc_at_handler(int set, uint16_t port, void *priv)
+{
+    kbc_at_port_handler(0, set, port, priv);
+    kbc_at_port_handler(1, set, port + 0x0004, priv);
+}
+
+void
+kbc_at_set_irq(int num, uint16_t irq, void *priv)
+{
+    atkbc_t *dev = (atkbc_t *) priv;
+
+    if (dev->irq[num] != 0xffff) {
+        if ((num == 0) && !machine_has_flags_ex(MACHINE_PS2_KBC))
+            picintclevel(1 << dev->irq[num], &dev->irq_state);
+        else
+            picintc(1 << dev->irq[num]);
+    }
+
+    dev->irq[num] = irq;
+}
+
 static void *
 kbc_at_init(const device_t *info)
 {
     atkbc_t *dev;
     int max_ports;
 
-    dev = (atkbc_t *) malloc(sizeof(atkbc_t));
-    memset(dev, 0x00, sizeof(atkbc_t));
+    dev = (atkbc_t *) calloc(1, sizeof(atkbc_t));
+
+    dev->kblock_switch = 1;
 
     dev->flags = info->local;
 
+    dev->is_asic  = !!(info->local & KBC_FLAG_IS_ASIC);
+    dev->is_type2 = !!(info->local & KBC_FLAG_IS_TYPE2);
+
     video_reset(gfxcard[0]);
     kbc_at_reset(dev);
 
     if (info->flags & DEVICE_PCI)
         dev->misc_flags |= FLAG_PCI;
 
-    io_sethandler(0x0060, 1, kbc_at_read, NULL, NULL, kbc_at_write, NULL, NULL, dev);
-    io_sethandler(0x0064, 1, kbc_at_read, NULL, NULL, kbc_at_write, NULL, NULL, dev);
+    dev->handlers[0].read  = kbc_at_port_1_read;
+    dev->handlers[0].write = kbc_at_port_1_write;
+    dev->handlers[1].read  = kbc_at_port_2_read;
+    dev->handlers[1].write = kbc_at_port_2_write;
+
+    dev->irq[0] = 1;
+    dev->irq[1] = 12;
 
     timer_add(&dev->kbc_poll_timer, kbc_at_poll, dev, 1);
     timer_add(&dev->pulse_cb, pulse_poll, dev, 0);
 
     timer_add(&dev->kbc_dev_poll_timer, kbc_at_dev_poll, dev, 1);
 
-    dev->write60_ven = NULL;
-    dev->write64_ven = NULL;
+    dev->write_cmd_data_ven = NULL;
+    dev->write_cmd_ven      = NULL;
 
-    kbc_ami_revision = '8';
-    kbc_award_revision = 0x42;
+    kbc_ami_revision        = '8';
+    kbc_award_revision      = 0x42;
+
+    kbc_chips_revision      = 0xa6;
+
+    kbc_phoenix_version     = 0x0416;
 
     switch (dev->flags & KBC_VEN_MASK) {
+        default:
+            break;
+
         case KBC_VEN_SIEMENS:
-            kbc_ami_revision = '8';
-            kbc_award_revision = 0x42;
-            dev->write60_ven = write60_ami;
-            dev->write64_ven = write64_siemens;
+        case KBC_VEN_AWARD:
+        case KBC_VEN_VIA:
+            if ((info->local & 0xff00) != 0x0000)
+                kbc_ami_revision = (info->local >> 8) & 0xff;
+            if ((info->local & 0xff0000) != 0x000000)
+                kbc_award_revision = (info->local >> 16) & 0xff;
+            dev->write_cmd_data_ven = write_cmd_data_award;
+            dev->write_cmd_ven = write_cmd_award;
             break;
 
         case KBC_VEN_ACER:
-        case KBC_VEN_GENERIC:
-        case KBC_VEN_NCR:
-        case KBC_VEN_IBM_PS1:
-        case KBC_VEN_COMPAQ:
-            dev->write64_ven = write64_generic;
+            dev->write_cmd_ven = write_cmd_acer;
             break;
 
         case KBC_VEN_OLIVETTI:
-            dev->write64_ven = write64_olivetti;
+            dev->write_cmd_ven = write_cmd_olivetti;
             break;
 
         case KBC_VEN_ALI:
             kbc_ami_revision = 'F';
             kbc_award_revision = 0x43;
-            dev->write60_ven = write60_ami;
-            dev->write64_ven = write64_ami;
+            dev->write_cmd_data_ven = write_cmd_data_ami;
+            dev->write_cmd_ven = write_cmd_ami;
             break;
 
-        case KBC_VEN_TRIGEM_AMI:
+        case KBC_VEN_AMI_TRIGEM:
+            dev->is_green = !!(info->local & KBC_FLAG_IS_GREEN);
             kbc_ami_revision = 'Z';
-            dev->write60_ven = write60_ami;
-            dev->write64_ven = write64_ami;
+            dev->write_cmd_data_ven = write_cmd_data_ami;
+            dev->write_cmd_ven = write_cmd_ami;
             break;
 
         case KBC_VEN_AMI:
-            if ((dev->flags & KBC_TYPE_MASK) == KBC_TYPE_GREEN)
-                kbc_ami_revision = '5';
-            else if ((dev->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1) {
-                if (cpu_64bitbus)
-                    kbc_ami_revision = 'R';
-                else if (is486)
-                    kbc_ami_revision = 'P';
-                else
-                    kbc_ami_revision = 'H';
-            } else if (is386 && !is486) {
-                if (cpu_16bitbus)
-                    kbc_ami_revision = 'D';
-                else
-                    kbc_ami_revision = 'B';
-            } else if (!is386)
-                kbc_ami_revision = '8';
-            else
-                kbc_ami_revision = 'F';
+        case KBC_VEN_HOLTEK:
+            kbc_ami_is_clone = !!(info->local & KBC_FLAG_IS_CLONE);
+            kbc_ami_revision = (info->local >> 8) & 0xff;
 
-            dev->write60_ven = write60_ami;
-            dev->write64_ven = write64_ami;
+            dev->write_cmd_data_ven = write_cmd_data_ami;
+            dev->write_cmd_ven = write_cmd_ami;
+            break;
+
+        case KBC_VEN_UMC:
+            if ((info->local & 0xff00) != 0x0000)
+                kbc_ami_revision = (info->local >> 8) & 0xff;
+            else
+                kbc_ami_revision = 0x48;
+
+            dev->write_cmd_ven = write_cmd_umc;
+            break;
+
+        case KBC_VEN_SIS:
+            if ((info->local & 0xff00) != 0x0000)
+                kbc_ami_revision = (info->local >> 8) & 0xff;
+            else
+                kbc_ami_revision = 0x48;
+
+            dev->write_cmd_data_ven = write_cmd_data_sis;
+            dev->write_cmd_ven = write_cmd_sis;
+            break;
+
+        case KBC_VEN_CHIPS:
+            if ((info->local & 0xff00) != 0x0000)
+                kbc_chips_revision = (info->local >> 8) & 0xff;
+            dev->write_cmd_data_ven = write_cmd_data_chips;
+            dev->write_cmd_ven = write_cmd_chips;
+            break;
+
+        case KBC_VEN_PHOENIX:
+            if ((info->local & 0xffff00) != 0x000000)
+                kbc_phoenix_version = (info->local >> 8) & 0xffff;
+            dev->write_cmd_data_ven = write_cmd_data_phoenix;
+            dev->write_cmd_ven = write_cmd_phoenix;
             break;
 
         case KBC_VEN_QUADTEL:
-            dev->write60_ven = write60_quadtel;
-            dev->write64_ven = write64_quadtel;
+            dev->write_cmd_data_ven = write_cmd_data_quadtel;
+            dev->write_cmd_ven = write_cmd_quadtel;
             break;
 
         case KBC_VEN_TOSHIBA:
-            dev->write60_ven = write60_toshiba;
-            dev->write64_ven = write64_toshiba;
-            break;
-
-        default:
+            dev->write_cmd_data_ven = write_cmd_data_toshiba;
+            dev->write_cmd_ven = write_cmd_toshiba;
             break;
     }
 
-    max_ports = ((dev->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1) ? 2 : 1;
+    max_ports = 2;
 
     for (int i = 0; i < max_ports; i++) {
-        kbc_at_ports[i] = (kbc_at_port_t *) malloc(sizeof(kbc_at_port_t));
-        memset(kbc_at_ports[i], 0x00, sizeof(kbc_at_port_t));
+        kbc_at_ports[i] = (kbc_at_port_t *) calloc(1, sizeof(kbc_at_port_t));
         kbc_at_ports[i]->out_new = -1;
     }
 
@@ -2100,314 +3050,32 @@ kbc_at_init(const device_t *info)
     dev->ports[1] = kbc_at_ports[1];
 
     /* The actual keyboard. */
-    device_add(&keyboard_at_generic_device);
+    if (keyboard_type == KEYBOARD_TYPE_INTERNAL) {
+        if (machine_has_flags(machine, MACHINE_KEYBOARD_JIS))
+            device_add(machine_has_flags_ex(MACHINE_PS2_KBC) ? &keyboard_ps55_device :
+                       &keyboard_ax_device);
+        else
+            device_add_params(&keyboard_at_generic_device, (void *) (uintptr_t)
+                              (machine_has_flags_ex(MACHINE_PS2_KBC) ? FLAG_PS2_KBD : 0x00));
+    } else
+        keyboard_add_device();
+
+    fast_reset = 0x00;
+
+    kbc_at_handler(1, 0x0060, dev);
 
     return dev;
 }
 
-const device_t keyboard_at_device = {
-    .name          = "PC/AT Keyboard",
-    .internal_name = "keyboard_at",
+const device_t kbc_at_device = {
+    .name          = "PC/AT Keyboard Controller",
+    .internal_name = "kbc_at",
     .flags         = DEVICE_KBC,
-    .local         = KBC_TYPE_ISA | KBC_VEN_GENERIC,
+    .local         = KBC_VEN_GENERIC,
     .init          = kbc_at_init,
     .close         = kbc_at_close,
     .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_at_siemens_device = {
-    .name          = "PC/AT Keyboard",
-    .internal_name = "keyboard_at",
-    .flags         = DEVICE_KBC,
-    .local         = KBC_TYPE_ISA | KBC_VEN_SIEMENS,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_at_ami_device = {
-    .name          = "PC/AT Keyboard (AMI)",
-    .internal_name = "keyboard_at_ami",
-    .flags         = DEVICE_KBC,
-    .local         = KBC_TYPE_ISA | KBC_VEN_AMI,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_at_tg_ami_device = {
-    .name          = "PC/AT Keyboard (TriGem AMI)",
-    .internal_name = "keyboard_at_tg_ami",
-    .flags         = DEVICE_KBC,
-    .local         = KBC_TYPE_ISA | KBC_VEN_TRIGEM_AMI,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_at_toshiba_device = {
-    .name          = "PC/AT Keyboard (Toshiba)",
-    .internal_name = "keyboard_at_toshiba",
-    .flags         = DEVICE_KBC,
-    .local         = KBC_TYPE_ISA | KBC_VEN_TOSHIBA,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_at_olivetti_device = {
-    .name          = "PC/AT Keyboard (Olivetti)",
-    .internal_name = "keyboard_at_olivetti",
-    .flags         = DEVICE_KBC,
-    .local         = KBC_TYPE_ISA | KBC_VEN_OLIVETTI,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_at_ncr_device = {
-    .name          = "PC/AT Keyboard (NCR)",
-    .internal_name = "keyboard_at_ncr",
-    .flags         = DEVICE_KBC,
-    .local         = KBC_TYPE_ISA | KBC_VEN_NCR,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_at_compaq_device = {
-    .name          = "PC/AT Keyboard (Compaq)",
-    .internal_name = "keyboard_at_compaq",
-    .flags         = DEVICE_KBC,
-    .local         = KBC_TYPE_ISA | KBC_VEN_COMPAQ,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_ps2_device = {
-    .name          = "PS/2 Keyboard",
-    .internal_name = "keyboard_ps2",
-    .flags         = DEVICE_KBC,
-    .local         = KBC_TYPE_PS2_1 | KBC_VEN_GENERIC,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_ps2_ps1_device = {
-    .name          = "PS/2 Keyboard (IBM PS/1)",
-    .internal_name = "keyboard_ps2_ps1",
-    .flags         = DEVICE_KBC,
-    .local         = KBC_TYPE_PS2_1 | KBC_VEN_IBM_PS1,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_ps2_ps1_pci_device = {
-    .name          = "PS/2 Keyboard (IBM PS/1)",
-    .internal_name = "keyboard_ps2_ps1_pci",
-    .flags         = DEVICE_KBC | DEVICE_PCI,
-    .local         = KBC_TYPE_PS2_1 | KBC_VEN_IBM_PS1,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_ps2_xi8088_device = {
-    .name          = "PS/2 Keyboard (Xi8088)",
-    .internal_name = "keyboard_ps2_xi8088",
-    .flags         = DEVICE_KBC,
-    .local         = KBC_TYPE_PS2_1 | KBC_VEN_GENERIC,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_ps2_ami_device = {
-    .name          = "PS/2 Keyboard (AMI)",
-    .internal_name = "keyboard_ps2_ami",
-    .flags         = DEVICE_KBC,
-    .local         = KBC_TYPE_PS2_1 | KBC_VEN_AMI,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_ps2_tg_ami_device = {
-    .name          = "PS/2 Keyboard (TriGem AMI)",
-    .internal_name = "keyboard_ps2_tg_ami",
-    .flags         = DEVICE_KBC,
-    .local         = KBC_TYPE_PS2_1 | KBC_VEN_TRIGEM_AMI,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_ps2_mca_2_device = {
-    .name          = "PS/2 Keyboard",
-    .internal_name = "keyboard_ps2_mca_2",
-    .flags         = DEVICE_KBC,
-    .local         = KBC_TYPE_PS2_2 | KBC_VEN_GENERIC,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_ps2_quadtel_device = {
-    .name          = "PS/2 Keyboard (Quadtel/MegaPC)",
-    .internal_name = "keyboard_ps2_quadtel",
-    .flags         = DEVICE_KBC,
-    .local         = KBC_TYPE_PS2_1 | KBC_VEN_QUADTEL,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_ps2_pci_device = {
-    .name          = "PS/2 Keyboard",
-    .internal_name = "keyboard_ps2_pci",
-    .flags         = DEVICE_KBC | DEVICE_PCI,
-    .local         = KBC_TYPE_PS2_1 | KBC_VEN_GENERIC,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_ps2_ami_pci_device = {
-    .name          = "PS/2 Keyboard (AMI)",
-    .internal_name = "keyboard_ps2_ami_pci",
-    .flags         = DEVICE_KBC | DEVICE_PCI,
-    .local         = KBC_TYPE_PS2_1 | KBC_VEN_AMI,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_ps2_ali_pci_device = {
-    .name          = "PS/2 Keyboard (ALi M5123/M1543C)",
-    .internal_name = "keyboard_ps2_ali_pci",
-    .flags         = DEVICE_KBC | DEVICE_PCI,
-    .local         = KBC_TYPE_PS2_1 | KBC_VEN_ALI,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_ps2_intel_ami_pci_device = {
-    .name          = "PS/2 Keyboard (AMI)",
-    .internal_name = "keyboard_ps2_intel_ami_pci",
-    .flags         = DEVICE_KBC | DEVICE_PCI,
-    .local         = KBC_TYPE_GREEN | KBC_VEN_AMI,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_ps2_tg_ami_pci_device = {
-    .name          = "PS/2 Keyboard (TriGem AMI)",
-    .internal_name = "keyboard_ps2_tg_ami_pci",
-    .flags         = DEVICE_KBC | DEVICE_PCI,
-    .local         = KBC_TYPE_PS2_1 | KBC_VEN_TRIGEM_AMI,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_ps2_acer_pci_device = {
-    .name          = "PS/2 Keyboard (Acer 90M002A)",
-    .internal_name = "keyboard_ps2_acer_pci",
-    .flags         = DEVICE_KBC | DEVICE_PCI,
-    .local         = KBC_TYPE_PS2_1 | KBC_VEN_ACER,
-    .init          = kbc_at_init,
-    .close         = kbc_at_close,
-    .reset         = kbc_at_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/device/kbc_at_dev.c b/src/device/kbc_at_dev.c
index c1041e6e1..81ab0aee9 100644
--- a/src/device/kbc_at_dev.c
+++ b/src/device/kbc_at_dev.c
@@ -8,11 +8,9 @@
  *
  *          AT / PS/2 attached device emulation.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2023 Miran Grca.
+ *          Copyright 2023-2025 Miran Grca.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -22,23 +20,9 @@
 #define HAVE_STDARG_H
 #include <wchar.h>
 #include <86box/86box.h>
-#include "cpu.h"
-#include <86box/timer.h>
-#include <86box/io.h>
-#include <86box/pic.h>
-#include <86box/pit.h>
-#include <86box/ppi.h>
-#include <86box/mem.h>
 #include <86box/device.h>
-#include <86box/machine.h>
-#include <86box/m_at_t3100e.h>
-#include <86box/fdd.h>
-#include <86box/fdc.h>
-#include <86box/sound.h>
-#include <86box/snd_speaker.h>
-#include <86box/video.h>
-#include <86box/keyboard.h>
 #include <86box/plat_fallthrough.h>
+#include <86box/keyboard.h>
 
 #ifdef ENABLE_KBC_AT_DEV_LOG
 int kbc_at_dev_do_log = ENABLE_KBC_AT_DEV_LOG;
@@ -58,7 +42,7 @@ kbc_at_dev_log(const char *fmt, ...)
 #    define kbc_at_dev_log(fmt, ...)
 #endif
 
-static void
+void
 kbc_at_dev_queue_reset(atkbc_dev_t *dev, uint8_t reset_main)
 {
     if (reset_main) {
@@ -95,10 +79,6 @@ kbc_at_dev_queue_add(atkbc_dev_t *dev, uint8_t val, uint8_t main)
         dev->cmd_queue[dev->cmd_queue_end] = val;
         dev->cmd_queue_end                 = (dev->cmd_queue_end + 1) & 0xf;
     }
-
-    /* TODO: This should be done on actual send to host. */
-    if (val != 0xfe)
-        dev->last_scan_code = val;
 }
 
 static void
@@ -123,6 +103,8 @@ kbc_at_dev_poll(void *priv)
                 (dev->queue_start != dev->queue_end)) {
                 kbc_at_dev_log("%s: %02X (DATA) on channel 1\n", dev->name, dev->queue[dev->queue_start]);
                 dev->port->out_new   = dev->queue[dev->queue_start];
+                if (dev->port->out_new != 0xfe)
+                    dev->last_scan_code = dev->port->out_new;
                 dev->queue_start     = (dev->queue_start + 1) & dev->fifo_mask;
             }
             if (dev->ignore || !(*dev->scan) || dev->port->wantcmd)
@@ -143,6 +125,8 @@ kbc_at_dev_poll(void *priv)
             if ((dev->port->out_new == -1) && (dev->cmd_queue_start != dev->cmd_queue_end)) {
                 kbc_at_dev_log("%s: %02X (CMD ) on channel 1\n", dev->name, dev->cmd_queue[dev->cmd_queue_start]);
                 dev->port->out_new   = dev->cmd_queue[dev->cmd_queue_start];
+                if (dev->port->out_new != 0xfe)
+                    dev->last_scan_code = dev->port->out_new;
                 dev->cmd_queue_start = (dev->cmd_queue_start + 1) & 0xf;
             }
             if (dev->cmd_queue_start == dev->cmd_queue_end)
@@ -166,6 +150,8 @@ kbc_at_dev_poll(void *priv)
             if ((dev->port->out_new == -1) && (dev->cmd_queue_start != dev->cmd_queue_end)) {
                 kbc_at_dev_log("%s: %02X (CMD ) on channel 1\n", dev->name, dev->cmd_queue[dev->cmd_queue_start]);
                 dev->port->out_new   = dev->cmd_queue[dev->cmd_queue_start];
+                if (dev->port->out_new != 0xfe)
+                    dev->last_scan_code = dev->port->out_new;
                 dev->cmd_queue_start = (dev->cmd_queue_start + 1) & 0xf;
             }
             if (dev->cmd_queue_start == dev->cmd_queue_end)
diff --git a/src/device/kbc_xt.c b/src/device/kbc_xt.c
new file mode 100644
index 000000000..176f1df43
--- /dev/null
+++ b/src/device/kbc_xt.c
@@ -0,0 +1,903 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the XT-style keyboard.
+ *
+ *
+ *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *          Fred N. van Kempen, <decwiz@yahoo.com>
+ *          EngiNerd, <webmaster.crrc@yahoo.it>
+ *
+ *          Copyright 2008-2019 Sarah Walker.
+ *          Copyright 2016-2019 Miran Grca.
+ *          Copyright 2017-2019 Fred N. van kempen.
+ *          Copyright 2020 EngiNerd.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#define HAVE_STDARG_H
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/fdd.h>
+#include <86box/machine.h>
+#include <86box/m_xt_t1000.h>
+#include <86box/cassette.h>
+#include <86box/io.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/ppi.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/sound.h>
+#include <86box/snd_speaker.h>
+#include <86box/video.h>
+#include <86box/keyboard.h>
+
+#define STAT_PARITY   0x80
+#define STAT_RTIMEOUT 0x40
+#define STAT_TTIMEOUT 0x20
+#define STAT_LOCK     0x10
+#define STAT_CD       0x08
+#define STAT_SYSFLAG  0x04
+#define STAT_IFULL    0x02
+#define STAT_OFULL    0x01
+
+/* Keyboard Types */
+enum {
+    KBD_TYPE_PC81 = 0,
+    KBD_TYPE_PC82,
+    KBD_TYPE_XT82,
+    KBD_TYPE_XT86,
+    KBD_TYPE_COMPAQ,
+    KBD_TYPE_TANDY,
+    KBD_TYPE_TOSHIBA,
+    KBD_TYPE_VTECH,
+    KBD_TYPE_OLIVETTI,
+    KBD_TYPE_ZENITH,
+    KBD_TYPE_PRAVETZ,
+    KBD_TYPE_HYUNDAI,
+    KBD_TYPE_FE2010,
+    KBD_TYPE_XTCLONE
+};
+
+typedef struct xtkbd_t {
+    int want_irq;
+    int blocked;
+    int tandy;
+
+    uint8_t pa;
+    uint8_t pb;
+    uint8_t pd;
+    uint8_t cfg;
+    uint8_t clock;
+    uint8_t key_waiting;
+    uint8_t type;
+    uint8_t pravetz_flags;
+    uint8_t cpu_speed;
+
+    pc_timer_t send_delay_timer;
+} xtkbd_t;
+
+static uint8_t key_queue[16];
+static int     key_queue_start = 0;
+static int     key_queue_end   = 0;
+static int     is_tandy = 0;
+static int     is_t1x00 = 0;
+static int     is_amstrad = 0;
+
+#ifdef ENABLE_KEYBOARD_XT_LOG
+int keyboard_xt_do_log = ENABLE_KEYBOARD_XT_LOG;
+
+static void
+kbd_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (keyboard_xt_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define kbd_log(fmt, ...)
+#endif
+
+static uint8_t
+get_fdd_switch_settings(void)
+{
+
+    uint8_t fdd_count = 0;
+
+    for (uint8_t i = 0; i < FDD_NUM; i++) {
+        if (fdd_get_flags(i))
+            fdd_count++;
+    }
+
+    if (!fdd_count)
+        return 0x00;
+    else
+        return ((fdd_count - 1) << 6) | 0x01;
+}
+
+static uint8_t
+get_videomode_switch_settings(void)
+{
+
+    if (video_is_mda())
+        return 0x30;
+    else if (video_is_cga())
+        return 0x20; /* 0x10 would be 40x25 */
+    else
+        return 0x00;
+}
+
+static void
+kbd_poll(void *priv)
+{
+    xtkbd_t *kbd = (xtkbd_t *) priv;
+
+    timer_advance_u64(&kbd->send_delay_timer, 1000 * TIMER_USEC);
+
+    if (!(kbd->pb & 0x40) && (kbd->type != KBD_TYPE_TANDY))
+        return;
+
+    if (kbd->want_irq) {
+        kbd->want_irq = 0;
+        kbd->pa       = kbd->key_waiting;
+        kbd->blocked  = 1;
+        picint(2);
+#ifdef ENABLE_KEYBOARD_XT_LOG
+        kbd_log("XTkbd: kbd_poll(): keyboard_xt : take IRQ\n");
+#endif
+    }
+
+    if ((key_queue_start != key_queue_end) && !kbd->blocked) {
+        kbd->key_waiting = key_queue[key_queue_start];
+        kbd_log("XTkbd: reading %02X from the key queue at %i\n",
+                kbd->key_waiting, key_queue_start);
+        key_queue_start = (key_queue_start + 1) & 0x0f;
+        kbd->want_irq   = 1;
+    }
+}
+
+static void
+kbd_adddata(uint16_t val)
+{
+    /* Test for T1000 'Fn' key (Right Alt / Right Ctrl) */
+    if (is_t1x00) {
+        if (keyboard_recv(0x138) || keyboard_recv(0x11d)) { /* 'Fn' pressed */
+            t1000_syskey(0x00, 0x04, 0x00);                 /* Set 'Fn' indicator */
+            switch (val) {
+                case 0x45: /* Num Lock => toggle numpad */
+                    t1000_syskey(0x00, 0x00, 0x10);
+                    break;
+                case 0x47: /* Home => internal display */
+                    t1000_syskey(0x40, 0x00, 0x00);
+                    break;
+                case 0x49: /* PgDn => turbo on */
+                    t1000_syskey(0x80, 0x00, 0x00);
+                    break;
+                case 0x4D: /* Right => toggle LCD font */
+                    t1000_syskey(0x00, 0x00, 0x20);
+                    break;
+                case 0x4F: /* End => external display */
+                    t1000_syskey(0x00, 0x40, 0x00);
+                    break;
+                case 0x51: /* PgDn => turbo off */
+                    t1000_syskey(0x00, 0x80, 0x00);
+                    break;
+                case 0x54: /* SysRQ => toggle window */
+                    t1000_syskey(0x00, 0x00, 0x08);
+                    break;
+
+                default:
+                    break;
+            }
+        } else
+            t1000_syskey(0x04, 0x00, 0x00); /* Reset 'Fn' indicator */
+    }
+
+    key_queue[key_queue_end] = val;
+    kbd_log("XTkbd: %02X added to key queue at %i\n",
+            val, key_queue_end);
+    key_queue_end = (key_queue_end + 1) & 0x0f;
+}
+
+void
+kbd_adddata_process(uint16_t val, void (*adddata)(uint16_t val))
+{
+    uint8_t num_lock = 0;
+    uint8_t shift_states = 0;
+
+    if (!adddata)
+        return;
+
+    keyboard_get_states(NULL, &num_lock, NULL, NULL);
+    shift_states = keyboard_get_shift() & STATE_LSHIFT;
+
+    if (is_amstrad)
+        num_lock = !num_lock;
+
+    /* If NumLock is on, invert the left shift state so we can always check for
+       the the same way flag being set (and with NumLock on that then means it
+       is actually *NOT* set). */
+    if (num_lock)
+        shift_states ^= STATE_LSHIFT;
+
+    switch (val) {
+        case FAKE_LSHIFT_ON:
+            /* If NumLock is on, fake shifts are sent when shift is *NOT* presed,
+               if NumLock is off, fake shifts are sent when shift is pressed. */
+            if (shift_states) {
+                /* Send fake shift. */
+                adddata(num_lock ? 0x2a : 0xaa);
+            }
+            break;
+        case FAKE_LSHIFT_OFF:
+            if (shift_states) {
+                /* Send fake shift. */
+                adddata(num_lock ? 0xaa : 0x2a);
+            }
+            break;
+        default:
+            adddata(val);
+            break;
+    }
+}
+
+static void
+kbd_adddata_ex(uint16_t val)
+{
+    kbd_adddata_process(val, kbd_adddata);
+}
+
+static void
+kbd_write(uint16_t port, uint8_t val, void *priv)
+{
+    xtkbd_t *kbd = (xtkbd_t *) priv;
+    uint8_t  bit;
+    uint8_t  set;
+    uint8_t  new_clock;
+
+    switch (port) {
+        case 0x61: /* Keyboard Control Register (aka Port B) */
+            if (!(val & 0x80) || (kbd->type == KBD_TYPE_HYUNDAI)) {
+                new_clock = !!(val & 0x40);
+                if (!kbd->clock && new_clock) {
+                    key_queue_start = key_queue_end = 0;
+                    kbd->want_irq                   = 0;
+                    kbd->blocked                    = 0;
+                    kbd_adddata(0xaa);
+                }
+            }
+
+            kbd->pb = val;
+            if (!(kbd->pb & 0x80) || (kbd->type == KBD_TYPE_HYUNDAI))
+                kbd->clock = !!(kbd->pb & 0x40);
+            ppi.pb = val;
+
+            timer_process();
+
+            if (((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) ||
+                (kbd->type == KBD_TYPE_PRAVETZ)) && (cassette != NULL))
+                pc_cas_set_motor(cassette, (kbd->pb & 0x08) == 0);
+
+            speaker_update();
+
+            speaker_gated  = val & 1;
+            speaker_enable = val & 2;
+
+            if (speaker_enable)
+                was_speaker_enable = 1;
+            pit_devs[0].set_gate(pit_devs[0].data, 2, val & 1);
+
+            if (val & 0x80) {
+                kbd->pa      = 0;
+                kbd->blocked = 0;
+                picintc(2);
+            }
+
+#ifdef ENABLE_KEYBOARD_XT_LOG
+            if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) || (kbd->type == KBD_TYPE_PRAVETZ))
+                kbd_log("XTkbd: Cassette motor is %s\n", !(val & 0x08) ? "ON" : "OFF");
+#endif
+            break;
+
+        case 0x62: /* Switch Register (aka Port C) */
+#ifdef ENABLE_KEYBOARD_XT_LOG
+            if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) || (kbd->type == KBD_TYPE_PRAVETZ))
+                kbd_log("XTkbd: Cassette IN is %i\n", !!(val & 0x10));
+#endif
+            if (kbd->type == KBD_TYPE_FE2010) {
+                kbd_log("XTkbd: Switch register in is %02X\n", val);
+                if (!(kbd->cfg & 0x08))
+                    kbd->pd = (kbd->pd & 0x30) | (val & 0xcf);
+            }
+            break;
+
+        case 0x63:
+            if (kbd->type == KBD_TYPE_FE2010) {
+                kbd_log("XTkbd: Configuration register in is %02X\n", val);
+                if (!(kbd->cfg & 0x08))
+                    kbd->cfg = val;
+            }
+            break;
+
+        case 0xc0 ... 0xcf: /* Pravetz Flags */
+            kbd_log("XTkbd: Port %02X out: %02X\n", port, val);
+            if (kbd->type == KBD_TYPE_PRAVETZ) {
+                bit                = (port >> 1) & 0x07;
+                set                = (port & 0x01) << bit;
+                kbd->pravetz_flags = (kbd->pravetz_flags & ~(1 << bit)) | set;
+            }
+            break;
+
+        case 0x1f0:
+            kbd_log("XTkbd: Port %04X out: %02X\n", port, val);
+            if (kbd->type == KBD_TYPE_VTECH) {
+                kbd->cpu_speed     = val;
+                cpu_dynamic_switch(kbd->cpu_speed >> 7);
+            }
+            break;
+
+        default:
+            break;
+    }
+}
+
+static uint8_t
+kbd_read(uint16_t port, void *priv)
+{
+    const xtkbd_t *kbd = (xtkbd_t *) priv;
+    uint8_t        ret = 0xff;
+
+    switch (port) {
+        case 0x60: /* Keyboard Data Register  (aka Port A) */
+            if ((kbd->pb & 0x80) && ((kbd->type == KBD_TYPE_PC81) ||
+                (kbd->type == KBD_TYPE_PC82) || (kbd->type == KBD_TYPE_PRAVETZ) ||
+                (kbd->type == KBD_TYPE_XT82) || (kbd->type == KBD_TYPE_XT86) ||
+                (kbd->type == KBD_TYPE_XTCLONE) || (kbd->type == KBD_TYPE_COMPAQ) ||
+                (kbd->type == KBD_TYPE_ZENITH) || (kbd->type == KBD_TYPE_HYUNDAI) ||
+                (kbd->type == KBD_TYPE_VTECH))) {
+                if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) ||
+                    (kbd->type == KBD_TYPE_XTCLONE) || (kbd->type == KBD_TYPE_COMPAQ) ||
+                    (kbd->type == KBD_TYPE_PRAVETZ) || (kbd->type == KBD_TYPE_HYUNDAI))
+                    ret = (kbd->pd & ~0x02) | (hasfpu ? 0x02 : 0x00);
+                else if ((kbd->type == KBD_TYPE_XT82) || (kbd->type == KBD_TYPE_XT86) ||
+                    (kbd->type == KBD_TYPE_VTECH))
+                    /* According to Ruud on the PCem forum, this is supposed to
+                       return 0xFF on the XT. */
+                    ret = 0xff;
+                else if (kbd->type == KBD_TYPE_ZENITH) {
+                    /* Zenith Data Systems Z-151
+                     * SW1 switch settings:
+                     * bits 6-7: floppy drive number
+                     * bits 4-5: video mode
+                     * bit 2-3: base memory size
+                     * bit 1: fpu enable
+                     * bit 0: fdc enable
+                     */
+                    ret = get_fdd_switch_settings();
+
+                    ret |= get_videomode_switch_settings();
+
+                    /* Base memory size should always be 64k */
+                    ret |= 0x0c;
+
+                    if (hasfpu)
+                        ret |= 0x02;
+                }
+            } else
+                ret = kbd->pa;
+            break;
+
+        case 0x61: /* Keyboard Control Register (aka Port B) */
+            ret = kbd->pb;
+            break;
+
+        case 0x62: /* Switch Register (aka Port C) */
+            if (kbd->type == KBD_TYPE_FE2010) {
+                if (kbd->pb & 0x04) /* PB2 */
+                    ret = (kbd->pd & 0x0d) | (hasfpu ? 0x02 : 0x00);
+                else
+                    ret = kbd->pd >> 4;
+            } else if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) ||
+                (kbd->type == KBD_TYPE_PRAVETZ)) {
+                if (kbd->pb & 0x04) /* PB2 */
+                    switch (mem_size + isa_mem_size) {
+                        case 64:
+                        case 48:
+                        case 32:
+                        case 16:
+                            ret = 0x00;
+                            break;
+                        default:
+                            ret = (((mem_size + isa_mem_size) - 64) / 32) & 0x0f;
+                            break;
+                    }
+                else
+                    ret = (((mem_size + isa_mem_size) - 64) / 32) >> 4;
+            } else if ((kbd->type == KBD_TYPE_OLIVETTI) ||
+                       (kbd->type == KBD_TYPE_ZENITH)) {
+                /* Olivetti M19 or Zenith Data Systems Z-151 */
+                if (kbd->pb & 0x04) /* PB2 */
+                    ret = kbd->pd & 0xbf;
+                else
+                    ret = kbd->pd >> 4;
+            } else {
+                if (kbd->pb & 0x08) /* PB3 */
+                    ret = kbd->pd >> 4;
+                else
+                    ret = (kbd->pd & 0x0d) | (hasfpu ? 0x02 : 0x00);
+            }
+            ret |= (ppispeakon ? 0x20 : 0);
+
+            /* This is needed to avoid error 131 (cassette error).
+               This is serial read: bit 5 = clock, bit 4 = data, cassette header is 256 x 0xff. */
+            if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) ||
+                (kbd->type == KBD_TYPE_PRAVETZ)) {
+                if (cassette == NULL)
+                    ret |= (ppispeakon ? 0x10 : 0);
+                else
+                    ret |= (pc_cas_get_inp(cassette) ? 0x10 : 0);
+            }
+
+            if (kbd->type == KBD_TYPE_TANDY)
+                ret |= (tandy1k_eeprom_read() ? 0x10 : 0);
+            break;
+
+        case 0x63: /* Keyboard Configuration Register (aka Port D) */
+            if ((kbd->type == KBD_TYPE_XT82) || (kbd->type == KBD_TYPE_XT86) ||
+                (kbd->type == KBD_TYPE_XTCLONE) || (kbd->type == KBD_TYPE_COMPAQ) ||
+                (kbd->type == KBD_TYPE_TOSHIBA) || (kbd->type == KBD_TYPE_HYUNDAI) ||
+                (kbd->type == KBD_TYPE_VTECH))
+                ret = kbd->pd;
+            break;
+
+        case 0xc0: /* Pravetz Flags */
+            if (kbd->type == KBD_TYPE_PRAVETZ)
+                ret = kbd->pravetz_flags;
+            kbd_log("XTkbd: Port %02X in : %02X\n", port, ret);
+            break;
+
+        case 0x1f0:
+            if (kbd->type == KBD_TYPE_VTECH)
+                ret = kbd->cpu_speed;
+            kbd_log("XTkbd: Port %04X in : %02X\n", port, ret);
+            break;
+
+        default:
+            break;
+    }
+
+    return ret;
+}
+
+static void
+kbd_reset(void *priv)
+{
+    xtkbd_t *kbd = (xtkbd_t *) priv;
+
+    kbd->want_irq      = 0;
+    kbd->blocked       = 0;
+    kbd->pa            = 0x00;
+    kbd->pb            = 0x00;
+    kbd->pravetz_flags = 0x00;
+
+    keyboard_scan   = 1;
+
+    key_queue_start = 0;
+    key_queue_end   = 0;
+}
+
+void
+keyboard_set_is_amstrad(int ams)
+{
+    is_amstrad = ams;
+}
+
+static void *
+kbd_init(const device_t *info)
+{
+    xtkbd_t *kbd;
+
+    kbd = (xtkbd_t *) calloc(1, sizeof(xtkbd_t));
+
+    io_sethandler(0x0060, 4,
+                  kbd_read, NULL, NULL, kbd_write, NULL, NULL, kbd);
+    keyboard_send = kbd_adddata_ex;
+    kbd->type = info->local;
+    if (kbd->type == KBD_TYPE_VTECH)
+        kbd->cpu_speed = (!!cpu) << 2;
+    kbd_reset(kbd);
+    if (kbd->type == KBD_TYPE_PRAVETZ)
+        io_sethandler(0x00c0, 16,
+                      kbd_read, NULL, NULL, kbd_write, NULL, NULL, kbd);
+    if (kbd->type == KBD_TYPE_VTECH)
+        io_sethandler(0x01f0, 1,
+                      kbd_read, NULL, NULL, kbd_write, NULL, NULL, kbd);
+
+    key_queue_start = key_queue_end = 0;
+
+    video_reset(gfxcard[0]);
+
+    if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) ||
+        (kbd->type == KBD_TYPE_PRAVETZ) || (kbd->type == KBD_TYPE_XT82) ||
+        (kbd->type <= KBD_TYPE_XT86) || (kbd->type == KBD_TYPE_XTCLONE) ||
+        (kbd->type == KBD_TYPE_COMPAQ) || (kbd->type == KBD_TYPE_TOSHIBA) ||
+        (kbd->type == KBD_TYPE_OLIVETTI) || (kbd->type == KBD_TYPE_HYUNDAI) ||
+        (kbd->type == KBD_TYPE_VTECH) || (kbd->type == KBD_TYPE_FE2010)) {
+        /* DIP switch readout: bit set = OFF, clear = ON. */
+        if (kbd->type == KBD_TYPE_OLIVETTI)
+            /* Olivetti M19
+             * Jumpers J1, J2 - monitor type.
+             * 01 - mono (high-res)
+             * 10 - color (low-res, disables 640x400x2 mode)
+             * 00 - autoswitching
+             */
+            kbd->pd |= 0x00;
+        else
+            /* Switches 7, 8 - floppy drives. */
+            kbd->pd = get_fdd_switch_settings();
+
+        /* Switches 5, 6 - video card type */
+        kbd->pd |= get_videomode_switch_settings();
+
+        /* Switches 3, 4 - memory size. */
+        if ((kbd->type == KBD_TYPE_XT86) || (kbd->type == KBD_TYPE_XTCLONE) ||
+            (kbd->type == KBD_TYPE_HYUNDAI) || (kbd->type == KBD_TYPE_COMPAQ) ||
+            (kbd->type == KBD_TYPE_TOSHIBA) || (kbd->type == KBD_TYPE_FE2010)) {
+            switch (mem_size) {
+                case 256:
+                    kbd->pd |= 0x00;
+                    break;
+                case 512:
+                    kbd->pd |= 0x04;
+                    break;
+                case 576:
+                    kbd->pd |= 0x08;
+                    break;
+                case 640:
+                default:
+                    kbd->pd |= 0x0c;
+                    break;
+            }
+        } else if ((kbd->type == KBD_TYPE_XT82) || (kbd->type == KBD_TYPE_VTECH)) {
+            switch (mem_size) {
+                case 64: /* 1x64k */
+                    kbd->pd |= 0x00;
+                    break;
+                case 128: /* 2x64k */
+                    kbd->pd |= 0x04;
+                    break;
+                case 192: /* 3x64k */
+                    kbd->pd |= 0x08;
+                    break;
+                case 256: /* 4x64k */
+                default:
+                    kbd->pd |= 0x0c;
+                    break;
+            }
+        } else if (kbd->type == KBD_TYPE_PC82) {
+            switch (mem_size) {
+#ifdef PC82_192K_3BANK
+                case 192: /* 3x64k, not supported by stock BIOS due to bugs */
+                    kbd->pd |= 0x08;
+                    break;
+#else
+                case 192: /* 2x64k + 2x32k */
+#endif
+                case 64:  /* 4x16k */
+                case 96:  /* 2x32k + 2x16k */
+                case 128: /* 4x32k */
+                case 160: /* 2x64k + 2x16k */
+                case 224: /* 3x64k + 1x32k */
+                case 256: /* 4x64k */
+                default:
+                    kbd->pd |= 0x0c;
+                    break;
+            }
+        } else { /* really just the PC '81 */
+            switch (mem_size) {
+                case 16: /* 1x16k */
+                    kbd->pd |= 0x00;
+                    break;
+                case 32: /* 2x16k */
+                    kbd->pd |= 0x04;
+                    break;
+                case 48: /* 3x16k */
+                    kbd->pd |= 0x08;
+                    break;
+                case 64: /* 4x16k */
+                default:
+                    kbd->pd |= 0x0c;
+                    break;
+            }
+        }
+
+        /* Switch 2 - 8087 FPU. */
+        if (hasfpu)
+            kbd->pd |= 0x02;
+    } else if (kbd->type == KBD_TYPE_ZENITH) {
+        /* Zenith Data Systems Z-151
+         * SW2 switch settings:
+         * bit 7: monitor frequency
+         * bits 5-6: autoboot (00-11 resident monitor, 10 hdd, 01 fdd)
+         * bits 0-4: installed memory
+         */
+        kbd->pd = 0x20;
+        switch (mem_size) {
+            case 128:
+                kbd->pd |= 0x02;
+                break;
+            case 192:
+                kbd->pd |= 0x04;
+                break;
+            case 256:
+                kbd->pd |= 0x06;
+                break;
+            case 320:
+                kbd->pd |= 0x08;
+                break;
+            case 384:
+                kbd->pd |= 0x0a;
+                break;
+            case 448:
+                kbd->pd |= 0x0c;
+                break;
+            case 512:
+                kbd->pd |= 0x0e;
+                break;
+            case 576:
+                kbd->pd |= 0x10;
+                break;
+            case 640:
+            default:
+                kbd->pd |= 0x12;
+                break;
+        }
+    }
+
+    timer_add(&kbd->send_delay_timer, kbd_poll, kbd, 1);
+
+    is_tandy = (kbd->type == KBD_TYPE_TANDY);
+    is_t1x00 = (kbd->type == KBD_TYPE_TOSHIBA);
+
+    if (keyboard_type == KEYBOARD_TYPE_INTERNAL)
+        keyboard_set_table(scancode_xt);
+    else
+        keyboard_add_device();
+
+    is_amstrad = 0;
+
+    return kbd;
+}
+
+static void
+kbd_close(void *priv)
+{
+    xtkbd_t *kbd = (xtkbd_t *) priv;
+
+    /* Stop the timer. */
+    timer_disable(&kbd->send_delay_timer);
+
+    /* Disable scanning. */
+    keyboard_scan = 0;
+
+    keyboard_send = NULL;
+
+    io_removehandler(0x0060, 4,
+                     kbd_read, NULL, NULL, kbd_write, NULL, NULL, kbd);
+
+    free(kbd);
+}
+
+const device_t kbc_pc_device = {
+    .name          = "IBM PC Keyboard Controller (1981)",
+    .internal_name = "kbc_pc",
+    .flags         = 0,
+    .local         = KBD_TYPE_PC81,
+    .init          = kbd_init,
+    .close         = kbd_close,
+    .reset         = kbd_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t kbc_pc82_device = {
+    .name          = "IBM PC Keyboard Controller (1982)",
+    .internal_name = "kbc_pc82",
+    .flags         = 0,
+    .local         = KBD_TYPE_PC82,
+    .init          = kbd_init,
+    .close         = kbd_close,
+    .reset         = kbd_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t kbc_pravetz_device = {
+    .name          = "Pravetz Keyboard Controller",
+    .internal_name = "kbc_pravetz",
+    .flags         = 0,
+    .local         = KBD_TYPE_PRAVETZ,
+    .init          = kbd_init,
+    .close         = kbd_close,
+    .reset         = kbd_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t kbc_xt_device = {
+    .name          = "XT (1982) Keyboard Controller",
+    .internal_name = "kbc_xt",
+    .flags         = 0,
+    .local         = KBD_TYPE_XT82,
+    .init          = kbd_init,
+    .close         = kbd_close,
+    .reset         = kbd_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t kbc_xt86_device = {
+    .name          = "XT (1986) Keyboard Controller",
+    .internal_name = "kbc_xt86",
+    .flags         = 0,
+    .local         = KBD_TYPE_XT86,
+    .init          = kbd_init,
+    .close         = kbd_close,
+    .reset         = kbd_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t kbc_xt_compaq_device = {
+    .name          = "Compaq Portable Keyboard Controller",
+    .internal_name = "kbc_xt_compaq",
+    .flags         = 0,
+    .local         = KBD_TYPE_COMPAQ,
+    .init          = kbd_init,
+    .close         = kbd_close,
+    .reset         = kbd_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t kbc_tandy_device = {
+    .name          = "Tandy 1000 Keyboard Controller",
+    .internal_name = "kbc_tandy",
+    .flags         = 0,
+    .local         = KBD_TYPE_TANDY,
+    .init          = kbd_init,
+    .close         = kbd_close,
+    .reset         = kbd_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t kbc_xt_t1x00_device = {
+    .name          = "Toshiba T1x00 Keyboard Controller",
+    .internal_name = "kbc_xt_t1x00",
+    .flags         = 0,
+    .local         = KBD_TYPE_TOSHIBA,
+    .init          = kbd_init,
+    .close         = kbd_close,
+    .reset         = kbd_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t kbc_xt_lxt3_device = {
+    .name          = "VTech Laser Turbo XT Keyboard Controller",
+    .internal_name = "kbc_xt_lxt",
+    .flags         = 0,
+    .local         = KBD_TYPE_VTECH,
+    .init          = kbd_init,
+    .close         = kbd_close,
+    .reset         = kbd_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t kbc_xt_olivetti_device = {
+    .name          = "Olivetti XT Keyboard Controller",
+    .internal_name = "kbc_xt_olivetti",
+    .flags         = 0,
+    .local         = KBD_TYPE_OLIVETTI,
+    .init          = kbd_init,
+    .close         = kbd_close,
+    .reset         = kbd_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t kbc_xt_zenith_device = {
+    .name          = "Zenith XT Keyboard Controller",
+    .internal_name = "kbc_xt_zenith",
+    .flags         = 0,
+    .local         = KBD_TYPE_ZENITH,
+    .init          = kbd_init,
+    .close         = kbd_close,
+    .reset         = kbd_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t kbc_xt_hyundai_device = {
+    .name          = "Hyundai XT Keyboard Controller",
+    .internal_name = "kbc_xt_hyundai",
+    .flags         = 0,
+    .local         = KBD_TYPE_HYUNDAI,
+    .init          = kbd_init,
+    .close         = kbd_close,
+    .reset         = kbd_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t kbc_xt_fe2010_device = {
+    .name          = "Faraday FE2010 XT Keyboard Controller",
+    .internal_name = "kbc_xt_fe2010",
+    .flags         = 0,
+    .local         = KBD_TYPE_FE2010,
+    .init          = kbd_init,
+    .close         = kbd_close,
+    .reset         = kbd_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t kbc_xtclone_device = {
+    .name          = "XT (Clone) Keyboard Controller",
+    .internal_name = "kbc_xtclone",
+    .flags         = 0,
+    .local         = KBD_TYPE_XTCLONE,
+    .init          = kbd_init,
+    .close         = kbd_close,
+    .reset         = kbd_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/device/keyboard.c b/src/device/keyboard.c
index 5f9986d7b..524593eb7 100644
--- a/src/device/keyboard.c
+++ b/src/device/keyboard.c
@@ -18,54 +18,142 @@
  *          Copyright 2015-2019 Miran Grca.
  *          Copyright 2017-2019 Fred N. van Kempen.
  */
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
+#include <stdlib.h>
 #include <wchar.h>
+#define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/machine.h>
+#include <86box/device.h>
 #include <86box/keyboard.h>
+#include <86box/plat.h>
 
 #include "cpu.h"
 
-int keyboard_scan;
+uint16_t     scancode_map[768]        = { 0 };
+uint16_t     scancode_config_map[768] = { 0 };
 
-#ifdef _WIN32
-/* Windows: F8+F12 */
-uint16_t key_prefix_1_1 = 0x042;     /* F8 */
-uint16_t key_prefix_1_2 = 0x000;     /* Invalid */
-uint16_t key_prefix_2_1 = 0x000;     /* Invalid */
-uint16_t key_prefix_2_2 = 0x000;     /* Invalid */
-uint16_t key_uncapture_1 = 0x058;    /* F12 */
-uint16_t key_uncapture_2 = 0x000;    /* Invalid */
+int          keyboard_scan;
+
+typedef struct keyboard_t {
+    const device_t *device;
+} keyboard_t;
+
+int          keyboard_type = 0;
+
+static const device_t keyboard_internal_device = {
+    .name          = "Internal",
+    .internal_name = "internal",
+    .flags         = 0,
+    .local         = KEYBOARD_TYPE_INTERNAL,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+static keyboard_t keyboard_devices[] = {
+    // clang-format off
+    { &keyboard_internal_device        },
+    { &keyboard_pc_xt_device           },
+    { &keyboard_at_device              },
+    { &keyboard_ax_device              },
+    { &keyboard_ps2_device             },
+    { &keyboard_ps55_device            },
+    { NULL                             }
+    // clang-format on
+};
+
+#ifdef ENABLE_KBC_AT_LOG
+int kbc_at_do_log = ENABLE_KBC_AT_LOG;
+
+static void
+kbc_at_log(const char* fmt, ...)
+{
+    va_list ap;
+
+    if (kbc_at_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
 #else
-/* WxWidgets cannot do two regular keys.. CTRL+END */
-uint16_t key_prefix_1_1 = 0x01d;     /* Left Ctrl */
-uint16_t key_prefix_1_2 = 0x11d;     /* Right Ctrl */
-uint16_t key_prefix_2_1 = 0x000;     /* Invalid */
-uint16_t key_prefix_2_2 = 0x000;     /* Invalid */
-uint16_t key_uncapture_1 = 0x04f;    /* Numpad End */
-uint16_t key_uncapture_2 = 0x14f;    /* End */
+#    define kbc_at_log(fmt, ...)
 #endif
 
 void (*keyboard_send)(uint16_t val);
 
-static int recv_key[512]; /* keyboard input buffer */
-static int oldkey[512];
+static int recv_key[768] = { 0 }; /* keyboard input buffer */
+static int recv_key_ui[768] = { 0 }; /* keyboard input buffer */
+static int oldkey[768];
 #if 0
-static int keydelay[512];
+static int keydelay[768];
 #endif
 static scancode *scan_table; /* scancode table for keyboard */
 
-static uint8_t caps_lock   = 0;
-static uint8_t num_lock    = 0;
-static uint8_t scroll_lock = 0;
-static uint8_t shift       = 0;
+static volatile uint8_t caps_lock    = 0;
+static volatile uint8_t num_lock     = 0;
+static volatile uint8_t scroll_lock  = 0;
+static volatile uint8_t kana_lock    = 0;
+static volatile uint8_t kbd_in_reset = 0;
+static uint8_t shift                 = 0;
+
+static int key5576mode = 0;
+
+typedef struct {
+    const uint16_t sc;
+    const uint8_t mk[4];
+    const uint8_t brk[4];
+} scconvtbl;
+
+static scconvtbl scconv55_8a[18 + 1] =
+{
+    // clang-format off
+      {.sc = 0x02 , .mk = {    0x48 }, .brk = {       0 } }, /* '1' -> 'Clear/ /SysRq' */
+      {.sc = 0x03 , .mk = {    0x49 }, .brk = {       0 } }, /* '2' -> '終了 (Exit)' */
+      {.sc = 0x04 , .mk = {    0x46 }, .brk = {       0 } }, /* '3' -> 'メッセージ (Message)/ /応答 (Respond)' */
+      {.sc = 0x05 , .mk = {    0x44 }, .brk = {       0 } }, /* '4' -> 'サイズ変換 (Change Size)/ /横倍角 (2x Width)' */
+      {.sc = 0x06 , .mk = {    0x42 }, .brk = {       0 } }, /* '5' -> '単語登録 (Register Word)/ /再交換 (Re-change)' */
+      {.sc = 0x07 , .mk = {    0x43 }, .brk = {       0 } }, /* '6' -> '漢字 (Kanji)/ /番号 (Number)' */
+      {.sc = 0x08 , .mk = {    0x40 }, .brk = {       0 } }, /* '7' -> '取消 (Cancel)' */
+      {.sc = 0x09 , .mk = {    0x51 }, .brk = {       0 } }, /* '8' -> 'コピー (Copy)/ /移動 (Move)' */
+      {.sc = 0x3d , .mk = {    0x76 }, .brk = {       0 } }, /* 'F3' -> 'Cr Bnk/領域呼出 (Call Range)/All Cr/登録 (Register)' */
+      {.sc = 0x3e , .mk = {    0x77 }, .brk = {       0 } }, /* 'F4' -> '割込み (Interrupt)' */
+      {.sc = 0x3f , .mk = {    0x78 }, .brk = {       0 } }, /* 'F5' -> 'UF1' */
+      {.sc = 0x40 , .mk = {    0x79 }, .brk = {       0 } }, /* 'F6' -> 'UF2' */
+      {.sc = 0x41 , .mk = {    0x7a }, .brk = {       0 } }, /* 'F7' -> 'UF3' */
+      {.sc = 0x42 , .mk = {    0x7b }, .brk = {       0 } }, /* 'F8' -> 'UF4' */
+      {.sc = 0x43 , .mk = {    0x7c }, .brk = {       0 } }, /* 'F9' -> 'EOF/Erase/ErInp' */
+      {.sc = 0x44 , .mk = {    0x7d }, .brk = {       0 } }, /* 'F10' -> 'Attn/ /CrSel' */
+      {.sc = 0x57 , .mk = {    0x7e }, .brk = {       0 } }, /* 'F11' -> 'PA1/ /DvCncl' */
+      {.sc = 0x58 , .mk = {    0x7f }, .brk = {       0 } }, /* 'F12' -> 'PA2/ /PA3' */
+      {.sc = 0 , .mk = { 0 }, .brk = { 0 } } /* end */
+    // clang-format on
+};
 
 void
 keyboard_init(void)
 {
+    num_lock     = 0;
+    caps_lock    = 0;
+    scroll_lock  = 0;
+    kana_lock    = 0;
+    shift        = 0;
+    kbd_in_reset = 0;
+
     memset(recv_key, 0x00, sizeof(recv_key));
+    memset(recv_key_ui, 0x00, sizeof(recv_key));
+    memset(oldkey, 0x00, sizeof(recv_key));
+#if 0
+    memset(key_delay, 0x00, sizeof(recv_key));
+#endif
 
     keyboard_scan = 1;
     scan_table    = NULL;
@@ -115,8 +203,40 @@ key_process(uint16_t scan, int down)
     if (!keyboard_scan || (keyboard_send == NULL))
         return;
 
+    scan = scancode_config_map[scan];
+
     oldkey[scan] = down;
 
+    kbc_at_log("Key %04X,%d in process\n", scan, down);
+
+    c = 0;
+    /* According to Japanese DOS K3.3 manual (N:SC18-2194-1),
+      IBM 5576-002, -003 keyboards have the one-time key conversion mode
+      that emulates 18 out of 131 keys on IBM 5576-001 keyboard.
+      It is triggered by pressing L-Shift (⇧) + L-Ctrl + R-Alt (前面キー)
+      when the scancode set is 82h or 8ah.
+    */
+    if (key5576mode) {
+        int i = 0;
+        if (!down) {
+            /* Do and exit the 5576-001 emulation when a key is pressed other than trigger keys. */
+            if (scan != 0x1d && scan != 0x2a && scan != 0x138)
+            {
+                key5576mode = 0;
+                kbc_at_log("5576-001 key emulation disabled.\n");
+            }
+        }
+        while (scconv55_8a[i].sc != 0)
+        {
+            if (scconv55_8a[i].sc == scan) {
+                while (scconv55_8a[i].mk[c] != 0)
+                    keyboard_send(scconv55_8a[i].mk[c++]);
+                return;
+            }
+            i++;
+        }
+    }
+
     if (down && (codes[scan].mk[0] == 0))
         return;
 
@@ -143,12 +263,22 @@ key_process(uint16_t scan, int down)
         if (fake_shift_needed(scan))
             keyboard_send(0x101);
     }
+
+    /* Enter the 5576-001 emulation mode. */
+    if (keyboard_mode == 0x8a && down && ((keyboard_get_shift() & 0x43) == 0x43))
+    {
+        key5576mode = 1;
+        kbc_at_log("5576-001 key emulation enabled.\n");
+    }
 }
 
 /* Handle a keystroke event from the UI layer. */
 void
 keyboard_input(int down, uint16_t scan)
 {
+    if (kbd_in_reset)
+        return;
+
     /* Special case for E1 1D, translate it to 0100 - special case. */
     if ((scan >> 8) == 0xe1) {
         if ((scan & 0xff) == 0x1d)
@@ -223,13 +353,16 @@ keyboard_input(int down, uint16_t scan)
                     shift &= ~0x80;
                     break;
                 case 0x03a: /* Caps Lock */
-                    caps_lock ^= 1;
+                    if (!(machine_has_bus(machine, MACHINE_AT) > 0))
+                        caps_lock ^= 1;
                     break;
                 case 0x045:
-                    num_lock ^= 1;
+                    if (!(machine_has_bus(machine, MACHINE_AT) > 0))
+                        num_lock ^= 1;
                     break;
                 case 0x046:
-                    scroll_lock ^= 1;
+                    if (!(machine_has_bus(machine, MACHINE_AT) > 0))
+                        scroll_lock ^= 1;
                     break;
 
                 default:
@@ -238,16 +371,39 @@ keyboard_input(int down, uint16_t scan)
         }
     }
 
-    /* NOTE: Shouldn't this be some sort of bit shift? An array of 8 unsigned 64-bit integers
-             should be enough. */
-#if 0
-    recv_key[scan >> 6] |= ((uint64_t) down << ((uint64_t) scan & 0x3fLL));
-#endif
+    /* kbc_at_log("Received scan code: %03X (%s)\n", scan & 0x1ff, down ? "down" : "up"); */
+    recv_key_ui[scan & 0x1ff] = down;
 
-    /* pclog("Received scan code: %03X (%s)\n", scan & 0x1ff, down ? "down" : "up"); */
-    recv_key[scan & 0x1ff] = down;
+    if (mouse_capture || !kbd_req_capture || video_fullscreen) {
+        recv_key[scan & 0x1ff] = down;
+        key_process(scan & 0x1ff, down);
+    }
+}
 
-    key_process(scan & 0x1ff, down);
+void
+keyboard_all_up(void)
+{
+    for (unsigned short i = 0; i < 0x200; i++) {
+        if (recv_key_ui[i])
+            recv_key_ui[i] = 0;
+
+        if (recv_key[i]) {
+            recv_key[i] = 0;
+            key_process(i, 0);
+        }
+    }
+}
+
+void
+keyboard_set_in_reset(uint8_t in_reset)
+{
+    kbd_in_reset = in_reset;
+}
+
+uint8_t
+keyboard_get_in_reset(void)
+{
+    return kbd_in_reset;
 }
 
 static uint8_t
@@ -269,11 +425,12 @@ keyboard_do_break(uint16_t scan)
    Caps Lock, Num Lock, and Scroll Lock when receving the "Set keyboard LEDs"
    command. */
 void
-keyboard_update_states(uint8_t cl, uint8_t nl, uint8_t sl)
+keyboard_update_states(uint8_t cl, uint8_t nl, uint8_t sl, uint8_t kl)
 {
     caps_lock   = cl;
     num_lock    = nl;
     scroll_lock = sl;
+    kana_lock   = kl;
 }
 
 uint8_t
@@ -283,7 +440,7 @@ keyboard_get_shift(void)
 }
 
 void
-keyboard_get_states(uint8_t *cl, uint8_t *nl, uint8_t *sl)
+keyboard_get_states(uint8_t *cl, uint8_t *nl, uint8_t *sl, uint8_t *kl)
 {
     if (cl)
         *cl = caps_lock;
@@ -291,6 +448,8 @@ keyboard_get_states(uint8_t *cl, uint8_t *nl, uint8_t *sl)
         *nl = num_lock;
     if (sl)
         *sl = scroll_lock;
+    if (kl)
+        *kl = kana_lock;
 }
 
 /* Called by the UI to update the states of Caps Lock, Num Lock, and Scroll Lock. */
@@ -334,7 +493,7 @@ keyboard_set_states(uint8_t cl, uint8_t nl, uint8_t sl)
         }
     }
 
-    keyboard_update_states(cl, nl, sl);
+    keyboard_update_states(cl, nl, sl, kana_lock);
 }
 
 int
@@ -343,41 +502,107 @@ keyboard_recv(uint16_t key)
     return recv_key[key];
 }
 
+int
+keyboard_recv_ui(uint16_t key)
+{
+    return recv_key_ui[key];
+}
+
 /* Do we have Control-Alt-PgDn in the keyboard buffer? */
 int
 keyboard_isfsenter(void)
 {
-    return ((recv_key[0x01d] || recv_key[0x11d]) && (recv_key[0x038] || recv_key[0x138]) && (recv_key[0x049] || recv_key[0x149]));
+    return ((recv_key_ui[0x01d] || recv_key_ui[0x11d]) && (recv_key_ui[0x038] || recv_key_ui[0x138]) && (recv_key_ui[0x049] || recv_key_ui[0x149]));
 }
 
 int
 keyboard_isfsenter_up(void)
 {
-    return (!recv_key[0x01d] && !recv_key[0x11d] && !recv_key[0x038] && !recv_key[0x138] && !recv_key[0x049] && !recv_key[0x149]);
+    return (!recv_key_ui[0x01d] && !recv_key_ui[0x11d] && !recv_key_ui[0x038] && !recv_key_ui[0x138] && !recv_key_ui[0x049] && !recv_key_ui[0x149]);
 }
 
 /* Do we have Control-Alt-PgDn in the keyboard buffer? */
 int
 keyboard_isfsexit(void)
 {
-    return ((recv_key[0x01d] || recv_key[0x11d]) && (recv_key[0x038] || recv_key[0x138]) && (recv_key[0x051] || recv_key[0x151]));
+    return ((recv_key_ui[0x01d] || recv_key_ui[0x11d]) && (recv_key_ui[0x038] || recv_key_ui[0x138]) && (recv_key_ui[0x051] || recv_key_ui[0x151]));
 }
 
 int
 keyboard_isfsexit_up(void)
 {
-    return (!recv_key[0x01d] && !recv_key[0x11d] && !recv_key[0x038] && !recv_key[0x138] && !recv_key[0x051] && !recv_key[0x151]);
+    return (!recv_key_ui[0x01d] && !recv_key_ui[0x11d] && !recv_key_ui[0x038] && !recv_key_ui[0x138] && !recv_key_ui[0x051] && !recv_key_ui[0x151]);
 }
 
-/* Do we have the mouse uncapture combination in the keyboard buffer? */
-int
-keyboard_ismsexit(void)
+/* This is so we can disambiguate scan codes that would otherwise conflict and get
+   passed on incorrectly. */
+uint16_t
+convert_scan_code(uint16_t scan_code)
 {
-    if ((key_prefix_2_1 != 0x000) || (key_prefix_2_2 != 0x000))
-        return ((recv_key[key_prefix_1_1] || recv_key[key_prefix_1_2]) &&
-                (recv_key[key_prefix_2_1] || recv_key[key_prefix_2_2]) &&
-                (recv_key[key_uncapture_1] || recv_key[key_uncapture_2]));
-    else
-        return ((recv_key[key_prefix_1_1] || recv_key[key_prefix_1_2]) &&
-                (recv_key[key_uncapture_1] || recv_key[key_uncapture_2]));
+    if ((scan_code & 0xff00) == 0xe000)
+        scan_code = (scan_code & 0xff) | 0x0100;
+
+    if (scan_code == 0xE11D)
+        scan_code = 0x0100;
+    /* E0 00 is sent by some USB keyboards for their special keys, as it is an
+       invalid scan code (it has no untranslated set 2 equivalent), we mark it
+       appropriately so it does not get passed through. */
+    else if ((scan_code > 0x01FF) || (scan_code == 0x0100))
+        scan_code = 0xFFFF;
+
+    return scan_code;
+}
+
+const char *
+keyboard_get_name(int keyboard)
+{
+    return (keyboard_devices[keyboard].device->name);
+}
+
+const char *
+keyboard_get_internal_name(int keyboard)
+{
+    return device_get_internal_name(keyboard_devices[keyboard].device);
+}
+
+int
+keyboard_get_from_internal_name(char *s)
+{
+    int c = 0;
+
+    while (keyboard_devices[c].device != NULL) {
+        if (!strcmp((char *) keyboard_devices[c].device->internal_name, s))
+            return c;
+        c++;
+    }
+
+    return 0;
+}
+
+int
+keyboard_has_config(int keyboard)
+{
+    if (keyboard_devices[keyboard].device == NULL)
+        return 0;
+
+    return (keyboard_devices[keyboard].device->config ? 1 : 0);
+}
+
+const device_t *
+keyboard_get_device(int keyboard)
+{
+    return (keyboard_devices[keyboard].device);
+}
+
+/* Return number of MOUSE types we know about. */
+int
+keyboard_get_ndev(void)
+{
+    return ((sizeof(keyboard_devices) / sizeof(keyboard_t)) - 1);
+}
+
+void
+keyboard_add_device(void)
+{
+    device_add(keyboard_devices[keyboard_type].device);
 }
diff --git a/src/device/keyboard_at.c b/src/device/keyboard_at.c
index 7accb2fd6..d6fdaf4b7 100644
--- a/src/device/keyboard_at.c
+++ b/src/device/keyboard_at.c
@@ -25,42 +25,39 @@
 #include <86box/device.h>
 #include <86box/keyboard.h>
 #include <86box/mouse.h>
-
-#define FLAG_PS2       0x08  /* dev is AT or PS/2 */
-#define FLAG_AT        0x00  /* dev is AT or PS/2 */
-#define FLAG_TYPE_MASK 0x07  /* mask for type     */
+#include <86box/machine.h>
 
 #define FIFO_SIZE      16
 
 #define BAT_COUNT      1000
 
-enum {
-    KBD_84_KEY = 0,
-    KBD_101_KEY,
-    KBD_102_KEY,
-    KBD_JIS,
-    KBD_KOREAN
-};
-
 #define FLAG_ENABLED 0x10  /* dev is enabled for use */
 #define FLAG_CTRLDAT 0x08  /* ctrl or data mode */
 
-const uint8_t id_bytes[16][4] = { { 0x00, 0x00, 0x00, 0x00 },    /* AT 84-key */
-                                  { 0x00, 0x00, 0x00, 0x00 },    /* AT 101/102/106-key */
+const uint8_t id_bytes[24][4] = { { 0x00, 0x00, 0x00, 0x00 },    /* XT 83-key */
+                                  { 0x00, 0x00, 0x00, 0x00 },    /* AT 84-key */
+                                  { 0xab, 0x83, 0x00, 0x00 },    /* XT/AT 101-key */
+                                  { 0xab, 0x83, 0x00, 0x00 },    /* XT/AT 101-key */
+                                  { 0xab, 0x90, 0x00, 0x00 },    /* XT/AT 106-key JIS */
+                                  { 0xab, 0x90, 0x00, 0x00 },    /* AT KSC */
+                                  { 0xab, 0x83, 0x00, 0x00 },    /* AT ABNT2 */
                                   { 0x00, 0x00, 0x00, 0x00 },
-                                  { 0x00, 0x00, 0x00, 0x00 },
-                                  { 0x00, 0x00, 0x00, 0x00 },    /* AT Korean */
+                                  { 0x00, 0x00, 0x00, 0x00 },    /* FLAG_AX = 0x08 */
                                   { 0x00, 0x00, 0x00, 0x00 },
                                   { 0x00, 0x00, 0x00, 0x00 },
                                   { 0x00, 0x00, 0x00, 0x00 },
                                   { 0x00, 0x00, 0x00, 0x00 },
+                                  { 0x00, 0x00, 0x00, 0x00 },
+                                  { 0x00, 0x00, 0x00, 0x00 },
+                                  { 0x00, 0x00, 0x00, 0x00 },
+                                  { 0x00, 0x00, 0x00, 0x00 },    /* FLAG_PS2_KBD = 0x10 */
+                                  { 0x00, 0x00, 0x00, 0x00 },
                                   { 0xab, 0x83, 0x00, 0x00 },    /* PS/2 101-key */
                                   { 0xab, 0x83, 0x00, 0x00 },    /* PS/2 102-key */
-                                  { 0xab, 0x90, 0x00, 0x00 },    /* PS/2 106-key JIS */
+                                  { 0xab, 0x90, 0x00, 0x00 },    /* PS/55 106-key JIS (IBM-J 5576-002) */
                                   /* Japanese keyboard ID - TODO: Find the actual Korean one. */
-                                  { 0xab, 0x90, 0x00, 0x00 },    /* PS/2 Korean */
-                                  { 0x00, 0x00, 0x00, 0x00 },
-                                  { 0x00, 0x00, 0x00, 0x00 },
+                                  { 0xab, 0x90, 0x00, 0x00 },    /* PS/2 KSC */
+                                  { 0xab, 0x83, 0x00, 0x00 },    /* PS/2 ABNT2 */
                                   { 0x00, 0x00, 0x00, 0x00 } };
 
 /* Global keyboard flags for scan code set 3:
@@ -77,404 +74,5208 @@ static atkbc_dev_t *SavedKbd                        = NULL;
 
 static uint8_t     inv_cmd_response                 = 0xfa;
 
+static int         is_special                       = 0;
+
 static uint16_t    bat_counter                      = 0;
 
-static const scancode scancode_set1[512] = {
+const scancode scancode_set1_at[512] = {
   // clang-format off
-    { {          0},{               0} }, { {     0x01,0},{          0x81,0} }, { {     0x02,0},{          0x82,0} }, { {     0x03,0},{          0x83,0} },        /*000*/
-    { {     0x04,0},{          0x84,0} }, { {     0x05,0},{          0x85,0} }, { {     0x06,0},{          0x86,0} }, { {     0x07,0},{          0x87,0} },        /*004*/
-    { {     0x08,0},{          0x88,0} }, { {     0x09,0},{          0x89,0} }, { {     0x0a,0},{          0x8a,0} }, { {     0x0b,0},{          0x8b,0} },        /*008*/
-    { {     0x0c,0},{          0x8c,0} }, { {     0x0d,0},{          0x8d,0} }, { {     0x0e,0},{          0x8e,0} }, { {     0x0f,0},{          0x8f,0} },        /*00c*/
-    { {     0x10,0},{          0x90,0} }, { {     0x11,0},{          0x91,0} }, { {     0x12,0},{          0x92,0} }, { {     0x13,0},{          0x93,0} },        /*010*/
-    { {     0x14,0},{          0x94,0} }, { {     0x15,0},{          0x95,0} }, { {     0x16,0},{          0x96,0} }, { {     0x17,0},{          0x97,0} },        /*014*/
-    { {     0x18,0},{          0x98,0} }, { {     0x19,0},{          0x99,0} }, { {     0x1a,0},{          0x9a,0} }, { {     0x1b,0},{          0x9b,0} },        /*018*/
-    { {     0x1c,0},{          0x9c,0} }, { {     0x1d,0},{          0x9d,0} }, { {     0x1e,0},{          0x9e,0} }, { {     0x1f,0},{          0x9f,0} },        /*01c*/
-    { {     0x20,0},{          0xa0,0} }, { {     0x21,0},{          0xa1,0} }, { {     0x22,0},{          0xa2,0} }, { {     0x23,0},{          0xa3,0} },        /*020*/
-    { {     0x24,0},{          0xa4,0} }, { {     0x25,0},{          0xa5,0} }, { {     0x26,0},{          0xa6,0} }, { {     0x27,0},{          0xa7,0} },        /*024*/
-    { {     0x28,0},{          0xa8,0} }, { {     0x29,0},{          0xa9,0} }, { {     0x2a,0},{          0xaa,0} }, { {     0x2b,0},{          0xab,0} },        /*028*/
-    { {     0x2c,0},{          0xac,0} }, { {     0x2d,0},{          0xad,0} }, { {     0x2e,0},{          0xae,0} }, { {     0x2f,0},{          0xaf,0} },        /*02c*/
-    { {     0x30,0},{          0xb0,0} }, { {     0x31,0},{          0xb1,0} }, { {     0x32,0},{          0xb2,0} }, { {     0x33,0},{          0xb3,0} },        /*030*/
-    { {     0x34,0},{          0xb4,0} }, { {     0x35,0},{          0xb5,0} }, { {     0x36,0},{          0xb6,0} }, { {     0x37,0},{          0xb7,0} },        /*034*/
-    { {     0x38,0},{          0xb8,0} }, { {     0x39,0},{          0xb9,0} }, { {     0x3a,0},{          0xba,0} }, { {     0x3b,0},{          0xbb,0} },        /*038*/
-    { {     0x3c,0},{          0xbc,0} }, { {     0x3d,0},{          0xbd,0} }, { {     0x3e,0},{          0xbe,0} }, { {     0x3f,0},{          0xbf,0} },        /*03c*/
-    { {     0x40,0},{          0xc0,0} }, { {     0x41,0},{          0xc1,0} }, { {     0x42,0},{          0xc2,0} }, { {     0x43,0},{          0xc3,0} },        /*040*/
-    { {     0x44,0},{          0xc4,0} }, { {     0x45,0},{          0xc5,0} }, { {     0x46,0},{          0xc6,0} }, { {     0x47,0},{          0xc7,0} },        /*044*/
-    { {     0x48,0},{          0xc8,0} }, { {     0x49,0},{          0xc9,0} }, { {     0x4a,0},{          0xca,0} }, { {     0x4b,0},{          0xcb,0} },        /*048*/
-    { {     0x4c,0},{          0xcc,0} }, { {     0x4d,0},{          0xcd,0} }, { {     0x4e,0},{          0xce,0} }, { {     0x4f,0},{          0xcf,0} },        /*04c*/
-    { {     0x50,0},{          0xd0,0} }, { {     0x51,0},{          0xd1,0} }, { {     0x52,0},{          0xd2,0} }, { {     0x53,0},{          0xd3,0} },        /*050*/
-    { {     0x54,0},{          0xd4,0} }, { {     0x55,0},{          0xd5,0} }, { {     0x56,0},{          0xd6,0} }, { {     0x57,0},{          0xd7,0} },        /*054*/
-    { {     0x58,0},{          0xd8,0} }, { {     0x59,0},{          0xd9,0} }, { {     0x5a,0},{          0xda,0} }, { {     0x5b,0},{          0xdb,0} },        /*058*/
-    { {     0x5c,0},{          0xdc,0} }, { {     0x5d,0},{          0xdd,0} }, { {     0x5e,0},{          0xde,0} }, { {     0x5f,0},{          0xdf,0} },        /*05c*/
-    { {     0x60,0},{          0xe0,0} }, { {     0x61,0},{          0xe1,0} }, { {     0x62,0},{          0xe2,0} }, { {     0x63,0},{          0xe3,0} },        /*060*/
-    { {     0x64,0},{          0xe4,0} }, { {     0x65,0},{          0xe5,0} }, { {     0x66,0},{          0xe6,0} }, { {     0x67,0},{          0xe7,0} },        /*064*/
-    { {     0x68,0},{          0xe8,0} }, { {     0x69,0},{          0xe9,0} }, { {     0x6a,0},{          0xea,0} }, { {     0x6b,0},{          0xeb,0} },        /*068*/
-    { {     0x6c,0},{          0xec,0} }, { {     0x6d,0},{          0xed,0} }, { {     0x6e,0},{          0xee,0} }, { {     0x6f,0},{          0xef,0} },        /*06c*/
-    { {     0x70,0},{          0xf0,0} }, { {     0x71,0},{          0xf1,0} }, { {     0x72,0},{          0xf2,0} }, { {     0x73,0},{          0xf3,0} },        /*070*/
-    { {     0x74,0},{          0xf4,0} }, { {     0x75,0},{          0xf5,0} }, { {     0x76,0},{          0xf6,0} }, { {     0x77,0},{          0xf7,0} },        /*074*/
-    { {     0x78,0},{          0xf8,0} }, { {     0x79,0},{          0xf9,0} }, { {     0x7a,0},{          0xfa,0} }, { {     0x7b,0},{          0xfb,0} },        /*078*/
-    { {     0x7c,0},{          0xfc,0} }, { {     0x7d,0},{          0xfd,0} }, { {     0x7e,0},{          0xfe,0} }, { {     0x7f,0},{          0xff,0} },        /*07c*/
+    { .mk = {            0 }, .brk = {                   0 } }, /* 000 */
+    { .mk = {      0x01, 0 }, .brk = {             0x81, 0 } }, /* 001 */
+    { .mk = {      0x02, 0 }, .brk = {             0x82, 0 } }, /* 002 */
+    { .mk = {      0x03, 0 }, .brk = {             0x83, 0 } }, /* 003 */
+    { .mk = {      0x04, 0 }, .brk = {             0x84, 0 } }, /* 004 */
+    { .mk = {      0x05, 0 }, .brk = {             0x85, 0 } }, /* 005 */
+    { .mk = {      0x06, 0 }, .brk = {             0x86, 0 } }, /* 006 */
+    { .mk = {      0x07, 0 }, .brk = {             0x87, 0 } }, /* 007 */
+    { .mk = {      0x08, 0 }, .brk = {             0x88, 0 } }, /* 008 */
+    { .mk = {      0x09, 0 }, .brk = {             0x89, 0 } }, /* 009 */
+    { .mk = {      0x0a, 0 }, .brk = {             0x8a, 0 } }, /* 00a */
+    { .mk = {      0x0b, 0 }, .brk = {             0x8b, 0 } }, /* 00b */
+    { .mk = {      0x0c, 0 }, .brk = {             0x8c, 0 } }, /* 00c */
+    { .mk = {      0x0d, 0 }, .brk = {             0x8d, 0 } }, /* 00d */
+    { .mk = {      0x0e, 0 }, .brk = {             0x8e, 0 } }, /* 00e */
+    { .mk = {      0x0f, 0 }, .brk = {             0x8f, 0 } }, /* 00f */
+    { .mk = {      0x10, 0 }, .brk = {             0x90, 0 } }, /* 010 */
+    { .mk = {      0x11, 0 }, .brk = {             0x91, 0 } }, /* 011 */
+    { .mk = {      0x12, 0 }, .brk = {             0x92, 0 } }, /* 012 */
+    { .mk = {      0x13, 0 }, .brk = {             0x93, 0 } }, /* 013 */
+    { .mk = {      0x14, 0 }, .brk = {             0x94, 0 } }, /* 014 */
+    { .mk = {      0x15, 0 }, .brk = {             0x95, 0 } }, /* 015 */
+    { .mk = {      0x16, 0 }, .brk = {             0x96, 0 } }, /* 016 */
+    { .mk = {      0x17, 0 }, .brk = {             0x97, 0 } }, /* 017 */
+    { .mk = {      0x18, 0 }, .brk = {             0x98, 0 } }, /* 018 */
+    { .mk = {      0x19, 0 }, .brk = {             0x99, 0 } }, /* 019 */
+    { .mk = {      0x1a, 0 }, .brk = {             0x9a, 0 } }, /* 01a */
+    { .mk = {      0x1b, 0 }, .brk = {             0x9b, 0 } }, /* 01b */
+    { .mk = {      0x1c, 0 }, .brk = {             0x9c, 0 } }, /* 01c */
+    { .mk = {      0x1d, 0 }, .brk = {             0x9d, 0 } }, /* 01d */
+    { .mk = {      0x1e, 0 }, .brk = {             0x9e, 0 } }, /* 01e */
+    { .mk = {      0x1f, 0 }, .brk = {             0x9f, 0 } }, /* 01f */
+    { .mk = {      0x20, 0 }, .brk = {             0xa0, 0 } }, /* 020 */
+    { .mk = {      0x21, 0 }, .brk = {             0xa1, 0 } }, /* 021 */
+    { .mk = {      0x22, 0 }, .brk = {             0xa2, 0 } }, /* 022 */
+    { .mk = {      0x23, 0 }, .brk = {             0xa3, 0 } }, /* 023 */
+    { .mk = {      0x24, 0 }, .brk = {             0xa4, 0 } }, /* 024 */
+    { .mk = {      0x25, 0 }, .brk = {             0xa5, 0 } }, /* 025 */
+    { .mk = {      0x26, 0 }, .brk = {             0xa6, 0 } }, /* 026 */
+    { .mk = {      0x27, 0 }, .brk = {             0xa7, 0 } }, /* 027 */
+    { .mk = {      0x28, 0 }, .brk = {             0xa8, 0 } }, /* 028 */
+    { .mk = {      0x29, 0 }, .brk = {             0xa9, 0 } }, /* 029 */
+    { .mk = {      0x2a, 0 }, .brk = {             0xaa, 0 } }, /* 02a */
+    { .mk = {      0x2b, 0 }, .brk = {             0xab, 0 } }, /* 02b */
+    { .mk = {      0x2c, 0 }, .brk = {             0xac, 0 } }, /* 02c */
+    { .mk = {      0x2d, 0 }, .brk = {             0xad, 0 } }, /* 02d */
+    { .mk = {      0x2e, 0 }, .brk = {             0xae, 0 } }, /* 02e */
+    { .mk = {      0x2f, 0 }, .brk = {             0xaf, 0 } }, /* 02f */
+    { .mk = {      0x30, 0 }, .brk = {             0xb0, 0 } }, /* 030 */
+    { .mk = {      0x31, 0 }, .brk = {             0xb1, 0 } }, /* 031 */
+    { .mk = {      0x32, 0 }, .brk = {             0xb2, 0 } }, /* 032 */
+    { .mk = {      0x33, 0 }, .brk = {             0xb3, 0 } }, /* 033 */
+    { .mk = {      0x34, 0 }, .brk = {             0xb4, 0 } }, /* 034 */
+    { .mk = {      0x35, 0 }, .brk = {             0xb5, 0 } }, /* 035 */
+    { .mk = {      0x36, 0 }, .brk = {             0xb6, 0 } }, /* 036 */
+    { .mk = {      0x37, 0 }, .brk = {             0xb7, 0 } }, /* 037 */
+    { .mk = {      0x38, 0 }, .brk = {             0xb8, 0 } }, /* 038 */
+    { .mk = {      0x39, 0 }, .brk = {             0xb9, 0 } }, /* 039 */
+    { .mk = {      0x3a, 0 }, .brk = {             0xba, 0 } }, /* 03a */
+    { .mk = {      0x3b, 0 }, .brk = {             0xbb, 0 } }, /* 03b */
+    { .mk = {      0x3c, 0 }, .brk = {             0xbc, 0 } }, /* 03c */
+    { .mk = {      0x3d, 0 }, .brk = {             0xbd, 0 } }, /* 03d */
+    { .mk = {      0x3e, 0 }, .brk = {             0xbe, 0 } }, /* 03e */
+    { .mk = {      0x3f, 0 }, .brk = {             0xbf, 0 } }, /* 03f */
+    { .mk = {      0x40, 0 }, .brk = {             0xc0, 0 } }, /* 040 */
+    { .mk = {      0x41, 0 }, .brk = {             0xc1, 0 } }, /* 041 */
+    { .mk = {      0x42, 0 }, .brk = {             0xc2, 0 } }, /* 042 */
+    { .mk = {      0x43, 0 }, .brk = {             0xc3, 0 } }, /* 043 */
+    { .mk = {      0x44, 0 }, .brk = {             0xc4, 0 } }, /* 044 */
+    { .mk = {      0x45, 0 }, .brk = {             0xc5, 0 } }, /* 045 */
+    { .mk = {      0x46, 0 }, .brk = {             0xc6, 0 } }, /* 046 */
+    { .mk = {      0x47, 0 }, .brk = {             0xc7, 0 } }, /* 047 */
+    { .mk = {      0x48, 0 }, .brk = {             0xc8, 0 } }, /* 048 */
+    { .mk = {      0x49, 0 }, .brk = {             0xc9, 0 } }, /* 049 */
+    { .mk = {      0x4a, 0 }, .brk = {             0xca, 0 } }, /* 04a */
+    { .mk = {      0x4b, 0 }, .brk = {             0xcb, 0 } }, /* 04b */
+    { .mk = {      0x4c, 0 }, .brk = {             0xcc, 0 } }, /* 04c */
+    { .mk = {      0x4d, 0 }, .brk = {             0xcd, 0 } }, /* 04d */
+    { .mk = {      0x4e, 0 }, .brk = {             0xce, 0 } }, /* 04e */
+    { .mk = {      0x4f, 0 }, .brk = {             0xcf, 0 } }, /* 04f */
+    { .mk = {      0x50, 0 }, .brk = {             0xd0, 0 } }, /* 050 */
+    { .mk = {      0x51, 0 }, .brk = {             0xd1, 0 } }, /* 051 */
+    { .mk = {      0x52, 0 }, .brk = {             0xd2, 0 } }, /* 052 */
+    { .mk = {      0x53, 0 }, .brk = {             0xd3, 0 } }, /* 053 */
+    { .mk = {      0x54, 0 }, .brk = {             0xd4, 0 } }, /* 054 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 055 */
+    { .mk = {      0x56, 0 }, .brk = {             0xd6, 0 } }, /* 054 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 057 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 058 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 059 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05b */
+    { .mk = {      0x5c, 0 }, .brk = {             0xdc, 0 } }, /* 054 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05f */
+    { .mk = {      0x60, 0 }, .brk = {             0xe0, 0 } }, /* 060 */
+    { .mk = {      0x61, 0 }, .brk = {             0xe1, 0 } }, /* 061 */
+    { .mk = {      0x62, 0 }, .brk = {             0xe2, 0 } }, /* 062 */
+    { .mk = {      0x63, 0 }, .brk = {             0xe3, 0 } }, /* 063 */
+    { .mk = {      0x64, 0 }, .brk = {             0xe4, 0 } }, /* 064 */
+    { .mk = {      0x65, 0 }, .brk = {             0xe5, 0 } }, /* 065 */
+    { .mk = {      0x66, 0 }, .brk = {             0xe6, 0 } }, /* 066 */
+    { .mk = {      0x67, 0 }, .brk = {             0xe7, 0 } }, /* 067 */
+    { .mk = {      0x68, 0 }, .brk = {             0xe8, 0 } }, /* 068 */
+    { .mk = {      0x69, 0 }, .brk = {             0xe9, 0 } }, /* 069 */
+    { .mk = {      0x6a, 0 }, .brk = {             0xea, 0 } }, /* 06a */
+    { .mk = {      0x6b, 0 }, .brk = {             0xeb, 0 } }, /* 06b */
+    { .mk = {      0x6c, 0 }, .brk = {             0xec, 0 } }, /* 06c */
+    { .mk = {      0x6d, 0 }, .brk = {             0xed, 0 } }, /* 06d */
+    { .mk = {      0x6e, 0 }, .brk = {             0xee, 0 } }, /* 06e */
+    { .mk = {      0x6f, 0 }, .brk = {             0xef, 0 } }, /* 06f */
+    { .mk = {      0x70, 0 }, .brk = {             0xf0, 0 } }, /* 070 */
+    { .mk = {      0x71, 0 }, .brk = {             0xf1, 0 } }, /* 071 */
+    { .mk = {      0x72, 0 }, .brk = {             0xf2, 0 } }, /* 072 */
+    { .mk = {      0x73, 0 }, .brk = {             0xf3, 0 } }, /* 073 */
+    { .mk = {      0x74, 0 }, .brk = {             0xf4, 0 } }, /* 074 */
+    { .mk = {      0x75, 0 }, .brk = {             0xf5, 0 } }, /* 075 */
+    { .mk = {      0x76, 0 }, .brk = {             0xf6, 0 } }, /* 076 */
+    { .mk = {      0x77, 0 }, .brk = {             0xf7, 0 } }, /* 077 */
+    { .mk = {      0x78, 0 }, .brk = {             0xf8, 0 } }, /* 078 */
+    { .mk = {      0x79, 0 }, .brk = {             0xf9, 0 } }, /* 079 */
+    { .mk = {      0x7a, 0 }, .brk = {             0xfa, 0 } }, /* 07a */
+    { .mk = {      0x7b, 0 }, .brk = {             0xfb, 0 } }, /* 07b */
+    { .mk = {      0x7c, 0 }, .brk = {             0xfc, 0 } }, /* 07c */
+    { .mk = {      0x7d, 0 }, .brk = {             0xfd, 0 } }, /* 07d */
+    { .mk = {      0x7e, 0 }, .brk = {             0xfe, 0 } }, /* 07e */
+    { .mk = {      0x7f, 0 }, .brk = {             0xff, 0 } }, /* 07f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 080 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 081 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 082 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 083 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 084 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 085 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 086 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 087 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 088 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 089 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 090 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 091 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 092 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 093 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 094 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 095 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 096 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 097 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 098 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 099 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ed */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f0 */
+    { .mk = {      0xf1, 0 }, .brk = {                   0 } }, /* 0f1 */
+    { .mk = {      0xf2, 0 }, .brk = {                   0 } }, /* 0f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fe */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ff */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 100 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 101 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 102 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 103 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 104 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 105 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 106 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 107 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 108 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 109 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 110 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 111 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 112 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 113 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 114 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 115 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 116 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 117 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 118 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 119 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11b */
+    { .mk = {      0x1c, 0 }, .brk = {             0x9c, 0 } }, /* 11c */
+    { .mk = {      0x1d, 0 }, .brk = {             0x9d, 0 } }, /* 11d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 120 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 121 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 122 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 123 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 124 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 125 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 126 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 127 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 128 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 129 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 130 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 131 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 132 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 133 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 134 */
+    { .mk = {      0x35, 0 }, .brk = {             0xb5, 0 } }, /* 135 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 136 */
+    { .mk = {      0x37, 0 }, .brk = {             0xb7, 0 } }, /* 137 */
+    { .mk = {      0x38, 0 }, .brk = {             0xb8, 0 } }, /* 138 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 139 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 140 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 141 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 142 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 143 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 144 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 145 */
+    { .mk = {      0x46, 0 }, .brk = {             0xc6, 0 } }, /* 146 */
+    { .mk = {      0x47, 0 }, .brk = {             0xc7, 0 } }, /* 147 */
+    { .mk = {      0x48, 0 }, .brk = {             0xc8, 0 } }, /* 148 */
+    { .mk = {      0x49, 0 }, .brk = {             0xc9, 0 } }, /* 149 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14a */
+    { .mk = {      0x4b, 0 }, .brk = {             0xcb, 0 } }, /* 14b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14c */
+    { .mk = {      0x4d, 0 }, .brk = {             0xcd, 0 } }, /* 14d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14e */
+    { .mk = {      0x4f, 0 }, .brk = {             0xcf, 0 } }, /* 14f */
+    { .mk = {      0x50, 0 }, .brk = {             0xd0, 0 } }, /* 150 */
+    { .mk = {      0x51, 0 }, .brk = {             0xd1, 0 } }, /* 151 */
+    { .mk = {      0x52, 0 }, .brk = {             0xd2, 0 } }, /* 152 */
+    { .mk = {      0x53, 0 }, .brk = {             0xd3, 0 } }, /* 153 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 154 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 155 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 156 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 157 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 158 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 159 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15a */
+    { .mk = {      0x56, 0 }, .brk = {             0xd6, 0 } }, /* 15b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 160 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 161 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 162 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 163 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 164 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 165 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 166 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 167 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 168 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 169 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 170 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 171 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 172 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 173 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 174 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 175 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 176 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 177 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 178 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 179 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 180 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 181 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 182 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 183 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 184 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 185 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 186 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 187 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 188 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 189 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 190 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 191 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 192 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 193 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 194 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 195 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 196 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 197 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 198 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 199 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ed */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fe */
+    { .mk = {            0 }, .brk = {                   0 } }  /* 1ff */
+  // clang-format on
+};
 
-    { {     0x80,0},{               0} }, { {     0x81,0},{               0} }, { {     0x82,0},{               0} }, { {          0},{               0} },        /*080*/
-    { {          0},{               0} }, { {     0x85,0},{               0} }, { {     0x86,0},{               0} }, { {     0x87,0},{               0} },        /*084*/
-    { {     0x88,0},{               0} }, { {     0x89,0},{               0} }, { {     0x8a,0},{               0} }, { {     0x8b,0},{               0} },        /*088*/
-    { {     0x8c,0},{               0} }, { {     0x8d,0},{               0} }, { {     0x8e,0},{               0} }, { {     0x8f,0},{               0} },        /*08c*/
-    { {     0x90,0},{               0} }, { {     0x91,0},{               0} }, { {     0x92,0},{               0} }, { {     0x93,0},{               0} },        /*090*/
-    { {     0x94,0},{               0} }, { {     0x95,0},{               0} }, { {     0x96,0},{               0} }, { {     0x97,0},{               0} },        /*094*/
-    { {     0x98,0},{               0} }, { {     0x99,0},{               0} }, { {     0x9a,0},{               0} }, { {     0x9b,0},{               0} },        /*098*/
-    { {     0x9c,0},{               0} }, { {     0x9d,0},{               0} }, { {     0x9e,0},{               0} }, { {     0x9f,0},{               0} },        /*09c*/
-    { {     0xa0,0},{               0} }, { {     0xa1,0},{               0} }, { {     0xa2,0},{               0} }, { {     0xa3,0},{               0} },        /*0a0*/
-    { {     0xa4,0},{               0} }, { {     0xa5,0},{               0} }, { {     0xa6,0},{               0} }, { {     0xa7,0},{               0} },        /*0a4*/
-    { {     0xa8,0},{               0} }, { {     0xa9,0},{               0} }, { {     0xaa,0},{               0} }, { {     0xab,0},{               0} },        /*0a8*/
-    { {     0xac,0},{               0} }, { {     0xad,0},{               0} }, { {     0xae,0},{               0} }, { {     0xaf,0},{               0} },        /*0ac*/
-    { {     0xb0,0},{               0} }, { {     0xb1,0},{               0} }, { {     0xb2,0},{               0} }, { {     0xb3,0},{               0} },        /*0b0*/
-    { {     0xb4,0},{               0} }, { {     0xb5,0},{               0} }, { {     0xb6,0},{               0} }, { {     0xb7,0},{               0} },        /*0b4*/
-    { {     0xb8,0},{               0} }, { {     0xb9,0},{               0} }, { {     0xba,0},{               0} }, { {     0xbb,0},{               0} },        /*0b8*/
-    { {     0xbc,0},{               0} }, { {     0xbd,0},{               0} }, { {     0xbe,0},{               0} }, { {     0xbf,0},{               0} },        /*0bc*/
-    { {     0xc0,0},{               0} }, { {     0xc1,0},{               0} }, { {     0xc2,0},{               0} }, { {     0xc3,0},{               0} },        /*0c0*/
-    { {     0xc4,0},{               0} }, { {     0xc5,0},{               0} }, { {     0xc6,0},{               0} }, { {     0xc7,0},{               0} },        /*0c4*/
-    { {     0xc8,0},{               0} }, { {     0xc9,0},{               0} }, { {     0xca,0},{               0} }, { {     0xcb,0},{               0} },        /*0c8*/
-    { {     0xcc,0},{               0} }, { {     0xcd,0},{               0} }, { {     0xce,0},{               0} }, { {     0xcf,0},{               0} },        /*0cc*/
-    { {     0xd0,0},{               0} }, { {     0xd1,0},{               0} }, { {     0xd2,0},{               0} }, { {     0xd3,0},{               0} },        /*0d0*/
-    { {     0xd4,0},{               0} }, { {     0xd5,0},{               0} }, { {     0xd6,0},{               0} }, { {     0xd7,0},{               0} },        /*0d4*/
-    { {     0xd8,0},{               0} }, { {     0xd9,0},{               0} }, { {     0xda,0},{               0} }, { {     0xdb,0},{               0} },        /*0d8*/
-    { {     0xdc,0},{               0} }, { {     0xdd,0},{               0} }, { {     0xde,0},{               0} }, { {     0xdf,0},{               0} },        /*0dc*/
-    { {     0xe0,0},{               0} }, { {     0xe1,0},{               0} }, { {     0xe2,0},{               0} }, { {     0xe3,0},{               0} },        /*0e0*/
-    { {     0xe4,0},{               0} }, { {     0xe5,0},{               0} }, { {     0xe6,0},{               0} }, { {     0xe7,0},{               0} },        /*0e4*/
-    { {     0xe8,0},{               0} }, { {     0xe9,0},{               0} }, { {     0xea,0},{               0} }, { {     0xeb,0},{               0} },        /*0e8*/
-    { {     0xec,0},{               0} }, { {     0xed,0},{               0} }, { {     0xee,0},{               0} }, { {     0xef,0},{               0} },        /*0ec*/
-    { {          0},{               0} }, { {     0xf1,0},{               0} }, { {     0xf2,0},{               0} }, { {     0xf3,0},{               0} },        /*0f0*/
-    { {     0xf4,0},{               0} }, { {     0xf5,0},{               0} }, { {     0xf6,0},{               0} }, { {     0xf7,0},{               0} },        /*0f4*/
-    { {     0xf8,0},{               0} }, { {     0xf9,0},{               0} }, { {     0xfa,0},{               0} }, { {     0xfb,0},{               0} },        /*0f8*/
-    { {     0xfc,0},{               0} }, { {     0xfd,0},{               0} }, { {     0xfe,0},{               0} }, { {     0xff,0},{               0} },        /*0fc*/
+const scancode scancode_set2_at[512] = {
+  // clang-format off
+    { .mk = {            0 }, .brk = {                   0 } }, /* 000 */
+    { .mk = {      0x76, 0 }, .brk = {       0xF0, 0x76, 0 } }, /* 001 */
+    { .mk = {      0x16, 0 }, .brk = {       0xF0, 0x16, 0 } }, /* 002 */
+    { .mk = {      0x1E, 0 }, .brk = {       0xF0, 0x1E, 0 } }, /* 003 */
+    { .mk = {      0x26, 0 }, .brk = {       0xF0, 0x26, 0 } }, /* 004 */
+    { .mk = {      0x25, 0 }, .brk = {       0xF0, 0x25, 0 } }, /* 005 */
+    { .mk = {      0x2E, 0 }, .brk = {       0xF0, 0x2E, 0 } }, /* 006 */
+    { .mk = {      0x36, 0 }, .brk = {       0xF0, 0x36, 0 } }, /* 007 */
+    { .mk = {      0x3D, 0 }, .brk = {       0xF0, 0x3D, 0 } }, /* 008 */
+    { .mk = {      0x3E, 0 }, .brk = {       0xF0, 0x3E, 0 } }, /* 009 */
+    { .mk = {      0x46, 0 }, .brk = {       0xF0, 0x46, 0 } }, /* 00a */
+    { .mk = {      0x45, 0 }, .brk = {       0xF0, 0x45, 0 } }, /* 00b */
+    { .mk = {      0x4E, 0 }, .brk = {       0xF0, 0x4E, 0 } }, /* 00c */
+    { .mk = {      0x55, 0 }, .brk = {       0xF0, 0x55, 0 } }, /* 00d */
+    { .mk = {      0x66, 0 }, .brk = {       0xF0, 0x66, 0 } }, /* 00e */
+    { .mk = {      0x0D, 0 }, .brk = {       0xF0, 0x0D, 0 } }, /* 00f */
+    { .mk = {      0x15, 0 }, .brk = {       0xF0, 0x15, 0 } }, /* 010 */
+    { .mk = {      0x1D, 0 }, .brk = {       0xF0, 0x1D, 0 } }, /* 011 */
+    { .mk = {      0x24, 0 }, .brk = {       0xF0, 0x24, 0 } }, /* 012 */
+    { .mk = {      0x2D, 0 }, .brk = {       0xF0, 0x2D, 0 } }, /* 013 */
+    { .mk = {      0x2C, 0 }, .brk = {       0xF0, 0x2C, 0 } }, /* 014 */
+    { .mk = {      0x35, 0 }, .brk = {       0xF0, 0x35, 0 } }, /* 015 */
+    { .mk = {      0x3C, 0 }, .brk = {       0xF0, 0x3C, 0 } }, /* 016 */
+    { .mk = {      0x43, 0 }, .brk = {       0xF0, 0x43, 0 } }, /* 017 */
+    { .mk = {      0x44, 0 }, .brk = {       0xF0, 0x44, 0 } }, /* 018 */
+    { .mk = {      0x4D, 0 }, .brk = {       0xF0, 0x4D, 0 } }, /* 019 */
+    { .mk = {      0x54, 0 }, .brk = {       0xF0, 0x54, 0 } }, /* 01a */
+    { .mk = {      0x5B, 0 }, .brk = {       0xF0, 0x5B, 0 } }, /* 01b */
+    { .mk = {      0x5A, 0 }, .brk = {       0xF0, 0x5A, 0 } }, /* 01c */
+    { .mk = {      0x14, 0 }, .brk = {       0xF0, 0x14, 0 } }, /* 01d */
+    { .mk = {      0x1C, 0 }, .brk = {       0xF0, 0x1C, 0 } }, /* 01e */
+    { .mk = {      0x1B, 0 }, .brk = {       0xF0, 0x1B, 0 } }, /* 01f */
+    { .mk = {      0x23, 0 }, .brk = {       0xF0, 0x23, 0 } }, /* 020 */
+    { .mk = {      0x2B, 0 }, .brk = {       0xF0, 0x2B, 0 } }, /* 021 */
+    { .mk = {      0x34, 0 }, .brk = {       0xF0, 0x34, 0 } }, /* 022 */
+    { .mk = {      0x33, 0 }, .brk = {       0xF0, 0x33, 0 } }, /* 023 */
+    { .mk = {      0x3B, 0 }, .brk = {       0xF0, 0x3B, 0 } }, /* 024 */
+    { .mk = {      0x42, 0 }, .brk = {       0xF0, 0x42, 0 } }, /* 025 */
+    { .mk = {      0x4B, 0 }, .brk = {       0xF0, 0x4B, 0 } }, /* 026 */
+    { .mk = {      0x4C, 0 }, .brk = {       0xF0, 0x4C, 0 } }, /* 027 */
+    { .mk = {      0x52, 0 }, .brk = {       0xF0, 0x52, 0 } }, /* 028 */
+    { .mk = {      0x0E, 0 }, .brk = {       0xF0, 0x0E, 0 } }, /* 029 */
+    { .mk = {      0x12, 0 }, .brk = {       0xF0, 0x12, 0 } }, /* 02a */
+    { .mk = {      0x5D, 0 }, .brk = {       0xF0, 0x5D, 0 } }, /* 02b */
+    { .mk = {      0x1A, 0 }, .brk = {       0xF0, 0x1A, 0 } }, /* 02c */
+    { .mk = {      0x22, 0 }, .brk = {       0xF0, 0x22, 0 } }, /* 02d */
+    { .mk = {      0x21, 0 }, .brk = {       0xF0, 0x21, 0 } }, /* 02e */
+    { .mk = {      0x2A, 0 }, .brk = {       0xF0, 0x2A, 0 } }, /* 02f */
+    { .mk = {      0x32, 0 }, .brk = {       0xF0, 0x32, 0 } }, /* 030 */
+    { .mk = {      0x31, 0 }, .brk = {       0xF0, 0x31, 0 } }, /* 031 */
+    { .mk = {      0x3A, 0 }, .brk = {       0xF0, 0x3A, 0 } }, /* 032 */
+    { .mk = {      0x41, 0 }, .brk = {       0xF0, 0x41, 0 } }, /* 033 */
+    { .mk = {      0x49, 0 }, .brk = {       0xF0, 0x49, 0 } }, /* 034 */
+    { .mk = {      0x4A, 0 }, .brk = {       0xF0, 0x4A, 0 } }, /* 035 */
+    { .mk = {      0x59, 0 }, .brk = {       0xF0, 0x59, 0 } }, /* 036 */
+    { .mk = {      0x7C, 0 }, .brk = {       0xF0, 0x7C, 0 } }, /* 037 */
+    { .mk = {      0x11, 0 }, .brk = {       0xF0, 0x11, 0 } }, /* 038 */
+    { .mk = {      0x29, 0 }, .brk = {       0xF0, 0x29, 0 } }, /* 039 */
+    { .mk = {      0x58, 0 }, .brk = {       0xF0, 0x58, 0 } }, /* 03a */
+    { .mk = {      0x05, 0 }, .brk = {       0xF0, 0x05, 0 } }, /* 03b */
+    { .mk = {      0x06, 0 }, .brk = {       0xF0, 0x06, 0 } }, /* 03c */
+    { .mk = {      0x04, 0 }, .brk = {       0xF0, 0x04, 0 } }, /* 03d */
+    { .mk = {      0x0C, 0 }, .brk = {       0xF0, 0x0C, 0 } }, /* 03e */
+    { .mk = {      0x03, 0 }, .brk = {       0xF0, 0x03, 0 } }, /* 03f */
+    { .mk = {      0x0B, 0 }, .brk = {       0xF0, 0x0B, 0 } }, /* 040 */
+    { .mk = {      0x83, 0 }, .brk = {       0xF0, 0x83, 0 } }, /* 041 */
+    { .mk = {      0x0A, 0 }, .brk = {       0xF0, 0x0A, 0 } }, /* 042 */
+    { .mk = {      0x01, 0 }, .brk = {       0xF0, 0x01, 0 } }, /* 043 */
+    { .mk = {      0x09, 0 }, .brk = {       0xF0, 0x09, 0 } }, /* 044 */
+    { .mk = {      0x77, 0 }, .brk = {       0xF0, 0x77, 0 } }, /* 045 */
+    { .mk = {      0x7E, 0 }, .brk = {       0xF0, 0x7E, 0 } }, /* 046 */
+    { .mk = {      0x6C, 0 }, .brk = {       0xF0, 0x6C, 0 } }, /* 047 */
+    { .mk = {      0x75, 0 }, .brk = {       0xF0, 0x75, 0 } }, /* 048 */
+    { .mk = {      0x7D, 0 }, .brk = {       0xF0, 0x7D, 0 } }, /* 049 */
+    { .mk = {      0x7B, 0 }, .brk = {       0xF0, 0x7B, 0 } }, /* 04a */
+    { .mk = {      0x6B, 0 }, .brk = {       0xF0, 0x6B, 0 } }, /* 04b */
+    { .mk = {      0x73, 0 }, .brk = {       0xF0, 0x73, 0 } }, /* 04c */
+    { .mk = {      0x74, 0 }, .brk = {       0xF0, 0x74, 0 } }, /* 04d */
+    { .mk = {      0x79, 0 }, .brk = {       0xF0, 0x79, 0 } }, /* 04e */
+    { .mk = {      0x69, 0 }, .brk = {       0xF0, 0x69, 0 } }, /* 04f */
+    { .mk = {      0x72, 0 }, .brk = {       0xF0, 0x72, 0 } }, /* 050 */
+    { .mk = {      0x7A, 0 }, .brk = {       0xF0, 0x7A, 0 } }, /* 051 */
+    { .mk = {      0x70, 0 }, .brk = {       0xF0, 0x70, 0 } }, /* 052 */
+    { .mk = {      0x71, 0 }, .brk = {       0xF0, 0x71, 0 } }, /* 053 */
+    { .mk = {      0x84, 0 }, .brk = {       0xF0, 0x84, 0 } }, /* 054 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 055 */
+    { .mk = {      0x61, 0 }, .brk = {       0xF0, 0x61, 0 } }, /* 056 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 057 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 058 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 059 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05b */
+    { .mk = {      0x27, 0 }, .brk = {       0xF0, 0x27, 0 } }, /* 05c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05f */
+    { .mk = {      0x47, 0 }, .brk = {       0xF0, 0x47, 0 } }, /* 060 */
+    { .mk = {      0x4F, 0 }, .brk = {       0xF0, 0x4F, 0 } }, /* 061 */
+    { .mk = {      0x56, 0 }, .brk = {       0xF0, 0x56, 0 } }, /* 062 */
+    { .mk = {      0x5E, 0 }, .brk = {       0xF0, 0x5E, 0 } }, /* 063 */
+    { .mk = {      0x08, 0 }, .brk = {       0xF0, 0x08, 0 } }, /* 064 */
+    { .mk = {      0x10, 0 }, .brk = {       0xF0, 0x10, 0 } }, /* 065 */
+    { .mk = {      0x18, 0 }, .brk = {       0xF0, 0x18, 0 } }, /* 066 */
+    { .mk = {      0x20, 0 }, .brk = {       0xF0, 0x20, 0 } }, /* 067 */
+    { .mk = {      0x28, 0 }, .brk = {       0xF0, 0x28, 0 } }, /* 068 */
+    { .mk = {      0x30, 0 }, .brk = {       0xF0, 0x30, 0 } }, /* 069 */
+    { .mk = {      0x38, 0 }, .brk = {       0xF0, 0x38, 0 } }, /* 06a */
+    { .mk = {      0x40, 0 }, .brk = {       0xF0, 0x40, 0 } }, /* 06b */
+    { .mk = {      0x48, 0 }, .brk = {       0xF0, 0x48, 0 } }, /* 06c */
+    { .mk = {      0x50, 0 }, .brk = {       0xF0, 0x50, 0 } }, /* 06d */
+    { .mk = {      0x57, 0 }, .brk = {       0xF0, 0x57, 0 } }, /* 06e */
+    { .mk = {      0x6F, 0 }, .brk = {       0xF0, 0x6F, 0 } }, /* 06f */
+    { .mk = {      0x13, 0 }, .brk = {       0xF0, 0x13, 0 } }, /* 070 */
+    { .mk = {      0x19, 0 }, .brk = {       0xF0, 0x19, 0 } }, /* 071 */
+    { .mk = {      0x39, 0 }, .brk = {       0xF0, 0x39, 0 } }, /* 072 */
+    { .mk = {      0x51, 0 }, .brk = {       0xF0, 0x51, 0 } }, /* 073 */
+    { .mk = {      0x53, 0 }, .brk = {       0xF0, 0x53, 0 } }, /* 074 */
+    { .mk = {      0x5C, 0 }, .brk = {       0xF0, 0x5C, 0 } }, /* 075 */
+    { .mk = {      0x5F, 0 }, .brk = {       0xF0, 0x5F, 0 } }, /* 076 */
+    { .mk = {      0x62, 0 }, .brk = {       0xF0, 0x62, 0 } }, /* 077 */
+    { .mk = {      0x63, 0 }, .brk = {       0xF0, 0x63, 0 } }, /* 078 */
+    { .mk = {      0x64, 0 }, .brk = {       0xF0, 0x64, 0 } }, /* 079 */
+    { .mk = {      0x65, 0 }, .brk = {       0xF0, 0x65, 0 } }, /* 07a */
+    { .mk = {      0x67, 0 }, .brk = {       0xF0, 0x67, 0 } }, /* 07b */
+    { .mk = {      0x68, 0 }, .brk = {       0xF0, 0x68, 0 } }, /* 07c */
+    { .mk = {      0x6A, 0 }, .brk = {       0xF0, 0x6A, 0 } }, /* 07d */
+    { .mk = {      0x6D, 0 }, .brk = {       0xF0, 0x6D, 0 } }, /* 07e */
+    { .mk = {      0x6E, 0 }, .brk = {       0xF0, 0x6E, 0 } }, /* 07f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 080 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 081 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 082 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 083 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 084 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 085 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 086 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 087 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 088 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 089 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 090 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 091 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 092 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 093 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 094 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 095 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 096 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 097 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 098 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 099 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ed */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f0 */
+    { .mk = {      0xf1, 0 }, .brk = {       0xf0, 0xf1, 0 } }, /* 0f1 */
+    { .mk = {      0xf2, 0 }, .brk = {       0xf0, 0xf2, 0 } }, /* 0f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fe */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ff */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 100 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 101 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 102 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 103 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 104 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 105 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 106 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 107 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 108 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 109 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 110 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 111 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 112 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 113 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 114 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 115 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 116 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 117 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 118 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 119 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11b */
+    { .mk = {      0x5A, 0 }, .brk = {       0xF0, 0x5A, 0 } }, /* 11c */
+    { .mk = {      0x14, 0 }, .brk = {       0xF0, 0x14, 0 } }, /* 11d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 120 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 121 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 122 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 123 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 124 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 125 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 126 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 127 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 128 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 129 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 130 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 131 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 132 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 133 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 134 */
+    { .mk = {      0x4A, 0 }, .brk = {       0xF0, 0x4A, 0 } }, /* 135 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 136 */
+    { .mk = {      0x7C, 0 }, .brk = {       0xF0, 0x7C, 0 } }, /* 137 */
+    { .mk = {      0x11, 0 }, .brk = {       0xF0, 0x11, 0 } }, /* 138 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 139 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 140 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 141 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 142 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 143 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 144 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 145 */
+    { .mk = {      0x7E, 0 }, .brk = {       0xF0, 0x7E, 0 } }, /* 146 */
+    { .mk = {      0x6C, 0 }, .brk = {       0xF0, 0x6C, 0 } }, /* 147 */
+    { .mk = {      0x75, 0 }, .brk = {       0xF0, 0x75, 0 } }, /* 148 */
+    { .mk = {      0x7D, 0 }, .brk = {       0xF0, 0x7D, 0 } }, /* 149 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14a */
+    { .mk = {      0x6B, 0 }, .brk = {       0xF0, 0x6B, 0 } }, /* 14b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14c */
+    { .mk = {      0x74, 0 }, .brk = {       0xF0, 0x74, 0 } }, /* 14d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14e */
+    { .mk = {      0x69, 0 }, .brk = {       0xF0, 0x69, 0 } }, /* 14f */
+    { .mk = {      0x72, 0 }, .brk = {       0xF0, 0x72, 0 } }, /* 150 */
+    { .mk = {      0x7A, 0 }, .brk = {       0xF0, 0x7A, 0 } }, /* 151 */
+    { .mk = {      0x70, 0 }, .brk = {       0xF0, 0x70, 0 } }, /* 152 */
+    { .mk = {      0x71, 0 }, .brk = {       0xF0, 0x71, 0 } }, /* 153 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 154 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 155 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 156 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 157 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 158 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 159 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15a */
+    { .mk = {      0x61, 0 }, .brk = {       0xF0, 0x61, 0 } }, /* 15b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 160 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 161 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 162 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 163 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 164 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 165 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 166 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 167 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 168 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 169 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 170 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 171 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 172 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 173 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 174 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 175 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 176 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 177 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 178 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 179 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 180 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 181 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 182 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 183 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 184 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 185 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 186 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 187 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 188 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 189 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 190 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 191 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 192 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 193 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 194 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 195 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 196 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 197 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 198 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 199 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ed */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fe */
+    { .mk = {            0 }, .brk = {                   0 } }  /* 1ff */
+  // clang-format on
+};
 
-    { {0xe1,0x1d,0},{0xe1,     0x9d,0} }, { {0xe0,0x01,0},{0xe0,     0x81,0} }, { {0xe0,0x02,0},{0xe0,     0x82,0} }, { {0xe0,0x03,0},{0xe0,     0x83,0} },        /*100*/
-    { {0xe0,0x04,0},{0xe0,     0x84,0} }, { {0xe0,0x05,0},{0xe0,     0x85,0} }, { {0xe0,0x06,0},{0xe0,     0x86,0} }, { {0xe0,0x07,0},{0xe0,     0x87,0} },        /*104*/
-    { {0xe0,0x08,0},{0xe0,     0x88,0} }, { {0xe0,0x09,0},{0xe0,     0x89,0} }, { {0xe0,0x0a,0},{0xe0,     0x8a,0} }, { {0xe0,0x0b,0},{0xe0,     0x8b,0} },        /*108*/
-    { {0xe0,0x0c,0},{0xe0,     0x8c,0} }, { {          0},{               0} }, { {0xe0,0x0e,0},{0xe0,     0x8e,0} }, { {0xe0,0x0f,0},{0xe0,     0x8f,0} },        /*10c*/
-    { {0xe0,0x10,0},{0xe0,     0x90,0} }, { {0xe0,0x11,0},{0xe0,     0x91,0} }, { {0xe0,0x12,0},{0xe0,     0x92,0} }, { {0xe0,0x13,0},{0xe0,     0x93,0} },        /*110*/
-    { {0xe0,0x14,0},{0xe0,     0x94,0} }, { {0xe0,0x15,0},{0xe0,     0x95,0} }, { {0xe0,0x16,0},{0xe0,     0x96,0} }, { {0xe0,0x17,0},{0xe0,     0x97,0} },        /*114*/
-    { {0xe0,0x18,0},{0xe0,     0x98,0} }, { {0xe0,0x19,0},{0xe0,     0x99,0} }, { {0xe0,0x1a,0},{0xe0,     0x9a,0} }, { {0xe0,0x1b,0},{0xe0,     0x9b,0} },        /*118*/
-    { {0xe0,0x1c,0},{0xe0,     0x9c,0} }, { {0xe0,0x1d,0},{0xe0,     0x9d,0} }, { {0xe0,0x1e,0},{0xe0,     0x9e,0} }, { {0xe0,0x1f,0},{0xe0,     0x9f,0} },        /*11c*/
-    { {0xe0,0x20,0},{0xe0,     0xa0,0} }, { {0xe0,0x21,0},{0xe0,     0xa1,0} }, { {0xe0,0x22,0},{0xe0,     0xa2,0} }, { {0xe0,0x23,0},{0xe0,     0xa3,0} },        /*120*/
-    { {0xe0,0x24,0},{0xe0,     0xa4,0} }, { {0xe0,0x25,0},{0xe0,     0xa5,0} }, { {0xe0,0x26,0},{0xe0,     0xa6,0} }, { {          0},{               0} },        /*124*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*128*/
-    { {0xe0,0x2c,0},{0xe0,     0xac,0} }, { {0xe0,0x2d,0},{0xe0,     0xad,0} }, { {0xe0,0x2e,0},{0xe0,     0xae,0} }, { {0xe0,0x2f,0},{0xe0,     0xaf,0} },        /*12c*/
-    { {0xe0,0x30,0},{0xe0,     0xb0,0} }, { {0xe0,0x31,0},{0xe0,     0xb1,0} }, { {0xe0,0x32,0},{0xe0,     0xb2,0} }, { {          0},{               0} },        /*130*/
-    { {0xe0,0x34,0},{0xe0,     0xb4,0} }, { {0xe0,0x35,0},{0xe0,     0xb5,0} }, { {          0},{               0} }, { {0xe0,0x37,0},{0xe0,     0xb7,0} },        /*134*/
-    { {0xe0,0x38,0},{0xe0,     0xb8,0} }, { {          0},{               0} }, { {0xe0,0x3a,0},{0xe0,     0xba,0} }, { {0xe0,0x3b,0},{0xe0,     0xbb,0} },        /*138*/
-    { {0xe0,0x3c,0},{0xe0,     0xbc,0} }, { {0xe0,0x3d,0},{0xe0,     0xbd,0} }, { {0xe0,0x3e,0},{0xe0,     0xbe,0} }, { {0xe0,0x3f,0},{0xe0,     0xbf,0} },        /*13c*/
-    { {0xe0,0x40,0},{0xe0,     0xc0,0} }, { {0xe0,0x41,0},{0xe0,     0xc1,0} }, { {0xe0,0x42,0},{0xe0,     0xc2,0} }, { {0xe0,0x43,0},{0xe0,     0xc3,0} },        /*140*/
-    { {0xe0,0x44,0},{0xe0,     0xc4,0} }, { {          0},{               0} }, { {0xe0,0x46,0},{0xe0,     0xc6,0} }, { {0xe0,0x47,0},{0xe0,     0xc7,0} },        /*144*/
-    { {0xe0,0x48,0},{0xe0,     0xc8,0} }, { {0xe0,0x49,0},{0xe0,     0xc9,0} }, { {          0},{               0} }, { {0xe0,0x4b,0},{0xe0,     0xcb,0} },        /*148*/
-    { {0xe0,0x4c,0},{0xe0,     0xcc,0} }, { {0xe0,0x4d,0},{0xe0,     0xcd,0} }, { {0xe0,0x4e,0},{0xe0,     0xce,0} }, { {0xe0,0x4f,0},{0xe0,     0xcf,0} },        /*14c*/
-    { {0xe0,0x50,0},{0xe0,     0xd0,0} }, { {0xe0,0x51,0},{0xe0,     0xd1,0} }, { {0xe0,0x52,0},{0xe0,     0xd2,0} }, { {0xe0,0x53,0},{0xe0,     0xd3,0} },        /*150*/
-    { {          0},{               0} }, { {0xe0,0x55,0},{0xe0,     0xd5,0} }, { {          0},{               0} }, { {0xe0,0x57,0},{0xe0,     0xd7,0} },        /*154*/
-    { {0xe0,0x58,0},{0xe0,     0xd8,0} }, { {0xe0,0x59,0},{0xe0,     0xd9,0} }, { {0xe0,0x5a,0},{0xe0,     0xaa,0} }, { {0xe0,0x5b,0},{0xe0,     0xdb,0} },        /*158*/
-    { {0xe0,0x5c,0},{0xe0,     0xdc,0} }, { {0xe0,0x5d,0},{0xe0,     0xdd,0} }, { {0xe0,0x5e,0},{0xe0,     0xee,0} }, { {0xe0,0x5f,0},{0xe0,     0xdf,0} },        /*15c*/
-    { {          0},{               0} }, { {0xe0,0x61,0},{0xe0,     0xe1,0} }, { {0xe0,0x62,0},{0xe0,     0xe2,0} }, { {0xe0,0x63,0},{0xe0,     0xe3,0} },        /*160*/
-    { {0xe0,0x64,0},{0xe0,     0xe4,0} }, { {0xe0,0x65,0},{0xe0,     0xe5,0} }, { {0xe0,0x66,0},{0xe0,     0xe6,0} }, { {0xe0,0x67,0},{0xe0,     0xe7,0} },        /*164*/
-    { {0xe0,0x68,0},{0xe0,     0xe8,0} }, { {0xe0,0x69,0},{0xe0,     0xe9,0} }, { {0xe0,0x6a,0},{0xe0,     0xea,0} }, { {0xe0,0x6b,0},{0xe0,     0xeb,0} },        /*168*/
-    { {0xe0,0x6c,0},{0xe0,     0xec,0} }, { {0xe0,0x6d,0},{0xe0,     0xed,0} }, { {0xe0,0x6e,0},{0xe0,     0xee,0} }, { {          0},{               0} },        /*16c*/
-    { {0xe0,0x70,0},{0xe0,     0xf0,0} }, { {0xe0,0x71,0},{0xe0,     0xf1,0} }, { {0xe0,0x72,0},{0xe0,     0xf2,0} }, { {0xe0,0x73,0},{0xe0,     0xf3,0} },        /*170*/
-    { {0xe0,0x74,0},{0xe0,     0xf4,0} }, { {0xe0,0x75,0},{0xe0,     0xf5,0} }, { {          0},{               0} }, { {0xe0,0x77,0},{0xe0,     0xf7,0} },        /*174*/
-    { {0xe0,0x78,0},{0xe0,     0xf8,0} }, { {0xe0,0x79,0},{0xe0,     0xf9,0} }, { {0xe0,0x7a,0},{0xe0,     0xfa,0} }, { {0xe0,0x7b,0},{0xe0,     0xfb,0} },        /*178*/
-    { {0xe0,0x7c,0},{0xe0,     0xfc,0} }, { {0xe0,0x7d,0},{0xe0,     0xfd,0} }, { {0xe0,0x7e,0},{0xe0,     0xfe,0} }, { {0xe0,0x7f,0},{0xe0,     0xff,0} },        /*17c*/
+const scancode scancode_set1_ax[512] = {
+  // clang-format off
+    { .mk = {            0 }, .brk = {                   0 } }, /* 000 */
+    { .mk = {      0x01, 0 }, .brk = {             0x81, 0 } }, /* 001 */
+    { .mk = {      0x02, 0 }, .brk = {             0x82, 0 } }, /* 002 */
+    { .mk = {      0x03, 0 }, .brk = {             0x83, 0 } }, /* 003 */
+    { .mk = {      0x04, 0 }, .brk = {             0x84, 0 } }, /* 004 */
+    { .mk = {      0x05, 0 }, .brk = {             0x85, 0 } }, /* 005 */
+    { .mk = {      0x06, 0 }, .brk = {             0x86, 0 } }, /* 006 */
+    { .mk = {      0x07, 0 }, .brk = {             0x87, 0 } }, /* 007 */
+    { .mk = {      0x08, 0 }, .brk = {             0x88, 0 } }, /* 008 */
+    { .mk = {      0x09, 0 }, .brk = {             0x89, 0 } }, /* 009 */
+    { .mk = {      0x0a, 0 }, .brk = {             0x8a, 0 } }, /* 00a */
+    { .mk = {      0x0b, 0 }, .brk = {             0x8b, 0 } }, /* 00b */
+    { .mk = {      0x0c, 0 }, .brk = {             0x8c, 0 } }, /* 00c */
+    { .mk = {      0x0d, 0 }, .brk = {             0x8d, 0 } }, /* 00d */
+    { .mk = {      0x0e, 0 }, .brk = {             0x8e, 0 } }, /* 00e */
+    { .mk = {      0x0f, 0 }, .brk = {             0x8f, 0 } }, /* 00f */
+    { .mk = {      0x10, 0 }, .brk = {             0x90, 0 } }, /* 010 */
+    { .mk = {      0x11, 0 }, .brk = {             0x91, 0 } }, /* 011 */
+    { .mk = {      0x12, 0 }, .brk = {             0x92, 0 } }, /* 012 */
+    { .mk = {      0x13, 0 }, .brk = {             0x93, 0 } }, /* 013 */
+    { .mk = {      0x14, 0 }, .brk = {             0x94, 0 } }, /* 014 */
+    { .mk = {      0x15, 0 }, .brk = {             0x95, 0 } }, /* 015 */
+    { .mk = {      0x16, 0 }, .brk = {             0x96, 0 } }, /* 016 */
+    { .mk = {      0x17, 0 }, .brk = {             0x97, 0 } }, /* 017 */
+    { .mk = {      0x18, 0 }, .brk = {             0x98, 0 } }, /* 018 */
+    { .mk = {      0x19, 0 }, .brk = {             0x99, 0 } }, /* 019 */
+    { .mk = {      0x1a, 0 }, .brk = {             0x9a, 0 } }, /* 01a */
+    { .mk = {      0x1b, 0 }, .brk = {             0x9b, 0 } }, /* 01b */
+    { .mk = {      0x1c, 0 }, .brk = {             0x9c, 0 } }, /* 01c */
+    { .mk = {      0x1d, 0 }, .brk = {             0x9d, 0 } }, /* 01d */
+    { .mk = {      0x1e, 0 }, .brk = {             0x9e, 0 } }, /* 01e */
+    { .mk = {      0x1f, 0 }, .brk = {             0x9f, 0 } }, /* 01f */
+    { .mk = {      0x20, 0 }, .brk = {             0xa0, 0 } }, /* 020 */
+    { .mk = {      0x21, 0 }, .brk = {             0xa1, 0 } }, /* 021 */
+    { .mk = {      0x22, 0 }, .brk = {             0xa2, 0 } }, /* 022 */
+    { .mk = {      0x23, 0 }, .brk = {             0xa3, 0 } }, /* 023 */
+    { .mk = {      0x24, 0 }, .brk = {             0xa4, 0 } }, /* 024 */
+    { .mk = {      0x25, 0 }, .brk = {             0xa5, 0 } }, /* 025 */
+    { .mk = {      0x26, 0 }, .brk = {             0xa6, 0 } }, /* 026 */
+    { .mk = {      0x27, 0 }, .brk = {             0xa7, 0 } }, /* 027 */
+    { .mk = {      0x28, 0 }, .brk = {             0xa8, 0 } }, /* 028 */
+    { .mk = {      0x2b, 0 }, .brk = {             0xab, 0 } }, /* 029 */
+    { .mk = {      0x2a, 0 }, .brk = {             0xaa, 0 } }, /* 02a */
+    { .mk = {      0x29, 0 }, .brk = {             0xa9, 0 } }, /* 02b */
+    { .mk = {      0x2c, 0 }, .brk = {             0xac, 0 } }, /* 02c */
+    { .mk = {      0x2d, 0 }, .brk = {             0xad, 0 } }, /* 02d */
+    { .mk = {      0x2e, 0 }, .brk = {             0xae, 0 } }, /* 02e */
+    { .mk = {      0x2f, 0 }, .brk = {             0xaf, 0 } }, /* 02f */
+    { .mk = {      0x30, 0 }, .brk = {             0xb0, 0 } }, /* 030 */
+    { .mk = {      0x31, 0 }, .brk = {             0xb1, 0 } }, /* 031 */
+    { .mk = {      0x32, 0 }, .brk = {             0xb2, 0 } }, /* 032 */
+    { .mk = {      0x33, 0 }, .brk = {             0xb3, 0 } }, /* 033 */
+    { .mk = {      0x34, 0 }, .brk = {             0xb4, 0 } }, /* 034 */
+    { .mk = {      0x35, 0 }, .brk = {             0xb5, 0 } }, /* 035 */
+    { .mk = {      0x36, 0 }, .brk = {             0xb6, 0 } }, /* 036 */
+    { .mk = {      0x37, 0 }, .brk = {             0xb7, 0 } }, /* 037 */
+    { .mk = {      0x38, 0 }, .brk = {             0xb8, 0 } }, /* 038 */
+    { .mk = {      0x39, 0 }, .brk = {             0xb9, 0 } }, /* 039 */
+    { .mk = {      0x3a, 0 }, .brk = {             0xba, 0 } }, /* 03a */
+    { .mk = {      0x3b, 0 }, .brk = {             0xbb, 0 } }, /* 03b */
+    { .mk = {      0x3c, 0 }, .brk = {             0xbc, 0 } }, /* 03c */
+    { .mk = {      0x3d, 0 }, .brk = {             0xbd, 0 } }, /* 03d */
+    { .mk = {      0x3e, 0 }, .brk = {             0xbe, 0 } }, /* 03e */
+    { .mk = {      0x3f, 0 }, .brk = {             0xbf, 0 } }, /* 03f */
+    { .mk = {      0x40, 0 }, .brk = {             0xc0, 0 } }, /* 040 */
+    { .mk = {      0x41, 0 }, .brk = {             0xc1, 0 } }, /* 041 */
+    { .mk = {      0x42, 0 }, .brk = {             0xc2, 0 } }, /* 042 */
+    { .mk = {      0x43, 0 }, .brk = {             0xc3, 0 } }, /* 043 */
+    { .mk = {      0x44, 0 }, .brk = {             0xc4, 0 } }, /* 044 */
+    { .mk = {      0x45, 0 }, .brk = {             0xc5, 0 } }, /* 045 */
+    { .mk = {      0x46, 0 }, .brk = {             0xc6, 0 } }, /* 046 */
+    { .mk = {      0x47, 0 }, .brk = {             0xc7, 0 } }, /* 047 */
+    { .mk = {      0x48, 0 }, .brk = {             0xc8, 0 } }, /* 048 */
+    { .mk = {      0x49, 0 }, .brk = {             0xc9, 0 } }, /* 049 */
+    { .mk = {      0x4a, 0 }, .brk = {             0xca, 0 } }, /* 04a */
+    { .mk = {      0x4b, 0 }, .brk = {             0xcb, 0 } }, /* 04b */
+    { .mk = {      0x4c, 0 }, .brk = {             0xcc, 0 } }, /* 04c */
+    { .mk = {      0x4d, 0 }, .brk = {             0xcd, 0 } }, /* 04d */
+    { .mk = {      0x4e, 0 }, .brk = {             0xce, 0 } }, /* 04e */
+    { .mk = {      0x4f, 0 }, .brk = {             0xcf, 0 } }, /* 04f */
+    { .mk = {      0x50, 0 }, .brk = {             0xd0, 0 } }, /* 050 */
+    { .mk = {      0x51, 0 }, .brk = {             0xd1, 0 } }, /* 051 */
+    { .mk = {      0x52, 0 }, .brk = {             0xd2, 0 } }, /* 052 */
+    { .mk = {      0x53, 0 }, .brk = {             0xd3, 0 } }, /* 053 */
+    { .mk = {      0x54, 0 }, .brk = {             0xd4, 0 } }, /* 054 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 055 */
+    { .mk = {      0x56, 0 }, .brk = {             0xd6, 0 } }, /* 054 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 057 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 058 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 059 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05b */
+    { .mk = {      0x5c, 0 }, .brk = {             0xdc, 0 } }, /* 05c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05f */
+    { .mk = {      0x60, 0 }, .brk = {             0xe0, 0 } }, /* 060 */
+    { .mk = {      0x61, 0 }, .brk = {             0xe1, 0 } }, /* 061 */
+    { .mk = {      0x62, 0 }, .brk = {             0xe2, 0 } }, /* 062 */
+    { .mk = {      0x63, 0 }, .brk = {             0xe3, 0 } }, /* 063 */
+    { .mk = {      0x64, 0 }, .brk = {             0xe4, 0 } }, /* 064 */
+    { .mk = {      0x65, 0 }, .brk = {             0xe5, 0 } }, /* 065 */
+    { .mk = {      0x66, 0 }, .brk = {             0xe6, 0 } }, /* 066 */
+    { .mk = {      0x67, 0 }, .brk = {             0xe7, 0 } }, /* 067 */
+    { .mk = {      0x68, 0 }, .brk = {             0xe8, 0 } }, /* 068 */
+    { .mk = {      0x69, 0 }, .brk = {             0xe9, 0 } }, /* 069 */
+    { .mk = {      0x6a, 0 }, .brk = {             0xea, 0 } }, /* 06a */
+    { .mk = {      0x6b, 0 }, .brk = {             0xeb, 0 } }, /* 06b */
+    { .mk = {      0x6c, 0 }, .brk = {             0xec, 0 } }, /* 06c */
+    { .mk = {      0x6d, 0 }, .brk = {             0xed, 0 } }, /* 06d */
+    { .mk = {      0x6e, 0 }, .brk = {             0xee, 0 } }, /* 06e */
+    { .mk = {      0x6f, 0 }, .brk = {             0xef, 0 } }, /* 06f */
+    { .mk = {      0x70, 0 }, .brk = {             0xf0, 0 } }, /* 070 */
+    { .mk = {      0x71, 0 }, .brk = {             0xf1, 0 } }, /* 071 */
+    { .mk = {      0x72, 0 }, .brk = {             0xf2, 0 } }, /* 072 */
+    { .mk = {      0x56, 0 }, .brk = {             0xd6, 0 } }, /* 054 */
+    { .mk = {      0x74, 0 }, .brk = {             0xf4, 0 } }, /* 074 */
+    { .mk = {      0x75, 0 }, .brk = {             0xf5, 0 } }, /* 075 */
+    { .mk = {      0x76, 0 }, .brk = {             0xf6, 0 } }, /* 076 */
+    { .mk = {      0x77, 0 }, .brk = {             0xf7, 0 } }, /* 077 */
+    { .mk = {      0x78, 0 }, .brk = {             0xf8, 0 } }, /* 078 */
+    { .mk = {      0x79, 0 }, .brk = {             0xf9, 0 } }, /* 079 */
+    { .mk = {      0x7a, 0 }, .brk = {             0xfa, 0 } }, /* 07a */
+    { .mk = {      0x7b, 0 }, .brk = {             0xfb, 0 } }, /* 07b */
+    { .mk = {      0x7c, 0 }, .brk = {             0xfc, 0 } }, /* 07c */
+    { .mk = {      0x2b, 0 }, .brk = {             0xab, 0 } }, /* 07d */
+    { .mk = {      0x7e, 0 }, .brk = {             0xfe, 0 } }, /* 07e */
+    { .mk = {      0x7f, 0 }, .brk = {             0xff, 0 } }, /* 07f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 080 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 081 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 082 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 083 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 084 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 085 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 086 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 087 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 088 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 089 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 090 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 091 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 092 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 093 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 094 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 095 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 096 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 097 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 098 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 099 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ed */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f0 */
+    { .mk = {      0xf1, 0 }, .brk = {                   0 } }, /* 0f1 */
+    { .mk = {      0xf2, 0 }, .brk = {                   0 } }, /* 0f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fe */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ff */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 100 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 101 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 102 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 103 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 104 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 105 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 106 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 107 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 108 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 109 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 110 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 111 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 112 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 113 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 114 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 115 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 116 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 117 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 118 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 119 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11b */
+    { .mk = {      0x1c, 0 }, .brk = {             0x9c, 0 } }, /* 11c */
+    { .mk = {      0x1d, 0 }, .brk = {             0x9d, 0 } }, /* 11d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 120 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 121 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 122 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 123 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 124 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 125 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 126 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 127 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 128 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 129 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 130 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 131 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 132 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 133 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 134 */
+    { .mk = {      0x35, 0 }, .brk = {             0xb5, 0 } }, /* 135 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 136 */
+    { .mk = {      0x37, 0 }, .brk = {             0xb7, 0 } }, /* 137 */
+    { .mk = {      0x38, 0 }, .brk = {             0xb8, 0 } }, /* 138 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 139 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 140 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 141 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 142 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 143 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 144 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 145 */
+    { .mk = {      0x46, 0 }, .brk = {             0xc6, 0 } }, /* 146 */
+    { .mk = {      0x47, 0 }, .brk = {             0xc7, 0 } }, /* 147 */
+    { .mk = {      0x48, 0 }, .brk = {             0xc8, 0 } }, /* 148 */
+    { .mk = {      0x49, 0 }, .brk = {             0xc9, 0 } }, /* 149 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14a */
+    { .mk = {      0x4b, 0 }, .brk = {             0xcb, 0 } }, /* 14b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14c */
+    { .mk = {      0x4d, 0 }, .brk = {             0xcd, 0 } }, /* 14d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14e */
+    { .mk = {      0x4f, 0 }, .brk = {             0xcf, 0 } }, /* 14f */
+    { .mk = {      0x50, 0 }, .brk = {             0xd0, 0 } }, /* 150 */
+    { .mk = {      0x51, 0 }, .brk = {             0xd1, 0 } }, /* 151 */
+    { .mk = {      0x52, 0 }, .brk = {             0xd2, 0 } }, /* 152 */
+    { .mk = {      0x53, 0 }, .brk = {             0xd3, 0 } }, /* 153 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 154 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 155 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 156 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 157 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 158 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 159 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15a */
+    { .mk = {      0x5c, 0 }, .brk = {             0xdc, 0 } }, /* 15b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 160 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 161 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 162 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 163 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 164 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 165 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 166 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 167 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 168 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 169 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 170 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 171 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 172 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 173 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 174 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 175 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 176 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 177 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 178 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 179 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 180 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 181 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 182 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 183 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 184 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 185 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 186 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 187 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 188 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 189 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 190 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 191 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 192 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 193 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 194 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 195 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 196 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 197 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 198 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 199 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ed */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fe */
+    { .mk = {            0 }, .brk = {                   0 } }  /* 1ff */
+  // clang-format on
+};
 
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*180*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*184*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*188*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*18c*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*190*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*194*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*198*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*19c*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1a0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1a4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1a8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1ac*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1c0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1c4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1c8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1cc*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1d0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1d4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1d8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1dc*/
-    { {          0},{               0} }, { {0xe0,0xe1,0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1e0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1e4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1e8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {0xe0,0xee,0},{               0} }, { {          0},{               0} },        /*1ec*/
-    { {          0},{               0} }, { {0xe0,0xf1,0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1f0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1f4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1f8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {0xe0,0xfe,0},{               0} }, { {0xe0,0xff,0},{               0} }         /*1fc*/
+const scancode scancode_set2_ax[512] = {
+  // clang-format off
+    { .mk = {            0 }, .brk = {                   0 } }, /* 000 */
+    { .mk = {      0x76, 0 }, .brk = {       0xF0, 0x76, 0 } }, /* 001 */
+    { .mk = {      0x16, 0 }, .brk = {       0xF0, 0x16, 0 } }, /* 002 */
+    { .mk = {      0x1E, 0 }, .brk = {       0xF0, 0x1E, 0 } }, /* 003 */
+    { .mk = {      0x26, 0 }, .brk = {       0xF0, 0x26, 0 } }, /* 004 */
+    { .mk = {      0x25, 0 }, .brk = {       0xF0, 0x25, 0 } }, /* 005 */
+    { .mk = {      0x2E, 0 }, .brk = {       0xF0, 0x2E, 0 } }, /* 006 */
+    { .mk = {      0x36, 0 }, .brk = {       0xF0, 0x36, 0 } }, /* 007 */
+    { .mk = {      0x3D, 0 }, .brk = {       0xF0, 0x3D, 0 } }, /* 008 */
+    { .mk = {      0x3E, 0 }, .brk = {       0xF0, 0x3E, 0 } }, /* 009 */
+    { .mk = {      0x46, 0 }, .brk = {       0xF0, 0x46, 0 } }, /* 00a */
+    { .mk = {      0x45, 0 }, .brk = {       0xF0, 0x45, 0 } }, /* 00b */
+    { .mk = {      0x4E, 0 }, .brk = {       0xF0, 0x4E, 0 } }, /* 00c */
+    { .mk = {      0x55, 0 }, .brk = {       0xF0, 0x55, 0 } }, /* 00d */
+    { .mk = {      0x66, 0 }, .brk = {       0xF0, 0x66, 0 } }, /* 00e */
+    { .mk = {      0x0D, 0 }, .brk = {       0xF0, 0x0D, 0 } }, /* 00f */
+    { .mk = {      0x15, 0 }, .brk = {       0xF0, 0x15, 0 } }, /* 010 */
+    { .mk = {      0x1D, 0 }, .brk = {       0xF0, 0x1D, 0 } }, /* 011 */
+    { .mk = {      0x24, 0 }, .brk = {       0xF0, 0x24, 0 } }, /* 012 */
+    { .mk = {      0x2D, 0 }, .brk = {       0xF0, 0x2D, 0 } }, /* 013 */
+    { .mk = {      0x2C, 0 }, .brk = {       0xF0, 0x2C, 0 } }, /* 014 */
+    { .mk = {      0x35, 0 }, .brk = {       0xF0, 0x35, 0 } }, /* 015 */
+    { .mk = {      0x3C, 0 }, .brk = {       0xF0, 0x3C, 0 } }, /* 016 */
+    { .mk = {      0x43, 0 }, .brk = {       0xF0, 0x43, 0 } }, /* 017 */
+    { .mk = {      0x44, 0 }, .brk = {       0xF0, 0x44, 0 } }, /* 018 */
+    { .mk = {      0x4D, 0 }, .brk = {       0xF0, 0x4D, 0 } }, /* 019 */
+    { .mk = {      0x54, 0 }, .brk = {       0xF0, 0x54, 0 } }, /* 01a */
+    { .mk = {      0x5B, 0 }, .brk = {       0xF0, 0x5B, 0 } }, /* 01b */
+    { .mk = {      0x5A, 0 }, .brk = {       0xF0, 0x5A, 0 } }, /* 01c */
+    { .mk = {      0x14, 0 }, .brk = {       0xF0, 0x14, 0 } }, /* 01d */
+    { .mk = {      0x1C, 0 }, .brk = {       0xF0, 0x1C, 0 } }, /* 01e */
+    { .mk = {      0x1B, 0 }, .brk = {       0xF0, 0x1B, 0 } }, /* 01f */
+    { .mk = {      0x23, 0 }, .brk = {       0xF0, 0x23, 0 } }, /* 020 */
+    { .mk = {      0x2B, 0 }, .brk = {       0xF0, 0x2B, 0 } }, /* 021 */
+    { .mk = {      0x34, 0 }, .brk = {       0xF0, 0x34, 0 } }, /* 022 */
+    { .mk = {      0x33, 0 }, .brk = {       0xF0, 0x33, 0 } }, /* 023 */
+    { .mk = {      0x3B, 0 }, .brk = {       0xF0, 0x3B, 0 } }, /* 024 */
+    { .mk = {      0x42, 0 }, .brk = {       0xF0, 0x42, 0 } }, /* 025 */
+    { .mk = {      0x4B, 0 }, .brk = {       0xF0, 0x4B, 0 } }, /* 026 */
+    { .mk = {      0x4C, 0 }, .brk = {       0xF0, 0x4C, 0 } }, /* 027 */
+    { .mk = {      0x52, 0 }, .brk = {       0xF0, 0x52, 0 } }, /* 028 */
+    { .mk = {      0x5D, 0 }, .brk = {       0xF0, 0x5D, 0 } }, /* 029 */
+    { .mk = {      0x12, 0 }, .brk = {       0xF0, 0x12, 0 } }, /* 02a */
+    { .mk = {      0x0E, 0 }, .brk = {       0xF0, 0x0E, 0 } }, /* 02b */
+    { .mk = {      0x1A, 0 }, .brk = {       0xF0, 0x1A, 0 } }, /* 02c */
+    { .mk = {      0x22, 0 }, .brk = {       0xF0, 0x22, 0 } }, /* 02d */
+    { .mk = {      0x21, 0 }, .brk = {       0xF0, 0x21, 0 } }, /* 02e */
+    { .mk = {      0x2A, 0 }, .brk = {       0xF0, 0x2A, 0 } }, /* 02f */
+    { .mk = {      0x32, 0 }, .brk = {       0xF0, 0x32, 0 } }, /* 030 */
+    { .mk = {      0x31, 0 }, .brk = {       0xF0, 0x31, 0 } }, /* 031 */
+    { .mk = {      0x3A, 0 }, .brk = {       0xF0, 0x3A, 0 } }, /* 032 */
+    { .mk = {      0x41, 0 }, .brk = {       0xF0, 0x41, 0 } }, /* 033 */
+    { .mk = {      0x49, 0 }, .brk = {       0xF0, 0x49, 0 } }, /* 034 */
+    { .mk = {      0x4A, 0 }, .brk = {       0xF0, 0x4A, 0 } }, /* 035 */
+    { .mk = {      0x59, 0 }, .brk = {       0xF0, 0x59, 0 } }, /* 036 */
+    { .mk = {      0x7C, 0 }, .brk = {       0xF0, 0x7C, 0 } }, /* 037 */
+    { .mk = {      0x11, 0 }, .brk = {       0xF0, 0x11, 0 } }, /* 038 */
+    { .mk = {      0x29, 0 }, .brk = {       0xF0, 0x29, 0 } }, /* 039 */
+    { .mk = {      0x58, 0 }, .brk = {       0xF0, 0x58, 0 } }, /* 03a */
+    { .mk = {      0x05, 0 }, .brk = {       0xF0, 0x05, 0 } }, /* 03b */
+    { .mk = {      0x06, 0 }, .brk = {       0xF0, 0x06, 0 } }, /* 03c */
+    { .mk = {      0x04, 0 }, .brk = {       0xF0, 0x04, 0 } }, /* 03d */
+    { .mk = {      0x0C, 0 }, .brk = {       0xF0, 0x0C, 0 } }, /* 03e */
+    { .mk = {      0x03, 0 }, .brk = {       0xF0, 0x03, 0 } }, /* 03f */
+    { .mk = {      0x0B, 0 }, .brk = {       0xF0, 0x0B, 0 } }, /* 040 */
+    { .mk = {      0x83, 0 }, .brk = {       0xF0, 0x83, 0 } }, /* 041 */
+    { .mk = {      0x0A, 0 }, .brk = {       0xF0, 0x0A, 0 } }, /* 042 */
+    { .mk = {      0x01, 0 }, .brk = {       0xF0, 0x01, 0 } }, /* 043 */
+    { .mk = {      0x09, 0 }, .brk = {       0xF0, 0x09, 0 } }, /* 044 */
+    { .mk = {      0x77, 0 }, .brk = {       0xF0, 0x77, 0 } }, /* 045 */
+    { .mk = {      0x7E, 0 }, .brk = {       0xF0, 0x7E, 0 } }, /* 046 */
+    { .mk = {      0x6C, 0 }, .brk = {       0xF0, 0x6C, 0 } }, /* 047 */
+    { .mk = {      0x75, 0 }, .brk = {       0xF0, 0x75, 0 } }, /* 048 */
+    { .mk = {      0x7D, 0 }, .brk = {       0xF0, 0x7D, 0 } }, /* 049 */
+    { .mk = {      0x7B, 0 }, .brk = {       0xF0, 0x7B, 0 } }, /* 04a */
+    { .mk = {      0x6B, 0 }, .brk = {       0xF0, 0x6B, 0 } }, /* 04b */
+    { .mk = {      0x73, 0 }, .brk = {       0xF0, 0x73, 0 } }, /* 04c */
+    { .mk = {      0x74, 0 }, .brk = {       0xF0, 0x74, 0 } }, /* 04d */
+    { .mk = {      0x79, 0 }, .brk = {       0xF0, 0x79, 0 } }, /* 04e */
+    { .mk = {      0x69, 0 }, .brk = {       0xF0, 0x69, 0 } }, /* 04f */
+    { .mk = {      0x72, 0 }, .brk = {       0xF0, 0x72, 0 } }, /* 050 */
+    { .mk = {      0x7A, 0 }, .brk = {       0xF0, 0x7A, 0 } }, /* 051 */
+    { .mk = {      0x70, 0 }, .brk = {       0xF0, 0x70, 0 } }, /* 052 */
+    { .mk = {      0x71, 0 }, .brk = {       0xF0, 0x71, 0 } }, /* 053 */
+    { .mk = {      0x84, 0 }, .brk = {       0xF0, 0x84, 0 } }, /* 054 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 055 */
+    { .mk = {      0x61, 0 }, .brk = {       0xF0, 0x61, 0 } }, /* 056 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 057 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 058 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 059 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05b */
+    { .mk = {      0x27, 0 }, .brk = {       0xF0, 0x27, 0 } }, /* 05c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05f */
+    { .mk = {      0x47, 0 }, .brk = {       0xF0, 0x47, 0 } }, /* 060 */
+    { .mk = {      0x4F, 0 }, .brk = {       0xF0, 0x4F, 0 } }, /* 061 */
+    { .mk = {      0x56, 0 }, .brk = {       0xF0, 0x56, 0 } }, /* 062 */
+    { .mk = {      0x5E, 0 }, .brk = {       0xF0, 0x5E, 0 } }, /* 063 */
+    { .mk = {      0x08, 0 }, .brk = {       0xF0, 0x08, 0 } }, /* 064 */
+    { .mk = {      0x10, 0 }, .brk = {       0xF0, 0x10, 0 } }, /* 065 */
+    { .mk = {      0x18, 0 }, .brk = {       0xF0, 0x18, 0 } }, /* 066 */
+    { .mk = {      0x20, 0 }, .brk = {       0xF0, 0x20, 0 } }, /* 067 */
+    { .mk = {      0x28, 0 }, .brk = {       0xF0, 0x28, 0 } }, /* 068 */
+    { .mk = {      0x30, 0 }, .brk = {       0xF0, 0x30, 0 } }, /* 069 */
+    { .mk = {      0x38, 0 }, .brk = {       0xF0, 0x38, 0 } }, /* 06a */
+    { .mk = {      0x40, 0 }, .brk = {       0xF0, 0x40, 0 } }, /* 06b */
+    { .mk = {      0x48, 0 }, .brk = {       0xF0, 0x48, 0 } }, /* 06c */
+    { .mk = {      0x50, 0 }, .brk = {       0xF0, 0x50, 0 } }, /* 06d */
+    { .mk = {      0x57, 0 }, .brk = {       0xF0, 0x57, 0 } }, /* 06e */
+    { .mk = {      0x6F, 0 }, .brk = {       0xF0, 0x6F, 0 } }, /* 06f */
+    { .mk = {      0x13, 0 }, .brk = {       0xF0, 0x13, 0 } }, /* 070 */
+    { .mk = {      0x19, 0 }, .brk = {       0xF0, 0x19, 0 } }, /* 071 */
+    { .mk = {      0x39, 0 }, .brk = {       0xF0, 0x39, 0 } }, /* 072 */
+    { .mk = {      0x5D, 0 }, .brk = {       0xF0, 0x5D, 0 } }, /* 073 */
+    { .mk = {      0x53, 0 }, .brk = {       0xF0, 0x53, 0 } }, /* 074 */
+    { .mk = {      0x5C, 0 }, .brk = {       0xF0, 0x5C, 0 } }, /* 075 */
+    { .mk = {      0x5F, 0 }, .brk = {       0xF0, 0x5F, 0 } }, /* 076 */
+    { .mk = {      0x62, 0 }, .brk = {       0xF0, 0x62, 0 } }, /* 077 */
+    { .mk = {      0x63, 0 }, .brk = {       0xF0, 0x63, 0 } }, /* 078 */
+    { .mk = {      0x64, 0 }, .brk = {       0xF0, 0x64, 0 } }, /* 079 */
+    { .mk = {      0x65, 0 }, .brk = {       0xF0, 0x65, 0 } }, /* 07a */
+    { .mk = {      0x67, 0 }, .brk = {       0xF0, 0x67, 0 } }, /* 07b */
+    { .mk = {      0x68, 0 }, .brk = {       0xF0, 0x68, 0 } }, /* 07c */
+    { .mk = {      0x61, 0 }, .brk = {       0xF0, 0x61, 0 } }, /* 07d */
+    { .mk = {      0x6D, 0 }, .brk = {       0xF0, 0x6D, 0 } }, /* 07e */
+    { .mk = {      0x6E, 0 }, .brk = {       0xF0, 0x6E, 0 } }, /* 07f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 080 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 081 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 082 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 083 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 084 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 085 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 086 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 087 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 088 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 089 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 090 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 091 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 092 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 093 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 094 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 095 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 096 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 097 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 098 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 099 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ed */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f0 */
+    { .mk = {      0xf1, 0 }, .brk = {       0xf0, 0xf1, 0 } }, /* 0f1 */
+    { .mk = {      0xf2, 0 }, .brk = {       0xf0, 0xf2, 0 } }, /* 0f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fe */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ff */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 100 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 101 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 102 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 103 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 104 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 105 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 106 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 107 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 108 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 109 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 110 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 111 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 112 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 113 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 114 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 115 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 116 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 117 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 118 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 119 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11b */
+    { .mk = {      0x5A, 0 }, .brk = {       0xF0, 0x5A, 0 } }, /* 11c */
+    { .mk = {      0x14, 0 }, .brk = {       0xF0, 0x14, 0 } }, /* 11d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 120 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 121 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 122 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 123 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 124 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 125 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 126 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 127 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 128 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 129 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 130 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 131 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 132 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 133 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 134 */
+    { .mk = {      0x4A, 0 }, .brk = {       0xF0, 0x4A, 0 } }, /* 135 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 136 */
+    { .mk = {      0x7C, 0 }, .brk = {       0xF0, 0x7C, 0 } }, /* 137 */
+    { .mk = {      0x11, 0 }, .brk = {       0xF0, 0x11, 0 } }, /* 138 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 139 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 140 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 141 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 142 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 143 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 144 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 145 */
+    { .mk = {      0x7E, 0 }, .brk = {       0xF0, 0x7E, 0 } }, /* 146 */
+    { .mk = {      0x6C, 0 }, .brk = {       0xF0, 0x6C, 0 } }, /* 147 */
+    { .mk = {      0x75, 0 }, .brk = {       0xF0, 0x75, 0 } }, /* 148 */
+    { .mk = {      0x7D, 0 }, .brk = {       0xF0, 0x7D, 0 } }, /* 149 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14a */
+    { .mk = {      0x6B, 0 }, .brk = {       0xF0, 0x6B, 0 } }, /* 14b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14c */
+    { .mk = {      0x74, 0 }, .brk = {       0xF0, 0x74, 0 } }, /* 14d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14e */
+    { .mk = {      0x69, 0 }, .brk = {       0xF0, 0x69, 0 } }, /* 14f */
+    { .mk = {      0x72, 0 }, .brk = {       0xF0, 0x72, 0 } }, /* 150 */
+    { .mk = {      0x7A, 0 }, .brk = {       0xF0, 0x7A, 0 } }, /* 151 */
+    { .mk = {      0x70, 0 }, .brk = {       0xF0, 0x70, 0 } }, /* 152 */
+    { .mk = {      0x71, 0 }, .brk = {       0xF0, 0x71, 0 } }, /* 153 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 154 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 155 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 156 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 157 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 158 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 159 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15a */
+    { .mk = {      0x27, 0 }, .brk = {       0xF0, 0x27, 0 } }, /* 15b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 160 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 161 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 162 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 163 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 164 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 165 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 166 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 167 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 168 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 169 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 170 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 171 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 172 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 173 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 174 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 175 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 176 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 177 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 178 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 179 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 180 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 181 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 182 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 183 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 184 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 185 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 186 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 187 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 188 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 189 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 190 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 191 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 192 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 193 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 194 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 195 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 196 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 197 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 198 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 199 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ed */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fe */
+    { .mk = {            0 }, .brk = {                   0 } }  /* 1ff */
+  // clang-format on
+};
+
+const scancode scancode_set1[512] = {
+  // clang-format off
+    { .mk = {            0 }, .brk = {                   0 } }, /* 000 */
+    { .mk = {      0x01, 0 }, .brk = {             0x81, 0 } }, /* 001 */
+    { .mk = {      0x02, 0 }, .brk = {             0x82, 0 } }, /* 002 */
+    { .mk = {      0x03, 0 }, .brk = {             0x83, 0 } }, /* 003 */
+    { .mk = {      0x04, 0 }, .brk = {             0x84, 0 } }, /* 004 */
+    { .mk = {      0x05, 0 }, .brk = {             0x85, 0 } }, /* 005 */
+    { .mk = {      0x06, 0 }, .brk = {             0x86, 0 } }, /* 006 */
+    { .mk = {      0x07, 0 }, .brk = {             0x87, 0 } }, /* 007 */
+    { .mk = {      0x08, 0 }, .brk = {             0x88, 0 } }, /* 008 */
+    { .mk = {      0x09, 0 }, .brk = {             0x89, 0 } }, /* 009 */
+    { .mk = {      0x0a, 0 }, .brk = {             0x8a, 0 } }, /* 00a */
+    { .mk = {      0x0b, 0 }, .brk = {             0x8b, 0 } }, /* 00b */
+    { .mk = {      0x0c, 0 }, .brk = {             0x8c, 0 } }, /* 00c */
+    { .mk = {      0x0d, 0 }, .brk = {             0x8d, 0 } }, /* 00d */
+    { .mk = {      0x0e, 0 }, .brk = {             0x8e, 0 } }, /* 00e */
+    { .mk = {      0x0f, 0 }, .brk = {             0x8f, 0 } }, /* 00f */
+    { .mk = {      0x10, 0 }, .brk = {             0x90, 0 } }, /* 010 */
+    { .mk = {      0x11, 0 }, .brk = {             0x91, 0 } }, /* 011 */
+    { .mk = {      0x12, 0 }, .brk = {             0x92, 0 } }, /* 012 */
+    { .mk = {      0x13, 0 }, .brk = {             0x93, 0 } }, /* 013 */
+    { .mk = {      0x14, 0 }, .brk = {             0x94, 0 } }, /* 014 */
+    { .mk = {      0x15, 0 }, .brk = {             0x95, 0 } }, /* 015 */
+    { .mk = {      0x16, 0 }, .brk = {             0x96, 0 } }, /* 016 */
+    { .mk = {      0x17, 0 }, .brk = {             0x97, 0 } }, /* 017 */
+    { .mk = {      0x18, 0 }, .brk = {             0x98, 0 } }, /* 018 */
+    { .mk = {      0x19, 0 }, .brk = {             0x99, 0 } }, /* 019 */
+    { .mk = {      0x1a, 0 }, .brk = {             0x9a, 0 } }, /* 01a */
+    { .mk = {      0x1b, 0 }, .brk = {             0x9b, 0 } }, /* 01b */
+    { .mk = {      0x1c, 0 }, .brk = {             0x9c, 0 } }, /* 01c */
+    { .mk = {      0x1d, 0 }, .brk = {             0x9d, 0 } }, /* 01d */
+    { .mk = {      0x1e, 0 }, .brk = {             0x9e, 0 } }, /* 01e */
+    { .mk = {      0x1f, 0 }, .brk = {             0x9f, 0 } }, /* 01f */
+    { .mk = {      0x20, 0 }, .brk = {             0xa0, 0 } }, /* 020 */
+    { .mk = {      0x21, 0 }, .brk = {             0xa1, 0 } }, /* 021 */
+    { .mk = {      0x22, 0 }, .brk = {             0xa2, 0 } }, /* 022 */
+    { .mk = {      0x23, 0 }, .brk = {             0xa3, 0 } }, /* 023 */
+    { .mk = {      0x24, 0 }, .brk = {             0xa4, 0 } }, /* 024 */
+    { .mk = {      0x25, 0 }, .brk = {             0xa5, 0 } }, /* 025 */
+    { .mk = {      0x26, 0 }, .brk = {             0xa6, 0 } }, /* 026 */
+    { .mk = {      0x27, 0 }, .brk = {             0xa7, 0 } }, /* 027 */
+    { .mk = {      0x28, 0 }, .brk = {             0xa8, 0 } }, /* 028 */
+    { .mk = {      0x29, 0 }, .brk = {             0xa9, 0 } }, /* 029 */
+    { .mk = {      0x2a, 0 }, .brk = {             0xaa, 0 } }, /* 02a */
+    { .mk = {      0x2b, 0 }, .brk = {             0xab, 0 } }, /* 02b */
+    { .mk = {      0x2c, 0 }, .brk = {             0xac, 0 } }, /* 02c */
+    { .mk = {      0x2d, 0 }, .brk = {             0xad, 0 } }, /* 02d */
+    { .mk = {      0x2e, 0 }, .brk = {             0xae, 0 } }, /* 02e */
+    { .mk = {      0x2f, 0 }, .brk = {             0xaf, 0 } }, /* 02f */
+    { .mk = {      0x30, 0 }, .brk = {             0xb0, 0 } }, /* 030 */
+    { .mk = {      0x31, 0 }, .brk = {             0xb1, 0 } }, /* 031 */
+    { .mk = {      0x32, 0 }, .brk = {             0xb2, 0 } }, /* 032 */
+    { .mk = {      0x33, 0 }, .brk = {             0xb3, 0 } }, /* 033 */
+    { .mk = {      0x34, 0 }, .brk = {             0xb4, 0 } }, /* 034 */
+    { .mk = {      0x35, 0 }, .brk = {             0xb5, 0 } }, /* 035 */
+    { .mk = {      0x36, 0 }, .brk = {             0xb6, 0 } }, /* 036 */
+    { .mk = {      0x37, 0 }, .brk = {             0xb7, 0 } }, /* 037 */
+    { .mk = {      0x38, 0 }, .brk = {             0xb8, 0 } }, /* 038 */
+    { .mk = {      0x39, 0 }, .brk = {             0xb9, 0 } }, /* 039 */
+    { .mk = {      0x3a, 0 }, .brk = {             0xba, 0 } }, /* 03a */
+    { .mk = {      0x3b, 0 }, .brk = {             0xbb, 0 } }, /* 03b */
+    { .mk = {      0x3c, 0 }, .brk = {             0xbc, 0 } }, /* 03c */
+    { .mk = {      0x3d, 0 }, .brk = {             0xbd, 0 } }, /* 03d */
+    { .mk = {      0x3e, 0 }, .brk = {             0xbe, 0 } }, /* 03e */
+    { .mk = {      0x3f, 0 }, .brk = {             0xbf, 0 } }, /* 03f */
+    { .mk = {      0x40, 0 }, .brk = {             0xc0, 0 } }, /* 040 */
+    { .mk = {      0x41, 0 }, .brk = {             0xc1, 0 } }, /* 041 */
+    { .mk = {      0x42, 0 }, .brk = {             0xc2, 0 } }, /* 042 */
+    { .mk = {      0x43, 0 }, .brk = {             0xc3, 0 } }, /* 043 */
+    { .mk = {      0x44, 0 }, .brk = {             0xc4, 0 } }, /* 044 */
+    { .mk = {      0x45, 0 }, .brk = {             0xc5, 0 } }, /* 045 */
+    { .mk = {      0x46, 0 }, .brk = {             0xc6, 0 } }, /* 046 */
+    { .mk = {      0x47, 0 }, .brk = {             0xc7, 0 } }, /* 047 */
+    { .mk = {      0x48, 0 }, .brk = {             0xc8, 0 } }, /* 048 */
+    { .mk = {      0x49, 0 }, .brk = {             0xc9, 0 } }, /* 049 */
+    { .mk = {      0x4a, 0 }, .brk = {             0xca, 0 } }, /* 04a */
+    { .mk = {      0x4b, 0 }, .brk = {             0xcb, 0 } }, /* 04b */
+    { .mk = {      0x4c, 0 }, .brk = {             0xcc, 0 } }, /* 04c */
+    { .mk = {      0x4d, 0 }, .brk = {             0xcd, 0 } }, /* 04d */
+    { .mk = {      0x4e, 0 }, .brk = {             0xce, 0 } }, /* 04e */
+    { .mk = {      0x4f, 0 }, .brk = {             0xcf, 0 } }, /* 04f */
+    { .mk = {      0x50, 0 }, .brk = {             0xd0, 0 } }, /* 050 */
+    { .mk = {      0x51, 0 }, .brk = {             0xd1, 0 } }, /* 051 */
+    { .mk = {      0x52, 0 }, .brk = {             0xd2, 0 } }, /* 052 */
+    { .mk = {      0x53, 0 }, .brk = {             0xd3, 0 } }, /* 053 */
+    { .mk = {      0x54, 0 }, .brk = {             0xd4, 0 } }, /* 054 */
+    { .mk = {      0x55, 0 }, .brk = {             0xd5, 0 } }, /* 055 */
+    { .mk = {      0x56, 0 }, .brk = {             0xd6, 0 } }, /* 056 */
+    { .mk = {      0x57, 0 }, .brk = {             0xd7, 0 } }, /* 057 */
+    { .mk = {      0x58, 0 }, .brk = {             0xd8, 0 } }, /* 058 */
+    { .mk = {      0x59, 0 }, .brk = {             0xd9, 0 } }, /* 059 */
+    { .mk = {      0x5a, 0 }, .brk = {             0xda, 0 } }, /* 05a */
+    { .mk = {      0x5b, 0 }, .brk = {             0xdb, 0 } }, /* 05b */
+    { .mk = {      0x5c, 0 }, .brk = {             0xdc, 0 } }, /* 05c */
+    { .mk = {      0x5d, 0 }, .brk = {             0xdd, 0 } }, /* 05d */
+    { .mk = {      0x5e, 0 }, .brk = {             0xde, 0 } }, /* 05e */
+    { .mk = {      0x5f, 0 }, .brk = {             0xdf, 0 } }, /* 05f */
+    { .mk = {      0x60, 0 }, .brk = {             0xe0, 0 } }, /* 060 */
+    { .mk = {      0x61, 0 }, .brk = {             0xe1, 0 } }, /* 061 */
+    { .mk = {      0x62, 0 }, .brk = {             0xe2, 0 } }, /* 062 */
+    { .mk = {      0x63, 0 }, .brk = {             0xe3, 0 } }, /* 063 */
+    { .mk = {      0x64, 0 }, .brk = {             0xe4, 0 } }, /* 064 */
+    { .mk = {      0x65, 0 }, .brk = {             0xe5, 0 } }, /* 065 */
+    { .mk = {      0x66, 0 }, .brk = {             0xe6, 0 } }, /* 066 */
+    { .mk = {      0x67, 0 }, .brk = {             0xe7, 0 } }, /* 067 */
+    { .mk = {      0x68, 0 }, .brk = {             0xe8, 0 } }, /* 068 */
+    { .mk = {      0x69, 0 }, .brk = {             0xe9, 0 } }, /* 069 */
+    { .mk = {      0x6a, 0 }, .brk = {             0xea, 0 } }, /* 06a */
+    { .mk = {      0x6b, 0 }, .brk = {             0xeb, 0 } }, /* 06b */
+    { .mk = {      0x6c, 0 }, .brk = {             0xec, 0 } }, /* 06c */
+    { .mk = {      0x6d, 0 }, .brk = {             0xed, 0 } }, /* 06d */
+    { .mk = {      0x6e, 0 }, .brk = {             0xee, 0 } }, /* 06e */
+    { .mk = {      0x6f, 0 }, .brk = {             0xef, 0 } }, /* 06f */
+    { .mk = {      0x70, 0 }, .brk = {             0xf0, 0 } }, /* 070 */
+    { .mk = {      0x71, 0 }, .brk = {             0xf1, 0 } }, /* 071 */
+    { .mk = {      0x72, 0 }, .brk = {             0xf2, 0 } }, /* 072 */
+    { .mk = {      0x73, 0 }, .brk = {             0xf3, 0 } }, /* 073 */
+    { .mk = {      0x74, 0 }, .brk = {             0xf4, 0 } }, /* 074 */
+    { .mk = {      0x75, 0 }, .brk = {             0xf5, 0 } }, /* 075 */
+    { .mk = {      0x76, 0 }, .brk = {             0xf6, 0 } }, /* 076 */
+    { .mk = {      0x77, 0 }, .brk = {             0xf7, 0 } }, /* 077 */
+    { .mk = {      0x78, 0 }, .brk = {             0xf8, 0 } }, /* 078 */
+    { .mk = {      0x79, 0 }, .brk = {             0xf9, 0 } }, /* 079 */
+    { .mk = {      0x7a, 0 }, .brk = {             0xfa, 0 } }, /* 07a */
+    { .mk = {      0x7b, 0 }, .brk = {             0xfb, 0 } }, /* 07b */
+    { .mk = {      0x7c, 0 }, .brk = {             0xfc, 0 } }, /* 07c */
+    { .mk = {      0x7d, 0 }, .brk = {             0xfd, 0 } }, /* 07d */
+    { .mk = {      0x7e, 0 }, .brk = {             0xfe, 0 } }, /* 07e */
+    { .mk = {      0x7f, 0 }, .brk = {             0xff, 0 } }, /* 07f */
+    { .mk = {      0x80, 0 }, .brk = {                   0 } }, /* 080 */
+    { .mk = {      0x81, 0 }, .brk = {                   0 } }, /* 081 */
+    { .mk = {      0x82, 0 }, .brk = {                   0 } }, /* 082 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 083 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 084 */
+    { .mk = {      0x85, 0 }, .brk = {                   0 } }, /* 085 */
+    { .mk = {      0x86, 0 }, .brk = {                   0 } }, /* 086 */
+    { .mk = {      0x87, 0 }, .brk = {                   0 } }, /* 087 */
+    { .mk = {      0x88, 0 }, .brk = {                   0 } }, /* 088 */
+    { .mk = {      0x89, 0 }, .brk = {                   0 } }, /* 089 */
+    { .mk = {      0x8a, 0 }, .brk = {                   0 } }, /* 08a */
+    { .mk = {      0x8b, 0 }, .brk = {                   0 } }, /* 08b */
+    { .mk = {      0x8c, 0 }, .brk = {                   0 } }, /* 08c */
+    { .mk = {      0x8d, 0 }, .brk = {                   0 } }, /* 08d */
+    { .mk = {      0x8e, 0 }, .brk = {                   0 } }, /* 08e */
+    { .mk = {      0x8f, 0 }, .brk = {                   0 } }, /* 08f */
+    { .mk = {      0x90, 0 }, .brk = {                   0 } }, /* 090 */
+    { .mk = {      0x91, 0 }, .brk = {                   0 } }, /* 091 */
+    { .mk = {      0x92, 0 }, .brk = {                   0 } }, /* 092 */
+    { .mk = {      0x93, 0 }, .brk = {                   0 } }, /* 093 */
+    { .mk = {      0x94, 0 }, .brk = {                   0 } }, /* 094 */
+    { .mk = {      0x95, 0 }, .brk = {                   0 } }, /* 095 */
+    { .mk = {      0x96, 0 }, .brk = {                   0 } }, /* 096 */
+    { .mk = {      0x97, 0 }, .brk = {                   0 } }, /* 097 */
+    { .mk = {      0x98, 0 }, .brk = {                   0 } }, /* 098 */
+    { .mk = {      0x99, 0 }, .brk = {                   0 } }, /* 099 */
+    { .mk = {      0x9a, 0 }, .brk = {                   0 } }, /* 09a */
+    { .mk = {      0x9b, 0 }, .brk = {                   0 } }, /* 09b */
+    { .mk = {      0x9c, 0 }, .brk = {                   0 } }, /* 09c */
+    { .mk = {      0x9d, 0 }, .brk = {                   0 } }, /* 09d */
+    { .mk = {      0x9e, 0 }, .brk = {                   0 } }, /* 09e */
+    { .mk = {      0x9f, 0 }, .brk = {                   0 } }, /* 09f */
+    { .mk = {      0xa0, 0 }, .brk = {                   0 } }, /* 0a0 */
+    { .mk = {      0xa1, 0 }, .brk = {                   0 } }, /* 0a1 */
+    { .mk = {      0xa2, 0 }, .brk = {                   0 } }, /* 0a2 */
+    { .mk = {      0xa3, 0 }, .brk = {                   0 } }, /* 0a3 */
+    { .mk = {      0xa4, 0 }, .brk = {                   0 } }, /* 0a4 */
+    { .mk = {      0xa5, 0 }, .brk = {                   0 } }, /* 0a5 */
+    { .mk = {      0xa6, 0 }, .brk = {                   0 } }, /* 0a6 */
+    { .mk = {      0xa7, 0 }, .brk = {                   0 } }, /* 0a7 */
+    { .mk = {      0xa8, 0 }, .brk = {                   0 } }, /* 0a8 */
+    { .mk = {      0xa9, 0 }, .brk = {                   0 } }, /* 0a9 */
+    { .mk = {      0xaa, 0 }, .brk = {                   0 } }, /* 0aa */
+    { .mk = {      0xab, 0 }, .brk = {                   0 } }, /* 0ab */
+    { .mk = {      0xac, 0 }, .brk = {                   0 } }, /* 0ac */
+    { .mk = {      0xad, 0 }, .brk = {                   0 } }, /* 0ad */
+    { .mk = {      0xae, 0 }, .brk = {                   0 } }, /* 0ae */
+    { .mk = {      0xaf, 0 }, .brk = {                   0 } }, /* 0af */
+    { .mk = {      0xb0, 0 }, .brk = {                   0 } }, /* 0b0 */
+    { .mk = {      0xb1, 0 }, .brk = {                   0 } }, /* 0b1 */
+    { .mk = {      0xb2, 0 }, .brk = {                   0 } }, /* 0b2 */
+    { .mk = {      0xb3, 0 }, .brk = {                   0 } }, /* 0b3 */
+    { .mk = {      0xb4, 0 }, .brk = {                   0 } }, /* 0b4 */
+    { .mk = {      0xb5, 0 }, .brk = {                   0 } }, /* 0b5 */
+    { .mk = {      0xb6, 0 }, .brk = {                   0 } }, /* 0b6 */
+    { .mk = {      0xb7, 0 }, .brk = {                   0 } }, /* 0b7 */
+    { .mk = {      0xb8, 0 }, .brk = {                   0 } }, /* 0b8 */
+    { .mk = {      0xb9, 0 }, .brk = {                   0 } }, /* 0b9 */
+    { .mk = {      0xba, 0 }, .brk = {                   0 } }, /* 0ba */
+    { .mk = {      0xbb, 0 }, .brk = {                   0 } }, /* 0bb */
+    { .mk = {      0xbc, 0 }, .brk = {                   0 } }, /* 0bc */
+    { .mk = {      0xbd, 0 }, .brk = {                   0 } }, /* 0bd */
+    { .mk = {      0xbe, 0 }, .brk = {                   0 } }, /* 0be */
+    { .mk = {      0xbf, 0 }, .brk = {                   0 } }, /* 0bf */
+    { .mk = {      0xc0, 0 }, .brk = {                   0 } }, /* 0c0 */
+    { .mk = {      0xc1, 0 }, .brk = {                   0 } }, /* 0c1 */
+    { .mk = {      0xc2, 0 }, .brk = {                   0 } }, /* 0c2 */
+    { .mk = {      0xc3, 0 }, .brk = {                   0 } }, /* 0c3 */
+    { .mk = {      0xc4, 0 }, .brk = {                   0 } }, /* 0c4 */
+    { .mk = {      0xc5, 0 }, .brk = {                   0 } }, /* 0c5 */
+    { .mk = {      0xc6, 0 }, .brk = {                   0 } }, /* 0c6 */
+    { .mk = {      0xc7, 0 }, .brk = {                   0 } }, /* 0c7 */
+    { .mk = {      0xc8, 0 }, .brk = {                   0 } }, /* 0c8 */
+    { .mk = {      0xc9, 0 }, .brk = {                   0 } }, /* 0c9 */
+    { .mk = {      0xca, 0 }, .brk = {                   0 } }, /* 0ca */
+    { .mk = {      0xcb, 0 }, .brk = {                   0 } }, /* 0cb */
+    { .mk = {      0xcc, 0 }, .brk = {                   0 } }, /* 0cc */
+    { .mk = {      0xcd, 0 }, .brk = {                   0 } }, /* 0cd */
+    { .mk = {      0xce, 0 }, .brk = {                   0 } }, /* 0ce */
+    { .mk = {      0xcf, 0 }, .brk = {                   0 } }, /* 0cf */
+    { .mk = {      0xd0, 0 }, .brk = {                   0 } }, /* 0d0 */
+    { .mk = {      0xd1, 0 }, .brk = {                   0 } }, /* 0d1 */
+    { .mk = {      0xd2, 0 }, .brk = {                   0 } }, /* 0d2 */
+    { .mk = {      0xd3, 0 }, .brk = {                   0 } }, /* 0d3 */
+    { .mk = {      0xd4, 0 }, .brk = {                   0 } }, /* 0d4 */
+    { .mk = {      0xd5, 0 }, .brk = {                   0 } }, /* 0d5 */
+    { .mk = {      0xd6, 0 }, .brk = {                   0 } }, /* 0d6 */
+    { .mk = {      0xd7, 0 }, .brk = {                   0 } }, /* 0d7 */
+    { .mk = {      0xd8, 0 }, .brk = {                   0 } }, /* 0d8 */
+    { .mk = {      0xd9, 0 }, .brk = {                   0 } }, /* 0d9 */
+    { .mk = {      0xda, 0 }, .brk = {                   0 } }, /* 0da */
+    { .mk = {      0xdb, 0 }, .brk = {                   0 } }, /* 0db */
+    { .mk = {      0xdc, 0 }, .brk = {                   0 } }, /* 0dc */
+    { .mk = {      0xdd, 0 }, .brk = {                   0 } }, /* 0dd */
+    { .mk = {      0xde, 0 }, .brk = {                   0 } }, /* 0de */
+    { .mk = {      0xdf, 0 }, .brk = {                   0 } }, /* 0df */
+    { .mk = {      0xe0, 0 }, .brk = {                   0 } }, /* 0e0 */
+    { .mk = {      0xe1, 0 }, .brk = {                   0 } }, /* 0e1 */
+    { .mk = {      0xe2, 0 }, .brk = {                   0 } }, /* 0e2 */
+    { .mk = {      0xe3, 0 }, .brk = {                   0 } }, /* 0e3 */
+    { .mk = {      0xe4, 0 }, .brk = {                   0 } }, /* 0e4 */
+    { .mk = {      0xe5, 0 }, .brk = {                   0 } }, /* 0e5 */
+    { .mk = {      0xe6, 0 }, .brk = {                   0 } }, /* 0e6 */
+    { .mk = {      0xe7, 0 }, .brk = {                   0 } }, /* 0e7 */
+    { .mk = {      0xe8, 0 }, .brk = {                   0 } }, /* 0e8 */
+    { .mk = {      0xe9, 0 }, .brk = {                   0 } }, /* 0e9 */
+    { .mk = {      0xea, 0 }, .brk = {                   0 } }, /* 0ea */
+    { .mk = {      0xeb, 0 }, .brk = {                   0 } }, /* 0eb */
+    { .mk = {      0xec, 0 }, .brk = {                   0 } }, /* 0ec */
+    { .mk = {      0xed, 0 }, .brk = {                   0 } }, /* 0ed */
+    { .mk = {      0xee, 0 }, .brk = {                   0 } }, /* 0ee */
+    { .mk = {      0xef, 0 }, .brk = {                   0 } }, /* 0ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f0 */
+    { .mk = {      0xf1, 0 }, .brk = {                   0 } }, /* 0f1 */
+    { .mk = {      0xf2, 0 }, .brk = {                   0 } }, /* 0f2 */
+    { .mk = {      0xf3, 0 }, .brk = {                   0 } }, /* 0f3 */
+    { .mk = {      0xf4, 0 }, .brk = {                   0 } }, /* 0f4 */
+    { .mk = {      0xf5, 0 }, .brk = {                   0 } }, /* 0f5 */
+    { .mk = {      0xf6, 0 }, .brk = {                   0 } }, /* 0f6 */
+    { .mk = {      0xf7, 0 }, .brk = {                   0 } }, /* 0f7 */
+    { .mk = {      0xf8, 0 }, .brk = {                   0 } }, /* 0f8 */
+    { .mk = {      0xf9, 0 }, .brk = {                   0 } }, /* 0f9 */
+    { .mk = {      0xfa, 0 }, .brk = {                   0 } }, /* 0fa */
+    { .mk = {      0xfb, 0 }, .brk = {                   0 } }, /* 0fb */
+    { .mk = {      0xfc, 0 }, .brk = {                   0 } }, /* 0fc */
+    { .mk = {      0xfd, 0 }, .brk = {                   0 } }, /* 0fd */
+    { .mk = {      0xfe, 0 }, .brk = {                   0 } }, /* 0fe */
+    { .mk = {      0xff, 0 }, .brk = {                   0 } }, /* 0ff */
+    { .mk = {0xe1, 0x1d, 0 }, .brk = { 0xe1,       0x9d, 0 } }, /* 100 */
+    { .mk = {0xe0, 0x01, 0 }, .brk = { 0xe0,       0x81, 0 } }, /* 101 */
+    { .mk = {0xe0, 0x02, 0 }, .brk = { 0xe0,       0x82, 0 } }, /* 102 */
+    { .mk = {0xe0, 0x03, 0 }, .brk = { 0xe0,       0x83, 0 } }, /* 103 */
+    { .mk = {0xe0, 0x04, 0 }, .brk = { 0xe0,       0x84, 0 } }, /* 104 */
+    { .mk = {0xe0, 0x05, 0 }, .brk = { 0xe0,       0x85, 0 } }, /* 105 */
+    { .mk = {0xe0, 0x06, 0 }, .brk = { 0xe0,       0x86, 0 } }, /* 106 */
+    { .mk = {0xe0, 0x07, 0 }, .brk = { 0xe0,       0x87, 0 } }, /* 107 */
+    { .mk = {0xe0, 0x08, 0 }, .brk = { 0xe0,       0x88, 0 } }, /* 108 */
+    { .mk = {0xe0, 0x09, 0 }, .brk = { 0xe0,       0x89, 0 } }, /* 109 */
+    { .mk = {0xe0, 0x0a, 0 }, .brk = { 0xe0,       0x8a, 0 } }, /* 10a */
+    { .mk = {0xe0, 0x0b, 0 }, .brk = { 0xe0,       0x8b, 0 } }, /* 10b */
+    { .mk = {0xe0, 0x0c, 0 }, .brk = { 0xe0,       0x8c, 0 } }, /* 10c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10d */
+    { .mk = {0xe0, 0x0e, 0 }, .brk = { 0xe0,       0x8e, 0 } }, /* 10e */
+    { .mk = {0xe0, 0x0f, 0 }, .brk = { 0xe0,       0x8f, 0 } }, /* 10f */
+    { .mk = {0xe0, 0x10, 0 }, .brk = { 0xe0,       0x90, 0 } }, /* 110 */
+    { .mk = {0xe0, 0x11, 0 }, .brk = { 0xe0,       0x91, 0 } }, /* 111 */
+    { .mk = {0xe0, 0x12, 0 }, .brk = { 0xe0,       0x92, 0 } }, /* 112 */
+    { .mk = {0xe0, 0x13, 0 }, .brk = { 0xe0,       0x93, 0 } }, /* 113 */
+    { .mk = {0xe0, 0x14, 0 }, .brk = { 0xe0,       0x94, 0 } }, /* 114 */
+    { .mk = {0xe0, 0x15, 0 }, .brk = { 0xe0,       0x95, 0 } }, /* 115 */
+    { .mk = {0xe0, 0x16, 0 }, .brk = { 0xe0,       0x96, 0 } }, /* 116 */
+    { .mk = {0xe0, 0x17, 0 }, .brk = { 0xe0,       0x97, 0 } }, /* 117 */
+    { .mk = {0xe0, 0x18, 0 }, .brk = { 0xe0,       0x98, 0 } }, /* 118 */
+    { .mk = {0xe0, 0x19, 0 }, .brk = { 0xe0,       0x99, 0 } }, /* 119 */
+    { .mk = {0xe0, 0x1a, 0 }, .brk = { 0xe0,       0x9a, 0 } }, /* 11a */
+    { .mk = {0xe0, 0x1b, 0 }, .brk = { 0xe0,       0x9b, 0 } }, /* 11b */
+    { .mk = {0xe0, 0x1c, 0 }, .brk = { 0xe0,       0x9c, 0 } }, /* 11c */
+    { .mk = {0xe0, 0x1d, 0 }, .brk = { 0xe0,       0x9d, 0 } }, /* 11d */
+    { .mk = {0xe0, 0x1e, 0 }, .brk = { 0xe0,       0x9e, 0 } }, /* 11e */
+    { .mk = {0xe0, 0x1f, 0 }, .brk = { 0xe0,       0x9f, 0 } }, /* 11f */
+    { .mk = {0xe0, 0x20, 0 }, .brk = { 0xe0,       0xa0, 0 } }, /* 120 */
+    { .mk = {0xe0, 0x21, 0 }, .brk = { 0xe0,       0xa1, 0 } }, /* 121 */
+    { .mk = {0xe0, 0x22, 0 }, .brk = { 0xe0,       0xa2, 0 } }, /* 122 */
+    { .mk = {0xe0, 0x23, 0 }, .brk = { 0xe0,       0xa3, 0 } }, /* 123 */
+    { .mk = {0xe0, 0x24, 0 }, .brk = { 0xe0,       0xa4, 0 } }, /* 124 */
+    { .mk = {0xe0, 0x25, 0 }, .brk = { 0xe0,       0xa5, 0 } }, /* 125 */
+    { .mk = {0xe0, 0x26, 0 }, .brk = { 0xe0,       0xa6, 0 } }, /* 126 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 127 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 128 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 129 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12b */
+    { .mk = {0xe0, 0x2c, 0 }, .brk = { 0xe0,       0xac, 0 } }, /* 12c */
+    { .mk = {0xe0, 0x2d, 0 }, .brk = { 0xe0,       0xad, 0 } }, /* 12d */
+    { .mk = {0xe0, 0x2e, 0 }, .brk = { 0xe0,       0xae, 0 } }, /* 12e */
+    { .mk = {0xe0, 0x2f, 0 }, .brk = { 0xe0,       0xaf, 0 } }, /* 12f */
+    { .mk = {0xe0, 0x30, 0 }, .brk = { 0xe0,       0xb0, 0 } }, /* 130 */
+    { .mk = {0xe0, 0x31, 0 }, .brk = { 0xe0,       0xb1, 0 } }, /* 131 */
+    { .mk = {0xe0, 0x32, 0 }, .brk = { 0xe0,       0xb2, 0 } }, /* 132 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 133 */
+    { .mk = {0xe0, 0x34, 0 }, .brk = { 0xe0,       0xb4, 0 } }, /* 134 */
+    { .mk = {0xe0, 0x35, 0 }, .brk = { 0xe0,       0xb5, 0 } }, /* 135 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 136 */
+    { .mk = {0xe0, 0x37, 0 }, .brk = { 0xe0,       0xb7, 0 } }, /* 137 */
+    { .mk = {0xe0, 0x38, 0 }, .brk = { 0xe0,       0xb8, 0 } }, /* 138 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 139 */
+    { .mk = {0xe0, 0x3a, 0 }, .brk = { 0xe0,       0xba, 0 } }, /* 13a */
+    { .mk = {0xe0, 0x3b, 0 }, .brk = { 0xe0,       0xbb, 0 } }, /* 13b */
+    { .mk = {0xe0, 0x3c, 0 }, .brk = { 0xe0,       0xbc, 0 } }, /* 13c */
+    { .mk = {0xe0, 0x3d, 0 }, .brk = { 0xe0,       0xbd, 0 } }, /* 13d */
+    { .mk = {0xe0, 0x3e, 0 }, .brk = { 0xe0,       0xbe, 0 } }, /* 13e */
+    { .mk = {0xe0, 0x3f, 0 }, .brk = { 0xe0,       0xbf, 0 } }, /* 13f */
+    { .mk = {0xe0, 0x40, 0 }, .brk = { 0xe0,       0xc0, 0 } }, /* 140 */
+    { .mk = {0xe0, 0x41, 0 }, .brk = { 0xe0,       0xc1, 0 } }, /* 141 */
+    { .mk = {0xe0, 0x42, 0 }, .brk = { 0xe0,       0xc2, 0 } }, /* 142 */
+    { .mk = {0xe0, 0x43, 0 }, .brk = { 0xe0,       0xc3, 0 } }, /* 143 */
+    { .mk = {0xe0, 0x44, 0 }, .brk = { 0xe0,       0xc4, 0 } }, /* 144 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 145 */
+    { .mk = {0xe0, 0x46, 0 }, .brk = { 0xe0,       0xc6, 0 } }, /* 146 */
+    { .mk = {0xe0, 0x47, 0 }, .brk = { 0xe0,       0xc7, 0 } }, /* 147 */
+    { .mk = {0xe0, 0x48, 0 }, .brk = { 0xe0,       0xc8, 0 } }, /* 148 */
+    { .mk = {0xe0, 0x49, 0 }, .brk = { 0xe0,       0xc9, 0 } }, /* 149 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14a */
+    { .mk = {0xe0, 0x4b, 0 }, .brk = { 0xe0,       0xcb, 0 } }, /* 14b */
+    { .mk = {0xe0, 0x4c, 0 }, .brk = { 0xe0,       0xcc, 0 } }, /* 14c */
+    { .mk = {0xe0, 0x4d, 0 }, .brk = { 0xe0,       0xcd, 0 } }, /* 14d */
+    { .mk = {0xe0, 0x4e, 0 }, .brk = { 0xe0,       0xce, 0 } }, /* 14e */
+    { .mk = {0xe0, 0x4f, 0 }, .brk = { 0xe0,       0xcf, 0 } }, /* 14f */
+    { .mk = {0xe0, 0x50, 0 }, .brk = { 0xe0,       0xd0, 0 } }, /* 150 */
+    { .mk = {0xe0, 0x51, 0 }, .brk = { 0xe0,       0xd1, 0 } }, /* 151 */
+    { .mk = {0xe0, 0x52, 0 }, .brk = { 0xe0,       0xd2, 0 } }, /* 152 */
+    { .mk = {0xe0, 0x53, 0 }, .brk = { 0xe0,       0xd3, 0 } }, /* 153 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 154 */
+    { .mk = {0xe0, 0x55, 0 }, .brk = { 0xe0,       0xd5, 0 } }, /* 155 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 156 */
+    { .mk = {0xe0, 0x57, 0 }, .brk = { 0xe0,       0xd7, 0 } }, /* 157 */
+    { .mk = {0xe0, 0x58, 0 }, .brk = { 0xe0,       0xd8, 0 } }, /* 158 */
+    { .mk = {0xe0, 0x59, 0 }, .brk = { 0xe0,       0xd9, 0 } }, /* 159 */
+    { .mk = {0xe0, 0x5a, 0 }, .brk = { 0xe0,       0xda, 0 } }, /* 15a */
+    { .mk = {0xe0, 0x5b, 0 }, .brk = { 0xe0,       0xdb, 0 } }, /* 15b */
+    { .mk = {0xe0, 0x5c, 0 }, .brk = { 0xe0,       0xdc, 0 } }, /* 15c */
+    { .mk = {0xe0, 0x5d, 0 }, .brk = { 0xe0,       0xdd, 0 } }, /* 15d */
+    { .mk = {0xe0, 0x5e, 0 }, .brk = { 0xe0,       0xde, 0 } }, /* 15e */
+    { .mk = {0xe0, 0x5f, 0 }, .brk = { 0xe0,       0xdf, 0 } }, /* 15f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 160 */
+    { .mk = {0xe0, 0x61, 0 }, .brk = { 0xe0,       0xe1, 0 } }, /* 161 */
+    { .mk = {0xe0, 0x62, 0 }, .brk = { 0xe0,       0xe2, 0 } }, /* 162 */
+    { .mk = {0xe0, 0x63, 0 }, .brk = { 0xe0,       0xe3, 0 } }, /* 163 */
+    { .mk = {0xe0, 0x64, 0 }, .brk = { 0xe0,       0xe4, 0 } }, /* 164 */
+    { .mk = {0xe0, 0x65, 0 }, .brk = { 0xe0,       0xe5, 0 } }, /* 165 */
+    { .mk = {0xe0, 0x66, 0 }, .brk = { 0xe0,       0xe6, 0 } }, /* 166 */
+    { .mk = {0xe0, 0x67, 0 }, .brk = { 0xe0,       0xe7, 0 } }, /* 167 */
+    { .mk = {0xe0, 0x68, 0 }, .brk = { 0xe0,       0xe8, 0 } }, /* 168 */
+    { .mk = {0xe0, 0x69, 0 }, .brk = { 0xe0,       0xe9, 0 } }, /* 169 */
+    { .mk = {0xe0, 0x6a, 0 }, .brk = { 0xe0,       0xea, 0 } }, /* 16a */
+    { .mk = {0xe0, 0x6b, 0 }, .brk = { 0xe0,       0xeb, 0 } }, /* 16b */
+    { .mk = {0xe0, 0x6c, 0 }, .brk = { 0xe0,       0xec, 0 } }, /* 16c */
+    { .mk = {0xe0, 0x6d, 0 }, .brk = { 0xe0,       0xed, 0 } }, /* 16d */
+    { .mk = {0xe0, 0x6e, 0 }, .brk = { 0xe0,       0xee, 0 } }, /* 16e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16f */
+    { .mk = {0xe0, 0x70, 0 }, .brk = { 0xe0,       0xf0, 0 } }, /* 170 */
+    { .mk = {0xe0, 0x71, 0 }, .brk = { 0xe0,       0xf1, 0 } }, /* 171 */
+    { .mk = {0xe0, 0x72, 0 }, .brk = { 0xe0,       0xf2, 0 } }, /* 172 */
+    { .mk = {0xe0, 0x73, 0 }, .brk = { 0xe0,       0xf3, 0 } }, /* 173 */
+    { .mk = {0xe0, 0x74, 0 }, .brk = { 0xe0,       0xf4, 0 } }, /* 174 */
+    { .mk = {0xe0, 0x75, 0 }, .brk = { 0xe0,       0xf5, 0 } }, /* 175 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 176 */
+    { .mk = {0xe0, 0x77, 0 }, .brk = { 0xe0,       0xf7, 0 } }, /* 177 */
+    { .mk = {0xe0, 0x78, 0 }, .brk = { 0xe0,       0xf8, 0 } }, /* 178 */
+    { .mk = {0xe0, 0x79, 0 }, .brk = { 0xe0,       0xf9, 0 } }, /* 179 */
+    { .mk = {0xe0, 0x7a, 0 }, .brk = { 0xe0,       0xfa, 0 } }, /* 17a */
+    { .mk = {0xe0, 0x7b, 0 }, .brk = { 0xe0,       0xfb, 0 } }, /* 17b */
+    { .mk = {0xe0, 0x7c, 0 }, .brk = { 0xe0,       0xfc, 0 } }, /* 17c */
+    { .mk = {0xe0, 0x7d, 0 }, .brk = { 0xe0,       0xfd, 0 } }, /* 17d */
+    { .mk = {0xe0, 0x7e, 0 }, .brk = { 0xe0,       0xfe, 0 } }, /* 17e */
+    { .mk = {0xe0, 0x7f, 0 }, .brk = { 0xe0,       0xff, 0 } }, /* 17f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 180 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 181 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 182 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 183 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 184 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 185 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 186 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 187 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 188 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 189 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 190 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 191 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 192 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 193 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 194 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 195 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 196 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 197 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 198 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 199 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e0 */
+    { .mk = {0xe0, 0xe1, 0 }, .brk = {                   0 } }, /* 1e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ed */
+    { .mk = {0xe0, 0xee, 0 }, .brk = {                   0 } }, /* 1ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f0 */
+    { .mk = {0xe0, 0xf1, 0 }, .brk = {                   0 } }, /* 1f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fd */
+    { .mk = {0xe0, 0xfe, 0 }, .brk = {                   0 } }, /* 1fe */
+    { .mk = {0xe0, 0xff, 0 }, .brk = {                   0 } }  /* 1ff */
   // clang-format on
 };
 
 static const scancode scancode_set2[512] = {
   // clang-format off
-    { {          0},{               0} }, { {     0x76,0},{     0xF0,0x76,0} }, { {     0x16,0},{     0xF0,0x16,0} }, { {     0x1E,0},{     0xF0,0x1E,0} },        /*000*/
-    { {     0x26,0},{     0xF0,0x26,0} }, { {     0x25,0},{     0xF0,0x25,0} }, { {     0x2E,0},{     0xF0,0x2E,0} }, { {     0x36,0},{     0xF0,0x36,0} },        /*004*/
-    { {     0x3D,0},{     0xF0,0x3D,0} }, { {     0x3E,0},{     0xF0,0x3E,0} }, { {     0x46,0},{     0xF0,0x46,0} }, { {     0x45,0},{     0xF0,0x45,0} },        /*008*/
-    { {     0x4E,0},{     0xF0,0x4E,0} }, { {     0x55,0},{     0xF0,0x55,0} }, { {     0x66,0},{     0xF0,0x66,0} }, { {     0x0D,0},{     0xF0,0x0D,0} },        /*00c*/
-    { {     0x15,0},{     0xF0,0x15,0} }, { {     0x1D,0},{     0xF0,0x1D,0} }, { {     0x24,0},{     0xF0,0x24,0} }, { {     0x2D,0},{     0xF0,0x2D,0} },        /*010*/
-    { {     0x2C,0},{     0xF0,0x2C,0} }, { {     0x35,0},{     0xF0,0x35,0} }, { {     0x3C,0},{     0xF0,0x3C,0} }, { {     0x43,0},{     0xF0,0x43,0} },        /*014*/
-    { {     0x44,0},{     0xF0,0x44,0} }, { {     0x4D,0},{     0xF0,0x4D,0} }, { {     0x54,0},{     0xF0,0x54,0} }, { {     0x5B,0},{     0xF0,0x5B,0} },        /*018*/
-    { {     0x5A,0},{     0xF0,0x5A,0} }, { {     0x14,0},{     0xF0,0x14,0} }, { {     0x1C,0},{     0xF0,0x1C,0} }, { {     0x1B,0},{     0xF0,0x1B,0} },        /*01c*/
-    { {     0x23,0},{     0xF0,0x23,0} }, { {     0x2B,0},{     0xF0,0x2B,0} }, { {     0x34,0},{     0xF0,0x34,0} }, { {     0x33,0},{     0xF0,0x33,0} },        /*020*/
-    { {     0x3B,0},{     0xF0,0x3B,0} }, { {     0x42,0},{     0xF0,0x42,0} }, { {     0x4B,0},{     0xF0,0x4B,0} }, { {     0x4C,0},{     0xF0,0x4C,0} },        /*024*/
-    { {     0x52,0},{     0xF0,0x52,0} }, { {     0x0E,0},{     0xF0,0x0E,0} }, { {     0x12,0},{     0xF0,0x12,0} }, { {     0x5D,0},{     0xF0,0x5D,0} },        /*028*/
-    { {     0x1A,0},{     0xF0,0x1A,0} }, { {     0x22,0},{     0xF0,0x22,0} }, { {     0x21,0},{     0xF0,0x21,0} }, { {     0x2A,0},{     0xF0,0x2A,0} },        /*02c*/
-    { {     0x32,0},{     0xF0,0x32,0} }, { {     0x31,0},{     0xF0,0x31,0} }, { {     0x3A,0},{     0xF0,0x3A,0} }, { {     0x41,0},{     0xF0,0x41,0} },        /*030*/
-    { {     0x49,0},{     0xF0,0x49,0} }, { {     0x4A,0},{     0xF0,0x4A,0} }, { {     0x59,0},{     0xF0,0x59,0} }, { {     0x7C,0},{     0xF0,0x7C,0} },        /*034*/
-    { {     0x11,0},{     0xF0,0x11,0} }, { {     0x29,0},{     0xF0,0x29,0} }, { {     0x58,0},{     0xF0,0x58,0} }, { {     0x05,0},{     0xF0,0x05,0} },        /*038*/
-    { {     0x06,0},{     0xF0,0x06,0} }, { {     0x04,0},{     0xF0,0x04,0} }, { {     0x0C,0},{     0xF0,0x0C,0} }, { {     0x03,0},{     0xF0,0x03,0} },        /*03c*/
-    { {     0x0B,0},{     0xF0,0x0B,0} }, { {     0x83,0},{     0xF0,0x83,0} }, { {     0x0A,0},{     0xF0,0x0A,0} }, { {     0x01,0},{     0xF0,0x01,0} },        /*040*/
-    { {     0x09,0},{     0xF0,0x09,0} }, { {     0x77,0},{     0xF0,0x77,0} }, { {     0x7E,0},{     0xF0,0x7E,0} }, { {     0x6C,0},{     0xF0,0x6C,0} },        /*044*/
-    { {     0x75,0},{     0xF0,0x75,0} }, { {     0x7D,0},{     0xF0,0x7D,0} }, { {     0x7B,0},{     0xF0,0x7B,0} }, { {     0x6B,0},{     0xF0,0x6B,0} },        /*048*/
-    { {     0x73,0},{     0xF0,0x73,0} }, { {     0x74,0},{     0xF0,0x74,0} }, { {     0x79,0},{     0xF0,0x79,0} }, { {     0x69,0},{     0xF0,0x69,0} },        /*04c*/
-    { {     0x72,0},{     0xF0,0x72,0} }, { {     0x7A,0},{     0xF0,0x7A,0} }, { {     0x70,0},{     0xF0,0x70,0} }, { {     0x71,0},{     0xF0,0x71,0} },        /*050*/
-    { {     0x84,0},{     0xF0,0x84,0} }, { {     0x60,0},{     0xF0,0x60,0} }, { {     0x61,0},{     0xF0,0x61,0} }, { {     0x78,0},{     0xF0,0x78,0} },        /*054*/
-    { {     0x07,0},{     0xF0,0x07,0} }, { {     0x0F,0},{     0xF0,0x0F,0} }, { {     0x17,0},{     0xF0,0x17,0} }, { {     0x1F,0},{     0xF0,0x1F,0} },        /*058*/
-    { {     0x27,0},{     0xF0,0x27,0} }, { {     0x2F,0},{     0xF0,0x2F,0} }, { {     0x37,0},{     0xF0,0x37,0} }, { {     0x3F,0},{     0xF0,0x3F,0} },        /*05c*/
-    { {     0x47,0},{     0xF0,0x47,0} }, { {     0x4F,0},{     0xF0,0x4F,0} }, { {     0x56,0},{     0xF0,0x56,0} }, { {     0x5E,0},{     0xF0,0x5E,0} },        /*060*/
-    { {     0x08,0},{     0xF0,0x08,0} }, { {     0x10,0},{     0xF0,0x10,0} }, { {     0x18,0},{     0xF0,0x18,0} }, { {     0x20,0},{     0xF0,0x20,0} },        /*064*/
-    { {     0x28,0},{     0xF0,0x28,0} }, { {     0x30,0},{     0xF0,0x30,0} }, { {     0x38,0},{     0xF0,0x38,0} }, { {     0x40,0},{     0xF0,0x40,0} },        /*068*/
-    { {     0x48,0},{     0xF0,0x48,0} }, { {     0x50,0},{     0xF0,0x50,0} }, { {     0x57,0},{     0xF0,0x57,0} }, { {     0x6F,0},{     0xF0,0x6F,0} },        /*06c*/
-    { {     0x13,0},{     0xF0,0x13,0} }, { {     0x19,0},{     0xF0,0x19,0} }, { {     0x39,0},{     0xF0,0x39,0} }, { {     0x51,0},{     0xF0,0x51,0} },        /*070*/
-    { {     0x53,0},{     0xF0,0x53,0} }, { {     0x5C,0},{     0xF0,0x5C,0} }, { {     0x5F,0},{     0xF0,0x5F,0} }, { {     0x62,0},{     0xF0,0x62,0} },        /*074*/
-    { {     0x63,0},{     0xF0,0x63,0} }, { {     0x64,0},{     0xF0,0x64,0} }, { {     0x65,0},{     0xF0,0x65,0} }, { {     0x67,0},{     0xF0,0x67,0} },        /*078*/
-    { {     0x68,0},{     0xF0,0x68,0} }, { {     0x6A,0},{     0xF0,0x6A,0} }, { {     0x6D,0},{     0xF0,0x6D,0} }, { {     0x6E,0},{     0xF0,0x6E,0} },        /*07c*/
-
-    { {     0x80,0},{     0xf0,0x80,0} }, { {     0x81,0},{     0xf0,0x81,0} }, { {     0x82,0},{     0xf0,0x82,0} }, { {          0},{               0} },        /*080*/
-    { {          0},{               0} }, { {     0x85,0},{     0xf0,0x54,0} }, { {     0x86,0},{     0xf0,0x86,0} }, { {     0x87,0},{     0xf0,0x87,0} },        /*084*/
-    { {     0x88,0},{     0xf0,0x88,0} }, { {     0x89,0},{     0xf0,0x89,0} }, { {     0x8a,0},{     0xf0,0x8a,0} }, { {     0x8b,0},{     0xf0,0x8b,0} },        /*088*/
-    { {     0x8c,0},{     0xf0,0x8c,0} }, { {     0x8d,0},{     0xf0,0x8d,0} }, { {     0x8e,0},{     0xf0,0x8e,0} }, { {     0x8f,0},{     0xf0,0x8f,0} },        /*08c*/
-    { {     0x90,0},{     0xf0,0x90,0} }, { {     0x91,0},{     0xf0,0x91,0} }, { {     0x92,0},{     0xf0,0x92,0} }, { {     0x93,0},{     0xf0,0x93,0} },        /*090*/
-    { {     0x94,0},{     0xf0,0x94,0} }, { {     0x95,0},{     0xf0,0x95,0} }, { {     0x96,0},{     0xf0,0x96,0} }, { {     0x97,0},{     0xf0,0x97,0} },        /*094*/
-    { {     0x98,0},{     0xf0,0x98,0} }, { {     0x99,0},{     0xf0,0x99,0} }, { {     0x9a,0},{     0xf0,0x9a,0} }, { {     0x9b,0},{     0xf0,0x9b,0} },        /*098*/
-    { {     0x9c,0},{     0xf0,0x9c,0} }, { {     0x9d,0},{     0xf0,0x9d,0} }, { {     0x9e,0},{     0xf0,0x9e,0} }, { {     0x9f,0},{     0xf0,0x9f,0} },        /*09c*/
-    { {     0xa0,0},{     0xf0,0xa0,0} }, { {     0xa1,0},{     0xf0,0xa1,0} }, { {     0xa2,0},{     0xf0,0xa2,0} }, { {     0xa3,0},{     0xf0,0xa3,0} },        /*0a0*/
-    { {     0xa4,0},{     0xf0,0xa4,0} }, { {     0xa5,0},{     0xf0,0xa5,0} }, { {     0xa6,0},{     0xf0,0xa6,0} }, { {     0xa7,0},{     0xf0,0xa7,0} },        /*0a4*/
-    { {     0xa8,0},{     0xf0,0xa8,0} }, { {     0xa9,0},{     0xf0,0xa9,0} }, { {     0xaa,0},{     0xf0,0xaa,0} }, { {     0xab,0},{     0xf0,0xab,0} },        /*0a8*/
-    { {     0xac,0},{     0xf0,0xac,0} }, { {     0xad,0},{     0xf0,0xad,0} }, { {     0xae,0},{     0xf0,0xae,0} }, { {     0xaf,0},{     0xf0,0xaf,0} },        /*0ac*/
-    { {     0xb0,0},{     0xf0,0xb0,0} }, { {     0xb1,0},{     0xf0,0xb1,0} }, { {     0xb2,0},{     0xf0,0xb2,0} }, { {     0xb3,0},{     0xf0,0xb3,0} },        /*0b0*/
-    { {     0xb4,0},{     0xf0,0xb4,0} }, { {     0xb5,0},{     0xf0,0xb5,0} }, { {     0xb6,0},{     0xf0,0xb6,0} }, { {     0xb7,0},{     0xf0,0xb7,0} },        /*0b4*/
-    { {     0xb8,0},{     0xf0,0xb8,0} }, { {     0xb9,0},{     0xf0,0xb9,0} }, { {     0xba,0},{     0xf0,0xba,0} }, { {     0xbb,0},{     0xf0,0xbb,0} },        /*0b8*/
-    { {     0xbc,0},{     0xf0,0xbc,0} }, { {     0xbd,0},{     0xf0,0xbd,0} }, { {     0xbe,0},{     0xf0,0xbe,0} }, { {     0xbf,0},{     0xf0,0xbf,0} },        /*0bc*/
-    { {     0xc0,0},{     0xf0,0xc0,0} }, { {     0xc1,0},{     0xf0,0xc1,0} }, { {     0xc2,0},{     0xf0,0xc2,0} }, { {     0xc3,0},{     0xf0,0xc3,0} },        /*0c0*/
-    { {     0xc4,0},{     0xf0,0xc4,0} }, { {     0xc5,0},{     0xf0,0xc5,0} }, { {     0xc6,0},{     0xf0,0xc6,0} }, { {     0xc7,0},{     0xf0,0xc7,0} },        /*0c4*/
-    { {     0xc8,0},{     0xf0,0xc8,0} }, { {     0xc9,0},{     0xf0,0xc9,0} }, { {     0xca,0},{     0xf0,0xca,0} }, { {     0xcb,0},{     0xf0,0xcb,0} },        /*0c8*/
-    { {     0xcc,0},{     0xf0,0xcc,0} }, { {     0xcd,0},{     0xf0,0xcd,0} }, { {     0xce,0},{     0xf0,0xce,0} }, { {     0xcf,0},{     0xf0,0xcf,0} },        /*0cc*/
-    { {     0xd0,0},{     0xf0,0xd0,0} }, { {     0xd1,0},{     0xf0,0xd0,0} }, { {     0xd2,0},{     0xf0,0xd2,0} }, { {     0xd3,0},{     0xf0,0xd3,0} },        /*0d0*/
-    { {     0xd4,0},{     0xf0,0xd4,0} }, { {     0xd5,0},{     0xf0,0xd5,0} }, { {     0xd6,0},{     0xf0,0xd6,0} }, { {     0xd7,0},{     0xf0,0xd7,0} },        /*0d4*/
-    { {     0xd8,0},{     0xf0,0xd8,0} }, { {     0xd9,0},{     0xf0,0xd9,0} }, { {     0xda,0},{     0xf0,0xda,0} }, { {     0xdb,0},{     0xf0,0xdb,0} },        /*0d8*/
-    { {     0xdc,0},{     0xf0,0xdc,0} }, { {     0xdd,0},{     0xf0,0xdd,0} }, { {     0xde,0},{     0xf0,0xde,0} }, { {     0xdf,0},{     0xf0,0xdf,0} },        /*0dc*/
-    { {     0xe0,0},{     0xf0,0xe0,0} }, { {     0xe1,0},{     0xf0,0xe1,0} }, { {     0xe2,0},{     0xf0,0xe2,0} }, { {     0xe3,0},{     0xf0,0xe3,0} },        /*0e0*/
-    { {     0xe4,0},{     0xf0,0xe4,0} }, { {     0xe5,0},{     0xf0,0xe5,0} }, { {     0xe6,0},{     0xf0,0xe6,0} }, { {     0xe7,0},{     0xf0,0xe7,0} },        /*0e4*/
-    { {     0xe8,0},{     0xf0,0xe8,0} }, { {     0xe9,0},{     0xf0,0xe9,0} }, { {     0xea,0},{     0xf0,0xea,0} }, { {     0xeb,0},{     0xf0,0xeb,0} },        /*0e8*/
-    { {     0xec,0},{     0xf0,0xec,0} }, { {     0xed,0},{     0xf0,0xed,0} }, { {     0xee,0},{     0xf0,0xee,0} }, { {     0xef,0},{     0xf0,0xef,0} },        /*0ec*/
-    { {          0},{               0} }, { {     0xf1,0},{     0xf0,0xf1,0} }, { {     0xf2,0},{     0xf0,0xf2,0} }, { {     0xf3,0},{     0xf0,0xf3,0} },        /*0f0*/
-    { {     0xf4,0},{     0xf0,0xf4,0} }, { {     0xf5,0},{     0xf0,0xf5,0} }, { {     0xf6,0},{     0xf0,0xf6,0} }, { {     0xf7,0},{     0xf0,0xf7,0} },        /*0f4*/
-    { {     0xf8,0},{     0xf0,0xf8,0} }, { {     0xf9,0},{     0xf0,0xf9,0} }, { {     0xfa,0},{     0xf0,0xfa,0} }, { {     0xfb,0},{     0xf0,0xfb,0} },        /*0f8*/
-    { {     0xfc,0},{     0xf0,0xfc,0} }, { {     0xfd,0},{     0xf0,0xfd,0} }, { {     0xfe,0},{     0xf0,0xfe,0} }, { {     0xff,0},{     0xf0,0xff,0} },        /*0fc*/
-
-    { {0xe1,0x14,0},{0xe1,0xf0,0x14,0} }, { {0xe0,0x76,0},{0xe0,0xF0,0x76,0} }, { {0xe0,0x16,0},{0xe0,0xF0,0x16,0} }, { {0xe0,0x1E,0},{0xe0,0xF0,0x1E,0} },        /*100*/
-    { {0xe0,0x26,0},{0xe0,0xF0,0x26,0} }, { {0xe0,0x25,0},{0xe0,0xF0,0x25,0} }, { {0xe0,0x2E,0},{0xe0,0xF0,0x2E,0} }, { {0xe0,0x36,0},{0xe0,0xF0,0x36,0} },        /*104*/
-    { {0xe0,0x3D,0},{0xe0,0xF0,0x3D,0} }, { {0xe0,0x3E,0},{0xe0,0xF0,0x3E,0} }, { {0xe0,0x46,0},{0xe0,0xF0,0x46,0} }, { {0xe0,0x45,0},{0xe0,0xF0,0x45,0} },        /*108*/
-    { {0xe0,0x4E,0},{0xe0,0xF0,0x4E,0} }, { {          0},{               0} }, { {0xe0,0x66,0},{0xe0,0xF0,0x66,0} }, { {0xe0,0x0D,0},{0xe0,0xF0,0x0D,0} },        /*10c*/
-    { {0xe0,0x15,0},{0xe0,0xF0,0x15,0} }, { {0xe0,0x1D,0},{0xe0,0xF0,0x1D,0} }, { {0xe0,0x24,0},{0xe0,0xF0,0x24,0} }, { {0xe0,0x2D,0},{0xe0,0xF0,0x2D,0} },        /*110*/
-    { {0xe0,0x2C,0},{0xe0,0xF0,0x2C,0} }, { {0xe0,0x35,0},{0xe0,0xF0,0x35,0} }, { {0xe0,0x3C,0},{0xe0,0xF0,0x3C,0} }, { {0xe0,0x43,0},{0xe0,0xF0,0x43,0} },        /*114*/
-    { {0xe0,0x44,0},{0xe0,0xF0,0x44,0} }, { {0xe0,0x4D,0},{0xe0,0xF0,0x4D,0} }, { {0xe0,0x54,0},{0xe0,0xF0,0x54,0} }, { {0xe0,0x5B,0},{0xe0,0xF0,0x5B,0} },        /*118*/
-    { {0xe0,0x5A,0},{0xe0,0xF0,0x5A,0} }, { {0xe0,0x14,0},{0xe0,0xF0,0x14,0} }, { {0xe0,0x1C,0},{0xe0,0xF0,0x1C,0} }, { {0xe0,0x1B,0},{0xe0,0xF0,0x1B,0} },        /*11c*/
-    { {0xe0,0x23,0},{0xe0,0xF0,0x23,0} }, { {0xe0,0x2B,0},{0xe0,0xF0,0x2B,0} }, { {0xe0,0x34,0},{0xe0,0xF0,0x34,0} }, { {0xe0,0x33,0},{0xe0,0xF0,0x33,0} },        /*120*/
-    { {0xe0,0x3B,0},{0xe0,0xF0,0x3B,0} }, { {0xe0,0x42,0},{0xe0,0xF0,0x42,0} }, { {0xe0,0x4B,0},{0xe0,0xF0,0x4B,0} }, { {          0},{               0} },        /*124*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*128*/
-    { {0xe0,0x1A,0},{0xe0,0xF0,0x1A,0} }, { {0xe0,0x22,0},{0xe0,0xF0,0x22,0} }, { {0xe0,0x21,0},{0xe0,0xF0,0x21,0} }, { {0xe0,0x2A,0},{0xe0,0xF0,0x2A,0} },        /*12c*/
-    { {0xe0,0x32,0},{0xe0,0xF0,0x32,0} }, { {0xe0,0x31,0},{0xe0,0xF0,0x31,0} }, { {0xe0,0x3A,0},{0xe0,0xF0,0x3A,0} }, { {          0},{               0} },        /*130*/
-    { {0xe0,0x49,0},{0xe0,0xF0,0x49,0} }, { {0xe0,0x4A,0},{0xe0,0xF0,0x4A,0} }, { {          0},{               0} }, { {0xe0,0x7C,0},{0xe0,0xF0,0x7C,0} },        /*134*/
-    { {0xe0,0x11,0},{0xe0,0xF0,0x11,0} }, { {          0},{               0} }, { {0xe0,0x58,0},{0xe0,0xF0,0x58,0} }, { {0xe0,0x05,0},{0xe0,0xF0,0x05,0} },        /*138*/
-    { {0xe0,0x06,0},{0xe0,0xF0,0x06,0} }, { {0xe0,0x04,0},{0xe0,0xF0,0x04,0} }, { {0xe0,0x0C,0},{0xe0,0xF0,0x0C,0} }, { {0xe0,0x03,0},{0xe0,0xF0,0x03,0} },        /*13c*/
-    { {0xe0,0x0B,0},{0xe0,0xF0,0x0B,0} }, { {0xe0,0x02,0},{0xe0,0xF0,0x02,0} }, { {0xe0,0x0A,0},{0xe0,0xF0,0x0A,0} }, { {0xe0,0x01,0},{0xe0,0xF0,0x01,0} },        /*140*/
-    { {0xe0,0x09,0},{0xe0,0xF0,0x09,0} }, { {          0},{               0} }, { {0xe0,0x7E,0},{0xe0,0xF0,0x7E,0} }, { {0xe0,0x6C,0},{0xe0,0xF0,0x6C,0} },        /*144*/
-    { {0xe0,0x75,0},{0xe0,0xF0,0x75,0} }, { {0xe0,0x7D,0},{0xe0,0xF0,0x7D,0} }, { {          0},{               0} }, { {0xe0,0x6B,0},{0xe0,0xF0,0x6B,0} },        /*148*/
-    { {0xe0,0x73,0},{0xe0,0xF0,0x73,0} }, { {0xe0,0x74,0},{0xe0,0xF0,0x74,0} }, { {0xe0,0x79,0},{0xe0,0xF0,0x79,0} }, { {0xe0,0x69,0},{0xe0,0xF0,0x69,0} },        /*14c*/
-    { {0xe0,0x72,0},{0xe0,0xF0,0x72,0} }, { {0xe0,0x7A,0},{0xe0,0xF0,0x7A,0} }, { {0xe0,0x70,0},{0xe0,0xF0,0x70,0} }, { {0xe0,0x71,0},{0xe0,0xF0,0x71,0} },        /*150*/
-    { {          0},{               0} }, { {0xe0,0x60,0},{0xe0,0xF0,0x60,0} }, { {          0},{               0} }, { {0xe0,0x78,0},{0xe0,0xF0,0x78,0} },        /*154*/
-    { {0xe0,0x07,0},{0xe0,0xF0,0x07,0} }, { {0xe0,0x0F,0},{0xe0,0xF0,0x0F,0} }, { {0xe0,0x17,0},{0xe0,0xF0,0x17,0} }, { {0xe0,0x1F,0},{0xe0,0xF0,0x1F,0} },        /*158*/
-    { {0xe0,0x27,0},{0xe0,0xF0,0x27,0} }, { {0xe0,0x2F,0},{0xe0,0xF0,0x2F,0} }, { {0xe0,0x37,0},{0xe0,0xF0,0x37,0} }, { {0xe0,0x3F,0},{0xe0,0xF0,0x3F,0} },        /*15c*/
-    { {          0},{               0} }, { {0xe0,0x4F,0},{0xe0,0xF0,0x4F,0} }, { {0xe0,0x56,0},{0xe0,0xF0,0x56,0} }, { {0xe0,0x5E,0},{0xe0,0xF0,0x5E,0} },        /*160*/
-    { {0xe0,0x08,0},{0xe0,0xF0,0x08,0} }, { {0xe0,0x10,0},{0xe0,0xF0,0x10,0} }, { {0xe0,0x18,0},{0xe0,0xF0,0x18,0} }, { {0xe0,0x20,0},{0xe0,0xF0,0x20,0} },        /*164*/
-    { {0xe0,0x28,0},{0xe0,0xF0,0x28,0} }, { {0xe0,0x30,0},{0xe0,0xF0,0x30,0} }, { {0xe0,0x38,0},{0xe0,0xF0,0x38,0} }, { {0xe0,0x40,0},{0xe0,0xF0,0x40,0} },        /*168*/
-    { {0xe0,0x48,0},{0xe0,0xF0,0x48,0} }, { {0xe0,0x50,0},{0xe0,0xF0,0x50,0} }, { {0xe0,0x57,0},{0xe0,0xF0,0x57,0} }, { {          0},{               0} },        /*16c*/
-    { {0xe0,0x13,0},{0xe0,0xF0,0x13,0} }, { {0xe0,0x19,0},{0xe0,0xF0,0x19,0} }, { {0xe0,0x39,0},{0xe0,0xF0,0x39,0} }, { {0xe0,0x51,0},{0xe0,0xF0,0x51,0} },        /*170*/
-    { {0xe0,0x53,0},{0xe0,0xF0,0x53,0} }, { {0xe0,0x5C,0},{0xe0,0xF0,0x5C,0} }, { {          0},{               0} }, { {0xe0,0x62,0},{0xe0,0xF0,0x62,0} },        /*174*/
-    { {0xe0,0x63,0},{0xe0,0xF0,0x63,0} }, { {0xe0,0x64,0},{0xe0,0xF0,0x64,0} }, { {0xe0,0x65,0},{0xe0,0xF0,0x65,0} }, { {0xe0,0x67,0},{0xe0,0xF0,0x67,0} },        /*178*/
-    { {0xe0,0x68,0},{0xe0,0xF0,0x68,0} }, { {0xe0,0x6A,0},{0xe0,0xF0,0x6A,0} }, { {0xe0,0x6D,0},{0xe0,0xF0,0x6D,0} }, { {0xe0,0x6E,0},{0xe0,0xF0,0x6E,0} },        /*17c*/
-
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*180*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*184*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*188*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*18c*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*190*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*194*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*198*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*19c*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1a0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1a4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1a8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1ac*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1c0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1c4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1c8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1cc*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1d0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1d4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1d8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1dc*/
-    { {          0},{               0} }, { {0xe0,0xe1,0},{0xe0,0xF0,0xE1,0} }, { {          0},{               0} }, { {          0},{               0} },        /*1e0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1e4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1e8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {0xe0,0xee,0},{0xe0,0xF0,0xEE,0} }, { {          0},{               0} },        /*1ec*/
-    { {          0},{               0} }, { {0xe0,0xf1,0},{0xe0,0xF0,0xF1,0} }, { {          0},{               0} }, { {          0},{               0} },        /*1f0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1f4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1f8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {0xe0,0xfe,0},{0xe0,0xF0,0xFE,0} }, { {0xe0,0xff,0},{0xe0,0xF0,0xFF,0} }         /*1fc*/
+    { .mk = {            0 }, .brk = {                   0 } }, /* 000 */
+    { .mk = {      0x76, 0 }, .brk = {       0xF0, 0x76, 0 } }, /* 001 */
+    { .mk = {      0x16, 0 }, .brk = {       0xF0, 0x16, 0 } }, /* 002 */
+    { .mk = {      0x1E, 0 }, .brk = {       0xF0, 0x1E, 0 } }, /* 003 */
+    { .mk = {      0x26, 0 }, .brk = {       0xF0, 0x26, 0 } }, /* 004 */
+    { .mk = {      0x25, 0 }, .brk = {       0xF0, 0x25, 0 } }, /* 005 */
+    { .mk = {      0x2E, 0 }, .brk = {       0xF0, 0x2E, 0 } }, /* 006 */
+    { .mk = {      0x36, 0 }, .brk = {       0xF0, 0x36, 0 } }, /* 007 */
+    { .mk = {      0x3D, 0 }, .brk = {       0xF0, 0x3D, 0 } }, /* 008 */
+    { .mk = {      0x3E, 0 }, .brk = {       0xF0, 0x3E, 0 } }, /* 009 */
+    { .mk = {      0x46, 0 }, .brk = {       0xF0, 0x46, 0 } }, /* 00a */
+    { .mk = {      0x45, 0 }, .brk = {       0xF0, 0x45, 0 } }, /* 00b */
+    { .mk = {      0x4E, 0 }, .brk = {       0xF0, 0x4E, 0 } }, /* 00c */
+    { .mk = {      0x55, 0 }, .brk = {       0xF0, 0x55, 0 } }, /* 00d */
+    { .mk = {      0x66, 0 }, .brk = {       0xF0, 0x66, 0 } }, /* 00e */
+    { .mk = {      0x0D, 0 }, .brk = {       0xF0, 0x0D, 0 } }, /* 00f */
+    { .mk = {      0x15, 0 }, .brk = {       0xF0, 0x15, 0 } }, /* 010 */
+    { .mk = {      0x1D, 0 }, .brk = {       0xF0, 0x1D, 0 } }, /* 011 */
+    { .mk = {      0x24, 0 }, .brk = {       0xF0, 0x24, 0 } }, /* 012 */
+    { .mk = {      0x2D, 0 }, .brk = {       0xF0, 0x2D, 0 } }, /* 013 */
+    { .mk = {      0x2C, 0 }, .brk = {       0xF0, 0x2C, 0 } }, /* 014 */
+    { .mk = {      0x35, 0 }, .brk = {       0xF0, 0x35, 0 } }, /* 015 */
+    { .mk = {      0x3C, 0 }, .brk = {       0xF0, 0x3C, 0 } }, /* 016 */
+    { .mk = {      0x43, 0 }, .brk = {       0xF0, 0x43, 0 } }, /* 017 */
+    { .mk = {      0x44, 0 }, .brk = {       0xF0, 0x44, 0 } }, /* 018 */
+    { .mk = {      0x4D, 0 }, .brk = {       0xF0, 0x4D, 0 } }, /* 019 */
+    { .mk = {      0x54, 0 }, .brk = {       0xF0, 0x54, 0 } }, /* 01a */
+    { .mk = {      0x5B, 0 }, .brk = {       0xF0, 0x5B, 0 } }, /* 01b */
+    { .mk = {      0x5A, 0 }, .brk = {       0xF0, 0x5A, 0 } }, /* 01c */
+    { .mk = {      0x14, 0 }, .brk = {       0xF0, 0x14, 0 } }, /* 01d */
+    { .mk = {      0x1C, 0 }, .brk = {       0xF0, 0x1C, 0 } }, /* 01e */
+    { .mk = {      0x1B, 0 }, .brk = {       0xF0, 0x1B, 0 } }, /* 01f */
+    { .mk = {      0x23, 0 }, .brk = {       0xF0, 0x23, 0 } }, /* 020 */
+    { .mk = {      0x2B, 0 }, .brk = {       0xF0, 0x2B, 0 } }, /* 021 */
+    { .mk = {      0x34, 0 }, .brk = {       0xF0, 0x34, 0 } }, /* 022 */
+    { .mk = {      0x33, 0 }, .brk = {       0xF0, 0x33, 0 } }, /* 023 */
+    { .mk = {      0x3B, 0 }, .brk = {       0xF0, 0x3B, 0 } }, /* 024 */
+    { .mk = {      0x42, 0 }, .brk = {       0xF0, 0x42, 0 } }, /* 025 */
+    { .mk = {      0x4B, 0 }, .brk = {       0xF0, 0x4B, 0 } }, /* 026 */
+    { .mk = {      0x4C, 0 }, .brk = {       0xF0, 0x4C, 0 } }, /* 027 */
+    { .mk = {      0x52, 0 }, .brk = {       0xF0, 0x52, 0 } }, /* 028 */
+    { .mk = {      0x0E, 0 }, .brk = {       0xF0, 0x0E, 0 } }, /* 029 */
+    { .mk = {      0x12, 0 }, .brk = {       0xF0, 0x12, 0 } }, /* 02a */
+    { .mk = {      0x5D, 0 }, .brk = {       0xF0, 0x5D, 0 } }, /* 02b */
+    { .mk = {      0x1A, 0 }, .brk = {       0xF0, 0x1A, 0 } }, /* 02c */
+    { .mk = {      0x22, 0 }, .brk = {       0xF0, 0x22, 0 } }, /* 02d */
+    { .mk = {      0x21, 0 }, .brk = {       0xF0, 0x21, 0 } }, /* 02e */
+    { .mk = {      0x2A, 0 }, .brk = {       0xF0, 0x2A, 0 } }, /* 02f */
+    { .mk = {      0x32, 0 }, .brk = {       0xF0, 0x32, 0 } }, /* 030 */
+    { .mk = {      0x31, 0 }, .brk = {       0xF0, 0x31, 0 } }, /* 031 */
+    { .mk = {      0x3A, 0 }, .brk = {       0xF0, 0x3A, 0 } }, /* 032 */
+    { .mk = {      0x41, 0 }, .brk = {       0xF0, 0x41, 0 } }, /* 033 */
+    { .mk = {      0x49, 0 }, .brk = {       0xF0, 0x49, 0 } }, /* 034 */
+    { .mk = {      0x4A, 0 }, .brk = {       0xF0, 0x4A, 0 } }, /* 035 */
+    { .mk = {      0x59, 0 }, .brk = {       0xF0, 0x59, 0 } }, /* 036 */
+    { .mk = {      0x7C, 0 }, .brk = {       0xF0, 0x7C, 0 } }, /* 037 */
+    { .mk = {      0x11, 0 }, .brk = {       0xF0, 0x11, 0 } }, /* 038 */
+    { .mk = {      0x29, 0 }, .brk = {       0xF0, 0x29, 0 } }, /* 039 */
+    { .mk = {      0x58, 0 }, .brk = {       0xF0, 0x58, 0 } }, /* 03a */
+    { .mk = {      0x05, 0 }, .brk = {       0xF0, 0x05, 0 } }, /* 03b */
+    { .mk = {      0x06, 0 }, .brk = {       0xF0, 0x06, 0 } }, /* 03c */
+    { .mk = {      0x04, 0 }, .brk = {       0xF0, 0x04, 0 } }, /* 03d */
+    { .mk = {      0x0C, 0 }, .brk = {       0xF0, 0x0C, 0 } }, /* 03e */
+    { .mk = {      0x03, 0 }, .brk = {       0xF0, 0x03, 0 } }, /* 03f */
+    { .mk = {      0x0B, 0 }, .brk = {       0xF0, 0x0B, 0 } }, /* 040 */
+    { .mk = {      0x83, 0 }, .brk = {       0xF0, 0x83, 0 } }, /* 041 */
+    { .mk = {      0x0A, 0 }, .brk = {       0xF0, 0x0A, 0 } }, /* 042 */
+    { .mk = {      0x01, 0 }, .brk = {       0xF0, 0x01, 0 } }, /* 043 */
+    { .mk = {      0x09, 0 }, .brk = {       0xF0, 0x09, 0 } }, /* 044 */
+    { .mk = {      0x77, 0 }, .brk = {       0xF0, 0x77, 0 } }, /* 045 */
+    { .mk = {      0x7E, 0 }, .brk = {       0xF0, 0x7E, 0 } }, /* 046 */
+    { .mk = {      0x6C, 0 }, .brk = {       0xF0, 0x6C, 0 } }, /* 047 */
+    { .mk = {      0x75, 0 }, .brk = {       0xF0, 0x75, 0 } }, /* 048 */
+    { .mk = {      0x7D, 0 }, .brk = {       0xF0, 0x7D, 0 } }, /* 049 */
+    { .mk = {      0x7B, 0 }, .brk = {       0xF0, 0x7B, 0 } }, /* 04a */
+    { .mk = {      0x6B, 0 }, .brk = {       0xF0, 0x6B, 0 } }, /* 04b */
+    { .mk = {      0x73, 0 }, .brk = {       0xF0, 0x73, 0 } }, /* 04c */
+    { .mk = {      0x74, 0 }, .brk = {       0xF0, 0x74, 0 } }, /* 04d */
+    { .mk = {      0x79, 0 }, .brk = {       0xF0, 0x79, 0 } }, /* 04e */
+    { .mk = {      0x69, 0 }, .brk = {       0xF0, 0x69, 0 } }, /* 04f */
+    { .mk = {      0x72, 0 }, .brk = {       0xF0, 0x72, 0 } }, /* 050 */
+    { .mk = {      0x7A, 0 }, .brk = {       0xF0, 0x7A, 0 } }, /* 051 */
+    { .mk = {      0x70, 0 }, .brk = {       0xF0, 0x70, 0 } }, /* 052 */
+    { .mk = {      0x71, 0 }, .brk = {       0xF0, 0x71, 0 } }, /* 053 */
+    { .mk = {      0x84, 0 }, .brk = {       0xF0, 0x84, 0 } }, /* 054 */
+    { .mk = {      0x60, 0 }, .brk = {       0xF0, 0x60, 0 } }, /* 055 */
+    { .mk = {      0x61, 0 }, .brk = {       0xF0, 0x61, 0 } }, /* 056 */
+    { .mk = {      0x78, 0 }, .brk = {       0xF0, 0x78, 0 } }, /* 057 */
+    { .mk = {      0x07, 0 }, .brk = {       0xF0, 0x07, 0 } }, /* 058 */
+    { .mk = {      0x0F, 0 }, .brk = {       0xF0, 0x0F, 0 } }, /* 059 */
+    { .mk = {      0x17, 0 }, .brk = {       0xF0, 0x17, 0 } }, /* 05a */
+    { .mk = {      0x1F, 0 }, .brk = {       0xF0, 0x1F, 0 } }, /* 05b */
+    { .mk = {      0x27, 0 }, .brk = {       0xF0, 0x27, 0 } }, /* 05c */
+    { .mk = {      0x2F, 0 }, .brk = {       0xF0, 0x2F, 0 } }, /* 05d */
+    { .mk = {      0x37, 0 }, .brk = {       0xF0, 0x37, 0 } }, /* 05e */
+    { .mk = {      0x3F, 0 }, .brk = {       0xF0, 0x3F, 0 } }, /* 05f */
+    { .mk = {      0x47, 0 }, .brk = {       0xF0, 0x47, 0 } }, /* 060 */
+    { .mk = {      0x4F, 0 }, .brk = {       0xF0, 0x4F, 0 } }, /* 061 */
+    { .mk = {      0x56, 0 }, .brk = {       0xF0, 0x56, 0 } }, /* 062 */
+    { .mk = {      0x5E, 0 }, .brk = {       0xF0, 0x5E, 0 } }, /* 063 */
+    { .mk = {      0x08, 0 }, .brk = {       0xF0, 0x08, 0 } }, /* 064 */
+    { .mk = {      0x10, 0 }, .brk = {       0xF0, 0x10, 0 } }, /* 065 */
+    { .mk = {      0x18, 0 }, .brk = {       0xF0, 0x18, 0 } }, /* 066 */
+    { .mk = {      0x20, 0 }, .brk = {       0xF0, 0x20, 0 } }, /* 067 */
+    { .mk = {      0x28, 0 }, .brk = {       0xF0, 0x28, 0 } }, /* 068 */
+    { .mk = {      0x30, 0 }, .brk = {       0xF0, 0x30, 0 } }, /* 069 */
+    { .mk = {      0x38, 0 }, .brk = {       0xF0, 0x38, 0 } }, /* 06a */
+    { .mk = {      0x40, 0 }, .brk = {       0xF0, 0x40, 0 } }, /* 06b */
+    { .mk = {      0x48, 0 }, .brk = {       0xF0, 0x48, 0 } }, /* 06c */
+    { .mk = {      0x50, 0 }, .brk = {       0xF0, 0x50, 0 } }, /* 06d */
+    { .mk = {      0x57, 0 }, .brk = {       0xF0, 0x57, 0 } }, /* 06e */
+    { .mk = {      0x6F, 0 }, .brk = {       0xF0, 0x6F, 0 } }, /* 06f */
+    { .mk = {      0x13, 0 }, .brk = {       0xF0, 0x13, 0 } }, /* 070 */
+    { .mk = {      0x19, 0 }, .brk = {       0xF0, 0x19, 0 } }, /* 071 */
+    { .mk = {      0x39, 0 }, .brk = {       0xF0, 0x39, 0 } }, /* 072 */
+    { .mk = {      0x51, 0 }, .brk = {       0xF0, 0x51, 0 } }, /* 073 */
+    { .mk = {      0x53, 0 }, .brk = {       0xF0, 0x53, 0 } }, /* 074 */
+    { .mk = {      0x5C, 0 }, .brk = {       0xF0, 0x5C, 0 } }, /* 075 */
+    { .mk = {      0x5F, 0 }, .brk = {       0xF0, 0x5F, 0 } }, /* 076 */
+    { .mk = {      0x62, 0 }, .brk = {       0xF0, 0x62, 0 } }, /* 077 */
+    { .mk = {      0x63, 0 }, .brk = {       0xF0, 0x63, 0 } }, /* 078 */
+    { .mk = {      0x64, 0 }, .brk = {       0xF0, 0x64, 0 } }, /* 079 */
+    { .mk = {      0x65, 0 }, .brk = {       0xF0, 0x65, 0 } }, /* 07a */
+    { .mk = {      0x67, 0 }, .brk = {       0xF0, 0x67, 0 } }, /* 07b */
+    { .mk = {      0x68, 0 }, .brk = {       0xF0, 0x68, 0 } }, /* 07c */
+    { .mk = {      0x6A, 0 }, .brk = {       0xF0, 0x6A, 0 } }, /* 07d */
+    { .mk = {      0x6D, 0 }, .brk = {       0xF0, 0x6D, 0 } }, /* 07e */
+    { .mk = {      0x6E, 0 }, .brk = {       0xF0, 0x6E, 0 } }, /* 07f */
+    { .mk = {      0x80, 0 }, .brk = {       0xf0, 0x80, 0 } }, /* 080 */
+    { .mk = {      0x81, 0 }, .brk = {       0xf0, 0x81, 0 } }, /* 081 */
+    { .mk = {      0x82, 0 }, .brk = {       0xf0, 0x82, 0 } }, /* 082 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 083 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 084 */
+    { .mk = {      0x85, 0 }, .brk = {       0xf0, 0x54, 0 } }, /* 085 */
+    { .mk = {      0x86, 0 }, .brk = {       0xf0, 0x86, 0 } }, /* 086 */
+    { .mk = {      0x87, 0 }, .brk = {       0xf0, 0x87, 0 } }, /* 087 */
+    { .mk = {      0x88, 0 }, .brk = {       0xf0, 0x88, 0 } }, /* 088 */
+    { .mk = {      0x89, 0 }, .brk = {       0xf0, 0x89, 0 } }, /* 089 */
+    { .mk = {      0x8a, 0 }, .brk = {       0xf0, 0x8a, 0 } }, /* 08a */
+    { .mk = {      0x8b, 0 }, .brk = {       0xf0, 0x8b, 0 } }, /* 08b */
+    { .mk = {      0x8c, 0 }, .brk = {       0xf0, 0x8c, 0 } }, /* 08c */
+    { .mk = {      0x8d, 0 }, .brk = {       0xf0, 0x8d, 0 } }, /* 08d */
+    { .mk = {      0x8e, 0 }, .brk = {       0xf0, 0x8e, 0 } }, /* 08e */
+    { .mk = {      0x8f, 0 }, .brk = {       0xf0, 0x8f, 0 } }, /* 08f */
+    { .mk = {      0x90, 0 }, .brk = {       0xf0, 0x90, 0 } }, /* 090 */
+    { .mk = {      0x91, 0 }, .brk = {       0xf0, 0x91, 0 } }, /* 091 */
+    { .mk = {      0x92, 0 }, .brk = {       0xf0, 0x92, 0 } }, /* 092 */
+    { .mk = {      0x93, 0 }, .brk = {       0xf0, 0x93, 0 } }, /* 093 */
+    { .mk = {      0x94, 0 }, .brk = {       0xf0, 0x94, 0 } }, /* 094 */
+    { .mk = {      0x95, 0 }, .brk = {       0xf0, 0x95, 0 } }, /* 095 */
+    { .mk = {      0x96, 0 }, .brk = {       0xf0, 0x96, 0 } }, /* 096 */
+    { .mk = {      0x97, 0 }, .brk = {       0xf0, 0x97, 0 } }, /* 097 */
+    { .mk = {      0x98, 0 }, .brk = {       0xf0, 0x98, 0 } }, /* 098 */
+    { .mk = {      0x99, 0 }, .brk = {       0xf0, 0x99, 0 } }, /* 099 */
+    { .mk = {      0x9a, 0 }, .brk = {       0xf0, 0x9a, 0 } }, /* 09a */
+    { .mk = {      0x9b, 0 }, .brk = {       0xf0, 0x9b, 0 } }, /* 09b */
+    { .mk = {      0x9c, 0 }, .brk = {       0xf0, 0x9c, 0 } }, /* 09c */
+    { .mk = {      0x9d, 0 }, .brk = {       0xf0, 0x9d, 0 } }, /* 09d */
+    { .mk = {      0x9e, 0 }, .brk = {       0xf0, 0x9e, 0 } }, /* 09e */
+    { .mk = {      0x9f, 0 }, .brk = {       0xf0, 0x9f, 0 } }, /* 09f */
+    { .mk = {      0xa0, 0 }, .brk = {       0xf0, 0xa0, 0 } }, /* 0a0 */
+    { .mk = {      0xa1, 0 }, .brk = {       0xf0, 0xa1, 0 } }, /* 0a1 */
+    { .mk = {      0xa2, 0 }, .brk = {       0xf0, 0xa2, 0 } }, /* 0a2 */
+    { .mk = {      0xa3, 0 }, .brk = {       0xf0, 0xa3, 0 } }, /* 0a3 */
+    { .mk = {      0xa4, 0 }, .brk = {       0xf0, 0xa4, 0 } }, /* 0a4 */
+    { .mk = {      0xa5, 0 }, .brk = {       0xf0, 0xa5, 0 } }, /* 0a5 */
+    { .mk = {      0xa6, 0 }, .brk = {       0xf0, 0xa6, 0 } }, /* 0a6 */
+    { .mk = {      0xa7, 0 }, .brk = {       0xf0, 0xa7, 0 } }, /* 0a7 */
+    { .mk = {      0xa8, 0 }, .brk = {       0xf0, 0xa8, 0 } }, /* 0a8 */
+    { .mk = {      0xa9, 0 }, .brk = {       0xf0, 0xa9, 0 } }, /* 0a9 */
+    { .mk = {      0xaa, 0 }, .brk = {       0xf0, 0xaa, 0 } }, /* 0aa */
+    { .mk = {      0xab, 0 }, .brk = {       0xf0, 0xab, 0 } }, /* 0ab */
+    { .mk = {      0xac, 0 }, .brk = {       0xf0, 0xac, 0 } }, /* 0ac */
+    { .mk = {      0xad, 0 }, .brk = {       0xf0, 0xad, 0 } }, /* 0ad */
+    { .mk = {      0xae, 0 }, .brk = {       0xf0, 0xae, 0 } }, /* 0ae */
+    { .mk = {      0xaf, 0 }, .brk = {       0xf0, 0xaf, 0 } }, /* 0af */
+    { .mk = {      0xb0, 0 }, .brk = {       0xf0, 0xb0, 0 } }, /* 0b0 */
+    { .mk = {      0xb1, 0 }, .brk = {       0xf0, 0xb1, 0 } }, /* 0b1 */
+    { .mk = {      0xb2, 0 }, .brk = {       0xf0, 0xb2, 0 } }, /* 0b2 */
+    { .mk = {      0xb3, 0 }, .brk = {       0xf0, 0xb3, 0 } }, /* 0b3 */
+    { .mk = {      0xb4, 0 }, .brk = {       0xf0, 0xb4, 0 } }, /* 0b4 */
+    { .mk = {      0xb5, 0 }, .brk = {       0xf0, 0xb5, 0 } }, /* 0b5 */
+    { .mk = {      0xb6, 0 }, .brk = {       0xf0, 0xb6, 0 } }, /* 0b6 */
+    { .mk = {      0xb7, 0 }, .brk = {       0xf0, 0xb7, 0 } }, /* 0b7 */
+    { .mk = {      0xb8, 0 }, .brk = {       0xf0, 0xb8, 0 } }, /* 0b8 */
+    { .mk = {      0xb9, 0 }, .brk = {       0xf0, 0xb9, 0 } }, /* 0b9 */
+    { .mk = {      0xba, 0 }, .brk = {       0xf0, 0xba, 0 } }, /* 0ba */
+    { .mk = {      0xbb, 0 }, .brk = {       0xf0, 0xbb, 0 } }, /* 0bb */
+    { .mk = {      0xbc, 0 }, .brk = {       0xf0, 0xbc, 0 } }, /* 0bc */
+    { .mk = {      0xbd, 0 }, .brk = {       0xf0, 0xbd, 0 } }, /* 0bd */
+    { .mk = {      0xbe, 0 }, .brk = {       0xf0, 0xbe, 0 } }, /* 0be */
+    { .mk = {      0xbf, 0 }, .brk = {       0xf0, 0xbf, 0 } }, /* 0bf */
+    { .mk = {      0xc0, 0 }, .brk = {       0xf0, 0xc0, 0 } }, /* 0c0 */
+    { .mk = {      0xc1, 0 }, .brk = {       0xf0, 0xc1, 0 } }, /* 0c1 */
+    { .mk = {      0xc2, 0 }, .brk = {       0xf0, 0xc2, 0 } }, /* 0c2 */
+    { .mk = {      0xc3, 0 }, .brk = {       0xf0, 0xc3, 0 } }, /* 0c3 */
+    { .mk = {      0xc4, 0 }, .brk = {       0xf0, 0xc4, 0 } }, /* 0c4 */
+    { .mk = {      0xc5, 0 }, .brk = {       0xf0, 0xc5, 0 } }, /* 0c5 */
+    { .mk = {      0xc6, 0 }, .brk = {       0xf0, 0xc6, 0 } }, /* 0c6 */
+    { .mk = {      0xc7, 0 }, .brk = {       0xf0, 0xc7, 0 } }, /* 0c7 */
+    { .mk = {      0xc8, 0 }, .brk = {       0xf0, 0xc8, 0 } }, /* 0c8 */
+    { .mk = {      0xc9, 0 }, .brk = {       0xf0, 0xc9, 0 } }, /* 0c9 */
+    { .mk = {      0xca, 0 }, .brk = {       0xf0, 0xca, 0 } }, /* 0ca */
+    { .mk = {      0xcb, 0 }, .brk = {       0xf0, 0xcb, 0 } }, /* 0cb */
+    { .mk = {      0xcc, 0 }, .brk = {       0xf0, 0xcc, 0 } }, /* 0cc */
+    { .mk = {      0xcd, 0 }, .brk = {       0xf0, 0xcd, 0 } }, /* 0cd */
+    { .mk = {      0xce, 0 }, .brk = {       0xf0, 0xce, 0 } }, /* 0ce */
+    { .mk = {      0xcf, 0 }, .brk = {       0xf0, 0xcf, 0 } }, /* 0cf */
+    { .mk = {      0xd0, 0 }, .brk = {       0xf0, 0xd0, 0 } }, /* 0d0 */
+    { .mk = {      0xd1, 0 }, .brk = {       0xf0, 0xd0, 0 } }, /* 0d1 */
+    { .mk = {      0xd2, 0 }, .brk = {       0xf0, 0xd2, 0 } }, /* 0d2 */
+    { .mk = {      0xd3, 0 }, .brk = {       0xf0, 0xd3, 0 } }, /* 0d3 */
+    { .mk = {      0xd4, 0 }, .brk = {       0xf0, 0xd4, 0 } }, /* 0d4 */
+    { .mk = {      0xd5, 0 }, .brk = {       0xf0, 0xd5, 0 } }, /* 0d5 */
+    { .mk = {      0xd6, 0 }, .brk = {       0xf0, 0xd6, 0 } }, /* 0d6 */
+    { .mk = {      0xd7, 0 }, .brk = {       0xf0, 0xd7, 0 } }, /* 0d7 */
+    { .mk = {      0xd8, 0 }, .brk = {       0xf0, 0xd8, 0 } }, /* 0d8 */
+    { .mk = {      0xd9, 0 }, .brk = {       0xf0, 0xd9, 0 } }, /* 0d9 */
+    { .mk = {      0xda, 0 }, .brk = {       0xf0, 0xda, 0 } }, /* 0da */
+    { .mk = {      0xdb, 0 }, .brk = {       0xf0, 0xdb, 0 } }, /* 0db */
+    { .mk = {      0xdc, 0 }, .brk = {       0xf0, 0xdc, 0 } }, /* 0dc */
+    { .mk = {      0xdd, 0 }, .brk = {       0xf0, 0xdd, 0 } }, /* 0dd */
+    { .mk = {      0xde, 0 }, .brk = {       0xf0, 0xde, 0 } }, /* 0de */
+    { .mk = {      0xdf, 0 }, .brk = {       0xf0, 0xdf, 0 } }, /* 0df */
+    { .mk = {      0xe0, 0 }, .brk = {       0xf0, 0xe0, 0 } }, /* 0e0 */
+    { .mk = {      0xe1, 0 }, .brk = {       0xf0, 0xe1, 0 } }, /* 0e1 */
+    { .mk = {      0xe2, 0 }, .brk = {       0xf0, 0xe2, 0 } }, /* 0e2 */
+    { .mk = {      0xe3, 0 }, .brk = {       0xf0, 0xe3, 0 } }, /* 0e3 */
+    { .mk = {      0xe4, 0 }, .brk = {       0xf0, 0xe4, 0 } }, /* 0e4 */
+    { .mk = {      0xe5, 0 }, .brk = {       0xf0, 0xe5, 0 } }, /* 0e5 */
+    { .mk = {      0xe6, 0 }, .brk = {       0xf0, 0xe6, 0 } }, /* 0e6 */
+    { .mk = {      0xe7, 0 }, .brk = {       0xf0, 0xe7, 0 } }, /* 0e7 */
+    { .mk = {      0xe8, 0 }, .brk = {       0xf0, 0xe8, 0 } }, /* 0e8 */
+    { .mk = {      0xe9, 0 }, .brk = {       0xf0, 0xe9, 0 } }, /* 0e9 */
+    { .mk = {      0xea, 0 }, .brk = {       0xf0, 0xea, 0 } }, /* 0ea */
+    { .mk = {      0xeb, 0 }, .brk = {       0xf0, 0xeb, 0 } }, /* 0eb */
+    { .mk = {      0xec, 0 }, .brk = {       0xf0, 0xec, 0 } }, /* 0ec */
+    { .mk = {      0xed, 0 }, .brk = {       0xf0, 0xed, 0 } }, /* 0ed */
+    { .mk = {      0xee, 0 }, .brk = {       0xf0, 0xee, 0 } }, /* 0ee */
+    { .mk = {      0xef, 0 }, .brk = {       0xf0, 0xef, 0 } }, /* 0ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f0 */
+    { .mk = {      0xf1, 0 }, .brk = {       0xf0, 0xf1, 0 } }, /* 0f1 */
+    { .mk = {      0xf2, 0 }, .brk = {       0xf0, 0xf2, 0 } }, /* 0f2 */
+    { .mk = {      0xf3, 0 }, .brk = {       0xf0, 0xf3, 0 } }, /* 0f3 */
+    { .mk = {      0xf4, 0 }, .brk = {       0xf0, 0xf4, 0 } }, /* 0f4 */
+    { .mk = {      0xf5, 0 }, .brk = {       0xf0, 0xf5, 0 } }, /* 0f5 */
+    { .mk = {      0xf6, 0 }, .brk = {       0xf0, 0xf6, 0 } }, /* 0f6 */
+    { .mk = {      0xf7, 0 }, .brk = {       0xf0, 0xf7, 0 } }, /* 0f7 */
+    { .mk = {      0xf8, 0 }, .brk = {       0xf0, 0xf8, 0 } }, /* 0f8 */
+    { .mk = {      0xf9, 0 }, .brk = {       0xf0, 0xf9, 0 } }, /* 0f9 */
+    { .mk = {      0xfa, 0 }, .brk = {       0xf0, 0xfa, 0 } }, /* 0fa */
+    { .mk = {      0xfb, 0 }, .brk = {       0xf0, 0xfb, 0 } }, /* 0fb */
+    { .mk = {      0xfc, 0 }, .brk = {       0xf0, 0xfc, 0 } }, /* 0fc */
+    { .mk = {      0xfd, 0 }, .brk = {       0xf0, 0xfd, 0 } }, /* 0fd */
+    { .mk = {      0xfe, 0 }, .brk = {       0xf0, 0xfe, 0 } }, /* 0fe */
+    { .mk = {      0xff, 0 }, .brk = {       0xf0, 0xff, 0 } }, /* 0ff */
+    { .mk = {0xe1, 0x14, 0 }, .brk = { 0xe1, 0xf0, 0x14, 0 } }, /* 100 */
+    { .mk = {0xe0, 0x76, 0 }, .brk = { 0xe0, 0xF0, 0x76, 0 } }, /* 101 */
+    { .mk = {0xe0, 0x16, 0 }, .brk = { 0xe0, 0xF0, 0x16, 0 } }, /* 102 */
+    { .mk = {0xe0, 0x1E, 0 }, .brk = { 0xe0, 0xF0, 0x1E, 0 } }, /* 103 */
+    { .mk = {0xe0, 0x26, 0 }, .brk = { 0xe0, 0xF0, 0x26, 0 } }, /* 104 */
+    { .mk = {0xe0, 0x25, 0 }, .brk = { 0xe0, 0xF0, 0x25, 0 } }, /* 105 */
+    { .mk = {0xe0, 0x2E, 0 }, .brk = { 0xe0, 0xF0, 0x2E, 0 } }, /* 106 */
+    { .mk = {0xe0, 0x36, 0 }, .brk = { 0xe0, 0xF0, 0x36, 0 } }, /* 107 */
+    { .mk = {0xe0, 0x3D, 0 }, .brk = { 0xe0, 0xF0, 0x3D, 0 } }, /* 108 */
+    { .mk = {0xe0, 0x3E, 0 }, .brk = { 0xe0, 0xF0, 0x3E, 0 } }, /* 109 */
+    { .mk = {0xe0, 0x46, 0 }, .brk = { 0xe0, 0xF0, 0x46, 0 } }, /* 10a */
+    { .mk = {0xe0, 0x45, 0 }, .brk = { 0xe0, 0xF0, 0x45, 0 } }, /* 10b */
+    { .mk = {0xe0, 0x4E, 0 }, .brk = { 0xe0, 0xF0, 0x4E, 0 } }, /* 10c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10d */
+    { .mk = {0xe0, 0x66, 0 }, .brk = { 0xe0, 0xF0, 0x66, 0 } }, /* 10e */
+    { .mk = {0xe0, 0x0D, 0 }, .brk = { 0xe0, 0xF0, 0x0D, 0 } }, /* 10f */
+    { .mk = {0xe0, 0x15, 0 }, .brk = { 0xe0, 0xF0, 0x15, 0 } }, /* 110 */
+    { .mk = {0xe0, 0x1D, 0 }, .brk = { 0xe0, 0xF0, 0x1D, 0 } }, /* 112 */
+    { .mk = {0xe0, 0x24, 0 }, .brk = { 0xe0, 0xF0, 0x24, 0 } }, /* 113 */
+    { .mk = {0xe0, 0x2D, 0 }, .brk = { 0xe0, 0xF0, 0x2D, 0 } }, /* 113 */
+    { .mk = {0xe0, 0x2C, 0 }, .brk = { 0xe0, 0xF0, 0x2C, 0 } }, /* 114 */
+    { .mk = {0xe0, 0x35, 0 }, .brk = { 0xe0, 0xF0, 0x35, 0 } }, /* 115 */
+    { .mk = {0xe0, 0x3C, 0 }, .brk = { 0xe0, 0xF0, 0x3C, 0 } }, /* 116 */
+    { .mk = {0xe0, 0x43, 0 }, .brk = { 0xe0, 0xF0, 0x43, 0 } }, /* 117 */
+    { .mk = {0xe0, 0x44, 0 }, .brk = { 0xe0, 0xF0, 0x44, 0 } }, /* 118 */
+    { .mk = {0xe0, 0x4D, 0 }, .brk = { 0xe0, 0xF0, 0x4D, 0 } }, /* 119 */
+    { .mk = {0xe0, 0x54, 0 }, .brk = { 0xe0, 0xF0, 0x54, 0 } }, /* 11a */
+    { .mk = {0xe0, 0x5B, 0 }, .brk = { 0xe0, 0xF0, 0x5B, 0 } }, /* 11b */
+    { .mk = {0xe0, 0x5A, 0 }, .brk = { 0xe0, 0xF0, 0x5A, 0 } }, /* 11c */
+    { .mk = {0xe0, 0x14, 0 }, .brk = { 0xe0, 0xF0, 0x14, 0 } }, /* 11d */
+    { .mk = {0xe0, 0x1C, 0 }, .brk = { 0xe0, 0xF0, 0x1C, 0 } }, /* 11e */
+    { .mk = {0xe0, 0x1B, 0 }, .brk = { 0xe0, 0xF0, 0x1B, 0 } }, /* 11f */
+    { .mk = {0xe0, 0x23, 0 }, .brk = { 0xe0, 0xF0, 0x23, 0 } }, /* 120 */
+    { .mk = {0xe0, 0x2B, 0 }, .brk = { 0xe0, 0xF0, 0x2B, 0 } }, /* 121 */
+    { .mk = {0xe0, 0x34, 0 }, .brk = { 0xe0, 0xF0, 0x34, 0 } }, /* 122 */
+    { .mk = {0xe0, 0x33, 0 }, .brk = { 0xe0, 0xF0, 0x33, 0 } }, /* 123 */
+    { .mk = {0xe0, 0x3B, 0 }, .brk = { 0xe0, 0xF0, 0x3B, 0 } }, /* 124 */
+    { .mk = {0xe0, 0x42, 0 }, .brk = { 0xe0, 0xF0, 0x42, 0 } }, /* 125 */
+    { .mk = {0xe0, 0x4B, 0 }, .brk = { 0xe0, 0xF0, 0x4B, 0 } }, /* 126 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 127 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 128 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 129 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12b */
+    { .mk = {0xe0, 0x1A, 0 }, .brk = { 0xe0, 0xF0, 0x1A, 0 } }, /* 12c */
+    { .mk = {0xe0, 0x22, 0 }, .brk = { 0xe0, 0xF0, 0x22, 0 } }, /* 12d */
+    { .mk = {0xe0, 0x21, 0 }, .brk = { 0xe0, 0xF0, 0x21, 0 } }, /* 12e */
+    { .mk = {0xe0, 0x2A, 0 }, .brk = { 0xe0, 0xF0, 0x2A, 0 } }, /* 12f */
+    { .mk = {0xe0, 0x32, 0 }, .brk = { 0xe0, 0xF0, 0x32, 0 } }, /* 130 */
+    { .mk = {0xe0, 0x31, 0 }, .brk = { 0xe0, 0xF0, 0x31, 0 } }, /* 131 */
+    { .mk = {0xe0, 0x3A, 0 }, .brk = { 0xe0, 0xF0, 0x3A, 0 } }, /* 132 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 133 */
+    { .mk = {0xe0, 0x49, 0 }, .brk = { 0xe0, 0xF0, 0x49, 0 } }, /* 134 */
+    { .mk = {0xe0, 0x4A, 0 }, .brk = { 0xe0, 0xF0, 0x4A, 0 } }, /* 135 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 136 */
+    { .mk = {0xe0, 0x7C, 0 }, .brk = { 0xe0, 0xF0, 0x7C, 0 } }, /* 137 */
+    { .mk = {0xe0, 0x11, 0 }, .brk = { 0xe0, 0xF0, 0x11, 0 } }, /* 138 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 139 */
+    { .mk = {0xe0, 0x58, 0 }, .brk = { 0xe0, 0xF0, 0x58, 0 } }, /* 13a */
+    { .mk = {0xe0, 0x05, 0 }, .brk = { 0xe0, 0xF0, 0x05, 0 } }, /* 13b */
+    { .mk = {0xe0, 0x06, 0 }, .brk = { 0xe0, 0xF0, 0x06, 0 } }, /* 13c */
+    { .mk = {0xe0, 0x04, 0 }, .brk = { 0xe0, 0xF0, 0x04, 0 } }, /* 13d */
+    { .mk = {0xe0, 0x0C, 0 }, .brk = { 0xe0, 0xF0, 0x0C, 0 } }, /* 13e */
+    { .mk = {0xe0, 0x03, 0 }, .brk = { 0xe0, 0xF0, 0x03, 0 } }, /* 13f */
+    { .mk = {0xe0, 0x0B, 0 }, .brk = { 0xe0, 0xF0, 0x0B, 0 } }, /* 140 */
+    { .mk = {0xe0, 0x02, 0 }, .brk = { 0xe0, 0xF0, 0x02, 0 } }, /* 141 */
+    { .mk = {0xe0, 0x0A, 0 }, .brk = { 0xe0, 0xF0, 0x0A, 0 } }, /* 142 */
+    { .mk = {0xe0, 0x01, 0 }, .brk = { 0xe0, 0xF0, 0x01, 0 } }, /* 143 */
+    { .mk = {0xe0, 0x09, 0 }, .brk = { 0xe0, 0xF0, 0x09, 0 } }, /* 144 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 145 */
+    { .mk = {0xe0, 0x7E, 0 }, .brk = { 0xe0, 0xF0, 0x7E, 0 } }, /* 146 */
+    { .mk = {0xe0, 0x6C, 0 }, .brk = { 0xe0, 0xF0, 0x6C, 0 } }, /* 147 */
+    { .mk = {0xe0, 0x75, 0 }, .brk = { 0xe0, 0xF0, 0x75, 0 } }, /* 148 */
+    { .mk = {0xe0, 0x7D, 0 }, .brk = { 0xe0, 0xF0, 0x7D, 0 } }, /* 149 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14a */
+    { .mk = {0xe0, 0x6B, 0 }, .brk = { 0xe0, 0xF0, 0x6B, 0 } }, /* 14b */
+    { .mk = {0xe0, 0x73, 0 }, .brk = { 0xe0, 0xF0, 0x73, 0 } }, /* 14c */
+    { .mk = {0xe0, 0x74, 0 }, .brk = { 0xe0, 0xF0, 0x74, 0 } }, /* 14d */
+    { .mk = {0xe0, 0x79, 0 }, .brk = { 0xe0, 0xF0, 0x79, 0 } }, /* 14e */
+    { .mk = {0xe0, 0x69, 0 }, .brk = { 0xe0, 0xF0, 0x69, 0 } }, /* 14f */
+    { .mk = {0xe0, 0x72, 0 }, .brk = { 0xe0, 0xF0, 0x72, 0 } }, /* 150 */
+    { .mk = {0xe0, 0x7A, 0 }, .brk = { 0xe0, 0xF0, 0x7A, 0 } }, /* 151 */
+    { .mk = {0xe0, 0x70, 0 }, .brk = { 0xe0, 0xF0, 0x70, 0 } }, /* 152 */
+    { .mk = {0xe0, 0x71, 0 }, .brk = { 0xe0, 0xF0, 0x71, 0 } }, /* 153 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 154 */
+    { .mk = {0xe0, 0x60, 0 }, .brk = { 0xe0, 0xF0, 0x60, 0 } }, /* 155 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 156 */
+    { .mk = {0xe0, 0x78, 0 }, .brk = { 0xe0, 0xF0, 0x78, 0 } }, /* 157 */
+    { .mk = {0xe0, 0x07, 0 }, .brk = { 0xe0, 0xF0, 0x07, 0 } }, /* 158 */
+    { .mk = {0xe0, 0x0F, 0 }, .brk = { 0xe0, 0xF0, 0x0F, 0 } }, /* 159 */
+    { .mk = {0xe0, 0x17, 0 }, .brk = { 0xe0, 0xF0, 0x17, 0 } }, /* 15a */
+    { .mk = {0xe0, 0x1F, 0 }, .brk = { 0xe0, 0xF0, 0x1F, 0 } }, /* 15b */
+    { .mk = {0xe0, 0x27, 0 }, .brk = { 0xe0, 0xF0, 0x27, 0 } }, /* 15c */
+    { .mk = {0xe0, 0x2F, 0 }, .brk = { 0xe0, 0xF0, 0x2F, 0 } }, /* 15d */
+    { .mk = {0xe0, 0x37, 0 }, .brk = { 0xe0, 0xF0, 0x37, 0 } }, /* 15e */
+    { .mk = {0xe0, 0x3F, 0 }, .brk = { 0xe0, 0xF0, 0x3F, 0 } }, /* 15f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 160 */
+    { .mk = {0xe0, 0x4F, 0 }, .brk = { 0xe0, 0xF0, 0x4F, 0 } }, /* 161 */
+    { .mk = {0xe0, 0x56, 0 }, .brk = { 0xe0, 0xF0, 0x56, 0 } }, /* 162 */
+    { .mk = {0xe0, 0x5E, 0 }, .brk = { 0xe0, 0xF0, 0x5E, 0 } }, /* 163 */
+    { .mk = {0xe0, 0x08, 0 }, .brk = { 0xe0, 0xF0, 0x08, 0 } }, /* 164 */
+    { .mk = {0xe0, 0x10, 0 }, .brk = { 0xe0, 0xF0, 0x10, 0 } }, /* 165 */
+    { .mk = {0xe0, 0x18, 0 }, .brk = { 0xe0, 0xF0, 0x18, 0 } }, /* 166 */
+    { .mk = {0xe0, 0x20, 0 }, .brk = { 0xe0, 0xF0, 0x20, 0 } }, /* 167 */
+    { .mk = {0xe0, 0x28, 0 }, .brk = { 0xe0, 0xF0, 0x28, 0 } }, /* 168 */
+    { .mk = {0xe0, 0x30, 0 }, .brk = { 0xe0, 0xF0, 0x30, 0 } }, /* 169 */
+    { .mk = {0xe0, 0x38, 0 }, .brk = { 0xe0, 0xF0, 0x38, 0 } }, /* 16a */
+    { .mk = {0xe0, 0x40, 0 }, .brk = { 0xe0, 0xF0, 0x40, 0 } }, /* 16b */
+    { .mk = {0xe0, 0x48, 0 }, .brk = { 0xe0, 0xF0, 0x48, 0 } }, /* 16c */
+    { .mk = {0xe0, 0x50, 0 }, .brk = { 0xe0, 0xF0, 0x50, 0 } }, /* 16d */
+    { .mk = {0xe0, 0x57, 0 }, .brk = { 0xe0, 0xF0, 0x57, 0 } }, /* 16e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16f */
+    { .mk = {0xe0, 0x13, 0 }, .brk = { 0xe0, 0xF0, 0x13, 0 } }, /* 170 */
+    { .mk = {0xe0, 0x19, 0 }, .brk = { 0xe0, 0xF0, 0x19, 0 } }, /* 171 */
+    { .mk = {0xe0, 0x39, 0 }, .brk = { 0xe0, 0xF0, 0x39, 0 } }, /* 172 */
+    { .mk = {0xe0, 0x51, 0 }, .brk = { 0xe0, 0xF0, 0x51, 0 } }, /* 173 */
+    { .mk = {0xe0, 0x53, 0 }, .brk = { 0xe0, 0xF0, 0x53, 0 } }, /* 174 */
+    { .mk = {0xe0, 0x5C, 0 }, .brk = { 0xe0, 0xF0, 0x5C, 0 } }, /* 175 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 176 */
+    { .mk = {0xe0, 0x62, 0 }, .brk = { 0xe0, 0xF0, 0x62, 0 } }, /* 177 */
+    { .mk = {0xe0, 0x63, 0 }, .brk = { 0xe0, 0xF0, 0x63, 0 } }, /* 178 */
+    { .mk = {0xe0, 0x64, 0 }, .brk = { 0xe0, 0xF0, 0x64, 0 } }, /* 179 */
+    { .mk = {0xe0, 0x65, 0 }, .brk = { 0xe0, 0xF0, 0x65, 0 } }, /* 17a */
+    { .mk = {0xe0, 0x67, 0 }, .brk = { 0xe0, 0xF0, 0x67, 0 } }, /* 17b */
+    { .mk = {0xe0, 0x68, 0 }, .brk = { 0xe0, 0xF0, 0x68, 0 } }, /* 17c */
+    { .mk = {0xe0, 0x6A, 0 }, .brk = { 0xe0, 0xF0, 0x6A, 0 } }, /* 17d */
+    { .mk = {0xe0, 0x6D, 0 }, .brk = { 0xe0, 0xF0, 0x6D, 0 } }, /* 17e */
+    { .mk = {0xe0, 0x6E, 0 }, .brk = { 0xe0, 0xF0, 0x6E, 0 } }, /* 17f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 180 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 181 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 182 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 183 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 184 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 185 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 186 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 187 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 188 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 189 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 190 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 191 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 192 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 193 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 194 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 195 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 196 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 197 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 198 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 199 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cv */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e0 */
+    { .mk = {0xe0, 0xe1, 0 }, .brk = { 0xe0, 0xF0, 0xE1, 0 } }, /* 1e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ed */
+    { .mk = {0xe0, 0xee, 0 }, .brk = { 0xe0, 0xF0, 0xEE, 0 } }, /* 1ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f0 */
+    { .mk = {0xe0, 0xf1, 0 }, .brk = { 0xe0, 0xF0, 0xF1, 0 } }, /* 1f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fd */
+    { .mk = {0xe0, 0xfe, 0 }, .brk = { 0xe0, 0xF0, 0xFE, 0 } }, /* 1fe */
+    { .mk = {0xe0, 0xff, 0 }, .brk = { 0xe0, 0xF0, 0xFF, 0 } }  /* 1ff */
   // clang-format on
 };
 
 static const scancode scancode_set3[512] = {
   // clang-format off
-    { {          0},{               0} }, { {     0x08,0},{     0xf0,0x08,0} }, { {     0x16,0},{     0xf0,0x16,0} }, { {     0x1E,0},{     0xf0,0x1E,0} },        /*000*/
-    { {     0x26,0},{     0xf0,0x26,0} }, { {     0x25,0},{     0xf0,0x25,0} }, { {     0x2E,0},{     0xf0,0x2E,0} }, { {     0x36,0},{     0xf0,0x36,0} },        /*004*/
-    { {     0x3D,0},{     0xf0,0x3D,0} }, { {     0x3E,0},{     0xf0,0x3E,0} }, { {     0x46,0},{     0xf0,0x46,0} }, { {     0x45,0},{     0xf0,0x45,0} },        /*008*/
-    { {     0x4E,0},{     0xf0,0x4E,0} }, { {     0x55,0},{     0xf0,0x55,0} }, { {     0x66,0},{     0xf0,0x66,0} }, { {     0x0D,0},{     0xf0,0x0D,0} },        /*00c*/
-    { {     0x15,0},{     0xf0,0x15,0} }, { {     0x1D,0},{     0xf0,0x1D,0} }, { {     0x24,0},{     0xf0,0x24,0} }, { {     0x2D,0},{     0xf0,0x2D,0} },        /*010*/
-    { {     0x2C,0},{     0xf0,0x2C,0} }, { {     0x35,0},{     0xf0,0x35,0} }, { {     0x3C,0},{     0xf0,0x3C,0} }, { {     0x43,0},{     0xf0,0x43,0} },        /*014*/
-    { {     0x44,0},{     0xf0,0x44,0} }, { {     0x4D,0},{     0xf0,0x4D,0} }, { {     0x54,0},{     0xf0,0x54,0} }, { {     0x5B,0},{     0xf0,0x5B,0} },        /*018*/
-    { {     0x5A,0},{     0xf0,0x5A,0} }, { {     0x11,0},{     0xf0,0x11,0} }, { {     0x1C,0},{     0xf0,0x1C,0} }, { {     0x1B,0},{     0xf0,0x1B,0} },        /*01c*/
-    { {     0x23,0},{     0xf0,0x23,0} }, { {     0x2B,0},{     0xf0,0x2B,0} }, { {     0x34,0},{     0xf0,0x34,0} }, { {     0x33,0},{     0xf0,0x33,0} },        /*020*/
-    { {     0x3B,0},{     0xf0,0x3B,0} }, { {     0x42,0},{     0xf0,0x42,0} }, { {     0x4B,0},{     0xf0,0x4B,0} }, { {     0x4C,0},{     0xf0,0x4C,0} },        /*024*/
-    { {     0x52,0},{     0xf0,0x52,0} }, { {     0x0E,0},{     0xf0,0x0E,0} }, { {     0x12,0},{     0xf0,0x12,0} }, { {     0x5C,0},{     0xf0,0x5C,0} },        /*028*/
-    { {     0x1A,0},{     0xf0,0x1A,0} }, { {     0x22,0},{     0xf0,0x22,0} }, { {     0x21,0},{     0xf0,0x21,0} }, { {     0x2A,0},{     0xf0,0x2A,0} },        /*02c*/
-    { {     0x32,0},{     0xf0,0x32,0} }, { {     0x31,0},{     0xf0,0x31,0} }, { {     0x3A,0},{     0xf0,0x3A,0} }, { {     0x41,0},{     0xf0,0x41,0} },        /*030*/
-    { {     0x49,0},{     0xf0,0x49,0} }, { {     0x4A,0},{     0xf0,0x4A,0} }, { {     0x59,0},{     0xf0,0x59,0} }, { {     0x7E,0},{     0xf0,0x7E,0} },        /*034*/
-    { {     0x19,0},{     0xf0,0x19,0} }, { {     0x29,0},{     0xf0,0x29,0} }, { {     0x14,0},{     0xf0,0x14,0} }, { {     0x07,0},{     0xf0,0x07,0} },        /*038*/
-    { {     0x0F,0},{     0xf0,0x0F,0} }, { {     0x17,0},{     0xf0,0x17,0} }, { {     0x1F,0},{     0xf0,0x1F,0} }, { {     0x27,0},{     0xf0,0x27,0} },        /*03c*/
-    { {     0x2F,0},{     0xf0,0x2F,0} }, { {     0x37,0},{     0xf0,0x37,0} }, { {     0x3F,0},{     0xf0,0x3F,0} }, { {     0x47,0},{     0xf0,0x47,0} },        /*040*/
-    { {     0x4F,0},{     0xf0,0x4F,0} }, { {     0x76,0},{     0xf0,0x76,0} }, { {     0x5F,0},{     0xf0,0x5F,0} }, { {     0x6C,0},{     0xf0,0x6C,0} },        /*044*/
-    { {     0x75,0},{     0xf0,0x75,0} }, { {     0x7D,0},{     0xf0,0x7D,0} }, { {     0x84,0},{     0xf0,0x84,0} }, { {     0x6B,0},{     0xf0,0x6B,0} },        /*048*/
-    { {     0x73,0},{     0xf0,0x73,0} }, { {     0x74,0},{     0xf0,0x74,0} }, { {     0x7C,0},{     0xf0,0x7C,0} }, { {     0x69,0},{     0xf0,0x69,0} },        /*04c*/
-    { {     0x72,0},{     0xf0,0x72,0} }, { {     0x7A,0},{     0xf0,0x7A,0} }, { {     0x70,0},{     0xf0,0x70,0} }, { {     0x71,0},{     0xf0,0x71,0} },        /*050*/
-    { {     0x57,0},{     0xf0,0x57,0} }, { {     0x60,0},{     0xf0,0x60,0} }, { {          0},{               0} }, { {     0x56,0},{     0xf0,0x56,0} },        /*054*/
-    { {     0x5E,0},{     0xf0,0x5E,0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*058*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*05c*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*060*/
-    { {          0},{               0} }, { {     0x10,0},{     0xf0,0x10,0} }, { {     0x18,0},{     0xf0,0x18,0} }, { {     0x20,0},{     0xf0,0x20,0} },        /*064*/
-    { {     0x28,0},{     0xf0,0x28,0} }, { {     0x30,0},{     0xf0,0x30,0} }, { {     0x38,0},{     0xf0,0x38,0} }, { {     0x40,0},{     0xf0,0x40,0} },        /*068*/
-    { {     0x48,0},{     0xf0,0x48,0} }, { {     0x50,0},{     0xf0,0x50,0} }, { {          0},{               0} }, { {          0},{               0} },        /*06c*/
-    { {     0x87,0},{     0xf0,0x87,0} }, { {          0},{               0} }, { {          0},{               0} }, { {     0x51,0},{     0xf0,0x51,0} },        /*070*/
-    { {     0x53,0},{     0xf0,0x53,0} }, { {     0x5C,0},{     0xf0,0x5C,0} }, { {          0},{               0} }, { {     0x62,0},{     0xf0,0x62,0} },        /*074*/
-    { {     0x63,0},{     0xf0,0x63,0} }, { {     0x86,0},{     0xf0,0x86,0} }, { {          0},{               0} }, { {     0x85,0},{     0xf0,0x85,0} },        /*078*/
-    { {     0x68,0},{     0xf0,0x68,0} }, { {     0x13,0},{     0xf0,0x13,0} }, { {          0},{               0} }, { {          0},{               0} },        /*07c*/
-
-    { {     0x80,0},{     0xf0,0x80,0} }, { {     0x81,0},{     0xf0,0x81,0} }, { {     0x82,0},{     0xf0,0x82,0} }, { {          0},{               0} },        /*080*/
-    { {          0},{               0} }, { {     0x85,0},{     0xf0,0x54,0} }, { {     0x86,0},{     0xf0,0x86,0} }, { {     0x87,0},{     0xf0,0x87,0} },        /*084*/
-    { {     0x88,0},{     0xf0,0x88,0} }, { {     0x89,0},{     0xf0,0x89,0} }, { {     0x8a,0},{     0xf0,0x8a,0} }, { {     0x8b,0},{     0xf0,0x8b,0} },        /*088*/
-    { {          0},{               0} }, { {          0},{               0} }, { {     0x8e,0},{     0xf0,0x8e,0} }, { {     0x8f,0},{     0xf0,0x8f,0} },        /*08c*/
-    { {     0x90,0},{     0xf0,0x90,0} }, { {     0x91,0},{     0xf0,0x91,0} }, { {     0x92,0},{     0xf0,0x92,0} }, { {     0x93,0},{     0xf0,0x93,0} },        /*090*/
-    { {     0x94,0},{     0xf0,0x94,0} }, { {     0x95,0},{     0xf0,0x95,0} }, { {     0x96,0},{     0xf0,0x96,0} }, { {     0x97,0},{     0xf0,0x97,0} },        /*094*/
-    { {     0x98,0},{     0xf0,0x98,0} }, { {     0x99,0},{     0xf0,0x99,0} }, { {     0x9a,0},{     0xf0,0x9a,0} }, { {     0x9b,0},{     0xf0,0x9b,0} },        /*098*/
-    { {     0x9c,0},{     0xf0,0x9c,0} }, { {     0x9d,0},{     0xf0,0x9d,0} }, { {     0x9e,0},{     0xf0,0x9e,0} }, { {     0x9f,0},{     0xf0,0x9f,0} },        /*09c*/
-    { {     0xa0,0},{     0xf0,0xa0,0} }, { {     0xa1,0},{     0xf0,0xa1,0} }, { {     0xa2,0},{     0xf0,0xa2,0} }, { {     0xa3,0},{     0xf0,0xa3,0} },        /*0a0*/
-    { {     0xa4,0},{     0xf0,0xa4,0} }, { {     0xa5,0},{     0xf0,0xa5,0} }, { {     0xa6,0},{     0xf0,0xa6,0} }, { {     0xa7,0},{     0xf0,0xa7,0} },        /*0a4*/
-    { {     0xa8,0},{     0xf0,0xa8,0} }, { {     0xa9,0},{     0xf0,0xa9,0} }, { {     0xaa,0},{     0xf0,0xaa,0} }, { {     0xab,0},{     0xf0,0xab,0} },        /*0a8*/
-    { {     0xac,0},{     0xf0,0xac,0} }, { {     0xad,0},{     0xf0,0xad,0} }, { {     0xae,0},{     0xf0,0xae,0} }, { {     0xaf,0},{     0xf0,0xaf,0} },        /*0ac*/
-    { {     0xb0,0},{     0xf0,0xb0,0} }, { {     0xb1,0},{     0xf0,0xb1,0} }, { {     0xb2,0},{     0xf0,0xb2,0} }, { {     0xb3,0},{     0xf0,0xb3,0} },        /*0b0*/
-    { {     0xb4,0},{     0xf0,0xb4,0} }, { {     0xb5,0},{     0xf0,0xb5,0} }, { {     0xb6,0},{     0xf0,0xb6,0} }, { {     0xb7,0},{     0xf0,0xb7,0} },        /*0b4*/
-    { {     0xb8,0},{     0xf0,0xb8,0} }, { {     0xb9,0},{     0xf0,0xb9,0} }, { {     0xba,0},{     0xf0,0xba,0} }, { {     0xbb,0},{     0xf0,0xbb,0} },        /*0b8*/
-    { {     0xbc,0},{     0xf0,0xbc,0} }, { {     0xbd,0},{     0xf0,0xbd,0} }, { {     0xbe,0},{     0xf0,0xbe,0} }, { {     0xbf,0},{     0xf0,0xbf,0} },        /*0bc*/
-    { {     0xc0,0},{     0xf0,0xc0,0} }, { {     0xc1,0},{     0xf0,0xc1,0} }, { {     0xc2,0},{     0xf0,0xc2,0} }, { {     0xc3,0},{     0xf0,0xc3,0} },        /*0c0*/
-    { {     0xc4,0},{     0xf0,0xc4,0} }, { {     0xc5,0},{     0xf0,0xc5,0} }, { {     0xc6,0},{     0xf0,0xc6,0} }, { {     0xc7,0},{     0xf0,0xc7,0} },        /*0c4*/
-    { {     0xc8,0},{     0xf0,0xc8,0} }, { {     0xc9,0},{     0xf0,0xc9,0} }, { {     0xca,0},{     0xf0,0xca,0} }, { {     0xcb,0},{     0xf0,0xcb,0} },        /*0c8*/
-    { {     0xcc,0},{     0xf0,0xcc,0} }, { {     0xcd,0},{     0xf0,0xcd,0} }, { {     0xce,0},{     0xf0,0xce,0} }, { {     0xcf,0},{     0xf0,0xcf,0} },        /*0cc*/
-    { {     0xd0,0},{     0xf0,0xd0,0} }, { {     0xd1,0},{     0xf0,0xd0,0} }, { {     0xd2,0},{     0xf0,0xd2,0} }, { {     0xd3,0},{     0xf0,0xd3,0} },        /*0d0*/
-    { {     0xd4,0},{     0xf0,0xd4,0} }, { {     0xd5,0},{     0xf0,0xd5,0} }, { {     0xd6,0},{     0xf0,0xd6,0} }, { {     0xd7,0},{     0xf0,0xd7,0} },        /*0d4*/
-    { {     0xd8,0},{     0xf0,0xd8,0} }, { {     0xd9,0},{     0xf0,0xd9,0} }, { {     0xda,0},{     0xf0,0xda,0} }, { {     0xdb,0},{     0xf0,0xdb,0} },        /*0d8*/
-    { {     0xdc,0},{     0xf0,0xdc,0} }, { {     0xdd,0},{     0xf0,0xdd,0} }, { {     0xde,0},{     0xf0,0xde,0} }, { {     0xdf,0},{     0xf0,0xdf,0} },        /*0dc*/
-    { {     0xe0,0},{     0xf0,0xe0,0} }, { {     0xe1,0},{     0xf0,0xe1,0} }, { {     0xe2,0},{     0xf0,0xe2,0} }, { {     0xe3,0},{     0xf0,0xe3,0} },        /*0e0*/
-    { {     0xe4,0},{     0xf0,0xe4,0} }, { {     0xe5,0},{     0xf0,0xe5,0} }, { {     0xe6,0},{     0xf0,0xe6,0} }, { {     0xe7,0},{     0xf0,0xe7,0} },        /*0e4*/
-    { {     0xe8,0},{     0xf0,0xe8,0} }, { {     0xe9,0},{     0xf0,0xe9,0} }, { {     0xea,0},{     0xf0,0xea,0} }, { {     0xeb,0},{     0xf0,0xeb,0} },        /*0e8*/
-    { {     0xec,0},{     0xf0,0xec,0} }, { {     0xed,0},{     0xf0,0xed,0} }, { {     0xee,0},{     0xf0,0xee,0} }, { {     0xef,0},{     0xf0,0xef,0} },        /*0ec*/
-    { {          0},{               0} }, { {     0xf1,0},{     0xf0,0xf1,0} }, { {     0xf2,0},{     0xf0,0xf2,0} }, { {     0xf3,0},{     0xf0,0xf3,0} },        /*0f0*/
-    { {     0xf4,0},{     0xf0,0xf4,0} }, { {     0xf5,0},{     0xf0,0xf5,0} }, { {     0xf6,0},{     0xf0,0xf6,0} }, { {     0xf7,0},{     0xf0,0xf7,0} },        /*0f4*/
-    { {     0xf8,0},{     0xf0,0xf8,0} }, { {     0xf9,0},{     0xf0,0xf9,0} }, { {     0xfa,0},{     0xf0,0xfa,0} }, { {     0xfb,0},{     0xf0,0xfb,0} },        /*0f8*/
-    { {     0xfc,0},{     0xf0,0xfc,0} }, { {     0xfd,0},{     0xf0,0xfd,0} }, { {     0xfe,0},{     0xf0,0xfe,0} }, { {     0xff,0},{     0xf0,0xff,0} },        /*0fc*/
-
-    { {     0x62,0},{     0xF0,0x62,0} }, { {0xe0,0x76,0},{0xe0,0xF0,0x76,0} }, { {0xe0,0x16,0},{0xe0,0xF0,0x16,0} }, { {0xe0,0x1E,0},{0xe0,0xF0,0x1E,0} },        /*100*/
-    { {0xe0,0x26,0},{0xe0,0xF0,0x26,0} }, { {0xe0,0x25,0},{0xe0,0xF0,0x25,0} }, { {0xe0,0x2E,0},{0xe0,0xF0,0x2E,0} }, { {0xe0,0x36,0},{0xe0,0xF0,0x36,0} },        /*104*/
-    { {0xe0,0x3D,0},{0xe0,0xF0,0x3D,0} }, { {0xe0,0x3E,0},{0xe0,0xF0,0x3E,0} }, { {0xe0,0x46,0},{0xe0,0xF0,0x46,0} }, { {0xe0,0x45,0},{0xe0,0xF0,0x45,0} },        /*108*/
-    { {0xe0,0x4E,0},{0xe0,0xF0,0x4E,0} }, { {          0},{               0} }, { {0xe0,0x66,0},{0xe0,0xF0,0x66,0} }, { {0xe0,0x0D,0},{0xe0,0xF0,0x0D,0} },        /*10c*/
-    { {0xe0,0x15,0},{0xe0,0xF0,0x15,0} }, { {0xe0,0x1D,0},{0xe0,0xF0,0x1D,0} }, { {0xe0,0x24,0},{0xe0,0xF0,0x24,0} }, { {0xe0,0x2D,0},{0xe0,0xF0,0x2D,0} },        /*110*/
-    { {0xe0,0x2C,0},{0xe0,0xF0,0x2C,0} }, { {0xe0,0x35,0},{0xe0,0xF0,0x35,0} }, { {0xe0,0x3C,0},{0xe0,0xF0,0x3C,0} }, { {0xe0,0x43,0},{0xe0,0xF0,0x43,0} },        /*114*/
-    { {0xe0,0x44,0},{0xe0,0xF0,0x44,0} }, { {0xe0,0x4D,0},{0xe0,0xF0,0x4D,0} }, { {0xe0,0x54,0},{0xe0,0xF0,0x54,0} }, { {0xe0,0x5B,0},{0xe0,0xF0,0x5B,0} },        /*118*/
-    { {     0x79,0},{     0xf0,0x79,0} }, { {     0x58,0},{     0xf0,0x58,0} }, { {0xe0,0x1C,0},{0xe0,0xF0,0x1C,0} }, { {0xe0,0x1B,0},{0xe0,0xF0,0x1B,0} },        /*11c*/
-    { {0xe0,0x23,0},{0xe0,0xF0,0x23,0} }, { {0xe0,0x2B,0},{0xe0,0xF0,0x2B,0} }, { {0xe0,0x34,0},{0xe0,0xF0,0x34,0} }, { {0xe0,0x33,0},{0xe0,0xF0,0x33,0} },        /*120*/
-    { {0xe0,0x3B,0},{0xe0,0xF0,0x3B,0} }, { {0xe0,0x42,0},{0xe0,0xF0,0x42,0} }, { {0xe0,0x4B,0},{0xe0,0xF0,0x4B,0} }, { {          0},{               0} },        /*124*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*128*/
-    { {0xe0,0x1A,0},{0xe0,0xF0,0x1A,0} }, { {0xe0,0x22,0},{0xe0,0xF0,0x22,0} }, { {0xe0,0x21,0},{0xe0,0xF0,0x21,0} }, { {0xe0,0x2A,0},{0xe0,0xF0,0x2A,0} },        /*12c*/
-    { {0xe0,0x32,0},{0xe0,0xF0,0x32,0} }, { {0xe0,0x31,0},{0xe0,0xF0,0x31,0} }, { {0xe0,0x3A,0},{0xe0,0xF0,0x3A,0} }, { {          0},{               0} },        /*130*/
-    { {0xe0,0x49,0},{0xe0,0xF0,0x49,0} }, { {     0x77,0},{     0xf0,0x77,0} }, { {          0},{               0} }, { {     0x57,0},{     0xf0,0x57,0} },        /*134*/
-    { {     0x39,0},{     0xf0,0x39,0} }, { {          0},{               0} }, { {0xe0,0x58,0},{0xe0,0xF0,0x58,0} }, { {0xe0,0x05,0},{0xe0,0xF0,0x05,0} },        /*138*/
-    { {0xe0,0x06,0},{0xe0,0xF0,0x06,0} }, { {0xe0,0x04,0},{0xe0,0xF0,0x04,0} }, { {0xe0,0x0C,0},{0xe0,0xF0,0x0C,0} }, { {0xe0,0x03,0},{0xe0,0xF0,0x03,0} },        /*13c*/
-    { {0xe0,0x0B,0},{0xe0,0xF0,0x0B,0} }, { {0xe0,0x02,0},{0xe0,0xF0,0x02,0} }, { {0xe0,0x0A,0},{0xe0,0xF0,0x0A,0} }, { {0xe0,0x01,0},{0xe0,0xF0,0x01,0} },        /*140*/
-    { {0xe0,0x09,0},{0xe0,0xF0,0x09,0} }, { {          0},{               0} }, { {0xe0,0x7E,0},{0xe0,0xF0,0x7E,0} }, { {     0x6E,0},{     0xf0,0x6E,0} },        /*144*/
-    { {     0x63,0},{     0xf0,0x63,0} }, { {     0x6F,0},{     0xf0,0x6F,0} }, { {          0},{               0} }, { {     0x61,0},{     0xf0,0x61,0} },        /*148*/
-    { {0xe0,0x73,0},{0xe0,0xF0,0x73,0} }, { {     0x6A,0},{     0xf0,0x6A,0} }, { {0xe0,0x79,0},{0xe0,0xF0,0x79,0} }, { {     0x65,0},{     0xf0,0x65,0} },        /*14c*/
-    { {     0x60,0},{     0xf0,0x60,0} }, { {     0x6D,0},{     0xf0,0x6D,0} }, { {     0x67,0},{     0xf0,0x67,0} }, { {     0x64,0},{     0xf0,0x64,0} },        /*150*/
-    { {     0xd4,0},{     0xf0,0xD4,0} }, { {0xe0,0x60,0},{0xe0,0xF0,0x60,0} }, { {          0},{               0} }, { {0xe0,0x78,0},{0xe0,0xF0,0x78,0} },        /*154*/
-    { {0xe0,0x07,0},{0xe0,0xF0,0x07,0} }, { {0xe0,0x0F,0},{0xe0,0xF0,0x0F,0} }, { {0xe0,0x17,0},{0xe0,0xF0,0x17,0} }, { {     0x8B,0},{     0xf0,0x8B,0} },        /*158*/
-    { {     0x8C,0},{     0xf0,0x8C,0} }, { {     0x8D,0},{     0xf0,0x8D,0} }, { {          0},{               0} }, { {     0x7F,0},{     0xf0,0x7F,0} },        /*15c*/
-    { {          0},{               0} }, { {0xe0,0x4F,0},{0xe0,0xF0,0x4F,0} }, { {0xe0,0x56,0},{0xe0,0xF0,0x56,0} }, { {          0},{               0} },        /*160*/
-    { {0xe0,0x08,0},{0xe0,0xF0,0x08,0} }, { {0xe0,0x10,0},{0xe0,0xF0,0x10,0} }, { {0xe0,0x18,0},{0xe0,0xF0,0x18,0} }, { {0xe0,0x20,0},{0xe0,0xF0,0x20,0} },        /*164*/
-    { {0xe0,0x28,0},{0xe0,0xF0,0x28,0} }, { {0xe0,0x30,0},{0xe0,0xF0,0x30,0} }, { {0xe0,0x38,0},{0xe0,0xF0,0x38,0} }, { {0xe0,0x40,0},{0xe0,0xF0,0x40,0} },        /*168*/
-    { {0xe0,0x48,0},{0xe0,0xF0,0x48,0} }, { {0xe0,0x50,0},{0xe0,0xF0,0x50,0} }, { {0xe0,0x57,0},{0xe0,0xF0,0x57,0} }, { {          0},{               0} },        /*16c*/
-    { {0xe0,0x13,0},{0xe0,0xF0,0x13,0} }, { {0xe0,0x19,0},{0xe0,0xF0,0x19,0} }, { {0xe0,0x39,0},{0xe0,0xF0,0x39,0} }, { {0xe0,0x51,0},{0xe0,0xF0,0x51,0} },        /*170*/
-    { {0xe0,0x53,0},{0xe0,0xF0,0x53,0} }, { {0xe0,0x5C,0},{0xe0,0xF0,0x5C,0} }, { {          0},{               0} }, { {0xe0,0x62,0},{0xe0,0xF0,0x62,0} },        /*174*/
-    { {0xe0,0x63,0},{0xe0,0xF0,0x63,0} }, { {0xe0,0x64,0},{0xe0,0xF0,0x64,0} }, { {0xe0,0x65,0},{0xe0,0xF0,0x65,0} }, { {0xe0,0x67,0},{0xe0,0xF0,0x67,0} },        /*178*/
-    { {0xe0,0x68,0},{0xe0,0xF0,0x68,0} }, { {0xe0,0x6A,0},{0xe0,0xF0,0x6A,0} }, { {0xe0,0x6D,0},{0xe0,0xF0,0x6D,0} }, { {0xe0,0x6E,0},{0xe0,0xF0,0x6E,0} },        /*17c*/
-
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*180*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*184*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*188*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*18c*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*190*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*194*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*198*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*19c*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1a0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1a4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1a8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1ac*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1c0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1c4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1c8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1cc*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1d0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1d4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1d8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1dc*/
-    { {          0},{               0} }, { {0xe0,0xe1,0},{0xe0,0xF0,0xE1,0} }, { {          0},{               0} }, { {          0},{               0} },        /*1e0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1e4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1e8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {0xe0,0xee,0},{0xe0,0xF0,0xEE,0} }, { {          0},{               0} },        /*1ec*/
-    { {          0},{               0} }, { {0xe0,0xf1,0},{0xe0,0xF0,0xF1,0} }, { {          0},{               0} }, { {          0},{               0} },        /*1f0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1f4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1f8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {0xe0,0xfe,0},{0xe0,0xF0,0xFE,0} }, { {0xe0,0xff,0},{0xe0,0xF0,0xFF,0} }         /*1fc*/
+    { .mk = {            0 }, .brk = {                   0 } }, /* 000 */
+    { .mk = {      0x08, 0 }, .brk = {       0xf0, 0x08, 0 } }, /* 001 */
+    { .mk = {      0x16, 0 }, .brk = {       0xf0, 0x16, 0 } }, /* 002 */
+    { .mk = {      0x1E, 0 }, .brk = {       0xf0, 0x1E, 0 } }, /* 003 */
+    { .mk = {      0x26, 0 }, .brk = {       0xf0, 0x26, 0 } }, /* 004 */
+    { .mk = {      0x25, 0 }, .brk = {       0xf0, 0x25, 0 } }, /* 005 */
+    { .mk = {      0x2E, 0 }, .brk = {       0xf0, 0x2E, 0 } }, /* 006 */
+    { .mk = {      0x36, 0 }, .brk = {       0xf0, 0x36, 0 } }, /* 007 */
+    { .mk = {      0x3D, 0 }, .brk = {       0xf0, 0x3D, 0 } }, /* 008 */
+    { .mk = {      0x3E, 0 }, .brk = {       0xf0, 0x3E, 0 } }, /* 009 */
+    { .mk = {      0x46, 0 }, .brk = {       0xf0, 0x46, 0 } }, /* 00a */
+    { .mk = {      0x45, 0 }, .brk = {       0xf0, 0x45, 0 } }, /* 00b */
+    { .mk = {      0x4E, 0 }, .brk = {       0xf0, 0x4E, 0 } }, /* 00c */
+    { .mk = {      0x55, 0 }, .brk = {       0xf0, 0x55, 0 } }, /* 00d */
+    { .mk = {      0x66, 0 }, .brk = {       0xf0, 0x66, 0 } }, /* 00e */
+    { .mk = {      0x0D, 0 }, .brk = {       0xf0, 0x0D, 0 } }, /* 00f */
+    { .mk = {      0x15, 0 }, .brk = {       0xf0, 0x15, 0 } }, /* 010 */
+    { .mk = {      0x1D, 0 }, .brk = {       0xf0, 0x1D, 0 } }, /* 011 */
+    { .mk = {      0x24, 0 }, .brk = {       0xf0, 0x24, 0 } }, /* 012 */
+    { .mk = {      0x2D, 0 }, .brk = {       0xf0, 0x2D, 0 } }, /* 013 */
+    { .mk = {      0x2C, 0 }, .brk = {       0xf0, 0x2C, 0 } }, /* 014 */
+    { .mk = {      0x35, 0 }, .brk = {       0xf0, 0x35, 0 } }, /* 015 */
+    { .mk = {      0x3C, 0 }, .brk = {       0xf0, 0x3C, 0 } }, /* 016 */
+    { .mk = {      0x43, 0 }, .brk = {       0xf0, 0x43, 0 } }, /* 017 */
+    { .mk = {      0x44, 0 }, .brk = {       0xf0, 0x44, 0 } }, /* 018 */
+    { .mk = {      0x4D, 0 }, .brk = {       0xf0, 0x4D, 0 } }, /* 019 */
+    { .mk = {      0x54, 0 }, .brk = {       0xf0, 0x54, 0 } }, /* 01a */
+    { .mk = {      0x5B, 0 }, .brk = {       0xf0, 0x5B, 0 } }, /* 01b */
+    { .mk = {      0x5A, 0 }, .brk = {       0xf0, 0x5A, 0 } }, /* 01c */
+    { .mk = {      0x11, 0 }, .brk = {       0xf0, 0x11, 0 } }, /* 01d */
+    { .mk = {      0x1C, 0 }, .brk = {       0xf0, 0x1C, 0 } }, /* 01e */
+    { .mk = {      0x1B, 0 }, .brk = {       0xf0, 0x1B, 0 } }, /* 01f */
+    { .mk = {      0x23, 0 }, .brk = {       0xf0, 0x23, 0 } }, /* 020 */
+    { .mk = {      0x2B, 0 }, .brk = {       0xf0, 0x2B, 0 } }, /* 021 */
+    { .mk = {      0x34, 0 }, .brk = {       0xf0, 0x34, 0 } }, /* 022 */
+    { .mk = {      0x33, 0 }, .brk = {       0xf0, 0x33, 0 } }, /* 023 */
+    { .mk = {      0x3B, 0 }, .brk = {       0xf0, 0x3B, 0 } }, /* 024 */
+    { .mk = {      0x42, 0 }, .brk = {       0xf0, 0x42, 0 } }, /* 025 */
+    { .mk = {      0x4B, 0 }, .brk = {       0xf0, 0x4B, 0 } }, /* 026 */
+    { .mk = {      0x4C, 0 }, .brk = {       0xf0, 0x4C, 0 } }, /* 027 */
+    { .mk = {      0x52, 0 }, .brk = {       0xf0, 0x52, 0 } }, /* 028 */
+    { .mk = {      0x0E, 0 }, .brk = {       0xf0, 0x0E, 0 } }, /* 029 */
+    { .mk = {      0x12, 0 }, .brk = {       0xf0, 0x12, 0 } }, /* 02a */
+    { .mk = {0x8c, 0x2B, 0 }, .brk = { 0xf0, 0x8c, 0x2B, 0 } }, /* 02b */
+    { .mk = {      0x1A, 0 }, .brk = {       0xf0, 0x1A, 0 } }, /* 02c */
+    { .mk = {      0x22, 0 }, .brk = {       0xf0, 0x22, 0 } }, /* 02d */
+    { .mk = {      0x21, 0 }, .brk = {       0xf0, 0x21, 0 } }, /* 02e */
+    { .mk = {      0x2A, 0 }, .brk = {       0xf0, 0x2A, 0 } }, /* 02f */
+    { .mk = {      0x32, 0 }, .brk = {       0xf0, 0x32, 0 } }, /* 030 */
+    { .mk = {      0x31, 0 }, .brk = {       0xf0, 0x31, 0 } }, /* 031 */
+    { .mk = {      0x3A, 0 }, .brk = {       0xf0, 0x3A, 0 } }, /* 032 */
+    { .mk = {      0x41, 0 }, .brk = {       0xf0, 0x41, 0 } }, /* 033 */
+    { .mk = {      0x49, 0 }, .brk = {       0xf0, 0x49, 0 } }, /* 034 */
+    { .mk = {      0x4A, 0 }, .brk = {       0xf0, 0x4A, 0 } }, /* 035 */
+    { .mk = {      0x59, 0 }, .brk = {       0xf0, 0x59, 0 } }, /* 036 */
+    { .mk = {      0x7E, 0 }, .brk = {       0xf0, 0x7E, 0 } }, /* 037 */
+    { .mk = {      0x19, 0 }, .brk = {       0xf0, 0x19, 0 } }, /* 038 */
+    { .mk = {      0x29, 0 }, .brk = {       0xf0, 0x29, 0 } }, /* 039 */
+    { .mk = {      0x14, 0 }, .brk = {       0xf0, 0x14, 0 } }, /* 03a */
+    { .mk = {      0x07, 0 }, .brk = {       0xf0, 0x07, 0 } }, /* 03b */
+    { .mk = {      0x0F, 0 }, .brk = {       0xf0, 0x0F, 0 } }, /* 03c */
+    { .mk = {      0x17, 0 }, .brk = {       0xf0, 0x17, 0 } }, /* 03d */
+    { .mk = {      0x1F, 0 }, .brk = {       0xf0, 0x1F, 0 } }, /* 03e */
+    { .mk = {      0x27, 0 }, .brk = {       0xf0, 0x27, 0 } }, /* 03f */
+    { .mk = {      0x2F, 0 }, .brk = {       0xf0, 0x2F, 0 } }, /* 040 */
+    { .mk = {      0x37, 0 }, .brk = {       0xf0, 0x37, 0 } }, /* 041 */
+    { .mk = {      0x3F, 0 }, .brk = {       0xf0, 0x3F, 0 } }, /* 042 */
+    { .mk = {      0x47, 0 }, .brk = {       0xf0, 0x47, 0 } }, /* 043 */
+    { .mk = {      0x4F, 0 }, .brk = {       0xf0, 0x4F, 0 } }, /* 044 */
+    { .mk = {      0x76, 0 }, .brk = {       0xf0, 0x76, 0 } }, /* 045 */
+    { .mk = {      0x5F, 0 }, .brk = {       0xf0, 0x5F, 0 } }, /* 046 */
+    { .mk = {      0x6C, 0 }, .brk = {       0xf0, 0x6C, 0 } }, /* 047 */
+    { .mk = {      0x75, 0 }, .brk = {       0xf0, 0x75, 0 } }, /* 048 */
+    { .mk = {      0x7D, 0 }, .brk = {       0xf0, 0x7D, 0 } }, /* 049 */
+    { .mk = {      0x84, 0 }, .brk = {       0xf0, 0x84, 0 } }, /* 04a */
+    { .mk = {      0x6B, 0 }, .brk = {       0xf0, 0x6B, 0 } }, /* 04b */
+    { .mk = {      0x73, 0 }, .brk = {       0xf0, 0x73, 0 } }, /* 04c */
+    { .mk = {      0x74, 0 }, .brk = {       0xf0, 0x74, 0 } }, /* 04d */
+    { .mk = {      0x7C, 0 }, .brk = {       0xf0, 0x7C, 0 } }, /* 04e */
+    { .mk = {      0x69, 0 }, .brk = {       0xf0, 0x69, 0 } }, /* 04f */
+    { .mk = {      0x72, 0 }, .brk = {       0xf0, 0x72, 0 } }, /* 050 */
+    { .mk = {      0x7A, 0 }, .brk = {       0xf0, 0x7A, 0 } }, /* 051 */
+    { .mk = {      0x70, 0 }, .brk = {       0xf0, 0x70, 0 } }, /* 052 */
+    { .mk = {      0x71, 0 }, .brk = {       0xf0, 0x71, 0 } }, /* 053 */
+    { .mk = {      0x57, 0 }, .brk = {       0xf0, 0x57, 0 } }, /* 054 */
+    { .mk = {      0x60, 0 }, .brk = {       0xf0, 0x60, 0 } }, /* 055 */
+    { .mk = {0x8c, 0x56, 0 }, .brk = { 0xf0, 0x8c, 0x56, 0 } }, /* 056 */
+    { .mk = {      0x56, 0 }, .brk = {       0xf0, 0x56, 0 } }, /* 057 */
+    { .mk = {      0x5E, 0 }, .brk = {       0xf0, 0x5E, 0 } }, /* 058 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 059 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 060 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 061 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 062 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 063 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 064 */
+    { .mk = {      0x10, 0 }, .brk = {       0xf0, 0x10, 0 } }, /* 065 */
+    { .mk = {      0x18, 0 }, .brk = {       0xf0, 0x18, 0 } }, /* 066 */
+    { .mk = {      0x20, 0 }, .brk = {       0xf0, 0x20, 0 } }, /* 067 */
+    { .mk = {      0x28, 0 }, .brk = {       0xf0, 0x28, 0 } }, /* 068 */
+    { .mk = {      0x30, 0 }, .brk = {       0xf0, 0x30, 0 } }, /* 069 */
+    { .mk = {      0x38, 0 }, .brk = {       0xf0, 0x38, 0 } }, /* 06a */
+    { .mk = {      0x40, 0 }, .brk = {       0xf0, 0x40, 0 } }, /* 06b */
+    { .mk = {      0x48, 0 }, .brk = {       0xf0, 0x48, 0 } }, /* 06c */
+    { .mk = {      0x50, 0 }, .brk = {       0xf0, 0x50, 0 } }, /* 06d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06f */
+    { .mk = {0x8c, 0x70, 0 }, .brk = { 0xf0, 0x8c, 0x70, 0 } }, /* 07d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 071 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 072 */
+    { .mk = {0x8c, 0x73, 0 }, .brk = { 0xf0, 0x8c, 0x73, 0 } }, /* 073 */
+    { .mk = {      0x53, 0 }, .brk = {       0xf0, 0x53, 0 } }, /* 074 */
+    { .mk = {      0x5C, 0 }, .brk = {       0xf0, 0x5C, 0 } }, /* 075 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 076 */
+    { .mk = {      0x62, 0 }, .brk = {       0xf0, 0x62, 0 } }, /* 077 */
+    { .mk = {      0x63, 0 }, .brk = {       0xf0, 0x63, 0 } }, /* 078 */
+    { .mk = {0x8c, 0x79, 0 }, .brk = { 0xf0, 0x8c, 0x79, 0 } }, /* 079 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07a */
+    { .mk = {0x8c, 0x7b, 0 }, .brk = { 0xf0, 0x8c, 0x7b, 0 } }, /* 07b */
+    { .mk = {      0x68, 0 }, .brk = {       0xf0, 0x68, 0 } }, /* 07c */
+    { .mk = {0x8c, 0x7d, 0 }, .brk = { 0xf0, 0x8c, 0x7d, 0 } }, /* 07d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07f */
+    { .mk = {      0x80, 0 }, .brk = {       0xf0, 0x80, 0 } }, /* 080 */
+    { .mk = {      0x81, 0 }, .brk = {       0xf0, 0x81, 0 } }, /* 081 */
+    { .mk = {      0x82, 0 }, .brk = {       0xf0, 0x82, 0 } }, /* 082 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 083 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 084 */
+    { .mk = {      0x85, 0 }, .brk = {       0xf0, 0x54, 0 } }, /* 085 */
+    { .mk = {      0x86, 0 }, .brk = {       0xf0, 0x86, 0 } }, /* 086 */
+    { .mk = {      0x87, 0 }, .brk = {       0xf0, 0x87, 0 } }, /* 087 */
+    { .mk = {      0x88, 0 }, .brk = {       0xf0, 0x88, 0 } }, /* 087 */
+    { .mk = {      0x89, 0 }, .brk = {       0xf0, 0x89, 0 } }, /* 088 */
+    { .mk = {      0x8a, 0 }, .brk = {       0xf0, 0x8a, 0 } }, /* 089 */
+    { .mk = {      0x8b, 0 }, .brk = {       0xf0, 0x8b, 0 } }, /* 08b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08d */
+    { .mk = {      0x8e, 0 }, .brk = {       0xf0, 0x8e, 0 } }, /* 08e */
+    { .mk = {      0x8f, 0 }, .brk = {       0xf0, 0x8f, 0 } }, /* 08f */
+    { .mk = {      0x90, 0 }, .brk = {       0xf0, 0x90, 0 } }, /* 090 */
+    { .mk = {      0x91, 0 }, .brk = {       0xf0, 0x91, 0 } }, /* 091 */
+    { .mk = {      0x92, 0 }, .brk = {       0xf0, 0x92, 0 } }, /* 092 */
+    { .mk = {      0x93, 0 }, .brk = {       0xf0, 0x93, 0 } }, /* 093 */
+    { .mk = {      0x94, 0 }, .brk = {       0xf0, 0x94, 0 } }, /* 094 */
+    { .mk = {      0x95, 0 }, .brk = {       0xf0, 0x95, 0 } }, /* 095 */
+    { .mk = {      0x96, 0 }, .brk = {       0xf0, 0x96, 0 } }, /* 096 */
+    { .mk = {      0x97, 0 }, .brk = {       0xf0, 0x97, 0 } }, /* 097 */
+    { .mk = {      0x98, 0 }, .brk = {       0xf0, 0x98, 0 } }, /* 098 */
+    { .mk = {      0x99, 0 }, .brk = {       0xf0, 0x99, 0 } }, /* 099 */
+    { .mk = {      0x9a, 0 }, .brk = {       0xf0, 0x9a, 0 } }, /* 09a */
+    { .mk = {      0x9b, 0 }, .brk = {       0xf0, 0x9b, 0 } }, /* 09b */
+    { .mk = {      0x9c, 0 }, .brk = {       0xf0, 0x9c, 0 } }, /* 09c */
+    { .mk = {      0x9d, 0 }, .brk = {       0xf0, 0x9d, 0 } }, /* 09d */
+    { .mk = {      0x9e, 0 }, .brk = {       0xf0, 0x9e, 0 } }, /* 09e */
+    { .mk = {      0x9f, 0 }, .brk = {       0xf0, 0x9f, 0 } }, /* 09f */
+    { .mk = {      0xa0, 0 }, .brk = {       0xf0, 0xa0, 0 } }, /* 0a0 */
+    { .mk = {      0xa1, 0 }, .brk = {       0xf0, 0xa1, 0 } }, /* 0a1 */
+    { .mk = {      0xa2, 0 }, .brk = {       0xf0, 0xa2, 0 } }, /* 0a2 */
+    { .mk = {      0xa3, 0 }, .brk = {       0xf0, 0xa3, 0 } }, /* 0a3 */
+    { .mk = {      0xa4, 0 }, .brk = {       0xf0, 0xa4, 0 } }, /* 0a4 */
+    { .mk = {      0xa5, 0 }, .brk = {       0xf0, 0xa5, 0 } }, /* 0a5 */
+    { .mk = {      0xa6, 0 }, .brk = {       0xf0, 0xa6, 0 } }, /* 0a6 */
+    { .mk = {      0xa7, 0 }, .brk = {       0xf0, 0xa7, 0 } }, /* 0a7 */
+    { .mk = {      0xa8, 0 }, .brk = {       0xf0, 0xa8, 0 } }, /* 0a8 */
+    { .mk = {      0xa9, 0 }, .brk = {       0xf0, 0xa9, 0 } }, /* 0a9 */
+    { .mk = {      0xaa, 0 }, .brk = {       0xf0, 0xaa, 0 } }, /* 0aa */
+    { .mk = {      0xab, 0 }, .brk = {       0xf0, 0xab, 0 } }, /* 0ab */
+    { .mk = {      0xac, 0 }, .brk = {       0xf0, 0xac, 0 } }, /* 0ac */
+    { .mk = {      0xad, 0 }, .brk = {       0xf0, 0xad, 0 } }, /* 0ad */
+    { .mk = {      0xae, 0 }, .brk = {       0xf0, 0xae, 0 } }, /* 0ae */
+    { .mk = {      0xaf, 0 }, .brk = {       0xf0, 0xaf, 0 } }, /* 0af */
+    { .mk = {      0xb0, 0 }, .brk = {       0xf0, 0xb0, 0 } }, /* 0b0 */
+    { .mk = {      0xb1, 0 }, .brk = {       0xf0, 0xb1, 0 } }, /* 0b1 */
+    { .mk = {      0xb2, 0 }, .brk = {       0xf0, 0xb2, 0 } }, /* 0b2 */
+    { .mk = {      0xb3, 0 }, .brk = {       0xf0, 0xb3, 0 } }, /* 0b3 */
+    { .mk = {      0xb4, 0 }, .brk = {       0xf0, 0xb4, 0 } }, /* 0b4 */
+    { .mk = {      0xb5, 0 }, .brk = {       0xf0, 0xb5, 0 } }, /* 0b5 */
+    { .mk = {      0xb6, 0 }, .brk = {       0xf0, 0xb6, 0 } }, /* 0b6 */
+    { .mk = {      0xb7, 0 }, .brk = {       0xf0, 0xb7, 0 } }, /* 0b7 */
+    { .mk = {      0xb8, 0 }, .brk = {       0xf0, 0xb8, 0 } }, /* 0b8 */
+    { .mk = {      0xb9, 0 }, .brk = {       0xf0, 0xb9, 0 } }, /* 0b9 */
+    { .mk = {      0xba, 0 }, .brk = {       0xf0, 0xba, 0 } }, /* 0ba */
+    { .mk = {      0xbb, 0 }, .brk = {       0xf0, 0xbb, 0 } }, /* 0bb */
+    { .mk = {      0xbc, 0 }, .brk = {       0xf0, 0xbc, 0 } }, /* 0bc */
+    { .mk = {      0xbd, 0 }, .brk = {       0xf0, 0xbd, 0 } }, /* 0bd */
+    { .mk = {      0xbe, 0 }, .brk = {       0xf0, 0xbe, 0 } }, /* 0be */
+    { .mk = {      0xbf, 0 }, .brk = {       0xf0, 0xbf, 0 } }, /* 0bf */
+    { .mk = {      0xc0, 0 }, .brk = {       0xf0, 0xc0, 0 } }, /* 0c0 */
+    { .mk = {      0xc1, 0 }, .brk = {       0xf0, 0xc1, 0 } }, /* 0c1 */
+    { .mk = {      0xc2, 0 }, .brk = {       0xf0, 0xc2, 0 } }, /* 0c2 */
+    { .mk = {      0xc3, 0 }, .brk = {       0xf0, 0xc3, 0 } }, /* 0c3 */
+    { .mk = {      0xc4, 0 }, .brk = {       0xf0, 0xc4, 0 } }, /* 0c4 */
+    { .mk = {      0xc5, 0 }, .brk = {       0xf0, 0xc5, 0 } }, /* 0c5 */
+    { .mk = {      0xc6, 0 }, .brk = {       0xf0, 0xc6, 0 } }, /* 0c6 */
+    { .mk = {      0xc7, 0 }, .brk = {       0xf0, 0xc7, 0 } }, /* 0c7 */
+    { .mk = {      0xc8, 0 }, .brk = {       0xf0, 0xc8, 0 } }, /* 0c8 */
+    { .mk = {      0xc9, 0 }, .brk = {       0xf0, 0xc9, 0 } }, /* 0c9 */
+    { .mk = {      0xca, 0 }, .brk = {       0xf0, 0xca, 0 } }, /* 0ca */
+    { .mk = {      0xcb, 0 }, .brk = {       0xf0, 0xcb, 0 } }, /* 0cb */
+    { .mk = {      0xcc, 0 }, .brk = {       0xf0, 0xcc, 0 } }, /* 0cc */
+    { .mk = {      0xcd, 0 }, .brk = {       0xf0, 0xcd, 0 } }, /* 0cd */
+    { .mk = {      0xce, 0 }, .brk = {       0xf0, 0xce, 0 } }, /* 0ce */
+    { .mk = {      0xcf, 0 }, .brk = {       0xf0, 0xcf, 0 } }, /* 0cf */
+    { .mk = {      0xd0, 0 }, .brk = {       0xf0, 0xd0, 0 } }, /* 0d0 */
+    { .mk = {      0xd1, 0 }, .brk = {       0xf0, 0xd0, 0 } }, /* 0d1 */
+    { .mk = {      0xd2, 0 }, .brk = {       0xf0, 0xd2, 0 } }, /* 0d2 */
+    { .mk = {      0xd3, 0 }, .brk = {       0xf0, 0xd3, 0 } }, /* 0d3 */
+    { .mk = {      0xd4, 0 }, .brk = {       0xf0, 0xd4, 0 } }, /* 0d4 */
+    { .mk = {      0xd5, 0 }, .brk = {       0xf0, 0xd5, 0 } }, /* 0d5 */
+    { .mk = {      0xd6, 0 }, .brk = {       0xf0, 0xd6, 0 } }, /* 0d6 */
+    { .mk = {      0xd7, 0 }, .brk = {       0xf0, 0xd7, 0 } }, /* 0d7 */
+    { .mk = {      0xd8, 0 }, .brk = {       0xf0, 0xd8, 0 } }, /* 0d8 */
+    { .mk = {      0xd9, 0 }, .brk = {       0xf0, 0xd9, 0 } }, /* 0d9 */
+    { .mk = {      0xda, 0 }, .brk = {       0xf0, 0xda, 0 } }, /* 0da */
+    { .mk = {      0xdb, 0 }, .brk = {       0xf0, 0xdb, 0 } }, /* 0db */
+    { .mk = {      0xdc, 0 }, .brk = {       0xf0, 0xdc, 0 } }, /* 0dc */
+    { .mk = {      0xdd, 0 }, .brk = {       0xf0, 0xdd, 0 } }, /* 0dd */
+    { .mk = {      0xde, 0 }, .brk = {       0xf0, 0xde, 0 } }, /* 0de */
+    { .mk = {      0xdf, 0 }, .brk = {       0xf0, 0xdf, 0 } }, /* 0df */
+    { .mk = {      0xe0, 0 }, .brk = {       0xf0, 0xe0, 0 } }, /* 0e0 */
+    { .mk = {      0xe1, 0 }, .brk = {       0xf0, 0xe1, 0 } }, /* 0e1 */
+    { .mk = {      0xe2, 0 }, .brk = {       0xf0, 0xe2, 0 } }, /* 0e2 */
+    { .mk = {      0xe3, 0 }, .brk = {       0xf0, 0xe3, 0 } }, /* 0e3 */
+    { .mk = {      0xe4, 0 }, .brk = {       0xf0, 0xe4, 0 } }, /* 0e4 */
+    { .mk = {      0xe5, 0 }, .brk = {       0xf0, 0xe5, 0 } }, /* 0e5 */
+    { .mk = {      0xe6, 0 }, .brk = {       0xf0, 0xe6, 0 } }, /* 0e6 */
+    { .mk = {      0xe7, 0 }, .brk = {       0xf0, 0xe7, 0 } }, /* 0e7 */
+    { .mk = {      0xe8, 0 }, .brk = {       0xf0, 0xe8, 0 } }, /* 0e7 */
+    { .mk = {      0xe9, 0 }, .brk = {       0xf0, 0xe9, 0 } }, /* 0e8 */
+    { .mk = {      0xea, 0 }, .brk = {       0xf0, 0xea, 0 } }, /* 0e9 */
+    { .mk = {      0xeb, 0 }, .brk = {       0xf0, 0xeb, 0 } }, /* 0eb */
+    { .mk = {      0xec, 0 }, .brk = {       0xf0, 0xec, 0 } }, /* 0ec */
+    { .mk = {      0xed, 0 }, .brk = {       0xf0, 0xed, 0 } }, /* 0ed */
+    { .mk = {      0xee, 0 }, .brk = {       0xf0, 0xee, 0 } }, /* 0ee */
+    { .mk = {      0xef, 0 }, .brk = {       0xf0, 0xef, 0 } }, /* 0ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f0 */
+    { .mk = {      0xf1, 0 }, .brk = {       0xf0, 0xf1, 0 } }, /* 0f1 */
+    { .mk = {      0xf2, 0 }, .brk = {       0xf0, 0xf2, 0 } }, /* 0f2 */
+    { .mk = {      0xf3, 0 }, .brk = {       0xf0, 0xf3, 0 } }, /* 0f3 */
+    { .mk = {      0xf4, 0 }, .brk = {       0xf0, 0xf4, 0 } }, /* 0f4 */
+    { .mk = {      0xf5, 0 }, .brk = {       0xf0, 0xf5, 0 } }, /* 0f5 */
+    { .mk = {      0xf6, 0 }, .brk = {       0xf0, 0xf6, 0 } }, /* 0f6 */
+    { .mk = {      0xf7, 0 }, .brk = {       0xf0, 0xf7, 0 } }, /* 0f7 */
+    { .mk = {      0xf8, 0 }, .brk = {       0xf0, 0xf8, 0 } }, /* 0f8 */
+    { .mk = {      0xf9, 0 }, .brk = {       0xf0, 0xf9, 0 } }, /* 0f9 */
+    { .mk = {      0xfa, 0 }, .brk = {       0xf0, 0xfa, 0 } }, /* 0fa */
+    { .mk = {      0xfb, 0 }, .brk = {       0xf0, 0xfb, 0 } }, /* 0fb */
+    { .mk = {      0xfc, 0 }, .brk = {       0xf0, 0xfc, 0 } }, /* 0fc */
+    { .mk = {      0xfd, 0 }, .brk = {       0xf0, 0xfd, 0 } }, /* 0fd */
+    { .mk = {      0xfe, 0 }, .brk = {       0xf0, 0xfe, 0 } }, /* 0fe */
+    { .mk = {      0xff, 0 }, .brk = {       0xf0, 0xff, 0 } }, /* 0ff */
+    { .mk = {      0x62, 0 }, .brk = {       0xF0, 0x62, 0 } }, /* 100 */
+    { .mk = {0xe0, 0x76, 0 }, .brk = { 0xe0, 0xF0, 0x76, 0 } }, /* 101 */
+    { .mk = {0xe0, 0x16, 0 }, .brk = { 0xe0, 0xF0, 0x16, 0 } }, /* 102 */
+    { .mk = {0xe0, 0x1E, 0 }, .brk = { 0xe0, 0xF0, 0x1E, 0 } }, /* 103 */
+    { .mk = {0xe0, 0x26, 0 }, .brk = { 0xe0, 0xF0, 0x26, 0 } }, /* 104 */
+    { .mk = {0xe0, 0x25, 0 }, .brk = { 0xe0, 0xF0, 0x25, 0 } }, /* 105 */
+    { .mk = {0xe0, 0x2E, 0 }, .brk = { 0xe0, 0xF0, 0x2E, 0 } }, /* 106 */
+    { .mk = {0xe0, 0x36, 0 }, .brk = { 0xe0, 0xF0, 0x36, 0 } }, /* 107 */
+    { .mk = {0xe0, 0x3D, 0 }, .brk = { 0xe0, 0xF0, 0x3D, 0 } }, /* 108 */
+    { .mk = {0xe0, 0x3E, 0 }, .brk = { 0xe0, 0xF0, 0x3E, 0 } }, /* 109 */
+    { .mk = {0xe0, 0x46, 0 }, .brk = { 0xe0, 0xF0, 0x46, 0 } }, /* 10a */
+    { .mk = {0xe0, 0x45, 0 }, .brk = { 0xe0, 0xF0, 0x45, 0 } }, /* 10b */
+    { .mk = {0xe0, 0x4E, 0 }, .brk = { 0xe0, 0xF0, 0x4E, 0 } }, /* 10c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10d */
+    { .mk = {0xe0, 0x66, 0 }, .brk = { 0xe0, 0xF0, 0x66, 0 } }, /* 10e */
+    { .mk = {0xe0, 0x0D, 0 }, .brk = { 0xe0, 0xF0, 0x0D, 0 } }, /* 10f */
+    { .mk = {0xe0, 0x15, 0 }, .brk = { 0xe0, 0xF0, 0x15, 0 } }, /* 110 */
+    { .mk = {0xe0, 0x1D, 0 }, .brk = { 0xe0, 0xF0, 0x1D, 0 } }, /* 111 */
+    { .mk = {0xe0, 0x24, 0 }, .brk = { 0xe0, 0xF0, 0x24, 0 } }, /* 112 */
+    { .mk = {0xe0, 0x2D, 0 }, .brk = { 0xe0, 0xF0, 0x2D, 0 } }, /* 113 */
+    { .mk = {0xe0, 0x2C, 0 }, .brk = { 0xe0, 0xF0, 0x2C, 0 } }, /* 114 */
+    { .mk = {0xe0, 0x35, 0 }, .brk = { 0xe0, 0xF0, 0x35, 0 } }, /* 115 */
+    { .mk = {0xe0, 0x3C, 0 }, .brk = { 0xe0, 0xF0, 0x3C, 0 } }, /* 116 */
+    { .mk = {0xe0, 0x43, 0 }, .brk = { 0xe0, 0xF0, 0x43, 0 } }, /* 117 */
+    { .mk = {0xe0, 0x44, 0 }, .brk = { 0xe0, 0xF0, 0x44, 0 } }, /* 118 */
+    { .mk = {0xe0, 0x4D, 0 }, .brk = { 0xe0, 0xF0, 0x4D, 0 } }, /* 119 */
+    { .mk = {0xe0, 0x54, 0 }, .brk = { 0xe0, 0xF0, 0x54, 0 } }, /* 11a */
+    { .mk = {0xe0, 0x5B, 0 }, .brk = { 0xe0, 0xF0, 0x5B, 0 } }, /* 11b */
+    { .mk = {      0x79, 0 }, .brk = {       0xf0, 0x79, 0 } }, /* 11c */
+    { .mk = {      0x58, 0 }, .brk = {       0xf0, 0x58, 0 } }, /* 11d */
+    { .mk = {0xe0, 0x1C, 0 }, .brk = { 0xe0, 0xF0, 0x1C, 0 } }, /* 11e */
+    { .mk = {0xe0, 0x1B, 0 }, .brk = { 0xe0, 0xF0, 0x1B, 0 } }, /* 11f */
+    { .mk = {0xe0, 0x23, 0 }, .brk = { 0xe0, 0xF0, 0x23, 0 } }, /* 120 */
+    { .mk = {0xe0, 0x2B, 0 }, .brk = { 0xe0, 0xF0, 0x2B, 0 } }, /* 121 */
+    { .mk = {0xe0, 0x34, 0 }, .brk = { 0xe0, 0xF0, 0x34, 0 } }, /* 122 */
+    { .mk = {0xe0, 0x33, 0 }, .brk = { 0xe0, 0xF0, 0x33, 0 } }, /* 123 */
+    { .mk = {0xe0, 0x3B, 0 }, .brk = { 0xe0, 0xF0, 0x3B, 0 } }, /* 124 */
+    { .mk = {0xe0, 0x42, 0 }, .brk = { 0xe0, 0xF0, 0x42, 0 } }, /* 125 */
+    { .mk = {0xe0, 0x4B, 0 }, .brk = { 0xe0, 0xF0, 0x4B, 0 } }, /* 126 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 127 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 128 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 129 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12b */
+    { .mk = {0xe0, 0x1A, 0 }, .brk = { 0xe0, 0xF0, 0x1A, 0 } }, /* 12c */
+    { .mk = {0xe0, 0x22, 0 }, .brk = { 0xe0, 0xF0, 0x22, 0 } }, /* 12d */
+    { .mk = {0xe0, 0x21, 0 }, .brk = { 0xe0, 0xF0, 0x21, 0 } }, /* 12e */
+    { .mk = {0xe0, 0x2A, 0 }, .brk = { 0xe0, 0xF0, 0x2A, 0 } }, /* 12f */
+    { .mk = {0xe0, 0x32, 0 }, .brk = { 0xe0, 0xF0, 0x32, 0 } }, /* 130 */
+    { .mk = {0xe0, 0x31, 0 }, .brk = { 0xe0, 0xF0, 0x31, 0 } }, /* 131 */
+    { .mk = {0xe0, 0x3A, 0 }, .brk = { 0xe0, 0xF0, 0x3A, 0 } }, /* 132 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 133 */
+    { .mk = {0xe0, 0x49, 0 }, .brk = { 0xe0, 0xF0, 0x49, 0 } }, /* 134 */
+    { .mk = {      0x77, 0 }, .brk = {       0xf0, 0x77, 0 } }, /* 135 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 136 */
+    { .mk = {      0x57, 0 }, .brk = {       0xf0, 0x57, 0 } }, /* 137 */
+    { .mk = {      0x39, 0 }, .brk = {       0xf0, 0x39, 0 } }, /* 138 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 139 */
+    { .mk = {0xe0, 0x58, 0 }, .brk = { 0xe0, 0xF0, 0x58, 0 } }, /* 13a */
+    { .mk = {0xe0, 0x05, 0 }, .brk = { 0xe0, 0xF0, 0x05, 0 } }, /* 13b */
+    { .mk = {0xe0, 0x06, 0 }, .brk = { 0xe0, 0xF0, 0x06, 0 } }, /* 13c */
+    { .mk = {0xe0, 0x04, 0 }, .brk = { 0xe0, 0xF0, 0x04, 0 } }, /* 13d */
+    { .mk = {0xe0, 0x0C, 0 }, .brk = { 0xe0, 0xF0, 0x0C, 0 } }, /* 13e */
+    { .mk = {0xe0, 0x03, 0 }, .brk = { 0xe0, 0xF0, 0x03, 0 } }, /* 13f */
+    { .mk = {0xe0, 0x0B, 0 }, .brk = { 0xe0, 0xF0, 0x0B, 0 } }, /* 140 */
+    { .mk = {0xe0, 0x02, 0 }, .brk = { 0xe0, 0xF0, 0x02, 0 } }, /* 141 */
+    { .mk = {0xe0, 0x0A, 0 }, .brk = { 0xe0, 0xF0, 0x0A, 0 } }, /* 142 */
+    { .mk = {0xe0, 0x01, 0 }, .brk = { 0xe0, 0xF0, 0x01, 0 } }, /* 143 */
+    { .mk = {0xe0, 0x09, 0 }, .brk = { 0xe0, 0xF0, 0x09, 0 } }, /* 144 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 145 */
+    { .mk = {0xe0, 0x7E, 0 }, .brk = { 0xe0, 0xF0, 0x7E, 0 } }, /* 146 */
+    { .mk = {      0x6E, 0 }, .brk = {       0xf0, 0x6E, 0 } }, /* 147 */
+    { .mk = {      0x63, 0 }, .brk = {       0xf0, 0x63, 0 } }, /* 148 */
+    { .mk = {      0x6F, 0 }, .brk = {       0xf0, 0x6F, 0 } }, /* 149 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14a */
+    { .mk = {      0x61, 0 }, .brk = {       0xf0, 0x61, 0 } }, /* 14b */
+    { .mk = {0xe0, 0x73, 0 }, .brk = { 0xe0, 0xF0, 0x73, 0 } }, /* 14c */
+    { .mk = {      0x6A, 0 }, .brk = {       0xf0, 0x6A, 0 } }, /* 14d */
+    { .mk = {0xe0, 0x79, 0 }, .brk = { 0xe0, 0xF0, 0x79, 0 } }, /* 14e */
+    { .mk = {      0x65, 0 }, .brk = {       0xf0, 0x65, 0 } }, /* 14f */
+    { .mk = {      0x60, 0 }, .brk = {       0xf0, 0x60, 0 } }, /* 150 */
+    { .mk = {      0x6D, 0 }, .brk = {       0xf0, 0x6D, 0 } }, /* 151 */
+    { .mk = {      0x67, 0 }, .brk = {       0xf0, 0x67, 0 } }, /* 152 */
+    { .mk = {      0x64, 0 }, .brk = {       0xf0, 0x64, 0 } }, /* 153 */
+    { .mk = {      0xd4, 0 }, .brk = {       0xf0, 0xD4, 0 } }, /* 154 */
+    { .mk = {0xe0, 0x60, 0 }, .brk = { 0xe0, 0xF0, 0x60, 0 } }, /* 155 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 156 */
+    { .mk = {0xe0, 0x78, 0 }, .brk = { 0xe0, 0xF0, 0x78, 0 } }, /* 157 */
+    { .mk = {0xe0, 0x07, 0 }, .brk = { 0xe0, 0xF0, 0x07, 0 } }, /* 158 */
+    { .mk = {0xe0, 0x0F, 0 }, .brk = { 0xe0, 0xF0, 0x0F, 0 } }, /* 159 */
+    { .mk = {0xe0, 0x17, 0 }, .brk = { 0xe0, 0xF0, 0x17, 0 } }, /* 15a */
+    { .mk = {      0x8B, 0 }, .brk = {       0xf0, 0x8B, 0 } }, /* 15b */
+    { .mk = {      0x8C, 0 }, .brk = {       0xf0, 0x8C, 0 } }, /* 15c */
+    { .mk = {      0x8D, 0 }, .brk = {       0xf0, 0x8D, 0 } }, /* 15d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15e */
+    { .mk = {      0x7F, 0 }, .brk = {       0xf0, 0x7F, 0 } }, /* 15f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 160 */
+    { .mk = {0xe0, 0x4F, 0 }, .brk = { 0xe0, 0xF0, 0x4F, 0 } }, /* 161 */
+    { .mk = {0xe0, 0x56, 0 }, .brk = { 0xe0, 0xF0, 0x56, 0 } }, /* 162 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 163 */
+    { .mk = {0xe0, 0x08, 0 }, .brk = { 0xe0, 0xF0, 0x08, 0 } }, /* 164 */
+    { .mk = {0xe0, 0x10, 0 }, .brk = { 0xe0, 0xF0, 0x10, 0 } }, /* 165 */
+    { .mk = {0xe0, 0x18, 0 }, .brk = { 0xe0, 0xF0, 0x18, 0 } }, /* 166 */
+    { .mk = {0xe0, 0x20, 0 }, .brk = { 0xe0, 0xF0, 0x20, 0 } }, /* 167 */
+    { .mk = {0xe0, 0x28, 0 }, .brk = { 0xe0, 0xF0, 0x28, 0 } }, /* 168 */
+    { .mk = {0xe0, 0x30, 0 }, .brk = { 0xe0, 0xF0, 0x30, 0 } }, /* 169 */
+    { .mk = {0xe0, 0x38, 0 }, .brk = { 0xe0, 0xF0, 0x38, 0 } }, /* 16a */
+    { .mk = {0xe0, 0x40, 0 }, .brk = { 0xe0, 0xF0, 0x40, 0 } }, /* 16b */
+    { .mk = {0xe0, 0x48, 0 }, .brk = { 0xe0, 0xF0, 0x48, 0 } }, /* 16c */
+    { .mk = {0xe0, 0x50, 0 }, .brk = { 0xe0, 0xF0, 0x50, 0 } }, /* 16d */
+    { .mk = {0xe0, 0x57, 0 }, .brk = { 0xe0, 0xF0, 0x57, 0 } }, /* 16e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16f */
+    { .mk = {0xe0, 0x13, 0 }, .brk = { 0xe0, 0xF0, 0x13, 0 } }, /* 170 */
+    { .mk = {0xe0, 0x19, 0 }, .brk = { 0xe0, 0xF0, 0x19, 0 } }, /* 171 */
+    { .mk = {0xe0, 0x39, 0 }, .brk = { 0xe0, 0xF0, 0x39, 0 } }, /* 172 */
+    { .mk = {0xe0, 0x51, 0 }, .brk = { 0xe0, 0xF0, 0x51, 0 } }, /* 173 */
+    { .mk = {0xe0, 0x53, 0 }, .brk = { 0xe0, 0xF0, 0x53, 0 } }, /* 174 */
+    { .mk = {0xe0, 0x5C, 0 }, .brk = { 0xe0, 0xF0, 0x5C, 0 } }, /* 175 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 176 */
+    { .mk = {0xe0, 0x62, 0 }, .brk = { 0xe0, 0xF0, 0x62, 0 } }, /* 177 */
+    { .mk = {0xe0, 0x63, 0 }, .brk = { 0xe0, 0xF0, 0x63, 0 } }, /* 178 */
+    { .mk = {0xe0, 0x64, 0 }, .brk = { 0xe0, 0xF0, 0x64, 0 } }, /* 179 */
+    { .mk = {0xe0, 0x65, 0 }, .brk = { 0xe0, 0xF0, 0x65, 0 } }, /* 17a */
+    { .mk = {0xe0, 0x67, 0 }, .brk = { 0xe0, 0xF0, 0x67, 0 } }, /* 17b */
+    { .mk = {0xe0, 0x68, 0 }, .brk = { 0xe0, 0xF0, 0x68, 0 } }, /* 17c */
+    { .mk = {0xe0, 0x6A, 0 }, .brk = { 0xe0, 0xF0, 0x6A, 0 } }, /* 17d */
+    { .mk = {0xe0, 0x6D, 0 }, .brk = { 0xe0, 0xF0, 0x6D, 0 } }, /* 17e */
+    { .mk = {0xe0, 0x6E, 0 }, .brk = { 0xe0, 0xF0, 0x6E, 0 } }, /* 17f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 180 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 181 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 182 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 183 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 184 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 185 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 186 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 187 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 188 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 189 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 190 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 191 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 192 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 193 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 194 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 195 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 196 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 197 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 198 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 199 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e0 */
+    { .mk = {0xe0, 0xe1, 0 }, .brk = { 0xe0, 0xF0, 0xE1, 0 } }, /* 1e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ed */
+    { .mk = {0xe0, 0xee, 0 }, .brk = { 0xe0, 0xF0, 0xEE, 0 } }, /* 1ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f0 */
+    { .mk = {0xe0, 0xf1, 0 }, .brk = { 0xe0, 0xF0, 0xF1, 0 } }, /* 1f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fd */
+    { .mk = {0xe0, 0xfe, 0 }, .brk = { 0xe0, 0xF0, 0xFE, 0 } }, /* 1fe */
+    { .mk = {0xe0, 0xff, 0 }, .brk = { 0xe0, 0xF0, 0xFF, 0 } }  /* 1ff */
   // clang-format on
 };
 
+/*  IBM Japan 5576-001, 002 and 003 keyboards have three extra scancode sets; 81h, 82h, 8ah.
+    To implement them, we need take the following into consideration.
+        * Add a UI to switch the type of keyboards and keyboard IDs.
+        * Add modified scancode set 1 and 2 (in these modes, language input keys are used as an alternative key).
+        * Japanese keyboards traditionally use a bit-paired layout. Its key mapping doesn't match with foreign keyboards.
+
+    5576 keyboards kept 101-key compatible scancode sets because PS/55 had to support western (PS/2) versions of operating systems.
+    The default scancode set is 2.
+    In Japanese DOS, the keyboard driver confirms its keyboard ID, and sends a command to switch the scancode set to 8Ah.
+    Japanese OS/2 and Windows use the scancode set 81h or 82h.
+
+    The OADG standard (1991-) and modern Japanese keyboards use the same keyboard ID and scancode set ID as PS/2 keyboards use.
+    Three extra scancode sets are no longer available. Instead, language input keys are available in scancode set 1 and 2.
+    However, their physical key layout is a bit-paired layout.
+    Users have to choose the correct keyboard layout on setup, and the driver needs to remap keys.
+
+    Currently, the key mapping is designed to match with the Japanese layout keyboard.
+
+     [Japanese DOS and keyboard scancode set comparison]
+    |                           | K3.3 | J4.0 | J5.0 | J4.0/V | J5.0/V | OS/2 J1.3 | DOS 5(US)|
+    |---------------------------|:----:|:----:|:----:|:------:|:------:|:---------:|:--------:|
+    | IBM 101 US English        |  n/a |  n/a |  n/a |    2   |    2   |      2    |     2    |
+    | IBM-J 5576-00x (obsolete) |  8Ah |  8Ah |  8Ah |   82h  |   82h  |     81h   |     2    |
+    | OADG (modern Japanese)    |  n/a |  n/a |  n/a |    2   |    2   |      2    |     2    |
+*/
+
+/* Scancode set 81h : Set 01 with language specific keys support used by OS/2 */
+static const scancode scancode_set81[512] = {
+    // clang-format off
+      { .mk = {            0 }, .brk = {                   0 } }, /* 000 */
+      { .mk = {      0x01, 0 }, .brk = {             0x81, 0 } }, /* 001 */
+      { .mk = {      0x02, 0 }, .brk = {             0x82, 0 } }, /* 002 */
+      { .mk = {      0x03, 0 }, .brk = {             0x83, 0 } }, /* 003 */
+      { .mk = {      0x04, 0 }, .brk = {             0x84, 0 } }, /* 004 */
+      { .mk = {      0x05, 0 }, .brk = {             0x85, 0 } }, /* 005 */
+      { .mk = {      0x06, 0 }, .brk = {             0x86, 0 } }, /* 006 */
+      { .mk = {      0x07, 0 }, .brk = {             0x87, 0 } }, /* 007 */
+      { .mk = {      0x08, 0 }, .brk = {             0x88, 0 } }, /* 008 */
+      { .mk = {      0x09, 0 }, .brk = {             0x89, 0 } }, /* 009 */
+      { .mk = {      0x0a, 0 }, .brk = {             0x8a, 0 } }, /* 00a */
+      { .mk = {      0x0b, 0 }, .brk = {             0x8b, 0 } }, /* 00b */
+      { .mk = {      0x0c, 0 }, .brk = {             0x8c, 0 } }, /* 00c */
+      { .mk = {      0x0d, 0 }, .brk = {             0x8d, 0 } }, /* 00d */
+      { .mk = {      0x0e, 0 }, .brk = {             0x8e, 0 } }, /* 00e */
+      { .mk = {      0x0f, 0 }, .brk = {             0x8f, 0 } }, /* 00f */
+      { .mk = {      0x10, 0 }, .brk = {             0x90, 0 } }, /* 010 */
+      { .mk = {      0x11, 0 }, .brk = {             0x91, 0 } }, /* 011 */
+      { .mk = {      0x12, 0 }, .brk = {             0x92, 0 } }, /* 012 */
+      { .mk = {      0x13, 0 }, .brk = {             0x93, 0 } }, /* 013 */
+      { .mk = {      0x14, 0 }, .brk = {             0x94, 0 } }, /* 014 */
+      { .mk = {      0x15, 0 }, .brk = {             0x95, 0 } }, /* 015 */
+      { .mk = {      0x16, 0 }, .brk = {             0x96, 0 } }, /* 016 */
+      { .mk = {      0x17, 0 }, .brk = {             0x97, 0 } }, /* 017 */
+      { .mk = {      0x18, 0 }, .brk = {             0x98, 0 } }, /* 018 */
+      { .mk = {      0x19, 0 }, .brk = {             0x99, 0 } }, /* 019 */
+      { .mk = {      0x1a, 0 }, .brk = {             0x9a, 0 } }, /* 01a */
+      { .mk = {      0x1b, 0 }, .brk = {             0x9b, 0 } }, /* 01b */
+      { .mk = {      0x1c, 0 }, .brk = {             0x9c, 0 } }, /* 01c */
+      { .mk = {      0x1d, 0 }, .brk = {             0x9d, 0 } }, /* 01d */
+      { .mk = {      0x1e, 0 }, .brk = {             0x9e, 0 } }, /* 01e */
+      { .mk = {      0x1f, 0 }, .brk = {             0x9f, 0 } }, /* 01f */
+      { .mk = {      0x20, 0 }, .brk = {             0xa0, 0 } }, /* 020 */
+      { .mk = {      0x21, 0 }, .brk = {             0xa1, 0 } }, /* 021 */
+      { .mk = {      0x22, 0 }, .brk = {             0xa2, 0 } }, /* 022 */
+      { .mk = {      0x23, 0 }, .brk = {             0xa3, 0 } }, /* 023 */
+      { .mk = {      0x24, 0 }, .brk = {             0xa4, 0 } }, /* 024 */
+      { .mk = {      0x25, 0 }, .brk = {             0xa5, 0 } }, /* 025 */
+      { .mk = {      0x26, 0 }, .brk = {             0xa6, 0 } }, /* 026 */
+      { .mk = {      0x27, 0 }, .brk = {             0xa7, 0 } }, /* 027 */
+      { .mk = {      0x28, 0 }, .brk = {             0xa8, 0 } }, /* 028* */
+      { .mk = {      0x77, 0 }, .brk = {             0xf7, 0 } }, /* 029 0x45 Hankaku, Zenkaku */
+      { .mk = {      0x2a, 0 }, .brk = {             0xaa, 0 } }, /* 02a */
+      { .mk = {      0x1b, 0 }, .brk = {             0x9b, 0 } }, /* 02b 0x17 Mu */
+      { .mk = {      0x2c, 0 }, .brk = {             0xac, 0 } }, /* 02c */
+      { .mk = {      0x2d, 0 }, .brk = {             0xad, 0 } }, /* 02d */
+      { .mk = {      0x2e, 0 }, .brk = {             0xae, 0 } }, /* 02e */
+      { .mk = {      0x2f, 0 }, .brk = {             0xaf, 0 } }, /* 02f */
+      { .mk = {      0x30, 0 }, .brk = {             0xb0, 0 } }, /* 030 */
+      { .mk = {      0x31, 0 }, .brk = {             0xb1, 0 } }, /* 031 */
+      { .mk = {      0x32, 0 }, .brk = {             0xb2, 0 } }, /* 032 */
+      { .mk = {      0x33, 0 }, .brk = {             0xb3, 0 } }, /* 033 */
+      { .mk = {      0x34, 0 }, .brk = {             0xb4, 0 } }, /* 034 */
+      { .mk = {      0x35, 0 }, .brk = {             0xb5, 0 } }, /* 035 */
+      { .mk = {      0x36, 0 }, .brk = {             0xb6, 0 } }, /* 036 */
+      { .mk = {      0x37, 0 }, .brk = {             0xb7, 0 } }, /* 037 * (asterisk) */
+      { .mk = {      0x70, 0 }, .brk = {             0xf0, 0 } }, /* 038 0x3A LALT = Kanji */
+      { .mk = {      0x39, 0 }, .brk = {             0xb9, 0 } }, /* 039 */
+      { .mk = {      0x3a, 0 }, .brk = {             0xba, 0 } }, /* 03a */
+      { .mk = {      0x3b, 0 }, .brk = {             0xbb, 0 } }, /* 03b */
+      { .mk = {      0x3c, 0 }, .brk = {             0xbc, 0 } }, /* 03c */
+      { .mk = {      0x3d, 0 }, .brk = {             0xbd, 0 } }, /* 03d */
+      { .mk = {      0x3e, 0 }, .brk = {             0xbe, 0 } }, /* 03e */
+      { .mk = {      0x3f, 0 }, .brk = {             0xbf, 0 } }, /* 03f */
+      { .mk = {      0x40, 0 }, .brk = {             0xc0, 0 } }, /* 040 */
+      { .mk = {      0x41, 0 }, .brk = {             0xc1, 0 } }, /* 041 */
+      { .mk = {      0x42, 0 }, .brk = {             0xc2, 0 } }, /* 042 */
+      { .mk = {      0x43, 0 }, .brk = {             0xc3, 0 } }, /* 043 */
+      { .mk = {      0x44, 0 }, .brk = {             0xc4, 0 } }, /* 044 */
+      { .mk = {      0x45, 0 }, .brk = {             0xc5, 0 } }, /* 045 NUMLOCKCLEAR -> Shift + SCRLOCK :TODO */
+      { .mk = {      0x46, 0 }, .brk = {             0xc6, 0 } }, /* 046 0x75 SCROLLLOCK */
+      { .mk = {      0x47, 0 }, .brk = {             0xc7, 0 } }, /* 047 */
+      { .mk = {      0x48, 0 }, .brk = {             0xc8, 0 } }, /* 048 */
+      { .mk = {      0x49, 0 }, .brk = {             0xc9, 0 } }, /* 049 */
+      { .mk = {      0x4a, 0 }, .brk = {             0xca, 0 } }, /* 04a */
+      { .mk = {      0x4b, 0 }, .brk = {             0xcb, 0 } }, /* 04b */
+      { .mk = {      0x4c, 0 }, .brk = {             0xcc, 0 } }, /* 04c */
+      { .mk = {      0x4d, 0 }, .brk = {             0xcd, 0 } }, /* 04d */
+      { .mk = {      0x4e, 0 }, .brk = {             0xce, 0 } }, /* 04e */
+      { .mk = {      0x4f, 0 }, .brk = {             0xcf, 0 } }, /* 04f */
+      { .mk = {      0x50, 0 }, .brk = {             0xd0, 0 } }, /* 050 */
+      { .mk = {      0x51, 0 }, .brk = {             0xd1, 0 } }, /* 051 */
+      { .mk = {      0x52, 0 }, .brk = {             0xd2, 0 } }, /* 052 */
+      { .mk = {      0x53, 0 }, .brk = {             0xd3, 0 } }, /* 053 */
+      { .mk = {      0x54, 0 }, .brk = {             0xd4, 0 } }, /* 054 */
+      { .mk = {      0x55, 0 }, .brk = {             0xd5, 0 } }, /* 055 */
+      { .mk = {      0x56, 0 }, .brk = {             0xd6, 0 } }, /* 056 */
+      { .mk = {      0x57, 0 }, .brk = {             0xd7, 0 } }, /* 057 F11 */
+      { .mk = {      0x58, 0 }, .brk = {             0xd8, 0 } }, /* 058 F12 */
+      { .mk = {      0x59, 0 }, .brk = {             0xd9, 0 } }, /* 059 */
+      { .mk = {      0x5a, 0 }, .brk = {             0xda, 0 } }, /* 05a */
+      { .mk = {      0x5b, 0 }, .brk = {             0xdb, 0 } }, /* 05b */
+      { .mk = {      0x5c, 0 }, .brk = {             0xdc, 0 } }, /* 05c */
+      { .mk = {      0x5d, 0 }, .brk = {             0xdd, 0 } }, /* 05d */
+      { .mk = {      0x5e, 0 }, .brk = {             0xde, 0 } }, /* 05e */
+      { .mk = {      0x5f, 0 }, .brk = {             0xdf, 0 } }, /* 05f */
+      { .mk = {      0x60, 0 }, .brk = {             0xe0, 0 } }, /* 060 */
+      { .mk = {      0x61, 0 }, .brk = {             0xe1, 0 } }, /* 061 */
+      { .mk = {      0x62, 0 }, .brk = {             0xe2, 0 } }, /* 062 */
+      { .mk = {      0x63, 0 }, .brk = {             0xe3, 0 } }, /* 063 */
+      { .mk = {      0x64, 0 }, .brk = {             0xe4, 0 } }, /* 064 */
+      { .mk = {      0x65, 0 }, .brk = {             0xe5, 0 } }, /* 065 */
+      { .mk = {      0x66, 0 }, .brk = {             0xe6, 0 } }, /* 066 */
+      { .mk = {      0x67, 0 }, .brk = {             0xe7, 0 } }, /* 067 */
+      { .mk = {      0x68, 0 }, .brk = {             0xe8, 0 } }, /* 068 */
+      { .mk = {      0x69, 0 }, .brk = {             0xe9, 0 } }, /* 069 */
+      { .mk = {      0x6a, 0 }, .brk = {             0xea, 0 } }, /* 06a */
+      { .mk = {      0x6b, 0 }, .brk = {             0xeb, 0 } }, /* 06b */
+      { .mk = {      0x6c, 0 }, .brk = {             0xec, 0 } }, /* 06c */
+      { .mk = {      0x6d, 0 }, .brk = {             0xed, 0 } }, /* 06d */
+      { .mk = {      0x6e, 0 }, .brk = {             0xee, 0 } }, /* 06e */
+      { .mk = {      0x6f, 0 }, .brk = {             0xef, 0 } }, /* 06f */
+      { .mk = {0xe0, 0x38, 0 }, .brk = { 0xe0,       0xb8, 0 } }, /* 070 0x36 Kana */
+      { .mk = {      0x71, 0 }, .brk = {             0xf1, 0 } }, /* 071 */
+      { .mk = {      0x72, 0 }, .brk = {             0xf2, 0 } }, /* 072 */
+      { .mk = {      0x73, 0 }, .brk = {             0xf3, 0 } }, /* 073 0x0b Ro, Underline */
+      { .mk = {      0x74, 0 }, .brk = {             0xf4, 0 } }, /* 074 */
+      { .mk = {      0x75, 0 }, .brk = {             0xf5, 0 } }, /* 075 */
+      { .mk = {      0x76, 0 }, .brk = {             0xf6, 0 } }, /* 076 */
+      { .mk = {      0x77, 0 }, .brk = {             0xf7, 0 } }, /* 077 */
+      { .mk = {      0x78, 0 }, .brk = {             0xf8, 0 } }, /* 078 */
+      { .mk = {      0x79, 0 }, .brk = {             0xf9, 0 } }, /* 079 0x35 Henkan */
+      { .mk = {      0x7a, 0 }, .brk = {             0xfa, 0 } }, /* 07a */
+      { .mk = {      0x7b, 0 }, .brk = {             0xfb, 0 } }, /* 07b 0x33 Muhenkan */
+      { .mk = {      0x7c, 0 }, .brk = {             0xfc, 0 } }, /* 07c */
+      { .mk = {      0x2b, 0 }, .brk = {             0xab, 0 } }, /* 07d 0x30 Yen, Vertical line */
+      { .mk = {      0x7e, 0 }, .brk = {             0xfe, 0 } }, /* 07e */
+      { .mk = {      0x7f, 0 }, .brk = {             0xff, 0 } }, /* 07f */
+      { .mk = {      0x80, 0 }, .brk = {                   0 } }, /* 080 */
+      { .mk = {      0x81, 0 }, .brk = {                   0 } }, /* 081 */
+      { .mk = {      0x82, 0 }, .brk = {                   0 } }, /* 082 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 083 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 084 */
+      { .mk = {      0x85, 0 }, .brk = {                   0 } }, /* 085 */
+      { .mk = {      0x86, 0 }, .brk = {                   0 } }, /* 086 */
+      { .mk = {      0x87, 0 }, .brk = {                   0 } }, /* 087 */
+      { .mk = {      0x88, 0 }, .brk = {                   0 } }, /* 088 */
+      { .mk = {      0x89, 0 }, .brk = {                   0 } }, /* 089 */
+      { .mk = {      0x8a, 0 }, .brk = {                   0 } }, /* 08a */
+      { .mk = {      0x8b, 0 }, .brk = {                   0 } }, /* 08b */
+      { .mk = {      0x8c, 0 }, .brk = {                   0 } }, /* 08c */
+      { .mk = {      0x8d, 0 }, .brk = {                   0 } }, /* 08d */
+      { .mk = {      0x8e, 0 }, .brk = {                   0 } }, /* 08e */
+      { .mk = {      0x8f, 0 }, .brk = {                   0 } }, /* 08f */
+      { .mk = {      0x90, 0 }, .brk = {                   0 } }, /* 090 */
+      { .mk = {      0x91, 0 }, .brk = {                   0 } }, /* 091 */
+      { .mk = {      0x92, 0 }, .brk = {                   0 } }, /* 092 */
+      { .mk = {      0x93, 0 }, .brk = {                   0 } }, /* 093 */
+      { .mk = {      0x94, 0 }, .brk = {                   0 } }, /* 094 */
+      { .mk = {      0x95, 0 }, .brk = {                   0 } }, /* 095 */
+      { .mk = {      0x96, 0 }, .brk = {                   0 } }, /* 096 */
+      { .mk = {      0x97, 0 }, .brk = {                   0 } }, /* 097 */
+      { .mk = {      0x98, 0 }, .brk = {                   0 } }, /* 098 */
+      { .mk = {      0x99, 0 }, .brk = {                   0 } }, /* 099 */
+      { .mk = {      0x9a, 0 }, .brk = {                   0 } }, /* 09a */
+      { .mk = {      0x9b, 0 }, .brk = {                   0 } }, /* 09b */
+      { .mk = {      0x9c, 0 }, .brk = {                   0 } }, /* 09c */
+      { .mk = {      0x9d, 0 }, .brk = {                   0 } }, /* 09d */
+      { .mk = {      0x9e, 0 }, .brk = {                   0 } }, /* 09e */
+      { .mk = {      0x9f, 0 }, .brk = {                   0 } }, /* 09f */
+      { .mk = {      0xa0, 0 }, .brk = {                   0 } }, /* 0a0 */
+      { .mk = {      0xa1, 0 }, .brk = {                   0 } }, /* 0a1 */
+      { .mk = {      0xa2, 0 }, .brk = {                   0 } }, /* 0a2 */
+      { .mk = {      0xa3, 0 }, .brk = {                   0 } }, /* 0a3 */
+      { .mk = {      0xa4, 0 }, .brk = {                   0 } }, /* 0a4 */
+      { .mk = {      0xa5, 0 }, .brk = {                   0 } }, /* 0a5 */
+      { .mk = {      0xa6, 0 }, .brk = {                   0 } }, /* 0a6 */
+      { .mk = {      0xa7, 0 }, .brk = {                   0 } }, /* 0a7 */
+      { .mk = {      0xa8, 0 }, .brk = {                   0 } }, /* 0a8 */
+      { .mk = {      0xa9, 0 }, .brk = {                   0 } }, /* 0a9 */
+      { .mk = {      0xaa, 0 }, .brk = {                   0 } }, /* 0aa */
+      { .mk = {      0xab, 0 }, .brk = {                   0 } }, /* 0ab */
+      { .mk = {      0xac, 0 }, .brk = {                   0 } }, /* 0ac */
+      { .mk = {      0xad, 0 }, .brk = {                   0 } }, /* 0ad */
+      { .mk = {      0xae, 0 }, .brk = {                   0 } }, /* 0ae */
+      { .mk = {      0xaf, 0 }, .brk = {                   0 } }, /* 0af */
+      { .mk = {      0xb0, 0 }, .brk = {                   0 } }, /* 0b0 */
+      { .mk = {      0xb1, 0 }, .brk = {                   0 } }, /* 0b1 */
+      { .mk = {      0xb2, 0 }, .brk = {                   0 } }, /* 0b2 */
+      { .mk = {      0xb3, 0 }, .brk = {                   0 } }, /* 0b3 */
+      { .mk = {      0xb4, 0 }, .brk = {                   0 } }, /* 0b4 */
+      { .mk = {      0xb5, 0 }, .brk = {                   0 } }, /* 0b5 */
+      { .mk = {      0xb6, 0 }, .brk = {                   0 } }, /* 0b6 */
+      { .mk = {      0xb7, 0 }, .brk = {                   0 } }, /* 0b7 */
+      { .mk = {      0xb8, 0 }, .brk = {                   0 } }, /* 0b8 */
+      { .mk = {      0xb9, 0 }, .brk = {                   0 } }, /* 0b9 */
+      { .mk = {      0xba, 0 }, .brk = {                   0 } }, /* 0ba */
+      { .mk = {      0xbb, 0 }, .brk = {                   0 } }, /* 0bb */
+      { .mk = {      0xbc, 0 }, .brk = {                   0 } }, /* 0bc */
+      { .mk = {      0xbd, 0 }, .brk = {                   0 } }, /* 0bd */
+      { .mk = {      0xbe, 0 }, .brk = {                   0 } }, /* 0be */
+      { .mk = {      0xbf, 0 }, .brk = {                   0 } }, /* 0bf */
+      { .mk = {      0xc0, 0 }, .brk = {                   0 } }, /* 0c0 */
+      { .mk = {      0xc1, 0 }, .brk = {                   0 } }, /* 0c1 */
+      { .mk = {      0xc2, 0 }, .brk = {                   0 } }, /* 0c2 */
+      { .mk = {      0xc3, 0 }, .brk = {                   0 } }, /* 0c3 */
+      { .mk = {      0xc4, 0 }, .brk = {                   0 } }, /* 0c4 */
+      { .mk = {      0xc5, 0 }, .brk = {                   0 } }, /* 0c5 */
+      { .mk = {      0xc6, 0 }, .brk = {                   0 } }, /* 0c6 */
+      { .mk = {      0xc7, 0 }, .brk = {                   0 } }, /* 0c7 */
+      { .mk = {      0xc8, 0 }, .brk = {                   0 } }, /* 0c8 */
+      { .mk = {      0xc9, 0 }, .brk = {                   0 } }, /* 0c9 */
+      { .mk = {      0xca, 0 }, .brk = {                   0 } }, /* 0ca */
+      { .mk = {      0xcb, 0 }, .brk = {                   0 } }, /* 0cb */
+      { .mk = {      0xcc, 0 }, .brk = {                   0 } }, /* 0cc */
+      { .mk = {      0xcd, 0 }, .brk = {                   0 } }, /* 0cd */
+      { .mk = {      0xce, 0 }, .brk = {                   0 } }, /* 0ce */
+      { .mk = {      0xcf, 0 }, .brk = {                   0 } }, /* 0cf */
+      { .mk = {      0xd0, 0 }, .brk = {                   0 } }, /* 0d0 */
+      { .mk = {      0xd1, 0 }, .brk = {                   0 } }, /* 0d1 */
+      { .mk = {      0xd2, 0 }, .brk = {                   0 } }, /* 0d2 */
+      { .mk = {      0xd3, 0 }, .brk = {                   0 } }, /* 0d3 */
+      { .mk = {      0xd4, 0 }, .brk = {                   0 } }, /* 0d4 */
+      { .mk = {      0xd5, 0 }, .brk = {                   0 } }, /* 0d5 */
+      { .mk = {      0xd6, 0 }, .brk = {                   0 } }, /* 0d6 */
+      { .mk = {      0xd7, 0 }, .brk = {                   0 } }, /* 0d7 */
+      { .mk = {      0xd8, 0 }, .brk = {                   0 } }, /* 0d8 */
+      { .mk = {      0xd9, 0 }, .brk = {                   0 } }, /* 0d9 */
+      { .mk = {      0xda, 0 }, .brk = {                   0 } }, /* 0da */
+      { .mk = {      0xdb, 0 }, .brk = {                   0 } }, /* 0db */
+      { .mk = {      0xdc, 0 }, .brk = {                   0 } }, /* 0dc */
+      { .mk = {      0xdd, 0 }, .brk = {                   0 } }, /* 0dd */
+      { .mk = {      0xde, 0 }, .brk = {                   0 } }, /* 0de */
+      { .mk = {      0xdf, 0 }, .brk = {                   0 } }, /* 0df */
+      { .mk = {      0xe0, 0 }, .brk = {                   0 } }, /* 0e0 */
+      { .mk = {      0xe1, 0 }, .brk = {                   0 } }, /* 0e1 */
+      { .mk = {      0xe2, 0 }, .brk = {                   0 } }, /* 0e2 */
+      { .mk = {      0xe3, 0 }, .brk = {                   0 } }, /* 0e3 */
+      { .mk = {      0xe4, 0 }, .brk = {                   0 } }, /* 0e4 */
+      { .mk = {      0xe5, 0 }, .brk = {                   0 } }, /* 0e5 */
+      { .mk = {      0xe6, 0 }, .brk = {                   0 } }, /* 0e6 */
+      { .mk = {      0xe7, 0 }, .brk = {                   0 } }, /* 0e7 */
+      { .mk = {      0xe8, 0 }, .brk = {                   0 } }, /* 0e8 */
+      { .mk = {      0xe9, 0 }, .brk = {                   0 } }, /* 0e9 */
+      { .mk = {      0xea, 0 }, .brk = {                   0 } }, /* 0ea */
+      { .mk = {      0xeb, 0 }, .brk = {                   0 } }, /* 0eb */
+      { .mk = {      0xec, 0 }, .brk = {                   0 } }, /* 0ec */
+      { .mk = {      0xed, 0 }, .brk = {                   0 } }, /* 0ed */
+      { .mk = {      0xee, 0 }, .brk = {                   0 } }, /* 0ee */
+      { .mk = {      0xef, 0 }, .brk = {                   0 } }, /* 0ef */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 0f0 */
+      { .mk = {      0xf1, 0 }, .brk = {                   0 } }, /* 0f1 */
+      { .mk = {      0xf2, 0 }, .brk = {                   0 } }, /* 0f2 */
+      { .mk = {      0xf3, 0 }, .brk = {                   0 } }, /* 0f3 */
+      { .mk = {      0xf4, 0 }, .brk = {                   0 } }, /* 0f4 */
+      { .mk = {      0xf5, 0 }, .brk = {                   0 } }, /* 0f5 */
+      { .mk = {      0xf6, 0 }, .brk = {                   0 } }, /* 0f6 */
+      { .mk = {      0xf7, 0 }, .brk = {                   0 } }, /* 0f7 */
+      { .mk = {      0xf8, 0 }, .brk = {                   0 } }, /* 0f8 */
+      { .mk = {      0xf9, 0 }, .brk = {                   0 } }, /* 0f9 */
+      { .mk = {      0xfa, 0 }, .brk = {                   0 } }, /* 0fa */
+      { .mk = {      0xfb, 0 }, .brk = {                   0 } }, /* 0fb */
+      { .mk = {      0xfc, 0 }, .brk = {                   0 } }, /* 0fc */
+      { .mk = {      0xfd, 0 }, .brk = {                   0 } }, /* 0fd */
+      { .mk = {      0xfe, 0 }, .brk = {                   0 } }, /* 0fe */
+      { .mk = {      0xff, 0 }, .brk = {                   0 } }, /* 0ff */
+      { .mk = {0xe1, 0x1d, 0 }, .brk = { 0xe1,       0x9d, 0 } }, /* 100 */
+      { .mk = {0xe0, 0x01, 0 }, .brk = { 0xe0,       0x81, 0 } }, /* 101 */
+      { .mk = {0xe0, 0x02, 0 }, .brk = { 0xe0,       0x82, 0 } }, /* 102 */
+      { .mk = {0xe0, 0x03, 0 }, .brk = { 0xe0,       0x83, 0 } }, /* 103 */
+      { .mk = {0xe0, 0x04, 0 }, .brk = { 0xe0,       0x84, 0 } }, /* 104 */
+      { .mk = {0xe0, 0x05, 0 }, .brk = { 0xe0,       0x85, 0 } }, /* 105 */
+      { .mk = {0xe0, 0x06, 0 }, .brk = { 0xe0,       0x86, 0 } }, /* 106 */
+      { .mk = {0xe0, 0x07, 0 }, .brk = { 0xe0,       0x87, 0 } }, /* 107 */
+      { .mk = {0xe0, 0x08, 0 }, .brk = { 0xe0,       0x88, 0 } }, /* 108 */
+      { .mk = {0xe0, 0x09, 0 }, .brk = { 0xe0,       0x89, 0 } }, /* 109 */
+      { .mk = {0xe0, 0x0a, 0 }, .brk = { 0xe0,       0x8a, 0 } }, /* 10a */
+      { .mk = {0xe0, 0x0b, 0 }, .brk = { 0xe0,       0x8b, 0 } }, /* 10b */
+      { .mk = {0xe0, 0x0c, 0 }, .brk = { 0xe0,       0x8c, 0 } }, /* 10c */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 10d */
+      { .mk = {0xe0, 0x0e, 0 }, .brk = { 0xe0,       0x8e, 0 } }, /* 10e */
+      { .mk = {0xe0, 0x0f, 0 }, .brk = { 0xe0,       0x8f, 0 } }, /* 10f */
+      { .mk = {0xe0, 0x10, 0 }, .brk = { 0xe0,       0x90, 0 } }, /* 110 */
+      { .mk = {0xe0, 0x11, 0 }, .brk = { 0xe0,       0x91, 0 } }, /* 112 */
+      { .mk = {0xe0, 0x12, 0 }, .brk = { 0xe0,       0x92, 0 } }, /* 113 */
+      { .mk = {0xe0, 0x13, 0 }, .brk = { 0xe0,       0x93, 0 } }, /* 113 */
+      { .mk = {0xe0, 0x14, 0 }, .brk = { 0xe0,       0x94, 0 } }, /* 114 */
+      { .mk = {0xe0, 0x15, 0 }, .brk = { 0xe0,       0x95, 0 } }, /* 115 */
+      { .mk = {0xe0, 0x16, 0 }, .brk = { 0xe0,       0x96, 0 } }, /* 116 */
+      { .mk = {0xe0, 0x17, 0 }, .brk = { 0xe0,       0x97, 0 } }, /* 117 */
+      { .mk = {0xe0, 0x18, 0 }, .brk = { 0xe0,       0x98, 0 } }, /* 118 */
+      { .mk = {0xe0, 0x19, 0 }, .brk = { 0xe0,       0x99, 0 } }, /* 119 */
+      { .mk = {0xe0, 0x1a, 0 }, .brk = { 0xe0,       0x9a, 0 } }, /* 11a */
+      { .mk = {0xe0, 0x1b, 0 }, .brk = { 0xe0,       0x9b, 0 } }, /* 11b */
+      { .mk = {0xe0, 0x1c, 0 }, .brk = { 0xe0,       0x9c, 0 } }, /* 11c */
+      { .mk = {0xe0, 0x1d, 0 }, .brk = { 0xe0,       0x9d, 0 } }, /* 11d */
+      { .mk = {0xe0, 0x1e, 0 }, .brk = { 0xe0,       0x9e, 0 } }, /* 11e */
+      { .mk = {0xe0, 0x1f, 0 }, .brk = { 0xe0,       0x9f, 0 } }, /* 11f */
+      { .mk = {0xe0, 0x20, 0 }, .brk = { 0xe0,       0xa0, 0 } }, /* 120 */
+      { .mk = {0xe0, 0x21, 0 }, .brk = { 0xe0,       0xa1, 0 } }, /* 121 */
+      { .mk = {0xe0, 0x22, 0 }, .brk = { 0xe0,       0xa2, 0 } }, /* 122 */
+      { .mk = {0xe0, 0x23, 0 }, .brk = { 0xe0,       0xa3, 0 } }, /* 123 */
+      { .mk = {0xe0, 0x24, 0 }, .brk = { 0xe0,       0xa4, 0 } }, /* 124 */
+      { .mk = {0xe0, 0x25, 0 }, .brk = { 0xe0,       0xa5, 0 } }, /* 125 */
+      { .mk = {0xe0, 0x26, 0 }, .brk = { 0xe0,       0xa6, 0 } }, /* 126 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 127 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 128 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 129 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 12a */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 12b */
+      { .mk = {0xe0, 0x2c, 0 }, .brk = { 0xe0,       0xac, 0 } }, /* 12c */
+      { .mk = {0xe0, 0x2d, 0 }, .brk = { 0xe0,       0xad, 0 } }, /* 12d */
+      { .mk = {0xe0, 0x2e, 0 }, .brk = { 0xe0,       0xae, 0 } }, /* 12e */
+      { .mk = {0xe0, 0x2f, 0 }, .brk = { 0xe0,       0xaf, 0 } }, /* 12f */
+      { .mk = {0xe0, 0x30, 0 }, .brk = { 0xe0,       0xb0, 0 } }, /* 130 */
+      { .mk = {0xe0, 0x31, 0 }, .brk = { 0xe0,       0xb1, 0 } }, /* 131 */
+      { .mk = {0xe0, 0x32, 0 }, .brk = { 0xe0,       0xb2, 0 } }, /* 132 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 133 */
+      { .mk = {0xe0, 0x34, 0 }, .brk = { 0xe0,       0xb4, 0 } }, /* 134 */
+      { .mk = {0xe0, 0x35, 0 }, .brk = { 0xe0,       0xb5, 0 } }, /* 135 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 136 */
+      { .mk = {0xe0, 0x37, 0 }, .brk = { 0xe0,       0xb7, 0 } }, /* 137 */
+      { .mk = {      0x38, 0 }, .brk = {             0xb8, 0 } }, /* 138* 0x31 R-Alt */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 139 */
+      { .mk = {0xe0, 0x3a, 0 }, .brk = { 0xe0,       0xba, 0 } }, /* 13a */
+      { .mk = {0xe0, 0x3b, 0 }, .brk = { 0xe0,       0xbb, 0 } }, /* 13b */
+      { .mk = {0xe0, 0x3c, 0 }, .brk = { 0xe0,       0xbc, 0 } }, /* 13c */
+      { .mk = {0xe0, 0x3d, 0 }, .brk = { 0xe0,       0xbd, 0 } }, /* 13d */
+      { .mk = {0xe0, 0x3e, 0 }, .brk = { 0xe0,       0xbe, 0 } }, /* 13e */
+      { .mk = {0xe0, 0x3f, 0 }, .brk = { 0xe0,       0xbf, 0 } }, /* 13f */
+      { .mk = {0xe0, 0x40, 0 }, .brk = { 0xe0,       0xc0, 0 } }, /* 140 */
+      { .mk = {0xe0, 0x41, 0 }, .brk = { 0xe0,       0xc1, 0 } }, /* 141 */
+      { .mk = {0xe0, 0x42, 0 }, .brk = { 0xe0,       0xc2, 0 } }, /* 142 */
+      { .mk = {0xe0, 0x43, 0 }, .brk = { 0xe0,       0xc3, 0 } }, /* 143 */
+      { .mk = {0xe0, 0x44, 0 }, .brk = { 0xe0,       0xc4, 0 } }, /* 144 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 145 */
+      { .mk = {0xe0, 0x46, 0 }, .brk = { 0xe0,       0xc6, 0 } }, /* 146 */
+      { .mk = {0xe0, 0x47, 0 }, .brk = { 0xe0,       0xc7, 0 } }, /* 147 */
+      { .mk = {0xe0, 0x48, 0 }, .brk = { 0xe0,       0xc8, 0 } }, /* 148 */
+      { .mk = {0xe0, 0x49, 0 }, .brk = { 0xe0,       0xc9, 0 } }, /* 149 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 14a */
+      { .mk = {0xe0, 0x4b, 0 }, .brk = { 0xe0,       0xcb, 0 } }, /* 14b */
+      { .mk = {0xe0, 0x4c, 0 }, .brk = { 0xe0,       0xcc, 0 } }, /* 14c */
+      { .mk = {0xe0, 0x4d, 0 }, .brk = { 0xe0,       0xcd, 0 } }, /* 14d */
+      { .mk = {0xe0, 0x4e, 0 }, .brk = { 0xe0,       0xce, 0 } }, /* 14e */
+      { .mk = {0xe0, 0x4f, 0 }, .brk = { 0xe0,       0xcf, 0 } }, /* 14f */
+      { .mk = {0xe0, 0x50, 0 }, .brk = { 0xe0,       0xd0, 0 } }, /* 150 */
+      { .mk = {0xe0, 0x51, 0 }, .brk = { 0xe0,       0xd1, 0 } }, /* 151 */
+      { .mk = {0xe0, 0x52, 0 }, .brk = { 0xe0,       0xd2, 0 } }, /* 152 */
+      { .mk = {0xe0, 0x53, 0 }, .brk = { 0xe0,       0xd3, 0 } }, /* 153 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 154 */
+      { .mk = {0xe0, 0x55, 0 }, .brk = { 0xe0,       0xd5, 0 } }, /* 155 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 156 */
+      { .mk = {0xe0, 0x57, 0 }, .brk = { 0xe0,       0xd7, 0 } }, /* 157 */
+      { .mk = {0xe0, 0x58, 0 }, .brk = { 0xe0,       0xd8, 0 } }, /* 158 */
+      { .mk = {0xe0, 0x59, 0 }, .brk = { 0xe0,       0xd9, 0 } }, /* 159 */
+      { .mk = {0xe0, 0x5a, 0 }, .brk = { 0xe0,       0xaa, 0 } }, /* 15a */
+      { .mk = {      0x7b, 0 }, .brk = {             0xfb, 0 } }, /* 15b 0x33 LGUI->Muhenkan (in emulator only) */
+      { .mk = {      0x79, 0 }, .brk = {             0xf9, 0 } }, /* 15c 0x35 RGUI->Henkan (in emulator only) */
+      { .mk = {0xe0, 0x38, 0 }, .brk = { 0xe0,       0xb8, 0 } }, /* 15d 0x36 APPLICATION->Kana (in emulator only) */
+      { .mk = {0xe0, 0x5e, 0 }, .brk = { 0xe0,       0xee, 0 } }, /* 15e */
+      { .mk = {0xe0, 0x5f, 0 }, .brk = { 0xe0,       0xdf, 0 } }, /* 15f */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 160 */
+      { .mk = {0xe0, 0x61, 0 }, .brk = { 0xe0,       0xe1, 0 } }, /* 161 */
+      { .mk = {0xe0, 0x62, 0 }, .brk = { 0xe0,       0xe2, 0 } }, /* 162 */
+      { .mk = {0xe0, 0x63, 0 }, .brk = { 0xe0,       0xe3, 0 } }, /* 163 */
+      { .mk = {0xe0, 0x64, 0 }, .brk = { 0xe0,       0xe4, 0 } }, /* 164 */
+      { .mk = {0xe0, 0x65, 0 }, .brk = { 0xe0,       0xe5, 0 } }, /* 165 */
+      { .mk = {0xe0, 0x66, 0 }, .brk = { 0xe0,       0xe6, 0 } }, /* 166 */
+      { .mk = {0xe0, 0x67, 0 }, .brk = { 0xe0,       0xe7, 0 } }, /* 167 */
+      { .mk = {0xe0, 0x68, 0 }, .brk = { 0xe0,       0xe8, 0 } }, /* 168 */
+      { .mk = {0xe0, 0x69, 0 }, .brk = { 0xe0,       0xe9, 0 } }, /* 169 */
+      { .mk = {0xe0, 0x6a, 0 }, .brk = { 0xe0,       0xea, 0 } }, /* 16a */
+      { .mk = {0xe0, 0x6b, 0 }, .brk = { 0xe0,       0xeb, 0 } }, /* 16b */
+      { .mk = {0xe0, 0x6c, 0 }, .brk = { 0xe0,       0xec, 0 } }, /* 16c */
+      { .mk = {0xe0, 0x6d, 0 }, .brk = { 0xe0,       0xed, 0 } }, /* 16d */
+      { .mk = {0xe0, 0x6e, 0 }, .brk = { 0xe0,       0xee, 0 } }, /* 16e */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 16f */
+      { .mk = {0xe0, 0x70, 0 }, .brk = { 0xe0,       0xf0, 0 } }, /* 170 */
+      { .mk = {0xe0, 0x71, 0 }, .brk = { 0xe0,       0xf1, 0 } }, /* 171 */
+      { .mk = {0xe0, 0x72, 0 }, .brk = { 0xe0,       0xf2, 0 } }, /* 172 */
+      { .mk = {0xe0, 0x73, 0 }, .brk = { 0xe0,       0xf3, 0 } }, /* 173 */
+      { .mk = {0xe0, 0x74, 0 }, .brk = { 0xe0,       0xf4, 0 } }, /* 174 */
+      { .mk = {0xe0, 0x75, 0 }, .brk = { 0xe0,       0xf5, 0 } }, /* 175 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 176 */
+      { .mk = {0xe0, 0x77, 0 }, .brk = { 0xe0,       0xf7, 0 } }, /* 177 */
+      { .mk = {0xe0, 0x78, 0 }, .brk = { 0xe0,       0xf8, 0 } }, /* 178 */
+      { .mk = {0xe0, 0x79, 0 }, .brk = { 0xe0,       0xf9, 0 } }, /* 179 */
+      { .mk = {0xe0, 0x7a, 0 }, .brk = { 0xe0,       0xfa, 0 } }, /* 17a */
+      { .mk = {0xe0, 0x7b, 0 }, .brk = { 0xe0,       0xfb, 0 } }, /* 17b */
+      { .mk = {0xe0, 0x7c, 0 }, .brk = { 0xe0,       0xfc, 0 } }, /* 17c */
+      { .mk = {0xe0, 0x7d, 0 }, .brk = { 0xe0,       0xfd, 0 } }, /* 17d */
+      { .mk = {0xe0, 0x7e, 0 }, .brk = { 0xe0,       0xfe, 0 } }, /* 17e */
+      { .mk = {0xe0, 0x7f, 0 }, .brk = { 0xe0,       0xff, 0 } }, /* 17f */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 180 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 181 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 182 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 183 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 184 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 185 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 186 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 187 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 188 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 189 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 18a */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 18b */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 18c */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 18d */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 18e */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 18f */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 190 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 191 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 192 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 193 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 194 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 195 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 196 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 197 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 198 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 199 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 19a */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 19b */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 19c */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 19d */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 19e */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 19f */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1a0 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1a1 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1a2 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1a3 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1a4 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1a5 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1a6 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1a7 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1a8 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1a9 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1aa */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1ab */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1ac */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1ad */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1ae */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1af */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1b0 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1b1 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1b2 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1b3 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1b4 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1b5 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1b6 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1b7 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1b8 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1b9 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1ba */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1bb */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1bc */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1bd */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1be */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1bf */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1c0 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1c1 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1c2 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1c3 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1c4 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1c5 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1c6 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1c7 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1c8 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1c9 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1ca */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1cb */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1cv */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1cd */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1ce */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1cf */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1d0 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1d1 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1d2 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1d3 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1d4 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1d5 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1d6 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1d7 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1d8 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1d9 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1da */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1db */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1dc */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1dd */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1de */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1df */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1e0 */
+      { .mk = {0xe0, 0xe1, 0 }, .brk = {                   0 } }, /* 1e1 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1e2 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1e3 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1e4 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1e5 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1e6 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1e7 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1e8 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1e9 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1ea */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1eb */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1ec */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1ed */
+      { .mk = {0xe0, 0xee, 0 }, .brk = {                   0 } }, /* 1ee */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1ef */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1f0 */
+      { .mk = {0xe0, 0xf1, 0 }, .brk = {                   0 } }, /* 1f1 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1f2 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1f3 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1f4 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1f5 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1f6 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1f7 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1f8 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1f9 */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1fa */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1fb */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1fc */
+      { .mk = {            0 }, .brk = {                   0 } }, /* 1fd */
+      { .mk = {0xe0, 0xfe, 0 }, .brk = {                   0 } }, /* 1fe */
+      { .mk = {0xe0, 0xff, 0 }, .brk = {                   0 } }  /* 1ff */
+    // clang-format on
+    };
+/* Scancode set 82h : Set 02 with language specific keys support used by DOS/V */
+static const scancode scancode_set82[512] = {
+  // clang-format off
+    { .mk = {            0 }, .brk = {                   0 } }, /* 000 */
+    { .mk = {      0x76, 0 }, .brk = {       0xF0, 0x76, 0 } }, /* 001 */
+    { .mk = {      0x16, 0 }, .brk = {       0xF0, 0x16, 0 } }, /* 002 */
+    { .mk = {      0x1E, 0 }, .brk = {       0xF0, 0x1E, 0 } }, /* 003 */
+    { .mk = {      0x26, 0 }, .brk = {       0xF0, 0x26, 0 } }, /* 004 */
+    { .mk = {      0x25, 0 }, .brk = {       0xF0, 0x25, 0 } }, /* 005 */
+    { .mk = {      0x2E, 0 }, .brk = {       0xF0, 0x2E, 0 } }, /* 006 */
+    { .mk = {      0x36, 0 }, .brk = {       0xF0, 0x36, 0 } }, /* 007 */
+    { .mk = {      0x3D, 0 }, .brk = {       0xF0, 0x3D, 0 } }, /* 008 */
+    { .mk = {      0x3E, 0 }, .brk = {       0xF0, 0x3E, 0 } }, /* 009 */
+    { .mk = {      0x46, 0 }, .brk = {       0xF0, 0x46, 0 } }, /* 00a */
+    { .mk = {      0x45, 0 }, .brk = {       0xF0, 0x45, 0 } }, /* 00b */
+    { .mk = {      0x4E, 0 }, .brk = {       0xF0, 0x4E, 0 } }, /* 00c */
+    { .mk = {      0x55, 0 }, .brk = {       0xF0, 0x55, 0 } }, /* 00d */
+    { .mk = {      0x66, 0 }, .brk = {       0xF0, 0x66, 0 } }, /* 00e */
+    { .mk = {      0x0D, 0 }, .brk = {       0xF0, 0x0D, 0 } }, /* 00f */
+    { .mk = {      0x15, 0 }, .brk = {       0xF0, 0x15, 0 } }, /* 010 */
+    { .mk = {      0x1D, 0 }, .brk = {       0xF0, 0x1D, 0 } }, /* 011 */
+    { .mk = {      0x24, 0 }, .brk = {       0xF0, 0x24, 0 } }, /* 012 */
+    { .mk = {      0x2D, 0 }, .brk = {       0xF0, 0x2D, 0 } }, /* 013 */
+    { .mk = {      0x2C, 0 }, .brk = {       0xF0, 0x2C, 0 } }, /* 014 */
+    { .mk = {      0x35, 0 }, .brk = {       0xF0, 0x35, 0 } }, /* 015 */
+    { .mk = {      0x3C, 0 }, .brk = {       0xF0, 0x3C, 0 } }, /* 016 */
+    { .mk = {      0x43, 0 }, .brk = {       0xF0, 0x43, 0 } }, /* 017 */
+    { .mk = {      0x44, 0 }, .brk = {       0xF0, 0x44, 0 } }, /* 018 */
+    { .mk = {      0x4D, 0 }, .brk = {       0xF0, 0x4D, 0 } }, /* 019 */
+    { .mk = {      0x54, 0 }, .brk = {       0xF0, 0x54, 0 } }, /* 01a */
+    { .mk = {      0x5B, 0 }, .brk = {       0xF0, 0x5B, 0 } }, /* 01b */
+    { .mk = {      0x5A, 0 }, .brk = {       0xF0, 0x5A, 0 } }, /* 01c */
+    { .mk = {      0x14, 0 }, .brk = {       0xF0, 0x14, 0 } }, /* 01d */
+    { .mk = {      0x1C, 0 }, .brk = {       0xF0, 0x1C, 0 } }, /* 01e */
+    { .mk = {      0x1B, 0 }, .brk = {       0xF0, 0x1B, 0 } }, /* 01f */
+    { .mk = {      0x23, 0 }, .brk = {       0xF0, 0x23, 0 } }, /* 020 */
+    { .mk = {      0x2B, 0 }, .brk = {       0xF0, 0x2B, 0 } }, /* 021 */
+    { .mk = {      0x34, 0 }, .brk = {       0xF0, 0x34, 0 } }, /* 022 */
+    { .mk = {      0x33, 0 }, .brk = {       0xF0, 0x33, 0 } }, /* 023 */
+    { .mk = {      0x3B, 0 }, .brk = {       0xF0, 0x3B, 0 } }, /* 024 */
+    { .mk = {      0x42, 0 }, .brk = {       0xF0, 0x42, 0 } }, /* 025 */
+    { .mk = {      0x4B, 0 }, .brk = {       0xF0, 0x4B, 0 } }, /* 026 */
+    { .mk = {      0x4C, 0 }, .brk = {       0xF0, 0x4C, 0 } }, /* 027 */
+    { .mk = {      0x52, 0 }, .brk = {       0xF0, 0x52, 0 } }, /* 028* */
+    { .mk = {      0x62, 0 }, .brk = {       0xf0, 0x62, 0 } }, /* 029 0x45 Hankaku, Zenkaku */
+    { .mk = {      0x12, 0 }, .brk = {       0xF0, 0x12, 0 } }, /* 02a */
+    { .mk = {      0x5b, 0 }, .brk = {       0xf0, 0x5b, 0 } }, /* 02b 0x17 Mu */
+    { .mk = {      0x1A, 0 }, .brk = {       0xF0, 0x1A, 0 } }, /* 02c */
+    { .mk = {      0x22, 0 }, .brk = {       0xF0, 0x22, 0 } }, /* 02d */
+    { .mk = {      0x21, 0 }, .brk = {       0xF0, 0x21, 0 } }, /* 02e */
+    { .mk = {      0x2A, 0 }, .brk = {       0xF0, 0x2A, 0 } }, /* 02f */
+    { .mk = {      0x32, 0 }, .brk = {       0xF0, 0x32, 0 } }, /* 030 */
+    { .mk = {      0x31, 0 }, .brk = {       0xF0, 0x31, 0 } }, /* 031 */
+    { .mk = {      0x3A, 0 }, .brk = {       0xF0, 0x3A, 0 } }, /* 032 */
+    { .mk = {      0x41, 0 }, .brk = {       0xF0, 0x41, 0 } }, /* 033 */
+    { .mk = {      0x49, 0 }, .brk = {       0xF0, 0x49, 0 } }, /* 034 */
+    { .mk = {      0x4A, 0 }, .brk = {       0xF0, 0x4A, 0 } }, /* 035 */
+    { .mk = {      0x59, 0 }, .brk = {       0xF0, 0x59, 0 } }, /* 036 */
+    { .mk = {      0x7C, 0 }, .brk = {       0xF0, 0x7C, 0 } }, /* 037 */
+    { .mk = {      0x13, 0 }, .brk = {       0xF0, 0x13, 0 } }, /* 038 0x3A LALT = Kanji */
+    { .mk = {      0x29, 0 }, .brk = {       0xF0, 0x29, 0 } }, /* 039 */
+    { .mk = {      0x58, 0 }, .brk = {       0xF0, 0x58, 0 } }, /* 03a */
+    { .mk = {      0x05, 0 }, .brk = {       0xF0, 0x05, 0 } }, /* 03b */
+    { .mk = {      0x06, 0 }, .brk = {       0xF0, 0x06, 0 } }, /* 03c */
+    { .mk = {      0x04, 0 }, .brk = {       0xF0, 0x04, 0 } }, /* 03d */
+    { .mk = {      0x0C, 0 }, .brk = {       0xF0, 0x0C, 0 } }, /* 03e */
+    { .mk = {      0x03, 0 }, .brk = {       0xF0, 0x03, 0 } }, /* 03f */
+    { .mk = {      0x0B, 0 }, .brk = {       0xF0, 0x0B, 0 } }, /* 040 */
+    { .mk = {      0x83, 0 }, .brk = {       0xF0, 0x83, 0 } }, /* 041 */
+    { .mk = {      0x0A, 0 }, .brk = {       0xF0, 0x0A, 0 } }, /* 042 */
+    { .mk = {      0x01, 0 }, .brk = {       0xF0, 0x01, 0 } }, /* 043 */
+    { .mk = {      0x09, 0 }, .brk = {       0xF0, 0x09, 0 } }, /* 044 */
+    { .mk = {      0x77, 0 }, .brk = {       0xF0, 0x77, 0 } }, /* 045 NUMLOCKCLEAR -> Shift + SCRLOCK :TODO */
+    { .mk = {      0x7E, 0 }, .brk = {       0xF0, 0x7E, 0 } }, /* 046 0x75 SCROLLLOCK */
+    { .mk = {      0x6C, 0 }, .brk = {       0xF0, 0x6C, 0 } }, /* 047 */
+    { .mk = {      0x75, 0 }, .brk = {       0xF0, 0x75, 0 } }, /* 048 */
+    { .mk = {      0x7D, 0 }, .brk = {       0xF0, 0x7D, 0 } }, /* 049 */
+    { .mk = {      0x7B, 0 }, .brk = {       0xF0, 0x7B, 0 } }, /* 04a */
+    { .mk = {      0x6B, 0 }, .brk = {       0xF0, 0x6B, 0 } }, /* 04b */
+    { .mk = {      0x73, 0 }, .brk = {       0xF0, 0x73, 0 } }, /* 04c */
+    { .mk = {      0x74, 0 }, .brk = {       0xF0, 0x74, 0 } }, /* 04d */
+    { .mk = {      0x79, 0 }, .brk = {       0xF0, 0x79, 0 } }, /* 04e */
+    { .mk = {      0x69, 0 }, .brk = {       0xF0, 0x69, 0 } }, /* 04f */
+    { .mk = {      0x72, 0 }, .brk = {       0xF0, 0x72, 0 } }, /* 050 */
+    { .mk = {      0x7A, 0 }, .brk = {       0xF0, 0x7A, 0 } }, /* 051 */
+    { .mk = {      0x70, 0 }, .brk = {       0xF0, 0x70, 0 } }, /* 052 */
+    { .mk = {      0x71, 0 }, .brk = {       0xF0, 0x71, 0 } }, /* 053 */
+    { .mk = {      0x84, 0 }, .brk = {       0xF0, 0x84, 0 } }, /* 054 */
+    { .mk = {      0x60, 0 }, .brk = {       0xF0, 0x60, 0 } }, /* 055 */
+    { .mk = {      0x61, 0 }, .brk = {       0xF0, 0x61, 0 } }, /* 056 */
+    { .mk = {      0x78, 0 }, .brk = {       0xF0, 0x78, 0 } }, /* 057 */
+    { .mk = {      0x07, 0 }, .brk = {       0xF0, 0x07, 0 } }, /* 058 */
+    { .mk = {      0x0F, 0 }, .brk = {       0xF0, 0x0F, 0 } }, /* 059 */
+    { .mk = {      0x17, 0 }, .brk = {       0xF0, 0x17, 0 } }, /* 05a */
+    { .mk = {      0x1F, 0 }, .brk = {       0xF0, 0x1F, 0 } }, /* 05b */
+    { .mk = {      0x27, 0 }, .brk = {       0xF0, 0x27, 0 } }, /* 05c */
+    { .mk = {      0x2F, 0 }, .brk = {       0xF0, 0x2F, 0 } }, /* 05d */
+    { .mk = {      0x37, 0 }, .brk = {       0xF0, 0x37, 0 } }, /* 05e */
+    { .mk = {      0x3F, 0 }, .brk = {       0xF0, 0x3F, 0 } }, /* 05f */
+    { .mk = {      0x47, 0 }, .brk = {       0xF0, 0x47, 0 } }, /* 060 */
+    { .mk = {      0x4F, 0 }, .brk = {       0xF0, 0x4F, 0 } }, /* 061 */
+    { .mk = {      0x56, 0 }, .brk = {       0xF0, 0x56, 0 } }, /* 062 */
+    { .mk = {      0x5E, 0 }, .brk = {       0xF0, 0x5E, 0 } }, /* 063 */
+    { .mk = {      0x08, 0 }, .brk = {       0xF0, 0x08, 0 } }, /* 064 */
+    { .mk = {      0x10, 0 }, .brk = {       0xF0, 0x10, 0 } }, /* 065 */
+    { .mk = {      0x18, 0 }, .brk = {       0xF0, 0x18, 0 } }, /* 066 */
+    { .mk = {      0x20, 0 }, .brk = {       0xF0, 0x20, 0 } }, /* 067 */
+    { .mk = {      0x28, 0 }, .brk = {       0xF0, 0x28, 0 } }, /* 068 */
+    { .mk = {      0x30, 0 }, .brk = {       0xF0, 0x30, 0 } }, /* 069 */
+    { .mk = {      0x38, 0 }, .brk = {       0xF0, 0x38, 0 } }, /* 06a */
+    { .mk = {      0x40, 0 }, .brk = {       0xF0, 0x40, 0 } }, /* 06b */
+    { .mk = {      0x48, 0 }, .brk = {       0xF0, 0x48, 0 } }, /* 06c */
+    { .mk = {      0x50, 0 }, .brk = {       0xF0, 0x50, 0 } }, /* 06d */
+    { .mk = {      0x57, 0 }, .brk = {       0xF0, 0x57, 0 } }, /* 06e */
+    { .mk = {      0x6F, 0 }, .brk = {       0xF0, 0x6F, 0 } }, /* 06f */
+    { .mk = {0xe0, 0x11, 0 }, .brk = { 0xe0, 0xf0, 0x11, 0 } }, /* 070 0x36 Kana */
+    { .mk = {      0x19, 0 }, .brk = {       0xF0, 0x19, 0 } }, /* 071 */
+    { .mk = {      0x39, 0 }, .brk = {       0xF0, 0x39, 0 } }, /* 072 */
+    { .mk = {      0x51, 0 }, .brk = {       0xF0, 0x51, 0 } }, /* 073 0x0b Ro, Underline */
+    { .mk = {      0x53, 0 }, .brk = {       0xF0, 0x53, 0 } }, /* 074 */
+    { .mk = {      0x5C, 0 }, .brk = {       0xF0, 0x5C, 0 } }, /* 075 */
+    { .mk = {      0x5F, 0 }, .brk = {       0xF0, 0x5F, 0 } }, /* 076 */
+    { .mk = {      0x62, 0 }, .brk = {       0xF0, 0x62, 0 } }, /* 077 */
+    { .mk = {      0x63, 0 }, .brk = {       0xF0, 0x63, 0 } }, /* 078 */
+    { .mk = {      0x64, 0 }, .brk = {       0xF0, 0x64, 0 } }, /* 079 0x35 Henkan */
+    { .mk = {      0x65, 0 }, .brk = {       0xF0, 0x65, 0 } }, /* 07a */
+    { .mk = {      0x67, 0 }, .brk = {       0xF0, 0x67, 0 } }, /* 07b 0x33 Muhenkan */
+    { .mk = {      0x68, 0 }, .brk = {       0xF0, 0x68, 0 } }, /* 07c */
+    { .mk = {      0x5d, 0 }, .brk = {       0xf0, 0x5d, 0 } }, /* 07d 0x30 Yen, Vertical line */
+    { .mk = {      0x6D, 0 }, .brk = {       0xF0, 0x6D, 0 } }, /* 07e */
+    { .mk = {      0x6E, 0 }, .brk = {       0xF0, 0x6E, 0 } }, /* 07f */
+    { .mk = {      0x80, 0 }, .brk = {       0xf0, 0x80, 0 } }, /* 080 */
+    { .mk = {      0x81, 0 }, .brk = {       0xf0, 0x81, 0 } }, /* 081 */
+    { .mk = {      0x82, 0 }, .brk = {       0xf0, 0x82, 0 } }, /* 082 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 083 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 084 */
+    { .mk = {      0x85, 0 }, .brk = {       0xf0, 0x54, 0 } }, /* 085 */
+    { .mk = {      0x86, 0 }, .brk = {       0xf0, 0x86, 0 } }, /* 086 */
+    { .mk = {      0x87, 0 }, .brk = {       0xf0, 0x87, 0 } }, /* 087 */
+    { .mk = {      0x88, 0 }, .brk = {       0xf0, 0x88, 0 } }, /* 088 */
+    { .mk = {      0x89, 0 }, .brk = {       0xf0, 0x89, 0 } }, /* 089 */
+    { .mk = {      0x8a, 0 }, .brk = {       0xf0, 0x8a, 0 } }, /* 08a */
+    { .mk = {      0x8b, 0 }, .brk = {       0xf0, 0x8b, 0 } }, /* 08b */
+    { .mk = {      0x8c, 0 }, .brk = {       0xf0, 0x8c, 0 } }, /* 08c */
+    { .mk = {      0x8d, 0 }, .brk = {       0xf0, 0x8d, 0 } }, /* 08d */
+    { .mk = {      0x8e, 0 }, .brk = {       0xf0, 0x8e, 0 } }, /* 08e */
+    { .mk = {      0x8f, 0 }, .brk = {       0xf0, 0x8f, 0 } }, /* 08f */
+    { .mk = {      0x90, 0 }, .brk = {       0xf0, 0x90, 0 } }, /* 090 */
+    { .mk = {      0x91, 0 }, .brk = {       0xf0, 0x91, 0 } }, /* 091 */
+    { .mk = {      0x92, 0 }, .brk = {       0xf0, 0x92, 0 } }, /* 092 */
+    { .mk = {      0x93, 0 }, .brk = {       0xf0, 0x93, 0 } }, /* 093 */
+    { .mk = {      0x94, 0 }, .brk = {       0xf0, 0x94, 0 } }, /* 094 */
+    { .mk = {      0x95, 0 }, .brk = {       0xf0, 0x95, 0 } }, /* 095 */
+    { .mk = {      0x96, 0 }, .brk = {       0xf0, 0x96, 0 } }, /* 096 */
+    { .mk = {      0x97, 0 }, .brk = {       0xf0, 0x97, 0 } }, /* 097 */
+    { .mk = {      0x98, 0 }, .brk = {       0xf0, 0x98, 0 } }, /* 098 */
+    { .mk = {      0x99, 0 }, .brk = {       0xf0, 0x99, 0 } }, /* 099 */
+    { .mk = {      0x9a, 0 }, .brk = {       0xf0, 0x9a, 0 } }, /* 09a */
+    { .mk = {      0x9b, 0 }, .brk = {       0xf0, 0x9b, 0 } }, /* 09b */
+    { .mk = {      0x9c, 0 }, .brk = {       0xf0, 0x9c, 0 } }, /* 09c */
+    { .mk = {      0x9d, 0 }, .brk = {       0xf0, 0x9d, 0 } }, /* 09d */
+    { .mk = {      0x9e, 0 }, .brk = {       0xf0, 0x9e, 0 } }, /* 09e */
+    { .mk = {      0x9f, 0 }, .brk = {       0xf0, 0x9f, 0 } }, /* 09f */
+    { .mk = {      0xa0, 0 }, .brk = {       0xf0, 0xa0, 0 } }, /* 0a0 */
+    { .mk = {      0xa1, 0 }, .brk = {       0xf0, 0xa1, 0 } }, /* 0a1 */
+    { .mk = {      0xa2, 0 }, .brk = {       0xf0, 0xa2, 0 } }, /* 0a2 */
+    { .mk = {      0xa3, 0 }, .brk = {       0xf0, 0xa3, 0 } }, /* 0a3 */
+    { .mk = {      0xa4, 0 }, .brk = {       0xf0, 0xa4, 0 } }, /* 0a4 */
+    { .mk = {      0xa5, 0 }, .brk = {       0xf0, 0xa5, 0 } }, /* 0a5 */
+    { .mk = {      0xa6, 0 }, .brk = {       0xf0, 0xa6, 0 } }, /* 0a6 */
+    { .mk = {      0xa7, 0 }, .brk = {       0xf0, 0xa7, 0 } }, /* 0a7 */
+    { .mk = {      0xa8, 0 }, .brk = {       0xf0, 0xa8, 0 } }, /* 0a8 */
+    { .mk = {      0xa9, 0 }, .brk = {       0xf0, 0xa9, 0 } }, /* 0a9 */
+    { .mk = {      0xaa, 0 }, .brk = {       0xf0, 0xaa, 0 } }, /* 0aa */
+    { .mk = {      0xab, 0 }, .brk = {       0xf0, 0xab, 0 } }, /* 0ab */
+    { .mk = {      0xac, 0 }, .brk = {       0xf0, 0xac, 0 } }, /* 0ac */
+    { .mk = {      0xad, 0 }, .brk = {       0xf0, 0xad, 0 } }, /* 0ad */
+    { .mk = {      0xae, 0 }, .brk = {       0xf0, 0xae, 0 } }, /* 0ae */
+    { .mk = {      0xaf, 0 }, .brk = {       0xf0, 0xaf, 0 } }, /* 0af */
+    { .mk = {      0xb0, 0 }, .brk = {       0xf0, 0xb0, 0 } }, /* 0b0 */
+    { .mk = {      0xb1, 0 }, .brk = {       0xf0, 0xb1, 0 } }, /* 0b1 */
+    { .mk = {      0xb2, 0 }, .brk = {       0xf0, 0xb2, 0 } }, /* 0b2 */
+    { .mk = {      0xb3, 0 }, .brk = {       0xf0, 0xb3, 0 } }, /* 0b3 */
+    { .mk = {      0xb4, 0 }, .brk = {       0xf0, 0xb4, 0 } }, /* 0b4 */
+    { .mk = {      0xb5, 0 }, .brk = {       0xf0, 0xb5, 0 } }, /* 0b5 */
+    { .mk = {      0xb6, 0 }, .brk = {       0xf0, 0xb6, 0 } }, /* 0b6 */
+    { .mk = {      0xb7, 0 }, .brk = {       0xf0, 0xb7, 0 } }, /* 0b7 */
+    { .mk = {      0xb8, 0 }, .brk = {       0xf0, 0xb8, 0 } }, /* 0b8 */
+    { .mk = {      0xb9, 0 }, .brk = {       0xf0, 0xb9, 0 } }, /* 0b9 */
+    { .mk = {      0xba, 0 }, .brk = {       0xf0, 0xba, 0 } }, /* 0ba */
+    { .mk = {      0xbb, 0 }, .brk = {       0xf0, 0xbb, 0 } }, /* 0bb */
+    { .mk = {      0xbc, 0 }, .brk = {       0xf0, 0xbc, 0 } }, /* 0bc */
+    { .mk = {      0xbd, 0 }, .brk = {       0xf0, 0xbd, 0 } }, /* 0bd */
+    { .mk = {      0xbe, 0 }, .brk = {       0xf0, 0xbe, 0 } }, /* 0be */
+    { .mk = {      0xbf, 0 }, .brk = {       0xf0, 0xbf, 0 } }, /* 0bf */
+    { .mk = {      0xc0, 0 }, .brk = {       0xf0, 0xc0, 0 } }, /* 0c0 */
+    { .mk = {      0xc1, 0 }, .brk = {       0xf0, 0xc1, 0 } }, /* 0c1 */
+    { .mk = {      0xc2, 0 }, .brk = {       0xf0, 0xc2, 0 } }, /* 0c2 */
+    { .mk = {      0xc3, 0 }, .brk = {       0xf0, 0xc3, 0 } }, /* 0c3 */
+    { .mk = {      0xc4, 0 }, .brk = {       0xf0, 0xc4, 0 } }, /* 0c4 */
+    { .mk = {      0xc5, 0 }, .brk = {       0xf0, 0xc5, 0 } }, /* 0c5 */
+    { .mk = {      0xc6, 0 }, .brk = {       0xf0, 0xc6, 0 } }, /* 0c6 */
+    { .mk = {      0xc7, 0 }, .brk = {       0xf0, 0xc7, 0 } }, /* 0c7 */
+    { .mk = {      0xc8, 0 }, .brk = {       0xf0, 0xc8, 0 } }, /* 0c8 */
+    { .mk = {      0xc9, 0 }, .brk = {       0xf0, 0xc9, 0 } }, /* 0c9 */
+    { .mk = {      0xca, 0 }, .brk = {       0xf0, 0xca, 0 } }, /* 0ca */
+    { .mk = {      0xcb, 0 }, .brk = {       0xf0, 0xcb, 0 } }, /* 0cb */
+    { .mk = {      0xcc, 0 }, .brk = {       0xf0, 0xcc, 0 } }, /* 0cc */
+    { .mk = {      0xcd, 0 }, .brk = {       0xf0, 0xcd, 0 } }, /* 0cd */
+    { .mk = {      0xce, 0 }, .brk = {       0xf0, 0xce, 0 } }, /* 0ce */
+    { .mk = {      0xcf, 0 }, .brk = {       0xf0, 0xcf, 0 } }, /* 0cf */
+    { .mk = {      0xd0, 0 }, .brk = {       0xf0, 0xd0, 0 } }, /* 0d0 */
+    { .mk = {      0xd1, 0 }, .brk = {       0xf0, 0xd0, 0 } }, /* 0d1 */
+    { .mk = {      0xd2, 0 }, .brk = {       0xf0, 0xd2, 0 } }, /* 0d2 */
+    { .mk = {      0xd3, 0 }, .brk = {       0xf0, 0xd3, 0 } }, /* 0d3 */
+    { .mk = {      0xd4, 0 }, .brk = {       0xf0, 0xd4, 0 } }, /* 0d4 */
+    { .mk = {      0xd5, 0 }, .brk = {       0xf0, 0xd5, 0 } }, /* 0d5 */
+    { .mk = {      0xd6, 0 }, .brk = {       0xf0, 0xd6, 0 } }, /* 0d6 */
+    { .mk = {      0xd7, 0 }, .brk = {       0xf0, 0xd7, 0 } }, /* 0d7 */
+    { .mk = {      0xd8, 0 }, .brk = {       0xf0, 0xd8, 0 } }, /* 0d8 */
+    { .mk = {      0xd9, 0 }, .brk = {       0xf0, 0xd9, 0 } }, /* 0d9 */
+    { .mk = {      0xda, 0 }, .brk = {       0xf0, 0xda, 0 } }, /* 0da */
+    { .mk = {      0xdb, 0 }, .brk = {       0xf0, 0xdb, 0 } }, /* 0db */
+    { .mk = {      0xdc, 0 }, .brk = {       0xf0, 0xdc, 0 } }, /* 0dc */
+    { .mk = {      0xdd, 0 }, .brk = {       0xf0, 0xdd, 0 } }, /* 0dd */
+    { .mk = {      0xde, 0 }, .brk = {       0xf0, 0xde, 0 } }, /* 0de */
+    { .mk = {      0xdf, 0 }, .brk = {       0xf0, 0xdf, 0 } }, /* 0df */
+    { .mk = {      0xe0, 0 }, .brk = {       0xf0, 0xe0, 0 } }, /* 0e0 */
+    { .mk = {      0xe1, 0 }, .brk = {       0xf0, 0xe1, 0 } }, /* 0e1 */
+    { .mk = {      0xe2, 0 }, .brk = {       0xf0, 0xe2, 0 } }, /* 0e2 */
+    { .mk = {      0xe3, 0 }, .brk = {       0xf0, 0xe3, 0 } }, /* 0e3 */
+    { .mk = {      0xe4, 0 }, .brk = {       0xf0, 0xe4, 0 } }, /* 0e4 */
+    { .mk = {      0xe5, 0 }, .brk = {       0xf0, 0xe5, 0 } }, /* 0e5 */
+    { .mk = {      0xe6, 0 }, .brk = {       0xf0, 0xe6, 0 } }, /* 0e6 */
+    { .mk = {      0xe7, 0 }, .brk = {       0xf0, 0xe7, 0 } }, /* 0e7 */
+    { .mk = {      0xe8, 0 }, .brk = {       0xf0, 0xe8, 0 } }, /* 0e8 */
+    { .mk = {      0xe9, 0 }, .brk = {       0xf0, 0xe9, 0 } }, /* 0e9 */
+    { .mk = {      0xea, 0 }, .brk = {       0xf0, 0xea, 0 } }, /* 0ea */
+    { .mk = {      0xeb, 0 }, .brk = {       0xf0, 0xeb, 0 } }, /* 0eb */
+    { .mk = {      0xec, 0 }, .brk = {       0xf0, 0xec, 0 } }, /* 0ec */
+    { .mk = {      0xed, 0 }, .brk = {       0xf0, 0xed, 0 } }, /* 0ed */
+    { .mk = {      0xee, 0 }, .brk = {       0xf0, 0xee, 0 } }, /* 0ee */
+    { .mk = {      0xef, 0 }, .brk = {       0xf0, 0xef, 0 } }, /* 0ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f0 */
+    { .mk = {      0xf1, 0 }, .brk = {       0xf0, 0xf1, 0 } }, /* 0f1 */
+    { .mk = {      0xf2, 0 }, .brk = {       0xf0, 0xf2, 0 } }, /* 0f2 */
+    { .mk = {      0xf3, 0 }, .brk = {       0xf0, 0xf3, 0 } }, /* 0f3 */
+    { .mk = {      0xf4, 0 }, .brk = {       0xf0, 0xf4, 0 } }, /* 0f4 */
+    { .mk = {      0xf5, 0 }, .brk = {       0xf0, 0xf5, 0 } }, /* 0f5 */
+    { .mk = {      0xf6, 0 }, .brk = {       0xf0, 0xf6, 0 } }, /* 0f6 */
+    { .mk = {      0xf7, 0 }, .brk = {       0xf0, 0xf7, 0 } }, /* 0f7 */
+    { .mk = {      0xf8, 0 }, .brk = {       0xf0, 0xf8, 0 } }, /* 0f8 */
+    { .mk = {      0xf9, 0 }, .brk = {       0xf0, 0xf9, 0 } }, /* 0f9 */
+    { .mk = {      0xfa, 0 }, .brk = {       0xf0, 0xfa, 0 } }, /* 0fa */
+    { .mk = {      0xfb, 0 }, .brk = {       0xf0, 0xfb, 0 } }, /* 0fb */
+    { .mk = {      0xfc, 0 }, .brk = {       0xf0, 0xfc, 0 } }, /* 0fc */
+    { .mk = {      0xfd, 0 }, .brk = {       0xf0, 0xfd, 0 } }, /* 0fd */
+    { .mk = {      0xfe, 0 }, .brk = {       0xf0, 0xfe, 0 } }, /* 0fe */
+    { .mk = {      0xff, 0 }, .brk = {       0xf0, 0xff, 0 } }, /* 0ff */
+    { .mk = {0xe1, 0x14, 0 }, .brk = { 0xe1, 0xf0, 0x14, 0 } }, /* 100 */
+    { .mk = {0xe0, 0x76, 0 }, .brk = { 0xe0, 0xF0, 0x76, 0 } }, /* 101 */
+    { .mk = {0xe0, 0x16, 0 }, .brk = { 0xe0, 0xF0, 0x16, 0 } }, /* 102 */
+    { .mk = {0xe0, 0x1E, 0 }, .brk = { 0xe0, 0xF0, 0x1E, 0 } }, /* 103 */
+    { .mk = {0xe0, 0x26, 0 }, .brk = { 0xe0, 0xF0, 0x26, 0 } }, /* 104 */
+    { .mk = {0xe0, 0x25, 0 }, .brk = { 0xe0, 0xF0, 0x25, 0 } }, /* 105 */
+    { .mk = {0xe0, 0x2E, 0 }, .brk = { 0xe0, 0xF0, 0x2E, 0 } }, /* 106 */
+    { .mk = {0xe0, 0x36, 0 }, .brk = { 0xe0, 0xF0, 0x36, 0 } }, /* 107 */
+    { .mk = {0xe0, 0x3D, 0 }, .brk = { 0xe0, 0xF0, 0x3D, 0 } }, /* 108 */
+    { .mk = {0xe0, 0x3E, 0 }, .brk = { 0xe0, 0xF0, 0x3E, 0 } }, /* 109 */
+    { .mk = {0xe0, 0x46, 0 }, .brk = { 0xe0, 0xF0, 0x46, 0 } }, /* 10a */
+    { .mk = {0xe0, 0x45, 0 }, .brk = { 0xe0, 0xF0, 0x45, 0 } }, /* 10b */
+    { .mk = {0xe0, 0x4E, 0 }, .brk = { 0xe0, 0xF0, 0x4E, 0 } }, /* 10c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10d */
+    { .mk = {0xe0, 0x66, 0 }, .brk = { 0xe0, 0xF0, 0x66, 0 } }, /* 10e */
+    { .mk = {0xe0, 0x0D, 0 }, .brk = { 0xe0, 0xF0, 0x0D, 0 } }, /* 10f */
+    { .mk = {0xe0, 0x15, 0 }, .brk = { 0xe0, 0xF0, 0x15, 0 } }, /* 110 */
+    { .mk = {0xe0, 0x1D, 0 }, .brk = { 0xe0, 0xF0, 0x1D, 0 } }, /* 112 */
+    { .mk = {0xe0, 0x24, 0 }, .brk = { 0xe0, 0xF0, 0x24, 0 } }, /* 113 */
+    { .mk = {0xe0, 0x2D, 0 }, .brk = { 0xe0, 0xF0, 0x2D, 0 } }, /* 113 */
+    { .mk = {0xe0, 0x2C, 0 }, .brk = { 0xe0, 0xF0, 0x2C, 0 } }, /* 114 */
+    { .mk = {0xe0, 0x35, 0 }, .brk = { 0xe0, 0xF0, 0x35, 0 } }, /* 115 */
+    { .mk = {0xe0, 0x3C, 0 }, .brk = { 0xe0, 0xF0, 0x3C, 0 } }, /* 116 */
+    { .mk = {0xe0, 0x43, 0 }, .brk = { 0xe0, 0xF0, 0x43, 0 } }, /* 117 */
+    { .mk = {0xe0, 0x44, 0 }, .brk = { 0xe0, 0xF0, 0x44, 0 } }, /* 118 */
+    { .mk = {0xe0, 0x4D, 0 }, .brk = { 0xe0, 0xF0, 0x4D, 0 } }, /* 119 */
+    { .mk = {0xe0, 0x54, 0 }, .brk = { 0xe0, 0xF0, 0x54, 0 } }, /* 11a */
+    { .mk = {0xe0, 0x5B, 0 }, .brk = { 0xe0, 0xF0, 0x5B, 0 } }, /* 11b */
+    { .mk = {0xe0, 0x5A, 0 }, .brk = { 0xe0, 0xF0, 0x5A, 0 } }, /* 11c */
+    { .mk = {0xe0, 0x14, 0 }, .brk = { 0xe0, 0xF0, 0x14, 0 } }, /* 11d */
+    { .mk = {0xe0, 0x1C, 0 }, .brk = { 0xe0, 0xF0, 0x1C, 0 } }, /* 11e */
+    { .mk = {0xe0, 0x1B, 0 }, .brk = { 0xe0, 0xF0, 0x1B, 0 } }, /* 11f */
+    { .mk = {0xe0, 0x23, 0 }, .brk = { 0xe0, 0xF0, 0x23, 0 } }, /* 120 */
+    { .mk = {0xe0, 0x2B, 0 }, .brk = { 0xe0, 0xF0, 0x2B, 0 } }, /* 121 */
+    { .mk = {0xe0, 0x34, 0 }, .brk = { 0xe0, 0xF0, 0x34, 0 } }, /* 122 */
+    { .mk = {0xe0, 0x33, 0 }, .brk = { 0xe0, 0xF0, 0x33, 0 } }, /* 123 */
+    { .mk = {0xe0, 0x3B, 0 }, .brk = { 0xe0, 0xF0, 0x3B, 0 } }, /* 124 */
+    { .mk = {0xe0, 0x42, 0 }, .brk = { 0xe0, 0xF0, 0x42, 0 } }, /* 125 */
+    { .mk = {0xe0, 0x4B, 0 }, .brk = { 0xe0, 0xF0, 0x4B, 0 } }, /* 126 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 127 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 128 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 129 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12b */
+    { .mk = {0xe0, 0x1A, 0 }, .brk = { 0xe0, 0xF0, 0x1A, 0 } }, /* 12c */
+    { .mk = {0xe0, 0x22, 0 }, .brk = { 0xe0, 0xF0, 0x22, 0 } }, /* 12d */
+    { .mk = {0xe0, 0x21, 0 }, .brk = { 0xe0, 0xF0, 0x21, 0 } }, /* 12e */
+    { .mk = {0xe0, 0x2A, 0 }, .brk = { 0xe0, 0xF0, 0x2A, 0 } }, /* 12f */
+    { .mk = {0xe0, 0x32, 0 }, .brk = { 0xe0, 0xF0, 0x32, 0 } }, /* 130 */
+    { .mk = {0xe0, 0x31, 0 }, .brk = { 0xe0, 0xF0, 0x31, 0 } }, /* 131 */
+    { .mk = {0xe0, 0x3A, 0 }, .brk = { 0xe0, 0xF0, 0x3A, 0 } }, /* 132 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 133 */
+    { .mk = {0xe0, 0x49, 0 }, .brk = { 0xe0, 0xF0, 0x49, 0 } }, /* 134 */
+    { .mk = {0xe0, 0x4A, 0 }, .brk = { 0xe0, 0xF0, 0x4A, 0 } }, /* 135 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 136 */
+    { .mk = {0xe0, 0x7C, 0 }, .brk = { 0xe0, 0xF0, 0x7C, 0 } }, /* 137 */
+    { .mk = {0xe0, 0x11, 0 }, .brk = { 0xe0, 0xF0, 0x11, 0 } }, /* 138* 0x31 R-Alt */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 139 */
+    { .mk = {0xe0, 0x58, 0 }, .brk = { 0xe0, 0xF0, 0x58, 0 } }, /* 13a */
+    { .mk = {0xe0, 0x05, 0 }, .brk = { 0xe0, 0xF0, 0x05, 0 } }, /* 13b */
+    { .mk = {0xe0, 0x06, 0 }, .brk = { 0xe0, 0xF0, 0x06, 0 } }, /* 13c */
+    { .mk = {0xe0, 0x04, 0 }, .brk = { 0xe0, 0xF0, 0x04, 0 } }, /* 13d */
+    { .mk = {0xe0, 0x0C, 0 }, .brk = { 0xe0, 0xF0, 0x0C, 0 } }, /* 13e */
+    { .mk = {0xe0, 0x03, 0 }, .brk = { 0xe0, 0xF0, 0x03, 0 } }, /* 13f */
+    { .mk = {0xe0, 0x0B, 0 }, .brk = { 0xe0, 0xF0, 0x0B, 0 } }, /* 140 */
+    { .mk = {0xe0, 0x02, 0 }, .brk = { 0xe0, 0xF0, 0x02, 0 } }, /* 141 */
+    { .mk = {0xe0, 0x0A, 0 }, .brk = { 0xe0, 0xF0, 0x0A, 0 } }, /* 142 */
+    { .mk = {0xe0, 0x01, 0 }, .brk = { 0xe0, 0xF0, 0x01, 0 } }, /* 143 */
+    { .mk = {0xe0, 0x09, 0 }, .brk = { 0xe0, 0xF0, 0x09, 0 } }, /* 144 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 145 */
+    { .mk = {0xe0, 0x7E, 0 }, .brk = { 0xe0, 0xF0, 0x7E, 0 } }, /* 146 */
+    { .mk = {0xe0, 0x6C, 0 }, .brk = { 0xe0, 0xF0, 0x6C, 0 } }, /* 147 */
+    { .mk = {0xe0, 0x75, 0 }, .brk = { 0xe0, 0xF0, 0x75, 0 } }, /* 148 */
+    { .mk = {0xe0, 0x7D, 0 }, .brk = { 0xe0, 0xF0, 0x7D, 0 } }, /* 149 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14a */
+    { .mk = {0xe0, 0x6B, 0 }, .brk = { 0xe0, 0xF0, 0x6B, 0 } }, /* 14b */
+    { .mk = {0xe0, 0x73, 0 }, .brk = { 0xe0, 0xF0, 0x73, 0 } }, /* 14c */
+    { .mk = {0xe0, 0x74, 0 }, .brk = { 0xe0, 0xF0, 0x74, 0 } }, /* 14d */
+    { .mk = {0xe0, 0x79, 0 }, .brk = { 0xe0, 0xF0, 0x79, 0 } }, /* 14e */
+    { .mk = {0xe0, 0x69, 0 }, .brk = { 0xe0, 0xF0, 0x69, 0 } }, /* 14f */
+    { .mk = {0xe0, 0x72, 0 }, .brk = { 0xe0, 0xF0, 0x72, 0 } }, /* 150 */
+    { .mk = {0xe0, 0x7A, 0 }, .brk = { 0xe0, 0xF0, 0x7A, 0 } }, /* 151 */
+    { .mk = {0xe0, 0x70, 0 }, .brk = { 0xe0, 0xF0, 0x70, 0 } }, /* 152 */
+    { .mk = {0xe0, 0x71, 0 }, .brk = { 0xe0, 0xF0, 0x71, 0 } }, /* 153 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 154 */
+    { .mk = {0xe0, 0x60, 0 }, .brk = { 0xe0, 0xF0, 0x60, 0 } }, /* 155 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 156 */
+    { .mk = {0xe0, 0x78, 0 }, .brk = { 0xe0, 0xF0, 0x78, 0 } }, /* 157 */
+    { .mk = {0xe0, 0x07, 0 }, .brk = { 0xe0, 0xF0, 0x07, 0 } }, /* 158 */
+    { .mk = {0xe0, 0x0F, 0 }, .brk = { 0xe0, 0xF0, 0x0F, 0 } }, /* 159 */
+    { .mk = {0xe0, 0x17, 0 }, .brk = { 0xe0, 0xF0, 0x17, 0 } }, /* 15a */
+    { .mk = {      0x67, 0 }, .brk = {       0xf0, 0x67, 0 } }, /* 15b 0x33 LGUI->Muhenkan (in emulator only) */
+    { .mk = {      0x64, 0 }, .brk = {       0xf0, 0x64, 0 } }, /* 15c 0x35 RGUI->Henkan (in emulator only) */
+    { .mk = {0xe0, 0x11, 0 }, .brk = { 0xe0, 0xf0, 0x11, 0 } }, /* 15d 0x36 APPLICATION->Kana (in emulator only) */
+    { .mk = {0xe0, 0x37, 0 }, .brk = { 0xe0, 0xF0, 0x37, 0 } }, /* 15e */
+    { .mk = {0xe0, 0x3F, 0 }, .brk = { 0xe0, 0xF0, 0x3F, 0 } }, /* 15f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 160 */
+    { .mk = {0xe0, 0x4F, 0 }, .brk = { 0xe0, 0xF0, 0x4F, 0 } }, /* 161 */
+    { .mk = {0xe0, 0x56, 0 }, .brk = { 0xe0, 0xF0, 0x56, 0 } }, /* 162 */
+    { .mk = {0xe0, 0x5E, 0 }, .brk = { 0xe0, 0xF0, 0x5E, 0 } }, /* 163 */
+    { .mk = {0xe0, 0x08, 0 }, .brk = { 0xe0, 0xF0, 0x08, 0 } }, /* 164 */
+    { .mk = {0xe0, 0x10, 0 }, .brk = { 0xe0, 0xF0, 0x10, 0 } }, /* 165 */
+    { .mk = {0xe0, 0x18, 0 }, .brk = { 0xe0, 0xF0, 0x18, 0 } }, /* 166 */
+    { .mk = {0xe0, 0x20, 0 }, .brk = { 0xe0, 0xF0, 0x20, 0 } }, /* 167 */
+    { .mk = {0xe0, 0x28, 0 }, .brk = { 0xe0, 0xF0, 0x28, 0 } }, /* 168 */
+    { .mk = {0xe0, 0x30, 0 }, .brk = { 0xe0, 0xF0, 0x30, 0 } }, /* 169 */
+    { .mk = {0xe0, 0x38, 0 }, .brk = { 0xe0, 0xF0, 0x38, 0 } }, /* 16a */
+    { .mk = {0xe0, 0x40, 0 }, .brk = { 0xe0, 0xF0, 0x40, 0 } }, /* 16b */
+    { .mk = {0xe0, 0x48, 0 }, .brk = { 0xe0, 0xF0, 0x48, 0 } }, /* 16c */
+    { .mk = {0xe0, 0x50, 0 }, .brk = { 0xe0, 0xF0, 0x50, 0 } }, /* 16d */
+    { .mk = {0xe0, 0x57, 0 }, .brk = { 0xe0, 0xF0, 0x57, 0 } }, /* 16e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16f */
+    { .mk = {0xe0, 0x13, 0 }, .brk = { 0xe0, 0xF0, 0x13, 0 } }, /* 170 */
+    { .mk = {0xe0, 0x19, 0 }, .brk = { 0xe0, 0xF0, 0x19, 0 } }, /* 171 */
+    { .mk = {0xe0, 0x39, 0 }, .brk = { 0xe0, 0xF0, 0x39, 0 } }, /* 172 */
+    { .mk = {0xe0, 0x51, 0 }, .brk = { 0xe0, 0xF0, 0x51, 0 } }, /* 173 */
+    { .mk = {0xe0, 0x53, 0 }, .brk = { 0xe0, 0xF0, 0x53, 0 } }, /* 174 */
+    { .mk = {0xe0, 0x5C, 0 }, .brk = { 0xe0, 0xF0, 0x5C, 0 } }, /* 175 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 176 */
+    { .mk = {0xe0, 0x62, 0 }, .brk = { 0xe0, 0xF0, 0x62, 0 } }, /* 177 */
+    { .mk = {0xe0, 0x63, 0 }, .brk = { 0xe0, 0xF0, 0x63, 0 } }, /* 178 */
+    { .mk = {0xe0, 0x64, 0 }, .brk = { 0xe0, 0xF0, 0x64, 0 } }, /* 179 */
+    { .mk = {0xe0, 0x65, 0 }, .brk = { 0xe0, 0xF0, 0x65, 0 } }, /* 17a */
+    { .mk = {0xe0, 0x67, 0 }, .brk = { 0xe0, 0xF0, 0x67, 0 } }, /* 17b */
+    { .mk = {0xe0, 0x68, 0 }, .brk = { 0xe0, 0xF0, 0x68, 0 } }, /* 17c */
+    { .mk = {0xe0, 0x6A, 0 }, .brk = { 0xe0, 0xF0, 0x6A, 0 } }, /* 17d */
+    { .mk = {0xe0, 0x6D, 0 }, .brk = { 0xe0, 0xF0, 0x6D, 0 } }, /* 17e */
+    { .mk = {0xe0, 0x6E, 0 }, .brk = { 0xe0, 0xF0, 0x6E, 0 } }, /* 17f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 180 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 181 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 182 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 183 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 184 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 185 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 186 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 187 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 188 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 189 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 190 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 191 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 192 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 193 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 194 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 195 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 196 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 197 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 198 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 199 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cv */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e0 */
+    { .mk = {0xe0, 0xe1, 0 }, .brk = { 0xe0, 0xF0, 0xE1, 0 } }, /* 1e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ed */
+    { .mk = {0xe0, 0xee, 0 }, .brk = { 0xe0, 0xF0, 0xEE, 0 } }, /* 1ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f0 */
+    { .mk = {0xe0, 0xf1, 0 }, .brk = { 0xe0, 0xF0, 0xF1, 0 } }, /* 1f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fd */
+    { .mk = {0xe0, 0xfe, 0 }, .brk = { 0xe0, 0xF0, 0xFE, 0 } }, /* 1fe */
+    { .mk = {0xe0, 0xff, 0 }, .brk = { 0xe0, 0xF0, 0xFF, 0 } }  /* 1ff */
+  // clang-format on
+};
+/* Scancode set 8Ah : IBM 5556 keyboard compatible scancode set used by J-DOS */
+static scancode scancode_set8a[512] =
+{
+    // clang-format off                     
+      {.mk = {       0 }, .brk = {       0 } }, /* 000 */
+      {.mk = { 0x3d, 0 }, .brk = {       0 } }, /* 001 */
+      {.mk = { 0x24, 0 }, .brk = {       0 } }, /* 002 */
+      {.mk = { 0x25, 0 }, .brk = {       0 } }, /* 003 */
+      {.mk = { 0x26, 0 }, .brk = {       0 } }, /* 004 */
+      {.mk = { 0x27, 0 }, .brk = {       0 } }, /* 005 */
+      {.mk = { 0x28, 0 }, .brk = {       0 } }, /* 006 */
+      {.mk = { 0x29, 0 }, .brk = {       0 } }, /* 007 */
+      {.mk = { 0x2a, 0 }, .brk = {       0 } }, /* 008 */
+      {.mk = { 0x2b, 0 }, .brk = {       0 } }, /* 009 */
+      {.mk = { 0x2c, 0 }, .brk = {       0 } }, /* 00a */
+      {.mk = { 0x2d, 0 }, .brk = {       0 } }, /* 00b */
+      {.mk = { 0x2e, 0 }, .brk = {       0 } }, /* 00c */
+      {.mk = { 0x2f, 0 }, .brk = {       0 } }, /* 00d */
+      {.mk = { 0x3e, 0 }, .brk = {       0 } }, /* 00e */
+      {.mk = { 0x3c, 0 }, .brk = {       0 } }, /* 00f */
+      {.mk = { 0x18, 0 }, .brk = {       0 } }, /* 010 */
+      {.mk = { 0x19, 0 }, .brk = {       0 } }, /* 011 */
+      {.mk = { 0x1a, 0 }, .brk = {       0 } }, /* 012 */
+      {.mk = { 0x1b, 0 }, .brk = {       0 } }, /* 013 */
+      {.mk = { 0x1c, 0 }, .brk = {       0 } }, /* 014 */
+      {.mk = { 0x1d, 0 }, .brk = {       0 } }, /* 015 */
+      {.mk = { 0x1e, 0 }, .brk = {       0 } }, /* 016 */
+      {.mk = { 0x1f, 0 }, .brk = {       0 } }, /* 017 */
+      {.mk = { 0x20, 0 }, .brk = {       0 } }, /* 018 */
+      {.mk = { 0x21, 0 }, .brk = {       0 } }, /* 019 */
+      {.mk = { 0x22, 0 }, .brk = {       0 } }, /* 01a */
+      {.mk = { 0x23, 0 }, .brk = {       0 } }, /* 01b */
+      {.mk = { 0x3b, 0 }, .brk = {       0 } }, /* 01c */
+      {.mk = { 0x41, 0 }, .brk = { 0xc1, 0 } }, /* 01d LCTRL */
+      {.mk = { 0x0c, 0 }, .brk = {       0 } }, /* 01e */
+      {.mk = { 0x0d, 0 }, .brk = {       0 } }, /* 01f */
+      {.mk = { 0x0e, 0 }, .brk = {       0 } }, /* 020 */
+      {.mk = { 0x0f, 0 }, .brk = {       0 } }, /* 021 */
+      {.mk = { 0x10, 0 }, .brk = {       0 } }, /* 022 */
+      {.mk = { 0x11, 0 }, .brk = {       0 } }, /* 023 */
+      {.mk = { 0x12, 0 }, .brk = {       0 } }, /* 024 */
+      {.mk = { 0x13, 0 }, .brk = {       0 } }, /* 025 */
+      {.mk = { 0x14, 0 }, .brk = {       0 } }, /* 026 */
+      {.mk = { 0x15, 0 }, .brk = {       0 } }, /* 027 */
+      {.mk = { 0x16, 0 }, .brk = {       0 } }, /* 028* */
+      {.mk = { 0x45, 0 }, .brk = {       0 } }, /* 029 0x45 Hankaku, Zenkaku */
+      {.mk = { 0x38, 0 }, .brk = { 0xb8, 0 } }, /* 02a LSHIFT */
+      {.mk = { 0x17, 0 }, .brk = {       0 } }, /* 02b 0x17 Mu */
+      {.mk = { 0x01, 0 }, .brk = {       0 } }, /* 02c */
+      {.mk = { 0x02, 0 }, .brk = {       0 } }, /* 02d */
+      {.mk = { 0x03, 0 }, .brk = {       0 } }, /* 02e */
+      {.mk = { 0x04, 0 }, .brk = {       0 } }, /* 02f */
+      {.mk = { 0x05, 0 }, .brk = {       0 } }, /* 030 */
+      {.mk = { 0x06, 0 }, .brk = {       0 } }, /* 031 */
+      {.mk = { 0x07, 0 }, .brk = {       0 } }, /* 032 */
+      {.mk = { 0x08, 0 }, .brk = {       0 } }, /* 033 */
+      {.mk = { 0x09, 0 }, .brk = {       0 } }, /* 034 */
+      {.mk = { 0x0a, 0 }, .brk = {       0 } }, /* 035 */
+      {.mk = { 0x39, 0 }, .brk = { 0xb9, 0 } }, /* 036 RSHIFT */
+      {.mk = { 0x64, 0 }, .brk = {       0 } }, /* 037 * (asterisk) */
+      {.mk = { 0x3A, 0 }, .brk = { 0xba, 0 } }, /* 038 0x3A LALT = Kanji */
+      {.mk = { 0x34, 0 }, .brk = {       0 } }, /* 039 */
+      {.mk = { 0x32, 0 }, .brk = { 0xb2, 0 } }, /* 03a CAPSLOCK */
+      {.mk = { 0x68, 0 }, .brk = {       0 } }, /* 03b F1 */
+      {.mk = { 0x69, 0 }, .brk = {       0 } }, /* 03c */
+      {.mk = { 0x6a, 0 }, .brk = {       0 } }, /* 03d */
+      {.mk = { 0x6b, 0 }, .brk = {       0 } }, /* 03e */
+      {.mk = { 0x6c, 0 }, .brk = {       0 } }, /* 03f */
+      {.mk = { 0x6d, 0 }, .brk = {       0 } }, /* 040 */
+      {.mk = { 0x6e, 0 }, .brk = {       0 } }, /* 041 */
+      {.mk = { 0x6f, 0 }, .brk = {       0 } }, /* 042 */
+      {.mk = { 0x70, 0 }, .brk = {       0 } }, /* 043 */
+      {.mk = { 0x71, 0 }, .brk = {       0 } }, /* 044 F10 */
+      {.mk = { 0x47, 0 }, .brk = {       0 } }, /* 045 NUMLOCKCLEAR -> Shift + SCRLOCK :TODO */
+      {.mk = { 0x75, 0 }, .brk = {       0 } }, /* 046 0x75 SCROLLLOCK */
+      {.mk = { 0x5d, 0 }, .brk = {       0 } }, /* 047 KP7 */
+      {.mk = { 0x5e, 0 }, .brk = {       0 } }, /* 048 */
+      {.mk = { 0x5f, 0 }, .brk = {       0 } }, /* 049 */
+      {.mk = { 0x67, 0 }, .brk = {       0 } }, /* 04a KP_MINUS */
+      {.mk = { 0x5a, 0 }, .brk = {       0 } }, /* 04b */
+      {.mk = { 0x5b, 0 }, .brk = {       0 } }, /* 04c */
+      {.mk = { 0x5c, 0 }, .brk = {       0 } }, /* 04d */
+      {.mk = { 0x63, 0 }, .brk = {       0 } }, /* 04e */
+      {.mk = { 0x57, 0 }, .brk = {       0 } }, /* 04f */
+      {.mk = { 0x58, 0 }, .brk = {       0 } }, /* 050 */
+      {.mk = { 0x59, 0 }, .brk = {       0 } }, /* 051 */
+      {.mk = { 0x55, 0 }, .brk = {       0 } }, /* 052 KP0 */
+      {.mk = { 0x56, 0 }, .brk = {       0 } }, /* 053 KP_PERIOD */
+      {.mk = {       0 }, .brk = {       0 } }, /* 054 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 055 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 056 */
+      {.mk = { 0x72, 0 }, .brk = {       0 } }, /* 057 F11 */
+      {.mk = { 0x73, 0 }, .brk = {       0 } }, /* 058 F12 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 059 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 05a */
+      {.mk = {       0 }, .brk = {       0 } }, /* 05b */
+      {.mk = {       0 }, .brk = {       0 } }, /* 05c */
+      {.mk = {       0 }, .brk = {       0 } }, /* 05d */
+      {.mk = {       0 }, .brk = {       0 } }, /* 05e */
+      {.mk = {       0 }, .brk = {       0 } }, /* 05f */
+      {.mk = {       0 }, .brk = {       0 } }, /* 060 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 061 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 062 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 063 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 064 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 065 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 066 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 067 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 068 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 069 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 06a */
+      {.mk = {       0 }, .brk = {       0 } }, /* 06b */
+      {.mk = {       0 }, .brk = {       0 } }, /* 06c */
+      {.mk = {       0 }, .brk = {       0 } }, /* 06d */
+      {.mk = {       0 }, .brk = {       0 } }, /* 06e */
+      {.mk = {       0 }, .brk = {       0 } }, /* 06f */
+      {.mk = { 0x36, 0 }, .brk = { 0xb6, 0 } }, /* 070 0x36 Kana */
+      {.mk = {       0 }, .brk = {       0 } }, /* 071 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 072 */
+      {.mk = { 0x0b, 0 }, .brk = {       0 } }, /* 073 0x0b Ro, Underline */
+      {.mk = {       0 }, .brk = {       0 } }, /* 074 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 075 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 076 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 077 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 078 */
+      {.mk = { 0x35, 0 }, .brk = {       0 } }, /* 079 0x35 Henkan */
+      {.mk = {       0 }, .brk = {       0 } }, /* 07a */
+      {.mk = { 0x33, 0 }, .brk = {       0 } }, /* 07b 0x33 Muhenkan */
+      {.mk = {       0 }, .brk = {       0 } }, /* 07c */
+      {.mk = { 0x30, 0 }, .brk = {       0 } }, /* 07d 0x30 Yen, Vertical line */
+      {.mk = {       0 }, .brk = {       0 } }, /* 07e */
+      {.mk = {       0 }, .brk = {       0 } }, /* 07f */
+      {.mk = {       0 }, .brk = {       0 } }, /* 080 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 081 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 082 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 083 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 084 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 085 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 086 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 087 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 088 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 089 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 08a */
+      {.mk = {       0 }, .brk = {       0 } }, /* 08b */
+      {.mk = {       0 }, .brk = {       0 } }, /* 08c */
+      {.mk = {       0 }, .brk = {       0 } }, /* 08d */
+      {.mk = {       0 }, .brk = {       0 } }, /* 08e */
+      {.mk = {       0 }, .brk = {       0 } }, /* 08f */
+      {.mk = {       0 }, .brk = {       0 } }, /* 090 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 091 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 092 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 093 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 094 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 095 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 096 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 097 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 098 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 099 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 09a */
+      {.mk = {       0 }, .brk = {       0 } }, /* 09b */
+      {.mk = {       0 }, .brk = {       0 } }, /* 09c */
+      {.mk = {       0 }, .brk = {       0 } }, /* 09d */
+      {.mk = {       0 }, .brk = {       0 } }, /* 09e */
+      {.mk = {       0 }, .brk = {       0 } }, /* 09f */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0a0 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0a1 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0a2 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0a3 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0a4 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0a5 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0a6 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0a7 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0a8 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0a9 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0aa */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0ab */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0ac */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0ad */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0ae */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0af */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0b0 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0b1 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0b2 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0b3 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0b4 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0b5 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0b6 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0b7 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0b8 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0b9 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0ba */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0bb */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0bc */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0bd */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0be */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0bf */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0c0 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0c1 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0c2 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0c3 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0c4 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0c5 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0c6 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0c7 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0c8 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0c9 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0ca */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0cb */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0cc */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0cd */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0ce */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0cf */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0d0 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0d1 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0d2 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0d3 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0d4 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0d5 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0d6 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0d7 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0d8 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0d9 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0da */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0db */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0dc */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0dd */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0de */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0df */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0e0 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0e1 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0e2 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0e3 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0e4 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0e5 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0e6 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0e7 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0e8 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0e9 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0ea */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0eb */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0ec */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0ed */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0ee */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0ef */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0f0 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0f1 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0f2 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0f3 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0f4 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0f5 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0f6 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0f7 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0f8 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0f9 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0fa */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0fb */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0fc */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0fd */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0fe */
+      {.mk = {       0 }, .brk = {       0 } }, /* 0ff */
+      {.mk = {       0 }, .brk = {       0 } }, /* 100 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 101 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 102 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 103 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 104 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 105 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 106 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 107 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 108 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 109 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 10a */
+      {.mk = {       0 }, .brk = {       0 } }, /* 10b */
+      {.mk = {       0 }, .brk = {       0 } }, /* 10c */
+      {.mk = {       0 }, .brk = {       0 } }, /* 10d */
+      {.mk = {       0 }, .brk = {       0 } }, /* 10e */
+      {.mk = {       0 }, .brk = {       0 } }, /* 10f */
+      {.mk = {       0 }, .brk = {       0 } }, /* 110 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 112 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 113 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 113 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 114 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 115 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 116 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 117 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 118 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 119 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 11a */
+      {.mk = {       0 }, .brk = {       0 } }, /* 11b */
+      {.mk = { 0x60, 0 }, .brk = {       0 } }, /* 11c KP_Enter */
+      {.mk = { 0x37, 0 }, .brk = { 0xb7, 0 } }, /* 11d R-Ctrl */
+      {.mk = {       0 }, .brk = {       0 } }, /* 11e */
+      {.mk = {       0 }, .brk = {       0 } }, /* 11f */
+      {.mk = {       0 }, .brk = {       0 } }, /* 120 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 121 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 122 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 123 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 124 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 125 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 126 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 127 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 128 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 129 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 12a */
+      {.mk = {       0 }, .brk = {       0 } }, /* 12b */
+      {.mk = {       0 }, .brk = {       0 } }, /* 12c */
+      {.mk = {       0 }, .brk = {       0 } }, /* 12d */
+      {.mk = {       0 }, .brk = {       0 } }, /* 12e */
+      {.mk = {       0 }, .brk = {       0 } }, /* 12f */
+      {.mk = {       0 }, .brk = {       0 } }, /* 130 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 131 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 132 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 133 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 134 */
+      {.mk = { 0x65, 0 }, .brk = {       0 } }, /* 135 KP_DIVIDE */
+      {.mk = {       0 }, .brk = {       0 } }, /* 136 */
+      {.mk = { 0x74, 0 }, .brk = {       0 } }, /* 137 PRINTSCREEN */
+      {.mk = { 0x31, 0 }, .brk = { 0xb1, 0 } }, /* 138* 0x31 R-Alt */
+      {.mk = {       0 }, .brk = {       0 } }, /* 139 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 13a */
+      {.mk = {       0 }, .brk = {       0 } }, /* 13b */
+      {.mk = {       0 }, .brk = {       0 } }, /* 13c */
+      {.mk = {       0 }, .brk = {       0 } }, /* 13d */
+      {.mk = {       0 }, .brk = {       0 } }, /* 13e */
+      {.mk = {       0 }, .brk = {       0 } }, /* 13f */
+      {.mk = {       0 }, .brk = {       0 } }, /* 140 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 141 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 142 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 143 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 144 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 145 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 146 */
+      {.mk = { 0x4c, 0 }, .brk = {       0 } }, /* 147 Home */
+      {.mk = { 0x4e, 0 }, .brk = {       0 } }, /* 148 Up */
+      {.mk = { 0x52, 0 }, .brk = {       0 } }, /* 149 PageUp */
+      {.mk = {       0 }, .brk = {       0 } }, /* 14a */
+      {.mk = { 0x4b, 0 }, .brk = {       0 } }, /* 14b Left */
+      {.mk = {       0 }, .brk = {       0 } }, /* 14c */
+      {.mk = { 0x4d, 0 }, .brk = {       0 } }, /* 14d Right */
+      {.mk = {       0 }, .brk = {       0 } }, /* 14e */
+      {.mk = { 0x53, 0 }, .brk = {       0 } }, /* 14f End */
+      {.mk = { 0x4a, 0 }, .brk = {       0 } }, /* 150 Down */
+      {.mk = { 0x54, 0 }, .brk = {       0 } }, /* 151 PageDown */
+      {.mk = { 0x4f, 0 }, .brk = {       0 } }, /* 152 Ins */
+      {.mk = { 0x50, 0 }, .brk = {       0 } }, /* 153 Del */
+      {.mk = {       0 }, .brk = {       0 } }, /* 154 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 155 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 156 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 157 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 158 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 159 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 15a */
+      {.mk = { 0x33, 0 }, .brk = {       0 } }, /* 15b 0x33 LGUI->Muhenkan (in emulator only) */
+      {.mk = { 0x35, 0 }, .brk = {       0 } }, /* 15c 0x35 RGUI->Henkan (in emulator only) */
+      {.mk = { 0x36, 0 }, .brk = { 0xb6, 0 } }, /* 15d 0x36 APPLICATION->Kana (in emulator only) */
+      {.mk = {       0 }, .brk = {       0 } }, /* 15e */
+      {.mk = {       0 }, .brk = {       0 } }, /* 15f */
+      {.mk = {       0 }, .brk = {       0 } }, /* 160 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 161 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 162 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 163 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 164 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 165 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 166 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 167 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 168 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 169 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 16a */
+      {.mk = {       0 }, .brk = {       0 } }, /* 16b */
+      {.mk = {       0 }, .brk = {       0 } }, /* 16c */
+      {.mk = {       0 }, .brk = {       0 } }, /* 16d */
+      {.mk = {       0 }, .brk = {       0 } }, /* 16e */
+      {.mk = {       0 }, .brk = {       0 } }, /* 16f */
+      {.mk = {       0 }, .brk = {       0 } }, /* 170 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 171 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 172 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 173 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 174 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 175 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 176 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 177 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 178 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 179 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 17a */
+      {.mk = {       0 }, .brk = {       0 } }, /* 17b */
+      {.mk = {       0 }, .brk = {       0 } }, /* 17c */
+      {.mk = {       0 }, .brk = {       0 } }, /* 17d */
+      {.mk = {       0 }, .brk = {       0 } }, /* 17e */
+      {.mk = {       0 }, .brk = {       0 } }, /* 17f */
+      {.mk = {       0 }, .brk = {       0 } }, /* 180 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 181 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 182 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 183 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 184 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 185 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 186 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 187 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 188 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 189 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 18a */
+      {.mk = {       0 }, .brk = {       0 } }, /* 18b */
+      {.mk = {       0 }, .brk = {       0 } }, /* 18c */
+      {.mk = {       0 }, .brk = {       0 } }, /* 18d */
+      {.mk = {       0 }, .brk = {       0 } }, /* 18e */
+      {.mk = {       0 }, .brk = {       0 } }, /* 18f */
+      {.mk = {       0 }, .brk = {       0 } }, /* 190 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 191 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 192 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 193 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 194 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 195 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 196 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 197 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 198 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 199 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 19a */
+      {.mk = {       0 }, .brk = {       0 } }, /* 19b */
+      {.mk = {       0 }, .brk = {       0 } }, /* 19c */
+      {.mk = {       0 }, .brk = {       0 } }, /* 19d */
+      {.mk = {       0 }, .brk = {       0 } }, /* 19e */
+      {.mk = {       0 }, .brk = {       0 } }, /* 19f */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1a0 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1a1 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1a2 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1a3 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1a4 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1a5 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1a6 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1a7 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1a8 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1a9 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1aa */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1ab */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1ac */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1ad */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1ae */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1af */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1b0 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1b1 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1b2 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1b3 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1b4 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1b5 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1b6 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1b7 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1b8 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1b9 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1ba */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1bb */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1bc */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1bd */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1be */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1bf */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1c0 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1c1 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1c2 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1c3 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1c4 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1c5 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1c6 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1c7 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1c8 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1c9 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1ca */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1cb */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1cv */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1cd */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1ce */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1cf */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1d0 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1d1 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1d2 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1d3 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1d4 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1d5 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1d6 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1d7 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1d8 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1d9 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1da */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1db */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1dc */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1dd */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1de */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1df */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1e0 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1e1 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1e2 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1e3 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1e4 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1e5 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1e6 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1e7 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1e8 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1e9 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1ea */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1eb */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1ec */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1ed */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1ee */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1ef */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1f0 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1f1 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1f2 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1f3 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1f4 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1f5 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1f6 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1f7 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1f8 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1f9 */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1fa */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1fb */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1fc */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1fd */
+      {.mk = {       0 }, .brk = {       0 } }, /* 1fe */
+      {.mk = {       0 }, .brk = {       0 } }  /* 1ff */
+    // clang-format on
+};
+
 #ifdef ENABLE_KEYBOARD_AT_LOG
 int keyboard_at_do_log = ENABLE_KEYBOARD_AT_LOG;
 
@@ -494,21 +5295,43 @@ keyboard_at_log(const char *fmt, ...)
 #endif
 
 static void
-keyboard_at_set_scancode_set(void)
+keyboard_at_set_scancode_set(atkbc_dev_t *dev)
 {
     switch (keyboard_mode) {
         default:
         case 0x01:
-            keyboard_set_table(scancode_set1);
+            if (dev->type & FLAG_AX)
+                keyboard_set_table(scancode_set1_ax);
+            else if ((dev->type & FLAG_TYPE_MASK) > KBD_84_KEY)
+                keyboard_set_table(scancode_set1);
+            else
+                keyboard_set_table(scancode_set1_at);
             break;
 
         case 0x02:
-            keyboard_set_table(scancode_set2);
+            if (dev->type & FLAG_AX)
+                keyboard_set_table(scancode_set2_ax);
+            else if ((dev->type & FLAG_TYPE_MASK) > KBD_84_KEY)
+                keyboard_set_table(scancode_set2);
+            else
+                keyboard_set_table(scancode_set2_at);
             break;
 
         case 0x03:
             keyboard_set_table(scancode_set3);
             break;
+
+        case 0x81:
+            keyboard_set_table(scancode_set81);
+            break;
+
+        case 0x82:
+            keyboard_set_table(scancode_set82);
+            break;
+
+        case 0x8a:
+            keyboard_set_table(scancode_set8a);
+            break;
     }
 }
 
@@ -527,9 +5350,92 @@ add_data_kbd(uint16_t val)
     uint8_t  num_lock = 0;
     uint8_t  shift_states = 0;
 
+    if ((keyboard_mode == 0x03) && (val == 0x8c)) {
+        is_special = 1;
+        return;
+    } else if (is_special) {
+        uint8_t keys = (dev->type & FLAG_TYPE_MASK);
+
+        switch (val) {
+            case 0x2b:
+                switch (keys) {
+                    default:
+                        val = 0x5c;
+                        break;
+                    case KBD_102_KEY: case KBD_JIS:
+                    case KBD_ABNT2:
+                        val = 0x53;
+                        break;
+                }
+                break;
+            case 0x56:
+                switch (keys) {
+                    default:
+                        val = 0x12;
+                        break;
+                    case KBD_102_KEY: case KBD_ABNT2:
+                        val = 0x13;
+                        break;
+                }
+                break;
+            case 0x70:
+                switch (keys) {
+                    default:
+                        val = 0x29;
+                        break;
+                    case KBD_JIS:
+                        val = 0x87;
+                        break;
+                }
+                break;
+            case 0x73:
+                switch (keys) {
+                    default:
+                        val = 0x59;
+                        break;
+                    case KBD_JIS: case KBD_ABNT2:
+                        val = 0x5c;
+                        break;
+                }
+                break;
+            case 0x79:
+                switch (keys) {
+                    default:
+                        val = 0x29;
+                        break;
+                    case KBD_JIS:
+                        val = 0x86;
+                        break;
+                }
+                break;
+            case 0x7b:
+                switch (keys) {
+                    default:
+                        val = 0x29;
+                        break;
+                    case KBD_JIS:
+                        val = 0x85;
+                        break;
+                }
+                break;
+            case 0x7d:
+                switch (keys) {
+                    default:
+                        val = 0x66;
+                        break;
+                    case KBD_JIS:
+                        val = 0x13;
+                        break;
+                }
+                break;
+        }
+
+        is_special = 0;
+    }
+
     dev->ignore = 1;
 
-    keyboard_get_states(NULL, &num_lock, NULL);
+    keyboard_get_states(NULL, &num_lock, NULL, NULL);
     shift_states = keyboard_get_shift() & STATE_SHIFT_MASK;
 
     switch (val) {
@@ -716,7 +5622,9 @@ keyboard_at_set_defaults(atkbc_dev_t *dev)
     memset(keyboard_set3_flags, 0, 512);
 
     keyboard_mode = 0x02;
-    keyboard_at_set_scancode_set();
+    keyboard_at_set_scancode_set(dev);
+
+    is_special = 0;
 }
 
 static void
@@ -729,6 +5637,10 @@ keyboard_at_bat(void *priv)
 
         keyboard_scan = 1;
 
+        keyboard_all_up();
+        keyboard_update_states(0, 0, 0, 0);
+
+        keyboard_set_in_reset(0);
         kbc_at_dev_queue_add(dev, 0xaa, 0);
     } else {
         bat_counter--;
@@ -743,7 +5655,6 @@ keyboard_at_invalid_cmd(atkbc_dev_t *dev)
     kbc_at_dev_queue_add(dev, inv_cmd_response, 0);
 }
 
-
 static void
 keyboard_at_write(void *priv)
 {
@@ -763,23 +5674,30 @@ keyboard_at_write(void *priv)
         switch (dev->command) {
             case 0xed: /* Set/reset LEDs */
                 kbc_at_dev_queue_add(dev, 0xfa, 0);
+                keyboard_update_states(!!(val & 0x4), !!(val & 0x2), val & 0x1, !!(val & 0x8));
                 keyboard_at_log("%s: Set/reset LEDs [%02X]\n", dev->name, val);
                 break;
 
             case 0xf0: /* Get/set scancode set */
-                kbc_at_dev_queue_add(dev, (val > 3) ? 0xfe : 0xfa, 0);
                 switch (val) {
                     case 0x00:
+                        kbc_at_dev_queue_add(dev, 0xfa, 0); /* ACK */
                         keyboard_at_log("%s: Get scan code set [%02X]\n", dev->name, keyboard_mode);
                         kbc_at_dev_queue_add(dev, keyboard_mode, 0);
                         break;
                     case 0x01 ... 0x03:
+                    case 0x81:
+                    case 0x82:
+                    case 0x8a:
+                        kbc_at_dev_queue_add(dev, 0xfa, 0); /* ACK */
                         keyboard_mode = val;
+                        is_special = 0;
                         keyboard_at_log("%s: Set scan code set [%02X]\n", dev->name, keyboard_mode);
-                        keyboard_at_set_scancode_set();
+                        keyboard_at_set_scancode_set(dev);
                         break;
                     default:
                         /* Fatal so any instance of anything attempting to set scan code > 3 can be reported to us. */
+                        kbc_at_dev_queue_add(dev, 0xfe, 0); /* Resend */
                         fatal("%s: Scan code set [%02X] invalid, resend\n", dev->name, val);
                         dev->flags |= FLAG_CTRLDAT;
                         dev->state = DEV_STATE_MAIN_WANT_IN;
@@ -806,18 +5724,24 @@ keyboard_at_write(void *priv)
         }
     } else {
         if (dev->flags & FLAG_CTRLDAT) {
-            /* Special case - another command during another command that wants input - proceed
+            /*
+               Special case - another command during another command that wants input - proceed
                as normal but do not cancel the command (so keep waiting for input), unless the
-               command in progress is ED (Set/reset LEDs). */
-            if (val == 0xed) {
-                keyboard_scan = 1;
+               command in progress is ED (Set/reset LEDs).
+
+               It appears to also apply to command EE (Echo), F4 (Enable), F5 (Diable and Set
+               Default), and F6 (SetDefault).
+             */
+            if ((val == 0xed) || (val == 0xee) || (val == 0xf4) || (val == 0xf5) || (val == 0xf6))
                 dev->flags &= ~FLAG_CTRLDAT;
-            } else
+            else
                 dev->state = DEV_STATE_MAIN_WANT_IN;
         }
 
         switch (val) {
             case 0xed: /* set/reset LEDs */
+                if ((dev->flags & FLAG_CTRLDAT) && (dev->command == 0xed))
+                    keyboard_scan = 1;
                 dev->command = val;
                 keyboard_at_log("%s: set/reset LEDs\n", dev->name);
                 dev->flags |= FLAG_CTRLDAT;
@@ -837,7 +5761,7 @@ keyboard_at_write(void *priv)
                 break;
 
             case 0xf0: /* get/set scan code set */
-                if (dev->type & FLAG_PS2) {
+                if (dev->type & FLAG_PS2_KBD) {
                     dev->command = val;
                     keyboard_at_log("%s: scan code set\n", dev->name);
                     dev->flags |= FLAG_CTRLDAT;
@@ -848,7 +5772,7 @@ keyboard_at_write(void *priv)
                 break;
 
             case 0xf2: /* read ID */
-                keyboard_at_log("%s: read keyboard id\n", dev->name);
+                keyboard_at_log("%s: read keyboard id: ", dev->name);
                 /* TODO: After keyboard type selection is implemented, make this
                          return the correct keyboard ID for the selected type. */
                 kbc_at_dev_queue_add(dev, 0xfa, 0);
@@ -857,7 +5781,9 @@ keyboard_at_write(void *priv)
                         break;
 
                     kbc_at_dev_queue_add(dev, id_bytes[dev->type][i], 0);
+                    keyboard_at_log("%02X ", id_bytes[dev->type][i]);
                 }
+                keyboard_at_log("\n");
                 break;
 
             case 0xf3: /* set command mode */
@@ -878,6 +5804,13 @@ keyboard_at_write(void *priv)
             case 0xf6: /* set defaults */
                 keyboard_at_log("%s: set defaults%s\n",
                                 dev->name, (val == 0xf6) ? "" : " and disable keyboard");
+                dev->port->out_new = -1;
+                dev->port->wantcmd = 0;
+
+                kbc_at_dev_queue_reset(dev, 1);
+
+                dev->last_scan_code = 0x00;
+
                 keyboard_scan = !(val & 0x01);
                 keyboard_at_log("%s: val = %02X, keyboard_scan = %i\n",
                                 dev->name, val, keyboard_scan);
@@ -888,11 +5821,11 @@ keyboard_at_write(void *priv)
                 memset(keyboard_set3_flags, 0, 512);
 
                 keyboard_mode = 0x02;
-                keyboard_at_set_scancode_set();
+                keyboard_at_set_scancode_set(dev);
                 break;
 
             case 0xf7: /* set all keys to repeat */
-                if (dev->type & FLAG_PS2) {
+                if (dev->type & FLAG_PS2_KBD) {
                     keyboard_at_log("%s: set all keys to repeat\n", dev->name);
                     kbc_at_dev_queue_add(dev, 0xfa, 0);
                     keyboard_set3_all_break = 1;
@@ -901,7 +5834,7 @@ keyboard_at_write(void *priv)
                 break;
 
             case 0xf8: /* set all keys to give make/break codes */
-                if (dev->type & FLAG_PS2) {
+                if (dev->type & FLAG_PS2_KBD) {
                     keyboard_at_log("%s: set all keys to give make/break codes\n", dev->name);
                     kbc_at_dev_queue_add(dev, 0xfa, 0);
                     keyboard_set3_all_break = 1;
@@ -910,7 +5843,7 @@ keyboard_at_write(void *priv)
                 break;
 
             case 0xf9: /* set all keys to give make codes only */
-                if (dev->type & FLAG_PS2) {
+                if (dev->type & FLAG_PS2_KBD) {
                     keyboard_at_log("%s: set all keys to give make codes only\n", dev->name);
                     kbc_at_dev_queue_add(dev, 0xfa, 0);
                     keyboard_set3_all_break = 0;
@@ -919,7 +5852,7 @@ keyboard_at_write(void *priv)
                 break;
 
             case 0xfa: /* set all keys to repeat and give make/break codes */
-                if (dev->type & FLAG_PS2) {
+                if (dev->type & FLAG_PS2_KBD) {
                     keyboard_at_log("%s: set all keys to repeat and give make/break codes\n", dev->name);
                     kbc_at_dev_queue_add(dev, 0xfa, 0);
                     keyboard_set3_all_repeat = 1;
@@ -951,6 +5884,7 @@ keyboard_at_write(void *priv)
                 break;
 
             case 0xff: /* reset */
+                keyboard_set_in_reset(1);
                 kbc_at_dev_reset(dev, 1);
                 bat_counter = 1000;
                 break;
@@ -961,6 +5895,44 @@ keyboard_at_write(void *priv)
     }
 }
 
+#ifdef SCAN_CODE_TABLES_COMPARISON
+/* Non-translated to translated scan codes. */
+static const uint8_t nont_to_t[256] = {
+    0x00, 0x43, 0x41, 0x3f, 0x3d, 0x3b, 0x3c, 0x58,
+    0x64, 0x44, 0x42, 0x40, 0x3e, 0x0f, 0x29, 0x59,
+    0x65, 0x38, 0x2a, 0x70, 0x1d, 0x10, 0x02, 0x5a,
+    0x66, 0x71, 0x2c, 0x1f, 0x1e, 0x11, 0x03, 0x5b,
+    0x67, 0x2e, 0x2d, 0x20, 0x12, 0x05, 0x04, 0x5c,
+    0x68, 0x39, 0x2f, 0x21, 0x14, 0x13, 0x06, 0x5d,
+    0x69, 0x31, 0x30, 0x23, 0x22, 0x15, 0x07, 0x5e,
+    0x6a, 0x72, 0x32, 0x24, 0x16, 0x08, 0x09, 0x5f,
+    0x6b, 0x33, 0x25, 0x17, 0x18, 0x0b, 0x0a, 0x60,
+    0x6c, 0x34, 0x35, 0x26, 0x27, 0x19, 0x0c, 0x61,
+    0x6d, 0x73, 0x28, 0x74, 0x1a, 0x0d, 0x62, 0x6e,
+    0x3a, 0x36, 0x1c, 0x1b, 0x75, 0x2b, 0x63, 0x76,
+    0x55, 0x56, 0x77, 0x78, 0x79, 0x7a, 0x0e, 0x7b,
+    0x7c, 0x4f, 0x7d, 0x4b, 0x47, 0x7e, 0x7f, 0x6f,
+    0x52, 0x53, 0x50, 0x4c, 0x4d, 0x48, 0x01, 0x45,
+    0x57, 0x4e, 0x51, 0x4a, 0x37, 0x49, 0x46, 0x54,
+    0x80, 0x81, 0x82, 0x41, 0x54, 0x85, 0x86, 0x87,
+    0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+    0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+    0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+    0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
+    0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+    0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+    0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+    0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+    0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+    0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
+    0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+    0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
+    0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
+    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+    0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+};
+#endif
+
 /*
  * Initialize the device for use by the user.
  *
@@ -981,7 +5953,13 @@ keyboard_at_init(const device_t *info)
        Key 63  = Japanese key between right Ctrl and right Alt, scan code: 86 (Henkan/Zenkouho 79);
        Key 65? = Japanese key between right Ctrl and right Alt, scan code: 87 (Hiragana/Katakana 70).
      */
-    dev->type = FLAG_PS2 | KBD_102_KEY /* device_get_config_int("type") */;
+    dev->type = info->local | device_get_config_int("keys");
+
+    /*
+        We assume that the IBM PS/55 machine uses the 5576-002 keyboard (JP/CN layout) here.
+        This is not smart but suitable for supporting a keyboard ID that is rarely used in standard PCs.
+        At least, the Taiwanese PS/55 uses the same keyboard ID and scancode set. The Korean one is unknown.
+    */
 
     keyboard_at_log("%s: type=%d\n", dev->name, dev->type);
 
@@ -999,8 +5977,143 @@ keyboard_at_init(const device_t *info)
 
     keyboard_send = add_data_kbd;
     SavedKbd = dev;
+    keyboard_update_states(0, 0, 0, 0);
 
-    inv_cmd_response = (dev->type & FLAG_PS2) ? 0xfe : 0xfa;
+    inv_cmd_response = (dev->type & FLAG_PS2_KBD) ? 0xfe : 0xfa;
+
+    is_special = 0;
+
+#ifdef SCAN_CODE_TABLES_COMPARISON
+    pclog_toggle_suppr();
+
+    pclog("Scan code set 01 vs. 81 (make):\n===============================\n");
+    for (int i = 0; i < 512; i++) {
+        pclog("Scan code %03X:", i);
+        int j = 0;
+        do {
+            if (scancode_set1[i].mk[j] == scancode_set81[i].mk[j])
+                pclog(" --");
+            else 
+                pclog(" (%02X != %02X)", scancode_set1[i].mk[j], scancode_set81[i].mk[j]);
+            j++;
+        } while ((scancode_set1[i].mk[j] != 0) && (scancode_set81[i].mk[j] != 0));
+        pclog("\n");
+    }
+
+    pclog("\nScan code set 01 vs. 81 (break):\n================================\n");
+    for (int i = 0; i < 512; i++) {
+        pclog("Scan code %03X:", i);
+        int j = 0;
+        do {
+            if (scancode_set1[i].brk[j] == scancode_set81[i].brk[j])
+                pclog(" --");
+            else 
+                pclog(" (%02X != %02X)", scancode_set1[i].brk[j], scancode_set81[i].brk[j]);
+            j++;
+        } while ((scancode_set1[i].brk[j] != 0) && (scancode_set81[i].brk[j] != 0));
+        pclog("\n");
+    }
+
+    pclog("\nScan code set 02 vs. 82 (make):\n===============================\n");
+    for (int i = 0; i < 512; i++) {
+        pclog("Scan code %03X:", i);
+        int j = 0;
+        do {
+            if (scancode_set2[i].mk[j] == scancode_set82[i].mk[j])
+                pclog(" --");
+            else 
+                pclog(" (%02X != %02X)", scancode_set2[i].mk[j], scancode_set82[i].mk[j]);
+            j++;
+        } while ((scancode_set2[i].mk[j] != 0) && (scancode_set82[i].mk[j] != 0));
+        pclog("\n");
+    }
+
+    pclog("\nScan code set 02 vs. 82 (break):\n================================\n");
+    for (int i = 0; i < 512; i++) {
+        pclog("Scan code %03X:", i);
+        int j = 0;
+        do {
+            if (scancode_set2[i].brk[j] == scancode_set82[i].brk[j])
+                pclog(" --");
+            else 
+                pclog(" (%02X != %02X)", scancode_set2[i].brk[j], scancode_set82[i].brk[j]);
+            j++;
+        } while ((scancode_set2[i].brk[j] != 0) && (scancode_set82[i].brk[j] != 0));
+        pclog("\n");
+    }
+
+    pclog("\nScan code set 01 vs. 02 (make):\n===============================\n");
+    for (int i = 0; i < 512; i++) {
+        pclog("Scan code %03X:", i);
+        int j = 0;
+        int k = 0;
+        int was_f0 = 0;
+        do {
+            if (scancode_set2[i].mk[k] == 0xf0)
+                was_f0 = 1;
+            else {
+                uint8_t code = nont_to_t[scancode_set2[i].mk[k]];
+
+                if (was_f0) {
+                    if (code & 0x80)
+                        code = 0x00;
+                    else
+                        code |= 0x80;
+
+                    was_f0 = 0;
+                }
+
+                if (scancode_set1[i].mk[j] == code)
+                    pclog(" --");
+                else 
+                    pclog(" (%02X != %02X)", scancode_set1[i].mk[j], code);
+
+                j++;
+            }
+
+            k++;
+        } while ((scancode_set1[i].mk[j] != 0) && (scancode_set2[i].mk[k] != 0));
+        pclog("\n");
+    }
+
+    pclog("\nScan code set 01 vs. 02 (break):\n================================\n");
+    for (int i = 0; i < 512; i++) {
+        pclog("Scan code %03X:", i);
+        int j = 0;
+        int k = 0;
+        int was_f0 = 0;
+        do {
+            if (scancode_set2[i].brk[k] == 0xf0)
+                was_f0 = 1;
+            else {
+                uint8_t code = nont_to_t[scancode_set2[i].brk[k]];
+
+                if (was_f0) {
+                    if (code & 0x80)
+                        code = 0x00;
+                    else
+                        code |= 0x80;
+
+                    was_f0 = 0;
+                }
+
+                if (scancode_set1[i].brk[j] == code)
+                    pclog(" --");
+                else 
+                    pclog(" (%02X != %02X)", scancode_set1[i].brk[j], code);
+
+                j++;
+            }
+
+            k++;
+        } while ((scancode_set1[i].brk[j] != 0) && (scancode_set2[i].brk[k] != 0));
+        pclog("\n");
+    }
+
+    pclog_toggle_suppr();
+
+    fatal("Comparison finished\n");
+#endif
 
     /* Return our private data to the I/O layer. */
     return dev;
@@ -1017,6 +6130,8 @@ keyboard_at_close(void *priv)
     /* Disable the scancode maps. */
     keyboard_set_table(NULL);
 
+    keyboard_update_states(0, 0, 0, 0);
+
     SavedKbd = NULL;
 
     free(dev);
@@ -1025,23 +6140,22 @@ keyboard_at_close(void *priv)
 static const device_config_t keyboard_at_config[] = {
   // clang-format off
     {
-        .name = "type",
-        .description = "Type",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 2,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "AT 84-key",          .value = FLAG_AT  | KBD_84_KEY  },
-            { .description = "AT 101/102/106-key", .value = FLAG_AT  | KBD_101_KEY },
-            { .description = "AT Korean",          .value = FLAG_AT  | KBD_KOREAN  },
-            { .description = "PS/2 101-key",       .value = FLAG_PS2 | KBD_101_KEY },
-            { .description = "PS/2 102-key",       .value = FLAG_PS2 | KBD_102_KEY },
-            { .description = "PS/2 106-key JIS",   .value = FLAG_PS2 | KBD_JIS     },
-            { .description = "PS/2 Korean",        .value = FLAG_PS2 | KBD_KOREAN  },
-            { .description = ""                                                    }
-        }
+        .name           = "keys",
+        .description    = "Keys",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = KBD_101_KEY,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "84",          .value = KBD_84_KEY  },
+            { .description = "101 (ANSI)",  .value = KBD_101_KEY },
+            { .description = "102 (ISO)",   .value = KBD_102_KEY },
+            { .description = "106 (JIS)",   .value = KBD_JIS     },
+            { .description = "103 (KSC)",   .value = KBD_KSC     },
+            { .description = "104 (ABNT2)", .value = KBD_ABNT2   }
+        },
+        .bios           = { { 0 } }
     },
     {
         .name = "", .description = "", .type = CONFIG_END
@@ -1049,17 +6163,98 @@ static const device_config_t keyboard_at_config[] = {
   // clang-format on
 };
 
-/* TODO: Add more keyboard types. */
-const device_t keyboard_at_generic_device = {
-    .name          = "Standard AT or PS/2 Keyboard",
-    .internal_name = "ps2",
-    .flags         = DEVICE_PS2,
-    .local         = 0,
+static const device_config_t keyboard_ps2_config[] = {
+  // clang-format off
+    {
+        .name           = "keys",
+        .description    = "Keys",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = KBD_101_KEY,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "101 (ANSI)",  .value = KBD_101_KEY },
+            { .description = "102 (ISO)",   .value = KBD_102_KEY },
+            { .description = "106 (JIS)",   .value = KBD_JIS     },
+            { .description = "103 (KSC)",   .value = KBD_KSC     },
+            { .description = "104 (ABNT2)", .value = KBD_ABNT2   }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name = "", .description = "", .type = CONFIG_END
+    }
+  // clang-format on
+};
+
+const device_t keyboard_at_device = {
+    .name          = "AT Keyboard",
+    .internal_name = "keyboard_at",
+    .flags         = DEVICE_AT_KBC,
+    .local         = FLAG_AT,
     .init          = keyboard_at_init,
     .close         = keyboard_at_close,
     .reset         = NULL,
-    { .poll = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = keyboard_at_config
 };
+
+const device_t keyboard_ax_device = {
+    .name          = "AX Keyboard",
+    .internal_name = "keyboard_ax",
+    .flags         = DEVICE_AT_KBC,
+    .local         = FLAG_AX | KBD_JIS,
+    .init          = keyboard_at_init,
+    .close         = keyboard_at_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t keyboard_ps2_device = {
+    .name          = "PS/2 Keyboard",
+    .internal_name = "keyboard_ps2",
+    .flags         = DEVICE_AT_KBC | DEVICE_PS2_KBC,
+    .local         = FLAG_PS2_KBD,
+    .init          = keyboard_at_init,
+    .close         = keyboard_at_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = keyboard_ps2_config
+};
+
+const device_t keyboard_ps55_device = {
+    .name          = "PS/55 Keyboard",
+    .internal_name = "keyboard_ps55",
+    .flags         = DEVICE_AT_KBC | DEVICE_PS2_KBC,
+    .local         = FLAG_PS2_KBD | KBD_JIS,
+    .init          = keyboard_at_init,
+    .close         = keyboard_at_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t keyboard_at_generic_device = {
+    .name          = "AT/PS/2 Keyboard",
+    .internal_name = "keyboard_at",
+    .flags         = DEVICE_AT_KBC,
+    .local         = KBD_102_KEY,
+    .init          = keyboard_at_init,
+    .close         = keyboard_at_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = keyboard_at_config
+};
+
diff --git a/src/device/keyboard_xt.c b/src/device/keyboard_xt.c
index f65a6dffc..2936868b0 100644
--- a/src/device/keyboard_xt.c
+++ b/src/device/keyboard_xt.c
@@ -29,1081 +29,592 @@
 #include <wchar.h>
 #include <86box/86box.h>
 #include <86box/device.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/fdd.h>
 #include <86box/machine.h>
 #include <86box/m_xt_t1000.h>
 #include <86box/cassette.h>
-#include <86box/io.h>
-#include <86box/pic.h>
-#include <86box/pit.h>
-#include <86box/ppi.h>
-#include <86box/mem.h>
-#include <86box/rom.h>
-#include <86box/sound.h>
-#include <86box/snd_speaker.h>
-#include <86box/video.h>
 #include <86box/keyboard.h>
 
-#define STAT_PARITY   0x80
-#define STAT_RTIMEOUT 0x40
-#define STAT_TTIMEOUT 0x20
-#define STAT_LOCK     0x10
-#define STAT_CD       0x08
-#define STAT_SYSFLAG  0x04
-#define STAT_IFULL    0x02
-#define STAT_OFULL    0x01
-
-/* Keyboard Types */
-enum {
-    KBD_TYPE_PC81 = 0,
-    KBD_TYPE_PC82,
-    KBD_TYPE_XT82,
-    KBD_TYPE_XT86,
-    KBD_TYPE_COMPAQ,
-    KBD_TYPE_TANDY,
-    KBD_TYPE_TOSHIBA,
-    KBD_TYPE_VTECH,
-    KBD_TYPE_OLIVETTI,
-    KBD_TYPE_ZENITH,
-    KBD_TYPE_PRAVETZ,
-    KBD_TYPE_HYUNDAI,
-    KBD_TYPE_XTCLONE
-};
-
-typedef struct xtkbd_t {
-    int want_irq;
-    int blocked;
-    int tandy;
-
-    uint8_t pa;
-    uint8_t pb;
-    uint8_t pd;
-    uint8_t clock;
-    uint8_t key_waiting;
-    uint8_t type;
-    uint8_t pravetz_flags;
-
-    pc_timer_t send_delay_timer;
-} xtkbd_t;
-
 /*XT keyboard has no escape scancodes, and no scancodes beyond 53*/
 const scancode scancode_xt[512] = {
   // clang-format off
-    { {0},       {0}       }, { {0x01, 0}, {0x81, 0} },
-    { {0x02, 0}, {0x82, 0} }, { {0x03, 0}, {0x83, 0} },
-    { {0x04, 0}, {0x84, 0} }, { {0x05, 0}, {0x85, 0} },
-    { {0x06, 0}, {0x86, 0} }, { {0x07, 0}, {0x87, 0} },
-    { {0x08, 0}, {0x88, 0} }, { {0x09, 0}, {0x89, 0} },
-    { {0x0a, 0}, {0x8a, 0} }, { {0x0b, 0}, {0x8b, 0} },
-    { {0x0c, 0}, {0x8c, 0} }, { {0x0d, 0}, {0x8d, 0} },
-    { {0x0e, 0}, {0x8e, 0} }, { {0x0f, 0}, {0x8f, 0} },
-    { {0x10, 0}, {0x90, 0} }, { {0x11, 0}, {0x91, 0} },
-    { {0x12, 0}, {0x92, 0} }, { {0x13, 0}, {0x93, 0} },
-    { {0x14, 0}, {0x94, 0} }, { {0x15, 0}, {0x95, 0} },
-    { {0x16, 0}, {0x96, 0} }, { {0x17, 0}, {0x97, 0} },
-    { {0x18, 0}, {0x98, 0} }, { {0x19, 0}, {0x99, 0} },
-    { {0x1a, 0}, {0x9a, 0} }, { {0x1b, 0}, {0x9b, 0} },
-    { {0x1c, 0}, {0x9c, 0} }, { {0x1d, 0}, {0x9d, 0} },
-    { {0x1e, 0}, {0x9e, 0} }, { {0x1f, 0}, {0x9f, 0} },
-    { {0x20, 0}, {0xa0, 0} }, { {0x21, 0}, {0xa1, 0} },
-    { {0x22, 0}, {0xa2, 0} }, { {0x23, 0}, {0xa3, 0} },
-    { {0x24, 0}, {0xa4, 0} }, { {0x25, 0}, {0xa5, 0} },
-    { {0x26, 0}, {0xa6, 0} }, { {0x27, 0}, {0xa7, 0} },
-    { {0x28, 0}, {0xa8, 0} }, { {0x29, 0}, {0xa9, 0} },
-    { {0x2a, 0}, {0xaa, 0} }, { {0x2b, 0}, {0xab, 0} },
-    { {0x2c, 0}, {0xac, 0} }, { {0x2d, 0}, {0xad, 0} },
-    { {0x2e, 0}, {0xae, 0} }, { {0x2f, 0}, {0xaf, 0} },
-    { {0x30, 0}, {0xb0, 0} }, { {0x31, 0}, {0xb1, 0} },
-    { {0x32, 0}, {0xb2, 0} }, { {0x33, 0}, {0xb3, 0} },
-    { {0x34, 0}, {0xb4, 0} }, { {0x35, 0}, {0xb5, 0} },
-    { {0x36, 0}, {0xb6, 0} }, { {0x37, 0}, {0xb7, 0} },
-    { {0x38, 0}, {0xb8, 0} }, { {0x39, 0}, {0xb9, 0} },
-    { {0x3a, 0}, {0xba, 0} }, { {0x3b, 0}, {0xbb, 0} },
-    { {0x3c, 0}, {0xbc, 0} }, { {0x3d, 0}, {0xbd, 0} },
-    { {0x3e, 0}, {0xbe, 0} }, { {0x3f, 0}, {0xbf, 0} },
-    { {0x40, 0}, {0xc0, 0} }, { {0x41, 0}, {0xc1, 0} },
-    { {0x42, 0}, {0xc2, 0} }, { {0x43, 0}, {0xc3, 0} },
-    { {0x44, 0}, {0xc4, 0} }, { {0x45, 0}, {0xc5, 0} },
-    { {0x46, 0}, {0xc6, 0} }, { {0x47, 0}, {0xc7, 0} },
-    { {0x48, 0}, {0xc8, 0} }, { {0x49, 0}, {0xc9, 0} },
-    { {0x4a, 0}, {0xca, 0} }, { {0x4b, 0}, {0xcb, 0} },
-    { {0x4c, 0}, {0xcc, 0} }, { {0x4d, 0}, {0xcd, 0} },
-    { {0x4e, 0}, {0xce, 0} }, { {0x4f, 0}, {0xcf, 0} },
-    { {0x50, 0}, {0xd0, 0} }, { {0x51, 0}, {0xd1, 0} },
-    { {0x52, 0}, {0xd2, 0} }, { {0x53, 0}, {0xd3, 0} },
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*054*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*058*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*05c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*060*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*064*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*068*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*06c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*070*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*074*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*078*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*07c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*080*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*084*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*088*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*08c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*090*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*094*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*098*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*09c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0a0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0a4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0a8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0ac*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0b0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0b4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0b8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0bc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0c0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0c4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0c8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0cc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0d0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0d4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0d8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0dc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0e0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0e4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0e8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0ec*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0f0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0f4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0f8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0fc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*100*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*104*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*108*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*10c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*110*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*114*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*118*/
-    { {0x1c, 0}, {0x9c, 0} }, { {0x1d, 0}, {0x9d, 0} },
-    { {0},             {0} }, { {0},             {0} }, /*11c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*120*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*124*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*128*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*12c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*130*/
-    { {0},             {0} }, { {0x35, 0}, {0xb5, 0} },
-    { {0},             {0} }, { {0x37, 0}, {0xb7, 0} }, /*134*/
-    { {0x38, 0}, {0xb8, 0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*138*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*13c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*140*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0x46, 0}, {0xc6, 0} }, { {0x47, 0}, {0xc7, 0} }, /*144*/
-    { {0x48, 0}, {0xc8, 0} }, { {0x49, 0}, {0xc9, 0} },
-    { {0},             {0} }, { {0x4b, 0}, {0xcb, 0} }, /*148*/
-    { {0},             {0} }, { {0x4d, 0}, {0xcd, 0} },
-    { {0},             {0} }, { {0x4f, 0}, {0xcf, 0} }, /*14c*/
-    { {0x50, 0}, {0xd0, 0} }, { {0x51, 0}, {0xd1, 0} },
-    { {0x52, 0}, {0xd2, 0} }, { {0x53, 0}, {0xd3, 0} }, /*150*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*154*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*158*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*15c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*160*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*164*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*168*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*16c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*170*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*174*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*148*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*17c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*180*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*184*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*88*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*18c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*190*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*194*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*198*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*19c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1a0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1a4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1a8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1ac*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1b0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1b4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1b8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1bc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1c0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1c4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1c8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1cc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1d0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1d4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1d8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1dc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1e0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1e4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1e8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1ec*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1f0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1f4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1f8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} } /*1fc*/
+    { .mk = {            0 }, .brk = {                   0 } }, /* 000 */
+    { .mk = {      0x01, 0 }, .brk = {             0x81, 0 } }, /* 001 */
+    { .mk = {      0x02, 0 }, .brk = {             0x82, 0 } }, /* 002 */
+    { .mk = {      0x03, 0 }, .brk = {             0x83, 0 } }, /* 003 */
+    { .mk = {      0x04, 0 }, .brk = {             0x84, 0 } }, /* 004 */
+    { .mk = {      0x05, 0 }, .brk = {             0x85, 0 } }, /* 005 */
+    { .mk = {      0x06, 0 }, .brk = {             0x86, 0 } }, /* 006 */
+    { .mk = {      0x07, 0 }, .brk = {             0x87, 0 } }, /* 007 */
+    { .mk = {      0x08, 0 }, .brk = {             0x88, 0 } }, /* 008 */
+    { .mk = {      0x09, 0 }, .brk = {             0x89, 0 } }, /* 009 */
+    { .mk = {      0x0a, 0 }, .brk = {             0x8a, 0 } }, /* 00a */
+    { .mk = {      0x0b, 0 }, .brk = {             0x8b, 0 } }, /* 00b */
+    { .mk = {      0x0c, 0 }, .brk = {             0x8c, 0 } }, /* 00c */
+    { .mk = {      0x0d, 0 }, .brk = {             0x8d, 0 } }, /* 00d */
+    { .mk = {      0x0e, 0 }, .brk = {             0x8e, 0 } }, /* 00e */
+    { .mk = {      0x0f, 0 }, .brk = {             0x8f, 0 } }, /* 00f */
+    { .mk = {      0x10, 0 }, .brk = {             0x90, 0 } }, /* 010 */
+    { .mk = {      0x11, 0 }, .brk = {             0x91, 0 } }, /* 011 */
+    { .mk = {      0x12, 0 }, .brk = {             0x92, 0 } }, /* 012 */
+    { .mk = {      0x13, 0 }, .brk = {             0x93, 0 } }, /* 013 */
+    { .mk = {      0x14, 0 }, .brk = {             0x94, 0 } }, /* 014 */
+    { .mk = {      0x15, 0 }, .brk = {             0x95, 0 } }, /* 015 */
+    { .mk = {      0x16, 0 }, .brk = {             0x96, 0 } }, /* 016 */
+    { .mk = {      0x17, 0 }, .brk = {             0x97, 0 } }, /* 017 */
+    { .mk = {      0x18, 0 }, .brk = {             0x98, 0 } }, /* 018 */
+    { .mk = {      0x19, 0 }, .brk = {             0x99, 0 } }, /* 019 */
+    { .mk = {      0x1a, 0 }, .brk = {             0x9a, 0 } }, /* 01a */
+    { .mk = {      0x1b, 0 }, .brk = {             0x9b, 0 } }, /* 01b */
+    { .mk = {      0x1c, 0 }, .brk = {             0x9c, 0 } }, /* 01c */
+    { .mk = {      0x1d, 0 }, .brk = {             0x9d, 0 } }, /* 01d */
+    { .mk = {      0x1e, 0 }, .brk = {             0x9e, 0 } }, /* 01e */
+    { .mk = {      0x1f, 0 }, .brk = {             0x9f, 0 } }, /* 01f */
+    { .mk = {      0x20, 0 }, .brk = {             0xa0, 0 } }, /* 020 */
+    { .mk = {      0x21, 0 }, .brk = {             0xa1, 0 } }, /* 021 */
+    { .mk = {      0x22, 0 }, .brk = {             0xa2, 0 } }, /* 022 */
+    { .mk = {      0x23, 0 }, .brk = {             0xa3, 0 } }, /* 023 */
+    { .mk = {      0x24, 0 }, .brk = {             0xa4, 0 } }, /* 024 */
+    { .mk = {      0x25, 0 }, .brk = {             0xa5, 0 } }, /* 025 */
+    { .mk = {      0x26, 0 }, .brk = {             0xa6, 0 } }, /* 026 */
+    { .mk = {      0x27, 0 }, .brk = {             0xa7, 0 } }, /* 027 */
+    { .mk = {      0x28, 0 }, .brk = {             0xa8, 0 } }, /* 028 */
+    { .mk = {      0x29, 0 }, .brk = {             0xa9, 0 } }, /* 029 */
+    { .mk = {      0x2a, 0 }, .brk = {             0xaa, 0 } }, /* 02a */
+    { .mk = {      0x2b, 0 }, .brk = {             0xab, 0 } }, /* 02b */
+    { .mk = {      0x2c, 0 }, .brk = {             0xac, 0 } }, /* 02c */
+    { .mk = {      0x2d, 0 }, .brk = {             0xad, 0 } }, /* 02d */
+    { .mk = {      0x2e, 0 }, .brk = {             0xae, 0 } }, /* 02e */
+    { .mk = {      0x2f, 0 }, .brk = {             0xaf, 0 } }, /* 02f */
+    { .mk = {      0x30, 0 }, .brk = {             0xb0, 0 } }, /* 030 */
+    { .mk = {      0x31, 0 }, .brk = {             0xb1, 0 } }, /* 031 */
+    { .mk = {      0x32, 0 }, .brk = {             0xb2, 0 } }, /* 032 */
+    { .mk = {      0x33, 0 }, .brk = {             0xb3, 0 } }, /* 033 */
+    { .mk = {      0x34, 0 }, .brk = {             0xb4, 0 } }, /* 034 */
+    { .mk = {      0x35, 0 }, .brk = {             0xb5, 0 } }, /* 035 */
+    { .mk = {      0x36, 0 }, .brk = {             0xb6, 0 } }, /* 036 */
+    { .mk = {      0x37, 0 }, .brk = {             0xb7, 0 } }, /* 037 */
+    { .mk = {      0x38, 0 }, .brk = {             0xb8, 0 } }, /* 038 */
+    { .mk = {      0x39, 0 }, .brk = {             0xb9, 0 } }, /* 039 */
+    { .mk = {      0x3a, 0 }, .brk = {             0xba, 0 } }, /* 03a */
+    { .mk = {      0x3b, 0 }, .brk = {             0xbb, 0 } }, /* 03b */
+    { .mk = {      0x3c, 0 }, .brk = {             0xbc, 0 } }, /* 03c */
+    { .mk = {      0x3d, 0 }, .brk = {             0xbd, 0 } }, /* 03d */
+    { .mk = {      0x3e, 0 }, .brk = {             0xbe, 0 } }, /* 03e */
+    { .mk = {      0x3f, 0 }, .brk = {             0xbf, 0 } }, /* 03f */
+    { .mk = {      0x40, 0 }, .brk = {             0xc0, 0 } }, /* 040 */
+    { .mk = {      0x41, 0 }, .brk = {             0xc1, 0 } }, /* 041 */
+    { .mk = {      0x42, 0 }, .brk = {             0xc2, 0 } }, /* 042 */
+    { .mk = {      0x43, 0 }, .brk = {             0xc3, 0 } }, /* 043 */
+    { .mk = {      0x44, 0 }, .brk = {             0xc4, 0 } }, /* 044 */
+    { .mk = {      0x45, 0 }, .brk = {             0xc5, 0 } }, /* 045 */
+    { .mk = {      0x46, 0 }, .brk = {             0xc6, 0 } }, /* 046 */
+    { .mk = {      0x47, 0 }, .brk = {             0xc7, 0 } }, /* 047 */
+    { .mk = {      0x48, 0 }, .brk = {             0xc8, 0 } }, /* 048 */
+    { .mk = {      0x49, 0 }, .brk = {             0xc9, 0 } }, /* 049 */
+    { .mk = {      0x4a, 0 }, .brk = {             0xca, 0 } }, /* 04a */
+    { .mk = {      0x4b, 0 }, .brk = {             0xcb, 0 } }, /* 04b */
+    { .mk = {      0x4c, 0 }, .brk = {             0xcc, 0 } }, /* 04c */
+    { .mk = {      0x4d, 0 }, .brk = {             0xcd, 0 } }, /* 04d */
+    { .mk = {      0x4e, 0 }, .brk = {             0xce, 0 } }, /* 04e */
+    { .mk = {      0x4f, 0 }, .brk = {             0xcf, 0 } }, /* 04f */
+    { .mk = {      0x50, 0 }, .brk = {             0xd0, 0 } }, /* 050 */
+    { .mk = {      0x51, 0 }, .brk = {             0xd1, 0 } }, /* 051 */
+    { .mk = {      0x52, 0 }, .brk = {             0xd2, 0 } }, /* 052 */
+    { .mk = {      0x53, 0 }, .brk = {             0xd3, 0 } }, /* 053 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 054 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 055 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 056 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 057 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 058 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 059 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 060 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 061 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 062 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 063 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 064 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 065 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 066 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 067 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 068 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 069 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 070 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 071 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 072 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 073 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 074 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 075 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 076 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 077 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 078 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 079 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 080 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 081 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 082 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 083 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 084 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 085 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 086 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 087 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 088 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 089 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 090 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 091 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 092 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 093 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 094 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 095 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 096 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 097 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 098 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 099 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ed */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fe */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ff */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 100 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 101 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 102 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 103 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 104 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 105 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 106 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 107 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 108 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 109 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 110 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 111 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 112 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 113 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 114 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 115 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 116 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 117 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 118 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 119 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11b */
+    { .mk = {      0x1c, 0 }, .brk = {             0x9c, 0 } }, /* 11c */
+    { .mk = {      0x1d, 0 }, .brk = {             0x9d, 0 } }, /* 11d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 120 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 121 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 122 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 123 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 124 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 125 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 126 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 127 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 128 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 129 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 130 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 131 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 132 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 133 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 134 */
+    { .mk = {      0x35, 0 }, .brk = {             0xb5, 0 } }, /* 135 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 136 */
+    { .mk = {      0x37, 0 }, .brk = {             0xb7, 0 } }, /* 137 */
+    { .mk = {      0x38, 0 }, .brk = {             0xb8, 0 } }, /* 138 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 139 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 140 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 141 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 142 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 143 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 144 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 145 */
+    { .mk = {      0x46, 0 }, .brk = {             0xc6, 0 } }, /* 146 */
+    { .mk = {      0x47, 0 }, .brk = {             0xc7, 0 } }, /* 147 */
+    { .mk = {      0x48, 0 }, .brk = {             0xc8, 0 } }, /* 148 */
+    { .mk = {      0x49, 0 }, .brk = {             0xc9, 0 } }, /* 149 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14a */
+    { .mk = {      0x4b, 0 }, .brk = {             0xcb, 0 } }, /* 14b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14c */
+    { .mk = {      0x4d, 0 }, .brk = {             0xcd, 0 } }, /* 14d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14e */
+    { .mk = {      0x4f, 0 }, .brk = {             0xcf, 0 } }, /* 14f */
+    { .mk = {      0x50, 0 }, .brk = {             0xd0, 0 } }, /* 150 */
+    { .mk = {      0x51, 0 }, .brk = {             0xd1, 0 } }, /* 151 */
+    { .mk = {      0x52, 0 }, .brk = {             0xd2, 0 } }, /* 152 */
+    { .mk = {      0x53, 0 }, .brk = {             0xd3, 0 } }, /* 153 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 154 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 155 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 156 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 157 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 158 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 159 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 160 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 161 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 162 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 163 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 164 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 165 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 166 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 167 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 168 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 169 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 170 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 171 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 172 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 173 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 174 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 175 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 176 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 177 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 178 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 179 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 180 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 181 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 182 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 183 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 184 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 185 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 186 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 187 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 188 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 189 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 190 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 191 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 192 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 193 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 194 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 195 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 196 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 197 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 198 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 199 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ed */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fe */
+    { .mk = {            0 }, .brk = {                   0 } }  /* 1ff */
   // clang-format on
 };
 
-static uint8_t key_queue[16];
-static int     key_queue_start = 0;
-static int     key_queue_end   = 0;
-static int     is_tandy = 0;
-static int     is_t1x00 = 0;
-static int     is_amstrad = 0;
-
-#ifdef ENABLE_KEYBOARD_XT_LOG
-int keyboard_xt_do_log = ENABLE_KEYBOARD_XT_LOG;
-
-static void
-kbd_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (keyboard_xt_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define kbd_log(fmt, ...)
-#endif
-
-static uint8_t
-get_fdd_switch_settings(void)
-{
-
-    uint8_t fdd_count = 0;
-
-    for (uint8_t i = 0; i < FDD_NUM; i++) {
-        if (fdd_get_flags(i))
-            fdd_count++;
-    }
-
-    if (!fdd_count)
-        return 0x00;
-    else
-        return ((fdd_count - 1) << 6) | 0x01;
-}
-
-static uint8_t
-get_videomode_switch_settings(void)
-{
-
-    if (video_is_mda())
-        return 0x30;
-    else if (video_is_cga())
-        return 0x20; /* 0x10 would be 40x25 */
-    else
-        return 0x00;
-}
-
-static void
-kbd_poll(void *priv)
-{
-    xtkbd_t *kbd = (xtkbd_t *) priv;
-
-    timer_advance_u64(&kbd->send_delay_timer, 1000 * TIMER_USEC);
-
-    if (!(kbd->pb & 0x40) && (kbd->type != KBD_TYPE_TANDY))
-        return;
-
-    if (kbd->want_irq) {
-        kbd->want_irq = 0;
-        kbd->pa       = kbd->key_waiting;
-        kbd->blocked  = 1;
-        picint(2);
-#ifdef ENABLE_KEYBOARD_XT_LOG
-        kbd_log("XTkbd: kbd_poll(): keyboard_xt : take IRQ\n");
-#endif
-    }
-
-    if ((key_queue_start != key_queue_end) && !kbd->blocked) {
-        kbd->key_waiting = key_queue[key_queue_start];
-        kbd_log("XTkbd: reading %02X from the key queue at %i\n",
-                kbd->key_waiting, key_queue_start);
-        key_queue_start = (key_queue_start + 1) & 0x0f;
-        kbd->want_irq   = 1;
-    }
-}
-
-static void
-kbd_adddata(uint16_t val)
-{
-    /* Test for T1000 'Fn' key (Right Alt / Right Ctrl) */
-    if (is_t1x00) {
-        if (keyboard_recv(0x138) || keyboard_recv(0x11d)) { /* 'Fn' pressed */
-            t1000_syskey(0x00, 0x04, 0x00);                 /* Set 'Fn' indicator */
-            switch (val) {
-                case 0x45: /* Num Lock => toggle numpad */
-                    t1000_syskey(0x00, 0x00, 0x10);
-                    break;
-                case 0x47: /* Home => internal display */
-                    t1000_syskey(0x40, 0x00, 0x00);
-                    break;
-                case 0x49: /* PgDn => turbo on */
-                    t1000_syskey(0x80, 0x00, 0x00);
-                    break;
-                case 0x4D: /* Right => toggle LCD font */
-                    t1000_syskey(0x00, 0x00, 0x20);
-                    break;
-                case 0x4F: /* End => external display */
-                    t1000_syskey(0x00, 0x40, 0x00);
-                    break;
-                case 0x51: /* PgDn => turbo off */
-                    t1000_syskey(0x00, 0x80, 0x00);
-                    break;
-                case 0x54: /* SysRQ => toggle window */
-                    t1000_syskey(0x00, 0x00, 0x08);
-                    break;
-
-                default:
-                    break;
-            }
-        } else
-            t1000_syskey(0x04, 0x00, 0x00); /* Reset 'Fn' indicator */
-    }
-
-    key_queue[key_queue_end] = val;
-    kbd_log("XTkbd: %02X added to key queue at %i\n",
-            val, key_queue_end);
-    key_queue_end = (key_queue_end + 1) & 0x0f;
-}
-
-void
-kbd_adddata_process(uint16_t val, void (*adddata)(uint16_t val))
-{
-    uint8_t num_lock = 0;
-    uint8_t shift_states = 0;
-
-    if (!adddata)
-        return;
-
-    keyboard_get_states(NULL, &num_lock, NULL);
-    shift_states = keyboard_get_shift() & STATE_LSHIFT;
-
-    if (is_amstrad)
-        num_lock = !num_lock;
-
-    /* If NumLock is on, invert the left shift state so we can always check for
-       the the same way flag being set (and with NumLock on that then means it
-       is actually *NOT* set). */
-    if (num_lock)
-        shift_states ^= STATE_LSHIFT;
-
-    switch (val) {
-        case FAKE_LSHIFT_ON:
-            /* If NumLock is on, fake shifts are sent when shift is *NOT* presed,
-               if NumLock is off, fake shifts are sent when shift is pressed. */
-            if (shift_states) {
-                /* Send fake shift. */
-                adddata(num_lock ? 0x2a : 0xaa);
-            }
-            break;
-        case FAKE_LSHIFT_OFF:
-            if (shift_states) {
-                /* Send fake shift. */
-                adddata(num_lock ? 0xaa : 0x2a);
-            }
-            break;
-        default:
-            adddata(val);
-            break;
-    }
-}
-
-static void
-kbd_adddata_ex(uint16_t val)
-{
-    kbd_adddata_process(val, kbd_adddata);
-}
-
-static void
-kbd_write(uint16_t port, uint8_t val, void *priv)
-{
-    xtkbd_t *kbd = (xtkbd_t *) priv;
-    uint8_t  bit;
-    uint8_t  set;
-    uint8_t  new_clock;
-
-    switch (port) {
-        case 0x61: /* Keyboard Control Register (aka Port B) */
-            if (!(val & 0x80) || (kbd->type == KBD_TYPE_HYUNDAI)) {
-                new_clock = !!(val & 0x40);
-                if (!kbd->clock && new_clock) {
-                    key_queue_start = key_queue_end = 0;
-                    kbd->want_irq                   = 0;
-                    kbd->blocked                    = 0;
-                    kbd_adddata(0xaa);
-                }
-            }
-            kbd->pb = val;
-            if (!(kbd->pb & 0x80) || (kbd->type == KBD_TYPE_HYUNDAI))
-                kbd->clock = !!(kbd->pb & 0x40);
-            ppi.pb = val;
-
-            timer_process();
-
-            if (((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) ||
-                (kbd->type == KBD_TYPE_PRAVETZ)) && (cassette != NULL))
-                pc_cas_set_motor(cassette, (kbd->pb & 0x08) == 0);
-
-            speaker_update();
-
-            speaker_gated  = val & 1;
-            speaker_enable = val & 2;
-
-            if (speaker_enable)
-                was_speaker_enable = 1;
-            pit_devs[0].set_gate(pit_devs[0].data, 2, val & 1);
-
-            if (val & 0x80) {
-                kbd->pa      = 0;
-                kbd->blocked = 0;
-                picintc(2);
-            }
-
-#ifdef ENABLE_KEYBOARD_XT_LOG
-            if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) || (kbd->type == KBD_TYPE_PRAVETZ))
-                kbd_log("XTkbd: Cassette motor is %s\n", !(val & 0x08) ? "ON" : "OFF");
-#endif
-            break;
-#ifdef ENABLE_KEYBOARD_XT_LOG
-        case 0x62: /* Switch Register (aka Port C) */
-            if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) || (kbd->type == KBD_TYPE_PRAVETZ))
-                kbd_log("XTkbd: Cassette IN is %i\n", !!(val & 0x10));
-            break;
-#endif
-
-        case 0xc0 ... 0xcf: /* Pravetz Flags */
-            kbd_log("XTkbd: Port %02X out: %02X\n", port, val);
-            if (kbd->type == KBD_TYPE_PRAVETZ) {
-                bit                = (port >> 1) & 0x07;
-                set                = (port & 0x01) << bit;
-                kbd->pravetz_flags = (kbd->pravetz_flags & ~(1 << bit)) | set;
-            }
-            break;
-
-        default:
-            break;
-    }
-}
-
-static uint8_t
-kbd_read(uint16_t port, void *priv)
-{
-    const xtkbd_t *kbd = (xtkbd_t *) priv;
-    uint8_t        ret = 0xff;
-
-    switch (port) {
-        case 0x60: /* Keyboard Data Register  (aka Port A) */
-            if ((kbd->pb & 0x80) && ((kbd->type == KBD_TYPE_PC81) ||
-                (kbd->type == KBD_TYPE_PC82) || (kbd->type == KBD_TYPE_PRAVETZ) ||
-                (kbd->type == KBD_TYPE_XT82) || (kbd->type == KBD_TYPE_XT86) ||
-                (kbd->type == KBD_TYPE_XTCLONE) || (kbd->type == KBD_TYPE_COMPAQ) ||
-                (kbd->type == KBD_TYPE_ZENITH) || (kbd->type == KBD_TYPE_HYUNDAI))) {
-                if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) ||
-                    (kbd->type == KBD_TYPE_XTCLONE) || (kbd->type == KBD_TYPE_COMPAQ) ||
-                    (kbd->type == KBD_TYPE_PRAVETZ) || (kbd->type == KBD_TYPE_HYUNDAI))
-                    ret = (kbd->pd & ~0x02) | (hasfpu ? 0x02 : 0x00);
-                else if ((kbd->type == KBD_TYPE_XT82) || (kbd->type == KBD_TYPE_XT86))
-                    /* According to Ruud on the PCem forum, this is supposed to
-                       return 0xFF on the XT. */
-                    ret = 0xff;
-                else if (kbd->type == KBD_TYPE_ZENITH) {
-                    /* Zenith Data Systems Z-151
-                     * SW1 switch settings:
-                     * bits 6-7: floppy drive number
-                     * bits 4-5: video mode
-                     * bit 2-3: base memory size
-                     * bit 1: fpu enable
-                     * bit 0: fdc enable
-                     */
-                    ret = get_fdd_switch_settings();
-
-                    ret |= get_videomode_switch_settings();
-
-                    /* Base memory size should always be 64k */
-                    ret |= 0x0c;
-
-                    if (hasfpu)
-                        ret |= 0x02;
-                }
-            } else
-                ret = kbd->pa;
-            break;
-
-        case 0x61: /* Keyboard Control Register (aka Port B) */
-            ret = kbd->pb;
-            break;
-
-        case 0x62: /* Switch Register (aka Port C) */
-            if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) ||
-                (kbd->type == KBD_TYPE_PRAVETZ)) {
-                if (kbd->pb & 0x04) /* PB2 */
-                    switch (mem_size + isa_mem_size) {
-                        case 64:
-                        case 48:
-                        case 32:
-                        case 16:
-                            ret = 0x00;
-                            break;
-                        default:
-                            ret = (((mem_size + isa_mem_size) - 64) / 32) & 0x0f;
-                            break;
-                    }
-                else
-                    ret = (((mem_size + isa_mem_size) - 64) / 32) >> 4;
-            } else if ((kbd->type == KBD_TYPE_OLIVETTI) ||
-                       (kbd->type == KBD_TYPE_ZENITH)) {
-                /* Olivetti M19 or Zenith Data Systems Z-151 */
-                if (kbd->pb & 0x04) /* PB2 */
-                    ret = kbd->pd & 0xbf;
-                else
-                    ret = kbd->pd >> 4;
-            } else {
-                if (kbd->pb & 0x08) /* PB3 */
-                    ret = kbd->pd >> 4;
-                else {
-                    /* LaserXT = Always 512k RAM;
-                       LaserXT/3 = Bit 0: set = 512k, clear = 256k. */
-#if defined(DEV_BRANCH) && defined(USE_LASERXT)
-                    if (kbd->type == KBD_TYPE_VTECH)
-                        ret = ((mem_size == 512) ? 0x0d : 0x0c) | (hasfpu ? 0x02 : 0x00);
-                    else
-#endif
-                        ret = (kbd->pd & 0x0d) | (hasfpu ? 0x02 : 0x00);
-                }
-            }
-            ret |= (ppispeakon ? 0x20 : 0);
-
-            /* This is needed to avoid error 131 (cassette error).
-               This is serial read: bit 5 = clock, bit 4 = data, cassette header is 256 x 0xff. */
-            if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) ||
-                (kbd->type == KBD_TYPE_PRAVETZ)) {
-                if (cassette == NULL)
-                    ret |= (ppispeakon ? 0x10 : 0);
-                else
-                    ret |= (pc_cas_get_inp(cassette) ? 0x10 : 0);
-            }
-
-            if (kbd->type == KBD_TYPE_TANDY)
-                ret |= (tandy1k_eeprom_read() ? 0x10 : 0);
-            break;
-
-        case 0x63: /* Keyboard Configuration Register (aka Port D) */
-            if ((kbd->type == KBD_TYPE_XT82) || (kbd->type == KBD_TYPE_XT86) ||
-                (kbd->type == KBD_TYPE_XTCLONE) || (kbd->type == KBD_TYPE_COMPAQ) ||
-                (kbd->type == KBD_TYPE_TOSHIBA) || (kbd->type == KBD_TYPE_HYUNDAI))
-                ret = kbd->pd;
-            break;
-
-        case 0xc0: /* Pravetz Flags */
-            if (kbd->type == KBD_TYPE_PRAVETZ)
-                ret = kbd->pravetz_flags;
-            kbd_log("XTkbd: Port %02X in : %02X\n", port, ret);
-            break;
-
-        default:
-            break;
-    }
-
-    return ret;
-}
-
-static void
-kbd_reset(void *priv)
-{
-    xtkbd_t *kbd = (xtkbd_t *) priv;
-
-    kbd->want_irq      = 0;
-    kbd->blocked       = 0;
-    kbd->pa            = 0x00;
-    kbd->pb            = 0x00;
-    kbd->pravetz_flags = 0x00;
-
-    keyboard_scan = 1;
-
-    key_queue_start = 0;
-    key_queue_end   = 0;
-}
-
-void
-keyboard_set_is_amstrad(int ams)
-{
-    is_amstrad = ams;
-}
+typedef struct {
+     int type;
+} kbd_t;
 
 static void *
 kbd_init(const device_t *info)
 {
-    xtkbd_t *kbd;
+    kbd_t *dev = (kbd_t *) calloc(1, sizeof(kbd_t));
 
-    kbd = (xtkbd_t *) malloc(sizeof(xtkbd_t));
-    memset(kbd, 0x00, sizeof(xtkbd_t));
+    dev->type = info->local;
 
-    io_sethandler(0x0060, 4,
-                  kbd_read, NULL, NULL, kbd_write, NULL, NULL, kbd);
-    keyboard_send = kbd_adddata_ex;
-    kbd_reset(kbd);
-    kbd->type = info->local;
-    if (kbd->type == KBD_TYPE_PRAVETZ) {
-        io_sethandler(0x00c0, 16,
-                      kbd_read, NULL, NULL, kbd_write, NULL, NULL, kbd);
-    }
+    if (dev->type == KBD_83_KEY)
+        keyboard_set_table(scancode_xt);
+    else
+        keyboard_set_table(scancode_set1);
 
-    key_queue_start = key_queue_end = 0;
-
-    video_reset(gfxcard[0]);
-
-    if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) ||
-        (kbd->type == KBD_TYPE_PRAVETZ) || (kbd->type == KBD_TYPE_XT82) ||
-        (kbd->type <= KBD_TYPE_XT86) || (kbd->type == KBD_TYPE_XTCLONE) ||
-        (kbd->type == KBD_TYPE_COMPAQ) || (kbd->type == KBD_TYPE_TOSHIBA) ||
-        (kbd->type == KBD_TYPE_OLIVETTI) || (kbd->type == KBD_TYPE_HYUNDAI)) {
-        /* DIP switch readout: bit set = OFF, clear = ON. */
-        if (kbd->type == KBD_TYPE_OLIVETTI)
-            /* Olivetti M19
-             * Jumpers J1, J2 - monitor type.
-             * 01 - mono (high-res)
-             * 10 - color (low-res, disables 640x400x2 mode)
-             * 00 - autoswitching
-             */
-            kbd->pd |= 0x00;
-        else
-            /* Switches 7, 8 - floppy drives. */
-            kbd->pd = get_fdd_switch_settings();
-
-        /* Siitches 5, 6 - video card type */
-        kbd->pd |= get_videomode_switch_settings();
-
-        /* Switches 3, 4 - memory size. */
-        if ((kbd->type == KBD_TYPE_XT86) || (kbd->type == KBD_TYPE_XTCLONE) ||
-            (kbd->type == KBD_TYPE_HYUNDAI) || (kbd->type == KBD_TYPE_COMPAQ) ||
-            (kbd->type == KBD_TYPE_TOSHIBA)) {
-            switch (mem_size) {
-                case 256:
-                    kbd->pd |= 0x00;
-                    break;
-                case 512:
-                    kbd->pd |= 0x04;
-                    break;
-                case 576:
-                    kbd->pd |= 0x08;
-                    break;
-                case 640:
-                default:
-                    kbd->pd |= 0x0c;
-                    break;
-            }
-        } else if (kbd->type == KBD_TYPE_XT82) {
-            switch (mem_size) {
-                case 64: /* 1x64k */
-                    kbd->pd |= 0x00;
-                    break;
-                case 128: /* 2x64k */
-                    kbd->pd |= 0x04;
-                    break;
-                case 192: /* 3x64k */
-                    kbd->pd |= 0x08;
-                    break;
-                case 256: /* 4x64k */
-                default:
-                    kbd->pd |= 0x0c;
-                    break;
-            }
-        } else if (kbd->type == KBD_TYPE_PC82) {
-            switch (mem_size) {
-                case 192: /* 3x64k, not supported by stock BIOS due to bugs */
-                    kbd->pd |= 0x08;
-                    break;
-                case 64:  /* 4x16k */
-                case 96:  /* 2x32k + 2x16k */
-                case 128: /* 4x32k */
-                case 160: /* 2x64k + 2x16k */
-                case 224: /* 3x64k + 1x32k */
-                case 256: /* 4x64k */
-                default:
-                    kbd->pd |= 0x0c;
-                    break;
-            }
-        } else { /* really just the PC '81 */
-            switch (mem_size) {
-                case 16: /* 1x16k */
-                    kbd->pd |= 0x00;
-                    break;
-                case 32: /* 2x16k */
-                    kbd->pd |= 0x04;
-                    break;
-                case 48: /* 3x16k */
-                    kbd->pd |= 0x08;
-                    break;
-                case 64: /* 4x16k */
-                default:
-                    kbd->pd |= 0x0c;
-                    break;
-            }
-        }
-
-        /* Switch 2 - 8087 FPU. */
-        if (hasfpu)
-            kbd->pd |= 0x02;
-    } else if (kbd->type == KBD_TYPE_ZENITH) {
-        /* Zenith Data Systems Z-151
-         * SW2 switch settings:
-         * bit 7: monitor frequency
-         * bits 5-6: autoboot (00-11 resident monitor, 10 hdd, 01 fdd)
-         * bits 0-4: installed memory
-         */
-        kbd->pd = 0x20;
-        switch (mem_size) {
-            case 128:
-                kbd->pd |= 0x02;
-                break;
-            case 192:
-                kbd->pd |= 0x04;
-                break;
-            case 256:
-                kbd->pd |= 0x06;
-                break;
-            case 320:
-                kbd->pd |= 0x08;
-                break;
-            case 384:
-                kbd->pd |= 0x0a;
-                break;
-            case 448:
-                kbd->pd |= 0x0c;
-                break;
-            case 512:
-                kbd->pd |= 0x0e;
-                break;
-            case 576:
-                kbd->pd |= 0x10;
-                break;
-            case 640:
-            default:
-                kbd->pd |= 0x12;
-                break;
-        }
-    }
-
-    timer_add(&kbd->send_delay_timer, kbd_poll, kbd, 1);
-
-    keyboard_set_table(scancode_xt);
-
-    is_tandy = (kbd->type == KBD_TYPE_TANDY);
-    is_t1x00 = (kbd->type == KBD_TYPE_TOSHIBA);
-
-    is_amstrad = 0;
-
-    return kbd;
+    return dev;
 }
 
 static void
 kbd_close(void *priv)
 {
-    xtkbd_t *kbd = (xtkbd_t *) priv;
-
-    /* Stop the timer. */
-    timer_disable(&kbd->send_delay_timer);
-
-    /* Disable scanning. */
-    keyboard_scan = 0;
-
-    keyboard_send = NULL;
-
-    io_removehandler(0x0060, 4,
-                     kbd_read, NULL, NULL, kbd_write, NULL, NULL, kbd);
+    kbd_t *kbd = (kbd_t *) priv;
 
     free(kbd);
 }
 
-const device_t keyboard_pc_device = {
-    .name          = "IBM PC Keyboard (1981)",
-    .internal_name = "keyboard_pc",
-    .flags         = 0,
-    .local         = KBD_TYPE_PC81,
-    .init          = kbd_init,
-    .close         = kbd_close,
-    .reset         = kbd_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
+static const device_config_t keyboard_pc_xt_config[] = {
+  // clang-format off
+    {
+        .name           = "keys",
+        .description    = "Keys",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = KBD_83_KEY,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "83",          .value = KBD_83_KEY  },
+            { .description = "101 (ANSI)",  .value = KBD_101_KEY },
+            { .description = "102 (ISO)",   .value = KBD_102_KEY }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name = "", .description = "", .type = CONFIG_END
+    }
+  // clang-format on
 };
 
-const device_t keyboard_pc82_device = {
-    .name          = "IBM PC Keyboard (1982)",
-    .internal_name = "keyboard_pc82",
-    .flags         = 0,
-    .local         = KBD_TYPE_PC82,
+const device_t keyboard_pc_xt_device = {
+    .name          = "PC/XT Keyboard",
+    .internal_name = "keyboard_pc_xt",
+    .flags         = DEVICE_XT_KBC,
+    .local         = 0,
     .init          = kbd_init,
     .close         = kbd_close,
-    .reset         = kbd_reset,
-    { .available = NULL },
+    .reset         = NULL,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_pravetz_device = {
-    .name          = "Pravetz Keyboard",
-    .internal_name = "keyboard_pravetz",
-    .flags         = 0,
-    .local         = KBD_TYPE_PRAVETZ,
-    .init          = kbd_init,
-    .close         = kbd_close,
-    .reset         = kbd_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_xt_device = {
-    .name          = "XT (1982) Keyboard",
-    .internal_name = "keyboard_xt",
-    .flags         = 0,
-    .local         = KBD_TYPE_XT82,
-    .init          = kbd_init,
-    .close         = kbd_close,
-    .reset         = kbd_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_xt86_device = {
-    .name          = "XT (1986) Keyboard",
-    .internal_name = "keyboard_xt86",
-    .flags         = 0,
-    .local         = KBD_TYPE_XT86,
-    .init          = kbd_init,
-    .close         = kbd_close,
-    .reset         = kbd_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_xt_compaq_device = {
-    .name          = "Compaq Portable Keyboard",
-    .internal_name = "keyboard_xt_compaq",
-    .flags         = 0,
-    .local         = KBD_TYPE_COMPAQ,
-    .init          = kbd_init,
-    .close         = kbd_close,
-    .reset         = kbd_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_tandy_device = {
-    .name          = "Tandy 1000 Keyboard",
-    .internal_name = "keyboard_tandy",
-    .flags         = 0,
-    .local         = KBD_TYPE_TANDY,
-    .init          = kbd_init,
-    .close         = kbd_close,
-    .reset         = kbd_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_xt_t1x00_device = {
-    .name          = "Toshiba T1x00 Keyboard",
-    .internal_name = "keyboard_xt_t1x00",
-    .flags         = 0,
-    .local         = KBD_TYPE_TOSHIBA,
-    .init          = kbd_init,
-    .close         = kbd_close,
-    .reset         = kbd_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-#if defined(DEV_BRANCH) && defined(USE_LASERXT)
-const device_t keyboard_xt_lxt3_device = {
-    .name          = "VTech Laser XT3 Keyboard",
-    .internal_name = "keyboard_xt_lxt3",
-    .flags         = 0,
-    .local         = KBD_TYPE_VTECH,
-    .init          = kbd_init,
-    .close         = kbd_close,
-    .reset         = kbd_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-#endif
-
-const device_t keyboard_xt_olivetti_device = {
-    .name          = "Olivetti XT Keyboard",
-    .internal_name = "keyboard_xt_olivetti",
-    .flags         = 0,
-    .local         = KBD_TYPE_OLIVETTI,
-    .init          = kbd_init,
-    .close         = kbd_close,
-    .reset         = kbd_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_xt_zenith_device = {
-    .name          = "Zenith XT Keyboard",
-    .internal_name = "keyboard_xt_zenith",
-    .flags         = 0,
-    .local         = KBD_TYPE_ZENITH,
-    .init          = kbd_init,
-    .close         = kbd_close,
-    .reset         = kbd_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_xt_hyundai_device = {
-    .name          = "Hyundai XT Keyboard",
-    .internal_name = "keyboard_x_hyundai",
-    .flags         = 0,
-    .local         = KBD_TYPE_HYUNDAI,
-    .init          = kbd_init,
-    .close         = kbd_close,
-    .reset         = kbd_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t keyboard_xtclone_device = {
-    .name          = "XT (Clone) Keyboard",
-    .internal_name = "keyboard_xtclone",
-    .flags         = 0,
-    .local         = KBD_TYPE_XTCLONE,
-    .init          = kbd_init,
-    .close         = kbd_close,
-    .reset         = kbd_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
+    .config        = keyboard_pc_xt_config
 };
diff --git a/src/device/lpt.c b/src/device/lpt.c
new file mode 100644
index 000000000..f7cc6eda0
--- /dev/null
+++ b/src/device/lpt.c
@@ -0,0 +1,1050 @@
+/* Copyright holders: Sarah Walker
+   see COPYING for more details
+*/
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/fifo.h>
+#include <86box/timer.h>
+#include <86box/device.h>
+#include <86box/dma.h>
+#include <86box/lpt.h>
+#include <86box/pic.h>
+#include <86box/sound.h>
+#include <86box/prt_devs.h>
+#include <86box/thread.h>
+#include <86box/device.h>
+#include <86box/machine.h>
+#include <86box/network.h>
+#include <86box/plat_fallthrough.h>
+
+static int    next_inst               = 0;
+static int    lpt_3bc_used            = 0;
+
+static lpt_t *lpt1;
+
+lpt_port_t    lpt_ports[PARALLEL_MAX];
+
+lpt_device_t  lpt_devs[PARALLEL_MAX];
+
+const lpt_device_t lpt_none_device = {
+    .name          = "None",
+    .internal_name = "none",
+    .init          = NULL,
+    .close         = NULL,
+    .write_data    = NULL,
+    .write_ctrl    = NULL,
+    .read_status   = NULL,
+    .read_ctrl     = NULL
+};
+
+static const struct {
+    const lpt_device_t *device;
+} lpt_devices[] = {
+  // clang-format off
+    { &lpt_none_device          },
+    { &dss_device               },
+    { &lpt_dac_device           },
+    { &lpt_dac_stereo_device    },
+    { &lpt_prt_text_device      },
+    { &lpt_prt_escp_device      },
+    { &lpt_prt_ps_device        },
+#ifdef USE_PCL
+    { &lpt_prt_pcl_device       },
+#endif
+    { &lpt_plip_device          },
+    { &lpt_hasp_savquest_device },
+    { NULL                      }
+  // clang-format on
+};
+
+#ifdef ENABLE_LPT_LOG
+int lpt_do_log = ENABLE_LPT_LOG;
+
+static void
+lpt_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (lpt_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define lpt_log(fmt, ...)
+#endif
+
+const device_t *
+lpt_device_getdevice(const int id)
+{
+    return (device_t *) lpt_devices[id].device->cfgdevice;
+}
+
+int
+lpt_device_has_config(const int id)
+{
+    int   c                    = 0;
+    const device_t        *dev = (device_t *) lpt_devices[id].device->cfgdevice;
+    const device_config_t *config;
+    if (dev == NULL)
+        return 0;
+
+    if (dev->config == NULL)
+        return 0;
+
+    config = dev->config;
+
+    while (config->type != CONFIG_END) {
+        c++;
+        config++;
+    }
+
+    return (c > 0) ? 1 : 0;
+}
+
+const char *
+lpt_device_get_name(const int id)
+{
+    if (lpt_devices[id].device == NULL)
+        return NULL;
+
+    return lpt_devices[id].device->name;
+}
+
+const char *
+lpt_device_get_internal_name(const int id)
+{
+    if (lpt_devices[id].device == NULL)
+        return NULL;
+
+    return lpt_devices[id].device->internal_name;
+}
+
+int
+lpt_device_get_from_internal_name(const char *str)
+{
+    int c = 0;
+
+    while (lpt_devices[c].device != NULL) {
+        if (!strcmp(lpt_devices[c].device->internal_name, str))
+            return c;
+        c++;
+    }
+
+    return 0;
+}
+
+void
+lpt_devices_init(void)
+{
+    for (uint8_t i = 0; i < PARALLEL_MAX; i++) {
+        lpt_t *dev = lpt_devs[i].lpt;
+
+        if (lpt_devices[lpt_ports[i].device].device != NULL) {
+            memcpy(&(lpt_devs[i]), (lpt_device_t *) lpt_devices[lpt_ports[i].device].device, sizeof(lpt_device_t));
+
+            if (lpt_devs[i].init)
+                lpt_devs[i].priv = lpt_devs[i].init(dev);
+        } else
+            memset(&(lpt_devs[i]), 0x00, sizeof(lpt_device_t));
+
+        lpt_devs[i].lpt = dev;
+    }
+}
+
+void
+lpt_devices_close(void)
+{
+    for (uint8_t i = 0; i < PARALLEL_MAX; i++) {
+        if (lpt_devs[i].close)
+            lpt_devs[i].close(lpt_devs[i].priv);
+
+        memset(&(lpt_devs[i]), 0x00, sizeof(lpt_device_t));
+    }
+}
+
+static uint8_t
+lpt_get_ctrl_raw(const lpt_t *dev)
+{
+    uint8_t ret;
+
+    if (dev->dt && dev->dt->read_ctrl && dev->dt->priv)
+        ret = (dev->dt->read_ctrl(dev->dt->priv) & 0xef) | dev->enable_irq;
+    else
+        ret = 0xc0 | dev->ctrl | dev->enable_irq;
+
+    return ret & 0xdf;
+}
+
+static uint8_t
+lpt_is_epp(const lpt_t *dev)
+{
+    return (dev->epp || ((dev->ecp) && ((dev->ecr & 0xe0) == 0x80)));
+}
+
+static uint8_t
+lpt_get_ctrl(const lpt_t *dev)
+{
+    uint8_t ret = lpt_get_ctrl_raw(dev);
+
+    if (!dev->ecp && !dev->epp)
+        ret |= 0x20;
+
+    return ret;
+}
+
+static void
+lpt_write_fifo(lpt_t *dev, const uint8_t val, const uint8_t tag)
+{
+    if (!fifo_get_full(dev->fifo)) {
+        fifo_write_evt_tagged(tag, val, dev->fifo);
+
+        if (!timer_is_enabled(&dev->fifo_out_timer))
+            timer_set_delay_u64(&dev->fifo_out_timer, (uint64_t) ((1000000.0 / 2500000.0) * (double) TIMER_USEC));
+    }
+}
+
+static void
+lpt_ecp_update_irq(lpt_t *dev)
+{
+    if (!(dev->ecr & 0x04) && ((dev->fifo_stat | dev->dma_stat) & 0x04))
+        picintlevel(1 << dev->irq, &dev->irq_state);
+    else
+        picintclevel(1 << dev->irq, &dev->irq_state);
+}
+
+static void
+lpt_strobe(lpt_t *dev, const uint8_t val)
+{
+    if (dev->dt && dev->dt->strobe && dev->dt->priv)
+        dev->dt->strobe(dev->strobe, val, dev->dt->priv);
+
+    dev->strobe = val;
+}
+
+static void
+lpt_fifo_out_callback(void *priv)
+{
+    lpt_t *dev = (lpt_t *) priv;
+
+    if ((dev->ecr & 0xe0) != 0xc0)  switch (dev->state) {
+        default:
+            break;
+
+        case LPT_STATE_READ_DMA:
+            ;
+            int ret = 0xff;
+
+            if (dev->dma == 0xff)
+                ret = DMA_NODATA;
+            else
+                ret = dma_channel_read(dev->dma);
+
+            if (ret != DMA_NODATA) {
+                fifo_write_evt_tagged(0x01, (uint8_t) (ret & 0xff), dev->fifo);
+
+                if (ret & DMA_OVER)
+                    /* Internal flag to indicate we have finished the DMA reads. */
+                    dev->dma_stat = 0x08;
+            }
+
+            timer_advance_u64(&dev->fifo_out_timer,
+                              (uint64_t) ((1000000.0 / 2500000.0) * (double) TIMER_USEC));
+
+            if (dev->dma_stat || fifo_get_full(dev->fifo))
+                dev->state = LPT_STATE_WRITE_FIFO;
+            break;
+
+        case LPT_STATE_WRITE_FIFO:
+            if (!fifo_get_empty(dev->fifo)) {
+                uint8_t tag = 0x00;
+                const uint8_t val = fifo_read_evt_tagged(&tag, dev->fifo);
+
+                lpt_log("FIFO: %02X, TAG = %02X\n", val, tag);
+
+                /* We do not currently support sending commands. */
+                if (tag == 0x01) {
+                    if (dev->dt && dev->dt->write_data && dev->dt->priv)
+                        dev->dt->write_data(val, dev->dt->priv);
+
+                    lpt_strobe(dev, 1);
+                    lpt_strobe(dev, 0);
+                }
+            }
+
+            if (((dev->ecr & 0xe0) != 0xc0) && (dev->ecr & 0x08)) {
+                if (fifo_get_empty(dev->fifo)) {
+                    if (dev->dma_stat) {
+                        /* Now actually set the external flag. */
+                        dev->dma_stat = 0x04;
+                        dev->state = LPT_STATE_IDLE;
+                        lpt_ecp_update_irq(dev);
+                    } else {
+                        dev->state = LPT_STATE_READ_DMA;
+
+                        timer_advance_u64(&dev->fifo_out_timer,
+                                          (uint64_t) ((1000000.0 / 2500000.0) * (double) TIMER_USEC));
+                    }
+                } else
+                    timer_advance_u64(&dev->fifo_out_timer,
+                                      (uint64_t) ((1000000.0 / 2500000.0) * (double) TIMER_USEC));
+            } else if (!fifo_get_empty(dev->fifo))
+                timer_advance_u64(&dev->fifo_out_timer,
+                                  (uint64_t) ((1000000.0 / 2500000.0) * (double) TIMER_USEC));
+            break;
+    }
+}
+
+void
+lpt_write(const uint16_t port, const uint8_t val, void *priv)
+{
+    lpt_t *dev  = (lpt_t *) priv;
+    uint16_t    mask = 0x0407;
+
+    lpt_log("[W] %04X = %02X (ECR = %02X)\n", port, val, dev->ecr);
+
+    /* This is needed so the parallel port at 3BC works. */
+    if (dev->addr & 0x0004)
+        mask = 0x0403;
+
+    switch (port & mask) {
+        case 0x0000:
+            if (dev->ecp) {
+                if (((dev->ecr & 0xe0) == 0x40) || ((dev->ecr & 0xe0) == 0x60) ||
+                    ((dev->ecr & 0xe0) == 0xc0))
+                    /* AFIFO */
+                    lpt_write_fifo(dev, val, 0x00);
+                else if (!(dev->ecr & 0xc0) && (!(dev->ecr & 0x20) || !(lpt_get_ctrl_raw(dev) & 0x20)) &&
+                           dev->dt && dev->dt->write_data && dev->dt->priv)
+                    /* DATAR */
+                    dev->dt->write_data(val, dev->dt->priv);
+                dev->dat = val;
+            } else {
+                /* DTR */
+                if ((!dev->ext || !(lpt_get_ctrl_raw(dev) & 0x20)) && dev->dt &&
+                    dev->dt->write_data && dev->dt->priv)
+                    dev->dt->write_data(val, dev->dt->priv);
+                dev->dat = val;
+            }
+            break;
+
+        case 0x0001:
+            break;
+
+        case 0x0002:
+            if (dev->dt && dev->dt->write_ctrl && dev->dt->priv)
+                dev->dt->write_ctrl(val, dev->dt->priv);
+            dev->ctrl       = val;
+            dev->strobe     = val & 0x01;
+            dev->autofeed   = val & 0x02;
+            dev->enable_irq = val & 0x10;
+            if (!(val & 0x10) && (dev->irq != 0xff))
+                picintc(1 << dev->irq);
+            dev->irq_state  = 0;
+            break;
+
+        case 0x0003:
+            if (lpt_is_epp(dev)) {
+                if (dev->dt && dev->dt->epp_write_data && dev->dt->priv)
+                    dev->dt->epp_write_data(1, val, dev->dt->priv);
+            }
+            break;
+
+        case 0x0004 ... 0x0007:
+            if (lpt_is_epp(dev)) {
+                if (dev->dt && dev->dt->epp_write_data && dev->dt->priv)
+                    dev->dt->epp_write_data(0, val, dev->dt->priv);
+            }
+            break;
+
+        case 0x0404:
+            if (dev->cfg_regs_enabled) {
+                switch (dev->eir) {
+                    case 0x00:
+                        dev->ext_regs[0x00] = val & 0x31;
+                        break;
+                    case 0x02:
+                        dev->ext_regs[0x02] = val & 0xd0;
+                        if (dev->ext_regs[0x02] & 0x80)
+                            dev->ecr        = dev->ret_ecr;
+                        else  switch (dev->ret_ecr & 0xe0) {
+                            case 0x00: case 0x20:
+                            case 0x80:
+                                dev->ecr = (dev->ret_ecr & 0x1f) | 0x60;
+                                break;
+                        }
+                        break;
+                    case 0x04:
+                        dev->ext_regs[0x00] = val & 0x37;
+                        break;
+                    case 0x05:
+                        dev->ext_regs[0x00] = val;
+                        dev->cnfga_readout  = (val & 0x80) ? 0x1c : 0x14;
+                        dev->cnfgb_readout  = (dev->cnfgb_readout & 0xc0) | (val & 0x3b);
+                        break;
+                }
+                break;
+            } else
+                fallthrough;
+        case 0x0400:
+            switch (dev->ecr >> 5) {
+                default:
+                    break;
+                case 2: case 6:
+                    lpt_write_fifo(dev, val, 0x01);
+                    break;
+                case 3:
+                    if (!(lpt_get_ctrl_raw(dev) & 0x20))
+                        lpt_write_fifo(dev, val, 0x01);
+                    break;
+            }
+            break;
+
+        case 0x0402: case 0x0406:
+            if ((dev->ecr & 0x04) && !(val & 0x04)) {
+                dev->dma_stat  = 0x00;
+                fifo_reset(dev->fifo);
+                if (val & 0x08) {
+                    dev->state = LPT_STATE_READ_DMA;
+                    dev->fifo_stat = 0x00;
+                    if (!timer_is_enabled(&dev->fifo_out_timer))
+                        timer_set_delay_u64(&dev->fifo_out_timer, (uint64_t) ((1000000.0 / 2500000.0) * (double) TIMER_USEC));
+                } else {
+                    dev->state = LPT_STATE_WRITE_FIFO;
+                    if (((dev->ecr & 0xe0) == 0x40) || ((dev->ecr & 0xe0) == 0xc0) ||
+                        (lpt_get_ctrl_raw(dev) & 0x20))
+                        dev->fifo_stat = fifo_get_ready(dev->fifo) ? 0x04 : 0x00;
+                    else
+                        dev->fifo_stat = fifo_get_ready(dev->fifo) ? 0x00 : 0x04;
+                }
+            } else if ((val & 0x04) && !(dev->ecr & 0x04)) {
+                if (timer_is_enabled(&dev->fifo_out_timer))
+                    timer_disable(&dev->fifo_out_timer);
+
+                dev->state = LPT_STATE_IDLE;
+            }
+            if (dev->ext_regs[0x02] & 0x80)
+                dev->ecr        = val;
+            else  switch (val & 0xe0) {
+                case 0x00: case 0x20:
+                case 0x80:
+                    dev->ecr = (val & 0x1f) | 0x60;
+                    break;
+            }
+            dev->ret_ecr    = val;
+            lpt_ecp_update_irq(dev);
+            break;
+
+        case 0x0403: case 0x0407:
+            if (dev->cfg_regs_enabled)
+                dev->eir = val & 0x07;
+            break;
+
+        default:
+            break;
+    }
+}
+
+static void
+lpt_fifo_d_ready_evt(void *priv)
+{
+    lpt_t *dev = (lpt_t *) priv;
+
+    if (!(dev->ecr & 0x08)) {
+        if (((dev->ecr & 0xe0) == 0xc0) || ((dev->ecr & 0xe0) == 0x40) ||
+            (lpt_get_ctrl_raw(dev) & 0x20))
+            dev->fifo_stat = fifo_get_ready(dev->fifo) ? 0x04 : 0x00;
+        else
+            dev->fifo_stat = fifo_get_ready(dev->fifo) ? 0x00 : 0x04;
+    }
+
+    lpt_ecp_update_irq(dev);
+}
+
+void
+lpt_write_to_fifo(void *priv, const uint8_t val)
+{
+    lpt_t *dev = (lpt_t *) priv;
+
+    if (dev->ecp) {
+        if (((dev->ecr & 0xe0) == 0x20) && (lpt_get_ctrl_raw(dev) & 0x20))
+            dev->dat = val;
+        else if (((dev->ecr & 0xe0) == 0x40) && !fifo_get_full(dev->fifo))
+            fifo_write_evt_tagged(0x01, val, dev->fifo);
+        else if (((dev->ecr & 0xe0) == 0xc0) && !fifo_get_full(dev->fifo))
+            fifo_write_evt_tagged(0x01, val, dev->fifo);
+        else if (((dev->ecr & 0xe0) == 0x60) && (lpt_get_ctrl_raw(dev) & 0x20) &&
+            !fifo_get_full(dev->fifo))
+            fifo_write_evt_tagged(0x01, val, dev->fifo);
+
+        if (((dev->ecr & 0xe0) != 0xc0) && ((dev->ecr & 0x0c) == 0x08) && (dev->dma != 0xff)) {
+            const int ret = dma_channel_write(dev->dma, val);
+
+            if (ret & DMA_OVER)
+                dev->dma_stat |= 0x04;
+        }
+    } else {
+        if (dev->ext && (lpt_get_ctrl_raw(dev) & 0x20))
+            dev->dat = val;
+    }
+}
+
+void
+lpt_write_to_dat(void *priv, const uint8_t val)
+{
+    lpt_t *dev = (lpt_t *) priv;
+
+    dev->dat = val;
+}
+
+static uint8_t
+lpt_read_fifo(const lpt_t *dev)
+{
+    uint8_t ret = 0xff;
+
+    if (!fifo_get_empty(dev->fifo))
+        ret = fifo_read(dev->fifo);
+
+    return ret;
+}
+
+uint8_t
+lpt_read_status(lpt_t *dev)
+{
+    uint8_t     low_bits = 0x07;
+    uint8_t     ret;
+
+    if (dev->ext) {
+        low_bits = 0x03 | (dev->irq_state ? 0x00 : 0x04);
+        if (dev->irq != 0xff)
+            picintclevel(1 << dev->irq, &dev->irq_state);
+        dev->irq_state = 0;
+    }
+    if (dev->epp || dev->ecp) {
+        low_bits = lpt_is_epp(dev) ? 0x02 : 0x03;
+        if (lpt_get_ctrl_raw(dev) & 0x10)
+            low_bits |= (dev->irq_state ? 0x00 : 0x04);
+        else
+            low_bits |= 0x04;
+    }
+
+    if (dev->dt && dev->dt->read_status && dev->dt->priv)
+        ret = (dev->dt->read_status(dev->dt->priv) & 0xf8) | low_bits;
+    else
+        ret = 0xd8 | low_bits;
+
+    return ret;
+}
+
+uint8_t
+lpt_read_ecp_mode(lpt_t *dev)
+{
+    return ((dev->ret_ecr & 0xe0) == 0x60) ? 0x60 : 0x00;
+}
+
+uint8_t
+lpt_read(const uint16_t port, void *priv)
+{
+    lpt_t    *dev  = (lpt_t *) priv;
+    uint16_t  mask = 0x0407;
+    uint8_t   ret  = 0xff;
+
+    /* This is needed so the parallel port at 3BC works. */
+    if (dev->addr & 0x0004)
+        mask = 0x0403;
+
+    switch (port & mask) {
+        case 0x0000:
+            if (dev->ecp) {
+                if (dev->ecr & 0xc0) {
+                    if (((dev->ecr & 0xe0) == 0xc0) && !fifo_get_empty(dev->fifo)) {
+                        uint8_t tag = 0x00;
+                        ret = fifo_read_evt_tagged(&tag, dev->fifo);
+                    } else if (((dev->ecr & 0xe0) == 0x60) && !(lpt_get_ctrl_raw(dev) & 0x20) &&
+                               !fifo_get_empty(dev->fifo)) {
+                        uint8_t tag = 0x00;
+                        ret = fifo_read_evt_tagged(&tag, dev->fifo);
+                    }
+                } else
+                    ret = dev->dat;
+            } else {
+                /* DTR */
+                ret = dev->dat;
+            }
+            break;
+
+        case 0x0001:
+            ret = lpt_read_status(dev);
+            break;
+
+        case 0x0002:
+            ret = lpt_get_ctrl(dev);
+            if (dev->ecp)
+                ret = (ret & 0xfc) | (dev->ctrl & 0x03);
+            break;
+
+        case 0x0003:
+            if (lpt_is_epp(dev)) {
+                if (dev->dt && dev->dt->epp_request_read && dev->dt->priv)
+                    dev->dt->epp_request_read(1, dev->dt->priv);
+                ret = dev->dat;
+            }
+            break;
+
+        case 0x0004 ... 0x0007:
+            if (lpt_is_epp(dev)) {
+                if (dev->dt && dev->dt->epp_request_read && dev->dt->priv)
+                    dev->dt->epp_request_read(0, dev->dt->priv);
+                ret = dev->dat;
+            }
+            break;
+
+        case 0x0404:
+            if (dev->cfg_regs_enabled) {
+                switch (dev->eir) {
+                    default:
+                        ret = 0xff;
+                        break;
+                    case 0x00: case 0x02:
+                    case 0x04: case 0x05:
+                        ret = dev->ext_regs[dev->eir];
+                        break;
+                }
+                break;
+            } else
+                fallthrough;
+        case 0x0400:
+            switch (dev->ecr >> 5) {
+                default:
+                    break;
+                case 3:
+                    if (lpt_get_ctrl_raw(dev) & 0x20)
+                        ret = lpt_read_fifo(dev);
+                    break;
+                case 6:
+                    /* TFIFO */
+                    if (!fifo_get_empty(dev->fifo))
+                        ret = fifo_read_evt(dev->fifo);
+                    break;
+                case 7:
+                    /* CNFGA */
+                    ret = dev->cnfga_readout;
+                    break;
+            }
+            break;
+
+        case 0x0405:
+            if (dev->cfg_regs_enabled) {
+                ret = 0x00;
+                break;
+            } else
+                fallthrough;
+        case 0x0401:
+            if ((dev->ecr & 0xe0) == 0xe0) {
+                /* CNFGB */
+                ret = dev->cnfgb_readout | (dev->irq_state ? 0x40 : 0x00);
+            }
+            break;
+
+        case 0x0402: case 0x0406:
+            ret = dev->ret_ecr | dev->fifo_stat | (dev->dma_stat & 0x04);
+            ret |= (fifo_get_full(dev->fifo) ? 0x02 : 0x00);
+            ret |= (fifo_get_empty(dev->fifo) ? 0x01 : 0x00);
+            break;
+
+        case 0x0403: case 0x0407:
+            if (dev->cfg_regs_enabled)
+                ret = dev->eir;
+            break;
+
+        default:
+            break;
+    }
+
+    lpt_log("[R] %04X = %02X\n", port, ret);
+
+    return ret;
+}
+
+uint8_t
+lpt_read_port(lpt_t *dev, const uint16_t reg)
+{
+    return lpt_read(reg, dev);
+}
+
+void
+lpt_irq(void *priv, const int raise)
+{
+    lpt_t *dev = (lpt_t *) priv;
+
+    if (dev->enable_irq) {
+        if (dev->irq != 0xff) {
+            if (dev->ext) {
+                if (raise)
+                    picintlevel(1 << dev->irq, &dev->irq_state);
+                else
+                    picintclevel(1 << dev->irq, &dev->irq_state);
+            } else {
+                if (raise)
+                    picint(1 << dev->irq);
+                else
+                    picintc(1 << dev->irq);
+            }
+        }
+
+        if (!dev->ext || (dev->irq == 0xff))
+            dev->irq_state = raise;
+    } else {
+        if (dev->irq != 0xff) {
+            if (dev->ext)
+                picintclevel(1 << dev->irq, &dev->irq_state);
+            else
+                picintc(1 << dev->irq);
+        }
+
+        dev->irq_state = 0;
+    }
+}
+
+void
+lpt_set_ext(lpt_t *dev, const uint8_t ext)
+{
+    if (lpt_ports[dev->id].enabled)
+        dev->ext = ext;
+}
+
+void
+lpt_set_ecp(lpt_t *dev, const uint8_t ecp)
+{
+    if (lpt_ports[dev->id].enabled)
+        dev->ecp = ecp;
+}
+
+void
+lpt_set_epp(lpt_t *dev, const uint8_t epp)
+{
+    if (lpt_ports[dev->id].enabled)
+        dev->epp = epp;
+}
+
+void
+lpt_set_lv2(lpt_t *dev, const uint8_t lv2)
+{
+    if (lpt_ports[dev->id].enabled)
+        dev->lv2 = lv2;
+}
+
+void
+lpt_set_fifo_threshold(lpt_t *dev, const int threshold)
+{
+    if (lpt_ports[dev->id].enabled)
+        fifo_set_trigger_len(dev->fifo, threshold);
+}
+
+void
+lpt_set_cfg_regs_enabled(lpt_t *dev, const uint8_t cfg_regs_enabled)
+{
+    if (lpt_ports[dev->id].enabled)
+        dev->cfg_regs_enabled = cfg_regs_enabled;
+}
+
+void
+lpt_set_cnfga_readout(lpt_t *dev, const uint8_t cnfga_readout)
+{
+    if (lpt_ports[dev->id].enabled)
+        dev->cnfga_readout = cnfga_readout;
+}
+
+void
+lpt_set_cnfgb_readout(lpt_t *dev, const uint8_t cnfgb_readout)
+{
+    if (lpt_ports[dev->id].enabled)
+        dev->cnfgb_readout = (dev->cnfgb_readout & 0xc0) | (cnfgb_readout & 0x3f);
+}
+
+void
+lpt_port_setup(lpt_t *dev, const uint16_t port)
+{
+    if (lpt_ports[dev->id].enabled) {
+        if ((dev->addr != 0x0000) && (dev->addr != 0xffff)) {
+            io_removehandler(dev->addr, 0x0007, lpt_read, NULL, NULL, lpt_write, NULL, NULL, dev);
+            io_removehandler(dev->addr + 0x0400, 0x0007, lpt_read, NULL, NULL, lpt_write, NULL, NULL, dev);
+        }
+        if ((port != 0x0000) && (port != 0xffff)) {
+            lpt_log("Set handler: %04X-%04X\n", port, port + 0x0003);
+            io_sethandler(port, 0x0003, lpt_read, NULL, NULL, lpt_write, NULL, NULL, dev);
+            if (dev->epp)
+                io_sethandler(port + 0x0003, 0x0005, lpt_read, NULL, NULL, lpt_write, NULL, NULL, dev);
+            if (dev->ecp || dev->lv2) {
+                io_sethandler(port + 0x0400, 0x0003, lpt_read, NULL, NULL, lpt_write, NULL, NULL, dev);
+                if (dev->epp)
+                    io_sethandler(port + 0x0404, 0x0003, lpt_read, NULL, NULL, lpt_write, NULL, NULL, dev);
+            }
+        }
+        dev->addr = port;
+    } else
+        dev->addr = 0xffff;
+}
+
+void
+lpt_port_irq(lpt_t *dev, const uint8_t irq)
+{
+    if (lpt_ports[dev->id].enabled)
+        dev->irq = irq;
+    else
+        dev->irq = 0xff;
+
+    lpt_log("Port %i IRQ = %02X\n", dev->id, irq);
+}
+
+void
+lpt_port_dma(lpt_t *dev, const uint8_t dma)
+{
+    if (lpt_ports[dev->id].enabled)
+        dev->dma = dma;
+    else
+        dev->dma = 0xff;
+
+    lpt_log("Port %i DMA = %02X\n", dev->id, dma);
+}
+
+void
+lpt1_dma(const uint8_t dma)
+{
+    if (lpt1 != NULL)
+        lpt_port_dma(lpt1, dma);
+}
+
+void
+lpt_port_remove(lpt_t *dev)
+{
+    if (lpt_ports[dev->id].enabled && (dev->addr != 0xffff)) {
+        io_removehandler(dev->addr, 0x0007, lpt_read, NULL, NULL, lpt_write, NULL, NULL, dev);
+        io_removehandler(dev->addr + 0x0400, 0x0007, lpt_read, NULL, NULL, lpt_write, NULL, NULL, dev);
+
+        dev->addr = 0xffff;
+    }
+}
+
+void
+lpt1_remove_ams(lpt_t *dev)
+{
+    if (dev->enabled)
+        io_removehandler(dev->addr + 1, 0x0002, lpt_read, NULL, NULL, lpt_write, NULL, NULL, dev);
+}
+
+void
+lpt_speed_changed(void *priv)
+{
+    lpt_t *dev = (lpt_t *) priv;
+
+    if (timer_is_enabled(&dev->fifo_out_timer)) {
+        timer_disable(&dev->fifo_out_timer);
+        timer_set_delay_u64(&dev->fifo_out_timer, (uint64_t) ((1000000.0 / 2500000.0) * (double) TIMER_USEC));
+    }
+}
+
+void
+lpt_port_zero(lpt_t *dev)
+{
+    lpt_t temp = { 0 };
+
+    temp.irq            = dev->irq;
+    temp.id             = dev->id;
+    temp.dt             = dev->dt;
+    temp.fifo           = dev->fifo;
+    temp.fifo_out_timer = dev->fifo_out_timer;
+
+    if (lpt_ports[dev->id].enabled)
+        lpt_port_remove(dev);
+
+    memset(dev, 0x00, sizeof(lpt_t));
+
+    dev->addr           = 0xffff;
+    dev->irq            = temp.irq;
+    dev->id             = temp.id;
+    dev->dt             = temp.dt;
+    dev->fifo           = temp.fifo;
+    dev->fifo_out_timer = temp.fifo_out_timer;
+
+    if (machine_has_bus(machine, MACHINE_BUS_MCA))
+        dev->ext = 1;
+}
+
+static void
+lpt_close(void *priv)
+{
+    lpt_t *dev = (lpt_t *) priv;
+
+    if (lpt_ports[dev->id].enabled) {
+        fifo_close(dev->fifo);
+        dev->fifo       = NULL;
+
+        timer_disable(&dev->fifo_out_timer);
+
+    }
+
+    if (lpt1 == dev)
+        lpt1 = NULL;
+
+    free(dev);
+}
+
+static void
+lpt_reset(void *priv)
+{
+    lpt_t *dev = (lpt_t *) priv;
+
+    if (lpt_ports[dev->id].enabled)
+        if (timer_is_enabled(&dev->fifo_out_timer))
+            timer_disable(&dev->fifo_out_timer);
+
+    lpt_port_zero(dev);
+
+    if (lpt_ports[dev->id].enabled) {
+        if (dev->irq_state) {
+            if (dev->irq == 0xff)
+                dev->irq_state = 0x00;
+            else {
+                picintclevel(dev->irq, &dev->irq_state);
+                picintc(dev->irq);
+            }
+        }
+
+        dev->enable_irq       = 0x00;
+        dev->cfg_regs_enabled = 0;
+        dev->ext              = !!(machine_has_bus(machine, MACHINE_BUS_MCA));
+        dev->epp              = 0;
+        dev->ecp              = 0;
+        dev->ecr              = 0x15;
+        dev->ret_ecr          = 0x15;
+        dev->dat              = 0xff;
+        dev->fifo_stat        = 0x00;
+        dev->dma_stat         = 0x00;
+
+        memset(dev->ext_regs, 0x00, 8);
+        dev->ext_regs[0x02]   = 0x80;
+        dev->ext_regs[0x04]   = 0x07;
+        dev->cnfga_readout   &= 0xf7;
+    }
+}
+
+static void *
+lpt_init(const device_t *info)
+{
+    lpt_t *dev = (lpt_t *) calloc(1, sizeof(lpt_t));
+    int orig_inst   = next_inst;
+
+    const uint16_t default_ports[PARALLEL_MAX] = { LPT1_ADDR, LPT2_ADDR, LPT_MDA_ADDR, LPT4_ADDR };
+    const uint8_t  default_irqs[PARALLEL_MAX]  = { LPT1_IRQ, LPT2_IRQ, LPT_MDA_IRQ, LPT4_IRQ };
+
+    if (info->local & 0xFFF00000)
+        next_inst = PARALLEL_MAX - 1;
+
+    dev->id = next_inst;
+
+    if (lpt_ports[next_inst].enabled || (info->local & 0xFFF00000)) {
+        lpt_log("Adding parallel port %i...\n", next_inst);
+        dev->dt         = &(lpt_devs[next_inst]);
+        dev->dt->lpt    = dev;
+
+        dev->fifo       = NULL;
+        memset(&dev->fifo_out_timer, 0x00, sizeof(pc_timer_t));
+
+        lpt_port_zero(dev);
+
+        dev->addr             = 0xffff;
+        dev->irq              = 0xff;
+        if ((jumpered_internal_ecp_dma >= 0) && (jumpered_internal_ecp_dma != 4))
+            dev->dma              = jumpered_internal_ecp_dma;
+        else
+            dev->dma              = 0xff;
+        dev->enable_irq       = 0x00;
+        dev->cfg_regs_enabled = 0;
+        dev->ext              = 0;
+        dev->epp              = 0;
+        dev->ecp              = 0;
+        dev->ecr              = 0x15;
+        dev->ret_ecr          = 0x15;
+        dev->cnfga_readout    = 0x10;
+        dev->cnfgb_readout    = 0x00;
+
+        memset(dev->ext_regs, 0x00, 8);
+        dev->ext_regs[0x02]   = 0x80;
+
+        if (lpt_ports[dev->id].enabled) {
+            if (info->local & 0xfff00000) {
+                lpt_port_setup(dev, info->local >> 20);
+                lpt_port_irq(dev, (info->local >> 16) & 0xF);
+                next_inst          = orig_inst;
+            } else {
+                if ((dev->id == 2) && (lpt_3bc_used)) {
+                    lpt_port_setup(dev, LPT1_ADDR);
+                    lpt_port_irq(dev, LPT1_IRQ);
+                } else {
+                    lpt_port_setup(dev, default_ports[dev->id]);
+                    lpt_port_irq(dev, default_irqs[dev->id]);
+                }
+            }
+
+            dev->fifo       = fifo16_init();
+
+            fifo_set_trigger_len(dev->fifo, 8);
+
+            fifo_set_d_ready_evt(dev->fifo, lpt_fifo_d_ready_evt);
+            fifo_set_priv(dev->fifo, dev);
+
+            timer_add(&dev->fifo_out_timer, lpt_fifo_out_callback, dev, 0);
+        }
+    }
+
+    if (!(info->local & 0xfff00000))
+        next_inst++;
+
+    if (lpt1 == NULL)
+        lpt1 = dev;
+
+    return dev;
+}
+
+void
+lpt_set_next_inst(int ni)
+{
+    next_inst = ni;
+}
+
+void
+lpt_set_3bc_used(int is_3bc_used)
+{
+    lpt_3bc_used = is_3bc_used;
+}
+
+void
+lpt_standalone_init(void)
+{
+    while (next_inst < (PARALLEL_MAX - 1))
+        device_add_inst(&lpt_port_device, next_inst + 1);
+};
+
+const device_t lpt_port_device = {
+    .name          = "Parallel Port",
+    .internal_name = "lpt",
+    .flags         = 0,
+    .local         = 0,
+    .init          = lpt_init,
+    .close         = lpt_close,
+    .reset         = lpt_reset,
+    .available     = NULL,
+    .speed_changed = lpt_speed_changed,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/device/mouse.c b/src/device/mouse.c
index da4ed1c04..fb7fd020f 100644
--- a/src/device/mouse.c
+++ b/src/device/mouse.c
@@ -61,7 +61,7 @@ static const device_t mouse_none_device = {
     .init          = NULL,
     .close         = NULL,
     .reset         = NULL,
-    { .poll = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -75,7 +75,7 @@ static const device_t mouse_internal_device = {
     .init          = NULL,
     .close         = NULL,
     .reset         = NULL,
-    { .poll = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -83,34 +83,41 @@ static const device_t mouse_internal_device = {
 
 static mouse_t mouse_devices[] = {
     // clang-format off
-    { &mouse_none_device         },
-    { &mouse_internal_device     },
-    { &mouse_logibus_device      },
-    { &mouse_msinport_device     },
+    { &mouse_none_device               },
+    { &mouse_internal_device           },
+    { &mouse_logibus_device            },
+    { &mouse_msinport_device           },
 #ifdef USE_GENIBUS
-    { &mouse_genibus_device      },
+    { &mouse_genibus_device            },
+#endif
+
+    { &mouse_mssystems_device          },
+    { &mouse_mssystems_bus_device      },
+    { &mouse_msserial_device           },
+    { &mouse_msserial_ballpoint_device },
+    { &mouse_ltserial_device           },
+    { &mouse_ps2_device                },
+#ifdef USE_STANDALONE_QUICKPORT
+    { &mouse_upc_standalone_device     },
 #endif
-    { &mouse_mssystems_device    },
-    { &mouse_msserial_device     },
-    { &mouse_ltserial_device     },
-    { &mouse_ps2_device          },
 #ifdef USE_WACOM
-    { &mouse_wacom_device        },
-    { &mouse_wacom_artpad_device },
+    { &mouse_wacom_device              },
+    { &mouse_wacom_artpad_device       },
 #endif
-    { NULL                       }
+    { &mouse_mtouch_device             },
+    { NULL                             }
     // clang-format on
 };
 
 static _Atomic double  mouse_x;
 static _Atomic double  mouse_y;
 static atomic_int      mouse_z;
+static atomic_int      mouse_w;
 static atomic_int      mouse_buttons;
 
 static int             mouse_delta_b;
 static int             mouse_old_b;
 
-static const device_t *mouse_curr;
 static void           *mouse_priv;
 static int             mouse_nbut;
 static int             mouse_raw;
@@ -156,6 +163,7 @@ mouse_clear_coords(void)
     mouse_clear_y();
 
     mouse_z = 0;
+    mouse_w = 0;
 }
 
 void
@@ -355,6 +363,14 @@ mouse_wheel_moved(void)
     return ret;
 }
 
+int
+mouse_hwheel_moved(void)
+{
+    int ret = !!(atomic_load(&mouse_w));
+
+    return ret;
+}
+
 int
 mouse_moved(void)
 {
@@ -373,13 +389,14 @@ mouse_state_changed(void)
     int b;
     int b_mask    = (1 << mouse_nbut) - 1;
     int wheel     = (mouse_nbut >= 4);
+    int hwheel    = (mouse_nbut >= 6);
     int ret;
 
     b = atomic_load(&mouse_buttons);
     mouse_delta_b = (b ^ mouse_old_b);
     mouse_old_b   = b;
 
-    ret = mouse_moved() || ((atomic_load(&mouse_z) != 0) && wheel) || (mouse_delta_b & b_mask);
+    ret = mouse_moved() || ((atomic_load(&mouse_z) != 0) && wheel) || ((atomic_load(&mouse_w) != 0) && hwheel) || (mouse_delta_b & b_mask);
 
     return ret;
 }
@@ -475,16 +492,28 @@ mouse_clear_z(void)
     atomic_store(&mouse_z, 0);
 }
 
+void
+mouse_set_w(int w)
+{
+    atomic_fetch_add(&mouse_w, w);
+}
+
+void
+mouse_clear_w(void)
+{
+    atomic_store(&mouse_w, 0);
+}
+
 void
 mouse_subtract_z(int *delta_z, int min, int max, int invert)
 {
     int z = atomic_load(&mouse_z);
     int real_z = invert ? -z : z;
 
-    if (mouse_z > max) {
+    if (real_z > max) {
         *delta_z = max;
         real_z -= max;
-    } else if (mouse_z < min) {
+    } else if (real_z < min) {
         *delta_z = min;
         real_z += ABS(min);
     } else {
@@ -495,6 +524,26 @@ mouse_subtract_z(int *delta_z, int min, int max, int invert)
     atomic_store(&mouse_z, invert ? -real_z : real_z);
 }
 
+void
+mouse_subtract_w(int *delta_w, int min, int max, int invert)
+{
+    int w = atomic_load(&mouse_w);
+    int real_w = invert ? -w : w;
+
+    if (real_w > max) {
+        *delta_w = max;
+        real_w -= max;
+    } else if (real_w < min) {
+        *delta_w = min;
+        real_w += ABS(min);
+    } else {
+        *delta_w = real_w;
+        real_w = 0;
+    }
+
+    atomic_store(&mouse_w, invert ? -real_w : real_w);
+}
+
 void
 mouse_set_buttons_ex(int b)
 {
@@ -510,7 +559,7 @@ mouse_get_buttons_ex(void)
 void
 mouse_set_sample_rate(double new_rate)
 {
-    mouse_timed = (new_rate > 0.0);
+    mouse_timed = !force_constant_mouse && (new_rate > 0.0);
 
     timer_stop(&mouse_timer);
 
@@ -519,6 +568,12 @@ mouse_set_sample_rate(double new_rate)
         timer_on_auto(&mouse_timer, 1000000.0 / sample_rate);
 }
 
+void
+mouse_update_sample_rate(void)
+{
+    mouse_set_sample_rate(sample_rate);
+}
+
 /* Callback from the hardware driver. */
 void
 mouse_set_buttons(int buttons)
@@ -536,17 +591,10 @@ mouse_get_abs_coords(double *x_abs, double *y_abs)
 void
 mouse_process(void)
 {
-    if (mouse_curr == NULL)
-        return;
-
     if ((mouse_input_mode >= 1) && mouse_poll_ex)
         mouse_poll_ex();
-    else if ((mouse_input_mode == 0) && ((mouse_dev_poll != NULL) || (mouse_curr->poll != NULL))) {
-        if (mouse_curr->poll != NULL)
-            mouse_curr->poll(mouse_priv);
-        else
-            mouse_dev_poll(mouse_priv);
-    }
+    else if ((mouse_input_mode == 0) && (mouse_dev_poll != NULL))
+        mouse_dev_poll(mouse_priv);
 }
 
 void
@@ -558,9 +606,6 @@ mouse_set_poll_ex(void (*poll_ex)(void))
 void
 mouse_set_poll(int (*func)(void *), void *arg)
 {
-    if (mouse_type != MOUSE_TYPE_INTERNAL)
-        return;
-
     mouse_dev_poll = func;
     mouse_priv     = arg;
 }
@@ -628,7 +673,7 @@ mouse_set_raw(int raw)
 void
 mouse_reset(void)
 {
-    if (mouse_curr != NULL)
+    if (mouse_priv != NULL)
         return; /* Mouse already initialized. */
 
     mouse_log("MOUSE: reset(type=%d, '%s')\n",
@@ -637,8 +682,7 @@ mouse_reset(void)
     /* Clear local data. */
     mouse_clear_coords();
     mouse_clear_buttons();
-    mouse_input_mode                  = 0;
-    mouse_timed                 = 1;
+    mouse_input_mode      = 0;
 
     /* If no mouse configured, we're done. */
     if (mouse_type == 0)
@@ -647,22 +691,15 @@ mouse_reset(void)
     timer_add(&mouse_timer, mouse_timer_poll, NULL, 0);
 
     /* Poll at 100 Hz, the default of a PS/2 mouse. */
-    sample_rate = 100.0;
-    timer_on_auto(&mouse_timer, 1000000.0 / sample_rate);
+    mouse_set_sample_rate(100.0);
 
-    mouse_curr = mouse_devices[mouse_type].device;
-
-    if ((mouse_type > 1) && (mouse_curr != NULL))
-        mouse_priv = device_add(mouse_curr);
+    if ((mouse_type > 1) && (mouse_devices[mouse_type].device != NULL))
+        mouse_priv = device_add(mouse_devices[mouse_type].device);
 }
 
 void
 mouse_close(void)
 {
-    if (mouse_curr == NULL)
-        return;
-
-    mouse_curr     = NULL;
     mouse_priv     = NULL;
     mouse_nbut     = 0;
     mouse_dev_poll = NULL;
@@ -679,7 +716,6 @@ mouse_init(void)
     mouse_clear_buttons();
 
     mouse_type     = MOUSE_TYPE_NONE;
-    mouse_curr     = NULL;
     mouse_priv     = NULL;
     mouse_nbut     = 0;
     mouse_dev_poll = NULL;
diff --git a/src/device/mouse_bus.c b/src/device/mouse_bus.c
index 554704c9d..dd71ef11e 100644
--- a/src/device/mouse_bus.c
+++ b/src/device/mouse_bus.c
@@ -508,7 +508,7 @@ bm_poll(void *priv)
             dev->mouse_buttons |= 0x40;
 
         /* Set bits 3-5 according to button state changes. */
-        xor = ((dev->current_b ^ mouse_get_buttons_ex()) & 0x07) << 3;
+        xor = ((dev->current_b ^ dev->mouse_buttons) & 0x07) << 3;
         dev->mouse_buttons |= xor;
     }
 
@@ -614,8 +614,7 @@ bm_init(const device_t *info)
     mouse_t *dev;
     int      hz;
 
-    dev = (mouse_t *) malloc(sizeof(mouse_t));
-    memset(dev, 0x00, sizeof(mouse_t));
+    dev = (mouse_t *) calloc(1, sizeof(mouse_t));
 
     if ((info->local & ~MOUSE_TYPE_ONBOARD) == MOUSE_TYPE_INPORT)
         dev->flags = FLAG_INPORT;
@@ -681,72 +680,78 @@ bm_init(const device_t *info)
 
     mouse_set_sample_rate(0.0);
 
+    mouse_set_poll(bm_poll, dev);
+
     return dev;
 }
 
 static const device_config_t lt_config[] = {
   // clang-format off
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x23c,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x23c,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "0x230", .value = 0x230 },
             { .description = "0x234", .value = 0x234 },
             { .description = "0x238", .value = 0x238 },
             { .description = "0x23C", .value = 0x23c },
             { .description = ""                      }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "IRQ 2", .value = 2 },
             { .description = "IRQ 3", .value = 3 },
             { .description = "IRQ 4", .value = 4 },
             { .description = "IRQ 5", .value = 5 },
             { .description = ""                  }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "hz",
-        .description = "Hz",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 45,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "hz",
+        .description    = "Hz",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 45,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Non-timed (original)",       .value =  0 },
             { .description = "30 Hz (JMP2 = 1)",           .value = 30 },
             { .description = "45 Hz (JMP2 not populated)", .value = 45 },
-            { .description = "60 Hz (JMP 2 = 2)",          .value = 60 },
+            { .description = "60 Hz (JMP2 = 2)",           .value = 60 },
             { .description = ""                                        }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "buttons",
-        .description = "Buttons",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 2,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "buttons",
+        .description    = "Buttons",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Two",   .value = 2 },
             { .description = "Three", .value = 3 },
             { .description = ""                  }
-        }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -755,50 +760,53 @@ static const device_config_t lt_config[] = {
 static const device_config_t ms_config[] = {
   // clang-format off
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x23c,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x23c,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "0x230", .value = 0x230 },
             { .description = "0x234", .value = 0x234 },
             { .description = "0x238", .value = 0x238 },
             { .description = "0x23C", .value = 0x23c },
             { .description = ""                      }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "IRQ 2", .value = 2 },
             { .description = "IRQ 3", .value = 3 },
             { .description = "IRQ 4", .value = 4 },
             { .description = "IRQ 5", .value = 5 },
             { .description = ""                  }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "buttons",
-        .description = "Buttons",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 2,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "buttons",
+        .description    = "Buttons",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Two",   .value = 2 },
             { .description = "Three", .value = 3 },
             { .description = ""                  }
-        }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -807,12 +815,12 @@ static const device_config_t ms_config[] = {
 const device_t mouse_logibus_device = {
     .name          = "Logitech/Microsoft Bus Mouse",
     .internal_name = "logibus",
-    .flags         = DEVICE_ISA,
+    .flags         = DEVICE_ISA | DEVICE_SIDECAR,
     .local         = MOUSE_TYPE_LOGIBUS,
     .init          = bm_init,
     .close         = bm_close,
     .reset         = NULL,
-    { .poll = bm_poll },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = lt_config
@@ -826,7 +834,7 @@ const device_t mouse_logibus_onboard_device = {
     .init          = bm_init,
     .close         = bm_close,
     .reset         = NULL,
-    { .poll = bm_poll },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -835,12 +843,12 @@ const device_t mouse_logibus_onboard_device = {
 const device_t mouse_msinport_device = {
     .name          = "Microsoft Bus Mouse (InPort)",
     .internal_name = "msbus",
-    .flags         = DEVICE_ISA,
+    .flags         = DEVICE_ISA | DEVICE_SIDECAR,
     .local         = MOUSE_TYPE_INPORT,
     .init          = bm_init,
     .close         = bm_close,
     .reset         = NULL,
-    { .poll = bm_poll },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = ms_config
diff --git a/src/device/mouse_microtouch_touchscreen.c b/src/device/mouse_microtouch_touchscreen.c
new file mode 100644
index 000000000..512fcc0df
--- /dev/null
+++ b/src/device/mouse_microtouch_touchscreen.c
@@ -0,0 +1,613 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          3M MicroTouch Serial emulation.
+ *
+ *
+ *
+ * Authors: Cacodemon345, mourix
+ *
+ *          Copyright 2024 Cacodemon345
+ */
+
+/* Reference: https://www.touchwindow.com/mm5/drivers/mtsctlrm.pdf */
+
+/* TODO:
+    - Properly implement GP/SP commands (formats are not documented at all, like anywhere; no dumps yet).
+    - Add additional SMT2/3 formats as we currently only support Tablet, Hex and Dec.
+    - Mode Polled.
+*/
+#include <ctype.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdbool.h>
+#include <time.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/timer.h>
+#include <86box/mouse.h>
+#include <86box/serial.h>
+#include <86box/plat.h>
+#include <86box/fifo8.h>
+#include <86box/fifo.h>
+#include <86box/video.h>
+#include <86box/nvr.h>
+
+#define NVR_SIZE    16
+
+enum mtouch_formats {
+    FORMAT_DEC    = 1,
+    FORMAT_HEX    = 2,
+    FORMAT_RAW    = 3,
+    FORMAT_TABLET = 4
+};
+
+enum mtouch_modes {
+    MODE_DOWNUP   = 1,
+    MODE_INACTIVE = 2,
+    MODE_POINT    = 3,
+    MODE_STREAM   = 4,
+};
+
+const char* mtouch_identity[] = {
+    "A30100", /* SMT2 Serial / SMT3(R)V */
+    "A40100", /* SMT2 PCBus */
+    "P50100", /* TouchPen 4(+) */
+    "Q10100", /* SMT3(R) Serial */
+};
+
+typedef struct mouse_microtouch_t {
+    char         cmd[256];
+    double       abs_x, abs_x_old, abs_y, abs_y_old;
+    float        scale_x, scale_y, off_x, off_y;
+    int          but, but_old;
+    int          baud_rate, cmd_pos;
+    uint8_t      format, mode;
+    uint8_t      id, cal_cntr, pen_mode;
+    bool         mode_status, cal_ex, soh;   
+    bool         in_reset, reset;
+    uint8_t     *nvr;
+    char         nvr_path[64];    
+    serial_t    *serial;
+    Fifo8        resp;
+    pc_timer_t   host_to_serial_timer;
+    pc_timer_t   reset_timer;
+} mouse_microtouch_t;
+
+static mouse_microtouch_t *mtouch_inst = NULL;
+
+static void
+mtouch_savenvr(void *priv)
+{
+    mouse_microtouch_t *dev = (mouse_microtouch_t *) priv;
+    
+    FILE *fp;
+
+    fp = nvr_fopen(dev->nvr_path, "wb");
+    if (fp) {
+        fwrite(dev->nvr, 1, NVR_SIZE, fp);
+        fclose(fp);
+        fp = NULL;
+    }
+}
+
+static void
+mtouch_writenvr(void *priv, float scale_x, float scale_y, float off_x, float off_y)
+{
+    mouse_microtouch_t *dev = (mouse_microtouch_t *) priv;
+    
+    memcpy(&dev->nvr[0], &scale_x, 4);
+    memcpy(&dev->nvr[4], &scale_y, 4);
+    memcpy(&dev->nvr[8], &off_x, 4);
+    memcpy(&dev->nvr[12], &off_y, 4);
+}
+
+static void
+mtouch_readnvr(void *priv)
+{
+    mouse_microtouch_t *dev = (mouse_microtouch_t *) priv;
+    memcpy(&dev->scale_x, &dev->nvr[0], 4);
+    memcpy(&dev->scale_y, &dev->nvr[4], 4);
+    memcpy(&dev->off_x, &dev->nvr[8], 4);
+    memcpy(&dev->off_y, &dev->nvr[12], 4);
+    
+    pclog("MT NVR CAL: scale_x=%f, scale_y=%f, off_x=%f, off_y=%f\n", dev->scale_x, dev->scale_y, dev->off_x, dev->off_y);
+}
+
+static void
+mtouch_initnvr(void *priv)
+{
+    mouse_microtouch_t *dev = (mouse_microtouch_t *) priv;
+    FILE *fp;
+
+    /* Allocate and initialize the EEPROM. */
+    dev->nvr = (uint8_t *) calloc(1, NVR_SIZE);
+
+    fp = nvr_fopen(dev->nvr_path, "rb");
+    if (fp) {
+        if (fread(dev->nvr, 1, NVR_SIZE, fp) != NVR_SIZE)
+            fatal("mtouch_initnvr(): Error reading data\n");
+        fclose(fp);
+        fp = NULL;
+    } else
+        mtouch_writenvr(dev, 1, 1, 0, 0);
+}
+
+static void
+mtouch_reset_complete(void *priv)
+{
+    mouse_microtouch_t *dev = (mouse_microtouch_t *) priv;
+    
+    dev->reset = true;
+    dev->in_reset = false;
+    fifo8_push_all(&dev->resp, (uint8_t *) "\x01\x30\x0D", 3); /* <SOH>0<CR>  */
+}
+
+static void
+mtouch_calibrate_timer(void *priv)
+{
+    mouse_microtouch_t *dev = (mouse_microtouch_t *) priv;
+    
+    if ((dev->cal_cntr == 2 && (dev->abs_x > 0.25 || dev->abs_y < 0.75)) || \
+        (dev->cal_cntr == 1 && (dev->abs_x < 0.75 || dev->abs_y > 0.25))) {
+        return;
+    }
+    
+    dev->cal_cntr--;    
+    fifo8_push_all(&dev->resp, (uint8_t *) "\x01\x31\x0D", 3); /* <SOH>1<CR>  */
+    
+    if (dev->cal_ex) {
+        if (!dev->cal_cntr) {
+            double x1_ref = 0.125;
+            double y1_ref = 0.875;
+            double x2_ref = 0.875;
+            double y2_ref = 0.125;
+            double x1 = dev->abs_x_old;
+            double y1 = dev->abs_y_old;
+            double x2 = dev->abs_x;
+            double y2 = dev->abs_y;
+            
+            dev->scale_x = (x2_ref - x1_ref) / (x2 - x1);
+            dev->off_x   = x1_ref - dev->scale_x * x1;
+            dev->scale_y = (y2_ref - y1_ref) / (y2 - y1);
+            dev->off_y   = y1_ref - dev->scale_y * y1;
+            dev->cal_ex = false;
+            
+            pclog("MT NEW CAL: scale_x=%f, scale_y=%f, off_x=%f, off_y=%f\n", dev->scale_x, dev->scale_y, dev->off_x, dev->off_y);
+            mtouch_writenvr(dev, dev->scale_x, dev->scale_y, dev->off_x, dev->off_y);
+            mtouch_savenvr(dev);
+        }
+        dev->abs_x_old = dev->abs_x;
+        dev->abs_y_old = dev->abs_y;
+    }    
+}
+
+static void
+mtouch_process_commands(mouse_microtouch_t *dev)
+{
+    dev->cmd[strcspn(dev->cmd, "\r")] = '\0';
+    pclog("MT Command: %s\n", dev->cmd);
+    
+    if (dev->cmd[0] == 'C' && dev->cmd[1] == 'N') {      /* Calibrate New */
+        dev->cal_cntr = 2;
+    }
+    else if (dev->cmd[0] == 'C' && dev->cmd[1] == 'X') { /* Calibrate Extended */
+        dev->scale_x = 1;
+        dev->scale_y = 1;
+        dev->off_x   = 0;
+        dev->off_y   = 0;
+        dev->cal_ex = true;
+        dev->cal_cntr = 2;
+    }
+    else if (dev->cmd[0] == 'F' && dev->cmd[1] == 'D') { /* Format Decimal */
+        dev->format = FORMAT_DEC;
+        dev->mode_status = false;
+    }
+    else if (dev->cmd[0] == 'F' && dev->cmd[1] == 'O') { /* Finger Only */
+        dev->pen_mode = 1;
+    }
+    else if (dev->cmd[0] == 'F' && dev->cmd[1] == 'H') { /* Format Hexadecimal */
+        dev->format = FORMAT_HEX;
+        dev->mode_status = false;
+    }
+    else if (dev->cmd[0] == 'F' && dev->cmd[1] == 'R') { /* Format Raw */
+        dev->format = FORMAT_RAW;
+        dev->mode = MODE_INACTIVE;
+        dev->cal_cntr = 0;
+    }
+    else if (dev->cmd[0] == 'F' && dev->cmd[1] == 'T') { /* Format Tablet */
+        dev->format = FORMAT_TABLET;
+    }
+    else if (dev->cmd[0] == 'G' && dev->cmd[1] == 'P' && dev->cmd[2] == '1') { /* Get Parameter Block 1 */
+        fifo8_push_all(&dev->resp, (uint8_t *) "\x01\x41\x0D", 3); /* <SOH>A<CR>  */
+        fifo8_push_all(&dev->resp, (uint8_t *) "0000000000000000000000000\r", 26);
+    }
+    else if (dev->cmd[0] == 'M' && dev->cmd[1] == 'D' && dev->cmd[2] == 'U') { /* Mode Down/Up */
+        dev->mode = MODE_DOWNUP;
+    }
+    else if (dev->cmd[0] == 'M' && dev->cmd[1] == 'I') { /* Mode Inactive */
+        dev->mode = MODE_INACTIVE;
+    }
+    else if (dev->cmd[0] == 'M' && dev->cmd[1] == 'P') { /* Mode Point */
+        dev->mode = MODE_POINT;
+    }
+    else if (dev->cmd[0] == 'M' && dev->cmd[1] == 'T') { /* Mode Status */
+        dev->mode_status = true;
+    }
+    else if (dev->cmd[0] == 'M' && dev->cmd[1] == 'S') { /* Mode Stream */
+        dev->mode = MODE_STREAM;
+    }
+    else if (dev->cmd[0] == 'O' && dev->cmd[1] == 'I') { /* Output Identity */
+        fifo8_push(&dev->resp, 0x01);
+        fifo8_push_all(&dev->resp, (uint8_t *) mtouch_identity[dev->id], 6);
+        fifo8_push(&dev->resp, 0x0D);
+        return;
+    }
+    else if (dev->cmd[0] == 'O' && dev->cmd[1] == 'S') { /* Output Status */
+        if (dev->reset) {
+            fifo8_push_all(&dev->resp, (uint8_t *) "\x01\x40\x60\x0D", 4);
+        } else {
+            fifo8_push_all(&dev->resp, (uint8_t *) "\x01\x40\x40\x0D", 4);
+        }
+        return;
+    }
+    else if (dev->cmd[0] == 'P') { 
+        if (strlen(dev->cmd) == 2) { /* Pen */
+            if (dev->cmd[1] == 'F') dev->pen_mode = 3;      /* Pen or Finger */
+            else if (dev->cmd[1] == 'O') dev->pen_mode = 2; /* Pen Only */
+        } 
+        else if (strlen(dev->cmd) == 5) { /* Serial Options */
+            if      (dev->cmd[4] == 1) dev->baud_rate = 19200;
+            else if (dev->cmd[4] == 2) dev->baud_rate = 9600;
+            else if (dev->cmd[4] == 3) dev->baud_rate = 4600;
+            else if (dev->cmd[4] == 4) dev->baud_rate = 2400;
+            else if (dev->cmd[4] == 5) dev->baud_rate = 1200;
+            
+            timer_stop(&dev->host_to_serial_timer);
+            timer_on_auto(&dev->host_to_serial_timer, (1000000. / dev->baud_rate) * 10);
+        }
+    }
+    else if (dev->cmd[0] == 'R') { /* Reset */
+        dev->in_reset = true;
+        dev->cal_cntr = 0;
+        dev->pen_mode = 3;
+        
+        if (dev->cmd[0] == 'D') { /* Restore Defaults */
+            dev->mode = MODE_STREAM;
+            dev->mode_status = false;
+            
+            if (dev->id < 2) {
+                dev->format = FORMAT_DEC;
+            } else {
+                dev->format = FORMAT_TABLET;
+            }
+        }
+        
+        timer_on_auto(&dev->reset_timer, 500. * 1000.);
+        return;
+    }
+    else if (dev->cmd[0] == 'S' && dev->cmd[1] == 'P' && dev->cmd[2] == '1') { /* Set Parameter Block 1 */
+        fifo8_push_all(&dev->resp, (uint8_t *) "\x01\x41\x0D", 3); /* <SOH>A<CR>  */
+        return;
+    }
+    else if (dev->cmd[0] == 'U' && dev->cmd[1] == 'T') { /* Unit Type */
+        fifo8_push(&dev->resp, 0x01);
+        
+        if (dev->id == 2) {
+            fifo8_push_all(&dev->resp, (uint8_t *) "TP****00", 8);
+        } else {
+            fifo8_push_all(&dev->resp, (uint8_t *) "QM****00", 8);
+        }
+        fifo8_push(&dev->resp, 0x0D);
+        return;
+    }
+    
+    fifo8_push_all(&dev->resp, (uint8_t *) "\x01\x30\x0D", 3); /* <SOH>0<CR>  */
+}
+
+static void
+mtouch_write(UNUSED(serial_t *serial), void *priv, uint8_t data)
+{
+    mouse_microtouch_t *dev = (mouse_microtouch_t *) priv;
+    
+    if (data == '\x1') {
+        dev->soh = 1;
+    } 
+    else if (dev->soh) {
+        if (data != '\r') {
+            dev->cmd[dev->cmd_pos++] = data;
+        } else {
+            dev->soh = 0;
+            
+            if (!dev->cmd_pos) {
+                return;
+            }
+            
+            dev->cmd[dev->cmd_pos++] = data;
+            dev->cmd_pos = 0;
+            mtouch_process_commands(dev);
+        }
+    }
+}
+    
+static int
+mtouch_prepare_transmit(void *priv)    
+{
+    mouse_microtouch_t *dev = (mouse_microtouch_t *) priv;
+    
+    char buffer[16];
+    double abs_x = dev->abs_x;
+    double abs_y = dev->abs_y;
+    int but      = dev->but;
+    
+    if (dev->mode == MODE_INACTIVE) {
+        return 0;
+    }
+    
+    if (dev->cal_cntr || (!dev->but && !dev->but_old)) { /* Calibration or no buttonpress */
+        if (!dev->but && dev->but_old) {
+            mtouch_calibrate_timer(dev);
+        }
+        dev->but_old = but; /* Save buttonpress */
+        return 0;
+    }
+    
+    if (dev->format == FORMAT_TABLET) {
+        if (but) { /* Touchdown/Continuation */
+            fifo8_push(&dev->resp, 0b11000000 | ((dev->pen_mode == 2) ? ((1 << 5) | ((but & 3))) : 0));
+            fifo8_push(&dev->resp, (uint16_t)(16383 * abs_x) & 0b1111111);
+            fifo8_push(&dev->resp, ((uint16_t)(16383 * abs_x) >> 7) & 0b1111111);
+            fifo8_push(&dev->resp, (uint16_t)(16383 * (1 - abs_y)) & 0b1111111);
+            fifo8_push(&dev->resp, ((uint16_t)(16383 * (1 - abs_y)) >> 7) & 0b1111111);
+        } 
+        else if (dev->but_old) { /* Liftoff */
+            fifo8_push(&dev->resp, 0b10000000 | ((dev->pen_mode == 2) ? ((1 << 5)) : 0));
+            fifo8_push(&dev->resp, (uint16_t)(16383 * dev->abs_x_old) & 0b1111111);
+            fifo8_push(&dev->resp, ((uint16_t)(16383 * dev->abs_x_old) >> 7) & 0b1111111);
+            fifo8_push(&dev->resp, (uint16_t)(16383 * (1 - dev->abs_y_old))& 0b1111111);
+            fifo8_push(&dev->resp, ((uint16_t)(16383 * (1 - dev->abs_y_old)) >> 7) & 0b1111111);
+        }
+    }
+    
+    else if (dev->format == FORMAT_DEC || dev->format == FORMAT_HEX) {
+        if (but) {
+            if (!dev->but_old) { /* Touchdown (MS, MP, MDU) */
+                fifo8_push(&dev->resp, (dev->mode_status) ? 0x19 : 0x01);
+                if (dev->format == FORMAT_DEC){
+                    snprintf(buffer, sizeof(buffer), "%03d,%03d\r", (uint16_t)(999 * abs_x), (uint16_t)(999 * (1 - abs_y)));
+                } 
+                else if (dev->format == FORMAT_HEX) {
+                    snprintf(buffer, sizeof(buffer), "%03X,%03X\r", (uint16_t)(1023 * abs_x), (uint16_t)(1023 * (1 - abs_y)));
+                }
+                fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer));
+            } 
+            else if (dev->mode == MODE_STREAM){ /* Touch Continuation (MS) */
+                fifo8_push(&dev->resp, (dev->mode_status) ? 0x1c : 0x01);
+                if (dev->format == FORMAT_DEC){
+                    snprintf(buffer, sizeof(buffer), "%03d,%03d\r", (uint16_t)(999 * abs_x), (uint16_t)(999 * (1 - abs_y)));
+                } 
+                else if (dev->format == FORMAT_HEX) {
+                    snprintf(buffer, sizeof(buffer), "%03X,%03X\r", (uint16_t)(1023 * abs_x), (uint16_t)(1023 * (1 - abs_y)));
+                }
+                fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer));
+            }
+        } 
+        else if (dev->but_old && dev->mode != MODE_POINT) { /* Touch Liftoff (MS, MDU) */
+            fifo8_push(&dev->resp, (dev->mode_status) ? 0x18 : 0x01);
+            if (dev->format == FORMAT_DEC) {
+                snprintf(buffer, sizeof(buffer), "%03d,%03d\r", (uint16_t)(999 * dev->abs_x_old), (uint16_t)(999 * (1 - dev->abs_y_old)));
+            } 
+            else if (dev->format == FORMAT_HEX) {
+                snprintf(buffer, sizeof(buffer), "%03X,%03X\r", (uint16_t)(1023 * dev->abs_x_old), (uint16_t)(1023 * (1 - dev->abs_y_old)));
+            }
+            fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer));
+        }
+    }
+    
+    /* Save old states*/
+    dev->abs_x_old = abs_x;
+    dev->abs_y_old = abs_y;
+    dev->but_old = but;
+    return 0;
+}
+
+static void
+mtouch_write_to_host(void *priv)
+{
+    mouse_microtouch_t *dev = (mouse_microtouch_t *) priv;
+    
+    if (dev->serial == NULL)
+        goto no_write_to_machine;
+    if ((dev->serial->type >= SERIAL_16550) && dev->serial->fifo_enabled) {
+        if (fifo_get_full(dev->serial->rcvr_fifo)) {
+            goto no_write_to_machine;
+        }
+    } else {
+        if (dev->serial->lsr & 1) {
+            goto no_write_to_machine;
+        }
+    }
+    if (dev->in_reset) {
+        goto no_write_to_machine;
+    }
+    if (fifo8_num_used(&dev->resp)) {
+        serial_write_fifo(dev->serial, fifo8_pop(&dev->resp));
+    }
+    else {
+        mtouch_prepare_transmit(dev);
+    }
+
+no_write_to_machine:
+    timer_on_auto(&dev->host_to_serial_timer, (1000000.0 / (double) dev->baud_rate) * (double) (1 + 8 + 1));
+}
+
+static int
+mtouch_poll(void *priv)
+{
+    mouse_microtouch_t *dev = (mouse_microtouch_t *) priv;
+    
+    dev->but = mouse_get_buttons_ex();
+    mouse_get_abs_coords(&dev->abs_x, &dev->abs_y);
+    
+    if (enable_overscan) {
+        int index = mouse_tablet_in_proximity - 1;
+        if (mouse_tablet_in_proximity == -1) {
+            mouse_tablet_in_proximity = 0;
+        }
+        
+        dev->abs_x *= monitors[index].mon_unscaled_size_x - 1;
+        dev->abs_y *= monitors[index].mon_efscrnsz_y - 1;
+        
+        if (dev->abs_x <= (monitors[index].mon_overscan_x / 2.)) {
+            dev->abs_x = (monitors[index].mon_overscan_x / 2.);
+        }
+        if (dev->abs_y <= (monitors[index].mon_overscan_y / 2.)) {
+            dev->abs_y = (monitors[index].mon_overscan_y / 2.);
+        }
+        dev->abs_x -= (monitors[index].mon_overscan_x / 2.);
+        dev->abs_y -= (monitors[index].mon_overscan_y / 2.);
+        dev->abs_x = dev->abs_x / (double) monitors[index].mon_xsize;
+        dev->abs_y = dev->abs_y / (double) monitors[index].mon_ysize;
+    }
+    
+    dev->abs_x = dev->scale_x * dev->abs_x + dev->off_x;
+    dev->abs_y = dev->scale_y * dev->abs_y + dev->off_y;
+    
+    if (dev->abs_x >= 1.0) dev->abs_x = 1.0;
+    if (dev->abs_y >= 1.0) dev->abs_y = 1.0;
+    if (dev->abs_x <= 0.0) dev->abs_x = 0.0;
+    if (dev->abs_y <= 0.0) dev->abs_y = 0.0;
+    
+    return 0;
+}
+
+static void
+mtouch_poll_global(void)
+{
+    mtouch_poll(mtouch_inst);
+}
+
+void *
+mtouch_init(UNUSED(const device_t *info))
+{
+    mouse_microtouch_t *dev = calloc(1, sizeof(mouse_microtouch_t));
+    
+    dev->serial = serial_attach(device_get_config_int("port"), NULL, mtouch_write, dev);
+    dev->baud_rate = 9600;
+    serial_set_cts(dev->serial, 1);
+    serial_set_dsr(dev->serial, 1);
+    serial_set_dcd(dev->serial, 1);
+    
+    fifo8_create(&dev->resp, 256);
+    timer_add(&dev->host_to_serial_timer, mtouch_write_to_host, dev, 0);
+    timer_add(&dev->reset_timer, mtouch_reset_complete, dev, 0);
+    timer_on_auto(&dev->host_to_serial_timer, (1000000. / dev->baud_rate) * 10);
+    dev->id          = device_get_config_int("identity");
+    dev->pen_mode    = 3;
+    dev->mode        = MODE_STREAM;
+    
+    sprintf(dev->nvr_path, "mtouch_%s.nvr", mtouch_identity[dev->id]);
+    mtouch_initnvr(dev);
+    mtouch_readnvr(dev);
+    
+    if (dev->id < 2) { /* legacy controllers */
+        dev->format = FORMAT_DEC;
+    } else {
+        dev->format = FORMAT_TABLET;
+    }
+    
+    mouse_input_mode = device_get_config_int("crosshair") + 1;
+    mouse_set_buttons(2);
+    mouse_set_poll(mtouch_poll, dev);
+    mouse_set_poll_ex(mtouch_poll_global);
+    mtouch_inst = dev;
+    
+    return dev;
+}
+
+void
+mtouch_close(void *priv)
+{
+    mouse_microtouch_t *dev = (mouse_microtouch_t *) priv;
+
+    fifo8_destroy(&dev->resp);
+    /* Detach serial port from the mouse. */
+    if (dev && dev->serial && dev->serial->sd) {
+        memset(dev->serial->sd, 0, sizeof(serial_device_t));
+    }
+    
+    free(dev);
+    mtouch_inst = NULL;
+}
+
+static const device_config_t mtouch_config[] = {
+  // clang-format off
+    {
+        .name           = "port",
+        .description    = "Serial Port",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "COM1", .value = 0 },
+            { .description = "COM2", .value = 1 },
+            { .description = "COM3", .value = 2 },
+            { .description = "COM4", .value = 3 },
+            { .description = ""                 }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "identity",
+        .description    = "Controller",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "A3 - SMT2 Serial / SMT3(R)V", .value = 0 },
+            { .description = "A4 - SMT2 PCBus",             .value = 1 },
+            { .description = "P5 - TouchPen 4(+)",          .value = 2 },
+            { .description = "Q1 - SMT3(R) Serial",         .value = 3 },
+            { .description = ""                                        }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "crosshair",
+        .description    = "Show Crosshair",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
+const device_t mouse_mtouch_device = {
+    .name          = "3M MicroTouch (Serial)",
+    .internal_name = "microtouch_touchpen",
+    .flags         = DEVICE_COM,
+    .local         = 0,
+    .init          = mtouch_init,
+    .close         = mtouch_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = mtouch_config
+};
\ No newline at end of file
diff --git a/src/device/mouse_ps2.c b/src/device/mouse_ps2.c
index c3a7310f0..80d9f3876 100644
--- a/src/device/mouse_ps2.c
+++ b/src/device/mouse_ps2.c
@@ -10,7 +10,7 @@
  *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2023 Miran Grca.
+ *          Copyright 2023-2025 Miran Grca.
  */
 #include <stdarg.h>
 #include <stdatomic.h>
@@ -21,7 +21,6 @@
 #include <wchar.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
-#include "cpu.h"
 #include <86box/device.h>
 #include <86box/keyboard.h>
 #include <86box/mouse.h>
@@ -34,13 +33,15 @@ enum {
     MODE_ECHO
 };
 
-#define FLAG_EXPLORER 0x200  /* Has 5 buttons */
-#define FLAG_5BTN     0x100  /* using Intellimouse Optical mode */
-#define FLAG_INTELLI   0x80  /* device is IntelliMouse */
-#define FLAG_INTMODE   0x40  /* using Intellimouse mode */
-#define FLAG_SCALED    0x20  /* enable delta scaling */
-#define FLAG_ENABLED   0x10  /* dev is enabled for use */
-#define FLAG_CTRLDAT   0x08  /* ctrl or data mode */
+#define FLAG_HWHL          0x800  /* Report horizontal wheel movements. */
+#define FLAG_EXPLORER_HWHL 0x400  /* Has tilt-wheel/horizontal scroll wheel */
+#define FLAG_EXPLORER      0x200  /* Has 5 buttons */
+#define FLAG_5BTN          0x100  /* using Intellimouse Optical mode */
+#define FLAG_INTELLI        0x80  /* device is IntelliMouse */
+#define FLAG_INTMODE        0x40  /* using Intellimouse mode */
+#define FLAG_SCALED         0x20  /* enable delta scaling */
+#define FLAG_ENABLED        0x10  /* dev is enabled for use */
+#define FLAG_CTRLDAT        0x08  /* ctrl or data mode */
 
 #define FIFO_SIZE      16
 
@@ -82,10 +83,16 @@ ps2_report_coordinates(atkbc_dev_t *dev, int main)
     int overflow_y;
     int b = mouse_get_buttons_ex();
     int delta_z;
+    int delta_w;
 
     mouse_subtract_coords(&delta_x, &delta_y, &overflow_x, &overflow_y,
                           -256, 255, 1, 0);
-    mouse_subtract_z(&delta_z, -8, 7, 1);
+
+    if (dev->flags & FLAG_5BTN)
+        mouse_subtract_z(&delta_z, -32, 31, 1);
+    else
+        mouse_subtract_z(&delta_z, -8, 7, 1);
+    mouse_subtract_w(&delta_w, -1, 1, 0);
 
     buff[0] |= (overflow_y << 7) | (overflow_x << 6) |
               ((delta_y & 0x0100) >> 3) | ((delta_x & 0x0100) >> 4) |
@@ -97,10 +104,21 @@ ps2_report_coordinates(atkbc_dev_t *dev, int main)
     kbc_at_dev_queue_add(dev, buff[1], main);
     kbc_at_dev_queue_add(dev, buff[2], main);
     if (dev->flags & FLAG_INTMODE) {
-        delta_z &= 0x0f;
+        delta_z &= (dev->flags & FLAG_HWHL) ? 0x3f : 0x0f;
 
         if (dev->flags & FLAG_5BTN) {
-            if (b & 8)
+            if ((dev->flags & FLAG_HWHL) && (delta_z || delta_w))
+            {
+                if (delta_w) {
+                    delta_z = delta_w;
+                    delta_z &= 0x3f;
+                    delta_z |= 0x40;
+                } else {
+                    delta_z &= 0x3f;
+                    delta_z |= 0x80;
+                }
+            }
+            else if (b & 8)
                 delta_z |= 0x10;
             if (b & 16)
                 delta_z |= 0x20;
@@ -120,7 +138,7 @@ ps2_set_defaults(atkbc_dev_t *dev)
     dev->rate = 100;
     mouse_set_sample_rate(100.0);
     dev->resolution = 2;
-    dev->flags &= 0x188;
+    dev->flags &= 0x688;
     mouse_scan = 0;
 }
 
@@ -298,6 +316,13 @@ ps2_write(void *priv)
             (last_data[2] == 0xf3) && (last_data[3] == 0xc8) &&
             (last_data[4] == 0xf3) && (last_data[5] == 0x50))
             dev->flags |= FLAG_5BTN;
+
+        if ((dev->flags & FLAG_5BTN) && (dev->flags & FLAG_EXPLORER_HWHL) &&
+            (last_data[0] == 0xf3) && (last_data[1] == 0xc8) &&
+            (last_data[2] == 0xf3) && (last_data[3] == 0x50) &&
+            (last_data[4] == 0xf3) && (last_data[5] == 0x28))
+            dev->flags |= FLAG_HWHL;
+
     }
 }
 
@@ -307,13 +332,13 @@ ps2_poll(void *priv)
     atkbc_dev_t *dev = (atkbc_dev_t *) priv;
     int packet_size = (dev->flags & FLAG_INTMODE) ? 4 : 3;
 
-    int cond = (!mouse_capture && !video_fullscreen) || (!mouse_scan || !mouse_state_changed()) ||
-               ((dev->mode == MODE_STREAM) && (kbc_at_dev_queue_pos(dev, 1) >= (FIFO_SIZE - packet_size)));
+    int cond = (mouse_capture || video_fullscreen) && mouse_scan && (dev->mode == MODE_STREAM) &&
+               mouse_state_changed() && (kbc_at_dev_queue_pos(dev, 1) < (FIFO_SIZE - packet_size));
 
-    if (!cond && (dev->mode == MODE_STREAM))
+    if (cond)
         ps2_report_coordinates(dev, 1);
 
-    return cond;
+    return !cond;
 }
 
 /*
@@ -327,6 +352,9 @@ mouse_ps2_init(const device_t *info)
     atkbc_dev_t *dev = kbc_at_dev_init(DEV_AUX);
     int      i;
 
+    if (info->local & MOUSE_TYPE_QPORT)
+        device_context(&mouse_upc_standalone_device);
+
     dev->name = info->name;
     dev->type = info->local;
 
@@ -336,6 +364,8 @@ mouse_ps2_init(const device_t *info)
         dev->flags |= FLAG_INTELLI;
     if (i > 4)
         dev->flags |= FLAG_EXPLORER;
+    if (i > 5)
+        dev->flags |= FLAG_EXPLORER_HWHL;
 
     mouse_ps2_log("%s: buttons=%d\n", dev->name, i);
 
@@ -352,6 +382,11 @@ mouse_ps2_init(const device_t *info)
     if (dev->port != NULL)
         kbc_at_dev_reset(dev, 0);
 
+    mouse_set_poll(ps2_poll, dev);
+
+    if (info->local & MOUSE_TYPE_QPORT)
+        device_context_restore();
+
     /* Return our private data to the I/O layer. */
     return dev;
 }
@@ -367,20 +402,22 @@ ps2_close(void *priv)
 static const device_config_t ps2_config[] = {
   // clang-format off
     {
-        .name = "buttons",
-        .description = "Buttons",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 2,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "Two",          .value = 2 },
-            { .description = "Three",        .value = 3 },
-            { .description = "Wheel",        .value = 4 },
-            { .description = "Five + Wheel", .value = 5 },
-            { .description = ""                         }
-        }
+        .name           = "buttons",
+        .description    = "Buttons",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Two",             .value = 2 },
+            { .description = "Three",           .value = 3 },
+            { .description = "Wheel",           .value = 4 },
+            { .description = "Five + Wheel",    .value = 5 },
+            { .description = "Five + 2 Wheels", .value = 6 },
+            { .description = ""                              }
+        },
+        .bios           = { { 0 } }
     },
     {
         .name = "", .description = "", .type = CONFIG_END
@@ -389,14 +426,14 @@ static const device_config_t ps2_config[] = {
 };
 
 const device_t mouse_ps2_device = {
-    .name          = "Standard PS/2 Mouse",
+    .name          = "PS/2 Mouse",
     .internal_name = "ps2",
-    .flags         = DEVICE_PS2,
+    .flags         = DEVICE_PS2_KBC,
     .local         = MOUSE_TYPE_PS2,
     .init          = mouse_ps2_init,
     .close         = ps2_close,
     .reset         = NULL,
-    { .poll = ps2_poll },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = ps2_config
diff --git a/src/device/mouse_serial.c b/src/device/mouse_serial.c
index 08aee09d8..45750ef09 100644
--- a/src/device/mouse_serial.c
+++ b/src/device/mouse_serial.c
@@ -50,7 +50,7 @@ enum {
     FORMAT_MM_SERIES = 0x13,
     FORMAT_PB_3BYTE,
     FORMAT_PB_5BYTE,
-    FORMAT_MSYSTEMS = 0x15,    /* Alias for FORMAT_PB_5BYTE. */
+    FORMAT_MSYSTEMS = 0x15, /* Alias for FORMAT_PB_5BYTE. */
     FORMAT_MS,
     FORMAT_HEX,
     FORMAT_MS_4BYTE,
@@ -59,45 +59,46 @@ enum {
 };
 
 typedef struct mouse_t {
-    const char *name;  /* name of this device */
+    const char *name; /* name of this device */
 
-    uint8_t     id[252];
-    uint8_t     buf[256];
+    uint8_t id[252];
+    uint8_t buf[256];
 
-    uint8_t     flags; /* device flags */
-    uint8_t     but; 
-    uint8_t     rts_toggle;
-    uint8_t     status;
-    uint8_t     format;
-    uint8_t     prompt;
+    uint8_t flags; /* device flags */
+    uint8_t but;
+    uint8_t rts_toggle;
+    uint8_t status;
+    uint8_t format;
+    uint8_t prompt;
 
-    uint8_t     continuous;
-    uint8_t     ib;
-    uint8_t     command;
-    uint8_t     buf_len;
-    uint8_t     report_mode;
-    uint8_t     id_len;
-    uint8_t     buf_pos;
-    uint8_t     rev;
+    uint8_t continuous;
+    uint8_t ib;
+    uint8_t command;
+    uint8_t buf_len;
+    uint8_t report_mode;
+    uint8_t id_len;
+    uint8_t buf_pos;
+    uint8_t rev;
 
-    int8_t      type;  /* type of this device */
-    int8_t      port;
+    int8_t type; /* type of this device */
+    int8_t port;
 
-    int         state;
+    int state;
 
-    int         bps;
-    int         rps;
+    int bps;
+    int default_bps;
+    int rps;
 
-    double      transmit_period;
-    double      report_period;
-    double      cur_period;
-    double      min_bit_period;
-    double      acc_time;
-    double      host_transmit_period;
+    double transmit_period;
+    double report_period;
+    double cur_period;
+    double min_bit_period;
+    double acc_time;
+    double host_transmit_period;
 
-    pc_timer_t  timer;
+    pc_timer_t timer;
 
-    serial_t *  serial;
+    serial_t *serial;
 } mouse_t;
 
 #define FLAG_INPORT  0x80 /* device is MS InPort */
@@ -128,7 +129,7 @@ mouse_serial_log(const char *fmt, ...)
 static void
 sermouse_set_period(mouse_t *dev, double period)
 {
-    dev->cur_period = period;    /* Needed for the recalculation of the timings. */
+    dev->cur_period = period; /* Needed for the recalculation of the timings. */
 
     timer_stop(&dev->timer);
 
@@ -142,10 +143,15 @@ sermouse_transmit_byte(mouse_t *dev, int do_next)
     if (dev->buf_pos == 0)
         dev->acc_time = 0.0;
 
-    serial_write_fifo(dev->serial, dev->buf[dev->buf_pos]);
+    if (dev->serial)
+        serial_write_fifo(dev->serial, dev->buf[dev->buf_pos]);
 
     if (do_next) {
-        dev->buf_pos = (dev->buf_pos + 1) % dev->buf_len;
+        /* If we have a buffer length of 0, pretend the state is STATE_SKIP_PACKET. */
+        if (dev->buf_len == 0)
+            dev->buf_pos = 0;
+        else
+            dev->buf_pos = (dev->buf_pos + 1) % dev->buf_len;
 
         if (dev->buf_pos != 0)
             sermouse_set_period(dev, dev->transmit_period);
@@ -155,7 +161,7 @@ sermouse_transmit_byte(mouse_t *dev, int do_next)
 static void
 sermouse_transmit(mouse_t *dev, int len, int from_report, int to_report)
 {
-    dev->state = to_report ? STATE_TRANSMIT_REPORT : STATE_TRANSMIT;
+    dev->state   = to_report ? STATE_TRANSMIT_REPORT : STATE_TRANSMIT;
     dev->buf_pos = 0;
     dev->buf_len = len;
 
@@ -181,7 +187,7 @@ sermouse_report_msystems(mouse_t *dev)
 {
     int delta_x = 0;
     int delta_y = 0;
-    int b = mouse_get_buttons_ex();
+    int b       = mouse_get_buttons_ex();
 
     mouse_subtract_coords(&delta_x, &delta_y, NULL, NULL, -128, 127, 1, 0);
 
@@ -190,12 +196,12 @@ sermouse_report_msystems(mouse_t *dev)
     if (dev->but >= 3)
         dev->buf[0] |= (b & 0x04) ? 0x00 : 0x02; /* middle button */
     else
-        dev->buf[0] |= 0x02; /* middle button */
+        dev->buf[0] |= 0x02;                 /* middle button */
     dev->buf[0] |= (b & 0x02) ? 0x00 : 0x01; /* right button */
     dev->buf[1] = delta_x;
     dev->buf[2] = delta_y;
-    dev->buf[3] = delta_x;    /* same as byte 1 */
-    dev->buf[4] = delta_y;    /* same as byte 2 */
+    dev->buf[3] = delta_x; /* same as byte 1 */
+    dev->buf[4] = delta_y; /* same as byte 2 */
 
     return 5;
 }
@@ -205,7 +211,7 @@ sermouse_report_3bp(mouse_t *dev)
 {
     int delta_x = 0;
     int delta_y = 0;
-    int b = mouse_get_buttons_ex();
+    int b       = mouse_get_buttons_ex();
 
     mouse_subtract_coords(&delta_x, &delta_y, NULL, NULL, -128, 127, 1, 0);
 
@@ -213,7 +219,7 @@ sermouse_report_3bp(mouse_t *dev)
     dev->buf[0] |= (b & 0x01) ? 0x04 : 0x00; /* left button */
     if (dev->but >= 3)
         dev->buf[0] |= (b & 0x04) ? 0x02 : 0x00; /* middle button */
-    dev->buf[0] |= (b & 0x02) ? 0x01 : 0x00; /* right button */
+    dev->buf[0] |= (b & 0x02) ? 0x01 : 0x00;     /* right button */
     dev->buf[1] = delta_x;
     dev->buf[2] = delta_y;
 
@@ -225,7 +231,7 @@ sermouse_report_mmseries(mouse_t *dev)
 {
     int delta_x = 0;
     int delta_y = 0;
-    int b = mouse_get_buttons_ex();
+    int b       = mouse_get_buttons_ex();
 
     mouse_subtract_coords(&delta_x, &delta_y, NULL, NULL, -127, 127, 1, 0);
 
@@ -238,7 +244,7 @@ sermouse_report_mmseries(mouse_t *dev)
     dev->buf[0] |= (b & 0x01) ? 0x04 : 0x00; /* left button */
     if (dev->but >= 3)
         dev->buf[0] |= (b & 0x04) ? 0x02 : 0x00; /* middle button */
-    dev->buf[0] |= (b & 0x02) ? 0x01 : 0x00; /* right button */
+    dev->buf[0] |= (b & 0x02) ? 0x01 : 0x00;     /* right button */
     dev->buf[1] = ABS(delta_x) & 0x7f;
     dev->buf[2] = ABS(delta_y) & 0x7f;
     mouse_serial_log("MM series mouse report: %02X %02X %02X\n", dev->buf[0], dev->buf[1], dev->buf[2]);
@@ -251,7 +257,7 @@ sermouse_report_bp1(mouse_t *dev, int abs)
 {
     int delta_x = 0;
     int delta_y = 0;
-    int b = mouse_get_buttons_ex();
+    int b       = mouse_get_buttons_ex();
 
     mouse_subtract_coords(&delta_x, &delta_y, NULL, NULL, -2048, 2047, 1, abs);
 
@@ -259,7 +265,7 @@ sermouse_report_bp1(mouse_t *dev, int abs)
     dev->buf[0] |= (b & 0x01) ? 0x10 : 0x00; /* left button */
     if (dev->but >= 3)
         dev->buf[0] |= (b & 0x04) ? 0x08 : 0x00; /* middle button */
-    dev->buf[0] |= (b & 0x02) ? 0x04 : 0x00; /* right button */
+    dev->buf[0] |= (b & 0x02) ? 0x04 : 0x00;     /* right button */
     dev->buf[1] = (delta_x & 0x3f);
     dev->buf[2] = ((delta_x >> 6) & 0x3f);
     dev->buf[3] = (delta_y & 0x3f);
@@ -272,17 +278,17 @@ static uint8_t
 sermouse_report_ms(mouse_t *dev)
 {
     uint8_t len;
-    int delta_x = 0;
-    int delta_y = 0;
-    int delta_z = 0;
-    int b = mouse_get_buttons_ex();
+    int     delta_x = 0;
+    int     delta_y = 0;
+    int     delta_z = 0;
+    int     b       = mouse_get_buttons_ex();
 
     mouse_subtract_coords(&delta_x, &delta_y, NULL, NULL, -128, 127, 0, 0);
     mouse_subtract_z(&delta_z, -8, 7, 1);
 
     dev->buf[0] = 0x40;
-    dev->buf[0] |= (((delta_y >> 6) & 0x03) << 2);
-    dev->buf[0] |= ((delta_x >> 6) & 0x03);
+    dev->buf[0] |= ((((delta_y & 0xFF) >> 6) & 0x03) << 2);
+    dev->buf[0] |= (((delta_x & 0xFF) >> 6) & 0x03);
     if (b & 0x01)
         dev->buf[0] |= 0x20;
     if (b & 0x02)
@@ -290,7 +296,16 @@ sermouse_report_ms(mouse_t *dev)
     dev->buf[1] = delta_x & 0x3f;
     dev->buf[2] = delta_y & 0x3f;
     mouse_serial_log("Microsoft serial mouse report: %02X %02X %02X\n", dev->buf[0], dev->buf[1], dev->buf[2]);
-    if (dev->but == 3) {
+    if (dev->type == MOUSE_TYPE_MSBPOINT) {
+        len         = 4;
+        dev->buf[3] = 0;
+        if (b & 0x4)
+            dev->buf[3] |= 0x8;
+        if (b & 0x8)
+            dev->buf[3] |= 0x4;
+        dev->buf[3] |= !!(delta_y < 0) ? 0x2 : 0;
+        dev->buf[3] |= !!(delta_x < 0) ? 0x1 : 0;
+    } else if (dev->but == 3) {
         len = 3;
         if (dev->format == FORMAT_MS) {
             if (b & 0x04) {
@@ -320,18 +335,18 @@ sermouse_report_ms(mouse_t *dev)
 static uint8_t
 sermouse_report_hex(mouse_t *dev)
 {
-    char    ret[6] = { 0, 0, 0, 0, 0, 0 };
-    uint8_t but = 0x00;
-    int delta_x = 0;
-    int delta_y = 0;
-    int b = mouse_get_buttons_ex();
+    char    ret[6]  = { 0, 0, 0, 0, 0, 0 };
+    uint8_t but     = 0x00;
+    int     delta_x = 0;
+    int     delta_y = 0;
+    int     b       = mouse_get_buttons_ex();
 
     mouse_subtract_coords(&delta_x, &delta_y, NULL, NULL, -128, 127, 1, 0);
 
     but |= (b & 0x01) ? 0x04 : 0x00; /* left button */
     if (dev->but >= 3)
         but |= (b & 0x04) ? 0x02 : 0x00; /* middle button */
-    but |= (b & 0x02) ? 0x01 : 0x00; /* right button */
+    but |= (b & 0x02) ? 0x01 : 0x00;     /* right button */
 
     sprintf(ret, "%01X%02X%02X", but & 0x0f, (int8_t) delta_x, (int8_t) delta_y);
 
@@ -436,14 +451,14 @@ ltsermouse_set_report_period(mouse_t *dev, int rps)
         sermouse_set_period(dev, 0.0);
 
         dev->report_period = 0.0;
-        dev->continuous = 1;
+        dev->continuous    = 1;
     } else {
 #if 0
         if (rps > dev->max_rps)
             rps = dev->max_rps;
 #endif
 
-        dev->continuous = 0;
+        dev->continuous    = 0;
         dev->report_period = 1000000.0 / ((double) rps);
         /* Actual spacing between reports. */
     }
@@ -465,21 +480,22 @@ ltsermouse_update_report_period(mouse_t *dev)
 }
 
 static void
-ltsermouse_switch_baud_rate(mouse_t *dev, int next_state)
+ltsermouse_switch_baud_rate(mouse_t *dev, int next_state, int prompt_off)
 {
     double word_lens[FORMATS_NUM] = {
-           [FORMAT_BP1_ABS]   = 7.0 + 1.0,    /* 7 data bits + even parity */
-           [FORMAT_BP1_REL]   = 7.0 + 1.0,    /* 7 data bits + even parity */
-           [FORMAT_MM_SERIES] = 8.0 + 1.0,    /* 8 data bits + odd parity */ 
-           [FORMAT_PB_3BYTE]  = 8.0,          /* 8 data bits + no parity */
-           [FORMAT_PB_5BYTE]  = 8.0,          /* 8 data bits + no parity */
-           [FORMAT_MS]        = 7.0,          /* 7 datas bits + no parity */
-           [FORMAT_HEX]       = 8.0,          /* 8 data bits + no parity */
-           [FORMAT_MS_4BYTE]  = 7.0,          /* 7 datas bits + no parity */
-           [FORMAT_MS_WHEEL]  = 7.0 };        /* 7 datas bits + no parity */
+        [FORMAT_BP1_ABS]   = 7.0 + 1.0, /* 7 data bits + even parity */
+        [FORMAT_BP1_REL]   = 7.0 + 1.0, /* 7 data bits + even parity */
+        [FORMAT_MM_SERIES] = 8.0 + 1.0, /* 8 data bits + odd parity */
+        [FORMAT_PB_3BYTE]  = 8.0,       /* 8 data bits + no parity */
+        [FORMAT_PB_5BYTE]  = 8.0,       /* 8 data bits + no parity */
+        [FORMAT_MS]        = 7.0,       /* 7 datas bits + no parity */
+        [FORMAT_HEX]       = 8.0,       /* 8 data bits + no parity */
+        [FORMAT_MS_4BYTE]  = 7.0,       /* 7 datas bits + no parity */
+        [FORMAT_MS_WHEEL]  = 7.0        /* 7 datas bits + no parity */
+    };
     double word_len = word_lens[dev->format];
 
-    word_len += 1.0 + 2.0;            /* 1 start bit + 2 stop bits */
+    word_len += 1.0 + 2.0; /* 1 start bit + 2 stop bits */
 
 #if 0
     dev->max_rps = (int) floor(((double) dev->bps) / (word_len * num_words));
@@ -501,7 +517,7 @@ ltsermouse_switch_baud_rate(mouse_t *dev, int next_state)
     ltsermouse_set_report_period(dev, dev->rps);
 
     if (!dev->continuous && (next_state != STATE_BAUD_RATE)) {
-        if (dev->prompt)
+        if (dev->prompt && prompt_off)
             ltsermouse_set_prompt_mode(dev, 0);
 
         sermouse_transmit_report(dev, 0);
@@ -526,18 +542,19 @@ sermouse_next_state(mouse_t *dev)
 static void
 ltsermouse_process_command(mouse_t *dev)
 {
-    int cmd_to_rps[9] = { 10, 20, 35, 70, 150, 0, -1, 100, 50 };
-    int b;
+    int     cmd_to_rps[9] = { 10, 20, 35, 70, 150, 0, -1, 100, 50 };
+    int     b;
     uint8_t format_codes[FORMATS_NUM] = {
-                        [FORMAT_BP1_ABS]   = 0x0c,
-                        [FORMAT_BP1_REL]   = 0x06,
-                        [FORMAT_MM_SERIES] = 0x0a,
-                        [FORMAT_PB_3BYTE]  = 0x00,
-                        [FORMAT_PB_5BYTE]  = 0x02,
-                        [FORMAT_MS]        = 0x0e,
-                        [FORMAT_HEX]       = 0x04,
-                        [FORMAT_MS_4BYTE]  = 0x08,         /* Guess */
-                        [FORMAT_MS_WHEEL]  = 0x08 };       /* Guess */
+        [FORMAT_BP1_ABS]   = 0x0c,
+        [FORMAT_BP1_REL]   = 0x06,
+        [FORMAT_MM_SERIES] = 0x0a,
+        [FORMAT_PB_3BYTE]  = 0x00,
+        [FORMAT_PB_5BYTE]  = 0x02,
+        [FORMAT_MS]        = 0x0e,
+        [FORMAT_HEX]       = 0x04,
+        [FORMAT_MS_4BYTE]  = 0x08, /* Guess */
+        [FORMAT_MS_WHEEL]  = 0x08  /* Guess */
+    };
     const char *copr = "\r\n(C) " COPYRIGHT_YEAR " 86Box, Revision 3.0";
 
     mouse_serial_log("ltsermouse_process_command(): %02X\n", dev->ib);
@@ -546,13 +563,13 @@ ltsermouse_process_command(mouse_t *dev)
     switch (dev->command) {
         case 0x20:
             /* Auto Baud Selection */
-            dev->bps = (int) floor(1000000.0 / dev->host_transmit_period);
+            dev->bps             = (int) floor(1000000.0 / dev->host_transmit_period);
             dev->transmit_period = dev->host_transmit_period;
 
             dev->buf[0] = 0x06;
             sermouse_transmit(dev, 1, 0, 0);
 
-            ltsermouse_switch_baud_rate(dev, STATE_BAUD_RATE);
+            ltsermouse_switch_baud_rate(dev, STATE_BAUD_RATE, 0);
             break;
 
         case 0x4a: /* Report Rate Selection commands */
@@ -564,7 +581,7 @@ ltsermouse_process_command(mouse_t *dev)
         case 0x4e:
         case 0x4f:
             dev->report_mode = dev->command;
-            dev->rps = cmd_to_rps[dev->command - 0x4a];
+            dev->rps         = cmd_to_rps[dev->command - 0x4a];
             ltsermouse_update_report_period(dev);
             break;
 
@@ -588,16 +605,16 @@ ltsermouse_process_command(mouse_t *dev)
             /* Absolute Bit Pad One Packed Binary Format */
             mouse_clear_coords();
             fallthrough;
-        case 0x42:    /* Relative Bit Pad One Packed Binary Format */
-        case 0x53:    /* MM Series Data Format */
-        case 0x54:    /* Three Byte Packed Binary Format */
-        case 0x55:    /* Five Byte Packed Binary Format (Mouse Systems-compatible) */
-        case 0x56:    /* Microsoft Compatible Format */
-        case 0x57:    /* Hexadecimal Format */
-        case 0x58:    /* Microsoft Compatible Format (3+1 byte 3-button, from the FreeBSD source code) */
+        case 0x42: /* Relative Bit Pad One Packed Binary Format */
+        case 0x53: /* MM Series Data Format */
+        case 0x54: /* Three Byte Packed Binary Format */
+        case 0x55: /* Five Byte Packed Binary Format (Mouse Systems-compatible) */
+        case 0x56: /* Microsoft Compatible Format */
+        case 0x57: /* Hexadecimal Format */
+        case 0x58: /* Microsoft Compatible Format (3+1 byte 3-button, from the FreeBSD source code) */
             if ((dev->rev >= 0x02) && ((dev->command != 0x58) || (dev->rev > 0x04))) {
                 dev->format = dev->command & 0x1f;
-                ltsermouse_switch_baud_rate(dev, sermouse_next_state(dev));
+                ltsermouse_switch_baud_rate(dev, sermouse_next_state(dev), 0);
             }
             break;
 
@@ -615,7 +632,7 @@ ltsermouse_process_command(mouse_t *dev)
             break;
         case 0x05:
             /* Diagnostic */
-            b = mouse_get_buttons_ex();
+            b           = mouse_get_buttons_ex();
             dev->buf[0] = ((b & 0x01) << 2) | ((b & 0x06) >> 1);
             dev->buf[1] = dev->buf[2] = 0x00;
             sermouse_transmit(dev, 3, 0, 0);
@@ -625,7 +642,7 @@ ltsermouse_process_command(mouse_t *dev)
             if (dev->rev >= 0x20) {
                 /* Format and Revision Number */
                 dev->buf[0] = format_codes[dev->format];
-                dev->buf[0] |= 0x10;    /* Revision 3.0, 0x00 would be Revision 2.0 */
+                dev->buf[0] |= 0x10; /* Revision 3.0, 0x00 would be Revision 2.0 */
                 sermouse_transmit(dev, 1, 0, 0);
             }
             break;
@@ -671,7 +688,7 @@ ltsermouse_process_data(mouse_t *dev)
 {
     mouse_serial_log("ltsermouse_process_data(): %02X (command = %02X)\n", dev->ib, dev->command);
 
-    switch(dev->command) {
+    switch (dev->command) {
         case 0x2a:
             switch (dev->ib) {
                 default:
@@ -689,7 +706,7 @@ ltsermouse_process_data(mouse_t *dev)
                     dev->bps = 9600;
                     break;
             }
-            ltsermouse_switch_baud_rate(dev, (dev->prompt || dev->continuous) ? STATE_IDLE : STATE_TRANSMIT_REPORT);
+            ltsermouse_switch_baud_rate(dev, (dev->prompt || dev->continuous) ? STATE_IDLE : STATE_TRANSMIT_REPORT, 0);
             break;
         default:
             dev->state = STATE_IDLE;
@@ -702,25 +719,32 @@ sermouse_reset(mouse_t *dev, int callback)
 {
     sermouse_set_period(dev, 0.0);
 
-    dev->bps = 1200;
-    dev->rps = 0;
+    if (dev->default_bps)
+        dev->bps = dev->default_bps;
+    else
+        dev->bps    = 1200;
+    dev->rps    = 0;
     dev->prompt = 0;
     if (dev->id[0] == 'H')
         dev->format = FORMAT_MSYSTEMS;
-    else  switch (dev->but) {
-        default:
-        case 2:
-            dev->format = FORMAT_MS;
-            break;
-        case 3:
-            dev->format = (dev->type == MOUSE_TYPE_LT3BUTTON) ? FORMAT_MS : FORMAT_MS_4BYTE;
-            break;
-        case 4:
-            dev->format = FORMAT_MS_WHEEL;
-            break;
-    }
+    else
+        switch (dev->but) {
+            default:
+            case 2:
+                dev->format = FORMAT_MS;
+                break;
+            case 3:
+                dev->format = (dev->type == MOUSE_TYPE_LT3BUTTON) ? FORMAT_MS : FORMAT_MS_4BYTE;
+                break;
+            case 4:
+                dev->format = FORMAT_MS_WHEEL;
+                break;
+            case 5:
+                dev->format = FORMAT_MS;
+                break;
+        }
 
-    ltsermouse_switch_baud_rate(dev, callback ? STATE_TRANSMIT : STATE_IDLE);
+    ltsermouse_switch_baud_rate(dev, callback ? STATE_TRANSMIT : STATE_IDLE, 1);
 }
 
 static void
@@ -746,7 +770,7 @@ sermouse_timer(void *priv)
             if (!dev->prompt && !dev->continuous)
                 sermouse_transmit_report(dev, (dev->state == STATE_TRANSMIT_REPORT));
             else
-                 dev->state = STATE_IDLE;
+                dev->state = STATE_IDLE;
             break;
         case STATE_TRANSMIT_REPORT:
         case STATE_TRANSMIT:
@@ -828,10 +852,6 @@ sermouse_close(void *priv)
 {
     mouse_t *dev = (mouse_t *) priv;
 
-    /* Detach serial port from the mouse. */
-    if (dev && dev->serial && dev->serial->sd)
-        memset(dev->serial->sd, 0, sizeof(serial_device_t));
-
     free(dev);
 }
 
@@ -839,37 +859,52 @@ sermouse_close(void *priv)
 static void *
 sermouse_init(const device_t *info)
 {
-    mouse_t *dev;
+    mouse_t *dev = (mouse_t *) calloc(1, sizeof(mouse_t));
     void (*rcr_callback)(struct serial_s *serial, void *priv);
     void (*dev_write)(struct serial_s *serial, void *priv, uint8_t data);
-    void (*transmit_period_callback)(struct serial_s *serial, void *priv, double transmit_period);
+    void (*transmit_period_callback)(struct serial_s *serial, void *priv,
+                                     double transmit_period);
+
+    if (info->local == MOUSE_TYPE_MSYSTEMSB) {
+        uintptr_t irqbase = ((device_get_config_int("irq") << 16) |
+                             (device_get_config_hex16("addr") << 20)) |
+                             ns16450_device.local;
+        device_add_params(&ns16450_device, (void *) irqbase);
+    }
 
-    dev = (mouse_t *) malloc(sizeof(mouse_t));
-    memset(dev, 0x00, sizeof(mouse_t));
     dev->name = info->name;
-    dev->but  = device_get_config_int("buttons");
-    dev->rev  = device_get_config_int("revision");
+    dev->but  = (info->local == MOUSE_TYPE_MSBPOINT) ? 5 : device_get_config_int("buttons");
 
-    if (info->local == 0)
-        dev->rts_toggle  = 1;
+    if ((info->local == 0) || (info->local == MOUSE_TYPE_MSBPOINT))
+        dev->rts_toggle = 1;
     else
-        dev->rts_toggle  = device_get_config_int("rts_toggle");
+        dev->rts_toggle = device_get_config_int("rts_toggle");
 
     if (dev->but > 2)
         dev->flags |= FLAG_3BTN;
 
-    if (info->local == MOUSE_TYPE_MSYSTEMS) {
-        dev->format    = 0;
-        dev->type      = info->local;
-        dev->id_len    = 1;
-        dev->id[0]     = 'H';
+    if (info->local == MOUSE_TYPE_MSBPOINT) {
+        dev->format = 7;
+        dev->status = 0x0f;
+        dev->type   = MOUSE_TYPE_MSBPOINT;
+        dev->id_len = 1;
+        dev->id[0]  = 'B';
+        dev->flags &= ~FLAG_3BTN;
+    } else if ((info->local == MOUSE_TYPE_MSYSTEMS) || (info->local == MOUSE_TYPE_MSYSTEMSB)) {
+        dev->format = 0;
+        dev->type   = info->local;
+        dev->id_len = 1;
+        dev->id[0]  = 'H';
     } else {
-        dev->format    = 7;
-        dev->status    = 0x0f;
-        dev->id_len    = 1;
-        dev->id[0]     = 'M';
-        if (info->local)
-            dev->rev  = device_get_config_int("revision");
+        dev->format = 7;
+        dev->status = 0x0f;
+        dev->id_len = 1;
+        dev->id[0]  = 'M';
+        if (info->local == 1) {
+            /* Logitech Serial Mouse */
+            dev->rev         = device_get_config_int("revision");
+            dev->default_bps = device_get_config_int("default_baud");
+        }
         switch (dev->but) {
             default:
             case 2:
@@ -889,11 +924,11 @@ sermouse_init(const device_t *info)
         }
     }
 
-    dev->port = device_get_config_int("port");
+    dev->port = (info->local == MOUSE_TYPE_MSYSTEMSB) ? (SERIAL_MAX - 1) : device_get_config_int("port");
 
     /* Attach a serial port to the mouse. */
-    rcr_callback = dev->rts_toggle ? sermouse_callback : NULL;
-    dev_write = (info->local == 1) ? ltsermouse_write : NULL;
+    rcr_callback             = dev->rts_toggle ? sermouse_callback : NULL;
+    dev_write                = (info->local == 1) ? ltsermouse_write : NULL;
     transmit_period_callback = (info->local == 1) ? ltsermouse_transmit_period : NULL;
 
     dev->serial = serial_attach_ex(dev->port, rcr_callback, dev_write,
@@ -909,147 +944,231 @@ sermouse_init(const device_t *info)
     /* Tell them how many buttons we have. */
     mouse_set_buttons(dev->but);
 
+    mouse_set_poll(sermouse_poll, dev);
+
     /* Return our private data to the I/O layer. */
     return dev;
 }
 
+#define SERMOUSE_PORT_CONFIG_COMMON                \
+    {                                              \
+        .name           = "port",                  \
+        .description    = "Serial Port",           \
+        .type           = CONFIG_SELECTION,        \
+        .default_string = NULL,                    \
+        .default_int    = 0,                       \
+        .file_filter    = NULL,                    \
+        .spinner        = { 0 },                   \
+        .selection      = {                        \
+            { .description = "COM1", .value = 0 }, \
+            { .description = "COM2", .value = 1 }, \
+            { .description = "COM3", .value = 2 }, \
+            { .description = "COM4", .value = 3 }, \
+            { .description = ""                 }  \
+        },                                         \
+        .bios           = { { 0 } }                \
+    }
+
 static const device_config_t msssermouse_config[] = {
-  // clang-format off
+    // clang-format off
+    SERMOUSE_PORT_CONFIG_COMMON,
     {
-        .name = "port",
-        .description = "Serial Port",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "COM1", .value = 0 },
-            { .description = "COM2", .value = 1 },
-            { .description = "COM3", .value = 2 },
-            { .description = "COM4", .value = 3 },
-            { .description = ""                 }
-        }
-    },
-    {
-        .name = "buttons",
-        .description = "Buttons",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 2,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "buttons",
+        .description    = "Buttons",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Two",   .value = 2 },
             { .description = "Three", .value = 3 },
             { .description = ""                  }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "rts_toggle",
-        .description = "RTS toggle",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "rts_toggle",
+        .description    = "RTS toggle",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
-  // clang-format on
+    // clang-format on
+};
+
+static const device_config_t mssbusmouse_config[] = {
+    // clang-format off
+    {
+        .name           = "addr",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x238,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x338", .value = 0x338 },
+            { .description = "0x238", .value = 0x238 },
+            { .description = "0x3f8", .value = 0x3f8 },
+            { .description = "0x2f8", .value = 0x2f8 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+
+    {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 2",   .value =  2 },
+            { .description = "IRQ 3",   .value =  3 },
+            { .description = "IRQ 4",   .value =  4 },
+            { .description = "IRQ 5",   .value =  5 },
+            { .description = "IRQ 7",   .value =  7 },
+            { .description = "IRQ 10",  .value = 10 },
+            { .description = "IRQ 11",  .value = 11 },
+            { .description = "IRQ 12",  .value = 12 },
+            { .description = "IRQ 15",  .value = 15 },
+            { .description = ""                     }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "buttons",
+        .description    = "Buttons",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Two",   .value = 2 },
+            { .description = "Three", .value = 3 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "rts_toggle",
+        .description    = "RTS toggle",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
 };
 
 static const device_config_t mssermouse_config[] = {
-  // clang-format off
+    // clang-format off
+    SERMOUSE_PORT_CONFIG_COMMON,
     {
-        .name = "port",
-        .description = "Serial Port",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "COM1", .value = 0 },
-            { .description = "COM2", .value = 1 },
-            { .description = "COM3", .value = 2 },
-            { .description = "COM4", .value = 3 },
-            { .description = ""                 }
-        }
-    },
-    {
-        .name = "buttons",
-        .description = "Buttons",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 2,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "buttons",
+        .description    = "Buttons",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Two",   .value = 2 },
             { .description = "Three", .value = 3 },
             { .description = "Wheel", .value = 4 },
             { .description = ""                  }
-        }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
-  // clang-format on
+    // clang-format on
+};
+
+static const device_config_t msballpoint_config[] = {
+    // clang-format off
+    SERMOUSE_PORT_CONFIG_COMMON,
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
 };
 
 static const device_config_t ltsermouse_config[] = {
-  // clang-format off
+    // clang-format off
+    SERMOUSE_PORT_CONFIG_COMMON,
     {
-        .name = "port",
-        .description = "Serial Port",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "COM1", .value = 0 },
-            { .description = "COM2", .value = 1 },
-            { .description = "COM3", .value = 2 },
-            { .description = "COM4", .value = 3 },
-            { .description = ""                 }
-        }
-    },
-    {
-        .name = "buttons",
-        .description = "Buttons",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 2,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "buttons",
+        .description    = "Buttons",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Two",   .value = 2 },
             { .description = "Three", .value = 3 },
             { .description = ""                  }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "revision",
-        .description = "Revision",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 3,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "revision",
+        .description    = "Revision",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 3,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "LOGIMOUSE R7 1.0",  .value = 1 },
             { .description = "LOGIMOUSE R7 2.0",  .value = 2 },
             { .description = "LOGIMOUSE C7 3.0",  .value = 3 },
             { .description = "Logitech MouseMan", .value = 4 },
             { .description = ""                              }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "rts_toggle",
-        .description = "Microsoft-compatible RTS toggle",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "default_baud",
+        .description    = "Default Baud rate",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1200,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "1200", .value = 1200 },
+            { .description = "2400", .value = 2400 },
+            { .description = "4800", .value = 4800 },
+            { .description = "9600", .value = 9600 },
+            { .description = ""                    }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "rts_toggle",
+        .description    = "RTS toggle",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
-  // clang-format on
+    // clang-format on
 };
 
 const device_t mouse_mssystems_device = {
@@ -1060,12 +1179,26 @@ const device_t mouse_mssystems_device = {
     .init          = sermouse_init,
     .close         = sermouse_close,
     .reset         = NULL,
-    { .poll = sermouse_poll },
+    .available     = NULL,
     .speed_changed = sermouse_speed_changed,
     .force_redraw  = NULL,
     .config        = msssermouse_config
 };
 
+const device_t mouse_mssystems_bus_device = {
+    .name          = "Mouse Systems Bus Mouse",
+    .internal_name = "mssystems_bus",
+    .flags         = DEVICE_ISA,
+    .local         = MOUSE_TYPE_MSYSTEMSB,
+    .init          = sermouse_init,
+    .close         = sermouse_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = sermouse_speed_changed,
+    .force_redraw  = NULL,
+    .config        = mssbusmouse_config
+};
+
 const device_t mouse_msserial_device = {
     .name          = "Microsoft Serial Mouse",
     .internal_name = "msserial",
@@ -1074,12 +1207,26 @@ const device_t mouse_msserial_device = {
     .init          = sermouse_init,
     .close         = sermouse_close,
     .reset         = NULL,
-    { .poll = sermouse_poll },
+    .available     = NULL,
     .speed_changed = sermouse_speed_changed,
     .force_redraw  = NULL,
     .config        = mssermouse_config
 };
 
+const device_t mouse_msserial_ballpoint_device = {
+    .name          = "Microsoft Serial BallPoint",
+    .internal_name = "msballpoint",
+    .flags         = DEVICE_COM,
+    .local         = MOUSE_TYPE_MSBPOINT,
+    .init          = sermouse_init,
+    .close         = sermouse_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = sermouse_speed_changed,
+    .force_redraw  = NULL,
+    .config        = msballpoint_config
+};
+
 const device_t mouse_ltserial_device = {
     .name          = "Logitech Serial Mouse",
     .internal_name = "ltserial",
@@ -1088,7 +1235,7 @@ const device_t mouse_ltserial_device = {
     .init          = sermouse_init,
     .close         = sermouse_close,
     .reset         = NULL,
-    { .poll = sermouse_poll },
+    .available     = NULL,
     .speed_changed = sermouse_speed_changed,
     .force_redraw  = NULL,
     .config        = ltsermouse_config
diff --git a/src/device/mouse_upc.c b/src/device/mouse_upc.c
new file mode 100644
index 000000000..9f55c9214
--- /dev/null
+++ b/src/device/mouse_upc.c
@@ -0,0 +1,446 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the Chips & Technologies F82C710 Universal
+ *          Peripheral Controller (UPC) PS/2 mouse port.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2025 Miran Grca.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#define HAVE_STDARG_H
+#include <wchar.h>
+#include <86box/86box.h>
+#include "cpu.h"
+#include "x86seg.h"
+#include <86box/device.h>
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/pic.h>
+#include <86box/keyboard.h>
+#include <86box/mouse.h>
+
+#define STAT_DEV_IDLE      0x01
+#define STAT_RX_FULL       0x02
+#define STAT_TX_IDLE       0x04
+#define STAT_RESET         0x08
+#define STAT_INTS_ON       0x10
+#define STAT_ERROR_FLAG    0x20
+#define STAT_CLEAR         0x40
+#define STAT_ENABLE        0x80
+
+typedef struct mouse_upc_t {
+    uint8_t           status;
+    uint8_t           ib;
+    uint8_t           ob;
+    uint8_t           state;
+    uint8_t           ctrl_queue_start;
+    uint8_t           ctrl_queue_end;
+
+    uint8_t           handler_enable[2];
+
+    uint16_t          mdata_addr;
+    uint16_t          mstat_addr;
+
+    uint16_t          irq;
+
+    uint16_t          base_addr[2];
+
+    /* Local copies of the pointers to both ports for easier swapping (AMI '5' MegaKey). */
+    kbc_at_port_t    *port;
+
+    /* Main timers. */
+    pc_timer_t        poll_timer;
+    pc_timer_t        dev_poll_timer;
+
+    struct {
+        uint8_t (*read)(uint16_t port, void *priv);
+        void    (*write)(uint16_t port, uint8_t val, void *priv);
+    } handlers[2];
+
+    void             *mouse_ps2;
+} mouse_upc_t;
+
+enum {
+    STATE_MAIN_IBF,    /* UPC checking if the input buffer is full. */
+    STATE_MAIN,        /* UPC checking if the auxiliary has anything to send. */
+    STATE_OUT,         /* UPC is sending multiple bytes. */
+    STATE_SEND,        /* UPC is sending command to the auxiliary device. */
+    STATE_SCAN         /* UPC is waiting for the auxiliary command response. */
+};
+
+#ifdef ENABLE_MOUSE_UPC_LOG
+int mouse_upc_do_log = ENABLE_MOUSE_UPC_LOG;
+
+static void
+mouse_upc_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (mouse_upc_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define mouse_upc_log(fmt, ...)
+#endif
+
+static void
+mouse_upc_send_to_ob(mouse_upc_t *dev, uint8_t val)
+{
+    dev->status = (dev->status & ~STAT_DEV_IDLE) | STAT_RX_FULL;
+
+    if (dev->status & STAT_INTS_ON) {
+        picint_common(1 << dev->irq, 0, 0, NULL);
+        picint_common(1 << dev->irq, 0, 1, NULL);
+    }
+
+    dev->ob = val;
+}
+
+static void
+set_enable_aux(mouse_upc_t *dev, uint8_t enable)
+{
+    dev->status &= ~STAT_ENABLE;
+    dev->status |= (enable ? STAT_ENABLE : 0x00);
+}
+
+static void
+mouse_upc_ibf_process(mouse_upc_t *dev)
+{
+    /* IBF set, process both commands and data. */
+    dev->status |= STAT_TX_IDLE;
+    dev->state   = STATE_MAIN_IBF;
+
+    set_enable_aux(dev, 1);
+
+    if (dev->port != NULL) {
+        dev->port->wantcmd = 1;
+        dev->port->dat     = dev->ib;
+        dev->state         = STATE_SEND;
+    }
+}
+
+/*
+    Correct Procedure:
+        1. Controller asks the device (keyboard or auxiliary device) for a byte.
+        2. The device, unless it's in the reset or command states, sees if there's anything to give it,
+           and if yes, begins the transfer.
+        3. The controller checks if there is a transfer, if yes, transfers the byte and sends it to the host,
+           otherwise, checks the next device, or if there is no device left to check, checks if IBF is full
+           and if yes, processes it.
+ */
+static int
+mouse_upc_scan(mouse_upc_t *dev)
+{
+    if ((dev->port != NULL) && (dev->port->out_new != -1)) {
+        mouse_upc_log("UPC Mouse: %02X coming\n", dev->port->out_new & 0xff);
+        mouse_upc_send_to_ob(dev, dev->port->out_new);
+        dev->port->out_new = -1;
+        dev->state         = STATE_MAIN_IBF;
+        return 1;
+    }
+
+    return 0;
+}
+
+static void
+mouse_upc_poll(void *priv)
+{
+    mouse_upc_t *dev = (mouse_upc_t *) priv;
+
+    timer_advance_u64(&dev->poll_timer, (100ULL * TIMER_USEC));
+
+    switch (dev->state) {
+        case STATE_MAIN_IBF:
+        default:
+            if (!(dev->status & STAT_TX_IDLE))
+                mouse_upc_ibf_process(dev);
+            else if (!(dev->status & STAT_RX_FULL)) {
+                if (dev->status & STAT_ENABLE)
+                    dev->state = STATE_MAIN;
+            }
+            break;
+        case STATE_MAIN:
+            if (!(dev->status & STAT_TX_IDLE))
+                mouse_upc_ibf_process(dev);
+            else {
+                (void) mouse_upc_scan(dev);
+                dev->state = STATE_MAIN_IBF;
+            }
+            break;
+        case STATE_SEND:
+            if (!dev->port->wantcmd)
+                dev->state = STATE_SCAN;
+            break;
+        case STATE_SCAN:
+            (void) mouse_upc_scan(dev);
+            break;
+    }
+}
+
+static void
+mouse_upc_dev_poll(void *priv)
+{
+    mouse_upc_t *dev = (mouse_upc_t *) priv;
+
+    timer_advance_u64(&dev->dev_poll_timer, (100ULL * TIMER_USEC));
+
+    if ((dev->port != NULL) && (dev->port->priv != NULL))
+        dev->port->poll(dev->port->priv);
+}
+
+static void
+mouse_upc_port_1_write(uint16_t port, uint8_t val, void *priv)
+{
+    mouse_upc_t *dev = (mouse_upc_t *) priv;
+
+    mouse_upc_log("UPC Mouse: [%04X:%08X] write(%04X) = %02X\n", CS, cpu_state.pc, port, val);
+
+    if ((dev->status & STAT_TX_IDLE) && (dev->status & STAT_ENABLE)) {
+        dev->ib      = val;
+        dev->status &= ~STAT_TX_IDLE;
+    }
+}
+
+static void
+mouse_upc_port_2_write(uint16_t port, uint8_t val, void *priv)
+{
+    mouse_upc_t *dev = (mouse_upc_t *) priv;
+
+    mouse_upc_log("UPC Mouse: [%04X:%08X] write(%04X) = %02X\n", CS, cpu_state.pc, port, val);
+
+    dev->status = (dev->status & 0x27) | (val & 0xd8);
+
+    if (dev->status & (STAT_CLEAR | STAT_RESET)) {
+        /* TODO: Silently reset the mouse. */
+        dev->status &= ~STAT_RX_FULL;
+        dev->status |= (STAT_DEV_IDLE | STAT_TX_IDLE);
+    }
+}
+
+static uint8_t
+mouse_upc_port_1_read(uint16_t port, void *priv)
+{
+    mouse_upc_t *dev = (mouse_upc_t *) priv;
+    uint8_t      ret = 0xff;
+
+    cycles -= ISA_CYCLES(8);
+
+    ret = dev->ob;
+    dev->ob = 0xff;
+    dev->status &= ~STAT_RX_FULL;
+    dev->status |= STAT_DEV_IDLE;
+
+    mouse_upc_log("UPC Mouse: [%04X:%08X] read (%04X) = %02X\n",  CS, cpu_state.pc, port, ret);
+
+    return ret;
+}
+
+static uint8_t
+mouse_upc_port_2_read(uint16_t port, void *priv)
+{
+    mouse_upc_t *dev = (mouse_upc_t *) priv;
+    uint8_t      ret = 0xff;
+
+    cycles -= ISA_CYCLES(8);
+
+    ret = dev->status;
+
+    mouse_upc_log("UPC Mouse: [%04X:%08X] read (%04X) = %02X\n",  CS, cpu_state.pc, port, ret);
+
+    return ret;
+}
+
+static void
+mouse_upc_reset(void *priv)
+{
+    mouse_upc_t *dev = (mouse_upc_t *) priv;
+
+    dev->status      = STAT_DEV_IDLE | STAT_TX_IDLE;
+    dev->ob          = 0xff;
+
+    dev->state       = STATE_MAIN_IBF;
+}
+
+static void
+mouse_upc_close(void *priv)
+{
+    mouse_upc_t *dev = (mouse_upc_t *) priv;
+
+    /* Stop timers. */
+    timer_disable(&dev->dev_poll_timer);
+    timer_disable(&dev->poll_timer);
+
+    if (kbc_at_ports[1] != NULL) {
+        free(kbc_at_ports[1]);
+        kbc_at_ports[1] = NULL;
+    }
+
+    free(dev);
+}
+
+void
+mouse_upc_port_handler(int num, int set, uint16_t port, void *priv)
+{
+    mouse_upc_t *dev = (mouse_upc_t *) priv;
+
+    if (dev->handler_enable[num] && (dev->base_addr[num] != 0x0000))
+        io_removehandler(dev->base_addr[num], 1,
+                         dev->handlers[num].read, NULL, NULL,
+                         dev->handlers[num].write, NULL, NULL, priv);
+
+    dev->handler_enable[num] = set;
+    dev->base_addr[num]      = port;
+
+    if (dev->handler_enable[num] && (dev->base_addr[num] != 0x0000))
+        io_sethandler(dev->base_addr[num], 1,
+                      dev->handlers[num].read, NULL, NULL,
+                      dev->handlers[num].write, NULL, NULL, priv);
+}
+
+void
+mouse_upc_handler(int set, uint16_t port, void *priv)
+{
+    mouse_upc_port_handler(0, set, port, priv);
+    mouse_upc_port_handler(1, set, port + 0x0001, priv);
+}
+
+void
+mouse_upc_set_irq(int num, uint16_t irq, void *priv)
+{
+    mouse_upc_t *dev = (mouse_upc_t *) priv;
+
+    if (dev->irq != 0xffff)
+        picintc(1 << dev->irq);
+
+    dev->irq = irq;
+}
+
+static void *
+mouse_upc_init_common(int standalone, int irq)
+{
+    mouse_upc_t *dev;
+
+    dev = (mouse_upc_t *) calloc(1, sizeof(mouse_upc_t));
+
+    mouse_upc_reset(dev);
+
+    dev->handlers[0].read  = mouse_upc_port_1_read;
+    dev->handlers[0].write = mouse_upc_port_1_write;
+    dev->handlers[1].read  = mouse_upc_port_2_read;
+    dev->handlers[1].write = mouse_upc_port_2_write;
+
+    dev->irq = irq;
+
+    if (kbc_at_ports[1] == NULL) {
+        kbc_at_ports[1] = (kbc_at_port_t *) calloc(1, sizeof(kbc_at_port_t));
+        kbc_at_ports[1]->out_new = -1;
+    }
+
+    dev->port = kbc_at_ports[1];
+
+    timer_add(&dev->poll_timer, mouse_upc_poll, dev, 1);
+    timer_add(&dev->dev_poll_timer, mouse_upc_dev_poll, dev, 1);
+
+    if (standalone) {
+        mouse_upc_handler(1, 0x02d4, dev);
+        dev->mouse_ps2 = device_add_params(&mouse_ps2_device, (void *) (uintptr_t) MOUSE_TYPE_PS2_QPORT);
+    }
+
+    return dev;
+}
+
+static void *
+mouse_upc_init(const device_t *info)
+{
+    void *dev = NULL;
+
+    if (info->local == 1)
+        dev = mouse_upc_init_common(1, device_get_config_int("irq"));
+    else
+        dev = mouse_upc_init_common(0, info->local);
+
+    return dev;
+}
+
+static const device_config_t upc_config[] = {
+  // clang-format off
+    {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 12,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 12",  .value = 12 },
+            { .description = "IRQ 2/9", .value =  2 },
+            { .description = ""                     }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "buttons",
+        .description    = "Buttons",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Two",             .value = 2 },
+            { .description = "Three",           .value = 3 },
+            { .description = "Wheel",           .value = 4 },
+            { .description = "Five + Wheel",    .value = 5 },
+            { .description = "Five + 2 Wheels", .value = 6 },
+            { .description = ""                              }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name = "", .description = "", .type = CONFIG_END
+    }
+  // clang-format on
+};
+
+const device_t mouse_upc_device = {
+    .name          = "PS/2 QuickPort Mouse (F82C710)",
+    .internal_name = "mouse_upc",
+    .flags         = DEVICE_ISA,
+    .local         = 0,
+    .init          = mouse_upc_init,
+    .close         = mouse_upc_close,
+    .reset         = mouse_upc_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t mouse_upc_standalone_device = {
+    .name          = "PS/2 QuickPort Mouse",
+    .internal_name = "mouse_upc_standalone",
+    .flags         = DEVICE_ISA,
+    .local         = 1,
+    .init          = mouse_upc_init,
+    .close         = mouse_upc_close,
+    .reset         = mouse_upc_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = upc_config
+};
diff --git a/src/device/mouse_wacom_tablet.c b/src/device/mouse_wacom_tablet.c
index d299d8bab..3b50882ab 100644
--- a/src/device/mouse_wacom_tablet.c
+++ b/src/device/mouse_wacom_tablet.c
@@ -662,8 +662,10 @@ wacom_init(const device_t *info)
     if (dev->tablet_type->type == WACOM_TYPE_IV) {
         wacom_reset_artpad(dev);
         wacom_process_settings_dword(dev, 0xE2018000);
-    }
-    else wacom_reset(dev);
+    } else
+        wacom_reset(dev);
+
+    mouse_set_poll(wacom_poll, dev);
 
     return dev;
 }
@@ -693,20 +695,21 @@ wacom_close(void *priv)
 static const device_config_t wacom_config[] = {
   // clang-format off
     {
-        .name = "port",
-        .description = "Serial Port",
-        .type = CONFIG_SELECTION,
+        .name           = "port",
+        .description    = "Serial Port",
+        .type           = CONFIG_SELECTION,
         .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .default_int    = 0,
+        .file_filter    = "",
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "COM1", .value = 0 },
             { .description = "COM2", .value = 1 },
             { .description = "COM3", .value = 2 },
             { .description = "COM4", .value = 3 },
             { .description = ""                 }
-        }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -720,7 +723,7 @@ const device_t mouse_wacom_device = {
     .init          = wacom_init,
     .close         = wacom_close,
     .reset         = NULL,
-    { .poll = wacom_poll },
+    .available     = NULL,
     .speed_changed = wacom_speed_changed,
     .force_redraw  = NULL,
     .config        = wacom_config
@@ -730,11 +733,11 @@ const device_t mouse_wacom_artpad_device = {
     .name          = "Wacom ArtPad",
     .internal_name = "wacom_serial_artpad",
     .flags         = DEVICE_COM,
-    .local         = (uintptr_t)&artpad_id,
+    .local         = (uintptr_t) &artpad_id,
     .init          = wacom_init,
     .close         = wacom_close,
     .reset         = NULL,
-    { .poll = wacom_poll },
+    .available     = NULL,
     .speed_changed = wacom_speed_changed,
     .force_redraw  = NULL,
     .config        = wacom_config
diff --git a/src/device/nec_mate_unk.c b/src/device/nec_mate_unk.c
index 165962f30..c0393eaa2 100644
--- a/src/device/nec_mate_unk.c
+++ b/src/device/nec_mate_unk.c
@@ -30,7 +30,7 @@
 #include <86box/plat_unused.h>
 
 static uint8_t
-nec_mate_unk_read(UNUSED(uint16_t addr), void *priv)
+nec_mate_unk_read(UNUSED(uint16_t addr), UNUSED(void *priv))
 {
     /* Expected by this NEC machine.
 
@@ -49,7 +49,7 @@ nec_mate_unk_close(void *priv)
 }
 
 static void *
-nec_mate_unk_init(const device_t *info)
+nec_mate_unk_init(UNUSED(const device_t *info))
 {
     /* We have to return something non-NULL. */
     uint8_t *dev = (uint8_t *) calloc(1, sizeof(uint8_t));
@@ -68,7 +68,7 @@ const device_t nec_mate_unk_device = {
     .init          = nec_mate_unk_init,
     .close         = nec_mate_unk_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/device/novell_cardkey.c b/src/device/novell_cardkey.c
new file mode 100644
index 000000000..edc32b879
--- /dev/null
+++ b/src/device/novell_cardkey.c
@@ -0,0 +1,128 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the Novell NetWare 2.x Key Card, which
+ *          was used for anti-piracy protection.
+ *
+ *
+ * Authors: Cacodemon345
+ *
+ *          Copyright 2024 Cacodemon345.
+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+#include <86box/86box.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/timer.h>
+#include <86box/plat.h>
+#include <86box/novell_cardkey.h>
+
+typedef struct novell_cardkey_t {
+    char serial_number_str[13];
+} novell_cardkey_t;
+
+static uint8_t
+novell_cardkey_read(uint16_t port, void *priv)
+{
+    novell_cardkey_t* cardkey = (novell_cardkey_t*)priv;
+    uint8_t val = 0x00;
+    switch (port) {
+        /* Byte 5 high nibble + byte 4 high nibble */
+        case 0x23A:
+            val = (((cardkey->serial_number_str[10] > 'A') ? ((cardkey->serial_number_str[10] - 'A') + 10) : (cardkey->serial_number_str[10] - '0')) << 4) | (((cardkey->serial_number_str[8] > 'A') ? ((cardkey->serial_number_str[8] - 'A') + 10) : (cardkey->serial_number_str[8] - '0')) << 4);
+            break;
+        /* Byte 5 low nibble + byte 4 low nibble */
+        case 0x23B:
+            val = (((cardkey->serial_number_str[11] > 'A') ? ((cardkey->serial_number_str[11] - 'A') + 10) : (cardkey->serial_number_str[11] - '0')) << 4) | (((cardkey->serial_number_str[9] > 'A') ? ((cardkey->serial_number_str[9] - 'A') + 10) : (cardkey->serial_number_str[9] - '0')) << 4);
+            break;
+        /* Byte 2 low nibble + byte 1 low nibble */
+        case 0x23C:
+            val = ((cardkey->serial_number_str[5] - '0') << 4) | ((cardkey->serial_number_str[3] - '0'));
+            break;
+        /* Byte 0 high nibble + byte 3 low nibble*/
+        case 0x23D:
+            val = ((cardkey->serial_number_str[0] - '0') << 4) | ((cardkey->serial_number_str[7] - '0'));
+            break;
+        /* Byte 0 low nibble + byte 3 high nibble */
+        case 0x23E:
+            val = ((cardkey->serial_number_str[1] - '0') << 4) | ((cardkey->serial_number_str[6] - '0'));
+            break;
+        /* Byte 1 high nibble + byte 2 high nibble*/
+        case 0x23F:
+            val = ((cardkey->serial_number_str[2] - '0') << 4) | ((cardkey->serial_number_str[4] - '0'));
+            break;
+    }
+    return val ^ 0xFF;
+}
+
+void* novell_cardkey_init(UNUSED(const device_t* info))
+{
+    char sernumstr[13] = { '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', 0 };
+    int i = 0;
+    novell_cardkey_t* cardkey = calloc(1, sizeof(novell_cardkey_t));
+
+    strncpy(sernumstr, device_get_config_string("serial_number"), sizeof(sernumstr) - 1);
+    
+    for (i = 0; i < sizeof(sernumstr) - 4; i++) {
+        if (sernumstr[i] > '8' || sernumstr[i] < '0')
+            sernumstr[i] = '0';
+    }
+    if (sernumstr[8] > 'F' || sernumstr[8] < '0')
+        sernumstr[8] = '0';
+    if (sernumstr[9] > 'F' || sernumstr[9] < '0')
+        sernumstr[9] = '0';
+    if (sernumstr[10] > 'F' || sernumstr[10] < '0')
+        sernumstr[10] = '0';
+    if (sernumstr[11] > 'F' || sernumstr[11] < '0')
+        sernumstr[11] = '0';
+    sernumstr[12] = 0;
+    strncpy(cardkey->serial_number_str, sernumstr, sizeof(sernumstr));
+    io_sethandler(NOVELL_KEYCARD_ADDR, NOVELL_KEYCARD_ADDRLEN, novell_cardkey_read, NULL, NULL, NULL, NULL, NULL, cardkey);
+    return cardkey;
+}
+
+void novell_cardkey_close(void* priv)
+{
+    free(priv);
+}
+
+static const device_config_t keycard_config[] = {
+  // clang-format off
+    {
+        .name           = "serial_number",
+        .description    = "Serial Number",
+        .type           = CONFIG_STRING,
+        .default_string = "",
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
+const device_t novell_keycard_device = {
+    .name          = "Novell NetWare 2.x Key Card",
+    .internal_name = "novellkeycard",
+    .flags         = DEVICE_ISA,
+    .local         = 0,
+    .init          = novell_cardkey_init,
+    .close         = novell_cardkey_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = keycard_config
+};
diff --git a/src/device/pci_bridge.c b/src/device/pci_bridge.c
index 8183f8afa..bf49baf14 100644
--- a/src/device/pci_bridge.c
+++ b/src/device/pci_bridge.c
@@ -30,8 +30,10 @@
 #include <86box/mem.h>
 #include <86box/device.h>
 #include <86box/pci.h>
+#include <86box/plat_fallthrough.h>
 
 #define PCI_BRIDGE_DEC_21150   0x10110022
+#define PCI_BRIDGE_DEC_21152   0x10110024
 #define AGP_BRIDGE_ALI_M5243   0x10b95243
 #define AGP_BRIDGE_ALI_M5247   0x10b95247
 #define AGP_BRIDGE_INTEL_440LX 0x80867181
@@ -41,11 +43,13 @@
 #define AGP_BRIDGE_VIA_598     0x11068598
 #define AGP_BRIDGE_VIA_691     0x11068691
 #define AGP_BRIDGE_VIA_8601    0x11068601
+#define AGP_BRIDGE_SIS_5XXX    0x10390001
 
 #define AGP_BRIDGE_ALI(x)      (((x) >> 16) == 0x10b9)
 #define AGP_BRIDGE_INTEL(x)    (((x) >> 16) == 0x8086)
 #define AGP_BRIDGE_VIA(x)      (((x) >> 16) == 0x1106)
-#define AGP_BRIDGE(x)          ((x) >= AGP_BRIDGE_ALI_M5243)
+#define AGP_BRIDGE_SIS(x)      (((x) >> 16) == 0x1039)
+#define AGP_BRIDGE(x)          ((x) >= AGP_BRIDGE_SIS_5XXX)
 
 typedef struct pci_bridge_t {
     uint32_t local;
@@ -83,6 +87,14 @@ pci_bridge_set_ctl(void *priv, uint8_t ctl)
     dev->ctl = ctl;
 }
 
+uint8_t
+pci_bridge_get_bus_index(void *priv)
+{
+    pci_bridge_t *dev = (pci_bridge_t *) priv;
+
+    return dev->bus_index;
+}
+
 static void
 pci_bridge_write(int func, int addr, uint8_t val, void *priv)
 {
@@ -134,6 +146,8 @@ pci_bridge_write(int func, int addr, uint8_t val, void *priv)
                 val |= 0x02;
             else if (dev->local == AGP_BRIDGE_ALI_M5247)
                 val &= 0xc3;
+            else if (AGP_BRIDGE_SIS(dev->local))
+                val &= 0x27;
             else
                 val &= 0x67;
             break;
@@ -194,7 +208,8 @@ pci_bridge_write(int func, int addr, uint8_t val, void *priv)
         case 0x22:
         case 0x24:
         case 0x26:
-            val &= 0xf0;
+            val &= 0xf0;    /* SiS datasheets say 0Fh for 1Ch but that's clearly an erratum since the
+                               definition of the bits is identical to the other vendors' AGP bridges. */
             break;
 
         case 0x3c:
@@ -205,6 +220,8 @@ pci_bridge_write(int func, int addr, uint8_t val, void *priv)
         case 0x3e:
             if (AGP_BRIDGE_VIA(dev->local))
                 val &= 0x0c;
+            else if (AGP_BRIDGE_SIS(dev->local))
+                val &= 0x0e;
             else if (dev->local == AGP_BRIDGE_ALI_M5247)
                 val &= 0x0f;
             else if (dev->local == AGP_BRIDGE_ALI_M5243)
@@ -235,12 +252,15 @@ pci_bridge_write(int func, int addr, uint8_t val, void *priv)
         case 0x40:
             if (dev->local == PCI_BRIDGE_DEC_21150)
                 val &= 0x32;
+            else if (dev->local == PCI_BRIDGE_DEC_21152)
+                val &= 0x12;
             break;
 
         case 0x41:
             if (AGP_BRIDGE_VIA(dev->local))
                 val &= 0x7e;
-            else if (dev->local == PCI_BRIDGE_DEC_21150)
+            else if ((dev->local == PCI_BRIDGE_DEC_21150) || 
+                     (dev->local == PCI_BRIDGE_DEC_21152))
                 val &= 0x07;
             break;
 
@@ -250,18 +270,22 @@ pci_bridge_write(int func, int addr, uint8_t val, void *priv)
             break;
 
         case 0x43:
-            if (dev->local == PCI_BRIDGE_DEC_21150)
+            if ((dev->local == PCI_BRIDGE_DEC_21150) || 
+                (dev->local == PCI_BRIDGE_DEC_21152))
                 val &= 0x03;
             break;
 
         case 0x64:
-            if (dev->local == PCI_BRIDGE_DEC_21150)
+            if ((dev->local == PCI_BRIDGE_DEC_21150) || 
+                (dev->local == PCI_BRIDGE_DEC_21152))
                 val &= 0x7e;
             break;
 
         case 0x69:
             if (dev->local == PCI_BRIDGE_DEC_21150)
                 val &= 0x3f;
+            else if (dev->local == PCI_BRIDGE_DEC_21152)
+                val = (val & 0x01) | 0x3e;
             break;
 
         case 0x86:
@@ -295,6 +319,15 @@ pci_bridge_write(int func, int addr, uint8_t val, void *priv)
             break;
 
         case 0xe0:
+            if (AGP_BRIDGE_ALI(dev->local)) {
+                if (!(dev->ctl & 0x20))
+                    return;
+            } else if (dev->local == PCI_BRIDGE_DEC_21152)
+                val &= 0x03;
+            else
+                return;
+            break;
+
         case 0xe1:
             if (AGP_BRIDGE_ALI(dev->local)) {
                 if (!(dev->ctl & 0x20))
@@ -392,6 +425,14 @@ pci_bridge_reset(void *priv)
 
     /* command and status */
     switch (dev->local) {
+        case PCI_BRIDGE_DEC_21152:
+            dev->regs[0x08] = 0x03;
+            dev->regs[0x34] = 0xdc;
+            dev->regs[0x69] = 0x3e;
+            dev->regs[0xdc] = 0x01;
+            dev->regs[0xde] = 0x01;
+            dev->regs[0xe2] = 0x80;
+            fallthrough;
         case PCI_BRIDGE_DEC_21150:
             dev->regs[0x06] = 0x80;
             dev->regs[0x07] = 0x02;
@@ -480,12 +521,11 @@ static void *
 pci_bridge_init(const device_t *info)
 {
     uint8_t interrupts[4];
-    uint8_t interrupt_count;
     uint8_t interrupt_mask;
+    uint8_t add_type;
     uint8_t slot_count;
 
-    pci_bridge_t *dev = (pci_bridge_t *) malloc(sizeof(pci_bridge_t));
-    memset(dev, 0, sizeof(pci_bridge_t));
+    pci_bridge_t *dev = (pci_bridge_t *) calloc(1, sizeof(pci_bridge_t));
 
     dev->local     = info->local;
     dev->bus_index = pci_register_bus();
@@ -493,22 +533,27 @@ pci_bridge_init(const device_t *info)
 
     pci_bridge_reset(dev);
 
-    pci_add_bridge(AGP_BRIDGE(dev->local), pci_bridge_read, pci_bridge_write, dev, &dev->slot);
-
-    interrupt_count = sizeof(interrupts);
-    interrupt_mask  = interrupt_count - 1;
+    interrupt_mask = sizeof(interrupts) - 1;
     if (dev->slot < 32) {
-        for (uint8_t i = 0; i < interrupt_count; i++)
+        for (uint8_t i = 0; i <= interrupt_mask; i++)
             interrupts[i] = pci_get_int(dev->slot, PCI_INTA + i);
     }
     pci_bridge_log("PCI Bridge %d: upstream bus %02X slot %02X interrupts %02X %02X %02X %02X\n",
                    dev->bus_index, (dev->slot >> 5) & 0xff, dev->slot & 31, interrupts[0],
                    interrupts[1], interrupts[2], interrupts[3]);
 
-    if (info->local == PCI_BRIDGE_DEC_21150)
+    if (info->local == PCI_BRIDGE_DEC_21150) {
         slot_count = 9; /* 9 bus masters */
-    else
+        add_type   = PCI_ADD_NORMAL;
+    } else if (info->local == PCI_BRIDGE_DEC_21152) {
+        slot_count = 0; /* 4 bus masters, but slots are added by the Dell machines */
+        add_type   = PCI_ADD_BRIDGE;
+    } else {
         slot_count = 1; /* AGP bridges always have 1 slot */
+        add_type   = PCI_ADD_AGPBRIDGE;
+    }
+
+    pci_add_bridge(add_type, pci_bridge_read, pci_bridge_write, dev, &dev->slot);
 
     for (uint8_t i = 0; i < slot_count; i++) {
         /* Interrupts for bridge slots are assigned in round-robin: ABCD, BCDA, CDAB and so on. */
@@ -535,7 +580,21 @@ const device_t dec21150_device = {
     .init          = pci_bridge_init,
     .close         = NULL,
     .reset         = pci_bridge_reset,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t dec21152_device = {
+    .name          = "DEC 21152 PCI Bridge",
+    .internal_name = "dec21152",
+    .flags         = DEVICE_PCI,
+    .local         = PCI_BRIDGE_DEC_21152,
+    .init          = pci_bridge_init,
+    .close         = NULL,
+    .reset         = pci_bridge_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -550,7 +609,7 @@ const device_t ali5243_agp_device = {
     .init          = pci_bridge_init,
     .close         = NULL,
     .reset         = pci_bridge_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -565,7 +624,7 @@ const device_t ali5247_agp_device = {
     .init          = pci_bridge_init,
     .close         = NULL,
     .reset         = pci_bridge_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -579,7 +638,7 @@ const device_t i440lx_agp_device = {
     .init          = pci_bridge_init,
     .close         = NULL,
     .reset         = pci_bridge_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -593,7 +652,7 @@ const device_t i440bx_agp_device = {
     .init          = pci_bridge_init,
     .close         = NULL,
     .reset         = pci_bridge_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -607,7 +666,7 @@ const device_t i440gx_agp_device = {
     .init          = pci_bridge_init,
     .close         = NULL,
     .reset         = pci_bridge_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -621,7 +680,7 @@ const device_t via_vp3_agp_device = {
     .init          = pci_bridge_init,
     .close         = NULL,
     .reset         = pci_bridge_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -635,7 +694,7 @@ const device_t via_mvp3_agp_device = {
     .init          = pci_bridge_init,
     .close         = NULL,
     .reset         = pci_bridge_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -649,7 +708,7 @@ const device_t via_apro_agp_device = {
     .init          = pci_bridge_init,
     .close         = NULL,
     .reset         = pci_bridge_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -663,7 +722,21 @@ const device_t via_vt8601_agp_device = {
     .init          = pci_bridge_init,
     .close         = NULL,
     .reset         = pci_bridge_reset,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t sis_5xxx_agp_device = {
+    .name          = "SiS 5591/(5)600 AGP Bridge",
+    .internal_name = "via_5xxx_agp",
+    .flags         = DEVICE_PCI,
+    .local         = AGP_BRIDGE_SIS_5XXX,
+    .init          = pci_bridge_init,
+    .close         = NULL,
+    .reset         = pci_bridge_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/device/phoenix_486_jumper.c b/src/device/phoenix_486_jumper.c
index a3c891c90..a3e2f0e7e 100644
--- a/src/device/phoenix_486_jumper.c
+++ b/src/device/phoenix_486_jumper.c
@@ -110,8 +110,7 @@ phoenix_486_jumper_close(void *priv)
 static void *
 phoenix_486_jumper_init(const device_t *info)
 {
-    phoenix_486_jumper_t *dev = (phoenix_486_jumper_t *) malloc(sizeof(phoenix_486_jumper_t));
-    memset(dev, 0, sizeof(phoenix_486_jumper_t));
+    phoenix_486_jumper_t *dev = (phoenix_486_jumper_t *) calloc(1, sizeof(phoenix_486_jumper_t));
 
     dev->type = info->local;
 
@@ -130,7 +129,7 @@ const device_t phoenix_486_jumper_device = {
     .init          = phoenix_486_jumper_init,
     .close         = phoenix_486_jumper_close,
     .reset         = phoenix_486_jumper_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -144,7 +143,7 @@ const device_t phoenix_486_jumper_pci_device = {
     .init          = phoenix_486_jumper_init,
     .close         = phoenix_486_jumper_close,
     .reset         = phoenix_486_jumper_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/device/postcard.c b/src/device/postcard.c
index dbae3232a..ec031c2b8 100644
--- a/src/device/postcard.c
+++ b/src/device/postcard.c
@@ -30,11 +30,14 @@
 #include "cpu.h"
 
 uint8_t         postcard_codes[POSTCARDS_NUM];
+char            postcard_diags[5] = { 0 };
 
 static uint16_t postcard_port;
 static uint8_t  postcard_written[POSTCARDS_NUM];
 static uint8_t  postcard_ports_num = 1;
 static uint8_t  postcard_prev_codes[POSTCARDS_NUM];
+static uint8_t  postcard_dell_mode = 0;
+static char     postcard_prev_diags[5] = { 0 };
 #define UISTR_LEN 32
 static char postcard_str[UISTR_LEN]; /* UI output string */
 
@@ -98,12 +101,22 @@ postcard_setui(void)
                 break;
         }
     } else {
+        char dell_diags[11] = { 0 };
+        if (postcard_dell_mode) {
+            if (!postcard_written[1])
+                snprintf(dell_diags, sizeof(dell_diags), " ---- ----");
+            else if (postcard_written[1] == 1)
+                snprintf(dell_diags, sizeof(dell_diags), " %s ----", postcard_diags);
+            else
+                snprintf(dell_diags, sizeof(dell_diags), " %s %s", postcard_diags, postcard_prev_diags);
+        }
+
         if (!postcard_written[0])
-            snprintf(postcard_str, sizeof(postcard_str), "POST: -- --");
+            snprintf(postcard_str, sizeof(postcard_str), "POST: -- --%s", dell_diags);
         else if (postcard_written[0] == 1)
-            snprintf(postcard_str, sizeof(postcard_str), "POST: %02X --", postcard_codes[0]);
+            snprintf(postcard_str, sizeof(postcard_str), "POST: %02X --%s", postcard_codes[0], dell_diags);
         else
-            snprintf(postcard_str, sizeof(postcard_str), "POST: %02X %02X", postcard_codes[0], postcard_prev_codes[0]);
+            snprintf(postcard_str, sizeof(postcard_str), "POST: %02X %02X%s", postcard_codes[0], postcard_prev_codes[0], dell_diags);
     }
 
     ui_sb_bugui(postcard_str);
@@ -122,6 +135,9 @@ postcard_reset(void)
     memset(postcard_codes, 0x00, POSTCARDS_NUM * sizeof(uint8_t));
     memset(postcard_prev_codes, 0x00, POSTCARDS_NUM * sizeof(uint8_t));
 
+    memset(postcard_diags, 0x00, 5 * sizeof(char));
+    memset(postcard_prev_diags, 0x00, 5 * sizeof(char));
+
     postcard_setui();
 }
 
@@ -140,6 +156,35 @@ postcard_write(uint16_t port, uint8_t val, UNUSED(void *priv))
     postcard_setui();
 }
 
+static int
+postcard_cmp_diags(uint32_t val)
+{
+    int   ret = 0;
+    char *pv  = (char *) &val;
+
+    for (int i = 0; i < 4; i++)
+        ret = ret || (pv[i] != postcard_diags[3 - i]);
+
+    return ret;
+}
+
+static void
+postcard_writel(uint16_t port, uint32_t val, UNUSED(void *priv))
+{
+    char *pv  = (char *) &val;
+
+    if (postcard_written[1] && !postcard_cmp_diags(val))
+        return;
+
+    *(uint32_t *) postcard_prev_diags = *(uint32_t *) postcard_diags;
+    for (int i = 0; i < 4; i++)
+        postcard_diags[i] = pv[3 - i];
+    if (postcard_written[1] < 2)
+        postcard_written[1]++;
+
+    postcard_setui();
+}
+
 static void *
 postcard_init(UNUSED(const device_t *info))
 {
@@ -147,17 +192,22 @@ postcard_init(UNUSED(const device_t *info))
 
     if (machine_has_bus(machine, MACHINE_BUS_MCA))
         postcard_port = 0x680; /* MCA machines */
-    else if (strstr(machines[machine].name, " PS/2 ") || strstr(machine_getname_ex(machine), " PS/1 "))
+    else if (strstr(machines[machine].name, " PS/2 ") ||
+             strstr(machine_getname_ex(machine), " PS/1 "))
         postcard_port = 0x190; /* ISA PS/2 machines */
     else if (strstr(machines[machine].name, " IBM XT "))
         postcard_port = 0x60; /* IBM XT */
     else if (strstr(machines[machine].name, " IBM PCjr")) {
         postcard_port = 0x10; /* IBM PCjr */
         postcard_ports_num = 3; /* IBM PCjr error ports 11h and 12h */
-    } else if (strstr(machines[machine].name, " Compaq ") && !machine_has_bus(machine, MACHINE_BUS_PCI))
+    } else if (strstr(machines[machine].name, " Compaq ") && 
+               !strstr(machines[machine].name, " Presario ") &&
+               !strstr(machines[machine].name, " ProSignia "))
         postcard_port = 0x84; /* ISA Compaq machines */
     else if (strstr(machines[machine].name, "Olivetti"))
         postcard_port = 0x378; /* Olivetti machines */
+    else if (!strcmp(machines[machine].internal_name, "isa486c"))
+        postcard_port = 0x5080; /* ASUS ISA-486C */
     else
         postcard_port = 0x80; /* AT and clone machines */
     postcard_log("POST card initializing on port %04Xh\n", postcard_port);
@@ -168,6 +218,12 @@ postcard_init(UNUSED(const device_t *info))
         io_sethandler(postcard_port, postcard_ports_num,
                       NULL, NULL, NULL, postcard_write, NULL, NULL, NULL);
 
+    postcard_dell_mode = strstr(machines[machine].name, " Dell ") &&
+                         (machine_get_chipset(machine) >= MACHINE_CHIPSET_INTEL_430FX);
+    if (postcard_dell_mode)
+        io_sethandler(is486 ? 0x00e0 : 0x00e4, 0x0001,
+                      NULL, NULL, NULL, NULL, NULL, postcard_writel, NULL);
+
     return postcard_write;
 }
 
@@ -187,7 +243,7 @@ const device_t postcard_device = {
     .init          = postcard_init,
     .close         = postcard_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/device/radisys_config.c b/src/device/radisys_config.c
new file mode 100644
index 000000000..67f577de4
--- /dev/null
+++ b/src/device/radisys_config.c
@@ -0,0 +1,89 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the Radisys EPC-2012 Configuration registers.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2025 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/machine.h>
+#include <86box/lpt.h>
+#include <86box/machine.h>
+#include <86box/chipset.h>
+#include <86box/plat_unused.h>
+
+typedef struct radisys_config_t {
+    uint8_t regs[2];
+} radisys_config_t;
+
+static uint8_t
+radisys_config_read(uint16_t port, void *priv)
+{
+    radisys_config_t *dev = (radisys_config_t *) priv;
+    uint8_t           ret = dev->regs[port & 0x0001];
+
+    return ret;
+}
+
+static void
+radisys_config_write(uint16_t port, uint8_t val, void *priv)
+{
+    radisys_config_t *dev = (radisys_config_t *) priv;
+
+    dev->regs[port & 0x0001] = val;
+
+    if (!(port & 0x0001) && machine_has_jumpered_ecp_dma(machine, MACHINE_DMA_USE_CONFIG))
+        lpt1_dma((val & 0x02) ? 3 : 1);
+}
+
+static void
+radisys_config_close(void *priv)
+{
+    radisys_config_t *dev = (radisys_config_t *) priv;
+
+    free(dev);
+}
+
+static void *
+radisys_config_init(UNUSED(const device_t *info))
+{
+    /* We have to return something non-NULL. */
+    radisys_config_t *dev = (radisys_config_t *) calloc(1, sizeof(radisys_config_t));
+
+    /* 370h is also supported. */
+    io_sethandler(0x0270, 0x0002, radisys_config_read, NULL, NULL, radisys_config_write, NULL, NULL, dev);
+
+    return dev;
+}
+
+const device_t radisys_config_device = {
+    .name          = "Radisys EPC-2012 Configuration",
+    .internal_name = "radisys_config",
+    .flags         = 0,
+    .local         = 0,
+    .init          = radisys_config_init,
+    .close         = radisys_config_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/device/serial.c b/src/device/serial.c
index 37aadf8fe..ad9abfe5d 100644
--- a/src/device/serial.c
+++ b/src/device/serial.c
@@ -15,7 +15,7 @@
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Fred N. van Kempen, <decwiz@yahoo.com>
  *
- *          Copyright 2016-2020 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  *          Copyright 2017-2020 Fred N. van Kempen.
  */
 #include <stdarg.h>
@@ -27,6 +27,7 @@
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/device.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/machine.h>
 #include <86box/io.h>
@@ -197,6 +198,8 @@ serial_receive_timer(void *priv)
             /* Raise Data Ready interrupt. */
             dev->lsr |= 0x01;
             dev->int_status |= SERIAL_INT_RECEIVE;
+            if (dev->lsr & 0x02)
+                dev->int_status |= SERIAL_INT_LSR;
 
             serial_update_ints(dev);
         }
@@ -223,7 +226,7 @@ serial_write_fifo(serial_t *dev, uint8_t dat)
                ((dev->type >= SERIAL_16550) && dev->fifo_enabled) ?
                fifo_get_count(dev->rcvr_fifo) : 0);
 
-    if (!(dev->mctrl & 0x10))
+    if ((dev != NULL) && !(dev->mctrl & 0x10))
         write_fifo(dev, dat);
 }
 
@@ -266,10 +269,6 @@ serial_move_to_txsr(serial_t *dev)
         /* Update interrupts to signal THRE and that TXSR is no longer empty. */
         serial_update_ints(dev);
     }
-    if (dev->transmit_enabled & 2)
-        dev->baud_cycles++;
-    else
-        dev->baud_cycles = 0; /* If not moving while transmitting, reset BAUDOUT cycle count. */
     if (!dev->fifo_enabled || (fifo_get_count(dev->xmit_fifo) == 0x0))
         dev->transmit_enabled &= ~1; /* Stop moving. */
     dev->transmit_enabled |= 2;      /* Start transmitting. */
@@ -303,16 +302,26 @@ static void
 serial_transmit_timer(void *priv)
 {
     serial_t *dev   = (serial_t *) priv;
-    int       delay = 8; /* STOP to THRE delay is 8 BAUDOUT cycles. */
+    /*
+       Norton Diagnostics waits for up to 2 bit periods, this is
+       confirmed by the NS16550A timings graph, which shows operation
+       as follows after write: 1 bit of delay, then start bit, and at
+       the end of the start bit, move from THR to TXSR.
+     */
+    int       delay = 1;
 
     if (dev->transmit_enabled & 3) {
+        /*
+           If already transmitting, move from THR to TXSR at the end of
+           the last data bit.
+         */
         if ((dev->transmit_enabled & 1) && (dev->transmit_enabled & 2))
-            delay = dev->data_bits; /* Delay by less if already transmitting. */
+            delay = dev->data_bits + 1;
 
         dev->baud_cycles++;
 
-        /* We have processed (total bits) BAUDOUT cycles, transmit the byte. */
-        if ((dev->baud_cycles == dev->bits) && (dev->transmit_enabled & 2))
+        /* We have processed (delay + total bits) BAUDOUT cycles, transmit the byte. */
+        if ((dev->baud_cycles == (dev->bits + 1)) && (dev->transmit_enabled & 2))
             serial_process_txsr(dev);
 
         /* We have processed (data bits) BAUDOUT cycles. */
@@ -432,6 +441,31 @@ serial_set_dcd(serial_t *dev, uint8_t enabled)
     }
 }
 
+void
+serial_set_ri(serial_t *dev, uint8_t enabled)
+{
+    uint8_t prev_state = !!(dev->msr & 0x40);
+    if (dev->mctrl & 0x10)
+        return;
+
+    dev->msr &= ~0x40;
+    dev->msr |= (!!enabled) << 6;
+    dev->msr_set &= ~0x40;
+    dev->msr_set |= (!!enabled) << 6;
+
+    if (prev_state == 0 && (!!enabled) == 1) {
+        dev->msr |= 0x4;
+        dev->int_status |= SERIAL_INT_MSR;
+        serial_update_ints(dev);
+    }
+}
+
+int
+serial_get_ri(serial_t *dev)
+{
+    return !!(dev->msr & (1 << 6));
+}
+
 void
 serial_set_clock_src(serial_t *dev, double clock_src)
 {
@@ -441,6 +475,12 @@ serial_set_clock_src(serial_t *dev, double clock_src)
     serial_update_speed(dev);
 }
 
+void
+serial_set_type(serial_t *dev, uint8_t type)
+{
+    dev->type = type;
+}
+
 void
 serial_write(uint16_t addr, uint8_t val, void *priv)
 {
@@ -570,7 +610,9 @@ serial_write(uint16_t addr, uint8_t val, void *priv)
                 serial_do_irq(dev, 0);
             if ((val ^ dev->mctrl) & 0x10)
                 serial_reset_fifo(dev);
-            dev->mctrl = val;
+            if (dev->sd && dev->sd->dtr_callback && (val ^ dev->mctrl) & 1)
+                dev->sd->dtr_callback(dev, val & 1, dev->sd->priv);
+            dev->mctrl = val & 0x1f;
             if (val & 0x10) {
                 new_msr = (val & 0x0c) << 4;
                 new_msr |= (val & 0x02) ? 0x10 : 0;
@@ -587,6 +629,11 @@ serial_write(uint16_t addr, uint8_t val, void *priv)
 
                 dev->msr = new_msr;
 
+                if (dev->msr & 0x0f) {
+                    dev->int_status |= SERIAL_INT_MSR;
+                    serial_update_ints(dev);
+                }
+
                 /* TODO: Why reset the FIFO's here?! */
                 fifo_reset(dev->xmit_fifo);
                 fifo_reset(dev->rcvr_fifo);
@@ -686,7 +733,10 @@ serial_read(uint16_t addr, void *priv)
             serial_update_ints(dev);
             break;
         case 6:
-            ret = dev->msr | dev->msr_set;
+            if (dev->mctrl & 0x10)
+                ret = dev->msr;
+            else
+                ret = dev->msr | dev->msr_set;
             dev->msr &= ~0x0f;
             dev->int_status &= ~SERIAL_INT_MSR;
             serial_update_ints(dev);
@@ -702,6 +752,14 @@ serial_read(uint16_t addr, void *priv)
     return ret;
 }
 
+uint8_t
+serial_get_shadow(serial_t *dev)
+{
+    uint8_t ret = dev->fcr;
+
+    return ret;
+}
+
 void
 serial_remove(serial_t *dev)
 {
@@ -739,6 +797,20 @@ serial_setup(serial_t *dev, uint16_t addr, uint8_t irq)
     dev->irq = irq;
 }
 
+void
+serial_irq(serial_t *dev, const uint8_t irq)
+{
+    if (dev == NULL)
+        return;
+
+    if (com_ports[dev->inst].enabled)
+        dev->irq = irq;
+    else
+        dev->irq = 0xff;
+
+    serial_log("Port %i IRQ = %02X\n", dev->inst, irq);
+}
+
 static void
 serial_rcvr_d_empty_evt(void *priv)
 {
@@ -794,6 +866,25 @@ serial_attach_ex(int port,
     return sd->serial;
 }
 
+serial_t *
+serial_attach_ex_2(int port,
+                 void (*rcr_callback)(struct serial_s *serial, void *priv),
+                 void (*dev_write)(struct serial_s *serial, void *priv, uint8_t data),
+                 void (*dtr_callback)(struct serial_s *serial, int status, void *priv),
+                 void *priv)
+{
+    serial_device_t *sd = &serial_devices[port];
+
+    sd->rcr_callback             = rcr_callback;
+    sd->dtr_callback             = dtr_callback;
+    sd->dev_write                = dev_write;
+    sd->transmit_period_callback = NULL;
+    sd->lcr_callback             = NULL;
+    sd->priv                     = priv;
+
+    return sd->serial;
+}
+
 static void
 serial_speed_changed(void *priv)
 {
@@ -807,10 +898,10 @@ serial_close(void *priv)
 {
     serial_t *dev = (serial_t *) priv;
 
-    next_inst--;
-
-    if (com_ports[dev->inst].enabled)
+    if (dev->sd) {
+        memset(dev->sd, 0, sizeof(serial_device_t));
         fifo_close(dev->rcvr_fifo);
+    }
 
     free(dev);
 }
@@ -820,7 +911,7 @@ serial_reset(void *priv)
 {
     serial_t *dev = (serial_t *) priv;
 
-    if (com_ports[dev->inst].enabled) {
+    if (dev->sd) {
         timer_disable(&dev->transmit_timer);
         timer_disable(&dev->timeout_timer);
         timer_disable(&dev->receive_timer);
@@ -852,22 +943,37 @@ serial_reset(void *priv)
 static void *
 serial_init(const device_t *info)
 {
-    serial_t *dev = (serial_t *) malloc(sizeof(serial_t));
-    memset(dev, 0, sizeof(serial_t));
+    serial_t *dev = (serial_t *) calloc(1, sizeof(serial_t));
+    int orig_inst = next_inst;
+
+    if (info->local & 0xFFF00000)
+        next_inst = SERIAL_MAX - 1;
 
     dev->inst = next_inst;
 
-    if (com_ports[next_inst].enabled) {
+    if (com_ports[next_inst].enabled || (info->local & 0xFFF00000)) {
         serial_log("Adding serial port %i...\n", next_inst);
         dev->type = info->local;
         memset(&(serial_devices[next_inst]), 0, sizeof(serial_device_t));
         dev->sd         = &(serial_devices[next_inst]);
         dev->sd->serial = dev;
-        if (next_inst == 3)
+
+        if (info->local & 0xfff00000) {
+            dev->base_address = info->local >> 20;
+            dev->irq          = (info->local >> 16) & 0xF;
+            io_sethandler(dev->base_address, 0x0008, serial_read, NULL, NULL, serial_write, NULL, NULL, dev);
+            next_inst = orig_inst;
+        } else if (next_inst == 6)
+            serial_setup(dev, COM7_ADDR, COM7_IRQ);
+        else if (next_inst == 5)
+            serial_setup(dev, COM6_ADDR, COM6_IRQ);
+        else if (next_inst == 4)
+            serial_setup(dev, COM5_ADDR, COM5_IRQ);
+        else if (next_inst == 3)
             serial_setup(dev, COM4_ADDR, COM4_IRQ);
         else if (next_inst == 2)
             serial_setup(dev, COM3_ADDR, COM3_IRQ);
-        else if ((next_inst == 1) || (info->flags & DEVICE_PCJR))
+        else if ((next_inst == 1) || (info->local == SERIAL_8250_PCJR))
             serial_setup(dev, COM2_ADDR, COM2_IRQ);
         else if (next_inst == 0)
             serial_setup(dev, COM1_ADDR, COM1_IRQ);
@@ -902,7 +1008,8 @@ serial_init(const device_t *info)
         serial_reset_port(dev);
     }
 
-    next_inst++;
+    if (!(info->local & 0xfff00000))
+        next_inst++;
 
     return dev;
 }
@@ -916,7 +1023,7 @@ serial_set_next_inst(int ni)
 void
 serial_standalone_init(void)
 {
-    while (next_inst < SERIAL_MAX)
+    while (next_inst < (SERIAL_MAX - 1))
         device_add_inst(&ns8250_device, next_inst + 1);
 };
 
@@ -928,7 +1035,7 @@ const device_t ns8250_device = {
     .init          = serial_init,
     .close         = serial_close,
     .reset         = serial_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = serial_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -937,12 +1044,12 @@ const device_t ns8250_device = {
 const device_t ns8250_pcjr_device = {
     .name          = "National Semiconductor 8250(-compatible) UART for PCjr",
     .internal_name = "ns8250_pcjr",
-    .flags         = DEVICE_PCJR,
+    .flags         = 0,
     .local         = SERIAL_8250_PCJR,
     .init          = serial_init,
     .close         = serial_close,
     .reset         = serial_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = serial_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -956,7 +1063,7 @@ const device_t ns16450_device = {
     .init          = serial_init,
     .close         = serial_close,
     .reset         = serial_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = serial_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -970,7 +1077,7 @@ const device_t ns16550_device = {
     .init          = serial_init,
     .close         = serial_close,
     .reset         = serial_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = serial_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -984,7 +1091,7 @@ const device_t ns16650_device = {
     .init          = serial_init,
     .close         = serial_close,
     .reset         = serial_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = serial_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -998,7 +1105,7 @@ const device_t ns16750_device = {
     .init          = serial_init,
     .close         = serial_close,
     .reset         = serial_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = serial_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1012,7 +1119,7 @@ const device_t ns16850_device = {
     .init          = serial_init,
     .close         = serial_close,
     .reset         = serial_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = serial_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1026,7 +1133,7 @@ const device_t ns16950_device = {
     .init          = serial_init,
     .close         = serial_close,
     .reset         = serial_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = serial_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/device/serial_passthrough.c b/src/device/serial_passthrough.c
index 1b1c5e3bf..249380b4f 100644
--- a/src/device/serial_passthrough.c
+++ b/src/device/serial_passthrough.c
@@ -13,7 +13,7 @@
  *              Jasmine Iwanek <jasmine@iwanek.co.uk>
  *
  *              Copyright 2021      Andreas J. Reichel.
- *              Copyright 2021-2022 Jasmine Iwanek.
+ *              Copyright 2021-2025 Jasmine Iwanek.
  */
 
 #include <stdarg.h>
@@ -54,7 +54,7 @@ serial_passthrough_log(const char *fmt, ...)
 void
 serial_passthrough_init(void)
 {
-    for (uint8_t c = 0; c < SERIAL_MAX; c++) {
+    for (uint8_t c = 0; c < (SERIAL_MAX - 1); c++) {
         if (serial_passthrough_enabled[c]) {
             /* Instance n for COM n */
             device_add_inst(&serial_passthrough_device, c + 1);
@@ -75,6 +75,8 @@ host_to_serial_cb(void *priv)
 
     uint8_t byte;
 
+    plat_serpt_set_line_state(priv);
+
     /* write_fifo has no failure indication, but if we write to fast, the host
      * can never fetch the bytes in time, so check if the fifo is full if in
      * fifo mode or if lsr has bit 0 set if not in fifo mode */
@@ -178,8 +180,7 @@ serial_passthrough_dev_init(const device_t *info)
 {
     serial_passthrough_t *dev;
 
-    dev = (serial_passthrough_t *) malloc(sizeof(serial_passthrough_t));
-    memset(dev, 0, sizeof(serial_passthrough_t));
+    dev = (serial_passthrough_t *) calloc(1, sizeof(serial_passthrough_t));
     dev->mode = device_get_config_int("mode");
 
     dev->port      = device_get_instance() - 1;
@@ -223,147 +224,141 @@ serial_passthrough_dev_init(const device_t *info)
 }
 
 const char *serpt_mode_names[SERPT_MODES_MAX] = {
-    [SERPT_MODE_VCON]    = "vcon",
-    [SERPT_MODE_TCPSRV]  = "tcpsrv",
-    [SERPT_MODE_TCPCLNT] = "tcpclnt",
-    [SERPT_MODE_HOSTSER] = "hostser",
+#ifdef _WIN32
+    [SERPT_MODE_NPIPE_SRV]  = "npipesrv",
+    [SERPT_MODE_NPIPE_CLNT] = "npipeclnt",
+#else
+    [SERPT_MODE_VCON]       = "vcon",
+#endif
+    [SERPT_MODE_TCP_SRV]    = "tcpsrv",
+    [SERPT_MODE_TCP_CLNT]   = "tcpclnt",
+    [SERPT_MODE_HOSTSER]    = "hostser",
 };
 
 // clang-format off
 static const device_config_t serial_passthrough_config[] = {
     {
-        .name = "mode",
-        .description = "Passthrough Mode",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "mode",
+        .description    = "Passthrough Mode",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
 #ifdef _WIN32
-            {
-                .description = "Named Pipe (Server)",
-                .value = SERPT_MODE_VCON
-            },
+            { .description = "Named Pipe (Server)",             .value = SERPT_MODE_NPIPE_SRV  },
+            { .description = "Named Pipe (Client)",             .value = SERPT_MODE_NPIPE_CLNT },
+#else /* _WIN32 */
+            { .description = "Pseudo Terminal/Virtual Console", .value = SERPT_MODE_VCON       },
+#endif /* _WIN32 */
 #if 0 /* TODO */
-            {
-                .description = "Named Pipe (Client)",
-                .value = SERPT_MODE_VCON
-            },
+            { .description = "TCP Server",                      .value = SERPT_MODE_TCP_SRV    },
+            { .description = "TCP Client",                      .value = SERPT_MODE_TCP_CLNT   },
 #endif
-#else
-            {
-                .description = "Pseudo Terminal/Virtual Console",
-                .value = SERPT_MODE_VCON
-            },
-#endif
-#if 0 /* TODO */
-            {
-                .description = "TCP Server",
-                .value = SERPT_MODE_TCPSRV
-            },
-            {
-                .description = "TCP Client",
-                .value = SERPT_MODE_TCPCLNT
-            },
-#endif
-            {
-                .description = "Host Serial Passthrough",
-                .value = SERPT_MODE_HOSTSER
-            },
-            {
-                .description = ""
-            }
-        }
+            { .description = "Host Serial Passthrough",         .value = SERPT_MODE_HOSTSER    },
+            { .description = ""                                                                }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "host_serial_path",
-        .description = "Host Serial Device",
-        .type = CONFIG_SERPORT,
-        .default_string = "",
-        .file_filter = NULL,
-        .spinner = {},
-        .selection = {}
+        .name           = "host_serial_path",
+        .description    = "Host Serial Device",
+        .type           = CONFIG_SERPORT,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
 #ifdef _WIN32
     {
-        .name = "named_pipe",
-        .description = "Name of pipe",
-        .type = CONFIG_STRING,
+        .name           = "named_pipe",
+        .description    = "Name of pipe",
+        .type           = CONFIG_STRING,
         .default_string = "\\\\.\\pipe\\86Box\\test",
-        .file_filter = NULL,
-        .spinner = {},
-        .selection = {}
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
-#endif
+#endif /* _WIN32 */
     {
-        .name = "data_bits",
-        .description = "Data bits",
-        .type = CONFIG_SELECTION,
-        .default_string = "8",
-        .default_int = 8,
-        .file_filter = NULL,
-        .spinner = { 0 },
-        .selection = {
+        .name           = "data_bits",
+        .description    = "Data bits",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 8,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
 #if 0 /* Mentioned by WFW 3.1x, not supported, atleast on Linux */
             { .description = "4", .value = 4 },
 #endif
             { .description = "5", .value = 5 },
             { .description = "6", .value = 6 },
             { .description = "7", .value = 7 },
-            { .description = "8", .value = 8 }
-        }
+            { .description = "8", .value = 8 },
+            { .description = ""              }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "stop_bits",
-        .description = "Stop bits",
-        .type = CONFIG_SELECTION,
-        .default_string = "1",
-        .default_int = 1,
-        .file_filter = NULL,
-        .spinner = { 0 },
-        .selection = {
+        .name           = "stop_bits",
+        .description    = "Stop bits",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "1",   .value = 1   },
 #if 0
             { .description = "1.5", .value = 1.5 },
 #endif
-            { .description = "2",   .value = 2   }
-        }
+            { .description = "2",   .value = 2   },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "baudrate",
-        .description = "Baud Rate of Passthrough",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 115200,
-        .file_filter = NULL,
-        .spinner = { 0 },
-        .selection = {
+        .name           = "baudrate",
+        .description    = "Baud Rate of Passthrough",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 115200,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
 #if 0
-            { .description = "256000", .value = 256000 },
-            { .description = "128000", .value = 128000 },
+            { .description = "256000", .value = 256000   },
+            { .description = "128000", .value = 128000   },
 #endif
-            { .description = "115200", .value = 115200 },
-            { .description =  "57600", .value =  57600 },
-            { .description =  "56000", .value =  56000 },
-            { .description =  "38400", .value =  38400 },
-            { .description =  "19200", .value =  19200 },
-            { .description =  "14400", .value =  14400 },
-            { .description =   "9600", .value =   9600 },
-            { .description =   "7200", .value =   7200 },
-            { .description =   "4800", .value =   4800 },
-            { .description =   "2400", .value =   2400 },
-            { .description =   "1800", .value =   1800 },
-            { .description =   "1200", .value =   1200 },
-            { .description =    "600", .value =    600 },
-            { .description =    "300", .value =    300 },
-            { .description =    "150", .value =    150 },
+            { .description = "115200", .value = 115200   },
+            { .description =  "57600", .value =  57600   },
+            { .description =  "56000", .value =  56000   },
+            { .description =  "38400", .value =  38400   },
+            { .description =  "19200", .value =  19200   },
+            { .description =  "14400", .value =  14400   },
+            { .description =   "9600", .value =   9600   },
+            { .description =   "7200", .value =   7200   },
+            { .description =   "4800", .value =   4800   },
+            { .description =   "2400", .value =   2400   },
+            { .description =   "1800", .value =   1800   },
+            { .description =   "1200", .value =   1200   },
+            { .description =    "600", .value =    600   },
+            { .description =    "300", .value =    300   },
+            { .description =    "150", .value =    150   },
 #if 0
             { .description =  "134.5", .value =    134.5 },
 #endif
-            { .description =    "110", .value =    110 },
-            { .description =     "75", .value =     75 }
-        }
+            { .description =    "110", .value =    110   },
+            { .description =     "75", .value =     75   },
+            { .description = ""                          }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
@@ -376,7 +371,7 @@ const device_t serial_passthrough_device = {
     .init          = serial_passthrough_dev_init,
     .close         = serial_passthrough_dev_close,
     .reset         = NULL,
-    { .poll = NULL },
+    .available     = NULL,
     .speed_changed = serial_passthrough_speed_changed,
     .force_redraw  = NULL,
     .config        = serial_passthrough_config
diff --git a/src/device/smbus_ali7101.c b/src/device/smbus_ali7101.c
index 349de470d..49eb44bc6 100644
--- a/src/device/smbus_ali7101.c
+++ b/src/device/smbus_ali7101.c
@@ -273,7 +273,7 @@ smbus_ali7101_reset(void *priv)
 static void *
 smbus_ali7101_init(const device_t *info)
 {
-    smbus_ali7101_t *dev = (smbus_ali7101_t *) malloc(sizeof(smbus_ali7101_t));
+    smbus_ali7101_t *dev = (smbus_ali7101_t *) calloc(1, sizeof(smbus_ali7101_t));
     memset(dev, 0, sizeof(smbus_ali7101_t));
 
     dev->local = info->local;
@@ -302,12 +302,12 @@ smbus_ali7101_close(void *priv)
 const device_t ali7101_smbus_device = {
     .name          = "ALi M7101-compatible SMBus Host Controller",
     .internal_name = "ali7101_smbus",
-    .flags         = DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0,
     .init          = smbus_ali7101_init,
     .close         = smbus_ali7101_close,
     .reset         = smbus_ali7101_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/device/smbus_piix4.c b/src/device/smbus_piix4.c
index 6f2b1632e..ae37c72c4 100644
--- a/src/device/smbus_piix4.c
+++ b/src/device/smbus_piix4.c
@@ -357,8 +357,7 @@ smbus_piix4_setclock(smbus_piix4_t *dev, int clock)
 static void *
 smbus_piix4_init(const device_t *info)
 {
-    smbus_piix4_t *dev = (smbus_piix4_t *) malloc(sizeof(smbus_piix4_t));
-    memset(dev, 0, sizeof(smbus_piix4_t));
+    smbus_piix4_t *dev = (smbus_piix4_t *) calloc(1, sizeof(smbus_piix4_t));
 
     dev->local = info->local;
     /* We save the I2C bus handle on dev but use i2c_smbus for all operations because
@@ -387,12 +386,12 @@ smbus_piix4_close(void *priv)
 const device_t piix4_smbus_device = {
     .name          = "PIIX4-compatible SMBus Host Controller",
     .internal_name = "piix4_smbus",
-    .flags         = DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = SMBUS_PIIX4,
     .init          = smbus_piix4_init,
     .close         = smbus_piix4_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -401,12 +400,12 @@ const device_t piix4_smbus_device = {
 const device_t via_smbus_device = {
     .name          = "VIA VT82C686B SMBus Host Controller",
     .internal_name = "via_smbus",
-    .flags         = DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = SMBUS_VIA,
     .init          = smbus_piix4_init,
     .close         = smbus_piix4_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/device/smbus_sis5595.c b/src/device/smbus_sis5595.c
new file mode 100644
index 000000000..42d1452ad
--- /dev/null
+++ b/src/device/smbus_sis5595.c
@@ -0,0 +1,385 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of a generic SiS 5595-compatible SMBus host
+ *          controller.
+ *
+ * Authors: RichardG, <richardg867@gmail.com>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2020-2021 RichardG.
+ *          Copyright 2021 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/timer.h>
+#include <86box/i2c.h>
+#include <86box/pci.h>
+#include <86box/smbus.h>
+#include <86box/plat_fallthrough.h>
+
+#ifdef ENABLE_SMBUS_SIS5595_LOG
+int smbus_sis5595_do_log = ENABLE_SMBUS_SIS5595_LOG;
+
+static void
+smbus_sis5595_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (smbus_sis5595_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define smbus_sis5595_log(fmt, ...)
+#endif
+
+static void
+smbus_sis5595_irq(smbus_sis5595_t *dev, int raise)
+{
+    if (dev->irq_enable) {
+        if (raise)
+            pci_set_mirq(6, 1, &dev->irq_state);
+        else
+            pci_clear_mirq(6, 1, &dev->irq_state);
+    }
+}
+
+void
+smbus_sis5595_irq_enable(void *priv, uint8_t enable)
+{
+    smbus_sis5595_t *dev = (smbus_sis5595_t *) priv;
+
+    if (!enable && dev->irq_enable)
+        pci_clear_mirq(6, 1, &dev->irq_state);
+
+    dev->irq_enable = enable;
+}
+
+uint8_t
+smbus_sis5595_read_index(void *priv)
+{
+    smbus_sis5595_t *dev = (smbus_sis5595_t *) priv;
+
+    return dev->index;
+}
+
+uint8_t
+smbus_sis5595_read_data(void *priv)
+{
+    smbus_sis5595_t *dev = (smbus_sis5595_t *) priv;
+    uint8_t          ret = 0x00;
+
+    switch (dev->index) {
+        case 0x00:
+            ret = dev->stat & 0xff;
+            break;
+        case 0x01:
+            ret = dev->stat >> 8;
+            break;
+
+        case 0x02:
+            ret = dev->ctl & 0xff;
+            break;
+        case 0x03:
+            ret = dev->ctl >> 8;
+            break;
+
+        case 0x04:
+            ret = dev->addr;
+            break;
+
+        case 0x05:
+            ret = dev->cmd;
+            break;
+
+        case 0x06:
+            ret = dev->block_ptr;
+            break;
+
+        case 0x07:
+            ret = dev->count;
+            break;
+
+        case 0x08 ... 0x0f:
+            ret = dev->data[(dev->index & 0x07) + (dev->block_ptr << 3)];
+            if (dev->index == 0x0f) {
+                dev->block_ptr = (dev->block_ptr + 1) & 3;
+                smbus_sis5595_irq(dev, dev->block_ptr != 0x00);
+            }
+            break;
+
+        case 0x10:
+            ret = dev->saved_addr;
+            break;
+
+        case 0x11:
+            ret = dev->data0;
+            break;
+
+        case 0x12:
+            ret = dev->data1;
+            break;
+
+        case 0x13:
+            ret = dev->alias;
+            break;
+
+        case 0xff:
+            ret = dev->reg_ff & 0xc0;
+            break;
+
+        default:
+            break;
+    }
+
+    smbus_sis5595_log("SMBus SIS5595: read(%02X) = %02x\n", dev->addr, ret);
+
+    return ret;
+}
+
+void
+smbus_sis5595_write_index(void *priv, uint8_t val)
+{
+    smbus_sis5595_t *dev = (smbus_sis5595_t *) priv;
+
+    dev->index = val;
+}
+
+void
+smbus_sis5595_write_data(void *priv, uint8_t val)
+{
+    smbus_sis5595_t *dev = (smbus_sis5595_t *) priv;
+    uint8_t          smbus_addr;
+    uint8_t          cmd;
+    uint8_t          read;
+    uint16_t         prev_stat;
+    uint16_t         timer_bytes = 0;
+
+    smbus_sis5595_log("SMBus SIS5595: write(%02X, %02X)\n", dev->addr, val);
+
+    prev_stat      = dev->next_stat;
+    dev->next_stat = 0x0000;
+    switch (dev->index) {
+        case 0x00:
+            dev->stat &= ~(val & 0xf0);
+            /* Make sure IDLE is set if we're not busy or errored. */
+            if (dev->stat == 0x04)
+                dev->stat = 0x00;
+            break;
+        case 0x01:
+            dev->stat &= ~(val & 0x07);
+            break;
+
+        case 0x02:
+            dev->ctl = (dev->ctl & 0xff00) | val;
+            if (val & 0x20) {    /* cancel an in-progress command if KILL is set */
+                if (prev_stat) { /* cancel only if a command is in progress */
+                    timer_disable(&dev->response_timer);
+                    dev->stat = 0x80; /* raise FAILED */
+                }
+            } else if (val & 0x10) {
+                /* dispatch command if START is set */
+                timer_bytes++; /* address */
+
+                smbus_addr = (dev->addr >> 1);
+                read       = dev->addr & 0x01;
+
+                cmd = (dev->ctl >> 1) & 0x7;
+                smbus_sis5595_log("SMBus SIS5595: addr=%02X read=%d protocol=%X cmd=%02X "
+                                  "data0=%02X data1=%02X\n", smbus_addr, read, cmd, dev->cmd,
+                                  dev->data0, dev->data1);
+
+                /* Raise DEV_ERR if no device is at this address, or if the device returned
+                   NAK when starting the transfer. */
+                if (!i2c_start(i2c_smbus, smbus_addr, read)) {
+                    dev->next_stat = 0x0020;
+                    break;
+                }
+
+                dev->next_stat = 0x0040; /* raise INTER (command completed) by default */
+
+                /* Decode the command protocol. */
+                dev->block_ptr = 0x01;
+                switch (cmd) {
+                    case 0x0: /* quick R/W */
+                        break;
+
+                    case 0x1:     /* byte R/W */
+                        if (read) /* byte read */
+                            dev->data[0] = i2c_read(i2c_smbus, smbus_addr);
+                        else /* byte write */
+                            i2c_write(i2c_smbus, smbus_addr, dev->data[0]);
+                        timer_bytes++;
+
+                        break;
+
+                    case 0x2: /* byte data R/W */
+                        /* command write */
+                        i2c_write(i2c_smbus, smbus_addr, dev->cmd);
+                        timer_bytes++;
+
+                        if (read) /* byte read */
+                            dev->data[0] = i2c_read(i2c_smbus, smbus_addr);
+                        else /* byte write */
+                            i2c_write(i2c_smbus, smbus_addr, dev->data[0]);
+                        timer_bytes++;
+
+                        break;
+
+                    case 0x3: /* word data R/W */
+                        /* command write */
+                        i2c_write(i2c_smbus, smbus_addr, dev->cmd);
+                        timer_bytes++;
+
+                        if (read) { /* word read */
+                            dev->data[0] = i2c_read(i2c_smbus, smbus_addr);
+                            dev->data[1] = i2c_read(i2c_smbus, smbus_addr);
+                        } else { /* word write */
+                            i2c_write(i2c_smbus, smbus_addr, dev->data[0]);
+                            i2c_write(i2c_smbus, smbus_addr, dev->data[1]);
+                        }
+                        timer_bytes += 2;
+
+                    break;
+
+                    case 0x5:                    /* block R/W */
+                        dev->block_ptr = 0x00;
+                        timer_bytes++;           /* count the SMBus length byte now */
+                        fallthrough;
+
+                    default:                     /* unknown */
+                        dev->next_stat = 0x0010; /* raise DEV_ERR */
+                        timer_bytes    = 0;
+                        break;
+                }
+
+                /* Finish transfer. */
+                i2c_stop(i2c_smbus, smbus_addr);
+            }
+            break;
+        case 0x03:
+            dev->ctl = (dev->ctl & 0x00ff) | (val << 8);
+            break;
+
+        case 0x04:
+            dev->addr = val;
+            break;
+
+        case 0x05:
+            dev->cmd = val;
+            break;
+
+        case 0x08 ... 0x0f:
+            dev->data[dev->index & 0x07] = val;
+            break;
+
+        case 0x10:
+            dev->saved_addr = val;
+            break;
+
+        case 0x11:
+            dev->data0 = val;
+            break;
+
+        case 0x12:
+            dev->data1 = val;
+            break;
+
+        case 0x13:
+            dev->alias = val & 0xfe;
+            break;
+
+        case 0xff:
+            dev->reg_ff = val & 0x3f;
+            break;
+
+        default:
+            break;
+    }
+
+    if (dev->next_stat != 0x04) { /* schedule dispatch of any pending status register update */
+        dev->stat = 0x08;         /* raise HOST_BUSY while waiting */
+        timer_disable(&dev->response_timer);
+        /* delay = ((half clock for start + half clock for stop) + (bytes * (8 bits + ack))) * 60us period measured on real VIA 686B */
+        timer_set_delay_u64(&dev->response_timer, (1 + (timer_bytes * 9)) * 60 * TIMER_USEC);
+    }
+}
+
+static void
+smbus_sis5595_response(void *priv)
+{
+    smbus_sis5595_t *dev = (smbus_sis5595_t *) priv;
+
+    /* Dispatch the status register update. */
+    dev->stat = dev->next_stat;
+}
+
+static void
+smbus_sis5595_reset(void *priv)
+{
+    smbus_sis5595_t *dev = (smbus_sis5595_t *) priv;
+
+    timer_disable(&dev->response_timer);
+    dev->stat         = 0x0000;
+    dev->block_ptr    = 0x01;
+}
+
+static void *
+smbus_sis5595_init(const device_t *info)
+{
+    smbus_sis5595_t *dev = (smbus_sis5595_t *) calloc(1, sizeof(smbus_sis5595_t));
+
+    dev->local        = info->local;
+
+    /* We save the I2C bus handle on dev but use i2c_smbus for all operations because
+       dev and therefore dev->i2c will be invalidated if a device triggers a hard reset. */
+    i2c_smbus = dev->i2c = i2c_addbus("smbus_sis5595");
+
+    timer_add(&dev->response_timer, smbus_sis5595_response, dev, 0);
+
+    smbus_sis5595_reset(dev);
+
+    return dev;
+}
+
+static void
+smbus_sis5595_close(void *priv)
+{
+    smbus_sis5595_t *dev = (smbus_sis5595_t *) priv;
+
+    if (i2c_smbus == dev->i2c)
+        i2c_smbus = NULL;
+    i2c_removebus(dev->i2c);
+
+    free(dev);
+}
+
+const device_t sis5595_smbus_device = {
+    .name          = "SiS 5595-compatible SMBus Host Controller",
+    .internal_name = "sis5595_smbus",
+    .flags         = DEVICE_ISA16,
+    .local         = 0,
+    .init          = smbus_sis5595_init,
+    .close         = smbus_sis5595_close,
+    .reset         = smbus_sis5595_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/device/tulip_jumper.c b/src/device/tulip_jumper.c
new file mode 100644
index 000000000..1974129e3
--- /dev/null
+++ b/src/device/tulip_jumper.c
@@ -0,0 +1,103 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the Tulip Jumper Readout.
+ *
+ *          Bits 7-5 = board number, 0-5 valid, 6, 7 invalid.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2025 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/machine.h>
+#include <86box/sound.h>
+#include <86box/chipset.h>
+#include <86box/plat.h>
+#include <86box/plat_unused.h>
+
+typedef struct tulip_jumper_t {
+    uint8_t jumper;
+} tulip_jumper_t;
+
+#ifdef ENABLE_TULIP_JUMPER_LOG
+int tulip_jumper_do_log = ENABLE_TULIP_JUMPER_LOG;
+
+static void
+tulip_jumper_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (tulip_jumper_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define tulip_jumper_log(fmt, ...)
+#endif
+
+static uint8_t
+tulip_jumper_read(uint16_t addr, void *priv)
+{
+    const tulip_jumper_t *dev = (tulip_jumper_t *) priv;
+    uint8_t               ret = 0xff;
+
+    tulip_jumper_log("Tulip Jumper: Read %02x\n", dev->jumper);
+
+    ret = dev->jumper;
+
+    return ret;
+}
+
+static void
+tulip_jumper_close(void *priv)
+{
+    tulip_jumper_t *dev = (tulip_jumper_t *) priv;
+
+    free(dev);
+}
+
+static void *
+tulip_jumper_init(const device_t *info)
+{
+    tulip_jumper_t *dev = (tulip_jumper_t *) calloc(1, sizeof(tulip_jumper_t));
+
+    /* Return board number 05. */
+    dev->jumper = 0xbf;
+
+    io_sethandler(0x0d80, 0x0001, tulip_jumper_read, NULL, NULL, NULL, NULL, NULL, dev);
+
+    return dev;
+}
+
+const device_t tulip_jumper_device = {
+    .name          = "Tulip Jumper Readout",
+    .internal_name = "tulip_jumper",
+    .flags         = 0,
+    .local         = 0,
+    .init          = tulip_jumper_init,
+    .close         = tulip_jumper_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/device/unittester.c b/src/device/unittester.c
index e52f3b56f..0e864aa0b 100644
--- a/src/device/unittester.c
+++ b/src/device/unittester.c
@@ -104,8 +104,8 @@ struct unittester_state {
     /* 0x04: Exit */
     uint8_t exit_code;
 };
-static struct unittester_state       unittester;
-static const struct unittester_state unittester_defaults = {
+static struct unittester_state unittester;
+static struct unittester_state unittester_defaults = {
     .trigger_port = 0x0080,
     .iobase_port  = 0xFFFF,
     .fsm1         = UT_FSM1_WAIT_8,
@@ -114,15 +114,6 @@ static const struct unittester_state unittester_defaults = {
     .cmd_id       = UT_CMD_NOOP,
 };
 
-static const device_config_t unittester_config[] = {
-    { .name           = "exit_enabled",
-     .description    = "Enable 0x04 \"Exit 86Box\" command",
-     .type           = CONFIG_BINARY,
-     .default_int    = 1,
-     .default_string = "" },
-    { .type = CONFIG_END }
-};
-
 /* Kept separate, as we will be reusing this object */
 static bitmap_t *unittester_screen_buffer = NULL;
 
@@ -589,7 +580,7 @@ unittester_trigger_write(UNUSED(uint16_t port), uint8_t val, UNUSED(void *priv))
 static void *
 unittester_init(UNUSED(const device_t *info))
 {
-    unittester = (struct unittester_state) unittester_defaults;
+    unittester = unittester_defaults;
 
     unittester_exit_enabled = !!device_get_config_int("exit_enabled");
 
@@ -620,6 +611,23 @@ unittester_close(UNUSED(void *priv))
     unittester_log("[UT] 86Box Unit Tester closed\n");
 }
 
+static const device_config_t unittester_config[] = {
+  // clang-format off
+    {
+        .name           = "exit_enabled",
+        .description    = "Enable 0x04 \"Exit 86Box\" command",
+        .type           = CONFIG_BINARY,
+        .default_int    = 1,
+        .default_string = NULL,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
 const device_t unittester_device = {
     .name          = "86Box Unit Tester",
     .internal_name = "unittester",
@@ -628,7 +636,7 @@ const device_t unittester_device = {
     .init          = unittester_init,
     .close         = unittester_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = unittester_config,
diff --git a/src/machine/m_xt_zenith.c b/src/device/zenith_scratchpad.c
similarity index 54%
rename from src/machine/m_xt_zenith.c
rename to src/device/zenith_scratchpad.c
index 0da091917..0db40c3f0 100644
--- a/src/machine/m_xt_zenith.c
+++ b/src/device/zenith_scratchpad.c
@@ -45,8 +45,9 @@
 #include <86box/serial.h>
 #include <86box/machine.h>
 #include <86box/io.h>
-#include <86box/vid_cga.h>
+#include <86box/video.h>
 #include <86box/plat_unused.h>
+#include <86box/chipset.h>
 
 typedef struct {
     mem_mapping_t scratchpad_mapping;
@@ -73,8 +74,7 @@ zenith_scratchpad_init(UNUSED(const device_t *info))
 {
     zenith_t *dev;
 
-    dev = (zenith_t *) malloc(sizeof(zenith_t));
-    memset(dev, 0x00, sizeof(zenith_t));
+    dev = (zenith_t *) calloc(1, sizeof(zenith_t));
 
     dev->scratchpad_ram = malloc(0x4000);
 
@@ -95,7 +95,7 @@ zenith_scratchpad_close(void *priv)
     free(dev);
 }
 
-static const device_t zenith_scratchpad_device = {
+const device_t zenith_scratchpad_device = {
     .name          = "Zenith scratchpad RAM",
     .internal_name = "zenith_scratchpad",
     .flags         = 0,
@@ -103,103 +103,8 @@ static const device_t zenith_scratchpad_device = {
     .init          = zenith_scratchpad_init,
     .close         = zenith_scratchpad_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
 };
-
-void
-machine_zenith_init(const machine_t *model)
-{
-    machine_common_init(model);
-
-    device_add(&zenith_scratchpad_device);
-
-    pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_xt);
-
-    device_add(&keyboard_xt_zenith_device);
-
-    nmi_init();
-}
-
-/*
- * Current bugs and limitations:
- * - missing NVRAM implementation
- */
-int
-machine_xt_z184_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/zdsupers/z184m v3.1d.10d",
-                           0x000f8000, 32768, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_zenith_init(model);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_xt_device);
-
-    lpt1_remove(); /* only one parallel port */
-    lpt2_remove();
-    lpt1_init(0x278);
-    device_add(&ns8250_device);
-    serial_set_next_inst(SERIAL_MAX); /* So that serial_standalone_init() won't do anything. */
-
-    device_add(&cga_device);
-
-    return ret;
-}
-
-int
-machine_xt_z151_init(const machine_t *model)
-{
-    int ret;
-    ret = bios_load_linear("roms/machines/zdsz151/444-229-18.bin",
-                           0x000fc000, 32768, 0);
-    if (ret) {
-        bios_load_aux_linear("roms/machines/zdsz151/444-260-18.bin",
-                             0x000f8000, 16384, 0);
-    }
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_zenith_init(model);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_xt_tandy_device);
-
-    return ret;
-}
-
-/*
- * Current bugs and limitations:
- * - Memory board support for EMS currently missing
- */
-int
-machine_xt_z159_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/zdsz159/z159m v2.9e.10d",
-                           0x000f8000, 32768, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_zenith_init(model);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_xt_tandy_device);
-
-    /* parallel port is on the memory board */
-    lpt1_remove(); /* only one parallel port */
-    lpt2_remove();
-    lpt1_init(0x278);
-
-    return ret;
-}
diff --git a/src/disk/CMakeLists.txt b/src/disk/CMakeLists.txt
index 00da385d4..9b8d72f54 100644
--- a/src/disk/CMakeLists.txt
+++ b/src/disk/CMakeLists.txt
@@ -9,16 +9,36 @@
 #          CMake build script.
 #
 # Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
 #
 #          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2024      Jasmine Iwanek.
 #
 
-add_library(hdd OBJECT hdd.c hdd_image.c hdd_table.c hdc.c hdc_st506_xt.c
-    hdc_st506_at.c hdc_xta.c hdc_esdi_at.c hdc_esdi_mca.c hdc_xtide.c
-    hdc_ide.c hdc_ide_ali5213.c hdc_ide_opti611.c hdc_ide_cmd640.c hdc_ide_cmd646.c
-    hdc_ide_sff8038i.c)
+add_library(hdd OBJECT
+    hdd.c
+    hdd_image.c
+    hdd_table.c
+    hdc.c
+    hdc_st506_xt.c
+    hdc_st506_at.c
+    hdc_xta.c
+    hdc_xta_ps1.c
+    hdc_esdi_at.c
+    hdc_esdi_mca.c
+    hdc_xtide.c
+    hdc_ide.c
+    hdc_ide_ali5213.c
+    hdc_ide_opti611.c
+    hdc_ide_cmd640.c
+    hdc_ide_cmd646.c
+    hdc_ide_rz1000.c
+    hdc_ide_sff8038i.c
+    hdc_ide_um8673f.c
+    hdc_ide_w83769f.c
+)
 
-add_library(zip OBJECT zip.c)
+add_library(rdisk OBJECT rdisk.c)
 
 add_library(mo OBJECT mo.c)
 
diff --git a/src/disk/hdc.c b/src/disk/hdc.c
index 7bfb7e05a..135528401 100644
--- a/src/disk/hdc.c
+++ b/src/disk/hdc.c
@@ -30,7 +30,7 @@
 #include <86box/hdc_ide.h>
 #include <86box/hdd.h>
 
-int hdc_current;
+int hdc_current[HDC_MAX] = { 0, 0 };
 
 #ifdef ENABLE_HDC_LOG
 int hdc_do_log = ENABLE_HDC_LOG;
@@ -50,65 +50,52 @@ hdc_log(const char *fmt, ...)
 #    define hdc_log(fmt, ...)
 #endif
 
-static const device_t hdc_none_device = {
-    .name          = "None",
-    .internal_name = "none",
-    .flags         = 0,
-    .local         = 0,
-    .init          = NULL,
-    .close         = NULL,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-static const device_t hdc_internal_device = {
-    .name          = "Internal",
-    .internal_name = "internal",
-    .flags         = 0,
-    .local         = 0,
-    .init          = NULL,
-    .close         = NULL,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
 static const struct {
     const device_t *device;
 } controllers[] = {
     // clang-format off
-    { &hdc_none_device             },
-    { &hdc_internal_device         },
-    { &st506_xt_xebec_device       },
-    { &st506_xt_wdxt_gen_device    },
+    { &device_none                 },
+    { &device_internal             },
+    /* ISA */
+    { &xtide_acculogic_device      },
     { &st506_xt_dtc5150x_device    },
+    { &st506_xt_xebec_device       },
+    { &xtide_device                },
     { &st506_xt_st11_m_device      },
-    { &st506_xt_wd1002a_wx1_device },
-    { &st506_xt_wd1004a_wx1_device },
-    { &st506_at_wd1003_device      },
     { &st506_xt_st11_r_device      },
+    { &xta_st50x_device            },
+    { &st506_xt_victor_v86p_device },
     { &st506_xt_wd1002a_27x_device },
+    { &st506_xt_wd1002a_wx1_device },
     { &st506_xt_wd1004_27x_device  },
     { &st506_xt_wd1004a_27x_device },
-    { &st506_xt_victor_v86p_device },
-    { &esdi_at_wd1007vse1_device   },
+    { &st506_xt_wd1004a_wx1_device },
+    { &xta_wdxt150_device          },
+    { &st506_xt_wdxt_gen_device    },
+    /* ISA16 */
     { &ide_isa_device              },
     { &ide_isa_2ch_device          },
     { &xtide_at_device             },
+    { &xtide_at_2ch_device         },
     { &xtide_at_ps2_device         },
-    { &xta_wdxt150_device          },
-    { &xtide_acculogic_device      },
-    { &xtide_device                },
+    { &xtide_at_ps2_2ch_device     },
+    { &ide_ter_device              },
+    { &ide_qua_device              },
+    { &st506_at_wd1003_device      },
+    { &esdi_at_wd1007vse1_device   },
+    /* MCA */
     { &esdi_ps2_device             },
-    { &ide_pci_device              },
-    { &ide_pci_2ch_device          },
+    { &esdi_integrated_device      },
+    { &mcide_device                },
+    /* VLB */
     { &ide_vlb_device              },
     { &ide_vlb_2ch_device          },
+    /* PCI */
+    { &ide_cmd646_ter_qua_device   },
+    { &ide_cmd648_ter_qua_device   },
+    { &ide_cmd649_ter_qua_device   },
+    { &ide_pci_device              },
+    { &ide_pci_2ch_device          },
     { NULL                         }
     // clang-format on
 };
@@ -127,18 +114,14 @@ hdc_init(void)
 void
 hdc_reset(void)
 {
-    hdc_log("HDC: reset(current=%d, internal=%d)\n",
-            hdc_current, (machines[machine].flags & MACHINE_HDC) ? 1 : 0);
+    for (int i = 0; i < HDC_MAX; i++) {
+        hdc_log("HDC %i: reset(current=%d, internal=%d)\n", i,
+                hdc_current[i], hdc_current[i] == HDC_INTERNAL);
 
-    /* If we have a valid controller, add its device. */
-    if (hdc_current > 1)
-        device_add(controllers[hdc_current].device);
-
-    /* Now, add the tertiary and/or quaternary IDE controllers. */
-    if (ide_ter_enabled)
-        device_add(&ide_ter_device);
-    if (ide_qua_enabled)
-        device_add(&ide_qua_device);
+        /* If we have a valid controller, add its device. */
+        if (hdc_current[i] > HDC_INTERNAL)
+            device_add_inst(controllers[hdc_current[i]].device, i + 1);
+    }
 }
 
 const char *
@@ -148,7 +131,7 @@ hdc_get_internal_name(int hdc)
 }
 
 int
-hdc_get_from_internal_name(char *s)
+hdc_get_from_internal_name(const char *s)
 {
     int c = 0;
 
diff --git a/src/disk/hdc_esdi_at.c b/src/disk/hdc_esdi_at.c
index 65184094a..64d292250 100644
--- a/src/disk/hdc_esdi_at.c
+++ b/src/disk/hdc_esdi_at.c
@@ -129,23 +129,24 @@ esdi_at_log(const char *fmt, ...)
 static __inline void
 irq_raise(esdi_t *esdi)
 {
-    if (!(esdi->fdisk & 2))
-        picint(1 << 14);
-
     esdi->irqstat = 1;
+    if (!(esdi->fdisk & 2))
+        picint_common(1 << 14, PIC_IRQ_EDGE, 1, NULL);
 }
 
 static __inline void
-irq_lower(UNUSED(esdi_t *esdi))
+irq_lower(esdi_t *esdi)
 {
-    picintc(1 << 14);
+    esdi->irqstat = 0;
+    if (!(esdi->fdisk & 2))
+        picint_common(1 << 14, PIC_IRQ_EDGE, 0, NULL);
 }
 
 static __inline void
-irq_update(UNUSED(esdi_t *esdi))
+irq_update(esdi_t *esdi)
 {
-    if (esdi->irqstat && !((pic2.irr | pic2.isr) & 0x40) && !(esdi->fdisk & 2))
-        picint(1 << 14);
+    uint8_t set = !(esdi->fdisk & 2) && esdi->irqstat;
+    picint_common(1 << 14, PIC_IRQ_EDGE, set, NULL);
 }
 
 static void
@@ -213,6 +214,41 @@ get_sector(esdi_t *esdi, off64_t *addr)
     return 0;
 }
 
+static int
+get_sector_format(esdi_t *esdi, off64_t *addr)
+{
+    const drive_t *drive   = &esdi->drives[esdi->drive_sel];
+    int            heads   = drive->cfg_hpc;
+    int            sectors = drive->cfg_spt;
+    int            c;
+    int            h;
+    int            s;
+
+    if (esdi->head > heads) {
+        esdi_at_log("esdi_get_sector: past end of configured heads\n");
+        return 1;
+    }
+
+    if (drive->cfg_spt == drive->real_spt && drive->cfg_hpc == drive->real_hpc) {
+        *addr = ((((off64_t) esdi->cylinder * heads) + esdi->head) * sectors);
+    } else {
+        /*
+         * When performing translation, the firmware seems to leave 1
+         * sector per track inaccessible (spare sector)
+         */
+
+        *addr = ((((off64_t) esdi->cylinder * heads) + esdi->head) * sectors);
+
+        s = *addr % (drive->real_spt - 1);
+        h = (*addr / (drive->real_spt - 1)) % drive->real_hpc;
+        c = (*addr / (drive->real_spt - 1)) / drive->real_hpc;
+
+        *addr = ((((off64_t) c * drive->real_hpc) + h) * drive->real_spt) + s;
+    }
+
+    return 0;
+}
+
 /* Move to the next sector using CHS addressing. */
 static void
 next_sector(esdi_t *esdi)
@@ -263,6 +299,7 @@ esdi_write(uint16_t port, uint8_t val, void *priv)
     double  seek_time;
     double  xfer_time;
     off64_t addr;
+    uint8_t old;
 
     esdi_at_log("WD1007 write(%04x, %02x)\n", port, val);
 
@@ -358,7 +395,7 @@ esdi_write(uint16_t port, uint8_t val, void *priv)
                                 fatal("Write with ECC\n");
                             esdi->status = STAT_READY | STAT_DRQ | STAT_DSC;
                             esdi->pos    = 0;
-                            ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 1);
+                            ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 1);
                             break;
 
                         case CMD_VERIFY:
@@ -375,7 +412,7 @@ esdi_write(uint16_t port, uint8_t val, void *priv)
                         case CMD_FORMAT:
                             esdi->status = STAT_DRQ;
                             esdi->pos    = 0;
-                            ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 1);
+                            ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 1);
                             break;
 
                         case CMD_SET_PARAMETERS: /* Initialize Drive Parameters */
@@ -411,15 +448,15 @@ esdi_write(uint16_t port, uint8_t val, void *priv)
                 esdi_set_callback(esdi, 500 * HDC_TIME);
                 esdi->reset  = 1;
                 esdi->status = STAT_BUSY;
-            }
-
-            if (val & 0x04) {
+            } else if (!(esdi->fdisk & 0x04) && (val & 0x04)) {
                 /* Drive held in reset. */
                 esdi_set_callback(esdi, 0);
                 esdi->status = STAT_BUSY;
             }
+            old = esdi->fdisk;
             esdi->fdisk = val;
-            irq_update(esdi);
+            if (!(val & 0x02) && (old & 0x02))
+                irq_update(esdi);
             break;
 
         default:
@@ -515,6 +552,29 @@ esdi_read(uint16_t port, void *priv)
     return temp;
 }
 
+/**
+ * Copy a string into a buffer, padding with spaces, and placing characters as
+ * if they were packed into 16-bit values, stored little-endian.
+ *
+ * @param str Destination buffer
+ * @param src Source string
+ * @param len Length of destination buffer to fill in. Strings shorter than
+ *            this length will be padded with spaces.
+ */
+static void
+esdi_padstr(char *str, const char *src, const int len)
+{
+    int v;
+
+    for (int i = 0; i < len; i++) {
+        if (*src != '\0')
+            v = *src++;
+        else
+            v = ' ';
+        str[i ^ 1] = v;
+    }
+}
+
 static void
 esdi_callback(void *priv)
 {
@@ -533,6 +593,7 @@ esdi_callback(void *priv)
         esdi->reset    = 0;
 
         ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+        ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
         return;
     }
 
@@ -569,12 +630,16 @@ esdi_callback(void *priv)
             } else {
                 if (get_sector(esdi, &addr)) {
                     esdi->error  = ERR_ID_NOT_FOUND;
+read_error:
                     esdi->status = STAT_READY | STAT_DSC | STAT_ERR;
                     irq_raise(esdi);
                     break;
                 }
 
-                hdd_image_read(drive->hdd_num, addr, 1, (uint8_t *) esdi->buffer);
+                if (hdd_image_read(drive->hdd_num, addr, 1, (uint8_t *) esdi->buffer) < 0) {
+                    esdi->error = ERR_BAD_BLOCK;
+                    goto read_error;
+                }
                 esdi->pos    = 0;
                 esdi->status = STAT_DRQ | STAT_READY | STAT_DSC;
                 irq_raise(esdi);
@@ -586,28 +651,32 @@ esdi_callback(void *priv)
                 esdi->status = STAT_READY | STAT_ERR | STAT_DSC;
                 esdi->error  = ERR_ABRT;
                 irq_raise(esdi);
-                ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+                ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
                 break;
             } else {
                 if (get_sector(esdi, &addr)) {
                     esdi->error  = ERR_ID_NOT_FOUND;
+write_error:
                     esdi->status = STAT_READY | STAT_DSC | STAT_ERR;
                     irq_raise(esdi);
-                    ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+                    ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
                     break;
                 }
 
-                hdd_image_write(drive->hdd_num, addr, 1, (uint8_t *) esdi->buffer);
+                if (hdd_image_write(drive->hdd_num, addr, 1, (uint8_t *) esdi->buffer) < 0) {
+                    esdi->error = ERR_BAD_BLOCK;
+                    goto write_error;
+                }
                 irq_raise(esdi);
                 esdi->secount = (esdi->secount - 1) & 0xff;
                 if (esdi->secount) {
                     esdi->status = STAT_DRQ | STAT_READY | STAT_DSC;
                     esdi->pos    = 0;
                     next_sector(esdi);
-                    ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 1);
+                    ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 1);
                 } else {
                     esdi->status = STAT_READY | STAT_DSC;
-                    ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+                    ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
                 }
             }
             break;
@@ -622,13 +691,17 @@ esdi_callback(void *priv)
             } else {
                 if (get_sector(esdi, &addr)) {
                     esdi->error  = ERR_ID_NOT_FOUND;
+verify_error:
                     esdi->status = STAT_READY | STAT_DSC | STAT_ERR;
                     irq_raise(esdi);
                     ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
                     break;
                 }
 
-                hdd_image_read(drive->hdd_num, addr, 1, (uint8_t *) esdi->buffer);
+                if (hdd_image_read(drive->hdd_num, addr, 1, (uint8_t *) esdi->buffer) < 0) {
+                    esdi->error = ERR_BAD_BLOCK;
+                    goto verify_error;
+                }
                 ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 1);
                 next_sector(esdi);
                 esdi->secount = (esdi->secount - 1) & 0xff;
@@ -646,21 +719,25 @@ esdi_callback(void *priv)
             break;
 
         case CMD_FORMAT:
-            ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+            ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
             if (!drive->present) {
                 esdi->status = STAT_READY | STAT_ERR | STAT_DSC;
                 esdi->error  = ERR_ABRT;
                 irq_raise(esdi);
                 break;
             } else {
-                if (get_sector(esdi, &addr)) {
+                if (get_sector_format(esdi, &addr)) {
                     esdi->error  = ERR_ID_NOT_FOUND;
+format_error:
                     esdi->status = STAT_READY | STAT_DSC | STAT_ERR;
                     irq_raise(esdi);
                     break;
                 }
 
-                hdd_image_zero(drive->hdd_num, addr, esdi->secount);
+                if (hdd_image_zero(drive->hdd_num, addr, esdi->secount) < 0) {
+                    esdi->error = ERR_BAD_BLOCK;
+                    goto format_error;
+                }
                 esdi->status = STAT_READY | STAT_DSC;
                 irq_raise(esdi);
             }
@@ -676,10 +753,12 @@ esdi_callback(void *priv)
             esdi->status = STAT_READY | STAT_DSC;
             irq_raise(esdi);
             ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+            ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
             break;
 
         case CMD_SET_PARAMETERS: /* Initialize Drive Parameters */
             ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+            ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
             if (!drive->present) {
                 esdi->status = STAT_READY | STAT_ERR | STAT_DSC;
                 esdi->error  = ERR_ABRT;
@@ -702,10 +781,12 @@ esdi_callback(void *priv)
             esdi->error  = ERR_ABRT;
             irq_raise(esdi);
             ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+            ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
             break;
 
         case 0xe0:
             ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+            ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
             if (!drive->present) {
                 esdi->status = STAT_READY | STAT_ERR | STAT_DSC;
                 esdi->error  = ERR_ABRT;
@@ -749,6 +830,7 @@ esdi_callback(void *priv)
             }
             irq_raise(esdi);
             ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+            ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
             break;
 
         case CMD_READ_PARAMETERS:
@@ -758,33 +840,42 @@ esdi_callback(void *priv)
                 irq_raise(esdi);
             } else {
                 memset(esdi->buffer, 0x00, 512);
-                esdi->buffer[0] = 0x44;                              /* general configuration */
-                esdi->buffer[1] = drive->real_tracks;                /* number of non-removable cylinders */
-                esdi->buffer[2] = 0;                                 /* number of removable cylinders */
-                esdi->buffer[3] = drive->real_hpc;                   /* number of heads */
-                esdi->buffer[4] = 600;                               /* number of unformatted bytes/sector */
-                esdi->buffer[5] = esdi->buffer[4] * drive->real_spt; /* number of unformatted bytes/track */
-                esdi->buffer[6] = drive->real_spt;                   /* number of sectors */
-                esdi->buffer[7] = 0;                                 /*minimum bytes in inter-sector gap*/
-                esdi->buffer[8] = 0;                                 /* minimum bytes in postamble */
-                esdi->buffer[9] = 0;                                 /* number of words of vendor status */
-                /* controller info */
-                esdi->buffer[20] = 2; /* controller type */
-                esdi->buffer[21] = 1; /* sector buffer size, in sectors */
-                esdi->buffer[22] = 0; /* ecc bytes appended */
-                esdi->buffer[27] = 'W' | ('D' << 8);
-                esdi->buffer[28] = '1' | ('0' << 8);
-                esdi->buffer[29] = '0' | ('7' << 8);
-                esdi->buffer[30] = 'V' | ('-' << 8);
-                esdi->buffer[31] = 'S' | ('E' << 8);
-                esdi->buffer[32] = '1';
-                esdi->buffer[47] = 0; /* sectors per interrupt */
-                esdi->buffer[48] = 0; /* can use double word read/write? */
+                esdi->buffer[0] = 0x3244;                            /*
+                                                                        Soft sectored (0x0004),
+                                                                        Fixed drive (0x0040),
+                                                                        Transfer rate > 5 Mbps but <= 10 Mbps (0x0200),
+                                                                        Data strobe offset option (0x1000),
+                                                                        Track offset option (0x2000).
+                                                                      */
+                if (drive->real_spt >= 26)
+                    esdi->buffer[0] |= 0x0008;                       /* Not MFM encoded. */
+                esdi->buffer[1] = drive->real_tracks;                /* Fixed cylinders - the BIOS lists 2 less. */
+                esdi->buffer[2] = 0;                                 /* Removable cylinders. */
+                esdi->buffer[3] = drive->real_hpc;                   /* Heads. */
+                esdi->buffer[5] = 600;                               /* Unformatted bytes per sector. */
+                esdi->buffer[4] = esdi->buffer[5] * drive->real_spt; /* Unformatted bytes per track. */
+                esdi->buffer[6] = drive->real_spt;                   /* Sectors per track - the BIOS lists 1 less. */
+                esdi->buffer[7] = 3088;                              /* Bytes in inter-sector gap. */
+                esdi->buffer[8] = 11;                                /* Byce in sync fileds. */
+                esdi->buffer[9] = 0xf;                               /* Number of vendor unique words. */
+                /* Serial Number */
+                esdi_padstr((char *) (esdi->buffer + 10), "00000000000000000000", 20);
+                /* Controller information. */
+                esdi->buffer[20] = 3;                                /* Buffer type. */
+                esdi->buffer[21] = 64;                               /* Buffer size in 512-byte increments. */
+                esdi->buffer[22] = 4;                                /* Bytes of ECC. */
+                /* Firmware */
+                esdi_padstr((char *) (esdi->buffer + 23), "REV. A5", 8);
+                /* Model */
+                esdi_padstr((char *) (esdi->buffer + 27), "WD1007V", 40);
+                esdi->buffer[47] = 1;                                /* Sectors per interrupt. */
+                esdi->buffer[48] = 0;                                /* Can use DWord read/write? */
                 esdi->pos        = 0;
                 esdi->status     = STAT_DRQ | STAT_READY | STAT_DSC;
                 irq_raise(esdi);
             }
             ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+            ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
             break;
 
         default:
@@ -796,6 +887,7 @@ esdi_callback(void *priv)
             esdi->error  = ERR_ABRT;
             irq_raise(esdi);
             ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+            ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
             break;
     }
 }
@@ -836,12 +928,11 @@ wd1007vse1_init(UNUSED(const device_t *info))
 {
     int c;
 
-    esdi_t *esdi = malloc(sizeof(esdi_t));
-    memset(esdi, 0x00, sizeof(esdi_t));
+    esdi_t *esdi = calloc(1, sizeof(esdi_t));
 
     c = 0;
     for (uint8_t d = 0; d < HDD_NUM; d++) {
-        if ((hdd[d].bus == HDD_BUS_ESDI) && (hdd[d].esdi_channel < ESDI_NUM)) {
+        if ((hdd[d].bus_type == HDD_BUS_ESDI) && (hdd[d].esdi_channel < ESDI_NUM)) {
             loadhd(esdi, hdd[d].esdi_channel, d, hdd[d].fn);
 
             if (++c >= ESDI_NUM)
@@ -871,6 +962,7 @@ wd1007vse1_init(UNUSED(const device_t *info))
     timer_add(&esdi->callback_timer, esdi_callback, esdi, 0);
 
     ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+    ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
 
     return esdi;
 }
@@ -890,6 +982,7 @@ wd1007vse1_close(void *priv)
     free(esdi);
 
     ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+    ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
 }
 
 static int
@@ -901,12 +994,12 @@ wd1007vse1_available(void)
 const device_t esdi_at_wd1007vse1_device = {
     .name          = "Western Digital WD1007V-SE1 (ESDI)",
     .internal_name = "esdi_at",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0,
     .init          = wd1007vse1_init,
     .close         = wd1007vse1_close,
     .reset         = NULL,
-    { .available = wd1007vse1_available },
+    .available     = wd1007vse1_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/disk/hdc_esdi_mca.c b/src/disk/hdc_esdi_mca.c
index 02f054ca2..e59ae981d 100644
--- a/src/disk/hdc_esdi_mca.c
+++ b/src/disk/hdc_esdi_mca.c
@@ -92,7 +92,7 @@
 #define BIOS_FILE_L     "roms/hdd/esdi/90x8969.bin"
 #define BIOS_FILE_H     "roms/hdd/esdi/90x8970.bin"
 
-#define ESDI_TIME       512.0
+#define ESDI_TIME       500.0
 #define CMD_ADAPTER     0
 
 typedef struct esdi_drive_t {
@@ -113,6 +113,7 @@ typedef struct esdi_t {
     uint8_t  basic_ctrl;
     uint8_t  status;
     uint8_t  irq_status;
+    int      irq_ena_disable;
     int      irq_in_progress;
     int      cmd_req_in_progress;
     int      cmd_pos;
@@ -149,6 +150,11 @@ typedef struct esdi_t {
     uint8_t pos_regs[8];
 } esdi_t;
 
+enum {
+    ESDI_IS_ADAPTER,
+    ESDI_IS_INTEGRATED
+};
+
 #define STATUS_DMA_ENA             (1 << 7)
 #define STATUS_IRQ_PENDING         (1 << 6)
 #define STATUS_CMD_IN_PROGRESS     (1 << 5)
@@ -187,6 +193,7 @@ typedef struct esdi_t {
 #define CMD_READ_VERIFY            0x03
 #define CMD_WRITE_VERIFY           0x04
 #define CMD_SEEK                   0x05
+#define CMD_PARK_HEADS             0x06
 #define CMD_GET_DEV_STATUS         0x08
 #define CMD_GET_DEV_CONFIG         0x09
 #define CMD_GET_POS_INFO           0x0a
@@ -218,14 +225,26 @@ esdi_mca_log(const char *fmt, ...)
 static __inline void
 set_irq(esdi_t *dev)
 {
+    dev->irq_ena_disable = 1;
+    esdi_mca_log("Set IRQ 14: bit=%x, cmd=%02x.\n", dev->basic_ctrl & CTRL_IRQ_ENA, dev->command);
     if (dev->basic_ctrl & CTRL_IRQ_ENA)
-        picint(1 << 14);
+        picint_common(1 << ESDI_IRQCHAN, PIC_IRQ_EDGE, 1, NULL);
 }
 
 static __inline void
-clear_irq(UNUSED(esdi_t *dev))
+clear_irq(esdi_t *dev)
 {
-    picintc(1 << 14);
+    dev->irq_ena_disable = 0;
+    esdi_mca_log("Clear IRQ 14: bit=%x, cmd=%02x.\n", dev->basic_ctrl & CTRL_IRQ_ENA, dev->command);
+    if (dev->basic_ctrl & CTRL_IRQ_ENA)
+        picint_common(1 << ESDI_IRQCHAN, PIC_IRQ_EDGE, 0, NULL);
+}
+
+static __inline void
+update_irq(esdi_t *dev)
+{
+    uint8_t set = (dev->basic_ctrl & CTRL_IRQ_ENA) && dev->irq_ena_disable;
+    picint_common(1 << ESDI_IRQCHAN, PIC_IRQ_EDGE, set, NULL);
 }
 
 static void
@@ -235,10 +254,11 @@ esdi_mca_set_callback(esdi_t *dev, double callback)
         return;
     }
 
-    if (callback) {
-        timer_on_auto(&dev->timer, callback);
-    } else {
+    if (callback == 0.0) {
+        esdi_mca_log("Callback Stopped.\n");
         timer_stop(&dev->timer);
+    } else {
+        timer_on_auto(&dev->timer, callback);
     }
 }
 
@@ -268,6 +288,7 @@ cmd_unsupported(esdi_t *dev)
     dev->irq_in_progress = 1;
     set_irq(dev);
     ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+    ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
 }
 
 static void
@@ -289,6 +310,7 @@ device_not_present(esdi_t *dev)
     dev->irq_in_progress = 1;
     set_irq(dev);
     ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+    ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
 }
 
 static void
@@ -310,6 +332,29 @@ rba_out_of_range(esdi_t *dev)
     dev->irq_in_progress = 1;
     set_irq(dev);
     ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+    ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
+}
+
+static void
+defective_block(esdi_t *dev)
+{
+    dev->status_len     = 9;
+    dev->status_data[0] = dev->command | STATUS_LEN(9) | dev->cmd_dev;
+    dev->status_data[1] = 0x0e01; /*Command block error, invalid parameter*/
+    dev->status_data[2] = 0x0009; /*Defective block*/
+    dev->status_data[3] = 0;
+    dev->status_data[4] = 0;
+    dev->status_data[5] = 0;
+    dev->status_data[6] = 0;
+    dev->status_data[7] = 0;
+    dev->status_data[8] = 0;
+
+    dev->status          = STATUS_IRQ | STATUS_STATUS_OUT_FULL;
+    dev->irq_status      = dev->cmd_dev | IRQ_CMD_COMPLETE_FAILURE;
+    dev->irq_in_progress = 1;
+    set_irq(dev);
+    ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+    ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
 }
 
 static void
@@ -317,9 +362,9 @@ complete_command_status(esdi_t *dev)
 {
     dev->status_len = 7;
     if (dev->cmd_dev == ATTN_DEVICE_0)
-        dev->status_data[0] = CMD_READ | STATUS_LEN(7) | STATUS_DEVICE(0);
+        dev->status_data[0] = dev->command | STATUS_LEN(7) | STATUS_DEVICE(0);
     else
-        dev->status_data[0] = CMD_READ | STATUS_LEN(7) | STATUS_DEVICE(1);
+        dev->status_data[0] = dev->command | STATUS_LEN(7) | STATUS_DEVICE(1);
     dev->status_data[1] = 0x0000;                  /*Error bits*/
     dev->status_data[2] = 0x1900;                  /*Device status*/
     dev->status_data[3] = 0;                       /*Number of blocks left to do*/
@@ -327,18 +372,16 @@ complete_command_status(esdi_t *dev)
     dev->status_data[5] = (dev->rba - 1) >> 8;
     dev->status_data[6] = 0; /*Number of blocks requiring error recovery*/
     ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+    ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
 }
 
 #define ESDI_ADAPTER_ONLY()                      \
-    do {                                         \
         if (dev->cmd_dev != ATTN_HOST_ADAPTER) { \
             cmd_unsupported(dev);                \
             return;                              \
-        }                                        \
-    } while (0)
+        }
 
 #define ESDI_DRIVE_ONLY()                                                     \
-    do {                                                                      \
         if (dev->cmd_dev != ATTN_DEVICE_0 && dev->cmd_dev != ATTN_DEVICE_1) { \
             cmd_unsupported(dev);                                             \
             return;                                                           \
@@ -346,8 +389,7 @@ complete_command_status(esdi_t *dev)
         if (dev->cmd_dev == ATTN_DEVICE_0)                                    \
             drive = &dev->drives[0];                                          \
         else                                                                  \
-            drive = &dev->drives[1];                                          \
-    } while (0)
+            drive = &dev->drives[1];
 
 static void
 esdi_callback(void *priv)
@@ -357,19 +399,21 @@ esdi_callback(void *priv)
     int            val;
     double         cmd_time = 0.0;
 
-    esdi_mca_set_callback(dev, 0);
-
     /* If we are returning from a RESET, handle this first. */
     if (dev->in_reset) {
+        esdi_mca_log("ESDI reset.\n");
         dev->in_reset   = 0;
-        dev->status     = STATUS_IRQ;
+        dev->status     = STATUS_IRQ | STATUS_TRANSFER_REQ | STATUS_STATUS_OUT_FULL;
+        dev->status_len = 1; /*ToDo: better implementation for Xenix?*/
+        dev->status_data[0] = STATUS_LEN(1) | ATTN_HOST_ADAPTER;
         dev->irq_status = IRQ_HOST_ADAPTER | IRQ_RESET_COMPLETE;
-
         return;
     }
 
+    esdi_mca_log("Command=%02x.\n", dev->command);
     switch (dev->command) {
         case CMD_READ:
+        case 0x15:
             ESDI_DRIVE_ONLY();
 
             if (!drive->present) {
@@ -379,7 +423,8 @@ esdi_callback(void *priv)
 
             switch (dev->cmd_state) {
                 case 0:
-                    dev->rba = (dev->cmd_data[2] | (dev->cmd_data[3] << 16)) & 0x0fffffff;
+                    if (dev->command == CMD_READ)
+                        dev->rba = (dev->cmd_data[2] | (dev->cmd_data[3] << 16)) & 0x0fffffff;
 
                     dev->sector_pos   = 0;
                     dev->sector_count = dev->cmd_data[1];
@@ -409,7 +454,10 @@ esdi_callback(void *priv)
                         if (!dev->data_pos) {
                             if (dev->rba >= drive->sectors)
                                 fatal("Read past end of drive\n");
-                            hdd_image_read(drive->hdd_num, dev->rba, 1, (uint8_t *) dev->data);
+                            if (hdd_image_read(drive->hdd_num, dev->rba, 1, (uint8_t *) dev->data) < 0) {
+                                defective_block(dev);
+                                return;
+                            }
                             cmd_time += hdd_timing_read(&hdd[drive->hdd_num], dev->rba, 1);
                             cmd_time += esdi_mca_get_xfer_time(dev, 1);
                         }
@@ -498,7 +546,10 @@ esdi_callback(void *priv)
 
                         if (dev->rba >= drive->sectors)
                             fatal("Write past end of drive\n");
-                        hdd_image_write(drive->hdd_num, dev->rba, 1, (uint8_t *) dev->data);
+                        if (hdd_image_write(drive->hdd_num, dev->rba, 1, (uint8_t *) dev->data) < 0) {
+                            defective_block(dev);
+                            return;
+                        }
                         cmd_time += hdd_timing_write(&hdd[drive->hdd_num], dev->rba, 1);
                         cmd_time += esdi_mca_get_xfer_time(dev, 1);
                         dev->rba++;
@@ -594,6 +645,35 @@ esdi_callback(void *priv)
             }
             break;
 
+        case CMD_PARK_HEADS:
+            ESDI_DRIVE_ONLY();
+
+            if (!drive->present) {
+                device_not_present(dev);
+                return;
+            }
+
+            switch (dev->cmd_state) {
+                case 0:
+                    dev->rba = 0x00000000;
+                    cmd_time = hdd_seek_get_time(&hdd[drive->hdd_num], dev->rba, HDD_OP_SEEK, 0, 0.0);
+                    esdi_mca_set_callback(dev, ESDI_TIME + cmd_time);
+                    dev->cmd_state = 1;
+                    break;
+
+                case 1:
+                    complete_command_status(dev);
+                    dev->status          = STATUS_IRQ | STATUS_STATUS_OUT_FULL;
+                    dev->irq_status      = dev->cmd_dev | IRQ_CMD_COMPLETE_SUCCESS;
+                    dev->irq_in_progress = 1;
+                    set_irq(dev);
+                    break;
+
+                default:
+                    break;
+            }
+            break;
+
         case CMD_GET_DEV_STATUS:
             ESDI_DRIVE_ONLY();
 
@@ -621,38 +701,56 @@ esdi_callback(void *priv)
             dev->irq_in_progress = 1;
             set_irq(dev);
             ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+            ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
             break;
 
         case CMD_GET_DEV_CONFIG:
-            ESDI_DRIVE_ONLY();
-
-            if (!drive->present) {
-                device_not_present(dev);
-                return;
+            if (dev->cmd_dev == ATTN_HOST_ADAPTER)
+            {
+                if ((dev->status & STATUS_IRQ) || dev->irq_in_progress)
+                    fatal("IRQ in progress %02x %i\n", dev->status, dev->irq_in_progress);
+                /* INT 13, AX=1C0B - ESDI FIXED DISK - GET ADAPTER CONFIGURATION */
+                /* The PS/55 will test sector buffer after this request is done. */
+                dev->status_len = 6;
+                dev->status_data[0] = CMD_GET_DEV_CONFIG | STATUS_LEN(6) | STATUS_DEVICE_HOST_ADAPTER;
+                dev->status_data[1] = 0;
+                dev->status_data[2] = 0;
+                /* bit 15-12: chip revision = 0011b, bit 11-8: sector buffer size = n * 256 bytes (n must be < 6) */
+                dev->status_data[3] = 0x3200;
+                dev->status_data[4] = 0;
+                dev->status_data[5] = 0;
             }
+            else
+            {
+                ESDI_DRIVE_ONLY();
+                if (!drive->present) {
+                    device_not_present(dev);
+                    return;
+                }
 
-            if ((dev->status & STATUS_IRQ) || dev->irq_in_progress)
-                fatal("IRQ in progress %02x %i\n", dev->status, dev->irq_in_progress);
-
-            dev->status_len     = 6;
-            dev->status_data[0] = CMD_GET_DEV_CONFIG | STATUS_LEN(6) | STATUS_DEVICE_HOST_ADAPTER;
-            dev->status_data[1] = 0x10; /*Zero defect*/
-            dev->status_data[2] = drive->sectors & 0xffff;
-            dev->status_data[3] = drive->sectors >> 16;
-            dev->status_data[4] = drive->tracks;
-            dev->status_data[5] = drive->hpc | (drive->spt << 16);
+                if ((dev->status & STATUS_IRQ) || dev->irq_in_progress)
+                    fatal("IRQ in progress %02x %i\n", dev->status, dev->irq_in_progress);
 
+                dev->status_len = 6;
+                dev->status_data[0] = CMD_GET_DEV_CONFIG | STATUS_LEN(6) | STATUS_DEVICE_HOST_ADAPTER;
+                dev->status_data[1] = 0x10; /*Zero defect*/
+                dev->status_data[2] = drive->sectors & 0xffff;
+                dev->status_data[3] = drive->sectors >> 16;
+                dev->status_data[4] = drive->tracks;
+                dev->status_data[5] = drive->hpc | (drive->spt << 16);
+            }
             esdi_mca_log("CMD_GET_DEV_CONFIG %i  %04x %04x %04x %04x %04x %04x\n",
-                         drive->sectors,
-                         dev->status_data[0], dev->status_data[1],
-                         dev->status_data[2], dev->status_data[3],
-                         dev->status_data[4], dev->status_data[5]);
+                drive->sectors,
+                dev->status_data[0], dev->status_data[1],
+                dev->status_data[2], dev->status_data[3],
+                dev->status_data[4], dev->status_data[5]);
 
-            dev->status          = STATUS_IRQ | STATUS_STATUS_OUT_FULL;
-            dev->irq_status      = dev->cmd_dev | IRQ_CMD_COMPLETE_SUCCESS;
+            dev->status = STATUS_IRQ | STATUS_STATUS_OUT_FULL;
+            dev->irq_status = dev->cmd_dev | IRQ_CMD_COMPLETE_SUCCESS;
             dev->irq_in_progress = 1;
             set_irq(dev);
             ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+            ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
             break;
 
         case CMD_GET_POS_INFO:
@@ -663,7 +761,7 @@ esdi_callback(void *priv)
 
             dev->status_len     = 5;
             dev->status_data[0] = CMD_GET_POS_INFO | STATUS_LEN(5) | STATUS_DEVICE_HOST_ADAPTER;
-            dev->status_data[1] = 0xffdd; /*MCA ID*/
+            dev->status_data[1] = dev->pos_regs[1] | (dev->pos_regs[0] << 8); /*MCA ID*/
             dev->status_data[2] = dev->pos_regs[3] | (dev->pos_regs[2] << 8);
             dev->status_data[3] = 0xff;
             dev->status_data[4] = 0xff;
@@ -673,6 +771,7 @@ esdi_callback(void *priv)
             dev->irq_in_progress = 1;
             set_irq(dev);
             ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+            ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
             break;
 
         case 0x10:
@@ -726,6 +825,7 @@ esdi_callback(void *priv)
                     dev->irq_in_progress = 1;
                     set_irq(dev);
                     ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
+                    ui_sb_update_icon_write(SB_HDD | HDD_BUS_ESDI, 0);
                     break;
 
                 default:
@@ -820,14 +920,12 @@ esdi_callback(void *priv)
 
             switch (dev->cmd_state) {
                 case 0:
-                    dev->rba = (dev->cmd_data[2] | (dev->cmd_data[3] << 16)) & 0x0fffffff;
+                    dev->rba = hdd_image_get_last_sector(drive->hdd_num);
 
-                    dev->sector_count = dev->cmd_data[1];
-
-                    if ((dev->rba + dev->sector_count) > hdd_image_get_last_sector(drive->hdd_num)) {
-                        rba_out_of_range(dev);
-                        return;
-                    }
+                    if (dev->command == CMD_FORMAT_UNIT)
+                        dev->sector_count = dev->cmd_data[1];
+                    else
+                        dev->sector_count = 0;
 
                     dev->status          = STATUS_IRQ | STATUS_CMD_IN_PROGRESS | STATUS_TRANSFER_REQ;
                     dev->irq_status      = dev->cmd_dev | IRQ_DATA_TRANSFER_READY;
@@ -844,7 +942,8 @@ esdi_callback(void *priv)
                         return;
                     }
 
-                    hdd_image_zero(drive->hdd_num, dev->rba, dev->sector_count);
+                    if (dev->command == CMD_FORMAT_UNIT)
+                        hdd_image_zero(drive->hdd_num, 0, hdd_image_get_last_sector(drive->hdd_num) + 1);
 
                     dev->status    = STATUS_CMD_IN_PROGRESS;
                     dev->cmd_state = 2;
@@ -873,7 +972,7 @@ static uint8_t
 esdi_read(uint16_t port, void *priv)
 {
     esdi_t *dev = (esdi_t *) priv;
-    uint8_t ret = 0xff;
+    uint8_t ret = 0x00;
 
     switch (port & 7) {
         case 2: /*Basic status register*/
@@ -890,6 +989,7 @@ esdi_read(uint16_t port, void *priv)
             break;
     }
 
+    esdi_mca_log("ESDI: rr(%04x, %02x)\n", port & 7, ret);
     return ret;
 }
 
@@ -897,6 +997,7 @@ static void
 esdi_write(uint16_t port, uint8_t val, void *priv)
 {
     esdi_t *dev = (esdi_t *) priv;
+    uint8_t old;
 
     esdi_mca_log("ESDI: wr(%04x, %02x)\n", port & 7, val);
 
@@ -906,11 +1007,14 @@ esdi_write(uint16_t port, uint8_t val, void *priv)
                 dev->in_reset = 1;
                 esdi_mca_set_callback(dev, ESDI_TIME * 50);
                 dev->status = STATUS_BUSY;
+            } else if (!(dev->basic_ctrl & CTRL_RESET) && (val & CTRL_RESET)) {
+                esdi_mca_set_callback(dev, 0.0);
+                dev->status = STATUS_BUSY;
             }
+            old = dev->basic_ctrl;
             dev->basic_ctrl = val;
-
-            if (!(dev->basic_ctrl & CTRL_IRQ_ENA))
-                picintc(1 << 14);
+            if ((val & CTRL_IRQ_ENA) && !(old & CTRL_IRQ_ENA))
+                update_irq(dev);
             break;
 
         case 3: /*Attention register*/
@@ -945,6 +1049,7 @@ esdi_write(uint16_t port, uint8_t val, void *priv)
                     break;
 
                 case ATTN_DEVICE_0:
+                    esdi_mca_log("ATTN Device 0.\n");
                     switch (val & ATTN_REQ_MASK) {
                         case ATTN_CMD_REQ:
                             if (dev->cmd_req_in_progress)
@@ -957,6 +1062,7 @@ esdi_write(uint16_t port, uint8_t val, void *priv)
                             break;
 
                         case ATTN_EOI:
+                            esdi_mca_log("EOI.\n");
                             dev->irq_in_progress = 0;
                             dev->status &= ~STATUS_IRQ;
                             clear_irq(dev);
@@ -1008,8 +1114,10 @@ esdi_readw(uint16_t port, void *priv)
 
     switch (port & 7) {
         case 0: /*Status Interface Register*/
-            if (dev->status_pos >= dev->status_len)
+            if (dev->status_pos >= dev->status_len) {
+                esdi_mca_log("esdi_readw port=%04x, ret=0000 (pos=%d, len=%d).\n", port, dev->status_pos, dev->status_len);
                 return 0;
+            }
             ret = dev->status_data[dev->status_pos++];
             if (dev->status_pos >= dev->status_len) {
                 dev->status &= ~STATUS_STATUS_OUT_FULL;
@@ -1021,6 +1129,7 @@ esdi_readw(uint16_t port, void *priv)
             fatal("esdi_readw port=%04x\n", port);
     }
 
+    esdi_mca_log("esdi_readw port=%04x, ret=%04x.\n", port, ret);
     return ret;
 }
 
@@ -1112,15 +1221,40 @@ esdi_mca_write(int port, uint8_t val, void *priv)
             break;
     }
 
+    if (!(dev->pos_regs[3] & 8)) {
+        switch (dev->pos_regs[3] & 7) {
+            case 2:
+                dev->bios = 0xc8000;
+                break;
+            case 3:
+                dev->bios = 0xcc000;
+                break;
+            case 4:
+                dev->bios = 0xd0000;
+                break;
+            case 5:
+                dev->bios = 0xd4000;
+                break;
+            case 6:
+                dev->bios = 0xd8000;
+                break;
+            case 7:
+                dev->bios = 0xdc000;
+                break;
+            default:
+                break;
+        }
+    } else
+        dev->bios = 0;
+
     if (dev->pos_regs[2] & 1) {
         io_sethandler(ESDI_IOADDR_PRI, 8,
                       esdi_read, esdi_readw, NULL,
                       esdi_write, esdi_writew, NULL, dev);
 
-        if (!(dev->pos_regs[3] & 8)) {
+        if (dev->bios) {
             mem_mapping_enable(&dev->bios_rom.mapping);
-            mem_mapping_set_addr(&dev->bios_rom.mapping,
-                                 ((dev->pos_regs[3] & 7) * 0x4000) + 0xc0000, 0x4000);
+            mem_mapping_set_addr(&dev->bios_rom.mapping, dev->bios, 0x4000);
         }
 
         /* Say hello. */
@@ -1129,6 +1263,62 @@ esdi_mca_write(int port, uint8_t val, void *priv)
     }
 }
 
+static void
+esdi_integrated_mca_write(int port, uint8_t val, void* priv)
+{
+    esdi_t* dev = (esdi_t*)priv;
+
+    esdi_mca_log("ESDI: mcawr(%04x, %02x)  pos[2]=%02x pos[3]=%02x\n",
+        port, val, dev->pos_regs[2], dev->pos_regs[3]);
+
+    if (port < 0x102)
+        return;
+
+    /* Save the new value. */
+    dev->pos_regs[port & 7] = val;
+
+    io_removehandler(ESDI_IOADDR_PRI, 8,
+        esdi_read, esdi_readw, NULL,
+        esdi_write, esdi_writew, NULL, dev);
+
+    switch (dev->pos_regs[2] & 0x3c) {
+    case 0x14:
+        dev->dma = 5;
+        break;
+    case 0x18:
+        dev->dma = 6;
+        break;
+    case 0x1c:
+        dev->dma = 7;
+        break;
+    case 0x00:
+        dev->dma = 0;
+        break;
+    case 0x04:
+        dev->dma = 1;
+        break;
+    case 0x0c:
+        dev->dma = 3;
+        break;
+    case 0x10:
+        dev->dma = 4;
+        break;
+
+    default:
+        break;
+    }
+
+    if (dev->pos_regs[2] & 1) {
+        io_sethandler(ESDI_IOADDR_PRI, 8,
+            esdi_read, esdi_readw, NULL,
+            esdi_write, esdi_writew, NULL, dev);
+
+        /* Say hello. */
+        esdi_mca_log("ESDI: I/O=3510, IRQ=14, DMA=%d\n",
+            dev->dma);
+    }
+}
+
 static uint8_t
 esdi_mca_feedb(void *priv)
 {
@@ -1137,6 +1327,16 @@ esdi_mca_feedb(void *priv)
     return (dev->pos_regs[2] & 1);
 }
 
+static void esdi_reset(void* priv)
+{
+    esdi_t* dev = (esdi_t*)priv;
+    if (!dev->in_reset) {
+        dev->in_reset = 1;
+        esdi_mca_set_callback(dev, ESDI_TIME * 50);
+        dev->status = STATUS_BUSY;
+    }
+}
+
 static void *
 esdi_init(UNUSED(const device_t *info))
 {
@@ -1145,23 +1345,24 @@ esdi_init(UNUSED(const device_t *info))
     uint8_t  c;
     uint8_t  i;
 
-    dev = malloc(sizeof(esdi_t));
+    dev = calloc(1, sizeof(esdi_t));
     if (dev == NULL)
         return (NULL);
-    memset(dev, 0x00, sizeof(esdi_t));
 
     /* Mark as unconfigured. */
     dev->irq_status = 0xff;
 
-    rom_init_interleaved(&dev->bios_rom,
-                         BIOS_FILE_H, BIOS_FILE_L,
-                         0xc8000, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL);
-    mem_mapping_disable(&dev->bios_rom.mapping);
+    if (info->local == ESDI_IS_ADAPTER) {
+        rom_init_interleaved(&dev->bios_rom,
+            BIOS_FILE_H, BIOS_FILE_L,
+            0xc8000, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL);
+        mem_mapping_disable(&dev->bios_rom.mapping);
+    }
 
     dev->drives[0].present = dev->drives[1].present = 0;
 
     for (c = 0, i = 0; i < HDD_NUM; i++) {
-        if ((hdd[i].bus == HDD_BUS_ESDI) && (hdd[i].esdi_channel < ESDI_NUM)) {
+        if ((hdd[i].bus_type == HDD_BUS_ESDI) && (hdd[i].esdi_channel < ESDI_NUM)) {
             /* This is an ESDI drive. */
             drive = &dev->drives[hdd[i].esdi_channel];
 
@@ -1178,7 +1379,7 @@ esdi_init(UNUSED(const device_t *info))
             drive->spt     = hdd[i].spt;
             drive->hpc     = hdd[i].hpc;
             drive->tracks  = hdd[i].tracks;
-            drive->sectors = hdd_image_get_last_sector(i) + 1;
+            drive->sectors = hdd_image_get_last_sector(i);
             drive->hdd_num = i;
 
             /* Mark drive as present. */
@@ -1189,12 +1390,25 @@ esdi_init(UNUSED(const device_t *info))
             break;
     }
 
-    /* Set the MCA ID for this controller, 0xFFDD. */
-    dev->pos_regs[0] = 0xff;
-    dev->pos_regs[1] = 0xdd;
+    /* Set the MCA ID for this controller. */
+    if (info->local == ESDI_IS_ADAPTER) {
+        dev->pos_regs[0] = 0xff;
+        dev->pos_regs[1] = 0xdd;
+    } else if (info->local == ESDI_IS_INTEGRATED) {
+        dev->pos_regs[0] = 0x9f;
+        dev->pos_regs[1] = 0xdf;
+    }
 
     /* Enable the device. */
-    mca_add(esdi_mca_read, esdi_mca_write, esdi_mca_feedb, NULL, dev);
+    if (info->local == ESDI_IS_INTEGRATED) {
+        /* The slot number of this controller is fixed by the planar. IBM PS/55 5551-T assigns it #5. */
+        int slotno = device_get_config_int("in_esdi_slot");
+        if (slotno)
+            mca_add_to_slot(esdi_mca_read, esdi_integrated_mca_write, esdi_mca_feedb, esdi_reset, dev, slotno - 1);
+        else
+            mca_add(esdi_mca_read, esdi_integrated_mca_write, esdi_mca_feedb, esdi_reset, dev);
+    } else
+        mca_add(esdi_mca_read, esdi_mca_write, esdi_mca_feedb, NULL, dev);
 
     /* Mark for a reset. */
     dev->in_reset = 1;
@@ -1234,12 +1448,61 @@ const device_t esdi_ps2_device = {
     .name          = "IBM PS/2 ESDI Fixed Disk Adapter (MCA)",
     .internal_name = "esdi_mca",
     .flags         = DEVICE_MCA,
-    .local         = 0,
+    .local         = ESDI_IS_ADAPTER,
     .init          = esdi_init,
     .close         = esdi_close,
     .reset         = NULL,
-    { .available = esdi_available },
+    .available     = esdi_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
 };
+
+static device_config_t
+    esdi_integrated_config[] = {
+          {
+           .name        = "in_esdi_slot",
+           .description = "Slot #",
+           .type        = CONFIG_SELECTION,
+           .selection   = {
+                { .description = "Auto", .value = 0 },
+                { .description = "1", .value = 1 },
+                { .description = "2", .value = 2 },
+                { .description = "3", .value = 3 },
+                { .description = "4", .value = 4 },
+                { .description = "5", .value = 5 },
+                { .description = "6", .value = 6 },
+                { .description = "7", .value = 7 },
+                { .description = "8", .value = 8 }
+            },
+           .default_int = 0
+        },
+          { .type = -1 }
+};
+
+/*
+Device for an IBM DBA (Direct Bus Attachment) hard disk.
+The Disk BIOS is included in the System ROM.
+Some models have an exclusive channel slot for the DBA hard disk.
+Following IBM machines are supported:
+  * PS/2 model 55SX
+  * PS/2 model 65SX
+  * PS/2 model 70 type 3 (Slot #4)
+  * PS/2 model 70 type 4 (Slot #4)
+  * PS/55 model 5550-T (Slot #5)
+  * PS/55 model 5550-V (Slot #5)
+*/
+const device_t
+esdi_integrated_device = {
+    .name = "IBM Integrated Fixed Disk and Controller (MCA)",
+    .internal_name = "esdi_integrated_mca",
+    .flags = DEVICE_MCA,
+    .local = ESDI_IS_INTEGRATED,
+    .init = esdi_init,
+    .close = esdi_close,
+    .reset = esdi_reset,
+    .available = NULL,
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = esdi_integrated_config
+};
diff --git a/src/disk/hdc_ide.c b/src/disk/hdc_ide.c
index 39031138f..b034fa3e3 100644
--- a/src/disk/hdc_ide.c
+++ b/src/disk/hdc_ide.c
@@ -30,8 +30,10 @@
 #include "cpu.h"
 #include <86box/machine.h>
 #include <86box/io.h>
+#include <86box/mca.h>
 #include <86box/mem.h>
 #include <86box/pic.h>
+#include <86box/rom.h>
 #include <86box/pci.h>
 #include <86box/rom.h>
 #include <86box/timer.h>
@@ -44,7 +46,7 @@
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
 #include <86box/hdd.h>
-#include <86box/zip.h>
+#include <86box/rdisk.h>
 #include <86box/version.h>
 
 /* Bits of 'atastat' */
@@ -89,15 +91,15 @@
 #define WIN_SET_MULTIPLE_MODE          0xc6
 #define WIN_READ_DMA                   0xc8
 #define WIN_READ_DMA_ALT               0xc9
-#define WIN_WRITE_DMA                  0xcA
-#define WIN_WRITE_DMA_ALT              0xcB
+#define WIN_WRITE_DMA                  0xca
+#define WIN_WRITE_DMA_ALT              0xcb
 #define WIN_STANDBYNOW1                0xe0
 #define WIN_IDLENOW1                   0xe1
 #define WIN_SETIDLE1                   0xe3
 #define WIN_CHECKPOWERMODE1            0xe5
 #define WIN_SLEEP1                     0xe6
-#define WIN_IDENTIFY                   0xeC /* Ask drive to identify itself */
-#define WIN_SET_FEATURES               0xeF
+#define WIN_IDENTIFY                   0xec /* Ask drive to identify itself */
+#define WIN_SET_FEATURES               0xef
 #define WIN_READ_NATIVE_MAX            0xf8
 
 #define FEATURE_SET_TRANSFER_MODE      0x03
@@ -112,8 +114,10 @@
 
 #define IDE_ATAPI_IS_EARLY             ide->sc->pad0
 
+#define ROM_PATH_MCIDE                 "roms/hdd/xtide/ide_ps2 R1.1.bin"
+
 typedef struct ide_bm_t {
-    int (*dma)(uint8_t *data, int transfer_length, int out, void *priv);
+    int (*dma)(uint8_t *data, int transfer_length, int total_length, int out, void *priv);
     void (*set_irq)(uint8_t status, void *priv);
     void *priv;
 } ide_bm_t;
@@ -135,7 +139,13 @@ typedef struct ide_board_t {
     ide_bm_t  *bm;
 } ide_board_t;
 
-ide_board_t *ide_boards[IDE_BUS_MAX];
+typedef struct mcide_t {
+    uint8_t    pos_regs[8];
+    uint32_t   bios_addr;
+    rom_t bios_rom;
+} mcide_t;
+
+ide_board_t *ide_boards[IDE_BUS_MAX] = { 0 };
 
 static uint8_t ide_ter_pnp_rom[] = {
     /* BOX0001, serial 0, dummy checksum (filled in by isapnp_add_card) */
@@ -224,9 +234,7 @@ static uint8_t ide_qua_pnp_rom[] = {
     0x79, 0x00
 };
 
-ide_t *ide_drives[IDE_NUM];
-int    ide_ter_enabled = 0;
-int    ide_qua_enabled = 0;
+ide_t *ide_drives[IDE_NUM] = { 0 };
 
 static void ide_atapi_callback(ide_t *ide);
 static void ide_callback(void *priv);
@@ -367,7 +375,7 @@ ide_atapi_get_period(uint8_t channel)
 
     ide_log("ide_atapi_get_period(%i)\n", channel);
 
-    if (!ide) {
+    if (ide == NULL) {
         ide_log("Get period failed\n");
         return -1.0;
     }
@@ -376,7 +384,7 @@ ide_atapi_get_period(uint8_t channel)
 }
 
 static void
-ide_irq_update(ide_board_t *dev, int log)
+ide_irq_update(ide_board_t *dev, UNUSED(int log))
 {
     ide_t *ide;
     uint8_t set;
@@ -401,7 +409,7 @@ ide_irq_update(ide_board_t *dev, int log)
 void
 ide_irq(ide_t *ide, int set, int log)
 {
-    if (!ide_boards[ide->board])
+    if (ide_boards[ide->board] == NULL)
         return;
 
 #if defined(ENABLE_IDE_LOG) && (ENABLE_IDE_LOG == 2)
@@ -427,7 +435,7 @@ ide_irq(ide_t *ide, int set, int log)
  *            this length will be padded with spaces.
  */
 void
-ide_padstr(char *str, const char *src, int len)
+ide_padstr(char *str, const char *src, const int len)
 {
     int v;
 
@@ -461,37 +469,39 @@ ide_padstr8(uint8_t *buf, int buf_size, const char *src)
 }
 
 static int
-ide_get_max(ide_t *ide, int type)
+ide_is_ata4(const ide_board_t *board)
 {
-    int ret = -1;
-    ide_bm_t *bm = ide_boards[ide->board]->bm;
-    int ata_4 = (!ide_boards[ide->board]->force_ata3 && (bm != NULL));
-    int max[2][4] = { { 0, -1, -1, -1 }, { 4, 2, 2, 5 } };
+    const ide_bm_t *bm = board->bm;
+
+    return (!board->force_ata3 && (bm != NULL));
+}
+
+static int
+ide_get_max(const ide_t *ide, const int type)
+{
+    const int       ata_4     = ide_is_ata4(ide_boards[ide->board]);
+    const int       max[2][4] = { { 3, -1, -1, -1 }, { 4, 2, 2, 5 } };
+    int             ret;
 
     if (ide->type == IDE_ATAPI)
-        ret = ide->get_max(!IDE_ATAPI_IS_EARLY && ata_4, type);
-    else if (type <= TYPE_UDMA)
-        ret = max[ata_4][type];
+        ret = ide->get_max(ide, !IDE_ATAPI_IS_EARLY && ata_4, type);
     else
-        fatal("Unknown transfer type: %i\n", type);
+        ret = max[ata_4][type];
 
     return ret;
 }
 
 static int
-ide_get_timings(ide_t *ide, int type)
+ide_get_timings(const ide_t *ide, const int type)
 {
-    int ret = 0;
-    ide_bm_t *bm = ide_boards[ide->board]->bm;
-    int ata_4 = (!ide_boards[ide->board]->force_ata3 && (bm != NULL));
-    int timings[2][3] = { { 0, 0, 0 }, { 120, 120, 0 } };
+    const int       ata_4         = ide_is_ata4(ide_boards[ide->board]);
+    const int       timings[2][3] = { { 0, 240, 180 }, { 120, 120, 120 } };
+    int             ret;
 
     if (ide->type == IDE_ATAPI)
-        ret = ide->get_timings(!IDE_ATAPI_IS_EARLY && ata_4, type);
-    else if (type <= TIMINGS_PIO_FC)
-        ret = timings[ata_4][type];
+        ret = ide->get_timings(ide, !IDE_ATAPI_IS_EARLY && ata_4, type);
     else
-        fatal("Unknown transfer type: %i\n", type);
+        ret = timings[ata_4][type];
 
     return ret;
 }
@@ -500,30 +510,33 @@ ide_get_timings(ide_t *ide, int type)
  * Fill in ide->buffer with the output of the "IDENTIFY DEVICE" command
  */
 static void
-ide_hd_identify(ide_t *ide)
+ide_hd_identify(const ide_t *ide)
 {
     char device_identify[9] = { '8', '6', 'B', '_', 'H', 'D', '0', '0', 0 };
-    ide_bm_t *bm = ide_boards[ide->board]->bm;
-
-    uint32_t d_hpc;
-    uint32_t d_spt;
-    uint32_t d_tracks;
-    uint64_t full_size = (((uint64_t) hdd[ide->hdd_num].tracks) *
-                         hdd[ide->hdd_num].hpc * hdd[ide->hdd_num].spt);
+    const ide_bm_t *bm      = ide_boards[ide->board]->bm;
+    uint64_t full_size      = (((uint64_t) hdd[ide->hdd_num].tracks) *
+                              hdd[ide->hdd_num].hpc * hdd[ide->hdd_num].spt);
 
     device_identify[6] = (ide->hdd_num / 10) + 0x30;
     device_identify[7] = (ide->hdd_num % 10) + 0x30;
     ide_log("IDE Identify: %s\n", device_identify);
 
-    d_spt = ide->spt;
-    if (ide->hpc <= 16) {
+    uint32_t d_hpc    = ide->hpc;
+    uint32_t d_spt    = ide->spt;
+    uint32_t d_tracks;
+
+    if ((ide->hpc <= 16) && (ide->spt <= 63)) {
         /* HPC <= 16, report as needed. */
         d_tracks = ide->tracks;
-        d_hpc    = ide->hpc;
     } else {
         /* HPC > 16, convert to 16 HPC. */
-        d_hpc    = 16;
-        d_tracks = (ide->tracks * ide->hpc) / 16;
+        if (ide->hpc > 16)
+            d_hpc = 16;
+        if (ide->spt > 63)
+            d_spt = 63;
+        d_tracks = (ide->tracks * ide->hpc * ide->spt) / (16 * 63);
+        if (d_tracks > 16383)
+            d_tracks = 16383;
     }
 
     /* Specify default CHS translation */
@@ -543,7 +556,10 @@ ide_hd_identify(ide_t *ide)
     /* Firmware */
     ide_padstr((char *) (ide->buffer + 23), EMU_VERSION_EX, 8);
     /* Model */
-    ide_padstr((char *) (ide->buffer + 27), device_identify, 40);
+    if (hdd[ide->hdd_num].model)
+        ide_padstr((char *) (ide->buffer + 27), hdd[ide->hdd_num].model, 40);
+    else
+        ide_padstr((char *) (ide->buffer + 27), device_identify, 40);
     /* Fixed drive */
     ide->buffer[0]  = (1 << 6);
     /* Buffer type */
@@ -569,7 +585,7 @@ ide_hd_identify(ide_t *ide)
          */
         ide->buffer[53] = 1;
 
-        if (ide->cfg_spt != 0) {
+        if (ide->params_specified) {
             ide->buffer[54] = (full_size / ide->cfg_hpc) / ide->cfg_spt;
             ide->buffer[55] = ide->cfg_hpc;
             ide->buffer[56] = ide->cfg_spt;
@@ -600,9 +616,12 @@ ide_hd_identify(ide_t *ide)
     if (!ide_boards[ide->board]->force_ata3 && (bm != NULL)) {
         ide->buffer[80] = 0x7e; /*ATA-1 to ATA-6 supported*/
         ide->buffer[81] = 0x19; /*ATA-6 revision 3a supported*/
-    } else {
+    } else
         ide->buffer[80] = 0x0e; /*ATA-1 to ATA-3 supported*/
-    }
+
+    ide->buffer[83] = ide->buffer[84] = 0x4000;
+    ide->buffer[86] = 0x0000;
+    ide->buffer[87] = 0x4000;
 }
 
 static void
@@ -622,7 +641,7 @@ ide_identify(ide_t *ide)
     memset(ide->buffer, 0, 512);
 
     if (ide->type == IDE_ATAPI)
-        ide->identify(ide, !IDE_ATAPI_IS_EARLY && !ide_boards[ide->board]->force_ata3 && (bm != NULL));
+        ide->identify((const ide_t *) ide, !IDE_ATAPI_IS_EARLY && !ide_boards[ide->board]->force_ata3 && (bm != NULL));
     else if (ide->type == IDE_HDD)
         ide_hd_identify(ide);
     else {
@@ -647,8 +666,9 @@ ide_identify(ide_t *ide)
     ide->buffer[88]                   = 0x0000;
 
     if (max_pio >= 3) {
+        ide->buffer[49] |= 0x0c00;
         ide->buffer[53] |= 0x0002;
-        ide->buffer[67] = ide_get_timings(ide, TIMINGS_PIO);
+        ide->buffer[67] = ide_get_timings(ide, TIMINGS_PIO_FC);
         ide->buffer[68] = ide_get_timings(ide, TIMINGS_PIO_FC);
         for (i = 3; i <= max_pio; i++)
             ide->buffer[64] |= (1 << (i - 3));
@@ -691,12 +711,8 @@ ide_identify(ide_t *ide)
     }
 
     if (ide->mdma_mode != -1) {
-        d = (ide->mdma_mode & 0xff);
-        d <<= 8;
-        if ((ide->mdma_mode & 0x300) == 0x000) {
-            if ((ide->mdma_mode & 0xff) >= 3)
-                ide->buffer[64] |= d;
-        } else if ((ide->mdma_mode & 0x300) == 0x100)
+        d = (ide->mdma_mode & 0xff) << 8;
+        if ((ide->mdma_mode & 0x300) == 0x100)
             ide->buffer[62] |= d;
         else if ((ide->mdma_mode & 0x300) == 0x200)
             ide->buffer[63] |= d;
@@ -728,6 +744,22 @@ ide_get_sector(ide_t *ide)
     }
 }
 
+static off64_t
+ide_get_sector_format(ide_t *ide)
+{
+    uint32_t heads;
+    uint32_t sectors;
+
+    if (ide->tf->lba)
+        return (off64_t) ide->lba_addr;
+    else {
+        heads   = ide->cfg_hpc;
+        sectors = ide->cfg_spt;
+
+        return ((((off64_t) ide->tf->cylinder * heads) + (off64_t) ide->tf->head) * sectors);
+    }
+}
+
 /**
  * Move to the next sector using CHS addressing
  */
@@ -794,6 +826,7 @@ ide_set_features(ide_t *ide)
     int     mode;
     int     submode;
     int     max;
+    int     max_pio_submode;
 
     features      = ide->tf->cylprecomp;
     features_data = ide->tf->secount;
@@ -809,9 +842,10 @@ ide_set_features(ide_t *ide)
 
             switch (mode) {
                 case 0x00: /* PIO default */
-                    if (submode != 0)
+                    max             = ide_get_max(ide, TYPE_PIO);
+                    max_pio_submode = (max >= 3) ? 1 : 0;
+                    if (submode > max_pio_submode)
                         return 0;
-                    max            = ide_get_max(ide, TYPE_PIO);
                     ide->mdma_mode = (1 << max);
                     ide_log("IDE %02X: Setting DPIO mode: %02X, %08X\n", ide->channel,
                             submode, ide->mdma_mode);
@@ -936,7 +970,7 @@ ide_atapi_attach(ide_t *ide)
     ide->type = IDE_ATAPI;
     ide_allocate_buffer(ide);
     ide_set_signature(ide);
-    ide->mdma_mode = (1 << ide->get_max(!IDE_ATAPI_IS_EARLY &&
+    ide->mdma_mode = (1 << ide->get_max((const ide_t *) ide, !IDE_ATAPI_IS_EARLY &&
                       !ide_boards[ide->board]->force_ata3 && (bm != NULL), TYPE_PIO));
     ide->tf->error = 1;
     ide->cfg_spt = ide->cfg_hpc = 0;
@@ -947,7 +981,7 @@ ide_atapi_attach(ide_t *ide)
 void
 ide_set_callback(ide_t *ide, double callback)
 {
-    if (!ide) {
+    if (ide == NULL) {
         ide_log("ide_set_callback(NULL): Set callback failed\n");
         return;
     }
@@ -967,7 +1001,7 @@ ide_set_board_callback(uint8_t board, double callback)
 
     ide_log("ide_set_board_callback(%i)\n", board);
 
-    if (!dev) {
+    if (dev == NULL) {
         ide_log("Set board callback failed\n");
         return;
     }
@@ -991,9 +1025,8 @@ ide_atapi_command_bus(ide_t *ide)
 static void
 ide_atapi_callback(ide_t *ide)
 {
-    int out;
-    int ret = 0;
-    ide_bm_t *bm = ide_boards[ide->board]->bm;
+    static int  ret = 0;
+    ide_bm_t   *bm  = ide_boards[ide->board]->bm;
 #ifdef ENABLE_IDE_LOG
     char *phases[7] = { "Idle", "Command", "Data in", "Data out", "Data in DMA", "Data out DMA",
                      "Complete" };
@@ -1019,14 +1052,17 @@ ide_atapi_callback(ide_t *ide)
 
     switch (ide->sc->packet_status) {
         default:
+            ret              = 0;
             break;
 
         case PHASE_IDLE:
+            ret              = 0;
             ide->tf->pos     = 0;
             ide->tf->phase   = 1;
             ide->tf->atastat = READY_STAT | DRQ_STAT | (ide->tf->atastat & ERR_STAT);
             break;
         case PHASE_COMMAND:
+            ret              = 1;
             ide->tf->atastat = BUSY_STAT | (ide->tf->atastat & ERR_STAT);
             if (ide->packet_command) {
                 ide->packet_command(ide->sc, ide->sc->atapi_cdb);
@@ -1036,6 +1072,7 @@ ide_atapi_callback(ide_t *ide)
             break;
         case PHASE_COMPLETE:
         case PHASE_ERROR:
+            ret              = 0;
             ide->tf->atastat = READY_STAT;
             if (ide->sc->packet_status == PHASE_ERROR)
                 ide->tf->atastat       |= ERR_STAT;
@@ -1045,37 +1082,112 @@ ide_atapi_callback(ide_t *ide)
             break;
         case PHASE_DATA_IN:
         case PHASE_DATA_OUT:
+            ret              = 0;
             ide->tf->atastat = READY_STAT | DRQ_STAT | (ide->tf->atastat & ERR_STAT);
             ide->tf->phase   = !(ide->sc->packet_status & 0x01) << 1;
             ide_irq_raise(ide);
             break;
         case PHASE_DATA_IN_DMA:
-        case PHASE_DATA_OUT_DMA:
-            out = (ide->sc->packet_status & 0x01);
-
             if (!IDE_ATAPI_IS_EARLY && !ide_boards[ide->board]->force_ata3 &&
                 (bm != NULL) && bm->dma) {
-                ret = bm->dma(ide->sc->temp_buffer, ide->sc->packet_len, out, bm->priv);
-            }
-            /* Else, DMA command without a bus master, ret = 0 (default). */
+                if (ide->sc->block_len == 0) {
+                    ret = bm->dma(ide->sc->temp_buffer, ide->sc->packet_len, 0, 0, bm->priv);
+
+                    /* Underrun. */
+                    if (ret == 1)
+                        ret = 3;
+                } else {
+                    ret = bm->dma(ide->sc->temp_buffer + ide->sc->buffer_pos -
+                                  ide->sc->block_len, ide->sc->block_len,
+                                  ide->sc->sector_len * ide->sc->block_len,
+                                  0, bm->priv);
+
+                    if (ret == 1) {
+                        if (ide->sc->sector_len == 0)
+                            ret = 3;
+                        else if (ide->read != NULL)
+                            ide->read(ide->sc);
+                    }
+                }
+            } else
+                ret = 0;
 
             switch (ret) {
+                default:
+                    break;
                 case 0:
                     if (ide->bus_master_error)
                         ide->bus_master_error(ide->sc);
                     break;
-                case 1:
-                    if (out && ide->phase_data_out)
-                        ret = ide->phase_data_out(ide->sc);
-                    else if (!out && ide->command_stop)
-                        ide->command_stop(ide->sc);
+                case 2:
+                    ide_atapi_command_bus(ide);
+                    break;
+                case 3:
+                    /* Reached EOT - terminate the command as there's nothing
+                       more to transfer. */
+                    ide->sc->packet_status = PHASE_COMPLETE;
+                    ide->sc->callback      = 0.0;
 
-                    if ((ide->sc->packet_status == PHASE_COMPLETE) && (ide->sc->callback == 0.0))
+                    if (ide->command_stop != NULL)
+                        ide->command_stop(ide->sc);
+                    fallthrough;
+                case 1:
+                    if ((ide->sc->packet_status == PHASE_COMPLETE) &&
+                        (ide->sc->callback == 0.0))
                         ide_atapi_callback(ide);
                     break;
+            }
+            break;
+        case PHASE_DATA_OUT_DMA:
+            if (!IDE_ATAPI_IS_EARLY && !ide_boards[ide->board]->force_ata3 &&
+                (bm != NULL) && bm->dma) {
+                if (ide->sc->block_len == 0) {
+                    ret = bm->dma(ide->sc->temp_buffer, ide->sc->packet_len, 0, 1, bm->priv);
+
+                    /* Underrun. */
+                    if (ret == 1)
+                        ret = 3;
+                } else {
+                    ret = bm->dma(ide->sc->temp_buffer + ide->sc->buffer_pos,
+                                  ide->sc->block_len,
+                                  ide->sc->sector_len * ide->sc->block_len,
+                                  1, bm->priv);
+
+                    if (ret & 1) {
+                        if (ide->write != NULL)
+                            ide->write(ide->sc);
+
+                        if ((ret == 1) && (ide->sc->sector_len == 0))
+                            ret = 3;
+                    }
+                }
+            } else
+                ret = 0;
+
+            switch (ret) {
+                default:
+                    break;
+                case 0:
+                    if (ide->bus_master_error)
+                        ide->bus_master_error(ide->sc);
+                    break;
                 case 2:
                     ide_atapi_command_bus(ide);
                     break;
+                case 3:
+                    /* Reached EOT - terminate the command as there's nothing
+                       more to transfer. */
+                    ide->sc->packet_status = PHASE_COMPLETE;
+                    ide->sc->callback      = 0.0;
+
+                    if (ide->phase_data_out != NULL)
+                        (void) ide->phase_data_out(ide->sc);
+                    fallthrough;
+                case 1:
+                    if ((ide->sc->packet_status == PHASE_COMPLETE) &&
+                        (ide->sc->callback == 0.0))
+                        ide_atapi_callback(ide);
+                    break;
             }
             break;
     }
@@ -1085,32 +1197,45 @@ ide_atapi_callback(ide_t *ide)
 static void
 ide_atapi_pio_request(ide_t *ide, uint8_t out)
 {
-    scsi_common_t *dev = ide->sc;
+    scsi_common_t *dev  = ide->sc;
+    int            left = 0;
 
     ide_irq_lower(ide);
 
-    ide->tf->atastat = BSY_STAT;
+    ide->tf->atastat   = BSY_STAT;
 
     if (ide->tf->pos >= dev->packet_len) {
-        ide_log("%i bytes %s, command done\n", ide->tf->pos, out ? "written" : "read");
+        // ide_log("%i bytes %s, command done\n", ide->tf->pos, out ? "written" : "read");
+        ide_log("%i bytes %s, command done, %i sectors left\n", ide->tf->pos, out ? "written" : "read",
+                dev->sector_len);
 
         ide->tf->pos = dev->request_pos = 0;
-        if (out && ide->phase_data_out)
-            ide->phase_data_out(dev);
-        else if (!out && ide->command_stop)
-            ide->command_stop(dev);
 
-        if ((ide->sc->packet_status == PHASE_COMPLETE) && (ide->sc->callback == 0.0))
-            ide_atapi_callback(ide);
+        if (dev->block_len == 0) {
+            if (out && (ide->phase_data_out != NULL))
+                ide->phase_data_out(dev);
+            else if (!out && (ide->command_stop != NULL))
+                ide->command_stop(dev);
+
+            if ((ide->sc->packet_status == PHASE_COMPLETE) && (ide->sc->callback == 0.0))
+                ide_atapi_callback(ide);
+        }
     } else {
         ide_log("%i bytes %s, %i bytes are still left\n", ide->tf->pos,
                 out ? "written" : "read", dev->packet_len - ide->tf->pos);
 
-        /* If less than (packet length) bytes are remaining, update packet length
-           accordingly. */
+        left = 1;
+
+        /*
+           If less than (packet length) bytes are remaining, update packet length
+           accordingly.
+         */
         if ((dev->packet_len - ide->tf->pos) < (dev->max_transfer_len)) {
             dev->max_transfer_len = dev->packet_len - ide->tf->pos;
-            /* Also update the request length so the host knows how many bytes to transfer. */
+            /*
+               Also update the request length so the host knows how many bytes to
+               transfer.
+             */
             ide->tf->request_length = dev->max_transfer_len;
         }
         ide_log("CD-ROM %i: Packet length %i, request length %i\n", dev->id, dev->packet_len,
@@ -1118,43 +1243,77 @@ ide_atapi_pio_request(ide_t *ide, uint8_t out)
 
         dev->packet_status = PHASE_DATA_IN | out;
 
-        ide->tf->atastat = BSY_STAT;
-        ide->tf->phase  = 1;
-        ide_atapi_callback(ide);
-        ide_set_callback(ide, 0.0);
+        if (dev->block_len == 0) {
+            ide_atapi_callback(ide);
+            ide_set_callback(ide, 0.0);
+        }
 
-        dev->request_pos = 0;
+        dev->request_pos  = 0;
+    }
+
+    if (dev->block_len != 0) {
+        if (out) {
+            if (ide->write != NULL)
+                ide->write(dev);
+
+            if (dev->sector_len == 0) {
+                if (left) {
+                    ide_atapi_callback(ide);
+                    ide_set_callback(ide, 0.0);
+                } else {
+                    if (ide->phase_data_out != NULL)
+                        (void) ide->phase_data_out(dev);
+
+                    if ((ide->sc->packet_status == PHASE_COMPLETE) &&
+                        (ide->sc->callback == 0.0))
+                        ide_atapi_callback(ide);
+                }
+            }
+        } else {
+            if (dev->sector_len == 0) {
+                if (left) {
+                    ide_atapi_callback(ide);
+                    ide_set_callback(ide, 0.0);
+                } else {
+                    if (ide->command_stop != NULL)
+                        ide->command_stop(dev);
+
+                    if ((ide->sc->packet_status == PHASE_COMPLETE) &&
+                        (ide->sc->callback == 0.0))
+                        ide_atapi_callback(ide);
+                }
+            } else if (ide->read != NULL)
+                ide->read(dev);
+        }
     }
 }
 
 static uint16_t
-ide_atapi_packet_read(ide_t *ide, int length)
+ide_atapi_packet_read(ide_t *ide)
 {
     scsi_common_t *dev = ide->sc;
     const uint16_t *bufferw;
     uint16_t ret = 0;
 
     if (dev && dev->temp_buffer && (dev->packet_status == PHASE_DATA_IN)) {
-        ide_log("PHASE_DATA_IN read: %i, %i, %i, %i\n",
-                dev->request_pos, dev->max_transfer_len, ide->tf->pos, dev->packet_len);
+        /* ide_log("PHASE_DATA_IN read: %i, %i, %i, %i\n",
+                dev->request_pos, dev->max_transfer_len, ide->tf->pos, dev->packet_len); */
 
         bufferw = (uint16_t *) dev->temp_buffer;
 
-        /* Make sure we return a 0 and don't attempt to read from the buffer if
+        /*
+           Make sure we return a 0 and don't attempt to read from the buffer if
            we're transferring bytes beyond it, which can happen when issuing media
            access commands with an allocated length below minimum request length
-           (which is 1 sector = 2048 bytes). */
-        if (length == 2) {
-            ret = (ide->tf->pos < dev->packet_len) ? bufferw[ide->tf->pos >> 1] : 0;
-            ide->tf->pos += 2;
-            dev->request_pos += 2;
-        } else {
-            ret = (ide->tf->pos < dev->packet_len) ? dev->temp_buffer[ide->tf->pos] : 0;
-            ide->tf->pos++;
-            dev->request_pos++;
-        }
+           (which is 1 sector = 2048 bytes).
+         */
+        ret = (ide->tf->pos < dev->packet_len) ? bufferw[ide->tf->pos >> 1] : 0;
+        ide->tf->pos += 2;
 
-        if ((dev->request_pos >= dev->max_transfer_len) || (ide->tf->pos >= dev->packet_len)) {
+        dev->request_pos += 2;
+
+        if ((dev->request_pos >= dev->max_transfer_len) ||
+            (ide->tf->pos >= dev->packet_len)) {
             /* Time for a DRQ. */
             ide_atapi_pio_request(ide, 0);
         }
@@ -1164,7 +1323,7 @@ ide_atapi_packet_read(ide_t *ide, int length)
 }
 
 static void
-ide_atapi_packet_write(ide_t *ide, uint16_t val, int length)
+ide_atapi_packet_write(ide_t *ide, const uint16_t val)
 {
     scsi_common_t *dev = ide->sc;
 
@@ -1181,18 +1340,14 @@ ide_atapi_packet_write(ide_t *ide, uint16_t val, int length)
     }
 
     if ((bufferb != NULL) && (dev->packet_status != PHASE_DATA_IN)) {
-        if (length == 2) {
-            bufferw[ide->tf->pos >> 1] = val & 0xffff;
-            ide->tf->pos += 2;
-            dev->request_pos += 2;
-        } else {
-            bufferb[ide->tf->pos] = val & 0xff;
-            ide->tf->pos++;
-            dev->request_pos++;
-        }
+        bufferw[ide->tf->pos >> 1] = val & 0xffff;
+
+        ide->tf->pos += 2;
+        dev->request_pos += 2;
 
         if (dev->packet_status == PHASE_DATA_OUT) {
-            if ((dev->request_pos >= dev->max_transfer_len) || (ide->tf->pos >= dev->packet_len)) {
+            if ((dev->request_pos >= dev->max_transfer_len) ||
+                (ide->tf->pos >= dev->packet_len)) {
                 /* Time for a DRQ. */
                 ide_atapi_pio_request(ide, 1);
             }
@@ -1208,34 +1363,31 @@ ide_atapi_packet_write(ide_t *ide, uint16_t val, int length)
 }
 
 static void
-ide_write_data(ide_t *ide, uint16_t val, int length)
+ide_write_data(ide_t *ide, const uint16_t val)
 {
-    uint8_t  *idebufferb = (uint8_t *) ide->buffer;
     uint16_t *idebufferw = ide->buffer;
 
     if ((ide->type != IDE_NONE) && !(ide->type & IDE_SHADOW) && ide->buffer) {
         if (ide->command == WIN_PACKETCMD) {
             if (ide->type == IDE_ATAPI)
-                ide_atapi_packet_write(ide, val, length);
+                ide_atapi_packet_write(ide, val);
             else
                 ide->tf->pos = 0;
         } else {
-            if (length == 2) {
-                idebufferw[ide->tf->pos >> 1] = val & 0xffff;
-                ide->tf->pos += 2;
-            } else {
-                idebufferb[ide->tf->pos] = val & 0xff;
-                ide->tf->pos++;
-            }
+            idebufferw[ide->tf->pos >> 1] = val & 0xffff;
+            ide->tf->pos += 2;
 
             if (ide->tf->pos >= 512) {
                 ide->tf->pos     = 0;
                 ide->tf->atastat = BSY_STAT;
-                double seek_time = hdd_timing_write(&hdd[ide->hdd_num], ide_get_sector(ide), 1);
-                double xfer_time = ide_get_xfer_time(ide, 512);
-                double wait_time = seek_time + xfer_time;
+                const double seek_time = hdd_timing_write(&hdd[ide->hdd_num], ide_get_sector(ide), 1);
+                const double xfer_time = ide_get_xfer_time(ide, 512);
+                const double wait_time = seek_time + xfer_time;
                 if (ide->command == WIN_WRITE_MULTIPLE) {
-                    if ((ide->blockcount + 1) >= ide->blocksize || ide->tf->secount == 1) {
+                    if (hdd[ide->hdd_num].speed_preset == 0) {
+                        ide->pending_delay = 0;
+                        ide_callback(ide);
+                    } else if ((ide->blockcount + 1) >= ide->blocksize || ide->tf->secount == 1) {
                         ide_set_callback(ide, seek_time + xfer_time + ide->pending_delay);
                         ide->pending_delay = 0;
                     } else {
@@ -1261,7 +1413,7 @@ ide_writew(uint16_t addr, uint16_t val, void *priv)
     ide = ide_drives[ch];
 
 #if defined(ENABLE_IDE_LOG) && (ENABLE_IDE_LOG == 2)
-    ide_log("ide_writew(%04X, %04X, %08X)\n", addr, val, priv);
+    ide_log("[%04X:%08X] ide_writew(%04X, %04X, %08X)\n", CS, cpu_state.pc, addr, val, priv);
 #endif
 
     addr &= 0x7;
@@ -1271,7 +1423,7 @@ ide_writew(uint16_t addr, uint16_t val, void *priv)
 
     switch (addr) {
         case 0x0: /* Data */
-            ide_write_data(ide, val, 2);
+            ide_write_data(ide, val);
             break;
         case 0x7:
             ide_writeb(addr, val & 0xff, priv);
@@ -1295,7 +1447,7 @@ ide_writel(uint16_t addr, uint32_t val, void *priv)
     ide = ide_drives[ch];
 
 #if defined(ENABLE_IDE_LOG) && (ENABLE_IDE_LOG == 2)
-    ide_log("ide_writel(%04X, %08X, %08X)\n", addr, val, priv);
+    ide_log("[%04X:%08X] ide_writel(%04X, %08X, %08X)\n", CS, cpu_state.pc, addr, val, priv);
 #endif
 
     addr &= 0x7;
@@ -1305,9 +1457,9 @@ ide_writel(uint16_t addr, uint32_t val, void *priv)
 
     switch (addr) {
         case 0x0: /* Data */
-            ide_write_data(ide, val & 0xffff, 2);
+            ide_write_data(ide, val & 0xffff);
             if (dev->bit32)
-                ide_write_data(ide, val >> 16, 2);
+                ide_write_data(ide, val >> 16);
             else
                 ide_writew(addr + 2, (val >> 16) & 0xffff, priv);
             break;
@@ -1345,9 +1497,9 @@ ide_write_devctl(UNUSED(uint16_t addr), uint8_t val, void *priv)
     ide       = ide_drives[ch];
     ide_other = ide_drives[ch ^ 1];
 
-    ide_log("ide_write_devctl(%04X, %02X, %08X)\n", addr, val, priv);
+    ide_log("[%04X:%08X] ide_write_devctl(%04X, %02X, %08X)\n", CS, cpu_state.pc, addr, val, priv);
 
-    if ((ide->type == IDE_NONE) && (ide_other->type == IDE_NONE))
+    if ((addr & 0x0001) || ((ide->type == IDE_NONE) && (ide_other->type == IDE_NONE)))
         return;
 
     dev->diag = 0;
@@ -1455,13 +1607,13 @@ ide_writeb(uint16_t addr, uint8_t val, void *priv)
     ide       = ide_drives[ch];
     ide_other = ide_drives[ch ^ 1];
 
-    ide_log("ide_writeb(%04X, %02X, %08X)\n", addr, val, priv);
+    ide_log("[%04X:%08X] ide_writeb(%04X, %02X, %08X)\n", CS, cpu_state.pc, addr, val, priv);
 
     addr &= 0x7;
 
     if ((ide->type != IDE_NONE) || ((addr != 0x0) && (addr != 0x7)))  switch (addr) {
         case 0x0: /* Data */
-            ide_write_data(ide, val | (val << 8), 2);
+            ide_write_data(ide, val | (val << 8));
             break;
 
         /* Note to self: for ATAPI, bit 0 of this is DMA if set, PIO if clear. */
@@ -1567,7 +1719,8 @@ ide_writeb(uint16_t addr, uint8_t val, void *priv)
             break;
 
         case 0x7: /* Command register */
-            if (ide->tf->atastat & (BSY_STAT | DRQ_STAT))
+            if ((ide->tf->atastat & (BSY_STAT | DRQ_STAT)) &&
+                ((val != WIN_SRST) || (ide->type != IDE_ATAPI)))
                 break;
 
             if ((ide->type == IDE_NONE) || ((ide->type & IDE_SHADOW) && (val != WIN_DRIVE_DIAGNOSTICS)))
@@ -1579,8 +1732,8 @@ ide_writeb(uint16_t addr, uint8_t val, void *priv)
             ide->tf->error = 0;
 
             switch (val) {
-                case WIN_RECAL ... 0x1F:
-                case WIN_SEEK ... 0x7F:
+                case WIN_RECAL ... 0x1f:
+                case WIN_SEEK ... 0x7f:
                     if (ide->type == IDE_ATAPI)
                         ide->tf->atastat = DRDY_STAT;
                     else
@@ -1590,9 +1743,13 @@ ide_writeb(uint16_t addr, uint8_t val, void *priv)
                         ide->sc->callback = 100.0 * IDE_TIME;
                         ide_set_callback(ide, 100.0 * IDE_TIME);
                     } else {
-                        double seek_time = hdd_seek_get_time(&hdd[ide->hdd_num], (val & 0x60) ?
-                                                             ide_get_sector(ide) : 0, HDD_OP_SEEK, 0, 0.0);
-                        ide_set_callback(ide, seek_time);
+                        if (hdd[ide->hdd_num].speed_preset == 0)
+                            ide_set_callback(ide, 100.0 * IDE_TIME);
+                        else {
+                            double seek_time = hdd_seek_get_time(&hdd[ide->hdd_num], (val & 0x60) ?
+                                                                 ide_get_sector(ide) : 0, HDD_OP_SEEK, 0, 0.0);
+                            ide_set_callback(ide, seek_time);
+                        }
                     }
                     break;
 
@@ -1625,16 +1782,20 @@ ide_writeb(uint16_t addr, uint8_t val, void *priv)
                         ide->sc->callback = 200.0 * IDE_TIME;
 
                     if (ide->type == IDE_HDD) {
-                        ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus, 1);
+                        ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus_type, 1);
                         uint32_t sec_count;
                         double   wait_time;
                         if ((val == WIN_READ_DMA) || (val == WIN_READ_DMA_ALT)) {
-                            /* TODO make DMA timing more accurate */
+                            /* TODO: Make DMA timing more accurate. */
                             sec_count        = ide->tf->secount ? ide->tf->secount : 256;
                             double seek_time = hdd_timing_read(&hdd[ide->hdd_num],
                                                                ide_get_sector(ide), sec_count);
                             double xfer_time = ide_get_xfer_time(ide, 512 * sec_count);
                             wait_time        = seek_time > xfer_time ? seek_time : xfer_time;
+                        } else if ((val == WIN_READ_MULTIPLE) && (hdd[ide->hdd_num].speed_preset == 0)) {
+                           ide_set_callback(ide, 200.0 * IDE_TIME);
+                           ide->do_initial_read = 1;
+                           break;
                         } else if ((val == WIN_READ_MULTIPLE) && (ide->blocksize > 0)) {
                             sec_count = ide->tf->secount ? ide->tf->secount : 256;
                             if (sec_count > ide->blocksize)
@@ -1663,7 +1824,7 @@ ide_writeb(uint16_t addr, uint8_t val, void *priv)
                     ide->blockcount = 0;
                     /* Turn on the activity indicator *here* so that it gets turned on
                        less times. */
-                    ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus, 1);
+                    ui_sb_update_icon_write(SB_HDD | hdd[ide->hdd_num].bus_type, 1);
                     fallthrough;
 
                 case WIN_WRITE:
@@ -1792,39 +1953,28 @@ ide_writeb(uint16_t addr, uint8_t val, void *priv)
 }
 
 static uint16_t
-ide_read_data(ide_t *ide, int length)
+ide_read_data(ide_t *ide)
 {
-    const uint8_t  *idebufferb = (uint8_t *) ide->buffer;
     const uint16_t *idebufferw = ide->buffer;
-    uint16_t ret = 0;
-    double seek_us;
-    double xfer_us;
+    uint16_t ret = 0x0000;
 
-#if defined(ENABLE_IDE_LOG) && (ENABLE_IDE_LOG == 2)
+#if defined(ENABLE_IDE_LOG) && (ENABLE_IDE_LOG == 3)
     ide_log("ide_read_data(): ch = %i, board = %i, type = %i\n", ide->channel,
             ide->board, ide->type);
 #endif
 
-    if ((ide->type == IDE_NONE) || (ide->type & IDE_SHADOW) || !ide->buffer) {
-        if (length == 2)
-            ret = 0xff7f;
-        else
-            ret = 0x7f;
-    } else if (ide->command == WIN_PACKETCMD) {
+    if ((ide->type == IDE_NONE) || (ide->type & IDE_SHADOW) || (ide->buffer == NULL))
+        ret = 0xff7f;
+    else if (ide->command == WIN_PACKETCMD) {
         if (ide->type == IDE_ATAPI)
-            ret = ide_atapi_packet_read(ide, length);
+            ret = ide_atapi_packet_read(ide);
         else {
             ide_log("Drive not ATAPI (position: %i)\n", ide->tf->pos);
             ide->tf->pos = 0;
         }
     } else {
-        if (length == 2) {
-            ret = idebufferw[ide->tf->pos >> 1];
-            ide->tf->pos += 2;
-        } else {
-            ret = idebufferb[ide->tf->pos];
-            ide->tf->pos++;
-        }
+        ret = idebufferw[ide->tf->pos >> 1];
+        ide->tf->pos += 2;
 
         if (ide->tf->pos >= 512) {
             ide->tf->pos     = 0;
@@ -1835,31 +1985,34 @@ ide_read_data(ide_t *ide, int length)
             if ((ide->command == WIN_READ) ||
                 (ide->command == WIN_READ_NORETRY) ||
                 (ide->command == WIN_READ_MULTIPLE)) {
+
                 ide->tf->secount--;
 
                 if (ide->tf->secount) {
                     ide_next_sector(ide);
                     ide->tf->atastat = BSY_STAT | READY_STAT | DSC_STAT;
                     if (ide->command == WIN_READ_MULTIPLE) {
-                        if (!ide->blockcount) {
+                        if (hdd[ide->hdd_num].speed_preset == 0)
+                            ide_callback(ide);
+                        else if (!ide->blockcount) {
                             uint32_t cnt = ide->tf->secount ?
                                            ide->tf->secount : 256;
                             if (cnt > ide->blocksize)
                                 cnt = ide->blocksize;
-                            seek_us = hdd_timing_read(&hdd[ide->hdd_num],
-                                                      ide_get_sector(ide), cnt);
-                            xfer_us = ide_get_xfer_time(ide, 512 * cnt);
+                            const double seek_us = hdd_timing_read(&hdd[ide->hdd_num],
+                                                   ide_get_sector(ide), cnt);
+                            const double xfer_us = ide_get_xfer_time(ide, 512 * cnt);
                             ide_set_callback(ide, seek_us + xfer_us);
                         } else
                             ide_callback(ide);
                     } else {
-                        seek_us = hdd_timing_read(&hdd[ide->hdd_num],
-                                                  ide_get_sector(ide), 1);
-                        xfer_us = ide_get_xfer_time(ide, 512);
+                        const double seek_us = hdd_timing_read(&hdd[ide->hdd_num],
+                                                               ide_get_sector(ide), 1);
+                        const double xfer_us = ide_get_xfer_time(ide, 512);
                         ide_set_callback(ide, seek_us + xfer_us);
                     }
                 } else
-                    ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus, 0);
+                    ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus_type, 0);
             }
         }
     }
@@ -1868,7 +2021,7 @@ ide_read_data(ide_t *ide, int length)
 }
 
 static uint8_t
-ide_status(ide_t *ide, ide_t *ide_other, int ch)
+ide_status(ide_t *ide, UNUSED(ide_t *ide_other), UNUSED(int ch))
 {
     uint8_t ret;
 
@@ -1881,8 +2034,7 @@ ide_status(ide_t *ide, ide_t *ide_other, int ch)
         /* On real hardware, a slave with a present master always
            returns a status of 0x00.
            Confirmed by the ATA-3 and ATA-4 specifications. */
-        // ret = 0x00;
-        ret = 0x01;
+        ret = 0x00;
     } else {
         ret = ide->tf->atastat;
         if (ide->type == IDE_ATAPI)
@@ -1905,7 +2057,7 @@ ide_readb(uint16_t addr, void *priv)
 
     switch (addr & 0x7) {
         case 0x0: /* Data */
-            ret = ide_read_data(ide, 2) & 0xff;
+            ret = ide_read_data(ide) & 0xff;
             break;
 
         /* For ATAPI: Bits 7-4 = sense key, bit 3 = MCR (media change requested),
@@ -1985,58 +2137,53 @@ ide_readb(uint16_t addr, void *priv)
             break;
     }
 
-    ide_log("ide_readb(%04X, %08X) = %02X\n", addr, priv, ret);
+    ide_log("[%04X:%08X] ide_readb(%04X, %08X) = %02X\n", CS, cpu_state.pc, addr, priv, ret);
+
     return ret;
 }
 
 uint8_t
-ide_read_alt_status(UNUSED(uint16_t addr), void *priv)
+ide_read_alt_status(UNUSED(const uint16_t addr), void *priv)
 {
-    uint8_t ret = 0xff;
-
     const ide_board_t *dev = (ide_board_t *) priv;
 
-    ide_t *ide;
-    int    ch;
-
-    ch  = dev->cur_dev;
-    ide = ide_drives[ch];
+    const int     ch  = dev->cur_dev;
+    ide_t *       ide = ide_drives[ch];
+    uint8_t       ret = 0xff;
 
     /* Per the Seagate ATA-3 specification:
        Reading the alternate status does *NOT* clear the IRQ. */
-    ret = ide_status(ide, ide_drives[ch ^ 1], ch);
+    if (!(addr & 0x0001))
+        ret = ide_status(ide, ide_drives[ch ^ 1], ch);
+
+    // ide_log("[%04X:%08X] ide_read_alt_status(%04X, %08X) = %02X\n", CS, cpu_state.pc, addr, priv, ret);
+    // ide_log("ide_read_alt_status(%04X, %08X) = %02X\n", CS, cpu_state.pc, addr, priv, ret);
 
-    ide_log("ide_read_alt_status(%04X, %08X) = %02X\n", addr, priv, ret);
     return ret;
 }
 
 uint16_t
 ide_readw(uint16_t addr, void *priv)
 {
-    uint16_t ret = 0xffff;
-
     const ide_board_t *dev = (ide_board_t *) priv;
-
-    ide_t *ide;
-    int    ch;
-
-    ch  = dev->cur_dev;
-    ide = ide_drives[ch];
+    const int          ch  = dev->cur_dev;
+    ide_t *            ide = ide_drives[ch];
+    uint16_t           ret;
 
     switch (addr & 0x7) {
+        default:
+            ret = ide_readb(addr, priv) | (ide_readb(addr + 1, priv) << 8);
+            break;
         case 0x0: /* Data */
-            ret = ide_read_data(ide, 2);
+            ret = ide_read_data(ide);
             break;
         case 0x7:
             ret = ide_readb(addr, priv) | 0xff00;
             break;
-        default:
-            ret = ide_readb(addr, priv) | (ide_readb(addr + 1, priv) << 8);
-            break;
     }
 
 #if defined(ENABLE_IDE_LOG) && (ENABLE_IDE_LOG == 2)
-    ide_log("ide_readw(%04X, %08X) = %04X\n", addr, priv, ret);
+    ide_log("[%04X:%08X] ide_readw(%04X, %08X) = %04X\n", CS, cpu_state.pc, addr, priv, ret);
 #endif
     return ret;
 }
@@ -2044,20 +2191,16 @@ ide_readw(uint16_t addr, void *priv)
 static uint32_t
 ide_readl(uint16_t addr, void *priv)
 {
-    ide_t *ide;
-    int    ch;
-    uint32_t ret = 0xffffffff;
-
     const ide_board_t *dev = (ide_board_t *) priv;
-
-    ch  = dev->cur_dev;
-    ide = ide_drives[ch];
+    const int          ch  = dev->cur_dev;
+    ide_t *            ide = ide_drives[ch];
+    uint32_t           ret;
 
     switch (addr & 0x7) {
         case 0x0: /* Data */
-            ret = ide_read_data(ide, 2);
+            ret = ide_read_data(ide);
             if (dev->bit32)
-                ret |= (ide_read_data(ide, 2) << 16);
+                ret |= (ide_read_data(ide) << 16);
             else
                 ret |= (ide_readw(addr + 2, priv) << 16);
             break;
@@ -2071,7 +2214,7 @@ ide_readl(uint16_t addr, void *priv)
     }
 
 #if defined(ENABLE_IDE_LOG) && (ENABLE_IDE_LOG == 2)
-    ide_log("ide_readl(%04X, %08X) = %04X\n", addr, priv, ret);
+    ide_log("[%04X:%08X] ide_readl(%04X, %08X) = %04X\n", CS, cpu_state.pc, addr, priv, ret);
 #endif
     return ret;
 }
@@ -2122,12 +2265,11 @@ atapi_error_no_ready(ide_t *ide)
 static void
 ide_callback(void *priv)
 {
-    int snum;
-    int ret = 0;
-    uint8_t err = 0x00;
-    int chk_chs = 0;
-    ide_t *ide = (ide_t *) priv;
-    ide_bm_t *bm = ide_boards[ide->board]->bm;
+    ide_t *         ide = (ide_t *) priv;
+    const ide_bm_t *bm  = ide_boards[ide->board]->bm;
+    int             chk_chs;
+    int             ret;
+    uint8_t         err = 0x00;
 
     ide_log("ide_callback(%i): %02X\n", ide->channel, ide->command);
 
@@ -2137,8 +2279,9 @@ ide_callback(void *priv)
             if (ide->type == IDE_ATAPI)
                 atapi_error_no_ready(ide);
             else {
-                if (chk_chs && ((ide->tf->cylinder >= ide->tracks) || (ide->tf->head >= ide->hpc) ||
-                    !ide->tf->sector || (ide->tf->sector > ide->spt)))
+                /* The J-Bond PCI400C-A Phoenix BIOS implies that this command is supposed to
+                   ignore the sector number. */
+                if (chk_chs && ((ide->tf->cylinder >= ide->tracks) || (ide->tf->head >= ide->hpc)))
                     err = IDNF_ERR;
                 else {
                     ide->tf->atastat = DRDY_STAT | DSC_STAT;
@@ -2160,7 +2303,7 @@ ide_callback(void *priv)
            Status = 00h, Error = 01h, Sector Count = 01h, Sector Number = 01h,
            Cylinder Low = 14h, Cylinder High = EBh and Drive/Head = 00h. */
         case WIN_SRST: /*ATAPI Device Reset */
-            ide->tf->error = 1; /*Device passed*/
+            ide->tf->error     = 1; /*Device passed*/
 
             ide->tf->secount   = 1;
             ide->tf->sector    = 1;
@@ -2207,9 +2350,10 @@ ide_callback(void *priv)
                 if (ide->do_initial_read) {
                     ide->do_initial_read = 0;
                     ide->sector_pos      = 0;
-                    hdd_image_read(ide->hdd_num, ide_get_sector(ide),
-                                   ide->tf->secount ? ide->tf->secount : 256, ide->sector_buffer);
-                }
+                    ret = hdd_image_read(ide->hdd_num, ide_get_sector(ide),
+                                         ide->tf->secount ? ide->tf->secount : 256, ide->sector_buffer);
+                } else
+                    ret = 0;
 
                 memcpy(ide->buffer, &ide->sector_buffer[ide->sector_pos * 512], 512);
 
@@ -2217,10 +2361,14 @@ ide_callback(void *priv)
 
                 ide->tf->pos = 0;
                 ide->tf->atastat = DRQ_STAT | DRDY_STAT | DSC_STAT;
+                if (ret < 0) {
+                    ide_log("IDE %i: Read aborted (image read error)\n", ide->channel);
+                    err = UNC_ERR;
+                }
 
                 ide_irq_raise(ide);
 
-                ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus, 1);
+                ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus_type, 1);
             }
             break;
 
@@ -2238,26 +2386,28 @@ ide_callback(void *priv)
                     ide->sector_pos = ide->tf->secount;
                 else
                     ide->sector_pos = 256;
-                hdd_image_read(ide->hdd_num, ide_get_sector(ide), ide->sector_pos, ide->sector_buffer);
 
                 ide->tf->pos = 0;
 
-                if (!ide_boards[ide->board]->force_ata3 && (bm != NULL) && bm->dma) {
+                if (hdd_image_read(ide->hdd_num, ide_get_sector(ide), ide->sector_pos, ide->sector_buffer) < 0) {
+                    ide_log("IDE %i: DMA read aborted (image read error)\n", ide->channel);
+                    err = UNC_ERR;
+                } else if (!ide_boards[ide->board]->force_ata3 && bm->dma) {
                     /* We should not abort - we should simply wait for the host to start DMA. */
-                    ret = bm->dma(ide->sector_buffer, ide->sector_pos * 512, 0, bm->priv);
+                    ret = bm->dma(ide->sector_buffer, ide->sector_pos * 512, 0, 0, bm->priv);
                     if (ret == 2) {
                         /* Bus master DMA disabled, simply wait for the host to enable DMA. */
                         ide->tf->atastat = DRQ_STAT | DRDY_STAT | DSC_STAT;
                         ide_set_callback(ide, 6.0 * IDE_TIME);
                         return;
-                    } else if (ret == 1) {
+                    } else if (ret & 1) {
                         /* DMA successful */
                         ide_log("IDE %i: DMA read successful\n", ide->channel);
 
                         ide->tf->atastat = DRDY_STAT | DSC_STAT;
 
                         ide_irq_raise(ide);
-                        ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus, 0);
+                        ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus_type, 0);
                     } else {
                         /* Bus master DMAS error, abort the command. */
                         ide_log("IDE %i: DMA read aborted (failed)\n", ide->channel);
@@ -2285,8 +2435,10 @@ ide_callback(void *priv)
                 if (ide->do_initial_read) {
                     ide->do_initial_read = 0;
                     ide->sector_pos      = 0;
-                    hdd_image_read(ide->hdd_num, ide_get_sector(ide),
-                                   ide->tf->secount ? ide->tf->secount : 256, ide->sector_buffer);
+                    ret = hdd_image_read(ide->hdd_num, ide_get_sector(ide),
+                                         ide->tf->secount ? ide->tf->secount : 256, ide->sector_buffer);
+                } else {
+                    ret = 0;
                 }
 
                 memcpy(ide->buffer, &ide->sector_buffer[ide->sector_pos * 512], 512);
@@ -2295,6 +2447,10 @@ ide_callback(void *priv)
                 ide->tf->pos     = 0;
 
                 ide->tf->atastat = DRQ_STAT | DRDY_STAT | DSC_STAT;
+                if (ret < 0) {
+                    ide_log("IDE %i: Read aborted (image read error)\n", ide->channel);
+                    err = UNC_ERR;
+                }
                 if (!ide->blockcount)
                     ide_irq_raise(ide);
                 ide->blockcount++;
@@ -2313,18 +2469,19 @@ ide_callback(void *priv)
             else if (!ide->tf->lba && (ide->cfg_spt == 0))
                 err = IDNF_ERR;
             else {
-                hdd_image_write(ide->hdd_num, ide_get_sector(ide), 1, (uint8_t *) ide->buffer);
+                ui_sb_update_icon_write(SB_HDD | hdd[ide->hdd_num].bus_type, 1);
+                ret = hdd_image_write(ide->hdd_num, ide_get_sector(ide), 1, (uint8_t *) ide->buffer);
                 ide_irq_raise(ide);
                 ide->tf->secount--;
                 if (ide->tf->secount) {
                     ide->tf->atastat = DRQ_STAT | DRDY_STAT | DSC_STAT;
                     ide->tf->pos     = 0;
                     ide_next_sector(ide);
-                    ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus, 1);
                 } else {
                     ide->tf->atastat = DRDY_STAT | DSC_STAT;
-                    ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus, 0);
                 }
+                if (ret < 0)
+                    err = UNC_ERR;
             }
             ide_log("Write: %02X, %i, %08X, %" PRIi64 "\n", err, ide->hdd_num, ide->lba_addr, sector);
             break;
@@ -2338,30 +2495,32 @@ ide_callback(void *priv)
                 ide_log("IDE %i: DMA write aborted (SPECIFY failed)\n", ide->channel);
                 err = IDNF_ERR;
             } else {
-                if (!ide_boards[ide->board]->force_ata3 && (bm != NULL) && bm->dma) {
+                if (!ide_boards[ide->board]->force_ata3 && bm->dma) {
                     if (ide->tf->secount)
                         ide->sector_pos = ide->tf->secount;
                     else
                         ide->sector_pos = 256;
 
-                    ret = bm->dma(ide->sector_buffer, ide->sector_pos * 512, 1, bm->priv);
+                    ret = bm->dma(ide->sector_buffer, ide->sector_pos * 512, 0, 1, bm->priv);
 
                     if (ret == 2) {
                         /* Bus master DMA disabled, simply wait for the host to enable DMA. */
                         ide->tf->atastat = DRQ_STAT | DRDY_STAT | DSC_STAT;
                         ide_set_callback(ide, 6.0 * IDE_TIME);
                         return;
-                    } else if (ret == 1) {
+                    } else if (ret & 1) {
                         /* DMA successful */
-                        ide_log("IDE %i: DMA write successful\n", ide->channel);
+                        ui_sb_update_icon_write(SB_HDD | hdd[ide->hdd_num].bus_type, 1);
+                        ret = hdd_image_write(ide->hdd_num, ide_get_sector(ide),
+                                              ide->sector_pos, ide->sector_buffer);
 
-                        hdd_image_write(ide->hdd_num, ide_get_sector(ide),
-                                        ide->sector_pos, ide->sector_buffer);
+                        ide_log("IDE %i: DMA write %ssuccessful\n", ide->channel, (ret < 0) ? "un" : "");
 
                         ide->tf->atastat = DRDY_STAT | DSC_STAT;
+                        if (ret < 0)
+                            err = UNC_ERR;
 
                         ide_irq_raise(ide);
-                        ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus, 0);
                     } else {
                         /* Bus master DMA error, abort the command. */
                         ide_log("IDE %i: DMA read aborted (failed)\n", ide->channel);
@@ -2386,7 +2545,7 @@ ide_callback(void *priv)
             else if (!ide->tf->lba && (ide->cfg_spt == 0))
                 err = IDNF_ERR;
             else {
-                hdd_image_write(ide->hdd_num, ide_get_sector(ide), 1, (uint8_t *) ide->buffer);
+                ret = hdd_image_write(ide->hdd_num, ide_get_sector(ide), 1, (uint8_t *) ide->buffer);
                 ide->blockcount++;
                 if (ide->blockcount >= ide->blocksize || ide->tf->secount == 1) {
                     ide->blockcount = 0;
@@ -2399,8 +2558,10 @@ ide_callback(void *priv)
                     ide_next_sector(ide);
                 } else {
                     ide->tf->atastat = DRDY_STAT | DSC_STAT;
-                    ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus, 0);
+                    ui_sb_update_icon_write(SB_HDD | hdd[ide->hdd_num].bus_type, 0);
                 }
+                if (ret < 0)
+                    err = UNC_ERR;
             }
             break;
 
@@ -2414,7 +2575,7 @@ ide_callback(void *priv)
                 ide->tf->pos     = 0;
                 ide->tf->atastat = DRDY_STAT | DSC_STAT;
                 ide_irq_raise(ide);
-                ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus, 1);
+                ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus_type, 1);
             }
             break;
 
@@ -2424,12 +2585,14 @@ ide_callback(void *priv)
             else if (!ide->tf->lba && (ide->cfg_spt == 0))
                 err = IDNF_ERR;
             else {
-                hdd_image_zero(ide->hdd_num, ide_get_sector(ide), ide->tf->secount);
+                ret = hdd_image_zero(ide->hdd_num, ide_get_sector_format(ide), ide->tf->secount);
 
                 ide->tf->atastat = DRDY_STAT | DSC_STAT;
+                if (ret < 0)
+                    err = UNC_ERR;
                 ide_irq_raise(ide);
 
-                ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus, 1);
+                ui_sb_update_icon_write(SB_HDD | hdd[ide->hdd_num].bus_type, 1);
             }
             break;
 
@@ -2437,10 +2600,12 @@ ide_callback(void *priv)
             if (ide->type == IDE_ATAPI)
                 err = ABRT_ERR;
             else {
-                if (ide->cfg_spt == 0) {
-                    /* Only accept after RESET or DIAG. */
+                /* Only accept after RESET or DIAG. */
+                if (ide->params_specified) {
                     ide->cfg_spt = ide->tf->secount;
                     ide->cfg_hpc = ide->tf->head + 1;
+
+                    ide->params_specified = 1;
                 }
                 ide->command = 0x00;
                 ide->tf->atastat = DRDY_STAT | DSC_STAT;
@@ -2488,7 +2653,7 @@ ide_callback(void *priv)
 
         case WIN_READ_NATIVE_MAX:
             if (ide->type == IDE_HDD) {
-                snum = hdd[ide->hdd_num].spt;
+                int snum = hdd[ide->hdd_num].spt;
                 snum *= hdd[ide->hdd_num].hpc;
                 snum *= hdd[ide->hdd_num].tracks;
                 ide_set_sector(ide, snum - 1);
@@ -2601,7 +2766,7 @@ ide_handlers(uint8_t board, int set)
         }
 
         if (ide_boards[board]->base[1]) {
-            io_handler(set, ide_boards[board]->base[1], 1,
+            io_handler(set, ide_boards[board]->base[1], 2,
                        ide_read_alt_status, NULL, NULL,
                        ide_write_devctl, NULL, NULL,
                        ide_boards[board]);
@@ -2618,6 +2783,15 @@ ide_set_base_addr(int board, int base, uint16_t port)
         ide_boards[board]->base[base] = port;
 }
 
+void
+ide_set_irq(int board, int irq)
+{
+    ide_log("ide_set_irq(%i, %i)\n", board, irq);
+
+    if (ide_boards[board] != NULL)
+        ide_boards[board]->irq = irq;
+}
+
 static void
 ide_clear_bus_master(int board)
 {
@@ -2651,20 +2825,23 @@ ide_board_close(int board)
 
     ide_log("ide_board_close(%i)\n", board);
 
-    if ((ide_boards[board] == NULL) || !ide_boards[board]->inited)
+    if (ide_boards[board] == NULL)
         return;
 
     ide_log("IDE: Closing board %i...\n", board);
 
-    timer_stop(&ide_boards[board]->timer);
+    if (ide_boards[board]->inited) {
+        timer_stop(&ide_boards[board]->timer);
 
-    ide_clear_bus_master(board);
+        ide_clear_bus_master(board);
+    }
 
     /* Close hard disk image files (if previously open) */
     for (uint8_t d = 0; d < 2; d++) {
         c = (board << 1) + d;
 
-        ide_boards[board]->ide[d] = NULL;
+        if (ide_boards[board]->inited)
+            ide_boards[board]->ide[d] = NULL;
 
         dev = ide_drives[c];
 
@@ -2689,10 +2866,8 @@ ide_board_close(int board)
                 dev->buffer = NULL;
             }
 
-            if (dev) {
-                free(dev);
-                ide_drives[c] = NULL;
-            }
+            free(dev);
+            ide_drives[c] = NULL;
         }
     }
 
@@ -2701,19 +2876,12 @@ ide_board_close(int board)
 }
 
 static void
-ide_board_setup(int board)
+ide_board_setup(const int board)
 {
-    ide_t *dev;
-    int    c;
-    int    d;
-    int    ch;
-    int    is_ide;
-    int    valid_ch;
-    int    min_ch;
-    int    max_ch;
-
-    min_ch = (board << 1);
-    max_ch = min_ch + 1;
+    const int min_ch = (board << 1);
+    const int max_ch = min_ch + 1;
+    int       c;
+    int       d;
 
     ide_log("IDE: board %i: loading disks...\n", board);
     for (d = 0; d < 2; d++) {
@@ -2723,14 +2891,10 @@ ide_board_setup(int board)
 
     c = 0;
     for (d = 0; d < HDD_NUM; d++) {
-        is_ide = (hdd[d].bus == HDD_BUS_IDE);
-        ch     = hdd[d].ide_channel;
+        const int is_ide   = (hdd[d].bus_type == HDD_BUS_IDE);
+        const int ch       = hdd[d].ide_channel;
 
-        if (board == 4) {
-            valid_ch = ((ch >= 0) && (ch <= 1));
-            ch |= 8;
-        } else
-            valid_ch = ((ch >= min_ch) && (ch <= max_ch));
+        const int valid_ch = ((ch >= min_ch) && (ch <= max_ch));
 
         if (is_ide && valid_ch) {
             ide_log("Found IDE hard disk on channel %i\n", ch);
@@ -2744,8 +2908,8 @@ ide_board_setup(int board)
     ide_log("IDE: board %i: done, loaded %d disks.\n", board, c);
 
     for (d = 0; d < 2; d++) {
-        c   = (board << 1) + d;
-        dev = ide_drives[c];
+        c          = (board << 1) + d;
+        ide_t *dev = ide_drives[c];
 
         if (dev->type == IDE_NONE)
             continue;
@@ -2758,15 +2922,33 @@ ide_board_setup(int board)
         dev->tf->error = 1;
         if (dev->type != IDE_HDD)
             dev->cfg_spt = dev->cfg_hpc = 0;
-        if (dev->type == IDE_HDD)
+        if (dev->type == IDE_HDD) {
             dev->blocksize = hdd[dev->hdd_num].max_multiple_block;
+
+            /* Calculate the default heads and sectors. */
+            uint32_t d_hpc    = dev->hpc;
+            uint32_t d_spt    = dev->spt;
+
+            if ((dev->hpc > 16) || (dev->spt > 63)) {
+                /* HPC > 16, convert to 16 HPC. */
+                if (dev->hpc > 16)
+                    d_hpc = 16;
+                if (dev->spt > 63)
+                    d_spt = 63;
+            }
+
+            dev->cfg_spt = d_spt;
+            dev->cfg_hpc = d_hpc;
+        }
+
+        dev->params_specified = 0;
     }
 }
 
 static void
-ide_board_init(int board, int irq, int base_main, int side_main, int type)
+ide_board_init(int board, int irq, int base_main, int side_main, int type, int bus)
 {
-    ide_log("ide_board_init(%i, %i, %04X, %04X, %i)\n", board, irq, base_main, side_main, type);
+    ide_log("ide_board_init(%i, %i, %04X, %04X, %i, %i)\n", board, irq, base_main, side_main, type, bus);
 
     if ((ide_boards[board] != NULL) && ide_boards[board]->inited)
         return;
@@ -2782,7 +2964,9 @@ ide_board_init(int board, int irq, int base_main, int side_main, int type)
         ide_boards[board]->bit32 = 1;
     ide_boards[board]->base[0] = base_main;
     ide_boards[board]->base[1] = side_main;
-    ide_set_handlers(board);
+
+    if (!(bus & DEVICE_MCA))
+        ide_set_handlers(board);
 
     timer_add(&ide_boards[board]->timer, ide_board_callback, ide_boards[board], 0);
 
@@ -2791,6 +2975,36 @@ ide_board_init(int board, int irq, int base_main, int side_main, int type)
     ide_boards[board]->inited = 1;
 }
 
+/* Needed for ESS ES1688/968 PnP. */
+void
+ide_pnp_config_changed_1addr(uint8_t ld, isapnp_device_config_t *config, void *priv)
+{
+    intptr_t board = (intptr_t) priv;
+
+    if (ld)
+        return;
+
+    if (ide_boards[board]->base[0] || ide_boards[board]->base[1]) {
+        ide_remove_handlers(board);
+        ide_boards[board]->base[0] = ide_boards[board]->base[1] = 0;
+    }
+
+    ide_boards[board]->irq = -1;
+
+    if (config->activate) {
+        ide_boards[board]->base[0] = (config->io[0].base != ISAPNP_IO_DISABLED) ?
+                                     config->io[0].base : 0x0000;
+        ide_boards[board]->base[1] = (config->io[0].base != ISAPNP_IO_DISABLED) ?
+                                     (config->io[0].base + 0x0206) : 0x0000;
+
+        if (ide_boards[board]->base[0] && ide_boards[board]->base[1])
+            ide_set_handlers(board);
+
+        if (config->irq[0].irq != ISAPNP_IRQ_DISABLED)
+            ide_boards[board]->irq = config->irq[0].irq;
+    }
+}
+
 void
 ide_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *priv)
 {
@@ -2820,6 +3034,25 @@ ide_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *priv)
     }
 }
 
+static void *
+ide_sec_init(const device_t *info)
+{
+    /* Don't claim this channel again if it was already claimed. */
+    if (ide_boards[1])
+        return (NULL);
+
+    ide_board_init(1, HDC_SECONDARY_IRQ, HDC_SECONDARY_BASE, HDC_SECONDARY_SIDE, info->local, info->flags);
+
+    return (ide_boards[1]);
+}
+
+/* Close a standalone IDE unit. */
+static void
+ide_sec_close(UNUSED(void *priv))
+{
+    ide_board_close(1);
+}
+
 static void *
 ide_ter_init(const device_t *info)
 {
@@ -2834,13 +3067,12 @@ ide_ter_init(const device_t *info)
         irq = device_get_config_int("irq");
 
     if (irq < 0) {
-        ide_board_init(2, -1, 0, 0, 0);
+        ide_board_init(2, -1, 0, 0, 0, 0);
         if (irq == -1)
             isapnp_add_card(ide_ter_pnp_rom, sizeof(ide_ter_pnp_rom),
                             ide_pnp_config_changed, NULL, NULL, NULL, (void *) 2);
-    } else {
-        ide_board_init(2, irq, HDC_TERTIARY_BASE, HDC_TERTIARY_SIDE, 0);
-    }
+    } else
+        ide_board_init(2, irq, HDC_TERTIARY_BASE, HDC_TERTIARY_SIDE, 0, 0);
 
     return (ide_boards[2]);
 }
@@ -2866,12 +3098,12 @@ ide_qua_init(const device_t *info)
         irq = device_get_config_int("irq");
 
     if (irq < 0) {
-        ide_board_init(3, -1, 0, 0, 0);
+        ide_board_init(3, -1, 0, 0, 0, 0);
         if (irq == -1)
             isapnp_add_card(ide_qua_pnp_rom, sizeof(ide_qua_pnp_rom),
                             ide_pnp_config_changed, NULL, NULL, NULL, (void *) 3);
     } else
-        ide_board_init(3, irq, HDC_QUATERNARY_BASE, HDC_QUATERNARY_SIDE, 0);
+        ide_board_init(3, irq, HDC_QUATERNARY_BASE, HDC_QUATERNARY_SIDE, 0, 0);
 
     return (ide_boards[3]);
 }
@@ -2886,7 +3118,7 @@ ide_qua_close(UNUSED(void *priv))
 void *
 ide_xtide_init(void)
 {
-    ide_board_init(0, -1, 0, 0, 0);
+    ide_board_init(0, -1, 0, 0, 0, 0);
 
     return ide_boards[0];
 }
@@ -2899,7 +3131,7 @@ ide_xtide_close(void)
 
 void
 ide_set_bus_master(int board,
-                   int (*dma)(uint8_t *data, int transfer_length, int out, void *priv),
+                   int (*dma)(uint8_t *data, int transfer_length, int total_length, int out, void *priv),
                    void (*set_irq)(uint8_t status, void *priv), void *priv)
 {
     ide_bm_t *bm;
@@ -2922,10 +3154,17 @@ ide_init(const device_t *info)
 
     switch (info->local) {
         case 0 ... 5:
-            ide_board_init(0, 14, 0x1f0, 0x3f6, info->local);
+            ide_board_init(0, HDC_PRIMARY_IRQ, HDC_PRIMARY_BASE, HDC_PRIMARY_SIDE, info->local, info->flags);
 
             if (info->local & 1)
-                ide_board_init(1, 15, 0x170, 0x376, info->local);
+                ide_board_init(1, HDC_SECONDARY_IRQ, HDC_SECONDARY_BASE, HDC_SECONDARY_SIDE, info->local, info->flags);
+            break;
+
+        case 8 ... 0x0d:
+            ide_board_init(2, -1, 0, 0, info->local, info->flags);
+
+            if (info->local & 1)
+                ide_board_init(3, -1, 0, 0, info->local, info->flags);
             break;
 
         default:
@@ -3026,15 +3265,192 @@ ide_close(UNUSED(void *priv))
     }
 }
 
+void
+ide_hard_reset(void)
+{
+    for (int i = 0; i < IDE_BUS_MAX; i++)
+        ide_boards[i] = NULL;
+
+    for (int i = 0; i < IDE_NUM; i++)
+        ide_drives[i] = NULL;
+}
+
+static uint8_t
+mcide_mca_read(const int port, void *priv)
+{
+    const mcide_t *dev = (mcide_t *) priv;
+
+    ide_log("IDE: mcard(%04x)\n", port);
+
+    return (dev->pos_regs[port & 7]);
+}
+
+static void
+mcide_mca_write(const int port, const uint8_t val, void *priv)
+{
+    mcide_t *dev      = (mcide_t *) priv;
+    uint16_t bases[4] = { HDC_PRIMARY_BASE, HDC_SECONDARY_BASE, HDC_TERTIARY_BASE, HDC_QUATERNARY_BASE };
+    int irqs[4]       = { HDC_QUATERNARY_IRQ, HDC_TERTIARY_IRQ, HDC_PRIMARY_IRQ, HDC_SECONDARY_IRQ };
+
+    if ((port >= 0x102) && (dev->pos_regs[port & 7] != val)) {
+        ide_log("IDE: mcawr(%04x, %02x)  pos[2]=%02x pos[3]=%02x\n",
+                port, val, dev->pos_regs[2], dev->pos_regs[3]);
+
+        /* Save the new value. */
+        dev->pos_regs[port & 7] = val;
+
+        mem_mapping_disable(&dev->bios_rom.mapping);
+        dev->bios_addr          = 0x00000000;
+
+        ide_remove_handlers(0);
+        ide_boards[0]->base[0]  = ide_boards[0]->base[1] = 0x0000;
+
+        ide_boards[0]->irq      = -1;
+
+        ide_remove_handlers(1);
+        ide_boards[1]->base[0]  = ide_boards[1]->base[1] = 0x0000;
+
+        ide_boards[1]->irq      = -1;
+
+        if (dev->pos_regs[2] & 1) {
+            if (dev->pos_regs[2] & 0x80)
+                dev->bios_addr = 0x000c0000 + (0x00004000 * (uint32_t) ((dev->pos_regs[2] >> 4) & 0x07));
+
+            if (dev->pos_regs[3] & 0x08) {
+                ide_boards[0]->base[0] = bases[dev->pos_regs[3] & 0x03];
+                ide_boards[0]->base[1] = bases[dev->pos_regs[3] & 0x03] + 0x0206;
+            }
+
+            if (dev->pos_regs[3] & 0x80)
+                ide_boards[0]->irq = irqs[(dev->pos_regs[3] >> 4) & 0x03];
+
+            if (dev->pos_regs[4] & 0x08) {
+                ide_boards[1]->base[0] = bases[dev->pos_regs[4] & 0x03];
+                ide_boards[1]->base[1] = bases[dev->pos_regs[4] & 0x03] + 0x0206;
+            }
+
+            if (dev->pos_regs[4] & 0x80)
+                ide_boards[1]->irq = irqs[(dev->pos_regs[4] >> 4) & 0x03];
+
+            ide_set_handlers(0);
+
+            ide_set_handlers(1);
+
+            if (dev->bios_addr)
+                mem_mapping_set_addr(&dev->bios_rom.mapping, dev->bios_addr, 0x00004000);
+
+            /* Say hello. */
+            ide_log("McIDE: Primary Master I/O=%03X, Primary IRQ=%02i, "
+                    "Secondary Master I/O=%03X, Secondary IRQ=%02i, "
+                    "BIOS @%05X\n",
+                    ide_boards[0]->base[0], ide_boards[0]->irq,
+                    ide_boards[1]->base[0], ide_boards[1]->irq,
+                    dev->bios_addr);
+        }
+    }
+}
+
+static uint8_t
+mcide_mca_feedb(void *priv)
+{
+    const mcide_t *dev = (mcide_t *) priv;
+
+    return (dev->pos_regs[2] & 1);
+}
+
+static void
+mcide_mca_reset(void *priv)
+{
+    mcide_t *dev = (mcide_t *) priv;
+
+    for (uint8_t i = 0; i < 2; i++) {
+        if (ide_boards[i] != NULL)
+            ide_board_reset(i);
+    }
+
+    ide_log("McIDE: MCA Reset.\n");
+    mem_mapping_disable(&dev->bios_rom.mapping);
+    mcide_mca_write(0x102, 0, dev);
+}
+
+static void
+mcide_reset(UNUSED(void *priv))
+{
+    for (uint8_t i = 0; i < 2; i++) {
+        if (ide_boards[i] != NULL)
+            ide_board_reset(i);
+    }
+
+    ide_log("McIDE: Reset.\n");
+}
+
+static void *
+mcide_init(const device_t *info)
+{
+    ide_log("Initializing McIDE...\n");
+    mcide_t *dev = (mcide_t *) calloc(1, sizeof(mcide_t));
+
+    ide_board_init(0, -1, 0, 0, info->local, info->flags);
+    ide_board_init(1, -1, 0, 0, info->local, info->flags);
+
+    rom_init(&dev->bios_rom, ROM_PATH_MCIDE,
+                         0xc8000, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL);
+    mem_mapping_disable(&dev->bios_rom.mapping);
+
+    /* Set the MCA ID for this controller, 0xF171. */
+    dev->pos_regs[0] = 0xf1;
+    dev->pos_regs[1] = 0x71;
+
+    /* Enable the device. */
+    mca_add(mcide_mca_read, mcide_mca_write, mcide_mca_feedb, mcide_mca_reset, dev);
+
+    return dev;
+}
+
+static int
+mcide_available(void)
+{
+    return (rom_present(ROM_PATH_MCIDE));
+}
+
+static void
+mcide_close(void *priv)
+{
+    mcide_t *dev = (mcide_t *) priv;
+
+    for (uint8_t i = 0; i < 2; i++) {
+        if (ide_boards[i] != NULL) {
+            ide_board_close(i);
+            ide_boards[i] = NULL;
+        }
+    }
+
+    free(dev);
+}
+
 const device_t ide_isa_device = {
     .name          = "ISA PC/AT IDE Controller",
     .internal_name = "ide_isa",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0,
     .init          = ide_init,
     .close         = ide_close,
     .reset         = ide_reset,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ide_isa_sec_device = {
+    .name          = "ISA PC/AT IDE Controller (Secondary)",
+    .internal_name = "ide_isa_sec",
+    .flags         = DEVICE_ISA16,
+    .local         = 0,
+    .init          = ide_sec_init,
+    .close         = ide_sec_close,
+    .reset         = ide_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -3043,12 +3459,12 @@ const device_t ide_isa_device = {
 const device_t ide_isa_2ch_device = {
     .name          = "ISA PC/AT IDE Controller (Dual-Channel)",
     .internal_name = "ide_isa_2ch",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 1,
     .init          = ide_init,
     .close         = ide_close,
     .reset         = ide_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -3057,12 +3473,26 @@ const device_t ide_isa_2ch_device = {
 const device_t ide_vlb_device = {
     .name          = "VLB IDE Controller",
     .internal_name = "ide_vlb",
-    .flags         = DEVICE_VLB | DEVICE_AT,
+    .flags         = DEVICE_VLB,
     .local         = 2,
     .init          = ide_init,
     .close         = ide_close,
     .reset         = ide_reset,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ide_vlb_sec_device = {
+    .name          = "VLB IDE Controller (Secondary)",
+    .internal_name = "ide_vlb_sec",
+    .flags         = DEVICE_VLB,
+    .local         = 2,
+    .init          = ide_sec_init,
+    .close         = ide_sec_close,
+    .reset         = ide_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -3071,12 +3501,12 @@ const device_t ide_vlb_device = {
 const device_t ide_vlb_2ch_device = {
     .name          = "VLB IDE Controller (Dual-Channel)",
     .internal_name = "ide_vlb_2ch",
-    .flags         = DEVICE_VLB | DEVICE_AT,
+    .flags         = DEVICE_VLB,
     .local         = 3,
     .init          = ide_init,
     .close         = ide_close,
     .reset         = ide_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -3085,12 +3515,26 @@ const device_t ide_vlb_2ch_device = {
 const device_t ide_pci_device = {
     .name          = "PCI IDE Controller",
     .internal_name = "ide_pci",
-    .flags         = DEVICE_PCI | DEVICE_AT,
+    .flags         = DEVICE_PCI,
     .local         = 4,
     .init          = ide_init,
     .close         = ide_close,
     .reset         = ide_reset,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ide_pci_sec_device = {
+    .name          = "PCI IDE Controller (Secondary)",
+    .internal_name = "ide_pci_sec",
+    .flags         = DEVICE_PCI,
+    .local         = 4,
+    .init          = ide_sec_init,
+    .close         = ide_sec_close,
+    .reset         = ide_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -3099,12 +3543,26 @@ const device_t ide_pci_device = {
 const device_t ide_pci_2ch_device = {
     .name          = "PCI IDE Controller (Dual-Channel)",
     .internal_name = "ide_pci_2ch",
-    .flags         = DEVICE_PCI | DEVICE_AT,
+    .flags         = DEVICE_PCI,
     .local         = 5,
     .init          = ide_init,
     .close         = ide_close,
     .reset         = ide_reset,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t mcide_device = {
+    .name          = "MCA McIDE Controller",
+    .internal_name = "ide_mcide",
+    .flags         = DEVICE_MCA,
+    .local         = 1,
+    .init          = mcide_init,
+    .close         = mcide_close,
+    .reset         = mcide_reset,
+    .available     = mcide_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -3113,14 +3571,14 @@ const device_t ide_pci_2ch_device = {
 // clang-format off
 static const device_config_t ide_ter_config[] = {
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = HDC_TERTIARY_IRQ,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = HDC_TERTIARY_IRQ,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Plug and Play", .value = -1 },
             { .description = "IRQ 2",         .value =  2 },
             { .description = "IRQ 3",         .value =  3 },
@@ -3132,21 +3590,22 @@ static const device_config_t ide_ter_config[] = {
             { .description = "IRQ 11",        .value = 11 },
             { .description = "IRQ 12",        .value = 12 },
             { .description = ""                           }
-        }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t ide_qua_config[] = {
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = HDC_QUATERNARY_IRQ,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = HDC_QUATERNARY_IRQ,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Plug and Play", .value = -1 },
             { .description = "IRQ 2",         .value =  2 },
             { .description = "IRQ 3",         .value =  3 },
@@ -3158,7 +3617,8 @@ static const device_config_t ide_qua_config[] = {
             { .description = "IRQ 11",        .value = 11 },
             { .description = "IRQ 12",        .value = 12 },
             { .description = ""                           }
-        }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
@@ -3167,12 +3627,12 @@ static const device_config_t ide_qua_config[] = {
 const device_t ide_ter_device = {
     .name          = "Tertiary IDE Controller",
     .internal_name = "ide_ter",
-    .flags         = DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0,
     .init          = ide_ter_init,
     .close         = ide_ter_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = ide_ter_config
@@ -3181,12 +3641,12 @@ const device_t ide_ter_device = {
 const device_t ide_ter_pnp_device = {
     .name          = "Tertiary IDE Controller (Plug and Play only)",
     .internal_name = "ide_ter_pnp",
-    .flags         = DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 1,
     .init          = ide_ter_init,
     .close         = ide_ter_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -3195,12 +3655,12 @@ const device_t ide_ter_pnp_device = {
 const device_t ide_qua_device = {
     .name          = "Quaternary IDE Controller",
     .internal_name = "ide_qua",
-    .flags         = DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0,
     .init          = ide_qua_init,
     .close         = ide_qua_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = ide_qua_config
@@ -3209,13 +3669,27 @@ const device_t ide_qua_device = {
 const device_t ide_qua_pnp_device = {
     .name          = "Quaternary IDE Controller (Plug and Play only)",
     .internal_name = "ide_qua_pnp",
-    .flags         = DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 1,
     .init          = ide_qua_init,
     .close         = ide_qua_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
-    .config        = ide_qua_config
+    .config        = NULL
+};
+
+const device_t ide_pci_ter_qua_2ch_device = {
+    .name          = "PCI IDE Controller (Dual-Channel Tertiary/Quaternary)",
+    .internal_name = "ide_pci_ter_qua_2ch",
+    .flags         = DEVICE_PCI,
+    .local         = 0x0d,
+    .init          = ide_init,
+    .close         = ide_close,
+    .reset         = ide_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
 };
diff --git a/src/disk/hdc_ide_ali5213.c b/src/disk/hdc_ide_ali5213.c
index eee3844c4..67f959e1a 100644
--- a/src/disk/hdc_ide_ali5213.c
+++ b/src/disk/hdc_ide_ali5213.c
@@ -83,7 +83,7 @@ ali5213_write(uint16_t addr, uint8_t val, void *priv)
 {
     ali5213_t *dev = (ali5213_t *) priv;
 
-    ali5213_log("[%04X:%08X] [W] %02X = %02X (%i)\n", CS, cpu_state.pc, port, val, dev->tries);
+    ali5213_log("[%04X:%08X] [W] %02X = %02X\n", CS, cpu_state.pc, addr, val);
 
     switch (addr) {
         case 0xf4: /* Usually it writes 30h here */
@@ -179,7 +179,7 @@ ali5213_read(uint16_t addr, void *priv)
             break;
     }
 
-    ali5213_log("[%04X:%08X] [R] %02X = %02X\n", CS, cpu_state.pc, port, ret);
+    ali5213_log("[%04X:%08X] [R] %02X = %02X\n", CS, cpu_state.pc, addr, ret);
 
     return ret;
 }
@@ -246,7 +246,7 @@ const device_t ide_ali1489_device = {
     .init          = ali5213_init,
     .close         = ali5213_close,
     .reset         = ali5213_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -260,7 +260,7 @@ const device_t ide_ali5213_device = {
     .init          = ali5213_init,
     .close         = ali5213_close,
     .reset         = ali5213_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/disk/hdc_ide_cmd640.c b/src/disk/hdc_ide_cmd640.c
index 3e77730a2..dbdf32dcf 100644
--- a/src/disk/hdc_ide_cmd640.c
+++ b/src/disk/hdc_ide_cmd640.c
@@ -34,7 +34,7 @@
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
 #include <86box/hdc_ide_sff8038i.h>
-#include <86box/zip.h>
+#include <86box/rdisk.h>
 #include <86box/mo.h>
 
 typedef struct cmd640_t {
@@ -45,7 +45,7 @@ typedef struct cmd640_t {
     uint8_t  pci;
     uint8_t  irq_state;
     uint8_t  pci_slot;
-    uint8_t  pad0;
+    uint8_t  force_on;
     uint8_t  regs[256];
     uint32_t local;
     int      irq_mode[2];
@@ -143,7 +143,7 @@ cmd640_ide_handlers(cmd640_t *dev)
         ide_set_base(0, main);
         ide_set_side(0, side);
 
-        if (dev->regs[0x04] & 0x01)
+        if ((dev->regs[0x04] & 0x01) || dev->force_on)
             ide_pri_enable();
     }
 
@@ -161,7 +161,7 @@ cmd640_ide_handlers(cmd640_t *dev)
         ide_set_base(1, main);
         ide_set_side(1, side);
 
-        if ((dev->regs[0x04] & 0x01) && (dev->regs[0x51] & 0x08))
+        if (((dev->regs[0x04] & 0x01) || dev->force_on) && (dev->regs[0x51] & 0x08))
             ide_sec_enable();
     }
 }
@@ -417,10 +417,10 @@ cmd640_reset(void *priv)
             (cdrom[i].ide_channel <= max_channel) && cdrom[i].priv)
             scsi_cdrom_reset((scsi_common_t *) cdrom[i].priv);
     }
-    for (i = 0; i < ZIP_NUM; i++) {
-        if ((zip_drives[i].bus_type == ZIP_BUS_ATAPI) && (zip_drives[i].ide_channel >= min_channel) &&
-            (zip_drives[i].ide_channel <= max_channel) && zip_drives[i].priv)
-            zip_reset((scsi_common_t *) zip_drives[i].priv);
+    for (i = 0; i < RDISK_NUM; i++) {
+        if ((rdisk_drives[i].bus_type == RDISK_BUS_ATAPI) && (rdisk_drives[i].ide_channel >= min_channel) &&
+            (rdisk_drives[i].ide_channel <= max_channel) && rdisk_drives[i].priv)
+            rdisk_reset((scsi_common_t *) rdisk_drives[i].priv);
     }
     for (i = 0; i < MO_NUM; i++) {
         if ((mo_drives[i].bus_type == MO_BUS_ATAPI) && (mo_drives[i].ide_channel >= min_channel) &&
@@ -504,8 +504,7 @@ cmd640_close(void *priv)
 static void *
 cmd640_init(const device_t *info)
 {
-    cmd640_t *dev = (cmd640_t *) malloc(sizeof(cmd640_t));
-    memset(dev, 0x00, sizeof(cmd640_t));
+    cmd640_t *dev = (cmd640_t *) calloc(1, sizeof(cmd640_t));
 
     dev->id = next_id | 0x60;
 
@@ -513,6 +512,7 @@ cmd640_init(const device_t *info)
     dev->local = info->local;
 
     dev->channels = ((info->local & 0x60000) >> 17) & 0x03;
+    dev->force_on = !!(info->local & 0x100000);
 
     if (info->flags & DEVICE_PCI) {
         device_add(&ide_pci_2ch_device);
@@ -563,7 +563,7 @@ const device_t ide_cmd640_vlb_device = {
     .init          = cmd640_init,
     .close         = cmd640_close,
     .reset         = cmd640_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -577,7 +577,7 @@ const device_t ide_cmd640_vlb_178_device = {
     .init          = cmd640_init,
     .close         = cmd640_close,
     .reset         = cmd640_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -591,7 +591,7 @@ const device_t ide_cmd640_vlb_pri_device = {
     .init          = cmd640_init,
     .close         = cmd640_close,
     .reset         = cmd640_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -605,7 +605,7 @@ const device_t ide_cmd640_vlb_pri_178_device = {
     .init          = cmd640_init,
     .close         = cmd640_close,
     .reset         = cmd640_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -619,7 +619,7 @@ const device_t ide_cmd640_vlb_sec_device = {
     .init          = cmd640_init,
     .close         = cmd640_close,
     .reset         = cmd640_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -633,7 +633,7 @@ const device_t ide_cmd640_vlb_sec_178_device = {
     .init          = cmd640_init,
     .close         = cmd640_close,
     .reset         = cmd640_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -647,7 +647,7 @@ const device_t ide_cmd640_pci_device = {
     .init          = cmd640_init,
     .close         = cmd640_close,
     .reset         = cmd640_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -661,35 +661,35 @@ const device_t ide_cmd640_pci_legacy_only_device = {
     .init          = cmd640_init,
     .close         = cmd640_close,
     .reset         = cmd640_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
 };
 
 const device_t ide_cmd640_pci_single_channel_device = {
-    .name          = "CMD PCI-0640B PCI",
+    .name          = "CMD PCI-0640B PCI (Single Channel)",
     .internal_name = "ide_cmd640_pci_single_channel",
     .flags         = DEVICE_PCI,
     .local         = 0x2000a,
     .init          = cmd640_init,
     .close         = cmd640_close,
     .reset         = cmd640_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
 };
 
 const device_t ide_cmd640_pci_single_channel_sec_device = {
-    .name          = "CMD PCI-0640B PCI",
+    .name          = "CMD PCI-0640B PCI (Single Channel, Secondary)",
     .internal_name = "ide_cmd640_pci_single_channel_sec",
     .flags         = DEVICE_PCI,
     .local         = 0x4000a,
     .init          = cmd640_init,
     .close         = cmd640_close,
     .reset         = cmd640_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/disk/hdc_ide_cmd646.c b/src/disk/hdc_ide_cmd646.c
index 8367b9a41..7aa920e22 100644
--- a/src/disk/hdc_ide_cmd646.c
+++ b/src/disk/hdc_ide_cmd646.c
@@ -34,8 +34,26 @@
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
 #include <86box/hdc_ide_sff8038i.h>
-#include <86box/zip.h>
+#include <86box/rdisk.h>
+#include <86box/rom.h>
+#include <86box/hdd.h>
+#include <86box/scsi_disk.h>
 #include <86box/mo.h>
+#include "cpu.h"
+#include "x86.h"
+
+#define CMD_TYPE_646              0x0000000
+#define CMD_TYPE_648              0x0100000
+#define CMD_TYPE_649              0x0200000
+
+#define CMD648_JP7                0x0400000    /* Reload subsystem ID on reset. */
+#define CMD648_RAID               0x0800000
+
+#define CMD64X_ONBOARD            0x1000000
+
+#define CMD648_BIOS_FILE          "roms/hdd/ide/648_1910.bin"
+#define CMD649_REV_1914_BIOS_FILE "roms/hdd/ide/649_1914.bin"
+#define CMD649_REV_2301_BIOS_FILE "roms/hdd/ide/649_2301.bin"
 
 typedef struct cmd646_t {
     uint8_t     vlb_idx;
@@ -46,11 +64,17 @@ typedef struct cmd646_t {
     uint8_t     regs[256];
 
     uint32_t    local;
+    uint32_t    rom_addr;
+    uint32_t    rom_addr_size;
+    uint32_t    rom_addr_mask;
 
     int         irq_pin;
+    int         has_bios;
 
     int         irq_mode[2];
 
+    rom_t       bios_rom;
+
     sff8038i_t *bm[2];
 } cmd646_t;
 
@@ -80,7 +104,8 @@ cmd646_set_irq_0(uint8_t status, void *priv)
     if (!(dev->regs[0x50] & 0x04) || (status & 0x04))
         dev->regs[0x50] = (dev->regs[0x50] & ~0x04) | status;
 
-    sff_bus_master_set_irq(status, dev->bm[0]);
+    if (!(dev->local & CMD_TYPE_648) || !(dev->regs[0x71] & 0x10))
+        sff_bus_master_set_irq(status, dev->bm[0]);
 }
 
 static void
@@ -91,23 +116,24 @@ cmd646_set_irq_1(uint8_t status, void *priv)
     if (!(dev->regs[0x57] & 0x10) || (status & 0x04))
         dev->regs[0x57] = (dev->regs[0x57] & ~0x10) | (status << 2);
 
-    sff_bus_master_set_irq(status, dev->bm[1]);
+    if (!(dev->local & CMD_TYPE_648) || !(dev->regs[0x71] & 0x20))
+        sff_bus_master_set_irq(status, dev->bm[1]);
 }
 
 static int
-cmd646_bus_master_dma_0(uint8_t *data, int transfer_length, int out, void *priv)
+cmd646_bus_master_dma_0(uint8_t *data, int transfer_length, int total_length, int out, void *priv)
 {
     const cmd646_t *dev = (cmd646_t *) priv;
 
-    return sff_bus_master_dma(data, transfer_length, out, dev->bm[0]);
+    return sff_bus_master_dma(data, transfer_length, total_length, out, dev->bm[0]);
 }
 
 static int
-cmd646_bus_master_dma_1(uint8_t *data, int transfer_length, int out, void *priv)
+cmd646_bus_master_dma_1(uint8_t *data, int transfer_length, int total_length, int out, void *priv)
 {
     const cmd646_t *dev = (cmd646_t *) priv;
 
-    return sff_bus_master_dma(data, transfer_length, out, dev->bm[1]);
+    return sff_bus_master_dma(data, transfer_length, total_length, out, dev->bm[1]);
 }
 
 static void
@@ -116,13 +142,24 @@ cmd646_ide_handlers(cmd646_t *dev)
     uint16_t main;
     uint16_t side;
     int      irq_mode[2] = { IRQ_MODE_LEGACY, IRQ_MODE_LEGACY };
+    int      first       = 0;
+    int      reg09       = dev->regs[0x09];
+    int      reg50       = dev->regs[0x50];
+
+    if ((dev->local & CMD_TYPE_648) && (dev->local & CMD648_RAID)) {
+        reg09 = 0xff;
+        reg50 |= 0x40;
+    }
+
+    if (dev->local & 0x80000)
+        first += 2;
 
     sff_set_slot(dev->bm[0], dev->pci_slot);
     sff_set_slot(dev->bm[1], dev->pci_slot);
 
-    ide_pri_disable();
+    ide_handlers(first, 0);
 
-    if ((dev->regs[0x09] & 0x01) && (dev->regs[0x50] & 0x40)) {
+    if ((reg09 & 0x01) && (reg50 & 0x40)) {
         main = (dev->regs[0x11] << 8) | (dev->regs[0x10] & 0xf8);
         side = ((dev->regs[0x15] << 8) | (dev->regs[0x14] & 0xfc)) + 2;
     } else {
@@ -130,23 +167,28 @@ cmd646_ide_handlers(cmd646_t *dev)
         side = 0x3f6;
     }
 
-    ide_set_base(0, main);
-    ide_set_side(0, side);
+    ide_set_base(first, main);
+    ide_set_side(first, side);
 
-    if (dev->regs[0x09] & 0x01)
+    if (reg09 & 0x01)
         irq_mode[0] = IRQ_MODE_PCI_IRQ_PIN;
 
     sff_set_irq_mode(dev->bm[0], irq_mode[0]);
+    cmd646_log("IDE %i: %04X, %04X, %i\n", first, main, side, irq_mode[0]);
 
-    if (dev->regs[0x04] & 0x01)
-        ide_pri_enable();
+    int pri_enabled = (dev->regs[0x04] & 0x01);
+    if (dev->local & CMD_TYPE_648)
+        pri_enabled = pri_enabled && (dev->regs[0x51] & 0x04);
+
+    if (pri_enabled)
+        ide_handlers(first, 1);
 
     if (dev->single_channel)
         return;
 
-    ide_sec_disable();
+    ide_handlers(first + 1, 0);
 
-    if ((dev->regs[0x09] & 0x04) && (dev->regs[0x50] & 0x40)) {
+    if ((reg09 & 0x04) && (reg50 & 0x40)) {
         main = (dev->regs[0x19] << 8) | (dev->regs[0x18] & 0xf8);
         side = ((dev->regs[0x1d] << 8) | (dev->regs[0x1c] & 0xfc)) + 2;
     } else {
@@ -154,16 +196,17 @@ cmd646_ide_handlers(cmd646_t *dev)
         side = 0x376;
     }
 
-    ide_set_base(1, main);
-    ide_set_side(1, side);
+    ide_set_base(first + 1, main);
+    ide_set_side(first + 1, side);
 
-    if (dev->regs[0x09] & 0x04)
-        irq_mode[1] = 1;
+    if (reg09 & 0x04)
+        irq_mode[1] = IRQ_MODE_PCI_IRQ_PIN;
 
     sff_set_irq_mode(dev->bm[1], irq_mode[1]);
+    cmd646_log("IDE %i: %04X, %04X, %i\n", first + 1, main, side, irq_mode[1]);
 
     if ((dev->regs[0x04] & 0x01) && (dev->regs[0x51] & 0x08))
-        ide_sec_enable();
+        ide_handlers(first + 1, 1);
 }
 
 static void
@@ -175,74 +218,176 @@ cmd646_ide_bm_handlers(cmd646_t *dev)
     sff_bus_master_handler(dev->bm[1], (dev->regs[0x04] & 1), base + 8);
 }
 
+uint8_t
+cmd646_bm_write(uint16_t port, uint8_t val, void *priv)
+{
+    cmd646_t *dev = (cmd646_t *) priv;
+    uint8_t   ret = val;
+
+    switch (port & 0x000f) {
+        case 0x0001:
+            dev->regs[(port & 0x000f) | 0x70] = val & 0xf0;
+            if (val & 0x04)
+                dev->regs[0x50] &= ~0x04;
+            if (val & 0x08)
+                dev->regs[0x57] &= ~0x10;
+            ret &= 0x03;
+            break; 
+        case 0x0003:
+            dev->regs[0x73] = val;
+            break; 
+        case 0x0009:
+            dev->regs[(port & 0x000f) | 0x70] = (dev->regs[(port & 0x000f) | 0x70] & 0x0f) | (val & 0xf0);
+            ret &= 0x03;
+            break; 
+        case 0x000b:
+            dev->regs[0x7b] = val;
+            break; 
+   }
+
+   return ret;
+}
+
+uint8_t
+cmd646_bm_read(uint16_t port, uint8_t val, void *priv)
+{
+    cmd646_t *dev = (cmd646_t *) priv;
+    uint8_t   ret = val;
+
+    switch (port & 0x000f) {
+        case 0x0001:
+            ret = (dev->regs[(port & 0x000f) | 0x70] & 0xf3) | (dev->regs[0x50] & 0x04) | ((dev->regs[0x57] & 0x10) >> 1);
+            break;
+        case 0x0002: case 0x000a:
+            ret |= 0x08;
+            break;
+        case 0x0003:
+            ret = dev->regs[0x73];
+            break; 
+        case 0x0009:
+            ret = dev->regs[(port & 0x000f) | 0x70];
+            break;
+        case 0x000b:
+            ret = dev->regs[0x7b];
+            break; 
+   }
+
+   return ret;
+}
+
+static void
+cmd646_bios_handler(cmd646_t *dev)
+{
+    if ((dev->local & CMD_TYPE_648) && dev->has_bios) {
+        uint32_t *addr = (uint32_t *) &(dev->regs[0x30]);
+
+        *addr         &= (~dev->rom_addr_mask) | 0x00000001;
+        dev->rom_addr  = *addr & 0xfffffff0;
+
+        cmd646_log("ROM address now: %08X\n", dev->rom_addr);
+
+        if ((dev->regs[0x04] & 0x02) && (*addr & 0x00000001))
+            mem_mapping_set_addr(&dev->bios_rom.mapping, dev->rom_addr, dev->rom_addr_size);
+        else
+            mem_mapping_disable(&dev->bios_rom.mapping);
+    }
+}
+
 static void
 cmd646_pci_write(int func, int addr, uint8_t val, void *priv)
 {
-    cmd646_t *dev = (cmd646_t *) priv;
+    cmd646_t *dev   = (cmd646_t *) priv;
+    int       reg50 = dev->regs[0x50];
+
+    if ((dev->local & CMD_TYPE_648) && (dev->regs[0x0a] == 0x04) && (dev->regs[0x0b] == 0x01))
+        reg50 |= 0x40;
 
     cmd646_log("[%04X:%08X] (%08X) cmd646_pci_write(%i, %02X, %02X)\n", CS, cpu_state.pc, ESI, func, addr, val);
 
     if (func == 0x00)
         switch (addr) {
             case 0x04:
-                dev->regs[addr] = (val & 0x45);
+                if (dev->has_bios)
+                    dev->regs[addr] = (val & 0x47);
+                else
+                    dev->regs[addr] = (val & 0x45);
+
                 cmd646_ide_handlers(dev);
+                cmd646_ide_bm_handlers(dev);
+
+                cmd646_bios_handler(dev);
+                break;
+            case 0x05:
+                if (dev->local & CMD_TYPE_648)
+                    dev->regs[addr] = (dev->regs[addr] & 0x7e) | (val & 0x01);
                 break;
             case 0x07:
-                dev->regs[addr] &= ~(val & 0xb1);
+                if (dev->local & CMD_TYPE_648)
+                    dev->regs[addr] = ((dev->regs[addr] & ~(val & 0xb9)) & 0xbf) | (val & 0x40);
+                else
+                    dev->regs[addr] &= ~(val & 0xb1);
                 break;
             case 0x09:
-                if ((dev->regs[addr] & 0x0a) == 0x0a) {
-                    dev->regs[addr]  = (dev->regs[addr] & 0x0a) | (val & 0x05);
-                    dev->irq_mode[0] = !!(val & 0x01);
-                    dev->irq_mode[1] = !!(val & 0x04);
+                if (!(dev->local & CMD_TYPE_648) ||
+                    ((dev->regs[0x0a] == 0x01) && (dev->regs[0x0b] == 0x01))) {
+                    if ((dev->regs[addr] & 0x0a) == 0x0a) {
+                        dev->regs[addr]  = (dev->regs[addr] & 0x8a) | (val & 0x05);
+                        dev->irq_mode[0] = !!(val & 0x01);
+                        dev->irq_mode[1] = !!(val & 0x04);
+                        cmd646_ide_handlers(dev);
+                    }
+                }
+                break;
+            case 0x0a: case 0x0b:
+                if ((dev->local & CMD_TYPE_648) && (dev->regs[0x4f] & 0x04)) {
+                    dev->regs[addr] = val;
                     cmd646_ide_handlers(dev);
                 }
                 break;
             case 0x10:
-                if (dev->regs[0x50] & 0x40) {
+                if (reg50 & 0x40) {
                     dev->regs[0x10] = (val & 0xf8) | 1;
                     cmd646_ide_handlers(dev);
                 }
                 break;
             case 0x11:
-                if (dev->regs[0x50] & 0x40) {
+                if (reg50 & 0x40) {
                     dev->regs[0x11] = val;
                     cmd646_ide_handlers(dev);
                 }
                 break;
             case 0x14:
-                if (dev->regs[0x50] & 0x40) {
+                if (reg50 & 0x40) {
                     dev->regs[0x14] = (val & 0xfc) | 1;
                     cmd646_ide_handlers(dev);
                 }
                 break;
             case 0x15:
-                if (dev->regs[0x50] & 0x40) {
+                if (reg50 & 0x40) {
                     dev->regs[0x15] = val;
                     cmd646_ide_handlers(dev);
                 }
                 break;
             case 0x18:
-                if (dev->regs[0x50] & 0x40) {
+                if (reg50 & 0x40) {
                     dev->regs[0x18] = (val & 0xf8) | 1;
                     cmd646_ide_handlers(dev);
                 }
                 break;
             case 0x19:
-                if (dev->regs[0x50] & 0x40) {
+                if (reg50 & 0x40) {
                     dev->regs[0x19] = val;
                     cmd646_ide_handlers(dev);
                 }
                 break;
             case 0x1c:
-                if (dev->regs[0x50] & 0x40) {
+                if (reg50 & 0x40) {
                     dev->regs[0x1c] = (val & 0xfc) | 1;
                     cmd646_ide_handlers(dev);
                 }
                 break;
             case 0x1d:
-                if (dev->regs[0x50] & 0x40) {
+                if (reg50 & 0x40) {
                     dev->regs[0x1d] = val;
                     cmd646_ide_handlers(dev);
                 }
@@ -255,18 +400,42 @@ cmd646_pci_write(int func, int addr, uint8_t val, void *priv)
                 dev->regs[0x21] = val;
                 cmd646_ide_bm_handlers(dev);
                 break;
+            case 0x2c ... 0x2f:
+            case 0x8c ... 0x8f:
+                if (dev->local & CMD_TYPE_648)
+                    dev->regs[(addr & 0x0f) | 0x20] = val;
+                break;
+            case 0x30 ... 0x33:
+                if ((dev->local & CMD_TYPE_648) && dev->has_bios) {
+                    dev->regs[addr] = val;
+                    cmd646_bios_handler(dev);
+                }
+                break;
+            case 0x3c:
+                dev->regs[0x3c] = val;
+                break;
+            case 0x4f:
+                if (dev->local & CMD_TYPE_648)
+                    dev->regs[addr] = (dev->regs[addr] & 0xfa) | (val & 0x05);
+                break;
             case 0x51:
-                dev->regs[addr] = val & 0xc8;
+                if (dev->local & CMD_TYPE_648)
+                    dev->regs[addr] = val & 0xcc;
+                else
+                    dev->regs[addr] = val & 0xc8;
                 cmd646_ide_handlers(dev);
                 break;
             case 0x52:
             case 0x54:
             case 0x56:
             case 0x58:
-            case 0x59:
             case 0x5b:
                 dev->regs[addr] = val;
                 break;
+            case 0x59:
+                if ((dev->local & CMD_TYPE_649) || !(dev->local & CMD_TYPE_648))
+                    dev->regs[addr] = val;
+                break;
             case 0x53:
             case 0x55:
                 dev->regs[addr] = val & 0xc0;
@@ -274,10 +443,32 @@ cmd646_pci_write(int func, int addr, uint8_t val, void *priv)
             case 0x57:
                 dev->regs[addr] = (dev->regs[addr] & 0x10) | (val & 0xcc);
                 break;
-            case 0x70 ... 0x77:
+            case 0x64:
+                if (dev->local & CMD_TYPE_648)
+                    dev->regs[addr] = (dev->regs[addr] & 0xfc) | (val & 0x03);
+                break;
+            case 0x65:
+                if (dev->local & CMD_TYPE_648)
+                    dev->regs[addr] = (dev->regs[addr] & 0x7f) | (val & 0x80);
+                break;
+            case 0x71:
+                if (dev->local & CMD_TYPE_648)
+                    sff_bus_master_write(addr & 0x0f, val, dev->bm[0]);
+                else
+                    sff_bus_master_write(addr & 0x0f, val & 0x03, dev->bm[0]);
+                break;
+            case 0x70:
+            case 0x72 ... 0x77:
                 sff_bus_master_write(addr & 0x0f, val, dev->bm[0]);
                 break;
-            case 0x78 ... 0x7f:
+            case 0x79:
+                if (dev->local & CMD_TYPE_648)
+                    sff_bus_master_write(addr & 0x0f, val, dev->bm[1]);
+                else
+                    sff_bus_master_write(addr & 0x0f, val & 0x03, dev->bm[1]);
+                break;
+            case 0x78:
+            case 0x7a ... 0x7f:
                 sff_bus_master_write(addr & 0x0f, val, dev->bm[1]);
                 break;
 
@@ -295,14 +486,18 @@ cmd646_pci_read(int func, int addr, void *priv)
     if (func == 0x00) {
         ret = dev->regs[addr];
 
-        if (addr == 0x50)
+        if ((addr == 0x09) && (dev->local & CMD_TYPE_648) && (dev->regs[0x0a] == 0x04))
+            ret = 0x00;
+        else if (addr == 0x50)
             dev->regs[0x50] &= ~0x04;
         else if (addr == 0x57)
             dev->regs[0x57] &= ~0x10;
         else if ((addr >= 0x70) && (addr <= 0x77))
             ret = sff_bus_master_read(addr & 0x0f, dev->bm[0]);
         else if ((addr >= 0x78) && (addr <= 0x7f))
-            ret = sff_bus_master_read(addr & 0x0f, dev->bm[0]);
+            ret = sff_bus_master_read(addr & 0x0f, dev->bm[1]);
+        else if ((dev->local & CMD_TYPE_648) && (addr >= 0x8c) && (addr <= 0x8f))
+            ret = dev->regs[(addr & 0x0f) | 0x20];
     }
 
     cmd646_log("[%04X:%08X] (%08X) cmd646_pci_read(%i, %02X, %02X)\n", CS, cpu_state.pc, ESI, func, addr, ret);
@@ -310,22 +505,44 @@ cmd646_pci_read(int func, int addr, void *priv)
     return ret;
 }
 
+static int
+check_ch(cmd646_t *dev, int channel)
+{
+    int ret = 0;
+    int min = 0;
+    int max = dev->single_channel ? 1 : 3;
+
+    if (dev->local & 0x80000) {
+        min += 4;
+        max += 4;
+    }
+
+    if ((channel >= min) && (channel <= max))
+        ret = 1;
+
+    return ret;
+}
+
 static void
 cmd646_reset(void *priv)
 {
     cmd646_t *dev = (cmd646_t *) priv;
     int       i   = 0;
 
+    for (i = 0; i < HDD_NUM; i++) {
+        if ((hdd[i].bus_type == HDD_BUS_ATAPI) && check_ch(dev, hdd[i].ide_channel) && hdd[i].priv)
+            scsi_disk_reset((scsi_common_t *) hdd[i].priv);
+    }
     for (i = 0; i < CDROM_NUM; i++) {
-        if ((cdrom[i].bus_type == CDROM_BUS_ATAPI) && (cdrom[i].ide_channel < 4) && cdrom[i].priv)
+        if ((cdrom[i].bus_type == CDROM_BUS_ATAPI) && check_ch(dev, cdrom[i].ide_channel) && cdrom[i].priv)
             scsi_cdrom_reset((scsi_common_t *) cdrom[i].priv);
     }
-    for (i = 0; i < ZIP_NUM; i++) {
-        if ((zip_drives[i].bus_type == ZIP_BUS_ATAPI) && (zip_drives[i].ide_channel < 4) && zip_drives[i].priv)
-            zip_reset((scsi_common_t *) zip_drives[i].priv);
+    for (i = 0; i < RDISK_NUM; i++) {
+        if ((rdisk_drives[i].bus_type == RDISK_BUS_ATAPI) && check_ch(dev, rdisk_drives[i].ide_channel) && rdisk_drives[i].priv)
+            rdisk_reset((scsi_common_t *) rdisk_drives[i].priv);
     }
     for (i = 0; i < MO_NUM; i++) {
-        if ((mo_drives[i].bus_type == MO_BUS_ATAPI) && (mo_drives[i].ide_channel < 4) && mo_drives[i].priv)
+        if ((mo_drives[i].bus_type == MO_BUS_ATAPI) && check_ch(dev, mo_drives[i].ide_channel) && mo_drives[i].priv)
             mo_reset((scsi_common_t *) mo_drives[i].priv);
     }
 
@@ -336,16 +553,40 @@ cmd646_reset(void *priv)
 
     dev->regs[0x00] = 0x95; /* CMD */
     dev->regs[0x01] = 0x10;
-    dev->regs[0x02] = 0x46; /* PCI-0646 */
+    if (dev->local & CMD_TYPE_649)
+        dev->regs[0x02] = 0x49; /* PCI-0649 */
+    else if (dev->local & CMD_TYPE_648)
+        dev->regs[0x02] = 0x48; /* PCI-0648 */
+    else
+        dev->regs[0x02] = 0x46; /* PCI-0646 */
     dev->regs[0x03] = 0x06;
     dev->regs[0x04] = 0x00;
-    dev->regs[0x06] = 0x80;
     dev->regs[0x07] = 0x02;       /* DEVSEL timing: 01 medium */
     dev->regs[0x09] = dev->local; /* Programming interface */
-    dev->regs[0x0a] = 0x01;       /* IDE controller */
+    if ((dev->local & CMD_TYPE_648) && (dev->local & CMD648_RAID)) {
+        dev->regs[0x06] = 0x90;
+        dev->regs[0x08] = 0x02;
+        dev->regs[0x0a] = 0x04;       /* RAID controller */
+
+        dev->regs[0x50] = 0x40;       /* Enable Base address register R/W;
+                                         If 0, they return 0 and are read-only 8 */
+
+        /* Blank base addresses */
+        dev->regs[0x10] = 0x01;
+        dev->regs[0x14] = 0x01;
+        dev->regs[0x18] = 0x01;
+        dev->regs[0x1c] = 0x01;
+    } else {
+        dev->regs[0x06] = 0x80;
+        dev->regs[0x0a] = 0x01;       /* IDE controller */
+    }
     dev->regs[0x0b] = 0x01;       /* Mass storage controller */
 
-    if ((dev->local & 0xffff) == 0x8a) {
+    if ((dev->local & CMD_TYPE_648) && (dev->local & CMD648_JP7))
+        for (int i = 0; i < 4; i++)
+            dev->regs[0x2c + i] = dev->regs[i];
+
+    if ((dev->regs[0x0a] == 0x01) && ((dev->regs[0x09] & 0x8a) == 0x8a)) {
         dev->regs[0x50] = 0x40; /* Enable Base address register R/W;
                                    If 0, they return 0 and are read-only 8 */
 
@@ -371,13 +612,47 @@ cmd646_reset(void *priv)
         dev->regs[0x51] = 0x08;
 
     dev->regs[0x57] = 0x0c;
-    dev->regs[0x59] = 0x40;
 
-    dev->irq_mode[0] = dev->irq_mode[1] = 0;
+    if (dev->local & CMD_TYPE_648) {
+        dev->regs[0x34] = 0x60;
+
+        dev->regs[0x4f] = (dev->local & CMD648_JP7) ? 0x02 : 0x00;
+        dev->regs[0x51] |= 0x04;
+
+        if (dev->local & CMD_TYPE_649) {
+            dev->regs[0x57] |= 0x80;
+            dev->regs[0x59] = 0x40;
+        } else
+            dev->regs[0x57] |= 0xc0;
+
+        dev->regs[0x60] = 0x01;
+        dev->regs[0x62] = 0x21;
+        dev->regs[0x63] = 0x06;
+        dev->regs[0x65] = 0x60;
+        dev->regs[0x67] = 0xf0;
+
+        /* 80-pin stuff. */
+        dev->regs[0x72] = 0x08;
+        dev->regs[0x7a] = 0x08;
+        dev->regs[0x79] = 0x83;
+    } else
+        dev->regs[0x59] = 0x40;
+
     dev->irq_pin                        = PCI_INTA;
 
+    if ((dev->local & CMD_TYPE_648) && (dev->local & CMD648_RAID))
+        dev->irq_mode[0] = dev->irq_mode[1] = IRQ_MODE_PCI_IRQ_PIN;
+    else {
+        dev->irq_mode[0] = (dev->regs[0x09] & 0x01) ? IRQ_MODE_PCI_IRQ_PIN : IRQ_MODE_LEGACY;
+        dev->irq_mode[1] = (dev->regs[0x09] & 0x04) ? IRQ_MODE_PCI_IRQ_PIN : IRQ_MODE_LEGACY;
+    }
+
+    dev->irq_pin     = PCI_INTA;
+
     cmd646_ide_handlers(dev);
     cmd646_ide_bm_handlers(dev);
+
+    cmd646_bios_handler(dev);
 }
 
 static void
@@ -391,47 +666,151 @@ cmd646_close(void *priv)
 static void *
 cmd646_init(const device_t *info)
 {
-    cmd646_t *dev = (cmd646_t *) malloc(sizeof(cmd646_t));
-    memset(dev, 0x00, sizeof(cmd646_t));
+    cmd646_t *dev   = (cmd646_t *) calloc(1, sizeof(cmd646_t));
+    int       first = 0;
 
     dev->local = info->local;
 
     device_add(&ide_pci_2ch_device);
 
-    if (info->local & 0x80000)
-        pci_add_card(PCI_ADD_NORMAL, cmd646_pci_read, cmd646_pci_write, dev, &dev->pci_slot);
-    else
+    if (info->local & 0x80000) {
+        first = 2;
+        device_add(&ide_pci_ter_qua_2ch_device);
+    } else
+        device_add(&ide_pci_2ch_device);
+
+    if (info->local & CMD64X_ONBOARD)
         pci_add_card(PCI_ADD_IDE, cmd646_pci_read, cmd646_pci_write, dev, &dev->pci_slot);
+    else
+        pci_add_card(PCI_ADD_NORMAL, cmd646_pci_read, cmd646_pci_write, dev, &dev->pci_slot);
 
     dev->single_channel = !!(info->local & 0x20000);
 
-    dev->bm[0] = device_add_inst(&sff8038i_device, 1);
+    dev->bm[0] = device_add_inst(&sff8038i_device, first + 1);
     if (!dev->single_channel)
-        dev->bm[1] = device_add_inst(&sff8038i_device, 2);
+        dev->bm[1] = device_add_inst(&sff8038i_device, first + 2);
 
-    ide_set_bus_master(0, cmd646_bus_master_dma_0, cmd646_set_irq_0, dev);
+    ide_set_bus_master(first, cmd646_bus_master_dma_0, cmd646_set_irq_0, dev);
     if (!dev->single_channel)
-        ide_set_bus_master(1, cmd646_bus_master_dma_1, cmd646_set_irq_1, dev);
+        ide_set_bus_master(first + 1, cmd646_bus_master_dma_1, cmd646_set_irq_1, dev);
 
     sff_set_irq_mode(dev->bm[0], IRQ_MODE_LEGACY);
 
     if (!dev->single_channel)
         sff_set_irq_mode(dev->bm[1], IRQ_MODE_LEGACY);
 
+    sff_set_slot(dev->bm[0], dev->pci_slot);
+    sff_set_slot(dev->bm[1], dev->pci_slot);
+
+    if (dev->local & CMD_TYPE_648) {
+        sff_set_ven_handlers(dev->bm[0], cmd646_bm_write, cmd646_bm_read, dev);
+        sff_set_ven_handlers(dev->bm[1], cmd646_bm_write, cmd646_bm_read, dev);
+
+        dev->has_bios = device_get_config_int("bios");
+
+        if (dev->has_bios) {
+            char *fn             = NULL;
+
+            if (dev->local & CMD_TYPE_649) {
+                const char *bios_rev = (char *) device_get_config_bios("bios_rev");
+                fn                   = (char *) device_get_bios_file(info, bios_rev, 0);
+
+                dev->rom_addr_size   = device_get_bios_file_size(info, bios_rev);
+            } else {
+                fn                   = CMD648_BIOS_FILE;
+
+                dev->rom_addr_size   = 0x00004000;
+            }
+
+            dev->rom_addr_mask   = dev->rom_addr_size - 1;
+
+            rom_init(&dev->bios_rom, fn,
+                     0x000d0000, dev->rom_addr_size, dev->rom_addr_mask, 0, MEM_MAPPING_EXTERNAL);
+
+            mem_mapping_disable(&dev->bios_rom.mapping);
+        }
+    }
+
     cmd646_reset(dev);
 
+    if (dev->local & CMD_TYPE_648)
+        for (int i = 0; i < 4; i++)
+            dev->regs[0x2c + i] = dev->regs[i];
+
     return dev;
 }
 
+static const device_config_t cmd648_config[] = {
+    {
+        .name           = "bios",
+        .description    = "Enable BIOS",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+// clang-format on
+
+static const device_config_t cmd649_config[] = {
+    {
+        .name           = "bios",
+        .description    = "Enable BIOS",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_rev",
+        .description    = "BIOS Revision",
+        .type           = CONFIG_BIOS,
+        .default_string = "rev_2301",
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .bios           = {
+            {
+                .name          = "Revision 1.9.14",
+                .internal_name = "rev_1914",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 16384,
+                .files         = { CMD649_REV_2301_BIOS_FILE, "" }
+            },
+            {
+                .name          = "Revision 2.3.01",
+                .internal_name = "rev_2301",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 65536,
+                .files         = { CMD649_REV_2301_BIOS_FILE, "" }
+            },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+// clang-format on
+
 const device_t ide_cmd646_device = {
     .name          = "CMD PCI-0646",
     .internal_name = "ide_cmd646",
     .flags         = DEVICE_PCI,
-    .local         = 0x8a,
+    .local         = 0x000008a | CMD64X_ONBOARD,
     .init          = cmd646_init,
     .close         = cmd646_close,
     .reset         = cmd646_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -441,26 +820,82 @@ const device_t ide_cmd646_legacy_only_device = {
     .name          = "CMD PCI-0646 (Legacy Mode Only)",
     .internal_name = "ide_cmd646_legacy_only",
     .flags         = DEVICE_PCI,
-    .local         = 0x80,
+    .local         = 0x0000080 | CMD64X_ONBOARD,
     .init          = cmd646_init,
     .close         = cmd646_close,
     .reset         = cmd646_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
 };
 
 const device_t ide_cmd646_single_channel_device = {
-    .name          = "CMD PCI-0646",
+    .name          = "CMD PCI-0646 (Single Channel)",
     .internal_name = "ide_cmd646_single_channel",
     .flags         = DEVICE_PCI,
-    .local         = 0x2008a,
+    .local         = 0x002008a | CMD64X_ONBOARD,
     .init          = cmd646_init,
     .close         = cmd646_close,
     .reset         = cmd646_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
 };
+
+const device_t ide_cmd646_ter_qua_device = {
+    .name          = "CMD PCI-0646 (Tertiary and Quaternary)",
+    .internal_name = "ide_cmd646_ter_qua",
+    .flags         = DEVICE_PCI,
+    .local         = 0x008008f,
+    .init          = cmd646_init,
+    .close         = cmd646_close,
+    .reset         = cmd646_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ide_cmd648_ter_qua_device = {
+    .name          = "CMD PCI-0648 (Tertiary and Quaternary)",
+    .internal_name = "ide_cmd648_ter_qua",
+    .flags         = DEVICE_PCI,
+    .local         = 0x0d8008f,
+    .init          = cmd646_init,
+    .close         = cmd646_close,
+    .reset         = cmd646_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = cmd648_config
+};
+
+const device_t ide_cmd648_ter_qua_onboard_device = {
+    .name          = "CMD PCI-0648 (Tertiary and Quaternary) On-Board",
+    .internal_name = "ide_cmd648_ter_qua_onboard",
+    .flags         = DEVICE_PCI,
+    .local         = 0x0d8008f | CMD64X_ONBOARD,
+    .init          = cmd646_init,
+    .close         = cmd646_close,
+    .reset         = cmd646_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ide_cmd649_ter_qua_device = {
+    .name          = "CMD PCI-0649 (Tertiary and Quaternary)",
+    .internal_name = "ide_cmd649_ter_qua",
+    .flags         = DEVICE_PCI,
+    .local         = 0x0f8008f,
+    .init          = cmd646_init,
+    .close         = cmd646_close,
+    .reset         = cmd646_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = cmd649_config
+};
diff --git a/src/disk/hdc_ide_opti611.c b/src/disk/hdc_ide_opti611.c
index 480331201..4927b5fe3 100644
--- a/src/disk/hdc_ide_opti611.c
+++ b/src/disk/hdc_ide_opti611.c
@@ -317,8 +317,7 @@ opti611_close(void *priv)
 static void *
 opti611_init(UNUSED(const device_t *info))
 {
-    opti611_t *dev = (opti611_t *) malloc(sizeof(opti611_t));
-    memset(dev, 0, sizeof(opti611_t));
+    opti611_t *dev = (opti611_t *) calloc(1, sizeof(opti611_t));
 
     dev->is_sec = info->local;
 
@@ -341,7 +340,7 @@ const device_t ide_opti611_vlb_device = {
     .init          = opti611_init,
     .close         = opti611_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -355,7 +354,7 @@ const device_t ide_opti611_vlb_sec_device = {
     .init          = opti611_init,
     .close         = opti611_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/disk/hdc_ide_rz1000.c b/src/disk/hdc_ide_rz1000.c
new file mode 100644
index 000000000..6b7aa68e8
--- /dev/null
+++ b/src/disk/hdc_ide_rz1000.c
@@ -0,0 +1,298 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the PC Technology RZ-1000 controller.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2025 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/cdrom.h>
+#include <86box/scsi_device.h>
+#include <86box/scsi_cdrom.h>
+#include <86box/dma.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/keyboard.h>
+#include <86box/mem.h>
+#include <86box/pci.h>
+#include <86box/pic.h>
+#include <86box/timer.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/hdc_ide_sff8038i.h>
+#include <86box/rdisk.h>
+#include <86box/mo.h>
+
+typedef struct rz1000_t {
+    uint8_t  vlb_idx;
+    uint8_t  id;
+    uint8_t  in_cfg;
+    uint8_t  channels;
+    uint8_t  pci;
+    uint8_t  irq_state;
+    uint8_t  pci_slot;
+    uint8_t  pad0;
+    uint8_t  regs[256];
+    uint32_t local;
+    int      irq_mode[2];
+    int      irq_pin;
+    int      irq_line;
+} rz1000_t;
+
+static int next_id = 0;
+
+#ifdef ENABLE_RZ1000_LOG
+int rz1000_do_log = ENABLE_RZ1000_LOG;
+
+static void
+rz1000_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (rz1000_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define rz1000_log(fmt, ...)
+#endif
+
+static void
+rz1000_ide_handlers(rz1000_t *dev)
+{
+    uint16_t main;
+    uint16_t side;
+
+    if (dev->channels & 0x01) {
+        ide_pri_disable();
+
+        main = 0x1f0;
+        side = 0x3f6;
+
+        ide_set_base(0, main);
+        ide_set_side(0, side);
+
+        if (dev->regs[0x04] & 0x01)
+            ide_pri_enable();
+    }
+
+    if (dev->channels & 0x02) {
+        ide_sec_disable();
+
+        main = 0x170;
+        side = 0x376;
+
+        ide_set_base(1, main);
+        ide_set_side(1, side);
+
+        if (dev->regs[0x04] & 0x01)
+            ide_sec_enable();
+    }
+}
+
+static void
+rz1000_pci_write(int func, int addr, uint8_t val, void *priv)
+{
+    rz1000_t *dev = (rz1000_t *) priv;
+
+    rz1000_log("rz1000_pci_write(%i, %02X, %02X)\n", func, addr, val);
+
+    if (func == 0x00)
+        switch (addr) {
+            case 0x04:
+                dev->regs[addr] = (val & 0x41);
+                rz1000_ide_handlers(dev);
+                break;
+            case 0x07:
+                dev->regs[addr] &= ~(val & 0x80);
+                break;
+            case 0x09:
+                if ((dev->regs[addr] & 0x0a) == 0x0a) {
+                    dev->regs[addr]  = (dev->regs[addr] & 0x0a) | (val & 0x05);
+                    dev->irq_mode[0] = !!(val & 0x01);
+                    dev->irq_mode[1] = !!(val & 0x04);
+                    rz1000_ide_handlers(dev);
+                }
+                break;
+            case 0x40 ... 0x4f:
+                dev->regs[addr] = val;
+                break;
+        }
+}
+
+static uint8_t
+rz1000_pci_read(int func, int addr, void *priv)
+{
+    rz1000_t *dev = (rz1000_t *) priv;
+    uint8_t   ret = 0xff;
+
+    if (func == 0x00)
+        ret = dev->regs[addr];
+
+    rz1000_log("rz1000_pci_read(%i, %02X, %02X)\n", func, addr, ret);
+
+    return ret;
+}
+
+static void
+rz1000_reset(void *priv)
+{
+    rz1000_t *dev = (rz1000_t *) priv;
+    int       i   = 0;
+    int       min_channel;
+    int       max_channel;
+
+    switch (dev->channels) {
+        default:
+        case 0x00:
+            min_channel = max_channel = 0;
+            break;
+        case 0x01:
+            min_channel = 0;
+            max_channel = 1;
+            break;
+        case 0x02:
+            min_channel = 2;
+            max_channel = 3;
+            break;
+        case 0x03:
+            min_channel = 0;
+            max_channel = 3;
+            break;
+    }
+
+    for (i = 0; i < CDROM_NUM; i++) {
+        if ((cdrom[i].bus_type == CDROM_BUS_ATAPI) && (cdrom[i].ide_channel >= min_channel) &&
+            (cdrom[i].ide_channel <= max_channel) && cdrom[i].priv)
+            scsi_cdrom_reset((scsi_common_t *) cdrom[i].priv);
+    }
+    for (i = 0; i < RDISK_NUM; i++) {
+        if ((rdisk_drives[i].bus_type == RDISK_BUS_ATAPI) && (rdisk_drives[i].ide_channel >= min_channel) &&
+            (rdisk_drives[i].ide_channel <= max_channel) && rdisk_drives[i].priv)
+            rdisk_reset((scsi_common_t *) rdisk_drives[i].priv);
+    }
+    for (i = 0; i < MO_NUM; i++) {
+        if ((mo_drives[i].bus_type == MO_BUS_ATAPI) && (mo_drives[i].ide_channel >= min_channel) &&
+            (mo_drives[i].ide_channel <= max_channel) && mo_drives[i].priv)
+            mo_reset((scsi_common_t *) mo_drives[i].priv);
+    }
+
+    memset(dev->regs, 0x00, sizeof(dev->regs));
+
+    rz1000_log("dev->local = %08X\n", dev->local);
+
+    dev->regs[0x00] = 0x42;       /* PC Technology */
+    dev->regs[0x01] = 0x10;
+    dev->regs[0x02] = 0x00;       /* RZ-1000 */
+    dev->regs[0x03] = 0x10;
+    dev->regs[0x04] = 0x00;
+    dev->regs[0x07] = 0x02;       /* DEVSEL timing: 01 medium */
+    dev->regs[0x08] = 0x02;       /* Revision 02 */
+    dev->regs[0x09] = dev->local; /* Programming interface */
+    dev->regs[0x0a] = 0x01;       /* IDE controller */
+    dev->regs[0x0b] = 0x01;       /* Mass storage controller */
+
+    dev->regs[0x10] = 0xf1;
+    dev->regs[0x11] = 0x01;
+    dev->regs[0x14] = 0xf5;
+    dev->regs[0x15] = 0x03;
+    dev->regs[0x18] = 0x71;
+    dev->regs[0x19] = 0x01;
+    dev->regs[0x1c] = 0x75;
+    dev->regs[0x1d] = 0x03;
+
+    dev->irq_mode[0] = dev->irq_mode[1] = 0;
+    dev->irq_pin                        = PCI_INTA;
+    dev->irq_line                       = 14;
+
+    rz1000_ide_handlers(dev);
+}
+
+static void
+rz1000_close(void *priv)
+{
+    rz1000_t *dev = (rz1000_t *) priv;
+
+    free(dev);
+
+    next_id = 0;
+}
+
+static void *
+rz1000_init(const device_t *info)
+{
+    rz1000_t *dev = (rz1000_t *) calloc(1, sizeof(rz1000_t));
+
+    dev->id = next_id | 0x60;
+
+    dev->pci   = !!(info->flags & DEVICE_PCI);
+    dev->local = info->local;
+
+    dev->channels = ((info->local & 0x60000) >> 17) & 0x03;
+
+    if (dev->channels & 0x02)
+        device_add(&ide_pci_2ch_device);
+    else
+        device_add(&ide_pci_device);
+
+    if (info->local & 0x80000)
+        pci_add_card(PCI_ADD_NORMAL, rz1000_pci_read, rz1000_pci_write, dev, &dev->pci_slot);
+    else
+        pci_add_card(PCI_ADD_IDE, rz1000_pci_read, rz1000_pci_write, dev, &dev->pci_slot);
+
+    if (dev->channels & 0x01)
+        ide_board_set_force_ata3(0, 1);
+
+    if (dev->channels & 0x02)
+        ide_board_set_force_ata3(1, 1);
+
+    next_id++;
+
+    rz1000_reset(dev);
+
+    return dev;
+}
+
+const device_t ide_rz1000_pci_device = {
+    .name          = "PC Technology RZ-1000 PCI",
+    .internal_name = "ide_rz1000_pci",
+    .flags         = DEVICE_PCI,
+    .local         = 0x60000,
+    .init          = rz1000_init,
+    .close         = rz1000_close,
+    .reset         = rz1000_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ide_rz1000_pci_single_channel_device = {
+    .name          = "PC Technology RZ-1000 PCI (Single Channel)",
+    .internal_name = "ide_rz1000_pci_single_channel",
+    .flags         = DEVICE_PCI,
+    .local         = 0x20000,
+    .init          = rz1000_init,
+    .close         = rz1000_close,
+    .reset         = rz1000_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/disk/hdc_ide_sff8038i.c b/src/disk/hdc_ide_sff8038i.c
index 3f43f80e6..50deac38a 100644
--- a/src/disk/hdc_ide_sff8038i.c
+++ b/src/disk/hdc_ide_sff8038i.c
@@ -42,7 +42,7 @@
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
 #include <86box/hdc_ide_sff8038i.h>
-#include <86box/zip.h>
+#include <86box/rdisk.h>
 #include <86box/mo.h>
 #include <86box/plat_unused.h>
 
@@ -118,6 +118,9 @@ sff_bus_master_write(uint16_t port, uint8_t val, void *priv)
 
     sff_log("SFF-8038i Bus master BYTE  write: %04X       %02X\n", port, val);
 
+    if (dev->ven_write != NULL)
+        val = dev->ven_write(port, val, dev->priv);
+
     switch (port & 7) {
         case 0:
             sff_log("sff Cmd   : val = %02X, old = %02X\n", val, dev->command);
@@ -255,6 +258,9 @@ sff_bus_master_read(uint16_t port, void *priv)
             break;
     }
 
+    if (dev->ven_read != NULL)
+        ret= dev->ven_read(port, ret, dev->priv);
+
     sff_log("SFF-8038i Bus master BYTE  read : %04X       %02X\n", port, ret);
 
     return ret;
@@ -316,14 +322,14 @@ sff_bus_master_readl(uint16_t port, void *priv)
 }
 
 int
-sff_bus_master_dma(uint8_t *data, int transfer_length, int out, void *priv)
+sff_bus_master_dma(uint8_t *data, int transfer_length, int total_length, int out, void *priv)
 {
     sff8038i_t *dev = (sff8038i_t *) priv;
 #ifdef ENABLE_SFF_LOG
     char *sop;
 #endif
 
-    int force_end = 0;
+    int force_end  = 0;
     int buffer_pos = 0;
 
 #ifdef ENABLE_SFF_LOG
@@ -365,9 +371,15 @@ sff_bus_master_dma(uint8_t *data, int transfer_length, int out, void *priv)
             return 1; /* This block has exhausted the data to transfer and it was smaller than the count, break. */
         } else {
             if (!transfer_length && !dev->eot) {
-                sff_log("Total transfer length smaller than sum of all blocks, full block\n");
-                dev->status &= ~2;
-                return 1; /* We have exhausted the data to transfer but there's more blocks left, break. */
+                if (total_length) {
+                    sff_log("Total transfer length smaller than sum of all blocks, partial transfer\n");
+                    sff_bus_master_next_addr(dev);
+                    return 1; /* We have exhausted the data to transfer but there's more blocks left, break. */
+                } else {
+                    sff_log("Total transfer length smaller than sum of all blocks, full block\n");
+                    dev->status &= ~2;
+                    return 1; /* We have exhausted the data to transfer but there's more blocks left, break. */
+                }
             } else if (transfer_length && dev->eot) {
                 sff_log("Total transfer length greater than sum of all blocks\n");
                 dev->status |= 2;
@@ -375,7 +387,7 @@ sff_bus_master_dma(uint8_t *data, int transfer_length, int out, void *priv)
             } else if (dev->eot) {
                 sff_log("Regular EOT\n");
                 dev->status &= ~3;
-                return 1; /* We have regularly reached EOT - clear status and break. */
+                return 3; /* We have regularly reached EOT - clear status and break. */
             } else {
                 /* We have more to transfer and there are blocks left, get next block. */
                 sff_bus_master_next_addr(dev);
@@ -436,9 +448,9 @@ sff_bus_master_set_irq(uint8_t status, void *priv)
         case IRQ_MODE_SIS_551X:
             /* SiS 551x mode. */
             if (irq)
-                pci_set_mirq(2, 1, &dev->irq_state);
+                pci_set_mirq(dev->mirq, 1, &dev->irq_state);
             else
-                pci_clear_mirq(2, 1, &dev->irq_state);
+                pci_clear_mirq(dev->mirq, 1, &dev->irq_state);
             break;
     }
 }
@@ -475,19 +487,22 @@ sff_reset(void *priv)
 #endif
 
     for (uint8_t i = 0; i < HDD_NUM; i++) {
-        if ((hdd[i].bus == HDD_BUS_ATAPI) && (hdd[i].ide_channel < 4) && hdd[i].priv)
+        if ((hdd[i].bus_type == HDD_BUS_ATAPI) && (hdd[i].ide_channel < 4) && hdd[i].priv)
             scsi_disk_reset((scsi_common_t *) hdd[i].priv);
     }
     for (uint8_t i = 0; i < CDROM_NUM; i++) {
-        if ((cdrom[i].bus_type == CDROM_BUS_ATAPI) && (cdrom[i].ide_channel < 4) && cdrom[i].priv)
+        if ((cdrom[i].bus_type == CDROM_BUS_ATAPI) && (cdrom[i].ide_channel < 4) &&
+            cdrom[i].priv)
             scsi_cdrom_reset((scsi_common_t *) cdrom[i].priv);
     }
-    for (uint8_t i = 0; i < ZIP_NUM; i++) {
-        if ((zip_drives[i].bus_type == ZIP_BUS_ATAPI) && (zip_drives[i].ide_channel < 4) && zip_drives[i].priv)
-            zip_reset((scsi_common_t *) zip_drives[i].priv);
+    for (uint8_t i = 0; i < RDISK_NUM; i++) {
+        if ((rdisk_drives[i].bus_type == RDISK_BUS_ATAPI) && (rdisk_drives[i].ide_channel < 4) &&
+            rdisk_drives[i].priv)
+            rdisk_reset((scsi_common_t *) rdisk_drives[i].priv);
     }
     for (uint8_t i = 0; i < MO_NUM; i++) {
-        if ((mo_drives[i].bus_type == MO_BUS_ATAPI) && (mo_drives[i].ide_channel < 4) && mo_drives[i].priv)
+        if ((mo_drives[i].bus_type == MO_BUS_ATAPI) && (mo_drives[i].ide_channel < 4) &&
+            mo_drives[i].priv)
             mo_reset((scsi_common_t *) mo_drives[i].priv);
     }
 
@@ -554,6 +569,22 @@ sff_set_irq_pin(sff8038i_t *dev, int irq_pin)
     dev->irq_pin = irq_pin;
 }
 
+void
+sff_set_mirq(sff8038i_t *dev, uint8_t mirq)
+{
+    dev->mirq = mirq;
+}
+
+void
+sff_set_ven_handlers(sff8038i_t *dev, uint8_t (*ven_write)(uint16_t port, uint8_t val, void *priv),
+                     uint8_t (*ven_read)(uint16_t port, uint8_t val, void *priv), void *priv)
+{
+    dev->ven_write = ven_write;
+    dev->ven_read  = ven_read;
+
+    dev->priv      = priv;
+}
+
 static void
 sff_close(void *priv)
 {
@@ -569,8 +600,7 @@ sff_close(void *priv)
 static void *
 sff_init(UNUSED(const device_t *info))
 {
-    sff8038i_t *dev = (sff8038i_t *) malloc(sizeof(sff8038i_t));
-    memset(dev, 0, sizeof(sff8038i_t));
+    sff8038i_t *dev = (sff8038i_t *) calloc(1, sizeof(sff8038i_t));
 
     /* Make sure to only add IDE once. */
     if (next_id == 0)
@@ -586,6 +616,7 @@ sff_init(UNUSED(const device_t *info))
     dev->pci_irq_line = 14;
     dev->irq_level    = 0;
     dev->irq_state    = 0;
+    dev->mirq         = 2;
 
     dev->channel      = next_id;
     next_id++;
@@ -601,7 +632,7 @@ const device_t sff8038i_device = {
     .init          = sff_init,
     .close         = sff_close,
     .reset         = sff_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/disk/hdc_ide_um8673f.c b/src/disk/hdc_ide_um8673f.c
new file mode 100644
index 000000000..b40595750
--- /dev/null
+++ b/src/disk/hdc_ide_um8673f.c
@@ -0,0 +1,212 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the UMC UMF8673F IDE controller.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2024 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+
+#include <86box/hdc_ide.h>
+#include <86box/hdc.h>
+#include <86box/mem.h>
+#include <86box/nmi.h>
+#include <86box/pic.h>
+#include <86box/pci.h>
+#include <86box/plat_unused.h>
+#include <86box/port_92.h>
+#include <86box/smram.h>
+
+#include <86box/chipset.h>
+
+#ifdef ENABLE_UM8673F_LOG
+int um8673f_do_log = ENABLE_UM8673F_LOG;
+
+static void
+um8673f_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (um8673f_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define um8673f_log(fmt, ...)
+#endif
+
+typedef struct um8673f_t {
+    uint8_t index;
+    uint8_t tries;
+    uint8_t unlocked;
+
+    uint8_t regs[256];
+} um8673f_t;
+
+static void
+um8673f_ide_handler(um8673f_t *dev)
+{
+    ide_pri_disable();
+    ide_sec_disable();
+    if (dev->regs[0xb0] & 0x80)
+        ide_pri_enable();
+    if (dev->regs[0xb0] & 0x40)
+        ide_sec_enable();
+}
+
+static void
+um8673f_write(uint16_t addr, uint8_t val, void *priv)
+{
+    um8673f_t *dev = (um8673f_t *) priv;
+
+    um8673f_log("[%04X:%08X] [W] %02X = %02X (%i)\n", CS, cpu_state.pc, addr, val, dev->tries);
+
+    switch (addr) {
+        case 0x108:
+            if (dev->unlocked) {
+                if (dev->index == 0x34) {
+                    dev->unlocked = 0;
+                    dev->tries = 0;
+                } else
+                    dev->index = val;
+            } else if (((dev->tries == 0) && (val == 0x4a)) ||
+                ((dev->tries == 1) && (val == 0x6c))) {
+                dev->tries++;
+                if (dev->tries == 2)
+                    dev->unlocked = 1;
+            } else
+                dev->tries = 0;
+            break;
+
+        case 0x109:
+            switch (dev->index) {
+                case 0xb0:
+                    dev->regs[dev->index] = val;
+                    um8673f_ide_handler(dev);
+                    break;
+                case 0xb1 ... 0xb8:
+                    dev->regs[dev->index] = val;
+                    break;
+
+                default:
+                    break;
+            }
+            break;
+
+        default:
+            break;
+    }
+}
+
+static uint8_t
+um8673f_read(uint16_t addr, void *priv)
+{
+    um8673f_t *dev = (um8673f_t *) priv;
+    uint8_t    ret = 0xff;
+
+    switch (addr) {
+        case 0x108:
+            if (dev->unlocked)
+                ret = dev->index;
+            else
+                dev->tries = 0;
+            break;
+        case 0x109:
+            if ((dev->index >= 0xb0) && (dev->index <= 0xb8))
+                ret = dev->regs[dev->index];
+            break;
+
+        default:
+            break;
+    }
+
+    um8673f_log("[%04X:%08X] [R] %02X = %02X\n", CS, cpu_state.pc, addr, ret);
+
+    return ret;
+}
+
+static void
+um8673f_reset(void *priv)
+{
+    um8673f_t *dev = (um8673f_t *) priv;
+
+    memset(dev->regs, 0x00, 256);
+
+    ide_pri_disable();
+    ide_sec_disable();
+
+    /* IDE registers */
+    dev->regs[0xb0] = 0xc0;
+
+    um8673f_ide_handler(dev);
+}
+
+static void
+um8673f_close(void *priv)
+{
+    um8673f_t *dev = (um8673f_t *) priv;
+
+    free(dev);
+}
+
+static void *
+um8673f_init(UNUSED(const device_t *info))
+{
+    um8673f_t *dev = (um8673f_t *) calloc(1, sizeof(um8673f_t));
+
+    io_sethandler(0x0108, 0x0002, um8673f_read, NULL, NULL, um8673f_write, NULL, NULL, dev);
+
+    device_add(info->local ? &ide_pci_2ch_device : &ide_vlb_2ch_device);
+
+    um8673f_reset(dev);
+
+    return dev;
+}
+
+const device_t ide_um8886af_device = {
+    .name          = "UMC UM8886F IDE",
+    .internal_name = "um8886af_ide",
+    .flags         = 0,
+    .local         = 1,
+    .init          = um8673f_init,
+    .close         = um8673f_close,
+    .reset         = um8673f_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ide_um8673f_device = {
+    .name          = "UMC UM8673F",
+    .internal_name = "um8673f",
+    .flags         = 0,
+    .local         = 0,
+    .init          = um8673f_init,
+    .close         = um8673f_close,
+    .reset         = um8673f_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/disk/hdc_ide_w83769f.c b/src/disk/hdc_ide_w83769f.c
new file mode 100644
index 000000000..25ee16d10
--- /dev/null
+++ b/src/disk/hdc_ide_w83769f.c
@@ -0,0 +1,472 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the Winbond W83769F controller.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2020-2025 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/cdrom.h>
+#include <86box/scsi_device.h>
+#include <86box/scsi_cdrom.h>
+#include <86box/dma.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/keyboard.h>
+#include <86box/mem.h>
+#include <86box/pci.h>
+#include <86box/pic.h>
+#include <86box/timer.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/hdc_ide_sff8038i.h>
+#include <86box/rdisk.h>
+#include <86box/mo.h>
+
+typedef struct w83769f_t {
+    uint8_t  vlb_idx;
+    uint8_t  id;
+    uint8_t  in_cfg;
+    uint8_t  channels;
+    uint8_t  pci;
+    uint8_t  pci_slot;
+    uint8_t  pad;
+    uint8_t  pad0;
+    uint8_t  regs[256];
+} w83769f_t;
+
+static int next_id = 0;
+
+#ifdef ENABLE_W83769F_LOG
+int w83769f_do_log = ENABLE_W83769F_LOG;
+
+static void
+w83769f_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (w83769f_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define w83769f_log(fmt, ...)
+#endif
+
+void
+w83769f_set_irq_0(uint8_t status, void *priv)
+{
+    w83769f_t *dev = (w83769f_t *) priv;
+    int        irq = !!(status & 0x04);
+
+    if (!(dev->regs[0x50] & 0x04) || (status & 0x04))
+        dev->regs[0x50] = (dev->regs[0x50] & ~0x04) | status;
+
+    if (!(dev->channels & 1))
+        return;
+
+    if (irq)
+        picint(1 << 14);
+    else
+       picintc(1 << 14);
+}
+
+void
+w83769f_set_irq_1(uint8_t status, void *priv)
+{
+    w83769f_t *dev = (w83769f_t *) priv;
+    int        irq = !!(status & 0x04);
+
+    if (!(dev->regs[0x50] & 0x04) || (status & 0x04))
+        dev->regs[0x50] = (dev->regs[0x50] & ~0x04) | status;
+
+    if (!(dev->channels & 2))
+        return;
+
+    if (irq)
+        picint(1 << 15);
+    else
+       picintc(1 << 15);
+}
+
+static void
+w83769f_ide_handlers(w83769f_t *dev)
+{
+    if (dev->channels & 0x01) {
+        ide_pri_disable();
+
+        if (!dev->pci || (dev->regs[0x04] & 0x01))
+            ide_pri_enable();
+    }
+
+    if (dev->channels & 0x02) {
+        ide_sec_disable();
+
+        if ((!dev->pci || (dev->regs[0x04] & 0x01)) && (dev->regs[0x57] & 0x01))
+            ide_sec_enable();
+    }
+}
+
+static void
+w83769f_common_write(int addr, uint8_t val, w83769f_t *dev)
+{
+    switch (addr) {
+        case 0x50:
+        case 0x57:
+            dev->regs[0x57] = val & 0x01;
+            w83769f_ide_handlers(dev);
+            break;
+        case 0x51:
+            dev->regs[addr] = val & 0x7f;
+            break;
+        case 0x52:
+        case 0x54:
+        case 0x56:
+        case 0x58 ... 0x59:
+            dev->regs[addr] = val;
+            break;
+        case 0x53:
+        case 0x55:
+            dev->regs[addr] = val & 0xcf;
+            break;
+
+        default:
+            break;
+    }
+}
+
+static void
+w83769f_vlb_write(uint16_t addr, uint8_t val, void *priv)
+{
+    w83769f_t *dev = (w83769f_t *) priv;
+
+    switch (addr) {
+        case 0x0034:
+        case 0x00b4:
+            dev->vlb_idx = val;
+            break;
+        case 0x0038:
+        case 0x00b8:
+            w83769f_common_write(dev->vlb_idx, val, dev);
+            break;
+
+        default:
+            break;
+    }
+}
+
+static void
+w83769f_vlb_writew(uint16_t addr, uint16_t val, void *priv)
+{
+    w83769f_vlb_write(addr, val & 0xff, priv);
+    w83769f_vlb_write(addr + 1, val >> 8, priv);
+}
+
+static void
+w83769f_vlb_writel(uint16_t addr, uint32_t val, void *priv)
+{
+    w83769f_vlb_writew(addr, val & 0xffff, priv);
+    w83769f_vlb_writew(addr + 2, val >> 16, priv);
+}
+
+static uint8_t
+w83769f_vlb_read(uint16_t addr, void *priv)
+{
+    uint8_t    ret = 0xff;
+    w83769f_t *dev = (w83769f_t *) priv;
+
+    switch (addr) {
+        case 0x0034:
+        case 0x00b4:
+            ret = dev->vlb_idx;
+            break;
+        case 0x0038:
+        case 0x00b8:
+            ret = dev->regs[dev->vlb_idx];
+            if (dev->vlb_idx == 0x50)
+                dev->regs[0x50] &= ~0x04;
+            break;
+
+        default:
+            break;
+    }
+
+    return ret;
+}
+
+static uint16_t
+w83769f_vlb_readw(uint16_t addr, void *priv)
+{
+    uint16_t ret = 0xffff;
+
+    ret = w83769f_vlb_read(addr, priv);
+    ret |= (w83769f_vlb_read(addr + 1, priv) << 8);
+
+    return ret;
+}
+
+static uint32_t
+w83769f_vlb_readl(uint16_t addr, void *priv)
+{
+    uint32_t ret = 0xffffffff;
+
+    ret = w83769f_vlb_readw(addr, priv);
+    ret |= (w83769f_vlb_readw(addr + 2, priv) << 16);
+
+    return ret;
+}
+
+static void
+w83769f_pci_write(int func, int addr, uint8_t val, void *priv)
+{
+    w83769f_t *dev = (w83769f_t *) priv;
+
+    w83769f_log("w83769f_pci_write(%i, %02X, %02X)\n", func, addr, val);
+
+    if (func == 0x00)
+        switch (addr) {
+            case 0x04:
+                dev->regs[addr] = (dev->regs[addr] & 0xbf) | (val & 0x40);
+                w83769f_ide_handlers(dev);
+                break;
+            case 0x07:
+                dev->regs[addr] &= ~(val & 0x80);
+                break;
+        }
+}
+
+static uint8_t
+w83769f_pci_read(int func, int addr, void *priv)
+{
+    w83769f_t *dev = (w83769f_t *) priv;
+    uint8_t    ret = 0xff;
+
+    if (func == 0x00)
+        ret = dev->regs[addr];
+
+    w83769f_log("w83769f_pci_read(%i, %02X, %02X)\n", func, addr, ret);
+
+    return ret;
+}
+
+static void
+w83769f_reset(void *priv)
+{
+    w83769f_t *dev = (w83769f_t *) priv;
+    int        i   = 0;
+    int        min_channel;
+    int        max_channel;
+
+    switch (dev->channels) {
+        default:
+        case 0x00:
+            min_channel = max_channel = 0;
+            break;
+        case 0x01:
+            min_channel = 0;
+            max_channel = 1;
+            break;
+        case 0x02:
+            min_channel = 2;
+            max_channel = 3;
+            break;
+        case 0x03:
+            min_channel = 0;
+            max_channel = 3;
+            break;
+    }
+
+    for (i = 0; i < CDROM_NUM; i++) {
+        if ((cdrom[i].bus_type == CDROM_BUS_ATAPI) && (cdrom[i].ide_channel >= min_channel) &&
+            (cdrom[i].ide_channel <= max_channel) && cdrom[i].priv)
+            scsi_cdrom_reset((scsi_common_t *) cdrom[i].priv);
+    }
+    for (i = 0; i < RDISK_NUM; i++) {
+        if ((rdisk_drives[i].bus_type == RDISK_BUS_ATAPI) && (rdisk_drives[i].ide_channel >= min_channel) &&
+            (rdisk_drives[i].ide_channel <= max_channel) && rdisk_drives[i].priv)
+            rdisk_reset((scsi_common_t *) rdisk_drives[i].priv);
+    }
+    for (i = 0; i < MO_NUM; i++) {
+        if ((mo_drives[i].bus_type == MO_BUS_ATAPI) && (mo_drives[i].ide_channel >= min_channel) &&
+            (mo_drives[i].ide_channel <= max_channel) && mo_drives[i].priv)
+            mo_reset((scsi_common_t *) mo_drives[i].priv);
+    }
+
+    if (dev->channels & 0x01)
+        w83769f_set_irq_0(0x00, priv);
+
+    if (dev->channels & 0x02)
+        w83769f_set_irq_1(0x00, priv);
+
+    memset(dev->regs, 0x00, sizeof(dev->regs));
+
+    dev->regs[0x50] = (dev->id << 3); /* Device ID: 00 = 60h, 01 = 61h, 10 = 62h, 11 = 63h */
+    dev->regs[0x51] = 0x40;
+    dev->regs[0x57] = 0x01;           /* Required by the MSI MS-5109 */
+    dev->regs[0x59] = 0x40;
+
+    if (dev->pci) {
+        dev->regs[0x00] = 0xad;       /* Winbond */
+        dev->regs[0x01] = 0x10;
+        dev->regs[0x02] = 0x01;       /* W83769 */
+        dev->regs[0x03] = 0x00;
+        dev->regs[0x04] = 0x01;
+        dev->regs[0x07] = 0x02;       /* DEVSEL timing: 01 medium */
+        dev->regs[0x08] = 0x02;       /* 00h for Rev BB, 02h for Rev A3C */
+        dev->regs[0x09] = 0x00;       /* Programming interface */
+        dev->regs[0x0a] = 0x01;       /* IDE controller */
+        dev->regs[0x0b] = 0x01;       /* Mass storage controller */
+        dev->regs[0x3c] = 0x0e;       /* IRQ 14 */
+        dev->regs[0x3d] = 0x01;       /* INTA */
+    } else
+        dev->regs[0x04] = 0x01;       /* To make sure the two channels get enabled. */
+
+    w83769f_ide_handlers(dev);
+}
+
+static void
+w83769f_close(void *priv)
+{
+    w83769f_t *dev = (w83769f_t *) priv;
+
+    free(dev);
+
+    next_id = 0;
+}
+
+static void *
+w83769f_init(const device_t *info)
+{
+    w83769f_t *dev = (w83769f_t *) calloc(1, sizeof(w83769f_t));
+
+    dev->id = next_id | 0x60;
+
+    dev->pci   = !!(info->flags & DEVICE_PCI);
+
+    dev->channels = ((info->local & 0x60000) >> 17) & 0x03;
+
+    if (info->flags & DEVICE_PCI) {
+        device_add(&ide_pci_2ch_device);
+
+        if (info->local & 0x80000)
+            pci_add_card(PCI_ADD_NORMAL, w83769f_pci_read, w83769f_pci_write, dev, &dev->pci_slot);
+        else
+            pci_add_card(PCI_ADD_IDE, w83769f_pci_read, w83769f_pci_write, dev, &dev->pci_slot);
+    } else if (info->flags & DEVICE_VLB)
+        device_add(&ide_vlb_2ch_device);
+
+    if (dev->channels & 0x01)
+        ide_set_bus_master(0, NULL, w83769f_set_irq_0, dev);
+
+    if (dev->channels & 0x02)
+        ide_set_bus_master(1, NULL, w83769f_set_irq_1, dev);
+
+    /* The CMD PCI-0640B IDE controller has no DMA capability,
+       so set our devices IDE devices to force ATA-3 (no DMA). */
+    if (dev->channels & 0x01)
+        ide_board_set_force_ata3(0, 1);
+
+    if (dev->channels & 0x02)
+        ide_board_set_force_ata3(1, 1);
+
+    io_sethandler(info->local & 0xffff, 0x0001,
+                  w83769f_vlb_read, w83769f_vlb_readw, w83769f_vlb_readl,
+                  w83769f_vlb_write, w83769f_vlb_writew, w83769f_vlb_writel,
+                  dev);
+    io_sethandler((info->local & 0xffff) + 0x0004, 0x0001,
+                  w83769f_vlb_read, w83769f_vlb_readw, w83769f_vlb_readl,
+                  w83769f_vlb_write, w83769f_vlb_writew, w83769f_vlb_writel,
+                  dev);
+
+    next_id++;
+
+    w83769f_reset(dev);
+
+    return dev;
+}
+
+const device_t ide_w83769f_vlb_device = {
+    .name          = "Winbond W83769F VLB",
+    .internal_name = "ide_w83769f_vlb",
+    .flags         = DEVICE_VLB,
+    .local         = 0x600b4,
+    .init          = w83769f_init,
+    .close         = w83769f_close,
+    .reset         = w83769f_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ide_w83769f_vlb_34_device = {
+    .name          = "Winbond W83769F VLB (Port 34h)",
+    .internal_name = "ide_w83769f_vlb_34",
+    .flags         = DEVICE_VLB,
+    .local         = 0x60034,
+    .init          = w83769f_init,
+    .close         = w83769f_close,
+    .reset         = w83769f_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ide_w83769f_pci_device = {
+    .name          = "Winbond W83769F PCI",
+    .internal_name = "ide_w83769f_pci",
+    .flags         = DEVICE_PCI,
+    .local         = 0x600b4,
+    .init          = w83769f_init,
+    .close         = w83769f_close,
+    .reset         = w83769f_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ide_w83769f_pci_34_device = {
+    .name          = "Winbond W83769F PCI (Port 34h)",
+    .internal_name = "ide_w83769f_pci_34",
+    .flags         = DEVICE_PCI,
+    .local         = 0x60034,
+    .init          = w83769f_init,
+    .close         = w83769f_close,
+    .reset         = w83769f_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ide_w83769f_pci_single_channel_device = {
+    .name          = "Winbond W83769F PCI (Single Channel)",
+    .internal_name = "ide_w83769f_pci_single_channel",
+    .flags         = DEVICE_PCI,
+    .local         = 0x200b4,
+    .init          = w83769f_init,
+    .close         = w83769f_close,
+    .reset         = w83769f_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/disk/hdc_st506_at.c b/src/disk/hdc_st506_at.c
index 41499591d..ed7b29d1f 100644
--- a/src/disk/hdc_st506_at.c
+++ b/src/disk/hdc_st506_at.c
@@ -134,26 +134,27 @@ st506_at_log(const char *fmt, ...)
 #    define st506_at_log(fmt, ...)
 #endif
 
-static inline void
+static __inline void
 irq_raise(mfm_t *mfm)
 {
-    if (!(mfm->fdisk & 2))
-        picint(1 << 14);
-
     mfm->irqstat = 1;
+    if (!(mfm->fdisk & 2))
+        picint_common(1 << 14, PIC_IRQ_EDGE, 1, NULL);
 }
 
-static inline void
-irq_lower(UNUSED(mfm_t *mfm))
+static __inline void
+irq_lower(mfm_t *mfm)
 {
-    picintc(1 << 14);
+    mfm->irqstat = 0;
+    if (!(mfm->fdisk & 2))
+        picint_common(1 << 14, PIC_IRQ_EDGE, 0, NULL);
 }
 
-static void
+static __inline void
 irq_update(mfm_t *mfm)
 {
-    if (mfm->irqstat && !((pic2.irr | pic2.isr) & 0x40) && !(mfm->fdisk & 2))
-        picint(1 << 14);
+    uint8_t set = !(mfm->fdisk & 2) && mfm->irqstat;
+    picint_common(1 << 14, PIC_IRQ_EDGE, set, NULL);
 }
 
 /*
@@ -186,7 +187,7 @@ get_sector(mfm_t *mfm, off64_t *addr)
         return 1;
     }
 
-    if (mfm->sector >= drive->cfg_spt + 1) {
+    if (mfm->sector >= (drive->cfg_spt + 1)) {
         st506_at_log("WD1003(%d) get_sector: past end of configured sectors\n",
                      mfm->drvsel);
         return 1;
@@ -198,7 +199,7 @@ get_sector(mfm_t *mfm, off64_t *addr)
         return 1;
     }
 
-    if (mfm->sector >= drive->spt + 1) {
+    if (mfm->sector >= (drive->spt + 1)) {
         st506_at_log("WD1003(%d) get_sector: past end of sectors\n", mfm->drvsel);
         return 1;
     }
@@ -208,6 +209,35 @@ get_sector(mfm_t *mfm, off64_t *addr)
     return 0;
 }
 
+static int
+get_sector_format(mfm_t *mfm, off64_t *addr)
+{
+    const drive_t *drive = &mfm->drives[mfm->drvsel];
+
+    /* FIXME: See if this is even needed - if the code is present, IBM AT
+              diagnostics v2.07 will error with: ERROR 152 - SYSTEM BOARD. */
+    if (drive->curcyl != mfm->cylinder) {
+        st506_at_log("WD1003(%d) sector: wrong cylinder\n");
+        return 1;
+    }
+
+    if (mfm->head > drive->cfg_hpc) {
+        st506_at_log("WD1003(%d) get_sector: past end of configured heads\n",
+                     mfm->drvsel);
+        return 1;
+    }
+
+    /* We should check this in the SET_DRIVE_PARAMETERS command!  --FvK */
+    if (mfm->head > drive->hpc) {
+        st506_at_log("WD1003(%d) get_sector: past end of heads\n", mfm->drvsel);
+        return 1;
+    }
+
+    *addr = ((((off64_t) mfm->cylinder * drive->cfg_hpc) + mfm->head) * drive->cfg_spt);
+
+    return 0;
+}
+
 /* Move to the next sector using CHS addressing. */
 static void
 next_sector(mfm_t *mfm)
@@ -247,13 +277,9 @@ mfm_cmd(mfm_t *mfm, uint8_t val)
     switch (val & 0xf0) {
         case CMD_RESTORE:
             drive->steprate = (val & 0x0f);
-            st506_at_log("WD1003(%d) restore, step=%d\n",
-                         mfm->drvsel, drive->steprate);
-            drive->curcyl = 0;
-            mfm->cylinder = 0;
-            mfm->status   = STAT_READY | STAT_DSC;
             mfm->command &= 0xf0;
-            irq_raise(mfm);
+            mfm->status = STAT_BUSY;
+            timer_set_delay_u64(&mfm->callback_timer, 200 * MFM_TIME);
             break;
 
         case CMD_SEEK:
@@ -310,38 +336,8 @@ mfm_cmd(mfm_t *mfm, uint8_t val)
                     break;
 
                 case CMD_SET_PARAMETERS:
-                    /*
-                     * NOTE:
-                     *
-                     * We currently just set these parameters, and
-                     * never bother to check if they "fit within"
-                     * the actual parameters, as determined by the
-                     * image loader.
-                     *
-                     * The difference in parameters is OK, and
-                     * occurs when the BIOS or operating system
-                     * decides to use a different translation
-                     * scheme, but either way, it SHOULD always
-                     * fit within the actual parameters!
-                     *
-                     * We SHOULD check that here!! --FvK
-                     */
-                    if (drive->cfg_spt == 0) {
-                        /* Only accept after RESET or DIAG. */
-                        drive->cfg_spt = mfm->secount;
-                        drive->cfg_hpc = mfm->head + 1;
-                        st506_at_log("WD1003(%d) parameters: tracks=%d, spt=%i, hpc=%i\n",
-                                     mfm->drvsel, drive->tracks,
-                                     drive->cfg_spt, drive->cfg_hpc);
-                    } else {
-                        st506_at_log("WD1003(%d) parameters: tracks=%d,spt=%i,hpc=%i (IGNORED)\n",
-                                     mfm->drvsel, drive->tracks,
-                                     drive->cfg_spt, drive->cfg_hpc);
-                    }
-                    mfm->command = 0x00;
-                    mfm->status  = STAT_READY | STAT_DSC;
-                    mfm->error   = 1;
-                    irq_raise(mfm);
+                    mfm->status = STAT_BUSY;
+                    timer_set_delay_u64(&mfm->callback_timer, 200 * MFM_TIME);
                     break;
 
                 default:
@@ -378,6 +374,7 @@ static void
 mfm_write(uint16_t port, uint8_t val, void *priv)
 {
     mfm_t *mfm = (mfm_t *) priv;
+    uint8_t old;
 
     st506_at_log("WD1003 write(%04x, %02x)\n", port, val);
 
@@ -408,7 +405,7 @@ mfm_write(uint16_t port, uint8_t val, void *priv)
 
         case 0x01f6: /* drive/head */
             mfm->head   = val & 0xF;
-            mfm->drvsel = (val & 0x10) ? 1 : 0;
+            mfm->drvsel = !!(val & 0x10);
             if (mfm->drives[mfm->drvsel].present)
                 mfm->status = STAT_READY | STAT_DSC;
             else
@@ -425,15 +422,15 @@ mfm_write(uint16_t port, uint8_t val, void *priv)
                 timer_set_delay_u64(&mfm->callback_timer, 500 * MFM_TIME);
                 mfm->reset  = 1;
                 mfm->status = STAT_BUSY;
-            }
-
-            if (val & 0x04) {
+            } else if (!(mfm->fdisk & 0x04) && (val & 0x04)) {
                 /* Drive held in reset. */
                 timer_disable(&mfm->callback_timer);
                 mfm->status = STAT_BUSY;
             }
+            old = mfm->fdisk;
             mfm->fdisk = val;
-            irq_update(mfm);
+            if (!(val & 0x02) && (old & 0x02))
+                irq_update(mfm);
             break;
 
         default:
@@ -560,11 +557,21 @@ do_callback(void *priv)
         mfm->reset = 0;
 
         ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 0);
+        ui_sb_update_icon_write(SB_HDD | HDD_BUS_MFM, 0);
 
         return;
     }
 
     switch (mfm->command) {
+        case CMD_RESTORE:
+            st506_at_log("WD1003(%d) restore, step=%d\n",
+                         mfm->drvsel, drive->steprate);
+            drive->curcyl = 0;
+            mfm->cylinder = 0;
+            mfm->status   = STAT_READY | STAT_DSC;
+            irq_raise(mfm);
+            break;
+
         case CMD_SEEK:
             st506_at_log("WD1003(%d) seek, step=%d\n",
                          mfm->drvsel, drive->steprate);
@@ -579,12 +586,16 @@ do_callback(void *priv)
             do_seek(mfm);
             if (get_sector(mfm, &addr)) {
                 mfm->error  = ERR_ID_NOT_FOUND;
+read_error:
                 mfm->status = STAT_READY | STAT_DSC | STAT_ERR;
                 irq_raise(mfm);
                 break;
             }
 
-            hdd_image_read(drive->hdd_num, addr, 1, (uint8_t *) mfm->buffer);
+            if (hdd_image_read(drive->hdd_num, addr, 1, (uint8_t *) mfm->buffer) < 0) {
+                mfm->error = ERR_BAD_BLOCK;
+                goto read_error;
+            }
 
             mfm->pos    = 0;
             mfm->status = STAT_DRQ | STAT_READY | STAT_DSC;
@@ -598,12 +609,16 @@ do_callback(void *priv)
             do_seek(mfm);
             if (get_sector(mfm, &addr)) {
                 mfm->error  = ERR_ID_NOT_FOUND;
+write_error:
                 mfm->status = STAT_READY | STAT_DSC | STAT_ERR;
                 irq_raise(mfm);
                 break;
             }
 
-            hdd_image_write(drive->hdd_num, addr, 1, (uint8_t *) mfm->buffer);
+            if (hdd_image_write(drive->hdd_num, addr, 1, (uint8_t *) mfm->buffer) < 0) {
+                mfm->error = ERR_BAD_BLOCK;
+                goto write_error;
+            }
             irq_raise(mfm);
             mfm->secount = (mfm->secount - 1) & 0xff;
 
@@ -613,9 +628,9 @@ do_callback(void *priv)
                 mfm->status |= STAT_DRQ;
                 mfm->pos = 0;
                 next_sector(mfm);
-                ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 1);
+                ui_sb_update_icon_write(SB_HDD | HDD_BUS_MFM, 1);
             } else
-                ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 0);
+                ui_sb_update_icon_write(SB_HDD | HDD_BUS_MFM, 0);
             break;
 
         case CMD_VERIFY:
@@ -632,7 +647,7 @@ do_callback(void *priv)
             st506_at_log("WD1003(%d) format(%d,%d)\n",
                          mfm->drvsel, mfm->cylinder, mfm->head);
             do_seek(mfm);
-            if (get_sector(mfm, &addr)) {
+            if (get_sector_format(mfm, &addr)) {
                 mfm->error  = ERR_ID_NOT_FOUND;
                 mfm->status = STAT_READY | STAT_DSC | STAT_ERR;
                 irq_raise(mfm);
@@ -643,7 +658,7 @@ do_callback(void *priv)
 
             mfm->status = STAT_READY | STAT_DSC;
             irq_raise(mfm);
-            ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 1);
+            ui_sb_update_icon_write(SB_HDD | HDD_BUS_MFM, 1);
             break;
 
         case CMD_DIAGNOSE:
@@ -660,6 +675,41 @@ do_callback(void *priv)
             irq_raise(mfm);
             break;
 
+        case CMD_SET_PARAMETERS:
+            /*
+             * NOTE:
+             *
+             * We currently just set these parameters, and
+             * never bother to check if they "fit within"
+             * the actual parameters, as determined by the
+             * image loader.
+             *
+             * The difference in parameters is OK, and
+             * occurs when the BIOS or operating system
+             * decides to use a different translation
+             * scheme, but either way, it SHOULD always
+             * fit within the actual parameters!
+             *
+             * We SHOULD check that here!! --FvK
+             */
+            if (drive->cfg_spt == 0) {
+                /* Only accept after RESET or DIAG. */
+                drive->cfg_spt = mfm->secount;
+                drive->cfg_hpc = mfm->head + 1;
+                st506_at_log("WD1003(%d) parameters: tracks=%d, spt=%i, hpc=%i\n",
+                             mfm->drvsel, drive->tracks,
+                             drive->cfg_spt, drive->cfg_hpc);
+            } else {
+                st506_at_log("WD1003(%d) parameters: tracks=%d,spt=%i,hpc=%i (IGNORED)\n",
+                             mfm->drvsel, drive->tracks,
+                             drive->cfg_spt, drive->cfg_hpc);
+            }
+            mfm->command = 0x00;
+            mfm->status  = STAT_READY | STAT_DSC;
+            mfm->error   = 1;
+            irq_raise(mfm);
+            break;
+
         default:
             st506_at_log("WD1003(%d) callback on unknown command %02x\n",
                          mfm->drvsel, mfm->command);
@@ -695,12 +745,11 @@ mfm_init(UNUSED(const device_t *info))
     int    c;
 
     st506_at_log("WD1003: ISA MFM/RLL Fixed Disk Adapter initializing ...\n");
-    mfm = malloc(sizeof(mfm_t));
-    memset(mfm, 0x00, sizeof(mfm_t));
+    mfm = calloc(1, sizeof(mfm_t));
 
     c = 0;
     for (uint8_t d = 0; d < HDD_NUM; d++) {
-        if ((hdd[d].bus == HDD_BUS_MFM) && (hdd[d].mfm_channel < MFM_NUM)) {
+        if ((hdd[d].bus_type == HDD_BUS_MFM) && (hdd[d].mfm_channel < MFM_NUM)) {
             loadhd(mfm, hdd[d].mfm_channel, d, hdd[d].fn);
 
             st506_at_log("WD1003(%d): (%s) geometry %d/%d/%d\n", c, hdd[d].fn,
@@ -724,6 +773,7 @@ mfm_init(UNUSED(const device_t *info))
     timer_add(&mfm->callback_timer, do_callback, mfm, 0);
 
     ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 0);
+    ui_sb_update_icon_write(SB_HDD | HDD_BUS_MFM, 0);
 
     return mfm;
 }
@@ -742,17 +792,18 @@ mfm_close(void *priv)
     free(mfm);
 
     ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 0);
+    ui_sb_update_icon_write(SB_HDD | HDD_BUS_MFM, 0);
 }
 
 const device_t st506_at_wd1003_device = {
     .name          = "WD1003 AT MFM/RLL Controller",
     .internal_name = "st506_at",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0,
     .init          = mfm_init,
     .close         = mfm_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/disk/hdc_st506_xt.c b/src/disk/hdc_st506_xt.c
index fc20350b0..a7313ca63 100644
--- a/src/disk/hdc_st506_xt.c
+++ b/src/disk/hdc_st506_xt.c
@@ -457,6 +457,37 @@ get_chs(hdc_t *dev, drive_t *drive)
     return 1;
 }
 
+static int
+get_chs_format(hdc_t *dev, drive_t *drive)
+{
+    dev->err_bv = 0x80;
+
+    dev->head = dev->command[1] & 0x1f;
+    /* 6 bits are used for the sector number even on the IBM PC controller. */
+    dev->sector = 1;
+    dev->count  = dev->command[4];
+    if (((dev->type == ST506_XT_TYPE_ST11M) || (dev->type == ST506_XT_TYPE_ST11R)) && (dev->command[0] >= 0xf0))
+        dev->cylinder = 0;
+    else {
+        dev->cylinder = dev->command[3] | ((dev->command[2] & 0xc0) << 2);
+        dev->cylinder += dev->cyl_off; /* for ST-11 */
+    }
+
+    if (dev->cylinder >= drive->cfg_cyl) {
+        /*
+         * This really is an error, we cannot move
+         * past the end of the drive, which should
+         * result in an ERR_ILLEGAL_ADDR.  --FvK
+         */
+        drive->cylinder = drive->cfg_cyl - 1;
+        return 0;
+    }
+
+    drive->cylinder = dev->cylinder;
+
+    return 1;
+}
+
 static void
 st506_callback(void *priv)
 {
@@ -549,14 +580,14 @@ st506_callback(void *priv)
                     (void) get_chs(dev, drive);
                     st506_xt_log("ST506: FORMAT_DRIVE(%i) interleave=%i\n",
                                  dev->drive_sel, dev->command[4]);
-                    ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 1);
+                    ui_sb_update_icon_write(SB_HDD | HDD_BUS_MFM, 1);
                     timer_advance_u64(&dev->timer, ST506_TIME);
                     dev->state = STATE_SEND_DATA;
                     break;
 
                 case STATE_SEND_DATA: /* wrong, but works */
                     if (!get_sector(dev, drive, &addr)) {
-                        ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 0);
+                        ui_sb_update_icon_write(SB_HDD | HDD_BUS_MFM, 0);
                         st506_error(dev, dev->error);
                         st506_complete(dev);
                         return;
@@ -573,7 +604,7 @@ st506_callback(void *priv)
                     break;
 
                 case STATE_SENT_DATA:
-                    ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 0);
+                    ui_sb_update_icon_write(SB_HDD | HDD_BUS_MFM, 0);
                     st506_complete(dev);
                     break;
 
@@ -628,18 +659,18 @@ st506_callback(void *priv)
         case CMD_FORMAT_BAD_TRACK:
             switch (dev->state) {
                 case STATE_START_COMMAND:
-                    (void) get_chs(dev, drive);
+                    (void) get_chs_format(dev, drive);
                     st506_xt_log("ST506: FORMAT_%sTRACK(%i, %i/%i)\n",
                                  (dev->command[0] == CMD_FORMAT_BAD_TRACK) ? "BAD_" : "",
                                  dev->drive_sel, dev->cylinder, dev->head);
-                    ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 1);
+                    ui_sb_update_icon_write(SB_HDD | HDD_BUS_MFM, 1);
                     timer_advance_u64(&dev->timer, ST506_TIME);
                     dev->state = STATE_SEND_DATA;
                     break;
 
                 case STATE_SEND_DATA: /* wrong, but works */
                     if (!get_sector(dev, drive, &addr)) {
-                        ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 0);
+                        ui_sb_update_icon_write(SB_HDD | HDD_BUS_MFM, 0);
                         st506_error(dev, dev->error);
                         st506_complete(dev);
                         return;
@@ -655,7 +686,7 @@ st506_callback(void *priv)
                     break;
 
                 case STATE_SENT_DATA:
-                    ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 0);
+                    ui_sb_update_icon_write(SB_HDD | HDD_BUS_MFM, 0);
                     st506_complete(dev);
                     break;
 
@@ -684,6 +715,7 @@ st506_callback(void *priv)
                                  dev->head, dev->sector, dev->count);
 
                     if (!get_sector(dev, drive, &addr)) {
+read_error_start:
                         st506_error(dev, dev->error);
                         st506_complete(dev);
                         return;
@@ -691,8 +723,11 @@ st506_callback(void *priv)
                     ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 1);
 
                     /* Read data from the image. */
-                    hdd_image_read(drive->hdd_num, addr, 1,
-                                   (uint8_t *) dev->buff);
+                    if (hdd_image_read(drive->hdd_num, addr, 1,
+                                       (uint8_t *) dev->buff) < 0) {
+                        dev->error = ERR_UNC_ERR;
+                        goto read_error_start;
+                    }
 
                     /* Set up the data transfer. */
                     dev->buff_pos = 0;
@@ -734,6 +769,7 @@ st506_callback(void *priv)
                     next_sector(dev, drive);
 
                     if (!get_sector(dev, drive, &addr)) {
+read_error_sent:
                         ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 0);
                         st506_error(dev, dev->error);
                         st506_complete(dev);
@@ -741,8 +777,11 @@ st506_callback(void *priv)
                     }
 
                     /* Read data from the image. */
-                    hdd_image_read(drive->hdd_num, addr, 1,
-                                   (uint8_t *) dev->buff);
+                    if (hdd_image_read(drive->hdd_num, addr, 1,
+                                       (uint8_t *) dev->buff) < 0) {
+                        dev->error = ERR_UNC_ERR;
+                        goto read_error_sent;
+                    }
 
                     /* Set up the data transfer. */
                     dev->buff_pos = 0;
@@ -789,7 +828,7 @@ st506_callback(void *priv)
                         return;
                     }
 
-                    ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 1);
+                    ui_sb_update_icon_write(SB_HDD | HDD_BUS_MFM, 1);
 
                     /* Set up the data transfer. */
                     dev->buff_pos = 0;
@@ -825,18 +864,22 @@ st506_callback(void *priv)
 
                 case STATE_RECEIVED_DATA:
                     if (!get_sector(dev, drive, &addr)) {
-                        ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 0);
+write_error:
+                        ui_sb_update_icon_write(SB_HDD | HDD_BUS_MFM, 0);
                         st506_error(dev, dev->error);
                         st506_complete(dev);
                         return;
                     }
 
                     /* Write data to image. */
-                    hdd_image_write(drive->hdd_num, addr, 1,
-                                    (uint8_t *) dev->buff);
+                    if (hdd_image_write(drive->hdd_num, addr, 1,
+                                        (uint8_t *) dev->buff) < 0) {
+                        dev->error = ERR_UNC_ERR;
+                        goto write_error;
+                    }
 
                     if (--dev->count == 0) {
-                        ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 0);
+                        ui_sb_update_icon_write(SB_HDD | HDD_BUS_MFM, 0);
                         st506_complete(dev);
                         break;
                     }
@@ -1125,8 +1168,12 @@ st506_callback(void *priv)
                 ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 1);
 
                 /* Write data to image. */
-                hdd_image_write(drive->hdd_num, addr, 1,
-                                (uint8_t *) dev->buff);
+                if (hdd_image_write(drive->hdd_num, addr, 1,
+                                    (uint8_t *) dev->buff) < 0) {
+                    st506_error(dev, ERR_UNC_ERR);
+                    st506_complete(dev);
+                    return;
+                }
 
                 if (--dev->count == 0) {
                     ui_sb_update_icon(SB_HDD | HDD_BUS_MFM, 0);
@@ -1580,8 +1627,7 @@ st506_init(const device_t *info)
     int         i;
     int         c;
 
-    dev = (hdc_t *) malloc(sizeof(hdc_t));
-    memset(dev, 0x00, sizeof(hdc_t));
+    dev = (hdc_t *) calloc(1, sizeof(hdc_t));
     dev->type = info->local & 255;
 
     /* Set defaults for the controller. */
@@ -1652,7 +1698,7 @@ st506_init(const device_t *info)
             dev->base     = device_get_config_hex16("base");
             dev->irq      = device_get_config_int("irq");
             if (dev->irq == 2)
-                dev->switches |= 0x40;
+                dev->switches |= 0x80;
             dev->bios_addr = device_get_config_hex20("bios_addr");
             break;
 
@@ -1671,7 +1717,7 @@ st506_init(const device_t *info)
             dev->base     = device_get_config_hex16("base");
             dev->irq      = device_get_config_int("irq");
             if (dev->irq == 2)
-                dev->switches |= 0x40;
+                dev->switches |= 0x80;
             dev->bios_addr = device_get_config_hex20("bios_addr");
             break;
 
@@ -1686,7 +1732,7 @@ st506_init(const device_t *info)
             dev->base     = device_get_config_hex16("base");
             dev->irq      = device_get_config_int("irq");
             if (dev->irq == 2)
-                dev->switches |= 0x40;
+                dev->switches |= 0x80;
             dev->bios_addr = device_get_config_hex20("bios_addr");
             break;
 
@@ -1701,7 +1747,7 @@ st506_init(const device_t *info)
             dev->base     = device_get_config_hex16("base");
             dev->irq      = device_get_config_int("irq");
             if (dev->irq == 2)
-                dev->switches |= 0x40;
+                dev->switches |= 0x80;
             dev->bios_addr = device_get_config_hex20("bios_addr");
             break;
 
@@ -1716,7 +1762,7 @@ st506_init(const device_t *info)
             dev->base     = device_get_config_hex16("base");
             dev->irq      = device_get_config_int("irq");
             if (dev->irq == 2)
-                dev->switches |= 0x40;
+                dev->switches |= 0x80;
             dev->bios_addr = device_get_config_hex20("bios_addr");
             break;
 
@@ -1752,7 +1798,7 @@ st506_init(const device_t *info)
     st506_xt_log("ST506: looking for disks...\n");
 #endif
     for (c = 0, i = 0; i < HDD_NUM; i++) {
-        if ((hdd[i].bus == HDD_BUS_MFM) && (hdd[i].mfm_channel < MFM_NUM)) {
+        if ((hdd[i].bus_type == HDD_BUS_MFM) && (hdd[i].mfm_channel < MFM_NUM)) {
             st506_xt_log("ST506: disk '%s' on channel %i\n",
                          hdd[i].fn, hdd[i].mfm_channel);
             loadhd(dev, hdd[i].mfm_channel, i, hdd[i].fn);
@@ -1868,335 +1914,356 @@ victor_v86p_available(void)
 // clang-format off
 static const device_config_t dtc_config[] = {
     {
-        .name = "bios_addr",
-        .description = "BIOS address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0xc8000,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xc8000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Disabled", .value = 0x00000 },
             { .description = "C800H",    .value = 0xc8000 },
             { .description = "CA00H",    .value = 0xca000 },
             { .description = "D800H",    .value = 0xd8000 },
             { .description = "F400H",    .value = 0xf4000 },
             { .description = ""                           }
-        }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t st11_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x0320,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0320,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "320H", .value = 0x0320 },
             { .description = "324H", .value = 0x0324 },
             { .description = "328H", .value = 0x0328 },
             { .description = "32CH", .value = 0x032c },
             { .description = ""                      }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "IRQ 2", .value = 2 },
             { .description = "IRQ 5", .value = 5 },
             { .description = ""                  }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "bios_addr",
-        .description = "BIOS address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0xc8000,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xc8000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Disabled", .value = 0x00000 },
             { .description = "C800H",    .value = 0xc8000 },
             { .description = "D000H",    .value = 0xd0000 },
             { .description = "D800H",    .value = 0xd8000 },
             { .description = "E000H",    .value = 0xe0000 },
             { .description = ""                           }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "revision",
-        .description = "Board Revision",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 19,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "Rev. 05 (v1.7)", .value =  5 },
-            { .description = "Rev. 19 (v2.0)", .value = 19 },
+        .name           = "revision",
+        .description    = "BIOS Revision",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 19,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "v1.7", .value =  5 },
+            { .description = "v2.0", .value = 19 },
             { .description = ""                            }
-        }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t wd_config[] = {
     {
-        .name = "bios_addr",
-        .description = "BIOS address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0xc8000,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xc8000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Disabled", .value = 0x00000 },
             { .description = "C800H",    .value = 0xc8000 },
             { .description = ""                           }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x0320,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0320,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "320H", .value = 0x0320 },
             { .description = "324H", .value = 0x0324 },
             { .description = ""                      }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "IRQ 2", .value = 2 },
             { .description = "IRQ 5", .value = 5 },
             { .description = ""                  }
-        }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t wd_nobios_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x0320,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0320,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "320H", .value = 0x0320 },
             { .description = "324H", .value = 0x0324 },
             { .description = ""                      }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "IRQ 2", .value = 2 },
             { .description = "IRQ 5", .value = 5 },
             { .description = ""                  }
-        }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t wd_rll_config[] = {
     {
-        .name = "bios_addr",
-        .description = "BIOS address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0xc8000,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xc8000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Disabled", .value = 0x00000 },
             { .description = "C800H",    .value = 0xc8000 },
             { .description = ""                           }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x0320,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0320,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "320H", .value = 0x0320 },
             { .description = "324H", .value = 0x0324 },
             { .description = ""                      }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "IRQ 2", .value = 2 },
             { .description = "IRQ 5", .value = 5 },
             { .description = ""                  }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "translate",
-        .description = "Translate 26 -> 17",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "translate",
+        .description    = "Translate 26 -> 17",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Off", .value = 0 },
             { .description = "On",  .value = 1 },
             { .description = ""                }
-        }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t wd1004a_config[] = {
     {
-        .name = "bios_addr",
-        .description = "BIOS address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0xc8000,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xc8000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Disabled", .value = 0x00000 },
             { .description = "C800H",    .value = 0xc8000 },
             { .description = ""                           }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x0320,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0320,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "320H", .value = 0x0320 },
             { .description = "324H", .value = 0x0324 },
             { .description = ""                      }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "IRQ 2", .value = 2 },
             { .description = "IRQ 5", .value = 5 },
             { .description = ""                  }
-        }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t wd1004_rll_config[] = {
     {
-        .name = "bios_addr",
-        .description = "BIOS address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0xc8000,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xc8000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Disabled", .value = 0x00000 },
             { .description = "C800H",    .value = 0xc8000 },
             { .description = "CA00H",    .value = 0xca000 },
             { .description = "CC00H",    .value = 0xcc000 },
             { .description = "CE00H",    .value = 0xce000 },
             { .description = ""                           }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x0320,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0320,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "320H", .value = 0x0320 },
             { .description = "324H", .value = 0x0324 },
             { .description = "328H", .value = 0x0328 },
             { .description = "32CH", .value = 0x032c },
             { .description = ""                      }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "IRQ 2", .value = 2 },
             { .description = "IRQ 5", .value = 5 },
             { .description = ""                  }
-        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "translate",
-        .description = "Translate 26 -> 17",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "translate",
+        .description    = "Translate 26 -> 17",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Off", .value = 0 },
             { .description = "On",  .value = 1 },
             { .description = ""                }
-        }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
@@ -2211,7 +2278,7 @@ const device_t st506_xt_xebec_device = {
     .init          = st506_init,
     .close         = st506_close,
     .reset         = NULL,
-    { .available = xebec_available },
+    .available     = xebec_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2225,7 +2292,7 @@ const device_t st506_xt_wdxt_gen_device = {
     .init          = st506_init,
     .close         = st506_close,
     .reset         = NULL,
-    { .available = wdxt_available },
+    .available     = wdxt_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2239,7 +2306,7 @@ const device_t st506_xt_dtc5150x_device = {
     .init          = st506_init,
     .close         = st506_close,
     .reset         = NULL,
-    { .available = dtc5150x_available },
+    .available     = dtc5150x_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = dtc_config
@@ -2253,7 +2320,7 @@ const device_t st506_xt_st11_m_device = {
     .init          = st506_init,
     .close         = st506_close,
     .reset         = NULL,
-    { .available = st11_m_available },
+    .available     = st11_m_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = st11_config
@@ -2267,7 +2334,7 @@ const device_t st506_xt_st11_r_device = {
     .init          = st506_init,
     .close         = st506_close,
     .reset         = NULL,
-    { .available = st11_r_available },
+    .available     = st11_r_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = st11_config
@@ -2281,7 +2348,7 @@ const device_t st506_xt_wd1002a_wx1_device = {
     .init          = st506_init,
     .close         = st506_close,
     .reset         = NULL,
-    { .available = wd1002a_wx1_available },
+    .available     = wd1002a_wx1_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = wd_config
@@ -2295,7 +2362,7 @@ const device_t st506_xt_wd1002a_wx1_nobios_device = {
     .init          = st506_init,
     .close         = st506_close,
     .reset         = NULL,
-    { .available = wd1002a_wx1_available },
+    .available     = wd1002a_wx1_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = wd_nobios_config
@@ -2309,7 +2376,7 @@ const device_t st506_xt_wd1002a_27x_device = {
     .init          = st506_init,
     .close         = st506_close,
     .reset         = NULL,
-    { .available = wd1002a_27x_available },
+    .available     = wd1002a_27x_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = wd_rll_config
@@ -2323,7 +2390,7 @@ const device_t st506_xt_wd1004a_wx1_device = {
     .init          = st506_init,
     .close         = st506_close,
     .reset         = NULL,
-    { .available = wd1004a_wx1_available },
+    .available     = wd1004a_wx1_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = wd1004a_config
@@ -2337,7 +2404,7 @@ const device_t st506_xt_wd1004_27x_device = {
     .init          = st506_init,
     .close         = st506_close,
     .reset         = NULL,
-    { .available = wd1004_27x_available },
+    .available     = wd1004_27x_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = wd1004_rll_config
@@ -2351,7 +2418,7 @@ const device_t st506_xt_wd1004a_27x_device = {
     .init          = st506_init,
     .close         = st506_close,
     .reset         = NULL,
-    { .available = wd1004a_27x_available },
+    .available     = wd1004a_27x_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = wd_rll_config
@@ -2365,7 +2432,7 @@ const device_t st506_xt_victor_v86p_device = {
     .init          = st506_init,
     .close         = st506_close,
     .reset         = NULL,
-    { .available = victor_v86p_available },
+    .available     = victor_v86p_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2379,7 +2446,7 @@ const device_t st506_xt_toshiba_t1200_device = {
     .init          = st506_init,
     .close         = st506_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/disk/hdc_xta.c b/src/disk/hdc_xta.c
index ede21caf2..8c60caad2 100644
--- a/src/disk/hdc_xta.c
+++ b/src/disk/hdc_xta.c
@@ -82,6 +82,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#include <inttypes.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -101,11 +102,15 @@
 #include <86box/ui.h>
 #include <86box/hdc.h>
 #include <86box/hdd.h>
+#include "cpu.h"
 
 #define HDC_TIME           (250 * TIMER_USEC)
 
 #define WD_REV_1_BIOS_FILE "roms/hdd/xta/idexywd2.bin"
 #define WD_REV_2_BIOS_FILE "roms/hdd/xta/infowdbios.rom"
+#define PC3086_BIOS_FILE   "roms/machines/pc3086/c800.bin"
+#define ST50X_BIOS_FILE    "roms/hdd/xta/ST05XBIO.BIN"
+#define PC5086_BIOS_FILE   "roms/machines/pc5086/c800.bin"
 
 enum {
     STATE_IDLE = 0,
@@ -236,6 +241,7 @@ typedef struct hdc_t {
     const char *name; /* controller name */
 
     uint16_t base; /* controller base I/O address */
+    uint8_t  sw;   /* controller switches */
     int8_t   irq;  /* controller IRQ channel */
     int8_t   dma;  /* controller DMA channel */
     int8_t   type; /* controller type ID */
@@ -269,6 +275,10 @@ typedef struct hdc_t {
     uint8_t sector_buf[512]; /* sector buffer */
 } hdc_t;
 
+typedef struct hdc_dual_t {
+    hdc_t  *hdc[2];
+} hdc_dual_t;
+
 #ifdef ENABLE_XTA_LOG
 int xta_do_log = ENABLE_XTA_LOG;
 
@@ -385,7 +395,7 @@ do_format(hdc_t *dev, drive_t *drive, dcb_t *dcb)
             dev->sector = 0;
 
             /* Activate the status icon. */
-            ui_sb_update_icon(SB_HDD | HDD_BUS_XTA, 1);
+            ui_sb_update_icon_write(SB_HDD | HDD_BUS_XTA, 1);
 
 do_fmt:
             /*
@@ -408,8 +418,9 @@ do_fmt:
                         break;
 
                     /* Write the block to the image. */
-                    hdd_image_write(drive->hdd_num, addr, 1,
-                                    (uint8_t *) dev->sector_buf);
+                    if (hdd_image_write(drive->hdd_num, addr, 1,
+                                        (uint8_t *) dev->sector_buf) < 0)
+                        dev->sense = ERR_BADTRK;
                 }
             }
 
@@ -425,7 +436,7 @@ do_fmt:
     }
 
     /* De-activate the status icon. */
-    ui_sb_update_icon(SB_HDD | HDD_BUS_XTA, 0);
+    ui_sb_update_icon_write(SB_HDD | HDD_BUS_XTA, 0);
 }
 
 /* Execute the DCB we just received. */
@@ -522,6 +533,7 @@ hdc_callback(void *priv)
 do_send:
                     /* Get address of sector to load. */
                     if (get_sector(dev, drive, &addr)) {
+read_error:
                         /* De-activate the status icon. */
                         ui_sb_update_icon(SB_HDD | HDD_BUS_XTA, 0);
                         dev->comp |= COMP_ERR;
@@ -530,8 +542,11 @@ do_send:
                     }
 
                     /* Read the block from the image. */
-                    hdd_image_read(drive->hdd_num, addr, 1,
-                                   (uint8_t *) dev->sector_buf);
+                    if (hdd_image_read(drive->hdd_num, addr, 1,
+                                       (uint8_t *) dev->sector_buf) < 0) {
+                        dev->sense = ERR_BADTRK;
+                        goto read_error;
+                    }
 
                     /* Ready to transfer the data out. */
                     dev->state   = STATE_SDATA;
@@ -626,7 +641,7 @@ do_send:
 
                 case STATE_RECV:
                     /* Activate the status icon. */
-                    ui_sb_update_icon(SB_HDD | HDD_BUS_XTA, 1);
+                    ui_sb_update_icon_write(SB_HDD | HDD_BUS_XTA, 1);
 do_recv:
                     /* Ready to transfer the data in. */
                     dev->state   = STATE_RDATA;
@@ -673,8 +688,9 @@ do_recv:
 
                     /* Get address of sector to write. */
                     if (get_sector(dev, drive, &addr)) {
+write_error:
                         /* De-activate the status icon. */
-                        ui_sb_update_icon(SB_HDD | HDD_BUS_XTA, 0);
+                        ui_sb_update_icon_write(SB_HDD | HDD_BUS_XTA, 0);
 
                         dev->comp |= COMP_ERR;
                         set_intr(dev);
@@ -682,13 +698,16 @@ do_recv:
                     }
 
                     /* Write the block to the image. */
-                    hdd_image_write(drive->hdd_num, addr, 1,
-                                    (uint8_t *) dev->sector_buf);
+                    if (hdd_image_write(drive->hdd_num, addr, 1,
+                                        (uint8_t *) dev->sector_buf) < 0) {
+                        dev->sense = ERR_BADTRK;
+                        goto write_error;
+                    }
 
                     dev->buf_idx = 0;
                     if (--dev->count == 0) {
                         /* De-activate the status icon. */
-                        ui_sb_update_icon(SB_HDD | HDD_BUS_XTA, 0);
+                        ui_sb_update_icon_write(SB_HDD | HDD_BUS_XTA, 0);
 
                         set_intr(dev);
                         return;
@@ -873,7 +892,7 @@ hdc_read(uint16_t port, void *priv)
     hdc_t  *dev = (hdc_t *) priv;
     uint8_t ret = 0xff;
 
-    switch (port & 7) {
+    switch (port & 3) {
         case 0: /* DATA register */
             dev->status &= ~STAT_IRQ;
 
@@ -906,7 +925,7 @@ hdc_read(uint16_t port, void *priv)
             break;
 
         case 2:         /* "read option jumpers" */
-            ret = 0xff; /* all switches off */
+            ret = dev->sw;
             break;
 
         default:
@@ -922,7 +941,7 @@ hdc_write(uint16_t port, uint8_t val, void *priv)
 {
     hdc_t *dev = (hdc_t *) priv;
 
-    switch (port & 7) {
+    switch (port & 3) {
         case 0: /* DATA register */
             if (dev->state == STATE_RDATA) {
                 if (!(dev->status & STAT_REQ)) {
@@ -980,39 +999,92 @@ hdc_write(uint16_t port, uint8_t val, void *priv)
     }
 }
 
+void
+xta_handler(void *priv, int set)
+{
+    hdc_t      *dev = (hdc_t *) priv;
+
+    io_handler(set, dev->base, 4,
+               hdc_read, NULL, NULL, hdc_write, NULL, NULL, dev);
+}
+
 static void *
-xta_init(const device_t *info)
+xta_init_common(const device_t *info, int type)
 {
     drive_t    *drive;
     const char *bios_rev = NULL;
     const char *fn       = NULL;
     hdc_t      *dev;
     int         c;
-    int         max = XTA_NUM;
+    int         min      = 0;
+    int         max      = XTA_NUM;
 
     /* Allocate and initialize device block. */
-    dev = malloc(sizeof(hdc_t));
-    memset(dev, 0x00, sizeof(hdc_t));
-    dev->type = info->local;
+    dev = calloc(1, sizeof(hdc_t));
+
+    dev->sw   = 0xff;        /* all switches off */
+    dev->type = type;
 
     /* Do per-controller-type setup. */
     switch (dev->type) {
         case 0: /* WDXT-150, with BIOS */
             dev->name     = "WDXT-150";
+            bios_rev      = (char *) device_get_config_bios("bios_rev");
+            fn            = (char *) device_get_bios_file(info, bios_rev, 0);
+            /* Revision 2 actually supports 2 drives using drive select. */
+            if (!strcmp(bios_rev, "rev_1"))
+                max           = 1;
+#ifdef SELECTABLE_BASE
             dev->base     = device_get_config_hex16("base");
+#else
+            dev->base     = 0x0320;
+#endif
             dev->irq      = device_get_config_int("irq");
             dev->rom_addr = device_get_config_hex20("bios_addr");
             dev->dma      = 3;
-            bios_rev      = (char *) device_get_config_bios("bios_rev");
-            fn            = (char *) device_get_bios_file(info, bios_rev, 0);
-            max           = 1;
+        case 1: /* Amstrad PC3086 */
+            dev->name     = "WDXT-150 PC3086";
+            dev->rom_addr = 0xc8000;
+            fn            = PC3086_BIOS_FILE;
+            dev->base     = 0x0320;
+            dev->irq      = 5;
+            dev->dma      = 3;
             break;
 
-        case 1: /* EuroPC */
-            dev->name = "HD20";
-            dev->base = 0x0320;
-            dev->irq  = 5;
-            dev->dma  = 3;
+        case 2: /* EuroPC */
+        case 5: /* Amstrad PC5086 */
+            switch (dev->type) {
+                case 2:
+                    dev->name     = "HD20";
+                    break;
+                case 5:
+                    dev->name     = "ST-50X PC5086";
+                    dev->rom_addr = 0xc8000;
+                    fn            = PC5086_BIOS_FILE;
+                    max           = 1;
+                    break;
+            }
+            dev->base     = 0x0320;
+            dev->irq      = 5;
+            dev->dma      = 3;
+            break;
+        case 3: /* Seagate ST-05X Standalone */
+        case 4: /* Seagate ST-05X Standalone secondary device */
+            switch (dev->type) {
+                case 3:
+                    dev->name     = "ST-50X PRI";
+                    dev->rom_addr = device_get_config_hex20("bios_addr");
+                    fn            = ST50X_BIOS_FILE;
+                    max           = 1;
+                    break;
+                case 4:
+                    dev->name     = "ST-50X SEC";
+                    min           = 1;
+                    break;
+            }
+            dev->base     = 0x0320 + (dev->type & 4);
+            dev->irq      = 5;
+            dev->dma      = 3;
             break;
 
         default:
@@ -1023,14 +1095,16 @@ xta_init(const device_t *info)
             dev->name, dev->base, dev->irq, dev->dma);
     if (dev->rom_addr != 0x000000)
         xta_log(", BIOS=%06X", dev->rom_addr);
-
     xta_log(")\n");
 
     /* Load any disks for this device class. */
     c = 0;
     for (uint8_t i = 0; i < HDD_NUM; i++) {
-        if ((hdd[i].bus == HDD_BUS_XTA) && (hdd[i].xta_channel < max)) {
-            drive = &dev->drives[hdd[i].xta_channel];
+        if ((hdd[i].bus_type == HDD_BUS_XTA) && (hdd[i].xta_channel >= min) && (hdd[i].xta_channel < max)) {
+            if (dev->type == 4)
+                drive = &dev->drives[0];
+            else
+                drive = &dev->drives[hdd[i].xta_channel];
 
             if (!hdd_image_load(i)) {
                 drive->present = 0;
@@ -1050,6 +1124,156 @@ xta_init(const device_t *info)
             drive->hpc    = drive->cfg_hpc;
             drive->tracks = drive->cfg_tracks;
 
+            if (dev->type == 0) {
+                if (!strcmp(bios_rev, "rev_1")) {
+                    /*
+                       WDXT-150, Revision 1 switches:
+                           - Bit 6: 1 = IBM (INT 13h), 0 = Tandy (INT 0Ah).
+                           - Bit 5: 1 = 17 sectors per track, 0 = 27 sectors per track.
+                           - Drive 0, bits 1,0:
+                               - With bit 4 set:
+                                   - 0,0 = 820/4/17;
+                                   - 0,1 = 615/4/17;
+                                   - 1,0 = 782/4/17;
+                                   - 1,1 = 782/2/17.
+                               - With bit 4 clear:
+                                   - 0,0 = 1024/4/17;
+                                   - 0,1 = 940/4/17;
+                                   - 1,0 = 1024/4/17;
+                                   - 1,1 = 1024/2/17.
+                           - Drive 1, bits 3,2:
+                               - With bit 4 set:
+                                   - 0,0 = 820/4/17;
+                                   - 0,1 = 615/4/17;
+                                   - 1,0 = 782/4/17;
+                                   - 1,1 = 782/2/17.
+                               - With bit 4 clear:
+                                   - 0,0 = 1024/4/17;
+                                   - 0,1 = 940/4/17;
+                                   - 1,0 = 1024/4/17;
+                                   - 1,1 = 1024/2/17.
+                     */
+                    if (drive->tracks == 940)
+                        dev->sw = ((dev->sw & 0xef) & (c ? 0xf3 : 0xfc)) | (0x01 << (c << 1));
+                    else if (drive->tracks == 1024) {
+                        if (drive->hpc == 4)
+                            dev->sw = ((dev->sw & 0xef) & (c ? 0xf3 : 0xfc)) | (0x00 << (c << 1));
+                        else
+                            dev->sw = ((dev->sw & 0xef) & (c ? 0xf3 : 0xfc)) | (0x03 << (c << 1));
+                    } else if (drive->tracks == 782) {
+                        if (drive->hpc == 4)
+                            dev->sw = (dev->sw & (c ? 0xf3 : 0xfc)) | (0x02 << (c << 1));
+                        else
+                            dev->sw = (dev->sw & (c ? 0xf3 : 0xfc)) | (0x03 << (c << 1));
+                    } else if (drive->tracks == 820)
+                        dev->sw = (dev->sw & (c ? 0xf3 : 0xfc)) | (0x00 << (c << 1));
+                    else
+                        dev->sw = (dev->sw & (c ? 0xf3 : 0xfc)) | (0x01 << (c << 1));
+                } else {
+                    /*
+                       WDXT-150, Revision 2 switches:
+                           - Drive 0, bits 1,0:
+                               - With bit 4 set:
+                                   - 0,0 = 612/4/17;
+                                   - 0,1 = 615/6/17;
+                                   - 1,0 = 977/5/17;
+                                   - 1,1 = 615/4/17.
+                               - With bit 4 clear:
+                                   - 0,0 = 976/4/17;
+                                   - 0,1 = 1024/3/17;
+                                   - 1,0 = 1024/4/17;
+                                   - 1,1 = 1024/2/17.
+                           - Drive 1, bits 3,2:
+                               - With bit 4 set:
+                                   - 0,0 = 612/4/17;
+                                   - 0,1 = 615/6/17;
+                                   - 1,0 = 977/5/17;
+                                   - 1,1 = 615/4/17.
+                               - With bit 4 clear:
+                                   - 0,0 = 976/4/17;
+                                   - 0,1 = 1024/3/17;
+                                   - 1,0 = 1024/4/17;
+                                   - 1,1 = 1024/2/17.
+                     */
+                    if (drive->tracks == 976)
+                        dev->sw = ((dev->sw & 0xef) & (c ? 0xf3 : 0xfc)) | (0x00 << (c << 1));
+                    else if (drive->tracks == 1024) {
+                        if (drive->hpc == 3)
+                            dev->sw = ((dev->sw & 0xef) & (c ? 0xf3 : 0xfc)) | (0x01 << (c << 1));
+                        else if (drive->hpc == 4)
+                            dev->sw = ((dev->sw & 0xef) & (c ? 0xf3 : 0xfc)) | (0x02 << (c << 1));
+                        else
+                            dev->sw = ((dev->sw & 0xef) & (c ? 0xf3 : 0xfc)) | (0x03 << (c << 1));
+                    } else if (drive->tracks == 615) {
+                        if (drive->hpc == 6)
+                            dev->sw = (dev->sw & (c ? 0xf3 : 0xfc)) | (0x01 << (c << 1));
+                        else
+                            dev->sw = (dev->sw & (c ? 0xf3 : 0xfc)) | (0x03 << (c << 1));
+                    } else if (drive->tracks == 612)
+                        dev->sw = (dev->sw & (c ? 0xf3 : 0xfc)) | (0x00 << (c << 1));
+                    else
+                        dev->sw = (dev->sw & (c ? 0xf3 : 0xfc)) | (0x02 << (c << 1));
+                }
+            } else if (dev->type == 1) {
+                /*
+                   WDXT-150, Revision 3 (Amstrad PC3086) switches:
+                       - Drive 0, bits 1,0:
+                           - With bit 4 set:
+                               - 0,0 = 612/4/17;
+                               - 0,1 = 615/6/17;
+                               - 1,0 = 977/5/17;
+                               - 1,1 = 615/4/17.
+                           - With bit 4 clear:
+                               - 0,0 = 971/4/17;
+                               - 0,1 = 976/6/17;
+                               - 1,0 = 1024/5/17;
+                               - 1,1 = 976/4/17.
+                       - Drive 1, bits 3,2:
+                           - With bit 4 set:
+                               - 0,0 = 612/4/17;
+                               - 0,1 = 615/6/17;
+                               - 1,0 = 977/5/17;
+                               - 1,1 = 615/4/17.
+                           - With bit 4 clear:
+                               - 0,0 = 971/4/17;
+                               - 0,1 = 976/6/17;
+                               - 1,0 = 1024/5/17;
+                               - 1,1 = 976/4/17.
+                 */
+                if (drive->tracks == 971)
+                    dev->sw = ((dev->sw & 0xef) & (c ? 0xf3 : 0xfc)) | (0x00 << (c << 1));
+                else if (drive->tracks == 976) {
+                    if (drive->hpc == 6)
+                        dev->sw = ((dev->sw & 0xef) & (c ? 0xf3 : 0xfc)) | (0x01 << (c << 1));
+                    else
+                        dev->sw = ((dev->sw & 0xef) & (c ? 0xf3 : 0xfc)) | (0x03 << (c << 1));
+                } else if (drive->tracks == 1024)
+                    dev->sw = ((dev->sw & 0xef) & (c ? 0xf3 : 0xfc)) | (0x02 << (c << 1));
+                else if (drive->tracks == 615) {
+                    if (drive->hpc == 6)
+                        dev->sw = (dev->sw & (c ? 0xf3 : 0xfc)) | (0x01 << (c << 1));
+                    else
+                        dev->sw = (dev->sw & (c ? 0xf3 : 0xfc)) | (0x03 << (c << 1));
+                } else if (drive->tracks == 612)
+                    dev->sw = (dev->sw & (c ? 0xf3 : 0xfc)) | (0x00 << (c << 1));
+                else
+                    dev->sw = (dev->sw & (c ? 0xf3 : 0xfc)) | (0x02 << (c << 1));
+            } else if ((dev->type >= 3) && (dev->type <= 5)) {
+                /*
+                   Bits 1, 0:
+                       - 1, 1 = 615/4/17 (20 MB);
+                       - 1, 0 or 0, 0 = 980/5/17 (40 MB);
+                       - 0, 1 = 615/6/17 (30 MB).
+                       - 0, 0 is actually no hard disk present - switch port supposed to be readable always?
+                 */
+                if (drive->tracks == 980)
+                    dev->sw = 0xfe;
+                else if (drive->hpc == 6)
+                    dev->sw = 0xfd;
+                else
+                    dev->sw = 0xff;
+            }
+
             xta_log("%s: drive%d (cyl=%d,hd=%d,spt=%d), disk %d\n",
                     dev->name, hdd[i].xta_channel, drive->tracks,
                     drive->hpc, drive->spt, i);
@@ -1075,6 +1299,23 @@ xta_init(const device_t *info)
     return dev;
 }
 
+static void *
+xta_init(const device_t *info)
+{
+    return xta_init_common(info, info->local);
+}
+
+static void *
+xta_st50x_init(const device_t *info)
+{
+    hdc_dual_t *dev = (hdc_dual_t *) calloc(1, sizeof(hdc_dual_t));
+
+    dev->hdc[0] = xta_init_common(info, info->local);
+    dev->hdc[1] = xta_init_common(info, 4);
+
+    return dev;
+}
+
 static void
 xta_close(void *priv)
 {
@@ -1096,94 +1337,191 @@ xta_close(void *priv)
     free(dev);
 }
 
+static void
+xta_st50x_close(void *priv)
+{
+    hdc_dual_t    *dev = (hdc_dual_t *) priv;
+
+    xta_close(dev->hdc[1]);
+    xta_close(dev->hdc[0]);
+}
+
+static int
+st50x_available(void)
+{
+    return (rom_present(ST50X_BIOS_FILE));
+}
+
 static const device_config_t wdxt150_config[] = {
     // clang-format off
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x0320,
-        .file_filter = "",
-        .spinner = { 0 }, /*W2*/
-        .selection = {
+        .name           = "bios_rev",
+        .description    = "BIOS Revision",
+        .type           = CONFIG_BIOS,
+        .default_string = "rev_1",
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .bios           = {
+            {
+                .name          = "Revision 1.0",
+                .internal_name = "rev_1",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 8192,
+                .files         = { WD_REV_1_BIOS_FILE, "" }
+            },
+            {
+                .name          = "Revision 2.0",
+                .internal_name = "rev_2",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 8192,
+                .files         = { WD_REV_2_BIOS_FILE, "" }
+            },
+            { .files_no = 0 }
+        },
+    },
+#ifdef SELECTABLE_BASE
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0320,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "320H", .value = 0x0320 },
             { .description = "324H", .value = 0x0324 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
+#endif
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 }, /*W3*/
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "IRQ 5", .value = 5 },
             { .description = "IRQ 4", .value = 4 },
             { .description = ""                  }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "bios_addr",
-        .description = "BIOS Address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0xc8000,
-        .file_filter = "",
-        .spinner = { 0 }, /*W1*/
-        .selection = {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xc8000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "C800H", .value = 0xc8000 },
             { .description = "CA00H", .value = 0xca000 },
             { .description = ""                        }
         },
+        .bios           = { { 0 } }
     },
+    { .name = "", .description = "", .type = CONFIG_END }
+// clang-format off
+};
+
+static const device_config_t st50x_config[] = {
+    // clang-format off
     {
-        .name = "bios_rev",
-        .description = "BIOS Revision",
-        .type = CONFIG_BIOS,
-        .default_string = "rev_1",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 }, /*W1*/
-        .bios = {
-            { .name = "Revision 1.0", .internal_name = "rev_1", .bios_type = BIOS_NORMAL,
-              .files_no = 1, .local = 0, .size = 8192, .files = { WD_REV_1_BIOS_FILE, "" } },
-            { .name = "Revision 2.0", .internal_name = "rev_2", .bios_type = BIOS_NORMAL,
-              .files_no = 1, .local = 0, .size = 8192, .files = { WD_REV_2_BIOS_FILE, "" } },
-            { .files_no = 0 }
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xc8000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "C800H", .value = 0xc8000 },
+            { .description = "CA00H", .value = 0xca000 },
+            { .description = ""                        }
         },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 // clang-format off
 };
 
 const device_t xta_wdxt150_device = {
-    .name = "WDXT-150 XTA Fixed Disk Controller",
+    .name          = "WDXT-150 XTA Fixed Disk Controller",
     .internal_name = "xta_wdxt150",
-    .flags = DEVICE_ISA,
-    .local = 0,
-    .init = xta_init,
-    .close = xta_close,
-    .reset = NULL,
-    { .available = NULL /*xta_available*/ },
+    .flags         = DEVICE_ISA,
+    .local         = 0,
+    .init          = xta_init,
+    .close         = xta_close,
+    .reset         = NULL,
+    .available     = NULL /*xta_available*/,
     .speed_changed = NULL,
-    .force_redraw = NULL,
-    .config = wdxt150_config
+    .force_redraw  = NULL,
+    .config        = wdxt150_config
+};
+
+const device_t xta_wdxt150_pc3086_device = {
+    .name          = "WDXT-150 XTA Fixed Disk Controller (PC3086)",
+    .internal_name = "xta_wdxt150",
+    .flags         = DEVICE_ISA,
+    .local         = 1,
+    .init          = xta_init,
+    .close         = xta_close,
+    .reset         = NULL,
+    .available     = NULL /*xta_available*/,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = wdxt150_config
 };
 
 const device_t xta_hd20_device = {
-    .name = "EuroPC HD20 Fixed Disk Controller",
+    .name          = "EuroPC HD20 Fixed Disk Controller",
     .internal_name = "xta_hd20",
-    .flags = DEVICE_ISA,
-    .local = 1,
-    .init = xta_init,
-    .close = xta_close,
-    .reset = NULL,
-    { .available = NULL },
+    .flags         = DEVICE_ISA,
+    .local         = 2,
+    .init          = xta_init,
+    .close         = xta_close,
+    .reset         = NULL,
+    .available     = NULL,
     .speed_changed = NULL,
-    .force_redraw = NULL,
-    .config = NULL
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t xta_st50x_device = {
+    .name          = "ST-50X Fixed Disk Controller",
+    .internal_name = "xta_st50x",
+    .flags         = DEVICE_ISA,
+    .local         = 3,
+    .init          = xta_st50x_init,
+    .close         = xta_st50x_close,
+    .reset         = NULL,
+    .available     = st50x_available,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = st50x_config
+};
+
+const device_t xta_st50x_pc5086_device = {
+    .name          = "ST-50X Fixed Disk Controller (PC5086)",
+    .internal_name = "xta_st50x_pc5086",
+    .flags         = DEVICE_ISA,
+    .local         = 5,
+    .init          = xta_init,
+    .close         = xta_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
 };
diff --git a/src/machine/m_ps1_hdc.c b/src/disk/hdc_xta_ps1.c
similarity index 98%
rename from src/machine/m_ps1_hdc.c
rename to src/disk/hdc_xta_ps1.c
index f35879458..ea71c918b 100644
--- a/src/machine/m_ps1_hdc.c
+++ b/src/disk/hdc_xta_ps1.c
@@ -462,7 +462,6 @@ static const geom_t ibm_type_table[] = {
   // clang-format on
 };
 
-#define ENABLE_PS1_HDC_LOG 1
 #ifdef ENABLE_PS1_HDC_LOG
 int ps1_hdc_do_log = ENABLE_PS1_HDC_LOG;
 
@@ -654,7 +653,7 @@ do_format(hdc_t *dev, drive_t *drive, ccb_t *ccb)
         case STATE_FINIT:
 do_fmt:
             /* Activate the status icon. */
-            ui_sb_update_icon(SB_HDD | HDD_BUS_XTA, 1);
+            ui_sb_update_icon_write(SB_HDD | HDD_BUS_XTA, 1);
 
             /* Seek to cylinder. */
             if (do_seek(dev, drive, start_cyl)) {
@@ -692,7 +691,7 @@ do_fmt:
             }
 
             /* De-activate the status icon. */
-            ui_sb_update_icon(SB_HDD | HDD_BUS_XTA, 0);
+            ui_sb_update_icon_write(SB_HDD | HDD_BUS_XTA, 0);
 
             /* This saves us a LOT of code. */
             dev->state = STATE_FINIT;
@@ -706,6 +705,7 @@ do_fmt:
     if (intr) {
         /* De-activate the status icon. */
         ui_sb_update_icon(SB_HDD | HDD_BUS_XTA, 0);
+        ui_sb_update_icon_write(SB_HDD | HDD_BUS_XTA, 0);
 
         do_finish(dev);
     }
@@ -721,7 +721,9 @@ hdc_callback(void *priv)
     off64_t  addr;
     int      no_data = 0;
     int      val;
+#ifdef ENABLE_PS1_HDC_LOG
     uint8_t  cmd = ccb->cmd & 0x0f;
+#endif
 
     /* Clear the SSB error bits. */
     dev->ssb.track_0        = 0;
@@ -969,7 +971,7 @@ do_send:
 
                 case STATE_RECV:
                     /* Activate the status icon. */
-                    ui_sb_update_icon(SB_HDD | HDD_BUS_XTA, 1);
+                    ui_sb_update_icon_write(SB_HDD | HDD_BUS_XTA, 1);
 do_recv:
                     /* Ready to transfer the data in. */
                     dev->state   = STATE_RDATA;
@@ -999,7 +1001,7 @@ do_recv:
                                 ps1_hdc_log("HDC: CMD_WRITE_SECTORS out of data (idx=%d, len=%d)!\n", dev->buf_idx, dev->buf_len);
 
                                 /* De-activate the status icon. */
-                                ui_sb_update_icon(SB_HDD | HDD_BUS_XTA, 0);
+                                ui_sb_update_icon_write(SB_HDD | HDD_BUS_XTA, 0);
 
                                 dev->intstat |= ISR_EQUIP_CHECK;
                                 dev->ssb.need_reset = 1;
@@ -1024,7 +1026,7 @@ do_recv:
                     /* Get address of sector to write. */
                     if (get_sector(dev, drive, &addr)) {
                         /* De-activate the status icon. */
-                        ui_sb_update_icon(SB_HDD | HDD_BUS_XTA, 0);
+                        ui_sb_update_icon_write(SB_HDD | HDD_BUS_XTA, 0);
 
                         do_finish(dev);
                         return;
@@ -1037,7 +1039,7 @@ do_recv:
                     dev->buf_idx = 0;
                     if (--dev->count == 0) {
                         /* De-activate the status icon. */
-                        ui_sb_update_icon(SB_HDD | HDD_BUS_XTA, 0);
+                        ui_sb_update_icon_write(SB_HDD | HDD_BUS_XTA, 0);
 
                         if (!(dev->ctrl & ACR_DMA_EN))
                             dev->status &= ~ASR_DATA_REQ;
@@ -1296,8 +1298,7 @@ ps1_hdc_init(UNUSED(const device_t *info))
     int      c;
 
     /* Allocate and initialize device block. */
-    dev = malloc(sizeof(hdc_t));
-    memset(dev, 0x00, sizeof(hdc_t));
+    dev = calloc(1, sizeof(hdc_t));
 
     /* Set up controller parameters for PS/1 2011. */
     dev->base = 0x0320;
@@ -1310,7 +1311,7 @@ ps1_hdc_init(UNUSED(const device_t *info))
     /* Load any disks for this device class. */
     c = 0;
     for (uint8_t i = 0; i < HDD_NUM; i++) {
-        if ((hdd[i].bus == HDD_BUS_XTA) && (hdd[i].xta_channel < 1)) {
+        if ((hdd[i].bus_type == HDD_BUS_XTA) && (hdd[i].xta_channel < 1)) {
             drive = &dev->drives[hdd[i].xta_channel];
 
             if (!hdd_image_load(i)) {
@@ -1380,12 +1381,12 @@ ps1_hdc_close(void *priv)
 const device_t ps1_hdc_device = {
     .name          = "PS/1 2011 Fixed Disk Controller",
     .internal_name = "ps1_hdc",
-    .flags         = DEVICE_ISA | DEVICE_PS2,
+    .flags         = DEVICE_ISA,
     .local         = 0,
     .init          = ps1_hdc_init,
     .close         = ps1_hdc_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/disk/hdc_xtide.c b/src/disk/hdc_xtide.c
index 057d4f0ed..63067f579 100644
--- a/src/disk/hdc_xtide.c
+++ b/src/disk/hdc_xtide.c
@@ -41,11 +41,13 @@
 #include <86box/mem.h>
 #include <86box/rom.h>
 #include <86box/timer.h>
+#include <86box/nvr.h>
 #include <86box/device.h>
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
 #include <86box/plat_unused.h>
 
+#define ROM_PATH_TINY   "roms/hdd/xtide/ide_tiny.bin"
 #define ROM_PATH_XT     "roms/hdd/xtide/ide_xt.bin"
 #define ROM_PATH_XTP    "roms/hdd/xtide/ide_xtp.bin"
 #define ROM_PATH_AT     "roms/hdd/xtide/ide_at.bin"
@@ -57,6 +59,7 @@ typedef struct xtide_t {
     void   *ide_board;
     uint8_t data_high;
     rom_t   bios_rom;
+    char    nvr_path[64];
 } xtide_t;
 
 static void
@@ -132,35 +135,46 @@ xtide_read(uint16_t port, void *priv)
 static void *
 xtide_init(const device_t *info)
 {
-    xtide_t *xtide = malloc(sizeof(xtide_t));
+    xtide_t *xtide = calloc(1, sizeof(xtide_t));
 
-    memset(xtide, 0x00, sizeof(xtide_t));
-
-        rom_init(&xtide->bios_rom,
-                 device_get_bios_file(info, device_get_config_bios("bios"), 0),
-                 0xc8000, 0x2000, 0x1fff, 0, MEM_MAPPING_EXTERNAL);
+    rom_init(&xtide->bios_rom,
+             device_get_bios_file(info, device_get_config_bios("bios"), 0),
+             device_get_config_hex20("bios_addr"), 0x2000, 0x1fff, 0, MEM_MAPPING_EXTERNAL);
 
     xtide->ide_board = ide_xtide_init();
 
-    io_sethandler(0x0300, 16,
+    io_sethandler(device_get_config_hex16("base"), 16,
                   xtide_read, NULL, NULL,
                   xtide_write, NULL, NULL, xtide);
 
+    uint8_t rom_writes_enabled = device_get_config_int("rom_writes_enabled");
+
+    if (rom_writes_enabled) {
+        mem_mapping_set_write_handler(&xtide->bios_rom.mapping, rom_write, rom_writew, rom_writel);
+        sprintf(xtide->nvr_path, "xtide_%i.nvr", device_get_instance());
+        FILE *fp = nvr_fopen(xtide->nvr_path, "rb");
+        if (fp != NULL) {
+            (void) !fread(xtide->bios_rom.rom, 1, 0x2000, fp);
+            fclose(fp);
+        }
+    }
+
     return xtide;
 }
 
 static void *
 xtide_at_init(const device_t *info)
 {
-    xtide_t *xtide = malloc(sizeof(xtide_t));
+    xtide_t *xtide = calloc(1, sizeof(xtide_t));
 
-    memset(xtide, 0x00, sizeof(xtide_t));
+    rom_init(&xtide->bios_rom,
+             device_get_bios_file(info, device_get_config_bios("bios"), 0),
+             0xc8000, 0x2000, 0x1fff, 0, MEM_MAPPING_EXTERNAL);
 
-        rom_init(&xtide->bios_rom,
-                 device_get_bios_file(info, device_get_config_bios("bios"), 0),
-                 0xc8000, 0x2000, 0x1fff, 0, MEM_MAPPING_EXTERNAL);
-
-    device_add(&ide_isa_2ch_device);
+    if (info->local == 1)
+        device_add(&ide_isa_2ch_device);
+    else
+        device_add(&ide_isa_device);
 
     return xtide;
 }
@@ -168,9 +182,7 @@ xtide_at_init(const device_t *info)
 static void *
 xtide_acculogic_init(UNUSED(const device_t *info))
 {
-    xtide_t *xtide = malloc(sizeof(xtide_t));
-
-    memset(xtide, 0x00, sizeof(xtide_t));
+    xtide_t *xtide = calloc(1, sizeof(xtide_t));
 
     rom_init(&xtide->bios_rom, ROM_PATH_PS2,
              0xc8000, 0x2000, 0x1fff, 0, MEM_MAPPING_EXTERNAL);
@@ -195,6 +207,14 @@ xtide_close(void *priv)
 {
     xtide_t *xtide = (xtide_t *) priv;
 
+    if (xtide->nvr_path[0] != 0x00) {
+        FILE *fp = nvr_fopen(xtide->nvr_path, "wb");
+        if (fp != NULL) {
+            fwrite(xtide->bios_rom.rom, 1, 0x2000, fp);
+            fclose(fp);
+        }
+    }
+
     free(xtide);
 
     ide_xtide_close();
@@ -203,14 +223,15 @@ xtide_close(void *priv)
 static void *
 xtide_at_ps2_init(UNUSED(const device_t *info))
 {
-    xtide_t *xtide = malloc(sizeof(xtide_t));
-
-    memset(xtide, 0x00, sizeof(xtide_t));
+    xtide_t *xtide = calloc(1, sizeof(xtide_t));
 
     rom_init(&xtide->bios_rom, ROM_PATH_PS2AT,
              0xc8000, 0x2000, 0x1fff, 0, MEM_MAPPING_EXTERNAL);
 
-    device_add(&ide_isa_2ch_device);
+    if (info->local == 1)
+        device_add(&ide_isa_2ch_device);
+    else
+        device_add(&ide_isa_device);
 
     return xtide;
 }
@@ -229,49 +250,173 @@ xtide_at_close(void *priv)
     free(xtide);
 }
 
+// clang-format off
 static const device_config_t xtide_config[] = {
-    // clang-format off
     {
-        .name = "bios",
-        .description = "BIOS",
-        .type = CONFIG_BIOS,
+        .name           = "bios",
+        .description    = "BIOS Revision",
+        .type           = CONFIG_BIOS,
         .default_string = "xt",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 }, /*W1*/
-        .bios = {
-            { .name = "Regular XT", .internal_name = "xt", .bios_type = BIOS_NORMAL,
-              .files_no = 1, .local = 0, .size = 8192, .files = { ROM_PATH_XT, "" } },
-            { .name = "XT+ (V20/V30/8018x)", .internal_name = "xt_plus", .bios_type = BIOS_NORMAL,
-              .files_no = 1, .local = 0, .size = 8192, .files = { ROM_PATH_XTP, "" } },
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = {
+            {
+                .name          = "Regular XT",
+                .internal_name = "xt",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 8192,
+                .files         = { ROM_PATH_XT, "" }
+            },
+            {
+                .name          = "XT+ (V20/V30/8018x)",
+                .internal_name = "xt_plus",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 8192,
+                .files         = { ROM_PATH_XTP, "" }
+            },
             { .files_no = 0 }
         },
     },
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x300,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "200H", .value = 0x200 },
+            { .description = "210H", .value = 0x210 },
+            { .description = "220H", .value = 0x220 },
+            { .description = "230H", .value = 0x230 },
+            { .description = "240H", .value = 0x240 },
+            { .description = "250H", .value = 0x250 },
+            { .description = "260H", .value = 0x260 },
+            { .description = "270H", .value = 0x270 },
+            { .description = "280H", .value = 0x280 },
+            { .description = "290H", .value = 0x290 },
+            { .description = "2A0H", .value = 0x2a0 },
+            { .description = "2B0H", .value = 0x2b0 },
+            { .description = "2C0H", .value = 0x2c0 },
+            { .description = "2D0H", .value = 0x2d0 },
+            { .description = "2E0H", .value = 0x2e0 },
+            { .description = "2F0H", .value = 0x2f0 },
+            { .description = "300H", .value = 0x300 },
+            { .description = "310H", .value = 0x310 },
+            { .description = "320H", .value = 0x320 },
+            { .description = "330H", .value = 0x330 },
+            { .description = "340H", .value = 0x340 },
+            { .description = "350H", .value = 0x350 },
+            { .description = "360H", .value = 0x360 },
+            { .description = "370H", .value = 0x370 },
+            { .description = "380H", .value = 0x380 },
+            { .description = "390H", .value = 0x390 },
+            { .description = "3A0H", .value = 0x3a0 },
+            { .description = "3B0H", .value = 0x3b0 },
+            { .description = "3C0H", .value = 0x3c0 },
+            { .description = "3D0H", .value = 0x3d0 },
+            { .description = "3E0H", .value = 0x3e0 },
+            { .description = "3F0H", .value = 0x3f0 },
+            { NULL                                  }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "rom_writes_enabled",
+        .description    = "Enable BIOS extension ROM Writes",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xd0000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled", .value = 0x00000 },
+#if 0
+            // Supported on XT IDE Deluxe By Monotech
+            { .description = "C000H",    .value = 0xc0000 },
+            { .description = "C200H",    .value = 0xc2000 },
+            { .description = "C400H",    .value = 0xc4000 },
+            { .description = "C600H",    .value = 0xc6000 },
+#endif
+            { .description = "C800H",    .value = 0xc8000 },
+            { .description = "CA00H",    .value = 0xca000 },
+            { .description = "CC00H",    .value = 0xcc000 },
+            { .description = "CE00H",    .value = 0xce000 },
+            { .description = "D000H",    .value = 0xd0000 },
+            { .description = "D200H",    .value = 0xd2000 },
+            { .description = "D400H",    .value = 0xd4000 },
+            { .description = "D600H",    .value = 0xd6000 },
+            { .description = "D800H",    .value = 0xd8000 },
+            { .description = "DA00H",    .value = 0xda000 },
+            { .description = "DC00H",    .value = 0xdc000 },
+            { .description = "DE00H",    .value = 0xde000 },
+#if 0
+            // Supported on VCFed rev 2
+            { .description = "E000H",    .value = 0xe0000 },
+            { .description = "E400H",    .value = 0xe4000 },
+            { .description = "E800H",    .value = 0xe8000 },
+            { .description = "EC00H",    .value = 0xec000 },
+#endif
+            { .description = ""                           }
+        },
+        .bios           = { { 0 } }
+    },
     { .name = "", .description = "", .type = CONFIG_END }
-    // clang-format on
 };
 
 static const device_config_t xtide_at_config[] = {
-    // clang-format off
     {
-        .name = "bios",
-        .description = "BIOS",
-        .type = CONFIG_BIOS,
+        .name           = "bios",
+        .description    = "BIOS Revision",
+        .type           = CONFIG_BIOS,
         .default_string = "at",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 }, /*W1*/
-        .bios = {
-            { .name = "Regular AT", .internal_name = "at", .bios_type = BIOS_NORMAL,
-              .files_no = 1, .local = 0, .size = 8192, .files = { ROM_PATH_AT, "" } },
-            { .name = "386", .internal_name = "at_386", .bios_type = BIOS_NORMAL,
-              .files_no = 1, .local = 0, .size = 8192, .files = { ROM_PATH_AT_386, "" } },
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = {
+            {
+                .name          = "Regular AT",
+                .internal_name = "at",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 8192,
+                .files         = { ROM_PATH_AT, "" }
+            },
+            {
+                .name          = "386",
+                .internal_name = "at_386",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 8192,
+                .files         = { ROM_PATH_AT_386, "" }
+            },
             { .files_no = 0 }
         },
     },
     { .name = "", .description = "", .type = CONFIG_END }
-    // clang-format on
 };
+// clang-format on
 
 const device_t xtide_device = {
     .name          = "PC/XT XTIDE",
@@ -281,21 +426,35 @@ const device_t xtide_device = {
     .init          = xtide_init,
     .close         = xtide_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = xtide_config
 };
 
 const device_t xtide_at_device = {
-    .name          = "PC/AT XTIDE",
-    .internal_name = "xtide_at",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .name          = "PC/AT XTIDE (Primary Only)",
+    .internal_name = "xtide_at_1ch",
+    .flags         = DEVICE_ISA16,
     .local         = 0,
     .init          = xtide_at_init,
     .close         = xtide_at_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = xtide_at_config
+};
+
+const device_t xtide_at_2ch_device = {
+    .name          = "PC/AT XTIDE",
+    .internal_name = "xtide_at",
+    .flags         = DEVICE_ISA16,
+    .local         = 1,
+    .init          = xtide_at_init,
+    .close         = xtide_at_close,
+    .reset         = NULL,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = xtide_at_config
@@ -309,21 +468,35 @@ const device_t xtide_acculogic_device = {
     .init          = xtide_acculogic_init,
     .close         = xtide_close,
     .reset         = NULL,
-    { .available = xtide_acculogic_available },
+    .available     = xtide_acculogic_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
 };
 
 const device_t xtide_at_ps2_device = {
-    .name          = "PS/2 AT XTIDE (1.1.5)",
-    .internal_name = "xtide_at_ps2",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .name          = "PS/2 AT XTIDE (1.1.5) (Primary Only)",
+    .internal_name = "xtide_at_ps2_1ch",
+    .flags         = DEVICE_ISA16,
     .local         = 0,
     .init          = xtide_at_ps2_init,
     .close         = xtide_at_close,
     .reset         = NULL,
-    { .available = xtide_at_ps2_available },
+    .available     = xtide_at_ps2_available,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t xtide_at_ps2_2ch_device = {
+    .name          = "PS/2 AT XTIDE (1.1.5)",
+    .internal_name = "xtide_at_ps2",
+    .flags         = DEVICE_ISA16,
+    .local         = 1,
+    .init          = xtide_at_ps2_init,
+    .close         = xtide_at_close,
+    .reset         = NULL,
+    .available     = xtide_at_ps2_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/disk/hdd.c b/src/disk/hdd.c
index 3bb15c241..e48af6b20 100644
--- a/src/disk/hdd.c
+++ b/src/disk/hdd.c
@@ -50,53 +50,40 @@ hdd_string_to_bus(char *str, int cdrom)
     if (!strcmp(str, "none"))
         return HDD_BUS_DISABLED;
 
-    if (!strcmp(str, "mfm") || !strcmp(str, "rll")) {
+    if (!strcmp(str, "mfm")) {
         if (cdrom) {
 no_cdrom:
-            ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2131, (wchar_t *) IDS_4099);
+            ui_msgbox_header(MBX_ERROR, plat_get_string(STRING_INVALID_CONFIG), plat_get_string(STRING_NO_ST506_ESDI_CDROM));
             return 0;
         }
 
         return HDD_BUS_MFM;
     }
 
-    /* FIXME: delete 'rll' in a year or so.. --FvK */
-    if (!strcmp(str, "esdi") || !strcmp(str, "rll")) {
+    if (!strcmp(str, "esdi")) {
         if (cdrom)
             goto no_cdrom;
 
         return HDD_BUS_ESDI;
     }
 
-    if (!strcmp(str, "ide_pio_only"))
-        return HDD_BUS_IDE;
-
     if (!strcmp(str, "ide"))
         return HDD_BUS_IDE;
 
-    if (!strcmp(str, "atapi_pio_only"))
-        return HDD_BUS_ATAPI;
-
     if (!strcmp(str, "atapi"))
         return HDD_BUS_ATAPI;
 
-    if (!strcmp(str, "eide"))
-        return HDD_BUS_IDE;
-
     if (!strcmp(str, "xta"))
         return HDD_BUS_XTA;
 
-    if (!strcmp(str, "atide"))
-        return HDD_BUS_IDE;
-
-    if (!strcmp(str, "ide_pio_and_dma"))
-        return HDD_BUS_IDE;
-
-    if (!strcmp(str, "atapi_pio_and_dma"))
-        return HDD_BUS_ATAPI;
-
     if (!strcmp(str, "scsi"))
         return HDD_BUS_SCSI;
+    
+    if (!strcmp(str, "mitsumi"))
+        return CDROM_BUS_MITSUMI;
+
+    if (!strcmp(str, "mke"))
+        return CDROM_BUS_MKE;
 
     return 0;
 }
@@ -108,6 +95,17 @@ hdd_bus_to_string(int bus, UNUSED(int cdrom))
 
     switch (bus) {
         default:
+        if (cdrom) {
+            switch (bus) {
+                case CDROM_BUS_MITSUMI:
+                    s = "mitsumi";
+                    break;
+                case CDROM_BUS_MKE:
+                    s = "mke";
+                    break;
+            }
+            break;
+        }
         case HDD_BUS_DISABLED:
             break;
 
@@ -142,7 +140,7 @@ hdd_bus_to_string(int bus, UNUSED(int cdrom))
 int
 hdd_is_valid(int c)
 {
-    if (hdd[c].bus == HDD_BUS_DISABLED)
+    if (hdd[c].bus_type == HDD_BUS_DISABLED)
         return 0;
 
     if (strlen(hdd[c].fn) == 0)
@@ -162,8 +160,12 @@ hdd_seek_get_time(hard_disk_t *hdd, uint32_t dst_addr, uint8_t operation, uint8_
 
     const hdd_zone_t *zone = NULL;
     if (hdd->num_zones <= 0) {
+#ifdef DO_FATAL
         fatal("hdd_seek_get_time(): hdd->num_zones < 0)\n");
         return 0.0;
+#else
+        return 1000.0;
+#endif
     }
     for (uint32_t i = 0; i < hdd->num_zones; i++) {
         zone = &hdd->zones[i];
@@ -426,15 +428,142 @@ hdd_zones_init(hard_disk_t *hdd)
 
 static hdd_preset_t hdd_speed_presets[] = {
   // clang-format off
-    { .name = "RAM Disk (max. speed)", .internal_name = "ramdisk",                                                                                                        .rcache_num_seg = 16, .rcache_seg_size = 128, .max_multiple = 32 },
-    { .name = "[1989] 3500 RPM",       .internal_name = "1989_3500rpm", .zones =  1,  .avg_spt = 35, .heads = 2, .rpm = 3500, .full_stroke_ms = 40, .track_seek_ms = 8,   .rcache_num_seg =  1, .rcache_seg_size =  16, .max_multiple =  8 },
-    { .name = "[1992] 3600 RPM",       .internal_name = "1992_3600rpm", .zones =  1,  .avg_spt = 45, .heads = 2, .rpm = 3600, .full_stroke_ms = 30, .track_seek_ms = 6,   .rcache_num_seg =  4, .rcache_seg_size =  16, .max_multiple =  8 },
-    { .name = "[1994] 4500 RPM",       .internal_name = "1994_4500rpm", .zones =  8,  .avg_spt = 80, .heads = 4, .rpm = 4500, .full_stroke_ms = 26, .track_seek_ms = 5,   .rcache_num_seg =  4, .rcache_seg_size =  32, .max_multiple = 16 },
-    { .name = "[1996] 5400 RPM",       .internal_name = "1996_5400rpm", .zones = 16, .avg_spt = 135, .heads = 4, .rpm = 5400, .full_stroke_ms = 24, .track_seek_ms = 3,   .rcache_num_seg =  4, .rcache_seg_size =  64, .max_multiple = 16 },
-    { .name = "[1997] 5400 RPM",       .internal_name = "1997_5400rpm", .zones = 16, .avg_spt = 185, .heads = 6, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 2.5, .rcache_num_seg =  8, .rcache_seg_size =  64, .max_multiple = 32 },
-    { .name = "[1998] 5400 RPM",       .internal_name = "1998_5400rpm", .zones = 16, .avg_spt = 300, .heads = 8, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 2,   .rcache_num_seg =  8, .rcache_seg_size = 128, .max_multiple = 32 },
-    { .name = "[2000] 7200 RPM",       .internal_name = "2000_7200rpm", .zones = 16, .avg_spt = 350, .heads = 6, .rpm = 7200, .full_stroke_ms = 15, .track_seek_ms = 2,   .rcache_num_seg = 16, .rcache_seg_size = 128, .max_multiple = 32 },
-  // clang-format on
+    { .name = "[Generic] RAM Disk (max. speed)",                  .internal_name = "ramdisk",                                                                                                        .rcache_num_seg = 16, .rcache_seg_size = 128, .max_multiple = 32 },
+    { .name = "[Generic] 1989 (3500 RPM)",                        .internal_name = "1989_3500rpm", .zones =  1,  .avg_spt = 35, .heads = 2, .rpm = 3500, .full_stroke_ms = 40, .track_seek_ms = 8,   .rcache_num_seg =  1, .rcache_seg_size =  16, .max_multiple =  8 },
+    { .name = "[Generic] 1992 (3600 RPM)",                        .internal_name = "1992_3600rpm", .zones =  1,  .avg_spt = 45, .heads = 2, .rpm = 3600, .full_stroke_ms = 30, .track_seek_ms = 6,   .rcache_num_seg =  4, .rcache_seg_size =  16, .max_multiple =  8 },
+    { .name = "[Generic] 1994 (4500 RPM)",                        .internal_name = "1994_4500rpm", .zones =  8,  .avg_spt = 80, .heads = 4, .rpm = 4500, .full_stroke_ms = 26, .track_seek_ms = 5,   .rcache_num_seg =  4, .rcache_seg_size =  32, .max_multiple = 16 },
+    { .name = "[Generic] 1996 (5400 RPM)",                        .internal_name = "1996_5400rpm", .zones = 16, .avg_spt = 135, .heads = 4, .rpm = 5400, .full_stroke_ms = 24, .track_seek_ms = 3,   .rcache_num_seg =  4, .rcache_seg_size =  64, .max_multiple = 16 },
+    { .name = "[Generic] 1997 (5400 RPM)",                        .internal_name = "1997_5400rpm", .zones = 16, .avg_spt = 185, .heads = 6, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 2.5, .rcache_num_seg =  8, .rcache_seg_size =  64, .max_multiple = 32 },
+    { .name = "[Generic] 1998 (5400 RPM)",                        .internal_name = "1998_5400rpm", .zones = 16, .avg_spt = 300, .heads = 8, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 2,   .rcache_num_seg =  8, .rcache_seg_size = 128, .max_multiple = 32 },
+    { .name = "[Generic] 2000 (7200 RPM)",                        .internal_name = "2000_7200rpm", .zones = 16, .avg_spt = 350, .heads = 6, .rpm = 7200, .full_stroke_ms = 15, .track_seek_ms = 2,   .rcache_num_seg = 16, .rcache_seg_size = 128, .max_multiple = 32 },
+    { .name = "[PIO IDE] IBM WDA-L42",                            .internal_name = "WDAL42", .model = "WDA-L42", .zones =  1,  .avg_spt = 85, .heads = 2, .rpm = 3600, .full_stroke_ms = 33, .track_seek_ms = 2.5,   .rcache_num_seg =  1, .rcache_seg_size =  32, .max_multiple =  1 },
+    { .name = "[ATA-1] Conner CP3024",                            .internal_name = "CP3024", .model = "Conner Peripherals 20MB - CP3024", .zones =  1,  .avg_spt = 33, .heads = 2, .rpm = 3500, .full_stroke_ms = 50, .track_seek_ms = 8,   .rcache_num_seg =  1, .rcache_seg_size =  8, .max_multiple =  8 }, // Needed for GRiDcase 1520 to work
+    { .name = "[ATA-1] Conner CP3044",                            .internal_name = "CP3044", .model = "Conner Peripherals 40MB - CP3044", .zones =  1,  .avg_spt = 40, .heads = 2, .rpm = 3500, .full_stroke_ms = 50, .track_seek_ms = 8,   .rcache_num_seg =  1, .rcache_seg_size =  8, .max_multiple =  8 }, // Needed for GRiDcase 1520 to work
+    { .name = "[ATA-1] Conner CP3104",                            .internal_name = "CP3104", .model = "Conner Peripherals 104MB - CP3104", .zones =  1,  .avg_spt = 33, .heads = 8, .rpm = 3500, .full_stroke_ms = 45, .track_seek_ms = 8,   .rcache_num_seg =  4, .rcache_seg_size =  8, .max_multiple =  8 }, // Needed for GRiDcase 1520 to work
+    { .name = "[ATA-1] Conner CFS420A",                           .internal_name = "CFS420A", .model = "Conner Peripherals 420MB - CFS420A", .zones =  1,  .avg_spt = 40, .heads = 2, .rpm = 3600, .full_stroke_ms = 33, .track_seek_ms = 3,   .rcache_num_seg =  4, .rcache_seg_size =  32, .max_multiple =  8 },
+    { .name = "[ATA-1] HP Kittyhawk",                             .internal_name = "C3014A", .model = "HP C3014A", .zones =  6,  .avg_spt = 80, .heads = 3, .rpm = 5400, .full_stroke_ms = 18, .track_seek_ms = 3,   .rcache_num_seg =  4, .rcache_seg_size =  16, .max_multiple =  8 },
+    { .name = "[ATA-1] IBM H3256-A3",                             .internal_name = "H3256A3", .model = "H3256-A3", .zones =  1,  .avg_spt = 40, .heads = 2, .rpm = 3600, .full_stroke_ms = 32, .track_seek_ms = 4,   .rcache_num_seg =  4, .rcache_seg_size =  96, .max_multiple =  8 },
+    { .name = "[ATA-1] IBM H3342-A4",                             .internal_name = "H3342A4", .model = "H3342-A4", .zones =  1,  .avg_spt = 40, .heads = 2, .rpm = 3600, .full_stroke_ms = 30, .track_seek_ms = 4,   .rcache_num_seg =  4, .rcache_seg_size =  96, .max_multiple =  8 },
+    { .name = "[ATA-1] Kalok KL343",                              .internal_name = "KL343", .model = "KALOK KL-343", .zones =  1,  .avg_spt = 80, .heads = 6, .rpm = 3600, .full_stroke_ms = 50, .track_seek_ms = 2,   .rcache_num_seg =  1, .rcache_seg_size =  8, .max_multiple =  8 },
+    { .name = "[ATA-1] Kalok KL3100",                             .internal_name = "KL3100", .model = "KALOK KL-3100", .zones =  1,  .avg_spt = 100, .heads = 6, .rpm = 3662, .full_stroke_ms = 50, .track_seek_ms = 2,   .rcache_num_seg =  1, .rcache_seg_size =  32, .max_multiple =  8 },
+    { .name = "[ATA-1] Maxtor 7060AT",                            .internal_name = "7060AT", .model = "Maxtor 7060 AT", .zones =  1,  .avg_spt = 62, .heads = 2, .rpm = 3524, .full_stroke_ms = 30, .track_seek_ms = 3.6,   .rcache_num_seg =  1, .rcache_seg_size =  64, .max_multiple =  8 },
+    { .name = "[ATA-1] Maxtor 7131AT",                            .internal_name = "7131AT", .model = "Maxtor 7131 AT", .zones =  2,  .avg_spt = 54, .heads = 2, .rpm = 3551, .full_stroke_ms = 27, .track_seek_ms = 4.5,   .rcache_num_seg =  1, .rcache_seg_size =  64, .max_multiple =  8 },
+    { .name = "[ATA-1] Maxtor 7213AT",                            .internal_name = "7213AT", .model = "Maxtor 7213 AT", .zones =  4,  .avg_spt = 55, .heads = 4, .rpm = 3551, .full_stroke_ms = 28, .track_seek_ms = 6.5,   .rcache_num_seg =  1, .rcache_seg_size =  64, .max_multiple =  8 },
+    { .name = "[ATA-1] Maxtor 7245AT",                            .internal_name = "7245AT", .model = "Maxtor 7245 AT", .zones =  4,  .avg_spt = 49, .heads = 4, .rpm = 3551, .full_stroke_ms = 27, .track_seek_ms = 4.4,   .rcache_num_seg =  8, .rcache_seg_size =  64, .max_multiple =  8 },
+    { .name = "[ATA-1] Quantum ProDrive LPS 105",                 .internal_name = "LPS105AT", .model = "QUANTUM PRODRIVE 105", .zones =  1,  .avg_spt = 70, .heads = 2, .rpm = 3662, .full_stroke_ms = 45, .track_seek_ms = 5,   .rcache_num_seg =  1, .rcache_seg_size =  64, .max_multiple =  8 },
+    { .name = "[ATA-1] Quantum ProDrive LPS 120AT",               .internal_name = "GM12A012", .model = "QUANTUM PRODRIVE 120AT", .zones =  1,  .avg_spt = 50, .heads = 2, .rpm = 3605, .full_stroke_ms = 45, .track_seek_ms = 4,   .rcache_num_seg =  1, .rcache_seg_size =  64, .max_multiple =  8 },
+    { .name = "[ATA-1] Seagate ST3243A",                          .internal_name = "ST3243A", .model = "ST3243A", .zones =  1,  .avg_spt = 40, .heads = 4, .rpm = 3811, .full_stroke_ms = 32, .track_seek_ms = 4,   .rcache_num_seg =  4, .rcache_seg_size =  32, .max_multiple =  8 },
+    { .name = "[ATA-1] Western Digital Caviar 140",               .internal_name = "AC140", .model = "WDC AC140", .zones =  4,  .avg_spt = 70, .heads = 2, .rpm = 3551, .full_stroke_ms = 28, .track_seek_ms = 6,   .rcache_num_seg =  8, .rcache_seg_size =  8, .max_multiple =  8 },
+    { .name = "[ATA-1] Western Digital Caviar 280",               .internal_name = "AC280", .model = "WDC AC280", .zones =  4,  .avg_spt = 70, .heads = 4, .rpm = 3595, .full_stroke_ms = 28, .track_seek_ms = 6,   .rcache_num_seg =  8, .rcache_seg_size =  32, .max_multiple =  8 },
+    { .name = "[ATA-1] Western Digital Caviar 1210",              .internal_name = "AC1210", .model = "WDC AC1210F", .zones =  4,  .avg_spt = 30, .heads = 2, .rpm = 3314, .full_stroke_ms = 33, .track_seek_ms = 4,   .rcache_num_seg =  4, .rcache_seg_size =  128, .max_multiple =  8 },
+    { .name = "[ATA-1] Western Digital Caviar 2120",              .internal_name = "AC2120", .model = "WDC AC2120M", .zones =  4,  .avg_spt = 40, .heads = 2, .rpm = 3605, .full_stroke_ms = 28, .track_seek_ms = 2.8,   .rcache_num_seg =  8, .rcache_seg_size =  32, .max_multiple =  8 },
+    { .name = "[ATA-2] IBM DBOA-2720",                            .internal_name = "DBOA2720", .model = "DBOA-2720", .zones =  2,  .avg_spt = 135, .heads = 2, .rpm = 4000, .full_stroke_ms = 30, .track_seek_ms = 5,   .rcache_num_seg =  4, .rcache_seg_size =  64, .max_multiple =  8 },
+    { .name = "[ATA-2] IBM DeskStar 4 (DCAA-32880)",              .internal_name = "DCAA32880", .model = "IBM-DCAA-32880", .zones =  8,  .avg_spt = 185, .heads = 2, .rpm = 5400, .full_stroke_ms = 19, .track_seek_ms = 1.7,   .rcache_num_seg =  4, .rcache_seg_size =  96, .max_multiple =  16 },
+    { .name = "[ATA-2] IBM DeskStar 4 (DCAA-33610)",              .internal_name = "DCAA33610", .model = "IBM-DCAA-33610", .zones =  8,  .avg_spt = 185, .heads = 3, .rpm = 5400, .full_stroke_ms = 19, .track_seek_ms = 1.7,   .rcache_num_seg =  4, .rcache_seg_size =  96, .max_multiple =  16 },
+    { .name = "[ATA-2] IBM DeskStar 4 (DCAA-34330)",              .internal_name = "DCAA34330", .model = "IBM-DCAA-34330", .zones =  8,  .avg_spt = 185, .heads = 3, .rpm = 5400, .full_stroke_ms = 19, .track_seek_ms = 1.7,   .rcache_num_seg =  4, .rcache_seg_size =  96, .max_multiple =  16 },
+    { .name = "[ATA-2] Maxtor 7540AV",                            .internal_name = "7540AV", .model = "Maxtor 7540 AV", .zones =  2,  .avg_spt = 120, .heads = 4, .rpm = 3551, .full_stroke_ms = 31, .track_seek_ms = 4.3,   .rcache_num_seg =  4, .rcache_seg_size =  32, .max_multiple =  8 },
+    { .name = "[ATA-2] Maxtor 7546AT",                            .internal_name = "7546AT", .model = "Maxtor 7546 AT", .zones =  2,  .avg_spt = 100, .heads = 4, .rpm = 4500, .full_stroke_ms = 28, .track_seek_ms = 2.3,   .rcache_num_seg =  4, .rcache_seg_size =  256, .max_multiple =  8 },
+    { .name = "[ATA-2] Maxtor 7850AV",                            .internal_name = "7850AV", .model = "Maxtor 7850 AV", .zones =  4,  .avg_spt = 120, .heads = 4, .rpm = 3551, .full_stroke_ms = 31, .track_seek_ms = 3.7,   .rcache_num_seg =  4, .rcache_seg_size =  64, .max_multiple =  8 },
+    { .name = "[ATA-2] Maxtor 71336AP",                           .internal_name = "71336AP", .model = "Maxtor 71336 AP", .zones =  4,  .avg_spt = 105, .heads = 4, .rpm = 4480, .full_stroke_ms = 12, .track_seek_ms = 3.4,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-2] Quantum Bigfoot 1.2AT",                    .internal_name = "BF12A011", .model = "QUANTUM BIGFOOT BF1.2A", .zones =  2,  .avg_spt = 155, .heads = 2, .rpm = 3600, .full_stroke_ms = 30, .track_seek_ms = 3.5,   .rcache_num_seg =  4, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-2] Quantum Bigfoot (CY4320A)",                .internal_name = "CY4320A", .model = "QUANTUM BIGFOOT_CY4320A", .zones =  2,  .avg_spt = 130, .heads = 2, .rpm = 4000, .full_stroke_ms = 29, .track_seek_ms = 2,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  16 }, // from Hardcore Windows NT Final Segment by Kugee
+    { .name = "[ATA-2] Quantum Fireball 640AT",                   .internal_name = "FB64A341", .model = "QUANTUM FIREBALL 640AT", .zones =  2,  .avg_spt = 120, .heads = 2, .rpm = 5400, .full_stroke_ms = 24, .track_seek_ms = 3.1,   .rcache_num_seg =  4, .rcache_seg_size =  128, .max_multiple =  8 },
+    { .name = "[ATA-2] Quantum Fireball TM1080AT",                .internal_name = "TM10A462", .model = "QUANTUM FIREBALL TM1.0A", .zones =  2,  .avg_spt = 120, .heads = 2, .rpm = 4500, .full_stroke_ms = 21, .track_seek_ms = 3,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  8 },
+    { .name = "[ATA-2] Quantum Fireball TM1.2AT",                 .internal_name = "TM12A012", .model = "QUANTUM FIREBALL TM1.2A", .zones =  4,  .avg_spt = 120, .heads = 2, .rpm = 4500, .full_stroke_ms = 21, .track_seek_ms = 3,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  8 },
+    { .name = "[ATA-2] Samsung PLS-31274A",                       .internal_name = "PLS31274A", .model = "SAMSUNG PLS-31274A", .zones =  4,  .avg_spt = 110, .heads = 4, .rpm = 4500, .full_stroke_ms = 45, .track_seek_ms = 4.5,   .rcache_num_seg =  4, .rcache_seg_size =  256, .max_multiple =  8 },
+    { .name = "[ATA-2] Samsung Winner-1",                         .internal_name = "WNR31601A", .model = "SAMSUNG WNR-31601A", .zones =  8,  .avg_spt = 110, .heads = 4, .rpm = 5400, .full_stroke_ms = 22, .track_seek_ms = 3,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-2] Seagate Medalist (ST3780A)",               .internal_name = "ST3780A", .model = "ST3780A", .zones =  8,  .avg_spt = 120, .heads = 4, .rpm = 4500, .full_stroke_ms = 25, .track_seek_ms = 3.5,   .rcache_num_seg =  4, .rcache_seg_size =  256, .max_multiple =  16 },
+    { .name = "[ATA-2] Seagate Medalist (ST31220A)",              .internal_name = "ST31220A", .model = "ST31220A", .zones =  8,  .avg_spt = 140, .heads = 6, .rpm = 4500, .full_stroke_ms = 27, .track_seek_ms = 3.5,   .rcache_num_seg =  4, .rcache_seg_size =  256, .max_multiple =  16 },
+    { .name = "[ATA-2] Seagate Medalist 210xe",                   .internal_name = "ST3250A", .model = "ST3250A", .zones =  4,  .avg_spt = 148, .heads = 2, .rpm = 3811, .full_stroke_ms = 30, .track_seek_ms = 4.1,   .rcache_num_seg =  8, .rcache_seg_size =  120, .max_multiple =  8 },
+    { .name = "[ATA-2] Seagate Medalist 275xe",                   .internal_name = "ST3295A", .model = "ST3295A", .zones =  4,  .avg_spt = 130, .heads = 2, .rpm = 3811, .full_stroke_ms = 30, .track_seek_ms = 3.4,   .rcache_num_seg =  3, .rcache_seg_size =  120, .max_multiple =  8 },
+    { .name = "[ATA-2] Seagate Medalist 545xe",                   .internal_name = "ST3660A", .model = "ST3660A", .zones =  4,  .avg_spt = 130, .heads = 4, .rpm = 3811, .full_stroke_ms = 34, .track_seek_ms = 3.4,   .rcache_num_seg =  8, .rcache_seg_size =  120, .max_multiple =  8 },
+    { .name = "[ATA-2] Seagate Medalist 640xe",                   .internal_name = "ST3630A", .model = "ST3630A", .zones =  4,  .avg_spt = 130, .heads = 4, .rpm = 3811, .full_stroke_ms = 34, .track_seek_ms = 3.5,   .rcache_num_seg =  8, .rcache_seg_size =  120, .max_multiple =  8 },
+    { .name = "[ATA-2] Seagate Medalist 850xe",                   .internal_name = "ST3850A", .model = "ST3850A", .zones =  8,  .avg_spt = 150, .heads = 4, .rpm = 3811, .full_stroke_ms = 34, .track_seek_ms = 3.8,   .rcache_num_seg =  8, .rcache_seg_size =  120, .max_multiple =  8 },
+    { .name = "[ATA-2] Seagate Medalist 1270SL",                  .internal_name = "ST51270A", .model = "ST51270A", .zones =  8,  .avg_spt = 205, .heads = 3, .rpm = 5736, .full_stroke_ms = 25, .track_seek_ms = 2,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-2] Seagate Medalist 3240",                    .internal_name = "ST33240A", .model = "ST33240A", .zones =  16,  .avg_spt = 225, .heads = 8, .rpm = 4500, .full_stroke_ms = 25, .track_seek_ms = 2.5,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-2] Toshiba MK2101MAN (HDD2616)",              .internal_name = "HDD2616", .model = "TOSHIBA MK2101MAN", .zones =  8,  .avg_spt = 130, .heads = 10, .rpm = 4200, .full_stroke_ms = 36, .track_seek_ms = 3,   .rcache_num_seg =  4, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-2] Western Digital Caviar 2540",              .internal_name = "AC2540", .model = "WDC AC2540H", .zones =  4,  .avg_spt = 150, .heads = 2, .rpm = 4500, .full_stroke_ms = 12, .track_seek_ms = 4,   .rcache_num_seg =  4, .rcache_seg_size =  128, .max_multiple =  8 },
+    { .name = "[ATA-2] Western Digital Caviar 2850",              .internal_name = "AC2850", .model = "WDC AC2850F", .zones =  4,  .avg_spt = 130, .heads = 2, .rpm = 5200, .full_stroke_ms = 12, .track_seek_ms = 4,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  8 },
+    { .name = "[ATA-2] Western Digital Caviar 11000",             .internal_name = "AC11000", .model = "WDC AC11000H", .zones =  4,  .avg_spt = 120, .heads = 2, .rpm = 5200, .full_stroke_ms = 12, .track_seek_ms = 3,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  8 },
+    { .name = "[ATA-2] Western Digital Caviar 21200",             .internal_name = "AC21200", .model = "WDC AC21200H", .zones =  4,  .avg_spt = 110, .heads = 4, .rpm = 5200, .full_stroke_ms = 39, .track_seek_ms = 3,   .rcache_num_seg =  4, .rcache_seg_size =  128, .max_multiple =  8 },
+    { .name = "[ATA-2] Western Digital Caviar 21600",             .internal_name = "AC21600", .model = "WDC AC21600H", .zones =  8,  .avg_spt = 140, .heads = 4, .rpm = 5200, .full_stroke_ms = 30, .track_seek_ms = 3,   .rcache_num_seg =  4, .rcache_seg_size =  128, .max_multiple =  8 },
+    { .name = "[ATA-2] Western Digital Caviar 22000",             .internal_name = "AC22000", .model = "WDC AC22000LA", .zones =  8,  .avg_spt = 130, .heads = 3, .rpm = 5200, .full_stroke_ms = 33, .track_seek_ms = 3.5,   .rcache_num_seg =  4, .rcache_seg_size =  128, .max_multiple =  8 },
+    { .name = "[ATA-2] Western Digital Caviar 22100",             .internal_name = "AC22100", .model = "WDC AC22100H", .zones =  8,  .avg_spt = 140, .heads = 4, .rpm = 5200, .full_stroke_ms = 30, .track_seek_ms = 3,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-2] Western Digital Caviar 31200",             .internal_name = "AC31200", .model = "WDC AC31200F", .zones =  8,  .avg_spt = 210, .heads = 4, .rpm = 4500, .full_stroke_ms = 12, .track_seek_ms = 4,   .rcache_num_seg =  8, .rcache_seg_size =  64, .max_multiple =  16 },
+    { .name = "[ATA-3] Conner CFS1275A",                          .internal_name = "CFS1275A", .model = "Conner Peripherals 1275MB - CFS1275A", .zones =  4,  .avg_spt = 130, .heads = 2, .rpm = 4500, .full_stroke_ms = 25, .track_seek_ms = 3.8,   .rcache_num_seg =  4, .rcache_seg_size =  64, .max_multiple =  16 }, // Either ATA-2 or ATA-3
+    { .name = "[ATA-3] Fujitsu MPA3017AT",                        .internal_name = "MPA3017AT", .model = "FUJITSU MPA3017AT", .zones =  5,  .avg_spt = 195, .heads = 2, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 3.2,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-3] Fujitsu MPA3026AT",                        .internal_name = "MPA3026AT", .model = "FUJITSU MPA3026AT", .zones =  8,  .avg_spt = 195, .heads = 3, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 3.2,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-3] Fujitsu MPA3035AT",                        .internal_name = "MPA3035AT", .model = "FUJITSU MPA3035AT", .zones =  11,  .avg_spt = 195, .heads = 4, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 3.2,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-3] Fujitsu MPA3043AT",                        .internal_name = "MPA3043AT", .model = "FUJITSU MPA3043AT", .zones =  15,  .avg_spt = 195, .heads = 5, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 3.2,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-3] Fujitsu MPA3052AT",                        .internal_name = "MPA3052AT", .model = "FUJITSU MPA3052AT", .zones =  16,  .avg_spt = 195, .heads = 6, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 3.2,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-3] Samsung Voyager 6",                        .internal_name = "SV0844A", .model = "SAMSUNG SV0844A", .zones =  8,  .avg_spt = 205, .heads = 4, .rpm = 5400, .full_stroke_ms = 22, .track_seek_ms = 2,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-3] Samsung Winner 5X",                        .internal_name = "WU33205A", .model = "SAMSUNG WU33205A", .zones =  16,  .avg_spt = 200, .heads = 4, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 3,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-3] Seagate Medalist 636",                     .internal_name = "ST3636A", .model = "Seagate Technology 636MB - ST3636A", .zones =  2,  .avg_spt = 130, .heads = 2, .rpm = 4500, .full_stroke_ms = 25, .track_seek_ms = 3.8,   .rcache_num_seg =  4, .rcache_seg_size =  64, .max_multiple =  8 },
+    { .name = "[ATA-3] Seagate Medalist 1082",                    .internal_name = "ST31082A", .model = "Seagate Technology 1082MB - ST31082A", .zones =  4,  .avg_spt = 130, .heads = 3, .rpm = 4500, .full_stroke_ms = 25, .track_seek_ms = 3.8,   .rcache_num_seg =  4, .rcache_seg_size =  64, .max_multiple =  8 },
+    { .name = "[ATA-3] Seagate Medalist 1276",                    .internal_name = "ST31276A", .model = "Seagate Technology 1275MB - ST31276A", .zones =  4,  .avg_spt = 130, .heads = 3, .rpm = 4500, .full_stroke_ms = 25, .track_seek_ms = 3.8,   .rcache_num_seg =  4, .rcache_seg_size =  64, .max_multiple =  16 },
+    { .name = "[ATA-3] Seagate Medalist 1720",                    .internal_name = "ST31720A", .model = "ST31720A", .zones =  4,  .avg_spt = 120, .heads = 4, .rpm = 4500, .full_stroke_ms = 25, .track_seek_ms = 2,   .rcache_num_seg =  4, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-3] Seagate Medalist 2132",                    .internal_name = "ST32132A", .model = "ST32132A", .zones =  8,  .avg_spt = 125, .heads = 6, .rpm = 4500, .full_stroke_ms = 30, .track_seek_ms = 2.3,   .rcache_num_seg =  8, .rcache_seg_size =  120, .max_multiple =  16 },
+    { .name = "[ATA-3] Western Digital Caviar 21700",             .internal_name = "AC21700", .model = "WDC AC21700H", .zones =  8,  .avg_spt = 185, .heads = 3, .rpm = 5200, .full_stroke_ms = 21, .track_seek_ms = 3,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  16 }, // Apple Computer OEM only, not retail version
+    { .name = "[ATA-4] Fujitsu MPB3021AT",                        .internal_name = "MPB3021AT", .model = "FUJITSU MPB3021AT", .zones =  7,  .avg_spt = 200, .heads = 3, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 2.5,   .rcache_num_seg =  8, .rcache_seg_size =  256, .max_multiple =  16 },
+    { .name = "[ATA-4] Fujitsu MPD3043AT",                        .internal_name = "MPD3043AT", .model = "FUJITSU MPD3043AT", .zones =  5,  .avg_spt = 195, .heads = 2, .rpm = 5400, .full_stroke_ms = 29, .track_seek_ms = 1.5,   .rcache_num_seg =  8, .rcache_seg_size =  512, .max_multiple =  16 },
+    { .name = "[ATA-4] Fujitsu MPD3064AT",                        .internal_name = "MPD3064AT", .model = "FUJITSU MPD3064AT", .zones =  7,  .avg_spt = 195, .heads = 3, .rpm = 5400, .full_stroke_ms = 30, .track_seek_ms = 1.5,   .rcache_num_seg =  8, .rcache_seg_size =  512, .max_multiple =  16 },
+    { .name = "[ATA-4] Fujitsu MPD3084AT",                        .internal_name = "MPD3084AT", .model = "FUJITSU MPD3084AT", .zones =  7,  .avg_spt = 195, .heads = 4, .rpm = 5400, .full_stroke_ms = 19, .track_seek_ms = 1.5,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  16 },
+    { .name = "[ATA-4] Fujitsu MPE3064AT",                        .internal_name = "MPE3064AT", .model = "FUJITSU MPE3064AT", .zones =  7,  .avg_spt = 295, .heads = 2, .rpm = 5400, .full_stroke_ms = 30, .track_seek_ms = 1.5,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-4] Maxtor DiamondMax 2160",                   .internal_name = "86480D6", .model = "Maxtor 86480D6", .zones =  8,  .avg_spt = 197, .heads = 4, .rpm = 5200, .full_stroke_ms = 18, .track_seek_ms = 1,   .rcache_num_seg =  8, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-4] Maxtor DiamondMax 2880",                   .internal_name = "90432D3", .model = "Maxtor 90432D3", .zones =  16,  .avg_spt = 190, .heads = 3, .rpm = 5400, .full_stroke_ms = 18, .track_seek_ms = 1,   .rcache_num_seg =  8, .rcache_seg_size =  256, .max_multiple =  32 },
+    { .name = "[ATA-4] Maxtor DiamondMax 3400",                   .internal_name = "90644D3", .model = "Maxtor 90644D3", .zones =  16,  .avg_spt = 290, .heads = 3, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 0.9,   .rcache_num_seg =  8, .rcache_seg_size =  256, .max_multiple =  32 },
+    { .name = "[ATA-4] Maxtor DiamondMax 4320 (90432D2)",         .internal_name = "90432D2", .model = "Maxtor 90432D2", .zones =  16,  .avg_spt = 290, .heads = 2, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 0.9,   .rcache_num_seg =  16, .rcache_seg_size =  256, .max_multiple =  32 },
+    { .name = "[ATA-4] Maxtor DiamondMax 4320 (90845D4)",         .internal_name = "90845D4", .model = "Maxtor 90845D4", .zones =  16,  .avg_spt = 290, .heads = 3, .rpm = 5400, .full_stroke_ms = 18, .track_seek_ms = 0.9,   .rcache_num_seg =  16, .rcache_seg_size =  256, .max_multiple =  32 },
+    { .name = "[ATA-4] Maxtor DiamondMax Plus 6800 (90683U2)",    .internal_name = "90683U2", .model = "Maxtor 90683U2", .zones =  16,  .avg_spt = 290, .heads = 2, .rpm = 7200, .full_stroke_ms = 20, .track_seek_ms = 1,   .rcache_num_seg =  16, .rcache_seg_size =  256, .max_multiple =  32 },
+    { .name = "[ATA-4] Maxtor DiamondMax Plus 6800 (91024U3)",    .internal_name = "91024U3", .model = "Maxtor 91024U3", .zones =  16,  .avg_spt = 290, .heads = 3, .rpm = 7200, .full_stroke_ms = 20, .track_seek_ms = 1,   .rcache_num_seg =  16, .rcache_seg_size =  256, .max_multiple =  32 },
+    { .name = "[ATA-4] Maxtor DiamondMax Plus 6800 (91366U4)",    .internal_name = "91366U4", .model = "Maxtor 91366U4", .zones =  16,  .avg_spt = 290, .heads = 4, .rpm = 7200, .full_stroke_ms = 20, .track_seek_ms = 1,   .rcache_num_seg =  16, .rcache_seg_size =  256, .max_multiple =  32 },
+    { .name = "[ATA-4] Maxtor DiamondMax Plus 6800 (92049U6)",    .internal_name = "92049U6", .model = "Maxtor 92049U6", .zones =  16,  .avg_spt = 290, .heads = 6, .rpm = 7200, .full_stroke_ms = 20, .track_seek_ms = 1,   .rcache_num_seg =  16, .rcache_seg_size =  256, .max_multiple =  32 },
+    { .name = "[ATA-4] Maxtor DiamondMax Plus 6800 (92732U8)",    .internal_name = "92732U8", .model = "Maxtor 92732U8", .zones =  16,  .avg_spt = 290, .heads = 8, .rpm = 7200, .full_stroke_ms = 20, .track_seek_ms = 1,   .rcache_num_seg =  16, .rcache_seg_size =  256, .max_multiple =  32 },
+    { .name = "[ATA-4] Quantum Bigfoot TX4.3AT",                  .internal_name = "TX043A011", .model = "QUANTUM BIGFOOT TX4.3A", .zones =  2,  .avg_spt = 220, .heads = 2, .rpm = 4000, .full_stroke_ms = 30, .track_seek_ms = 2.5,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  32 },
+    { .name = "[ATA-4] Quantum Fireball ST3.2AT",                 .internal_name = "ST32A461", .model = "QUANTUM FIREBALL ST3.2A", .zones =  4,  .avg_spt = 200, .heads = 4, .rpm = 5400, .full_stroke_ms = 21, .track_seek_ms = 2,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-4] Quantum Fireball SE4.3A",                  .internal_name = "SE43A011", .model = "QUANTUM FIREBALL SE4.3A", .zones =  2,  .avg_spt = 200, .heads = 4, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 2,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-4] Quantum Fireball SE6.4A",                  .internal_name = "SE64A011", .model = "QUANTUM FIREBALL SE6.4A", .zones =  3,  .avg_spt = 200, .heads = 6, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 2,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-4] Quantum Fireball SE8.4A",                  .internal_name = "SE84A011", .model = "QUANTUM FIREBALL SE8.4A", .zones =  4,  .avg_spt = 200, .heads = 8, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 2,   .rcache_num_seg =  8, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-4] Seagate Medalist 2122",                    .internal_name = "ST32122A", .model = "ST32122A", .zones =  16,  .avg_spt = 215, .heads = 2, .rpm = 4500, .full_stroke_ms = 23, .track_seek_ms = 3.8,   .rcache_num_seg =  16, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-4] Seagate Medalist 3321",                    .internal_name = "ST33221A", .model = "ST33221A", .zones =  16,  .avg_spt = 210, .heads = 4, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 1.7,   .rcache_num_seg =  16, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-4] Seagate Medalist 4321",                    .internal_name = "ST34321A", .model = "ST34321A", .zones =  16,  .avg_spt = 210, .heads = 4, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 2.2,   .rcache_num_seg =  16, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-4] Seagate Medalist 6531",                    .internal_name = "ST36531A", .model = "ST36531A", .zones =  16,  .avg_spt = 215, .heads = 6, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 1.7,   .rcache_num_seg =  16, .rcache_seg_size =  128, .max_multiple =  16 },
+    { .name = "[ATA-4] Seagate Medalist 8420",                    .internal_name = "ST38420A", .model = "ST38420A", .zones =  16,  .avg_spt = 290, .heads = 4, .rpm = 5400, .full_stroke_ms = 16, .track_seek_ms = 1.5,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-4] Seagate Medalist 13030",                   .internal_name = "ST313030A", .model = "ST313030A", .zones =  16,  .avg_spt = 290, .heads = 6, .rpm = 5400, .full_stroke_ms = 16, .track_seek_ms = 1.5,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-4] Seagate Medalist 17240",                   .internal_name = "ST317240A", .model = "ST317240A", .zones =  16,  .avg_spt = 290, .heads = 8, .rpm = 5400, .full_stroke_ms = 16, .track_seek_ms = 1.5,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-4] Toshiba MK4006MAV",                        .internal_name = "MK4006MAV", .model = "TOSHIBA MK4006MAV", .zones =  8,  .avg_spt = 230, .heads = 6, .rpm = 4200, .full_stroke_ms = 25, .track_seek_ms = 3,   .rcache_num_seg =  8, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-4] Western Digital Caviar 14300",             .internal_name = "AC14300", .model = "WDC AC14300RT", .zones =  16,  .avg_spt = 195, .heads = 2, .rpm = 5400, .full_stroke_ms = 21, .track_seek_ms = 5.5,   .rcache_num_seg =  8, .rcache_seg_size =  512, .max_multiple =  16 },
+    { .name = "[ATA-4] Western Digital Caviar 23200",             .internal_name = "AC23200", .model = "WDC AC23200LB", .zones =  16,  .avg_spt = 210, .heads = 4, .rpm = 5400, .full_stroke_ms = 21, .track_seek_ms = 3,   .rcache_num_seg =  8, .rcache_seg_size =  256, .max_multiple =  32 },
+    { .name = "[ATA-4] Western Digital Caviar 26400",             .internal_name = "AC26400", .model = "WDC AC26400RN", .zones =  16,  .avg_spt = 295, .heads = 5, .rpm = 5400, .full_stroke_ms = 21, .track_seek_ms = 3,   .rcache_num_seg =  8, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-4] Western Digital Caviar 33200",             .internal_name = "AC33200", .model = "WDC AC33200LA", .zones =  16,  .avg_spt = 310, .heads = 5, .rpm = 5200, .full_stroke_ms = 40, .track_seek_ms = 3,   .rcache_num_seg =  16, .rcache_seg_size =  256, .max_multiple =  32 },
+    { .name = "[ATA-5] IBM Travelstar 6GN",                       .internal_name = "DARA206000", .model = "IBM-DARA-206000", .zones =  12,  .avg_spt = 292, .heads = 2, .rpm = 4200, .full_stroke_ms = 31, .track_seek_ms = 4,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-5] IBM Travelstar 9GN",                       .internal_name = "DARA209000", .model = "IBM-DARA-209000", .zones =  12,  .avg_spt = 292, .heads = 3, .rpm = 4200, .full_stroke_ms = 31, .track_seek_ms = 4,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-5] IBM/Hitachi Travelstar 12GN",              .internal_name = "DARA212000", .model = "IBM-DARA-212000", .zones =  12,  .avg_spt = 292, .heads = 4, .rpm = 4200, .full_stroke_ms = 31, .track_seek_ms = 4,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 }, // Either Hitachi or IBM OEM
+    { .name = "[ATA-5] Maxtor DiamondMax VL 17",                  .internal_name = "90871U2", .model = "Maxtor 90871U2", .zones =  16,  .avg_spt = 290, .heads = 3, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 0.9,   .rcache_num_seg =  16, .rcache_seg_size =  256, .max_multiple =  32 },
+    { .name = "[ATA-5] Maxtor DiamondMax VL 20 (91021U2)",        .internal_name = "91021U2", .model = "Maxtor 91021U2", .zones =  16,  .avg_spt = 295, .heads = 2, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 1,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-5] Maxtor DiamondMax VL 20 (91531U3)",        .internal_name = "91531U3", .model = "Maxtor 91531U3", .zones =  16,  .avg_spt = 295, .heads = 3, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 1,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-5] Maxtor DiamondMax VL 20 (92041U4)",        .internal_name = "92041U4", .model = "Maxtor 92041U4", .zones =  16,  .avg_spt = 295, .heads = 4, .rpm = 5400, .full_stroke_ms = 20, .track_seek_ms = 1,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-5] Quantum Fireball EX3.2A",                  .internal_name = "EX32A012", .model = "QUANTUM FIREBALL EX3.2A", .zones =  1,  .avg_spt = 210, .heads = 2, .rpm = 5400, .full_stroke_ms = 18, .track_seek_ms = 2,   .rcache_num_seg =  8, .rcache_seg_size =  512, .max_multiple =  16 },
+    { .name = "[ATA-5] Quantum Fireball EX5.1A",                  .internal_name = "EX51A012", .model = "QUANTUM FIREBALL EX5.1A", .zones =  2,  .avg_spt = 210, .heads = 3, .rpm = 5400, .full_stroke_ms = 18, .track_seek_ms = 2,   .rcache_num_seg =  8, .rcache_seg_size =  512, .max_multiple =  16 },
+    { .name = "[ATA-5] Quantum Fireball EX6.4A",                  .internal_name = "EX64A012", .model = "QUANTUM FIREBALL EX6.4A", .zones =  2,  .avg_spt = 210, .heads = 4, .rpm = 5400, .full_stroke_ms = 18, .track_seek_ms = 2,   .rcache_num_seg =  8, .rcache_seg_size =  512, .max_multiple =  16 },
+    { .name = "[ATA-5] Quantum Fireball EX10.2A",                 .internal_name = "EX10A011", .model = "QUANTUM FIREBALL EX10.2A", .zones =  3, .avg_spt = 210, .heads = 6, .rpm = 5400, .full_stroke_ms = 18, .track_seek_ms = 2,     .rcache_num_seg =  8, .rcache_seg_size =  512, .max_multiple =  16 },
+    { .name = "[ATA-5] Quantum Fireball EX12.7A",                 .internal_name = "EX12A011", .model = "QUANTUM FIREBALL EX12.7A", .zones =  4, .avg_spt = 210, .heads = 8, .rpm = 5400, .full_stroke_ms = 18, .track_seek_ms = 2,     .rcache_num_seg =  8, .rcache_seg_size =  512, .max_multiple =  16 },
+    { .name = "[ATA-5] Quantum Fireball CR4.3A",                  .internal_name = "CR43A013", .model = "QUANTUM FIREBALL CR4.3A", .zones =  2,  .avg_spt = 310, .heads = 3, .rpm = 5400, .full_stroke_ms = 18, .track_seek_ms = 2,   .rcache_num_seg =  8, .rcache_seg_size =  512, .max_multiple =  16 },
+    { .name = "[ATA-5] Quantum Fireball CR6.4A",                  .internal_name = "CR64A011", .model = "QUANTUM FIREBALL CR6.4A", .zones =  2,  .avg_spt = 310, .heads = 4, .rpm = 5400, .full_stroke_ms = 18, .track_seek_ms = 2,   .rcache_num_seg =  8, .rcache_seg_size =  512, .max_multiple =  16 },  
+    { .name = "[ATA-5] Quantum Fireball CR8.4A",                  .internal_name = "CR84A011", .model = "QUANTUM FIREBALL CR8.4A", .zones =  3,  .avg_spt = 310, .heads = 6, .rpm = 5400, .full_stroke_ms = 18, .track_seek_ms = 2,   .rcache_num_seg =  8, .rcache_seg_size =  512, .max_multiple =  16 },
+    { .name = "[ATA-5] Quantum Fireball CR13.0A",                 .internal_name = "CR13A011", .model = "QUANTUM FIREBALL CR13.0A", .zones =  4,  .avg_spt = 310, .heads = 8, .rpm = 5400, .full_stroke_ms = 18, .track_seek_ms = 2,   .rcache_num_seg =  8, .rcache_seg_size =  512, .max_multiple =  16 },
+    { .name = "[ATA-5] Samsung SpinPoint V6800 (SV0682D)",        .internal_name = "SV0682D", .model = "SAMSUNG SV0682D", .zones =  8,  .avg_spt = 295, .heads = 2, .rpm = 5400, .full_stroke_ms = 18, .track_seek_ms = 1.3,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-5] Samsung SpinPoint V6800 (SV1023D)",        .internal_name = "SV1023D", .model = "SAMSUNG SV1023D", .zones =  8,  .avg_spt = 295, .heads = 3, .rpm = 5400, .full_stroke_ms = 18, .track_seek_ms = 1.3,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-5] Samsung SpinPoint V6800 (SV1364D)",        .internal_name = "SV1364D", .model = "SAMSUNG SV1364D", .zones =  8,  .avg_spt = 295, .heads = 4, .rpm = 5400, .full_stroke_ms = 18, .track_seek_ms = 1.3,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-5] Samsung SpinPoint V6800 (SV1705D)",        .internal_name = "SV1705D", .model = "SAMSUNG SV1705D", .zones =  8,  .avg_spt = 295, .heads = 5, .rpm = 5400, .full_stroke_ms = 18, .track_seek_ms = 1.3,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-5] Samsung SpinPoint V6800 (SV2046D)",        .internal_name = "SV2046D", .model = "SAMSUNG SV2046D", .zones =  8,  .avg_spt = 295, .heads = 6, .rpm = 5400, .full_stroke_ms = 18, .track_seek_ms = 1.3,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-5] Seagate U8 - 4.3gb",                       .internal_name = "ST34313A", .model = "ST34313A", .zones =  16,  .avg_spt = 289, .heads = 1, .rpm = 5400, .full_stroke_ms = 25, .track_seek_ms = 1.5,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-5] Seagate U8 - 8.4gb",                       .internal_name = "ST38410A", .model = "ST38410A", .zones =  16,  .avg_spt = 289, .heads = 2, .rpm = 5400, .full_stroke_ms = 25, .track_seek_ms = 1.5,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-5] Seagate U8 - 13gb",                        .internal_name = "ST313021A", .model = "ST313021A", .zones =  16,  .avg_spt = 289, .heads = 4, .rpm = 5400, .full_stroke_ms = 25, .track_seek_ms = 1.5,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-5] Seagate U8 - 17.2gb",                      .internal_name = "ST317221A", .model = "ST317221A", .zones =  16,  .avg_spt = 289, .heads = 3, .rpm = 5400, .full_stroke_ms = 25, .track_seek_ms = 1.5,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-5] Western Digital Caviar 102AA",             .internal_name = "WD102AA", .model = "WDC WD102AA-00ANA0", .zones =  16,  .avg_spt = 295, .heads = 8, .rpm = 5400, .full_stroke_ms = 12, .track_seek_ms = 1.5,   .rcache_num_seg =  16, .rcache_seg_size =  512, .max_multiple =  32 },
+    { .name = "[ATA-5] Western Digital Expert",                   .internal_name = "WD135BA", .model = "WDC WD135BA-60AK", .zones =  16,  .avg_spt = 350, .heads = 6, .rpm = 7200, .full_stroke_ms = 15, .track_seek_ms = 2,   .rcache_num_seg =  16, .rcache_seg_size =  1920, .max_multiple =  32 },
+   // clang-format on
 };
 
 int
@@ -491,6 +620,8 @@ hdd_preset_apply(int hdd_id)
     hd->cache.num_segments = preset->rcache_num_seg;
     hd->cache.segment_size = preset->rcache_seg_size;
     hd->max_multiple_block = preset->max_multiple;
+    if (preset->model)
+        hd->model = preset->model;
 
     if (!hd->speed_preset)
         return;
diff --git a/src/disk/hdd_image.c b/src/disk/hdd_image.c
index df473d7d9..75c27f4d1 100644
--- a/src/disk/hdd_image.c
+++ b/src/disk/hdd_image.c
@@ -26,6 +26,9 @@
 #include <time.h>
 #include <wchar.h>
 #include <errno.h>
+#ifdef __unix__
+#include <unistd.h>
+#endif
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/path.h>
@@ -53,7 +56,9 @@ typedef struct hdd_image_t {
 hdd_image_t hdd_images[HDD_NUM];
 
 static char  empty_sector[512];
+#ifndef __unix__
 static char *empty_sector_1mb;
+#endif
 
 #ifdef ENABLE_HDD_IMAGE_LOG
 int hdd_image_do_log = ENABLE_HDD_IMAGE_LOG;
@@ -181,8 +186,12 @@ hdd_image_calc_chs(uint32_t *c, uint32_t *h, uint32_t *s, uint32_t size)
 static int
 prepare_new_hard_disk(uint8_t id, uint64_t full_size)
 {
+    if (!hdd_images[id].file)
+        return -1;
+
     uint64_t target_size = (full_size + hdd_images[id].base) - ftello64(hdd_images[id].file);
 
+#ifndef __unix__
     uint32_t size;
     uint32_t t;
 
@@ -217,7 +226,16 @@ prepare_new_hard_disk(uint8_t id, uint64_t full_size)
     pclog_toggle_suppr();
 
     free(empty_sector_1mb);
+#else
+    pclog("Creating hard disk image: ");
+    int ret = ftruncate(fileno(hdd_images[id].file), (size_t) target_size);
 
+    if (ret) {
+        pclog("failed\n");
+        fatal("Could not create hard disk image\n");
+    }
+    pclog("OK!\n");
+#endif
     hdd_images[id].last_sector = (uint32_t) (full_size >> 9) - 1;
 
     hdd_images[id].loaded = 1;
@@ -279,7 +297,7 @@ hdd_image_load(int id)
     if (fn[0] == '.') {
         hdd_image_log("File name starts with .\n");
         memset(hdd[id].fn, 0, sizeof(hdd[id].fn));
-        return 0;
+        goto fail_raw;
     }
     hdd_images[id].file = plat_fopen(fn, "rb+");
     if (hdd_images[id].file == NULL) {
@@ -290,14 +308,14 @@ hdd_image_load(int id)
             if (hdd[id].wp) {
                 hdd_image_log("A write-protected image must exist\n");
                 memset(hdd[id].fn, 0, sizeof(hdd[id].fn));
-                return 0;
+                goto fail_raw;
             }
 
             hdd_images[id].file = plat_fopen(fn, "wb+");
             if (hdd_images[id].file == NULL) {
                 hdd_image_log("Unable to open image\n");
                 memset(hdd[id].fn, 0, sizeof(hdd[id].fn));
-                return 0;
+                goto fail_raw;
             } else {
                 if (image_is_hdi(fn)) {
                     full_size           = ((uint64_t) hdd[id].spt) * ((uint64_t) hdd[id].hpc) * ((uint64_t) hdd[id].tracks) << 9LL;
@@ -327,7 +345,7 @@ hdd_image_load(int id)
                     hdd_images[id].type = HDD_IMAGE_HDX;
                 } else if (is_vhd[0]) {
                     fclose(hdd_images[id].file);
-                    MVHDGeom geometry;
+                    MVHDGeom geometry = { 0 };
                     geometry.cyl               = hdd[id].tracks;
                     geometry.heads             = hdd[id].hpc;
                     geometry.spt               = hdd[id].spt;
@@ -335,7 +353,7 @@ hdd_image_load(int id)
                     hdd_images[id].last_sector = (full_size >> 9LL) - 1;
 
                     if (hdd[id].vhd_blocksize || hdd[id].vhd_parent[0]) {
-                        MVHDCreationOptions options;
+                        MVHDCreationOptions options = { 0 };
 retry_vhd:
                         options.block_size_in_sectors = hdd[id].vhd_blocksize;
                         options.path                  = fn;
@@ -373,11 +391,16 @@ retry_vhd:
             s = full_size = ((uint64_t) hdd[id].spt) * ((uint64_t) hdd[id].hpc) * ((uint64_t) hdd[id].tracks) << 9LL;
 
             ret = prepare_new_hard_disk(id, full_size);
+            if (ret <= 0)
+                goto fail_raw;
             return ret;
         } else {
             /* Failed for another reason */
             hdd_image_log("Failed for another reason\n");
-            return 0;
+fail_raw:
+            hdd_images[id].type        = HDD_IMAGE_RAW;
+            hdd_images[id].last_sector = (uint32_t) (((uint64_t) hdd[id].spt) * ((uint64_t) hdd[id].hpc) * ((uint64_t) hdd[id].tracks)) - 1;
+            return 1;
         }
     } else {
         if (image_is_hdi(fn)) {
@@ -400,7 +423,7 @@ retry_vhd:
                 fclose(hdd_images[id].file);
                 hdd_images[id].file = NULL;
                 memset(hdd[id].fn, 0, sizeof(hdd[id].fn));
-                return 0;
+                goto fail_raw;
             }
             if (fread(&spt, 1, 4, hdd_images[id].file) != 4)
                 fatal("hdd_image_load(): HDI: Error reading sectors per track\n");
@@ -428,7 +451,7 @@ retry_vhd:
                 fclose(hdd_images[id].file);
                 hdd_images[id].file = NULL;
                 memset(hdd[id].fn, 0, sizeof(hdd[id].fn));
-                return 0;
+                goto fail_raw;
             }
             if (fread(&spt, 1, 4, hdd_images[id].file) != 4)
                 fatal("hdd_image_load(): HDI: Error reading sectors per track\n");
@@ -487,7 +510,7 @@ retry_vhd:
     return ret;
 }
 
-void
+int
 hdd_image_seek(uint8_t id, uint32_t sector)
 {
     off64_t addr = sector;
@@ -495,29 +518,40 @@ hdd_image_seek(uint8_t id, uint32_t sector)
 
     hdd_images[id].pos = sector;
     if (hdd_images[id].type != HDD_IMAGE_VHD) {
-        if (fseeko64(hdd_images[id].file, addr + hdd_images[id].base, SEEK_SET) == -1)
-            fatal("hdd_image_seek(): Error seeking\n");
+        if (!hdd_images[id].file || (fseeko64(hdd_images[id].file, addr + hdd_images[id].base, SEEK_SET) == -1)) {
+            hdd_image_log("hdd_image_seek(): Error seeking\n");
+            return -1;
+        }
     }
+
+    return 0;
 }
 
-void
+int
 hdd_image_read(uint8_t id, uint32_t sector, uint32_t count, uint8_t *buffer)
 {
     int    non_transferred_sectors;
     size_t num_read;
 
     if (hdd_images[id].type == HDD_IMAGE_VHD) {
-        non_transferred_sectors = mvhd_read_sectors(hdd_images[id].vhd, sector, count, buffer);
-        hdd_images[id].pos      = sector + count - non_transferred_sectors - 1;
+        hdd_images[id].vhd->error = 0;
+        non_transferred_sectors   = mvhd_read_sectors(hdd_images[id].vhd, sector, count, buffer);
+        hdd_images[id].pos        = sector + count - non_transferred_sectors - 1;
+        if (hdd_images[id].vhd->error)
+            return -1;
     } else {
-        if (fseeko64(hdd_images[id].file, ((uint64_t) (sector) << 9LL) + hdd_images[id].base, SEEK_SET) == -1) {
-            fatal("Hard disk image %i: Read error during seek\n", id);
-            return;
+        if (!hdd_images[id].file || (fseeko64(hdd_images[id].file, ((uint64_t) (sector) << 9LL) + hdd_images[id].base, SEEK_SET) == -1)) {
+            hdd_image_log("Hard disk image %i: Read error during seek\n", id);
+            return -1;
         }
 
         num_read           = fread(buffer, 512, count, hdd_images[id].file);
         hdd_images[id].pos = sector + num_read;
+        if ((num_read < count) && !feof(hdd_images[id].file))
+            return -1;
     }
+
+    return 0;
 }
 
 uint32_t
@@ -541,31 +575,40 @@ hdd_image_read_ex(uint8_t id, uint32_t sector, uint32_t count, uint8_t *buffer)
     if ((sectors - sector) < transfer_sectors)
         transfer_sectors = sectors - sector;
 
-    hdd_image_read(id, sector, transfer_sectors, buffer);
+    if (hdd_image_read(id, sector, transfer_sectors, buffer) < 0)
+        return -1;
 
     if (count != transfer_sectors)
         return 1;
     return 0;
 }
 
-void
+int
 hdd_image_write(uint8_t id, uint32_t sector, uint32_t count, uint8_t *buffer)
 {
     int    non_transferred_sectors;
     size_t num_write;
 
     if (hdd_images[id].type == HDD_IMAGE_VHD) {
-        non_transferred_sectors = mvhd_write_sectors(hdd_images[id].vhd, sector, count, buffer);
-        hdd_images[id].pos      = sector + count - non_transferred_sectors - 1;
+        hdd_images[id].vhd->error = 0;
+        non_transferred_sectors   = mvhd_write_sectors(hdd_images[id].vhd, sector, count, buffer);
+        hdd_images[id].pos        = sector + count - non_transferred_sectors - 1;
+        if (hdd_images[id].vhd->error)
+            return -1;
     } else {
-        if (fseeko64(hdd_images[id].file, ((uint64_t) (sector) << 9LL) + hdd_images[id].base, SEEK_SET) == -1) {
-            fatal("Hard disk image %i: Write error during seek\n", id);
-            return;
+        if (!hdd_images[id].file || (fseeko64(hdd_images[id].file, ((uint64_t) (sector) << 9LL) + hdd_images[id].base, SEEK_SET) == -1)) {
+            hdd_image_log("Hard disk image %i: Write error during seek\n", id);
+            return -1;
         }
 
         num_write          = fwrite(buffer, 512, count, hdd_images[id].file);
         hdd_images[id].pos = sector + num_write;
+        fflush(hdd_images[id].file);
+        if (num_write < count)
+            return -1;
     }
+
+    return 0;
 }
 
 int
@@ -577,25 +620,29 @@ hdd_image_write_ex(uint8_t id, uint32_t sector, uint32_t count, uint8_t *buffer)
     if ((sectors - sector) < transfer_sectors)
         transfer_sectors = sectors - sector;
 
-    hdd_image_write(id, sector, transfer_sectors, buffer);
+    if (hdd_image_write(id, sector, transfer_sectors, buffer) < 0)
+        return -1;
 
     if (count != transfer_sectors)
         return 1;
     return 0;
 }
 
-void
+int
 hdd_image_zero(uint8_t id, uint32_t sector, uint32_t count)
 {
     if (hdd_images[id].type == HDD_IMAGE_VHD) {
+        hdd_images[id].vhd->error   = 0;
         int non_transferred_sectors = mvhd_format_sectors(hdd_images[id].vhd, sector, count);
         hdd_images[id].pos          = sector + count - non_transferred_sectors - 1;
+        if (hdd_images[id].vhd->error)
+            return -1;
     } else {
         memset(empty_sector, 0, 512);
 
-        if (fseeko64(hdd_images[id].file, ((uint64_t) (sector) << 9LL) + hdd_images[id].base, SEEK_SET) == -1) {
-            fatal("Hard disk image %i: Zero error during seek\n", id);
-            return;
+        if (!hdd_images[id].file || (fseeko64(hdd_images[id].file, ((uint64_t) (sector) << 9LL) + hdd_images[id].base, SEEK_SET) == -1)) {
+            hdd_image_log("Hard disk image %i: Zero error during seek\n", id);
+            return -1;
         }
 
         for (uint32_t i = 0; i < count; i++) {
@@ -603,9 +650,14 @@ hdd_image_zero(uint8_t id, uint32_t sector, uint32_t count)
                 break;
 
             hdd_images[id].pos = sector + i;
-            fwrite(empty_sector, 512, 1, hdd_images[id].file);
+            if (!fwrite(empty_sector, 512, 1, hdd_images[id].file))
+                return -1;
         }
+
+        fflush(hdd_images[id].file);
     }
+
+    return 0;
 }
 
 int
diff --git a/src/disk/minivhd/create.c b/src/disk/minivhd/create.c
index d06382ef9..1fcfc8682 100644
--- a/src/disk/minivhd/create.c
+++ b/src/disk/minivhd/create.c
@@ -315,7 +315,7 @@ create_sparse_diff(const char* path, const char* par_path, uint64_t size_in_byte
 {
     uint8_t footer_buff[MVHD_FOOTER_SIZE] = {0};
     uint8_t sparse_buff[MVHD_SPARSE_SIZE] = {0};
-    uint8_t bat_sect[MVHD_SECTOR_SIZE];
+    uint8_t bat_sect[MVHD_SECTOR_SIZE] = {0};
     MVHDGeom par_geom = {0};
     memset(bat_sect, 0xffffffff, sizeof bat_sect);
     MVHDMeta* vhdm = NULL;
diff --git a/src/disk/minivhd/internal.h b/src/disk/minivhd/internal.h
index d3f930110..4caef7c47 100644
--- a/src/disk/minivhd/internal.h
+++ b/src/disk/minivhd/internal.h
@@ -115,6 +115,7 @@ typedef struct MVHDSparseHeader {
 struct MVHDMeta {
     FILE*            f;
     bool             readonly;
+    bool             error;
     char             filename[MVHD_MAX_PATH_BYTES];
     struct MVHDMeta* parent;
     MVHDFooter       footer;
@@ -271,7 +272,7 @@ struct MVHDMeta* mvhd_create_fixed_raw(const char* path, FILE* raw_img, uint64_t
  * \param [in] f File to write sectors to
  * \param [in] sector_count The number of sectors to write
  */
-void mvhd_write_empty_sectors(FILE* f, int sector_count);
+bool mvhd_write_empty_sectors(FILE* f, int sector_count);
 
 /**
  * \brief Read a fixed VHD image
diff --git a/src/disk/minivhd/manage.c b/src/disk/minivhd/manage.c
index 7ac3989e6..fdf3d8e79 100644
--- a/src/disk/minivhd/manage.c
+++ b/src/disk/minivhd/manage.c
@@ -92,7 +92,7 @@ read_footer(MVHDMeta* vhdm)
 static void
 read_sparse_header(MVHDMeta* vhdm)
 {
-    uint8_t buffer[MVHD_SPARSE_SIZE];
+    uint8_t buffer[MVHD_SPARSE_SIZE] = { 0 };
 
     mvhd_fseeko64(vhdm->f, vhdm->footer.data_offset, SEEK_SET);
     (void) !fread(buffer, sizeof buffer, 1, vhdm->f);
@@ -438,17 +438,15 @@ mvhd_version_id(void)
 MVHDAPI int
 mvhd_file_is_vhd(FILE* f)
 {
-    uint8_t con_str[8];
+    uint8_t con_str[8] = { 0 };
 
-    if (f == NULL) {
+    if (f == NULL)
         return 0;
-    }
 
     mvhd_fseeko64(f, -MVHD_FOOTER_SIZE, SEEK_END);
     (void) !fread(con_str, sizeof con_str, 1, f);
-    if (mvhd_is_conectix_str(con_str)) {
+    if (mvhd_is_conectix_str(con_str))
         return 1;
-    }
 
     return 0;
 }
@@ -457,13 +455,12 @@ mvhd_file_is_vhd(FILE* f)
 MVHDAPI MVHDGeom
 mvhd_calculate_geometry(uint64_t size)
 {
-    MVHDGeom chs;
+    MVHDGeom chs = { 0 };
     uint32_t ts = (uint32_t)(size / MVHD_SECTOR_SIZE);
     uint32_t spt, heads, cyl, cth;
 
-    if (ts > 65535 * 16 * 255) {
+    if (ts > 65535 * 16 * 255)
         ts = 65535 * 16 * 255;
-    }
 
     if (ts >= 65535 * 16 * 63) {
         spt = 255;
@@ -473,9 +470,8 @@ mvhd_calculate_geometry(uint64_t size)
         spt = 17;
         cth = ts / spt;
         heads = (cth + 1023) / 1024;
-        if (heads < 4) {
+        if (heads < 4)
             heads = 4;
-        }
         if (cth >= (heads * 1024) || heads > 16) {
             spt = 31;
             heads = 16;
@@ -500,7 +496,7 @@ mvhd_calculate_geometry(uint64_t size)
 MVHDAPI MVHDMeta*
 mvhd_open(const char* path, int readonly, int* err)
 {
-    MVHDError open_err;
+    MVHDError open_err = { 0 };
 
     MVHDMeta *vhdm = calloc(sizeof *vhdm, 1);
     if (vhdm == NULL) {
@@ -516,11 +512,10 @@ mvhd_open(const char* path, int readonly, int* err)
     //This is safe, as we've just checked for potential overflow above
     strcpy(vhdm->filename, path);
 
-    if (readonly) {
+    if (readonly)
         vhdm->f = mvhd_fopen((const char*)vhdm->filename, "rb", err);
-    } else {
+    else
         vhdm->f = mvhd_fopen((const char*)vhdm->filename, "rb+", err);
-    }
     if (vhdm->f == NULL) {
         /* note, mvhd_fopen sets err for us */
         goto cleanup_vhdm;
@@ -567,14 +562,12 @@ mvhd_open(const char* path, int readonly, int* err)
     vhdm->format_buffer.sector_count = 64;
     if (vhdm->footer.disk_type == MVHD_TYPE_DIFF) {
         char* par_path = get_diff_parent_path(vhdm, err);
-        if (par_path == NULL) {
+        if (par_path == NULL)
             goto cleanup_format_buff;
-        }
 
         uint32_t par_mod_ts = mvhd_file_mod_timestamp(par_path, err);
-        if (*err != 0) {
+        if (*err != 0)
             goto cleanup_format_buff;
-        }
 
         if (vhdm->sparse.par_timestamp != par_mod_ts) {
             /* The last-modified timestamp is to fragile to make this a fatal error.
@@ -582,9 +575,8 @@ mvhd_open(const char* path, int readonly, int* err)
             *err = MVHD_ERR_TIMESTAMP;
         }
         vhdm->parent = mvhd_open(par_path, true, err);
-        if (vhdm->parent == NULL) {
+        if (vhdm->parent == NULL)
             goto cleanup_format_buff;
-        }
 
         if (memcmp(vhdm->sparse.par_uuid, vhdm->parent->footer.uuid, sizeof vhdm->sparse.par_uuid) != 0) {
             *err = MVHD_ERR_INVALID_PAR_UUID;
@@ -629,9 +621,8 @@ mvhd_close(MVHDMeta* vhdm)
     if (vhdm == NULL)
         return;
 
-    if (vhdm->parent != NULL) {
+    if (vhdm->parent != NULL)
         mvhd_close(vhdm->parent);
-    }
 
     fclose(vhdm->f);
 
@@ -655,7 +646,7 @@ mvhd_close(MVHDMeta* vhdm)
 MVHDAPI int
 mvhd_diff_update_par_timestamp(MVHDMeta* vhdm, int* err)
 {
-    uint8_t sparse_buff[1024];
+    uint8_t sparse_buff[1024] = { 0 };
 
     if (vhdm == NULL || err == NULL) {
         *err = MVHD_ERR_INVALID_PARAMS;
diff --git a/src/disk/minivhd/minivhd_io.c b/src/disk/minivhd/minivhd_io.c
index ff86a8337..3b75ca74d 100644
--- a/src/disk/minivhd/minivhd_io.c
+++ b/src/disk/minivhd/minivhd_io.c
@@ -37,6 +37,7 @@
 #ifndef _FILE_OFFSET_BITS
 # define _FILE_OFFSET_BITS 64
 #endif
+#include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -45,7 +46,10 @@
 #include <time.h>
 #include "minivhd.h"
 #include "internal.h"
+#define HAVE_STDARG_H
 
+#include "cpu.h"
+#include <86box/86box.h>
 
 /*
  * The following bit array macros adapted from:
@@ -56,7 +60,6 @@
 #define VHD_CLEARBIT(A,k)   ( A[(k>>3)] &= ~(0x80 >> (k&7)) )
 #define VHD_TESTBIT(A,k)    ( A[(k>>3)] & (0x80 >> (k&7)) )
 
-
 /**
  * \brief Check that we will not be overflowing buffers
  *
@@ -68,28 +71,30 @@
  * \param [out] trunc_sectors The number of sectors truncated if transfer_sectors < num_sectors
  */
 static inline void
-check_sectors(uint32_t offset, int num_sectors, uint32_t total_sectors, int* transfer_sect, int* trunc_sect)
+check_sectors(uint32_t offset, int num_sectors, uint32_t total_sectors, int *transfer_sect, int *trunc_sect)
 {
     *transfer_sect = num_sectors;
     *trunc_sect = 0;
 
-    if ((total_sectors - offset) < (uint32_t)*transfer_sect) {
+    if ((total_sectors - offset) < ((uint32_t) *transfer_sect)) {
         *transfer_sect = total_sectors - offset;
         *trunc_sect = num_sectors - *transfer_sect;
     }
 }
 
-
-void
-mvhd_write_empty_sectors(FILE* f, int sector_count)
+bool
+mvhd_write_empty_sectors(FILE *f, int sector_count)
 {
     uint8_t zero_bytes[MVHD_SECTOR_SIZE] = {0};
 
     for (int i = 0; i < sector_count; i++) {
-        fwrite(zero_bytes, sizeof zero_bytes, 1, f);
+        if (!fwrite(zero_bytes, sizeof zero_bytes, 1, f))
+            return 0;
     }
-}
 
+    fflush(f);
+    return 1;
+}
 
 /**
  * \brief Read the sector bitmap for a block.
@@ -101,19 +106,18 @@ mvhd_write_empty_sectors(FILE* f, int sector_count)
  * \param [in] blk The block for which to read the sector bitmap from
  */
 static void
-read_sect_bitmap(MVHDMeta* vhdm, int blk)
+read_sect_bitmap(MVHDMeta *vhdm, int blk)
 {
     if (vhdm->block_offset[blk] != MVHD_SPARSE_BLK) {
         mvhd_fseeko64(vhdm->f, (uint64_t)vhdm->block_offset[blk] * MVHD_SECTOR_SIZE, SEEK_SET);
-        (void) !fread(vhdm->bitmap.curr_bitmap, vhdm->bitmap.sector_count * MVHD_SECTOR_SIZE, 1, vhdm->f);
-    } else {
+        if (!fread(vhdm->bitmap.curr_bitmap, vhdm->bitmap.sector_count * MVHD_SECTOR_SIZE, 1, vhdm->f))
+            vhdm->error = 1;
+    } else
         memset(vhdm->bitmap.curr_bitmap, 0, vhdm->bitmap.sector_count * MVHD_SECTOR_SIZE);
-    }
 
     vhdm->bitmap.curr_block = blk;
 }
 
-
 /**
  * \brief Write the current sector bitmap in memory to file
  *
@@ -124,12 +128,13 @@ write_curr_sect_bitmap(MVHDMeta* vhdm)
 {
     if (vhdm->bitmap.curr_block >= 0) {
         int64_t abs_offset = (int64_t)vhdm->block_offset[vhdm->bitmap.curr_block] * MVHD_SECTOR_SIZE;
-        mvhd_fseeko64(vhdm->f, abs_offset, SEEK_SET);
-        fwrite(vhdm->bitmap.curr_bitmap, MVHD_SECTOR_SIZE, vhdm->bitmap.sector_count, vhdm->f);
+        if (mvhd_fseeko64(vhdm->f, abs_offset, SEEK_SET) == -1)
+            vhdm->error = 1;
+        if (!fwrite(vhdm->bitmap.curr_bitmap, MVHD_SECTOR_SIZE, vhdm->bitmap.sector_count, vhdm->f))
+            vhdm->error = 1;
     }
 }
 
-
 /**
  * \brief Write block offset from memory into file
  *
@@ -137,16 +142,18 @@ write_curr_sect_bitmap(MVHDMeta* vhdm)
  * \param [in] blk The block for which to write the offset for
  */
 static void
-write_bat_entry(MVHDMeta* vhdm, int blk)
+write_bat_entry(MVHDMeta *vhdm, int blk)
 {
     uint64_t table_offset = vhdm->sparse.bat_offset + ((uint64_t)blk * sizeof *vhdm->block_offset);
     uint32_t offset = mvhd_to_be32(vhdm->block_offset[blk]);
 
-    mvhd_fseeko64(vhdm->f, table_offset, SEEK_SET);
-    fwrite(&offset, sizeof offset, 1, vhdm->f);
+    if (mvhd_fseeko64(vhdm->f, table_offset, SEEK_SET) == -1)
+        vhdm->error = 1;
+    if (!fwrite(&offset, sizeof offset, 1, vhdm->f))
+        vhdm->error = 1;
+    fflush(vhdm->f);
 }
 
-
 /**
  * \brief Create an empty block in a sparse or differencing VHD image
  *
@@ -162,9 +169,9 @@ write_bat_entry(MVHDMeta* vhdm, int blk)
  * \param [in] blk The block number to create
  */
 static void
-create_block(MVHDMeta* vhdm, int blk)
+create_block(MVHDMeta *vhdm, int blk)
 {
-    uint8_t footer[MVHD_FOOTER_SIZE];
+    uint8_t footer[MVHD_FOOTER_SIZE] = { 0 };
 
     /* Seek to where the footer SHOULD be */
     mvhd_fseeko64(vhdm->f, -MVHD_FOOTER_SIZE, SEEK_END);
@@ -174,67 +181,78 @@ create_block(MVHDMeta* vhdm, int blk)
     if (!mvhd_is_conectix_str(footer)) {
         /* Oh dear. We use the header instead, since something has gone wrong at the footer */
         mvhd_fseeko64(vhdm->f, 0, SEEK_SET);
-        (void) !fread(footer, sizeof footer, 1, vhdm->f);
+        if (!fread(footer, sizeof footer, 1, vhdm->f))
+            vhdm->error = 1;
         mvhd_fseeko64(vhdm->f, 0, SEEK_END);
     }
 
     int64_t abs_offset = mvhd_ftello64(vhdm->f);
-    if (abs_offset % MVHD_SECTOR_SIZE != 0) {
+    if ((abs_offset % MVHD_SECTOR_SIZE) != 0) {
         /* Yikes! We're supposed to be on a sector boundary. Add some padding */
-        int64_t padding_amount = (int64_t)MVHD_SECTOR_SIZE - (abs_offset % MVHD_SECTOR_SIZE);
+        int64_t padding_amount = ((int64_t) MVHD_SECTOR_SIZE) - (abs_offset % MVHD_SECTOR_SIZE);
         uint8_t zero_byte = 0;
         for (int i = 0; i < padding_amount; i++) {
-            fwrite(&zero_byte, sizeof zero_byte, 1, vhdm->f);
+            if (!fwrite(&zero_byte, sizeof zero_byte, 1, vhdm->f))
+                vhdm->error = 1;
         }
         abs_offset += padding_amount;
     }
 
     uint32_t sect_offset = (uint32_t)(abs_offset / MVHD_SECTOR_SIZE);
     int blk_size_sectors = vhdm->sparse.block_sz / MVHD_SECTOR_SIZE;
-    mvhd_write_empty_sectors(vhdm->f, vhdm->bitmap.sector_count + blk_size_sectors);
+    if (!mvhd_write_empty_sectors(vhdm->f, vhdm->bitmap.sector_count + blk_size_sectors))
+        vhdm->error = 1;
 
     /* Add a bit of padding. That's what Windows appears to do, although it's not strictly necessary... */
-    mvhd_write_empty_sectors(vhdm->f, 5);
+    if (!mvhd_write_empty_sectors(vhdm->f, 5))
+        vhdm->error = 1;
 
     /* And we finish with the footer */
-    fwrite(footer, sizeof footer, 1, vhdm->f);
+    if (!fwrite(footer, sizeof footer, 1, vhdm->f))
+        vhdm->error = 1;
 
     /* We no longer have a sparse block. Update that BAT! */
     vhdm->block_offset[blk] = sect_offset;
     write_bat_entry(vhdm, blk);
+
+    fflush(vhdm->f);
 }
 
-
 int
-mvhd_fixed_read(MVHDMeta* vhdm, uint32_t offset, int num_sectors, void* out_buff) {
-    int64_t addr;
-    int transfer_sectors, truncated_sectors;
+mvhd_fixed_read(MVHDMeta *vhdm, uint32_t offset, int num_sectors, void *out_buff) {
+    int64_t addr = 0ULL;
+    int transfer_sectors = 0;
+    int truncated_sectors = 0;
     uint32_t total_sectors = (uint32_t)(vhdm->footer.curr_sz / MVHD_SECTOR_SIZE);
 
     check_sectors(offset, num_sectors, total_sectors, &transfer_sectors, &truncated_sectors);
 
-    addr = (int64_t)offset * MVHD_SECTOR_SIZE;
-    mvhd_fseeko64(vhdm->f, addr, SEEK_SET);
-    (void) !fread(out_buff, transfer_sectors*MVHD_SECTOR_SIZE, 1, vhdm->f);
+    addr = ((int64_t) offset) * MVHD_SECTOR_SIZE;
+    if (mvhd_fseeko64(vhdm->f, addr, SEEK_SET) == -1)
+        vhdm->error = 1;
+    if (!fread(out_buff, transfer_sectors * MVHD_SECTOR_SIZE, 1, vhdm->f) && !feof(vhdm->f))
+        vhdm->error = 1;
 
     return truncated_sectors;
 }
 
-
 int
-mvhd_sparse_read(MVHDMeta* vhdm, uint32_t offset, int num_sectors, void* out_buff)
+mvhd_sparse_read(MVHDMeta *vhdm, uint32_t offset, int num_sectors, void *out_buff)
 {
-    int transfer_sectors, truncated_sectors;
+    int transfer_sectors = 0;
+    int truncated_sectors;
     uint32_t total_sectors = (uint32_t)(vhdm->footer.curr_sz / MVHD_SECTOR_SIZE);
 
     check_sectors(offset, num_sectors, total_sectors, &transfer_sectors, &truncated_sectors);
 
     uint8_t* buff = (uint8_t*)out_buff;
-    int64_t addr;
-    uint32_t s, ls;
-    int blk, prev_blk, sib;
+    int64_t addr = 0ULL;
+    uint32_t s = 0;
+    uint32_t ls = 0;
+    int blk = 0;
+    int prev_blk = -1;
+    int sib = 0;
     ls = offset + transfer_sectors;
-    prev_blk = -1;
 
     for (s = offset; s < ls; s++) {
         blk = s / vhdm->sect_per_block;
@@ -243,15 +261,19 @@ mvhd_sparse_read(MVHDMeta* vhdm, uint32_t offset, int num_sectors, void* out_buf
             prev_blk = blk;
             if (vhdm->bitmap.curr_block != blk) {
                 read_sect_bitmap(vhdm, blk);
-                mvhd_fseeko64(vhdm->f, (uint64_t)sib * MVHD_SECTOR_SIZE, SEEK_CUR);
+                if (mvhd_fseeko64(vhdm->f, (uint64_t)sib * MVHD_SECTOR_SIZE, SEEK_CUR) == -1)
+                    vhdm->error = 1;
             } else {
-                addr = ((int64_t)vhdm->block_offset[blk] + vhdm->bitmap.sector_count + sib) * MVHD_SECTOR_SIZE;
-                mvhd_fseeko64(vhdm->f, addr, SEEK_SET);
+                addr = (((int64_t) vhdm->block_offset[blk]) + vhdm->bitmap.sector_count + sib) *
+                       MVHD_SECTOR_SIZE;
+                if (mvhd_fseeko64(vhdm->f, addr, SEEK_SET) == -1)
+                    vhdm->error = 1;
             }
         }
 
         if (VHD_TESTBIT(vhdm->bitmap.curr_bitmap, sib)) {
-            (void) !fread(buff, MVHD_SECTOR_SIZE, 1, vhdm->f);
+            if (!fread(buff, MVHD_SECTOR_SIZE, 1, vhdm->f) && !feof(vhdm->f))
+                vhdm->error = 1;
         } else {
             memset(buff, 0, MVHD_SECTOR_SIZE);
             mvhd_fseeko64(vhdm->f, MVHD_SECTOR_SIZE, SEEK_CUR);
@@ -262,19 +284,21 @@ mvhd_sparse_read(MVHDMeta* vhdm, uint32_t offset, int num_sectors, void* out_buf
     return truncated_sectors;
 }
 
-
 int
-mvhd_diff_read(MVHDMeta* vhdm, uint32_t offset, int num_sectors, void* out_buff)
+mvhd_diff_read(MVHDMeta *vhdm, uint32_t offset, int num_sectors, void *out_buff)
 {
-    int transfer_sectors, truncated_sectors;
+    int transfer_sectors = 0;
+    int truncated_sectors = 0;
     uint32_t total_sectors = (uint32_t)(vhdm->footer.curr_sz / MVHD_SECTOR_SIZE);
 
     check_sectors(offset, num_sectors, total_sectors, &transfer_sectors, &truncated_sectors);
 
-    uint8_t* buff = (uint8_t*)out_buff;
-    MVHDMeta* curr_vhdm = vhdm;
-    uint32_t s, ls;
-    int blk, sib;
+    uint8_t *buff = (uint8_t*)out_buff;
+    MVHDMeta *curr_vhdm = vhdm;
+    uint32_t s = 0;
+    uint32_t ls = 0;
+    int blk = 0;
+    int sib = 0;
     ls = offset + transfer_sectors;
 
     for (s = offset; s < ls; s++) {
@@ -291,10 +315,14 @@ mvhd_diff_read(MVHDMeta* vhdm, uint32_t offset, int num_sectors, void* out_buff)
 
         /* We handle actual sector reading using the fixed or sparse functions,
            as a differencing VHD is also a sparse VHD */
-        if (curr_vhdm->footer.disk_type == MVHD_TYPE_DIFF || curr_vhdm->footer.disk_type == MVHD_TYPE_DYNAMIC) {
+        if ((curr_vhdm->footer.disk_type == MVHD_TYPE_DIFF) ||
+            (curr_vhdm->footer.disk_type == MVHD_TYPE_DYNAMIC))
             mvhd_sparse_read(curr_vhdm, s, 1, buff);
-        } else {
+        else
             mvhd_fixed_read(curr_vhdm, s, 1, buff);
+        if (curr_vhdm->error) {
+            curr_vhdm->error = 0;
+            vhdm->error = 1;
         }
 
         curr_vhdm = vhdm;
@@ -304,84 +332,96 @@ mvhd_diff_read(MVHDMeta* vhdm, uint32_t offset, int num_sectors, void* out_buff)
     return truncated_sectors;
 }
 
-
 int
-mvhd_fixed_write(MVHDMeta* vhdm, uint32_t offset, int num_sectors, void* in_buff)
+mvhd_fixed_write(MVHDMeta *vhdm, uint32_t offset, int num_sectors, void *in_buff)
 {
-    int64_t addr;
-    int transfer_sectors, truncated_sectors;
+    int64_t addr = 0ULL;
+    int transfer_sectors = 0;
+    int truncated_sectors = 0;
     uint32_t total_sectors = (uint32_t)(vhdm->footer.curr_sz / MVHD_SECTOR_SIZE);
 
     check_sectors(offset, num_sectors, total_sectors, &transfer_sectors, &truncated_sectors);
 
     addr = (int64_t)offset * MVHD_SECTOR_SIZE;
-    mvhd_fseeko64(vhdm->f, addr, SEEK_SET);
-    fwrite(in_buff, transfer_sectors*MVHD_SECTOR_SIZE, 1, vhdm->f);
+    if (mvhd_fseeko64(vhdm->f, addr, SEEK_SET) == -1)
+        vhdm->error = 1;
+    if (!fwrite(in_buff, transfer_sectors * MVHD_SECTOR_SIZE, 1, vhdm->f))
+        vhdm->error = 1;
+    fflush(vhdm->f);
 
     return truncated_sectors;
 }
 
-
 int
-mvhd_sparse_diff_write(MVHDMeta* vhdm, uint32_t offset, int num_sectors, void* in_buff)
+mvhd_sparse_diff_write(MVHDMeta *vhdm, uint32_t offset, int num_sectors, void *in_buff)
 {
-    int transfer_sectors, truncated_sectors;
+    int transfer_sectors = 0;
+    int truncated_sectors = 0;
     uint32_t total_sectors = (uint32_t)(vhdm->footer.curr_sz / MVHD_SECTOR_SIZE);
 
     check_sectors(offset, num_sectors, total_sectors, &transfer_sectors, &truncated_sectors);
 
-    uint8_t* buff = (uint8_t*)in_buff;
-    int64_t addr;
-    uint32_t s, ls;
-    int blk, prev_blk, sib;
+    uint8_t* buff = (uint8_t *) in_buff;
+    int64_t addr = 0ULL;
+    uint32_t s = 0;
+    uint32_t ls = 0;
+    int blk = 0;
+    int prev_blk = -1;
+    int sib = 0;
     ls = offset + transfer_sectors;
-    prev_blk = -1;
 
-    for (s = offset; s < ls; s++) {
-        blk = s / vhdm->sect_per_block;
-        sib = s % vhdm->sect_per_block;
-        if (vhdm->bitmap.curr_block != blk && prev_blk >= 0) {
-            /* Write the sector bitmap for the previous block, before we replace it. */
-            write_curr_sect_bitmap(vhdm);
-        }
-
-        if (vhdm->block_offset[blk] == MVHD_SPARSE_BLK) {
-            /* "read" the sector bitmap first, before creating a new block, as the bitmap will be
-               zero either way */
-            read_sect_bitmap(vhdm, blk);
-            create_block(vhdm, blk);
-        }
-
-        if (blk != prev_blk) {
-            if (vhdm->bitmap.curr_block != blk) {
-                read_sect_bitmap(vhdm, blk);
-                mvhd_fseeko64(vhdm->f, (uint64_t)sib * MVHD_SECTOR_SIZE, SEEK_CUR);
-            } else {
-                addr = ((int64_t)vhdm->block_offset[blk] + vhdm->bitmap.sector_count + sib) * MVHD_SECTOR_SIZE;
-                mvhd_fseeko64(vhdm->f, addr, SEEK_SET);
+    if (offset < total_sectors) {
+        for (s = offset; s < ls; s++) {
+            blk = s / vhdm->sect_per_block;
+            sib = s % vhdm->sect_per_block;
+            if (vhdm->bitmap.curr_block != blk && prev_blk >= 0) {
+                /* Write the sector bitmap for the previous block, before we replace it. */
+                write_curr_sect_bitmap(vhdm);
             }
-            prev_blk = blk;
-        }
 
-        fwrite(buff, MVHD_SECTOR_SIZE, 1, vhdm->f);
-        VHD_SETBIT(vhdm->bitmap.curr_bitmap, sib);
-        buff += MVHD_SECTOR_SIZE;
+            if (vhdm->block_offset[blk] == MVHD_SPARSE_BLK) {
+                /* "read" the sector bitmap first, before creating a new block, as the bitmap will be
+                   zero either way */
+                read_sect_bitmap(vhdm, blk);
+                create_block(vhdm, blk);
+            }
+
+            if (blk != prev_blk) {
+                if (vhdm->bitmap.curr_block != blk) {
+                    read_sect_bitmap(vhdm, blk);
+                    if (mvhd_fseeko64(vhdm->f, (uint64_t)sib * MVHD_SECTOR_SIZE, SEEK_CUR) == -1)
+                        vhdm->error = 1;
+                } else {
+                    addr = (((int64_t) vhdm->block_offset[blk]) + vhdm->bitmap.sector_count + sib) *
+                           MVHD_SECTOR_SIZE;
+                    if (mvhd_fseeko64(vhdm->f, addr, SEEK_SET) == -1)
+                        vhdm->error = 1;
+                }
+                prev_blk = blk;
+            }
+
+            if (!fwrite(buff, MVHD_SECTOR_SIZE, 1, vhdm->f))
+                vhdm->error = 1;
+            VHD_SETBIT(vhdm->bitmap.curr_bitmap, sib);
+            buff += MVHD_SECTOR_SIZE;
+        }
     }
 
     /* And write the sector bitmap for the last block we visited to disk */
     write_curr_sect_bitmap(vhdm);
 
+    fflush(vhdm->f);
+
     return truncated_sectors;
 }
 
-
 int
-mvhd_noop_write(MVHDMeta* vhdm, uint32_t offset, int num_sectors, void* in_buff)
+mvhd_noop_write(MVHDMeta *vhdm, uint32_t offset, int num_sectors, void *in_buff)
 {
-    (void)vhdm;
-    (void)offset;
-    (void)num_sectors;
-    (void)in_buff;
+    (void) vhdm;
+    (void) offset;
+    (void) num_sectors;
+    (void) in_buff;
 
     return 0;
 }
diff --git a/src/disk/minivhd/minivhd_util.c b/src/disk/minivhd/minivhd_util.c
index dd3244322..4901e5841 100644
--- a/src/disk/minivhd/minivhd_util.c
+++ b/src/disk/minivhd/minivhd_util.c
@@ -462,7 +462,7 @@ mvhd_file_mod_timestamp(const char* path, int *err)
 {
     *err = 0;
 #ifdef _WIN32
-    struct _stat file_stat;
+    struct _stat file_stat = { 0 };
     size_t path_len = strlen(path);
     mvhd_utf16 new_path[260] = {0};
     int new_path_len = (sizeof new_path) - 2;
@@ -485,7 +485,7 @@ mvhd_file_mod_timestamp(const char* path, int *err)
         return 0;
     }
 #else
-    struct stat file_stat;
+    struct stat file_stat = { 0 };
     int stat_res = stat(path, &file_stat);
 
     if (stat_res != 0) {
diff --git a/src/disk/mo.c b/src/disk/mo.c
index c93f4b055..5ffe74f78 100644
--- a/src/disk/mo.c
+++ b/src/disk/mo.c
@@ -9,35 +9,33 @@
  *          Implementation of a generic Magneto-Optical Disk drive
  *          commands, for both ATAPI and SCSI usage.
  *
- *
- *
  * Authors: Natalia Portillo <claunia@claunia.com>
  *          Miran Grca, <mgrca8@gmail.com>
  *          Fred N. van Kempen, <decwiz@yahoo.com>
  *
- *          Copyright 2020-2021 Natalia Portillo.
- *          Copyright 2020-2021 Miran Grca.
- *          Copyright 2020-2021 Fred N. van Kempen
+ *          Copyright 2020-2025 Natalia Portillo.
+ *          Copyright 2020-2025 Miran Grca.
+ *          Copyright 2020-2025 Fred N. van Kempen
  */
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
+#define _GNU_SOURCE
+#include <inttypes.h>
+#ifdef ENABLE_MO_LOG
 #include <stdarg.h>
-#include <wchar.h>
-#define HAVE_STDARG_H
+#endif
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <86box/86box.h>
 #include <86box/timer.h>
-#include <86box/config.h>
-#include <86box/timer.h>
 #include <86box/device.h>
+#include <86box/log.h>
 #include <86box/scsi.h>
 #include <86box/scsi_device.h>
 #include <86box/nvr.h>
 #include <86box/path.h>
 #include <86box/plat.h>
 #include <86box/ui.h>
-#include <86box/hdc.h>
 #include <86box/hdc_ide.h>
 #include <86box/mo.h>
 #include <86box/version.h>
@@ -53,235 +51,49 @@
 
 mo_drive_t mo_drives[MO_NUM];
 
-/* Table of all SCSI commands and their flags, needed for the new disc change / not ready handler. */
+// clang-format off
+/*
+   Table of all SCSI commands and their flags, needed for the new disc change /
+   not ready handler.
+ */
 const uint8_t mo_command_flags[0x100] = {
-    IMPLEMENTED | CHECK_READY | NONDATA,          /* 0x00 */
-    IMPLEMENTED | ALLOW_UA | NONDATA | SCSI_ONLY, /* 0x01 */
-    0,
-    IMPLEMENTED | ALLOW_UA,                                     /* 0x03 */
-    IMPLEMENTED | CHECK_READY | ALLOW_UA | NONDATA | SCSI_ONLY, /* 0x04 */
-    0, 0, 0,
-    IMPLEMENTED | CHECK_READY, /* 0x08 */
-    0,
-    IMPLEMENTED | CHECK_READY,           /* 0x0A */
-    IMPLEMENTED | CHECK_READY | NONDATA, /* 0x0B */
-    0, 0, 0, 0, 0, 0,
-    IMPLEMENTED | ALLOW_UA,                          /* 0x12 */
-    IMPLEMENTED | CHECK_READY | NONDATA | SCSI_ONLY, /* 0x13 */
-    0,
-    IMPLEMENTED,             /* 0x15 */
-    IMPLEMENTED | SCSI_ONLY, /* 0x16 */
-    IMPLEMENTED | SCSI_ONLY, /* 0x17 */
-    0, 0,
-    IMPLEMENTED,               /* 0x1A */
-    IMPLEMENTED | CHECK_READY, /* 0x1B */
-    0,
-    IMPLEMENTED,               /* 0x1D */
-    IMPLEMENTED | CHECK_READY, /* 0x1E */
-    0, 0, 0, 0, 0, 0,
-    IMPLEMENTED | CHECK_READY, /* 0x25 */
-    0, 0,
-    IMPLEMENTED | CHECK_READY, /* 0x28 */
-    0,
-    IMPLEMENTED | CHECK_READY,           /* 0x2A */
-    IMPLEMENTED | CHECK_READY | NONDATA, /* 0x2B */
-    IMPLEMENTED | CHECK_READY | NONDATA, /* 0x2C */
-    0,
-    IMPLEMENTED | CHECK_READY,                       /* 0x2E */
-    IMPLEMENTED | CHECK_READY | NONDATA | SCSI_ONLY, /* 0x2F */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0,
-    0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0,
-    IMPLEMENTED, /* 0x55 */
-    0, 0, 0, 0,
-    IMPLEMENTED, /* 0x5A */
-    0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    IMPLEMENTED | CHECK_READY, /* 0xA8 */
-    0,
-    IMPLEMENTED | CHECK_READY, /* 0xAA */
-    0,
-    IMPLEMENTED | CHECK_READY | NONDATA, /* 0xAC */
-    0,
-    IMPLEMENTED | CHECK_READY,                       /* 0xAE */
-    IMPLEMENTED | CHECK_READY | NONDATA | SCSI_ONLY, /* 0xAF */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0,
-    0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    [0x00]          = IMPLEMENTED | CHECK_READY,
+    [0x01]          = IMPLEMENTED | ALLOW_UA | SCSI_ONLY,
+    [0x03]          = IMPLEMENTED | ALLOW_UA,
+    [0x04]          = IMPLEMENTED | CHECK_READY | ALLOW_UA | SCSI_ONLY,
+    [0x08]          = IMPLEMENTED | CHECK_READY,
+    [0x0a]          = IMPLEMENTED | CHECK_READY,
+    [0x0b]          = IMPLEMENTED | CHECK_READY,
+    [0x12]          = IMPLEMENTED | ALLOW_UA,
+    [0x13]          = IMPLEMENTED | CHECK_READY,
+    [0x15]          = IMPLEMENTED,
+    [0x16]          = IMPLEMENTED | SCSI_ONLY,
+    [0x17]          = IMPLEMENTED | SCSI_ONLY,
+    [0x1a]          = IMPLEMENTED,
+    [0x1b]          = IMPLEMENTED | CHECK_READY,
+    [0x1d]          = IMPLEMENTED,
+    [0x1e]          = IMPLEMENTED | CHECK_READY,
+    [0x25]          = IMPLEMENTED | CHECK_READY,
+    [0x28]          = IMPLEMENTED | CHECK_READY,
+    [0x2a ... 0x2c] = IMPLEMENTED | CHECK_READY,
+    [0x2e ... 0x2f] = IMPLEMENTED | CHECK_READY,
+    [0x41]          = IMPLEMENTED | CHECK_READY,
+    [0x55]          = IMPLEMENTED,
+    [0x5a]          = IMPLEMENTED,
+    [0xa8]          = IMPLEMENTED | CHECK_READY,
+    [0xaa]          = IMPLEMENTED | CHECK_READY,
+    [0xac]          = IMPLEMENTED | CHECK_READY,
+    [0xae]          = IMPLEMENTED | CHECK_READY,
+    [0xaf]          = IMPLEMENTED | CHECK_READY | SCSI_ONLY
 };
 
 static uint64_t mo_mode_sense_page_flags = GPMODEP_ALL_PAGES;
 
-static const mode_sense_pages_t mo_mode_sense_pages_default =
-    // clang-format off
-{   {
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 }
-}   };
-// clang-format on
+static const mode_sense_pages_t mo_mode_sense_pages_default      = { 0 };
 
-static const mode_sense_pages_t mo_mode_sense_pages_default_scsi =
-    // clang-format off
-{   {
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 }
-}   };
-// clang-format on
+static const mode_sense_pages_t mo_mode_sense_pages_default_scsi = { 0 };
 
-static const mode_sense_pages_t mo_mode_sense_pages_changeable =
-    // clang-format off
-{   {
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 }
-}   };
+static const mode_sense_pages_t mo_mode_sense_pages_changeable   = { 0 };
 // clang-format on
 
 static void mo_command_complete(mo_t *dev);
@@ -291,32 +103,22 @@ static void mo_init(mo_t *dev);
 int mo_do_log = ENABLE_MO_LOG;
 
 static void
-mo_log(const char *fmt, ...)
+mo_log(void *priv, const char *fmt, ...)
 {
     va_list ap;
 
     if (mo_do_log) {
         va_start(ap, fmt);
-        pclog_ex(fmt, ap);
+        log_out(priv, fmt, ap);
         va_end(ap);
     }
 }
 #else
-#    define mo_log(fmt, ...)
+#    define mo_log(priv, fmt, ...)
 #endif
 
-int
-find_mo_for_channel(uint8_t channel)
-{
-    for (uint8_t i = 0; i < MO_NUM; i++) {
-        if ((mo_drives[i].bus_type == MO_BUS_ATAPI) && (mo_drives[i].ide_channel == channel))
-            return i;
-    }
-    return 0xff;
-}
-
 static int
-mo_load_abort(mo_t *dev)
+mo_load_abort(const mo_t *dev)
 {
     if (dev->drv->fp)
         fclose(dev->drv->fp);
@@ -330,105 +132,139 @@ mo_load_abort(mo_t *dev)
 int
 image_is_mdi(const char *s)
 {
-    if (!strcasecmp(path_get_extension((char *) s), "MDI"))
-        return 1;
-    else
-        return 0;
+    return !strcasecmp(path_get_extension((char *) s), "MDI");
 }
 
 int
-mo_load(mo_t *dev, char *fn)
+mo_is_empty(const uint8_t id)
 {
-    int          is_mdi;
-    uint32_t     size  = 0;
-    unsigned int found = 0;
+    const mo_t *dev = (const mo_t *) mo_drives[id].priv;
+    int         ret = 0;
 
-    if (!dev->drv) {
+    if ((dev->drv == NULL) || (dev->drv->fp == NULL))
+        ret = 1;
+
+    return ret;
+}
+
+void
+mo_load(const mo_t *dev, const char *fn, const int skip_insert)
+{
+    const int was_empty = mo_is_empty(dev->id);
+    int       ret       = 0;
+    int       offs      = 0;
+
+    if (strstr(fn, "wp://") == fn) {
+        offs                = 5;
+        dev->drv->read_only = 1;
+    }
+
+    fn += offs;
+
+    if (dev->drv == NULL)
         mo_eject(dev->id);
-        return 0;
-    }
+    else {
+        const int is_mdi = image_is_mdi(fn);
 
-    is_mdi = image_is_mdi(fn);
+        dev->drv->fp     = plat_fopen(fn, dev->drv->read_only ? "rb" : "rb+");
+        ret              = 1;
 
-    dev->drv->fp = plat_fopen(fn, dev->drv->read_only ? "rb" : "rb+");
-    if (!dev->drv->fp) {
-        if (!dev->drv->read_only) {
-            dev->drv->fp = plat_fopen(fn, "rb");
-            if (dev->drv->fp)
-                dev->drv->read_only = 1;
-            else
-                return mo_load_abort(dev);
-        } else
-            return mo_load_abort(dev);
-    }
+        if (dev->drv->fp == NULL) {
+            if (!dev->drv->read_only) {
+                dev->drv->fp = plat_fopen(fn, "rb");
+                if (dev->drv->fp == NULL)
+                    ret = mo_load_abort(dev);
+                else
+                    dev->drv->read_only = 1;
+            } else
+                ret = mo_load_abort(dev);
+        }
 
-    fseek(dev->drv->fp, 0, SEEK_END);
-    size = (uint32_t) ftell(dev->drv->fp);
+        if (ret) {
+            fseeko64(dev->drv->fp, 0, SEEK_END);
 
-    if (is_mdi) {
-        /* This is a MDI image. */
-        size -= 0x1000LL;
-        dev->drv->base = 0x1000;
-    }
+            uint64_t     size  = (uint64_t) ftello64(dev->drv->fp);
+            unsigned int found = 0;
 
-    for (uint8_t i = 0; i < KNOWN_MO_TYPES; i++) {
-        if (size == (mo_types[i].sectors * mo_types[i].bytes_per_sector)) {
-            found                 = 1;
-            dev->drv->medium_size = mo_types[i].sectors;
-            dev->drv->sector_size = mo_types[i].bytes_per_sector;
-            break;
+            if (is_mdi) {
+                /* This is a MDI image. */
+                size -= 0x1000LL;
+                dev->drv->base = 0x1000;
+            } else
+                dev->drv->base = 0;
+
+            dev->drv->supported = 0;
+
+            for (uint8_t i = 0; i < KNOWN_MO_TYPES; i++) {
+                if (size == ((uint64_t) mo_types[i].sectors * mo_types[i].bytes_per_sector)) {
+                    found                 = 1;
+                    dev->drv->medium_size = mo_types[i].sectors;
+                    dev->drv->sector_size = mo_types[i].bytes_per_sector;
+                    dev->drv->supported   = mo_drive_types[dev->drv->type].supported_media[i];
+                    break;
+                }
+            }
+
+            if (found) {
+                if (fseeko64(dev->drv->fp, (uint64_t) dev->drv->base, SEEK_SET) == -1)
+                    log_fatal(dev->log, "mo_load(): Error seeking to the beginning of "
+                              "the file\n");
+
+                strncpy(dev->drv->image_path, fn - offs, sizeof(dev->drv->image_path) - 1);
+
+                ret = 1;
+            } else
+                ret = mo_load_abort(dev);
         }
     }
 
-    if (!found)
-        return mo_load_abort(dev);
+    if (ret && !skip_insert) {
+        /* Signal media change to the emulated machine. */
+        mo_insert((mo_t *) dev);
 
-    if (fseek(dev->drv->fp, dev->drv->base, SEEK_SET) == -1)
-        fatal("mo_load(): Error seeking to the beginning of the file\n");
-
-    strncpy(dev->drv->image_path, fn, sizeof(dev->drv->image_path) - 1);
-
-    return 1;
-}
-
-void
-mo_disk_reload(mo_t *dev)
-{
-    int ret = 0;
-
-    if (strlen(dev->drv->prev_image_path) == 0)
-        return;
-    else
-        ret = mo_load(dev, dev->drv->prev_image_path);
+        /* The drive was previously empty, transition directly to UNIT ATTENTION. */
+        if (was_empty)
+            mo_insert((mo_t *) dev);
+    }
 
     if (ret)
-        dev->unit_attention = 1;
+        ui_sb_update_icon_wp(SB_MO | dev->id, dev->drv->read_only);
 }
 
 void
-mo_disk_unload(mo_t *dev)
+mo_disk_reload(const mo_t *dev)
 {
-    if (dev->drv && dev->drv->fp) {
+    if (strlen(dev->drv->prev_image_path) != 0)
+        (void) mo_load(dev, dev->drv->prev_image_path, 0);
+}
+
+static void
+mo_disk_unload(const mo_t *dev)
+{
+    if ((dev->drv != NULL) && (dev->drv->fp != NULL)) {
         fclose(dev->drv->fp);
         dev->drv->fp = NULL;
     }
 }
 
 void
-mo_disk_close(mo_t *dev)
+mo_disk_close(const mo_t *dev)
 {
-    if (dev->drv && dev->drv->fp) {
+    if ((dev->drv != NULL) && (dev->drv->fp != NULL)) {
         mo_disk_unload(dev);
 
-        memcpy(dev->drv->prev_image_path, dev->drv->image_path, sizeof(dev->drv->prev_image_path));
+        memcpy(dev->drv->prev_image_path, dev->drv->image_path,
+               sizeof(dev->drv->prev_image_path));
         memset(dev->drv->image_path, 0, sizeof(dev->drv->image_path));
 
         dev->drv->medium_size = 0;
+
+        mo_insert((mo_t *) dev);
     }
 }
 
 static void
-mo_set_callback(mo_t *dev)
+mo_set_callback(const mo_t *dev)
 {
     if (dev->drv->bus_type != MO_BUS_SCSI)
         ide_set_callback(ide_drives[dev->drv->ide_channel], dev->callback);
@@ -437,55 +273,55 @@ mo_set_callback(mo_t *dev)
 static void
 mo_init(mo_t *dev)
 {
-    if (dev->id >= MO_NUM)
-        return;
-
-    dev->requested_blocks = 1;
-    dev->sense[0]         = 0xf0;
-    dev->sense[7]         = 10;
-    dev->drv->bus_mode    = 0;
-    if (dev->drv->bus_type >= MO_BUS_ATAPI)
-        dev->drv->bus_mode |= 2;
-    if (dev->drv->bus_type < MO_BUS_SCSI)
-        dev->drv->bus_mode |= 1;
-    mo_log("MO %i: Bus type %i, bus mode %i\n", dev->id, dev->drv->bus_type, dev->drv->bus_mode);
-    if (dev->drv->bus_type < MO_BUS_SCSI) {
-        dev->tf->phase          = 1;
-        dev->tf->request_length = 0xEB14;
+    if (dev->id < MO_NUM) {
+        dev->requested_blocks = 1;
+        dev->sense[0]         = 0xf0;
+        dev->sense[7]         = 10;
+        dev->drv->bus_mode    = 0;
+        if (dev->drv->bus_type >= MO_BUS_ATAPI)
+            dev->drv->bus_mode |= 2;
+        if (dev->drv->bus_type < MO_BUS_SCSI)
+            dev->drv->bus_mode |= 1;
+        mo_log(dev->log, "Bus type %i, bus mode %i\n", dev->drv->bus_type, dev->drv->bus_mode);
+        if (dev->drv->bus_type < MO_BUS_SCSI) {
+            dev->tf->phase          = 1;
+            dev->tf->request_length = 0xEB14;
+        }
+        dev->tf->status    = READY_STAT | DSC_STAT;
+        dev->tf->pos       = 0;
+        dev->packet_status = PHASE_NONE;
+        mo_sense_key = mo_asc = mo_ascq = dev->unit_attention = dev->transition = 0;
+        mo_info      = 0x00000000;
     }
-    dev->tf->status    = READY_STAT | DSC_STAT;
-    dev->tf->pos       = 0;
-    dev->packet_status = PHASE_NONE;
-    mo_sense_key = mo_asc = mo_ascq = dev->unit_attention = 0;
 }
 
 static int
-mo_supports_pio(mo_t *dev)
+mo_supports_pio(const mo_t *dev)
 {
     return (dev->drv->bus_mode & 1);
 }
 
 static int
-mo_supports_dma(mo_t *dev)
+mo_supports_dma(const mo_t *dev)
 {
     return (dev->drv->bus_mode & 2);
 }
 
 /* Returns: 0 for none, 1 for PIO, 2 for DMA. */
 static int
-mo_current_mode(mo_t *dev)
+mo_current_mode(const mo_t *dev)
 {
     if (!mo_supports_pio(dev) && !mo_supports_dma(dev))
         return 0;
     if (mo_supports_pio(dev) && !mo_supports_dma(dev)) {
-        mo_log("MO %i: Drive does not support DMA, setting to PIO\n", dev->id);
+        mo_log(dev->log, "Drive does not support DMA, setting to PIO\n");
         return 1;
     }
     if (!mo_supports_pio(dev) && mo_supports_dma(dev))
         return 2;
     if (mo_supports_pio(dev) && mo_supports_dma(dev)) {
-        mo_log("MO %i: Drive supports both, setting to %s\n", dev->id,
-               (dev->tf->features & 1) ? "DMA" : "PIO");
+        mo_log(dev->log, "Drive supports both, setting to %s\n", (dev->tf->features & 1) ?
+               "DMA" : "PIO");
         return (dev->tf->features & 1) ? 2 : 1;
     }
 
@@ -495,21 +331,21 @@ mo_current_mode(mo_t *dev)
 static void
 mo_mode_sense_load(mo_t *dev)
 {
-    FILE *fp;
-    char  fn[512];
+    char  fn[512] = { 0 };
 
     memset(&dev->ms_pages_saved, 0, sizeof(mode_sense_pages_t));
     if (mo_drives[dev->id].bus_type == MO_BUS_SCSI)
-        memcpy(&dev->ms_pages_saved, &mo_mode_sense_pages_default_scsi, sizeof(mode_sense_pages_t));
+        memcpy(&dev->ms_pages_saved, &mo_mode_sense_pages_default_scsi,
+               sizeof(mode_sense_pages_t));
     else
-        memcpy(&dev->ms_pages_saved, &mo_mode_sense_pages_default, sizeof(mode_sense_pages_t));
+        memcpy(&dev->ms_pages_saved, &mo_mode_sense_pages_default,
+               sizeof(mode_sense_pages_t));
 
-    memset(fn, 0, 512);
     if (dev->drv->bus_type == MO_BUS_SCSI)
         sprintf(fn, "scsi_mo_%02i_mode_sense_bin", dev->id);
     else
         sprintf(fn, "mo_%02i_mode_sense_bin", dev->id);
-    fp = plat_fopen(nvr_path(fn), "rb");
+    FILE *fp = plat_fopen(nvr_path(fn), "rb");
     if (fp) {
         /* Nothing to read, not used by MO. */
         fclose(fp);
@@ -517,28 +353,27 @@ mo_mode_sense_load(mo_t *dev)
 }
 
 static void
-mo_mode_sense_save(mo_t *dev)
+mo_mode_sense_save(const mo_t *dev)
 {
-    FILE *fp;
-    char  fn[512];
+    char  fn[512] = { 0 };
 
-    memset(fn, 0, 512);
     if (dev->drv->bus_type == MO_BUS_SCSI)
         sprintf(fn, "scsi_mo_%02i_mode_sense_bin", dev->id);
     else
         sprintf(fn, "mo_%02i_mode_sense_bin", dev->id);
-    fp = plat_fopen(nvr_path(fn), "wb");
+    FILE *fp = plat_fopen(nvr_path(fn), "wb");
     if (fp) {
         /* Nothing to write, not used by MO. */
         fclose(fp);
     }
 }
 
-/*SCSI Mode Sense 6/10*/
+/* SCSI Mode Sense 6/10. */
 static uint8_t
-mo_mode_sense_read(mo_t *dev, uint8_t page_control, uint8_t page, uint8_t pos)
+mo_mode_sense_read(const mo_t *dev, const uint8_t pgctl,
+                   const uint8_t page, const uint8_t pos)
 {
-    switch (page_control) {
+    switch (pgctl) {
         case 0:
         case 3:
             return dev->ms_pages_saved.pages[page][pos];
@@ -558,14 +393,11 @@ mo_mode_sense_read(mo_t *dev, uint8_t page_control, uint8_t page, uint8_t pos)
 }
 
 static uint32_t
-mo_mode_sense(mo_t *dev, uint8_t *buf, uint32_t pos, uint8_t page, uint8_t block_descriptor_len)
+mo_mode_sense(const mo_t *dev, uint8_t *buf, uint32_t pos,
+              uint8_t page, const uint8_t block_descriptor_len)
 {
-    uint64_t pf;
-    uint8_t  page_control = (page >> 6) & 3;
-
-    pf = mo_mode_sense_page_flags;
-
-    uint8_t msplen;
+    const uint64_t pf    = mo_mode_sense_page_flags;
+    const uint8_t  pgctl = (page >> 6) & 3;
 
     page &= 0x3f;
 
@@ -583,12 +415,12 @@ mo_mode_sense(mo_t *dev, uint8_t *buf, uint32_t pos, uint8_t page, uint8_t block
     for (uint8_t i = 0; i < 0x40; i++) {
         if ((page == GPMODE_ALL_PAGES) || (page == i)) {
             if (pf & (1LL << ((uint64_t) page))) {
-                buf[pos++] = mo_mode_sense_read(dev, page_control, i, 0);
-                msplen     = mo_mode_sense_read(dev, page_control, i, 1);
-                buf[pos++] = msplen;
-                mo_log("MO %i: MODE SENSE: Page [%02X] length %i\n", dev->id, i, msplen);
+                const uint8_t msplen = mo_mode_sense_read(dev, pgctl, i, 1);
+                buf[pos++]           = mo_mode_sense_read(dev, pgctl, i, 0);
+                buf[pos++]           = msplen;
+                mo_log(dev->log, "MODE SENSE: Page [%02X] length %i\n", i, msplen);
                 for (uint8_t j = 0; j < msplen; j++)
-                    buf[pos++] = mo_mode_sense_read(dev, page_control, i, 2 + j);
+                    buf[pos++] = mo_mode_sense_read(dev, pgctl, i, 2 + j);
             }
         }
     }
@@ -604,7 +436,10 @@ mo_update_request_length(mo_t *dev, int len, int block_len)
 
     dev->max_transfer_len = dev->tf->request_length;
 
-    /* For media access commands, make sure the requested DRQ length matches the block length. */
+    /*
+       For media access commands, make sure the requested DRQ length
+       matches the block length.
+     */
     switch (dev->current_cdb[0]) {
         case 0x08:
         case 0x0a:
@@ -613,10 +448,13 @@ mo_update_request_length(mo_t *dev, int len, int block_len)
         case 0xa8:
         case 0xaa:
             /* Round it to the nearest 2048 bytes. */
-            dev->max_transfer_len = (dev->max_transfer_len >> 9) << 9;
+            dev->max_transfer_len = (dev->max_transfer_len / dev->drv->sector_size) *
+                                    dev->drv->sector_size;
 
-            /* Make sure total length is not bigger than sum of the lengths of
-               all the requested blocks. */
+            /*
+               Make sure total length is not bigger than sum of the lengths of
+               all the requested blocks.
+             */
             bt = (dev->requested_blocks * block_len);
             if (len > bt)
                 len = bt;
@@ -641,7 +479,10 @@ mo_update_request_length(mo_t *dev, int len, int block_len)
     /* If the DRQ length is odd, and the total remaining length is bigger, make sure it's even. */
     if ((dev->max_transfer_len & 1) && (dev->max_transfer_len < len))
         dev->max_transfer_len &= 0xfffe;
-    /* If the DRQ length is smaller or equal in size to the total remaining length, set it to that. */
+    /*
+       If the DRQ length is smaller or equal in size to the total remaining length,
+       set it to that.
+     */
     if (!dev->max_transfer_len)
         dev->max_transfer_len = 65534;
 
@@ -649,8 +490,6 @@ mo_update_request_length(mo_t *dev, int len, int block_len)
         dev->tf->request_length = dev->max_transfer_len = len;
     else if (len > dev->max_transfer_len)
         dev->tf->request_length = dev->max_transfer_len;
-
-    return;
 }
 
 static double
@@ -658,42 +497,30 @@ mo_bus_speed(mo_t *dev)
 {
     double ret = -1.0;
 
-    if (dev && dev->drv && (dev->drv->bus_type == MO_BUS_SCSI)) {
-        dev->callback = -1.0; /* Speed depends on SCSI controller */
-        return 0.0;
-    } else {
-        if (dev && dev->drv)
-            ret = ide_atapi_get_period(dev->drv->ide_channel);
-        if (ret == -1.0) {
-            if (dev)
-                dev->callback = -1.0;
-            return 0.0;
-        } else
-            return ret * 1000000.0;
+    if (dev && dev->drv)
+        ret = ide_atapi_get_period(dev->drv->ide_channel);
+
+    if (ret == -1.0) {
+        if (dev)
+            dev->callback = -1.0;
+        ret = 0.0;
     }
+
+    return ret;
 }
 
 static void
 mo_command_common(mo_t *dev)
 {
-    double bytes_per_second;
-    double period;
-
     dev->tf->status = BUSY_STAT;
     dev->tf->phase  = 1;
     dev->tf->pos    = 0;
     if (dev->packet_status == PHASE_COMPLETE)
         dev->callback = 0.0;
-    else {
-        if (dev->drv->bus_type == MO_BUS_SCSI) {
-            dev->callback = -1.0; /* Speed depends on SCSI controller */
-            return;
-        } else
-            bytes_per_second = mo_bus_speed(dev);
-
-        period        = 1000000.0 / bytes_per_second;
-        dev->callback = period * (double) (dev->packet_len);
-    }
+    else if (dev->drv->bus_type == MO_BUS_SCSI)
+        dev->callback = -1.0; /* Speed depends on SCSI controller */
+    else
+        dev->callback = mo_bus_speed(dev) * (double) (dev->packet_len);
 
     mo_set_callback(dev);
 }
@@ -701,7 +528,6 @@ mo_command_common(mo_t *dev)
 static void
 mo_command_complete(mo_t *dev)
 {
-    ui_sb_update_icon(SB_MO | dev->id, 0);
     dev->packet_status = PHASE_COMPLETE;
     mo_command_common(dev);
 }
@@ -734,16 +560,20 @@ mo_command_write_dma(mo_t *dev)
     mo_command_common(dev);
 }
 
-/* id = Current MO device ID;
+/*
+   dev = Pointer to current MO device;
    len = Total transfer length;
    block_len = Length of a single block (why does it matter?!);
    alloc_len = Allocated transfer length;
-   direction = Transfer direction (0 = read from host, 1 = write to host). */
+   direction = Transfer direction (0 = read from host, 1 = write to host).
+ */
 static void
-mo_data_command_finish(mo_t *dev, int len, int block_len, int alloc_len, int direction)
+mo_data_command_finish(mo_t *dev, int len, const int block_len,
+                       const int alloc_len, const int direction)
 {
-    mo_log("MO %i: Finishing command (%02X): %i, %i, %i, %i, %i\n",
-           dev->id, dev->current_cdb[0], len, block_len, alloc_len, direction, dev->tf->request_length);
+    mo_log(dev->log, "Finishing command (%02X): %i, %i, %i, %i, %i\n",
+           dev->current_cdb[0], len, block_len, alloc_len,
+           direction, dev->tf->request_length);
     dev->tf->pos = 0;
     if (alloc_len >= 0) {
         if (alloc_len < len)
@@ -765,34 +595,36 @@ mo_data_command_finish(mo_t *dev, int len, int block_len, int alloc_len, int dir
                 mo_command_write_dma(dev);
         } else {
             mo_update_request_length(dev, len, block_len);
-            if (direction == 0)
+            if ((dev->drv->bus_type != MO_BUS_SCSI) &&
+                (dev->tf->request_length == 0))
+                mo_command_complete(dev);
+            else if (direction == 0)
                 mo_command_read(dev);
             else
                 mo_command_write(dev);
         }
     }
 
-    mo_log("MO %i: Status: %i, cylinder %i, packet length: %i, position: %i, phase: %i\n",
-           dev->id, dev->packet_status, dev->tf->request_length, dev->packet_len, dev->tf->pos,
-           dev->tf->phase);
+    mo_log(dev->log, "Status: %i, cylinder %i, packet length: %i, position: %i, phase: %i\n",
+           dev->packet_status, dev->tf->request_length, dev->packet_len,
+           dev->tf->pos, dev->tf->phase);
 }
 
 static void
 mo_sense_clear(mo_t *dev, UNUSED(int command))
 {
     mo_sense_key = mo_asc = mo_ascq = 0;
+    mo_info      = 0x00000000;
 }
 
 static void
-mo_set_phase(mo_t *dev, uint8_t phase)
+mo_set_phase(const mo_t *dev, const uint8_t phase)
 {
-    uint8_t scsi_bus = (dev->drv->scsi_device_id >> 4) & 0x0f;
-    uint8_t scsi_id  = dev->drv->scsi_device_id & 0x0f;
+    const uint8_t scsi_bus = (dev->drv->scsi_device_id >> 4) & 0x0f;
+    const uint8_t scsi_id  = dev->drv->scsi_device_id & 0x0f;
 
-    if (dev->drv->bus_type != MO_BUS_SCSI)
-        return;
-
-    scsi_devices[scsi_bus][scsi_id].phase = phase;
+    if (dev->drv->bus_type == MO_BUS_SCSI)
+        scsi_devices[scsi_bus][scsi_id].phase = phase;
 }
 
 static void
@@ -800,8 +632,6 @@ mo_cmd_error(mo_t *dev)
 {
     mo_set_phase(dev, SCSI_PHASE_STATUS);
     dev->tf->error = ((mo_sense_key & 0xf) << 4) | ABRT_ERR;
-    if (dev->unit_attention)
-        dev->tf->error |= MCR_ERR;
     dev->tf->status        = READY_STAT | ERR_STAT;
     dev->tf->phase         = 3;
     dev->tf->pos           = 0;
@@ -809,39 +639,49 @@ mo_cmd_error(mo_t *dev)
     dev->callback          = 50.0 * MO_TIME;
     mo_set_callback(dev);
     ui_sb_update_icon(SB_MO | dev->id, 0);
-    mo_log("MO %i: [%02X] ERROR: %02X/%02X/%02X\n", dev->id, dev->current_cdb[0], mo_sense_key, mo_asc, mo_ascq);
+    ui_sb_update_icon_write(SB_MO | dev->id, 0);
+    mo_log(dev->log, "[%02X] ERROR: %02X/%02X/%02X\n", dev->current_cdb[0], mo_sense_key,
+           mo_asc, mo_ascq);
 }
 
 static void
 mo_unit_attention(mo_t *dev)
 {
     mo_set_phase(dev, SCSI_PHASE_STATUS);
-    dev->tf->error = (SENSE_UNIT_ATTENTION << 4) | ABRT_ERR;
-    if (dev->unit_attention)
-        dev->tf->error |= MCR_ERR;
-    dev->tf->status        = READY_STAT | ERR_STAT;
-    dev->tf->phase         = 3;
-    dev->tf->pos           = 0;
-    dev->packet_status     = PHASE_ERROR;
-    dev->callback          = 50.0 * MO_TIME;
+    dev->tf->error     = (SENSE_UNIT_ATTENTION << 4) | ABRT_ERR;
+    dev->tf->status    = READY_STAT | ERR_STAT;
+    dev->tf->phase     = 3;
+    dev->tf->pos       = 0;
+    dev->packet_status = PHASE_ERROR;
+    dev->callback      = 50.0 * MO_TIME;
     mo_set_callback(dev);
     ui_sb_update_icon(SB_MO | dev->id, 0);
-    mo_log("MO %i: UNIT ATTENTION\n", dev->id);
+    ui_sb_update_icon_write(SB_MO | dev->id, 0);
+    mo_log(dev->log, "UNIT ATTENTION\n");
 }
 
 static void
 mo_buf_alloc(mo_t *dev, uint32_t len)
 {
-    mo_log("MO %i: Allocated buffer length: %i\n", dev->id, len);
-    if (!dev->buffer)
+    mo_log(dev->log, "Allocated buffer length: %i\n", len);
+
+    if (dev->buffer == NULL) {
         dev->buffer = (uint8_t *) malloc(len);
+        dev->buffer_sz = len;
+    }
+
+    if (len > dev->buffer_sz) {
+        uint8_t *buf = (uint8_t *) realloc(dev->buffer, len);
+        dev->buffer = buf;
+        dev->buffer_sz = len;
+    }
 }
 
 static void
 mo_buf_free(mo_t *dev)
 {
     if (dev->buffer) {
-        mo_log("MO %i: Freeing buffer...\n", dev->id);
+        mo_log(dev->log, "Freeing buffer...\n");
         free(dev->buffer);
         dev->buffer = NULL;
     }
@@ -854,6 +694,10 @@ mo_bus_master_error(scsi_common_t *sc)
 
     mo_buf_free(dev);
     mo_sense_key = mo_asc = mo_ascq = 0;
+    mo_info      =  (dev->sector_pos >> 24)        |
+                   ((dev->sector_pos >> 16) <<  8) |
+                   ((dev->sector_pos >> 8)  << 16) |
+                   ( dev->sector_pos        << 24);
     mo_cmd_error(dev);
 }
 
@@ -863,6 +707,7 @@ mo_not_ready(mo_t *dev)
     mo_sense_key = SENSE_NOT_READY;
     mo_asc       = ASC_MEDIUM_NOT_PRESENT;
     mo_ascq      = 0;
+    mo_info      = 0x00000000;
     mo_cmd_error(dev);
 }
 
@@ -872,24 +717,56 @@ mo_write_protected(mo_t *dev)
     mo_sense_key = SENSE_UNIT_ATTENTION;
     mo_asc       = ASC_WRITE_PROTECTED;
     mo_ascq      = 0;
+    mo_info      =  (dev->sector_pos >> 24)        |
+                   ((dev->sector_pos >> 16) <<  8) |
+                   ((dev->sector_pos >> 8)  << 16) |
+                   ( dev->sector_pos        << 24);
     mo_cmd_error(dev);
 }
 
 static void
-mo_invalid_lun(mo_t *dev)
+mo_write_error(mo_t *dev)
+{
+    mo_sense_key = SENSE_MEDIUM_ERROR;
+    mo_asc       = ASC_WRITE_ERROR;
+    mo_ascq      = 0;
+    mo_info      =  (dev->sector_pos >> 24)        |
+                   ((dev->sector_pos >> 16) <<  8) |
+                   ((dev->sector_pos >> 8)  << 16) |
+                   ( dev->sector_pos        << 24);
+    mo_cmd_error(dev);
+}
+
+static void
+mo_read_error(mo_t *dev)
+{
+    mo_sense_key = SENSE_MEDIUM_ERROR;
+    mo_asc       = ASC_UNRECOVERED_READ_ERROR;
+    mo_ascq      = 0;
+    mo_info      =  (dev->sector_pos >> 24)        |
+                   ((dev->sector_pos >> 16) <<  8) |
+                   ((dev->sector_pos >> 8)  << 16) |
+                   ( dev->sector_pos        << 24);
+    mo_cmd_error(dev);
+}
+
+static void
+mo_invalid_lun(mo_t *dev, const uint8_t lun)
 {
     mo_sense_key = SENSE_ILLEGAL_REQUEST;
     mo_asc       = ASC_INV_LUN;
     mo_ascq      = 0;
+    mo_info      = lun << 24;
     mo_cmd_error(dev);
 }
 
 static void
-mo_illegal_opcode(mo_t *dev)
+mo_illegal_opcode(mo_t *dev, const uint8_t opcode)
 {
     mo_sense_key = SENSE_ILLEGAL_REQUEST;
     mo_asc       = ASC_ILLEGAL_OPCODE;
     mo_ascq      = 0;
+    mo_info      = opcode << 24;
     mo_cmd_error(dev);
 }
 
@@ -899,127 +776,177 @@ mo_lba_out_of_range(mo_t *dev)
     mo_sense_key = SENSE_ILLEGAL_REQUEST;
     mo_asc       = ASC_LBA_OUT_OF_RANGE;
     mo_ascq      = 0;
+    mo_info      =  (dev->sector_pos >> 24)        |
+                   ((dev->sector_pos >> 16) <<  8) |
+                   ((dev->sector_pos >> 8)  << 16) |
+                   ( dev->sector_pos        << 24);
     mo_cmd_error(dev);
 }
 
 static void
-mo_invalid_field(mo_t *dev)
+mo_invalid_field(mo_t *dev, const uint32_t field)
 {
     mo_sense_key = SENSE_ILLEGAL_REQUEST;
     mo_asc       = ASC_INV_FIELD_IN_CMD_PACKET;
     mo_ascq      = 0;
+    mo_info      =  (field >> 24)        |
+                   ((field >> 16) <<  8) |
+                   ((field >> 8)  << 16) |
+                   ( field        << 24);
     mo_cmd_error(dev);
     dev->tf->status = 0x53;
 }
 
 static void
-mo_invalid_field_pl(mo_t *dev)
+mo_invalid_field_pl(mo_t *dev, const uint32_t field)
 {
     mo_sense_key = SENSE_ILLEGAL_REQUEST;
     mo_asc       = ASC_INV_FIELD_IN_PARAMETER_LIST;
     mo_ascq      = 0;
+    mo_info      =  (field >> 24)        |
+                   ((field >> 16) <<  8) |
+                   ((field >> 8)  << 16) |
+                   ( field        << 24);
     mo_cmd_error(dev);
     dev->tf->status = 0x53;
 }
 
 static int
-mo_blocks(mo_t *dev, int32_t *len, UNUSED(int first_batch), int out)
+mo_blocks(mo_t *dev, int32_t *len, const int out)
 {
-    *len = 0;
+    int ret = 1;
+    *len    = 0;
 
-    if (!dev->sector_len) {
-        mo_command_complete(dev);
-        return -1;
-    }
+    if (dev->sector_len > 0) {
+        mo_log(dev->log, "%sing %i blocks starting from %i...\n", out ? "Writ" : "Read",
+               dev->requested_blocks, dev->sector_pos);
 
-    mo_log("%sing %i blocks starting from %i...\n", out ? "Writ" : "Read", dev->requested_blocks, dev->sector_pos);
-
-    if (dev->sector_pos >= dev->drv->medium_size) {
-        mo_log("MO %i: Trying to %s beyond the end of disk\n", dev->id, out ? "write" : "read");
-        mo_lba_out_of_range(dev);
-        return 0;
-    }
-
-    *len = dev->requested_blocks * dev->drv->sector_size;
-
-    for (int i = 0; i < dev->requested_blocks; i++) {
-        if (fseek(dev->drv->fp, dev->drv->base + (dev->sector_pos * dev->drv->sector_size) + (i * dev->drv->sector_size), SEEK_SET) == 1)
-            break;
-
-        if (feof(dev->drv->fp))
-            break;
-
-        if (out) {
-            if (fwrite(dev->buffer + (i * dev->drv->sector_size), 1, dev->drv->sector_size, dev->drv->fp) != dev->drv->sector_size)
-                fatal("mo_blocks(): Error writing data\n");
+        if (!dev->drv->supported) {
+            mo_log(dev->log, "Trying to %s an unsupported medium\n",
+                   out ? "write" : "read");
+            out ? mo_write_error(dev) : mo_read_error(dev);
+            ret = 0;
+        } else if (dev->sector_pos >= dev->drv->medium_size) {
+            mo_log(dev->log, "Trying to %s beyond the end of disk\n",
+                   out ? "write" : "read");
+            mo_lba_out_of_range(dev);
+            ret = 0;
         } else {
-            if (fread(dev->buffer + (i * dev->drv->sector_size), 1, dev->drv->sector_size, dev->drv->fp) != dev->drv->sector_size)
-                fatal("mo_blocks(): Error reading data\n");
+            *len    = dev->requested_blocks * dev->drv->sector_size;
+
+            for (int i = 0; i < dev->requested_blocks; i++) {
+                if (fseeko64(dev->drv->fp, (uint64_t) dev->drv->base +
+                             (uint64_t) (dev->sector_pos * dev->drv->sector_size),
+                    SEEK_SET) == -1) {
+                    if (out)
+                        mo_write_error(dev);
+                    else
+                        mo_read_error(dev);
+                    ret = -1;
+                } else {
+                    if (feof(dev->drv->fp))
+                        break;
+
+                    if (out) {
+                        if (fwrite(dev->buffer + (i * dev->drv->sector_size), 1,
+                                   dev->drv->sector_size, dev->drv->fp) != dev->drv->sector_size) {
+                            mo_log(dev->log, "mo_blocks(): Error writing data\n");
+                            mo_write_error(dev);
+                            ret = -1;
+                        } else
+                            fflush(dev->drv->fp);
+                    } else if (fread(dev->buffer + (i * dev->drv->sector_size), 1,
+                                     dev->drv->sector_size, dev->drv->fp) != dev->drv->sector_size) {
+                        mo_log(dev->log, "mo_blocks(): Error reading data\n");
+                        mo_read_error(dev);
+                        ret = -1;
+                    }
+                }
+
+                if (ret == -1)
+                    break;
+
+                dev->sector_pos++;
+            }
+
+            if (ret == 1) {
+                mo_log(dev->log, "%s %i bytes of blocks...\n", out ? "Written" :
+                       "Read", *len);
+
+                dev->sector_len -= dev->requested_blocks;
+            }
         }
+    } else {
+        mo_command_complete(dev);
+        ret = 0;
     }
 
-    mo_log("%s %i bytes of blocks...\n", out ? "Written" : "Read", *len);
-
-    dev->sector_pos += dev->requested_blocks;
-    dev->sector_len -= dev->requested_blocks;
-
-    return 1;
+    return ret;
 }
 
 void
 mo_insert(mo_t *dev)
 {
-    dev->unit_attention = 1;
+    if ((dev != NULL) && (dev->drv != NULL)) {
+        if (dev->drv->fp == NULL) {
+            dev->unit_attention = 0;
+            dev->transition     = 0;
+            mo_log(dev->log, "Media removal\n");
+        } else if (dev->transition) {
+            dev->unit_attention = 1;
+            /* Turn off the medium changed status. */
+            dev->transition     = 0;
+            mo_log(dev->log, "Media insert\n");
+        } else {
+            dev->unit_attention = 0;
+            dev->transition     = 1;
+            mo_log(dev->log, "Media transition\n");
+        }
+    }
 }
 
 void
 mo_format(mo_t *dev)
 {
-    long size;
     int  ret;
     int  fd;
 
-    mo_log("MO %i: Formatting media...\n", dev->id);
+    mo_log(dev->log, "Formatting media...\n");
 
-    fseek(dev->drv->fp, 0, SEEK_END);
-    size = ftell(dev->drv->fp);
+    fseeko64(dev->drv->fp, 0, SEEK_END);
+    int64_t size = ftello64(dev->drv->fp);
 
 #ifdef _WIN32
-    HANDLE        fh;
     LARGE_INTEGER liSize;
 
-    fd = _fileno(dev->drv->fp);
-    fh = (HANDLE) _get_osfhandle(fd);
+    fd              = _fileno(dev->drv->fp);
+    const HANDLE fh = (HANDLE) _get_osfhandle(fd);
 
     liSize.QuadPart = 0;
 
     ret = (int) SetFilePointerEx(fh, liSize, NULL, FILE_BEGIN);
 
-    if (!ret) {
-        mo_log("MO %i: Failed seek to start of image file\n", dev->id);
-        return;
-    }
+    if (ret) {
+        ret = (int) SetEndOfFile(fh);
 
-    ret = (int) SetEndOfFile(fh);
+        if (ret) {
+            liSize.QuadPart = size;
+            ret             = (int) SetFilePointerEx(fh, liSize, NULL, FILE_BEGIN);
 
-    if (!ret) {
-        mo_log("MO %i: Failed to truncate image file to 0\n", dev->id);
-        return;
-    }
+            if (ret) {
+                ret = (int) SetEndOfFile(fh);
 
-    liSize.QuadPart = size;
-    ret             = (int) SetFilePointerEx(fh, liSize, NULL, FILE_BEGIN);
-
-    if (!ret) {
-        mo_log("MO %i: Failed seek to end of image file\n", dev->id);
-        return;
-    }
-
-    ret = (int) SetEndOfFile(fh);
-
-    if (!ret) {
-        mo_log("MO %i: Failed to truncate image file to %llu\n", dev->id, size);
-        return;
+                if (!ret) {
+                    mo_log(dev->log, "Failed to truncate image file to %llu\n", size);
+                }
+            } else {
+                mo_log(dev->log, "Failed seek to end of image file\n");
+            }
+        } else {
+            mo_log(dev->log, "Failed to truncate image file to 0\n");
+        }
+    } else {
+        mo_log(dev->log, "Failed seek to start of image file\n");
     }
 #else
     fd = fileno(dev->drv->fp);
@@ -1027,15 +954,13 @@ mo_format(mo_t *dev)
     ret = ftruncate(fd, 0);
 
     if (ret) {
-        mo_log("MO %i: Failed to truncate image file to 0\n", dev->id);
-        return;
-    }
+        mo_log(dev->log, "Failed to truncate image file to 0\n");
+    } else {
+        ret = ftruncate(fd, size);
 
-    ret = ftruncate(fd, size);
-
-    if (ret) {
-        mo_log("MO %i: Failed to truncate image file to %llu", dev->id, size);
-        return;
+        if (ret) {
+            mo_log(dev->log, "Failed to truncate image file to %llu", size);
+        }
     }
 #endif
 }
@@ -1050,10 +975,15 @@ mo_erase(mo_t *dev)
         return -1;
     }
 
-    mo_log("MO %i: Erasing %i blocks starting from %i...\n", dev->id, dev->sector_len, dev->sector_pos);
+    mo_log(dev->log, "Erasing %i blocks starting from %i...\n",
+           dev->sector_len, dev->sector_pos);
 
-    if (dev->sector_pos >= dev->drv->medium_size) {
-        mo_log("MO %i: Trying to erase beyond the end of disk\n", dev->id);
+    if (!dev->drv->supported) {
+        mo_log(dev->log, "Trying to erase an unsupported medium\n");
+        mo_write_error(dev);
+        return 0;
+    } else if (dev->sector_pos >= dev->drv->medium_size) {
+        mo_log(dev->log, "Trying to erase beyond the end of disk\n");
         mo_lba_out_of_range(dev);
         return 0;
     }
@@ -1061,7 +991,9 @@ mo_erase(mo_t *dev)
     mo_buf_alloc(dev, dev->drv->sector_size);
     memset(dev->buffer, 0, dev->drv->sector_size);
 
-    fseek(dev->drv->fp, dev->drv->base + (dev->sector_pos * dev->drv->sector_size), SEEK_SET);
+    fseeko64(dev->drv->fp, dev->drv->base +
+             ((uint64_t) dev->sector_pos * dev->drv->sector_size),
+             SEEK_SET);
 
     for (i = 0; i < dev->requested_blocks; i++) {
         if (feof(dev->drv->fp))
@@ -1070,7 +1002,9 @@ mo_erase(mo_t *dev)
         fwrite(dev->buffer, 1, dev->drv->sector_size, dev->drv->fp);
     }
 
-    mo_log("MO %i: Erased %i bytes of blocks...\n", dev->id, i * dev->drv->sector_size);
+    fflush(dev->drv->fp);
+
+    mo_log(dev->log, "Erased %i bytes of blocks...\n", i * dev->drv->sector_size);
 
     dev->sector_pos += i;
     dev->sector_len -= i;
@@ -1078,96 +1012,110 @@ mo_erase(mo_t *dev)
     return 1;
 }
 
-/*SCSI Sense Initialization*/
-void
-mo_sense_code_ok(mo_t *dev)
-{
-    mo_sense_key = SENSE_NONE;
-    mo_asc       = 0;
-    mo_ascq      = 0;
-}
-
 static int
-mo_pre_execution_check(mo_t *dev, uint8_t *cdb)
+mo_pre_execution_check(mo_t *dev, const uint8_t *cdb)
 {
-    int ready = 0;
+    int ready;
 
-    if ((cdb[0] != GPCMD_REQUEST_SENSE) && (dev->cur_lun == SCSI_LUN_USE_CDB) && (cdb[1] & 0xe0)) {
-        mo_log("MO %i: Attempting to execute a unknown command targeted at SCSI LUN %i\n", dev->id,
+    if ((cdb[0] != GPCMD_REQUEST_SENSE) && (dev->cur_lun == SCSI_LUN_USE_CDB) &&
+        (cdb[1] & 0xe0)) {
+        mo_log(dev->log, "Attempting to execute a unknown command targeted at SCSI LUN %i\n",
                ((dev->tf->request_length >> 5) & 7));
-        mo_invalid_lun(dev);
+        mo_invalid_lun(dev, cdb[1] >> 5);
         return 0;
     }
 
     if (!(mo_command_flags[cdb[0]] & IMPLEMENTED)) {
-        mo_log("MO %i: Attempting to execute unknown command %02X over %s\n", dev->id, cdb[0],
-               (dev->drv->bus_type == MO_BUS_SCSI) ? "SCSI" : "ATAPI");
+        mo_log(dev->log, "Attempting to execute unknown command %02X over %s\n",
+               cdb[0], (dev->drv->bus_type == MO_BUS_SCSI) ?
+               "SCSI" : "ATAPI");
 
-        mo_illegal_opcode(dev);
+        mo_illegal_opcode(dev, cdb[0]);
         return 0;
     }
 
-    if ((dev->drv->bus_type < MO_BUS_SCSI) && (mo_command_flags[cdb[0]] & SCSI_ONLY)) {
-        mo_log("MO %i: Attempting to execute SCSI-only command %02X over ATAPI\n", dev->id, cdb[0]);
-        mo_illegal_opcode(dev);
+    if ((dev->drv->bus_type < MO_BUS_SCSI) &&
+        (mo_command_flags[cdb[0]] & SCSI_ONLY)) {
+        mo_log(dev->log, "Attempting to execute SCSI-only command %02X "
+               "over ATAPI\n", cdb[0]);
+        mo_illegal_opcode(dev, cdb[0]);
         return 0;
     }
 
-    if ((dev->drv->bus_type == MO_BUS_SCSI) && (mo_command_flags[cdb[0]] & ATAPI_ONLY)) {
-        mo_log("MO %i: Attempting to execute ATAPI-only command %02X over SCSI\n", dev->id, cdb[0]);
-        mo_illegal_opcode(dev);
+    if ((dev->drv->bus_type == MO_BUS_SCSI) &&
+        (mo_command_flags[cdb[0]] & ATAPI_ONLY)) {
+        mo_log(dev->log, "Attempting to execute ATAPI-only command %02X "
+               "over SCSI\n", cdb[0]);
+        mo_illegal_opcode(dev, cdb[0]);
         return 0;
     }
 
-    ready = (dev->drv->fp != NULL);
+    if (dev->transition) {
+        if ((cdb[0] == GPCMD_TEST_UNIT_READY) || (cdb[0] == GPCMD_REQUEST_SENSE))
+            ready = 0;
+        else {
+            if (!(mo_command_flags[cdb[0]] & ALLOW_UA)) {
+                mo_log(dev->log, "(ext_medium_changed != 0): mo_insert()\n");
+                mo_insert((void *) dev);
+            }
 
-    /* If the drive is not ready, there is no reason to keep the
+            ready = (dev->drv->fp != NULL);
+        }
+    } else
+        ready = (dev->drv->fp != NULL);
+
+    /*
+       If the drive is not ready, there is no reason to keep the
        UNIT ATTENTION condition present, as we only use it to mark
-       disc changes. */
-    if (!ready && dev->unit_attention)
+       disc changes.
+     */
+    if (!ready && (dev->unit_attention > 0))
         dev->unit_attention = 0;
 
-    /* If the UNIT ATTENTION condition is set and the command does not allow
-       execution under it, error out and report the condition. */
+    /*
+       If the UNIT ATTENTION condition is set and the command does not allow
+       execution under it, error out and report the condition.
+     */
     if (dev->unit_attention == 1) {
-        /* Only increment the unit attention phase if the command can not pass through it. */
+        /*
+           Only increment the unit attention phase if the command can
+           not pass through it.
+         */
         if (!(mo_command_flags[cdb[0]] & ALLOW_UA)) {
-            /* mo_log("MO %i: Unit attention now 2\n", dev->id); */
-            dev->unit_attention = 2;
-            mo_log("MO %i: UNIT ATTENTION: Command %02X not allowed to pass through\n", dev->id, cdb[0]);
+            mo_log(dev->log, "Unit attention now 2\n");
+            dev->unit_attention++;
+            mo_log(dev->log, "UNIT ATTENTION: Command %02X not allowed to "
+                   "pass through\n", cdb[0]);
             mo_unit_attention(dev);
             return 0;
         }
     } else if (dev->unit_attention == 2) {
         if (cdb[0] != GPCMD_REQUEST_SENSE) {
-            /* mo_log("MO %i: Unit attention now 0\n", dev->id); */
+            mo_log(dev->log, "MO %i: Unit attention now 0\n");
             dev->unit_attention = 0;
         }
     }
 
-    /* Unless the command is REQUEST SENSE, clear the sense. This will *NOT*
-       the UNIT ATTENTION condition if it's set. */
+    /*
+       Unless the command is REQUEST SENSE, clear the sense. This will *NOT* clear
+       the UNIT ATTENTION condition if it's set.
+     */
     if (cdb[0] != GPCMD_REQUEST_SENSE)
         mo_sense_clear(dev, cdb[0]);
 
-    /* Next it's time for NOT READY. */
-    if ((mo_command_flags[cdb[0]] & CHECK_READY) && !ready) {
-        mo_log("MO %i: Not ready (%02X)\n", dev->id, cdb[0]);
+    if (!ready && (mo_command_flags[cdb[0]] & CHECK_READY)) {
+        mo_log(dev->log, "Not ready (%02X)\n", cdb[0]);
         mo_not_ready(dev);
         return 0;
     }
 
-    mo_log("MO %i: Continuing with command %02X\n", dev->id, cdb[0]);
-
+    mo_log(dev->log, "Continuing with command %02X\n", cdb[0]);
     return 1;
 }
 
 static void
 mo_seek(mo_t *dev, uint32_t pos)
 {
-#if 0
-    mo_log("MO %i: Seek %08X\n", dev->id, pos);
-#endif
     dev->sector_pos = pos;
 }
 
@@ -1188,28 +1136,30 @@ mo_reset(scsi_common_t *sc)
     dev->callback           = 0.0;
     mo_set_callback(dev);
     dev->tf->phase          = 1;
-    dev->tf->request_length = 0xEB14;
+    dev->tf->request_length = 0xeb14;
     dev->packet_status      = PHASE_NONE;
-    dev->unit_attention     = 0;
     dev->cur_lun            = SCSI_LUN_USE_CDB;
+    mo_sense_key = mo_asc = mo_ascq = dev->unit_attention = dev->transition = 0;
+    mo_info      = 0x00000000;
 }
 
 static void
-mo_request_sense(mo_t *dev, uint8_t *buffer, uint8_t alloc_length, int desc)
+mo_request_sense(mo_t *dev, uint8_t *buffer, const uint8_t alloc_length, const int desc)
 {
-    /*Will return 18 bytes of 0*/
+    /* Will return 18 bytes of 0. */
     if (alloc_length != 0) {
-        memset(buffer, 0, alloc_length);
-        if (!desc)
-            memcpy(buffer, dev->sense, alloc_length);
-        else {
+        memset(buffer, 0x00, alloc_length);
+        if (desc) {
             buffer[1] = mo_sense_key;
             buffer[2] = mo_asc;
             buffer[3] = mo_ascq;
-        }
+        } else
+            memcpy(buffer, dev->sense, alloc_length);
     }
 
-    buffer[0] = desc ? 0x72 : 0x70;
+    buffer[0] = desc ? 0x72 : 0xf0;
+    if (!desc)
+        buffer[7] = 10;
 
     if (dev->unit_attention && (mo_sense_key == 0)) {
         buffer[desc ? 1 : 2]  = SENSE_UNIT_ATTENTION;
@@ -1217,25 +1167,27 @@ mo_request_sense(mo_t *dev, uint8_t *buffer, uint8_t alloc_length, int desc)
         buffer[desc ? 3 : 13] = 0;
     }
 
-    mo_log("MO %i: Reporting sense: %02X %02X %02X\n", dev->id, buffer[2], buffer[12], buffer[13]);
+    mo_log(dev->log, "Reporting sense: %02X %02X %02X\n", buffer[2], buffer[12], buffer[13]);
 
     if (buffer[desc ? 1 : 2] == SENSE_UNIT_ATTENTION) {
-        /* If the last remaining sense is unit attention, clear
-           that condition. */
+        /* If the last remaining sense is unit attention, clear that condition. */
         dev->unit_attention = 0;
     }
 
     /* Clear the sense stuff as per the spec. */
     mo_sense_clear(dev, GPCMD_REQUEST_SENSE);
+
+    if (dev->transition) {
+        mo_log(dev->log, "MO_TRANSITION: mo_insert()\n");
+        mo_insert((void *) dev);
+    }
 }
 
 static void
 mo_request_sense_for_scsi(scsi_common_t *sc, uint8_t *buffer, uint8_t alloc_length)
 {
-    mo_t *dev   = (mo_t *) sc;
-    int   ready = 0;
-
-    ready = (dev->drv->fp != NULL);
+    mo_t      *dev   = (mo_t *) sc;
+    const int  ready = (dev->drv->fp != NULL);
 
     if (!ready && dev->unit_attention) {
         /* If the drive is not ready, there is no reason to keep the
@@ -1245,12 +1197,11 @@ mo_request_sense_for_scsi(scsi_common_t *sc, uint8_t *buffer, uint8_t alloc_leng
     }
 
     /* Do *NOT* advance the unit attention phase. */
-
     mo_request_sense(dev, buffer, alloc_length, 0);
 }
 
 static void
-mo_set_buf_len(mo_t *dev, int32_t *BufLen, int32_t *src_len)
+mo_set_buf_len(const mo_t *dev, int32_t *BufLen, int32_t *src_len)
 {
     if (dev->drv->bus_type == MO_BUS_SCSI) {
         if (*BufLen == -1)
@@ -1259,29 +1210,28 @@ mo_set_buf_len(mo_t *dev, int32_t *BufLen, int32_t *src_len)
             *BufLen  = MIN(*src_len, *BufLen);
             *src_len = *BufLen;
         }
-        mo_log("MO %i: Actual transfer length: %i\n", dev->id, *BufLen);
+        mo_log(dev->log, "Actual transfer length: %i\n", *BufLen);
     }
 }
 
 static void
-mo_command(scsi_common_t *sc, uint8_t *cdb)
+mo_command(scsi_common_t *sc, const uint8_t *cdb)
 {
-    mo_t    *dev = (mo_t *) sc;
-    int      pos = 0;
-    int      block_desc = 0;
-    int      ret;
-    int32_t  len;
-    int32_t  max_len;
-    int32_t  alloc_length;
-    int      size_idx;
-    int      idx = 0;
-    unsigned preamble_len;
-    char     device_identify[9] = { '8', '6', 'B', '_', 'M', 'O', '0', '0', 0 };
-    int32_t  blen               = 0;
-    int32_t *BufLen;
-    uint32_t previous_pos = 0;
-    uint8_t  scsi_bus     = (dev->drv->scsi_device_id >> 4) & 0x0f;
-    uint8_t  scsi_id      = dev->drv->scsi_device_id & 0x0f;
+    mo_t *        dev                = (mo_t *) sc;
+    char          device_identify[9] = { '8', '6', 'B', '_', 'M', 'O', '0', '0', 0 };
+    uint32_t      previous_pos       = 0;
+    int32_t       blen               = 0;
+    const uint8_t scsi_bus           = (dev->drv->scsi_device_id >> 4) & 0x0f;
+    const uint8_t scsi_id            = dev->drv->scsi_device_id & 0x0f;
+    int           pos                = 0;
+    int           idx                = 0;
+    int32_t       len;
+    int32_t       max_len;
+    int32_t       alloc_length;
+    unsigned      preamble_len;
+    int           block_desc;
+    int           size_idx;
+    int32_t *     BufLen;
 
     if (dev->drv->bus_type == MO_BUS_SCSI) {
         BufLen          = &scsi_devices[scsi_bus][scsi_id].buffer_length;
@@ -1299,11 +1249,13 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
     memcpy(dev->current_cdb, cdb, 12);
 
     if (cdb[0] != 0) {
-        mo_log("MO %i: Command 0x%02X, Sense Key %02X, Asc %02X, Ascq %02X, Unit attention: %i\n",
-               dev->id, cdb[0], mo_sense_key, mo_asc, mo_ascq, dev->unit_attention);
-        mo_log("MO %i: Request length: %04X\n", dev->id, dev->tf->request_length);
+        mo_log(dev->log, "Command 0x%02X, Sense Key %02X, Asc %02X, Ascq %02X, "
+               "Unit attention: %i\n",
+               cdb[0], mo_sense_key, mo_asc, mo_ascq, dev->unit_attention);
+        mo_log(dev->log, "Request length: %04X\n", dev->tf->request_length);
 
-        mo_log("MO %i: CDB: %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", dev->id,
+        mo_log(dev->log, "CDB: %02X %02X %02X %02X %02X %02X %02X %02X "
+               "%02X %02X %02X %02X\n",
                cdb[0], cdb[1], cdb[2], cdb[3], cdb[4], cdb[5], cdb[6], cdb[7],
                cdb[8], cdb[9], cdb[10], cdb[11]);
     }
@@ -1312,14 +1264,17 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
 
     mo_set_phase(dev, SCSI_PHASE_STATUS);
 
-    /* This handles the Not Ready/Unit Attention check if it has to be handled at this point. */
+    /*
+       This handles the Not Ready/Unit Attention check if it has to be
+       handled at this point.
+     */
     if (mo_pre_execution_check(dev, cdb) == 0)
         return;
 
     switch (cdb[0]) {
         case GPCMD_SEND_DIAGNOSTIC:
             if (!(cdb[1] & (1 << 2))) {
-                mo_invalid_field(dev);
+                mo_invalid_field(dev, cdb[1]);
                 return;
             }
             fallthrough;
@@ -1348,8 +1303,6 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
             break;
 
         case GPCMD_REQUEST_SENSE:
-            /* If there's a unit attention condition and there's a buffered not ready, a standalone REQUEST SENSE
-               should forget about the not ready, and report unit attention straight away. */
             mo_set_phase(dev, SCSI_PHASE_DATA_IN);
             max_len = cdb[4];
 
@@ -1390,83 +1343,82 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
             switch (cdb[0]) {
                 case GPCMD_READ_6:
                     dev->sector_len = cdb[4];
-                    dev->sector_pos = ((((uint32_t) cdb[1]) & 0x1f) << 16) | (((uint32_t) cdb[2]) << 8) | ((uint32_t) cdb[3]);
+                    dev->sector_pos = ((((uint32_t) cdb[1]) & 0x1f) << 16) |
+                                      (((uint32_t) cdb[2]) << 8) | ((uint32_t) cdb[3]);
                     if (dev->sector_len == 0)
                         dev->sector_len = 256;
-                    mo_log("MO %i: Length: %i, LBA: %i\n", dev->id, dev->sector_len, dev->sector_pos);
+                    mo_log(dev->log, "Length: %i, LBA: %i\n", dev->sector_len, dev->sector_pos);
                     break;
                 case GPCMD_READ_10:
                     dev->sector_len = (cdb[7] << 8) | cdb[8];
-                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
-                    mo_log("MO %i: Length: %i, LBA: %i\n", dev->id, dev->sector_len, dev->sector_pos);
+                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) |
+                                      (cdb[4] << 8) | cdb[5];
+                    mo_log(dev->log, "Length: %i, LBA: %i\n", dev->sector_len, dev->sector_pos);
                     break;
                 case GPCMD_READ_12:
-                    dev->sector_len = (((uint32_t) cdb[6]) << 24) | (((uint32_t) cdb[7]) << 16) | (((uint32_t) cdb[8]) << 8) | ((uint32_t) cdb[9]);
-                    dev->sector_pos = (((uint32_t) cdb[2]) << 24) | (((uint32_t) cdb[3]) << 16) | (((uint32_t) cdb[4]) << 8) | ((uint32_t) cdb[5]);
-                    mo_log("MO %i: Length: %i, LBA: %i\n", dev->id, dev->sector_len, dev->sector_pos);
+                    dev->sector_len = (((uint32_t) cdb[6]) << 24) |
+                                      (((uint32_t) cdb[7]) << 16) |
+                                      (((uint32_t) cdb[8]) << 8) | ((uint32_t) cdb[9]);
+                    dev->sector_pos = (((uint32_t) cdb[2]) << 24) |
+                                      (((uint32_t) cdb[3]) << 16) |
+                                      (((uint32_t) cdb[4]) << 8) | ((uint32_t) cdb[5]);
+                    mo_log(dev->log, "Length: %i, LBA: %i\n", dev->sector_len, dev->sector_pos);
                     break;
 
                 default:
                     break;
             }
 
-            if (!dev->sector_len) {
+            if (dev->sector_len) {
+                max_len               = dev->sector_len;
+                dev->requested_blocks = max_len;
+
+                dev->packet_len = max_len * alloc_length;
+                mo_buf_alloc(dev, dev->packet_len);
+
+                const int ret = mo_blocks(dev, &alloc_length, 0);
+                alloc_length  = dev->requested_blocks * dev->drv->sector_size;
+
+                if (ret > 0) {
+                    dev->requested_blocks = max_len;
+                    dev->packet_len       = alloc_length;
+
+                    mo_set_buf_len(dev, BufLen, (int32_t *) &dev->packet_len);
+
+                    mo_data_command_finish(dev, alloc_length, dev->drv->sector_size, alloc_length, 0);
+
+                    if (dev->packet_status != PHASE_COMPLETE)
+                        ui_sb_update_icon(SB_MO | dev->id, 1);
+                    else
+                        ui_sb_update_icon(SB_MO | dev->id, 0);
+                } else {
+                    mo_set_phase(dev, SCSI_PHASE_STATUS);
+                    dev->packet_status = (ret < 0) ? PHASE_ERROR : PHASE_COMPLETE;
+                    dev->callback      = 20.0 * MO_TIME;
+                    mo_set_callback(dev);
+                    mo_buf_free(dev);
+                }
+            } else {
                 mo_set_phase(dev, SCSI_PHASE_STATUS);
-                /* mo_log("MO %i: All done - callback set\n", dev->id); */
+                /* mo_log(dev->log, "All done - callback set\n"); */
                 dev->packet_status = PHASE_COMPLETE;
                 dev->callback      = 20.0 * MO_TIME;
                 mo_set_callback(dev);
-                break;
             }
-
-            max_len               = dev->sector_len;
-            dev->requested_blocks = max_len; /* If we're reading all blocks in one go for DMA, why not also for PIO, it should NOT
-                                                matter anyway, this step should be identical and only the way the read dat is
-                                                transferred to the host should be different. */
-
-            dev->packet_len = max_len * alloc_length;
-            mo_buf_alloc(dev, dev->packet_len);
-
-            ret = mo_blocks(dev, &alloc_length, 1, 0);
-            if (ret <= 0) {
-                mo_set_phase(dev, SCSI_PHASE_STATUS);
-                dev->packet_status = PHASE_COMPLETE;
-                dev->callback      = 20.0 * MO_TIME;
-                mo_set_callback(dev);
-                mo_buf_free(dev);
-                return;
-            }
-
-            dev->requested_blocks = max_len;
-            dev->packet_len       = alloc_length;
-
-            mo_set_buf_len(dev, BufLen, (int32_t *) &dev->packet_len);
-
-            mo_data_command_finish(dev, alloc_length, dev->drv->sector_size, alloc_length, 0);
-
-            if (dev->packet_status != PHASE_COMPLETE)
-                ui_sb_update_icon(SB_MO | dev->id, 1);
-            else
-                ui_sb_update_icon(SB_MO | dev->id, 0);
-            return;
+            break;
 
         case GPCMD_VERIFY_6:
         case GPCMD_VERIFY_10:
         case GPCMD_VERIFY_12:
-            /* Data and blank verification cannot be set at the same time */
-            if ((cdb[1] & 2) && (cdb[1] & 4)) {
-                mo_invalid_field(dev);
-                return;
-            }
-            if (!(cdb[1] & 2) || (cdb[1] & 4)) {
+            if (!(cdb[1] & 2)) {
                 mo_set_phase(dev, SCSI_PHASE_STATUS);
                 mo_command_complete(dev);
                 break;
+            } else if (!dev->drv->supported) {
+                mo_read_error(dev);
+                break;
             }
-            /*TODO: Implement*/
-            mo_invalid_field(dev);
-            return;
-
+            fallthrough;
         case GPCMD_WRITE_6:
         case GPCMD_WRITE_10:
         case GPCMD_WRITE_AND_VERIFY_10:
@@ -1475,73 +1427,113 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
             mo_set_phase(dev, SCSI_PHASE_DATA_OUT);
             alloc_length = dev->drv->sector_size;
 
-            if (dev->drv->read_only) {
-                mo_write_protected(dev);
-                return;
-            }
-
             switch (cdb[0]) {
                 case GPCMD_VERIFY_6:
                 case GPCMD_WRITE_6:
                     dev->sector_len = cdb[4];
+                    /*
+                       For READ (6) and WRITE (6), a length of 0 indicates a
+                       transfer of 256 sectors.
+                     */
                     if (dev->sector_len == 0)
-                        dev->sector_len = 256; /* For READ (6) and WRITE (6), a length of 0 indicates a transfer of 256 sector. */
-                    dev->sector_pos = ((((uint32_t) cdb[1]) & 0x1f) << 16) | (((uint32_t) cdb[2]) << 8) | ((uint32_t) cdb[3]);
+                        dev->sector_len = 256;
+                    dev->sector_pos = ((((uint32_t) cdb[1]) & 0x1f) << 16) |
+                                      (((uint32_t) cdb[2]) << 8) | ((uint32_t) cdb[3]);
+                    mo_log(dev->log, "Length: %i, LBA: %i\n", dev->sector_len, dev->sector_pos);
                     break;
                 case GPCMD_VERIFY_10:
                 case GPCMD_WRITE_10:
                 case GPCMD_WRITE_AND_VERIFY_10:
                     dev->sector_len = (cdb[7] << 8) | cdb[8];
-                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
-                    mo_log("MO %i: Length: %i, LBA: %i\n", dev->id, dev->sector_len, dev->sector_pos);
+                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) |
+                                      (cdb[4] << 8) | cdb[5];
+                    mo_log(dev->log, "Length: %i, LBA: %i\n", dev->sector_len, dev->sector_pos);
                     break;
                 case GPCMD_VERIFY_12:
                 case GPCMD_WRITE_12:
                 case GPCMD_WRITE_AND_VERIFY_12:
-                    dev->sector_len = (((uint32_t) cdb[6]) << 24) | (((uint32_t) cdb[7]) << 16) | (((uint32_t) cdb[8]) << 8) | ((uint32_t) cdb[9]);
-                    dev->sector_pos = (((uint32_t) cdb[2]) << 24) | (((uint32_t) cdb[3]) << 16) | (((uint32_t) cdb[4]) << 8) | ((uint32_t) cdb[5]);
+                    dev->sector_len = (((uint32_t) cdb[6]) << 24) |
+                                      (((uint32_t) cdb[7]) << 16) |
+                                      (((uint32_t) cdb[8]) << 8) | ((uint32_t) cdb[9]);
+                    dev->sector_pos = (((uint32_t) cdb[2]) << 24) |
+                                      (((uint32_t) cdb[3]) << 16) |
+                                      (((uint32_t) cdb[4]) << 8) | ((uint32_t) cdb[5]);
                     break;
 
                 default:
                     break;
             }
 
-            if ((dev->sector_pos >= dev->drv->medium_size) /* ||
-                 ((dev->sector_pos + dev->sector_len - 1) >= dev->drv->medium_size)*/
-            ) {
+            if (!dev->drv->supported)
+                mo_write_error(dev);
+            else if (dev->sector_pos >= dev->drv->medium_size)
                 mo_lba_out_of_range(dev);
-                return;
+            else {
+                if (dev->sector_len) {
+                    max_len               = dev->sector_len;
+                    dev->requested_blocks = max_len;
+
+                    dev->packet_len = max_len * alloc_length;
+                    mo_buf_alloc(dev, dev->packet_len);
+
+                    dev->requested_blocks = max_len;
+                    dev->packet_len       = max_len * dev->drv->sector_size;
+
+                    mo_set_buf_len(dev, BufLen, (int32_t *) &dev->packet_len);
+
+                    mo_data_command_finish(dev, dev->packet_len, dev->drv->sector_size,
+                                           dev->packet_len, 1);
+
+                    ui_sb_update_icon_write(SB_MO | dev->id,
+                                      dev->packet_status != PHASE_COMPLETE);
+                } else {
+                    mo_set_phase(dev, SCSI_PHASE_STATUS);
+                    mo_log(dev->log, "All done - callback set\n");
+                    dev->packet_status = PHASE_COMPLETE;
+                    dev->callback      = 20.0 * SCSI_TIME;
+                    mo_set_callback(dev);
+                }
             }
+            break;
 
-            if (!dev->sector_len) {
-                mo_set_phase(dev, SCSI_PHASE_STATUS);
-                /* mo_log("MO %i: All done - callback set\n", dev->id); */
-                dev->packet_status = PHASE_COMPLETE;
-                dev->callback      = 20.0 * MO_TIME;
-                mo_set_callback(dev);
-                break;
+        case GPCMD_WRITE_SAME_10:
+            mo_set_phase(dev, SCSI_PHASE_DATA_OUT);
+            alloc_length = dev->drv->sector_size;
+
+            if ((cdb[1] & 6) == 6)
+                mo_invalid_field(dev, cdb[1]);
+            else {
+                dev->sector_len = (cdb[7] << 8) | cdb[8];
+                dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
+
+                if (!dev->drv->supported)
+                    mo_write_error(dev);
+                else if (dev->sector_pos >= dev->drv->medium_size)
+                    mo_lba_out_of_range(dev);
+                else if (dev->sector_len) {
+                    mo_buf_alloc(dev, alloc_length);
+                    mo_set_buf_len(dev, BufLen, (int32_t *) &dev->packet_len);
+
+                    dev->requested_blocks = 1;
+                    dev->packet_len = alloc_length;
+
+                    mo_set_phase(dev, SCSI_PHASE_DATA_OUT);
+
+                    mo_data_command_finish(dev, dev->drv->sector_size,
+                                           dev->drv->sector_size,
+                                           alloc_length, 1);
+
+                    ui_sb_update_icon_write(SB_MO | dev->id,
+                                      dev->packet_status != PHASE_COMPLETE);
+                } else {
+                    mo_set_phase(dev, SCSI_PHASE_STATUS);
+                    mo_log(dev->log, "All done - callback set\n");
+                    dev->packet_status = PHASE_COMPLETE;
+                    dev->callback      = 20.0 * SCSI_TIME;
+                    mo_set_callback(dev);
+                }
             }
-
-            max_len               = dev->sector_len;
-            dev->requested_blocks = max_len; /* If we're writing all blocks in one go for DMA, why not also for PIO, it should NOT
-                                                matter anyway, this step should be identical and only the way the read dat is
-                                                transferred to the host should be different. */
-
-            dev->packet_len = max_len * alloc_length;
-            mo_buf_alloc(dev, dev->packet_len);
-
-            dev->requested_blocks = max_len;
-            dev->packet_len       = max_len << 9;
-
-            mo_set_buf_len(dev, BufLen, (int32_t *) &dev->packet_len);
-
-            mo_data_command_finish(dev, dev->packet_len, dev->drv->sector_size, dev->packet_len, 1);
-
-            if (dev->packet_status != PHASE_COMPLETE)
-                ui_sb_update_icon(SB_MO | dev->id, 1);
-            else
-                ui_sb_update_icon(SB_MO | dev->id, 0);
-            return;
+            break;
 
         case GPCMD_MODE_SENSE_6:
         case GPCMD_MODE_SENSE_10:
@@ -1561,7 +1553,7 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
             }
 
             if (!(mo_mode_sense_page_flags & (1LL << (uint64_t) (cdb[2] & 0x3f)))) {
-                mo_invalid_field(dev);
+                mo_invalid_field(dev, cdb[2]);
                 mo_buf_free(dev);
                 return;
             }
@@ -1570,14 +1562,16 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
             alloc_length = len;
 
             if (cdb[0] == GPCMD_MODE_SENSE_6) {
-                len            = mo_mode_sense(dev, dev->buffer, 4, cdb[2], block_desc);
+                len            = mo_mode_sense(dev, dev->buffer, 4,
+                                               cdb[2], block_desc);
                 len            = MIN(len, alloc_length);
                 dev->buffer[0] = len - 1;
                 dev->buffer[1] = 0;
                 if (block_desc)
                     dev->buffer[3] = 8;
             } else {
-                len            = mo_mode_sense(dev, dev->buffer, 8, cdb[2], block_desc);
+                len            = mo_mode_sense(dev, dev->buffer, 8,
+                                               cdb[2], block_desc);
                 len            = MIN(len, alloc_length);
                 dev->buffer[0] = (len - 2) >> 8;
                 dev->buffer[1] = (len - 2) & 255;
@@ -1590,7 +1584,7 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
 
             mo_set_buf_len(dev, BufLen, &len);
 
-            mo_log("MO %i: Reading mode page: %02X...\n", dev->id, cdb[2]);
+            mo_log(dev->log, "Reading mode page: %02X...\n", cdb[2]);
 
             mo_data_command_finish(dev, len, len, alloc_length, 0);
             return;
@@ -1650,7 +1644,7 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
                 preamble_len = 4;
                 size_idx     = 3;
 
-                dev->buffer[idx++] = 7; /*Optical disk*/
+                dev->buffer[idx++] = 7;         /* Optical disk */
                 dev->buffer[idx++] = cdb[2];
                 dev->buffer[idx++] = 0;
 
@@ -1661,14 +1655,15 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
                         dev->buffer[idx++] = 0x00;
                         dev->buffer[idx++] = 0x80;
                         break;
-                    case 0x80: /*Unit serial number page*/
+                    case 0x80:    /*Unit serial number page*/
                         dev->buffer[idx++] = strlen("VCM!10") + 1;
-                        ide_padstr8(dev->buffer + idx, 20, "VCM!10"); /* Serial */
+                        /* Serial */
+                        ide_padstr8(dev->buffer + idx, 20, "VCM!10");
                         idx += strlen("VCM!10");
                         break;
                     default:
-                        mo_log("INQUIRY: Invalid page: %02X\n", cdb[2]);
-                        mo_invalid_field(dev);
+                        mo_log(dev->log, "INQUIRY: Invalid page: %02X\n", cdb[2]);
+                        mo_invalid_field(dev, cdb[2]);
                         mo_buf_free(dev);
                         return;
                 }
@@ -1677,31 +1672,35 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
                 size_idx     = 4;
 
                 memset(dev->buffer, 0, 8);
-                if (cdb[1] & 0xe0)
-                    dev->buffer[0] = 0x60; /*No physical device on this LUN*/
+                if ((cdb[1] & 0xe0) || ((dev->cur_lun > 0x00) && (dev->cur_lun < 0xff)))
+                    dev->buffer[0] = 0x7f;    /* No physical device on this LUN */
                 else
-                    dev->buffer[0] = 0x07;                                          /*Optical disk*/
-                dev->buffer[1] = 0x80;                                              /*Removable*/
-                dev->buffer[2] = (dev->drv->bus_type == MO_BUS_SCSI) ? 0x02 : 0x00; /*SCSI-2 compliant*/
+                    dev->buffer[0] = 0x07;    /* Optical disk */
+                dev->buffer[1] = 0x80;        /* Removable */
+                /* SCSI-2 compliant */
+                dev->buffer[2] = (dev->drv->bus_type == MO_BUS_SCSI) ? 0x02 : 0x00;
                 dev->buffer[3] = (dev->drv->bus_type == MO_BUS_SCSI) ? 0x02 : 0x21;
-#if 0
-                dev->buffer[4] = 31;
-#endif
                 dev->buffer[4] = 0;
                 if (dev->drv->bus_type == MO_BUS_SCSI) {
-                    dev->buffer[6] = 1;    /* 16-bit transfers supported */
-                    dev->buffer[7] = 0x20; /* Wide bus supported */
+                    dev->buffer[6] = 1;       /* 16-bit transfers supported */
+                    dev->buffer[7] = 0x20;    /* Wide bus supported */
                 }
                 dev->buffer[7] |= 0x02;
 
                 if (dev->drv->type > 0) {
-                    ide_padstr8(dev->buffer + 8, 8, mo_drive_types[dev->drv->type].vendor);    /* Vendor */
-                    ide_padstr8(dev->buffer + 16, 16, mo_drive_types[dev->drv->type].model);   /* Product */
-                    ide_padstr8(dev->buffer + 32, 4, mo_drive_types[dev->drv->type].revision); /* Revision */
+                    ide_padstr8(dev->buffer + 8, 8,
+                                mo_drive_types[dev->drv->type].vendor);      /* Vendor */
+                    ide_padstr8(dev->buffer + 16, 16,
+                             mo_drive_types[dev->drv->type].model);          /* Product */
+                    ide_padstr8(dev->buffer + 32, 4,
+                                mo_drive_types[dev->drv->type].revision);    /* Revision */
                 } else {
-                    ide_padstr8(dev->buffer + 8, 8, EMU_NAME);          /* Vendor */
-                    ide_padstr8(dev->buffer + 16, 16, device_identify); /* Product */
-                    ide_padstr8(dev->buffer + 32, 4, EMU_VERSION_EX);   /* Revision */
+                    ide_padstr8(dev->buffer + 8, 8,
+                                EMU_NAME);          /* Vendor */
+                    ide_padstr8(dev->buffer + 16, 16,
+                                device_identify);      /* Product */
+                    ide_padstr8(dev->buffer + 32, 4,
+                                EMU_VERSION_EX);    /* Revision */
                 }
                 idx = 36;
 
@@ -1752,7 +1751,8 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
 
             mo_buf_alloc(dev, 8);
 
-            max_len = dev->drv->medium_size - 1; /* IMPORTANT: What's returned is the last LBA block. */
+            /* IMPORTANT: What's returned is the last LBA block. */
+            max_len = dev->drv->medium_size - 1;
             memset(dev->buffer, 0, 8);
             dev->buffer[0] = (max_len >> 24) & 0xff;
             dev->buffer[1] = (max_len >> 16) & 0xff;
@@ -1769,7 +1769,7 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
 
         case GPCMD_ERASE_10:
         case GPCMD_ERASE_12:
-            /*Relative address*/
+            /* Relative address. */
             if (cdb[1] & 1)
                 previous_pos = dev->sector_pos;
 
@@ -1778,18 +1778,20 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
                     dev->sector_len = (cdb[7] << 8) | cdb[8];
                     break;
                 case GPCMD_ERASE_12:
-                    dev->sector_len = (((uint32_t) cdb[6]) << 24) | (((uint32_t) cdb[7]) << 16) | (((uint32_t) cdb[8]) << 8) | ((uint32_t) cdb[9]);
+                    dev->sector_len = (((uint32_t) cdb[6]) << 24) |
+                                      (((uint32_t) cdb[7]) << 16) |
+                                      (((uint32_t) cdb[8]) << 8) | ((uint32_t) cdb[9]);
                     break;
 
                 default:
                     break;
             }
 
-            /*Erase all remaining sectors*/
+            /* Erase all remaining sectors. */
             if (cdb[1] & 4) {
-                /* Cannot have a sector number when erase all*/
+                /* Cannot have a sector number when erase all. */
                 if (dev->sector_len) {
-                    mo_invalid_field(dev);
+                    mo_invalid_field(dev, dev->sector_len);
                     return;
                 }
                 mo_format(dev);
@@ -1800,10 +1802,13 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
 
             switch (cdb[0]) {
                 case GPCMD_ERASE_10:
-                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
+                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) |
+                                      (cdb[4] << 8) | cdb[5];
                     break;
                 case GPCMD_ERASE_12:
-                    dev->sector_pos = (((uint32_t) cdb[2]) << 24) | (((uint32_t) cdb[3]) << 16) | (((uint32_t) cdb[4]) << 8) | ((uint32_t) cdb[5]);
+                    dev->sector_pos = (((uint32_t) cdb[2]) << 24) |
+                                      (((uint32_t) cdb[3]) << 16) |
+                                      (((uint32_t) cdb[4]) << 8) | ((uint32_t) cdb[5]);
                     break;
 
                 default:
@@ -1817,7 +1822,10 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
             mo_command_complete(dev);
             break;
 
-        /*Never seen media that supports generations but it's interesting to know if any implementation calls this commmand*/
+        /*
+           Never seen media that supports generations but it's interesting to know if any
+           implementation calls this commmand.
+         */
         case GPCMD_READ_GENERATION:
             mo_set_phase(dev, SCSI_PHASE_DATA_IN);
 
@@ -1834,12 +1842,13 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
             break;
 
         default:
-            mo_illegal_opcode(dev);
+            mo_illegal_opcode(dev, cdb[0]);
             break;
     }
 
 #if 0
-    mo_log("MO %i: Phase: %02X, request length: %i\n", dev->id, dev->tf->phase, dev->tf->request_length);
+    mo_log(dev->log, "Phase: %02X, request length: %i\n",
+           dev->tf->phase, dev->tf->request_length);
 #endif
 
     if ((dev->packet_status == PHASE_COMPLETE) || (dev->packet_status == PHASE_ERROR))
@@ -1859,22 +1868,16 @@ mo_command_stop(scsi_common_t *sc)
 static uint8_t
 mo_phase_data_out(scsi_common_t *sc)
 {
-    mo_t *dev = (mo_t *) sc;
-
-    uint16_t block_desc_len;
-    uint16_t pos;
-    uint16_t param_list_len;
-
-    uint8_t error = 0;
-    uint8_t page;
-    uint8_t page_len;
-
-    uint8_t hdr_len;
-    uint8_t val;
-    uint8_t old_val;
-    uint8_t ch;
-
-    int len = 0;
+    mo_t *         dev         = (mo_t *) sc;
+    const uint32_t last_sector = dev->drv->medium_size - 1;
+    int            len         = 0;
+    uint8_t        error       = 0;
+    uint32_t       last_to_write;
+    uint16_t       block_desc_len;
+    uint16_t       pos;
+    uint16_t       param_list_len;
+    uint8_t        hdr_len;
+    uint8_t        val;
 
     switch (dev->current_cdb[0]) {
         case GPCMD_VERIFY_6:
@@ -1887,7 +1890,41 @@ mo_phase_data_out(scsi_common_t *sc)
         case GPCMD_WRITE_12:
         case GPCMD_WRITE_AND_VERIFY_12:
             if (dev->requested_blocks > 0)
-                mo_blocks(dev, &len, 1, 1);
+                mo_blocks(dev, &len, 1);
+            break;
+        case GPCMD_WRITE_SAME_10:
+            if (!dev->current_cdb[7] && !dev->current_cdb[8])
+                last_to_write = last_sector;
+            else
+                last_to_write = dev->sector_pos + dev->sector_len - 1;
+
+            for (int i = dev->sector_pos; i <= (int) last_to_write; i++) {
+                if (dev->current_cdb[1] & 2) {
+                    dev->buffer[0] = (i >> 24) & 0xff;
+                    dev->buffer[1] = (i >> 16) & 0xff;
+                    dev->buffer[2] = (i >> 8) & 0xff;
+                    dev->buffer[3] = i & 0xff;
+                } else if (dev->current_cdb[1] & 4) {
+                    uint32_t s          = (i % 63);
+                    uint32_t h          = ((i - s) / 63) % 16;
+                    uint32_t c          = ((i - s) / 63) / 16;
+                    dev->buffer[0] = (c >> 16) & 0xff;
+                    dev->buffer[1] = (c >> 8) & 0xff;
+                    dev->buffer[2] = c & 0xff;
+                    dev->buffer[3] = h & 0xff;
+                    dev->buffer[4] = (s >> 24) & 0xff;
+                    dev->buffer[5] = (s >> 16) & 0xff;
+                    dev->buffer[6] = (s >> 8) & 0xff;
+                    dev->buffer[7] = s & 0xff;
+                }
+                if (fseeko64(dev->drv->fp,
+                             ((uint64_t) i * dev->drv->sector_size), SEEK_SET) == -1)
+                    mo_write_error(dev);
+                if (feof(dev->drv->fp))
+                    break;
+                if (fwrite(dev->buffer, 1, dev->drv->sector_size, dev->drv->fp) != dev->drv->sector_size)
+                    mo_write_error(dev);
+            }
             break;
         case GPCMD_MODE_SELECT_6:
         case GPCMD_MODE_SELECT_10:
@@ -1915,30 +1952,33 @@ mo_phase_data_out(scsi_common_t *sc)
                 block_desc_len = 0;
 
             pos = hdr_len + block_desc_len;
+            mo_log(dev->log, "Block descriptor: %08X %08X %08X %08X %08X %08X %08X %08X\n",
+                   dev->buffer[hdr_len], dev->buffer[hdr_len + 1], dev->buffer[hdr_len + 2], dev->buffer[hdr_len + 3],
+                   dev->buffer[hdr_len + 4], dev->buffer[hdr_len + 5], dev->buffer[hdr_len + 6], dev->buffer[hdr_len + 7]);
 
             while (1) {
                 if (pos >= param_list_len) {
-                    mo_log("MO %i: Buffer has only block descriptor\n", dev->id);
+                    mo_log(dev->log, "Buffer has only block descriptor\n");
                     break;
                 }
 
-                page     = dev->buffer[pos] & 0x3F;
-                page_len = dev->buffer[pos + 1];
+                const uint8_t page     = dev->buffer[pos] & 0x3F;
+                const uint8_t page_len = dev->buffer[pos + 1];
 
                 pos += 2;
 
                 if (!(mo_mode_sense_page_flags & (1LL << ((uint64_t) page))))
                     error |= 1;
-                else {
-                    for (uint8_t i = 0; i < page_len; i++) {
-                        ch      = mo_mode_sense_pages_changeable.pages[page][i + 2];
-                        val     = dev->buffer[pos + i];
-                        old_val = dev->ms_pages_saved.pages[page][i + 2];
-                        if (val != old_val) {
-                            if (ch)
-                                dev->ms_pages_saved.pages[page][i + 2] = val;
-                            else
-                                error |= 1;
+                else for (uint8_t i = 0; i < page_len; i++) {
+                    const uint8_t ch      = mo_mode_sense_pages_changeable.pages[page][i + 2];
+                    const uint8_t old_val = dev->ms_pages_saved.pages[page][i + 2];
+                    val                   = dev->buffer[pos + i];
+                    if (val != old_val) {
+                        if (ch)
+                            dev->ms_pages_saved.pages[page][i + 2] = val;
+                        else {
+                            error |= 1;
+                            mo_invalid_field_pl(dev, val);
                         }
                     }
                 }
@@ -1958,7 +1998,6 @@ mo_phase_data_out(scsi_common_t *sc)
 
             if (error) {
                 mo_buf_free(dev);
-                mo_invalid_field_pl(dev);
                 return 0;
             }
             break;
@@ -1980,13 +2019,13 @@ mo_global_init(void)
 }
 
 static int
-mo_get_max(int ide_has_dma, int type)
+mo_get_max(UNUSED(const ide_t *ide), const int ide_has_dma, const int type)
 {
     int ret;
 
     switch (type) {
         case TYPE_PIO:
-            ret = ide_has_dma ? 3 : 0;
+            ret = 3;
             break;
         case TYPE_SDMA:
         default:
@@ -2004,7 +2043,7 @@ mo_get_max(int ide_has_dma, int type)
 }
 
 static int
-mo_get_timings(int ide_has_dma, int type)
+mo_get_timings(UNUSED(const ide_t *ide), const int ide_has_dma, const int type)
 {
     int ret;
 
@@ -2013,10 +2052,10 @@ mo_get_timings(int ide_has_dma, int type)
             ret = ide_has_dma ? 0x96 : 0;
             break;
         case TIMINGS_PIO:
-            ret = ide_has_dma ? 0xb4 : 0;
+            ret = 0xf0;
             break;
         case TIMINGS_PIO_FC:
-            ret = ide_has_dma ? 0xb4 : 0;
+            ret = 0xb4;
             break;
         default:
             ret = 0;
@@ -2027,7 +2066,7 @@ mo_get_timings(int ide_has_dma, int type)
 }
 
 static void
-mo_do_identify(ide_t *ide, int ide_has_dma)
+mo_do_identify(const ide_t *ide, const int ide_has_dma)
 {
     char model[40];
 
@@ -2036,56 +2075,65 @@ mo_do_identify(ide_t *ide, int ide_has_dma)
     memset(model, 0, 40);
 
     if (mo_drives[mo->id].type > 0) {
-        snprintf(model, 40, "%s %s", mo_drive_types[mo_drives[mo->id].type].vendor, mo_drive_types[mo_drives[mo->id].type].model);
-        ide_padstr((char *) (ide->buffer + 23), mo_drive_types[mo_drives[mo->id].type].revision, 8); /* Firmware */
+        snprintf(model, 40, "%s %s", mo_drive_types[mo_drives[mo->id].type].vendor,
+                 mo_drive_types[mo_drives[mo->id].type].model);
+        /* Firmware */
+        ide_padstr((char *) (ide->buffer + 23),
+                   mo_drive_types[mo_drives[mo->id].type].revision, 8);
         ide_padstr((char *) (ide->buffer + 27), model, 40);                                          /* Model */
     } else {
         snprintf(model, 40, "%s %s%02i", EMU_NAME, "86B_MO", mo->id);
-        ide_padstr((char *) (ide->buffer + 23), EMU_VERSION_EX, 8); /* Firmware */
-        ide_padstr((char *) (ide->buffer + 27), model, 40);         /* Model */
+        ide_padstr((char *) (ide->buffer + 23), EMU_VERSION_EX, 8);    /* Firmware */
+        ide_padstr((char *) (ide->buffer + 27), model, 40);               /* Model */
     }
 
     if (ide_has_dma) {
-        ide->buffer[80] = 0x70; /*Supported ATA versions : ATA/ATAPI-4 ATA/ATAPI-6*/
-        ide->buffer[81] = 0x19; /*Maximum ATA revision supported : ATA/ATAPI-6 T13 1410D revision 3a*/
+        /* Supported ATA versions : ATA/ATAPI-4 ATA/ATAPI-6 */
+        ide->buffer[80] = 0x70;
+        /* Maximum ATA revision supported : ATA/ATAPI-6 T13 1410D revision 3a */
+        ide->buffer[81] = 0x19;
     }
 }
 
 static void
-mo_identify(ide_t *ide, int ide_has_dma)
+mo_identify(const ide_t *ide, const int ide_has_dma)
 {
-    ide->buffer[0] = 0x8000 | (0 << 8) | 0x80 | (1 << 5); /* ATAPI device, direct-access device, removable media, interrupt DRQ */
-    ide_padstr((char *) (ide->buffer + 10), "", 20);      /* Serial Number */
-    ide->buffer[49]  = 0x200;                             /* LBA supported */
-    ide->buffer[126] = 0xfffe;                            /* Interpret zero byte count limit as maximum length */
+    /* ATAPI device, direct-access device, removable media, interrupt DRQ */
+    ide->buffer[0] = 0x8000 | (0 << 8) | 0x80 | (1 << 5);
+    ide_padstr((char *) (ide->buffer + 10), "", 20);    /* Serial Number */
+    ide->buffer[49]  = 0x200;                                 /* LBA supported */
+    /* Interpret zero byte count limit as maximum length */
+    ide->buffer[126] = 0xfffe;
     mo_do_identify(ide, ide_has_dma);
 }
 
 static void
-mo_drive_reset(int c)
+mo_drive_reset(const int c)
 {
-    mo_t          *dev;
-    scsi_device_t *sd;
-    ide_t         *id;
-    uint8_t        scsi_bus = (mo_drives[c].scsi_device_id >> 4) & 0x0f;
-    uint8_t        scsi_id  = mo_drives[c].scsi_device_id & 0x0f;
+    const uint8_t scsi_bus = (mo_drives[c].scsi_device_id >> 4) & 0x0f;
+    const uint8_t scsi_id  = mo_drives[c].scsi_device_id & 0x0f;
 
-    if (!mo_drives[c].priv) {
-        mo_drives[c].priv = (mo_t *) malloc(sizeof(mo_t));
-        memset(mo_drives[c].priv, 0, sizeof(mo_t));
+    if (mo_drives[c].priv == NULL) {
+        mo_drives[c].priv = (mo_t *) calloc(1, sizeof(mo_t));
+        mo_t *dev         = (mo_t *) mo_drives[c].priv;
+
+        char n[1024]      = { 0 };
+
+        sprintf(n, "MO %i", c + 1);
+        dev->log          = log_open(n);
     }
 
-    dev = (mo_t *) mo_drives[c].priv;
+    mo_t *dev    = (mo_t *) mo_drives[c].priv;
 
     dev->id      = c;
     dev->cur_lun = SCSI_LUN_USE_CDB;
 
     if (mo_drives[c].bus_type == MO_BUS_SCSI) {
-        if (!dev->tf)
+        if (dev->tf == NULL)
             dev->tf        = (ide_tf_t *) calloc(1, sizeof(ide_tf_t));
 
         /* SCSI MO, attach to the SCSI bus. */
-        sd = &scsi_devices[scsi_bus][scsi_id];
+        scsi_device_t *sd  = &scsi_devices[scsi_bus][scsi_id];
 
         sd->sc             = (scsi_common_t *) dev;
         sd->command        = mo_command;
@@ -2096,7 +2144,7 @@ mo_drive_reset(int c)
         sd->type           = SCSI_REMOVABLE_DISK;
     } else if (mo_drives[c].bus_type == MO_BUS_ATAPI) {
         /* ATAPI MO, attach to the IDE bus. */
-        id = ide_get_drive(mo_drives[c].ide_channel);
+        ide_t *id = ide_get_drive(mo_drives[c].ide_channel);
         /* If the IDE channel is initialized, we attach to it,
            otherwise, we do nothing - it's going to be a drive
            that's not attached to anything. */
@@ -2123,17 +2171,11 @@ mo_drive_reset(int c)
 void
 mo_hard_reset(void)
 {
-    mo_t   *dev;
-    uint8_t scsi_id;
-    uint8_t scsi_bus;
-
     for (uint8_t c = 0; c < MO_NUM; c++) {
         if ((mo_drives[c].bus_type == MO_BUS_ATAPI) || (mo_drives[c].bus_type == MO_BUS_SCSI)) {
-            mo_log("MO hard_reset drive=%d\n", c);
-
             if (mo_drives[c].bus_type == MO_BUS_SCSI) {
-                scsi_bus = (mo_drives[c].scsi_device_id >> 4) & 0x0f;
-                scsi_id  = mo_drives[c].scsi_device_id & 0x0f;
+                const uint8_t scsi_bus = (mo_drives[c].scsi_device_id >> 4) & 0x0f;
+                const uint8_t scsi_id  = mo_drives[c].scsi_device_id & 0x0f;
 
                 /* Make sure to ignore any SCSI MO drive that has an out of range SCSI Bus. */
                 if (scsi_bus >= SCSI_BUS_MAX)
@@ -2150,7 +2192,9 @@ mo_hard_reset(void)
 
             mo_drive_reset(c);
 
-            dev = (mo_t *) mo_drives[c].priv;
+            mo_t *dev = (mo_t *) mo_drives[c].priv;
+
+            mo_log(dev->log, "MO hard_reset drive=%d\n", c);
 
             if (dev->tf == NULL)
                 continue;
@@ -2161,14 +2205,16 @@ mo_hard_reset(void)
             mo_init(dev);
 
             if (strlen(mo_drives[c].image_path))
-                mo_load(dev, mo_drives[c].image_path);
+                mo_load(dev, mo_drives[c].image_path, 0);
 
             mo_mode_sense_load(dev);
 
             if (mo_drives[c].bus_type == MO_BUS_SCSI)
-                mo_log("SCSI MO drive %i attached to SCSI ID %i\n", c, mo_drives[c].scsi_device_id);
+                mo_log(dev->log, "SCSI MO drive %i attached to SCSI ID %i\n",
+                       c, mo_drives[c].scsi_device_id);
             else if (mo_drives[c].bus_type == MO_BUS_ATAPI)
-                mo_log("ATAPI MO drive %i attached to IDE channel %i\n", c, mo_drives[c].ide_channel);
+                mo_log(dev->log, "ATAPI MO drive %i attached to IDE channel %i\n",
+                       c, mo_drives[c].ide_channel);
         }
     }
 }
@@ -2176,19 +2222,15 @@ mo_hard_reset(void)
 void
 mo_close(void)
 {
-    mo_t   *dev;
-    uint8_t scsi_id;
-    uint8_t scsi_bus;
-
     for (uint8_t c = 0; c < MO_NUM; c++) {
         if (mo_drives[c].bus_type == MO_BUS_SCSI) {
-            scsi_bus = (mo_drives[c].scsi_device_id >> 4) & 0x0f;
-            scsi_id  = mo_drives[c].scsi_device_id & 0x0f;
+            const uint8_t scsi_bus = (mo_drives[c].scsi_device_id >> 4) & 0x0f;
+            const uint8_t scsi_id  = mo_drives[c].scsi_device_id & 0x0f;
 
             memset(&scsi_devices[scsi_bus][scsi_id], 0x00, sizeof(scsi_device_t));
         }
 
-        dev = (mo_t *) mo_drives[c].priv;
+        mo_t *dev = (mo_t *) mo_drives[c].priv;
 
         if (dev) {
             mo_disk_unload(dev);
@@ -2196,6 +2238,13 @@ mo_close(void)
             if (dev->tf)
                 free(dev->tf);
 
+            if (dev->log != NULL) {
+                mo_log(dev->log, "Log closed\n");
+
+                log_close(dev->log);
+                dev->log = NULL;
+            }
+
             free(dev);
             mo_drives[c].priv = NULL;
         }
diff --git a/src/disk/rdisk.c b/src/disk/rdisk.c
new file mode 100644
index 000000000..683b1e963
--- /dev/null
+++ b/src/disk/rdisk.c
@@ -0,0 +1,2349 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the Iomega ZIP drive with SCSI(-like)
+ *          commands, for both ATAPI and SCSI usage.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2018-2025 Miran Grca.
+ */
+#ifdef ENABLE_RDISK_LOG
+#include <stdarg.h>
+#endif
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <86box/86box.h>
+#include <86box/timer.h>
+#include <86box/device.h>
+#include <86box/log.h>
+#include <86box/scsi.h>
+#include <86box/scsi_device.h>
+#include <86box/nvr.h>
+#include <86box/path.h>
+#include <86box/plat.h>
+#include <86box/ui.h>
+#include <86box/hdc_ide.h>
+#include <86box/rdisk.h>
+#include <86box/version.h>
+
+#define IDE_ATAPI_IS_EARLY             id->sc->pad0
+
+rdisk_drive_t rdisk_drives[RDISK_NUM];
+
+// clang-format off
+/*
+   Table of all SCSI commands and their flags, needed for the new disc change /
+   not ready handler.
+ */
+const uint8_t rdisk_command_flags[0x100] = {
+    [0x00]          = IMPLEMENTED | CHECK_READY,
+    [0x01]          = IMPLEMENTED | ALLOW_UA | SCSI_ONLY,
+    [0x03]          = IMPLEMENTED | ALLOW_UA,
+    [0x04]          = IMPLEMENTED | CHECK_READY | ALLOW_UA | SCSI_ONLY,
+    [0x06]          = IMPLEMENTED,
+    [0x08]          = IMPLEMENTED | CHECK_READY,
+    [0x0a ... 0x0b] = IMPLEMENTED | CHECK_READY,
+    [0x0c]          = IMPLEMENTED,
+    [0x0d]          = IMPLEMENTED | ATAPI_ONLY,
+    [0x12]          = IMPLEMENTED | ALLOW_UA,
+    [0x13]          = IMPLEMENTED | CHECK_READY,
+    [0x15]          = IMPLEMENTED,
+    [0x16 ... 0x17] = IMPLEMENTED | SCSI_ONLY,
+    [0x1a]          = IMPLEMENTED,
+    [0x1b]          = IMPLEMENTED | CHECK_READY,
+    [0x1d]          = IMPLEMENTED,
+    [0x1e]          = IMPLEMENTED | CHECK_READY,
+    [0x23]          = IMPLEMENTED | ATAPI_ONLY,
+    [0x25]          = IMPLEMENTED | CHECK_READY,
+    [0x28]          = IMPLEMENTED | CHECK_READY,
+    [0x2a ... 0x2b] = IMPLEMENTED | CHECK_READY,
+    [0x2e ... 0x2f] = IMPLEMENTED | CHECK_READY,
+    [0x41]          = IMPLEMENTED | CHECK_READY,
+    [0x55]          = IMPLEMENTED,
+    [0x5a]          = IMPLEMENTED,
+    [0xa8]          = IMPLEMENTED | CHECK_READY,
+    [0xaa]          = IMPLEMENTED | CHECK_READY,
+    [0xae]          = IMPLEMENTED | CHECK_READY,
+    [0xaf]          = IMPLEMENTED | CHECK_READY | SCSI_ONLY,
+    [0xbd]          = IMPLEMENTED
+};
+
+static uint64_t zip_mode_sense_page_flags     = (GPMODEP_R_W_ERROR_PAGE | GPMODEP_DISCONNECT_PAGE |
+                                                 GPMODEP_IOMEGA_PAGE | GPMODEP_ALL_PAGES);
+static uint64_t zip_250_mode_sense_page_flags = (GPMODEP_R_W_ERROR_PAGE | GPMODEP_FLEXIBLE_DISK_PAGE |
+                                                 GPMODEP_CACHING_PAGE | GPMODEP_IOMEGA_PAGE |
+                                                 GPMODEP_ALL_PAGES);
+
+static const mode_sense_pages_t zip_mode_sense_pages_default = {
+    { [0x01] = { GPMODE_R_W_ERROR_PAGE,               0x0a, 0xc8, 0x16, 0x00, 0x00, 0x00, 0x00,
+                 0x5a,                                0x00, 0x50, 0x20                         },
+      [0x02] = { GPMODE_DISCONNECT_PAGE,              0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+      [0x2f] = { GPMODE_IOMEGA_PAGE,                  0x04, 0x5c, 0x0f, 0xff, 0x0f             } }
+};
+
+static const mode_sense_pages_t zip_250_mode_sense_pages_default = {
+    { [0x01] = { GPMODE_R_W_ERROR_PAGE,               0x06, 0xc8, 0x64, 0x00, 0x00, 0x00, 0x00 },
+      [0x05] = { GPMODE_FLEXIBLE_DISK_PAGE,           0x1e, 0x80, 0x00, 0x40, 0x20, 0x02, 0x00,
+                 0x00,                                0xef, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x0b, 0x7d, 0x00, 0x00 },
+      [0x08] = { GPMODE_CACHING_PAGE,                 0x0a, 0x04, 0x00, 0xff, 0xff, 0x00, 0x00,
+                 0xff,                                0xff, 0xff, 0xff                         },
+      [0x2f] = { GPMODE_IOMEGA_PAGE,                  0x04, 0x5c, 0x0f, 0x3c, 0x0f             } }
+};
+
+static const mode_sense_pages_t zip_mode_sense_pages_default_scsi = {
+    { [0x01] = { GPMODE_R_W_ERROR_PAGE,               0x0a, 0xc8, 0x16, 0x00, 0x00, 0x00, 0x00,
+                 0x5a,                                0x00, 0x50, 0x20                         },
+      [0x02] = { GPMODE_DISCONNECT_PAGE,              0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+      [0x2f] = { GPMODE_IOMEGA_PAGE,                  0x04, 0x5c, 0x0f, 0xff, 0x0f             } }
+};
+
+static const mode_sense_pages_t zip_250_mode_sense_pages_default_scsi = {
+    { [0x01] = { GPMODE_R_W_ERROR_PAGE,               0x06, 0xc8, 0x64, 0x00, 0x00, 0x00, 0x00 },
+      [0x05] = { GPMODE_FLEXIBLE_DISK_PAGE,           0x1e, 0x80, 0x00, 0x40, 0x20, 0x02, 0x00,
+                 0x00,                                0xef, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x0b, 0x7d, 0x00, 0x00 },
+      [0x08] = { GPMODE_CACHING_PAGE,                 0x0a, 0x04, 0x00, 0xff, 0xff, 0x00, 0x00,
+                 0xff,                                0xff, 0xff, 0xff                         },
+      [0x2f] = { GPMODE_IOMEGA_PAGE,                  0x04, 0x5c, 0x0f, 0x3c, 0x0f             } }
+};
+
+static const mode_sense_pages_t zip_mode_sense_pages_changeable = {
+    { [0x01] = { GPMODE_R_W_ERROR_PAGE,               0x0a, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff,
+                 0x5a,                                0xff, 0xff, 0xff                         },
+      [0x02] = { GPMODE_DISCONNECT_PAGE,              0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+      [0x2f] = { GPMODE_IOMEGA_PAGE,                  0x04, 0xff, 0xff, 0xff, 0xff             } }
+};
+
+static const mode_sense_pages_t zip_250_mode_sense_pages_changeable = {
+    { [0x01] = { GPMODE_R_W_ERROR_PAGE,               0x06, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 },
+      [0x05] = { GPMODE_FLEXIBLE_DISK_PAGE,           0x1e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                 0xff,                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                 0xff,                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                 0xff,                                0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00 },
+      [0x08] = { GPMODE_CACHING_PAGE,                 0x0a, 0x04, 0x00, 0xff, 0xff, 0x00, 0x00,
+                 0xff,                                0xff, 0xff, 0xff                         },
+      [0x2f] = { GPMODE_IOMEGA_PAGE,                  0x04, 0xff, 0xff, 0xff, 0xff             } }
+};
+// clang-format on
+
+static void rdisk_command_complete(rdisk_t *dev);
+static void rdisk_init(rdisk_t *dev);
+
+#ifdef ENABLE_RDISK_LOG
+int rdisk_do_log = ENABLE_RDISK_LOG;
+
+static void
+rdisk_log(void *priv, const char *fmt, ...)
+{
+    va_list ap;
+
+    if (rdisk_do_log) {
+        va_start(ap, fmt);
+        log_out(priv, fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define rdisk_log(priv, fmt, ...)
+#endif
+
+static int
+rdisk_load_abort(const rdisk_t *dev)
+{
+    if (dev->drv->fp)
+        fclose(dev->drv->fp);
+    dev->drv->fp           = NULL;
+    dev->drv->medium_size = 0;
+    rdisk_eject(dev->id); /* Make sure the host OS knows we've rejected (and ejected) the image. */
+    return 0;
+}
+
+int
+image_is_zdi(const char *s)
+{
+    return !strcasecmp(path_get_extension((char *) s), "ZDI");
+}
+
+int
+rdisk_is_empty(const uint8_t id)
+{
+    const rdisk_t *dev = (const rdisk_t *) rdisk_drives[id].priv;
+    int          ret = 0;
+
+    if ((dev->drv == NULL) || (dev->drv->fp == NULL))
+        ret = 1;
+
+    return ret;
+}
+
+void
+rdisk_load(const rdisk_t *dev, const char *fn, const int skip_insert)
+{
+    const int was_empty = rdisk_is_empty(dev->id);
+    int       ret       = 0;
+    int       offs      = 0;
+
+    if (strstr(fn, "wp://") == fn) {
+        offs                = 5;
+        dev->drv->read_only = 1;
+    }
+
+    fn += offs;
+
+    if (dev->drv == NULL)
+        rdisk_eject(dev->id);
+    else {
+        const int is_zdi = image_is_zdi(fn);
+
+        dev->drv->fp     = plat_fopen(fn, dev->drv->read_only ? "rb" : "rb+");
+        ret              = 1;
+
+        if (dev->drv->fp == NULL) {
+            if (!dev->drv->read_only) {
+                dev->drv->fp = plat_fopen(fn, "rb");
+                if (dev->drv->fp == NULL)
+                    ret = rdisk_load_abort(dev);
+                else
+                    dev->drv->read_only = 1;
+            } else
+                ret = rdisk_load_abort(dev);
+        }
+
+        if (ret) {
+            fseek(dev->drv->fp, 0, SEEK_END);
+            int size = ftell(dev->drv->fp);
+
+            if (is_zdi) {
+                /* This is a ZDI image. */
+                size -= 0x1000;
+                dev->drv->base = 0x1000;
+            } else
+                dev->drv->base = 0;
+
+            if (dev->drv->type != RDISK_TYPE_ZIP_100) {
+                if ((size != (ZIP_250_SECTORS << 9)) && (size != (ZIP_SECTORS << 9))) {
+                    rdisk_log(dev->log, "File is incorrect size for a RDISK image\n");
+                    rdisk_log(dev->log, "Must be exactly %i or %i bytes\n",
+                            ZIP_250_SECTORS << 9, ZIP_SECTORS << 9);
+                    ret = rdisk_load_abort(dev);
+                }
+            } else if (size != (ZIP_SECTORS << 9)) {
+                rdisk_log(dev->log, "File is incorrect size for a RDISK image\n");
+                rdisk_log(dev->log, "Must be exactly %i bytes\n", ZIP_SECTORS << 9);
+                ret = rdisk_load_abort(dev);
+            }
+
+            if (ret)
+                dev->drv->medium_size = size >> 9;
+        }
+
+         if (ret) {
+             if (fseek(dev->drv->fp, dev->drv->base, SEEK_SET) == -1)
+                 log_fatal(dev->log, "rdisk_load(): Error seeking to the beginning of "
+                           "the file\n");
+
+             strncpy(dev->drv->image_path, fn - offs, sizeof(dev->drv->image_path) - 1);
+             /*
+                After using strncpy, dev->drv->image_path needs to be explicitly null
+                terminated to make gcc happy.
+                In the event strlen(dev->drv->image_path) == sizeof(dev->drv->image_path)
+                (no null terminator) it is placed at the very end. Otherwise, it is placed
+                right after the string.
+              */
+             const size_t term = strlen(dev->drv->image_path) ==
+                 sizeof(dev->drv->image_path) ? sizeof(dev->drv->image_path) - 1 :
+                                                strlen(dev->drv->image_path);
+             dev->drv->image_path[term] = '\0';
+        }
+    }
+
+    if (ret && !skip_insert) {
+        /* Signal media change to the emulated machine. */
+        rdisk_insert((rdisk_t *) dev);
+
+        /* The drive was previously empty, transition directly to UNIT ATTENTION. */
+        if (was_empty)
+            rdisk_insert((rdisk_t *) dev);
+    }
+
+    if (ret)
+        ui_sb_update_icon_wp(SB_RDISK | dev->id, dev->drv->read_only);
+}
+
+void
+rdisk_disk_reload(const rdisk_t *dev)
+{
+    if (strlen(dev->drv->prev_image_path) != 0)
+        (void) rdisk_load(dev, dev->drv->prev_image_path, 0);
+}
+
+static void
+rdisk_disk_unload(const rdisk_t *dev)
+{
+    if ((dev->drv != NULL) && (dev->drv->fp != NULL)) {
+        fclose(dev->drv->fp);
+        dev->drv->fp = NULL;
+    }
+}
+
+void
+rdisk_disk_close(const rdisk_t *dev)
+{
+    if ((dev->drv != NULL) && (dev->drv->fp != NULL)) {
+        rdisk_disk_unload(dev);
+
+        memcpy(dev->drv->prev_image_path, dev->drv->image_path,
+               sizeof(dev->drv->prev_image_path));
+        memset(dev->drv->image_path, 0, sizeof(dev->drv->image_path));
+
+        dev->drv->medium_size = 0;
+
+        rdisk_insert((rdisk_t *) dev);
+    }
+}
+
+static void
+rdisk_set_callback(const rdisk_t *dev)
+{
+    if (dev->drv->bus_type != RDISK_BUS_SCSI)
+        ide_set_callback(ide_drives[dev->drv->ide_channel], dev->callback);
+}
+
+static void
+rdisk_init(rdisk_t *dev)
+{
+    if (dev->id < RDISK_NUM) {
+        dev->requested_blocks = 1;
+        dev->sense[0]         = 0xf0;
+        dev->sense[7]         = 10;
+        dev->drv->bus_mode    = 0;
+        if (dev->drv->bus_type >= RDISK_BUS_ATAPI)
+            dev->drv->bus_mode |= 2;
+        if (dev->drv->bus_type < RDISK_BUS_SCSI)
+            dev->drv->bus_mode |= 1;
+        rdisk_log(dev->log, "Bus type %i, bus mode %i\n", dev->drv->bus_type, dev->drv->bus_mode);
+        if (dev->drv->bus_type < RDISK_BUS_SCSI) {
+            dev->tf->phase          = 1;
+            dev->tf->request_length = 0xEB14;
+        }
+        dev->tf->status    = READY_STAT | DSC_STAT;
+        dev->tf->pos       = 0;
+        dev->packet_status = PHASE_NONE;
+        rdisk_sense_key = rdisk_asc = rdisk_ascq = dev->unit_attention = dev->transition = 0;
+        rdisk_info      = 0x00000000;
+    }
+}
+
+static int
+rdisk_supports_pio(const rdisk_t *dev)
+{
+    return (dev->drv->bus_mode & 1);
+}
+
+static int
+rdisk_supports_dma(const rdisk_t *dev)
+{
+    return (dev->drv->bus_mode & 2);
+}
+
+/* Returns: 0 for none, 1 for PIO, 2 for DMA. */
+static int
+rdisk_current_mode(const rdisk_t *dev)
+{
+    if (!rdisk_supports_pio(dev) && !rdisk_supports_dma(dev))
+        return 0;
+    if (rdisk_supports_pio(dev) && !rdisk_supports_dma(dev)) {
+        rdisk_log(dev->log, "Drive does not support DMA, setting to PIO\n");
+        return 1;
+    }
+    if (!rdisk_supports_pio(dev) && rdisk_supports_dma(dev))
+        return 2;
+    if (rdisk_supports_pio(dev) && rdisk_supports_dma(dev)) {
+        rdisk_log(dev->log, "Drive supports both, setting to %s\n",
+                (dev->tf->features & 1) ? "DMA" : "PIO");
+        return (dev->tf->features & 1) ? 2 : 1;
+    }
+
+    return 0;
+}
+
+static void
+rdisk_mode_sense_load(rdisk_t *dev)
+{
+    char  fn[512] = { 0 };
+
+    memset(&dev->ms_pages_saved, 0, sizeof(mode_sense_pages_t));
+
+    if (dev->drv->type == RDISK_TYPE_ZIP_100) {
+        if (rdisk_drives[dev->id].bus_type == RDISK_BUS_SCSI)
+            memcpy(&dev->ms_pages_saved, &zip_mode_sense_pages_default_scsi, sizeof(mode_sense_pages_t));
+        else
+            memcpy(&dev->ms_pages_saved, &zip_mode_sense_pages_default, sizeof(mode_sense_pages_t));
+    } else {
+        if (rdisk_drives[dev->id].bus_type == RDISK_BUS_SCSI)
+            memcpy(&dev->ms_pages_saved, &zip_250_mode_sense_pages_default_scsi, sizeof(mode_sense_pages_t));
+        else
+            memcpy(&dev->ms_pages_saved, &zip_250_mode_sense_pages_default, sizeof(mode_sense_pages_t));
+    }
+
+    if (dev->drv->bus_type == RDISK_BUS_SCSI)
+        sprintf(fn, "scsi_rdisk_%02i_mode_sense_bin", dev->id);
+    else
+        sprintf(fn, "rdisk_%02i_mode_sense_bin", dev->id);
+    FILE *fp = plat_fopen(nvr_path(fn), "rb");
+    if (fp) {
+        /* Nothing to read, not used by RDISK. */
+        fclose(fp);
+    }
+}
+
+static void
+rdisk_mode_sense_save(const rdisk_t *dev)
+{
+    char  fn[512] = { 0 };
+
+    if (dev->drv->bus_type == RDISK_BUS_SCSI)
+        sprintf(fn, "scsi_rdisk_%02i_mode_sense_bin", dev->id);
+    else
+        sprintf(fn, "rdisk_%02i_mode_sense_bin", dev->id);
+    FILE *fp = plat_fopen(nvr_path(fn), "wb");
+    if (fp) {
+        /* Nothing to write, not used by RDISK. */
+        fclose(fp);
+    }
+}
+
+/* SCSI Mode Sense 6/10. */
+static uint8_t
+zip_mode_sense_read(const rdisk_t *dev, const uint8_t pgctl,
+                    const uint8_t page, const uint8_t pos)
+{
+    switch (pgctl) {
+        case 0:
+        case 3:
+            if ((dev->drv->type != RDISK_TYPE_ZIP_100) && (page == 5) && (pos == 9) &&
+                (dev->drv->medium_size == ZIP_SECTORS))
+                return 0x60;
+            return dev->ms_pages_saved.pages[page][pos];
+        case 1:
+            if (dev->drv->type == RDISK_TYPE_ZIP_100)
+                return zip_mode_sense_pages_changeable.pages[page][pos];
+            else
+                return zip_250_mode_sense_pages_changeable.pages[page][pos];
+        case 2:
+            if (dev->drv->type == RDISK_TYPE_ZIP_100) {
+                if (dev->drv->bus_type == RDISK_BUS_SCSI)
+                    return zip_mode_sense_pages_default_scsi.pages[page][pos];
+                else
+                    return zip_mode_sense_pages_default.pages[page][pos];
+            } else {
+                if ((page == 5) && (pos == 9) && (dev->drv->medium_size == ZIP_SECTORS))
+                    return 0x60;
+                if (dev->drv->bus_type == RDISK_BUS_SCSI)
+                    return zip_250_mode_sense_pages_default_scsi.pages[page][pos];
+                else
+                    return zip_250_mode_sense_pages_default.pages[page][pos];
+            }
+
+        default:
+            break;
+    }
+
+    return 0;
+}
+
+static uint32_t
+rdisk_mode_sense(const rdisk_t *dev, uint8_t *buf, uint32_t pos,
+               uint8_t page, const uint8_t block_descriptor_len)
+{
+    uint64_t       pf;
+    const uint8_t  pgctl = (page >> 6) & 3;
+
+    if (dev->drv->type == RDISK_TYPE_ZIP_100)
+        pf = zip_mode_sense_page_flags;
+    else
+        pf = zip_250_mode_sense_page_flags;
+
+    page &= 0x3f;
+
+    if (block_descriptor_len) {
+        buf[pos++] = ((dev->drv->medium_size >> 24) & 0xff);
+        buf[pos++] = ((dev->drv->medium_size >> 16) & 0xff);
+        buf[pos++] = ((dev->drv->medium_size >> 8) & 0xff);
+        buf[pos++] = (dev->drv->medium_size & 0xff);
+        buf[pos++] = 0; /* Reserved. */
+        buf[pos++] = 0; /* Block length (0x200 = 512 bytes). */
+        buf[pos++] = 2;
+        buf[pos++] = 0;
+    }
+
+    for (uint8_t i = 0; i < 0x40; i++) {
+        if ((page == GPMODE_ALL_PAGES) || (page == i)) {
+            if (pf & (1LL << ((uint64_t) page))) {
+                const uint8_t msplen = zip_mode_sense_read(dev, pgctl, i, 1);
+                buf[pos++]           = zip_mode_sense_read(dev, pgctl, i, 0);
+                buf[pos++]           = msplen;
+                rdisk_log(dev->log, "MODE SENSE: Page [%02X] length %i\n", i, msplen);
+                for (uint8_t j = 0; j < msplen; j++)
+                    buf[pos++] = zip_mode_sense_read(dev, pgctl, i, 2 + j);
+            }
+        }
+    }
+
+    return pos;
+}
+
+static void
+rdisk_update_request_length(rdisk_t *dev, int len, int block_len)
+{
+    int bt;
+    int min_len = 0;
+
+    dev->max_transfer_len = dev->tf->request_length;
+
+    /*
+       For media access commands, make sure the requested DRQ length matches the
+       block length.
+     */
+    switch (dev->current_cdb[0]) {
+        case 0x08:
+        case 0x0a:
+        case 0x28:
+        case 0x2a:
+        case 0xa8:
+        case 0xaa:
+            /* Round it to the nearest 2048 bytes. */
+            dev->max_transfer_len = (dev->max_transfer_len >> 9) << 9;
+
+            /*
+               Make sure total length is not bigger than sum of the lengths of
+               all the requested blocks.
+             */
+            bt = (dev->requested_blocks * block_len);
+            if (len > bt)
+                len = bt;
+
+            min_len = block_len;
+
+            if (len <= block_len) {
+                /* Total length is less or equal to block length. */
+                if (dev->max_transfer_len < block_len) {
+                    /* Transfer a minimum of (block size) bytes. */
+                    dev->max_transfer_len = block_len;
+                    dev->packet_len       = block_len;
+                    break;
+                }
+            }
+            fallthrough;
+
+        default:
+            dev->packet_len = len;
+            break;
+    }
+    /*
+       If the DRQ length is odd, and the total remaining length is bigger,
+       make sure it's even.
+     */
+    if ((dev->max_transfer_len & 1) && (dev->max_transfer_len < len))
+        dev->max_transfer_len &= 0xfffe;
+    /*
+       If the DRQ length is smaller or equal in size to the total remaining length,
+       set it to that.
+     */
+    if (!dev->max_transfer_len)
+        dev->max_transfer_len = 65534;
+
+    if ((len <= dev->max_transfer_len) && (len >= min_len))
+        dev->tf->request_length = dev->max_transfer_len = len;
+    else if (len > dev->max_transfer_len)
+        dev->tf->request_length = dev->max_transfer_len;
+
+    return;
+}
+
+static double
+rdisk_bus_speed(rdisk_t *dev)
+{
+    double ret = -1.0;
+
+    if (dev && dev->drv)
+        ret = ide_atapi_get_period(dev->drv->ide_channel);
+
+    if (ret == -1.0) {
+        if (dev)
+            dev->callback = -1.0;
+        ret = 0.0;
+    }
+
+    return ret;
+}
+
+static void
+rdisk_command_common(rdisk_t *dev)
+{
+    dev->tf->status = BUSY_STAT;
+    dev->tf->phase  = 1;
+    dev->tf->pos    = 0;
+    if (dev->packet_status == PHASE_COMPLETE)
+        dev->callback = 0.0;
+    else if (dev->drv->bus_type == RDISK_BUS_SCSI)
+        dev->callback = -1.0; /* Speed depends on SCSI controller */
+    else
+        dev->callback = rdisk_bus_speed(dev) * (double) (dev->packet_len);
+
+    rdisk_set_callback(dev);
+}
+
+static void
+rdisk_command_complete(rdisk_t *dev)
+{
+    dev->packet_status = PHASE_COMPLETE;
+    rdisk_command_common(dev);
+}
+
+static void
+rdisk_command_read(rdisk_t *dev)
+{
+    dev->packet_status = PHASE_DATA_IN;
+    rdisk_command_common(dev);
+}
+
+static void
+rdisk_command_read_dma(rdisk_t *dev)
+{
+    dev->packet_status = PHASE_DATA_IN_DMA;
+    rdisk_command_common(dev);
+}
+
+static void
+rdisk_command_write(rdisk_t *dev)
+{
+    dev->packet_status = PHASE_DATA_OUT;
+    rdisk_command_common(dev);
+}
+
+static void
+rdisk_command_write_dma(rdisk_t *dev)
+{
+    dev->packet_status = PHASE_DATA_OUT_DMA;
+    rdisk_command_common(dev);
+}
+
+/*
+   dev = Pointer to current RDISK device;
+   len = Total transfer length;
+   block_len = Length of a single block (why does it matter?!);
+   alloc_len = Allocated transfer length;
+   direction = Transfer direction (0 = read from host, 1 = write to host).
+ */
+static void
+rdisk_data_command_finish(rdisk_t *dev, int len, const int block_len,
+                        const int alloc_len, const int direction)
+{
+    rdisk_log(dev->log, "Finishing command (%02X): %i, %i, %i, %i, %i\n",
+            dev->current_cdb[0], len, block_len, alloc_len,
+            direction, dev->tf->request_length);
+    dev->tf->pos = 0;
+    if (alloc_len >= 0) {
+        if (alloc_len < len)
+            len = alloc_len;
+    }
+    if ((len == 0) || (rdisk_current_mode(dev) == 0)) {
+        if (dev->drv->bus_type != RDISK_BUS_SCSI)
+            dev->packet_len = 0;
+
+        rdisk_command_complete(dev);
+    } else {
+        if (rdisk_current_mode(dev) == 2) {
+            if (dev->drv->bus_type != RDISK_BUS_SCSI)
+                dev->packet_len = alloc_len;
+
+            if (direction == 0)
+                rdisk_command_read_dma(dev);
+            else
+                rdisk_command_write_dma(dev);
+        } else {
+            rdisk_update_request_length(dev, len, block_len);
+            if ((dev->drv->bus_type != RDISK_BUS_SCSI) &&
+                (dev->tf->request_length == 0))
+                rdisk_command_complete(dev);
+            else if (direction == 0)
+                rdisk_command_read(dev);
+            else
+                rdisk_command_write(dev);
+        }
+    }
+
+    rdisk_log(dev->log, "Status: %i, cylinder %i, packet length: %i, position: %i, phase: %i\n",
+            dev->packet_status, dev->tf->request_length, dev->packet_len,
+            dev->tf->pos, dev->tf->phase);
+}
+
+static void
+rdisk_sense_clear(rdisk_t *dev, UNUSED(int command))
+{
+    rdisk_sense_key = rdisk_asc = rdisk_ascq = 0;
+    rdisk_info      = 0x00000000;
+}
+
+static void
+rdisk_set_phase(const rdisk_t *dev, const uint8_t phase)
+{
+    const uint8_t scsi_bus = (dev->drv->scsi_device_id >> 4) & 0x0f;
+    const uint8_t scsi_id  = dev->drv->scsi_device_id & 0x0f;
+
+    if (dev->drv->bus_type == RDISK_BUS_SCSI)
+        scsi_devices[scsi_bus][scsi_id].phase = phase;
+}
+
+static void
+rdisk_cmd_error(rdisk_t *dev)
+{
+    rdisk_set_phase(dev, SCSI_PHASE_STATUS);
+    dev->tf->error = ((rdisk_sense_key & 0xf) << 4) | ABRT_ERR;
+    dev->tf->status    = READY_STAT | ERR_STAT;
+    dev->tf->phase     = 3;
+    dev->tf->pos       = 0;
+    dev->packet_status = PHASE_ERROR;
+    dev->callback      = 50.0 * RDISK_TIME;
+    rdisk_set_callback(dev);
+    ui_sb_update_icon(SB_RDISK | dev->id, 0);
+    ui_sb_update_icon_write(SB_RDISK | dev->id, 0);
+    rdisk_log(dev->log, "[%02X] ERROR: %02X/%02X/%02X\n", dev->current_cdb[0], rdisk_sense_key,
+            rdisk_asc, rdisk_ascq);
+}
+
+static void
+rdisk_unit_attention(rdisk_t *dev)
+{
+    rdisk_set_phase(dev, SCSI_PHASE_STATUS);
+    dev->tf->error = (SENSE_UNIT_ATTENTION << 4) | ABRT_ERR;
+    dev->tf->status    = READY_STAT | ERR_STAT;
+    dev->tf->phase     = 3;
+    dev->tf->pos       = 0;
+    dev->packet_status = PHASE_ERROR;
+    dev->callback      = 50.0 * RDISK_TIME;
+    rdisk_set_callback(dev);
+    ui_sb_update_icon(SB_RDISK | dev->id, 0);
+    ui_sb_update_icon_write(SB_RDISK | dev->id, 0);
+    rdisk_log(dev->log, "UNIT ATTENTION\n", dev->id);
+}
+
+static void
+rdisk_buf_alloc(rdisk_t *dev, const uint32_t len)
+{
+    rdisk_log(dev->log, "Allocated buffer length: %i\n", len);
+
+    if (dev->buffer == NULL) {
+        dev->buffer = (uint8_t *) malloc(len);
+        dev->buffer_sz = len;
+    }
+
+    if (len > dev->buffer_sz) {
+        uint8_t *buf = (uint8_t *) realloc(dev->buffer, len);
+        dev->buffer = buf;
+        dev->buffer_sz = len;
+    }
+}
+
+static void
+rdisk_buf_free(rdisk_t *dev)
+{
+    if (dev->buffer != NULL) {
+        rdisk_log(dev->log, "Removable Disk %i: Freeing buffer...\n");
+        free(dev->buffer);
+        dev->buffer = NULL;
+    }
+}
+
+static void
+rdisk_bus_master_error(scsi_common_t *sc)
+{
+    rdisk_t *dev = (rdisk_t *) sc;
+
+    rdisk_buf_free(dev);
+    rdisk_sense_key = rdisk_asc = rdisk_ascq = 0;
+    rdisk_info      =  (dev->sector_pos >> 24)        |
+                    ((dev->sector_pos >> 16) <<  8) |
+                    ((dev->sector_pos >> 8)  << 16) |
+                    ( dev->sector_pos        << 24);
+    rdisk_cmd_error(dev);
+}
+
+static void
+rdisk_not_ready(rdisk_t *dev)
+{
+    rdisk_sense_key = SENSE_NOT_READY;
+    rdisk_asc       = ASC_MEDIUM_NOT_PRESENT;
+    rdisk_ascq      = 0;
+    rdisk_info      = 0x00000000;
+    rdisk_cmd_error(dev);
+}
+
+static void
+rdisk_write_protected(rdisk_t *dev)
+{
+    rdisk_sense_key = SENSE_UNIT_ATTENTION;
+    rdisk_asc       = ASC_WRITE_PROTECTED;
+    rdisk_ascq      = 0;
+    rdisk_info      =  (dev->sector_pos >> 24)        |
+                    ((dev->sector_pos >> 16) <<  8) |
+                    ((dev->sector_pos >> 8)  << 16) |
+                    ( dev->sector_pos        << 24);
+    rdisk_cmd_error(dev);
+}
+
+static void
+rdisk_write_error(rdisk_t *dev)
+{
+    rdisk_sense_key = SENSE_MEDIUM_ERROR;
+    rdisk_asc       = ASC_WRITE_ERROR;
+    rdisk_ascq      = 0;
+    rdisk_info      =  (dev->sector_pos >> 24)        |
+                    ((dev->sector_pos >> 16) <<  8) |
+                    ((dev->sector_pos >> 8)  << 16) |
+                    ( dev->sector_pos        << 24);
+    rdisk_cmd_error(dev);
+}
+
+static void
+rdisk_read_error(rdisk_t *dev)
+{
+    rdisk_sense_key = SENSE_MEDIUM_ERROR;
+    rdisk_asc       = ASC_UNRECOVERED_READ_ERROR;
+    rdisk_ascq      = 0;
+    rdisk_info      =  (dev->sector_pos >> 24)        |
+                    ((dev->sector_pos >> 16) <<  8) |
+                    ((dev->sector_pos >> 8)  << 16) |
+                    ( dev->sector_pos        << 24);
+    rdisk_cmd_error(dev);
+}
+
+static void
+rdisk_invalid_lun(rdisk_t *dev, const uint8_t lun)
+{
+    rdisk_sense_key = SENSE_ILLEGAL_REQUEST;
+    rdisk_asc       = ASC_INV_LUN;
+    rdisk_ascq      = 0;
+    rdisk_info      = lun << 24;
+    rdisk_cmd_error(dev);
+}
+
+static void
+rdisk_illegal_opcode(rdisk_t *dev, const uint8_t opcode)
+{
+    rdisk_sense_key = SENSE_ILLEGAL_REQUEST;
+    rdisk_asc       = ASC_ILLEGAL_OPCODE;
+    rdisk_ascq      = 0;
+    rdisk_info      = opcode << 24;
+    rdisk_cmd_error(dev);
+}
+
+static void
+rdisk_lba_out_of_range(rdisk_t *dev)
+{
+    rdisk_sense_key = SENSE_ILLEGAL_REQUEST;
+    rdisk_asc       = ASC_LBA_OUT_OF_RANGE;
+    rdisk_ascq      = 0;
+    rdisk_info      =  (dev->sector_pos >> 24)        |
+                    ((dev->sector_pos >> 16) <<  8) |
+                    ((dev->sector_pos >> 8)  << 16) |
+                    ( dev->sector_pos        << 24);
+    rdisk_cmd_error(dev);
+}
+
+static void
+rdisk_invalid_field(rdisk_t *dev, const uint32_t field)
+{
+    rdisk_sense_key = SENSE_ILLEGAL_REQUEST;
+    rdisk_asc       = ASC_INV_FIELD_IN_CMD_PACKET;
+    rdisk_ascq      = 0;
+    rdisk_info      =  (field >> 24)        |
+                    ((field >> 16) <<  8) |
+                    ((field >> 8)  << 16) |
+                    ( field        << 24);
+    rdisk_cmd_error(dev);
+    dev->tf->status = 0x53;
+}
+
+static void
+rdisk_invalid_field_pl(rdisk_t *dev, const uint32_t field)
+{
+    rdisk_sense_key = SENSE_ILLEGAL_REQUEST;
+    rdisk_asc       = ASC_INV_FIELD_IN_PARAMETER_LIST;
+    rdisk_ascq      = 0;
+    rdisk_info      =  (field >> 24)        |
+                    ((field >> 16) <<  8) |
+                    ((field >> 8)  << 16) |
+                    ( field        << 24);
+    rdisk_cmd_error(dev);
+    dev->tf->status = 0x53;
+}
+
+static void
+rdisk_data_phase_error(rdisk_t *dev, const uint32_t info)
+{
+    rdisk_sense_key = SENSE_ILLEGAL_REQUEST;
+    rdisk_asc       = ASC_DATA_PHASE_ERROR;
+    rdisk_ascq      = 0;
+    rdisk_info      =  (info >> 24)        |
+                    ((info >> 16) <<  8) |
+                    ((info >> 8)  << 16) |
+                    ( info        << 24);
+    rdisk_cmd_error(dev);
+}
+
+static int
+rdisk_blocks(rdisk_t *dev, int32_t *len, const int out)
+{
+    int ret = 1;
+    *len    = 0;
+
+    if (dev->sector_len > 0) {
+        rdisk_log(dev->log, "%sing %i blocks starting from %i...\n", out ? "Writ" : "Read",
+                dev->requested_blocks, dev->sector_pos);
+
+        if (dev->sector_pos >= dev->drv->medium_size) {
+            rdisk_log(dev->log, "Trying to %s beyond the end of disk\n",
+                    out ? "write" : "read");
+            rdisk_lba_out_of_range(dev);
+            ret = 0;
+        } else {
+            *len    = dev->requested_blocks << 9;
+
+            for (int i = 0; i < dev->requested_blocks; i++) {
+                if (fseek(dev->drv->fp, dev->drv->base + (dev->sector_pos << 9),
+                    SEEK_SET) == -1) {
+                    if (out)
+                        rdisk_write_error(dev);
+                    else
+                        rdisk_read_error(dev);
+                    ret = -1;
+                } else {
+                    if (feof(dev->drv->fp))
+                        break;
+
+                    if (out) {
+                        if (fwrite(dev->buffer + (i << 9), 1,
+                                   512, dev->drv->fp) != 512) {
+                            rdisk_log(dev->log, "rdisk_blocks(): Error writing data\n");
+                            rdisk_write_error(dev);
+                            ret = -1;
+                        } else
+                            fflush(dev->drv->fp);
+                    } else if (fread(dev->buffer + (i << 9), 1,
+                                     512, dev->drv->fp) != 512) {
+                        rdisk_log(dev->log, "rdisk_blocks(): Error reading data\n");
+                        rdisk_read_error(dev);
+                        ret = -1;
+                    }
+                }
+
+                if (ret == -1)
+                    break;
+
+                dev->sector_pos++;
+            }
+
+            if (ret == 1) {
+                rdisk_log(dev->log, "%s %i bytes of blocks...\n", out ? "Written" :
+                        "Read", *len);
+
+                dev->sector_len -= dev->requested_blocks;
+            }
+        }
+    } else {
+        rdisk_command_complete(dev);
+        ret = 0;
+    }
+
+    return ret;
+}
+
+void
+rdisk_insert(rdisk_t *dev)
+{
+    if ((dev != NULL) && (dev->drv != NULL)) {
+        if (dev->drv->fp == NULL) {
+            dev->unit_attention = 0;
+            dev->transition     = 0;
+            rdisk_log(dev->log, "Media removal\n");
+        } else if (dev->transition) {
+            dev->unit_attention = 1;
+            /* Turn off the medium changed status. */
+            dev->transition     = 0;
+            rdisk_log(dev->log, "Media insert\n");
+        } else {
+            dev->unit_attention = 0;
+            dev->transition     = 1;
+            rdisk_log(dev->log, "Media transition\n");
+        }
+    }
+}
+
+static int
+rdisk_pre_execution_check(rdisk_t *dev, const uint8_t *cdb)
+{
+    int ready;
+
+    if ((cdb[0] != GPCMD_REQUEST_SENSE) && (dev->cur_lun == SCSI_LUN_USE_CDB) &&
+        (cdb[1] & 0xe0)) {
+        rdisk_log(dev->log, "Attempting to execute a unknown command targeted at SCSI LUN %i\n",
+                ((dev->tf->request_length >> 5) & 7));
+        rdisk_invalid_lun(dev, cdb[1] >> 5);
+        return 0;
+    }
+
+    if (!(rdisk_command_flags[cdb[0]] & IMPLEMENTED)) {
+        rdisk_log(dev->log, "Attempting to execute unknown command %02X over %s\n",
+                cdb[0], (dev->drv->bus_type == RDISK_BUS_SCSI) ?
+                "SCSI" : "ATAPI");
+
+        rdisk_illegal_opcode(dev, cdb[0]);
+        return 0;
+    }
+
+    if ((dev->drv->bus_type < RDISK_BUS_SCSI) &&
+        (rdisk_command_flags[cdb[0]] & SCSI_ONLY)) {
+        rdisk_log(dev->log, "Attempting to execute SCSI-only command %02X "
+                "over ATAPI\n", cdb[0]);
+        rdisk_illegal_opcode(dev, cdb[0]);
+        return 0;
+    }
+
+    if ((dev->drv->bus_type == RDISK_BUS_SCSI) &&
+        (rdisk_command_flags[cdb[0]] & ATAPI_ONLY)) {
+        rdisk_log(dev->log, "Attempting to execute ATAPI-only command %02X "
+                "over SCSI\n", cdb[0]);
+        rdisk_illegal_opcode(dev, cdb[0]);
+        return 0;
+    }
+
+    if (dev->transition) {
+        if ((cdb[0] == GPCMD_TEST_UNIT_READY) || (cdb[0] == GPCMD_REQUEST_SENSE))
+            ready = 0;
+        else {
+            if (!(rdisk_command_flags[cdb[0]] & ALLOW_UA)) {
+                rdisk_log(dev->log, "(ext_medium_changed != 0): rdisk_insert()\n");
+                rdisk_insert((void *) dev);
+            }
+
+            ready = (dev->drv->fp != NULL);
+        }
+    } else
+        ready = (dev->drv->fp != NULL);
+
+    /*
+       If the drive is not ready, there is no reason to keep the
+       UNIT ATTENTION condition present, as we only use it to mark
+       disc changes.
+     */
+    if (!ready && (dev->unit_attention > 0))
+        dev->unit_attention = 0;
+
+    /*
+       If the UNIT ATTENTION condition is set and the command does not allow
+       execution under it, error out and report the condition.
+     */
+    if (dev->unit_attention == 1) {
+        /*
+           Only increment the unit attention phase if the command can
+           not pass through it.
+         */
+        if (!(rdisk_command_flags[cdb[0]] & ALLOW_UA)) {
+            rdisk_log(dev->log, "Unit attention now 2\n");
+            dev->unit_attention++;
+            rdisk_log(dev->log, "UNIT ATTENTION: Command %02X not allowed to pass through\n",
+                    cdb[0]);
+            rdisk_unit_attention(dev);
+            return 0;
+        }
+    } else if (dev->unit_attention == 2) {
+        if (cdb[0] != GPCMD_REQUEST_SENSE) {
+            rdisk_log(dev->log, "Unit attention now 0\n");
+            dev->unit_attention = 0;
+        }
+    }
+
+    /*
+       Unless the command is REQUEST SENSE, clear the sense. This will *NOT* clear
+       the UNIT ATTENTION condition if it's set.
+     */
+    if (cdb[0] != GPCMD_REQUEST_SENSE)
+        rdisk_sense_clear(dev, cdb[0]);
+
+    if (!ready && (rdisk_command_flags[cdb[0]] & CHECK_READY)) {
+        rdisk_log(dev->log, "Not ready (%02X)\n", cdb[0]);
+        rdisk_not_ready(dev);
+        return 0;
+    }
+
+    rdisk_log(dev->log, "Continuing with command %02X\n", cdb[0]);
+    return 1;
+}
+
+static void
+rdisk_seek(rdisk_t *dev, const uint32_t pos)
+{
+    dev->sector_pos = pos;
+}
+
+static void
+rdisk_rezero(rdisk_t *dev)
+{
+    dev->sector_pos = dev->sector_len = 0;
+    rdisk_seek(dev, 0);
+}
+
+void
+rdisk_reset(scsi_common_t *sc)
+{
+    rdisk_t *dev = (rdisk_t *) sc;
+
+    rdisk_rezero(dev);
+    dev->tf->status         = 0;
+    dev->callback           = 0.0;
+    rdisk_set_callback(dev);
+    dev->tf->phase          = 1;
+    dev->tf->request_length = 0xEB14;
+    dev->packet_status      = PHASE_NONE;
+    dev->unit_attention     = 0;
+    dev->cur_lun            = SCSI_LUN_USE_CDB;
+    rdisk_sense_key = rdisk_asc = rdisk_ascq = dev->unit_attention = dev->transition = 0;
+    rdisk_info      = 0x00000000;
+}
+
+static void
+rdisk_request_sense(rdisk_t *dev, uint8_t *buffer, const uint8_t alloc_length, const int desc)
+{
+    /*Will return 18 bytes of 0*/
+    if (alloc_length != 0) {
+        memset(buffer, 0, alloc_length);
+        if (!desc)
+            memcpy(buffer, dev->sense, alloc_length);
+        else {
+            buffer[1] = rdisk_sense_key;
+            buffer[2] = rdisk_asc;
+            buffer[3] = rdisk_ascq;
+        }
+    }
+
+    buffer[0] = desc ? 0x72 : 0xf0;
+    if (!desc)
+        buffer[7] = 10;
+
+    if (dev->unit_attention && (rdisk_sense_key == 0)) {
+        buffer[desc ? 1 : 2]  = SENSE_UNIT_ATTENTION;
+        buffer[desc ? 2 : 12] = ASC_MEDIUM_MAY_HAVE_CHANGED;
+        buffer[desc ? 3 : 13] = 0;
+    }
+
+    rdisk_log(dev->log, "Reporting sense: %02X %02X %02X\n", buffer[2],
+            buffer[12], buffer[13]);
+
+    if (buffer[desc ? 1 : 2] == SENSE_UNIT_ATTENTION) {
+        /* If the last remaining sense is unit attention, clear
+           that condition. */
+        dev->unit_attention = 0;
+    }
+
+    /* Clear the sense stuff as per the spec. */
+    rdisk_sense_clear(dev, GPCMD_REQUEST_SENSE);
+
+    if (dev->transition) {
+        rdisk_log(dev->log, "Removable Disk_TRANSITION: rdisk_insert()\n");
+        rdisk_insert((void *) dev);
+    }
+}
+
+static void
+rdisk_request_sense_for_scsi(scsi_common_t *sc, uint8_t *buffer, const uint8_t alloc_length)
+{
+    rdisk_t     *dev   = (rdisk_t *) sc;
+    const int  ready = (dev->drv->fp != NULL);
+
+    if (!ready && dev->unit_attention) {
+        /*
+           If the drive is not ready, there is no reason to keep the UNIT ATTENTION
+           condition present, as we only use it to mark disc changes.
+         */
+        dev->unit_attention = 0;
+    }
+
+    /* Do *NOT* advance the unit attention phase. */
+    rdisk_request_sense(dev, buffer, alloc_length, 0);
+}
+
+static void
+rdisk_set_buf_len(const rdisk_t *dev, int32_t *BufLen, int32_t *src_len)
+{
+    if (dev->drv->bus_type == RDISK_BUS_SCSI) {
+        if (*BufLen == -1)
+            *BufLen = *src_len;
+        else {
+            *BufLen  = MIN(*src_len, *BufLen);
+            *src_len = *BufLen;
+        }
+        rdisk_log(dev->log, "Actual transfer length: %i\n", *BufLen);
+    }
+}
+
+static void
+rdisk_command(scsi_common_t *sc, const uint8_t *cdb)
+{
+    rdisk_t       *dev                = (rdisk_t *) sc;
+    char           device_identify[9] = { '8', '6', 'B', '_', 'R', 'D', '0', '0', 0 };
+    const uint8_t  scsi_bus           = (dev->drv->scsi_device_id >> 4) & 0x0f;
+    const uint8_t  scsi_id            = dev->drv->scsi_device_id & 0x0f;
+    int            pos                = 0;
+    int            idx                = 0;
+    int32_t        blen               = 0;
+    uint32_t       i;
+    unsigned       preamble_len;
+    int32_t        len;
+    int32_t        max_len;
+    int32_t        alloc_length;
+    int            block_desc;
+    int            size_idx;
+    int32_t *      BufLen;
+
+    if (dev->drv->bus_type == RDISK_BUS_SCSI) {
+        BufLen          = &scsi_devices[scsi_bus][scsi_id].buffer_length;
+        dev->tf->status &= ~ERR_STAT;
+    } else {
+        BufLen         = &blen;
+        dev->tf->error = 0;
+    }
+
+    dev->packet_len  = 0;
+    dev->request_pos = 0;
+
+    device_identify[7] = dev->id + 0x30;
+
+    memcpy(dev->current_cdb, cdb, 12);
+
+    if (cdb[0] != 0) {
+        rdisk_log(dev->log, "Command 0x%02X, Sense Key %02X, Asc %02X, Ascq %02X, "
+                "Unit attention: %i\n",
+                cdb[0], rdisk_sense_key, rdisk_asc, rdisk_ascq, dev->unit_attention);
+        rdisk_log(dev->log, "Request length: %04X\n", dev->tf->request_length);
+
+        rdisk_log(dev->log, "CDB: %02X %02X %02X %02X %02X %02X %02X %02X "
+                "%02X %02X %02X %02X\n",
+                cdb[0], cdb[1], cdb[2], cdb[3], cdb[4], cdb[5], cdb[6], cdb[7],
+                cdb[8], cdb[9], cdb[10], cdb[11]);
+    }
+
+    dev->sector_len = 0;
+
+    rdisk_set_phase(dev, SCSI_PHASE_STATUS);
+
+    /*
+       This handles the Not Ready/Unit Attention check if it has to be handled at
+       this point.
+     */
+    if (rdisk_pre_execution_check(dev, cdb) == 0)
+        return;
+
+    switch (cdb[0]) {
+        case GPCMD_SEND_DIAGNOSTIC:
+            if (!(cdb[1] & (1 << 2))) {
+                rdisk_invalid_field(dev, cdb[1]);
+                return;
+            }
+            fallthrough;
+        case GPCMD_SCSI_RESERVE:
+        case GPCMD_SCSI_RELEASE:
+        case GPCMD_TEST_UNIT_READY:
+            rdisk_set_phase(dev, SCSI_PHASE_STATUS);
+            rdisk_command_complete(dev);
+            break;
+
+        case GPCMD_FORMAT_UNIT:
+            if (dev->drv->read_only)
+                rdisk_write_protected(dev);
+            else {
+                rdisk_set_phase(dev, SCSI_PHASE_STATUS);
+                rdisk_command_complete(dev);
+            }
+            break;
+
+        case GPCMD_IOMEGA_SENSE:
+            rdisk_set_phase(dev, SCSI_PHASE_DATA_IN);
+            max_len = cdb[4];
+            rdisk_buf_alloc(dev, 256);
+            rdisk_set_buf_len(dev, BufLen, &max_len);
+            memset(dev->buffer, 0, 256);
+            if (cdb[2] == 1) {
+                /*
+                   This page is related to disk health status - setting
+                   this page to 0 makes disk health read as "marginal".
+                 */
+                dev->buffer[0] = 0x58;
+                dev->buffer[1] = 0x00;
+                for (i = 0x00; i < 0x58; i++)
+                    dev->buffer[i + 0x02] = 0xff;
+            } else if (cdb[2] == 2) {
+                dev->buffer[0] = 0x3d;
+                dev->buffer[1] = 0x00;
+                for (i = 0x00; i < 0x13; i++)
+                    dev->buffer[i + 0x02] = 0x00;
+                dev->buffer[0x15] = 0x00;
+                if (dev->drv->read_only)
+                    dev->buffer[0x15] |= 0x02;
+                for (i = 0x00; i < 0x27; i++)
+                    dev->buffer[i + 0x16] = 0x00;
+            } else {
+                rdisk_invalid_field(dev, cdb[2]);
+                rdisk_buf_free(dev);
+                return;
+            }
+            rdisk_data_command_finish(dev, 18, 18, cdb[4], 0);
+            break;
+
+        case GPCMD_REZERO_UNIT:
+            dev->sector_pos = dev->sector_len = 0;
+            rdisk_seek(dev, 0);
+            rdisk_set_phase(dev, SCSI_PHASE_STATUS);
+            break;
+
+        case GPCMD_REQUEST_SENSE:
+            /*
+               If there's a unit attention condition and there's a buffered not ready, a
+               standalone REQUEST SENSE should forget about the not ready, and report unit
+               attention straight away.
+             */
+            rdisk_set_phase(dev, SCSI_PHASE_DATA_IN);
+            max_len = cdb[4];
+
+            if (!max_len) {
+                rdisk_set_phase(dev, SCSI_PHASE_STATUS);
+                dev->packet_status = PHASE_COMPLETE;
+                dev->callback      = 20.0 * RDISK_TIME;
+                rdisk_set_callback(dev);
+                break;
+            }
+
+            rdisk_buf_alloc(dev, 256);
+            rdisk_set_buf_len(dev, BufLen, &max_len);
+            len = (cdb[1] & 1) ? 8 : 18;
+            rdisk_request_sense(dev, dev->buffer, max_len, cdb[1] & 1);
+            rdisk_data_command_finish(dev, len, len, cdb[4], 0);
+            break;
+
+        case GPCMD_MECHANISM_STATUS:
+            rdisk_set_phase(dev, SCSI_PHASE_DATA_IN);
+            len = (cdb[8] << 8) | cdb[9];
+
+            rdisk_buf_alloc(dev, 8);
+            rdisk_set_buf_len(dev, BufLen, &len);
+
+            memset(dev->buffer, 0, 8);
+            dev->buffer[5] = 1;
+
+            rdisk_data_command_finish(dev, 8, 8, len, 0);
+            break;
+
+        case GPCMD_READ_6:
+        case GPCMD_READ_10:
+        case GPCMD_READ_12:
+            rdisk_set_phase(dev, SCSI_PHASE_DATA_IN);
+            alloc_length = 512;
+
+            switch (cdb[0]) {
+                case GPCMD_READ_6:
+                    dev->sector_len = cdb[4];
+                    /*
+                       For READ (6) and WRITE (6), a length of 0 indicates a
+                       transfer of 256 sectors.
+                     */
+                    if (dev->sector_len == 0)
+                        dev->sector_len = 256;
+                    dev->sector_pos = ((((uint32_t) cdb[1]) & 0x1f) << 16) |
+                                      (((uint32_t) cdb[2]) << 8) | ((uint32_t) cdb[3]);
+                    rdisk_log(dev->log, "Length: %i, LBA: %i\n", dev->sector_len, dev->sector_pos);
+                    break;
+                case GPCMD_READ_10:
+                    dev->sector_len = (cdb[7] << 8) | cdb[8];
+                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) |
+                                      (cdb[4] << 8) | cdb[5];
+                    rdisk_log(dev->log, "Length: %i, LBA: %i\n", dev->sector_len, dev->sector_pos);
+                    break;
+                case GPCMD_READ_12:
+                    dev->sector_len = (((uint32_t) cdb[6]) << 24) |
+                                      (((uint32_t) cdb[7]) << 16) |
+                                      (((uint32_t) cdb[8]) << 8) | ((uint32_t) cdb[9]);
+                    dev->sector_pos = (((uint32_t) cdb[2]) << 24) |
+                                      (((uint32_t) cdb[3]) << 16) |
+                                      (((uint32_t) cdb[4]) << 8) | ((uint32_t) cdb[5]);
+                    break;
+
+                default:
+                    break;
+            }
+
+            if (dev->sector_pos >= dev->drv->medium_size)
+                rdisk_lba_out_of_range(dev);
+            else if (dev->sector_len) {
+                max_len               = dev->sector_len;
+                dev->requested_blocks = max_len;
+
+                dev->packet_len = max_len * alloc_length;
+                rdisk_buf_alloc(dev, dev->packet_len);
+
+                const int ret = rdisk_blocks(dev, &alloc_length, 0);
+                alloc_length  = dev->requested_blocks * 512;
+
+                if (ret > 0) {
+                    dev->requested_blocks = max_len;
+                    dev->packet_len       = alloc_length;
+
+                    rdisk_set_buf_len(dev, BufLen, (int32_t *) &dev->packet_len);
+
+                    rdisk_data_command_finish(dev, alloc_length, 512,
+                                            alloc_length, 0);
+
+                    ui_sb_update_icon(SB_RDISK | dev->id,
+                                      dev->packet_status != PHASE_COMPLETE);
+                } else {
+                    rdisk_set_phase(dev, SCSI_PHASE_STATUS);
+                    dev->packet_status = (ret < 0) ? PHASE_ERROR : PHASE_COMPLETE;
+                    dev->callback      = 20.0 * RDISK_TIME;
+                    rdisk_set_callback(dev);
+                    rdisk_buf_free(dev);
+                }
+            } else {
+                rdisk_set_phase(dev, SCSI_PHASE_STATUS);
+                /* rdisk_log(dev->log, "All done - callback set\n"); */
+                dev->packet_status = PHASE_COMPLETE;
+                dev->callback      = 20.0 * RDISK_TIME;
+                rdisk_set_callback(dev);
+                break;
+            }
+            break;
+
+        case GPCMD_VERIFY_6:
+        case GPCMD_VERIFY_10:
+        case GPCMD_VERIFY_12:
+            if (!(cdb[1] & 2)) {
+                rdisk_set_phase(dev, SCSI_PHASE_STATUS);
+                rdisk_command_complete(dev);
+                break;
+            }
+            fallthrough;
+        case GPCMD_WRITE_6:
+        case GPCMD_WRITE_10:
+        case GPCMD_WRITE_AND_VERIFY_10:
+        case GPCMD_WRITE_12:
+        case GPCMD_WRITE_AND_VERIFY_12:
+            rdisk_set_phase(dev, SCSI_PHASE_DATA_OUT);
+            alloc_length = 512;
+
+            if (dev->drv->read_only) {
+                rdisk_write_protected(dev);
+                break;
+            }
+
+            switch (cdb[0]) {
+                case GPCMD_VERIFY_6:
+                case GPCMD_WRITE_6:
+                    dev->sector_len = cdb[4];
+                    /*
+                       For READ (6) and WRITE (6), a length of 0 indicates a
+                       transfer of 256 sectors.
+                     */
+                    if (dev->sector_len == 0)
+                        dev->sector_len = 256;
+                    dev->sector_pos = ((((uint32_t) cdb[1]) & 0x1f) << 16) |
+                                      (((uint32_t) cdb[2]) << 8) | ((uint32_t) cdb[3]);
+                    break;
+                case GPCMD_VERIFY_10:
+                case GPCMD_WRITE_10:
+                case GPCMD_WRITE_AND_VERIFY_10:
+                    dev->sector_len = (cdb[7] << 8) | cdb[8];
+                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) |
+                                      (cdb[4] << 8) | cdb[5];
+                    rdisk_log(dev->log, "Length: %i, LBA: %i\n",
+                            dev->sector_len, dev->sector_pos);
+                    break;
+                case GPCMD_VERIFY_12:
+                case GPCMD_WRITE_12:
+                case GPCMD_WRITE_AND_VERIFY_12:
+                    dev->sector_len = (((uint32_t) cdb[6]) << 24) |
+                                      (((uint32_t) cdb[7]) << 16) |
+                                      (((uint32_t) cdb[8]) << 8) | ((uint32_t) cdb[9]);
+                    dev->sector_pos = (((uint32_t) cdb[2]) << 24) |
+                                      (((uint32_t) cdb[3]) << 16) |
+                                      (((uint32_t) cdb[4]) << 8) | ((uint32_t) cdb[5]);
+                    break;
+
+                default:
+                    break;
+            }
+
+            if (dev->sector_pos >= dev->drv->medium_size)
+                rdisk_lba_out_of_range(dev);
+            if (dev->sector_len) {
+                max_len               = dev->sector_len;
+                dev->requested_blocks = max_len;
+
+                dev->packet_len = max_len * alloc_length;
+                rdisk_buf_alloc(dev, dev->packet_len);
+
+                dev->requested_blocks = max_len;
+                dev->packet_len       = max_len << 9;
+
+                rdisk_set_buf_len(dev, BufLen, (int32_t *) &dev->packet_len);
+
+                rdisk_data_command_finish(dev, dev->packet_len, 512,
+                                        dev->packet_len, 1);
+
+                ui_sb_update_icon_write(SB_RDISK | dev->id,
+                                  dev->packet_status != PHASE_COMPLETE);
+            } else {
+                rdisk_set_phase(dev, SCSI_PHASE_STATUS);
+                /* rdisk_log(dev->log, "All done - callback set\n"); */
+                dev->packet_status = PHASE_COMPLETE;
+                dev->callback      = 20.0 * RDISK_TIME;
+                rdisk_set_callback(dev);
+            }
+            break;
+
+        case GPCMD_WRITE_SAME_10:
+            rdisk_set_phase(dev, SCSI_PHASE_DATA_OUT);
+            alloc_length = 512;
+
+            if ((cdb[1] & 6) == 6)
+                rdisk_invalid_field(dev, cdb[1]);
+            else {
+                if (dev->drv->read_only)
+                    rdisk_write_protected(dev);
+                else {
+                    dev->sector_len = (cdb[7] << 8) | cdb[8];
+                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) |
+                                      (cdb[4] << 8) | cdb[5];
+
+                    if (dev->sector_pos >= dev->drv->medium_size)
+                        rdisk_lba_out_of_range(dev);
+                    else if (dev->sector_len) {
+                        rdisk_buf_alloc(dev, alloc_length);
+                        rdisk_set_buf_len(dev, BufLen, (int32_t *) &dev->packet_len);
+
+                        max_len               = 1;
+                        dev->requested_blocks = 1;
+
+                        dev->packet_len = alloc_length;
+
+                        rdisk_set_phase(dev, SCSI_PHASE_DATA_OUT);
+
+                        rdisk_data_command_finish(dev, 512, 512,
+                                                alloc_length, 1);
+
+                        ui_sb_update_icon_write(SB_RDISK | dev->id,
+                                          dev->packet_status != PHASE_COMPLETE);
+                    } else {
+                        rdisk_set_phase(dev, SCSI_PHASE_STATUS);
+                        /* rdisk_log(dev->log, "All done - callback set\n"); */
+                        dev->packet_status = PHASE_COMPLETE;
+                        dev->callback      = 20.0 * RDISK_TIME;
+                        rdisk_set_callback(dev);
+                    }
+                }
+            }
+            break;
+
+        case GPCMD_MODE_SENSE_6:
+        case GPCMD_MODE_SENSE_10:
+            rdisk_set_phase(dev, SCSI_PHASE_DATA_IN);
+
+            if (dev->drv->bus_type == RDISK_BUS_SCSI)
+                block_desc = ((cdb[1] >> 3) & 1) ? 0 : 1;
+            else
+                block_desc = 0;
+
+            if (cdb[0] == GPCMD_MODE_SENSE_6) {
+                len = cdb[4];
+                rdisk_buf_alloc(dev, 256);
+            } else {
+                len = (cdb[8] | (cdb[7] << 8));
+                rdisk_buf_alloc(dev, 65536);
+            }
+
+            if (zip_mode_sense_page_flags & (1LL << (uint64_t) (cdb[2] & 0x3f))) {
+                memset(dev->buffer, 0, len);
+                alloc_length = len;
+
+                if (cdb[0] == GPCMD_MODE_SENSE_6) {
+                    len            = rdisk_mode_sense(dev, dev->buffer, 4, cdb[2],
+                                                      block_desc);
+                    len            = MIN(len, alloc_length);
+                    dev->buffer[0] = len - 1;
+                    dev->buffer[1] = 0;
+                    if (block_desc)
+                        dev->buffer[3] = 8;
+                } else {
+                    len            = rdisk_mode_sense(dev, dev->buffer, 8, cdb[2],
+                                                      block_desc);
+                    len            = MIN(len, alloc_length);
+                    dev->buffer[0] = (len - 2) >> 8;
+                    dev->buffer[1] = (len - 2) & 255;
+                    dev->buffer[2] = 0;
+                    if (block_desc) {
+                        dev->buffer[6] = 0;
+                        dev->buffer[7] = 8;
+                    }
+                }
+
+                rdisk_set_buf_len(dev, BufLen, &len);
+
+                rdisk_log(dev->log, "Reading mode page: %02X...\n", cdb[2]);
+
+                rdisk_data_command_finish(dev, len, len, alloc_length, 0);
+            } else {
+                rdisk_invalid_field(dev, cdb[2]);
+                rdisk_buf_free(dev);
+            }
+            break;
+
+        case GPCMD_MODE_SELECT_6:
+        case GPCMD_MODE_SELECT_10:
+            rdisk_set_phase(dev, SCSI_PHASE_DATA_OUT);
+
+            if (cdb[0] == GPCMD_MODE_SELECT_6) {
+                len = cdb[4];
+                rdisk_buf_alloc(dev, 256);
+            } else {
+                len = (cdb[7] << 8) | cdb[8];
+                rdisk_buf_alloc(dev, 65536);
+            }
+
+            rdisk_set_buf_len(dev, BufLen, &len);
+
+            dev->total_length = len;
+            dev->do_page_save = cdb[1] & 1;
+
+            rdisk_data_command_finish(dev, len, len, len, 1);
+            return;
+
+        case GPCMD_START_STOP_UNIT:
+            rdisk_set_phase(dev, SCSI_PHASE_STATUS);
+
+            switch (cdb[4] & 3) {
+                case 0:                 /* Stop the disc. */
+                    rdisk_eject(dev->id); /* The Iomega Windows 9x drivers require this. */
+                    break;
+                case 1: /* Start the disc and read the TOC. */
+                    break;
+                case 2: /* Eject the disc if possible. */
+#if 0
+                    rdisk_eject(dev->id);
+#endif
+                    break;
+                case 3: /* Load the disc (close tray). */
+                    rdisk_reload(dev->id);
+                    break;
+
+                default:
+                    break;
+            }
+
+            rdisk_command_complete(dev);
+            break;
+
+        case GPCMD_INQUIRY:
+            rdisk_set_phase(dev, SCSI_PHASE_DATA_IN);
+
+            max_len = cdb[3];
+            max_len <<= 8;
+            max_len |= cdb[4];
+
+            rdisk_buf_alloc(dev, 65536);
+
+            if (cdb[1] & 1) {
+                preamble_len = 4;
+                size_idx     = 3;
+
+                dev->buffer[idx++] = 0;
+                dev->buffer[idx++] = cdb[2];
+                dev->buffer[idx++] = 0;
+
+                idx++;
+
+                switch (cdb[2]) {
+                    case 0x00:
+                        dev->buffer[idx++] = 0x00;
+                        dev->buffer[idx++] = 0x83;
+                        break;
+                    case 0x83:
+                        if (idx + 24 > max_len) {
+                            rdisk_data_phase_error(dev, cdb[2]);
+                            rdisk_buf_free(dev);
+                            return;
+                        }
+
+                        dev->buffer[idx++] = 0x02;
+                        dev->buffer[idx++] = 0x00;
+                        dev->buffer[idx++] = 0x00;
+                        dev->buffer[idx++] = 20;
+                        ide_padstr8(dev->buffer + idx, 20, "53R141"); /* Serial */
+                        idx += 20;
+
+                        if (idx + 72 > cdb[4])
+                            goto atapi_out;
+                        dev->buffer[idx++] = 0x02;
+                        dev->buffer[idx++] = 0x01;
+                        dev->buffer[idx++] = 0x00;
+                        dev->buffer[idx++] = 68;
+                        /* Vendor */
+                        if (dev->drv->type >= RDISK_TYPE_ZIP_100)
+                            ide_padstr8(dev->buffer + idx, 8, "IOMEGA  ");
+                        else
+                            ide_padstr8(dev->buffer + 8, 8, EMU_NAME);          /* Vendor */
+                        idx += 8;
+                        /* Product */
+                        if (dev->drv->type == RDISK_TYPE_ZIP_250)
+                            ide_padstr8(dev->buffer + idx, 40, "ZIP 250         ");
+                        else if (dev->drv->type == RDISK_TYPE_ZIP_100)
+                            ide_padstr8(dev->buffer + idx, 40, "ZIP 100         ");
+                        else
+                            ide_padstr8(dev->buffer + 16, 40, device_identify);      /* Product */
+                        idx += 40;
+                        ide_padstr8(dev->buffer + idx, 20, "53R141");
+                        idx += 20;
+                        break;
+                    default:
+                        rdisk_log(dev->log, "INQUIRY: Invalid page: %02X\n", cdb[2]);
+                        rdisk_invalid_field(dev, cdb[2]);
+                        rdisk_buf_free(dev);
+                        return;
+                }
+            } else {
+                preamble_len = 5;
+                size_idx     = 4;
+
+                memset(dev->buffer, 0, 8);
+                if ((cdb[1] & 0xe0) || ((dev->cur_lun > 0x00) && (dev->cur_lun < 0xff)))
+                    dev->buffer[0] = 0x7f;    /* No physical device on this LUN */
+                else
+                    dev->buffer[0] = 0x00;    /* Hard disk */
+                dev->buffer[1] = 0x80;        /* Removable */
+                /* SCSI-2 compliant */
+                dev->buffer[2] = (dev->drv->bus_type == RDISK_BUS_SCSI) ? 0x02 : 0x00;
+                dev->buffer[3] = (dev->drv->bus_type == RDISK_BUS_SCSI) ? 0x02 : 0x21;
+#if 0
+                dev->buffer[4] = 31;
+#endif
+                dev->buffer[4] = 0;
+                if (dev->drv->bus_type == RDISK_BUS_SCSI) {
+                    dev->buffer[6] = 1;       /* 16-bit transfers supported */
+                    dev->buffer[7] = 0x20;    /* Wide bus supported */
+                }
+                dev->buffer[7] |= 0x02;
+
+                ide_padstr8(dev->buffer + 8, 8, "IOMEGA  ");    /* Vendor */
+                if (dev->drv->type == RDISK_TYPE_ZIP_250) {
+                    /* Product */
+                    ide_padstr8(dev->buffer + 16, 16, "ZIP 250         ");
+                    /* Revision */
+                    ide_padstr8(dev->buffer + 32, 4, "42.S");
+                    /* Date? */
+                    if (max_len >= 44)
+                        ide_padstr8(dev->buffer + 36, 8, "08/08/01");
+                    if (max_len >= 122)
+                        ide_padstr8(dev->buffer + 96, 26, "(c) Copyright IOMEGA 2000 "); /* Copyright string */
+                } else if (dev->drv->type == RDISK_TYPE_ZIP_100) {
+                    /* Product */
+                    ide_padstr8(dev->buffer + 16, 16, "ZIP 100         ");
+                    /* Revision */
+                    ide_padstr8(dev->buffer + 32, 4, "E.08");
+                } else {
+                    ide_padstr8(dev->buffer + 8, 8,
+                                EMU_NAME);          /* Vendor */
+                    ide_padstr8(dev->buffer + 16, 16,
+                                device_identify);      /* Product */
+                    ide_padstr8(dev->buffer + 32, 4,
+                                EMU_VERSION_EX);    /* Revision */
+                }
+                idx = 36;
+
+                if (max_len == 96) {
+                    dev->buffer[4] = 91;
+                    idx            = 96;
+                } else if (max_len == 128) {
+                    dev->buffer[4] = 0x75;
+                    idx            = 128;
+                }
+            }
+
+atapi_out:
+            dev->buffer[size_idx] = idx - preamble_len;
+            len                   = idx;
+
+            len = MIN(len, max_len);
+            rdisk_set_buf_len(dev, BufLen, &len);
+
+            rdisk_data_command_finish(dev, len, len, max_len, 0);
+            break;
+
+        case GPCMD_PREVENT_REMOVAL:
+            rdisk_set_phase(dev, SCSI_PHASE_STATUS);
+            rdisk_command_complete(dev);
+            break;
+
+        case GPCMD_SEEK_6:
+        case GPCMD_SEEK_10:
+            rdisk_set_phase(dev, SCSI_PHASE_STATUS);
+
+            switch (cdb[0]) {
+                case GPCMD_SEEK_6:
+                    pos = (cdb[2] << 8) | cdb[3];
+                    break;
+                case GPCMD_SEEK_10:
+                    pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
+                    break;
+
+                default:
+                    break;
+            }
+            rdisk_seek(dev, pos);
+            rdisk_command_complete(dev);
+            break;
+
+        case GPCMD_READ_CDROM_CAPACITY:
+            rdisk_set_phase(dev, SCSI_PHASE_DATA_IN);
+
+            rdisk_buf_alloc(dev, 8);
+
+            /* IMPORTANT: What's returned is the last LBA block. */
+            max_len = dev->drv->medium_size - 1;
+            memset(dev->buffer, 0, 8);
+            dev->buffer[0] = (max_len >> 24) & 0xff;
+            dev->buffer[1] = (max_len >> 16) & 0xff;
+            dev->buffer[2] = (max_len >> 8) & 0xff;
+            dev->buffer[3] = max_len & 0xff;
+            dev->buffer[6] = 2; /* 512 = 0x0200 */
+            len            = 8;
+
+            rdisk_set_buf_len(dev, BufLen, &len);
+
+            rdisk_data_command_finish(dev, len, len, len, 0);
+            break;
+
+        case GPCMD_IOMEGA_EJECT:
+            rdisk_set_phase(dev, SCSI_PHASE_STATUS);
+            rdisk_eject(dev->id);
+            rdisk_command_complete(dev);
+            break;
+
+        case GPCMD_READ_FORMAT_CAPACITIES:
+            len = (cdb[7] << 8) | cdb[8];
+
+            rdisk_buf_alloc(dev, len);
+            memset(dev->buffer, 0, len);
+
+            pos = 0;
+
+            /* List header */
+            dev->buffer[pos++] = 0;
+            dev->buffer[pos++] = 0;
+            dev->buffer[pos++] = 0;
+            if (dev->drv->fp != NULL)
+                dev->buffer[pos++] = 16;
+            else
+                dev->buffer[pos++] = 8;
+
+            /* Current/Maximum capacity header */
+            if (dev->drv->type == RDISK_TYPE_ZIP_100) {
+                /* ZIP 100 only supports ZIP 100 media as well, so we always return
+                   the ZIP 100 size. */
+                dev->buffer[pos++] = (ZIP_SECTORS >> 24) & 0xff;
+                dev->buffer[pos++] = (ZIP_SECTORS >> 16) & 0xff;
+                dev->buffer[pos++] = (ZIP_SECTORS >> 8) & 0xff;
+                dev->buffer[pos++] = ZIP_SECTORS & 0xff;
+                if (dev->drv->fp != NULL)
+                    dev->buffer[pos++] = 2;
+                else
+                    dev->buffer[pos++] = 3;
+            } else {
+                /* ZIP 250 also supports ZIP 100 media, so if the medium is inserted,
+                   we return the inserted medium's size, otherwise, the ZIP 250 size. */
+                if (dev->drv->fp != NULL) {
+                    dev->buffer[pos++] = (dev->drv->medium_size >> 24) & 0xff;
+                    dev->buffer[pos++] = (dev->drv->medium_size >> 16) & 0xff;
+                    dev->buffer[pos++] = (dev->drv->medium_size >> 8) & 0xff;
+                    dev->buffer[pos++] = dev->drv->medium_size & 0xff;
+                    dev->buffer[pos++] = 2; /* Current medium capacity */
+                } else {
+                    dev->buffer[pos++] = (ZIP_250_SECTORS >> 24) & 0xff;
+                    dev->buffer[pos++] = (ZIP_250_SECTORS >> 16) & 0xff;
+                    dev->buffer[pos++] = (ZIP_250_SECTORS >> 8) & 0xff;
+                    dev->buffer[pos++] = ZIP_250_SECTORS & 0xff;
+                    dev->buffer[pos++] = 3; /* Maximum medium capacity */
+                }
+            }
+
+            dev->buffer[pos++] = 512 >> 16;
+            dev->buffer[pos++] = 512 >> 8;
+            dev->buffer[pos++] = 512 & 0xff;
+
+            if (dev->drv->fp != NULL) {
+                /* Formattable capacity descriptor */
+                dev->buffer[pos++] = (dev->drv->medium_size >> 24) & 0xff;
+                dev->buffer[pos++] = (dev->drv->medium_size >> 16) & 0xff;
+                dev->buffer[pos++] = (dev->drv->medium_size >> 8) & 0xff;
+                dev->buffer[pos++] = dev->drv->medium_size & 0xff;
+                dev->buffer[pos++] = 0;
+                dev->buffer[pos++] = 512 >> 16;
+                dev->buffer[pos++] = 512 >> 8;
+                dev->buffer[pos++] = 512 & 0xff;
+            }
+
+            rdisk_set_buf_len(dev, BufLen, &len);
+
+            rdisk_data_command_finish(dev, len, len, len, 0);
+            break;
+
+        default:
+            rdisk_illegal_opcode(dev, cdb[0]);
+            break;
+    }
+
+#if 0
+    rdisk_log(dev->log, "Phase: %02X, request length: %i\n",
+            dev->tf->phase, dev->tf->request_length);
+#endif
+
+    if ((dev->packet_status == PHASE_COMPLETE) || (dev->packet_status == PHASE_ERROR))
+        rdisk_buf_free(dev);
+}
+
+static void
+rdisk_command_stop(scsi_common_t *sc)
+{
+    rdisk_t *dev = (rdisk_t *) sc;
+
+    rdisk_command_complete(dev);
+    rdisk_buf_free(dev);
+}
+
+/* The command second phase function, needed for Mode Select. */
+static uint8_t
+rdisk_phase_data_out(scsi_common_t *sc)
+{
+    rdisk_t *dev              = (rdisk_t *) sc;
+    int      len            = 0;
+    uint8_t  error          = 0;
+    uint32_t last_to_write;
+    uint32_t i;
+    uint16_t block_desc_len;
+    uint16_t pos;
+    uint16_t param_list_len;
+    uint8_t  hdr_len;
+    uint8_t  val;
+
+    switch (dev->current_cdb[0]) {
+        case GPCMD_VERIFY_6:
+        case GPCMD_VERIFY_10:
+        case GPCMD_VERIFY_12:
+            break;
+        case GPCMD_WRITE_6:
+        case GPCMD_WRITE_10:
+        case GPCMD_WRITE_AND_VERIFY_10:
+        case GPCMD_WRITE_12:
+        case GPCMD_WRITE_AND_VERIFY_12:
+            if (dev->requested_blocks > 0)
+                rdisk_blocks(dev, &len, 1);
+            break;
+        case GPCMD_WRITE_SAME_10:
+            if (!dev->current_cdb[7] && !dev->current_cdb[8]) {
+                last_to_write = (dev->drv->medium_size - 1);
+            } else
+                last_to_write = dev->sector_pos + dev->sector_len - 1;
+
+            for (i = dev->sector_pos; i <= last_to_write; i++) {
+                if (dev->current_cdb[1] & 2) {
+                    dev->buffer[0] = (i >> 24) & 0xff;
+                    dev->buffer[1] = (i >> 16) & 0xff;
+                    dev->buffer[2] = (i >> 8) & 0xff;
+                    dev->buffer[3] = i & 0xff;
+                } else if (dev->current_cdb[1] & 4) {
+                    /* CHS are 96, 1, 2048 (RDISK 100) and 239, 1, 2048 (RDISK 250) */
+                    const uint32_t s = (i % 2048);
+                    const uint32_t h = ((i - s) / 2048) % 1;
+                    const uint32_t c = ((i - s) / 2048) / 1;
+                    dev->buffer[0]   = (c >> 16) & 0xff;
+                    dev->buffer[1]   = (c >> 8) & 0xff;
+                    dev->buffer[2]   = c & 0xff;
+                    dev->buffer[3]   = h & 0xff;
+                    dev->buffer[4]   = (s >> 24) & 0xff;
+                    dev->buffer[5]   = (s >> 16) & 0xff;
+                    dev->buffer[6]   = (s >> 8) & 0xff;
+                    dev->buffer[7]   = s & 0xff;
+                }
+                if (fseek(dev->drv->fp, dev->drv->base + (i << 9),
+                          SEEK_SET) == -1)
+                    log_fatal(dev->log, "rdisk_phase_data_out(): Error seeking\n");
+                if (fwrite(dev->buffer, 1, 512, dev->drv->fp) != 512)
+                    log_fatal(dev->log, "rdisk_phase_data_out(): Error writing data\n");
+            }
+
+            fflush(dev->drv->fp);
+            break;
+        case GPCMD_MODE_SELECT_6:
+        case GPCMD_MODE_SELECT_10:
+            if (dev->current_cdb[0] == GPCMD_MODE_SELECT_10) {
+                hdr_len        = 8;
+                param_list_len = dev->current_cdb[7];
+                param_list_len <<= 8;
+                param_list_len |= dev->current_cdb[8];
+            } else {
+                hdr_len        = 4;
+                param_list_len = dev->current_cdb[4];
+            }
+
+            if (dev->drv->bus_type == RDISK_BUS_SCSI) {
+                if (dev->current_cdb[0] == GPCMD_MODE_SELECT_6) {
+                    block_desc_len = dev->buffer[2];
+                    block_desc_len <<= 8;
+                    block_desc_len |= dev->buffer[3];
+                } else {
+                    block_desc_len = dev->buffer[6];
+                    block_desc_len <<= 8;
+                    block_desc_len |= dev->buffer[7];
+                }
+            } else
+                block_desc_len = 0;
+
+            pos = hdr_len + block_desc_len;
+
+            while (1) {
+                if (pos >= param_list_len) {
+                    rdisk_log(dev->log, "Buffer has only block descriptor\n");
+                    break;
+                }
+
+                const uint8_t page     = dev->buffer[pos] & 0x3f;
+                const uint8_t page_len = dev->buffer[pos + 1];
+
+                pos += 2;
+
+                if (!(zip_mode_sense_page_flags & (1LL << ((uint64_t) page))))
+                    error |= 1;
+                else for (i = 0; i < page_len; i++) {
+                    const uint8_t old_val = dev->ms_pages_saved.pages[page][i + 2];
+                    const uint8_t ch      = zip_mode_sense_pages_changeable.pages[page][i + 2];
+                    val                   = dev->buffer[pos + i];
+                    if (val != old_val) {
+                        if (ch)
+                            dev->ms_pages_saved.pages[page][i + 2] = val;
+                        else {
+                            error |= 1;
+                            rdisk_invalid_field_pl(dev, val);
+                        }
+                    }
+                }
+
+                pos += page_len;
+
+                if (dev->drv->bus_type == RDISK_BUS_SCSI)
+                    val = zip_mode_sense_pages_default_scsi.pages[page][0] & 0x80;
+                else
+                    val = zip_mode_sense_pages_default.pages[page][0] & 0x80;
+                if (dev->do_page_save && val)
+                    rdisk_mode_sense_save(dev);
+
+                if (pos >= dev->total_length)
+                    break;
+            }
+
+            if (error) {
+                rdisk_buf_free(dev);
+                return 0;
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    rdisk_command_stop((scsi_common_t *) dev);
+    return 1;
+}
+
+/* Peform a master init on the entire module. */
+void
+rdisk_global_init(void)
+{
+    /* Clear the global data. */
+    memset(rdisk_drives, 0x00, sizeof(rdisk_drives));
+}
+
+static int
+rdisk_get_max(UNUSED(const ide_t *ide), const int ide_has_dma, const int type)
+{
+    int ret;
+
+    switch (type) {
+        case TYPE_PIO:
+            ret = 3;
+            break;
+        case TYPE_SDMA:
+        default:
+            ret = -1;
+            break;
+        case TYPE_MDMA:
+            ret = ide_has_dma ? 1 : -1;
+            break;
+        case TYPE_UDMA:
+            ret = ide_has_dma ? 5 : -1;
+            break;
+    }
+
+    return ret;
+}
+
+static int
+rdisk_get_timings(UNUSED(const ide_t *ide), const int ide_has_dma, const int type)
+{
+    int ret;
+
+    switch (type) {
+        case TIMINGS_DMA:
+            ret = ide_has_dma ? 0x96 : 0;
+            break;
+        case TIMINGS_PIO:
+            ret = 0xf0;
+            break;
+        case TIMINGS_PIO_FC:
+            ret = 0xb4;
+            break;
+        default:
+            ret = 0;
+            break;
+    }
+
+    return ret;
+}
+
+static void
+rdisk_zip_100_identify(const ide_t *ide)
+{
+    ide_padstr((char *) (ide->buffer + 23), "E.08", 8);                  /* Firmware */
+    ide_padstr((char *) (ide->buffer + 27), "IOMEGA ZIP 100 ATAPI", 40); /* Model */
+}
+
+static void
+rdisk_zip_250_identify(const ide_t *ide, const int ide_has_dma)
+{
+    /* Firmware */
+    ide_padstr((char *) (ide->buffer + 23), "42.S", 8);
+    /* Model */
+    ide_padstr((char *) (ide->buffer + 27), "IOMEGA  ZIP 250       ATAPI", 40);
+
+    if (ide_has_dma) {
+        ide->buffer[80] = 0x70;    /* Supported ATA versions : ATA/ATAPI-4 ATA/ATAPI-6 */
+        /* Maximum ATA revision supported : ATA/ATAPI-6 T13 1410D revision 3a */
+        ide->buffer[81] = 0x19;
+    }
+}
+
+static void
+rdisk_generic_identify(const ide_t *ide, const int ide_has_dma, const rdisk_t *rdisk)
+{
+    char model[40];
+
+    memset(model, 0, 40);
+    snprintf(model, 40, "%s %s%02i", EMU_NAME, "86B_RD", rdisk->id);
+    ide_padstr((char *) (ide->buffer + 23), EMU_VERSION_EX, 8);    /* Firmware */
+    ide_padstr((char *) (ide->buffer + 27), model, 40);               /* Model */
+
+    if (ide_has_dma) {
+        ide->buffer[80] = 0x70;    /* Supported ATA versions : ATA/ATAPI-4 ATA/ATAPI-6 */
+        /* Maximum ATA revision supported : ATA/ATAPI-6 T13 1410D revision 3a */
+        ide->buffer[81] = 0x19;
+    }
+}
+
+static void
+rdisk_identify(const ide_t *ide, const int ide_has_dma)
+{
+    const rdisk_t *rdisk = (rdisk_t *) ide->sc;
+
+    /*
+       ATAPI device, direct-access device, removable media, interrupt DRQ:
+
+       Using (2 << 5) below makes the ASUS P/I-P54TP4XE misdentify the RDISK drive
+       as a LS-120.
+     */
+    ide->buffer[0] = 0x8000 | (0 << 8) | 0x80 | (1 << 5);
+    ide_padstr((char *) (ide->buffer + 10), "", 20);    /* Serial Number */
+    ide->buffer[49]  = 0x200;                                  /* LBA supported */
+    /* Interpret zero byte count limit as maximum length */
+    ide->buffer[126] = 0xfffe;
+
+    if (rdisk_drives[rdisk->id].type == RDISK_TYPE_ZIP_250)
+        rdisk_zip_250_identify(ide, ide_has_dma);
+    else if (rdisk_drives[rdisk->id].type == RDISK_TYPE_ZIP_100)
+        rdisk_zip_100_identify(ide);
+    else
+        rdisk_generic_identify(ide, ide_has_dma, rdisk);
+}
+
+static void
+rdisk_drive_reset(const int c)
+{
+    const uint8_t scsi_bus = (rdisk_drives[c].scsi_device_id >> 4) & 0x0f;
+    const uint8_t scsi_id  = rdisk_drives[c].scsi_device_id & 0x0f;
+
+    if (rdisk_drives[c].priv == NULL) {
+        rdisk_drives[c].priv = (rdisk_t *) calloc(1, sizeof(rdisk_t));
+        rdisk_t *dev         = (rdisk_t *) rdisk_drives[c].priv;
+
+        char n[1024]       = { 0 };
+
+        sprintf(n, "Removable Disk %i", c + 1);
+        dev->log           = log_open(n);
+    }
+
+    rdisk_t *dev = (rdisk_t *) rdisk_drives[c].priv;
+
+    dev->id      = c;
+    dev->cur_lun = SCSI_LUN_USE_CDB;
+
+    if (rdisk_drives[c].bus_type == RDISK_BUS_SCSI) {
+        if (dev->tf == NULL)
+            dev->tf        = (ide_tf_t *) calloc(1, sizeof(ide_tf_t));
+
+        /* SCSI RDISK, attach to the SCSI bus. */
+        scsi_device_t *sd = &scsi_devices[scsi_bus][scsi_id];
+
+        sd->sc             = (scsi_common_t *) dev;
+        sd->command        = rdisk_command;
+        sd->request_sense  = rdisk_request_sense_for_scsi;
+        sd->reset          = rdisk_reset;
+        sd->phase_data_out = rdisk_phase_data_out;
+        sd->command_stop   = rdisk_command_stop;
+        sd->type           = SCSI_REMOVABLE_DISK;
+    } else if (rdisk_drives[c].bus_type == RDISK_BUS_ATAPI) {
+        /* ATAPI CD-ROM, attach to the IDE bus. */
+        ide_t         *id = ide_get_drive(rdisk_drives[c].ide_channel);
+        /* If the IDE channel is initialized, we attach to it,
+           otherwise, we do nothing - it's going to be a drive
+           that's not attached to anything. */
+        if (id) {
+            id->sc               = (scsi_common_t *) dev;
+            dev->tf              = id->tf;
+            IDE_ATAPI_IS_EARLY   = 0;
+            id->get_max          = rdisk_get_max;
+            id->get_timings      = rdisk_get_timings;
+            id->identify         = rdisk_identify;
+            id->stop             = NULL;
+            id->packet_command   = rdisk_command;
+            id->device_reset     = rdisk_reset;
+            id->phase_data_out   = rdisk_phase_data_out;
+            id->command_stop     = rdisk_command_stop;
+            id->bus_master_error = rdisk_bus_master_error;
+            id->interrupt_drq    = 1;
+
+            ide_atapi_attach(id);
+        }
+    }
+}
+
+void
+rdisk_hard_reset(void)
+{
+    for (uint8_t c = 0; c < RDISK_NUM; c++) {
+        if ((rdisk_drives[c].bus_type == RDISK_BUS_ATAPI) || (rdisk_drives[c].bus_type == RDISK_BUS_SCSI)) {
+
+            if (rdisk_drives[c].bus_type == RDISK_BUS_SCSI) {
+                const uint8_t scsi_bus = (rdisk_drives[c].scsi_device_id >> 4) & 0x0f;
+                const uint8_t scsi_id  = rdisk_drives[c].scsi_device_id & 0x0f;
+
+                /* Make sure to ignore any SCSI RDISK drive that has an out of range SCSI bus. */
+                if (scsi_bus >= SCSI_BUS_MAX)
+                    continue;
+
+                /* Make sure to ignore any SCSI RDISK drive that has an out of range ID. */
+                if (scsi_id >= SCSI_ID_MAX)
+                    continue;
+            }
+
+            /* Make sure to ignore any ATAPI RDISK drive that has an out of range IDE channel. */
+            if ((rdisk_drives[c].bus_type == RDISK_BUS_ATAPI) && (rdisk_drives[c].ide_channel > 7))
+                continue;
+
+            rdisk_drive_reset(c);
+
+            rdisk_t *dev = (rdisk_t *) rdisk_drives[c].priv;
+
+            rdisk_log(dev->log, "Removable Disk hard_reset drive=%d\n", c);
+
+            if (dev->tf == NULL)
+                continue;
+
+            dev->id  = c;
+            dev->drv = &rdisk_drives[c];
+
+            rdisk_init(dev);
+
+            if (strlen(rdisk_drives[c].image_path))
+                rdisk_load(dev, rdisk_drives[c].image_path, 0);
+
+            rdisk_mode_sense_load(dev);
+
+            if (rdisk_drives[c].bus_type == RDISK_BUS_SCSI)
+                rdisk_log(dev->log, "SCSI RDISK drive %i attached to SCSI ID %i\n",
+                        c, rdisk_drives[c].scsi_device_id);
+            else if (rdisk_drives[c].bus_type == RDISK_BUS_ATAPI)
+                rdisk_log(dev->log, "ATAPI RDISK drive %i attached to IDE channel %i\n",
+                        c, rdisk_drives[c].ide_channel);
+        }
+    }
+}
+
+void
+rdisk_close(void)
+{
+    for (uint8_t c = 0; c < RDISK_NUM; c++) {
+        if (rdisk_drives[c].bus_type == RDISK_BUS_SCSI) {
+            const uint8_t scsi_bus = (rdisk_drives[c].scsi_device_id >> 4) & 0x0f;
+            const uint8_t scsi_id  = rdisk_drives[c].scsi_device_id & 0x0f;
+
+            memset(&scsi_devices[scsi_bus][scsi_id], 0x00, sizeof(scsi_device_t));
+        }
+
+        rdisk_t *dev = (rdisk_t *) rdisk_drives[c].priv;
+
+        if (dev) {
+            rdisk_disk_unload(dev);
+
+            if (dev->tf)
+                free(dev->tf);
+
+            if (dev->log != NULL) {
+                rdisk_log(dev->log, "Log closed\n");
+
+                log_close(dev->log);
+                dev->log = NULL;
+            }
+
+            free(dev);
+            rdisk_drives[c].priv = NULL;
+        }
+    }
+}
diff --git a/src/disk/zip.c b/src/disk/zip.c
deleted file mode 100644
index d4b644865..000000000
--- a/src/disk/zip.c
+++ /dev/null
@@ -1,2442 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Implementation of the Iomega ZIP drive with SCSI(-like)
- *          commands, for both ATAPI and SCSI usage.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *
- *          Copyright 2018-2019 Miran Grca.
- */
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <wchar.h>
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include <86box/timer.h>
-#include <86box/config.h>
-#include <86box/timer.h>
-#include <86box/device.h>
-#include <86box/scsi.h>
-#include <86box/scsi_device.h>
-#include <86box/nvr.h>
-#include <86box/plat.h>
-#include <86box/ui.h>
-#include <86box/hdc.h>
-#include <86box/hdc_ide.h>
-#include <86box/zip.h>
-
-#define IDE_ATAPI_IS_EARLY             id->sc->pad0
-
-zip_drive_t zip_drives[ZIP_NUM];
-
-/* Table of all SCSI commands and their flags, needed for the new disc change / not ready handler. */
-const uint8_t zip_command_flags[0x100] = {
-    IMPLEMENTED | CHECK_READY | NONDATA,          /* 0x00 */
-    IMPLEMENTED | ALLOW_UA | NONDATA | SCSI_ONLY, /* 0x01 */
-    0,
-    IMPLEMENTED | ALLOW_UA,                                     /* 0x03 */
-    IMPLEMENTED | CHECK_READY | ALLOW_UA | NONDATA | SCSI_ONLY, /* 0x04 */
-    0,
-    IMPLEMENTED, /* 0x06 */
-    0,
-    IMPLEMENTED | CHECK_READY, /* 0x08 */
-    0,
-    IMPLEMENTED | CHECK_READY,           /* 0x0A */
-    IMPLEMENTED | CHECK_READY | NONDATA, /* 0x0B */
-    IMPLEMENTED,                         /* 0x0C */
-    IMPLEMENTED | ATAPI_ONLY,            /* 0x0D */
-    0, 0, 0, 0,
-    IMPLEMENTED | ALLOW_UA,                          /* 0x12 */
-    IMPLEMENTED | CHECK_READY | NONDATA | SCSI_ONLY, /* 0x13 */
-    0,
-    IMPLEMENTED,             /* 0x15 */
-    IMPLEMENTED | SCSI_ONLY, /* 0x16 */
-    IMPLEMENTED | SCSI_ONLY, /* 0x17 */
-    0, 0,
-    IMPLEMENTED,               /* 0x1A */
-    IMPLEMENTED | CHECK_READY, /* 0x1B */
-    0,
-    IMPLEMENTED,               /* 0x1D */
-    IMPLEMENTED | CHECK_READY, /* 0x1E */
-    0, 0, 0, 0,
-    IMPLEMENTED | ATAPI_ONLY, /* 0x23 */
-    0,
-    IMPLEMENTED | CHECK_READY, /* 0x25 */
-    0, 0,
-    IMPLEMENTED | CHECK_READY, /* 0x28 */
-    0,
-    IMPLEMENTED | CHECK_READY,           /* 0x2A */
-    IMPLEMENTED | CHECK_READY | NONDATA, /* 0x2B */
-    0, 0,
-    IMPLEMENTED | CHECK_READY,                       /* 0x2E */
-    IMPLEMENTED | CHECK_READY | NONDATA | SCSI_ONLY, /* 0x2F */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0,
-    IMPLEMENTED | CHECK_READY, /* 0x41 */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0,
-    IMPLEMENTED, /* 0x55 */
-    0, 0, 0, 0,
-    IMPLEMENTED, /* 0x5A */
-    0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    IMPLEMENTED | CHECK_READY, /* 0xA8 */
-    0,
-    IMPLEMENTED | CHECK_READY, /* 0xAA */
-    0, 0, 0,
-    IMPLEMENTED | CHECK_READY,                       /* 0xAE */
-    IMPLEMENTED | CHECK_READY | NONDATA | SCSI_ONLY, /* 0xAF */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    IMPLEMENTED, /* 0xBD */
-    0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static uint64_t zip_mode_sense_page_flags     = (GPMODEP_R_W_ERROR_PAGE | GPMODEP_DISCONNECT_PAGE | GPMODEP_IOMEGA_PAGE | GPMODEP_ALL_PAGES);
-static uint64_t zip_250_mode_sense_page_flags = (GPMODEP_R_W_ERROR_PAGE | GPMODEP_FLEXIBLE_DISK_PAGE | GPMODEP_CACHING_PAGE | GPMODEP_IOMEGA_PAGE | GPMODEP_ALL_PAGES);
-
-static const mode_sense_pages_t zip_mode_sense_pages_default =
-    // clang-format off
-{   {
-    {                        0,    0 },
-    {    GPMODE_R_W_ERROR_PAGE, 0x0a, 0xc8, 22, 0,  0, 0, 0, 90, 0, 0x50, 0x20 },
-    {   GPMODE_DISCONNECT_PAGE, 0x0e, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {       GPMODE_IOMEGA_PAGE,    0x04, 0x5c, 0x0f, 0xff, 0x0f }
-}   };
-// clang-format on
-
-static const mode_sense_pages_t zip_250_mode_sense_pages_default =
-    // clang-format off
-{   {
-    {                        0,    0 },
-    {    GPMODE_R_W_ERROR_PAGE, 0x06, 0xc8, 0x64, 0,  0, 0, 0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {GPMODE_FLEXIBLE_DISK_PAGE, 0x1e, 0x80, 0, 0x40, 0x20, 2, 0, 0, 0xef, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x0b, 0x7d, 0, 0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {      GPMODE_CACHING_PAGE, 0x0a, 4, 0, 0xff, 0xff, 0, 0, 0xff, 0xff, 0xff, 0xff },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {       GPMODE_IOMEGA_PAGE,    0x04, 0x5c, 0x0f, 0x3c, 0x0f }
-}   };
-// clang-format on
-
-static const mode_sense_pages_t zip_mode_sense_pages_default_scsi =
-    // clang-format off
-{   {
-    {                        0,    0 },
-    {    GPMODE_R_W_ERROR_PAGE, 0x0a, 0xc8, 22, 0,  0, 0, 0, 90, 0, 0x50, 0x20 },
-    {   GPMODE_DISCONNECT_PAGE, 0x0e, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {       GPMODE_IOMEGA_PAGE,    0x04, 0x5c, 0x0f, 0xff, 0x0f }
-}   };
-// clang-format on
-
-static const mode_sense_pages_t zip_250_mode_sense_pages_default_scsi =
-    // clang-format off
-{   {
-    {                        0,    0 },
-    {    GPMODE_R_W_ERROR_PAGE, 0x06, 0xc8, 0x64, 0,  0, 0, 0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {GPMODE_FLEXIBLE_DISK_PAGE, 0x1e, 0x80, 0, 0x40, 0x20, 2, 0, 0, 0xef, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x0b, 0x7d, 0, 0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {      GPMODE_CACHING_PAGE, 0x0a, 4, 0, 0xff, 0xff, 0, 0, 0xff, 0xff, 0xff, 0xff },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {       GPMODE_IOMEGA_PAGE,    0x04, 0x5c, 0x0f, 0x3c, 0x0f }
-}   };
-// clang-format on
-
-static const mode_sense_pages_t zip_mode_sense_pages_changeable =
-    // clang-format off
-{   {
-    {                        0,    0 },
-
-    {    GPMODE_R_W_ERROR_PAGE, 0x0a, 0xFF, 0xFF, 0,  0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF },
-    {   GPMODE_DISCONNECT_PAGE, 0x0e, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {       GPMODE_IOMEGA_PAGE,    0x04, 0xff, 0xff, 0xff, 0xff }
-}   };
-// clang-format on
-
-static const mode_sense_pages_t zip_250_mode_sense_pages_changeable =
-    // clang-format off
-{   {
-    {                        0,    0 },
-    {    GPMODE_R_W_ERROR_PAGE, 0x06, 0xFF, 0xFF, 0,  0, 0, 0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {GPMODE_FLEXIBLE_DISK_PAGE, 0x1e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {      GPMODE_CACHING_PAGE, 0x0a, 4, 0, 0xff, 0xff, 0, 0, 0xff, 0xff, 0xff, 0xff },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {                        0,    0 },
-    {       GPMODE_IOMEGA_PAGE,    0x04, 0xff, 0xff, 0xff, 0xff }
-}   };
-// clang-format on
-
-static void zip_command_complete(zip_t *dev);
-static void zip_init(zip_t *dev);
-
-#ifdef ENABLE_ZIP_LOG
-int zip_do_log = ENABLE_ZIP_LOG;
-
-static void
-zip_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (zip_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define zip_log(fmt, ...)
-#endif
-
-int
-find_zip_for_channel(uint8_t channel)
-{
-    for (uint8_t i = 0; i < ZIP_NUM; i++) {
-        if ((zip_drives[i].bus_type == ZIP_BUS_ATAPI) && (zip_drives[i].ide_channel == channel))
-            return i;
-    }
-    return 0xff;
-}
-
-static int
-zip_load_abort(zip_t *dev)
-{
-    if (dev->drv->fp)
-        fclose(dev->drv->fp);
-    dev->drv->fp           = NULL;
-    dev->drv->medium_size = 0;
-    zip_eject(dev->id); /* Make sure the host OS knows we've rejected (and ejected) the image. */
-    return 0;
-}
-
-int
-zip_load(zip_t *dev, char *fn)
-{
-    int size = 0;
-
-    if (!dev->drv) {
-        zip_eject(dev->id);
-        return 0;
-    }
-
-    dev->drv->fp = plat_fopen(fn, dev->drv->read_only ? "rb" : "rb+");
-    if (!dev->drv->fp) {
-        if (!dev->drv->read_only) {
-            dev->drv->fp = plat_fopen(fn, "rb");
-            if (dev->drv->fp)
-                dev->drv->read_only = 1;
-            else
-                return zip_load_abort(dev);
-        } else
-            return zip_load_abort(dev);
-    }
-
-    fseek(dev->drv->fp, 0, SEEK_END);
-    size = ftell(dev->drv->fp);
-
-    if ((size == ((ZIP_250_SECTORS << 9) + 0x1000)) || (size == ((ZIP_SECTORS << 9) + 0x1000))) {
-        /* This is a ZDI image. */
-        size -= 0x1000;
-        dev->drv->base = 0x1000;
-    } else
-        dev->drv->base = 0;
-
-    if (dev->drv->is_250) {
-        if ((size != (ZIP_250_SECTORS << 9)) && (size != (ZIP_SECTORS << 9))) {
-            zip_log("File is incorrect size for a ZIP image\nMust be exactly %i or %i bytes\n",
-                    ZIP_250_SECTORS << 9, ZIP_SECTORS << 9);
-            return zip_load_abort(dev);
-        }
-    } else {
-        if (size != (ZIP_SECTORS << 9)) {
-            zip_log("File is incorrect size for a ZIP image\nMust be exactly %i bytes\n",
-                    ZIP_SECTORS << 9);
-            return zip_load_abort(dev);
-        }
-    }
-
-    dev->drv->medium_size = size >> 9;
-
-    if (fseek(dev->drv->fp, dev->drv->base, SEEK_SET) == -1)
-        fatal("zip_load(): Error seeking to the beginning of the file\n");
-
-    strncpy(dev->drv->image_path, fn, strlen(dev->drv->image_path) + 1);
-
-    return 1;
-}
-
-void
-zip_disk_reload(zip_t *dev)
-{
-    int ret = 0;
-
-    if (strlen(dev->drv->prev_image_path) == 0)
-        return;
-    else
-        ret = zip_load(dev, dev->drv->prev_image_path);
-
-    if (ret)
-        dev->unit_attention = 1;
-}
-
-void
-zip_disk_unload(zip_t *dev)
-{
-    if (dev->drv && dev->drv->fp) {
-        fclose(dev->drv->fp);
-        dev->drv->fp = NULL;
-    }
-}
-
-void
-zip_disk_close(zip_t *dev)
-{
-    if (dev->drv && dev->drv->fp) {
-        zip_disk_unload(dev);
-
-        memcpy(dev->drv->prev_image_path, dev->drv->image_path, sizeof(dev->drv->prev_image_path));
-        memset(dev->drv->image_path, 0, sizeof(dev->drv->image_path));
-
-        dev->drv->medium_size = 0;
-    }
-}
-
-static void
-zip_set_callback(zip_t *dev)
-{
-    if (dev->drv->bus_type != ZIP_BUS_SCSI)
-        ide_set_callback(ide_drives[dev->drv->ide_channel], dev->callback);
-}
-
-static void
-zip_init(zip_t *dev)
-{
-    if (dev->id >= ZIP_NUM)
-        return;
-
-    dev->requested_blocks = 1;
-    dev->sense[0]         = 0xf0;
-    dev->sense[7]         = 10;
-    dev->drv->bus_mode    = 0;
-    if (dev->drv->bus_type >= ZIP_BUS_ATAPI)
-        dev->drv->bus_mode |= 2;
-    if (dev->drv->bus_type < ZIP_BUS_SCSI)
-        dev->drv->bus_mode |= 1;
-    zip_log("ZIP %i: Bus type %i, bus mode %i\n", dev->id, dev->drv->bus_type, dev->drv->bus_mode);
-    if (dev->drv->bus_type < ZIP_BUS_SCSI) {
-        dev->tf->phase          = 1;
-        dev->tf->request_length = 0xEB14;
-    }
-    dev->tf->status    = READY_STAT | DSC_STAT;
-    dev->tf->pos       = 0;
-    dev->packet_status = PHASE_NONE;
-    zip_sense_key = zip_asc = zip_ascq = dev->unit_attention = 0;
-}
-
-static int
-zip_supports_pio(zip_t *dev)
-{
-    return (dev->drv->bus_mode & 1);
-}
-
-static int
-zip_supports_dma(zip_t *dev)
-{
-    return (dev->drv->bus_mode & 2);
-}
-
-/* Returns: 0 for none, 1 for PIO, 2 for DMA. */
-static int
-zip_current_mode(zip_t *dev)
-{
-    if (!zip_supports_pio(dev) && !zip_supports_dma(dev))
-        return 0;
-    if (zip_supports_pio(dev) && !zip_supports_dma(dev)) {
-        zip_log("ZIP %i: Drive does not support DMA, setting to PIO\n", dev->id);
-        return 1;
-    }
-    if (!zip_supports_pio(dev) && zip_supports_dma(dev))
-        return 2;
-    if (zip_supports_pio(dev) && zip_supports_dma(dev)) {
-        zip_log("ZIP %i: Drive supports both, setting to %s\n", dev->id,
-                (dev->tf->features & 1) ? "DMA" : "PIO");
-        return (dev->tf->features & 1) ? 2 : 1;
-    }
-
-    return 0;
-}
-
-static void
-zip_mode_sense_load(zip_t *dev)
-{
-    FILE *fp;
-    char  fn[512];
-
-    memset(&dev->ms_pages_saved, 0, sizeof(mode_sense_pages_t));
-    if (dev->drv->is_250) {
-        if (zip_drives[dev->id].bus_type == ZIP_BUS_SCSI)
-            memcpy(&dev->ms_pages_saved, &zip_250_mode_sense_pages_default_scsi, sizeof(mode_sense_pages_t));
-        else
-            memcpy(&dev->ms_pages_saved, &zip_250_mode_sense_pages_default, sizeof(mode_sense_pages_t));
-    } else {
-        if (zip_drives[dev->id].bus_type == ZIP_BUS_SCSI)
-            memcpy(&dev->ms_pages_saved, &zip_mode_sense_pages_default_scsi, sizeof(mode_sense_pages_t));
-        else
-            memcpy(&dev->ms_pages_saved, &zip_mode_sense_pages_default, sizeof(mode_sense_pages_t));
-    }
-
-    memset(fn, 0, 512);
-    if (dev->drv->bus_type == ZIP_BUS_SCSI)
-        sprintf(fn, "scsi_zip_%02i_mode_sense_bin", dev->id);
-    else
-        sprintf(fn, "zip_%02i_mode_sense_bin", dev->id);
-    fp = plat_fopen(nvr_path(fn), "rb");
-    if (fp) {
-        /* Nothing to read, not used by ZIP. */
-        fclose(fp);
-    }
-}
-
-static void
-zip_mode_sense_save(zip_t *dev)
-{
-    FILE *fp;
-    char  fn[512];
-
-    memset(fn, 0, 512);
-    if (dev->drv->bus_type == ZIP_BUS_SCSI)
-        sprintf(fn, "scsi_zip_%02i_mode_sense_bin", dev->id);
-    else
-        sprintf(fn, "zip_%02i_mode_sense_bin", dev->id);
-    fp = plat_fopen(nvr_path(fn), "wb");
-    if (fp) {
-        /* Nothing to write, not used by ZIP. */
-        fclose(fp);
-    }
-}
-
-/*SCSI Mode Sense 6/10*/
-static uint8_t
-zip_mode_sense_read(zip_t *dev, uint8_t page_control, uint8_t page, uint8_t pos)
-{
-    switch (page_control) {
-        case 0:
-        case 3:
-            if (dev->drv->is_250 && (page == 5) && (pos == 9) && (dev->drv->medium_size == ZIP_SECTORS))
-                return 0x60;
-            return dev->ms_pages_saved.pages[page][pos];
-        case 1:
-            if (dev->drv->is_250)
-                return zip_250_mode_sense_pages_changeable.pages[page][pos];
-            else
-                return zip_mode_sense_pages_changeable.pages[page][pos];
-        case 2:
-            if (dev->drv->is_250) {
-                if ((page == 5) && (pos == 9) && (dev->drv->medium_size == ZIP_SECTORS))
-                    return 0x60;
-                if (dev->drv->bus_type == ZIP_BUS_SCSI)
-                    return zip_250_mode_sense_pages_default_scsi.pages[page][pos];
-                else
-                    return zip_250_mode_sense_pages_default.pages[page][pos];
-            } else {
-                if (dev->drv->bus_type == ZIP_BUS_SCSI)
-                    return zip_mode_sense_pages_default_scsi.pages[page][pos];
-                else
-                    return zip_mode_sense_pages_default.pages[page][pos];
-            }
-
-        default:
-            break;
-    }
-
-    return 0;
-}
-
-static uint32_t
-zip_mode_sense(zip_t *dev, uint8_t *buf, uint32_t pos, uint8_t page, uint8_t block_descriptor_len)
-{
-    uint64_t pf;
-    uint8_t  page_control = (page >> 6) & 3;
-
-    if (dev->drv->is_250)
-        pf = zip_250_mode_sense_page_flags;
-    else
-        pf = zip_mode_sense_page_flags;
-
-    uint8_t msplen;
-
-    page &= 0x3f;
-
-    if (block_descriptor_len) {
-        buf[pos++] = ((dev->drv->medium_size >> 24) & 0xff);
-        buf[pos++] = ((dev->drv->medium_size >> 16) & 0xff);
-        buf[pos++] = ((dev->drv->medium_size >> 8) & 0xff);
-        buf[pos++] = (dev->drv->medium_size & 0xff);
-        buf[pos++] = 0; /* Reserved. */
-        buf[pos++] = 0; /* Block length (0x200 = 512 bytes). */
-        buf[pos++] = 2;
-        buf[pos++] = 0;
-    }
-
-    for (uint8_t i = 0; i < 0x40; i++) {
-        if ((page == GPMODE_ALL_PAGES) || (page == i)) {
-            if (pf & (1LL << ((uint64_t) page))) {
-                buf[pos++] = zip_mode_sense_read(dev, page_control, i, 0);
-                msplen     = zip_mode_sense_read(dev, page_control, i, 1);
-                buf[pos++] = msplen;
-                zip_log("ZIP %i: MODE SENSE: Page [%02X] length %i\n", dev->id, i, msplen);
-                for (uint8_t j = 0; j < msplen; j++)
-                    buf[pos++] = zip_mode_sense_read(dev, page_control, i, 2 + j);
-            }
-        }
-    }
-
-    return pos;
-}
-
-static void
-zip_update_request_length(zip_t *dev, int len, int block_len)
-{
-    int bt;
-    int min_len = 0;
-
-    dev->max_transfer_len = dev->tf->request_length;
-
-    /* For media access commands, make sure the requested DRQ length matches the block length. */
-    switch (dev->current_cdb[0]) {
-        case 0x08:
-        case 0x0a:
-        case 0x28:
-        case 0x2a:
-        case 0xa8:
-        case 0xaa:
-            /* Round it to the nearest 2048 bytes. */
-            dev->max_transfer_len = (dev->max_transfer_len >> 9) << 9;
-
-            /* Make sure total length is not bigger than sum of the lengths of
-               all the requested blocks. */
-            bt = (dev->requested_blocks * block_len);
-            if (len > bt)
-                len = bt;
-
-            min_len = block_len;
-
-            if (len <= block_len) {
-                /* Total length is less or equal to block length. */
-                if (dev->max_transfer_len < block_len) {
-                    /* Transfer a minimum of (block size) bytes. */
-                    dev->max_transfer_len = block_len;
-                    dev->packet_len       = block_len;
-                    break;
-                }
-            }
-            fallthrough;
-
-        default:
-            dev->packet_len = len;
-            break;
-    }
-    /* If the DRQ length is odd, and the total remaining length is bigger, make sure it's even. */
-    if ((dev->max_transfer_len & 1) && (dev->max_transfer_len < len))
-        dev->max_transfer_len &= 0xfffe;
-    /* If the DRQ length is smaller or equal in size to the total remaining length, set it to that. */
-    if (!dev->max_transfer_len)
-        dev->max_transfer_len = 65534;
-
-    if ((len <= dev->max_transfer_len) && (len >= min_len))
-        dev->tf->request_length = dev->max_transfer_len = len;
-    else if (len > dev->max_transfer_len)
-        dev->tf->request_length = dev->max_transfer_len;
-
-    return;
-}
-
-static double
-zip_bus_speed(zip_t *dev)
-{
-    double ret = -1.0;
-
-    if (dev && dev->drv && (dev->drv->bus_type == ZIP_BUS_SCSI)) {
-        dev->callback = -1.0; /* Speed depends on SCSI controller */
-        return 0.0;
-    } else {
-        if (dev && dev->drv)
-            ret = ide_atapi_get_period(dev->drv->ide_channel);
-        if (ret == -1.0) {
-            if (dev)
-                dev->callback = -1.0;
-            return 0.0;
-        } else
-            return ret * 1000000.0;
-    }
-}
-
-static void
-zip_command_common(zip_t *dev)
-{
-    double bytes_per_second;
-    double period;
-
-    dev->tf->status = BUSY_STAT;
-    dev->tf->phase  = 1;
-    dev->tf->pos    = 0;
-    if (dev->packet_status == PHASE_COMPLETE)
-        dev->callback = 0.0;
-    else {
-        if (dev->drv->bus_type == ZIP_BUS_SCSI) {
-            dev->callback = -1.0; /* Speed depends on SCSI controller */
-            return;
-        } else
-            bytes_per_second = zip_bus_speed(dev);
-
-        period        = 1000000.0 / bytes_per_second;
-        dev->callback = period * (double) (dev->packet_len);
-    }
-
-    zip_set_callback(dev);
-}
-
-static void
-zip_command_complete(zip_t *dev)
-{
-    ui_sb_update_icon(SB_ZIP | dev->id, 0);
-    dev->packet_status = PHASE_COMPLETE;
-    zip_command_common(dev);
-}
-
-static void
-zip_command_read(zip_t *dev)
-{
-    dev->packet_status = PHASE_DATA_IN;
-    zip_command_common(dev);
-}
-
-static void
-zip_command_read_dma(zip_t *dev)
-{
-    dev->packet_status = PHASE_DATA_IN_DMA;
-    zip_command_common(dev);
-}
-
-static void
-zip_command_write(zip_t *dev)
-{
-    dev->packet_status = PHASE_DATA_OUT;
-    zip_command_common(dev);
-}
-
-static void
-zip_command_write_dma(zip_t *dev)
-{
-    dev->packet_status = PHASE_DATA_OUT_DMA;
-    zip_command_common(dev);
-}
-
-/* id = Current ZIP device ID;
-   len = Total transfer length;
-   block_len = Length of a single block (why does it matter?!);
-   alloc_len = Allocated transfer length;
-   direction = Transfer direction (0 = read from host, 1 = write to host). */
-static void
-zip_data_command_finish(zip_t *dev, int len, int block_len, int alloc_len, int direction)
-{
-    zip_log("ZIP %i: Finishing command (%02X): %i, %i, %i, %i, %i\n",
-            dev->id, dev->current_cdb[0], len, block_len, alloc_len, direction, dev->tf->request_length);
-    dev->tf->pos = 0;
-    if (alloc_len >= 0) {
-        if (alloc_len < len)
-            len = alloc_len;
-    }
-    if ((len == 0) || (zip_current_mode(dev) == 0)) {
-        if (dev->drv->bus_type != ZIP_BUS_SCSI)
-            dev->packet_len = 0;
-
-        zip_command_complete(dev);
-    } else {
-        if (zip_current_mode(dev) == 2) {
-            if (dev->drv->bus_type != ZIP_BUS_SCSI)
-                dev->packet_len = alloc_len;
-
-            if (direction == 0)
-                zip_command_read_dma(dev);
-            else
-                zip_command_write_dma(dev);
-        } else {
-            zip_update_request_length(dev, len, block_len);
-            if (direction == 0)
-                zip_command_read(dev);
-            else
-                zip_command_write(dev);
-        }
-    }
-
-    zip_log("ZIP %i: Status: %i, cylinder %i, packet length: %i, position: %i, phase: %i\n",
-            dev->id, dev->packet_status, dev->tf->request_length, dev->packet_len, dev->tf->pos,
-            dev->tf->phase);
-}
-
-static void
-zip_sense_clear(zip_t *dev, UNUSED(int command))
-{
-    zip_sense_key = zip_asc = zip_ascq = 0;
-}
-
-static void
-zip_set_phase(zip_t *dev, uint8_t phase)
-{
-    uint8_t scsi_bus = (dev->drv->scsi_device_id >> 4) & 0x0f;
-    uint8_t scsi_id  = dev->drv->scsi_device_id & 0x0f;
-
-    if (dev->drv->bus_type != ZIP_BUS_SCSI)
-        return;
-
-    scsi_devices[scsi_bus][scsi_id].phase = phase;
-}
-
-static void
-zip_cmd_error(zip_t *dev)
-{
-    zip_set_phase(dev, SCSI_PHASE_STATUS);
-    dev->tf->error = ((zip_sense_key & 0xf) << 4) | ABRT_ERR;
-    if (dev->unit_attention)
-        dev->tf->error |= MCR_ERR;
-    dev->tf->status    = READY_STAT | ERR_STAT;
-    dev->tf->phase     = 3;
-    dev->tf->pos       = 0;
-    dev->packet_status = PHASE_ERROR;
-    dev->callback      = 50.0 * ZIP_TIME;
-    zip_set_callback(dev);
-    ui_sb_update_icon(SB_ZIP | dev->id, 0);
-    zip_log("ZIP %i: [%02X] ERROR: %02X/%02X/%02X\n", dev->id, dev->current_cdb[0], zip_sense_key, zip_asc, zip_ascq);
-}
-
-static void
-zip_unit_attention(zip_t *dev)
-{
-    zip_set_phase(dev, SCSI_PHASE_STATUS);
-    dev->tf->error = (SENSE_UNIT_ATTENTION << 4) | ABRT_ERR;
-    if (dev->unit_attention)
-        dev->tf->error |= MCR_ERR;
-    dev->tf->status    = READY_STAT | ERR_STAT;
-    dev->tf->phase     = 3;
-    dev->tf->pos       = 0;
-    dev->packet_status = PHASE_ERROR;
-    dev->callback      = 50.0 * ZIP_TIME;
-    zip_set_callback(dev);
-    ui_sb_update_icon(SB_ZIP | dev->id, 0);
-    zip_log("ZIP %i: UNIT ATTENTION\n", dev->id);
-}
-
-static void
-zip_buf_alloc(zip_t *dev, uint32_t len)
-{
-    zip_log("ZIP %i: Allocated buffer length: %i\n", dev->id, len);
-    if (!dev->buffer)
-        dev->buffer = (uint8_t *) malloc(len);
-}
-
-static void
-zip_buf_free(zip_t *dev)
-{
-    if (dev->buffer) {
-        zip_log("ZIP %i: Freeing buffer...\n", dev->id);
-        free(dev->buffer);
-        dev->buffer = NULL;
-    }
-}
-
-static void
-zip_bus_master_error(scsi_common_t *sc)
-{
-    zip_t *dev = (zip_t *) sc;
-
-    zip_buf_free(dev);
-    zip_sense_key = zip_asc = zip_ascq = 0;
-    zip_cmd_error(dev);
-}
-
-static void
-zip_not_ready(zip_t *dev)
-{
-    zip_sense_key = SENSE_NOT_READY;
-    zip_asc       = ASC_MEDIUM_NOT_PRESENT;
-    zip_ascq      = 0;
-    zip_cmd_error(dev);
-}
-
-static void
-zip_write_protected(zip_t *dev)
-{
-    zip_sense_key = SENSE_UNIT_ATTENTION;
-    zip_asc       = ASC_WRITE_PROTECTED;
-    zip_ascq      = 0;
-    zip_cmd_error(dev);
-}
-
-static void
-zip_invalid_lun(zip_t *dev)
-{
-    zip_sense_key = SENSE_ILLEGAL_REQUEST;
-    zip_asc       = ASC_INV_LUN;
-    zip_ascq      = 0;
-    zip_cmd_error(dev);
-}
-
-static void
-zip_illegal_opcode(zip_t *dev)
-{
-    zip_sense_key = SENSE_ILLEGAL_REQUEST;
-    zip_asc       = ASC_ILLEGAL_OPCODE;
-    zip_ascq      = 0;
-    zip_cmd_error(dev);
-}
-
-static void
-zip_lba_out_of_range(zip_t *dev)
-{
-    zip_sense_key = SENSE_ILLEGAL_REQUEST;
-    zip_asc       = ASC_LBA_OUT_OF_RANGE;
-    zip_ascq      = 0;
-    zip_cmd_error(dev);
-}
-
-static void
-zip_invalid_field(zip_t *dev)
-{
-    zip_sense_key = SENSE_ILLEGAL_REQUEST;
-    zip_asc       = ASC_INV_FIELD_IN_CMD_PACKET;
-    zip_ascq      = 0;
-    zip_cmd_error(dev);
-    dev->tf->status = 0x53;
-}
-
-static void
-zip_invalid_field_pl(zip_t *dev)
-{
-    zip_sense_key = SENSE_ILLEGAL_REQUEST;
-    zip_asc       = ASC_INV_FIELD_IN_PARAMETER_LIST;
-    zip_ascq      = 0;
-    zip_cmd_error(dev);
-    dev->tf->status = 0x53;
-}
-
-static void
-zip_data_phase_error(zip_t *dev)
-{
-    zip_sense_key = SENSE_ILLEGAL_REQUEST;
-    zip_asc       = ASC_DATA_PHASE_ERROR;
-    zip_ascq      = 0;
-    zip_cmd_error(dev);
-}
-
-static int
-zip_blocks(zip_t *dev, int32_t *len, UNUSED(int first_batch), int out)
-{
-    *len = 0;
-
-    if (!dev->sector_len) {
-        zip_command_complete(dev);
-        return -1;
-    }
-
-    zip_log("%sing %i blocks starting from %i...\n", out ? "Writ" : "Read", dev->requested_blocks, dev->sector_pos);
-
-    if (dev->sector_pos >= dev->drv->medium_size) {
-        zip_log("ZIP %i: Trying to %s beyond the end of disk\n", dev->id, out ? "write" : "read");
-        zip_lba_out_of_range(dev);
-        return 0;
-    }
-
-    *len = dev->requested_blocks << 9;
-
-    for (int i = 0; i < dev->requested_blocks; i++) {
-        if (fseek(dev->drv->fp, dev->drv->base + (dev->sector_pos << 9) + (i << 9), SEEK_SET) == 1)
-            break;
-
-        if (feof(dev->drv->fp))
-            break;
-
-        if (out) {
-            if (fwrite(dev->buffer + (i << 9), 1, 512, dev->drv->fp) != 512)
-                fatal("zip_blocks(): Error writing data\n");
-        } else {
-            if (fread(dev->buffer + (i << 9), 1, 512, dev->drv->fp) != 512)
-                fatal("zip_blocks(): Error reading data\n");
-        }
-    }
-
-    zip_log("%s %i bytes of blocks...\n", out ? "Written" : "Read", *len);
-
-    dev->sector_pos += dev->requested_blocks;
-    dev->sector_len -= dev->requested_blocks;
-
-    return 1;
-}
-
-void
-zip_insert(zip_t *dev)
-{
-    dev->unit_attention = 1;
-}
-
-/*SCSI Sense Initialization*/
-void
-zip_sense_code_ok(zip_t *dev)
-{
-    zip_sense_key = SENSE_NONE;
-    zip_asc       = 0;
-    zip_ascq      = 0;
-}
-
-static int
-zip_pre_execution_check(zip_t *dev, uint8_t *cdb)
-{
-    int ready = 0;
-
-    if ((cdb[0] != GPCMD_REQUEST_SENSE) && (dev->cur_lun == SCSI_LUN_USE_CDB) && (cdb[1] & 0xe0)) {
-        zip_log("ZIP %i: Attempting to execute a unknown command targeted at SCSI LUN %i\n", dev->id,
-                ((dev->tf->request_length >> 5) & 7));
-        zip_invalid_lun(dev);
-        return 0;
-    }
-
-    if (!(zip_command_flags[cdb[0]] & IMPLEMENTED)) {
-        zip_log("ZIP %i: Attempting to execute unknown command %02X over %s\n", dev->id, cdb[0],
-                (dev->drv->bus_type == ZIP_BUS_SCSI) ? "SCSI" : "ATAPI");
-
-        zip_illegal_opcode(dev);
-        return 0;
-    }
-
-    if ((dev->drv->bus_type < ZIP_BUS_SCSI) && (zip_command_flags[cdb[0]] & SCSI_ONLY)) {
-        zip_log("ZIP %i: Attempting to execute SCSI-only command %02X over ATAPI\n", dev->id, cdb[0]);
-        zip_illegal_opcode(dev);
-        return 0;
-    }
-
-    if ((dev->drv->bus_type == ZIP_BUS_SCSI) && (zip_command_flags[cdb[0]] & ATAPI_ONLY)) {
-        zip_log("ZIP %i: Attempting to execute ATAPI-only command %02X over SCSI\n", dev->id, cdb[0]);
-        zip_illegal_opcode(dev);
-        return 0;
-    }
-
-    ready = (dev->drv->fp != NULL);
-
-    /* If the drive is not ready, there is no reason to keep the
-       UNIT ATTENTION condition present, as we only use it to mark
-       disc changes. */
-    if (!ready && dev->unit_attention)
-        dev->unit_attention = 0;
-
-    /* If the UNIT ATTENTION condition is set and the command does not allow
-       execution under it, error out and report the condition. */
-    if (dev->unit_attention == 1) {
-        /* Only increment the unit attention phase if the command can not pass through it. */
-        if (!(zip_command_flags[cdb[0]] & ALLOW_UA)) {
-            /* zip_log("ZIP %i: Unit attention now 2\n", dev->id); */
-            dev->unit_attention = 2;
-            zip_log("ZIP %i: UNIT ATTENTION: Command %02X not allowed to pass through\n", dev->id, cdb[0]);
-            zip_unit_attention(dev);
-            return 0;
-        }
-    } else if (dev->unit_attention == 2) {
-        if (cdb[0] != GPCMD_REQUEST_SENSE) {
-            /* zip_log("ZIP %i: Unit attention now 0\n", dev->id); */
-            dev->unit_attention = 0;
-        }
-    }
-
-    /* Unless the command is REQUEST SENSE, clear the sense. This will *NOT*
-       the UNIT ATTENTION condition if it's set. */
-    if (cdb[0] != GPCMD_REQUEST_SENSE)
-        zip_sense_clear(dev, cdb[0]);
-
-    /* Next it's time for NOT READY. */
-    if ((zip_command_flags[cdb[0]] & CHECK_READY) && !ready) {
-        zip_log("ZIP %i: Not ready (%02X)\n", dev->id, cdb[0]);
-        zip_not_ready(dev);
-        return 0;
-    }
-
-    zip_log("ZIP %i: Continuing with command %02X\n", dev->id, cdb[0]);
-
-    return 1;
-}
-
-static void
-zip_seek(zip_t *dev, uint32_t pos)
-{
-#if 0
-    zip_log("ZIP %i: Seek %08X\n", dev->id, pos);
-#endif
-    dev->sector_pos = pos;
-}
-
-static void
-zip_rezero(zip_t *dev)
-{
-    dev->sector_pos = dev->sector_len = 0;
-    zip_seek(dev, 0);
-}
-
-void
-zip_reset(scsi_common_t *sc)
-{
-    zip_t *dev = (zip_t *) sc;
-
-    zip_rezero(dev);
-    dev->tf->status         = 0;
-    dev->callback           = 0.0;
-    zip_set_callback(dev);
-    dev->tf->phase          = 1;
-    dev->tf->request_length = 0xEB14;
-    dev->packet_status      = PHASE_NONE;
-    dev->unit_attention     = 0;
-    dev->cur_lun            = SCSI_LUN_USE_CDB;
-}
-
-static void
-zip_request_sense(zip_t *dev, uint8_t *buffer, uint8_t alloc_length, int desc)
-{
-    /*Will return 18 bytes of 0*/
-    if (alloc_length != 0) {
-        memset(buffer, 0, alloc_length);
-        if (!desc)
-            memcpy(buffer, dev->sense, alloc_length);
-        else {
-            buffer[1] = zip_sense_key;
-            buffer[2] = zip_asc;
-            buffer[3] = zip_ascq;
-        }
-    }
-
-    buffer[0] = desc ? 0x72 : 0x70;
-
-    if (dev->unit_attention && (zip_sense_key == 0)) {
-        buffer[desc ? 1 : 2]  = SENSE_UNIT_ATTENTION;
-        buffer[desc ? 2 : 12] = ASC_MEDIUM_MAY_HAVE_CHANGED;
-        buffer[desc ? 3 : 13] = 0;
-    }
-
-    zip_log("ZIP %i: Reporting sense: %02X %02X %02X\n", dev->id, buffer[2], buffer[12], buffer[13]);
-
-    if (buffer[desc ? 1 : 2] == SENSE_UNIT_ATTENTION) {
-        /* If the last remaining sense is unit attention, clear
-           that condition. */
-        dev->unit_attention = 0;
-    }
-
-    /* Clear the sense stuff as per the spec. */
-    zip_sense_clear(dev, GPCMD_REQUEST_SENSE);
-}
-
-static void
-zip_request_sense_for_scsi(scsi_common_t *sc, uint8_t *buffer, uint8_t alloc_length)
-{
-    zip_t *dev   = (zip_t *) sc;
-    int    ready = 0;
-
-    ready = (dev->drv->fp != NULL);
-
-    if (!ready && dev->unit_attention) {
-        /* If the drive is not ready, there is no reason to keep the
-           UNIT ATTENTION condition present, as we only use it to mark
-           disc changes. */
-        dev->unit_attention = 0;
-    }
-
-    /* Do *NOT* advance the unit attention phase. */
-
-    zip_request_sense(dev, buffer, alloc_length, 0);
-}
-
-static void
-zip_set_buf_len(zip_t *dev, int32_t *BufLen, int32_t *src_len)
-{
-    if (dev->drv->bus_type == ZIP_BUS_SCSI) {
-        if (*BufLen == -1)
-            *BufLen = *src_len;
-        else {
-            *BufLen  = MIN(*src_len, *BufLen);
-            *src_len = *BufLen;
-        }
-        zip_log("ZIP %i: Actual transfer length: %i\n", dev->id, *BufLen);
-    }
-}
-
-static void
-zip_command(scsi_common_t *sc, uint8_t *cdb)
-{
-    zip_t   *dev = (zip_t *) sc;
-    int      pos = 0;
-    int      block_desc = 0;
-    int      ret;
-    int32_t  len;
-    int32_t  max_len;
-    int32_t  alloc_length;
-    uint32_t i = 0;
-    int      size_idx;
-    int      idx = 0;
-    unsigned preamble_len;
-    int32_t  blen = 0;
-    int32_t *BufLen;
-    uint8_t  scsi_bus = (dev->drv->scsi_device_id >> 4) & 0x0f;
-    uint8_t  scsi_id  = dev->drv->scsi_device_id & 0x0f;
-
-    if (dev->drv->bus_type == ZIP_BUS_SCSI) {
-        BufLen          = &scsi_devices[scsi_bus][scsi_id].buffer_length;
-        dev->tf->status &= ~ERR_STAT;
-    } else {
-        BufLen         = &blen;
-        dev->tf->error = 0;
-    }
-
-    dev->packet_len  = 0;
-    dev->request_pos = 0;
-
-    memcpy(dev->current_cdb, cdb, 12);
-
-    if (cdb[0] != 0) {
-        zip_log("ZIP %i: Command 0x%02X, Sense Key %02X, Asc %02X, Ascq %02X, Unit attention: %i\n",
-                dev->id, cdb[0], zip_sense_key, zip_asc, zip_ascq, dev->unit_attention);
-        zip_log("ZIP %i: Request length: %04X\n", dev->id, dev->tf->request_length);
-
-        zip_log("ZIP %i: CDB: %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", dev->id,
-                cdb[0], cdb[1], cdb[2], cdb[3], cdb[4], cdb[5], cdb[6], cdb[7],
-                cdb[8], cdb[9], cdb[10], cdb[11]);
-    }
-
-    dev->sector_len = 0;
-
-    zip_set_phase(dev, SCSI_PHASE_STATUS);
-
-    /* This handles the Not Ready/Unit Attention check if it has to be handled at this point. */
-    if (zip_pre_execution_check(dev, cdb) == 0)
-        return;
-
-    switch (cdb[0]) {
-        case GPCMD_SEND_DIAGNOSTIC:
-            if (!(cdb[1] & (1 << 2))) {
-                zip_invalid_field(dev);
-                return;
-            }
-            fallthrough;
-        case GPCMD_SCSI_RESERVE:
-        case GPCMD_SCSI_RELEASE:
-        case GPCMD_TEST_UNIT_READY:
-            zip_set_phase(dev, SCSI_PHASE_STATUS);
-            zip_command_complete(dev);
-            break;
-
-        case GPCMD_FORMAT_UNIT:
-            if (dev->drv->read_only) {
-                zip_write_protected(dev);
-                return;
-            }
-
-            zip_set_phase(dev, SCSI_PHASE_STATUS);
-            zip_command_complete(dev);
-            break;
-
-        case GPCMD_IOMEGA_SENSE:
-            zip_set_phase(dev, SCSI_PHASE_DATA_IN);
-            max_len = cdb[4];
-            zip_buf_alloc(dev, 256);
-            zip_set_buf_len(dev, BufLen, &max_len);
-            memset(dev->buffer, 0, 256);
-            if (cdb[2] == 1) {
-                /* This page is related to disk health status - setting
-                   this page to 0 makes disk health read as "marginal". */
-                dev->buffer[0] = 0x58;
-                dev->buffer[1] = 0x00;
-                for (i = 0x00; i < 0x58; i++)
-                    dev->buffer[i + 0x02] = 0xff;
-            } else if (cdb[2] == 2) {
-                dev->buffer[0] = 0x3d;
-                dev->buffer[1] = 0x00;
-                for (i = 0x00; i < 0x13; i++)
-                    dev->buffer[i + 0x02] = 0x00;
-                dev->buffer[0x15] = 0x00;
-                if (dev->drv->read_only)
-                    dev->buffer[0x15] |= 0x02;
-                for (i = 0x00; i < 0x27; i++)
-                    dev->buffer[i + 0x16] = 0x00;
-            } else {
-                zip_invalid_field(dev);
-                zip_buf_free(dev);
-                return;
-            }
-            zip_data_command_finish(dev, 18, 18, cdb[4], 0);
-            break;
-
-        case GPCMD_REZERO_UNIT:
-            dev->sector_pos = dev->sector_len = 0;
-            zip_seek(dev, 0);
-            zip_set_phase(dev, SCSI_PHASE_STATUS);
-            break;
-
-        case GPCMD_REQUEST_SENSE:
-            /* If there's a unit attention condition and there's a buffered not
-               ready, a standalone REQUEST SENSE should forget about the not
-               ready, and report unit attention straight away. */
-            zip_set_phase(dev, SCSI_PHASE_DATA_IN);
-            max_len = cdb[4];
-
-            if (!max_len) {
-                zip_set_phase(dev, SCSI_PHASE_STATUS);
-                dev->packet_status = PHASE_COMPLETE;
-                dev->callback      = 20.0 * ZIP_TIME;
-                zip_set_callback(dev);
-                break;
-            }
-
-            zip_buf_alloc(dev, 256);
-            zip_set_buf_len(dev, BufLen, &max_len);
-            len = (cdb[1] & 1) ? 8 : 18;
-            zip_request_sense(dev, dev->buffer, max_len, cdb[1] & 1);
-            zip_data_command_finish(dev, len, len, cdb[4], 0);
-            break;
-
-        case GPCMD_MECHANISM_STATUS:
-            zip_set_phase(dev, SCSI_PHASE_DATA_IN);
-            len = (cdb[8] << 8) | cdb[9];
-
-            zip_buf_alloc(dev, 8);
-            zip_set_buf_len(dev, BufLen, &len);
-
-            memset(dev->buffer, 0, 8);
-            dev->buffer[5] = 1;
-
-            zip_data_command_finish(dev, 8, 8, len, 0);
-            break;
-
-        case GPCMD_READ_6:
-        case GPCMD_READ_10:
-        case GPCMD_READ_12:
-            zip_set_phase(dev, SCSI_PHASE_DATA_IN);
-            alloc_length = 512;
-
-            switch (cdb[0]) {
-                case GPCMD_READ_6:
-                    dev->sector_len = cdb[4];
-                    /*
-                       For READ (6) and WRITE (6), a length of 0 indicates a
-                       transfer of 256 sectors.
-                     */
-                    if (dev->sector_len == 0)
-                        dev->sector_len = 256;
-                    dev->sector_pos = ((((uint32_t) cdb[1]) & 0x1f) << 16) |
-                                      (((uint32_t) cdb[2]) << 8) | ((uint32_t) cdb[3]);
-                    zip_log("ZIP %i: Length: %i, LBA: %i\n", dev->id, dev->sector_len, dev->sector_pos);
-                    break;
-                case GPCMD_READ_10:
-                    dev->sector_len = (cdb[7] << 8) | cdb[8];
-                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
-                    zip_log("ZIP %i: Length: %i, LBA: %i\n", dev->id, dev->sector_len, dev->sector_pos);
-                    break;
-                case GPCMD_READ_12:
-                    dev->sector_len = (((uint32_t) cdb[6]) << 24) | (((uint32_t) cdb[7]) << 16) |
-                                      (((uint32_t) cdb[8]) << 8) | ((uint32_t) cdb[9]);
-                    dev->sector_pos = (((uint32_t) cdb[2]) << 24) | (((uint32_t) cdb[3]) << 16) |
-                                      (((uint32_t) cdb[4]) << 8) | ((uint32_t) cdb[5]);
-                    break;
-
-                default:
-                    break;
-            }
-
-            if (dev->sector_pos >= dev->drv->medium_size) {
-                zip_lba_out_of_range(dev);
-                return;
-            }
-
-            if (!dev->sector_len) {
-                zip_set_phase(dev, SCSI_PHASE_STATUS);
-                /* zip_log("ZIP %i: All done - callback set\n", dev->id); */
-                dev->packet_status = PHASE_COMPLETE;
-                dev->callback      = 20.0 * ZIP_TIME;
-                zip_set_callback(dev);
-                break;
-            }
-
-            max_len               = dev->sector_len;
-            /*
-               If we're reading all blocks in one go for DMA, why not also for
-               PIO, it should NOT matter anyway, this step should be identical
-               and only the way the read dat is transferred to the host should
-               be different.
-             */
-            dev->requested_blocks = max_len;
-
-            dev->packet_len = max_len * alloc_length;
-            zip_buf_alloc(dev, dev->packet_len);
-
-            ret = zip_blocks(dev, &alloc_length, 1, 0);
-            if (ret <= 0) {
-                zip_set_phase(dev, SCSI_PHASE_STATUS);
-                dev->packet_status = PHASE_COMPLETE;
-                dev->callback      = 20.0 * ZIP_TIME;
-                zip_set_callback(dev);
-                zip_buf_free(dev);
-                return;
-            }
-
-            dev->requested_blocks = max_len;
-            dev->packet_len       = alloc_length;
-
-            zip_set_buf_len(dev, BufLen, (int32_t *) &dev->packet_len);
-
-            zip_data_command_finish(dev, alloc_length, 512, alloc_length, 0);
-
-            ui_sb_update_icon(SB_ZIP | dev->id, dev->packet_status != PHASE_COMPLETE);
-            return;
-
-        case GPCMD_VERIFY_6:
-        case GPCMD_VERIFY_10:
-        case GPCMD_VERIFY_12:
-            if (!(cdb[1] & 2)) {
-                zip_set_phase(dev, SCSI_PHASE_STATUS);
-                zip_command_complete(dev);
-                break;
-            }
-            fallthrough;
-        case GPCMD_WRITE_6:
-        case GPCMD_WRITE_10:
-        case GPCMD_WRITE_AND_VERIFY_10:
-        case GPCMD_WRITE_12:
-        case GPCMD_WRITE_AND_VERIFY_12:
-            zip_set_phase(dev, SCSI_PHASE_DATA_OUT);
-            alloc_length = 512;
-
-            if (dev->drv->read_only) {
-                zip_write_protected(dev);
-                return;
-            }
-
-            switch (cdb[0]) {
-                case GPCMD_VERIFY_6:
-                case GPCMD_WRITE_6:
-                    dev->sector_len = cdb[4];
-                    /*
-                       For READ (6) and WRITE (6), a length of 0 indicates a
-                       transfer of 256 sectors.
-                     */
-                    if (dev->sector_len == 0)
-                        dev->sector_len = 256;
-                    dev->sector_pos = ((((uint32_t) cdb[1]) & 0x1f) << 16) |
-                                      (((uint32_t) cdb[2]) << 8) | ((uint32_t) cdb[3]);
-                    break;
-                case GPCMD_VERIFY_10:
-                case GPCMD_WRITE_10:
-                case GPCMD_WRITE_AND_VERIFY_10:
-                    dev->sector_len = (cdb[7] << 8) | cdb[8];
-                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
-                    zip_log("ZIP %i: Length: %i, LBA: %i\n", dev->id, dev->sector_len, dev->sector_pos);
-                    break;
-                case GPCMD_VERIFY_12:
-                case GPCMD_WRITE_12:
-                case GPCMD_WRITE_AND_VERIFY_12:
-                    dev->sector_len = (((uint32_t) cdb[6]) << 24) | (((uint32_t) cdb[7]) << 16) |
-                                      (((uint32_t) cdb[8]) << 8) | ((uint32_t) cdb[9]);
-                    dev->sector_pos = (((uint32_t) cdb[2]) << 24) | (((uint32_t) cdb[3]) << 16) |
-                                      (((uint32_t) cdb[4]) << 8) | ((uint32_t) cdb[5]);
-                    break;
-
-                default:
-                    break;
-            }
-
-            if (dev->sector_pos >= dev->drv->medium_size) {
-                zip_lba_out_of_range(dev);
-                return;
-            }
-
-            if (!dev->sector_len) {
-                zip_set_phase(dev, SCSI_PHASE_STATUS);
-                /* zip_log("ZIP %i: All done - callback set\n", dev->id); */
-                dev->packet_status = PHASE_COMPLETE;
-                dev->callback      = 20.0 * ZIP_TIME;
-                zip_set_callback(dev);
-                break;
-            }
-
-            max_len               = dev->sector_len;
-            /*
-               If we're writing all blocks in one go for DMA, why not also for
-               PIO, it should NOT matter anyway, this step should be identical
-               and only the way the read dat is transferred to the host should
-               be different.
-             */
-            dev->requested_blocks = max_len;
-
-            dev->packet_len = max_len * alloc_length;
-            zip_buf_alloc(dev, dev->packet_len);
-
-            dev->requested_blocks = max_len;
-            dev->packet_len       = max_len << 9;
-
-            zip_set_buf_len(dev, BufLen, (int32_t *) &dev->packet_len);
-
-            zip_data_command_finish(dev, dev->packet_len, 512, dev->packet_len, 1);
-
-            ui_sb_update_icon(SB_ZIP | dev->id, dev->packet_status != PHASE_COMPLETE);
-            return;
-
-        case GPCMD_WRITE_SAME_10:
-            alloc_length = 512;
-
-            if ((cdb[1] & 6) == 6) {
-                zip_invalid_field(dev);
-                return;
-            }
-
-            if (dev->drv->read_only) {
-                zip_write_protected(dev);
-                return;
-            }
-
-            dev->sector_len = (cdb[7] << 8) | cdb[8];
-            dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
-
-            if (dev->sector_pos >= dev->drv->medium_size) {
-                zip_lba_out_of_range(dev);
-                return;
-            }
-
-            if (!dev->sector_len) {
-                zip_set_phase(dev, SCSI_PHASE_STATUS);
-                /* zip_log("ZIP %i: All done - callback set\n", dev->id); */
-                dev->packet_status = PHASE_COMPLETE;
-                dev->callback      = 20.0 * ZIP_TIME;
-                zip_set_callback(dev);
-                break;
-            }
-
-            zip_buf_alloc(dev, alloc_length);
-            zip_set_buf_len(dev, BufLen, (int32_t *) &dev->packet_len);
-
-            max_len               = 1;
-            dev->requested_blocks = 1;
-
-            dev->packet_len = alloc_length;
-
-            zip_set_phase(dev, SCSI_PHASE_DATA_OUT);
-
-            zip_data_command_finish(dev, 512, 512, alloc_length, 1);
-
-            ui_sb_update_icon(SB_ZIP | dev->id, dev->packet_status != PHASE_COMPLETE);
-            return;
-
-        case GPCMD_MODE_SENSE_6:
-        case GPCMD_MODE_SENSE_10:
-            zip_set_phase(dev, SCSI_PHASE_DATA_IN);
-
-            if (dev->drv->bus_type == ZIP_BUS_SCSI)
-                block_desc = ((cdb[1] >> 3) & 1) ? 0 : 1;
-            else
-                block_desc = 0;
-
-            if (cdb[0] == GPCMD_MODE_SENSE_6) {
-                len = cdb[4];
-                zip_buf_alloc(dev, 256);
-            } else {
-                len = (cdb[8] | (cdb[7] << 8));
-                zip_buf_alloc(dev, 65536);
-            }
-
-            if (!(zip_mode_sense_page_flags & (1LL << (uint64_t) (cdb[2] & 0x3f)))) {
-                zip_invalid_field(dev);
-                zip_buf_free(dev);
-                return;
-            }
-
-            memset(dev->buffer, 0, len);
-            alloc_length = len;
-
-            if (cdb[0] == GPCMD_MODE_SENSE_6) {
-                len            = zip_mode_sense(dev, dev->buffer, 4, cdb[2], block_desc);
-                len            = MIN(len, alloc_length);
-                dev->buffer[0] = len - 1;
-                dev->buffer[1] = 0;
-                if (block_desc)
-                    dev->buffer[3] = 8;
-            } else {
-                len            = zip_mode_sense(dev, dev->buffer, 8, cdb[2], block_desc);
-                len            = MIN(len, alloc_length);
-                dev->buffer[0] = (len - 2) >> 8;
-                dev->buffer[1] = (len - 2) & 255;
-                dev->buffer[2] = 0;
-                if (block_desc) {
-                    dev->buffer[6] = 0;
-                    dev->buffer[7] = 8;
-                }
-            }
-
-            zip_set_buf_len(dev, BufLen, &len);
-
-            zip_log("ZIP %i: Reading mode page: %02X...\n", dev->id, cdb[2]);
-
-            zip_data_command_finish(dev, len, len, alloc_length, 0);
-            return;
-
-        case GPCMD_MODE_SELECT_6:
-        case GPCMD_MODE_SELECT_10:
-            zip_set_phase(dev, SCSI_PHASE_DATA_OUT);
-
-            if (cdb[0] == GPCMD_MODE_SELECT_6) {
-                len = cdb[4];
-                zip_buf_alloc(dev, 256);
-            } else {
-                len = (cdb[7] << 8) | cdb[8];
-                zip_buf_alloc(dev, 65536);
-            }
-
-            zip_set_buf_len(dev, BufLen, &len);
-
-            dev->total_length = len;
-            dev->do_page_save = cdb[1] & 1;
-
-            zip_data_command_finish(dev, len, len, len, 1);
-            return;
-
-        case GPCMD_START_STOP_UNIT:
-            zip_set_phase(dev, SCSI_PHASE_STATUS);
-
-            switch (cdb[4] & 3) {
-                case 0:                 /* Stop the disc. */
-                    zip_eject(dev->id); /* The Iomega Windows 9x drivers require this. */
-                    break;
-                case 1: /* Start the disc and read the TOC. */
-                    break;
-                case 2: /* Eject the disc if possible. */
-#if 0
-                    zip_eject(dev->id);
-#endif
-                    break;
-                case 3: /* Load the disc (close tray). */
-                    zip_reload(dev->id);
-                    break;
-
-                default:
-                    break;
-            }
-
-            zip_command_complete(dev);
-            break;
-
-        case GPCMD_INQUIRY:
-            zip_set_phase(dev, SCSI_PHASE_DATA_IN);
-
-            max_len = cdb[3];
-            max_len <<= 8;
-            max_len |= cdb[4];
-
-            zip_buf_alloc(dev, 65536);
-
-            if (cdb[1] & 1) {
-                preamble_len = 4;
-                size_idx     = 3;
-
-                dev->buffer[idx++] = 0;
-                dev->buffer[idx++] = cdb[2];
-                dev->buffer[idx++] = 0;
-
-                idx++;
-
-                switch (cdb[2]) {
-                    case 0x00:
-                        dev->buffer[idx++] = 0x00;
-                        dev->buffer[idx++] = 0x83;
-                        break;
-                    case 0x83:
-                        if (idx + 24 > max_len) {
-                            zip_data_phase_error(dev);
-                            zip_buf_free(dev);
-                            return;
-                        }
-
-                        dev->buffer[idx++] = 0x02;
-                        dev->buffer[idx++] = 0x00;
-                        dev->buffer[idx++] = 0x00;
-                        dev->buffer[idx++] = 20;
-                        ide_padstr8(dev->buffer + idx, 20, "53R141"); /* Serial */
-                        idx += 20;
-
-                        if (idx + 72 > cdb[4])
-                            goto atapi_out;
-                        dev->buffer[idx++] = 0x02;
-                        dev->buffer[idx++] = 0x01;
-                        dev->buffer[idx++] = 0x00;
-                        dev->buffer[idx++] = 68;
-                        ide_padstr8(dev->buffer + idx, 8, "IOMEGA  "); /* Vendor */
-                        idx += 8;
-                        if (dev->drv->is_250)
-                            ide_padstr8(dev->buffer + idx, 40, "ZIP 250         "); /* Product */
-                        else
-                            ide_padstr8(dev->buffer + idx, 40, "ZIP 100         "); /* Product */
-                        idx += 40;
-                        ide_padstr8(dev->buffer + idx, 20, "53R141"); /* Product */
-                        idx += 20;
-                        break;
-                    default:
-                        zip_log("INQUIRY: Invalid page: %02X\n", cdb[2]);
-                        zip_invalid_field(dev);
-                        zip_buf_free(dev);
-                        return;
-                }
-            } else {
-                preamble_len = 5;
-                size_idx     = 4;
-
-                memset(dev->buffer, 0, 8);
-                if (cdb[1] & 0xe0)
-                    dev->buffer[0] = 0x60; /*No physical device on this LUN*/
-                else
-                    dev->buffer[0] = 0x00;                                           /*Hard disk*/
-                dev->buffer[1] = 0x80;                                               /*Removable*/
-                dev->buffer[2] = (dev->drv->bus_type == ZIP_BUS_SCSI) ? 0x02 : 0x00; /*SCSI-2 compliant*/
-                dev->buffer[3] = (dev->drv->bus_type == ZIP_BUS_SCSI) ? 0x02 : 0x21;
-#if 0
-                dev->buffer[4] = 31;
-#endif
-                dev->buffer[4] = 0;
-                if (dev->drv->bus_type == ZIP_BUS_SCSI) {
-                    dev->buffer[6] = 1;    /* 16-bit transfers supported */
-                    dev->buffer[7] = 0x20; /* Wide bus supported */
-                }
-                dev->buffer[7] |= 0x02;
-
-                ide_padstr8(dev->buffer + 8, 8, "IOMEGA  "); /* Vendor */
-                if (dev->drv->is_250) {
-                    ide_padstr8(dev->buffer + 16, 16, "ZIP 250         "); /* Product */
-                    ide_padstr8(dev->buffer + 32, 4, "42.S");              /* Revision */
-                    if (max_len >= 44)
-                        ide_padstr8(dev->buffer + 36, 8, "08/08/01"); /* Date? */
-                    if (max_len >= 122)
-                        ide_padstr8(dev->buffer + 96, 26, "(c) Copyright IOMEGA 2000 "); /* Copyright string */
-                } else {
-                    ide_padstr8(dev->buffer + 16, 16, "ZIP 100         "); /* Product */
-                    ide_padstr8(dev->buffer + 32, 4, "E.08");              /* Revision */
-                }
-                idx = 36;
-
-                if (max_len == 96) {
-                    dev->buffer[4] = 91;
-                    idx            = 96;
-                } else if (max_len == 128) {
-                    dev->buffer[4] = 0x75;
-                    idx            = 128;
-                }
-            }
-
-atapi_out:
-            dev->buffer[size_idx] = idx - preamble_len;
-            len                   = idx;
-
-            len = MIN(len, max_len);
-            zip_set_buf_len(dev, BufLen, &len);
-
-            zip_data_command_finish(dev, len, len, max_len, 0);
-            break;
-
-        case GPCMD_PREVENT_REMOVAL:
-            zip_set_phase(dev, SCSI_PHASE_STATUS);
-            zip_command_complete(dev);
-            break;
-
-        case GPCMD_SEEK_6:
-        case GPCMD_SEEK_10:
-            zip_set_phase(dev, SCSI_PHASE_STATUS);
-
-            switch (cdb[0]) {
-                case GPCMD_SEEK_6:
-                    pos = (cdb[2] << 8) | cdb[3];
-                    break;
-                case GPCMD_SEEK_10:
-                    pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
-                    break;
-
-                default:
-                    break;
-            }
-            zip_seek(dev, pos);
-            zip_command_complete(dev);
-            break;
-
-        case GPCMD_READ_CDROM_CAPACITY:
-            zip_set_phase(dev, SCSI_PHASE_DATA_IN);
-
-            zip_buf_alloc(dev, 8);
-
-            max_len = dev->drv->medium_size - 1; /* IMPORTANT: What's returned is the last LBA block. */
-            memset(dev->buffer, 0, 8);
-            dev->buffer[0] = (max_len >> 24) & 0xff;
-            dev->buffer[1] = (max_len >> 16) & 0xff;
-            dev->buffer[2] = (max_len >> 8) & 0xff;
-            dev->buffer[3] = max_len & 0xff;
-            dev->buffer[6] = 2; /* 512 = 0x0200 */
-            len            = 8;
-
-            zip_set_buf_len(dev, BufLen, &len);
-
-            zip_data_command_finish(dev, len, len, len, 0);
-            break;
-
-        case GPCMD_IOMEGA_EJECT:
-            zip_set_phase(dev, SCSI_PHASE_STATUS);
-            zip_eject(dev->id);
-            zip_command_complete(dev);
-            break;
-
-        case GPCMD_READ_FORMAT_CAPACITIES:
-            len = (cdb[7] << 8) | cdb[8];
-
-            zip_buf_alloc(dev, len);
-            memset(dev->buffer, 0, len);
-
-            pos = 0;
-
-            /* List header */
-            dev->buffer[pos++] = 0;
-            dev->buffer[pos++] = 0;
-            dev->buffer[pos++] = 0;
-            if (dev->drv->fp != NULL)
-                dev->buffer[pos++] = 16;
-            else
-                dev->buffer[pos++] = 8;
-
-            /* Current/Maximum capacity header */
-            if (dev->drv->is_250) {
-                /* ZIP 250 also supports ZIP 100 media, so if the medium is inserted,
-                   we return the inserted medium's size, otherwise, the ZIP 250 size. */
-                if (dev->drv->fp != NULL) {
-                    dev->buffer[pos++] = (dev->drv->medium_size >> 24) & 0xff;
-                    dev->buffer[pos++] = (dev->drv->medium_size >> 16) & 0xff;
-                    dev->buffer[pos++] = (dev->drv->medium_size >> 8) & 0xff;
-                    dev->buffer[pos++] = dev->drv->medium_size & 0xff;
-                    dev->buffer[pos++] = 2; /* Current medium capacity */
-                } else {
-                    dev->buffer[pos++] = (ZIP_250_SECTORS >> 24) & 0xff;
-                    dev->buffer[pos++] = (ZIP_250_SECTORS >> 16) & 0xff;
-                    dev->buffer[pos++] = (ZIP_250_SECTORS >> 8) & 0xff;
-                    dev->buffer[pos++] = ZIP_250_SECTORS & 0xff;
-                    dev->buffer[pos++] = 3; /* Maximum medium capacity */
-                }
-            } else {
-                /* ZIP 100 only supports ZIP 100 media as well, so we always return
-                   the ZIP 100 size. */
-                dev->buffer[pos++] = (ZIP_SECTORS >> 24) & 0xff;
-                dev->buffer[pos++] = (ZIP_SECTORS >> 16) & 0xff;
-                dev->buffer[pos++] = (ZIP_SECTORS >> 8) & 0xff;
-                dev->buffer[pos++] = ZIP_SECTORS & 0xff;
-                if (dev->drv->fp != NULL)
-                    dev->buffer[pos++] = 2;
-                else
-                    dev->buffer[pos++] = 3;
-            }
-
-            dev->buffer[pos++] = 512 >> 16;
-            dev->buffer[pos++] = 512 >> 8;
-            dev->buffer[pos++] = 512 & 0xff;
-
-            if (dev->drv->fp != NULL) {
-                /* Formattable capacity descriptor */
-                dev->buffer[pos++] = (dev->drv->medium_size >> 24) & 0xff;
-                dev->buffer[pos++] = (dev->drv->medium_size >> 16) & 0xff;
-                dev->buffer[pos++] = (dev->drv->medium_size >> 8) & 0xff;
-                dev->buffer[pos++] = dev->drv->medium_size & 0xff;
-                dev->buffer[pos++] = 0;
-                dev->buffer[pos++] = 512 >> 16;
-                dev->buffer[pos++] = 512 >> 8;
-                dev->buffer[pos++] = 512 & 0xff;
-            }
-
-            zip_set_buf_len(dev, BufLen, &len);
-
-            zip_data_command_finish(dev, len, len, len, 0);
-            break;
-
-        default:
-            zip_illegal_opcode(dev);
-            break;
-    }
-
-#if 0
-    zip_log("ZIP %i: Phase: %02X, request length: %i\n", dev->id, dev->tf->phase, dev->tf->request_length);
-#endif
-
-    if ((dev->packet_status == PHASE_COMPLETE) || (dev->packet_status == PHASE_ERROR))
-        zip_buf_free(dev);
-}
-
-static void
-zip_command_stop(scsi_common_t *sc)
-{
-    zip_t *dev = (zip_t *) sc;
-
-    zip_command_complete(dev);
-    zip_buf_free(dev);
-}
-
-/* The command second phase function, needed for Mode Select. */
-static uint8_t
-zip_phase_data_out(scsi_common_t *sc)
-{
-    zip_t *dev = (zip_t *) sc;
-
-    uint16_t block_desc_len;
-    uint16_t pos;
-    uint16_t param_list_len;
-
-    uint8_t error = 0;
-    uint8_t page;
-    uint8_t page_len;
-
-    uint32_t i = 0;
-
-    uint8_t hdr_len;
-    uint8_t val;
-    uint8_t old_val;
-    uint8_t ch;
-
-    uint32_t last_to_write = 0;
-    uint32_t c;
-    uint32_t h;
-    uint32_t s;
-
-    int len = 0;
-
-    switch (dev->current_cdb[0]) {
-        case GPCMD_VERIFY_6:
-        case GPCMD_VERIFY_10:
-        case GPCMD_VERIFY_12:
-            break;
-        case GPCMD_WRITE_6:
-        case GPCMD_WRITE_10:
-        case GPCMD_WRITE_AND_VERIFY_10:
-        case GPCMD_WRITE_12:
-        case GPCMD_WRITE_AND_VERIFY_12:
-            if (dev->requested_blocks > 0)
-                zip_blocks(dev, &len, 1, 1);
-            break;
-        case GPCMD_WRITE_SAME_10:
-            if (!dev->current_cdb[7] && !dev->current_cdb[8]) {
-                last_to_write = (dev->drv->medium_size - 1);
-            } else
-                last_to_write = dev->sector_pos + dev->sector_len - 1;
-
-            for (i = dev->sector_pos; i <= last_to_write; i++) {
-                if (dev->current_cdb[1] & 2) {
-                    dev->buffer[0] = (i >> 24) & 0xff;
-                    dev->buffer[1] = (i >> 16) & 0xff;
-                    dev->buffer[2] = (i >> 8) & 0xff;
-                    dev->buffer[3] = i & 0xff;
-                } else if (dev->current_cdb[1] & 4) {
-                    /* CHS are 96, 1, 2048 (ZIP 100) and 239, 1, 2048 (ZIP 250) */
-                    s              = (i % 2048);
-                    h              = ((i - s) / 2048) % 1;
-                    c              = ((i - s) / 2048) / 1;
-                    dev->buffer[0] = (c >> 16) & 0xff;
-                    dev->buffer[1] = (c >> 8) & 0xff;
-                    dev->buffer[2] = c & 0xff;
-                    dev->buffer[3] = h & 0xff;
-                    dev->buffer[4] = (s >> 24) & 0xff;
-                    dev->buffer[5] = (s >> 16) & 0xff;
-                    dev->buffer[6] = (s >> 8) & 0xff;
-                    dev->buffer[7] = s & 0xff;
-                }
-                if (fseek(dev->drv->fp, dev->drv->base + (i << 9), SEEK_SET) == -1)
-                    fatal("zip_phase_data_out(): Error seeking\n");
-                if (fwrite(dev->buffer, 1, 512, dev->drv->fp) != 512)
-                    fatal("zip_phase_data_out(): Error writing data\n");
-            }
-            break;
-        case GPCMD_MODE_SELECT_6:
-        case GPCMD_MODE_SELECT_10:
-            if (dev->current_cdb[0] == GPCMD_MODE_SELECT_10) {
-                hdr_len        = 8;
-                param_list_len = dev->current_cdb[7];
-                param_list_len <<= 8;
-                param_list_len |= dev->current_cdb[8];
-            } else {
-                hdr_len        = 4;
-                param_list_len = dev->current_cdb[4];
-            }
-
-            if (dev->drv->bus_type == ZIP_BUS_SCSI) {
-                if (dev->current_cdb[0] == GPCMD_MODE_SELECT_6) {
-                    block_desc_len = dev->buffer[2];
-                    block_desc_len <<= 8;
-                    block_desc_len |= dev->buffer[3];
-                } else {
-                    block_desc_len = dev->buffer[6];
-                    block_desc_len <<= 8;
-                    block_desc_len |= dev->buffer[7];
-                }
-            } else
-                block_desc_len = 0;
-
-            pos = hdr_len + block_desc_len;
-
-            while (1) {
-                if (pos >= param_list_len) {
-                    zip_log("ZIP %i: Buffer has only block descriptor\n", dev->id);
-                    break;
-                }
-
-                page     = dev->buffer[pos] & 0x3F;
-                page_len = dev->buffer[pos + 1];
-
-                pos += 2;
-
-                if (!(zip_mode_sense_page_flags & (1LL << ((uint64_t) page))))
-                    error |= 1;
-                else {
-                    for (i = 0; i < page_len; i++) {
-                        ch      = zip_mode_sense_pages_changeable.pages[page][i + 2];
-                        val     = dev->buffer[pos + i];
-                        old_val = dev->ms_pages_saved.pages[page][i + 2];
-                        if (val != old_val) {
-                            if (ch)
-                                dev->ms_pages_saved.pages[page][i + 2] = val;
-                            else
-                                error |= 1;
-                        }
-                    }
-                }
-
-                pos += page_len;
-
-                if (dev->drv->bus_type == ZIP_BUS_SCSI)
-                    val = zip_mode_sense_pages_default_scsi.pages[page][0] & 0x80;
-                else
-                    val = zip_mode_sense_pages_default.pages[page][0] & 0x80;
-                if (dev->do_page_save && val)
-                    zip_mode_sense_save(dev);
-
-                if (pos >= dev->total_length)
-                    break;
-            }
-
-            if (error) {
-                zip_buf_free(dev);
-                zip_invalid_field_pl(dev);
-                return 0;
-            }
-            break;
-
-        default:
-            break;
-    }
-
-    zip_command_stop((scsi_common_t *) dev);
-    return 1;
-}
-
-/* Peform a master init on the entire module. */
-void
-zip_global_init(void)
-{
-    /* Clear the global data. */
-    memset(zip_drives, 0x00, sizeof(zip_drives));
-}
-
-static int
-zip_get_max(int ide_has_dma, int type)
-{
-    int ret;
-
-    switch (type) {
-        case TYPE_PIO:
-            ret = ide_has_dma ? 3 : 0;
-            break;
-        case TYPE_SDMA:
-        default:
-            ret = -1;
-            break;
-        case TYPE_MDMA:
-            ret = ide_has_dma ? 1 : -1;
-            break;
-        case TYPE_UDMA:
-            ret = ide_has_dma ? 5 : -1;
-            break;
-    }
-
-    return ret;
-}
-
-static int
-zip_get_timings(int ide_has_dma, int type)
-{
-    int ret;
-
-    switch (type) {
-        case TIMINGS_DMA:
-            ret = ide_has_dma ? 0x96 : 0;
-            break;
-        case TIMINGS_PIO:
-            ret = ide_has_dma ? 0xb4 : 0;
-            break;
-        case TIMINGS_PIO_FC:
-            ret = ide_has_dma ? 0xb4 : 0;
-            break;
-        default:
-            ret = 0;
-            break;
-    }
-
-    return ret;
-}
-
-static void
-zip_100_identify(ide_t *ide)
-{
-    ide_padstr((char *) (ide->buffer + 23), "E.08", 8);                  /* Firmware */
-    ide_padstr((char *) (ide->buffer + 27), "IOMEGA ZIP 100 ATAPI", 40); /* Model */
-}
-
-static void
-zip_250_identify(ide_t *ide, int ide_has_dma)
-{
-    ide_padstr((char *) (ide->buffer + 23), "42.S", 8);                         /* Firmware */
-    ide_padstr((char *) (ide->buffer + 27), "IOMEGA  ZIP 250       ATAPI", 40); /* Model */
-
-    if (ide_has_dma) {
-        ide->buffer[80] = 0x70; /*Supported ATA versions : ATA/ATAPI-4 ATA/ATAPI-6*/
-        ide->buffer[81] = 0x19; /*Maximum ATA revision supported : ATA/ATAPI-6 T13 1410D revision 3a*/
-    }
-}
-
-static void
-zip_identify(ide_t *ide, int ide_has_dma)
-{
-    const zip_t *zip;
-
-    zip = (zip_t *) ide->sc;
-
-    /* ATAPI device, direct-access device, removable media, interrupt DRQ:
-
-       Using (2 << 5) below makes the ASUS P/I-P54TP4XE misdentify the ZIP drive
-       as a LS-120. */
-    ide->buffer[0] = 0x8000 | (0 << 8) | 0x80 | (1 << 5);
-    ide_padstr((char *) (ide->buffer + 10), "", 20); /* Serial Number */
-    ide->buffer[49]  = 0x200;                        /* LBA supported */
-    ide->buffer[126] = 0xfffe;                       /* Interpret zero byte count limit as maximum length */
-
-    if (zip_drives[zip->id].is_250)
-        zip_250_identify(ide, ide_has_dma);
-    else
-        zip_100_identify(ide);
-}
-
-static void
-zip_drive_reset(int c)
-{
-    zip_t         *dev;
-    scsi_device_t *sd;
-    ide_t         *id;
-    uint8_t        scsi_bus = (zip_drives[c].scsi_device_id >> 4) & 0x0f;
-    uint8_t        scsi_id  = zip_drives[c].scsi_device_id & 0x0f;
-
-    if (!zip_drives[c].priv) {
-        zip_drives[c].priv = (zip_t *) malloc(sizeof(zip_t));
-        memset(zip_drives[c].priv, 0, sizeof(zip_t));
-    }
-
-    dev = (zip_t *) zip_drives[c].priv;
-
-    dev->id      = c;
-    dev->cur_lun = SCSI_LUN_USE_CDB;
-
-    if (zip_drives[c].bus_type == ZIP_BUS_SCSI) {
-        if (!dev->tf)
-            dev->tf        = (ide_tf_t *) calloc(1, sizeof(ide_tf_t));
-
-        /* SCSI ZIP, attach to the SCSI bus. */
-        sd = &scsi_devices[scsi_bus][scsi_id];
-
-        sd->sc             = (scsi_common_t *) dev;
-        sd->command        = zip_command;
-        sd->request_sense  = zip_request_sense_for_scsi;
-        sd->reset          = zip_reset;
-        sd->phase_data_out = zip_phase_data_out;
-        sd->command_stop   = zip_command_stop;
-        sd->type           = SCSI_REMOVABLE_DISK;
-    } else if (zip_drives[c].bus_type == ZIP_BUS_ATAPI) {
-        /* ATAPI CD-ROM, attach to the IDE bus. */
-        id = ide_get_drive(zip_drives[c].ide_channel);
-        /* If the IDE channel is initialized, we attach to it,
-           otherwise, we do nothing - it's going to be a drive
-           that's not attached to anything. */
-        if (id) {
-            id->sc               = (scsi_common_t *) dev;
-            dev->tf              = id->tf;
-            IDE_ATAPI_IS_EARLY   = 0;
-            id->get_max          = zip_get_max;
-            id->get_timings      = zip_get_timings;
-            id->identify         = zip_identify;
-            id->stop             = NULL;
-            id->packet_command   = zip_command;
-            id->device_reset     = zip_reset;
-            id->phase_data_out   = zip_phase_data_out;
-            id->command_stop     = zip_command_stop;
-            id->bus_master_error = zip_bus_master_error;
-            id->interrupt_drq    = 1;
-
-            ide_atapi_attach(id);
-        }
-    }
-}
-
-void
-zip_hard_reset(void)
-{
-    zip_t  *dev;
-    uint8_t scsi_id;
-    uint8_t scsi_bus;
-
-    for (uint8_t c = 0; c < ZIP_NUM; c++) {
-        if ((zip_drives[c].bus_type == ZIP_BUS_ATAPI) || (zip_drives[c].bus_type == ZIP_BUS_SCSI)) {
-            zip_log("ZIP hard_reset drive=%d\n", c);
-
-            if (zip_drives[c].bus_type == ZIP_BUS_SCSI) {
-                scsi_bus = (zip_drives[c].scsi_device_id >> 4) & 0x0f;
-                scsi_id  = zip_drives[c].scsi_device_id & 0x0f;
-
-                /* Make sure to ignore any SCSI ZIP drive that has an out of range SCSI bus. */
-                if (scsi_bus >= SCSI_BUS_MAX)
-                    continue;
-
-                /* Make sure to ignore any SCSI ZIP drive that has an out of range ID. */
-                if (scsi_id >= SCSI_ID_MAX)
-                    continue;
-            }
-
-            /* Make sure to ignore any ATAPI ZIP drive that has an out of range IDE channel. */
-            if ((zip_drives[c].bus_type == ZIP_BUS_ATAPI) && (zip_drives[c].ide_channel > 7))
-                continue;
-
-            zip_drive_reset(c);
-
-            dev = (zip_t *) zip_drives[c].priv;
-
-            if (dev->tf == NULL)
-                continue;
-
-            dev->id  = c;
-            dev->drv = &zip_drives[c];
-
-            zip_init(dev);
-
-            if (strlen(zip_drives[c].image_path))
-                zip_load(dev, zip_drives[c].image_path);
-
-            zip_mode_sense_load(dev);
-
-            if (zip_drives[c].bus_type == ZIP_BUS_SCSI)
-                zip_log("SCSI ZIP drive %i attached to SCSI ID %i\n", c, zip_drives[c].scsi_device_id);
-            else if (zip_drives[c].bus_type == ZIP_BUS_ATAPI)
-                zip_log("ATAPI ZIP drive %i attached to IDE channel %i\n", c, zip_drives[c].ide_channel);
-        }
-    }
-}
-
-void
-zip_close(void)
-{
-    zip_t  *dev;
-    uint8_t scsi_bus;
-    uint8_t scsi_id;
-
-    for (uint8_t c = 0; c < ZIP_NUM; c++) {
-        if (zip_drives[c].bus_type == ZIP_BUS_SCSI) {
-            scsi_bus = (zip_drives[c].scsi_device_id >> 4) & 0x0f;
-            scsi_id  = zip_drives[c].scsi_device_id & 0x0f;
-
-            memset(&scsi_devices[scsi_bus][scsi_id], 0x00, sizeof(scsi_device_t));
-        }
-
-        dev = (zip_t *) zip_drives[c].priv;
-
-        if (dev) {
-            zip_disk_unload(dev);
-
-            if (dev->tf)
-                free(dev->tf);
-
-            free(dev);
-            zip_drives[c].priv = NULL;
-        }
-    }
-}
diff --git a/src/dma.c b/src/dma.c
index 2efe9772d..7000a7440 100644
--- a/src/dma.c
+++ b/src/dma.c
@@ -18,10 +18,12 @@
  *          Copyright 2016-2020 Miran Grca.
  *          Copyright 2017-2020 Fred N. van Kempen.
  */
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#define HAVE_STDARG_H
 #include <86box/86box.h>
 #include "cpu.h"
 #include "x86.h"
@@ -43,6 +45,7 @@ static int      dma_wp[2];
 static uint8_t  dma_stat;
 static uint8_t  dma_stat_rq;
 static uint8_t  dma_stat_rq_pc;
+static uint8_t  dma_stat_adv_pend;
 static uint8_t  dma_command[2];
 static uint8_t  dma_req_is_soft;
 static uint8_t  dma_advanced;
@@ -456,8 +459,9 @@ dma_sg_int_status_read(UNUSED(uint16_t addr), UNUSED(void *priv))
 static uint8_t
 dma_read(uint16_t addr, UNUSED(void *priv))
 {
-    int channel;
-    uint8_t temp;
+    int     channel;
+    int     count;
+    uint8_t ret = (dmaregs[0][addr & 0xf]);
 
     if (dma_pc98)
         addr >>= 1;
@@ -470,35 +474,41 @@ dma_read(uint16_t addr, UNUSED(void *priv))
         case 6: /*Address registers*/
             dma_wp[0] ^= 1;
             if (dma_wp[0])
-                return (dma[channel].ac & 0xff);
-            return ((dma[channel].ac >> 8) & 0xff);
+                ret = (dma[channel].ac & 0xff);
+            else
+                ret = ((dma[channel].ac >> 8) & 0xff);
+            break;
 
         case 1:
         case 3:
         case 5:
         case 7: /*Count registers*/
             dma_wp[0] ^= 1;
+            count = dma[channel].cc/* + 1*/;
             if (dma_wp[0])
-                temp = dma[channel].cc & 0xff;
+                ret = count & 0xff;
             else
-                temp = dma[channel].cc >> 8;
-            return temp;
+                ret = count >> 8;
+            break;
 
         case 8: /*Status register*/
-            temp = dma_stat_rq_pc & 0xf;
-            temp <<= 4;
-            temp |= dma_stat & 0xf;
+            ret = dma_stat_rq_pc & 0xf;
+            ret <<= 4;
+            ret |= dma_stat & 0xf;
             dma_stat &= ~0xf;
-            return temp;
+            break;
 
         case 0xd: /*Temporary register*/
-            return 0;
+            ret = 0x00;
+            break;
 
         default:
             break;
     }
 
-    return (dmaregs[0][addr & 0xf]);
+    dma_log("DMA: [R] %04X = %02X\n", addr, ret);
+
+    return ret;
 }
 
 static void
@@ -511,6 +521,8 @@ dma_write(uint16_t addr, uint8_t val, UNUSED(void *priv))
 
     channel = (addr >> 1) & 3;
 
+    dma_log("DMA: [W] %04X = %02X\n", addr, val);
+
     dmaregs[0][addr & 0xf] = val;
     switch (addr & 0xf) {
         case 0:
@@ -539,8 +551,10 @@ dma_write(uint16_t addr, uint8_t val, UNUSED(void *priv))
 
         case 8: /*Control register*/
             dma_command[0] = val;
+#ifdef ENABLE_DMA_LOG
             if (val & 0x01)
-                pclog("[%08X:%04X] Memory-to-memory enable\n", CS, cpu_state.pc);
+                dma_log("[%08X:%04X] Memory-to-memory enable\n", CS, cpu_state.pc);
+#endif
             return;
 
         case 9: /*Request register */
@@ -548,7 +562,7 @@ dma_write(uint16_t addr, uint8_t val, UNUSED(void *priv))
             if (val & 4) {
                 dma_stat_rq_pc |= (1 << channel);
                 if ((channel == 0) && (dma_command[0] & 0x01)) {
-                    pclog("Memory to memory transfer start\n");
+                    dma_log("Memory to memory transfer start\n");
                     dma_mem_to_mem_transfer();
                 } else
                     dma_block_transfer(channel);
@@ -661,6 +675,19 @@ dma_ps2_read(uint16_t addr, UNUSED(void *priv))
                     temp = dma_c->arb_level;
                     break;
 
+                case 9: /*Set DMA mask*/
+                    dma_m |= (1 << dma_ps2.xfr_channel);
+                    break;
+
+                case 0xa: /*Reset DMA mask*/
+                    dma_m &= ~(1 << dma_ps2.xfr_channel);
+                    break;
+
+                case 0xb:
+                    if (!(dma_m & (1 << dma_ps2.xfr_channel)))
+                        dma_ps2_run(dma_ps2.xfr_channel);
+                    break;
+
                 default:
                     fatal("Bad XFR Read command %i channel %i\n", dma_ps2.xfr_command, dma_ps2.xfr_channel);
             }
@@ -763,6 +790,19 @@ dma_ps2_write(uint16_t addr, uint8_t val, UNUSED(void *priv))
                     dma_c->arb_level = val;
                     break;
 
+                case 9: /*Set DMA mask*/
+                    dma_m |= (1 << dma_ps2.xfr_channel);
+                    break;
+
+                case 0xa: /*Reset DMA mask*/
+                    dma_m &= ~(1 << dma_ps2.xfr_channel);
+                    break;
+
+                case 0xb:
+                    if (!(dma_m & (1 << dma_ps2.xfr_channel)))
+                        dma_ps2_run(dma_ps2.xfr_channel);
+                    break;
+
                 default:
                     fatal("Bad XFR command %i channel %i val %02x\n", dma_ps2.xfr_command, dma_ps2.xfr_channel, val);
             }
@@ -777,9 +817,16 @@ static uint8_t
 dma16_read(uint16_t addr, UNUSED(void *priv))
 {
     int     channel = ((addr >> 2) & 3) + 4;
-    uint8_t temp;
+#ifdef ENABLE_DMA_LOG
+    uint16_t port = addr;
+#endif
+    uint8_t ret;
+    int count;
 
     addr >>= 1;
+
+    ret = dmaregs[1][addr & 0xf];
+
     switch (addr & 0xf) {
         case 0:
         case 2:
@@ -788,41 +835,49 @@ dma16_read(uint16_t addr, UNUSED(void *priv))
             dma_wp[1] ^= 1;
             if (dma_ps2.is_ps2) {
                 if (dma_wp[1])
-                    return (dma[channel].ac);
-                return ((dma[channel].ac >> 8) & 0xff);
-            }
-            if (dma_wp[1])
-                return ((dma[channel].ac >> 1) & 0xff);
-            return ((dma[channel].ac >> 9) & 0xff);
+                    ret = (dma[channel].ac);
+                else
+                    ret = ((dma[channel].ac >> 8) & 0xff);
+            } else if (dma_wp[1])
+                ret = ((dma[channel].ac >> 1) & 0xff);
+            else
+                ret = ((dma[channel].ac >> 9) & 0xff);
+            break;
 
         case 1:
         case 3:
         case 5:
         case 7: /*Count registers*/
             dma_wp[1] ^= 1;
+            count = dma[channel].cc/* + 1*/;
             if (dma_wp[1])
-                temp = dma[channel].cc & 0xff;
+                ret = count & 0xff;
             else
-                temp = dma[channel].cc >> 8;
-            return temp;
+                ret = count >> 8;
+            break;
 
         case 8: /*Status register*/
-            temp = (dma_stat_rq_pc & 0xf0);
-            temp |= dma_stat >> 4;
+            ret = (dma_stat_rq_pc & 0xf0);
+            ret |= dma_stat >> 4;
             dma_stat &= ~0xf0;
-            return temp;
+            break;
 
         default:
             break;
     }
 
-    return (dmaregs[1][addr & 0xf]);
+    dma_log("dma16_read(%08X) = %02X\n", addr, ret);
+
+    return ret;
 }
 
 static void
 dma16_write(uint16_t addr, uint8_t val, UNUSED(void *priv))
 {
     int channel = ((addr >> 2) & 3) + 4;
+
+    dma_log("dma16_write(%08X, %02X)\n", addr, val);
+
     addr >>= 1;
 
     dmaregs[1][addr & 0xf] = val;
@@ -925,6 +980,8 @@ dma_page_write(uint16_t addr, uint8_t val, UNUSED(void *priv))
 {
     uint8_t convert[8] = CHANNELS;
 
+    dma_log("DMA: [W] %04X = %02X\n", addr, val);
+
 #ifdef USE_DYNAREC
     if ((addr == 0x84) && cpu_use_dynarec)
         update_tsc();
@@ -1022,6 +1079,8 @@ dma_page_read(uint16_t addr, UNUSED(void *priv))
             ret = dma[addr].page_l;
     }
 
+    dma_log("DMA: [R] %04X = %02X\n", addr, ret);
+
     return ret;
 }
 
@@ -1129,11 +1188,12 @@ dma_reset(void)
         dma[c].transfer_mode = (c & 4) ? 0x0202 : 0x0101;
     }
 
-    dma_stat        = 0x00;
-    dma_stat_rq     = 0x00;
-    dma_stat_rq_pc  = 0x00;
-    dma_req_is_soft = 0;
-    dma_advanced    = 0;
+    dma_stat          = 0x00;
+    dma_stat_rq       = 0x00;
+    dma_stat_rq_pc    = 0x00;
+    dma_stat_adv_pend = 0x00;
+    dma_req_is_soft   = 0;
+    dma_advanced      = 0;
 
     memset(dma_buffer, 0x00, sizeof(dma_buffer));
     memset(dma16_buffer, 0x00, sizeof(dma16_buffer));
@@ -1440,7 +1500,7 @@ dma_retreat(dma_t *dma_c)
         dma_c->page = dma_c->page_l = (dma_c->ac >> 16) & 0xff;
         dma_c->page_h               = (dma_c->ac >> 24) & 0xff;
     } else if (as == 2)
-        dma_c->ac = ((dma_c->ac & 0xfffe0000) & dma_mask) | ((dma_c->ac - as) & 0xffff);
+        dma_c->ac = ((dma_c->ac & 0xfffe0000) & dma_mask) | ((dma_c->ac - as) & 0x1ffff);
     else
         dma_c->ac = ((dma_c->ac & 0xffff0000) & dma_mask) | ((dma_c->ac - as) & 0xffff);
 }
@@ -1456,11 +1516,141 @@ dma_advance(dma_t *dma_c)
         dma_c->page = dma_c->page_l = (dma_c->ac >> 16) & 0xff;
         dma_c->page_h               = (dma_c->ac >> 24) & 0xff;
     } else if (as == 2)
-        dma_c->ac = ((dma_c->ac & 0xfffe0000) & dma_mask) | ((dma_c->ac + as) & 0xffff);
+        dma_c->ac = ((dma_c->ac & 0xfffe0000) & dma_mask) | ((dma_c->ac + as) & 0x1ffff);
     else
         dma_c->ac = ((dma_c->ac & 0xffff0000) & dma_mask) | ((dma_c->ac + as) & 0xffff);
 }
 
+int
+dma_channel_readable(int channel)
+{
+    dma_t   *dma_c = &dma[channel];
+    int      ret = 1;
+
+    if (channel < 4) {
+        if (dma_command[0] & 0x04)
+            ret = 0;
+    } else {
+        if (dma_command[1] & 0x04)
+            ret = 0;
+    }
+
+    if (!(dma_e & (1 << channel)))
+        ret = 0;
+    if ((dma_m & (1 << channel)) && !dma_req_is_soft)
+        ret = 0;
+    if ((dma_c->mode & 0xC) != 8)
+        ret = 0;
+
+    return ret;
+}
+
+int
+dma_channel_read_only(int channel)
+{
+    dma_t   *dma_c = &dma[channel];
+    uint16_t temp;
+
+    if (channel < 4) {
+        if (dma_command[0] & 0x04)
+            return (DMA_NODATA);
+    } else {
+        if (dma_command[1] & 0x04)
+            return (DMA_NODATA);
+    }
+
+    if (!(dma_e & (1 << channel)))
+        return (DMA_NODATA);
+    if ((dma_m & (1 << channel)) && !dma_req_is_soft)
+        return (DMA_NODATA);
+    if ((dma_c->mode & 0xC) != 8)
+        return (DMA_NODATA);
+
+    dma_channel_advance(channel);
+
+    if (!dma_at && !channel)
+        refreshread();
+
+    if (!dma_c->size) {
+        temp = _dma_read(dma_c->ac, dma_c);
+
+        if (dma_c->mode & 0x20) {
+            if (dma_ps2.is_ps2)
+                dma_c->ac--;
+            else if (dma_advanced)
+                dma_retreat(dma_c);
+            else
+                dma_c->ac = (dma_c->ac & 0xffff0000 & dma_mask) | ((dma_c->ac - 1) & 0xffff);
+        } else {
+            if (dma_ps2.is_ps2)
+                dma_c->ac++;
+            else if (dma_advanced)
+                dma_advance(dma_c);
+            else
+                dma_c->ac = (dma_c->ac & 0xffff0000 & dma_mask) | ((dma_c->ac + 1) & 0xffff);
+        }
+    } else {
+        temp = _dma_readw(dma_c->ac, dma_c);
+
+        if (dma_c->mode & 0x20) {
+            if (dma_ps2.is_ps2)
+                dma_c->ac -= 2;
+            else if (dma_advanced)
+                dma_retreat(dma_c);
+            else
+                dma_c->ac = (dma_c->ac & 0xfffe0000 & dma_mask) | ((dma_c->ac - 2) & 0x1ffff);
+        } else {
+            if (dma_ps2.is_ps2)
+                dma_c->ac += 2;
+            else if (dma_advanced)
+                dma_advance(dma_c);
+            else
+                dma_c->ac = (dma_c->ac & 0xfffe0000 & dma_mask) | ((dma_c->ac + 2) & 0x1ffff);
+        }
+    }
+
+    dma_stat_rq |= (1 << channel);
+
+    dma_stat_adv_pend |= (1 << channel);
+
+    return temp;
+}
+
+int
+dma_channel_advance(int channel)
+{
+    dma_t   *dma_c = &dma[channel];
+    int      tc = 0;
+
+    if (dma_stat_adv_pend & (1 << channel)) {
+        dma_c->cc--;
+        if (dma_c->cc < 0) {
+            if (dma_advanced && (dma_c->sg_status & 1) && !(dma_c->sg_status & 6))
+                dma_sg_next_addr(dma_c);
+            else {
+                tc = 1;
+                if (dma_c->mode & 0x10) { /*Auto-init*/
+                    dma_c->cc = dma_c->cb;
+                    dma_c->ac = dma_c->ab;
+                } else
+                    dma_m |= (1 << channel);
+                dma_stat |= (1 << channel);
+            }
+        }
+
+        if (tc) {
+            if (dma_advanced && (dma_c->sg_status & 1) && ((dma_c->sg_command & 0xc0) == 0x40)) {
+                picint(1 << 13);
+                dma_c->sg_status |= 8;
+            }
+        }
+
+        dma_stat_adv_pend &= ~(1 << channel);
+    }
+
+    return tc;
+}
+
 int
 dma_channel_read(int channel)
 {
@@ -1483,6 +1673,9 @@ dma_channel_read(int channel)
     if ((dma_c->mode & 0xC) != 8)
         return (DMA_NODATA);
 
+    if (dma_stat_adv_pend & (1 << channel))
+        dma_channel_advance(channel);
+
     if (!dma_at && !channel)
         refreshread();
 
@@ -1626,6 +1819,8 @@ dma_channel_write(int channel, uint16_t val)
 
     dma_stat_rq |= (1 << channel);
 
+    dma_stat_adv_pend &= ~(1 << channel);
+
     dma_c->cc--;
     if (dma_c->cc < 0) {
         if (dma_advanced && (dma_c->sg_status & 1) && !(dma_c->sg_status & 6))
diff --git a/src/floppy/CMakeLists.txt b/src/floppy/CMakeLists.txt
index 89fbbf76f..c16ca06f4 100644
--- a/src/floppy/CMakeLists.txt
+++ b/src/floppy/CMakeLists.txt
@@ -9,10 +9,29 @@
 #          CMake build script.
 #
 # Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
 #
 #          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2024      Jasmine Iwanek.
 #
 
-add_library(fdd OBJECT fdd.c fdc.c fdc_magitronic.c fdc_monster.c fdc_pii15xb.c
-    fdi2raw.c fdd_common.c fdd_86f.c fdd_fdi.c fdd_imd.c fdd_img.c fdd_json.c
-    fdd_mfm.c fdd_td0.c)
+add_library(fdd OBJECT
+    fdd.c
+    fdc.c
+    fdc_compaticard.c
+    fdc_magitronic.c
+    fdc_monster.c
+    fdc_pii15xb.c
+    fdi2raw.c
+    fdd_common.c
+    fdd_86f.c
+    fdd_fdi.c
+    fdd_imd.c
+    fdd_img.c
+    fdd_pcjs.c
+    fdd_mfm.c
+    fdd_td0.c
+)
+
+add_subdirectory(lzw)
+target_link_libraries(86Box lzw)
diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c
index f30d86168..9d68365d2 100644
--- a/src/floppy/fdc.c
+++ b/src/floppy/fdc.c
@@ -38,6 +38,7 @@
 #include <86box/fdc_ext.h>
 #include <86box/plat_fallthrough.h>
 #include <86box/plat_unused.h>
+#include <86box/fifo.h>
 
 extern uint64_t motoron[FDD_NUM];
 
@@ -76,7 +77,9 @@ int         lastbyte = 0;
 int floppymodified[4];
 int floppyrate[4];
 
-int fdc_type = 0;
+int fdc_current[FDC_MAX] = { 0, 0 };
+
+volatile int fdcinited = 0;
 
 #ifdef ENABLE_FDC_LOG
 int fdc_do_log = ENABLE_FDC_LOG;
@@ -96,51 +99,26 @@ fdc_log(const char *fmt, ...)
 #    define fdc_log(fmt, ...)
 #endif
 
-#if 0
-const device_t fdc_none_device = {
-    .name          = "None",
-    .internal_name = "none",
-    .flags         = 0,
-    .local         = 0,
-    .init          = NULL,
-    .close         = NULL,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-#endif
-
-const device_t fdc_internal_device = {
-    .name          = "Internal",
-    .internal_name = "internal",
-    .flags         = 0,
-    .local         = 0,
-    .init          = NULL,
-    .close         = NULL,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
 typedef const struct {
     const device_t *device;
 } fdc_cards_t;
 
 static fdc_cards_t fdc_cards[] = {
     // clang-format off
+    { &device_none               },
+    { &device_internal           },
+    { &fdc_xt_device             },
+    { &fdc_at_device             },
+    { &fdc_b215_device           },
+    { &fdc_pii151b_device        },
+    { &fdc_pii158b_device        },
+    { &fdc_compaticard_i_device  },
+    { &fdc_compaticard_ii_device },
 #if 0
-    { &fdc_none_device     },
+    { &fdc_compaticard_iv_device },
 #endif
-    { &fdc_internal_device },
-    { &fdc_b215_device     },
-    { &fdc_pii151b_device  },
-    { &fdc_pii158b_device  },
-    { &fdc_monster_device  },
-    { NULL                 }
+    { &fdc_monster_device        },
+    { NULL                       }
     // clang-format on
 };
 
@@ -191,8 +169,8 @@ fdc_card_get_from_internal_name(char *s)
 void
 fdc_card_init(void)
 {
-    if ((fdc_type > 0) && fdc_cards[fdc_type].device)
-        device_add(fdc_cards[fdc_type].device);
+    if ((fdc_current[0] > FDC_INTERNAL) && fdc_cards[fdc_current[0]].device)
+        device_add_inst(fdc_cards[fdc_current[0]].device, 0);
 }
 
 uint8_t
@@ -206,15 +184,21 @@ fdc_ctrl_reset(void *priv)
 {
     fdc_t *fdc = (fdc_t *) priv;
 
-    fdc->stat = 0x80;
+    fdc->stat             = 0x80;
     fdc->pnum = fdc->ptot = 0;
     fdc->st0              = 0;
-    fdc->lock             = 0;
     fdc->head             = 0;
     fdc->step             = 0;
     fdc->power_down       = 0;
-    if (!(fdc->flags & FDC_FLAG_AT))
-        fdc->rate = 2;
+
+    if (!fdc->lock && !fdc->fifointest) {
+        fdc->fifo  = 0;
+        fdc->tfifo = 1;
+
+        fifo_reset(fdc->fifo_p);
+        fifo_set_len(fdc->fifo_p, fdc->tfifo + 1);
+        fifo_set_trigger_len(fdc->fifo_p, fdc->tfifo + 1);
+    }
 }
 
 sector_id_t
@@ -302,6 +286,15 @@ fdc_is_mfm(fdc_t *fdc)
     return fdc->mfm ? 1 : 0;
 }
 
+int
+fdc_is_dma(fdc_t *fdc)
+{
+    if ((fdc->flags & FDC_FLAG_PCJR) || !fdc->dma)
+        return 0;
+    else
+        return 1;
+}
+
 void
 fdc_request_next_sector_id(fdc_t *fdc)
 {
@@ -309,7 +302,7 @@ fdc_request_next_sector_id(fdc_t *fdc)
         fdc->stat = 0xf0;
     else {
         dma_set_drq(fdc->dma_ch, 1);
-        fdc->stat = 0xd0;
+        fdc->stat = 0x50;
     }
 }
 
@@ -337,52 +330,23 @@ fdc_get_format_sectors(fdc_t *fdc)
     return (int) fdc->format_sectors;
 }
 
-static void
-fdc_reset_fifo_buf(fdc_t *fdc)
-{
-    memset(fdc->fifobuf, 0, 16);
-    fdc->fifobufpos = 0;
-}
-
-static void
-fdc_fifo_buf_advance(fdc_t *fdc)
-{
-    if (fdc->fifobufpos == fdc->tfifo)
-        fdc->fifobufpos = 0;
-    else
-        fdc->fifobufpos++;
-}
-
-static void
-fdc_fifo_buf_write(fdc_t *fdc, uint8_t val)
-{
-    fdc->fifobuf[fdc->fifobufpos] = val;
-    fdc_fifo_buf_advance(fdc);
-}
-
-static int
-fdc_fifo_buf_read(fdc_t *fdc)
-{
-    int temp = fdc->fifobuf[fdc->fifobufpos];
-    fdc_fifo_buf_advance(fdc);
-    if (!fdc->fifobufpos)
-        fdc->data_ready = 0;
-    return temp;
-}
-
 static void
 fdc_int(fdc_t *fdc, int set_fintr)
 {
     int ienable = 0;
 
-    if (!(fdc->flags & FDC_FLAG_PCJR))
+    if (fdc->flags & FDC_FLAG_PS2_MCA)
+        ienable = 1;
+    else if (!(fdc->flags & FDC_FLAG_PCJR))
         ienable = !!(fdc->dor & 8);
 
-    if (ienable)
-        picint(1 << fdc->irq);
+    if (ienable) {
+        if (fdc->irq != 0xff)
+            picint(1 << fdc->irq);
 
-    if (set_fintr)
-        fdc->fintr = 1;
+        if (set_fintr)
+            fdc->fintr = 1;
+    }
     fdc_log("fdc_int(%i): fdc->fintr = %i\n", set_fintr, fdc->fintr);
 }
 
@@ -395,7 +359,7 @@ fdc_watchdog_poll(void *priv)
     if (fdc->watchdog_count)
         timer_advance_u64(&fdc->watchdog_timer, 1000 * TIMER_USEC);
     else {
-        if (fdc->dor & 0x20)
+        if ((fdc->dor & 0x20) && (fdc->irq != 0xff))
             picint(1 << fdc->irq);
     }
 }
@@ -425,6 +389,15 @@ fdc_set_power_down(fdc_t *fdc, uint8_t power_down)
     fdc->power_down = power_down;
 }
 
+void
+fdc_toggle_flag(fdc_t *fdc, int flag, int on)
+{
+    if (on)
+        fdc->flags |= flag;
+    else
+        fdc->flags &= ~flag;
+}
+
 void
 fdc_update_max_track(fdc_t *fdc, int max_track)
 {
@@ -452,6 +425,58 @@ fdc_update_rwc(fdc_t *fdc, int drive, int rwc)
     fdc_rate(fdc, drive);
 }
 
+uint8_t
+fdc_get_media_id(fdc_t *fdc, int id)
+{
+    uint8_t ret = fdc->media_id & (1 << id);
+
+    return ret;
+}
+
+void
+fdc_set_media_id(fdc_t *fdc, int id, int set)
+{
+    fdc->media_id = (fdc->media_id & ~(1 << id)) | (set << id);
+}
+
+void
+fdc_set_flags(fdc_t *fdc, int flags)
+{
+    fdc->flags |= flags;
+}
+
+void
+fdc_clear_flags(fdc_t *fdc, int flags)
+{
+    fdc->flags &= ~flags;
+}
+
+void
+fdc_set_fdd_changed(int drive, int changed)
+{
+    if (changed)
+        fdd_changed[drive] = 1;
+}
+
+uint8_t
+fdc_get_fdd_changed(int drive)
+{
+    uint8_t ret = !!fdd_changed[drive];
+
+    return ret;
+}
+
+uint8_t
+fdc_get_shadow(fdc_t *fdc)
+{
+    uint8_t ret = (fdc->rate & 0x03) |
+                  ((fdc->pretrk & 0x07) << 2) |
+                  (fdc->power_down ? 0x40 : 0x00) |
+                  ((fdc_read(0x03f2, fdc) & 0x04) ? 0x80 : 0x00);
+
+    return ret;
+}
+
 int
 fdc_get_boot_drive(fdc_t *fdc)
 {
@@ -503,9 +528,11 @@ fdc_update_drv2en(fdc_t *fdc, int drv2en)
 void
 fdc_update_rate(fdc_t *fdc, int drive)
 {
-    if (((fdc->rwc[drive] == 1) || (fdc->rwc[drive] == 2)) && fdc->enh_mode)
+    if (((fdc->rwc[drive] == 1) || (fdc->rwc[drive] == 2)) &&
+        fdc->enh_mode && !(fdc->flags & FDC_FLAG_SMC661))
         fdc->bit_rate = 500;
-    else if ((fdc->rwc[drive] == 3) && fdc->enh_mode)
+    else if ((fdc->rwc[drive] == 3) && fdc->enh_mode &&
+             !(fdc->flags & FDC_FLAG_SMC661))
         fdc->bit_rate = 250;
     else  switch (fdc->rate) {
         default:
@@ -569,7 +596,7 @@ fdc_get_bitcell_period(fdc_t *fdc)
 static int
 fdc_get_densel(fdc_t *fdc, int drive)
 {
-    if (fdc->enh_mode) {
+    if (fdc->enh_mode && !(fdc->flags & FDC_FLAG_SMC661)) {
         switch (fdc->rwc[drive]) {
             case 1:
             case 3:
@@ -623,9 +650,6 @@ static void
 fdc_rate(fdc_t *fdc, int drive)
 {
     fdc_update_rate(fdc, drive);
-#if 0
-    fdc_log("FDD %c: Setting rate: %i, %i, %i (%i, %i)\n", 0x41 + drive, fdc->drvrate[drive], fdc->rate, fdc_get_densel(fdc, drive), fdc->rwc[drive], fdc->densel_force);
-#endif
     fdc_log("FDD %c: [%i] Setting rate: %i, %i, %i (%i, %i, %i)\n", 0x41 + drive, fdc->enh_mode, fdc->drvrate[drive], fdc->rate, fdc_get_densel(fdc, drive), fdc->rwc[drive], fdc->densel_force, fdc->densel_polarity);
     fdd_set_densel(fdc_get_densel(fdc, drive));
     fdc_log("FDD %c: [%i] Densel: %i\n", 0x41 + drive, fdc->enh_mode, fdc_get_densel(fdc, drive));
@@ -658,18 +682,7 @@ fdc_bad_command(fdc_t *fdc)
 static void
 fdc_io_command_phase1(fdc_t *fdc, int out)
 {
-#if 0
-    int i;
-
-    pclog_toggle_suppr();
-    pclog("%02X ", fdc->processed_cmd);
-    for (i = 0; i < fdc->pnum; i++)
-        pclog("%02X ", fdc->params[i]);
-    pclog("\n");
-    pclog_toggle_suppr();
-#endif
-
-    fdc_reset_fifo_buf(fdc);
+    fifo_reset(fdc->fifo_p);
     fdc_rate(fdc, fdc->drive);
     fdc->head = fdc->params[2];
     fdd_set_head(real_drive(fdc, fdc->drive), (fdc->params[0] & 4) ? 1 : 0);
@@ -686,11 +699,16 @@ fdc_io_command_phase1(fdc_t *fdc, int out)
         }
     }
 
-    ui_sb_update_icon(SB_FLOPPY | real_drive(fdc, fdc->drive), 1);
-    fdc->stat = out ? 0x90 : 0x50;
-    if ((fdc->flags & FDC_FLAG_PCJR) || !fdc->dma)
-        fdc->stat |= 0x20;
+    if (fdc->processed_cmd == 0x05 || fdc->processed_cmd == 0x09)
+        ui_sb_update_icon_write(SB_FLOPPY | real_drive(fdc, fdc->drive), 1);
     else
+        ui_sb_update_icon(SB_FLOPPY | real_drive(fdc, fdc->drive), 1);
+    fdc->stat = out ? 0x10 : 0x50;
+    if ((fdc->flags & FDC_FLAG_PCJR) || !fdc->dma) {
+        fdc->stat |= 0x20;
+        if (out)
+            fdc->stat |= 0x80;
+    } else
         dma_set_drq(fdc->dma_ch, 1);
 }
 
@@ -728,13 +746,33 @@ fdc_sis(fdc_t *fdc)
     fdc->paramstogo = 2;
 }
 
+static void
+fdc_soft_reset(fdc_t *fdc)
+{
+    if (fdc->power_down) {
+        timer_set_delay_u64(&fdc->timer, 1000 * TIMER_USEC);
+        fdc->interrupt = -5;
+    } else {
+        timer_set_delay_u64(&fdc->timer, 8 * TIMER_USEC);
+        fdc->interrupt = -1;
+
+        fdc->perp &= 0xfc;
+
+        for (int i = 0; i < FDD_NUM; i++) {
+            ui_sb_update_icon(SB_FLOPPY | i, 0);
+            ui_sb_update_icon_write(SB_FLOPPY | i, 0);
+        }
+
+        fdc_ctrl_reset(fdc);
+   }
+}
+
 static void
 fdc_write(uint16_t addr, uint8_t val, void *priv)
 {
     fdc_t *fdc = (fdc_t *) priv;
 
     int drive;
-    int i;
     int drive_num;
 
     fdc_log("Write FDC %04X %02X\n", addr, val);
@@ -757,8 +795,8 @@ fdc_write(uint16_t addr, uint8_t val, void *priv)
                     timer_set_delay_u64(&fdc->timer, 8 * TIMER_USEC);
                     fdc->interrupt = -1;
                     ui_sb_update_icon(SB_FLOPPY | 0, 0);
+                    ui_sb_update_icon_write(SB_FLOPPY | 0, 0);
                     fdc_ctrl_reset(fdc);
-                    fdd_changed[0] = 1;
                 }
                 if (!fdd_get_flags(0))
                     val &= 0xfe;
@@ -766,33 +804,27 @@ fdc_write(uint16_t addr, uint8_t val, void *priv)
                 fdc->st0 &= ~0x07;
                 fdc->st0 |= (fdd_get_head(0) ? 4 : 0);
             } else {
-                if (!(val & 8) && (fdc->dor & 8)) {
-                    fdc->tc = 1;
-                    fdc_int(fdc, 1);
+                /*
+                   Writing this bit to logic "1" will enable the DRQ,
+                   nDACK, TC and FINTR outputs. This bit being a
+                   logic "0" will disable the nDACK and TC inputs, and
+                   hold the DRQ and FINTR outputs in a high
+                   impedance state.
+                 */
+                if (!(val & 8) && (fdc->dor & 8) && !(fdc->flags & FDC_FLAG_PS2_MCA)) {
+                    fdc->tc    = 1;
+                    fdc->fintr = 0;
+                    picintc(1 << fdc->irq);
                 }
                 if (!(val & 4)) {
                     fdd_stop(real_drive(fdc, val & 3));
                     fdc->stat = 0x00;
                     fdc->pnum = fdc->ptot = 0;
                 }
-                if ((val & 4) && !(fdc->dor & 4)) {
-                    if (fdc->power_down) {
-                        timer_set_delay_u64(&fdc->timer, 1000 * TIMER_USEC);
-                        fdc->interrupt = -5;
-                    } else {
-                        timer_set_delay_u64(&fdc->timer, 8 * TIMER_USEC);
-                        fdc->interrupt = -1;
-
-                        fdc->perp &= 0xfc;
-
-                        for (i = 0; i < FDD_NUM; i++)
-                            ui_sb_update_icon(SB_FLOPPY | i, 0);
-
-                        fdc_ctrl_reset(fdc);
-                    }
-                }
+                if ((val & 4) && !(fdc->dor & 4))
+                    fdc_soft_reset(fdc);
                 /* We can now simplify this since each motor now spins separately. */
-                for (i = 0; i < FDD_NUM; i++) {
+                for (int i = 0; i < FDD_NUM; i++) {
                     drive_num = real_drive(fdc, i);
                     if ((!fdd_get_flags(drive_num)) || (drive_num >= FDD_NUM))
                         val &= ~(0x10 << drive_num);
@@ -807,26 +839,57 @@ fdc_write(uint16_t addr, uint8_t val, void *priv)
             return;
         case 3: /* TDR */
             if (fdc->enh_mode) {
-                drive = real_drive(fdc, fdc->dor & 3);
-                fdc_update_rwc(fdc, drive, (val & 0x30) >> 4);
+                if (fdc->flags & FDC_FLAG_SMC661) {
+                    fdc_set_swap(fdc, !!(val & 0x20));
+                    fdc_update_densel_force(fdc, (val & 0x18) >> 3);
+                } else {
+                    drive = real_drive(fdc, fdc->dor & 3);
+                    fdc_update_rwc(fdc, drive, (val & 0x30) >> 4);
+                }
+            }
+            /* Bit 2: FIFO test mode (PS/55 5550-S,T only. Undocumented) 
+               The Power-on Self Test of PS/55 writes and verifies 8 bytes of FIFO buffer through I/O 3F5h.
+               If it fails, then floppy drives will be treated as DD drives. */
+            if (fdc->flags & FDC_FLAG_PS2_MCA) {
+                if (val & 0x04) {
+                    fdc->tfifo      = 8;
+                    fdc->fifointest = 1;
+                } else {
+                    fdc->tfifo      = 1;
+                    fdc->fifointest = 0;
+                }
+                fifo_reset(fdc->fifo_p);
+                fifo_set_len(fdc->fifo_p, fdc->tfifo + 1);
+                fifo_set_trigger_len(fdc->fifo_p, fdc->tfifo + 1);
             }
             return;
-        case 4:
-            if (val & 0x80) {
-                timer_set_delay_u64(&fdc->timer, 8 * TIMER_USEC);
-                fdc->interrupt = -1;
-                fdc->perp &= 0xfc;
-                fdc_ctrl_reset(fdc);
+        case 4: /* DSR */
+            if (!(fdc->flags & FDC_FLAG_NO_DSR_RESET)) {
+                if (!(val & 0x80)) {
+                    timer_set_delay_u64(&fdc->timer, 8 * TIMER_USEC);
+                    fdc->interrupt = -6;
+                }
+                if (fdc->power_down || ((val & 0x80) && !(fdc->dsr & 0x80)))
+                    fdc_soft_reset(fdc);
             }
+            fdc->dsr = val;
             return;
         case 5: /*Command register*/
+            if (fdc->fifointest) {
+                /* Write FIFO buffer in the test mode (PS/55) */
+                fdc_log("FIFO buffer position = %X\n", ((fifo_t *) fdc->fifo_p)->end);
+                fifo_write(val, fdc->fifo_p);
+                if (fifo_get_full(fdc->fifo_p))
+                    fdc->stat &= ~0x80;
+                break;
+            }
             if ((fdc->stat & 0xf0) == 0xb0) {
                 if ((fdc->flags & FDC_FLAG_PCJR) || !fdc->fifo) {
                     fdc->dat = val;
                     fdc->stat &= ~0x80;
                 } else {
-                    fdc_fifo_buf_write(fdc, val);
-                    if (fdc->fifobufpos == 0)
+                    fifo_write(val, fdc->fifo_p);
+                    if (fifo_get_full(fdc->fifo_p))
                         fdc->stat &= ~0x80;
                 }
                 break;
@@ -849,7 +912,11 @@ fdc_write(uint16_t addr, uint8_t val, void *priv)
                 fdc_log("Starting FDC command %02X\n", fdc->command);
                 fdc->error = 0;
 
-                if (((fdc->command & 0x1f) == 0x02) || ((fdc->command & 0x1f) == 0x05) || ((fdc->command & 0x1f) == 0x06) || ((fdc->command & 0x1f) == 0x0a) || ((fdc->command & 0x1f) == 0x0c) || ((fdc->command & 0x1f) == 0x0d) || ((fdc->command & 0x1f) == 0x11) || ((fdc->command & 0x1f) == 0x16) || ((fdc->command & 0x1f) == 0x19) || ((fdc->command & 0x1f) == 0x1d))
+                if (((fdc->command & 0x1f) == 0x02) || ((fdc->command & 0x1f) == 0x05) ||
+                    ((fdc->command & 0x1f) == 0x06) || ((fdc->command & 0x1f) == 0x0a) ||
+                    ((fdc->command & 0x1f) == 0x0c) || ((fdc->command & 0x1f) == 0x0d) ||
+                    ((fdc->command & 0x1f) == 0x11) || ((fdc->command & 0x1f) == 0x16) ||
+                    ((fdc->command & 0x1f) == 0x19) || ((fdc->command & 0x1f) == 0x1d))
                     fdc->processed_cmd = fdc->command & 0x1f;
                 else
                     fdc->processed_cmd = fdc->command;
@@ -942,6 +1009,10 @@ fdc_write(uint16_t addr, uint8_t val, void *priv)
                         fdc->format_state = 0;
                         break;
                     case 0x0e: /*Dump registers*/
+                        if (fdc->flags & FDC_FLAG_NEC) {
+                            fdc_bad_command(fdc);
+                            break;
+                        }
                         fdc->lastdrive = fdc->drive;
                         fdc->interrupt = 0x0e;
                         fdc_callback(fdc);
@@ -960,6 +1031,10 @@ fdc_write(uint16_t addr, uint8_t val, void *priv)
                     case 0x10: /*Get version*/
                     case 0x14: /*Unlock*/
                     case 0x94: /*Lock*/
+                        if (fdc->flags & FDC_FLAG_NEC) {
+                            fdc_bad_command(fdc);
+                            break;
+                        }
                         fdc->lastdrive = fdc->drive;
                         fdc->interrupt = fdc->command;
                         fdc_callback(fdc);
@@ -973,6 +1048,10 @@ fdc_write(uint16_t addr, uint8_t val, void *priv)
                             fdc_bad_command(fdc);
                         break;
                     case 0x13: /*Configure*/
+                        if (fdc->flags & FDC_FLAG_NEC) {
+                            fdc_bad_command(fdc);
+                            break;
+                        }
                         fdc->pnum = 0;
                         fdc->ptot = 3;
                         fdc->stat |= 0x90;
@@ -997,6 +1076,7 @@ fdc_write(uint16_t addr, uint8_t val, void *priv)
                 }
                 if (fdc->pnum == fdc->ptot) {
                     fdc_log("Got all params %02X\n", fdc->command);
+                    fifo_reset(fdc->fifo_p);
                     fdc->interrupt  = fdc->processed_cmd;
                     fdc->reset_stat = 0;
                     /* Disable timer if enabled. */
@@ -1153,9 +1233,6 @@ fdc_write(uint16_t addr, uint8_t val, void *priv)
                             fdc->stat     = (1 << fdc->drive);
                             if (!(fdc->flags & FDC_FLAG_PCJR))
                                 fdc->stat |= 0x80;
-#if 0
-                            fdc->head = (fdc->params[0] & 4) ? 1 : 0;
-#endif
                             fdc->head = 0; /* TODO: See if this is correct. */
                             fdc->st0  = fdc->params[0] & 0x03;
                             fdc->st0 |= (fdc->params[0] & 4);
@@ -1254,7 +1331,7 @@ fdc_write(uint16_t addr, uint8_t val, void *priv)
             if (!(fdc->flags & FDC_FLAG_TOSHIBA) && !(fdc->flags & FDC_FLAG_AT) && !(fdc->flags & FDC_FLAG_UMC))
                 return;
             fdc->rate = val & 0x03;
-            if (fdc->flags & FDC_FLAG_PS1)
+            if (fdc->flags & FDC_FLAG_PS2)
                 fdc->noprec = !!(val & 0x04);
             return;
 
@@ -1274,23 +1351,43 @@ fdc_read(uint16_t addr, void *priv)
 
     if (!fdc->power_down || ((addr & 7) == 2))  switch (addr & 7) {
         case 0: /* STA */
-            if (fdc->flags & FDC_FLAG_PS1) {
+            if (fdc->flags & FDC_FLAG_PS2) {
                 drive = real_drive(fdc, fdc->dor & 3);
                 ret   = 0x00;
                 /* TODO:
                         Bit 2: INDEX (best return always 0 as it goes by very fast)
                 */
-                if (fdc->seek_dir) /* nDIRECTION */
+                if (fdc->seek_dir)                 /* nDIRECTION */
                     ret |= 0x01;
-                if (writeprot[drive]) /* WRITEPROT */
+                if (writeprot[drive])              /* WRITEPROT */
                     ret |= 0x02;
-                if (!fdd_get_head(drive)) /* nHDSEL */
+                if (!fdd_get_head(drive))          /* nHDSEL */
                     ret |= 0x08;
-                if (fdd_track0(drive)) /* TRK0 */
+                if (fdd_track0(drive))             /* TRK0 */
                     ret |= 0x10;
-                if (fdc->step) /* STEP */
+                if (fdc->step)                     /* STEP */
                     ret |= 0x20;
-                if (dma_get_drq(fdc->dma_ch)) /* DRQ */
+                if (dma_get_drq(fdc->dma_ch))      /* DRQ */
+                    ret |= 0x40;
+                if (fdc->fintr || fdc->reset_stat) /* INTR */
+                    ret |= 0x80;
+            } else if (fdc->flags & FDC_FLAG_PS2_MCA) {
+                drive = real_drive(fdc, fdc->dor & 3);
+                ret   = 0x04;
+                /* TODO:
+                        Bit 2: nINDEX (best return always 1 as it goes by very fast)
+                */
+                if (!fdc->seek_dir)                /* DIRECTION */
+                    ret |= 0x01;
+                if (!writeprot[drive])             /* nWRITEPROT */
+                    ret |= 0x02;
+                if (fdd_get_head(drive))           /* HDSEL */
+                    ret |= 0x08;
+                if (!fdd_track0(drive))            /* nTRK0 */
+                    ret |= 0x10;
+                if (fdc->step)                     /* STEP */
+                    ret |= 0x20;
+                if (!fdd_get_type(1))              /* -Drive 2 Installed */
                     ret |= 0x40;
                 if (fdc->fintr || fdc->reset_stat) /* INTR */
                     ret |= 0x80;
@@ -1298,14 +1395,12 @@ fdc_read(uint16_t addr, void *priv)
                 ret = 0xff;
             break;
         case 1: /* STB */
-            if (fdc->flags & FDC_FLAG_PS1) {
+            if (fdc->flags & FDC_FLAG_PS2) {
                 drive = real_drive(fdc, fdc->dor & 3);
                 ret   = 0x00;
-                /* -Drive 2 Installed */
-                if (!fdd_get_type(1))
+                if (!fdd_get_type(1))              /* -Drive 2 Installed */
                     ret |= 0x80;
-                /* -Drive Select 1,0 */
-                switch (drive) {
+                switch (drive) {                   /* -Drive Select 1,0 */
                     case 0:
                         ret |= 0x43;
                         break;
@@ -1322,6 +1417,11 @@ fdc_read(uint16_t addr, void *priv)
                     default:
                         break;
                 }
+            } else if (fdc->flags & FDC_FLAG_PS2_MCA) {
+                drive = real_drive(fdc, fdc->dor & 3);
+                ret   = 0xc0;
+                ret  |= (fdc->dor & 0x01) << 5;    /* Drive Select 0 */
+                ret  |= (fdc->dor & 0x30) >> 4;    /* Motor Select 1, 0 */
             } else {
                 if (is486 || !fdc->enable_3f1)
                     ret = 0xff;
@@ -1330,19 +1430,12 @@ fdc_read(uint16_t addr, void *priv)
                         drive = real_drive(fdc, fdc->dor & 1);
                         ret   = !fdd_is_dd(drive) ? ((fdc->dor & 1) ? 2 : 1) : 0;
                     } else {
-                        ret = 0x70;
-
+                        /* TODO: What is this and what is it used for?
+                                 It's almost identical to the PS/2 MCA mode. */
                         drive = real_drive(fdc, fdc->dor & 3);
-
-                        if (drive)
-                            ret &= ~0x40;
-                        else
-                            ret &= ~0x20;
-
-                        if (fdc->dor & 0x10)
-                            ret |= 1;
-                        if (fdc->dor & 0x20)
-                            ret |= 2;
+                        ret   = 0x70;
+                        ret  &= ~(drive ? 0x40 : 0x20);
+                        ret  |= (fdc->dor & 0x30) >> 4;    /* Motor Select 1, 0 */
                     }
                 }
             }
@@ -1352,7 +1445,8 @@ fdc_read(uint16_t addr, void *priv)
             break;
         case 3:
             drive = real_drive(fdc, fdc->dor & 3);
-            if (fdc->flags & FDC_FLAG_PS1) {
+            /* TODO: FDC_FLAG_PS2_TDR? */
+            if ((fdc->flags & FDC_FLAG_PS2) || (fdc->flags & FDC_FLAG_PS2_MCA)) {
                 /* PS/1 Model 2121 seems return drive type in port
                  * 0x3f3, despite the 82077AA fdc_t not implementing
                  * this. This is presumably implemented outside the
@@ -1371,26 +1465,34 @@ fdc_read(uint16_t addr, void *priv)
                     ret = 0x10;
                 else
                     ret = 0x00;
+                /* PS/55 POST throws an error and halt if ret = 1 or 2, somehow. */
             } else if (!fdc->enh_mode)
                 ret = 0x20;
+            else if (fdc->flags & FDC_FLAG_SMC661)
+                ret = (fdc->densel_force << 3) | ((!!fdc->swap) << 5) | (fdc->media_id << 6);
             else
-                ret = fdc->rwc[drive] << 4;
+                ret = (fdc->rwc[drive] << 4) | (fdc->media_id << 6);
             break;
         case 4: /*Status*/
             ret = fdc->stat;
             break;
         case 5: /*Data*/
+            if (fdc->fifointest) {
+                /* Read FIFO buffer in the test mode (PS/55) */
+                ret = fifo_read(fdc->fifo_p);
+                break;
+            }
             if ((fdc->stat & 0xf0) == 0xf0) {
                 fdc->stat &= ~0x80;
                 if ((fdc->flags & FDC_FLAG_PCJR) || !fdc->fifo) {
                     fdc->data_ready = 0;
                     ret             = fdc->dat;
                 } else
-                    ret = fdc_fifo_buf_read(fdc);
+                    ret = fifo_read(fdc->fifo_p);
                 break;
             }
-            fdc->stat &= ~0x80;
             if (fdc->paramstogo) {
+                fdc->stat &= ~0x80;
                 fdc_log("%i parameters to go\n", fdc->paramstogo);
                 fdc->paramstogo--;
                 ret = fdc->res[10 - fdc->paramstogo];
@@ -1398,7 +1500,11 @@ fdc_read(uint16_t addr, void *priv)
                     fdc->stat = 0x80;
                 else
                     fdc->stat |= 0xC0;
+            } else if (fdc->dma) {
+                ret       = fdc->dat;
+                break;
             } else {
+                fdc->stat &= ~0x80;
                 if (lastbyte)
                     fdc->stat = 0x80;
                 lastbyte        = 0;
@@ -1410,7 +1516,7 @@ fdc_read(uint16_t addr, void *priv)
         case 7: /*Disk change*/
             drive = real_drive(fdc, fdc->dor & 3);
 
-            if (fdc->flags & FDC_FLAG_PS1) {
+            if (fdc->flags & FDC_FLAG_PS2) {
                 if (fdc->dor & (0x10 << drive)) {
                     ret = (fdd_changed[drive] || drive_empty[drive]) ? 0x00 : 0x80;
                     ret |= (fdc->dor & 0x08);
@@ -1418,6 +1524,14 @@ fdc_read(uint16_t addr, void *priv)
                     ret |= (fdc->rate & 0x03);
                 } else
                     ret = 0x00;
+            } else if (fdc->flags & FDC_FLAG_PS2_MCA) {
+                if (fdc->dor & (0x10 << drive)) {
+                    ret = (fdd_changed[drive] || drive_empty[drive]) ? 0x80 : 0x00;
+                    ret |= ((fdc->rate & 0x03) << 1);
+                    ret |= fdc_get_densel(fdc, drive);
+                    ret |= 0x78;
+                } else
+                    ret = 0xf9;
             } else {
                 if (fdc->dor & (0x10 << drive)) {
                     if ((drive == 1) && (fdc->flags & FDC_FLAG_TOSHIBA))
@@ -1440,9 +1554,8 @@ fdc_read(uint16_t addr, void *priv)
             fdc->step = 0;
             break;
         default:
-            ret = 0xFF;
+            ret = 0xff;
     }
-    // fdc_log("Read FDC %04X %02X\n", addr, ret);
     fdc_log("[%04X:%08X] Read FDC %04X %02X [%i:%02X]\n", CS, cpu_state.pc, addr, ret, drive, fdc->dor & (0x10 << drive));
     return ret;
 }
@@ -1451,7 +1564,7 @@ static void
 fdc_poll_common_finish(fdc_t *fdc, int compare, int st5)
 {
     fdc_int(fdc, 1);
-    if (!(fdc->flags & FDC_FLAG_PS1))
+    if (!(fdc->flags & FDC_FLAG_FINTR))
         fdc->fintr = 0;
     fdc->stat = 0xD0;
     fdc->st0 = fdc->res[4] = (fdd_get_head(real_drive(fdc, fdc->drive)) ? 4 : 0) | fdc->rw_drive;
@@ -1497,6 +1610,7 @@ fdc_poll_common_finish(fdc_t *fdc, int compare, int st5)
     fdc->res[10] = fdc->params[4];
     fdc_log("Read/write finish (%02X %02X %02X %02X %02X %02X %02X)\n", fdc->res[4], fdc->res[5], fdc->res[6], fdc->res[7], fdc->res[8], fdc->res[9], fdc->res[10]);
     ui_sb_update_icon(SB_FLOPPY | real_drive(fdc, fdc->drive), 0);
+    ui_sb_update_icon_write(SB_FLOPPY | real_drive(fdc, fdc->drive), 0);
     fdc->paramstogo = 7;
     dma_set_drq(fdc->dma_ch, 0);
 }
@@ -1540,8 +1654,10 @@ fdc_callback(void *priv)
         case -5: /*Reset in power down mode */
             fdc->perp &= 0xfc;
 
-            for (uint8_t i = 0; i < FDD_NUM; i++)
+            for (uint8_t i = 0; i < FDD_NUM; i++) {
                 ui_sb_update_icon(SB_FLOPPY | i, 0);
+                ui_sb_update_icon_write(SB_FLOPPY | i, 0);
+            }
 
             fdc_ctrl_reset(fdc);
 
@@ -1554,6 +1670,9 @@ fdc_callback(void *priv)
             memset(fdc->pcn, 0x00, 4 * sizeof(uint16_t));
             fdc->reset_stat = 4;
             return;
+        case -6: /*DSR Reset clear*/
+            fdc->dsr |= 0x80;
+            return;
         case 0x01: /* Mode */
             fdc->stat         = 0x80;
             fdc->densel_force = (fdc->params[2] & 0xC0) >> 6;
@@ -1595,8 +1714,8 @@ fdc_callback(void *priv)
         case 0x06: /* Read data */
         case 0x0c: /* Read deleted data */
         case 0x11: /* Scan equal */
+        case 0x16: /* Verify */
         case 0x19: /* Scan low or equal */
-        case 0x1c: /* Verify */
         case 0x1d: /* Scan high or equal */
             if ((fdc->interrupt == 0x11) || (fdc->interrupt == 0x19) || (fdc->interrupt == 0x1D))
                 compare = 1;
@@ -1649,8 +1768,10 @@ fdc_callback(void *priv)
             if (fdc->sector == fdc->params[5]) {
                 /* Reached end of track, MT bit is clear */
                 if (!(fdc->command & 0x80)) {
-                    fdc->rw_track++;
-                    fdc->sector = 1;
+                    if (fdc->dma) {
+                        fdc->rw_track++;
+                        fdc->sector = 1;
+                    }
                     if (!(fdc->flags & FDC_FLAG_PCJR) && fdc->dma && (old_sector == 255))
                         fdc_no_dma_end(fdc, compare);
                     else
@@ -1659,10 +1780,12 @@ fdc_callback(void *priv)
                 }
                 /* Reached end of track, MT bit is set, head is 1 */
                 if (fdd_get_head(real_drive(fdc, fdc->drive)) == 1) {
-                    fdc->rw_track++;
-                    fdc->sector = 1;
-                    fdc->head &= 0xFE;
-                    fdd_set_head(real_drive(fdc, fdc->drive), 0);
+                    if (fdc->dma) {
+                        fdc->rw_track++;
+                        fdc->sector = 1;
+                        fdc->head &= 0xFE;
+                        fdd_set_head(real_drive(fdc, fdc->drive), 0);
+                    }
                     if (!(fdc->flags & FDC_FLAG_PCJR) && fdc->dma && (old_sector == 255))
                         fdc_no_dma_end(fdc, compare);
                     else
@@ -1680,7 +1803,12 @@ fdc_callback(void *priv)
                 }
             } else if (fdc->sector < fdc->params[5])
                 fdc->sector++;
-            ui_sb_update_icon(SB_FLOPPY | real_drive(fdc, fdc->drive), 1);
+            else if (fdc->params[5] == 0)
+                fdc->sector++;
+            if (fdc->interrupt == 0x05 || fdc->interrupt == 0x09)
+                ui_sb_update_icon_write(SB_FLOPPY | real_drive(fdc, fdc->drive), 1);
+            else
+                ui_sb_update_icon(SB_FLOPPY | real_drive(fdc, fdc->drive), 1);
             switch (fdc->interrupt) {
                 case 5:
                 case 9:
@@ -1689,7 +1817,7 @@ fdc_callback(void *priv)
                         fdc->stat = 0xb0;
                     else {
                         dma_set_drq(fdc->dma_ch, 1);
-                        fdc->stat = 0x90;
+                        fdc->stat = 0x10;
                     }
                     break;
                 case 6:
@@ -1711,7 +1839,7 @@ fdc_callback(void *priv)
                         fdc->stat = 0xb0;
                     else {
                         dma_set_drq(fdc->dma_ch, 1);
-                        fdc->stat = 0x90;
+                        fdc->stat = 0x10;
                     }
                     break;
 
@@ -1743,7 +1871,7 @@ fdc_callback(void *priv)
             } else {
                 fdc->interrupt = -2;
                 fdc_int(fdc, 1);
-                if (!(fdc->flags & FDC_FLAG_PS1))
+                if (!(fdc->flags & FDC_FLAG_FINTR))
                     fdc->fintr = 0;
                 fdc->stat = 0xD0;
                 fdc->st0 = fdc->res[4] = (fdd_get_head(real_drive(fdc, fdc->drive)) ? 4 : 0) | fdc->drive;
@@ -1802,6 +1930,9 @@ fdc_callback(void *priv)
             fdc->pretrk = fdc->params[2];
             fdc->fifo   = (fdc->params[1] & 0x20) ? 0 : 1;
             fdc->tfifo  = (fdc->params[1] & 0xF);
+            fifo_reset(fdc->fifo_p);
+            fifo_set_len(fdc->fifo_p, fdc->tfifo + 1);
+            fifo_set_trigger_len(fdc->fifo_p, fdc->tfifo + 1);
             fdc->stat   = 0x80;
             return;
         case 0x14: /*Unlock*/
@@ -1829,11 +1960,10 @@ void
 fdc_error(fdc_t *fdc, int st5, int st6)
 {
     dma_set_drq(fdc->dma_ch, 0);
-#if 1
     timer_disable(&fdc->timer);
 
     fdc_int(fdc, 1);
-    if (!(fdc->flags & FDC_FLAG_PS1))
+    if (!(fdc->flags & FDC_FLAG_FINTR))
         fdc->fintr = 0;
     fdc->stat = 0xD0;
     fdc->st0 = fdc->res[4] = 0x40 | (fdd_get_head(real_drive(fdc, fdc->drive)) ? 4 : 0) | fdc->rw_drive;
@@ -1841,6 +1971,10 @@ fdc_error(fdc_t *fdc, int st5, int st6)
         fdc->st0 |= 0x08;
     fdc->res[5] = st5;
     fdc->res[6] = st6;
+    if (fdc->wrong_am) {
+        fdc->res[6] |= 0x40;
+        fdc->wrong_am = 0;
+    }
     fdc_log("FDC Error: %02X %02X %02X\n", fdc->res[4], fdc->res[5], fdc->res[6]);
     switch (fdc->interrupt) {
         case 0x02:
@@ -1865,49 +1999,8 @@ fdc_error(fdc_t *fdc, int st5, int st6)
             break;
     }
     ui_sb_update_icon(SB_FLOPPY | real_drive(fdc, fdc->drive), 0);
+    ui_sb_update_icon_write(SB_FLOPPY | real_drive(fdc, fdc->drive), 0);
     fdc->paramstogo = 7;
-#else
-    switch (fdc->interrupt) {
-        case 0x02:
-        case 0x05:
-        case 0x06:
-        case 0x09:
-        case 0x0C:
-        case 0x11:
-        case 0x16:
-        case 0x19:
-        case 0x1D:
-            fdc->error = 1;
-            fdc->st5   = st5;
-            fdc->st6   = st6;
-            fdc->tc    = 1;
-            fdc->stat  = 0x10;
-            fdc_callback(fdc);
-            break;
-        default:
-            timer_disable(&fdc->timer);
-
-            fdc_int(fdc, 1);
-            if (!(fdc->flags & FDC_FLAG_PS1))
-                fdc->fintr = 0;
-            fdc->stat = 0xD0;
-            fdc->st0 = fdc->res[4] = 0x40 | (fdd_get_head(real_drive(fdc, fdc->drive)) ? 4 : 0) | fdc->rw_drive;
-            if (fdc->head && !fdd_is_double_sided(real_drive(fdc, fdc->drive)))
-                fdc->st0 |= 0x08;
-            fdc->res[5] = st5;
-            fdc->res[6] = st6;
-            fdc_log("FDC Error: %02X %02X %02X\n", fdc->res[4], fdc->res[5], fdc->res[6]);
-
-            fdc->res[7]  = 0;
-            fdc->res[8]  = 0;
-            fdc->res[9]  = 0;
-            fdc->res[10] = 0;
-
-            ui_sb_update_icon(SB_FLOPPY | real_drive(fdc, fdc->drive), 0);
-            fdc->paramstogo = 7;
-            break;
-    }
-#endif
 }
 
 void
@@ -1928,7 +2021,6 @@ int
 fdc_data(fdc_t *fdc, uint8_t data, int last)
 {
     int result = 0;
-    int n;
 
     if (fdc->deleted & 2) {
         /* We're in a VERIFY command, so return with 0. */
@@ -1950,8 +2042,8 @@ fdc_data(fdc_t *fdc, uint8_t data, int last)
             fdc->stat       = 0xf0;
         } else {
             /* FIFO enabled */
-            fdc_fifo_buf_write(fdc, data);
-            if (fdc->fifobufpos == 0) {
+            fifo_write(data, fdc->fifo_p);
+            if (fifo_get_full(fdc->fifo_p)) {
                 /* We have wrapped around, means FIFO is over */
                 fdc->data_ready = 1;
                 fdc->stat       = 0xf0;
@@ -1963,11 +2055,10 @@ fdc_data(fdc_t *fdc, uint8_t data, int last)
 
         if (!fdc->fifo || (fdc->tfifo < 1)) {
             fdc->data_ready = 1;
-            fdc->stat       = 0xd0;
+            fdc->stat       = 0x50;
             dma_set_drq(fdc->dma_ch, 1);
 
-            fdc->fifobufpos = 0;
-
+            fdc->dat = data;
             result = dma_channel_write(fdc->dma_ch, data);
 
             if (result & DMA_OVER) {
@@ -1978,19 +2069,15 @@ fdc_data(fdc_t *fdc, uint8_t data, int last)
             dma_set_drq(fdc->dma_ch, 0);
         } else {
             /* FIFO enabled */
-            fdc_fifo_buf_write(fdc, data);
-            if (last || (fdc->fifobufpos == 0)) {
+            fifo_write(data, fdc->fifo_p);
+            if (last || fifo_get_full(fdc->fifo_p)) {
                 /* We have wrapped around, means FIFO is over */
                 fdc->data_ready = 1;
-                fdc->stat       = 0xd0;
+                fdc->stat       = 0x50;
                 dma_set_drq(fdc->dma_ch, 1);
 
-                n = (fdc->fifobufpos > 0) ? (fdc->fifobufpos - 1) : fdc->tfifo;
-                if (fdc->fifobufpos > 0)
-                    fdc->fifobufpos = 0;
-
-                for (int i = 0; i <= n; i++) {
-                    result = dma_channel_write(fdc->dma_ch, fdc->fifobuf[i]);
+                while (!fifo_get_empty(fdc->fifo_p)) {
+                    result = dma_channel_write(fdc->dma_ch, fifo_read(fdc->fifo_p));
 
                     if (result & DMA_OVER) {
                         dma_set_drq(fdc->dma_ch, 0);
@@ -2101,9 +2188,9 @@ fdc_getdata(fdc_t *fdc, int last)
             if (!last)
                 fdc->stat = 0xb0;
         } else {
-            data = fdc_fifo_buf_read(fdc);
+            data = fifo_read(fdc->fifo_p);
 
-            if (!last && (fdc->fifobufpos == 0))
+            if (!last && fifo_get_empty(fdc->fifo_p))
                 fdc->stat = 0xb0;
         }
     } else {
@@ -2115,14 +2202,14 @@ fdc_getdata(fdc_t *fdc, int last)
                 fdc->tc = 1;
 
             if (!last) {
-                fdc->stat = 0x90;
                 dma_set_drq(fdc->dma_ch, 1);
+                fdc->stat = 0x10;
             }
         } else {
-            if (fdc->fifobufpos == 0) {
-                for (int i = 0; i <= fdc->tfifo; i++) {
+            if (fifo_get_empty(fdc->fifo_p)) {
+                while (!fifo_get_full(fdc->fifo_p)) {
                     data            = dma_channel_read(fdc->dma_ch);
-                    fdc->fifobuf[i] = data;
+                    fifo_write(data, fdc->fifo_p);
 
                     if (data & DMA_OVER) {
                         dma_set_drq(fdc->dma_ch, 0);
@@ -2133,11 +2220,11 @@ fdc_getdata(fdc_t *fdc, int last)
                 dma_set_drq(fdc->dma_ch, 0);
             }
 
-            data = fdc_fifo_buf_read(fdc);
+            data = fifo_read(fdc->fifo_p);
 
-            if (!last && (fdc->fifobufpos == 0)) {
+            if (!last && fifo_get_empty(fdc->fifo_p)) {
                 dma_set_drq(fdc->dma_ch, 1);
-                fdc->stat = 0x90;
+                fdc->stat = 0x10;
             }
         }
     }
@@ -2218,9 +2305,13 @@ fdc_set_base(fdc_t *fdc, int base)
 {
     int super_io = (fdc->flags & FDC_FLAG_SUPERIO);
 
+    if (base == 0x0000) {
+        fdc->base_address = base;
+        return;
+    }
+
     if (fdc->flags & FDC_FLAG_NSC) {
-        io_sethandler(base + 2, 0x0001, fdc_read, NULL, NULL, fdc_write, NULL, NULL, fdc);
-        io_sethandler(base + 4, 0x0002, fdc_read, NULL, NULL, fdc_write, NULL, NULL, fdc);
+        io_sethandler(base + 2, 0x0004, fdc_read, NULL, NULL, fdc_write, NULL, NULL, fdc);
         io_sethandler(base + 7, 0x0001, fdc_read, NULL, NULL, fdc_write, NULL, NULL, fdc);
     } else {
         if ((fdc->flags & FDC_FLAG_AT) || (fdc->flags & FDC_FLAG_AMSTRAD)) {
@@ -2249,10 +2340,12 @@ fdc_remove(fdc_t *fdc)
 {
     int super_io = (fdc->flags & FDC_FLAG_SUPERIO);
 
+    if (fdc->base_address == 0x0000)
+        return;
+
     fdc_log("FDC Removed (%04X)\n", fdc->base_address);
     if (fdc->flags & FDC_FLAG_NSC) {
-        io_removehandler(fdc->base_address + 2, 0x0001, fdc_read, NULL, NULL, fdc_write, NULL, NULL, fdc);
-        io_removehandler(fdc->base_address + 4, 0x0002, fdc_read, NULL, NULL, fdc_write, NULL, NULL, fdc);
+        io_removehandler(fdc->base_address + 2, 0x0004, fdc_read, NULL, NULL, fdc_write, NULL, NULL, fdc);
         io_removehandler(fdc->base_address + 7, 0x0001, fdc_read, NULL, NULL, fdc_write, NULL, NULL, fdc);
     } else {
         if ((fdc->flags & FDC_FLAG_AT) || (fdc->flags & FDC_FLAG_AMSTRAD)) {
@@ -2286,7 +2379,7 @@ fdc_reset(void *priv)
     fdc->enable_3f1 = 1;
 
     fdc_update_enh_mode(fdc, 0);
-    if (fdc->flags & FDC_FLAG_PS1)
+    if (fdc->flags & FDC_FLAG_DENSEL_INVERT)
         fdc_update_densel_polarity(fdc, 0);
     else
         fdc_update_densel_polarity(fdc, 1);
@@ -2298,15 +2391,27 @@ fdc_reset(void *priv)
     fdc_update_rwc(fdc, 1, default_rwc);
     fdc_update_rwc(fdc, 2, default_rwc);
     fdc_update_rwc(fdc, 3, default_rwc);
-    fdc_update_drvrate(fdc, 0, 0);
-    fdc_update_drvrate(fdc, 1, 0);
-    fdc_update_drvrate(fdc, 2, 0);
-    fdc_update_drvrate(fdc, 3, 0);
+    /*
+       The OKI IF386SX natively supports the Japanese 1.25 MB floppy format,
+       since it can read such images just fine, it also attempts to use data
+       rate 01 on a 3.5" MB drive (which is the only kind it can physically
+       take, anyway), and rate 01 on a 3.5" MB drive is usually used by 3-mode
+       drives to switch to 360 RPM. Hence why I'm switching DRVDEN to 1, so
+       rate 01 becomes 500 kbps, so on a 3-mode 3.5" drive, 1.25 MB floppies
+       can be read. The side effect is that to read 5.25" 360k drives, you
+       need to use a dual-RPM 5.25" drive - but hey, that finally gets those
+       drives some usage as well.
+     */
+    fdc_update_drvrate(fdc, 0, !strcmp(machine_get_internal_name(),  "if386sx"));
+    fdc_update_drvrate(fdc, 1, !strcmp(machine_get_internal_name(),  "if386sx"));
+    fdc_update_drvrate(fdc, 2, !strcmp(machine_get_internal_name(),  "if386sx"));
+    fdc_update_drvrate(fdc, 3, !strcmp(machine_get_internal_name(),  "if386sx"));
     fdc_update_drv2en(fdc, 1);
     fdc_update_rates(fdc);
 
     fdc->fifo  = 0;
     fdc->tfifo = 1;
+    fdc->fifointest = 0;
 
     if (fdc->flags & FDC_FLAG_PCJR) {
         fdc->dma        = 0;
@@ -2330,27 +2435,35 @@ fdc_reset(void *priv)
     fdc->swwp          = 0;
     fdc->disable_write = 0;
 
+    fdc->lock          = 0;
+
     fdc_ctrl_reset(fdc);
 
+    if (!(fdc->flags & FDC_FLAG_AT))
+        fdc->rate = 2;
+
     fdc->max_track = (fdc->flags & FDC_FLAG_MORE_TRACKS) ? 85 : 79;
 
     fdc_remove(fdc);
-    if (fdc->flags & FDC_FLAG_SEC) {
+    if (fdc->flags & FDC_FLAG_SEC)
         fdc_set_base(fdc, FDC_SECONDARY_ADDR);
-    } else if (fdc->flags & FDC_FLAG_TER) {
+    else if (fdc->flags & FDC_FLAG_TER)
         fdc_set_base(fdc, FDC_TERTIARY_ADDR);
-    } else if (fdc->flags & FDC_FLAG_QUA) {
+    else if (fdc->flags & FDC_FLAG_QUA)
         fdc_set_base(fdc, FDC_QUATERNARY_ADDR);
-    } else {
+    else
         fdc_set_base(fdc, (fdc->flags & FDC_FLAG_PCJR) ? FDC_PRIMARY_PCJR_ADDR : FDC_PRIMARY_ADDR);
-    }
 
     current_drive = 0;
 
-    for (uint8_t i = 0; i < FDD_NUM; i++)
+    for (uint8_t i = 0; i < FDD_NUM; i++) {
         ui_sb_update_icon(SB_FLOPPY | i, 0);
+        ui_sb_update_icon_write(SB_FLOPPY | i, 0);
+    }
 
     fdc->power_down = 0;
+
+    fdc->media_id   = 0;
 }
 
 static void
@@ -2358,10 +2471,13 @@ fdc_close(void *priv)
 {
     fdc_t *fdc = (fdc_t *) priv;
 
-    fdc_reset(fdc);
-
     /* Stop timers. */
-    fdc->watchdog_count = 0;
+    timer_disable(&fdc->watchdog_timer);
+    timer_disable(&fdc->timer);
+
+    fifo_close(fdc->fifo_p);
+
+    fdcinited = 0;
 
     free(fdc);
 }
@@ -2369,8 +2485,7 @@ fdc_close(void *priv)
 static void *
 fdc_init(const device_t *info)
 {
-    fdc_t *fdc = (fdc_t *) malloc(sizeof(fdc_t));
-    memset(fdc, 0, sizeof(fdc_t));
+    fdc_t *fdc = (fdc_t *) calloc(1, sizeof(fdc_t));
 
     fdc->flags = info->local;
 
@@ -2396,6 +2511,8 @@ fdc_init(const device_t *info)
 
     fdc_log("FDC added: %04X (flags: %08X)\n", fdc->base_address, fdc->flags);
 
+    fdc->fifo_p = (void *) fifo16_init();
+
     timer_add(&fdc->timer, fdc_callback, fdc, 0);
 
     d86f_set_fdc(fdc);
@@ -2407,6 +2524,8 @@ fdc_init(const device_t *info)
 
     fdc_reset(fdc);
 
+    fdcinited = 1;
+
     return fdc;
 }
 
@@ -2424,7 +2543,7 @@ const device_t fdc_xt_device = {
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2438,7 +2557,7 @@ const device_t fdc_xt_sec_device = {
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2452,7 +2571,7 @@ const device_t fdc_xt_ter_device = {
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2466,7 +2585,7 @@ const device_t fdc_xt_qua_device = {
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2480,7 +2599,7 @@ const device_t fdc_xt_t1x00_device = {
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2494,7 +2613,7 @@ const device_t fdc_xt_amstrad_device = {
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2508,7 +2627,21 @@ const device_t fdc_xt_tandy_device = {
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t fdc_xt_umc_um8398_device = {
+    .name          = "PC/XT Floppy Drive Controller (UMC UM8398)",
+    .internal_name = "fdc_xt_umc_um8398",
+    .flags         = 0,
+    .local         = FDC_FLAG_UMC,
+    .init          = fdc_init,
+    .close         = fdc_close,
+    .reset         = fdc_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2522,7 +2655,7 @@ const device_t fdc_pcjr_device = {
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2536,7 +2669,7 @@ const device_t fdc_at_device = {
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2550,7 +2683,7 @@ const device_t fdc_at_sec_device = {
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2564,7 +2697,7 @@ const device_t fdc_at_ter_device = {
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2578,7 +2711,7 @@ const device_t fdc_at_qua_device = {
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2592,21 +2725,21 @@ const device_t fdc_at_actlow_device = {
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
 };
 
-const device_t fdc_at_ps1_device = {
-    .name          = "PC/AT Floppy Drive Controller (PS/1, PS/2 ISA)",
-    .internal_name = "fdc_at_ps1",
+const device_t fdc_at_smc_661_device = {
+    .name          = "PC/AT Floppy Drive Controller (SM(s)C FDC37C661/2)",
+    .internal_name = "fdc_at_smc",
     .flags         = 0,
-    .local         = FDC_FLAG_DISKCHG_ACTLOW | FDC_FLAG_AT | FDC_FLAG_PS1,
+    .local         = FDC_FLAG_AT | FDC_FLAG_SUPERIO | FDC_FLAG_SMC661,
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2620,7 +2753,7 @@ const device_t fdc_at_smc_device = {
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2634,7 +2767,7 @@ const device_t fdc_at_ali_device = {
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2648,7 +2781,7 @@ const device_t fdc_at_winbond_device = {
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2662,35 +2795,51 @@ const device_t fdc_at_nsc_device = {
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
 };
 
-const device_t fdc_dp8473_device = {
-    .name          = "NS DP8473 Floppy Drive Controller",
-    .internal_name = "fdc_dp8473",
+const device_t fdc_at_nsc_dp8473_device = {
+    .name          = "PC/AT Floppy Drive Controller (NSC DP8473)",
+    .internal_name = "fdc_at_nsc_dp8473",
     .flags         = 0,
-    .local         = FDC_FLAG_AT | FDC_FLAG_NSC,
+    .local         = FDC_FLAG_AT | FDC_FLAG_NEC | FDC_FLAG_NO_DSR_RESET,
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
 };
 
-const device_t fdc_um8398_device = {
-    .name          = "UMC UM8398 Floppy Drive Controller",
-    .internal_name = "fdc_um8398",
+const device_t fdc_ps2_device = {
+    .name          = "PS/2 Model 25/30 Floppy Drive Controller",
+    .internal_name = "fdc_ps2",
     .flags         = 0,
-    .local         = FDC_FLAG_UMC,
+    .local         = FDC_FLAG_FINTR | FDC_FLAG_DENSEL_INVERT | FDC_FLAG_NO_DSR_RESET | FDC_FLAG_DISKCHG_ACTLOW |
+                     FDC_FLAG_AT | FDC_FLAG_PS2,
     .init          = fdc_init,
     .close         = fdc_close,
     .reset         = fdc_reset,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t fdc_ps2_mca_device = {
+    .name          = "PS/2 MCA Floppy Drive Controller",
+    .internal_name = "fdc_ps2_mca",
+    .flags         = 0,
+    .local         = FDC_FLAG_FINTR | FDC_FLAG_DENSEL_INVERT | FDC_FLAG_NO_DSR_RESET | FDC_FLAG_AT |
+                     FDC_FLAG_PS2_MCA,
+    .init          = fdc_init,
+    .close         = fdc_close,
+    .reset         = fdc_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/floppy/fdc_compaticard.c b/src/floppy/fdc_compaticard.c
new file mode 100644
index 000000000..cc438ddf6
--- /dev/null
+++ b/src/floppy/fdc_compaticard.c
@@ -0,0 +1,368 @@
+/*
+ * 86Box     A hypervisor and IBM PC system emulator that specializes in
+ *           running old operating systems and software designed for IBM
+ *           PC systems and compatibles from 1981 through fairly recent
+ *           system designs based on the PCI bus.
+ *
+ *           This file is part of the 86Box distribution.
+ *
+ *           Emulation of Micro Solutions CompatiCard I/II/IV.
+ *
+ * Authors:  Jasmine Iwanek, <jasmine@iwanek.co.uk>
+ *
+ *           Copyright 2022-2025 Jasmine Iwanek.
+ */
+
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/machine.h>
+#include <86box/timer.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/plat_unused.h>
+
+#define DEVICE_COMPATICARD_I  0
+#define DEVICE_COMPATICARD_II 1
+#define DEVICE_COMPATICARD_IV 2
+
+#define BIOS_ADDR (uint32_t)(device_get_config_hex20("bios_addr") & 0x000fffff)
+#define ROM_COMPATICARD_IV "roms/floppy/compaticard/ccivbios1.05.bin"
+
+#define CR_2_MASK 0x2f /* 00101111b */
+
+typedef struct compaticard_s {
+    rom_t   bios_rom;
+    fdc_t  *fdc;
+    /*
+     * 7 - Reserved - Set to 0
+     * 6 - Reserved - Set to 0
+     * 5 - Programmable Pin 2 Logic I sets Pin 2 low (TODO)
+     * 4 - Reserved - Set to 0
+     * 3-0 - Data Transfer Rate Select (TODO)
+     *       0000---250 Kbps
+     *       0001-300 Kbps
+     *       1111-500 Kbps
+	 */
+    uint8_t cr_2;
+} compaticard_t;
+
+static void
+compaticard_out(UNUSED(uint16_t port), uint8_t val, void *priv)
+{
+    compaticard_t *dev = (compaticard_t *) priv;
+
+    dev->cr_2 = (val & CR_2_MASK);
+}
+
+static uint8_t
+compaticard_in(UNUSED(uint16_t port), void *priv)
+{
+    compaticard_t *dev  = (compaticard_t *) priv;
+    uint8_t        ret  = (dev->cr_2 &CR_2_MASK);
+
+    return ret;
+}
+
+static void
+compaticard_close(void *priv)
+{
+    compaticard_t *dev = (compaticard_t *) priv;
+
+    free(dev);
+}
+
+static void *
+compaticard_init(const device_t *info)
+{
+    compaticard_t *dev       = calloc(1, sizeof(compaticard_t));
+    uint16_t       base_addr = device_get_config_hex16("base");
+    uint8_t        irq       = 6;
+    uint8_t        dma       = 2;
+    uint16_t       cr2_addr  = 0x7f2; // Control Register 2
+
+    // CompatiCard II & IV have configurable IRQ and DMA
+    if (info->local >= DEVICE_COMPATICARD_II) {
+        irq = device_get_config_int("irq");
+        dma = device_get_config_int("dma");
+    }
+
+    // Only on CompatiCard IV
+    if ((info->local == DEVICE_COMPATICARD_IV) && (BIOS_ADDR != 0))
+        rom_init(&dev->bios_rom, ROM_COMPATICARD_IV, BIOS_ADDR, 0x2000, 0x1ffff, 0, MEM_MAPPING_EXTERNAL);
+
+    // TODO: Make this neater
+    switch (base_addr) {
+        case FDC_SECONDARY_ADDR:
+            cr2_addr = 0x772;
+            if (info->local == DEVICE_COMPATICARD_IV)
+                dev->fdc = device_add(&fdc_at_sec_device);
+            else
+                dev->fdc = device_add(&fdc_xt_sec_device);
+            break;
+
+        case FDC_TERTIARY_ADDR:
+            cr2_addr = 0x762;
+            if (info->local == DEVICE_COMPATICARD_IV)
+                dev->fdc = device_add(&fdc_at_ter_device);
+            else
+                dev->fdc = device_add(&fdc_xt_ter_device);
+            break;
+
+        case FDC_QUATERNARY_ADDR:
+            cr2_addr = 0x7e2;
+            if (info->local == DEVICE_COMPATICARD_IV)
+                dev->fdc = device_add(&fdc_at_qua_device);
+            else
+                dev->fdc = device_add(&fdc_xt_qua_device);
+            break;
+
+        default:
+            if (info->local == DEVICE_COMPATICARD_IV)
+                dev->fdc = device_add(&fdc_at_device);
+            else
+                dev->fdc = device_add(&fdc_xt_device);
+            break;
+    }
+
+    fdc_set_irq(dev->fdc, irq);
+    fdc_set_dma_ch(dev->fdc, dma);
+
+    io_sethandler(cr2_addr, 0x0001,
+                  compaticard_in, NULL, NULL,
+                  compaticard_out, NULL, NULL,
+                  dev);
+
+    return dev;
+}
+
+static int compaticard_iv_available(void)
+{
+    return rom_present(ROM_COMPATICARD_IV);
+}
+
+static const device_config_t compaticard_i_config[] = {
+// clang-format off
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x3f0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x3f0", .value = 0x3f0 },
+            { .description = "0x370", .value = 0x370 },
+            { .description = "0x360", .value = 0x360 },
+            { .description = "0x3e0", .value = 0x3e0 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+// clang-format on
+};
+
+static const device_config_t compaticard_ii_config[] = {
+// clang-format off
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x3f0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x3f0", .value = 0x3f0 },
+            { .description = "0x370", .value = 0x370 },
+            { .description = "0x360", .value = 0x360 },
+            { .description = "0x3e0", .value = 0x3e0 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 6,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 2", .value = 2 },
+            { .description = "IRQ 3", .value = 3 },
+            { .description = "IRQ 4", .value = 4 },
+            { .description = "IRQ 5", .value = 5 },
+            { .description = "IRQ 6", .value = 6 },
+            { .description = "IRQ 7", .value = 7 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "dma",
+        .description    = "DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "DMA 1", .value = 1 },
+            { .description = "DMA 2", .value = 2 },
+            { .description = "DMA 3", .value = 3 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+// clang-format on
+};
+
+static const device_config_t compaticard_iv_config[] = {
+// clang-format off
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x3f0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x3f0", .value = 0x3f0 },
+            { .description = "0x370", .value = 0x370 },
+            { .description = "0x360", .value = 0x360 },
+            { .description = "0x3e0", .value = 0x3e0 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 6,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 2", .value = 2 },
+            { .description = "IRQ 3", .value = 3 },
+            { .description = "IRQ 4", .value = 4 },
+            { .description = "IRQ 5", .value = 5 },
+            { .description = "IRQ 6", .value = 6 },
+            { .description = "IRQ 7", .value = 7 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "dma",
+        .description    = "DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "DMA 1", .value = 1 },
+            { .description = "DMA 2", .value = 2 },
+            { .description = "DMA 3", .value = 3 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_addr",
+        .description    = "BIOS Address:",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xce000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled", .value = 0       },
+            { .description = "CC00H",    .value = 0xcc000 },
+            { .description = "CE00H",    .value = 0xce000 },
+            { .description = "D000H",    .value = 0xd0000 },
+            { .description = "D800H",    .value = 0xd8000 },
+            { .description = "DE00H",    .value = 0xde000 },
+            { .description = "E000H",    .value = 0xe0000 },
+            { .description = "E800H",    .value = 0xe8000 },
+            { .description = "EE00H",    .value = 0xee000 },
+            { .description = ""                           }
+        },
+        .bios           = { { 0 } }
+    },
+#if 0
+    {
+        .name           = "autoboot_enabled",
+        .description    = "Enable Autoboot",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+#endif
+    { .name = "", .description = "", .type = CONFIG_END }
+// clang-format on
+};
+
+const device_t fdc_compaticard_i_device = {
+    .name          = "Micro Solutions CompatiCard I",
+    .internal_name = "compaticard_i",
+    .flags         = DEVICE_ISA,
+    .local         = 0,
+    .init          = compaticard_init,
+    .close         = compaticard_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = compaticard_i_config
+};
+
+const device_t fdc_compaticard_ii_device = {
+    .name          = "Micro Solutions CompatiCard II",
+    .internal_name = "compaticard_ii",
+    .flags         = DEVICE_ISA,
+    .local         = 1,
+    .init          = compaticard_init,
+    .close         = compaticard_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = compaticard_ii_config
+};
+
+const device_t fdc_compaticard_iv_device = {
+    .name          = "Micro Solutions CompatiCard IV",
+    .internal_name = "compaticard_iv",
+    .flags         = DEVICE_ISA,
+    .local         = 2,
+    .init          = compaticard_init,
+    .close         = compaticard_close,
+    .reset         = NULL,
+    .available     = compaticard_iv_available,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = compaticard_iv_config
+};
diff --git a/src/floppy/fdc_magitronic.c b/src/floppy/fdc_magitronic.c
index 084ce8c81..a1ee922da 100644
--- a/src/floppy/fdc_magitronic.c
+++ b/src/floppy/fdc_magitronic.c
@@ -90,12 +90,11 @@ b215_close(void *priv)
 static void *
 b215_init(UNUSED(const device_t *info))
 {
-    b215_t *dev = (b215_t *) malloc(sizeof(b215_t));
-    memset(dev, 0, sizeof(b215_t));
+    b215_t *dev = (b215_t *) calloc(1, sizeof(b215_t));
 
     rom_init(&dev->rom, ROM_B215, ROM_ADDR, 0x2000, 0x1fff, 0, MEM_MAPPING_EXTERNAL);
 
-    dev->fdc_controller = device_add(&fdc_um8398_device);
+    dev->fdc_controller = device_add(&fdc_xt_umc_um8398_device);
     io_sethandler(FDC_PRIMARY_ADDR, 1, b215_read, NULL, NULL, NULL, NULL, NULL, dev);
 
     return dev;
@@ -110,18 +109,19 @@ b215_available(void)
 static const device_config_t b215_config[] = {
   // clang-format off
     {
-        .name = "bios_addr",
-        .description = "BIOS Address:",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0xca000,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xca000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "CA00H", .value = 0xca000 },
             { .description = "CC00H", .value = 0xcc000 },
             { .description = ""                        }
-        }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -135,7 +135,7 @@ const device_t fdc_b215_device = {
     .init          = b215_init,
     .close         = b215_close,
     .reset         = NULL,
-    { .available = b215_available },
+    .available     = b215_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = b215_config
diff --git a/src/floppy/fdc_monster.c b/src/floppy/fdc_monster.c
index 1629ac1c4..38ad9e2ed 100644
--- a/src/floppy/fdc_monster.c
+++ b/src/floppy/fdc_monster.c
@@ -11,10 +11,11 @@
  *
  *
  * Authors:  Jasmine Iwanek, <jasmine@iwanek.co.uk>
+ *           Miran Grca, <mgrca8@gmail.com>
  *
- *           Copyright 2022 Jasmine Iwanek.
+ *           Copyright 2022-2025 Jasmine Iwanek.
+ *           Copyright 2024      Miran Grca.
  */
-
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -26,6 +27,8 @@
 #include <86box/device.h>
 #include <86box/io.h>
 #include <86box/mem.h>
+#include <86box/timer.h>
+#include <86box/nvr.h>
 #include <86box/rom.h>
 #include <86box/machine.h>
 #include <86box/timer.h>
@@ -41,6 +44,7 @@ typedef struct monster_fdc_t {
     rom_t  bios_rom;
     fdc_t *fdc_pri;
     fdc_t *fdc_sec;
+    char   nvr_path[64];
 } monster_fdc_t;
 
 static void
@@ -48,6 +52,14 @@ monster_fdc_close(void *priv)
 {
     monster_fdc_t *dev = (monster_fdc_t *) priv;
 
+    if (dev->nvr_path[0] != 0x00) {
+        FILE *fp = nvr_fopen(dev->nvr_path, "wb");
+        if (fp != NULL) {
+            fwrite(dev->bios_rom.rom, 1, 0x2000, fp);
+            fclose(fp);
+        }
+    }
+
     free(dev);
 }
 
@@ -56,8 +68,7 @@ monster_fdc_init(UNUSED(const device_t *info))
 {
     monster_fdc_t *dev;
 
-    dev = (monster_fdc_t *) malloc(sizeof(monster_fdc_t));
-    memset(dev, 0, sizeof(monster_fdc_t));
+    dev = (monster_fdc_t *) calloc(1, sizeof(monster_fdc_t));
 
 #if 0
     uint8_t sec_irq = device_get_config_int("sec_irq");
@@ -79,9 +90,16 @@ monster_fdc_init(UNUSED(const device_t *info))
         fdc_set_dma_ch(dev->fdc_sec, sec_dma);
 #endif
 
-#if 0
     uint8_t rom_writes_enabled = device_get_config_int("rom_writes_enabled");
-#endif
+    if (rom_writes_enabled) {
+        mem_mapping_set_write_handler(&dev->bios_rom.mapping, rom_write, rom_writew, rom_writel);
+        sprintf(dev->nvr_path, "monster_fdc_%i.nvr", device_get_instance());
+        FILE *fp = nvr_fopen(dev->nvr_path, "rb");
+        if (fp != NULL) {
+            (void) !fread(dev->bios_rom.rom, 1, 0x2000, fp);
+            fclose(fp);
+        }
+    }
 
     return dev;
 }
@@ -96,82 +114,61 @@ static const device_config_t monster_fdc_config[] = {
   // clang-format off
 #if 0
     {
-        .name = "sec_enabled",
-        .description = "Enable Secondary Controller",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "sec_enabled",
+        .description    = "Enable Secondary Controller",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "sec_irq",
-        .description = "Secondary Controller IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 6,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "IRQ 2",
-                .value = 2
-            },
-            {
-                .description = "IRQ 3",
-                .value = 3
-            },
-            {
-                .description = "IRQ 4",
-                .value = 4
-            },
-            {
-                .description = "IRQ 5",
-                .value = 5
-            },
-            {
-                .description = "IRQ 6",
-                .value = 6
-            },
-            {
-                .description = "IRQ 7",
-                .value = 7
-            },
-            { .description = "" }
-        }
+        .name           = "sec_irq",
+        .description    = "Secondary Controller IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 6,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 2", .value = 2 },
+            { .description = "IRQ 3", .value = 3 },
+            { .description = "IRQ 4", .value = 4 },
+            { .description = "IRQ 5", .value = 5 },
+            { .description = "IRQ 6", .value = 6 },
+            { .description = "IRQ 7", .value = 7 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "sec_dma",
-        .description = "Secondary Controller DMA",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 2,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "DMA 1",
-                .value = 1
-            },
-            {
-                .description = "DMA 2",
-                .value = 2
-            },
-            {
-                .description = "DMA 3",
-                .value = 3
-            },
-            { .description = "" }
-        }
+        .name           = "sec_dma",
+        .description    = "Secondary Controller DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "DMA 1", .value = 1 },
+            { .description = "DMA 2", .value = 2 },
+            { .description = "DMA 3", .value = 3 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
 #endif
     {
-        .name = "bios_addr",
-        .description = "BIOS Address:",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0xc8000,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xc8000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Disabled", .value = 0 },
             { .description = "C000H",    .value = 0xc0000 },
             { .description = "C800H",    .value = 0xc8000 },
@@ -180,31 +177,37 @@ static const device_config_t monster_fdc_config[] = {
             { .description = "E000H",    .value = 0xe0000 },
             { .description = "E800H",    .value = 0xe8000 },
             { .description = ""                           }
-        }
+        },
+        .bios           = { { 0 } }
     },
 #if 0
     {
-        .name = "bios_size",
-        .description = "BIOS Size:",
-        .type = CONFIG_HEX20,
-        .default_string = "32",
-        .default_int = 0xc8000,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "bios_size",
+        .description    = "BIOS size",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 32,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "8K",  .value = 8  },
             { .description = "32K", .value = 32 },
             { .description = ""                 }
-        }
-    },
-    {
-        .name = "rom_writes_enabled",
-        .description = "Enable BIOS extension ROM Writes",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        },
+        .bios           = { { 0 } }
     },
 #endif
+    {
+        .name           = "rom_writes_enabled",
+        .description    = "Enable BIOS extension ROM Writes",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
@@ -217,7 +220,7 @@ const device_t fdc_monster_device = {
     .init          = monster_fdc_init,
     .close         = monster_fdc_close,
     .reset         = NULL,
-    { .available = monster_fdc_available },
+    .available     = monster_fdc_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = monster_fdc_config
diff --git a/src/floppy/fdc_pii15xb.c b/src/floppy/fdc_pii15xb.c
index 5fd38d250..4c8c589e4 100644
--- a/src/floppy/fdc_pii15xb.c
+++ b/src/floppy/fdc_pii15xb.c
@@ -75,7 +75,7 @@ MiniMicro 4 also won't work with the XT FDC which the Zilog claims to be.
 #include <86box/fdc_ext.h>
 
 #define DTK_VARIANT  ((info->local == 158) ? ROM_PII_158B : ROM_PII_151B)
-#define DTK_CHIP     ((info->local == 158) ? &fdc_xt_device : &fdc_dp8473_device)
+#define DTK_CHIP     ((info->local == 158) ? &fdc_xt_device : &fdc_at_nsc_dp8473_device)
 #define BIOS_ADDR    (uint32_t)(device_get_config_hex20("bios_addr") & 0x000fffff)
 #define ROM_PII_151B "roms/floppy/dtk/pii-151b.rom"
 #define ROM_PII_158B "roms/floppy/dtk/pii-158b.rom"
@@ -97,8 +97,7 @@ pii_init(const device_t *info)
 {
     pii_t *dev;
 
-    dev = (pii_t *) malloc(sizeof(pii_t));
-    memset(dev, 0, sizeof(pii_t));
+    dev = (pii_t *) calloc(1, sizeof(pii_t));
 
     if (BIOS_ADDR != 0)
         rom_init(&dev->bios_rom, DTK_VARIANT, BIOS_ADDR, 0x2000, 0x1ffff, 0, MEM_MAPPING_EXTERNAL);
@@ -123,20 +122,21 @@ pii_158_available(void)
 static const device_config_t pii_config[] = {
   // clang-format off
     {
-        .name = "bios_addr",
-        .description = "BIOS Address:",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0xce000,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xce000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Disabled", .value = 0 },
             { .description = "CA00H",    .value = 0xca000 },
             { .description = "CC00H",    .value = 0xcc000 },
             { .description = "CE00H",    .value = 0xce000 },
             { .description = ""                           }
-        }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -150,7 +150,7 @@ const device_t fdc_pii151b_device = {
     .init          = pii_init,
     .close         = pii_close,
     .reset         = NULL,
-    { .available = pii_151b_available },
+    .available     = pii_151b_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = pii_config
@@ -164,7 +164,7 @@ const device_t fdc_pii158b_device = {
     .init          = pii_init,
     .close         = pii_close,
     .reset         = NULL,
-    { .available = pii_158_available },
+    .available     = pii_158_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = pii_config
diff --git a/src/floppy/fdd.c b/src/floppy/fdd.c
index 09e791c4e..8bc946388 100644
--- a/src/floppy/fdd.c
+++ b/src/floppy/fdd.c
@@ -26,6 +26,7 @@
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/timer.h>
+#include <86box/machine.h>
 #include <86box/path.h>
 #include <86box/plat.h>
 #include <86box/ui.h>
@@ -34,7 +35,7 @@
 #include <86box/fdd_fdi.h>
 #include <86box/fdd_imd.h>
 #include <86box/fdd_img.h>
-#include <86box/fdd_json.h>
+#include <86box/fdd_pcjs.h>
 #include <86box/fdd_mfm.h>
 #include <86box/fdd_td0.h>
 #include <86box/fdc.h>
@@ -99,12 +100,12 @@ d86f_handler_t d86f_handler[FDD_NUM];
 
 static const struct
 {
-    char *ext;
-    void (*load)(int drive, char *fn);
-    void (*close)(int drive);
-    int size;
+    const char *ext;
+    void        (*load)(int drive, char *fn);
+    void        (*close)(int drive);
+    int         size;
 } loaders[] = {
-    {"001",   img_load,  img_close,  -1},
+    { "001",  img_load,  img_close,  -1},
     { "002",  img_load,  img_close,  -1},
     { "003",  img_load,  img_close,  -1},
     { "004",  img_load,  img_close,  -1},
@@ -131,7 +132,7 @@ static const struct
     { "IMA",  img_load,  img_close,  -1},
     { "IMD",  imd_load,  imd_close,  -1},
     { "IMG",  img_load,  img_close,  -1},
-    { "JSON", json_load, json_close, -1},
+    { "JSON", pcjs_load, pcjs_close, -1},
     { "MFM",  mfm_load,  mfm_close,  -1},
     { "TD0",  td0_load,  td0_close,  -1},
     { "VFD",  img_load,  img_close,  -1},
@@ -139,59 +140,42 @@ static const struct
     { 0,      0,         0,          0 }
 };
 
-static const struct
-{
+static const struct {
     int         max_track;
     int         flags;
     const char *name;
     const char *internal_name;
-} drive_types[] =
-{
-    {       /*None*/
-        0, 0, "None", "none"
-    },
-    {       /*5.25" 1DD*/
-        43, FLAG_RPM_300 | FLAG_525 | FLAG_HOLE0, "5.25\" 180k", "525_1dd"
-    },
-    {       /*5.25" DD*/
-        43, FLAG_RPM_300 | FLAG_525 | FLAG_DS | FLAG_HOLE0, "5.25\" 360k", "525_2dd"
-    },
-    {       /*5.25" QD*/
-        86, FLAG_RPM_300 | FLAG_525 | FLAG_DS | FLAG_HOLE0 | FLAG_DOUBLE_STEP, "5.25\" 720k", "525_2qd"
-    },
-    {       /*5.25" HD PS/2*/
-        86, FLAG_RPM_360 | FLAG_525 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP | FLAG_INVERT_DENSEL | FLAG_PS2, "5.25\" 1.2M PS/2", "525_2hd_ps2"
-    },
-    {       /*5.25" HD*/
-        86, FLAG_RPM_360 | FLAG_525 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP, "5.25\" 1.2M", "525_2hd"
-    },
-    {       /*5.25" HD Dual RPM*/
-        86, FLAG_RPM_300 | FLAG_RPM_360 | FLAG_525 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP, "5.25\" 1.2M 300/360 RPM", "525_2hd_dualrpm"
-    },
-    {       /*3.5" 1DD*/
-        86, FLAG_RPM_300 | FLAG_HOLE0 | FLAG_DOUBLE_STEP, "3.5\" 360k", "35_1dd"
-    },
-    {       /*3.5" DD*/
-        86, FLAG_RPM_300 | FLAG_DS | FLAG_HOLE0 | FLAG_DOUBLE_STEP, "3.5\" 720k", "35_2dd"
-    },
-    {       /*3.5" HD PS/2*/
-        86, FLAG_RPM_300 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP | FLAG_INVERT_DENSEL | FLAG_PS2, "3.5\" 1.44M PS/2", "35_2hd_ps2"
-    },
-    {       /*3.5" HD*/
-        86, FLAG_RPM_300 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP, "3.5\" 1.44M", "35_2hd"
-    },
-    {       /*3.5" HD PC-98*/
-        86, FLAG_RPM_300 | FLAG_RPM_360 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP | FLAG_INVERT_DENSEL, "3.5\" 1.25M PC-98", "35_2hd_nec"
-    },
-    {       /*3.5" HD 3-Mode*/
-        86, FLAG_RPM_300 | FLAG_RPM_360 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP, "3.5\" 1.44M 300/360 RPM", "35_2hd_3mode"
-    },
-    {       /*3.5" ED*/
-        86, FLAG_RPM_300 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_HOLE2 | FLAG_DOUBLE_STEP, "3.5\" 2.88M", "35_2ed"
-    },
-    {       /*End of list*/
-        -1, -1, "", ""
-    }
+} drive_types[] = {
+    /* None */
+    { 0, 0, "None", "none" },
+    /* 5.25" 1DD */
+    { 43, FLAG_RPM_300 | FLAG_525 | FLAG_HOLE0, "5.25\" 180k", "525_1dd" },
+    /* 5.25" DD */
+    { 43, FLAG_RPM_300 | FLAG_525 | FLAG_DS | FLAG_HOLE0, "5.25\" 360k", "525_2dd" },
+    /* 5.25" QD */
+    { 86, FLAG_RPM_300 | FLAG_525 | FLAG_DS | FLAG_HOLE0 | FLAG_DOUBLE_STEP, "5.25\" 720k", "525_2qd" },
+    /* 5.25" HD */
+    { 86, FLAG_RPM_360 | FLAG_525 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP | FLAG_PS2, "5.25\" 1.2M", "525_2hd" },
+    /* 5.25" HD Dual RPM */
+    { 86, FLAG_RPM_300 | FLAG_RPM_360 | FLAG_525 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP, "5.25\" 1.2M 300/360 RPM", "525_2hd_dualrpm" },
+    /* 3.5" 1DD */
+    { 86, FLAG_RPM_300 | FLAG_HOLE0 | FLAG_DOUBLE_STEP, "3.5\" 360k", "35_1dd" },
+    /* 3.5" DD, Equivalent to TEAC FD-235F */
+    { 86, FLAG_RPM_300 | FLAG_DS | FLAG_HOLE0 | FLAG_DOUBLE_STEP, "3.5\" 720k", "35_2dd" },
+    /* 3.5" HD, Equivalent to TEAC FD-235HF */
+    { 86, FLAG_RPM_300 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP | FLAG_PS2, "3.5\" 1.44M", "35_2hd" },
+    /* TODO: 3.5" DD, Equivalent to TEAC FD-235GF */
+//    { 86, FLAG_RPM_300 | FLAG_RPM_360 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP, "3.5\" 1.25M", "35_2hd_2mode" },
+    /* 3.5" HD PC-98 */
+    { 86, FLAG_RPM_300 | FLAG_RPM_360 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP | FLAG_INVERT_DENSEL, "3.5\" 1.25M PC-98", "35_2hd_nec" },
+    /* 3.5" HD 3-Mode, Equivalent to TEAC FD-235HG */
+    { 86, FLAG_RPM_300 | FLAG_RPM_360 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP, "3.5\" 1.44M 300/360 RPM", "35_2hd_3mode" },
+    /* 3.5" ED, Equivalent to TEAC FD-235J */
+    { 86, FLAG_RPM_300 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_HOLE2 | FLAG_DOUBLE_STEP, "3.5\" 2.88M", "35_2ed" },
+    /* 3.5" ED Dual RPM, Equivalent to TEAC FD-335J */
+    { 86, FLAG_RPM_300 | FLAG_RPM_360 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_HOLE2 | FLAG_DOUBLE_STEP, "3.5\" 2.88M 300/360 RPM", "35_2ed_dualrpm" },
+    /* End of list */
+    { -1, -1, "", "" }
 };
 
 #ifdef ENABLE_FDD_LOG
@@ -227,7 +211,7 @@ fdd_get_internal_name(int type)
 int
 fdd_get_from_internal_name(char *s)
 {
-    int c = 0;
+    int   c = 0;
 
     while (strlen(drive_types[c].internal_name)) {
         if (!strcmp((char *) drive_types[c].internal_name, s))
@@ -295,11 +279,32 @@ fdd_current_track(int drive)
     return fdd[drive].track;
 }
 
+static int
+fdd_type_invert_densel(int type)
+{
+    int ret;
+
+    if (drive_types[type].flags & FLAG_PS2)
+        ret = (!!strstr(machine_getname(), "PS/1")) || (!!strstr(machine_getname(), "PS/2")) || (!!strstr(machine_getname(), "PS/55"));
+    else
+        ret = drive_types[type].flags & FLAG_INVERT_DENSEL;
+
+    return ret;
+}
+
+static int
+fdd_invert_densel(int drive)
+{
+    int ret = fdd_type_invert_densel(fdd[drive].type);
+
+    return ret;
+}
+
 void
 fdd_set_densel(int densel)
 {
     for (uint8_t i = 0; i < FDD_NUM; i++) {
-        if (drive_types[fdd[i].type].flags & FLAG_INVERT_DENSEL)
+        if (fdd_invert_densel(i))
             fdd[i].densel = densel ^ 1;
         else
             fdd[i].densel = densel;
@@ -315,7 +320,7 @@ fdd_getrpm(int drive)
     hole   = fdd_hole(drive);
     densel = fdd[drive].densel;
 
-    if (drive_types[fdd[drive].type].flags & FLAG_INVERT_DENSEL)
+    if (fdd_invert_densel(drive))
         densel ^= 1;
 
     if (!(drive_types[fdd[drive].type].flags & FLAG_RPM_360))
@@ -353,10 +358,9 @@ fdd_doublestep_40(int drive)
 void
 fdd_set_type(int drive, int type)
 {
-    int old_type    = fdd[drive].type;
-    fdd[drive].type = type;
-    if ((drive_types[old_type].flags ^ drive_types[type].flags) & FLAG_INVERT_DENSEL)
+    if (fdd_type_invert_densel(fdd[drive].type) != fdd_type_invert_densel(type))
         fdd[drive].densel ^= 1;
+    fdd[drive].type = type;
 }
 
 int
@@ -454,12 +458,18 @@ fdd_load(int drive, char *fn)
     int         c = 0;
     int         size;
     const char *p;
-    FILE *      fp;
+    FILE       *fp;
+    int         offs = 0;
 
     fdd_log("FDD: loading drive %d with '%s'\n", drive, fn);
 
     if (!fn)
         return;
+    if (strstr(fn, "wp://") == fn) {
+        offs = 5;
+        ui_writeprot[drive] = 1;
+    }
+    fn += offs;
     p = path_get_extension(fn);
     if (!p)
         return;
@@ -472,13 +482,14 @@ fdd_load(int drive, char *fn)
         while (loaders[c].ext) {
             if (!strcasecmp(p, (char *) loaders[c].ext) && (size == loaders[c].size || loaders[c].size == -1)) {
                 driveloaders[drive] = c;
-                if (floppyfns[drive] != fn)
-                    strcpy(floppyfns[drive], fn);
+                if (floppyfns[drive] != (fn - offs))
+                    strcpy(floppyfns[drive], fn - offs);
                 d86f_setup(drive);
-                loaders[c].load(drive, floppyfns[drive]);
+                loaders[c].load(drive, floppyfns[drive] + offs);
                 drive_empty[drive] = 0;
                 fdd_forced_seek(drive, 0);
                 fdd_changed[drive] = 1;
+                ui_sb_update_icon_wp(SB_FLOPPY | drive, ui_writeprot[drive]);
                 return;
             }
             c++;
@@ -528,7 +539,7 @@ fdd_hole(int drive)
 static __inline uint64_t
 fdd_byteperiod(int drive)
 {
-    if (!fdd_get_turbo(drive) && drives[drive].byteperiod)
+    if (drives[drive].byteperiod)
         return drives[drive].byteperiod(drive);
     else
         return 32ULL * TIMER_USEC;
@@ -674,7 +685,7 @@ fdd_init(void)
     d86f_init();
     td0_init();
     imd_init();
-    json_init();
+    pcjs_init();
 
     for (i = 0; i < FDD_NUM; i++) {
         fdd_load(i, floppyfns[i]);
diff --git a/src/floppy/fdd_86f.c b/src/floppy/fdd_86f.c
index fa1c070f1..f210bf4fd 100644
--- a/src/floppy/fdd_86f.c
+++ b/src/floppy/fdd_86f.c
@@ -28,6 +28,7 @@
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/timer.h>
+#include <86box/crc.h>
 #include <86box/dma.h>
 #include <86box/nvr.h>
 #include <86box/random.h>
@@ -223,6 +224,7 @@ typedef struct d86f_t {
     uint8_t    *filebuf;
     uint8_t    *outbuf;
     sector_t   *last_side_sector[2];
+    uint16_t    crc_table[256];
 } d86f_t;
 
 static const uint8_t encoded_fm[64] = {
@@ -247,7 +249,6 @@ static const uint8_t encoded_mfm[64] = {
 };
 
 static d86f_t  *d86f[FDD_NUM];
-static uint16_t CRCTable[256];
 static fdc_t   *d86f_fdc;
 uint64_t        poly = 0x42F0E1EBA9EA3693LL; /* ECMA normal */
 
@@ -276,28 +277,6 @@ d86f_log(const char *fmt, ...)
 #    define d86f_log(fmt, ...)
 #endif
 
-static void
-setup_crc(uint16_t poly)
-{
-    int      c = 256;
-    int      bc;
-    uint16_t temp;
-
-    while (c--) {
-        temp = c << 8;
-        bc   = 8;
-
-        while (bc--) {
-            if (temp & 0x8000)
-                temp = (temp << 1) ^ poly;
-            else
-                temp <<= 1;
-
-            CRCTable[c] = temp;
-        }
-    }
-}
-
 void
 d86f_destroy_linked_lists(int drive, int side)
 {
@@ -628,10 +607,12 @@ d86f_get_array_size(int drive, int side, int words)
     int hole;
     int rm;
     int ssd;
+    int mpc;
 
     rm   = d86f_get_rpm_mode(drive);
     ssd  = d86f_get_speed_shift_dir(drive);
-    hole = (d86f_handler[drive].disk_flags(drive) & 6) >> 1;
+    hole = (d86f_handler[drive].disk_flags(drive) >> 1) & 3;
+    mpc  = (d86f_handler[drive].disk_flags(drive) >> 13) & 1;
 
     if (!rm && ssd) /* Special case - extra bit cells size specifies entire array size. */
         array_size = 0;
@@ -703,13 +684,20 @@ d86f_get_array_size(int drive, int side, int words)
     array_size <<= 4;
     array_size += d86f_handler[drive].extra_bit_cells(drive, side);
 
-    if (array_size & 15)
-        array_size = (array_size >> 4) + 1;
-    else
-        array_size = (array_size >> 4);
+    if (mpc && !words) {
+        if (array_size & 7)
+            array_size = (array_size >> 3) + 1;
+        else
+            array_size = (array_size >> 3);
+    } else {
+        if (array_size & 15)
+            array_size = (array_size >> 4) + 1;
+        else
+            array_size = (array_size >> 4);
 
-    if (!words)
-        array_size <<= 1;
+        if (!words)
+            array_size <<= 1;
+    }
 
     return array_size;
 }
@@ -770,36 +758,43 @@ d86f_get_encoding(int drive)
 uint64_t
 d86f_byteperiod(int drive)
 {
-    double dusec = (double) TIMER_USEC;
-    double p     = 2.0;
+    d86f_t   *dev = d86f[drive];
+    uint64_t  ret = 32ULL * TIMER_USEC;
 
-    switch (d86f_track_flags(drive) & 0x0f) {
-        case 0x02: /* 125 kbps, FM */
-            p = 4.0;
-            break;
-        case 0x01: /* 150 kbps, FM */
-            p = 20.0 / 6.0;
-            break;
-        case 0x0a: /* 250 kbps, MFM */
-        case 0x00: /* 250 kbps, FM */
-        default:
-            p = 2.0;
-            break;
-        case 0x09: /* 300 kbps, MFM */
-            p = 10.0 / 6.0;
-            break;
-        case 0x08: /* 500 kbps, MFM */
-            p = 1.0;
-            break;
-        case 0x0b: /* 1000 kbps, MFM */
-            p = 0.5;
-            break;
-        case 0x0d: /* 2000 kbps, MFM */
-            p = 0.25;
-            break;
+    if (!fdd_get_turbo(drive) || (dev->version != 0x0063) || (dev->state == STATE_SECTOR_NOT_FOUND)) {
+        double dusec = (double) TIMER_USEC;
+        double p     = 2.0;
+
+        switch (d86f_track_flags(drive) & 0x0f) {
+            case 0x02: /* 125 kbps, FM */
+                p = 4.0;
+                break;
+            case 0x01: /* 150 kbps, FM */
+                p = 20.0 / 6.0;
+                break;
+            case 0x0a: /* 250 kbps, MFM */
+            case 0x00: /* 250 kbps, FM */
+                default:
+                p = 2.0;
+                break;
+            case 0x09: /* 300 kbps, MFM */
+                p = 10.0 / 6.0;
+                break;
+            case 0x08: /* 500 kbps, MFM */
+                p = 1.0;
+                break;
+            case 0x0b: /* 1000 kbps, MFM */
+                p = 0.5;
+                break;
+            case 0x0d: /* 2000 kbps, MFM */
+                p = 0.25;
+                break;
+        }
+
+        ret = (uint64_t) (p * dusec);
     }
 
-    return (uint64_t) (p * dusec);
+    return ret;
 }
 
 int
@@ -1098,9 +1093,9 @@ d86f_get_bit(int drive, int side)
     /* In some cases, misindentification occurs so we need to make sure the surface data array is not
        not NULL. */
     if (d86f_has_surface_desc(drive) && dev->track_surface_data[side]) {
-        if (d86f_reverse_bytes(drive)) {
+        if (d86f_reverse_bytes(drive))
             surface_data = dev->track_surface_data[side][track_word] & 0xFF;
-        } else {
+        else {
             surface_data = (dev->track_surface_data[side][track_word] & 0xFF) << 8;
             surface_data |= (dev->track_surface_data[side][track_word] >> 8);
         }
@@ -1150,9 +1145,9 @@ d86f_put_bit(int drive, int side, int bit)
     }
 
     if (d86f_has_surface_desc(drive)) {
-        if (d86f_reverse_bytes(drive)) {
+        if (d86f_reverse_bytes(drive))
             surface_data = dev->track_surface_data[side][track_word] & 0xFF;
-        } else {
+        else {
             surface_data = (dev->track_surface_data[side][track_word] & 0xFF) << 8;
             surface_data |= (dev->track_surface_data[side][track_word] >> 8);
         }
@@ -1177,9 +1172,9 @@ d86f_put_bit(int drive, int side, int bit)
 
         surface_data &= ~(1 << track_bit);
         surface_data |= (surface_bit << track_bit);
-        if (d86f_reverse_bytes(drive)) {
+        if (d86f_reverse_bytes(drive))
             dev->track_surface_data[side][track_word] = surface_data;
-        } else {
+        else {
             dev->track_surface_data[side][track_word] = (surface_data & 0xFF) << 8;
             dev->track_surface_data[side][track_word] |= (surface_data >> 8);
         }
@@ -1191,9 +1186,9 @@ d86f_put_bit(int drive, int side, int bit)
     encoded_data &= ~(1 << track_bit);
     encoded_data |= (current_bit << track_bit);
 
-    if (d86f_reverse_bytes(drive)) {
+    if (d86f_reverse_bytes(drive))
         d86f_handler[drive].encoded_data(drive, side)[track_word] = encoded_data;
-    } else {
+    else {
         d86f_handler[drive].encoded_data(drive, side)[track_word] = (encoded_data & 0xFF) << 8;
         d86f_handler[drive].encoded_data(drive, side)[track_word] |= (encoded_data >> 8);
     }
@@ -1228,16 +1223,10 @@ decodefm(UNUSED(int drive), uint16_t dat)
     return temp;
 }
 
-void
-fdd_calccrc(uint8_t byte, crc_t *crc_var)
-{
-    crc_var->word = (crc_var->word << 8) ^ CRCTable[(crc_var->word >> 8) ^ byte];
-}
-
 static void
 d86f_calccrc(d86f_t *dev, uint8_t byte)
 {
-    fdd_calccrc(byte, &(dev->calc_crc));
+    crc16_calc(dev->crc_table, byte, &(dev->calc_crc));
 }
 
 int
@@ -1265,7 +1254,9 @@ d86f_word_is_aligned(int drive, int side, uint32_t base_pos)
 
 /* State 1: Find sector ID */
 void
-d86f_find_address_mark_fm(int drive, int side, find_t *find, uint16_t req_am, uint16_t other_am, uint16_t wrong_am, uint16_t ignore_other_am)
+d86f_find_address_mark_fm(int drive, int side, find_t *find, uint16_t req_am,
+                          uint16_t other_am, uint16_t wrong_am,
+                          uint16_t ignore_other_am)
 {
     d86f_t *dev = d86f[drive];
 
@@ -1273,7 +1264,8 @@ d86f_find_address_mark_fm(int drive, int side, find_t *find, uint16_t req_am, ui
 
     if (dev->last_word[side] == req_am) {
         dev->calc_crc.word = 0xFFFF;
-        fdd_calccrc(decodefm(drive, dev->last_word[side]), &(dev->calc_crc));
+        crc16_calc(dev->crc_table, decodefm(drive, dev->last_word[side]),
+                   &(dev->calc_crc));
         find->sync_marks = find->bits_obtained =
         find->bytes_obtained                   = 0;
         find->sync_pos                         = 0xFFFFFFFF;
@@ -1293,12 +1285,22 @@ d86f_find_address_mark_fm(int drive, int side, find_t *find, uint16_t req_am, ui
 
     if ((ignore_other_am & 2) && (dev->last_word[side] == other_am)) {
         dev->calc_crc.word = 0xFFFF;
-        fdd_calccrc(decodefm(drive, dev->last_word[side]), &(dev->calc_crc));
+        crc16_calc(dev->crc_table, decodefm(drive, dev->last_word[side]),
+                   &(dev->calc_crc));
         find->sync_marks = find->bits_obtained = find->bytes_obtained = 0;
         find->sync_pos                                                = 0xFFFFFFFF;
         if (ignore_other_am & 1) {
             /* Skip mode, let's go back to finding ID. */
-            dev->state -= 2;
+            fdc_set_wrong_am(d86f_fdc);
+            dev->data_find.sync_marks = dev->data_find.bits_obtained = dev->data_find.bytes_obtained = 0;
+            dev->error_condition                                                                     = 0;
+            dev->state                                                                               = STATE_IDLE;
+            if (dev->state == STATE_02_READ_DATA)
+                fdc_track_finishread(d86f_fdc, dev->error_condition);
+            else if (dev->state == STATE_11_SCAN_DATA)
+                fdc_sector_finishcompare(d86f_fdc, (dev->satisfying_bytes == ((128 << ((uint32_t) dev->last_sector.id.n)) - 1)) ? 1 : 0);
+            else
+                fdc_sector_finishread(d86f_fdc);
         } else {
             /* Not skip mode, process the sector anyway. */
             fdc_set_wrong_am(d86f_fdc);
@@ -1360,7 +1362,8 @@ d86f_find_address_mark_mfm(int drive, int side, find_t *find, uint16_t req_am, u
     if ((dev->last_word[side] == req_am) && (find->sync_marks >= 3)) {
         if (d86f_word_is_aligned(drive, side, find->sync_pos)) {
             dev->calc_crc.word = 0xCDB4;
-            fdd_calccrc(decodefm(drive, dev->last_word[side]), &(dev->calc_crc));
+            crc16_calc(dev->crc_table, decodefm(drive, dev->last_word[side]),
+                       &(dev->calc_crc));
             find->sync_marks = find->bits_obtained = find->bytes_obtained = 0;
             find->sync_pos                                                = 0xFFFFFFFF;
             dev->preceding_bit[side]                                      = dev->last_word[side] & 1;
@@ -1372,12 +1375,22 @@ d86f_find_address_mark_mfm(int drive, int side, find_t *find, uint16_t req_am, u
     if ((ignore_other_am & 2) && (dev->last_word[side] == other_am) && (find->sync_marks >= 3)) {
         if (d86f_word_is_aligned(drive, side, find->sync_pos)) {
             dev->calc_crc.word = 0xCDB4;
-            fdd_calccrc(decodefm(drive, dev->last_word[side]), &(dev->calc_crc));
+            crc16_calc(dev->crc_table, decodefm(drive, dev->last_word[side]),
+                       &(dev->calc_crc));
             find->sync_marks = find->bits_obtained = find->bytes_obtained = 0;
             find->sync_pos                                                = 0xFFFFFFFF;
             if (ignore_other_am & 1) {
                 /* Skip mode, let's go back to finding ID. */
-                dev->state -= 2;
+                fdc_set_wrong_am(d86f_fdc);
+                dev->data_find.sync_marks = dev->data_find.bits_obtained = dev->data_find.bytes_obtained = 0;
+                dev->error_condition                                                                     = 0;
+                dev->state                                                                               = STATE_IDLE;
+                if (dev->state == STATE_02_READ_DATA)
+                    fdc_track_finishread(d86f_fdc, dev->error_condition);
+                else if (dev->state == STATE_11_SCAN_DATA)
+                    fdc_sector_finishcompare(d86f_fdc, (dev->satisfying_bytes == ((128 << ((uint32_t) dev->last_sector.id.n)) - 1)) ? 1 : 0);
+                else
+                    fdc_sector_finishread(d86f_fdc);
             } else {
                 /* Not skip mode, process the sector anyway. */
                 fdc_set_wrong_am(d86f_fdc);
@@ -1437,8 +1450,11 @@ d86f_read_sector_id(int drive, int side, int match)
             if (dev->id_find.bytes_obtained < 4) {
                 dev->last_sector.byte_array[dev->id_find.bytes_obtained] =
                 decodefm(drive, dev->last_word[side]);
-                fdd_calccrc(dev->last_sector.byte_array[dev->id_find.bytes_obtained], &(dev->calc_crc));
-            } else if ((dev->id_find.bytes_obtained >= 4) && (dev->id_find.bytes_obtained < 6)) {
+                crc16_calc(dev->crc_table,
+                           dev->last_sector.byte_array[dev->id_find.bytes_obtained],
+                           &(dev->calc_crc));
+            } else if ((dev->id_find.bytes_obtained >= 4) &&
+                       (dev->id_find.bytes_obtained < 6)) {
                 dev->track_crc.bytes[(dev->id_find.bytes_obtained & 1) ^ 1] =
                 decodefm(drive, dev->last_word[side]);
             }
@@ -1616,7 +1632,7 @@ d86f_read_sector_data(int drive, int side)
                         }
                     }
                 }
-                fdd_calccrc(data, &(dev->calc_crc));
+                crc16_calc(dev->crc_table, data, &(dev->calc_crc));
             } else if (dev->data_find.bytes_obtained < crc_pos)
                 dev->track_crc.bytes[(dev->data_find.bytes_obtained - sector_len) ^ 1] =
                 decodefm(drive, dev->last_word[side]);
@@ -1703,11 +1719,12 @@ d86f_write_sector_data(int drive, int side, int mfm, uint16_t am)
 
             if (dev->data_find.bytes_obtained < sector_len) {
                 /* This is a data byte, so CRC it. */
-                if (!dev->data_find.bytes_obtained) {
-                    fdd_calccrc(decodefm(drive, am), &(dev->calc_crc));
-                } else {
-                    fdd_calccrc(dev->current_byte[side], &(dev->calc_crc));
-                }
+                if (!dev->data_find.bytes_obtained)
+                    crc16_calc(dev->crc_table, decodefm(drive, am),
+                               &(dev->calc_crc));
+                else
+                    crc16_calc(dev->crc_table, dev->current_byte[side],
+                               &(dev->calc_crc));
             }
         }
     } else {
@@ -1815,7 +1832,6 @@ d86f_write_direct_common(int drive, int side, uint16_t byte, uint8_t type, uint3
     uint16_t  mask_data;
     uint16_t  mask_surface;
     uint16_t  mask_hole;
-    uint16_t  mask_fuzzy;
     decoded_t dbyte;
     decoded_t dpbyte;
 
@@ -1828,6 +1844,7 @@ d86f_write_direct_common(int drive, int side, uint16_t byte, uint8_t type, uint3
     if (type == 0) {
         /* Byte write. */
         encoded_byte = d86f_encode_byte(drive, 0, dbyte, dpbyte);
+        dev->preceding_bit[side] = encoded_byte & 1;
         if (!d86f_reverse_bytes(drive)) {
             mask_data = encoded_byte >> 8;
             encoded_byte &= 0xFF;
@@ -1837,6 +1854,7 @@ d86f_write_direct_common(int drive, int side, uint16_t byte, uint8_t type, uint3
     } else {
         /* Word write. */
         encoded_byte = byte;
+        dev->preceding_bit[side] = (encoded_byte >> 8) & 1;
         if (d86f_reverse_bytes(drive)) {
             mask_data = encoded_byte >> 8;
             encoded_byte &= 0xFF;
@@ -1845,16 +1863,19 @@ d86f_write_direct_common(int drive, int side, uint16_t byte, uint8_t type, uint3
         }
     }
 
-    dev->preceding_bit[side] = encoded_byte & 1;
-
     if (d86f_has_surface_desc(drive)) {
-        mask_data    = dev->track_encoded_data[side][pos] ^= 0xFFFF;
+        /* Inverted track data, clear bits are now set. */
+        mask_data    = ~dev->track_encoded_data[side][pos];
+        /* Surface data. */
         mask_surface = dev->track_surface_data[side][pos];
-        mask_hole    = (mask_surface & mask_data) ^ 0xFFFF; /* This will retain bits that are both fuzzy and 0, therefore physical holes. */
-        encoded_byte &= mask_hole;                          /* Filter out physical hole bits from the encoded data. */
-        mask_data ^= 0xFFFF;                                /* Invert back so bits 1 are 1 again. */
-        mask_fuzzy = (mask_surface & mask_data) ^ 0xFFFF;   /* All fuzzy bits are 0. */
-        dev->track_surface_data[side][pos] &= mask_fuzzy;   /* Remove fuzzy bits (but not hole bits) from the surface mask, making them regular again. */
+
+        /* Hole = surface & ~data, so holes are one. */
+        mask_hole    = mask_surface & mask_data;
+        /* Hole bits are ones again, set the surface data to that. */
+        dev->track_surface_data[side][pos] = mask_hole;
+
+        /* Force the data of any hole to zero. */
+        encoded_byte &= ~mask_hole;
     }
 
     dev->track_encoded_data[side][pos] = encoded_byte;
@@ -2400,16 +2421,28 @@ d86f_turbo_poll(int drive, int side)
         case STATE_0C_READ_DATA:
         case STATE_11_SCAN_DATA:
         case STATE_16_VERIFY_DATA:
-            d86f_turbo_read(drive, side);
+            if (fdc_is_dma(d86f_fdc))
+                for (int i = 0; i < (128 << dev->last_sector.id.n); i++)
+                    d86f_turbo_read(drive, side);
+            else
+                d86f_turbo_read(drive, side);
             break;
 
         case STATE_05_WRITE_DATA:
         case STATE_09_WRITE_DATA:
-            d86f_turbo_write(drive, side);
+            if (fdc_is_dma(d86f_fdc))
+                for (int i = 0; i < (128 << dev->last_sector.id.n); i++)
+                    d86f_turbo_write(drive, side);
+            else
+                d86f_turbo_write(drive, side);
             break;
 
         case STATE_0D_FORMAT_TRACK:
-            d86f_turbo_format(drive, side, (side && (d86f_get_sides(drive) != 2)));
+            if (fdc_is_dma(d86f_fdc))
+                while (dev->state == STATE_0D_FORMAT_TRACK)
+                    d86f_turbo_format(drive, side, (side && (d86f_get_sides(drive) != 2)));
+            else
+                d86f_turbo_format(drive, side, (side && (d86f_get_sides(drive) != 2)));
             return;
 
         case STATE_IDLE:
@@ -2437,16 +2470,17 @@ d86f_poll(int drive)
             dev->state = STATE_SECTOR_NOT_FOUND;
     }
 
-    if (fdd_get_turbo(drive) && (dev->version == 0x0063)) {
-        d86f_turbo_poll(drive, side);
-        return;
-    }
-
     if ((dev->state != STATE_IDLE) && (dev->state != STATE_SECTOR_NOT_FOUND) && ((dev->state & 0xF8) != 0xE8)) {
         if (!d86f_can_read_address(drive))
             dev->state = STATE_SECTOR_NOT_FOUND;
     }
 
+    /* Do normal poll if DENSEL is wrong, because Windows 95 is very strict about timings there. */
+    if (fdd_get_turbo(drive) && (dev->version == 0x0063) && (dev->state != STATE_SECTOR_NOT_FOUND)) {
+        d86f_turbo_poll(drive, side);
+        return;
+    }
+
     if ((dev->state != STATE_02_SPIN_TO_INDEX) && (dev->state != STATE_0D_SPIN_TO_INDEX))
         d86f_get_bit(drive, side ^ 1);
 
@@ -2551,12 +2585,6 @@ d86f_poll(int drive)
 
     d86f_advance_bit(drive, side);
 
-    if (d86f_wrong_densel(drive) && (dev->state != STATE_IDLE)) {
-        dev->state = STATE_IDLE;
-        fdc_noidam(d86f_fdc);
-        return;
-    }
-
     if ((dev->index_count == 2) && (dev->state != STATE_IDLE)) {
         switch (dev->state) {
             case STATE_0A_FIND_ID:
@@ -2700,8 +2728,7 @@ d86f_prepare_sector(int drive, int side, int prev_pos, uint8_t *id_buf, uint8_t
     uint16_t datadam_mfm = 0x4A55;
 
     if (fdd_get_turbo(drive) && (dev->version == 0x0063)) {
-        s = (sector_t *) malloc(sizeof(sector_t));
-        memset(s, 0, sizeof(sector_t));
+        s = (sector_t *) calloc(1, sizeof(sector_t));
         s->c     = id_buf[0];
         s->h     = id_buf[1];
         s->r     = id_buf[2];
@@ -2847,22 +2874,22 @@ d86f_construct_encoded_buffer(int drive, int side)
             /* Source image has surface description data, so we have some more handling to do. */
             src1_fuzm = src1[i] & src1_s[i];
             src2_fuzm = src2[i] & src2_s[i];
-            dst_fuzm  = src1_fuzm | src2_fuzm; /* The bits that remain set are fuzzy in either one or
-                                                                  the other or both. */
-            src1_holm = src1[i] | (src1_s[i] ^ 0xffff);
-            src2_holm = src2[i] | (src2_s[i] ^ 0xffff);
-            dst_holm  = (src1_holm & src2_holm) ^ 0xffff; /* The bits that remain set are holes in both. */
-            dst_neim  = (dst_fuzm | dst_holm) ^ 0xffff;   /* The bits that remain set are those that are neither
-                                                                     fuzzy nor are holes in both. */
+            dst_fuzm  = src1_fuzm | src2_fuzm;     /* The bits that remain set are fuzzy in either one or
+                                                      the other or both. */
+            src1_holm = ~src1[i] & src1_s[i];
+            src2_holm = ~src2[i] & src2_s[i];
+            dst_holm  = src1_holm & src2_holm;     /* The bits that remain set are holes in both. */
+            dst_neim  = ~(dst_fuzm | dst_holm);    /* The bits that remain set are those that are neither
+                                                      fuzzy nor are holes in both. */
             src1_d = src1[i] & dst_neim;
             src2_d = src2[i] & dst_neim;
 
-            dst_s[i] = (dst_neim ^ 0xffff); /* The set bits are those that are either fuzzy or are
-                                                                       holes in both. */
-            dst[i] = (src1_d | src2_d);     /* Initial data is remaining data from Source 1 and
-                                                       Source 2. */
-            dst[i] |= dst_fuzm;             /* Add to it the fuzzy bytes (holes have surface bit set
-                                                       but data bit clear). */
+            dst_s[i] = ~dst_neim;                  /* The set bits are those that are either fuzzy or are
+                                                      holes in both. */
+            dst[i] = (src1_d | src2_d);            /* Initial data is remaining data from Source 1 and
+                                                      Source 2. */
+            dst[i] |= dst_fuzm;                    /* Add to it the fuzzy bytes (holes have surface bit set
+                                                      but data bit clear). */
         } else {
             /* No surface data, the handling is much simpler - a simple OR. */
             dst[i]   = src1[i] | src2[i];
@@ -2880,6 +2907,7 @@ d86f_decompose_encoded_buffer(int drive, int side)
     uint16_t        temp2;
     uint32_t        len;
     const uint16_t *dst    = dev->track_encoded_data[side];
+    const uint16_t *dst_s  = dev->track_surface_data[side];
     uint16_t       *src1   = dev->thin_track_encoded_data[0][side];
     uint16_t       *src1_s = dev->thin_track_surface_data[0][side];
     uint16_t       *src2   = dev->thin_track_encoded_data[1][side];
@@ -2891,15 +2919,15 @@ d86f_decompose_encoded_buffer(int drive, int side)
         if (d86f_has_surface_desc(drive)) {
             /* Source image has surface description data, so we have some more handling to do.
                We need hole masks for both buffers. Holes have data bit clear and surface bit set. */
-            temp      = src1[i] & (src1_s[i] ^ 0xffff);
-            temp2     = src2[i] & (src2_s[i] ^ 0xffff);
-            src1[i]   = dst[i] & temp;
-            src1_s[i] = temp ^ 0xffff;
-            src2[i]   = dst[i] & temp2;
-            src2_s[i] = temp2 ^ 0xffff;
-        } else {
+            src1_s[i] = src2_s[i] = dst_s[i]; /* Write the new holes and weak bits. */
+            temp      = ~src1[i] & src1_s[i]; /* Bits that are clear in data and set in surface are holes. */
+            temp2     = ~src2[i] & src2_s[i]; /* Bits that are clear in data and set in surface are holes. */
+            src1[i]   = dst[i] & ~temp;       /* Make sure the holes' bits are cleared in the decomposed buffer. */
+            src1_s[i] |= temp;                /* Make sure the holes' bits are set in the decomposed surface. */
+            src2[i]   = dst[i] & ~temp2;      /* Make sure the holes' bits are cleared in the decomposed buffer. */
+            src2_s[i] |= temp2;               /* Make sure the holes' bits are set in the decomposed surface. */
+        } else
             src1[i] = src2[i] = dst[i];
-        }
     }
 }
 
@@ -3195,6 +3223,8 @@ d86f_writeback(int drive)
         free(dev->filebuf);
     }
 #endif
+
+    fflush(dev->fp);
 }
 
 void
@@ -3249,7 +3279,12 @@ d86f_readsector(int drive, int sector, int track, int side, int rate, int sector
     if (!ret)
         return;
 
-    if (sector == SECTOR_FIRST)
+    if (d86f_wrong_densel(drive)) {
+        dev->state = STATE_SECTOR_NOT_FOUND;
+
+        if (fdd_get_turbo(drive))
+            dev->track_pos = 0;
+    } else if (sector == SECTOR_FIRST)
         dev->state = STATE_02_SPIN_TO_INDEX;
     else if (sector == SECTOR_NEXT)
         dev->state = STATE_02_FIND_ID;
@@ -3274,7 +3309,13 @@ d86f_writesector(int drive, int sector, int track, int side, int rate, int secto
     if (!ret)
         return;
 
-    dev->state = fdc_is_deleted(d86f_fdc) ? STATE_09_FIND_ID : STATE_05_FIND_ID;
+    if (d86f_wrong_densel(drive)) {
+        dev->state = STATE_SECTOR_NOT_FOUND;
+
+        if (fdd_get_turbo(drive))
+            dev->track_pos = 0;
+    } else
+        dev->state = fdc_is_deleted(d86f_fdc) ? STATE_09_FIND_ID : STATE_05_FIND_ID;
 }
 
 void
@@ -3287,7 +3328,13 @@ d86f_comparesector(int drive, int sector, int track, int side, int rate, int sec
     if (!ret)
         return;
 
-    dev->state = STATE_11_FIND_ID;
+    if (d86f_wrong_densel(drive)) {
+        dev->state = STATE_SECTOR_NOT_FOUND;
+
+        if (fdd_get_turbo(drive))
+            dev->track_pos = 0;
+    } else
+        dev->state = STATE_11_FIND_ID;
 }
 
 void
@@ -3308,7 +3355,13 @@ d86f_readaddress(int drive, UNUSED(int side), UNUSED(int rate))
     dev->id_found                                                   = 0;
     dev->dma_over                                                   = 0;
 
-    dev->state = STATE_0A_FIND_ID;
+    if (d86f_wrong_densel(drive)) {
+        dev->state = STATE_SECTOR_NOT_FOUND;
+
+        if (fdd_get_turbo(drive))
+            dev->track_pos = 0;
+    } else
+        dev->state = STATE_0A_FIND_ID;
 }
 
 void
@@ -3410,7 +3463,13 @@ d86f_common_format(int drive, int side, UNUSED(int rate), uint8_t fill, int prox
     dev->index_count = dev->error_condition = dev->satisfying_bytes = dev->sector_count = 0;
     dev->dma_over                                                                       = 0;
 
-    dev->state = STATE_0D_SPIN_TO_INDEX;
+    if (d86f_wrong_densel(drive) && !proxy) {
+        dev->state = STATE_SECTOR_NOT_FOUND;
+
+        if (fdd_get_turbo(drive))
+            dev->track_pos = 0;
+    } else
+        dev->state = STATE_0D_SPIN_TO_INDEX;
 }
 
 void
@@ -3436,6 +3495,7 @@ d86f_common_handlers(int drive)
     drives[drive].poll          = d86f_poll;
     drives[drive].format        = d86f_proxy_format;
     drives[drive].stop          = d86f_stop;
+    drives[drive].hole          = d86f_hole;
 }
 
 int
@@ -3526,9 +3586,9 @@ d86f_load(int drive, char *fn)
         writeprot[drive] = 1;
     }
 
-    if (ui_writeprot[drive]) {
+    if (ui_writeprot[drive])
         writeprot[drive] = 1;
-    }
+
     fwriteprot[drive] = writeprot[drive];
 
     fseek(dev->fp, 0, SEEK_END);
@@ -3828,8 +3888,6 @@ d86f_load(int drive, char *fn)
 void
 d86f_init(void)
 {
-    setup_crc(0x1021);
-
     for (uint8_t i = 0; i < FDD_NUM; i++)
         d86f[i] = NULL;
 }
@@ -3887,13 +3945,14 @@ d86f_setup(int drive)
     d86f_t *dev;
 
     /* Allocate a drive structure. */
-    dev = (d86f_t *) malloc(sizeof(d86f_t));
-    memset(dev, 0x00, sizeof(d86f_t));
+    dev = (d86f_t *) calloc(1, sizeof(d86f_t));
     dev->state = STATE_IDLE;
 
     dev->last_side_sector[0] = NULL;
     dev->last_side_sector[1] = NULL;
 
+    crc16_setup(dev->crc_table, 0x1021);
+
     /* Set the drive as active. */
     d86f[drive] = dev;
 }
diff --git a/src/floppy/fdd_fdi.c b/src/floppy/fdd_fdi.c
index f14bf2cd4..97b6441a0 100644
--- a/src/floppy/fdd_fdi.c
+++ b/src/floppy/fdd_fdi.c
@@ -316,15 +316,13 @@ fdi_load(int drive, char *fn)
     writeprot[drive] = fwriteprot[drive] = 1;
 
     /* Allocate a drive block. */
-    dev = (fdi_t *) malloc(sizeof(fdi_t));
+    dev = (fdi_t *) calloc(1, sizeof(fdi_t));
 
     if (dev == NULL) {
         memset(floppyfns[drive], 0, sizeof(floppyfns[drive]));
         return;
     }
 
-    memset(dev, 0x00, sizeof(fdi_t));
-
     d86f_unregister(drive);
 
     dev->fp = plat_fopen(fn, "rb");
diff --git a/src/floppy/fdd_imd.c b/src/floppy/fdd_imd.c
index a5cd8f056..7994530ed 100644
--- a/src/floppy/fdd_imd.c
+++ b/src/floppy/fdd_imd.c
@@ -45,6 +45,7 @@ typedef struct imd_track_t {
     uint32_t gap3_len;
     uint16_t side_flags;
     uint8_t  max_sector_size;
+    uint8_t  spt;
 } imd_track_t;
 
 typedef struct imd_t {
@@ -548,6 +549,8 @@ imd_writeback(int drive)
             }
         }
     }
+
+    fflush(dev->fp);
 }
 
 static uint8_t
@@ -632,8 +635,7 @@ imd_load(int drive, char *fn)
     writeprot[drive] = 0;
 
     /* Allocate a drive block. */
-    dev = (imd_t *) malloc(sizeof(imd_t));
-    memset(dev, 0x00, sizeof(imd_t));
+    dev = (imd_t *) calloc(1, sizeof(imd_t));
 
     dev->fp = plat_fopen(fn, "rb+");
     if (dev->fp == NULL) {
@@ -711,6 +713,9 @@ imd_load(int drive, char *fn)
     imd[drive] = dev;
 
     while (1) {
+        imd_log("In : %02X %02X %02X %02X %02X\n",
+                buffer2[0], buffer2[1], buffer2[2], buffer2[3], buffer2[4]);
+
         track = buffer2[1];
         side  = buffer2[2];
         if (side & 1)
@@ -718,16 +723,20 @@ imd_load(int drive, char *fn)
         extra = side & 0xC0;
         side &= 0x3F;
 
+        track_spt   = buffer2[3];
+        dev->tracks[track][side].spt = track_spt;
+        sector_size = buffer2[4];
+
         dev->tracks[track][side].side_flags = (buffer2[0] % 3);
-        if (!dev->tracks[track][side].side_flags)
+        if ((track_spt != 0x00) && (!dev->tracks[track][side].side_flags))
             dev->disk_flags |= 0x02;
-        dev->tracks[track][side].side_flags |= (!(buffer2[0] - dev->tracks[track][side].side_flags) ? 0 : 8);
+        dev->tracks[track][side].side_flags |=
+            (!(buffer2[0] - dev->tracks[track][side].side_flags) ? 0 : 8);
         mfm         = dev->tracks[track][side].side_flags & 8;
         track_total = mfm ? 146 : 73;
         pre_sector  = mfm ? 60 : 42;
 
-        track_spt   = buffer2[3];
-        sector_size = buffer2[4];
+        imd_log("Out : %02X %02X %02X %02X %02X\n", buffer2[0], track, side, track_spt, sector_size);
         if ((track_spt == 15) && (sector_size == 2))
             dev->tracks[track][side].side_flags |= 0x20;
         if ((track_spt == 16) && (sector_size == 2))
@@ -744,7 +753,7 @@ imd_load(int drive, char *fn)
             dev->tracks[track][side].max_sector_size = 5;
         if (!mfm)
             dev->tracks[track][side].max_sector_size--;
-        imd_log("Side flags for (%02i)(%01i): %02X\n", track, side, dev->tracks[track][side].side_flags);
+        imd_log("Side flags for (%02i)(%01i): %02X\n", track, side, dev->tracks[track] [side].side_flags);
         dev->tracks[track][side].is_present = 1;
         dev->tracks[track][side].file_offs  = (buffer2 - buffer);
         memcpy(dev->tracks[track][side].params, buffer2, 5);
@@ -762,7 +771,6 @@ imd_load(int drive, char *fn)
         }
 
         if (track_spt == 0x00) {
-            dev->tracks[track][side].n_map_offs = last_offset;
             buffer2                             = buffer + last_offset;
             last_offset += track_spt;
             dev->tracks[track][side].is_present = 0;
@@ -872,7 +880,7 @@ imd_load(int drive, char *fn)
             }
 
             dev->tracks[track][side].gap3_len = (size_diff - minimum_gap4) / track_spt;
-        } else if ((track_spt == 0x00) || (gap3_sizes[converted_rate][sector_size][track_spt] != 0x00))
+        } else
             dev->tracks[track][side].gap3_len = gap3_sizes[converted_rate][sector_size][track_spt];
 
         /* imd_log("GAP3 length for (%02i)(%01i): %i bytes\n", track, side, dev->tracks[track][side].gap3_len); */
@@ -886,6 +894,32 @@ imd_load(int drive, char *fn)
 
     /* If more than 43 tracks, then the tracks are thin (96 tpi). */
     dev->track_count++;
+    imd_log("In : dev->track_count = %i\n", dev->track_count);
+
+    int empty_tracks = 0;
+    for (int i = 0; i < dev->track_count; i++) {
+        if ((dev->sides == 2) && (dev->tracks[i][0].spt == 0x00) && (dev->tracks[i][1].spt == 0x00))
+            empty_tracks++;
+        else if ((dev->sides == 1) && (dev->tracks[i][0].spt == 0x00))
+            empty_tracks++;
+    }
+    imd_log("empty_tracks = %i\n", empty_tracks);
+
+    if (empty_tracks >= (dev->track_count >> 1)) {
+        for (int i = 0; i < dev->track_count; i += 2) {
+            imd_log("Thick %02X = Thin %02X\n", i >> 1, i);
+            dev->tracks[i >> 1][0] = dev->tracks[i][0];
+            dev->tracks[i >> 1][1] = dev->tracks[i][1];
+        }
+        for (int i = (dev->track_count >> 1); i < dev->track_count; i++) {
+            imd_log("Emptying %02X....\n", i);
+            memset(&(dev->tracks[i][0]), 1, sizeof(imd_track_t));
+            memset(&(dev->tracks[i][1]), 1, sizeof(imd_track_t));
+        }
+        dev->track_count >>= 1;
+    }
+    imd_log("Out: dev->track_count = %i\n", dev->track_count);
+
     dev->track_width = 0;
     if (dev->track_count > 43)
         dev->track_width = 1;
diff --git a/src/floppy/fdd_img.c b/src/floppy/fdd_img.c
index 404cbf9fa..30e0212cd 100644
--- a/src/floppy/fdd_img.c
+++ b/src/floppy/fdd_img.c
@@ -431,6 +431,8 @@ write_back(int drive)
         if (fwrite(dev->track_data[side], 1, size, dev->fp) != size)
             fatal("IMG write_back(): Error writing data\n");
     }
+
+    fflush(dev->fp);
 }
 
 static uint16_t
@@ -679,8 +681,7 @@ img_load(int drive, char *fn)
     writeprot[drive] = 0;
 
     /* Allocate a drive block. */
-    dev = (img_t *) malloc(sizeof(img_t));
-    memset(dev, 0x00, sizeof(img_t));
+    dev = (img_t *) calloc(1, sizeof(img_t));
 
     dev->fp = plat_fopen(fn, "rb+");
     if (dev->fp == NULL) {
@@ -1073,9 +1074,14 @@ jump_if_fdf:
             dev->sectors = 19;
             dev->tracks  = 80;
         } else if (size <= 1638400) { /*HD 1024 sector*/
+#ifdef SYNTH_FORMAT
             dev->sectors     = 10;
-            dev->tracks      = 80;
             dev->sector_size = 3;
+#else
+            /* Prefer 20 512-byte sectors per track, used by the OpenStep 4.0 Pre-Release 1 boot disk. */
+            dev->sectors     = 20;
+#endif
+            dev->tracks      = 80;
         } else if (size <= 1720320) { /*DMF (Windows 95) */
             dev->sectors = 21;
             dev->tracks  = 80;
@@ -1086,9 +1092,14 @@ jump_if_fdf:
             dev->sectors = 21;
             dev->tracks  = 82;
         } else if (size <= 1802240) { /*HD 1024 sector*/
-            dev->sectors     = 22;
-            dev->tracks      = 80;
+#ifdef SYNTH_FORMAT
+            dev->sectors     = 11;
             dev->sector_size = 3;
+#else
+            /* Prefer 22 512-byte sectors per track. */
+            dev->sectors     = 22;
+#endif
+            dev->tracks      = 80;
         } else if (size == 1884160) { /*XDF (OS/2 Warp)*/
             dev->sectors = 23;
             dev->tracks  = 80;
@@ -1108,12 +1119,12 @@ jump_if_fdf:
             dev->sectors = 42;
             dev->tracks  = 80;
 #if 0
-        } else if (size <= 3440640) { /*HD 1024 sector*/
+        } else if (size <= 3440640) { /*ED 1024 sector*/
             dev->sectors = 21;
             dev->tracks = 80;
             dev->sector_size = 3;
 #endif
-        } else if (size <= 3604480) { /*HD 1024 sector*/
+        } else if (size <= 3604480) { /*ED 1024 sector*/
             dev->sectors     = 22;
             dev->tracks      = 80;
             dev->sector_size = 3;
diff --git a/src/floppy/fdd_json.c b/src/floppy/fdd_json.c
deleted file mode 100644
index 36a041a68..000000000
--- a/src/floppy/fdd_json.c
+++ /dev/null
@@ -1,704 +0,0 @@
-/*
- * VARCem   Virtual ARchaeological Computer EMulator.
- *          An emulator of (mostly) x86-based PC systems and devices,
- *          using the ISA,EISA,VLB,MCA  and PCI system buses, roughly
- *          spanning the era between 1981 and 1995.
- *
- *          Implementation of the PCjs JSON floppy image format.
- *
- *
- *
- * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
- *
- *          Copyright 2017-2019 Fred N. van Kempen.
- *
- *          Redistribution and  use  in source  and binary forms, with
- *          or  without modification, are permitted  provided that the
- *          following conditions are met:
- *
- *          1. Redistributions of  source  code must retain the entire
- *             above notice, this list of conditions and the following
- *             disclaimer.
- *
- *          2. Redistributions in binary form must reproduce the above
- *             copyright  notice,  this list  of  conditions  and  the
- *             following disclaimer in  the documentation and/or other
- *             materials provided with the distribution.
- *
- *          3. Neither the  name of the copyright holder nor the names
- *             of  its  contributors may be used to endorse or promote
- *             products  derived from  this  software without specific
- *             prior written permission.
- *
- * THIS SOFTWARE  IS  PROVIDED BY THE  COPYRIGHT  HOLDERS AND CONTRIBUTORS
- * "AS IS" AND  ANY EXPRESS  OR  IMPLIED  WARRANTIES,  INCLUDING, BUT  NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE  ARE  DISCLAIMED. IN  NO  EVENT  SHALL THE COPYRIGHT
- * HOLDER OR  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL  DAMAGES  (INCLUDING,  BUT  NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE  GOODS OR SERVICES;  LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  AND ON  ANY
- * THEORY OF  LIABILITY, WHETHER IN  CONTRACT, STRICT  LIABILITY, OR  TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include <86box/timer.h>
-#include <86box/plat.h>
-#include <86box/fdd.h>
-#include <86box/fdd_86f.h>
-#include <86box/fdc.h>
-#include <86box/fdd_common.h>
-#include <86box/fdd_json.h>
-
-#define NTRACKS  256
-#define NSIDES   2
-#define NSECTORS 256
-
-typedef struct sector_t {
-    uint8_t  track;  /* ID: track number */
-    uint8_t  side;   /*     side number */
-    uint8_t  sector; /*     sector number 1.. */
-    uint16_t size;   /* encoded size of sector */
-    uint8_t *data;   /* allocated data for it */
-} sector_t;
-
-typedef struct json_t {
-    FILE *fp;
-
-    /* Geometry. */
-    uint8_t tracks;               /* number of tracks */
-    uint8_t sides;                /* number of sides */
-    uint8_t sectors;              /* number of sectors per track */
-    uint8_t spt[NTRACKS][NSIDES]; /* number of sectors per track */
-
-    uint8_t track;          /* current track */
-    uint8_t side;           /* current side */
-    uint8_t sector[NSIDES]; /* current sector */
-
-    uint8_t dmf; /* disk is DMF format */
-    uint8_t interleave;
-#if 0
-    uint8_t    skew;
-#endif
-    uint8_t gap2_len;
-    uint8_t gap3_len;
-    int     track_width;
-
-    uint16_t disk_flags;  /* flags for the entire disk */
-    uint16_t track_flags; /* flags for the current track */
-
-    uint8_t interleave_ordered[NTRACKS][NSIDES];
-
-    sector_t sects[NTRACKS][NSIDES][NSECTORS];
-} json_t;
-
-static json_t *images[FDD_NUM];
-
-#define ENABLE_JSON_LOG 1
-#ifdef ENABLE_JSON_LOG
-int json_do_log = ENABLE_JSON_LOG;
-
-static void
-json_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (json_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define json_log(fmt, ...)
-#endif
-
-static void
-handle(json_t *dev, char *name, char *str)
-{
-    sector_t *sec = NULL;
-    uint32_t  l;
-    uint32_t pat;
-    uint8_t  *p;
-    char     *sp;
-    int       s;
-
-    /* Point to the currently selected sector. */
-    sec = &dev->sects[dev->track][dev->side][dev->dmf - 1];
-
-    /* If no name given, assume sector is done. */
-    if (name == NULL) {
-        /* If no buffer, assume one with 00's. */
-        if (sec->data == NULL) {
-            sec->data = (uint8_t *) malloc(sec->size);
-            memset(sec->data, 0x00, sec->size);
-        }
-
-        /* Encode the sector size. */
-        sec->size = fdd_sector_size_code(sec->size);
-
-        /* Set up the rest of the Sector ID. */
-        sec->track = dev->track;
-        sec->side  = dev->side;
-
-        return;
-    }
-
-    if (!strcmp(name, "sector")) {
-        sec->sector = atoi(str);
-        sec->size   = 512;
-    } else if (!strcmp(name, "length")) {
-        sec->size = atoi(str);
-    } else if (!strcmp(name, "pattern")) {
-        pat = atol(str);
-
-        if (sec->data == NULL)
-            sec->data = (uint8_t *) malloc(sec->size);
-        p = sec->data;
-        s = (sec->size / sizeof(uint32_t));
-        for (int i = 0; i < s; i++) {
-            l    = pat;
-            *p++ = (l & 0x000000ff);
-            l >>= 8;
-            *p++ = (l & 0x000000ff);
-            l >>= 8;
-            *p++ = (l & 0x000000ff);
-            l >>= 8;
-            *p++ = (l & 0x000000ff);
-        }
-    } else if (!strcmp(name, "data")) {
-        if (sec->data == NULL)
-            sec->data = (uint8_t *) malloc(sec->size);
-        p = sec->data;
-        while (str && *str) {
-            sp = strchr(str, ',');
-            if (sp != NULL)
-                *sp++ = '\0';
-            l = atol(str);
-
-            *p++ = (l & 0x000000ff);
-            l >>= 8;
-            *p++ = (l & 0x000000ff);
-            l >>= 8;
-            *p++ = (l & 0x000000ff);
-            l >>= 8;
-            *p++ = (l & 0x000000ff);
-
-            str = sp;
-        }
-    }
-}
-
-static int
-unexpect(int c, int state, int level)
-{
-    json_log("JSON: Unexpected '%c' in state %d/%d.\n", c, state, level);
-
-    return (-1);
-}
-
-static int
-load_image(json_t *dev)
-{
-    char  buff[4096];
-    char  name[32];
-    int   c;
-    int   state;
-    int   level;
-    char *ptr;
-
-    if (dev->fp == NULL) {
-        json_log("JSON: no file loaded!\n");
-        return 0;
-    }
-
-    /* Initialize. */
-    for (uint16_t i = 0; i < NTRACKS; i++) {
-        for (uint8_t j = 0; j < NSIDES; j++)
-            memset(dev->sects[i][j], 0x00, sizeof(sector_t));
-    }
-    dev->track = dev->side = dev->dmf = 0; /* "dmf" is "sector#" */
-
-    /* Now run the state machine. */
-    ptr   = NULL;
-    level = state = 0;
-    while (state >= 0) {
-        /* Get a character from the input. */
-        c = fgetc(dev->fp);
-        if ((c == EOF) || ferror(dev->fp)) {
-            state = -1;
-            break;
-        }
-
-        /* Process it. */
-        switch (state) {
-            case 0: /* read level header */
-                dev->dmf = 1;
-                if ((c != '[') && (c != '{') && (c != '\r') && (c != '\n')) {
-                    state = unexpect(c, state, level);
-                } else if (c == '[') {
-                    if (++level == 3)
-                        state++;
-                }
-                break;
-
-            case 1: /* read sector header */
-                if (c != '{')
-                    state = unexpect(c, state, level);
-                else
-                    state++;
-                break;
-
-            case 2: /* begin sector data name */
-                if (c != '\"') {
-                    state = unexpect(c, state, level);
-                } else {
-                    ptr = name;
-                    state++;
-                }
-                break;
-
-            case 3: /* read sector data name */
-                if (c == '\"') {
-                    *ptr = '\0';
-                    state++;
-                } else {
-                    *ptr++ = c;
-                }
-                break;
-
-            case 4: /* end of sector data name */
-                if (c != ':') {
-                    state = unexpect(c, state, level);
-                } else {
-                    ptr = buff;
-                    state++;
-                }
-                break;
-
-            case 5: /* read sector value data */
-                switch (c) {
-                    case ',':
-                    case '}':
-                        *ptr = '\0';
-                        handle(dev, name, buff);
-
-                        if (c == '}')
-                            state = 7; /* done */
-                        else
-                            state = 2; /* word */
-                        break;
-
-                    case '[':
-                        state++;
-                        break;
-
-                    default:
-                        *ptr++ = c;
-                }
-                break;
-
-            case 6: /* read sector data complex */
-                if (c != ']')
-                    *ptr++ = c;
-                else
-                    state = 5;
-                break;
-
-            case 7: /* sector done */
-                handle(dev, NULL, NULL);
-                switch (c) {
-                    case ',': /* next sector */
-                        dev->dmf++;
-                        state = 1;
-                        break;
-
-                    case ']': /* all sectors done */
-                        if (--level == 0)
-                            state = -1;
-                        else
-                            state++;
-                        break;
-
-                    default:
-                        state = unexpect(c, state, level);
-                }
-                break;
-
-            case 8: /* side done */
-                switch (c) {
-                    case ',': /* next side */
-                        state = 0;
-                        break;
-
-                    case ']': /* all sides done */
-                        if (--level == 0)
-                            state = -1;
-                        else
-                            state++;
-                        break;
-
-                    default:
-                        state = unexpect(c, state, level);
-                }
-                dev->spt[dev->track][dev->side] = dev->dmf;
-                dev->side++;
-                break;
-
-            case 9: /* track done */
-                switch (c) {
-                    case ',': /* next track */
-                        dev->side = 0;
-                        state     = 0;
-                        break;
-
-                    case ']': /* all tracks done */
-                        if (--level == 0)
-                            state = -1;
-                        else
-                            state++;
-                        break;
-
-                    default:
-                        state = unexpect(c, state, level);
-                }
-                dev->track++;
-                break;
-
-            default:
-                break;
-        }
-    }
-
-    /* Save derived values. */
-    dev->tracks = dev->track;
-    dev->sides  = dev->side;
-
-    return 1;
-}
-
-/* Seek the heads to a track, and prepare to read data from that track. */
-static void
-json_seek(int drive, int track)
-{
-    uint8_t id[4] = { 0, 0, 0, 0 };
-    json_t *dev   = images[drive];
-    int     rate;
-    int     gap2;
-    int     gap3;
-    int     pos;
-    int     ssize;
-    int     rsec;
-    int     asec;
-
-    if (dev->fp == NULL) {
-        json_log("JSON: seek: no file loaded!\n");
-        return;
-    }
-
-    /* Allow for doublestepping tracks. */
-    if (!dev->track_width && fdd_doublestep_40(drive))
-        track /= 2;
-
-    /* Set the new track. */
-    dev->track = track;
-    d86f_set_cur_track(drive, track);
-
-    /* Reset the 86F state machine. */
-    d86f_reset_index_hole_pos(drive, 0);
-    d86f_destroy_linked_lists(drive, 0);
-    d86f_reset_index_hole_pos(drive, 1);
-    d86f_destroy_linked_lists(drive, 1);
-
-    if (track > dev->tracks) {
-        d86f_zero_track(drive);
-        return;
-    }
-
-    for (uint8_t side = 0; side < dev->sides; side++) {
-        /* Get transfer rate for this side. */
-        rate = dev->track_flags & 0x07;
-        if (!rate && (dev->track_flags & 0x20))
-            rate = 4;
-
-        /* Get correct GAP3 value for this side. */
-        gap3 = fdd_get_gap3_size(rate,
-                                 dev->sects[track][side][0].size,
-                                 dev->spt[track][side]);
-
-        /* Get correct GAP2 value for this side. */
-        gap2 = ((dev->track_flags & 0x07) >= 3) ? 41 : 22;
-
-        pos = d86f_prepare_pretrack(drive, side, 0);
-
-        for (uint8_t sector = 0; sector < dev->spt[track][side]; sector++) {
-            rsec = dev->sects[track][side][sector].sector;
-            asec = sector;
-
-            id[0] = track;
-            id[1] = side;
-            id[2] = rsec;
-            if (dev->sects[track][side][asec].size > 255)
-                perror("fdd_json.c: json_seek: sector size too big.");
-            id[3] = dev->sects[track][side][asec].size & 0xff;
-            ssize = fdd_sector_code_size(dev->sects[track][side][asec].size & 0xff);
-
-            pos = d86f_prepare_sector(
-                drive, side, pos, id,
-                dev->sects[track][side][asec].data,
-                ssize, gap2, gap3,
-                0 /*flags*/
-            );
-
-            if (sector == 0)
-                d86f_initialize_last_sector_id(drive, id[0], id[1], id[2], id[3]);
-        }
-    }
-}
-
-static uint16_t
-disk_flags(int drive)
-{
-    const json_t *dev = images[drive];
-
-    return (dev->disk_flags);
-}
-
-static uint16_t
-track_flags(int drive)
-{
-    const json_t *dev = images[drive];
-
-    return (dev->track_flags);
-}
-
-static void
-set_sector(int drive, int side, uint8_t c, uint8_t h, uint8_t r, uint8_t n)
-{
-    json_t *dev = images[drive];
-
-    dev->sector[side] = 0;
-
-    /* Make sure we are on the desired track. */
-    if (c != dev->track)
-        return;
-
-    /* Set the desired side. */
-    dev->side = side;
-
-    /* Now loop over all sector ID's on this side to find our sector. */
-    for (uint8_t i = 0; i < dev->spt[c][side]; i++) {
-        if ((dev->sects[dev->track][side][i].track == c) && (dev->sects[dev->track][side][i].side == h) && (dev->sects[dev->track][side][i].sector == r) && (dev->sects[dev->track][side][i].size == n)) {
-            dev->sector[side] = i;
-        }
-    }
-}
-
-static uint8_t
-poll_read_data(int drive, int side, uint16_t pos)
-{
-    const json_t *dev = images[drive];
-    uint8_t       sec = dev->sector[side];
-
-    return (dev->sects[dev->track][side][sec].data[pos]);
-}
-
-void
-json_init(void)
-{
-    memset(images, 0x00, sizeof(images));
-}
-
-void
-json_load(int drive, char *fn)
-{
-    double          bit_rate;
-    int             temp_rate;
-    const sector_t *sec;
-    json_t         *dev;
-
-    /* Just in case- remove ourselves from 86F. */
-    d86f_unregister(drive);
-
-    /* Allocate a drive block. */
-    dev = (json_t *) malloc(sizeof(json_t));
-    memset(dev, 0x00, sizeof(json_t));
-
-    /* Open the image file. */
-    dev->fp = plat_fopen(fn, "rb");
-    if (dev->fp == NULL) {
-        free(dev);
-        memset(fn, 0x00, sizeof(char));
-        return;
-    }
-
-    /* Our images are always RO. */
-    writeprot[drive] = 1;
-
-    /* Set up the drive unit. */
-    images[drive] = dev;
-
-    /* Load all sectors from the image file. */
-    if (!load_image(dev)) {
-        json_log("JSON: failed to initialize\n");
-        (void) fclose(dev->fp);
-        free(dev);
-        images[drive] = NULL;
-        memset(fn, 0x00, sizeof(char));
-        return;
-    }
-
-    json_log("JSON(%d): %s (%i tracks, %i sides, %i sectors)\n",
-             drive, fn, dev->tracks, dev->sides, dev->spt[0][0]);
-
-    /*
-     * If the image has more than 43 tracks, then
-     * the tracks are thin (96 tpi).
-     */
-    dev->track_width = (dev->tracks > 43) ? 1 : 0;
-
-    /* If the image has 2 sides, mark it as such. */
-    dev->disk_flags = 0x00;
-    if (dev->sides == 2)
-        dev->disk_flags |= 0x08;
-
-    /* JSON files are always assumed to be MFM-encoded. */
-    dev->track_flags = 0x08;
-
-    dev->interleave = 0;
-#if 0
-    dev->skew = 0;
-#endif
-
-    temp_rate = 0xff;
-    sec       = &dev->sects[0][0][0];
-    for (uint8_t i = 0; i < 6; i++) {
-        if (dev->spt[0][0] > fdd_max_sectors[sec->size][i])
-            continue;
-
-        bit_rate  = fdd_bit_rates_300[i];
-        temp_rate = fdd_rates[i];
-        dev->disk_flags |= (fdd_holes[i] << 1);
-
-        if ((bit_rate == 500.0) && (dev->spt[0][0] == 21) && (sec->size == 2) && (dev->tracks >= 80) && (dev->tracks <= 82) && (dev->sides == 2)) {
-            /*
-             * This is a DMF floppy, set the flag so
-             * we know to interleave the sectors.
-             */
-            dev->dmf = 1;
-        } else {
-            if ((bit_rate == 500.0) && (dev->spt[0][0] == 22) && (sec->size == 2) && (dev->tracks >= 80) && (dev->tracks <= 82) && (dev->sides == 2)) {
-                /*
-                 * This is marked specially because of the
-                 * track flag (a RPM slow down is needed).
-                 */
-                dev->interleave = 2;
-            }
-
-            dev->dmf = 0;
-        }
-
-        break;
-    }
-
-    if (temp_rate == 0xff) {
-        json_log("JSON: invalid image (temp_rate=0xff)\n");
-        (void) fclose(dev->fp);
-        dev->fp = NULL;
-        free(dev);
-        images[drive] = NULL;
-        memset(fn, 0x00, sizeof(char));
-        return;
-    }
-
-    if (dev->interleave == 2) {
-        dev->interleave = 1;
-        dev->disk_flags |= 0x60;
-    }
-
-    dev->gap2_len = (temp_rate == 3) ? 41 : 22;
-    if (dev->dmf)
-        dev->gap3_len = 8;
-    else
-        dev->gap3_len = fdd_get_gap3_size(temp_rate, sec->size, dev->spt[0][0]);
-
-    if (!dev->gap3_len) {
-        json_log("JSON: image of unknown format was inserted into drive %c:!\n",
-                 'C' + drive);
-        (void) fclose(dev->fp);
-        dev->fp = NULL;
-        free(dev);
-        images[drive] = NULL;
-        memset(fn, 0x00, sizeof(char));
-        return;
-    }
-
-    dev->track_flags |= (temp_rate & 0x03); /* data rate */
-    if (temp_rate & 0x04)
-        dev->track_flags |= 0x20; /* RPM */
-
-    json_log("      disk_flags: 0x%02x, track_flags: 0x%02x, GAP3 length: %i\n",
-             dev->disk_flags, dev->track_flags, dev->gap3_len);
-    json_log("      bit rate 300: %.2f, temporary rate: %i, hole: %i, DMF: %i\n",
-             bit_rate, temp_rate, (dev->disk_flags >> 1), dev->dmf);
-
-    /* Set up handlers for 86F layer. */
-    d86f_handler[drive].disk_flags        = disk_flags;
-    d86f_handler[drive].side_flags        = track_flags;
-    d86f_handler[drive].writeback         = null_writeback;
-    d86f_handler[drive].set_sector        = set_sector;
-    d86f_handler[drive].read_data         = poll_read_data;
-    d86f_handler[drive].write_data        = null_write_data;
-    d86f_handler[drive].format_conditions = null_format_conditions;
-    d86f_handler[drive].extra_bit_cells   = null_extra_bit_cells;
-    d86f_handler[drive].encoded_data      = common_encoded_data;
-    d86f_handler[drive].read_revolution   = common_read_revolution;
-    d86f_handler[drive].index_hole_pos    = null_index_hole_pos;
-    d86f_handler[drive].get_raw_size      = common_get_raw_size;
-    d86f_handler[drive].check_crc         = 1;
-    d86f_set_version(drive, 0x0063);
-
-    d86f_common_handlers(drive);
-
-    drives[drive].seek = json_seek;
-}
-
-/* Close the image. */
-void
-json_close(int drive)
-{
-    json_t *dev = images[drive];
-
-    if (dev == NULL)
-        return;
-
-    /* Unlink image from the system. */
-    d86f_unregister(drive);
-
-    /* Release all the sector buffers. */
-    for (uint16_t t = 0; t < 256; t++) {
-        for (uint8_t h = 0; h < 2; h++) {
-            memset(dev->sects[t][h], 0x00, sizeof(sector_t));
-            for (uint16_t s = 0; s < 256; s++) {
-                if (dev->sects[t][h][s].data != NULL)
-                    free(dev->sects[t][h][s].data);
-                dev->sects[t][h][s].data = NULL;
-            }
-        }
-    }
-
-    if (dev->fp != NULL)
-        (void) fclose(dev->fp);
-
-    /* Release the memory. */
-    free(dev);
-    images[drive] = NULL;
-}
diff --git a/src/floppy/fdd_mfm.c b/src/floppy/fdd_mfm.c
index b4c859d5d..87da4e08b 100644
--- a/src/floppy/fdd_mfm.c
+++ b/src/floppy/fdd_mfm.c
@@ -396,8 +396,7 @@ mfm_load(int drive, char *fn)
     writeprot[drive] = fwriteprot[drive] = 1;
 
     /* Allocate a drive block. */
-    dev = (mfm_t *) malloc(sizeof(mfm_t));
-    memset(dev, 0x00, sizeof(mfm_t));
+    dev = (mfm_t *) calloc(1, sizeof(mfm_t));
 
     dev->fp = plat_fopen(fn, "rb");
     if (dev->fp == NULL) {
@@ -454,9 +453,12 @@ mfm_load(int drive, char *fn)
         dev->br_rounded = (int) dbr;
         mfm_log("Rounded bit rate: %i kbps\n", dev->br_rounded);
 
-        dbr              = round(((double) dev->hdr.rpm) / 60.0) * 60.0;
+        if (dev->hdr.rpm != 0)
+            dbr              = round(((double) dev->hdr.rpm) / 60.0) * 60.0;
+        else
+            dbr              = (dev->br_rounded == 300) ? 360.0 : 300.0;
         dev->rpm_rounded = (int) dbr;
-        mfm_log("Rounded RPM: %i kbps\n", dev->rpm_rounded);
+        mfm_log("Rounded RPM: %i rpm\n", dev->rpm_rounded);
     }
 
     /* Set up the drive unit. */
diff --git a/src/floppy/fdd_pcjs.c b/src/floppy/fdd_pcjs.c
new file mode 100644
index 000000000..6f69042b0
--- /dev/null
+++ b/src/floppy/fdd_pcjs.c
@@ -0,0 +1,796 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the pcjs v2 floppy image format (read-only)
+ *
+ * Authors: cold-brewed
+ *
+ *          Copyright 2024 cold-brewed
+ */
+
+
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#ifndef _MSC_VER
+#include <unistd.h>
+#else
+#include <io.h>
+#endif
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/timer.h>
+#include <86box/plat.h>
+#include <86box/fdd.h>
+#include <86box/fdd_86f.h>
+#include <86box/fdd_common.h>
+#include <86box/fdd_pcjs.h>
+#include <cJSON.h>
+
+static pcjs_t *images[FDD_NUM];
+static pcjs_error_t pcjs_error = E_SUCCESS;
+
+struct pcjs_error_description {
+    int code;
+    const char *message;
+} pcjs_error_description[] = {
+    { E_SUCCESS,          "No error"                               },
+    { E_MISSING_KEY,      "The requested key was missing"          },
+    { E_UNEXPECTED_VALUE, "The value was not of the expected type" },
+    { E_INTEGRITY,        "Integrity check failed"                 },
+    { E_INVALID_OBJECT,   "Object is missing or invalid"           },
+    { E_ALLOC,            "Memory allocation failure"              },
+    { E_PARSE,            "Parsing failure"                        },
+    { -1,                 "Unknown error"                          },
+};
+
+#ifdef ENABLE_PCJS_LOG
+int pcjs_do_log = ENABLE_PCJS_LOG;
+static void
+pcjs_log(const char *fmt, ...)
+{
+    if (pcjs_do_log) {
+        va_list ap;
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define pcjs_log(fmt, ...)
+#endif
+
+void
+pcjs_init(void)
+{
+    memset(images, 0x00, sizeof(images));
+}
+
+const char* pcjs_errmsg(void)
+{
+    int i = 0;
+    while (pcjs_error_description[i].code >= 0) {
+        if (pcjs_error_description[i].code == pcjs_error) {
+            return pcjs_error_description[i].message;
+        }
+        i++;
+    }
+    return "Unknown error";
+}
+
+int parse_image_info(pcjs_t *dev, const cJSON *parsed_json)
+{
+    const cJSON *imageInfo = NULL;
+
+    if(dev == NULL || parsed_json == NULL) {
+        pcjs_log("Null values passed\n");
+        pcjs_error = E_INTEGRITY;
+        return 1;
+    }
+
+    imageInfo = cJSON_GetObjectItemCaseSensitive(parsed_json, "imageInfo");
+
+    if (imageInfo == NULL || !cJSON_IsObject(imageInfo)) {
+        pcjs_log("imageInfo object does not exist or is invalid\n");
+        pcjs_error = E_INVALID_OBJECT;
+        return 1;
+    }
+
+    /* Macros are used here to avoid repetition */
+    /* First get strings */
+    IMAGE_INFO_GET_STRING(type)
+    IMAGE_INFO_GET_STRING(name)
+    IMAGE_INFO_GET_STRING(format)
+    IMAGE_INFO_GET_STRING(hash)
+    IMAGE_INFO_GET_STRING(version)
+    IMAGE_INFO_GET_STRING(repository)
+    /* Then the numbers */
+    IMAGE_INFO_GET_NUMBER(cylinders)
+    IMAGE_INFO_GET_NUMBER(heads)
+    IMAGE_INFO_GET_NUMBER(trackDefault)
+    IMAGE_INFO_GET_NUMBER(sectorDefault)
+    IMAGE_INFO_GET_NUMBER(diskSize)
+
+    /* Special cases */
+    /* Convert bootSector to array if it exists */
+    /* For some reason the array itself is stored as a string
+     * which needs to be converted into an array before parsing. */
+    dev->image_info.boot_sector_array_size = 0;
+    const cJSON *array_string = cJSON_GetObjectItemCaseSensitive(imageInfo, "bootSector");
+    cJSON *bootSector = NULL;
+    if(cJSON_IsString(array_string) && array_string != NULL) {
+        bootSector = cJSON_Parse(array_string->valuestring);
+    }
+    if(cJSON_IsArray(bootSector)) {
+        const int array_size = cJSON_GetArraySize(bootSector);
+        dev->image_info.boot_sector_array_size = array_size;
+        const cJSON *array_item = NULL;
+        int array_index = 0;
+        cJSON_ArrayForEach(array_item, bootSector)
+        {
+            /* Make sure each item is a number */
+            if(!cJSON_IsNumber(array_item)) {
+                pcjs_log("Non-number item in bootSector array\n");
+                dev->image_info.boot_sector_array_size = 0;
+                /* Prevent the loop from continuing */
+                array_item = NULL;
+                break;
+            }
+            /* Make sure each number is in range */
+            const int value = array_item->valueint;
+            if (value < 0 || value > 255) {
+                pcjs_log("bootSector value %i out of range (0-255)\n", value);
+                dev->image_info.boot_sector_array_size = 0;
+                /* Prevent the loop from continuing */
+                array_item = NULL;
+                break;
+            }
+            /* Make sure we don't exceed the array length */
+            if (array_index + 1 > PCJS_IMAGE_INFO_ARRAY_LEN) {
+                pcjs_log("bootSector array length exceeded (max %i)\n", PCJS_IMAGE_INFO_ARRAY_LEN);
+                dev->image_info.boot_sector_array_size = 0;
+                /* Prevent the loop from continuing */
+                array_item = NULL;
+                break;
+            }
+            dev->image_info.boot_sector[array_index] = value;
+            array_index++;
+        }
+    }
+
+    /* checksum: Can't use the number macro like the others because it uses valueInt
+     * which is 32-bit signed and we need unsigned. Use the double value (valuedouble) instead. */
+    const cJSON *checksum_json = cJSON_GetObjectItemCaseSensitive(imageInfo, "checksum");
+    if (cJSON_IsNumber(checksum_json)) {
+        dev->image_info.checksum = checksum_json->valuedouble;
+    } else {
+        pcjs_log("Required number value for \"%s\" missing from imageInfo\n", "checksum");
+        pcjs_error = E_MISSING_KEY;
+        cJSON_Delete(bootSector);
+        return 1;
+    }
+
+    /* Use the metadata as the official source */
+    dev->total_tracks  = dev->image_info.cylinders;
+    dev->total_sides   = dev->image_info.heads;
+    dev->total_sectors = dev->image_info.trackDefault;
+    cJSON_Delete(bootSector);
+    return 0;
+}
+
+int parse_file_table(pcjs_t *dev, const cJSON *parsed_json)
+{
+    const cJSON *fileTable = NULL;
+
+    if(dev == NULL || parsed_json == NULL) {
+        pcjs_log("Null values passed\n");
+        pcjs_error = E_INTEGRITY;
+        return 1;
+    }
+
+    fileTable = cJSON_GetObjectItemCaseSensitive(parsed_json, "fileTable");
+
+    if (fileTable == NULL || !cJSON_IsArray(fileTable)) {
+        pcjs_log("fileTable object does not exist or is invalid\n");
+        pcjs_error = E_INVALID_OBJECT;
+        return 1;
+    }
+
+    const cJSON *each_file_table = NULL;
+    dev->file_table.num_entries  = cJSON_GetArraySize(fileTable);
+    uint16_t processed_entries   = 0;
+    uint16_t current_entry       = 0;
+
+    if (dev->file_table.num_entries == 0) {
+        pcjs_log("No fileTable entries to process\n");
+        return 0;
+    }
+
+    pcjs_log("Processing %i file table entries\n", dev->file_table.num_entries);
+
+    /* Allocate the entries */
+    dev->file_table.entries = (pcjs_file_table_entry_t *)calloc(dev->file_table.num_entries, sizeof(pcjs_file_table_entry_t));
+    if (dev->file_table.entries == NULL ) {
+        pcjs_log("Failed to allocate file table entries\n");
+        pcjs_error = E_ALLOC;
+        return 1;
+    }
+
+    cJSON_ArrayForEach(each_file_table, fileTable)
+    {
+        /* The -1 length of the temporary buffer brought to you by gcc's -Wstringop-truncation */
+        char hash[PCJS_FILE_TABLE_STRING_LEN-1] = {0};
+        char path[PCJS_FILE_TABLE_STRING_LEN-1] = {0};
+        char attr[PCJS_FILE_TABLE_STRING_LEN-1] = {0};
+        char date[PCJS_FILE_TABLE_STRING_LEN-1] = {0};
+        uint16_t f_size = 0;
+
+        JSON_GET_OBJECT_STRING_OPTIONAL(hash, each_file_table,   PCJS_OBJECT_KEY_FT_HASH)
+        JSON_GET_OBJECT_STRING_OPTIONAL(path, each_file_table,   PCJS_OBJECT_KEY_FT_PATH)
+        JSON_GET_OBJECT_STRING_REQUIRED(attr, each_file_table,   PCJS_OBJECT_KEY_FT_ATTR)
+        JSON_GET_OBJECT_STRING_REQUIRED(date, each_file_table,   PCJS_OBJECT_KEY_FT_DATE)
+        JSON_GET_OBJECT_NUMBER_OPTIONAL(f_size, each_file_table, PCJS_OBJECT_KEY_FT_SIZE)
+
+        strncpy(dev->file_table.entries[current_entry].hash,  hash, sizeof(dev->file_table.entries[current_entry].hash) - 1);
+        strncpy(dev->file_table.entries[current_entry].path,  path, sizeof(dev->file_table.entries[current_entry].path) - 1);
+        strncpy(dev->file_table.entries[current_entry].attr,  attr, sizeof(dev->file_table.entries[current_entry].attr) - 1);
+        strncpy(dev->file_table.entries[current_entry].date,  date, sizeof(dev->file_table.entries[current_entry].date) - 1);
+        dev->file_table.entries[current_entry].size = f_size;
+
+        processed_entries++;
+        current_entry++;
+
+    }
+
+    if(processed_entries != dev->file_table.num_entries) {
+        pcjs_log("fileTable entries processed (%i) inconsistent with number of entries in the table (%i)\n", processed_entries, dev->file_table.num_entries);
+        pcjs_error = E_INTEGRITY;
+        goto fail;
+    }
+
+    return 0;
+fail:
+    /* Deallocate the array */
+    free(dev->file_table.entries);
+    return 1;
+}
+
+int json_parse(pcjs_t *dev)
+{
+    const cJSON *diskData = NULL;
+
+    /* Determine the size of the file, reset back */
+    fseek(dev->fp, 0L, SEEK_END);
+    const long numbytes = ftell(dev->fp);
+    fseek(dev->fp, 0L, SEEK_SET);
+
+    /* Allocate memory for the contents */
+    char *buffer = calloc(numbytes + 1, sizeof(char));
+    if(buffer == NULL) {
+        pcjs_error = E_ALLOC;
+        return 1;
+    }
+
+    /* Read and null terminate */
+    (void) !fread(buffer, sizeof(char), numbytes, dev->fp);
+    buffer[numbytes] = '\0';
+
+    cJSON *parsed_json = cJSON_Parse(buffer);
+
+    if (parsed_json == NULL)
+    {
+        const char *error_ptr = cJSON_GetErrorPtr();
+        if (error_ptr != NULL) {
+            fprintf(stderr, "Error parsing json before: %s\n", error_ptr);
+        }
+        pcjs_error = E_PARSE;
+        goto fail;
+    }
+
+    if(parse_image_info(dev, parsed_json)) {
+        pcjs_log("Failed to parse imageInfo metadata\n");
+        goto fail;
+    }
+
+    /* File table metadata is optional */
+    if(parse_file_table(dev, parsed_json)) {
+        pcjs_log("File table metadata is not present or invalid\n");
+    }
+
+    diskData = cJSON_GetObjectItemCaseSensitive(parsed_json, "diskData");
+
+    const cJSON *each_track = NULL;
+    int total_c = 0;
+
+    /* The diskData array is essentially [c][h][s] */
+    /* Start with the tracks in [c] */
+    cJSON_ArrayForEach(each_track, diskData)
+    {
+        int total_heads = 0;
+        const cJSON *each_head = NULL;
+
+        /* For each track, loop on each head */
+        /* Now in [c][h] */
+        cJSON_ArrayForEach(each_head, each_track)
+        {
+            int total_sectors = 0;
+            const cJSON *each_sector = NULL;
+
+            /* Now loop on the sectors in [c][h][s] */
+            /* Each sector item will have the information needed to fill in a pcjs_sector_t */
+            cJSON_ArrayForEach(each_sector, each_head)
+            {
+                const cJSON *data            = NULL;
+                const cJSON *each_data       = NULL;
+                int          data_array_size = 0;
+                int          total_d         = 0;
+                int32_t      current_track   = 0;
+                int32_t      current_head    = 0;
+                int32_t      current_sector  = 0;
+                int32_t      current_length  = 0;
+                int32_t      file_mapping    = 0;
+                int32_t      offset          = 0;
+                pcjs_sector_t *sector = NULL;
+
+                /* Macros to keep things tidy */
+                JSON_GET_OBJECT_NUMBER_REQUIRED(current_track,          each_sector, PCJS_OBJECT_KEY_TRACK)
+                JSON_GET_OBJECT_NUMBER_REQUIRED(current_head,           each_sector, PCJS_OBJECT_KEY_HEAD)
+                JSON_GET_OBJECT_NUMBER_REQUIRED(current_sector,         each_sector, PCJS_OBJECT_KEY_SECTOR)
+                JSON_GET_OBJECT_NUMBER_REQUIRED(current_length,         each_sector, PCJS_OBJECT_KEY_LENGTH)
+                JSON_GET_OBJECT_NUMBER_OPTIONAL_DEFAULT(offset,         each_sector, PCJS_OBJECT_KEY_OFFSET, -1)
+                JSON_GET_OBJECT_NUMBER_OPTIONAL_DEFAULT(file_mapping,   each_sector, PCJS_OBJECT_KEY_FILE,   -1)
+
+                /* NOTE: The sectors array is zero indexed, but the metadata for each sector shows its conventional sector number */
+                sector = &dev->sectors[current_track][current_head][current_sector-1];
+
+                if (sector->data == NULL ) {
+                    /* We could verify the sector size against the metadata here */
+                    sector->data = (uint8_t *)calloc(1, current_length);
+                    if (sector->data == NULL ) {
+                        pcjs_log("Failed to allocate\n");
+                        pcjs_error = E_ALLOC;
+                        goto fail;
+                    }
+                }
+                sector->track          = current_track;
+                sector->side           = current_head;
+                sector->sector         = current_sector;
+                sector->size           = current_length;
+                sector->encoded_size   = fdd_sector_size_code(current_length);
+                sector->offset         = offset;
+                sector->file           = file_mapping;
+                sector->pattern_repeat = 0;
+                sector->last_entry     = 0;
+
+                data = cJSON_GetObjectItemCaseSensitive(each_sector, PCJS_OBJECT_KEY_DATA);
+                if(data != NULL && cJSON_IsArray(data)) {
+                    data_array_size = cJSON_GetArraySize(data);
+                    cJSON_ArrayForEach(each_data, data)
+                    {
+                        /* total_d is our current position in the data array */
+                        /* That number will be used to determine where to store the
+                         * value in its destination (sector->data).
+                         * Each value in the data array is a 32-bit integer, but the
+                         * destination (sector->data) is a uint8_t array. Therefore
+                         * we'll need to manually calculate offsets and place the bytes.
+                         */
+                        const int dest_offset = total_d * 4;
+                        if(total_d == data_array_size - 1) {
+                            /* This is the last value in the data array. Check to see if we'll need it
+                             * for the repeating pattern.
+                             * We use current_length / 4 because each data element is 32 bits in size.
+                             * For example, if current_length = 512
+                             * then 512 / 4 = 128
+                             * so anything less than that value will have padding */
+                            if (total_d + 1 < current_length / 4) {
+                                sector->last_entry = each_data->valueint;
+                                /* total_d + 1 because it is zero indexed at this point */
+                                sector->pattern_repeat = current_length / 4 - (total_d + 1);
+                            }
+                        }
+                        const int value = each_data->valueint;
+                        /* Take each value and shift in as necessary */
+                        for (int i = 0; i < 4; i++) {
+                            sector->data[dest_offset + i] = (value >> i * 8) & 0xff;
+                        }
+                        total_d++;
+                    }
+                } else {
+                    pcjs_log("Data array missing from [%d][%d][%d]", current_track, current_head, current_sector);
+                    pcjs_error = E_MISSING_KEY;
+                    goto fail;
+                }
+                /* Fill in the repeating pattern if needed */
+                /* total_d was already advanced at the end of the previous loop */
+                for (int i = 0; i < sector->pattern_repeat; i++ ) {
+                    const int position = total_d + i;
+                    const int dest_offset = position * 4;
+                    if(position >= (sector->size / 4)) {
+                        /* Something is wrong */
+                        pcjs_log("Out of bounds write attempt to data array at %i", position);
+                        pcjs_error = E_INTEGRITY;
+                        goto fail;
+                    }
+                    for (int j = 0; j < 4; j++) {
+                        sector->data[dest_offset + j] = (sector->last_entry >> j * 8) & 0xff;
+                    }
+                }
+
+                total_sectors++;
+                dev->calc_total_sectors = total_sectors;
+                /* End sectors */
+            }
+            dev->spt[total_c][total_heads] = total_sectors;
+            total_heads++;
+            dev->calc_total_sides = total_heads;
+            /* End heads */
+        }
+        total_c++;
+        dev->calc_total_tracks = total_c;
+        /* End tracks */
+    }
+
+    pcjs_log("calculated totals: c/h/s %i/%i/%i\n", dev->calc_total_tracks, dev->calc_total_sides, dev->calc_total_sectors);
+    pcjs_log("metadata totals:   c/h/s %i/%i/%i\n", dev->image_info.cylinders, dev->image_info.heads, dev->image_info.trackDefault);
+
+    free(buffer);
+    cJSON_Delete(parsed_json);
+    return 0;
+fail:
+    free(buffer);
+    cJSON_Delete(parsed_json);
+    return pcjs_error;
+}
+
+/* Handlers */
+
+static uint16_t
+disk_flags(int drive)
+{
+    const pcjs_t *dev = images[drive];
+
+    return dev->disk_flags;
+}
+
+static uint16_t
+track_flags(int drive)
+{
+    const pcjs_t *dev = images[drive];
+
+    return dev->track_flags;
+}
+
+static void
+set_sector(int drive, int side, uint8_t c, UNUSED(uint8_t h), uint8_t r, UNUSED(uint8_t n))
+{
+    pcjs_t *dev = images[drive];
+
+    dev->current_sector[side] = 0;
+
+    /* Make sure we are on the desired track. */
+    if (c != dev->current_track)
+        return;
+
+    /* Set the desired side. */
+    dev->current_side = side;
+
+    /* Sectors are stored zero indexed, but sector zero should not be requested */
+    if(r == 0) {
+        pcjs_log("set_sector: Sector 0 requested?\n");
+    } else {
+        dev->current_sector[side] = r - 1;
+    }
+    /* The ifdef is necessary because if ENABLE_PCJS_LOG is not defined gcc throws an unused variable warning */
+#ifdef ENABLE_PCJS_LOG
+    const int file_index = dev->sectors[dev->current_track][side][dev->current_sector[side]].file;
+    pcjs_log("set sector: %i/%i/%i %s%s%s\n", c, h, r,
+        file_index == -1 ? "" : "(",
+        file_index == -1 ? "" : dev->file_table.entries[file_index].path,
+        file_index == -1 ? "" : ")");
+#endif
+}
+
+static uint8_t
+poll_read_data(int drive, int side, uint16_t pos)
+{
+    const pcjs_t *dev = images[drive];
+    const uint8_t sec = dev->current_sector[side];
+    return (dev->sectors[dev->current_track][side][sec].data[pos]);
+}
+
+static void
+pcjs_seek(int drive, int track)
+{
+    uint8_t id[4] = { 0, 0, 0, 0 };
+    pcjs_t *dev   = images[drive];
+    int     rate;
+    int     gap2;
+    int     gap3;
+    int     pos;
+    int     ssize;
+    int     rsec;
+    int     asec;
+
+    if (dev->fp == NULL) {
+        pcjs_log("pcjs_seek: no file loaded\n");
+        return;
+    }
+
+    /* Allow for doublestepping tracks. */
+    if (!dev->track_width && fdd_doublestep_40(drive))
+        track /= 2;
+
+    /* Set the new track. */
+    dev->current_track = track;
+    d86f_set_cur_track(drive, track);
+
+    /* Reset the 86F state machine. */
+    d86f_reset_index_hole_pos(drive, 0);
+    d86f_destroy_linked_lists(drive, 0);
+    d86f_reset_index_hole_pos(drive, 1);
+    d86f_destroy_linked_lists(drive, 1);
+
+    if (track > dev->total_tracks) {
+        d86f_zero_track(drive);
+        return;
+    }
+
+    pcjs_log("seeking to track %i\n", track);
+
+    for (uint8_t side = 0; side < dev->total_sides; side++) {
+        /* Get transfer rate for this side. */
+        rate = dev->track_flags & 0x07;
+        if (!rate && (dev->track_flags & 0x20))
+            rate = 4;
+
+        /* Get correct GAP3 value for this side. */
+        gap3 = fdd_get_gap3_size(rate,
+                                 // dev->sectors[track][side][0].size,
+                                 dev->sectors[track][side][0].encoded_size,
+                                 dev->spt[track][side]);
+
+        /* Get correct GAP2 value for this side. */
+        gap2 = ((dev->track_flags & 0x07) >= 3) ? 41 : 22;
+
+        pos = d86f_prepare_pretrack(drive, side, 0);
+
+        for (uint8_t sector = 0; sector < dev->spt[track][side]; sector++) {
+            rsec = dev->sectors[track][side][sector].sector;
+            asec = sector;
+
+            id[0] = track;
+            id[1] = side;
+            id[2] = rsec;
+            if (dev->sectors[track][side][asec].encoded_size > 255)
+                perror("PCJS: pcjs_seek: sector size too big.");
+            id[3] = dev->sectors[track][side][asec].encoded_size & 0xff;
+            ssize = fdd_sector_code_size(dev->sectors[track][side][asec].encoded_size & 0xff);
+
+            pos = d86f_prepare_sector(
+                drive, side, pos, id,
+                dev->sectors[track][side][asec].data,
+                ssize, gap2, gap3,
+                0
+            );
+
+            if (sector == 0)
+                d86f_initialize_last_sector_id(drive, id[0], id[1], id[2], id[3]);
+        }
+    }
+}
+
+static int
+pcjs_load_image(pcjs_t *dev)
+{
+    if (dev->fp == NULL) {
+        pcjs_log("No file loaded!\n");
+        return 1;
+    }
+
+    /* Initialize. */
+    for (uint16_t i = 0; i < PCJS_MAX_TRACKS; i++) {
+        for (uint8_t j = 0; j < PCJS_MAX_SIDES; j++)
+            memset(dev->sectors[i][j], 0x00, sizeof(pcjs_sector_t));
+    }
+    dev->current_track = 0;
+    dev->current_side = 0;
+
+    return json_parse(dev);
+}
+
+void
+pcjs_load(int drive, char *fn)
+{
+    double          bit_rate = 0;
+    int             temp_rate;
+    const pcjs_sector_t *sector;
+    pcjs_t         *dev;
+
+    d86f_unregister(drive);
+
+    /* Allocate a drive block */
+    dev = (pcjs_t *) calloc(1, sizeof(pcjs_t));
+
+    /* Open the image file, read-only */
+    dev->fp = plat_fopen(fn, "rb");
+    if (dev->fp == NULL) {
+        free(dev);
+        memset(fn, 0x00, sizeof(char));
+        return;
+    }
+
+    pcjs_log("Opening filename: %s\n", fn);
+
+    /* Always set the drive to write-protected mode */
+    writeprot[drive] = 1;
+
+    /* Place in the correct slot */
+    images[drive] = dev;
+
+    /* Parse and load the information from the json file */
+    if (pcjs_load_image(dev)) {
+        pcjs_log("Failed to initialize: %s\n", pcjs_errmsg());
+        (void) fclose(dev->fp);
+        free(dev);
+        images[drive] = NULL;
+        memset(fn, 0x00, sizeof(char));
+        return;
+    }
+
+    pcjs_log("Drive %d: %s (%i tracks, %i sides, %i sectors, sector size %i)\n",
+             drive, fn, dev->image_info.cylinders, dev->image_info.heads, dev->image_info.trackDefault, dev->image_info.sectorDefault);
+
+
+    /*
+     * If the image has more than 43 tracks, then
+     * the tracks are thin (96 tpi).
+     */
+    dev->track_width = (dev->total_tracks > 43) ? 1 : 0;
+
+    /* If the image has 2 sides, mark it as such. */
+    dev->disk_flags = 0x00;
+    if (dev->total_sides == 2)
+        dev->disk_flags |= 0x08;
+
+    /* PCJS files are always assumed to be MFM-encoded. */
+    dev->track_flags = 0x08;
+
+    dev->interleave = 0;
+
+    temp_rate = 0xff;
+    sector       = &dev->sectors[0][0][0];
+    for (uint8_t i = 0; i < 6; i++) {
+        if (dev->spt[0][0] > fdd_max_sectors[sector->encoded_size][i])
+            continue;
+
+        bit_rate  = fdd_bit_rates_300[i];
+        temp_rate = fdd_rates[i];
+        dev->disk_flags |= (fdd_holes[i] << 1);
+
+        if ((bit_rate == 500.0) && (dev->spt[0][0] == 21) && (sector->encoded_size == 2) && (dev->total_tracks >= 80) && (dev->total_tracks <= 82) && (dev->total_sides == 2)) {
+            /*
+             * This is a DMF floppy, set the flag so
+             * we know to interleave the sectors.
+             */
+            dev->dmf = 1;
+        } else {
+            if ((bit_rate == 500.0) && (dev->spt[0][0] == 22) && (sector->encoded_size == 2) && (dev->total_tracks >= 80) && (dev->total_tracks <= 82) && (dev->total_sides == 2)) {
+                /*
+                 * This is marked specially because of the
+                 * track flag (a RPM slow down is needed).
+                 */
+                dev->interleave = 2;
+            }
+            dev->dmf = 0;
+        }
+        break;
+    }
+
+    if (temp_rate == 0xff) {
+        pcjs_log("Invalid image (temp_rate=0xff)\n");
+        (void) fclose(dev->fp);
+        dev->fp = NULL;
+        free(dev);
+        images[drive] = NULL;
+        memset(fn, 0x00, sizeof(char));
+        return;
+    }
+
+    if (dev->interleave == 2) {
+        dev->interleave = 1;
+        dev->disk_flags |= 0x60;
+    }
+
+    dev->gap2_len = (temp_rate == 3) ? 41 : 22;
+    if (dev->dmf)
+        dev->gap3_len = 8;
+    else
+        dev->gap3_len = fdd_get_gap3_size(temp_rate, sector->encoded_size, dev->spt[0][0]);
+
+    if (!dev->gap3_len) {
+        pcjs_log("Image of unknown format was inserted into drive %c:\n",
+                 'C' + drive);
+        (void) fclose(dev->fp);
+        dev->fp = NULL;
+        free(dev);
+        images[drive] = NULL;
+        memset(fn, 0x00, sizeof(char));
+        return;
+    }
+
+    dev->track_flags |= (temp_rate & 0x03); /* data rate */
+    if (temp_rate & 0x04)
+        dev->track_flags |= 0x20; /* RPM */
+
+    pcjs_log("      disk_flags: 0x%02x, track_flags: 0x%02x, GAP3 length: %i\n",
+             dev->disk_flags, dev->track_flags, dev->gap3_len);
+    pcjs_log("      bit rate 300: %.2f, temporary rate: %i, hole: %i, DMF: %i\n",
+             bit_rate, temp_rate, (dev->disk_flags >> 1), dev->dmf);
+    pcjs_log("      encoded_size: %i spt: %i\n", sector->encoded_size, dev->spt[0][0]);
+
+    /* Set up 86F handlers */
+
+    d86f_handler[drive].disk_flags        = disk_flags;
+    d86f_handler[drive].side_flags        = track_flags;
+    d86f_handler[drive].writeback         = null_writeback;
+    d86f_handler[drive].set_sector        = set_sector;
+    d86f_handler[drive].read_data         = poll_read_data;
+    d86f_handler[drive].write_data        = null_write_data;
+    d86f_handler[drive].format_conditions = null_format_conditions;
+    d86f_handler[drive].extra_bit_cells   = null_extra_bit_cells;
+    d86f_handler[drive].encoded_data      = common_encoded_data;
+    d86f_handler[drive].read_revolution   = common_read_revolution;
+    d86f_handler[drive].index_hole_pos    = null_index_hole_pos;
+    d86f_handler[drive].get_raw_size      = common_get_raw_size;
+    d86f_handler[drive].check_crc         = 1;
+    d86f_set_version(drive, 0x0063);
+
+    d86f_common_handlers(drive);
+
+    drives[drive].seek = pcjs_seek;
+
+}
+
+void
+pcjs_close(int drive)
+{
+    pcjs_t *dev = images[drive];
+
+    if (dev == NULL)
+        return;
+
+    /* Unlink image from the system. */
+    d86f_unregister(drive);
+
+    /* Release all the sector buffers. */
+    for (int c = 0; c < PCJS_MAX_TRACKS; c++) {
+        for (int h = 0; h < PCJS_MAX_SIDES; h++) {
+            for (uint16_t s = 0; s < PCJS_MAX_SECTORS; s++) {
+                if (dev->sectors[c][h][s].data != NULL)
+                    free(dev->sectors[c][h][s].data);
+                dev->sectors[c][h][s].data = NULL;
+
+            }
+        }
+    }
+    /* Release file table entries */
+    if(dev->file_table.entries != NULL)
+        free(dev->file_table.entries);
+    dev->file_table.entries = NULL;
+    dev->file_table.num_entries = 0;
+
+    if (dev->fp != NULL)
+        (void) fclose(dev->fp);
+
+    /* Release the memory. */
+    free(dev);
+    images[drive] = NULL;
+}
diff --git a/src/floppy/fdd_td0.c b/src/floppy/fdd_td0.c
index 46e29343b..f5882158b 100644
--- a/src/floppy/fdd_td0.c
+++ b/src/floppy/fdd_td0.c
@@ -42,6 +42,7 @@
 #include <86box/fdd_86f.h>
 #include <86box/fdd_td0.h>
 #include <86box/fdc.h>
+#include "lzw/lzw.h"
 
 #define BUFSZ         512 /* new input buffer */
 #define TD0_MAX_BUFSZ (1024UL * 1024UL * 4UL)
@@ -124,7 +125,9 @@ typedef struct td0_t {
     uint8_t      xdf_ordered_pos[256][2];
     uint8_t      interleave_ordered_pos[256][2];
 
+    uint8_t *lzw_buf;
     uint8_t *imagebuf;
+
     uint8_t *processed_buf;
 } td0_t;
 
@@ -650,11 +653,20 @@ td0_initialize(int drive)
     head_count = header[9];
 
     if (header[0] == 't') {
-        td0_log("TD0: File is compressed\n");
-        disk_decode.fdd_file = dev->fp;
-        state_init_Decode(&disk_decode);
-        disk_decode.fdd_file_offset = 12;
-        state_Decode(&disk_decode, dev->imagebuf, TD0_MAX_BUFSZ);
+        if (((header[4] / 10) % 10) == 2) {
+            td0_log("TD0: File is compressed (TeleDisk 2.x, LZHUF)\n");
+            disk_decode.fdd_file = dev->fp;
+            state_init_Decode(&disk_decode);
+            disk_decode.fdd_file_offset = 12;
+            state_Decode(&disk_decode, dev->imagebuf, TD0_MAX_BUFSZ);
+        } else {
+            td0_log("TD0: File is compressed (TeleDisk 1.x, LZW)\n");
+            if (fseek(dev->fp, 12, SEEK_SET) == -1)
+                fatal("td0_initialize(): Error seeking to offet 12\n");
+            if (fread(dev->lzw_buf, 1, file_size - 12, dev->fp) != (file_size - 12))
+                fatal("td0_initialize(): Error reading LZW-encoded buffer\n");
+            LZWDecodeFile((char *) dev->imagebuf, (char *) dev->lzw_buf, NULL, file_size - 12);
+        }
     } else {
         td0_log("TD0: File is uncompressed\n");
         if (fseek(dev->fp, 12, SEEK_SET) == -1)
@@ -1202,8 +1214,7 @@ td0_load(int drive, char *fn)
 
     writeprot[drive] = 1;
 
-    dev = (td0_t *) malloc(sizeof(td0_t));
-    memset(dev, 0x00, sizeof(td0_t));
+    dev = (td0_t *) calloc(1, sizeof(td0_t));
     td0[drive] = dev;
 
     dev->fp = plat_fopen(fn, "rb");
@@ -1224,10 +1235,9 @@ td0_load(int drive, char *fn)
 
     /* Allocate the processing buffers. */
     i             = 1024UL * 1024UL * 4UL;
-    dev->imagebuf = (uint8_t *) malloc(i);
-    memset(dev->imagebuf, 0x00, i);
-    dev->processed_buf = (uint8_t *) malloc(i);
-    memset(dev->processed_buf, 0x00, i);
+    dev->lzw_buf = (uint8_t *) calloc(1, i);
+    dev->imagebuf = (uint8_t *) calloc(1, i);
+    dev->processed_buf = (uint8_t *) calloc(1, i);
 
     if (!td0_initialize(drive)) {
         td0_log("TD0: Failed to initialize\n");
@@ -1268,6 +1278,8 @@ td0_close(int drive)
 
     d86f_unregister(drive);
 
+    if (dev->lzw_buf)
+        free(dev->lzw_buf);
     if (dev->imagebuf)
         free(dev->imagebuf);
     if (dev->processed_buf)
diff --git a/src/cpu/softfloat/CMakeLists.txt b/src/floppy/lzw/CMakeLists.txt
similarity index 68%
rename from src/cpu/softfloat/CMakeLists.txt
rename to src/floppy/lzw/CMakeLists.txt
index 936157185..bc6f0b612 100644
--- a/src/cpu/softfloat/CMakeLists.txt
+++ b/src/floppy/lzw/CMakeLists.txt
@@ -13,5 +13,4 @@
 #          Copyright 2020-2021 David Hrdlička.
 #
 
-add_library(softfloat OBJECT f2xm1.cc fpatan.cc fprem.cc fsincos.cc fyl2x.cc softfloat_poly.cc softfloat.cc softfloat16.cc
-		softfloat-muladd.cc softfloat-round-pack.cc softfloat-specialize.cc softfloatx80.cc)
+add_library(lzw STATIC lzwdecode.c lzwencode.c)
\ No newline at end of file
diff --git a/src/floppy/lzw/lzw.h b/src/floppy/lzw/lzw.h
new file mode 100644
index 000000000..26abbf6ad
--- /dev/null
+++ b/src/floppy/lzw/lzw.h
@@ -0,0 +1,49 @@
+/***************************************************************************
+*          Header for Lempel-Ziv-Welch Encoding and Decoding Library
+*
+*   File    : lzw.h
+*   Purpose : Provides prototypes for functions that use Lempel-Ziv-Welch
+*             coding to encode/decode files.
+*   Author  : Michael Dipperstein
+*   Date    : January 30, 2004
+*
+****************************************************************************
+*
+* LZW: An ANSI C Lempel-Ziv-Welch Encoding/Decoding Routines
+* Copyright (C) 2005, 2007, 2014 by
+* Michael Dipperstein (mdipperstein@gmail.com)
+*
+* This file is part of the lzw library.
+*
+* The lzw library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 3 of the
+* License, or (at your option) any later version.
+*
+* The lzw library is distributed in the hope that it will be useful, but
+* WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+* General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+***************************************************************************/
+
+#ifndef _LZW_H_
+#define _LZW_H_
+
+/***************************************************************************
+*                                CONSTANTS
+***************************************************************************/
+
+/***************************************************************************
+*                               PROTOTYPES
+***************************************************************************/
+ /* encode inFile */
+int LZWEncodeFile(char *dest, char *src, uint64_t *dst_len, uint64_t src_len);
+
+/* decode inFile*/
+int LZWDecodeFile(char *dest, char *src, uint64_t *dst_len, uint64_t src_len);
+
+#endif  /* ndef _LZW_H_ */
diff --git a/src/floppy/lzw/lzwdecode.c b/src/floppy/lzw/lzwdecode.c
new file mode 100644
index 000000000..7634b52f8
--- /dev/null
+++ b/src/floppy/lzw/lzwdecode.c
@@ -0,0 +1,269 @@
+/***************************************************************************
+*                    Lempel-Ziv-Welch Decoding Functions
+*
+*   File    : lzwdecode.c
+*   Purpose : Provides a function for decoding Lempel-Ziv-Welch encoded
+*             file streams
+*   Author  : Michael Dipperstein
+*   Date    : January 30, 2005
+*
+****************************************************************************
+*
+* LZW: An ANSI C Lempel-Ziv-Welch Encoding/Decoding Routines
+* Copyright (C) 2005, 2007, 2014, 2017 by
+* Michael Dipperstein (mdipperstein@gmail.com)
+*
+* This file is part of the lzw library.
+*
+* The lzw library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 3 of the
+* License, or (at your option) any later version.
+*
+* The lzw library is distributed in the hope that it will be useful, but
+* WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+* General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+***************************************************************************/
+
+/***************************************************************************
+*                             INCLUDED FILES
+***************************************************************************/
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include "lzw.h"
+#include "lzwlocal.h"
+
+/***************************************************************************
+*                            TYPE DEFINITIONS
+***************************************************************************/
+typedef struct
+{
+    uint8_t  suffixChar;    /* last char in encoded string */
+    uint16_t prefixCode;    /* code for remaining chars in string */
+} decode_dictionary_t;
+
+/***************************************************************************
+*                                CONSTANTS
+***************************************************************************/
+
+/***************************************************************************
+*                                  MACROS
+***************************************************************************/
+
+/***************************************************************************
+*                            GLOBAL VARIABLES
+***************************************************************************/
+
+/* dictionary of string the code word is the dictionary index */
+static decode_dictionary_t dictionary[(MAX_CODES - FIRST_CODE)];
+
+/***************************************************************************
+*                               PROTOTYPES
+***************************************************************************/
+static uint8_t DecodeRecursive(unsigned int code, char **dest);
+
+/* read encoded data */
+static int GetCodeWord(char *src);
+
+static uint16_t bufPos = 0x0000;
+static uint16_t bufLen = 0x0000;
+
+static uint32_t bufOutPos = 0x00000000;
+
+/***************************************************************************
+*                                FUNCTIONS
+***************************************************************************/
+
+/***************************************************************************
+*   Function   : LZWDecodeFile
+*   Description: This routine reads an input file 1 encoded string at a
+*                time and decodes it using the LZW algorithm.
+*   Parameters : fpIn - pointer to the open binary file to decode
+*                fpOut - pointer to the open binary file to write decoded
+*                       output
+*   Effects    : fpIn is decoded using the LZW algorithm with CODE_LEN codes
+*                and written to fpOut.  Neither file is closed after exit.
+*   Returned   : 0 for success, -1 for failure.  errno will be set in the
+*                event of a failure.
+***************************************************************************/
+int
+LZWDecodeFile_Internal(char *dest, char *src)
+{
+    uint16_t nextCode;    /* value of next code */
+    uint16_t lastCode;    /* last decoded code word */
+    int      code;        /* code word to decode */
+    uint8_t  c;           /* last decoded character */
+
+    /* validate arguments */
+    if (dest == NULL) {
+        errno = ENOENT;
+        return -1;
+    }
+
+    bufPos = 0x0000;
+    bufOutPos = 0x00000000;
+
+    /* initialize for decoding */
+    nextCode = FIRST_CODE;  /* code for next (first) string */
+
+    /* first code from file must be a character.  use it for initial values */
+    lastCode = GetCodeWord(src);
+    c = lastCode;
+    *(dest++) = lastCode;
+    bufOutPos++;
+
+    /* decode rest of file */
+    while ((int)(code = GetCodeWord(src)) != EOF) {
+        if (code < nextCode) {
+            /* we have a known code.  decode it */
+            c = DecodeRecursive(code, &dest);
+        } else {
+            /***************************************************************
+            * We got a code that's not in our dictionary.  This must be due
+            * to the string + char + string + char + string exception.
+            * Build the decoded string using the last character + the
+            * string from the last code.
+            ***************************************************************/
+            unsigned char tmp;
+
+            tmp = c;
+            c = DecodeRecursive(lastCode, &dest);
+            *(dest++) = tmp;
+            bufOutPos++;
+        }
+
+        /* if room, add new code to the dictionary */
+        if (nextCode < MAX_CODES) {
+            dictionary[nextCode - FIRST_CODE].prefixCode = lastCode;
+            dictionary[nextCode - FIRST_CODE].suffixChar = c;
+            nextCode++;
+        }
+
+        /* save character and code for use in unknown code word case */
+        lastCode = code;
+    }
+
+    return 0;
+}
+
+int
+LZWDecodeFile(char *dest, char *src, uint64_t *dst_len, uint64_t src_len)
+{
+    uint16_t size = 0x0000;
+    uint64_t pos  = 0x0000000000000000ULL;
+
+    /* validate arguments */
+    if ((dest == NULL) || (src == NULL)) {
+        errno = ENOENT;
+        return -1;
+    }
+
+    if (dst_len != NULL)
+        *dst_len = 0x0000000000000000ULL;
+
+    while (1) {
+        size = *(uint16_t *) src;
+        src += 2;
+        bufLen = size;
+        size >>= 1;
+        if (bufLen & 1)
+            size++;
+        if (size > 0x1800)
+            return -1;
+        LZWDecodeFile_Internal(dest, src);
+        src += size;
+        dest += bufOutPos;
+        if (dst_len != NULL)
+            *dst_len += bufOutPos;
+        pos += (size + 2);
+        if ((size < 0x1800) || (pos >= src_len))
+            /* We have just decoded a block smaller than 0x3000 bytes,
+               this means this has been the last block, end. */
+            break;
+    }
+
+    return 0;
+}
+
+/***************************************************************************
+*   Function   : DecodeRecursive
+*   Description: This function uses the dictionary to decode a code word
+*                into the string it represents and write it to the output
+*                file.  The string is actually built in reverse order and
+*                recursion is used to write it out in the correct order.
+*   Parameters : code - the code word to decode
+*                fpOut - the file that the decoded code word is written to
+*   Effects    : Decoded code word is written to a file
+*   Returned   : The first character in the decoded string
+***************************************************************************/
+static uint8_t
+DecodeRecursive(unsigned int code, char **dest)
+{
+    unsigned char c;
+    unsigned char firstChar;
+
+    if (code >= FIRST_CODE) {
+        /* code word is string + c */
+        c = dictionary[code - FIRST_CODE].suffixChar;
+        code = dictionary[code - FIRST_CODE].prefixCode;
+
+        /* evaluate new code word for remaining string */
+        firstChar = DecodeRecursive(code, dest);
+    } else {
+        /* code word is just c */
+        c = code;
+        firstChar = code;
+    }
+
+    *((*dest)++) = c;
+    bufOutPos++;
+    return firstChar;
+}
+
+/***************************************************************************
+*   Function   : GetCodeWord
+*   Description: This function reads and returns a code word from an
+*                encoded file.  In order to deal with endian issue the
+*                code word is read least significant byte followed by the
+*                remaining bits.
+*   Parameters : fpIn - file containing the encoded data
+*                codeLen - number of bits in code word
+*   Effects    : code word is read from encoded input
+*   Returned   : The next code word in the encoded file.  EOF if the end
+*                of file has been reached.
+*
+*   NOTE: If the code word contains more than 16 bits, this routine should
+*         be modified to read in all the bytes from least significant to
+*         most significant followed by any left over bits.
+***************************************************************************/
+static int
+GetCodeWord(char *src)
+{
+    int code = 0;
+    static unsigned int realPos;
+
+    realPos = bufPos >> 1;
+
+    if (bufPos >= bufLen)
+        /* End of buffer. */
+        code = EOF;
+    else if (bufPos & 1)
+        /* Odd position. */
+        code = (((uint8_t) src[realPos] & 0xf0) >> 4) | ((uint8_t) src[realPos + 1] << 4);
+    else
+        /* Even position. */
+        code = ((uint8_t) src[realPos] & 0xff) | (((uint8_t) src[realPos + 1] & 0xf) << 8);
+
+    bufPos += 3;
+
+    return code;
+}
diff --git a/src/floppy/lzw/lzwencode.c b/src/floppy/lzw/lzwencode.c
new file mode 100644
index 000000000..0a4d659bb
--- /dev/null
+++ b/src/floppy/lzw/lzwencode.c
@@ -0,0 +1,454 @@
+/***************************************************************************
+*                    Lempel-Ziv-Welch Encoding Functions
+*
+*   File    : lzwencode.c
+*   Purpose : Provides a function for Lempel-Ziv-Welch encoding of file
+*             streams
+*   Author  : Michael Dipperstein
+*   Date    : January 30, 2005
+*
+****************************************************************************
+*
+* LZW: An ANSI C Lempel-Ziv-Welch Encoding/Decoding Routines
+* Copyright (C) 2005, 2007, 2014, 2017 by
+* Michael Dipperstein (mdipperstein@gmail.com)
+*
+* This file is part of the lzw library.
+*
+* The lzw library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 3 of the
+* License, or (at your option) any later version.
+*
+* The lzw library is distributed in the hope that it will be useful, but
+* WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+* General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+***************************************************************************/
+
+/***************************************************************************
+*                             INCLUDED FILES
+***************************************************************************/
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include "lzw.h"
+#include "lzwlocal.h"
+
+/***************************************************************************
+*                            TYPE DEFINITIONS
+***************************************************************************/
+/* node in dictionary tree */
+typedef struct dict_node_t
+{
+    unsigned int codeWord;      /* code word for this entry */
+    unsigned char suffixChar;   /* last char in encoded string */
+    unsigned int prefixCode;    /* code for remaining chars in string */
+
+    /* pointer to child nodes */
+    struct dict_node_t *left;   /* child with < key */
+    struct dict_node_t *right;  /* child with >= key */
+} dict_node_t;
+
+/***************************************************************************
+*                                CONSTANTS
+***************************************************************************/
+
+/***************************************************************************
+*                                  MACROS
+***************************************************************************/
+
+/***************************************************************************
+*                            GLOBAL VARIABLES
+***************************************************************************/
+
+/***************************************************************************
+*                               PROTOTYPES
+***************************************************************************/
+
+/* dictionary tree node create/free */
+static dict_node_t *MakeNode(const unsigned int codeWord, const unsigned int prefixCode,
+                             const unsigned char suffixChar);
+static void FreeTree(dict_node_t *node);
+
+/* searches tree for matching dictionary entry */
+static dict_node_t *FindDictionaryEntry(dict_node_t *root, const int unsigned prefixCode,
+                                        const unsigned char c);
+
+/* makes key from prefix code and character */
+static unsigned int MakeKey(const unsigned int prefixCode, const unsigned char suffixChar);
+
+/* write encoded data */
+static int PutCodeWord(char *dest, int code);
+
+static char    *src_base;
+static uint64_t src_length = 0x0000000000000000ULL;
+
+static uint32_t bufPos = 0x00000000;
+static uint32_t bufInPos = 0x00000000;
+
+static int
+is_eob(char *src)
+{
+    return ((uint64_t) (uintptr_t) (src - src_base)) >= src_length;
+}
+
+static int
+get_char(char **src)
+{
+    int ret = EOF;
+
+    if (!is_eob(*src)) {
+        ret = (uint8_t) **src;
+        (*src)++;
+    }
+
+    return ret;
+}
+
+/***************************************************************************
+*                                FUNCTIONS
+***************************************************************************/
+
+static int
+LZWEncodeFile_Internal(char *dest, char *src)
+{
+    unsigned int code;                  /* code for current string */
+    unsigned int nextCode;              /* next available code index */
+    int c;                              /* character to add to string */
+
+    dict_node_t *dictRoot;              /* root of dictionary tree */
+    dict_node_t *node;                  /* node of dictionary tree */
+
+    /* validate arguments */
+    if (src == NULL) {
+        errno = ENOENT;
+        return -1;
+    }
+
+    /* initialize dictionary as empty */
+    dictRoot = NULL;
+
+    nextCode = FIRST_CODE;  /* code for next (first) string */
+
+    bufPos = 0x00000000;
+    bufInPos = 0x00000000;
+
+    /* now start the actual encoding process */
+
+    c = get_char(&src);
+
+    if (c == EOF)
+        return -1;      /* empty file */
+    else {
+        bufInPos++;
+        code = c;       /* start with code string = first character */
+    }
+
+    /* create a tree root from 1st 2 character string */
+    if ((c = get_char(&src)) != EOF) {
+        bufInPos++;
+
+        /* special case for NULL root */
+        dictRoot = MakeNode(nextCode, code, c);
+
+        if (dictRoot == NULL) {
+            perror("Making Dictionary Root");
+            return -1;
+        }
+        
+        nextCode++;
+
+        /* write code for 1st char */
+        (void) PutCodeWord(dest, code);
+
+        /* new code is just 2nd char */
+        code = c;
+    }
+
+    /* now encode normally */
+    while ((c = get_char(&src)) != EOF) {
+        /* look for code + c in the dictionary */
+        node = FindDictionaryEntry(dictRoot, code, c);
+
+        if ((node->prefixCode == code) && (node->suffixChar == c))
+            /* code + c is in the dictionary, make it's code the new code */
+            code = node->codeWord;
+        else {
+            /* code + c is not in the dictionary, add it if there's room */
+            if (nextCode < MAX_CODES) {
+                dict_node_t *tmp = MakeNode(nextCode, code, c);
+
+                if (tmp == NULL) {
+                    perror("Making Dictionary Node");
+                    FreeTree(dictRoot);
+                    return -1;
+                }
+
+                nextCode++;
+
+                if (MakeKey(code, c) < MakeKey(node->prefixCode, node->suffixChar))
+                    node->left = tmp;
+                else
+                    node->right = tmp;
+            }
+
+            /* write out code for the string before c was added */
+            if (PutCodeWord(dest, code))
+                break;
+
+            /* new code is just c */
+            code = c;
+        }
+
+        bufInPos++;
+    }
+
+    /* no more input.  write out last of the code. */
+    (void) PutCodeWord(dest, code);
+
+    /* free the dictionary */
+    FreeTree(dictRoot);
+
+    return (c == EOF) ? 1 : 0;
+}
+
+/***************************************************************************
+*   Function   : LZWEncodeFile
+*   Description: This routine reads an input file 1 character at a time and
+*                writes out an LZW encoded version of that file.
+*   Parameters : fpIn - pointer to the open binary file to encode
+*                fpOut - pointer to the open binary file to write encoded
+*                       output
+*   Effects    : fpIn is encoded using the LZW algorithm with CODE_LEN codes
+*                and written to fpOut.  Neither file is closed after exit.
+*   Returned   : 0 for success, -1 for failure.  errno will be set in the
+*                event of a failure.
+***************************************************************************/
+int
+LZWEncodeFile(char *dest, char *src, uint64_t *dst_len, uint64_t src_len)
+{
+    uint64_t pos  = 0x0000000000000000ULL;
+
+    /* validate arguments */
+    if ((dest == NULL) || (src == NULL)) {
+        errno = ENOENT;
+        return -1;
+    }
+
+    if (dst_len != NULL)
+        *dst_len = 0x0000000000000000ULL;
+
+    src_base = src;
+    src_length = src_len;
+
+    while (1) {
+        int ret = LZWEncodeFile_Internal(dest + 2, src);
+        if (ret == -1)
+            break;
+        *(uint16_t *) dest = bufPos;
+        if (bufPos & 1)
+            bufPos = (bufPos >> 1) + 1;
+        else
+            bufPos >>= 1;
+        dest += (bufPos + 2);
+        if (dst_len != NULL)
+            *dst_len += (bufPos + 2);
+        /* TODO: Why do we need this - 1 clunkfest? */
+        src += bufInPos;
+        pos += bufInPos;
+        if ((ret == 1) || (pos >= src_len) || (bufPos < 0x1800))
+            break;
+    }
+
+    return 0;
+}
+
+/***************************************************************************
+*   Function   : MakeKey
+*   Description: This routine creates a simple key from a prefix code and
+*                an appended character.  The key may be used to establish
+*                an order when building/searching a dictionary tree.
+*   Parameters : prefixCode - code for all but the last character of a
+*                             string.
+*                suffixChar - the last character of a string
+*   Effects    : None
+*   Returned   : Key built from string represented as a prefix + char.  Key
+*                format is {ms nibble of c} + prefix + {ls nibble of c}
+***************************************************************************/
+static unsigned int
+MakeKey(const unsigned int prefixCode, const unsigned char suffixChar)
+{
+    unsigned int key;
+
+    /* position ms nibble */
+    key = suffixChar & 0xF0;
+    key <<= MAX_CODE_LEN;
+
+    /* include prefix code */
+    key |= (prefixCode << 4);
+
+    /* inclulde ls nibble */
+    key |= (suffixChar & 0x0F);
+
+    return key;
+}
+
+/***************************************************************************
+*   Function   : MakeNode
+*   Description: This routine creates and initializes a dictionary entry
+*                for a string and the code word that encodes it.
+*   Parameters : codeWord - code word used to encode the string prefixCode +
+*                           suffixChar
+*                prefixCode - code for all but the last character of a
+*                             string.
+*                suffixChar - the last character of a string
+*   Effects    : Node is allocated for new dictionary entry
+*   Returned   : Pointer to newly allocated node or NULL on error.
+*                errno will be set on an error.
+***************************************************************************/
+static dict_node_t *
+MakeNode(const unsigned int codeWord, const unsigned int prefixCode, const unsigned char suffixChar)
+{
+    dict_node_t *node;
+
+    node = malloc(sizeof(dict_node_t));
+
+    if (node != NULL) {
+        node->codeWord = codeWord;
+        node->prefixCode = prefixCode;
+        node->suffixChar = suffixChar;
+
+        node->left = NULL;
+        node->right = NULL;
+    }
+
+    return node;
+}
+
+/***************************************************************************
+*   Function   : FreeTree
+*   Description: This routine will free all nodes of a tree rooted at the
+*                node past as a parameter.
+*   Parameters : node - root of tree to free
+*   Effects    : frees allocated tree node from initial parameter down.
+*   Returned   : none
+***************************************************************************/
+static void
+FreeTree(dict_node_t *node)
+{
+    if (node == NULL)
+        /* nothing to free */
+        return;
+
+    /* free left branch */
+    if (node->left != NULL)
+        FreeTree(node->left);
+
+    /* free right branch */
+    if (node->right != NULL)
+        FreeTree(node->right);
+
+    /* free root */
+    free(node);
+}
+
+/***************************************************************************
+*   Function   : FindDictionaryEntry
+*   Description: This routine searches the dictionary tree for an entry
+*                with a matching string (prefix code + suffix character).
+*                If one isn't found, the parent node for that string is
+*                returned.
+*   Parameters : prefixCode - code for the prefix of string
+*                c - last character in string
+*   Effects    : None
+*   Returned   : If string is in dictionary, pointer to node containing
+*                string, otherwise pointer to suitable parent node.  NULL
+*                is returned for an empty tree.
+***************************************************************************/
+static dict_node_t *
+FindDictionaryEntry(dict_node_t *root, const int unsigned prefixCode, const unsigned char c)
+{
+    unsigned int searchKey, key;
+
+    if (root == NULL)
+        return NULL;
+
+    searchKey = MakeKey(prefixCode, c);     /* key of string to find */
+
+    while (1) {
+        /* key of current node */
+        key = MakeKey(root->prefixCode, root->suffixChar);
+
+        if (key == searchKey)
+            /* current node contains string */
+            return root;
+        else if (searchKey < key) {
+            if (root->left != NULL)
+                /* check left branch for string */
+                root = root->left;
+            else
+                /* string isn't in tree, it can be added as a left child */
+                return root;
+        } else {
+            if (root->right != NULL)
+                /* check right branch for string */
+                root = root->right;
+            else
+                /* string isn't in tree, it can be added as a right child */
+                return root;
+        }
+    }
+}
+
+/***************************************************************************
+*   Function   : PutCodeWord
+*   Description: This function writes a code word from to an encoded file.
+*                In order to deal with endian issue the code word is
+*                written least significant byte followed by the remaining
+*                bits.
+*   Parameters : bfpOut - bit file containing the encoded data
+*                code - code word to add to the encoded data
+*                codeLen - length of the code word
+*   Effects    : code word is written to the encoded output
+*   Returned   : EOF for failure, ENOTSUP unsupported architecture,
+*                otherwise the number of bits written.  If an error occurs
+*                after a partial write, the partially written bits will not
+*                be unwritten.
+***************************************************************************/
+static int
+PutCodeWord(char *dest, int code)
+{
+    static unsigned int realPos;
+    int ret = 0;
+
+    if (bufPos >= 0x3000)
+        ret = -1;
+    else {
+        realPos = bufPos >> 1;
+
+        if (bufPos & 1) {
+            /* Odd position. */
+            dest[realPos] = (dest[realPos] & 0x0f) | ((code << 4) & 0xf0);
+            dest[realPos + 1] = (code >> 4) & 0xff;
+        } else {
+            /* Even position. */
+            dest[realPos] = code & 0xff;
+            dest[realPos + 1] = ((code >> 8) & 0x0f);
+        }
+
+        bufPos += 3;
+
+        if (bufPos >= 0x3000)
+            ret = 1;
+    }
+
+    return ret;
+}
diff --git a/src/floppy/lzw/lzwlocal.h b/src/floppy/lzw/lzwlocal.h
new file mode 100644
index 000000000..79d1f9646
--- /dev/null
+++ b/src/floppy/lzw/lzwlocal.h
@@ -0,0 +1,63 @@
+/***************************************************************************
+*          Header for Lempel-Ziv-Welch Encoding and Decoding Library
+*
+*   File    : lzwlocal.h
+*   Purpose : Provides constant definitions for functions values used within
+*             the functions for Lempel-Ziv-Welch encoding/decoding.
+*   Author  : Michael Dipperstein
+*   Date    : February 22, 2015
+*
+****************************************************************************
+*
+* LZW: An ANSI C Lempel-Ziv-Welch Encoding/Decoding Routines
+* Copyright (C) 2015 by
+* Michael Dipperstein (mdipperstein@gmail.com)
+*
+* This file is part of the lzw library.
+*
+* The lzw library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 3 of the
+* License, or (at your option) any later version.
+*
+* The lzw library is distributed in the hope that it will be useful, but
+* WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+* General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+***************************************************************************/
+
+#ifndef _LZWLOCAL_H_
+#define _LZWLOCAL_H_
+/***************************************************************************
+*                             INCLUDED FILES
+***************************************************************************/
+#include <stdio.h>
+#include <limits.h>
+
+/***************************************************************************
+*                                CONSTANTS
+***************************************************************************/
+#define MIN_CODE_LEN    12                  /* min # bits in a code word */
+#define MAX_CODE_LEN    12                  /* max # bits in a code word */
+
+#define FIRST_CODE      (1 << CHAR_BIT)     /* value of 1st string code */
+#define MAX_CODES       (1 << MAX_CODE_LEN)
+
+#if (MIN_CODE_LEN <= CHAR_BIT)
+#error Code words must be larger than 1 character
+#endif
+
+#if ((MAX_CODES - 1) > INT_MAX)
+#error There cannot be more codes than can fit in an integer
+#endif
+
+/***************************************************************************
+*                                  MACROS
+***************************************************************************/
+#define CURRENT_MAX_CODES(bits)     ((unsigned int)(1 << (bits)))
+
+#endif  /* ndef _LZWLOCAL_H_ */
diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
index 83dcd4836..6b44a2236 100644
--- a/src/game/CMakeLists.txt
+++ b/src/game/CMakeLists.txt
@@ -9,9 +9,16 @@
 #          CMake build script.
 #
 # Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
 #
 #          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2024      Jasmine Iwanek.
 #
 
-add_library(game OBJECT gameport.c joystick_standard.c
-    joystick_ch_flightstick_pro.c joystick_sw_pad.c joystick_tm_fcs.c)
+add_library(game OBJECT
+    gameport.c
+    joystick_standard.c
+    joystick_ch_flightstick_pro.c
+    joystick_sw_pad.c
+    joystick_tm_fcs.c
+)
diff --git a/src/game/gameport.c b/src/game/gameport.c
index 323555984..f17e39efe 100644
--- a/src/game/gameport.c
+++ b/src/game/gameport.c
@@ -8,15 +8,15 @@
  *
  *          Implementation of a generic Game Port.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Sarah Walker, <https://pcem-emulator.co.uk/>
  *          RichardG, <richardg867@gmail.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
- *          Copyright 2016-2018 Miran Grca.
+ *          Copyright 2016-2022 Miran Grca.
  *          Copyright 2008-2018 Sarah Walker.
- *          Copyright 2021 RichardG.
+ *          Copyright 2021      RichardG.
+ *          Copyright 2021-2025 Jasmine Iwanek.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -31,12 +31,14 @@
 #include <86box/timer.h>
 #include <86box/isapnp.h>
 #include <86box/gameport.h>
-#include <86box/joystick_ch_flightstick_pro.h>
-#include <86box/joystick_standard.h>
-#include <86box/joystick_sw_pad.h>
-#include <86box/joystick_tm_fcs.h>
 #include <86box/plat_unused.h>
 
+device_t game_ports[GAMEPORT_MAX];
+
+typedef struct {
+    const device_t *device;
+} GAMEPORT;
+
 typedef struct g_axis_t {
     pc_timer_t                  timer;
     int                         axis_nr;
@@ -50,17 +52,22 @@ typedef struct _gameport_ {
     struct _gameport_          *next;
 } gameport_t;
 
+typedef struct _tmacm_ {
+    struct gameport_t *port1;
+    struct gameport_t *port2;
+} tmacm_t;
+
 typedef struct _joystick_instance_ {
     uint8_t  state;
     g_axis_t axis[4];
 
-    const joystick_if_t *intf;
-    void                *dat;
+    const joystick_t *intf;
+    void             *dat;
 } joystick_instance_t;
 
-int joystick_type = JS_TYPE_NONE;
+int joystick_type[GAMEPORT_MAX] = { JS_TYPE_NONE, JS_TYPE_NONE };
 
-static const joystick_if_t joystick_none = {
+static const joystick_t joystick_none = {
     .name          = "None",
     .internal_name = "none",
     .init          = NULL,
@@ -79,43 +86,67 @@ static const joystick_if_t joystick_none = {
 };
 
 static const struct {
-    const joystick_if_t *joystick;
+    const joystick_t *joystick;
 } joysticks[] = {
-    { &joystick_none },
-    { &joystick_2axis_2button },
-    { &joystick_2axis_4button },
-    { &joystick_2axis_6button },
-    { &joystick_2axis_8button },
-    { &joystick_3axis_2button },
-    { &joystick_3axis_4button },
-    { &joystick_4axis_4button },
-    { &joystick_ch_flightstick_pro },
-    { &joystick_sw_pad },
-    { &joystick_tm_fcs },
-    { NULL }
+    { &joystick_none                         },
+    { &joystick_2axis_2button                },
+    { &joystick_2button_gamepad              },
+    { &joystick_2button_flight_yoke          },
+    { &joystick_2axis_4button                },
+    { &joystick_4button_gamepad              },
+    { &joystick_4button_flight_yoke          },
+    { &joystick_2axis_6button                },
+    { &joystick_2axis_8button                },
+    { &joystick_3axis_2button                },
+    { &joystick_2button_yoke_throttle        },
+    { &joystick_3axis_4button                },
+    { &joystick_win95_steering_wheel         },
+    { &joystick_4button_yoke_throttle        },
+    { &joystick_4axis_4button                },
+    { &joystick_ch_flightstick_pro           },
+    { &joystick_ch_flightstick_pro_ch_pedals },
+    { &joystick_sw_pad                       },
+    { &joystick_tm_fcs                       },
+    { &joystick_tm_fcs_rcs                   },
+    { NULL                                   }
 };
 
-static joystick_instance_t *joystick_instance = NULL;
+static joystick_instance_t *joystick_instance[GAMEPORT_MAX] = { NULL, NULL };
 
 static uint8_t gameport_pnp_rom[] = {
-    0x09, 0xf8, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,          /* BOX0002, dummy checksum (filled in by isapnp_add_card) */
-    0x0a, 0x10, 0x10,                                              /* PnP version 1.0, vendor version 1.0 */
-    0x82, 0x09, 0x00, 'G', 'a', 'm', 'e', ' ', 'P', 'o', 'r', 't', /* ANSI identifier */
+    /* BOX0002, serial 0, dummy checksum (filled in by isapnp_add_card) */
+    0x09, 0xf8, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+    /* PnP version 1.0, vendor version 1.0 */
+    0x0a, 0x10, 0x10,
+    /* ANSI identifier */
+    0x82, 0x09, 0x00, 'G', 'a', 'm', 'e', ' ', 'P', 'o', 'r', 't',
 
-    0x15, 0x09, 0xf8, 0x00, 0x02, 0x01,             /* logical device BOX0002, can participate in boot */
-    0x1c, 0x41, 0xd0, 0xb0, 0x2f,                   /* compatible device PNPB02F */
-    0x31, 0x00,                                     /* start dependent functions, preferred */
-    0x47, 0x01, 0x00, 0x02, 0x00, 0x02, 0x08, 0x08, /* I/O 0x200, decodes 16-bit, 8-byte alignment, 8 addresses */
-    0x30,                                           /* start dependent functions, acceptable */
-    0x47, 0x01, 0x08, 0x02, 0x08, 0x02, 0x08, 0x08, /* I/O 0x208, decodes 16-bit, 8-byte alignment, 8 addresses */
-    0x31, 0x02,                                     /* start dependent functions, sub-optimal */
-    0x47, 0x01, 0x00, 0x01, 0xf8, 0xff, 0x08, 0x08, /* I/O 0x100-0xFFF8, decodes 16-bit, 8-byte alignment, 8 addresses */
-    0x38,                                           /* end dependent functions */
+    /* Logical device BOX0002, can participate in boot */
+    0x15, 0x09, 0xf8, 0x00, 0x02, 0x01,
+    /* Compatible device PNPB02F */
+    0x1c, 0x41, 0xd0, 0xb0, 0x2f,
+    /* Start dependent functions, preferred */
+    0x31, 0x00,
+    /* I/O 0x200, decodes 16-bit, 8-byte alignment, 8 addresses */
+    0x47, 0x01, 0x00, 0x02, 0x00, 0x02, 0x08, 0x08,
+    /* Start dependent functions, acceptable */
+    0x30,
+    /* I/O 0x208, decodes 16-bit, 8-byte alignment, 8 addresses */
+    0x47, 0x01, 0x08, 0x02, 0x08, 0x02, 0x08, 0x08,
+    /* Start dependent functions, sub-optimal */
+    0x31, 0x02,
+    /* I/O 0x100-0xFFF8, decodes 16-bit, 8-byte alignment, 8 addresses */
+    0x47, 0x01, 0x00, 0x01, 0xf8, 0xff, 0x08, 0x08,
+    /* End dependent functions */
+    0x38,
 
-    0x79, 0x00 /* end tag, dummy checksum (filled in by isapnp_add_card) */
+    /* End tag, dummy checksum (filled in by isapnp_add_card) */
+    0x79, 0x00
 };
+
 static const isapnp_device_config_t gameport_pnp_defaults[] = {
-    {.activate = 1,
+    {
+        .activate = 1,
         .io       = {
             { .base = 0x200 },
         }
@@ -228,15 +259,13 @@ gameport_write(UNUSED(uint16_t addr), UNUSED(uint8_t val), void *priv)
     /* Read all axes. */
     joystick->state |= 0x0f;
 
-    gameport_time(joystick, 0, joystick->intf->read_axis(joystick->dat, 0));
-    gameport_time(joystick, 1, joystick->intf->read_axis(joystick->dat, 1));
-    gameport_time(joystick, 2, joystick->intf->read_axis(joystick->dat, 2));
-    gameport_time(joystick, 3, joystick->intf->read_axis(joystick->dat, 3));
+    for (uint8_t i = 0; i < 4; i++)
+        gameport_time(joystick, i, joystick->intf->read_axis(joystick->dat, i));
 
     /* Notify the interface. */
     joystick->intf->write(joystick->dat);
 
-    cycles -= ISA_CYCLES(8);
+    cycles -= ISA_CYCLES((8 << is_pcjr));
 }
 
 static uint8_t
@@ -252,7 +281,7 @@ gameport_read(UNUSED(uint16_t addr), void *priv)
     /* Merge axis state with button state. */
     uint8_t ret = joystick->state | joystick->intf->read(joystick->dat);
 
-    cycles -= ISA_CYCLES(8);
+    cycles -= ISA_CYCLES((8 << is_pcjr));
 
     return ret;
 }
@@ -270,17 +299,17 @@ timer_over(void *priv)
 }
 
 void
-gameport_update_joystick_type(void)
+gameport_update_joystick_type(uint8_t gp)
 {
     /* Add a standalone game port if a joystick is enabled but no other game ports exist. */
     if (standalone_gameport_type)
         gameport_add(standalone_gameport_type);
 
     /* Reset the joystick interface. */
-    if (joystick_instance) {
-        joystick_instance->intf->close(joystick_instance->dat);
-        joystick_instance->intf = joysticks[joystick_type].joystick;
-        joystick_instance->dat  = joystick_instance->intf->init();
+    if (joystick_instance[gp]) {
+        joystick_instance[gp]->intf->close(joystick_instance[gp]->dat);
+        joystick_instance[gp]->intf = joysticks[joystick_type[gp]].joystick;
+        joystick_instance[gp]->dat  = joystick_instance[gp]->intf->init();
     }
 }
 
@@ -290,6 +319,9 @@ gameport_remap(void *priv, uint16_t address)
     gameport_t *dev = (gameport_t *) priv;
     gameport_t *other_dev;
 
+    if (dev == NULL)
+        return;
+
     if (dev->addr) {
         /* Remove this port from the active ports list. */
         if (active_gameports == dev) {
@@ -359,43 +391,36 @@ gameport_add(const device_t *gameport_type)
 static void *
 gameport_init(const device_t *info)
 {
-    gameport_t *dev = NULL;
+    gameport_t *dev = calloc(1, sizeof(gameport_t));
 
-    dev = malloc(sizeof(gameport_t));
-    memset(dev, 0x00, sizeof(gameport_t));
+    // TODO: Later we'll actually support more than one gameport
+    uint8_t joy_insn = 0;
 
     /* Allocate global instance. */
-    if (!joystick_instance && joystick_type) {
-        joystick_instance = malloc(sizeof(joystick_instance_t));
-        memset(joystick_instance, 0x00, sizeof(joystick_instance_t));
+    if (!joystick_instance[joy_insn] && joystick_type[joy_insn]) {
+        joystick_instance[joy_insn] = calloc(1, sizeof(joystick_instance_t));
 
-        joystick_instance->axis[0].joystick = joystick_instance;
-        joystick_instance->axis[1].joystick = joystick_instance;
-        joystick_instance->axis[2].joystick = joystick_instance;
-        joystick_instance->axis[3].joystick = joystick_instance;
+        // For each analog joystick axis
+        for (uint8_t i = 0; i < 4; i++) {
+            joystick_instance[joy_insn]->axis[i].joystick = joystick_instance[joy_insn];
 
-        joystick_instance->axis[0].axis_nr = 0;
-        joystick_instance->axis[1].axis_nr = 1;
-        joystick_instance->axis[2].axis_nr = 2;
-        joystick_instance->axis[3].axis_nr = 3;
+            joystick_instance[joy_insn]->axis[i].axis_nr = i;
 
-        timer_add(&joystick_instance->axis[0].timer, timer_over, &joystick_instance->axis[0], 0);
-        timer_add(&joystick_instance->axis[1].timer, timer_over, &joystick_instance->axis[1], 0);
-        timer_add(&joystick_instance->axis[2].timer, timer_over, &joystick_instance->axis[2], 0);
-        timer_add(&joystick_instance->axis[3].timer, timer_over, &joystick_instance->axis[3], 0);
+            timer_add(&joystick_instance[joy_insn]->axis[i].timer, timer_over, &joystick_instance[joy_insn]->axis[i], 0);
+        }
 
-        joystick_instance->intf = joysticks[joystick_type].joystick;
-        joystick_instance->dat  = joystick_instance->intf->init();
+        joystick_instance[joy_insn]->intf = joysticks[joystick_type[joy_insn]].joystick;
+        joystick_instance[joy_insn]->dat  = joystick_instance[joy_insn]->intf->init();
     }
 
-    dev->joystick = joystick_instance;
+    dev->joystick = joystick_instance[joy_insn];
 
     /* Map game port to the default address. Not applicable on PnP-only ports. */
     dev->len = (info->local >> 16) & 0xff;
     gameport_remap(dev, info->local & 0xffff);
 
-    /* Register ISAPnP if this is a standard game port card. */
-    if ((info->local & 0xffff) == 0x200)
+    /* Register ISAPnP if this is a PNP game port card. */
+    if (info->local & GAMEPORT_PNPROM)
         isapnp_set_device_defaults(isapnp_add_card(gameport_pnp_rom, sizeof(gameport_pnp_rom), gameport_pnp_config_changed, NULL, NULL, NULL, dev), 0, gameport_pnp_defaults);
 
     return dev;
@@ -404,25 +429,24 @@ gameport_init(const device_t *info)
 static void *
 tmacm_init(UNUSED(const device_t *info))
 {
-    uint16_t    port = 0x0000;
-    gameport_t *dev  = NULL;
+    uint16_t  port = 0x0000;
+    tmacm_t  *dev  = NULL;
 
-    dev = malloc(sizeof(gameport_t));
-    memset(dev, 0x00, sizeof(gameport_t));
+    dev = calloc(1, sizeof(tmacm_t));
 
     port = (uint16_t) device_get_config_hex16("port1_addr");
     switch (port) {
         case 0x201:
-            dev = gameport_add(&gameport_201_device);
+            dev->port1 = gameport_add(&gameport_201_device);
             break;
         case 0x203:
-            dev = gameport_add(&gameport_203_device);
+            dev->port1 = gameport_add(&gameport_203_device);
             break;
         case 0x205:
-            dev = gameport_add(&gameport_205_device);
+            dev->port1 = gameport_add(&gameport_205_device);
             break;
         case 0x207:
-            dev = gameport_add(&gameport_207_device);
+            dev->port1 = gameport_add(&gameport_207_device);
             break;
         default:
             break;
@@ -431,16 +455,16 @@ tmacm_init(UNUSED(const device_t *info))
     port = (uint16_t) device_get_config_hex16("port2_addr");
     switch (port) {
         case 0x209:
-            dev = gameport_add(&gameport_209_device);
+            dev->port2 = gameport_add(&gameport_209_device);
             break;
         case 0x20b:
-            dev = gameport_add(&gameport_20b_device);
+            dev->port2 = gameport_add(&gameport_20b_device);
             break;
         case 0x20d:
-            dev = gameport_add(&gameport_20d_device);
+            dev->port2 = gameport_add(&gameport_20d_device);
             break;
         case 0x20f:
-            dev = gameport_add(&gameport_20f_device);
+            dev->port2 = gameport_add(&gameport_20f_device);
             break;
         default:
             break;
@@ -454,29 +478,46 @@ gameport_close(void *priv)
 {
     gameport_t *dev = (gameport_t *) priv;
 
+    // TODO: Later we'll actually support more than one gameport
+    uint8_t joy_insn = 0;
+
     /* If this port was active, remove it from the active ports list. */
     gameport_remap(dev, 0);
 
     /* Free the global instance here, if it wasn't already freed. */
-    if (joystick_instance) {
-        joystick_instance->intf->close(joystick_instance->dat);
+    if (joystick_instance[joy_insn]) {
+        joystick_instance[joy_insn]->intf->close(joystick_instance[joy_insn]->dat);
 
-        free(joystick_instance);
-        joystick_instance = NULL;
+        free(joystick_instance[joy_insn]);
+        joystick_instance[joy_insn] = NULL;
     }
 
     free(dev);
 }
 
 const device_t gameport_device = {
-    .name          = "Game port",
+    .name          = "86Box PNP Game port",
     .internal_name = "gameport",
     .flags         = 0,
-    .local         = 0x080200,
+    .local         = GAMEPORT_PNPROM | GAMEPORT_8ADDR | 0x0200,
     .init          = gameport_init,
     .close         = gameport_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t gameport_200_device = {
+    .name          = "Game port (Port 200h-207h)",
+    .internal_name = "gameport_200",
+    .flags         = 0,
+    .local         = GAMEPORT_8ADDR | 0x0200,
+    .init          = gameport_init,
+    .close         = gameport_close,
+    .reset         = NULL,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -486,11 +527,11 @@ const device_t gameport_201_device = {
     .name          = "Game port (Port 201h only)",
     .internal_name = "gameport_201",
     .flags         = 0,
-    .local         = 0x010201,
+    .local         = GAMEPORT_1ADDR | 0x0201,
     .init          = gameport_init,
     .close         = gameport_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -500,11 +541,11 @@ const device_t gameport_203_device = {
     .name          = "Game port (Port 203h only)",
     .internal_name = "gameport_203",
     .flags         = 0,
-    .local         = 0x010203,
+    .local         = GAMEPORT_1ADDR | 0x0203,
     .init          = gameport_init,
     .close         = gameport_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -514,11 +555,11 @@ const device_t gameport_205_device = {
     .name          = "Game port (Port 205h only)",
     .internal_name = "gameport_205",
     .flags         = 0,
-    .local         = 0x010205,
+    .local         = GAMEPORT_1ADDR | 0x0205,
     .init          = gameport_init,
     .close         = gameport_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -528,11 +569,11 @@ const device_t gameport_207_device = {
     .name          = "Game port (Port 207h only)",
     .internal_name = "gameport_207",
     .flags         = 0,
-    .local         = 0x010207,
+    .local         = GAMEPORT_1ADDR | 0x0207,
     .init          = gameport_init,
     .close         = gameport_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -542,11 +583,11 @@ const device_t gameport_208_device = {
     .name          = "Game port (Port 208h-20fh)",
     .internal_name = "gameport_208",
     .flags         = 0,
-    .local         = 0x080208,
+    .local         = GAMEPORT_8ADDR | 0x0208,
     .init          = gameport_init,
     .close         = gameport_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -556,11 +597,11 @@ const device_t gameport_209_device = {
     .name          = "Game port (Port 209h only)",
     .internal_name = "gameport_209",
     .flags         = 0,
-    .local         = 0x010209,
+    .local         = GAMEPORT_1ADDR | 0x0209,
     .init          = gameport_init,
     .close         = gameport_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -570,11 +611,11 @@ const device_t gameport_20b_device = {
     .name          = "Game port (Port 20Bh only)",
     .internal_name = "gameport_20b",
     .flags         = 0,
-    .local         = 0x01020B,
+    .local         = GAMEPORT_1ADDR | 0x020B,
     .init          = gameport_init,
     .close         = gameport_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -584,11 +625,11 @@ const device_t gameport_20d_device = {
     .name          = "Game port (Port 20Dh only)",
     .internal_name = "gameport_20d",
     .flags         = 0,
-    .local         = 0x01020D,
+    .local         = GAMEPORT_1ADDR | 0x020D,
     .init          = gameport_init,
     .close         = gameport_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -598,11 +639,11 @@ const device_t gameport_20f_device = {
     .name          = "Game port (Port 20Fh only)",
     .internal_name = "gameport_20f",
     .flags         = 0,
-    .local         = 0x01020F,
+    .local         = GAMEPORT_1ADDR | 0x020F,
     .init          = gameport_init,
     .close         = gameport_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -611,40 +652,42 @@ const device_t gameport_20f_device = {
 static const device_config_t tmacm_config[] = {
   // clang-format off
     {
-        .name = "port1_addr",
-        .description = "Port 1 Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x0201,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "port1_addr",
+        .description    = "Port 1 Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0201,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "201h",     .value = 0x0201 },
             { .description = "203h",     .value = 0x0203 },
             { .description = "205h",     .value = 0x0205 },
             { .description = "207h",     .value = 0x0207 },
             { .description = "Disabled", .value = 0x0000 },
-            { "" }
-        }
+            { .description = ""                          }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "port2_addr",
-        .description = "Port 2 Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x0209,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "port2_addr",
+        .description    = "Port 2 Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0209,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "209h",     .value = 0x0209 },
             { .description = "20Bh",     .value = 0x020B },
             { .description = "20Dh",     .value = 0x020D },
             { .description = "20Fh",     .value = 0x020F },
             { .description = "Disabled", .value = 0x0000 },
-            { "" }
-        }
+            { .description = ""                          }
+        },
+        .bios           = { { 0 } }
     },
-    { "", "", -1 }
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
@@ -656,7 +699,7 @@ const device_t gameport_tm_acm_device = {
     .init          = tmacm_init,
     .close         = NULL,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = tmacm_config
@@ -666,11 +709,25 @@ const device_t gameport_pnp_device = {
     .name          = "Game port (Plug and Play only)",
     .internal_name = "gameport_pnp",
     .flags         = 0,
-    .local         = 0x080000,
+    .local         = GAMEPORT_8ADDR,
     .init          = gameport_init,
     .close         = gameport_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t gameport_pnp_1io_device = {
+    .name          = "Game port (Plug and Play only, 1 I/O port)",
+    .internal_name = "gameport_pnp_1io",
+    .flags         = 0,
+    .local         = GAMEPORT_1ADDR,
+    .init          = gameport_init,
+    .close         = gameport_close,
+    .reset         = NULL,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -680,11 +737,11 @@ const device_t gameport_pnp_6io_device = {
     .name          = "Game port (Plug and Play only, 6 I/O ports)",
     .internal_name = "gameport_pnp_6io",
     .flags         = 0,
-    .local         = 0x060000,
+    .local         = GAMEPORT_6ADDR,
     .init          = gameport_init,
     .close         = gameport_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -694,11 +751,11 @@ const device_t gameport_sio_device = {
     .name          = "Game port (Super I/O)",
     .internal_name = "gameport_sio",
     .flags         = 0,
-    .local         = 0x1080000,
+    .local         = GAMEPORT_SIO | GAMEPORT_8ADDR,
     .init          = gameport_init,
     .close         = gameport_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -706,14 +763,75 @@ const device_t gameport_sio_device = {
 
 const device_t gameport_sio_1io_device = {
     .name          = "Game port (Super I/O, 1 I/O port)",
-    .internal_name = "gameport_sio",
+    .internal_name = "gameport_sio_1io",
     .flags         = 0,
-    .local         = 0x1010000,
+    .local         = GAMEPORT_SIO | GAMEPORT_1ADDR,
     .init          = gameport_init,
     .close         = gameport_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
 };
+
+static const GAMEPORT gameports[] = {
+    { &device_none            },
+    { &device_internal        },
+    { &gameport_200_device    },
+    { &gameport_device        },
+    { &gameport_208_device    },
+    { &gameport_pnp_device    },
+    { &gameport_tm_acm_device },
+    { NULL                    }
+    // clang-format on
+};
+
+/* UI */
+int
+gameport_available(int port)
+{
+    if (gameports[port].device)
+        return (device_available(gameports[port].device));
+
+    return 1;
+}
+
+/* UI */
+const device_t *
+gameport_get_device(int port)
+{
+    return (gameports[port].device);
+}
+
+/* UI */
+int
+gameport_has_config(int port)
+{
+    if (!gameports[port].device)
+        return 0;
+
+    return (device_has_config(gameports[port].device) ? 1 : 0);
+}
+
+/* UI */
+const char *
+gameport_get_internal_name(int port)
+{
+    return device_get_internal_name(gameports[port].device);
+}
+
+/* UI */
+int
+gameport_get_from_internal_name(const char *str)
+{
+    int c = 0;
+
+    while (gameports[c].device != NULL) {
+        if (!strcmp(gameports[c].device->internal_name, str))
+            return c;
+        c++;
+    }
+
+    return 0;
+}
diff --git a/src/game/joystick_ch_flightstick_pro.c b/src/game/joystick_ch_flightstick_pro.c
index 49ce824bc..b3d4e0ef5 100644
--- a/src/game/joystick_ch_flightstick_pro.c
+++ b/src/game/joystick_ch_flightstick_pro.c
@@ -8,8 +8,6 @@
  *
  *          Implementation of the Flight Stick Pro.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Sarah Walker, <https://pcem-emulator.co.uk/>
  *
@@ -43,7 +41,6 @@
 #include <86box/device.h>
 #include <86box/timer.h>
 #include <86box/gameport.h>
-#include <86box/joystick_standard.h>
 #include <86box/plat_unused.h>
 
 static void *
@@ -63,23 +60,23 @@ ch_flightstick_pro_read(UNUSED(void *priv))
 {
     uint8_t ret = 0xf0;
 
-    if (JOYSTICK_PRESENT(0)) {
-        if (joystick_state[0].button[0])
+    if (JOYSTICK_PRESENT(0, 0)) {
+        if (joystick_state[0][0].button[0])
             ret &= ~0x10;
-        if (joystick_state[0].button[1])
+        if (joystick_state[0][0].button[1])
             ret &= ~0x20;
-        if (joystick_state[0].button[2])
+        if (joystick_state[0][0].button[2])
             ret &= ~0x40;
-        if (joystick_state[0].button[3])
+        if (joystick_state[0][0].button[3])
             ret &= ~0x80;
-        if (joystick_state[0].pov[0] != -1) {
-            if (joystick_state[0].pov[0] > 315 || joystick_state[0].pov[0] < 45)
+        if (joystick_state[0][0].pov[0] != -1) {
+            if (joystick_state[0][0].pov[0] > 315 || joystick_state[0][0].pov[0] < 45)
                 ret &= ~0xf0;
-            else if (joystick_state[0].pov[0] >= 45 && joystick_state[0].pov[0] < 135)
+            else if (joystick_state[0][0].pov[0] >= 45 && joystick_state[0][0].pov[0] < 135)
                 ret &= ~0xb0;
-            else if (joystick_state[0].pov[0] >= 135 && joystick_state[0].pov[0] < 225)
+            else if (joystick_state[0][0].pov[0] >= 135 && joystick_state[0][0].pov[0] < 225)
                 ret &= ~0x70;
-            else if (joystick_state[0].pov[0] >= 225 && joystick_state[0].pov[0] < 315)
+            else if (joystick_state[0][0].pov[0] >= 225 && joystick_state[0][0].pov[0] < 315)
                 ret &= ~0x30;
         }
     }
@@ -96,18 +93,38 @@ ch_flightstick_pro_write(UNUSED(void *priv))
 static int
 ch_flightstick_pro_read_axis(UNUSED(void *priv), int axis)
 {
-    if (!JOYSTICK_PRESENT(0))
+    if (!JOYSTICK_PRESENT(0, 0))
         return AXIS_NOT_PRESENT;
 
     switch (axis) {
         case 0:
-            return joystick_state[0].axis[0];
+            return joystick_state[0][0].axis[0];
         case 1:
-            return joystick_state[0].axis[1];
+            return joystick_state[0][0].axis[1];
         case 2:
             return 0;
         case 3:
-            return joystick_state[0].axis[2];
+            return joystick_state[0][0].axis[2];
+        default:
+            return 0;
+    }
+}
+
+static int
+ch_flightstick_pro_ch_pedals_read_axis(UNUSED(void *priv), int axis)
+{
+    if (!JOYSTICK_PRESENT(0, 0))
+        return AXIS_NOT_PRESENT;
+
+    switch (axis) {
+        case 0:
+            return joystick_state[0][0].axis[0];
+        case 1:
+            return joystick_state[0][0].axis[1];
+        case 2:
+            return joystick_state[0][0].axis[3];
+        case 3:
+            return joystick_state[0][0].axis[2];
         default:
             return 0;
     }
@@ -119,7 +136,7 @@ ch_flightstick_pro_a0_over(UNUSED(void *priv))
     //
 }
 
-const joystick_if_t joystick_ch_flightstick_pro = {
+const joystick_t joystick_ch_flightstick_pro = {
     .name          = "CH Flightstick Pro",
     .internal_name = "ch_flightstick_pro",
     .init          = ch_flightstick_pro_init,
@@ -136,3 +153,21 @@ const joystick_if_t joystick_ch_flightstick_pro = {
     .button_names  = { "Button 1", "Button 2", "Button 3", "Button 4" },
     .pov_names     = { "POV" }
 };
+
+const joystick_t joystick_ch_flightstick_pro_ch_pedals = {
+    .name          = "CH Flightstick Pro + CH Pedals",
+    .internal_name = "ch_flightstick_pro_ch_pedals",
+    .init          = ch_flightstick_pro_init,
+    .close         = ch_flightstick_pro_close,
+    .read          = ch_flightstick_pro_read,
+    .write         = ch_flightstick_pro_write,
+    .read_axis     = ch_flightstick_pro_ch_pedals_read_axis,
+    .a0_over       = ch_flightstick_pro_a0_over,
+    .axis_count    = 4,
+    .button_count  = 4,
+    .pov_count     = 1,
+    .max_joysticks = 1,
+    .axis_names    = { "X axis", "Y axis", "Throttle", "Rudder" },
+    .button_names  = { "Button 1", "Button 2", "Button 3", "Button 4" },
+    .pov_names     = { "POV" }
+};
diff --git a/src/game/joystick_standard.c b/src/game/joystick_standard.c
index b9c449f99..fa83826da 100644
--- a/src/game/joystick_standard.c
+++ b/src/game/joystick_standard.c
@@ -8,13 +8,14 @@
  *
  *          Implementation of a standard joystick.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
  *          Copyright 2016-2018 Miran Grca.
  *          Copyright 2008-2018 Sarah Walker.
+ *          Copyright 2021-2025 Jasmine Iwanek.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,7 +44,6 @@
 #include <86box/device.h>
 #include <86box/timer.h>
 #include <86box/gameport.h>
-#include <86box/joystick_standard.h>
 #include <86box/plat_unused.h>
 
 static void *
@@ -63,16 +63,17 @@ joystick_standard_read(UNUSED(void *priv))
 {
     uint8_t ret = 0xf0;
 
-    if (JOYSTICK_PRESENT(0)) {
-        if (joystick_state[0].button[0])
+    if (JOYSTICK_PRESENT(0, 0)) {
+        if (joystick_state[0][0].button[0])
             ret &= ~0x10;
-        if (joystick_state[0].button[1])
+        if (joystick_state[0][0].button[1])
             ret &= ~0x20;
     }
-    if (JOYSTICK_PRESENT(1)) {
-        if (joystick_state[1].button[0])
+
+    if (JOYSTICK_PRESENT(0, 1)) {
+        if (joystick_state[0][1].button[0])
             ret &= ~0x40;
-        if (joystick_state[1].button[1])
+        if (joystick_state[0][1].button[1])
             ret &= ~0x80;
     }
 
@@ -84,14 +85,14 @@ joystick_standard_read_4button(UNUSED(void *priv))
 {
     uint8_t ret = 0xf0;
 
-    if (JOYSTICK_PRESENT(0)) {
-        if (joystick_state[0].button[0])
+    if (JOYSTICK_PRESENT(0, 0)) {
+        if (joystick_state[0][0].button[0])
             ret &= ~0x10;
-        if (joystick_state[0].button[1])
+        if (joystick_state[0][0].button[1])
             ret &= ~0x20;
-        if (joystick_state[0].button[2])
+        if (joystick_state[0][0].button[2])
             ret &= ~0x40;
-        if (joystick_state[0].button[3])
+        if (joystick_state[0][0].button[3])
             ret &= ~0x80;
     }
 
@@ -109,21 +110,21 @@ joystick_standard_read_axis(UNUSED(void *priv), int axis)
 {
     switch (axis) {
         case 0:
-            if (!JOYSTICK_PRESENT(0))
+            if (!JOYSTICK_PRESENT(0, 0))
                 return AXIS_NOT_PRESENT;
-            return joystick_state[0].axis[0];
+            return joystick_state[0][0].axis[0];
         case 1:
-            if (!JOYSTICK_PRESENT(0))
+            if (!JOYSTICK_PRESENT(0, 0))
                 return AXIS_NOT_PRESENT;
-            return joystick_state[0].axis[1];
+            return joystick_state[0][0].axis[1];
         case 2:
-            if (!JOYSTICK_PRESENT(1))
+            if (!JOYSTICK_PRESENT(0, 1))
                 return AXIS_NOT_PRESENT;
-            return joystick_state[1].axis[0];
+            return joystick_state[0][1].axis[0];
         case 3:
-            if (!JOYSTICK_PRESENT(1))
+            if (!JOYSTICK_PRESENT(0, 1))
                 return AXIS_NOT_PRESENT;
-            return joystick_state[1].axis[1];
+            return joystick_state[0][1].axis[1];
         default:
             return 0;
     }
@@ -132,38 +133,69 @@ joystick_standard_read_axis(UNUSED(void *priv), int axis)
 static int
 joystick_standard_read_axis_4button(UNUSED(void *priv), int axis)
 {
-    if (!JOYSTICK_PRESENT(0))
+    if (!JOYSTICK_PRESENT(0, 0))
         return AXIS_NOT_PRESENT;
 
     switch (axis) {
         case 0:
-            return joystick_state[0].axis[0];
+            return joystick_state[0][0].axis[0];
         case 1:
-            return joystick_state[0].axis[1];
+            return joystick_state[0][0].axis[1];
         case 2:
-            return 0;
         case 3:
-            return 0;
         default:
             return 0;
     }
 }
 
+#if 0
+// For later use
+static int
+joystick_standard_read_axis_with_pov(UNUSED(void *priv), int axis)
+{
+    if (!JOYSTICK_PRESENT(0, 0))
+        return AXIS_NOT_PRESENT;
+
+    switch (axis) {
+        case 0: // X-axis
+            return joystick_state[0][0].axis[0];
+        case 1: // Y-axis
+            return joystick_state[0][0].axis[1];
+        case 2: // POV Hat (mapped to the 3rd logical axis, index 2)
+            if (joystick_state[0][0].pov[0] == -1)
+                return 32767; // Centered/No input (as per tm_fcs_rcs_read_axis example)
+            if (joystick_state[0][0].pov[0] > 315 || joystick_state[0][0].pov[0] < 45)
+                return -32768; // Up
+            if (joystick_state[0][0].pov[0] >= 45 && joystick_state[0][0].pov[0] < 135)
+                return -16384; // Up-Right (example value, matches tm_fcs_rcs_read_axis)
+            if (joystick_state[0][0].pov[0] >= 135 && joystick_state[0][0].pov[0] < 225)
+                return 0; // Right/Left (example, matches tm_fcs_rcs_read_axis)
+            if (joystick_state[0][0].pov[0] >= 225 && joystick_state[0][0].pov[0] < 315)
+                return 16384; // Down-Left (example value, matches tm_fcs_rcs_read_axis)
+            return 0; // Fallback
+        case 3: // This case might be used for a Z-axis if present, or can return 0 if not.
+                // For gamepads with only X/Y and POV, this will likely be unused or return 0.
+            return 0;
+        default:
+            return 0;
+    }
+}
+#endif
+
 static int
 joystick_standard_read_axis_3axis(UNUSED(void *priv), int axis)
 {
-    if (!JOYSTICK_PRESENT(0))
+    if (!JOYSTICK_PRESENT(0, 0))
         return AXIS_NOT_PRESENT;
 
     switch (axis) {
         case 0:
-            return joystick_state[0].axis[0];
+            return joystick_state[0][0].axis[0];
         case 1:
-            return joystick_state[0].axis[1];
+            return joystick_state[0][0].axis[1];
         case 2:
-            return joystick_state[0].axis[2];
+            return joystick_state[0][0].axis[2];
         case 3:
-            return 0;
         default:
             return 0;
     }
@@ -172,18 +204,18 @@ joystick_standard_read_axis_3axis(UNUSED(void *priv), int axis)
 static int
 joystick_standard_read_axis_4axis(UNUSED(void *priv), int axis)
 {
-    if (!JOYSTICK_PRESENT(0))
+    if (!JOYSTICK_PRESENT(0, 0))
         return AXIS_NOT_PRESENT;
 
     switch (axis) {
         case 0:
-            return joystick_state[0].axis[0];
+            return joystick_state[0][0].axis[0];
         case 1:
-            return joystick_state[0].axis[1];
+            return joystick_state[0][0].axis[1];
         case 2:
-            return joystick_state[0].axis[2];
+            return joystick_state[0][0].axis[2];
         case 3:
-            return joystick_state[0].axis[3];
+            return joystick_state[0][0].axis[3];
         default:
             return 0;
     }
@@ -192,18 +224,18 @@ joystick_standard_read_axis_4axis(UNUSED(void *priv), int axis)
 static int
 joystick_standard_read_axis_6button(UNUSED(void *priv), int axis)
 {
-    if (!JOYSTICK_PRESENT(0))
+    if (!JOYSTICK_PRESENT(0, 0))
         return AXIS_NOT_PRESENT;
 
     switch (axis) {
         case 0:
-            return joystick_state[0].axis[0];
+            return joystick_state[0][0].axis[0];
         case 1:
-            return joystick_state[0].axis[1];
+            return joystick_state[0][0].axis[1];
         case 2:
-            return joystick_state[0].button[4] ? -32767 : 32768;
+            return joystick_state[0][0].button[4] ? -32767 : 32768;
         case 3:
-            return joystick_state[0].button[5] ? -32767 : 32768;
+            return joystick_state[0][0].button[5] ? -32767 : 32768;
         default:
             return 0;
     }
@@ -211,24 +243,24 @@ joystick_standard_read_axis_6button(UNUSED(void *priv), int axis)
 static int
 joystick_standard_read_axis_8button(UNUSED(void *priv), int axis)
 {
-    if (!JOYSTICK_PRESENT(0))
+    if (!JOYSTICK_PRESENT(0, 0))
         return AXIS_NOT_PRESENT;
 
     switch (axis) {
         case 0:
-            return joystick_state[0].axis[0];
+            return joystick_state[0][0].axis[0];
         case 1:
-            return joystick_state[0].axis[1];
+            return joystick_state[0][0].axis[1];
         case 2:
-            if (joystick_state[0].button[4])
+            if (joystick_state[0][0].button[4])
                 return -32767;
-            if (joystick_state[0].button[6])
+            if (joystick_state[0][0].button[6])
                 return 32768;
             return 0;
         case 3:
-            if (joystick_state[0].button[5])
+            if (joystick_state[0][0].button[5])
                 return -32767;
-            if (joystick_state[0].button[7])
+            if (joystick_state[0][0].button[7])
                 return 32768;
             return 0;
         default:
@@ -242,7 +274,7 @@ joystick_standard_a0_over(UNUSED(void *priv))
     //
 }
 
-const joystick_if_t joystick_2axis_2button = {
+const joystick_t joystick_2axis_2button = {
     .name          = "2-axis, 2-button joystick(s)",
     .internal_name = "2axis_2button",
     .init          = joystick_standard_init,
@@ -260,7 +292,43 @@ const joystick_if_t joystick_2axis_2button = {
     .pov_names     = { NULL }
 };
 
-const joystick_if_t joystick_2axis_4button = {
+const joystick_t joystick_2button_gamepad = {
+    .name          = "2-button gamepad(s)",
+    .internal_name = "2button_gamepad",
+    .init          = joystick_standard_init,
+    .close         = joystick_standard_close,
+    .read          = joystick_standard_read,
+    .write         = joystick_standard_write,
+    .read_axis     = joystick_standard_read_axis,
+    .a0_over       = joystick_standard_a0_over,
+    .axis_count    = 2,
+    .button_count  = 2,
+    .pov_count     = 0,
+    .max_joysticks = 2,
+    .axis_names    = { "X axis", "Y axis" },
+    .button_names  = { "Button 1", "Button 2" },
+    .pov_names     = { NULL }
+};
+
+const joystick_t joystick_2button_flight_yoke = {
+    .name          = "2-button flight yoke",
+    .internal_name = "2button_flight_yoke",
+    .init          = joystick_standard_init,
+    .close         = joystick_standard_close,
+    .read          = joystick_standard_read,
+    .write         = joystick_standard_write,
+    .read_axis     = joystick_standard_read_axis,
+    .a0_over       = joystick_standard_a0_over,
+    .axis_count    = 2,
+    .button_count  = 2,
+    .pov_count     = 0,
+    .max_joysticks = 2,
+    .axis_names    = { "Roll axis", "Pitch axis" },
+    .button_names  = { "Trigger", "Button 2" },
+    .pov_names     = { NULL }
+};
+
+const joystick_t joystick_2axis_4button = {
     .name          = "2-axis, 4-button joystick",
     .internal_name = "2axis_4button",
     .init          = joystick_standard_init,
@@ -278,7 +346,43 @@ const joystick_if_t joystick_2axis_4button = {
     .pov_names     = { NULL }
 };
 
-const joystick_if_t joystick_3axis_2button = {
+const joystick_t joystick_4button_gamepad = {
+    .name          = "4-button gamepad",
+    .internal_name = "4button_gamepad",
+    .init          = joystick_standard_init,
+    .close         = joystick_standard_close,
+    .read          = joystick_standard_read_4button,
+    .write         = joystick_standard_write,
+    .read_axis     = joystick_standard_read_axis_4button,
+    .a0_over       = joystick_standard_a0_over,
+    .axis_count    = 2,
+    .button_count  = 4,
+    .pov_count     = 0,
+    .max_joysticks = 1,
+    .axis_names    = { "X axis", "Y axis" },
+    .button_names  = { "Button 1", "Button 2", "Button 3", "Button 4" },
+    .pov_names     = { NULL }
+};
+
+const joystick_t joystick_4button_flight_yoke = {
+    .name          = "4-button flight yoke",
+    .internal_name = "4button_flight_yoke",
+    .init          = joystick_standard_init,
+    .close         = joystick_standard_close,
+    .read          = joystick_standard_read_4button,
+    .write         = joystick_standard_write,
+    .read_axis     = joystick_standard_read_axis_4button,
+    .a0_over       = joystick_standard_a0_over,
+    .axis_count    = 2,
+    .button_count  = 4,
+    .pov_count     = 0,
+    .max_joysticks = 1,
+    .axis_names    = { "Roll axis", "Pitch axis" },
+    .button_names  = { "Trigger", "Button 2", "Button 3", "Button 4" },
+    .pov_names     = { NULL }
+};
+
+const joystick_t joystick_3axis_2button = {
     .name          = "3-axis, 2-button joystick",
     .internal_name = "3axis_2button",
     .init          = joystick_standard_init,
@@ -296,7 +400,25 @@ const joystick_if_t joystick_3axis_2button = {
     .pov_names     = { NULL }
 };
 
-const joystick_if_t joystick_3axis_4button = {
+const joystick_t joystick_2button_yoke_throttle = {
+    .name          = "2-button flight yoke with throttle",
+    .internal_name = "2button_yoke_throttle",
+    .init          = joystick_standard_init,
+    .close         = joystick_standard_close,
+    .read          = joystick_standard_read,
+    .write         = joystick_standard_write,
+    .read_axis     = joystick_standard_read_axis_3axis,
+    .a0_over       = joystick_standard_a0_over,
+    .axis_count    = 3,
+    .button_count  = 2,
+    .pov_count     = 0,
+    .max_joysticks = 1,
+    .axis_names    = { "Roll axis", "Pitch axis", "Throttle axis" },
+    .button_names  = { "Trigger", "Button 2" },
+    .pov_names     = { NULL }
+};
+
+const joystick_t joystick_3axis_4button = {
     .name          = "3-axis, 4-button joystick",
     .internal_name = "3axis_4button",
     .init          = joystick_standard_init,
@@ -314,7 +436,43 @@ const joystick_if_t joystick_3axis_4button = {
     .pov_names     = { NULL }
 };
 
-const joystick_if_t joystick_4axis_4button = {
+const joystick_t joystick_4button_yoke_throttle = {
+    .name          = "4-button flight yoke with throttle",
+    .internal_name = "4button_yoke_throttle",
+    .init          = joystick_standard_init,
+    .close         = joystick_standard_close,
+    .read          = joystick_standard_read_4button,
+    .write         = joystick_standard_write,
+    .read_axis     = joystick_standard_read_axis_3axis,
+    .a0_over       = joystick_standard_a0_over,
+    .axis_count    = 3,
+    .button_count  = 4,
+    .pov_count     = 0,
+    .max_joysticks = 1,
+    .axis_names    = { "Roll axis", "Pitch axis", "Throttle axis" },
+    .button_names  = { "Button 1", "Button 2", "Button 3", "Button 4" },
+    .pov_names     = { NULL }
+};
+
+const joystick_t joystick_win95_steering_wheel = {
+    .name          = "Win95 Steering Wheel (3-axis, 4-button)",
+    .internal_name = "win95_steering_wheel",
+    .init          = joystick_standard_init,
+    .close         = joystick_standard_close,
+    .read          = joystick_standard_read_4button,
+    .write         = joystick_standard_write,
+    .read_axis     = joystick_standard_read_axis_3axis,
+    .a0_over       = joystick_standard_a0_over,
+    .axis_count    = 3,
+    .button_count  = 4,
+    .pov_count     = 0,
+    .max_joysticks = 1,
+    .axis_names    = { "Steering axis", "Accelerator axis", "Brake axis" },
+    .button_names  = { "Button 1", "Button 2", "Button 3", "Button 4" },
+    .pov_names     = { NULL }
+};
+
+const joystick_t joystick_4axis_4button = {
     .name          = "4-axis, 4-button joystick",
     .internal_name = "4axis_4button",
     .init          = joystick_standard_init,
@@ -332,7 +490,7 @@ const joystick_if_t joystick_4axis_4button = {
     .pov_names     = { NULL }
 };
 
-const joystick_if_t joystick_2axis_6button = {
+const joystick_t joystick_2axis_6button = {
     .name          = "2-axis, 6-button joystick",
     .internal_name = "2axis_6button",
     .init          = joystick_standard_init,
@@ -350,7 +508,7 @@ const joystick_if_t joystick_2axis_6button = {
     .pov_names     = { NULL }
 };
 
-const joystick_if_t joystick_2axis_8button = {
+const joystick_t joystick_2axis_8button = {
     .name          = "2-axis, 8-button joystick",
     .internal_name = "2axis_8button",
     .init          = joystick_standard_init,
diff --git a/src/game/joystick_sw_pad.c b/src/game/joystick_sw_pad.c
index 5c91ee1e9..7c1d4910b 100644
--- a/src/game/joystick_sw_pad.c
+++ b/src/game/joystick_sw_pad.c
@@ -29,8 +29,6 @@
  *          - Some DOS stuff will write to 0x201 while a packet is
  *            being transferred. This seems to be ignored.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Sarah Walker, <https://pcem-emulator.co.uk/>
  *
@@ -64,7 +62,6 @@
 #include <86box/device.h>
 #include <86box/timer.h>
 #include <86box/gameport.h>
-#include <86box/joystick_sw_pad.h>
 #include <86box/plat_unused.h>
 
 typedef struct sw_data {
@@ -93,9 +90,7 @@ sw_timer_over(void *priv)
     if (sw->poll_left == 1 && !sw->poll_clock)
         timer_advance_u64(&sw->poll_timer, TIMER_USEC * 160);
     else if (sw->poll_left)
-        timer_advance_u64(&sw->poll_timer, TIMER_USEC * 5);
-    else
-        timer_disable(&sw->poll_timer);
+        timer_set_delay_u64(&sw->poll_timer, TIMER_USEC * 5);
 }
 
 static void
@@ -122,8 +117,7 @@ sw_parity(uint16_t data)
 static void *
 sw_init(void)
 {
-    sw_data *sw = (sw_data *) malloc(sizeof(sw_data));
-    memset(sw, 0, sizeof(sw_data));
+    sw_data *sw = (sw_data *) calloc(1, sizeof(sw_data));
 
     timer_add(&sw->poll_timer, sw_timer_over, sw, 0);
     timer_add(&sw->trigger_timer, sw_trigger_timer_over, sw, 0);
@@ -145,7 +139,7 @@ sw_read(void *priv)
     sw_data *sw   = (sw_data *) priv;
     uint8_t  temp = 0;
 
-    if (!JOYSTICK_PRESENT(0))
+    if (!JOYSTICK_PRESENT(0, 0))
         return 0xff;
 
     if (timer_is_enabled(&sw->poll_timer)) {
@@ -171,14 +165,12 @@ sw_write(void *priv)
     sw_data *sw              = (sw_data *) priv;
     int64_t  time_since_last = timer_get_remaining_us(&sw->trigger_timer);
 
-    if (!JOYSTICK_PRESENT(0))
+    if (!JOYSTICK_PRESENT(0, 0))
         return;
 
-    timer_process();
-
     if (!sw->poll_left) {
         sw->poll_clock = 1;
-        timer_set_delay_u64(&sw->poll_timer, TIMER_USEC * 50);
+        timer_set_delay_u64(&sw->poll_timer, TIMER_USEC * 40);
 
         if (time_since_last > 9900 && time_since_last < 9940) {
             sw->poll_mode = 0;
@@ -196,24 +188,24 @@ sw_write(void *priv)
                 sw->poll_data = 1;
             }
 
-            for (uint8_t c = 0; c < 4; c++) {
+            for (uint8_t js = 0; js < 4; js++) {
                 uint16_t data = 0x3fff;
 
-                if (!JOYSTICK_PRESENT(c))
+                if (!JOYSTICK_PRESENT(0, js))
                     break;
 
-                if (joystick_state[c].axis[1] < -16383)
+                if (joystick_state[0][js].axis[1] < -16383)
                     data &= ~1;
-                if (joystick_state[c].axis[1] > 16383)
+                if (joystick_state[0][js].axis[1] > 16383)
                     data &= ~2;
-                if (joystick_state[c].axis[0] > 16383)
+                if (joystick_state[0][js].axis[0] > 16383)
                     data &= ~4;
-                if (joystick_state[c].axis[0] < -16383)
+                if (joystick_state[0][js].axis[0] < -16383)
                     data &= ~8;
 
-                for (uint8_t b = 0; b < 10; b++) {
-                    if (joystick_state[c].button[b])
-                        data &= ~(1 << (b + 4));
+                for (uint8_t button_nr = 0; button_nr < 10; button_nr++) {
+                    if (joystick_state[0][js].button[button_nr])
+                        data &= ~(1 << (button_nr + 4));
                 }
 
                 if (sw_parity(data))
@@ -221,10 +213,10 @@ sw_write(void *priv)
 
                 if (sw->poll_mode) {
                     sw->poll_left += 5;
-                    sw->poll_data |= (data << (c * 15 + 3));
+                    sw->poll_data |= (data << (js * 15 + 3));
                 } else {
                     sw->poll_left += 15;
-                    sw->poll_data |= (data << (c * 15 + 1));
+                    sw->poll_data |= (data << (js * 15 + 1));
                 }
             }
         }
@@ -236,7 +228,7 @@ sw_write(void *priv)
 static int
 sw_read_axis(UNUSED(void *priv), UNUSED(int axis))
 {
-    if (!JOYSTICK_PRESENT(0))
+    if (!JOYSTICK_PRESENT(0, 0))
         return AXIS_NOT_PRESENT;
 
     return 0; /*No analogue support on Sidewinder game pad*/
@@ -250,7 +242,7 @@ sw_a0_over(void *priv)
     timer_set_delay_u64(&sw->trigger_timer, TIMER_USEC * 10000);
 }
 
-const joystick_if_t joystick_sw_pad = {
+const joystick_t joystick_sw_pad = {
     .name          = "Microsoft SideWinder Pad",
     .internal_name = "sidewinder_pad",
     .init          = sw_init,
diff --git a/src/game/joystick_tm_fcs.c b/src/game/joystick_tm_fcs.c
index d54d0e37d..6c1176a42 100644
--- a/src/game/joystick_tm_fcs.c
+++ b/src/game/joystick_tm_fcs.c
@@ -8,8 +8,6 @@
  *
  *          Implementation of Thrust Master Flight Control System.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Sarah Walker, <https://pcem-emulator.co.uk/>
  *
@@ -43,7 +41,6 @@
 #include <86box/device.h>
 #include <86box/timer.h>
 #include <86box/gameport.h>
-#include <86box/joystick_standard.h>
 #include <86box/plat_unused.h>
 
 static void *
@@ -63,14 +60,14 @@ tm_fcs_read(UNUSED(void *priv))
 {
     uint8_t ret = 0xf0;
 
-    if (JOYSTICK_PRESENT(0)) {
-        if (joystick_state[0].button[0])
+    if (JOYSTICK_PRESENT(0, 0)) {
+        if (joystick_state[0][0].button[0])
             ret &= ~0x10;
-        if (joystick_state[0].button[1])
+        if (joystick_state[0][0].button[1])
             ret &= ~0x20;
-        if (joystick_state[0].button[2])
+        if (joystick_state[0][0].button[2])
             ret &= ~0x40;
-        if (joystick_state[0].button[3])
+        if (joystick_state[0][0].button[3])
             ret &= ~0x80;
     }
 
@@ -86,26 +83,56 @@ tm_fcs_write(UNUSED(void *priv))
 static int
 tm_fcs_read_axis(UNUSED(void *priv), int axis)
 {
-    if (!JOYSTICK_PRESENT(0))
+    if (!JOYSTICK_PRESENT(0, 0))
         return AXIS_NOT_PRESENT;
 
     switch (axis) {
         case 0:
-            return joystick_state[0].axis[0];
+            return joystick_state[0][0].axis[0];
         case 1:
-            return joystick_state[0].axis[1];
+            return joystick_state[0][0].axis[1];
         case 2:
             return 0;
         case 3:
-            if (joystick_state[0].pov[0] == -1)
+            if (joystick_state[0][0].pov[0] == -1)
                 return 32767;
-            if (joystick_state[0].pov[0] > 315 || joystick_state[0].pov[0] < 45)
+            if (joystick_state[0][0].pov[0] > 315 || joystick_state[0][0].pov[0] < 45)
                 return -32768;
-            if (joystick_state[0].pov[0] >= 45 && joystick_state[0].pov[0] < 135)
+            if (joystick_state[0][0].pov[0] >= 45 && joystick_state[0][0].pov[0] < 135)
                 return -16384;
-            if (joystick_state[0].pov[0] >= 135 && joystick_state[0].pov[0] < 225)
+            if (joystick_state[0][0].pov[0] >= 135 && joystick_state[0][0].pov[0] < 225)
                 return 0;
-            if (joystick_state[0].pov[0] >= 225 && joystick_state[0].pov[0] < 315)
+            if (joystick_state[0][0].pov[0] >= 225 && joystick_state[0][0].pov[0] < 315)
+                return 16384;
+            return 0;
+        default:
+            return 0;
+    }
+}
+
+static int
+tm_fcs_rcs_read_axis(UNUSED(void *priv), int axis)
+{
+    if (!JOYSTICK_PRESENT(0, 0))
+        return AXIS_NOT_PRESENT;
+
+    switch (axis) {
+        case 0:
+            return joystick_state[0][0].axis[0];
+        case 1:
+            return joystick_state[0][0].axis[1];
+        case 2:
+            return joystick_state[0][0].axis[2];
+        case 3:
+            if (joystick_state[0][0].pov[0] == -1)
+                return 32767;
+            if (joystick_state[0][0].pov[0] > 315 || joystick_state[0][0].pov[0] < 45)
+                return -32768;
+            if (joystick_state[0][0].pov[0] >= 45 && joystick_state[0][0].pov[0] < 135)
+                return -16384;
+            if (joystick_state[0][0].pov[0] >= 135 && joystick_state[0][0].pov[0] < 225)
+                return 0;
+            if (joystick_state[0][0].pov[0] >= 225 && joystick_state[0][0].pov[0] < 315)
                 return 16384;
             return 0;
         default:
@@ -119,7 +146,7 @@ tm_fcs_a0_over(UNUSED(void *priv))
     //
 }
 
-const joystick_if_t joystick_tm_fcs = {
+const joystick_t joystick_tm_fcs = {
     .name          = "Thrustmaster Flight Control System",
     .internal_name = "thrustmaster_fcs",
     .init          = tm_fcs_init,
@@ -136,3 +163,21 @@ const joystick_if_t joystick_tm_fcs = {
     .button_names  = { "Button 1", "Button 2", "Button 3", "Button 4" },
     .pov_names     = { "POV" }
 };
+
+const joystick_t joystick_tm_fcs_rcs = {
+    .name          = "Thrustmaster FCS + Rudder Control System",
+    .internal_name = "thrustmaster_fcs_rcs",
+    .init          = tm_fcs_init,
+    .close         = tm_fcs_close,
+    .read          = tm_fcs_read,
+    .write         = tm_fcs_write,
+    .read_axis     = tm_fcs_rcs_read_axis,
+    .a0_over       = tm_fcs_a0_over,
+    .axis_count    = 3,
+    .button_count  = 4,
+    .pov_count     = 1,
+    .max_joysticks = 1,
+    .axis_names    = { "X axis", "Y axis", "Rudder" },
+    .button_names  = { "Button 1", "Button 2", "Button 3", "Button 4" },
+    .pov_names     = { "POV" }
+};
diff --git a/src/gdbstub.c b/src/gdbstub.c
index 703637422..2ae40d24c 100644
--- a/src/gdbstub.c
+++ b/src/gdbstub.c
@@ -40,6 +40,7 @@
 #include <86box/86box.h>
 #include "cpu.h"
 #include "x86seg.h"
+#include "x87_sf.h"
 #include "x87.h"
 #include "x87_ops_conv.h"
 #include <86box/io.h>
@@ -365,13 +366,7 @@ gdbstub_break(void)
 static void
 gdbstub_jump(uint32_t new_pc)
 {
-    /* Nasty hack; qemu always uses the full 32-bit EIP internally... */
-    if (cpu_state.op32 || ((new_pc >= cs) && (new_pc < (cs + 65536)))) {
-        cpu_state.pc = new_pc - cs;
-    } else {
-        loadseg((new_pc >> 4) & 0xf000, &cpu_state.seg_cs);
-        cpu_state.pc = new_pc & 0xffff;
-    }
+    cpu_state.pc = new_pc - cs;
     flushmmucache();
 }
 
@@ -1518,6 +1513,7 @@ gdbstub_client_thread(void *priv)
                 case '$': /* packet start */
                     /* Wait for any existing packets to be processed. */
                     thread_wait_event(client->processed_event, -1);
+                    thread_set_event(client->processed_event);
 
                     client->packet_pos = 0;
                     break;
@@ -1535,6 +1531,7 @@ gdbstub_client_thread(void *priv)
                 case 0x03: /* break */
                     /* Wait for any existing packets to be processed. */
                     thread_wait_event(client->processed_event, -1);
+                    thread_set_event(client->processed_event);
 
                     /* Break immediately. */
                     gdbstub_log("GDB Stub: Break requested\n");
@@ -1544,6 +1541,7 @@ gdbstub_client_thread(void *priv)
                 default:
                     /* Wait for any existing packets to be processed, just in case. */
                     thread_wait_event(client->processed_event, -1);
+                    thread_set_event(client->processed_event);
 
                     if (client->packet_pos < (sizeof(client->packet) - 1)) {
                         /* Append byte to the packet. */
@@ -1793,6 +1791,24 @@ gdbstub_init(void)
         return;
     }
 
+    int yes = 1;
+    if (setsockopt(gdbstub_socket, SOL_SOCKET, SO_REUSEADDR,
+#ifdef _WIN32
+                   (const char *) &yes,
+#else
+                   &yes,
+#endif
+                   sizeof(yes)) == -1) {
+        pclog("GDB Stub: setsockopt SO_REUSEADDR failed\n");
+        return;
+    }
+
+#ifdef _WIN32
+    if (setsockopt(gdbstub_socket, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, (const char *) &yes, sizeof(yes)) == -1) {
+        pclog("GDB Stub: setsockopt SO_EXCLUSIVEADDRUSE failed\n");
+    }
+#endif
+
     /* Bind GDB server socket. */
     int                port      = 12345;
     struct sockaddr_in bind_addr = {
diff --git a/src/include/86box/86box.h b/src/include/86box/86box.h
index 20f3fffcc..ce39652bc 100644
--- a/src/include/86box/86box.h
+++ b/src/include/86box/86box.h
@@ -8,35 +8,52 @@
  *
  *          Main include file for the application.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Fred N. van Kempen, <decwiz@yahoo.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
  *          Copyright 2016-2020 Miran Grca.
  *          Copyright 2017-2020 Fred N. van Kempen.
  *          Copyright 2021 Laci bá'
+ *          Copyright 2021-2025 Jasmine Iwanek.
  */
 #ifndef EMU_86BOX_H
 #define EMU_86BOX_H
 
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+/* Doesn't compile on NetBSD/OpenBSD without this include */
+#include <stdarg.h>
+#endif
+
+#if defined(__HAIKU__)
+/* Doesn't compile on Haiku without this include */
+#include <stdlib.h>
+#endif
+
 /* Configuration values. */
-#define SERIAL_MAX   4
+#define GFXCARD_MAX  2
+#define SERIAL_MAX   8
 #define PARALLEL_MAX 4
 #define SCREEN_RES_X 640
 #define SCREEN_RES_Y 480
 
 /* Filename and pathname info. */
-#define CONFIG_FILE     "86box.cfg"
-#define NVR_PATH        "nvr"
-#define SCREENSHOT_PATH "screenshots"
+#define CONFIG_FILE        "86box.cfg"
+#define GLOBAL_CONFIG_FILE "86box_global.cfg"
+#define NVR_PATH           "nvr"
+#define SCREENSHOT_PATH    "screenshots"
+#define VMM_PATH		   "Virtual Machines"
+#define VMM_PATH_WINDOWS   "86Box VMs"
 
 /* Recently used images */
-#define MAX_PREV_IMAGES    4
+#define MAX_PREV_IMAGES    10
 #define MAX_IMAGE_PATH_LEN 2048
 
-/* Default language 0xFFFF = from system, 0x409 = en-US */
-#define DEFAULT_LANGUAGE 0x0409
+/* Max UUID Length */
+#define MAX_UUID_LEN 64
+
+/* Default language code */
+#define DEFAULT_LANGUAGE "system"
 
 #define POSTCARDS_NUM 4
 #define POSTCARD_MASK (POSTCARDS_NUM - 1)
@@ -75,8 +92,6 @@ extern "C" {
 #endif
 
 /* Global variables. */
-extern uint32_t lang_sys; /* (-) system language code */
-
 extern int dump_on_exit;        /* (O) dump regs on exit*/
 extern int start_in_fullscreen; /* (O) start in fullscreen */
 #ifdef _WIN32
@@ -103,35 +118,44 @@ extern uint64_t instru_run_ms;
 #define window_y monitor_settings[0].mon_window_y
 #define window_w monitor_settings[0].mon_window_w
 #define window_h monitor_settings[0].mon_window_h
+extern int      inhibit_multimedia_keys;    /* (G) Inhibit multimedia keys on Windows. */
 extern int      window_remember;
 extern int      vid_resize;                 /* (C) allow resizing */
 extern int      invert_display;             /* (C) invert the display */
 extern int      suppress_overscan;          /* (C) suppress overscans */
-extern uint32_t lang_id;                    /* (C) language code identifier */
-extern char     icon_set[256];              /* (C) iconset identifier */
+extern int      lang_id;                    /* (G) language id */
 extern int      scale;                      /* (C) screen scale factor */
 extern int      dpi_scale;                  /* (C) DPI scaling of the emulated screen */
 extern int      vid_api;                    /* (C) video renderer */
 extern int      vid_cga_contrast;           /* (C) video */
+extern int      vid_cga_comp_brightness;    /* (C) CGA composite brightness */
+extern int      vid_cga_comp_sharpness;     /* (C) CGA composite sharpness */
+extern int      vid_cga_comp_hue;           /* (C) CGA composite hue */
+extern int      vid_cga_comp_saturation;    /* (C) CGA composite saturation */
+extern int      vid_cga_comp_contrast;      /* (C) CGA composite saturation */
 extern int      video_fullscreen;           /* (C) video */
-extern int      video_fullscreen_first;     /* (C) video */
 extern int      video_fullscreen_scale;     /* (C) video */
 extern int      enable_overscan;            /* (C) video */
 extern int      force_43;                   /* (C) video */
 extern int      video_filter_method;        /* (C) video */
 extern int      video_vsync;                /* (C) video */
 extern int      video_framerate;            /* (C) video */
-extern int      gfxcard[2];                 /* (C) graphics/video card */
-extern char     video_shader[512];          /* (C) video */
+extern double   video_gl_input_scale;       /* (C) OpenGL 3.x input scale */
+extern int      video_gl_input_scale_mode;  /* (C) OpenGL 3.x input stretch mode */
+extern int      gfxcard[GFXCARD_MAX];       /* (C) graphics/video card */
 extern int      bugger_enabled;             /* (C) enable ISAbugger */
+extern int      novell_keycard_enabled;     /* (C) enable Novell NetWare 2.x key card emulation. */
 extern int      postcard_enabled;           /* (C) enable POST card */
 extern int      unittester_enabled;         /* (C) enable unit tester device */
+extern int      gameport_type[];            /* (C) enable gameports */
 extern int      isamem_type[];              /* (C) enable ISA mem cards */
+extern int      isarom_type[];              /* (C) enable ISA ROM cards */
 extern int      isartc_type;                /* (C) enable ISA RTC card */
 extern int      sound_is_float;             /* (C) sound uses FP values */
 extern int      voodoo_enabled;             /* (C) video option */
 extern int      ibm8514_standalone_enabled; /* (C) video option */
 extern int      xga_standalone_enabled;     /* (C) video option */
+extern int      da2_standalone_enabled;     /* (C) video option */
 extern uint32_t mem_size;                   /* (C) memory size (Installed on system board) */
 extern uint32_t isa_mem_size;               /* (C) memory size (ISA Memory Cards) */
 extern int      cpu;                        /* (C) cpu type */
@@ -140,48 +164,68 @@ extern int      fpu_type;                   /* (C) fpu type */
 extern int      fpu_softfloat;              /* (C) fpu uses softfloat */
 extern int      time_sync;                  /* (C) enable time sync */
 extern int      hdd_format_type;            /* (C) hard disk file format */
-extern int      confirm_reset;              /* (C) enable reset confirmation */
-extern int      confirm_exit;               /* (C) enable exit confirmation */
-extern int      confirm_save;               /* (C) enable save confirmation */
+extern int      confirm_reset;              /* (G) enable reset confirmation */
+extern int      confirm_exit;               /* (G) enable exit confirmation */
+extern int      confirm_save;               /* (G) enable save confirmation */
 extern int      enable_discord;             /* (C) enable Discord integration */
+extern int      force_10ms;                 /* (C) force 10ms CPU frame interval */
+extern int      jumpered_internal_ecp_dma;  /* (C) Jumpered internal EPC DMA */
+extern int      other_ide_present;          /* IDE controllers from non-IDE cards are present */
+extern int      other_scsi_present;         /* SCSI controllers from non-SCSI cards are present */
+extern int      is_pcjr;                    /* The current machine is PCjr. */
 
+extern int    hard_reset_pending;
 extern int    fixed_size_x;
 extern int    fixed_size_y;
+extern int    sound_muted;                  /* (C) Is sound muted? */
 extern int    do_auto_pause;                /* (C) Auto-pause the emulator on focus loss */
 extern int    auto_paused;
-extern double mouse_sensitivity;            /* (C) Mouse sensitivity scale */
+extern int    force_constant_mouse;         /* (C) Force constant updating of the mouse */
+extern double mouse_sensitivity;            /* (G) Mouse sensitivity scale */
 #ifdef _Atomic
 extern _Atomic double mouse_x_error;        /* Mouse error accumulator - Y */
 extern _Atomic double mouse_y_error;        /* Mouse error accumulator - Y */
 #endif
 extern int    pit_mode;                     /* (C) force setting PIT mode */
 extern int    fm_driver;                    /* (C) select FM sound driver */
+extern int    hook_enabled;                 /* (C) Keyboard hook is enabled */
+extern int    vmm_disabled;                 /* (G) disable built-in manager */
+extern char   vmm_path_cfg[1024];           /* (G) VMs path (unless -E is used) */
 
-/* Keyboard variables for future key combination redefinition. */
-extern uint16_t key_prefix_1_1;
-extern uint16_t key_prefix_1_2;
-extern uint16_t key_prefix_2_1;
-extern uint16_t key_prefix_2_2;
-extern uint16_t key_uncapture_1;
-extern uint16_t key_uncapture_2;
+extern char exe_path[2048];        /* path (dir) of executable */
+extern char usr_path[1024];        /* path (dir) of user data */
+extern char cfg_path[1024];        /* full path of config file */
+extern char global_cfg_path[1024]; /* full path of global config file */
+extern int  open_dir_usr_path;     /* default file open dialog directory of usr_path */
+extern char uuid[MAX_UUID_LEN];    /* UUID or machine identifier */
+extern char vmm_path[1024];        /* VM Manager path to scan */
+extern int  start_vmm;             /* the current execution will start the manager */
+extern int  portable_mode;         /* we are running in portable mode 
+                                      (global dirs = exe path) */
+
+extern int  monitor_edid;                   /* (C) Which EDID to use. 0=default, 1=custom. */
+extern char monitor_edid_path[1024];        /* (C) Path to custom EDID */
+
+extern int color_scheme;                    /* (C) Color scheme of UI (Windows-only) */
 
-extern char exe_path[2048];    /* path (dir) of executable */
-extern char usr_path[1024];    /* path (dir) of user data */
-extern char cfg_path[1024];    /* full path of config file */
-extern int  open_dir_usr_path; /* default file open dialog directory of usr_path */
 #ifndef USE_NEW_DYNAREC
 extern FILE *stdlog; /* file to log output to */
 #endif
 extern int config_changed; /* config has changed */
 
+extern __thread int is_cpu_thread; /* Is this the CPU thread? */
+
 /* Function prototypes. */
 #ifdef HAVE_STDARG_H
-extern void pclog_ex(const char *fmt, va_list);
-extern void fatal_ex(const char *fmt, va_list);
+extern void pclog_ex(const char *fmt, va_list ap);
+extern void fatal_ex(const char *fmt, va_list ap);
+extern void warning_ex(const char *fmt, va_list ap);
 #endif
 extern void pclog_toggle_suppr(void);
 extern void pclog(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
+extern void always_log(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
 extern void fatal(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
+extern void warning(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
 extern void set_screen_size(int x, int y);
 extern void set_screen_size_monitor(int x, int y, int monitor_index);
 extern void reset_screen_size(void);
@@ -191,6 +235,7 @@ extern void update_mouse_msg(void);
 #if 0
 extern void pc_reload(wchar_t *fn);
 #endif
+extern int  pc_init_roms(void);
 extern int  pc_init_modules(void);
 extern int  pc_init(int argc, char *argv[]);
 extern void pc_close(void *threadid);
@@ -224,6 +269,17 @@ extern int    framecountx;
 extern volatile int     cpu_thread_run;
 extern          uint8_t postcard_codes[POSTCARDS_NUM];
 
+// Accelerator key structure, defines, helper functions
+struct accelKey {
+	char name[64];
+	char desc[64];
+	char seq[64];
+};
+#define NUM_ACCELS 8
+extern struct accelKey acc_keys[NUM_ACCELS];
+extern struct accelKey def_acc_keys[NUM_ACCELS];
+extern int FindAccelerator(const char *name);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/include/86box/access_bus.h b/src/include/86box/access_bus.h
new file mode 100644
index 000000000..333a1d4a5
--- /dev/null
+++ b/src/include/86box/access_bus.h
@@ -0,0 +1,37 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Definitions for the ACPI emulation.
+ *
+ *
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2020-2025 Miran Grca.
+ */
+#ifndef ACCESS_BUS_H
+#define ACCESS_BUS_H
+
+#define AB_RST 0x80
+
+typedef struct access_bus_t {
+  uint8_t  control;
+  uint8_t  status;
+  uint8_t  own_addr;
+  uint8_t  data;
+  uint8_t  clock;
+  uint8_t  enable;
+  uint16_t base;
+} access_bus_t;
+
+extern const device_t access_bus_device;
+
+/* Functions */
+extern void    access_bus_handler(access_bus_t *dev, uint8_t enable, uint16_t base);
+
+#endif /*ACCESS_BUS_H*/
diff --git a/src/include/86box/acpi.h b/src/include/86box/acpi.h
index 2b8a6396f..5a3eb39ec 100644
--- a/src/include/86box/acpi.h
+++ b/src/include/86box/acpi.h
@@ -52,12 +52,14 @@ extern "C" {
 #define ACPI_ENABLE     0xf1
 #define ACPI_DISABLE    0xf0
 
-#define VEN_ALI         0x010b9
-#define VEN_INTEL       0x08086
-#define VEN_SIS         0x01039
-#define VEN_SMC         0x01055
-#define VEN_VIA         0x01106
-#define VEN_VIA_596B    0x11106
+#define VEN_ALI              0x010b9
+#define VEN_INTEL            0x08086
+#define VEN_SIS_5582         0x01039
+#define VEN_SIS_5595_1997    0x11039
+#define VEN_SIS_5595         0x21039
+#define VEN_SMC              0x01055
+#define VEN_VIA              0x01106
+#define VEN_VIA_596B         0x11106
 
 typedef struct acpi_regs_t {
     uint8_t  acpitst;
@@ -76,6 +78,25 @@ typedef struct acpi_regs_t {
     uint8_t  gporeg[4];
     uint8_t  extiotrapsts;
     uint8_t  extiotrapen;
+    uint8_t  enter_c2_ps;
+    uint8_t  enter_c3_ps;
+    uint8_t  reg_12;
+    uint8_t  reg_13;
+    uint8_t  smi_cmd;
+    uint8_t  reg_24;
+    uint8_t  reg_25;
+    uint8_t  reg_26;
+    uint8_t  smi_en_val;
+    uint8_t  smi_dis_val;
+    uint8_t  mail_box;
+    uint8_t  reg_2b;
+    uint8_t  gp_tmr;
+    uint8_t  leg_sts;
+    uint8_t  leg_en;
+    uint8_t  tst_ctl;
+    uint8_t  reg_34;
+    uint8_t  index;
+    uint8_t  reg_ff;
     uint16_t pmsts;
     uint16_t pmen;
     uint16_t pmcntrl;
@@ -91,6 +112,15 @@ typedef struct acpi_regs_t {
     uint16_t gpsmien;
     uint16_t pscntrl;
     uint16_t gpscists;
+    uint16_t reg_14;
+    uint16_t reg_16;
+    uint16_t reg_18;
+    uint16_t reg_1a;
+    uint16_t reg_1c;
+    uint16_t gpe_mul;
+    uint16_t gpe_ctl;
+    uint16_t gpe_smi;
+    uint16_t gpe_rl;
     int      smi_lock;
     int      smi_active;
     uint32_t pcntrl;
@@ -107,7 +137,12 @@ typedef struct acpi_regs_t {
     uint32_t gpo_val;
     uint32_t gpi_val;
     uint32_t extsmi_val;
-    uint32_t pad0;
+    uint32_t reg_0c;
+    uint32_t gpe_sts;
+    uint32_t gpe_en;
+    uint32_t gpe_pin;
+    uint32_t gpe_io;
+    uint32_t gpe_pol;
 } acpi_regs_t;
 
 typedef struct acpi_t {
@@ -128,11 +163,15 @@ typedef struct acpi_t {
     pc_timer_t  timer;
     pc_timer_t  resume_timer;
     pc_timer_t  pwrbtn_timer;
+    pc_timer_t  gp_timer;
+    pc_timer_t  per_timer;
     nvr_t      *nvr;
     apm_t      *apm;
     void       *i2c;
     void      (*trap_update)(void *priv);
     void       *trap_priv;
+    void       *smbus;
+    void       *priv;
 } acpi_t;
 
 /* Global variables. */
@@ -145,6 +184,9 @@ extern const device_t acpi_intel_device;
 extern const device_t acpi_smc_device;
 extern const device_t acpi_via_device;
 extern const device_t acpi_via_596b_device;
+extern const device_t acpi_sis_5582_device;
+extern const device_t acpi_sis_5595_1997_device;
+extern const device_t acpi_sis_5595_device;
 
 /* Functions */
 extern void    acpi_update_irq(acpi_t *dev);
@@ -163,6 +205,12 @@ extern void    acpi_set_nvr(acpi_t *dev, nvr_t *nvr);
 extern void    acpi_set_trap_update(acpi_t *dev, void (*update)(void *priv), void *priv);
 extern uint8_t acpi_ali_soft_smi_status_read(acpi_t *dev);
 extern void    acpi_ali_soft_smi_status_write(acpi_t *dev, uint8_t soft_smi);
+extern void *  acpi_get_smbus(void *priv);
+extern void    acpi_sis5582_pmu_event(void *priv);
+extern void    acpi_sis5595_smi_raise(void *priv);
+extern void    acpi_sis5595_pmu_event(void *priv);
+extern void    acpi_sis5595_smbus_event(void *priv);
+extern void    acpi_sis5595_software_smi(void *priv);
 
 #ifdef __cplusplus
 }
diff --git a/src/include/86box/bswap.h b/src/include/86box/bswap.h
index ac758b20a..61a6a46a2 100644
--- a/src/include/86box/bswap.h
+++ b/src/include/86box/bswap.h
@@ -40,89 +40,55 @@
 
 #include <stdint.h>
 
-#ifdef HAVE_BYTESWAP_H
-#    include <byteswap.h>
-#else
-# define bswap_16(x) \
-    ( \
-        ((uint16_t)( \
-        (((uint16_t)(x) & (uint16_t)0x00ffU) << 8) |  \
-        (((uint16_t)(x) & (uint16_t)0xff00U) >> 8) )) \
-    )
+#ifndef __NetBSD__
+#define bswap_16(x)					\
+	((uint16_t)((((x) & 0x00ffu) << 8) |		\
+		    (((x) & 0xff00u) >> 8)))
 
-# define bswap_32(x) \
-    ( \
-        ((uint32_t)( \
-        (((uint32_t)(x) & (uint32_t)0x000000ffUL) << 24) |  \
-        (((uint32_t)(x) & (uint32_t)0x0000ff00UL) <<  8) |  \
-        (((uint32_t)(x) & (uint32_t)0x00ff0000UL) >>  8) |  \
-        (((uint32_t)(x) & (uint32_t)0xff000000UL) >> 24) )) \
-    )
+#define bswap_32(x)					\
+	((uint32_t)((((x) & 0x000000fful) << 24) |	\
+		    (((x) & 0x0000ff00ul) <<  8) |	\
+		    (((x) & 0x00ff0000ul) >>  8) |	\
+		    (((x) & 0xff000000ul) >> 24)))
 
-# define bswap_64(x) \
-    ( \
-        ((uint64_t)( \
-        (uint64_t)(((uint64_t)(x) & (uint64_t)0x00000000000000ffULL) << 56) |  \
-        (uint64_t)(((uint64_t)(x) & (uint64_t)0x000000000000ff00ULL) << 40) |  \
-        (uint64_t)(((uint64_t)(x) & (uint64_t)0x0000000000ff0000ULL) << 24) |  \
-        (uint64_t)(((uint64_t)(x) & (uint64_t)0x00000000ff000000ULL) <<  8) |  \
-        (uint64_t)(((uint64_t)(x) & (uint64_t)0x000000ff00000000ULL) >>  8) |  \
-        (uint64_t)(((uint64_t)(x) & (uint64_t)0x0000ff0000000000ULL) >> 24) |  \
-        (uint64_t)(((uint64_t)(x) & (uint64_t)0x00ff000000000000ULL) >> 40) |  \
-        (uint64_t)(((uint64_t)(x) & (uint64_t)0xff00000000000000ULL) >> 56) )) \
-    )
-#endif    /*HAVE_BYTESWAP_H*/
+# define bswap_64(x)							\
+        ((uint64_t)((((x) & 0x00000000000000ffull) << 56) |		\
+		    (((x) & 0x000000000000ff00ull) << 40) |		\
+		    (((x) & 0x0000000000ff0000ull) << 24) |		\
+		    (((x) & 0x00000000ff000000ull) <<  8) |		\
+		    (((x) & 0x000000ff00000000ull) >>  8) |		\
+		    (((x) & 0x0000ff0000000000ull) >> 24) |		\
+		    (((x) & 0x00ff000000000000ull) >> 40) |		\
+		    (((x) & 0xff00000000000000ull) >> 56)))
 
-#if  __GNUC__ >= 10
-#if defined __has_builtin && __has_builtin(__builtin_bswap16)
-#define bswap16(x) __builtin_bswap16(x)
-#else
-static __inline uint16_t bswap16(uint16_t x)
-{
-    return bswap_16(x);
-}
-#    endif
-#else
 static __inline uint16_t
 bswap16(uint16_t x)
 {
+#if defined (__GNUC__) || defined (__clang__)
+    return __builtin_bswap16(x);
+#else
     return bswap_16(x);
-}
 #endif
+}
 
-#if __GNUC__ >= 10
-#    if defined __has_builtin && __has_builtin(__builtin_bswap32)
-#        define bswap32(x) __builtin_bswap32(x)
-#    else
 static __inline uint32_t
 bswap32(uint32_t x)
 {
-    return bswap_32(x);
-}
-#    endif
+#if defined (__GNUC__) || defined (__clang__)
+    return __builtin_bswap32(x);
 #else
-static __inline uint32_t
-bswap32(uint32_t x)
-{
     return bswap_32(x);
-}
 #endif
-
-#if __GNUC__ >= 10
-#    if defined __has_builtin && __has_builtin(__builtin_bswap64)
-#        define bswap64(x) __builtin_bswap64(x)
-#    else
-static __inline uint64_t
-bswap64(uint64_t x)
-{
-    return bswap_64(x);
 }
-#    endif
-#else
+
 static __inline uint64_t
 bswap64(uint64_t x)
 {
-    return bswap_64(x);
+#if defined (__GNUC__) || defined (__clang__)
+    return __builtin_bswap64(x);
+#else
+    return bswap_16(x);
+#endif
 }
 #endif
 
@@ -167,12 +133,12 @@ bswap64s(uint64_t *s)
         return endian##_bswap(v, size);                            \
     }                                                              \
                                                                    \
-    static __inline void endian##size##_to_cpus(type *p)           \
+    static __inline void endian##size##_to_cpus(UNUSED(type *p))   \
     {                                                              \
         endian##_bswaps(p, size)                                   \
     }                                                              \
                                                                    \
-    static __inline void cpu_to_##endian##size##s(type *p)         \
+    static __inline void cpu_to_##endian##size##s(UNUSED(type *p)) \
     {                                                              \
         endian##_bswaps(p, size)                                   \
     }                                                              \
@@ -198,12 +164,10 @@ CPU_CONVERT(le, 64, uint64_t)
 /* unaligned versions (optimized for frequent unaligned accesses)*/
 
 #if defined(__i386__) || defined(__powerpc__)
-
 #    define cpu_to_le16wu(p, v) cpu_to_le16w(p, v)
 #    define cpu_to_le32wu(p, v) cpu_to_le32w(p, v)
 #    define le16_to_cpupu(p)    le16_to_cpup(p)
 #    define le32_to_cpupu(p)    le32_to_cpup(p)
-
 #    define cpu_to_be16wu(p, v) cpu_to_be16w(p, v)
 #    define cpu_to_be32wu(p, v) cpu_to_be32w(p, v)
 
diff --git a/src/include/86box/cartridge.h b/src/include/86box/cartridge.h
index 2fa0a9358..2b0662703 100644
--- a/src/include/86box/cartridge.h
+++ b/src/include/86box/cartridge.h
@@ -21,7 +21,10 @@
 extern "C" {
 #endif
 
+#define CART_IMAGE_HISTORY    10
+
 extern char cart_fns[2][512];
+extern char *cart_image_history[2][CART_IMAGE_HISTORY];
 
 extern void cart_load(int drive, char *fn);
 extern void cart_close(int drive);
diff --git a/src/include/86box/cassette.h b/src/include/86box/cassette.h
index 3706ca632..dc85bfc26 100644
--- a/src/include/86box/cassette.h
+++ b/src/include/86box/cassette.h
@@ -75,7 +75,7 @@ void           pc_cas_del(pc_cassette_t *cas);
  * @short  Set the cassette file
  * @return True on error, false otherwise
  *****************************************************************************/
-int pc_cas_set_fname(pc_cassette_t *cas, const char *fname);
+int pc_cas_set_fname(pc_cassette_t *cas, char *fname);
 
 /*!***************************************************************************
  * @short  Get the cassette mode
@@ -153,10 +153,13 @@ void pc_cas_print_state(const pc_cassette_t *cas);
 void pc_cas_clock(pc_cassette_t *cas, unsigned long cnt);
 void pc_cas_advance(pc_cassette_t *cas);
 
+#define CASSETTE_IMAGE_HISTORY    10
+
 extern pc_cassette_t *cassette;
 
 extern char          cassette_fname[512];
 extern char          cassette_mode[512];
+extern char *        cassette_image_history[CASSETTE_IMAGE_HISTORY];
 extern unsigned long cassette_pos;
 extern unsigned long cassette_srate;
 extern int           cassette_enable;
diff --git a/src/include/86box/cdrom.h b/src/include/86box/cdrom.h
index 15127b06e..85e5a0f0b 100644
--- a/src/include/86box/cdrom.h
+++ b/src/include/86box/cdrom.h
@@ -15,160 +15,222 @@
 #ifndef EMU_CDROM_H
 #define EMU_CDROM_H
 
+#ifndef EMU_VERSION_H
+#include <86box/version.h>
+#endif
+
 #define CDROM_NUM                   8
 
 #define CD_STATUS_EMPTY             0
 #define CD_STATUS_DATA_ONLY         1
-#define CD_STATUS_PAUSED            2
-#define CD_STATUS_PLAYING           3
-#define CD_STATUS_STOPPED           4
-#define CD_STATUS_PLAYING_COMPLETED 5
+#define CD_STATUS_DVD               2
+#define CD_STATUS_PAUSED            4
+#define CD_STATUS_PLAYING           5
+#define CD_STATUS_STOPPED           6
+#define CD_STATUS_PLAYING_COMPLETED 7
+#define CD_STATUS_HOLD              8
+#define CD_STATUS_DVD_REJECTED      16
+#define CD_STATUS_HAS_AUDIO         0xc
+#define CD_STATUS_MASK              0x1f
 
 /* Medium changed flag. */
+#define CD_STATUS_TRANSITION     0x40
 #define CD_STATUS_MEDIUM_CHANGED 0x80
 
+#define CD_TRACK_UNK_DATA        0x04
+#define CD_TRACK_NORMAL          0x00
 #define CD_TRACK_AUDIO           0x08
+#define CD_TRACK_CDI             0x10
+#define CD_TRACK_XA              0x20
+#define CD_TRACK_MODE_MASK       0x30
 #define CD_TRACK_MODE2           0x04
-
-#define CD_READ_DATA             0
-#define CD_READ_AUDIO            1
-#define CD_READ_RAW              2
+#define CD_TRACK_MODE2_MASK      0x07
 
 #define CD_TOC_NORMAL            0
 #define CD_TOC_SESSION           1
 #define CD_TOC_RAW               2
 
-#define CD_IMAGE_HISTORY         4
-
-#define BUF_SIZE                 32768
+#define CD_IMAGE_HISTORY         10
 
 #define CDROM_IMAGE              200
 
 /* This is so that if/when this is changed to something else,
    changing this one define will be enough. */
-#define CDROM_EMPTY !dev->host_drive
+#define CDROM_EMPTY              !dev->host_drive
+
+#define DVD_LAYER_0_SECTORS      0x00210558ULL
+
+#define RAW_SECTOR_SIZE          2352
+#define COOKED_SECTOR_SIZE       2048
+
+#define CD_BUF_SIZE              (16 * RAW_SECTOR_SIZE)
+
+#define DATA_TRACK               0x14
+#define AUDIO_TRACK              0x10
+
+#define CD_FPS                   75
+
+#define _LUT_SIZE                0x100
+
+#define FRAMES_TO_MSF(f, M, S, F)                 \
+    {                                             \
+        uint64_t value = f;                       \
+        *(F)           = (value % CD_FPS) & 0xff; \
+        value /= CD_FPS;                          \
+        *(S) = (value % 60) & 0xff;               \
+        value /= 60;                              \
+        *(M) = value & 0xff;                      \
+    }
+#define MSF_TO_FRAMES(M, S, F) ((M) *60 * CD_FPS + (S) *CD_FPS + (F))
+
+typedef struct SMSF {
+    uint16_t min;
+    uint8_t  sec;
+    uint8_t  fr;
+} TMSF;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 enum {
-    CDROM_BUS_DISABLED = 0,
-    CDROM_BUS_ATAPI    = 5,
-    CDROM_BUS_SCSI     = 6,
-    CDROM_BUS_MITSUMI  = 7,
-    CDROM_BUS_USB      = 8
+    CDROM_BUS_DISABLED =  0,
+    CDROM_BUS_PHILIPS  =  1,
+    CDROM_BUS_SONY     =  2,
+    CDROM_BUS_HITACHI  =  3,
+    CDROM_BUS_MKE      =  4,
+    CDROM_BUS_MITSUMI  =  5,
+    CDROM_BUS_LPT      =  6,
+    CDROM_BUS_ATAPI    =  8,
+    CDROM_BUS_SCSI     =  9,
+    CDROM_BUS_USB      = 10
 };
 
-enum
-{
-    CDROM_TYPE_86BOX_100,
-    CDROM_TYPE_AZT_CDA46802I_115,
-    CDROM_TYPE_BTC_BCD36XH_U10,
-    CDROM_TYPE_GOLDSTAR_CRD_8160B_314,
-    CDROM_TYPE_HITACHI_CDR_8130_0020,
-    CDROM_TYPE_KENWOOD_UCR_421_208E,
-    CDROM_TYPE_MATSHITA_587_7S13,
-    CDROM_TYPE_MATSHITA_588_LS15,
-    CDROM_TYPE_MATSHITA_571_10e,
-    CDROM_TYPE_MATSHITA_572_10j,
-    CDROM_TYPE_MITSUMI_FX4820T_D02A,
-    CDROM_TYPE_NEC_260_100,
-    CDROM_TYPE_NEC_260_101,
-    CDROM_TYPE_NEC_273_420,
-    CDROM_TYPE_NEC_280_105,
-    CDROM_TYPE_NEC_280_308,
-    CDROM_TYPE_PHILIPS_PCA403CD_U31P,
-    CDROM_TYPE_SONY_CDU76_10i,
-    CDROM_TYPE_SONY_CDU311_30h,
-    CDROM_TYPE_TOSHIBA_5302TA_0305,
-    CDROM_TYPE_TOSHIBA_5702B_TA70,
-    CDROM_TYPE_CHINON_CDS431_H42,
-    CDROM_TYPE_DEC_RRD45_0436,
-    CDROM_TYPE_MATSHITA_501_10b,
-    CDROM_TYPE_NEC_25_10a,
-    CDROM_TYPE_NEC_38_103,
-    CDROM_TYPE_NEC_75_103,
-    CDROM_TYPE_NEC_77_106,
-    CDROM_TYPE_NEC_211_100,
-    CDROM_TYPE_NEC_464_105,
-    CDROM_TYPE_SONY_CDU541_10i,
-    CDROM_TYPE_SONY_CDU561_18k,
-    CDROM_TYPE_SONY_CDU76S_100,
-    CDROM_TYPE_PHILIPS_CDD2600_107,
-    CDROM_TYPE_PIONEER_DRM604X_2403,
-    CDROM_TYPE_PLEXTOR_PX32TS_103,
-    CDROM_TYPE_TEAC_CD50_100,
-    CDROM_TYPE_TEAC_R55S_10R,
-    CDROM_TYPE_TEXEL_DMXX24_100,
-    CDROM_TYPE_TOSHIBA_XM_3433,
-    CDROM_TYPE_TOSHIBA_XM3201B_3232,
-    CDROM_TYPE_TOSHIBA_XM3301TA_0272,
-    CDROM_TYPE_TOSHIBA_XM5701TA_3136,
-    CDROM_TYPE_TOSHIBA_SDM1401_1008,
-    CDROM_TYPES_NUM
-};
-
-#define KNOWN_CDROM_DRIVE_TYPES     CDROM_TYPES_NUM
+#define BUS_TYPE_MKE                CDROM_BUS_MKE
 #define BUS_TYPE_IDE                CDROM_BUS_ATAPI
 #define BUS_TYPE_SCSI               CDROM_BUS_SCSI
 #define BUS_TYPE_BOTH              -2
 #define BUS_TYPE_NONE              -1
 
-static const struct
-{
-    const char  vendor[9];
-    const char  model[17];
-    const char  revision[5];
-    const char *name;
-    const char *internal_name;
-    const int   bus_type;
+#define CDV                         EMU_VERSION_EX
+
+static const struct cdrom_drive_types_s {
+    const char   *vendor;
+    const char   *model;
+    const char   *revision;
+    const char   *internal_name;
+    const int     bus_type;
+    /* SCSI standard for SCSI (or both) devices, early for IDE. */
+    const int     scsi_std;
+    const int     speed;
+    const int     inquiry_len;
+    const int     caddy;
+    const int     is_dvd;
+    const int     transfer_max[4];
 } cdrom_drive_types[] = {
-    { "86BOX",    "CD-ROM",             "1.00", "86BOX CD-ROM 1.00",             "86BOX_CD-ROM_1.00",             BUS_TYPE_BOTH  },
-    { "AZT",      "CDA46802I",          "1.15", "AZT CDA46802I 1.15",            "AZT_CDA46802I_1.15",            BUS_TYPE_IDE  },
-    { "BTC",      "CD-ROM BCD36XH",     "U1.0", "BTC CD-ROM BCD36XH U1.0",       "BTC_CD-ROM_BCD36XH_U1.0",       BUS_TYPE_IDE  },
-    { "GOLDSTAR", "CRD-8160B",          "3.14", "GOLDSTAR CRD-8160B 3.14",       "GOLDSTAR_CRD-8160B_3.14",       BUS_TYPE_IDE  },
-    { "HITACHI",  "CDR-8130",           "0020", "HITACHI CDR-8130 0020",         "HITACHI_CDR-8130_0020",         BUS_TYPE_IDE  },
-    { "KENWOOD",  "CD-ROM UCR-421",     "208E", "KENWOOD CD-ROM UCR-421 208E",   "KENWOOD_CD-ROM_UCR-421_208E",   BUS_TYPE_IDE  },
-    { "MATSHITA", "CD-ROM CR-587",      "7S13", "MATSHITA CD-ROM CR-587 7S13",   "MATSHITA_CD-ROM_CR-587_7S13",   BUS_TYPE_IDE  },
-    { "MATSHITA", "CD-ROM CR-588",      "LS15", "MATSHITA CD-ROM CR-588 LS15",   "MATSHITA_CD-ROM_CR-588_LS15",   BUS_TYPE_IDE  },
-    { "MATSHITA", "CR-571",             "1.0e", "MATSHITA CR-571 1.0e",          "MATSHITA_CR-571_1.0e",          BUS_TYPE_IDE  },
-    { "MATSHITA", "CR-572",             "1.0j", "MATSHITA CR-572 1.0j",          "MATSHITA_CR-572_1.0j",          BUS_TYPE_IDE  },
-    { "MITSUMI",  "CRMC-FX4820T",       "D02A", "MITSUMI CRMC-FX4820T D02A",     "MITSUMI_CRMC-FX4820T_D02A",     BUS_TYPE_IDE  },
-    { "NEC",      "CD-ROM DRIVE:260",   "1.00", "NEC CD-ROM DRIVE:260 1.00",     "NEC_CD-ROM_DRIVE260_1.00",      BUS_TYPE_IDE  },
-    { "NEC",      "CD-ROM DRIVE:260",   "1.01", "NEC CD-ROM DRIVE:260 1.01",     "NEC_CD-ROM_DRIVE260_1.01",      BUS_TYPE_IDE  },
-    { "NEC",      "CD-ROM DRIVE:273",   "4.20", "NEC CD-ROM DRIVE:273 4.20",     "NEC_CD-ROM_DRIVE273_4.20",      BUS_TYPE_IDE  },
-    { "NEC",      "CD-ROM DRIVE:280",   "1.05", "NEC CD-ROM DRIVE:280 1.05",     "NEC_CD-ROM_DRIVE280_1.05",      BUS_TYPE_IDE  },
-    { "NEC",      "CD-ROM DRIVE:280",   "3.08", "NEC CD-ROM DRIVE:280 3.08",     "NEC_CD-ROM_DRIVE280_3.08",      BUS_TYPE_IDE  },
-    { "PHILIPS",  "CD-ROM PCA403CD",    "U31P", "PHILIPS CD-ROM PCA403CD U31P",  "PHILIPS_CD-ROM_PCA403CD_U31P",  BUS_TYPE_IDE  },
-    { "SONY",     "CD-ROM CDU76",       "1.0i", "SONY CD-ROM CDU76 1.0i",        "SONY_CD-ROM_CDU76_1.0i",        BUS_TYPE_IDE  },
-    { "SONY",     "CD-ROM CDU311",      "3.0h", "SONY CD-ROM CDU311 3.0h",       "SONY_CD-ROM_CDU311_3.0h",       BUS_TYPE_IDE  },
-    { "TOSHIBA",  "CD-ROM XM-5302TA",   "0305", "TOSHIBA CD-ROM XM-5302TA 0305", "TOSHIBA_CD-ROM_XM-5302TA_0305", BUS_TYPE_IDE  },
-    { "TOSHIBA",  "CD-ROM XM-5702B",    "TA70", "TOSHIBA CD-ROM XM-5702B TA70",  "TOSHIBA_CD-ROM_XM-5702B_TA70",  BUS_TYPE_IDE  },
-    { "CHINON",   "CD-ROM CDS-431",     "H42 ", "CHINON CD-ROM CDS-431 H42",     "CHINON_CD-ROM_CDS-431_H42",     BUS_TYPE_SCSI },
-    { "DEC",      "RRD45   (C) DEC",    "0436", "DEC RRD45 0436",                "DEC_RRD45_0436",                BUS_TYPE_SCSI },
-    { "MATSHITA", "CD-ROM CR-501",      "1.0b", "MATSHITA CD-ROM CR-501 1.0b",   "MATSHITA_CD-ROM_CR-501_1.0b",   BUS_TYPE_SCSI },
-    { "NEC",      "CD-ROM DRIVE:25",    "1.0a", "NEC CD-ROM DRIVE:25 1.0a",      "NEC_CD-ROM_DRIVE25_1.0a",       BUS_TYPE_SCSI },
-    { "NEC",      "CD-ROM DRIVE:38",    "1.00", "NEC CD-ROM DRIVE:38 1.00",      "NEC_CD-ROM_DRIVE38_1.00",       BUS_TYPE_SCSI },
-    { "NEC",      "CD-ROM DRIVE:75",    "1.03", "NEC CD-ROM DRIVE:75 1.03",      "NEC_CD-ROM_DRIVE75_1.03",       BUS_TYPE_SCSI },
-    { "NEC",      "CD-ROM DRIVE:77",    "1.06", "NEC CD-ROM DRIVE:77 1.06",      "NEC_CD-ROM_DRIVE77_1.06",       BUS_TYPE_SCSI },
-    { "NEC",      "CD-ROM DRIVE:211",   "1.00", "NEC CD-ROM DRIVE:211 1.00",     "NEC_CD-ROM_DRIVE211_1.00",      BUS_TYPE_SCSI },
-    { "NEC",      "CD-ROM DRIVE:464",   "1.05", "NEC CD-ROM DRIVE:464 1.05",     "NEC_CD-ROM_DRIVE464_1.05",       BUS_TYPE_SCSI },
-    { "SONY",     "CD-ROM CDU-541",     "1.0i", "SONY CD-ROM CDU-541 1.0i",      "SONY_CD-ROM_CDU-541_1.0i",      BUS_TYPE_SCSI },
-    { "SONY",     "CD-ROM CDU-561",     "1.8k", "SONY CD-ROM CDU-561 1.8k",      "SONY_CD-ROM_CDU-561_1.8k",      BUS_TYPE_SCSI },
-    { "SONY",     "CD-ROM CDU-76S",     "1.00", "SONY CD-ROM CDU-76S 1.00",      "SONY_CD-ROM_CDU-76S_1.00",      BUS_TYPE_SCSI },
-    { "PHILIPS",  "CDD2600",            "1.07", "PHILIPS CDD2600 1.07",          "PHILIPS_CDD2600_1.07",          BUS_TYPE_SCSI },
-    { "PIONEER",  "CD-ROM DRM-604X",    "2403", "PIONEER CD-ROM DRM-604X 2403",  "PIONEER_CD-ROM_DRM-604X_2403",  BUS_TYPE_SCSI },
-    { "PLEXTOR",  "CD-ROM PX-32TS",     "1.03", "PLEXTOR CD-ROM PX-32TS 1.03",   "PLEXTOR_CD-ROM_PX-32TS_1.03",   BUS_TYPE_SCSI },
-    { "TEAC",     "CD 50",              "1.00", "TEAC CD 50 1.00",               "TEAC_CD_50_1.00",               BUS_TYPE_SCSI },
-    { "TEAC",     "CD-ROM R55S",        "1.0R", "TEAC CD-ROM R55S 1.0R",         "TEAC_CD-ROM_R55S_1.0R",         BUS_TYPE_SCSI },
-    { "TEXEL",    "CD-ROM DM-XX24",     "1.00", "TEXEL CD-ROM DM-XX24 1.00",     "TEXEL_CD-ROM_DM-XX24_1.00",     BUS_TYPE_SCSI },
-    { "TOSHIBA",  "CD-ROM DRIVE:XM",    "3433", "TOSHIBA CD-ROM DRIVE:XM 3433",  "TOSHIBA_CD-ROM_DRIVEXM_3433",   BUS_TYPE_SCSI },
-    { "TOSHIBA",  "CD-ROM XM-3201B",    "3232", "TOSHIBA CD-ROM XM-3201B 3232",  "TOSHIBA_CD-ROM_XM-3201B_3232",  BUS_TYPE_SCSI },
-    { "TOSHIBA",  "CD-ROM XM-3301TA",   "0272", "TOSHIBA CD-ROM XM-3301TA 0272", "TOSHIBA_CD-ROM_XM-3301TA_0272", BUS_TYPE_SCSI },
-    { "TOSHIBA",  "CD-ROM XM-5701TA",   "3136", "TOSHIBA CD-ROM XM-5701TA 3136", "TOSHIBA_CD-ROM_XM-5701TA_3136", BUS_TYPE_SCSI },
-    { "TOSHIBA",  "DVD-ROM SD-M1401",   "1008", "TOSHIBA DVD-ROM SD-M1401 1008", "TOSHIBA_DVD-ROM_SD-M1401_1008", BUS_TYPE_SCSI },
-    { "",         "",                   "",     "",                              "",                              BUS_TYPE_NONE },
+    { EMU_NAME,   "86B_CD",           CDV,    "86cd",           BUS_TYPE_BOTH, 2, -1, 36, 0, 0, {  4,  2,  2,  5 } },
+    /* SCSI-1 / early ATAPI generic - second on purpose so the later variant is the default. */
+    { EMU_NAME,   "86B_CD",           "1.00", "86cd100",        BUS_TYPE_BOTH, 1, -1, 36, 1, 0, {  0, -1, -1, -1 } },
+    /* No difference from 86BOX CD-ROM, other than name - but enough people have requested such a name to warrant it. */
+    { EMU_NAME,   "86B_DVD",          "5.00", "86dvd",          BUS_TYPE_BOTH, 2, -1, 36, 0, 1, {  4,  2,  2,  5 } },
+    { "ASUS",     "CD-S500/A",        "1.41", "asus_500",       BUS_TYPE_IDE,  0, 50, 36, 0, 0, {  4,  2,  2,  2 } },
+    { "ASUS",     "CD-S520/A4",       "1.32", "asus_520",       BUS_TYPE_IDE,  0, 52, 36, 0, 0, {  4,  2,  2,  2 } },
+    { "AZT",      "CDA46802I",        "1.15", "azt_cda",        BUS_TYPE_IDE,  0,  4, 36, 0, 0, {  3,  0,  0,  0 } },
+    { "BTC",      "CD-ROM BCD36XH",   "U1.0", "btc_36xh",       BUS_TYPE_IDE,  0, 36, 36, 0, 0, {  4,  2,  2, -1 } },
+    { "GOLDSTAR", "CRD-8160B",        "3.14", "goldstar",       BUS_TYPE_IDE,  0, 16, 36, 0, 0, {  4,  2,  2, -1 } },
+    /* TODO: Find an IDENTIFY and/or INQUIRY dump. */
+    { "GOLDSTAR", "GCD-R560B",        "1.00", "goldstar",       BUS_TYPE_IDE,  0,  6, 36, 0, 0, {  4,  2,  2, -1 } },
+    { "HITACHI",  "CDR-8130",         "0020", "hitachi_r8130",  BUS_TYPE_IDE,  0, 16, 36, 0, 0, {  4,  2,  2, -1 } },
+    { "HITACHI",  "GD-7500",          "A1  ", "hitachi_7500",   BUS_TYPE_IDE,  0, 40, 36, 0, 0, {  4,  2,  2,  2 } }, /* DVD. */
+    { "HL-DT-ST", "CD-ROM GCR-8526B", "1.01", "hldtst_8526b",   BUS_TYPE_IDE,  0, 52, 36, 0, 0, {  4,  2,  2,  2 } },
+    { "HL-DT-ST", "DVDRAM GSA-4160",  "A302", "hldtst_4160",    BUS_TYPE_IDE,  0, 40, 36, 0, 0, {  4,  2,  2,  2 } },
+    { "KENWOOD",  "CD-ROM UCR-421",   "208E", "kenwood_421",    BUS_TYPE_IDE,  0, 72, 36, 0, 0, {  4,  2,  2,  4 } },
+    /*
+       This is a laptop/notebook drive, as is also evident from the name:
+           CRN = Notebook, CRD = Desktop.
+     */
+    { "LG",       "CD-ROM CRN-8245B", "1.30", "lg_8245b",       BUS_TYPE_IDE,  0, 24, 36, 0, 0, {  4,  2,  2, -1 } },
+    { "LG",       "CD-ROM CRD-8322B", "1.06", "lg_8322b",       BUS_TYPE_IDE,  0, 32, 36, 0, 0, {  4,  2,  2, -1 } },
+    /* Nothing on Google, deduced 48x from the name. */
+    { "LITE-ON",  "LTN48125S",        "1S07", "liteon_48125s",  BUS_TYPE_IDE,  0, 48, 36, 0, 0, {  4,  2,  2,  2 } },
+    /* Confirmed to be 52x, was the basis for deducing the other one's speed. */
+    { "LITE-ON",  "LTN526D",          "YSR5", "liteon_526d",    BUS_TYPE_IDE,  0, 52, 36, 0, 0, {  4,  2,  2,  2 } },
+    { "MATSHITA", "CD-ROM CR-583",    "1.07", "matshita_583",   BUS_TYPE_IDE,  0,  8, 36, 0, 0, {  4,  2,  2, -1 } },
+    { "MATSHITA", "CD-ROM CR-585",    "Z18P", "matshita_585",   BUS_TYPE_IDE,  0, 24, 36, 0, 0, {  4,  2,  2, -1 } },
+    { "MATSHITA", "CD-ROM CR-587",    "7S13", "matshita_587",   BUS_TYPE_IDE,  0, 24, 36, 0, 0, {  4,  2,  2, -1 } },
+    { "MATSHITA", "CD-ROM CR-588",    "LS15", "matshita_588",   BUS_TYPE_IDE,  0, 32, 36, 0, 0, {  4,  2,  2, -1 } },
+    { "MATSHITA", "CR-571",           "1.0e", "matshita_571",   BUS_TYPE_IDE,  0,  2, 36, 0, 0, {  0, -1, -1, -1 } },
+    { "MATSHITA", "CR-572",           "1.0j", "matshita_572",   BUS_TYPE_IDE,  0,  4, 36, 0, 0, {  0, -1, -1, -1 } },
+    { "MITSUMI",  "CRMC-FX4820T",     "D02A", "mitsumi_4820t",  BUS_TYPE_IDE,  0, 48, 36, 0, 0, {  4,  2,  2,  2 } },
+    /* TODO: Find an IDENTIFY and/or INQUIRY dump. */
+    { "MITSUMI",  "CRMC-FX810T4",     "????", "mitsumi_810t4",  BUS_TYPE_IDE,  0,  8, 36, 0, 0, {  4,  2,  2, -1 } },
+    { "NEC",      "CD-ROM DRIVE:260", "1.00", "nec_260_early",  BUS_TYPE_IDE,  1,  2, 36, 1, 0, {  0, -1, -1, -1 } },
+    { "NEC",      "CD-ROM DRIVE:260", "1.01", "nec_260",        BUS_TYPE_IDE,  1,  4, 36, 1, 0, {  0, -1, -1, -1 } },
+    { "NEC",      "CD-ROM DRIVE:273", "4.20", "nec_273",        BUS_TYPE_IDE,  0,  4, 36, 0, 0, {  0, -1, -1, -1 } },
+    { "NEC",      "CD-ROM DRIVE:280", "1.05", "nec_280_early",  BUS_TYPE_IDE,  0,  6, 36, 1, 0, {  4,  2,  2, -1 } },
+    { "NEC",      "CD-ROM DRIVE:280", "3.08", "nec_280",        BUS_TYPE_IDE,  0,  8, 36, 1, 0, {  4,  2,  2, -1 } },
+    { "NEC",      "CDR-1300A",        "1.05", "nec_1300a",      BUS_TYPE_IDE,  0,  6, 36, 0, 0, {  4,  2,  2, -1 } },
+    { "NEC",      "CDR-1900A",        "1.00", "nec_1900a",      BUS_TYPE_IDE,  0, 32, 36, 0, 0, {  4,  2,  2, -1 } },
+    { "PHILIPS",  "CD-ROM PCA403CD",  "U31P", "philips_403",    BUS_TYPE_IDE,  0, 40, 36, 0, 0, {  4,  2,  2, -1 } },
+    { "SONY",     "CD-ROM CDU76",     "1.0i", "sony_76",        BUS_TYPE_IDE,  0,  4, 36, 0, 0, {  2, -1, -1, -1 } },
+    { "SONY",     "CD-ROM CDU311",    "3.0h", "sony_311",       BUS_TYPE_IDE,  0,  8, 36, 0, 0, {  3,  2,  1, -1 } },
+    { "SONY",     "CD-ROM CDU5225",   "NYS4", "sony_5225",      BUS_TYPE_IDE,  0, 52, 36, 0, 0, {  4,  2,  2,  4 } },
+    { "TEAC",     "CD-516E",          "1.0G", "teac_516e",      BUS_TYPE_IDE,  0, 16, 36, 0, 0, {  3,  2,  2, -1 } },
+    { "TEAC",     "CD-524EA",         "3.0D", "teac_524ea",     BUS_TYPE_IDE,  0, 24, 36, 0, 0, {  3,  2,  2, -1 } },
+    { "TEAC",     "CD-532E",          "2.0A", "teac_532e",      BUS_TYPE_IDE,  0, 32, 36, 0, 0, {  3,  2,  2, -1 } },
+    { "TOSHIBA",  "CD-ROM XM-5302TA", "0305", "toshiba_5302ta", BUS_TYPE_IDE,  0,  4, 96, 0, 0, {  0, -1, -1, -1 } },
+    { "TOSHIBA",  "CD-ROM XM-5702B",  "TA70", "toshiba_5702b",  BUS_TYPE_IDE,  0, 12, 96, 0, 0, {  3,  2,  1, -1 } },
+    { "TOSHIBA",  "CD-ROM XM-6202B",  "1512", "toshiba_6202b",  BUS_TYPE_IDE,  0, 32, 96, 0, 0, {  4,  2,  2, -1 } },
+    { "TOSHIBA",  "CD-ROM XM-6402B",  "1008", "toshiba_6402b",  BUS_TYPE_IDE,  0, 32, 96, 0, 0, {  4,  2,  2,  2 } },
+    { "TOSHIBA",  "CD-ROM XM-6702B",  "1007", "toshiba_6720b",  BUS_TYPE_IDE,  0, 48, 96, 0, 0, {  4,  2,  2,  2 } },
+    { "TOSHIBA",  "DVD-ROM SD-M1802", "1051", "toshiba_m1802",  BUS_TYPE_IDE,  0, 48, 96, 0, 1, {  4,  2,  2,  2 } },
+    { "CHINON",   "CD-ROM CDS-431",   "H42 ", "chinon_431",     BUS_TYPE_SCSI, 1,  1, 36, 1, 0, { -1, -1, -1, -1 } },
+    { "CHINON",   "CD-ROM CDX-435",   "M62 ", "chinon_435",     BUS_TYPE_SCSI, 1,  2, 36, 1, 0, { -1, -1, -1, -1 } },
+    { "DEC",      "RRD45   (C) DEC",  "0436", "dec_45",         BUS_TYPE_SCSI, 1,  4, 36, 0, 0, { -1, -1, -1, -1 } },
+    { "MATSHITA", "CD-ROM CR-501",    "1.0b", "matshita_501",   BUS_TYPE_SCSI, 1,  1, 36, 1, 0, { -1, -1, -1, -1 } },
+    { "NEC",      "CD-ROM DRIVE:25",  "1.0a", "nec_25",         BUS_TYPE_SCSI, 1,  2, 36, 0, 0, { -1, -1, -1, -1 } },
+    { "NEC",      "CD-ROM DRIVE:38",  "1.00", "nec_38",         BUS_TYPE_SCSI, 2,  1, 36, 0, 0, { -1, -1, -1, -1 } },
+    /* The speed of the following two is guesswork based on the CDR-74. */
+    { "NEC",      "CD-ROM DRIVE:75",  "1.03", "nec_75",         BUS_TYPE_SCSI, 1,  1, 36, 1, 0, { -1, -1, -1, -1 } },
+    { "NEC",      "CD-ROM DRIVE:77",  "1.06", "nec_77",         BUS_TYPE_SCSI, 1,  1, 36, 1, 0, { -1, -1, -1, -1 } },
+    { "NEC",      "CD-ROM DRIVE:211", "1.00", "nec_211",        BUS_TYPE_SCSI, 2,  3, 36, 0, 0, { -1, -1, -1, -1 } },
+    /* The speed of the following two is guesswork based on the CDR-400. */
+    { "NEC",      "CD-ROM DRIVE:464", "1.05", "nec_464",        BUS_TYPE_SCSI, 2,  3, 36, 0, 0, { -1, -1, -1, -1 } },
+    /* The speed of the following two is guesswork based on the name. */
+    { "ShinaKen", "CD-ROM DM-3x1S",   "1.04", "shinaken_3x1s",  BUS_TYPE_SCSI, 1,  3, 36, 0, 0, { -1, -1, -1, -1 } },
+    { "SONY",     "CD-ROM CDU-541",   "1.0i", "sony_541",       BUS_TYPE_SCSI, 1,  1, 36, 1, 0, { -1, -1, -1, -1 } },
+    { "SONY",     "CD-ROM CDU-561",   "1.8k", "sony_561",       BUS_TYPE_SCSI, 2,  2, 36, 1, 0, { -1, -1, -1, -1 } },
+    { "SONY",     "CD-ROM CDU-76S",   "1.00", "sony_76s",       BUS_TYPE_SCSI, 2,  4, 36, 0, 0, { -1, -1, -1, -1 } },
+    { "PHILIPS",  "CDD2600",          "1.07", "philips_2600",   BUS_TYPE_SCSI, 2,  6, 36, 0, 0, { -1, -1, -1, -1 } },
+    /* NOTE: The real thing is a CD changer drive! */
+    { "PIONEER",  "CD-ROM DRM-604X",  "2403", "pioneer_604x",   BUS_TYPE_SCSI, 2,  4, 47, 0, 0, { -1, -1, -1, -1 } },
+    { "PLEXTOR",  "CD-ROM PX-32TS",   "1.03", "plextor_32ts",   BUS_TYPE_SCSI, 2, 32, 36, 0, 0, { -1, -1, -1, -1 } },
+    /* The speed of the following two is guesswork based on the R55S. */
+    { "TEAC",     "CD 50",            "1.00", "teac_50",        BUS_TYPE_SCSI, 2,  4, 36, 1, 0, { -1, -1, -1, -1 } },
+    { "TEAC",     "CD-ROM R55S",      "1.0R", "teac_55s",       BUS_TYPE_SCSI, 2,  4, 36, 0, 0, { -1, -1, -1, -1 } },
+    /* Texel is Plextor according to Plextor's own EU website. */
+    { "TEXEL",    "CD-ROM DM-3024",   "1.00", "texel_3024",     BUS_TYPE_SCSI, 2,  2, 36, 1, 0, { -1, -1, -1, -1 } },
+    /*
+       Unusual 2.23x according to Google, I'm rounding it upwards to 3x.
+       Assumed caddy based on the DM-3024.
+     */
+    { "TEXEL",    "CD-ROM DM-3028",   "1.06", "texel_3028",     BUS_TYPE_SCSI, 2,  3, 36, 1, 0, { -1, -1, -1, -1 } }, /* Caddy. */
+    /*
+       The characteristics are a complete guesswork because I can't find
+       this one on Google.
+
+       Also, INQUIRY length is always 96 on these Toshiba drives.
+     */
+    { "TOSHIBA",  "CD-ROM DRIVE:XM",  "3433", "toshiba_xm",     BUS_TYPE_SCSI, 2,  2, 96, 0, 0, { -1, -1, -1, -1 } }, /* Tray.  */
+    { "TOSHIBA",  "CD-ROM XM-3201B",  "3232", "toshiba_3201b",  BUS_TYPE_SCSI, 1,  1, 96, 1, 0, { -1, -1, -1, -1 } }, /* Caddy. */
+    { "TOSHIBA",  "CD-ROM XM-3301TA", "0272", "toshiba_3301ta", BUS_TYPE_SCSI, 2,  2, 96, 0, 0, { -1, -1, -1, -1 } }, /* Tray.  */
+    { "TOSHIBA",  "CD-ROM XM-5701TA", "3136", "toshiba_5701a",  BUS_TYPE_SCSI, 2, 12, 96, 0, 0, { -1, -1, -1, -1 } }, /* Tray.  */
+    { "TOSHIBA",  "DVD-ROM SD-M1401", "1008", "toshiba_m1401",  BUS_TYPE_SCSI, 2, 40, 96, 0, 1, { -1, -1, -1, -1 } }, /* Tray.  */
+    { "MATSHITA", "CR-562",           "0.75", "cr562",          BUS_TYPE_MKE , 0,  2,  0, 0, 0, { -1, -1, -1, -1 } },
+    { "MATSHITA", "CR-562",           "0.80", "cr562_080",      BUS_TYPE_MKE , 0,  2,  0, 0, 0, { -1, -1, -1, -1 } },
+    { "MATSHITA", "CR-563",           "0.75", "cr563",          BUS_TYPE_MKE , 0,  2,  0, 0, 0, { -1, -1, -1, -1 } },
+    { "MATSHITA", "CR-563",           "0.80", "cr563_080",      BUS_TYPE_MKE , 0,  2,  0, 0, 0, { -1, -1, -1, -1 } },
+    { "",         "",                 "",     "",               BUS_TYPE_NONE, 0, -1,  0, 0, 0, { -1, -1, -1, -1 } }
 };
 
 /* To shut up the GCC compilers. */
@@ -194,133 +256,230 @@ typedef struct track_info_t {
     uint8_t f;
 } track_info_t;
 
+typedef struct raw_track_info_t {
+    uint8_t  session;
+    uint8_t  adr_ctl;
+    uint8_t  tno;
+    uint8_t  point;
+    uint8_t  m;
+    uint8_t  s;
+    uint8_t  f;
+    uint8_t  zero;
+    uint8_t  pm;
+    uint8_t  ps;
+    uint8_t  pf;
+} raw_track_info_t;
+
 /* Define the various CD-ROM drive operations (ops). */
 typedef struct cdrom_ops_t {
-    void (*get_tracks)(struct cdrom *dev, int *first, int *last);
-    void (*get_track_info)(struct cdrom *dev, uint32_t track, int end, track_info_t *ti);
-    void (*get_subchannel)(struct cdrom *dev, uint32_t lba, subchannel_t *subc);
-    int (*is_track_pre)(struct cdrom *dev, uint32_t lba);
-    int (*sector_size)(struct cdrom *dev, uint32_t lba);
-    int (*read_sector)(struct cdrom *dev, int type, uint8_t *b, uint32_t lba);
-    int (*track_type)(struct cdrom *dev, uint32_t lba);
-    void (*exit)(struct cdrom *dev);
+    int      (*get_track_info)(const void *local, const uint32_t track,
+                               const int end, track_info_t *ti);
+    void     (*get_raw_track_info)(const void *local, int *num,
+                                   uint8_t *rti);
+    int      (*is_track_pre)(const void *local, const uint32_t sector);
+    int      (*read_sector)(const void *local, uint8_t *buffer,
+                            const uint32_t sector);
+    uint8_t  (*get_track_type)(const void *local, const uint32_t sector);
+    uint32_t (*get_last_block)(const void *local);
+    int      (*read_dvd_structure)(const void *local, const uint8_t layer,
+                                   const uint8_t format, uint8_t *buffer,
+                                   uint32_t *info);
+    int      (*is_dvd)(const void *local);
+    int      (*has_audio)(const void *local);
+    int      (*is_empty)(const void *local);
+    void     (*close)(void *local);
+    void     (*load)(const void *local);
 } cdrom_ops_t;
 
 typedef struct cdrom {
-    uint8_t id;
+    uint8_t           id;
 
     union {
-        uint8_t res;
-        uint8_t res0; /* Reserved for other ID's. */
-        uint8_t res1;
-        uint8_t ide_channel;
-        uint8_t scsi_device_id;
+        uint8_t           res;
+        uint8_t           res0;      /* Reserved for other ID's. */
+        uint8_t           mke_channel;
+        uint8_t           ide_channel;
+        uint8_t           scsi_device_id;
     };
 
-    uint8_t bus_type;  /* 0 = ATAPI, 1 = SCSI */
-    uint8_t bus_mode;  /* Bit 0 = PIO suported;
-                          Bit 1 = DMA supportd. */
-    uint8_t cd_status; /* Struct variable reserved for
-                          media status. */
-    uint8_t speed;
-    uint8_t cur_speed;
+    uint8_t            bus_type;     /* 0 = ATAPI, 1 = SCSI */
+    uint8_t            bus_mode;     /* Bit 0 = PIO suported;
+                                        Bit 1 = DMA supportd. */
+    uint8_t            cd_status;    /* Struct variable reserved for
+                                        media status. */
+    uint8_t            speed;
+    uint8_t            cur_speed;
 
-    int   is_dir;
-    void *priv;
+    void              *priv;
 
-    char image_path[1024];
-    char prev_image_path[1024];
+    char               image_path[1024];
+    char               prev_image_path[1280];
 
-    char *image_history[CD_IMAGE_HISTORY];
+    uint32_t           sound_on;
+    uint32_t           cdrom_capacity;
+    uint32_t           seek_pos;
+    uint32_t           seek_diff;
+    uint32_t           cd_end;
+    uint32_t           type;
+    uint32_t           sector_size;
 
-    uint32_t sound_on;
-    uint32_t cdrom_capacity;
-    uint32_t seek_pos;
-    uint32_t seek_diff;
-    uint32_t cd_end;
-    uint32_t type;
+    uint32_t           inv_field;
+    int32_t            cached_sector;
+    int32_t            cd_buflen;
+    int32_t            sony_msf;
+    int32_t            real_speed;
+    int32_t            is_early;
+    int32_t            is_nec;
+    int32_t            is_bcd;
 
-    int host_drive;
-    int prev_host_drive;
-    int cd_buflen;
-    int audio_op;
-    int audio_muted_soft;
-    int sony_msf;
+    int32_t            cdrom_sector_size;
 
     const cdrom_ops_t *ops;
 
-    void *image;
+    char              *image_history[CD_IMAGE_HISTORY];
 
-    void (*insert)(void *priv);
-    void (*close)(void *priv);
-    uint32_t (*get_volume)(void *p, int channel);
-    uint32_t (*get_channel)(void *p, int channel);
+    void              *local;
+    void              *log;
 
-    int16_t cd_buffer[BUF_SIZE];
+    void               (*insert)(void *priv);
+    void               (*close)(void *priv);
+    uint32_t           (*get_volume)(void *p, int channel);
+    uint32_t           (*get_channel)(void *p, int channel);
+
+    int16_t            cd_buffer[CD_BUF_SIZE];
+
+    uint8_t            subch_buffer[96];
+
+    /* Needs some extra breathing space in case of overflows. */
+    uint8_t            raw_buffer[2][4096];
+    uint8_t            extra_buffer[296];
+
+    int32_t            is_chinon;
+    int32_t            is_pioneer;
+    int32_t            is_plextor;
+    int32_t            is_sony;
+    int32_t            is_toshiba;
+
+    int32_t            c2_first;
+    int32_t            cur_buf;
+
+    /* Only used on Windows hosts for disc change notifications. */
+    uint8_t            host_letter;
+    uint8_t            mode2;
+
+    int                no_check;
+
+    uint8_t            _F_LUT[_LUT_SIZE];
+    uint8_t            _B_LUT[_LUT_SIZE];
+
+    uint8_t            p_parity[172];
+    uint8_t            q_parity[104];
 } cdrom_t;
 
 extern cdrom_t cdrom[CDROM_NUM];
 
-extern char   *cdrom_getname(int type);
+#define MSFtoLBA(m, s, f)  ((((m * 60) + s) * 75) + f)
 
-extern char   *cdrom_get_internal_name(int type);
-extern int     cdrom_get_from_internal_name(char *s);
-extern void    cdrom_set_type(int model, int type);
-extern int     cdrom_get_type(int model);
+static __inline int
+bin2bcd(int x)
+{
+    return (x % 10) | ((x / 10) << 4);
+}
 
-extern int     cdrom_lba_to_msf_accurate(int lba);
-extern double  cdrom_seek_time(cdrom_t *dev);
-extern void    cdrom_stop(cdrom_t *dev);
-extern int     cdrom_is_pre(cdrom_t *dev, uint32_t lba);
-extern int     cdrom_audio_callback(cdrom_t *dev, int16_t *output, int len);
-extern uint8_t cdrom_audio_play(cdrom_t *dev, uint32_t pos, uint32_t len, int ismsf);
-extern uint8_t cdrom_audio_track_search(cdrom_t *dev, uint32_t pos, int type, uint8_t playbit);
-extern uint8_t cdrom_audio_track_search_pioneer(cdrom_t *dev, uint32_t pos, uint8_t playbit);
-extern uint8_t cdrom_audio_play_pioneer(cdrom_t *dev, uint32_t pos);
-extern uint8_t cdrom_audio_play_toshiba(cdrom_t *dev, uint32_t pos, int type);
-extern void    cdrom_audio_pause_resume(cdrom_t *dev, uint8_t resume);
-extern uint8_t cdrom_audio_scan(cdrom_t *dev, uint32_t pos, int type);
-extern uint8_t cdrom_get_audio_status_pioneer(cdrom_t *dev, uint8_t *b);
-extern uint8_t cdrom_get_audio_status_sony(cdrom_t *dev, uint8_t *b, int msf);
-extern uint8_t cdrom_get_current_subchannel(cdrom_t *dev, uint8_t *b, int msf);
-extern void    cdrom_get_current_subchannel_sony(cdrom_t *dev, uint8_t *b, int msf);
-extern void    cdrom_get_current_subcodeq(cdrom_t *dev, uint8_t *b);
-extern uint8_t cdrom_get_current_subcodeq_playstatus(cdrom_t *dev, uint8_t *b);
-extern int     cdrom_read_toc(cdrom_t *dev, unsigned char *b, int type,
-                              unsigned char start_track, int msf, int max_len);
-extern int     cdrom_read_toc_sony(cdrom_t *dev, unsigned char *b, unsigned char start_track, int msf, int max_len);
-extern void    cdrom_get_track_buffer(cdrom_t *dev, uint8_t *buf);
-extern void    cdrom_get_q(cdrom_t *dev, uint8_t *buf, int *curtoctrk, uint8_t mode);
-extern uint8_t cdrom_mitsumi_audio_play(cdrom_t *dev, uint32_t pos, uint32_t len);
-extern int     cdrom_readsector_raw(cdrom_t *dev, uint8_t *buffer, int sector, int ismsf,
-                                    int cdrom_sector_type, int cdrom_sector_flags, int *len, uint8_t vendor_type);
-extern uint8_t cdrom_read_disc_info_toc(cdrom_t *dev, unsigned char *b, unsigned char track, int type);
+static __inline int
+bcd2bin(int x)
+{
+    return (x >> 4) * 10 + (x & 0x0f);
+}
 
-extern void cdrom_seek(cdrom_t *dev, uint32_t pos, uint8_t vendor_type);
+extern char           *cdrom_get_vendor(const int type);
+extern void            cdrom_get_model(const int type, char *name, const int id);
+extern char           *cdrom_get_revision(const int type);
+extern int             cdrom_get_scsi_std(const int type);
+extern int             cdrom_is_early(const int type);
+extern int             cdrom_is_dvd(const int type);
+extern int             cdrom_is_generic(const int type);
+extern int             cdrom_is_caddy(const int type);
+extern int             cdrom_get_speed(const int type);
+extern int             cdrom_get_inquiry_len(const int type);
+extern int             cdrom_has_dma(const int type);
+extern int             cdrom_get_transfer_max(const int type, const int mode);
+extern int             cdrom_get_type_count(void);
+extern void            cdrom_generate_name_mke(const int type, char *name);
+extern void            cdrom_get_identify_model(const int type, char *name, const int id);
+extern void            cdrom_get_name(const int type, char *name);
+extern char           *cdrom_get_internal_name(const int type);
+extern int             cdrom_get_from_internal_name(const char *s);
+/* TODO: Configuration migration, remove when no longer needed. */
+extern int             cdrom_get_from_name(const char *s);
+extern void            cdrom_set_type(const int model, const int type);
+extern int             cdrom_get_type(const int model);
 
-extern void cdrom_close_handler(uint8_t id);
-extern void cdrom_insert(uint8_t id);
-extern void cdrom_eject(uint8_t id);
-extern void cdrom_reload(uint8_t id);
+extern int             cdrom_lba_to_msf_accurate(const int lba);
+extern void            cdrom_interleave_subch(uint8_t *d, const uint8_t *s);
+extern double          cdrom_seek_time(const cdrom_t *dev);
+extern void            cdrom_stop(cdrom_t *dev);
+extern void            cdrom_seek(cdrom_t *dev, const uint32_t pos, const uint8_t vendor_type);
+extern int             cdrom_is_pre(const cdrom_t *dev, const uint32_t lba);
 
-extern int  cdrom_image_open(cdrom_t *dev, const char *fn);
-extern void cdrom_image_close(cdrom_t *dev);
-extern void cdrom_image_reset(cdrom_t *dev);
+extern int             cdrom_audio_callback(cdrom_t *dev, int16_t *output, const int len);
+extern uint8_t         cdrom_audio_play(cdrom_t *dev, const uint32_t pos, const uint32_t len, const int ismsf);
+extern uint8_t         cdrom_audio_track_search(cdrom_t *dev, const uint32_t pos,
+                                                const int type, const uint8_t playbit);
+extern uint8_t         cdrom_audio_track_search_pioneer(cdrom_t *dev, const uint32_t pos, const uint8_t playbit);
+extern uint8_t         cdrom_audio_play_pioneer(cdrom_t *dev, const uint32_t pos);
+extern uint8_t         cdrom_audio_play_toshiba(cdrom_t *dev, const uint32_t pos, const int type);
+extern uint8_t         cdrom_audio_scan(cdrom_t *dev, const uint32_t pos);
+extern void            cdrom_audio_pause_resume(cdrom_t *dev, const uint8_t resume);
 
-extern void cdrom_ioctl_eject(void);
-extern void cdrom_ioctl_load(void);
-extern int  cdrom_ioctl_open(cdrom_t *dev, const char d);
+extern uint8_t         cdrom_get_current_status(const cdrom_t *dev);
+extern void            cdrom_get_current_subchannel(cdrom_t *dev, uint8_t *b, const int msf);
+extern void            cdrom_get_current_subchannel_sony(cdrom_t *dev, uint8_t *b, const int msf);
+extern uint8_t         cdrom_get_audio_status_pioneer(cdrom_t *dev, uint8_t *b);
+extern uint8_t         cdrom_get_audio_status_sony(cdrom_t *dev, uint8_t *b, const int msf);
+extern void            cdrom_get_current_subcodeq(cdrom_t *dev, uint8_t *b);
+extern uint8_t         cdrom_get_current_subcodeq_playstatus(cdrom_t *dev, uint8_t *b);
+extern int             cdrom_read_toc(const cdrom_t *dev, uint8_t *b, const int type,
+                                      const uint8_t start_track, const int msf, const int max_len);
+extern int             cdrom_read_toc_sony(const cdrom_t *dev, uint8_t *b, const uint8_t start_track,
+                                           const int msf, const int max_len);
+#ifdef USE_CDROM_MITSUMI
+extern void            cdrom_get_track_buffer(cdrom_t *dev, uint8_t *buf);
+extern void            cdrom_get_q(cdrom_t *dev, uint8_t *buf, int *curtoctrk, uint8_t mode);
+extern uint8_t         cdrom_mitsumi_audio_play(cdrom_t *dev, uint32_t pos, uint32_t len);
+#endif
+extern uint8_t         cdrom_read_disc_info_toc(cdrom_t *dev, uint8_t *b,
+                                                const uint8_t track, const int type);
+extern int             cdrom_is_track_audio(cdrom_t *dev, const int sector, const int ismsf,
+                                            int cdrom_sector_type, const uint8_t vendor_type);
+extern int             cdrom_readsector_raw(cdrom_t *dev, uint8_t *buffer, const int sector, const int ismsf,
+                                            int cdrom_sector_type, const int cdrom_sector_flags,
+                                            int *len, const uint8_t vendor_type);
+extern int             cdrom_read_dvd_structure(const cdrom_t *dev, const uint8_t layer, const uint8_t format,
+                                                uint8_t *buffer, uint32_t *info);
+extern void            cdrom_read_disc_information(const cdrom_t *dev, uint8_t *buffer);
+extern int             cdrom_read_track_information(cdrom_t *dev, const uint8_t *cdb, uint8_t *buffer);
+extern uint8_t         cdrom_get_current_mode(cdrom_t *dev);
+extern void            cdrom_set_empty(cdrom_t *dev);
+extern void            cdrom_update_status(cdrom_t *dev);
+extern int             cdrom_load(cdrom_t *dev, const char *fn, const int skip_insert);
 
-extern void cdrom_update_cdb(uint8_t *cdb, int lba_pos,
-                             int number_of_blocks);
+extern void            cdrom_global_init(void);
+extern void            cdrom_hard_reset(void);
+extern void            cdrom_close(void);
+extern void            cdrom_insert(const uint8_t id);
+extern void            cdrom_exit(const uint8_t id);
+extern int             cdrom_is_empty(const uint8_t id);
+extern void            cdrom_eject(const uint8_t id);
+extern void            cdrom_reload(const uint8_t id);
 
-extern int find_cdrom_for_scsi_id(uint8_t scsi_id);
+extern void            cdrom_compute_ecc_block(cdrom_t *dev, uint8_t *parity, const uint8_t *data,
+                                               uint32_t major_count, uint32_t minor_count,
+                                               uint32_t major_mult, uint32_t minor_inc, int m2f1);
+extern unsigned long   cdrom_crc32(unsigned long crc, const unsigned char *buf,
+                                   size_t len);
 
-extern void cdrom_close(void);
-extern void cdrom_global_init(void);
-extern void cdrom_global_reset(void);
-extern void cdrom_hard_reset(void);
-extern void scsi_cdrom_drive_reset(int c);
+extern int             cdrom_assigned_letters;
 
 #ifdef __cplusplus
 }
diff --git a/src/include/86box/cdrom_image.h b/src/include/86box/cdrom_image.h
index c848af50d..e0760ff7e 100644
--- a/src/include/86box/cdrom_image.h
+++ b/src/include/86box/cdrom_image.h
@@ -6,35 +6,33 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          CD-ROM image file handling module header, translated to C
- *          from cdrom_dosbox.h.
+ *          CD-ROM image file handling module header.
  *
- * Authors: RichardG,
- *          Miran Grca, <mgrca8@gmail.com>
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          RichardG, <richardg867@gmail.com>
+ *          Cacodemon345
  *
- *          Copyright 2016-2022 RichardG.
- *          Copyright 2016-2022 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
+ *          Copyright 2016-2025 RichardG.
+ *          Copyright 2024-2025 Cacodemon345.
  */
 #ifndef CDROM_IMAGE_H
 #define CDROM_IMAGE_H
 
-/* this header file lists the functions provided by
-   various platform specific cdrom-ioctl files */
+/* Track file struct. */
+typedef struct track_file_t {
+    int (*read)(void *priv, uint8_t *buffer, uint64_t seek, size_t count);
+    uint64_t (*get_length)(void *priv);
+    void (*close)(void *priv);
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+    char  fn[260];
+    FILE *fp;
+    void *priv;
+    void *log;
 
-extern int  image_open(uint8_t id, wchar_t *fn);
-extern void image_reset(uint8_t id);
+    int motorola;
+} track_file_t;
 
-extern void image_close(uint8_t id);
-
-void        update_status_bar_icon_state(int tag, int state);
-extern void cdrom_set_null_handler(uint8_t id);
-
-#ifdef __cplusplus
-}
-#endif
+extern void *image_open(cdrom_t *dev, const char *path);
 
 #endif /*CDROM_IMAGE_H*/
diff --git a/src/include/86box/cdrom_image_backend.h b/src/include/86box/cdrom_image_backend.h
deleted file mode 100644
index 39faf9f33..000000000
--- a/src/include/86box/cdrom_image_backend.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          CD-ROM image file handling module header , translated to C
- *          from cdrom_dosbox.h.
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          Fred N. van Kempen, <decwiz@yahoo.com>
- *          The DOSBox Team, <unknown>
- *
- *          Copyright 2016-2020 Miran Grca.
- *          Copyright 2017-2020 Fred N. van Kempen.
- *          Copyright 2002-2020 The DOSBox Team.
- */
-#ifndef CDROM_IMAGE_BACKEND_H
-#define CDROM_IMAGE_BACKEND_H
-
-#define RAW_SECTOR_SIZE    2352
-#define COOKED_SECTOR_SIZE 2048
-
-#define DATA_TRACK         0x14
-#define AUDIO_TRACK        0x10
-
-#define CD_FPS             75
-#define FRAMES_TO_MSF(f, M, S, F)                 \
-    {                                             \
-        uint64_t value = f;                       \
-        *(F)           = (value % CD_FPS) & 0xff; \
-        value /= CD_FPS;                          \
-        *(S) = (value % 60) & 0xff;               \
-        value /= 60;                              \
-        *(M) = value & 0xff;                      \
-    }
-#define MSF_TO_FRAMES(M, S, F) ((M) *60 * CD_FPS + (S) *CD_FPS + (F))
-
-typedef struct SMSF {
-    uint16_t min;
-    uint8_t  sec;
-    uint8_t  fr;
-} TMSF;
-
-/* Track file struct. */
-typedef struct track_file_t {
-    int (*read)(void *priv, uint8_t *buffer, uint64_t seek, size_t count);
-    uint64_t (*get_length)(void *priv);
-    void (*close)(void *priv);
-
-    char  fn[260];
-    FILE *fp;
-    void *priv;
-} track_file_t;
-
-typedef struct track_t {
-    int           number;
-    int           track_number;
-    int           attr;
-    int           sector_size;
-    int           mode2;
-    int           form;
-    int           pre;
-    int           pad;
-    uint64_t      start;
-    uint64_t      length;
-    uint64_t      skip;
-    track_file_t *file;
-} track_t;
-
-typedef struct cd_img_t {
-    int      tracks_num;
-    track_t *tracks;
-} cd_img_t;
-
-/* Binary file functions. */
-extern void cdi_close(cd_img_t *cdi);
-extern int  cdi_set_device(cd_img_t *cdi, const char *path);
-extern int  cdi_get_audio_tracks(cd_img_t *cdi, int *st_track, int *end, TMSF *lead_out);
-extern int  cdi_get_audio_tracks_lba(cd_img_t *cdi, int *st_track, int *end, uint32_t *lead_out);
-extern int  cdi_get_audio_track_pre(cd_img_t *cdi, int track);
-extern int  cdi_get_audio_track_info(cd_img_t *cdi, int end, int track, int *track_num, TMSF *start, uint8_t *attr);
-extern int  cdi_get_audio_track_info_lba(cd_img_t *cdi, int end, int track, int *track_num, uint32_t *start, uint8_t *attr);
-extern int  cdi_get_track(cd_img_t *cdi, uint32_t sector);
-extern int  cdi_get_audio_sub(cd_img_t *cdi, uint32_t sector, uint8_t *attr, uint8_t *track, uint8_t *index, TMSF *rel_pos, TMSF *abs_pos);
-extern int  cdi_read_sector(cd_img_t *cdi, uint8_t *buffer, int raw, uint32_t sector);
-extern int  cdi_read_sectors(cd_img_t *cdi, uint8_t *buffer, int raw, uint32_t sector, uint32_t num);
-extern int  cdi_read_sector_sub(cd_img_t *cdi, uint8_t *buffer, uint32_t sector);
-extern int  cdi_get_sector_size(cd_img_t *cdi, uint32_t sector);
-extern int  cdi_is_mode2(cd_img_t *cdi, uint32_t sector);
-extern int  cdi_get_mode2_form(cd_img_t *cdi, uint32_t sector);
-extern int  cdi_load_iso(cd_img_t *cdi, const char *filename);
-extern int  cdi_load_cue(cd_img_t *cdi, const char *cuefile);
-extern int  cdi_has_data_track(cd_img_t *cdi);
-extern int  cdi_has_audio_track(cd_img_t *cdi);
-
-/* Virtual ISO functions. */
-extern int           viso_read(void *priv, uint8_t *buffer, uint64_t seek, size_t count);
-extern uint64_t      viso_get_length(void *priv);
-extern void          viso_close(void *priv);
-extern track_file_t *viso_init(const char *dirname, int *error);
-
-#endif /*CDROM_IMAGE_BACKEND_H*/
diff --git a/src/include/86box/cdrom_image_viso.h b/src/include/86box/cdrom_image_viso.h
new file mode 100644
index 000000000..19f0e1de0
--- /dev/null
+++ b/src/include/86box/cdrom_image_viso.h
@@ -0,0 +1,26 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          CD-ROM image file handling module header.
+ *
+ * Authors: RichardG, <richardg867@gmail.com>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2016-2025 RichardG.
+ *          Copyright 2016-2025 Miran Grca.
+ */
+#ifndef CDROM_IMAGE_VISO_H
+#define CDROM_IMAGE_VISO_H
+
+/* Virtual ISO functions. */
+extern int           viso_read(void *priv, uint8_t *buffer, uint64_t seek, size_t count);
+extern uint64_t      viso_get_length(void *priv);
+extern void          viso_close(void *priv);
+extern track_file_t *viso_init(const uint8_t id, const char *dirname, int *error);
+
+#endif /*CDROM_IMAGE_VISO_H*/
diff --git a/src/include/86box/cdrom_interface.h b/src/include/86box/cdrom_interface.h
index 081f758f6..ba4d0581b 100644
--- a/src/include/86box/cdrom_interface.h
+++ b/src/include/86box/cdrom_interface.h
@@ -21,11 +21,13 @@ extern int cdrom_interface_current;
 
 extern void cdrom_interface_reset(void);
 
-extern const char     *cdrom_interface_get_internal_name(int cdinterface);
-extern int             cdrom_interface_get_from_internal_name(char *s);
-extern int             cdrom_interface_has_config(int cdinterface);
-extern const device_t *cdrom_interface_get_device(int cdinterface);
-extern int             cdrom_interface_get_flags(int cdinterface);
-extern int             cdrom_interface_available(int cdinterface);
+const  char           *cdrom_interface_get_internal_name(const int cdinterface);
+extern int             cdrom_interface_get_from_internal_name(const char *s);
+#ifdef EMU_DEVICE_H
+extern const device_t *cdrom_interface_get_device(const int cdinterface);
+#endif
+extern int             cdrom_interface_has_config(const int cdinterface);
+extern int             cdrom_interface_get_flags(const int cdinterface);
+extern int             cdrom_interface_available(const int cdinterface);
 
 #endif /*EMU_CDROM_INTERFACE_H*/
diff --git a/src/include/86box/cdrom_mitsumi.h b/src/include/86box/cdrom_mitsumi.h
index 0b8a3a250..01c549c0b 100644
--- a/src/include/86box/cdrom_mitsumi.h
+++ b/src/include/86box/cdrom_mitsumi.h
@@ -8,11 +8,11 @@
  *
  *          Mitsumi CD-ROM emulation for the ISA bus.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
- *          Copyright 2022 Miran Grca.
+ *          Copyright 2022      Miran Grca.
+ *          Copyright 2024-2025 Jasmine Iwanek.
  */
 #ifndef CDROM_MITSUMI_H
 #define CDROM_MITSUMI_H
diff --git a/src/include/86box/cdrom_mke.h b/src/include/86box/cdrom_mke.h
new file mode 100644
index 000000000..659e084e3
--- /dev/null
+++ b/src/include/86box/cdrom_mke.h
@@ -0,0 +1,24 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Panasonic/MKE CD-ROM emulation for the ISA bus.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          Cacodemon345
+ *
+ *          Copyright 2022-2025 Miran Grca.
+ *          Copyright 2025      Cacodemon345.
+ */
+
+#ifndef CDROM_MKE_H
+#define CDROM_MKE_H
+
+extern const device_t mke_cdrom_device;
+extern const device_t mke_cdrom_noncreative_device;
+
+#endif /*CDROM_MKE_H*/
diff --git a/src/include/86box/chipset.h b/src/include/86box/chipset.h
index 4aa3ee3e9..9cd037d1f 100644
--- a/src/include/86box/chipset.h
+++ b/src/include/86box/chipset.h
@@ -18,12 +18,14 @@
 #define EMU_CHIPSET_H
 
 /* ACC */
+extern const device_t acc2036_device;
 extern const device_t acc2168_device;
 
 /* ALi */
 extern const device_t ali1217_device;
 extern const device_t ali1429_device;
 extern const device_t ali1429g_device;
+extern const device_t ali1409_device;
 extern const device_t ali1435_device;
 extern const device_t ali1489_device;
 extern const device_t ali1531_device;
@@ -36,8 +38,14 @@ extern const device_t ali6117d_device;
 /* AMD */
 extern const device_t amd640_device;
 
+/* ASUS */
+extern const device_t isa486c_device;
+
 /* Compaq */
+extern const device_t compaq_device;
+
 extern const device_t compaq_386_device;
+extern const device_t compaq_genoa_device;
 
 /* Contaq/Cypress */
 extern const device_t contaq_82c596a_device;
@@ -46,9 +54,11 @@ extern const device_t contaq_82c597_device;
 /* C&T */
 extern const device_t ct_82c100_device;
 extern const device_t neat_device;
+extern const device_t neat_sx_device;
 extern const device_t scat_device;
 extern const device_t scat_4_device;
 extern const device_t scat_sx_device;
+extern const device_t cs8220_device;
 extern const device_t cs8230_device;
 extern const device_t cs4031_device;
 
@@ -56,6 +66,9 @@ extern const device_t cs4031_device;
 extern const device_t gc100_device;
 extern const device_t gc100a_device;
 
+/* GRiDcase */
+extern const device_t grid1520_device;
+
 /* Headland */
 extern const device_t headland_gc10x_device;
 extern const device_t headland_gc113_device;
@@ -106,11 +119,25 @@ extern const device_t slc90e66_device;
 
 extern const device_t ioapic_device;
 
+/* VTech */
+extern const device_t laserxt_device;
+extern const device_t lxt3_device;
+
+/* Olivetti */
+extern const device_t olivetti_eva_device;
+
 /* OPTi */
 extern const device_t opti283_device;
 extern const device_t opti291_device;
+extern const device_t opti381_device;
+extern const device_t opti391_device;
+extern const device_t opti481_device;
 extern const device_t opti493_device;
-extern const device_t opti495_device;
+extern const device_t opti495slc_device;
+extern const device_t opti495sx_device;
+extern const device_t opti496_device;
+extern const device_t opti498_device;
+extern const device_t opti499_device;
 extern const device_t opti601_device;
 extern const device_t opti602_device;
 extern const device_t opti802g_device;
@@ -121,6 +148,12 @@ extern const device_t opti895_device;
 extern const device_t opti5x7_device;
 extern const device_t opti5x7_pci_device;
 
+/* Philips */
+extern const device_t philips_device;
+
+/* Sanyo */
+extern const device_t sanyo_device;
+
 /* SiS */
 extern const device_t rabbit_device;
 extern const device_t sis_85c401_device;
@@ -130,8 +163,16 @@ extern const device_t sis_85c471_device;
 extern const device_t sis_85c496_device;
 extern const device_t sis_85c496_ls486e_device;
 extern const device_t sis_85c50x_device;
+extern const device_t sis_550x_85c503_device;
+extern const device_t sis_85c50x_5503_device;
+extern const device_t sis_550x_device;
 extern const device_t sis_5511_device;
 extern const device_t sis_5571_device;
+extern const device_t sis_5581_device;
+extern const device_t sis_5591_1997_device;
+extern const device_t sis_5591_device;
+extern const device_t sis_5600_1997_device;
+extern const device_t sis_5600_device;
 
 /* ST */
 extern const device_t stpc_client_device;
@@ -141,9 +182,14 @@ extern const device_t stpc_atlas_device;
 extern const device_t stpc_serial_device;
 extern const device_t stpc_lpt_device;
 
+/* Symphony */
+extern const device_t sl82c461_device;
+
 /* UMC */
 extern const device_t umc_8886f_device;
 extern const device_t umc_8886af_device;
+extern const device_t umc_8886bf_device;
+extern const device_t umc_8890_device;
 extern const device_t umc_hb4_device;
 
 /* VIA */
@@ -174,12 +220,16 @@ extern const device_t vlsi_scamp_device;
 extern const device_t wd76c10_device;
 
 /* Miscellaneous Hardware */
+extern const device_t tulip_jumper_device;
+
+extern const device_t dell_jumper_device;
+
 extern const device_t nec_mate_unk_device;
 
 extern const device_t phoenix_486_jumper_device;
 extern const device_t phoenix_486_jumper_pci_device;
 
-#if defined(DEV_BRANCH) && defined(USE_OLIVETTI)
-extern const device_t olivetti_eva_device;
-#endif
+extern const device_t radisys_config_device;
+
+extern const device_t zenith_scratchpad_device;
 #endif /*EMU_CHIPSET_H*/
diff --git a/src/include/86box/config.h b/src/include/86box/config.h
index 80c987162..507c506f0 100644
--- a/src/include/86box/config.h
+++ b/src/include/86box/config.h
@@ -8,16 +8,16 @@
  *
  *          Configuration file handler header.
  *
- *
- *
  * Authors: Sarah Walker,
  *          Miran Grca, <mgrca8@gmail.com>
  *          Fred N. van Kempen, <decwiz@yahoo.com>
  *          Overdoze,
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
  *          Copyright 2008-2017 Sarah Walker.
  *          Copyright 2016-2017 Miran Grca.
  *          Copyright 2017 Fred N. van Kempen.
+ *          Copyright 2021-2025 Jasmine Iwanek.
  */
 #ifndef EMU_CONFIG_H
 #define EMU_CONFIG_H
@@ -111,15 +111,18 @@ typedef struct config_t {
 #    ifdef USE_SERIAL_DEVICES
     char serial_devices[SERIAL_MAX][32];     /* Serial device names */
 #    endif
+    char gameport_devices[GAMEPORT_MAX][32]; /* gameport device names */
 
     /* Other peripherals category */
-    int fdc_type;                 /* Floppy disk controller type */
+    int fdc_current[FDC_MAX];     /* Floppy disk controller type */
+    int hdc_current[HDC_MAX];     /* Hard disk controller type */
     int hdc;                      /* Hard disk controller */
     int scsi_card;                /* SCSI controller */
     int ide_ter_enabled;          /* Tertiary IDE controller enabled */
     int ide_qua_enabled;          /* Quaternary IDE controller enabled */
     int bugger_enabled;           /* ISA bugger device enabled */
     int isa_rtc_type;             /* ISA RTC card */
+    int isa_rom_type[ISAROM_MAX]; /* ISA ROM boards */
     int isa_mem_type[ISAMEM_MAX]; /* ISA memory boards */
 
     /* Hard disks category */
@@ -130,11 +133,13 @@ typedef struct config_t {
 
     /* Other removable devices category */
     storage_cfg_t cdrom[CDROM_NUM]; /* CD-ROM drives */
-    storage_cfg_t rdisk[ZIP_NUM];   /* Removable disk drives */
+    storage_cfg_t rdisk[RDISK_NUM]; /* Removable disk drives */
 } config_t;
 #endif
 
+extern void config_load_global(void);
 extern void config_load(void);
+extern void config_save_global(void);
 extern void config_save(void);
 
 #ifdef EMU_INI_H
diff --git a/src/include/86box/crc.h b/src/include/86box/crc.h
new file mode 100644
index 000000000..1a6e76dab
--- /dev/null
+++ b/src/include/86box/crc.h
@@ -0,0 +1,34 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Definitions for the CRC code.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2016-2025 Miran Grca.
+ */
+#ifndef EMU_CRC_H
+#define EMU_CRC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef union {
+    uint16_t word;
+    uint8_t  bytes[2];
+} crc_t;
+
+extern void crc16_setup(uint16_t *crc_table, uint16_t poly);
+extern void crc16_calc(uint16_t *crc_table, uint8_t byte, crc_t *crc_var);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*EMU_CRC_H*/
diff --git a/src/include/86box/device.h b/src/include/86box/device.h
index 71a76c6b1..76f12a0c5 100644
--- a/src/include/86box/device.h
+++ b/src/include/86box/device.h
@@ -18,7 +18,7 @@
  *          Copyright 2016-2019 Miran Grca.
  *          Copyright 2008-2019 Sarah Walker.
  *          Copyright 2021      Andreas J. Reichel.
- *          Copyright 2021-2022 Jasmine Iwanek.
+ *          Copyright 2021-2025 Jasmine Iwanek.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -57,6 +57,7 @@
 #define CONFIG_MIDI_OUT     (3 | CONFIG_TYPE_INT)      /* config_get_int() */
 #define CONFIG_SPINNER      (4 | CONFIG_TYPE_INT)      /* config_get_int() */
 #define CONFIG_MIDI_IN      (5 | CONFIG_TYPE_INT)      /* config_get_int() */
+#define CONFIG_MEMORY       (6 | CONFIG_TYPE_INT)      /* config_get_int() */
 
 #define CONFIG_STRING       (0 | CONFIG_TYPE_STRING)     /* config_get_string() */
 #define CONFIG_FNAME        (1 | CONFIG_TYPE_STRING)     /* config_get_string() */
@@ -78,32 +79,36 @@
 // #define CONFIG_STANDALONE 257      /* not available on the on-board variant */
 
 enum {
-    DEVICE_PCJR      = 2,          /* requires an IBM PCjr */
-    DEVICE_XTKBC     = 4,          /* requires an XT-compatible keyboard controller */
-    DEVICE_AT        = 8,          /* requires an AT-compatible system */
-    DEVICE_ATKBC     = 0x10,       /* requires an AT-compatible keyboard controller */
-    DEVICE_PS2       = 0x20,       /* requires a PS/1 or PS/2 system */
-    DEVICE_ISA       = 0x40,       /* requires the ISA bus */
-    DEVICE_CBUS      = 0x80,       /* requires the C-BUS bus */
-    DEVICE_PCMCIA    = 0x100,      /* requires the PCMCIA bus */
-    DEVICE_MCA       = 0x200,      /* requires the MCA bus */
-    DEVICE_HIL       = 0x400,      /* requires the HP HIL bus */
-    DEVICE_EISA      = 0x800,      /* requires the EISA bus */
-    DEVICE_AT32      = 0x1000,     /* requires the Mylex AT/32 local bus */
-    DEVICE_OLB       = 0x2000,     /* requires the OPTi local bus */
-    DEVICE_VLB       = 0x4000,     /* requires the VLB bus */
-    DEVICE_PCI       = 0x8000,     /* requires the PCI bus */
-    DEVICE_CARDBUS   = 0x10000,    /* requires the CardBus bus */
-    DEVICE_USB       = 0x20000,    /* requires the USB bus */
-    DEVICE_AGP       = 0x40000,    /* requires the AGP bus */
-    DEVICE_AC97      = 0x80000,    /* requires the AC'97 bus */
-    DEVICE_COM       = 0x100000,   /* requires a serial port */
-    DEVICE_LPT       = 0x200000,   /* requires a parallel port */
-    DEVICE_KBC       = 0x400000,   /* is a keyboard controller */
+    DEVICE_CASETTE   = 1,          /* requires a Casette Port */
+    DEVICE_SIDECAR   = 2,          /* requires an IBM PCjr */
+    DEVICE_ISA       = 4,          /* requires the ISA bus */
+    DEVICE_XT_KBC    = 8,          /* requires an XT-compatible keyboard controller */
+    DEVICE_CBUS      = 0x10,       /* requires the C-BUS bus */
+    DEVICE_ISA16     = 0x20,       /* requires an AT-compatible system */
+    DEVICE_AT_KBC    = 0x40,       /* requires an AT-compatible keyboard controller */
+    DEVICE_MCA       = 0x80,       /* requires the MCA bus */
+    DEVICE_MCA32     = 0x100,      /* requires the MCA bus */
+    DEVICE_PS2_KBC   = 0x200,      /* requires a PS/1 or PS/2 system */
+    DEVICE_PCMCIA    = 0x400,      /* requires the PCMCIA bus */
+    DEVICE_HIL       = 0x800,      /* requires the HP HIL bus */
+    DEVICE_EISA      = 0x1000,     /* requires the EISA bus */
+    DEVICE_AT32      = 0x2000,     /* requires the Mylex AT/32 local bus */
+    DEVICE_OLB       = 0x4000,     /* requires the OPTi local bus */
+    DEVICE_VLB       = 0x8000,     /* requires the VLB bus */
+    DEVICE_PCI       = 0x10000,    /* requires the PCI bus */
+    DEVICE_CARDBUS   = 0x20000,    /* requires the CardBus bus */
+    DEVICE_USB       = 0x40000,    /* requires the USB bus */
+    DEVICE_AGP       = 0x80000,    /* requires the AGP bus */
+    DEVICE_AC97      = 0x100000,   /* requires the AC'97 bus */
+    DEVICE_BUS       = 0x1fffff,   /* requires a machine bus */
 
-    DEVICE_ONBOARD   = 0x20000000, /* is on-board */
-    DEVICE_EXTPARAMS = 0x40000000, /* accepts extended parameters */
+    DEVICE_COM       = 0x200000,   /* requires a serial port */
+    DEVICE_LPT       = 0x400000,   /* requires a parallel port */
 
+    DEVICE_KBC       = 0x800000,   /* is a keyboard controller */
+    DEVICE_SOFTRESET = 0x1000000,  /* requires to be reset on soft reset */
+
+    DEVICE_ONBOARD   = 0x40000000, /* is on-board */
     DEVICE_PIT       = 0x80000000, /* device is a PIT */
 
     DEVICE_ALL       = 0xffffffff  /* match all devices */
@@ -118,16 +123,6 @@ enum {
 #define BIOS_INTERLEAVED_INVERT          8
 #define BIOS_HIGH_BIT_INVERT             16
 
-#define device_common_config_t                      \
-    const char                     *name;           \
-    const char                     *description;    \
-    int                             type;           \
-    const char                     *default_string; \
-    int                             default_int;    \
-    const char                     *file_filter;    \
-    const device_config_spinner_t   spinner;        \
-    const device_config_selection_t selection[32]
-
 typedef struct device_config_selection_t {
     const char *description;
     int         value;
@@ -139,29 +134,27 @@ typedef struct device_config_spinner_t {
     int16_t step;
 } device_config_spinner_t;
 
-typedef struct _device_dep_config_ {
-    device_common_config_t;
-} device_dep_config_t;
-
 typedef struct device_config_bios_t {
     const char *name;
     const char *internal_name;
-    int         bios_type;
-    int         files_no;
+    uint8_t     bios_type;
+    uint8_t     files_no;
     uint32_t    local;
     uint32_t    size;
-    void       *dev1;
-    void       *dev2;
+    void       *dev[2];
     const char *files[9];
-    /* Configuration options that depend on the device variant.
-       To prevent excessive nesting, there is no CONFIG_BIOS
-       option a dep_config struct  */
-    const device_dep_config_t *dep_config;
 } device_config_bios_t;
 
 typedef struct _device_config_ {
-    device_common_config_t;
-    const device_config_bios_t      bios[32];
+    const char                      *name;
+    const char                      *description;
+    int                              type;
+    const char                      *default_string;
+    int                              default_int;
+    const char                      *file_filter;
+    const device_config_spinner_t    spinner;
+    const device_config_selection_t  selection[64];
+    const device_config_bios_t       bios[32];
 } device_config_t;
 
 typedef struct _device_ {
@@ -176,10 +169,7 @@ typedef struct _device_ {
     };
     void (*close)(void *priv);
     void (*reset)(void *priv);
-    union {
-        int (*available)(void);
-        int (*poll)(void *priv);
-    };
+    int  (*available)(void);
     void (*speed_changed)(void *priv);
     void (*force_redraw)(void *priv);
 
@@ -197,59 +187,62 @@ extern "C" {
 #endif
 
 extern void  device_init(void);
-extern void  device_set_context(device_context_t *c, const device_t *dev, int inst);
+extern void  device_set_context(device_context_t *ctx, const device_t *dev, int inst);
 extern void  device_context(const device_t *dev);
 extern void  device_context_inst(const device_t *dev, int inst);
 extern void  device_context_restore(void);
-extern void *device_add(const device_t *d);
-extern void *device_add_parameters(const device_t *dev, void *params);
+extern void *device_add(const device_t *dev);
+extern void *device_add_linked(const device_t *dev, void *priv);
+extern void *device_add_params(const device_t *dev, void *params);
 extern void  device_add_ex(const device_t *dev, void *priv);
-extern void  device_add_ex_parameters(const device_t *dev, void *priv, void *params);
+extern void  device_add_ex_params(const device_t *dev, void *priv, void *params);
 extern void *device_add_inst(const device_t *dev, int inst);
-extern void *device_add_inst_parameters(const device_t *dev, int inst, void *params);
+extern void *device_add_inst_params(const device_t *dev, int inst, void *params);
 extern void  device_add_inst_ex(const device_t *dev, void *priv, int inst);
-extern void  device_add_inst_ex_parameters(const device_t *dev, void *priv, int inst, void *params);
-extern void *device_cadd(const device_t *dev, const device_t *cd);
-extern void *device_cadd_parameters(const device_t *dev, const device_t *cd, void *params);
-extern void  device_cadd_ex(const device_t *dev, const device_t *cd, void *priv);
-extern void  device_cadd_ex_parameters(const device_t *dev, const device_t *cd, void *priv, void *params);
-extern void *device_cadd_inst(const device_t *dev, const device_t *cd, int inst);
-extern void *device_cadd_inst_parameters(const device_t *dev, const device_t *cd, int inst, void *params);
-extern void  device_cadd_inst_ex(const device_t *dev, const device_t *cd, void *priv, int inst);
-extern void  device_cadd_inst_ex_parameters(const device_t *dev, const device_t *cd, void *priv, int inst, void *params);
+extern void  device_add_inst_ex_params(const device_t *dev, void *priv, int inst, void *params);
+extern void *device_get_common_priv(void);
 extern void  device_close_all(void);
 extern void  device_reset_all(uint32_t match_flags);
 extern void *device_find_first_priv(uint32_t match_flags);
 extern void *device_get_priv(const device_t *dev);
 extern int   device_available(const device_t *dev);
-extern int   device_poll(const device_t *dev);
 extern void  device_speed_changed(void);
 extern void  device_force_redraw(void);
 extern void  device_get_name(const device_t *dev, int bus, char *name);
 extern int   device_has_config(const device_t *dev);
+
+extern uint8_t     device_get_bios_type(const device_t *dev, const char *internal_name);
+extern uint8_t     device_get_bios_num_files(const device_t *dev, const char *internal_name);
+extern uint32_t    device_get_bios_local(const device_t *dev, const char *internal_name);
+extern uint32_t    device_get_bios_file_size(const device_t *dev, const char *internal_name);
 extern const char *device_get_bios_file(const device_t *dev, const char *internal_name, int file_no);
 
-extern int device_is_valid(const device_t *, int m);
+extern int device_is_valid(const device_t *, int mch);
 
 extern const device_t* device_context_get_device(void);
 
 extern int         device_get_config_int(const char *name);
-extern int         device_get_config_int_ex(const char *s, int dflt_int);
+extern int         device_get_config_int_ex(const char *str, int def);
 extern int         device_get_config_hex16(const char *name);
 extern int         device_get_config_hex20(const char *name);
-extern int         device_get_config_mac(const char *name, int dflt_int);
-extern void        device_set_config_int(const char *s, int val);
-extern void        device_set_config_hex16(const char *s, int val);
-extern void        device_set_config_hex20(const char *s, int val);
-extern void        device_set_config_mac(const char *s, int val);
+extern int         device_get_config_mac(const char *name, int def);
+extern void        device_set_config_int(const char *str, int val);
+extern void        device_set_config_hex16(const char *str, int val);
+extern void        device_set_config_hex20(const char *str, int val);
+extern void        device_set_config_mac(const char *str, int val);
 extern const char *device_get_config_string(const char *name);
-extern const int   device_get_instance(void);
+extern int         device_get_instance(void);
 #define device_get_config_bios device_get_config_string
 
 extern const char *device_get_internal_name(const device_t *dev);
 
-extern int   machine_get_config_int(char *s);
-extern char *machine_get_config_string(char *s);
+extern int         machine_get_config_int(char *str);
+extern const char *machine_get_config_string(char *str);
+
+extern int         machine_device_available(const device_t *dev);
+
+extern const device_t device_none;
+extern const device_t device_internal;
 
 #ifdef __cplusplus
 }
diff --git a/src/include/86box/dma.h b/src/include/86box/dma.h
index 7129da17c..9f649275e 100644
--- a/src/include/86box/dma.h
+++ b/src/include/86box/dma.h
@@ -98,6 +98,8 @@ extern void writedma2(uint8_t temp);
 extern int  dma_get_drq(int channel);
 extern void dma_set_drq(int channel, int set);
 
+extern int dma_channel_read_only(int channel);
+extern int dma_channel_advance(int channel);
 extern int dma_channel_read(int channel);
 extern int dma_channel_write(int channel, uint16_t val);
 
@@ -120,4 +122,6 @@ void dma_high_page_init(void);
 void dma_remove_sg(void);
 void dma_set_sg_base(uint8_t sg_base);
 
+extern int dma_channel_readable(int channel);
+
 #endif /*EMU_DMA_H*/
diff --git a/src/include/86box/fdc.h b/src/include/86box/fdc.h
index 09c9c4578..cd1e58db7 100644
--- a/src/include/86box/fdc.h
+++ b/src/include/86box/fdc.h
@@ -22,8 +22,6 @@
 #ifndef EMU_FDC_H
 #define EMU_FDC_H
 
-extern int fdc_type;
-
 #define FDC_PRIMARY_ADDR        0x03f0
 #define FDC_PRIMARY_IRQ         6
 #define FDC_PRIMARY_DMA         2
@@ -40,21 +38,27 @@ extern int fdc_type;
 #define FDC_QUATERNARY_IRQ      6
 #define FDC_QUATERNARY_DMA      2
 
-#define FDC_FLAG_PCJR           0x01   /* PCjr */
-#define FDC_FLAG_DISKCHG_ACTLOW 0x02   /* Amstrad, PS/1, PS/2 ISA */
-#define FDC_FLAG_AT             0x04   /* AT+, PS/x */
-#define FDC_FLAG_PS1            0x08   /* PS/1, PS/2 ISA */
-#define FDC_FLAG_SUPERIO        0x10   /* Super I/O chips */
-#define FDC_FLAG_START_RWC_1    0x20   /* W83877F, W83977F */
-#define FDC_FLAG_MORE_TRACKS    0x40   /* W83877F, W83977F, PC87306, PC87309 */
-#define FDC_FLAG_NSC            0x80   /* PC87306, PC87309 */
-#define FDC_FLAG_TOSHIBA        0x100  /* T1000, T1200 */
-#define FDC_FLAG_AMSTRAD        0x200  /* Non-AT Amstrad machines */
-#define FDC_FLAG_UMC            0x400  /* UMC UM8398 */
-#define FDC_FLAG_ALI            0x800  /* ALi M512x / M1543C */
-#define FDC_FLAG_SEC            0x1000 /* Is Secondary */
-#define FDC_FLAG_TER            0x2000 /* Is Tertiary */
-#define FDC_FLAG_QUA            0x3000 /* Is Quaternary */
+#define FDC_FLAG_PCJR           0x01     /* PCjr */
+#define FDC_FLAG_DISKCHG_ACTLOW 0x02     /* Amstrad, PS/1, PS/2 ISA */
+#define FDC_FLAG_AT             0x04     /* AT+, PS/x */
+#define FDC_FLAG_PS2            0x08     /* PS/1, PS/2 ISA */
+#define FDC_FLAG_PS2_MCA        0x10     /* PS/2 MCA */
+#define FDC_FLAG_SUPERIO        0x20     /* Super I/O chips */
+#define FDC_FLAG_START_RWC_1    0x40     /* W83877F, W83977F */
+#define FDC_FLAG_MORE_TRACKS    0x80     /* W83877F, W83977F, PC87306, PC87309 */
+#define FDC_FLAG_NSC            0x100    /* PC87306, PC87309 */
+#define FDC_FLAG_TOSHIBA        0x200    /* T1000, T1200 */
+#define FDC_FLAG_AMSTRAD        0x400    /* Non-AT Amstrad machines */
+#define FDC_FLAG_UMC            0x800    /* UMC UM8398 */
+#define FDC_FLAG_ALI            0x1000   /* ALi M512x / M1543C */
+#define FDC_FLAG_NO_DSR_RESET   0x2000   /* Has no DSR reset */
+#define FDC_FLAG_DENSEL_INVERT  0x4000   /* Invert DENSEL polarity */
+#define FDC_FLAG_FINTR          0x8000   /* Raise FINTR on data command finish */
+#define FDC_FLAG_NEC            0x10000  /* Is NEC upd765-compatible */
+#define FDC_FLAG_SEC            0x20000  /* Is Secondary */
+#define FDC_FLAG_TER            0x40000  /* Is Tertiary */
+#define FDC_FLAG_QUA            0x80000  /* Is Quaternary */
+#define FDC_FLAG_SMC661         0x100000 /* SM(s)C FDC37C661 - different TDR enhanced mode */
 
 typedef struct fdc_t {
     uint8_t dor;
@@ -100,7 +104,6 @@ typedef struct fdc_t {
     uint8_t densel_force;
     uint8_t fifo;
     uint8_t tfifo;
-    uint8_t fifobufpos;
 
     uint8_t drv2en;
     uint8_t gap;
@@ -115,14 +118,15 @@ typedef struct fdc_t {
     uint8_t rw_drive;
 
     uint8_t lock;
+    uint8_t dsr;
+
+    uint8_t media_id;
+
+    uint8_t params[15];
     uint8_t specify[2];
-
     uint8_t res[11];
-
-    uint8_t eot[4];
+    uint16_t eot[4];
     uint8_t rwc[4];
-    uint8_t params[8];
-    uint8_t fifobuf[16];
 
     uint16_t pcn[4];
 
@@ -145,6 +149,9 @@ typedef struct fdc_t {
 
     int drvrate[4];
 
+    void *fifo_p;
+    int fifointest;
+
     sector_id_t read_track_sector;
     sector_id_t format_sector_id;
 
@@ -162,6 +169,9 @@ extern void fdc_3f1_enable(fdc_t *fdc, int enable);
 extern int  fdc_get_bit_rate(fdc_t *fdc);
 extern int  fdc_get_bitcell_period(fdc_t *fdc);
 
+extern uint8_t fdc_get_media_id(fdc_t *fdc, int id);
+extern void    fdc_set_media_id(fdc_t *fdc, int id, int set);
+
 /* A few functions to communicate between Super I/O chips and the FDC. */
 extern void    fdc_update_enh_mode(fdc_t *fdc, int enh_mode);
 extern int     fdc_get_rwc(fdc_t *fdc, int drive);
@@ -173,6 +183,7 @@ extern uint8_t fdc_get_densel_polarity(fdc_t *fdc);
 extern void    fdc_update_densel_force(fdc_t *fdc, int densel_force);
 extern void    fdc_update_drvrate(fdc_t *fdc, int drive, int drvrate);
 extern void    fdc_update_drv2en(fdc_t *fdc, int drv2en);
+extern void    fdc_toggle_flag(fdc_t *fdc, int flag, int on);
 
 extern void fdc_noidam(fdc_t *fdc);
 extern void fdc_nosector(fdc_t *fdc);
@@ -197,6 +208,7 @@ extern int         fdc_get_drive(fdc_t *fdc);
 extern int         fdc_get_perp(fdc_t *fdc);
 extern int         fdc_get_format_n(fdc_t *fdc);
 extern int         fdc_is_mfm(fdc_t *fdc);
+extern int         fdc_is_dma(fdc_t *fdc);
 extern double      fdc_get_hut(fdc_t *fdc);
 extern double      fdc_get_hlt(fdc_t *fdc);
 extern void        fdc_request_next_sector_id(fdc_t *fdc);
@@ -211,6 +223,11 @@ extern uint8_t     fdc_get_diswr(fdc_t *fdc);
 extern void        fdc_set_diswr(fdc_t *fdc, uint8_t diswr);
 extern uint8_t     fdc_get_swap(fdc_t *fdc);
 extern void        fdc_set_swap(fdc_t *fdc, uint8_t swap);
+extern void        fdc_set_flags(fdc_t *fdc, int flags);
+extern void        fdc_clear_flags(fdc_t *fdc, int flags);
+extern void        fdc_set_fdd_changed(int drive, int changed);
+extern uint8_t     fdc_get_fdd_changed(int drive);
+extern uint8_t     fdc_get_shadow(fdc_t *fdc);
 
 extern void fdc_finishcompare(fdc_t *fdc, int satisfying);
 extern void fdc_finishread(fdc_t *fdc);
@@ -243,19 +260,21 @@ extern const device_t fdc_xt_qua_device;
 extern const device_t fdc_xt_t1x00_device;
 extern const device_t fdc_xt_tandy_device;
 extern const device_t fdc_xt_amstrad_device;
+extern const device_t fdc_xt_umc_um8398_device;
 extern const device_t fdc_pcjr_device;
 extern const device_t fdc_at_device;
 extern const device_t fdc_at_sec_device;
 extern const device_t fdc_at_ter_device;
 extern const device_t fdc_at_qua_device;
 extern const device_t fdc_at_actlow_device;
-extern const device_t fdc_at_ps1_device;
+extern const device_t fdc_at_smc_661_device;
 extern const device_t fdc_at_smc_device;
 extern const device_t fdc_at_ali_device;
 extern const device_t fdc_at_winbond_device;
 extern const device_t fdc_at_nsc_device;
-extern const device_t fdc_dp8473_device;
-extern const device_t fdc_um8398_device;
+extern const device_t fdc_at_nsc_dp8473_device;
+extern const device_t fdc_ps2_device;
+extern const device_t fdc_ps2_mca_device;
 #endif
 
 #endif /*EMU_FDC_H*/
diff --git a/src/include/86box/fdc_ext.h b/src/include/86box/fdc_ext.h
index 0d821ac11..e6348139b 100644
--- a/src/include/86box/fdc_ext.h
+++ b/src/include/86box/fdc_ext.h
@@ -22,15 +22,22 @@
 #ifndef EMU_FDC_EXT_H
 #define EMU_FDC_EXT_H
 
-extern int fdc_type;
+#define FDC_MAX 2
+
+extern int fdc_current[FDC_MAX];
 
 /* Controller types. */
-#define FDC_INTERNAL 0
+#define FDC_NONE     0
+#define FDC_INTERNAL 1
 
 extern const device_t fdc_b215_device;
 extern const device_t fdc_pii151b_device;
 extern const device_t fdc_pii158b_device;
 
+extern const device_t fdc_compaticard_i_device;
+extern const device_t fdc_compaticard_ii_device;
+extern const device_t fdc_compaticard_iv_device;
+
 extern const device_t fdc_monster_device;
 
 extern void fdc_card_init(void);
@@ -41,4 +48,4 @@ extern const device_t *fdc_card_getdevice(int card);
 extern int             fdc_card_has_config(int card);
 extern int             fdc_card_available(int card);
 
-#endif /*EMU_FDC_H*/
+#endif /*EMU_FDC_EXT_H*/
diff --git a/src/include/86box/fdd.h b/src/include/86box/fdd.h
index 0331f4fcc..d6ade3bc6 100644
--- a/src/include/86box/fdd.h
+++ b/src/include/86box/fdd.h
@@ -8,21 +8,19 @@
  *
  *          Definitions for the floppy drive emulation.
  *
- *
- *
  * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
  *          Miran Grca, <mgrca8@gmail.com>
  *          Fred N. van Kempen, <decwiz@yahoo.com>
  *
- *          Copyright 2008-2018 Sarah Walker.
- *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2018 Fred N. van Kempen.
+ *          Copyright 2008-2025 Sarah Walker.
+ *          Copyright 2016-2025 Miran Grca.
+ *          Copyright 2018-2025 Fred N. van Kempen.
  */
 #ifndef EMU_FDD_H
 #define EMU_FDD_H
 
 #define FDD_NUM              4
-#define FLOPPY_IMAGE_HISTORY 4
+#define FLOPPY_IMAGE_HISTORY 10
 #define SEEK_RECALIBRATE     -999
 
 #ifdef __cplusplus
@@ -129,13 +127,6 @@ extern int drive_empty[FDD_NUM];
 #define SECTOR_FIRST -2
 #define SECTOR_NEXT  -1
 
-typedef union {
-    uint16_t word;
-    uint8_t  bytes[2];
-} crc_t;
-
-void fdd_calccrc(uint8_t byte, crc_t *crc_var);
-
 typedef struct d86f_handler_t {
     uint16_t (*disk_flags)(int drive);
     uint16_t (*side_flags)(int drive);
diff --git a/src/include/86box/fdd_86f.h b/src/include/86box/fdd_86f.h
index cc8035965..de7bb7dcb 100644
--- a/src/include/86box/fdd_86f.h
+++ b/src/include/86box/fdd_86f.h
@@ -8,13 +8,11 @@
  *
  *          Definitions for the 86F floppy image format.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Fred N. van Kempen, <decwiz@yahoo.com>
  *
- *          Copyright 2016-2019 Miran Grca.
- *          Copyright 2018-2019 Fred N. van Kempen.
+ *          Copyright 2016-2025 Miran Grca.
+ *          Copyright 2018-2025 Fred N. van Kempen.
  */
 #ifndef EMU_FLOPPY_86F_H
 #define EMU_FLOPPY_86F_H
diff --git a/src/include/86box/fdd_json.h b/src/include/86box/fdd_json.h
deleted file mode 100644
index 7f3c9adb4..000000000
--- a/src/include/86box/fdd_json.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * VARCem   Virtual ARchaeological Computer EMulator.
- *          An emulator of (mostly) x86-based PC systems and devices,
- *          using the ISA,EISA,VLB,MCA  and PCI system buses, roughly
- *          spanning the era between 1981 and 1995.
- *
- *          Definitions for the PCjs JSON floppy image format.
- *
- *
- *
- * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
- *
- *          Copyright 2017-2018 Fred N. van Kempen.
- *
- *          Redistribution and  use  in source  and binary forms, with
- *          or  without modification, are permitted  provided that the
- *          following conditions are met:
- *
- *          1. Redistributions of  source  code must retain the entire
- *             above notice, this list of conditions and the following
- *             disclaimer.
- *
- *          2. Redistributions in binary form must reproduce the above
- *             copyright  notice,  this list  of  conditions  and  the
- *             following disclaimer in  the documentation and/or other
- *             materials provided with the distribution.
- *
- *          3. Neither the  name of the copyright holder nor the names
- *             of  its  contributors may be used to endorse or promote
- *             products  derived from  this  software without specific
- *             prior written permission.
- *
- * THIS SOFTWARE  IS  PROVIDED BY THE  COPYRIGHT  HOLDERS AND CONTRIBUTORS
- * "AS IS" AND  ANY EXPRESS  OR  IMPLIED  WARRANTIES,  INCLUDING, BUT  NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE  ARE  DISCLAIMED. IN  NO  EVENT  SHALL THE COPYRIGHT
- * HOLDER OR  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL  DAMAGES  (INCLUDING,  BUT  NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE  GOODS OR SERVICES;  LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  AND ON  ANY
- * THEORY OF  LIABILITY, WHETHER IN  CONTRACT, STRICT  LIABILITY, OR  TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef EMU_FLOPPY_JSON_H
-#define EMU_FLOPPY_JSON_H
-
-extern void json_init(void);
-extern void json_load(int drive, char *fn);
-extern void json_close(int drive);
-
-#endif /*EMU_FLOPPY_JSON_H*/
diff --git a/src/include/86box/fdd_pcjs.h b/src/include/86box/fdd_pcjs.h
new file mode 100644
index 000000000..30e8d28a3
--- /dev/null
+++ b/src/include/86box/fdd_pcjs.h
@@ -0,0 +1,255 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the pcjs v2 floppy image format (read-only)
+ *
+ * Authors: cold-brewed
+ *
+ *          Copyright 2024 cold-brewed
+ *
+ *          More info: https://www.pcjs.org/tools/diskimage/
+ *          pcjs disk module v2: https://github.com/jeffpar/pcjs/blob/master/machines/pcx86/modules/v2/disk.js
+ */
+
+#ifndef EMU_FLOPPY_PCJS_H
+#define EMU_FLOPPY_PCJS_H
+
+/* Currently targeting v2 of the spec */
+#define PCJS_DISK_SPEC_VERSION 2
+
+#define PCJS_MAX_TRACKS  256
+#define PCJS_MAX_SIDES   2
+#define PCJS_MAX_SECTORS 256
+
+/* The json keys as defined in each sector array item */
+#define PCJS_OBJECT_KEY_CYLINDER "c"
+#define PCJS_OBJECT_KEY_TRACK    PCJS_OBJECT_KEY_CYLINDER
+#define PCJS_OBJECT_KEY_HEAD     "h"
+#define PCJS_OBJECT_KEY_SECTOR   "s"
+#define PCJS_OBJECT_KEY_LENGTH   "l"
+#define PCJS_OBJECT_KEY_DATA     "d"
+#define PCJS_OBJECT_KEY_FILE     "f"
+#define PCJS_OBJECT_KEY_OFFSET   "d"
+
+/* The json keys as defined in the fileTable object */
+#define PCJS_OBJECT_KEY_FT_HASH "hash"
+#define PCJS_OBJECT_KEY_FT_PATH "path"
+#define PCJS_OBJECT_KEY_FT_ATTR "attr"
+#define PCJS_OBJECT_KEY_FT_DATE "date"
+#define PCJS_OBJECT_KEY_FT_SIZE "size"
+
+/* String length defaults */
+#define PCJS_IMAGE_INFO_STRING_LEN 128
+#define PCJS_IMAGE_INFO_ARRAY_LEN  128
+#define PCJS_FILE_TABLE_STRING_LEN 128
+
+/* Defaults for optional json values */
+#define JSON_OPTIONAL_NUMBER_DEFAULT 0
+#define JSON_OPTIONAL_STRING_DEFAULT ""
+
+/* Structure for each sector */
+typedef struct pcjs_sector_t {
+    /* Track number */
+    uint8_t track;
+    /* Side number */
+    uint8_t side;
+    /* Sector number */
+    uint8_t sector;
+    /* Size of the sector */
+    uint16_t size;
+    /* Encoded size of the sector */
+    uint16_t encoded_size;
+    /* Pointer the the allocated data for the sector */
+    uint8_t *data;
+    /* Number of times to repeat the pattern until end of sector */
+    uint16_t pattern_repeat;
+    /* Last pattern entry to repeat */
+    int32_t last_entry;
+    /* Maps back to a file entry. -1 if not set */
+    int32_t file;
+    /* The offset in the mapped file entry. -1 if not set */
+    int32_t offset;
+} pcjs_sector_t;
+
+/* Cases are mixed here (some camelCase) to match the pcjs values */
+typedef struct pcjs_image_info_t {
+    char     type[PCJS_IMAGE_INFO_STRING_LEN];
+    char     name[PCJS_IMAGE_INFO_STRING_LEN];
+    char     format[PCJS_IMAGE_INFO_STRING_LEN];
+    char     hash[PCJS_IMAGE_INFO_STRING_LEN];
+    uint32_t checksum;
+    uint8_t  cylinders;
+    uint8_t  heads;
+    uint8_t  trackDefault;
+    uint16_t sectorDefault;
+    uint32_t diskSize;
+    uint8_t  boot_sector[PCJS_IMAGE_INFO_ARRAY_LEN];
+    uint8_t  boot_sector_array_size;
+    char     version[PCJS_IMAGE_INFO_STRING_LEN];
+    char     repository[PCJS_IMAGE_INFO_STRING_LEN];
+} pcjs_image_info_t;
+
+typedef struct pcjs_file_table_entry_t {
+    char     hash[PCJS_FILE_TABLE_STRING_LEN];
+    char     path[PCJS_FILE_TABLE_STRING_LEN];
+    char     attr[PCJS_FILE_TABLE_STRING_LEN];
+    char     date[PCJS_FILE_TABLE_STRING_LEN];
+    uint32_t size;
+} pcjs_file_table_entry_t ;
+
+typedef struct pcjs_file_table_t {
+    pcjs_file_table_entry_t *entries;
+    uint16_t num_entries;
+} pcjs_file_table_t;
+
+typedef struct pcjs_t {
+    /* FILE pointer for the json file */
+    FILE *fp;
+
+    /* These values are read in from the metadata */
+    /* Total number of tracks */
+    uint8_t  total_tracks;
+    /* Total number of sides */
+    uint8_t  total_sides;
+    /* Total number of sectors per track */
+    uint16_t total_sectors;
+
+    /* These values are calculated for validation */
+    /* Calculated number of tracks */
+    uint8_t  calc_total_tracks;
+    /* Calculated number of sides */
+    uint8_t  calc_total_sides;
+    /* Calculated number of sectors per track */
+    uint16_t calc_total_sectors;
+
+    /* Number of sectors per track */
+    uint8_t spt[PCJS_MAX_TRACKS][PCJS_MAX_SIDES];
+
+    /* Current track */
+    uint8_t current_track;
+    /* Current side */
+    uint8_t current_side;
+    /* Current sector */
+    uint8_t current_sector[PCJS_MAX_SIDES];
+
+    /* Disk is in dmf format? */
+    uint8_t dmf;
+    uint8_t interleave;
+    uint8_t gap2_len;
+    uint8_t gap3_len;
+    int     track_width;
+
+    /* Flags for the entire disk */
+    uint16_t disk_flags;
+    /* Flags for the current track */
+    uint16_t track_flags;
+
+    uint8_t interleave_ordered[PCJS_MAX_TRACKS][PCJS_MAX_SIDES];
+
+    /* The main mapping of all the sectors back to each individual pcjs_sector_t item. */
+    pcjs_sector_t sectors[PCJS_MAX_TRACKS][PCJS_MAX_SIDES][PCJS_MAX_SECTORS];
+
+    /* Disk metadata information contained in each image */
+    pcjs_image_info_t image_info;
+    /* Optional file table mapping for each sector */
+    pcjs_file_table_t file_table;
+} pcjs_t;
+
+/* Errors */
+enum pcjs_img_error {
+    E_SUCCESS = 0,
+    E_MISSING_KEY = 1,
+    E_UNEXPECTED_VALUE = 2,
+    E_INTEGRITY,
+    E_INVALID_OBJECT,
+    E_ALLOC,
+    E_PARSE,
+};
+
+typedef enum pcjs_img_error pcjs_error_t;
+
+/* Macros */
+
+/* Macro for getting image info metadata: strings */
+#define IMAGE_INFO_GET_STRING(type) \
+    const cJSON * type##_json = cJSON_GetObjectItemCaseSensitive(imageInfo, #type); \
+    if (cJSON_IsString( type##_json) && type##_json->valuestring != NULL) { \
+        strncpy(dev->image_info.type,  type##_json->valuestring, sizeof(dev->image_info. type) - 1); \
+    } else { \
+        pcjs_log("Required string value for \"%s\" missing from imageInfo\n", #type); \
+        pcjs_error = E_INVALID_OBJECT; \
+        return 1; \
+    }
+/* Macro for getting image info metadata: ints */
+#define IMAGE_INFO_GET_NUMBER(type) \
+    const cJSON * type##_json = cJSON_GetObjectItemCaseSensitive(imageInfo, #type); \
+    if (cJSON_IsNumber( type##_json)) { \
+        dev->image_info.type = type##_json->valueint; \
+    } else { \
+        pcjs_log("Required number value for \"%s\" missing from imageInfo\n", #type); \
+        pcjs_error = E_INVALID_OBJECT; \
+        return 1; \
+    }
+
+/* Macro for getting required object value: number */
+#define JSON_GET_OBJECT_NUMBER_REQUIRED(var, json, key) \
+const cJSON *var##_json  = cJSON_GetObjectItemCaseSensitive(json, key); \
+if (!cJSON_IsNumber(var##_json)) { \
+    pcjs_log("Required number value for \"%s\" missing or invalid\n", key); \
+    pcjs_error = E_INVALID_OBJECT; \
+    goto fail; \
+} else { \
+    var = var##_json->valueint; \
+}
+
+/* Macro for getting optional object value: number
+ * Default value will be used if the number does not exist */
+#define JSON_GET_OBJECT_NUMBER_OPTIONAL(var, json, key) \
+const cJSON *var##_json  = cJSON_GetObjectItemCaseSensitive(json, key); \
+if (!cJSON_IsNumber(var##_json)) { \
+var = JSON_OPTIONAL_NUMBER_DEFAULT; \
+} else { \
+var = var##_json->valueint; \
+}
+
+/* Macro for getting optional object value: number
+ * Provided default value will be used if the number does not exist */
+#define JSON_GET_OBJECT_NUMBER_OPTIONAL_DEFAULT(var, json, key, default) \
+const cJSON *var##_json  = cJSON_GetObjectItemCaseSensitive(json, key); \
+if (!cJSON_IsNumber(var##_json)) { \
+var = default; \
+} else { \
+var = var##_json->valueint; \
+}
+
+/* Macro for getting optional object value: string
+ * Default value will be used if the string does not exist */
+#define JSON_GET_OBJECT_STRING_OPTIONAL(var, json, key) \
+    const cJSON * var##_json = cJSON_GetObjectItemCaseSensitive(json, key); \
+    if (cJSON_IsString( var##_json) && var##_json->valuestring != NULL) { \
+        strncpy(var,  var##_json->valuestring, sizeof(var) - 1); \
+    } else { \
+        strncpy(var,  JSON_OPTIONAL_STRING_DEFAULT, sizeof(var) - 1); \
+    }
+
+/* Macro for getting required object value: string */
+#define JSON_GET_OBJECT_STRING_REQUIRED(var, json, key) \
+    const cJSON * var##_json = cJSON_GetObjectItemCaseSensitive(json, key); \
+    if (cJSON_IsString( var##_json) && var##_json->valuestring != NULL) { \
+        strncpy(var,  var##_json->valuestring, sizeof(var) - 1); \
+    } else { \
+        pcjs_error = E_INVALID_OBJECT; \
+        goto fail; \
+    }
+
+extern void pcjs_init(void);
+extern void pcjs_load(int drive, char *fn);
+extern void pcjs_close(int drive);
+extern const char* pcjs_errmsg(void);
+
+#endif
diff --git a/src/include/86box/fifo.h b/src/include/86box/fifo.h
index e76189d8a..f8f07d9b5 100644
--- a/src/include/86box/fifo.h
+++ b/src/include/86box/fifo.h
@@ -10,8 +10,11 @@
  *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2023 Miran Grca.
+ *          Copyright 2023-2025 Miran Grca.
  */
+#ifndef FIFO_H
+#define FIFO_H
+
 #define FIFO(size)                      \
     typedef struct {                    \
         int     start;                  \
@@ -34,6 +37,7 @@
         void  (*d_full_evt)(void *);    \
         void  (*d_ready_evt)(void *);   \
                                         \
+        uint8_t tag[64];                \
         uint8_t buf[size];              \
     } fifo## size ##_t;
 
@@ -47,9 +51,13 @@ FIFO(64)
 
 extern int        fifo_get_count(void *priv);
 extern void       fifo_write(uint8_t val, void *priv);
+extern void       fifo_write_tagged(uint8_t tag, uint8_t val, void *priv);
 extern void       fifo_write_evt(uint8_t val, void *priv);
+extern void       fifo_write_evt_tagged(uint8_t tag, uint8_t val, void *priv);
 extern uint8_t    fifo_read(void *priv);
+extern uint8_t    fifo_read_tagged(uint8_t *tag, void *priv);
 extern uint8_t    fifo_read_evt(void *priv);
+extern uint8_t    fifo_read_evt_tagged(uint8_t *tag, void *priv);
 extern void       fifo_clear_overrun(void *priv);
 extern int        fifo_get_full(void *priv);
 extern int        fifo_get_d_full(void *priv);
@@ -71,3 +79,5 @@ extern void       fifo_reset(void *priv);
 extern void       fifo_reset_evt(void *priv);
 extern void       fifo_close(void *priv);
 extern void      *fifo_init(int len);
+
+#endif /*FIFO_H*/
diff --git a/src/include/86box/fifo8.h b/src/include/86box/fifo8.h
index 9f88ec408..7dec1d57d 100644
--- a/src/include/86box/fifo8.h
+++ b/src/include/86box/fifo8.h
@@ -69,28 +69,80 @@ extern uint8_t fifo8_pop(Fifo8 *fifo);
 /**
  * fifo8_pop_buf:
  * @fifo: FIFO to pop from
- * @max: maximum number of bytes to pop
- * @num: actual number of returned bytes
+ * @dest: the buffer to write the data into (can be NULL)
+ * @destlen: size of @dest and maximum number of bytes to pop
  *
- * Pop a number of elements from the FIFO up to a maximum of max. The buffer
+ * Pop a number of elements from the FIFO up to a maximum of @destlen.
+ * The popped data is copied into the @dest buffer.
+ * Care is taken when the data wraps around in the ring buffer.
+ *
+ * Returns: number of bytes popped.
+ */
+extern uint32_t fifo8_pop_buf(Fifo8 *fifo, uint8_t *dest, uint32_t destlen);
+
+/**
+ * fifo8_pop_bufptr:
+ * @fifo: FIFO to pop from
+ * @max: maximum number of bytes to pop
+ * @numptr: pointer filled with number of bytes returned (can be NULL)
+ *
+ * New code should prefer to use fifo8_pop_buf() instead of fifo8_pop_bufptr().
+ *
+ * Pop a number of elements from the FIFO up to a maximum of @max. The buffer
  * containing the popped data is returned. This buffer points directly into
- * the FIFO backing store and data is invalidated once any of the fifo8_* APIs
- * are called on the FIFO.
+ * the internal FIFO backing store and data (without checking for overflow!)
+ * and is invalidated once any of the fifo8_* APIs are called on the FIFO.
  *
  * The function may return fewer bytes than requested when the data wraps
  * around in the ring buffer; in this case only a contiguous part of the data
  * is returned.
  *
- * The number of valid bytes returned is populated in *num; will always return
- * at least 1 byte. max must not be 0 or greater than the number of bytes in
- * the FIFO.
+ * The number of valid bytes returned is populated in *@numptr; will always
+ * return at least 1 byte. max must not be 0 or greater than the number of
+ * bytes in the FIFO.
  *
  * Clients are responsible for checking the availability of requested data
  * using fifo8_num_used().
  *
  * Returns: A pointer to popped data.
  */
-extern const uint8_t *fifo8_pop_buf(Fifo8 *fifo, uint32_t max, uint32_t *num);
+extern const uint8_t *fifo8_pop_bufptr(Fifo8 *fifo, uint32_t max, uint32_t *numptr);
+
+/**
+ * fifo8_peek_bufptr: read upto max bytes from the fifo
+ * @fifo: FIFO to read from
+ * @max: maximum number of bytes to peek
+ * @numptr: pointer filled with number of bytes returned (can be NULL)
+ *
+ * Peek into a number of elements from the FIFO up to a maximum of @max.
+ * The buffer containing the data peeked into is returned. This buffer points
+ * directly into the FIFO backing store. Since data is invalidated once any
+ * of the fifo8_* APIs are called on the FIFO, it is the caller responsibility
+ * to access it before doing further API calls.
+ *
+ * The function may return fewer bytes than requested when the data wraps
+ * around in the ring buffer; in this case only a contiguous part of the data
+ * is returned.
+ *
+ * The number of valid bytes returned is populated in *@numptr; will always
+ * return at least 1 byte. max must not be 0 or greater than the number of
+ * bytes in the FIFO.
+ *
+ * Clients are responsible for checking the availability of requested data
+ * using fifo8_num_used().
+ *
+ * Returns: A pointer to peekable data.
+ */
+extern const uint8_t *fifo8_peek_bufptr(Fifo8 *fifo, uint32_t max, uint32_t *numptr);
+
+/**
+ * fifo8_drop:
+ * @fifo: FIFO to drop bytes
+ * @len: number of bytes to drop
+ *
+ * Drop (consume) bytes from a FIFO.
+ */
+extern void fifo8_drop(Fifo8 *fifo, uint32_t len);
 
 /**
  * fifo8_reset:
diff --git a/src/include/86box/filters.h b/src/include/86box/filters.h
index dfe19c654..d11e79512 100644
--- a/src/include/86box/filters.h
+++ b/src/include/86box/filters.h
@@ -5,7 +5,7 @@
 
 /* fc=150Hz */
 static inline float
-adgold_highpass_iir(int i, float NewSample)
+adgold_highpass_iir(int c, int i, float NewSample)
 {
     float ACoef[NCoef + 1] = {
         0.98657437157334349000,
@@ -19,28 +19,28 @@ adgold_highpass_iir(int i, float NewSample)
         0.97261396931534050000
     };
 
-    static float y[2][NCoef + 1]; /* output samples */
-    static float x[2][NCoef + 1]; /* input samples */
+    static float y[2][2][NCoef + 1]; /* output samples */
+    static float x[2][2][NCoef + 1]; /* input samples */
     int          n;
 
     /* shift the old samples */
     for (n = NCoef; n > 0; n--) {
-        x[i][n] = x[i][n - 1];
-        y[i][n] = y[i][n - 1];
+        x[c][i][n] = x[c][i][n - 1];
+        y[c][i][n] = y[c][i][n - 1];
     }
 
     /* Calculate the new output */
-    x[i][0] = NewSample;
-    y[i][0] = ACoef[0] * x[i][0];
+    x[c][i][0] = NewSample;
+    y[c][i][0] = ACoef[0] * x[c][i][0];
     for (n = 1; n <= NCoef; n++)
-        y[i][0] += ACoef[n] * x[i][n] - BCoef[n] * y[i][n];
+        y[c][i][0] += ACoef[n] * x[c][i][n] - BCoef[n] * y[c][i][n];
 
-    return y[i][0];
+    return y[c][i][0];
 }
 
 /* fc=150Hz */
 static inline float
-adgold_lowpass_iir(int i, float NewSample)
+adgold_lowpass_iir(int c, int i, float NewSample)
 {
     float ACoef[NCoef + 1] = {
         0.00009159473951071446,
@@ -54,23 +54,23 @@ adgold_lowpass_iir(int i, float NewSample)
         0.97261396931306277000
     };
 
-    static float y[2][NCoef + 1]; /* output samples */
-    static float x[2][NCoef + 1]; /* input samples */
+    static float y[2][2][NCoef + 1]; /* output samples */
+    static float x[2][2][NCoef + 1]; /* input samples */
     int          n;
 
     /* shift the old samples */
     for (n = NCoef; n > 0; n--) {
-        x[i][n] = x[i][n - 1];
-        y[i][n] = y[i][n - 1];
+        x[c][i][n] = x[c][i][n - 1];
+        y[c][i][n] = y[c][i][n - 1];
     }
 
     /* Calculate the new output */
-    x[i][0] = NewSample;
-    y[i][0] = ACoef[0] * x[i][0];
+    x[c][i][0] = NewSample;
+    y[c][i][0] = ACoef[0] * x[c][i][0];
     for (n = 1; n <= NCoef; n++)
-        y[i][0] += ACoef[n] * x[i][n] - BCoef[n] * y[i][n];
+        y[c][i][0] += ACoef[n] * x[c][i][n] - BCoef[n] * y[c][i][n];
 
-    return y[i][0];
+    return y[c][i][0];
 }
 
 /* fc=56Hz */
@@ -197,8 +197,8 @@ low_iir(int c, int i, double NewSample)
         0.93726236021404663000
     };
 
-    static double y[3][2][NCoef + 1]; /* output samples */
-    static double x[3][2][NCoef + 1]; /* input samples */
+    static double y[5][2][NCoef + 1]; /* output samples */
+    static double x[5][2][NCoef + 1]; /* input samples */
     int           n;
 
     /* shift the old samples */
@@ -232,8 +232,8 @@ low_cut_iir(int c, int i, double NewSample)
         0.93726236021916731000
     };
 
-    static double y[3][2][NCoef + 1]; /* output samples */
-    static double x[3][2][NCoef + 1]; /* input samples */
+    static double y[5][2][NCoef + 1]; /* output samples */
+    static double x[5][2][NCoef + 1]; /* input samples */
     int           n;
 
     /* shift the old samples */
@@ -266,8 +266,8 @@ high_iir(int c, int i, double NewSample)
         -1.36640781670578510000,
         0.52352474706139873000
     };
-    static double y[3][2][NCoef + 1]; /* output samples */
-    static double x[3][2][NCoef + 1]; /* input samples */
+    static double y[5][2][NCoef + 1]; /* output samples */
+    static double x[5][2][NCoef + 1]; /* input samples */
     int           n;
 
     /* shift the old samples */
@@ -300,8 +300,8 @@ high_cut_iir(int c, int i, double NewSample)
         -1.36640781666419950000,
         0.52352474703279628000
     };
-    static double y[3][2][NCoef + 1]; /* output samples */
-    static double x[3][2][NCoef + 1]; /* input samples */
+    static double y[5][2][NCoef + 1]; /* output samples */
+    static double x[5][2][NCoef + 1]; /* input samples */
     int           n;
 
     /* shift the old samples */
@@ -334,8 +334,8 @@ deemph_iir(int i, double NewSample)
         -1.05429146278569141337,
         0.26412280202756849290
     };
-    static double y[3][NCoef + 1]; /* output samples */
-    static double x[3][NCoef + 1]; /* input samples */
+    static double y[5][NCoef + 1]; /* output samples */
+    static double x[5][NCoef + 1]; /* input samples */
     int           n;
 
     /* shift the old samples */
@@ -372,8 +372,8 @@ sb_iir(int c, int i, double NewSample)
         0.55326988968868285000
     };
 
-    static double y[3][2][NCoef + 1]; /* output samples */
-    static double x[3][2][NCoef + 1]; /* input samples */
+    static double y[5][2][NCoef + 1]; /* output samples */
+    static double x[5][2][NCoef + 1]; /* input samples */
     int           n;
 
     /* shift the old samples */
@@ -395,13 +395,13 @@ sb_iir(int c, int i, double NewSample)
 #define NCoef      1
 #define SB16_NCoef 51
 
-extern double low_fir_sb16_coef[3][SB16_NCoef];
+extern double low_fir_sb16_coef[5][SB16_NCoef];
 
 static inline double
 low_fir_sb16(int c, int i, double NewSample)
 {
-    static double x[3][2][SB16_NCoef + 1]; // input samples
-    static int    pos[3] = { 0, 0 };
+    static double x[4][2][SB16_NCoef + 1]; // input samples
+    static int    pos[4] = { 0, 0, 0, 0 };
     double        out    = 0.0;
     int           n;
 
@@ -422,4 +422,31 @@ low_fir_sb16(int c, int i, double NewSample)
     return out;
 }
 
+extern double low_fir_pas16_coef[SB16_NCoef];
+
+static inline double
+low_fir_pas16(const int i, const double NewSample)
+{
+    static double x[2][SB16_NCoef + 1]; // input samples
+    static int    pos = 0;
+    double        out = 0.0;
+    int           n;
+
+    /* Calculate the new output */
+    x[i][pos] = NewSample;
+
+    for (n = 0; n < ((SB16_NCoef + 1) - pos) && n < SB16_NCoef; n++)
+        out += low_fir_pas16_coef[n] * x[i][n + pos];
+    for (; n < SB16_NCoef; n++)
+        out += low_fir_pas16_coef[n] * x[i][(n + pos) - (SB16_NCoef + 1)];
+
+    if (i == 1) {
+        pos++;
+        if (pos > SB16_NCoef)
+            pos = 0;
+    }
+
+    return out;
+}
+
 #endif /*EMU_FILTERS_H*/
diff --git a/src/include/86box/flash.h b/src/include/86box/flash.h
index 6f0e1ff15..bd9b7e505 100644
--- a/src/include/86box/flash.h
+++ b/src/include/86box/flash.h
@@ -20,6 +20,7 @@
 #ifndef EMU_FLASH_H
 #define EMU_FLASH_H
 
+extern const device_t amd_am28f010_flash_device;
 extern const device_t catalyst_flash_device;
 
 extern const device_t intel_flash_bxt_ami_device;
diff --git a/src/include/86box/gameport.h b/src/include/86box/gameport.h
index ba3568464..f9d7810e0 100644
--- a/src/include/86box/gameport.h
+++ b/src/include/86box/gameport.h
@@ -8,22 +8,28 @@
  *
  *          Definitions for the generic game port handlers.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Sarah Walker, <https://pcem-emulator.co.uk/>
  *          RichardG, <richardg867@gmail.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
- *          Copyright 2016-2018 Miran Grca.
+ *          Copyright 2016-2022 Miran Grca.
  *          Copyright 2008-2018 Sarah Walker.
- *          Copyright 2021 RichardG.
+ *          Copyright 2021      RichardG.
+ *          Copyright 2021-2025 Jasmine Iwanek.
  */
 #ifndef EMU_GAMEPORT_H
 #define EMU_GAMEPORT_H
 
+#define GAMEPORT_MAX 2
+
 #define MAX_PLAT_JOYSTICKS  8
 #define MAX_JOYSTICKS       4
 
+#define MAX_JOY_AXES    16
+#define MAX_JOY_BUTTONS 32
+#define MAX_JOY_POVS    4
+
 #define JS_TYPE_NONE               0
 #define JS_TYPE_2AXIS_4BUTTON      1
 #define JS_TYPE_2AXIS_6BUTTON      2
@@ -36,60 +42,18 @@
 
 #define POV_X               0x80000000
 #define POV_Y               0x40000000
-#define SLIDER              0x20000000
 
 #define AXIS_NOT_PRESENT    -99999
 
-#define JOYSTICK_PRESENT(n) (joystick_state[n].plat_joystick_nr != 0)
+#define JOYSTICK_PRESENT(gp, js) (joystick_state[gp][js].plat_joystick_nr != 0)
 
+#define GAMEPORT_1ADDR      0x010000
+#define GAMEPORT_6ADDR      0x060000
+#define GAMEPORT_8ADDR      0x080000
 #define GAMEPORT_SIO        0x1000000
-
-typedef struct plat_joystick_t {
-    char name[260];
-
-    int a[8];
-    int b[32];
-    int p[4];
-    int s[2];
-
-    struct {
-        char name[260];
-        int  id;
-    } axis[8];
-
-    struct {
-        char name[260];
-        int  id;
-    } button[32];
-
-    struct {
-        char name[260];
-        int  id;
-    } pov[4];
-
-    struct {
-        char name[260];
-        int  id;
-    } slider[2];
-
-    int nr_axes;
-    int nr_buttons;
-    int nr_povs;
-    int nr_sliders;
-} plat_joystick_t;
+#define GAMEPORT_PNPROM     0x2000000
 
 typedef struct joystick_t {
-    int axis[8];
-    int button[32];
-    int pov[4];
-
-    int plat_joystick_nr;
-    int axis_mapping[8];
-    int button_mapping[32];
-    int pov_mapping[4][2];
-} joystick_t;
-
-typedef struct joystick_if_t {
     const char *name;
     const char *internal_name;
 
@@ -104,17 +68,66 @@ typedef struct joystick_if_t {
     int         button_count;
     int         pov_count;
     int         max_joysticks;
-    const char *axis_names[8];
-    const char *button_names[32];
-    const char *pov_names[4];
-} joystick_if_t;
+    const char *axis_names[MAX_JOY_AXES];
+    const char *button_names[MAX_JOY_BUTTONS];
+    const char *pov_names[MAX_JOY_POVS];
+} joystick_t;
+
+typedef struct plat_joystick_state_t {
+    char name[260];
+
+    int a[MAX_JOY_AXES];
+    int b[MAX_JOY_BUTTONS];
+    int p[MAX_JOY_POVS];
+
+    struct {
+        char name[260];
+        int  id;
+    } axis[MAX_JOY_AXES];
+
+    struct {
+        char name[260];
+        int  id;
+    } button[MAX_JOY_BUTTONS];
+
+    struct {
+        char name[260];
+        int  id;
+    } pov[MAX_JOY_POVS];
+
+    int nr_axes;
+    int nr_buttons;
+    int nr_povs;
+} plat_joystick_state_t;
+
+typedef struct joystick_state_t {
+    int axis[MAX_JOY_AXES];
+    int button[MAX_JOY_BUTTONS];
+    int pov[MAX_JOY_POVS];
+
+    int plat_joystick_nr;
+    int axis_mapping[MAX_JOY_AXES];
+    int button_mapping[MAX_JOY_BUTTONS];
+    int pov_mapping[MAX_JOY_POVS][2];
+} joystick_state_t;
+
+extern device_t game_ports[GAMEPORT_MAX];
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+extern int gameport_available(int port);
+#ifdef EMU_DEVICE_H
+extern const device_t *gameport_get_device(int port);
+#endif
+extern int         gameport_has_config(int port);
+extern const char *gameport_get_internal_name(int port);
+extern int         gameport_get_from_internal_name(const char *str);
+
 #ifdef EMU_DEVICE_H
 extern const device_t gameport_device;
+extern const device_t gameport_200_device;
 extern const device_t gameport_201_device;
 extern const device_t gameport_203_device;
 extern const device_t gameport_205_device;
@@ -126,22 +139,23 @@ extern const device_t gameport_20d_device;
 extern const device_t gameport_20f_device;
 extern const device_t gameport_tm_acm_device;
 extern const device_t gameport_pnp_device;
+extern const device_t gameport_pnp_1io_device;
 extern const device_t gameport_pnp_6io_device;
 extern const device_t gameport_sio_device;
 extern const device_t gameport_sio_1io_device;
 
 extern const device_t *standalone_gameport_type;
 #endif
-extern int             gameport_instance_id;
-extern plat_joystick_t plat_joystick_state[MAX_PLAT_JOYSTICKS];
-extern joystick_t      joystick_state[MAX_JOYSTICKS];
-extern int             joysticks_present;
+extern int                   gameport_instance_id;
+extern plat_joystick_state_t plat_joystick_state[MAX_PLAT_JOYSTICKS];
+extern joystick_state_t      joystick_state[GAMEPORT_MAX][MAX_JOYSTICKS];
+extern int                   joysticks_present;
 
-extern int joystick_type;
+extern int joystick_type[GAMEPORT_MAX];
 
 extern void joystick_init(void);
 extern void joystick_close(void);
-extern void joystick_process(void);
+extern void joystick_process(uint8_t gp);
 
 extern const char *joystick_get_name(int js);
 extern const char *joystick_get_internal_name(int js);
@@ -154,10 +168,33 @@ extern const char *joystick_get_axis_name(int js, int id);
 extern const char *joystick_get_button_name(int js, int id);
 extern const char *joystick_get_pov_name(int js, int id);
 
-extern void  gameport_update_joystick_type(void);
+extern void  gameport_update_joystick_type(uint8_t gp);
 extern void  gameport_remap(void *priv, uint16_t address);
 extern void *gameport_add(const device_t *gameport_type);
 
+extern const joystick_t joystick_2axis_2button;
+extern const joystick_t joystick_2button_gamepad;
+extern const joystick_t joystick_2button_flight_yoke;
+extern const joystick_t joystick_2axis_4button;
+extern const joystick_t joystick_4button_gamepad;
+extern const joystick_t joystick_4button_flight_yoke;
+extern const joystick_t joystick_3axis_2button;
+extern const joystick_t joystick_2button_yoke_throttle;
+extern const joystick_t joystick_3axis_4button;
+extern const joystick_t joystick_4button_yoke_throttle;
+extern const joystick_t joystick_win95_steering_wheel;
+extern const joystick_t joystick_4axis_4button;
+extern const joystick_t joystick_2axis_6button;
+extern const joystick_t joystick_2axis_8button;
+
+extern const joystick_t joystick_ch_flightstick_pro;
+extern const joystick_t joystick_ch_flightstick_pro_ch_pedals;
+
+extern const joystick_t joystick_sw_pad;
+
+extern const joystick_t joystick_tm_fcs;
+extern const joystick_t joystick_tm_fcs_rcs;
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/include/86box/hdc.h b/src/include/86box/hdc.h
index 01f927185..26fed9b0a 100644
--- a/src/include/86box/hdc.h
+++ b/src/include/86box/hdc.h
@@ -13,7 +13,7 @@
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Fred N. van Kempen, <decwiz@yahoo.com>
  *
- *          Copyright 2016-2020 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  *          Copyright 2017-2020 Fred N. van Kempen.
  */
 #ifndef EMU_HDC_H
@@ -22,17 +22,14 @@
 #define MFM_NUM   2  /* 2 drives per controller supported */
 #define ESDI_NUM  2  /* 2 drives per controller supported */
 #define XTA_NUM   2  /* 2 drives per controller supported */
-#define IDE_NUM   10 /* 8 drives per AT IDE + 2 for XT IDE */
-#define ATAPI_NUM 8  /* 8 drives per AT IDE */
-#define SCSI_NUM  16 /* theoretically the controller can have at \
-                      * least 7 devices, with each device being  \
-                      * able to support 8 units, but hey... */
 
 /* Controller types. */
 #define HDC_NONE     0
 #define HDC_INTERNAL 1
 
-extern int hdc_current;
+#define HDC_MAX      4
+
+extern int hdc_current[HDC_MAX];
 
 extern const device_t st506_xt_xebec_device;              /* st506_xt_xebec */
 extern const device_t st506_xt_wdxt_gen_device;           /* st506_xt_wdxt_gen */
@@ -51,15 +48,20 @@ extern const device_t st506_xt_toshiba_t1200_device;      /* st506_xt_toshiba_t1
 
 extern const device_t esdi_at_wd1007vse1_device; /* esdi_at */
 extern const device_t esdi_ps2_device;           /* esdi_mca */
+extern const device_t esdi_integrated_device;           /* esdi_mca */
 
 extern const device_t ide_isa_device;         /* isa_ide */
+extern const device_t ide_isa_sec_device;     /* isa_ide sec*/
 extern const device_t ide_isa_2ch_device;     /* isa_ide_2ch */
-extern const device_t ide_isa_2ch_opt_device; /* isa_ide_2ch_opt */
 extern const device_t ide_vlb_device;         /* vlb_ide */
+extern const device_t ide_vlb_sec_device;     /* vlb_ide sec */
 extern const device_t ide_vlb_2ch_device;     /* vlb_ide_2ch */
 extern const device_t ide_pci_device;         /* pci_ide */
+extern const device_t ide_pci_sec_device;     /* pci_ide sec */
 extern const device_t ide_pci_2ch_device;     /* pci_ide_2ch */
 
+extern const device_t ide_pci_ter_qua_2ch_device;     /* pci_ide_ter_qua_2ch */
+
 extern const device_t ide_ali1489_device;                       /* ALi M1489 */
 extern const device_t ide_ali5213_device;                       /* ALi M5213 */
 
@@ -76,31 +78,56 @@ extern const device_t ide_cmd640_pci_single_channel_sec_device; /* CMD PCI-640B
 extern const device_t ide_cmd646_device;                        /* CMD PCI-646 */
 extern const device_t ide_cmd646_legacy_only_device;            /* CMD PCI-646 (Legacy Mode Only) */
 extern const device_t ide_cmd646_single_channel_device;         /* CMD PCI-646 (Only primary channel) */
+extern const device_t ide_cmd646_ter_qua_device;                /* CMD PCI-646 (Tertiary and quaternary channels) */
+extern const device_t ide_cmd648_ter_qua_device;                /* CMD PCI-648 (Tertiary and quaternary channels) */
+extern const device_t ide_cmd648_ter_qua_onboard_device;        /* CMD PCI-648 (Tertiary and quaternary channels, on-board) */
+extern const device_t ide_cmd649_ter_qua_device;                /* CMD PCI-649 (Tertiary and quaternary channels) */
 
-extern const device_t ide_opti611_vlb_device;     /* OPTi 82c611/611A VLB */
-extern const device_t ide_opti611_vlb_sec_device; /* OPTi 82c611/611A VLB (Secondary channel) */
+extern const device_t ide_opti611_vlb_device;                   /* OPTi 82c611/611A VLB */
+extern const device_t ide_opti611_vlb_sec_device;               /* OPTi 82c611/611A VLB (Secondary channel) */
+
+extern const device_t ide_rz1000_pci_device;                    /* PC Technology RZ-1000 PCI */
+extern const device_t ide_rz1000_pci_single_channel_device;     /* PC Technology RZ-1000 PCI (Only primary channel) */
+
+extern const device_t ide_um8673f_device;                       /* UMC UM8673F */
+extern const device_t ide_um8886af_device;                      /* UMC UM8886AF */
+
+extern const device_t ide_w83769f_vlb_device;                   /* Winbond W83769F VLB */
+extern const device_t ide_w83769f_vlb_34_device;                /* Winbond W83769F VLB (Port 34h) */
+extern const device_t ide_w83769f_pci_device;                   /* Winbond W83769F PCI */
+extern const device_t ide_w83769f_pci_34_device;                /* Winbond W83769F PCI (Port 34h) */
+extern const device_t ide_w83769f_pci_single_channel_device;    /* Winbond W83769F PCI (Only primary channel) */
 
 extern const device_t ide_ter_device;
 extern const device_t ide_ter_pnp_device;
 extern const device_t ide_qua_device;
 extern const device_t ide_qua_pnp_device;
 
-extern const device_t xta_wdxt150_device; /* xta_wdxt150 */
-extern const device_t xta_hd20_device;    /* EuroPC internal */
+extern const device_t mcide_device;
 
-extern const device_t xtide_device;           /* xtide_xt */
-extern const device_t xtide_at_device;        /* xtide_at */
-extern const device_t xtide_acculogic_device; /* xtide_ps2 */
-extern const device_t xtide_at_ps2_device;    /* xtide_at_ps2 */
+extern const device_t xta_wdxt150_device;         /* xta_wdxt150 */
+extern const device_t xta_wdxt150_pc3086_device;  /* xta_wdxt150 (PC3086) */
+extern const device_t xta_hd20_device;            /* EuroPC internal */
+extern const device_t xta_st50x_device;           /* ST-50X */
+extern const device_t xta_st50x_pc5086_device;    /* ST-50X (PC5086) */
+
+extern const device_t xtide_device;            /* xtide_xt */
+extern const device_t xtide_at_device;         /* xtide_at */
+extern const device_t xtide_at_2ch_device;     /* xtide_at_2ch */
+extern const device_t xtide_acculogic_device;  /* xtide_ps2 */
+extern const device_t xtide_at_ps2_device;     /* xtide_at_ps2 */
+extern const device_t xtide_at_ps2_2ch_device; /* xtide_at_ps2_2ch */
 
 extern void hdc_init(void);
 extern void hdc_reset(void);
 
 extern const char     *hdc_get_internal_name(int hdc);
-extern int             hdc_get_from_internal_name(char *s);
+extern int             hdc_get_from_internal_name(const char *s);
 extern int             hdc_has_config(int hdc);
 extern const device_t *hdc_get_device(int hdc);
 extern int             hdc_get_flags(int hdc);
 extern int             hdc_available(int hdc);
 
+extern void xta_handler(void *priv, int set);
+
 #endif /*EMU_HDC_H*/
diff --git a/src/include/86box/hdc_ide.h b/src/include/86box/hdc_ide.h
index 1f7a78c9f..3fd589f9c 100644
--- a/src/include/86box/hdc_ide.h
+++ b/src/include/86box/hdc_ide.h
@@ -19,20 +19,23 @@
 #ifndef EMU_IDE_H
 #define EMU_IDE_H
 
+#define IDE_NUM             10    /* 8 drives per AT IDE + 2 for XT IDE */
+#define ATAPI_NUM           10    /* 8 drives per AT IDE + 2 for XT IDE */
+
 #define IDE_BUS_MAX         4
 #define IDE_CHAN_MAX        2
 
-#define HDC_PRIMARY_BASE    0x01F0
-#define HDC_PRIMARY_SIDE    0x03F6
+#define HDC_PRIMARY_BASE    0x01f0
+#define HDC_PRIMARY_SIDE    0x03f6
 #define HDC_PRIMARY_IRQ     14
 #define HDC_SECONDARY_BASE  0x0170
 #define HDC_SECONDARY_SIDE  0x0376
 #define HDC_SECONDARY_IRQ   15
-#define HDC_TERTIARY_BASE   0x01E8
-#define HDC_TERTIARY_SIDE   0x03EE
+#define HDC_TERTIARY_BASE   0x01e8
+#define HDC_TERTIARY_SIDE   0x03ee
 #define HDC_TERTIARY_IRQ    11
 #define HDC_QUATERNARY_BASE 0x0168
-#define HDC_QUATERNARY_SIDE 0x036E
+#define HDC_QUATERNARY_SIDE 0x036e
 #define HDC_QUATERNARY_IRQ  10
 
 enum {
@@ -82,7 +85,7 @@ typedef struct ide_s {
     uint8_t  selected;
     uint8_t  command;
     uint8_t  head;
-    uint8_t  pad;
+    uint8_t  params_specified;
     int      type;
     int      board;
     int      irqstat;
@@ -121,15 +124,17 @@ typedef struct ide_s {
     double         pending_delay;
 
 #ifdef SCSI_DEVICE_H
-    int     (*get_max)(int ide_has_dma, int type);
-    int     (*get_timings)(int ide_has_dma, int type);
-    void    (*identify)(struct ide_s *ide, int ide_has_dma);
-    void    (*stop)(scsi_common_t *sc);
-    void    (*packet_command)(scsi_common_t *sc, uint8_t *cdb);
+    int     (*get_max)(const struct ide_s *ide, const int ide_has_dma, const int type);
+    int     (*get_timings)(const struct ide_s *ide, const int ide_has_dma, const int type);
+    void    (*identify)(const struct ide_s *ide, const int ide_has_dma);
+    void    (*stop)(const scsi_common_t *sc);
+    void    (*packet_command)(scsi_common_t *sc, const uint8_t *cdb);
     void    (*device_reset)(scsi_common_t *sc);
     uint8_t (*phase_data_out)(scsi_common_t *sc);
     void    (*command_stop)(scsi_common_t *sc);
     void    (*bus_master_error)(scsi_common_t *sc);
+    void    (*read)(scsi_common_t *sc);
+    void    (*write)(scsi_common_t *sc);
 #else
     void *  get_max;
     void *  get_timings;
@@ -142,10 +147,8 @@ typedef struct ide_s {
 #endif
 } ide_t;
 
-#ifdef EMU_HDC_H
 extern ide_t *ide_drives[IDE_NUM];
 #endif
-#endif
 
 /* Type:
         0 = PIO,
@@ -175,9 +178,6 @@ enum {
     TIMINGS_PIO_FC = 2
 };
 
-extern int ide_ter_enabled;
-extern int ide_qua_enabled;
-
 #ifdef SCSI_DEVICE_H
 extern ide_t *ide_get_drive(int ch);
 extern void   ide_irq(ide_t *ide, int set, int log);
@@ -198,19 +198,21 @@ extern uint8_t  ide_read_alt_status(uint16_t addr, void *priv);
 extern uint16_t ide_readw(uint16_t addr, void *priv);
 
 extern void ide_set_bus_master(int board,
-                               int (*dma)(uint8_t *data, int transfer_length, int out, void *priv),
+                               int (*dma)(uint8_t *data, int transfer_length, int total_length, int out, void *priv),
                                void (*set_irq)(uint8_t status, void *priv), void *priv);
 
 extern void win_cdrom_eject(uint8_t id);
 extern void win_cdrom_reload(uint8_t id);
 
 extern void ide_set_base_addr(int board, int base, uint16_t port);
+extern void ide_set_irq(int board, int irq);
 
 extern void ide_handlers(uint8_t board, int set);
 
 extern void ide_board_set_force_ata3(int board, int force_ata3);
 #ifdef EMU_ISAPNP_H
 extern void ide_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *priv);
+extern void ide_pnp_config_changed_1addr(uint8_t ld, isapnp_device_config_t *config, void *priv);
 #endif
 
 extern double ide_atapi_get_period(uint8_t channel);
@@ -225,6 +227,8 @@ extern void ide_padstr8(uint8_t *buf, int buf_size, const char *src);
 extern uint8_t ide_read_ali_75(void);
 extern uint8_t ide_read_ali_76(void);
 
+extern void    ide_hard_reset(void);
+
 /* Legacy #define's. */
 #define ide_irq_raise(ide) ide_irq(ide, 1, 1)
 #define ide_irq_lower(ide) ide_irq(ide, 0, 1)
diff --git a/src/include/86box/hdc_ide_sff8038i.h b/src/include/86box/hdc_ide_sff8038i.h
index 2283497bb..901cdb325 100644
--- a/src/include/86box/hdc_ide_sff8038i.h
+++ b/src/include/86box/hdc_ide_sff8038i.h
@@ -43,6 +43,7 @@ typedef struct sff8038i_t
     uint8_t  irq_state;
     uint8_t  channel;
     uint8_t  irq_line;
+    uint8_t  mirq;
     uint16_t base;
     uint16_t pad;
     uint32_t ptr;
@@ -55,6 +56,11 @@ typedef struct sff8038i_t
     int      irq_level;
     int      irq_pin;
     int      pci_irq_line;
+
+    uint8_t  (*ven_write)(uint16_t port, uint8_t val, void *priv);
+    uint8_t  (*ven_read)(uint16_t port, uint8_t val, void *priv);
+
+    void     *priv;
 } sff8038i_t;
 
 extern const device_t sff8038i_device;
@@ -62,7 +68,7 @@ extern const device_t sff8038i_device;
 extern void sff_bus_master_handler(sff8038i_t *dev, int enabled, uint16_t base);
 
 extern void sff_bus_master_set_irq(uint8_t status, void *priv);
-extern int sff_bus_master_dma(uint8_t *data, int transfer_length, int out, void *priv);
+extern int  sff_bus_master_dma(uint8_t *data, int transfer_length, int total_length, int out, void *priv);
 
 extern void    sff_bus_master_write(uint16_t port, uint8_t val, void *priv);
 extern uint8_t sff_bus_master_read(uint16_t port, void *priv);
@@ -72,10 +78,12 @@ extern void sff_bus_master_reset(sff8038i_t *dev);
 extern void sff_set_slot(sff8038i_t *dev, int slot);
 
 extern void sff_set_irq_line(sff8038i_t *dev, int irq_line);
-
 extern void sff_set_irq_mode(sff8038i_t *dev, int irq_mode);
 extern void sff_set_irq_pin(sff8038i_t *dev, int irq_pin);
-
 extern void sff_set_irq_level(sff8038i_t *dev, int irq_level);
+extern void sff_set_mirq(sff8038i_t *dev, uint8_t mirq);
+
+extern void sff_set_ven_handlers(sff8038i_t *dev, uint8_t (*ven_write)(uint16_t port, uint8_t val, void *priv),
+                                 uint8_t (*ven_read)(uint16_t port, uint8_t val, void *priv), void *priv);
 
 #endif /*EMU_HDC_IDE_SFF8038I_H*/
diff --git a/src/include/86box/hdd.h b/src/include/86box/hdd.h
index 89a6cf1ff..597059e4f 100644
--- a/src/include/86box/hdd.h
+++ b/src/include/86box/hdd.h
@@ -67,14 +67,15 @@ enum {
 };
 #else
 enum {
-    HDD_BUS_DISABLED = 0,
-    HDD_BUS_MFM      = 1,
-    HDD_BUS_XTA      = 2,
-    HDD_BUS_ESDI     = 3,
-    HDD_BUS_IDE      = 4,
-    HDD_BUS_ATAPI    = 5,
-    HDD_BUS_SCSI     = 6,
-    HDD_BUS_USB      = 7
+    HDD_BUS_DISABLED =  0,
+    HDD_BUS_MFM      =  1,
+    HDD_BUS_XTA      =  2,
+    HDD_BUS_ESDI     =  3,
+    HDD_BUS_LPT      =  6,
+    HDD_BUS_IDE      =  7,
+    HDD_BUS_ATAPI    =  8,
+    HDD_BUS_SCSI     =  9,
+    HDD_BUS_USB      = 10
 };
 #endif
 
@@ -90,6 +91,7 @@ enum {
 typedef struct hdd_preset_t {
     const char *name;
     const char *internal_name;
+    const char *model;
     uint32_t    zones;
     uint32_t    avg_spt;
     uint32_t    heads;
@@ -137,54 +139,63 @@ typedef struct hdd_zone_t {
 
 /* Define the virtual Hard Disk. */
 typedef struct hard_disk_t {
-    uint8_t id;
+    uint8_t           id;
+
     union {
-        uint8_t channel; /* Needed for Settings to reduce the number of if's */
+        /* Needed for Settings to reduce the number of if's */
+        uint8_t           channel;
 
-        uint8_t mfm_channel; /* Should rename and/or unionize */
-        uint8_t esdi_channel;
-        uint8_t xta_channel;
-        uint8_t ide_channel;
-        uint8_t scsi_id;
+        uint8_t           mfm_channel;
+        uint8_t           esdi_channel;
+        uint8_t           xta_channel;
+        uint8_t           ide_channel;
+        uint8_t           scsi_id;
     };
-    uint8_t bus;
-    uint8_t bus_mode;  /* Bit 0 = PIO suported;
-                          Bit 1 = DMA supportd. */
-    uint8_t wp; /* Disk has been mounted READ-ONLY */
-    uint8_t pad;
-    uint8_t pad0;
 
-    void *priv;
+    uint8_t            bus_type;
+    uint8_t            bus_mode;     /* Bit 0 = PIO suported;
+                                        Bit 1 = DMA supportd. */
+    uint8_t            wp;           /* Disk has been mounted
+                                        READ-ONLY */
+    uint8_t            pad;
+    uint8_t            pad0;
 
-    char fn[1024];         /* Name of current image file */
-    char vhd_parent[1041]; /* Differential VHD parent file */
+    void              *priv;
 
-    uint32_t seek_pos;
-    uint32_t seek_len;
-    uint32_t base;
-    uint32_t spt;
-    uint32_t hpc; /* Physical geometry parameters */
-    uint32_t tracks;
+    char               fn[1024];     /* Name of current image file */
+    /* Differential VHD parent file */
+    char               vhd_parent[1280];
 
-    hdd_zone_t  zones[HDD_MAX_ZONES];
-    uint32_t    num_zones;
-    hdd_cache_t cache;
-    uint32_t    phy_cyl;
-    uint32_t    phy_heads;
-    uint32_t    rpm;
-    uint8_t     max_multiple_block;
+    uint32_t           seek_pos;
+    uint32_t           seek_len;
+    uint32_t           base;
+    uint32_t           spt;          /* Physical geometry parameters */
+    uint32_t           hpc;
+    uint32_t           tracks;
+    uint32_t           speed_preset;
 
-    uint32_t cur_cylinder;
-    uint32_t cur_track;
-    uint32_t cur_addr;
+    uint32_t           num_zones;
+    uint32_t           phy_cyl;
+    uint32_t           phy_heads;
+    uint32_t           rpm;
+    uint32_t           cur_cylinder;
+    uint32_t           cur_track;
+    uint32_t           cur_addr;
+    uint32_t           vhd_blocksize;
 
-    uint32_t speed_preset;
-    uint32_t vhd_blocksize;
+    uint8_t            max_multiple_block;
+    uint8_t            pad1[3];
 
-    double avg_rotation_lat_usec;
-    double full_stroke_usec;
-    double head_switch_usec;
-    double cyl_switch_usec;
+    const char        *model;
+
+    hdd_zone_t         zones[HDD_MAX_ZONES];
+
+    hdd_cache_t        cache;
+
+    double             avg_rotation_lat_usec;
+    double             full_stroke_usec;
+    double             head_switch_usec;
+    double             cyl_switch_usec;
 } hard_disk_t;
 
 extern hard_disk_t  hdd[HDD_NUM];
@@ -197,12 +208,12 @@ extern int   hdd_is_valid(int c);
 
 extern void     hdd_image_init(void);
 extern int      hdd_image_load(int id);
-extern void     hdd_image_seek(uint8_t id, uint32_t sector);
-extern void     hdd_image_read(uint8_t id, uint32_t sector, uint32_t count, uint8_t *buffer);
+extern int      hdd_image_seek(uint8_t id, uint32_t sector);
+extern int      hdd_image_read(uint8_t id, uint32_t sector, uint32_t count, uint8_t *buffer);
 extern int      hdd_image_read_ex(uint8_t id, uint32_t sector, uint32_t count, uint8_t *buffer);
-extern void     hdd_image_write(uint8_t id, uint32_t sector, uint32_t count, uint8_t *buffer);
+extern int      hdd_image_write(uint8_t id, uint32_t sector, uint32_t count, uint8_t *buffer);
 extern int      hdd_image_write_ex(uint8_t id, uint32_t sector, uint32_t count, uint8_t *buffer);
-extern void     hdd_image_zero(uint8_t id, uint32_t sector, uint32_t count);
+extern int      hdd_image_zero(uint8_t id, uint32_t sector, uint32_t count);
 extern int      hdd_image_zero_ex(uint8_t id, uint32_t sector, uint32_t count);
 extern uint32_t hdd_image_get_last_sector(uint8_t id);
 extern uint32_t hdd_image_get_pos(uint8_t id);
diff --git a/src/include/86box/i8080.h b/src/include/86box/i8080.h
deleted file mode 100644
index 9a25b5d1b..000000000
--- a/src/include/86box/i8080.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          8080 CPU emulation (header).
- *
- *
- *
- * Authors: Cacodemon345
- *
- *          Copyright 2022 Cacodemon345
- */
-
-#include <stdint.h>
-
-typedef struct i8080 {
-    union {
-        uint16_t af; /* Intended in case we also go for μPD9002 emulation, which also has a Z80 emulation mode. */
-        struct {
-            uint8_t a;
-            uint8_t flags;
-        };
-    };
-    union {
-        uint16_t bc;
-        struct {
-            uint8_t b;
-            uint8_t c;
-        };
-    };
-    union {
-        uint16_t de;
-        struct {
-            uint8_t d;
-            uint8_t e;
-        };
-    };
-    union {
-        uint16_t hl;
-        struct {
-            uint8_t h;
-            uint8_t l;
-        };
-    };
-    uint16_t  pc;
-    uint16_t  sp;
-    uint16_t  oldpc;
-    uint16_t  ei;
-    uint32_t  pmembase;
-    uint32_t  dmembase;   /* Base from where i8080 starts. */
-    uint8_t   emulated;  /* 0 = not emulated, use separate registers, 1 = emulated, use x86 registers. */
-    uint16_t *cpu_flags;
-    void    (*writemembyte)(uint32_t, uint8_t);
-    uint8_t (*readmembyte)(uint32_t);
-    void    (*startclock)(void);
-    void    (*endclock)(void);
-    void    (*checkinterrupts)(void);
-    uint8_t (*fetchinstruction)(void *);
-} i8080;
-
-#define C_FLAG_I8080  (1 << 0)
-#define P_FLAG_I8080  (1 << 2)
-#define AC_FLAG_I8080 (1 << 4)
-#define Z_FLAG_I8080  (1 << 6)
-#define S_FLAG_I8080  (1 << 7)
diff --git a/src/include/86box/ini.h b/src/include/86box/ini.h
index d52620f69..4dd8387bc 100644
--- a/src/include/86box/ini.h
+++ b/src/include/86box/ini.h
@@ -31,6 +31,7 @@ typedef void *ini_section_t;
 
 extern ini_t ini_new(void);
 extern ini_t ini_read(const char *fn);
+extern void  ini_strip_quotes(ini_t ini);
 extern void  ini_write(ini_t ini, const char *fn);
 extern void  ini_dump(ini_t ini);
 extern void  ini_close(ini_t ini);
@@ -42,6 +43,7 @@ extern uint32_t ini_section_get_uint(ini_section_t section, const char *name, ui
 extern float    ini_section_get_float(ini_section_t section, const char *name, float def);
 #endif
 extern double   ini_section_get_double(ini_section_t section, const char *name, double def);
+extern int      ini_section_get_hex12(ini_section_t section, const char *name, int def);
 extern int      ini_section_get_hex16(ini_section_t section, const char *name, int def);
 extern int      ini_section_get_hex20(ini_section_t section, const char *name, int def);
 extern int      ini_section_get_mac(ini_section_t section, const char *name, int def);
@@ -53,11 +55,13 @@ extern void     ini_section_set_uint(ini_section_t section, const char *name, ui
 extern void     ini_section_set_float(ini_section_t section, const char *name, float val);
 #endif
 extern void     ini_section_set_double(ini_section_t section, const char *name, double val);
+extern void     ini_section_set_hex12(ini_section_t section, const char *name, int val);
 extern void     ini_section_set_hex16(ini_section_t section, const char *name, int val);
 extern void     ini_section_set_hex20(ini_section_t section, const char *name, int val);
 extern void     ini_section_set_mac(ini_section_t section, const char *name, int val);
 extern void     ini_section_set_string(ini_section_t section, const char *name, const char *val);
 extern void     ini_section_set_wstring(ini_section_t section, const char *name, wchar_t *val);
+extern int      ini_has_entry(ini_section_t self, const char *name);
 
 #define ini_delete_var(ini, head, name)       ini_section_delete_var(ini_find_section(ini, head), name)
 
@@ -67,6 +71,7 @@ extern void     ini_section_set_wstring(ini_section_t section, const char *name,
 #define ini_get_float(ini, head, name, def)   ini_section_get_float(ini_find_section(ini, head), name, def)
 #endif
 #define ini_get_double(ini, head, name, def)  ini_section_get_double(ini_find_section(ini, head), name, def)
+#define ini_get_hex12(ini, head, name, def)   ini_section_get_hex12(ini_find_section(ini, head), name, def)
 #define ini_get_hex16(ini, head, name, def)   ini_section_get_hex16(ini_find_section(ini, head), name, def)
 #define ini_get_hex20(ini, head, name, def)   ini_section_get_hex20(ini_find_section(ini, head), name, def)
 #define ini_get_mac(ini, head, name, def)     ini_section_get_mac(ini_find_section(ini, head), name, def)
@@ -79,6 +84,7 @@ extern void     ini_section_set_wstring(ini_section_t section, const char *name,
 #define ini_set_float(ini, head, name, val)  ini_section_set_float(ini_find_or_create_section(ini, head), name, val)
 #endif
 #define ini_set_double(ini, head, name, val)  ini_section_set_double(ini_find_or_create_section(ini, head), name, val)
+#define ini_set_hex12(ini, head, name, val)   ini_section_set_hex12(ini_find_or_create_section(ini, head), name, val)
 #define ini_set_hex16(ini, head, name, val)   ini_section_set_hex16(ini_find_or_create_section(ini, head), name, val)
 #define ini_set_hex20(ini, head, name, val)   ini_section_set_hex20(ini_find_or_create_section(ini, head), name, val)
 #define ini_set_mac(ini, head, name, val)     ini_section_set_mac(ini_find_or_create_section(ini, head), name, val)
diff --git a/src/include/86box/isamem.h b/src/include/86box/isamem.h
index 9a1841c53..93f417e3e 100644
--- a/src/include/86box/isamem.h
+++ b/src/include/86box/isamem.h
@@ -42,7 +42,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 #ifndef EMU_ISAMEM_H
 #define EMU_ISAMEM_H
 
@@ -52,18 +51,14 @@
 extern "C" {
 #endif
 
-/* Global variables. */
-extern const device_t isamem_device;
-extern const device_t isamem_brat80_device;
-extern const device_t isamem_ev159_device;
-
 /* Functions. */
 extern void isamem_reset(void);
 
 extern const char     *isamem_get_name(int t);
 extern const char     *isamem_get_internal_name(int t);
-extern int             isamem_get_from_internal_name(const char *s);
+extern int             isamem_get_from_internal_name(const char *str);
 extern const device_t *isamem_get_device(int t);
+extern int             isamem_has_config(int board);
 
 #ifdef __cplusplus
 }
diff --git a/src/include/86box/isarom.h b/src/include/86box/isarom.h
new file mode 100644
index 000000000..91cfa15a9
--- /dev/null
+++ b/src/include/86box/isarom.h
@@ -0,0 +1,37 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of ISA ROM card Expansions.
+ *
+ * Authors: Jasmine Iwanek, <jriwanek@gmail.com>
+ *
+ *          Copyright 2025 Jasmine Iwanek.
+ */
+#ifndef EMU_ISAROM_H
+#define EMU_ISAROM_H
+
+#define ISAROM_MAX 4 /* max #cards in system */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Functions. */
+extern void isarom_reset(void);
+
+extern const char     *isarom_get_name(int t);
+extern const char     *isarom_get_internal_name(int t);
+extern int             isarom_get_from_internal_name(const char *str);
+extern const device_t *isarom_get_device(int t);
+extern int             isarom_has_config(int board);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*EMU_ISAROM_H*/
diff --git a/src/include/86box/isartc.h b/src/include/86box/isartc.h
index 92c58e350..815daa5d6 100644
--- a/src/include/86box/isartc.h
+++ b/src/include/86box/isartc.h
@@ -42,7 +42,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 #ifndef EMU_ISARTC_H
 #define EMU_ISARTC_H
 
@@ -50,14 +49,13 @@
 extern "C" {
 #endif
 
-/* Global variables. */
-
 /* Functions. */
 extern void isartc_reset(void);
 
 extern const char     *isartc_get_internal_name(int t);
-extern int             isartc_get_from_internal_name(char *s);
+extern int             isartc_get_from_internal_name(const char *str);
 extern const device_t *isartc_get_device(int t);
+extern int             isartc_has_config(int board);
 
 #ifdef __cplusplus
 }
diff --git a/src/include/86box/joystick_ch_flightstick_pro.h b/src/include/86box/joystick_ch_flightstick_pro.h
deleted file mode 100644
index b49800ecb..000000000
--- a/src/include/86box/joystick_ch_flightstick_pro.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Definitions for the Flight Stick Pro driver.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          Sarah Walker, <https://pcem-emulator.co.uk/>
- *
- *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2008-2018 Sarah Walker.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free  Software  Foundation; either  version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is  distributed in the hope that it will be useful, but
- * WITHOUT   ANY  WARRANTY;  without  even   the  implied  warranty  of
- * MERCHANTABILITY  or FITNESS  FOR A PARTICULAR  PURPOSE. See  the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the:
- *
- *   Free Software Foundation, Inc.
- *   59 Temple Place - Suite 330
- *   Boston, MA 02111-1307
- *   USA.
- */
-
-#ifndef EMU_JOYSTICK_CH_FLIGHTSTICK_PRO_H
-#define EMU_JOYSTICK_CH_FLIGHTSTICK_PRO_H
-
-extern const joystick_if_t joystick_ch_flightstick_pro;
-
-#endif /*EMU_JOYSTICK_CH_FLIGHTSTICK_PRO_H*/
diff --git a/src/include/86box/joystick_standard.h b/src/include/86box/joystick_standard.h
deleted file mode 100644
index c874677ea..000000000
--- a/src/include/86box/joystick_standard.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Definitions for the joystick driver.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          Sarah Walker, <https://pcem-emulator.co.uk/>
- *
- *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2008-2018 Sarah Walker.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free  Software  Foundation; either  version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is  distributed in the hope that it will be useful, but
- * WITHOUT   ANY  WARRANTY;  without  even   the  implied  warranty  of
- * MERCHANTABILITY  or FITNESS  FOR A PARTICULAR  PURPOSE. See  the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the:
- *
- *   Free Software Foundation, Inc.
- *   59 Temple Place - Suite 330
- *   Boston, MA 02111-1307
- *   USA.
- */
-
-#ifndef EMU_JOYSTICK_STANDARD_H
-#define EMU_JOYSTICK_STANDARD_H
-
-extern const joystick_if_t joystick_2axis_2button;
-extern const joystick_if_t joystick_2axis_4button;
-extern const joystick_if_t joystick_3axis_2button;
-extern const joystick_if_t joystick_3axis_4button;
-extern const joystick_if_t joystick_4axis_4button;
-extern const joystick_if_t joystick_2axis_6button;
-extern const joystick_if_t joystick_2axis_8button;
-
-#endif /*EMU_JOYSTICK_STANDARD_H*/
diff --git a/src/include/86box/joystick_sw_pad.h b/src/include/86box/joystick_sw_pad.h
deleted file mode 100644
index a75d802de..000000000
--- a/src/include/86box/joystick_sw_pad.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Definitions for the Sidewinder Pro driver.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          Sarah Walker, <https://pcem-emulator.co.uk/>
- *
- *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2008-2018 Sarah Walker.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free  Software  Foundation; either  version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is  distributed in the hope that it will be useful, but
- * WITHOUT   ANY  WARRANTY;  without  even   the  implied  warranty  of
- * MERCHANTABILITY  or FITNESS  FOR A PARTICULAR  PURPOSE. See  the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the:
- *
- *   Free Software Foundation, Inc.
- *   59 Temple Place - Suite 330
- *   Boston, MA 02111-1307
- *   USA.
- */
-
-#ifndef EMU_JOYSTICK_SW_PAD_H
-#define EMU_JOYSTICK_SW_PAD_H
-
-extern const joystick_if_t joystick_sw_pad;
-
-#endif /*EMU_JOYSTICK_SW_PAD_H*/
diff --git a/src/include/86box/joystick_tm_fcs.h b/src/include/86box/joystick_tm_fcs.h
deleted file mode 100644
index 65e734a40..000000000
--- a/src/include/86box/joystick_tm_fcs.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Definitions for the Flight Control System driver.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          Sarah Walker, <https://pcem-emulator.co.uk/>
- *
- *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2008-2018 Sarah Walker.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free  Software  Foundation; either  version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is  distributed in the hope that it will be useful, but
- * WITHOUT   ANY  WARRANTY;  without  even   the  implied  warranty  of
- * MERCHANTABILITY  or FITNESS  FOR A PARTICULAR  PURPOSE. See  the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the:
- *
- *   Free Software Foundation, Inc.
- *   59 Temple Place - Suite 330
- *   Boston, MA 02111-1307
- *   USA.
- */
-
-#ifndef EMU_JOYSTICK_TM_FCS_H
-#define EMU_JOYSTICK_TM_FCS_H
-
-extern const joystick_if_t joystick_tm_fcs;
-
-#endif /*EMU_JOYSTICK_TM_FCS_H*/
diff --git a/src/include/86box/keyboard.h b/src/include/86box/keyboard.h
index 759fad714..231da4dd5 100644
--- a/src/include/86box/keyboard.h
+++ b/src/include/86box/keyboard.h
@@ -15,13 +15,28 @@
  *          Fred N. van Kempen, <decwiz@yahoo.com>
  *
  *          Copyright 2008-2019 Sarah Walker.
- *          Copyright 2016-2019 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  *          Copyright 2017-2019 Fred N. van Kempen.
  */
 
 #ifndef EMU_KEYBOARD_H
 #define EMU_KEYBOARD_H
 
+#define FLAG_AT        0x00  /* dev is AT         */
+#define FLAG_PS2_KBD   0x10  /* dev is AT or PS/2 */
+#define FLAG_AX        0x08  /* dev is AX         */
+#define FLAG_TYPE_MASK 0x07  /* mask for type     */
+
+enum {
+    KBD_83_KEY = 0,
+    KBD_84_KEY,
+    KBD_101_KEY,
+    KBD_102_KEY,
+    KBD_JIS,
+    KBD_KSC,
+    KBD_ABNT2
+};
+
 enum {
     DEV_KBD = 0,
     DEV_AUX = 1
@@ -38,6 +53,15 @@ enum {
     DEV_STATE_MAIN_WANT_EXECUTE_BAT = 7
 };
 
+enum {
+    KEYBOARD_TYPE_INTERNAL          = 0,
+    KEYBOARD_TYPE_PC_XT,
+    KEYBOARD_TYPE_AT,
+    KEYBOARD_TYPE_AX,
+    KEYBOARD_TYPE_PS2,
+    KEYBOARD_TYPE_PS55
+};
+
 /* Used by the AT / PS/2 keyboard controller, common device, keyboard, and mouse. */
 typedef struct kbc_at_port_t {
     uint8_t wantcmd;
@@ -54,16 +78,16 @@ typedef struct kbc_at_port_t {
 typedef struct atkbc_dev_t {
     const char *name; /* name of this device */
 
-    uint8_t type;
-    uint8_t command;
-    uint8_t last_scan_code;
-    uint8_t state;
-    uint8_t resolution;
-    uint8_t rate;
-    uint8_t cmd_queue_start;
-    uint8_t cmd_queue_end;
-    uint8_t queue_start;
-    uint8_t queue_end;
+    uint8_t     type;
+    uint8_t     command;
+    uint8_t     last_scan_code;
+    uint8_t     state;
+    uint8_t     resolution;
+    uint8_t     rate;
+    uint8_t     cmd_queue_start;
+    uint8_t     cmd_queue_end;
+    uint8_t     queue_start;
+    uint8_t     queue_end;
 
     uint16_t flags;
 
@@ -94,109 +118,55 @@ typedef struct scancode {
     const uint8_t brk[4];
 } scancode;
 
-#define STATE_SHIFT_MASK 0x22
-#define STATE_RSHIFT     0x20
-#define STATE_LSHIFT     0x02
+#define STATE_SHIFT_MASK         0x22
+#define STATE_RSHIFT             0x20
+#define STATE_LSHIFT             0x02
 
-#define FAKE_LSHIFT_ON   0x100
-#define FAKE_LSHIFT_OFF  0x101
-#define LSHIFT_ON        0x102
-#define LSHIFT_OFF       0x103
-#define RSHIFT_ON        0x104
-#define RSHIFT_OFF       0x105
+#define FAKE_LSHIFT_ON          0x100
+#define FAKE_LSHIFT_OFF         0x101
+#define LSHIFT_ON               0x102
+#define LSHIFT_OFF              0x103
+#define RSHIFT_ON               0x104
+#define RSHIFT_OFF              0x105
 
-/* KBC #define's */
-/* IBM-style controllers */
-#define KBC_IBM_PC_XT          0x0000 /* IBM PC/XT */
-#define KBC_IBM_PCJR           0x0001 /* IBM PCjr */
-#define KBC_IBM_TYPE_1         0x0002 /* IBM AT / PS/2 Type 1 */
-#define KBC_IBM_TYPE_2         0x0003 /* IBM PS/2 Type 2 */
-#define KBC_AMI_ACCESS_METHODS 0x0004 /* Access Methods AMI */
-#define KBC_JU_JET             0x0005 /* Ju-Jet */
-/* OEM proprietary */
-#define KBC_TANDY       0x0011 /* Tandy 1000/1000HX */
-#define KBC_TANDY_SL2   0x0012 /* Tandy 1000SL2 */
-#define KBC_AMSTRAD     0x0013 /* Amstrad */
-#define KBC_OLIVETTI_XT 0x0014 /* Olivetti XT */
-#define KBC_OLIVETTI    0x0015 /* Olivetti AT */
-#define KBC_TOSHIBA     0x0016 /* Toshiba AT */
-#define KBC_COMPAQ      0x0017 /* Compaq */
-#define KBC_NCR         0x0018 /* NCR */
-#define KBC_QUADTEL     0x0019 /* Quadtel */
-#define KBC_SIEMENS     0x001A /* Siemens */
-/* Phoenix MultiKey/42 */
-#define PHOENIX_MK42_105  0x0521 /* Phoenix MultiKey/42 1.05 */
-#define PHOENIX_MK42_129  0x2921 /* Phoenix MultiKey/42 1.29 */
-#define PHOENIX_MK42_138  0x3821 /* Phoenix MultiKey/42 1.38 */
-#define PHOENIX_MK42_140  0x3821 /* Phoenix MultiKey/42 1.40 */
-#define PHOENIX_MKC42_214 0x1422 /* Phoenix MultiKey/C42 2.14 */
-#define PHOENIX_MK42I_416 0x1624 /* Phoenix MultiKey/42i 4.16 */
-#define PHOENIX_MK42I_419 0x1924 /* Phoenix MultiKey/42i 4.19 */
-/* AMI 0x3x */
-#define KBC_ACER_V30             0x0030 /* Acer (0xA1 returns nothing, 0xAF returns 0x00) */
-#define KBC_AMI_MEGAKEY_SUPER_IO 0x0035 /* AMI '5' MegaKey 1994 NSC (and SM(S)C?) */
-#define KBC_AMI_8                0x0038 /* AMI '8' */
-/* AMI 0x4x */
-#define KBC_AMI_B    0x0042 /* AMI 'B' */
-#define KBC_AMI_D    0x0044 /* AMI 'D' */
-#define KBC_AMI_E    0x0045 /* AMI 'E' */
-#define KBC_AMIKEY   0x0046 /* AMI 'F'/AMIKEY */
-#define KBC_AMIKEY_2 0x0048 /* AMI 'H'/AMIEY-2 */
-#define KBC_MR       0x004D /* MR 'M' - Temporary classification until we get a dump */
-/* AMI 0x5x */
-#define KBC_AMI_MEGAKEY_1993 0x0050 /* AMI 'P' MegaKey 1993 */
-#define KBC_AMI_MEGAKEY_1994 0x0052 /* AMI 'R' MegaKey 1994 - 0xA0 returns 1993 copyright */
-#define KBC_AMI_TRIGEM       0x005A /* TriGem AMI 'Z' (1990 AMI copyright) */
-/* AMI 0x6x */
-#define KBC_TANDON 0x0061 /* Tandon 'a' - Temporary classification until we get a dump */
-/* Holtek */
-#define KBC_HT_REGIONAL_6542   0x1046 /* Holtek 'F' (Regional 6542) */
-#define KBC_HT_HT6542B_BESTKEY 0x1048 /* Holtek 'H' (Holtek HT6542B, BestKey) */
-/* AMI 0x0x clone without command 0xA0 */
-#define KBC_UNK_00 0x2000 /* Unknown 0x00 */
-#define KBC_UNK_01 0x2001 /* Unknown 0x01 */
-/* AMI 0x3x clone without command 0xA0 */
-#define KBC_UNK_7         0x2037 /* Unknown '7' - Temporary classification until we get a dump */
-#define KBC_UNK_9         0x2037 /* Unknown '9' - Temporary classification until we get a dump */
-#define KBC_JETKEY_NO_VER 0x2038 /* No-version JetKey '8' */
-/* AMI 0x4x clone without command 0xA0 */
-#define KBC_UNK_A           0x2041 /* Unknown 'A' - Temporary classification until we get a dump */
-#define KBC_JETKEY_5_W83C42 0x2046 /* JetKey 5.0 'F' and Winbond W83C42 */
-#define KBC_UNK_G           0x2047 /* Unknown 'G' - Temporary classification until we get a dump */
-#define KBC_MB_300E_SIS     0x2048 /* MB-300E Non-VIA 'H' and SiS 5582/559x */
-#define KBC_UNK_L           0x204C /* Unknown 'L' - Temporary classification until we get a dump */
-/* AMI 0x0x clone with command 0xA0 (Get Copyright String) only returning 0x00 */
-#define KBC_VPC_2007 0x3000 /* Microsoft Virtual PC 2007 - everything returns 0x00 */
-/* AMI 0x4x clone with command 0xA0 (Get Copyright String) only returning 0x00 */
-#define KBC_ALI_M148X   0x3045 /* ALi M148x 'E'/'U' (0xA1 actually returns 'F' but BIOS shows 'E' or 'U') */
-#define KBC_LANCE_UTRON 0x3046 /* Lance LT38C41 'F', Utron */
-/* AMI 0x5x clone with command 0xA0 (Get Copyright String) only returning 0x00 */
-#define KBC_SARC_6042 0x3055 /* SARC 6042 'U' */
-/* Award and clones */
-#define KBC_AWARD 0x4200         /* Award (0xA1 returns 0x00) - Temporary classification until we get \
-                                    the real 0xAF return */
-#define KBC_VIA_VT82C4XN  0x4246 /* VIA VT82C41N, VT82C4N (0xA1 returns 'F') */
-#define KBC_VIA_VT82C586A 0x4346 /* VIA VT82C586A (0xA1 returns 'F') */
-#define KBC_VIA_VT82C586B 0x4446 /* VIA VT82C586B (0xA1 returns 'F') */
-#define KBC_VIA_VT82C686B 0x4546 /* VIA VT82C686B (0xA1 returns 'F') */
-/* UMC */
-#define KBC_UMC_UM8886 0x5048 /* UMC UM8886 'H' */
-/* IBM-style controllers with inverted P1 video type bit polarity */
-#define KBC_IBM_TYPE_1_XI8088 0x8000 /* Xi8088: IBM Type 1 */
-/* AMI (this is the 0xA1 revision byte) with inverted P1 video type bit polarity */
-#define KBC_ACER_V30_INV 0x8030 /* Acer (0xA1 returns nothing, 0xAF returns 0x00) */
-/* Holtek with inverted P1 video type bit polarity */
-#define KBC_HT_HT6542B_XI8088 0x9048 /* Xi8088: Holtek 'H' (Holtek HT6542B, BestKey) */
-/* Award and clones with inverted P1 video type bit polarity */
-#define KBC_VIA_VT82C4XN_XI8088 0xC246 /* Xi8088: VIA VT82C41N, VT82C4N (0xA1 returns 'F') */
+#define KBC_VEN_GENERIC          0x00
+#define KBC_VEN_ACER             0x01
+#define KBC_VEN_ALI              0x02
+#define KBC_VEN_AMI              0x03
+#define KBC_VEN_AMI_TRIGEM       0x04
+#define KBC_VEN_AWARD            0x05
+#define KBC_VEN_CHIPS            0x06
+#define KBC_VEN_COMPAQ           0x07
+#define KBC_VEN_HOLTEK           0x08
+#define KBC_VEN_IBM              0x09
+#define KBC_VEN_NCR              0x0a
+#define KBC_VEN_OLIVETTI         0x0b
+#define KBC_VEN_QUADTEL          0x0c
+#define KBC_VEN_PHOENIX          0x0d
+#define KBC_VEN_SIEMENS          0x0e
+#define KBC_VEN_TOSHIBA          0x0f
+#define KBC_VEN_VIA              0x10
+#define KBC_VEN_UMC              0x11
+#define KBC_VEN_SIS              0x12
+#define KBC_VEN_MASK             0x1f
+
+#define KBC_FLAG_IS_ASIC   0x80000000
+#define KBC_FLAG_IS_CLONE  0x40000000
+#define KBC_FLAG_IS_GREEN  0x20000000
+#define KBC_FLAG_IS_TYPE2  0x10000000
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+extern int     keyboard_type;
+
 extern uint8_t keyboard_mode;
 extern int     keyboard_scan;
 
+extern uint16_t scancode_map[768];
+extern uint16_t scancode_config_map[768];
+
 extern void (*keyboard_send)(uint16_t val);
 extern void kbd_adddata_process(uint16_t val, void (*adddata)(uint16_t val));
 
@@ -214,46 +184,28 @@ extern int     mouse_scan;
 extern kbc_at_port_t     *kbc_at_ports[2];
 
 #ifdef EMU_DEVICE_H
-extern const device_t keyboard_pc_device;
-extern const device_t keyboard_pc82_device;
-extern const device_t keyboard_pravetz_device;
-extern const device_t keyboard_xt_device;
-extern const device_t keyboard_xt86_device;
-extern const device_t keyboard_xt_compaq_device;
-extern const device_t keyboard_xt_t1x00_device;
-extern const device_t keyboard_tandy_device;
-#    if defined(DEV_BRANCH) && defined(USE_LASERXT)
-extern const device_t keyboard_xt_lxt3_device;
-#    endif /*defined(DEV_BRANCH) && defined(USE_LASERXT) */
-extern const device_t keyboard_xt_olivetti_device;
-extern const device_t keyboard_xt_zenith_device;
-extern const device_t keyboard_xt_hyundai_device;
-extern const device_t keyboard_xtclone_device;
-extern const device_t keyboard_at_device;
-extern const device_t keyboard_at_siemens_device;
-extern const device_t keyboard_at_ami_device;
-extern const device_t keyboard_at_tg_ami_device;
-extern const device_t keyboard_at_toshiba_device;
-extern const device_t keyboard_at_olivetti_device;
-extern const device_t keyboard_at_ncr_device;
-extern const device_t keyboard_at_compaq_device;
-extern const device_t keyboard_ps2_device;
-extern const device_t keyboard_ps2_ps1_device;
-extern const device_t keyboard_ps2_ps1_pci_device;
-extern const device_t keyboard_ps2_xi8088_device;
-extern const device_t keyboard_ps2_ami_device;
-extern const device_t keyboard_ps2_tg_ami_device;
-extern const device_t keyboard_ps2_tg_ami_green_device;
-extern const device_t keyboard_ps2_olivetti_device;
-extern const device_t keyboard_ps2_mca_2_device;
-extern const device_t keyboard_ps2_quadtel_device;
-extern const device_t keyboard_ps2_pci_device;
-extern const device_t keyboard_ps2_ami_pci_device;
-extern const device_t keyboard_ps2_intel_ami_pci_device;
-extern const device_t keyboard_ps2_acer_pci_device;
-extern const device_t keyboard_ps2_ali_pci_device;
-extern const device_t keyboard_ps2_tg_ami_pci_device;
+extern const device_t kbc_pc_device;
+extern const device_t kbc_pc82_device;
+extern const device_t kbc_pravetz_device;
+extern const device_t kbc_xt_device;
+extern const device_t kbc_xt86_device;
+extern const device_t kbc_xt_compaq_device;
+extern const device_t kbc_xt_t1x00_device;
+extern const device_t kbc_tandy_device;
+extern const device_t kbc_xt_lxt3_device;
+extern const device_t kbc_xt_olivetti_device;
+extern const device_t kbc_xt_zenith_device;
+extern const device_t kbc_xt_hyundai_device;
+extern const device_t kbc_xt_fe2010_device;
+extern const device_t kbc_xtclone_device;
 
+extern const device_t kbc_at_device;
+
+extern const device_t keyboard_pc_xt_device;
+extern const device_t keyboard_at_device;
+extern const device_t keyboard_ax_device;
+extern const device_t keyboard_ps2_device;
+extern const device_t keyboard_ps55_device;
 extern const device_t keyboard_at_generic_device;
 #endif /*EMU_DEVICE_H*/
 
@@ -264,22 +216,49 @@ extern void     keyboard_poll_host(void);
 extern void     keyboard_process(void);
 extern uint16_t keyboard_convert(int ch);
 extern void     keyboard_input(int down, uint16_t scan);
-extern void     keyboard_update_states(uint8_t cl, uint8_t nl, uint8_t sl);
+extern void     keyboard_all_up(void);
+extern void     keyboard_update_states(uint8_t cl, uint8_t nl, uint8_t sl, uint8_t kl);
 extern uint8_t  keyboard_get_shift(void);
-extern void     keyboard_get_states(uint8_t *cl, uint8_t *nl, uint8_t *sl);
+extern void     keyboard_set_in_reset(uint8_t in_reset);
+extern uint8_t  keyboard_get_in_reset(void);
+extern void     keyboard_get_states(uint8_t *cl, uint8_t *nl, uint8_t *sl, uint8_t *kl);
 extern void     keyboard_set_states(uint8_t cl, uint8_t nl, uint8_t sl);
 extern int      keyboard_recv(uint16_t key);
+extern int      keyboard_recv_ui(uint16_t key);
 extern int      keyboard_isfsenter(void);
 extern int      keyboard_isfsenter_up(void);
 extern int      keyboard_isfsexit(void);
 extern int      keyboard_isfsexit_up(void);
-extern int      keyboard_ismsexit(void);
 extern void     keyboard_set_is_amstrad(int ams);
+extern void     kbc_at_set_ps2(void *priv, uint8_t ps2);
+extern uint8_t  kbc_at_read_p(void *priv, uint8_t port, uint8_t mask);
+extern void     kbc_at_write_p(void *priv, uint8_t port, uint8_t mask, uint8_t val);
 
+extern void         kbc_at_set_fast_reset(uint8_t new_fast_reset);
+extern void         kbc_at_port_handler(int num, int set, uint16_t port, void *priv);
+extern void         kbc_at_handler(int set, uint16_t port, void *priv);
+extern void         kbc_at_set_irq(int num, uint16_t irq, void *priv);
+
+extern void         kbc_at_dev_queue_reset(atkbc_dev_t *dev, uint8_t reset_main);
 extern uint8_t      kbc_at_dev_queue_pos(atkbc_dev_t *dev, uint8_t main);
 extern void         kbc_at_dev_queue_add(atkbc_dev_t *dev, uint8_t val, uint8_t main);
 extern void         kbc_at_dev_reset(atkbc_dev_t *dev, int do_fa);
 extern atkbc_dev_t *kbc_at_dev_init(uint8_t inst);
+/* This is so we can disambiguate scan codes that would otherwise conflict and get
+   passed on incorrectly. */
+extern uint16_t     convert_scan_code(uint16_t scan_code);
+
+extern const char *    keyboard_get_name(int mouse);
+extern const char *    keyboard_get_internal_name(int mouse);
+extern int             keyboard_get_from_internal_name(char *s);
+extern int             keyboard_has_config(int mouse);
+#ifdef EMU_DEVICE_H
+extern const device_t *keyboard_get_device(int mouse);
+#endif
+extern int             keyboard_get_ndev(void);
+extern void            keyboard_add_device(void);
+
+extern const scancode  scancode_set1[512];
 
 #ifdef __cplusplus
 }
diff --git a/src/include/86box/language.h b/src/include/86box/language.h
deleted file mode 100644
index af459c0ff..000000000
--- a/src/include/86box/language.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Definitions for the language management module.
- *
- *
- *
- * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
- *
- *          Copyright 2017-2018 Fred N. van Kempen.
- *          Copyright 2022      Jasmine Iwanek.
- */
-
-#ifndef LANG_UAGE_H
-#define LANG_UAGE_H
-
-/* String IDs. */
-#define IDS_STRINGS 2048     // "86Box"
-#define IDS_2049    2049     // "Error"
-#define IDS_2050    2050     // "Fatal error"
-#define IDS_2051    2051     // " - PAUSED"
-#define IDS_2052    2052     // "Press Ctrl+Alt+PgDn..."
-#define IDS_2053    2053     // "Speed"
-#define IDS_2054    2054     // "ZIP %i (%03i): %ls"
-#define IDS_2055    2055     // "ZIP images (*.IM?)\0*.IM..."
-#define IDS_2056    2056     // "No usable ROM images found!"
-#define IDS_2057    2057     // "(empty)"
-#define IDS_2058    2058     // "ZIP images (*.IM?)\0*.IM..."
-#define IDS_2059    2059     // "(Turbo)"
-#define IDS_2060    2060     // "On"
-#define IDS_2061    2061     // "Off"
-#define IDS_2062    2062     // "All floppy images (*.DSK..."
-#define IDS_2063    2063     // "Machine ""%hs"" is not..."
-#define IDS_2064    2064     // "Video card ""%hs"" is not..."
-#define IDS_2065    2065     // "Machine"
-#define IDS_2066    2066     // "Display"
-#define IDS_2067    2067     // "Input devices"
-#define IDS_2068    2068     // "Sound"
-#define IDS_2069    2069     // "Network"
-#define IDS_2070    2070     // "Ports (COM & LPT)"
-#define IDS_2071    2071     // "Storage controllers"
-#define IDS_2072    2072     // "Hard disks"
-#define IDS_2073    2073     // "Floppy and CD-ROM drives"
-#define IDS_2074    2074     // "Other removable devices"
-#define IDS_2075    2075     // "Other peripherals"
-#define IDS_2076    2076     // "Surface-based images (*.8.."
-#define IDS_2077    2077     // "Click to capture mouse"
-#define IDS_2078    2078     // "Press F12-F8 to release mouse"
-#define IDS_2079    2079     // "Press F12-F8 or middle button.."
-#define IDS_2081    2081     // "Bus"
-#define IDS_BUS     IDS_2081 // "Bus"
-#define IDS_2082    2082     // "File"
-#define IDS_2083    2083     // "C"
-#define IDS_2084    2084     // "H"
-#define IDS_2085    2085     // "S"
-#define IDS_2086    2086     // "MB"
-#define IDS_MB      IDS_2086 // "MB"
-#define IDS_2087    2087     // "Speed"
-
-#define IDS_2088    2088     // "Check BPB"
-#define IDS_BPB     IDS_2088 // "Check BPB"
-
-#define IDS_2089    2089     // "KB"
-#define IDS_KB      IDS_2089 // "KB"
-
-#define IDS_2090    2090     // "Could not initialize the video..."
-
-#define IDS_2091    2091     // "Default"
-#define IDS_DEFAULT IDS_2091 // "Default"
-
-#define IDS_2092    2092     // "%i Wait state(s)"
-#define IDS_WS      IDS_2092 // "%i Wait state(s)"
-
-#define IDS_2093    2093     // "Type"
-#define IDS_TYPE    IDS_2093 // "Type"
-
-/* TODO */
-#define IDS_2094    2094     // "PCap failed to set up.."
-#define IDS_2095    2095     // "No PCap devices found"
-#define IDS_2096    2096     // "Invalid PCap device"
-#define IDS_2097    2097     // "Standard 2-button joystick(s)"
-#define IDS_2098    2098     // "Standard 4-button joystick"
-#define IDS_2099    2099     // "Standard 6-button joystick"
-#define IDS_2100    2100     // "Standard 8-button joystick"
-#define IDS_2101    2101     // "CH Flightstick Pro"
-#define IDS_2102    2102     // "Microsoft SideWinder Pad"
-#define IDS_2103    2103     // "Thrustmaster Flight Cont.."
-#define IDS_2104    2104     // "None"
-#define IDS_2105    2105     // "Unable to load keyboard..."
-#define IDS_2106    2106     // "Unable to register raw input."
-#define IDS_2107    2107     // "%u"
-#define IDS_2108    2108     // "%u MB (CHS: %i, %i, %i)"
-#define IDS_2109    2109     // "Floppy %i (%s): %ls"
-#define IDS_2110    2110     // "All floppy images (*.0??;*.."
-#define IDS_2112    2112     // "Unable to initialize SDL..."
-#define IDS_2113    2113     // "Are you sure you want to..."
-#define IDS_2114    2114     // "Are you sure you want to..."
-#define IDS_2115    2115     // "Unable to initialize Ghostscript..."
-#define IDS_2116    2116     // "MO %i (%03i): %ls"
-#define IDS_2117    2117     // "MO images (*.IM?)\0*.IM..."
-#define IDS_2118    2118     // "Welcome to 86Box!"
-#define IDS_2119    2119     // "Internal controller"
-#define IDS_2120    2120     // "Exit"
-#define IDS_2121    2121     // "No ROMs found"
-#define IDS_2122    2122     // "Do you want to save the settings?"
-#define IDS_2123    2123     // "This will hard reset the emulated..."
-#define IDS_2124    2124     // "Save"
-#define IDS_2125    2125     // "About 86Box"
-#define IDS_2126    2126     // "86Box v" EMU_VERSION
-#define IDS_2127    2127     // "An emulator of old computers..."
-#define IDS_2128    2128     // "OK"
-#define IDS_2129    2129     // "Hardware not available"
-#define IDS_2130    2130     // "Make sure " LIB_NAME_PCAP "..."
-#define IDS_2131    2131     // "Invalid configuration"
-#define IDS_2133    2133     // LIB_NAME_GS " is required for...
-#define IDS_2135    2135     // "Entering fullscreen mode"
-#define IDS_2136    2136     // "Don't show this message again"
-#define IDS_2137    2137     // "Don't exit"
-#define IDS_2138    2138     // "Reset"
-#define IDS_2139    2139     // "Don't reset"
-#define IDS_2140    2140     // "MO images (*.IM?)\0*.IM?..."
-#define IDS_2141    2141     // "CD-ROM images (*.ISO;*.CU.."
-#define IDS_2142    2142     // "%hs Device Configuration"
-#define IDS_2143    2143     // "Monitor in sleep mode"
-#define IDS_2144    2144     // "OpenGL Shaders (*.GLSL)..."
-#define IDS_2145    2145     // "OpenGL options"
-#define IDS_2146    2146     // "You are loading an unsupported..."
-#define IDS_2147    2147     // "CPU type filtering based on..."
-#define IDS_2148    2148     // "Continue"
-#define IDS_2149    2149     // "Cassette: %s"
-#define IDS_2150    2150     // "Cassette images (*.PCM;*.RAW;*..."
-#define IDS_2151    2151     // "Cartridge %i: %ls"
-#define IDS_2152    2152     // "Cartridge images (*.JRC)\0*.JRC\0..."
-#define IDS_2153    2153     // "Error initializing renderer"
-#define IDS_2154    2154     // "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-#define IDS_2155    2155     // "Resume execution"
-#define IDS_2156    2156     // "Pause execution"
-#define IDS_2157    2157     // "Press Ctrl+Alt+Del"
-#define IDS_2158    2158     // "Press Ctrl+Alt+Esc"
-#define IDS_2159    2159     // "Hard reset"
-#define IDS_2160    2160     // "ACPI shutdown"
-#define IDS_2161    2161     // "Settings"
-#define IDS_2162    2162     // "Early drive"
-#define IDS_2163    2163     // "no dynarec"
-#define IDS_2164    2164     // "old dynarec"
-#define IDS_2165    2165     // "new dynarec"
-#ifdef USE_DYNAREC
-#    ifdef USE_NEW_DYNAREC
-#        define IDS_DYNAREC IDS_2165
-#    else
-#        define IDS_DYNAREC IDS_2164
-#    endif
-#else
-#    define IDS_DYNAREC IDS_2163
-#endif
-#define IDS_2166    2166     // "Video card #2 ""%hs"" is not..."
-#define IDS_2167    2167     // "Network driver initialization failed"
-#define IDS_2168    2168     // "The network configuration will be switched to the null driver"
-
-#define IDS_4096    4096     // "Hard disk (%s)"
-#define IDS_4097    4097     // "%01i:%01i"
-#define IDS_4098    4098     // "%i"
-#define IDS_4099    4099     // "MFM/RLL or ESDI CD-ROM driv.."
-#define IDS_4100    4100     // "Custom..."
-#define IDS_4101    4101     // "Custom (large)..."
-#define IDS_4102    4102     // "Add New Hard Disk"
-#define IDS_4103    4103     // "Add Existing Hard Disk"
-#define IDS_4104    4104     // "HDI disk images cannot be..."
-#define IDS_4105    4105     // "Disk images cannot be larger..."
-#define IDS_4106    4106     // "Hard disk images (*.HDI;*.HD.."
-#define IDS_4107    4107     // "Unable to open the file for read"
-#define IDS_4108    4108     // "Unable to open the file for write"
-#define IDS_4109    4109     // "HDI or HDX image with a sect.."
-#define IDS_4110    4110     // "USB is not yet supported"
-#define IDS_4111    4111     // "Disk image file already exists"
-#define IDS_4112    4112     // "Please specify a valid file name."
-#define IDS_4113    4113     // "Remember to partition and fo.."
-#define IDS_4114    4114     // "Make sure the file exists and..."
-#define IDS_4115    4115     // "Make sure the file is being..."
-#define IDS_4116    4116     // "Disk image too large"
-#define IDS_4117    4117     // "Remember to partition and format..."
-#define IDS_4118    4118     // "The selected file will be..."
-#define IDS_4119    4119     // "Unsupported disk image"
-#define IDS_4120    4120     // "Overwrite"
-#define IDS_4121    4121     // "Don't overwrite"
-#define IDS_4122    4122     // "Raw image (.img)"
-#define IDS_4123    4123     // "HDI image (.hdi)"
-#define IDS_4124    4124     // "HDX image (.hdx)"
-#define IDS_4125    4125     // "Fixed-size VHD (.vhd)"
-#define IDS_4126    4126     // "Dynamic-size VHD (.vhd)"
-#define IDS_4127    4127     // "Differencing VHD (.vhd)"
-#define IDS_4128    4128     // "Large blocks (2 MB)"
-#define IDS_4129    4129     // "Small blocks (512 KB)"
-#define IDS_4130    4130     // "VHD files (*.VHD)\0*.VHD\0All..."
-#define IDS_4131    4131     // "Select the parent VHD"
-#define IDS_4132    4132     // "This could mean that the parent..."
-#define IDS_4133    4133     // "Parent and child disk timestamps..."
-#define IDS_4134    4134     // "Could not fix VHD timestamp."
-#define IDS_4135    4135     // "%01i:%02i"
-
-#define IDS_4352    4352     // "MFM/RLL"
-#define IDS_4353    4353     // "XT IDE"
-#define IDS_4354    4354     // "ESDI"
-#define IDS_4355    4355     // "IDE"
-#define IDS_4356    4356     // "ATAPI"
-#define IDS_4357    4357     // "SCSI"
-
-#define IDS_4608    4608     // "MFM/RLL (%01i:%01i)"
-#define IDS_4609    4609     // "XT IDE (%01i:%01i)"
-#define IDS_4610    4610     // "ESDI (%01i:%01i)"
-#define IDS_4611    4611     // "IDE (%01i:%01i)"
-#define IDS_4612    4612     // "ATAPI (%01i:%01i)"
-#define IDS_4613    4613     // "SCSI (%02i:%02i)"
-
-#define IDS_5120    5120     // "CD-ROM %i (%s): %s"
-
-#define IDS_5376    5376     // "Disabled"
-#define IDS_5377    5377     // <Reserved>
-#define IDS_5378    5378     // <Reserved>
-#define IDS_5379    5379     // <Reserved>
-#define IDS_5380    5380     // <Reserved>
-#define IDS_5381    5381     // "ATAPI"
-#define IDS_5382    5382     // "SCSI"
-
-#define IDS_5632    5632     // "Disabled"
-#define IDS_5633    5633     // <Reserved>
-#define IDS_5634    5634     // <Reserved>
-#define IDS_5635    5635     // <Reserved>
-#define IDS_5636    5636     // <Reserved>
-#define IDS_5637    5637     // "ATAPI (%01i:%01i)"
-#define IDS_5638    5638     // "SCSI (%02i:%02i)"
-
-#define IDS_5888    5888     // "160 kB"
-#define IDS_5889    5889     // "180 kB"
-#define IDS_5890    5890     // "320 kB"
-#define IDS_5891    5891     // "360 kB"
-#define IDS_5892    5892     // "640 kB"
-#define IDS_5893    5893     // "720 kB"
-#define IDS_5894    5894     // "1.2 MB"
-#define IDS_5895    5895     // "1.25 MB"
-#define IDS_5896    5896     // "1.44 MB"
-#define IDS_5897    5897     // "DMF (cluster 1024)"
-#define IDS_5898    5898     // "DMF (cluster 2048)"
-#define IDS_5899    5899     // "2.88 MB"
-#define IDS_5900    5900     // "ZIP 100"
-#define IDS_5901    5901     // "ZIP 250"
-#define IDS_5902    5902     // "3.5\" 128 MB (ISO 10090)"
-#define IDS_5903    5903     // "3.5\" 230 MB (ISO 13963)"
-#define IDS_5904    5904     // "3.5\" 540 MB (ISO 15498)"
-#define IDS_5905    5905     // "3.5\" 640 MB (ISO 15498)"
-#define IDS_5906    5906     // "3.5\" 1.3 GB (GigaMO)"
-#define IDS_5907    5907     // "3.5\" 2.3 GB (GigaMO 2)"
-#define IDS_5908    5908     // "5.25\" 600 MB"
-#define IDS_5909    5909     // "5.25\" 650 MB"
-#define IDS_5910    5910     // "5.25\" 1 GB"
-#define IDS_5911    5911     // "5.25\" 1.3 GB"
-
-#define IDS_6144    6144     // "Perfect RPM"
-#define IDS_6145    6145     // "1%% below perfect RPM"
-#define IDS_6146    6146     // "1.5%% below perfect RPM"
-#define IDS_6147    6147     // "2%% below perfect RPM"
-
-#define IDS_7168    7168     // "(System Default)"
-
-#define IDS_LANG_ENUS IDS_7168
-
-#define STR_NUM_2048  121
-// UNUSED: #define STR_NUM_3072  11
-#define STR_NUM_4096 40
-#define STR_NUM_4352 6
-#define STR_NUM_4608 6
-#define STR_NUM_5120 1
-#define STR_NUM_5376 7
-#define STR_NUM_5632 7
-#define STR_NUM_5888 24
-#define STR_NUM_6144 4
-#define STR_NUM_7168 1
-
-#endif /*LANG_UAGE_H*/
diff --git a/src/include/86box/log.h b/src/include/86box/log.h
index 9d3568069..e9fb70dc1 100644
--- a/src/include/86box/log.h
+++ b/src/include/86box/log.h
@@ -6,42 +6,48 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          Main include file for the application.
- *
- *
+ *          New logging system handler header.
  *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Fred N. van Kempen, <decwiz@yahoo.com>
+ *          Connor Hyde, <mario64crashed@gmail.com, nomorestarfrost@gmail.com>
  *
- *          Copyright 2021 Miran Grca.
- *          Copyright 2021 Fred N. van Kempen.
+ *          Copyright 2021-25 Miran Grca.
+ *          Copyright 2021-25 Fred N. van Kempen.
+ *          Copyright 2025 Connor Hyde.
  */
 
 #ifndef EMU_LOG_H
 #define EMU_LOG_H
 
-#ifndef RELEASE_BUILD
-
 #    ifdef __cplusplus
 extern "C" {
 #    endif
 
+#ifdef __NetBSD__
+/* Doesn't compile on NetBSD without this include */
+#include <stdarg.h>
+#endif
+
+#define LOG_SIZE_BUFFER                 8192            /* Log size buffer */
+#define LOG_SIZE_BUFFER_CYCLIC_LINES    32              /* Cyclic log size buffer (number of lines that should be cehcked) */
+#define LOG_MINIMUM_REPEAT_ORDER        4               /* Minimum repeat size */
+
 /* Function prototypes. */
 extern void log_set_suppr_seen(void *priv, int suppr_seen);
 extern void log_set_dev_name(void *priv, char *dev_name);
-#    ifdef HAVE_STDARG_H
+#ifndef RELEASE_BUILD
 extern void log_out(void *priv, const char *fmt, va_list);
+extern void log_out_cyclic(void* priv, const char *fmt, va_list);
+#endif /*RELEASE_BUILD*/
 extern void log_fatal(void *priv, const char *fmt, ...);
-#    endif
-extern void *log_open(char *dev_name);
+extern void log_warning(void *priv, const char *fmt, ...);
+extern void *log_open(const char *dev_name);
+extern void *log_open_cyclic(const char *dev_name);
 extern void  log_close(void *priv);
 
 #    ifdef __cplusplus
 }
 #    endif
 
-#else
-#    define log_fatal(priv, fmt, ...) fatal(fmt, ...)
-#endif /*RELEASE_BUILD*/
-
 #endif /*EMU_LOG_H*/
diff --git a/src/include/86box/lpt.h b/src/include/86box/lpt.h
index 4e95b64c3..61c95094f 100644
--- a/src/include/86box/lpt.h
+++ b/src/include/86box/lpt.h
@@ -17,87 +17,139 @@
 #define LPT6_IRQ  5
 #endif
 
-typedef struct lpt_device_t {
-    const char *name;
-    const char *internal_name;
+typedef struct lpt_device_s {
+    const char   *name;
+    const char   *internal_name;
 
-    void   *(*init)(void *lpt);
-    void    (*close)(void *priv);
-    void    (*write_data)(uint8_t val, void *priv);
-    void    (*write_ctrl)(uint8_t val, void *priv);
-    uint8_t (*read_data)(void *priv);
-    uint8_t (*read_status)(void *priv);
-    uint8_t (*read_ctrl)(void *priv);
+    void         *(*init)(void *lpt);
+    void          (*close)(void *priv);
+    void          (*write_data)(uint8_t val, void *priv);
+    void          (*write_ctrl)(uint8_t val, void *priv);
+    void          (*strobe)(uint8_t old, uint8_t val,void *priv);
+    uint8_t       (*read_status)(void *priv);
+    uint8_t       (*read_ctrl)(void *priv);
+    void          (*epp_write_data)(uint8_t is_addr, uint8_t val, void *priv);
+    void          (*epp_request_read)(uint8_t is_addr, void *priv);
+
+    void         *priv;
+    struct lpt_t *lpt;
+//#ifdef EMU_DEVICE_H
+//    struct device_t *cfgdevice;
+//#else
+    void            *cfgdevice;
+//#endif
 } lpt_device_t;
 
-extern void lpt_init(void);
-extern void lpt_port_init(int i, uint16_t port);
-extern void lpt_port_irq(int i, uint8_t irq);
-extern void lpt_port_remove(int i);
-extern void lpt1_remove_ams(void);
-
-#define lpt1_init(a)  lpt_port_init(0, a)
-#define lpt1_irq(a)   lpt_port_irq(0, a)
-#define lpt1_remove() lpt_port_remove(0)
-
-#define lpt2_init(a)  lpt_port_init(1, a)
-#define lpt2_irq(a)   lpt_port_irq(1, a)
-#define lpt2_remove() lpt_port_remove(1)
-
-#define lpt3_init(a)  lpt_port_init(2, a)
-#define lpt3_irq(a)   lpt_port_irq(2, a)
-#define lpt3_remove() lpt_port_remove(2)
-
-#define lpt4_init(a)  lpt_port_init(3, a)
-#define lpt4_irq(a)   lpt_port_irq(3, a)
-#define lpt4_remove() lpt_port_remove(3)
-
-#if 0
-#define lpt5_init(a)  lpt_port_init(4, a)
-#define lpt5_irq(a)   lpt_port_irq(4, a)
-#define lpt5_remove() lpt_port_remove(4)
-
-#define lpt6_init(a)  lpt_port_init(5, a)
-#define lpt6_irq(a)   lpt_port_irq(5, a)
-#define lpt6_remove() lpt_port_remove(5)
-#endif
-
-void lpt_devices_init(void);
-void lpt_devices_close(void);
-
-typedef struct lpt_port_t {
+#ifdef _TIMER_H_
+typedef struct lpt_t {
     uint8_t       enabled;
     uint8_t       irq;
+    uint8_t       irq_state;
+    uint8_t       dma;
     uint8_t       dat;
     uint8_t       ctrl;
+    uint8_t       ext;
+    uint8_t       epp;
+    uint8_t       ecp;
+    uint8_t       ecr;
+    uint8_t       ret_ecr;
+    uint8_t       in_dat;
+    uint8_t       fifo_stat;
+    uint8_t       dma_stat;
+    uint8_t       state;
+    uint8_t       autofeed;
+    uint8_t       strobe;
+    uint8_t       lv2;
+    uint8_t       cnfga_readout;
+    uint8_t       cnfgb_readout;
+    uint8_t       cfg_regs_enabled;
+    uint8_t       inst;
+    uint8_t       eir;
+    uint8_t       pad;
+    uint8_t       ext_regs[8];
     uint16_t      addr;
-    uint16_t      pad0;
-    int           device;
+    uint16_t      id;
+    uint16_t      pad0[2];
     int           enable_irq;
     lpt_device_t *dt;
-    void         *priv;
+#ifdef FIFO_H
+    fifo16_t *    fifo;
+#else
+    void *        fifo;
+#endif
+
+    pc_timer_t    fifo_out_timer;
+} lpt_t;
+#endif /* _TIMER_H_ */
+
+typedef struct lpt_port_s {
+    uint8_t       enabled;
+
+    int           device;
 } lpt_port_t;
 
 extern lpt_port_t lpt_ports[PARALLEL_MAX];
 
-extern void    lpt_write(uint16_t port, uint8_t val, void *priv);
-extern uint8_t lpt_read(uint16_t port, void *priv);
+typedef enum {
+    LPT_STATE_IDLE = 0,
+    LPT_STATE_READ_DMA,
+    LPT_STATE_WRITE_FIFO
+} lpt_state_t;
 
-extern uint8_t lpt_read_port(int port, uint16_t reg);
+extern void                lpt_write(uint16_t port, uint8_t val, void *priv);
 
-extern uint8_t lpt_read_status(int port);
-extern void    lpt_irq(void *priv, int raise);
+extern void                lpt_write_to_fifo(void *priv, uint8_t val);
 
-extern const char *lpt_device_get_name(int id);
-extern const char *lpt_device_get_internal_name(int id);
+extern uint8_t             lpt_read(uint16_t port, void *priv);
 
-extern int lpt_device_get_from_internal_name(char *s);
+extern uint8_t             lpt_read_port(lpt_t *dev, uint16_t reg);
 
-extern const lpt_device_t lpt_dac_device;
-extern const lpt_device_t lpt_dac_stereo_device;
+extern uint8_t             lpt_read_status(lpt_t *dev);
+extern uint8_t             lpt_read_ecp_mode(lpt_t *dev);
 
-extern const lpt_device_t dss_device;
+extern void                lpt_irq(void *priv, int raise);
 
-extern const lpt_device_t lpt_hasp_savquest_device;
+extern int                 lpt_device_get_from_internal_name(const char *str);
+
+extern const char         *lpt_device_get_name(int id);
+extern const char         *lpt_device_get_internal_name(int id);
+
+#ifdef EMU_DEVICE_H
+extern const device_t     *lpt_device_getdevice(const int id);
+#endif
+
+extern int                 lpt_device_has_config(const int id);
+
+extern const lpt_device_t  lpt_dac_device;
+extern const lpt_device_t  lpt_dac_stereo_device;
+
+extern const lpt_device_t  dss_device;
+
+extern const lpt_device_t  lpt_hasp_savquest_device;
+
+extern void                lpt_set_ext(lpt_t *dev, uint8_t ext);
+extern void                lpt_set_ecp(lpt_t *dev, uint8_t ecp);
+extern void                lpt_set_epp(lpt_t *dev, uint8_t epp);
+extern void                lpt_set_lv2(lpt_t *dev, uint8_t lv2);
+extern void                lpt_set_cfg_regs_enabled(lpt_t *dev, uint8_t cfg_regs_enabled);
+extern void                lpt_set_fifo_threshold(lpt_t *dev, int threshold);
+extern void                lpt_set_cnfga_readout(lpt_t *dev, const uint8_t cnfga_readout);
+extern void                lpt_set_cnfgb_readout(lpt_t *dev, const uint8_t cnfgb_readout);
+extern void                lpt_port_setup(lpt_t *dev, uint16_t port);
+extern void                lpt_port_irq(lpt_t *dev, uint8_t irq);
+extern void                lpt_port_dma(lpt_t *dev, uint8_t dma);
+extern void                lpt1_dma(const uint8_t dma);
+extern void                lpt_port_remove(lpt_t *dev);
+extern void                lpt1_remove_ams(lpt_t *dev);
+
+extern void                lpt_devices_init(void);
+extern void                lpt_devices_close(void);
+
+extern void                lpt_set_next_inst(int ni);
+extern void                lpt_set_3bc_used(int is_3bc_used);
+
+extern void                lpt_standalone_init(void);
+
+extern const device_t      lpt_port_device;
 
 #endif /*EMU_LPT_H*/
diff --git a/src/include/86box/m_pcjr.h b/src/include/86box/m_pcjr.h
new file mode 100644
index 000000000..7bbcde3ed
--- /dev/null
+++ b/src/include/86box/m_pcjr.h
@@ -0,0 +1,80 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Header files for the PCjr keyboard and video subsystems.
+ *
+ *
+ *
+ * Authors: Connor Hyde, <mario64crashed@gmail.com>
+ *
+ *          Copyright 2025 starfrost
+ */
+
+#pragma once
+
+#define PCJR_RGB          0
+#define PCJR_COMPOSITE    1
+#define PCJR_RGB_NO_BROWN 4
+#define PCJR_RGB_IBM_5153 5
+
+#define DOUBLE_NONE               0
+#define DOUBLE_SIMPLE             1
+#define DOUBLE_INTERPOLATE_SRGB   2
+#define DOUBLE_INTERPOLATE_LINEAR 3
+
+typedef struct pcjr_s 
+{
+    /* Video Controller stuff. */
+    mem_mapping_t mapping;
+    uint8_t       crtc[32];
+    int           crtcreg;
+    int           array_index;
+    uint8_t       array[32];
+    int           array_ff;
+    int           memctrl;
+    uint8_t       status;
+    int           addr_mode;
+    uint8_t      *vram;
+    uint8_t      *b8000;
+    int           linepos;
+    int           displine;
+    int           scanline;
+    int           vc;
+    int           dispon;
+    int           cursorvisible;            // Is the cursor visible on the current scanline?
+    int           cursoron;
+    int           blink;
+    int           vsynctime;
+    int           fullchange;
+    int           vadj;
+    uint16_t      memaddr;
+    uint16_t      memaddr_backup;
+    uint64_t      dispontime;
+    uint64_t      dispofftime;
+    pc_timer_t    timer;
+    int           firstline;
+    int           lastline;
+    int           composite;
+    int           apply_hd;
+    int           double_type;
+
+        /* Keyboard Controller stuff. */
+    int        latched;
+    int        data;
+    int        serial_data[44];
+    int        serial_pos;
+    uint8_t    pa;
+    uint8_t    pb;
+    pc_timer_t send_delay_timer;
+
+} pcjr_t; 
+
+void pcjr_recalc_timings(pcjr_t *pcjr);
+
+// Note: This is a temporary solution until the pcjr video is made its own gfx card
+void pcjr_vid_init(pcjr_t *pcjr);
\ No newline at end of file
diff --git a/src/include/86box/m_tandy.h b/src/include/86box/m_tandy.h
new file mode 100644
index 000000000..5ef509830
--- /dev/null
+++ b/src/include/86box/m_tandy.h
@@ -0,0 +1,96 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Header files for the Tandy keyboard and video subsystems.
+ *
+ *
+ *
+ * Authors: Connor Hyde, <mario64crashed@gmail.com>
+ *
+ *          Copyright 2025 starfrost
+ */
+
+typedef struct t1kvid_t {
+    mem_mapping_t mapping;
+    mem_mapping_t vram_mapping;
+
+    uint8_t crtc[32];
+    int     crtcreg;
+
+    int     array_index;
+    uint8_t array[256];
+    int     memctrl;
+    uint8_t mode;
+    uint8_t col;
+    uint8_t status;
+
+    uint8_t *vram;
+    uint8_t *b8000;
+    uint32_t b8000_mask;
+    uint32_t b8000_limit;
+    uint8_t  planar_ctrl;
+    uint8_t  lp_strobe;
+
+    int      linepos;
+    int      displine;
+    int      scanline;
+    int      vc;
+    int      dispon;
+    int      cursorvisible;
+    int      cursoron;
+    int      blink;
+    int      fullchange;
+    int      vsynctime;
+    int      vadj;
+    int      double_type;
+    uint16_t memaddr;
+    uint16_t memaddr_backup;
+
+    uint64_t   dispontime;
+    uint64_t   dispofftime;
+    pc_timer_t timer;
+    int        firstline;
+    int        lastline;
+
+    int composite;
+} t1kvid_t;
+
+typedef struct t1keep_t {
+    char *path;
+
+    int      state;
+    int      count;
+    int      addr;
+    int      clk;
+    uint16_t data;
+    uint16_t store[64];
+} t1keep_t;
+
+typedef struct tandy_t {
+    mem_mapping_t ram_mapping;
+    mem_mapping_t rom_mapping; /* SL2 */
+
+    uint8_t *rom; /* SL2 */
+    uint8_t  ram_bank;
+    uint8_t  rom_bank;   /* SL2 */
+    int      rom_offset; /* SL2 */
+
+    uint32_t base;
+    uint32_t mask;
+    int      is_hx;
+    int      is_sl2;
+
+    t1kvid_t *vid;
+} tandy_t;
+
+void tandy_vid_init(tandy_t* dev);
+uint8_t tandy_vid_in(uint16_t addr, void* priv);
+void tandy_vid_out(uint16_t addr, uint8_t val, void *priv);
+
+void tandy_vid_close(void* priv);
+void tandy_recalc_address_sl(tandy_t* dev); //this function is needed by both m_ and vid_tandy.c
diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index 228485bfd..94d8e407e 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -8,49 +8,47 @@
  *
  *          Handling of the emulated machines.
  *
- *
- *
  * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
  *          Miran Grca, <mgrca8@gmail.com>
  *          Fred N. van Kempen, <decwiz@yahoo.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
  *          Copyright 2008-2020 Sarah Walker.
- *          Copyright 2016-2020 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  *          Copyright 2017-2020 Fred N. van Kempen.
+ *          Copyright 2025      Jasmine Iwanek.
  */
 
 #ifndef EMU_MACHINE_H
 #define EMU_MACHINE_H
 
 /* Machine feature flags. */
-#define MACHINE_BUS_NONE 0x00000000 /* sys has no bus */
+#define MACHINE_BUS_NONE      0x00000000 /* sys has no bus */
 /* Feature flags for BUS'es. */
-#define MACHINE_BUS_ISA       0x00000001 /* sys has ISA bus */
-#define MACHINE_BUS_CASSETTE  0x00000002 /* sys has cassette port */
-#define MACHINE_BUS_CARTRIDGE 0x00000004 /* sys has two cartridge bays */
-#define MACHINE_BUS_PCJR      0x00000008 /* sys has PCjr sidecar bus */
-#define MACHINE_BUS_DM_KBC    0x00000010 /* system has keyboard controller that supports
-                                            both XT and AT keyboards */
+#define MACHINE_BUS_CASSETTE  0x00000001 /* sys has cassette port */
+#define MACHINE_BUS_SIDECAR   0x00000002 /* sys has PCjr sidecar bus */
+#define MACHINE_BUS_ISA       0x00000004 /* sys has ISA bus */
+#define MACHINE_BUS_XT_KBD    0x00000008 /* sys has an XT keyboard port */
+#define MACHINE_BUS_CBUS      0x00000010 /* sys has C-BUS bus */
 #define MACHINE_BUS_ISA16     0x00000020 /* sys has ISA16 bus - PC/AT architecture */
-#define MACHINE_BUS_CBUS      0x00000040 /* sys has C-BUS bus */
-#define MACHINE_BUS_PCMCIA    0x00000080 /* sys has PCMCIA bus */
-#define MACHINE_BUS_PS2_LATCH 0x00000100 /* system has PS/2 keyboard controller IRQ latch */
+#define MACHINE_BUS_AT_KBD    0x00000040 /* sys has an AT keyboard port */
+#define MACHINE_BUS_MCA       0x00000080 /* sys has MCA bus */
+#define MACHINE_BUS_MCA32     0x00000100 /* sys has MCA32 bus */
 #define MACHINE_BUS_PS2_PORTS 0x00000200 /* system has PS/2 keyboard and mouse ports */
-#define MACHINE_BUS_PS2       (MACHINE_BUS_PS2_LATCH | MACHINE_BUS_PS2_PORTS)
-#define MACHINE_BUS_HIL       0x00000400 /* system has HP HIL keyboard and mouse ports */
-#define MACHINE_BUS_EISA      0x00000800 /* sys has EISA bus */
-#define MACHINE_BUS_AT32      0x00001000 /* sys has Mylex AT/32 local bus */
-#define MACHINE_BUS_OLB       0x00002000 /* sys has OPTi local bus */
-#define MACHINE_BUS_VLB       0x00004000 /* sys has VL bus */
-#define MACHINE_BUS_MCA       0x00008000 /* sys has MCA bus */
+#define MACHINE_BUS_PS2       MACHINE_BUS_PS2_PORTS
+#define MACHINE_BUS_PCMCIA    0x00000400 /* sys has PCMCIA bus */
+#define MACHINE_BUS_HIL       0x00000800 /* system has HP HIL keyboard and mouse ports */
+#define MACHINE_BUS_EISA      0x00001000 /* sys has EISA bus */
+#define MACHINE_BUS_AT32      0x00002000 /* sys has Mylex AT/32 local bus */
+#define MACHINE_BUS_OLB       0x00004000 /* sys has OPTi local bus */
+#define MACHINE_BUS_VLB       0x00008000 /* sys has VL bus */
 #define MACHINE_BUS_PCI       0x00010000 /* sys has PCI bus */
 #define MACHINE_BUS_CARDBUS   0x00020000 /* sys has CardBus bus */
 #define MACHINE_BUS_USB       0x00040000 /* sys has USB bus */
 #define MACHINE_BUS_AGP       0x00080000 /* sys has AGP bus */
 #define MACHINE_BUS_AC97      0x00100000 /* sys has AC97 bus (ACR/AMR/CNR slot) */
 /* Aliases. */
-#define MACHINE_CASSETTE    (MACHINE_BUS_CASSETTE)  /* sys has cassette port */
-#define MACHINE_CARTRIDGE   (MACHINE_BUS_CARTRIDGE) /* sys has two cartridge bays */
+#define MACHINE_CASSETTE    (MACHINE_BUS_CASSETTE) /* sys has cassette port */
 /* Combined flags. */
 #define MACHINE_PC          (MACHINE_BUS_ISA)                     /* sys is PC/XT-compatible (ISA) */
 #define MACHINE_AT          (MACHINE_BUS_ISA | MACHINE_BUS_ISA16) /* sys is AT-compatible (ISA + ISA16) */
@@ -69,44 +67,47 @@
 #define MACHINE_AGP         (MACHINE_BUS_AGP | MACHINE_PCI)       /* sys is AT-compatible with AGP  */
 #define MACHINE_AGP98       (MACHINE_BUS_AGP | MACHINE_PCI98)     /* sys is NEC PC-98x1 series with AGP (did that even exist?) */
 
-#define MACHINE_PC5150      (MACHINE_PC | MACHINE_CASSETTE)                     /* sys is IBM PC 5150 */
-#define MACHINE_PCJR        (MACHINE_PC | MACHINE_CASSETTE | MACHINE_CARTRIDGE) /* sys is PCjr */
-#define MACHINE_PS2         (MACHINE_AT | MACHINE_BUS_PS2)                      /* sys is PS/2 */
-#define MACHINE_PS2_MCA     (MACHINE_MCA | MACHINE_BUS_PS2)                     /* sys is MCA PS/2 */
-#define MACHINE_PS2_VLB     (MACHINE_VLB | MACHINE_BUS_PS2)                     /* sys is VLB PS/2 */
-#define MACHINE_PS2_PCI     (MACHINE_PCI | MACHINE_BUS_PS2)                     /* sys is PCI PS/2 */
-#define MACHINE_PS2_PCIV    (MACHINE_PCIV | MACHINE_BUS_PS2)                    /* sys is VLB/PCI PS/2 */
-#define MACHINE_PS2_AGP     (MACHINE_AGP | MACHINE_BUS_PS2)                     /* sys is AGP PS/2 */
-#define MACHINE_PS2_A97     (MACHINE_PS2_AGP | MACHINE_BUS_AC97)                /* sys is AGP/AC97 PS/2 */
-#define MACHINE_PS2_NOISA   (MACHINE_PS2_AGP & ~MACHINE_AT)                     /* sys is AGP PS/2 without ISA */
-#define MACHINE_PS2_PCIONLY (MACHINE_PS2_NOISA & ~MACHINE_BUS_AGP)              /* sys is PCI PS/2 without ISA */
-#define MACHINE_PS2_NOI97   (MACHINE_PS2_A97 & ~MACHINE_AT)                     /* sys is AGP/AC97 PS/2 without ISA */
+#define MACHINE_PC5150      (MACHINE_CASSETTE | MACHINE_PC)          /* sys is IBM PC 5150 */
+#define MACHINE_PCJR        (MACHINE_CASSETTE | MACHINE_BUS_SIDECAR) /* sys is PCjr */
+#define MACHINE_PS2         (MACHINE_AT | MACHINE_BUS_PS2)           /* sys is PS/2 */
+#define MACHINE_PS2_MCA     (MACHINE_MCA | MACHINE_BUS_PS2)          /* sys is MCA PS/2 */
+#define MACHINE_PS2_VLB     (MACHINE_VLB | MACHINE_BUS_PS2)          /* sys is VLB PS/2 */
+#define MACHINE_PS2_PCI     (MACHINE_PCI | MACHINE_BUS_PS2)          /* sys is PCI PS/2 */
+#define MACHINE_PS2_PCIV    (MACHINE_PCIV | MACHINE_BUS_PS2)         /* sys is VLB/PCI PS/2 */
+#define MACHINE_PS2_AGP     (MACHINE_AGP | MACHINE_BUS_PS2)          /* sys is AGP PS/2 */
+#define MACHINE_PS2_A97     (MACHINE_PS2_AGP | MACHINE_BUS_AC97)     /* sys is AGP/AC97 PS/2 */
+#define MACHINE_PS2_NOISA   (MACHINE_PS2_AGP & ~MACHINE_AT)          /* sys is AGP PS/2 without ISA */
+#define MACHINE_PS2_PCIONLY (MACHINE_PS2_NOISA & ~MACHINE_BUS_AGP)   /* sys is PCI PS/2 without ISA */
+#define MACHINE_PS2_NOI97   (MACHINE_PS2_A97 & ~MACHINE_AT)          /* sys is AGP/AC97 PS/2 without ISA */
+
 /* Feature flags for miscellaneous internal devices. */
 #define MACHINE_FLAGS_NONE        0x00000000 /* sys has no int devices */
 #define MACHINE_SOFTFLOAT_ONLY    0x00000001 /* sys requires SoftFloat FPU */
 #define MACHINE_VIDEO             0x00000002 /* sys has int video */
 #define MACHINE_VIDEO_8514A       0x00000004 /* sys has int video */
-#define MACHINE_VIDEO_XGA         0x00000008 /* sys has int video */
-#define MACHINE_VIDEO_ONLY        0x00000010 /* sys has fixed video */
-#define MACHINE_MOUSE             0x00000020 /* sys has int mouse */
-#define MACHINE_FDC               0x00000040 /* sys has int FDC */
-#define MACHINE_LPT_PRI           0x00000080 /* sys has int pri LPT */
-#define MACHINE_LPT_SEC           0x00000100 /* sys has int sec LPT */
-#define MACHINE_LPT_TER           0x00000200 /* sys has int ter LPT */
-#define MACHINE_LPT_QUA           0x00000400 /* sys has int qua LPT */
-#define MACHINE_UART_PRI          0x00000800 /* sys has int pri UART */
-#define MACHINE_UART_SEC          0x00001000 /* sys has int sec UART */
-#define MACHINE_UART_TER          0x00002000 /* sys has int ter UART */
-#define MACHINE_UART_QUA          0x00004000 /* sys has int qua UART */
-#define MACHINE_GAMEPORT          0x00008000 /* sys has int game port */
-#define MACHINE_SOUND             0x00010000 /* sys has int sound */
-#define MACHINE_NIC               0x00020000 /* sys has int NIC */
-#define MACHINE_MODEM             0x00040000 /* sys has int modem */
+#define MACHINE_VIDEO_ONLY        0x00000008 /* sys has fixed video */
+#define MACHINE_KEYBOARD          0x00000010 /* sys has int keyboard */
+#define MACHINE_AX                0x00000020 /* sys adheres to Japanese AX standard */
+#define MACHINE_KEYBOARD_JIS      0x00000020 /* sys has int keyboard which is Japanese (AX or PS/55) */
+#define MACHINE_MOUSE             0x00000040 /* sys has int mouse */
+#define MACHINE_FDC               0x00000080 /* sys has int FDC */
+#define MACHINE_LPT_PRI           0x00000100 /* sys has int pri LPT */
+#define MACHINE_LPT_SEC           0x00000200 /* sys has int sec LPT */
+#define MACHINE_LPT_TER           0x00000400 /* sys has int ter LPT */
+#define MACHINE_PS2_KBC           0x00000800 /* sys has a PS/2 keyboard controller */
+                                             /* this is separate from having PS/2 ports */
+#define MACHINE_UART_PRI          0x00010800 /* sys has int pri UART */
+#define MACHINE_UART_SEC          0x00002000 /* sys has int sec UART */
+#define MACHINE_UART_TER          0x00004000 /* sys has int ter UART */
+#define MACHINE_UART_QUA          0x00008000 /* sys has int qua UART */
+#define MACHINE_GAMEPORT          0x00010000 /* sys has int game port */
+#define MACHINE_SOUND             0x00020000 /* sys has int sound */
+#define MACHINE_NIC               0x00040000 /* sys has int NIC */
 /* Feature flags for advanced devices. */
 #define MACHINE_APM               0x00080000 /* sys has APM */
 #define MACHINE_ACPI              0x00100000 /* sys has ACPI */
-#define MACHINE_HWM               0x00200000 /* sys has hw monitor */
-#define MACHINE_COREBOOT          0x00400000 /* sys has coreboot BIOS */
+#define MACHINE_PCI_INTERNAL      0x00200000 /* sys has only internal PCI */
+#define MACHINE_CARTRIDGE         0x00400000 /* sys has cartridge bays */
 /* Feature flags for internal storage controllers. */
 #define MACHINE_MFM               0x00800000 /* sys has int MFM/RLL */
 #define MACHINE_XTA               0x01000000 /* sys has int XTA */
@@ -142,6 +143,24 @@
 #define MACHINE_PIIX3             (MACHINE_PIIX | MACHINE_USB)
 #define MACHINE_PIIX4             (MACHINE_PIIX3 | MACHINE_ACPI)
 
+#define MACHINE_DMA_0             0x00000001
+#define MACHINE_DMA_1             0x00000002
+#define MACHINE_DMA_2             0x00000004
+#define MACHINE_DMA_3             0x00000008
+#define MACHINE_DMA_DISABLED      0x00000010
+#define MACHINE_DMA_5             0x00000020
+#define MACHINE_DMA_6             0x00000040
+#define MACHINE_DMA_7             0x00000080
+#define MACHINE_DMA_JUMPERS_MASK  (MACHINE_DMA_0 | MACHINE_DMA_1 | MACHINE_DMA_2 | MACHINE_DMA_3 | \
+                                   MACHINE_DMA_DISABLED | MACHINE_DMA_5 | MACHINE_DMA_6 | MACHINE_DMA_7)
+#define MACHINE_DMA_USE_MBDMA     0x00000100
+#define MACHINE_DMA_USE_CONFIG    0x00000200
+#define MACHINE_DMA_EXT_CONFIG    (MACHINE_DMA_USE_MBDMA | MACHINE_DMA_USE_CONFIG)
+
+#define DMA_DISABLED                       4
+#define DMA_NONE                          -1
+#define DMA_ANY                           -1
+
 #define IS_ARCH(m, a) ((machines[m].bus_flags & (a)) ? 1 : 0)
 #define IS_AT(m)      (((machines[m].bus_flags & (MACHINE_BUS_ISA16 | MACHINE_BUS_EISA | MACHINE_BUS_VLB | MACHINE_BUS_MCA | MACHINE_BUS_PCI | MACHINE_BUS_PCMCIA | MACHINE_BUS_AGP | MACHINE_BUS_AC97)) && !(machines[m].bus_flags & MACHINE_PC98)) ? 1 : 0)
 
@@ -163,30 +182,33 @@
 
 enum {
     MACHINE_TYPE_NONE       = 0,
-    MACHINE_TYPE_8088       = 1,
-    MACHINE_TYPE_8086       = 2,
-    MACHINE_TYPE_286        = 3,
-    MACHINE_TYPE_386SX      = 4,
-    MACHINE_TYPE_486SLC     = 5,
-    MACHINE_TYPE_386DX      = 6,
-    MACHINE_TYPE_386DX_486  = 7,
-    MACHINE_TYPE_486        = 8,
-    MACHINE_TYPE_486_S2     = 9,
-    MACHINE_TYPE_486_S3     = 10,
-    MACHINE_TYPE_486_MISC   = 11,
-    MACHINE_TYPE_SOCKET4    = 12,
-    MACHINE_TYPE_SOCKET5    = 13,
-    MACHINE_TYPE_SOCKET7_3V = 14,
-    MACHINE_TYPE_SOCKET7    = 15,
-    MACHINE_TYPE_SOCKETS7   = 16,
-    MACHINE_TYPE_SOCKET8    = 17,
-    MACHINE_TYPE_SLOT1      = 18,
-    MACHINE_TYPE_SLOT1_2    = 19,
-    MACHINE_TYPE_SLOT1_370  = 20,
-    MACHINE_TYPE_SLOT2      = 21,
-    MACHINE_TYPE_SOCKET370  = 22,
-    MACHINE_TYPE_MISC       = 23,
-    MACHINE_TYPE_MAX        = 24
+    MACHINE_TYPE_8088,
+    MACHINE_TYPE_8086,
+    MACHINE_TYPE_286,
+    MACHINE_TYPE_386SX,
+    MACHINE_TYPE_M6117,
+    MACHINE_TYPE_486SLC,
+    MACHINE_TYPE_386DX,
+    MACHINE_TYPE_386DX_486,
+    MACHINE_TYPE_486,
+    MACHINE_TYPE_486_S2,
+    MACHINE_TYPE_486_S3,
+    MACHINE_TYPE_486_S3_PCI,
+    MACHINE_TYPE_486_MISC,
+    MACHINE_TYPE_SOCKET4,
+    MACHINE_TYPE_SOCKET4_5,
+    MACHINE_TYPE_SOCKET5,
+    MACHINE_TYPE_SOCKET7_3V,
+    MACHINE_TYPE_SOCKET7,
+    MACHINE_TYPE_SOCKETS7,
+    MACHINE_TYPE_SOCKET8,
+    MACHINE_TYPE_SLOT1,
+    MACHINE_TYPE_SLOT1_2,
+    MACHINE_TYPE_SLOT1_370,
+    MACHINE_TYPE_SLOT2,
+    MACHINE_TYPE_SOCKET370,
+    MACHINE_TYPE_MISC,
+    MACHINE_TYPE_MAX
 };
 
 enum {
@@ -196,6 +218,7 @@ enum {
     MACHINE_CHIPSET_GC100A,
     MACHINE_CHIPSET_GC103,
     MACHINE_CHIPSET_HT18,
+    MACHINE_CHIPSET_ACC_2036,
     MACHINE_CHIPSET_ACC_2168,
     MACHINE_CHIPSET_ALI_M1217,
     MACHINE_CHIPSET_ALI_M6117,
@@ -207,7 +230,10 @@ enum {
     MACHINE_CHIPSET_ALI_ALADDIN_V,
     MACHINE_CHIPSET_ALI_ALADDIN_PRO_II,
     MACHINE_CHIPSET_SCAT,
+    MACHINE_CHIPSET_SCAT_SX,
     MACHINE_CHIPSET_NEAT,
+    MACHINE_CHIPSET_NEAT_SX,
+    MACHINE_CHIPSET_CT_AT,
     MACHINE_CHIPSET_CT_386,
     MACHINE_CHIPSET_CT_CS4031,
     MACHINE_CHIPSET_CONTAQ_82C596,
@@ -232,8 +258,14 @@ enum {
     MACHINE_CHIPSET_INTEL_440GX,
     MACHINE_CHIPSET_OPTI_283,
     MACHINE_CHIPSET_OPTI_291,
+    MACHINE_CHIPSET_OPTI_381,
+    MACHINE_CHIPSET_OPTI_391,
+    MACHINE_CHIPSET_OPTI_481,
     MACHINE_CHIPSET_OPTI_493,
-    MACHINE_CHIPSET_OPTI_495,
+    MACHINE_CHIPSET_OPTI_495SLC,
+    MACHINE_CHIPSET_OPTI_495SX,
+    MACHINE_CHIPSET_OPTI_496,
+    MACHINE_CHIPSET_OPTI_498,
     MACHINE_CHIPSET_OPTI_499,
     MACHINE_CHIPSET_OPTI_895_802G,
     MACHINE_CHIPSET_OPTI_547_597,
@@ -245,8 +277,12 @@ enum {
     MACHINE_CHIPSET_SIS_471,
     MACHINE_CHIPSET_SIS_496,
     MACHINE_CHIPSET_SIS_501,
+    MACHINE_CHIPSET_SIS_5501,
     MACHINE_CHIPSET_SIS_5511,
     MACHINE_CHIPSET_SIS_5571,
+    MACHINE_CHIPSET_SIS_5581,
+    MACHINE_CHIPSET_SIS_5591,
+    MACHINE_CHIPSET_SIS_5600,
     MACHINE_CHIPSET_SMSC_VICTORYBX_66,
     MACHINE_CHIPSET_STPC_CLIENT,
     MACHINE_CHIPSET_STPC_CONSUMER_II,
@@ -270,6 +306,7 @@ enum {
     MACHINE_CHIPSET_VLSI_VL82C481,
     MACHINE_CHIPSET_VLSI_VL82C486,
     MACHINE_CHIPSET_WD76C10,
+    MACHINE_CHIPSET_ZYMOS_POACH,
     MACHINE_CHIPSET_MAX
 };
 
@@ -301,7 +338,7 @@ typedef struct _machine_ {
     uint32_t               type;
     uintptr_t              chipset;
     int                  (*init)(const struct _machine_ *);
-    uint8_t              (*p1_handler)(uint8_t write, uint8_t val);
+    uint8_t              (*p1_handler)(void);
     uint32_t             (*gpio_handler)(uint8_t write, uint32_t val);
     uintptr_t              available_flag;
     uint32_t             (*gpio_acpi_handler)(uint8_t write, uint32_t val);
@@ -311,28 +348,34 @@ typedef struct _machine_ {
     const machine_memory_t ram;
     int                    ram_granularity;
     int                    nvrmask;
+    int                    jumpered_ecp_dma;
+    int                    default_jumpered_ecp_dma;
 #ifdef EMU_DEVICE_H
-    const device_t *kbc_device;
+    const device_t        *kbc_device;
 #else
-    void *kbc_device;
+    void                  *kbc_device;
 #endif /* EMU_DEVICE_H */
-    uint8_t  kbc_p1;
-    uint32_t gpio;
-    uint32_t gpio_acpi;
+    uintptr_t              kbc_params;
+    /* Bits 23-16: XOR mask, bits 15-8: OR mask, bits 7-0: AND mask. */
+    uint32_t               kbc_p1;
+    uint32_t               gpio;
+    uint32_t               gpio_acpi;
 #ifdef EMU_DEVICE_H
-    const device_t *device;
-    const device_t *fdc_device;
-    const device_t *sio_device;
-    const device_t *vid_device;
-    const device_t *snd_device;
-    const device_t *net_device;
+    const device_t        *device;
+    const device_t        *kbd_device;
+    const device_t        *fdc_device;
+    const device_t        *sio_device;
+    const device_t        *vid_device;
+    const device_t        *snd_device;
+    const device_t        *net_device;
 #else
-    void *device;
-    void *fdc_device;
-    void *sio_device;
-    void *vid_device;
-    void *snd_device;
-    void *net_device;
+    void                  *device;
+    void                  *kbd_device;
+    void                  *fdc_device;
+    void                  *sio_device;
+    void                  *vid_device;
+    void                  *snd_device;
+    void                  *net_device;
 #endif
 } machine_t;
 
@@ -354,13 +397,14 @@ extern void *                 machine_snd;
 extern machine_pc98_t         machine_pc98;
 
 /* Core functions. */
-extern int         machine_count(void);
-extern int         machine_available(int m);
-extern const char *machine_getname(void);
-extern const char *machine_getname_ex(int m);
-extern const char *machine_get_internal_name(void);
-extern int         machine_get_machine_from_internal_name(const char *s);
-extern void        machine_init(void);
+extern int             machine_count(void);
+extern int             machine_available(int m);
+extern const char *    machine_getname(void);
+extern const char *    machine_getname_ex(int m);
+extern const char *    machine_get_internal_name(void);
+extern const char *    machine_get_nvr_name(void);
+extern int             machine_get_machine_from_internal_name(const char *s);
+extern void            machine_init(void);
 #ifdef EMU_DEVICE_H
 extern const device_t *machine_get_kbc_device(int m);
 extern const device_t *machine_get_device(int m);
@@ -370,564 +414,968 @@ extern const device_t *machine_get_vid_device(int m);
 extern const device_t *machine_get_snd_device(int m);
 extern const device_t *machine_get_net_device(int m);
 #endif
-extern const char *machine_get_internal_name_ex(int m);
-extern int         machine_get_nvrmask(int m);
-extern int         machine_has_flags(int m, int flags);
-extern int         machine_has_bus(int m, int bus_flags);
-extern int         machine_has_cartridge(int m);
-extern int         machine_get_min_ram(int m);
-extern int         machine_get_max_ram(int m);
-extern int         machine_get_ram_granularity(int m);
-extern int         machine_get_type(int m);
-extern void        machine_close(void);
-extern int         machine_has_mouse(void);
-extern int         machine_is_sony(void);
+extern const char *    machine_get_internal_name_ex(int m);
+extern const char *    machine_get_nvr_name_ex(int m);
+extern int             machine_get_nvrmask(int m);
+extern int             machine_has_flags(int m, int flags);
+extern void            machine_set_ps2(void);
+extern void            machine_force_ps2(int is_ps2);
+extern int             machine_has_flags_ex(int flags);
+extern int             machine_has_bus(int m, int bus_flags);
+extern int             machine_has_cartridge(int m);
+extern int             machine_has_jumpered_ecp_dma(int m, int dma);
+extern int             machine_get_default_jumpered_ecp_dma(int m);
+extern int             machine_map_jumpered_ecp_dma(int dma);
+extern const char *    machine_get_jumpered_ecp_dma_name(int dma);
+extern int             machine_get_min_ram(int m);
+extern int             machine_get_max_ram(int m);
+extern int             machine_get_ram_granularity(int m);
+extern int             machine_get_type(int m);
+extern int             machine_get_chipset(int m);
+extern void            machine_close(void);
+extern int             machine_has_mouse(void);
+extern int             machine_is_sony(void);
 
-extern uint8_t  machine_get_p1_default(void);
-extern uint8_t  machine_get_p1(void);
-extern void     machine_set_p1_default(uint8_t val);
-extern void     machine_set_p1(uint8_t val);
-extern void     machine_and_p1(uint8_t val);
-extern void     machine_init_p1(void);
-extern uint8_t  machine_handle_p1(uint8_t write, uint8_t val);
-extern uint32_t machine_get_gpio_default(void);
-extern uint32_t machine_get_gpio(void);
-extern void     machine_set_gpio_default(uint32_t val);
-extern void     machine_set_gpio(uint32_t val);
-extern void     machine_and_gpio(uint32_t val);
-extern void     machine_init_gpio(void);
-extern uint32_t machine_handle_gpio(uint8_t write, uint32_t val);
-extern uint32_t machine_get_gpio_acpi_default(void);
-extern uint32_t machine_get_gpio_acpi(void);
-extern void     machine_set_gpio_acpi_default(uint32_t val);
-extern void     machine_set_gpio_acpi(uint32_t val);
-extern void     machine_and_gpio_acpi(uint32_t val);
-extern void     machine_init_gpio_acpi(void);
-extern uint32_t machine_handle_gpio_acpi(uint8_t write, uint32_t val);
+extern uint8_t         machine_compaq_p1_handler(void);
+extern uint8_t         machine_generic_p1_handler(void);
+extern uint8_t         machine_ncr_p1_handler(void);
+extern uint8_t         machine_ps1_p1_handler(void);
+extern uint8_t         machine_t3100e_p1_handler(void);
+
+extern uint8_t         machine_get_p1_default(void);
+extern void            machine_set_p1_default(uint8_t val);
+extern void            machine_set_p1(uint8_t val);
+extern void            machine_and_p1(uint8_t val);
+extern void            machine_init_p1(void);
+extern uint8_t         machine_handle_p1(uint8_t write, uint8_t val);
+extern uint8_t         machine_get_p1(uint8_t kbc_p1);
+extern uint32_t        machine_get_gpio_default(void);
+extern uint32_t        machine_get_gpio(void);
+extern void            machine_set_gpio_default(uint32_t val);
+extern void            machine_set_gpio(uint32_t val);
+extern void            machine_and_gpio(uint32_t val);
+extern void            machine_init_gpio(void);
+extern uint32_t        machine_handle_gpio(uint8_t write, uint32_t val);
+extern uint32_t        machine_get_gpio_acpi_default(void);
+extern uint32_t        machine_get_gpio_acpi(void);
+extern void            machine_set_gpio_acpi_default(uint32_t val);
+extern void            machine_set_gpio_acpi(uint32_t val);
+extern void            machine_and_gpio_acpi(uint32_t val);
+extern void            machine_init_gpio_acpi(void);
+extern uint32_t        machine_handle_gpio_acpi(uint8_t write, uint32_t val);
 
 /* Initialization functions for boards and systems. */
-extern void machine_common_init(const machine_t *);
-extern void machine_pc98_common_init(const machine_t *);
+extern void            machine_common_init(const machine_t *);
+extern void            machine_pc98_common_init(const machine_t *);
 
 /* m_amstrad.c */
-extern int machine_pc1512_init(const machine_t *);
-extern int machine_pc1640_init(const machine_t *);
-extern int machine_pc200_init(const machine_t *);
-extern int machine_ppc512_init(const machine_t *);
-extern int machine_pc2086_init(const machine_t *);
-extern int machine_pc3086_init(const machine_t *);
-
-/* m_at.c */
-extern void machine_at_common_init_ex(const machine_t *, int type);
-extern void machine_at_common_init(const machine_t *);
-extern void machine_at_init(const machine_t *);
-extern void machine_at_ps2_init(const machine_t *);
-extern void machine_at_common_ide_init(const machine_t *);
-extern void machine_at_ibm_common_ide_init(const machine_t *);
-extern void machine_at_ide_init(const machine_t *);
-extern void machine_at_ps2_ide_init(const machine_t *);
-
-extern int machine_at_ibm_init(const machine_t *);
-
-// IBM AT with custom BIOS
-extern int machine_at_ibmatami_init(const machine_t *);     // IBM AT with AMI BIOS
-extern int machine_at_ibmatpx_init(const machine_t *);      // IBM AT with Phoenix BIOS
-extern int machine_at_ibmatquadtel_init(const machine_t *); // IBM AT with Quadtel BIOS
-
-extern int machine_at_ibmxt286_init(const machine_t *);
-
-extern int machine_at_siemens_init(const machine_t *); // Siemens PCD-2L. N82330 discrete machine. It segfaults in some places
-
-#if defined(DEV_BRANCH) && defined(USE_OPEN_AT)
-extern int machine_at_openat_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  vid_1512_device;
 #endif
-
-/* m_at_286_386sx.c */
-extern int machine_at_tg286m_init(const machine_t *);
-extern int machine_at_ama932j_init(const machine_t *);
-extern int machine_at_px286_init(const machine_t *);
-extern int machine_at_quadt286_init(const machine_t *);
-extern int machine_at_mr286_init(const machine_t *);
-
-extern int machine_at_neat_init(const machine_t *);
-extern int machine_at_neat_ami_init(const machine_t *);
-
-extern int machine_at_quadt386sx_init(const machine_t *);
-
-extern int machine_at_award286_init(const machine_t *);
-extern int machine_at_gdc212m_init(const machine_t *);
-extern int machine_at_gw286ct_init(const machine_t *);
-extern int machine_at_super286c_init(const machine_t *);
-extern int machine_at_super286tr_init(const machine_t *);
-extern int machine_at_spc4200p_init(const machine_t *);
-extern int machine_at_spc4216p_init(const machine_t *);
-extern int machine_at_spc4620p_init(const machine_t *);
-extern int machine_at_kmxc02_init(const machine_t *);
-extern int machine_at_deskmaster286_init(const machine_t *);
-
-extern int machine_at_pc8_init(const machine_t *);
-extern int machine_at_3302_init(const machine_t *);
-
-#if defined(DEV_BRANCH) && defined(USE_OLIVETTI)
-extern int machine_at_m290_init(const machine_t *);
+extern int             machine_pc1512_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  vid_1640_device;
 #endif
+extern int             machine_pc1640_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  vid_200_device;
+#endif
+extern int             machine_pc200_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  vid_ppc512_device;
+#endif
+extern int             machine_ppc512_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  vid_pc2086_device;
+#endif
+extern int             machine_pc2086_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  vid_pc3086_device;
+#endif
+extern int             machine_pc3086_init(const machine_t *);
 
-extern int machine_at_shuttle386sx_init(const machine_t *);
-extern int machine_at_adi386sx_init(const machine_t *);
-extern int machine_at_cmdsl386sx16_init(const machine_t *);
-extern int machine_at_cmdsl386sx25_init(const machine_t *);
-extern int machine_at_dataexpert386sx_init(const machine_t *);
-extern int machine_at_spc6033p_init(const machine_t *);
-extern int machine_at_wd76c10_init(const machine_t *);
-extern int machine_at_arb1374_init(const machine_t *);
-extern int machine_at_sbc350a_init(const machine_t *);
-extern int machine_at_flytech386_init(const machine_t *);
-extern int machine_at_325ax_init(const machine_t *);
-extern int machine_at_mr1217_init(const machine_t *);
-extern int machine_at_pja511m_init(const machine_t *);
-extern int machine_at_prox1332_init(const machine_t *);
+/* m_at_286.c */
+/* ISA */
+#ifdef EMU_DEVICE_H
+extern const device_t  ibmat_device;
+#endif
+extern int             machine_at_ibmat_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  ibmxt286_device;
+#endif
+extern int             machine_at_ibmxt286_init(const machine_t *);
+extern int             machine_at_cmdpc_init(const machine_t *);
+extern int             machine_at_portableii_init(const machine_t *);
+extern int             machine_at_portableiii_init(const machine_t *);
+extern int             machine_at_grid1520_init(const machine_t *);
+extern int             machine_at_mr286_init(const machine_t *);
+extern int             machine_at_pc8_init(const machine_t *);
+extern int             machine_at_m290_init(const machine_t *);
+extern int             machine_at_pxat_init(const machine_t *);
+extern int             machine_at_quadtat_init(const machine_t *);
+extern int             machine_at_pb286_init(const machine_t *);
+extern int             machine_at_mbc17_init(const machine_t *);
+extern int             machine_at_ax286_init(const machine_t *);
+/* Siemens PCD-2L. N82330 discrete machine. It segfaults in some places */
+extern int             machine_at_siemens_init(const machine_t *);
+extern int             machine_at_tbunk286_init(const machine_t *);
 
-extern int machine_at_awardsx_init(const machine_t *);
+/* C&T PC/AT */
+extern int             machine_at_dells200_init(const machine_t *);
+extern int             machine_at_super286c_init(const machine_t *);
+extern int             machine_at_at122_init(const machine_t *);
+extern int             machine_at_tuliptc7_init(const machine_t *);
 
-extern int machine_at_pc916sx_init(const machine_t *);
+/* GC103 */
+extern int             machine_at_quadt286_init(const machine_t *);
+extern void            machine_at_headland_common_init(const machine_t *model, int type);
+extern int             machine_at_tg286m_init(const machine_t *);
+/* Wells American A*Star with custom award BIOS. */
+extern int             machine_at_wellamerastar_init(const machine_t *);
+
+/* NEAT */
+extern int             machine_at_ataripc4_init(const machine_t *);
+extern int             machine_at_neat_ami_init(const machine_t *);
+extern int             machine_at_3302_init(const machine_t *);
+extern int             machine_at_px286_init(const machine_t *);
+
+/* SCAMP */
+extern int             machine_at_pc7286_init(const machine_t *);
+
+/* SCAT */
+extern int             machine_at_pc5286_init(const machine_t *);
+extern int             machine_at_gw286ct_init(const machine_t *);
+extern int             machine_at_gdc212m_init(const machine_t *);
+extern int             machine_at_award286_init(const machine_t *);
+extern int             machine_at_super286tr_init(const machine_t *);
+extern int             machine_at_drsm35286_init(const machine_t *);
+extern int             machine_at_deskmaster286_init(const machine_t *);
+extern int             machine_at_spc4200p_init(const machine_t *);
+extern int             machine_at_spc4216p_init(const machine_t *);
+extern int             machine_at_spc4620p_init(const machine_t *);
+extern int             machine_at_senor_scat286_init(const machine_t *);
+
+/* m_at_386sx.c */
+/* ISA */
+extern int             machine_at_pc916sx_init(const machine_t *);
+extern int             machine_at_quadt386sx_init(const machine_t *);
+
+/* ACC 2036 */
+#ifdef EMU_DEVICE_H
+extern const device_t  pbl300sx_device;
+#endif
+extern int             machine_at_pbl300sx_init(const machine_t *);
+
+/* ALi M1217 */
+extern int             machine_at_arb1374_init(const machine_t *);
+extern int             machine_at_sbc350a_init(const machine_t *);
+extern int             machine_at_flytech386_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  c325ax_device;
+#endif
+extern int             machine_at_325ax_init(const machine_t *);
+
+/* ALi M1409 */
+extern int             machine_at_acer100t_init(const machine_t *);
+
+/* HT18 */
+extern int             machine_at_ama932j_init(const machine_t *);
+
+/* Intel 82335 */
+extern int             machine_at_adi386sx_init(const machine_t *);
+extern int             machine_at_shuttle386sx_init(const machine_t *);
+
+/* NEAT */
+extern int             machine_at_cmdsl386sx16_init(const machine_t *);
+extern int             machine_at_neat_init(const machine_t *);
+
+/* NEATsx */
+extern int             machine_at_if386sx_init(const machine_t *);
+
+/* OPTi 283 */
+extern int             machine_at_svc386sxp1_init(const machine_t *);
+
+/* OPTi 291 */
+extern int             machine_at_awardsx_init(const machine_t *);
+
+/* SCAMP */
+extern int             machine_at_cmdsl386sx25_init(const machine_t *);
+extern int             machine_at_dataexpert386sx_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  dells333sl_device;
+#endif
+extern int             machine_at_dells333sl_init(const machine_t *);
+extern int             machine_at_spc6033p_init(const machine_t *);
+
+/* SCATsx */
+extern int             machine_at_kmxc02_init(const machine_t *);
+
+/* WD76C10 */
+extern int             machine_at_wd76c10_init(const machine_t *);
+
+/* m_at_m6117.c */
+/* ALi M6117D */
+extern int             machine_at_pja511m_init(const machine_t *);
+extern int             machine_at_prox1332_init(const machine_t *);
+
+/* m_at_386dx.c */
+/* ISA */
+#ifdef EMU_DEVICE_H
+extern const device_t  deskpro386_device;
+#endif
+extern int             machine_at_deskpro386_init(const machine_t *);
+extern int             machine_at_portableiii386_init(const machine_t *);
+extern int             machine_at_micronics386_init(const machine_t *);
+extern int             machine_at_micronics386px_init(const machine_t *);
+
+/* ACC 2168 */
+extern int             machine_at_acc386_init(const machine_t *);
+
+/* C&T 386/AT */
+extern int             machine_at_ecs386_init(const machine_t *);
+extern int             machine_at_spc6000a_init(const machine_t *);
+extern int             machine_at_tandy4000_init(const machine_t *);
+
+/* ALi M1429 */
+extern int             machine_at_ecs386v_init(const machine_t *);
+
+/* OPTi 391 */
+extern int             machine_at_dataexpert386wb_init(const machine_t *);
+
+/* OPTi 495SLC */
+extern int             machine_at_opti495_init(const machine_t *);
+
+/* SiS 310 */
+extern int             machine_at_asus3863364k_init(const machine_t *);
+extern int             machine_at_asus386_init(const machine_t *);
+
+/* m_at_486slc.c */
+/* OPTi 283 */
+extern int             machine_at_rycleopardlx_init(const machine_t *);
 
 /* m_at_386dx_486.c */
-extern int machine_at_acc386_init(const machine_t *);
-extern int machine_at_asus386_init(const machine_t *);
-extern int machine_at_ecs386_init(const machine_t *);
-extern int machine_at_spc6000a_init(const machine_t *);
-extern int machine_at_micronics386_init(const machine_t *);
-extern int machine_at_ecs386v_init(const machine_t *);
+/* ALi M1429G */
+extern int             machine_at_exp4349_init(const machine_t *);
 
-extern int machine_at_rycleopardlx_init(const machine_t *);
+/* OPTi 495SX */
+extern int             machine_at_c747_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  opti495_ami_device;
+#endif
+extern int             machine_at_opti495_ami_init(const machine_t *);
 
-extern int machine_at_486vchd_init(const machine_t *);
+/* m_at_common.c */
+extern void            machine_at_common_init_ex(const machine_t *, int type);
+extern void            machine_at_common_init(const machine_t *);
+extern void            machine_at_init(const machine_t *);
+extern void            machine_at_ps2_init(const machine_t *);
+extern void            machine_at_common_ide_init(const machine_t *);
+extern void            machine_at_ibm_common_ide_init(const machine_t *);
+extern void            machine_at_ide_init(const machine_t *);
+extern void            machine_at_ps2_ide_init(const machine_t *);
 
-extern int machine_at_cs4031_init(const machine_t *);
+/* m_at_socket1.c */
+/* CS4031 */
+extern int             machine_at_cs4031_init(const machine_t *);
 
-extern int machine_at_pb410a_init(const machine_t *);
+/* OPTi 381 */
+extern int             machine_at_ga486l_init(const machine_t *);
 
-extern int machine_at_decpclpv_init(const machine_t *);
-extern int machine_at_acerv10_init(const machine_t *);
+/* OPTi 493 */
+extern int             machine_at_svc486wb_init(const machine_t *);
 
-extern int machine_at_acera1g_init(const machine_t *);
-extern int machine_at_ali1429_init(const machine_t *);
-extern int machine_at_winbios1429_init(const machine_t *);
+/* OPTi 498 */
+extern int             machine_at_mvi486_init(const machine_t *);
 
-extern int machine_at_opti495_init(const machine_t *);
-extern int machine_at_opti495_ami_init(const machine_t *);
-extern int machine_at_opti495_mr_init(const machine_t *);
-extern int machine_at_exp4349_init(const machine_t *);
+/* SiS 401 */
+extern int             machine_at_isa486_init(const machine_t *);
+extern int             machine_at_sis401_init(const machine_t *);
 
-extern int machine_at_vect486vl_init(const machine_t *);
-extern int machine_at_d824_init(const machine_t *);
+/* SiS 460 */
+extern int             machine_at_av4_init(const machine_t *);
 
-extern int machine_at_403tg_init(const machine_t *);
-extern int machine_at_403tg_d_init(const machine_t *);
-extern int machine_at_403tg_d_mr_init(const machine_t *);
-extern int machine_at_pb450_init(const machine_t *);
-extern int machine_at_pb450_init(const machine_t *);
-extern int machine_at_pc330_6573_init(const machine_t *);
-extern int machine_at_mvi486_init(const machine_t *);
+/* SiS 471 */
+extern int             machine_at_advantage40xxd_init(const machine_t *);
 
-extern int machine_at_sis401_init(const machine_t *);
-extern int machine_at_isa486_init(const machine_t *);
-extern int machine_at_av4_init(const machine_t *);
-extern int machine_at_valuepoint433_init(const machine_t *);
+/* Symphony SL42C460 */
+extern int             machine_at_dtk461_init(const machine_t *);
 
-extern int machine_at_vli486sv2g_init(const machine_t *);
-extern int machine_at_ami471_init(const machine_t *);
-extern int machine_at_dtk486_init(const machine_t *);
-extern int machine_at_px471_init(const machine_t *);
-extern int machine_at_win471_init(const machine_t *);
-extern int machine_at_pci400ca_init(const machine_t *);
-extern int machine_at_vi15g_init(const machine_t *);
-extern int machine_at_greenb_init(const machine_t *);
-extern int machine_at_4gpv5_init(const machine_t *);
+/* VIA VT82C495 */
+extern int             machine_at_486vchd_init(const machine_t *);
 
-extern int machine_at_r418_init(const machine_t *);
-extern int machine_at_ls486e_init(const machine_t *);
-extern int machine_at_4dps_init(const machine_t *);
-extern int machine_at_ms4144_init(const machine_t *);
-extern int machine_at_4saw2_init(const machine_t *);
-extern int machine_at_m4li_init(const machine_t *);
-extern int machine_at_alfredo_init(const machine_t *);
-extern int machine_at_amis76_init(const machine_t *);
-extern int machine_at_ninja_init(const machine_t *);
-extern int machine_at_bat4ip3e_init(const machine_t *);
-extern int machine_at_486pi_init(const machine_t *);
-extern int machine_at_sb486p_init(const machine_t *);
-extern int machine_at_486sp3_init(const machine_t *);
-extern int machine_at_486sp3c_init(const machine_t *);
-extern int machine_at_486sp3g_init(const machine_t *);
-extern int machine_at_486ap4_init(const machine_t *);
-extern int machine_at_g486vpa_init(const machine_t *);
-extern int machine_at_486vipio2_init(const machine_t *);
-extern int machine_at_abpb4_init(const machine_t *);
-extern int machine_at_win486pci_init(const machine_t *);
-extern int machine_at_ms4145_init(const machine_t *);
-extern int machine_at_sbc490_init(const machine_t *);
-extern int machine_at_tf486_init(const machine_t *);
-extern int machine_at_arb1476_init(const machine_t *);
+/* VLSI 82C480 */
+extern int             machine_at_vect486vl_init(const machine_t *);
 
-extern int machine_at_pci400cb_init(const machine_t *);
-extern int machine_at_g486ip_init(const machine_t *);
+/* VLSI 82C481 */
+extern int             machine_at_d824_init(const machine_t *);
 
-extern int machine_at_itoxstar_init(const machine_t *);
-extern int machine_at_arb1423c_init(const machine_t *);
-extern int machine_at_arb1479_init(const machine_t *);
-extern int machine_at_iach488_init(const machine_t *);
-extern int machine_at_pcm9340_init(const machine_t *);
-extern int machine_at_pcm5330_init(const machine_t *);
+/* VLSI 82C486 */
+extern int             machine_at_pcs44c_init(const machine_t *);
+extern int             machine_at_tuliptc38_init(const machine_t *);
 
-extern int machine_at_ecs486_init(const machine_t *);
-extern int machine_at_hot433a_init(const machine_t *);
-extern int machine_at_atc1415_init(const machine_t *);
-extern int machine_at_actionpc2600_init(const machine_t *);
-extern int machine_at_actiontower8400_init(const machine_t *);
-extern int machine_at_m919_init(const machine_t *);
-extern int machine_at_spc7700plw_init(const machine_t *);
-extern int machine_at_ms4134_init(const machine_t *);
-extern int machine_at_tg486gp_init(const machine_t *);
-extern int machine_at_tg486g_init(const machine_t *);
-extern int machine_at_dvent4xx_init(const machine_t *);
-extern int machine_at_ecsal486_init(const machine_t *);
-extern int machine_at_ap4100aa_init(const machine_t *);
-extern int machine_at_atc1762_init(const machine_t *);
+/* ZyMOS Poach */
+extern int             machine_at_isa486c_init(const machine_t *);
+extern int             machine_at_genoa486_init(const machine_t *);
 
-/* m_at_commodore.c */
-extern int machine_at_cmdpc_init(const machine_t *);
+/* m_at_socket2.c */
+/* ACC 2168 */
+extern int             machine_at_pb410a_init(const machine_t *);
 
-/* m_at_compaq.c */
-extern int machine_at_portableii_init(const machine_t *);
-extern int machine_at_portableiii_init(const machine_t *);
-extern int machine_at_portableiii386_init(const machine_t *);
-extern int machine_at_deskpro386_init(const machine_t *);
-extern int machine_at_deskpro386_05_1988_init(const machine_t *);
+/* ALi M1429G */
+extern int             machine_at_acera1g_init(const machine_t *);
+extern int             machine_at_winbios1429_init(const machine_t *);
+extern int             machine_at_ali1429_init(const machine_t *);
+
+/* i420TX */
+extern int             machine_at_pci400ca_init(const machine_t *);
+
+/* IMS 8848 */
+extern int             machine_at_g486ip_init(const machine_t *);
+
+/* OPTi 499 */
+extern int             machine_at_cobalt_init(const machine_t *);
+extern int             machine_at_cougar_init(const machine_t *);
+
+/* SiS 461 */
+extern int             machine_at_decpclpv_init(const machine_t *);
+extern int             machine_at_dell466np_init(const machine_t *);
+extern int             machine_at_valuepoint433_init(const machine_t *);
+
+/* VLSI 82C480 */
+extern int             machine_at_martin_init(const machine_t *);
+
+/* m_at_socket3.c */
+/* ALi M1429G */
+extern int             machine_at_atc1762_init(const machine_t *);
+extern int             machine_at_ecsal486_init(const machine_t *);
+extern int             machine_at_ap4100aa_init(const machine_t *);
+
+/* Contaq 82C596A */
+extern int             machine_at_4gpv5_init(const machine_t *);
+
+/* Contaq 82C597 */
+extern int             machine_at_greenb_init(const machine_t *);
+
+/* OPTi 895 */
+#ifdef EMU_DEVICE_H
+extern const device_t  j403tg_device;
+#endif
+extern int             machine_at_403tg_init(const machine_t *);
+extern int             machine_at_403tg_d_init(const machine_t *);
+extern int             machine_at_403tg_d_mr_init(const machine_t *);
+
+/* SiS 461 */
+extern int             machine_at_acerv10_init(const machine_t *);
+
+/* SiS 471 */
+extern int             machine_at_win471_init(const machine_t *);
+extern int             machine_at_vi15g_init(const machine_t *);
+extern int             machine_at_vli486sv2g_init(const machine_t *);
+extern int             machine_at_dvent4xx_init(const machine_t *);
+extern int             machine_at_dtk486_init(const machine_t *);
+extern int             machine_at_ami471_init(const machine_t *);
+extern int             machine_at_px471_init(const machine_t *);
+extern int             machine_at_tg486g_init(const machine_t *);
+
+/* m_at_socket3_pci.c */
+/* ALi M1429G */
+extern int             machine_at_ms4134_init(const machine_t *);
+extern int             machine_at_tg486gp_init(const machine_t *);
+
+/* ALi M1489 */
+extern int             machine_at_sbc490_init(const machine_t *);
+extern int             machine_at_abpb4_init(const machine_t *);
+extern int             machine_at_arb1476_init(const machine_t *);
+extern int             machine_at_win486pci_init(const machine_t *);
+extern int             machine_at_tf486_init(const machine_t *);
+extern int             machine_at_ms4145_init(const machine_t *);
+
+/* OPTi 802G */
+#ifdef EMU_DEVICE_H
+extern const device_t  pc330_6573_device;
+#endif
+extern int             machine_at_pc330_6573_init(const machine_t *);
+
+/* OPTi 895 */
+#ifdef EMU_DEVICE_H
+extern const device_t  pb450_device;
+#endif
+extern int             machine_at_pb450_init(const machine_t *);
+
+/* i420EX */
+extern int             machine_at_486pi_init(const machine_t *);
+extern int             machine_at_bat4ip3e_init(const machine_t *);
+extern int             machine_at_486ap4_init(const machine_t *);
+extern int             machine_at_ninja_init(const machine_t *);
+extern int             machine_at_sb486p_init(const machine_t *);
+
+/* i420TX */
+extern int             machine_at_amis76_init(const machine_t *);
+extern int             machine_at_486sp3_init(const machine_t *);
+extern int             machine_at_alfredo_init(const machine_t *);
+
+/* i420ZX */
+extern int             machine_at_486sp3g_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  sb486pv_device;
+#endif
+extern int             machine_at_sb486pv_init(const machine_t *);
+
+/* IMS 8848 */
+extern int             machine_at_pci400cb_init(const machine_t *);
+
+/* SiS 496 */
+extern int             machine_at_acerp3_init(const machine_t *);
+extern int             machine_at_486sp3c_init(const machine_t *);
+extern int             machine_at_ls486e_init(const machine_t *);
+extern int             machine_at_m4li_init(const machine_t *);
+extern int             machine_at_ms4144_init(const machine_t *);
+extern int             machine_at_r418_init(const machine_t *);
+extern int             machine_at_4saw2_init(const machine_t *);
+extern int             machine_at_4dps_init(const machine_t *);
+
+/* UMC 8881 */
+extern int             machine_at_atc1415_init(const machine_t *);
+extern int             machine_at_84xxuuda_init(const machine_t *);
+extern int             machine_at_pl4600c_init(const machine_t *);
+extern int             machine_at_ecs486_init(const machine_t *);
+extern int             machine_at_actionpc2600_init(const machine_t *);
+extern int             machine_at_actiontower8400_init(const machine_t *);
+extern int             machine_at_m919_init(const machine_t *);
+extern int             machine_at_spc7700plw_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  hot433a_device;
+#endif
+extern int             machine_at_hot433a_init(const machine_t *);
+
+/* VIA VT82C496G */
+extern int             machine_at_g486vpa_init(const machine_t *);
+extern int             machine_at_486vipio2_init(const machine_t *);
+
+/* m_at_486_misc.c */
+/* STPC Client */
+extern int             machine_at_itoxstar_init(const machine_t *);
+
+/* STPC Consumer-II */
+extern int             machine_at_arb1423c_init(const machine_t *);
+extern int             machine_at_arb1479_init(const machine_t *);
+extern int             machine_at_iach488_init(const machine_t *);
+
+/* STPC Elite */
+extern int             machine_at_pcm9340_init(const machine_t *);
+
+/* STPC Atlas */
+extern int             machine_at_pcm5330_init(const machine_t *);
 
 /* m_at_socket4.c */
-extern void machine_at_premiere_common_init(const machine_t *, int);
-extern void machine_at_award_common_init(const machine_t *);
+/* i430LX */
+#ifdef EMU_DEVICE_H
+extern const device_t  v12p_device;
+#endif
+extern int             machine_at_v12p_init(const machine_t *);
+extern int             machine_at_excaliburpci_init(const machine_t *);
+extern int             machine_at_p5mp3_init(const machine_t *);
+extern int             machine_at_opti560l_init(const machine_t *);
+extern void            machine_at_award_common_init(const machine_t *);
+extern int             machine_at_586is_init(const machine_t *);
+extern int             machine_at_valuepointp60_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  batman_device;
+#endif
+extern int             machine_at_batman_init(const machine_t *);
+extern void            machine_at_premiere_common_init(const machine_t *, int);
+extern int             machine_at_revenge_init(const machine_t *);
+extern int             machine_at_m5pi_init(const machine_t *);
+extern int             machine_at_pb520r_init(const machine_t *);
 
-extern void machine_at_sp4_common_init(const machine_t *model);
+/* OPTi 597 */
+extern int             machine_at_excalibur_init(const machine_t *);
+extern int             machine_at_globalyst330_p5_init(const machine_t *);
+extern int             machine_at_p5vl_init(const machine_t *);
 
-extern int machine_at_excaliburpci_init(const machine_t *);
-extern int machine_at_p5mp3_init(const machine_t *);
-extern int machine_at_dellxp60_init(const machine_t *);
-extern int machine_at_opti560l_init(const machine_t *);
-extern int machine_at_ambradp60_init(const machine_t *);
-extern int machine_at_valuepointp60_init(const machine_t *);
-extern int machine_at_revenge_init(const machine_t *);
-extern int machine_at_586is_init(const machine_t *);
-extern int machine_at_pb520r_init(const machine_t *);
+/* SiS 501 */
+extern int             machine_at_excaliburpci2_init(const machine_t *);
+extern void            machine_at_sp4_common_init(const machine_t *model);
+extern int             machine_at_p5sp4_init(const machine_t *);
+extern int             machine_at_ecs50x_init(const machine_t *);
 
-extern int machine_at_excalibur_init(const machine_t *);
-
-extern int machine_at_p5vl_init(const machine_t *);
-
-extern int machine_at_excaliburpci2_init(const machine_t *);
-extern int machine_at_p5sp4_init(const machine_t *);
+/* m_at_socket4_5.c */
+/* OPTi 597 */
+extern int             machine_at_pci56001_init(const machine_t *);
 
 /* m_at_socket5.c */
-extern int machine_at_plato_init(const machine_t *);
-extern int machine_at_dellplato_init(const machine_t *);
-extern int machine_at_ambradp90_init(const machine_t *);
-extern int machine_at_586ip_init(const machine_t *);
-extern int machine_at_tek932_init(const machine_t *);
+/* i430NX */
+extern int             machine_at_p54np4_init(const machine_t *);
+extern int             machine_at_586ip_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  plato_device;
+#endif
+extern int             machine_at_plato_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  d842_device;
+#endif
+extern int             machine_at_d842_init(const machine_t *);
+extern int             machine_at_tek932_init(const machine_t *);
 
-extern int machine_at_acerv30_init(const machine_t *);
-extern int machine_at_apollo_init(const machine_t *);
-extern int machine_at_zappa_init(const machine_t *);
-extern int machine_at_powermatev_init(const machine_t *);
-extern int machine_at_hawk_init(const machine_t *);
-extern int machine_at_pt2000_init(const machine_t *);
+/* i430FX */
+extern int             machine_at_acerv30_init(const machine_t *);
+extern int             machine_at_apollo_init(const machine_t *);
+extern int             machine_at_optiplexgxl_init(const machine_t *);
+extern int             machine_at_pt2000_init(const machine_t *);
+extern int             machine_at_zappa_init(const machine_t *);
+extern int             machine_at_powermatev_init(const machine_t *);
+extern int             machine_at_hawk_init(const machine_t *);
 
-extern int machine_at_pat54pv_init(const machine_t *);
+/* OPTi 597 */
+extern int             machine_at_ncselp90_init(const machine_t *);
+extern int             machine_at_hot543_init(const machine_t *);
+extern int             machine_at_pat54pv_init(const machine_t *);
 
-extern int machine_at_hot543_init(const machine_t *);
-extern int machine_at_ncselp90_init(const machine_t *);
+/* SiS 501 */
+extern int             machine_at_p54sp4_init(const machine_t *);
+extern int             machine_at_sq588_init(const machine_t *);
+extern int             machine_at_p54sps_init(const machine_t *);
+extern int             machine_at_ms5109_init(const machine_t *);
 
-extern int machine_at_p54sp4_init(const machine_t *);
-extern int machine_at_sq588_init(const machine_t *);
-extern int machine_at_p54sps_init(const machine_t *);
+/* SiS 5501 */
+extern int             machine_at_torino_init(const machine_t *);
+
+/* UMC 889x */
+extern int             machine_at_hot539_init(const machine_t *);
 
 /* m_at_socket7_3v.c */
-extern int machine_at_p54tp4xe_init(const machine_t *);
-extern int machine_at_p54tp4xe_mr_init(const machine_t *);
-extern int machine_at_exp8551_init(const machine_t *);
-extern int machine_at_gw2katx_init(const machine_t *);
-extern int machine_at_thor_init(const machine_t *);
-extern int machine_at_mrthor_init(const machine_t *);
-extern uint32_t machine_at_endeavor_gpio_handler(uint8_t write, uint32_t val);
-extern int machine_at_endeavor_init(const machine_t *);
-extern int machine_at_ms5119_init(const machine_t *);
-extern int machine_at_pb640_init(const machine_t *);
-extern int machine_at_mb500n_init(const machine_t *);
-extern int machine_at_fmb_init(const machine_t *);
+/* i430FX */
+#ifdef EMU_DEVICE_H
+extern const device_t  p54tp4xe_device;
+#endif
+extern int             machine_at_p54tp4xe_init(const machine_t *);
+extern int             machine_at_exp8551_init(const machine_t *);
+extern int             machine_at_vectra54_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  thor_device;
+#endif
+extern int             machine_at_thor_init(const machine_t *);
+extern uint32_t        machine_at_endeavor_gpio_handler(uint8_t write, uint32_t val);
+extern int             machine_at_endeavor_init(const machine_t *);
+extern int             machine_at_ms5119_init(const machine_t *);
+extern int             machine_at_pb640_init(const machine_t *);
+extern int             machine_at_mb500n_init(const machine_t *);
+extern int             machine_at_fmb_init(const machine_t *);
 
-extern int machine_at_acerm3a_init(const machine_t *);
-extern int machine_at_ap53_init(const machine_t *);
-extern int machine_at_8500tuc_init(const machine_t *);
-extern int machine_at_p55t2s_init(const machine_t *);
+/* i430HX */
+extern int             machine_at_acerv35n_init(const machine_t *);
+extern int             machine_at_ap53_init(const machine_t *);
+extern int             machine_at_8500tuc_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  d943_device;
+#endif
+extern int             machine_at_d943_init(const machine_t *);
 
-extern int machine_at_p5vxb_init(const machine_t *);
-extern int machine_at_dellhannibalp_init(const machine_t *);
-extern int machine_at_gw2kte_init(const machine_t *);
+/* i430VX */
+extern int             machine_at_gw2kma_init(const machine_t *);
 
-extern int machine_at_ap5s_init(const machine_t *);
-extern int machine_at_ms5124_init(const machine_t *);
-extern int machine_at_amis727_init(const machine_t *);
-extern int machine_at_vectra54_init(const machine_t *);
+/* SiS 5501 */
+#ifdef EMU_DEVICE_H
+extern const device_t  c5sbm2_device;
+#endif
+extern int             machine_at_5sbm2_init(const machine_t *);
+
+/* SiS 5511 */
+extern int             machine_at_amis727_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  ap5s_device;
+#endif
+extern int             machine_at_ap5s_init(const machine_t *);
+extern int             machine_at_pc140_6260_init(const machine_t *);
+extern int             machine_at_ms5124_init(const machine_t *);
 
 /* m_at_socket7.c */
-extern int machine_at_acerv35n_init(const machine_t *);
-extern int machine_at_p55t2p4_init(const machine_t *);
-extern int machine_at_m7shi_init(const machine_t *);
-extern int machine_at_tc430hx_init(const machine_t *);
-extern int machine_at_infinia7200_init(const machine_t *);
-extern int machine_at_cu430hx_init(const machine_t *);
-extern int machine_at_equium5200_init(const machine_t *);
-extern int machine_at_pcv90_init(const machine_t *);
-extern int machine_at_p65up5_cp55t2d_init(const machine_t *);
-extern int machine_at_epc2102_init(const machine_t *);
-
-extern int machine_at_ap5vm_init(const machine_t *);
-extern int machine_at_p55tvp4_init(const machine_t *);
-extern int machine_at_5ivg_init(const machine_t *);
-extern int machine_at_8500tvxa_init(const machine_t *);
-extern int machine_at_presario2240_init(const machine_t *);
-extern int machine_at_presario4500_init(const machine_t *);
-extern int machine_at_p55va_init(const machine_t *);
-extern int machine_at_brio80xx_init(const machine_t *);
-extern int machine_at_pb680_init(const machine_t *);
-extern int machine_at_pb810_init(const machine_t *);
-extern int machine_at_mb520n_init(const machine_t *);
-extern int machine_at_i430vx_init(const machine_t *);
-
-extern int machine_at_nupro592_init(const machine_t *);
-extern int machine_at_tx97_init(const machine_t *);
-#if defined(DEV_BRANCH) && defined(USE_AN430TX)
-extern int machine_at_an430tx_init(const machine_t *);
+/* i430HX */
+extern int             machine_at_acerm3a_init(const machine_t *);
+extern int             machine_at_p55t2p4_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern void            machine_at_p65up5_common_init(const machine_t *, const device_t *northbridge);
 #endif
-extern int machine_at_ym430tx_init(const machine_t *);
-extern int machine_at_thunderbolt_init(const machine_t *);
-extern int machine_at_mb540n_init(const machine_t *);
-extern int machine_at_56a5_init(const machine_t *);
-extern int machine_at_p5mms98_init(const machine_t *);
-extern int machine_at_richmond_init(const machine_t *);
-extern int machine_at_tomahawk_init(const machine_t *);
+extern int             machine_at_p65up5_cp55t2d_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  cu430hx_device;
+#endif
+extern int             machine_at_cu430hx_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  tc430hx_device;
+#endif
+extern int             machine_at_tc430hx_init(const machine_t *);
+extern int             machine_at_m7shi_init(const machine_t *);
+extern int             machine_at_epc2102_init(const machine_t *);
+extern int             machine_at_pcv90_init(const machine_t *);
+extern int             machine_at_p55t2s_init(const machine_t *);
 
-extern int machine_at_ficva502_init(const machine_t *);
+/* i430VX */
+extern int             machine_at_ap5vm_init(const machine_t *);
+extern int             machine_at_p55tvp4_init(const machine_t *);
+extern int             machine_at_5ivg_init(const machine_t *);
+extern int             machine_at_8500tvxa_init(const machine_t *);
+extern int             machine_at_presario2240_init(const machine_t *);
+extern int             machine_at_presario4500_init(const machine_t *);
+extern int             machine_at_dellhannibalp_init(const machine_t *);
+extern int             machine_at_p5vxb_init(const machine_t *);
+extern int             machine_at_p55va_init(const machine_t *);
+extern int             machine_at_gw2kte_init(const machine_t *);
+extern int             machine_at_brio80xx_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  lgibmx52_device;
+#endif
+extern int             machine_at_lgibmx52_init(const machine_t *);
+extern int             machine_at_pb680_init(const machine_t *);
+extern int             machine_at_pb810_init(const machine_t *);
+extern int             machine_at_mb520n_init(const machine_t *);
+extern int             machine_at_i430vx_init(const machine_t *);
 
-extern int machine_at_ficpa2012_init(const machine_t *);
+/* i430TX */
+extern int             machine_at_nupro592_init(const machine_t *);
+extern int             machine_at_tx97_init(const machine_t *);
+extern void            machine_at_optiplex_21152_init(void);
+extern int             machine_at_optiplexgn_init(const machine_t *);
+extern int             machine_at_tomahawk_init(const machine_t *);
+extern int             machine_at_ym430tx_init(const machine_t *);
+extern int             machine_at_thunderbolt_init(const machine_t *);
+extern int             machine_at_ma23c_init(const machine_t *);
+extern int             machine_at_an430tx_init(const machine_t *);
+extern int             machine_at_mb540n_init(const machine_t *);
+extern int             machine_at_56a5_init(const machine_t *);
+extern int             machine_at_p5mms98_init(const machine_t *);
+extern int             machine_at_richmond_init(const machine_t *);
 
-extern int machine_at_r534f_init(const machine_t *);
-extern int machine_at_ms5146_init(const machine_t *);
-extern int machine_at_cb52xsi_init(const machine_t *);
+/* VIA VPX */
+extern int             machine_at_ficva502_init(const machine_t *);
 
-extern int machine_at_m560_init(const machine_t *);
-extern int machine_at_ms5164_init(const machine_t *);
+/* VIA VP3 */
+extern int             machine_at_ficpa2012_init(const machine_t *);
+extern int             machine_at_via809ds_init(const machine_t *);
+
+/* SiS 5571 */
+extern int             machine_at_cb52xsi_init(const machine_t *);
+extern int             machine_at_ms5146_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  r534f_device;
+#endif
+extern int             machine_at_r534f_init(const machine_t *);
+
+/* SiS 5581 */
+extern int             machine_at_sp97xv_init(const machine_t *);
+extern int             machine_at_sq578_init(const machine_t *);
+
+/* SiS 5591 */
+extern int             machine_at_ms5172_init(const machine_t *);
+
+/* ALi ALADDiN IV+ */
+#ifdef EMU_DEVICE_H
+extern const device_t  m5ata_device;
+#endif
+extern int             machine_at_m5ata_init(const machine_t *);
+extern int             machine_at_ms5164_init(const machine_t *);
+extern int             machine_at_m560_init(const machine_t *);
 
 /* m_at_sockets7.c */
-extern int machine_at_p5a_init(const machine_t *);
-extern int machine_at_m579_init(const machine_t *);
-extern int machine_at_gwlucas_init(const machine_t *);
-extern int machine_at_5aa_init(const machine_t *);
-extern int machine_at_5ax_init(const machine_t *);
+/* ALi ALADDiN V */
+extern int             machine_at_p5a_init(const machine_t *);
+extern int             machine_at_m579_init(const machine_t *);
+extern int             machine_at_gwlucas_init(const machine_t *);
+extern int             machine_at_5aa_init(const machine_t *);
+extern int             machine_at_5ax_init(const machine_t *);
 
-extern int machine_at_ax59pro_init(const machine_t *);
-extern int machine_at_mvp3_init(const machine_t *);
-extern int machine_at_ficva503a_init(const machine_t *);
-extern int machine_at_5emapro_init(const machine_t *);
+/* VIA MVP3 */
+extern int             machine_at_ax59pro_init(const machine_t *);
+extern int             machine_at_delhi3_init(const machine_t *);
+extern int             machine_at_mvp3_init(const machine_t *);
+extern int             machine_at_ficva503a_init(const machine_t *);
+extern int             machine_at_5emapro_init(const machine_t *);
+
+/* SiS 5591 */
+extern int             machine_at_5sg100_init(const machine_t *);
 
 /* m_at_socket8.c */
-extern int machine_at_ap61_init(const machine_t *);
-extern int machine_at_p6rp4_init(const machine_t *);
-
-extern int machine_at_686nx_init(const machine_t *);
-extern int machine_at_acerv60n_init(const machine_t *);
-extern int machine_at_lgibmx61_init(const machine_t *);
-extern int machine_at_vs440fx_init(const machine_t *);
-extern int machine_at_gw2kvenus_init(const machine_t *);
-extern int machine_at_ap440fx_init(const machine_t *);
-extern int machine_at_mb600n_init(const machine_t *);
-extern int machine_at_8600ttc_init(const machine_t *);
-extern int machine_at_m6mi_init(const machine_t *);
+/* i450KX */
+extern int             machine_at_ap61_init(const machine_t *);
 #ifdef EMU_DEVICE_H
-extern void machine_at_p65up5_common_init(const machine_t *, const device_t *northbridge);
+extern const device_t  ficpo6000_device;
 #endif
-extern int machine_at_p65up5_cp6nd_init(const machine_t *);
+extern int             machine_at_p6rp4_init(const machine_t *);
+extern int             machine_at_ficpo6000_init(const machine_t *);
+
+/* i440FX */
+extern int             machine_at_acerv60n_init(const machine_t *);
+extern int             machine_at_p65up5_cp6nd_init(const machine_t *);
+extern int             machine_at_8600ttc_init(const machine_t *);
+extern int             machine_at_686nx_init(const machine_t *);
+extern int             machine_at_ap440fx_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  vs440fx_device;
+#endif
+extern int             machine_at_vs440fx_init(const machine_t *);
+extern int             machine_at_lgibmx61_init(const machine_t *);
+extern int             machine_at_m6mi_init(const machine_t *);
+extern int             machine_at_mb600n_init(const machine_t *);
 
 /* m_at_slot1.c */
-extern int machine_at_m729_init(const machine_t *);
+/* ALi ALADDiN-PRO II */
+extern int             machine_at_m729_init(const machine_t *);
 
-extern int machine_at_p65up5_cpknd_init(const machine_t *);
-extern int machine_at_kn97_init(const machine_t *);
+/* i440FX */
+extern int             machine_at_acerv62x_init(const machine_t *);
+extern int             machine_at_p65up5_cpknd_init(const machine_t *);
+extern int             machine_at_kn97_init(const machine_t *);
 
-extern int machine_at_lx6_init(const machine_t *);
-extern int machine_at_spitfire_init(const machine_t *);
+/* i440LX */
+extern int             machine_at_lx6_init(const machine_t *);
+extern int             machine_at_optiplexgxa_init(const machine_t *);
+extern int             machine_at_spitfire_init(const machine_t *);
+extern int             machine_at_ma30d_init(const machine_t *);
 
-extern int machine_at_ma30d_init(const machine_t *);
+/* i440EX */
+extern int             machine_at_p6i440e2_init(const machine_t *);
 
-extern int machine_at_p6i440e2_init(const machine_t *);
+/* i440BX */
+extern int             machine_at_bf6_init(const machine_t *);
+extern int             machine_at_bx6_init(const machine_t *);
+extern int             machine_at_ax6bc_init(const machine_t *);
+extern int             machine_at_p2bls_init(const machine_t *);
+extern int             machine_at_p3bf_init(const machine_t *);
+extern int             machine_at_686bx_init(const machine_t *);
+extern int             machine_at_lgibmx7g_init(const machine_t *);
+extern int             machine_at_p6sba_init(const machine_t *);
+extern int             machine_at_s1846_init(const machine_t *);
 
-extern int machine_at_p2bls_init(const machine_t *);
-extern int machine_at_lgibmx7g_init(const machine_t *);
-extern int machine_at_p3bf_init(const machine_t *);
-extern int machine_at_bf6_init(const machine_t *);
-extern int machine_at_ax6bc_init(const machine_t *);
-extern int machine_at_atc6310bxii_init(const machine_t *);
-extern int machine_at_686bx_init(const machine_t *);
-extern int machine_at_s1846_init(const machine_t *);
-extern int machine_at_p6sba_init(const machine_t *);
-extern int machine_at_ficka6130_init(const machine_t *);
-extern int machine_at_p3v133_init(const machine_t *);
-extern int machine_at_p3v4x_init(const machine_t *);
-extern int machine_at_gt694va_init(const machine_t *);
+/* i440ZX */
+extern int             machine_at_vei8_init(const machine_t *);
+extern int             machine_at_ms6168_init(const machine_t *);
+extern int             machine_at_borapro_init(const machine_t *);
 
-extern int machine_at_vei8_init(const machine_t *);
+/* SMSC VictoryBX-66 */
+extern int             machine_at_atc6310bxii_init(const machine_t *);
 
-extern int machine_at_borapro_init(const machine_t *);
-extern int machine_at_ms6168_init(const machine_t *);
+/* VIA Apollo Pro */
+extern int             machine_at_ficka6130_init(const machine_t *);
+
+/* VIA Apollo Pro 133 */
+extern int             machine_at_p3v133_init(const machine_t *);
+
+/* VIA Apollo Pro 133A */
+extern int             machine_at_p3v4x_init(const machine_t *);
+extern int             machine_at_gt694va_init(const machine_t *);
+
+/* SiS 5600 */
+extern int             machine_at_p6f99_init(const machine_t *);
+extern int             machine_at_m747_init(const machine_t *);
+
+/* m_at_slot1_2.c */
+/* i440GX */
+extern int             machine_at_fw6400gx_init(const machine_t *);
+
+/* m_at_slot1_socket370.c */
+/* i440BX */
+extern int             machine_at_prosignias31x_bx_init(const machine_t *);
+extern int             machine_at_s1857_init(const machine_t *);
+
+/* VIA Apollo Pro 133 */
+extern int             machine_at_p6bat_init(const machine_t *);
 
 /* m_at_slot2.c */
-extern int machine_at_6gxu_init(const machine_t *);
-extern int machine_at_s2dge_init(const machine_t *);
-extern int machine_at_fw6400gx_init(const machine_t *);
+/* i440GX */
+extern int             machine_at_6gxu_init(const machine_t *);
+extern int             machine_at_s2dge_init(const machine_t *);
 
 /* m_at_socket370.c */
-extern int machine_at_s370slm_init(const machine_t *);
+/* i440LX */
+extern int             machine_at_s370slm_init(const machine_t *);
 
-extern int machine_at_cubx_init(const machine_t *);
-extern int machine_at_atc7020bxii_init(const machine_t *);
-extern int machine_at_m773_init(const machine_t *);
-extern int machine_at_ambx133_init(const machine_t *);
-extern int machine_at_awo671r_init(const machine_t *);
-extern int machine_at_63a1_init(const machine_t *);
-extern int machine_at_s370sba_init(const machine_t *);
-extern int machine_at_apas3_init(const machine_t *);
-extern int machine_at_cuv4xls_init(const machine_t *);
-extern int machine_at_6via90ap_init(const machine_t *);
-extern int machine_at_s1857_init(const machine_t *);
-extern int machine_at_p6bap_init(const machine_t *);
-extern int machine_at_p6bat_init(const machine_t *);
+/* i440BX */
+extern int             machine_at_awo671r_init(const machine_t *);
+extern int             machine_at_ambx133_init(const machine_t *);
+extern int             machine_at_cubx_init(const machine_t *);
+
+/* i440ZX */
+extern int             machine_at_63a1_init(const machine_t *);
+
+/* SMSC VictoryBX-66 */
+extern int             machine_at_atc7020bxii_init(const machine_t *);
+extern int             machine_at_m773_init(const machine_t *);
+
+/* VIA Apollo Pro */
+extern int             machine_at_apas3_init(const machine_t *);
+
+/* VIA Apollo Pro 133 */
+extern int             machine_at_p6bap_init(const machine_t *);
+
+/* VIA Apollo Pro 133A */
+extern int             machine_at_6via90ap_init(const machine_t *);
+extern int             machine_at_cuv4xls_init(const machine_t *);
+
+/* SiS 600 */
+extern int             machine_at_7sbb_init(const machine_t *);
 
 /* m_at_misc.c */
-extern int machine_at_vpc2007_init(const machine_t *);
+extern int             machine_at_vpc2007_init(const machine_t *);
 
 /* m_at_t3100e.c */
-extern int machine_at_t3100e_init(const machine_t *);
+extern int             machine_at_t3100e_init(const machine_t *);
 
 /* m_elt.c */
 extern int machine_elt_init(const machine_t *);
 
 /* m_europc.c */
-extern int machine_europc_init(const machine_t *);
 #ifdef EMU_DEVICE_H
-extern const device_t europc_device;
+extern const device_t  europc_device;
 #endif
+extern int             machine_europc_init(const machine_t *);
 
 /* m_xt_olivetti.c */
-extern int machine_xt_m24_init(const machine_t *);
-extern int machine_xt_m240_init(const machine_t *);
-extern int machine_xt_m19_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  m19_vid_device;
+#endif
+extern int             machine_xt_m19_init(const machine_t *);
+extern int             machine_xt_m24_init(const machine_t *);
+extern int             machine_xt_m240_init(const machine_t *);
 
 /* m_pcjr.c */
-extern int machine_pcjr_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  pcjr_device;
+#endif
+extern int             machine_pcjr_init(const machine_t *);
 
 /* m_ps1.c */
-extern int machine_ps1_m2011_init(const machine_t *);
-extern int machine_ps1_m2121_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  ps1_2011_device;
+#endif
+extern int             machine_ps1_m2011_init(const machine_t *);
+extern int             machine_ps1_m2121_init(const machine_t *);
 
 /* m_ps1_hdc.c */
 #ifdef EMU_DEVICE_H
-extern void           ps1_hdc_inform(void *, uint8_t *);
-extern const device_t ps1_hdc_device;
+extern void            ps1_hdc_inform(void *, uint8_t *);
+extern const device_t  ps1_hdc_device;
 #endif
 
 /* m_ps2_isa.c */
-extern int machine_ps2_m30_286_init(const machine_t *);
+extern int             machine_ps2_m30_286_init(const machine_t *);
 
 /* m_ps2_mca.c */
-extern int machine_ps2_model_50_init(const machine_t *);
-extern int machine_ps2_model_60_init(const machine_t *);
-extern int machine_ps2_model_55sx_init(const machine_t *);
-extern int machine_ps2_model_65sx_init(const machine_t *);
-extern int machine_ps2_model_70_type3_init(const machine_t *);
-extern int machine_ps2_model_80_init(const machine_t *);
-extern int machine_ps2_model_80_axx_init(const machine_t *);
-extern int machine_ps2_model_70_type4_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  ps2_model_50_device;
+#endif
+extern int             machine_ps2_model_50_init(const machine_t *);
+extern int             machine_ps2_model_60_init(const machine_t *);
+extern int             machine_ps2_model_55sx_init(const machine_t *);
+extern int             machine_ps2_model_65sx_init(const machine_t *);
+extern int             machine_ps2_model_70_type3_init(const machine_t *);
+extern int             machine_ps2_model_80_init(const machine_t *);
+extern int             machine_ps2_model_80_axx_init(const machine_t *);
+extern int             machine_ps2_model_70_type4_init(const machine_t *);
+extern int             machine_ps55_model_50t_init(const machine_t*);
+extern int             machine_ps55_model_50v_init(const machine_t*);
 
 /* m_tandy.c */
 extern int tandy1k_eeprom_read(void);
-extern int machine_tandy_init(const machine_t *);
-extern int machine_tandy1000hx_init(const machine_t *);
-extern int machine_tandy1000sl2_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  tandy_1000sx_video_device;
+#endif
+extern int             machine_tandy1000sx_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  tandy_1000hx_video_device;
+#endif
+extern int             machine_tandy1000hx_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  tandy_1000sl_video_device;
+#endif
+extern int             machine_tandy1000sl2_init(const machine_t *);
 
 /* m_v86p.c */
-extern int machine_v86p_init(const machine_t *);
+extern int             machine_v86p_init(const machine_t *);
 
 /* m_xt.c */
-extern int machine_pc_init(const machine_t *);
-extern int machine_pc82_init(const machine_t *);
-
-extern int machine_xt_init(const machine_t *);
-extern int machine_genxt_init(const machine_t *);
-
-extern int machine_xt86_init(const machine_t *);
-
-extern int machine_xt_americxt_init(const machine_t *);
-extern int machine_xt_amixt_init(const machine_t *);
-extern int machine_xt_dtk_init(const machine_t *);
-extern int machine_xt_jukopc_init(const machine_t *);
-extern int machine_xt_openxt_init(const machine_t *);
-extern int machine_xt_pcxt_init(const machine_t *);
-extern int machine_xt_pxxt_init(const machine_t *);
-extern int machine_xt_pc4i_init(const machine_t *);
-extern int machine_xt_mpc1600_init(const machine_t *);
-extern int machine_xt_pcspirit_init(const machine_t *);
-extern int machine_xt_pc700_init(const machine_t *);
-extern int machine_xt_pc500_init(const machine_t *);
-extern int machine_xt_vendex_init(const machine_t *);
-extern int machine_xt_znic_init(const machine_t *);
-extern int machine_xt_glabios_init(const machine_t *);
-extern int machine_xt_super16t_init(const machine_t *);
-extern int machine_xt_super16te_init(const machine_t *);
-extern int machine_xt_top88_init(const machine_t *);
-extern int machine_xt_kaypropc_init(const machine_t *);
-extern int machine_xt_sansx16_init(const machine_t *);
-extern int machine_xt_bw230_init(const machine_t *);
-extern int machine_xt_pb8810_init(const machine_t *);
-
-extern int machine_xt_v20xt_init(const machine_t *);
-
-extern int machine_xt_iskra3104_init(const machine_t *);
-extern int machine_xt_pravetz16_imko4_init(const machine_t *);
-extern int machine_xt_micoms_xl7turbo_init(const machine_t *);
-
-/* m_xt_compaq.c */
-extern int machine_xt_compaq_deskpro_init(const machine_t *);
-extern int machine_xt_compaq_portable_init(const machine_t *);
-
-/* m_xt_laserxt.c */
-#if defined(DEV_BRANCH) && defined(USE_LASERXT)
-extern int machine_xt_laserxt_init(const machine_t *);
-extern int machine_xt_lxt3_init(const machine_t *);
+/* 8088 */
+#ifdef EMU_DEVICE_H
+extern const device_t  ibmpc_device;
 #endif
+extern int             machine_ibmpc_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  ibmpc82_device;
+#endif
+extern int             machine_ibmpc82_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  ibmxt_device;
+#endif
+extern int             machine_ibmxt_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  ibmxt86_device;
+#endif
+extern int             machine_ibmxt86_init(const machine_t *);
+extern int             machine_xt_americxt_init(const machine_t *);
+extern int             machine_xt_amixt_init(const machine_t *);
+extern int             machine_xt_ataripc3_init(const machine_t *);
+extern int             machine_xt_bw230_init(const machine_t *);
+extern int             machine_xt_mpc1600_init(const machine_t *);
+extern int             machine_xt_compaq_portable_init(const machine_t *);
+extern int             machine_xt_dtk_init(const machine_t *);
+extern int             machine_xt_pcspirit_init(const machine_t *);
+extern int             machine_genxt_init(const machine_t *);
+extern int             machine_xt_glabios_init(const machine_t *);
+extern int             machine_xt_top88_init(const machine_t *);
+extern int             machine_xt_super16t_init(const machine_t *);
+extern int             machine_xt_super16te_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  jukopc_device;
+#endif
+extern int             machine_xt_jukopc_init(const machine_t *);
+extern int             machine_xt_kaypropc_init(const machine_t *);
+extern int             machine_xt_micoms_xl7turbo_init(const machine_t *);
+extern int             machine_xt_pc500_init(const machine_t *);
+extern int             machine_xt_pc700_init(const machine_t *);
+extern int             machine_xt_pc4i_init(const machine_t *);
+extern int             machine_xt_openxt_init(const machine_t *);
+extern int             machine_xt_p3105_init(const machine_t *);
+extern int             machine_xt_pxxt_init(const machine_t *);
+extern int             machine_xt_pravetz16_imko4_init(const machine_t *);
+extern int             machine_xt_pravetz16s_cpu12p_init(const machine_t *);
+extern int             machine_xt_pb8810_init(const machine_t *);
+extern int             machine_xt_sansx16_init(const machine_t *);
+extern int             machine_xt_pcxt_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  vendex_device;
+#endif
+extern int             machine_xt_vendex_init(const machine_t *);
+extern int             machine_xt_laserxt_init(const machine_t *);
+extern int             machine_xt_znic_init(const machine_t *);
+extern int             machine_xt_z151_init(const machine_t *);
+extern int             machine_xt_z159_init(const machine_t *);
+extern int             machine_xt_z184_init(const machine_t *);
+
+/* GC100A */
+extern int             machine_xt_p3120_init(const machine_t *);
+
+/* V20 */
+extern int             machine_xt_v20xt_init(const machine_t *);
+extern int             machine_xt_tuliptc8_init(const machine_t *);
+
+/* 8086 */
+extern int             machine_xt_pc5086_init(const machine_t *);
+extern int             machine_xt_maz1016_init(const machine_t *);
+extern int             machine_xt_iskra3104_init(const machine_t *);
+extern int             machine_xt_lxt3_init(const machine_t *);
+extern int             machine_xt_compaq_deskpro_init(const machine_t *);
 
-/* m_xt_philips.c */
-extern int machine_xt_p3105_init(const machine_t *);
-extern int machine_xt_p3120_init(const machine_t *);
 /* m_xt_t1000.c */
-extern int machine_xt_t1000_init(const machine_t *);
-extern int machine_xt_t1200_init(const machine_t *);
-
-/* m_xt_zenith.c */
-extern int machine_xt_z184_init(const machine_t *);
-extern int machine_xt_z151_init(const machine_t *);
-extern int machine_xt_z159_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  t1000_video_device;
+extern const device_t  t1200_video_device;
+#endif
+extern int             machine_xt_t1000_init(const machine_t *);
+extern int             machine_xt_t1200_init(const machine_t *);
 
 /* m_xt_xi8088.c */
-extern int machine_xt_xi8088_init(const machine_t *);
+#ifdef EMU_DEVICE_H
+extern const device_t  xi8088_device;
+#endif
+extern int             machine_xt_xi8088_init(const machine_t *);
 
 #endif /*EMU_MACHINE_H*/
diff --git a/src/include/86box/machine_status.h b/src/include/86box/machine_status.h
index e7c57881b..c5640ac08 100644
--- a/src/include/86box/machine_status.h
+++ b/src/include/86box/machine_status.h
@@ -4,10 +4,13 @@
 typedef struct dev_status_empty_active_t {
     atomic_bool_t empty;
     atomic_bool_t active;
+    atomic_bool_t write_active;
+    atomic_bool_t write_prot;
 } dev_status_empty_active_t;
 
 typedef struct dev_status_active_t {
     atomic_bool_t active;
+    atomic_bool_t write_active;
 } dev_status_active_t;
 
 typedef struct dev_status_empty_t {
@@ -17,7 +20,7 @@ typedef struct dev_status_empty_t {
 typedef struct machine_status_t {
     dev_status_empty_active_t fdd[FDD_NUM];
     dev_status_empty_active_t cdrom[CDROM_NUM];
-    dev_status_empty_active_t zip[ZIP_NUM];
+    dev_status_empty_active_t rdisk[RDISK_NUM];
     dev_status_empty_active_t mo[MO_NUM];
     dev_status_empty_active_t cassette;
     dev_status_active_t       hdd[HDD_BUS_USB];
diff --git a/src/include/86box/mca.h b/src/include/86box/mca.h
index e048a6131..2d31fe33d 100644
--- a/src/include/86box/mca.h
+++ b/src/include/86box/mca.h
@@ -3,6 +3,7 @@
 
 extern void    mca_init(int nr_cards);
 extern void    mca_add(uint8_t (*read)(int addr, void *priv), void (*write)(int addr, uint8_t val, void *priv), uint8_t (*feedb)(void *priv), void (*reset)(void *priv), void *priv);
+extern void    mca_add_to_slot(uint8_t(*read)(int addr, void* priv), void (*write)(int addr, uint8_t val, void* priv), uint8_t(*feedb)(void* priv), void (*reset)(void* priv), void* priv, int c);
 extern void    mca_set_index(int index);
 extern uint8_t mca_read(uint16_t port);
 extern uint8_t mca_read_index(uint16_t port, int index);
diff --git a/src/include/86box/mem.h b/src/include/86box/mem.h
index 15afcb160..8710fca51 100644
--- a/src/include/86box/mem.h
+++ b/src/include/86box/mem.h
@@ -179,6 +179,7 @@ typedef struct _mem_mapping_ {
     uint32_t base;
     uint32_t size;
 
+    uint32_t base_ignore;
     uint32_t mask;
 
     uint8_t (*read_b)(uint32_t addr, void *priv);
@@ -264,12 +265,16 @@ extern uint32_t biosmask;
 extern uint32_t biosaddr;
 
 extern int        readlookup[256];
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
 extern uintptr_t *readlookup2;
+#endif
 extern uintptr_t  old_rl2;
 extern uint8_t    uncached;
 extern int        readlnext;
 extern int        writelookup[256];
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
 extern uintptr_t *writelookup2;
+#endif
 extern int        writelnext;
 extern uint32_t   ram_mapped_addr[64];
 extern uint8_t    page_ff[4096];
@@ -287,7 +292,16 @@ extern mem_mapping_t bios_high_mapping;
 extern uint32_t mem_logical_addr;
 
 extern page_t  *pages;
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
 extern page_t **page_lookup;
+#endif
+
+#if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
+/* The lookup tables. */
+extern page_t *page_lookup[1048576];
+extern uintptr_t readlookup2[1048576];
+extern uintptr_t writelookup2[1048576];
+#endif
 
 extern uint32_t get_phys_virt;
 extern uint32_t get_phys_phys;
@@ -299,10 +313,12 @@ extern int writelnum;
 
 extern int memspeed[11];
 
-extern int     mmu_perm;
 extern uint8_t high_page; /* if a high (> 4 gb) page was detected */
 
+extern uint8_t *_mem_exec[MEM_MAPPINGS_NO];
+
 extern uint32_t pages_sz; /* #pages in table */
+extern int      read_type;
 
 extern int mem_a20_state;
 extern int mem_a20_alt;
@@ -388,10 +404,16 @@ extern void mem_mapping_set_handler(mem_mapping_t *,
                                     void (*write_w)(uint32_t addr, uint16_t val, void *priv),
                                     void (*write_l)(uint32_t addr, uint32_t val, void *priv));
 
+extern void mem_mapping_set_write_handler(mem_mapping_t *,
+                                          void (*write_b)(uint32_t addr, uint8_t val, void *priv),
+                                          void (*write_w)(uint32_t addr, uint16_t val, void *priv),
+                                          void (*write_l)(uint32_t addr, uint32_t val, void *priv));
+
 extern void mem_mapping_set_p(mem_mapping_t *, void *priv);
 
 extern void mem_mapping_set_addr(mem_mapping_t *,
                                  uint32_t base, uint32_t size);
+extern void mem_mapping_set_base_ignore(mem_mapping_t *, uint32_t base_ignore);
 extern void mem_mapping_set_exec(mem_mapping_t *, uint8_t *exec);
 extern void mem_mapping_set_mask(mem_mapping_t *, uint32_t mask);
 extern void mem_mapping_disable(mem_mapping_t *);
@@ -438,6 +460,8 @@ extern void mem_flush_write_page(uint32_t addr, uint32_t virt);
 extern void mem_reset_page_blocks(void);
 
 extern void flushmmucache(void);
+extern void flushmmucache_write(void);
+extern void flushmmucache_pc(void);
 extern void flushmmucache_nopc(void);
 
 extern void mem_debug_check_addr(uint32_t addr, int write);
@@ -446,12 +470,21 @@ extern void mem_a20_init(void);
 extern void mem_a20_recalc(void);
 
 extern void mem_init(void);
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
+extern void mem_free(void);
+#endif
 extern void mem_close(void);
+extern void mem_zero(void);
 extern void mem_reset(void);
+extern void mem_remap_top_ex(int kb, uint32_t start);
+extern void mem_remap_top_ex_nomid(int kb, uint32_t start);
 extern void mem_remap_top(int kb);
+extern void mem_remap_top_nomid(int kb);
 
 extern void umc_smram_recalc(uint32_t start, int set);
 
+extern void pcjr_waitstates(void *);
+
 extern mem_mapping_t *read_mapping[MEM_MAPPINGS_NO];
 extern mem_mapping_t *write_mapping[MEM_MAPPINGS_NO];
 
diff --git a/src/include/86box/midi.h b/src/include/86box/midi.h
index 4bc678817..3a41c2cb5 100644
--- a/src/include/86box/midi.h
+++ b/src/include/86box/midi.h
@@ -32,6 +32,7 @@ typedef struct midi_device_t {
     void (*play_sysex)(uint8_t *sysex, unsigned int len);
     void (*play_msg)(uint8_t *msg);
     void (*poll)(void);
+    void (*reset)(void);
     int (*write)(uint8_t val);
 } midi_device_t;
 
@@ -77,6 +78,7 @@ extern void midi_raw_out_thru_rt_byte(uint8_t val);
 extern void midi_raw_out_byte(uint8_t val);
 extern void midi_clear_buffer(void);
 extern void midi_poll(void);
+extern void midi_reset(void);
 
 extern void midi_in_handler(int set, void (*msg)(void *priv, uint8_t *msg, uint32_t len), int (*sysex)(void *priv, uint8_t *buffer, uint32_t len, int abort), void *priv);
 extern void midi_in_handlers_clear(void);
@@ -102,16 +104,18 @@ extern void midi_in_sysex(uint8_t *buffer, uint32_t len);
 #ifdef EMU_DEVICE_H
 extern const device_t rtmidi_output_device;
 extern const device_t rtmidi_input_device;
+#    ifdef USE_OPL4ML
 extern const device_t opl4_midi_device;
+#    endif /* USE_OPL4ML */
 #    ifdef USE_FLUIDSYNTH
 extern const device_t fluidsynth_device;
-#    endif
+#    endif /* USE_FLUIDSYNTH */
 #    ifdef USE_MUNT
 extern const device_t mt32_old_device;
 extern const device_t mt32_new_device;
 extern const device_t cm32l_device;
 extern const device_t cm32ln_device;
-#    endif
+#    endif /* USE_MUNT */
 #endif
 
 #endif /*EMU_SOUND_MIDI_H*/
diff --git a/src/include/86box/mo.h b/src/include/86box/mo.h
index 5d4b723f3..76e7cbdbe 100644
--- a/src/include/86box/mo.h
+++ b/src/include/86box/mo.h
@@ -9,13 +9,13 @@
  *          Implementation of a generic Magneto-Optical Disk drive
  *          commands, for both ATAPI and SCSI usage.
  *
- *
- *
  * Authors: Natalia Portillo <claunia@claunia.com>
- *          Fred N. van Kempen, <decwiz@yahoo.com>
  *          Miran Grca, <mgrca8@gmail.com>
+ *          Fred N. van Kempen, <decwiz@yahoo.com>
  *
- *          Copyright 2020 Miran Grca.
+ *          Copyright 2020-2025 Natalia Portillo.
+ *          Copyright 2020-2025 Miran Grca.
+ *          Copyright 2020-2025 Fred N. van Kempen
  */
 
 #ifndef EMU_MO_H
@@ -27,7 +27,7 @@
 
 #define MO_TIME  10.0
 
-#define MO_IMAGE_HISTORY 4
+#define MO_IMAGE_HISTORY 10
 
 typedef struct mo_type_t {
     uint32_t sectors;
@@ -51,10 +51,10 @@ static const mo_type_t mo_types[KNOWN_MO_TYPES] = {
 };
 
 typedef struct mo_drive_type_t {
-    const char vendor[9];
-    const char model[16];
-    const char revision[5];
-    int8_t     supported_media[KNOWN_MO_TYPES];
+    const char *vendor;
+    const char *model;
+    const char *revision;
+    int8_t      supported_media[KNOWN_MO_TYPES];
 } mo_drive_type_t;
 
 #define KNOWN_MO_DRIVE_TYPES 22
@@ -84,105 +84,99 @@ static const mo_drive_type_t mo_drive_types[KNOWN_MO_DRIVE_TYPES] = {
 };
 
 enum {
-    MO_BUS_DISABLED = 0,
-    MO_BUS_ATAPI    = 5,
-    MO_BUS_SCSI     = 6,
-    MO_BUS_USB      = 7
+    MO_BUS_DISABLED =  0,
+    MO_BUS_LPT      =  6,
+    MO_BUS_ATAPI    =  8,
+    MO_BUS_SCSI     =  9,
+    MO_BUS_USB      = 10
 };
 
 typedef struct mo_drive_t {
-    uint8_t id;
+    uint8_t            id;
 
     union {
-        uint8_t res;
-        uint8_t res0; /* Reserved for other ID's. */
-        uint8_t res1;
-        uint8_t ide_channel;
-        uint8_t scsi_device_id;
+        uint8_t            res;
+        /* Reserved for other ID's. */
+        uint8_t            res0;
+        uint8_t            res1;
+        uint8_t            ide_channel;
+        uint8_t            scsi_device_id;
     };
 
-    uint8_t bus_type;  /* 0 = ATAPI, 1 = SCSI */
-    uint8_t bus_mode;  /* Bit 0 = PIO suported;
-                          Bit 1 = DMA supportd. */
-    uint8_t read_only; /* Struct variable reserved for
-                          media status. */
-    uint8_t pad;
-    uint8_t pad0;
+    uint8_t            bus_type;  /* 0 = ATAPI, 1 = SCSI */
+    uint8_t            bus_mode;  /* Bit 0 = PIO suported;
+                                     Bit 1 = DMA supportd. */
+    uint8_t            read_only; /* Struct variable reserved for
+                                     media status. */
+    uint8_t            pad;
+    uint8_t            pad0;
 
-    FILE *fp;
-    void *priv;
+    FILE              *fp;
+    void              *priv;
 
-    char image_path[1024];
-    char prev_image_path[1024];
+    char               image_path[1024];
+    char               prev_image_path[1024];
 
-    char *image_history[MO_IMAGE_HISTORY];
+    char              *image_history[MO_IMAGE_HISTORY];
 
-    uint32_t type;
-    uint32_t medium_size;
-    uint32_t base;
-    uint16_t sector_size;
+    uint32_t           type;
+    uint32_t           medium_size;
+    uint32_t           base;
+    uint16_t           sector_size;
 
+    int                supported;
 } mo_drive_t;
 
 typedef struct mo_t {
     mode_sense_pages_t ms_pages_saved;
 
-    mo_drive_t *drv;
+    mo_drive_t        *drv;
 #ifdef EMU_IDE_H
-    ide_tf_t *  tf;
+    ide_tf_t          *tf;
 #else
-    void *      tf;
+    void              *tf;
 #endif
 
-    uint8_t *buffer;
-    uint8_t  atapi_cdb[16];
-    uint8_t  current_cdb[16];
-    uint8_t  sense[256];
+    void *             log;
 
-#ifdef ANCIENT_CODE
-    /* Task file. */
-    uint8_t features;
-    uint8_t phase;
-    uint16_t request_length;
-    uint8_t status;
-    uint8_t error;
-    uint16_t pad;
-    uint32_t pos;
-#endif
+    uint8_t           *buffer;
+    size_t             buffer_sz;
+    uint8_t            atapi_cdb[16];
+    uint8_t            current_cdb[16];
+    uint8_t            sense[256];
 
-    uint8_t id;
-    uint8_t cur_lun;
-    uint8_t pad0;
-    uint8_t pad1;
+    uint8_t            id;
+    uint8_t            cur_lun;
+    uint8_t            pad0;
+    uint8_t            pad1;
 
-    uint16_t max_transfer_len;
-    uint16_t pad2;
+    uint16_t           max_transfer_len;
+    uint16_t           pad2;
 
-    int requested_blocks;
-    int packet_status;
-    int total_length;
-    int do_page_save;
-    int unit_attention;
-    int request_pos;
-    int old_len;
-    int pad3;
+    int                requested_blocks;
+    int                packet_status;
+    int                total_length;
+    int                do_page_save;
+    int                unit_attention;
+    int                request_pos;
+    int                old_len;
+    int                transition;
 
-    uint32_t sector_pos;
-    uint32_t sector_len;
-    uint32_t packet_len;
+    uint32_t           sector_pos;
+    uint32_t           sector_len;
+    uint32_t           packet_len;
+    uint32_t           block_len;
 
-    double callback;
+    double             callback;
+
+    uint8_t            (*ven_cmd)(void *sc, uint8_t *cdb, int32_t *BufLen);
 } mo_t;
 
-extern mo_t      *mo[MO_NUM];
-extern mo_drive_t mo_drives[MO_NUM];
-#if 0
-extern uint8_t    atapi_mo_drives[8];
-extern uint8_t    scsi_mo_drives[16];
-#endif
+extern mo_drive_t  mo_drives[MO_NUM];
 
 #define mo_sense_error dev->sense[0]
 #define mo_sense_key   dev->sense[2]
+#define mo_info        *(uint32_t *) &(dev->sense[3])
 #define mo_asc         dev->sense[12]
 #define mo_ascq        dev->sense[13]
 
@@ -190,15 +184,16 @@ extern uint8_t    scsi_mo_drives[16];
 extern "C" {
 #endif
 
-extern void mo_disk_close(mo_t *dev);
-extern void mo_disk_reload(mo_t *dev);
+extern void mo_disk_close(const mo_t *dev);
+extern void mo_disk_reload(const mo_t *dev);
 extern void mo_insert(mo_t *dev);
 
 extern void mo_global_init(void);
 extern void mo_hard_reset(void);
 
 extern void mo_reset(scsi_common_t *sc);
-extern int  mo_load(mo_t *dev, char *fn);
+extern int  mo_is_empty(const uint8_t id);
+extern void mo_load(const mo_t *dev, const char *fn, const int skip_insert);
 extern void mo_close(void);
 
 #ifdef __cplusplus
diff --git a/src/include/86box/mouse.h b/src/include/86box/mouse.h
index 786b86f41..9745de444 100644
--- a/src/include/86box/mouse.h
+++ b/src/include/86box/mouse.h
@@ -26,7 +26,7 @@
 #endif
 
 #define MOUSE_TYPE_NONE     0 /* no mouse configured */
-#define MOUSE_TYPE_INTERNAL 1 /* achine has internal mouse */
+#define MOUSE_TYPE_INTERNAL 1 /* machine has internal mouse */
 #define MOUSE_TYPE_LOGIBUS  2 /* Logitech/ATI Bus Mouse */
 #define MOUSE_TYPE_INPORT   3 /* Microsoft InPort Mouse */
 #if 0
@@ -41,7 +41,11 @@
 #define MOUSE_TYPE_PS2       11 /* PS/2 series Bus Mouse */
 #define MOUSE_TYPE_WACOM     12 /* WACOM tablet */
 #define MOUSE_TYPE_WACOMARTP 13 /* WACOM tablet (ArtPad) */
+#define MOUSE_TYPE_MSYSTEMSB 14 /* Mouse Systems bus mouse */
+#define MOUSE_TYPE_MSBPOINT  15 /* Microsoft Serial BallPoint mouse */
+#define MOUSE_TYPE_PS2_QPORT 27 /* PS/2 QuickPort series Bus Mouse */
 
+#define MOUSE_TYPE_QPORT     0x40 /* Mouse is an on-board version of one of the above. */
 #define MOUSE_TYPE_ONBOARD   0x80 /* Mouse is an on-board version of one of the above. */
 
 
@@ -50,7 +54,7 @@ extern "C" {
 #endif
 
 extern int    mouse_type;
-extern int    mouse_input_mode; /* 1 = Absolute, 0 = Relative */
+extern int    mouse_input_mode; /* 2 = Absolute (Visible Crosshair), 1 = Absolute, 0 = Relative */
 extern int    mouse_timed; /* 1 = Timed, 0 = Constant */
 extern int    mouse_tablet_in_proximity;
 extern double mouse_x_abs;
@@ -68,11 +72,18 @@ extern const device_t mouse_msinport_device;
 extern const device_t mouse_genibus_device;
 #    endif
 extern const device_t mouse_mssystems_device;
+extern const device_t mouse_mssystems_bus_device;
 extern const device_t mouse_msserial_device;
+extern const device_t mouse_msserial_ballpoint_device;
 extern const device_t mouse_ltserial_device;
 extern const device_t mouse_ps2_device;
+extern const device_t mouse_upc_device;
+extern const device_t mouse_upc_standalone_device;
+#    ifdef USE_WACOM
 extern const device_t mouse_wacom_device;
 extern const device_t mouse_wacom_artpad_device;
+#    endif
+extern const device_t mouse_mtouch_device;
 #endif
 
 extern void            mouse_clear_x(void);
@@ -97,9 +108,13 @@ extern void            mouse_scale_axis(int axis, int val);
 extern void            mouse_set_z(int z);
 extern void            mouse_clear_z(void);
 extern void            mouse_subtract_z(int *delta_z, int min, int max, int invert);
+extern void            mouse_set_w(int w);
+extern void            mouse_clear_w(void);
+extern void            mouse_subtract_w(int *delta_w, int min, int max, int invert);
 extern void            mouse_set_buttons_ex(int b);
 extern int             mouse_get_buttons_ex(void);
 extern void            mouse_set_sample_rate(double new_rate);
+extern void            mouse_update_sample_rate(void);
 extern void            mouse_set_buttons(int buttons);
 extern void            mouse_get_abs_coords(double *x_abs, double *y_abs);
 extern void            mouse_process(void);
@@ -121,6 +136,11 @@ extern void            mouse_init(void);
 
 extern void            mouse_bus_set_irq(void *priv, int irq);
 
+extern void            mouse_upc_port_handler(int num, int set, uint16_t port, void *priv);
+extern void            mouse_upc_handler(int set, uint16_t port, void *priv);
+
+extern void            mouse_upc_set_irq(int num, uint16_t irq, void *priv);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/include/86box/net_3c501.h b/src/include/86box/net_3c501.h
deleted file mode 100644
index c55151ab8..000000000
--- a/src/include/86box/net_3c501.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box Project.
- *
- *          Implementation of the following network controller:
- *            - 3Com Etherlink 3c500/3c501 (ISA 8-bit).
- *
- *
- *
- * Based on @(#)Dev3C501.cpp Oracle (VirtualBox)
- *
- * Authors: TheCollector1995, <mariogplayer@gmail.com>
- *          Oracle
- *
- *          Copyright 2022 TheCollector1995.
- *          Portions Copyright (C) 2022  Oracle and/or its affilitates.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free  Software  Foundation; either  version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is  distributed in the hope that it will be useful, but
- * WITHOUT   ANY  WARRANTY;  without  even   the  implied  warranty  of
- * MERCHANTABILITY  or FITNESS  FOR A PARTICULAR  PURPOSE. See  the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the:
- *
- *   Free Software Foundation, Inc.
- *   59 Temple Place - Suite 330
- *   Boston, MA 02111-1307
- *   USA.
- */
-#ifndef NET_3C501_H
-#define NET_3C501_H
-
-extern const device_t threec501_device;
-
-#endif /*NET_3C501_H*/
diff --git a/src/include/86box/net_3c503.h b/src/include/86box/net_3c503.h
deleted file mode 100644
index 44024850f..000000000
--- a/src/include/86box/net_3c503.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Implementation of the following network controllers:
- *            - 3Com Etherlink II 3c503 (ISA 8-bit).
- *
- *
- *
- * Based on @(#)3c503.cpp Carl (MAME)
- *
- * Authors: TheCollector1995, <mariogplayer@gmail.com>
- *          Miran Grca, <mgrca8@gmail.com>
- *          Fred N. van Kempen, <decwiz@yahoo.com>
- *          Carl, <unknown e-mail address>
- *
- *          Copyright 2018 TheCollector1995.
- *          Copyright 2018 Miran Grca.
- *          Copyright 2017-2018 Fred N. van Kempen.
- *          Portions Copyright (C) 2018  MAME Project
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free  Software  Foundation; either  version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is  distributed in the hope that it will be useful, but
- * WITHOUT   ANY  WARRANTY;  without  even   the  implied  warranty  of
- * MERCHANTABILITY  or FITNESS  FOR A PARTICULAR  PURPOSE. See  the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the:
- *
- *   Free Software Foundation, Inc.
- *   59 Temple Place - Suite 330
- *   Boston, MA 02111-1307
- *   USA.
- */
-#ifndef NET_3C503_H
-#define NET_3C503_H
-
-extern const device_t threec503_device;
-
-#endif /*NET_3C503_H*/
diff --git a/src/include/86box/net_dp8390.h b/src/include/86box/net_dp8390.h
index e9e1e6c71..0b1cc45f5 100644
--- a/src/include/86box/net_dp8390.h
+++ b/src/include/86box/net_dp8390.h
@@ -41,89 +41,89 @@ typedef struct dp8390_t {
 
     /* Command Register - 00h read/write */
     struct CR_t {
-        int     stop;      /* STP - Software Reset command */
-        int     start;     /* START - start the NIC */
-        int     tx_packet; /* TXP - initiate packet transmission */
+        bool     stop;      /* STP - Software Reset command */
+        bool     start;     /* START - start the NIC */
+        bool     tx_packet; /* TXP - initiate packet transmission */
         uint8_t rdma_cmd;  /* RD0,RD1,RD2 - Remote DMA command */
         uint8_t pgsel;     /* PS0,PS1 - Page select */
     } CR;
 
     /* Interrupt Status Register - 07h read/write */
     struct ISR_t {
-        int pkt_rx;    /* PRX - packet received with no errors */
-        int pkt_tx;    /* PTX - packet txed with no errors */
-        int rx_err;    /* RXE - packet rxed with 1 or more errors */
-        int tx_err;    /* TXE - packet txed   "  " "    "    " */
-        int overwrite; /* OVW - rx buffer resources exhausted */
-        int cnt_oflow; /* CNT - network tally counter MSB's set */
-        int rdma_done; /* RDC - remote DMA complete */
-        int reset;     /* RST - reset status */
+        bool pkt_rx;    /* PRX - packet received with no errors */
+        bool pkt_tx;    /* PTX - packet txed with no errors */
+        bool rx_err;    /* RXE - packet rxed with 1 or more errors */
+        bool tx_err;    /* TXE - packet txed   "  " "    "    " */
+        bool overwrite; /* OVW - rx buffer resources exhausted */
+        bool cnt_oflow; /* CNT - network tally counter MSB's set */
+        bool rdma_done; /* RDC - remote DMA complete */
+        bool reset;     /* RST - reset status */
     } ISR;
 
     /* Interrupt Mask Register - 0fh write */
     struct IMR_t {
-        int rx_inte;    /* PRXE - packet rx interrupt enable */
-        int tx_inte;    /* PTXE - packet tx interrput enable */
-        int rxerr_inte; /* RXEE - rx error interrupt enable */
-        int txerr_inte; /* TXEE - tx error interrupt enable */
-        int overw_inte; /* OVWE - overwrite warn int enable */
-        int cofl_inte;  /* CNTE - counter o'flow int enable */
-        int rdma_inte;  /* RDCE - remote DMA complete int enable */
-        int reserved;   /* D7 - reserved */
+        bool rx_inte;    /* PRXE - packet rx interrupt enable */
+        bool tx_inte;    /* PTXE - packet tx interrput enable */
+        bool rxerr_inte; /* RXEE - rx error interrupt enable */
+        bool txerr_inte; /* TXEE - tx error interrupt enable */
+        bool overw_inte; /* OVWE - overwrite warn int enable */
+        bool cofl_inte;  /* CNTE - counter o'flow int enable */
+        bool rdma_inte;  /* RDCE - remote DMA complete int enable */
+        bool reserved;   /* D7 - reserved */
     } IMR;
 
     /* Data Configuration Register - 0eh write */
     struct DCR_t {
-        int     wdsize;    /* WTS - 8/16-bit select */
-        int     endian;    /* BOS - byte-order select */
-        int     longaddr;  /* LAS - long-address select */
-        int     loop;      /* LS  - loopback select */
-        int     auto_rx;   /* AR  - auto-remove rx pkts with remote DMA */
+        bool     wdsize;    /* WTS - 8/16-bit select */
+        bool     endian;    /* BOS - byte-order select */
+        bool     longaddr;  /* LAS - long-address select */
+        bool     loop;      /* LS  - loopback select */
+        bool     auto_rx;   /* AR  - auto-remove rx pkts with remote DMA */
         uint8_t fifo_size; /* FT0,FT1 - fifo threshold */
     } DCR;
 
     /* Transmit Configuration Register - 0dh write */
     struct TCR_t {
-        int     crc_disable; /* CRC - inhibit tx CRC */
+        bool     crc_disable; /* CRC - inhibit tx CRC */
         uint8_t loop_cntl;   /* LB0,LB1 - loopback control */
-        int     ext_stoptx;  /* ATD - allow tx disable by external mcast */
-        int     coll_prio;   /* OFST - backoff algorithm select */
+        bool     ext_stoptx;  /* ATD - allow tx disable by external mcast */
+        bool     coll_prio;   /* OFST - backoff algorithm select */
         uint8_t reserved;    /* D5,D6,D7 - reserved */
     } TCR;
 
     /* Transmit Status Register - 04h read */
     struct TSR_t {
-        int tx_ok;      /* PTX - tx complete without error */
-        int reserved;   /*  D1 - reserved */
-        int collided;   /* COL - tx collided >= 1 times */
-        int aborted;    /* ABT - aborted due to excessive collisions */
-        int no_carrier; /* CRS - carrier-sense lost */
-        int fifo_ur;    /* FU  - FIFO underrun */
-        int cd_hbeat;   /* CDH - no tx cd-heartbeat from transceiver */
-        int ow_coll;    /* OWC - out-of-window collision */
+        bool tx_ok;      /* PTX - tx complete without error */
+        bool reserved;   /*  D1 - reserved */
+        bool collided;   /* COL - tx collided >= 1 times */
+        bool aborted;    /* ABT - aborted due to excessive collisions */
+        bool no_carrier; /* CRS - carrier-sense lost */
+        bool fifo_ur;    /* FU  - FIFO underrun */
+        bool cd_hbeat;   /* CDH - no tx cd-heartbeat from transceiver */
+        bool ow_coll;    /* OWC - out-of-window collision */
     } TSR;
 
     /* Receive Configuration Register - 0ch write */
     struct RCR_t {
-        int     errors_ok; /* SEP - accept pkts with rx errors */
-        int     runts_ok;  /* AR  - accept < 64-byte runts */
-        int     broadcast; /* AB  - accept eth broadcast address */
-        int     multicast; /* AM  - check mcast hash array */
-        int     promisc;   /* PRO - accept all packets */
-        int     monitor;   /* MON - check pkts, but don't rx */
+        bool     errors_ok; /* SEP - accept pkts with rx errors */
+        bool     runts_ok;  /* AR  - accept < 64-byte runts */
+        bool     broadcast; /* AB  - accept eth broadcast address */
+        bool     multicast; /* AM  - check mcast hash array */
+        bool     promisc;   /* PRO - accept all packets */
+        bool     monitor;   /* MON - check pkts, but don't rx */
         uint8_t reserved;  /* D6,D7 - reserved */
     } RCR;
 
     /* Receive Status Register - 0ch read */
     struct RSR_t {
-        int rx_ok;       /* PRX - rx complete without error */
-        int bad_crc;     /* CRC - Bad CRC detected */
-        int bad_falign;  /* FAE - frame alignment error */
-        int fifo_or;     /* FO  - FIFO overrun */
-        int rx_missed;   /* MPA - missed packet error */
-        int rx_mbit;     /* PHY - unicast or mcast/bcast address match */
-        int rx_disabled; /* DIS - set when in monitor mode */
-        int deferred;    /* DFR - collision active */
+        bool rx_ok;       /* PRX - rx complete without error */
+        bool bad_crc;     /* CRC - Bad CRC detected */
+        bool bad_falign;  /* FAE - frame alignment error */
+        bool fifo_or;     /* FO  - FIFO overrun */
+        bool rx_missed;   /* MPA - missed packet error */
+        bool rx_mbit;     /* PHY - unicast or mcast/bcast address match */
+        bool rx_disabled; /* DIS - set when in monitor mode */
+        bool deferred;    /* DFR - collision active */
     } RSR;
 
     uint16_t local_dma;     /* 01,02h read ; current local DMA addr */
@@ -171,6 +171,8 @@ typedef struct dp8390_t {
     /* DP8390 memory */
     uint8_t *mem; /* on-chip packet memory */
 
+    uint8_t sink_buffer[4096];
+
     uint8_t macaddr[32];  /* ASIC ROM'd MAC address, even bytes */
     uint8_t macaddr_size, /* Defaults to 16 but can be 32 */
         flags,            /* Flags affecting some behaviors. */
diff --git a/src/include/86box/net_ne2000.h b/src/include/86box/net_ne2000.h
index 350668ccb..ecf2612b5 100644
--- a/src/include/86box/net_ne2000.h
+++ b/src/include/86box/net_ne2000.h
@@ -37,18 +37,17 @@
 #define NET_NE2000_H
 
 enum {
-    NE2K_NONE         = 0,
-    NE2K_NE1000       = 1, /* 8-bit ISA NE1000 */
-    NE2K_NE2000       = 2, /* 16-bit ISA NE2000 */
-    NE2K_ETHERNEXT_MC = 3, /* 16-bit MCA EtherNext/MC */
-    NE2K_RTL8019AS    = 4, /* 16-bit ISA PnP Realtek 8019AS */
-    NE2K_RTL8029AS    = 5  /* 32-bit PCI Realtek 8029AS */
+    NE2K_NONE               = 0,
+    NE2K_NE1000             = 1, /* 8-bit ISA NE1000 */
+    NE2K_NE1000_COMPAT      = 2, /* 8-bit ISA NE1000-Compatible */
+    NE2K_NE2000             = 3, /* 16-bit ISA NE2000 */
+    NE2K_NE2000_COMPAT      = 4, /* 16-bit ISA NE2000-Compatible */
+    NE2K_NE2000_COMPAT_8BIT = 5, /* 8-bit ISA NE2000-Compatible, like: https://github.com/skiselev/isa8_eth */
+    NE2K_ETHERNEXT_MC       = 6, /* 16-bit MCA EtherNext/MC */
+    NE2K_RTL8019AS_PNP      = 7, /* 16-bit ISA PnP Realtek 8019AS */
+    NE2K_DE220P             = 8, /* 16-bit ISA PnP D-Link DE-220P */
+    NE2K_RTL8029AS          = 9, /* 32-bit PCI Realtek 8029AS */
+    /* Check nic_init() if adding items after this point. */
 };
 
-extern const device_t ne1000_device;
-extern const device_t ne2000_device;
-extern const device_t ethernext_mc_device;
-extern const device_t rtl8019as_device;
-extern const device_t rtl8029as_device;
-
 #endif /*NET_NE2000_H*/
diff --git a/src/include/86box/net_pcnet.h b/src/include/86box/net_pcnet.h
index 23ee643ed..994d88c75 100644
--- a/src/include/86box/net_pcnet.h
+++ b/src/include/86box/net_pcnet.h
@@ -30,12 +30,4 @@ enum {
     DEV_AM79C973     = 6  /* PCnet-FAST III (PCI, 10/100 Mbps) */
 };
 
-extern const device_t pcnet_am79c960_device;
-extern const device_t pcnet_am79c960_eb_device;
-extern const device_t pcnet_am79c960_vlb_device;
-extern const device_t pcnet_am79c961_device;
-extern const device_t pcnet_am79c970a_device;
-extern const device_t pcnet_am79c973_device;
-extern const device_t pcnet_am79c973_onboard_device;
-
 #endif /*NET_PCNET_H*/
diff --git a/src/include/86box/net_plip.h b/src/include/86box/net_plip.h
deleted file mode 100644
index 83c33e4c6..000000000
--- a/src/include/86box/net_plip.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Definitions for the PLIP parallel port network device.
- *
- *
- *
- * Authors: RichardG, <richardg867@gmail.com>
- *
- *          Copyright 2020 RichardG.
- */
-
-#ifndef NET_PLIP_H
-#define NET_PLIP_H
-#include <86box/device.h>
-#include <86box/lpt.h>
-
-extern const lpt_device_t lpt_plip_device;
-extern const device_t     plip_device;
-
-#endif /*NET_PLIP_H*/
diff --git a/src/include/86box/net_rtl8139.h b/src/include/86box/net_rtl8139.h
deleted file mode 100644
index f44d0facb..000000000
--- a/src/include/86box/net_rtl8139.h
+++ /dev/null
@@ -1 +0,0 @@
-extern const device_t rtl8139c_plus_device;
diff --git a/src/include/86box/net_tulip.h b/src/include/86box/net_tulip.h
deleted file mode 100644
index 2ee7ec3c1..000000000
--- a/src/include/86box/net_tulip.h
+++ /dev/null
@@ -1,4 +0,0 @@
-extern const device_t dec_tulip_device;
-extern const device_t dec_tulip_21140_device;
-extern const device_t dec_tulip_21140_vpc_device;
-extern const device_t dec_tulip_21040_device;
diff --git a/src/include/86box/net_wd8003.h b/src/include/86box/net_wd8003.h
index 726510cdb..6797c7d88 100644
--- a/src/include/86box/net_wd8003.h
+++ b/src/include/86box/net_wd8003.h
@@ -54,11 +54,4 @@ enum {
     WD8013EPA = 6
 };
 
-extern const device_t wd8003e_device;
-extern const device_t wd8003eb_device;
-extern const device_t wd8013ebt_device;
-extern const device_t wd8003eta_device;
-extern const device_t wd8003ea_device;
-extern const device_t wd8013epa_device;
-
 #endif /*NET_WD8003_H*/
diff --git a/src/include/86box/network.h b/src/include/86box/network.h
index e9b703ee0..5a6651b5b 100644
--- a/src/include/86box/network.h
+++ b/src/include/86box/network.h
@@ -48,16 +48,19 @@
 #include <stdint.h>
 
 /* Network provider types. */
-#define NET_TYPE_NONE  0 /* use the null network driver */
-#define NET_TYPE_SLIRP 1 /* use the SLiRP port forwarder */
-#define NET_TYPE_PCAP  2 /* use the (Win)Pcap API */
-#define NET_TYPE_VDE   3 /* use the VDE plug API */
+#define NET_TYPE_NONE     0 /* use the null network driver */
+#define NET_TYPE_SLIRP    1 /* use the SLiRP port forwarder */
+#define NET_TYPE_PCAP     2 /* use the (Win)Pcap API */
+#define NET_TYPE_VDE      3 /* use the VDE plug API */
+#define NET_TYPE_TAP      4 /* use a linux TAP device */
+#define NET_TYPE_NMSWITCH 5 /* use the network multicast switch provider */
+#define NET_TYPE_NRSWITCH 6 /* use the network remote switch provider */
 
 #define NET_MAX_FRAME  1518
 /* Queue size must be a power of 2 */
 #define NET_QUEUE_LEN      16
 #define NET_QUEUE_LEN_MASK (NET_QUEUE_LEN - 1)
-#define NET_QUEUE_COUNT 3
+#define NET_QUEUE_COUNT    4
 #define NET_CARD_MAX       4
 #define NET_HOST_INTF_MAX  64
 
@@ -84,9 +87,10 @@ enum {
 };
 
 enum {
-    NET_QUEUE_RX      = 0,
-    NET_QUEUE_TX_VM   = 1,
-    NET_QUEUE_TX_HOST = 2
+    NET_QUEUE_RX       = 0,
+    NET_QUEUE_TX_VM    = 1,
+    NET_QUEUE_TX_HOST  = 2,
+    NET_QUEUE_RX_ON_TX = 3
 };
 
 typedef struct netcard_conf_t {
@@ -94,10 +98,14 @@ typedef struct netcard_conf_t {
     int      net_type;
     char     host_dev_name[128];
     uint32_t link_state;
+    uint8_t  switch_group;
+    uint8_t  promisc_mode;
+    char     nrs_hostname[128];
 } netcard_conf_t;
 
 extern netcard_conf_t net_cards_conf[NET_CARD_MAX];
 extern uint16_t       net_card_current;
+extern int            slirp_card_num;
 
 typedef int (*NETRXCB)(void *, uint8_t *, int);
 typedef int (*NETSETLINKSTATE)(void *, uint32_t link_state);
@@ -125,7 +133,9 @@ typedef struct netdrv_t {
 extern const netdrv_t net_pcap_drv;
 extern const netdrv_t net_slirp_drv;
 extern const netdrv_t net_vde_drv;
+extern const netdrv_t net_tap_drv;
 extern const netdrv_t net_null_drv;
+extern const netdrv_t net_netswitch_drv;
 
 struct _netcard_t {
     const device_t *device;
@@ -154,10 +164,11 @@ typedef struct {
     int has_slirp;
     int has_pcap;
     int has_vde;
+    int has_tap;
 } network_devmap_t;
 
 
-#define HAS_NOSLIRP_NET(x)  (x.has_pcap || x.has_vde)
+#define HAS_NOSLIRP_NET(x)  (x.has_pcap || x.has_vde || x.has_tap)
 
 #ifdef __cplusplus
 extern "C" {
@@ -190,14 +201,73 @@ extern int             network_dev_available(int);
 extern int             network_dev_to_id(char *);
 extern int             network_card_available(int);
 extern int             network_card_has_config(int);
+extern int             network_type_has_config(int);
 extern const char     *network_card_get_internal_name(int);
 extern int             network_card_get_from_internal_name(char *);
+#ifdef EMU_DEVICE_H
 extern const device_t *network_card_getdevice(int);
+#endif
 
 extern int network_tx_pop(netcard_t *card, netpkt_t *out_pkt);
 extern int network_tx_popv(netcard_t *card, netpkt_t *pkt_vec, int vec_size);
 extern int network_rx_put(netcard_t *card, uint8_t *bufp, int len);
+extern int network_rx_on_tx_popv(netcard_t *card, netpkt_t *pkt_vec, int vec_size);
+extern int network_rx_on_tx_put(netcard_t *card, uint8_t *bufp, int len);
 extern int network_rx_put_pkt(netcard_t *card, netpkt_t *pkt);
+extern int network_rx_on_tx_put_pkt(netcard_t *card, netpkt_t *pkt);
+
+#ifdef EMU_DEVICE_H
+/* 3Com Etherlink */
+extern const device_t threec501_device;
+extern const device_t threec503_device;
+
+/* Novell NE2000 and compatibles */
+extern const device_t ne1000_device;
+extern const device_t ne1000_compat_device;
+extern const device_t ne2000_device;
+extern const device_t ne2000_compat_device;
+extern const device_t ne2000_compat_8bit_device;
+extern const device_t ethernext_mc_device;
+extern const device_t rtl8019as_pnp_device;
+extern const device_t de220p_device;
+extern const device_t rtl8029as_device;
+
+/* AMD PCnet*/
+extern const device_t pcnet_am79c960_device;
+extern const device_t pcnet_am79c960_eb_device;
+extern const device_t pcnet_am79c960_vlb_device;
+extern const device_t pcnet_am79c961_device;
+extern const device_t pcnet_am79c970a_device;
+extern const device_t pcnet_am79c973_device;
+extern const device_t pcnet_am79c973_onboard_device;
+
+/* Modem */
+extern const device_t modem_device;
+
+/* PLIP */
+#ifdef EMU_LPT_H
+extern const lpt_device_t lpt_plip_device;
+#endif
+extern const device_t     plip_device;
+
+/* Realtek RTL8139C+ */
+extern const device_t rtl8139c_plus_device;
+
+/* DEC Tulip */
+extern const device_t dec_tulip_device;
+extern const device_t dec_tulip_21140_device;
+extern const device_t dec_tulip_21140_vpc_device;
+extern const device_t dec_tulip_21040_device;
+
+/* WD 80x3 */
+extern const device_t wd8003e_device;
+extern const device_t wd8003eb_device;
+extern const device_t wd8013ebt_device;
+extern const device_t wd8003eta_device;
+extern const device_t wd8003ea_device;
+extern const device_t wd8013epa_device;
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/include/86box/net_eeprom_nmc93cxx.h b/src/include/86box/nmc93cxx.h
similarity index 72%
rename from src/include/86box/net_eeprom_nmc93cxx.h
rename to src/include/86box/nmc93cxx.h
index f5260d1ed..7573a6116 100644
--- a/src/include/86box/net_eeprom_nmc93cxx.h
+++ b/src/include/86box/nmc93cxx.h
@@ -1,5 +1,11 @@
-struct nmc93cxx_eeprom_t;
-typedef struct nmc93cxx_eeprom_t nmc93cxx_eeprom_t;
+#include <86box/vid_ati_eeprom.h>
+
+typedef struct nmc93cxx_eeprom_t {
+    ati_eeprom_t dev;
+    uint8_t  addrbits;
+    uint16_t size;
+    char     filename[1024];
+} nmc93cxx_eeprom_t;
 
 typedef struct nmc93cxx_eeprom_params_t {
     uint16_t  nwords;
diff --git a/src/include/86box/novell_cardkey.h b/src/include/86box/novell_cardkey.h
new file mode 100644
index 000000000..8ad3eabab
--- /dev/null
+++ b/src/include/86box/novell_cardkey.h
@@ -0,0 +1,37 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the Novell NetWare 2.x Key Card, which
+ *          was used for anti-piracy protection.
+ *
+ *
+ * Authors: Cacodemon345
+ *
+ *          Copyright 2024 Cacodemon345.
+ */
+#ifndef NOVELL_KEYCARD_H
+#define NOVELL_KEYCARD_H
+
+/* I/O port range used. */
+#define NOVELL_KEYCARD_ADDR    0x23a
+#define NOVELL_KEYCARD_ADDRLEN 6
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Global variables. */
+extern const device_t novell_keycard_device;
+
+/* Functions. */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*BUGGER_H*/
\ No newline at end of file
diff --git a/src/include/86box/nv/vid_nv_rivatimer.h b/src/include/86box/nv/vid_nv_rivatimer.h
new file mode 100644
index 000000000..59f6cfebf
--- /dev/null
+++ b/src/include/86box/nv/vid_nv_rivatimer.h
@@ -0,0 +1,84 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Fast, high-frequency, guest CPU-independent timer for Riva emulation.
+ *
+ *
+ * Authors: Connor Hyde, <mario64crashed@gmail.com> I need a better email address ;^)
+ *
+ *          Copyright 2024-2025 starfrost
+ */
+
+/*
+RivaTimer
+
+This is a fast, high-frequency, guest CPU-independent timer.
+
+The main 86box timer is dependent on the TSC (time-stamp counter) register of the emulated CPU core.
+This is fine for most purposes and has advantages in the fields of synchronisation and integrates neatly with 
+the clock dividers of the PC architecture, but in the case of the RIVA 128 it does not particularly suffice 
+(although it can be made to work with various techniques) since the clock source on the RIVA 128 is on the board itself
+and the GPU has several different clocks that control different parts of the GPU (e.g., PTIMER runs on the memory clock but the core gpu is using the pixel clock).
+
+As faster graphics cards that offload more and more of the 3D graphics pipeline are emulated in the future, more and more work needs to be done by the emulator and 
+issues of synchronisation with a host CPU will simply make that work harder. Some features that are required for 
+
+Architecture    Brand Name      3D Features
+NV1 (1995)      NV1             Some weird URBS rectangle crap but feature set generally similar to nv3 but a bit worse
+NV3 (1997)      RIVA 128 (ZX)   Triangle setup, edge-slope calculations, edge interpolation, span-slope calculations, span interpolation (Color-buffer, z-buffer, texture mapping, filtering)
+NV4 (1998)      RIVA TNT        NV3 + 2x1 pixel pipelines + 32-bit colour + larger textures + trilinear + more ram (16mb)
+NV5 (1999)      RIVA TNT2       NV4 + higher clock speed
+NV10 (1999)     GeForce 256     NV5 + initial geometry transformation + lighting (8x lights) + MPEG-2 motion compensation + 4x1 pixel pipelines
+NV15 (2000)     GeForce 2       NV10 + First attempt at programmability + 4x2 pixel pipelines
+NV20 (2001)     GeForce 3       Programmable shaders!
+
+As you can see, the performance basically exponentially increases over a period of only 4 years. 
+
+So I decided to create this timer that is completely separate from the CPU Core.
+*/
+
+#pragma once
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <86box/86box.h>
+
+#ifdef _WIN32     
+#include <Windows.h>
+// Linux & MacOS should have the same API since OSX 10.12 
+#else
+#include <time.h>
+#endif
+
+typedef struct rivatimer_s
+{
+    struct rivatimer_s*     prev;           // Previous Rivatimer
+    double                  period;         // Period in uS before firing
+    double                  value;          // The current value of the rivatimer
+    bool                    running;        // Is this RivaTimer running?
+    struct rivatimer_s*     next;           // Next RivaTimer
+    void                    (*callback)(double real_time);  // Callback to call on fire
+    #ifdef _WIN32
+    LARGE_INTEGER           starting_time;  // Starting time.
+    #else
+    struct timespec         starting_time;  // Starting time.
+    #endif
+    double                  time;           // Accumulated time in uS.
+} rivatimer_t;
+
+void rivatimer_init(void);                                              // Initialise the Rivatimer.
+rivatimer_t* rivatimer_create(double period, void (*callback)(double real_time));
+void rivatimer_destroy(rivatimer_t* rivatimer_ptr);
+
+void rivatimer_update_all(void);
+void rivatimer_start(rivatimer_t* rivatimer_ptr);
+void rivatimer_stop(rivatimer_t* rivatimer_ptr);
+double rivatimer_get_time(rivatimer_t* rivatimer_ptr);
+void rivatimer_set_callback(rivatimer_t* rivatimer_ptr, void (*callback)(double real_time));
+void rivatimer_set_period(rivatimer_t* rivatimer_ptr, double period);
diff --git a/src/include/86box/nvr.h b/src/include/86box/nvr.h
index d24ca903c..273fc0a37 100644
--- a/src/include/86box/nvr.h
+++ b/src/include/86box/nvr.h
@@ -60,6 +60,7 @@
 #define TIME_SYNC_ENABLED  1
 #define TIME_SYNC_UTC      2
 
+#ifdef _TIMER_H_
 /* Define a generic RTC/NVRAM device. */
 typedef struct _nvr_ {
     char    *fn;   /* pathname of image file */
@@ -98,14 +99,13 @@ extern const device_t ami_1994_nvr_device;
 extern const device_t ami_1995_nvr_device;
 extern const device_t via_nvr_device;
 extern const device_t p6rp4_nvr_device;
+extern const device_t martin_nvr_device;
 extern const device_t elt_nvr_device;
 #endif
 
 extern void rtc_tick(void);
 
 extern void  nvr_init(nvr_t *);
-extern char *nvr_path(char *str);
-extern FILE *nvr_fopen(char *str, char *mode);
 extern int   nvr_load(void);
 extern void  nvr_close(void);
 extern void  nvr_set_ven_save(void (*ven_save)(void));
@@ -114,14 +114,16 @@ extern int   nvr_save(void);
 extern int  nvr_is_leap(int year);
 extern int  nvr_get_days(int month, int year);
 extern void nvr_time_sync(void);
-extern void nvr_time_get(struct tm *);
-extern void nvr_time_set(struct tm *);
+extern void nvr_time_get(void *priv);
+extern void nvr_time_set(void *priv);
 
 extern void nvr_reg_write(uint16_t reg, uint8_t val, void *priv);
 extern void nvr_at_handler(int set, uint16_t base, nvr_t *nvr);
 extern void nvr_at_sec_handler(int set, uint16_t base, nvr_t *nvr);
 extern void nvr_at_index_read_handler(int set, uint16_t base, nvr_t *nvr);
 extern void nvr_read_addr_set(int set, nvr_t *nvr);
+extern uint8_t nvr_get_index(void *priv, uint8_t addr_id);
+extern void nvr_at_data_port(int set, nvr_t *nvr);
 extern void nvr_wp_set(int set, int h, nvr_t *nvr);
 extern void nvr_via_wp_set(int set, int reg, nvr_t *nvr);
 extern void nvr_bank_set(int base, uint8_t bank, nvr_t *nvr);
@@ -130,5 +132,9 @@ extern void nvr_irq_set(int irq, nvr_t *nvr);
 extern void nvr_smi_enable(int enable, nvr_t *nvr);
 extern uint8_t nvr_smi_status(nvr_t *nvr);
 extern void nvr_smi_status_clear(nvr_t *nvr);
+#endif
+
+extern char *nvr_path(char *str);
+extern FILE *nvr_fopen(char *str, char *mode);
 
 #endif /*EMU_NVR_H*/
diff --git a/src/include/86box/pci.h b/src/include/86box/pci.h
index 2bcb6b3b8..8887f89f4 100644
--- a/src/include/86box/pci.h
+++ b/src/include/86box/pci.h
@@ -110,11 +110,17 @@
 #define PCI_CARD_MAX              (PCI_CARDS_NUM - 1)
 /* The number of PCI card INT pins - always at 4 per the PCI specification. */
 #define PCI_INT_PINS_NUM          4
+#define PCI_INT_PINS_MAX          (PCI_INT_PINS_NUM - 1)
 /* The base for MIRQ lines accepted by pci_irq(). */
 #define PCI_MIRQ_BASE             PCI_CARDS_NUM
 /* PCI MIRQ lines (currently 8, this many are needed by the ALi M1543(C). */
 #define PCI_MIRQS_NUM             8
 #define PCI_MIRQ_MAX              (PCI_MIRQS_NUM - 1)
+/* The base for internal IRQ lines accepted by pci_irq(). */
+#define PCI_IIRQ_BASE             0x80
+/* PCI direct IRQ lines - always at 4 per the PCI specification. */
+#define PCI_IIRQS_NUM             4
+#define PCI_IIRQ_MAX              (PCI_IIRQS_NUM - 1)
 /* The base for direct IRQ lines accepted by pci_irq(). */
 #define PCI_DIRQ_BASE             0xf0
 /* PCI direct IRQ lines (currently 16 because we only emulate the legacy PIC). */
@@ -148,12 +154,16 @@
 
 #define pci_set_mirq(mirq, level, irq_state) \
         pci_irq(PCI_MIRQ_BASE | (mirq), 0, level, 1, irq_state)
+#define pci_set_iirq(pci_int, irq_state) \
+        pci_irq(PCI_IIRQ_BASE | (pci_int), 0, 0, 1, irq_state)
 #define pci_set_dirq(irq, irq_state) \
         pci_irq(PCI_DIRQ_BASE | (irq), 0, 1, 1, irq_state)
 #define pci_set_irq(slot, pci_int, irq_state) \
         pci_irq(slot, pci_int, 0, 1, irq_state)
 #define pci_clear_mirq(mirq, level, irq_state) \
         pci_irq(PCI_MIRQ_BASE | (mirq), 0, level, 0, irq_state)
+#define pci_clear_iirq(pci_int, irq_state) \
+        pci_irq(PCI_IIRQ_BASE | (pci_int), 0, 0, 0, irq_state)
 #define pci_clear_dirq(dirq, irq_state) \
         pci_irq(PCI_DIRQ_BASE | (irq), 0, 1, 0, irq_state)
 #define pci_clear_irq(slot, pci_int, irq_state) \
@@ -273,9 +283,11 @@ extern void        pci_init(int flags);
 
 /* PCI bridge stuff. */
 extern void        pci_bridge_set_ctl(void *priv, uint8_t ctl);
+extern uint8_t     pci_bridge_get_bus_index(void *priv);
 
 #ifdef EMU_DEVICE_H
 extern const device_t dec21150_device;
+extern const device_t dec21152_device;
 
 extern const device_t ali5243_agp_device;
 extern const device_t ali5247_agp_device;
@@ -286,6 +298,7 @@ extern const device_t via_vp3_agp_device;
 extern const device_t via_mvp3_agp_device;
 extern const device_t via_apro_agp_device;
 extern const device_t via_vt8601_agp_device;
+extern const device_t sis_5xxx_agp_device;
 #endif
 
 #endif /*EMU_PCI_H*/
diff --git a/src/include/86box/pic.h b/src/include/86box/pic.h
index 881328889..658222b7f 100644
--- a/src/include/86box/pic.h
+++ b/src/include/86box/pic.h
@@ -106,4 +106,6 @@ extern int     picinterrupt(void);
 
 extern uint8_t pic_irq_ack(void);
 
+extern void    pic_toggle_latch(int is_ps2);
+
 #endif /*EMU_PIC_H*/
diff --git a/src/include/86box/pit.h b/src/include/86box/pit.h
index 481cc6051..3a747b878 100644
--- a/src/include/86box/pit.h
+++ b/src/include/86box/pit.h
@@ -19,6 +19,8 @@
 #ifndef EMU_PIT_H
 #define EMU_PIT_H
 
+#define NUM_COUNTERS 3
+
 typedef struct ctr_t {
     uint8_t m;
     uint8_t ctrl;
@@ -42,6 +44,7 @@ typedef struct ctr_t {
     int state;
     int null_count;
     int do_read_status;
+    int enable;
 
     union {
         int32_t count;
@@ -55,9 +58,11 @@ typedef struct ctr_t {
     };
 
     uint32_t l;
+    uint32_t lback;
+    uint32_t lback2;
 
     void (*load_func)(uint8_t new_m, int new_count);
-    void (*out_func)(int new_out, int old_out);
+    void (*out_func)(int new_out, int old_out, void *priv);
 } ctr_t;
 
 typedef struct PIT {
@@ -65,11 +70,17 @@ typedef struct PIT {
     int        clock;
     pc_timer_t callback_timer;
 
-    ctr_t counters[3];
+    ctr_t counters[NUM_COUNTERS];
 
     uint8_t ctrl;
+
+    uint64_t   pit_const;
+
+    void *dev_priv;
 } pit_t;
 
+extern pit_t *ext_pit;
+
 enum {
     PIT_8253      = 0,
     PIT_8254      = 1,
@@ -87,10 +98,11 @@ typedef struct pit_intf_t {
     /* Sets if a counter's CLOCK input is from the timer or not - used by PCjr. */
     void (*set_using_timer)(void *data, int counter_id, int using_timer);
     /* Sets a counter's OUT output handler. */
-    void (*set_out_func)(void *data, int counter_id, void (*func)(int new_out, int old_out));
+    void (*set_out_func)(void *data, int counter_id, void (*func)(int new_out, int old_out, void *priv));
     /* Sets a counter's load count handler. */
     void (*set_load_func)(void *data, int counter_id, void (*func)(uint8_t new_m, int new_count));
     void (*ctr_clock)(void *data, int counter_id);
+    void (*set_pit_const)(void *data, uint64_t pit_const);
     void *data;
 } pit_intf_t;
 
@@ -102,6 +114,9 @@ extern double PCICLK;
 extern double AGPCLK;
 
 extern uint64_t PITCONST;
+extern uint64_t PAS16CONST;
+extern uint64_t PAS16CONST2;
+extern uint64_t PASSCSICONST;
 extern uint64_t ISACONST;
 extern uint64_t CGACONST;
 extern uint64_t MDACONST;
@@ -112,21 +127,35 @@ extern uint64_t RTCCONST;
 
 extern int refresh_at_enable;
 
-/* Sets a counter's CLOCK input. */
-extern void pit_ctr_set_clock(ctr_t *ctr, int clock);
+extern void pit_device_reset(pit_t *dev);
 
-extern pit_t *pit_common_init(int type, void (*out0)(int new_out, int old_out), void (*out1)(int new_out, int old_out));
+extern void pit_change_pas16_consts(double prescale);
+
+extern void pit_set_pit_const(void *data, uint64_t pit_const);
+
+extern void ctr_clock(void *data, int counter_id);
+
+/* Sets a counter's CLOCK input. */
+extern void pit_ctr_set_clock(ctr_t *ctr, int clock, void *priv);
+
+extern void pit_ctr_set_gate(void *data, int counter_id, int gate);
+
+extern void pit_ctr_set_out_func(void *data, int counter_id, void (*func)(int new_out, int old_out, void *priv));
+
+extern void pit_ctr_set_using_timer(void *data, int counter_id, int using_timer);
+
+extern pit_t *pit_common_init(int type, void (*out0)(int new_out, int old_out, void *priv), void (*out1)(int new_out, int old_out, void *priv));
 extern pit_t *pit_ps2_init(int type);
 extern void   pit_reset(pit_t *dev);
 
-extern void pit_irq0_timer_ps2(int new_out, int old_out);
+extern void pit_irq0_timer_ps2(int new_out, int old_out, void *priv);
 
-extern void pit_refresh_timer_xt(int new_out, int old_out);
-extern void pit_refresh_timer_at(int new_out, int old_out);
+extern void pit_refresh_timer_xt(int new_out, int old_out, void *priv);
+extern void pit_refresh_timer_at(int new_out, int old_out, void *priv);
 
-extern void pit_speaker_timer(int new_out, int old_out);
+extern void pit_speaker_timer(int new_out, int old_out, void *priv);
 
-extern void pit_nmi_timer_ps2(int new_out, int old_out);
+extern void pit_nmi_timer_ps2(int new_out, int old_out, void *priv);
 
 extern void pit_set_clock(uint32_t clock);
 extern void pit_handler(int set, uint16_t base, int size, void *priv);
@@ -136,6 +165,7 @@ extern uint8_t pit_read_reg(void *priv, uint8_t reg);
 #ifdef EMU_DEVICE_H
 extern const device_t i8253_device;
 extern const device_t i8253_pc98_device;
+extern const device_t i8253_ext_io_device;
 extern const device_t i8254_device;
 extern const device_t i8254_sec_device;
 extern const device_t i8254_ext_io_device;
diff --git a/src/include/86box/pit_fast.h b/src/include/86box/pit_fast.h
index f5d94192d..f35adef8f 100644
--- a/src/include/86box/pit_fast.h
+++ b/src/include/86box/pit_fast.h
@@ -56,19 +56,37 @@ typedef struct ctrf_t {
     };
 
     uint32_t   l;
+
+    uint64_t   pit_const;
+
     pc_timer_t timer;
 
     void (*load_func)(uint8_t new_m, int new_count);
-    void (*out_func)(int new_out, int old_out);
+    void (*out_func)(int new_out, int old_out, void *priv);
+    void *priv;
 } ctrf_t;
 
 typedef struct pitf_t {
     int    flags;
-    ctrf_t counters[3];
+    ctrf_t counters[NUM_COUNTERS];
 
     uint8_t ctrl;
+
+    void *dev_priv;
 } pitf_t;
 
+extern void pitf_set_pit_const(void *data, uint64_t pit_const);
+
+extern void pitf_handler(int set, uint16_t base, int size, void *priv);
+
+extern void pitf_ctr_set_out_func(void *data, int counter_id, void (*func)(int new_out, int old_out, void *priv));
+
+extern void pitf_ctr_set_using_timer(void *data, int counter_id, int using_timer);
+
+extern void pitf_ctr_set_gate(void *data, int counter_id, int gate);
+
+extern void pitf_ctr_clock(void *data, int counter_id);
+
 extern uint8_t pitf_read_reg(void *priv, uint8_t reg);
 
 extern const pit_intf_t pit_fast_intf;
diff --git a/src/include/86box/plat.h b/src/include/86box/plat.h
index 1f5f2b695..552b074f7 100644
--- a/src/include/86box/plat.h
+++ b/src/include/86box/plat.h
@@ -30,7 +30,31 @@
 #endif
 
 /* String ID numbers. */
-#include <86box/language.h>
+enum {
+    STRING_MOUSE_CAPTURE,             /* "Click to capture mouse" */
+    STRING_MOUSE_RELEASE,             /* "Press %1 to release mouse" */
+    STRING_MOUSE_RELEASE_MMB,         /* "Press %1 or middle button to release mouse" */
+    STRING_INVALID_CONFIG,            /* "Invalid configuration" */
+    STRING_NO_ST506_ESDI_CDROM,       /* "MFM/RLL or ESDI CD-ROM drives never existed" */
+    STRING_NET_ERROR,                 /* "Failed to initialize network driver" */
+    STRING_NET_ERROR_DESC,            /* "The network configuration will be switched..." */
+    STRING_PCAP_ERROR_NO_DEVICES,     /* "No PCap devices found" */
+    STRING_PCAP_ERROR_INVALID_DEVICE, /* "Invalid PCap device" */
+    STRING_PCAP_ERROR_DESC,           /* "Make sure libpcap is installed..." */
+    STRING_GHOSTSCRIPT_ERROR_TITLE,   /* "Unable to initialize Ghostscript" */
+    STRING_GHOSTSCRIPT_ERROR_DESC,    /* "gsdll32.dll/gsdll64.dll/libgs is required..." */
+    STRING_HW_NOT_AVAILABLE_TITLE,    /* "Hardware not available" */
+    STRING_HW_NOT_AVAILABLE_MACHINE,  /* "Machine \"%hs\" is not available..." */
+    STRING_HW_NOT_AVAILABLE_VIDEO,    /* "Video card \"%hs\" is not available..." */
+    STRING_HW_NOT_AVAILABLE_VIDEO2,   /* "Video card #2 \"%hs\" is not available..." */
+    STRING_HW_NOT_AVAILABLE_DEVICE,   /* "Device \"%hs\" is not available..." */
+    STRING_MONITOR_SLEEP,             /* "Monitor in sleep mode" */
+    STRING_GHOSTPCL_ERROR_TITLE,      /* "Unable to initialize GhostPCL" */
+    STRING_GHOSTPCL_ERROR_DESC,       /* "gpcl6dll32.dll/gpcl6dll64.dll/libgpcl6 is required..." */
+    STRING_ESCP_ERROR_TITLE,          /* "Unable to find Dot-Matrix fonts" */
+    STRING_ESCP_ERROR_DESC,           /* "TrueType fonts in the \"roms/printer/fonts\" directory..." */
+    STRING_EDID_TOO_LARGE,            /* "EDID file \"%ls\" is too large (%lld bytes)." */
+};
 
 /* The Win32 API uses _wcsicmp. */
 #ifdef _WIN32
@@ -107,14 +131,12 @@ extern int      infocus;
 extern char     emu_version[200]; /* version ID string */
 extern int      rctrl_is_lalt;
 extern int      update_icons;
-extern int      status_icons_fullscreen;
 
 extern int kbd_req_capture;
 extern int hide_status_bar;
 extern int hide_tool_bar;
 
 /* System-related functions. */
-extern char    *fix_exe_path(char *str);
 extern FILE    *plat_fopen(const char *path, const char *mode);
 extern FILE    *plat_fopen64(const char *path, const char *mode);
 extern void     plat_remove(char *path);
@@ -122,7 +144,10 @@ extern int      plat_getcwd(char *bufp, int max);
 extern int      plat_chdir(char *path);
 extern void     plat_tempfile(char *bufp, char *prefix, char *suffix);
 extern void     plat_get_exe_name(char *s, int size);
-extern void     plat_get_global_config_dir(char* strptr);
+extern void     plat_get_global_config_dir(char *outbuf, size_t len);
+extern void     plat_get_global_data_dir(char *outbuf, size_t len);
+extern void     plat_get_temp_dir(char *outbuf, uint8_t len);
+extern void     plat_get_vmm_dir(char *outbuf, size_t len);
 extern void     plat_init_rom_paths(void);
 extern int      plat_dir_check(char *path);
 extern int      plat_dir_create(char *path);
@@ -130,29 +155,20 @@ extern void    *plat_mmap(size_t size, uint8_t executable);
 extern void     plat_munmap(void *ptr, size_t size);
 extern uint64_t plat_timer_read(void);
 extern uint32_t plat_get_ticks(void);
-extern uint32_t plat_get_micro_ticks(void);
 extern void     plat_delay_ms(uint32_t count);
 extern void     plat_pause(int p);
 extern void     plat_mouse_capture(int on);
-extern int      plat_vidapi(char *name);
+extern int      plat_vidapi(const char *name);
 extern char    *plat_vidapi_name(int api);
-extern int      plat_setvid(int api);
-extern void     plat_vidsize(int x, int y);
-extern void     plat_setfullscreen(int on);
-extern void     plat_resize_monitor(int x, int y, int monitor_index);
+extern void     plat_resize(int x, int y, int monitor_index);
 extern void     plat_resize_request(int x, int y, int monitor_index);
-extern void     plat_resize(int x, int y);
-extern void     plat_vidapi_enable(int enabled);
-extern void     plat_vidapi_reload(void);
-extern void     plat_vid_reload_options(void);
-extern uint32_t plat_language_code(char *langcode);
-extern void     plat_language_code_r(uint32_t lcid, char *outbuf, int len);
+extern int      plat_language_code(char *langcode);
+extern void     plat_language_code_r(int id, char *outbuf, int len);
 extern void     plat_get_cpu_string(char *outbuf, uint8_t len);
-extern double   plat_get_dpi(void);
 extern void     plat_set_thread_name(void *thread, const char *name);
+extern void     plat_break(void);
 
 /* Resource management. */
-extern void     set_language(uint32_t id);
 extern wchar_t *plat_get_string(int id);
 
 /* Emulator start/stop support functions. */
@@ -171,30 +187,21 @@ extern void floppy_mount(uint8_t id, char *fn, uint8_t wp);
 extern void floppy_eject(uint8_t id);
 extern void cdrom_mount(uint8_t id, char *fn);
 extern void plat_cdrom_ui_update(uint8_t id, uint8_t reload);
-extern void zip_eject(uint8_t id);
-extern void zip_mount(uint8_t id, char *fn, uint8_t wp);
-extern void zip_reload(uint8_t id);
+extern void rdisk_eject(uint8_t id);
+extern void rdisk_mount(uint8_t id, char *fn, uint8_t wp);
+extern void rdisk_reload(uint8_t id);
 extern void mo_eject(uint8_t id);
 extern void mo_mount(uint8_t id, char *fn, uint8_t wp);
 extern void mo_reload(uint8_t id);
-extern int  ioctl_open(uint8_t id, char d);
-extern void ioctl_reset(uint8_t id);
-extern void ioctl_close(uint8_t id);
 
 /* Other stuff. */
 extern void startblit(void);
 extern void endblit(void);
-extern void take_screenshot(void);
 
 /* Conversion between UTF-8 and UTF-16. */
 extern size_t mbstoc16s(uint16_t dst[], const char src[], int len);
 extern size_t c16stombs(char dst[], const uint16_t src[], int len);
 
-#ifdef MTR_ENABLED
-extern void init_trace(void);
-extern void shutdown_trace(void);
-#endif
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/include/86box/plat_cdrom_ioctl.h b/src/include/86box/plat_cdrom_ioctl.h
new file mode 100644
index 000000000..471222134
--- /dev/null
+++ b/src/include/86box/plat_cdrom_ioctl.h
@@ -0,0 +1,34 @@
+/*
+ * 86Box        A hypervisor and IBM PC system emulator that specializes in
+ *              running old operating systems and software designed for IBM
+ *              PC systems and compatibles from 1981 through fairly recent
+ *              system designs based on the PCI bus.
+ *
+ *              This file is part of the 86Box distribution.
+ *
+ *              Definitions for platform specific serial to host passthrough.
+ *
+ *
+ * Authors:     Andreas J. Reichel <webmaster@6th-dimension.com>,
+ *              Jasmine Iwanek <jasmine@iwanek.co.uk>
+ *
+ *              Copyright 2021      Andreas J. Reichel.
+ *              Copyright 2021-2022 Jasmine Iwanek.
+ */
+
+#ifndef PLAT_CDROM_IOCTL_H
+#define PLAT_CDROM_IOCTL_H
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void *   ioctl_open(cdrom_t *dev, const char *drv);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/include/86box/plat_netsocket.h b/src/include/86box/plat_netsocket.h
new file mode 100644
index 000000000..c994ef9b9
--- /dev/null
+++ b/src/include/86box/plat_netsocket.h
@@ -0,0 +1,23 @@
+#ifndef _WIN32
+#    define SOCKET int
+#else
+#    include <winsock2.h>
+#    include <ws2tcpip.h>
+#endif
+
+enum net_socket_types {
+    /* Only TCP is supported for now. */
+    NET_SOCKET_TCP
+};
+
+SOCKET plat_netsocket_create(int type);
+SOCKET plat_netsocket_create_server(int type, unsigned short port);
+void   plat_netsocket_close(SOCKET socket);
+
+SOCKET plat_netsocket_accept(SOCKET socket);
+int    plat_netsocket_connected(SOCKET socket); /* Returns -1 on trouble. */
+int    plat_netsocket_connect(SOCKET socket, const char *hostname, unsigned short port);
+
+/* Returns 0 in case of inability to send. -1 in case of errors. */
+int plat_netsocket_send(SOCKET socket, const unsigned char *data, unsigned int size, int *wouldblock);
+int plat_netsocket_receive(SOCKET socket, unsigned char *data, unsigned int size, int *wouldblock);
diff --git a/src/include/86box/plat_serial_passthrough.h b/src/include/86box/plat_serial_passthrough.h
index 60674ea58..ec9a96545 100644
--- a/src/include/86box/plat_serial_passthrough.h
+++ b/src/include/86box/plat_serial_passthrough.h
@@ -30,6 +30,7 @@ extern int  plat_serpt_read(void *priv, uint8_t *data);
 extern int  plat_serpt_open_device(void *priv);
 extern void plat_serpt_close(void *priv);
 extern void plat_serpt_set_params(void *priv);
+extern void plat_serpt_set_line_state(void *priv);
 
 #ifdef __cplusplus
 }
diff --git a/src/include/86box/port_92.h b/src/include/86box/port_92.h
index 2dd4319be..838b7ca28 100644
--- a/src/include/86box/port_92.h
+++ b/src/include/86box/port_92.h
@@ -37,6 +37,7 @@ extern void port_92_add(void *priv);
 extern void port_92_remove(void *priv);
 
 extern const device_t port_92_device;
+extern const device_t port_92_key_device;
 extern const device_t port_92_inv_device;
 extern const device_t port_92_word_device;
 extern const device_t port_92_pci_device;
diff --git a/src/include/86box/prt_devs.h b/src/include/86box/prt_devs.h
index 3d9d6673a..d136d9d93 100644
--- a/src/include/86box/prt_devs.h
+++ b/src/include/86box/prt_devs.h
@@ -2,7 +2,14 @@
 #define EMU_PRT_DEVS_H
 
 extern const lpt_device_t lpt_prt_text_device;
+extern const device_t prt_text_device;
 extern const lpt_device_t lpt_prt_escp_device;
+extern const device_t prt_escp_device;
 extern const lpt_device_t lpt_prt_ps_device;
+extern const device_t prt_ps_device;
+#ifdef USE_PCL
+extern const lpt_device_t lpt_prt_pcl_device;
+extern const device_t prt_pcl_device;
+#endif
 
 #endif /*EMU_PRT_DEVS_H*/
diff --git a/src/include/86box/prt_papersizes.h b/src/include/86box/prt_papersizes.h
new file mode 100644
index 000000000..c45c74568
--- /dev/null
+++ b/src/include/86box/prt_papersizes.h
@@ -0,0 +1,50 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Define the various paper sizes for printers.
+ *
+ * Authors: Jasmine Iwanek, <jasmine@iwanek.co.uk>
+ *
+ *          Copyright 2025 Jasmine Iwanek
+ */
+#ifndef EMU_PRT_PAPERSIZES_H
+#define EMU_PRT_PAPERSIZES_H
+
+/* Standard U.S. Letter */
+#define LETTER_PAGE_WIDTH   8.5
+#define LETTER_PAGE_HEIGHT  11.0
+
+/* Standard U.S. Legal */
+#define LEGAL_PAGE_WIDTH   8.5
+#define LEGAL_PAGE_HEIGHT  14.0
+
+/* Standard U.S. Ledger */
+#define LEDGER_PAGE_WIDTH   11.0
+#define LEDGER_PAGE_HEIGHT  17.0
+
+/* Standard A0 */
+#define A0_PAGE_WIDTH   33.125
+#define A0_PAGE_HEIGHT  46.75
+
+/* Standard A1 */
+#define A1_PAGE_WIDTH   23.375
+#define A1_PAGE_HEIGHT  33.125
+
+/* Standard A2 */
+#define A2_PAGE_WIDTH   16.5
+#define A2_PAGE_HEIGHT  23.375
+
+/* Standard A3 */
+#define A3_PAGE_WIDTH   11.75
+#define A3_PAGE_HEIGHT  16.5
+
+/* Standard A4 */
+#define A4_PAGE_WIDTH   8.25
+#define A4_PAGE_HEIGHT  11.75
+
+#endif /*EMU_PLAT_FALLTHROUGH_H*/
diff --git a/src/include/86box/qt-glsl.h b/src/include/86box/qt-glsl.h
new file mode 100644
index 000000000..0cd8e27cd
--- /dev/null
+++ b/src/include/86box/qt-glsl.h
@@ -0,0 +1,158 @@
+#ifndef SRC_WX_GLSL_H_
+#define SRC_WX_GLSL_H_
+
+#define MAX_PREV 7
+
+#define MAX_SHADERS 20
+#define MAX_TEXTURES 20
+#define MAX_PARAMETERS 100
+
+#define MAX_USER_SHADERS 20
+//#define SDL2_SHADER_DEBUG
+
+struct shader_scale {
+        int mode[2];
+        float value[2];
+};
+
+struct shader_state {
+        float input_size[2];
+        float input_texture_size[2];
+        float output_texture_size[2];
+        float output_size[2];
+        float tex_coords[8];
+};
+
+struct shader_vbo {
+        int vertex_coord;
+        int tex_coord;
+        int color;
+};
+
+struct shader_texture {
+        int id;
+        int width;
+        int height;
+        int type;
+        int internal_format;
+        int format;
+        int min_filter;
+        int mag_filter;
+        int wrap_mode;
+        void *data;
+        int mipmap;
+};
+
+struct shader_lut_texture {
+        char name[50];
+        struct shader_texture texture;
+};
+
+struct shader_fbo {
+        int id;
+        struct shader_texture texture;
+        int srgb;
+        int mipmap_input;
+};
+
+struct shader_prev {
+        struct shader_fbo fbo;
+        struct shader_vbo vbo;
+};
+
+struct shader_input {
+        int texture;
+        int input_size;
+        int texture_size;
+        int tex_coord;
+};
+
+struct shader_uniforms {
+        int mvp_matrix;
+        int vertex_coord;
+        int tex_coord;
+        int color;
+
+        int texture;
+        int input_size;
+        int texture_size;
+        int output_size;
+
+        int frame_count;
+        int frame_direction;
+
+        struct shader_input orig;
+        struct shader_input pass[MAX_SHADERS];
+        struct shader_input prev_pass[MAX_SHADERS];
+        struct shader_input prev[MAX_PREV];
+
+        int parameters[MAX_PARAMETERS];
+        int lut_textures[MAX_TEXTURES];
+};
+
+struct shader_program {
+        int vertex_shader;
+        int fragment_shader;
+        int id;
+};
+
+struct shader_parameter {
+        char id[64];
+        char description[64];
+        float default_value;
+        float value;
+        float min;
+        float max;
+        float step;
+};
+
+struct shader_pass {
+        int active;
+        char alias[64];
+        int vertex_array;
+        int frame_count_mod;
+        struct shader_program program;
+        struct shader_uniforms uniforms;
+        struct shader_fbo fbo;
+        struct shader_vbo vbo;
+        struct shader_state state;
+        struct shader_scale scale;
+};
+
+struct glsl_shader {
+        int active;
+        char name[64];
+
+        int num_passes;
+        struct shader_pass passes[MAX_SHADERS];
+
+        int num_lut_textures;
+        struct shader_lut_texture lut_textures[MAX_TEXTURES];
+
+        int num_parameters;
+        struct shader_parameter parameters[MAX_PARAMETERS];
+
+        struct shader_pass prev_scene;
+        struct shader_prev prev[MAX_PREV + 1];
+
+        int last_prev_update;
+        int has_prev;
+
+        float shader_refresh_rate;
+
+        int input_filter_linear;
+};
+
+typedef struct glsl_t {
+        int num_shaders;
+        struct glsl_shader shaders[MAX_USER_SHADERS];
+        struct shader_pass scene;
+        struct shader_pass final_pass;
+        struct shader_pass fs_color;
+#ifdef SDL2_SHADER_DEBUG
+        struct shader_pass debug;
+#endif
+        int srgb;
+} glsl_t;
+
+#endif
\ No newline at end of file
diff --git a/src/include/86box/qt-glslp-parser.h b/src/include/86box/qt-glslp-parser.h
new file mode 100644
index 000000000..853e50e66
--- /dev/null
+++ b/src/include/86box/qt-glslp-parser.h
@@ -0,0 +1,59 @@
+#ifndef SRC_WX_GLSLP_PARSER_H_
+#define SRC_WX_GLSLP_PARSER_H_
+
+#include "qt-glsl.h"
+
+struct parameter {
+        char id[64];
+        char description[64];
+        float default_value;
+        float value;
+        float min;
+        float max;
+        float step;
+};
+
+struct texture {
+        char path[256];
+        char name[50];
+        int linear;
+        int mipmap;
+        char wrap_mode[50];
+};
+
+struct shader {
+        char shader_fn[1024];
+        char *shader_program;
+        char alias[64];
+        int filter_linear;
+        int float_framebuffer;
+        int srgb_framebuffer;
+        int mipmap_input;
+        int frame_count_mod;
+        char wrap_mode[50];
+        char scale_type_x[9], scale_type_y[9];
+        float scale_x, scale_y;
+};
+
+typedef struct glslp_t {
+        char name[64];
+        int num_shaders;
+        struct shader shaders[MAX_SHADERS];
+
+        int num_textures;
+        struct texture textures[MAX_TEXTURES];
+
+        int num_parameters;
+        struct parameter parameters[MAX_PARAMETERS];
+
+        int input_filter_linear;
+} glslp_t;
+
+void get_glslp_name(const char *f, char *s, int size);
+glslp_t *glslp_parse(const char *f);
+void glslp_free(glslp_t *p);
+
+void glslp_read_shader_config(glslp_t *shader);
+void glslp_write_shader_config(glslp_t *shader);
+
+#endif /* SRC_WX_GLSLP_PARSER_H_ */
diff --git a/src/include/86box/rdisk.h b/src/include/86box/rdisk.h
new file mode 100644
index 000000000..c226a2c9d
--- /dev/null
+++ b/src/include/86box/rdisk.h
@@ -0,0 +1,183 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the Iomega ZIP drive with SCSI(-like)
+ *          commands, for both ATAPI and SCSI usage.
+ *
+ *
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2018-2025 Miran Grca.
+ */
+
+#ifndef EMU_RDISK_H
+#define EMU_RDISK_H
+
+#define RDISK_NUM                  4
+
+#define BUF_SIZE               32768
+
+#define RDISK_TIME              10.0
+
+#define ZIP_SECTORS      (96 * 2048)
+
+#define ZIP_250_SECTORS     (489532)
+
+#define RDISK_IMAGE_HISTORY       10
+
+enum {
+    RDISK_TYPE_GENERIC = 0,
+    RDISK_TYPE_ZIP_100,
+    RDISK_TYPE_ZIP_250
+};
+
+typedef struct rdisk_type_t {
+    uint32_t sectors;
+    uint16_t bytes_per_sector;
+} rdisk_type_t;
+
+#define KNOWN_RDISK_TYPES 2
+static const rdisk_type_t rdisk_types[KNOWN_RDISK_TYPES] = {
+    { ZIP_SECTORS,        512 },
+    { ZIP_250_SECTORS,    512 },
+};
+
+typedef struct rdisk_drive_type_t {
+    const char *vendor;
+    const char *model;
+    const char *revision;
+    int8_t      supported_media[KNOWN_RDISK_TYPES];
+} rdisk_drive_type_t;
+
+#define KNOWN_RDISK_DRIVE_TYPES 3
+static const rdisk_drive_type_t rdisk_drive_types[KNOWN_RDISK_DRIVE_TYPES] = {
+    { "86BOX",    "REMOVABLE DISK",  "5.00", { 1, 1 }},
+    { "IOMEGA",   "ZIP 100",         "E.08", { 1, 0 }},
+    { "IOMEGA",   "ZIP 250",         "42.S", { 1, 1 }}
+};
+
+enum {
+    RDISK_BUS_DISABLED =  0,
+    RDISK_BUS_LPT      =  6,
+    RDISK_BUS_IDE      =  7,
+    RDISK_BUS_ATAPI    =  8,
+    RDISK_BUS_SCSI     =  9,
+    RDISK_BUS_USB      = 10
+};
+
+typedef struct rdisk_drive_t {
+    uint8_t            id;
+
+    union {
+        uint8_t            res;
+        /* Reserved for other ID's. */
+        uint8_t            res0;
+        uint8_t            res1;
+        uint8_t            ide_channel;
+        uint8_t            scsi_device_id;
+    };
+
+    uint8_t            bus_type;  /* 0 = ATAPI, 1 = SCSI */
+    uint8_t            bus_mode;  /* Bit 0 = PIO suported;
+                                     Bit 1 = DMA supportd. */
+    uint8_t            read_only; /* Struct variable reserved for
+                                     media status. */
+    uint8_t            pad;
+    uint8_t            pad0;
+
+    FILE              *fp;
+    void              *priv;
+
+    char               image_path[1024];
+    char               prev_image_path[1024];
+
+    char              *image_history[RDISK_IMAGE_HISTORY];
+
+    uint32_t           type;
+    uint32_t           medium_size;
+    uint32_t           base;
+} rdisk_drive_t;
+
+typedef struct rdisk_t {
+    mode_sense_pages_t ms_pages_saved;
+
+    rdisk_drive_t       *drv;
+#ifdef EMU_IDE_H
+    ide_tf_t          *tf;
+#else
+    void              *tf;
+#endif
+
+    void              *log;
+
+    uint8_t           *buffer;
+    size_t             buffer_sz;
+    uint8_t            atapi_cdb[16];
+    uint8_t            current_cdb[16];
+    uint8_t            sense[256];
+
+    uint8_t            id;
+    uint8_t            cur_lun;
+    uint8_t            pad0;
+    uint8_t            pad1;
+
+    uint16_t           max_transfer_len;
+    uint16_t           pad2;
+
+    int                requested_blocks;
+    int                packet_status;
+    int                total_length;
+    int                do_page_save;
+    int                unit_attention;
+    int                request_pos;
+    int                old_len;
+    int                transition;
+
+    uint32_t           sector_pos;
+    uint32_t           sector_len;
+    uint32_t           packet_len;
+    uint32_t           block_len;
+
+    double             callback;
+
+    uint8_t            (*ven_cmd)(void *sc, uint8_t *cdb, int32_t *BufLen);
+} rdisk_t;
+
+extern rdisk_t      *rdisk[RDISK_NUM];
+extern rdisk_drive_t rdisk_drives[RDISK_NUM];
+extern uint8_t     atapi_rdisk_drives[8];
+extern uint8_t     scsi_rdisk_drives[16];
+
+#define rdisk_sense_error dev->sense[0]
+#define rdisk_sense_key   dev->sense[2]
+#define rdisk_info        *(uint32_t *) &(dev->sense[3])
+#define rdisk_asc         dev->sense[12]
+#define rdisk_ascq        dev->sense[13]
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void rdisk_disk_close(const rdisk_t *dev);
+extern void rdisk_disk_reload(const rdisk_t *dev);
+extern void rdisk_insert(rdisk_t *dev);
+
+extern void rdisk_global_init(void);
+extern void rdisk_hard_reset(void);
+
+extern void rdisk_reset(scsi_common_t *sc);
+extern int  rdisk_is_empty(const uint8_t id);
+extern void rdisk_load(const rdisk_t *dev, const char *fn, const int skip_insert);
+extern void rdisk_close(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*EMU_RDISK_H*/
diff --git a/src/include/86box/renderdefs.h b/src/include/86box/renderdefs.h
new file mode 100644
index 000000000..36c3d9f74
--- /dev/null
+++ b/src/include/86box/renderdefs.h
@@ -0,0 +1,40 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          definitions for renderers
+ *
+ * Authors: Jasmine Iwanek, <jriwanek@gmail.com>
+ *
+ *          Copyright 2025 Jasmine Iwanek.
+ */
+#ifndef EMU_RENDERDEFS_H
+#define EMU_RENDERDEFS_H
+
+#define RENDERER_NAME_DEFAULT     "default"
+#define RENDERER_NAME_SYSTEM      "system"
+#define RENDERER_NAME_QT_SOFTWARE "qt_software"
+#define RENDERER_NAME_QT_OPENGL   "qt_opengl"
+#define RENDERER_NAME_QT_OPENGLES "qt_opengles"
+#define RENDERER_NAME_QT_OPENGL3  "qt_opengl3"
+#define RENDERER_NAME_QT_VULKAN   "qt_vulkan"
+#define RENDERER_NAME_VNC         "vnc"
+
+#define RENDERER_SOFTWARE 0
+#define RENDERER_OPENGL3  1
+#define RENDERER_VULKAN   2
+#define RENDERER_VNC      3
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*EMU_RENDERDEFS_H*/
diff --git a/src/include/86box/resource.h b/src/include/86box/resource.h
deleted file mode 100644
index 2e6628c77..000000000
--- a/src/include/86box/resource.h
+++ /dev/null
@@ -1,524 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Windows resource defines.
- *
- *
- *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
- *          Fred N. van Kempen, <decwiz@yahoo.com>
- *          David Hrdlička, <hrdlickadavid@outlook.com>
- *
- *          Copyright 2008-2019 Sarah Walker.
- *          Copyright 2016-2019 Miran Grca.
- *          Copyright 2018-2019 David Hrdlička.
- *          Copyright 2021-2022 Jasmine Iwanek.
- */
-
-#ifndef WIN_RESOURCE_H
-#define WIN_RESOURCE_H
-
-/* Dialog IDs. */
-#define DLG_ABOUT                       101 /* top-level dialog */
-#define DLG_STATUS                      102 /* top-level dialog */
-#define DLG_SND_GAIN                    103 /* top-level dialog */
-#define DLG_NEW_FLOPPY                  104 /* top-level dialog */
-#define DLG_SPECIFY_DIM                 105 /* top-level dialog */
-#define DLG_PREFERENCES                 106 /* top-level dialog */
-#define DLG_CONFIG                      110 /* top-level dialog */
-#define DLG_CFG_MACHINE                 111 /* sub-dialog of config */
-#define DLG_CFG_VIDEO                   112 /* sub-dialog of config */
-#define DLG_CFG_INPUT                   113 /* sub-dialog of config */
-#define DLG_CFG_SOUND                   114 /* sub-dialog of config */
-#define DLG_CFG_NETWORK                 115 /* sub-dialog of config */
-#define DLG_CFG_PORTS                   116 /* sub-dialog of config */
-#define DLG_CFG_STORAGE                 117 /* sub-dialog of config */
-#define DLG_CFG_HARD_DISKS              118 /* sub-dialog of config */
-#define DLG_CFG_HARD_DISKS_ADD          119 /* sub-dialog of config */
-#define DLG_CFG_FLOPPY_AND_CDROM_DRIVES 120 /* sub-dialog of config */
-#define DLG_CFG_OTHER_REMOVABLE_DEVICES 121 /* sub-dialog of config */
-#define DLG_CFG_PERIPHERALS             122 /* sub-dialog of config */
-
-/* Static text label IDs. */
-
-/* DLG_SND_GAIN */
-#define IDT_GAIN 1700 /* Gain */
-
-/* DLG_NEW_FLOPPY */
-#define IDT_FLP_FILE_NAME 1701 /* File name: */
-#define IDT_FLP_DISK_SIZE 1702 /* Disk size: */
-#define IDT_FLP_RPM_MODE  1703 /* RPM mode: */
-#define IDT_FLP_PROGRESS  1704 /* Progress: */
-
-/* DLG_SPECIFY_DIM */
-#define IDT_WIDTH  1705 /* ??? */
-#define IDT_HEIGHT 1706 /* ??? */
-
-/* DLG_CFG_MACHINE */
-#define IDT_MACHINE_TYPE 1707 /* Machine type: */
-#define IDT_MACHINE      1708 /* Machine: */
-#define IDT_CPU_TYPE     1709 /* CPU type: */
-#define IDT_CPU_SPEED    1710 /* CPU speed: */
-#define IDT_FPU          1711 /* FPU: */
-#define IDT_WAIT_STATES  1712 /* Wait states: */
-#define IDT_MB           1713 /* MB == IDC_TEXT_MB */
-#define IDT_MEMORY       1714 /* Memory: */
-
-/* DLG_CFG_VIDEO */
-#define IDT_VIDEO   1715 /* Video: */
-#define IDT_VIDEO_2 1716 /* Video 2: */
-
-/* DLG_CFG_INPUT */
-#define IDT_MOUSE    1717 /* Mouse: */
-#define IDT_JOYSTICK 1718 /* Joystick: */
-
-/* DLG_CFG_SOUND */
-#define IDT_SOUND1   1719 /* Sound card #1: */
-#define IDT_SOUND2   1720 /* Sound card #2: */
-#define IDT_SOUND3   1721 /* Sound card #3: */
-#define IDT_SOUND4   1722 /* Sound card #4: */
-#define IDT_MIDI_OUT 1723 /* MIDI Out Device: */
-#define IDT_MIDI_IN  1724 /* MIDI In Device: */
-
-/* DLG_CFG_NETWORK */
-#define IDT_NET_TYPE 1725 /* Network type: */
-#define IDT_PCAP     1726 /* PCap device: */
-#define IDT_NET      1727 /* Network adapter: */
-#define IDT_NET1     1728 /* Network adapter 1: */
-#define IDT_NET2     1729 /* Network adapter 2: */
-#define IDT_NET3     1730 /* Network adapter 3: */
-#define IDT_NET4     1731 /* Network adapter 4: */
-
-/* DLG_CFG_PORTS */
-#define IDT_COM1 1732 /* COM1 Device: */
-#define IDT_COM2 1733 /* COM1 Device: */
-#define IDT_COM3 1734 /* COM1 Device: */
-#define IDT_COM4 1735 /* COM1 Device: */
-
-#define IDT_LPT1 1736 /* LPT1 Device: */
-#define IDT_LPT2 1737 /* LPT2 Device: */
-#define IDT_LPT3 1738 /* LPT3 Device: */
-#define IDT_LPT4 1739 /* LPT4 Device: */
-
-/* DLG_CFG_STORAGE */
-#define IDT_HDC    1740 /* HD Controller: */
-#define IDT_FDC    1741 /* Ext FD Controller: */
-#define IDT_SCSI_1 1742 /* SCSI Board #1: */
-#define IDT_SCSI_2 1743 /* SCSI Board #2: */
-#define IDT_SCSI_3 1744 /* SCSI Board #3: */
-#define IDT_SCSI_4 1745 /* SCSI Board #4: */
-
-/* DLG_CFG_HARD_DISKS */
-#define IDT_HDD     1746 /* Hard disks: */
-#define IDT_BUS     1747 /* Bus: */
-#define IDT_CHANNEL 1748 /* Channel: */
-#define IDT_ID      1749 /* ID: */
-#define IDT_LUN     1750 /* LUN: */
-#define IDT_SPEED   1751 /* Speed: */
-
-/* DLG_CFG_HARD_DISKS_ADD */
-#define IDT_SECTORS    1752 /* Sectors: */
-#define IDT_HEADS      1753 /* Heads: */
-#define IDT_CYLS       1754 /* Cylinders: */
-#define IDT_SIZE_MB    1755 /* Size (MB): */
-#define IDT_TYPE       1756 /* Type: */
-#define IDT_FILE_NAME  1757 /* File name: */
-#define IDT_IMG_FORMAT 1758 /* Image Format: */
-#define IDT_BLOCK_SIZE 1759 /* Block Size: */
-#define IDT_PROGRESS   1760 /* Progress: */
-
-/* DLG_CFG_FLOPPY_AND_CDROM_DRIVES */
-#define IDT_FLOPPY_DRIVES 1761 /* Floppy drives: */
-#define IDT_FDD_TYPE      1762 /* Type: */
-#define IDT_CD_DRIVES     1763 /* CD-ROM drives: */
-#define IDT_CD_BUS        1764 /* Bus: */
-#define IDT_CD_ID         1765 /* ID: */
-#define IDT_CD_LUN        1766 /* LUN: */
-#define IDT_CD_CHANNEL    1767 /* Channel: */
-#define IDT_CD_SPEED      1768 /* Speed: */
-#define IDT_CD_TYPE       1769 /* Type: */
-
-/* DLG_CFG_OTHER_REMOVABLE_DEVICES */
-#define IDT_MO_DRIVES   1770 /* MO drives: */
-#define IDT_MO_BUS      1771 /* Bus: */
-#define IDT_MO_ID       1772 /* ID: */
-#define IDT_MO_CHANNEL  1773 /* Channel */
-#define IDT_MO_TYPE     1774 /* Type: */
-
-#define IDT_ZIP_DRIVES  1775 /* ZIP drives: */
-#define IDT_ZIP_BUS     1776 /* Bus: */
-#define IDT_ZIP_ID      1777 /* ID: */
-#define IDT_ZIP_LUN     1778 /* LUN: */
-#define IDT_ZIP_CHANNEL 1779 /* Channel: */
-
-/* DLG_CFG_PERIPHERALS */
-#define IDT_ISARTC   1780 /* ISA RTC: */
-#define IDT_ISAMEM_1 1781 /* ISAMEM Board #1: */
-#define IDT_ISAMEM_2 1782 /* ISAMEM Board #2: */
-#define IDT_ISAMEM_3 1783 /* ISAMEM Board #3: */
-#define IDT_ISAMEM_4 1784 /* ISAMEM Board #4: */
-
-/*
- * To try to keep these organized, we now group the
- * constants per dialog, as this allows easy adding
- * and deleting items.
- */
-#define IDC_SETTINGSCATLIST    1001 /* generic config */
-#define IDC_CFILE              1002 /* Select File dialog */
-#define IDC_TIME_SYNC          1005
-#define IDC_RADIO_TS_DISABLED  1006
-#define IDC_RADIO_TS_LOCAL     1007
-#define IDC_RADIO_TS_UTC       1008
-
-#define IDC_COMBO_MACHINE_TYPE 1010
-#define IDC_COMBO_MACHINE      1011 /* machine/cpu config */
-#define IDC_CONFIGURE_MACHINE  1012
-#define IDC_COMBO_CPU_TYPE     1013
-#define IDC_COMBO_CPU_SPEED    1014
-#define IDC_COMBO_FPU          1015
-#define IDC_COMBO_WS           1016
-#ifdef USE_DYNAREC
-#    define IDC_CHECK_DYNAREC 1017
-#endif
-#define IDC_CHECK_SOFTFLOAT       1018
-#define IDC_MEMTEXT               1019
-#define IDC_MEMSPIN               1020
-#define IDC_TEXT_MB               IDT_MB
-
-#define IDC_VIDEO                 1021 /* video config */
-#define IDC_COMBO_VIDEO           1022
-#define IDC_VIDEO_2               1023
-#define IDC_COMBO_VIDEO_2         1024
-#define IDC_CHECK_VOODOO          1025
-#define IDC_BUTTON_VOODOO         1026
-#define IDC_CHECK_IBM8514         1027
-#define IDC_CHECK_XGA             1028
-#define IDC_BUTTON_XGA            1029
-
-#define IDC_INPUT                 1030 /* input config */
-#define IDC_COMBO_MOUSE           1031
-#define IDC_COMBO_JOYSTICK        1032
-#define IDC_COMBO_JOY             1033
-#define IDC_CONFIGURE_MOUSE       1034
-
-#define IDC_SOUND                 1040 /* sound config */
-#define IDC_COMBO_SOUND1          1041
-#define IDC_COMBO_SOUND2          1042
-#define IDC_COMBO_SOUND3          1043
-#define IDC_COMBO_SOUND4          1044
-#define IDC_COMBO_MIDI_OUT        1045
-#define IDC_CHECK_MPU401          1046
-#define IDC_CONFIGURE_MPU401      1047
-#define IDC_CHECK_FLOAT           1048
-#define IDC_CONFIGURE_GUS         1049
-#define IDC_COMBO_MIDI_IN         1050
-#define IDC_CONFIGURE_CMS         1051
-#define IDC_CONFIGURE_SSI         1052
-#define IDC_FM_DRIVER             1053
-#define IDC_RADIO_FM_DRV_NUKED    1054
-#define IDC_RADIO_FM_DRV_YMFM     1055
-
-#define IDC_COMBO_NET1_TYPE       1060 /* network config */
-#define IDC_COMBO_NET2_TYPE       1061
-#define IDC_COMBO_NET3_TYPE       1062
-#define IDC_COMBO_NET4_TYPE       1063
-#define IDC_COMBO_PCAP1           1064
-#define IDC_COMBO_PCAP2           1065
-#define IDC_COMBO_PCAP3           1066
-#define IDC_COMBO_PCAP4           1067
-#define IDC_COMBO_NET1            1068
-#define IDC_COMBO_NET2            1069
-#define IDC_COMBO_NET3            1070
-#define IDC_COMBO_NET4            1071
-
-#define IDC_COMBO_LPT1            1080 /* ports config */
-#define IDC_COMBO_LPT2            1081
-#define IDC_COMBO_LPT3            1082
-#define IDC_COMBO_LPT4            1083
-#define IDC_CHECK_SERIAL1         1084
-#define IDC_CHECK_SERIAL2         1085
-#define IDC_CHECK_SERIAL3         1086
-#define IDC_CHECK_SERIAL4         1087
-#define IDC_CHECK_PARALLEL1       1088
-#define IDC_CHECK_PARALLEL2       1089
-#define IDC_CHECK_PARALLEL3       1090
-#define IDC_CHECK_PARALLEL4       1091
-#define IDC_CHECK_SERIAL_PASS1    1092
-#define IDC_CHECK_SERIAL_PASS2    1093
-#define IDC_CHECK_SERIAL_PASS3    1094
-#define IDC_CHECK_SERIAL_PASS4    1095
-
-#define IDC_OTHER_PERIPH          1110 /* storage controllers config */
-#define IDC_COMBO_HDC             1111
-#define IDC_CONFIGURE_HDC         1112
-#define IDC_CHECK_IDE_TER         1113
-#define IDC_BUTTON_IDE_TER        1114
-#define IDC_CHECK_IDE_QUA         1115
-#define IDC_BUTTON_IDE_QUA        1116
-#define IDC_GROUP_SCSI            1117
-#define IDC_COMBO_SCSI_1          1118
-#define IDC_COMBO_SCSI_2          1119
-#define IDC_COMBO_SCSI_3          1120
-#define IDC_COMBO_SCSI_4          1121
-#define IDC_CONFIGURE_SCSI_1      1122
-#define IDC_CONFIGURE_SCSI_2      1123
-#define IDC_CONFIGURE_SCSI_3      1124
-#define IDC_CONFIGURE_SCSI_4      1125
-#define IDC_CHECK_CASSETTE        1126
-
-#define IDC_HARD_DISKS            1130 /* hard disks config */
-#define IDC_LIST_HARD_DISKS       1131
-#define IDC_BUTTON_HDD_ADD_NEW    1132
-#define IDC_BUTTON_HDD_ADD        1133
-#define IDC_BUTTON_HDD_REMOVE     1134
-#define IDC_COMBO_HD_BUS          1135
-#define IDC_COMBO_HD_CHANNEL      1136
-#define IDC_COMBO_HD_ID           1137
-#define IDC_COMBO_HD_SPEED        1138
-#define IDC_COMBO_HD_CHANNEL_IDE  1139
-
-#define IDC_EDIT_HD_FILE_NAME     1140 /* add hard disk dialog */
-#define IDC_EDIT_HD_SPT           1141
-#define IDC_EDIT_HD_HPC           1142
-#define IDC_EDIT_HD_CYL           1143
-#define IDC_EDIT_HD_SIZE          1144
-#define IDC_COMBO_HD_TYPE         1145
-#define IDC_PBAR_IMG_CREATE       1146
-#define IDC_COMBO_HD_IMG_FORMAT   1147
-#define IDC_COMBO_HD_BLOCK_SIZE   1148
-
-#define IDC_REMOV_DEVICES         1150 /* floppy and cd-rom drives config */
-#define IDC_LIST_FLOPPY_DRIVES    1151
-#define IDC_COMBO_FD_TYPE         1152
-#define IDC_CHECKTURBO            1153
-#define IDC_CHECKBPB              1154
-#define IDC_LIST_CDROM_DRIVES     1155
-#define IDC_COMBO_CD_BUS          1156
-#define IDC_COMBO_CD_ID           1157
-#define IDC_COMBO_CD_LUN          1158
-#define IDC_COMBO_CD_CHANNEL_IDE  1159
-#define IDC_COMBO_CD_TYPE         1160
-
-#define IDC_LIST_ZIP_DRIVES       1170 /* other removable devices config */
-#define IDC_COMBO_ZIP_BUS         1171
-#define IDC_COMBO_ZIP_ID          1172
-#define IDC_COMBO_ZIP_LUN         1173
-#define IDC_COMBO_ZIP_CHANNEL_IDE 1174
-#define IDC_CHECK250              1175
-#define IDC_COMBO_CD_SPEED        1176
-#define IDC_LIST_MO_DRIVES        1177
-#define IDC_COMBO_MO_BUS          1178
-#define IDC_COMBO_MO_ID           1179
-#define IDC_COMBO_MO_LUN          1170
-#define IDC_COMBO_MO_CHANNEL_IDE  1181
-#define IDC_COMBO_MO_TYPE         1182
-
-#define IDC_CHECK_BUGGER          1190 /* other periph config */
-#define IDC_CHECK_POSTCARD        1191
-#define IDC_COMBO_ISARTC          1192
-#define IDC_CONFIGURE_ISARTC      1193
-#define IDC_COMBO_FDC             1194
-#define IDC_CONFIGURE_FDC         1195
-#define IDC_GROUP_ISAMEM          1196
-#define IDC_COMBO_ISAMEM_1        1197
-#define IDC_COMBO_ISAMEM_2        1198
-#define IDC_COMBO_ISAMEM_3        1199
-#define IDC_COMBO_ISAMEM_4        1200
-#define IDC_CONFIGURE_ISAMEM_1    1201
-#define IDC_CONFIGURE_ISAMEM_2    1202
-#define IDC_CONFIGURE_ISAMEM_3    1203
-#define IDC_CONFIGURE_ISAMEM_4    1204
-
-#define IDC_SLIDER_GAIN           1210 /* sound gain dialog */
-
-#define IDC_EDIT_FILE_NAME        1220 /* new floppy image dialog */
-#define IDC_COMBO_DISK_SIZE       1221
-#define IDC_COMBO_RPM_MODE        1222
-
-#define IDC_COMBO_LANG            1009 /* change language dialog */
-#define IDC_COMBO_ICON            1010
-#define IDC_CHECKBOX_GLOBAL       1300
-#define IDC_BUTTON_DEFAULT        1302
-#define IDC_BUTTON_DEFICON        1304
-
-/* For the DeviceConfig code, re-do later. */
-#define IDC_CONFIG_BASE            1300
-#define IDC_CONFIGURE_VID          1300
-#define IDC_CONFIGURE_VID_2        1301
-#define IDC_CONFIGURE_SND1         1302
-#define IDC_CONFIGURE_SND2         1303
-#define IDC_CONFIGURE_SND3         1304
-#define IDC_CONFIGURE_SND4         1305
-#define IDC_CONFIGURE_VOODOO       1306
-#define IDC_CONFIGURE_NET1_TYPE    1310
-#define IDC_CONFIGURE_NET2_TYPE    1311
-#define IDC_CONFIGURE_NET3_TYPE    1312
-#define IDC_CONFIGURE_NET4_TYPE    1313
-#define IDC_CONFIGURE_PCAP1        1314
-#define IDC_CONFIGURE_PCAP2        1315
-#define IDC_CONFIGURE_PCAP3        1316
-#define IDC_CONFIGURE_PCAP4        1317
-#define IDC_CONFIGURE_NET1         1318
-#define IDC_CONFIGURE_NET2         1319
-#define IDC_CONFIGURE_NET3         1320
-#define IDC_CONFIGURE_NET4         1321
-#define IDC_CONFIGURE_MIDI_OUT     1322
-#define IDC_CONFIGURE_MIDI_IN      1323
-#define IDC_CONFIGURE_SERIAL_PASS1 1324
-#define IDC_CONFIGURE_SERIAL_PASS2 1325
-#define IDC_CONFIGURE_SERIAL_PASS3 1326
-#define IDC_CONFIGURE_SERIAL_PASS4 1327
-#define IDC_JOY1                   1330
-#define IDC_JOY2                   1331
-#define IDC_JOY3                   1332
-#define IDC_JOY4                   1333
-#define IDC_HDTYPE                 1380
-#define IDC_RENDER                 1381
-#define IDC_STATUS                 1382
-
-#define IDC_EDIT_WIDTH             1400 /* specify main window dimensions dialog */
-#define IDC_WIDTHSPIN              1401
-#define IDC_EDIT_HEIGHT            1402
-#define IDC_HEIGHTSPIN             1403
-#define IDC_CHECK_LOCK_SIZE        1404
-
-#define IDM_ABOUT                  40001
-#define IDC_ABOUT_ICON             65535
-#define IDM_ACTION_KBD_REQ_CAPTURE 40010
-#define IDM_ACTION_RCTRL_IS_LALT   40011
-#define IDM_ACTION_SCREENSHOT      40012
-#define IDM_ACTION_HRESET          40013
-#define IDM_ACTION_RESET_CAD       40014
-#define IDM_ACTION_EXIT            40015
-#define IDM_ACTION_CTRL_ALT_ESC    40016
-#define IDM_ACTION_PAUSE           40017
-#ifdef MTR_ENABLED
-#    define IDM_ACTION_BEGIN_TRACE 40018
-#    define IDM_ACTION_END_TRACE   40019
-#    define IDM_ACTION_TRACE       40020
-#endif
-#define IDM_CONFIG              40021
-#define IDM_VID_HIDE_STATUS_BAR 40022
-#define IDM_VID_HIDE_TOOLBAR    40023
-#define IDM_UPDATE_ICONS        40030
-#define IDM_SND_GAIN            40031
-#define IDM_VID_MONITORS        40040
-#define IDM_VID_RESIZE          40041
-#define IDM_VID_REMEMBER        40042
-#define IDM_VID_SDL_SW          40050
-#define IDM_VID_SDL_HW          40051
-#define IDM_VID_SDL_OPENGL      40052
-#define IDM_VID_OPENGL_CORE     40053
-#ifdef USE_VNC
-#    define IDM_VID_VNC 40054
-#endif
-#define IDM_VID_SCALE_1X       40055
-#define IDM_VID_SCALE_2X       40056
-#define IDM_VID_SCALE_3X       40057
-#define IDM_VID_SCALE_4X       40058
-#define IDM_VID_SCALE_5X       40059
-#define IDM_VID_SCALE_6X       40060
-#define IDM_VID_SCALE_7X       40061
-#define IDM_VID_SCALE_8X       40062
-#define IDM_VID_SCALE_9X       40063
-#define IDM_VID_SCALE_10X      40064
-
-#define IDM_VID_HIDPI          40065
-#define IDM_VID_FULLSCREEN     40066
-#define IDM_VID_FS_FULL        40067
-#define IDM_VID_FS_43          40068
-#define IDM_VID_FS_KEEPRATIO   40069
-#define IDM_VID_FS_INT         40070
-#define IDM_VID_SPECIFY_DIM    40071
-#define IDM_VID_FORCE43        40072
-#define IDM_VID_OVERSCAN       40073
-#define IDM_VID_INVERT         40074
-#define IDM_VID_CGACON         40075
-#define IDM_VID_GRAYCT_601     40076
-#define IDM_VID_GRAYCT_709     40077
-#define IDM_VID_GRAYCT_AVE     40078
-#define IDM_VID_GRAY_RGB       40080
-#define IDM_VID_GRAY_MONO      40081
-#define IDM_VID_GRAY_AMBER     40082
-#define IDM_VID_GRAY_GREEN     40083
-#define IDM_VID_GRAY_WHITE     40084
-#define IDM_VID_FILTER_NEAREST 40085
-#define IDM_VID_FILTER_LINEAR  40086
-
-#define IDM_MEDIA              40087
-#define IDM_DOCS               40088
-
-#define IDM_DISCORD            40090
-
-#define IDM_PREFERENCES        40091
-
-#define IDM_VID_GL_FPS_BLITTER 40100
-#define IDM_VID_GL_FPS_25      40101
-#define IDM_VID_GL_FPS_30      40102
-#define IDM_VID_GL_FPS_50      40103
-#define IDM_VID_GL_FPS_60      40104
-#define IDM_VID_GL_FPS_75      40105
-#define IDM_VID_GL_VSYNC       40106
-#define IDM_VID_GL_SHADER      40107
-#define IDM_VID_GL_NOSHADER    40108
-
-/*
- * We need 7 bits for CDROM (2 bits ID and 5 bits for host drive),
- * and 5 bits for Removable Disks (5 bits for ID), so we use an
- * 8bit (256 entries) space for these devices.
- */
-#define IDM_CASSETTE_IMAGE_NEW         0x1200
-#define IDM_CASSETTE_IMAGE_EXISTING    0x1300
-#define IDM_CASSETTE_IMAGE_EXISTING_WP 0x1400
-#define IDM_CASSETTE_RECORD            0x1500
-#define IDM_CASSETTE_PLAY              0x1600
-#define IDM_CASSETTE_REWIND            0x1700
-#define IDM_CASSETTE_FAST_FORWARD      0x1800
-#define IDM_CASSETTE_EJECT             0x1900
-
-#define IDM_CARTRIDGE_IMAGE            0x2200
-#define IDM_CARTRIDGE_EJECT            0x2300
-
-#define IDM_FLOPPY_IMAGE_NEW           0x3200
-#define IDM_FLOPPY_IMAGE_EXISTING      0x3300
-#define IDM_FLOPPY_IMAGE_EXISTING_WP   0x3400
-#define IDM_FLOPPY_EXPORT_TO_86F       0x3500
-#define IDM_FLOPPY_EJECT               0x3600
-
-#define IDM_CDROM_MUTE                 0x4200
-#define IDM_CDROM_EMPTY                0x4300
-#define IDM_CDROM_RELOAD               0x4400
-#define IDM_CDROM_IMAGE                0x4500
-#define IDM_CDROM_DIR                  0x4600
-#define IDM_CDROM_HOST_DRIVE           0x4700
-
-#define IDM_ZIP_IMAGE_NEW              0x5200
-#define IDM_ZIP_IMAGE_EXISTING         0x5300
-#define IDM_ZIP_IMAGE_EXISTING_WP      0x5400
-#define IDM_ZIP_EJECT                  0x5500
-#define IDM_ZIP_RELOAD                 0x5600
-
-#define IDM_MO_IMAGE_NEW               0x6200
-#define IDM_MO_IMAGE_EXISTING          0x6300
-#define IDM_MO_IMAGE_EXISTING_WP       0x6400
-#define IDM_MO_EJECT                   0x6500
-#define IDM_MO_RELOAD                  0x6600
-
-/* Next default values for new objects */
-#ifdef APSTUDIO_INVOKED
-#    ifndef APSTUDIO_READONLY_SYMBOLS
-#        define _APS_NO_MFC              1
-#        define _APS_NEXT_RESOURCE_VALUE 1400
-#        define _APS_NEXT_COMMAND_VALUE  55000
-#        define _APS_NEXT_CONTROL_VALUE  1800
-#        define _APS_NEXT_SYMED_VALUE    200
-#    endif
-#endif
-
-#endif /*WIN_RESOURCE_H*/
diff --git a/src/include/86box/rom.h b/src/include/86box/rom.h
index 1f6e611b1..331d78526 100644
--- a/src/include/86box/rom.h
+++ b/src/include/86box/rom.h
@@ -52,6 +52,12 @@ extern uint8_t  rom_read(uint32_t addr, void *priv);
 extern uint16_t rom_readw(uint32_t addr, void *priv);
 extern uint32_t rom_readl(uint32_t addr, void *priv);
 
+extern void rom_write(uint32_t addr, uint8_t val, void *priv);
+extern void rom_writew(uint32_t addr, uint16_t val, void *priv);
+extern void rom_writel(uint32_t addr, uint32_t val, void *priv);
+
+extern void  rom_get_full_path(char *dest, const char *fn);
+
 extern FILE *rom_fopen(const char *fn, char *mode);
 extern int   rom_getfile(char *fn, char *s, int size);
 extern int   rom_present(const char *fn);
diff --git a/src/include/86box/scsi.h b/src/include/86box/scsi.h
index 376ac79b9..84a4a608e 100644
--- a/src/include/86box/scsi.h
+++ b/src/include/86box/scsi.h
@@ -22,20 +22,28 @@
 #define EMU_SCSI_H
 
 /* Configuration. */
-#define SCSI_BUS_MAX 4 /* currently we support up to 4 controllers */
+#define SCSI_CARD_MAX 4
+#define SCSI_BUS_MAX  9 /* currently we support up to 9 controllers:
+                           up to 1 on-board + up to 4x pas plus/16 + up to 4 scsi controllers */
 
-#define SCSI_ID_MAX  16 /* 16 on wide buses */
-#define SCSI_LUN_MAX 8  /* always 8 */
+#define SCSI_ID_MAX   16 /* 16 on wide buses */
+#define SCSI_LUN_MAX  8  /* always 8 */
 
-extern int scsi_card_current[SCSI_BUS_MAX];
+extern int             scsi_card_current[SCSI_CARD_MAX];
 
-extern int scsi_card_available(int card);
+extern void            scsi_reset(void);
+extern uint8_t         scsi_get_bus(void);
+
+extern int             scsi_card_available(int card);
 #ifdef EMU_DEVICE_H
 extern const device_t *scsi_card_getdevice(int card);
 #endif
-extern int         scsi_card_has_config(int card);
-extern const char *scsi_card_get_internal_name(int card);
-extern int         scsi_card_get_from_internal_name(char *s);
-extern void        scsi_card_init(void);
+extern int             scsi_card_has_config(int card);
+extern const char     *scsi_card_get_internal_name(int card);
+extern int             scsi_card_get_from_internal_name(char *s);
+extern void            scsi_card_init(void);
+
+extern void            scsi_bus_set_speed(uint8_t bus, double speed);
+extern double          scsi_bus_get_speed(uint8_t bus);
 
 #endif /*EMU_SCSI_H*/
diff --git a/src/include/86box/scsi_cdrom.h b/src/include/86box/scsi_cdrom.h
index dec537429..005223e27 100644
--- a/src/include/86box/scsi_cdrom.h
+++ b/src/include/86box/scsi_cdrom.h
@@ -26,55 +26,62 @@ typedef struct scsi_cdrom_t {
     /* Common block. */
     mode_sense_pages_t ms_pages_saved;
 
-    cdrom_t * drv;
+    cdrom_t *          drv;
 #ifdef EMU_IDE_H
-    ide_tf_t *tf;
+    ide_tf_t *         tf;
 #else
-    void *    tf;
+    void *             tf;
 #endif
 
-    uint8_t *buffer;
-    uint8_t atapi_cdb[16];
-    uint8_t current_cdb[16];
-    uint8_t sense[256];
+    void *             log;
 
-#ifdef ANCIENT_CODE
-    /* Task file. */
-    uint8_t features;
-    uint8_t phase;
-    uint16_t request_length;
-    uint8_t status;
-    uint8_t error;
-    uint16_t pad;
-    uint32_t pos;
-#endif
+    uint8_t *          buffer;
+    size_t             buffer_sz;
+    uint8_t            atapi_cdb[16];
+    uint8_t            current_cdb[16];
+    uint8_t            sense[256];
 
-    uint8_t id;
-    uint8_t cur_lun;
-    uint8_t early;
-    uint8_t pad1;
+    uint8_t            id;
+    uint8_t            cur_lun;
+    uint8_t            early;
+    uint8_t            sector_type;
 
-    uint16_t max_transfer_len;
-    uint16_t pad2;
+    uint16_t           max_transfer_len;
+    uint16_t           sector_flags;
 
-    int requested_blocks;
-    int packet_status;
-    int total_length;
-    int do_page_save;
-    int unit_attention;
-    int request_pos;
-    int old_len;
-    int media_status;
+    int                requested_blocks;
+    int                packet_status;
+    int                total_length;
+    int                do_page_save;
+    int                unit_attention;
+    int                request_pos;
+    int                wait;
+    int                buffer_pos;
 
-    uint32_t sector_pos;
-    uint32_t sector_len;
-    uint32_t packet_len;
+    uint32_t           sector_pos;
+    uint32_t           sector_len;
+    uint32_t           packet_len;
+    uint32_t           block_len;
 
-    double callback;
+    double             callback;
+
+    uint8_t            (*ven_cmd)(void *sc, const uint8_t *cdb, int32_t *BufLen);
+
+    int                use_cdb_9;
+    int                was_cached;
+    int                toc_cached;
+    int                media_access;
+    int                sectors_num;
+
+    uint8_t            vendor_type;
+    uint8_t            ven_cmd_is_data[256];
 
-    mode_sense_pages_t ms_pages_saved_sony;
     mode_sense_pages_t ms_drive_status_pages_saved;
-    int                sony_vendor;
+
+    uint64_t           ms_page_flags;
+
+    mode_sense_pages_t ms_pages_default;
+    mode_sense_pages_t ms_pages_changeable;
 } scsi_cdrom_t;
 #endif
 
@@ -82,10 +89,12 @@ extern scsi_cdrom_t *scsi_cdrom[CDROM_NUM];
 
 #define scsi_cdrom_sense_error dev->sense[0]
 #define scsi_cdrom_sense_key   dev->sense[2]
+#define scsi_cdrom_info        *(uint32_t *) &(dev->sense[3])
 #define scsi_cdrom_asc         dev->sense[12]
 #define scsi_cdrom_ascq        dev->sense[13]
 #define scsi_cdrom_drive       cdrom_drives[id].host_drive
 
 extern void scsi_cdrom_reset(scsi_common_t *sc);
+extern void scsi_cdrom_drive_reset(const int c);
 
 #endif /*EMU_SCSI_CDROM_H*/
diff --git a/src/include/86box/scsi_device.h b/src/include/86box/scsi_device.h
index 09f9ee2d9..289201b04 100644
--- a/src/include/86box/scsi_device.h
+++ b/src/include/86box/scsi_device.h
@@ -21,6 +21,7 @@
 #define SCSI_DEVICE_H
 
 /* Configuration. */
+#define SCSI_NUM         (SCSI_BUS_MAX * SCSI_ID_MAX)
 
 #define SCSI_LUN_USE_CDB 0xff
 
@@ -53,8 +54,8 @@
 #define GPCMD_SEEK_6                                  0x0b
 #define GPCMD_IOMEGA_SET_PROTECTION_MODE              0x0c
 #define GPCMD_IOMEGA_EJECT                            0x0d /* ATAPI only? */
-#define GPCMD_NO_OPERATION_TOSHIBA                    0x0d /* Toshiba Vendor Unique command */
-#define GPCMD_NO_OPERATION_NEC                        0x0d /* NEC Vendor Unique command */
+#define GPCMD_NO_OPERATION_TOSHIBA                    0x0d /* Toshiba Vendor Unique command. */
+#define GPCMD_NO_OPERATION_NEC                        0x0d /* NEC Vendor Unique command. */
 #define GPCMD_INQUIRY                                 0x12
 #define GPCMD_VERIFY_6                                0x13
 #define GPCMD_MODE_SELECT_6                           0x15
@@ -66,7 +67,7 @@
 #define GPCMD_PREVENT_REMOVAL                         0x1e
 #define GPCMD_READ_FORMAT_CAPACITIES                  0x23
 #define GPCMD_READ_CDROM_CAPACITY                     0x25
-#define GPCMD_UNKNOWN_CHINON                          0x26 /*Chinon Vendor Unique command*/
+#define GPCMD_UNKNOWN_CHINON                          0x26 /* Chinon Vendor Unique command. */
 #define GPCMD_READ_10                                 0x28
 #define GPCMD_READ_GENERATION                         0x29
 #define GPCMD_WRITE_10                                0x2a
@@ -100,51 +101,64 @@
 #define GPCMD_WRITE_AND_VERIFY_12                     0xae
 #define GPCMD_VERIFY_12                               0xaf
 #define GPCMD_PLAY_CD_OLD                             0xb4
-#define GPCMD_READ_CD_OLD                             0xb8
+#define GPCMD_READ_CD_OLD                             0xb8 /* Should be equivalent to 0xbe */
 #define GPCMD_READ_CD_MSF                             0xb9
 #define GPCMD_AUDIO_SCAN                              0xba
 #define GPCMD_SET_SPEED                               0xbb
-#define GPCMD_PLAY_CD                                 0xbc
+#define GPCMD_PLAY_CD                                 0xbc /* At some point, this was READ CD, according to the
+                                                              ATAPI specification */
 #define GPCMD_MECHANISM_STATUS                        0xbd
 #define GPCMD_READ_CD                                 0xbe
 #define GPCMD_SEND_DVD_STRUCTURE                      0xbf /* This is for writing only, irrelevant to 86Box. */
-#define GPCMD_EJECT_CHINON                            0xc0 /* Chinon Vendor Unique command */
 #define GPCMD_AUDIO_TRACK_SEARCH_TOSHIBA              0xc0 /* Toshiba Vendor Unique command */
-#define GPCMD_UNKNOWN_SONY                            0xc0 /* Sony Vendor Unique command */
+#define GPCMD_EJECT_CHINON                            0xc0 /* Chinon Vendor Unique command */
+#define GPCMD_MAGAZINE_EJECT_PIONEER                  0xc0 /* Pioneer Vendor Unique command */
+#define GPCMD_SET_ADDRESS_FORMAT_SONY                 0xc0 /* Sony Vendor Unique command */
 #define GPCMD_PLAY_AUDIO_TOSHIBA                      0xc1 /* Toshiba Vendor Unique command */
+#define GPCMD_READ_TOC_PIONEER                        0xc1 /* Pioneer Vendor Unique command */
 #define GPCMD_READ_TOC_SONY                           0xc1 /* Sony Vendor Unique command */
 #define GPCMD_PAUSE_RESUME_ALT                        0xc2
 #define GPCMD_READ_SUBCHANNEL_MATSUSHITA              0xc2 /* Matsushita Vendor Unique command */
+#define GPCMD_READ_SUBCODEQ_PIONEER                   0xc2 /* Pioneer Vendor Unique command */
 #define GPCMD_READ_SUBCHANNEL_SONY                    0xc2 /* Sony Vendor Unique command */
 #define GPCMD_STILL_TOSHIBA                           0xc2 /* Toshiba Vendor Unique command */
 #define GPCMD_READ_TOC_MATSUSHITA                     0xc3 /* Matsushita Vendor Unique command */
 #define GPCMD_READ_HEADER_SONY                        0xc3 /* Sony Vendor Unique command */
 #define GPCMD_SET_STOP_TIME_TOSHIBA                   0xc3 /* Toshiba Vendor Unique command */
-#define GPCMD_READ_HEADER_MATSUSHITA                  0xc4 /* Matsushita Vendor Unique command */
-#define GPCMD_PLAYBACK_STATUS_TOSHIBA                 0xc4 /* Sony Vendor Unique command */
 #define GPCMD_CADDY_EJECT_TOSHIBA                     0xc4 /* Toshiba Vendor Unique command */
+#define GPCMD_PLAYBACK_STATUS_SONY                    0xc4 /* Sony Vendor Unique command */
+#define GPCMD_READ_HEADER_MATSUSHITA                  0xc4 /* Matsushita Vendor Unique command */
 #define GPCMD_PAUSE_SONY                              0xc5 /* Sony Vendor Unique command */
 #define GPCMD_PLAY_AUDIO_MATSUSHITA                   0xc5 /* Matsushita Vendor Unique command */
-#define GPCMD_STOP_CHINON                             0xc6 /* Chinon Vendor Unique command */
-#define GPCMD_PLAT_TRACK_SONY                         0xc6 /* Sony Vendor Unique command */
+#define GPCMD_UNKNOWN_SCSI2_NEC                       0xc5 /* NEC Vendor Unique Command */
+#define GPCMD_PLAY_TRACK_SONY                         0xc6 /* Sony Vendor Unique command */
 #define GPCMD_READ_SUBCODEQ_PLAYING_STATUS_TOSHIBA    0xc6 /* Toshiba Vendor Unique command */
+#define GPCMD_STOP_CHINON                             0xc6 /* Chinon Vendor Unique command */
 #define GPCMD_PLAY_AUDIO_MSF_MATSUSHITA               0xc7 /* Matsushita Vendor Unique command*/
 #define GPCMD_PLAY_MSF_SONY                           0xc7 /* Sony Vendor Unique command*/
 #define GPCMD_READ_DISC_INFORMATION_TOSHIBA           0xc7 /* Toshiba Vendor Unique command */
-#define GPCMD_PLAY_AUDIO_TRACK_INDEX_MATSUSHITA       0xc8 /* Matsushita Vendor Unique command */
+#define GPCMD_AUDIO_TRACK_SEARCH_PIONEER              0xc8 /* Pioneer Vendor Unique command */
 #define GPCMD_PLAY_AUDIO_SONY                         0xc8 /* Sony Vendor Unique command */
-#define GPCMD_PLAY_AUDIO_TRACK_RELATIVE_10_MATSUSHITA 0xc9 /*Matsushita Vendor Unique command */
+#define GPCMD_PLAY_AUDIO_TRACK_INDEX_MATSUSHITA       0xc8 /* Matsushita Vendor Unique command */
+#define GPCMD_READ_CDROM_MODE_TOSHIBA                 0xc8 /* Toshiba Vendor Unique command */
+#define GPCMD_PLAY_AUDIO_PIONEER                      0xc9 /* Pioneer Vendor Unique command */
+#define GPCMD_PLAY_AUDIO_TRACK_RELATIVE_10_MATSUSHITA 0xc9 /* Matsushita Vendor Unique command */
 #define GPCMD_PLAYBACK_CONTROL_SONY                   0xc9 /* Sony Vendor Unique command */
+#define GPCMD_PAUSE_PIONEER                           0xca /* Pioneer Vendor Unique command */
 #define GPCMD_PAUSE_RESUME_MATSUSHITA                 0xcb /* Matsushita Vendor Unique command */
+#define GPCMD_STOP_PIONEER                            0xcb /* Pioneer Vendor Unique command */
+#define GPCMD_PLAYBACK_STATUS_PIONEER                 0xcc /* Pioneer Vendor Unique command */
 #define GPCMD_SCAN_PIONEER                            0xcd /* Should be equivalent to 0xba */
+#define GPCMD_READ_CD_MSF_OLD                         0xd5 /* Should be equivalent to 0xb9 */
 #define GPCMD_AUDIO_TRACK_SEARCH_NEC                  0xd8 /* NEC Vendor Unique command */
 #define GPCMD_PLAY_AUDIO_NEC                          0xd9 /* NEC Vendor Unique command */
-#define GPCMD_STILL_NEC                               0xda /* NEC Vendor Unique command */
 #define GPCMD_SET_SPEED_ALT                           0xda /* Should be equivalent to 0xbb */
+#define GPCMD_STILL_NEC                               0xda /* NEC Vendor Unique command */
 #define GPCMD_SET_STOP_TIME_NEC                       0xdb /* NEC Vendor Unique command */
 #define GPCMD_CADDY_EJECT_NEC                         0xdc /* NEC Vendor Unique command */
 #define GPCMD_READ_SUBCODEQ_PLAYING_STATUS_NEC        0xdd /* NEC Vendor Unique command */
 #define GPCMD_READ_DISC_INFORMATION_NEC               0xde /* NEC Vendor Unique command */
+#define GPCMD_DRIVE_STATUS_PIONEER                    0xe0 /* Pioneer Vendor Unique command */
 #define GPCMD_PLAY_AUDIO_12_MATSUSHITA                0xe5 /* Matsushita Vendor Unique command */
 #define GPCMD_PLAY_AUDIO_TRACK_RELATIVE_12_MATSUSHITA 0xe9 /* Matsushita Vendor Unique command */
 
@@ -173,8 +187,8 @@
 #define GPMODEP_RIGID_DISK_PAGE       0x0000000000000010LL
 #define GPMODEP_FLEXIBLE_DISK_PAGE    0x0000000000000020LL
 #define GPMODEP_CACHING_PAGE          0x0000000000000100LL
-#define GPMODEP_CDROM_PAGE_SONY       0x0000000000000200LL
-#define GPMODEP_CDROM_AUDIO_PAGE_SONY 0x0000000000000400LL
+#define GPMODEP_CDROM_PAGE_SONY       0x0000000000000100LL
+#define GPMODEP_CDROM_AUDIO_PAGE_SONY 0x0000000000000200LL
 #define GPMODEP_CDROM_PAGE            0x0000000000002000LL
 #define GPMODEP_CDROM_AUDIO_PAGE      0x0000000000004000LL
 #define GPMODEP_CAPABILITIES_PAGE     0x0000040000000000LL
@@ -189,6 +203,7 @@
 /* SCSI Sense Keys */
 #define SENSE_NONE            0
 #define SENSE_NOT_READY       2
+#define SENSE_MEDIUM_ERROR    3
 #define SENSE_ILLEGAL_REQUEST 5
 #define SENSE_UNIT_ATTENTION  6
 
@@ -196,6 +211,8 @@
 #define ASC_NONE                               0x00
 #define ASC_AUDIO_PLAY_OPERATION               0x00
 #define ASC_NOT_READY                          0x04
+#define ASC_WRITE_ERROR                        0x0c
+#define ASC_UNRECOVERED_READ_ERROR             0x11
 #define ASC_ILLEGAL_OPCODE                     0x20
 #define ASC_LBA_OUT_OF_RANGE                   0x21
 #define ASC_INV_FIELD_IN_CMD_PACKET            0x24
@@ -203,7 +220,7 @@
 #define ASC_INV_FIELD_IN_PARAMETER_LIST        0x26
 #define ASC_WRITE_PROTECTED                    0x27
 #define ASC_MEDIUM_MAY_HAVE_CHANGED            0x28
-#define ASC_CAPACITY_DATA_CHANGED              0x2A
+#define ASC_CAPACITY_DATA_CHANGED              0x2a
 #define ASC_INCOMPATIBLE_FORMAT                0x30
 #define ASC_MEDIUM_NOT_PRESENT                 0x3a
 #define ASC_DATA_PHASE_ERROR                   0x4b
@@ -212,21 +229,18 @@
 #define ASCQ_NONE                              0x00
 #define ASCQ_UNIT_IN_PROCESS_OF_BECOMING_READY 0x01
 #define ASCQ_INITIALIZING_COMMAND_REQUIRED     0x02
+#define ASCQ_CIRC_UNRECOVERED_ERROR            0x06
 #define ASCQ_CAPACITY_DATA_CHANGED             0x09
 #define ASCQ_AUDIO_PLAY_OPERATION_IN_PROGRESS  0x11
 #define ASCQ_AUDIO_PLAY_OPERATION_PAUSED       0x12
 #define ASCQ_AUDIO_PLAY_OPERATION_COMPLETED    0x13
 
-/* Tell RISC OS that we have a 4x CD-ROM drive (600kb/sec data, 706kb/sec raw).
-   Not that it means anything */
-#define CDROM_SPEED 706 /* 0x2C2 */
-
-#define BUFFER_SIZE (256 * 1024)
-
-#define RW_DELAY    (TIMER_USEC * 500)
-
 /* Some generally useful CD-ROM information */
+#ifdef CONSERVATIVE_MAXIMUM
 #define CD_MINS        90   /* max. minutes per CD */
+#else
+#define CD_MINS        100  /* max. minutes per CD - yes, 100-minute CD's in fact existed */
+#endif
 #define CD_SECS        60   /* seconds per minute */
 #define CD_FRAMES      75   /* frames per second */
 #define CD_FRAMESIZE   2048 /* bytes per frame, "cooked" mode */
@@ -260,6 +274,10 @@
 
 /* Profile list from MMC-6 revision 1 table 91 */
 #define MMC_PROFILE_NONE              0x0000
+#define MMC_PROFILE_REMOVABLE_DISK    0x0002
+#define MMC_PROFILE_MO                0x0003
+#define MMC_PROFILE_MO_WORM           0x0004
+#define MMC_PROFILE_AS_MO             0x0005
 #define MMC_PROFILE_CD_ROM            0x0008
 #define MMC_PROFILE_CD_R              0x0009
 #define MMC_PROFILE_CD_RW             0x000A
@@ -288,7 +306,6 @@
 #define MMC_PROFILE_HDDVD_RW_DL       0x005A
 #define MMC_PROFILE_INVALID           0xFFFF
 
-#define EARLY_ONLY                    64
 #define SCSI_ONLY                     32
 #define ATAPI_ONLY                    16
 #define IMPLEMENTED                   8
@@ -296,8 +313,6 @@
 #define CHECK_READY                   2
 #define ALLOW_UA                      1
 
-#define MSFtoLBA(m, s, f)             ((((m * 60) + s) * 75) + f)
-
 #define MSG_COMMAND_COMPLETE          0x00
 
 #define BUS_DBP                       0x01
@@ -308,7 +323,7 @@
 #define BUS_REQ                       0x20
 #define BUS_BSY                       0x40
 #define BUS_RST                       0x80
-#define BUS_ACK                       0x200
+#define BUS_ACK                       0x100
 #define BUS_ATN                       0x200
 #define BUS_ARB                       0x8000
 #define BUS_SETDATA(val)              ((uint32_t) val << 16)
@@ -317,6 +332,20 @@
 
 #define BUS_IDLE                      (1 << 31)
 
+#define STATE_IDLE                    0
+#define STATE_COMMAND                 1
+#define STATE_DATAIN                  2
+#define STATE_DATAOUT                 3
+#define STATE_STATUS                  4
+#define STATE_MESSAGEIN               5
+#define STATE_SELECT                  6
+#define STATE_MESSAGEOUT              7
+#define STATE_MESSAGE_ID              8
+
+#define PIO_TX_BUS                    0
+#define DMA_IN_TX_BUS                 1
+#define DMA_OUT_TX_BUS                2
+
 #define PHASE_IDLE                    0x00
 #define PHASE_COMMAND                 0x01
 #define PHASE_DATA_IN                 0x02
@@ -341,7 +370,7 @@
 #define MODE_SELECT_PHASE_PAGE        4
 
 typedef struct mode_sense_pages_t {
-    uint8_t pages[0x40][0x40];
+    uint8_t            pages[0x40][0x40];
 } mode_sense_pages_t;
 
 /* This is so we can access the common elements to all SCSI device structs
@@ -349,70 +378,109 @@ typedef struct mode_sense_pages_t {
 typedef struct scsi_common_s {
     mode_sense_pages_t ms_pages_saved;
 
-    void *    priv;
+    void *             priv;
 #ifdef EMU_IDE_H
-    ide_tf_t *tf;
+    ide_tf_t *         tf;
 #else
-    void *    tf;
+    void *             tf;
 #endif
 
-    uint8_t *temp_buffer;
-    uint8_t atapi_cdb[16]; /* This is atapi_cdb in ATAPI-supporting devices,
-                              and pad in SCSI-only devices. */
-    uint8_t current_cdb[16];
-    uint8_t sense[256];
+    void *             log;
 
-#ifdef ANCIENT_CODE
-    /* Task file. */
-    uint8_t features;
-    uint8_t phase;
-    uint16_t request_length;
-    uint8_t status;
-    uint8_t error;
-    uint16_t pad;
-    uint32_t pos;
-#endif
+    uint8_t *          temp_buffer;
+    /*
+       This is atapi_cdb in ATAPI-supporting devices,
+       and pad in SCSI-only devices.
+     */
+    uint8_t            atapi_cdb[16];
+    uint8_t            current_cdb[16];
+    uint8_t            sense[256];
 
-    uint8_t id;
-    uint8_t cur_lun;
-    uint8_t pad0;
-    uint8_t pad1;
+    uint8_t            id;
+    uint8_t            cur_lun;
+    uint8_t            pad0;
+    uint8_t            pad1;
 
-    uint16_t max_transfer_len;
-    uint16_t pad2;
+    uint16_t           max_transfer_len;
+    uint16_t           pad2;
 
-    int requested_blocks;
-    int packet_status;
-    int total_length;
-    int do_page_save;
-    int unit_attention;
-    int request_pos;
-    int old_len;
-    int media_status;
+    int                requested_blocks;
+    int                packet_status;
+    int                total_length;
+    int                do_page_save;
+    int                unit_attention;
+    int                request_pos;
+    int                wait;
+    int                buffer_pos;
 
-    uint32_t sector_pos;
-    uint32_t sector_len;
-    uint32_t packet_len;
+    uint32_t           sector_pos;
+    uint32_t           sector_len;
+    uint32_t           packet_len;
+    uint32_t           block_len;
 
-    double callback;
+    double             callback;
+
+    uint8_t            (*ven_cmd)(void *sc, uint8_t *cdb, int32_t *BufLen);
 } scsi_common_t;
 
 typedef struct scsi_device_t {
-    int32_t buffer_length;
+    int32_t            buffer_length;
 
-    uint8_t  status;
-    uint8_t  phase;
-    uint16_t type;
+    uint8_t            status;
+    uint8_t            phase;
 
-    scsi_common_t *sc;
+    uint16_t           type;
 
-    void    (*command)(scsi_common_t *sc, uint8_t *cdb);
-    void    (*request_sense)(scsi_common_t *sc, uint8_t *buffer, uint8_t alloc_length);
-    void    (*reset)(scsi_common_t *sc);
-    uint8_t (*phase_data_out)(scsi_common_t *sc);
-    void    (*command_stop)(scsi_common_t *sc);
+    scsi_common_t *    sc;
+
+    void               (*command)(scsi_common_t *sc, const uint8_t *cdb);
+    void               (*request_sense)(scsi_common_t *sc, uint8_t *buffer,
+                                        uint8_t alloc_length);
+    void               (*reset)(scsi_common_t *sc);
+    uint8_t            (*phase_data_out)(scsi_common_t *sc);
+    void               (*command_stop)(scsi_common_t *sc);
 } scsi_device_t;
 
+typedef struct scsi_bus_t {
+    uint8_t            data;
+    uint8_t            msglun;
+    uint8_t            data_wait;
+    uint8_t            target_id;
+    uint8_t            bus_device;
+    uint8_t            pad;
+    uint8_t            pad0;
+    uint8_t            pad1;
+
+    uint8_t            command[16];
+    uint8_t            msgout[4];
+    uint8_t            pad2[4];
+
+    int                tx_mode;
+    int                clear_req;
+    int                wait_data;
+    int                wait_complete;
+    int                bus_out;
+    int                bus_in;
+    int                command_pos;
+    int                command_issued;
+    int                data_pos;
+    int                msgout_pos;
+    int                is_msgout;
+    int                state;
+
+    uint32_t           bus_phase;
+    uint32_t           total_len;
+    uint32_t           data_repeat;
+
+    double             period;
+    double             speed;
+    double             divider;
+    double             multi;
+
+    void              *priv;
+    void               (*timer)(void *priv, double period);
+} scsi_bus_t;
+
 /* These are based on the INQUIRY values. */
 #define SCSI_NONE            0x0060
 #define SCSI_FIXED_DISK      0x0000
@@ -423,15 +491,8 @@ typedef struct scsi_device_t {
 extern scsi_device_t scsi_devices[SCSI_BUS_MAX][SCSI_ID_MAX];
 #endif /* EMU_SCSI_H */
 
-extern int cdrom_add_error_and_subchannel(uint8_t *b, int real_sector_type);
-extern int cdrom_LBAtoMSF_accurate(void);
-
-extern int mode_select_init(uint8_t command, uint16_t pl_length, uint8_t do_save);
-extern int mode_select_terminate(int force);
-extern int mode_select_write(uint8_t val);
-
-extern uint8_t *scsi_device_sense(scsi_device_t *dev);
 extern double   scsi_device_get_callback(scsi_device_t *dev);
+extern uint8_t *scsi_device_sense(scsi_device_t *dev);
 extern void     scsi_device_request_sense(scsi_device_t *dev, uint8_t *buffer,
                                           uint8_t alloc_length);
 extern void     scsi_device_reset(scsi_device_t *dev);
@@ -439,14 +500,16 @@ extern int      scsi_device_present(scsi_device_t *dev);
 extern int      scsi_device_valid(scsi_device_t *dev);
 extern int      scsi_device_cdb_length(scsi_device_t *dev);
 extern void     scsi_device_command_phase0(scsi_device_t *dev, uint8_t *cdb);
-extern void     scsi_device_command_phase1(scsi_device_t *dev);
 extern void     scsi_device_command_stop(scsi_device_t *dev);
+extern void     scsi_device_command_phase1(scsi_device_t *dev);
 extern void     scsi_device_identify(scsi_device_t *dev, uint8_t lun);
 extern void     scsi_device_close_all(void);
 extern void     scsi_device_init(void);
 
 extern void    scsi_reset(void);
 extern uint8_t scsi_get_bus(void);
+extern int     scsi_bus_read(scsi_bus_t *scsi_bus);
+extern void    scsi_bus_update(scsi_bus_t *scsi_bus, int bus);
 
 extern void    scsi_bus_set_speed(uint8_t bus, double speed);
 extern double  scsi_bus_get_speed(uint8_t bus);
diff --git a/src/include/86box/scsi_disk.h b/src/include/86box/scsi_disk.h
index eb4dc69a4..2d2371172 100644
--- a/src/include/86box/scsi_disk.h
+++ b/src/include/86box/scsi_disk.h
@@ -19,51 +19,46 @@
 typedef struct scsi_disk_t {
     mode_sense_pages_t ms_pages_saved;
 
-    hard_disk_t *drv;
+    hard_disk_t *      drv;
 #ifdef EMU_IDE_H
-    ide_tf_t *   tf;
+    ide_tf_t *         tf;
 #else
-    void *       tf;
+    void *             tf;
 #endif
 
-    uint8_t *temp_buffer;
-    uint8_t  atapi_cdb[16];
-    uint8_t  current_cdb[16];
-    uint8_t  sense[256];
+    void *             log;
 
-#ifdef ANCIENT_CODE
-    /* Task file. */
-    uint8_t features;
-    uint8_t phase;
-    uint16_t request_length;
-    uint8_t status;
-    uint8_t error;
-    uint16_t pad;
-    uint32_t pos;
-#endif
+    uint8_t *          temp_buffer;
+    size_t             temp_buffer_sz;
+    uint8_t            atapi_cdb[16];
+    uint8_t            current_cdb[16];
+    uint8_t            sense[256];
 
-    uint8_t id;
-    uint8_t cur_lun;
-    uint8_t pad0;
-    uint8_t pad1;
+    uint8_t            id;
+    uint8_t            cur_lun;
+    uint8_t            pad0;
+    uint8_t            pad1;
 
-    uint16_t max_transfer_len;
-    uint16_t pad2;
+    uint16_t           max_transfer_len;
+    uint16_t           pad2;
 
-    int requested_blocks;
-    int packet_status;
-    int total_length;
-    int do_page_save;
-    int unit_attention;
-    int request_pos;
-    int pad6;
-    int pad7;
+    int                requested_blocks;
+    int                packet_status;
+    int                total_length;
+    int                do_page_save;
+    int                unit_attention;
+    int                request_pos;
+    int                pad6;
+    int                pad7;
 
-    uint32_t sector_pos;
-    uint32_t sector_len;
-    uint32_t packet_len;
+    uint32_t           sector_pos;
+    uint32_t           sector_len;
+    uint32_t           packet_len;
+    uint32_t           block_len;
 
-    double callback;
+    double             callback;
+
+    uint8_t            (*ven_cmd)(void *sc, uint8_t *cdb, int32_t *BufLen);
 } scsi_disk_t;
 
 extern scsi_disk_t *scsi_disk[HDD_NUM];
diff --git a/src/include/86box/scsi_ncr5380.h b/src/include/86box/scsi_ncr5380.h
index ecf5660ef..5a43ba76a 100644
--- a/src/include/86box/scsi_ncr5380.h
+++ b/src/include/86box/scsi_ncr5380.h
@@ -6,9 +6,8 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          Implementation of the NCR 5380 series of SCSI Host Adapters
- *          made by NCR. These controllers were designed for
- *          the ISA bus.
+ *          Implementation of the NCR 5380 chip made by NCR
+ *          and used in various controllers.
  *
  *
  *
@@ -17,21 +16,96 @@
  *          Fred N. van Kempen, <decwiz@yahoo.com>
  *
  *          Copyright 2017-2018 Sarah Walker.
- *          Copyright 2017-2018 TheCollector1995.
  *          Copyright 2017-2018 Fred N. van Kempen.
+ *          Copyright 2017-2024 TheCollector1995.
  */
 
 #ifndef SCSI_NCR5380_H
 #define SCSI_NCR5380_H
 
+#define NCR_CURDATA             0 /* current SCSI data (read only) */
+#define NCR_OUTDATA             0 /* output data (write only) */
+#define NCR_INITCOMMAND         1 /* initiator command (read/write) */
+#define NCR_MODE                2 /* mode (read/write) */
+#define NCR_TARGETCMD           3 /* target command (read/write) */
+#define NCR_SELENABLE           4 /* select enable (write only) */
+#define NCR_BUSSTATUS           4 /* bus status (read only) */
+#define NCR_STARTDMA            5 /* start DMA send (write only) */
+#define NCR_BUSANDSTAT          5 /* bus and status (read only) */
+#define NCR_DMATARGET           6 /* DMA target (write only) */
+#define NCR_INPUTDATA           6 /* input data (read only) */
+#define NCR_DMAINIRECV          7 /* DMA initiator receive (write only) */
+#define NCR_RESETPARITY         7 /* reset parity/interrupt (read only) */
+
+#define ICR_DBP                 0x01
+#define ICR_ATN                 0x02
+#define ICR_SEL                 0x04
+#define ICR_BSY                 0x08
+#define ICR_ACK                 0x10
+#define ICR_ARB_LOST            0x20
+#define ICR_ARB_IN_PROGRESS     0x40
+#define ICR_RST                 0x80
+#define ICR_PHASE               0x9e
+#define ICR_WRITE               0x9f
+
+#define MODE_ARBITRATE          0x01
+#define MODE_DMA                0x02
+#define MODE_MONITOR_BUSY       0x04
+#define MODE_ENA_EOP_INT        0x08
+
+#define STATUS_ACK              0x01
+#define STATUS_BUSY_ERROR       0x04
+#define STATUS_PHASE_MATCH      0x08
+#define STATUS_INT              0x10
+#define STATUS_DRQ              0x40
+#define STATUS_END_OF_DMA       0x80
+
+#define TCR_IO                  0x01
+#define TCR_CD                  0x02
+#define TCR_MSG                 0x04
+#define TCR_REQ                 0x08
+#define TCR_LAST_BYTE_SENT      0x80
+
+typedef struct ncr_t {
+    uint8_t icr;
+    uint8_t mode;
+    uint8_t tcr;
+    uint8_t isr;
+    uint8_t output_data;
+    uint8_t tx_data;
+    uint8_t irq_state;
+    uint8_t isr_reg;
+
+    uint8_t bus;
+
+    int     irq;
+
+    double  period;
+
+    void   *priv;
+    void  (*dma_mode_ext)(void *priv, void *ext_priv, uint8_t val);
+    int   (*dma_send_ext)(void *priv, void *ext_priv);
+    int   (*dma_initiator_receive_ext)(void *priv, void *ext_priv);
+    void  (*timer)(void *ext_priv, double period);
+
+    scsi_bus_t scsibus;
+} ncr_t;
+
+extern void     ncr5380_irq(ncr_t *ncr, int set_irq);
+extern void	    ncr5380_set_irq(ncr_t *ncr, int irq);
+extern uint32_t ncr5380_get_bus_host(ncr_t *ncr);
+extern void     ncr5380_write(uint16_t port, uint8_t val, ncr_t *ncr);
+extern uint8_t  ncr5380_read(uint16_t port, ncr_t *ncr);
+
+#ifdef EMU_DEVICE_H
 extern const device_t scsi_lcs6821n_device;
+extern const device_t scsi_pas_device;
 extern const device_t scsi_rt1000b_device;
 extern const device_t scsi_rt1000mc_device;
 extern const device_t scsi_t128_device;
+extern const device_t scsi_t228_device;
 extern const device_t scsi_t130b_device;
 extern const device_t scsi_ls2000_device;
-#if defined(DEV_BRANCH) && defined(USE_SUMO)
-extern const device_t scsi_scsiat_device;
 #endif
 
 #endif /*SCSI_NCR5380_H*/
diff --git a/src/include/86box/scsi_pcscsi.h b/src/include/86box/scsi_pcscsi.h
index 3acee78f9..c4dbedeff 100644
--- a/src/include/86box/scsi_pcscsi.h
+++ b/src/include/86box/scsi_pcscsi.h
@@ -25,6 +25,8 @@
 #ifndef SCSI_PCSCSI_H
 #define SCSI_PCSCSI_H
 
+extern const device_t am53c974_pci_device;
+extern const device_t am53c974a_pci_device;
 extern const device_t dc390_pci_device;
 extern const device_t ncr53c90a_mca_device;
 
diff --git a/src/include/86box/scsi_t128.h b/src/include/86box/scsi_t128.h
new file mode 100644
index 000000000..a3bc79335
--- /dev/null
+++ b/src/include/86box/scsi_t128.h
@@ -0,0 +1,52 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the NCR 53c400 series of SCSI Host Adapters
+ *          made by NCR. These controllers were designed for the ISA and MCA bus.
+ *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          TheCollector1995, <mariogplayer@gmail.com>
+ *          Fred N. van Kempen, <decwiz@yahoo.com>
+ *
+ *          Copyright 2017-2018 Sarah Walker.
+ *          Copyright 2017-2018 Fred N. van Kempen.
+ *          Copyright 2017-2024 TheCollector1995.
+ */
+
+#ifndef SCSI_T128_H
+#define SCSI_T128_H
+
+typedef struct t128_t {
+    ncr_t   ncr;
+    rom_t   bios_rom;
+    mem_mapping_t mapping;
+
+    uint8_t ctrl;
+    uint8_t status;
+    uint8_t buffer[512];
+    uint8_t ext_ram[0x80];
+    uint32_t block_count;
+
+    int block_loaded;
+    int pos, host_pos;
+
+    uint32_t rom_addr;
+
+    int bios_enabled;
+    uint8_t pos_regs[8];
+    int type;
+
+    pc_timer_t timer;
+} t128_t;
+
+extern void    t128_write(uint32_t addr, uint8_t val, void *priv);
+extern uint8_t t128_read(uint32_t addr, void *priv);
+
+extern void    t128_callback(void *priv);
+
+#endif /*SCSI_T128_H*/
diff --git a/src/include/86box/scsi_x54x.h b/src/include/86box/scsi_x54x.h
index 0f1874302..8d5964de5 100644
--- a/src/include/86box/scsi_x54x.h
+++ b/src/include/86box/scsi_x54x.h
@@ -476,7 +476,8 @@ typedef struct x54x_t {
     /* 8 bytes */
     char *bios_path;  /* path to BIOS image file */
     char *mcode_path; /* path to microcode image file, needed by the AHA-1542CP */
-    char *nvr_path;   /* path to NVR image file */
+
+    char nvr_path[64]; /* path to NVR image file */
 
     /* 56 bytes */
     /* Pointer to a structure of vendor-specific data that only the vendor-specific code can understand */
diff --git a/src/include/86box/serial.h b/src/include/86box/serial.h
index 08f77ea13..c6389a262 100644
--- a/src/include/86box/serial.h
+++ b/src/include/86box/serial.h
@@ -16,7 +16,7 @@
  *          Fred N. van Kempen, <decwiz@yahoo.com>
  *
  *          Copyright 2008-2020 Sarah Walker.
- *          Copyright 2016-2020 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  *          Copyright 2017-2020 Fred N. van Kempen.
  */
 
@@ -43,6 +43,18 @@
 #define COM3_IRQ  4
 #define COM4_ADDR 0x02e8
 #define COM4_IRQ  3
+// The following support being assingned IRQ 3, 4, 5, 9, 10, 11, 12 or 15
+// There doesn't appear to be any specific standard however
+// So defaults have been chosen arbitarily
+// TODO: Allow configuration of the IRQ in the UI
+//#define COM5_ADDR 0x03f0
+//#define COM5_IRQ  3
+#define COM5_ADDR 0x02f0
+#define COM5_IRQ  11
+#define COM6_ADDR 0x03e0
+#define COM6_IRQ  10
+#define COM7_ADDR 0x02e0
+#define COM7_IRQ  9
 
 struct serial_device_s;
 struct serial_s;
@@ -92,6 +104,7 @@ typedef struct serial_s {
 
 typedef struct serial_device_s {
     void    (*rcr_callback)(struct serial_s *serial, void *priv);
+    void    (*dtr_callback)(struct serial_s *serial, int status, void *priv);
     void    (*dev_write)(struct serial_s *serial, void *priv, uint8_t data);
     void    (*lcr_callback)(struct serial_s *serial, void *priv, uint8_t lcr);
     void    (*transmit_period_callback)(struct serial_s *serial, void *priv, double transmit_period);
@@ -112,23 +125,33 @@ extern serial_t *serial_attach_ex(int port,
                                   void (*lcr_callback)(struct serial_s *serial, void *priv, uint8_t data_bits),
                                   void *priv);
 
+extern serial_t *serial_attach_ex_2(int port,
+                                  void (*rcr_callback)(struct serial_s *serial, void *priv),
+                                  void (*dev_write)(struct serial_s *serial, void *priv, uint8_t data),
+                                  void (*dtr_callback)(struct serial_s *serial, int status, void *priv),
+                                  void *priv);
+
 #define serial_attach(port, rcr_callback, dev_write, priv) \
         serial_attach_ex(port, rcr_callback, dev_write, NULL, NULL, priv);
 
 extern void      serial_remove(serial_t *dev);
-extern void      serial_set_type(serial_t *dev, int type);
 extern void      serial_setup(serial_t *dev, uint16_t addr, uint8_t irq);
+extern void      serial_irq(serial_t *dev, uint8_t irq);
 extern void      serial_clear_fifo(serial_t *dev);
 extern void      serial_write_fifo(serial_t *dev, uint8_t dat);
 extern void      serial_set_next_inst(int ni);
 extern void      serial_standalone_init(void);
 extern void      serial_set_clock_src(serial_t *dev, double clock_src);
+extern void      serial_set_type(serial_t *dev, uint8_t type);
 extern void      serial_reset_port(serial_t *dev);
 extern uint8_t   serial_read(uint16_t addr, void *priv);
 extern void      serial_device_timeout(void *priv);
 extern void      serial_set_cts(serial_t *dev, uint8_t enabled);
 extern void      serial_set_dsr(serial_t *dev, uint8_t enabled);
 extern void      serial_set_dcd(serial_t *dev, uint8_t enabled);
+extern void      serial_set_ri(serial_t *dev, uint8_t enabled);
+extern int       serial_get_ri(serial_t *dev);
+extern uint8_t   serial_get_shadow(serial_t *dev);
 
 extern const device_t ns8250_device;
 extern const device_t ns8250_pcjr_device;
diff --git a/src/include/86box/serial_passthrough.h b/src/include/86box/serial_passthrough.h
index 7ca6479d6..a5fa0013a 100644
--- a/src/include/86box/serial_passthrough.h
+++ b/src/include/86box/serial_passthrough.h
@@ -13,7 +13,7 @@
  *              Jasmine Iwanek <jasmine@iwanek.co.uk>
  *
  *              Copyright 2021      Andreas J. Reichel.
- *              Copyright 2021-2022 Jasmine Iwanek.
+ *              Copyright 2021-2025 Jasmine Iwanek.
  */
 
 #ifndef SERIAL_PASSTHROUGH_H
@@ -28,10 +28,15 @@
 #include <86box/serial.h>
 
 enum serial_passthrough_mode {
-    SERPT_MODE_VCON,    /*Named Pipe (Server) / Pseudo Terminal/Virtual Console */
-    SERPT_MODE_TCPSRV,  /* TCP Server (TODO) */
-    SERPT_MODE_TCPCLNT, /* TCP Client (TODO) */
-    SERPT_MODE_HOSTSER, /* Host Serial Passthrough */
+#ifdef _WIN32
+    SERPT_MODE_NPIPE_SRV,  /* Named Pipe (Server) */
+    SERPT_MODE_NPIPE_CLNT, /* Named Pipe (Client) */
+#else
+    SERPT_MODE_VCON,       /* Pseudo Terminal/Virtual Console */
+#endif
+    SERPT_MODE_TCP_SRV,    /* TCP Server (TODO) */
+    SERPT_MODE_TCP_CLNT,   /* TCP Client (TODO) */
+    SERPT_MODE_HOSTSER,    /* Host Serial Passthrough */
     SERPT_MODES_MAX,
 };
 
@@ -55,7 +60,7 @@ typedef struct serial_passthrough_s {
     void *backend_priv;                        /* Private platform backend data */
 } serial_passthrough_t;
 
-extern bool           serial_passthrough_enabled[SERIAL_MAX];
+extern bool           serial_passthrough_enabled[SERIAL_MAX - 1];
 extern const device_t serial_passthrough_device;
 
 extern void serial_passthrough_init(void);
diff --git a/src/include/86box/sio.h b/src/include/86box/sio.h
index b07e73e8e..2bae49ae1 100644
--- a/src/include/86box/sio.h
+++ b/src/include/86box/sio.h
@@ -16,82 +16,199 @@
 #ifndef EMU_SIO_H
 #define EMU_SIO_H
 
-extern void vt82c686_sio_write(uint8_t addr, uint8_t val, void *priv);
-
+/* ACC Micro */
 extern const device_t acc3221_device;
-extern const device_t ali5105_device;
+
+/* Acer / ALi */
 extern const device_t ali5123_device;
-extern const device_t f82c710_device;
+
+/* Chips & Technologies */
 extern const device_t f82c606_device;
-extern const device_t fdc37c651_device;
-extern const device_t fdc37c651_ide_device;
-extern const device_t fdc37c661_device;
-extern const device_t fdc37c661_ide_device;
-extern const device_t fdc37c661_ide_sec_device;
-extern const device_t fdc37c663_device;
-extern const device_t fdc37c663_ide_device;
-extern const device_t fdc37c665_device;
-extern const device_t fdc37c665_ide_device;
-extern const device_t fdc37c665_ide_pri_device;
-extern const device_t fdc37c665_ide_sec_device;
-extern const device_t fdc37c666_device;
-extern const device_t fdc37c67x_device;
+
+extern const device_t f82c710_device;
+extern const device_t f82c710_pc5086_device;
+
+/* Commodore */
+extern const device_t cbm_io_device;
+
+/* Dataworld 90C50 (COMBAT) */
+#define DW90C50_IDE          0x00001
+
+extern const device_t dw90c50_device;
+
+extern const device_t pc87310_device;
+/* SM(S)C */
+#define FDC37C651            0x00051
+#define FDC37C661            0x00061
+#define FDC37C663            0x00063
+#define FDC37C665            0x00065
+#define FDC37C666            0x00066
+
+#define FDC37C6XX_IDE_PRI    0x00100
+#define FDC37C6XX_IDE_SEC    0x00200
+
+#define FDC37C6XX_370        0x00400
+
+extern const device_t fdc37c6xx_device;
+
 extern const device_t fdc37c669_device;
-extern const device_t fdc37c669_370_device;
-extern const device_t fdc37c931apm_device;
-extern const device_t fdc37c931apm_compaq_device;
-extern const device_t fdc37c932fr_device;
-extern const device_t fdc37c932qf_device;
-extern const device_t fdc37c935_device;
+
+#define FDC37C93X_NORMAL     0x00002
+#define FDC37C93X_FR         0x00003
+#define FDC37C93X_APM        0x00030
+#define FDC37C93X_CHIP_ID    0x000ff
+
+#define FDC37XXX1            0x00100    /* Compaq KBC firmware and configuration registers on GPIO ports. */
+#define FDC37XXX2            0x00200    /* AMI '5' Megakey KBC firmware. */
+#define FDC37XXX3            0x00300    /* IBM KBC firmware. */
+#define FDC37XXX5            0x00500    /* Phoenix Multikey/42 1.38 KBC firmware. */
+#define FDC37XXX7            0x00700    /* Phoenix Multikey/42i 4.16 KBC firmware. */
+#define FDC37XXXX_KBC        0x00f00
+
+#define FDC37C93X_NO_NVR     0x01000
+#define FDC37XXXX_370        0x02000
+
+extern const device_t fdc37c93x_device;
+
 extern const device_t fdc37m60x_device;
-extern const device_t fdc37m60x_370_device;
+
+extern const device_t fdc37c67x_device;
+
+/* ITE */
 extern const device_t it8661f_device;
 extern const device_t it8671f_device;
+
+/* Intel */
+#define I82091AA_022         0x00000    /* Default. */
+#define I82091AA_024         0x00008
+#define I82091AA_26E         0x00100
+#define I82091AA_398         0x00108
+
+#define I82091AA_IDE_PRI     0x00200
+#define I82091AA_IDE_SEC     0x00400
+
 extern const device_t i82091aa_device;
-extern const device_t i82091aa_398_device;
-extern const device_t i82091aa_ide_pri_device;
-extern const device_t i82091aa_ide_device;
-extern const device_t pc87306_device;
-extern const device_t pc87307_device;
-extern const device_t pc87307_15c_device;
-extern const device_t pc87307_both_device;
-extern const device_t pc87309_device;
-extern const device_t pc87309_15c_device;
+
+/* National Semiconductors PC87310 / ALi M5105 */
+#define PCX73XX_IDE          0x00001
+
+#define PCX73XX_IDE_PRI      PCX73XX_IDE
+#define PCX73XX_IDE_SEC      0x00002
+
+#define PCX73XX_FDC_ON       0x10000
+
+#define PC87310_ALI          0x00004
+#define PC87332              PC87310_ALI
+
 extern const device_t pc87310_device;
-extern const device_t pc87310_ide_device;
-extern const device_t pc87311_device;
-extern const device_t pc87311_ide_device;
-extern const device_t pc87332_device;
-extern const device_t pc87332_398_device;
-extern const device_t pc87332_398_ide_device;
-extern const device_t pc87332_398_ide_sec_device;
-extern const device_t pc87332_398_ide_fdcon_device;
-extern const device_t pc97307_device;
-extern const device_t prime3b_device;
-extern const device_t prime3b_ide_device;
-extern const device_t prime3c_device;
-extern const device_t prime3c_ide_device;
+
+/* National Semiconductors */
+#define PCX7307_PC87307      0x000c0
+#define PCX7307_PC97307      0x000cf
+
+#define PC87309_PC87309      0x000e0
+
+#define PCX730X_CHIP_ID      0x000ff
+
+#define PCX730X_AMI          0x00200    /* AMI '5' Megakey KBC firmware. */
+#define PCX730X_PHOENIX_42   0x00500    /* Phoenix Multikey/42 1.37 KBC firmware. */
+#define PCX730X_PHOENIX_42I  0x00700    /* Phoenix Multikey/42i 4.16 KBC firmware. */
+#define PCX730X_KBC          0x00f00
+
+#define PCX730X_398          0x00000
+#define PCX730X_26E          0x01000
+#define PCX730X_15C          0x02000
+#define PCX730X_02E          0x03000
+#define PCX730X_BADDR        0x03000
+#define PCX730X_BADDR_SHIFT       12
+
+extern const device_t pc87306_device;
+
+extern const device_t pc873xx_device;
+
+/* National Semiconductors PC87307 / PC87309 */
+extern const device_t pc87307_device;
+
+extern const device_t pc87309_device;
+
+/* LG Prime */
+#define GM82C803A            0x00000
+#define GM82C803B            0x00001
+
+#define GM82C803_IDE_PRI     0x00100
+#define GM82C803_IDE_SEC     0x00200
+
+extern const device_t gm82c803ab_device;
+
+extern const device_t gm82c803c_device;
+
+/* IBM PS/1 */
 extern const device_t ps1_m2133_sio;
-#if defined(DEV_BRANCH) && defined(USE_SIO_DETECT)
+
+/* Super I/O Detect */
+#ifdef USE_SIO_DETECT
 extern const device_t sio_detect_device;
-#endif
+#endif /* USE_SIO_DETECT */
+
+/* UMC */
+#define UM82C862F            0x00000
+#define UM82C863F            0x0c100
+#define UM8663AF             0x0c300
+#define UM8663BF             0x0c400
+
+#define UM866X_IDE_PRI       0x00001
+#define UM866X_IDE_SEC       0x00002
+
+extern const device_t um866x_device;
+
 extern const device_t um8669f_device;
-extern const device_t um8669f_ide_device;
-extern const device_t um8669f_ide_sec_device;
+
+/* VIA */
+extern void vt82c686_sio_write(uint8_t addr, uint8_t val, void *priv);
+
 extern const device_t via_vt82c686_sio_device;
-extern const device_t w83787f_88h_device;
-extern const device_t w83787f_device;
-extern const device_t w83787f_ide_device;
-extern const device_t w83787f_ide_en_device;
-extern const device_t w83787f_ide_sec_device;
-extern const device_t w83877f_device;
-extern const device_t w83877f_president_device;
-extern const device_t w83877tf_device;
-extern const device_t w83877tf_acorp_device;
-extern const device_t w83977f_device;
-extern const device_t w83977f_370_device;
-extern const device_t w83977tf_device;
-extern const device_t w83977ef_device;
-extern const device_t w83977ef_370_device;
+
+/* VLSI */
+extern const device_t vl82c113_device;
+
+/* Winbond */
+#define W83777F              0x00007
+#define W83787F              0x00008
+#define W83787IF             0x00009
+
+#define W837X7_KEY_88        0x00000
+#define W837X7_KEY_89        0x00020
+
+#define W837X7_IDE_START     0x00040
+
+#define W83XX7_IDE_PRI       0x10000
+#define W83XX7_IDE_SEC       0x20000
+
+extern const device_t w837x7_device;
+
+#define W83877F              0x00a00
+#define W83877TF             0x00c00
+#define W83877_3F0           0x00005
+#define W83877_250           0x00004
+
+extern const device_t w83877_device;
+
+#define W83977F             0x977100
+#define W83977TF            0x977300
+#define W83977EF            0x52f000
+#define W83977_TYPE         0xffff00
+#define W83977_TYPE_SHIFT          8
+
+#define W83977_3F0           0x00000
+#define W83977_370           0x00001
+
+#define W83977_NO_NVR        0x00002
+
+#define W83977_AMI           0x00010    /* AMI 'H' KBC firmware. */
+#define W83977_PHOENIX       0x00020    /* Unknown Phoenix Multikey KBC firmware. */
+
+#define W83977_KBC           0x000f0
+
+extern const device_t w83977_device;
 
 #endif /*EMU_SIO_H*/
diff --git a/src/include/86box/sis_55xx.h b/src/include/86box/sis_55xx.h
new file mode 100644
index 000000000..99ccf7dfa
--- /dev/null
+++ b/src/include/86box/sis_55xx.h
@@ -0,0 +1,78 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Header for the implementation of the SiS 55xx Pentium
+ *          PCI/ISA Chipsets.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2019-2020 Miran Grca.
+ */
+#ifndef EMU_SIS_55XX_H
+#define EMU_SIS_55XX_H
+
+typedef struct
+{
+    uint8_t     sb_pci_slot;
+    uint8_t     ide_bits_1_3_writable;
+    uint8_t     usb_enabled;
+
+    uint8_t    *pmu_regs;
+
+    sff8038i_t *bm[2];
+    acpi_t     *acpi;
+} sis_55xx_common_t;
+
+extern void    sis_5511_host_to_pci_write(int addr, uint8_t val, void *priv);
+extern uint8_t sis_5511_host_to_pci_read(int addr, void *priv);
+extern void    sis_5571_host_to_pci_write(int addr, uint8_t val, void *priv);
+extern uint8_t sis_5571_host_to_pci_read(int addr, void *priv);
+extern void    sis_5581_host_to_pci_write(int addr, uint8_t val, void *priv);
+extern uint8_t sis_5581_host_to_pci_read(int addr, void *priv);
+extern void    sis_5591_host_to_pci_write(int addr, uint8_t val, void *priv);
+extern uint8_t sis_5591_host_to_pci_read(int addr, void *priv);
+extern void    sis_5600_host_to_pci_write(int addr, uint8_t val, void *priv);
+extern uint8_t sis_5600_host_to_pci_read(int addr, void *priv);
+
+extern void    sis_5513_pci_to_isa_write(int addr, uint8_t val, void *priv);
+extern uint8_t sis_5513_pci_to_isa_read(int addr, void *priv);
+extern void    sis_5513_ide_write(int addr, uint8_t val, void *priv);
+extern uint8_t sis_5513_ide_read(int addr, void *priv);
+extern void    sis_5572_usb_write(int addr, uint8_t val, void *priv);
+extern uint8_t sis_5572_usb_read(int addr, void *priv);
+extern void    sis_5595_pmu_write(int addr, uint8_t val, void *priv);
+extern uint8_t sis_5595_pmu_read(int addr, void *priv);
+
+extern const device_t sis_5511_h2p_device;
+extern const device_t sis_5571_h2p_device;
+extern const device_t sis_5581_h2p_device;
+extern const device_t sis_5591_h2p_device;
+extern const device_t sis_5600_h2p_device;
+
+extern const device_t sis_5513_p2i_device;
+extern const device_t sis_5572_p2i_device;
+extern const device_t sis_5582_p2i_device;
+extern const device_t sis_5595_1997_p2i_device;
+extern const device_t sis_5595_p2i_device;
+
+extern const device_t sis_5513_ide_device;
+extern const device_t sis_5572_ide_device;
+extern const device_t sis_5582_ide_device;
+extern const device_t sis_5591_5600_ide_device;
+
+extern const device_t sis_5572_usb_device;
+extern const device_t sis_5582_usb_device;
+extern const device_t sis_5595_usb_device;
+
+extern const device_t sis_5595_pmu_device;
+extern const device_t sis_5595_1997_pmu_device;
+
+extern const device_t sis_55xx_common_device;
+
+
+#endif /*EMU_SIS_55XX_H*/
diff --git a/src/include/86box/smbus.h b/src/include/86box/smbus.h
index 340d1d00e..2c06c3d4e 100644
--- a/src/include/86box/smbus.h
+++ b/src/include/86box/smbus.h
@@ -15,8 +15,8 @@
  *          Copyright 2020 RichardG.
  */
 
-#ifndef EMU_SMBUS_PIIX4_H
-#define EMU_SMBUS_PIIX4_H
+#ifndef EMU_SMBUS_H
+#define EMU_SMBUS_H
 
 #define SMBUS_PIIX4_BLOCK_DATA_SIZE   32
 #define SMBUS_PIIX4_BLOCK_DATA_MASK   (SMBUS_PIIX4_BLOCK_DATA_SIZE - 1)
@@ -24,6 +24,9 @@
 #define SMBUS_ALI7101_BLOCK_DATA_SIZE 32
 #define SMBUS_ALI7101_BLOCK_DATA_MASK (SMBUS_ALI7101_BLOCK_DATA_SIZE - 1)
 
+#define SMBUS_SIS5595_BLOCK_DATA_SIZE 32
+#define SMBUS_SIS5595_BLOCK_DATA_MASK (SMBUS_ALI7101_BLOCK_DATA_SIZE - 1)
+
 enum {
     SMBUS_PIIX4 = 0,
     SMBUS_VIA   = 1
@@ -63,16 +66,47 @@ typedef struct smbus_ali7101_t {
     void      *i2c;
 } smbus_ali7101_t;
 
-extern void smbus_piix4_remap(smbus_piix4_t *dev, uint16_t new_io_base, uint8_t enable);
-extern void smbus_piix4_setclock(smbus_piix4_t *dev, int clock);
+typedef struct smbus_sis5595_t {
+    uint32_t   local;
+    uint16_t   stat;
+    uint16_t   next_stat;
+    uint16_t   ctl;
+    uint8_t    cmd;
+    uint8_t    addr;
+    uint8_t    saved_addr;
+    uint8_t    block_ptr;
+    uint8_t    count;
+    uint8_t    data0;
+    uint8_t    data1;
+    uint8_t    alias;
+    uint8_t    reg_ff;
+    uint8_t    index;
+    uint8_t    irq_enable;
+    uint8_t    irq_state;
+    uint8_t    data[SMBUS_SIS5595_BLOCK_DATA_SIZE];
+    pc_timer_t response_timer;
+    void      *i2c;
+} smbus_sis5595_t;
 
-extern void smbus_ali7101_remap(smbus_ali7101_t *dev, uint16_t new_io_base, uint8_t enable);
+extern void    smbus_piix4_remap(smbus_piix4_t *dev, uint16_t new_io_base, uint8_t enable);
+extern void    smbus_piix4_setclock(smbus_piix4_t *dev, int clock);
+
+extern void    smbus_ali7101_remap(smbus_ali7101_t *dev, uint16_t new_io_base, uint8_t enable);
+
+extern void    smbus_sis5595_irq_enable(void *priv, uint8_t enable);
+
+extern uint8_t smbus_sis5595_read_index(void *priv);
+extern uint8_t smbus_sis5595_read_data(void *priv);
+extern void    smbus_sis5595_write_index(void *priv, uint8_t val);
+extern void    smbus_sis5595_write_data(void *priv, uint8_t val);
 
 #ifdef EMU_DEVICE_H
 extern const device_t piix4_smbus_device;
 extern const device_t via_smbus_device;
 
 extern const device_t ali7101_smbus_device;
+
+extern const device_t sis5595_smbus_device;
 #endif
 
-#endif /*EMU_SMBUS_PIIX4_H*/
+#endif /*EMU_SMBUS_H*/
diff --git a/src/include/86box/snd_ac97.h b/src/include/86box/snd_ac97.h
index 45a921863..a365f5afa 100644
--- a/src/include/86box/snd_ac97.h
+++ b/src/include/86box/snd_ac97.h
@@ -100,6 +100,7 @@
 #define AC97_CODEC_STAC9708 AC97_VENDOR_ID(0x83, 0x84, 0x76, 0x08)
 #define AC97_CODEC_STAC9721 AC97_VENDOR_ID(0x83, 0x84, 0x76, 0x09)
 #define AC97_CODEC_TR28023  AC97_VENDOR_ID('T', 'R', 'A', 0x03)
+#define AC97_CODEC_W83971D  AC97_VENDOR_ID('W', 'E', 'C', 0x01)
 #define AC97_CODEC_WM9701A  AC97_VENDOR_ID('W', 'M', 'L', 0x00)
 
 typedef struct ac97_vendor_reg_t {
@@ -150,6 +151,7 @@ extern const device_t cs4297a_device;
 extern const device_t stac9708_device;
 extern const device_t stac9721_device;
 extern const device_t tr28023_device;
+extern const device_t w83971d_device;
 extern const device_t wm9701a_device;
 
 extern const device_t ac97_via_device;
diff --git a/src/include/86box/snd_ad1848.h b/src/include/86box/snd_ad1848.h
index 6bdd2bf40..a7e38a6f8 100644
--- a/src/include/86box/snd_ad1848.h
+++ b/src/include/86box/snd_ad1848.h
@@ -16,7 +16,7 @@
  *
  *          Copyright 2008-2020 Sarah Walker.
  *          Copyright 2018-2020 TheCollector1995.
- *          Copyright 2021 RichardG.
+ *          Copyright 2021-2025 RichardG.
  */
 
 #ifndef SOUND_AD1848_H
@@ -26,8 +26,10 @@ enum {
     AD1848_TYPE_DEFAULT = 0,
     AD1848_TYPE_CS4248  = 1,
     AD1848_TYPE_CS4231  = 2,
-    AD1848_TYPE_CS4235  = 3,
-    AD1848_TYPE_CS4236  = 4
+    AD1848_TYPE_CS4232  = 3,
+    AD1848_TYPE_CS4236  = 4,
+    AD1848_TYPE_CS4236B = 5,
+    AD1848_TYPE_CS4235  = 6
 };
 
 typedef struct ad1848_t {
@@ -61,6 +63,9 @@ typedef struct ad1848_t {
     int     adpcm_data;
     int     adpcm_pos;
 
+    uint8_t  dma_ff;
+    uint32_t dma_data;
+
     pc_timer_t timer_count;
     uint64_t   timer_latch;
 
diff --git a/src/include/86box/win_opengl_glslp.h b/src/include/86box/snd_akm4531.h
similarity index 52%
rename from src/include/86box/win_opengl_glslp.h
rename to src/include/86box/snd_akm4531.h
index 6586cd526..96f87b396 100644
--- a/src/include/86box/win_opengl_glslp.h
+++ b/src/include/86box/snd_akm4531.h
@@ -6,19 +6,17 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          Header file for shader file parser.
+ *          Ensoniq AudioPCI family emulation.
  *
- * Authors: Teemu Korhonen
+ * Authors: Cacodemon345
  *
- *          Copyright 2021 Teemu Korhonen
+ *          Copyright 2024-2025 Cacodemon345.
  */
+struct akm4531_t
+{
+    unsigned char registers[256];
+};
 
-#ifndef WIN_OPENGL_GLSLP_H
-#define WIN_OPENGL_GLSLP_H
+typedef struct akm4531_t akm4531_t;
 
-#include <glad/glad.h>
-
-GLuint load_custom_shaders(const char *path);
-GLuint load_default_shaders(void);
-
-#endif /*!WIN_OPENGL_GLSLP_H*/
+double akm4531_apply_master_vol(unsigned short sample);
\ No newline at end of file
diff --git a/src/include/86box/snd_emu8k.h b/src/include/86box/snd_emu8k.h
index 090ab662a..4bad23b97 100644
--- a/src/include/86box/snd_emu8k.h
+++ b/src/include/86box/snd_emu8k.h
@@ -390,12 +390,12 @@ typedef struct emu8k_t {
     int16_t out_r;
 
     emu8k_chorus_eng_t chorus_engine;
-    int32_t            chorus_in_buffer[SOUNDBUFLEN];
+    int32_t            chorus_in_buffer[WTBUFLEN];
     emu8k_reverb_eng_t reverb_engine;
-    int32_t            reverb_in_buffer[SOUNDBUFLEN];
+    int32_t            reverb_in_buffer[WTBUFLEN];
 
     int     pos;
-    int32_t buffer[SOUNDBUFLEN * 2];
+    int32_t buffer[WTBUFLEN * 2];
 
     uint16_t addr;
 } emu8k_t;
@@ -406,6 +406,8 @@ void emu8k_close(emu8k_t *emu8k);
 
 void emu8k_update(emu8k_t *emu8k);
 
+#define EMU8K_ROM_PATH "roms/sound/creative/awe32.raw"
+
 /*
 
 Section E - Introduction to the EMU8000 Chip
diff --git a/src/include/86box/snd_mmb.h b/src/include/86box/snd_mmb.h
new file mode 100644
index 000000000..6e5f7d3a8
--- /dev/null
+++ b/src/include/86box/snd_mmb.h
@@ -0,0 +1,42 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Mindscape Music Board emulation.
+ *
+ * Authors: Roy Baer, <https://pcem-emulator.co.uk/>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
+ *
+ *          Copyright 2025 Roy Baer.
+ *          Copyright 2025 Jasmine Iwanek.
+ */
+#ifndef _SOUND_SND_MMB_H_
+#define _SOUND_SND_MMB_H_
+
+#define MMB_FREQ FREQ_48000
+
+/* NOTE:
+ * The constant clock rate is a deviation from the real hardware which has
+ * the design flaw that the clock rate is always half the ISA bus clock.
+ */
+#define MMB_CLOCK 2386364
+
+typedef struct ay_3_891x_s {
+    uint8_t index;
+    uint8_t regs[16];
+    struct  ayumi chip;
+} ay_3_891x_t;
+
+typedef struct mmb_s {
+    ay_3_891x_t first;
+    ay_3_891x_t second;
+
+    int16_t buffer[SOUNDBUFLEN * 2];
+    int     pos;
+} mmb_t;
+
+#endif /* _SOUND_SND_MMB_H_ */
diff --git a/src/include/86box/snd_mpu401.h b/src/include/86box/snd_mpu401.h
index 8cd275af8..6dd99379e 100644
--- a/src/include/86box/snd_mpu401.h
+++ b/src/include/86box/snd_mpu401.h
@@ -26,9 +26,9 @@
 
 #define MPU401_VERSION      0x15
 #define MPU401_REVISION     0x01
-#define MPU401_QUEUE        1024
+#define MPU401_QUEUE        32
 #define MPU401_INPUT_QUEUE  1024
-#define MPU401_TIMECONSTANT (60000000 / 1000.0f)
+#define MPU401_TIMECONSTANT (60000000.0 / 1000.0)
 #define MPU401_RESETBUSY    27.0f
 
 /*helpers*/
@@ -89,7 +89,7 @@ typedef struct mpu_t {
     uint32_t ch_toref[16];
     struct track {
         int         counter;
-        uint8_t     value[3];
+        uint8_t     value[8];
         uint8_t     sys_val;
         uint8_t     vlength;
         uint8_t     length;
@@ -106,7 +106,6 @@ typedef struct mpu_t {
         int      wsm;
         int      wsd_start;
         int      run_irq;
-        int      irq_pending;
         int      track_req;
         int      send_now;
         int      eoi_scheduled;
@@ -116,9 +115,11 @@ typedef struct mpu_t {
         int      sysex_in_finished;
         int      rec_copy;
         RecState rec;
+        uint8_t  irq_pending;
         uint8_t  tmask;
         uint8_t  cmask;
         uint8_t  amask;
+        uint8_t  queued_eois;
         uint8_t  last_rtcmd;
         uint16_t midi_mask;
         uint16_t req_mask;
diff --git a/src/include/86box/snd_opl.h b/src/include/86box/snd_opl.h
index 0d89589c4..62c62e965 100644
--- a/src/include/86box/snd_opl.h
+++ b/src/include/86box/snd_opl.h
@@ -18,11 +18,35 @@
 #define SOUND_OPL_H
 
 enum fm_type {
-    FM_YM3812  = 0, /* OPL2 */
-    FM_YMF262  = 1, /* OPL3 */
-    FM_YMF289B = 2, /* OPL3-L */
-    FM_YMF278B = 3, /* OPL 4 */
-    FM_MAX     = 4
+    FM_YM2149    =  0, /* SSG */
+    FM_YM3526    =  1, /* OPL */
+    FM_Y8950     =  2, /* MSX-Audio (OPL with ADPCM) */
+    FM_YM3812    =  3, /* OPL2 */
+    FM_YMF262    =  4, /* OPL3 */
+    FM_YMF289B   =  5, /* OPL3-L */
+    FM_YMF278B   =  6, /* OPL4 */
+    FM_YM2413    =  7, /* OPLL */
+    FM_YM2423    =  8, /* OPLL-X */
+    FM_YMF281    =  9, /* OPLLP */
+    FM_DS1001    = 10, /* Konami VRC7 MMC */
+    FM_YM2151    = 11, /* OPM */
+    FM_YM2203    = 12, /* OPN */
+    FM_YM2608    = 13, /* OPNA */
+    FM_YMF288    = 14, /* OPN3L */
+    FM_YM2610    = 15, /* OPNB */
+    FM_YM2610B   = 16, /* OPNB2 */
+    FM_YM2612    = 17, /* OPN2 */
+    FM_YM3438    = 18, /* OPN2C */
+    FM_YMF276    = 19, /* OPN2L */
+    FM_YM2164    = 20, /* OPP */
+    FM_YM3806    = 21, /* OPQ */
+#if 0
+    FM_YMF271    = 22, /* OPX */
+#endif
+    FM_YM2414    = 23, /* OPZ */
+    FM_ESFM      = 24, /* ESFM */
+    FM_OPL2BOARD = 25, /* OPL2Board (External Device) */
+    FM_MAX       = 26
 };
 
 enum fm_driver {
@@ -45,15 +69,60 @@ extern uint8_t fm_driver_get(int chip_id, fm_drv_t *drv);
 
 extern const fm_drv_t nuked_opl_drv;
 extern const fm_drv_t ymfm_drv;
+extern const fm_drv_t esfmu_opl_drv;
+extern const fm_drv_t ymfm_opl2board_drv;
 
 #ifdef EMU_DEVICE_H
 extern const device_t ym3812_nuked_device;
 extern const device_t ymf262_nuked_device;
 
+extern const device_t ym2149_ymfm_device;
+
+/* OPL Series */
+extern const device_t ym3526_ymfm_device;
+extern const device_t y8950_ymfm_device;
 extern const device_t ym3812_ymfm_device;
 extern const device_t ymf262_ymfm_device;
 extern const device_t ymf289b_ymfm_device;
 extern const device_t ymf278b_ymfm_device;
+extern const device_t ym2413_ymfm_device;
+extern const device_t ym2423_ymfm_device;
+extern const device_t ymf281_ymfm_device;
+extern const device_t ds1001_ymfm_device;
+
+/* OPM Series */
+extern const device_t ym2151_ymfm_device;
+
+/* OPN Series */
+extern const device_t ym2203_ymfm_device;
+extern const device_t ym2608_ymfm_device;
+extern const device_t ymf288_ymfm_device;
+extern const device_t ym2610_ymfm_device;
+extern const device_t ym2610b_ymfm_device;
+extern const device_t ym2612_ymfm_device;
+extern const device_t ym3438_ymfm_device;
+extern const device_t ymf276_ymfm_device;
+
+/* OPP Series */
+extern const device_t ym2164_ymfm_device;
+
+/* OPQ Series */
+extern const device_t ym3806_ymfm_device;
+
+/* OPX Series */
+#if 0
+extern const device_t ymf271_ymfm_device;
+#endif
+
+/* OPZ Series */
+extern const device_t ym2414_ymfm_device;
+
+extern const device_t esfm_esfmu_device;
+
+#ifdef USE_LIBSERIALPORT
+extern const device_t ym_opl2board_device;
+#endif
+
 #endif
 
 #endif /*SOUND_OPL_H*/
diff --git a/src/include/86box/snd_opl_nuked.h b/src/include/86box/snd_opl_nuked.h
index e53f860f1..0b203fe31 100644
--- a/src/include/86box/snd_opl_nuked.h
+++ b/src/include/86box/snd_opl_nuked.h
@@ -20,4 +20,181 @@
 #ifndef SOUND_OPL_NUKED_H
 #define SOUND_OPL_NUKED_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <inttypes.h>
+
+#ifndef OPL_ENABLE_STEREOEXT
+#define OPL_ENABLE_STEREOEXT 0
+#endif
+
+#define OPL_WRITEBUF_SIZE  1024
+#define OPL_WRITEBUF_DELAY 2
+
+typedef struct _opl3_slot    opl3_slot;
+typedef struct _opl3_channel opl3_channel;
+typedef struct _opl3_chip    opl3_chip;
+
+struct _opl3_slot {
+    opl3_channel *channel;
+    opl3_chip    *chip;
+    int16_t       out;
+    int16_t       fbmod;
+    int16_t      *mod;
+    int16_t       prout;
+    uint16_t      eg_rout;
+    uint16_t      eg_out;
+    uint8_t       eg_inc;
+    uint8_t       eg_gen;
+    uint8_t       eg_rate;
+    uint8_t       eg_ksl;
+    uint8_t      *trem;
+    uint8_t       reg_vib;
+    uint8_t       reg_type;
+    uint8_t       reg_ksr;
+    uint8_t       reg_mult;
+    uint8_t       reg_ksl;
+    uint8_t       reg_tl;
+    uint8_t       reg_ar;
+    uint8_t       reg_dr;
+    uint8_t       reg_sl;
+    uint8_t       reg_rr;
+    uint8_t       reg_wf;
+    uint8_t       key;
+    uint32_t      pg_reset;
+    uint32_t      pg_phase;
+    uint16_t      pg_phase_out;
+    uint8_t       slot_num;
+};
+
+struct _opl3_channel {
+    opl3_slot    *slotz[2]; // Don't use "slots" keyword to avoid conflict with Qt applications
+    opl3_channel *pair;
+    opl3_chip    *chip;
+    int16_t      *out[4];
+
+#if OPL_ENABLE_STEREOEXT
+    int32_t       leftpan;
+    int32_t       rightpan;
+#endif
+
+    uint8_t       chtype;
+    uint16_t      f_num;
+    uint8_t       block;
+    uint8_t       fb;
+    uint8_t       con;
+    uint8_t       alg;
+    uint8_t       ksv;
+    uint16_t      cha;
+    uint16_t      chb;
+    uint16_t      chc;
+    uint16_t      chd;
+    uint8_t       ch_num;
+};
+
+typedef struct _opl3_writebuf {
+    uint64_t time;
+    uint16_t reg;
+    uint8_t  data;
+} opl3_writebuf;
+
+struct _opl3_chip {
+    opl3_channel channel[18];
+    opl3_slot slot[36];
+    uint16_t timer;
+    uint64_t eg_timer;
+    uint8_t  eg_timerrem;
+    uint8_t  eg_state;
+    uint8_t  eg_add;
+    uint8_t  eg_timer_lo;
+    uint8_t  newm;
+    uint8_t  nts;
+    uint8_t  rhy;
+    uint8_t  vibpos;
+    uint8_t  vibshift;
+    uint8_t  tremolo;
+    uint8_t  tremolopos;
+    uint8_t  tremoloshift;
+    uint32_t noise;
+    int16_t  zeromod;
+    int32_t  mixbuff[4];
+    uint8_t  rm_hh_bit2;
+    uint8_t  rm_hh_bit3;
+    uint8_t  rm_hh_bit7;
+    uint8_t  rm_hh_bit8;
+    uint8_t  rm_tc_bit3;
+    uint8_t  rm_tc_bit5;
+
+#if OPL_ENABLE_STEREOEXT
+    uint8_t  stereoext;
+#endif
+
+    // OPL3L
+    int32_t  rateratio;
+    int32_t  samplecnt;
+    int32_t  oldsamples[4];
+    int32_t  samples[4];
+
+    uint64_t writebuf_samplecnt;
+    uint32_t writebuf_cur;
+    uint32_t writebuf_last;
+    uint64_t writebuf_lasttime;
+    opl3_writebuf writebuf[OPL_WRITEBUF_SIZE];
+};
+
+typedef struct {
+    opl3_chip opl;
+    int8_t    flags;
+    int8_t    pad;
+
+    uint16_t port;
+    uint8_t  status;
+    uint8_t  timer_ctrl;
+    uint16_t timer_count[2];
+    uint16_t timer_cur_count[2];
+
+    pc_timer_t timers[2];
+
+    int     pos;
+    int32_t buffer[MUSICBUFLEN * 2];
+} nuked_drv_t;
+
+enum {
+    FLAG_CYCLES = 0x02,
+    FLAG_OPL3   = 0x01
+};
+
+enum {
+    STAT_TMR_OVER  = 0x60,
+    STAT_TMR1_OVER = 0x40,
+    STAT_TMR2_OVER = 0x20,
+    STAT_TMR_ANY   = 0x80
+};
+
+enum {
+    CTRL_RESET      = 0x80,
+    CTRL_TMR_MASK   = 0x60,
+    CTRL_TMR1_MASK  = 0x40,
+    CTRL_TMR2_MASK  = 0x20,
+    CTRL_TMR2_START = 0x02,
+    CTRL_TMR1_START = 0x01
+};
+
+void OPL3_Generate(opl3_chip *chip, int32_t *buf);
+void OPL3_GenerateResampled(opl3_chip *chip, int32_t *buf);
+void OPL3_Reset(opl3_chip *chip, uint32_t samplerate);
+void OPL3_WriteReg(void *priv, uint16_t reg, uint8_t val);
+void OPL3_WriteRegBuffered(void *priv, uint16_t reg, uint8_t val);
+void OPL3_GenerateStream(opl3_chip *chip, int32_t *sndptr, uint32_t numsamples);
+
+static void OPL3_Generate4Ch(void *priv, int32_t *buf4);
+void OPL3_Generate4Ch_Resampled(opl3_chip *chip, int32_t *buf4);
+void OPL3_Generate4Ch_Stream(opl3_chip *chip, int32_t *sndptr1, int32_t *sndptr2, uint32_t numsamples);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*SOUND_OPL_NUKED_H*/
diff --git a/src/include/86box/snd_resid.h b/src/include/86box/snd_resid.h
index 4ddaf9b91..c6a616a3e 100644
--- a/src/include/86box/snd_resid.h
+++ b/src/include/86box/snd_resid.h
@@ -4,7 +4,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-void   *sid_init(void);
+void   *sid_init(uint8_t type, double range);
 void    sid_close(void *priv);
 void    sid_reset(void *priv);
 uint8_t sid_read(uint16_t addr, void *priv);
diff --git a/src/include/86box/snd_sb.h b/src/include/86box/snd_sb.h
index f433dd107..06fbbfa3b 100644
--- a/src/include/86box/snd_sb.h
+++ b/src/include/86box/snd_sb.h
@@ -11,9 +11,11 @@
  * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
  *          Miran Grca, <mgrca8@gmail.com>
  *          TheCollector1995, <mariogplayer@gmail.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
  *          Copyright 2008-2018 Sarah Walker.
  *          Copyright 2016-2018 Miran Grca.
+ *          Copyright 2024-2025 Jasmine Iwanek.
  */
 
 #ifndef SOUND_SND_SB_H
@@ -27,15 +29,19 @@
 
 enum {
     SADLIB  = 1,     /* No DSP */
-    SB1,             /* DSP v1.05 */
-    SB15,            /* DSP v2.00 */
-    SB2,             /* DSP v2.01 - needed for high-speed DMA */
-    SBPRO,           /* DSP v3.00 */
-    SBPRO2,          /* DSP v3.02 + OPL3 */
-    SB16,            /* DSP v4.05 + OPL3 */
-    SBAWE32,         /* DSP v4.12 + OPL3 */
-    SBAWE32PNP,      /* DSP v4.13 + OPL3 */
-    SBAWE64          /* DSP v4.16 + OPL3 */
+    SB_DSP_105,      /* DSP v1.05, Original CT1320 (Also known as CT1310) */
+    SB_DSP_200,      /* DSP v2.00 */
+    SB_DSP_201,      /* DSP v2.01 - needed for high-speed DMA, Seen on CT1350B with CT1336 */
+    SB_DSP_202,      /* DSP v2.02 - Seen on CT1350B with CT1336A */
+    SBPRO_DSP_300,   /* DSP v3.00 */
+    SBPRO2_DSP_302,  /* DSP v3.02 + OPL3 */
+    SB16_DSP_404,    /* DSP v4.05 + OPL3 */
+    SB16_DSP_405,    /* DSP v4.05 + OPL3 */
+    SB16_DSP_406,    /* DSP v4.06 + OPL3 */
+    SB16_DSP_411,    /* DSP v4.11 + OPL3 */
+    SBAWE32_DSP_412, /* DSP v4.12 + OPL3 */
+    SBAWE32_DSP_413, /* DSP v4.13 + OPL3 */
+    SBAWE64_DSP_416  /* DSP v4.16 + OPL3 */
 };
 
 /* SB 2.0 CD version */
@@ -126,6 +132,43 @@ typedef struct sb_ct1745_mixer_t {
     int output_filter; /* for clones */
 } sb_ct1745_mixer_t;
 
+/* ESS AudioDrive */
+typedef struct ess_mixer_t {
+    double master_l;
+    double master_r;
+    double voice_l;
+    double voice_r;
+    double fm_l;
+    double fm_r;
+    double cd_l;
+    double cd_r;
+    double line_l;
+    double line_r;
+    double mic_l;
+    double mic_r;
+    double auxb_l;
+    double auxb_r;
+    double speaker;
+    /*see sb_ct1745_mixer for values for input selector*/
+    int32_t input_selector;
+    /* extra values for input selector */
+    #define INPUT_MIXER_L 128
+    #define INPUT_MIXER_R 256
+
+    int input_filter;
+    int in_filter_freq;
+    int output_filter;
+
+    int stereo;
+    int stereo_isleft;
+
+    uint8_t index;
+    uint8_t regs[256];
+
+    uint8_t ess_id_str[4];
+    uint8_t ess_id_str_pos;
+} ess_mixer_t;
+
 typedef struct sb_t {
     uint8_t  cms_enabled;
     uint8_t  opl_enabled;
@@ -138,24 +181,33 @@ typedef struct sb_t {
         sb_ct1335_mixer_t mixer_sb2;
         sb_ct1345_mixer_t mixer_sbpro;
         sb_ct1745_mixer_t mixer_sb16;
+        ess_mixer_t       mixer_ess;
     };
     mpu_t  *mpu;
     emu8k_t emu8k;
     void   *gameport;
 
-    int pos;
     int pnp;
+    int has_ide;
 
     uint8_t pos_regs[8];
     uint8_t pnp_rom[512];
 
     uint16_t opl_pnp_addr;
+
+    uint16_t midi_addr;
     uint16_t gameport_addr;
 
     void   *opl_mixer;
     void  (*opl_mix)(void*, double*, double*);
 } sb_t;
 
+typedef struct goldfinch_t {
+    emu8k_t emu8k;
+
+    uint8_t pnp_rom[512];
+} goldfinch_t;
+
 extern void    sb_ct1345_mixer_write(uint16_t addr, uint8_t val, void *priv);
 extern uint8_t sb_ct1345_mixer_read(uint16_t addr, void *priv);
 extern void    sb_ct1345_mixer_reset(sb_t *sb);
@@ -164,7 +216,12 @@ extern void    sb_ct1745_mixer_write(uint16_t addr, uint8_t val, void *priv);
 extern uint8_t sb_ct1745_mixer_read(uint16_t addr, void *priv);
 extern void    sb_ct1745_mixer_reset(sb_t *sb);
 
+extern void    sb_ess_mixer_write(uint16_t addr, uint8_t val, void *priv);
+extern uint8_t sb_ess_mixer_read(uint16_t addr, void *priv);
+extern void    sb_ess_mixer_reset(sb_t *sb);
+
 extern void sb_get_buffer_sbpro(int32_t *buffer, int len, void *priv);
+extern void sb_get_music_buffer_sbpro(int32_t *buffer, int len, void *priv);
 extern void sbpro_filter_cd_audio(int channel, double *buffer, void *priv);
 extern void sb16_awe32_filter_cd_audio(int channel, double *buffer, void *priv);
 extern void sb_close(void *priv);
diff --git a/src/include/86box/snd_sb_dsp.h b/src/include/86box/snd_sb_dsp.h
index ecabe426d..0bc719d98 100644
--- a/src/include/86box/snd_sb_dsp.h
+++ b/src/include/86box/snd_sb_dsp.h
@@ -1,10 +1,19 @@
 #ifndef SOUND_SND_SB_DSP_H
 #define SOUND_SND_SB_DSP_H
 
+#include <86box/fifo.h>
+
 /*Sound Blaster Clones, for quirks*/
-#define SB_SUBTYPE_DEFAULT             0 /*Handle as a Creative card*/
-#define SB_SUBTYPE_CLONE_AZT2316A_0X11 1 /*Aztech Sound Galaxy Pro 16 AB, DSP 3.1 - SBPRO2 clone*/
-#define SB_SUBTYPE_CLONE_AZT1605_0X0C  2 /*Aztech Sound Galaxy Nova 16 Extra / Packard Bell Forte 16, DSP 2.1 - SBPRO2 clone*/
+#define SB_SUBTYPE_DEFAULT             0 /* Handle as a Creative card */
+#define SB_SUBTYPE_CLONE_AZT2316A_0X11 1 /* Aztech Sound Galaxy Pro 16 AB, DSP 3.1 - SBPRO2 clone */
+#define SB_SUBTYPE_CLONE_AZT1605_0X0C  2 /* Aztech Sound Galaxy Nova 16 Extra /
+                                            Packard Bell Forte 16, DSP 2.1 - SBPRO2 clone */
+#define SB_SUBTYPE_ESS_ES688           3 /* ESS Technology ES688 */
+#define SB_SUBTYPE_ESS_ES1688          4 /* ESS Technology ES1688 */
+
+/* ESS-related */
+#define IS_ESS(dsp) ((dsp)->sb_subtype >= SB_SUBTYPE_ESS_ES688)    /* Check for future ESS cards here */
+#define IS_NOT_ESS(dsp) ((dsp)->sb_subtype < SB_SUBTYPE_ESS_ES688) /* Check for future ESS cards here */
 
 /* aztech-related */
 #define IS_AZTECH(dsp)     ((dsp)->sb_subtype == SB_SUBTYPE_CLONE_AZT2316A_0X11 || (dsp)->sb_subtype == SB_SUBTYPE_CLONE_AZT1605_0X0C) /* check for future AZT cards here */
@@ -45,6 +54,10 @@ typedef struct sb_dsp_t {
     void *dma_priv;
 
     uint8_t sb_read_data[256];
+
+    uint8_t dma_ff;
+    int     dma_data;
+
     int     sb_read_wp;
     int     sb_read_rp;
     int     sb_speaker;
@@ -78,6 +91,8 @@ typedef struct sb_dsp_t {
     uint8_t sbref;
     int8_t  sbstep;
 
+    uint8_t activity;
+
     int sbdacpos;
 
     int sbleftright;
@@ -97,6 +112,8 @@ typedef struct sb_dsp_t {
     int sb_irqm16;
     int sb_irqm401;
 
+    uint8_t sb_has_real_opl;
+
     uint8_t sb_asp_regs[256];
     uint8_t sb_asp_mode;
 
@@ -108,6 +125,8 @@ typedef struct sb_dsp_t {
     int sbenable;
     int sb_enable_i;
 
+    int state;
+
     pc_timer_t output_timer;
     pc_timer_t input_timer;
 
@@ -123,6 +142,9 @@ typedef struct sb_dsp_t {
     pc_timer_t wb_timer;
     int        wb_full;
 
+    pc_timer_t irq_timer;
+    pc_timer_t irq16_timer;
+
     int busy_count;
 
     int     record_pos_read;
@@ -133,6 +155,28 @@ typedef struct sb_dsp_t {
 
     uint8_t azt_eeprom[AZTECH_EEPROM_SIZE]; /* the eeprom in the Aztech cards is attached to the DSP */
 
+    uint8_t  ess_regs[256]; /* ESS registers. */
+    uint8_t  ess_playback_mode;
+    uint8_t  ess_extended_mode;
+    uint8_t  ess_reload_len;
+    uint32_t ess_dma_counter;
+
+    /* IRQ status flags (0x22C) */
+    uint8_t  ess_irq_generic;
+    uint8_t  ess_irq_dmactr;
+
+    /* ESPCM */
+    fifo64_t *espcm_fifo;
+    uint8_t   espcm_fifo_reset;
+    uint8_t   espcm_mode;              /* see ESPCM in "NON-PCM SAMPLE FORMATS" deflist in snd_sb_dsp.c */
+    uint8_t   espcm_sample_idx;
+    uint8_t   espcm_range;
+    uint8_t   espcm_byte_buffer[4];
+    uint8_t   espcm_code_buffer[19];   /* used for ESPCM_3 and for ESPCM_4 recording */
+    int8_t    espcm_sample_buffer[19]; /* used for ESPCM_4 recording */
+    uint8_t   espcm_table_index;       /* used for ESPCM_3 */
+    uint8_t   espcm_last_value;        /* used for ESPCM_3 */
+
     mpu_t *mpu;
 } sb_dsp_t;
 
@@ -158,6 +202,8 @@ extern void sb_dsp_speed_changed(sb_dsp_t *dsp);
 
 extern void sb_dsp_poll(sb_dsp_t *dsp, int16_t *l, int16_t *r);
 
+extern void sb_dsp_set_real_opl(sb_dsp_t *dsp, uint8_t has_real_opl);
+
 extern void sb_dsp_set_stereo(sb_dsp_t *dsp, int stereo);
 
 extern void sb_dsp_update(sb_dsp_t *dsp);
diff --git a/src/include/86box/snd_sn76489.h b/src/include/86box/snd_sn76489.h
index 6e7399d54..81d9ad229 100644
--- a/src/include/86box/snd_sn76489.h
+++ b/src/include/86box/snd_sn76489.h
@@ -20,6 +20,9 @@ typedef struct sn76489_t {
     int      freqhi[4];
     int      vol[4];
     uint32_t shift;
+    uint32_t white_noise_tap_1;
+    uint32_t white_noise_tap_2;
+    uint32_t feedback_mask;
     uint8_t  noise;
     int      lasttone;
     uint8_t  firstdat;
diff --git a/src/include/86box/sound.h b/src/include/86box/sound.h
index 60628ece8..5f91ec9d0 100644
--- a/src/include/86box/sound.h
+++ b/src/include/86box/sound.h
@@ -12,9 +12,11 @@
  *
  * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
  *          Miran Grca, <mgrca8@gmail.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
  *          Copyright 2008-2018 Sarah Walker.
- *          Copyright 2016-2018 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
+ *          Copyright 2024-2025 Jasmine Iwanek.
  */
 
 #ifndef EMU_SOUND_H
@@ -33,9 +35,15 @@ extern int sound_gain;
 #define SOUND_FREQ  FREQ_48000
 #define SOUNDBUFLEN (SOUND_FREQ / 50)
 
+#define MUSIC_FREQ  FREQ_49716
+#define MUSICBUFLEN (MUSIC_FREQ / 36)
+
 #define CD_FREQ     FREQ_44100
 #define CD_BUFLEN   (CD_FREQ / 10)
 
+#define WT_FREQ     FREQ_44100
+#define WTBUFLEN    (MUSIC_FREQ / 45)
+
 enum {
     SOUND_NONE = 0,
     SOUND_INTERNAL
@@ -47,12 +55,24 @@ extern int speakval;
 extern int speakon;
 
 extern int sound_pos_global;
+
+extern int music_pos_global;
+extern int wavetable_pos_global;
+
 extern int sound_card_current[SOUND_CARD_MAX];
 
 extern void sound_add_handler(void (*get_buffer)(int32_t *buffer,
                                                  int len, void *priv),
                               void *priv);
 
+extern void music_add_handler(void (*get_buffer)(int32_t *buffer,
+                                                 int len, void *priv),
+                              void *priv);
+
+extern void wavetable_add_handler(void (*get_buffer)(int32_t *buffer,
+                                                     int len, void *priv),
+                                  void *priv);
+
 extern void sound_set_cd_audio_filter(void (*filter)(int     channel,
                                                      double *buffer, void *priv),
                                       void *priv);
@@ -85,10 +105,14 @@ extern void sound_cd_thread_reset(void);
 
 extern void closeal(void);
 extern void inital(void);
-extern void givealbuffer(void *buf);
-extern void givealbuffer_cd(void *buf);
+extern void givealbuffer(const void *buf);
+extern void givealbuffer_music(const void *buf);
+extern void givealbuffer_wt(const void *buf);
+extern void givealbuffer_cd(const void *buf);
 
 #define sb_vibra16c_onboard_relocate_base sb_vibra16s_onboard_relocate_base
+#define sb_vibra16cl_onboard_relocate_base sb_vibra16s_onboard_relocate_base
+#define sb_vibra16xv_onboard_relocate_base sb_vibra16s_onboard_relocate_base
 extern void sb_vibra16s_onboard_relocate_base(uint16_t new_addr, void *priv);
 
 #ifdef EMU_DEVICE_H
@@ -103,31 +127,22 @@ extern const device_t acermagic_s20_device;
 extern const device_t mirosound_pcm10_device;
 extern const device_t azt1605_device;
 
-/* Ensoniq AudioPCI */
-extern const device_t es1371_device;
-extern const device_t es1371_onboard_device;
+/* C-Media CMI8x38 */
+extern const device_t cmi8338_device;
+extern const device_t cmi8338_onboard_device;
+extern const device_t cmi8738_device;
+extern const device_t cmi8738_onboard_device;
+extern const device_t cmi8738_6ch_onboard_device;
+
+/* Covox ISA */
+extern const device_t voicemasterkey_device;
+extern const device_t soundmasterplus_device;
+extern const device_t isadacr0_device;
+extern const device_t isadacr1_device;
 
 /* Creative Labs Game Blaster */
 extern const device_t cms_device;
 
-/* Gravis UltraSound and UltraSound Max */
-extern const device_t gus_device;
-
-#    if defined(DEV_BRANCH) && defined(USE_PAS16)
-/* Pro Audio Spectrum 16 */
-extern const device_t pas16_device;
-#    endif
-
-/* IBM PS/1 Audio Card */
-extern const device_t ps1snd_device;
-
-/* Tandy PSSJ */
-extern const device_t pssj_device;
-extern const device_t pssj_isa_device;
-
-/* Tandy PSG */
-extern const device_t tndy_device;
-
 /* Creative Labs Sound Blaster */
 extern const device_t sb_1_device;
 extern const device_t sb_15_device;
@@ -138,42 +153,94 @@ extern const device_t sb_pro_v2_device;
 extern const device_t sb_pro_mcv_device;
 extern const device_t sb_pro_compat_device;
 extern const device_t sb_16_device;
-extern const device_t sb_vibra16s_onboard_device;
-extern const device_t sb_vibra16s_device;
-extern const device_t sb_vibra16xv_device;
 extern const device_t sb_vibra16c_onboard_device;
 extern const device_t sb_vibra16c_device;
+extern const device_t sb_vibra16cl_onboard_device;
+extern const device_t sb_vibra16cl_device;
+extern const device_t sb_vibra16s_onboard_device;
+extern const device_t sb_vibra16s_device;
+extern const device_t sb_vibra16xv_onboard_device;
+extern const device_t sb_vibra16xv_device;
 extern const device_t sb_16_pnp_device;
+extern const device_t sb_16_pnp_ide_device;
 extern const device_t sb_16_compat_device;
 extern const device_t sb_16_compat_nompu_device;
 extern const device_t sb_16_reply_mca_device;
+extern const device_t sb_goldfinch_device;
 extern const device_t sb_32_pnp_device;
 extern const device_t sb_awe32_device;
 extern const device_t sb_awe32_pnp_device;
 extern const device_t sb_awe64_value_device;
 extern const device_t sb_awe64_device;
+extern const device_t sb_awe64_ide_device;
 extern const device_t sb_awe64_gold_device;
 
+/* Crystal CS423x */
+extern const device_t cs4235_device;
+extern const device_t cs4235_onboard_device;
+extern const device_t cs4236_onboard_device;
+extern const device_t cs4236b_device;
+extern const device_t cs4236b_onboard_device;
+extern const device_t cs4237b_device;
+extern const device_t cs4238b_device;
+
+/* ESS Technology */
+extern const device_t ess_688_device;
+extern const device_t ess_ess0100_pnp_device;
+extern const device_t ess_1688_device;
+extern const device_t ess_ess0102_pnp_device;
+extern const device_t ess_ess0968_pnp_device;
+extern const device_t ess_soundpiper_16_mca_device;
+extern const device_t ess_soundpiper_32_mca_device;
+extern const device_t ess_chipchat_16_mca_device;
+
+/* Ensoniq AudioPCI */
+extern const device_t es1370_device;
+extern const device_t es1371_device;
+extern const device_t es1371_onboard_device;
+extern const device_t es1373_device;
+extern const device_t es1373_onboard_device;
+extern const device_t ct5880_device;
+extern const device_t ct5880_onboard_device;
+
+/* Gravis UltraSound and UltraSound Max */
+extern const device_t gus_device;
+extern const device_t gus_max_device;
+
+/* IBM PS/1 Audio Card */
+extern const device_t ps1snd_device;
+
 /* Innovation SSI-2001 */
 extern const device_t ssi2001_device;
+extern const device_t entertainer_device;
+
+/* Mindscape Music Board */
+extern const device_t mmb_device;
+
+/* Pro Audio Spectrum Plus, 16, and 16D */
+extern const device_t pasplus_device;
+extern const device_t pas16_device;
+extern const device_t pas16d_device;
+
+/* Rainbow Arts PC-Soundman */
+extern const device_t soundman_device;
+
+/* Tandy PSSJ */
+extern const device_t pssj_device;
+extern const device_t pssj_isa_device;
+
+/* Tandy PSG */
+extern const device_t tndy_device;
 
 /* Windows Sound System */
 extern const device_t wss_device;
 extern const device_t ncr_business_audio_device;
 
-/* Crystal CS423x */
-extern const device_t cs4235_device;
-extern const device_t cs4235_onboard_device;
-extern const device_t cs4236b_device;
-extern const device_t cs4237b_device;
-extern const device_t cs4238b_device;
+#ifdef USE_LIBSERIALPORT
+/* External Audio device OPL2Board (Host Connected hardware)*/
+extern const device_t opl2board_device;
+#endif 
 
-/* C-Media CMI8x38 */
-extern const device_t cmi8338_device;
-extern const device_t cmi8338_onboard_device;
-extern const device_t cmi8738_device;
-extern const device_t cmi8738_onboard_device;
-extern const device_t cmi8738_6ch_onboard_device;
 #endif
 
 #endif /*EMU_SOUND_H*/
diff --git a/src/include/86box/timer.h b/src/include/86box/timer.h
index 4ade8aab0..37a03d9ca 100644
--- a/src/include/86box/timer.h
+++ b/src/include/86box/timer.h
@@ -1,7 +1,7 @@
 #ifndef _TIMER_H_
 #define _TIMER_H_
 
-#include "cpu.h"
+extern uint64_t tsc;
 
 /* Maximum period, currently 1 second. */
 #define MAX_USEC64    1000000ULL
@@ -43,7 +43,7 @@ typedef struct pc_timer_t {
     ts_t ts;
 #endif
     int    flags;  /* The flags are defined above. */
-    int    pad;
+    int    in_callback;
     double period; /* This is used for large period timers to count
                       the microseconds and split the period. */
 
@@ -185,6 +185,9 @@ timer_set_p(pc_timer_t *timer, void *priv)
 extern void timer_stop(pc_timer_t *timer);
 extern void timer_on_auto(pc_timer_t *timer, double period);
 
+/* Change TSC, taking into account the timers. */
+extern void timer_set_new_tsc(uint64_t new_tsc);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/include/86box/ui.h b/src/include/86box/ui.h
index 9698f896c..63243a666 100644
--- a/src/include/86box/ui.h
+++ b/src/include/86box/ui.h
@@ -42,9 +42,6 @@ extern "C" {
 
 extern int ui_msgbox(int flags, void *message);
 extern int ui_msgbox_header(int flags, void *header, void *message);
-extern int ui_msgbox_ex(int flags, void *header, void *message, void *btn1, void *btn2, void *btn3);
-
-extern void ui_check_menu_item(int id, int checked);
 
 /* Status Bar functions. */
 #define SB_ICON_WIDTH 24
@@ -52,7 +49,7 @@ extern void ui_check_menu_item(int id, int checked);
 #define SB_CARTRIDGE  0x10
 #define SB_FLOPPY     0x20
 #define SB_CDROM      0x30
-#define SB_ZIP        0x40
+#define SB_RDISK      0x40
 #define SB_MO         0x50
 #define SB_HDD        0x60
 #define SB_NETWORK    0x70
@@ -60,18 +57,17 @@ extern void ui_check_menu_item(int id, int checked);
 #define SB_TEXT       0x90
 
 extern wchar_t *ui_window_title(wchar_t *s);
-extern void     ui_status_update(void);
 extern void     ui_hard_reset_completed(void);
 extern void     ui_init_monitor(int monitor_index);
 extern void     ui_deinit_monitor(int monitor_index);
-extern int      ui_sb_find_part(int tag);
 extern void     ui_sb_set_ready(int ready);
 extern void     ui_sb_update_panes(void);
 extern void     ui_sb_update_text(void);
 extern void     ui_sb_update_tip(int meaning);
-extern void     ui_sb_timer_callback(int pane);
 extern void     ui_sb_update_icon(int tag, int active);
+extern void     ui_sb_update_icon_write(int tag, int write);
 extern void     ui_sb_update_icon_state(int tag, int state);
+extern void     ui_sb_update_icon_wp(int tag, int state);
 extern void     ui_sb_set_text_w(wchar_t *wstr);
 extern void     ui_sb_set_text(char *str);
 extern void     ui_sb_bugui(char *str);
diff --git a/src/include/86box/version.h.in b/src/include/86box/version.h.in
index 5ebf7dba9..17c5b3068 100644
--- a/src/include/86box/version.h.in
+++ b/src/include/86box/version.h.in
@@ -14,6 +14,8 @@
  *
  *          Copyright 2020 Miran Grca.
  */
+#ifndef EMU_VERSION_H
+#define EMU_VERSION_H
 
 #define _LSTR(s) L ## s
 #define LSTR(s) _LSTR(s)
@@ -58,3 +60,5 @@
 # define EMU_DOCS_URL  "https://86box.readthedocs.io"
 #endif
 #define EMU_DOCS_URL_W LSTR(EMU_DOCS_URL)
+
+#endif /*EMU_VERSION_H*/
diff --git a/src/include/86box/vid_8514a.h b/src/include/86box/vid_8514a.h
index fab504bbe..6e8528325 100644
--- a/src/include/86box/vid_8514a.h
+++ b/src/include/86box/vid_8514a.h
@@ -18,6 +18,32 @@
 #ifndef VIDEO_8514A_H
 #define VIDEO_8514A_H
 
+#define INT_VSY         (1 << 0)
+#define INT_GE_BSY      (1 << 1)
+#define INT_FIFO_OVR    (1 << 2)
+#define INT_FIFO_EMP    (1 << 3)
+#define INT_MASK        0xf
+
+typedef enum {
+    IBM_8514A_TYPE = 0,
+    ATI_38800_TYPE,
+    ATI_68800_TYPE,
+    TYPE_MAX
+} ibm8514_card_type;
+
+typedef enum {
+    IBM = 0,
+    ATI,
+    EXTENSIONS_MAX
+} ibm8514_extensions_t;
+
+typedef enum {
+    VGA_MODE = 0,
+    IBM_MODE,
+    ATI_MODE,
+    MODE_MAX
+} ibm8514_mode_t;
+
 typedef struct hwcursor8514_t {
     int      ena;
     int      x;
@@ -32,23 +58,34 @@ typedef struct hwcursor8514_t {
     uint32_t pitch;
 } hwcursor8514_t;
 
+typedef union {
+    uint64_t q;
+    uint32_t d[2];
+    uint16_t w[4];
+    uint8_t  b[8];
+} latch8514_t;
+
 typedef struct ibm8514_t {
     rom_t bios_rom;
-    rom_t bios_rom2;
+    uint8_t *rom1;
+    uint8_t *rom2;
     hwcursor8514_t hwcursor;
     hwcursor8514_t hwcursor_latch;
     uint8_t        pos_regs[8];
+    char *rom_path;
 
     int force_old_addr;
     int type;
-    int local;
+    ibm8514_card_type local;
     int bpp;
-    int on[2];
+    int on;
     int accel_bpp;
 
     uint32_t vram_size;
     uint32_t vram_mask;
     uint32_t pallook[512];
+    uint32_t bios_addr;
+    uint32_t memaddr_latch;
 
     PALETTE   vgapal;
     uint8_t   hwcursor_oddeven;
@@ -68,9 +105,12 @@ typedef struct ibm8514_t {
     uint64_t  dispofftime;
 
     struct {
+        uint16_t scratch0;
+        uint16_t scratch1;
         uint16_t subsys_cntl;
         uint16_t setup_md;
         uint16_t advfunc_cntl;
+        uint16_t advfunc_cntl_old;
         uint16_t cur_y;
         uint16_t cur_x;
         int16_t  destx;
@@ -88,10 +128,14 @@ typedef struct ibm8514_t {
         uint16_t wrt_mask;
         uint16_t rd_mask;
         uint16_t color_cmp;
-        uint16_t bkgd_mix;
-        uint16_t frgd_mix;
+        uint8_t bkgd_mix;
+        uint8_t frgd_mix;
+        uint8_t bkgd_sel;
+        uint8_t frgd_sel;
         uint16_t multifunc_cntl;
         uint16_t multifunc[16];
+        uint16_t clip_right;
+        uint16_t clip_bottom;
         int16_t  clip_left;
         int16_t  clip_top;
         uint8_t  pix_trans[2];
@@ -102,9 +146,9 @@ typedef struct ibm8514_t {
         int      x3;
         int      y1;
         int      y2;
-        int      sys_cnt;
-        int      sys_cnt2;
         int      temp_cnt;
+        int16_t  dx_ibm;
+        int16_t  dy_ibm;
         int16_t  cx;
         int16_t  cx_back;
         int16_t  cy;
@@ -117,21 +161,16 @@ typedef struct ibm8514_t {
         int16_t  err;
         uint32_t src;
         uint32_t dest;
-        uint32_t newsrc_blt;
-        uint32_t newdest_blt;
-        uint32_t newdest_in;
-        uint32_t newdest_out;
-        uint8_t *writemono;
-        uint8_t *nibbleset;
         int      x_count;
         int      xx_count;
         int      y_count;
         int      input;
+        int      input2;
         int      output;
+        int      output2;
 
-        uint16_t cur_x_bit12;
-        uint16_t cur_y_bit12;
         int      ssv_len;
+        int      ssv_len_back;
         uint8_t  ssv_dir;
         uint8_t  ssv_draw;
         int      odd_in;
@@ -143,10 +182,17 @@ typedef struct ibm8514_t {
         int      ydir;
         int      linedraw;
         uint32_t ge_offset;
+        uint32_t src_ge_offset;
+        uint32_t dst_ge_offset;
+        uint16_t src_pitch;
+        uint16_t dst_pitch;
+        int64_t cur_x_24bpp;
+        int64_t cur_y_24bpp;
+        int64_t dest_x_24bpp;
+        int64_t dest_y_24bpp;
     } accel;
 
     uint16_t test;
-    int      vendor_mode[2];
     int      h_blankstart;
     int      h_blank_end_val;
     int      hblankstart;
@@ -163,6 +209,7 @@ typedef struct ibm8514_t {
     int      split;
     int      h_disp;
     int      h_total;
+    int      h_sync_start;
     int      h_sync_width;
     int      h_disp_time;
     int      rowoffset;
@@ -181,8 +228,8 @@ typedef struct ibm8514_t {
     int      lastline_draw;
     int      displine;
     int      fullchange;
-    uint32_t ma;
-    uint32_t maback;
+    uint32_t memaddr;
+    uint32_t memaddr_backup;
 
     uint8_t *vram;
     uint8_t *changedvram;
@@ -195,20 +242,25 @@ typedef struct ibm8514_t {
     int     hsync_width;
     int     htotal;
     int     hdisp;
+    int     hdisp2;
     int     hdisped;
-    int     sc;
+    int     scanline;
     int     vsyncstart;
     int     vsyncwidth;
     int     vtotal;
     int     v_disp;
+    int     v_disp2;
     int     vdisp;
+    int     vdisp2;
     int     disp_cntl;
+    int     disp_cntl_2;
     int     interlace;
-    uint8_t subsys_cntl;
+    uint16_t subsys_cntl;
     uint8_t subsys_stat;
 
     atomic_int force_busy;
     atomic_int force_busy2;
+    atomic_int fifo_idx;
 
     int      blitter_busy;
     uint64_t blitter_time;
@@ -216,7 +268,29 @@ typedef struct ibm8514_t {
     int      pitch;
     int      ext_pitch;
     int      ext_crt_pitch;
-    int      extensions;
+    ibm8514_extensions_t extensions;
+    ibm8514_mode_t mode;
+    int      onboard;
+    int      linear;
+    uint32_t vram_amount;
+    int      vram_512k_8514;
+    int      vendor_mode;
+    int      _8514on;
+    int      _8514crt;
+    PALETTE  _8514pal;
+    uint8_t  ven_clock;
+
+    latch8514_t latch;
+
+    void (*vblank_start)(void *priv);
+    void (*accel_out_fifo)(void *priv, uint16_t port, uint16_t val, int len);
+    void (*update_irqs)(void *priv);
+
 } ibm8514_t;
 
+#define IBM_8514A (((dev->local & 0xff) == IBM_8514A_TYPE) && (dev->extensions == IBM))
+#define ATI_8514A_ULTRA (((dev->local & 0xff) == IBM_8514A_TYPE) && (dev->extensions == ATI))
+#define ATI_GRAPHICS_ULTRA ((dev->local & 0xff) == ATI_38800_TYPE)
+#define ATI_MACH32 ((dev->local & 0xff) == ATI_68800_TYPE)
+
 #endif /*VIDEO_8514A_H*/
diff --git a/src/include/86box/vid_8514a_device.h b/src/include/86box/vid_8514a_device.h
new file mode 100644
index 000000000..b4102b17a
--- /dev/null
+++ b/src/include/86box/vid_8514a_device.h
@@ -0,0 +1,25 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Emulation of the 8514/A card from IBM for the MCA bus and
+ *          generic ISA bus clones without vendor extensions.
+ *
+ *
+ *
+ * Authors: TheCollector1995
+ *
+ *          Copyright 2024 TheCollector1995.
+ */
+#ifndef VIDEO_8514A_DEVICE_H
+#define VIDEO_8514A_DEVICE_H
+
+#ifdef EMU_DEVICE_H
+extern const device_t ibm8514_mca_device;
+extern const device_t gen8514_isa_device;
+#endif
+#endif /*VIDEO_XGA_DEVICE_H*/
diff --git a/src/include/86box/vid_ati_eeprom.h b/src/include/86box/vid_ati_eeprom.h
index 99af36eda..c52b5bd4b 100644
--- a/src/include/86box/vid_ati_eeprom.h
+++ b/src/include/86box/vid_ati_eeprom.h
@@ -47,7 +47,8 @@ typedef struct ati_eeprom_t {
 } ati_eeprom_t;
 
 void ati_eeprom_load(ati_eeprom_t *eeprom, char *fn, int type);
-void ati_eeprom_load_mach8(ati_eeprom_t *eeprom, char *fn);
+void ati_eeprom_load_mach8(ati_eeprom_t *eeprom, char *fn, int mca);
+void ati_eeprom_load_mach8_vga(ati_eeprom_t *eeprom, char *fn);
 void ati_eeprom_write(ati_eeprom_t *eeprom, int ena, int clk, int dat);
 int  ati_eeprom_read(ati_eeprom_t *eeprom);
 
diff --git a/src/include/86box/vid_ati_mach8.h b/src/include/86box/vid_ati_mach8.h
index 7b5862f35..e6fd124de 100644
--- a/src/include/86box/vid_ati_mach8.h
+++ b/src/include/86box/vid_ati_mach8.h
@@ -18,6 +18,12 @@
 #ifndef VIDEO_ATI_MACH8_H
 #define VIDEO_ATI_MACH8_H
 
+typedef enum {
+    ATI_68875 = 0,
+    ATI_68860,
+    RAMDAC_MAX
+} mach_ramdac_type;
+
 typedef struct mach_t {
     ati_eeprom_t eeprom;
     svga_t       svga;
@@ -25,6 +31,7 @@ typedef struct mach_t {
     rom_t         bios_rom;
     rom_t         bios_rom2;
     mem_mapping_t mmio_linear_mapping;
+    mem_mapping_t banked_mapping;
 
     int mca_bus;
     int pci_bus;
@@ -38,11 +45,9 @@ typedef struct mach_t {
     uint8_t irq_state;
 
     int index;
-    int ramdac_type;
+    mach_ramdac_type ramdac_type;
     int old_mode;
 
-    uint32_t memory;
-
     uint16_t config1;
     uint16_t config2;
 
@@ -73,8 +78,14 @@ typedef struct mach_t {
     uint8_t  bank_r;
     uint16_t shadow_set;
     uint16_t shadow_cntl;
-    int ext_on[2];
-    int compat_mode;
+    uint8_t overscan_col_8;
+    uint8_t overscan_b_col_24;
+    uint8_t overscan_g_col_24;
+    uint8_t overscan_r_col_24;
+    uint16_t fifo_test_data[17];
+    uint8_t old_on1;
+    uint8_t old_on2;
+    int     crt_resolution;
 
     struct {
         uint8_t  line_idx;
@@ -82,7 +93,13 @@ typedef struct mach_t {
         uint8_t  patt_idx;
         uint8_t  patt_len;
         uint8_t  pix_trans[2];
-        uint8_t  eeprom_control;
+        uint8_t  alu_bg_fn;
+        uint8_t  alu_fg_fn;
+        uint16_t eeprom_control;
+        uint16_t clip_left;
+        uint16_t clip_right;
+        uint16_t clip_top;
+        uint16_t clip_bottom;
         uint16_t dest_x_end;
         uint16_t dest_x_start;
         uint16_t dest_y_end;
@@ -92,23 +109,28 @@ typedef struct mach_t {
         uint16_t src_y;
         int16_t  bres_count;
         uint16_t clock_sel;
+        uint16_t clock_sel_mode;
         uint16_t crt_pitch;
         uint16_t ge_pitch;
+        uint16_t src_pitch;
+        uint16_t dst_pitch;
         uint16_t dest_cmp_fn;
         uint16_t dp_config;
         uint16_t ext_ge_config;
+        uint16_t crt_offset_lo;
+        uint16_t crt_offset_hi;
         uint16_t ge_offset_lo;
         uint16_t ge_offset_hi;
         uint16_t linedraw_opt;
         uint16_t max_waitstates;
-        uint8_t  patt_data_idx;
-        uint8_t  patt_data[0x18];
         uint16_t scan_to_x;
         uint16_t scratch0;
         uint16_t scratch1;
         uint16_t test;
         uint16_t pattern;
         uint16_t test2;
+        int      patt_data_idx_reg;
+        int      patt_data_idx;
         int      src_y_dir;
         int      cmd_type;
         int      block_write_mono_pattern_enable;
@@ -122,6 +144,7 @@ typedef struct mach_t {
         int16_t  dx_end;
         int16_t  dy;
         int16_t  dy_end;
+        int16_t  dx_first_row_start;
         int16_t  dx_start;
         int16_t  dy_start;
         int16_t  cy;
@@ -143,20 +166,24 @@ typedef struct mach_t {
         int      stepx;
         int      stepy;
         int      src_stepx;
-        uint8_t  color_pattern[16];
-        uint8_t  color_pattern_full[32];
-        uint16_t color_pattern_word[8];
+        uint8_t  mono_pattern_normal[16];
+        uint8_t  color_pattern[32];
+        uint16_t color_pattern_hicol[8];
         int      mono_pattern[8][8];
-        uint32_t ge_offset;
+        uint32_t src_ge_offset;
+        uint32_t dst_ge_offset;
         uint32_t crt_offset;
         uint32_t patt_len_reg;
         int      poly_fill;
         uint16_t dst_clr_cmp_mask;
         int      clip_overrun;
         int      color_pattern_idx;
+        int64_t  src_x_scan;
+        int64_t  src_y_scan;
     } accel;
 
     atomic_int force_busy;
+    atomic_int fifo_test_idx;
 } mach_t;
 
 #endif /*VIDEO_ATI_MACH8_H*/
diff --git a/src/include/86box/vid_cga.h b/src/include/86box/vid_cga.h
index 5b6a2dea2..439ee36fc 100644
--- a/src/include/86box/vid_cga.h
+++ b/src/include/86box/vid_cga.h
@@ -8,43 +8,90 @@
  *
  *          Emulation of the old and new IBM CGA graphics cards.
  *
- *
- *
  * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
  *          Miran Grca, <mgrca8@gmail.com>
+ *          Connor Hyde / starfrost, <mario64crashed@gmail.com>
  *
  *          Copyright 2008-2018 Sarah Walker.
  *          Copyright 2016-2018 Miran Grca.
+ *          Copyright 2025      starfrost (refactoring).
  */
 
 #ifndef VIDEO_CGA_H
 #define VIDEO_CGA_H
 
+// Mode flags for the CGA.
+// Set by writing to 3D8
+typedef enum cga_mode_flags_e {
+    CGA_MODE_FLAG_HIGHRES = 1 << 0,                     // 80-column text mode
+    CGA_MODE_FLAG_GRAPHICS = 1 << 1,                    // Graphics mode
+    CGA_MODE_FLAG_BW = 1 << 2,                          // Black and white 
+    CGA_MODE_FLAG_VIDEO_ENABLE = 1 << 3,                // 0 = no video (as if the video was 0)
+    CGA_MODE_FLAG_HIGHRES_GRAPHICS = 1 << 4,            // 640*200 mode. Corrupts text mode if CGA_MODE_FLAG_GRAPHICS not set.
+    CGA_MODE_FLAG_BLINK = 1 << 5,                       // If this is set, bit 5 of textmode characters blinks. Otherwise it is a high-intensity bg mode.
+} cga_mode_flags;
+
+// Motorola MC6845 CRTC registers
+typedef enum cga_crtc_registers_e {
+    CGA_CRTC_HTOTAL = 0x0,                              // Horizontal total (total number of characters incl. hsync)
+    CGA_CRTC_HDISP = 0x1,                               // Horizontal display 
+    CGA_CRTC_HSYNC_POS = 0x2,                           // Horizontal position of horizontal ysnc
+    CGA_CRTC_HSYNC_WIDTH = 0x3,                         // Width of horizontal sync
+    CGA_CRTC_VTOTAL = 0x4,                              // Vertical total (total number of scanlines incl. vsync)
+    CGA_CRTC_VTOTAL_ADJUST = 0x5,                       // Vertical total adjust value
+    CGA_CRTC_VDISP = 0x6,                               // Vertical display (total number of displayed scanline)
+    CGA_CRTC_VSYNC = 0x7,                               // Vertical sync scanline number
+    CGA_CRTC_INTERLACE = 0x8,                           // Interlacing mode
+    CGA_CRTC_MAX_SCANLINE_ADDR = 0x9,                   // Maximum scanline address
+    CGA_CRTC_CURSOR_START = 0xA,                        // Cursor start scanline
+    CGA_CRTC_CURSOR_END = 0xB,                          // Cursor end scanline
+    CGA_CRTC_START_ADDR_HIGH = 0xC,                     // Screen start address high 8 bits
+    CGA_CRTC_START_ADDR_LOW = 0xD,                      // Screen start address low 8 bits
+    CGA_CRTC_CURSOR_ADDR_HIGH = 0xE,                    // Cursor address high 8 bits
+    CGA_CRTC_CURSOR_ADDR_LOW = 0xF,                     // Cursor address low 8 bits
+    CGA_CRTC_LIGHT_PEN_ADDR_HIGH = 0x10,                // Light pen address high 8 bits (not currently supported)
+    CGA_CRTC_LIGHT_PEN_ADDR_LOW = 0x11,                 // Light pen address low 8 bits (not currently supported)
+} cga_crtc_registers;
+
+// Registers for the CGA
+typedef enum cga_registers_e {
+    CGA_REGISTER_CRTC_INDEX = 0x3D4,
+    CGA_REGISTER_CRTC_DATA = 0x3D5,
+    CGA_REGISTER_MODE_CONTROL = 0x3D8,
+    CGA_REGISTER_COLOR_SELECT = 0x3D9,
+    CGA_REGISTER_STATUS = 0x3DA,
+    CGA_REGISTER_CLEAR_LIGHT_PEN_LATCH = 0x3DB,
+    CGA_REGISTER_SET_LIGHT_PEN_LATCH = 0x3DC,
+} cga_registers;
+
+#define CGA_NUM_CRTC_REGS   32
+
 typedef struct cga_t {
     mem_mapping_t mapping;
 
     int     crtcreg;
-    uint8_t crtc[32];
+    uint8_t crtc[CGA_NUM_CRTC_REGS];
 
     uint8_t cgastat;
 
     uint8_t cgamode;
     uint8_t cgacol;
 
+    uint8_t lp_strobe;
+
     int      fontbase;
     int      linepos;
     int      displine;
-    int      sc;
+    int      scanline;
     int      vc;
     int      cgadispon;
-    int      con;
-    int      coff;
+    int      cursorvisible;             // Determines if the cursor is visible FOR THE CURRENT SCANLINE.
     int      cursoron;
     int      cgablink;
     int      vsynctime;
     int      vadj;
-    uint16_t ma;
-    uint16_t maback;
+    uint16_t memaddr;
+    uint16_t memaddr_backup;
     int      oddeven;
 
     uint64_t   dispontime;
@@ -69,19 +116,22 @@ typedef struct cga_t {
     int double_type;
 } cga_t;
 
-void    cga_init(cga_t *cga);
-void    cga_out(uint16_t addr, uint8_t val, void *priv);
-uint8_t cga_in(uint16_t addr, void *priv);
-void    cga_write(uint32_t addr, uint8_t val, void *priv);
-uint8_t cga_read(uint32_t addr, void *priv);
-void    cga_recalctimings(cga_t *cga);
-void    cga_poll(void *priv);
-
-#ifdef EMU_DEVICE_H
-extern const device_config_t cga_config[];
-
-extern const device_t cga_device;
-extern const device_t cga_pravetz_device;
-#endif
+extern void    cga_init(cga_t *cga);
+extern void    cga_out(uint16_t addr, uint8_t val, void *priv);
+extern uint8_t cga_in(uint16_t addr, void *priv);
+extern void    cga_write(uint32_t addr, uint8_t val, void *priv);
+extern uint8_t cga_read(uint32_t addr, void *priv);
+extern void    cga_recalctimings(cga_t *cga);
+extern void    cga_interpolate_init(void);
+extern void    cga_blit_memtoscreen(int x, int y, int w, int h, int double_type);
+extern void    cga_do_blit(int vid_xsize, int firstline, int lastline, int double_type);
+extern void    cga_poll(void *priv);
 
+//#ifdef EMU_DEVICE_H
+//extern const device_config_t cga_config[];
+//
+//extern const device_t cga_device;
+//extern const device_t cga_pravetz_device;
+//#endif
+//
 #endif /*VIDEO_CGA_H*/
diff --git a/src/include/86box/vid_cga_comp.h b/src/include/86box/vid_cga_comp.h
index 291145291..94051b5e5 100644
--- a/src/include/86box/vid_cga_comp.h
+++ b/src/include/86box/vid_cga_comp.h
@@ -21,11 +21,13 @@
 #ifndef VIDEO_CGA_COMP_H
 #define VIDEO_CGA_COMP_H
 
+#include <stdbool.h>
+
 #define Bitu unsigned int
-#define bool uint8_t
 
 void    update_cga16_color(uint8_t cgamode);
 void    cga_comp_init(int revision);
-Bit32u *Composite_Process(uint8_t cgamode, uint8_t border, uint32_t blocks /*, bool doublewidth*/, uint32_t *TempLine);
+void    cga_comp_reload(int new_brightness, int new_saturation, int new_sharpness, int new_hue, int new_contrast);
+uint32_t *Composite_Process(uint8_t cgamode, uint8_t border, uint32_t blocks /*, bool doublewidth*/, uint32_t *TempLine);
 
 #endif /*VIDEO_CGA_COMP_H*/
diff --git a/src/include/86box/vid_colorplus.h b/src/include/86box/vid_colorplus.h
index 5acd4c8a2..8716f72fb 100644
--- a/src/include/86box/vid_colorplus.h
+++ b/src/include/86box/vid_colorplus.h
@@ -4,6 +4,8 @@
 typedef struct colorplus_t {
     cga_t   cga;
     uint8_t control;
+
+    lpt_t * lpt;
 } colorplus_t;
 
 void    colorplus_init(colorplus_t *colorplus);
diff --git a/src/include/86box/vid_ddc.h b/src/include/86box/vid_ddc.h
index 144cca406..32c8e88c5 100644
--- a/src/include/86box/vid_ddc.h
+++ b/src/include/86box/vid_ddc.h
@@ -20,7 +20,9 @@
 #ifndef EMU_VID_DDC_H
 #define EMU_VID_DDC_H
 
-extern void *ddc_init(void *i2c);
-extern void  ddc_close(void *eeprom);
+extern void  *ddc_init(void *i2c);
+extern void   ddc_close(void *eeprom);
+extern size_t ddc_create_default_edid(uint8_t **size_out);
+extern size_t ddc_load_edid(char *path, uint8_t *buf, size_t size);
 
 #endif /*EMU_VID_DDC_H*/
diff --git a/src/include/86box/vid_ega.h b/src/include/86box/vid_ega.h
index 0bccd607e..beef6f98d 100644
--- a/src/include/86box/vid_ega.h
+++ b/src/include/86box/vid_ega.h
@@ -39,7 +39,7 @@ typedef struct ega_t {
     uint8_t lb;
     uint8_t lc;
     uint8_t ld;
-    uint8_t stat;
+    uint8_t status;
     uint8_t colourcompare;
     uint8_t colournocare;
     uint8_t scrblank;
@@ -47,13 +47,12 @@ typedef struct ega_t {
     uint8_t ctl_mode;
     uint8_t color_mux;
     uint8_t dot;
-    uint8_t crtc[32];
-    uint8_t gdcreg[16];
+    uint8_t crtc[256];
+    uint8_t gdcreg[256];
     uint8_t attrregs[32];
     uint8_t seqregs[64];
     uint8_t egapal[16];
     uint8_t regs[256];
-
     uint8_t *vram;
 
     uint16_t light_pen;
@@ -69,11 +68,12 @@ typedef struct ega_t {
     int chain4;
     int chain2_read;
     int chain2_write;
-    int con;
+    int cursorvisible;
     int oddeven_page;
     int oddeven_chain;
     int vc;
-    int sc;
+    int real_vc;
+    int scanline;
     int dispon;
     int hdisp_on;
     int cursoron;
@@ -113,13 +113,16 @@ typedef struct ega_t {
     int remap_required;
     int actual_type;
     int chipset;
+    int mono_display;
+
+    int mda_attr_to_color_table[256][2][2];
 
     uint32_t charseta;
     uint32_t charsetb;
-    uint32_t ma_latch;
-    uint32_t ma;
-    uint32_t maback;
-    uint32_t ca;
+    uint32_t memaddr_latch;
+    uint32_t memaddr;
+    uint32_t memaddr_backup;
+    uint32_t cursoraddr;
     uint32_t vram_limit;
     uint32_t overscan_color;
     uint32_t cca;
@@ -140,6 +143,13 @@ typedef struct ega_t {
 
     uint32_t   (*remap_func)(struct ega_t *ega, uint32_t in_addr);
     void       (*render)(struct ega_t *svga);
+
+    /* If set then another device is driving the monitor output and the EGA
+      card should not attempt to display anything. */
+    void       (*render_override)(void *priv);
+    void *     priv_parent;
+
+    uint8_t    alt_addr; /* 0 for 0x3XX range, 1 for 0x2XX range */
 } ega_t;
 #endif
 
@@ -150,6 +160,8 @@ extern const device_t sega_device;
 extern const device_t atiega800p_device;
 extern const device_t iskra_ega_device;
 extern const device_t et2000_device;
+extern const device_t jega_device;
+extern const device_t jvga_device;
 #endif
 
 extern int update_overscan;
@@ -172,15 +184,16 @@ extern uint8_t ega_in(uint16_t addr, void *priv);
 extern void    ega_poll(void *priv);
 extern void    ega_write(uint32_t addr, uint8_t val, void *priv);
 extern uint8_t ega_read(uint32_t addr, void *priv);
+extern void    ega_set_type(void *priv, uint32_t local);
 
 extern int firstline_draw;
 extern int lastline_draw;
 extern int displine;
-extern int sc;
+extern int scanline;
 
-extern uint32_t ma;
-extern uint32_t ca;
-extern int      con;
+extern uint32_t memaddr;
+extern uint32_t cursoraddr;
+extern int      cursorvisible;
 extern int      cursoron;
 extern int      cgablink;
 
@@ -199,4 +212,19 @@ void ega_render_text(ega_t *ega);
 void ega_render_graphics(ega_t *ega);
 #endif
 
+enum {
+  EGA_IBM = 0,
+  EGA_COMPAQ,
+  EGA_SUPEREGA,
+  EGA_ATI800P,
+  EGA_ISKRA,
+  EGA_TSENG
+};
+
+enum {
+  EGA_TYPE_IBM    = 0,
+  EGA_TYPE_OTHER  = 1,
+  EGA_TYPE_COMPAQ = 2
+};
+
 #endif /*VIDEO_EGA_H*/
diff --git a/src/include/86box/vid_ega_render_remap.h b/src/include/86box/vid_ega_render_remap.h
index b01bb2b0e..1b0f7676c 100644
--- a/src/include/86box/vid_ega_render_remap.h
+++ b/src/include/86box/vid_ega_render_remap.h
@@ -33,9 +33,9 @@
         }                                                                                               \
                                                                                                         \
         if (nr & VAR_ROW0_MA13)                                                                         \
-            out_addr = (out_addr & ~0x8000) | ((ega->sc & 1) ? 0x8000 : 0);                             \
+            out_addr = (out_addr & ~0x8000) | ((ega->scanline & 1) ? 0x8000 : 0);                             \
         if (nr & VAR_ROW1_MA14)                                                                         \
-            out_addr = (out_addr & ~0x10000) | ((ega->sc & 2) ? 0x10000 : 0);                           \
+            out_addr = (out_addr & ~0x10000) | ((ega->scanline & 2) ? 0x10000 : 0);                           \
                                                                                                         \
         return out_addr;                                                                                \
     }
diff --git a/src/include/86box/vid_hercules.h b/src/include/86box/vid_hercules.h
index c58a50aa3..05f2673a5 100644
--- a/src/include/86box/vid_hercules.h
+++ b/src/include/86box/vid_hercules.h
@@ -13,10 +13,12 @@
  * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
  *          Miran Grca, <mgrca8@gmail.com>
  *          Jasmine Iwanek, <jriwanek@gmail.com>
- *
+ *          Connor Hyde / starfrost, <mario64crashed@gmail.com
+ * 
  *          Copyright 2008-2019 Sarah Walker.
  *          Copyright 2016-2019 Miran Grca.
  *          Copyright 2021 Jasmine Iwanek.
+ *          Copyright 2025 starfrost
  */
 
 #ifndef VIDEO_HERCULES_H
@@ -31,7 +33,7 @@ typedef struct {
 
     uint8_t ctrl;
     uint8_t ctrl2;
-    uint8_t stat;
+    uint8_t status;
 
     uint64_t   dispontime;
     uint64_t   dispofftime;
@@ -43,22 +45,22 @@ typedef struct {
     int      linepos;
     int      displine;
     int      vc;
-    int      sc;
-    uint16_t ma;
-    uint16_t maback;
-    int      con;
-    int      coff;
+    int      scanline;
+    uint16_t memaddr;
+    uint16_t memaddr_backup;
+    int      cursorvisible;
     int      cursoron;
     int      dispon;
     int      blink;
     int      vsynctime;
     int      vadj;
 
-    int lp_ff;
-    int fullchange;
+    int     lp_ff;
+    int     fullchange;
 
-    int cols[256][2][2];
+    int     cols[256][2][2];
 
+    lpt_t  *lpt;
     uint8_t *vram;
     int      monitor_index;
     int      prev_monitor_index;
diff --git a/src/include/86box/vid_mda.h b/src/include/86box/vid_mda.h
index d13c45a28..2443e0ccc 100644
--- a/src/include/86box/vid_mda.h
+++ b/src/include/86box/vid_mda.h
@@ -1,44 +1,126 @@
-/* Copyright holders: Sarah Walker
-   see COPYING for more details
-*/
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Emulation of the IBM Monochrome Display and Printer card.
+ *
+ * Authors: Sarah Walker, starfrost
+ *
+ *          Copyright 2007-2024 Sarah Walker
+ *          Copyright 2025 Connor Hyde / starfrost, <mario64crashed@gmail.com>
+ */
 
 #ifndef VIDEO_MDA_H
 #define VIDEO_MDA_H
 
+// Defines
+#define MDA_CRTC_NUM_REGISTERS      32
+
+// Enums & structures
+
+typedef enum mda_registers_e
+{
+    MDA_REGISTER_START = 0x3B0,
+
+    MDA_REGISTER_CRTC_INDEX = 0x3B4,
+    MDA_REGISTER_CRTC_DATA = 0x3B5,
+    MDA_REGISTER_MODE_CONTROL = 0x3B8,
+    MDA_REGISTER_CRT_STATUS = 0x3BA,
+    MDA_REGISTER_PARALLEL_DATA = 0x3BC,
+    MDA_REGISTER_PRINTER_STATUS = 0x3BD,
+    MDA_REGISTER_PRINTER_CONTROL = 0x3BE,
+    
+    MDA_REGISTER_END = 0x3BF,
+} mda_registers; 
+
+// Motorola MC6845 CRTC registers (without light pen for some reason)
+typedef enum mda_crtc_registers_e
+{
+    MDA_CRTC_HTOTAL = 0x0,                              // Horizontal total (total number of characters incl. hsync)
+    MDA_CRTC_HDISP = 0x1,                               // Horizontal display 
+    MDA_CRTC_HSYNC_POS = 0x2,                           // Horizontal position of horizontal ysnc
+    MDA_CRTC_HSYNC_WIDTH = 0x3,                         // Width of horizontal sync
+    MDA_CRTC_VTOTAL = 0x4,                              // Vertical total (total number of scanlines incl. vsync)
+    MDA_CRTC_VTOTAL_ADJUST = 0x5,                       // Vertical total adjust value
+    MDA_CRTC_VDISP = 0x6,                               // Vertical display (total number of displayed scanline)
+    MDA_CRTC_VSYNC = 0x7,                               // Vertical sync scanline number
+    MDA_CRTC_INTERLACE = 0x8,                           // Interlacing mode
+    MDA_CRTC_MAX_SCANLINE_ADDR = 0x9,                   // Maximum scanline address
+    MDA_CRTC_CURSOR_START = 0xA,                        // Cursor start scanline
+    MDA_CRTC_CURSOR_END = 0xB,                          // Cursor end scanline
+    MDA_CRTC_START_ADDR_HIGH = 0xC,                     // Screen start address high 8 bits
+    MDA_CRTC_START_ADDR_LOW = 0xD,                      // Screen start address low 8 bits
+    MDA_CRTC_CURSOR_ADDR_HIGH = 0xE,                    // Cursor address high 8 bits
+    MDA_CRTC_CURSOR_ADDR_LOW = 0xF,                     // Cursor address low 8 bits
+} mda_crtc_registers;
+
+typedef enum mda_mode_flags_e
+{
+    MDA_MODE_HIGHRES = 1 << 0,                          // MUST be enabled for sane operation
+    MDA_MODE_BW = 1 << 1,                    // UNUSED in most cases. Not present on Hercules
+    MDA_MODE_VIDEO_ENABLE = 1 << 3, 
+    MDA_MODE_BLINK = 1 << 5,
+} mda_mode_flags;
+
+typedef enum mda_colors_e 
+{
+    MDA_COLOR_BLACK = 0,
+    MDA_COLOR_BLUE = 1,
+    MDA_COLOR_GREEN = 2,
+    MDA_COLOR_CYAN = 3,
+    MDA_COLOR_RED = 4,
+    MDA_COLOR_MAGENTA = 5,
+    MDA_COLOR_BROWN = 6,
+    MDA_COLOR_WHITE = 7,
+    MDA_COLOR_GREY = 8,
+    MDA_COLOR_BRIGHT_BLUE = 9,
+    MDA_COLOR_BRIGHT_GREEN = 10,
+    MDA_COLOR_BRIGHT_CYAN = 11,
+    MDA_COLOR_BRIGHT_RED = 12,
+    MDA_COLOR_BRIGHT_MAGENTA = 13,
+    MDA_COLOR_BRIGHT_YELLOW = 14,
+    MDA_COLOR_BRIGHT_WHITE = 15,
+} mda_colors; 
+
 typedef struct mda_t {
     mem_mapping_t mapping;
 
-    uint8_t crtc[32];
-    int     crtcreg;
+    uint8_t     crtc[MDA_CRTC_NUM_REGISTERS];
+    int32_t     crtcreg;
 
-    uint8_t ctrl;
-    uint8_t stat;
+    uint8_t     mode;
+    uint8_t     status;
 
-    uint64_t   dispontime;
-    uint64_t   dispofftime;
-    pc_timer_t timer;
+    uint64_t    dispontime;
+    uint64_t    dispofftime;
+    pc_timer_t  timer;
 
-    int firstline;
-    int lastline;
+    int32_t     firstline;
+    int32_t     lastline;
 
-    int      fontbase;
-    int      linepos;
-    int      displine;
-    int      vc;
-    int      sc;
-    uint16_t ma;
-    uint16_t maback;
-    int      con;
-    int      coff;
-    int      cursoron;
-    int      dispon;
-    int      blink;
-    int      vsynctime;
-    int      vadj;
-    int      monitor_index;
-    int      prev_monitor_index;
+    int32_t     fontbase;
+    int32_t     linepos;
+    int32_t     displine;
+    int32_t     vc;
+    int32_t     scanline;
+    uint16_t    memaddr;
+    uint16_t    memaddr_backup;
+    int32_t     cursorvisible;
+    int32_t     cursoron;
+    int32_t     dispon;
+    int32_t     blink;
+    int32_t     vsynctime;
+    int32_t     vadj;
+    int32_t     monitor_index;
+    int32_t     prev_monitor_index;
+    int32_t     monitor_type;           // Used for MDA Colour support (REV0 u64)
 
-    uint8_t *vram;
+    uint8_t    *vram;
+    lpt_t      *lpt;
 } mda_t;
 
 #define VIDEO_MONITOR_PROLOGUE()                        \
diff --git a/src/include/86box/vid_ogc.h b/src/include/86box/vid_ogc.h
index 839769e69..efafb180e 100644
--- a/src/include/86box/vid_ogc.h
+++ b/src/include/86box/vid_ogc.h
@@ -23,6 +23,7 @@
 
 typedef struct ogc_t {
     cga_t cga;
+    uint16_t ctrl_addr;
     /* unused in OGC, required for M19 video card structure idiom */
     uint8_t  ctrl_3dd;
     uint8_t  ctrl_3de;
diff --git a/src/include/86box/vid_pgc.h b/src/include/86box/vid_pgc.h
index 35e2d9e42..dd6a45b98 100644
--- a/src/include/86box/vid_pgc.h
+++ b/src/include/86box/vid_pgc.h
@@ -115,14 +115,13 @@ typedef struct pgc {
     int      displine;
     int      vc;
     int      cgadispon;
-    int      con;
-    int      coff;
+    int      cursorvisible;
     int      cursoron;
     int      cgablink;
     int      vsynctime;
     int      vadj;
-    uint16_t ma;
-    uint16_t maback;
+    uint16_t memaddr;
+    uint16_t memaddr_backup;
     int      oddeven;
 
     uint64_t dispontime;
diff --git a/src/cpu/x886seg_2386.c b/src/include/86box/vid_ps55da2.h
similarity index 52%
rename from src/cpu/x886seg_2386.c
rename to src/include/86box/vid_ps55da2.h
index 335c757e4..f029b5751 100644
--- a/src/cpu/x886seg_2386.c
+++ b/src/include/86box/vid_ps55da2.h
@@ -6,17 +6,19 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          x86 CPU segment emulation for the 286/386 interpreter.
+ *          IBM PS/55 Display Adapter II emulation.
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
+ * Authors: Akamaki.
  *
- *          Copyright 2008-2018 Sarah Walker.
- *          Copyright 2016-2018 Miran Grca.
+ *          Copyright 2024 Akamaki.
  */
-#ifndef OPS_286_386
-#    define OPS_286_386
+
+#ifndef VIDEO_DA2_DEVICE_H
+#define VIDEO_DA2_DEVICE_H
+
+#ifdef EMU_DEVICE_H
+extern const device_t ps55da2_device;
 #endif
-#include "x86seg.c"
+#endif /*VIDEO_DA2_DEVICE_H*/
diff --git a/src/include/86box/vid_quadcolor.h b/src/include/86box/vid_quadcolor.h
new file mode 100644
index 000000000..41b39dfb0
--- /dev/null
+++ b/src/include/86box/vid_quadcolor.h
@@ -0,0 +1,93 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Quadram Quadcolor I / I+II emulation
+ *
+ * Authors:  Benedikt Freisen, <https://pcem-emulator.co.uk/>
+ *           Jasmine Iwanek, <jriwanek@gmail.com>
+ *
+ *          Copyright 2024      Benedikt Freisen.
+            Copyright 2025      Jasmine Iwanek.
+ */
+
+#ifndef _VID_QUADCOLOR_H_
+#define _VID_QUADCOLOR_H_
+
+typedef struct quadcolor_t {
+    mem_mapping_t mapping;
+    mem_mapping_t mapping_2;
+
+    int     crtcreg;
+#if 0
+    uint8_t crtc[CGA_NUM_CRTC_REGS];
+#else
+    uint8_t crtc[32];
+#endif
+    uint8_t cgastat;
+
+    uint8_t cgamode;
+    uint8_t cgacol;
+
+    uint8_t lp_strobe;
+
+    uint8_t  quadcolor_ctrl;
+    uint8_t  quadcolor_2_oe;
+    uint16_t page_offset;
+
+    int      fontbase;
+    int      linepos;
+    int      displine;
+    int      scanline;
+    int      vc;
+    int      cgadispon;
+    int      cursorvisible;             // Determines if the cursor is visible FOR THE CURRENT SCANLINE.
+    int      cursoron;
+    int      cgablink;
+    int      vsynctime;
+    int      vadj;
+    uint16_t memaddr;
+    uint16_t memaddr_backup;
+    int      oddeven;
+
+    int      qc2idx;
+    uint8_t  qc2mask;
+
+    uint64_t   dispontime;
+    uint64_t   dispofftime;
+    pc_timer_t timer;
+
+    int firstline;
+    int lastline;
+
+    int drawcursor;
+
+    int fullchange;
+
+    uint8_t *vram;
+    uint8_t *vram_2;
+
+    uint8_t charbuffer[256];
+
+    int revision;
+    int composite;
+    int rgb_type;
+    int double_type;
+
+    int has_2nd_charset;
+    int has_quadcolor_2;
+} quadcolor_t;
+
+void    quadcolor_init(quadcolor_t *quadcolor);
+void    quadcolor_out(uint16_t addr, uint8_t val, void *priv);
+uint8_t quadcolor_in(uint16_t addr, void *priv);
+void    quadcolor_write(uint32_t addr, uint8_t val, void *priv);
+uint8_t quadcolor_read(uint32_t addr, void *priv);
+void    quadcolor_recalctimings(quadcolor_t *quadcolor);
+void    quadcolor_poll(void *priv);
+
+#endif /* _VID_QUADCOLOR_H_ */
diff --git a/src/include/86box/vid_svga.h b/src/include/86box/vid_svga.h
index 624e85a1b..a66dd8c03 100644
--- a/src/include/86box/vid_svga.h
+++ b/src/include/86box/vid_svga.h
@@ -29,6 +29,8 @@
 #    define FLAG_ATI          128
 #    define FLAG_S3_911_16BIT 256
 #    define FLAG_512K_MASK    512
+#    define FLAG_NO_SHIFT3    1024 /* Needed for Bochs VBE. */
+#    define FLAG_PRECISETIME  2048 /* Needed for Copper demo if on dynarec. */
 struct monitor_t;
 
 typedef struct hwcursor_t {
@@ -77,6 +79,8 @@ typedef struct svga_t {
     uint8_t overlay_oddeven;
     uint8_t fcr;
     uint8_t hblank_overscan;
+    uint8_t vidsys_ena;
+    uint8_t sleep;
 
     int dac_addr;
     int dac_pos;
@@ -85,6 +89,7 @@ typedef struct svga_t {
     int dac_b;
     int vtotal;
     int dispend;
+    int vdisp;
     int vsyncstart;
     int split;
     int vblankstart;
@@ -96,12 +101,12 @@ typedef struct svga_t {
     int dispon;
     int hdisp_on;
     int vc;
-    int sc;
+    int scanline;
     int linepos;
     int vslines;
     int linecountff;
     int oddeven;
-    int con;
+    int cursorvisible;
     int cursoron;
     int blink;
     int scrollcache;
@@ -112,6 +117,7 @@ typedef struct svga_t {
     int lastline_draw;
     int displine;
     int fullchange;
+    int left_overscan;
     int x_add;
     int y_add;
     int pan;
@@ -129,7 +135,12 @@ typedef struct svga_t {
     int hblank_end_mask;
     int hblank_sub;
     int packed_4bpp;
+    int ps_bit_bug;
     int ati_4color;
+    int vblankend;
+    int render_line_offset;
+    int start_retrace_latch;
+    int vga_mode;
 
     /*The three variables below allow us to implement memory maps like that seen on a 1MB Trio64 :
       0MB-1MB - VRAM
@@ -146,15 +157,15 @@ typedef struct svga_t {
     uint32_t  charseta;
     uint32_t  charsetb;
     uint32_t  adv_flags;
-    uint32_t  ma_latch;
+    uint32_t  memaddr_latch;
     uint32_t  ca_adj;
-    uint32_t  ma;
-    uint32_t  maback;
+    uint32_t  memaddr;
+    uint32_t  memaddr_backup;
     uint32_t  write_bank;
     uint32_t  read_bank;
     uint32_t  extra_banks[2];
     uint32_t  banked_mask;
-    uint32_t  ca;
+    uint32_t  cursoraddr;
     uint32_t  overscan_color;
     uint32_t *map8;
     uint32_t  pallook[512];
@@ -166,10 +177,14 @@ typedef struct svga_t {
     latch_t  latch;
 
     pc_timer_t timer;
-    pc_timer_t timer8514;
+    pc_timer_t timer_8514;
+    pc_timer_t timer_xga;
 
     double clock;
-    double clock8514;
+    double clock_8514;
+    double clock_xga;
+
+    double multiplier;
 
     hwcursor_t hwcursor;
     hwcursor_t hwcursor_latch;
@@ -180,6 +195,7 @@ typedef struct svga_t {
 
     void (*render)(struct svga_t *svga);
     void (*render8514)(struct svga_t *svga);
+    void (*render_xga)(struct svga_t *svga);
     void (*recalctimings_ex)(struct svga_t *svga);
 
     void (*video_out)(uint16_t addr, uint8_t val, void *priv);
@@ -193,8 +209,17 @@ typedef struct svga_t {
 
     void (*vblank_start)(struct svga_t *svga);
 
+    void (*write)(uint32_t addr, uint8_t val, void *priv);
+    void (*writew)(uint32_t addr, uint16_t val, void *priv);
+    void (*writel)(uint32_t addr, uint32_t val, void *priv);
+
+    uint8_t (*read)(uint32_t addr, void *priv);
+    uint16_t (*readw)(uint32_t addr, void *priv);
+    uint32_t (*readl)(uint32_t addr, void *priv);
+
     void (*ven_write)(struct svga_t *svga, uint8_t val, uint32_t addr);
     float (*getclock)(int clock, void *priv);
+    float (*getclock8514)(int clock, void *priv);
 
     /* Called when VC=R18 and friends. If this returns zero then MA resetting
        is skipped. Matrox Mystique in Power mode reuses this counter for
@@ -210,6 +235,11 @@ typedef struct svga_t {
     int   override;
     void *priv;
 
+    int vga_enabled;
+    /* The PS/55 POST BIOS has a special monitor detection for its internal VGA
+       when the monitor is connected to the Display Adapter. */
+    int cable_connected;
+
     uint8_t  crtc[256];
     uint8_t  gdcreg[256];
     uint8_t  attrregs[32];
@@ -256,6 +286,10 @@ typedef struct svga_t {
       you should set this flag when entering that mode*/
     int disable_blink;
 
+    /*Force special shifter bypass logic for 8-bpp lowres modes.
+      Needed if the screen is squished on certain S3 cards.*/
+    int force_shifter_bypass;
+
     /*Force CRTC to dword mode, regardless of CR14/CR17. Required for S3 enhanced mode*/
     int force_dword_mode;
 
@@ -284,30 +318,49 @@ typedef struct svga_t {
 
     void *  dev8514;
     void *  ext8514;
+    void *  clock_gen8514;
     void *  xga;
+
+    /* If set then another device is driving the monitor output and the EGA
+      card should not attempt to display anything. */
+    void       (*render_override)(void *priv);
+    void *     priv_parent;
+
+    void *     local;
 } svga_t;
 
-extern int vga_on;
+extern void     ibm8514_set_poll(svga_t *svga);
+extern void     ibm8514_poll(void *priv);
+extern void     ibm8514_recalctimings(svga_t *svga);
+extern uint8_t  ibm8514_ramdac_in(uint16_t port, void *priv);
+extern void     ibm8514_ramdac_out(uint16_t port, uint8_t val, void *priv);
+extern void     ibm8514_accel_out_fifo(svga_t *svga, uint16_t port, uint32_t val, int len);
+extern void     ibm8514_accel_out(uint16_t port, uint32_t val, svga_t *svga, int len);
+extern uint16_t ibm8514_accel_in_fifo(svga_t *svga, uint16_t port, int len);
+extern uint8_t  ibm8514_accel_in(uint16_t port, svga_t *svga);
+extern int      ibm8514_cpu_src(svga_t *svga);
+extern int      ibm8514_cpu_dest(svga_t *svga);
+extern void     ibm8514_accel_out_pixtrans(svga_t *svga, uint16_t port, uint32_t val, int len);
+extern void     ibm8514_short_stroke_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, svga_t *svga, uint8_t ssv, int len);
+extern void     ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, svga_t *svga, int len);
 
-extern void    ibm8514_poll(void *priv);
-extern void    ibm8514_recalctimings(svga_t *svga);
-extern uint8_t ibm8514_ramdac_in(uint16_t port, void *priv);
-extern void    ibm8514_ramdac_out(uint16_t port, uint8_t val, void *priv);
-extern int     ibm8514_cpu_src(svga_t *svga);
-extern int     ibm8514_cpu_dest(svga_t *svga);
-extern void    ibm8514_accel_out_pixtrans(svga_t *svga, uint16_t port, uint32_t val, int len);
-extern void    ibm8514_short_stroke_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, svga_t *svga, uint8_t ssv, int len);
-extern void    ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, svga_t *svga, int len);
+extern void     ati8514_out(uint16_t addr, uint8_t val, void *priv);
+extern uint8_t  ati8514_in(uint16_t addr, void *priv);
+extern void     ati8514_recalctimings(svga_t *svga);
+extern uint8_t  ati8514_mca_read(int port, void *priv);
+extern uint8_t  ati8514_rom_readb(uint32_t addr, void *priv);
+extern uint16_t ati8514_rom_readw(uint32_t addr, void *priv);
+extern void     ati8514_mca_write(int port, uint8_t val, void *priv);
+extern void     ati8514_pos_write(uint16_t port, uint8_t val, void *priv);
+extern void     ati8514_init(svga_t *svga, void *ext8514, void *dev8514);
 
-#ifdef ATI_8514_ULTRA
-extern void    ati8514_recalctimings(svga_t *svga);
-extern uint8_t ati8514_mca_read(int port, void *priv);
-extern void    ati8514_mca_write(int port, uint8_t val, void *priv);
-extern void    ati8514_init(svga_t *svga, void *ext8514, void *dev8514);
-#endif
+extern void     xga_write_test(uint32_t addr, uint8_t val, void *priv);
+extern uint8_t  xga_read_test(uint32_t addr, void *priv);
+extern void     xga_set_poll(svga_t *svga);
+extern void     xga_poll(void *priv);
+extern void     xga_recalctimings(svga_t *svga);
 
-extern void xga_poll(void *priv, svga_t *svga);
-extern void xga_recalctimings(svga_t *svga);
+extern uint32_t svga_decode_addr(svga_t *svga, uint32_t addr, int write);
 
 extern int  svga_init(const device_t *info, svga_t *svga, void *priv, int memsize,
                       void (*recalctimings_ex)(struct svga_t *svga),
@@ -350,6 +403,8 @@ uint32_t svga_mask_addr(uint32_t addr, svga_t *svga);
 uint32_t svga_mask_changedaddr(uint32_t addr, svga_t *svga);
 
 void svga_doblit(int wx, int wy, svga_t *svga);
+void svga_set_poll(svga_t *svga);
+void svga_poll(void *priv);
 
 enum {
     RAMDAC_6BIT = 0,
@@ -360,15 +415,15 @@ uint32_t svga_lookup_lut_ram(svga_t* svga, uint32_t val);
 
 /* We need a way to add a device with a pointer to a parent device so it can attach itself to it, and
    possibly also a second ATi 68860 RAM DAC type that auto-sets SVGA render on RAM DAC render change. */
-extern void    ati68860_ramdac_out(uint16_t addr, uint8_t val, void *priv, svga_t *svga);
-extern uint8_t ati68860_ramdac_in(uint16_t addr, void *priv, svga_t *svga);
+extern void    ati68860_ramdac_out(uint16_t addr, uint8_t val, int is_8514, void *priv, svga_t *svga);
+extern uint8_t ati68860_ramdac_in(uint16_t addr, int is_8514, void *priv, svga_t *svga);
 extern void    ati68860_set_ramdac_type(void *priv, int type);
 extern void    ati68860_ramdac_set_render(void *priv, svga_t *svga);
 extern void    ati68860_ramdac_set_pallook(void *priv, int i, uint32_t col);
 extern void    ati68860_hwcursor_draw(svga_t *svga, int displine);
 
-extern void    ati68875_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, void *priv, svga_t *svga);
-extern uint8_t ati68875_ramdac_in(uint16_t addr, int rs2, int rs3, void *priv, svga_t *svga);
+extern void    ati68875_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, int is_8514, void *priv, svga_t *svga);
+extern uint8_t ati68875_ramdac_in(uint16_t addr, int rs2, int rs3, int is_8514, void *priv, svga_t *svga);
 
 extern void    att49x_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *priv, svga_t *svga);
 extern uint8_t att49x_ramdac_in(uint16_t addr, int rs2, void *priv, svga_t *svga);
@@ -377,6 +432,9 @@ extern void    att498_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *priv
 extern uint8_t att498_ramdac_in(uint16_t addr, int rs2, void *priv, svga_t *svga);
 extern float   av9194_getclock(int clock, void *priv);
 
+extern void    bt481_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *priv, svga_t *svga);
+extern uint8_t bt481_ramdac_in(uint16_t addr, int rs2, void *priv, svga_t *svga);
+
 extern void    bt48x_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, void *priv, svga_t *svga);
 extern uint8_t bt48x_ramdac_in(uint16_t addr, int rs2, int rs3, void *priv, svga_t *svga);
 extern void    bt48x_recalctimings(void *priv, svga_t *svga);
@@ -386,9 +444,12 @@ extern void    ibm_rgb528_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *
 extern uint8_t ibm_rgb528_ramdac_in(uint16_t addr, int rs2, void *priv, svga_t *svga);
 extern void    ibm_rgb528_recalctimings(void *priv, svga_t *svga);
 extern void    ibm_rgb528_hwcursor_draw(svga_t *svga, int displine);
+extern float   ibm_rgb528_getclock(int clock, void *priv);
+extern void    ibm_rgb528_ramdac_set_ref_clock(void *priv, svga_t *svga, float ref_clock);
 
 extern void  icd2061_write(void *priv, int val);
 extern float icd2061_getclock(int clock, void *priv);
+extern void  icd2061_set_ref_clock(void *priv, svga_t *svga, float ref_clock);
 
 /* The code is the same, the #define's are so that the correct name can be used. */
 #    define ics9161_write    icd2061_write
@@ -405,6 +466,8 @@ extern uint8_t sc1148x_ramdac_in(uint16_t addr, int rs2, void *priv, svga_t *svg
 
 extern void    sc1502x_ramdac_out(uint16_t addr, uint8_t val, void *priv, svga_t *svga);
 extern uint8_t sc1502x_ramdac_in(uint16_t addr, void *priv, svga_t *svga);
+extern void    sc1502x_rs2_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *priv, svga_t *svga);
+extern uint8_t sc1502x_rs2_ramdac_in(uint16_t addr, int rs2, void *priv, svga_t *svga);
 
 extern void    sdac_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *priv, svga_t *svga);
 extern uint8_t sdac_ramdac_in(uint16_t addr, int rs2, void *priv, svga_t *svga);
@@ -433,6 +496,7 @@ extern const device_t att491_ramdac_device;
 extern const device_t att492_ramdac_device;
 extern const device_t att498_ramdac_device;
 extern const device_t av9194_device;
+extern const device_t bt481_ramdac_device;
 extern const device_t bt484_ramdac_device;
 extern const device_t att20c504_ramdac_device;
 extern const device_t bt485_ramdac_device;
@@ -441,9 +505,12 @@ extern const device_t bt485a_ramdac_device;
 extern const device_t gendac_ramdac_device;
 extern const device_t ibm_rgb528_ramdac_device;
 extern const device_t ics2494an_305_device;
-extern const device_t ati18810_device;
-extern const device_t ati18811_0_device;
-extern const device_t ati18811_1_device;
+extern const device_t ati18810_28800_device;
+extern const device_t ati18811_0_28800_device;
+extern const device_t ati18811_1_28800_device;
+extern const device_t ati18810_mach32_device;
+extern const device_t ati18811_0_mach32_device;
+extern const device_t ati18811_1_mach32_device;
 extern const device_t ics2595_device;
 extern const device_t icd2061_device;
 extern const device_t ics9161_device;
@@ -452,6 +519,7 @@ extern const device_t sc11487_ramdac_device;
 extern const device_t sc11486_ramdac_device;
 extern const device_t sc11484_nors2_ramdac_device;
 extern const device_t sc1502x_ramdac_device;
+extern const device_t sc1502x_rs2_ramdac_device;
 extern const device_t sdac_ramdac_device;
 extern const device_t stg_ramdac_device;
 extern const device_t tkd8001_ramdac_device;
diff --git a/src/include/86box/vid_svga_render.h b/src/include/86box/vid_svga_render.h
index 224d96c8e..7ead95838 100644
--- a/src/include/86box/vid_svga_render.h
+++ b/src/include/86box/vid_svga_render.h
@@ -23,11 +23,11 @@
 extern int firstline_draw;
 extern int lastline_draw;
 extern int displine;
-extern int sc;
+extern int scanline;
 
-extern uint32_t ma;
-extern uint32_t ca;
-extern int      con;
+extern uint32_t memaddr;
+extern uint32_t cursoraddr;
+extern int      cursorvisible;
 extern int      cursoron;
 extern int      cgablink;
 
@@ -48,18 +48,17 @@ extern void svga_render_text_80_ksc5601(svga_t *svga);
 
 extern void svga_render_2bpp_lowres(svga_t *svga);
 extern void svga_render_2bpp_highres(svga_t *svga);
+extern void svga_render_2bpp_s3_lowres(svga_t *svga);
+extern void svga_render_2bpp_s3_highres(svga_t *svga);
 extern void svga_render_2bpp_headland_highres(svga_t *svga);
 extern void svga_render_4bpp_lowres(svga_t *svga);
 extern void svga_render_4bpp_highres(svga_t *svga);
 extern void svga_render_8bpp_lowres(svga_t *svga);
 extern void svga_render_8bpp_highres(svga_t *svga);
+extern void svga_render_4bpp_tseng_highres(svga_t *svga);
 extern void svga_render_8bpp_clone_highres(svga_t *svga);
 extern void svga_render_8bpp_tseng_lowres(svga_t *svga);
 extern void svga_render_8bpp_tseng_highres(svga_t *svga);
-extern void svga_render_8bpp_gs_lowres(svga_t *svga);
-extern void svga_render_8bpp_gs_highres(svga_t *svga);
-extern void svga_render_8bpp_rgb_lowres(svga_t *svga);
-extern void svga_render_8bpp_rgb_highres(svga_t *svga);
 extern void svga_render_15bpp_lowres(svga_t *svga);
 extern void svga_render_15bpp_highres(svga_t *svga);
 extern void svga_render_15bpp_mix_lowres(svga_t *svga);
diff --git a/src/include/86box/vid_svga_render_remap.h b/src/include/86box/vid_svga_render_remap.h
index ff9151c3c..d6c9fa5a6 100644
--- a/src/include/86box/vid_svga_render_remap.h
+++ b/src/include/86box/vid_svga_render_remap.h
@@ -47,9 +47,9 @@
         }                                                                                               \
                                                                                                         \
         if (nr & VAR_ROW0_MA13)                                                                         \
-            out_addr = (out_addr & ~0x8000) | ((svga->sc & 1) ? 0x8000 : 0);                            \
+            out_addr = (out_addr & ~0x8000) | ((svga->scanline & 1) ? 0x8000 : 0);                            \
         if (nr & VAR_ROW1_MA14)                                                                         \
-            out_addr = (out_addr & ~0x10000) | ((svga->sc & 2) ? 0x10000 : 0);                          \
+            out_addr = (out_addr & ~0x10000) | ((svga->scanline & 2) ? 0x10000 : 0);                          \
                                                                                                         \
         return out_addr;                                                                                \
     }
diff --git a/src/include/86box/vid_v6355.h b/src/include/86box/vid_v6355.h
new file mode 100644
index 000000000..f8fd11519
--- /dev/null
+++ b/src/include/86box/vid_v6355.h
@@ -0,0 +1,72 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Emulation of the old and new IBM CGA graphics cards.
+ *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *          Connor Hyde / starfrost, <mario64crashed@gmail.com>
+ *
+ *          Copyright 2008-2018 Sarah Walker.
+ *          Copyright 2016-2018 Miran Grca.
+ *          Copyright 2025      starfrost (refactoring).
+ */
+
+#ifndef VIDEO_V6355_H
+#define VIDEO_V6355_H
+
+typedef struct v6355_t {
+    mem_mapping_t mapping;
+
+    uint8_t       cgastat;
+    uint8_t       cgamode;
+    uint8_t       cgacol;
+
+    uint8_t       pad[3];
+    uint8_t       crtc[32];
+    uint8_t       v6355data[106];
+    uint8_t       charbuffer[256];
+
+    uint16_t      ma;
+    uint16_t      maback;
+
+    /* The V6355 has its own set of registers, as well as the emulated MC6845 */
+    int           v6355reg;
+    int           crtcreg;
+    int           fontbase;
+    int           linepos;
+    int           displine;
+    int           sc;
+    int           vc;
+    int           cgadispon;
+    int           con;
+    int           coff;
+    int           cursoron;
+    int           cgablink;
+    int           vsynctime;
+    int           vadj;
+    int           oddeven;
+    int           display_type;
+    int           firstline;
+    int           lastline;
+    int           drawcursor;
+    int           revision;
+    int           rgb_type;
+    int           double_type;
+
+    uint32_t      v6355pal[16];
+
+    uint64_t      dispontime;
+    uint64_t      dispofftime;
+
+    pc_timer_t    timer;
+
+    uint8_t *     vram;
+} v6355_t;
+
+#endif /*VIDEO_V6355_H*/
diff --git a/src/include/86box/vid_vga.h b/src/include/86box/vid_vga.h
index bc552b285..54a1d0690 100644
--- a/src/include/86box/vid_vga.h
+++ b/src/include/86box/vid_vga.h
@@ -25,12 +25,19 @@
 typedef struct vga_t {
     svga_t svga;
 
-    rom_t bios_rom;
+    rom_t  bios_rom;
 } vga_t;
 
-static video_timings_t timing_vga = { VIDEO_ISA, 8, 16, 32, 8, 16, 32 };
+extern void    vga_out(uint16_t addr, uint8_t val, void *priv);
+extern uint8_t vga_in(uint16_t addr, void *priv);
 
-void    vga_out(uint16_t addr, uint8_t val, void *priv);
-uint8_t vga_in(uint16_t addr, void *priv);
+extern void    vga_init(const device_t *info, vga_t *vga, int enabled);
+
+extern void    vga_disable(void* p);
+extern void    vga_enable(void* p);
+
+extern int     vga_isenabled(void* p);
+
+extern video_timings_t        timing_vga;
 
 #endif /*VIDEO_VGA_H*/
diff --git a/src/include/86box/vid_voodoo_banshee.h b/src/include/86box/vid_voodoo_banshee.h
index 89298e94e..257a549dd 100644
--- a/src/include/86box/vid_voodoo_banshee.h
+++ b/src/include/86box/vid_voodoo_banshee.h
@@ -18,6 +18,7 @@
 #ifndef VIDEO_VOODOO_BANSHEE_H
 #define VIDEO_VOODOO_BANSHEE_H
 
+void banshee_cmd_write(void *priv, uint32_t addr, uint32_t val);
 void banshee_set_overlay_addr(void *priv, uint32_t addr);
 
 #endif /*VIDEO_VOODOO_BANSHEE_H*/
diff --git a/src/include/86box/vid_voodoo_codegen_x86-64.h b/src/include/86box/vid_voodoo_codegen_x86-64.h
index dc0ebce72..e8b7299f2 100644
--- a/src/include/86box/vid_voodoo_codegen_x86-64.h
+++ b/src/include/86box/vid_voodoo_codegen_x86-64.h
@@ -2157,6 +2157,12 @@ voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo_params_t *params,
         addbyte(0xc2);
     }
 
+    addbyte(0xf3); /*MOVQ XMM15(colbfog), XMM0 */
+    addbyte(0x44);
+    addbyte(0x0f);
+    addbyte(0x7e);
+    addbyte(0xf8);
+
     if (params->fogMode & FOG_ENABLE) {
         if (params->fogMode & FOG_CONSTANT) {
             addbyte(0x66); /*MOVD XMM3, params->fogColor[ESI]*/
@@ -2580,17 +2586,17 @@ voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo_params_t *params,
                 addbyte(0xef);
                 addbyte(0xe4);
                 break;
-            case AFUNC_ASATURATE:
-                addbyte(0x66); /*PMULLW XMM4, XMM11(minus_254)*/
+            case AFUNC_ACOLORBEFOREFOG:
+                addbyte(0x66); /*PMULLW XMM4, XMM15(colbfog)*/
                 addbyte(0x41);
                 addbyte(0x0f);
                 addbyte(0xd5);
-                addbyte(0xe3);
+                addbyte(0xe7);
                 addbyte(0xf3); /*MOVQ XMM5, XMM4*/
                 addbyte(0x0f);
                 addbyte(0x7e);
                 addbyte(0xec);
-                addbyte(0x66); /*PADDW XMM4, alookup[1*8]*/
+                addbyte(0x66); /*PADDW XMM4, R10(alookup)[1*8]*/
                 addbyte(0x41);
                 addbyte(0x0f);
                 addbyte(0xfd);
@@ -2610,6 +2616,7 @@ voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo_params_t *params,
                 addbyte(0x71);
                 addbyte(0xd4);
                 addbyte(8);
+                break;
         }
 
         switch (src_afunc) {
@@ -2762,7 +2769,36 @@ voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo_params_t *params,
                 addbyte(0xef);
                 addbyte(0xc0);
                 break;
-            case AFUNC_ACOLORBEFOREFOG:
+            case AFUNC_ASATURATE:
+                addbyte(0x66); /*PMULLW XMM0, XMM11(minus_254)*/
+                addbyte(0x41);
+                addbyte(0x0f);
+                addbyte(0xd5);
+                addbyte(0xc3);
+                addbyte(0xf3); /*MOVQ XMM5, XMM0*/
+                addbyte(0x0f);
+                addbyte(0x7e);
+                addbyte(0xe8);
+                addbyte(0x66); /*PADDW XMM0, alookup[1*8]*/
+                addbyte(0x41);
+                addbyte(0x0f);
+                addbyte(0xfd);
+                addbyte(0x42);
+                addbyte(8 * 2);
+                addbyte(0x66); /*PSRLW XMM5, 8*/
+                addbyte(0x0f);
+                addbyte(0x71);
+                addbyte(0xd5);
+                addbyte(8);
+                addbyte(0x66); /*PADDW XMM0, XMM5*/
+                addbyte(0x0f);
+                addbyte(0xfd);
+                addbyte(0xc5);
+                addbyte(0x66); /*PSRLW XMM0, 8*/
+                addbyte(0x0f);
+                addbyte(0x71);
+                addbyte(0xd0);
+                addbyte(8);
                 break;
         }
 
diff --git a/src/include/86box/vid_voodoo_common.h b/src/include/86box/vid_voodoo_common.h
index 96865ac6d..4201562c2 100644
--- a/src/include/86box/vid_voodoo_common.h
+++ b/src/include/86box/vid_voodoo_common.h
@@ -408,6 +408,7 @@ typedef struct voodoo_t {
     atomic_int   cmd_read;
     atomic_int   cmd_written;
     atomic_int   cmd_written_fifo;
+    atomic_int   cmd_written_fifo_2;
 
     voodoo_params_t params_buffer[PARAM_SIZE];
     atomic_int      params_read_idx[4];
@@ -419,6 +420,7 @@ typedef struct voodoo_t {
     int        cmdfifo_rp;
     int        cmdfifo_ret_addr;
     int        cmdfifo_in_sub;
+    int        cmdfifo_in_agp;
     atomic_int cmdfifo_depth_rd;
     atomic_int cmdfifo_depth_wr;
     atomic_int cmdfifo_enabled;
@@ -426,7 +428,21 @@ typedef struct voodoo_t {
     uint32_t   cmdfifo_amax;
     int        cmdfifo_holecount;
 
-    atomic_uint cmd_status;
+    uint32_t   cmdfifo_base_2;
+    uint32_t   cmdfifo_end_2;
+    uint32_t   cmdfifo_size_2;
+    int        cmdfifo_rp_2;
+    int        cmdfifo_ret_addr_2;
+    int        cmdfifo_in_sub_2;
+    int        cmdfifo_in_agp_2;
+    atomic_int cmdfifo_depth_rd_2;
+    atomic_int cmdfifo_depth_wr_2;
+    atomic_int cmdfifo_enabled_2;
+    uint32_t   cmdfifo_amin_2;
+    uint32_t   cmdfifo_amax_2;
+    int        cmdfifo_holecount_2;
+
+    atomic_uint cmd_status, cmd_status_2;
 
     uint32_t     sSetupMode;
     vert_t       verts[4];
diff --git a/src/include/86box/vid_voodoo_regs.h b/src/include/86box/vid_voodoo_regs.h
index f05029a8d..6aeb98bcc 100644
--- a/src/include/86box/vid_voodoo_regs.h
+++ b/src/include/86box/vid_voodoo_regs.h
@@ -338,17 +338,22 @@ enum {
 };
 
 enum {
-    LFB_FORMAT_RGB565   = 0,
-    LFB_FORMAT_RGB555   = 1,
-    LFB_FORMAT_ARGB1555 = 2,
-    LFB_FORMAT_ARGB8888 = 5,
-    LFB_FORMAT_DEPTH    = 15,
-    LFB_FORMAT_MASK     = 15
+    LFB_FORMAT_RGB565         = 0,
+    LFB_FORMAT_RGB555         = 1,
+    LFB_FORMAT_ARGB1555       = 2,
+    LFB_FORMAT_XRGB8888       = 4,
+    LFB_FORMAT_ARGB8888       = 5,
+    LFB_FORMAT_DEPTH_RGB565   = 12,
+    LFB_FORMAT_DEPTH_RGB555   = 13,
+    LFB_FORMAT_DEPTH_ARGB1555 = 14,
+    LFB_FORMAT_DEPTH          = 15,
+    LFB_FORMAT_MASK           = 15
 };
 
 enum {
     LFB_WRITE_COLOUR = 1,
-    LFB_WRITE_DEPTH  = 2
+    LFB_WRITE_DEPTH  = 2,
+    LFB_WRITE_BOTH   = 4
 };
 
 enum {
diff --git a/src/include/86box/vid_voodoo_render.h b/src/include/86box/vid_voodoo_render.h
index cd1962430..e88d21dd5 100644
--- a/src/include/86box/vid_voodoo_render.h
+++ b/src/include/86box/vid_voodoo_render.h
@@ -210,11 +210,10 @@ void voodoo_codegen_close(voodoo_t *voodoo);
                 newdest_g = (dest_g * (255 - dest_a)) / 255; \
                 newdest_b = (dest_b * (255 - dest_a)) / 255; \
                 break;                                       \
-            case AFUNC_ASATURATE:                            \
-                _a        = MIN(src_a, 1 - dest_a);          \
-                newdest_r = (dest_r * _a) / 255;             \
-                newdest_g = (dest_g * _a) / 255;             \
-                newdest_b = (dest_b * _a) / 255;             \
+            case AFUNC_ACOLORBEFOREFOG:                      \
+                newdest_r = (dest_r * colbfog_r) / 255;      \
+                newdest_g = (dest_g * colbfog_g) / 255;      \
+                newdest_b = (dest_b * colbfog_b) / 255;      \
                 break;                                       \
         }                                                    \
                                                              \
@@ -254,8 +253,11 @@ void voodoo_codegen_close(voodoo_t *voodoo);
                 src_g = (src_g * (255 - dest_a)) / 255;      \
                 src_b = (src_b * (255 - dest_a)) / 255;      \
                 break;                                       \
-            case AFUNC_ACOLORBEFOREFOG:                      \
-                fatal("AFUNC_ACOLORBEFOREFOG\n");            \
+            case AFUNC_ASATURATE:                            \
+                _a        = MIN(src_a, 255 - dest_a);        \
+                src_r     = (dest_r * _a) / 255;             \
+                src_g     = (dest_g * _a) / 255;             \
+                src_b     = (dest_b * _a) / 255;             \
                 break;                                       \
         }                                                    \
                                                              \
diff --git a/src/include/86box/vid_xga.h b/src/include/86box/vid_xga.h
index e5248b309..9aac43b9f 100644
--- a/src/include/86box/vid_xga.h
+++ b/src/include/86box/vid_xga.h
@@ -19,6 +19,9 @@
 
 #include <86box/rom.h>
 
+#define XGA_INT_START_BLKNK_ENAB         (1 << 0)
+#define XGA_INT_MASK                     0xf
+
 typedef struct xga_hwcursor_t {
     int      ena;
     int      x;
@@ -35,7 +38,7 @@ typedef struct xga_t {
     mem_mapping_t  linear_mapping;
     mem_mapping_t  video_mapping;
     rom_t          bios_rom;
-    rom_t          vga_bios_rom;
+    rom_t          bios_rom2;
     xga_hwcursor_t hwcursor;
     xga_hwcursor_t hwcursor_latch;
     PALETTE        extpal;
@@ -47,6 +50,8 @@ typedef struct xga_t {
 
     uint8_t  pos_regs[8];
     uint8_t  disp_addr;
+    uint8_t  dac_mask;
+    uint8_t  dac_status;
     uint8_t  cfg_reg;
     uint8_t  instance;
     uint8_t  op_mode;
@@ -82,11 +87,13 @@ typedef struct xga_t {
     uint8_t  border_color;
     uint8_t  direct_color;
     uint8_t  dma_channel;
-    uint8_t  instance_isa;
     uint8_t  instance_num;
-    uint8_t  ext_mem_addr;
+    uint8_t  vga_post;
+    uint8_t  addr_test;
     uint8_t *vram;
     uint8_t *changedvram;
+    uint8_t int_ena;
+    uint8_t int_stat;
 
     int16_t hwc_pos_x;
     int16_t hwc_pos_y;
@@ -106,6 +113,10 @@ typedef struct xga_t {
     uint16_t old_pal_addr_idx;
     uint16_t sprite_pal_addr_idx_prefetch;
 
+    int dac_addr;
+    int dac_pos;
+    int dac_r;
+    int dac_g;
     int v_total;
     int dispend;
     int v_syncstart;
@@ -119,7 +130,7 @@ typedef struct xga_t {
     int dispon;
     int h_disp_on;
     int vc;
-    int sc;
+    int scanline;
     int linepos;
     int oddeven;
     int firstline;
@@ -141,6 +152,7 @@ typedef struct xga_t {
     int cursor_data_on;
     int pal_test;
     int a5_test;
+    int test_stage;
     int type;
     int bus;
 
@@ -151,16 +163,20 @@ typedef struct xga_t {
     uint32_t hwc_color0;
     uint32_t hwc_color1;
     uint32_t disp_start_addr;
-    uint32_t ma_latch;
+    uint32_t memaddr_latch;
     uint32_t vram_size;
     uint32_t vram_mask;
     uint32_t rom_addr;
-    uint32_t ma;
-    uint32_t maback;
+    uint32_t memaddr;
+    uint32_t memaddr_backup;
     uint32_t read_bank;
     uint32_t write_bank;
     uint32_t px_map_base;
     uint32_t pallook[512];
+    uint32_t bios_diag;
+    uint32_t mapping_base;
+
+    PALETTE xgapal;
 
     uint64_t dispontime;
     uint64_t dispofftime;
@@ -193,6 +209,10 @@ typedef struct xga_t {
         uint16_t dst_map_y;
         uint16_t pat_map_x;
         uint16_t pat_map_y;
+        uint16_t clip_l;
+        uint16_t clip_r;
+        uint16_t clip_t;
+        uint16_t clip_b;
 
         int ssv_state;
         int pat_src;
@@ -206,13 +226,13 @@ typedef struct xga_t {
         int y;
         int sx;
         int sy;
-        int dx;
-        int dy;
         int px;
         int py;
         int pattern;
         int command_len;
         int filling;
+        int y_len;
+        int x_len;
 
         uint32_t short_stroke;
         uint32_t color_cmp;
@@ -222,14 +242,13 @@ typedef struct xga_t {
         uint32_t bkgd_color;
         uint32_t command;
         uint32_t dir_cmd;
+        uint32_t pattern_data;
 
         uint8_t  px_map_format[4];
         uint16_t px_map_width[4];
         uint16_t px_map_height[4];
         uint32_t px_map_base[4];
     } accel;
-
-    int big_endian_linear;
 } xga_t;
 
 #endif /*VIDEO_XGA_H*/
diff --git a/src/include/86box/vid_xga_device.h b/src/include/86box/vid_xga_device.h
index e337ef9d3..7a72e76f5 100644
--- a/src/include/86box/vid_xga_device.h
+++ b/src/include/86box/vid_xga_device.h
@@ -20,7 +20,6 @@
 
 #ifdef EMU_DEVICE_H
 extern const device_t xga_device;
-extern const device_t xga_isa_device;
 extern const device_t inmos_isa_device;
 #endif
 #endif /*VIDEO_XGA_DEVICE_H*/
diff --git a/src/include/86box/video.h b/src/include/86box/video.h
index e82807a12..81424dbcb 100644
--- a/src/include/86box/video.h
+++ b/src/include/86box/video.h
@@ -36,6 +36,10 @@ using atomic_int  = std::atomic_int;
 #define getcolg(color) (((color) >> 8) & 0xFF)
 #define getcolb(color) ((color) & 0xFF)
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 enum {
     VID_NONE = 0,
     VID_INTERNAL
@@ -49,10 +53,6 @@ enum {
     FULLSCR_SCALE_INT43
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 enum {
     VIDEO_ISA = 0,
     VIDEO_MCA,
@@ -69,6 +69,14 @@ enum {
 #define VIDEO_FLAG_TYPE_NONE    5
 #define VIDEO_FLAG_TYPE_MASK    7
 
+#define VIDEO_FLAG_TYPE_SECONDARY VIDEO_FLAG_TYPE_SPECIAL
+
+#define FONT_IBM_MDA_437_PATH        "roms/video/mda/mda.rom"
+#define FONT_IBM_MDA_437_NORDIC_PATH "roms/video/mda/4733197.bin"
+#define FONT_KAM_PATH                "roms/video/mda/kam.bin"
+#define FONT_KAMCL16_PATH            "roms/video/mda/kamcl16.bin"
+#define FONT_TULIP_DGA_PATH          "roms/video/mda/tulip-dga-bios.bin"
+
 typedef struct video_timings_t {
     int type;
     int write_b;
@@ -122,6 +130,8 @@ typedef struct monitor_t {
     int                      mon_force_resize;
     int                      mon_fullchange;
     int                      mon_changeframecount;
+    int                      mon_renderedframes;
+    atomic_int               mon_actualrenderedframes;
     atomic_int               mon_screenshots;
     uint32_t                *mon_pal_lookup;
     int                     *mon_cga_palette;
@@ -129,6 +139,8 @@ typedef struct monitor_t {
     int                      mon_cga_palette_static; /* Whether it should not be freed by the API. */
     const video_timings_t   *mon_vid_timings;
     int                      mon_vid_type;
+    atomic_bool              mon_interlace;
+    atomic_bool              mon_composite;
     struct blit_data_struct *mon_blit_data_ptr;
 } monitor_t;
 
@@ -180,6 +192,10 @@ extern bitmap_t *buffer32;
 #define efscrnsz_y           (monitors[monitor_index_global].mon_efscrnsz_y)
 #define unscaled_size_x      (monitors[monitor_index_global].mon_unscaled_size_x)
 #define unscaled_size_y      (monitors[monitor_index_global].mon_unscaled_size_y)
+
+#define CGAPAL_CGA_START    16            // Where the 16-color cga text/composite starts
+
+
 extern PALETTE      cgapal;
 extern PALETTE      cgapal_mono[6];
 #if 0
@@ -187,16 +203,15 @@ extern uint32_t     pal_lookup[256];
 #endif
 extern int          video_fullscreen;
 extern int          video_fullscreen_scale;
-extern int          video_fullscreen_first;
-extern uint8_t      fontdat[2048][8];
-extern uint8_t      fontdatm[2048][16];
-extern uint8_t      fontdat2[2048][8];
-extern uint8_t      fontdatm2[2048][16];
-extern uint8_t      fontdatw[512][32];
-extern uint8_t      fontdat8x12[256][16];
-extern uint8_t      fontdat12x18[256][36];
-extern dbcs_font_t *fontdatksc5601;
-extern dbcs_font_t *fontdatksc5601_user;
+extern uint8_t      fontdat[2048][8];      /* IBM CGA font */
+extern uint8_t      fontdatm[2048][16];    /* IBM MDA font */
+extern uint8_t      fontdat2[2048][8];     /* IBM CGA 2nd instance font */
+extern uint8_t      fontdatm2[2048][16];   /* IBM MDA 2nd instance font */
+extern uint8_t      fontdatw[512][32];     /* Wyse700 font */
+extern uint8_t      fontdat8x12[256][16];  /* MDSI Genius font */
+extern uint8_t      fontdat12x18[256][36]; /* IM1024 font */
+extern dbcs_font_t *fontdatksc5601;        /* Korean KSC-5601 font */
+extern dbcs_font_t *fontdatksc5601_user;   /* Korean KSC-5601 user defined font */
 extern uint32_t    *video_6to8;
 extern uint32_t    *video_8togs;
 extern uint32_t    *video_8to32;
@@ -223,7 +238,7 @@ extern void video_screenshot_monitor(uint32_t *buf, int start_x, int start_y, in
 extern void video_screenshot(uint32_t *buf, int start_x, int start_y, int row_len);
 
 #ifdef _WIN32
-extern void *__cdecl (*video_copy)(void *_Dst, const void *_Src, size_t _Size);
+extern void * (__cdecl *video_copy)(void *_Dst, const void *_Src, size_t _Size);
 extern void *__cdecl video_transform_copy(void *_Dst, const void *_Src, size_t _Size);
 #else
 extern void *(*video_copy)(void *__restrict _Dst, const void *__restrict _Src, size_t _Size);
@@ -276,8 +291,8 @@ extern uint8_t video_force_resize_get_monitor(int monitor_index);
 extern void    video_force_resize_set_monitor(uint8_t res, int monitor_index);
 extern void    video_update_timing(void);
 
-extern void loadfont_ex(char *s, int format, int offset);
-extern void loadfont(char *s, int format);
+extern void loadfont_ex(char *fn, int format, int offset);
+extern void loadfont(char *fn, int format);
 
 extern int get_actual_size_x(void);
 extern int get_actual_size_y(void);
@@ -313,6 +328,9 @@ extern const device_t mach32_mca_device;
 extern const device_t mach32_pci_device;
 extern const device_t mach32_onboard_pci_device;
 
+/* IBM Display Adapter (PS/55) */
+extern void da2_device_add(void);
+
 /* ATi Mach64 */
 extern const device_t mach64gx_isa_device;
 extern const device_t mach64gx_vlb_device;
@@ -320,29 +338,38 @@ extern const device_t mach64gx_pci_device;
 extern const device_t mach64vt2_device;
 
 /* ATi 18800 */
-#    if defined(DEV_BRANCH) && defined(USE_VGAWONDER)
 extern const device_t ati18800_wonder_device;
-#    endif
 extern const device_t ati18800_vga88_device;
 extern const device_t ati18800_device;
 
 /* ATi 28800 */
 extern const device_t ati28800_device;
+extern const device_t ati28800_wonder1024d_xl_plus_device;
 extern const device_t ati28800k_device;
 extern const device_t ati28800k_spc4620p_device;
 extern const device_t ati28800k_spc6033p_device;
 extern const device_t compaq_ati28800_device;
-#    if defined(DEV_BRANCH) && defined(USE_XL24)
+#    ifdef USE_XL24
 extern const device_t ati28800_wonderxl24_device;
-#    endif
+#    endif /* USE_XL24 */
+
+/* Bochs */
+extern const device_t bochs_svga_device;
+
+/* Chips & Technologies */
+extern const device_t chips_69000_device;
+extern const device_t chips_69000_onboard_device;
 
 /* Cirrus Logic GD54xx */
 extern const device_t gd5401_isa_device;
+extern const device_t gd5401_onboard_device;
 extern const device_t gd5402_isa_device;
 extern const device_t gd5402_onboard_device;
 extern const device_t gd5420_isa_device;
+extern const device_t gd5420_onboard_device;
 extern const device_t gd5422_isa_device;
 extern const device_t gd5424_vlb_device;
+extern const device_t gd5424_onboard_device;
 extern const device_t gd5426_isa_device;
 extern const device_t gd5426_diamond_speedstar_pro_a1_isa_device;
 extern const device_t gd5426_vlb_device;
@@ -355,6 +382,7 @@ extern const device_t gd5428_boca_isa_device;
 extern const device_t gd5428_mca_device;
 extern const device_t gd5426_mca_device;
 extern const device_t gd5428_onboard_device;
+extern const device_t gd5428_onboard_vlb_device;
 extern const device_t gd5429_isa_device;
 extern const device_t gd5429_vlb_device;
 extern const device_t gd5430_diamond_speedstar_pro_se_a8_vlb_device;
@@ -368,15 +396,23 @@ extern const device_t gd5434_onboard_pci_device;
 extern const device_t gd5434_vlb_device;
 extern const device_t gd5434_pci_device;
 extern const device_t gd5436_pci_device;
-extern const device_t gd5440_onboard_pci_device;
+extern const device_t gd5436_onboard_pci_device;
 extern const device_t gd5440_pci_device;
+extern const device_t gd5440_onboard_pci_device;
 extern const device_t gd5446_pci_device;
 extern const device_t gd5446_stb_pci_device;
 extern const device_t gd5480_pci_device;
 
+/* IBM CGA */
+extern const device_t cga_device;
+
+/* Pravetz CGA */
+extern const device_t cga_pravetz_device;
+
 /* Compaq CGA */
 extern const device_t compaq_cga_device;
 extern const device_t compaq_cga_2_device;
+extern const device_t compaq_plasma_device;
 
 /* Olivetti OGC */
 extern const device_t ogc_device;
@@ -440,13 +476,21 @@ extern const device_t millennium_device;
 extern const device_t mystique_device;
 extern const device_t mystique_220_device;
 extern const device_t millennium_ii_device;
+#ifdef USE_G100
 extern const device_t productiva_g100_device;
+#endif /* USE_G100 */
+
+/* JEGA */
+extern const device_t if386jega_device;
 
 /* Oak OTI-0x7 */
 extern const device_t oti037c_device;
+extern const device_t oti037_pbl300sx_device;
 extern const device_t oti067_device;
 extern const device_t oti067_acer386_device;
 extern const device_t oti067_ama932j_device;
+extern const device_t oti077_acer100t_device;
+extern const device_t oti077_pcs44c_device;
 extern const device_t oti077_device;
 
 /* Paradise/WD (S)VGA */
@@ -458,6 +502,9 @@ extern const device_t paradise_wd90c11_megapc_device;
 extern const device_t paradise_wd90c11_device;
 extern const device_t paradise_wd90c30_device;
 
+/* Quadram Quadcolor I / I + II */
+extern const device_t quadcolor_device;
+
 /* Realtek (S)VGA */
 extern const device_t realtek_rtg3105_device;
 extern const device_t realtek_rtg3106_device;
@@ -466,10 +513,14 @@ extern const device_t realtek_rtg3106_device;
 extern const device_t s3_orchid_86c911_isa_device;
 extern const device_t s3_diamond_stealth_vram_isa_device;
 extern const device_t s3_ami_86c924_isa_device;
+extern const device_t s3_elsa_winner1000_86c928_vlb_device;
+extern const device_t s3_elsa_winner2000_86c928_isa_device;
 extern const device_t s3_metheus_86c928_isa_device;
 extern const device_t s3_metheus_86c928_vlb_device;
+extern const device_t s3_elsa_winner1000_86c928_pci_device;
 extern const device_t s3_spea_mercury_lite_86c928_pci_device;
 extern const device_t s3_spea_mirage_86c801_isa_device;
+extern const device_t s3_winner1000_805_isa_device;
 extern const device_t s3_86c805_onboard_vlb_device;
 extern const device_t s3_spea_mirage_86c805_vlb_device;
 extern const device_t s3_mirocrystal_8s_805_vlb_device;
@@ -490,6 +541,7 @@ extern const device_t s3_spea_mirage_p64_vlb_device;
 extern const device_t s3_phoenix_trio64_vlb_device;
 extern const device_t s3_phoenix_trio64_onboard_pci_device;
 extern const device_t s3_phoenix_trio64_pci_device;
+extern const device_t s3_stb_powergraph_64_video_vlb_device;
 extern const device_t s3_phoenix_trio64vplus_pci_device;
 extern const device_t s3_phoenix_trio64vplus_onboard_pci_device;
 extern const device_t s3_cardex_trio64vplus_pci_device;
@@ -500,15 +552,15 @@ extern const device_t s3_phoenix_vision864_pci_device;
 extern const device_t s3_phoenix_vision864_vlb_device;
 extern const device_t s3_9fx_531_pci_device;
 extern const device_t s3_phoenix_vision868_pci_device;
-extern const device_t s3_phoenix_vision868_vlb_device;
 extern const device_t s3_diamond_stealth64_pci_device;
 extern const device_t s3_diamond_stealth64_vlb_device;
 extern const device_t s3_diamond_stealth64_964_pci_device;
 extern const device_t s3_diamond_stealth64_964_vlb_device;
+extern const device_t s3_diamond_stealth64_968_pci_device;
+extern const device_t s3_diamond_stealth64_968_vlb_device;
 extern const device_t s3_mirovideo_40sv_ergo_968_pci_device;
 extern const device_t s3_9fx_771_pci_device;
 extern const device_t s3_phoenix_vision968_pci_device;
-extern const device_t s3_phoenix_vision968_vlb_device;
 extern const device_t s3_spea_mercury_p64v_pci_device;
 extern const device_t s3_elsa_winner2000_pro_x_964_pci_device;
 extern const device_t s3_elsa_winner2000_pro_x_pci_device;
@@ -517,15 +569,17 @@ extern const device_t s3_trio64v2_dx_onboard_pci_device;
 
 /* S3 ViRGE */
 extern const device_t s3_virge_325_pci_device;
+extern const device_t s3_virge_325_onboard_pci_device;
 extern const device_t s3_diamond_stealth_2000_pci_device;
+extern const device_t s3_mirocrystal_3d_pci_device;
 extern const device_t s3_diamond_stealth_3000_pci_device;
 extern const device_t s3_stb_velocity_3d_pci_device;
 extern const device_t s3_virge_375_pci_device;
+extern const device_t s3_virge_375_onboard_pci_device;
 extern const device_t s3_diamond_stealth_2000pro_pci_device;
 extern const device_t s3_virge_385_pci_device;
 extern const device_t s3_virge_357_pci_device;
 extern const device_t s3_virge_357_agp_device;
-extern const device_t s3_diamond_stealth_4000_pci_device;
 extern const device_t s3_diamond_stealth_4000_agp_device;
 extern const device_t s3_trio3d2x_pci_device;
 extern const device_t s3_trio3d2x_agp_device;
@@ -539,6 +593,7 @@ extern const device_t tgui9440_vlb_device;
 extern const device_t tgui9440_pci_device;
 extern const device_t tgui9440_onboard_pci_device;
 extern const device_t tgui9660_pci_device;
+extern const device_t tgui9660_onboard_pci_device;
 extern const device_t tgui9680_pci_device;
 
 /* IBM PS/1 (S)VGA */
@@ -547,6 +602,7 @@ extern const device_t ibm_ps1_2121_device;
 /* Trident TVGA 8900 */
 extern const device_t tvga8900b_device;
 extern const device_t tvga8900d_device;
+extern const device_t tvga8900dr_device;
 extern const device_t tvga9000b_device;
 extern const device_t nec_sv9000_device;
 
@@ -559,6 +615,7 @@ extern const device_t ps1vga_mca_device;
 extern const device_t voodoo_device;
 extern const device_t voodoo_banshee_device;
 extern const device_t creative_voodoo_banshee_device;
+extern const device_t quantum3d_raven_device;
 extern const device_t voodoo_3_1000_device;
 extern const device_t voodoo_3_1000_agp_device;
 extern const device_t voodoo_3_2000_device;
@@ -577,6 +634,14 @@ extern const device_t velocity_200_agp_device;
 /* Wyse 700 */
 extern const device_t wy700_device;
 
+/* Yamaha V6355 */
+extern const device_t v6355d_device;
+
+/* Tandy */
+extern const device_t tandy_1000_video_device;
+extern const device_t tandy_1000hx_video_device;
+extern const device_t tandy_1000sl_video_device;
+
 #endif
 
 #endif /*EMU_VIDEO_H*/
diff --git a/src/include/86box/win.h b/src/include/86box/win.h
index 35f6688ad..5cead7cb0 100644
--- a/src/include/86box/win.h
+++ b/src/include/86box/win.h
@@ -26,50 +26,7 @@
 #ifndef UNICODE
 #    define UNICODE
 #endif
-#define BITMAP WINDOWS_BITMAP
-#if 0
-#    ifdef _WIN32_WINNT
-#        undef _WIN32_WINNT
-#        define _WIN32_WINNT 0x0501
-#    endif
-#endif
-#include "resource.h"
 #include <windows.h>
-#undef BITMAP
-
-/* DPI Awareness Context, copied from MinGW-w64 windef.h */
-#ifndef _DPI_AWARENESS_CONTEXTS_
-DECLARE_HANDLE(DPI_AWARENESS_CONTEXT);
-#    define DPI_AWARENESS_CONTEXT_UNAWARE              ((DPI_AWARENESS_CONTEXT) -1)
-#    define DPI_AWARENESS_CONTEXT_SYSTEM_AWARE         ((DPI_AWARENESS_CONTEXT) -2)
-#    define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE    ((DPI_AWARENESS_CONTEXT) -3)
-#    define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 ((DPI_AWARENESS_CONTEXT) -4)
-#    define DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED    ((DPI_AWARENESS_CONTEXT) -5)
-#endif
-
-#ifndef WM_DPICHANGED_AFTERPARENT
-#    define WM_DPICHANGED_AFTERPARENT 0x02E3
-#endif
-
-/* Class names and such. */
-#define CLASS_NAME             L"86BoxMainWnd"
-#define MENU_NAME              L"MainMenu"
-#define ACCEL_NAME             L"MainAccel"
-#define SUB_CLASS_NAME         L"86BoxSubWnd"
-#define SB_CLASS_NAME          L"86BoxStatusBar"
-#define SB_MENU_NAME           L"StatusBarMenu"
-#define FS_CLASS_NAME          L"86BoxFullScreen"
-#define SDL_CLASS_NAME         L"86BoxSDLWnd"
-#define SDL_SUB_CLASS_NAME     L"86BoxSDLSubWnd"
-
-#define CASSETTE_SUBMENU_NAME  L"CassetteSubmenu"
-#define CARTRIDGE_SUBMENU_NAME L"CartridgeSubmenu"
-#define FLOPPY_SUBMENU_NAME    L"FloppySubmenu"
-#define CDROM_SUBMENU_NAME     L"CdromSubmenu"
-#define ZIP_SUBMENU_NAME       L"ZIPSubmenu"
-#define MO_SUBMENU_NAME        L"MOSubmenu"
-
-#define VID_GL_SUBMENU         L"VidGLSubMenu"
 
 /* Application-specific window messages.
 
@@ -92,163 +49,4 @@ DECLARE_HANDLE(DPI_AWARENESS_CONTEXT);
 /* The emulator has shut down. */
 #define WM_HAS_SHUTDOWN 0x8897
 
-#ifdef USE_VNC
-#    define RENDERERS_NUM 5
-#else
-#    define RENDERERS_NUM 4
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern HINSTANCE hinstance;
-extern HWND      hwndMain;
-extern HWND      hwndRender;
-extern HWND      hwndRender2;
-extern HANDLE    ghMutex;
-extern HICON     hIcon[256];
-extern int       dpi;
-extern RECT      oldclip;
-extern int       sbar_height;
-extern int       tbar_height;
-extern int       user_resize;
-extern int       acp_utf8;
-
-#if 0
-extern int status_is_open;
-#endif
-
-extern char  openfilestring[512];
-extern WCHAR wopenfilestring[512];
-
-extern uint8_t filterindex;
-
-extern void ResizeWindowByClientArea(HWND hwnd, int width, int height);
-
-/* Emulator start/stop support functions. */
-extern void do_start(void);
-extern void do_stop(void);
-
-/* Internal platform support functions. */
-extern int  has_language_changed(uint32_t id);
-extern void set_language(uint32_t id);
-extern int  get_vidpause(void);
-extern void show_cursor(int);
-
-extern void keyboard_getkeymap(void);
-extern void keyboard_handle(PRAWINPUT raw);
-
-extern void win_mouse_init(void);
-extern void win_mouse_close(void);
-extern void win_mouse_handle(PRAWINPUT raw);
-
-extern void win_joystick_handle(PRAWINPUT raw);
-
-extern void win_notify_dlg_open(void);
-extern void win_notify_dlg_closed(void);
-extern int  win_get_dpi(HWND hwnd);
-extern int  win_get_system_metrics(int i, int dpi);
-
-extern LPARAM win_get_string(int id);
-
-extern void win_clear_icon_set(void);
-extern void win_system_icon_set(void);
-extern void win_load_icon_set(void);
-extern void win_get_icons_path(char *path_root);
-
-extern intptr_t fdd_type_to_icon(int type);
-
-#ifdef EMU_DEVICE_H
-extern uint8_t deviceconfig_open(HWND hwnd, const device_t *device);
-extern uint8_t deviceconfig_inst_open(HWND hwnd, const device_t *device, int inst);
-#endif
-extern uint8_t joystickconfig_open(HWND hwnd, int joy_nr, int type);
-
-extern int getfile(HWND hwnd, char *f, char *fn);
-extern int getsfile(HWND hwnd, char *f, char *fn);
-
-extern void hard_disk_add_open(HWND hwnd, int is_existing);
-extern int  hard_disk_was_added(void);
-
-/* Platform UI support functions. */
-extern int ui_init(int nCmdShow);
-
-/* Functions in win_about.c: */
-extern void AboutDialogCreate(HWND hwnd);
-
-/* Functions in win_snd_gain.c: */
-extern void SoundGainDialogCreate(HWND hwnd);
-
-/* Functions in win_new_floppy.c: */
-extern void NewFloppyDialogCreate(HWND hwnd, int id, int part);
-
-/* Functions in win_specify_dim.c: */
-extern void SpecifyDimensionsDialogCreate(HWND hwnd);
-
-/* Functions in win_preferences.c: */
-extern void PreferencesDlgCreate(HWND hwnd);
-
-/* Functions in win_settings.c: */
-#define SETTINGS_PAGE_MACHINE                 0
-#define SETTINGS_PAGE_VIDEO                   1
-#define SETTINGS_PAGE_INPUT                   2
-#define SETTINGS_PAGE_SOUND                   3
-#define SETTINGS_PAGE_NETWORK                 4
-#define SETTINGS_PAGE_PORTS                   5
-#define SETTINGS_PAGE_STORAGE                 6
-#define SETTINGS_PAGE_HARD_DISKS              7
-#define SETTINGS_PAGE_FLOPPY_AND_CDROM_DRIVES 8
-#define SETTINGS_PAGE_OTHER_REMOVABLE_DEVICES 9
-#define SETTINGS_PAGE_PERIPHERALS             10
-
-extern void win_settings_open(HWND hwnd);
-extern void win_settings_open_ex(HWND hwnd, int category);
-
-/* Functions in win_stbar.c: */
-extern HWND hwndSBAR;
-extern void StatusBarCreate(HWND hwndParent, uintptr_t idStatus, HINSTANCE hInst);
-extern int  MediaMenuHandler(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
-
-/* Functions in win_toolbar.c */
-extern HWND hwndRebar;
-extern void ToolBarCreate(HWND hwndParent, HINSTANCE hInst);
-extern void ToolBarLoadIcons(void);
-extern void ToolBarUpdatePause(int paused);
-
-/* Functions in win_dialog.c: */
-/* Pass NULL in the title param to use the default title. */
-extern int file_dlg_w(HWND hwnd, WCHAR *f, WCHAR *fn, WCHAR *title, int save);
-extern int file_dlg(HWND hwnd, WCHAR *f, char *fn, char *title, int save);
-extern int file_dlg_mb(HWND hwnd, char *f, char *fn, char *title, int save);
-extern int file_dlg_w_st(HWND hwnd, int i, WCHAR *fn, char *title, int save);
-extern int file_dlg_st(HWND hwnd, int i, char *fn, char *title, int save);
-
-extern wchar_t *BrowseFolder(wchar_t *saved_path, wchar_t *title);
-
-/* Functions in win_media_menu.c */
-extern void  media_menu_init(void);
-extern void  media_menu_reset(void);
-extern int   media_menu_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
-extern HMENU media_menu_get_cassette(void);
-extern HMENU media_menu_get_cartridge(int id);
-extern HMENU media_menu_get_floppy(int id);
-extern HMENU media_menu_get_cdrom(int id);
-extern HMENU media_menu_get_zip(int id);
-extern HMENU media_menu_get_mo(int id);
-extern void  media_menu_update_cassette(void);
-extern void  media_menu_update_cartridge(int id);
-extern void  media_menu_update_floppy(int id);
-extern void  media_menu_update_cdrom(int id);
-extern void  media_menu_update_zip(int id);
-extern void  media_menu_update_mo(int id);
-
-/* Functions in win_ui.c */
-extern HMENU menuMain;
-extern void  ResetAllMenus(void);
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /*PLAT_WIN_H*/
diff --git a/src/include/86box/win_opengl.h b/src/include/86box/win_opengl.h
deleted file mode 100644
index d354131ef..000000000
--- a/src/include/86box/win_opengl.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Header file for OpenGL rendering module
- *
- * Authors: Teemu Korhonen
- *
- *          Copyright 2021 Teemu Korhonen
- */
-
-#ifndef WIN_OPENGL_H
-#define WIN_OPENGL_H
-
-#define UNICODE
-#include <windows.h>
-
-extern int  opengl_init(HWND hwnd);
-extern int  opengl_pause(void);
-extern void opengl_close(void);
-extern void opengl_set_fs(int fs);
-extern void opengl_resize(int w, int h);
-extern void opengl_reload(void);
-
-#endif /*!WIN_OPENGL_H*/
diff --git a/src/include/86box/win_sdl.h b/src/include/86box/win_sdl.h
deleted file mode 100644
index 69340e8b6..000000000
--- a/src/include/86box/win_sdl.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Definitions for the libSDL2 rendering module.
- *
- *
- *
- * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
- *          Michael Drüing, <michael@drueing.de>
- *
- *          Copyright 2018-2019 Fred N. van Kempen.
- *          Copyright 2018-2019 Michael Drüing.
- *
- *          Redistribution and  use  in source  and binary forms, with
- *          or  without modification, are permitted  provided that the
- *          following conditions are met:
- *
- *         1. Redistributions of  source  code must retain the entire
- *            above notice, this list of conditions and the following
- *            disclaimer.
- *
- *         2. Redistributions in binary form must reproduce the above
- *            copyright  notice,  this list  of  conditions  and  the
- *            following disclaimer in  the documentation and/or other
- *            materials provided with the distribution.
- *
- *         3. Neither the  name of the copyright holder nor the names
- *            of  its  contributors may be used to endorse or promote
- *            products  derived from  this  software without specific
- *            prior written permission.
- *
- * THIS SOFTWARE  IS  PROVIDED BY THE  COPYRIGHT  HOLDERS AND CONTRIBUTORS
- * "AS IS" AND  ANY EXPRESS  OR  IMPLIED  WARRANTIES,  INCLUDING, BUT  NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE  ARE  DISCLAIMED. IN  NO  EVENT  SHALL THE COPYRIGHT
- * HOLDER OR  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL  DAMAGES  (INCLUDING,  BUT  NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE  GOODS OR SERVICES;  LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  AND ON  ANY
- * THEORY OF  LIABILITY, WHETHER IN  CONTRACT, STRICT  LIABILITY, OR  TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WIN_SDL_H
-#define WIN_SDL_H
-
-extern void sdl_close(void);
-extern int  sdl_inits(HWND h);
-extern int  sdl_inith(HWND h);
-extern int  sdl_initho(HWND h);
-extern int  sdl_pause(void);
-extern void sdl_resize(int x, int y);
-extern void sdl_enable(int enable);
-extern void sdl_set_fs(int fs);
-extern void sdl_reload(void);
-
-#endif /*WIN_SDL_H*/
diff --git a/src/include/86box/zip.h b/src/include/86box/zip.h
deleted file mode 100644
index a4a4c341f..000000000
--- a/src/include/86box/zip.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Implementation of the Iomega ZIP drive with SCSI(-like)
- *          commands, for both ATAPI and SCSI usage.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *
- *          Copyright 2018-2019 Miran Grca.
- */
-
-#ifndef EMU_ZIP_H
-#define EMU_ZIP_H
-
-#define ZIP_NUM         4
-
-#define BUF_SIZE        32768
-
-#define ZIP_TIME        10.0
-
-#define ZIP_SECTORS     (96 * 2048)
-
-#define ZIP_250_SECTORS (489532)
-
-#define ZIP_IMAGE_HISTORY 4
-
-enum {
-    ZIP_BUS_DISABLED = 0,
-    ZIP_BUS_ATAPI    = 5,
-    ZIP_BUS_SCSI     = 6,
-    ZIP_BUS_USB      = 7
-};
-
-typedef struct zip_drive_t {
-    uint8_t id;
-
-    union {
-        uint8_t res;
-        uint8_t res0; /* Reserved for other ID's. */
-        uint8_t res1;
-        uint8_t ide_channel;
-        uint8_t scsi_device_id;
-    };
-
-    uint8_t bus_type;  /* 0 = ATAPI, 1 = SCSI */
-    uint8_t bus_mode;  /* Bit 0 = PIO suported;
-                          Bit 1 = DMA supportd. */
-    uint8_t read_only; /* Struct variable reserved for
-                          media status. */
-    uint8_t pad;
-    uint8_t pad0;
-
-    FILE *fp;
-    void *priv;
-
-    char image_path[1024];
-    char prev_image_path[1024];
-
-    char *image_history[ZIP_IMAGE_HISTORY];
-
-    uint32_t is_250;
-    uint32_t medium_size;
-    uint32_t base;
-} zip_drive_t;
-
-typedef struct zip_t {
-    mode_sense_pages_t ms_pages_saved;
-
-    zip_drive_t *drv;
-#ifdef EMU_IDE_H
-    ide_tf_t *   tf;
-#else
-    void *       tf;
-#endif
-
-    uint8_t *buffer;
-    uint8_t atapi_cdb[16];
-    uint8_t current_cdb[16];
-    uint8_t sense[256];
-
-#ifdef ANCIENT_CODE
-    /* Task file. */
-    uint8_t features;
-    uint8_t phase;
-    uint16_t request_length;
-    uint8_t status;
-    uint8_t error;
-    uint16_t pad;
-    uint32_t pos;
-#endif
-
-    uint8_t id;
-    uint8_t cur_lun;
-    uint8_t pad0;
-    uint8_t pad1;
-
-    uint16_t max_transfer_len;
-    uint16_t pad2;
-
-    int requested_blocks;
-    int packet_status;
-    int total_length;
-    int do_page_save;
-    int unit_attention;
-    int request_pos;
-    int old_len;
-    int pad3;
-
-    uint32_t sector_pos;
-    uint32_t sector_len;
-    uint32_t packet_len;
-
-    double callback;
-} zip_t;
-
-extern zip_t      *zip[ZIP_NUM];
-extern zip_drive_t zip_drives[ZIP_NUM];
-extern uint8_t     atapi_zip_drives[8];
-extern uint8_t     scsi_zip_drives[16];
-
-#define zip_sense_error dev->sense[0]
-#define zip_sense_key   dev->sense[2]
-#define zip_asc         dev->sense[12]
-#define zip_ascq        dev->sense[13]
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void zip_disk_close(zip_t *dev);
-extern void zip_disk_reload(zip_t *dev);
-extern void zip_insert(zip_t *dev);
-
-extern void zip_global_init(void);
-extern void zip_hard_reset(void);
-
-extern void zip_reset(scsi_common_t *sc);
-extern int  zip_load(zip_t *dev, char *fn);
-extern void zip_close(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*EMU_ZIP_H*/
diff --git a/src/include/cJSON.h b/src/include/cJSON.h
new file mode 100644
index 000000000..218cc9ea6
--- /dev/null
+++ b/src/include/cJSON.h
@@ -0,0 +1,300 @@
+/*
+  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+#ifndef cJSON__h
+#define cJSON__h
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32))
+#define __WINDOWS__
+#endif
+
+#ifdef __WINDOWS__
+
+/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention.  For windows you have 3 define options:
+
+CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols
+CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols (default)
+CJSON_IMPORT_SYMBOLS - Define this if you want to dllimport symbol
+
+For *nix builds that support visibility attribute, you can define similar behavior by
+
+setting default visibility to hidden by adding
+-fvisibility=hidden (for gcc)
+or
+-xldscope=hidden (for sun cc)
+to CFLAGS
+
+then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does
+
+*/
+
+#define CJSON_CDECL __cdecl
+#define CJSON_STDCALL __stdcall
+
+/* export symbols by default, this is necessary for copy pasting the C and header file */
+#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS)
+#define CJSON_EXPORT_SYMBOLS
+#endif
+
+#if defined(CJSON_HIDE_SYMBOLS)
+#define CJSON_PUBLIC(type)   type CJSON_STDCALL
+#elif defined(CJSON_EXPORT_SYMBOLS)
+#define CJSON_PUBLIC(type)   __declspec(dllexport) type CJSON_STDCALL
+#elif defined(CJSON_IMPORT_SYMBOLS)
+#define CJSON_PUBLIC(type)   __declspec(dllimport) type CJSON_STDCALL
+#endif
+#else /* !__WINDOWS__ */
+#define CJSON_CDECL
+#define CJSON_STDCALL
+
+#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
+#define CJSON_PUBLIC(type)   __attribute__((visibility("default"))) type
+#else
+#define CJSON_PUBLIC(type) type
+#endif
+#endif
+
+/* project version */
+#define CJSON_VERSION_MAJOR 1
+#define CJSON_VERSION_MINOR 7
+#define CJSON_VERSION_PATCH 17
+
+#include <stddef.h>
+
+/* cJSON Types: */
+#define cJSON_Invalid (0)
+#define cJSON_False  (1 << 0)
+#define cJSON_True   (1 << 1)
+#define cJSON_NULL   (1 << 2)
+#define cJSON_Number (1 << 3)
+#define cJSON_String (1 << 4)
+#define cJSON_Array  (1 << 5)
+#define cJSON_Object (1 << 6)
+#define cJSON_Raw    (1 << 7) /* raw json */
+
+#define cJSON_IsReference 256
+#define cJSON_StringIsConst 512
+
+/* The cJSON structure: */
+typedef struct cJSON
+{
+    /* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
+    struct cJSON *next;
+    struct cJSON *prev;
+    /* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */
+    struct cJSON *child;
+
+    /* The type of the item, as above. */
+    int type;
+
+    /* The item's string, if type==cJSON_String  and type == cJSON_Raw */
+    char *valuestring;
+    /* writing to valueint is DEPRECATED, use cJSON_SetNumberValue instead */
+    int valueint;
+    /* The item's number, if type==cJSON_Number */
+    double valuedouble;
+
+    /* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
+    char *string;
+} cJSON;
+
+typedef struct cJSON_Hooks
+{
+      /* malloc/free are CDECL on Windows regardless of the default calling convention of the compiler, so ensure the hooks allow passing those functions directly. */
+      void *(CJSON_CDECL *malloc_fn)(size_t sz);
+      void (CJSON_CDECL *free_fn)(void *ptr);
+} cJSON_Hooks;
+
+typedef int cJSON_bool;
+
+/* Limits how deeply nested arrays/objects can be before cJSON rejects to parse them.
+ * This is to prevent stack overflows. */
+#ifndef CJSON_NESTING_LIMIT
+#define CJSON_NESTING_LIMIT 1000
+#endif
+
+/* returns the version of cJSON as a string */
+CJSON_PUBLIC(const char*) cJSON_Version(void);
+
+/* Supply malloc, realloc and free functions to cJSON */
+CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks);
+
+/* Memory Management: the caller is always responsible to free the results from all variants of cJSON_Parse (with cJSON_Delete) and cJSON_Print (with stdlib free, cJSON_Hooks.free_fn, or cJSON_free as appropriate). The exception is cJSON_PrintPreallocated, where the caller has full responsibility of the buffer. */
+/* Supply a block of JSON, and this returns a cJSON object you can interrogate. */
+CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value);
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithLength(const char *value, size_t buffer_length);
+/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
+/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated);
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithLengthOpts(const char *value, size_t buffer_length, const char **return_parse_end, cJSON_bool require_null_terminated);
+
+/* Render a cJSON entity to text for transfer/storage. */
+CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item);
+/* Render a cJSON entity to text for transfer/storage without any formatting. */
+CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item);
+/* Render a cJSON entity to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */
+CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt);
+/* Render a cJSON entity to text using a buffer already allocated in memory with given length. Returns 1 on success and 0 on failure. */
+/* NOTE: cJSON is not always 100% accurate in estimating how much memory it will use, so to be safe allocate 5 bytes more than you actually need */
+CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format);
+/* Delete a cJSON entity and all subentities. */
+CJSON_PUBLIC(void) cJSON_Delete(cJSON *item);
+
+/* Returns the number of items in an array (or object). */
+CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array);
+/* Retrieve item number "index" from array "array". Returns NULL if unsuccessful. */
+CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index);
+/* Get item "string" from object. Case insensitive. */
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string);
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string);
+CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string);
+/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
+CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void);
+
+/* Check item type and return its value */
+CJSON_PUBLIC(char *) cJSON_GetStringValue(const cJSON * const item);
+CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item);
+
+/* These functions check the type of an item */
+CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item);
+
+/* These calls create a cJSON item of the appropriate type. */
+CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean);
+CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num);
+CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string);
+/* raw json */
+CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw);
+CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void);
+
+/* Create a string where valuestring references a string so
+ * it will not be freed by cJSON_Delete */
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string);
+/* Create an object/array that only references it's elements so
+ * they will not be freed by cJSON_Delete */
+CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child);
+CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child);
+
+/* These utilities create an Array of count items.
+ * The parameter count cannot be greater than the number of elements in the number array, otherwise array access will be out of bounds.*/
+CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char *const *strings, int count);
+
+/* Append item to the specified array/object. */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToArray(cJSON *array, cJSON *item);
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item);
+/* Use this when string is definitely const (i.e. a literal, or as good as), and will definitely survive the cJSON object.
+ * WARNING: When this function was used, make sure to always check that (item->type & cJSON_StringIsConst) is zero before
+ * writing to `item->string` */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item);
+/* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item);
+
+/* Remove/Detach items from Arrays/Objects. */
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string);
+
+/* Update array items. */
+CJSON_PUBLIC(cJSON_bool) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem); /* Shifts pre-existing items to the right. */
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement);
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem);
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object,const char *string,cJSON *newitem);
+
+/* Duplicate a cJSON item */
+CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse);
+/* Duplicate will create a new, identical cJSON item to the one you pass, in new memory that will
+ * need to be released. With recurse!=0, it will duplicate any children connected to the item.
+ * The item->next and ->prev pointers are always zero on return from Duplicate. */
+/* Recursively compare two cJSON items for equality. If either a or b is NULL or invalid, they will be considered unequal.
+ * case_sensitive determines if object keys are treated case sensitive (1) or case insensitive (0) */
+CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive);
+
+/* Minify a strings, remove blank characters(such as ' ', '\t', '\r', '\n') from strings.
+ * The input pointer json cannot point to a read-only address area, such as a string constant, 
+ * but should point to a readable and writable address area. */
+CJSON_PUBLIC(void) cJSON_Minify(char *json);
+
+/* Helper functions for creating and adding items to an object at the same time.
+ * They return the added item or NULL on failure. */
+CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean);
+CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number);
+CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string);
+CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw);
+CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name);
+
+/* When assigning an integer value, it needs to be propagated to valuedouble too. */
+#define cJSON_SetIntValue(object, number) ((object) ? (object)->valueint = (object)->valuedouble = (number) : (number))
+/* helper for the cJSON_SetNumberValue macro */
+CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number);
+#define cJSON_SetNumberValue(object, number) ((object != NULL) ? cJSON_SetNumberHelper(object, (double)number) : (number))
+/* Change the valuestring of a cJSON_String object, only takes effect when type of object is cJSON_String */
+CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring);
+
+/* If the object is not a boolean type this does nothing and returns cJSON_Invalid else it returns the new type*/
+#define cJSON_SetBoolValue(object, boolValue) ( \
+    (object != NULL && ((object)->type & (cJSON_False|cJSON_True))) ? \
+    (object)->type=((object)->type &(~(cJSON_False|cJSON_True)))|((boolValue)?cJSON_True:cJSON_False) : \
+    cJSON_Invalid\
+)
+
+/* Macro for iterating over an array or object */
+#define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)
+
+/* malloc/free objects using the malloc/free functions that have been set with cJSON_InitHooks */
+CJSON_PUBLIC(void *) cJSON_malloc(size_t size);
+CJSON_PUBLIC(void) cJSON_free(void *object);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/include/slirp/libslirp-version.h b/src/include/slirp/libslirp-version.h
deleted file mode 100644
index b68906957..000000000
--- a/src/include/slirp/libslirp-version.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause */
-#ifndef LIBSLIRP_VERSION_H_
-#define LIBSLIRP_VERSION_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SLIRP_MAJOR_VERSION 4
-#define SLIRP_MINOR_VERSION 7
-#define SLIRP_MICRO_VERSION 0
-#define SLIRP_VERSION_STRING "4.7.0-86Box"
-
-#define SLIRP_CHECK_VERSION(major,minor,micro)                          \
-    (SLIRP_MAJOR_VERSION > (major) ||                                   \
-     (SLIRP_MAJOR_VERSION == (major) && SLIRP_MINOR_VERSION > (minor)) || \
-     (SLIRP_MAJOR_VERSION == (major) && SLIRP_MINOR_VERSION == (minor) && \
-      SLIRP_MICRO_VERSION >= (micro)))
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* LIBSLIRP_VERSION_H_ */
diff --git a/src/include/slirp/libslirp.h b/src/include/slirp/libslirp.h
deleted file mode 100644
index 7a6c9a4da..000000000
--- a/src/include/slirp/libslirp.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause */
-#ifndef LIBSLIRP_H
-#define LIBSLIRP_H
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <sys/types.h>
-
-#ifdef _WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <in6addr.h>
-#else
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#endif
-
-#include "libslirp-version.h"
-
-/* Windows does not define ssize_t, so we need to define it here. */
-#ifndef _SSIZE_T_DEFINED
-# define _SSIZE_T_DEFINED
-# undef ssize_t
-# ifdef _WIN64
-#  define ssize_t int64_t
-# else
-#  define ssize_t int32_t
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Opaque structure containing the slirp state */
-typedef struct Slirp Slirp;
-
-/* Flags passed to SlirpAddPollCb and to be returned by SlirpGetREventsCb. */
-enum {
-    SLIRP_POLL_IN = 1 << 0,
-    SLIRP_POLL_OUT = 1 << 1,
-    SLIRP_POLL_PRI = 1 << 2,
-    SLIRP_POLL_ERR = 1 << 3,
-    SLIRP_POLL_HUP = 1 << 4,
-};
-
-typedef ssize_t (*SlirpReadCb)(void *buf, size_t len, void *opaque);
-typedef ssize_t (*SlirpWriteCb)(const void *buf, size_t len, void *opaque);
-typedef void (*SlirpTimerCb)(void *opaque);
-typedef int (*SlirpAddPollCb)(int fd, int events, void *opaque);
-typedef int (*SlirpGetREventsCb)(int idx, void *opaque);
-
-typedef enum SlirpTimerId {
-    SLIRP_TIMER_RA,
-    SLIRP_TIMER_NUM,
-} SlirpTimerId;
-
-/*
- * Callbacks from slirp, to be set by the application.
- *
- * The opaque parameter is set to the opaque pointer given in the slirp_new /
- * slirp_init call.
- */
-typedef struct SlirpCb {
-    /*
-     * Send an ethernet frame to the guest network. The opaque parameter is the
-     * one given to slirp_init(). If the guest is not ready to receive a frame,
-     * the function can just drop the data. TCP will then handle retransmissions
-     * at a lower pace.
-     * <0 reports an IO error.
-     */
-    SlirpWriteCb send_packet;
-    /* Print a message for an error due to guest misbehavior.  */
-    void (*guest_error)(const char *msg, void *opaque);
-    /* Return the virtual clock value in nanoseconds */
-    int64_t (*clock_get_ns)(void *opaque);
-    /* Create a new timer with the given callback and opaque data. Not
-     * needed if timer_new_opaque is provided. */
-    void *(*timer_new)(SlirpTimerCb cb, void *cb_opaque, void *opaque);
-    /* Remove and free a timer */
-    void (*timer_free)(void *timer, void *opaque);
-    /* Modify a timer to expire at @expire_time (ms) */
-    void (*timer_mod)(void *timer, int64_t expire_time, void *opaque);
-    /* Register a fd for future polling */
-    void (*register_poll_fd)(int fd, void *opaque);
-    /* Unregister a fd */
-    void (*unregister_poll_fd)(int fd, void *opaque);
-    /* Kick the io-thread, to signal that new events may be processed because some TCP buffer
-     * can now receive more data, i.e. slirp_socket_can_recv will return 1. */
-    void (*notify)(void *opaque);
-
-    /*
-     * Fields introduced in SlirpConfig version 4 begin
-     */
-
-    /* Initialization has completed and a Slirp* has been created.  */
-    void (*init_completed)(Slirp *slirp, void *opaque);
-    /* Create a new timer.  When the timer fires, the application passes
-     * the SlirpTimerId and cb_opaque to slirp_handle_timer.  */
-    void *(*timer_new_opaque)(SlirpTimerId id, void *cb_opaque, void *opaque);
-} SlirpCb;
-
-#define SLIRP_CONFIG_VERSION_MIN 1
-#define SLIRP_CONFIG_VERSION_MAX 4
-
-typedef struct SlirpConfig {
-    /* Version must be provided */
-    uint32_t version;
-    /*
-     * Fields introduced in SlirpConfig version 1 begin
-     */
-    int restricted;
-    bool in_enabled;
-    struct in_addr vnetwork;
-    struct in_addr vnetmask;
-    struct in_addr vhost;
-    bool in6_enabled;
-    struct in6_addr vprefix_addr6;
-    uint8_t vprefix_len;
-    struct in6_addr vhost6;
-    const char *vhostname;
-    const char *tftp_server_name;
-    const char *tftp_path;
-    const char *bootfile;
-    struct in_addr vdhcp_start;
-    struct in_addr vnameserver;
-    struct in6_addr vnameserver6;
-    const char **vdnssearch;
-    const char *vdomainname;
-    /* Default: IF_MTU_DEFAULT */
-    size_t if_mtu;
-    /* Default: IF_MRU_DEFAULT */
-    size_t if_mru;
-    /* Prohibit connecting to 127.0.0.1:* */
-    bool disable_host_loopback;
-    /*
-     * Enable emulation code (*warning*: this code isn't safe, it is not
-     * recommended to enable it)
-     */
-    bool enable_emu;
-    /*
-     * Fields introduced in SlirpConfig version 2 begin
-     */
-    struct sockaddr_in *outbound_addr;
-    struct sockaddr_in6 *outbound_addr6;
-    /*
-     * Fields introduced in SlirpConfig version 3 begin
-     */
-    bool disable_dns;  /* slirp will not redirect/serve any DNS packet */
-    /*
-     * Fields introduced in SlirpConfig version 4 begin
-     */
-    bool disable_dhcp; /* slirp will not reply to any DHCP requests */
-} SlirpConfig;
-
-/* Create a new instance of a slirp stack */
-Slirp *slirp_new(const SlirpConfig *cfg, const SlirpCb *callbacks,
-                 void *opaque);
-/* slirp_init is deprecated in favor of slirp_new */
-Slirp *slirp_init(int restricted, bool in_enabled, struct in_addr vnetwork,
-                  struct in_addr vnetmask, struct in_addr vhost,
-                  bool in6_enabled, struct in6_addr vprefix_addr6,
-                  uint8_t vprefix_len, struct in6_addr vhost6,
-                  const char *vhostname, const char *tftp_server_name,
-                  const char *tftp_path, const char *bootfile,
-                  struct in_addr vdhcp_start, struct in_addr vnameserver,
-                  struct in6_addr vnameserver6, const char **vdnssearch,
-                  const char *vdomainname, const SlirpCb *callbacks,
-                  void *opaque);
-/* Shut down an instance of a slirp stack */
-void slirp_cleanup(Slirp *slirp);
-
-/* This is called by the application when it is about to sleep through poll().
- * *timeout is set to the amount of virtual time (in ms) that the application intends to
- * wait (UINT32_MAX if infinite). slirp_pollfds_fill updates it according to
- * e.g. TCP timers, so the application knows it should sleep a smaller amount of
- * time. slirp_pollfds_fill calls add_poll for each file descriptor
- * that should be monitored along the sleep. The opaque pointer is passed as
- * such to add_poll, and add_poll returns an index. */
-void slirp_pollfds_fill(Slirp *slirp, uint32_t *timeout,
-                        SlirpAddPollCb add_poll, void *opaque);
-
-/* This is called by the application after sleeping, to report which file
- * descriptors are available. slirp_pollfds_poll calls get_revents on each file
- * descriptor, giving it the index that add_poll returned during the
- * slirp_pollfds_fill call, to know whether the descriptor is available for
- * read/write/etc. (SLIRP_POLL_*)
- * select_error should be passed 1 if poll() returned an error. */
-void slirp_pollfds_poll(Slirp *slirp, int select_error,
-                        SlirpGetREventsCb get_revents, void *opaque);
-
-/* This is called by the application when the guest emits a packet on the
- * guest network, to be interpreted by slirp. */
-void slirp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len);
-
-/* This is called by the application when a timer expires, if it provides
- * the timer_new_opaque callback.  It is not needed if the application only
- * uses timer_new. */
-void slirp_handle_timer(Slirp *slirp, SlirpTimerId id, void *cb_opaque);
-
-/* These set up / remove port forwarding between a host port in the real world
- * and the guest network. */
-int slirp_add_hostfwd(Slirp *slirp, int is_udp, struct in_addr host_addr,
-                      int host_port, struct in_addr guest_addr, int guest_port);
-int slirp_remove_hostfwd(Slirp *slirp, int is_udp, struct in_addr host_addr,
-                         int host_port);
-
-#define SLIRP_HOSTFWD_UDP 1
-#define SLIRP_HOSTFWD_V6ONLY 2
-int slirp_add_hostxfwd(Slirp *slirp,
-                       const struct sockaddr *haddr, socklen_t haddrlen,
-                       const struct sockaddr *gaddr, socklen_t gaddrlen,
-                       int flags);
-int slirp_remove_hostxfwd(Slirp *slirp,
-                          const struct sockaddr *haddr, socklen_t haddrlen,
-                          int flags);
-
-/* Set up port forwarding between a port in the guest network and a
- * command running on the host */
-int slirp_add_exec(Slirp *slirp, const char *cmdline,
-                   struct in_addr *guest_addr, int guest_port);
-/* Set up port forwarding between a port in the guest network and a
- * Unix port on the host */
-int slirp_add_unix(Slirp *slirp, const char *unixsock,
-                   struct in_addr *guest_addr, int guest_port);
-/* Set up port forwarding between a port in the guest network and a
- * callback that will receive the data coming from the port */
-int slirp_add_guestfwd(Slirp *slirp, SlirpWriteCb write_cb, void *opaque,
-                       struct in_addr *guest_addr, int guest_port);
-
-/* TODO: rather identify a guestfwd through an opaque pointer instead of through
- * the guest_addr */
-
-/* This is called by the application for a guestfwd, to determine how much data
- * can be received by the forwarded port through a call to slirp_socket_recv. */
-size_t slirp_socket_can_recv(Slirp *slirp, struct in_addr guest_addr,
-                             int guest_port);
-/* This is called by the application for a guestfwd, to provide the data to be
- * sent on the forwarded port */
-void slirp_socket_recv(Slirp *slirp, struct in_addr guest_addr, int guest_port,
-                       const uint8_t *buf, int size);
-
-/* Remove entries added by slirp_add_exec, slirp_add_unix or slirp_add_guestfwd */
-int slirp_remove_guestfwd(Slirp *slirp, struct in_addr guest_addr,
-                          int guest_port);
-
-/* Return a human-readable state of the slirp stack */
-char *slirp_connection_info(Slirp *slirp);
-
-/* Return a human-readable state of the NDP/ARP tables */
-char *slirp_neighbor_info(Slirp *slirp);
-
-/* Save the slirp state through the write_cb. The opaque pointer is passed as
- * such to the write_cb. */
-void slirp_state_save(Slirp *s, SlirpWriteCb write_cb, void *opaque);
-
-/* Returns the version of the slirp state, to be saved along the state */
-int slirp_state_version(void);
-
-/* Load the slirp state through the read_cb. The opaque pointer is passed as
- * such to the read_cb. The version should be given as it was obtained from
- * slirp_state_version when slirp_state_save was called. */
-int slirp_state_load(Slirp *s, int version_id, SlirpReadCb read_cb,
-                     void *opaque);
-
-/* Return the version of the slirp implementation */
-const char *slirp_version_string(void);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* LIBSLIRP_H */
diff --git a/src/include_make/86box/version.h b/src/include_make/86box/version.h
deleted file mode 100644
index 4004f58b3..000000000
--- a/src/include_make/86box/version.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Definitions for project version, branding, and external links.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *
- *          Copyright 2020 Miran Grca.
- */
-
-#define _LSTR(s) L ## s
-#define LSTR(s) _LSTR(s)
-
-/* Version info. */
-#define EMU_NAME    "86Box"
-#define EMU_NAME_W  LSTR(EMU_NAME)
-
-#define EMU_VERSION       "4.1"
-#define EMU_VERSION_W     LSTR(EMU_VERSION)
-#define EMU_VERSION_EX    "3.50" /* frozen due to IDE re-detection behavior on Windows */
-#define EMU_VERSION_MAJ   4
-#define EMU_VERSION_MIN   1
-#define EMU_VERSION_PATCH 0
-
-#define EMU_BUILD_NUM 0
-
-#define EMU_VERSION_FULL   EMU_VERSION
-#define EMU_VERSION_FULL_W EMU_VERSION_W
-
-#define COPYRIGHT_YEAR "2024"
-
-/* Web URL info. */
-#define EMU_SITE       "86box.net"
-#define EMU_SITE_W     LSTR(EMU_SITE)
-#define EMU_ROMS_URL   "https://github.com/86Box/roms/releases/latest"
-#define EMU_ROMS_URL_W LSTR(EMU_ROMS_URL)
-#ifdef RELEASE_BUILD
-# define EMU_DOCS_URL  "https://86box.readthedocs.io/en/v4.1/"
-#else
-# define EMU_DOCS_URL  "https://86box.readthedocs.io"
-#endif
-#define EMU_DOCS_URL_W LSTR(EMU_DOCS_URL)
diff --git a/src/io.c b/src/io.c
index 7705aba12..284cf9a1f 100644
--- a/src/io.c
+++ b/src/io.c
@@ -15,7 +15,7 @@
  *          Fred N. van Kempen, <decwiz@yahoo.com>
  *
  *          Copyright 2008-2019 Sarah Walker.
- *          Copyright 2016-2019 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -28,6 +28,7 @@
 #include <86box/io.h>
 #include <86box/timer.h>
 #include "cpu.h"
+#include "x86.h"
 #include <86box/m_amstrad.h>
 #include <86box/pci.h>
 
@@ -145,6 +146,8 @@ io_sethandler_common(uint16_t base, int size,
         q->next = NULL;
 
         io_last[base + c] = q;
+
+        q = NULL;
     }
 }
 
@@ -279,6 +282,58 @@ io_handler_interleaved(int set, uint16_t base, int size,
     io_handler_common(set, base, size, inb, inw, inl, outb, outw, outl, priv, 2);
 }
 
+#ifdef USE_DEBUG_REGS_486
+extern int trap;
+/* Set trap for I/O address breakpoints. */
+void
+io_debug_check_addr(uint16_t addr)
+{
+    int i = 0;
+    int set_trap = 0;
+
+    if (!(dr[7] & 0xFF))
+        return;
+    
+    if (!(cr4 & 0x8))
+        return; /* No I/O debug trap. */
+
+    for (i = 0; i < 4; i++) {
+        uint16_t dr_addr = dr[i] & 0xFFFF;
+        int breakpoint_enabled = !!(dr[7] & (0x3 << (2 * i)));
+        int len_type_pair = ((dr[7] >> 16) & (0xF << (4 * i))) >> (4 * i);
+        if (!breakpoint_enabled)
+            continue;
+        if ((len_type_pair & 3) != 2)
+            continue;
+        
+        switch ((len_type_pair >> 2) & 3)
+        {
+            case 0x00:
+                if (dr_addr == addr) {
+                    set_trap = 1;
+                    dr[6] |= (1 << i);
+                }
+                break;
+            case 0x01:
+                if ((dr_addr & ~1) == addr || ((dr_addr & ~1) + 1) == (addr + 1)) {
+                    set_trap = 1;
+                    dr[6] |= (1 << i);
+                }
+                break;
+            case 0x03:
+                dr_addr &= ~3;
+                if (addr >= dr_addr && addr < (dr_addr + 4)) {
+                    set_trap = 1;
+                    dr[6] |= (1 << i);
+                }
+                break;
+        }
+    }
+    if (set_trap)
+        trap |= 4;
+}
+#endif
+
 uint8_t
 inb(uint16_t port)
 {
@@ -290,6 +345,12 @@ inb(uint16_t port)
     int     qfound = 0;
 #endif
 
+    io_port = port;
+
+#ifdef USE_DEBUG_REGS_486
+    io_debug_check_addr(port);
+#endif
+
     if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) {
         ret = pci_read(port, NULL);
         found = 1;
@@ -350,6 +411,13 @@ outb(uint16_t port, uint8_t val)
     int   qfound = 0;
 #endif
 
+    io_port = port;
+    io_val  = val;
+
+#ifdef USE_DEBUG_REGS_486
+    io_debug_check_addr(port);
+#endif
+
     if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) {
         pci_write(port, val, NULL);
         found = 1;
@@ -377,10 +445,10 @@ outb(uint16_t port, uint8_t val)
         }
     }
 
-    if (!found) {
+    if (!found || (port == 0x84)) {
         cycles -= io_delay;
 #ifdef USE_DYNAREC
-        if (cpu_use_dynarec && ((port == 0xeb) || (port == 0xed)))
+        if (cpu_use_dynarec && ((port == 0x84) || (port == 0xeb) || (port == 0xed)))
             update_tsc();
 #endif
     }
@@ -402,6 +470,12 @@ inw(uint16_t port)
 #endif
     uint8_t  ret8[2];
 
+    io_port = port;
+
+#ifdef USE_DEBUG_REGS_486
+    io_debug_check_addr(port);
+#endif
+
     if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) {
         ret = pci_readw(port, NULL);
         found = 2;
@@ -474,6 +548,13 @@ outw(uint16_t port, uint16_t val)
     int   qfound = 0;
 #endif
 
+    io_port = port;
+    io_val  = val;
+
+#ifdef USE_DEBUG_REGS_486
+    io_debug_check_addr(port);
+#endif
+
     if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) {
         pci_writew(port, val, NULL);
         found = 2;
@@ -542,6 +623,12 @@ inl(uint16_t port)
     int      qfound = 0;
 #endif
 
+    io_port = port;
+
+#ifdef USE_DEBUG_REGS_486
+    io_debug_check_addr(port);
+#endif
+
     if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) {
         ret = pci_readl(port, NULL);
         found = 4;
@@ -646,6 +733,13 @@ outl(uint16_t port, uint32_t val)
 #endif
     int   i      = 0;
 
+    io_port = port;
+    io_val  = val;
+
+#ifdef USE_DEBUG_REGS_486
+    io_debug_check_addr(port);
+#endif
+
     if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) {
         pci_writel(port, val, NULL);
         found = 4;
diff --git a/src/ioapic.c b/src/ioapic.c
index c3939f249..ea0811f91 100644
--- a/src/ioapic.c
+++ b/src/ioapic.c
@@ -117,12 +117,12 @@ ioapic_init(UNUSED(const device_t *info))
 const device_t ioapic_device = {
     .name          = "I/O Advanced Programmable Interrupt Controller",
     .internal_name = "ioapic",
-    .flags         = DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0,
     .init          = ioapic_init,
     .close         = ioapic_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/log.c b/src/log.c
deleted file mode 100644
index b5267d70b..000000000
--- a/src/log.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          The handler of the new logging system.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          Fred N. van Kempen, <decwiz@yahoo.com>
- *
- *          Copyright 2021 Miran Grca.
- *          Copyright 2021 Fred N. van Kempen.
- */
-#include <inttypes.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <wchar.h>
-
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include <86box/config.h>
-#include <86box/mem.h>
-#include "cpu.h"
-#include <86box/plat.h>
-#include <86box/version.h>
-#include <86box/log.h>
-
-#ifndef RELEASE_BUILD
-typedef struct log_t {
-    char  buff[1024];
-    char *dev_name;
-    int   seen;
-    int   suppr_seen;
-} log_t;
-
-extern FILE *stdlog; /* file to log output to */
-
-void
-log_set_suppr_seen(void *priv, int suppr_seen)
-{
-    log_t *log = (log_t *) priv;
-
-    log->suppr_seen = suppr_seen;
-}
-
-void
-log_set_dev_name(void *priv, char *dev_name)
-{
-    log_t *log = (log_t *) priv;
-
-    log->dev_name = dev_name;
-}
-
-static void
-log_copy(log_t *log, char *dest, const char *src, size_t dest_size)
-{
-    memset(dest, 0x00, dest_size * sizeof(char));
-    if (log && log->dev_name && strcmp(log->dev_name, "")) {
-        strcat(dest, log->dev_name);
-        strcat(dest, ": ");
-    }
-    strcat(dest, src);
-}
-
-/*
- * Log something to the logfile or stdout.
- *
- * To avoid excessively-large logfiles because some
- * module repeatedly logs, we keep track of what is
- * being logged, and catch repeating entries.
- */
-void
-log_out(void *priv, const char *fmt, va_list ap)
-{
-    log_t *log = (log_t *) priv;
-    char   temp[1024];
-    char   fmt2[1024];
-
-    if (log == NULL)
-        return;
-
-    if (strcmp(fmt, "") == 0)
-        return;
-
-    if (stdlog == NULL) {
-        if (log_path[0] != '\0') {
-            stdlog = plat_fopen(log_path, "w");
-            if (stdlog == NULL)
-                stdlog = stdout;
-        } else
-            stdlog = stdout;
-    }
-
-    vsprintf(temp, fmt, ap);
-    if (log->suppr_seen && !strcmp(log->buff, temp))
-        log->seen++;
-    else {
-        if (log->suppr_seen && log->seen) {
-            log_copy(log, fmt2, "*** %d repeats ***\n", 1024);
-            fprintf(stdlog, fmt2, log->seen);
-        }
-        log->seen = 0;
-        strcpy(log->buff, temp);
-        log_copy(log, fmt2, temp, 1024);
-        fprintf(stdlog, fmt2, ap);
-    }
-
-    fflush(stdlog);
-}
-
-void
-log_fatal(void *priv, const char *fmt, ...)
-{
-    log_t  *log = (log_t *) priv;
-    char    temp[1024];
-    char    fmt2[1024];
-    va_list ap;
-
-    if (log == NULL)
-        return;
-
-    va_start(ap, fmt);
-    log_copy(log, fmt2, fmt, 1024);
-    vsprintf(temp, fmt2, ap);
-    fatal_ex(fmt2, ap);
-    va_end(ap);
-    exit(-1);
-}
-
-void *
-log_open(char *dev_name)
-{
-    log_t *log = malloc(sizeof(log_t));
-
-    memset(log, 0, sizeof(log_t));
-
-    log->dev_name   = dev_name;
-    log->suppr_seen = 1;
-
-    return (void *) log;
-}
-
-void
-log_close(void *priv)
-{
-    log_t *log = (log_t *) priv;
-
-    free(log);
-}
-#endif
diff --git a/src/lpt.c b/src/lpt.c
deleted file mode 100644
index dd77b3516..000000000
--- a/src/lpt.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/* Copyright holders: Sarah Walker
-   see COPYING for more details
-*/
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/io.h>
-#include <86box/lpt.h>
-#include <86box/pic.h>
-#include <86box/sound.h>
-#include <86box/prt_devs.h>
-#include <86box/net_plip.h>
-
-lpt_port_t lpt_ports[PARALLEL_MAX];
-
-const lpt_device_t lpt_none_device = {
-    .name          = "None",
-    .internal_name = "none",
-    .init          = NULL,
-    .close         = NULL,
-    .write_data    = NULL,
-    .write_ctrl    = NULL,
-    .read_data     = NULL,
-    .read_status   = NULL,
-    .read_ctrl     = NULL
-};
-
-static const struct {
-    const char         *internal_name;
-    const lpt_device_t *device;
-} lpt_devices[] = {
-  // clang-format off
-    {"none",            &lpt_none_device          },
-    {"dss",             &dss_device               },
-    {"lpt_dac",         &lpt_dac_device           },
-    {"lpt_dac_stereo",  &lpt_dac_stereo_device    },
-    {"text_prt",        &lpt_prt_text_device      },
-    {"dot_matrix",      &lpt_prt_escp_device      },
-    {"postscript",      &lpt_prt_ps_device        },
-    {"plip",            &lpt_plip_device          },
-    {"dongle_savquest", &lpt_hasp_savquest_device },
-    {"",                NULL                      }
-  // clang-format on
-};
-
-const char *
-lpt_device_get_name(int id)
-{
-    if (strlen(lpt_devices[id].internal_name) == 0)
-        return NULL;
-    if (!lpt_devices[id].device)
-        return "None";
-    return lpt_devices[id].device->name;
-}
-
-const char *
-lpt_device_get_internal_name(int id)
-{
-    if (strlen(lpt_devices[id].internal_name) == 0)
-        return NULL;
-    return lpt_devices[id].internal_name;
-}
-
-int
-lpt_device_get_from_internal_name(char *s)
-{
-    int c = 0;
-
-    while (strlen(lpt_devices[c].internal_name) != 0) {
-        if (strcmp(lpt_devices[c].internal_name, s) == 0)
-            return c;
-        c++;
-    }
-
-    return 0;
-}
-
-void
-lpt_devices_init(void)
-{
-    for (uint8_t i = 0; i < PARALLEL_MAX; i++) {
-        lpt_ports[i].dt = (lpt_device_t *) lpt_devices[lpt_ports[i].device].device;
-
-        if (lpt_ports[i].dt && lpt_ports[i].dt->init)
-            lpt_ports[i].priv = lpt_ports[i].dt->init(&lpt_ports[i]);
-    }
-}
-
-void
-lpt_devices_close(void)
-{
-    lpt_port_t *dev;
-
-    for (uint8_t i = 0; i < PARALLEL_MAX; i++) {
-        dev = &lpt_ports[i];
-
-        if (lpt_ports[i].dt && lpt_ports[i].dt->close)
-            dev->dt->close(dev->priv);
-
-        dev->dt = NULL;
-    }
-}
-
-void
-lpt_write(uint16_t port, uint8_t val, void *priv)
-{
-    lpt_port_t *dev = (lpt_port_t *) priv;
-
-    switch (port & 3) {
-        case 0:
-            if (dev->dt && dev->dt->write_data && dev->priv)
-                dev->dt->write_data(val, dev->priv);
-            dev->dat = val;
-            break;
-
-        case 1:
-            break;
-
-        case 2:
-            if (dev->dt && dev->dt->write_ctrl && dev->priv)
-                dev->dt->write_ctrl(val, dev->priv);
-            dev->ctrl       = val;
-            dev->enable_irq = val & 0x10;
-            break;
-
-        default:
-            break;
-    }
-}
-
-uint8_t
-lpt_read(uint16_t port, void *priv)
-{
-    uint8_t     ret = 0xff;
-    lpt_port_t *dev = (lpt_port_t *) priv;
-
-    switch (port & 3) {
-        case 0:
-            if (dev->dt && dev->dt->read_data && dev->priv)
-                ret = dev->dt->read_data(dev->priv);
-            else
-                ret = dev->dat;
-            break;
-
-        case 1:
-            if (dev->dt && dev->dt->read_status && dev->priv)
-                ret = dev->dt->read_status(dev->priv) | 0x07;
-            else
-                ret = 0xdf;
-            break;
-
-        case 2:
-            if (dev->dt && dev->dt->read_ctrl && dev->priv)
-                ret = (dev->dt->read_ctrl(dev->priv) & 0xef) | dev->enable_irq;
-            else
-                ret = 0xe0 | dev->ctrl | dev->enable_irq;
-            break;
-
-        default:
-            break;
-    }
-
-    return ret;
-}
-
-uint8_t
-lpt_read_port(int port, uint16_t reg)
-{
-    lpt_port_t *dev = &(lpt_ports[port]);
-    uint8_t ret = lpt_read(reg, dev);
-
-    return ret;
-}
-
-uint8_t
-lpt_read_status(int port)
-{
-    lpt_port_t *dev = &(lpt_ports[port]);
-    uint8_t ret = 0xff;
-
-    if (dev->dt && dev->dt->read_status && dev->priv)
-        ret = dev->dt->read_status(dev->priv) | 0x07;
-    else
-        ret = 0xdf;
-
-    return ret;
-}
-
-void
-lpt_irq(void *priv, int raise)
-{
-    const lpt_port_t *dev = (lpt_port_t *) priv;
-
-    if (dev->enable_irq && (dev->irq != 0xff)) {
-        if (raise)
-            picint(1 << dev->irq);
-        else
-            picintc(1 << dev->irq);
-    }
-}
-
-void
-lpt_init(void)
-{
-    uint16_t default_ports[PARALLEL_MAX] = { LPT1_ADDR, LPT2_ADDR, LPT_MDA_ADDR, LPT4_ADDR };
-    uint8_t  default_irqs[PARALLEL_MAX]  = { LPT1_IRQ, LPT2_IRQ, LPT_MDA_IRQ, LPT4_IRQ };
-
-    for (uint8_t i = 0; i < PARALLEL_MAX; i++) {
-        lpt_ports[i].addr       = 0xffff;
-        lpt_ports[i].irq        = 0xff;
-        lpt_ports[i].enable_irq = 0x10;
-
-        if (lpt_ports[i].enabled) {
-            lpt_port_init(i, default_ports[i]);
-            lpt_port_irq(i, default_irqs[i]);
-        }
-    }
-}
-
-void
-lpt_port_init(int i, uint16_t port)
-{
-    if (lpt_ports[i].enabled) {
-        if (lpt_ports[i].addr != 0xffff)
-            io_removehandler(lpt_ports[i].addr, 0x0003, lpt_read, NULL, NULL, lpt_write, NULL, NULL, &lpt_ports[i]);
-        if (port != 0xffff)
-            io_sethandler(port, 0x0003, lpt_read, NULL, NULL, lpt_write, NULL, NULL, &lpt_ports[i]);
-        lpt_ports[i].addr = port;
-    } else
-        lpt_ports[i].addr = 0xffff;
-}
-
-void
-lpt_port_irq(int i, uint8_t irq)
-{
-    if (lpt_ports[i].enabled)
-        lpt_ports[i].irq = irq;
-    else
-        lpt_ports[i].irq = 0xff;
-}
-
-void
-lpt_port_remove(int i)
-{
-    if (lpt_ports[i].enabled && (lpt_ports[i].addr != 0xffff)) {
-        io_removehandler(lpt_ports[i].addr, 0x0003, lpt_read, NULL, NULL, lpt_write, NULL, NULL, &lpt_ports[i]);
-        lpt_ports[i].addr = 0xffff;
-    }
-}
-
-void
-lpt1_remove_ams(void)
-{
-    if (lpt_ports[0].enabled)
-        io_removehandler(lpt_ports[0].addr + 1, 0x0002, lpt_read, NULL, NULL, lpt_write, NULL, NULL, &lpt_ports[0]);
-}
diff --git a/src/mac/CMakeLists.txt b/src/mac/CMakeLists.txt
index bbdf1d5d5..c88ddf097 100644
--- a/src/mac/CMakeLists.txt
+++ b/src/mac/CMakeLists.txt
@@ -11,10 +11,12 @@
 # Authors: dob205,
 #          Jerome Vernet
 #          David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
 #
 #          Copyright 2021 dob205.
 #          Copyright 2021 Jerome Vernet.
 #          Copyright 2021 David Hrdlička.
+#          Copyright 2024 Jasmine Iwanek.
 #
 
 # Pick the bundle icon depending on the release channel
@@ -50,4 +52,4 @@ set_target_properties(86Box
 
 #set(XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES")
 #set(XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-")
-#set(XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/mac/codesign/dev/app.entitlements)
+#set(XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/mac/entitlements.plist)
diff --git a/src/mac/entitlements.plist b/src/mac/entitlements.plist
new file mode 100644
index 000000000..59a80495d
--- /dev/null
+++ b/src/mac/entitlements.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+</dict>
+</plist>
diff --git a/src/machine/CMakeLists.txt b/src/machine/CMakeLists.txt
index e88631044..816c9d38c 100644
--- a/src/machine/CMakeLists.txt
+++ b/src/machine/CMakeLists.txt
@@ -9,34 +9,52 @@
 #          CMake build script.
 #
 # Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
 #
 #          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2024      Jasmine Iwanek.
 #
 
-add_library(mch OBJECT machine.c machine_table.c m_xt.c m_xt_compaq.c
-    m_xt_philips.c
-    m_xt_t1000.c m_xt_t1000_vid.c m_xt_xi8088.c m_xt_zenith.c m_pcjr.c
-    m_amstrad.c m_europc.c m_elt.c m_xt_olivetti.c m_tandy.c m_v86p.c
-    m_at.c m_at_commodore.c
-    m_at_t3100e.c m_at_t3100e_vid.c m_ps1.c m_ps1_hdc.c m_ps2_isa.c
-    m_ps2_mca.c m_at_compaq.c m_at_286_386sx.c m_at_386dx_486.c
-    m_at_socket4.c m_at_socket5.c m_at_socket7_3v.c m_at_socket7.c
-    m_at_sockets7.c m_at_socket8.c m_at_slot1.c m_at_slot2.c m_at_socket370.c
-    m_at_misc.c)
-
-if(AN430TX)
-    target_compile_definitions(mch PRIVATE USE_AN430TX)
-endif()
-
-if(DESKPRO386)
-    target_compile_definitions(mch PRIVATE USE_DESKPRO386)
-endif()
-
-if(LASERXT)
-    target_sources(mch PRIVATE m_xt_laserxt.c)
-    target_compile_definitions(mch PRIVATE USE_LASERXT)
-endif()
-
-if(OPEN_AT)
-    target_compile_definitions(mch PRIVATE USE_OPEN_AT)
-endif()
+add_library(mch OBJECT
+    machine.c
+    machine_table.c
+    m_xt.c
+    m_xt_t1000.c
+    m_xt_xi8088.c
+    m_pcjr.c
+    m_amstrad.c
+    m_europc.c
+    m_elt.c
+    m_xt_olivetti.c
+    m_tandy.c
+    m_v86p.c
+    m_at_t3100e.c
+    m_ps1.c
+    m_ps2_isa.c
+    m_ps2_mca.c
+    m_at_common.c
+    m_at_286.c
+    m_at_386sx.c
+    m_at_m6117.c
+    m_at_386dx.c
+    m_at_486slc.c
+    m_at_386dx_486.c
+    m_at_socket1.c
+    m_at_socket2.c
+    m_at_socket3.c
+    m_at_socket3_pci.c
+    m_at_486_misc.c
+    m_at_socket4.c
+    m_at_socket4_5.c
+    m_at_socket5.c
+    m_at_socket7_3v.c
+    m_at_socket7.c
+    m_at_sockets7.c
+    m_at_socket8.c
+    m_at_slot1.c
+    m_at_slot1_2.c
+    m_at_slot1_socket370.c
+    m_at_slot2.c
+    m_at_socket370.c
+    m_at_misc.c
+)
diff --git a/src/machine/m_amstrad.c b/src/machine/m_amstrad.c
index dfeb1fa0f..809a4a701 100644
--- a/src/machine/m_amstrad.c
+++ b/src/machine/m_amstrad.c
@@ -66,6 +66,7 @@
 #include <86box/lpt.h>
 #include <86box/fdd.h>
 #include <86box/fdc.h>
+#include <86box/hdc.h>
 #include <86box/sound.h>
 #include <86box/snd_speaker.h>
 #include <86box/video.h>
@@ -85,6 +86,11 @@
 #define STAT_IFULL    0x02
 #define STAT_OFULL    0x01
 
+#define DOUBLE_NONE               0
+#define DOUBLE_SIMPLE             1
+#define DOUBLE_INTERPOLATE_SRGB   2
+#define DOUBLE_INTERPOLATE_LINEAR 3
+
 typedef struct amsvid_t {
     rom_t      bios_rom;    /* 1640 */
     cga_t      cga;         /* 1640/200 */
@@ -105,7 +111,7 @@ typedef struct amsvid_t {
     int        cga_enabled; /* 1640 */
     uint8_t    cgacol;
     uint8_t    cgamode;
-    uint8_t    stat;
+    uint8_t    status;
     uint8_t    plane_write; /* 1512/200 */
     uint8_t    plane_read;  /* 1512/200 */
     uint8_t    border;      /* 1512/200 */
@@ -113,18 +119,18 @@ typedef struct amsvid_t {
     int        fontbase;    /* 1512/200 */
     int        linepos;
     int        displine;
-    int        sc;
+    int        scanline;
     int        vc;
     int        cgadispon;
-    int        con;
-    int        coff;
+    int        cursorvisible;
     int        cursoron;
     int        cgablink;
     int        vsynctime;
     int        fullchange;
     int        vadj;
-    uint16_t   ma;
-    uint16_t   maback;
+    int        double_type;
+    uint16_t   memaddr;
+    uint16_t   memaddr_backup;
     int        dispon;
     int        blink;
     uint64_t   dispontime;  /* 1512/1640 */
@@ -156,7 +162,9 @@ typedef struct amstrad_t {
 
     /* Video stuff. */
     amsvid_t *vid;
+
     fdc_t    *fdc;
+    lpt_t    *lpt;
 } amstrad_t;
 
 uint32_t amstrad_latch;
@@ -291,7 +299,7 @@ vid_in_1512(uint16_t addr, void *priv)
             break;
 
         case 0x03da:
-            ret = vid->stat;
+            ret = vid->status;
             break;
 
         default:
@@ -337,15 +345,12 @@ vid_read_1512(uint32_t addr, void *priv)
 }
 
 static void
-vid_poll_1512(void *priv)
+ams1512_render(amsvid_t *vid, int line)
 {
-    amsvid_t *vid = (amsvid_t *) priv;
-    uint16_t  ca  = (vid->crtc[15] | (vid->crtc[14] << 8)) & 0x3fff;
+    uint16_t  cursoraddr  = (vid->crtc[15] | (vid->crtc[14] << 8)) & 0x3fff;
     int       drawcursor;
     int       x;
     int       c;
-    int       xs_temp;
-    int       ys_temp;
     uint8_t   chr;
     uint8_t   attr;
     uint16_t  dat;
@@ -354,150 +359,200 @@ vid_poll_1512(void *priv)
     uint16_t  dat4;
     int       cols[4];
     int       col;
-    int       oldsc;
+
+    for (c = 0; c < 8; c++) {
+        if ((vid->cgamode & 0x12) == 0x12) {
+            buffer32->line[line][c] = buffer32->line[(line) + 1][c] = (vid->border & 15) + 16;
+            if (vid->cgamode & CGA_MODE_FLAG_HIGHRES) {
+                buffer32->line[line][c + (vid->crtc[1] << 3) + 8] = buffer32->line[(line) + 1][c + (vid->crtc[1] << 3) + 8] = 0;
+            } else {
+                buffer32->line[line][c + (vid->crtc[1] << 4) + 8] = buffer32->line[(line) + 1][c + (vid->crtc[1] << 4) + 8] = 0;
+            }
+        } else {
+            buffer32->line[line][c] = buffer32->line[(line) + 1][c] = (vid->cgacol & 15) + 16;
+            if (vid->cgamode & CGA_MODE_FLAG_HIGHRES) {
+                buffer32->line[line][c + (vid->crtc[1] << 3) + 8] = buffer32->line[(line) + 1][c + (vid->crtc[1] << 3) + 8] = (vid->cgacol & 15) + 16;
+            } else {
+                buffer32->line[line][c + (vid->crtc[1] << 4) + 8] = buffer32->line[(line) + 1][c + (vid->crtc[1] << 4) + 8] = (vid->cgacol & 15) + 16;
+            }
+        }
+    }
+    if (vid->cgamode & CGA_MODE_FLAG_HIGHRES) {
+        for (x = 0; x < 80; x++) {
+            chr        = vid->vram[(vid->memaddr<< 1) & 0x3fff];
+            attr       = vid->vram[((vid->memaddr<< 1) + 1) & 0x3fff];
+            drawcursor = ((vid->memaddr== cursoraddr) && vid->cursorvisible && vid->cursoron);
+            if (vid->cgamode & CGA_MODE_FLAG_BLINK) {
+                cols[1] = (attr & 15) + 16;
+                cols[0] = ((attr >> 4) & 7) + 16;
+                if ((vid->blink & 16) && (attr & 0x80) && !drawcursor)
+                    cols[1] = cols[0];
+            } else {
+                cols[1] = (attr & 15) + 16;
+                cols[0] = (attr >> 4) + 16;
+            }
+            if (drawcursor)
+                for (c = 0; c < 8; c++)
+                    buffer32->line[line][(x << 3) + c + 8] =
+                        cols[(fontdat[vid->fontbase + chr][vid->scanline & 7] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
+            else
+                for (c = 0; c < 8; c++)
+                    buffer32->line[line][(x << 3) + c + 8] =
+                        cols[(fontdat[vid->fontbase + chr][vid->scanline & 7] & (1 << (c ^ 7))) ? 1 : 0];
+            vid->memaddr++;
+        }
+    } else if (!(vid->cgamode & CGA_MODE_FLAG_GRAPHICS)) {
+        for (x = 0; x < 40; x++) {
+            chr        = vid->vram[(vid->memaddr<< 1) & 0x3fff];
+            attr       = vid->vram[((vid->memaddr<< 1) + 1) & 0x3fff];
+            drawcursor = ((vid->memaddr == cursoraddr)  && vid->cursorvisible && vid->cursoron);
+                    
+            if (vid->cgamode & CGA_MODE_FLAG_BLINK) {
+                cols[1] = (attr & 15) + 16;
+                cols[0] = ((attr >> 4) & 7) + 16;
+                if ((vid->blink & 16) && (attr & 0x80))
+                    cols[1] = cols[0];
+            } else {
+                cols[1] = (attr & 15) + 16;
+                cols[0] = (attr >> 4) + 16;
+            }
+            vid->memaddr++;
+            if (drawcursor)
+                for (c = 0; c < 8; c++)
+                    buffer32->line[line][(x << 4) + (c << 1) + 8] =
+                    buffer32->line[line][(x << 4) + (c << 1) + 1 + 8] =
+                        cols[(fontdat[vid->fontbase + chr][vid->scanline & 7] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
+            else
+                for (c = 0; c < 8; c++)
+                    buffer32->line[line][(x << 4) + (c << 1) + 8] =
+                    buffer32->line[line][(x << 4) + (c << 1) + 1 + 8] =
+                        cols[(fontdat[vid->fontbase + chr][vid->scanline & 7] & (1 << (c ^ 7))) ? 1 : 0];
+        }
+    } else if (!(vid->cgamode & CGA_MODE_FLAG_HIGHRES_GRAPHICS)) {
+        cols[0] = (vid->cgacol & 15) | 16;
+        col     = (vid->cgacol & 16) ? 24 : 16;
+        if (vid->cgamode & CGA_MODE_FLAG_BW) {
+            cols[1] = col | 3;
+            cols[2] = col | 4;
+            cols[3] = col | 7;
+        } else if (vid->cgacol & 32) {
+            cols[1] = col | 3;
+            cols[2] = col | 5;
+            cols[3] = col | 7;
+        } else {
+            cols[1] = col | 2;
+            cols[2] = col | 4;
+            cols[3] = col | 6;
+        }
+        for (x = 0; x < 40; x++) {
+            dat = (vid->vram[((vid->memaddr<< 1) & 0x1fff) + ((vid->scanline & 1) * 0x2000)] << 8) |
+                  vid->vram[((vid->memaddr<< 1) & 0x1fff) + ((vid->scanline & 1) * 0x2000) + 1];
+            vid->memaddr++;
+            for (c = 0; c < 8; c++) {
+                buffer32->line[line][(x << 4) + (c << 1) + 8] =
+                buffer32->line[line][(x << 4) + (c << 1) + 1 + 8] = cols[dat >> 14];
+                dat <<= 2;
+            }
+        }
+    } else {
+        for (x = 0; x < 40; x++) {
+            cursoraddr   = ((vid->memaddr<< 1) & 0x1fff) + ((vid->scanline & 1) * 0x2000);
+            dat  = (vid->vram[cursoraddr] << 8) | vid->vram[cursoraddr + 1];
+            dat2 = (vid->vram[cursoraddr + 0x4000] << 8) | vid->vram[cursoraddr + 0x4001];
+            dat3 = (vid->vram[cursoraddr + 0x8000] << 8) | vid->vram[cursoraddr + 0x8001];
+            dat4 = (vid->vram[cursoraddr + 0xc000] << 8) | vid->vram[cursoraddr + 0xc001];
+
+            vid->memaddr++;
+            for (c = 0; c < 16; c++) {
+                buffer32->line[line][(x << 4) + c + 8] =  (((dat >> 15) | ((dat2 >> 15) << 1) |
+                                                          ((dat3 >> 15) << 2) | ((dat4 >> 15) << 3)) & (vid->cgacol & 15)) + 16;
+                dat <<= 1;
+                dat2 <<= 1;
+                dat3 <<= 1;
+                dat4 <<= 1;
+            }
+        }
+    }
+}
+
+static void
+ams1512_render_blank(amsvid_t *vid, int line)
+{
+    int cols = ((vid->cgamode & 0x12) == 0x12) ? 0 : (vid->cgacol & 15) + 16;
+
+    if (vid->cgamode & CGA_MODE_FLAG_HIGHRES)
+        hline(buffer32, 0, line, (vid->crtc[1] << 3) + 16, cols);
+    else
+        hline(buffer32, 0, line, (vid->crtc[1] << 4) + 16, cols);
+}
+
+static void
+vid_poll_1512(void *priv)
+{
+    amsvid_t *vid = (amsvid_t *) priv;
+    int       x;
+    int       xs_temp;
+    int       ys_temp;
+    int       scanline_old;
+    int       old_ma;
 
     if (!vid->linepos) {
         timer_advance_u64(&vid->timer, vid->dispofftime);
-        vid->stat |= 1;
+        vid->status |= 1;
         vid->linepos = 1;
-        oldsc        = vid->sc;
+        scanline_old        = vid->scanline;
         if (vid->dispon) {
             if (vid->displine < vid->firstline) {
                 vid->firstline = vid->displine;
                 video_wait_for_buffer();
             }
             vid->lastline = vid->displine;
-            for (c = 0; c < 8; c++) {
-                if ((vid->cgamode & 0x12) == 0x12) {
-                    buffer32->line[vid->displine << 1][c] = buffer32->line[(vid->displine << 1) + 1][c] = (vid->border & 15) + 16;
-                    if (vid->cgamode & 1) {
-                        buffer32->line[vid->displine << 1][c + (vid->crtc[1] << 3) + 8] = buffer32->line[(vid->displine << 1) + 1][c + (vid->crtc[1] << 3) + 8] = 0;
-                    } else {
-                        buffer32->line[vid->displine << 1][c + (vid->crtc[1] << 4) + 8] = buffer32->line[(vid->displine << 1) + 1][c + (vid->crtc[1] << 4) + 8] = 0;
-                    }
-                } else {
-                    buffer32->line[vid->displine << 1][c] = buffer32->line[(vid->displine << 1) + 1][c] = (vid->cgacol & 15) + 16;
-                    if (vid->cgamode & 1) {
-                        buffer32->line[vid->displine << 1][c + (vid->crtc[1] << 3) + 8] = buffer32->line[(vid->displine << 1) + 1][c + (vid->crtc[1] << 3) + 8] = (vid->cgacol & 15) + 16;
-                    } else {
-                        buffer32->line[vid->displine << 1][c + (vid->crtc[1] << 4) + 8] = buffer32->line[(vid->displine << 1) + 1][c + (vid->crtc[1] << 4) + 8] = (vid->cgacol & 15) + 16;
-                    }
-                }
-            }
-            if (vid->cgamode & 1) {
-                for (x = 0; x < 80; x++) {
-                    chr        = vid->vram[(vid->ma << 1) & 0x3fff];
-                    attr       = vid->vram[((vid->ma << 1) + 1) & 0x3fff];
-                    drawcursor = ((vid->ma == ca) && vid->con && vid->cursoron);
-                    if (vid->cgamode & 0x20) {
-                        cols[1] = (attr & 15) + 16;
-                        cols[0] = ((attr >> 4) & 7) + 16;
-                        if ((vid->blink & 16) && (attr & 0x80) && !drawcursor)
-                            cols[1] = cols[0];
-                    } else {
-                        cols[1] = (attr & 15) + 16;
-                        cols[0] = (attr >> 4) + 16;
-                    }
-                    if (drawcursor) {
-                        for (c = 0; c < 8; c++) {
-                            buffer32->line[vid->displine << 1][(x << 3) + c + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 3) + c + 8] = cols[(fontdat[vid->fontbase + chr][vid->sc & 7] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
-                        }
-                    } else {
-                        for (c = 0; c < 8; c++) {
-                            buffer32->line[vid->displine << 1][(x << 3) + c + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 3) + c + 8] = cols[(fontdat[vid->fontbase + chr][vid->sc & 7] & (1 << (c ^ 7))) ? 1 : 0];
-                        }
-                    }
-                    vid->ma++;
-                }
-            } else if (!(vid->cgamode & 2)) {
-                for (x = 0; x < 40; x++) {
-                    chr        = vid->vram[(vid->ma << 1) & 0x3fff];
-                    attr       = vid->vram[((vid->ma << 1) + 1) & 0x3fff];
-                    drawcursor = ((vid->ma == ca) && vid->con && vid->cursoron);
-                    if (vid->cgamode & 0x20) {
-                        cols[1] = (attr & 15) + 16;
-                        cols[0] = ((attr >> 4) & 7) + 16;
-                        if ((vid->blink & 16) && (attr & 0x80))
-                            cols[1] = cols[0];
-                    } else {
-                        cols[1] = (attr & 15) + 16;
-                        cols[0] = (attr >> 4) + 16;
-                    }
-                    vid->ma++;
-                    if (drawcursor) {
-                        for (c = 0; c < 8; c++) {
-                            buffer32->line[vid->displine << 1][(x << 4) + (c << 1) + 8] = buffer32->line[vid->displine << 1][(x << 4) + (c << 1) + 1 + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + (c << 1) + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdat[vid->fontbase + chr][vid->sc & 7] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
-                        }
-                    } else {
-                        for (c = 0; c < 8; c++) {
-                            buffer32->line[vid->displine << 1][(x << 4) + (c << 1) + 8] = buffer32->line[vid->displine << 1][(x << 4) + (c << 1) + 1 + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + (c << 1) + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdat[vid->fontbase + chr][vid->sc & 7] & (1 << (c ^ 7))) ? 1 : 0];
-                        }
-                    }
-                }
-            } else if (!(vid->cgamode & 16)) {
-                cols[0] = (vid->cgacol & 15) | 16;
-                col     = (vid->cgacol & 16) ? 24 : 16;
-                if (vid->cgamode & 4) {
-                    cols[1] = col | 3;
-                    cols[2] = col | 4;
-                    cols[3] = col | 7;
-                } else if (vid->cgacol & 32) {
-                    cols[1] = col | 3;
-                    cols[2] = col | 5;
-                    cols[3] = col | 7;
-                } else {
-                    cols[1] = col | 2;
-                    cols[2] = col | 4;
-                    cols[3] = col | 6;
-                }
-                for (x = 0; x < 40; x++) {
-                    dat = (vid->vram[((vid->ma << 1) & 0x1fff) + ((vid->sc & 1) * 0x2000)] << 8) | vid->vram[((vid->ma << 1) & 0x1fff) + ((vid->sc & 1) * 0x2000) + 1];
-                    vid->ma++;
-                    for (c = 0; c < 8; c++) {
-                        buffer32->line[vid->displine << 1][(x << 4) + (c << 1) + 8] = buffer32->line[vid->displine << 1][(x << 4) + (c << 1) + 1 + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + (c << 1) + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + (c << 1) + 1 + 8] = cols[dat >> 14];
-                        dat <<= 2;
-                    }
-                }
-            } else {
-                for (x = 0; x < 40; x++) {
-                    ca   = ((vid->ma << 1) & 0x1fff) + ((vid->sc & 1) * 0x2000);
-                    dat  = (vid->vram[ca] << 8) | vid->vram[ca + 1];
-                    dat2 = (vid->vram[ca + 0x4000] << 8) | vid->vram[ca + 0x4001];
-                    dat3 = (vid->vram[ca + 0x8000] << 8) | vid->vram[ca + 0x8001];
-                    dat4 = (vid->vram[ca + 0xc000] << 8) | vid->vram[ca + 0xc001];
-
-                    vid->ma++;
-                    for (c = 0; c < 16; c++) {
-                        buffer32->line[vid->displine << 1][(x << 4) + c + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + c + 8] = (((dat >> 15) | ((dat2 >> 15) << 1) | ((dat3 >> 15) << 2) | ((dat4 >> 15) << 3)) & (vid->cgacol & 15)) + 16;
-                        dat <<= 1;
-                        dat2 <<= 1;
-                        dat3 <<= 1;
-                        dat4 <<= 1;
-                    }
-                }
-            }
-        } else {
-            cols[0] = ((vid->cgamode & 0x12) == 0x12) ? 0 : (vid->cgacol & 15) + 16;
-            if (vid->cgamode & 1) {
-                hline(buffer32, 0, (vid->displine << 1), (vid->crtc[1] << 3) + 16, cols[0]);
-                hline(buffer32, 0, (vid->displine << 1) + 1, (vid->crtc[1] << 3) + 16, cols[0]);
-            } else {
-                hline(buffer32, 0, (vid->displine << 1), (vid->crtc[1] << 4) + 16, cols[0]);
-                hline(buffer32, 0, (vid->displine << 1), (vid->crtc[1] << 4) + 16, cols[0]);
+            switch (vid->double_type) {
+                default:
+                    ams1512_render(vid, vid->displine << 1);
+                    ams1512_render_blank(vid, (vid->displine << 1) + 1);
+                    break;
+                case DOUBLE_NONE:
+                    ams1512_render(vid, vid->displine);
+                    break;
+                case DOUBLE_SIMPLE:
+                    old_ma = vid->memaddr;
+                    ams1512_render(vid, vid->displine << 1);
+                    vid->memaddr = old_ma;
+                    ams1512_render(vid, (vid->displine << 1) + 1);
+                    break;
             }
+        } else  switch (vid->double_type) {
+            default:
+                ams1512_render_blank(vid, vid->displine << 1);
+                break;
+            case DOUBLE_NONE:
+                ams1512_render_blank(vid, vid->displine);
+                break;
+            case DOUBLE_SIMPLE:
+                ams1512_render_blank(vid, vid->displine << 1);
+                ams1512_render_blank(vid, (vid->displine << 1) + 1);
+                break;
         }
 
-        if (vid->cgamode & 1)
+        if (vid->cgamode & CGA_MODE_FLAG_HIGHRES)
             x = (vid->crtc[1] << 3) + 16;
         else
             x = (vid->crtc[1] << 4) + 16;
 
-        video_process_8(x, vid->displine << 1);
-        video_process_8(x, (vid->displine << 1) + 1);
+        switch (vid->double_type) {
+            default:
+                video_process_8((x < 64) ? 656 : x, vid->displine << 1);
+                video_process_8((x < 64) ? 656 : x, (vid->displine << 1) + 1);
+                break;
+            case DOUBLE_NONE:
+                video_process_8((x < 64) ? 656 : x, vid->displine);
+                break;
+        }
 
-        vid->sc = oldsc;
+        vid->scanline = scanline_old;
         if (vid->vsynctime)
-            vid->stat |= 8;
+            vid->status |= 8;
         vid->displine++;
         if (vid->displine >= 360)
             vid->displine = 0;
@@ -506,30 +561,29 @@ vid_poll_1512(void *priv)
         if ((vid->lastline - vid->firstline) == 199)
             vid->dispon = 0; /*Amstrad PC1512 always displays 200 lines, regardless of CRTC settings*/
         if (vid->dispon)
-            vid->stat &= ~1;
+            vid->status &= ~1;
         vid->linepos = 0;
         if (vid->vsynctime) {
             vid->vsynctime--;
             if (!vid->vsynctime)
-                vid->stat &= ~8;
+                vid->status &= ~8;
         }
-        if (vid->sc == (vid->crtc[11] & 31)) {
-            vid->con  = 0;
-            vid->coff = 1;
+        if (vid->scanline == (vid->crtc[11] & 31)) {
+            vid->cursorvisible  = 0;
         }
         if (vid->vadj) {
-            vid->sc++;
-            vid->sc &= 31;
-            vid->ma = vid->maback;
+            vid->scanline++;
+            vid->scanline &= 31;
+            vid->memaddr= vid->memaddr_backup;
             vid->vadj--;
             if (!vid->vadj) {
                 vid->dispon = 1;
-                vid->ma = vid->maback = (vid->crtc[13] | (vid->crtc[12] << 8)) & 0x3fff;
-                vid->sc               = 0;
+                vid->memaddr= vid->memaddr_backup = (vid->crtc[13] | (vid->crtc[12] << 8)) & 0x3fff;
+                vid->scanline               = 0;
             }
-        } else if (vid->sc == vid->crtc[9]) {
-            vid->maback = vid->ma;
-            vid->sc     = 0;
+        } else if (vid->scanline == vid->crtc[9]) {
+            vid->memaddr_backup = vid->memaddr;
+            vid->scanline     = 0;
             vid->vc++;
             vid->vc &= 127;
 
@@ -547,7 +601,7 @@ vid_poll_1512(void *priv)
                 vid->displine  = 0;
                 vid->vsynctime = 46;
 
-                if (vid->cgamode & 1)
+                if (vid->cgamode & CGA_MODE_FLAG_HIGHRES)
                     x = (vid->crtc[1] << 3) + 16;
                 else
                     x = (vid->crtc[1] << 4) + 16;
@@ -573,26 +627,20 @@ vid_poll_1512(void *priv)
                             video_force_resize_set(0);
                     }
 
-                    if (enable_overscan) {
-                        video_blit_memtoscreen(0, (vid->firstline - 4) << 1,
-                                               xsize, ((vid->lastline - vid->firstline) + 8) << 1);
-                    } else {
-                        video_blit_memtoscreen(8, vid->firstline << 1,
-                                               xsize, (vid->lastline - vid->firstline) << 1);
-                    }
+                    cga_do_blit(xsize, vid->firstline, vid->lastline, vid->double_type);
                 }
 
                 video_res_x = xsize;
                 video_res_y = ysize;
-                if (vid->cgamode & 1) {
+                if (vid->cgamode & CGA_MODE_FLAG_HIGHRES) {
                     video_res_x /= 8;
                     video_res_y /= vid->crtc[9] + 1;
                     video_bpp = 0;
-                } else if (!(vid->cgamode & 2)) {
+                } else if (!(vid->cgamode & CGA_MODE_FLAG_GRAPHICS)) {
                     video_res_x /= 16;
                     video_res_y /= vid->crtc[9] + 1;
                     video_bpp = 0;
-                } else if (!(vid->cgamode & 16)) {
+                } else if (!(vid->cgamode & CGA_MODE_FLAG_HIGHRES_GRAPHICS)) {
                     video_res_x /= 2;
                     video_bpp = 2;
                 } else {
@@ -604,12 +652,12 @@ vid_poll_1512(void *priv)
                 vid->blink++;
             }
         } else {
-            vid->sc++;
-            vid->sc &= 31;
-            vid->ma = vid->maback;
+            vid->scanline++;
+            vid->scanline &= 31;
+            vid->memaddr= vid->memaddr_backup;
         }
-        if (vid->sc == (vid->crtc[10] & 31))
-            vid->con = 1;
+        if (vid->scanline == (vid->crtc[10] & 31))
+            vid->cursorvisible = 1;
     }
 }
 
@@ -619,8 +667,7 @@ vid_init_1512(amstrad_t *ams)
     amsvid_t *vid;
 
     /* Allocate a video controller block. */
-    vid = (amsvid_t *) malloc(sizeof(amsvid_t));
-    memset(vid, 0x00, sizeof(amsvid_t));
+    vid = (amsvid_t *) calloc(1, sizeof(amsvid_t));
 
     video_inform(VIDEO_FLAG_TYPE_CGA, &timing_pc1512);
 
@@ -642,6 +689,9 @@ vid_init_1512(amstrad_t *ams)
     cga_palette = (device_get_config_int("display_type") << 1);
     cgapal_rebuild();
 
+    vid->double_type = device_get_config_int("double_type");
+    cga_interpolate_init();
+
     ams->vid = vid;
 }
 
@@ -679,6 +729,23 @@ const device_config_t vid_1512_config[] = {
             { .description = ""                               }
         }
     },
+    {
+        .name           = "double_type",
+        .description    = "Line doubling type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = DOUBLE_NONE,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",                 .value = DOUBLE_NONE               },
+            { .description = "Simple doubling",      .value = DOUBLE_SIMPLE             },
+            { .description = "sRGB interpolation",   .value = DOUBLE_INTERPOLATE_SRGB   },
+            { .description = "Linear interpolation", .value = DOUBLE_INTERPOLATE_LINEAR },
+            { .description = ""                                                         }
+        },
+        .bios           = { { 0 } }
+    },
     {
         .name = "codepage",
         .description = "Hardware font",
@@ -726,7 +793,7 @@ const device_t vid_1512_device = {
     .init          = NULL,
     .close         = vid_close_1512,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = vid_speed_change_1512,
     .force_redraw  = NULL,
     .config        = vid_1512_config
@@ -823,8 +890,7 @@ vid_init_1640(amstrad_t *ams)
     amsvid_t *vid;
 
     /* Allocate a video controller block. */
-    vid = (amsvid_t *) malloc(sizeof(amsvid_t));
-    memset(vid, 0x00, sizeof(amsvid_t));
+    vid = (amsvid_t *) calloc(1, sizeof(amsvid_t));
 
     rom_init(&vid->bios_rom, "roms/machines/pc1640/40100",
              0xc0000, 0x8000, 0x7fff, 0, 0);
@@ -851,6 +917,10 @@ vid_init_1640(amstrad_t *ams)
     cga_palette = 0;
     cgapal_rebuild();
 
+    vid->double_type = device_get_config_int("double_type");
+    vid->cga.double_type = device_get_config_int("double_type");
+    cga_interpolate_init();
+
     ams->vid = vid;
 }
 
@@ -874,6 +944,23 @@ vid_speed_changed_1640(void *priv)
 
 const device_config_t vid_1640_config[] = {
   // clang-format off
+    {
+        .name           = "double_type",
+        .description    = "Line doubling type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = DOUBLE_NONE,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",                 .value = DOUBLE_NONE               },
+            { .description = "Simple doubling",      .value = DOUBLE_SIMPLE             },
+            { .description = "sRGB interpolation",   .value = DOUBLE_INTERPOLATE_SRGB   },
+            { .description = "Linear interpolation", .value = DOUBLE_INTERPOLATE_LINEAR },
+            { .description = ""                                                         }
+        },
+        .bios           = { { 0 } }
+    },
     {
         .name = "language",
         .description = "BIOS language",
@@ -906,7 +993,7 @@ const device_t vid_1640_device = {
     .init          = NULL,
     .close         = vid_close_1640,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = vid_speed_changed_1640,
     .force_redraw  = NULL,
     .config        = vid_1640_config
@@ -1048,7 +1135,7 @@ vid_in_200(uint16_t addr, void *priv)
 
     switch (addr) {
         case 0x03b8:
-            return (mda->ctrl);
+            return (mda->mode);
 
         case 0x03d8:
             return (cga->cgamode);
@@ -1110,9 +1197,9 @@ vid_out_200(uint16_t addr, uint8_t val, void *priv)
             }
             return;
         case 0x3b8:
-            old       = mda->ctrl;
-            mda->ctrl = val;
-            if ((mda->ctrl ^ old) & 3)
+            old       = mda->mode;
+            mda->mode = val;
+            if ((mda->mode ^ old) & 3)
                 mda_recalctimings(mda);
             vid->crtc_index &= 0x1F;
             vid->crtc_index |= 0x80;
@@ -1214,11 +1301,11 @@ vid_out_200(uint16_t addr, uint8_t val, void *priv)
 
 static void
 lcd_draw_char_80(amsvid_t *vid, uint32_t *buffer, uint8_t chr,
-                 uint8_t attr, int drawcursor, int blink, int sc,
+                 uint8_t attr, int drawcursor, int blink, int scanline,
                  int mode160, uint8_t control)
 {
     int      c;
-    uint8_t  bits   = fontdat[chr + vid->cga.fontbase][sc];
+    uint8_t  bits   = fontdat[chr + vid->cga.fontbase][scanline];
     uint8_t  bright = 0;
     uint16_t mask;
 
@@ -1249,10 +1336,10 @@ lcd_draw_char_80(amsvid_t *vid, uint32_t *buffer, uint8_t chr,
 
 static void
 lcd_draw_char_40(amsvid_t *vid, uint32_t *buffer, uint8_t chr,
-                 uint8_t attr, int drawcursor, int blink, int sc,
+                 uint8_t attr, int drawcursor, int blink, int scanline,
                  uint8_t control)
 {
-    uint8_t bits = fontdat[chr + vid->cga.fontbase][sc];
+    uint8_t bits = fontdat[chr + vid->cga.fontbase][scanline];
     uint8_t mask = 0x80;
 
     if (attr & 8) /* bright */
@@ -1273,92 +1360,91 @@ static void
 lcdm_poll(amsvid_t *vid)
 {
     mda_t   *mda = &vid->mda;
-    uint16_t ca  = (mda->crtc[15] | (mda->crtc[14] << 8)) & 0x3fff;
+    uint16_t cursoraddr  = (mda->crtc[MDA_CRTC_CURSOR_ADDR_LOW] | (mda->crtc[MDA_CRTC_CURSOR_ADDR_HIGH] << 8)) & 0x3fff;
     int      drawcursor;
     int      x;
     int      oldvc;
     uint8_t  chr;
     uint8_t  attr;
-    int      oldsc;
+    int      scanline_old;
     int      blink;
 
     if (!mda->linepos) {
         timer_advance_u64(&vid->timer, mda->dispofftime);
-        mda->stat |= 1;
+        mda->status |= 1;
         mda->linepos = 1;
-        oldsc        = mda->sc;
-        if ((mda->crtc[8] & 3) == 3)
-            mda->sc = (mda->sc << 1) & 7;
+        scanline_old        = mda->scanline;
+        if ((mda->crtc[MDA_CRTC_INTERLACE] & 3) == 3)
+            mda->scanline = (mda->scanline << 1) & 7;
         if (mda->dispon) {
             if (mda->displine < mda->firstline)
                 mda->firstline = mda->displine;
             mda->lastline = mda->displine;
-            for (x = 0; x < mda->crtc[1]; x++) {
-                chr        = mda->vram[(mda->ma << 1) & 0xfff];
-                attr       = mda->vram[((mda->ma << 1) + 1) & 0xfff];
-                drawcursor = ((mda->ma == ca) && mda->con && mda->cursoron);
-                blink      = ((mda->blink & 16) && (mda->ctrl & 0x20) && (attr & 0x80) && !drawcursor);
+            for (x = 0; x < mda->crtc[MDA_CRTC_HDISP]; x++) {
+                chr        = mda->vram[(mda->memaddr<< 1) & 0xfff];
+                attr       = mda->vram[((mda->memaddr<< 1) + 1) & 0xfff];
+                drawcursor = ((mda->memaddr== cursoraddr) && mda->cursorvisible && mda->cursoron);
+                blink      = ((mda->blink & 16) && (mda->mode & MDA_MODE_BLINK) && (attr & 0x80) && !drawcursor);
 
-                lcd_draw_char_80(vid, &(buffer32->line[mda->displine])[x * 8], chr, attr, drawcursor, blink, mda->sc, 0, mda->ctrl);
-                mda->ma++;
+                lcd_draw_char_80(vid, &(buffer32->line[mda->displine])[x * 8], chr, attr, drawcursor, blink, mda->scanline, 0, mda->mode);
+                mda->memaddr++;
             }
         }
-        mda->sc = oldsc;
-        if (mda->vc == mda->crtc[7] && !mda->sc)
-            mda->stat |= 8;
+        mda->scanline = scanline_old;
+        if (mda->vc == mda->crtc[MDA_CRTC_VSYNC] && !mda->scanline)
+            mda->status |= 8;
         mda->displine++;
         if (mda->displine >= 500)
             mda->displine = 0;
     } else {
         timer_advance_u64(&vid->timer, mda->dispontime);
         if (mda->dispon)
-            mda->stat &= ~1;
+            mda->status &= ~1;
         mda->linepos = 0;
         if (mda->vsynctime) {
             mda->vsynctime--;
             if (!mda->vsynctime)
-                mda->stat &= ~8;
+                mda->status &= ~8;
         }
-        if (mda->sc == (mda->crtc[11] & 31) || ((mda->crtc[8] & 3) == 3 && mda->sc == ((mda->crtc[11] & 31) >> 1))) {
-            mda->con  = 0;
-            mda->coff = 1;
+        if (mda->scanline == (mda->crtc[MDA_CRTC_CURSOR_END] & 31) || ((mda->crtc[MDA_CRTC_INTERLACE] & 3) == 3 && mda->scanline == ((mda->crtc[MDA_CRTC_CURSOR_END] & 31) >> 1))) {
+            mda->cursorvisible  = 0;
         }
         if (mda->vadj) {
-            mda->sc++;
-            mda->sc &= 31;
-            mda->ma = mda->maback;
+            mda->scanline++;
+            mda->scanline &= 31;
+            mda->memaddr= mda->memaddr_backup;
             mda->vadj--;
             if (!mda->vadj) {
                 mda->dispon = 1;
-                mda->ma = mda->maback = (mda->crtc[13] | (mda->crtc[12] << 8)) & 0x3fff;
-                mda->sc               = 0;
+                mda->memaddr= mda->memaddr_backup = (mda->crtc[MDA_CRTC_START_ADDR_LOW] | (mda->crtc[MDA_CRTC_START_ADDR_HIGH] << 8)) & 0x3fff;
+                mda->scanline               = 0;
             }
-        } else if (mda->sc == mda->crtc[9] || ((mda->crtc[8] & 3) == 3 && mda->sc == (mda->crtc[9] >> 1))) {
-            mda->maback = mda->ma;
-            mda->sc     = 0;
+        } else if (mda->scanline == mda->crtc[MDA_CRTC_MAX_SCANLINE_ADDR] || ((mda->crtc[MDA_CRTC_INTERLACE] & 3) == 3 && mda->scanline == (mda->crtc[MDA_CRTC_MAX_SCANLINE_ADDR] >> 1))) {
+            mda->memaddr_backup = mda->memaddr;
+            mda->scanline     = 0;
             oldvc       = mda->vc;
             mda->vc++;
             mda->vc &= 127;
-            if (mda->vc == mda->crtc[6])
+            if (mda->vc == mda->crtc[MDA_CRTC_VDISP])
                 mda->dispon = 0;
-            if (oldvc == mda->crtc[4]) {
+            if (oldvc == mda->crtc[MDA_CRTC_VTOTAL]) {
                 mda->vc   = 0;
-                mda->vadj = mda->crtc[5];
+                mda->vadj = mda->crtc[MDA_CRTC_VTOTAL_ADJUST];
                 if (!mda->vadj)
                     mda->dispon = 1;
                 if (!mda->vadj)
-                    mda->ma = mda->maback = (mda->crtc[13] | (mda->crtc[12] << 8)) & 0x3fff;
-                if ((mda->crtc[10] & 0x60) == 0x20)
+                    mda->memaddr= mda->memaddr_backup = (mda->crtc[MDA_CRTC_START_ADDR_LOW] | (mda->crtc[MDA_CRTC_START_ADDR_HIGH] << 8)) & 0x3fff;
+                if ((mda->crtc[MDA_CRTC_CURSOR_START] & 0x60) == 0x20)
                     mda->cursoron = 0;
                 else
                     mda->cursoron = mda->blink & 16;
             }
-            if (mda->vc == mda->crtc[7]) {
+            if (mda->vc == mda->crtc[MDA_CRTC_VSYNC]) {
                 mda->dispon    = 0;
                 mda->displine  = 0;
                 mda->vsynctime = 16;
-                if (mda->crtc[7]) {
-                    x = mda->crtc[1] * 8;
+                if (mda->crtc[MDA_CRTC_VSYNC]) {
+                    x = mda->crtc[MDA_CRTC_HDISP] * 8;
                     mda->lastline++;
                     if ((x != xsize) || ((mda->lastline - mda->firstline) != ysize) || video_force_resize_get()) {
                         xsize = x;
@@ -1374,8 +1460,8 @@ lcdm_poll(amsvid_t *vid)
                     }
                     video_blit_memtoscreen(0, mda->firstline, xsize, ysize);
                     frames++;
-                    video_res_x = mda->crtc[1];
-                    video_res_y = mda->crtc[6];
+                    video_res_x = mda->crtc[MDA_CRTC_HDISP];
+                    video_res_y = mda->crtc[MDA_CRTC_VDISP];
                     video_bpp   = 0;
                 }
                 mda->firstline = 1000;
@@ -1383,12 +1469,12 @@ lcdm_poll(amsvid_t *vid)
                 mda->blink++;
             }
         } else {
-            mda->sc++;
-            mda->sc &= 31;
-            mda->ma = mda->maback;
+            mda->scanline++;
+            mda->scanline &= 31;
+            mda->memaddr= mda->memaddr_backup;
         }
-        if (mda->sc == (mda->crtc[10] & 31) || ((mda->crtc[8] & 3) == 3 && mda->sc == ((mda->crtc[10] & 31) >> 1)))
-            mda->con = 1;
+        if (mda->scanline == (mda->crtc[MDA_CRTC_CURSOR_START] & 31) || ((mda->crtc[MDA_CRTC_INTERLACE] & 3) == 3 && mda->scanline == ((mda->crtc[MDA_CRTC_CURSOR_START] & 31) >> 1)))
+            mda->cursorvisible = 1;
     }
 }
 
@@ -1404,19 +1490,19 @@ lcdc_poll(amsvid_t *vid)
     uint8_t  chr;
     uint8_t  attr;
     uint16_t dat;
-    int      oldsc;
-    uint16_t ca;
+    int      scanline_old;
+    uint16_t cursoraddr;
     int      blink;
 
-    ca = (cga->crtc[15] | (cga->crtc[14] << 8)) & 0x3fff;
+    cursoraddr = (cga->crtc[CGA_CRTC_CURSOR_ADDR_LOW] | (cga->crtc[CGA_CRTC_CURSOR_ADDR_HIGH] << 8)) & 0x3fff;
 
     if (!cga->linepos) {
         timer_advance_u64(&vid->timer, cga->dispofftime);
         cga->cgastat |= 1;
         cga->linepos = 1;
-        oldsc        = cga->sc;
-        if ((cga->crtc[8] & 3) == 3)
-            cga->sc = ((cga->sc << 1) + cga->oddeven) & 7;
+        scanline_old        = cga->scanline;
+        if ((cga->crtc[CGA_CRTC_INTERLACE] & 3) == 3)
+            cga->scanline = ((cga->scanline << 1) + cga->oddeven) & 7;
         if (cga->cgadispon) {
             if (cga->displine < cga->firstline) {
                 cga->firstline = cga->displine;
@@ -1424,30 +1510,30 @@ lcdc_poll(amsvid_t *vid)
             }
             cga->lastline = cga->displine;
 
-            if (cga->cgamode & 1) {
-                for (x = 0; x < cga->crtc[1]; x++) {
+            if (cga->cgamode & CGA_MODE_FLAG_HIGHRES) {
+                for (x = 0; x < cga->crtc[CGA_CRTC_HDISP]; x++) {
                     chr        = cga->charbuffer[x << 1];
                     attr       = cga->charbuffer[(x << 1) + 1];
-                    drawcursor = ((cga->ma == ca) && cga->con && cga->cursoron);
-                    blink      = ((cga->cgablink & 16) && (cga->cgamode & 0x20) && (attr & 0x80) && !drawcursor);
-                    lcd_draw_char_80(vid, &(buffer32->line[cga->displine << 1])[x * 8], chr, attr, drawcursor, blink, cga->sc, cga->cgamode & 0x40, cga->cgamode);
-                    lcd_draw_char_80(vid, &(buffer32->line[(cga->displine << 1) + 1])[x * 8], chr, attr, drawcursor, blink, cga->sc, cga->cgamode & 0x40, cga->cgamode);
-                    cga->ma++;
+                    drawcursor = ((cga->memaddr == cursoraddr) && cga->cursorvisible && cga->cursoron);
+                    blink      = ((cga->cgablink & 16) && (cga->cgamode & CGA_MODE_FLAG_BLINK) && (attr & 0x80) && !drawcursor);
+                    lcd_draw_char_80(vid, &(buffer32->line[cga->displine << 1])[x * 8], chr, attr, drawcursor, blink, cga->scanline, cga->cgamode & 0x40, cga->cgamode);
+                    lcd_draw_char_80(vid, &(buffer32->line[(cga->displine << 1) + 1])[x * 8], chr, attr, drawcursor, blink, cga->scanline, cga->cgamode & 0x40, cga->cgamode);
+                    cga->memaddr++;
                 }
-            } else if (!(cga->cgamode & 2)) {
-                for (x = 0; x < cga->crtc[1]; x++) {
-                    chr        = cga->vram[(cga->ma << 1) & 0x3fff];
-                    attr       = cga->vram[((cga->ma << 1) + 1) & 0x3fff];
-                    drawcursor = ((cga->ma == ca) && cga->con && cga->cursoron);
-                    blink      = ((cga->cgablink & 16) && (cga->cgamode & 0x20) && (attr & 0x80) && !drawcursor);
-                    lcd_draw_char_40(vid, &(buffer32->line[cga->displine << 1])[x * 16], chr, attr, drawcursor, blink, cga->sc, cga->cgamode);
-                    lcd_draw_char_40(vid, &(buffer32->line[(cga->displine << 1) + 1])[x * 16], chr, attr, drawcursor, blink, cga->sc, cga->cgamode);
-                    cga->ma++;
+            } else if (!(cga->cgamode & CGA_MODE_FLAG_GRAPHICS)) {
+                for (x = 0; x < cga->crtc[CGA_CRTC_HDISP]; x++) {
+                    chr        = cga->vram[(cga->memaddr << 1) & 0x3fff];
+                    attr       = cga->vram[((cga->memaddr << 1) + 1) & 0x3fff];
+                    drawcursor = ((cga->memaddr == cursoraddr) && cga->cursorvisible && cga->cursoron);
+                    blink      = ((cga->cgablink & 16) && (cga->cgamode & CGA_MODE_FLAG_BLINK) && (attr & 0x80) && !drawcursor);
+                    lcd_draw_char_40(vid, &(buffer32->line[cga->displine << 1])[x * 16], chr, attr, drawcursor, blink, cga->scanline, cga->cgamode);
+                    lcd_draw_char_40(vid, &(buffer32->line[(cga->displine << 1) + 1])[x * 16], chr, attr, drawcursor, blink, cga->scanline, cga->cgamode);
+                    cga->memaddr++;
                 }
             } else { /* Graphics mode */
-                for (x = 0; x < cga->crtc[1]; x++) {
-                    dat = (cga->vram[((cga->ma << 1) & 0x1fff) + ((cga->sc & 1) * 0x2000)] << 8) | cga->vram[((cga->ma << 1) & 0x1fff) + ((cga->sc & 1) * 0x2000) + 1];
-                    cga->ma++;
+                for (x = 0; x < cga->crtc[CGA_CRTC_HDISP]; x++) {
+                    dat = (cga->vram[((cga->memaddr << 1) & 0x1fff) + ((cga->scanline & 1) * 0x2000)] << 8) | cga->vram[((cga->memaddr << 1) & 0x1fff) + ((cga->scanline & 1) * 0x2000) + 1];
+                    cga->memaddr++;
                     for (uint8_t c = 0; c < 16; c++) {
                         buffer32->line[cga->displine << 1][(x << 4) + c] = buffer32->line[(cga->displine << 1) + 1][(x << 4) + c] = (dat & 0x8000) ? blue : green;
                         dat <<= 1;
@@ -1455,22 +1541,22 @@ lcdc_poll(amsvid_t *vid)
                 }
             }
         } else {
-            if (cga->cgamode & 1) {
-                hline(buffer32, 0, (cga->displine << 1), (cga->crtc[1] << 3), green);
-                hline(buffer32, 0, (cga->displine << 1) + 1, (cga->crtc[1] << 3), green);
+            if (cga->cgamode & CGA_MODE_FLAG_HIGHRES) {
+                hline(buffer32, 0, (cga->displine << 1), (cga->crtc[CGA_CRTC_HDISP] << 3), green);
+                hline(buffer32, 0, (cga->displine << 1) + 1, (cga->crtc[CGA_CRTC_HDISP] << 3), green);
             } else {
-                hline(buffer32, 0, (cga->displine << 1), (cga->crtc[1] << 4), green);
-                hline(buffer32, 0, (cga->displine << 1) + 1, (cga->crtc[1] << 4), green);
+                hline(buffer32, 0, (cga->displine << 1), (cga->crtc[CGA_CRTC_HDISP] << 4), green);
+                hline(buffer32, 0, (cga->displine << 1) + 1, (cga->crtc[CGA_CRTC_HDISP] << 4), green);
             }
         }
 
-        if (cga->cgamode & 1)
-            x = (cga->crtc[1] << 3);
+        if (cga->cgamode & CGA_MODE_FLAG_HIGHRES)
+            x = (cga->crtc[CGA_CRTC_HDISP] << 3);
         else
-            x = (cga->crtc[1] << 4);
+            x = (cga->crtc[CGA_CRTC_HDISP] << 4);
 
-        cga->sc = oldsc;
-        if (cga->vc == cga->crtc[7] && !cga->sc)
+        cga->scanline = scanline_old;
+        if (cga->vc == cga->crtc[CGA_CRTC_VSYNC] && !cga->scanline)
             cga->cgastat |= 8;
         cga->displine++;
         if (cga->displine >= 360)
@@ -1483,54 +1569,53 @@ lcdc_poll(amsvid_t *vid)
             if (!cga->vsynctime)
                 cga->cgastat &= ~8;
         }
-        if (cga->sc == (cga->crtc[11] & 31) || ((cga->crtc[8] & 3) == 3 && cga->sc == ((cga->crtc[11] & 31) >> 1))) {
-            cga->con  = 0;
-            cga->coff = 1;
+        if (cga->scanline == (cga->crtc[CGA_CRTC_CURSOR_END] & 31) || ((cga->crtc[CGA_CRTC_INTERLACE] & 3) == 3 && cga->scanline == ((cga->crtc[CGA_CRTC_CURSOR_END] & 31) >> 1))) {
+            cga->cursorvisible  = 0;
         }
-        if ((cga->crtc[8] & 3) == 3 && cga->sc == (cga->crtc[9] >> 1))
-            cga->maback = cga->ma;
+        if ((cga->crtc[CGA_CRTC_INTERLACE] & 3) == 3 && cga->scanline == (cga->crtc[CGA_CRTC_MAX_SCANLINE_ADDR] >> 1))
+            cga->memaddr_backup = cga->memaddr;
         if (cga->vadj) {
-            cga->sc++;
-            cga->sc &= 31;
-            cga->ma = cga->maback;
+            cga->scanline++;
+            cga->scanline &= 31;
+            cga->memaddr = cga->memaddr_backup;
             cga->vadj--;
             if (!cga->vadj) {
                 cga->cgadispon = 1;
-                cga->ma = cga->maback = (cga->crtc[13] | (cga->crtc[12] << 8)) & 0x3fff;
-                cga->sc               = 0;
+                cga->memaddr = cga->memaddr_backup = (cga->crtc[CGA_CRTC_START_ADDR_LOW] | (cga->crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x3fff;
+                cga->scanline               = 0;
             }
-        } else if (cga->sc == cga->crtc[9]) {
-            cga->maback = cga->ma;
-            cga->sc     = 0;
+        } else if (cga->scanline == cga->crtc[CGA_CRTC_MAX_SCANLINE_ADDR]) {
+            cga->memaddr_backup = cga->memaddr;
+            cga->scanline     = 0;
             oldvc       = cga->vc;
             cga->vc++;
             cga->vc &= 127;
 
-            if (cga->vc == cga->crtc[6])
+            if (cga->vc == cga->crtc[CGA_CRTC_VDISP])
                 cga->cgadispon = 0;
 
-            if (oldvc == cga->crtc[4]) {
+            if (oldvc == cga->crtc[CGA_CRTC_VTOTAL]) {
                 cga->vc   = 0;
-                cga->vadj = cga->crtc[5];
+                cga->vadj = cga->crtc[CGA_CRTC_VTOTAL_ADJUST];
                 if (!cga->vadj)
                     cga->cgadispon = 1;
                 if (!cga->vadj)
-                    cga->ma = cga->maback = (cga->crtc[13] | (cga->crtc[12] << 8)) & 0x3fff;
-                if ((cga->crtc[10] & 0x60) == 0x20)
+                    cga->memaddr = cga->memaddr_backup = (cga->crtc[CGA_CRTC_START_ADDR_LOW] | (cga->crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x3fff;
+                if ((cga->crtc[CGA_CRTC_CURSOR_START] & 0x60) == 0x20)
                     cga->cursoron = 0;
                 else
                     cga->cursoron = cga->cgablink & 8;
             }
 
-            if (cga->vc == cga->crtc[7]) {
+            if (cga->vc == cga->crtc[CGA_CRTC_VSYNC]) {
                 cga->cgadispon = 0;
                 cga->displine  = 0;
                 cga->vsynctime = 16;
-                if (cga->crtc[7]) {
-                    if (cga->cgamode & 1)
-                        x = (cga->crtc[1] << 3);
+                if (cga->crtc[CGA_CRTC_VSYNC]) {
+                    if (cga->cgamode & CGA_MODE_FLAG_HIGHRES)
+                        x = (cga->crtc[CGA_CRTC_HDISP] << 3);
                     else
-                        x = (cga->crtc[1] << 4);
+                        x = (cga->crtc[CGA_CRTC_HDISP] << 4);
                     cga->lastline++;
 
                     xs_temp = x;
@@ -1542,7 +1627,7 @@ lcdc_poll(amsvid_t *vid)
                         if (ys_temp < 32)
                             ys_temp = 400;
 
-                        if ((cga->cgamode & 8) && ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get())) {
+                        if ((cga->cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) && ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get())) {
                             xsize = xs_temp;
                             ysize = ys_temp;
                             set_screen_size(xsize, ysize);
@@ -1559,15 +1644,15 @@ lcdc_poll(amsvid_t *vid)
 
                     video_res_x = xsize;
                     video_res_y = ysize;
-                    if (cga->cgamode & 1) {
+                    if (cga->cgamode & CGA_MODE_FLAG_HIGHRES) {
                         video_res_x /= 8;
-                        video_res_y /= cga->crtc[9] + 1;
+                        video_res_y /= cga->crtc[CGA_CRTC_MAX_SCANLINE_ADDR] + 1;
                         video_bpp = 0;
-                    } else if (!(cga->cgamode & 2)) {
+                    } else if (!(cga->cgamode & CGA_MODE_FLAG_GRAPHICS)) {
                         video_res_x /= 16;
-                        video_res_y /= cga->crtc[9] + 1;
+                        video_res_y /= cga->crtc[CGA_CRTC_MAX_SCANLINE_ADDR] + 1;
                         video_bpp = 0;
-                    } else if (!(cga->cgamode & 16)) {
+                    } else if (!(cga->cgamode & CGA_MODE_FLAG_HIGHRES_GRAPHICS)) {
                         video_res_x /= 2;
                         video_bpp = 2;
                     } else
@@ -1579,17 +1664,17 @@ lcdc_poll(amsvid_t *vid)
                 cga->oddeven ^= 1;
             }
         } else {
-            cga->sc++;
-            cga->sc &= 31;
-            cga->ma = cga->maback;
+            cga->scanline++;
+            cga->scanline &= 31;
+            cga->memaddr = cga->memaddr_backup;
         }
         if (cga->cgadispon)
             cga->cgastat &= ~1;
-        if (cga->sc == (cga->crtc[10] & 31) || ((cga->crtc[8] & 3) == 3 && cga->sc == ((cga->crtc[10] & 31) >> 1)))
-            cga->con = 1;
-        if (cga->cgadispon && (cga->cgamode & 1)) {
-            for (x = 0; x < (cga->crtc[1] << 1); x++)
-                cga->charbuffer[x] = cga->vram[((cga->ma << 1) + x) & 0x3fff];
+        if (cga->scanline == (cga->crtc[CGA_CRTC_CURSOR_START] & 31) || ((cga->crtc[CGA_CRTC_INTERLACE] & 3) == 3 && cga->scanline == ((cga->crtc[CGA_CRTC_CURSOR_START] & 31) >> 1)))
+            cga->cursorvisible = 1;
+        if (cga->cgadispon && (cga->cgamode & CGA_MODE_FLAG_HIGHRES)) {
+            for (x = 0; x < (cga->crtc[CGA_CRTC_HDISP] << 1); x++)
+                cga->charbuffer[x] = cga->vram[((cga->memaddr << 1) + x) & 0x3fff];
         }
     }
 }
@@ -1620,8 +1705,7 @@ vid_init_200(amstrad_t *ams)
     mda_t    *mda;
 
     /* Allocate a video controller block. */
-    vid = (amsvid_t *) malloc(sizeof(amsvid_t));
-    memset(vid, 0x00, sizeof(amsvid_t));
+    vid = (amsvid_t *) calloc(1, sizeof(amsvid_t));
 
     vid->emulation = device_get_config_int("video_emulation");
 
@@ -1831,7 +1915,7 @@ const device_t vid_200_device = {
     .init          = NULL,
     .close         = vid_close_200,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = vid_speed_changed_200,
     .force_redraw  = NULL,
     .config        = vid_200_config
@@ -1931,7 +2015,7 @@ const device_t vid_ppc512_device = {
     .init          = NULL,
     .close         = vid_close_200,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = vid_speed_changed_200,
     .force_redraw  = NULL,
     .config        = vid_ppc512_config
@@ -1965,7 +2049,7 @@ const device_t vid_pc2086_device = {
     .init          = NULL,
     .close         = NULL,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = vid_pc2086_config
@@ -1999,7 +2083,7 @@ const device_t vid_pc3086_device = {
     .init          = NULL,
     .close         = NULL,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = vid_pc3086_config
@@ -2250,7 +2334,7 @@ ams_write(uint16_t port, uint8_t val, void *priv)
         case 0x0378:
         case 0x0379:
         case 0x037a:
-            lpt_write(port, val, &lpt_ports[0]);
+            lpt_write(port, val, ams->lpt);
             break;
 
         case 0xdead:
@@ -2270,7 +2354,7 @@ ams_read(uint16_t port, void *priv)
 
     switch (port) {
         case 0x0378:
-            ret = lpt_read(port, &lpt_ports[0]);
+            ret = lpt_read(port, ams->lpt);
             break;
 
         case 0x0379: /* printer control, also set LK1-3.
@@ -2284,11 +2368,11 @@ ams_read(uint16_t port, void *priv)
                       *   1 Italian Language.
                       *   0 Diagnostic Mode.
                       */
-            ret = (lpt_read(port, &lpt_ports[0]) & 0xf8) | ams->language;
+            ret = (lpt_read(port, ams->lpt) & 0xf8) | ams->language;
             break;
 
         case 0x037a: /* printer status */
-            ret = lpt_read(port, &lpt_ports[0]) & 0x1f;
+            ret = lpt_read(port, ams->lpt) & 0x1f;
 
             switch (ams->type) {
                 case AMS_PC1512:
@@ -2350,133 +2434,518 @@ ams_read(uint16_t port, void *priv)
 
 static const scancode scancode_pc200[512] = {
   // clang-format off
-    { {          0},{               0} }, { {     0x01,0},{          0x81,0} }, { {     0x02,0},{          0x82,0} }, { {     0x03,0},{          0x83,0} },        /*000*/
-    { {     0x04,0},{          0x84,0} }, { {     0x05,0},{          0x85,0} }, { {     0x06,0},{          0x86,0} }, { {     0x07,0},{          0x87,0} },        /*004*/
-    { {     0x08,0},{          0x88,0} }, { {     0x09,0},{          0x89,0} }, { {     0x0a,0},{          0x8a,0} }, { {     0x0b,0},{          0x8b,0} },        /*008*/
-    { {     0x0c,0},{          0x8c,0} }, { {     0x0d,0},{          0x8d,0} }, { {     0x0e,0},{          0x8e,0} }, { {     0x0f,0},{          0x8f,0} },        /*00c*/
-    { {     0x10,0},{          0x90,0} }, { {     0x11,0},{          0x91,0} }, { {     0x12,0},{          0x92,0} }, { {     0x13,0},{          0x93,0} },        /*010*/
-    { {     0x14,0},{          0x94,0} }, { {     0x15,0},{          0x95,0} }, { {     0x16,0},{          0x96,0} }, { {     0x17,0},{          0x97,0} },        /*014*/
-    { {     0x18,0},{          0x98,0} }, { {     0x19,0},{          0x99,0} }, { {     0x1a,0},{          0x9a,0} }, { {     0x1b,0},{          0x9b,0} },        /*018*/
-    { {     0x1c,0},{          0x9c,0} }, { {     0x1d,0},{          0x9d,0} }, { {     0x1e,0},{          0x9e,0} }, { {     0x1f,0},{          0x9f,0} },        /*01c*/
-    { {     0x20,0},{          0xa0,0} }, { {     0x21,0},{          0xa1,0} }, { {     0x22,0},{          0xa2,0} }, { {     0x23,0},{          0xa3,0} },        /*020*/
-    { {     0x24,0},{          0xa4,0} }, { {     0x25,0},{          0xa5,0} }, { {     0x26,0},{          0xa6,0} }, { {     0x27,0},{          0xa7,0} },        /*024*/
-    { {     0x28,0},{          0xa8,0} }, { {     0x29,0},{          0xa9,0} }, { {     0x2a,0},{          0xaa,0} }, { {     0x2b,0},{          0xab,0} },        /*028*/
-    { {     0x2c,0},{          0xac,0} }, { {     0x2d,0},{          0xad,0} }, { {     0x2e,0},{          0xae,0} }, { {     0x2f,0},{          0xaf,0} },        /*02c*/
-    { {     0x30,0},{          0xb0,0} }, { {     0x31,0},{          0xb1,0} }, { {     0x32,0},{          0xb2,0} }, { {     0x33,0},{          0xb3,0} },        /*030*/
-    { {     0x34,0},{          0xb4,0} }, { {     0x35,0},{          0xb5,0} }, { {     0x36,0},{          0xb6,0} }, { {     0x37,0},{          0xb7,0} },        /*034*/
-    { {     0x38,0},{          0xb8,0} }, { {     0x39,0},{          0xb9,0} }, { {     0x3a,0},{          0xba,0} }, { {     0x3b,0},{          0xbb,0} },        /*038*/
-    { {     0x3c,0},{          0xbc,0} }, { {     0x3d,0},{          0xbd,0} }, { {     0x3e,0},{          0xbe,0} }, { {     0x3f,0},{          0xbf,0} },        /*03c*/
-    { {     0x40,0},{          0xc0,0} }, { {     0x41,0},{          0xc1,0} }, { {     0x42,0},{          0xc2,0} }, { {     0x43,0},{          0xc3,0} },        /*040*/
-    { {     0x44,0},{          0xc4,0} }, { {     0x45,0},{          0xc5,0} }, { {     0x46,0},{          0xc6,0} }, { {     0x47,0},{          0xc7,0} },        /*044*/
-    { {     0x48,0},{          0xc8,0} }, { {     0x49,0},{          0xc9,0} }, { {     0x4a,0},{          0xca,0} }, { {     0x4b,0},{          0xcb,0} },        /*048*/
-    { {     0x4c,0},{          0xcc,0} }, { {     0x4d,0},{          0xcd,0} }, { {     0x4e,0},{          0xce,0} }, { {     0x4f,0},{          0xcf,0} },        /*04c*/
-    { {     0x50,0},{          0xd0,0} }, { {     0x51,0},{          0xd1,0} }, { {     0x52,0},{          0xd2,0} }, { {     0x53,0},{          0xd3,0} },        /*050*/
-    { {     0x54,0},{          0xd4,0} }, { {     0x55,0},{          0xd5,0} }, { {     0x56,0},{          0xd6,0} }, { {     0x57,0},{          0xd7,0} },        /*054*/
-    { {     0x58,0},{          0xd8,0} }, { {     0x59,0},{          0xd9,0} }, { {     0x5a,0},{          0xda,0} }, { {     0x5b,0},{          0xdb,0} },        /*058*/
-    { {     0x5c,0},{          0xdc,0} }, { {     0x5d,0},{          0xdd,0} }, { {     0x5e,0},{          0xde,0} }, { {     0x5f,0},{          0xdf,0} },        /*05c*/
-    { {     0x60,0},{          0xe0,0} }, { {     0x61,0},{          0xe1,0} }, { {     0x62,0},{          0xe2,0} }, { {     0x63,0},{          0xe3,0} },        /*060*/
-    { {     0x64,0},{          0xe4,0} }, { {     0x65,0},{          0xe5,0} }, { {     0x66,0},{          0xe6,0} }, { {     0x67,0},{          0xe7,0} },        /*064*/
-    { {     0x68,0},{          0xe8,0} }, { {     0x69,0},{          0xe9,0} }, { {     0x6a,0},{          0xea,0} }, { {     0x6b,0},{          0xeb,0} },        /*068*/
-    { {     0x6c,0},{          0xec,0} }, { {     0x6d,0},{          0xed,0} }, { {     0x6e,0},{          0xee,0} }, { {     0x6f,0},{          0xef,0} },        /*06c*/
-    { {     0x70,0},{          0xf0,0} }, { {     0x71,0},{          0xf1,0} }, { {     0x72,0},{          0xf2,0} }, { {     0x73,0},{          0xf3,0} },        /*070*/
-    { {     0x74,0},{          0xf4,0} }, { {     0x75,0},{          0xf5,0} }, { {     0x76,0},{          0xf6,0} }, { {     0x77,0},{          0xf7,0} },        /*074*/
-    { {     0x78,0},{          0xf8,0} }, { {     0x79,0},{          0xf9,0} }, { {     0x7a,0},{          0xfa,0} }, { {     0x7b,0},{          0xfb,0} },        /*078*/
-    { {     0x7c,0},{          0xfc,0} }, { {     0x7d,0},{          0xfd,0} }, { {     0x7e,0},{          0xfe,0} }, { {     0x7f,0},{          0xff,0} },        /*07c*/
-
-    { {     0x80,0},{               0} }, { {     0x81,0},{               0} }, { {     0x82,0},{               0} }, { {          0},{               0} },        /*080*/
-    { {          0},{               0} }, { {     0x85,0},{               0} }, { {     0x86,0},{               0} }, { {     0x87,0},{               0} },        /*084*/
-    { {     0x88,0},{               0} }, { {     0x89,0},{               0} }, { {     0x8a,0},{               0} }, { {     0x8b,0},{               0} },        /*088*/
-    { {     0x8c,0},{               0} }, { {     0x8d,0},{               0} }, { {     0x8e,0},{               0} }, { {     0x8f,0},{               0} },        /*08c*/
-    { {     0x90,0},{               0} }, { {     0x91,0},{               0} }, { {     0x92,0},{               0} }, { {     0x93,0},{               0} },        /*090*/
-    { {     0x94,0},{               0} }, { {     0x95,0},{               0} }, { {     0x96,0},{               0} }, { {     0x97,0},{               0} },        /*094*/
-    { {     0x98,0},{               0} }, { {     0x99,0},{               0} }, { {     0x9a,0},{               0} }, { {     0x9b,0},{               0} },        /*098*/
-    { {     0x9c,0},{               0} }, { {     0x9d,0},{               0} }, { {     0x9e,0},{               0} }, { {     0x9f,0},{               0} },        /*09c*/
-    { {     0xa0,0},{               0} }, { {     0xa1,0},{               0} }, { {     0xa2,0},{               0} }, { {     0xa3,0},{               0} },        /*0a0*/
-    { {     0xa4,0},{               0} }, { {     0xa5,0},{               0} }, { {     0xa6,0},{               0} }, { {     0xa7,0},{               0} },        /*0a4*/
-    { {     0xa8,0},{               0} }, { {     0xa9,0},{               0} }, { {     0xaa,0},{               0} }, { {     0xab,0},{               0} },        /*0a8*/
-    { {     0xac,0},{               0} }, { {     0xad,0},{               0} }, { {     0xae,0},{               0} }, { {     0xaf,0},{               0} },        /*0ac*/
-    { {     0xb0,0},{               0} }, { {     0xb1,0},{               0} }, { {     0xb2,0},{               0} }, { {     0xb3,0},{               0} },        /*0b0*/
-    { {     0xb4,0},{               0} }, { {     0xb5,0},{               0} }, { {     0xb6,0},{               0} }, { {     0xb7,0},{               0} },        /*0b4*/
-    { {     0xb8,0},{               0} }, { {     0xb9,0},{               0} }, { {     0xba,0},{               0} }, { {     0xbb,0},{               0} },        /*0b8*/
-    { {     0xbc,0},{               0} }, { {     0xbd,0},{               0} }, { {     0xbe,0},{               0} }, { {     0xbf,0},{               0} },        /*0bc*/
-    { {     0xc0,0},{               0} }, { {     0xc1,0},{               0} }, { {     0xc2,0},{               0} }, { {     0xc3,0},{               0} },        /*0c0*/
-    { {     0xc4,0},{               0} }, { {     0xc5,0},{               0} }, { {     0xc6,0},{               0} }, { {     0xc7,0},{               0} },        /*0c4*/
-    { {     0xc8,0},{               0} }, { {     0xc9,0},{               0} }, { {     0xca,0},{               0} }, { {     0xcb,0},{               0} },        /*0c8*/
-    { {     0xcc,0},{               0} }, { {     0xcd,0},{               0} }, { {     0xce,0},{               0} }, { {     0xcf,0},{               0} },        /*0cc*/
-    { {     0xd0,0},{               0} }, { {     0xd1,0},{               0} }, { {     0xd2,0},{               0} }, { {     0xd3,0},{               0} },        /*0d0*/
-    { {     0xd4,0},{               0} }, { {     0xd5,0},{               0} }, { {     0xd6,0},{               0} }, { {     0xd7,0},{               0} },        /*0d4*/
-    { {     0xd8,0},{               0} }, { {     0xd9,0},{               0} }, { {     0xda,0},{               0} }, { {     0xdb,0},{               0} },        /*0d8*/
-    { {     0xdc,0},{               0} }, { {     0xdd,0},{               0} }, { {     0xde,0},{               0} }, { {     0xdf,0},{               0} },        /*0dc*/
-    { {     0xe0,0},{               0} }, { {     0xe1,0},{               0} }, { {     0xe2,0},{               0} }, { {     0xe3,0},{               0} },        /*0e0*/
-    { {     0xe4,0},{               0} }, { {     0xe5,0},{               0} }, { {     0xe6,0},{               0} }, { {     0xe7,0},{               0} },        /*0e4*/
-    { {     0xe8,0},{               0} }, { {     0xe9,0},{               0} }, { {     0xea,0},{               0} }, { {     0xeb,0},{               0} },        /*0e8*/
-    { {     0xec,0},{               0} }, { {     0xed,0},{               0} }, { {     0xee,0},{               0} }, { {     0xef,0},{               0} },        /*0ec*/
-    { {          0},{               0} }, { {     0xf1,0},{               0} }, { {     0xf2,0},{               0} }, { {     0xf3,0},{               0} },        /*0f0*/
-    { {     0xf4,0},{               0} }, { {     0xf5,0},{               0} }, { {     0xf6,0},{               0} }, { {     0xf7,0},{               0} },        /*0f4*/
-    { {     0xf8,0},{               0} }, { {     0xf9,0},{               0} }, { {     0xfa,0},{               0} }, { {     0xfb,0},{               0} },        /*0f8*/
-    { {     0xfc,0},{               0} }, { {     0xfd,0},{               0} }, { {     0xfe,0},{               0} }, { {     0xff,0},{               0} },        /*0fc*/
-
-    { {0xe1,0x1d,0},{0xe1,     0x9d,0} }, { {0xe0,0x01,0},{0xe0,     0x81,0} }, { {0xe0,0x02,0},{0xe0,     0x82,0} }, { {0xe0,0x03,0},{0xe0,     0x83,0} },        /*100*/
-    { {0xe0,0x04,0},{0xe0,     0x84,0} }, { {0xe0,0x05,0},{0xe0,     0x85,0} }, { {0xe0,0x06,0},{0xe0,     0x86,0} }, { {0xe0,0x07,0},{0xe0,     0x87,0} },        /*104*/
-    { {0xe0,0x08,0},{0xe0,     0x88,0} }, { {0xe0,0x09,0},{0xe0,     0x89,0} }, { {0xe0,0x0a,0},{0xe0,     0x8a,0} }, { {0xe0,0x0b,0},{0xe0,     0x8b,0} },        /*108*/
-    { {0xe0,0x0c,0},{0xe0,     0x8c,0} }, { {          0},{               0} }, { {0xe0,0x0e,0},{0xe0,     0x8e,0} }, { {0xe0,0x0f,0},{0xe0,     0x8f,0} },        /*10c*/
-    { {0xe0,0x10,0},{0xe0,     0x90,0} }, { {0xe0,0x11,0},{0xe0,     0x91,0} }, { {0xe0,0x12,0},{0xe0,     0x92,0} }, { {0xe0,0x13,0},{0xe0,     0x93,0} },        /*110*/
-    { {0xe0,0x14,0},{0xe0,     0x94,0} }, { {0xe0,0x15,0},{0xe0,     0x95,0} }, { {0xe0,0x16,0},{0xe0,     0x96,0} }, { {0xe0,0x17,0},{0xe0,     0x97,0} },        /*114*/
-    { {0xe0,0x18,0},{0xe0,     0x98,0} }, { {0xe0,0x19,0},{0xe0,     0x99,0} }, { {0xe0,0x1a,0},{0xe0,     0x9a,0} }, { {0xe0,0x1b,0},{0xe0,     0x9b,0} },        /*118*/
-    { {0xe0,0x1c,0},{0xe0,     0x9c,0} }, { {0xe0,0x1d,0},{0xe0,     0x9d,0} }, { {0xe0,0x1e,0},{0xe0,     0x9e,0} }, { {0xe0,0x1f,0},{0xe0,     0x9f,0} },        /*11c*/
-    { {0xe0,0x20,0},{0xe0,     0xa0,0} }, { {0xe0,0x21,0},{0xe0,     0xa1,0} }, { {0xe0,0x22,0},{0xe0,     0xa2,0} }, { {0xe0,0x23,0},{0xe0,     0xa3,0} },        /*120*/
-    { {0xe0,0x24,0},{0xe0,     0xa4,0} }, { {0xe0,0x25,0},{0xe0,     0xa5,0} }, { {0xe0,0x26,0},{0xe0,     0xa6,0} }, { {          0},{               0} },        /*124*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*128*/
-    { {0xe0,0x2c,0},{0xe0,     0xac,0} }, { {0xe0,0x2d,0},{0xe0,     0xad,0} }, { {0xe0,0x2e,0},{0xe0,     0xae,0} }, { {0xe0,0x2f,0},{0xe0,     0xaf,0} },        /*12c*/
-    { {0xe0,0x30,0},{0xe0,     0xb0,0} }, { {0xe0,0x31,0},{0xe0,     0xb1,0} }, { {0xe0,0x32,0},{0xe0,     0xb2,0} }, { {          0},{               0} },        /*130*/
-    { {0xe0,0x34,0},{0xe0,     0xb4,0} }, { {0xe0,0x35,0},{0xe0,     0xb5,0} }, { {          0},{               0} }, { {0xe0,0x37,0},{0xe0,     0xb7,0} },        /*134*/
-    { {0xe0,0x38,0},{0xe0,     0xb8,0} }, { {          0},{               0} }, { {0xe0,0x3a,0},{0xe0,     0xba,0} }, { {0xe0,0x3b,0},{0xe0,     0xbb,0} },        /*138*/
-    { {0xe0,0x3c,0},{0xe0,     0xbc,0} }, { {0xe0,0x3d,0},{0xe0,     0xbd,0} }, { {0xe0,0x3e,0},{0xe0,     0xbe,0} }, { {0xe0,0x3f,0},{0xe0,     0xbf,0} },        /*13c*/
-    { {0xe0,0x40,0},{0xe0,     0xc0,0} }, { {0xe0,0x41,0},{0xe0,     0xc1,0} }, { {0xe0,0x42,0},{0xe0,     0xc2,0} }, { {0xe0,0x43,0},{0xe0,     0xc3,0} },        /*140*/
-    { {0xe0,0x44,0},{0xe0,     0xc4,0} }, { {          0},{               0} }, { {0xe0,0x46,0},{0xe0,     0xc6,0} }, { {0xe0,0x47,0},{0xe0,     0xc7,0} },        /*144*/
-    { {0xe0,0x48,0},{0xe0,     0xc8,0} }, { {0xe0,0x49,0},{0xe0,     0xc9,0} }, { {          0},{               0} }, { {0xe0,0x4b,0},{0xe0,     0xcb,0} },        /*148*/
-    { {0xe0,0x4c,0},{0xe0,     0xcc,0} }, { {0xe0,0x4d,0},{0xe0,     0xcd,0} }, { {0xe0,0x4e,0},{0xe0,     0xce,0} }, { {0xe0,0x4f,0},{0xe0,     0xcf,0} },        /*14c*/
-    { {0xe0,0x50,0},{0xe0,     0xd0,0} }, { {0xe0,0x51,0},{0xe0,     0xd1,0} }, { {0xe0,0x52,0},{0xe0,     0xd2,0} }, { {0xe0,0x53,0},{0xe0,     0xd3,0} },        /*150*/
-    { {          0},{               0} }, { {0xe0,0x55,0},{0xe0,     0xd5,0} }, { {          0},{               0} }, { {0xe0,0x57,0},{0xe0,     0xd7,0} },        /*154*/
-    { {0xe0,0x58,0},{0xe0,     0xd8,0} }, { {0xe0,0x59,0},{0xe0,     0xd9,0} }, { {0xe0,0x5a,0},{0xe0,     0xaa,0} }, { {0xe0,0x5b,0},{0xe0,     0xdb,0} },        /*158*/
-    { {0xe0,0x5c,0},{0xe0,     0xdc,0} }, { {0xe0,0x5d,0},{0xe0,     0xdd,0} }, { {0xe0,0x5e,0},{0xe0,     0xee,0} }, { {0xe0,0x5f,0},{0xe0,     0xdf,0} },        /*15c*/
-    { {          0},{               0} }, { {0xe0,0x61,0},{0xe0,     0xe1,0} }, { {0xe0,0x62,0},{0xe0,     0xe2,0} }, { {0xe0,0x63,0},{0xe0,     0xe3,0} },        /*160*/
-    { {0xe0,0x64,0},{0xe0,     0xe4,0} }, { {0xe0,0x65,0},{0xe0,     0xe5,0} }, { {0xe0,0x66,0},{0xe0,     0xe6,0} }, { {0xe0,0x67,0},{0xe0,     0xe7,0} },        /*164*/
-    { {0xe0,0x68,0},{0xe0,     0xe8,0} }, { {0xe0,0x69,0},{0xe0,     0xe9,0} }, { {0xe0,0x6a,0},{0xe0,     0xea,0} }, { {0xe0,0x6b,0},{0xe0,     0xeb,0} },        /*168*/
-    { {0xe0,0x6c,0},{0xe0,     0xec,0} }, { {0xe0,0x6d,0},{0xe0,     0xed,0} }, { {0xe0,0x6e,0},{0xe0,     0xee,0} }, { {          0},{               0} },        /*16c*/
-    { {0xe0,0x70,0},{0xe0,     0xf0,0} }, { {0xe0,0x71,0},{0xe0,     0xf1,0} }, { {0xe0,0x72,0},{0xe0,     0xf2,0} }, { {0xe0,0x73,0},{0xe0,     0xf3,0} },        /*170*/
-    { {0xe0,0x74,0},{0xe0,     0xf4,0} }, { {0xe0,0x75,0},{0xe0,     0xf5,0} }, { {          0},{               0} }, { {0xe0,0x77,0},{0xe0,     0xf7,0} },        /*174*/
-    { {0xe0,0x78,0},{0xe0,     0xf8,0} }, { {0xe0,0x79,0},{0xe0,     0xf9,0} }, { {0xe0,0x7a,0},{0xe0,     0xfa,0} }, { {0xe0,0x7b,0},{0xe0,     0xfb,0} },        /*178*/
-    { {0xe0,0x7c,0},{0xe0,     0xfc,0} }, { {0xe0,0x7d,0},{0xe0,     0xfd,0} }, { {0xe0,0x7e,0},{0xe0,     0xfe,0} }, { {0xe0,0x7f,0},{0xe0,     0xff,0} },        /*17c*/
-
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*180*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*184*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*188*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*18c*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*190*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*194*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*198*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*19c*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1a0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1a4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1a8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1ac*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1c0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1c4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1c8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1cc*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1d0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1d4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1d8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1dc*/
-    { {          0},{               0} }, { {0xe0,0xe1,0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1e0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1e4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1e8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {0xe0,0xee,0},{               0} }, { {          0},{               0} },        /*1ec*/
-    { {          0},{               0} }, { {0xe0,0xf1,0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1f0*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1f4*/
-    { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} }, { {          0},{               0} },        /*1f8*/
-    { {          0},{               0} }, { {          0},{               0} }, { {0xe0,0xfe,0},{               0} }, { {0xe0,0xff,0},{               0} }         /*1fc*/
+    { .mk = {            0 }, .brk = {                   0 } }, /* 000 */
+    { .mk = {      0x01, 0 }, .brk = {             0x81, 0 } }, /* 001 */
+    { .mk = {      0x02, 0 }, .brk = {             0x82, 0 } }, /* 002 */
+    { .mk = {      0x03, 0 }, .brk = {             0x83, 0 } }, /* 003 */
+    { .mk = {      0x04, 0 }, .brk = {             0x84, 0 } }, /* 004 */
+    { .mk = {      0x05, 0 }, .brk = {             0x85, 0 } }, /* 005 */
+    { .mk = {      0x06, 0 }, .brk = {             0x86, 0 } }, /* 006 */
+    { .mk = {      0x07, 0 }, .brk = {             0x87, 0 } }, /* 007 */
+    { .mk = {      0x08, 0 }, .brk = {             0x88, 0 } }, /* 008 */
+    { .mk = {      0x09, 0 }, .brk = {             0x89, 0 } }, /* 009 */
+    { .mk = {      0x0a, 0 }, .brk = {             0x8a, 0 } }, /* 00a */
+    { .mk = {      0x0b, 0 }, .brk = {             0x8b, 0 } }, /* 00b */
+    { .mk = {      0x0c, 0 }, .brk = {             0x8c, 0 } }, /* 00c */
+    { .mk = {      0x0d, 0 }, .brk = {             0x8d, 0 } }, /* 00d */
+    { .mk = {      0x0e, 0 }, .brk = {             0x8e, 0 } }, /* 00e */
+    { .mk = {      0x0f, 0 }, .brk = {             0x8f, 0 } }, /* 00f */
+    { .mk = {      0x10, 0 }, .brk = {             0x90, 0 } }, /* 010 */
+    { .mk = {      0x11, 0 }, .brk = {             0x91, 0 } }, /* 011 */
+    { .mk = {      0x12, 0 }, .brk = {             0x92, 0 } }, /* 012 */
+    { .mk = {      0x13, 0 }, .brk = {             0x93, 0 } }, /* 013 */
+    { .mk = {      0x14, 0 }, .brk = {             0x94, 0 } }, /* 014 */
+    { .mk = {      0x15, 0 }, .brk = {             0x95, 0 } }, /* 015 */
+    { .mk = {      0x16, 0 }, .brk = {             0x96, 0 } }, /* 016 */
+    { .mk = {      0x17, 0 }, .brk = {             0x97, 0 } }, /* 017 */
+    { .mk = {      0x18, 0 }, .brk = {             0x98, 0 } }, /* 018 */
+    { .mk = {      0x19, 0 }, .brk = {             0x99, 0 } }, /* 019 */
+    { .mk = {      0x1a, 0 }, .brk = {             0x9a, 0 } }, /* 01a */
+    { .mk = {      0x1b, 0 }, .brk = {             0x9b, 0 } }, /* 01b */
+    { .mk = {      0x1c, 0 }, .brk = {             0x9c, 0 } }, /* 01c */
+    { .mk = {      0x1d, 0 }, .brk = {             0x9d, 0 } }, /* 01d */
+    { .mk = {      0x1e, 0 }, .brk = {             0x9e, 0 } }, /* 01e */
+    { .mk = {      0x1f, 0 }, .brk = {             0x9f, 0 } }, /* 01f */
+    { .mk = {      0x20, 0 }, .brk = {             0xa0, 0 } }, /* 020 */
+    { .mk = {      0x21, 0 }, .brk = {             0xa1, 0 } }, /* 021 */
+    { .mk = {      0x22, 0 }, .brk = {             0xa2, 0 } }, /* 022 */
+    { .mk = {      0x23, 0 }, .brk = {             0xa3, 0 } }, /* 023 */
+    { .mk = {      0x24, 0 }, .brk = {             0xa4, 0 } }, /* 024 */
+    { .mk = {      0x25, 0 }, .brk = {             0xa5, 0 } }, /* 025 */
+    { .mk = {      0x26, 0 }, .brk = {             0xa6, 0 } }, /* 026 */
+    { .mk = {      0x27, 0 }, .brk = {             0xa7, 0 } }, /* 027 */
+    { .mk = {      0x28, 0 }, .brk = {             0xa8, 0 } }, /* 028 */
+    { .mk = {      0x29, 0 }, .brk = {             0xa9, 0 } }, /* 029 */
+    { .mk = {      0x2a, 0 }, .brk = {             0xaa, 0 } }, /* 02a */
+    { .mk = {      0x2b, 0 }, .brk = {             0xab, 0 } }, /* 02b */
+    { .mk = {      0x2c, 0 }, .brk = {             0xac, 0 } }, /* 02c */
+    { .mk = {      0x2d, 0 }, .brk = {             0xad, 0 } }, /* 02d */
+    { .mk = {      0x2e, 0 }, .brk = {             0xae, 0 } }, /* 02e */
+    { .mk = {      0x2f, 0 }, .brk = {             0xaf, 0 } }, /* 02f */
+    { .mk = {      0x30, 0 }, .brk = {             0xb0, 0 } }, /* 030 */
+    { .mk = {      0x31, 0 }, .brk = {             0xb1, 0 } }, /* 031 */
+    { .mk = {      0x32, 0 }, .brk = {             0xb2, 0 } }, /* 032 */
+    { .mk = {      0x33, 0 }, .brk = {             0xb3, 0 } }, /* 033 */
+    { .mk = {      0x34, 0 }, .brk = {             0xb4, 0 } }, /* 034 */
+    { .mk = {      0x35, 0 }, .brk = {             0xb5, 0 } }, /* 035 */
+    { .mk = {      0x36, 0 }, .brk = {             0xb6, 0 } }, /* 036 */
+    { .mk = {      0x37, 0 }, .brk = {             0xb7, 0 } }, /* 037 */
+    { .mk = {      0x38, 0 }, .brk = {             0xb8, 0 } }, /* 038 */
+    { .mk = {      0x39, 0 }, .brk = {             0xb9, 0 } }, /* 039 */
+    { .mk = {      0x3a, 0 }, .brk = {             0xba, 0 } }, /* 03a */
+    { .mk = {      0x3b, 0 }, .brk = {             0xbb, 0 } }, /* 03b */
+    { .mk = {      0x3c, 0 }, .brk = {             0xbc, 0 } }, /* 03c */
+    { .mk = {      0x3d, 0 }, .brk = {             0xbd, 0 } }, /* 03d */
+    { .mk = {      0x3e, 0 }, .brk = {             0xbe, 0 } }, /* 03e */
+    { .mk = {      0x3f, 0 }, .brk = {             0xbf, 0 } }, /* 03f */
+    { .mk = {      0x40, 0 }, .brk = {             0xc0, 0 } }, /* 040 */
+    { .mk = {      0x41, 0 }, .brk = {             0xc1, 0 } }, /* 041 */
+    { .mk = {      0x42, 0 }, .brk = {             0xc2, 0 } }, /* 042 */
+    { .mk = {      0x43, 0 }, .brk = {             0xc3, 0 } }, /* 043 */
+    { .mk = {      0x44, 0 }, .brk = {             0xc4, 0 } }, /* 044 */
+    { .mk = {      0x45, 0 }, .brk = {             0xc5, 0 } }, /* 045 */
+    { .mk = {      0x46, 0 }, .brk = {             0xc6, 0 } }, /* 046 */
+    { .mk = {      0x47, 0 }, .brk = {             0xc7, 0 } }, /* 047 */
+    { .mk = {      0x48, 0 }, .brk = {             0xc8, 0 } }, /* 048 */
+    { .mk = {      0x49, 0 }, .brk = {             0xc9, 0 } }, /* 049 */
+    { .mk = {      0x4a, 0 }, .brk = {             0xca, 0 } }, /* 04a */
+    { .mk = {      0x4b, 0 }, .brk = {             0xcb, 0 } }, /* 04b */
+    { .mk = {      0x4c, 0 }, .brk = {             0xcc, 0 } }, /* 04c */
+    { .mk = {      0x4d, 0 }, .brk = {             0xcd, 0 } }, /* 04d */
+    { .mk = {      0x4e, 0 }, .brk = {             0xce, 0 } }, /* 04e */
+    { .mk = {      0x4f, 0 }, .brk = {             0xcf, 0 } }, /* 04f */
+    { .mk = {      0x50, 0 }, .brk = {             0xd0, 0 } }, /* 050 */
+    { .mk = {      0x51, 0 }, .brk = {             0xd1, 0 } }, /* 051 */
+    { .mk = {      0x52, 0 }, .brk = {             0xd2, 0 } }, /* 052 */
+    { .mk = {      0x53, 0 }, .brk = {             0xd3, 0 } }, /* 053 */
+    { .mk = {      0x54, 0 }, .brk = {             0xd4, 0 } }, /* 054 */
+    { .mk = {      0x55, 0 }, .brk = {             0xd5, 0 } }, /* 055 */
+    { .mk = {      0x56, 0 }, .brk = {             0xd6, 0 } }, /* 056 */
+    { .mk = {      0x57, 0 }, .brk = {             0xd7, 0 } }, /* 057 */
+    { .mk = {      0x58, 0 }, .brk = {             0xd8, 0 } }, /* 058 */
+    { .mk = {      0x59, 0 }, .brk = {             0xd9, 0 } }, /* 059 */
+    { .mk = {      0x5a, 0 }, .brk = {             0xda, 0 } }, /* 05a */
+    { .mk = {      0x5b, 0 }, .brk = {             0xdb, 0 } }, /* 05b */
+    { .mk = {      0x5c, 0 }, .brk = {             0xdc, 0 } }, /* 05c */
+    { .mk = {      0x5d, 0 }, .brk = {             0xdd, 0 } }, /* 05d */
+    { .mk = {      0x5e, 0 }, .brk = {             0xde, 0 } }, /* 05e */
+    { .mk = {      0x5f, 0 }, .brk = {             0xdf, 0 } }, /* 05f */
+    { .mk = {      0x60, 0 }, .brk = {             0xe0, 0 } }, /* 060 */
+    { .mk = {      0x61, 0 }, .brk = {             0xe1, 0 } }, /* 061 */
+    { .mk = {      0x62, 0 }, .brk = {             0xe2, 0 } }, /* 062 */
+    { .mk = {      0x63, 0 }, .brk = {             0xe3, 0 } }, /* 063 */
+    { .mk = {      0x64, 0 }, .brk = {             0xe4, 0 } }, /* 064 */
+    { .mk = {      0x65, 0 }, .brk = {             0xe5, 0 } }, /* 065 */
+    { .mk = {      0x66, 0 }, .brk = {             0xe6, 0 } }, /* 066 */
+    { .mk = {      0x67, 0 }, .brk = {             0xe7, 0 } }, /* 067 */
+    { .mk = {      0x68, 0 }, .brk = {             0xe8, 0 } }, /* 068 */
+    { .mk = {      0x69, 0 }, .brk = {             0xe9, 0 } }, /* 069 */
+    { .mk = {      0x6a, 0 }, .brk = {             0xea, 0 } }, /* 06a */
+    { .mk = {      0x6b, 0 }, .brk = {             0xeb, 0 } }, /* 06b */
+    { .mk = {      0x6c, 0 }, .brk = {             0xec, 0 } }, /* 06c */
+    { .mk = {      0x6d, 0 }, .brk = {             0xed, 0 } }, /* 06d */
+    { .mk = {      0x6e, 0 }, .brk = {             0xee, 0 } }, /* 06e */
+    { .mk = {      0x6f, 0 }, .brk = {             0xef, 0 } }, /* 06f */
+    { .mk = {      0x70, 0 }, .brk = {             0xf0, 0 } }, /* 070 */
+    { .mk = {      0x71, 0 }, .brk = {             0xf1, 0 } }, /* 071 */
+    { .mk = {      0x72, 0 }, .brk = {             0xf2, 0 } }, /* 072 */
+    { .mk = {      0x73, 0 }, .brk = {             0xf3, 0 } }, /* 073 */
+    { .mk = {      0x74, 0 }, .brk = {             0xf4, 0 } }, /* 074 */
+    { .mk = {      0x75, 0 }, .brk = {             0xf5, 0 } }, /* 075 */
+    { .mk = {      0x76, 0 }, .brk = {             0xf6, 0 } }, /* 076 */
+    { .mk = {      0x77, 0 }, .brk = {             0xf7, 0 } }, /* 077 */
+    { .mk = {      0x78, 0 }, .brk = {             0xf8, 0 } }, /* 078 */
+    { .mk = {      0x79, 0 }, .brk = {             0xf9, 0 } }, /* 079 */
+    { .mk = {      0x7a, 0 }, .brk = {             0xfa, 0 } }, /* 07a */
+    { .mk = {      0x7b, 0 }, .brk = {             0xfb, 0 } }, /* 07b */
+    { .mk = {      0x7c, 0 }, .brk = {             0xfc, 0 } }, /* 07c */
+    { .mk = {      0x7d, 0 }, .brk = {             0xfd, 0 } }, /* 07d */
+    { .mk = {      0x7e, 0 }, .brk = {             0xfe, 0 } }, /* 07e */
+    { .mk = {      0x7f, 0 }, .brk = {             0xff, 0 } }, /* 07f */
+    { .mk = {      0x80, 0 }, .brk = {                   0 } }, /* 080 */
+    { .mk = {      0x81, 0 }, .brk = {                   0 } }, /* 081 */
+    { .mk = {      0x82, 0 }, .brk = {                   0 } }, /* 082 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 083 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 084 */
+    { .mk = {      0x85, 0 }, .brk = {                   0 } }, /* 085 */
+    { .mk = {      0x86, 0 }, .brk = {                   0 } }, /* 086 */
+    { .mk = {      0x87, 0 }, .brk = {                   0 } }, /* 087 */
+    { .mk = {      0x88, 0 }, .brk = {                   0 } }, /* 088 */
+    { .mk = {      0x89, 0 }, .brk = {                   0 } }, /* 089 */
+    { .mk = {      0x8a, 0 }, .brk = {                   0 } }, /* 08a */
+    { .mk = {      0x8b, 0 }, .brk = {                   0 } }, /* 08b */
+    { .mk = {      0x8c, 0 }, .brk = {                   0 } }, /* 08c */
+    { .mk = {      0x8d, 0 }, .brk = {                   0 } }, /* 08d */
+    { .mk = {      0x8e, 0 }, .brk = {                   0 } }, /* 08e */
+    { .mk = {      0x8f, 0 }, .brk = {                   0 } }, /* 08f */
+    { .mk = {      0x90, 0 }, .brk = {                   0 } }, /* 090 */
+    { .mk = {      0x91, 0 }, .brk = {                   0 } }, /* 091 */
+    { .mk = {      0x92, 0 }, .brk = {                   0 } }, /* 092 */
+    { .mk = {      0x93, 0 }, .brk = {                   0 } }, /* 093 */
+    { .mk = {      0x94, 0 }, .brk = {                   0 } }, /* 094 */
+    { .mk = {      0x95, 0 }, .brk = {                   0 } }, /* 095 */
+    { .mk = {      0x96, 0 }, .brk = {                   0 } }, /* 096 */
+    { .mk = {      0x97, 0 }, .brk = {                   0 } }, /* 097 */
+    { .mk = {      0x98, 0 }, .brk = {                   0 } }, /* 098 */
+    { .mk = {      0x99, 0 }, .brk = {                   0 } }, /* 099 */
+    { .mk = {      0x9a, 0 }, .brk = {                   0 } }, /* 09a */
+    { .mk = {      0x9b, 0 }, .brk = {                   0 } }, /* 09b */
+    { .mk = {      0x9c, 0 }, .brk = {                   0 } }, /* 09c */
+    { .mk = {      0x9d, 0 }, .brk = {                   0 } }, /* 09d */
+    { .mk = {      0x9e, 0 }, .brk = {                   0 } }, /* 09e */
+    { .mk = {      0x9f, 0 }, .brk = {                   0 } }, /* 09f */
+    { .mk = {      0xa0, 0 }, .brk = {                   0 } }, /* 0a0 */
+    { .mk = {      0xa1, 0 }, .brk = {                   0 } }, /* 0a1 */
+    { .mk = {      0xa2, 0 }, .brk = {                   0 } }, /* 0a2 */
+    { .mk = {      0xa3, 0 }, .brk = {                   0 } }, /* 0a3 */
+    { .mk = {      0xa4, 0 }, .brk = {                   0 } }, /* 0a4 */
+    { .mk = {      0xa5, 0 }, .brk = {                   0 } }, /* 0a5 */
+    { .mk = {      0xa6, 0 }, .brk = {                   0 } }, /* 0a6 */
+    { .mk = {      0xa7, 0 }, .brk = {                   0 } }, /* 0a7 */
+    { .mk = {      0xa8, 0 }, .brk = {                   0 } }, /* 0a8 */
+    { .mk = {      0xa9, 0 }, .brk = {                   0 } }, /* 0a9 */
+    { .mk = {      0xaa, 0 }, .brk = {                   0 } }, /* 0aa */
+    { .mk = {      0xab, 0 }, .brk = {                   0 } }, /* 0ab */
+    { .mk = {      0xac, 0 }, .brk = {                   0 } }, /* 0ac */
+    { .mk = {      0xad, 0 }, .brk = {                   0 } }, /* 0ad */
+    { .mk = {      0xae, 0 }, .brk = {                   0 } }, /* 0ae */
+    { .mk = {      0xaf, 0 }, .brk = {                   0 } }, /* 0af */
+    { .mk = {      0xb0, 0 }, .brk = {                   0 } }, /* 0b0 */
+    { .mk = {      0xb1, 0 }, .brk = {                   0 } }, /* 0b1 */
+    { .mk = {      0xb2, 0 }, .brk = {                   0 } }, /* 0b2 */
+    { .mk = {      0xb3, 0 }, .brk = {                   0 } }, /* 0b3 */
+    { .mk = {      0xb4, 0 }, .brk = {                   0 } }, /* 0b4 */
+    { .mk = {      0xb5, 0 }, .brk = {                   0 } }, /* 0b5 */
+    { .mk = {      0xb6, 0 }, .brk = {                   0 } }, /* 0b6 */
+    { .mk = {      0xb7, 0 }, .brk = {                   0 } }, /* 0b7 */
+    { .mk = {      0xb8, 0 }, .brk = {                   0 } }, /* 0b8 */
+    { .mk = {      0xb9, 0 }, .brk = {                   0 } }, /* 0b9 */
+    { .mk = {      0xba, 0 }, .brk = {                   0 } }, /* 0ba */
+    { .mk = {      0xbb, 0 }, .brk = {                   0 } }, /* 0bb */
+    { .mk = {      0xbc, 0 }, .brk = {                   0 } }, /* 0bc */
+    { .mk = {      0xbd, 0 }, .brk = {                   0 } }, /* 0bd */
+    { .mk = {      0xbe, 0 }, .brk = {                   0 } }, /* 0be */
+    { .mk = {      0xbf, 0 }, .brk = {                   0 } }, /* 0bf */
+    { .mk = {      0xc0, 0 }, .brk = {                   0 } }, /* 0c0 */
+    { .mk = {      0xc1, 0 }, .brk = {                   0 } }, /* 0c1 */
+    { .mk = {      0xc2, 0 }, .brk = {                   0 } }, /* 0c2 */
+    { .mk = {      0xc3, 0 }, .brk = {                   0 } }, /* 0c3 */
+    { .mk = {      0xc4, 0 }, .brk = {                   0 } }, /* 0c4 */
+    { .mk = {      0xc5, 0 }, .brk = {                   0 } }, /* 0c5 */
+    { .mk = {      0xc6, 0 }, .brk = {                   0 } }, /* 0c6 */
+    { .mk = {      0xc7, 0 }, .brk = {                   0 } }, /* 0c7 */
+    { .mk = {      0xc8, 0 }, .brk = {                   0 } }, /* 0c8 */
+    { .mk = {      0xc9, 0 }, .brk = {                   0 } }, /* 0c9 */
+    { .mk = {      0xca, 0 }, .brk = {                   0 } }, /* 0ca */
+    { .mk = {      0xcb, 0 }, .brk = {                   0 } }, /* 0cb */
+    { .mk = {      0xcc, 0 }, .brk = {                   0 } }, /* 0cc */
+    { .mk = {      0xcd, 0 }, .brk = {                   0 } }, /* 0cd */
+    { .mk = {      0xce, 0 }, .brk = {                   0 } }, /* 0ce */
+    { .mk = {      0xcf, 0 }, .brk = {                   0 } }, /* 0cf */
+    { .mk = {      0xd0, 0 }, .brk = {                   0 } }, /* 0d0 */
+    { .mk = {      0xd1, 0 }, .brk = {                   0 } }, /* 0d1 */
+    { .mk = {      0xd2, 0 }, .brk = {                   0 } }, /* 0d2 */
+    { .mk = {      0xd3, 0 }, .brk = {                   0 } }, /* 0d3 */
+    { .mk = {      0xd4, 0 }, .brk = {                   0 } }, /* 0d4 */
+    { .mk = {      0xd5, 0 }, .brk = {                   0 } }, /* 0d5 */
+    { .mk = {      0xd6, 0 }, .brk = {                   0 } }, /* 0d6 */
+    { .mk = {      0xd7, 0 }, .brk = {                   0 } }, /* 0d7 */
+    { .mk = {      0xd8, 0 }, .brk = {                   0 } }, /* 0d8 */
+    { .mk = {      0xd9, 0 }, .brk = {                   0 } }, /* 0d9 */
+    { .mk = {      0xda, 0 }, .brk = {                   0 } }, /* 0da */
+    { .mk = {      0xdb, 0 }, .brk = {                   0 } }, /* 0db */
+    { .mk = {      0xdc, 0 }, .brk = {                   0 } }, /* 0dc */
+    { .mk = {      0xdd, 0 }, .brk = {                   0 } }, /* 0dd */
+    { .mk = {      0xde, 0 }, .brk = {                   0 } }, /* 0de */
+    { .mk = {      0xdf, 0 }, .brk = {                   0 } }, /* 0df */
+    { .mk = {      0xe0, 0 }, .brk = {                   0 } }, /* 0e0 */
+    { .mk = {      0xe1, 0 }, .brk = {                   0 } }, /* 0e1 */
+    { .mk = {      0xe2, 0 }, .brk = {                   0 } }, /* 0e2 */
+    { .mk = {      0xe3, 0 }, .brk = {                   0 } }, /* 0e3 */
+    { .mk = {      0xe4, 0 }, .brk = {                   0 } }, /* 0e4 */
+    { .mk = {      0xe5, 0 }, .brk = {                   0 } }, /* 0e5 */
+    { .mk = {      0xe6, 0 }, .brk = {                   0 } }, /* 0e6 */
+    { .mk = {      0xe7, 0 }, .brk = {                   0 } }, /* 0e7 */
+    { .mk = {      0xe8, 0 }, .brk = {                   0 } }, /* 0e8 */
+    { .mk = {      0xe9, 0 }, .brk = {                   0 } }, /* 0e9 */
+    { .mk = {      0xea, 0 }, .brk = {                   0 } }, /* 0ea */
+    { .mk = {      0xeb, 0 }, .brk = {                   0 } }, /* 0eb */
+    { .mk = {      0xec, 0 }, .brk = {                   0 } }, /* 0ec */
+    { .mk = {      0xed, 0 }, .brk = {                   0 } }, /* 0ed */
+    { .mk = {      0xee, 0 }, .brk = {                   0 } }, /* 0ee */
+    { .mk = {      0xef, 0 }, .brk = {                   0 } }, /* 0ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f0 */
+    { .mk = {      0xf1, 0 }, .brk = {                   0 } }, /* 0f1 */
+    { .mk = {      0xf2, 0 }, .brk = {                   0 } }, /* 0f2 */
+    { .mk = {      0xf3, 0 }, .brk = {                   0 } }, /* 0f3 */
+    { .mk = {      0xf4, 0 }, .brk = {                   0 } }, /* 0f4 */
+    { .mk = {      0xf5, 0 }, .brk = {                   0 } }, /* 0f5 */
+    { .mk = {      0xf6, 0 }, .brk = {                   0 } }, /* 0f6 */
+    { .mk = {      0xf7, 0 }, .brk = {                   0 } }, /* 0f7 */
+    { .mk = {      0xf8, 0 }, .brk = {                   0 } }, /* 0f8 */
+    { .mk = {      0xf9, 0 }, .brk = {                   0 } }, /* 0f9 */
+    { .mk = {      0xfa, 0 }, .brk = {                   0 } }, /* 0fa */
+    { .mk = {      0xfb, 0 }, .brk = {                   0 } }, /* 0fb */
+    { .mk = {      0xfc, 0 }, .brk = {                   0 } }, /* 0fc */
+    { .mk = {      0xfd, 0 }, .brk = {                   0 } }, /* 0fd */
+    { .mk = {      0xfe, 0 }, .brk = {                   0 } }, /* 0fe */
+    { .mk = {      0xff, 0 }, .brk = {                   0 } }, /* 0ff */
+    { .mk = {0xe1, 0x1d, 0 }, .brk = { 0xe1,       0x9d, 0 } }, /* 100 */
+    { .mk = {0xe0, 0x01, 0 }, .brk = { 0xe0,       0x81, 0 } }, /* 101 */
+    { .mk = {0xe0, 0x02, 0 }, .brk = { 0xe0,       0x82, 0 } }, /* 102 */
+    { .mk = {0xe0, 0x03, 0 }, .brk = { 0xe0,       0x83, 0 } }, /* 103 */
+    { .mk = {0xe0, 0x04, 0 }, .brk = { 0xe0,       0x84, 0 } }, /* 104 */
+    { .mk = {0xe0, 0x05, 0 }, .brk = { 0xe0,       0x85, 0 } }, /* 105 */
+    { .mk = {0xe0, 0x06, 0 }, .brk = { 0xe0,       0x86, 0 } }, /* 106 */
+    { .mk = {0xe0, 0x07, 0 }, .brk = { 0xe0,       0x87, 0 } }, /* 107 */
+    { .mk = {0xe0, 0x08, 0 }, .brk = { 0xe0,       0x88, 0 } }, /* 108 */
+    { .mk = {0xe0, 0x09, 0 }, .brk = { 0xe0,       0x89, 0 } }, /* 109 */
+    { .mk = {0xe0, 0x0a, 0 }, .brk = { 0xe0,       0x8a, 0 } }, /* 10a */
+    { .mk = {0xe0, 0x0b, 0 }, .brk = { 0xe0,       0x8b, 0 } }, /* 10b */
+    { .mk = {0xe0, 0x0c, 0 }, .brk = { 0xe0,       0x8c, 0 } }, /* 10c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10d */
+    { .mk = {0xe0, 0x0e, 0 }, .brk = { 0xe0,       0x8e, 0 } }, /* 10e */
+    { .mk = {0xe0, 0x0f, 0 }, .brk = { 0xe0,       0x8f, 0 } }, /* 10f */
+    { .mk = {0xe0, 0x10, 0 }, .brk = { 0xe0,       0x90, 0 } }, /* 110 */
+    { .mk = {0xe0, 0x11, 0 }, .brk = { 0xe0,       0x91, 0 } }, /* 111 */
+    { .mk = {0xe0, 0x12, 0 }, .brk = { 0xe0,       0x92, 0 } }, /* 112 */
+    { .mk = {0xe0, 0x13, 0 }, .brk = { 0xe0,       0x93, 0 } }, /* 113 */
+    { .mk = {0xe0, 0x14, 0 }, .brk = { 0xe0,       0x94, 0 } }, /* 114 */
+    { .mk = {0xe0, 0x15, 0 }, .brk = { 0xe0,       0x95, 0 } }, /* 115 */
+    { .mk = {0xe0, 0x16, 0 }, .brk = { 0xe0,       0x96, 0 } }, /* 116 */
+    { .mk = {0xe0, 0x17, 0 }, .brk = { 0xe0,       0x97, 0 } }, /* 117 */
+    { .mk = {0xe0, 0x18, 0 }, .brk = { 0xe0,       0x98, 0 } }, /* 118 */
+    { .mk = {0xe0, 0x19, 0 }, .brk = { 0xe0,       0x99, 0 } }, /* 119 */
+    { .mk = {0xe0, 0x1a, 0 }, .brk = { 0xe0,       0x9a, 0 } }, /* 11a */
+    { .mk = {0xe0, 0x1b, 0 }, .brk = { 0xe0,       0x9b, 0 } }, /* 11b */
+    { .mk = {0xe0, 0x1c, 0 }, .brk = { 0xe0,       0x9c, 0 } }, /* 11c */
+    { .mk = {0xe0, 0x1d, 0 }, .brk = { 0xe0,       0x9d, 0 } }, /* 11d */
+    { .mk = {0xe0, 0x1e, 0 }, .brk = { 0xe0,       0x9e, 0 } }, /* 11e */
+    { .mk = {0xe0, 0x1f, 0 }, .brk = { 0xe0,       0x9f, 0 } }, /* 11f */
+    { .mk = {0xe0, 0x20, 0 }, .brk = { 0xe0,       0xa0, 0 } }, /* 120 */
+    { .mk = {0xe0, 0x21, 0 }, .brk = { 0xe0,       0xa1, 0 } }, /* 121 */
+    { .mk = {0xe0, 0x22, 0 }, .brk = { 0xe0,       0xa2, 0 } }, /* 122 */
+    { .mk = {0xe0, 0x23, 0 }, .brk = { 0xe0,       0xa3, 0 } }, /* 123 */
+    { .mk = {0xe0, 0x24, 0 }, .brk = { 0xe0,       0xa4, 0 } }, /* 124 */
+    { .mk = {0xe0, 0x25, 0 }, .brk = { 0xe0,       0xa5, 0 } }, /* 125 */
+    { .mk = {0xe0, 0x26, 0 }, .brk = { 0xe0,       0xa6, 0 } }, /* 126 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 127 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 128 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 129 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12b */
+    { .mk = {0xe0, 0x2c, 0 }, .brk = { 0xe0,       0xac, 0 } }, /* 12c */
+    { .mk = {0xe0, 0x2d, 0 }, .brk = { 0xe0,       0xad, 0 } }, /* 12d */
+    { .mk = {0xe0, 0x2e, 0 }, .brk = { 0xe0,       0xae, 0 } }, /* 12e */
+    { .mk = {0xe0, 0x2f, 0 }, .brk = { 0xe0,       0xaf, 0 } }, /* 12f */
+    { .mk = {0xe0, 0x30, 0 }, .brk = { 0xe0,       0xb0, 0 } }, /* 130 */
+    { .mk = {0xe0, 0x31, 0 }, .brk = { 0xe0,       0xb1, 0 } }, /* 131 */
+    { .mk = {0xe0, 0x32, 0 }, .brk = { 0xe0,       0xb2, 0 } }, /* 132 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 133 */
+    { .mk = {0xe0, 0x34, 0 }, .brk = { 0xe0,       0xb4, 0 } }, /* 134 */
+    { .mk = {0xe0, 0x35, 0 }, .brk = { 0xe0,       0xb5, 0 } }, /* 135 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 136 */
+    { .mk = {0xe0, 0x37, 0 }, .brk = { 0xe0,       0xb7, 0 } }, /* 137 */
+    { .mk = {0xe0, 0x38, 0 }, .brk = { 0xe0,       0xb8, 0 } }, /* 138 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 139 */
+    { .mk = {0xe0, 0x3a, 0 }, .brk = { 0xe0,       0xba, 0 } }, /* 13a */
+    { .mk = {0xe0, 0x3b, 0 }, .brk = { 0xe0,       0xbb, 0 } }, /* 13b */
+    { .mk = {0xe0, 0x3c, 0 }, .brk = { 0xe0,       0xbc, 0 } }, /* 13c */
+    { .mk = {0xe0, 0x3d, 0 }, .brk = { 0xe0,       0xbd, 0 } }, /* 13d */
+    { .mk = {0xe0, 0x3e, 0 }, .brk = { 0xe0,       0xbe, 0 } }, /* 13e */
+    { .mk = {0xe0, 0x3f, 0 }, .brk = { 0xe0,       0xbf, 0 } }, /* 13f */
+    { .mk = {0xe0, 0x40, 0 }, .brk = { 0xe0,       0xc0, 0 } }, /* 140 */
+    { .mk = {0xe0, 0x41, 0 }, .brk = { 0xe0,       0xc1, 0 } }, /* 141 */
+    { .mk = {0xe0, 0x42, 0 }, .brk = { 0xe0,       0xc2, 0 } }, /* 142 */
+    { .mk = {0xe0, 0x43, 0 }, .brk = { 0xe0,       0xc3, 0 } }, /* 143 */
+    { .mk = {0xe0, 0x44, 0 }, .brk = { 0xe0,       0xc4, 0 } }, /* 144 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 145 */
+    { .mk = {0xe0, 0x46, 0 }, .brk = { 0xe0,       0xc6, 0 } }, /* 146 */
+    { .mk = {0xe0, 0x47, 0 }, .brk = { 0xe0,       0xc7, 0 } }, /* 147 */
+    { .mk = {0xe0, 0x48, 0 }, .brk = { 0xe0,       0xc8, 0 } }, /* 148 */
+    { .mk = {0xe0, 0x49, 0 }, .brk = { 0xe0,       0xc9, 0 } }, /* 149 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14a */
+    { .mk = {0xe0, 0x4b, 0 }, .brk = { 0xe0,       0xcb, 0 } }, /* 14b */
+    { .mk = {0xe0, 0x4c, 0 }, .brk = { 0xe0,       0xcc, 0 } }, /* 14c */
+    { .mk = {0xe0, 0x4d, 0 }, .brk = { 0xe0,       0xcd, 0 } }, /* 14d */
+    { .mk = {0xe0, 0x4e, 0 }, .brk = { 0xe0,       0xce, 0 } }, /* 14e */
+    { .mk = {0xe0, 0x4f, 0 }, .brk = { 0xe0,       0xcf, 0 } }, /* 14f */
+    { .mk = {0xe0, 0x50, 0 }, .brk = { 0xe0,       0xd0, 0 } }, /* 150 */
+    { .mk = {0xe0, 0x51, 0 }, .brk = { 0xe0,       0xd1, 0 } }, /* 151 */
+    { .mk = {0xe0, 0x52, 0 }, .brk = { 0xe0,       0xd2, 0 } }, /* 152 */
+    { .mk = {0xe0, 0x53, 0 }, .brk = { 0xe0,       0xd3, 0 } }, /* 153 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 154 */
+    { .mk = {0xe0, 0x55, 0 }, .brk = { 0xe0,       0xd5, 0 } }, /* 155 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 156 */
+    { .mk = {0xe0, 0x57, 0 }, .brk = { 0xe0,       0xd7, 0 } }, /* 157 */
+    { .mk = {0xe0, 0x58, 0 }, .brk = { 0xe0,       0xd8, 0 } }, /* 158 */
+    { .mk = {0xe0, 0x59, 0 }, .brk = { 0xe0,       0xd9, 0 } }, /* 159 */
+    { .mk = {0xe0, 0x5a, 0 }, .brk = { 0xe0,       0xaa, 0 } }, /* 15a */
+    { .mk = {0xe0, 0x5b, 0 }, .brk = { 0xe0,       0xdb, 0 } }, /* 15b */
+    { .mk = {0xe0, 0x5c, 0 }, .brk = { 0xe0,       0xdc, 0 } }, /* 15c */
+    { .mk = {0xe0, 0x5d, 0 }, .brk = { 0xe0,       0xdd, 0 } }, /* 15d */
+    { .mk = {0xe0, 0x5e, 0 }, .brk = { 0xe0,       0xee, 0 } }, /* 15e */
+    { .mk = {0xe0, 0x5f, 0 }, .brk = { 0xe0,       0xdf, 0 } }, /* 15f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 160 */
+    { .mk = {0xe0, 0x61, 0 }, .brk = { 0xe0,       0xe1, 0 } }, /* 161 */
+    { .mk = {0xe0, 0x62, 0 }, .brk = { 0xe0,       0xe2, 0 } }, /* 162 */
+    { .mk = {0xe0, 0x63, 0 }, .brk = { 0xe0,       0xe3, 0 } }, /* 163 */
+    { .mk = {0xe0, 0x64, 0 }, .brk = { 0xe0,       0xe4, 0 } }, /* 164 */
+    { .mk = {0xe0, 0x65, 0 }, .brk = { 0xe0,       0xe5, 0 } }, /* 165 */
+    { .mk = {0xe0, 0x66, 0 }, .brk = { 0xe0,       0xe6, 0 } }, /* 166 */
+    { .mk = {0xe0, 0x67, 0 }, .brk = { 0xe0,       0xe7, 0 } }, /* 167 */
+    { .mk = {0xe0, 0x68, 0 }, .brk = { 0xe0,       0xe8, 0 } }, /* 168 */
+    { .mk = {0xe0, 0x69, 0 }, .brk = { 0xe0,       0xe9, 0 } }, /* 169 */
+    { .mk = {0xe0, 0x6a, 0 }, .brk = { 0xe0,       0xea, 0 } }, /* 16a */
+    { .mk = {0xe0, 0x6b, 0 }, .brk = { 0xe0,       0xeb, 0 } }, /* 16b */
+    { .mk = {0xe0, 0x6c, 0 }, .brk = { 0xe0,       0xec, 0 } }, /* 16c */
+    { .mk = {0xe0, 0x6d, 0 }, .brk = { 0xe0,       0xed, 0 } }, /* 16d */
+    { .mk = {0xe0, 0x6e, 0 }, .brk = { 0xe0,       0xee, 0 } }, /* 16e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16f */
+    { .mk = {0xe0, 0x70, 0 }, .brk = { 0xe0,       0xf0, 0 } }, /* 170 */
+    { .mk = {0xe0, 0x71, 0 }, .brk = { 0xe0,       0xf1, 0 } }, /* 171 */
+    { .mk = {0xe0, 0x72, 0 }, .brk = { 0xe0,       0xf2, 0 } }, /* 172 */
+    { .mk = {0xe0, 0x73, 0 }, .brk = { 0xe0,       0xf3, 0 } }, /* 173 */
+    { .mk = {0xe0, 0x74, 0 }, .brk = { 0xe0,       0xf4, 0 } }, /* 174 */
+    { .mk = {0xe0, 0x75, 0 }, .brk = { 0xe0,       0xf5, 0 } }, /* 175 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 176 */
+    { .mk = {0xe0, 0x77, 0 }, .brk = { 0xe0,       0xf7, 0 } }, /* 177 */
+    { .mk = {0xe0, 0x78, 0 }, .brk = { 0xe0,       0xf8, 0 } }, /* 178 */
+    { .mk = {0xe0, 0x79, 0 }, .brk = { 0xe0,       0xf9, 0 } }, /* 179 */
+    { .mk = {0xe0, 0x7a, 0 }, .brk = { 0xe0,       0xfa, 0 } }, /* 17a */
+    { .mk = {0xe0, 0x7b, 0 }, .brk = { 0xe0,       0xfb, 0 } }, /* 17b */
+    { .mk = {0xe0, 0x7c, 0 }, .brk = { 0xe0,       0xfc, 0 } }, /* 17c */
+    { .mk = {0xe0, 0x7d, 0 }, .brk = { 0xe0,       0xfd, 0 } }, /* 17d */
+    { .mk = {0xe0, 0x7e, 0 }, .brk = { 0xe0,       0xfe, 0 } }, /* 17e */
+    { .mk = {0xe0, 0x7f, 0 }, .brk = { 0xe0,       0xff, 0 } }, /* 17f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 180 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 181 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 182 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 183 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 184 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 185 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 186 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 187 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 188 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 189 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 190 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 191 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 192 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 193 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 194 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 195 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 196 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 197 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 198 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 199 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e0 */
+    { .mk = {0xe0, 0xe1, 0 }, .brk = {                   0 } }, /* 1e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ed */
+    { .mk = {0xe0, 0xee, 0 }, .brk = {                   0 } }, /* 1ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f0 */
+    { .mk = {0xe0, 0xf1, 0 }, .brk = {                   0 } }, /* 1f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fd */
+    { .mk = {0xe0, 0xfe, 0 }, .brk = {                   0 } }, /* 1fe */
+    { .mk = {0xe0, 0xff, 0 }, .brk = {                   0 } }  /* 1ff */
   // clang-format on
 };
 
@@ -2485,8 +2954,7 @@ machine_amstrad_init(const machine_t *model, int type)
 {
     amstrad_t *ams;
 
-    ams = (amstrad_t *) malloc(sizeof(amstrad_t));
-    memset(ams, 0x00, sizeof(amstrad_t));
+    ams = (amstrad_t *) calloc(1, sizeof(amstrad_t));
     ams->type     = type;
     amstrad_latch = 0x80000000;
 
@@ -2505,8 +2973,10 @@ machine_amstrad_init(const machine_t *model, int type)
 
     nmi_init();
 
-    lpt1_remove_ams();
-    lpt2_remove();
+    ams->lpt = device_add_inst(&lpt_port_device, 1);
+
+    lpt1_remove_ams(ams->lpt);
+    lpt_set_next_inst(255);
 
     io_sethandler(0x0378, 3,
                   ams_read, NULL, NULL, ams_write, NULL, NULL, ams);
@@ -2555,7 +3025,7 @@ machine_amstrad_init(const machine_t *model, int type)
                 break;
 
             case AMS_PC1640:
-                loadfont("roms/video/mda/mda.rom", 0);
+                loadfont(FONT_IBM_MDA_437_PATH, 0);
                 device_context(&vid_1640_device);
                 ams->language = device_get_config_int("language");
                 vid_init_1640(ams);
@@ -2583,6 +3053,7 @@ machine_amstrad_init(const machine_t *model, int type)
                 device_context(&vid_pc3086_device);
                 ams->language = device_get_config_int("language");
                 device_context_restore();
+                device_add(&xta_wdxt150_pc3086_device);
                 device_add(&paradise_pvga1a_pc3086_device);
                 break;
 
@@ -2618,7 +3089,7 @@ machine_amstrad_init(const machine_t *model, int type)
         mouse_set_poll(ms_poll, ams);
     }
 
-    standalone_gameport_type = &gameport_device;
+    standalone_gameport_type = &gameport_200_device;
 }
 
 int
diff --git a/src/machine/m_at.c b/src/machine/m_at.c
deleted file mode 100644
index 9fc53ebcd..000000000
--- a/src/machine/m_at.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Standard PC/AT implementation.
- *
- *
- *
- * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
- *          Miran Grca, <mgrca8@gmail.com>
- *          Sarah Walker, <https://pcem-emulator.co.uk/>
- *
- *          Copyright 2017-2020 Fred N. van Kempen.
- *          Copyright 2016-2020 Miran Grca.
- *          Copyright 2008-2020 Sarah Walker.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free  Software  Foundation; either  version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is  distributed in the hope that it will be useful, but
- * WITHOUT   ANY  WARRANTY;  without  even   the  implied  warranty  of
- * MERCHANTABILITY  or FITNESS  FOR A PARTICULAR  PURPOSE. See  the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the:
- *
- *   Free Software Foundation, Inc.
- *   59 Temple Place - Suite 330
- *   Boston, MA 02111-1307
- *   USA.
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/timer.h>
-#include <86box/pic.h>
-#include <86box/pit.h>
-#include <86box/dma.h>
-#include <86box/mem.h>
-#include <86box/device.h>
-#include <86box/fdd.h>
-#include <86box/fdc.h>
-#include <86box/fdc_ext.h>
-#include <86box/nvr.h>
-#include <86box/gameport.h>
-#include <86box/keyboard.h>
-#include <86box/lpt.h>
-#include <86box/rom.h>
-#include <86box/hdc.h>
-#include <86box/port_6x.h>
-#include <86box/machine.h>
-
-void
-machine_at_common_init_ex(const machine_t *model, int type)
-{
-    machine_common_init(model);
-
-    refresh_at_enable = 1;
-    pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_at);
-    pic2_init();
-    dma16_init();
-
-    if (!(type & 4))
-        device_add(&port_6x_device);
-    type &= 3;
-
-    if (type == 1)
-        device_add(&ibmat_nvr_device);
-    else if (type == 0)
-        device_add(&at_nvr_device);
-
-    standalone_gameport_type = &gameport_device;
-}
-
-void
-machine_at_common_init(const machine_t *model)
-{
-    machine_at_common_init_ex(model, 0);
-}
-
-void
-machine_at_init(const machine_t *model)
-{
-    machine_at_common_init(model);
-
-    device_add(&keyboard_at_device);
-}
-
-static void
-machine_at_ibm_common_init(const machine_t *model)
-{
-    machine_at_common_init_ex(model, 1);
-
-    device_add(&keyboard_at_device);
-
-    mem_remap_top(384);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-}
-
-void
-machine_at_ps2_init(const machine_t *model)
-{
-    machine_at_common_init(model);
-
-    device_add(&keyboard_ps2_device);
-}
-
-void
-machine_at_common_ide_init(const machine_t *model)
-{
-    machine_at_common_init(model);
-
-    device_add(&ide_isa_device);
-}
-
-void
-machine_at_ibm_common_ide_init(const machine_t *model)
-{
-    machine_at_common_init_ex(model, 1);
-
-    device_add(&ide_isa_device);
-}
-
-void
-machine_at_ide_init(const machine_t *model)
-{
-    machine_at_init(model);
-
-    device_add(&ide_isa_device);
-}
-
-void
-machine_at_ps2_ide_init(const machine_t *model)
-{
-    machine_at_ps2_init(model);
-
-    device_add(&ide_isa_device);
-}
-
-int
-machine_at_ibm_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/ibmat/62x0820.u27",
-                                "roms/machines/ibmat/62x0821.u47",
-                                0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_ibm_common_init(model);
-
-    return ret;
-}
-
-/* IBM AT machines with custom BIOSes */
-int
-machine_at_ibmatquadtel_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/ibmatquadtel/BIOS_30MAR90_U27_QUADTEL_ENH_286_BIOS_3.05.01_27256.BIN",
-                                "roms/machines/ibmatquadtel/BIOS_30MAR90_U47_QUADTEL_ENH_286_BIOS_3.05.01_27256.BIN",
-                                0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_ibm_common_init(model);
-
-    return ret;
-}
-
-int
-machine_at_ibmatami_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/ibmatami/BIOS_5170_30APR89_U27_AMI_27256.BIN",
-                                "roms/machines/ibmatami/BIOS_5170_30APR89_U47_AMI_27256.BIN",
-                                0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_ibm_common_init(model);
-
-    return ret;
-}
-
-int
-machine_at_ibmatpx_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/ibmatpx/BIOS ROM - PhoenixBIOS A286 - Version 1.01 - Even.bin",
-                                "roms/machines/ibmatpx/BIOS ROM - PhoenixBIOS A286 - Version 1.01 - Odd.bin",
-                                0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_ibm_common_init(model);
-
-    return ret;
-}
-
-int
-machine_at_ibmxt286_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/ibmxt286/bios_5162_21apr86_u34_78x7460_27256.bin",
-                                "roms/machines/ibmxt286/bios_5162_21apr86_u35_78x7461_27256.bin",
-                                0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_ibm_common_init(model);
-
-    return ret;
-}
-
-int
-machine_at_siemens_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/siemens/286BIOS.BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 1);
-
-    device_add(&keyboard_at_siemens_device);
-
-    mem_remap_top(384);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-#if defined(DEV_BRANCH) && defined(USE_OPEN_AT)
-int
-machine_at_openat_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/openat/bios.bin",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_ibm_common_init(model);
-
-    return ret;
-}
-#endif
diff --git a/src/machine/m_at_286.c b/src/machine/m_at_286.c
new file mode 100644
index 000000000..f74ad5115
--- /dev/null
+++ b/src/machine/m_at_286.c
@@ -0,0 +1,1084 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of 286 machines.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          EngiNerd <webmaster.crrc@yahoo.it>
+ *
+ *          Copyright 2016-2025 Miran Grca.
+ *          Copyright 2020-2025 EngiNerd.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/chipset.h>
+#include <86box/keyboard.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/hdc.h>
+#include <86box/ibm_5161.h>
+#include <86box/nvr.h>
+#include <86box/port_6x.h>
+#define USE_SIO_DETECT
+#include <86box/sio.h>
+#include <86box/serial.h>
+#include <86box/video.h>
+#include <86box/vid_cga.h>
+#include <86box/vid_cga_comp.h>
+#include <86box/flash.h>
+#include <86box/machine.h>
+
+/* ISA */
+static const device_config_t ibmat_config[] = {
+    // clang-format off
+    {
+        .name           = "bios",
+        .description    = "BIOS Version",
+        .type           = CONFIG_BIOS,
+        .default_string = "ibm5170_111585",
+        .default_int    = 0,
+        .file_filter    = "",
+        .spinner        = { 0 },
+        .bios           = {
+            {
+                .name          = "62X082x (11/15/85)",
+                .internal_name = "ibm5170_111585",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 0,
+                .size          = 65536,
+                .files         = { "roms/machines/ibmat/BIOS_5170_15NOV85_U27.BIN", "roms/machines/ibmat/BIOS_5170_15NOV85_U47.BIN", "" }
+            },
+            {
+                .name          = "61X9266 (11/15/85) (Alt)",
+                .internal_name = "ibm5170_111585_alt",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 0,
+                .size          = 65536,
+                .files         = { "roms/machines/ibmat/BIOS_5170_15NOV85_U27_61X9266.BIN", "roms/machines/ibmat/BIOS_5170_15NOV85_U47_61X9265.BIN", "" }
+            },
+            {
+                .name          = "648009x (06/10/85)",
+                .internal_name = "ibm5170_061085",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 0,
+                .size          = 65536,
+                .files         = { "roms/machines/ibmat/BIOS_5170_10JUN85_U27.BIN", "roms/machines/ibmat/BIOS_5170_10JUN85_U47.BIN", "" }
+            },
+            {
+                .name          = "618102x (01/10/84)",
+                .internal_name = "ibm5170_011084",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 0,
+                .size          = 65536,
+                .files         = { "roms/machines/ibmat/BIOS_5170_10JAN84_U27.BIN", "roms/machines/ibmat/BIOS_5170_10JAN84_U47.BIN", "" }
+            },
+            // The following are Diagnostic ROMs.
+            {
+                .name          = "Supersoft Diagnostics",
+                .internal_name = "diag_supersoft",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 2,
+                .size          = 65536,
+                .files         = { "roms/machines/diagnostic/5170_EVEN_LOW_U27_27256.bin", "roms/machines/diagnostic/5170_ODD_HIGH_U47_27256.bin", "" }
+            },
+
+            { .files_no = 0 }
+        },
+    },
+    {
+        .name        = "enable_5161",
+        .description = "IBM 5161 Expansion Unit",
+        .type        = CONFIG_BINARY,
+        .default_int = 0
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t ibmat_device = {
+    .name          = "IBM AT",
+    .internal_name = "ibmat_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ibmat_config
+};
+
+static void
+machine_at_ibm_common_init(const machine_t *model)
+{
+    machine_at_common_init_ex(model, 1);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    mem_remap_top(384);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+}
+
+int
+machine_at_ibmat_init(const machine_t *model)
+{
+    int         ret = 0;
+    uint8_t     enable_5161;
+    const char *fn[2];
+
+    /* No ROMs available. */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    enable_5161  = machine_get_config_int("enable_5161");
+    fn[0]        = device_get_bios_file(model->device, device_get_config_bios("bios"), 0);
+    fn[1]        = device_get_bios_file(model->device, device_get_config_bios("bios"), 1);
+    ret          = bios_load_interleaved(fn[0], fn[1], 0x000f0000, 65536, 0);
+    device_context_restore();
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_ibm_common_init(model);
+
+    if (enable_5161)
+        device_add(&ibm_5161_device);
+
+    return ret;
+}
+
+static const device_config_t ibmxt286_config[] = {
+    // clang-format off
+    {
+        .name = "enable_5161",
+        .description = "IBM 5161 Expansion Unit",
+        .type = CONFIG_BINARY,
+        .default_int = 0
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t ibmxt286_device = {
+    .name          = "IBM XT Model 286",
+    .internal_name = "ibmxt286_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ibmxt286_config
+};
+
+int
+machine_at_ibmxt286_init(const machine_t *model)
+{
+    int     ret;
+    uint8_t enable_5161;
+
+    device_context(model->device);
+    enable_5161  = machine_get_config_int("enable_5161");
+    device_context_restore();
+
+    ret = bios_load_interleaved("roms/machines/ibmxt286/bios_5162_21apr86_u34_78x7460_27256.bin",
+                                "roms/machines/ibmxt286/bios_5162_21apr86_u35_78x7461_27256.bin",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_ibm_common_init(model);
+
+    if (enable_5161)
+        device_add(&ibm_5161_device);
+
+    return ret;
+}
+
+int
+machine_at_cmdpc_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/cmdpc30/commodore pc 30 iii even.bin",
+                                "roms/machines/cmdpc30/commodore pc 30 iii odd.bin",
+                                0x000f8000, 32768, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_init(model);
+
+    mem_remap_top(384);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add(&cbm_io_device);
+
+    return ret;
+}
+
+int
+machine_at_portableii_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleavedr("roms/machines/portableii/109740-001.rom",
+                                 "roms/machines/portableii/109739-001.rom",
+                                 0x000f8000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    video_reset(gfxcard[0]);
+
+    device_add(&compaq_device);
+
+    machine_at_common_init(model);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_portableiii_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linearr("roms/machines/portableiii/K Combined.bin",
+                                0x000f8000, 65536, 0);
+
+
+    if (bios_only || !ret)
+        return ret;
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    video_reset(gfxcard[0]);
+
+    if (hdc_current[0] == HDC_INTERNAL)
+        device_add(&ide_isa_device);
+  
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&compaq_plasma_device);
+
+    device_add(&compaq_device);
+
+    machine_at_common_init(model);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_grid1520_init(const machine_t *model) {
+    int ret = 0;
+
+    ret = bios_load_linear("roms/machines/grid1520/grid1520_891025.rom",
+                           0x000f8000, 0x8000, 0);
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_ide_init(model);
+    mem_remap_top(384);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    // for now just select CGA with amber monitor 
+    //device_add(&cga_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add(&grid1520_device);
+
+    return ret;
+}
+
+int
+machine_at_mr286_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/mr286/V000B200-1",
+                                "roms/machines/mr286/V000B200-2",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_ide_init(model);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+uint8_t
+machine_ncr_p1_handler(void)
+{
+    /* switch settings
+     * bit 7: keyboard disable
+     * bit 6: display type (0 color, 1 mono)
+     * bit 5: power-on default speed (0 high, 1 low)
+     * bit 4: sense RAM size (0 unsupported, 1 512k on system board)
+     * bit 3: coprocessor detect
+     * bit 2: unused
+     * bit 1: high/auto speed
+     * bit 0: dma mode
+     */
+    /* (B0 or F0) | 0x04 | (display on bit 6) | (fpu on bit 3) */
+    return (video_is_mda() ? 0x40 : 0x00) | (hasfpu ? 0x08 : 0x00) | 0x90;
+}
+
+/*
+ * Current bugs:
+ * - ctrl-alt-del produces an 8042 error
+ */
+int
+machine_at_pc8_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/pc8/ncr_35117_u127_vers.4-2.bin",
+                                "roms/machines/pc8/ncr_35116_u113_vers.4-2.bin",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+int
+machine_at_m290_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/m290/m290_pep3_1.25.bin",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 6);
+    device_add(&amstrad_megapc_nvr_device);
+
+    device_add(&olivetti_eva_device);
+    device_add(&port_6x_olivetti_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_pxat_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/ibmatpx/BIOS ROM - PhoenixBIOS A286 - Version 1.01 - Even.bin",
+                                "roms/machines/ibmatpx/BIOS ROM - PhoenixBIOS A286 - Version 1.01 - Odd.bin",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_ibm_common_init(model);
+
+    return ret;
+}
+
+int
+machine_at_quadtat_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/ibmatquadtel/BIOS_30MAR90_U27_QUADTEL_ENH_286_BIOS_3.05.01_27256.BIN",
+                                "roms/machines/ibmatquadtel/BIOS_30MAR90_U47_QUADTEL_ENH_286_BIOS_3.05.01_27256.BIN",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_ibm_common_init(model);
+
+    return ret;
+}
+
+int
+machine_at_pb286_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/pb286/LB_V332P.BIN",
+                                "roms/machines/pb286/HB_V332P.BIN",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_ibm_common_init(model);
+
+    return ret;
+}
+
+int
+machine_at_mbc17_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/mbc17/SAT200C_U45EVEN_FB3H2.bin",
+                                "roms/machines/mbc17/SAT200C_U44ODD_FB3J2.bin",
+                                0x000f8000, 32768, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_ide_init(model);
+    device_add(&sanyo_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+int
+machine_at_ax286_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/ax286/AM27C512@DIP28_even.BIN",
+                                "roms/machines/ax286/AM27C512@DIP28_odd.BIN",
+                                0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_ide_init(model);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+int
+machine_at_siemens_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/siemens/286BIOS.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 1);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    mem_remap_top(384);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+int
+machine_at_tbunk286_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/ibmatami/BIOS_5170_30APR89_U27_AMI_27256.BIN",
+                                "roms/machines/ibmatami/BIOS_5170_30APR89_U47_AMI_27256.BIN",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_ibm_common_init(model);
+
+    return ret;
+}
+
+/* C&T PC/AT */
+static void
+machine_at_ctat_common_init(const machine_t *model)
+{
+    machine_at_common_init(model);
+
+    device_add(&cs8220_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+}
+
+int
+machine_at_dells200_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/dells200/dellL200256_LO_@DIP28.BIN",
+                                "roms/machines/dells200/Dell200256_HI_@DIP28.BIN",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_ctat_common_init(model);
+
+    return ret;
+}
+
+int
+machine_at_super286c_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/super286c/hyundai_award286.bin",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add(&cs8220_device);
+
+    return ret;
+}
+
+int
+machine_at_at122_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/at122/FINAL.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_ctat_common_init(model);
+
+    return ret;
+}
+
+int
+machine_at_tuliptc7_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleavedr("roms/machines/tuliptc7/tc7be.bin",
+                                 "roms/machines/tuliptc7/tc7bo.bin",
+                                 0x000f8000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_ctat_common_init(model);
+
+    return ret;
+}
+
+int
+machine_at_wellamerastar_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/wellamerastar/W_3.031_L.BIN",
+                                "roms/machines/wellamerastar/W_3.031_H.BIN",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_ctat_common_init(model);
+
+    return ret;
+}
+
+/* GC103 */
+int
+machine_at_quadt286_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/quadt286/QUADT89L.ROM",
+                                "roms/machines/quadt286/QUADT89H.ROM",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add(&headland_gc10x_device);
+
+    return ret;
+}
+
+void
+machine_at_headland_common_init(const machine_t *model, int type)
+{
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if ((type != 2) && (fdc_current[0] == FDC_INTERNAL))
+        device_add(&fdc_at_device);
+
+    if (type == 2)
+        device_add(&headland_ht18b_device);
+    else if (type == 1)
+        device_add(&headland_gc113_device);
+    else
+        device_add(&headland_gc10x_device);
+}
+
+int
+machine_at_tg286m_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/tg286m/ami.bin",
+                           0x000f0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_ide_init(model);
+
+    machine_at_headland_common_init(model, 1);
+
+    return ret;
+}
+
+// TODO
+// Onboard Paradise PVGA1A-JK VGA Graphics
+// Data Technology Corporation DTC7187 RLL Controller (Optional)
+int
+machine_at_ataripc4_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/ataripc4/AMI_PC4X_1.7_EVEN.BIN",
+                                "roms/machines/ataripc4/AMI_PC4X_1.7_ODD.BIN",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&neat_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_neat_ami_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ami286/AMIC206.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&neat_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_3302_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/3302/f000-flex_drive_test.bin",
+                           0x000f0000, 65536, 0);
+
+    if (ret) {
+        ret &= bios_load_aux_linear("roms/machines/3302/f800-setup_ncr3.5-013190.bin",
+                                    0x000f8000, 32768, 0);
+    }
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_ide_init(model);
+    device_add(&neat_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_px286_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/px286/KENITEC.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add(&neat_device);
+
+    return ret;
+}
+
+/* SCAMP */
+int
+machine_at_pc7286_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/pc7286/PC7286 BIOS (AM27C010@DIP32).BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&gd5401_onboard_device);
+
+    device_add_params(&dw90c50_device, (void *) DW90C50_IDE);
+    device_add(&vl82c113_device); /* The keyboard controller is part of the VL82c113. */
+
+    device_add(&vlsi_scamp_device);
+
+    return ret;
+}
+
+/* SCAT */
+static void
+machine_at_scat_init(const machine_t *model, int is_v4, int is_ami)
+{
+    machine_at_common_init(model);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (is_v4)
+        device_add(&scat_4_device);
+    else
+        device_add(&scat_device);
+}
+
+int
+machine_at_pc5286_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/pc5286/PC5286",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    /* Patch the checksum to avoid checksum error. */
+    if (rom[0xffff] == 0x2c)
+        rom[0xffff] = 0x2b;
+
+    machine_at_scat_init(model, 1, 0);
+
+    device_add(&f82c710_device);
+
+    device_add(&ide_isa_device);
+
+    return ret;
+}
+
+int
+machine_at_gw286ct_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/gw286ct/2ctc001.bin",
+                           0x000f0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_scat_init(model, 1, 0);
+
+    device_add(&f82c710_device);
+
+    device_add(&ide_isa_device);
+
+    return ret;
+}
+
+int
+machine_at_gdc212m_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/gdc212m/gdc212m_72h.bin",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_scat_init(model, 0, 1);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add(&ide_isa_device);
+
+    return ret;
+}
+
+int
+machine_at_award286_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/award286/award.bin",
+                           0x000f0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_scat_init(model, 0, 1);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add(&ide_isa_device);
+
+    return ret;
+}
+
+int
+machine_at_super286tr_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/super286tr/hyundai_award286.bin",
+                           0x000f0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_scat_init(model, 0, 1);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+int
+machine_at_drsm35286_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/drsm35286/syab04-665821fb81363428830424.bin",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+	
+    device_add(&ide_isa_device);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C651 | FDC37C6XX_IDE_PRI));
+   
+    machine_at_scat_init(model, 1, 0);
+	
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    return ret;
+}
+
+int
+machine_at_deskmaster286_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/deskmaster286/SAMSUNG-DESKMASTER-28612-ROM.BIN",
+                           0x000f0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_scat_init(model, 0, 1);
+
+    device_add(&f82c710_device);
+        
+    device_add(&ide_isa_device);
+
+    return ret;
+}
+
+int
+machine_at_spc4200p_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/spc4200p/u8.01",
+                           0x000f0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_scat_init(model, 0, 1);
+
+    device_add(&f82c710_device);
+
+    device_add(&ide_isa_device);
+
+    return ret;
+}
+
+int
+machine_at_spc4216p_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/spc4216p/7101.U8",
+                                "roms/machines/spc4216p/AC64.U10",
+                                0x000f0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_scat_init(model, 1, 1);
+
+    device_add(&f82c710_device);
+
+    return ret;
+}
+
+int
+machine_at_spc4620p_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/spc4620p/31005h.u8",
+                                "roms/machines/spc4620p/31005h.u10",
+                                0x000f0000, 131072, 0x8000);
+
+    if (bios_only || !ret)
+        return ret;
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&ati28800k_spc4620p_device);
+
+    machine_at_scat_init(model, 1, 1);
+
+    device_add(&f82c710_device);
+
+    device_add(&ide_isa_device);
+
+    return ret;
+}
+
+int
+machine_at_senor_scat286_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/senor286/AMI-DSC2-1115-061390-K8.rom",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_scat_init(model, 0, 1);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
diff --git a/src/machine/m_at_286_386sx.c b/src/machine/m_at_286_386sx.c
deleted file mode 100644
index a688181b4..000000000
--- a/src/machine/m_at_286_386sx.c
+++ /dev/null
@@ -1,939 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Implementation of 286 and 386SX machines.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          EngiNerd <webmaster.crrc@yahoo.it>
- *
- *          Copyright 2016-2019 Miran Grca.
- *          Copyright 2020 EngiNerd.
- */
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <wchar.h>
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include "cpu.h"
-#include <86box/timer.h>
-#include <86box/io.h>
-#include <86box/device.h>
-#include <86box/chipset.h>
-#include <86box/keyboard.h>
-#include <86box/mem.h>
-#include <86box/rom.h>
-#include <86box/fdd.h>
-#include <86box/fdc.h>
-#include <86box/fdc_ext.h>
-#include <86box/hdc.h>
-#include <86box/nvr.h>
-#include <86box/port_6x.h>
-#include <86box/sio.h>
-#include <86box/serial.h>
-#include <86box/video.h>
-#include <86box/vid_cga.h>
-#include <86box/flash.h>
-#include <86box/machine.h>
-
-int
-machine_at_mr286_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/mr286/V000B200-1",
-                                "roms/machines/mr286/V000B200-2",
-                                0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_ide_init(model);
-    device_add(&keyboard_at_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-static void
-machine_at_headland_common_init(int type)
-{
-    device_add(&keyboard_at_ami_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    if (type == 2)
-        device_add(&headland_ht18b_device);
-    else if (type == 1)
-        device_add(&headland_gc113_device);
-    else
-        device_add(&headland_gc10x_device);
-}
-
-int
-machine_at_tg286m_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/tg286m/ami.bin",
-                           0x000f0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_ide_init(model);
-
-    machine_at_headland_common_init(1);
-
-    return ret;
-}
-
-int
-machine_at_ama932j_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/ama932j/ami.bin",
-                           0x000f0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_ide_init(model);
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&oti067_ama932j_device);
-
-    machine_at_headland_common_init(2);
-
-    return ret;
-}
-
-int
-machine_at_quadt286_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/quadt286/QUADT89L.ROM",
-                                "roms/machines/quadt286/QUADT89H.ROM",
-                                0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add(&keyboard_at_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&headland_gc10x_device);
-
-    return ret;
-}
-
-int
-machine_at_quadt386sx_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/quadt386sx/QTC-SXM-EVEN-U3-05-07.BIN",
-                                "roms/machines/quadt386sx/QTC-SXM-ODD-U3-05-07.BIN",
-                                0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add(&keyboard_at_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&headland_gc10x_device);
-
-    return ret;
-}
-
-int
-machine_at_neat_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/dtk386/3cto001.bin",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_init(model);
-
-    device_add(&neat_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-int
-machine_at_neat_ami_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/ami286/AMIC206.BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&neat_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&keyboard_at_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_px286_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/px286/KENITEC.BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add(&keyboard_at_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&neat_device);
-
-    return ret;
-}
-
-int
-machine_at_micronics386_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/micronics386/386-Micronics-09-00021-EVEN.BIN",
-                                "roms/machines/micronics386/386-Micronics-09-00021-ODD.BIN",
-                                0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_init(model);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-static void
-machine_at_scat_init(const machine_t *model, int is_v4, int is_ami)
-{
-    machine_at_common_init(model);
-
-    if (machines[machine].bus_flags & MACHINE_BUS_PS2) {
-        if (is_ami)
-            device_add(&keyboard_ps2_ami_device);
-        else
-            device_add(&keyboard_ps2_device);
-    } else {
-        if (is_ami)
-            device_add(&keyboard_at_ami_device);
-        else
-            device_add(&keyboard_at_device);
-    }
-
-    if (is_v4)
-        device_add(&scat_4_device);
-    else
-        device_add(&scat_device);
-}
-
-static void
-machine_at_scatsx_init(const machine_t *model)
-{
-    machine_at_common_init(model);
-
-    device_add(&keyboard_at_ami_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&scat_sx_device);
-}
-
-int
-machine_at_award286_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/award286/award.bin",
-                           0x000f0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_scat_init(model, 0, 1);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&ide_isa_device);
-
-    return ret;
-}
-
-int
-machine_at_gdc212m_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/gdc212m/gdc212m_72h.bin",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_scat_init(model, 0, 1);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&ide_isa_device);
-
-    return ret;
-}
-
-int
-machine_at_gw286ct_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/gw286ct/2ctc001.bin",
-                           0x000f0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    device_add(&f82c710_device);
-
-    machine_at_scat_init(model, 1, 0);
-
-    device_add(&ide_isa_device);
-
-    return ret;
-}
-
-int
-machine_at_super286c_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/super286c/hyundai_award286.bin",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&keyboard_at_ami_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&neat_device);
-
-    return ret;
-}
-
-int
-machine_at_super286tr_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/super286tr/hyundai_award286.bin",
-                           0x000f0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_scat_init(model, 0, 1);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-int
-machine_at_spc4200p_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/spc4200p/u8.01",
-                           0x000f0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_scat_init(model, 0, 1);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&ide_isa_device);
-
-    return ret;
-}
-
-int
-machine_at_spc4216p_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/spc4216p/7101.U8",
-                                "roms/machines/spc4216p/AC64.U10",
-                                0x000f0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_scat_init(model, 1, 1);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-int
-machine_at_spc4620p_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/spc4620p/31005h.u8",
-                                "roms/machines/spc4620p/31005h.u10",
-                                0x000f0000, 131072, 0x8000);
-
-    if (bios_only || !ret)
-        return ret;
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&ati28800k_spc4620p_device);
-
-    machine_at_scat_init(model, 1, 1);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&ide_isa_device);
-
-    return ret;
-}
-
-int
-machine_at_kmxc02_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/kmxc02/3ctm005.bin",
-                           0x000f0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_scatsx_init(model);
-
-    return ret;
-}
-
-int
-machine_at_deskmaster286_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/deskmaster286/SAMSUNG-DESKMASTER-28612-ROM.BIN",
-                           0x000f0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_scat_init(model, 0, 1);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-        
-    device_add(&ide_isa_device);
-
-    return ret;
-}
-
-int
-machine_at_shuttle386sx_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/shuttle386sx/386-Shuttle386SX-Even.BIN",
-                                "roms/machines/shuttle386sx/386-Shuttle386SX-Odd.BIN",
-                                0x000f0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&intel_82335_device);
-    device_add(&keyboard_at_ami_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-int
-machine_at_adi386sx_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/adi386sx/3iip001l.bin",
-                                "roms/machines/adi386sx/3iip001h.bin",
-                                0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-    device_add(&amstrad_megapc_nvr_device); /* NVR that is initialized to all 0x00's. */
-
-    device_add(&intel_82335_device);
-    device_add(&keyboard_at_ami_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-int
-machine_at_wd76c10_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/megapc/41651-bios lo.u18",
-                                "roms/machines/megapc/211253-bios hi.u19",
-                                0x000f0000, 65536, 0x08000);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&paradise_wd90c11_megapc_device);
-
-    device_add(&keyboard_ps2_quadtel_device);
-
-    device_add(&wd76c10_device);
-
-    return ret;
-}
-
-int
-machine_at_cmdsl386sx16_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/cmdsl386sx16/cbm-sl386sx-bios-lo-v1.04-390914-04.bin",
-                                "roms/machines/cmdsl386sx16/cbm-sl386sx-bios-hi-v1.04-390915-04.bin",
-                                0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_ide_init(model);
-
-    device_add(&keyboard_at_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&neat_device);
-    /* Two serial ports - on the real hardware SL386SX-16, they are on the single UMC UM82C452. */
-    device_add_inst(&ns16450_device, 1);
-    device_add_inst(&ns16450_device, 2);
-
-    return ret;
-}
-
-static void
-machine_at_scamp_common_init(const machine_t *model, int is_ps2)
-{
-    machine_at_common_ide_init(model);
-
-    if (is_ps2)
-        device_add(&keyboard_ps2_ami_device);
-    else
-        device_add(&keyboard_at_ami_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&vlsi_scamp_device);
-}
-
-int
-machine_at_cmdsl386sx25_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/cmdsl386sx25/f000.rom",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&gd5402_onboard_device);
-
-    machine_at_scamp_common_init(model, 1);
-
-    return ret;
-}
-
-int
-machine_at_dataexpert386sx_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/dataexpert386sx/5e9f20e5ef967717086346.BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_scamp_common_init(model, 0);
-
-    return ret;
-}
-
-int
-machine_at_spc6033p_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/spc6033p/phoenix.BIN",
-                           0x000f0000, 65536, 0x10000);
-
-    if (bios_only || !ret)
-        return ret;
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&ati28800k_spc6033p_device);
-
-    machine_at_scamp_common_init(model, 1);
-
-    return ret;
-}
-
-int
-machine_at_awardsx_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/awardsx/Unknown 386SX OPTi291 - Award (original).BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_init(model);
-
-    device_add(&opti291_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-int
-machine_at_arb1374_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/arb1374/1374s.rom",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&ali1217_device);
-    device_add(&w83787f_ide_en_device);
-    device_add(&keyboard_ps2_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_sbc350a_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/sbc350a/350a.rom",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&ali1217_device);
-    device_add(&fdc37c665_ide_device);
-    device_add(&keyboard_ps2_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_flytech386_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/flytech386/FLYTECH.BIO",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&ali1217_device);
-    device_add(&w83787f_ide_en_device);
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&tvga8900d_device);
-
-    device_add(&keyboard_at_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_325ax_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/325ax/M27C512.BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&ali1217_device);
-    device_add(&fdc_at_device);
-    device_add(&keyboard_at_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_mr1217_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/mr1217/mrbios.BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&ali1217_device);
-    device_add(&fdc_at_device);
-    device_add(&keyboard_at_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_pja511m_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/pja511m/2006915102435734.rom",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add_inst(&fdc37c669_device, 1);
-    device_add_inst(&fdc37c669_device, 2);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&ali6117d_device);
-    device_add(&sst_flash_29ee010_device);
-
-    return ret;
-}
-
-int
-machine_at_prox1332_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/prox1332/D30B3AC1.BIN",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&fdc37c669_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&ali6117d_device);
-    device_add(&sst_flash_29ee010_device);
-
-    return ret;
-}
-
-/*
- * Current bugs:
- * - ctrl-alt-del produces an 8042 error
- */
-int
-machine_at_pc8_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/pc8/ncr_35117_u127_vers.4-2.bin",
-                                "roms/machines/pc8/ncr_35116_u113_vers.4-2.bin",
-                                0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add(&keyboard_at_ncr_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-int
-machine_at_3302_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/3302/f000-flex_drive_test.bin",
-                           0x000f0000, 65536, 0);
-
-    if (ret) {
-        ret &= bios_load_aux_linear("roms/machines/3302/f800-setup_ncr3.5-013190.bin",
-                                    0x000f8000, 32768, 0);
-    }
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_ide_init(model);
-    device_add(&neat_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&paradise_pvga1a_ncr3302_device);
-
-    device_add(&keyboard_at_ncr_device);
-
-    return ret;
-}
-
-/*
- * Current bugs:
- * - soft-reboot after saving CMOS settings/pressing ctrl-alt-del produces an 8042 error
- */
-int
-machine_at_pc916sx_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/pc916sx/ncr_386sx_u46-17_7.3.bin",
-                                "roms/machines/pc916sx/ncr_386sx_u12-19_7.3.bin",
-                                0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&keyboard_at_ncr_device);
-    mem_remap_top(384);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-#if defined(DEV_BRANCH) && defined(USE_OLIVETTI)
-int
-machine_at_m290_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/m290/m290_pep3_1.25.bin",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 4);
-    device_add(&keyboard_at_olivetti_device);
-    device_add(&port_6x_olivetti_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&olivetti_eva_device);
-
-    return ret;
-}
-#endif
diff --git a/src/machine/m_at_386dx.c b/src/machine/m_at_386dx.c
new file mode 100644
index 000000000..9cb7c5223
--- /dev/null
+++ b/src/machine/m_at_386dx.c
@@ -0,0 +1,412 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of 386DX machines.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2016-2025 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/chipset.h>
+#include <86box/keyboard.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/pci.h>
+#include <86box/dma.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/gameport.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/rom.h>
+#include <86box/sio.h>
+#include <86box/hdc.h>
+#include <86box/port_6x.h>
+#include <86box/port_92.h>
+#include <86box/video.h>
+#include <86box/vid_cga.h>
+#include <86box/vid_cga_comp.h>
+#include <86box/flash.h>
+#include <86box/scsi_ncr53c8xx.h>
+#include <86box/hwm.h>
+#include <86box/machine.h>
+#include <86box/plat_unused.h>
+#include <86box/sound.h>
+
+/* ISA */
+uint8_t
+machine_compaq_p1_handler(void)
+{
+    return machine_generic_p1_handler() | (hasfpu ? 0x00 : 0x04);
+}
+
+static const device_config_t deskpro386_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "deskpro386",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "September 1986", .internal_name = "deskpro386", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 65536, .files = { "roms/machines/deskpro386/1986-09-04-HI.json.bin", "" } },
+            { .name = "May 1988", .internal_name = "deskpro386_05_1988", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 65536, .files = { "roms/machines/deskpro386/1988-05-10.json.bin", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t deskpro386_device = {
+    .name          = "Compaq Deskpro 386",
+    .internal_name = "deskpro386_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = deskpro386_config
+};
+
+int
+machine_at_deskpro386_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linearr(fn, 0x000f8000, 65536, 0);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    video_reset(gfxcard[0]);
+
+    device_add(&compaq_386_device);
+
+    machine_at_common_init(model);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_portableiii386_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linearr("roms/machines/portableiii/P.2 Combined.bin",
+                                0x000f0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    video_reset(gfxcard[0]);
+
+    if (hdc_current[0] == HDC_INTERNAL)
+        device_add(&ide_isa_device);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&compaq_plasma_device);
+
+    device_add(&compaq_386_device);
+
+    machine_at_common_init(model);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_micronics386_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/micronics386/386-Micronics-09-00021-EVEN.BIN",
+                                "roms/machines/micronics386/386-Micronics-09-00021-ODD.BIN",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_init(model);
+
+    device_add(&port_92_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+int
+machine_at_micronics386px_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/micronics386/386-Micronics-09-00021-LO.BIN",
+                                "roms/machines/micronics386/386-Micronics-09-00021-HI.BIN",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_init(model);
+
+    device_add(&port_92_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* ACC 2168 */
+int
+machine_at_acc386_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/acc386/acc386.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&acc2168_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* C&T 386/AT */
+int
+machine_at_ecs386_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/ecs386/AMI BIOS for ECS-386_32 motherboard - L chip.bin",
+                                "roms/machines/ecs386/AMI BIOS for ECS-386_32 motherboard - H chip.bin",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&cs8230_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_spc6000a_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/spc6000a/3c80.u27",
+                                "roms/machines/spc6000a/9f80.u26",
+                                0x000f8000, 32768, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 1);
+
+    device_add(&cs8230_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_tandy4000_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/tandy4000/BIOS Tandy 4000 v1.03.01.bin",
+                           0x000f8000, 32768, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&cs8230_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* ALi M1429 */
+int
+machine_at_ecs386v_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ecs386v/PANDA_386V.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&ali1429_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* OPTi 391 */
+int
+machine_at_dataexpert386wb_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/dataexpert386wb/st0386-wb-ver2-0-618f078c738cb397184464.bin",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&opti391_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* OPTi 495SLC */
+int
+machine_at_opti495_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/award495/opt495s.awa",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&opti495slc_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* SiS 310 */
+int
+machine_at_asus3863364k_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/asus3863364k/am27c512dip28-64b53c26be3d8160533563.bin",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&rabbit_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+int
+machine_at_asus386_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/asus386/ASUS_ISA-386C_BIOS.bin",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&rabbit_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c
index 5a47af620..2942180bb 100644
--- a/src/machine/m_at_386dx_486.c
+++ b/src/machine/m_at_386dx_486.c
@@ -6,13 +6,11 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          Implementation of 386DX and 486 machines.
- *
- *
+ *          Implementation of 386DX/486 machines.
  *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2016-2020 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  */
 #include <stdarg.h>
 #include <stdint.h>
@@ -41,539 +39,16 @@
 #include <86box/sio.h>
 #include <86box/hdc.h>
 #include <86box/port_6x.h>
+#include <86box/port_92.h>
 #include <86box/video.h>
 #include <86box/flash.h>
 #include <86box/scsi_ncr53c8xx.h>
 #include <86box/hwm.h>
 #include <86box/machine.h>
 #include <86box/plat_unused.h>
+#include <86box/sound.h>
 
-int
-machine_at_acc386_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/acc386/acc386.BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add(&acc2168_device);
-    device_add(&keyboard_at_ami_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-int
-machine_at_asus386_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/asus386/ASUS_ISA-386C_BIOS.bin",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add(&rabbit_device);
-    device_add(&keyboard_at_ami_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-static void
-machine_at_sis401_common_init(const machine_t *model)
-{
-    machine_at_common_init(model);
-    device_add(&sis_85c401_device);
-    device_add(&keyboard_at_ami_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-}
-
-int
-machine_at_sis401_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/sis401/SIS401-2.AMI",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_sis401_common_init(model);
-
-    return ret;
-}
-
-int
-machine_at_isa486_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/isa486/ISA-486.BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_sis401_common_init(model);
-
-    return ret;
-}
-
-int
-machine_at_av4_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/av4/amibios_486dx_isa_bios_aa4025963.bin",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add(&sis_85c460_device);
-    device_add(&keyboard_at_ami_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-int
-machine_at_valuepoint433_init(const machine_t *model) // hangs without the PS/2 mouse
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/valuepoint433/$IMAGEP.FLH",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_ide_init(model);
-    device_add(&sis_85c461_device);
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&et4000w32_onboard_device);
-
-    device_add(&keyboard_ps2_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-int
-machine_at_ecs386_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/ecs386/AMI BIOS for ECS-386_32 motherboard - L chip.bin",
-                                "roms/machines/ecs386/AMI BIOS for ECS-386_32 motherboard - H chip.bin",
-                                0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add(&cs8230_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&keyboard_at_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_spc6000a_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/spc6000a/3c80.u27",
-                                "roms/machines/spc6000a/9f80.u26",
-                                0x000f8000, 32768, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 1);
-    device_add(&cs8230_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&keyboard_at_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_ecs386v_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/ecs386v/PANDA_386V.BIN",
-               0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-    return ret;
-
-    machine_at_common_init(model);
-    device_add(&ali1429_device);
-    device_add(&keyboard_ps2_intel_ami_pci_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-int
-machine_at_rycleopardlx_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/rycleopardlx/486-RYC-Leopard-LX.BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&opti283_device);
-    device_add(&keyboard_at_ami_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-int
-machine_at_486vchd_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/486vchd/486-4386-VC-HD.BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&via_vt82c49x_device);
-    device_add(&keyboard_at_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-int
-machine_at_cs4031_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/cs4031/CHIPS_1.AMI",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add(&cs4031_device);
-    device_add(&keyboard_at_ami_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-int
-machine_at_pb410a_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/pb410a/pb410a.080337.4abf.u25.bin",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_ibm_common_ide_init(model);
-
-    device_add(&keyboard_ps2_device);
-
-    device_add(&acc3221_device);
-    device_add(&acc2168_device);
-
-    device_add(&phoenix_486_jumper_device);
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&ht216_32_pb410a_device);
-
-    return ret;
-}
-
-int
-machine_at_vect486vl_init(const machine_t *model) // has HDC problems
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/vect486vl/aa0500.ami",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_ide_init(model);
-
-    device_add(&vl82c480_device);
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&gd5428_onboard_device);
-
-    device_add(&keyboard_ps2_ami_device);
-    device_add(&fdc37c651_ide_device);
-
-    return ret;
-}
-
-int
-machine_at_d824_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/d824/fts-biosupdated824noflashbiosepromv320-320334-160.bin",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&vl82c480_device);
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&gd5428_onboard_device);
-
-    device_add(&keyboard_ps2_device);
-    device_add(&fdc37c651_device);
-
-    return ret;
-}
-
-int
-machine_at_acera1g_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/acera1g/4alo001.bin",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add(&ali1429g_device);
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&gd5428_onboard_device);
-
-    device_add(&keyboard_ps2_acer_pci_device);
-
-    device_add(&ali5105_device);
-    device_add(&ide_ali5213_device);
-
-    return ret;
-}
-
-int
-machine_at_acerv10_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/acerv10/ALL.BIN",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&sis_85c461_device);
-    device_add(&keyboard_ps2_acer_pci_device);
-    device_add(&ide_isa_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-int
-machine_at_decpclpv_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/decpclpv/bios.bin",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&sis_85c461_device);
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&s3_86c805_onboard_vlb_device);
-
-    /* TODO: Phoenix MultiKey KBC */
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&ide_isa_2ch_device);
-    device_add(&fdc37c663_ide_device);
-
-    return ret;
-}
-
-static void
-machine_at_ali1429_common_init(const machine_t *model, int is_green)
-{
-    machine_at_common_init(model);
-
-    if (is_green)
-        device_add(&ali1429g_device);
-    else
-        device_add(&ali1429_device);
-
-    device_add(&keyboard_at_ami_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-}
-
-int
-machine_at_ali1429_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/ali1429/ami486.BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_ali1429_common_init(model, 0);
-
-    return ret;
-}
-
-int
-machine_at_winbios1429_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/win486/ali1429g.amw",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_ali1429_common_init(model, 1);
-
-    return ret;
-}
-
-int
-machine_at_opti495_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/award495/opt495s.awa",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&opti495_device);
-
-    device_add(&keyboard_at_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-static void
-machine_at_opti495_ami_common_init(const machine_t *model)
-{
-    machine_at_common_init(model);
-
-    device_add(&opti495_device);
-
-    device_add(&keyboard_at_ami_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-}
-
-int
-machine_at_opti495_ami_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/ami495/opt495sx.ami",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_opti495_ami_common_init(model);
-
-    return ret;
-}
-
-int
-machine_at_opti495_mr_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/mr495/opt495sx.mr",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_opti495_ami_common_init(model);
-
-    return ret;
-}
-
+/* ALi M1429G */
 int
 machine_at_exp4349_init(const machine_t *model)
 {
@@ -588,322 +63,22 @@ machine_at_exp4349_init(const machine_t *model)
     machine_at_common_init(model);
 
     device_add(&ali1429g_device);
-    device_add(&keyboard_at_ami_device);
 
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-    return ret;
-}
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
 
-static void
-machine_at_403tg_common_init(const machine_t *model, int nvr_hack)
-{
-    if (nvr_hack) {
-        machine_at_common_init_ex(model, 2);
-        device_add(&ami_1994_nvr_device);
-    } else
-        machine_at_common_init(model);
-
-    device_add(&opti895_device);
-
-    device_add(&keyboard_at_ami_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-}
-
-int
-machine_at_403tg_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/403tg/403TG.BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_403tg_common_init(model, 0);
-
-    return ret;
-}
-
-int
-machine_at_403tg_d_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/403tg_d/J403TGRevD.BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_403tg_common_init(model, 1);
-
-    return ret;
-}
-
-int
-machine_at_403tg_d_mr_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/403tg_d/MRBiosOPT895.bin",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_403tg_common_init(model, 0);
-
-    return ret;
-}
-
-int
-machine_at_pb450_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/pb450/OPTI802.BIN",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x11, PCI_CARD_NORMAL,      5, 4, 3, 2);
-    pci_register_slot(0x12, PCI_CARD_NORMAL,      9, 8, 7, 6);
-
-    device_add(&opti895_device);
-    device_add(&opti822_device);
-    device_add(&keyboard_ps2_intel_ami_pci_device);
-    device_add(&fdc37c661_ide_device);
-    device_add(&ide_opti611_vlb_sec_device);
-    device_add(&ide_vlb_2ch_device);
-    device_add(&intel_flash_bxt_device);
-    device_add(&phoenix_486_jumper_pci_device);
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&gd5428_vlb_onboard_device);
-
-    return ret;
-}
-
-int
-machine_at_pc330_6573_init(const machine_t *model) /* doesn't like every CPU other than the iDX4 and the Intel OverDrive, hangs without a PS/2 mouse */
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/pc330_6573/$IMAGES.USF",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-    device_add(&ide_vlb_2ch_device);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE,  0,  0,  0,  0);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,       1,  2,  3,  4);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,       5,  6,  7,  8);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,       9, 10, 11, 12);
-    /* This is a guess because the BIOS always gives it a video BIOS
-       and never gives it an IRQ, so it is impossible to known for
-       certain until we obtain PCI readouts from the real machine. */
-    pci_register_slot(0x0E, PCI_CARD_VIDEO,       13, 14, 15, 16);
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&gd5430_onboard_vlb_device);
-
-    device_add(&opti602_device);
-    device_add(&opti802g_device);
-    device_add(&opti822_device);
-    device_add(&keyboard_ps2_ami_device);
-    device_add(&fdc37c665_ide_device);
-    device_add(&ide_opti611_vlb_device);
-    device_add(&intel_flash_bxt_device);
-
-    return ret;
-}
-
-int
-machine_at_mvi486_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/mvi486/MVI627.BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&opti895_device);
-    device_add(&keyboard_at_device);
-    device_add(&pc87311_ide_device);
-
-    return ret;
-}
-
-static void
-machine_at_sis_85c471_common_init(const machine_t *model)
-{
-    machine_at_common_init(model);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&sis_85c471_device);
-}
-
-int
-machine_at_ami471_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/ami471/SIS471BE.AMI",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_sis_85c471_common_init(model);
-    device_add(&keyboard_at_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_vli486sv2g_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/vli486sv2g/0402.001",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_sis_85c471_common_init(model);
-    device_add(&keyboard_at_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_dtk486_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/dtk486/4siw005.bin",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_sis_85c471_common_init(model);
-    device_add(&keyboard_at_device);
-
-    return ret;
-}
-
-int
-machine_at_px471_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/px471/SIS471A1.PHO",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_sis_85c471_common_init(model);
-    device_add(&ide_vlb_device);
-    device_add(&keyboard_at_device);
-
-    return ret;
-}
-
-int
-machine_at_win471_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/win471/486-SiS_AC0360136.BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_sis_85c471_common_init(model);
-    device_add(&keyboard_at_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_pci400ca_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/pci400ca/486-AA008851.BIN",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x01, PCI_CARD_SCSI,        1, 2, 3, 4);
-    pci_register_slot(0x03, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x04, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x05, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&keyboard_ps2_ami_device);
-    device_add(&sio_device);
-    device_add(&intel_flash_bxt_ami_device);
-
-    device_add(&i420tx_device);
-    device_add(&ncr53c810_onboard_pci_device);
-
-    if (fdc_type == FDC_INTERNAL)
+    if (fdc_current[0] == FDC_INTERNAL)
         device_add(&fdc_at_device);
 
     return ret;
 }
 
+/* OPTi 495SX */
 int
-machine_at_vi15g_init(const machine_t *model)
+machine_at_c747_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/vi15g/vi15gr23.rom",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_sis_85c471_common_init(model);
-    device_add(&keyboard_at_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_greenb_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/greenb/4gpv31-ami-1993-8273517.bin",
+    ret = bios_load_linear("roms/machines/c747/486-C747 Tandon.BIN",
                            0x000f0000, 65536, 0);
 
     if (bios_only || !ret)
@@ -911,1340 +86,78 @@ machine_at_greenb_init(const machine_t *model)
 
     machine_at_common_init(model);
 
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
+    /* The EFAR chipset is a rebrand of the OPTi 495SX. */
+    device_add(&opti495sx_device);
 
-    device_add(&contaq_82c597_device);
+    /*
+       No idea what KBC it actually has but this produces the
+       desired behavior: command A9 does absolutely nothing.
+     */
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
 
-    device_add(&keyboard_at_ami_device);
+    device_add_params(&um866x_device, (void *) (UM82C862F | UM866X_IDE_PRI));
 
     return ret;
 }
 
+static const device_config_t opti495_ami_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "ami495",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "AMI 060692", .internal_name = "ami495", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 65536, .files = { "roms/machines/ami495/opt495sx.ami", "" } },
+            { .name = "MR BIOS V1.60", .internal_name = "mr495", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 65536, .files = { "roms/machines/ami495/opt495sx.mr", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t opti495_ami_device = {
+    .name          = "DataExpert SX495",
+    .internal_name = "opti495_ami_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = opti495_ami_config
+};
+
 int
-machine_at_4gpv5_init(const machine_t *model)
+machine_at_opti495_ami_init(const machine_t *model)
 {
-    int ret;
+    int ret = 0;
+    const char* fn;
 
-    ret = bios_load_linear("roms/machines/4gpv5/4GPV5.bin",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
+    /* No ROMs available */
+    if (!device_available(model->device))
         return ret;
 
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000f0000, 65536, 0);
+
     machine_at_common_init(model);
 
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
+    device_add(&opti495sx_device);
 
-    device_add(&contaq_82c596a_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
 
-    device_add(&keyboard_at_device);
-
-    return ret;
-}
-
-static void
-machine_at_sis_85c496_common_init(UNUSED(const machine_t *model))
-{
-    device_add(&ide_pci_2ch_device);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x05, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-
-    pci_set_irq_routing(PCI_INTA, PCI_IRQ_DISABLED);
-    pci_set_irq_routing(PCI_INTB, PCI_IRQ_DISABLED);
-    pci_set_irq_routing(PCI_INTC, PCI_IRQ_DISABLED);
-    pci_set_irq_routing(PCI_INTD, PCI_IRQ_DISABLED);
-}
-
-int
-machine_at_r418_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/r418/r418i.bin",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    machine_at_sis_85c496_common_init(model);
-    device_add(&sis_85c496_device);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL, 1, 2, 3, 4);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL, 2, 3, 4, 1);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL, 3, 4, 1, 2);
-    pci_register_slot(0x07, PCI_CARD_NORMAL, 4, 1, 2, 3);
-
-    device_add(&fdc37c665_device);
-    device_add(&keyboard_ps2_pci_device);
-
-    return ret;
-}
-
-int
-machine_at_m4li_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/m4li/M4LI.04S",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    machine_at_sis_85c496_common_init(model);
-    device_add(&sis_85c496_device);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL, 1, 2, 3, 4);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL, 2, 3, 4, 1);
-    pci_register_slot(0x07, PCI_CARD_NORMAL, 4, 1, 2, 3);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL, 3, 4, 1, 2);
-
-    device_add(&fdc37c665_device);
-    device_add(&keyboard_ps2_pci_device);
-
-    return ret;
-}
-
-int
-machine_at_ls486e_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/ls486e/LS486E RevC.BIN",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    machine_at_sis_85c496_common_init(model);
-    device_add(&sis_85c496_ls486e_device);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL, 1, 2, 3, 4);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL, 2, 3, 4, 1);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL, 3, 4, 1, 2);
-    pci_register_slot(0x06, PCI_CARD_NORMAL, 4, 1, 2, 3);
-
-    device_add(&fdc37c665_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-
-    return ret;
-}
-
-int
-machine_at_4dps_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/4dps/4DPS172G.BIN",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    machine_at_sis_85c496_common_init(model);
-    device_add(&sis_85c496_device);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL, 1, 2, 3, 4);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL, 2, 3, 4, 1);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL, 3, 4, 1, 2);
-    pci_register_slot(0x07, PCI_CARD_NORMAL, 4, 1, 2, 3);
-
-    device_add(&w83787f_device);
-    device_add(&keyboard_ps2_ami_device);
-
-    device_add(&intel_flash_bxt_device);
-
-    return ret;
-}
-
-int
-machine_at_ms4144_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/ms4144/ms-4144-1.4.bin",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    machine_at_sis_85c496_common_init(model);
-    device_add(&sis_85c496_ls486e_device);
-    pci_register_slot(0x03, PCI_CARD_NORMAL, 1, 2, 3, 4);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL, 2, 3, 4, 1);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL, 3, 4, 1, 2);
-
-    device_add(&w83787f_device);
-    device_add(&keyboard_at_ami_device);
-
-    device_add(&sst_flash_29ee010_device);
-
-    return ret;
-}
-
-int
-machine_at_486sp3c_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/486sp3c/SI4I0306.AWD",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    machine_at_sis_85c496_common_init(model);
-    device_add(&sis_85c496_device);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 2, 3, 4);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL, 2, 3, 4, 1);
-    pci_register_slot(0x0A, PCI_CARD_NORMAL, 3, 4, 1, 2);
-
-    device_add(&fdc37c665_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-
-    device_add(&intel_flash_bxt_device);
-
-    return ret;
-}
-
-int
-machine_at_4saw2_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/4saw2/4saw0911.bin",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    machine_at_sis_85c496_common_init(model);
-    device_add(&sis_85c496_device);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL, 1, 2, 3, 4);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL, 2, 3, 4, 1);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL, 3, 4, 1, 2);
-    pci_register_slot(0x11, PCI_CARD_NORMAL, 4, 1, 2, 3);
-
-    device_add(&w83787f_device);
-    device_add(&keyboard_ps2_pci_device);
-
-    device_add(&intel_flash_bxt_device);
-
-    return ret;
-}
-
-int
-machine_at_alfredo_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear_combined("roms/machines/alfredo/1010AQ0_.BIO",
-                                    "roms/machines/alfredo/1010AQ0_.BI1", 0x1c000, 128);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add(&ide_pci_device);
-
-    pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x01, PCI_CARD_IDE,         0, 0, 0, 0);
-    pci_register_slot(0x06, PCI_CARD_NORMAL,      3, 2, 1, 4);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 1, 3, 4);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 3, 2, 4);
-    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&sio_device);
-    device_add(&fdc37c663_device);
-    device_add(&intel_flash_bxt_ami_device);
-
-    device_add(&i420tx_device);
-
-    return ret;
-}
-
-int
-machine_at_ninja_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear_combined("roms/machines/ninja/1008AY0_.BIO",
-                                    "roms/machines/ninja/1008AY0_.BI1", 0x1c000, 128);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x05, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x11, PCI_CARD_NORMAL,      1, 2, 1, 2);
-    pci_register_slot(0x13, PCI_CARD_NORMAL,      2, 1, 2, 1);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      2, 1, 2, 1);
-    device_add(&keyboard_ps2_intel_ami_pci_device);
-    device_add(&intel_flash_bxt_ami_device);
-
-    device_add(&i420ex_device);
-    device_add(&i82091aa_device);
-
-    return ret;
-}
-
-int
-machine_at_bat4ip3e_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/bat4ip3e/404C.ROM",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x05, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x01, PCI_CARD_IDE,   0xfe, 0xff, 0, 0);
-    pci_register_slot(0x08, PCI_CARD_NORMAL,      1, 2, 1, 2);
-    pci_register_slot(0x09, PCI_CARD_NORMAL,      2, 1, 2, 1);
-    pci_register_slot(0x0a, PCI_CARD_NORMAL,      1, 2, 1, 2);
-
-    device_add(&phoenix_486_jumper_pci_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&i420ex_device);
-    device_add(&ide_cmd640_pci_device);
-    device_add(&fdc37c665_device);
-
-    return ret;
-}
-
-int
-machine_at_486pi_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/486pi/486pi.bin",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x05, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x12, PCI_CARD_NORMAL,      1, 2, 1, 2);
-    pci_register_slot(0x13, PCI_CARD_NORMAL,      2, 1, 2, 1);
-    pci_register_slot(0x14, PCI_CARD_NORMAL,      1, 2, 1, 2);
-
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c665_device);
-    device_add(&i420ex_device);
-
-    return ret;
-}
-
-int
-machine_at_sb486p_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/sb486p/amiboot.rom",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x05, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x14, PCI_CARD_NORMAL,      1, 2, 1, 2);
-    pci_register_slot(0x13, PCI_CARD_NORMAL,      2, 1, 2, 1);
-
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&i82091aa_device);
-    device_add(&i420ex_device);
-
-    return ret;
-}
-
-int
-machine_at_486sp3_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/486sp3/awsi2737.bin",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add(&ide_isa_device);
-
-    pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x01, PCI_CARD_SCSI,        1, 2, 3, 4); /* 01 = SCSI */
-    pci_register_slot(0x03, PCI_CARD_NORMAL,      1, 2, 3, 4); /* 03 = Slot 1 */
-    pci_register_slot(0x04, PCI_CARD_NORMAL,      2, 3, 4, 1); /* 04 = Slot 2 */
-    pci_register_slot(0x05, PCI_CARD_NORMAL,      3, 4, 1, 2); /* 05 = Slot 3 */
-    pci_register_slot(0x06, PCI_CARD_NORMAL,      4, 1, 2, 3); /* 06 = Slot 4 */
-    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&keyboard_ps2_ami_pci_device); /* Uses the AMIKEY KBC */
-    device_add(&sio_device);
-    device_add(&fdc37c663_ide_device);
-    device_add(&sst_flash_29ee010_device);
-
-    device_add(&i420tx_device);
-    device_add(&ncr53c810_onboard_pci_device);
-
-    return ret;
-}
-
-int
-machine_at_amis76_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear_inverted("roms/machines/s76p/s76p.rom", 
-                                    0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    // pci_register_slot(0x01, PCI_CARD_IDE,         1, 2, 3 ,4);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&sio_device);
-    device_add(&fdc37c665_device);
-    device_add(&intel_flash_bxt_ami_device);
-
-    device_add(&i420tx_device);
-    // device_add(&ide_cmd640_pci_device); /* is this actually cmd640? is it single channel? */
-    device_add(&ide_pci_device);
-
-    return ret;
-}
-
-int
-machine_at_pci400cb_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/pci400cb/032295.ROM",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-    device_add(&ami_1994_nvr_device);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      4, 3, 2, 1); /* 0F = Slot 1 */
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2); /* 0E = Slot 2 */
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      2, 3, 4, 1); /* 0D = Slot 3 */
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4); /* 0C = Slot 4 */
-    device_add(&keyboard_ps2_ami_pci_device);                  /* Assume AMI Megakey 1993 standalone ('P')
-                                                                  because of the Tekram machine below. */
-
-    device_add(&ims8848_device);
-
-    if (fdc_type == FDC_INTERNAL)
+    if (fdc_current[0] == FDC_INTERNAL)
         device_add(&fdc_at_device);
 
     return ret;
 }
-
-int
-machine_at_g486ip_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/g486ip/G486IP.BIN",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-    device_add(&ami_1992_nvr_device);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      3, 4, 1, 2); /* 03 = Slot 1 */
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 3, 4, 1); /* 04 = Slot 2 */
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4); /* 05 = Slot 3 */
-    device_add(&keyboard_ps2_ami_pci_device);                  /* AMI Megakey 1993 stanalone ('P') */
-
-    device_add(&ims8848_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-int
-machine_at_486sp3g_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/486sp3g/PCI-I-486SP3G_0306.001 (Beta).bin",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add(&ide_isa_device);
-
-    pci_init(PCI_CONFIG_TYPE_2);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x01, PCI_CARD_SCSI,        1, 2, 3, 4); /* 01 = SCSI */
-    pci_register_slot(0x06, PCI_CARD_NORMAL,      1, 2, 3, 4); /* 06 = Slot 1 */
-    pci_register_slot(0x05, PCI_CARD_NORMAL,      2, 3, 4, 1); /* 05 = Slot 2 */
-    pci_register_slot(0x04, PCI_CARD_NORMAL,      3, 4, 1, 2); /* 04 = Slot 3 */
-    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&keyboard_ps2_ami_pci_device);                  /* Uses the AMIKEY KBC */
-    device_add(&sio_zb_device);
-    device_add(&pc87332_398_ide_device);
-    device_add(&sst_flash_29ee010_device);
-
-    device_add(&i420zx_device);
-    device_add(&ncr53c810_onboard_pci_device);
-
-    return ret;
-}
-
-int
-machine_at_486ap4_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/486ap4/0205.002",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    /* Excluded: 5, 6, 7, 8 */
-    pci_register_slot(0x05, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x09, PCI_CARD_NORMAL,      1, 2, 3, 4); /* 09 = Slot 1 */
-    pci_register_slot(0x0a, PCI_CARD_NORMAL,      2, 3, 4, 1); /* 0a = Slot 2 */
-    pci_register_slot(0x0b, PCI_CARD_NORMAL,      3, 4, 1, 2); /* 0b = Slot 3 */
-    pci_register_slot(0x0c, PCI_CARD_NORMAL,      4, 1, 2, 3); /* 0c = Slot 4 */
-    device_add(&keyboard_ps2_ami_pci_device);                  /* Uses the AMIKEY KBC */
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&i420ex_device);
-
-    return ret;
-}
-
-int
-machine_at_g486vpa_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/g486vpa/3.BIN",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x08, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x09, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3);
-
-    device_add(&via_vt82c49x_pci_ide_device);
-    device_add(&via_vt82c505_device);
-    device_add(&pc87332_398_ide_sec_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&sst_flash_29ee010_device);
-
-    return ret;
-}
-
-int
-machine_at_486vipio2_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/486vipio2/1175G701.BIN",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x08, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x09, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3);
-
-    device_add(&via_vt82c49x_pci_ide_device);
-    device_add(&via_vt82c505_device);
-    device_add(&w83787f_ide_sec_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&sst_flash_29ee010_device);
-
-    return ret;
-}
-
-int
-machine_at_abpb4_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/abpb4/486-AB-PB4.BIN",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CAN_SWITCH_TYPE);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x03, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x04, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x05, PCI_CARD_NORMAL,      3, 4, 1, 2);
-
-    device_add(&ali1489_device);
-    device_add(&w83787f_device);
-    device_add(&keyboard_at_device);
-#if 0
-    device_add(&intel_flash_bxt_device);
-#endif
-    device_add(&sst_flash_29ee010_device);
-
-    return ret;
-}
-
-int
-machine_at_win486pci_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/win486pci/v1hj3.BIN",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x03, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x04, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x05, PCI_CARD_NORMAL,      3, 4, 1, 2);
-
-    device_add(&ali1489_device);
-    device_add(&prime3b_device);
-    device_add(&keyboard_at_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_ms4145_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/ms4145/AG56S.ROM",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x03, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x04, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x05, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x06, PCI_CARD_NORMAL,      4, 1, 2, 3);
-
-    device_add(&ali1489_device);
-    device_add(&w83787f_device);
-    device_add(&keyboard_at_ami_device);
-    device_add(&sst_flash_29ee010_device);
-
-    return ret;
-}
-
-int
-machine_at_sbc490_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/sbc490/07159589.rom",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x01, PCI_CARD_VIDEO,       4, 1, 2, 3);
-
-    device_add(&ali1489_device);
-    device_add(&fdc37c665_device);
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&tgui9440_onboard_pci_device);
-
-    device_add(&keyboard_ps2_ami_device);
-    device_add(&sst_flash_29ee010_device);
-
-    return ret;
-}
-
-int
-machine_at_tf486_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/tf486/tf486v10.BIN",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
-
-    device_add(&ali1489_device);
-    device_add(&w83977ef_device);
-    device_add(&keyboard_at_device);
-    device_add(&sst_flash_29ee010_device);
-
-    return ret;
-}
-
-int
-machine_at_arb1476_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/arb1476/w1476b.v21",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-
-    device_add(&ali1489_device);
-    device_add(&fdc37c669_device);
-    device_add(&keyboard_ps2_device);
-    device_add(&sst_flash_29ee010_device);
-
-    return ret;
-}
-
-int
-machine_at_itoxstar_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/itoxstar/STARA.ROM",
-                           0x000c0000, 262144, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x0B, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0C, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x1F, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    device_add(&w83977f_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&stpc_client_device);
-    device_add(&sst_flash_29ee020_device);
-    device_add(&w83781d_device);    /* fans: Chassis, CPU, unused; temperatures: Chassis, CPU, unused */
-    hwm_values.fans[2]         = 0; /* unused */
-    hwm_values.temperatures[2] = 0; /* unused */
-    hwm_values.voltages[0]     = 0; /* Vcore unused */
-
-    return ret;
-}
-
-int
-machine_at_arb1423c_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/arb1423c/A1423C.v12",
-                           0x000c0000, 262144, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x0B, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0C, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x1F, PCI_CARD_NORMAL,      1, 0, 0, 0);
-    pci_register_slot(0x1E, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x1D, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    device_add(&w83977f_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&stpc_consumer2_device);
-    device_add(&winbond_flash_w29c020_device);
-
-    return ret;
-}
-
-int
-machine_at_arb1479_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/arb1479/1479A.rom",
-                           0x000c0000, 262144, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x0B, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0C, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x1F, PCI_CARD_NORMAL,      1, 0, 0, 0);
-    pci_register_slot(0x1E, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x1D, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    device_add(&w83977f_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&stpc_consumer2_device);
-    device_add(&winbond_flash_w29c020_device);
-
-    return ret;
-}
-
-int
-machine_at_iach488_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/iach488/FH48800B.980",
-                           0x000c0000, 262144, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x0B, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0C, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&w83977f_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&stpc_consumer2_device);
-    device_add(&sst_flash_29ee020_device);
-
-    return ret;
-}
-
-int
-machine_at_pcm9340_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/pcm9340/9340v110.bin",
-                           0x000c0000, 262144, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x0B, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0C, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x1D, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x1E, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x1F, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    device_add_inst(&w83977f_device, 1);
-    device_add_inst(&w83977f_device, 2);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&stpc_elite_device);
-    device_add(&sst_flash_29ee020_device);
-
-    return ret;
-}
-
-int
-machine_at_pcm5330_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/pcm5330/5330_13b.bin",
-                           0x000c0000, 262144, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x0B, PCI_CARD_NORTHBRIDGE,     0, 0, 0, 0);
-    pci_register_slot(0x0C, PCI_CARD_SOUTHBRIDGE,     0, 0, 0, 0);
-    pci_register_slot(0x0D, PCI_CARD_SOUTHBRIDGE_IDE, 0, 0, 0, 0);
-    pci_register_slot(0x0E, PCI_CARD_SOUTHBRIDGE_USB, 1, 2, 3, 4);
-    pci_register_slot(0x13, PCI_CARD_NORMAL,          1, 2, 3, 4);
-    device_add(&stpc_serial_device);
-    device_add(&w83977f_370_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&stpc_atlas_device);
-    device_add(&sst_flash_29ee020_device);
-
-    return ret;
-}
-
-int
-machine_at_ecs486_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/ecs486/8810AIO.32J",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x12, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x0F, PCI_CARD_IDE,         0, 0, 0, 0);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2);
-
-    device_add(&umc_hb4_device);
-    device_add(&umc_8886f_device);
-    device_add(&ide_cmd640_pci_legacy_only_device);
-    device_add(&fdc37c665_device);
-    device_add(&intel_flash_bxt_device);
-    device_add(&keyboard_ps2_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_hot433a_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/hot433/433AUS33.ROM",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x12, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      2, 3, 4, 1);
-
-    device_add(&umc_hb4_device);
-    device_add(&umc_8886af_device);
-    device_add(&um8669f_device);
-    device_add(&winbond_flash_w29c010_device);
-    device_add(&keyboard_at_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_atc1415_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/atc1415/1415V330.ROM",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x12, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x13, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x14, PCI_CARD_NORMAL,      3, 4, 1, 2);
-
-    device_add(&umc_hb4_device);
-    device_add(&umc_8886af_device);
-    device_add(&intel_flash_bxt_device);
-    device_add(&keyboard_at_ami_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-int
-machine_at_actionpc2600_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/actionpc2600/action2600.BIN",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x12, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      2, 3, 4, 1);
-
-    device_add(&umc_hb4_device);
-    device_add(&umc_8886af_device);
-    device_add(&um8669f_device);
-    device_add(&intel_flash_bxt_device);
-    device_add(&keyboard_ps2_tg_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_actiontower8400_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/actiontower8400/V31C.ROM",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x12, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    if (gfxcard[0] == VID_INTERNAL)
-        pci_register_slot(0x15, PCI_CARD_VIDEO,   0, 0, 0, 0);
-    pci_register_slot(0x13, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x14, PCI_CARD_NORMAL,      2, 3, 4, 1);
-
-    device_add(&umc_hb4_device);
-    device_add(&umc_8886af_device);
-    device_add(&fdc37c665_device);
-    device_add(&intel_flash_bxt_device); // The ActionPC 2600 has this so I'm gonna assume this does too.
-    device_add(&keyboard_ps2_ami_pci_device);
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&gd5430_pci_device); // VBIOS not included in BIOS ROM
-
-    return ret;
-}
-
-int
-machine_at_m919_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/m919/9190914s.rom",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x12, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2);
-
-    device_add(&umc_hb4_device);
-    device_add(&umc_8886af_device);
-    device_add(&um8669f_device);
-    device_add(&sst_flash_29ee010_device);
-    device_add(&keyboard_at_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_spc7700plw_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/spc7700plw/77LW13FH.P24",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x12, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2);
-
-    device_add(&umc_hb4_device);
-    device_add(&umc_8886af_device);
-    device_add(&fdc37c665_device);
-    device_add(&intel_flash_bxt_device);
-    device_add(&keyboard_ps2_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_ms4134_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/ms4134/4alm001.bin",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_ide_init(model);
-
-    device_add(&ali1429g_device);
-
-    device_add(&fdc37c665_ide_pri_device);
-
-    pci_init(FLAG_MECHANISM_1 | FLAG_MECHANISM_2 | PCI_ALWAYS_EXPOSE_DEV0);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-
-    pci_register_slot(0x0B, PCI_CARD_SCSI, 4, 1, 2, 3);
-    pci_register_slot(0x08, PCI_CARD_NORMAL, 1, 2, 3, 4);
-    pci_register_slot(0x09, PCI_CARD_NORMAL, 2, 3, 4, 1);
-    pci_register_slot(0x0A, PCI_CARD_NORMAL, 3, 4, 1, 2);
-    pci_register_slot(0x10, PCI_CARD_NORMAL, 1, 2, 3, 4);
-
-    device_add(&ali1435_device);
-    device_add(&sst_flash_29ee010_device);
-
-    device_add(&keyboard_ps2_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_tg486gp_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/tg486gp/tg486gp.bin",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_ide_init(model);
-
-    device_add(&ali1429g_device);
-
-    device_add(&fdc37c665_ide_pri_device);
-
-    pci_init(FLAG_MECHANISM_1 | FLAG_MECHANISM_2 | PCI_ALWAYS_EXPOSE_DEV0);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-
-    pci_register_slot(0x0F, PCI_CARD_NORMAL, 1, 2, 3, 4);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL, 2, 3, 4, 1);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL, 3, 4, 1, 2);
-    pci_register_slot(0x10, PCI_CARD_NORMAL, 1, 2, 3, 4);
-
-    device_add(&ali1435_device);
-    device_add(&sst_flash_29ee010_device);
-
-    device_add(&keyboard_ps2_tg_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_tg486g_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/tg486g/tg486g.bin",
-                           0x000c0000, 262144, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add(&sis_85c471_device);
-    device_add(&ide_isa_device);
-    device_add(&fdc37c651_ide_device);
-    device_add(&keyboard_ps2_tg_ami_pci_device);
-
-    if (gfxcard[0] != VID_INTERNAL) {
-        for (uint16_t i = 0; i < 32768; i++)
-            rom[i] = mem_readb_phys(0x000c0000 + i);
-    }
-    mem_mapping_set_addr(&bios_mapping, 0x0c0000, 0x40000);
-    mem_mapping_set_exec(&bios_mapping, rom);
-
-    return ret;
-}
-
-int
-machine_at_dvent4xx_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/dvent4xx/Venturis466_BIOS.BIN",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add(&sis_85c471_device);
-    device_add(&ide_cmd640_vlb_pri_device);
-    device_add(&fdc37c665_ide_device);
-    device_add(&keyboard_ps2_device);
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&s3_phoenix_trio32_onboard_vlb_device);
-
-    return ret;
-}
-
-int
-machine_at_ecsal486_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/ecsal486/ECS_AL486.BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&ali1429g_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    return ret;
-}
-
-int
-machine_at_ap4100aa_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/ap4100aa/M27C512DIP28.BIN",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    device_add(&ami_1994_nvr_device);
-    device_add(&ali1429g_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&ide_vlb_device);
-    device_add(&um8669f_device); // needs um8663
-
-    return ret;
-}
-
-int
-machine_at_atc1762_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/atc1762/atc1762.bin",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add(&ali1429g_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-
-    return ret;
-}
\ No newline at end of file
diff --git a/src/machine/m_at_386sx.c b/src/machine/m_at_386sx.c
new file mode 100644
index 000000000..f48b8977a
--- /dev/null
+++ b/src/machine/m_at_386sx.c
@@ -0,0 +1,716 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of 386SX machines.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          EngiNerd <webmaster.crrc@yahoo.it>
+ *
+ *          Copyright 2016-2025 Miran Grca.
+ *          Copyright 2020-2025 EngiNerd.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/chipset.h>
+#include <86box/keyboard.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/hdc.h>
+#include <86box/nvr.h>
+#include <86box/port_6x.h>
+#define USE_SIO_DETECT
+#include <86box/sio.h>
+#include <86box/serial.h>
+#include <86box/video.h>
+#include <86box/vid_cga.h>
+#include <86box/flash.h>
+#include <86box/machine.h>
+
+/* ISA */
+/*
+ * Current bugs:
+ * - soft-reboot after saving CMOS settings/pressing ctrl-alt-del produces an 8042 error
+ */
+int
+machine_at_pc916sx_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/pc916sx/ncr_386sx_u46-17_7.3.bin",
+                                "roms/machines/pc916sx/ncr_386sx_u12-19_7.3.bin",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    mem_remap_top(384);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+int
+machine_at_quadt386sx_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/quadt386sx/QTC-SXM-EVEN-U3-05-07.BIN",
+                                "roms/machines/quadt386sx/QTC-SXM-ODD-U3-05-07.BIN",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add(&headland_gc10x_device);
+
+    return ret;
+}
+
+/* ACC2036 */
+static const device_config_t pbl300sx_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "pbl300sx",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "Phoenix ROM BIOS PLUS 1.10 - Revision 19910723091302", .internal_name = "pbl300sx_1991", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pbl300sx/V1.10_1113_910723.bin", "" } },
+            { .name = "Phoenix ROM BIOS PLUS 1.10 - Revision 19920910", .internal_name = "pbl300sx", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pbl300sx/pb_l300sx_1992.bin", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t pbl300sx_device = {
+    .name          = "Packard Bell Legend 300SX",
+    .internal_name = "pbl300sx_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = pbl300sx_config
+};
+
+int
+machine_at_pbl300sx_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+    device_context_restore();
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+    device_add(&acc2036_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&um866x_device, (void *) (UM82C862F | UM866X_IDE_PRI));
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    return ret;
+}
+
+/* ALi M1217 */
+int
+machine_at_arb1374_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/arb1374/1374s.rom",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&ali1217_device);
+    device_add(&ide_isa_device);
+    device_add_params(&w83877_device, (void *) (W83877F | W83877_3F0 | W83XX7_IDE_PRI));
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_sbc350a_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/sbc350a/350a.rom",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&ali1217_device);
+    device_add(&ide_isa_device);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_PRI));
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_flytech386_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/flytech386/FLYTECH.BIO",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&ali1217_device);
+    device_add(&ide_isa_device);
+    device_add_params(&w837x7_device, (void *) (W83787F | W837X7_KEY_89 | W83XX7_IDE_PRI | W837X7_IDE_START));
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&tvga8900d_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+static const device_config_t c325ax_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "325ax",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "AMIBIOS 070791", .internal_name = "325ax", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 65536, .files = { "roms/machines/325ax/M27C512.BIN", "" } },
+            { .name = "MR BIOS V1.41", .internal_name = "mr1217", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 65536, .files = { "roms/machines/325ax/mrbios.BIN", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t c325ax_device = {
+    .name          = "Chaintech 325AX",
+    .internal_name = "325ax_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = c325ax_config
+};
+
+int
+machine_at_325ax_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000f0000, 65536, 0);
+
+    machine_at_common_init(model);
+
+    device_add(&ali1217_device);
+    device_add(&fdc_at_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+/* ALi M1409 */
+int
+machine_at_acer100t_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/acer100t/acer386.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_ps2_ide_init(model);
+
+    device_add(&ali1409_device);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&oti077_acer100t_device);
+     
+    device_add_params(&pc87310_device, (void *) (PC87310_ALI));
+    
+    return ret;
+}
+
+/* HT18 */
+int
+machine_at_ama932j_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ama932j/ami.bin",
+                           0x000f0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_ide_init(model);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&oti067_ama932j_device);
+
+    machine_at_headland_common_init(model, 2);
+
+    device_add_params(&pc87310_device, (void *) (PC87310_ALI));
+
+    return ret;
+}
+
+/* Intel 82335 */
+int
+machine_at_adi386sx_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/adi386sx/3iip001l.bin",
+                                "roms/machines/adi386sx/3iip001h.bin",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+    device_add(&amstrad_megapc_nvr_device); /* NVR that is initialized to all 0x00's. */
+
+    device_add(&intel_82335_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+int
+machine_at_shuttle386sx_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/shuttle386sx/386-Shuttle386SX-Even.BIN",
+                                "roms/machines/shuttle386sx/386-Shuttle386SX-Odd.BIN",
+                                0x000f0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&intel_82335_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* NEAT */
+int
+machine_at_cmdsl386sx16_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/cmdsl386sx16/cbm-sl386sx-bios-lo-v1.04-390914-04.bin",
+                                "roms/machines/cmdsl386sx16/cbm-sl386sx-bios-hi-v1.04-390915-04.bin",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add(&neat_device);
+    device_add(&ide_isa_device);
+    /* Two serial ports - on the real hardware SL386SX-16, they are on the single UMC UM82C452. */
+    device_add_inst(&ns16450_device, 1);
+    device_add_inst(&ns16450_device, 2);
+
+    return ret;
+}
+
+int
+machine_at_neat_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/dtk386/3cto001.bin",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_init(model);
+
+    device_add(&neat_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* NEATsx */
+int
+machine_at_if386sx_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/if386sx/OKI_IF386SX_odd.bin",
+                                "roms/machines/if386sx/OKI_IF386SX_even.bin",
+                                0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+    device_add(&amstrad_megapc_nvr_device); /* NVR that is initialized to all 0x00's. */
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&neat_sx_device);
+
+    device_add(&if386jega_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    /*
+       One serial port - on the real hardware IF386AX, it is on the VL 16C451,
+       alognside the bidirectional parallel port.
+     */
+    device_add_inst(&ns16450_device, 1);
+
+    return ret;
+}
+
+/* OPTi 283 */
+int
+machine_at_svc386sxp1_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/svc386sxp1/svc-386sx-am27c512dip28-6468c04f09d89320349795.bin",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&opti283_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* OPTi 291 */
+int
+machine_at_awardsx_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/awardsx/Unknown 386SX OPTi291 - Award (original).BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_init(model);
+
+    device_add(&opti291_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* SCAMP */
+int
+machine_at_cmdsl386sx25_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/cmdsl386sx25/f000.rom",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&gd5402_onboard_device);
+
+    machine_at_common_init_ex(model, 2);
+
+    device_add(&ide_isa_device);
+
+    device_add_params(&pc87310_device, (void *) (PC87310_ALI));
+    device_add(&vl82c113_device); /* The keyboard controller is part of the VL82c113. */
+
+    device_add(&vlsi_scamp_device);
+
+    return ret;
+}
+
+static void
+machine_at_scamp_common_init(const machine_t *model, int is_ps2)
+{
+    machine_at_common_ide_init(model);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add(&vlsi_scamp_device);
+}
+
+int
+machine_at_dataexpert386sx_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/dataexpert386sx/5e9f20e5ef967717086346.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_scamp_common_init(model, 0);
+
+    return ret;
+}
+
+static const device_config_t dells333sl_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "dells333sl",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "Phoenix ROM BIOS PLUS 1.10 - Revision J01 (Jostens Learning Corporation OEM)", .internal_name = "dells333sl_j01", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/dells333sl/DELL386.BIN", "" } },
+            { .name = "Phoenix ROM BIOS PLUS 1.10 - Revision A02", .internal_name = "dells333sl", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/dells333sl/Dell_386SX_30807_UBIOS_B400_VLSI_VL82C311_Cirrus_Logic_GD5420.bin", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t dells333sl_device = {
+    .name          = "Dell System 333s/L",
+    .internal_name = "dells333sl_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = dells333sl_config
+};
+
+int
+machine_at_dells333sl_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000e0000, 262144, 0);
+    memcpy(rom, &(rom[0x00020000]), 131072);
+    mem_mapping_set_addr(&bios_mapping, 0x0c0000, 0x40000);
+    mem_mapping_set_exec(&bios_mapping, rom);
+    device_context_restore();
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    machine_at_common_init_ex(model, 2);
+
+    device_add(&ide_isa_device);
+
+    device_add_params(&pc873xx_device, (void *) (PCX73XX_IDE_PRI | PCX730X_26E));
+    device_add(&vl82c113_device); /* The keyboard controller is part of the VL82c113. */
+
+    device_add(&vlsi_scamp_device);
+
+    return ret;
+}
+
+int
+machine_at_spc6033p_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/spc6033p/phoenix.BIN",
+                           0x000f0000, 65536, 0x10000);
+
+    if (bios_only || !ret)
+        return ret;
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&ati28800k_spc6033p_device);
+
+    machine_at_scamp_common_init(model, 1);
+
+    return ret;
+}
+
+/* SCATsx */
+static void
+machine_at_scatsx_init(const machine_t *model)
+{
+    machine_at_common_init(model);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add(&scat_sx_device);
+}
+
+int
+machine_at_kmxc02_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/kmxc02/3ctm005.bin",
+                           0x000f0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_scatsx_init(model);
+
+    return ret;
+}
+
+/* WD76C10 */
+int
+machine_at_wd76c10_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/megapc/41651-bios lo.u18",
+                                "roms/machines/megapc/211253-bios hi.u19",
+                                0x000f0000, 65536, 0x08000);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&paradise_wd90c11_megapc_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&wd76c10_device);
+
+    return ret;
+}
diff --git a/src/machine/m_at_486_misc.c b/src/machine/m_at_486_misc.c
new file mode 100644
index 000000000..9eb8f8d4c
--- /dev/null
+++ b/src/machine/m_at_486_misc.c
@@ -0,0 +1,210 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of 486 Miscellaneous machines.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2016-2025 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/chipset.h>
+#include <86box/keyboard.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/pci.h>
+#include <86box/dma.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/gameport.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/rom.h>
+#include <86box/sio.h>
+#include <86box/hdc.h>
+#include <86box/port_6x.h>
+#include <86box/port_92.h>
+#include <86box/video.h>
+#include <86box/flash.h>
+#include <86box/scsi_ncr53c8xx.h>
+#include <86box/hwm.h>
+#include <86box/machine.h>
+#include <86box/plat_unused.h>
+#include <86box/sound.h>
+
+/* STPC Client */
+int
+machine_at_itoxstar_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/itoxstar/STARA.ROM",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x0B, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0C, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x1F, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    device_add_params(&w83977_device, (void *) (W83977F | W83977_AMI));
+    device_add(&stpc_client_device);
+    device_add(&sst_flash_29ee020_device);
+    device_add(&w83781d_device);    /* fans: Chassis, CPU, unused; temperatures: Chassis, CPU, unused */
+    hwm_values.fans[2]         = 0; /* unused */
+    hwm_values.temperatures[2] = 0; /* unused */
+    hwm_values.voltages[0]     = 0; /* Vcore unused */
+
+    return ret;
+}
+
+/* STPC Consumer-II */
+int
+machine_at_arb1423c_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/arb1423c/A1423C.v12",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x0B, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0C, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x1F, PCI_CARD_NORMAL,      1, 0, 0, 0);
+    pci_register_slot(0x1E, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x1D, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    device_add_params(&w83977_device, (void *) (W83977F | W83977_AMI));
+    device_add(&stpc_consumer2_device);
+    device_add(&winbond_flash_w29c020_device);
+
+    return ret;
+}
+
+int
+machine_at_arb1479_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/arb1479/1479A.rom",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x0B, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0C, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x1F, PCI_CARD_NORMAL,      1, 0, 0, 0);
+    pci_register_slot(0x1E, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x1D, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    device_add_params(&w83977_device, (void *) (W83977F | W83977_AMI));
+    device_add(&stpc_consumer2_device);
+    device_add(&winbond_flash_w29c020_device);
+
+    return ret;
+}
+
+int
+machine_at_iach488_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/iach488/FH48800B.980",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x0B, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0C, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    device_add_params(&w83977_device, (void *) (W83977F | W83977_AMI));
+    device_add(&stpc_consumer2_device);
+    device_add(&sst_flash_29ee020_device);
+
+    return ret;
+}
+
+/* STPC Elite */
+int
+machine_at_pcm9340_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/pcm9340/9340v110.bin",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x0B, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0C, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x1D, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x1E, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x1F, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    device_add_inst_params(&w83977_device, 1, (void *) (W83977F | W83977_AMI));
+    device_add_inst_params(&w83977_device, 2, (void *) W83977F);
+    device_add(&stpc_elite_device);
+    device_add(&sst_flash_29ee020_device);
+
+    return ret;
+}
+
+/* STPC Atlas */
+int
+machine_at_pcm5330_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/pcm5330/5330_13b.bin",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x0B, PCI_CARD_NORTHBRIDGE,     0, 0, 0, 0);
+    pci_register_slot(0x0C, PCI_CARD_SOUTHBRIDGE,     0, 0, 0, 0);
+    pci_register_slot(0x0D, PCI_CARD_SOUTHBRIDGE_IDE, 0, 0, 0, 0);
+    pci_register_slot(0x0E, PCI_CARD_SOUTHBRIDGE_USB, 1, 2, 3, 4);
+    pci_register_slot(0x13, PCI_CARD_NORMAL,          1, 2, 3, 4);
+    device_add(&stpc_serial_device);
+    device_add_params(&w83977_device, (void *) (W83977F | W83977_370 | W83977_AMI));
+    device_add(&stpc_atlas_device);
+    device_add(&sst_flash_29ee020_device);
+
+    return ret;
+}
diff --git a/src/machine/m_at_486slc.c b/src/machine/m_at_486slc.c
new file mode 100644
index 000000000..156eae16b
--- /dev/null
+++ b/src/machine/m_at_486slc.c
@@ -0,0 +1,72 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of 486SLC machines.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2016-2025 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/chipset.h>
+#include <86box/keyboard.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/pci.h>
+#include <86box/dma.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/gameport.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/rom.h>
+#include <86box/sio.h>
+#include <86box/hdc.h>
+#include <86box/port_6x.h>
+#include <86box/port_92.h>
+#include <86box/video.h>
+#include <86box/flash.h>
+#include <86box/scsi_ncr53c8xx.h>
+#include <86box/hwm.h>
+#include <86box/machine.h>
+#include <86box/plat_unused.h>
+#include <86box/sound.h>
+
+/* OPTi 283 */
+int
+machine_at_rycleopardlx_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/rycleopardlx/486-RYC-Leopard-LX.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&opti283_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
diff --git a/src/machine/m_at_commodore.c b/src/machine/m_at_commodore.c
deleted file mode 100644
index a0b522371..000000000
--- a/src/machine/m_at_commodore.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Implementation of the Commodore PC3 system.
- *
- *
- *
- * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
- *          Miran Grca, <mgrca8@gmail.com>
- *          Sarah Walker, <https://pcem-emulator.co.uk/>
- *
- *          Copyright 2017-2018 Fred N. van Kempen.
- *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2008-2018 Sarah Walker.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free  Software  Foundation; either  version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is  distributed in the hope that it will be useful, but
- * WITHOUT   ANY  WARRANTY;  without  even   the  implied  warranty  of
- * MERCHANTABILITY  or FITNESS  FOR A PARTICULAR  PURPOSE. See  the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the:
- *
- *   Free Software Foundation, Inc.
- *   59 Temple Place - Suite 330
- *   Boston, MA 02111-1307
- *   USA.
- */
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/device.h>
-#include <86box/timer.h>
-#include <86box/io.h>
-#include <86box/mem.h>
-#include <86box/fdc_ext.h>
-#include <86box/lpt.h>
-#include <86box/rom.h>
-#include <86box/serial.h>
-#include <86box/fdd.h>
-#include <86box/fdc.h>
-#include <86box/machine.h>
-#include <86box/plat_unused.h>
-
-static serial_t *cmd_uart;
-
-static void
-cbm_io_write(UNUSED(uint16_t port), uint8_t val, UNUSED(void *priv))
-{
-    lpt1_remove();
-    lpt2_remove();
-
-    switch (val & 3) {
-        case 1:
-            lpt1_init(LPT_MDA_ADDR);
-            break;
-        case 2:
-            lpt1_init(LPT1_ADDR);
-            break;
-        case 3:
-            lpt1_init(LPT2_ADDR);
-            break;
-
-        default:
-            break;
-    }
-
-    switch (val & 0xc) {
-        case 0x4:
-            serial_setup(cmd_uart, COM2_ADDR, COM2_IRQ);
-            break;
-        case 0x8:
-            serial_setup(cmd_uart, COM1_ADDR, COM1_IRQ);
-            break;
-
-        default:
-            break;
-    }
-}
-
-static void
-cbm_io_init(void)
-{
-    io_sethandler(0x0230, 0x0001, NULL, NULL, NULL, cbm_io_write, NULL, NULL, NULL);
-}
-
-int
-machine_at_cmdpc_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/cmdpc30/commodore pc 30 iii even.bin",
-                                "roms/machines/cmdpc30/commodore pc 30 iii odd.bin",
-                                0x000f8000, 32768, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_init(model);
-
-    mem_remap_top(384);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    cmd_uart = device_add(&ns8250_device);
-
-    cbm_io_init();
-
-    return ret;
-}
diff --git a/src/machine/m_at_common.c b/src/machine/m_at_common.c
new file mode 100644
index 000000000..9526c7749
--- /dev/null
+++ b/src/machine/m_at_common.c
@@ -0,0 +1,139 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the common initialization functions for
+  *         the PC/AT and copatible machines.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
+ *          Fred N. van Kempen, <decwiz@yahoo.com>
+ *
+ *          Copyright 2016-2025 Miran Grca.
+ *          Copyright 2008-2025 Sarah Walker.
+ *          Copyright 2025      Jasmine Iwanek.
+ *          Copyright 2017-2025 Fred N. van Kempen.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free  Software  Foundation; either  version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is  distributed in the hope that it will be useful, but
+ * WITHOUT   ANY  WARRANTY;  without  even   the  implied  warranty  of
+ * MERCHANTABILITY  or FITNESS  FOR A PARTICULAR  PURPOSE. See  the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the:
+ *
+ *   Free Software Foundation, Inc.
+ *   59 Temple Place - Suite 330
+ *   Boston, MA 02111-1307
+ *   USA.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/timer.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/dma.h>
+#include <86box/mem.h>
+#include <86box/device.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/nvr.h>
+#include <86box/gameport.h>
+#include <86box/keyboard.h>
+#include <86box/lpt.h>
+#include <86box/rom.h>
+#include <86box/hdc.h>
+#include <86box/port_6x.h>
+#include <86box/machine.h>
+
+void
+machine_at_common_init_ex(const machine_t *model, int type)
+{
+    machine_common_init(model);
+
+    refresh_at_enable = 1;
+    pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_at);
+    pic2_init();
+    dma16_init();
+
+    if (!(type & 4))
+        device_add(&port_6x_device);
+    type &= 3;
+
+    if (type == 1)
+        device_add(&ibmat_nvr_device);
+    else if (type == 0)
+        device_add(&at_nvr_device);
+
+    standalone_gameport_type = &gameport_device;
+}
+
+void
+machine_at_common_init(const machine_t *model)
+{
+    machine_at_common_init_ex(model, 0);
+}
+
+void
+machine_at_init(const machine_t *model)
+{
+    machine_at_common_init(model);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+}
+
+void
+machine_at_ps2_init(const machine_t *model)
+{
+    machine_at_common_init(model);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+}
+
+void
+machine_at_common_ide_init(const machine_t *model)
+{
+    machine_at_common_init(model);
+
+    device_add(&ide_isa_device);
+}
+
+void
+machine_at_ibm_common_ide_init(const machine_t *model)
+{
+    machine_at_common_init_ex(model, 1);
+
+    device_add(&ide_isa_device);
+}
+
+void
+machine_at_ide_init(const machine_t *model)
+{
+    machine_at_init(model);
+
+    device_add(&ide_isa_device);
+}
+
+void
+machine_at_ps2_ide_init(const machine_t *model)
+{
+    machine_at_ps2_init(model);
+
+    device_add(&ide_isa_device);
+}
+
+
diff --git a/src/machine/m_at_compaq.c b/src/machine/m_at_compaq.c
deleted file mode 100644
index 428199de7..000000000
--- a/src/machine/m_at_compaq.c
+++ /dev/null
@@ -1,898 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Emulation of various Compaq PC's.
- *
- *
- *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
- *          TheCollector1995, <mariogplayer@gmail.com>
- *
- *          Copyright 2008-2018 Sarah Walker.
- *          Copyright 2016-2018 Miran Grca.
- */
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <math.h>
-#include <86box/86box.h>
-#include "cpu.h"
-#include <86box/io.h>
-#include <86box/timer.h>
-#include <86box/pit.h>
-#include <86box/mem.h>
-#include <86box/rom.h>
-#include <86box/device.h>
-#include <86box/chipset.h>
-#include <86box/keyboard.h>
-#include <86box/fdd.h>
-#include <86box/fdc.h>
-#include <86box/fdc_ext.h>
-#include <86box/hdc.h>
-#include <86box/hdc_ide.h>
-#include <86box/machine.h>
-#include <86box/video.h>
-#include <86box/vid_cga.h>
-#include <86box/vid_cga_comp.h>
-#include <86box/plat_unused.h>
-
-
-static video_timings_t timing_compaq_plasma = { .type = VIDEO_ISA, .write_b = 8, .write_w = 16, .write_l = 32, .read_b = 8, .read_w = 16, .read_l = 32 };
-
-enum {
-    COMPAQ_PORTABLEII = 0,
-    COMPAQ_PORTABLEIII,
-    COMPAQ_PORTABLEIII386,
-    COMPAQ_DESKPRO386,
-    COMPAQ_DESKPRO386_05_1988
-};
-
-#define CGA_RGB       0
-#define CGA_COMPOSITE 1
-
-/*Very rough estimate*/
-#define VID_CLOCK (double) (651 * 416 * 60)
-
-static uint8_t cga_crtcmask[32] = {
-    0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x7f, 0x7f, 0xf3, 0x1f, 0x7f, 0x1f, 0x3f, 0xff, 0x3f, 0xff,
-    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-/* Mapping of attributes to colours */
-static uint32_t amber;
-static uint32_t black;
-static uint32_t blinkcols[256][2];
-static uint32_t normcols[256][2];
-
-/* Video options set by the motherboard; they will be picked up by the card
- * on the next poll.
- *
- * Bit  3:   Disable built-in video (for add-on card)
- * Bit  2:   Thin font
- * Bits 0,1: Font set (not currently implemented)
- */
-static int8_t cpq_st_display_internal = -1;
-
-static uint8_t mdaattr[256][2][2];
-
-static void
-compaq_plasma_display_set(uint8_t internal)
-{
-    cpq_st_display_internal = internal;
-}
-
-static uint8_t
-compaq_plasma_display_get(void)
-{
-    return cpq_st_display_internal;
-}
-
-typedef struct compaq_plasma_t {
-    cga_t         cga;
-    uint8_t       port_23c6;
-    uint8_t       internal_monitor;
-    uint8_t       attrmap;
-} compaq_plasma_t;
-
-static int compaq_machine_type = 0;
-
-/* Compaq Deskpro 386 remaps RAM from 0xA0000-0xFFFFF to 0xFA0000-0xFFFFFF */
-static mem_mapping_t ram_mapping;
-
-static void compaq_plasma_recalcattrs(compaq_plasma_t *self);
-
-static void
-compaq_plasma_recalctimings(compaq_plasma_t *self)
-{
-    double _dispontime;
-    double _dispofftime;
-    double disptime;
-
-    if (!self->internal_monitor && !(self->port_23c6 & 1)) {
-        cga_recalctimings(&self->cga);
-        return;
-    }
-
-    disptime          = 651;
-    _dispontime       = 640;
-    _dispofftime      = disptime - _dispontime;
-    self->cga.dispontime  = (uint64_t) (_dispontime * (cpuclock / VID_CLOCK) * (double) (1ULL << 32));
-    self->cga.dispofftime = (uint64_t) (_dispofftime * (cpuclock / VID_CLOCK) * (double) (1ULL << 32));
-}
-
-static void
-compaq_plasma_waitstates(UNUSED(void *priv))
-{
-    int ws_array[16] = { 3, 4, 5, 6, 7, 8, 4, 5, 6, 7, 8, 4, 5, 6, 7, 8 };
-    int ws;
-
-    ws = ws_array[cycles & 0xf];
-    sub_cycles(ws);
-}
-
-static void
-compaq_plasma_write(uint32_t addr, uint8_t val, void *priv)
-{
-    compaq_plasma_t *self = (compaq_plasma_t *) priv;
-
-    self->cga.vram[addr & 0x7fff] = val;
-    compaq_plasma_waitstates(&self->cga);
-}
-
-static uint8_t
-compaq_plasma_read(uint32_t addr, void *priv)
-{
-    compaq_plasma_t *self = (compaq_plasma_t *) priv;
-    uint8_t          ret;
-
-    compaq_plasma_waitstates(&self->cga);
-    ret = (self->cga.vram[addr & 0x7fff]);
-
-    return ret;
-}
-
-static void
-compaq_plasma_out(uint16_t addr, uint8_t val, void *priv)
-{
-    compaq_plasma_t *self = (compaq_plasma_t *) priv;
-    uint8_t          old;
-
-    switch (addr) {
-        /* Emulated CRTC, register select */
-        case 0x3d4:
-            cga_out(addr, val, &self->cga);
-            break;
-
-        /* Emulated CRTC, value */
-        case 0x3d5:
-            old                               = self->cga.crtc[self->cga.crtcreg];
-            self->cga.crtc[self->cga.crtcreg] = val & cga_crtcmask[self->cga.crtcreg];
-
-            /* Register 0x12 controls the attribute mappings for the
-             * plasma screen. */
-            if (self->cga.crtcreg == 0x12) {
-                self->attrmap = val;
-                compaq_plasma_recalcattrs(self);
-                break;
-            }
-
-            if (old != val) {
-                if (self->cga.crtcreg < 0xe || self->cga.crtcreg > 0x10) {
-                    self->cga.fullchange = changeframecount;
-                    compaq_plasma_recalctimings(self);
-                }
-            }
-            break;
-        case 0x3d8:
-        case 0x3d9:
-            cga_out(addr, val, &self->cga);
-            break;
-
-        case 0x13c6:
-            compaq_plasma_display_set((val & 8) ? 1 : 0);
-            break;
-
-        case 0x23c6:
-            self->port_23c6 = val;
-            if (val & 8) /* Disable internal CGA */
-                mem_mapping_disable(&self->cga.mapping);
-            else
-                mem_mapping_enable(&self->cga.mapping);
-            break;
-
-        default:
-            break;
-    }
-}
-
-static uint8_t
-compaq_plasma_in(uint16_t addr, void *priv)
-{
-    compaq_plasma_t *self = (compaq_plasma_t *) priv;
-    uint8_t          ret  = 0xff;
-
-    switch (addr) {
-        case 0x3d4:
-        case 0x3da:
-            ret = cga_in(addr, &self->cga);
-            break;
-
-        case 0x3d5:
-            if (self->cga.crtcreg == 0x12) {
-                ret = self->attrmap & 0x0f;
-                if (self->internal_monitor)
-                    ret |= 0x30; /* Plasma / CRT */
-            } else
-                ret = cga_in(addr, &self->cga);
-            break;
-
-        case 0x13c6:
-            ret = compaq_plasma_display_get() ? 8 : 0;
-            ret |= 4;
-            break;
-
-        case 0x1bc6:
-            ret = 0;
-            if (compaq_plasma_display_get()) {
-                if ((self->cga.cgamode & 0x12) == 0x12) {
-                    if (self->port_23c6 & 8)
-                        ret |= 0x40;
-                    else
-                        ret |= 0x20;
-                }
-            }
-            break;
-
-        case 0x23c6:
-            ret = 0;
-            break;
-
-        default:
-            break;
-    }
-
-    return ret;
-}
-
-static void
-compaq_plasma_poll(void *priv)
-{
-    compaq_plasma_t *self = (compaq_plasma_t *) priv;
-    uint8_t  chr;
-    uint8_t  attr;
-    uint8_t  sc;
-    uint16_t ma  = (self->cga.crtc[13] | (self->cga.crtc[12] << 8)) & 0x7fff;
-    uint16_t ca  = (self->cga.crtc[15] | (self->cga.crtc[14] << 8)) & 0x7fff;
-    uint16_t addr;
-    int      drawcursor;
-    int      cursorline;
-    int      blink     = 0;
-    int      underline = 0;
-    uint32_t ink = 0;
-    uint32_t fg = (self->cga.cgacol & 0x0f) ? amber : black;
-    uint32_t bg = black;
-    uint32_t cols[2];
-    uint8_t  dat;
-    uint8_t  pattern;
-    uint32_t ink0 = 0;
-    uint32_t ink1 = 0;
-
-    /* Switch between internal plasma and external CRT display. */
-    if ((cpq_st_display_internal != -1) && (cpq_st_display_internal != self->internal_monitor)) {
-        self->internal_monitor = cpq_st_display_internal;
-        compaq_plasma_recalctimings(self);
-    }
-
-    /* graphic mode and not mode 40h */
-    if (!self->internal_monitor && !(self->port_23c6 & 1)) {
-        cga_poll(&self->cga);
-        return;
-    }
-
-    /* mode 40h or text mode */
-    if (!self->cga.linepos) {
-        timer_advance_u64(&self->cga.timer, self->cga.dispofftime);
-        self->cga.cgastat |= 1;
-        self->cga.linepos = 1;
-        if (self->cga.cgadispon) {
-            if (self->cga.displine == 0) {
-                video_wait_for_buffer();
-            }
-            if (self->cga.cgamode & 2) {
-                if (self->cga.cgamode & 0x10) {
-                    /* 640x400 mode */
-                    if (self->port_23c6 & 1) /* 640*400 */ {
-                        addr = ((self->cga.displine) & 1) * 0x2000 + ((self->cga.displine >> 1) & 1) * 0x4000 + (self->cga.displine >> 2) * 80 + ((ma & ~1) << 1);
-                    } else {
-                        addr = ((self->cga.displine >> 1) & 1) * 0x2000 + (self->cga.displine >> 2) * 80 + ((ma & ~1) << 1);
-                    }
-                    for (uint8_t x = 0; x < 80; x++) {
-                        dat = self->cga.vram[addr & 0x7FFF];
-                        addr++;
-
-                        for (uint8_t c = 0; c < 8; c++) {
-                            ink = (dat & 0x80) ? fg : bg;
-                            if (!(self->cga.cgamode & 8))
-                                ink = black;
-                            (buffer32->line[self->cga.displine])[x * 8 + c] = ink;
-                            dat <<= 1;
-                        }
-                    }
-                } else {
-                    addr = ((self->cga.displine >> 1) & 1) * 0x2000 + (self->cga.displine >> 2) * 80 + ((ma & ~1) << 1);
-                    for (uint8_t x = 0; x < 80; x++) {
-                        dat = self->cga.vram[addr & 0x7fff];
-                        addr++;
-
-                        for (uint8_t c = 0; c < 4; c++) {
-                            pattern = (dat & 0xC0) >> 6;
-                            if (!(self->cga.cgamode & 8))
-                                pattern = 0;
-
-                            switch (pattern & 3) {
-                                case 0:
-                                    ink0 = ink1 = black;
-                                    break;
-                                case 1:
-                                    if (self->cga.displine & 1) {
-                                        ink0 = black;
-                                        ink1 = black;
-                                    } else {
-                                        ink0 = amber;
-                                        ink1 = black;
-                                    }
-                                    break;
-                                case 2:
-                                    if (self->cga.displine & 1) {
-                                        ink0 = black;
-                                        ink1 = amber;
-                                    } else {
-                                        ink0 = amber;
-                                        ink1 = black;
-                                    }
-                                    break;
-                                case 3:
-                                    ink0 = ink1 = amber;
-                                    break;
-
-                                default:
-                                    break;
-                            }
-                            buffer32->line[self->cga.displine][x * 8 + 2 * c]     = ink0;
-                            buffer32->line[self->cga.displine][x * 8 + 2 * c + 1] = ink1;
-                            dat <<= 2;
-                        }
-                    }
-                }
-            } else if (self->cga.cgamode & 1) {
-                /* 80-col */
-                sc = self->cga.displine & 0x0f;
-                addr = ((ma & ~1) + (self->cga.displine >> 4) * 80) * 2;
-                ma += (self->cga.displine >> 4) * 80;
-
-                if ((self->cga.crtc[0x0a] & 0x60) == 0x20)
-                    cursorline = 0;
-                else
-                    cursorline = ((self->cga.crtc[0x0a] & 0x0f) * 2 <= sc) && ((self->cga.crtc[0x0b] & 0x0F) * 2 >= sc);
-
-                /* for each text column */
-                for (uint8_t x = 0; x < 80; x++) {
-                    /* video output enabled */
-                    chr        = self->cga.vram[(addr + 2 * x) & 0x7FFF];
-                    attr       = self->cga.vram[(addr + 2 * x + 1) & 0x7FFF];
-                    drawcursor = ((ma == ca) && cursorline && (self->cga.cgamode & 8) && (self->cga.cgablink & 16));
-
-                    blink = ((self->cga.cgablink & 16) && (self->cga.cgamode & 0x20) && (attr & 0x80) && !drawcursor);
-                    underline = ((self->port_23c6 & 0x40) && (attr & 0x1) && !(attr & 0x6));
-                    /* blink active */
-                    if (self->cga.cgamode & 0x20) {
-                        cols[1] = blinkcols[attr][1];
-                        cols[0] = blinkcols[attr][0];
-                        /* attribute 7 active and not cursor */
-                        if (blink) {
-                            /* set blinking */
-                            cols[1] = cols[0];
-                        }
-                    } else {
-                        /* Set intensity bit */
-                        cols[1] = normcols[attr][1];
-                        cols[0] = normcols[attr][0];
-                    }
-                    /* character underline active and 7th row of pixels in character height being drawn */
-                    if (underline && (sc == 7)) {
-                        /* for each pixel in character width */
-                        for (uint8_t c = 0; c < 8; c++)
-                            buffer32->line[self->cga.displine][(x << 3) + c] = mdaattr[attr][blink][1];
-                    } else if (drawcursor) {
-                        for (uint8_t c = 0; c < 8; c++)
-                            buffer32->line[self->cga.displine][(x << 3) + c] = cols[(fontdatm2[chr + self->cga.fontbase][sc] & (1 << (c ^ 7))) ? 1 : 0] ^ (amber ^ black);
-                    } else {
-                        for (uint8_t c = 0; c < 8; c++)
-                            buffer32->line[self->cga.displine][(x << 3) + c] = cols[(fontdatm2[chr + self->cga.fontbase][sc] & (1 << (c ^ 7))) ? 1 : 0];
-                    }
-
-                    ++ma;
-                }
-            } else { /* 40-col */
-                sc = self->cga.displine & 0x0f;
-                addr = ((ma & ~1) + (self->cga.displine >> 4) * 40) * 2;
-                ma += (self->cga.displine >> 4) * 40;
-
-                if ((self->cga.crtc[0x0a] & 0x60) == 0x20)
-                    cursorline = 0;
-                else
-                    cursorline = ((self->cga.crtc[0x0a] & 0x0f) * 2 <= sc) && ((self->cga.crtc[0x0b] & 0x0F) * 2 >= sc);
-
-                for (uint8_t x = 0; x < 40; x++) {
-                    chr        = self->cga.vram[(addr + 2 * x) & 0x7FFF];
-                    attr       = self->cga.vram[(addr + 2 * x + 1) & 0x7FFF];
-                    drawcursor = ((ma == ca) && cursorline && (self->cga.cgamode & 8) && (self->cga.cgablink & 16));
-
-                    blink = ((self->cga.cgablink & 16) && (self->cga.cgamode & 0x20) && (attr & 0x80) && !drawcursor);
-                    underline = ((self->port_23c6 & 0x40) && (attr & 0x1) && !(attr & 0x6));
-                    /* blink active */
-                    if (self->cga.cgamode & 0x20) {
-                        cols[1] = blinkcols[attr][1];
-                        cols[0] = blinkcols[attr][0];
-                        /* attribute 7 active and not cursor */
-                        if (blink) {
-                            /* set blinking */
-                            cols[1] = cols[0];
-                        }
-                    } else {
-                        /* Set intensity bit */
-                        cols[1] = normcols[attr][1];
-                        cols[0] = normcols[attr][0];
-                    }
-                    /* character underline active and 7th row of pixels in character height being drawn */
-                    if (underline && (sc == 7)) {
-                        /* for each pixel in character width */
-                        for (uint8_t c = 0; c < 8; c++)
-                            buffer32->line[self->cga.displine][(x << 4) + (c * 2)] = buffer32->line[self->cga.displine][(x << 4) + (c * 2) + 1] = mdaattr[attr][blink][1];
-                    } else if (drawcursor) {
-                        for (uint8_t c = 0; c < 8; c++)
-                            buffer32->line[self->cga.displine][(x << 4) + c * 2] = buffer32->line[self->cga.displine][(x << 4) + c * 2 + 1] = cols[(fontdatm2[chr][sc] & (1 << (c ^ 7))) ? 1 : 0] ^ (amber ^ black);
-                    } else {
-                        for (uint8_t c = 0; c < 8; c++)
-                            buffer32->line[self->cga.displine][(x << 4) + c * 2] = buffer32->line[self->cga.displine][(x << 4) + c * 2 + 1] = cols[(fontdatm2[chr][sc] & (1 << (c ^ 7))) ? 1 : 0];
-                    }
-                    ++ma;
-                }
-            }
-        }
-        self->cga.displine++;
-        /* Hardcode a fixed refresh rate and VSYNC timing */
-        if (self->cga.displine == 400) { /* Start of VSYNC */
-            self->cga.cgastat |= 8;
-            self->cga.cgadispon = 0;
-        }
-        if (self->cga.displine == 416) { /* End of VSYNC */
-            self->cga.displine = 0;
-            self->cga.cgastat &= ~8;
-            self->cga.cgadispon = 1;
-        }
-    } else {
-        if (self->cga.cgadispon)
-            self->cga.cgastat &= ~1;
-
-        timer_advance_u64(&self->cga.timer, self->cga.dispontime);
-        self->cga.linepos = 0;
-
-        if (self->cga.displine == 400) {
-            /* Hardcode 640x400 window size */
-            if ((640 != xsize) || (400 != ysize) || video_force_resize_get()) {
-                xsize = 640;
-                ysize = 400;
-                if (xsize < 64)
-                    xsize = 656;
-                if (ysize < 32)
-                    ysize = 200;
-                set_screen_size(xsize, ysize);
-
-                if (video_force_resize_get())
-                    video_force_resize_set(0);
-            }
-            video_blit_memtoscreen(0, 0, xsize, ysize);
-            frames++;
-
-            /* Fixed 640x400 resolution */
-            video_res_x = 640;
-            video_res_y = 400;
-
-            if (self->cga.cgamode & 0x02) {
-                if (self->cga.cgamode & 0x10)
-                    video_bpp = 1;
-                else
-                    video_bpp = 2;
-            } else
-                video_bpp = 0;
-
-            self->cga.cgablink++;
-        }
-    }
-}
-
-static void
-compaq_plasma_mdaattr_rebuild(void)
-{
-    for (uint16_t c = 0; c < 256; c++) {
-        mdaattr[c][0][0] = mdaattr[c][1][0] = mdaattr[c][1][1] = 16;
-        if (c & 8)
-            mdaattr[c][0][1] = 15 + 16;
-        else
-            mdaattr[c][0][1] = 7 + 16;
-    }
-
-    mdaattr[0x70][0][1] = 16;
-    mdaattr[0x70][0][0] = mdaattr[0x70][1][0] = mdaattr[0x70][1][1] = 16 + 15;
-    mdaattr[0xF0][0][1]                                             = 16;
-    mdaattr[0xF0][0][0] = mdaattr[0xF0][1][0] = mdaattr[0xF0][1][1] = 16 + 15;
-    mdaattr[0x78][0][1]                                             = 16 + 7;
-    mdaattr[0x78][0][0] = mdaattr[0x78][1][0] = mdaattr[0x78][1][1] = 16 + 15;
-    mdaattr[0xF8][0][1]                                             = 16 + 7;
-    mdaattr[0xF8][0][0] = mdaattr[0xF8][1][0] = mdaattr[0xF8][1][1] = 16 + 15;
-    mdaattr[0x00][0][1] = mdaattr[0x00][1][1] = 16;
-    mdaattr[0x08][0][1] = mdaattr[0x08][1][1] = 16;
-    mdaattr[0x80][0][1] = mdaattr[0x80][1][1] = 16;
-    mdaattr[0x88][0][1] = mdaattr[0x88][1][1] = 16;
-}
-
-static void
-compaq_plasma_recalcattrs(compaq_plasma_t *self)
-{
-    int n;
-
-    /* val behaves as follows:
-     *     Bit 0: Attributes 01-06, 08-0E are inverse video
-     *     Bit 1: Attributes 01-06, 08-0E are bold
-     *     Bit 2: Attributes 11-16, 18-1F, 21-26, 28-2F ... F1-F6, F8-FF
-     *            are inverse video
-     *     Bit 3: Attributes 11-16, 18-1F, 21-26, 28-2F ... F1-F6, F8-FF
-     *            are bold */
-
-    /* Set up colours */
-    amber = makecol(0xff, 0x7d, 0x00);
-    black = makecol(0x64, 0x0c, 0x00);
-
-    /* Initialize the attribute mapping. Start by defaulting everything
-     * to black on amber, and with bold set by bit 3 */
-    for (n = 0; n < 256; n++) {
-        blinkcols[n][0] = normcols[n][0] = amber;
-        blinkcols[n][1] = normcols[n][1] = black;
-    }
-
-    /* Colours 0x11-0xFF are controlled by bits 2 and 3 of the
-     * passed value. Exclude x0 and x8, which are always black on
-     * amber. */
-    for (n = 0x11; n <= 0xFF; n++) {
-        if ((n & 7) == 0)
-            continue;
-        if (self->attrmap & 4) { /* Inverse */
-            blinkcols[n][0] = normcols[n][0] = amber;
-            blinkcols[n][1] = normcols[n][1] = black;
-        } else { /* Normal */
-            blinkcols[n][0] = normcols[n][0] = black;
-            blinkcols[n][1] = normcols[n][1] = amber;
-        }
-    }
-    /* Set up the 01-0E range, controlled by bits 0 and 1 of the
-     * passed value. When blinking is enabled this also affects 81-8E. */
-    for (n = 0x01; n <= 0x0E; n++) {
-        if (n == 7)
-            continue;
-        if (self->attrmap & 1) {
-            blinkcols[n][0] = normcols[n][0] = amber;
-            blinkcols[n][1] = normcols[n][1] = black;
-            blinkcols[n + 128][0]            = amber;
-            blinkcols[n + 128][1]            = black;
-        } else {
-            blinkcols[n][0] = normcols[n][0] = black;
-            blinkcols[n][1] = normcols[n][1] = amber;
-            blinkcols[n + 128][0]            = black;
-            blinkcols[n + 128][1]            = amber;
-        }
-    }
-    /* Colours 07 and 0F are always amber on black. If blinking is
-     * enabled so are 87 and 8F. */
-    for (n = 0x07; n <= 0x0F; n += 8) {
-        blinkcols[n][0] = normcols[n][0] = black;
-        blinkcols[n][1] = normcols[n][1] = amber;
-        blinkcols[n + 128][0]            = black;
-        blinkcols[n + 128][1]            = amber;
-    }
-    /* When not blinking, colours 81-8F are always amber on black. */
-    for (n = 0x81; n <= 0x8F; n++) {
-        normcols[n][0] = black;
-        normcols[n][1] = amber;
-    }
-
-    /* Finally do the ones which are solid black. These differ between
-     * the normal and blinking mappings */
-    for (n = 0; n <= 0xFF; n += 0x11)
-        normcols[n][0] = normcols[n][1] = black;
-
-    /* In the blinking range, 00 11 22 .. 77 and 80 91 A2 .. F7 are black */
-    for (n = 0; n <= 0x77; n += 0x11) {
-        blinkcols[n][0] = blinkcols[n][1] = black;
-        blinkcols[n + 128][0] = blinkcols[n + 128][1] = black;
-    }
-}
-
-static void *
-compaq_plasma_init(UNUSED(const device_t *info))
-{
-    compaq_plasma_t *self = malloc(sizeof(compaq_plasma_t));
-    memset(self, 0, sizeof(compaq_plasma_t));
-
-    video_inform(VIDEO_FLAG_TYPE_CGA, &timing_compaq_plasma);
-    loadfont_ex("roms/machines/portableiii/K Combined.bin", 11, 0x4bb2);
-
-    self->cga.composite = 0;
-    self->cga.revision  = 0;
-
-    self->cga.vram             = malloc(0x8000);
-    self->internal_monitor = 1;
-
-    cga_comp_init(self->cga.revision);
-    timer_add(&self->cga.timer, compaq_plasma_poll, self, 1);
-    mem_mapping_add(&self->cga.mapping, 0xb8000, 0x08000, compaq_plasma_read, NULL, NULL, compaq_plasma_write, NULL, NULL, NULL /*self->cga.vram*/, MEM_MAPPING_EXTERNAL, self);
-    io_sethandler(0x03d0, 0x0010, compaq_plasma_in, NULL, NULL, compaq_plasma_out, NULL, NULL, self);
-    io_sethandler(0x13c6, 0x0001, compaq_plasma_in, NULL, NULL, compaq_plasma_out, NULL, NULL, self);
-    io_sethandler(0x1bc6, 0x0001, compaq_plasma_in, NULL, NULL, compaq_plasma_out, NULL, NULL, self);
-    io_sethandler(0x23c6, 0x0001, compaq_plasma_in, NULL, NULL, compaq_plasma_out, NULL, NULL, self);
-
-    /* Default attribute mapping is 4 */
-    self->attrmap = 4;
-    compaq_plasma_recalcattrs(self);
-
-    self->cga.cgastat = 0xf4;
-    overscan_x = overscan_y = 16;
-
-    self->cga.rgb_type = device_get_config_int("rgb_type");
-    cga_palette        = (self->cga.rgb_type << 1);
-    cgapal_rebuild();
-    compaq_plasma_mdaattr_rebuild();
-
-    return self;
-}
-
-static void
-compaq_plasma_close(void *priv)
-{
-    compaq_plasma_t *self = (compaq_plasma_t *) priv;
-
-    free(self->cga.vram);
-    free(self);
-}
-
-static void
-compaq_plasma_speed_changed(void *priv)
-{
-    compaq_plasma_t *self = (compaq_plasma_t *) priv;
-
-    compaq_plasma_recalctimings(self);
-}
-
-const device_config_t compaq_plasma_config[] = {
-  // clang-format off
-    {
-        .name = "rgb_type",
-        .description = "RGB type",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "Color",            .value = 0 },
-            { .description = "Green Monochrome", .value = 1 },
-            { .description = "Amber Monochrome", .value = 2 },
-            { .description = "Gray Monochrome",  .value = 3 },
-            { .description = ""                             }
-        }
-    },
-    { .name = "", .description = "", .type = CONFIG_END }
-  // clang-format on
-};
-
-const device_t compaq_plasma_device = {
-    .name          = "Compaq Plasma",
-    .internal_name = "compaq_plasma",
-    .flags         = 0,
-    .local         = 0,
-    .init          = compaq_plasma_init,
-    .close         = compaq_plasma_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = compaq_plasma_speed_changed,
-    .force_redraw  = NULL,
-    .config        = compaq_plasma_config
-};
-
-static uint8_t
-read_ram(uint32_t addr, UNUSED(void *priv))
-{
-    addr = (addr & 0x7ffff) + 0x80000;
-    addreadlookup(mem_logical_addr, addr);
-
-    return (ram[addr]);
-}
-
-static uint16_t
-read_ramw(uint32_t addr, UNUSED(void *priv))
-{
-    addr = (addr & 0x7ffff) + 0x80000;
-    addreadlookup(mem_logical_addr, addr);
-
-    return (*(uint16_t *) &ram[addr]);
-}
-
-static uint32_t
-read_raml(uint32_t addr, UNUSED(void *priv))
-{
-    addr = (addr & 0x7ffff) + 0x80000;
-    addreadlookup(mem_logical_addr, addr);
-
-    return (*(uint32_t *) &ram[addr]);
-}
-
-static void
-write_ram(uint32_t addr, uint8_t val, UNUSED(void *priv))
-{
-    addr = (addr & 0x7ffff) + 0x80000;
-    addwritelookup(mem_logical_addr, addr);
-
-    mem_write_ramb_page(addr, val, &pages[addr >> 12]);
-}
-
-static void
-write_ramw(uint32_t addr, uint16_t val, UNUSED(void *priv))
-{
-    addr = (addr & 0x7ffff) + 0x80000;
-    addwritelookup(mem_logical_addr, addr);
-
-    mem_write_ramw_page(addr, val, &pages[addr >> 12]);
-}
-
-static void
-write_raml(uint32_t addr, uint32_t val, UNUSED(void *priv))
-{
-    addr = (addr & 0x7ffff) + 0x80000;
-    addwritelookup(mem_logical_addr, addr);
-
-    mem_write_raml_page(addr, val, &pages[addr >> 12]);
-}
-
-static void
-machine_at_compaq_init(const machine_t *model, int type)
-{
-    compaq_machine_type = type;
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    if (type < COMPAQ_PORTABLEIII386) {
-        mem_remap_top(384);
-        mem_mapping_add(&ram_mapping, 0xfa0000, 0x60000,
-                        read_ram, read_ramw, read_raml,
-                        write_ram, write_ramw, write_raml,
-                        0xa0000 + ram, MEM_MAPPING_INTERNAL, NULL);
-    }
-
-    video_reset(gfxcard[0]);
-
-    switch (type) {
-        case COMPAQ_PORTABLEII:
-            machine_at_init(model);
-            break;
-
-        case COMPAQ_PORTABLEIII:
-        case COMPAQ_PORTABLEIII386:
-            if (hdc_current == 1)
-                device_add(&ide_isa_device);
-            if (gfxcard[0] == VID_INTERNAL)
-                device_add(&compaq_plasma_device);
-            machine_at_init(model);
-            break;
-
-        case COMPAQ_DESKPRO386:
-        case COMPAQ_DESKPRO386_05_1988:
-            device_add(&compaq_386_device);
-            machine_at_common_init(model);
-            device_add(&keyboard_at_compaq_device);
-            break;
-
-        default:
-            break;
-    }
-}
-
-int
-machine_at_portableii_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleavedr("roms/machines/portableii/109740-001.rom",
-                                 "roms/machines/portableii/109739-001.rom",
-                                 0x000f8000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_compaq_init(model, COMPAQ_PORTABLEII);
-
-    return ret;
-}
-
-int
-machine_at_portableiii_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linearr("roms/machines/portableiii/K Combined.bin",
-                                0x000f8000, 65536, 0);
-
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_compaq_init(model, COMPAQ_PORTABLEIII);
-
-    return ret;
-}
-
-int
-machine_at_portableiii386_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linearr("roms/machines/portableiii/K Combined.bin",
-                                0x000f8000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_compaq_init(model, COMPAQ_PORTABLEIII386);
-
-    return ret;
-}
-
-int
-machine_at_deskpro386_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linearr("roms/machines/deskpro386/1986-09-04-HI.json.bin",
-                            0x000f8000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_compaq_init(model, COMPAQ_DESKPRO386);
-
-    return ret;
-}
-
-int
-machine_at_deskpro386_05_1988_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linearr("roms/machines/deskpro386/1988-05-10.json.bin",
-                            0x000f8000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_compaq_init(model, COMPAQ_DESKPRO386_05_1988);
-
-    return ret;
-}
diff --git a/src/machine/m_at_m6117.c b/src/machine/m_at_m6117.c
new file mode 100644
index 000000000..2d8116b12
--- /dev/null
+++ b/src/machine/m_at_m6117.c
@@ -0,0 +1,88 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of 386SX machines.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          EngiNerd <webmaster.crrc@yahoo.it>
+ *
+ *          Copyright 2016-2025 Miran Grca.
+ *          Copyright 2020-2025 EngiNerd.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/chipset.h>
+#include <86box/keyboard.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/hdc.h>
+#include <86box/nvr.h>
+#include <86box/port_6x.h>
+#define USE_SIO_DETECT
+#include <86box/sio.h>
+#include <86box/serial.h>
+#include <86box/video.h>
+#include <86box/vid_cga.h>
+#include <86box/flash.h>
+#include <86box/machine.h>
+
+/* ALi M6117D */
+int
+machine_at_pja511m_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/pja511m/2006915102435734.rom",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add_inst_params(&fdc37c669_device, 1, (void *) FDC37C6XX_IDE_PRI);
+    device_add_inst_params(&fdc37c669_device, 2, (void *) 0);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add(&ali6117d_device);
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
+
+int
+machine_at_prox1332_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/prox1332/D30B3AC1.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add_params(&fdc37c669_device, (void *) FDC37C6XX_370);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add(&ali6117d_device);
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
diff --git a/src/machine/m_at_misc.c b/src/machine/m_at_misc.c
index d4264f07e..268cf7f7d 100644
--- a/src/machine/m_at_misc.c
+++ b/src/machine/m_at_misc.c
@@ -8,11 +8,9 @@
  *
  *          Implementation of Miscellaneous, Fake, Hypervisor machines.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2016-2019 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -65,8 +63,7 @@ machine_at_vpc2007_init(const machine_t *model)
     pci_register_slot(0x0F, PCI_CARD_NORMAL, 1, 2, 3, 4);
     device_add(&i440bx_no_agp_device);
     device_add(&piix4e_device);
-    device_add(&w83977f_370_device);
-    device_add(&keyboard_ps2_ami_pci_device);
+    device_add_params(&w83977_device, (void *) (W83977F | W83977_370 | W83977_AMI | W83977_NO_NVR));
     device_add(&intel_flash_bxt_device);
     spd_register(SPD_TYPE_SDRAM, 0xF, 256); /* real VPC provides invalid SPD data */
 
diff --git a/src/machine/m_at_slot1.c b/src/machine/m_at_slot1.c
index 12c84ffdf..12fd9861f 100644
--- a/src/machine/m_at_slot1.c
+++ b/src/machine/m_at_slot1.c
@@ -8,11 +8,9 @@
  *
  *          Implementation of Slot 1 machines.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2016-2019 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -40,6 +38,69 @@
 #include <86box/clock.h>
 #include <86box/snd_ac97.h>
 
+/* ALi ALADDiN-PRO II */
+int
+machine_at_m729_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/m729/M729NEW.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x0F, PCI_CARD_SOUTHBRIDGE_IDE, 1, 2, 3, 4);
+    pci_register_slot(0x03, PCI_CARD_SOUTHBRIDGE_PMU, 1, 2, 3, 4);
+    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE_USB, 1, 2, 3, 4);
+    pci_register_slot(0x14, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x12, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x10, PCI_CARD_NORMAL, 3, 4, 1, 2);
+    device_add(&ali1621_device);
+    device_add(&ali1543c_device); /* +0 */
+    device_add(&winbond_flash_w29c010_device);
+    spd_register(SPD_TYPE_SDRAM, 0x7, 512);
+
+    return ret;
+}
+
+/* i440FX */
+int
+machine_at_acerv62x_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/acerv62x/v62xc0s1.bin",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 5, 0, 0, 4);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x10, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    device_add(&i440fx_device);
+    device_add(&piix3_device);
+    device_add_params(&fdc37c93x_device, (void *) (FDC37XXX5 | FDC37C93X_APM));
+    device_add(&sst_flash_29ee020_device);
+    spd_register(SPD_TYPE_SDRAM, 0x7, 128);
+
+    return ret;
+}
+
 int
 machine_at_p65up5_cpknd_init(const machine_t *model)
 {
@@ -79,8 +140,8 @@ machine_at_kn97_init(const machine_t *model)
     pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
     device_add(&i440fx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&w83877f_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&w83877_device, (void *) (W83877F | W83877_3F0));
     device_add(&intel_flash_bxt_device);
     device_add(&lm78_device); /* fans: Chassis, CPU, Power; temperature: MB */
     for (uint8_t i = 0; i < 3; i++)
@@ -89,6 +150,7 @@ machine_at_kn97_init(const machine_t *model)
     return ret;
 }
 
+/* i440LX */
 int
 machine_at_lx6_init(const machine_t *model)
 {
@@ -112,14 +174,48 @@ machine_at_lx6_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&i440lx_device);
     device_add(&piix4e_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&w83977tf_device);
+    device_add_params(&w83977_device, (void *) (W83977TF | W83977_AMI | W83977_NO_NVR));
     device_add(&sst_flash_29ee010_device);
     spd_register(SPD_TYPE_SDRAM, 0xF, 256);
 
     return ret;
 }
 
+int
+machine_at_optiplexgxa_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/optiplexgxa/DELL.ROM",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 4);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
+    pci_register_slot(0x11, PCI_CARD_NETWORK,     4, 0, 0, 0);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 2, 1);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      2, 1, 3, 4);
+    pci_register_slot(0x0F, PCI_CARD_BRIDGE,      0, 0, 0, 0);
+
+    if (sound_card_current[0] == SOUND_INTERNAL)
+        device_add(machine_get_snd_device(machine));
+
+    device_add(&i440lx_device);
+    device_add(&piix4_device);
+    machine_at_optiplex_21152_init();
+    device_add_params(&pc87307_device, (void *) (PCX730X_PHOENIX_42 | PCX7307_PC87307));
+    device_add(&intel_flash_bxt_device);
+    spd_register(SPD_TYPE_SDRAM, 0x7, 256);
+
+    return ret;
+}
+
 int
 machine_at_spitfire_init(const machine_t *model)
 {
@@ -131,7 +227,7 @@ machine_at_spitfire_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init_ex(model, 2);
+    machine_at_common_init(model);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
@@ -143,8 +239,7 @@ machine_at_spitfire_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&i440lx_device);
     device_add(&piix4e_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&fdc37c935_device);
+    device_add_params(&fdc37c93x_device, (void *) (FDC37XXX5 | FDC37C93X_NORMAL | FDC37C93X_NO_NVR));
     device_add(&intel_flash_bxt_device);
     spd_register(SPD_TYPE_SDRAM, 0xF, 256);
     device_add(&lm78_device); /* no reporting in BIOS */
@@ -180,14 +275,14 @@ machine_at_ma30d_init(const machine_t *model)
     device_add(&i440lx_device);
     device_add(&piix4e_device);
     device_add(&nec_mate_unk_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c67x_device);
+    device_add_params(&fdc37c67x_device, (void *) (FDC37XXX2 | FDC37XXXX_370));
     device_add(&intel_flash_bxt_device);
     spd_register(SPD_TYPE_SDRAM, 0x7, 256);
 
     return ret;
 }
 
+/* i440EX */
 int
 machine_at_p6i440e2_init(const machine_t *model)
 {
@@ -209,8 +304,7 @@ machine_at_p6i440e2_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 3, 4);
     device_add(&i440ex_device);
     device_add(&piix4_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&w83977tf_device);
+    device_add_params(&w83977_device, (void *) (W83977TF | W83977_AMI | W83977_NO_NVR));
     device_add(&sst_flash_29ee010_device);
     spd_register(SPD_TYPE_SDRAM, 0x03, 256);
     device_add(&w83781d_device);       /* fans: CPU, CHS, PS; temperatures: unused, CPU, System */
@@ -220,6 +314,70 @@ machine_at_p6i440e2_init(const machine_t *model)
     return ret;
 }
 
+/* i440BX */
+int
+machine_at_bf6_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/bf6/Beh_70.bin",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x08, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      2, 1, 4, 3);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x11, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x13, PCI_CARD_NORMAL,      3, 3, 1, 2);
+    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
+    device_add(&i440bx_device);
+    device_add(&piix4e_device);
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
+    device_add(&sst_flash_39sf020_device);
+    spd_register(SPD_TYPE_SDRAM, 0x7, 256);
+
+    return ret;
+}
+
+int
+machine_at_bx6_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/bx6/BX6_EG.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
+    device_add(&i440bx_device);
+    device_add(&piix4e_device);
+    device_add_params(&w83977_device, (void *) (W83977TF | W83977_AMI | W83977_NO_NVR));
+    device_add(&sst_flash_29ee010_device);
+    spd_register(SPD_TYPE_SDRAM, 0xF, 256);
+
+    return ret;
+}
+
 int
 machine_at_p2bls_init(const machine_t *model)
 {
@@ -245,8 +403,7 @@ machine_at_p2bls_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&i440bx_device);
     device_add(&piix4e_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&w83977ef_device);
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
 #if 0
     device_add(ics9xxx_get(ICS9150_08)); /* setting proper speeds requires some interaction with the AS97127F ASIC */
 #endif
@@ -259,37 +416,6 @@ machine_at_p2bls_init(const machine_t *model)
     return ret;
 }
 
-int
-machine_at_lgibmx7g_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/lgibmx7g/ms6119.331",
-                           0x000c0000, 262144, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x10, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x12, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x14, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
-    device_add(&i440bx_device);
-    device_add(&piix4e_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&w83977tf_device);
-    device_add(&winbond_flash_w29c020_device);
-    spd_register(SPD_TYPE_SDRAM, 0x7, 256);
-
-    return ret;
-}
-
 int
 machine_at_p3bf_init(const machine_t *model)
 {
@@ -315,8 +441,7 @@ machine_at_p3bf_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&i440bx_device);
     device_add(&piix4e_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&w83977ef_device);
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
     device_add(ics9xxx_get(ICS9250_08));
     device_add(&sst_flash_39sf020_device);
     spd_register(SPD_TYPE_SDRAM, 0xF, 256);
@@ -326,40 +451,6 @@ machine_at_p3bf_init(const machine_t *model)
     return ret;
 }
 
-int
-machine_at_bf6_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/bf6/Beh_70.bin",
-                           0x000c0000, 262144, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x08, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x09, PCI_CARD_NORMAL,      2, 1, 4, 3);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x11, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x13, PCI_CARD_NORMAL,      3, 3, 1, 2);
-    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
-    device_add(&i440bx_device);
-    device_add(&piix4e_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&w83977ef_device);
-    device_add(&sst_flash_39sf020_device);
-    spd_register(SPD_TYPE_SDRAM, 0x7, 256);
-
-    return ret;
-}
-
 int
 machine_at_ax6bc_init(const machine_t *model)
 {
@@ -384,8 +475,7 @@ machine_at_ax6bc_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&i440bx_device);
     device_add(&piix4e_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&w83977tf_device);
+    device_add_params(&w83977_device, (void *) (W83977TF | W83977_AMI | W83977_NO_NVR));
     device_add(&sst_flash_29ee020_device);
     spd_register(SPD_TYPE_SDRAM, 0x7, 256);
     device_add(&gl518sm_2d_device); /* fans: System, CPU; temperature: CPU; no reporting in BIOS */
@@ -393,38 +483,6 @@ machine_at_ax6bc_init(const machine_t *model)
     return ret;
 }
 
-int
-machine_at_atc6310bxii_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/atc6310bxii/6310s102.bin",
-                           0x000c0000, 262144, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x0A, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
-    device_add(&i440bx_device);
-    device_add(&slc90e66_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&w83977ef_device);
-    device_add(&sst_flash_39sf020_device);
-    spd_register(SPD_TYPE_SDRAM, 0x7, 256);
-
-    return ret;
-}
-
 int
 machine_at_686bx_init(const machine_t *model)
 {
@@ -448,8 +506,7 @@ machine_at_686bx_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&i440bx_device);
     device_add(&piix4e_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&w83977tf_device);
+    device_add_params(&w83977_device, (void *) (W83977TF | W83977_AMI | W83977_NO_NVR));
     device_add(&intel_flash_bxt_device);
     spd_register(SPD_TYPE_SDRAM, 0xF, 256);
     device_add(&w83781d_device);     /* fans: CPU, unused, unused; temperatures: unused, CPU, unused */
@@ -462,6 +519,36 @@ machine_at_686bx_init(const machine_t *model)
     return ret;
 }
 
+int
+machine_at_lgibmx7g_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/lgibmx7g/ms6119.331",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x10, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x14, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
+    device_add(&i440bx_device);
+    device_add(&piix4e_device);
+    device_add_params(&w83977_device, (void *) (W83977TF | W83977_AMI | W83977_NO_NVR));
+    device_add(&winbond_flash_w29c020_device);
+    spd_register(SPD_TYPE_SDRAM, 0x7, 256);
+
+    return ret;
+}
+
 int
 machine_at_p6sba_init(const machine_t *model)
 {
@@ -487,8 +574,7 @@ machine_at_p6sba_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&i440bx_device);
     device_add(&piix4e_device);
-    device_add(&w83977tf_device);
-    device_add(&keyboard_ps2_ami_pci_device);
+    device_add_params(&w83977_device, (void *) (W83977TF | W83977_AMI | W83977_NO_NVR));
     device_add(&intel_flash_bxt_device);
     spd_register(SPD_TYPE_SDRAM, 0x7, 256);
     device_add(&w83781d_device);    /* fans: CPU1, CPU2, Thermal Control; temperatures: unused, CPU1, CPU2? */
@@ -525,19 +611,143 @@ machine_at_s1846_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&i440bx_device);
     device_add(&piix4e_device);
-    device_add(&pc87309_device);
-    device_add(&keyboard_ps2_ami_pci_device);
+    device_add_params(&pc87309_device, (void *) (PCX730X_AMI | PC87309_PC87309));
     device_add(&intel_flash_bxt_device);
     spd_register(SPD_TYPE_SDRAM, 0x7, 256);
 
     if (sound_card_current[0] == SOUND_INTERNAL) {
-        device_add(&es1371_onboard_device);
-        device_add(&cs4297_device); /* found on other Tyan boards around the same time */
+        device_add(machine_get_snd_device(machine));
+        device_add(&ct1297_device); /* no good pictures, but the marking looks like CT1297 from a distance */
     }
 
     return ret;
 }
 
+/* i440ZX */
+int
+machine_at_vei8_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/vei8/QHW1001.BIN",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x10, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
+    device_add(&i440zx_device);
+    device_add(&piix4e_device);
+    device_add_params(&fdc37m60x_device, (void *) (FDC37XXX2 | FDC37XXXX_370));
+    device_add(ics9xxx_get(ICS9250_08));
+    device_add(&sst_flash_39sf020_device);
+    spd_register(SPD_TYPE_SDRAM, 0x3, 512);
+    device_add(&as99127f_device); /* fans: Chassis, CPU, Power; temperatures: MB, JTPWR, CPU */
+
+    return ret;
+}
+
+static void
+machine_at_ms6168_common_init(const machine_t *model)
+{
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x14, PCI_CARD_SOUND,       3, 4, 1, 2);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x10, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
+    device_add(&i440zx_device);
+    device_add(&piix4e_device);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&voodoo_3_2000_agp_onboard_8m_device);
+
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
+    device_add(&intel_flash_bxt_device);
+    spd_register(SPD_TYPE_SDRAM, 0x3, 256);
+
+    if (sound_card_current[0] == SOUND_INTERNAL) {
+        device_add(machine_get_snd_device(machine));
+        device_add(&cs4297_device);
+    }
+}
+
+int
+machine_at_ms6168_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ms6168/w6168ims.130",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_ms6168_common_init(model);
+
+    return ret;
+}
+
+int
+machine_at_borapro_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/borapro/MS6168V2.50",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_ms6168_common_init(model);
+
+    return ret;
+}
+
+/* SMSC VictoryBX-66 */
+int
+machine_at_atc6310bxii_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/atc6310bxii/6310s102.bin",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x08, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
+    device_add(&i440bx_device);
+    device_add(&slc90e66_device);
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
+    device_add(&sst_flash_39sf020_device);
+    spd_register(SPD_TYPE_SDRAM, 0x7, 256);
+
+    return ret;
+}
+
+/* VIA Apollo Pro */
 int
 machine_at_ficka6130_init(const machine_t *model)
 {
@@ -561,14 +771,14 @@ machine_at_ficka6130_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&via_apro_device);
     device_add(&via_vt82c596a_device);
-    device_add(&w83877tf_device);
-    device_add(&keyboard_ps2_ami_pci_device);
+    device_add_params(&w83877_device, (void *) (W83877TF | W83877_3F0));
     device_add(&sst_flash_29ee020_device);
     spd_register(SPD_TYPE_SDRAM, 0x7, 256);
 
     return ret;
 }
 
+/* VIA Apollo Pro 133 */
 int
 machine_at_p3v133_init(const machine_t *model)
 {
@@ -594,8 +804,7 @@ machine_at_p3v133_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&via_apro133_device);
     device_add(&via_vt82c596b_device);
-    device_add(&w83977ef_device);
-    device_add(&keyboard_ps2_ami_pci_device);
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
     device_add(ics9xxx_get(ICS9248_39));
     device_add(&sst_flash_39sf020_device);
     spd_register(SPD_TYPE_SDRAM, 0x7, 512);
@@ -606,6 +815,7 @@ machine_at_p3v133_init(const machine_t *model)
     return ret;
 }
 
+/* VIA Apollo Pro 133A */
 int
 machine_at_p3v4x_init(const machine_t *model)
 {
@@ -631,8 +841,7 @@ machine_at_p3v4x_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&via_apro133a_device);
     device_add(&via_vt82c596b_device);
-    device_add(&w83977ef_device);
-    device_add(&keyboard_ps2_ami_pci_device);
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
     device_add(ics9xxx_get(ICS9250_18));
     device_add(&sst_flash_39sf020_device);
     spd_register(SPD_TYPE_SDRAM, 0xF, 512);
@@ -664,8 +873,7 @@ machine_at_gt694va_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&via_apro133a_device);
     device_add(&via_vt82c596b_device);
-    device_add(&w83977ef_device);
-    device_add(&keyboard_ps2_ami_pci_device);
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
     device_add(&sst_flash_39sf020_device);
     spd_register(SPD_TYPE_SDRAM, 0x7, 1024);
     device_add(&w83782d_device);       /* fans: CPU, unused, unused; temperatures: System, CPU1, unused */
@@ -676,19 +884,20 @@ machine_at_gt694va_init(const machine_t *model)
     hwm_values.temperatures[2] = 0;    /* unused */
 
     if (sound_card_current[0] == SOUND_INTERNAL) {
-        device_add(&es1371_onboard_device);
-        device_add(&cs4297_device); /* assumed */
+        device_add(machine_get_snd_device(machine));
+        device_add(&cs4297_device); /* no good pictures, but the marking looks like CS4297 from a distance */
     }
 
     return ret;
 }
 
+/* SiS 5600 */
 int
-machine_at_vei8_init(const machine_t *model)
+machine_at_p6f99_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/vei8/QHW1001.BIN",
+    ret = bios_load_linear("roms/machines/p6f99/99-8.BIN",
                            0x000c0000, 262144, 0);
 
     if (bios_only || !ret)
@@ -696,114 +905,50 @@ machine_at_vei8_init(const machine_t *model)
 
     machine_at_common_init_ex(model, 2);
 
-    pci_init(PCI_CONFIG_TYPE_1);
+    pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x10, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x12, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
-    device_add(&i440bx_device);
-    device_add(&piix4e_device);
-    device_add(&fdc37m60x_370_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(ics9xxx_get(ICS9250_08));
-    device_add(&sst_flash_39sf020_device);
-    spd_register(SPD_TYPE_SDRAM, 0x3, 512);
-    device_add(&as99127f_device); /* fans: Chassis, CPU, Power; temperatures: MB, JTPWR, CPU */
-
-    return ret;
-}
-
-static void
-machine_at_ms6168_common_init(const machine_t *model)
-{
-    machine_at_common_init_ex(model, 2);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x14, PCI_CARD_SOUND,       3, 4, 1, 2);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x10, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x12, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
-    device_add(&i440zx_device);
-    device_add(&piix4e_device);
-    device_add(&w83977ef_device);
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&voodoo_3_2000_agp_onboard_8m_device);
-
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&intel_flash_bxt_device);
-    spd_register(SPD_TYPE_SDRAM, 0x3, 256);
+    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0C, PCI_CARD_SOUND,       2, 3, 4, 1);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x02, PCI_CARD_AGPBRIDGE,   0, 0, 0, 0);
+    device_add(&sis_5600_device);
+    device_add(&it8661f_device);
+    device_add(&winbond_flash_w29c020_device);
 
     if (sound_card_current[0] == SOUND_INTERNAL) {
-        device_add(&es1371_onboard_device);
-        device_add(&cs4297_device);
+        device_add(machine_get_snd_device(machine));
+        device_add(&ct1297_device);
     }
-}
-
-int
-machine_at_borapro_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/borapro/MS6168V2.50",
-                           0x000c0000, 262144, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_ms6168_common_init(model);
 
     return ret;
 }
 
 int
-machine_at_ms6168_init(const machine_t *model)
+machine_at_m747_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/ms6168/w6168ims.130",
+    ret = bios_load_linear("roms/machines/m747/990521.rom",
                            0x000c0000, 262144, 0);
 
     if (bios_only || !ret)
         return ret;
 
-    machine_at_ms6168_common_init(model);
-
-    return ret;
-}
-
-int
-machine_at_m729_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/m729/M729NEW.BIN",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
     machine_at_common_init_ex(model, 2);
 
-    pci_init(PCI_CONFIG_TYPE_1);
+    pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 0, 0);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x0F, PCI_CARD_SOUTHBRIDGE_IDE, 1, 2, 3, 4);
-    pci_register_slot(0x03, PCI_CARD_SOUTHBRIDGE_PMU, 1, 2, 3, 4);
-    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE_USB, 1, 2, 3, 4);
-    pci_register_slot(0x14, PCI_CARD_NORMAL, 1, 2, 3, 4);
-    pci_register_slot(0x12, PCI_CARD_NORMAL, 2, 3, 4, 1);
-    pci_register_slot(0x10, PCI_CARD_NORMAL, 3, 4, 1, 2);
-    device_add(&ali1621_device);
-    device_add(&ali1543c_device); /* +0 */
-    device_add(&winbond_flash_w29c010_device);
-    spd_register(SPD_TYPE_SDRAM, 0x7, 512);
+    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x02, PCI_CARD_AGPBRIDGE,   0, 0, 0, 0);
+    device_add(&sis_5600_device);
+    device_add(&it8661f_device);
+    device_add(&winbond_flash_w29c020_device);
 
     return ret;
 }
diff --git a/src/machine/m_at_slot1_2.c b/src/machine/m_at_slot1_2.c
new file mode 100644
index 000000000..2c8151abe
--- /dev/null
+++ b/src/machine/m_at_slot1_2.c
@@ -0,0 +1,78 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of Slot 1/2 machines.
+ *
+ *          Slot 2 is quite a rare type of Slot. Used mostly by Pentium
+ *          II and III Xeons.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2016-2025 Miran Grca.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/mem.h>
+#include <86box/io.h>
+#include <86box/rom.h>
+#include <86box/pci.h>
+#include <86box/device.h>
+#include <86box/chipset.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/keyboard.h>
+#include <86box/flash.h>
+#include <86box/sio.h>
+#include <86box/hwm.h>
+#include <86box/spd.h>
+#include <86box/video.h>
+#include <86box/clock.h>
+#include "cpu.h"
+#include <86box/machine.h>
+
+/* i440GX */
+int
+machine_at_fw6400gx_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/fw6400gx/FWGX1211.ROM",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 4);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 0, 0);
+
+    device_add(&i440gx_device);
+    device_add(&piix4e_device);
+    device_add_params(&pc87309_device, (void *) (PCX730X_15C | PCX730X_AMI | PC87309_PC87309));
+    device_add(ics9xxx_get(ICS9250_08));
+    device_add(&sst_flash_29ee020_device);
+    spd_register(SPD_TYPE_SDRAM, 0xF, 512);
+    device_add(&w83781d_device);       /* fans: Chassis, Power, CPU; temperatures: System, CPU, unused */
+    hwm_values.temperatures[3] = 0;    /* unused */
+    hwm_values.voltages[1]     = 1500; /* Vtt */
+
+    return ret;
+}
diff --git a/src/machine/m_at_slot1_socket370.c b/src/machine/m_at_slot1_socket370.c
new file mode 100644
index 000000000..c52885965
--- /dev/null
+++ b/src/machine/m_at_slot1_socket370.c
@@ -0,0 +1,151 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of Slot 1/Socket 370 machines machines.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2016-2025 Miran Grca.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/mem.h>
+#include <86box/io.h>
+#include <86box/rom.h>
+#include <86box/pci.h>
+#include <86box/device.h>
+#include <86box/chipset.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/keyboard.h>
+#include <86box/flash.h>
+#include <86box/sio.h>
+#include <86box/hwm.h>
+#include <86box/spd.h>
+#include <86box/video.h>
+#include "cpu.h"
+#include <86box/machine.h>
+#include <86box/clock.h>
+#include <86box/sound.h>
+#include <86box/snd_ac97.h>
+
+/* i440BX */
+int
+machine_at_prosignias31x_bx_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/prosignias31x_bx/p6bxt-ap-092600.bin",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x09, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x0a, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x0b, PCI_CARD_NORMAL, 3, 4, 1, 2);
+    pci_register_slot(0x0c, PCI_CARD_NORMAL, 4, 1, 2, 3);
+    pci_register_slot(0x0d, PCI_CARD_SOUND,  4, 3, 2, 1); /* assumed */
+    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 3, 4);
+    device_add(&i440bx_device);
+    device_add(&piix4e_device);
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
+    device_add(&winbond_flash_w29c020_device);
+    spd_register(SPD_TYPE_SDRAM, 0x7, 256);
+    device_add(&gl520sm_2d_device);  /* fans: CPU, Chassis; temperature: System */
+    hwm_values.temperatures[0] += 2; /* System offset */
+    hwm_values.temperatures[1] += 2; /* CPU offset */
+    hwm_values.voltages[0] = 3300;   /* Vcore and 3.3V are swapped */
+    hwm_values.voltages[2] = hwm_get_vcore();
+
+    if (sound_card_current[0] == SOUND_INTERNAL)
+        device_add(&cmi8738_onboard_device);
+
+    return ret;
+}
+
+int
+machine_at_s1857_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/s1857/BX57200A.ROM",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x0F, PCI_CARD_SOUND,       1, 0, 0, 0);
+    pci_register_slot(0x10, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x11, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x13, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x14, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
+    device_add(&i440bx_device);
+    device_add(&piix4e_device);
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
+    device_add(&intel_flash_bxt_device);
+    spd_register(SPD_TYPE_SDRAM, 0x7, 256);
+
+    if (sound_card_current[0] == SOUND_INTERNAL) {
+        device_add(machine_get_snd_device(machine));
+        device_add(&cs4297_device); /* no good pictures, but the marking looks like CS4297 from a distance */
+    }
+
+    return ret;
+}
+
+/* VIA Apollo Pro 133 */
+int
+machine_at_p6bat_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/p6bat/bata+56.BIN",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 3, 4);
+    pci_register_slot(0x09, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x0a, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x0b, PCI_CARD_NORMAL, 3, 4, 1, 2);
+    pci_register_slot(0x0c, PCI_CARD_NORMAL, 4, 1, 2, 3);
+    pci_register_slot(0x0d, PCI_CARD_NORMAL, 4, 3, 2, 1);
+    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 3, 4);
+    device_add(&via_apro133_device);
+    device_add(&via_vt82c596b_device);
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
+    device_add(&sst_flash_39sf020_device);
+    spd_register(SPD_TYPE_SDRAM, 0x7, 256);
+
+    if (sound_card_current[0] == SOUND_INTERNAL)
+        device_add(&cmi8738_onboard_device);
+
+    return ret;
+}
diff --git a/src/machine/m_at_slot2.c b/src/machine/m_at_slot2.c
index da160c138..20b5f05f7 100644
--- a/src/machine/m_at_slot2.c
+++ b/src/machine/m_at_slot2.c
@@ -10,11 +10,9 @@
  *
  *          Slot 2 is quite a rare type of Slot. Used mostly by Pentium II & III Xeons
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2016-2019 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -40,6 +38,7 @@
 #include "cpu.h"
 #include <86box/machine.h>
 
+/* i440GX */
 int
 machine_at_6gxu_init(const machine_t *model)
 {
@@ -65,8 +64,7 @@ machine_at_6gxu_init(const machine_t *model)
 
     device_add(&i440gx_device);
     device_add(&piix4e_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&w83977ef_device);
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
     device_add(&sst_flash_39sf020_device);
     spd_register(SPD_TYPE_SDRAM, 0xF, 512);
     device_add(&w83782d_device);       /* fans: CPU, Power, System; temperatures: System, CPU, unused */
@@ -102,8 +100,7 @@ machine_at_s2dge_init(const machine_t *model)
 
     device_add(&i440gx_device);
     device_add(&piix4e_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&w83977tf_device);
+    device_add_params(&w83977_device, (void *) (W83977TF | W83977_AMI | W83977_NO_NVR));
     device_add(&intel_flash_bxt_device);
     spd_register(SPD_TYPE_SDRAM, 0xF, 512);
     device_add(&w83781d_device);    /* fans: CPU1, CPU2, Thermal Control; temperatures: unused, CPU1, CPU2? */
@@ -113,41 +110,3 @@ machine_at_s2dge_init(const machine_t *model)
 
     return ret;
 }
-
-int
-machine_at_fw6400gx_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/fw6400gx/FWGX1211.ROM",
-                           0x000c0000, 262144, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 4);
-    pci_register_slot(0x0A, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 0, 0);
-
-    device_add(&i440gx_device);
-    device_add(&piix4e_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&pc87309_15c_device);
-    device_add(ics9xxx_get(ICS9250_08));
-    device_add(&sst_flash_29ee020_device);
-    spd_register(SPD_TYPE_SDRAM, 0xF, 512);
-    device_add(&w83781d_device);       /* fans: Chassis, Power, CPU; temperatures: System, CPU, unused */
-    hwm_values.temperatures[3] = 0;    /* unused */
-    hwm_values.voltages[1]     = 1500; /* Vtt */
-
-    return ret;
-}
diff --git a/src/machine/m_at_socket1.c b/src/machine/m_at_socket1.c
new file mode 100644
index 000000000..ab0fadb1a
--- /dev/null
+++ b/src/machine/m_at_socket1.c
@@ -0,0 +1,460 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of Socket 168 and 1 machines.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2016-2025 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/chipset.h>
+#include <86box/keyboard.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/pci.h>
+#include <86box/dma.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/gameport.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/rom.h>
+#include <86box/sio.h>
+#include <86box/hdc.h>
+#include <86box/port_6x.h>
+#include <86box/port_92.h>
+#include <86box/video.h>
+#include <86box/flash.h>
+#include <86box/scsi_ncr53c8xx.h>
+#include <86box/hwm.h>
+#include <86box/machine.h>
+#include <86box/plat_unused.h>
+#include <86box/sound.h>
+
+/* CS4031 */
+int
+machine_at_cs4031_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/cs4031/CHIPS_1.AMI",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&cs4031_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* OPTi 381 */
+int
+machine_at_ga486l_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ga486l/ga-486l_bios.bin",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&opti381_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* OPTi 493 */
+int
+machine_at_svc486wb_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/svc486wb/svc486wb-AM27C512DIP28.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&opti493_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add(&ide_isa_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* OPTi 498 */
+int
+machine_at_mvi486_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/mvi486/MVI627.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&opti498_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&ide_isa_device);
+    device_add_params(&pc873xx_device, (void *) (PCX73XX_IDE_PRI | PCX730X_398));
+
+    return ret;
+}
+
+/* SiS 401 */
+static void
+machine_at_sis401_common_init(const machine_t *model)
+{
+    machine_at_common_init(model);
+
+    device_add(&sis_85c401_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+}
+
+int
+machine_at_isa486_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/isa486/ISA-486.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_sis401_common_init(model);
+
+    return ret;
+}
+
+int
+machine_at_sis401_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/sis401/SIS401-2.AMI",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_sis401_common_init(model);
+
+    return ret;
+}
+
+/* SiS 460 */
+int
+machine_at_av4_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/av4/amibios_486dx_isa_bios_aa4025963.bin",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&sis_85c460_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* SiS 471 */
+int
+machine_at_advantage40xxd_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/advantage40xxd/AST101.09A",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+    device_add(&sis_85c471_device);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&um866x_device, (void *) (UM82C863F | UM866X_IDE_PRI));
+
+    device_add(&intel_flash_bxt_device);
+
+    return ret;
+}
+
+/* Symphony SL42C460 */
+int
+machine_at_dtk461_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/dtk461/DTK.BIO",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+    device_add(&sl82c461_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* VIA VT82C495 */
+int
+machine_at_486vchd_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/486vchd/486-4386-VC-HD.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&via_vt82c49x_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* VLSI 82C480 */
+int
+machine_at_vect486vl_init(const machine_t *model) // has HDC problems
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/vect486vl/aa0500.ami",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    machine_at_common_init_ex(model, 2);
+
+    device_add(&vl82c480_device);
+
+    device_add(&vl82c113_device);
+
+    device_add(&ide_isa_device);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C651 | FDC37C6XX_IDE_PRI));
+
+    return ret;
+}
+
+/* VLSI 82C481 */
+int
+machine_at_d824_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/d824/fts-biosupdated824noflashbiosepromv320-320334-160.bin",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    machine_at_common_init_ex(model, 2);
+
+    device_add(&vl82c480_device);
+
+    /*
+       Technically, it should be the VL82C114 but we do not have
+       a proper datasheet of it that tells us the registers.
+     */
+    device_add(&vl82c113_device);
+
+    device_add(&ide_isa_device);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C651);
+    
+    return ret;
+}
+
+/* VLSI 82C486 */
+int
+machine_at_pcs44c_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/pcs44c/V032004G.25",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    device_add(&vl82c486_device);
+    device_add(&tulip_jumper_device);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&oti077_pcs44c_device);
+     
+    device_add(&vl82c113_device);
+
+    device_add(&ide_isa_device);
+    device_add_params(&pc873xx_device, (void *) (PCX73XX_IDE_PRI | PCX730X_398));
+
+    device_add(&intel_flash_bxt_device);
+    
+    return ret;
+}
+
+int
+machine_at_tuliptc38_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/tuliptc38/TULIP1.BIN",
+                           0x000f0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    device_add(&vl82c486_device);
+    device_add(&tulip_jumper_device);
+
+    device_add(&vl82c113_device);
+
+    device_add(&ide_isa_device);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C651 | FDC37C6XX_IDE_PRI));
+
+    if (gfxcard[0] == VID_INTERNAL) {
+        bios_load_aux_linear("roms/machines/tuliptc38/VBIOS.BIN",
+                             0x000c0000, 32768, 0);
+
+        device_add(machine_get_vid_device(machine));
+    } else  for (uint16_t i = 0; i < 32768; i++)
+        rom[i] = mem_readb_phys(0x000c0000 + i);
+
+    mem_mapping_set_addr(&bios_mapping, 0x0c0000, 0x40000);
+    mem_mapping_set_exec(&bios_mapping, rom);
+
+    return ret;
+}
+
+/* ZyMOS Poach */
+int
+machine_at_isa486c_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/isa486c/asus-isa-486c-401a0-040591-657e2c17a0218417632602.bin",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&isa486c_device);
+    device_add(&port_92_key_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+int
+machine_at_genoa486_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/genoa486/AMI486.BIO",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&compaq_genoa_device);
+    device_add(&port_92_key_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
diff --git a/src/machine/m_at_socket2.c b/src/machine/m_at_socket2.c
new file mode 100644
index 000000000..6c24070ba
--- /dev/null
+++ b/src/machine/m_at_socket2.c
@@ -0,0 +1,379 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of Socket 2 machines.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2016-2025 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/chipset.h>
+#include <86box/keyboard.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/pci.h>
+#include <86box/dma.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/gameport.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/rom.h>
+#include <86box/sio.h>
+#include <86box/hdc.h>
+#include <86box/port_6x.h>
+#include <86box/port_92.h>
+#include <86box/video.h>
+#include <86box/flash.h>
+#include <86box/scsi_ncr53c8xx.h>
+#include <86box/hwm.h>
+#include <86box/machine.h>
+#include <86box/plat_unused.h>
+#include <86box/sound.h>
+
+/* ACC 2168 */
+int
+machine_at_pb410a_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/pb410a/pb410a.080337.4abf.u25.bin",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_ibm_common_ide_init(model);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&acc3221_device);
+    device_add(&acc2168_device);
+
+    device_add(&phoenix_486_jumper_device);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    return ret;
+}
+
+/* ALi M1429G */
+int
+machine_at_acera1g_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/acera1g/4alo001.bin",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+    device_add(&ali1429g_device);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&gd5428_onboard_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add_params(&pc87310_device, (void *) (PC87310_ALI));
+    device_add(&ide_ali5213_device);
+
+    return ret;
+}
+
+static void
+machine_at_ali1429_common_init(const machine_t *model, int is_green)
+{
+    machine_at_common_init(model);
+
+    if (is_green)
+        device_add(&ali1429g_device);
+    else
+        device_add(&ali1429_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+}
+
+int
+machine_at_winbios1429_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/win486/ali1429g.amw",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_ali1429_common_init(model, 1);
+
+    return ret;
+}
+
+int
+machine_at_ali1429_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ali1429/ami486.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_ali1429_common_init(model, 0);
+
+    return ret;
+}
+
+/* i420TX */
+int
+machine_at_pci400ca_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/pci400ca/486-AA008851.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_SCSI,        1, 2, 3, 4);
+    pci_register_slot(0x03, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x04, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x05, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&sio_device);
+
+    device_add(&intel_flash_bxt_ami_device);
+
+    device_add(&i420tx_device);
+    device_add(&ncr53c810_onboard_pci_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* IMS 8848 */
+int
+machine_at_g486ip_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/g486ip/G486IP.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+    device_add(&ami_1992_nvr_device);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      3, 4, 1, 2); /* 03 = Slot 1 */
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 3, 4, 1); /* 04 = Slot 2 */
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4); /* 05 = Slot 3 */
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&ims8848_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* OPTi 499 */
+int
+machine_at_cobalt_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/cobalt/Cobalt_2.3.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+	
+    machine_at_common_init(model);
+
+    device_add(&opti499_device);
+    device_add(&ide_opti611_vlb_device);
+    device_add(&ide_isa_sec_device);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+	
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+	
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    return ret;
+}
+
+int
+machine_at_cougar_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/cougar/COUGRMRB.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+    device_add(&ide_vlb_device);
+
+    device_add(&opti499_device);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_PRI));
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* SiS 461 */
+int
+machine_at_decpclpv_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/decpclpv/bios.bin",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&sis_85c461_device);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&ide_isa_2ch_device);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C663 | FDC37C6XX_IDE_PRI));
+
+    return ret;
+}
+
+int
+machine_at_dell466np_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/dell466np/466np.bin",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+    device_add(&sis_85c461_device);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+    else {
+        for (uint16_t i = 0; i < 32768; i++)
+            rom[i] = mem_readb_phys(0x000c0000 + i);
+    }
+    mem_mapping_set_addr(&bios_mapping, 0x0c0000, 0x40000);
+    mem_mapping_set_exec(&bios_mapping, rom);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&ide_isa_device);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C661 | FDC37C6XX_IDE_PRI));
+
+    return ret;
+}
+
+int
+machine_at_valuepoint433_init(const machine_t *model) // hangs without the PS/2 mouse
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/valuepoint433/$IMAGEP.FLH",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_ide_init(model);
+    device_add(&sis_85c461_device);
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&et4000w32_onboard_device);
+
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C661 | FDC37C6XX_IDE_PRI));
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* VLSI 82C480 */
+int
+machine_at_martin_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/martin/NONSCSI.ROM",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    device_add(&vl82c480_device);
+    device_add(&vl82c113_device);
+
+    device_add(&ide_vlb_device);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C651 | FDC37C6XX_IDE_PRI));
+
+    device_add(&intel_flash_bxt_device);
+    
+    return ret;
+}
diff --git a/src/machine/m_at_socket3.c b/src/machine/m_at_socket3.c
new file mode 100644
index 000000000..2d6ea9730
--- /dev/null
+++ b/src/machine/m_at_socket3.c
@@ -0,0 +1,438 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of Socket 3 machines.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2016-2025 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/chipset.h>
+#include <86box/keyboard.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/pci.h>
+#include <86box/dma.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/gameport.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/rom.h>
+#include <86box/sio.h>
+#include <86box/hdc.h>
+#include <86box/port_6x.h>
+#include <86box/port_92.h>
+#include <86box/video.h>
+#include <86box/flash.h>
+#include <86box/scsi_ncr53c8xx.h>
+#include <86box/hwm.h>
+#include <86box/machine.h>
+#include <86box/plat_unused.h>
+#include <86box/sound.h>
+
+/* ALi M1429G */
+int
+machine_at_atc1762_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/atc1762/atc1762.bin",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+    device_add(&ali1429g_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+int
+machine_at_ecsal486_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ecsal486/ECS_AL486.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&ali1429g_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+int
+machine_at_ap4100aa_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ap4100aa/M27C512DIP28.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    device_add(&ami_1994_nvr_device);
+    device_add(&ali1429g_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&ide_vlb_device);
+    device_add_params(&um866x_device, (void *) UM8663BF);
+
+    return ret;
+}
+
+/* Contaq 82C596A */
+int
+machine_at_4gpv5_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/4gpv5/4GPV5.bin",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add(&contaq_82c596a_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+/* Contaq 82C597 */
+int
+machine_at_greenb_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/greenb/4gpv31-ami-1993-8273517.bin",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add(&contaq_82c597_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+/* OPTi 895 */
+static const device_config_t j403tg_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "403tg",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "Award Modular BIOS v4.50G", .internal_name = "403tg", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 65536, .files = { "roms/machines/403tg/403TG.BIN", "" } },
+            { .name = "AMI WinBIOS (121593)", .internal_name = "403tg_d", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 65536, .files = { "roms/machines/403tg/J403TGRevD.BIN", "" } },
+            { .name = "MR BIOS V2.02", .internal_name = "403tg_d_mr", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 65536, .files = { "roms/machines/403tg/MRBiosOPT895.bin", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t j403tg_device = {
+    .name          = "Jetway J-403TG",
+    .internal_name = "403tg_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = j403tg_config
+};
+
+int
+machine_at_403tg_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    int nvr_hack = !strcmp(device_get_config_bios("bios"), "403tg_d");
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000f0000, 65536, 0);
+
+    if (nvr_hack) {
+        machine_at_common_init_ex(model, 2);
+        device_add(&ami_1994_nvr_device);
+    } else
+        machine_at_common_init(model);
+
+    device_add(&opti895_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* SiS 461 */
+int
+machine_at_acerv10_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/acerv10/ALL.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&sis_85c461_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&ide_isa_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* SiS 471 */
+static void
+machine_at_sis_85c471_common_init(const machine_t *model)
+{
+    machine_at_common_init(model);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add(&sis_85c471_device);
+}
+
+int
+machine_at_win471_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/win471/486-SiS_AC0360136.BIN",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_sis_85c471_common_init(model);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_vi15g_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/vi15g/vi15gr23.rom",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_sis_85c471_common_init(model);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_vli486sv2g_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/vli486sv2g/0402.001",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_sis_85c471_common_init(model);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_dvent4xx_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/dvent4xx/Venturis466_BIOS.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+    device_add(&sis_85c471_device);
+    device_add(&ide_cmd640_vlb_pri_device);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_SEC));
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    return ret;
+}
+
+int
+machine_at_dtk486_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/dtk486/4siw005.bin",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_sis_85c471_common_init(model);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_ami471_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ami471/SIS471BE.AMI",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_sis_85c471_common_init(model);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_px471_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/px471/SIS471A1.PHO",
+                           0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_sis_85c471_common_init(model);
+
+    device_add(&ide_vlb_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_tg486g_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/tg486g/tg486g.bin",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+    device_add(&amstrad_megapc_nvr_device);
+    device_add(&sis_85c471_device);
+    device_add(&ide_isa_device);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C651 | FDC37C6XX_IDE_PRI));
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (gfxcard[0] != VID_INTERNAL) {
+        for (uint16_t i = 0; i < 32768; i++)
+            rom[i] = mem_readb_phys(0x000c0000 + i);
+    }
+    mem_mapping_set_addr(&bios_mapping, 0x0c0000, 0x40000);
+    mem_mapping_set_exec(&bios_mapping, rom);
+
+    return ret;
+}
diff --git a/src/machine/m_at_socket370.c b/src/machine/m_at_socket370.c
index 4164b425a..1094e59f5 100644
--- a/src/machine/m_at_socket370.c
+++ b/src/machine/m_at_socket370.c
@@ -6,13 +6,11 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          Implementation of Socket 370(PGA370) machines.
- *
- *
+ *          Implementation of Socket 370 (PGA370) machines.
  *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2016-2019 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -40,6 +38,7 @@
 #include <86box/sound.h>
 #include <86box/snd_ac97.h>
 
+/* i440LX */
 int
 machine_at_s370slm_init(const machine_t *model)
 {
@@ -63,8 +62,7 @@ machine_at_s370slm_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&i440lx_device);
     device_add(&piix4e_device);
-    device_add(&w83977tf_device);
-    device_add(&keyboard_ps2_ami_pci_device);
+    device_add_params(&w83977_device, (void *) (W83977TF | W83977_AMI | W83977_NO_NVR));
     device_add(&intel_flash_bxt_device);
     spd_register(SPD_TYPE_SDRAM, 0x7, 256);
     device_add(&w83781d_device);    /* fans: CPU, Fan 2, Chassis; temperatures: unused, CPU, unused */
@@ -74,12 +72,13 @@ machine_at_s370slm_init(const machine_t *model)
     return ret;
 }
 
+/* i440BX */
 int
-machine_at_s1857_init(const machine_t *model)
+machine_at_awo671r_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/s1857/BX57200A.ROM",
+    ret = bios_load_linear("roms/machines/awo671r/a08139c.bin",
                            0x000c0000, 262144, 0);
 
     if (bios_only || !ret)
@@ -90,34 +89,30 @@ machine_at_s1857_init(const machine_t *model)
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x0F, PCI_CARD_SOUND,       1, 0, 0, 0);
-    pci_register_slot(0x10, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x11, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x12, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x13, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x14, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x0D, PCI_CARD_VIDEO,       2, 3, 4, 1);
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&i440bx_device);
     device_add(&piix4e_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&w83977ef_370_device);
-    device_add(&intel_flash_bxt_device);
-    spd_register(SPD_TYPE_SDRAM, 0x7, 256);
-
-    if (sound_card_current[0] == SOUND_INTERNAL) {
-        device_add(&es1371_onboard_device);
-        device_add(&cs4297_device); /* found on other Tyan boards around the same time */
-    }
+    device_add_inst_params(&w83977_device, 1, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
+    device_add_inst_params(&w83977_device, 2, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
+    device_add(&sst_flash_39sf020_device);
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+    spd_register(SPD_TYPE_SDRAM, 0x3, 256);
 
     return ret;
 }
 
 int
-machine_at_p6bap_init(const machine_t *model)
+machine_at_ambx133_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/p6bap/bapa14a.BIN",
+    ret = bios_load_linear("roms/machines/ambx133/mkbx2vg2.bin",
                            0x000c0000, 262144, 0);
 
     if (bios_only || !ret)
@@ -127,57 +122,22 @@ machine_at_p6bap_init(const machine_t *model)
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 3, 5);
-    pci_register_slot(0x09, PCI_CARD_NORMAL, 1, 2, 3, 5);
-    pci_register_slot(0x0a, PCI_CARD_NORMAL, 2, 3, 5, 1);
-    pci_register_slot(0x0b, PCI_CARD_NORMAL, 3, 5, 1, 2);
-    pci_register_slot(0x0c, PCI_CARD_NORMAL, 5, 1, 2, 3);
-    pci_register_slot(0x0d, PCI_CARD_NORMAL, 5, 3, 2, 1);
-    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 3, 5);
-    device_add(&via_apro133a_device);  /* Rebranded as ET82C693A */
-    device_add(&via_vt82c596b_device); /* Rebranded as ET82C696B */
-    device_add(&w83977ef_device);
-    device_add(&keyboard_ps2_ami_pci_device);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
+    device_add(&i440bx_device);
+    device_add(&piix4e_device);
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
     device_add(&sst_flash_39sf020_device);
     spd_register(SPD_TYPE_SDRAM, 0x7, 256);
-
-    if (sound_card_current[0] == SOUND_INTERNAL)
-        device_add(&cmi8738_onboard_device);
-
-    return ret;
-}
-
-int
-machine_at_p6bat_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/p6bat/bata+56.BIN",
-                           0x000c0000, 262144, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 3, 5);
-    pci_register_slot(0x09, PCI_CARD_NORMAL, 1, 2, 3, 5);
-    pci_register_slot(0x0a, PCI_CARD_NORMAL, 2, 3, 5, 1);
-    pci_register_slot(0x0b, PCI_CARD_NORMAL, 3, 5, 1, 2);
-    pci_register_slot(0x0c, PCI_CARD_NORMAL, 5, 1, 2, 3);
-    pci_register_slot(0x0d, PCI_CARD_NORMAL, 5, 3, 2, 1);
-    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 3, 5);
-    device_add(&via_apro133_device);
-    device_add(&via_vt82c596b_device);
-    device_add(&w83977ef_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&sst_flash_39sf020_device);
-    spd_register(SPD_TYPE_SDRAM, 0x7, 256);
-
-    if (sound_card_current[0] == SOUND_INTERNAL)
-        device_add(&cmi8738_onboard_device);
+    device_add(&gl518sm_2d_device); /* fans: CPUFAN1, CPUFAN2; temperature: CPU */
+    hwm_values.fans[1] += 500;
+    hwm_values.temperatures[0] += 4;                         /* CPU offset */
+    hwm_values.voltages[1] = RESISTOR_DIVIDER(12000, 10, 2); /* different 12V divider in BIOS (10K/2K?) */
 
     return ret;
 }
@@ -208,8 +168,8 @@ machine_at_cubx_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&i440bx_device);
     device_add(&piix4e_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&w83977ef_device);
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
+    device_add(&ide_cmd648_ter_qua_onboard_device);
     device_add(ics9xxx_get(ICS9250_08));
     device_add(&sst_flash_39sf020_device);
     spd_register(SPD_TYPE_SDRAM, 0xF, 256);
@@ -218,6 +178,39 @@ machine_at_cubx_init(const machine_t *model)
     return ret;
 }
 
+/* i440ZX */
+int
+machine_at_63a1_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/63a1/63a-q3.bin",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x08, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4); /* Integrated Sound? */
+    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
+    device_add(&i440zx_device);
+    device_add(&piix4e_device);
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
+    device_add(&intel_flash_bxt_device);
+    spd_register(SPD_TYPE_SDRAM, 0x3, 256);
+
+    return ret;
+}
+
+/* SMSC VictoryBX-66 */
 int
 machine_at_atc7020bxii_init(const machine_t *model)
 {
@@ -242,8 +235,7 @@ machine_at_atc7020bxii_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&i440bx_device);
     device_add(&slc90e66_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&w83977ef_device);
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
     device_add(&sst_flash_39sf020_device);
     spd_register(SPD_TYPE_SDRAM, 0xF, 256);
 
@@ -274,7 +266,6 @@ machine_at_m773_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&i440bx_device);
     device_add(&slc90e66_device);
-    device_add(&keyboard_ps2_ami_pci_device);
     device_add(&it8671f_device);
     device_add(&sst_flash_39sf020_device);
     spd_register(SPD_TYPE_SDRAM, 0x3, 256);
@@ -290,107 +281,7 @@ machine_at_m773_init(const machine_t *model)
     return ret;
 }
 
-int
-machine_at_ambx133_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/ambx133/mkbx2vg2.bin",
-                           0x000c0000, 262144, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x09, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0A, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
-    device_add(&i440bx_device);
-    device_add(&piix4e_device);
-    device_add(&w83977ef_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&sst_flash_39sf020_device);
-    spd_register(SPD_TYPE_SDRAM, 0x7, 256);
-    device_add(&gl518sm_2d_device); /* fans: CPUFAN1, CPUFAN2; temperature: CPU */
-    hwm_values.fans[1] += 500;
-    hwm_values.temperatures[0] += 4;                         /* CPU offset */
-    hwm_values.voltages[1] = RESISTOR_DIVIDER(12000, 10, 2); /* different 12V divider in BIOS (10K/2K?) */
-
-    return ret;
-}
-
-int
-machine_at_awo671r_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/awo671r/a08139c.bin",
-                           0x000c0000, 262144, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x09, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0A, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
-    device_add(&i440bx_device);
-    device_add(&piix4e_device);
-    device_add_inst(&w83977ef_device, 1);
-    device_add_inst(&w83977ef_device, 2);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&sst_flash_39sf020_device);
-    spd_register(SPD_TYPE_SDRAM, 0x3, 256);
-
-    return ret;
-}
-
-int
-machine_at_63a1_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/63a1/63a-q3.bin",
-                           0x000c0000, 262144, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x08, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x09, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4); /* Integrated Sound? */
-    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
-    device_add(&i440zx_device);
-    device_add(&piix4e_device);
-    device_add(&w83977tf_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&intel_flash_bxt_device);
-    spd_register(SPD_TYPE_SDRAM, 0x3, 256);
-
-    return ret;
-}
-
+/* VIA Apollo Pro */
 int
 machine_at_apas3_init(const machine_t *model)
 {
@@ -414,14 +305,86 @@ machine_at_apas3_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&via_apro_device);
     device_add(&via_vt82c586b_device);
-    device_add(&fdc37c669_device);
-    device_add(&keyboard_ps2_ami_pci_device);
+    device_add_params(&fdc37c669_device, (void *) 0);
     device_add(&sst_flash_39sf020_device);
     spd_register(SPD_TYPE_SDRAM, 0x7, 256);
 
     return ret;
 }
 
+/* VIA Apollo Pro 133 */
+int
+machine_at_p6bap_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/p6bap/bapa14a.BIN",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 3, 4);
+    pci_register_slot(0x09, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x0a, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x0b, PCI_CARD_NORMAL, 3, 4, 1, 2);
+    pci_register_slot(0x0c, PCI_CARD_NORMAL, 4, 1, 2, 3);
+    pci_register_slot(0x0d, PCI_CARD_NORMAL, 4, 3, 2, 1);
+    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 3, 4);
+    device_add(&via_apro133a_device);  /* Rebranded as ET82C693A */
+    device_add(&via_vt82c596b_device); /* Rebranded as ET82C696B */
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
+    device_add(&sst_flash_39sf020_device);
+    spd_register(SPD_TYPE_SDRAM, 0x7, 256);
+
+    if (sound_card_current[0] == SOUND_INTERNAL)
+        device_add(&cmi8738_onboard_device);
+
+    return ret;
+}
+
+/* VIA Apollo Pro 133A */
+int
+machine_at_6via90ap_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/6via90ap/90ap10.bin",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
+    device_add(&via_apro133a_device);
+    device_add(&via_vt82c686b_device); /* fans: CPU1, CPU2; temperatures: CPU, System, unused */
+    device_add(ics9xxx_get(ICS9250_18));
+    device_add(&sst_flash_39sf020_device);
+    spd_register(SPD_TYPE_SDRAM, 0x7, 1024);
+    hwm_values.temperatures[0] += 2; /* CPU offset */
+    hwm_values.temperatures[1] += 2; /* System offset */
+    hwm_values.temperatures[2] = 0;  /* unused */
+
+    if (sound_card_current[0] == SOUND_INTERNAL)
+        device_add(&alc100_device); /* ALC100P identified on similar Acorp boards (694TA, 6VIA90A1) */
+
+    return ret;
+}
+
 int
 machine_at_cuv4xls_init(const machine_t *model)
 {
@@ -449,7 +412,6 @@ machine_at_cuv4xls_init(const machine_t *model)
     pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
     device_add(&via_apro133a_device);
     device_add(&via_vt82c686b_device);
-    device_add(&keyboard_ps2_ami_pci_device);
     device_add(ics9xxx_get(ICS9250_18));
     device_add(&sst_flash_39sf020_device);
     spd_register(SPD_TYPE_SDRAM, 0xF, 1024);
@@ -461,12 +423,13 @@ machine_at_cuv4xls_init(const machine_t *model)
     return ret;
 }
 
+/* SiS 600 */
 int
-machine_at_6via90ap_init(const machine_t *model)
+machine_at_7sbb_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/6via90ap/90ap10.bin",
+    ret = bios_load_linear("roms/machines/7sbb/sbb12aa2.bin",
                            0x000c0000, 262144, 0);
 
     if (bios_only || !ret)
@@ -474,27 +437,16 @@ machine_at_6via90ap_init(const machine_t *model)
 
     machine_at_common_init_ex(model, 2);
 
-    pci_init(PCI_CONFIG_TYPE_1);
+    pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x09, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0A, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
-    device_add(&via_apro133a_device);
-    device_add(&via_vt82c686b_device); /* fans: CPU1, CPU2; temperatures: CPU, System, unused */
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(ics9xxx_get(ICS9250_18));
-    device_add(&sst_flash_39sf020_device);
-    spd_register(SPD_TYPE_SDRAM, 0x7, 1024);
-    hwm_values.temperatures[0] += 2; /* CPU offset */
-    hwm_values.temperatures[1] += 2; /* System offset */
-    hwm_values.temperatures[2] = 0;  /* unused */
-
-    if (sound_card_current[0] == SOUND_INTERNAL)
-        device_add(&alc100_device); /* ALC100P identified on similar Acorp boards (694TA, 6VIA90A1) */
+    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x10, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x11, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x02, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
+    device_add(&sis_5600_device);
+    device_add(&it8661f_device);
+    device_add(&sst_flash_29ee020_device); /* assumed */
 
     return ret;
 }
diff --git a/src/machine/m_at_socket3_pci.c b/src/machine/m_at_socket3_pci.c
new file mode 100644
index 000000000..c122caa2d
--- /dev/null
+++ b/src/machine/m_at_socket3_pci.c
@@ -0,0 +1,1487 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of Socket 3 PCI machines.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2016-2025 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/chipset.h>
+#include <86box/keyboard.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/pci.h>
+#include <86box/dma.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/gameport.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/rom.h>
+#include <86box/sio.h>
+#include <86box/hdc.h>
+#include <86box/port_6x.h>
+#include <86box/port_92.h>
+#include <86box/video.h>
+#include <86box/flash.h>
+#include <86box/scsi_ncr53c8xx.h>
+#include <86box/hwm.h>
+#include <86box/machine.h>
+#include <86box/plat_unused.h>
+#include <86box/sound.h>
+
+/* ALi M1429G */
+int
+machine_at_ms4134_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ms4134/4alm001.bin",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_ide_init(model);
+
+    device_add(&ali1429g_device);
+
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_PRI));
+
+    pci_init(FLAG_MECHANISM_1 | FLAG_MECHANISM_2 | PCI_ALWAYS_EXPOSE_DEV0);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+
+    pci_register_slot(0x0B, PCI_CARD_SCSI, 4, 1, 2, 3);
+    pci_register_slot(0x08, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x09, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL, 3, 4, 1, 2);
+    pci_register_slot(0x10, PCI_CARD_NORMAL, 1, 2, 3, 4);
+
+    device_add(&ali1435_device);
+    device_add(&sst_flash_29ee010_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_tg486gp_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/tg486gp/tg486gp.bin",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_ide_init(model);
+
+    device_add(&ali1429g_device);
+
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_PRI));
+
+    pci_init(FLAG_MECHANISM_1 | FLAG_MECHANISM_2 | PCI_ALWAYS_EXPOSE_DEV0);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+
+    pci_register_slot(0x0F, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL, 3, 4, 1, 2);
+    pci_register_slot(0x10, PCI_CARD_NORMAL, 1, 2, 3, 4);
+
+    device_add(&ali1435_device);
+    device_add(&sst_flash_29ee010_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+/* ALi M1489 */
+int
+machine_at_sbc490_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/sbc490/07159589.rom",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x01, PCI_CARD_VIDEO,       4, 1, 2, 3);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    device_add(&ali1489_device);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
+
+int
+machine_at_abpb4_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/abpb4/486-AB-PB4.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CAN_SWITCH_TYPE);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x03, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x04, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x05, PCI_CARD_NORMAL,      3, 4, 1, 2);
+
+    device_add(&ali1489_device);
+    device_add_params(&w837x7_device, (void *) (W83787F | W837X7_KEY_89));
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
+
+int
+machine_at_arb1476_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/arb1476/w1476b.v21",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+
+    device_add(&ali1489_device);
+    device_add_params(&fdc37c669_device, (void *) 0);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
+
+int
+machine_at_win486pci_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/win486pci/v1hj3.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x03, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x04, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x05, PCI_CARD_NORMAL,      3, 4, 1, 2);
+
+    device_add(&ali1489_device);
+    device_add_params(&gm82c803ab_device, (void *) GM82C803B);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_tf486_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/tf486/tf486v10.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
+
+    device_add(&ali1489_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_NO_NVR));
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
+
+int
+machine_at_ms4145_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ms4145/AG56S.ROM",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x03, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x04, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x05, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x06, PCI_CARD_NORMAL,      4, 1, 2, 3);
+
+    device_add(&ali1489_device);
+    device_add_params(&w837x7_device, (void *) (W83787F | W837X7_KEY_88));
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
+
+/* OPTi 802G */
+static const device_config_t pc330_6573_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Language",
+        .type = CONFIG_BIOS,
+        .default_string = "pc330_6573",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "English (PC 330, type 6573)", .internal_name = "pc330_6573", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pc330_6573/$IMAGES.USF", "" } },
+            { .name = "Japanese (Aptiva 510/710/Vision)", .internal_name = "aptiva510", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pc330_6573/aptiva510_$IMAGES.USF", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t pc330_6573_device = {
+    .name          = "IBM PC 330 (type 6573)",
+    .internal_name = "pc330_6573_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = pc330_6573_config
+};
+
+int
+machine_at_pc330_6573_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+    device_context_restore();
+
+    machine_at_common_init_ex(model, 2);
+    device_add(&ide_vlb_2ch_device);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE,  0,  0,  0,  0);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,       1,  2,  3,  4);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,       5,  6,  7,  8);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,       9, 10, 11, 12);
+    /* This is a guess because the BIOS always gives it a video BIOS
+       and never gives it an IRQ, so it is impossible to known for
+       certain until we obtain PCI readouts from the real machine. */
+    pci_register_slot(0x0E, PCI_CARD_VIDEO,       13, 14, 15, 16);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    device_add(&opti602_device);
+    device_add(&opti802g_device);
+    device_add(&opti822_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_SEC));
+    device_add(&ide_opti611_vlb_device);
+    device_add(&intel_flash_bxt_device);
+
+    return ret;
+}
+
+/* OPTi 895 */
+static const device_config_t pb450_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "pb450a",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "PhoenixBIOS 4.03 - Revision PCI 1.0A", .internal_name = "pb450a_pci10a" /*"pci10a"*/, .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pb450/OPTI802.bin", "" } },
+            { .name = "PhoenixBIOS 4.03 - Revision PNP 1.1A", .internal_name = "pb450a", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pb450/PNP11A.bin", "" } },
+            { .name = "PhoenixBIOS 4.05 - Revision P4HS20 (by Micro Firmware)", .internal_name = "pb450a_p4hs20", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pb450/p4hs20.bin", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t pb450_device = {
+    .name          = "Packard Bell PB450",
+    .internal_name = "pb450_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = pb450_config
+};
+
+int
+machine_at_pb450_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+    device_context_restore();
+    
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+    device_add(&ide_vlb_2ch_device);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x11, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,      5, 6, 7, 8);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    device_add(&opti895_device);
+    device_add(&opti602_device);
+    device_add(&opti822_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_SEC));
+    device_add(&ide_opti611_vlb_device);
+    device_add(&intel_flash_bxt_device);
+    device_add(&phoenix_486_jumper_pci_device);
+
+    return ret;
+}
+
+/* i420EX */
+int
+machine_at_486pi_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/486pi/486pi.bin",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x05, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,      1, 2, 1, 2);
+    pci_register_slot(0x13, PCI_CARD_NORMAL,      2, 1, 2, 1);
+    pci_register_slot(0x14, PCI_CARD_NORMAL,      1, 2, 1, 2);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add(&i420ex_device);
+
+    return ret;
+}
+
+int
+machine_at_bat4ip3e_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/bat4ip3e/404C.ROM",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x05, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_IDE,   0xfe, 0xff, 0, 0);
+    pci_register_slot(0x08, PCI_CARD_NORMAL,      1, 2, 1, 2);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      2, 1, 2, 1);
+    pci_register_slot(0x0a, PCI_CARD_NORMAL,      1, 2, 1, 2);
+
+    device_add(&phoenix_486_jumper_pci_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&i420ex_device);
+    device_add(&ide_cmd640_pci_device);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+
+    return ret;
+}
+
+int
+machine_at_486ap4_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/486ap4/0205.002",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    /* Excluded: 5, 6, 7, 8 */
+    pci_register_slot(0x05, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      1, 2, 3, 4); /* 09 = Slot 1 */
+    pci_register_slot(0x0a, PCI_CARD_NORMAL,      2, 3, 4, 1); /* 0a = Slot 2 */
+    pci_register_slot(0x0b, PCI_CARD_NORMAL,      3, 4, 1, 2); /* 0b = Slot 3 */
+    pci_register_slot(0x0c, PCI_CARD_NORMAL,      4, 1, 2, 3); /* 0c = Slot 4 */
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add(&i420ex_device);
+
+    return ret;
+}
+
+int
+machine_at_ninja_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear_combined("roms/machines/ninja/1008AY0_.BIO",
+                                    "roms/machines/ninja/1008AY0_.BI1", 0x1c000, 128);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+    device_add(&amstrad_megapc_nvr_device);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x05, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x11, PCI_CARD_NORMAL,      1, 2, 1, 2);
+    pci_register_slot(0x13, PCI_CARD_NORMAL,      2, 1, 2, 1);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      2, 1, 2, 1);
+
+    machine_force_ps2(1);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&intel_flash_bxt_ami_device);
+
+    device_add(&i420ex_device);
+    device_add_params(&i82091aa_device, (void *) I82091AA_022);
+
+    return ret;
+}
+
+int
+machine_at_sb486p_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/sb486p/amiboot.rom",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x05, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x14, PCI_CARD_NORMAL,      1, 2, 1, 2);
+    pci_register_slot(0x13, PCI_CARD_NORMAL,      2, 1, 2, 1);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add_params(&i82091aa_device, (void *) I82091AA_26E);
+    device_add(&i420ex_device);
+
+    return ret;
+}
+
+/* i420TX */
+int
+machine_at_amis76_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear_inverted("roms/machines/s76p/S76P.ROM",
+                                    0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+    pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    // pci_register_slot(0x01, PCI_CARD_IDE,         1, 2, 3 ,4);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&sio_device);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add(&intel_flash_bxt_ami_device);
+
+    device_add(&i420tx_device);
+    // device_add(&ide_cmd640_pci_device); /* is this actually cmd640? is it single channel? */
+    device_add(&ide_pci_device);
+
+    return ret;
+}
+
+int
+machine_at_486sp3_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/486sp3/awsi2737.bin",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+    device_add(&ide_isa_device);
+
+    pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_SCSI,        1, 2, 3, 4); /* 01 = SCSI */
+    pci_register_slot(0x03, PCI_CARD_NORMAL,      1, 2, 3, 4); /* 03 = Slot 1 */
+    pci_register_slot(0x04, PCI_CARD_NORMAL,      2, 3, 4, 1); /* 04 = Slot 2 */
+    pci_register_slot(0x05, PCI_CARD_NORMAL,      3, 4, 1, 2); /* 05 = Slot 3 */
+    pci_register_slot(0x06, PCI_CARD_NORMAL,      4, 1, 2, 3); /* 06 = Slot 4 */
+    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&sio_device);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C663 | FDC37C6XX_IDE_PRI));
+    device_add(&sst_flash_29ee010_device);
+
+    device_add(&i420tx_device);
+    device_add(&ncr53c810_onboard_pci_device);
+
+    return ret;
+}
+
+int
+machine_at_alfredo_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear_combined("roms/machines/alfredo/1010AQ0_.BIO",
+                                    "roms/machines/alfredo/1010AQ0_.BI1", 0x1c000, 128);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    device_add(&amstrad_megapc_nvr_device);
+    device_add(&ide_pci_device);
+
+    pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_IDE,         0, 0, 0, 0);
+    pci_register_slot(0x06, PCI_CARD_NORMAL,      3, 2, 1, 4);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 1, 3, 4);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 3, 2, 4);
+    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&sio_device);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C663);
+    device_add(&intel_flash_bxt_ami_device);
+
+    device_add(&i420tx_device);
+
+    return ret;
+}
+
+/* i420ZX */
+int
+machine_at_486sp3g_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/486sp3g/PCI-I-486SP3G_0306.001 (Beta).bin",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+    device_add(&ide_isa_device);
+
+    pci_init(PCI_CONFIG_TYPE_2);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_SCSI,        1, 2, 3, 4); /* 01 = SCSI */
+    pci_register_slot(0x06, PCI_CARD_NORMAL,      1, 2, 3, 4); /* 06 = Slot 1 */
+    pci_register_slot(0x05, PCI_CARD_NORMAL,      2, 3, 4, 1); /* 05 = Slot 2 */
+    pci_register_slot(0x04, PCI_CARD_NORMAL,      3, 4, 1, 2); /* 04 = Slot 3 */
+    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&sio_zb_device);
+    device_add_params(&pc873xx_device, (void *) (PC87332 | PCX73XX_IDE_PRI | PCX730X_398));
+    device_add(&sst_flash_29ee010_device);
+
+    device_add(&i420zx_device);
+    device_add(&ncr53c810_onboard_pci_device);
+
+    return ret;
+}
+
+static const device_config_t sb486pv_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "sb486pv",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "AMI WinBIOS (062594) - Revision 0108", .internal_name = "sb486pv_0108", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/sb486pv/41-0108-062594-SATURN2.rom", "" } },
+            { .name = "AMI WinBIOS (062594) - Revision 0301", .internal_name = "sb486pv_0301", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/sb486pv/0301-062594-SATURN2.rom", "" } },
+            { .name = "AMIBIOS 6 (071595) - Revision 1301", .internal_name = "sb486pv", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/sb486pv/amiboot.rom", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t sb486pv_device = {
+    .name          = "ICS SB486PV",
+    .internal_name = "sb486pv_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = sb486pv_config
+};
+
+int
+machine_at_sb486pv_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    if (!strcmp(fn, "roms/machines/sb486pv/amiboot.rom"))
+        ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+    else
+        ret = bios_load_linear_inverted(fn, 0x000e0000, 131072, 0);
+    device_context_restore();
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_2);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0e, PCI_CARD_IDE,         0, 0, 0, 0);
+    pci_register_slot(0x0f, PCI_CARD_VIDEO,       1, 2, 3, 4);
+    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add(&sio_zb_device);
+    device_add(&ide_rz1000_pci_single_channel_device);
+    device_add_params(&i82091aa_device, (void *) I82091AA_26E);
+    if (!strcmp(fn, "roms/machines/sb486pv/amiboot.rom"))
+        device_add(&intel_flash_bxt_device);
+    else
+        device_add(&intel_flash_bxt_ami_device);
+
+    device_add(&i420zx_device);
+
+    return ret;
+}
+
+/* IMS 8848 */
+int
+machine_at_pci400cb_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/pci400cb/032295.ROM",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+    device_add(&ami_1994_nvr_device);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      4, 3, 2, 1); /* 0F = Slot 1 */
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2); /* 0E = Slot 2 */
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      2, 3, 4, 1); /* 0D = Slot 3 */
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4); /* 0C = Slot 4 */
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&ims8848_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* SiS 496 */
+static void
+machine_at_sis_85c496_common_init(UNUSED(const machine_t *model))
+{
+    device_add(&ide_pci_2ch_device);
+
+    pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
+    pci_register_slot(0x05, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+
+    pci_set_irq_routing(PCI_INTA, PCI_IRQ_DISABLED);
+    pci_set_irq_routing(PCI_INTB, PCI_IRQ_DISABLED);
+    pci_set_irq_routing(PCI_INTC, PCI_IRQ_DISABLED);
+    pci_set_irq_routing(PCI_INTD, PCI_IRQ_DISABLED);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+}
+
+int
+machine_at_acerp3_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/acerp3/Acer Mate 600 P3 BIOS U13 V2.0R02-J3 ACR8DE00-S00-950911-R02-J3.bin",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    machine_at_sis_85c496_common_init(model);
+    device_add(&sis_85c496_device);
+    pci_register_slot(0x09, PCI_CARD_VIDEO,  0, 0, 0, 0);
+    pci_register_slot(0x0A, PCI_CARD_IDE, 	 0, 0, 0, 0);
+    pci_register_slot(0x12, PCI_CARD_NORMAL, 3, 4, 1, 2);
+    pci_register_slot(0x13, PCI_CARD_NORMAL, 2, 3, 4, 1);
+	pci_register_slot(0x14, PCI_CARD_NORMAL, 1, 2, 3, 4);
+
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_PRI));
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add(&ide_cmd640_pci_legacy_only_device);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&gd5434_onboard_pci_device);
+
+    device_add(&intel_flash_bxt_device);
+
+    return ret;
+}
+
+int
+machine_at_486sp3c_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/486sp3c/SI4I0306.AWD",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    machine_at_sis_85c496_common_init(model);
+    device_add(&sis_85c496_device);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL, 3, 4, 1, 2);
+
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&intel_flash_bxt_device);
+
+    return ret;
+}
+
+int
+machine_at_ls486e_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ls486e/LS486E RevC.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    machine_at_sis_85c496_common_init(model);
+    device_add(&sis_85c496_ls486e_device);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL, 3, 4, 1, 2);
+    pci_register_slot(0x06, PCI_CARD_NORMAL, 4, 1, 2, 3);
+
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_m4li_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/m4li/M4LI.04S",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    machine_at_sis_85c496_common_init(model);
+    device_add(&sis_85c496_device);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x07, PCI_CARD_NORMAL, 4, 1, 2, 3);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL, 3, 4, 1, 2);
+
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_ms4144_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ms4144/ms-4144-1.4.bin",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    machine_at_sis_85c496_common_init(model);
+    device_add(&sis_85c496_ls486e_device);
+    pci_register_slot(0x03, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL, 3, 4, 1, 2);
+
+    device_add_params(&w837x7_device, (void *) (W83787F | W837X7_KEY_89));
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
+
+int
+machine_at_r418_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/r418/r418i.bin",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    machine_at_sis_85c496_common_init(model);
+    device_add(&sis_85c496_device);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL, 3, 4, 1, 2);
+    pci_register_slot(0x07, PCI_CARD_NORMAL, 4, 1, 2, 3);
+
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_4saw2_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/4saw2/4saw0911.bin",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    machine_at_sis_85c496_common_init(model);
+    device_add(&sis_85c496_device);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL, 3, 4, 1, 2);
+    pci_register_slot(0x11, PCI_CARD_NORMAL, 4, 1, 2, 3);
+
+    device_add_params(&w837x7_device, (void *) (W83777F | W837X7_KEY_89));
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&intel_flash_bxt_device);
+
+    return ret;
+}
+
+int
+machine_at_4dps_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/4dps/4DPS172G.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    machine_at_sis_85c496_common_init(model);
+    device_add(&sis_85c496_device);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL, 3, 4, 1, 2);
+    pci_register_slot(0x07, PCI_CARD_NORMAL, 4, 1, 2, 3);
+
+    device_add_params(&w837x7_device, (void *) (W83787IF | W837X7_KEY_89));
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&intel_flash_bxt_device);
+
+    return ret;
+}
+
+/* UMC 8881 */
+int
+machine_at_atc1415_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/atc1415/1415V330.ROM",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x12, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x13, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x14, PCI_CARD_NORMAL,      3, 4, 1, 2);
+
+    device_add(&umc_hb4_device);
+    device_add(&umc_8886bf_device);
+    device_add(&intel_flash_bxt_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
+
+int
+machine_at_84xxuuda_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/84xxuuda/uud0520s.bin",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x12, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x03, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x04, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x05, PCI_CARD_NORMAL,      3, 4, 1, 2);
+
+    device_add(&umc_hb4_device);
+    device_add(&umc_8886bf_device);
+    device_add_params(&um866x_device, (void *) UM8663BF);
+    device_add(&winbond_flash_w29c010_device);
+
+    return ret;
+}
+
+int
+machine_at_pl4600c_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/pl4600c/SST29EE010.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4); /* Slot 01 */
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3); /* Slot 02 */
+    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x12, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); /* Onboard */
+    pci_register_slot(0x13, PCI_CARD_VIDEO,       0, 0, 0, 0); /* Onboard */ 
+
+
+    device_add(&umc_hb4_device);
+    device_add(&umc_8886af_device);
+    device_add_params(&um866x_device, (void *) UM8663AF);
+    device_add(&sst_flash_29ee010_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&gd5430_onboard_pci_device);
+
+    if (sound_card_current[0] == SOUND_INTERNAL)
+        device_add(&ess_1688_device);
+
+    if (fdc_current[0] == FDC_INTERNAL){
+        fdd_set_turbo(0, 1);
+        fdd_set_turbo(1, 1);
+    }
+
+    return ret;
+}
+
+int
+machine_at_ecs486_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ecs486/8810AIO.32J",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x12, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x0F, PCI_CARD_IDE,         0, 0, 0, 0);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2);
+
+    device_add(&umc_hb4_device);
+    device_add(&umc_8886f_device);
+    device_add(&ide_cmd640_pci_legacy_only_device);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add(&intel_flash_bxt_device);
+
+    machine_force_ps2(1);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_actionpc2600_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/actionpc2600/action2600.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 3);
+    pci_register_slot(0x12, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x0E, PCI_CARD_VIDEO,       0, 0, 0, 0);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
+
+    device_add(&umc_hb4_device);
+    device_add(&umc_8886bf_device);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add(&intel_flash_bxt_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    return ret;
+}
+
+int
+machine_at_actiontower8400_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/actiontower8400/V31C.ROM",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x12, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x15, PCI_CARD_VIDEO,       0, 0, 0, 0);
+    pci_register_slot(0x16, PCI_CARD_IDE,         0, 0, 0, 0);
+    pci_register_slot(0x13, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x14, PCI_CARD_NORMAL,      2, 3, 4, 1);
+
+    device_add(&umc_hb4_device);
+    device_add(&umc_8886f_device);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add(&ide_cmd640_pci_device);
+    device_add(&intel_flash_bxt_device); // The ActionPC 2600 has this so I'm gonna assume this does too.
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    return ret;
+}
+
+int
+machine_at_m919_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/m919/9190914s.rom",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x12, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2);
+
+    device_add(&umc_hb4_device);
+    device_add(&umc_8886af_device);    /* AF is correct - the BIOS does IDE writes to ports 108h and 109h. */
+    device_add_params(&um866x_device, (void *) UM8663BF);
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
+
+int
+machine_at_spc7700plw_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/spc7700plw/77LW13FH.P24",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x12, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2);
+
+    device_add(&umc_hb4_device);
+    device_add(&umc_8886af_device);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add(&intel_flash_bxt_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+static const device_config_t hot433a_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "hot433a",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "AMIBIOS 5 (101094) - Revision 433AUS33", .internal_name = "hot433a", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/hot433/433AUS33.ROM", "" } },
+            { .name = "Award Modular BIOS v4.51PG - Revision 2.5 (by eSupport)", .internal_name = "hot433a_v451pg", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/hot433/2A4X5H21.BIN", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t hot433a_device = {
+    .name          = "Shuttle HOT-433A",
+    .internal_name = "hot433a_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = hot433a_config
+};
+
+int
+machine_at_hot433a_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    int is_award = !strcmp(device_get_config_bios("bios"), "hot433a_v451pg");
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+    device_context_restore();
+
+    machine_at_common_init_ex(model, 2);
+    if (is_award)
+        device_add(&amstrad_megapc_nvr_device);
+    else
+        device_add(&ami_1994_nvr_device);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x12, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      2, 3, 4, 1);
+
+    device_add(&umc_hb4_device);
+    device_add(&umc_8886bf_device);
+    if (is_award)
+        device_add_params(&um866x_device, (void *) UM8663AF);
+    else
+        device_add_params(&um8669f_device, (void *) 0);
+    device_add(&winbond_flash_w29c010_device);
+    if (is_award)
+        machine_force_ps2(1);
+    else
+        machine_force_ps2(0);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    pic_toggle_latch(is_award);
+
+    return ret;
+}
+
+/* VIA VT82C496G */
+int
+machine_at_g486vpa_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/g486vpa/3.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x08, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3);
+
+    device_add(&via_vt82c49x_pci_ide_device);
+    device_add(&via_vt82c505_device);
+    device_add_params(&pc873xx_device, (void *) (PC87332 | PCX73XX_IDE_SEC | PCX730X_398));
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
+
+int
+machine_at_486vipio2_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/486vipio2/1175G701.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x08, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3);
+
+    device_add(&via_vt82c49x_pci_ide_device);
+    device_add(&via_vt82c505_device);
+    device_add_params(&w837x7_device, (void *) (W83787F | W837X7_KEY_89));
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    device_add(&winbond_flash_w29c010_device);
+
+    return ret;
+}
diff --git a/src/machine/m_at_socket4.c b/src/machine/m_at_socket4.c
index 02018949c..5e1bf533f 100644
--- a/src/machine/m_at_socket4.c
+++ b/src/machine/m_at_socket4.c
@@ -8,11 +8,9 @@
  *
  *          Implementation of Socket 4 machines.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2016-2019 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -41,46 +39,75 @@
 #include <86box/video.h>
 #include <86box/machine.h>
 
-void
-machine_at_premiere_common_init(const machine_t *model, int pci_switch)
-{
-    machine_at_common_init(model);
-    device_add(&ide_pci_device);
+/* i430LX */
+static const device_config_t v12p_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "v12p",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 }, /*W1*/
+        .bios = {
+            { .name = "Acer BIOS V1.2 - Revision R1.4", .internal_name = "v12p_r14", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/v12p/v12p_14.bin", "" } },
+            { .name = "Acer BIOS V1.2 - Revision R1.6", .internal_name = "v12p", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/v12p/v12p_16.bin", "" } },	  
+            { .files_no = 0 }            
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
 
-    pci_init(PCI_CONFIG_TYPE_2 | pci_switch);
+const device_t v12p_device = {
+    .name          = "Acer V12P",
+    .internal_name = "v12p_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available	   = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = v12p_config
+};
+
+int
+machine_at_v12p_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+    device_context_restore();
+	
+    machine_at_common_init(model);
+
+    device_add(&ide_isa_device);
+    pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x01, PCI_CARD_IDE,         0, 0, 0, 0);
-    pci_register_slot(0x06, PCI_CARD_NORMAL,      3, 2, 1, 4);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 1, 3, 4);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 3, 2, 4);
-    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&keyboard_ps2_intel_ami_pci_device);
+    pci_register_slot(0x01, PCI_CARD_SCSI,        1, 4, 3, 2);
+    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 2, 1, 4, 3);
+    pci_register_slot(0x03, PCI_CARD_NORMAL,      3, 2, 1, 4);
+    pci_register_slot(0x04, PCI_CARD_NORMAL,      4, 0, 0, 0);
+    pci_register_slot(0x05, PCI_CARD_NORMAL,      0, 0, 0, 0);
+    device_add(&i430lx_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
     device_add(&sio_zb_device);
-    device_add(&fdc37c665_device);
-    device_add(&intel_flash_bxt_ami_device);
-}
+    device_add_params(&pc87310_device, (void *) (PC87310_ALI));
+    device_add(&amd_am28f010_flash_device);
 
-void
-machine_at_sp4_common_init(const machine_t *model)
-{
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    /* Excluded: 02, 03, 04, 05, 06, 07, 08, 09, 0A, 0B, 0C, 0D, 0E, 0F, 10, 11, 12, 13, 14 */
-    pci_register_slot(0x0D, PCI_CARD_IDE, 1, 2, 3, 4);
-    /* Excluded: 02, 03*, 04*, 05*, 06*, 07*, 08* */
-    /* Slots: 09 (04), 0A (03), 0B (02), 0C (07) */
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x09, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    device_add(&sis_85c50x_device);
-    device_add(&ide_cmd640_pci_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c665_device);
-    device_add(&intel_flash_bxt_device);
+    return ret;
 }
 
 int
@@ -103,8 +130,8 @@ machine_at_excaliburpci_init(const machine_t *model)
     pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 3, 4, 1);
     pci_register_slot(0x0D, PCI_CARD_NORMAL,      3, 4, 1, 2);
     pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&fdc37c665_device);
-    device_add(&keyboard_ps2_ami_pci_device);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
     device_add(&ide_cmd640_pci_legacy_only_device);
 
     device_add(&i430lx_device);
@@ -126,7 +153,6 @@ machine_at_p5mp3_init(const machine_t *model)
         return ret;
 
     machine_at_common_init(model);
-    device_add(&ide_pci_device);
 
     pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
@@ -135,43 +161,11 @@ machine_at_p5mp3_init(const machine_t *model)
     pci_register_slot(0x03, PCI_CARD_NORMAL,      3, 4, 1, 2); /* 03 = Slot 3 */
     pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     device_add(&fdc_at_device);
-    device_add(&keyboard_ps2_pci_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
 
+    device_add(&i430lx_device);
     device_add(&sio_zb_device);
     device_add(&catalyst_flash_device);
-    device_add(&i430lx_device);
-
-    return ret;
-}
-
-int
-machine_at_dellxp60_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear_inverted("roms/machines/dellxp60/XP60-A08.ROM",
-                                    0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add(&ide_pci_device);
-
-    pci_init(PCI_CONFIG_TYPE_2);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    /* Not: 00, 02, 03, 04, 05, 06, 07, 08, 09, 0A, 0B, 0C, 0D, 0E, 0F. */
-    /* Yes: 01, 10, 11, 12, 13, 14. */
-    pci_register_slot(0x01, PCI_CARD_NORMAL,      1, 3, 2, 4);
-    pci_register_slot(0x04, PCI_CARD_NORMAL,      4, 4, 3, 3);
-    pci_register_slot(0x05, PCI_CARD_NORMAL,      1, 4, 3, 2);
-    pci_register_slot(0x06, PCI_CARD_NORMAL,      2, 1, 3, 4);
-    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&i430lx_device);
-    device_add(&keyboard_ps2_intel_ami_pci_device);
-    device_add(&sio_zb_device);
-    device_add(&fdc37c665_device);
-    device_add(&intel_flash_bxt_ami_device);
 
     return ret;
 }
@@ -187,8 +181,10 @@ machine_at_opti560l_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
-    device_add(&ide_pci_2ch_device);
+    machine_at_common_init_ex(model, 2);
+
+    device_add(&amstrad_megapc_nvr_device);
+    device_add(&ide_pci_device);
 
     pci_init(PCI_CONFIG_TYPE_2);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
@@ -197,27 +193,48 @@ machine_at_opti560l_init(const machine_t *model)
     pci_register_slot(0x08, PCI_CARD_NORMAL,      2, 1, 3, 4);
     pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     device_add(&i430lx_device);
-    device_add(&keyboard_ps2_intel_ami_pci_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
     device_add(&sio_zb_device);
-    device_add(&i82091aa_device);
+    device_add_params(&i82091aa_device, (void *) I82091AA_022);
     device_add(&intel_flash_bxt_ami_device);
 
     return ret;
 }
 
+void
+machine_at_award_common_init(const machine_t *model)
+{
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x03, PCI_CARD_NORMAL,      1, 2, 3, 4); /* 03 = Slot 1 */
+    pci_register_slot(0x04, PCI_CARD_NORMAL,      2, 3, 4, 1); /* 04 = Slot 2 */
+    pci_register_slot(0x05, PCI_CARD_NORMAL,      3, 4, 1, 2); /* 05 = Slot 3 */
+    pci_register_slot(0x06, PCI_CARD_NORMAL,      4, 1, 2, 3); /* 06 = Slot 4 */
+    pci_register_slot(0x07, PCI_CARD_SCSI,        1, 2, 3, 4); /* 07 = SCSI   */
+    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add(&sio_zb_device);
+    device_add(&intel_flash_bxt_device);
+}
+
 int
-machine_at_ambradp60_init(const machine_t *model)
+machine_at_586is_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear_combined("roms/machines/ambradp60/1004AF1P.BIO",
-                                    "roms/machines/ambradp60/1004AF1P.BI1",
-                                    0x1c000, 128);
+    ret = bios_load_linear("roms/machines/586is/IS.34",
+                           0x000e0000, 131072, 0);
 
     if (bios_only || !ret)
         return ret;
 
-    machine_at_premiere_common_init(model, 0);
+    machine_at_award_common_init(model);
 
     device_add(&i430lx_device);
 
@@ -237,7 +254,7 @@ machine_at_valuepointp60_init(const machine_t *model)
         return ret;
 
     machine_at_common_init(model);
-    device_add(&ide_pci_2ch_device);
+    device_add(&ide_pci_device);
 
     pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
@@ -247,9 +264,9 @@ machine_at_valuepointp60_init(const machine_t *model)
     pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 1, 3, 4);
     pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 3, 2, 4);
     pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&keyboard_ps2_ps1_pci_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
     device_add(&sio_device);
-    device_add(&fdc37c665_device);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_PRI));
     device_add(&intel_flash_bxt_ami_device);
 
     device_add(&i430lx_device);
@@ -260,6 +277,116 @@ machine_at_valuepointp60_init(const machine_t *model)
     return ret;
 }
 
+static const device_config_t batman_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "batman",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "AMIBIOS 111192 - Revision A08 (Dell Dimension XPS P60)", .internal_name = "dellxp60", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/batman/XP60-A08.ROM", "" } },
+            { .name = "Intel AMIBIOS - Revision 1.00.04.AF1P (AMBRA DP60 PCI)", .internal_name = "ambradp60", .bios_type = BIOS_NORMAL, 
+              .files_no = 2, .local = 0, .size = 131072, .files = { "roms/machines/batman/1004AF1P.BIO", "roms/machines/batman/1004AF1P.BI1", "" } },
+            { .name = "Intel AMIBIOS - Revision 1.00.08.AF1", .internal_name = "batman", .bios_type = BIOS_NORMAL, 
+              .files_no = 2, .local = 0, .size = 131072, .files = { "roms/machines/batman/1008AF1_.BIO", "roms/machines/batman/1008AF1_.BI1", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t batman_device = {
+    .name          = "Intel Premiere/PCI (Batman)",
+    .internal_name = "batman_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = batman_config
+};
+
+int
+machine_at_batman_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+    const char* fn2;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    int is_dell = !strcmp(device_get_config_bios("bios"), "dellxp60");
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    if (is_dell)
+        ret = bios_load_linear_inverted(fn, 0x000e0000, 131072, 0);
+    else {
+        fn2 = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 1);
+        ret = bios_load_linear_combined(fn, fn2, 0x1c000, 128);
+    }
+    device_context_restore();
+
+    machine_at_common_init_ex(model, 2);
+
+    device_add(&amstrad_megapc_nvr_device);
+    device_add(&ide_pci_device);
+
+    pci_init(PCI_CONFIG_TYPE_2);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_IDE,         0, 0, 0, 0);
+    if (is_dell) {
+        pci_register_slot(0x04, PCI_CARD_NORMAL,      4, 4, 3, 3);
+        pci_register_slot(0x05, PCI_CARD_NORMAL,      1, 4, 3, 2);
+        pci_register_slot(0x06, PCI_CARD_NORMAL,      2, 1, 3, 4);
+    } else {
+        pci_register_slot(0x06, PCI_CARD_NORMAL,      3, 2, 1, 4);
+        pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 1, 3, 4);
+        pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 3, 2, 4);
+    }
+    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add(&sio_zb_device);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_PRI));
+    device_add(&intel_flash_bxt_ami_device);
+
+    device_add(&i430lx_device);
+
+    return ret;
+}
+
+void
+machine_at_premiere_common_init(const machine_t *model, int pci_switch)
+{
+    machine_at_common_init_ex(model, 2);
+
+    device_add(&amstrad_megapc_nvr_device);
+    device_add(&ide_pci_2ch_device);
+
+    pci_init(PCI_CONFIG_TYPE_2 | pci_switch);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_IDE,         0, 0, 0, 0);
+    pci_register_slot(0x06, PCI_CARD_NORMAL,      3, 2, 1, 4);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 1, 3, 4);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 3, 2, 4);
+    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add(&sio_zb_device);
+    device_add(&ide_rz1000_pci_single_channel_device);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_SEC));
+    device_add(&intel_flash_bxt_ami_device);
+}
+
 int
 machine_at_revenge_init(const machine_t *model)
 {
@@ -279,42 +406,32 @@ machine_at_revenge_init(const machine_t *model)
     return ret;
 }
 
-void
-machine_at_award_common_init(const machine_t *model)
-{
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x03, PCI_CARD_NORMAL,      1, 2, 3, 4); /* 03 = Slot 1 */
-    pci_register_slot(0x04, PCI_CARD_NORMAL,      2, 3, 4, 1); /* 04 = Slot 2 */
-    pci_register_slot(0x05, PCI_CARD_NORMAL,      3, 4, 1, 2); /* 05 = Slot 3 */
-    pci_register_slot(0x06, PCI_CARD_NORMAL,      4, 1, 2, 3); /* 06 = Slot 4 */
-    pci_register_slot(0x07, PCI_CARD_SCSI,        1, 2, 3, 4); /* 07 = SCSI   */
-    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
-
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&sio_zb_device);
-    device_add(&intel_flash_bxt_device);
-}
-
 int
-machine_at_586is_init(const machine_t *model)
+machine_at_m5pi_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/586is/IS.34",
+    ret = bios_load_linear_inverted("roms/machines/m5pi/M5PI10R.BIN",
                            0x000e0000, 131072, 0);
 
     if (bios_only || !ret)
         return ret;
 
-    machine_at_award_common_init(model);
+    machine_at_common_init(model);
 
-    device_add(&i430lx_device);
+    pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_IDE,         0, 0, 0, 0);
+    pci_register_slot(0x0f, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0c, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0b, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    device_add(&i430lx_device);	
+    device_add(&sio_zb_device);	
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add(&ide_w83769f_pci_single_channel_device);	
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_SEC));
+    device_add(&intel_flash_bxt_ami_device);
 
     return ret;
 }
@@ -347,14 +464,15 @@ machine_at_pb520r_init(const machine_t *model)
     if (gfxcard[0] == VID_INTERNAL)
         device_add(&gd5434_onboard_pci_device);
 
-    device_add(&keyboard_ps2_pci_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
     device_add(&sio_zb_device);
-    device_add(&i82091aa_ide_device);
+    device_add_params(&i82091aa_device, (void *) (I82091AA_022 | I82091AA_IDE_PRI));
     device_add(&intel_flash_bxt_ami_device);
 
     return ret;
 }
 
+/* OPTi 597 */
 int
 machine_at_excalibur_init(const machine_t *model)
 {
@@ -370,8 +488,39 @@ machine_at_excalibur_init(const machine_t *model)
 
     device_add(&opti5x7_device);
     device_add(&ide_opti611_vlb_device);
-    device_add(&fdc37c661_device);
-    device_add(&keyboard_ps2_intel_ami_pci_device);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C661);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_at_globalyst330_p5_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/globalyst330_p5/MiTAC_PB5500C_v1.02_120794_ATT.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0,  0,  0,  0);
+    pci_register_slot(0x11, PCI_CARD_NORMAL,      1,  2,  3,  4);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,      5,  6,  7,  8);
+    pci_register_slot(0x13, PCI_CARD_NORMAL,      9,  10, 11, 12);
+    pci_register_slot(0x14, PCI_CARD_NORMAL,      13, 14, 15, 16);
+
+    device_add(&opti5x7_pci_device);
+    device_add(&opti822_device);
+    device_add(&sst_flash_29ee010_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
 
     return ret;
 }
@@ -391,7 +540,6 @@ machine_at_p5vl_init(const machine_t *model)
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-
     pci_register_slot(0x11, PCI_CARD_NORMAL,       1,  2,  3,  4);
     pci_register_slot(0x12, PCI_CARD_NORMAL,       5,  6,  7,  8);
     pci_register_slot(0x13, PCI_CARD_NORMAL,      9,  10, 11, 12);
@@ -400,14 +548,15 @@ machine_at_p5vl_init(const machine_t *model)
     device_add(&opti5x7_pci_device);
     device_add(&opti822_device);
     device_add(&sst_flash_29ee010_device);
-    device_add(&keyboard_at_ami_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
 
-    if (fdc_type == FDC_INTERNAL)
+    if (fdc_current[0] == FDC_INTERNAL)
         device_add(&fdc_at_device);
 
     return ret;
 }
 
+/* SiS 501 */
 int
 machine_at_excaliburpci2_init(const machine_t *model)
 {
@@ -422,7 +571,7 @@ machine_at_excaliburpci2_init(const machine_t *model)
     machine_at_common_init_ex(model, 2);
     device_add(&ami_1994_nvr_device);
 
-    pci_init(PCI_CONFIG_TYPE_1);
+    pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
     pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     pci_register_slot(0x08, PCI_CARD_IDE,         0, 0, 0, 0);
@@ -430,8 +579,8 @@ machine_at_excaliburpci2_init(const machine_t *model)
     pci_register_slot(0x0B, PCI_CARD_NORMAL,      2, 3, 4, 1);
     pci_register_slot(0x0C, PCI_CARD_NORMAL,      3, 4, 1, 2);
     pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    device_add(&fdc37c665_device);
-    device_add(&keyboard_ps2_ami_pci_device);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
     device_add(&ide_cmd640_pci_legacy_only_device);
 
     device_add(&sis_85c50x_device);
@@ -440,6 +589,29 @@ machine_at_excaliburpci2_init(const machine_t *model)
     return ret;
 }
 
+void
+machine_at_sp4_common_init(const machine_t *model)
+{
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    /* Excluded: 02, 03, 04, 05, 06, 07, 08, 09, 0A, 0B, 0C, 0D, 0E, 0F, 10, 11, 12, 13, 14 */
+    pci_register_slot(0x0D, PCI_CARD_IDE, 1, 2, 3, 4);
+    /* Excluded: 02, 03*, 04*, 05*, 06*, 07*, 08* */
+    /* Slots: 09 (04), 0A (03), 0B (02), 0C (07) */
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    device_add(&sis_85c50x_device);
+    device_add(&ide_cmd640_pci_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add(&intel_flash_bxt_device);
+}
+
 int
 machine_at_p5sp4_init(const machine_t *model)
 {
@@ -455,3 +627,33 @@ machine_at_p5sp4_init(const machine_t *model)
 
     return ret;
 }
+
+int
+machine_at_ecs50x_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ecs50x/ECSSi5piaio.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x02, PCI_CARD_IDE,         1, 2, 3, 4);
+    pci_register_slot(0x11, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x13, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    device_add(&sis_85c50x_device);
+    device_add_params(&ide_cmd640_pci_device, (void *) 0x100000);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add(&intel_flash_bxt_device);
+
+    return ret;
+}
diff --git a/src/machine/m_at_socket4_5.c b/src/machine/m_at_socket4_5.c
new file mode 100644
index 000000000..368f8397f
--- /dev/null
+++ b/src/machine/m_at_socket4_5.c
@@ -0,0 +1,72 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of Socket 4/5 machines.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2016-2025 Miran Grca.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/mem.h>
+#include <86box/io.h>
+#include <86box/rom.h>
+#include <86box/pci.h>
+#include <86box/device.h>
+#include <86box/chipset.h>
+#include <86box/fdc_ext.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/timer.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/keyboard.h>
+#include <86box/flash.h>
+#include <86box/nvr.h>
+#include <86box/scsi_ncr53c8xx.h>
+#include <86box/sio.h>
+#include <86box/timer.h>
+#include <86box/video.h>
+#include <86box/machine.h>
+
+/* OPTi 597 */
+int
+machine_at_pci56001_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/pci56001/AWARD_ISA_PCI_586_non_PNP_SN_013870745_1994.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0,  0,  0,  0);
+    pci_register_slot(0x11, PCI_CARD_NORMAL,      1,  2,  3,  4);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,      5,  6,  7,  8);
+    pci_register_slot(0x13, PCI_CARD_NORMAL,      9,  10, 11, 12);
+    pci_register_slot(0x14, PCI_CARD_NORMAL,      13, 14, 15, 16);
+
+    device_add(&opti5x7_pci_device);
+    device_add(&opti822_device);
+    device_add(&sst_flash_29ee010_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    return ret;
+}
diff --git a/src/machine/m_at_socket5.c b/src/machine/m_at_socket5.c
index 4a86c75d0..cb3803e0d 100644
--- a/src/machine/m_at_socket5.c
+++ b/src/machine/m_at_socket5.c
@@ -8,11 +8,9 @@
  *
  *          Implementation of Socket 5 machines.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2016-2019 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -29,6 +27,7 @@
 #include <86box/fdc_ext.h>
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/fdd.h>
 #include <86box/fdc.h>
@@ -39,60 +38,35 @@
 #include <86box/sio.h>
 #include <86box/video.h>
 #include <86box/machine.h>
+#include <86box/sound.h>
 
+/* i430NX */
 int
-machine_at_plato_init(const machine_t *model)
+machine_at_p54np4_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear_combined("roms/machines/plato/1016ax1_.bio",
-                                    "roms/machines/plato/1016ax1_.bi1",
-                                    0x1d000, 128);
+    ret = bios_load_linear("roms/machines/p54np4/asus-642accdebcb75833703472.bin",
+                           0x000e0000, 131072, 0);
 
     if (bios_only || !ret)
         return ret;
 
-    machine_at_premiere_common_init(model, PCI_CAN_SWITCH_TYPE);
-
-    device_add(&i430nx_device);
-
-    return ret;
-}
-
-int
-machine_at_dellplato_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear_combined("roms/machines/dellplato/1016AX1J.bio",
-                                    "roms/machines/dellplato/1016AX1J.bi1",
-                                    0x1d000, 128);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_premiere_common_init(model, PCI_CAN_SWITCH_TYPE);
-
-    device_add(&i430nx_device);
-
-    return ret;
-}
-
-int
-machine_at_ambradp90_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear_combined("roms/machines/ambradp90/1002AX1P.BIO",
-                                    "roms/machines/ambradp90/1002AX1P.BI1",
-                                    0x1d000, 128);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_premiere_common_init(model, PCI_CAN_SWITCH_TYPE);
+    machine_at_common_init(model);
+    device_add(&ide_vlb_2ch_device);
 
+    pci_init(PCI_CONFIG_TYPE_2 | PCI_CAN_SWITCH_TYPE);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_NORMAL,      1, 2, 3, 4); /* 07 = Slot 1 */
+    pci_register_slot(0x06, PCI_CARD_NORMAL,      2, 3, 4, 1); /* 06 = Slot 2 */
+    pci_register_slot(0x05, PCI_CARD_NORMAL,      3, 4, 1, 2); /* 05 = Slot 3 */
+    pci_register_slot(0x04, PCI_CARD_NORMAL,      4, 1, 2, 3); /* 04 = Slot 4 */
+    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     device_add(&i430nx_device);
+    device_add(&sio_zb_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_PRI));
+    device_add(&intel_flash_bxt_device);
 
     return ret;
 }
@@ -115,6 +89,146 @@ machine_at_586ip_init(const machine_t *model)
     return ret;
 }
 
+static const device_config_t plato_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "plato",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "Intel AMIBIOS - Revision 1.00.02.AX1P (AMBRA DP90 PCI)", .internal_name = "ambradp90", .bios_type = BIOS_NORMAL, 
+              .files_no = 2, .local = 0, .size = 131072, .files = { "roms/machines/plato/1002AX1P.BIO", "roms/machines/plato/1002AX1P.BI1", "" } },
+            { .name = "Intel AMIBIOS - Revision 1.00.16.AX1", .internal_name = "plato", .bios_type = BIOS_NORMAL, 
+              .files_no = 2, .local = 0, .size = 131072, .files = { "roms/machines/plato/1016ax1_.bio", "roms/machines/plato/1016ax1_.bi1", "" } },
+            { .name = "Intel AMIBIOS - Revision 1.00.16.AX1J (Dell Dimension XPS P___)", .internal_name = "dellplato", .bios_type = BIOS_NORMAL, 
+              .files_no = 2, .local = 0, .size = 131072, .files = { "roms/machines/plato/1016AX1J.BIO", "roms/machines/plato/1016AX1J.BI1", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t plato_device = {
+    .name          = "Intel Premiere/PCI II (Plato)",
+    .internal_name = "plato_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = plato_config
+};
+
+int
+machine_at_plato_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+    const char* fn2;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    fn2 = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 1);
+    ret = bios_load_linear_combined(fn, fn2, 0x1d000, 128);
+    device_context_restore();
+
+    machine_at_premiere_common_init(model, PCI_CAN_SWITCH_TYPE);
+
+    device_add(&i430nx_device);
+
+    return ret;
+}
+
+static const device_config_t d842_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "d842",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 }, /*W1*/
+        .bios = {
+            { .name = "PhoenixBIOS Pentium 1.03 - Revision 1.03.842", .internal_name = "d842_103", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d842/d842.BIN", "" } },
+            { .name = "PhoenixBIOS Pentium 1.03 - Revision 1.09.842", .internal_name = "d842_109", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d842/d842_jul96.bin", "" } },
+            { .name = "PhoenixBIOS Pentium 1.03 - Revision 1.10.842", .internal_name = "d842", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d842/d842_jun98_1.bin", "" } },
+            { .name = "PhoenixBIOS 4.04 - Revision 1.05.842", .internal_name = "d842_105", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d842/d842_mar96.bin", "" } },
+            { .name = "PhoenixBIOS 4.04 - Revision 1.06.842", .internal_name = "d842_106", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d842/d842_apr98.bin", "" } },
+            { .name = "PhoenixBIOS 4.04 - Revision 1.07.842", .internal_name = "d842_107", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d842/d842_jun98.BIN", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t d842_device = {
+    .name          = "Siemens-Nixdorf D842",
+    .internal_name = "d842_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = d842_config
+};
+
+int
+machine_at_d842_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+    device_context_restore();
+
+    machine_at_common_init(model);
+
+    device_add(&ide_pci_2ch_device);
+    pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); /* Onboard */
+    pci_register_slot(0x03, PCI_CARD_VIDEO,       4, 0, 0, 0); /* Onboard */
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 3, 2, 4); /* Slot 01 */
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 1, 3, 4); /* Slot 02 */
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add(&i430nx_device);
+    device_add(&sio_zb_device);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add(&intel_flash_bxt_device);
+
+    return ret;
+}
+
 int
 machine_at_tek932_init(const machine_t *model)
 {
@@ -125,7 +239,7 @@ machine_at_tek932_init(const machine_t *model)
 
     if (bios_only || !ret)
         return ret;
-    
+
     machine_at_common_init(model);
 
     pci_init(PCI_CONFIG_TYPE_2 | PCI_CAN_SWITCH_TYPE);
@@ -135,16 +249,18 @@ machine_at_tek932_init(const machine_t *model)
     pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2);
     pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
     pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 3, 2, 4);
-    device_add(&keyboard_ps2_intel_ami_pci_device);
+    machine_force_ps2(1);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
     device_add(&i430nx_device);
     device_add(&sio_zb_device);
-    device_add(&fdc37c665_ide_device);
     device_add(&ide_vlb_device);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_PRI));
     device_add(&intel_flash_bxt_ami_device);
 
     return ret;
 }
 
+/* i430FX */
 int
 machine_at_acerv30_init(const machine_t *model)
 {
@@ -167,8 +283,8 @@ machine_at_acerv30_init(const machine_t *model)
     pci_register_slot(0x13, PCI_CARD_NORMAL,      4, 1, 2, 3);
     device_add(&i430fx_device);
     device_add(&piix_device);
-    device_add(&keyboard_ps2_acer_pci_device);
-    device_add(&fdc37c665_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
 
     device_add(&sst_flash_29ee010_device);
 
@@ -196,10 +312,47 @@ machine_at_apollo_init(const machine_t *model)
     pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
     pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3);
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&keyboard_ps2_ami_pci_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
     device_add(&i430fx_device);
     device_add(&piix_device);
-    device_add(&pc87332_398_device);
+    device_add_params(&pc873xx_device, (void *) (PC87332 | PCX730X_398));
+    device_add(&intel_flash_bxt_device);
+
+    return ret;
+}
+
+int
+machine_at_optiplexgxl_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/optiplexgxl/DELL.ROM",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+    device_add(&amstrad_megapc_nvr_device);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      3, 4, 2, 1);
+    pci_register_slot(0x10, PCI_CARD_VIDEO,       0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    if (sound_card_current[0] == SOUND_INTERNAL)
+        machine_snd = device_add(machine_get_snd_device(machine));
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add(&i430fx_device);
+    device_add(&piix_device);
+    device_add_params(&pc873xx_device, (void *) (PC87332 | PCX730X_02E));
+    device_add(&dell_jumper_device);
     device_add(&intel_flash_bxt_device);
 
     return ret;
@@ -238,6 +391,35 @@ machine_at_zappa_gpio_init(void)
     machine_set_gpio_default(gpio);
 }
 
+int
+machine_at_pt2000_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ficpt2000/PT2000_v1.01.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x08, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add(&i430fx_device);
+    device_add(&piix_device);
+    device_add_params(&pc873xx_device, (void *) (PC87332 | PCX730X_398));
+    device_add(&intel_flash_bxt_device);
+
+    return ret;
+}
+
 int
 machine_at_zappa_init(const machine_t *model)
 {
@@ -259,10 +441,9 @@ machine_at_zappa_init(const machine_t *model)
     pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2);
     pci_register_slot(0x0F, PCI_CARD_NORMAL,      2, 3, 4, 1);
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&keyboard_ps2_intel_ami_pci_device);
     device_add(&i430fx_device);
     device_add(&piix_device);
-    device_add(&pc87306_device);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
     device_add(&intel_flash_bxt_ami_device);
 
     return ret;
@@ -287,10 +468,10 @@ machine_at_powermatev_init(const machine_t *model)
     pci_register_slot(0x08, PCI_CARD_NORMAL,      0, 0, 0, 0);
     pci_register_slot(0x11, PCI_CARD_NORMAL,      1, 2, 3, 4);
     pci_register_slot(0x13, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    device_add(&keyboard_ps2_ami_pci_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
     device_add(&i430fx_device);
     device_add(&piix_device);
-    device_add(&fdc37c665_device);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
     device_add(&intel_flash_bxt_device);
 
     return ret;
@@ -316,21 +497,22 @@ machine_at_hawk_init(const machine_t *model)
     pci_register_slot(0x13, PCI_CARD_NORMAL,      2, 3, 4, 1);
     pci_register_slot(0x12, PCI_CARD_NORMAL,      3, 4, 1, 2);
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&keyboard_ps2_tg_ami_pci_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
     device_add(&i430fx_device);
     device_add(&piix_device);
-    device_add(&fdc37c665_device);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
     device_add(&intel_flash_bxt_device);
 
     return ret;
 }
 
+/* OPTi 597 */
 int
-machine_at_pt2000_init(const machine_t *model)
+machine_at_ncselp90_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/ficpt2000/PT2000_v1.01.BIN",
+    ret = bios_load_linear("roms/machines/ncselp90/elegancep90.bin",
                            0x000e0000, 131072, 0);
 
     if (bios_only || !ret)
@@ -339,39 +521,18 @@ machine_at_pt2000_init(const machine_t *model)
     machine_at_common_init(model);
 
     pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x08, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x09, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&i430fx_device);
-    device_add(&piix_device);
-    device_add(&pc87332_398_device);
-    device_add(&intel_flash_bxt_device);
+    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x11, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x13, PCI_CARD_NORMAL,      3, 4, 1, 2);
 
-    return ret;
-}
-
-int
-machine_at_pat54pv_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/pat54pv/PAT54PV.bin",
-                           0x000f0000, 65536, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    device_add(&opti5x7_device);
-    device_add(&keyboard_ps2_intel_ami_pci_device);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
+    device_add(&opti5x7_pci_device);
+    device_add(&opti822_device);
+    device_add(&sst_flash_29ee010_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add(&ide_opti611_vlb_device);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_SEC));
+    device_add(&ide_vlb_2ch_device);
 
     return ret;
 }
@@ -398,44 +559,39 @@ machine_at_hot543_init(const machine_t *model)
     device_add(&opti5x7_pci_device);
     device_add(&opti822_device);
     device_add(&sst_flash_29ee010_device);
-    device_add(&keyboard_at_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
 
-    if (fdc_type == FDC_INTERNAL)
+    if (fdc_current[0] == FDC_INTERNAL)
         device_add(&fdc_at_device);
 
     return ret;
 }
 
 int
-machine_at_ncselp90_init(const machine_t *model)
+machine_at_pat54pv_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/ncselp90/elegancep90.bin",
-                           0x000e0000, 131072, 0);
+    ret = bios_load_linear("roms/machines/pat54pv/PAT54PV.bin",
+                           0x000f0000, 65536, 0);
 
     if (bios_only || !ret)
         return ret;
 
     machine_at_common_init(model);
 
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x11, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x12, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x13, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    device_add(&opti5x7_device);
 
-    device_add(&opti5x7_pci_device);
-    device_add(&opti822_device);
-    device_add(&sst_flash_29ee010_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&ide_opti611_vlb_device);
-    device_add(&fdc37c665_ide_sec_device);
-    device_add(&ide_vlb_2ch_device);
+    machine_force_ps2(1);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
 
     return ret;
 }
 
+/* SiS 501 */
 int
 machine_at_p54sp4_init(const machine_t *model)
 {
@@ -465,7 +621,7 @@ machine_at_sq588_init(const machine_t *model)
 
     machine_at_common_init(model);
 
-    pci_init(PCI_CONFIG_TYPE_1);
+    pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
     pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     /* Correct: 0D (01), 0F (02), 11 (03), 13 (04) */
@@ -476,8 +632,8 @@ machine_at_sq588_init(const machine_t *model)
     pci_register_slot(0x13, PCI_CARD_NORMAL,      4, 1, 2, 3);
     device_add(&sis_85c50x_device);
     device_add(&ide_cmd640_pci_single_channel_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c665_ide_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C665 | FDC37C6XX_IDE_SEC));
     device_add(&sst_flash_29ee010_device);
 
     return ret;
@@ -496,7 +652,7 @@ machine_at_p54sps_init(const machine_t *model)
 
     machine_at_common_init(model);
 
-    pci_init(PCI_CONFIG_TYPE_1);
+    pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
     pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     pci_register_slot(0x06, PCI_CARD_NORMAL, 1, 2, 3, 4);
@@ -505,9 +661,107 @@ machine_at_p54sps_init(const machine_t *model)
     pci_register_slot(0x09, PCI_CARD_NORMAL, 4, 1, 2, 3);
     device_add(&sis_85c50x_device);
     device_add(&ide_pci_2ch_device);
-    device_add(&keyboard_at_ami_device);
-    device_add(&w83787f_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&w837x7_device, (void *) (W83787F | W837X7_KEY_89));
     device_add(&sst_flash_29ee010_device);
 
     return ret;
 }
+
+int
+machine_at_ms5109_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ms5109/A778.ROM",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+    device_add(&ami_1994_nvr_device);
+
+    pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_IDE, 0, 0, 0, 0);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL, 1, 3, 2, 4);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL, 2, 1, 3, 4);
+    pci_register_slot(0x11, PCI_CARD_NORMAL, 3, 3, 2, 4);
+    pci_register_slot(0x13, PCI_CARD_NORMAL, 4, 1, 2, 3);
+    device_add(&sis_550x_85c503_device);
+    device_add(&ide_w83769f_pci_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&w837x7_device, (void *) (W83787F | W837X7_KEY_89));
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
+
+/* SiS 5501 */
+int
+machine_at_torino_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear_inverted("roms/machines/torino/PER113.ROM",
+                                    0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+    device_add(&ami_1994_nvr_device);
+
+    pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x08, PCI_CARD_VIDEO, 0, 0, 0, 0);
+    pci_register_slot(0x03, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL, 4, 1, 2, 3);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL, 3, 4, 1, 2);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    device_add(&sis_550x_85c503_device);
+    device_add(&ide_um8673f_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add(&intel_flash_bxt_ami_device);
+
+    return ret;
+}
+
+/* UMC 889x */
+int
+machine_at_hot539_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/hot539/539_R17.ROM",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+	return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x12, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x15, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x16, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL, 3, 4, 1, 2);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL, 4, 1, 2, 3);
+    device_add(&umc_8890_device);
+    device_add(&umc_8886af_device);
+    device_add(&sst_flash_29ee010_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&um866x_device, (void *) UM8663AF);
+
+    return ret;
+}
diff --git a/src/machine/m_at_socket7.c b/src/machine/m_at_socket7.c
index fd453f9af..b0651a8af 100644
--- a/src/machine/m_at_socket7.c
+++ b/src/machine/m_at_socket7.c
@@ -8,12 +8,9 @@
  *
  *          Implementation of Socket 7 (Dual Voltage) machines.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2016-2020 Miran Grca.
- *
+ *          Copyright 2016-2025 Miran Grca.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -24,7 +21,6 @@
 #include <86box/mem.h>
 #include <86box/io.h>
 #include <86box/rom.h>
-#include <86box/pci.h>
 #include <86box/device.h>
 #include <86box/chipset.h>
 #include <86box/hdc.h>
@@ -45,76 +41,39 @@
 #include <86box/scsi_ncr53c8xx.h>
 #include <86box/thread.h>
 #include <86box/network.h>
+#include <86box/pci.h>
 
+/* i430HX */
 int
-machine_at_acerv35n_init(const machine_t *model)
+machine_at_acerm3a_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/acerv35n/v35nd1s1.bin",
+    ret = bios_load_linear("roms/machines/acerm3a/r01-b3.bin",
                            0x000e0000, 131072, 0);
 
     if (bios_only || !ret)
         return ret;
 
     machine_at_common_init_ex(model, 2);
-    /* Yes, it's called amstrad_mega_pc_nvr_device, but it's basically the
-       standard AT NVR, just initialized to 0x00's (perhaps that should be the
-       default behavior?). */
-    device_add(&amstrad_megapc_nvr_device);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x11, PCI_CARD_NORMAL, 1, 2, 3, 4);
-    pci_register_slot(0x12, PCI_CARD_NORMAL, 2, 3, 4, 1);
-    pci_register_slot(0x13, PCI_CARD_NORMAL, 3, 4, 1, 2);
-    pci_register_slot(0x14, PCI_CARD_NORMAL, 4, 1, 2, 3);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x10, PCI_CARD_VIDEO,       4, 0, 0, 0);
     device_add(&i430hx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&fdc37c932fr_device);
+    device_add_params(&fdc37c93x_device, (void *) (FDC37XXX5 | FDC37C93X_NORMAL));
 
     device_add(&sst_flash_29ee010_device);
 
     return ret;
 }
 
-int
-machine_at_ap5vm_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/ap5vm/AP5V270.ROM",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    /* It seems there were plans for an on-board NCR 53C810 according to some clues
-       left in the manual, but were latter scrapped. The BIOS still support that
-       PCI device, though, so why not. */
-    pci_register_slot(0x06, PCI_CARD_SCSI,        1, 2, 3, 4);
-    pci_register_slot(0x09, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0A, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&i430vx_device);
-    device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c665_device);
-    device_add(&ncr53c810_onboard_pci_device);
-    device_add(&intel_flash_bxt_device);
-
-    return ret;
-}
-
 int
 machine_at_p55t2p4_init(const machine_t *model)
 {
@@ -137,155 +96,89 @@ machine_at_p55t2p4_init(const machine_t *model)
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     device_add(&i430hx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&w83877f_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&w83877_device, (void *) (W83877F | W83877_3F0));
     device_add(&intel_flash_bxt_device);
 
     return ret;
 }
 
-int
-machine_at_m7shi_init(const machine_t *model)
+void
+machine_at_p65up5_common_init(const machine_t *model, const device_t *northbridge)
 {
-    int ret;
-
-    ret = bios_load_linear("roms/machines/m7shi/m7shi2n.rom",
-                           0x000c0000, 262144, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
     machine_at_common_init(model);
 
     pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x12, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x11, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x10, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      1, 2, 3, 4);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    device_add(&i430hx_device);
-    device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c935_device);
-    device_add(&intel_flash_bxt_device);
-
-    return ret;
-}
-
-/* The Sony VAIO is an AG430HX, I'm assuming it has the same configuration bits
-   as the TC430HX, hence the #define. */
-#define machine_at_ag430hx_gpio_init machine_at_tc430hx_gpio_init
-
-/* The PB680 is a NV430VX, I'm assuming it has the same configuration bits as
-   the TC430HX, hence the #define. */
-#define machine_at_nv430vx_gpio_init machine_at_tc430hx_gpio_init
-
-static void
-machine_at_tc430hx_gpio_init(void)
-{
-    uint32_t gpio = 0xffffe1ff;
-
-    /* Register 0x0079: */
-    /* Bit 7: 0 = Clear password, 1 = Keep password. */
-    /* Bit 6: 0 = NVRAM cleared by jumper, 1 = NVRAM normal. */
-    /* Bit 5: 0 = CMOS Setup disabled, 1 = CMOS Setup enabled. */
-    /* Bit 4: External CPU clock (Switch 8). */
-    /* Bit 3: External CPU clock (Switch 7). */
-    /*        50 MHz: Switch 7 = Off, Switch 8 = Off. */
-    /*        60 MHz: Switch 7 = On, Switch 8 = Off. */
-    /*        66 MHz: Switch 7 = Off, Switch 8 = On. */
-    /* Bit 2: 0 = On-board audio absent, 1 = On-board audio present. */
-    /* Bit 1: 0 = Soft-off capable power supply present, 1 = Soft-off capable power supply absent. */
-    /* Bit 0: 0 = Reserved. */
-    /* NOTE: A bit is read as 1 if switch is off, and as 0 if switch is on. */
-    if (cpu_busspeed <= 50000000)
-        gpio |= 0xffff10ff;
-    else if ((cpu_busspeed > 50000000) && (cpu_busspeed <= 60000000))
-        gpio |= 0xffff18ff;
-    else if (cpu_busspeed > 60000000)
-        gpio |= 0xffff00ff;
-
-    machine_set_gpio_default(gpio);
+    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    device_add(northbridge);
+    device_add(&piix3_ioapic_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&w83877_device, (void *) (W83877F | W83877_3F0));
+    device_add(&sst_flash_29ee010_device);
+    device_add(&ioapic_device);
 }
 
 int
-machine_at_tc430hx_init(const machine_t *model)
+machine_at_p65up5_cp55t2d_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear_combined2("roms/machines/tc430hx/1007DH0_.BIO",
-                                     "roms/machines/tc430hx/1007DH0_.BI1",
-                                     "roms/machines/tc430hx/1007DH0_.BI2",
-                                     "roms/machines/tc430hx/1007DH0_.BI3",
-                                     "roms/machines/tc430hx/1007DH0_.RCV",
-                                     0x3a000, 128);
+    ret = bios_load_linear("roms/machines/p65up5/TD5I0201.AWD",
+                           0x000e0000, 131072, 0);
 
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init_ex(model, 2);
-    machine_at_tc430hx_gpio_init();
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x08, PCI_CARD_VIDEO,       4, 0, 0, 0);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x10, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(machine_get_vid_device(machine));
-
-    device_add(&i430hx_device);
-    device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&pc87306_device);
-    device_add(&intel_flash_bxt_ami_device);
+    machine_at_p65up5_common_init(model, &i430hx_device);
 
     return ret;
 }
 
-int
-machine_at_infinia7200_init(const machine_t *model)
-{
-    int ret;
+static const device_config_t cu430hx_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "cu430hx",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "Intel AMIBIOS - Revision 1.00.03.DK08 (Toshiba Equium 5200D)", .internal_name = "equium5200", .bios_type = BIOS_NORMAL, 
+              .files_no = 5, .local = 0, .size = 262144, .files = { "roms/machines/cu430hx/1003DK08.BIO", "roms/machines/cu430hx/1003DK08.BI1",
+                                                                    "roms/machines/cu430hx/1003DK08.BI2", "roms/machines/cu430hx/1003DK08.BI3",
+                                                                    "roms/machines/cu430hx/1003DK08.RCV", "" } },
+            { .name = "Intel AMIBIOS - Revision 1.00.06.DK0", .internal_name = "cu430hx", .bios_type = BIOS_NORMAL, 
+              .files_no = 5, .local = 0, .size = 262144, .files = { "roms/machines/cu430hx/1006DK0_.BIO", "roms/machines/cu430hx/1006DK0_.BI1",
+                                                                    "roms/machines/cu430hx/1006DK0_.BI2", "roms/machines/cu430hx/1006DK0_.BI3",
+                                                                    "roms/machines/cu430hx/1006DK0_.RCV", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
 
-    ret = bios_load_linear_combined2("roms/machines/infinia7200/1008DH08.BIO",
-                                     "roms/machines/infinia7200/1008DH08.BI1",
-                                     "roms/machines/infinia7200/1008DH08.BI2",
-                                     "roms/machines/infinia7200/1008DH08.BI3",
-                                     "roms/machines/infinia7200/1008DH08.RCV",
-                                     0x3a000, 128);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-    machine_at_tc430hx_gpio_init();
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x08, PCI_CARD_VIDEO, 4, 0, 0, 0);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL, 1, 2, 3, 4);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 3, 4, 1);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL, 3, 4, 1, 2);
-    pci_register_slot(0x10, PCI_CARD_NORMAL, 4, 1, 2, 3);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(machine_get_vid_device(machine));
-
-    device_add(&i430hx_device);
-    device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&pc87306_device);
-    device_add(&intel_flash_bxt_ami_device);
-
-    return ret;
-}
+const device_t cu430hx_device = {
+    .name          = "Intel CU430HX (Cumberland)",
+    .internal_name = "cu430hx_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = cu430hx_config
+};
 
 static void
 machine_at_cu430hx_gpio_init(void)
@@ -318,9 +211,22 @@ machine_at_cu430hx_gpio_init(void)
     machine_set_gpio_default(gpio);
 }
 
-static void
-machine_at_cu430hx_common_init(const machine_t *model)
+int
+machine_at_cu430hx_init(const machine_t *model)
 {
+    int ret = 0;
+    const char* fn[5];
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    for (int i = 0; i < 5; i++)
+        fn[i] = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), i);
+    ret = bios_load_linear_combined2(fn[0], fn[1], fn[2], fn[3], fn[4], 0x3a000, 128);
+    device_context_restore();
+
     machine_at_common_init_ex(model, 2);
     machine_at_cu430hx_gpio_init();
 
@@ -339,51 +245,182 @@ machine_at_cu430hx_common_init(const machine_t *model)
 
     device_add(&i430hx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&pc87306_device);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
     device_add(&intel_flash_bxt_ami_device);
+
+    return ret;
+}
+
+static const device_config_t tc430hx_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "tc430hx",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "Intel AMIBIOS - Revision 1.00.07.DH0", .internal_name = "tc430hx", .bios_type = BIOS_NORMAL, 
+              .files_no = 5, .local = 0, .size = 262144, .files = { "roms/machines/tc430hx/1007DH0_.BIO", "roms/machines/tc430hx/1007DH0_.BI1",
+                                                                    "roms/machines/tc430hx/1007DH0_.BI2", "roms/machines/tc430hx/1007DH0_.BI3",
+                                                                    "roms/machines/tc430hx/1007DH0_.RCV", "" } },
+            { .name = "Intel AMIBIOS - Revision 1.00.08.DH08 (Toshiba Infinia 7201)", .internal_name = "infinia7200", .bios_type = BIOS_NORMAL, 
+              .files_no = 5, .local = 0, .size = 262144, .files = { "roms/machines/tc430hx/1008DH08.BIO", "roms/machines/tc430hx/1008DH08.BI1",
+                                                                    "roms/machines/tc430hx/1008DH08.BI2", "roms/machines/tc430hx/1008DH08.BI3",
+                                                                    "roms/machines/tc430hx/1008DH08.RCV", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t tc430hx_device = {
+    .name          = "Intel TC430HX (Tucson)",
+    .internal_name = "tc430hx_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = tc430hx_config
+};
+
+static void
+machine_at_tc430hx_gpio_init(void)
+{
+    uint32_t gpio = 0xffffe1ff;
+
+    /* Register 0x0079: */
+    /* Bit 7: 0 = Clear password, 1 = Keep password. */
+    /* Bit 6: 0 = NVRAM cleared by jumper, 1 = NVRAM normal. */
+    /* Bit 5: 0 = CMOS Setup disabled, 1 = CMOS Setup enabled. */
+    /* Bit 4: External CPU clock (Switch 8). */
+    /* Bit 3: External CPU clock (Switch 7). */
+    /*        50 MHz: Switch 7 = Off, Switch 8 = Off. */
+    /*        60 MHz: Switch 7 = On, Switch 8 = Off. */
+    /*        66 MHz: Switch 7 = Off, Switch 8 = On. */
+    /* Bit 2: 0 = On-board audio absent, 1 = On-board audio present. */
+    /* Bit 1: 0 = Soft-off capable power supply present, 1 = Soft-off capable power supply absent. */
+    /* Bit 0: 0 = Reserved. */
+    /* NOTE: A bit is read as 1 if switch is off, and as 0 if switch is on. */
+    if (cpu_busspeed <= 50000000)
+        gpio |= 0xffff10ff;
+    else if ((cpu_busspeed > 50000000) && (cpu_busspeed <= 60000000))
+        gpio |= 0xffff18ff;
+    else if (cpu_busspeed > 60000000)
+        gpio |= 0xffff00ff;
+
+    machine_set_gpio_default(gpio);
 }
 
 int
-machine_at_cu430hx_init(const machine_t *model)
+machine_at_tc430hx_init(const machine_t *model)
 {
-    int ret;
+    int ret = 0;
+    const char* fn[5];
 
-    ret = bios_load_linear_combined2("roms/machines/cu430hx/1006DK0_.BIO",
-                                     "roms/machines/cu430hx/1006DK0_.BI1",
-                                     "roms/machines/cu430hx/1006DK0_.BI2",
-                                     "roms/machines/cu430hx/1006DK0_.BI3",
-                                     "roms/machines/cu430hx/1006DK0_.RCV",
-                                     0x3a000, 128);
-
-    if (bios_only || !ret)
+    /* No ROMs available */
+    if (!device_available(model->device))
         return ret;
 
-    machine_at_cu430hx_common_init(model);
+    device_context(model->device);
+    for (int i = 0; i < 5; i++)
+        fn[i] = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), i);
+    ret = bios_load_linear_combined2(fn[0], fn[1], fn[2], fn[3], fn[4], 0x3a000, 128);
+    device_context_restore();
+
+    machine_at_common_init_ex(model, 2);
+    machine_at_tc430hx_gpio_init();
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x08, PCI_CARD_VIDEO,       4, 0, 0, 0);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x10, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    device_add(&i430hx_device);
+    device_add(&piix3_device);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
+    device_add(&intel_flash_bxt_ami_device);
 
     return ret;
 }
 
 int
-machine_at_equium5200_init(const machine_t *model)
+machine_at_m7shi_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear_combined2("roms/machines/equium5200/1003DK08.BIO",
-                                     "roms/machines/equium5200/1003DK08.BI1",
-                                     "roms/machines/equium5200/1003DK08.BI2",
-                                     "roms/machines/equium5200/1003DK08.BI3",
-                                     "roms/machines/equium5200/1003DK08.RCV",
-                                     0x3a000, 128);
+    ret = bios_load_linear("roms/machines/m7shi/m7shi2n.rom",
+                           0x000c0000, 262144, 0);
 
     if (bios_only || !ret)
         return ret;
 
-    machine_at_cu430hx_common_init(model);
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x11, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x10, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    device_add(&i430hx_device);
+    device_add(&piix3_device);
+    device_add_params(&fdc37c93x_device, (void *) (FDC37XXX5 | FDC37C93X_NORMAL));
+    device_add(&intel_flash_bxt_device);
 
     return ret;
 }
 
+int
+machine_at_epc2102_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/epc2102/P5000HX.ROM",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+    device_add_params(&at_nvr_device, (void *) 0x20);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x10, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    device_add(&i430hx_device);
+    device_add(&piix3_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&i82091aa_device, (void *) I82091AA_022);
+    device_add(&radisys_config_device);
+    device_add(&sst_flash_39sf010_device);
+
+    return ret;
+}
+
+/* The Sony VAIO is an AG430HX, I'm assuming it has the same configuration bits
+   as the TC430HX, hence the #define. */
+#define machine_at_ag430hx_gpio_init machine_at_tc430hx_gpio_init
+
 int
 machine_at_pcv90_init(const machine_t *model)
 {
@@ -412,35 +449,47 @@ machine_at_pcv90_init(const machine_t *model)
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     device_add(&i430hx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&pc87306_device);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
     device_add(&intel_flash_bxt_ami_device);
 
     return ret;
 }
 
 int
-machine_at_p65up5_cp55t2d_init(const machine_t *model)
+machine_at_p55t2s_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/p65up5/TD5I0201.AWD",
+    ret = bios_load_linear("roms/machines/p55t2s/s6y08t.rom",
                            0x000e0000, 131072, 0);
 
     if (bios_only || !ret)
         return ret;
 
-    machine_at_p65up5_common_init(model, &i430hx_device);
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x13, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x14, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x11, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    device_add(&i430hx_device);
+    device_add(&piix3_device);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
+    device_add(&intel_flash_bxt_device);
 
     return ret;
 }
 
+/* i430VX */
 int
-machine_at_epc2102_init(const machine_t *model)
+machine_at_ap5vm_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/epc2102/P5000HX.ROM",
+    ret = bios_load_linear("roms/machines/ap5vm/AP5V270.ROM",
                            0x000e0000, 131072, 0);
 
     if (bios_only || !ret)
@@ -450,15 +499,20 @@ machine_at_epc2102_init(const machine_t *model)
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x10, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    /* It seems there were plans for an on-board NCR 53C810 according to some clues
+       left in the manual, but were latter scrapped. The BIOS still support that
+       PCI device, though, so why not. */
+    pci_register_slot(0x06, PCI_CARD_SCSI,        1, 2, 3, 4);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      4, 1, 2, 3);
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&i430hx_device);
+    device_add(&i430vx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&i82091aa_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add(&ncr53c810_onboard_pci_device);
     device_add(&intel_flash_bxt_device);
 
     return ret;
@@ -486,8 +540,8 @@ machine_at_p55tvp4_init(const machine_t *model)
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     device_add(&i430vx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device); // It uses the AMIKEY KBC
-    device_add(&w83877f_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&w83877_device, (void *) (W83877F | W83877_3F0));
     device_add(&intel_flash_bxt_device);
 
     return ret;
@@ -514,8 +568,8 @@ machine_at_5ivg_init(const machine_t *model)
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     device_add(&i430vx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&prime3c_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&gm82c803c_device, (void *) 0);
     device_add(&intel_flash_bxt_device);
 
     return ret;
@@ -543,8 +597,8 @@ machine_at_8500tvxa_init(const machine_t *model)
     pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 3, 2, 1);
     device_add(&i430vx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&um8669f_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&um8669f_device, (void *) 0);
     device_add(&sst_flash_29ee010_device);
 
     return ret;
@@ -574,8 +628,7 @@ machine_at_presario2240_init(const machine_t *model)
 
     device_add(&i430vx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c932qf_device);
+    device_add_params(&fdc37c93x_device, (void *) (FDC37XXX2 | FDC37C93X_NORMAL));
     device_add(&sst_flash_29ee020_device);
 
     return ret;
@@ -605,13 +658,74 @@ machine_at_presario4500_init(const machine_t *model)
 
     device_add(&i430vx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c931apm_compaq_device);
+    device_add_params(&fdc37c93x_device, (void *) (FDC37XXX1 | FDC37C93X_APM));
     device_add(&sst_flash_29ee020_device);
 
     return ret;
 }
 
+int
+machine_at_dellhannibalp_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear_combined2("roms/machines/dellhannibalp/1003DY0J.BIO",
+                                     "roms/machines/dellhannibalp/1003DY0J.BI1",
+                                     "roms/machines/dellhannibalp/1003DY0J.BI2",
+                                     "roms/machines/dellhannibalp/1003DY0J.BI3",
+                                     "roms/machines/dellhannibalp/1003DY0J.RCV",
+                                     0x3a000, 128);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x08, PCI_CARD_VIDEO,       4, 0, 0, 0);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x10, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 4);
+    device_add(&i430vx_device);
+    device_add(&piix3_device);
+    device_add_params(&fdc37c93x_device, (void *) (FDC37XXX2 | FDC37C93X_FR));
+    device_add(&intel_flash_bxt_ami_device);
+
+    return ret;
+}
+
+int
+machine_at_p5vxb_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/p5vxb/P5VXB10.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x05, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x06, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x08, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 4);
+    device_add(&i430vx_device);
+    device_add(&piix3_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&w83877_device, (void *) (W83877F | W83877_3F0));
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
+
 int
 machine_at_p55va_init(const machine_t *model)
 {
@@ -623,7 +737,7 @@ machine_at_p55va_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
@@ -634,13 +748,49 @@ machine_at_p55va_init(const machine_t *model)
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     device_add(&i430vx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c932fr_device);
+    device_add_params(&fdc37c93x_device, (void *) (FDC37XXX2 | FDC37C93X_FR));
     device_add(&intel_flash_bxt_device);
 
     return ret;
 }
 
+int
+machine_at_gw2kte_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear_combined2("roms/machines/gw2kte/1008CY1T.BIO",
+                                     "roms/machines/gw2kte/1008CY1T.BI1",
+                                     "roms/machines/gw2kte/1008CY1T.BI2",
+                                     "roms/machines/gw2kte/1008CY1T.BI3",
+                                     "roms/machines/gw2kte/1008CY1T.RCV",
+                                     0x3a000, 128);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x08, PCI_CARD_VIDEO,       4, 0, 0, 0);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x10, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 4);
+
+    if ((sound_card_current[0] == SOUND_INTERNAL) && machine_get_snd_device(machine)->available())
+        machine_snd = device_add(machine_get_snd_device(machine));
+
+    device_add(&i430vx_device);
+    device_add(&piix3_device);
+    device_add_params(&fdc37c93x_device, (void *) (FDC37XXX2 | FDC37C93X_FR));
+    device_add(&intel_flash_bxt_ami_device);
+
+    return ret;
+}
+
 int
 machine_at_brio80xx_init(const machine_t *model)
 {
@@ -652,7 +802,7 @@ machine_at_brio80xx_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
@@ -663,13 +813,85 @@ machine_at_brio80xx_init(const machine_t *model)
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
     device_add(&i430vx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c935_device);
+    device_add_params(&fdc37c93x_device, (void *) (FDC37XXX5 | FDC37C93X_NORMAL | FDC37XXXX_370));
     device_add(&sst_flash_29ee020_device);
 
     return ret;
 }
 
+static const device_config_t lgibmx52_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "lgibmx52",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "PhoenixBIOS 4.05 - Revision 08/21/97", .internal_name = "lgibmx52_082197", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/lgibmx52/BIOS.ROM", "" } },
+            { .name = "PhoenixBIOS 4.05 - Revision 03/26/99", .internal_name = "lgibmx52", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/lgibmx52/MS5136 LG IBM OEM.ROM", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t lgibmx52_device = {
+    .name          = "LG IBM Multinet x52 (MSI MS-5136)",
+    .internal_name = "lgibmx52_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = lgibmx52_config
+};
+
+int
+machine_at_lgibmx52_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+    device_context_restore();
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x10, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    device_add(&i430vx_device);
+    device_add(&piix3_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&w83877_device, (void *) (W83877F | W83877_3F0));
+    device_add(&winbond_flash_w29c010_device);
+
+    return ret;
+}
+
+/* The PB680 is a NV430VX, I'm assuming it has the same configuration bits as
+   the TC430HX, hence the #define. */
+#define machine_at_nv430vx_gpio_init machine_at_tc430hx_gpio_init
+
 int
 machine_at_pb680_init(const machine_t *model)
 {
@@ -701,8 +923,7 @@ machine_at_pb680_init(const machine_t *model)
 
     device_add(&i430vx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&pc87306_device);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
     device_add(&intel_flash_bxt_ami_device);
 
     return ret;
@@ -719,7 +940,7 @@ machine_at_pb810_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
@@ -733,8 +954,7 @@ machine_at_pb810_init(const machine_t *model)
 
     device_add(&i430vx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_device);
-    device_add(&fdc37c935_device);
+    device_add_params(&fdc37c93x_device, (void *) (FDC37XXX5 | FDC37C93X_NORMAL | FDC37XXXX_370));
     device_add(&intel_flash_bxt_device);
 
     return ret;
@@ -762,8 +982,8 @@ machine_at_mb520n_init(const machine_t *model)
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     device_add(&i430vx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c669_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&fdc37c669_device, (void *) 0);
     device_add(&intel_flash_bxt_device);
 
     return ret;
@@ -791,13 +1011,14 @@ machine_at_i430vx_init(const machine_t *model)
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     device_add(&i430vx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&um8669f_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&um8669f_device, (void *) 0);
     device_add(&intel_flash_bxt_device);
 
     return ret;
 }
 
+/* i430TX */
 int
 machine_at_nupro592_init(const machine_t *model)
 {
@@ -813,17 +1034,20 @@ machine_at_nupro592_init(const machine_t *model)
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0B, PCI_CARD_VIDEO,       3, 4, 1, 2); /* C&T B69000 */
+    pci_register_slot(0x0C, PCI_CARD_NETWORK,     4, 1, 2, 3); /* Intel 82559 */
     pci_register_slot(0x11, PCI_CARD_NORMAL,      1, 2, 3, 4);
     pci_register_slot(0x12, PCI_CARD_NORMAL,      4, 1, 2, 3);
     pci_register_slot(0x13, PCI_CARD_NORMAL,      3, 4, 1, 2);
     pci_register_slot(0x14, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      3, 4, 1, 2); /*Strongly suspect these are on-board slots*/
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      4, 1, 2, 3);
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 4); /* PIIX4 */
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
     device_add(&i430tx_device);
     device_add(&piix4_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&w83977ef_device);
+    device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
     device_add(&intel_flash_bxt_device);
     spd_register(SPD_TYPE_SDRAM, 0x3, 128);
     device_add(&w83781d_device);    /* fans: CPU1, unused, unused; temperatures: System, CPU1, unused */
@@ -859,8 +1083,8 @@ machine_at_tx97_init(const machine_t *model)
     pci_register_slot(0x08, PCI_CARD_NORMAL,      1, 2, 3, 4);
     device_add(&i430tx_device);
     device_add(&piix4_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&w83877tf_acorp_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&w83877_device, (void *) (W83877TF | W83877_3F0));
     device_add(&intel_flash_bxt_device);
     spd_register(SPD_TYPE_SDRAM, 0x3, 128);
     device_add(&w83781d_device);    /* fans: Chassis, CPU, Power; temperatures: MB, unused, CPU */
@@ -874,27 +1098,60 @@ machine_at_tx97_init(const machine_t *model)
     return ret;
 }
 
-#if defined(DEV_BRANCH) && defined(USE_AN430TX)
+void
+machine_at_optiplex_21152_init(void)
+{
+    uint8_t bus_index = pci_bridge_get_bus_index(device_add(&dec21152_device));
+    pci_register_bus_slot(bus_index, 0x09, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_bus_slot(bus_index, 0x0a, PCI_CARD_NORMAL, 4, 2, 1, 3);
+    pci_register_bus_slot(bus_index, 0x0b, PCI_CARD_NORMAL, 1, 3, 4, 2);
+}
+
 int
-machine_at_an430tx_init(const machine_t *model)
+machine_at_optiplexgn_init(const machine_t *model)
 {
     int ret;
 
-#    if 1
-    ret = bios_load_linear_combined2("roms/machines/an430tx/P10-0095.BIO",
-                                     "roms/machines/an430tx/P10-0095.BI1",
-                                     "roms/machines/an430tx/P10-0095.BI2",
-                                     "roms/machines/an430tx/P10-0095.BI3",
-                                     "roms/machines/an430tx/P10-0095.RCV",
-                                     0x3a000, 160);
-#    else
-    ret = bios_load_linear_combined2("roms/machines/an430tx/P06-0062.BIO",
-                                     "roms/machines/an430tx/P06-0062.BI1",
-                                     "roms/machines/an430tx/P06-0062.BI2",
-                                     "roms/machines/an430tx/P06-0062.BI3",
-                                     "roms/machines/an430tx/P10-0095.RCV",
-                                     0x3a000, 160);
-#    endif
+    ret = bios_load_linear("roms/machines/optiplexgn/DELL.ROM",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 2, 1);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      2, 1, 3, 4);
+    pci_register_slot(0x10, PCI_CARD_VIDEO,       4, 0, 0, 0); /* Trio64V2/GX, temporarily Trio64V2/DX is given */
+    pci_register_slot(0x11, PCI_CARD_NETWORK,     4, 0, 0, 0); /* 3C905, not yet emulated */
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 4);
+    pci_register_slot(0x0F, PCI_CARD_BRIDGE,      0, 0, 0, 0);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    if ((sound_card_current[0] == SOUND_INTERNAL) && machine_get_snd_device(machine)->available())
+        machine_snd = device_add(machine_get_snd_device(machine));
+
+    device_add(&i430tx_device);
+    device_add(&piix4_device);
+    machine_at_optiplex_21152_init();
+    device_add_params(&pc87307_device, (void *) (PCX730X_PHOENIX_42 | PCX7307_PC87307));
+    device_add(&intel_flash_bxt_device);
+    spd_register(SPD_TYPE_SDRAM, 0x3, 128);
+
+    return ret;
+}
+
+int
+machine_at_tomahawk_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/tomahawk/0AAGT046.ROM",
+                           0x000c0000, 262144, 0);
 
     if (bios_only || !ret)
         return ret;
@@ -903,22 +1160,31 @@ machine_at_an430tx_init(const machine_t *model)
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4); /* PIIX4 */
-    // pci_register_slot(0x08, PCI_CARD_VIDEO,       4, 0, 0, 0);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x10, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x0F, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4); /* PIIX4 */
+    pci_register_slot(0x0D, PCI_CARD_VIDEO,       3, 0, 0, 0);
+    pci_register_slot(0x0E, PCI_CARD_NETWORK,     4, 0, 0, 0);
+    pci_register_slot(0x06, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x07, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x08, PCI_CARD_NORMAL,      3, 4, 1, 2);
     device_add(&i430tx_device);
     device_add(&piix4_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&pc87307_both_device);
-    device_add(&intel_flash_bxt_ami_device);
+    device_add_params(&fdc37c67x_device, (void *) (FDC37XXX2 | FDC37XXXX_370));
+    device_add(&amd_flash_29f020a_device);
     spd_register(SPD_TYPE_SDRAM, 0x3, 128);
+    device_add(&lm78_device);      /* fans: Thermal, CPU, Chassis; temperature: unused */
+    device_add(&lm75_1_4a_device); /* temperature: CPU */
+
+    if ((gfxcard[0] == VID_INTERNAL) && machine_get_vid_device(machine))
+        device_add(machine_get_vid_device(machine));
+
+    if ((sound_card_current[0] == SOUND_INTERNAL) && machine_get_snd_device(machine))
+        device_add(machine_get_snd_device(machine));
+
+    if ((net_cards_conf[0].device_num == NET_INTERNAL) && machine_get_net_device(machine))
+        device_add(machine_get_net_device(machine));
 
     return ret;
 }
-#endif
 
 int
 machine_at_ym430tx_init(const machine_t *model)
@@ -944,14 +1210,111 @@ machine_at_ym430tx_init(const machine_t *model)
     pci_register_slot(0x08, PCI_CARD_NORMAL,      1, 2, 3, 4);
     device_add(&i430tx_device);
     device_add(&piix4_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&w83977tf_device);
+    device_add_params(&w83977_device, (void *) (W83977TF | W83977_AMI | W83977_NO_NVR));
     device_add(&intel_flash_bxt_device);
     spd_register(SPD_TYPE_SDRAM, 0x3, 128);
 
     return ret;
 }
 
+int
+machine_at_thunderbolt_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/thunderbolt/tbolt-01.rom",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 1, 2, 3); /* PIIX4 */
+    pci_register_slot(0x11, PCI_CARD_NORMAL,      0, 1, 2, 3);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,      1, 2, 3, 0);
+    pci_register_slot(0x13, PCI_CARD_NORMAL,      2, 3, 0, 1);
+    pci_register_slot(0x14, PCI_CARD_NORMAL,      3, 0, 1, 2);
+    device_add(&i430tx_device);
+    device_add(&piix4_device);
+    device_add_params(&fdc37c93x_device, (void *) (FDC37XXX5 | FDC37C93X_NORMAL | FDC37C93X_NO_NVR));
+    device_add(&intel_flash_bxt_device);
+    spd_register(SPD_TYPE_SDRAM, 0x3, 128);
+
+    return ret;
+}
+
+int
+machine_at_ma23c_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ma23c/BIOS.ROM",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x14, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x0B, PCI_CARD_VIDEO,       3, 4, 1, 2);
+    device_add(&i430tx_device);
+    device_add(&piix4_device);
+    device_add(&nec_mate_unk_device);
+    device_add_params(&fdc37c67x_device, (void *) (FDC37XXX2 | FDC37XXXX_370));
+    device_add(&intel_flash_bxt_device);
+    spd_register(SPD_TYPE_SDRAM, 0x7, 256);
+
+    return ret;
+}
+
+int
+machine_at_an430tx_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear_combined2("roms/machines/an430tx/ANP0911A.BIO",
+                                     "roms/machines/an430tx/ANP0911A.BI1",
+                                     "roms/machines/an430tx/ANP0911A.BI2",
+                                     "roms/machines/an430tx/ANP0911A.BI3",
+                                     "roms/machines/an430tx/ANP0911A.RCV",
+                                     0x3a000, 160);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 4); /* PIIX4 */
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x10, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x08, PCI_CARD_VIDEO,       4, 0, 0, 0);
+    device_add(&i430tx_device);
+    device_add(&piix4_device);
+#ifdef FOLLOW_THE_SPECIFICATION
+    device_add_params(&pc87307_device, (void *) (PCX730X_PHOENIX_42I | PCX7307_PC97307));
+#else
+    /* The technical specification says Phoenix, a real machnine HWINFO dump says AMI '5'. */
+    device_add_params(&pc87307_device, (void *) (PCX730X_AMI | PCX7307_PC97307));
+#endif
+    device_add(&intel_flash_bxt_ami_device);
+    spd_register(SPD_TYPE_SDRAM, 0x3, 128);
+
+    return ret;
+}
+
 int
 machine_at_mb540n_init(const machine_t *model)
 {
@@ -974,8 +1337,8 @@ machine_at_mb540n_init(const machine_t *model)
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4); /* PIIX4 */
     device_add(&i430tx_device);
     device_add(&piix4_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&um8669f_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&um8669f_device, (void *) 0);
     device_add(&sst_flash_29ee010_device);
     spd_register(SPD_TYPE_SDRAM, 0x3, 128);
 
@@ -1005,8 +1368,8 @@ machine_at_56a5_init(const machine_t *model)
     pci_register_slot(0x10, PCI_CARD_NORMAL,      1, 2, 3, 4);
     device_add(&i430tx_device);
     device_add(&piix4_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&w83877f_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&w83877_device, (void *) (W83877F | W83877_3F0));
     device_add(&sst_flash_29ee010_device);
     spd_register(SPD_TYPE_SDRAM, 0x3, 128);
 
@@ -1035,8 +1398,8 @@ machine_at_p5mms98_init(const machine_t *model)
     pci_register_slot(0x14, PCI_CARD_NORMAL,      4, 1, 2, 3);
     device_add(&i430tx_device);
     device_add(&piix4_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&w83977tf_device);
+    /* This actually has the Winbond W83967AF, for which I can not find any datasheet at all. */
+    device_add_params(&w83977_device, (void *) (W83977F | W83977_AMI | W83977_NO_NVR));
     device_add(&intel_flash_bxt_device);
     spd_register(SPD_TYPE_SDRAM, 0x3, 128);
     device_add(&lm78_device);      /* fans: Thermal, CPU, Chassis; temperature: unused */
@@ -1067,7 +1430,7 @@ machine_at_richmond_init(const machine_t *model)
     pci_register_slot(0x14, PCI_CARD_NORMAL,      4, 1, 2, 3);
     device_add(&i430tx_device);
     device_add(&piix4_device);
-    device_add(&keyboard_ps2_ami_pci_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
     device_add(&it8671f_device);
     device_add(&intel_flash_bxt_device);
     spd_register(SPD_TYPE_SDRAM, 0x3, 128);
@@ -1077,48 +1440,7 @@ machine_at_richmond_init(const machine_t *model)
     return ret;
 }
 
-int
-machine_at_tomahawk_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/tomahawk/0AAGT046.ROM",
-                           0x000c0000, 262144, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0F, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4); /* PIIX4 */
-    pci_register_slot(0x0D, PCI_CARD_VIDEO,       3, 0, 0, 0);
-    pci_register_slot(0x0E, PCI_CARD_NETWORK,     4, 0, 0, 0);
-    pci_register_slot(0x06, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x07, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x08, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    device_add(&i430tx_device);
-    device_add(&piix4_device);
-    device_add(&keyboard_ps2_intel_ami_pci_device);
-    device_add(&fdc37c67x_device);
-    device_add(&amd_flash_29f020a_device);
-    spd_register(SPD_TYPE_SDRAM, 0x3, 128);
-    device_add(&lm78_device);      /* fans: Thermal, CPU, Chassis; temperature: unused */
-    device_add(&lm75_1_4a_device); /* temperature: CPU */
-
-    if ((gfxcard[0] == VID_INTERNAL) && machine_get_vid_device(machine))
-        device_add(machine_get_vid_device(machine));
-
-    if ((sound_card_current[0] == SOUND_INTERNAL) && machine_get_snd_device(machine))
-        device_add(machine_get_snd_device(machine));
-
-    if ((net_cards_conf[0].device_num == NET_INTERNAL) && machine_get_net_device(machine))
-        device_add(machine_get_net_device(machine));
-
-    return ret;
-}
-
+/* VIA VPX */
 int
 machine_at_ficva502_init(const machine_t *model)
 {
@@ -1141,14 +1463,14 @@ machine_at_ficva502_init(const machine_t *model)
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
     device_add(&via_vpx_device);
     device_add(&via_vt82c586b_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&fdc37c669_370_device);
+    device_add_params(&fdc37c669_device, (void *) FDC37C6XX_370);
     device_add(&sst_flash_29ee010_device);
     spd_register(SPD_TYPE_SDRAM, 0x3, 256);
 
     return ret;
 }
 
+/* VIA VP3 */
 int
 machine_at_ficpa2012_init(const machine_t *model)
 {
@@ -1173,8 +1495,7 @@ machine_at_ficpa2012_init(const machine_t *model)
 
     device_add(&via_vp3_device);
     device_add(&via_vt82c586b_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&w83877f_device);
+    device_add_params(&w83877_device, (void *) (W83877F | W83877_3F0));
     device_add(&sst_flash_29ee010_device);
     spd_register(SPD_TYPE_SDRAM, 0x7, 512);
 
@@ -1182,11 +1503,43 @@ machine_at_ficpa2012_init(const machine_t *model)
 }
 
 int
-machine_at_r534f_init(const machine_t *model)
+machine_at_via809ds_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/r534f/r534f008.bin",
+    ret = bios_load_linear("roms/machines/via809ds/v30422sg.rom",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x08, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3); /* assumed */
+    pci_register_slot(0x01, PCI_CARD_AGPBRIDGE,   1, 2, 3, 4);
+
+    device_add(&via_vp3_device);
+    device_add(&via_vt82c586b_device);
+    device_add_params(&fdc37c669_device, (void *) 0);
+    device_add(&intel_flash_bxt_device);
+    spd_register(SPD_TYPE_SDRAM, 0x7, 512);
+
+    return ret;
+}
+
+/* SiS 5571 */
+int
+machine_at_cb52xsi_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/cb52xsi/CD5205S.ROM",
                            0x000e0000, 131072, 0);
 
     if (bios_only || !ret)
@@ -1197,14 +1550,13 @@ machine_at_r534f_init(const machine_t *model)
     pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
     pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      2, 3, 4, 1);
     pci_register_slot(0x0F, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x11, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x07, PCI_CARD_NORMAL,      4, 1, 2, 3);
 
     device_add(&sis_5571_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&w83877f_device);
+    device_add_params(&fdc37c669_device, (void *) FDC37C6XX_370);
     device_add(&sst_flash_29ee010_device);
 
     return ret;
@@ -1232,19 +1584,87 @@ machine_at_ms5146_init(const machine_t *model)
     pci_register_slot(0x10, PCI_CARD_NORMAL,      4, 1, 2, 3);
 
     device_add(&sis_5571_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&w83877f_device);
+    device_add_params(&w83877_device, (void *) (W83877F | W83877_3F0));
     device_add(&sst_flash_29ee010_device);
 
     return ret;
 }
 
+static const device_config_t r534f_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "r534f_1998",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "Award Modular BIOS v4.51PG - Revision 06/12/1998", .internal_name = "r534f_1998", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/r534f/r534f008-1998.bin", "" } },
+            { .name = "Award Modular BIOS v4.51PG - Revision 03/13/2000 (by Unicore Software)", .internal_name = "r534f", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/r534f/r534f008.bin", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t r534f_device = {
+    .name          = "Rise R534F",
+    .internal_name = "r534f_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = r534f_config
+};
+
 int
-machine_at_cb52xsi_init(const machine_t *model)
+machine_at_r534f_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+    device_context_restore();
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x11, PCI_CARD_NORMAL,      4, 1, 2, 3);
+
+    device_add(&sis_5571_device);
+    device_add_params(&w83877_device, (void *) (W83877F | W83877_3F0));
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
+
+/* SiS 5581 */
+int
+machine_at_sp97xv_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/cb52xsi/CD5205S.ROM",
+    ret = bios_load_linear("roms/machines/sp97xv/0109XVJ2.BIN",
                            0x000e0000, 131072, 0);
 
     if (bios_only || !ret)
@@ -1254,26 +1674,25 @@ machine_at_cb52xsi_init(const machine_t *model)
 
     pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
     pci_register_slot(0x0B, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x07, PCI_CARD_NORMAL,      4, 1, 2, 3);
-
-    device_add(&sis_5571_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c669_370_device);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x13, PCI_CARD_VIDEO,       1, 2, 3, 4);    /* On-chip SiS graphics, absent here. */
+    device_add(&sis_5581_device);
+    device_add_params(&w83877_device, (void *) (W83877F | W83877_3F0));
     device_add(&sst_flash_29ee010_device);
 
     return ret;
 }
 
 int
-machine_at_m560_init(const machine_t *model)
+machine_at_sq578_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/m560/5600410s.ami",
+    ret = bios_load_linear("roms/machines/sq578/578b03.rom",
                            0x000e0000, 131072, 0);
 
     if (bios_only || !ret)
@@ -1281,20 +1700,113 @@ machine_at_m560_init(const machine_t *model)
 
     machine_at_common_init_ex(model, 2);
 
+    pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    device_add(&sis_5581_device);
+    device_add_params(&w83877_device, (void *) (W83877TF | W83877_3F0));
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
+
+/* SiS 5591 */
+int
+machine_at_ms5172_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ms5172/A572MS15.ROM",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x02, PCI_CARD_AGPBRIDGE,   0, 0, 0, 0);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    device_add(&sis_5591_1997_device);
+    device_add_params(&w83877_device, (void *) (W83877TF | W83877_3F0));
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
+
+/* ALi ALADDiN IV+ */
+static const device_config_t m5ata_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "m5ata",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "Award Modular BIOS v4.51PG - Revision 12/23/97", .internal_name = "m5ata", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/m5ata/ATA1223.BIN", "" } },
+            { .name = "Award Modular BIOS v4.51PG - Revision 05/27/98", .internal_name = "m5ata_0527b", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/m5ata/ATA0527B.BIN", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t m5ata_device = {
+    .name          = "Biostar M5ATA",
+    .internal_name = "m5ata_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = m5ata_config
+};
+
+int
+machine_at_m5ata_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+    device_context_restore();
+
+    machine_at_common_init_ex(model, 2);
+
     pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE,     0, 0, 0, 0);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE,     1, 2, 3, 4);
     pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE,     1, 2, 3, 4);
     pci_register_slot(0x0B, PCI_CARD_SOUTHBRIDGE_IDE, 1, 2, 3, 4);
-    pci_register_slot(0x0C, PCI_CARD_SOUTHBRIDGE_PMU, 1, 2, 3, 4);
-    pci_register_slot(0x0F, PCI_CARD_SOUTHBRIDGE_USB, 1, 2, 3, 4);
     pci_register_slot(0x03, PCI_CARD_NORMAL,          1, 2, 3, 4);
     pci_register_slot(0x04, PCI_CARD_NORMAL,          2, 3, 4, 1);
     pci_register_slot(0x05, PCI_CARD_NORMAL,          3, 4, 1, 2);
     pci_register_slot(0x06, PCI_CARD_NORMAL,          4, 1, 2, 3);
+
     device_add(&ali1531_device);
     device_add(&ali1543_device); /* -5 */
-    device_add(&sst_flash_29ee010_device);
-    spd_register(SPD_TYPE_SDRAM, 0x3, 256);
+    spd_register(SPD_TYPE_SDRAM, 0x3, 64);
 
     return ret;
 }
@@ -1333,12 +1845,12 @@ machine_at_ms5164_init(const machine_t *model)
 }
 
 int
-machine_at_thunderbolt_init(const machine_t *model)
+machine_at_m560_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/thunderbolt/tbolt-01.rom",
-                           0x000c0000, 262144, 0);
+    ret = bios_load_linear("roms/machines/m560/5600410s.ami",
+                           0x000e0000, 131072, 0);
 
     if (bios_only || !ret)
         return ret;
@@ -1346,18 +1858,19 @@ machine_at_thunderbolt_init(const machine_t *model)
     machine_at_common_init_ex(model, 2);
 
     pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-	pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 1, 2, 3); /* PIIX4 */
-    pci_register_slot(0x11, PCI_CARD_NORMAL,      0, 1, 2, 3);
-    pci_register_slot(0x12, PCI_CARD_NORMAL,      1, 2, 3, 0);
-    pci_register_slot(0x13, PCI_CARD_NORMAL,      2, 3, 0, 1);
-    pci_register_slot(0x14, PCI_CARD_NORMAL,      3, 0, 1, 2);
-    device_add(&i430tx_device);
-    device_add(&piix4_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c935_device);
-    device_add(&intel_flash_bxt_device);
-    spd_register(SPD_TYPE_SDRAM, 0x3, 128);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE,     0, 0, 0, 0);
+    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE,     1, 2, 3, 4);
+    pci_register_slot(0x0B, PCI_CARD_SOUTHBRIDGE_IDE, 1, 2, 3, 4);
+    pci_register_slot(0x0C, PCI_CARD_SOUTHBRIDGE_PMU, 1, 2, 3, 4);
+    pci_register_slot(0x0F, PCI_CARD_SOUTHBRIDGE_USB, 1, 2, 3, 4);
+    pci_register_slot(0x03, PCI_CARD_NORMAL,          1, 2, 3, 4);
+    pci_register_slot(0x04, PCI_CARD_NORMAL,          2, 3, 4, 1);
+    pci_register_slot(0x05, PCI_CARD_NORMAL,          3, 4, 1, 2);
+    pci_register_slot(0x06, PCI_CARD_NORMAL,          4, 1, 2, 3);
+    device_add(&ali1531_device);
+    device_add(&ali1543_device); /* -5 */
+    device_add(&sst_flash_29ee010_device);
+    spd_register(SPD_TYPE_SDRAM, 0x3, 256);
 
     return ret;
 }
diff --git a/src/machine/m_at_socket7_3v.c b/src/machine/m_at_socket7_3v.c
index 2e642082d..f289b2275 100644
--- a/src/machine/m_at_socket7_3v.c
+++ b/src/machine/m_at_socket7_3v.c
@@ -8,11 +8,9 @@
  *
  *          Implementation of Socket 7 (Single Voltage) machines.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2016-2020 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -43,6 +41,175 @@
 #include <86box/plat_unused.h>
 #include <86box/sound.h>
 
+/* i430FX */
+static const device_config_t p54tp4xe_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "p54tp4xe",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "Award Modular BIOS v4.51PG - Revision 0302", .internal_name = "p54tp4xe", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/p54tp4xe/t15i0302.awd", "" } },
+            { .name = "MR BIOS V3.30", .internal_name = "p54tp4xe_mr", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/p54tp4xe/TRITON.BIO", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t p54tp4xe_device = {
+    .name          = "ASUS P/I-P55TP4XE",
+    .internal_name = "p54tp4xe_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = p54tp4xe_config
+};
+
+int
+machine_at_p54tp4xe_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+    device_context_restore();
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add(&i430fx_device);
+    device_add(&piix_device);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add(&intel_flash_bxt_device);
+
+    return ret;
+}
+
+int
+machine_at_exp8551_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/exp8551/AMI20.BIO",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x13, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x14, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x12, PCI_CARD_NORMAL, 3, 4, 1, 2);
+    pci_register_slot(0x11, PCI_CARD_NORMAL, 4, 1, 2, 3);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add(&i430fx_device);
+    device_add(&piix_device);
+    device_add_params(&w837x7_device, (void *) (W83787F | W837X7_KEY_89));
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
+
+int
+machine_at_vectra54_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/vectra54/GT0724.22",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0F, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0D, PCI_CARD_VIDEO,       0, 0, 0, 0);
+    pci_register_slot(0x06, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x07, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x08, PCI_CARD_NORMAL,      3, 4, 1, 2);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&s3_phoenix_trio64_onboard_pci_device);
+
+    device_add(&i430fx_device);
+    device_add(&piix_device);
+    device_add_params(&fdc37c93x_device, (void *) (FDC37XXX2 | FDC37C93X_NORMAL));
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
+
+static const device_config_t thor_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "thor",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "Intel AMIBIOS - Revision 1.00.03.CN0T (Gateway 2000)", .internal_name = "gw2katx", .bios_type = BIOS_NORMAL, 
+              .files_no = 2, .local = 0, .size = 131072, .files = { "roms/machines/thor/1003CN0T.BIO", "roms/machines/thor/1003CN0T.BI1", "" } },
+            { .name = "Intel AMIBIOS - Revision 1.00.06.CN0", .internal_name = "thor", .bios_type = BIOS_NORMAL, 
+              .files_no = 2, .local = 0, .size = 131072, .files = { "roms/machines/thor/1006cn0_.bio", "roms/machines/thor/1006cn0_.bi1", "" } },
+            { .name = "MR BIOS V3.28", .internal_name = "mrthor", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/thor/mr_atx.bio", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t thor_device = {
+    .name          = "Intel Advanced/ATX (Thor)",
+    .internal_name = "thor_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = thor_config
+};
+
 static void
 machine_at_thor_gpio_init(void)
 {
@@ -88,9 +255,29 @@ machine_at_thor_gpio_init(void)
     machine_set_gpio_default(gpio);
 }
 
-static void
-machine_at_thor_common_init(const machine_t *model, int has_video)
+int
+machine_at_thor_init(const machine_t *model)
 {
+    int ret = 0;
+    const char* fn;
+    const char* fn2;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    int is_mr     = !strcmp(device_get_config_bios("bios"), "mrthor");
+    int has_video = !strcmp(device_get_config_bios("bios"), "thor");
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    if (is_mr)
+        ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+    else {
+        fn2 = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 1);
+        ret = bios_load_linear_combined(fn, fn2, 0x20000, 128);
+    }
+    device_context_restore();
+
     machine_at_common_init_ex(model, 2);
     machine_at_thor_gpio_init();
 
@@ -106,139 +293,10 @@ machine_at_thor_common_init(const machine_t *model, int has_video)
     if (has_video && (gfxcard[0] == VID_INTERNAL))
         device_add(machine_get_vid_device(machine));
 
-    device_add(&keyboard_ps2_intel_ami_pci_device);
     device_add(&i430fx_device);
     device_add(&piix_device);
-    device_add(&pc87306_device);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
     device_add(&intel_flash_bxt_ami_device);
-}
-
-static void
-machine_at_p54tp4xe_common_init(const machine_t *model)
-{
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x09, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&i430fx_device);
-    device_add(&piix_device);
-    device_add(&fdc37c665_device);
-    device_add(&intel_flash_bxt_device);
-}
-
-int
-machine_at_p54tp4xe_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/p54tp4xe/t15i0302.awd",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_p54tp4xe_common_init(model);
-
-    return ret;
-}
-
-int
-machine_at_p54tp4xe_mr_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/p54tp4xe/TRITON.BIO",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_p54tp4xe_common_init(model);
-
-    return ret;
-}
-
-int
-machine_at_exp8551_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/exp8551/AMI20.BIO",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x13, PCI_CARD_NORMAL, 2, 3, 4, 1);
-    pci_register_slot(0x14, PCI_CARD_NORMAL, 1, 2, 3, 4);
-    pci_register_slot(0x12, PCI_CARD_NORMAL, 3, 4, 1, 2);
-    pci_register_slot(0x11, PCI_CARD_NORMAL, 4, 1, 2, 3);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&i430fx_device);
-    device_add(&piix_device);
-    device_add(&w83787f_device);
-    device_add(&sst_flash_29ee010_device);
-
-    return ret;
-}
-
-int
-machine_at_gw2katx_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear_combined("roms/machines/gw2katx/1003CN0T.BIO",
-                                    "roms/machines/gw2katx/1003CN0T.BI1",
-                                    0x20000, 128);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_thor_common_init(model, 0);
-
-    return ret;
-}
-
-int
-machine_at_thor_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear_combined("roms/machines/thor/1006cn0_.bio",
-                                    "roms/machines/thor/1006cn0_.bi1",
-                                    0x20000, 128);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_thor_common_init(model, 1);
-
-    return ret;
-}
-
-int
-machine_at_mrthor_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/mrthor/mr_atx.bio",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_thor_common_init(model, 0);
 
     return ret;
 }
@@ -359,10 +417,9 @@ machine_at_endeavor_init(const machine_t *model)
     if (sound_card_current[0] == SOUND_INTERNAL)
         machine_snd = device_add(machine_get_snd_device(machine));
 
-    device_add(&keyboard_ps2_intel_ami_pci_device);
     device_add(&i430fx_device);
     device_add(&piix_device);
-    device_add(&pc87306_device);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
     device_add(&intel_flash_bxt_ami_device);
 
     return ret;
@@ -390,8 +447,8 @@ machine_at_ms5119_init(const machine_t *model)
 
     device_add(&i430fx_device);
     device_add(&piix_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&w83787f_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&w837x7_device, (void *) (W83787F | W837X7_KEY_89));
     device_add(&sst_flash_29ee010_device);
 
     return ret;
@@ -455,10 +512,9 @@ machine_at_pb640_init(const machine_t *model)
     device_add(&piix_rev02_device);
 
     if (gfxcard[0] == VID_INTERNAL)
-        device_add(&gd5440_onboard_pci_device);
+        device_add(machine_get_vid_device(machine));
 
-    device_add(&keyboard_ps2_intel_ami_pci_device);
-    device_add(&pc87306_device);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
     device_add(&intel_flash_bxt_ami_device);
 
     return ret;
@@ -484,10 +540,10 @@ machine_at_mb500n_init(const machine_t *model)
     pci_register_slot(0x12, PCI_CARD_NORMAL, 3, 4, 1, 2);
     pci_register_slot(0x11, PCI_CARD_NORMAL, 4, 1, 2, 3);
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&keyboard_ps2_pci_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
     device_add(&i430fx_device);
     device_add(&piix_no_mirq_device);
-    device_add(&fdc37c665_device);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
     device_add(&intel_flash_bxt_device);
 
     return ret;
@@ -516,39 +572,38 @@ machine_at_fmb_init(const machine_t *model)
 
     device_add(&i430fx_device);
     device_add(&piix_no_mirq_device);
-    device_add(&keyboard_at_ami_device);
-    device_add(&w83787f_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&w837x7_device, (void *) (W83787F | W837X7_KEY_89));
     device_add(&intel_flash_bxt_device);
 
     return ret;
 }
 
 int
-machine_at_acerm3a_init(const machine_t *model)
+machine_at_acerv35n_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/acerm3a/r01-b3.bin",
+    ret = bios_load_linear("roms/machines/acerv35n/v35nd1s1.bin",
                            0x000e0000, 131072, 0);
 
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x10, PCI_CARD_VIDEO,       4, 0, 0, 0);
+    pci_register_slot(0x11, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x12, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x13, PCI_CARD_NORMAL, 3, 4, 1, 2);
+    pci_register_slot(0x14, PCI_CARD_NORMAL, 4, 1, 2, 3);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL, 1, 2, 3, 4);
     device_add(&i430hx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&fdc37c935_device);
-
+    /* The chip is not marked FR but the BIOS accesses register 06h of GPIO. */
+    device_add_params(&fdc37c93x_device, (void *) (FDC37XXX5 | FDC37C93X_FR));
     device_add(&sst_flash_29ee010_device);
 
     return ret;
@@ -577,8 +632,8 @@ machine_at_ap53_init(const machine_t *model)
     pci_register_slot(0x06, PCI_CARD_VIDEO,       1, 2, 3, 4);
     device_add(&i430hx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c669_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&fdc37c669_device, (void *) 0);
     device_add(&intel_flash_bxt_device);
 
     return ret;
@@ -606,20 +661,106 @@ machine_at_8500tuc_init(const machine_t *model)
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
     device_add(&i430hx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&um8669f_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&um8669f_device, (void *) 0);
     device_add(&intel_flash_bxt_device);
 
     return ret;
 }
 
+static const device_config_t d943_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "d943",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 }, /*W1*/
+        .bios = {
+            { .name = "PhoenixBIOS 4.05 - Revision 1.02.943", .internal_name = "d943_oct96", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d943/d943_oct96.bin", "" } },
+            { .name = "PhoenixBIOS 4.05 - Revision 1.03.943", .internal_name = "d943_dec96", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d943/d943_dec96.bin", "" } },
+            { .name = "PhoenixBIOS 4.05 - Revision 1.05.943", .internal_name = "d943_sept97", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d943/d943_sept97.bin", "" } },
+            { .name = "PhoenixBIOS 4.05 - Revision 1.06.943", .internal_name = "d943", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/d943/d943_oct97.bin", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t d943_device = {
+    .name          = "Siemens-Nixdorf D943",
+    .internal_name = "d943_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = d943_config
+};
+
 int
-machine_at_p55t2s_init(const machine_t *model)
+machine_at_d943_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+    device_context_restore();
+	
+    machine_at_common_init_ex(model, 2);
+    device_add(&amstrad_megapc_nvr_device);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x08, PCI_CARD_VIDEO,       4, 0, 0, 0);
+    pci_register_slot(0x11, PCI_CARD_NORMAL,      3, 2, 4, 1);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,	  2, 1, 3, 4);
+    pci_register_slot(0x13, PCI_CARD_NORMAL,      1, 3, 2, 4);
+    device_add(&i430hx_device);
+    device_add(&piix3_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add(&intel_flash_bxt_device);
+    spd_register(SPD_TYPE_EDO, 0x7, 256);
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    if (sound_card_current[0] == SOUND_INTERNAL)
+        machine_snd = device_add(machine_get_snd_device(machine));
+
+    return ret;
+}
+
+/* i430VX */
+int
+machine_at_gw2kma_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/p55t2s/s6y08t.rom",
-                           0x000e0000, 131072, 0);
+    ret = bios_load_linear_combined2("roms/machines/gw2kma/1007DQ0T.BIO",
+                                     "roms/machines/gw2kma/1007DQ0T.BI1",
+                                     "roms/machines/gw2kma/1007DQ0T.BI2",
+                                     "roms/machines/gw2kma/1007DQ0T.BI3",
+                                     "roms/machines/gw2kma/1007DQ0T.RCV",
+                                     0x3a000, 128);
 
     if (bios_only || !ret)
         return ret;
@@ -628,130 +769,182 @@ machine_at_p55t2s_init(const machine_t *model)
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x12, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x13, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x14, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x11, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&i430hx_device);
-    device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&pc87306_device);
-    device_add(&intel_flash_bxt_device);
-
-    return ret;
-}
-
-int
-machine_at_p5vxb_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/p5vxb/P5VXB10.BIN",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x05, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x06, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x08, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x09, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 4);
-    device_add(&i430vx_device);
-    device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&w83877f_device);
-    device_add(&sst_flash_29ee010_device);
-
-    return ret;
-}
-
-int
-machine_at_dellhannibalp_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear_combined2("roms/machines/dellhannibalp/1003DY0J.BIO",
-                                     "roms/machines/dellhannibalp/1003DY0J.BI1",
-                                     "roms/machines/dellhannibalp/1003DY0J.BI2",
-                                     "roms/machines/dellhannibalp/1003DY0J.BI3",
-                                     "roms/machines/dellhannibalp/1003DY0J.RCV",
-                                     0x3a000, 128);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x08, PCI_CARD_VIDEO,       4, 0, 0, 0);
     pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
     pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 3, 4, 1);
     pci_register_slot(0x0F, PCI_CARD_NORMAL,      3, 4, 1, 2);
     pci_register_slot(0x10, PCI_CARD_NORMAL,      4, 1, 2, 3);
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 4);
+
+    if ((sound_card_current[0] == SOUND_INTERNAL) && machine_get_snd_device(machine)->available())
+        machine_snd = device_add(machine_get_snd_device(machine));
+
     device_add(&i430vx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c932fr_device);
+    device_add_params(&fdc37c93x_device, (void *) (FDC37XXX2 | FDC37C93X_FR));
     device_add(&intel_flash_bxt_ami_device);
 
     return ret;
 }
 
+/* SiS 5501 */
+static const device_config_t c5sbm2_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "5sbm2",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "Award Modular BIOS v4.50GP - Revision 07/17/1995", .internal_name = "5sbm2_v450gp", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/5sbm2/5SBM0717.BIN", "" } },
+            { .name = "Award Modular BIOS v4.50PG - Revision 03/26/1996", .internal_name = "5sbm2", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/5sbm2/5SBM0326.BIN", "" } },
+            { .name = "Award Modular BIOS v4.51PG - Revision 2.2 (by Unicore Software)", .internal_name = "5sbm2_451pg", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/5sbm2/2A5ICC3A.BIN", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t c5sbm2_device = {
+    .name          = "Chaintech 5SBM/5SBM2 (M103)",
+    .internal_name = "5sbm2_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = c5sbm2_config
+};
+
 int
-machine_at_gw2kte_init(const machine_t *model)
+machine_at_5sbm2_init(const machine_t *model)
 {
-    int ret;
+    int ret = 0;
+    const char* fn;
 
-    ret = bios_load_linear_combined2("roms/machines/gw2kte/1008CY1T.BIO",
-                                     "roms/machines/gw2kte/1008CY1T.BI1",
-                                     "roms/machines/gw2kte/1008CY1T.BI2",
-                                     "roms/machines/gw2kte/1008CY1T.BI3",
-                                     "roms/machines/gw2kte/1008CY1T.RCV",
-                                     0x3a000, 128);
-
-    if (bios_only || !ret)
+    /* No ROMs available */
+    if (!device_available(model->device))
         return ret;
 
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x08, PCI_CARD_VIDEO,       4, 0, 0, 0);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x10, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 4);
-    device_add(&i430vx_device);
-    device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c932fr_device);
-    device_add(&intel_flash_bxt_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_ap5s_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/ap5s/AP5S150.BIN",
-                           0x000e0000, 131072, 0);
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+    device_context_restore();
 
     if (bios_only || !ret)
         return ret;
 
     machine_at_common_init_ex(model, 2);
 
+    pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x11, PCI_CARD_NORMAL,      3, 4, 1, 2);
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add(&sis_550x_device);
+    device_add_params(&um866x_device, (void *) UM8663AF);
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
+
+/* SiS 5511 */
+int
+machine_at_amis727_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/amis727/S727p.rom",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0xFE, 0xFF, 0, 0);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
+
+    device_add(&sis_5511_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add(&intel_flash_bxt_device);
+
+    return ret;
+}
+
+static const device_config_t ap5s_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "ap5s",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "Award Modular BIOS v4.50PG - Revision R1.20", .internal_name = "ap5s_450pg", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/ap5s/ap5s120.bin", "" } },
+            { .name = "Award Modular BIOS v4.51PG - Revision R1.50", .internal_name = "ap5s_r150", .bios_type = BIOS_NORMAL, 
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/ap5s/AP5S150.BIN", "" } },
+            { .name = "Award Modular BIOS v4.51PG - Revision R1.60", .internal_name = "ap5s", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/ap5s/ap5s160.bin", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t ap5s_device = {
+    .name          = "AOpen AP5S",
+    .internal_name = "ap5s_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ap5s_config
+};
+
+int
+machine_at_ap5s_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+    device_context_restore();
+
+    machine_at_common_init_ex(model, 2);
+
     pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
     pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
@@ -761,8 +954,39 @@ machine_at_ap5s_init(const machine_t *model)
     pci_register_slot(0x13, PCI_CARD_NORMAL,      4, 1, 2, 3);
 
     device_add(&sis_5511_device);
-    device_add(&keyboard_ps2_ami_device);
-    device_add(&fdc37c665_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
+
+int
+machine_at_pc140_6260_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/pc140_6260/LYKT32A.ROM",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x14, PCI_CARD_VIDEO,       0, 0, 0, 0); /* Onboard video */
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(&gd5436_onboard_pci_device);
+
+    device_add(&sis_5511_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&fdc37c669_device, (void *) 0);
     device_add(&sst_flash_29ee010_device);
 
     return ret;
@@ -790,70 +1014,8 @@ machine_at_ms5124_init(const machine_t *model)
     pci_register_slot(0x0F, PCI_CARD_NORMAL,      2, 3, 4, 1);
 
     device_add(&sis_5511_device);
-    device_add(&keyboard_ps2_ami_device);
-    device_add(&w83787f_88h_device);
-    device_add(&sst_flash_29ee010_device);
-
-    return ret;
-}
-
-int
-machine_at_amis727_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/amis727/S727p.rom",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0xFE, 0xFF, 0, 0);
-    pci_register_slot(0x0A, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
-
-    device_add(&sis_5511_device);
-    device_add(&keyboard_ps2_intel_ami_pci_device);
-    device_add(&fdc37c665_device);
-    device_add(&intel_flash_bxt_device);
-
-    return ret;
-}
-
-int
-machine_at_vectra54_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/vectra54/GT0724.22",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0F, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0D, PCI_CARD_VIDEO,       0, 0, 0, 0);
-    pci_register_slot(0x06, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x07, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x08, PCI_CARD_NORMAL,      3, 4, 1, 2);
-
-    if (gfxcard[0] == VID_INTERNAL)
-        device_add(&s3_phoenix_trio64_onboard_pci_device);
-
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&i430fx_device);
-    device_add(&piix_device);
-    device_add(&fdc37c931apm_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&w837x7_device, (void *) (W83787F | W837X7_KEY_88));
     device_add(&sst_flash_29ee010_device);
 
     return ret;
diff --git a/src/machine/m_at_socket8.c b/src/machine/m_at_socket8.c
index e1dad68e7..3d5f4787e 100644
--- a/src/machine/m_at_socket8.c
+++ b/src/machine/m_at_socket8.c
@@ -8,11 +8,9 @@
  *
  *          Implementation of Socket 8 machines.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2016-2019 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -33,12 +31,14 @@
 #include <86box/timer.h>
 #include <86box/nvr.h>
 #include <86box/sio.h>
+#include <86box/sound.h>
 #include <86box/hwm.h>
 #include <86box/spd.h>
 #include <86box/video.h>
 #include "cpu.h"
 #include <86box/machine.h>
 
+/* i450KX */
 int
 machine_at_ap61_init(const machine_t *model)
 {
@@ -64,10 +64,9 @@ machine_at_ap61_init(const machine_t *model)
     device_add(&i450kx_device);
     device_add(&sio_zb_device);
     device_add(&ide_cmd646_device);
-    device_add(&keyboard_ps2_acer_pci_device);
-    device_add(&fdc37c665_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
     device_add(&sst_flash_29ee010_device);
-    // device_add(&intel_flash_bxt_device);
 
     return ret;
 }
@@ -99,8 +98,156 @@ machine_at_p6rp4_init(const machine_t *model)
     device_add(&sio_zb_device);
     device_add(&ide_cmd646_device);
     /* Input port bit 2 must be 1 or CMOS Setup is disabled. */
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c665_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
+    device_add(&intel_flash_bxt_device);
+
+    return ret;
+}
+
+static const device_config_t ficpo6000_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "405F03C",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 }, /*W1*/
+        .bios = {
+            { .name = "PhoenixBIOS 4.05 - Revision 405F03C (CD-ROM Boot support)", .internal_name = "405F03C", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/ficpo6000/405F03C.ROM", "" } },
+            { .name = "PhoenixBIOS 4.05 - Revision 405F05C (No CD-ROM Boot support)", .internal_name = "405F05C", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/ficpo6000/405F05C.ROM", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t ficpo6000_device = {
+    .name          = "FIC PO-6000",
+    .internal_name = "ficpo6000_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available 	   = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ficpo6000_config
+};
+
+int
+machine_at_ficpo6000_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn;
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+    device_context_restore();
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x19, PCI_CARD_NORTHBRIDGE,     0, 0, 0, 0);
+    pci_register_slot(0x14, PCI_CARD_NORTHBRIDGE_SEC, 0, 0, 0, 0);
+    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE,     0, 0, 0, 0);
+    pci_register_slot(0x03, PCI_CARD_NORMAL,          1, 2, 3, 4);
+    pci_register_slot(0x04, PCI_CARD_NORMAL,          2, 3, 4, 1);
+    pci_register_slot(0x05, PCI_CARD_NORMAL,          3, 4, 1, 2);
+    pci_register_slot(0x06, PCI_CARD_NORMAL,          4, 1, 2, 3);
+    pci_register_slot(0x0c, PCI_CARD_IDE,             0, 0, 0, 0);
+    device_add(&i450kx_device);
+    device_add(&sio_zb_device);
+    device_add(&ide_cmd646_device);
+    /* Input port bit 2 must be 1 or CMOS Setup is disabled. */
+    device_add_params(&pc87306_device, (void *) PCX730X_PHOENIX_42);
+    device_add(&intel_flash_bxt_device);
+
+    return ret;
+}
+
+/* i440FX */
+int
+machine_at_acerv60n_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/acerv60n/V60NE5.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model,2 );
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x10, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    device_add(&i440fx_device);
+    device_add(&piix3_device);
+    device_add_params(&fdc37c93x_device, (void *) (FDC37XXX5 | FDC37C93X_NORMAL));
+    device_add(&sst_flash_29ee010_device);
+    spd_register(SPD_TYPE_SDRAM, 0x7, 128);
+
+    return ret;
+}
+
+int
+machine_at_p65up5_cp6nd_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/p65up5/ND6I0218.AWD",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_p65up5_common_init(model, &i440fx_device);
+
+    return ret;
+}
+
+int
+machine_at_8600ttc_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/8600ttc/TTC0715B.ROM",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x08, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    device_add(&i440fx_device);
+    device_add(&piix3_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&fdc37c669_device, (void *) 0);
     device_add(&intel_flash_bxt_device);
 
     return ret;
@@ -128,171 +275,13 @@ machine_at_686nx_init(const machine_t *model)
     pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3);
     device_add(&i440fx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device); // Uses the AMIKEY keyboard controller
-    device_add(&um8669f_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&um8669f_device, (void *) 0);
     device_add(&intel_flash_bxt_device);
 
     return ret;
 }
 
-int
-machine_at_mb600n_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/mb600n/60915cs.rom",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x11, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x12, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x13, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x14, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    device_add(&i440fx_device);
-    device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c669_device);
-    device_add(&intel_flash_bxt_device);
-
-    return ret;
-}
-
-int
-machine_at_acerv60n_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/acerv60n/V60NE5.BIN",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x10, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x12, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    device_add(&i440fx_device);
-    device_add(&piix3_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&fdc37c935_device);
-    device_add(&sst_flash_29ee010_device);
-
-    return ret;
-}
-
-int
-machine_at_lgibmx61_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/lgibmx61/bios.rom",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    device_add(&i440fx_device);
-    device_add(&piix3_device);
-    // device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&keyboard_ps2_ami_device);
-    // device_add(&w83787f_device);
-    device_add(&w83877f_president_device);
-    device_add(&sst_flash_29ee010_device);
-
-    return ret;
-}
-
-int
-machine_at_vs440fx_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear_combined2("roms/machines/vs440fx/1018CS1_.BIO",
-                                     "roms/machines/vs440fx/1018CS1_.BI1",
-                                     "roms/machines/vs440fx/1018CS1_.BI2",
-                                     "roms/machines/vs440fx/1018CS1_.BI3",
-                                     "roms/machines/vs440fx/1018CS1_.RCV",
-                                     0x3a000, 128);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x11, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x13, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&i440fx_device);
-    device_add(&piix3_device);
-    device_add(&keyboard_ps2_intel_ami_pci_device);
-    device_add(&pc87307_device);
-
-    device_add(&intel_flash_bxt_ami_device);
-
-    return ret;
-}
-
-int
-machine_at_gw2kvenus_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear_combined2("roms/machines/gw2kvenus/1011CS1T.BIO",
-                                     "roms/machines/gw2kvenus/1011CS1T.BI1",
-                                     "roms/machines/gw2kvenus/1011CS1T.BI2",
-                                     "roms/machines/gw2kvenus/1011CS1T.BI3",
-                                     "roms/machines/gw2kvenus/1011CS1T.RCV",
-                                     0x3a000, 128);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0F, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x11, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x13, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&i440fx_device);
-    device_add(&piix3_device);
-    device_add(&keyboard_ps2_intel_ami_pci_device);
-    device_add(&pc87307_device);
-
-    device_add(&intel_flash_bxt_ami_device);
-
-    return ret;
-}
-
 int
 machine_at_ap440fx_init(const machine_t *model)
 {
@@ -319,19 +308,105 @@ machine_at_ap440fx_init(const machine_t *model)
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 4);
     device_add(&i440fx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&pc87307_device);
+    device_add_params(&pc87307_device, (void *) (PCX730X_AMI | PCX7307_PC87307));
     device_add(&intel_flash_bxt_ami_device);
 
+    if (sound_card_current[0] == SOUND_INTERNAL)
+        device_add(machine_get_snd_device(machine));
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    return ret;
+}
+
+static const device_config_t vs440fx_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "vs440fx",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "Intel AMIBIOS - Revision 1.00.06.CS1J (Dell Dimension XPS Pro___n)", .internal_name = "dellvenus", .bios_type = BIOS_NORMAL, 
+              .files_no = 5, .local = 0, .size = 262144, .files = { "roms/machines/vs440fx/1006CS1J.BIO", "roms/machines/vs440fx/1006CS1J.BI1",
+                                                                    "roms/machines/vs440fx/1006CS1J.BI2", "roms/machines/vs440fx/1006CS1J.BI3",
+                                                                    "roms/machines/vs440fx/1006CS1J.RCV", "" } },
+            { .name = "Intel AMIBIOS - Revision 1.00.11.CS1T (Gateway 2000)", .internal_name = "gw2kvenus", .bios_type = BIOS_NORMAL, 
+              .files_no = 5, .local = 0, .size = 262144, .files = { "roms/machines/vs440fx/1011CS1T.BIO", "roms/machines/vs440fx/1011CS1T.BI1",
+                                                                    "roms/machines/vs440fx/1011CS1T.BI2", "roms/machines/vs440fx/1011CS1T.BI3",
+                                                                    "roms/machines/vs440fx/1011CS1T.RCV", "" } },
+            { .name = "Intel AMIBIOS - Revision 1.00.18.CS1", .internal_name = "vs440fx", .bios_type = BIOS_NORMAL, 
+              .files_no = 5, .local = 0, .size = 262144, .files = { "roms/machines/vs440fx/1018CS1_.BIO", "roms/machines/vs440fx/1018CS1_.BI1",
+                                                                    "roms/machines/vs440fx/1018CS1_.BI2", "roms/machines/vs440fx/1018CS1_.BI3",
+                                                                    "roms/machines/vs440fx/1018CS1_.RCV", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t vs440fx_device = {
+    .name          = "Intel VS440FX (Venus)",
+    .internal_name = "vs440fx_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = vs440fx_config
+};
+
+int
+machine_at_vs440fx_init(const machine_t *model)
+{
+    int ret = 0;
+    const char* fn[5];
+
+    /* No ROMs available */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    for (int i = 0; i < 5; i++)
+        fn[i] = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), i);
+    ret = bios_load_linear_combined2(fn[0], fn[1], fn[2], fn[3], fn[4], 0x3a000, 128);
+    device_context_restore();
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x11, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x13, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    device_add(&i440fx_device);
+    device_add(&piix3_device);
+    device_add_params(&pc87307_device, (void *) (PCX730X_AMI | PCX7307_PC87307));
+
+    device_add(&intel_flash_bxt_ami_device);
+
+    if (sound_card_current[0] == SOUND_INTERNAL)
+        device_add(machine_get_snd_device(machine));
+
     return ret;
 }
 
 int
-machine_at_8600ttc_init(const machine_t *model)
+machine_at_lgibmx61_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/8600ttc/TTC0715B.ROM",
+    ret = bios_load_linear("roms/machines/lgibmx61/bios.rom",
                            0x000e0000, 131072, 0);
 
     if (bios_only || !ret)
@@ -342,15 +417,15 @@ machine_at_8600ttc_init(const machine_t *model)
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x08, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x09, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      4, 1, 2, 3);
     device_add(&i440fx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c669_device);
-    device_add(&intel_flash_bxt_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&w83877_device, (void *) (W83877F | W83877_250));
+    device_add(&sst_flash_29ee010_device);
 
     return ret;
 }
@@ -366,7 +441,7 @@ machine_at_m6mi_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
@@ -377,46 +452,37 @@ machine_at_m6mi_init(const machine_t *model)
     pci_register_slot(0x0F, PCI_CARD_NORMAL,      4, 1, 2, 3);
     device_add(&i440fx_device);
     device_add(&piix3_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c935_device);
+    device_add_params(&fdc37c93x_device, (void *) (FDC37XXX5 | FDC37C93X_NORMAL));
     device_add(&intel_flash_bxt_device);
 
     return ret;
 }
 
-void
-machine_at_p65up5_common_init(const machine_t *model, const device_t *northbridge)
-{
-    machine_at_common_init(model);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x09, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x0A, PCI_CARD_NORMAL,      3, 4, 1, 2);
-    pci_register_slot(0x0B, PCI_CARD_NORMAL,      2, 3, 4, 1);
-    pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 2, 3, 4);
-    pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    device_add(northbridge);
-    device_add(&piix3_ioapic_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&w83877f_device);
-    device_add(&sst_flash_29ee010_device);
-    device_add(&ioapic_device);
-}
-
 int
-machine_at_p65up5_cp6nd_init(const machine_t *model)
+machine_at_mb600n_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/p65up5/ND6I0218.AWD",
+    ret = bios_load_linear("roms/machines/mb600n/60915cs.rom",
                            0x000e0000, 131072, 0);
 
     if (bios_only || !ret)
         return ret;
 
-    machine_at_p65up5_common_init(model, &i440fx_device);
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x11, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x13, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x14, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    device_add(&i440fx_device);
+    device_add(&piix3_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+    device_add_params(&fdc37c669_device, (void *) 0);
+    device_add(&intel_flash_bxt_device);
 
     return ret;
 }
diff --git a/src/machine/m_at_sockets7.c b/src/machine/m_at_sockets7.c
index 8ff1a367d..a39b2cef4 100644
--- a/src/machine/m_at_sockets7.c
+++ b/src/machine/m_at_sockets7.c
@@ -8,11 +8,9 @@
  *
  *          Implementation of Super Socket 7 machines.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2016-2020 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -40,6 +38,7 @@
 #include <86box/snd_ac97.h>
 #include <86box/clock.h>
 
+/* ALi ALADDiN V */
 int
 machine_at_p5a_init(const machine_t *model)
 {
@@ -135,6 +134,11 @@ machine_at_gwlucas_init(const machine_t *model)
     device_add(&sst_flash_39sf020_device);
     spd_register(SPD_TYPE_SDRAM, 0x7, 512);
 
+    if (sound_card_current[0] == SOUND_INTERNAL) {
+        device_add(machine_get_snd_device(machine));
+        device_add(&cs4297_device);
+    }
+
     return ret;
 }
 
@@ -202,6 +206,7 @@ machine_at_5ax_init(const machine_t *model)
     return ret;
 }
 
+/* VIA MVP3 */
 int
 machine_at_ax59pro_init(const machine_t *model)
 {
@@ -226,14 +231,44 @@ machine_at_ax59pro_init(const machine_t *model)
 
     device_add(&via_mvp3_device);
     device_add(&via_vt82c586b_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&w83877tf_device);
+    device_add_params(&w83877_device, (void *) (W83877TF | W83877_250));
     device_add(&sst_flash_39sf020_device);
     spd_register(SPD_TYPE_SDRAM, 0x7, 256);
 
     return ret;
 }
 
+int
+machine_at_delhi3_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/delhi3/DELHI3.ROM",
+                           0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+    pci_register_slot(0x13, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,      2, 3, 4, 1);
+
+    device_add(&via_mvp3_device);
+    device_add(&via_vt82c596a_device);
+    device_add_params(&w83877_device, (void *) (W83877TF | W83877_250));
+    device_add(&sst_flash_39sf020_device);
+    spd_register(SPD_TYPE_SDRAM, 0x3, 256);
+
+    if ((sound_card_current[0] == SOUND_INTERNAL) && machine_get_snd_device(machine))
+        device_add(machine_get_snd_device(machine));
+
+    return ret;
+}
+
 int
 machine_at_mvp3_init(const machine_t *model)
 {
@@ -257,8 +292,7 @@ machine_at_mvp3_init(const machine_t *model)
 
     device_add(&via_mvp3_device);
     device_add(&via_vt82c586b_device);
-    device_add(&keyboard_ps2_pci_device);
-    device_add(&w83877tf_device);
+    device_add_params(&w83877_device, (void *) (W83877TF | W83877_3F0));
     device_add(&sst_flash_39sf010_device);
     spd_register(SPD_TYPE_SDRAM, 0x3, 256);
 
@@ -289,7 +323,6 @@ machine_at_ficva503a_init(const machine_t *model)
 
     device_add(&via_mvp3_device);
     device_add(&via_vt82c686a_device); /* fans: CPU1, Chassis; temperatures: CPU, System, unused */
-    device_add(&keyboard_ps2_ami_pci_device);
     device_add(&sst_flash_39sf020_device);
     spd_register(SPD_TYPE_SDRAM, 0x7, 256);
     hwm_values.temperatures[0] += 2; /* CPU offset */
@@ -327,7 +360,6 @@ machine_at_5emapro_init(const machine_t *model)
 
     device_add(&via_mvp3_device); /* Rebranded as EQ82C6638 */
     device_add(&via_vt82c686a_device);
-    device_add(&keyboard_ps2_ami_pci_device);
     device_add(&sst_flash_39sf010_device);
     spd_register(SPD_TYPE_SDRAM, 0x7, 256);
     device_add(&via_vt82c686_hwm_device); /* fans: CPU1, Chassis; temperatures: CPU, System, unused */
@@ -337,3 +369,32 @@ machine_at_5emapro_init(const machine_t *model)
 
     return ret;
 }
+
+/* SiS 5591 */
+int
+machine_at_5sg100_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/5sg100/5sg.20g",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x09, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x0B, PCI_CARD_NORMAL,      2, 3, 4, 1);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL,      4, 1, 2, 3);
+    pci_register_slot(0x02, PCI_CARD_AGPBRIDGE,   0, 0, 0, 0);
+    device_add(&sis_5591_1997_device);
+    device_add_params(&w83877_device, (void *) (W83877TF | W83877_3F0));
+    device_add(&sst_flash_29ee010_device);
+
+    return ret;
+}
diff --git a/src/machine/m_at_t3100e.c b/src/machine/m_at_t3100e.c
index e3e24cf2c..4919f4975 100644
--- a/src/machine/m_at_t3100e.c
+++ b/src/machine/m_at_t3100e.c
@@ -117,15 +117,13 @@
  *                         bit 2 set for single-pixel LCD font
  *                         bits 0,1 for display font
  *
- *
- *
- * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
+ * Authors: John Elliott, <jce@seasip.info>
+ *          Fred N. van Kempen, <decwiz@yahoo.com>
  *          Miran Grca, <mgrca8@gmail.com>
- *          John Elliott, <jce@seasip.info>
  *
- *          Copyright 2017-2018 Fred N. van Kempen.
- *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2008-2018 John Elliott.
+ *          Copyright 2008-2025 John Elliott.
+ *          Copyright 2017-2025 Fred N. van Kempen.
+ *          Copyright 2016-2025 Miran Grca.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -796,6 +794,12 @@ upper_write_raml(uint32_t addr, uint32_t val, void *priv)
     *(uint32_t *) &ram[addr] = val;
 }
 
+uint8_t
+machine_t3100e_p1_handler(void)
+{
+    return (t3100e_mono_get() & 1) ? 0xff : 0xbf;
+}
+
 int
 machine_at_t3100e_init(const machine_t *model)
 {
@@ -813,11 +817,10 @@ machine_at_t3100e_init(const machine_t *model)
 
     machine_at_common_ide_init(model);
 
-    device_add(&keyboard_at_toshiba_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
 
-    if (fdc_type == FDC_INTERNAL) {
+    if (fdc_current[0] == FDC_INTERNAL)
         device_add(&fdc_at_device);
-    }
 
     /* Hook up system control port */
     io_sethandler(0x8084, 0x0001,
@@ -850,6 +853,9 @@ machine_at_t3100e_init(const machine_t *model)
                     NULL, MEM_MAPPING_INTERNAL, &t3100e_ems);
     mem_mapping_disable(&t3100e_ems.upper_mapping);
 
+    if (mem_size < (16384 - 448))
+        mem_set_mem_state_both(mem_size * 1024, 384 * 1024, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+
     device_add(&t3100e_device);
 
     return ret;
diff --git a/src/machine/m_elt.c b/src/machine/m_elt.c
index a69b62184..2c807782c 100644
--- a/src/machine/m_elt.c
+++ b/src/machine/m_elt.c
@@ -58,13 +58,13 @@ static void
 elt_vid_off_poll(void *priv)
 {
     cga_t  *cga   = priv;
-    uint8_t hdisp = cga->crtc[1];
+    uint8_t hdisp = cga->crtc[CGA_CRTC_HDISP];
 
     /* Don't display anything.
      * TODO: Do something less stupid to emulate backlight off. */
-    cga->crtc[1] = 0;
+    cga->crtc[CGA_CRTC_HDISP] = 0;
     cga_poll(cga);
-    cga->crtc[1] = hdisp;
+    cga->crtc[CGA_CRTC_HDISP] = hdisp;
 }
 
 static void
@@ -178,7 +178,7 @@ machine_elt_init(const machine_t *model)
 
     pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_xt);
 
-    if (fdc_type == FDC_INTERNAL)
+    if (fdc_current[0] == FDC_INTERNAL)
         device_add(&fdc_xt_device);
 
     if (gfxcard[0] == VID_INTERNAL) {
@@ -190,7 +190,7 @@ machine_elt_init(const machine_t *model)
     /* Keyboard goes after the video, because on XT compatibles it's dealt
      * with by the same PPI as the config switches and we need them to
      * indicate the correct display type */
-    device_add(&keyboard_xt_device);
+    device_add(&kbc_xt_device);
 
     device_add(&elt_nvr_device);
 
diff --git a/src/machine/m_europc.c b/src/machine/m_europc.c
index e541cf718..d85563241 100644
--- a/src/machine/m_europc.c
+++ b/src/machine/m_europc.c
@@ -625,7 +625,7 @@ europc_boot(UNUSED(const device_t *info))
         mouse_bus_set_irq(sys->mouse, 2);
         /* Configure the port for (Bus Mouse Compatible) Mouse. */
         b |= 0x01;
-    } else if (joystick_type)
+    } else if (joystick_type[0])
         b |= 0x02; /* enable port as joysticks */
     sys->nvr.regs[MRTC_CONF_C] = b;
 
@@ -646,11 +646,12 @@ europc_boot(UNUSED(const device_t *info))
      * (JS9) can be used to "move" it to 0x0350, to get it out of
      * the way of other cards that need this range.
      */
+    sys->jim = device_get_config_hex16("js9");
     io_sethandler(sys->jim, 16,
                   jim_read, NULL, NULL, jim_write, NULL, NULL, sys);
 
     /* Only after JIM has been initialized. */
-    (void) device_add(&keyboard_xt_device);
+    (void) device_add(&kbc_xt_device);
 
     /* Enable and set up the FDC. */
     (void) device_add(&fdc_xt_device);
@@ -660,7 +661,7 @@ europc_boot(UNUSED(const device_t *info))
      *
      * We only do this if we have not configured another one.
      */
-    if (hdc_current == 1)
+    if (hdc_current[0] == HDC_INTERNAL)
         (void) device_add(&xta_hd20_device);
 
     return sys;
@@ -680,14 +681,14 @@ static const device_config_t europc_config[] = {
     {
         .name = "js9",
         .description = "JS9 Jumper (JIM)",
-        .type = CONFIG_INT,
+        .type = CONFIG_HEX16,
         .default_string = "",
-        .default_int = 0,
+        .default_int = 0x0250,
         .file_filter = "",
         .spinner = { 0 },
         .selection = {
-            { .description = "Disabled (250h)", .value = 0 },
-            { .description = "Enabled (350h)",  .value = 1 },
+            { .description = "Disabled (250h)", .value = 0x0250 },
+            { .description = "Enabled (350h)",  .value = 0x0350 },
             { .description = ""                            }
         },
     },
@@ -703,7 +704,7 @@ const device_t europc_device = {
     .init          = europc_boot,
     .close         = europc_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = europc_config
diff --git a/src/machine/m_pcjr.c b/src/machine/m_pcjr.c
index 80a0ffbc1..b7d840224 100644
--- a/src/machine/m_pcjr.c
+++ b/src/machine/m_pcjr.c
@@ -48,11 +48,10 @@
 #include <86box/snd_sn76489.h>
 #include <86box/video.h>
 #include <86box/vid_cga_comp.h>
+#include <86box/m_pcjr.h>
 #include <86box/machine.h>
 #include <86box/plat_unused.h>
 
-#define PCJR_RGB       0
-#define PCJR_COMPOSITE 1
 
 #define STAT_PARITY    0x80
 #define STAT_RTIMEOUT  0x40
@@ -63,541 +62,530 @@
 #define STAT_IFULL     0x02
 #define STAT_OFULL     0x01
 
-typedef struct pcjr_t {
-    /* Video Controller stuff. */
-    mem_mapping_t mapping;
-    uint8_t       crtc[32];
-    int           crtcreg;
-    int           array_index;
-    uint8_t       array[32];
-    int           array_ff;
-    int           memctrl;
-    uint8_t       stat;
-    int           addr_mode;
-    uint8_t      *vram;
-    uint8_t      *b8000;
-    int           linepos;
-    int           displine;
-    int           sc;
-    int           vc;
-    int           dispon;
-    int           con;
-    int           coff;
-    int           cursoron;
-    int           blink;
-    int           vsynctime;
-    int           fullchange;
-    int           vadj;
-    uint16_t      ma;
-    uint16_t      maback;
-    uint64_t      dispontime;
-    uint64_t      dispofftime;
-    pc_timer_t    timer;
-    int           firstline;
-    int           lastline;
-    int           composite;
 
-    /* Keyboard Controller stuff. */
-    int        latched;
-    int        data;
-    int        serial_data[44];
-    int        serial_pos;
-    uint8_t    pa;
-    uint8_t    pb;
-    pc_timer_t send_delay_timer;
-} pcjr_t;
-
-static video_timings_t timing_dram = { VIDEO_BUS, 0, 0, 0, 0, 0, 0 }; /*No additional waitstates*/
-
-static uint8_t crtcmask[32] = {
-    0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x7f, 0x7f,
-    0xf3, 0x1f, 0x7f, 0x1f, 0x3f, 0xff, 0x3f, 0xff,
-    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
 static uint8_t key_queue[16];
 static int     key_queue_start = 0;
 static int     key_queue_end   = 0;
 
-static void
-recalc_address(pcjr_t *pcjr)
-{
-    uint8_t masked_memctrl = pcjr->memctrl;
+/*PCjr keyboard has no escape scancodes, and no scancodes beyond 54
+  Map right alt to 54h (FN) */
+const scancode scancode_pcjr[512] = {
+  // clang-format off
+    { .mk = {            0 }, .brk = {                   0 } }, /* 000 */
+    { .mk = {      0x01, 0 }, .brk = {             0x81, 0 } }, /* 001 */
+    { .mk = {      0x02, 0 }, .brk = {             0x82, 0 } }, /* 002 */
+    { .mk = {      0x03, 0 }, .brk = {             0x83, 0 } }, /* 003 */
+    { .mk = {      0x04, 0 }, .brk = {             0x84, 0 } }, /* 004 */
+    { .mk = {      0x05, 0 }, .brk = {             0x85, 0 } }, /* 005 */
+    { .mk = {      0x06, 0 }, .brk = {             0x86, 0 } }, /* 006 */
+    { .mk = {      0x07, 0 }, .brk = {             0x87, 0 } }, /* 007 */
+    { .mk = {      0x08, 0 }, .brk = {             0x88, 0 } }, /* 008 */
+    { .mk = {      0x09, 0 }, .brk = {             0x89, 0 } }, /* 009 */
+    { .mk = {      0x0a, 0 }, .brk = {             0x8a, 0 } }, /* 00a */
+    { .mk = {      0x0b, 0 }, .brk = {             0x8b, 0 } }, /* 00b */
+    { .mk = {      0x0c, 0 }, .brk = {             0x8c, 0 } }, /* 00c */
+    { .mk = {      0x0d, 0 }, .brk = {             0x8d, 0 } }, /* 00d */
+    { .mk = {      0x0e, 0 }, .brk = {             0x8e, 0 } }, /* 00e */
+    { .mk = {      0x0f, 0 }, .brk = {             0x8f, 0 } }, /* 00f */
+    { .mk = {      0x10, 0 }, .brk = {             0x90, 0 } }, /* 010 */
+    { .mk = {      0x11, 0 }, .brk = {             0x91, 0 } }, /* 011 */
+    { .mk = {      0x12, 0 }, .brk = {             0x92, 0 } }, /* 012 */
+    { .mk = {      0x13, 0 }, .brk = {             0x93, 0 } }, /* 013 */
+    { .mk = {      0x14, 0 }, .brk = {             0x94, 0 } }, /* 014 */
+    { .mk = {      0x15, 0 }, .brk = {             0x95, 0 } }, /* 015 */
+    { .mk = {      0x16, 0 }, .brk = {             0x96, 0 } }, /* 016 */
+    { .mk = {      0x17, 0 }, .brk = {             0x97, 0 } }, /* 017 */
+    { .mk = {      0x18, 0 }, .brk = {             0x98, 0 } }, /* 018 */
+    { .mk = {      0x19, 0 }, .brk = {             0x99, 0 } }, /* 019 */
+    { .mk = {      0x1a, 0 }, .brk = {             0x9a, 0 } }, /* 01a */
+    { .mk = {      0x1b, 0 }, .brk = {             0x9b, 0 } }, /* 01b */
+    { .mk = {      0x1c, 0 }, .brk = {             0x9c, 0 } }, /* 01c */
+    { .mk = {      0x1d, 0 }, .brk = {             0x9d, 0 } }, /* 01d */
+    { .mk = {      0x1e, 0 }, .brk = {             0x9e, 0 } }, /* 01e */
+    { .mk = {      0x1f, 0 }, .brk = {             0x9f, 0 } }, /* 01f */
+    { .mk = {      0x20, 0 }, .brk = {             0xa0, 0 } }, /* 020 */
+    { .mk = {      0x21, 0 }, .brk = {             0xa1, 0 } }, /* 021 */
+    { .mk = {      0x22, 0 }, .brk = {             0xa2, 0 } }, /* 022 */
+    { .mk = {      0x23, 0 }, .brk = {             0xa3, 0 } }, /* 023 */
+    { .mk = {      0x24, 0 }, .brk = {             0xa4, 0 } }, /* 024 */
+    { .mk = {      0x25, 0 }, .brk = {             0xa5, 0 } }, /* 025 */
+    { .mk = {      0x26, 0 }, .brk = {             0xa6, 0 } }, /* 026 */
+    { .mk = {      0x27, 0 }, .brk = {             0xa7, 0 } }, /* 027 */
+    { .mk = {      0x28, 0 }, .brk = {             0xa8, 0 } }, /* 028 */
+    { .mk = {      0x29, 0 }, .brk = {             0xa9, 0 } }, /* 029 */
+    { .mk = {      0x2a, 0 }, .brk = {             0xaa, 0 } }, /* 02a */
+    { .mk = {      0x2b, 0 }, .brk = {             0xab, 0 } }, /* 02b */
+    { .mk = {      0x2c, 0 }, .brk = {             0xac, 0 } }, /* 02c */
+    { .mk = {      0x2d, 0 }, .brk = {             0xad, 0 } }, /* 02d */
+    { .mk = {      0x2e, 0 }, .brk = {             0xae, 0 } }, /* 02e */
+    { .mk = {      0x2f, 0 }, .brk = {             0xaf, 0 } }, /* 02f */
+    { .mk = {      0x30, 0 }, .brk = {             0xb0, 0 } }, /* 030 */
+    { .mk = {      0x31, 0 }, .brk = {             0xb1, 0 } }, /* 031 */
+    { .mk = {      0x32, 0 }, .brk = {             0xb2, 0 } }, /* 032 */
+    { .mk = {      0x33, 0 }, .brk = {             0xb3, 0 } }, /* 033 */
+    { .mk = {      0x34, 0 }, .brk = {             0xb4, 0 } }, /* 034 */
+    { .mk = {      0x35, 0 }, .brk = {             0xb5, 0 } }, /* 035 */
+    { .mk = {      0x36, 0 }, .brk = {             0xb6, 0 } }, /* 036 */
+    { .mk = {      0x37, 0 }, .brk = {             0xb7, 0 } }, /* 037 */
+    { .mk = {      0x38, 0 }, .brk = {             0xb8, 0 } }, /* 038 */
+    { .mk = {      0x39, 0 }, .brk = {             0xb9, 0 } }, /* 039 */
+    { .mk = {      0x3a, 0 }, .brk = {             0xba, 0 } }, /* 03a */
+    { .mk = {      0x3b, 0 }, .brk = {             0xbb, 0 } }, /* 03b */
+    { .mk = {      0x3c, 0 }, .brk = {             0xbc, 0 } }, /* 03c */
+    { .mk = {      0x3d, 0 }, .brk = {             0xbd, 0 } }, /* 03d */
+    { .mk = {      0x3e, 0 }, .brk = {             0xbe, 0 } }, /* 03e */
+    { .mk = {      0x3f, 0 }, .brk = {             0xbf, 0 } }, /* 03f */
+    { .mk = {      0x40, 0 }, .brk = {             0xc0, 0 } }, /* 040 */
+    { .mk = {      0x41, 0 }, .brk = {             0xc1, 0 } }, /* 041 */
+    { .mk = {      0x42, 0 }, .brk = {             0xc2, 0 } }, /* 042 */
+    { .mk = {      0x43, 0 }, .brk = {             0xc3, 0 } }, /* 043 */
+    { .mk = {      0x44, 0 }, .brk = {             0xc4, 0 } }, /* 044 */
+    { .mk = {      0x45, 0 }, .brk = {             0xc5, 0 } }, /* 045 */
+    { .mk = {      0x46, 0 }, .brk = {             0xc6, 0 } }, /* 046 */
+    { .mk = {      0x47, 0 }, .brk = {             0xc7, 0 } }, /* 047 */
+    { .mk = {      0x48, 0 }, .brk = {             0xc8, 0 } }, /* 048 */
+    { .mk = {      0x49, 0 }, .brk = {             0xc9, 0 } }, /* 049 */
+    { .mk = {      0x4a, 0 }, .brk = {             0xca, 0 } }, /* 04a */
+    { .mk = {      0x4b, 0 }, .brk = {             0xcb, 0 } }, /* 04b */
+    { .mk = {      0x4c, 0 }, .brk = {             0xcc, 0 } }, /* 04c */
+    { .mk = {      0x4d, 0 }, .brk = {             0xcd, 0 } }, /* 04d */
+    { .mk = {      0x4e, 0 }, .brk = {             0xce, 0 } }, /* 04e */
+    { .mk = {      0x4f, 0 }, .brk = {             0xcf, 0 } }, /* 04f */
+    { .mk = {      0x50, 0 }, .brk = {             0xd0, 0 } }, /* 050 */
+    { .mk = {      0x51, 0 }, .brk = {             0xd1, 0 } }, /* 051 */
+    { .mk = {      0x52, 0 }, .brk = {             0xd2, 0 } }, /* 052 */
+    { .mk = {      0x53, 0 }, .brk = {             0xd3, 0 } }, /* 053 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 054 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 055 */
+    { .mk = {      0x55, 0 }, .brk = {             0xd5, 0 } }, /* 056 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 057 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 058 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 059 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 060 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 061 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 062 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 063 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 064 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 065 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 066 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 067 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 068 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 069 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 070 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 071 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 072 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 073 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 074 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 075 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 076 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 077 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 078 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 079 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 080 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 081 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 082 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 083 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 084 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 085 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 086 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 087 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 088 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 089 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 090 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 091 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 092 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 093 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 094 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 095 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 096 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 097 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 098 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 099 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ed */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fe */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ff */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 100 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 101 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 102 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 103 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 104 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 105 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 106 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 107 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 108 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 109 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 110 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 111 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 112 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 113 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 114 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 115 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 116 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 117 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 118 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 119 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11b */
+    { .mk = {      0x1c, 0 }, .brk = {             0x9c, 0 } }, /* 11c */
+    { .mk = {      0x1d, 0 }, .brk = {             0x9d, 0 } }, /* 11d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 120 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 121 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 122 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 123 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 124 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 125 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 126 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 127 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 128 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 129 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 130 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 131 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 132 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 133 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 134 */
+    { .mk = {      0x35, 0 }, .brk = {             0xb5, 0 } }, /* 135 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 136 */
+    { .mk = {      0x37, 0 }, .brk = {             0xb7, 0 } }, /* 137 */
+    { .mk = {      0x54, 0 }, .brk = {             0xd4, 0 } }, /* 138 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 139 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 140 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 141 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 142 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 143 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 144 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 145 */
+    { .mk = {      0x46, 0 }, .brk = {             0xc6, 0 } }, /* 146 */
+    { .mk = {      0x47, 0 }, .brk = {             0xc7, 0 } }, /* 147 */
+    { .mk = {      0x48, 0 }, .brk = {             0xc8, 0 } }, /* 148 */
+    { .mk = {      0x49, 0 }, .brk = {             0xc9, 0 } }, /* 149 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14a */
+    { .mk = {      0x4b, 0 }, .brk = {             0xcb, 0 } }, /* 14b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14c */
+    { .mk = {      0x4d, 0 }, .brk = {             0xcd, 0 } }, /* 14d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14e */
+    { .mk = {      0x4f, 0 }, .brk = {             0xcf, 0 } }, /* 14f */
+    { .mk = {      0x50, 0 }, .brk = {             0xd0, 0 } }, /* 150 */
+    { .mk = {      0x51, 0 }, .brk = {             0xd1, 0 } }, /* 151 */
+    { .mk = {      0x52, 0 }, .brk = {             0xd2, 0 } }, /* 152 */
+    { .mk = {      0x53, 0 }, .brk = {             0xd3, 0 } }, /* 153 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 154 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 155 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 156 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 157 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 158 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 159 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 160 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 161 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 162 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 163 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 164 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 165 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 166 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 167 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 168 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 169 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 170 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 171 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 172 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 173 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 174 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 175 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 176 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 177 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 178 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 179 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 180 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 181 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 182 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 183 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 184 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 185 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 186 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 187 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 188 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 189 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 190 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 191 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 192 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 193 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 194 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 195 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 196 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 197 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 198 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 199 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ed */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fe */
+    { .mk = {            0 }, .brk = {                   0 } }  /* 1ff */
+  // clang-format on
+};
 
-    /* According to the Technical Reference, bits 2 and 5 are
-       ignored if there is only 64k of RAM and there are only
-       4 pages. */
-    if (mem_size < 128)
-        masked_memctrl &= ~0x24;
-
-    if ((pcjr->memctrl & 0xc0) == 0xc0) {
-        pcjr->vram  = &ram[(masked_memctrl & 0x06) << 14];
-        pcjr->b8000 = &ram[(masked_memctrl & 0x30) << 11];
-    } else {
-        pcjr->vram  = &ram[(masked_memctrl & 0x07) << 14];
-        pcjr->b8000 = &ram[(masked_memctrl & 0x38) << 11];
-    }
-}
-
-static void
-recalc_timings(pcjr_t *pcjr)
-{
-    double _dispontime;
-    double _dispofftime;
-    double disptime;
-
-    if (pcjr->array[0] & 1) {
-        disptime    = pcjr->crtc[0] + 1;
-        _dispontime = pcjr->crtc[1];
-    } else {
-        disptime    = (pcjr->crtc[0] + 1) << 1;
-        _dispontime = pcjr->crtc[1] << 1;
-    }
-
-    _dispofftime = disptime - _dispontime;
-    _dispontime *= CGACONST;
-    _dispofftime *= CGACONST;
-    pcjr->dispontime  = (uint64_t) (_dispontime);
-    pcjr->dispofftime = (uint64_t) (_dispofftime);
-}
-
-static void
-vid_out(uint16_t addr, uint8_t val, void *priv)
-{
-    pcjr_t *pcjr = (pcjr_t *) priv;
-    uint8_t old;
-
-    switch (addr) {
-        case 0x3d0:
-        case 0x3d2:
-        case 0x3d4:
-        case 0x3d6:
-            pcjr->crtcreg = val & 0x1f;
-            return;
-
-        case 0x3d1:
-        case 0x3d3:
-        case 0x3d5:
-        case 0x3d7:
-            old                       = pcjr->crtc[pcjr->crtcreg];
-            pcjr->crtc[pcjr->crtcreg] = val & crtcmask[pcjr->crtcreg];
-            if (old != val) {
-                if (pcjr->crtcreg < 0xe || pcjr->crtcreg > 0x10) {
-                    pcjr->fullchange = changeframecount;
-                    recalc_timings(pcjr);
-                }
-            }
-            return;
-
-        case 0x3da:
-            if (!pcjr->array_ff)
-                pcjr->array_index = val & 0x1f;
-            else {
-                if (pcjr->array_index & 0x10)
-                    val &= 0x0f;
-                pcjr->array[pcjr->array_index & 0x1f] = val;
-                if (!(pcjr->array_index & 0x1f))
-                    update_cga16_color(val);
-            }
-            pcjr->array_ff = !pcjr->array_ff;
-            break;
-
-        case 0x3df:
-            pcjr->memctrl   = val;
-            pcjr->pa        = val; /* The PCjr BIOS expects the value written to 3DF to
-                                      then be readable from port 60, others it errors out
-                                      with only 64k RAM set (but somehow, still works with
-                                      128k or more RAM). */
-            pcjr->addr_mode = val >> 6;
-            recalc_address(pcjr);
-            break;
-
-        default:
-            break;
-    }
-}
-
-static uint8_t
-vid_in(uint16_t addr, void *priv)
-{
-    pcjr_t *pcjr = (pcjr_t *) priv;
-    uint8_t ret  = 0xff;
-
-    switch (addr) {
-        case 0x3d0:
-        case 0x3d2:
-        case 0x3d4:
-        case 0x3d6:
-            ret = pcjr->crtcreg;
-            break;
-
-        case 0x3d1:
-        case 0x3d3:
-        case 0x3d5:
-        case 0x3d7:
-            ret = pcjr->crtc[pcjr->crtcreg];
-            break;
-
-        case 0x3da:
-            pcjr->array_ff = 0;
-            pcjr->stat ^= 0x10;
-            ret = pcjr->stat;
-            break;
-
-        default:
-            break;
-    }
-
-    return ret;
-}
-
-static void
-vid_write(uint32_t addr, uint8_t val, void *priv)
-{
-    pcjr_t *pcjr = (pcjr_t *) priv;
-
-    if (pcjr->memctrl == -1)
-        return;
-
-    pcjr->b8000[addr & 0x3fff] = val;
-}
-
-static uint8_t
-vid_read(uint32_t addr, void *priv)
-{
-    const pcjr_t *pcjr = (pcjr_t *) priv;
-
-    if (pcjr->memctrl == -1)
-        return 0xff;
-
-    return (pcjr->b8000[addr & 0x3fff]);
-}
-
-static void
-vid_poll(void *priv)
-{
-    pcjr_t  *pcjr = (pcjr_t *) priv;
-    uint16_t ca   = (pcjr->crtc[15] | (pcjr->crtc[14] << 8)) & 0x3fff;
-    int      drawcursor;
-    int      x;
-    int      xs_temp;
-    int      ys_temp;
-    int      oldvc;
-    uint8_t  chr;
-    uint8_t  attr;
-    uint16_t dat;
-    int      cols[4];
-    int      oldsc;
-
-    if (!pcjr->linepos) {
-        timer_advance_u64(&pcjr->timer, pcjr->dispofftime);
-        pcjr->stat &= ~1;
-        pcjr->linepos = 1;
-        oldsc         = pcjr->sc;
-        if ((pcjr->crtc[8] & 3) == 3)
-            pcjr->sc = (pcjr->sc << 1) & 7;
-        if (pcjr->dispon) {
-            uint16_t offset = 0;
-            uint16_t mask   = 0x1fff;
-
-            if (pcjr->displine < pcjr->firstline) {
-                pcjr->firstline = pcjr->displine;
-                video_wait_for_buffer();
-            }
-            pcjr->lastline = pcjr->displine;
-            cols[0]        = (pcjr->array[2] & 0xf) + 16;
-            for (uint8_t c = 0; c < 8; c++) {
-                (buffer32->line[pcjr->displine])[c] = cols[0];
-                if (pcjr->array[0] & 1) {
-                    buffer32->line[pcjr->displine << 1][c + (pcjr->crtc[1] << 3) + 8] = buffer32->line[(pcjr->displine << 1) + 1][c + (pcjr->crtc[1] << 3) + 8] = cols[0];
-                } else {
-                    buffer32->line[pcjr->displine << 1][c + (pcjr->crtc[1] << 4) + 8] = buffer32->line[(pcjr->displine << 1) + 1][c + (pcjr->crtc[1] << 4) + 8] = cols[0];
-                }
-            }
-
-            switch (pcjr->addr_mode) {
-                case 0: /*Alpha*/
-                    offset = 0;
-                    mask   = 0x3fff;
-                    break;
-                case 1: /*Low resolution graphics*/
-                    offset = (pcjr->sc & 1) * 0x2000;
-                    break;
-                case 3: /*High resolution graphics*/
-                    offset = (pcjr->sc & 3) * 0x2000;
-                    break;
-
-                default:
-                    break;
-            }
-            switch ((pcjr->array[0] & 0x13) | ((pcjr->array[3] & 0x08) << 5)) {
-                case 0x13: /*320x200x16*/
-                    for (x = 0; x < pcjr->crtc[1]; x++) {
-                        dat = (pcjr->vram[((pcjr->ma << 1) & mask) + offset] << 8) | pcjr->vram[((pcjr->ma << 1) & mask) + offset + 1];
-                        pcjr->ma++;
-                        buffer32->line[pcjr->displine << 1][(x << 3) + 8] = buffer32->line[pcjr->displine << 1][(x << 3) + 9] = buffer32->line[(pcjr->displine << 1) + 1][(x << 3) + 8] = buffer32->line[(pcjr->displine << 1) + 1][(x << 3) + 9] = pcjr->array[((dat >> 12) & pcjr->array[1]) + 16] + 16;
-                        buffer32->line[pcjr->displine << 1][(x << 3) + 10] = buffer32->line[pcjr->displine << 1][(x << 3) + 11] = buffer32->line[(pcjr->displine << 1) + 1][(x << 3) + 10] = buffer32->line[(pcjr->displine << 1) + 1][(x << 3) + 11] = pcjr->array[((dat >> 8) & pcjr->array[1]) + 16] + 16;
-                        buffer32->line[pcjr->displine << 1][(x << 3) + 12] = buffer32->line[pcjr->displine << 1][(x << 3) + 13] = buffer32->line[(pcjr->displine << 1) + 1][(x << 3) + 12] = buffer32->line[(pcjr->displine << 1) + 1][(x << 3) + 13] = pcjr->array[((dat >> 4) & pcjr->array[1]) + 16] + 16;
-                        buffer32->line[pcjr->displine << 1][(x << 3) + 14] = buffer32->line[pcjr->displine << 1][(x << 3) + 15] = buffer32->line[(pcjr->displine << 1) + 1][(x << 3) + 14] = buffer32->line[(pcjr->displine << 1) + 1][(x << 3) + 15] = pcjr->array[(dat & pcjr->array[1]) + 16] + 16;
-                    }
-                    break;
-                case 0x12: /*160x200x16*/
-                    for (x = 0; x < pcjr->crtc[1]; x++) {
-                        dat = (pcjr->vram[((pcjr->ma << 1) & mask) + offset] << 8) | pcjr->vram[((pcjr->ma << 1) & mask) + offset + 1];
-                        pcjr->ma++;
-                        buffer32->line[pcjr->displine << 1][(x << 4) + 8] = buffer32->line[pcjr->displine << 1][(x << 4) + 9] = buffer32->line[pcjr->displine << 1][(x << 4) + 10] = buffer32->line[pcjr->displine << 1][(x << 4) + 11] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + 8] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + 9] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + 10] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + 11] = pcjr->array[((dat >> 12) & pcjr->array[1]) + 16] + 16;
-                        buffer32->line[pcjr->displine << 1][(x << 4) + 12] = buffer32->line[pcjr->displine << 1][(x << 4) + 13] = buffer32->line[pcjr->displine << 1][(x << 4) + 14] = buffer32->line[pcjr->displine << 1][(x << 4) + 15] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + 12] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + 13] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + 14] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + 15] = pcjr->array[((dat >> 8) & pcjr->array[1]) + 16] + 16;
-                        buffer32->line[pcjr->displine << 1][(x << 4) + 16] = buffer32->line[pcjr->displine << 1][(x << 4) + 17] = buffer32->line[pcjr->displine << 1][(x << 4) + 18] = buffer32->line[pcjr->displine << 1][(x << 4) + 19] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + 16] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + 17] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + 18] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + 19] = pcjr->array[((dat >> 4) & pcjr->array[1]) + 16] + 16;
-                        buffer32->line[pcjr->displine << 1][(x << 4) + 20] = buffer32->line[pcjr->displine << 1][(x << 4) + 21] = buffer32->line[pcjr->displine << 1][(x << 4) + 22] = buffer32->line[pcjr->displine << 1][(x << 4) + 23] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + 20] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + 21] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + 22] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + 23] = pcjr->array[(dat & pcjr->array[1]) + 16] + 16;
-                    }
-                    break;
-                case 0x03: /*640x200x4*/
-                    for (x = 0; x < pcjr->crtc[1]; x++) {
-                        dat = (pcjr->vram[((pcjr->ma << 1) & mask) + offset] << 8) | pcjr->vram[((pcjr->ma << 1) & mask) + offset + 1];
-                        pcjr->ma++;
-                        for (uint8_t c = 0; c < 8; c++) {
-                            chr = (dat >> 7) & 1;
-                            chr |= ((dat >> 14) & 2);
-                            buffer32->line[pcjr->displine << 1][(x << 3) + 8 + c] = buffer32->line[(pcjr->displine << 1) + 1][(x << 3) + 8 + c] = pcjr->array[(chr & pcjr->array[1]) + 16] + 16;
-                            dat <<= 1;
-                        }
-                    }
-                    break;
-                case 0x01: /*80 column text*/
-                    for (x = 0; x < pcjr->crtc[1]; x++) {
-                        chr        = pcjr->vram[((pcjr->ma << 1) & mask) + offset];
-                        attr       = pcjr->vram[((pcjr->ma << 1) & mask) + offset + 1];
-                        drawcursor = ((pcjr->ma == ca) && pcjr->con && pcjr->cursoron);
-                        if (pcjr->array[3] & 4) {
-                            cols[1] = pcjr->array[((attr & 15) & pcjr->array[1]) + 16] + 16;
-                            cols[0] = pcjr->array[(((attr >> 4) & 7) & pcjr->array[1]) + 16] + 16;
-                            if ((pcjr->blink & 16) && (attr & 0x80) && !drawcursor)
-                                cols[1] = cols[0];
-                        } else {
-                            cols[1] = pcjr->array[((attr & 15) & pcjr->array[1]) + 16] + 16;
-                            cols[0] = pcjr->array[((attr >> 4) & pcjr->array[1]) + 16] + 16;
-                        }
-                        if (pcjr->sc & 8) {
-                            for (uint8_t c = 0; c < 8; c++) {
-                                buffer32->line[pcjr->displine << 1][(x << 3) + c + 8] = buffer32->line[(pcjr->displine << 1) + 1][(x << 3) + c + 8] = cols[0];
-                            }
-                        } else {
-                            for (uint8_t c = 0; c < 8; c++) {
-                                buffer32->line[pcjr->displine << 1][(x << 3) + c + 8] = buffer32->line[(pcjr->displine << 1) + 1][(x << 3) + c + 8] = cols[(fontdat[chr][pcjr->sc & 7] & (1 << (c ^ 7))) ? 1 : 0];
-                            }
-                        }
-                        if (drawcursor) {
-                            for (uint8_t c = 0; c < 8; c++) {
-                                buffer32->line[pcjr->displine << 1][(x << 3) + c + 8] ^= 15;
-                                buffer32->line[(pcjr->displine << 1) + 1][(x << 3) + c + 8] ^= 15;
-                            }
-                        }
-                        pcjr->ma++;
-                    }
-                    break;
-                case 0x00: /*40 column text*/
-                    for (x = 0; x < pcjr->crtc[1]; x++) {
-                        chr        = pcjr->vram[((pcjr->ma << 1) & mask) + offset];
-                        attr       = pcjr->vram[((pcjr->ma << 1) & mask) + offset + 1];
-                        drawcursor = ((pcjr->ma == ca) && pcjr->con && pcjr->cursoron);
-                        if (pcjr->array[3] & 4) {
-                            cols[1] = pcjr->array[((attr & 15) & pcjr->array[1]) + 16] + 16;
-                            cols[0] = pcjr->array[(((attr >> 4) & 7) & pcjr->array[1]) + 16] + 16;
-                            if ((pcjr->blink & 16) && (attr & 0x80) && !drawcursor)
-                                cols[1] = cols[0];
-                        } else {
-                            cols[1] = pcjr->array[((attr & 15) & pcjr->array[1]) + 16] + 16;
-                            cols[0] = pcjr->array[((attr >> 4) & pcjr->array[1]) + 16] + 16;
-                        }
-                        pcjr->ma++;
-                        if (pcjr->sc & 8) {
-                            for (uint8_t c = 0; c < 8; c++) {
-                                buffer32->line[pcjr->displine << 1][(x << 4) + (c << 1) + 8] = buffer32->line[pcjr->displine << 1][(x << 4) + (c << 1) + 1 + 8] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + (c << 1) + 8] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + (c << 1) + 1 + 8] = cols[0];
-                            }
-                        } else {
-                            for (uint8_t c = 0; c < 8; c++) {
-                                buffer32->line[pcjr->displine << 1][(x << 4) + (c << 1) + 8] = buffer32->line[pcjr->displine << 1][(x << 4) + (c << 1) + 1 + 8] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + (c << 1) + 8] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdat[chr][pcjr->sc & 7] & (1 << (c ^ 7))) ? 1 : 0];
-                            }
-                        }
-                        if (drawcursor) {
-                            for (uint8_t c = 0; c < 16; c++) {
-                                buffer32->line[pcjr->displine << 1][(x << 4) + c + 8] ^= 15;
-                                buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + c + 8] ^= 15;
-                            }
-                        }
-                    }
-                    break;
-                case 0x02: /*320x200x4*/
-                    cols[0] = pcjr->array[0 + 16] + 16;
-                    cols[1] = pcjr->array[1 + 16] + 16;
-                    cols[2] = pcjr->array[2 + 16] + 16;
-                    cols[3] = pcjr->array[3 + 16] + 16;
-                    for (x = 0; x < pcjr->crtc[1]; x++) {
-                        dat = (pcjr->vram[((pcjr->ma << 1) & mask) + offset] << 8) | pcjr->vram[((pcjr->ma << 1) & mask) + offset + 1];
-                        pcjr->ma++;
-                        for (uint8_t c = 0; c < 8; c++) {
-                            buffer32->line[pcjr->displine << 1][(x << 4) + (c << 1) + 8] = buffer32->line[pcjr->displine << 1][(x << 4) + (c << 1) + 1 + 8] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + (c << 1) + 8] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + (c << 1) + 1 + 8] = cols[dat >> 14];
-                            dat <<= 2;
-                        }
-                    }
-                    break;
-                case 0x102: /*640x200x2*/
-                    cols[0] = pcjr->array[0 + 16] + 16;
-                    cols[1] = pcjr->array[1 + 16] + 16;
-                    for (x = 0; x < pcjr->crtc[1]; x++) {
-                        dat = (pcjr->vram[((pcjr->ma << 1) & mask) + offset] << 8) | pcjr->vram[((pcjr->ma << 1) & mask) + offset + 1];
-                        pcjr->ma++;
-                        for (uint8_t c = 0; c < 16; c++) {
-                            buffer32->line[pcjr->displine << 1][(x << 4) + c + 8] = buffer32->line[(pcjr->displine << 1) + 1][(x << 4) + c + 8] = cols[dat >> 15];
-                            dat <<= 1;
-                        }
-                    }
-                    break;
-
-                default:
-                    break;
-            }
-        } else {
-            if (pcjr->array[3] & 4) {
-                if (pcjr->array[0] & 1) {
-                    hline(buffer32, 0, (pcjr->displine << 1), (pcjr->crtc[1] << 3) + 16, (pcjr->array[2] & 0xf) + 16);
-                    hline(buffer32, 0, (pcjr->displine << 1) + 1, (pcjr->crtc[1] << 3) + 16, (pcjr->array[2] & 0xf) + 16);
-                } else {
-                    hline(buffer32, 0, (pcjr->displine << 1), (pcjr->crtc[1] << 4) + 16, (pcjr->array[2] & 0xf) + 16);
-                    hline(buffer32, 0, (pcjr->displine << 1) + 1, (pcjr->crtc[1] << 4) + 16, (pcjr->array[2] & 0xf) + 16);
-                }
-            } else {
-                cols[0] = pcjr->array[0 + 16] + 16;
-                if (pcjr->array[0] & 1) {
-                    hline(buffer32, 0, (pcjr->displine << 1), (pcjr->crtc[1] << 3) + 16, cols[0]);
-                    hline(buffer32, 0, (pcjr->displine << 1) + 1, (pcjr->crtc[1] << 3) + 16, cols[0]);
-                } else {
-                    hline(buffer32, 0, (pcjr->displine << 1), (pcjr->crtc[1] << 4) + 16, cols[0]);
-                    hline(buffer32, 0, (pcjr->displine << 1) + 1, (pcjr->crtc[1] << 4) + 16, cols[0]);
-                }
-            }
-        }
-        if (pcjr->array[0] & 1)
-            x = (pcjr->crtc[1] << 3) + 16;
-        else
-            x = (pcjr->crtc[1] << 4) + 16;
-        if (pcjr->composite) {
-            Composite_Process(pcjr->array[0], 0, x >> 2, buffer32->line[pcjr->displine << 1]);
-            Composite_Process(pcjr->array[0], 0, x >> 2, buffer32->line[(pcjr->displine << 1) + 1]);
-        } else {
-            video_process_8(x, pcjr->displine << 1);
-            video_process_8(x, (pcjr->displine << 1) + 1);
-        }
-        pcjr->sc = oldsc;
-        if (pcjr->vc == pcjr->crtc[7] && !pcjr->sc) {
-            pcjr->stat |= 8;
-        }
-        pcjr->displine++;
-        if (pcjr->displine >= 360)
-            pcjr->displine = 0;
-    } else {
-        timer_advance_u64(&pcjr->timer, pcjr->dispontime);
-        if (pcjr->dispon)
-            pcjr->stat |= 1;
-        pcjr->linepos = 0;
-        if (pcjr->vsynctime) {
-            pcjr->vsynctime--;
-            if (!pcjr->vsynctime) {
-                pcjr->stat &= ~8;
-            }
-        }
-        if (pcjr->sc == (pcjr->crtc[11] & 31) || ((pcjr->crtc[8] & 3) == 3 && pcjr->sc == ((pcjr->crtc[11] & 31) >> 1))) {
-            pcjr->con  = 0;
-            pcjr->coff = 1;
-        }
-        if (pcjr->vadj) {
-            pcjr->sc++;
-            pcjr->sc &= 31;
-            pcjr->ma = pcjr->maback;
-            pcjr->vadj--;
-            if (!pcjr->vadj) {
-                pcjr->dispon = 1;
-                pcjr->ma = pcjr->maback = (pcjr->crtc[13] | (pcjr->crtc[12] << 8)) & 0x3fff;
-                pcjr->sc                = 0;
-            }
-        } else if (pcjr->sc == pcjr->crtc[9] || ((pcjr->crtc[8] & 3) == 3 && pcjr->sc == (pcjr->crtc[9] >> 1))) {
-            pcjr->maback = pcjr->ma;
-            pcjr->sc     = 0;
-            oldvc        = pcjr->vc;
-            pcjr->vc++;
-            pcjr->vc &= 127;
-            if (pcjr->vc == pcjr->crtc[6])
-                pcjr->dispon = 0;
-            if (oldvc == pcjr->crtc[4]) {
-                pcjr->vc   = 0;
-                pcjr->vadj = pcjr->crtc[5];
-                if (!pcjr->vadj)
-                    pcjr->dispon = 1;
-                if (!pcjr->vadj)
-                    pcjr->ma = pcjr->maback = (pcjr->crtc[13] | (pcjr->crtc[12] << 8)) & 0x3fff;
-                if ((pcjr->crtc[10] & 0x60) == 0x20)
-                    pcjr->cursoron = 0;
-                else
-                    pcjr->cursoron = pcjr->blink & 16;
-            }
-            if (pcjr->vc == pcjr->crtc[7]) {
-                pcjr->dispon    = 0;
-                pcjr->displine  = 0;
-                pcjr->vsynctime = 16;
-                picint(1 << 5);
-                if (pcjr->crtc[7]) {
-                    if (pcjr->array[0] & 1)
-                        x = (pcjr->crtc[1] << 3) + 16;
-                    else
-                        x = (pcjr->crtc[1] << 4) + 16;
-                    pcjr->lastline++;
-
-                    xs_temp = x;
-                    ys_temp = (pcjr->lastline - pcjr->firstline) << 1;
-
-                    if ((xs_temp > 0) && (ys_temp > 0)) {
-                        if (xs_temp < 64)
-                            xs_temp = 656;
-                        if (ys_temp < 32)
-                            ys_temp = 400;
-                        if (!enable_overscan)
-                            xs_temp -= 16;
-
-                        if ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get()) {
-                            xsize = xs_temp;
-                            ysize = ys_temp;
-                            set_screen_size(xsize, ysize + (enable_overscan ? 16 : 0));
-
-                            if (video_force_resize_get())
-                                video_force_resize_set(0);
-                        }
-
-                        if (enable_overscan) {
-                            video_blit_memtoscreen(0, (pcjr->firstline - 4) << 1,
-                                                   xsize, ((pcjr->lastline - pcjr->firstline) + 8) << 1);
-                        } else {
-                            video_blit_memtoscreen(8, pcjr->firstline << 1,
-                                                   xsize, (pcjr->lastline - pcjr->firstline) << 1);
-                        }
-                    }
-
-                    frames++;
-                    video_res_x = xsize;
-                    video_res_y = ysize;
-                }
-                pcjr->firstline = 1000;
-                pcjr->lastline  = 0;
-                pcjr->blink++;
-            }
-        } else {
-            pcjr->sc++;
-            pcjr->sc &= 31;
-            pcjr->ma = pcjr->maback;
-        }
-        if (pcjr->sc == (pcjr->crtc[10] & 31) || ((pcjr->crtc[8] & 3) == 3 && pcjr->sc == ((pcjr->crtc[10] & 31) >> 1)))
-            pcjr->con = 1;
-    }
-}
 
 static void
 kbd_write(uint16_t port, uint8_t val, void *priv)
@@ -768,11 +756,11 @@ speed_changed(void *priv)
 {
     pcjr_t *pcjr = (pcjr_t *) priv;
 
-    recalc_timings(pcjr);
+    pcjr_recalc_timings(pcjr);
 }
 
 void
-pit_irq0_timer_pcjr(int new_out, int old_out)
+pit_irq0_timer_pcjr(int new_out, int old_out, UNUSED(void *priv))
 {
     if (new_out && !old_out) {
         picint(1);
@@ -794,11 +782,37 @@ static const device_config_t pcjr_config[] = {
         .file_filter = "",
         .spinner = { 0 },
         .selection = {
-            { .description = "RGB",       .value = PCJR_RGB       },
-            { .description = "Composite", .value = PCJR_COMPOSITE },
-            { .description = ""                                   }
+            { .description = "RGB",            .value = PCJR_RGB          },
+            { .description = "Composite",      .value = PCJR_COMPOSITE    },
+            { .description = "RGB (no brown)", .value = PCJR_RGB_NO_BROWN },
+            { .description = "RGB (IBM 5153)", .value = PCJR_RGB_IBM_5153 },
+            { .description = ""                                           }
         }
     },
+    {
+        .name           = "double_type",
+        .description    = "Line doubling type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = DOUBLE_NONE,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",                 .value = DOUBLE_NONE               },
+            { .description = "Simple doubling",      .value = DOUBLE_SIMPLE             },
+            { .description = "sRGB interpolation",   .value = DOUBLE_INTERPOLATE_SRGB   },
+            { .description = "Linear interpolation", .value = DOUBLE_INTERPOLATE_LINEAR },
+            { .description = ""                                                         }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name = "apply_hd",
+        .description = "Apply overscan deltas",
+        .type = CONFIG_BINARY,
+        .default_string = "",
+        .default_int = 1
+    },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
@@ -811,7 +825,7 @@ const device_t pcjr_device = {
     .init          = NULL,
     .close         = NULL,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = speed_changed,
     .force_redraw  = NULL,
     .config        = pcjr_config
@@ -820,7 +834,6 @@ const device_t pcjr_device = {
 int
 machine_pcjr_init(UNUSED(const machine_t *model))
 {
-    int     display_type;
     pcjr_t *pcjr;
 
     int ret;
@@ -831,13 +844,9 @@ machine_pcjr_init(UNUSED(const machine_t *model))
     if (bios_only || !ret)
         return ret;
 
-    pcjr = malloc(sizeof(pcjr_t));
-    memset(pcjr, 0x00, sizeof(pcjr_t));
-    pcjr->memctrl   = -1;
-    if (mem_size < 128)
-        pcjr->memctrl &= ~0x24;
-    display_type    = machine_get_config_int("display_type");
-    pcjr->composite = (display_type != PCJR_RGB);
+    pcjr = calloc(1, sizeof(pcjr_t));
+
+    is_pcjr = 1;
 
     pic_init_pcjr();
     pit_common_init(0, pit_irq0_timer_pcjr, NULL);
@@ -846,17 +855,11 @@ machine_pcjr_init(UNUSED(const machine_t *model))
 
     /* Initialize the video controller. */
     video_reset(gfxcard[0]);
-    loadfont("roms/video/mda/mda.rom", 0);
-    mem_mapping_add(&pcjr->mapping, 0xb8000, 0x08000,
-                    vid_read, NULL, NULL,
-                    vid_write, NULL, NULL, NULL, 0, pcjr);
-    io_sethandler(0x03d0, 16,
-                  vid_in, NULL, NULL, vid_out, NULL, NULL, pcjr);
-    timer_add(&pcjr->timer, vid_poll, pcjr, 1);
-    video_inform(VIDEO_FLAG_TYPE_CGA, &timing_dram);
+    loadfont(FONT_IBM_MDA_437_PATH, 0);
+    device_context(&pcjr_device);
+    pcjr_vid_init(pcjr);
+    device_context_restore();
     device_add_ex(&pcjr_device, pcjr);
-    cga_palette = 0;
-    cgapal_rebuild();
 
     /* Initialize the keyboard. */
     keyboard_scan   = 1;
@@ -866,7 +869,7 @@ machine_pcjr_init(UNUSED(const machine_t *model))
     io_sethandler(0x00a0, 8,
                   kbd_read, NULL, NULL, kbd_write, NULL, NULL, pcjr);
     timer_add(&pcjr->send_delay_timer, kbd_poll, pcjr, 1);
-    keyboard_set_table(scancode_xt);
+    keyboard_set_table(scancode_pcjr);
     keyboard_send = kbd_adddata_ex;
 
     /* Technically it's the SN76496N, but the SN76489 is identical to the SN76496N. */
@@ -877,7 +880,8 @@ machine_pcjr_init(UNUSED(const machine_t *model))
     device_add(&fdc_pcjr_device);
 
     device_add(&ns8250_pcjr_device);
-    serial_set_next_inst(SERIAL_MAX); /* So that serial_standalone_init() won't do anything. */
+    /* So that serial_standalone_init() won't do anything. */
+    serial_set_next_inst(SERIAL_MAX - 1);
 
     /* "All the inputs are 'read' with one 'IN' from address hex 201." - PCjr Technical Reference (Nov. 83), p.2-119
 
diff --git a/src/machine/m_ps1.c b/src/machine/m_ps1.c
index e0a15126e..c8973cbb1 100644
--- a/src/machine/m_ps1.c
+++ b/src/machine/m_ps1.c
@@ -82,6 +82,7 @@ typedef struct {
     uint8_t ps1_e0_regs[256];
 
     serial_t *uart;
+    lpt_t    *lpt;
 } ps1_t;
 
 static void
@@ -135,7 +136,7 @@ ps1_write(uint16_t port, uint8_t val, void *priv)
 
         case 0x0102:
             if (!(ps->ps1_94 & 0x80)) {
-                lpt1_remove();
+                lpt_port_remove(ps->lpt);
                 serial_remove(ps->uart);
                 if (val & 0x04) {
                     if (val & 0x08)
@@ -146,13 +147,13 @@ ps1_write(uint16_t port, uint8_t val, void *priv)
                 if (val & 0x10) {
                     switch ((val >> 5) & 3) {
                         case 0:
-                            lpt1_init(LPT_MDA_ADDR);
+                            lpt_port_setup(ps->lpt, LPT_MDA_ADDR);
                             break;
                         case 1:
-                            lpt1_init(LPT1_ADDR);
+                            lpt_port_setup(ps->lpt, LPT1_ADDR);
                             break;
                         case 2:
-                            lpt1_init(LPT2_ADDR);
+                            lpt_port_setup(ps->lpt, LPT2_ADDR);
                             break;
 
                         default:
@@ -252,7 +253,7 @@ static const device_config_t ps1_2011_config[] = {
         .default_string = "english_us",
         .default_int = 0,
         .file_filter = "",
-        .spinner = { 0 }, /*W1*/
+        .spinner = { 0 },
         .bios = {
             { .name = "English (US)", .internal_name = "english_us", .bios_type = BIOS_NORMAL,
               .files_no = 1, .local = 0, .size = 262144, .files = { "roms/machines/ibmps1es/FC0000_US.BIN", "" } },
@@ -287,10 +288,10 @@ const device_t ps1_2011_device = {
     .init          = NULL,
     .close         = NULL,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
-    .config        = &ps1_2011_config[0]
+    .config        = ps1_2011_config
 };
 
 static void
@@ -299,8 +300,7 @@ ps1_setup(int model)
     ps1_t *ps;
     void  *priv;
 
-    ps = (ps1_t *) malloc(sizeof(ps1_t));
-    memset(ps, 0x00, sizeof(ps1_t));
+    ps = (ps1_t *) calloc(1, sizeof(ps1_t));
     ps->model = model;
 
     io_sethandler(0x0091, 1,
@@ -315,45 +315,43 @@ ps1_setup(int model)
                   ps1_read, NULL, NULL, ps1_write, NULL, NULL, ps);
 
     ps->uart = device_add_inst(&ns16450_device, 1);
-
-    lpt1_remove();
-    lpt1_init(LPT_MDA_ADDR);
+    ps->lpt  = device_add_inst(&lpt_port_device, 1);
+    lpt_port_remove(ps->lpt);
+    lpt_port_setup(ps->lpt, LPT_MDA_ADDR);
 
     mem_remap_top(384);
 
-    device_add(&ps_nvr_device);
+    device_add(&fdc_ps2_device);
 
     if (model == 2011) {
-        if (!strcmp("english_us", device_get_config_bios("bios_language"))) {
-            /* US English */
-            rom_init(&ps->high_rom,
-                    device_get_bios_file(device_context_get_device(), device_get_config_bios("bios_language"), 0),
-                    0xfc0000, 0x40000, 0x3ffff, 0, MEM_MAPPING_EXTERNAL);
+        const device_t *d      = device_context_get_device();
+        const char *    bios   = device_get_config_bios("bios_language");
+        const char *    first  = device_get_bios_file(d, bios, 0);
+        const char *    second = device_get_bios_file(d, bios, 1);
 
-        } else if ((device_get_bios_file(device_context_get_device(), device_get_config_bios("bios_language"), 1)) == NULL) {
+        if (!strcmp(bios, "english_us")) {
+            /* US English */
+            rom_init(&ps->high_rom, first,
+                    0xfc0000, 0x40000, 0x3ffff, 0, MEM_MAPPING_EXTERNAL);
+        } else if (second == NULL) {
             /* Combined ROM. */
-            rom_init(&ps->high_rom,
-                        device_get_bios_file(device_context_get_device(), device_get_config_bios("bios_language"), 0),
+            rom_init(&ps->high_rom, first,
                         0xf80000, 0x80000, 0x7ffff, 0, MEM_MAPPING_EXTERNAL);
         } else {
             /* Split ROM. */
-            rom_init(&ps->mid_rom,
-                    device_get_bios_file(device_context_get_device(), device_get_config_bios("bios_language"), 0),
+            rom_init(&ps->mid_rom, first,
                     0xf80000, 0x40000, 0x3ffff, 0, MEM_MAPPING_EXTERNAL);
 
-            rom_init(&ps->high_rom,
-                    device_get_bios_file(device_context_get_device(), device_get_config_bios("bios_language"), 1),
+            rom_init(&ps->high_rom, second,
                     0xfc0000, 0x40000, 0x3ffff, 0, MEM_MAPPING_EXTERNAL);
         }
 
-        lpt2_remove();
+        lpt_set_next_inst(255);
 
         device_add(&ps1snd_device);
 
-        device_add(&fdc_at_ps1_device);
-
         /* Enable the builtin HDC. */
-        if (hdc_current == 1) {
+        if (hdc_current[0] == HDC_INTERNAL) {
             priv = device_add(&ps1_hdc_device);
 
             ps1_hdc_inform(priv, &ps->ps1_91);
@@ -378,12 +376,12 @@ ps1_setup(int model)
         if (gfxcard[0] == VID_INTERNAL)
             device_add(&ibm_ps1_2121_device);
 
-        device_add(&fdc_at_ps1_device);
-
         device_add(&ide_isa_device);
 
         device_add(&ps1snd_device);
     }
+
+    device_add(&ps_nvr_device);
 }
 
 static void
@@ -397,13 +395,22 @@ ps1_common_init(const machine_t *model)
     dma16_init();
     pic2_init();
 
-    device_add(&keyboard_ps2_ps1_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
     device_add(&port_6x_device);
 
     /* Audio uses ports 200h and 202-207h, so only initialize gameport on 201h. */
     standalone_gameport_type = &gameport_201_device;
 }
 
+uint8_t
+machine_ps1_p1_handler(void)
+{
+    const uint8_t current_drive = fdc_get_current_drive();
+
+    /* (B0 or F0) | (fdd_is_525(current_drive) on bit 6) */
+    return 0xb0 | (fdd_is_525(current_drive) ? 0x40 : 0x00);
+}
+
 int
 machine_ps1_m2011_init(const machine_t *model)
 {
diff --git a/src/machine/m_ps2_isa.c b/src/machine/m_ps2_isa.c
index fa9c5acc2..d768975d5 100644
--- a/src/machine/m_ps2_isa.c
+++ b/src/machine/m_ps2_isa.c
@@ -39,6 +39,7 @@ typedef struct {
         ps2_190;
 
     serial_t *uart;
+    lpt_t    *lpt;
 } ps2_isa_t;
 
 static void
@@ -53,7 +54,7 @@ ps2_write(uint16_t port, uint8_t val, void *priv)
 
         case 0x0102:
             if (!(ps2->ps2_94 & 0x80)) {
-                lpt1_remove();
+                lpt_port_remove(ps2->lpt);
                 serial_remove(ps2->uart);
                 if (val & 0x04) {
                     if (val & 0x08)
@@ -64,13 +65,13 @@ ps2_write(uint16_t port, uint8_t val, void *priv)
                 if (val & 0x10) {
                     switch ((val >> 5) & 3) {
                         case 0:
-                            lpt1_init(LPT_MDA_ADDR);
+                            lpt_port_setup(ps2->lpt, LPT_MDA_ADDR);
                             break;
                         case 1:
-                            lpt1_init(LPT1_ADDR);
+                            lpt_port_setup(ps2->lpt, LPT1_ADDR);
                             break;
                         case 2:
-                            lpt1_init(LPT2_ADDR);
+                            lpt_port_setup(ps2->lpt, LPT2_ADDR);
                             break;
 
                         default:
@@ -151,8 +152,7 @@ ps2_isa_setup(int model, int cpu_type)
     ps2_isa_t *ps2;
     void      *priv;
 
-    ps2 = (ps2_isa_t *) malloc(sizeof(ps2_isa_t));
-    memset(ps2, 0x00, sizeof(ps2_isa_t));
+    ps2 = (ps2_isa_t *) calloc(1, sizeof(ps2_isa_t));
     ps2->model    = model;
     ps2->cpu_type = cpu_type;
 
@@ -167,8 +167,11 @@ ps2_isa_setup(int model, int cpu_type)
 
     ps2->uart = device_add_inst(&ns16450_device, 1);
 
-    lpt1_remove();
-    lpt1_init(LPT_MDA_ADDR);
+    ps2->lpt  = device_add_inst(&lpt_port_device, 1);
+    lpt_set_ext(ps2->lpt, 1);
+
+    lpt_port_remove(ps2->lpt);
+    lpt_port_setup(ps2->lpt, LPT_MDA_ADDR);
 
     device_add(&port_92_device);
 
@@ -176,10 +179,10 @@ ps2_isa_setup(int model, int cpu_type)
 
     device_add(&ps_nvr_device);
 
-    device_add(&fdc_at_ps1_device);
+    device_add(&fdc_ps2_device);
 
     /* Enable the builtin HDC. */
-    if (hdc_current == 1) {
+    if (hdc_current[0] == HDC_INTERNAL) {
         priv = device_add(&ps1_hdc_device);
         ps1_hdc_inform(priv, &ps2->ps2_91);
     }
@@ -198,7 +201,7 @@ ps2_isa_common_init(const machine_t *model)
     dma16_init();
     pic2_init();
 
-    device_add(&keyboard_ps2_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
     device_add(&port_6x_ps2_device);
 }
 
diff --git a/src/machine/m_ps2_mca.c b/src/machine/m_ps2_mca.c
index a6fc30e1c..4a3d94ab3 100644
--- a/src/machine/m_ps2_mca.c
+++ b/src/machine/m_ps2_mca.c
@@ -67,6 +67,8 @@
 #include <86box/port_92.h>
 #include <86box/serial.h>
 #include <86box/video.h>
+#include <86box/vid_svga.h>
+#include <86box/vid_vga.h>
 #include <86box/machine.h>
 #include <86box/plat_unused.h>
 
@@ -103,6 +105,10 @@ static struct ps2_t {
     int pending_cache_miss;
 
     serial_t *uart;
+    lpt_t    *lpt;
+
+    vga_t* mb_vga;
+    int has_e0000_hole;
 } ps2;
 
 /*The model 70 type 3/4 BIOS performs cache testing. Since 86Box doesn't have any
@@ -140,7 +146,8 @@ static struct ps2_t {
 
 static uint8_t ps2_cache[65536];
 static int     ps2_cache_valid[65536 / 8];
-
+static void mem_encoding_update(void);
+// #define ENABLE_PS2_MCA_LOG 1
 #ifdef ENABLE_PS2_MCA_LOG
 int ps2_mca_do_log = ENABLE_PS2_MCA_LOG;
 
@@ -358,12 +365,120 @@ model_80_read(uint16_t port)
     return 0xff;
 }
 
+static uint8_t
+ps55_model_50t_read(uint16_t port)
+{
+    ps2_mca_log(" Read SysBrd %04X xx %04X:%04X\n", port, cs >> 4, cpu_state.pc);
+    switch (port) {
+        case 0x100:
+            return ps2.planar_id & 0xff;
+        case 0x101:
+            return ps2.planar_id >> 8;
+        case 0x102:
+            return ps2.option[0];
+        case 0x103: {
+            uint8_t val = 0xff;
+            /*
+            I/O 103h - Bit 7-4: Memory Card ID (Connector 1 or 3)
+                       Bit 3-0: Memory Card ID (Connector 2)
+
+            Memory Card ID: 7h = 2 MB Memory Card 2 or 3 Installed
+                            5h = 4 MB Memory Card 2 Installed
+            */
+            switch (mem_size / 1024) {
+                case 2:
+                    if (ps2.option[1] & 0x04)
+                        val = 0xff;
+                    else
+                        val = 0x7f;
+                    break;
+                case 4:
+                    if (ps2.option[1] & 0x04)
+                        val = 0xff;
+                    else
+                        val = 0x77;
+                    break;
+                case 6:
+                    if (ps2.option[1] & 0x04)
+                        val = 0x7f;
+                    else
+                        val = 0x77;
+                    break;
+                case 8:
+                default:
+                    if (ps2.option[1] & 0x04)
+                        val = 0x5f;
+                    else
+                        val = 0x77;
+                    break;
+            }
+            ps2_mca_log(" Read MCA %04X %02X %04X:%04X mem_size = %d, ps2option1 = %2X\n", port, val, cs >> 4, cpu_state.pc, mem_size, ps2.option[1]);
+            return val;
+        } case 0x104:
+            return ps2.option[2];
+        case 0x105:
+            return ps2.option[3];
+        case 0x106:
+            return ps2.subaddr_lo;
+        case 0x107:
+            return ps2.subaddr_hi;
+    }
+    return 0xff;
+}
+
+static uint8_t
+ps55_model_50v_read(uint16_t port)
+{
+    switch (port) {
+        case 0x100:
+            return ps2.planar_id & 0xff;
+        case 0x101:
+            return ps2.planar_id >> 8;
+        case 0x102:
+            return ps2.option[0];
+        case 0x103: {
+            uint8_t val = 0xff;
+            /*
+            I/O 103h - Bit 7-4: Reserved
+                       Bit 3-0: Memory Card ID (Connector 3 or 1)
+
+            Memory Card ID: 8h = 4 MB Memory Card IV Installed
+                            Fh = No Card Installed
+            */
+            switch (mem_size / 1024) {
+                case 4:
+                    if (ps2.option[1] & 0x04)
+                        val = 0xff;
+                    else
+                        val = 0xf8;
+                    break;
+                case 8:
+                default:
+                    if (ps2.option[1] & 0x04)
+                        val = 0xf8;
+                    else
+                        val = 0xf8;
+                    break;
+            }
+            return val;
+        } case 0x104:
+            /* Reading cache ID (bit 3-2) always returns zero */
+            return ps2.option[2] & 0xf3;
+        case 0x105:
+            return ps2.option[3];
+        case 0x106:
+            return ps2.subaddr_lo;
+        case 0x107:
+            return ps2.subaddr_hi;
+    }
+    return 0xff;
+}
 static void
 model_50_write(uint16_t port, uint8_t val)
 {
     switch (port) {
         case 0x102:
-            lpt1_remove();
+            lpt_port_remove(ps2.lpt);
             serial_remove(ps2.uart);
             if (val & 0x04) {
                 if (val & 0x08)
@@ -374,13 +489,13 @@ model_50_write(uint16_t port, uint8_t val)
             if (val & 0x10) {
                 switch ((val >> 5) & 3) {
                     case 0:
-                        lpt1_init(LPT_MDA_ADDR);
+                        lpt_port_setup(ps2.lpt, LPT_MDA_ADDR);
                         break;
                     case 1:
-                        lpt1_init(LPT1_ADDR);
+                        lpt_port_setup(ps2.lpt, LPT1_ADDR);
                         break;
                     case 2:
-                        lpt1_init(LPT2_ADDR);
+                        lpt_port_setup(ps2.lpt, LPT2_ADDR);
                         break;
 
                     default:
@@ -495,7 +610,7 @@ model_55sx_write(uint16_t port, uint8_t val)
 {
     switch (port) {
         case 0x102:
-            lpt1_remove();
+            lpt_port_remove(ps2.lpt);
             serial_remove(ps2.uart);
             if (val & 0x04) {
                 if (val & 0x08)
@@ -506,13 +621,13 @@ model_55sx_write(uint16_t port, uint8_t val)
             if (val & 0x10) {
                 switch ((val >> 5) & 3) {
                     case 0:
-                        lpt1_init(LPT_MDA_ADDR);
+                        lpt_port_setup(ps2.lpt, LPT_MDA_ADDR);
                         break;
                     case 1:
-                        lpt1_init(LPT1_ADDR);
+                        lpt_port_setup(ps2.lpt, LPT1_ADDR);
                         break;
                     case 2:
-                        lpt1_init(LPT2_ADDR);
+                        lpt_port_setup(ps2.lpt, LPT2_ADDR);
                         break;
 
                     default:
@@ -554,7 +669,7 @@ model_70_type3_write(uint16_t port, uint8_t val)
 {
     switch (port) {
         case 0x102:
-            lpt1_remove();
+            lpt_port_remove(ps2.lpt);
             serial_remove(ps2.uart);
             if (val & 0x04) {
                 if (val & 0x08)
@@ -565,13 +680,13 @@ model_70_type3_write(uint16_t port, uint8_t val)
             if (val & 0x10) {
                 switch ((val >> 5) & 3) {
                     case 0:
-                        lpt1_init(LPT_MDA_ADDR);
+                        lpt_port_setup(ps2.lpt, LPT_MDA_ADDR);
                         break;
                     case 1:
-                        lpt1_init(LPT1_ADDR);
+                        lpt_port_setup(ps2.lpt, LPT1_ADDR);
                         break;
                     case 2:
-                        lpt1_init(LPT2_ADDR);
+                        lpt_port_setup(ps2.lpt, LPT2_ADDR);
                         break;
 
                     default:
@@ -608,7 +723,7 @@ model_80_write(uint16_t port, uint8_t val)
 {
     switch (port) {
         case 0x102:
-            lpt1_remove();
+            lpt_port_remove(ps2.lpt);
             serial_remove(ps2.uart);
             if (val & 0x04) {
                 if (val & 0x08)
@@ -619,13 +734,13 @@ model_80_write(uint16_t port, uint8_t val)
             if (val & 0x10) {
                 switch ((val >> 5) & 3) {
                     case 0:
-                        lpt1_init(LPT_MDA_ADDR);
+                        lpt_port_setup(ps2.lpt, LPT_MDA_ADDR);
                         break;
                     case 1:
-                        lpt1_init(LPT1_ADDR);
+                        lpt_port_setup(ps2.lpt, LPT1_ADDR);
                         break;
                     case 2:
-                        lpt1_init(LPT2_ADDR);
+                        lpt_port_setup(ps2.lpt, LPT2_ADDR);
                         break;
 
                     default:
@@ -655,6 +770,62 @@ model_80_write(uint16_t port, uint8_t val)
     }
 }
 
+static void
+ps55_model_50tv_write(uint16_t port, uint8_t val)
+{
+    ps2_mca_log(" Write SysBrd %04X %02X %04X:%04X\n", port, val, cs >> 4, cpu_state.pc);
+    switch (port) {
+        case 0x102:
+            lpt_port_remove(ps2.lpt);
+            serial_remove(ps2.uart);
+            if (val & 0x04) {
+                if (val & 0x08)
+                    serial_setup(ps2.uart, COM1_ADDR, COM1_IRQ);
+                else
+                    serial_setup(ps2.uart, COM2_ADDR, COM2_IRQ);
+            }
+            if (val & 0x10) {
+                switch ((val >> 5) & 3) {
+                    case 0:
+                        lpt_port_setup(ps2.lpt, LPT_MDA_ADDR);
+                        break;
+                    case 1:
+                        lpt_port_setup(ps2.lpt, LPT1_ADDR);
+                        break;
+                    case 2:
+                        lpt_port_setup(ps2.lpt, LPT2_ADDR);
+                        break;
+                    default:
+                        break;
+                }
+            }
+            ps2.option[0] = val;
+            break;
+        case 0x103:
+            ps2.option[1] = val;
+            break;
+        case 0x104:
+            if ((ps2.option[2] ^ val) & 1) {
+                /* Disable/Enable E0000 - E0FFF (Make 2 KB hole for Display Adapter) */
+                ps2.option[2] = val;
+                mem_encoding_update();
+            }
+            ps2.option[2] = val;
+            break;
+        case 0x105:
+            ps2.option[3] = val;
+            break;
+        case 0x106:
+            ps2.subaddr_lo = val;
+            break;
+        case 0x107:
+            ps2.subaddr_hi = val;
+            break;
+        default:
+            break;
+    }
+}
+
 uint8_t
 ps2_mca_read(uint16_t port, UNUSED(void *priv))
 {
@@ -772,8 +943,15 @@ ps2_mca_write(uint16_t port, uint8_t val, UNUSED(void *priv))
             ps2.setup = val;
             break;
         case 0x96:
-            if ((val & 0x80) && !(ps2.adapter_setup & 0x80))
+            if ((val & 0x80) && !(ps2.adapter_setup & 0x80)) {
                 mca_reset();
+                if (ps2.has_e0000_hole) {
+                    /* Reset memstate for E0000 - E0FFFh hole (for PS/55 5550-V)
+                       5550-T does this in POST, but 5550-V doesn't. */
+                    ps2.option[2] &= 0xFE;
+                    mem_encoding_update();
+                }
+            }
             ps2.adapter_setup = val;
             mca_set_index(val & 7);
             break;
@@ -793,7 +971,16 @@ ps2_mca_write(uint16_t port, uint8_t val, UNUSED(void *priv))
             if (!(ps2.setup & PS2_SETUP_IO))
                 ps2.planar_write(port, val);
             else if (!(ps2.setup & PS2_SETUP_VGA))
+            {
+                if (ps2.mb_vga)
+                {
+                    if (vga_isenabled(ps2.mb_vga))
+                        vga_disable(ps2.mb_vga);
+                    if (val & 1)
+                        vga_enable(ps2.mb_vga);
+                }
                 ps2.pos_vga = val;
+            }
             else if (ps2.adapter_setup & PS2_ADAPTER_SETUP)
                 mca_write(port, val);
             break;
@@ -846,7 +1033,7 @@ ps2_mca_board_common_init(void)
 
     ps2.setup = 0xff;
 
-    lpt1_init(LPT_MDA_ADDR);
+    lpt_port_setup(ps2.lpt, LPT_MDA_ADDR);
 }
 
 static uint8_t
@@ -973,7 +1160,6 @@ ps2_mca_board_model_50_init(void)
 
     mem_remap_top(384);
     mca_init(4);
-    device_add(&keyboard_ps2_mca_2_device);
 
     ps2.planar_read  = model_50_read;
     ps2.planar_write = model_50_write;
@@ -994,7 +1180,6 @@ ps2_mca_board_model_60_init(void)
 
     mem_remap_top(384);
     mca_init(8);
-    device_add(&keyboard_ps2_mca_2_device);
 
     ps2.planar_read  = model_50_read;
     ps2.planar_write = model_50_write;
@@ -1054,7 +1239,6 @@ ps2_mca_board_model_55sx_init(int has_sec_nvram, int slots)
     }
 
     mca_init(slots);
-    device_add(&keyboard_ps2_device);
 
     if (has_sec_nvram)
         device_add(&ps2_nvr_55ls_device);
@@ -1117,6 +1301,11 @@ mem_encoding_update(void)
         ps2_mca_log("PS/2 Model 80-111: Split memory block disabled\n");
     }
 
+    if (ps2.has_e0000_hole && (ps2.option[2] & 1)) {
+        /* Set memstate for E0000 - E0FFFh hole (PS/55 only) */
+        mem_set_mem_state(0xe0000, 0x1000, MEM_READ_EXTERNAL | MEM_WRITE_EXTERNAL);
+    }
+
     flushmmucache_nopc();
 }
 
@@ -1228,7 +1417,6 @@ ps2_mca_board_model_70_type34_init(int is_type4, int slots)
 
     ps2.split_addr = mem_size * 1024;
     mca_init(slots);
-    device_add(&keyboard_ps2_device);
 
     ps2.planar_read  = model_70_type3_read;
     ps2.planar_write = model_70_type3_write;
@@ -1311,7 +1499,7 @@ ps2_mca_board_model_70_type34_init(int is_type4, int slots)
     }
 
     if (gfxcard[0] == VID_INTERNAL)
-        device_add(&ps1vga_mca_device);
+        ps2.mb_vga = device_add(&ps1vga_mca_device);
 }
 
 static void
@@ -1321,7 +1509,6 @@ ps2_mca_board_model_80_type2_init(void)
 
     ps2.split_addr = mem_size * 1024;
     mca_init(8);
-    device_add(&keyboard_ps2_device);
 
     ps2.planar_read  = model_80_read;
     ps2.planar_write = model_80_write;
@@ -1385,7 +1572,7 @@ ps2_mca_board_model_80_type2_init(void)
     }
 
     if (gfxcard[0] == VID_INTERNAL)
-        device_add(&ps1vga_mca_device);
+        ps2.mb_vga = device_add(&ps1vga_mca_device);
 
     ps2.split_size = 0;
 }
@@ -1395,8 +1582,8 @@ machine_ps2_common_init(const machine_t *model)
 {
     machine_common_init(model);
 
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_at_device);
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_ps2_mca_device);
 
     dma16_init();
     ps2_dma_init();
@@ -1409,28 +1596,84 @@ machine_ps2_common_init(const machine_t *model)
     nmi_mask = 0x80;
 
     ps2.uart = device_add_inst(&ns16550_device, 1);
+
+    ps2.lpt  = device_add_inst(&lpt_port_device, 1);
+    lpt_set_ext(ps2.lpt, 1);
+
+    ps2.has_e0000_hole = 0;
 }
 
+static const device_config_t ps2_model_50_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "ibmps2_m50",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "IBM PS/2 model 50", .internal_name = "ibmps2_m50", .bios_type = BIOS_NORMAL, 
+              .files_no = 4, .local = 0, .size = 131072, .files = { "roms/machines/ibmps2_m50/90x7420.zm13",
+                                                                    "roms/machines/ibmps2_m50/90x7429.zm18",
+                                                                    "roms/machines/ibmps2_m50/90x7423.zm14",
+                                                                    "roms/machines/ibmps2_m50/90x7426.zm16", "" } },
+            { .name = "IBM PS/2 model 50Z", .internal_name = "ibmps2_m50z", .bios_type = BIOS_NORMAL, 
+              .files_no = 2, .local = 0, .size = 131072, .files = { "roms/machines/ibmps2_m50/15F8366.BIN",
+                                                                    "roms/machines/ibmps2_m50/15F8365.BIN", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t ps2_model_50_device = {
+    .name          = "IBM PS/2 model 50",
+    .internal_name = "ps2_model_50_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ps2_model_50_config
+};
+
 int
 machine_ps2_model_50_init(const machine_t *model)
 {
-    int ret;
+    int ret = 0;
+    const char* fn[4];
 
-    ret = bios_load_interleaved("roms/machines/ibmps2_m50/90x7420.zm13",
-                                "roms/machines/ibmps2_m50/90x7429.zm18",
-                                0x000f0000, 131072, 0);
-    ret &= bios_load_aux_interleaved("roms/machines/ibmps2_m50/90x7423.zm14",
-                                     "roms/machines/ibmps2_m50/90x7426.zm16",
-                                     0x000e0000, 65536, 0);
-
-    if (bios_only || !ret)
+    /* No ROMs available */
+    if (!device_available(model->device))
         return ret;
 
+    device_context(model->device);
+    int is_50z = !strcmp(device_get_config_bios("bios"), "ibmps2_m50z");
+    if (is_50z) {
+        for (int i = 0; i < 2; i++)
+            fn[i] = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), i);
+        ret = bios_load_interleaved(fn[0], fn[1], 0x000e0000, 131072, 0);
+    } else {
+        for (int i = 0; i < 4; i++)
+            fn[i] = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), i);
+        ret = bios_load_interleaved(fn[0], fn[1], 0x000f0000, 131072, 0);
+        ret &= bios_load_aux_interleaved(fn[2], fn[3], 0x000e0000, 65536, 0);
+    }
+    device_context_restore();
+
     machine_ps2_common_init(model);
 
     ps2.planar_id = 0xfbff;
     ps2_mca_board_model_50_init();
 
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
     return ret;
 }
 
@@ -1454,6 +1697,8 @@ machine_ps2_model_60_init(const machine_t *model)
     ps2.planar_id = 0xf7ff;
     ps2_mca_board_model_60_init();
 
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
     return ret;
 }
 
@@ -1474,6 +1719,8 @@ machine_ps2_model_55sx_init(const machine_t *model)
     ps2.planar_id = 0xfbff;
     ps2_mca_board_model_55sx_init(0, 4);
 
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
     return ret;
 }
 
@@ -1494,6 +1741,8 @@ machine_ps2_model_65sx_init(const machine_t *model)
     ps2.planar_id = 0xe3ff;
     ps2_mca_board_model_55sx_init(1, 8);
 
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
     return ret;
 }
 
@@ -1514,6 +1763,8 @@ machine_ps2_model_70_type3_init(const machine_t *model)
     ps2.planar_id = 0xf9ff;
     ps2_mca_board_model_70_type34_init(0, 4);
 
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
     return ret;
 }
 
@@ -1534,6 +1785,8 @@ machine_ps2_model_80_init(const machine_t *model)
     ps2.planar_id = 0xfdff;
     ps2_mca_board_model_80_type2_init();
 
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
     return ret;
 }
 
@@ -1554,6 +1807,8 @@ machine_ps2_model_80_axx_init(const machine_t *model)
     ps2.planar_id = 0xfff9;
     ps2_mca_board_model_70_type34_init(0, 8);
 
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
     return ret;
 }
 
@@ -1574,5 +1829,166 @@ machine_ps2_model_70_type4_init(const machine_t *model)
     ps2.planar_id = 0xf9ff;
     ps2_mca_board_model_70_type34_init(1, 4);
 
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+static void
+ps55_mca_board_model_50t_init(void)
+{
+    ps2_mca_board_common_init();
+
+    ps2.split_addr = mem_size * 1024;
+    /* The slot 5 is reserved for the Integrated Fixed Disk II (an internal ESDI hard drive). */
+    mca_init(5);
+
+    ps2.planar_read = ps55_model_50t_read;
+    ps2.planar_write = ps55_model_50tv_write;
+
+    device_add(&ps2_nvr_device);
+
+    io_sethandler(0x00e0, 0x0002, mem_encoding_read, NULL, NULL, mem_encoding_write, NULL, NULL, NULL);
+
+    ps2.mem_regs[1] = 2;
+    ps2.option[2] &= 0xfe; /* Bit 0: Disable E0000-E0FFFh (4 KB) */
+    ps2.has_e0000_hole = 1;
+
+    mem_mapping_add(&ps2.split_mapping,
+        (mem_size + 256) * 1024,
+        256 * 1024,
+        ps2_read_split_ram,
+        ps2_read_split_ramw,
+        ps2_read_split_raml,
+        ps2_write_split_ram,
+        ps2_write_split_ramw,
+        ps2_write_split_raml,
+        &ram[0xa0000],
+        MEM_MAPPING_INTERNAL,
+        NULL);
+    mem_mapping_disable(&ps2.split_mapping);
+
+    if (mem_size > 8192) {
+        /* Only 8 MB supported on planar, create a memory expansion card for the rest */
+            ps2_mca_mem_fffc_init(8);
+    }
+
+    if (gfxcard[0] == VID_INTERNAL)
+        ps2.mb_vga = (vga_t *)device_add(&ps1vga_mca_device);
+}
+
+static void
+ps55_mca_board_model_50v_init(void)
+{
+    ps2_mca_board_common_init();
+
+    ps2.split_addr = mem_size * 1024;
+    /* The slot 5 is reserved for the Integrated Fixed Disk II (an internal ESDI hard drive). */
+    mca_init(5);
+
+    ps2.planar_read = ps55_model_50v_read;
+    ps2.planar_write = ps55_model_50tv_write;
+
+    device_add(&ps2_nvr_device);
+
+    io_sethandler(0x00e0, 0x0003, mem_encoding_read_cached, NULL, NULL, mem_encoding_write_cached, NULL, NULL, NULL);
+
+    ps2.mem_regs[1] = 2;
+    ps2.option[2] &= 0xf2; /*   Bit 3-2: -Cache IDs, Bit 1: Reserved
+                                Bit 0: Disable E0000-E0FFFh (4 KB) */
+    ps2.has_e0000_hole = 1;
+
+    mem_mapping_add(&ps2.split_mapping,
+        (mem_size + 256) * 1024,
+        256 * 1024,
+        ps2_read_split_ram,
+        ps2_read_split_ramw,
+        ps2_read_split_raml,
+        ps2_write_split_ram,
+        ps2_write_split_ramw,
+        ps2_write_split_raml,
+        &ram[0xa0000],
+        MEM_MAPPING_INTERNAL,
+        NULL);
+    mem_mapping_disable(&ps2.split_mapping);
+
+    mem_mapping_add(&ps2.cache_mapping,
+                    0,
+                    64 * 1024,
+                    ps2_read_cache_ram,
+                    ps2_read_cache_ramw,
+                    ps2_read_cache_raml,
+                    ps2_write_cache_ram,
+                    NULL,
+                    NULL,
+                    ps2_cache,
+                    MEM_MAPPING_INTERNAL,
+                    NULL);
+    mem_mapping_disable(&ps2.cache_mapping);
+
+    if (mem_size > 8192) {
+        /* Only 8 MB supported on planar, create a memory expansion card for the rest */
+            ps2_mca_mem_fffc_init(8);
+    }
+
+    if (gfxcard[0] == VID_INTERNAL)
+        ps2.mb_vga = (vga_t *)device_add(&ps1vga_mca_device);
+}
+
+int
+machine_ps55_model_50t_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ibmps55_m50t/38F6933.BIN",
+        0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_ps2_common_init(model);
+
+    /*
+    * Planar ID
+    * FFFAh - PS/55 model 5551-S0x, T0x (stage 1?)
+    * FFEEh - PS/55 model 5551-S1x, T1x (stage 2?)
+    * Verification in BIOS P/N 38F6933: FBxx -> 4 slots (error), xxEE -> 5 slots (ok), others -> 8 (error)
+    * 
+    * The only difference between S and T models is the CPU speed (16 MHz vs 20 MHz).
+    * The POST measures the speed, and sets a flag in the BIOS Data Area to indicate the sub model.
+    * The VM in 86Box runs faster than the real, so the POST always determines it as the T model.
+    */
+    ps2.planar_id = 0xffee;
+    ps55_mca_board_model_50t_init();
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
+    return ret;
+}
+
+int
+machine_ps55_model_50v_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/ibmps55_m50v/56F7416.BIN",
+                                "roms/machines/ibmps55_m50v/56F7417.BIN",
+                                0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_ps2_common_init(model);
+
+    /*
+    * Planar ID
+    * F1FFh - PS/55 model 5551-V0x, V1x
+    * Verification in BIOS P/N 56F7416,56F7417: FBxx -> 5 slots (ok), F1xx -> 5 slots (ok), others -> 8 (error)
+    */
+    ps2.planar_id = 0xf1ff;
+    ps55_mca_board_model_50v_init();
+
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
+
     return ret;
 }
diff --git a/src/machine/m_tandy.c b/src/machine/m_tandy.c
index 1d4c3303f..899e819f7 100644
--- a/src/machine/m_tandy.c
+++ b/src/machine/m_tandy.c
@@ -27,6 +27,7 @@
 #include <86box/86box.h>
 #include <86box/timer.h>
 #include <86box/io.h>
+#include <86box/pic.h>
 #include <86box/pit.h>
 #include <86box/nmi.h>
 #include <86box/mem.h>
@@ -43,15 +44,13 @@
 #include <86box/video.h>
 #include <86box/vid_cga_comp.h>
 #include <86box/machine.h>
+#include <86box/m_tandy.h>
 #include <86box/plat_unused.h>
 
-enum {
-    TANDY_RGB = 0,
-    TANDY_COMPOSITE
-};
 
 enum {
     TYPE_TANDY = 0,
+    TYPE_TANDY1000SX,
     TYPE_TANDY1000HX,
     TYPE_TANDY1000SL2
 };
@@ -63,355 +62,525 @@ enum {
     EEPROM_WRITE
 };
 
-typedef struct t1kvid_t {
-    mem_mapping_t mapping;
-    mem_mapping_t vram_mapping;
-
-    uint8_t crtc[32];
-    int     crtcreg;
-
-    int     array_index;
-    uint8_t array[256];
-    int     memctrl;
-    uint8_t mode;
-    uint8_t col;
-    uint8_t stat;
-
-    uint8_t *vram;
-    uint8_t *b8000;
-    uint32_t b8000_mask;
-    uint32_t b8000_limit;
-    uint8_t  planar_ctrl;
-
-    int      linepos;
-    int      displine;
-    int      sc;
-    int      vc;
-    int      dispon;
-    int      con;
-    int      coff;
-    int      cursoron;
-    int      blink;
-    int      fullchange;
-    int      vsynctime;
-    int      vadj;
-    uint16_t ma;
-    uint16_t maback;
-
-    uint64_t   dispontime;
-    uint64_t   dispofftime;
-    pc_timer_t timer;
-    int        firstline;
-    int        lastline;
-
-    int composite;
-} t1kvid_t;
-
-typedef struct t1keep_t {
-    char *path;
-
-    int      state;
-    int      count;
-    int      addr;
-    int      clk;
-    uint16_t data;
-    uint16_t store[64];
-} t1keep_t;
-
-typedef struct tandy_t {
-    mem_mapping_t ram_mapping;
-    mem_mapping_t rom_mapping; /* SL2 */
-
-    uint8_t *rom; /* SL2 */
-    uint8_t  ram_bank;
-    uint8_t  rom_bank;   /* SL2 */
-    int      rom_offset; /* SL2 */
-
-    uint32_t base;
-    uint32_t mask;
-    int      is_sl2;
-
-    t1kvid_t *vid;
-} tandy_t;
-
-static video_timings_t timing_dram = { VIDEO_BUS, 0, 0, 0, 0, 0, 0 }; /*No additional waitstates*/
 
 static const scancode scancode_tandy[512] = {
   // clang-format off
-    { {0},       {0}       }, { {0x01, 0}, {0x81, 0} },
-    { {0x02, 0}, {0x82, 0} }, { {0x03, 0}, {0x83, 0} },
-    { {0x04, 0}, {0x84, 0} }, { {0x05, 0}, {0x85, 0} },
-    { {0x06, 0}, {0x86, 0} }, { {0x07, 0}, {0x87, 0} },
-    { {0x08, 0}, {0x88, 0} }, { {0x09, 0}, {0x89, 0} },
-    { {0x0a, 0}, {0x8a, 0} }, { {0x0b, 0}, {0x8b, 0} },
-    { {0x0c, 0}, {0x8c, 0} }, { {0x0d, 0}, {0x8d, 0} },
-    { {0x0e, 0}, {0x8e, 0} }, { {0x0f, 0}, {0x8f, 0} },
-    { {0x10, 0}, {0x90, 0} }, { {0x11, 0}, {0x91, 0} },
-    { {0x12, 0}, {0x92, 0} }, { {0x13, 0}, {0x93, 0} },
-    { {0x14, 0}, {0x94, 0} }, { {0x15, 0}, {0x95, 0} },
-    { {0x16, 0}, {0x96, 0} }, { {0x17, 0}, {0x97, 0} },
-    { {0x18, 0}, {0x98, 0} }, { {0x19, 0}, {0x99, 0} },
-    { {0x1a, 0}, {0x9a, 0} }, { {0x1b, 0}, {0x9b, 0} },
-    { {0x1c, 0}, {0x9c, 0} }, { {0x1d, 0}, {0x9d, 0} },
-    { {0x1e, 0}, {0x9e, 0} }, { {0x1f, 0}, {0x9f, 0} },
-    { {0x20, 0}, {0xa0, 0} }, { {0x21, 0}, {0xa1, 0} },
-    { {0x22, 0}, {0xa2, 0} }, { {0x23, 0}, {0xa3, 0} },
-    { {0x24, 0}, {0xa4, 0} }, { {0x25, 0}, {0xa5, 0} },
-    { {0x26, 0}, {0xa6, 0} }, { {0x27, 0}, {0xa7, 0} },
-    { {0x28, 0}, {0xa8, 0} }, { {0x29, 0}, {0xa9, 0} },
-    { {0x2a, 0}, {0xaa, 0} }, { {0x2b, 0}, {0xab, 0} },
-    { {0x2c, 0}, {0xac, 0} }, { {0x2d, 0}, {0xad, 0} },
-    { {0x2e, 0}, {0xae, 0} }, { {0x2f, 0}, {0xaf, 0} },
-    { {0x30, 0}, {0xb0, 0} }, { {0x31, 0}, {0xb1, 0} },
-    { {0x32, 0}, {0xb2, 0} }, { {0x33, 0}, {0xb3, 0} },
-    { {0x34, 0}, {0xb4, 0} }, { {0x35, 0}, {0xb5, 0} },
-    { {0x36, 0}, {0xb6, 0} }, { {0x37, 0}, {0xb7, 0} },
-    { {0x38, 0}, {0xb8, 0} }, { {0x39, 0}, {0xb9, 0} },
-    { {0x3a, 0}, {0xba, 0} }, { {0x3b, 0}, {0xbb, 0} },
-    { {0x3c, 0}, {0xbc, 0} }, { {0x3d, 0}, {0xbd, 0} },
-    { {0x3e, 0}, {0xbe, 0} }, { {0x3f, 0}, {0xbf, 0} },
-    { {0x40, 0}, {0xc0, 0} }, { {0x41, 0}, {0xc1, 0} },
-    { {0x42, 0}, {0xc2, 0} }, { {0x43, 0}, {0xc3, 0} },
-    { {0x44, 0}, {0xc4, 0} }, { {0x45, 0}, {0xc5, 0} },
-    { {0x46, 0}, {0xc6, 0} }, { {0x47, 0}, {0xc7, 0} },
-    { {0x48, 0}, {0xc8, 0} }, { {0x49, 0}, {0xc9, 0} },
-    { {0x4a, 0}, {0xca, 0} }, { {0x4b, 0}, {0xcb, 0} },
-    { {0x4c, 0}, {0xcc, 0} }, { {0x4d, 0}, {0xcd, 0} },
-    { {0x4e, 0}, {0xce, 0} }, { {0x4f, 0}, {0xcf, 0} },
-    { {0x50, 0}, {0xd0, 0} }, { {0x51, 0}, {0xd1, 0} },
-    { {0x52, 0}, {0xd2, 0} }, { {0x56, 0}, {0xd6, 0} },
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*054*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*058*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*05c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*060*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*064*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*068*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*06c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*070*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*074*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*078*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*07c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*080*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*084*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*088*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*08c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*090*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*094*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*098*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*09c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0a0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0a4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0a8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0ac*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0b0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0b4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0b8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0bc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0c0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0c4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0c8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0cc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0d0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0d4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0d8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0dc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0e0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0e4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0e8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0ec*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0f0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0f4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0f8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0fc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*100*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*104*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*108*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*10c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*110*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*114*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*118*/
-    { {0x57, 0}, {0xd7, 0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*11c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*120*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*124*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*128*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*12c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*130*/
-    { {0},             {0} }, { {0x35, 0}, {0xb5, 0} },
-    { {0},             {0} }, { {0x37, 0}, {0xb7, 0} }, /*134*/
-    { {0x38, 0}, {0xb8, 0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*138*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*13c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*140*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0x46, 0}, {0xc6, 0} }, { {0x47, 0}, {0xc7, 0} }, /*144*/
-    { {0x29, 0}, {0xa9, 0} }, { {0x49, 0}, {0xc9, 0} },
-    { {0},             {0} }, { {0x2b, 0}, {0xab, 0} }, /*148*/
-    { {0},             {0} }, { {0x4e, 0}, {0xce, 0} },
-    { {0},             {0} }, { {0x4f, 0}, {0xcf, 0} }, /*14c*/
-    { {0x4a, 0}, {0xca, 0} }, { {0x51, 0}, {0xd1, 0} },
-    { {0x52, 0}, {0xd2, 0} }, { {0x53, 0}, {0xd3, 0} }, /*150*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*154*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*158*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*15c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*160*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*164*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*168*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*16c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*170*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*174*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*148*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*17c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*180*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*184*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*188*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*18c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*190*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*194*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*198*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*19c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1a0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1a4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1a8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1ac*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1b0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1b4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1b8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1bc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1c0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1c4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1c8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1cc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1d0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1d4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1d8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1dc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1e0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1e4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1e8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1ec*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1f0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1f4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1f8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }  /*1fc*/
+    { .mk = {            0 }, .brk = {                   0 } }, /* 000 */
+    { .mk = {      0x01, 0 }, .brk = {             0x81, 0 } }, /* 001 */
+    { .mk = {      0x02, 0 }, .brk = {             0x82, 0 } }, /* 002 */
+    { .mk = {      0x03, 0 }, .brk = {             0x83, 0 } }, /* 003 */
+    { .mk = {      0x04, 0 }, .brk = {             0x84, 0 } }, /* 004 */
+    { .mk = {      0x05, 0 }, .brk = {             0x85, 0 } }, /* 005 */
+    { .mk = {      0x06, 0 }, .brk = {             0x86, 0 } }, /* 006 */
+    { .mk = {      0x07, 0 }, .brk = {             0x87, 0 } }, /* 007 */
+    { .mk = {      0x08, 0 }, .brk = {             0x88, 0 } }, /* 008 */
+    { .mk = {      0x09, 0 }, .brk = {             0x89, 0 } }, /* 009 */
+    { .mk = {      0x0a, 0 }, .brk = {             0x8a, 0 } }, /* 00a */
+    { .mk = {      0x0b, 0 }, .brk = {             0x8b, 0 } }, /* 00b */
+    { .mk = {      0x0c, 0 }, .brk = {             0x8c, 0 } }, /* 00c */
+    { .mk = {      0x0d, 0 }, .brk = {             0x8d, 0 } }, /* 00d */
+    { .mk = {      0x0e, 0 }, .brk = {             0x8e, 0 } }, /* 00e */
+    { .mk = {      0x0f, 0 }, .brk = {             0x8f, 0 } }, /* 00f */
+    { .mk = {      0x10, 0 }, .brk = {             0x90, 0 } }, /* 010 */
+    { .mk = {      0x11, 0 }, .brk = {             0x91, 0 } }, /* 011 */
+    { .mk = {      0x12, 0 }, .brk = {             0x92, 0 } }, /* 013 */
+    { .mk = {      0x13, 0 }, .brk = {             0x93, 0 } }, /* 013 */
+    { .mk = {      0x14, 0 }, .brk = {             0x94, 0 } }, /* 014 */
+    { .mk = {      0x15, 0 }, .brk = {             0x95, 0 } }, /* 015 */
+    { .mk = {      0x16, 0 }, .brk = {             0x96, 0 } }, /* 016 */
+    { .mk = {      0x17, 0 }, .brk = {             0x97, 0 } }, /* 017 */
+    { .mk = {      0x18, 0 }, .brk = {             0x98, 0 } }, /* 018 */
+    { .mk = {      0x19, 0 }, .brk = {             0x99, 0 } }, /* 019 */
+    { .mk = {      0x1a, 0 }, .brk = {             0x9a, 0 } }, /* 01a */
+    { .mk = {      0x1b, 0 }, .brk = {             0x9b, 0 } }, /* 01b */
+    { .mk = {      0x1c, 0 }, .brk = {             0x9c, 0 } }, /* 01c */
+    { .mk = {      0x1d, 0 }, .brk = {             0x9d, 0 } }, /* 01d */
+    { .mk = {      0x1e, 0 }, .brk = {             0x9e, 0 } }, /* 01e */
+    { .mk = {      0x1f, 0 }, .brk = {             0x9f, 0 } }, /* 01f */
+    { .mk = {      0x20, 0 }, .brk = {             0xa0, 0 } }, /* 020 */
+    { .mk = {      0x21, 0 }, .brk = {             0xa1, 0 } }, /* 021 */
+    { .mk = {      0x22, 0 }, .brk = {             0xa2, 0 } }, /* 022 */
+    { .mk = {      0x23, 0 }, .brk = {             0xa3, 0 } }, /* 023 */
+    { .mk = {      0x24, 0 }, .brk = {             0xa4, 0 } }, /* 024 */
+    { .mk = {      0x25, 0 }, .brk = {             0xa5, 0 } }, /* 025 */
+    { .mk = {      0x26, 0 }, .brk = {             0xa6, 0 } }, /* 026 */
+    { .mk = {      0x27, 0 }, .brk = {             0xa7, 0 } }, /* 027 */
+    { .mk = {      0x28, 0 }, .brk = {             0xa8, 0 } }, /* 028 */
+    { .mk = {      0x29, 0 }, .brk = {             0xa9, 0 } }, /* 029 */
+    { .mk = {      0x2a, 0 }, .brk = {             0xaa, 0 } }, /* 02a */
+    { .mk = {      0x2b, 0 }, .brk = {             0xab, 0 } }, /* 02b */
+    { .mk = {      0x2c, 0 }, .brk = {             0xac, 0 } }, /* 02c */
+    { .mk = {      0x2d, 0 }, .brk = {             0xad, 0 } }, /* 02d */
+    { .mk = {      0x2e, 0 }, .brk = {             0xae, 0 } }, /* 02e */
+    { .mk = {      0x2f, 0 }, .brk = {             0xaf, 0 } }, /* 02f */
+    { .mk = {      0x30, 0 }, .brk = {             0xb0, 0 } }, /* 030 */
+    { .mk = {      0x31, 0 }, .brk = {             0xb1, 0 } }, /* 031 */
+    { .mk = {      0x32, 0 }, .brk = {             0xb2, 0 } }, /* 032 */
+    { .mk = {      0x33, 0 }, .brk = {             0xb3, 0 } }, /* 033 */
+    { .mk = {      0x34, 0 }, .brk = {             0xb4, 0 } }, /* 034 */
+    { .mk = {      0x35, 0 }, .brk = {             0xb5, 0 } }, /* 035 */
+    { .mk = {      0x36, 0 }, .brk = {             0xb6, 0 } }, /* 036 */
+    { .mk = {      0x37, 0 }, .brk = {             0xb7, 0 } }, /* 037 */
+    { .mk = {      0x38, 0 }, .brk = {             0xb8, 0 } }, /* 038 */
+    { .mk = {      0x39, 0 }, .brk = {             0xb9, 0 } }, /* 039 */
+    { .mk = {      0x3a, 0 }, .brk = {             0xba, 0 } }, /* 03a */
+    { .mk = {      0x3b, 0 }, .brk = {             0xbb, 0 } }, /* 03b */
+    { .mk = {      0x3c, 0 }, .brk = {             0xbc, 0 } }, /* 03c */
+    { .mk = {      0x3d, 0 }, .brk = {             0xbd, 0 } }, /* 03d */
+    { .mk = {      0x3e, 0 }, .brk = {             0xbe, 0 } }, /* 03e */
+    { .mk = {      0x3f, 0 }, .brk = {             0xbf, 0 } }, /* 03f */
+    { .mk = {      0x40, 0 }, .brk = {             0xc0, 0 } }, /* 040 */
+    { .mk = {      0x41, 0 }, .brk = {             0xc1, 0 } }, /* 041 */
+    { .mk = {      0x42, 0 }, .brk = {             0xc2, 0 } }, /* 042 */
+    { .mk = {      0x43, 0 }, .brk = {             0xc3, 0 } }, /* 043 */
+    { .mk = {      0x44, 0 }, .brk = {             0xc4, 0 } }, /* 044 */
+    { .mk = {      0x45, 0 }, .brk = {             0xc5, 0 } }, /* 045 */
+    { .mk = {      0x46, 0 }, .brk = {             0xc6, 0 } }, /* 046 */
+    { .mk = {      0x47, 0 }, .brk = {             0xc7, 0 } }, /* 047 */
+    { .mk = {      0x48, 0 }, .brk = {             0xc8, 0 } }, /* 048 */
+    { .mk = {      0x49, 0 }, .brk = {             0xc9, 0 } }, /* 049 */
+    { .mk = {      0x4a, 0 }, .brk = {             0xca, 0 } }, /* 04a */
+    { .mk = {      0x4b, 0 }, .brk = {             0xcb, 0 } }, /* 04b */
+    { .mk = {      0x4c, 0 }, .brk = {             0xcc, 0 } }, /* 04c */
+    { .mk = {      0x4d, 0 }, .brk = {             0xcd, 0 } }, /* 04d */
+    { .mk = {      0x4e, 0 }, .brk = {             0xce, 0 } }, /* 04e */
+    { .mk = {      0x4f, 0 }, .brk = {             0xcf, 0 } }, /* 04f */
+    { .mk = {      0x50, 0 }, .brk = {             0xd0, 0 } }, /* 050 */
+    { .mk = {      0x51, 0 }, .brk = {             0xd1, 0 } }, /* 051 */
+    { .mk = {      0x52, 0 }, .brk = {             0xd2, 0 } }, /* 052 */
+    { .mk = {      0x56, 0 }, .brk = {             0xd6, 0 } }, /* 053 */
+    { .mk = {      0x54, 0 }, .brk = {             0xd4, 0 } }, /* 054 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 055 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 056 */
+    { .mk = {      0x59, 0 }, .brk = {             0xd9, 0 } }, /* 057 */
+    { .mk = {      0x5a, 0 }, .brk = {             0xda, 0 } }, /* 058 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 059 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 060 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 061 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 062 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 063 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 064 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 065 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 066 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 067 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 068 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 069 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 070 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 071 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 072 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 073 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 074 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 075 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 076 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 077 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 078 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 079 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 080 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 081 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 082 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 083 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 084 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 085 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 086 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 087 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 088 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 089 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 090 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 091 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 092 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 093 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 094 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 095 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 096 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 097 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 098 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 099 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ed */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fe */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ff */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 100 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 101 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 102 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 103 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 104 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 105 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 106 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 107 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 108 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 109 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 110 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 111 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 112 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 113 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 114 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 115 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 116 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 117 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 118 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 119 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11b */
+    { .mk = {      0x57, 0 }, .brk = {             0xd7, 0 } }, /* 11c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 120 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 121 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 122 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 123 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 124 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 125 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 126 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 127 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 128 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 129 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 130 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 131 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 132 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 133 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 134 */
+    { .mk = {      0x35, 0 }, .brk = {             0xb5, 0 } }, /* 135 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 136 */
+    { .mk = {      0x37, 0 }, .brk = {             0xb7, 0 } }, /* 137 */
+    { .mk = {      0x38, 0 }, .brk = {             0xb8, 0 } }, /* 138 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 139 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 140 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 141 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 142 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 143 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 144 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 145 */
+    { .mk = {      0x46, 0 }, .brk = {             0xc6, 0 } }, /* 146 */
+    { .mk = {      0x58, 0 }, .brk = {             0xd8, 0 } }, /* 147 */
+    { .mk = {      0x29, 0 }, .brk = {             0xa9, 0 } }, /* 148 */
+    { .mk = {      0x49, 0 }, .brk = {             0xc9, 0 } }, /* 149 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14a */
+    { .mk = {      0x2b, 0 }, .brk = {             0xab, 0 } }, /* 14b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14c */
+    { .mk = {      0x4e, 0 }, .brk = {             0xce, 0 } }, /* 14d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14e */
+    { .mk = {      0x4f, 0 }, .brk = {             0xcf, 0 } }, /* 14f */
+    { .mk = {      0x4a, 0 }, .brk = {             0xca, 0 } }, /* 150 */
+    { .mk = {      0x51, 0 }, .brk = {             0xd1, 0 } }, /* 151 */
+    { .mk = {      0x55, 0 }, .brk = {             0xd5, 0 } }, /* 152 */
+    { .mk = {      0x53, 0 }, .brk = {             0xd3, 0 } }, /* 153 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 154 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 155 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 156 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 157 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 158 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 159 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 160 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 161 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 162 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 163 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 164 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 165 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 166 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 167 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 168 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 169 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 170 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 171 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 172 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 173 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 174 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 175 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 176 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 177 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 178 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 179 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 180 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 181 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 182 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 183 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 184 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 185 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 186 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 187 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 188 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 189 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 190 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 191 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 192 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 193 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 194 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 195 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 196 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 197 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 198 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 199 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ed */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fe */
+    { .mk = {            0 }, .brk = {                   0 } }  /* 1ff */
   // clang-format on
 };
-static uint8_t crtcmask[32] = {
-    0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x7f, 0x7f,
-    0xf3, 0x1f, 0x7f, 0x1f, 0x3f, 0xff, 0x3f, 0xff,
-    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-static uint8_t crtcmask_sl[32] = {
-    0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xff, 0xff,
-    0xf3, 0x1f, 0x7f, 0x1f, 0x3f, 0xff, 0x3f, 0xff,
-    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-static int eep_data_out;
 
-static uint8_t vid_in(uint16_t addr, void *priv);
-static void    vid_out(uint16_t addr, uint8_t val, void *priv);
+static int eep_data_out;
 
 #ifdef ENABLE_TANDY_LOG
 int tandy_do_log = ENABLE_TANDY_LOG;
@@ -431,725 +600,7 @@ tandy_log(const char *fmt, ...)
 #    define tandy_log(fmt, ...)
 #endif
 
-static void
-recalc_mapping(tandy_t *dev)
-{
-    t1kvid_t *vid = dev->vid;
 
-    mem_mapping_disable(&vid->mapping);
-    io_removehandler(0x03d0, 16,
-                     vid_in, NULL, NULL, vid_out, NULL, NULL, dev);
-
-    if (vid->planar_ctrl & 4) {
-        mem_mapping_enable(&vid->mapping);
-        if (vid->array[5] & 1)
-            mem_mapping_set_addr(&vid->mapping, 0xa0000, 0x10000);
-        else
-            mem_mapping_set_addr(&vid->mapping, 0xb8000, 0x8000);
-        io_sethandler(0x03d0, 16, vid_in, NULL, NULL, vid_out, NULL, NULL, dev);
-    }
-}
-
-static void
-recalc_timings(tandy_t *dev)
-{
-    t1kvid_t *vid = dev->vid;
-
-    double _dispontime;
-    double _dispofftime;
-    double disptime;
-
-    if (vid->mode & 1) {
-        disptime    = vid->crtc[0] + 1;
-        _dispontime = vid->crtc[1];
-    } else {
-        disptime    = (vid->crtc[0] + 1) << 1;
-        _dispontime = vid->crtc[1] << 1;
-    }
-
-    _dispofftime = disptime - _dispontime;
-    _dispontime *= CGACONST;
-    _dispofftime *= CGACONST;
-    vid->dispontime  = (uint64_t) (_dispontime);
-    vid->dispofftime = (uint64_t) (_dispofftime);
-}
-
-static void
-recalc_address(tandy_t *dev)
-{
-    t1kvid_t *vid = dev->vid;
-
-    if ((vid->memctrl & 0xc0) == 0xc0) {
-        vid->vram       = &ram[((vid->memctrl & 0x06) << 14) + dev->base];
-        vid->b8000      = &ram[((vid->memctrl & 0x30) << 11) + dev->base];
-        vid->b8000_mask = 0x7fff;
-    } else {
-        vid->vram       = &ram[((vid->memctrl & 0x07) << 14) + dev->base];
-        vid->b8000      = &ram[((vid->memctrl & 0x38) << 11) + dev->base];
-        vid->b8000_mask = 0x3fff;
-    }
-}
-
-static void
-recalc_address_sl(tandy_t *dev)
-{
-    t1kvid_t *vid = dev->vid;
-
-    vid->b8000_limit = 0x8000;
-
-    if (vid->array[5] & 1) {
-        vid->vram  = &ram[((vid->memctrl & 0x04) << 14) + dev->base];
-        vid->b8000 = &ram[((vid->memctrl & 0x20) << 11) + dev->base];
-    } else if ((vid->memctrl & 0xc0) == 0xc0) {
-        vid->vram  = &ram[((vid->memctrl & 0x06) << 14) + dev->base];
-        vid->b8000 = &ram[((vid->memctrl & 0x30) << 11) + dev->base];
-    } else {
-        vid->vram  = &ram[((vid->memctrl & 0x07) << 14) + dev->base];
-        vid->b8000 = &ram[((vid->memctrl & 0x38) << 11) + dev->base];
-        if ((vid->memctrl & 0x38) == 0x38)
-            vid->b8000_limit = 0x4000;
-    }
-}
-
-static void
-vid_out(uint16_t addr, uint8_t val, void *priv)
-{
-    tandy_t  *dev = (tandy_t *) priv;
-    t1kvid_t *vid = dev->vid;
-    uint8_t   old;
-
-    if ((addr >= 0x3d0) && (addr <= 0x3d7))
-        addr = (addr & 0xff9) | 0x004;
-
-    switch (addr) {
-        case 0x03d4:
-            vid->crtcreg = val & 0x1f;
-            break;
-
-        case 0x03d5:
-            old = vid->crtc[vid->crtcreg];
-            if (dev->is_sl2)
-                vid->crtc[vid->crtcreg] = val & crtcmask_sl[vid->crtcreg];
-            else
-                vid->crtc[vid->crtcreg] = val & crtcmask[vid->crtcreg];
-            if (old != val) {
-                if (vid->crtcreg < 0xe || vid->crtcreg > 0x10) {
-                    vid->fullchange = changeframecount;
-                    recalc_timings(dev);
-                }
-            }
-            break;
-
-        case 0x03d8:
-            vid->mode = val;
-            if (!dev->is_sl2)
-                update_cga16_color(vid->mode);
-            break;
-
-        case 0x03d9:
-            vid->col = val;
-            break;
-
-        case 0x03da:
-            vid->array_index = val & 0x1f;
-            break;
-
-        case 0x03de:
-            if (vid->array_index & 16)
-                val &= 0xf;
-            vid->array[vid->array_index & 0x1f] = val;
-            if (dev->is_sl2) {
-                if ((vid->array_index & 0x1f) == 5) {
-                    recalc_mapping(dev);
-                    recalc_address_sl(dev);
-                }
-            }
-            break;
-
-        case 0x03df:
-            vid->memctrl = val;
-            if (dev->is_sl2)
-                recalc_address_sl(dev);
-            else
-                recalc_address(dev);
-            break;
-
-        case 0x0065:
-            if (val == 8)
-                return; /*Hack*/
-            vid->planar_ctrl = val;
-            recalc_mapping(dev);
-            break;
-
-        default:
-            break;
-    }
-}
-
-static uint8_t
-vid_in(uint16_t addr, void *priv)
-{
-    const tandy_t  *dev = (tandy_t *) priv;
-    const t1kvid_t *vid = dev->vid;
-    uint8_t         ret = 0xff;
-
-    if ((addr >= 0x3d0) && (addr <= 0x3d7))
-        addr = (addr & 0xff9) | 0x004;
-
-    switch (addr) {
-        case 0x03d4:
-            ret = vid->crtcreg;
-            break;
-
-        case 0x03d5:
-            ret = vid->crtc[vid->crtcreg];
-            break;
-
-        case 0x03da:
-            ret = vid->stat;
-            break;
-
-        default:
-            break;
-    }
-
-    return ret;
-}
-
-static void
-vid_write(uint32_t addr, uint8_t val, void *priv)
-{
-    tandy_t  *dev = (tandy_t *) priv;
-    t1kvid_t *vid = dev->vid;
-
-    if (vid->memctrl == -1)
-        return;
-
-    if (dev->is_sl2) {
-        if (vid->array[5] & 1)
-            vid->b8000[addr & 0xffff] = val;
-        else {
-            if ((addr & 0x7fff) < vid->b8000_limit)
-                vid->b8000[addr & 0x7fff] = val;
-        }
-    } else {
-        vid->b8000[addr & vid->b8000_mask] = val;
-    }
-}
-
-static uint8_t
-vid_read(uint32_t addr, void *priv)
-{
-    const tandy_t  *dev = (tandy_t *) priv;
-    const t1kvid_t *vid = dev->vid;
-
-    if (vid->memctrl == -1)
-        return 0xff;
-
-    if (dev->is_sl2) {
-        if (vid->array[5] & 1)
-            return (vid->b8000[addr & 0xffff]);
-        if ((addr & 0x7fff) < vid->b8000_limit)
-            return (vid->b8000[addr & 0x7fff]);
-        else
-            return 0xff;
-    } else {
-        return (vid->b8000[addr & vid->b8000_mask]);
-    }
-}
-
-static void
-vid_poll(void *priv)
-{
-    tandy_t  *dev = (tandy_t *) priv;
-    t1kvid_t *vid = dev->vid;
-    uint16_t  ca  = (vid->crtc[15] | (vid->crtc[14] << 8)) & 0x3fff;
-    int       drawcursor;
-    int       x;
-    int       c;
-    int       xs_temp;
-    int       ys_temp;
-    int       oldvc;
-    uint8_t   chr;
-    uint8_t   attr;
-    uint16_t  dat;
-    int       cols[4];
-    int       col;
-    int       oldsc;
-
-    if (!vid->linepos) {
-        timer_advance_u64(&vid->timer, vid->dispofftime);
-        vid->stat |= 1;
-        vid->linepos = 1;
-        oldsc        = vid->sc;
-        if ((vid->crtc[8] & 3) == 3)
-            vid->sc = (vid->sc << 1) & 7;
-        if (vid->dispon) {
-            if (vid->displine < vid->firstline) {
-                vid->firstline = vid->displine;
-                video_wait_for_buffer();
-            }
-            vid->lastline = vid->displine;
-            cols[0]       = (vid->array[2] & 0xf) + 16;
-            for (c = 0; c < 8; c++) {
-                if (vid->array[3] & 4) {
-                    buffer32->line[vid->displine << 1][c] = buffer32->line[(vid->displine << 1) + 1][c] = cols[0];
-                    if (vid->mode & 1) {
-                        buffer32->line[vid->displine << 1][c + (vid->crtc[1] << 3) + 8] = buffer32->line[(vid->displine << 1) + 1][c + (vid->crtc[1] << 3) + 8] = cols[0];
-                    } else {
-                        buffer32->line[vid->displine << 1][c + (vid->crtc[1] << 4) + 8] = buffer32->line[(vid->displine << 1) + 1][c + (vid->crtc[1] << 4) + 8] = cols[0];
-                    }
-                } else if ((vid->mode & 0x12) == 0x12) {
-                    buffer32->line[vid->displine << 1][c] = buffer32->line[(vid->displine << 1) + 1][c] = 0;
-                    if (vid->mode & 1) {
-                        buffer32->line[vid->displine << 1][c + (vid->crtc[1] << 3) + 8] = buffer32->line[(vid->displine << 1) + 1][c + (vid->crtc[1] << 3) + 8] = 0;
-                    } else {
-                        buffer32->line[vid->displine << 1][c + (vid->crtc[1] << 4) + 8] = buffer32->line[(vid->displine << 1) + 1][c + (vid->crtc[1] << 4) + 8] = 0;
-                    }
-                } else {
-                    buffer32->line[vid->displine << 1][c] = buffer32->line[(vid->displine << 1) + 1][c] = (vid->col & 15) + 16;
-                    if (vid->mode & 1) {
-                        buffer32->line[vid->displine << 1][c + (vid->crtc[1] << 3) + 8] = buffer32->line[(vid->displine << 1) + 1][c + (vid->crtc[1] << 3) + 8] = (vid->col & 15) + 16;
-                    } else {
-                        buffer32->line[vid->displine << 1][c + (vid->crtc[1] << 4) + 8] = buffer32->line[(vid->displine << 1) + 1][c + (vid->crtc[1] << 4) + 8] = (vid->col & 15) + 16;
-                    }
-                }
-            }
-            if (dev->is_sl2 && (vid->array[5] & 1)) { /*640x200x16*/
-                for (x = 0; x < vid->crtc[1] * 2; x++) {
-                    dat = (vid->vram[(vid->ma << 1) & 0xffff] << 8) | vid->vram[((vid->ma << 1) + 1) & 0xffff];
-                    vid->ma++;
-                    buffer32->line[vid->displine << 1][(x << 2) + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 2) + 8] = vid->array[((dat >> 12) & 0xf) + 16] + 16;
-                    buffer32->line[vid->displine << 1][(x << 2) + 9] = buffer32->line[(vid->displine << 1) + 1][(x << 2) + 9] = vid->array[((dat >> 8) & 0xf) + 16] + 16;
-                    buffer32->line[vid->displine << 1][(x << 2) + 10] = buffer32->line[(vid->displine << 1) + 1][(x << 2) + 10] = vid->array[((dat >> 4) & 0xf) + 16] + 16;
-                    buffer32->line[vid->displine << 1][(x << 2) + 11] = buffer32->line[(vid->displine << 1) + 1][(x << 2) + 11] = vid->array[(dat & 0xf) + 16] + 16;
-                }
-            } else if ((vid->array[3] & 0x10) && (vid->mode & 1)) { /*320x200x16*/
-                for (x = 0; x < vid->crtc[1]; x++) {
-                    dat = (vid->vram[((vid->ma << 1) & 0x1fff) + ((vid->sc & 3) * 0x2000)] << 8) | vid->vram[((vid->ma << 1) & 0x1fff) + ((vid->sc & 3) * 0x2000) + 1];
-                    vid->ma++;
-                    buffer32->line[vid->displine << 1][(x << 3) + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 3) + 8] = buffer32->line[vid->displine << 1][(x << 3) + 9] = buffer32->line[(vid->displine << 1) + 1][(x << 3) + 9] = vid->array[((dat >> 12) & vid->array[1]) + 16] + 16;
-                    buffer32->line[vid->displine << 1][(x << 3) + 10] = buffer32->line[(vid->displine << 1) + 1][(x << 3) + 10] = buffer32->line[vid->displine << 1][(x << 3) + 11] = buffer32->line[(vid->displine << 1) + 1][(x << 3) + 11] = vid->array[((dat >> 8) & vid->array[1]) + 16] + 16;
-                    buffer32->line[vid->displine << 1][(x << 3) + 12] = buffer32->line[(vid->displine << 1) + 1][(x << 3) + 12] = buffer32->line[vid->displine << 1][(x << 3) + 13] = buffer32->line[(vid->displine << 1) + 1][(x << 3) + 13] = vid->array[((dat >> 4) & vid->array[1]) + 16] + 16;
-                    buffer32->line[vid->displine << 1][(x << 3) + 14] = buffer32->line[(vid->displine << 1) + 1][(x << 3) + 14] = buffer32->line[vid->displine << 1][(x << 3) + 15] = buffer32->line[(vid->displine << 1) + 1][(x << 3) + 15] = vid->array[(dat & vid->array[1]) + 16] + 16;
-                }
-            } else if (vid->array[3] & 0x10) { /*160x200x16*/
-                for (x = 0; x < vid->crtc[1]; x++) {
-                    if (dev->is_sl2) {
-                        dat = (vid->vram[((vid->ma << 1) & 0x1fff) + ((vid->sc & 1) * 0x2000)] << 8) | vid->vram[((vid->ma << 1) & 0x1fff) + ((vid->sc & 1) * 0x2000) + 1];
-                    } else {
-                        dat = (vid->vram[((vid->ma << 1) & 0x1fff) + ((vid->sc & 3) * 0x2000)] << 8) | vid->vram[((vid->ma << 1) & 0x1fff) + ((vid->sc & 3) * 0x2000) + 1];
-                    }
-                    vid->ma++;
-                    buffer32->line[vid->displine << 1][(x << 4) + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + 8] = buffer32->line[vid->displine << 1][(x << 4) + 9] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + 9] = buffer32->line[vid->displine << 1][(x << 4) + 10] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + 10] = buffer32->line[vid->displine << 1][(x << 4) + 11] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + 11] = vid->array[((dat >> 12) & vid->array[1]) + 16] + 16;
-                    buffer32->line[vid->displine << 1][(x << 4) + 12] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + 12] = buffer32->line[vid->displine << 1][(x << 4) + 13] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + 13] = buffer32->line[vid->displine << 1][(x << 4) + 14] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + 14] = buffer32->line[vid->displine << 1][(x << 4) + 15] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + 15] = vid->array[((dat >> 8) & vid->array[1]) + 16] + 16;
-                    buffer32->line[vid->displine << 1][(x << 4) + 16] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + 16] = buffer32->line[vid->displine << 1][(x << 4) + 17] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + 17] = buffer32->line[vid->displine << 1][(x << 4) + 18] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + 18] = buffer32->line[vid->displine << 1][(x << 4) + 19] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + 19] = vid->array[((dat >> 4) & vid->array[1]) + 16] + 16;
-                    buffer32->line[vid->displine << 1][(x << 4) + 20] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + 20] = buffer32->line[vid->displine << 1][(x << 4) + 21] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + 21] = buffer32->line[vid->displine << 1][(x << 4) + 22] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + 22] = buffer32->line[vid->displine << 1][(x << 4) + 23] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + 23] = vid->array[(dat & vid->array[1]) + 16] + 16;
-                }
-            } else if (vid->array[3] & 0x08) { /*640x200x4 - this implementation is a complete guess!*/
-                for (x = 0; x < vid->crtc[1]; x++) {
-                    dat = (vid->vram[((vid->ma << 1) & 0x1fff) + ((vid->sc & 3) * 0x2000)] << 8) | vid->vram[((vid->ma << 1) & 0x1fff) + ((vid->sc & 3) * 0x2000) + 1];
-                    vid->ma++;
-                    for (c = 0; c < 8; c++) {
-                        chr = (dat >> 6) & 2;
-                        chr |= ((dat >> 15) & 1);
-                        buffer32->line[vid->displine << 1][(x << 3) + 8 + c] = buffer32->line[(vid->displine << 1) + 1][(x << 3) + 8 + c] = vid->array[(chr & vid->array[1]) + 16] + 16;
-                        dat <<= 1;
-                    }
-                }
-            } else if (vid->mode & 1) {
-                for (x = 0; x < vid->crtc[1]; x++) {
-                    chr        = vid->vram[(vid->ma << 1) & 0x3fff];
-                    attr       = vid->vram[((vid->ma << 1) + 1) & 0x3fff];
-                    drawcursor = ((vid->ma == ca) && vid->con && vid->cursoron);
-                    if (vid->mode & 0x20) {
-                        cols[1] = vid->array[((attr & 15) & vid->array[1]) + 16] + 16;
-                        cols[0] = vid->array[(((attr >> 4) & 7) & vid->array[1]) + 16] + 16;
-                        if ((vid->blink & 16) && (attr & 0x80) && !drawcursor)
-                            cols[1] = cols[0];
-                    } else {
-                        cols[1] = vid->array[((attr & 15) & vid->array[1]) + 16] + 16;
-                        cols[0] = vid->array[((attr >> 4) & vid->array[1]) + 16] + 16;
-                    }
-                    if (vid->sc & 8) {
-                        for (c = 0; c < 8; c++) {
-                            buffer32->line[vid->displine << 1][(x << 3) + c + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 3) + c + 8] = cols[0];
-                        }
-                    } else {
-                        for (c = 0; c < 8; c++) {
-                            if (vid->sc == 8) {
-                                buffer32->line[vid->displine << 1][(x << 3) + c + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 3) + c + 8] = cols[(fontdat[chr][7] & (1 << (c ^ 7))) ? 1 : 0];
-                            } else {
-                                buffer32->line[vid->displine << 1][(x << 3) + c + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 3) + c + 8] = cols[(fontdat[chr][vid->sc & 7] & (1 << (c ^ 7))) ? 1 : 0];
-                            }
-                        }
-                    }
-                    if (drawcursor) {
-                        for (c = 0; c < 8; c++) {
-                            buffer32->line[vid->displine << 1][(x << 3) + c + 8] ^= 15;
-                            buffer32->line[(vid->displine << 1) + 1][(x << 3) + c + 8] ^= 15;
-                        }
-                    }
-                    vid->ma++;
-                }
-            } else if (!(vid->mode & 2)) {
-                for (x = 0; x < vid->crtc[1]; x++) {
-                    chr        = vid->vram[(vid->ma << 1) & 0x3fff];
-                    attr       = vid->vram[((vid->ma << 1) + 1) & 0x3fff];
-                    drawcursor = ((vid->ma == ca) && vid->con && vid->cursoron);
-                    if (vid->mode & 0x20) {
-                        cols[1] = vid->array[((attr & 15) & vid->array[1]) + 16] + 16;
-                        cols[0] = vid->array[(((attr >> 4) & 7) & vid->array[1]) + 16] + 16;
-                        if ((vid->blink & 16) && (attr & 0x80) && !drawcursor)
-                            cols[1] = cols[0];
-                    } else {
-                        cols[1] = vid->array[((attr & 15) & vid->array[1]) + 16] + 16;
-                        cols[0] = vid->array[((attr >> 4) & vid->array[1]) + 16] + 16;
-                    }
-                    vid->ma++;
-                    if (vid->sc & 8) {
-                        for (c = 0; c < 8; c++)
-                            buffer32->line[vid->displine << 1][(x << 4) + (c << 1) + 8] = buffer32->line[vid->displine << 1][(x << 4) + (c << 1) + 1 + 8] = cols[0];
-                    } else {
-                        for (c = 0; c < 8; c++) {
-                            if (vid->sc == 8) {
-                                buffer32->line[vid->displine << 1][(x << 4) + (c << 1) + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + (c << 1) + 8] = buffer32->line[vid->displine << 1][(x << 4) + (c << 1) + 1 + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdat[chr][7] & (1 << (c ^ 7))) ? 1 : 0];
-                            } else {
-                                buffer32->line[vid->displine << 1][(x << 4) + (c << 1) + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + (c << 1) + 8] = buffer32->line[vid->displine << 1][(x << 4) + (c << 1) + 1 + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdat[chr][vid->sc & 7] & (1 << (c ^ 7))) ? 1 : 0];
-                            }
-                        }
-                    }
-                    if (drawcursor) {
-                        for (c = 0; c < 16; c++) {
-                            buffer32->line[vid->displine << 1][(x << 4) + c + 8] ^= 15;
-                            buffer32->line[(vid->displine << 1) + 1][(x << 4) + c + 8] ^= 15;
-                        }
-                    }
-                }
-            } else if (!(vid->mode & 16)) {
-                cols[0] = (vid->col & 15);
-                col     = (vid->col & 16) ? 8 : 0;
-                if (vid->mode & 4) {
-                    cols[1] = col | 3;
-                    cols[2] = col | 4;
-                    cols[3] = col | 7;
-                } else if (vid->col & 32) {
-                    cols[1] = col | 3;
-                    cols[2] = col | 5;
-                    cols[3] = col | 7;
-                } else {
-                    cols[1] = col | 2;
-                    cols[2] = col | 4;
-                    cols[3] = col | 6;
-                }
-                cols[0] = vid->array[(cols[0] & vid->array[1]) + 16] + 16;
-                cols[1] = vid->array[(cols[1] & vid->array[1]) + 16] + 16;
-                cols[2] = vid->array[(cols[2] & vid->array[1]) + 16] + 16;
-                cols[3] = vid->array[(cols[3] & vid->array[1]) + 16] + 16;
-                for (x = 0; x < vid->crtc[1]; x++) {
-                    dat = (vid->vram[((vid->ma << 1) & 0x1fff) + ((vid->sc & 1) * 0x2000)] << 8) | vid->vram[((vid->ma << 1) & 0x1fff) + ((vid->sc & 1) * 0x2000) + 1];
-                    vid->ma++;
-                    for (c = 0; c < 8; c++) {
-                        buffer32->line[vid->displine << 1][(x << 4) + (c << 1) + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + (c << 1) + 8] = buffer32->line[vid->displine << 1][(x << 4) + (c << 1) + 1 + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + (c << 1) + 1 + 8] = cols[dat >> 14];
-                        dat <<= 2;
-                    }
-                }
-            } else {
-                cols[0] = 0;
-                cols[1] = vid->array[(vid->col & vid->array[1]) + 16] + 16;
-                for (x = 0; x < vid->crtc[1]; x++) {
-                    dat = (vid->vram[((vid->ma << 1) & 0x1fff) + ((vid->sc & 1) * 0x2000)] << 8) | vid->vram[((vid->ma << 1) & 0x1fff) + ((vid->sc & 1) * 0x2000) + 1];
-                    vid->ma++;
-                    for (c = 0; c < 16; c++) {
-                        buffer32->line[vid->displine << 1][(x << 4) + c + 8] = buffer32->line[(vid->displine << 1) + 1][(x << 4) + c + 8] = cols[dat >> 15];
-                        dat <<= 1;
-                    }
-                }
-            }
-        } else {
-            if (vid->array[3] & 4) {
-                if (vid->mode & 1) {
-                    hline(buffer32, 0, (vid->displine << 1), (vid->crtc[1] << 3) + 16, (vid->array[2] & 0xf) + 16);
-                    hline(buffer32, 0, (vid->displine << 1) + 1, (vid->crtc[1] << 3) + 16, (vid->array[2] & 0xf) + 16);
-                } else {
-                    hline(buffer32, 0, (vid->displine << 1), (vid->crtc[1] << 4) + 16, (vid->array[2] & 0xf) + 16);
-                    hline(buffer32, 0, (vid->displine << 1) + 1, (vid->crtc[1] << 4) + 16, (vid->array[2] & 0xf) + 16);
-                }
-            } else {
-                cols[0] = ((vid->mode & 0x12) == 0x12) ? 0 : (vid->col & 0xf) + 16;
-                if (vid->mode & 1) {
-                    hline(buffer32, 0, (vid->displine << 1), (vid->crtc[1] << 3) + 16, cols[0]);
-                    hline(buffer32, 0, (vid->displine << 1) + 1, (vid->crtc[1] << 3) + 16, cols[0]);
-                } else {
-                    hline(buffer32, 0, (vid->displine << 1), (vid->crtc[1] << 4) + 16, cols[0]);
-                    hline(buffer32, 0, (vid->displine << 1) + 1, (vid->crtc[1] << 4) + 16, cols[0]);
-                }
-            }
-        }
-
-        if (vid->mode & 1)
-            x = (vid->crtc[1] << 3) + 16;
-        else
-            x = (vid->crtc[1] << 4) + 16;
-        if (!dev->is_sl2 && vid->composite) {
-            Composite_Process(vid->mode, 0, x >> 2, buffer32->line[vid->displine << 1]);
-            Composite_Process(vid->mode, 0, x >> 2, buffer32->line[(vid->displine << 1) + 1]);
-        } else {
-            video_process_8(x, vid->displine << 1);
-            video_process_8(x, (vid->displine << 1) + 1);
-        }
-        vid->sc = oldsc;
-        if (vid->vc == vid->crtc[7] && !vid->sc)
-            vid->stat |= 8;
-        vid->displine++;
-        if (vid->displine >= 360)
-            vid->displine = 0;
-    } else {
-        timer_advance_u64(&vid->timer, vid->dispontime);
-        if (vid->dispon)
-            vid->stat &= ~1;
-        vid->linepos = 0;
-        if (vid->vsynctime) {
-            vid->vsynctime--;
-            if (!vid->vsynctime)
-                vid->stat &= ~8;
-        }
-        if (vid->sc == (vid->crtc[11] & 31) || ((vid->crtc[8] & 3) == 3 && vid->sc == ((vid->crtc[11] & 31) >> 1))) {
-            vid->con  = 0;
-            vid->coff = 1;
-        }
-        if (vid->vadj) {
-            vid->sc++;
-            vid->sc &= 31;
-            vid->ma = vid->maback;
-            vid->vadj--;
-            if (!vid->vadj) {
-                vid->dispon = 1;
-                if (dev->is_sl2 && (vid->array[5] & 1))
-                    vid->ma = vid->maback = vid->crtc[13] | (vid->crtc[12] << 8);
-                else
-                    vid->ma = vid->maback = (vid->crtc[13] | (vid->crtc[12] << 8)) & 0x3fff;
-                vid->sc = 0;
-            }
-        } else if (vid->sc == vid->crtc[9] || ((vid->crtc[8] & 3) == 3 && vid->sc == (vid->crtc[9] >> 1))) {
-            vid->maback = vid->ma;
-            vid->sc     = 0;
-            oldvc       = vid->vc;
-            vid->vc++;
-            if (dev->is_sl2)
-                vid->vc &= 255;
-            else
-                vid->vc &= 127;
-            if (vid->vc == vid->crtc[6])
-                vid->dispon = 0;
-            if (oldvc == vid->crtc[4]) {
-                vid->vc   = 0;
-                vid->vadj = vid->crtc[5];
-                if (!vid->vadj)
-                    vid->dispon = 1;
-                if (!vid->vadj) {
-                    if (dev->is_sl2 && (vid->array[5] & 1))
-                        vid->ma = vid->maback = vid->crtc[13] | (vid->crtc[12] << 8);
-                    else
-                        vid->ma = vid->maback = (vid->crtc[13] | (vid->crtc[12] << 8)) & 0x3fff;
-                }
-                if ((vid->crtc[10] & 0x60) == 0x20)
-                    vid->cursoron = 0;
-                else
-                    vid->cursoron = vid->blink & 16;
-            }
-            if (vid->vc == vid->crtc[7]) {
-                vid->dispon    = 0;
-                vid->displine  = 0;
-                vid->vsynctime = 16;
-                if (vid->crtc[7]) {
-                    if (vid->mode & 1)
-                        x = (vid->crtc[1] << 3) + 16;
-                    else
-                        x = (vid->crtc[1] << 4) + 16;
-                    vid->lastline++;
-
-                    xs_temp = x;
-                    ys_temp = (vid->lastline - vid->firstline) << 1;
-
-                    if ((xs_temp > 0) && (ys_temp > 0)) {
-                        if (xs_temp < 64)
-                            xs_temp = 656;
-                        if (ys_temp < 32)
-                            ys_temp = 400;
-                        if (!enable_overscan)
-                            xs_temp -= 16;
-
-                        if ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get()) {
-                            xsize = xs_temp;
-                            ysize = ys_temp;
-                            set_screen_size(xsize, ysize + (enable_overscan ? 16 : 0));
-
-                            if (video_force_resize_get())
-                                video_force_resize_set(0);
-                        }
-
-                        if (enable_overscan) {
-                            video_blit_memtoscreen(0, (vid->firstline - 4) << 1,
-                                                   xsize, ((vid->lastline - vid->firstline) + 8) << 1);
-                        } else {
-                            video_blit_memtoscreen(8, vid->firstline << 1,
-                                                   xsize, (vid->lastline - vid->firstline) << 1);
-                        }
-                    }
-
-                    frames++;
-
-                    video_res_x = xsize;
-                    video_res_y = ysize;
-                    if ((vid->array[3] & 0x10) && (vid->mode & 1)) { /*320x200x16*/
-                        video_res_x /= 2;
-                        video_bpp = 4;
-                    } else if (vid->array[3] & 0x10) { /*160x200x16*/
-                        video_res_x /= 4;
-                        video_bpp = 4;
-                    } else if (vid->array[3] & 0x08) { /*640x200x4 - this implementation is a complete guess!*/
-                        video_bpp = 2;
-                    } else if (vid->mode & 1) {
-                        video_res_x /= 8;
-                        video_res_y /= vid->crtc[9] + 1;
-                        video_bpp = 0;
-                    } else if (!(vid->mode & 2)) {
-                        video_res_x /= 16;
-                        video_res_y /= vid->crtc[9] + 1;
-                        video_bpp = 0;
-                    } else if (!(vid->mode & 16)) {
-                        video_res_x /= 2;
-                        video_bpp = 2;
-                    } else {
-                        video_bpp = 1;
-                    }
-                }
-                vid->firstline = 1000;
-                vid->lastline  = 0;
-                vid->blink++;
-            }
-        } else {
-            vid->sc++;
-            vid->sc &= 31;
-            vid->ma = vid->maback;
-        }
-        if (vid->sc == (vid->crtc[10] & 31) || ((vid->crtc[8] & 3) == 3 && vid->sc == ((vid->crtc[10] & 31) >> 1)))
-            vid->con = 1;
-    }
-}
-
-static void
-vid_speed_changed(void *priv)
-{
-    tandy_t *dev = (tandy_t *) priv;
-
-    recalc_timings(dev);
-}
-
-static void
-vid_close(void *priv)
-{
-    tandy_t *dev = (tandy_t *) priv;
-
-    free(dev->vid);
-    dev->vid = NULL;
-}
-
-static void
-vid_init(tandy_t *dev)
-{
-    int       display_type;
-    t1kvid_t *vid;
-
-    vid = malloc(sizeof(t1kvid_t));
-    memset(vid, 0x00, sizeof(t1kvid_t));
-    vid->memctrl = -1;
-    dev->vid     = vid;
-
-    video_inform(VIDEO_FLAG_TYPE_CGA, &timing_dram);
-
-    display_type   = machine_get_config_int("display_type");
-    vid->composite = (display_type != TANDY_RGB);
-
-    cga_comp_init(1);
-
-    if (dev->is_sl2) {
-        vid->b8000_limit = 0x8000;
-        vid->planar_ctrl = 4;
-        overscan_x = overscan_y = 16;
-
-        io_sethandler(0x0065, 1, vid_in, NULL, NULL, vid_out, NULL, NULL, dev);
-    } else
-        vid->b8000_mask = 0x3fff;
-    timer_add(&vid->timer, vid_poll, dev, 1);
-    mem_mapping_add(&vid->mapping, 0xb8000, 0x08000,
-                    vid_read, NULL, NULL, vid_write, NULL, NULL, NULL, 0, dev);
-    io_sethandler(0x03d0, 16,
-                  vid_in, NULL, NULL, vid_out, NULL, NULL, dev);
-}
-
-const device_config_t vid_config[] = {
-  // clang-format off
-    {
-        .name = "display_type",
-        .description = "Display type",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = TANDY_RGB,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "RGB",       .value = TANDY_RGB       },
-            { .description = "Composite", .value = TANDY_COMPOSITE },
-            { .description = ""                                    }
-        }
-    },
-    { .name = "", .description = "", .type = CONFIG_END }
-  // clang-format on
-};
-
-const device_t vid_device = {
-    .name          = "Tandy 1000",
-    .internal_name = "tandy1000_video",
-    .flags         = 0,
-    .local         = 0,
-    .init          = NULL,
-    .close         = vid_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = vid_speed_changed,
-    .force_redraw  = NULL,
-    .config        = vid_config
-};
-
-const device_t vid_device_hx = {
-    .name          = "Tandy 1000 HX",
-    .internal_name = "tandy1000_hx_video",
-    .flags         = 0,
-    .local         = 0,
-    .init          = NULL,
-    .close         = vid_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = vid_speed_changed,
-    .force_redraw  = NULL,
-    .config        = vid_config
-};
-
-const device_t vid_device_sl = {
-    .name          = "Tandy 1000SL2",
-    .internal_name = "tandy1000_sl_video",
-    .flags         = 0,
-    .local         = 1,
-    .init          = NULL,
-    .close         = vid_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = vid_speed_changed,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
 
 static void
 eep_write(UNUSED(uint16_t addr), uint8_t val, void *priv)
@@ -1241,8 +692,7 @@ eep_init(const device_t *info)
     t1keep_t *eep;
     FILE     *fp = NULL;
 
-    eep = (t1keep_t *) malloc(sizeof(t1keep_t));
-    memset(eep, 0x00, sizeof(t1keep_t));
+    eep = (t1keep_t *) calloc(1, sizeof(t1keep_t));
 
     switch (info->local) {
         case TYPE_TANDY1000HX:
@@ -1293,7 +743,7 @@ static const device_t eep_1000hx_device = {
     .init          = eep_init,
     .close         = eep_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1307,7 +757,7 @@ static const device_t eep_1000sl2_device = {
     .init          = eep_init,
     .close         = eep_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1320,12 +770,12 @@ tandy_write(uint16_t addr, uint8_t val, void *priv)
 
     switch (addr) {
         case 0x00a0:
-            if (val & 0x10) {
+            if (dev->is_hx && (val & 0x10)) {
                 dev->base = (mem_size - 256) * 1024;
                 dev->mask = 0x3ffff;
                 mem_mapping_set_addr(&ram_low_mapping, 0, dev->base);
                 mem_mapping_set_addr(&dev->ram_mapping,
-                                     ((val >> 1) & 7) * 128 * 1024, 0x40000);
+                                     (((val >> 1) & 7) - 1) * 128 * 1024, 0x40000);
             } else {
                 dev->base = (mem_size - 128) * 1024;
                 dev->mask = 0x1ffff;
@@ -1333,6 +783,22 @@ tandy_write(uint16_t addr, uint8_t val, void *priv)
                 mem_mapping_set_addr(&dev->ram_mapping,
                                      ((val >> 1) & 7) * 128 * 1024, 0x20000);
             }
+            if (dev->is_hx) {
+                io_removehandler(0x03d0, 16,
+                                 tandy_vid_in, NULL, NULL, tandy_vid_out, NULL, NULL, dev);
+                if (val & 0x01)
+                    mem_mapping_disable(&dev->vid->mapping);
+                else {
+                    io_sethandler(0x03d0, 16,
+                                  tandy_vid_in, NULL, NULL, tandy_vid_out, NULL, NULL, dev);
+                    mem_mapping_set_addr(&dev->vid->mapping, 0xb8000, 0x8000);
+                }
+            } else {
+                if (val & 0x01)
+                    mem_mapping_set_addr(&dev->vid->mapping, 0xc0000, 0x10000);
+                else
+                    mem_mapping_set_addr(&dev->vid->mapping, 0xb8000, 0x8000);
+            }
             dev->ram_bank = val;
             break;
 
@@ -1343,7 +809,7 @@ tandy_write(uint16_t addr, uint8_t val, void *priv)
                 mem_mapping_set_addr(&dev->ram_mapping,
                                      ((val >> 1) & 7) * 128 * 1024,
                                      0x20000);
-            recalc_address_sl(dev);
+            tandy_recalc_address_sl(dev);
             dev->ram_bank = val;
             break;
 
@@ -1462,8 +928,7 @@ machine_tandy1k_init(const machine_t *model, int type)
 {
     tandy_t *dev;
 
-    dev = malloc(sizeof(tandy_t));
-    memset(dev, 0x00, sizeof(tandy_t));
+    dev = calloc(1, sizeof(tandy_t));
 
     machine_common_init(model);
 
@@ -1480,29 +945,35 @@ machine_tandy1k_init(const machine_t *model, int type)
                     MEM_MAPPING_INTERNAL, dev);
     mem_mapping_set_addr(&ram_low_mapping, 0, dev->base);
 
-    device_add(&keyboard_tandy_device);
+    device_add(&kbc_tandy_device);
 
-    if (fdc_type == FDC_INTERNAL)
+    if (fdc_current[0] == FDC_INTERNAL)
         device_add(&fdc_xt_tandy_device);
 
     video_reset(gfxcard[0]);
 
     switch (type) {
         case TYPE_TANDY:
+        case TYPE_TANDY1000SX:
             keyboard_set_table(scancode_tandy);
             io_sethandler(0x00a0, 1,
                           tandy_read, NULL, NULL, tandy_write, NULL, NULL, dev);
-            vid_init(dev);
-            device_add_ex(&vid_device, dev);
-            device_add(&sn76489_device);
+            device_context(&tandy_1000_video_device);
+            tandy_vid_init(dev);
+            device_context_restore();
+            device_add_ex(&tandy_1000_video_device, dev);
+            device_add((type == TYPE_TANDY1000SX) ? &ncr8496_device : &sn76489_device);
             break;
 
         case TYPE_TANDY1000HX:
+            dev->is_hx = 1;
             keyboard_set_table(scancode_tandy);
             io_sethandler(0x00a0, 1,
                           tandy_read, NULL, NULL, tandy_write, NULL, NULL, dev);
-            vid_init(dev);
-            device_add_ex(&vid_device, dev);
+            device_context(&tandy_1000hx_video_device);
+            tandy_vid_init(dev);
+            device_context_restore();
+            device_add_ex(&tandy_1000hx_video_device, dev);
             device_add(&ncr8496_device);
             device_add(&eep_1000hx_device);
             break;
@@ -1512,8 +983,10 @@ machine_tandy1k_init(const machine_t *model, int type)
             init_rom(dev);
             io_sethandler(0xffe8, 8,
                           tandy_read, NULL, NULL, tandy_write, NULL, NULL, dev);
-            vid_init(dev);
-            device_add_ex(&vid_device_sl, dev);
+            device_context(&tandy_1000sl_video_device);
+            tandy_vid_init(dev);
+            device_context_restore();
+            device_add_ex(&tandy_1000sl_video_device, dev);
             device_add(&pssj_device);
             device_add(&eep_1000sl2_device);
             break;
@@ -1522,7 +995,7 @@ machine_tandy1k_init(const machine_t *model, int type)
             break;
     }
 
-    standalone_gameport_type = &gameport_device;
+    standalone_gameport_type = &gameport_200_device;
 
     eep_data_out = 0x0000;
 }
@@ -1534,7 +1007,7 @@ tandy1k_eeprom_read(void)
 }
 
 int
-machine_tandy_init(const machine_t *model)
+machine_tandy1000sx_init(const machine_t *model)
 {
     int ret;
 
@@ -1544,7 +1017,7 @@ machine_tandy_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_tandy1k_init(model, TYPE_TANDY);
+    machine_tandy1k_init(model, TYPE_TANDY1000SX);
 
     return ret;
 }
diff --git a/src/machine/m_v86p.c b/src/machine/m_v86p.c
index 54af9b053..fbe7296f8 100644
--- a/src/machine/m_v86p.c
+++ b/src/machine/m_v86p.c
@@ -86,15 +86,15 @@ machine_v86p_init(const machine_t *model)
     device_add(&ct_82c100_device);
     device_add(&f82c606_device);
 
-    device_add(&keyboard_xt_device);
+    device_add(&kbc_xt_device);
 
-    if (fdc_type == FDC_INTERNAL)
+    if (fdc_current[0] == FDC_INTERNAL)
         device_add(&fdc_xt_device);
 
     if (gfxcard[0] == VID_INTERNAL)
         device_add(&f82c425_video_device);
 
-    if (hdc_current <= 1)
+    if (hdc_current[0] <= HDC_INTERNAL)
         device_add(&st506_xt_victor_v86p_device);
 
     return ret;
diff --git a/src/machine/m_xt.c b/src/machine/m_xt.c
index 9a0b39a89..954483d62 100644
--- a/src/machine/m_xt.c
+++ b/src/machine/m_xt.c
@@ -1,3 +1,23 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of PC and XT machines.
+ *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *          Fred N. van Kempen, <decwiz@yahoo.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
+ *
+ *          Copyright 2008-2025 Sarah Walker.
+ *          Copyright 2016-2025 Miran Grca.
+ *          Copyright 2017-2025 Fred N. van Kempen.
+ *          Copyright 2025      Jasmine Iwanek.
+ */
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
@@ -11,78 +31,130 @@
 #include <86box/fdd.h>
 #include <86box/fdc.h>
 #include <86box/fdc_ext.h>
+#include <86box/lpt.h>
 #include <86box/hdc.h>
 #include <86box/gameport.h>
+#include <86box/serial.h>
+#include <86box/sio.h>
 #include <86box/ibm_5161.h>
 #include <86box/keyboard.h>
 #include <86box/rom.h>
 #include <86box/machine.h>
+#include <86box/nvr.h>
 #include <86box/chipset.h>
 #include <86box/port_6x.h>
+#include <86box/video.h>
 
 extern const device_t vendex_xt_rtc_onboard_device;
 
+/* 8088 */
 static void
-machine_xt_common_init(const machine_t *model)
+machine_xt_common_init(const machine_t *model, int fixed_floppy)
 {
+    if ((fdc_current[0] == FDC_INTERNAL) || fixed_floppy)
+        device_add(&fdc_xt_device);
+
     machine_common_init(model);
 
     pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_xt);
 
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_xt_device);
-
     nmi_init();
-    standalone_gameport_type = &gameport_device;
+    standalone_gameport_type = &gameport_200_device;
 }
 
+static const device_config_t ibmpc_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "ibm5150_5700671",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "5700671 (10/19/81)", .internal_name = "ibm5150_5700671", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 40960, .files = { "roms/machines/ibmpc/BIOS_IBM5150_19OCT81_5700671_U33.BIN", "" } },
+            { .name = "5700051 (04/24/81)", .internal_name = "ibm5150_5700051", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 40960, .files = { "roms/machines/ibmpc/BIOS_IBM5150_24APR81_5700051_U33.BIN", "" } },
+
+            // GLaBIOS for IBM PC
+            { .name = "GLaBIOS 0.4.0 (8088)", .internal_name = "glabios_040_8088", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 40960, .files = { "roms/machines/glabios/GLABIOS_0.4.0_8P.ROM", "" } },
+            { .name = "GLaBIOS 0.4.0 (V20)", .internal_name = "glabios_040_v20", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 40960, .files = { "roms/machines/glabios/GLABIOS_0.4.0_VP.ROM", "" } },
+
+            // The following are Diagnostic ROMs.
+            { .name = "Supersoft Diagnostics", .internal_name = "diag_supersoft", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 40960, .files = { "roms/machines/diagnostic/Supersoft_PCXT_8KB.bin", "" } },
+            { .name = "Ruud's Diagnostic Rom", .internal_name = "diag_ruuds", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 40960, .files = { "roms/machines/diagnostic/ruuds_diagnostic_rom_v5.4_8kb.bin", "" } },
+            { .name = "XT RAM Test", .internal_name = "diag_xtramtest", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 40960, .files = { "roms/machines/diagnostic/xtramtest_8k.bin", "" } },
+            { .files_no = 0 }
+        },
+    },
+    {
+        .name = "enable_5161",
+        .description = "IBM 5161 Expansion Unit",
+        .type = CONFIG_BINARY,
+        .default_int = 0
+    },
+    {
+        .name = "enable_basic",
+        .description = "IBM Cassette Basic",
+        .type = CONFIG_BINARY,
+        .default_int = 1
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t ibmpc_device = {
+    .name          = "IBM PC (1981)",
+    .internal_name = "ibmpc_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ibmpc_config
+};
+
 int
-machine_pc_init(const machine_t *model)
+machine_ibmpc_init(const machine_t *model)
 {
-    int ret;
+    int         ret = 0;
+    int         ret2;
+    uint8_t     enable_5161;
+    uint8_t     enable_basic;
+    const char *fn;
 
-    ret = bios_load_linear("roms/machines/ibmpc/BIOS_5150_24APR81_U33.BIN",
-                           0x000fe000, 40960, 0);
-    if (ret) {
-        bios_load_aux_linear("roms/machines/ibmpc/IBM 5150 - Cassette BASIC version C1.00 - U29 - 5700019.bin",
-                             0x000f6000, 8192, 0);
-        bios_load_aux_linear("roms/machines/ibmpc/IBM 5150 - Cassette BASIC version C1.00 - U30 - 5700027.bin",
-                             0x000f8000, 8192, 0);
-        bios_load_aux_linear("roms/machines/ibmpc/IBM 5150 - Cassette BASIC version C1.00 - U31 - 5700035.bin",
-                             0x000fa000, 8192, 0);
-        bios_load_aux_linear("roms/machines/ibmpc/IBM 5150 - Cassette BASIC version C1.00 - U32 - 5700043.bin",
-                             0x000fc000, 8192, 0);
-    }
-
-    if (bios_only || !ret)
+    /* No ROMs available. */
+    if (!device_available(model->device))
         return ret;
 
-    device_add(&keyboard_pc_device);
+    device_context(model->device);
+    enable_5161  = machine_get_config_int("enable_5161");
+    enable_basic = machine_get_config_int("enable_basic");
+    fn           = device_get_bios_file(model->device, device_get_config_bios("bios"), 0);
+    ret          = bios_load_linear(fn, 0x000fe000, 40960, 0);
+    device_context_restore();
 
-    machine_xt_common_init(model);
-
-    return ret;
-}
-
-int
-machine_pc82_init(const machine_t *model)
-{
-    int ret;
-    int ret2;
-
-    ret = bios_load_linear("roms/machines/ibmpc82/pc102782.bin",
-                           0x000fe000, 40960, 0);
-    if (ret) {
-        ret2 = bios_load_aux_linear("roms/machines/ibmpc82/ibm-basic-1.10.rom",
+    if (enable_basic && ret) {
+        ret2 = bios_load_aux_linear("roms/machines/ibmpc/ibm-basic-1.00.rom",
                                     0x000f6000, 32768, 0);
         if (!ret2) {
-            bios_load_aux_linear("roms/machines/ibmpc82/basicc11.f6",
+            bios_load_aux_linear("roms/machines/ibmpc/IBM 5150 - Cassette BASIC version C1.00 - U29 - 5700019.bin",
                                  0x000f6000, 8192, 0);
-            bios_load_aux_linear("roms/machines/ibmpc82/basicc11.f8",
+            bios_load_aux_linear("roms/machines/ibmpc/IBM 5150 - Cassette BASIC version C1.00 - U30 - 5700027.bin",
                                  0x000f8000, 8192, 0);
-            bios_load_aux_linear("roms/machines/ibmpc82/basicc11.fa",
+            bios_load_aux_linear("roms/machines/ibmpc/IBM 5150 - Cassette BASIC version C1.00 - U31 - 5700035.bin",
                                  0x000fa000, 8192, 0);
-            bios_load_aux_linear("roms/machines/ibmpc82/basicc11.fc",
+            bios_load_aux_linear("roms/machines/ibmpc/IBM 5150 - Cassette BASIC version C1.00 - U32 - 5700043.bin",
                                  0x000fc000, 8192, 0);
         }
     }
@@ -90,97 +162,463 @@ machine_pc82_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    device_add(&keyboard_pc82_device);
-    device_add(&ibm_5161_device);
+    device_add(&kbc_pc_device);
 
-    machine_xt_common_init(model);
+    machine_xt_common_init(model, 0);
+
+    if (enable_5161)
+        device_add(&ibm_5161_device);
 
     return ret;
 }
 
-static void
-machine_xt_init_ex(const machine_t *model)
-{
-    device_add(&keyboard_xt_device);
+static const device_config_t ibmpc82_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "ibm5150_1501476",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "1501476 (10/27/82)", .internal_name = "ibm5150_1501476", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 40960, .files = { "roms/machines/ibmpc82/BIOS_5150_27OCT82_1501476_U33.BIN", "" } },
+            { .name = "5000024 (08/16/82)", .internal_name = "ibm5150_5000024", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 40960, .files = { "roms/machines/ibmpc82/BIOS_5150_16AUG82_5000024_U33.BIN", "" } },
 
-    machine_xt_common_init(model);
-}
+            // GLaBIOS for IBM PC
+            { .name = "GLaBIOS 0.4.0 (8088)", .internal_name = "glabios_040_8088", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 40960, .files = { "roms/machines/glabios/GLABIOS_0.4.0_8P.ROM", "" } },
+            { .name = "GLaBIOS 0.4.0 (V20)", .internal_name = "glabios_040_v20", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 40960, .files = { "roms/machines/glabios/GLABIOS_0.4.0_VP.ROM", "" } },
+
+            // The following are Diagnostic ROMs.
+            { .name = "Supersoft Diagnostics", .internal_name = "diag_supersoft", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 40960, .files = { "roms/machines/diagnostic/Supersoft_PCXT_8KB.bin", "" } },
+            { .name = "Ruud's Diagnostic Rom", .internal_name = "diag_ruuds", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 40960, .files = { "roms/machines/diagnostic/ruuds_diagnostic_rom_v5.4_8kb.bin", "" } },
+            { .name = "XT RAM Test", .internal_name = "diag_xtramtest", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 40960, .files = { "roms/machines/diagnostic/xtramtest_8k.bin", "" } },
+            { .files_no = 0 }
+        },
+    },
+    {
+        .name = "enable_5161",
+        .description = "IBM 5161 Expansion Unit",
+        .type = CONFIG_BINARY,
+        .default_int = 1
+    },
+    {
+        .name = "enable_basic",
+        .description = "IBM Cassette Basic",
+        .type = CONFIG_BINARY,
+        .default_int = 1
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t ibmpc82_device = {
+    .name          = "IBM PC (1982)",
+    .internal_name = "ibmpc82_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ibmpc82_config
+};
 
 int
-machine_xt_init(const machine_t *model)
+machine_ibmpc82_init(const machine_t *model)
 {
-    int ret;
+    int         ret = 0;
+    int         ret2;
+    uint8_t     enable_5161;
+    uint8_t     enable_basic;
+    const char *fn;
 
-    ret = bios_load_linear("roms/machines/ibmxt/xt.rom",
-                           0x000f0000, 65536, 0);
-    if (!ret) {
-        ret = bios_load_linear("roms/machines/ibmxt/1501512.u18",
-                               0x000fe000, 65536, 0x6000);
-        if (ret) {
-            bios_load_aux_linear("roms/machines/ibmxt/1501512.u18",
-                                 0x000f8000, 24576, 0);
-            bios_load_aux_linear("roms/machines/ibmxt/5000027.u19",
-                                 0x000f0000, 32768, 0);
+    /* No ROMs available. */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    enable_5161  = machine_get_config_int("enable_5161");
+    enable_basic = machine_get_config_int("enable_basic");
+    fn           = device_get_bios_file(model->device, device_get_config_bios("bios"), 0);
+    ret          = bios_load_linear(fn, 0x000fe000, 40960, 0);
+    device_context_restore();
+
+    if (enable_basic && ret) {
+        ret2 = bios_load_aux_linear("roms/machines/ibmpc82/ibm-basic-1.10.rom",
+                                    0x000f6000, 32768, 0);
+        if (!ret2) {
+            bios_load_aux_linear("roms/machines/ibmpc82/IBM 5150 - Cassette BASIC version C1.10 - U29 - 5000019.bin",
+                                 0x000f6000, 8192, 0);
+            bios_load_aux_linear("roms/machines/ibmpc82/IBM 5150 - Cassette BASIC version C1.10 - U30 - 5000021.bin",
+                                 0x000f8000, 8192, 0);
+            bios_load_aux_linear("roms/machines/ibmpc82/IBM 5150 - Cassette BASIC version C1.10 - U31 - 5000022.bin",
+                                 0x000fa000, 8192, 0);
+            bios_load_aux_linear("roms/machines/ibmpc82/IBM 5150 - Cassette BASIC version C1.10 - U32 - 5000023.bin",
+                                 0x000fc000, 8192, 0);
         }
     }
 
     if (bios_only || !ret)
         return ret;
 
-    machine_xt_init_ex(model);
+    device_add(&kbc_pc82_device);
 
-    device_add(&ibm_5161_device);
+    machine_xt_common_init(model, 0);
+
+    if (enable_5161)
+        device_add(&ibm_5161_device);
 
     return ret;
 }
 
+static const device_config_t ibmxt_config[] = {
+    // clang-format off
+    {
+        .name           = "bios",
+        .description    = "BIOS Version",
+        .type           = CONFIG_BIOS,
+        .default_string = "ibm5160_1501512_5000027",
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .bios           = {
+            {
+                .name          = "1501512 (11/08/82)",
+                .internal_name = "ibm5160_1501512_5000027",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 0,
+                .size          = 65536,
+                .files         = { "roms/machines/ibmxt/BIOS_5160_08NOV82_U18_1501512.BIN", "roms/machines/ibmxt/BIOS_5160_08NOV82_U19_5000027.BIN", "" }
+            },
+            {
+                .name          = "1501512 (11/08/82) (Alt)",
+                .internal_name = "ibm5160_1501512_6359116",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 0,
+                .size          = 65536,
+                .files         = { "roms/machines/ibmxt/BIOS_5160_08NOV82_U18_1501512.BIN", "roms/machines/ibmxt/BIOS_5160_08NOV82_U19_6359116.BIN", "" }
+            },
+            {
+                .name          = "5000026 (08/16/82)",
+                .internal_name = "ibm5160_5000026_5000027",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 0,
+                .size          = 65536,
+                .files         = { "roms/machines/ibmxt/BIOS_5160_16AUG82_U18_5000026.BIN", "roms/machines/ibmxt/BIOS_5160_16AUG82_U19_5000027.BIN", "" }
+            },
+
+            // GLaBIOS for IBM XT
+            {
+                .name          = "GLaBIOS 0.4.0 (8088)",
+                .internal_name = "glabios_040_8088",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 1,
+                .size          = 40960,
+                .files         = { "roms/machines/glabios/GLABIOS_0.4.0_8X.ROM", "roms/machines/ibmxt/BIOS_5160_08NOV82_U19_5000027.BIN", "" }
+            },
+            {
+                .name          = "GLaBIOS 0.4.0 (V20)",
+                .internal_name = "glabios_040_v20",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 1,
+                .size          = 40960,
+                .files         = { "roms/machines/glabios/GLABIOS_0.4.0_VX.ROM", "roms/machines/ibmxt/BIOS_5160_08NOV82_U19_5000027.BIN", "" }
+            },
+
+            // The following are Diagnostic ROMs.
+            {
+                .name          = "Supersoft Diagnostics",
+                .internal_name = "diag_supersoft",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 2,
+                .size          = 65536,
+                .files         = { "roms/machines/diagnostic/Supersoft_PCXT_32KB.bin", "roms/machines/ibmxt/BIOS_5160_08NOV82_U19_5000027.BIN", "" }
+            },
+            {
+                .name          = "Ruud's Diagnostic Rom",
+                .internal_name = "diag_ruuds",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 2,
+                .size          = 65536,
+                .files         = { "roms/machines/diagnostic/ruuds_diagnostic_rom_v5.4_32kb.bin", "roms/machines/ibmxt/BIOS_5160_08NOV82_U19_5000027.BIN", "" }
+            },
+            {
+                .name          = "XT RAM Test",
+                .internal_name = "diag_xtramtest",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 2,
+                .size          = 65536,
+                .files         = { "roms/machines/diagnostic/xtramtest_32k.bin", "roms/machines/ibmxt/BIOS_5160_08NOV82_U19_5000027.BIN", "" }
+            },
+            { .files_no = 0 }
+        },
+    },
+    {
+        .name        = "enable_5161",
+        .description = "IBM 5161 Expansion Unit",
+        .type        = CONFIG_BINARY,
+        .default_int = 1
+    },
+    {
+        .name        = "enable_basic",
+        .description = "IBM Cassette Basic",
+        .type        = CONFIG_BINARY,
+        .default_int = 1
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t ibmxt_device = {
+    .name          = "IBM XT (1982)",
+    .internal_name = "ibmxt_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ibmxt_config
+};
+
 int
-machine_genxt_init(const machine_t *model)
+machine_ibmxt_init(const machine_t *model)
 {
-    int ret;
+    int         ret = 0;
+    uint8_t     enable_5161;
+    uint8_t     enable_basic;
+    const char *fn;
+    uint16_t    offset = 0;
+    uint32_t    local  = 0;
 
-    ret = bios_load_linear("roms/machines/genxt/pcxt.rom",
-                           0x000fe000, 8192, 0);
-
-    if (bios_only || !ret)
+    /* No ROMs available. */
+    if (!device_available(model->device))
         return ret;
 
-    machine_xt_init_ex(model);
+    device_context(model->device);
+    enable_5161  = machine_get_config_int("enable_5161");
+    enable_basic = machine_get_config_int("enable_basic");
+    fn           = device_get_bios_file(model->device, device_get_config_bios("bios"), 0);
+    local        = device_get_bios_local(model->device, device_get_config_bios("bios"));
+ 
+    if (local == 0) // Offset for stock roms
+         offset   = 0x6000;
+    ret          = bios_load_linear(fn, 0x000fe000, 65536, offset);
 
-    return ret;
-}
-
-int
-machine_xt86_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/ibmxt86/BIOS_5160_09MAY86_U18_59X7268_62X0890_27256_F800.BIN",
-                           0x000fe000, 65536, 0x6000);
-    if (ret) {
-        (void) bios_load_aux_linear("roms/machines/ibmxt86/BIOS_5160_09MAY86_U18_59X7268_62X0890_27256_F800.BIN",
-                                    0x000f8000, 24576, 0);
-        (void) bios_load_aux_linear("roms/machines/ibmxt86/BIOS_5160_09MAY86_U19_62X0819_68X4370_27256_F000.BIN",
-                                    0x000f0000, 32768, 0);
+    if (enable_basic && ret) {
+        if (local == 0) { // needed for stock roms
+            fn = device_get_bios_file(model->device, device_get_config_bios("bios"), 0);
+            (void) bios_load_aux_linear(fn, 0x000f8000, 24576, 0);
+        }
+        fn = device_get_bios_file(model->device, device_get_config_bios("bios"), 1);
+        /* On the real machine, the BASIC is repeated. */
+        (void) bios_load_aux_linear(fn, 0x000f0000, 8192, 0);
+        (void) bios_load_aux_linear(fn, 0x000f2000, 8192, 0);
+        (void) bios_load_aux_linear(fn, 0x000f4000, 8192, 0);
+        (void) bios_load_aux_linear(fn, 0x000f6000, 8192, 0);
     }
+    device_context_restore();
 
     if (bios_only || !ret)
         return ret;
 
-    device_add(&keyboard_xt86_device);
-    device_add(&ibm_5161_device);
+    device_add(&kbc_xt_device);
 
-    machine_xt_common_init(model);
+    machine_xt_common_init(model, 0);
+
+    if (enable_5161)
+        device_add(&ibm_5161_device);
+
+    return ret;
+}
+
+static const device_config_t ibmxt86_config[] = {
+    // clang-format off
+    {
+        .name           = "bios",
+        .description    = "BIOS Version",
+        .type           = CONFIG_BIOS,
+        .default_string = "ibm5160_050986",
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .bios           = {
+            {
+                .name          = "1501512 (05/09/86)",
+                .internal_name = "ibm5160_050986",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 0,
+                .size          = 65536,
+                .files         = { "roms/machines/ibmxt86/BIOS_5160_09MAY86_U18_59X7268_62X0890_27256_F800.BIN", "roms/machines/ibmxt86/BIOS_5160_09MAY86_U19_62X0819_68X4370_27256_F000.BIN", "" }
+            },
+            {
+                .name          = "5000026 (01/10/86)",
+                .internal_name = "ibm5160_011086",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 0,
+                .size          = 65536,
+                .files         = { "roms/machines/ibmxt86/BIOS_5160_10JAN86_U18_62X0851_27256_F800.BIN", "roms/machines/ibmxt86/BIOS_5160_10JAN86_U19_62X0854_27256_F000.BIN", "" }
+            },
+            {
+                .name          = "1501512 (01/10/86) (Alt)",
+                .internal_name = "ibm5160_011086_alt",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 0,
+                .size          = 65536,
+                .files         = { "roms/machines/ibmxt86/BIOS_5160_10JAN86_U18_62X0852_27256_F800.BIN", "roms/machines/ibmxt86/BIOS_5160_10JAN86_U19_62X0853_27256_F000.BIN", "" }
+            },
+
+            // GLaBIOS for IBM XT
+            {
+                .name          = "GLaBIOS 0.4.0 (8088)",
+                .internal_name = "glabios_040_8088",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 1,
+                .size          = 65536,
+                .files         = { "roms/machines/glabios/GLABIOS_0.4.0_8X.ROM", "roms/machines/ibmxt86/BIOS_5160_09MAY86_U19_62X0819_68X4370_27256_F000.BIN", "" }
+            },
+            {
+                .name          = "GLaBIOS 0.4.0 (V20)",
+                .internal_name = "glabios_040_v20",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 1,
+                .size          = 65536,
+                .files         = { "roms/machines/glabios/GLABIOS_0.4.0_VX.ROM", "roms/machines/ibmxt86/BIOS_5160_09MAY86_U19_62X0819_68X4370_27256_F000.BIN", "" }
+            },
+
+            // The following are Diagnostic ROMs.
+            {
+                .name          = "Supersoft Diagnostics",
+                .internal_name = "diag_supersoft",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 2,
+                .size          = 65536,
+                .files         = { "roms/machines/diagnostic/Supersoft_PCXT_32KB.bin", "roms/machines/ibmxt86/BIOS_5160_09MAY86_U19_62X0819_68X4370_27256_F000.BIN", "" }
+            },
+            {
+                .name          = "Ruud's Diagnostic Rom",
+                .internal_name = "diag_ruuds",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 2,
+                .size          = 65536,
+                .files         = { "roms/machines/diagnostic/ruuds_diagnostic_rom_v5.4_32kb.bin", "roms/machines/ibmxt86/BIOS_5160_09MAY86_U19_62X0819_68X4370_27256_F000.BIN", "" }
+            },
+            {
+                .name          = "XT RAM Test",
+                .internal_name = "diag_xtramtest",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 2,
+                .size          = 65536,
+                .files         = { "roms/machines/diagnostic/xtramtest_32k.bin", "roms/machines/ibmxt86/BIOS_5160_09MAY86_U19_62X0819_68X4370_27256_F000.BIN", "" }
+            },
+
+            { .files_no = 0 }
+        },
+    },
+    {
+        .name        = "enable_5161",
+        .description = "IBM 5161 Expansion Unit",
+        .type        = CONFIG_BINARY,
+        .default_int = 1
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t ibmxt86_device = {
+    .name          = "IBM XT (1986)",
+    .internal_name = "ibmxt86_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ibmxt86_config
+};
+
+int
+machine_ibmxt86_init(const machine_t *model)
+{
+    int         ret = 0;
+    uint8_t     enable_5161;
+    const char *fn;
+    uint16_t    offset = 0;
+    uint32_t    local = 0;
+
+    /* No ROMs available. */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    enable_5161  = machine_get_config_int("enable_5161");
+    fn           = device_get_bios_file(model->device, device_get_config_bios("bios"), 0);
+    local        = device_get_bios_local(model->device, device_get_config_bios("bios"));
+
+    if (local == 0) // Offset for stock roms
+        offset   = 0x6000;
+    ret          = bios_load_linear(fn, 0x000fe000, 65536, offset);
+
+    if (ret) {
+        if (local == 0) { // needed for stock roms
+            fn = device_get_bios_file(model->device, device_get_config_bios("bios"), 0);
+            (void) bios_load_aux_linear(fn, 0x000f8000, 24576, 0);
+        }
+        fn = device_get_bios_file(model->device, device_get_config_bios("bios"), 1);
+        (void) bios_load_aux_linear(fn, 0x000f0000, 32768, 0);
+    }
+    device_context_restore();
+
+    if (bios_only || !ret)
+        return ret;
+
+    device_add(&kbc_xt86_device);
+
+    machine_xt_common_init(model, 0);
+
+    if (enable_5161)
+        device_add(&ibm_5161_device);
 
     return ret;
 }
 
 static void
-machine_xt_clone_init(const machine_t *model)
+machine_xt_clone_init(const machine_t *model, int fixed_floppy)
 {
-    device_add(&keyboard_xtclone_device);
+    device_add(&kbc_xtclone_device);
 
-    machine_xt_common_init(model);
+    machine_xt_common_init(model, fixed_floppy);
 }
 
 int
@@ -194,7 +632,7 @@ machine_xt_americxt_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_xt_clone_init(model);
+    machine_xt_clone_init(model, 0);
 
     return ret;
 }
@@ -210,23 +648,98 @@ machine_xt_amixt_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_xt_clone_init(model);
+    machine_xt_clone_init(model, 0);
+
+    return ret;
+}
+
+/*
+   TODO:
+   - Onboard EGA Graphics (NSI Logic EVC315-S on early boards
+                           STMicroelectronics EGA on later revisions);
+   - RTC;
+   - Adaptec ACB-2072 RLL Controller Card (Optional);
+   - Atari PCM1 Mouse Support.
+ */
+int
+machine_xt_ataripc3_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ataripc3/AWARD_ATARI_PC_BIOS_3.08.BIN",
+                           0x000f8000, 32768, 0);
+#if 0
+    ret = bios_load_linear("roms/machines/ataripc3/c101701-004 308.u61",
+                           0x000f8000, 0x8000, 0);
+#endif
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_xt_clone_init(model, 0);
 
     return ret;
 }
 
 int
-machine_xt_znic_init(const machine_t *model)
+machine_xt_bw230_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/znic/ibmzen.rom",
+    ret = bios_load_linear("roms/machines/bw230/bondwell.bin",
                            0x000fe000, 8192, 0);
 
     if (bios_only || !ret)
         return ret;
 
-    machine_xt_clone_init(model);
+    machine_xt_clone_init(model, 0);
+
+    return ret;
+}
+
+int
+machine_xt_mpc1600_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/mpc1600/mpc4.34_merged.bin",
+                           0x000fc000, 16384, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    device_add(&kbc_pc82_device);
+
+    machine_xt_common_init(model, 0);
+
+    return ret;
+}
+
+int
+machine_xt_compaq_portable_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/portable/compaq portable plus 100666-001 rev c u47.bin",
+                           0x000fe000, 8192, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_common_init(model);
+
+    pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_xt);
+
+    device_add(&kbc_xt_compaq_device);
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_xt_device);
+    nmi_init();
+    if (joystick_type[0])
+        device_add(&gameport_200_device);
+
+    lpt_t *lpt = device_add_inst(&lpt_port_device, 1);
+    lpt_port_setup(lpt, LPT_MDA_ADDR);
+    lpt_set_3bc_used(1);
 
     return ret;
 }
@@ -242,23 +755,273 @@ machine_xt_dtk_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_xt_clone_init(model);
+    machine_xt_clone_init(model, 0);
 
     return ret;
 }
 
 int
-machine_xt_jukopc_init(const machine_t *model)
+machine_xt_pcspirit_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/jukopc/000o001.bin",
+    ret = bios_load_linear("roms/machines/pcspirit/u1101.bin",
+                           0x000fe000, 16384, 0);
+
+    if (ret) {
+        bios_load_aux_linear("roms/machines/pcspirit/u1103.bin",
+                             0x000fc000, 8192, 0);
+    }
+
+    if (bios_only || !ret)
+        return ret;
+
+    device_add(&kbc_pc82_device);
+
+    machine_xt_common_init(model, 0);
+
+    return ret;
+}
+
+int
+machine_genxt_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/genxt/pcxt.rom",
                            0x000fe000, 8192, 0);
 
     if (bios_only || !ret)
         return ret;
 
-    machine_xt_clone_init(model);
+    device_add(&kbc_xt_device);
+
+    machine_xt_common_init(model, 0);
+
+    return ret;
+}
+
+int
+machine_xt_glabios_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/glabios/GLABIOS_0.4.0_8X.ROM",
+                           0x000fe000, 8192, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    device_add(&kbc_xt_device);
+
+    machine_xt_common_init(model, 0);
+
+    return ret;
+}
+
+int
+machine_xt_top88_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/top88/Hyosung Topstar 88T - BIOS version 3.0.bin",
+                           0x000fc000, 16384, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    /* On-board FDC cannot be disabled */
+    machine_xt_clone_init(model, 1);
+
+    return ret;
+}
+
+static void
+machine_xt_hyundai_common_init(const machine_t *model, int fixed_floppy)
+{
+    device_add(&kbc_xt_hyundai_device);
+
+    machine_xt_common_init(model, fixed_floppy);
+}
+
+int
+machine_xt_super16t_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/super16t/Hyundai SUPER-16T - System BIOS HEA v1.12Ta (16k)(MBM27128)(1986).BIN",
+                           0x000fc000, 16384, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    /* On-board FDC cannot be disabled */
+    machine_xt_hyundai_common_init(model, 1);
+
+    return ret;
+}
+
+int
+machine_xt_super16te_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/super16te/Hyundai SUPER-16TE - System BIOS v2.00Id (16k)(D27128A)(1989).BIN",
+                           0x000fc000, 16384, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    /* On-board FDC cannot be disabled */
+    machine_xt_hyundai_common_init(model, 1);
+
+    return ret;
+}
+
+static const device_config_t jukopc_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "jukost",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "Bios 2.30", .internal_name = "jukost", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 8192, .files = { "roms/machines/jukopc/000o001.bin", "" } },
+            // GLaBIOS for Juko ST
+            { .name = "GLaBIOS 0.4.0 (8088)", .internal_name = "glabios_040_8088", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 8192, .files = { "roms/machines/glabios/GLABIOS_0.4.0_8S.ROM", "" } },
+            { .name = "GLaBIOS 0.4.0 (V20)", .internal_name = "glabios_040_v20", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 8192, .files = { "roms/machines/glabios/GLABIOS_0.4.0_VS.ROM", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t jukopc_device = {
+    .name          = "Juko ST",
+    .internal_name = "jukopc_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = jukopc_config
+};
+
+int
+machine_xt_jukopc_init(const machine_t *model)
+{
+    int         ret = 0;
+    const char *fn;
+
+    /* No ROMs available. */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn           = device_get_bios_file(model->device, device_get_config_bios("bios"), 0);
+    ret          = bios_load_linear(fn, 0x000fe000, 8192, 0);
+    device_context_restore();
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_xt_clone_init(model, 0);
+
+    return ret;
+}
+
+int
+machine_xt_kaypropc_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/kaypropc/Kaypro_v2.03K.bin",
+                           0x000fe000, 8192, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_xt_clone_init(model, 0);
+
+    return ret;
+}
+
+int
+machine_xt_micoms_xl7turbo_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/mxl7t/XL7_TURBO.BIN",
+                           0x000fe000, 8192, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    device_add(&kbc_xt_device);
+
+    machine_xt_common_init(model, 0);
+
+    return ret;
+}
+
+int
+machine_xt_pc500_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/pc500/rom404.bin",
+                           0x000f8000, 32768, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    device_add(&kbc_pc_device);
+
+    machine_xt_common_init(model, 0);
+
+    return ret;
+}
+
+int
+machine_xt_pc700_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/pc700/multitech pc-700 3.1.bin",
+                           0x000fe000, 8192, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    device_add(&kbc_pc_device);
+
+    machine_xt_common_init(model, 0);
+
+    return ret;
+}
+
+int
+machine_xt_pc4i_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/pc4i/NCR_PC4i_BIOSROM_1985.BIN",
+                           0x000fc000, 16384, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_xt_clone_init(model, 0);
 
     return ret;
 }
@@ -274,27 +1037,44 @@ machine_xt_openxt_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_xt_clone_init(model);
+    machine_xt_clone_init(model, 0);
 
     return ret;
 }
 
+static void
+machine_xt_philips_common_init(const machine_t *model)
+{
+    machine_common_init(model);
+
+    pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_xt);
+
+    nmi_init();
+
+    standalone_gameport_type = &gameport_200_device;
+
+    device_add(&kbc_pc_device);
+
+    device_add(&philips_device);
+
+    device_add(&xta_hd20_device);
+}
+
 int
-machine_xt_pcxt_init(const machine_t *model)
+machine_xt_p3105_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/pcxt/u18.rom",
-                           0x000f8000, 65536, 0);
-    if (ret) {
-        bios_load_aux_linear("roms/machines/pcxt/u19.rom",
-                             0x000f0000, 32768, 0);
-    }
+    ret = bios_load_linear("roms/machines/p3105/philipsnms9100.bin",
+                           0x000fc000, 16384, 0);
 
     if (bios_only || !ret)
         return ret;
 
-    machine_xt_clone_init(model);
+    machine_xt_philips_common_init(model);
+
+    /* On-board FDC cannot be disabled */
+    device_add(&fdc_xt_device);
 
     return ret;
 }
@@ -310,26 +1090,9 @@ machine_xt_pxxt_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    device_add(&keyboard_xt_device);
+    device_add(&kbc_xt_device);
 
-    machine_xt_common_init(model);
-
-    return ret;
-}
-
-int
-machine_xt_iskra3104_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved("roms/machines/iskra3104/198.bin",
-                                "roms/machines/iskra3104/199.bin",
-                                0x000fc000, 16384, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_xt_clone_init(model);
+    machine_xt_common_init(model, 0);
 
     return ret;
 }
@@ -339,7 +1102,7 @@ machine_xt_pravetz16_imko4_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/pravetz16/BIOS_IMKO4_FE00.BIN",
+    ret = bios_load_linear("roms/machines/pravetz16/BIOS_IMKO4_FE00.bin",
                            0x000fe000, 65536, 0);
     if (ret) {
         bios_load_aux_linear("roms/machines/pravetz16/BIOS_IMKO4_F400.BIN",
@@ -361,266 +1124,27 @@ machine_xt_pravetz16_imko4_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    device_add(&keyboard_pravetz_device);
+    device_add(&kbc_pravetz_device);
 
-    machine_xt_common_init(model);
+    machine_xt_common_init(model, 0);
 
     return ret;
 }
 
 int
-machine_xt_micoms_xl7turbo_init(const machine_t *model)
+machine_xt_pravetz16s_cpu12p_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/mxl7t/XL7_TURBO.BIN",
+    ret = bios_load_linear("roms/machines/pravetz16s/PR16S.BIN",
                            0x000fe000, 8192, 0);
 
     if (bios_only || !ret)
         return ret;
 
-    machine_xt_init_ex(model);
-    return ret;
-}
+    device_add(&kbc_xt_device);
 
-int
-machine_xt_pc4i_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/pc4i/NCR_PC4i_BIOSROM_1985.BIN",
-                           0x000fc000, 16384, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_xt_clone_init(model);
-
-    return ret;
-}
-
-int
-machine_xt_mpc1600_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/mpc1600/mpc4.34_merged.bin",
-                           0x000fc000, 16384, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    device_add(&keyboard_pc82_device);
-
-    machine_xt_common_init(model);
-
-    return ret;
-}
-
-int
-machine_xt_pcspirit_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/pcspirit/u1101.bin",
-                           0x000fe000, 16384, 0);
-
-    if (ret) {
-        bios_load_aux_linear("roms/machines/pcspirit/u1103.bin",
-                             0x000fc000, 8192, 0);
-    }
-
-    if (bios_only || !ret)
-        return ret;
-
-    device_add(&keyboard_pc82_device);
-
-    machine_xt_common_init(model);
-
-    return ret;
-}
-
-int
-machine_xt_pc700_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/pc700/multitech pc-700 3.1.bin",
-                           0x000fe000, 8192, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    device_add(&keyboard_pc_device);
-
-    machine_xt_common_init(model);
-
-    return ret;
-}
-
-int
-machine_xt_pc500_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/pc500/rom404.bin",
-                           0x000f8000, 32768, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    device_add(&keyboard_pc_device);
-
-    machine_xt_common_init(model);
-
-    return ret;
-}
-
-int
-machine_xt_vendex_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/vendex/Vendex Turbo 888 XT - ROM BIOS - VER 2.03C.bin",
-                           0x000fc000, 16384, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_xt_clone_init(model);
-    device_add(&vendex_xt_rtc_onboard_device);
-
-    return ret;
-}
-
-static void
-machine_xt_hyundai_common_init(const machine_t *model)
-{
-    device_add(&keyboard_xt_hyundai_device);
-
-    machine_xt_common_init(model);
-}
-
-int
-machine_xt_super16t_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/super16t/Hyundai SUPER-16T - System BIOS HEA v1.12Ta (16k)(MBM27128)(1986).BIN",
-                           0x000fc000, 16384, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_xt_hyundai_common_init(model);
-
-    /* On-board FDC cannot be disabled */
-    device_add(&fdc_xt_device);
-
-    return ret;
-}
-
-int
-machine_xt_super16te_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/super16te/Hyundai SUPER-16TE - System BIOS v2.00Id (16k)(D27128A)(1989).BIN",
-                           0x000fc000, 16384, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_xt_hyundai_common_init(model);
-
-    /* On-board FDC cannot be disabled */
-    device_add(&fdc_xt_device);
-
-    return ret;
-}
-
-int
-machine_xt_top88_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/top88/Hyosung Topstar 88T - BIOS version 3.0.bin",
-                           0x000fc000, 16384, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_xt_clone_init(model);
-
-    /* On-board FDC cannot be disabled */
-    device_add(&fdc_xt_device);
-
-    return ret;
-}
-
-int
-machine_xt_kaypropc_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/kaypropc/Kaypro_v2.03K.bin",
-                           0x000fe000, 8192, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_xt_clone_init(model);
-
-    return ret;
-}
-
-int
-machine_xt_sansx16_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/sansx16/tmm27128ad.bin.bin",
-                           0x000fc000, 16384, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_xt_clone_init(model);
-
-    /* On-board FDC cannot be disabled */
-    device_add(&fdc_xt_device);
-
-    return ret;
-}
-
-int
-machine_xt_bw230_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/bw230/bondwell.bin",
-                           0x000fe000, 8192, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_xt_clone_init(model);
-
-    return ret;
-}
-
-int
-machine_xt_v20xt_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/v20xt/V20XTBios.bin",
-                           0x000fe000, 8192, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_xt_clone_init(model);
+    machine_xt_common_init(model, 0);
 
     return ret;
 }
@@ -636,23 +1160,439 @@ machine_xt_pb8810_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_xt_clone_init(model);
+    machine_xt_clone_init(model, 0);
 
     return ret;
 }
 
 int
-machine_xt_glabios_init(const machine_t *model)
+machine_xt_sansx16_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/glabios/GLABIOS_0.2.6_8X_012324.ROM",
+    ret = bios_load_linear("roms/machines/sansx16/tmm27128ad.bin.bin",
+                           0x000fc000, 16384, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    /* On-board FDC cannot be disabled */
+    machine_xt_clone_init(model, 1);
+
+    return ret;
+}
+
+int
+machine_xt_pcxt_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/pcxt/u18.rom",
+                           0x000f8000, 65536, 0);
+    if (ret) {
+        bios_load_aux_linear("roms/machines/pcxt/u19.rom",
+                             0x000f0000, 32768, 0);
+    }
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_xt_clone_init(model, 0);
+
+    return ret;
+}
+
+static const device_config_t vendex_config[] = {
+    // clang-format off
+    {
+        .name = "bios",
+        .description = "BIOS Version",
+        .type = CONFIG_BIOS,
+        .default_string = "vendex",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .bios = {
+            { .name = "Bios 2.03C", .internal_name = "vendex", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 16384, .files = { "roms/machines/vendex/Vendex Turbo 888 XT - ROM BIOS - VER 2.03C.bin", "" } },
+            // GLaBIOS for Vendex
+            { .name = "GLaBIOS 0.4.0 (8088)", .internal_name = "glabios_040_8088", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 16384, .files = { "roms/machines/glabios/GLABIOS_0.4.0_8TV.ROM", "" } },
+            { .name = "GLaBIOS 0.4.0 (V20)", .internal_name = "glabios_040_v20", .bios_type = BIOS_NORMAL,
+              .files_no = 1, .local = 0, .size = 16384, .files = { "roms/machines/glabios/GLABIOS_0.4.0_VTV.ROM", "" } },
+            { .files_no = 0 }
+        },
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t vendex_device = {
+    .name          = "Vendex 888T",
+    .internal_name = "vendex_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = vendex_config
+};
+
+int
+machine_xt_vendex_init(const machine_t *model)
+{
+    int         ret = 0;
+    const char *fn;
+
+    /* No ROMs available. */
+    if (!device_available(model->device))
+        return ret;
+
+    device_context(model->device);
+    fn           = device_get_bios_file(model->device, device_get_config_bios("bios"), 0);
+    ret          = bios_load_linear(fn, 0x000fc000, 16384, 0);
+    device_context_restore();
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_xt_clone_init(model, 1);
+
+    device_add(&vendex_xt_rtc_onboard_device);
+
+    return ret;
+}
+
+static void
+machine_xt_laserxt_common_init(const machine_t *model,int is_lxt3)
+{
+    machine_common_init(model);
+
+    pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_xt);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_xt_device);
+
+    nmi_init();
+    standalone_gameport_type = &gameport_200_device;
+
+    device_add(is_lxt3 ? &lxt3_device : &laserxt_device);
+
+    device_add(&kbc_xt_lxt3_device);
+}
+
+int
+machine_xt_laserxt_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/ltxt/27c64.bin",
                            0x000fe000, 8192, 0);
 
     if (bios_only || !ret)
         return ret;
 
-    machine_xt_init_ex(model);
+    machine_xt_laserxt_common_init(model, 0);
+
+    return ret;
+}
+
+int
+machine_xt_znic_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/znic/ibmzen.rom",
+                           0x000fe000, 8192, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_xt_clone_init(model, 0);
+
+    return ret;
+}
+
+static void
+machine_zenith_common_init(const machine_t *model)
+{
+    machine_common_init(model);
+
+    device_add(&zenith_scratchpad_device);
+
+    pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_xt);
+
+    device_add(&kbc_xt_zenith_device);
+
+    nmi_init();
+}
+
+int
+machine_xt_z151_init(const machine_t *model)
+{
+    int ret;
+    ret = bios_load_linear("roms/machines/zdsz151/444-229-18.bin",
+                           0x000fc000, 32768, 0);
+    if (ret) {
+        bios_load_aux_linear("roms/machines/zdsz151/444-260-18.bin",
+                             0x000f8000, 16384, 0);
+    }
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_zenith_common_init(model);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_xt_tandy_device);
+
+    return ret;
+}
+
+/*
+ * Current bugs and limitations:
+ * - Memory board support for EMS currently missing
+ */
+int
+machine_xt_z159_init(const machine_t *model)
+{
+    lpt_t *lpt = NULL;
+    int    ret;
+
+    ret = bios_load_linear("roms/machines/zdsz159/z159m v2.9e.10d",
+                           0x000f8000, 32768, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_zenith_common_init(model);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_xt_tandy_device);
+
+    /* parallel port is on the memory board */
+    lpt = device_add_inst(&lpt_port_device, 1);
+    lpt_port_remove(lpt);
+    lpt_port_setup(lpt, LPT2_ADDR);
+    lpt_set_next_inst(255);
+
+    return ret;
+}
+
+/*
+ * Current bugs and limitations:
+ * - missing NVRAM implementation
+ */
+int
+machine_xt_z184_init(const machine_t *model)
+{
+    lpt_t *lpt = NULL;
+    int    ret;
+
+    ret = bios_load_linear("roms/machines/zdsupers/z184m v3.1d.10d",
+                           0x000f8000, 32768, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_zenith_common_init(model);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_xt_device);
+
+    lpt = device_add_inst(&lpt_port_device, 1);
+    lpt_port_remove(lpt);
+    lpt_port_setup(lpt, LPT2_ADDR);
+    lpt_set_next_inst(255);
+
+    device_add(&ns8250_device);
+    /* So that serial_standalone_init() won't do anything. */
+    serial_set_next_inst(SERIAL_MAX - 1);
+
+    device_add(&cga_device);
+
+    return ret;
+}
+
+/* GC100A */
+int
+machine_xt_p3120_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/p3120/philips_p3120.bin",
+                           0x000f8000, 32768, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_xt_philips_common_init(model);
+
+    device_add(&gc100a_device);
+
+    device_add(&fdc_at_device);
+
+    return ret;
+}
+
+/* V20 */
+int
+machine_xt_v20xt_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/v20xt/V20XTBios.bin",
+                           0x000fe000, 8192, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_xt_clone_init(model, 0);
+
+    return ret;
+}
+
+int
+machine_xt_tuliptc8_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/tuliptc8/tulip-bios_xt_compact_2.bin",
+                           0x000fc000, 16384, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    device_add(&kbc_xt_fe2010_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
+    machine_common_init(model);
+
+    pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_xt);
+
+    nmi_init();
+    standalone_gameport_type = &gameport_200_device;
+
+    device_add(&amstrad_megapc_nvr_device);
+
+    return ret;
+}
+
+/* 8086 */
+int
+machine_xt_compaq_deskpro_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/deskpro/Compaq - BIOS - Revision J - 106265-002.bin",
+                           0x000fe000, 8192, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_common_init(model);
+
+    pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_xt);
+
+    device_add(&kbc_xt_compaq_device);
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_xt_device);
+    nmi_init();
+    standalone_gameport_type = &gameport_200_device;
+
+    lpt_t *lpt = device_add_inst(&lpt_port_device, 1);
+    lpt_port_setup(lpt, LPT_MDA_ADDR);
+    lpt_set_3bc_used(1);
+
+    return ret;
+}
+
+int
+machine_xt_pc5086_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/pc5086/sys_rom.bin",
+                                 0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_common_init(model);
+
+    device_add(&ct_82c100_device);
+    device_add(&f82c710_pc5086_device);
+
+    device_add(&kbc_xt_device);
+
+    device_add(&amstrad_megapc_nvr_device); /* NVR that is initialized to all 0x00's. */
+
+    return ret;
+}
+
+int
+machine_xt_maz1016_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/maz1016/e1.bin",
+                                "roms/machines/maz1016/e4.bin",
+                                0x000fc000, 49152, 0);
+
+    if (ret) {
+        bios_load_aux_interleaved("roms/machines/maz1016/e2.bin",
+                                  "roms/machines/maz1016/e5.bin",
+                                  0x000f8000, 16384, 0);
+
+        bios_load_aux_interleaved("roms/machines/maz1016/e3.bin",
+                                  "roms/machines/maz1016/e6b.bin",
+                                  0x000f4000, 16384, 0);
+    }
+
+    if (bios_only || !ret)
+        return ret;
+
+    loadfont("roms/machines/maz1016/crt-8.bin", 0);
+
+    machine_xt_clone_init(model, 0);
+
+    return ret;
+}
+
+int
+machine_xt_iskra3104_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved("roms/machines/iskra3104/198.bin",
+                                "roms/machines/iskra3104/199.bin",
+                                0x000fc000, 16384, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_xt_clone_init(model, 0);
+
+    return ret;
+}
+
+int
+machine_xt_lxt3_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/lxt3/27c64d.bin",
+                           0x000fe000, 8192, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_xt_laserxt_common_init(model, 1);
 
     return ret;
 }
diff --git a/src/machine/m_xt_compaq.c b/src/machine/m_xt_compaq.c
deleted file mode 100644
index f5dca48a7..000000000
--- a/src/machine/m_xt_compaq.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Emulation of various Compaq XT-class PC's.
- *
- *
- *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
- *          TheCollector1995, <mariogplayer@gmail.com>
- *
- *          Copyright 2008-2019 Sarah Walker.
- *          Copyright 2016-2019 Miran Grca.
- */
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include "cpu.h"
-#include <86box/nmi.h>
-#include <86box/timer.h>
-#include <86box/pit.h>
-#include <86box/mem.h>
-#include <86box/rom.h>
-#include <86box/device.h>
-#include <86box/fdd.h>
-#include <86box/fdc.h>
-#include <86box/fdc_ext.h>
-#include <86box/gameport.h>
-#include <86box/keyboard.h>
-#include <86box/lpt.h>
-#include <86box/machine.h>
-
-int
-machine_xt_compaq_deskpro_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/deskpro/Compaq - BIOS - Revision J - 106265-002.bin",
-                           0x000fe000, 8192, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_common_init(model);
-
-    pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_xt);
-
-    device_add(&keyboard_xt_compaq_device);
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_xt_device);
-    nmi_init();
-    standalone_gameport_type = &gameport_device;
-
-    lpt1_remove();
-    lpt1_init(LPT_MDA_ADDR);
-
-    return ret;
-}
-
-int
-machine_xt_compaq_portable_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/portable/compaq portable plus 100666-001 rev c u47.bin",
-                           0x000fe000, 8192, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_common_init(model);
-
-    pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_xt);
-
-    device_add(&keyboard_xt_compaq_device);
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_xt_device);
-    nmi_init();
-    if (joystick_type)
-        device_add(&gameport_device);
-
-    lpt1_remove();
-    lpt1_init(LPT_MDA_ADDR);
-
-    return ret;
-}
diff --git a/src/machine/m_xt_laserxt.c b/src/machine/m_xt_laserxt.c
deleted file mode 100644
index 87c2fe362..000000000
--- a/src/machine/m_xt_laserxt.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*This is the chipset used in the LaserXT series model*/
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include "cpu.h"
-#include <86box/io.h>
-#include <86box/mem.h>
-#include <86box/nmi.h>
-#include <86box/timer.h>
-#include <86box/pit.h>
-#include <86box/rom.h>
-#include <86box/machine.h>
-#include <86box/device.h>
-#include <86box/timer.h>
-#include <86box/fdd.h>
-#include <86box/fdc.h>
-#include <86box/fdc_ext.h>
-#include <86box/gameport.h>
-#include <86box/keyboard.h>
-#include <86box/plat_unused.h>
-
-static int           laserxt_emspage[4];
-static int           laserxt_emscontrol[4];
-static mem_mapping_t laserxt_ems_mapping[4];
-static int           laserxt_ems_baseaddr_index = 0;
-static int           laserxt_is_lxt3            = 0;
-
-static uint32_t
-get_laserxt_ems_addr(uint32_t addr)
-{
-    if (laserxt_emspage[(addr >> 14) & 3] & 0x80) {
-        addr = (!laserxt_is_lxt3 ? 0x70000 + (((mem_size + 64) & 255) << 10) : 0x30000 + (((mem_size + 320) & 511) << 10)) + ((laserxt_emspage[(addr >> 14) & 3] & 0x0F) << 14) + ((laserxt_emspage[(addr >> 14) & 3] & 0x40) << 12) + (addr & 0x3FFF);
-    }
-
-    return addr;
-}
-
-static void
-laserxt_write(uint16_t port, uint8_t val, UNUSED(void *priv))
-{
-    uint32_t paddr;
-    uint32_t vaddr;
-    switch (port) {
-        case 0x0208:
-        case 0x4208:
-        case 0x8208:
-        case 0xC208:
-            laserxt_emspage[port >> 14] = val;
-            paddr                       = 0xC0000 + (port & 0xC000) + (((laserxt_ems_baseaddr_index + (4 - (port >> 14))) & 0x0C) << 14);
-            if (val & 0x80) {
-                mem_mapping_enable(&laserxt_ems_mapping[port >> 14]);
-                vaddr = get_laserxt_ems_addr(paddr);
-                mem_mapping_set_exec(&laserxt_ems_mapping[port >> 14], ram + vaddr);
-            } else {
-                mem_mapping_disable(&laserxt_ems_mapping[port >> 14]);
-            }
-            flushmmucache();
-            break;
-        case 0x0209:
-        case 0x4209:
-        case 0x8209:
-        case 0xC209:
-            laserxt_emscontrol[port >> 14] = val;
-            laserxt_ems_baseaddr_index     = 0;
-            for (uint8_t i = 0; i < 4; i++) {
-                laserxt_ems_baseaddr_index |= (laserxt_emscontrol[i] & 0x80) >> (7 - i);
-            }
-
-            mem_mapping_set_addr(&laserxt_ems_mapping[0], 0xC0000 + (((laserxt_ems_baseaddr_index + 4) & 0x0C) << 14), 0x4000);
-            mem_mapping_set_addr(&laserxt_ems_mapping[1], 0xC4000 + (((laserxt_ems_baseaddr_index + 3) & 0x0C) << 14), 0x4000);
-            mem_mapping_set_addr(&laserxt_ems_mapping[2], 0xC8000 + (((laserxt_ems_baseaddr_index + 2) & 0x0C) << 14), 0x4000);
-            mem_mapping_set_addr(&laserxt_ems_mapping[3], 0xCC000 + (((laserxt_ems_baseaddr_index + 1) & 0x0C) << 14), 0x4000);
-            flushmmucache();
-            break;
-
-        default:
-            break;
-    }
-}
-
-static uint8_t
-laserxt_read(uint16_t port, UNUSED(void *priv))
-{
-    switch (port) {
-        case 0x0208:
-        case 0x4208:
-        case 0x8208:
-        case 0xC208:
-            return laserxt_emspage[port >> 14];
-        case 0x0209:
-        case 0x4209:
-        case 0x8209:
-        case 0xC209:
-            return laserxt_emscontrol[port >> 14];
-
-        default:
-            break;
-    }
-    return 0xff;
-}
-
-static void
-mem_write_laserxtems(uint32_t addr, uint8_t val, UNUSED(void *priv))
-{
-    addr = get_laserxt_ems_addr(addr);
-    if (addr < (mem_size << 10))
-        ram[addr] = val;
-}
-
-static uint8_t
-mem_read_laserxtems(uint32_t addr, UNUSED(void *priv))
-{
-    uint8_t val = 0xFF;
-    addr        = get_laserxt_ems_addr(addr);
-    if (addr < (mem_size << 10))
-        val = ram[addr];
-    return val;
-}
-
-static void
-laserxt_init(int is_lxt3)
-{
-    if (mem_size > 640) {
-        io_sethandler(0x0208, 0x0002, laserxt_read, NULL, NULL, laserxt_write, NULL, NULL, NULL);
-        io_sethandler(0x4208, 0x0002, laserxt_read, NULL, NULL, laserxt_write, NULL, NULL, NULL);
-        io_sethandler(0x8208, 0x0002, laserxt_read, NULL, NULL, laserxt_write, NULL, NULL, NULL);
-        io_sethandler(0xc208, 0x0002, laserxt_read, NULL, NULL, laserxt_write, NULL, NULL, NULL);
-        mem_mapping_set_addr(&ram_low_mapping, 0, !is_lxt3 ? 0x70000 + (((mem_size + 64) & 255) << 10) : 0x30000 + (((mem_size + 320) & 511) << 10));
-    }
-
-    for (uint8_t i = 0; i < 4; i++) {
-        laserxt_emspage[i]    = 0x7F;
-        laserxt_emscontrol[i] = (i == 3) ? 0x00 : 0x80;
-        mem_mapping_add(&laserxt_ems_mapping[i], 0xE0000 + (i << 14), 0x4000, mem_read_laserxtems, NULL, NULL, mem_write_laserxtems, NULL, NULL, ram + 0xA0000 + (i << 14), 0, NULL);
-        mem_mapping_disable(&laserxt_ems_mapping[i]);
-    }
-    mem_set_mem_state(0x0c0000, 0x40000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
-    laserxt_is_lxt3 = is_lxt3;
-}
-
-static void
-machine_xt_laserxt_common_init(const machine_t *model,int is_lxt3)
-{
-    machine_common_init(model);
-
-    pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_xt);
-
-    if (fdc_type == FDC_INTERNAL)
-        device_add(&fdc_xt_device);
-
-    nmi_init();
-    standalone_gameport_type = &gameport_device;
-
-    laserxt_init(is_lxt3);
-}
-
-int
-machine_xt_laserxt_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/ltxt/27c64.bin",
-                           0x000fe000, 8192, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    device_add(&keyboard_xt_device);
-
-    machine_xt_laserxt_common_init(model, 0);
-
-    return ret;
-}
-
-int
-machine_xt_lxt3_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/lxt3/27c64d.bin",
-                           0x000fe000, 8192, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    device_add(&keyboard_xt_lxt3_device);
-
-    machine_xt_laserxt_common_init(model, 1);
-
-    return ret;
-}
diff --git a/src/machine/m_xt_olivetti.c b/src/machine/m_xt_olivetti.c
index 0b5a3eab0..079cd4555 100644
--- a/src/machine/m_xt_olivetti.c
+++ b/src/machine/m_xt_olivetti.c
@@ -30,6 +30,7 @@
 #include <wchar.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/io.h>
 #include <86box/pic.h>
@@ -38,6 +39,7 @@
 #include <86box/nmi.h>
 #include <86box/mem.h>
 #include <86box/device.h>
+#include <86box/lpt.h>
 #include <86box/nvr.h>
 #include <86box/keyboard.h>
 #include <86box/mouse.h>
@@ -591,7 +593,7 @@ m24_kbd_write(uint16_t port, uint8_t val, void *priv)
                          * bit 7 - use BIOS HD on mainboard (on) / on controller (off)
                          * bit 6 - use OCG/CGA display adapter (on) / other display adapter (off)
                          */
-                        ret = (hdc_current == HDC_INTERNAL) ? 0x00 : 0x80;
+                        ret = (hdc_current[0] == HDC_INTERNAL) ? 0x00 : 0x80;
                         ret |= video_is_cga() ? 0x40 : 0x00;
 
                         m24_kbd_adddata(ret);
@@ -846,262 +848,518 @@ ms_poll(void *priv)
  */
 const scancode scancode_olivetti_m24_deluxe[512] = {
   // clang-format off
-    { {0},       {0}       }, { {0x01, 0}, {0x81, 0} },
-    { {0x02, 0}, {0x82, 0} }, { {0x03, 0}, {0x83, 0} },
-    { {0x04, 0}, {0x84, 0} }, { {0x05, 0}, {0x85, 0} },
-    { {0x06, 0}, {0x86, 0} }, { {0x07, 0}, {0x87, 0} },
-    { {0x08, 0}, {0x88, 0} }, { {0x09, 0}, {0x89, 0} },
-    { {0x0a, 0}, {0x8a, 0} }, { {0x0b, 0}, {0x8b, 0} },
-    { {0x0c, 0}, {0x8c, 0} }, { {0x0d, 0}, {0x8d, 0} },
-    { {0x0e, 0}, {0x8e, 0} }, { {0x0f, 0}, {0x8f, 0} },
-    { {0x10, 0}, {0x90, 0} }, { {0x11, 0}, {0x91, 0} },
-    { {0x12, 0}, {0x92, 0} }, { {0x13, 0}, {0x93, 0} },
-    { {0x14, 0}, {0x94, 0} }, { {0x15, 0}, {0x95, 0} },
-    { {0x16, 0}, {0x96, 0} }, { {0x17, 0}, {0x97, 0} },
-    { {0x18, 0}, {0x98, 0} }, { {0x19, 0}, {0x99, 0} },
-    { {0x1a, 0}, {0x9a, 0} }, { {0x1b, 0}, {0x9b, 0} },
-    { {0x1c, 0}, {0x9c, 0} }, { {0x1d, 0}, {0x9d, 0} },
-    { {0x1e, 0}, {0x9e, 0} }, { {0x1f, 0}, {0x9f, 0} },
-    { {0x20, 0}, {0xa0, 0} }, { {0x21, 0}, {0xa1, 0} },
-    { {0x22, 0}, {0xa2, 0} }, { {0x23, 0}, {0xa3, 0} },
-    { {0x24, 0}, {0xa4, 0} }, { {0x25, 0}, {0xa5, 0} },
-    { {0x26, 0}, {0xa6, 0} }, { {0x27, 0}, {0xa7, 0} },
-    { {0x28, 0}, {0xa8, 0} }, { {0x29, 0}, {0xa9, 0} },
-    { {0x2a, 0}, {0xaa, 0} }, { {0x2b, 0}, {0xab, 0} },
-    { {0x2c, 0}, {0xac, 0} }, { {0x2d, 0}, {0xad, 0} },
-    { {0x2e, 0}, {0xae, 0} }, { {0x2f, 0}, {0xaf, 0} },
-    { {0x30, 0}, {0xb0, 0} }, { {0x31, 0}, {0xb1, 0} },
-    { {0x32, 0}, {0xb2, 0} }, { {0x33, 0}, {0xb3, 0} },
-    { {0x34, 0}, {0xb4, 0} }, { {0x35, 0}, {0xb5, 0} },
-    { {0x36, 0}, {0xb6, 0} }, { {0x37, 0}, {0xb7, 0} },
-    { {0x38, 0}, {0xb8, 0} }, { {0x39, 0}, {0xb9, 0} },
-    { {0x3a, 0}, {0xba, 0} }, { {0x3b, 0}, {0xbb, 0} },
-    { {0x3c, 0}, {0xbc, 0} }, { {0x3d, 0}, {0xbd, 0} },
-    { {0x3e, 0}, {0xbe, 0} }, { {0x3f, 0}, {0xbf, 0} },
-    { {0x40, 0}, {0xc0, 0} }, { {0x41, 0}, {0xc1, 0} },
-    { {0x42, 0}, {0xc2, 0} }, { {0x43, 0}, {0xc3, 0} },
-    { {0x44, 0}, {0xc4, 0} }, { {0x45, 0}, {0xc5, 0} },
-    { {0x46, 0}, {0xc6, 0} }, { {0x47, 0}, {0xc7, 0} },
-    { {0x48, 0}, {0xc8, 0} }, { {0x49, 0}, {0xc9, 0} },
-    { {0x4a, 0}, {0xca, 0} }, { {0x4b, 0}, {0xcb, 0} },
-    { {0x4c, 0}, {0xcc, 0} }, { {0x4d, 0}, {0xcd, 0} },
-    { {0x4e, 0}, {0xce, 0} }, { {0x4f, 0}, {0xcf, 0} },
-    { {0x50, 0}, {0xd0, 0} }, { {0x51, 0}, {0xd1, 0} },
-    { {0x52, 0}, {0xd2, 0} }, { {0x53, 0}, {0xd3, 0} },
-    { {0},             {0} }, { {0},             {0} },
-    { {0x5e, 0}, {0xde, 0} }, { {0x60, 0}, {0xe0, 0} }, /*054*/
-    { {0x61, 0}, {0xe1, 0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*058*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*05c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*060*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*064*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*068*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*06c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*070*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*074*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*078*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*07c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*080*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*084*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*088*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*08c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*090*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*094*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*098*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*09c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0a0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0a4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0a8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0ac*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0b0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0b4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0b8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0bc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0c0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0c4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0c8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0cc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0d0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0d4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0d8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0dc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0e0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0e4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0e8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0ec*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0f0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0f4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0f8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0fc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*100*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*104*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*108*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*10c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*110*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*114*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*118*/
-    { {0x57, 0}, {0xd7, 0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*11c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*120*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*124*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*128*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*12c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*130*/
-    { {0},             {0} }, { {0x5f, 0}, {0xdf, 0} },
-    { {0},             {0} }, { {0x37, 0}, {0xb7, 0} }, /*134*/
-    { {0x66, 0}, {0xe6, 0} }, { {0x55, 0}, {0xd5, 0} },
-    { {0},             {0} }, { {0},             {0} }, /*138*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*13c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*140*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0x46, 0}, {0xc6, 0} }, { {0x63, 0}, {0xe3, 0} }, /*144*/
-    { {0x5b, 0}, {0xdb, 0} }, { {0x5c, 0}, {0xdc, 0} },
-    { {0},             {0} }, { {0x58, 0}, {0xd8, 0} }, /*148*/
-    { {0},             {0} }, { {0x5a, 0}, {0xda, 0} },
-    { {0},             {0} }, { {0x65, 0}, {0xe5, 0} }, /*14c*/
-    { {0x59, 0}, {0xd9, 0} }, { {0x5d, 0}, {0xdd, 0} },
-    { {0x62, 0}, {0xe2, 0} }, { {0x64, 0}, {0xe4, 0} }, /*150*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*154*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0x54, 0}, {0xd4, 0} }, /*158*/
-    { {0x67, 0}, {0xe7, 0} }, { {0x56, 0}, {0xd6, 0} },
-    { {0},             {0} }, { {0},             {0} }, /*15c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*160*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*164*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*168*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*16c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*170*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*174*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*148*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*17c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*180*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*184*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*188*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*18c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*190*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*194*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*198*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*19c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1a0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1a4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1a8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1ac*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1b0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1b4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1b8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1bc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1c0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1c4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1c8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1cc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1d0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1d4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1d8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1dc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1e0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1e4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1e8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1ec*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1f0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1f4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1f8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }  /*1fc*/
+    { .mk = {            0 }, .brk = {                   0 } }, /* 000 */
+    { .mk = {      0x01, 0 }, .brk = {             0x81, 0 } }, /* 001 */
+    { .mk = {      0x02, 0 }, .brk = {             0x82, 0 } }, /* 002 */
+    { .mk = {      0x03, 0 }, .brk = {             0x83, 0 } }, /* 003 */
+    { .mk = {      0x04, 0 }, .brk = {             0x84, 0 } }, /* 004 */
+    { .mk = {      0x05, 0 }, .brk = {             0x85, 0 } }, /* 005 */
+    { .mk = {      0x06, 0 }, .brk = {             0x86, 0 } }, /* 006 */
+    { .mk = {      0x07, 0 }, .brk = {             0x87, 0 } }, /* 007 */
+    { .mk = {      0x08, 0 }, .brk = {             0x88, 0 } }, /* 008 */
+    { .mk = {      0x09, 0 }, .brk = {             0x89, 0 } }, /* 009 */
+    { .mk = {      0x0a, 0 }, .brk = {             0x8a, 0 } }, /* 00a */
+    { .mk = {      0x0b, 0 }, .brk = {             0x8b, 0 } }, /* 00b */
+    { .mk = {      0x0c, 0 }, .brk = {             0x8c, 0 } }, /* 00c */
+    { .mk = {      0x0d, 0 }, .brk = {             0x8d, 0 } }, /* 00d */
+    { .mk = {      0x0e, 0 }, .brk = {             0x8e, 0 } }, /* 00e */
+    { .mk = {      0x0f, 0 }, .brk = {             0x8f, 0 } }, /* 00f */
+    { .mk = {      0x10, 0 }, .brk = {             0x90, 0 } }, /* 010 */
+    { .mk = {      0x11, 0 }, .brk = {             0x91, 0 } }, /* 011 */
+    { .mk = {      0x12, 0 }, .brk = {             0x92, 0 } }, /* 013 */
+    { .mk = {      0x13, 0 }, .brk = {             0x93, 0 } }, /* 013 */
+    { .mk = {      0x14, 0 }, .brk = {             0x94, 0 } }, /* 014 */
+    { .mk = {      0x15, 0 }, .brk = {             0x95, 0 } }, /* 015 */
+    { .mk = {      0x16, 0 }, .brk = {             0x96, 0 } }, /* 016 */
+    { .mk = {      0x17, 0 }, .brk = {             0x97, 0 } }, /* 017 */
+    { .mk = {      0x18, 0 }, .brk = {             0x98, 0 } }, /* 018 */
+    { .mk = {      0x19, 0 }, .brk = {             0x99, 0 } }, /* 019 */
+    { .mk = {      0x1a, 0 }, .brk = {             0x9a, 0 } }, /* 01a */
+    { .mk = {      0x1b, 0 }, .brk = {             0x9b, 0 } }, /* 01b */
+    { .mk = {      0x1c, 0 }, .brk = {             0x9c, 0 } }, /* 01c */
+    { .mk = {      0x1d, 0 }, .brk = {             0x9d, 0 } }, /* 01d */
+    { .mk = {      0x1e, 0 }, .brk = {             0x9e, 0 } }, /* 01e */
+    { .mk = {      0x1f, 0 }, .brk = {             0x9f, 0 } }, /* 01f */
+    { .mk = {      0x20, 0 }, .brk = {             0xa0, 0 } }, /* 020 */
+    { .mk = {      0x21, 0 }, .brk = {             0xa1, 0 } }, /* 021 */
+    { .mk = {      0x22, 0 }, .brk = {             0xa2, 0 } }, /* 022 */
+    { .mk = {      0x23, 0 }, .brk = {             0xa3, 0 } }, /* 023 */
+    { .mk = {      0x24, 0 }, .brk = {             0xa4, 0 } }, /* 024 */
+    { .mk = {      0x25, 0 }, .brk = {             0xa5, 0 } }, /* 025 */
+    { .mk = {      0x26, 0 }, .brk = {             0xa6, 0 } }, /* 026 */
+    { .mk = {      0x27, 0 }, .brk = {             0xa7, 0 } }, /* 027 */
+    { .mk = {      0x28, 0 }, .brk = {             0xa8, 0 } }, /* 028 */
+    { .mk = {      0x29, 0 }, .brk = {             0xa9, 0 } }, /* 029 */
+    { .mk = {      0x2a, 0 }, .brk = {             0xaa, 0 } }, /* 02a */
+    { .mk = {      0x2b, 0 }, .brk = {             0xab, 0 } }, /* 02b */
+    { .mk = {      0x2c, 0 }, .brk = {             0xac, 0 } }, /* 02c */
+    { .mk = {      0x2d, 0 }, .brk = {             0xad, 0 } }, /* 02d */
+    { .mk = {      0x2e, 0 }, .brk = {             0xae, 0 } }, /* 02e */
+    { .mk = {      0x2f, 0 }, .brk = {             0xaf, 0 } }, /* 02f */
+    { .mk = {      0x30, 0 }, .brk = {             0xb0, 0 } }, /* 030 */
+    { .mk = {      0x31, 0 }, .brk = {             0xb1, 0 } }, /* 031 */
+    { .mk = {      0x32, 0 }, .brk = {             0xb2, 0 } }, /* 032 */
+    { .mk = {      0x33, 0 }, .brk = {             0xb3, 0 } }, /* 033 */
+    { .mk = {      0x34, 0 }, .brk = {             0xb4, 0 } }, /* 034 */
+    { .mk = {      0x35, 0 }, .brk = {             0xb5, 0 } }, /* 035 */
+    { .mk = {      0x36, 0 }, .brk = {             0xb6, 0 } }, /* 036 */
+    { .mk = {      0x37, 0 }, .brk = {             0xb7, 0 } }, /* 037 */
+    { .mk = {      0x38, 0 }, .brk = {             0xb8, 0 } }, /* 038 */
+    { .mk = {      0x39, 0 }, .brk = {             0xb9, 0 } }, /* 039 */
+    { .mk = {      0x3a, 0 }, .brk = {             0xba, 0 } }, /* 03a */
+    { .mk = {      0x3b, 0 }, .brk = {             0xbb, 0 } }, /* 03b */
+    { .mk = {      0x3c, 0 }, .brk = {             0xbc, 0 } }, /* 03c */
+    { .mk = {      0x3d, 0 }, .brk = {             0xbd, 0 } }, /* 03d */
+    { .mk = {      0x3e, 0 }, .brk = {             0xbe, 0 } }, /* 03e */
+    { .mk = {      0x3f, 0 }, .brk = {             0xbf, 0 } }, /* 03f */
+    { .mk = {      0x40, 0 }, .brk = {             0xc0, 0 } }, /* 040 */
+    { .mk = {      0x41, 0 }, .brk = {             0xc1, 0 } }, /* 041 */
+    { .mk = {      0x42, 0 }, .brk = {             0xc2, 0 } }, /* 042 */
+    { .mk = {      0x43, 0 }, .brk = {             0xc3, 0 } }, /* 043 */
+    { .mk = {      0x44, 0 }, .brk = {             0xc4, 0 } }, /* 044 */
+    { .mk = {      0x45, 0 }, .brk = {             0xc5, 0 } }, /* 045 */
+    { .mk = {      0x46, 0 }, .brk = {             0xc6, 0 } }, /* 046 */
+    { .mk = {      0x47, 0 }, .brk = {             0xc7, 0 } }, /* 047 */
+    { .mk = {      0x48, 0 }, .brk = {             0xc8, 0 } }, /* 048 */
+    { .mk = {      0x49, 0 }, .brk = {             0xc9, 0 } }, /* 049 */
+    { .mk = {      0x4a, 0 }, .brk = {             0xca, 0 } }, /* 04a */
+    { .mk = {      0x4b, 0 }, .brk = {             0xcb, 0 } }, /* 04b */
+    { .mk = {      0x4c, 0 }, .brk = {             0xcc, 0 } }, /* 04c */
+    { .mk = {      0x4d, 0 }, .brk = {             0xcd, 0 } }, /* 04d */
+    { .mk = {      0x4e, 0 }, .brk = {             0xce, 0 } }, /* 04e */
+    { .mk = {      0x4f, 0 }, .brk = {             0xcf, 0 } }, /* 04f */
+    { .mk = {      0x50, 0 }, .brk = {             0xd0, 0 } }, /* 050 */
+    { .mk = {      0x51, 0 }, .brk = {             0xd1, 0 } }, /* 051 */
+    { .mk = {      0x52, 0 }, .brk = {             0xd2, 0 } }, /* 052 */
+    { .mk = {      0x53, 0 }, .brk = {             0xd3, 0 } }, /* 053 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 054 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 055 */
+    { .mk = {      0x5e, 0 }, .brk = {             0xde, 0 } }, /* 056 */
+    { .mk = {      0x60, 0 }, .brk = {             0xe0, 0 } }, /* 057 */
+    { .mk = {      0x61, 0 }, .brk = {             0xe1, 0 } }, /* 058 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 059 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 060 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 061 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 062 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 063 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 064 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 065 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 066 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 067 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 068 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 069 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 070 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 071 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 072 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 073 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 074 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 075 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 076 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 077 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 078 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 079 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 080 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 081 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 082 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 083 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 084 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 085 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 086 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 087 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 088 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 089 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 090 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 091 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 092 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 093 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 094 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 095 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 096 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 097 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 098 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 099 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ed */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fe */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ff */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 100 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 101 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 102 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 103 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 104 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 105 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 106 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 107 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 108 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 109 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 110 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 111 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 112 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 113 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 114 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 115 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 116 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 117 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 118 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 119 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11b */
+    { .mk = {      0x57, 0 }, .brk = {             0xd7, 0 } }, /* 11c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 120 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 121 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 122 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 123 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 124 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 125 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 126 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 127 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 128 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 129 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 130 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 131 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 132 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 133 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 134 */
+    { .mk = {      0x5f, 0 }, .brk = {             0xdf, 0 } }, /* 135 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 136 */
+    { .mk = {      0x37, 0 }, .brk = {             0xb7, 0 } }, /* 137 */
+    { .mk = {      0x66, 0 }, .brk = {             0xe6, 0 } }, /* 138 */
+    { .mk = {      0x55, 0 }, .brk = {             0xd5, 0 } }, /* 139 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 140 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 141 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 142 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 143 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 144 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 145 */
+    { .mk = {      0x46, 0 }, .brk = {             0xc6, 0 } }, /* 146 */
+    { .mk = {      0x63, 0 }, .brk = {             0xe3, 0 } }, /* 147 */
+    { .mk = {      0x5b, 0 }, .brk = {             0xdb, 0 } }, /* 148 */
+    { .mk = {      0x5c, 0 }, .brk = {             0xdc, 0 } }, /* 149 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14a */
+    { .mk = {      0x58, 0 }, .brk = {             0xd8, 0 } }, /* 14b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14c */
+    { .mk = {      0x5a, 0 }, .brk = {             0xda, 0 } }, /* 14d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14e */
+    { .mk = {      0x65, 0 }, .brk = {             0xe5, 0 } }, /* 14f */
+    { .mk = {      0x59, 0 }, .brk = {             0xd9, 0 } }, /* 150 */
+    { .mk = {      0x5d, 0 }, .brk = {             0xdd, 0 } }, /* 151 */
+    { .mk = {      0x62, 0 }, .brk = {             0xe2, 0 } }, /* 152 */
+    { .mk = {      0x64, 0 }, .brk = {             0xe4, 0 } }, /* 153 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 154 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 155 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 156 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 157 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 158 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 159 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15a */
+    { .mk = {      0x54, 0 }, .brk = {             0xd4, 0 } }, /* 15b */
+    { .mk = {      0x67, 0 }, .brk = {             0xe7, 0 } }, /* 15c */
+    { .mk = {      0x56, 0 }, .brk = {             0xd6, 0 } }, /* 15d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 160 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 161 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 162 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 163 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 164 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 165 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 166 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 167 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 168 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 169 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 170 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 171 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 172 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 173 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 174 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 175 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 176 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 177 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 178 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 179 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 180 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 181 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 182 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 183 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 184 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 185 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 186 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 187 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 188 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 189 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 190 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 191 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 192 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 193 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 194 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 195 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 196 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 197 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 198 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 199 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ed */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fe */
+    { .mk = {            0 }, .brk = {                   0 } }  /* 1ff */
   // clang-format on
 };
 
@@ -1113,262 +1371,518 @@ const scancode scancode_olivetti_m24_deluxe[512] = {
  */
 const scancode scancode_olivetti_m240[512] = {
   // clang-format off
-    { {0},       {0}       }, { {0x01, 0}, {0x81, 0} },
-    { {0x02, 0}, {0x82, 0} }, { {0x03, 0}, {0x83, 0} },
-    { {0x04, 0}, {0x84, 0} }, { {0x05, 0}, {0x85, 0} },
-    { {0x06, 0}, {0x86, 0} }, { {0x07, 0}, {0x87, 0} },
-    { {0x08, 0}, {0x88, 0} }, { {0x09, 0}, {0x89, 0} },
-    { {0x0a, 0}, {0x8a, 0} }, { {0x0b, 0}, {0x8b, 0} },
-    { {0x0c, 0}, {0x8c, 0} }, { {0x0d, 0}, {0x8d, 0} },
-    { {0x0e, 0}, {0x8e, 0} }, { {0x0f, 0}, {0x8f, 0} },
-    { {0x10, 0}, {0x90, 0} }, { {0x11, 0}, {0x91, 0} },
-    { {0x12, 0}, {0x92, 0} }, { {0x13, 0}, {0x93, 0} },
-    { {0x14, 0}, {0x94, 0} }, { {0x15, 0}, {0x95, 0} },
-    { {0x16, 0}, {0x96, 0} }, { {0x17, 0}, {0x97, 0} },
-    { {0x18, 0}, {0x98, 0} }, { {0x19, 0}, {0x99, 0} },
-    { {0x1a, 0}, {0x9a, 0} }, { {0x1b, 0}, {0x9b, 0} },
-    { {0x1c, 0}, {0x9c, 0} }, { {0x1d, 0}, {0x9d, 0} },
-    { {0x1e, 0}, {0x9e, 0} }, { {0x1f, 0}, {0x9f, 0} },
-    { {0x20, 0}, {0xa0, 0} }, { {0x21, 0}, {0xa1, 0} },
-    { {0x22, 0}, {0xa2, 0} }, { {0x23, 0}, {0xa3, 0} },
-    { {0x24, 0}, {0xa4, 0} }, { {0x25, 0}, {0xa5, 0} },
-    { {0x26, 0}, {0xa6, 0} }, { {0x27, 0}, {0xa7, 0} },
-    { {0x28, 0}, {0xa8, 0} }, { {0x29, 0}, {0xa9, 0} },
-    { {0x2a, 0}, {0xaa, 0} }, { {0x2b, 0}, {0xab, 0} },
-    { {0x2c, 0}, {0xac, 0} }, { {0x2d, 0}, {0xad, 0} },
-    { {0x2e, 0}, {0xae, 0} }, { {0x2f, 0}, {0xaf, 0} },
-    { {0x30, 0}, {0xb0, 0} }, { {0x31, 0}, {0xb1, 0} },
-    { {0x32, 0}, {0xb2, 0} }, { {0x33, 0}, {0xb3, 0} },
-    { {0x34, 0}, {0xb4, 0} }, { {0x35, 0}, {0xb5, 0} },
-    { {0x36, 0}, {0xb6, 0} }, { {0x37, 0}, {0xb7, 0} },
-    { {0x38, 0}, {0xb8, 0} }, { {0x39, 0}, {0xb9, 0} },
-    { {0x3a, 0}, {0xba, 0} }, { {0x3b, 0}, {0xbb, 0} },
-    { {0x3c, 0}, {0xbc, 0} }, { {0x3d, 0}, {0xbd, 0} },
-    { {0x3e, 0}, {0xbe, 0} }, { {0x3f, 0}, {0xbf, 0} },
-    { {0x40, 0}, {0xc0, 0} }, { {0x41, 0}, {0xc1, 0} },
-    { {0x42, 0}, {0xc2, 0} }, { {0x43, 0}, {0xc3, 0} },
-    { {0x44, 0}, {0xc4, 0} }, { {0x45, 0}, {0xc5, 0} },
-    { {0x46, 0}, {0xc6, 0} }, { {0x47, 0}, {0xc7, 0} },
-    { {0x48, 0}, {0xc8, 0} }, { {0x49, 0}, {0xc9, 0} },
-    { {0x4a, 0}, {0xca, 0} }, { {0x4b, 0}, {0xcb, 0} },
-    { {0x4c, 0}, {0xcc, 0} }, { {0x4d, 0}, {0xcd, 0} },
-    { {0x4e, 0}, {0xce, 0} }, { {0x4f, 0}, {0xcf, 0} },
-    { {0x50, 0}, {0xd0, 0} }, { {0x51, 0}, {0xd1, 0} },
-    { {0x52, 0}, {0xd2, 0} }, { {0x53, 0}, {0xd3, 0} },
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*054*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*058*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*05c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*060*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*064*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*068*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*06c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*070*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*074*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*078*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*07c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*080*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*084*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*088*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*08c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*090*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*094*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*098*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*09c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0a0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0a4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0a8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0ac*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0b0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0b4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0b8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0bc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0c0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0c4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0c8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0cc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0d0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0d4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0d8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0dc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0e0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0e4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0e8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0ec*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0f0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0f4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0f8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*0fc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*100*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*104*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*108*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*10c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*110*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*114*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*118*/
-    { {0x1c, 0}, {0x9c, 0} }, { {0x1d, 0}, {0x9d, 0} },
-    { {0},             {0} }, { {0},             {0} }, /*11c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*120*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*124*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*128*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*12c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*130*/
-    { {0},             {0} }, { {0x35, 0}, {0xb5, 0} },
-    { {0},             {0} }, { {0x37, 0}, {0xb7, 0} }, /*134*/
-    { {0x38, 0}, {0xb8, 0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*138*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*13c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*140*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0x46, 0}, {0xc6, 0} }, { {0x47, 0}, {0xc7, 0} }, /*144*/
-    { {0x48, 0}, {0xc8, 0} }, { {0x49, 0}, {0xc9, 0} },
-    { {0},             {0} }, { {0x4b, 0}, {0xcb, 0} }, /*148*/
-    { {0},             {0} }, { {0x4d, 0}, {0xcd, 0} },
-    { {0},             {0} }, { {0x4f, 0}, {0xcf, 0} }, /*14c*/
-    { {0x50, 0}, {0xd0, 0} }, { {0x51, 0}, {0xd1, 0} },
-    { {0x52, 0}, {0xd2, 0} }, { {0x53, 0}, {0xd3, 0} }, /*150*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*154*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*158*/
-    { {0},             {0} }, { {0x54, 0}, {0xd4, 0} },
-    { {0x56, 0}, {0xd6, 0} }, { {0x5c, 0}, {0xdc, 0} }, /*15c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*160*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*164*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*168*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*16c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*170*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*174*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*148*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*17c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*180*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*184*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*188*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*18c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*190*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*194*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*198*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*19c*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1a0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1a4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1a8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1ac*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1b0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1b4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1b8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1bc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1c0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1c4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1c8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1cc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1d0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1d4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1d8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1dc*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1e0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1e4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1e8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1ec*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1f0*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1f4*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }, /*1f8*/
-    { {0},             {0} }, { {0},             {0} },
-    { {0},             {0} }, { {0},             {0} }  /*1fc*/
+    { .mk = {            0 }, .brk = {                   0 } }, /* 000 */
+    { .mk = {      0x01, 0 }, .brk = {             0x81, 0 } }, /* 001 */
+    { .mk = {      0x02, 0 }, .brk = {             0x82, 0 } }, /* 002 */
+    { .mk = {      0x03, 0 }, .brk = {             0x83, 0 } }, /* 003 */
+    { .mk = {      0x04, 0 }, .brk = {             0x84, 0 } }, /* 004 */
+    { .mk = {      0x05, 0 }, .brk = {             0x85, 0 } }, /* 005 */
+    { .mk = {      0x06, 0 }, .brk = {             0x86, 0 } }, /* 006 */
+    { .mk = {      0x07, 0 }, .brk = {             0x87, 0 } }, /* 007 */
+    { .mk = {      0x08, 0 }, .brk = {             0x88, 0 } }, /* 008 */
+    { .mk = {      0x09, 0 }, .brk = {             0x89, 0 } }, /* 009 */
+    { .mk = {      0x0a, 0 }, .brk = {             0x8a, 0 } }, /* 00a */
+    { .mk = {      0x0b, 0 }, .brk = {             0x8b, 0 } }, /* 00b */
+    { .mk = {      0x0c, 0 }, .brk = {             0x8c, 0 } }, /* 00c */
+    { .mk = {      0x0d, 0 }, .brk = {             0x8d, 0 } }, /* 00d */
+    { .mk = {      0x0e, 0 }, .brk = {             0x8e, 0 } }, /* 00e */
+    { .mk = {      0x0f, 0 }, .brk = {             0x8f, 0 } }, /* 00f */
+    { .mk = {      0x10, 0 }, .brk = {             0x90, 0 } }, /* 010 */
+    { .mk = {      0x11, 0 }, .brk = {             0x91, 0 } }, /* 011 */
+    { .mk = {      0x12, 0 }, .brk = {             0x92, 0 } }, /* 012 */
+    { .mk = {      0x13, 0 }, .brk = {             0x93, 0 } }, /* 013 */
+    { .mk = {      0x14, 0 }, .brk = {             0x94, 0 } }, /* 014 */
+    { .mk = {      0x15, 0 }, .brk = {             0x95, 0 } }, /* 015 */
+    { .mk = {      0x16, 0 }, .brk = {             0x96, 0 } }, /* 016 */
+    { .mk = {      0x17, 0 }, .brk = {             0x97, 0 } }, /* 017 */
+    { .mk = {      0x18, 0 }, .brk = {             0x98, 0 } }, /* 018 */
+    { .mk = {      0x19, 0 }, .brk = {             0x99, 0 } }, /* 019 */
+    { .mk = {      0x1a, 0 }, .brk = {             0x9a, 0 } }, /* 01a */
+    { .mk = {      0x1b, 0 }, .brk = {             0x9b, 0 } }, /* 01b */
+    { .mk = {      0x1c, 0 }, .brk = {             0x9c, 0 } }, /* 01c */
+    { .mk = {      0x1d, 0 }, .brk = {             0x9d, 0 } }, /* 01d */
+    { .mk = {      0x1e, 0 }, .brk = {             0x9e, 0 } }, /* 01e */
+    { .mk = {      0x1f, 0 }, .brk = {             0x9f, 0 } }, /* 01f */
+    { .mk = {      0x20, 0 }, .brk = {             0xa0, 0 } }, /* 020 */
+    { .mk = {      0x21, 0 }, .brk = {             0xa1, 0 } }, /* 021 */
+    { .mk = {      0x22, 0 }, .brk = {             0xa2, 0 } }, /* 023 */
+    { .mk = {      0x23, 0 }, .brk = {             0xa3, 0 } }, /* 023 */
+    { .mk = {      0x24, 0 }, .brk = {             0xa4, 0 } }, /* 024 */
+    { .mk = {      0x25, 0 }, .brk = {             0xa5, 0 } }, /* 025 */
+    { .mk = {      0x26, 0 }, .brk = {             0xa6, 0 } }, /* 026 */
+    { .mk = {      0x27, 0 }, .brk = {             0xa7, 0 } }, /* 027 */
+    { .mk = {      0x28, 0 }, .brk = {             0xa8, 0 } }, /* 028 */
+    { .mk = {      0x29, 0 }, .brk = {             0xa9, 0 } }, /* 029 */
+    { .mk = {      0x2a, 0 }, .brk = {             0xaa, 0 } }, /* 02a */
+    { .mk = {      0x2b, 0 }, .brk = {             0xab, 0 } }, /* 02b */
+    { .mk = {      0x2c, 0 }, .brk = {             0xac, 0 } }, /* 02c */
+    { .mk = {      0x2d, 0 }, .brk = {             0xad, 0 } }, /* 02d */
+    { .mk = {      0x2e, 0 }, .brk = {             0xae, 0 } }, /* 02e */
+    { .mk = {      0x2f, 0 }, .brk = {             0xaf, 0 } }, /* 02f */
+    { .mk = {      0x30, 0 }, .brk = {             0xb0, 0 } }, /* 030 */
+    { .mk = {      0x31, 0 }, .brk = {             0xb1, 0 } }, /* 031 */
+    { .mk = {      0x32, 0 }, .brk = {             0xb2, 0 } }, /* 032 */
+    { .mk = {      0x33, 0 }, .brk = {             0xb3, 0 } }, /* 033 */
+    { .mk = {      0x34, 0 }, .brk = {             0xb4, 0 } }, /* 034 */
+    { .mk = {      0x35, 0 }, .brk = {             0xb5, 0 } }, /* 035 */
+    { .mk = {      0x36, 0 }, .brk = {             0xb6, 0 } }, /* 036 */
+    { .mk = {      0x37, 0 }, .brk = {             0xb7, 0 } }, /* 037 */
+    { .mk = {      0x38, 0 }, .brk = {             0xb8, 0 } }, /* 038 */
+    { .mk = {      0x39, 0 }, .brk = {             0xb9, 0 } }, /* 039 */
+    { .mk = {      0x3a, 0 }, .brk = {             0xba, 0 } }, /* 03a */
+    { .mk = {      0x3b, 0 }, .brk = {             0xbb, 0 } }, /* 03b */
+    { .mk = {      0x3c, 0 }, .brk = {             0xbc, 0 } }, /* 03c */
+    { .mk = {      0x3d, 0 }, .brk = {             0xbd, 0 } }, /* 03d */
+    { .mk = {      0x3e, 0 }, .brk = {             0xbe, 0 } }, /* 03e */
+    { .mk = {      0x3f, 0 }, .brk = {             0xbf, 0 } }, /* 03f */
+    { .mk = {      0x40, 0 }, .brk = {             0xc0, 0 } }, /* 040 */
+    { .mk = {      0x41, 0 }, .brk = {             0xc1, 0 } }, /* 041 */
+    { .mk = {      0x42, 0 }, .brk = {             0xc2, 0 } }, /* 042 */
+    { .mk = {      0x43, 0 }, .brk = {             0xc3, 0 } }, /* 043 */
+    { .mk = {      0x44, 0 }, .brk = {             0xc4, 0 } }, /* 044 */
+    { .mk = {      0x45, 0 }, .brk = {             0xc5, 0 } }, /* 045 */
+    { .mk = {      0x46, 0 }, .brk = {             0xc6, 0 } }, /* 046 */
+    { .mk = {      0x47, 0 }, .brk = {             0xc7, 0 } }, /* 047 */
+    { .mk = {      0x48, 0 }, .brk = {             0xc8, 0 } }, /* 048 */
+    { .mk = {      0x49, 0 }, .brk = {             0xc9, 0 } }, /* 049 */
+    { .mk = {      0x4a, 0 }, .brk = {             0xca, 0 } }, /* 04a */
+    { .mk = {      0x4b, 0 }, .brk = {             0xcb, 0 } }, /* 04b */
+    { .mk = {      0x4c, 0 }, .brk = {             0xcc, 0 } }, /* 04c */
+    { .mk = {      0x4d, 0 }, .brk = {             0xcd, 0 } }, /* 04d */
+    { .mk = {      0x4e, 0 }, .brk = {             0xce, 0 } }, /* 04e */
+    { .mk = {      0x4f, 0 }, .brk = {             0xcf, 0 } }, /* 04f */
+    { .mk = {      0x50, 0 }, .brk = {             0xd0, 0 } }, /* 050 */
+    { .mk = {      0x51, 0 }, .brk = {             0xd1, 0 } }, /* 051 */
+    { .mk = {      0x52, 0 }, .brk = {             0xd2, 0 } }, /* 052 */
+    { .mk = {      0x53, 0 }, .brk = {             0xd3, 0 } }, /* 053 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 054 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 055 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 056 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 057 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 058 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 059 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 05f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 060 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 061 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 062 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 063 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 064 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 065 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 066 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 067 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 068 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 069 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 06f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 070 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 071 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 072 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 073 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 074 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 075 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 076 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 077 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 078 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 079 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 07f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 080 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 081 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 082 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 083 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 084 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 085 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 086 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 087 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 088 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 089 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 08f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 090 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 091 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 092 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 093 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 094 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 095 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 096 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 097 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 098 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 099 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 09f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ed */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0fe */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 0ff */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 100 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 101 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 102 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 103 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 104 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 105 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 106 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 107 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 108 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 109 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 10f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 110 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 111 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 112 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 113 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 114 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 115 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 116 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 117 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 118 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 119 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11b */
+    { .mk = {      0x1c, 0 }, .brk = {             0x9c, 0 } }, /* 11c */
+    { .mk = {      0x1d, 0 }, .brk = {             0x9d, 0 } }, /* 11d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 11f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 120 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 121 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 122 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 123 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 124 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 125 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 126 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 127 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 128 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 129 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 12f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 130 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 131 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 132 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 133 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 134 */
+    { .mk = {      0x35, 0 }, .brk = {             0xb5, 0 } }, /* 135 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 136 */
+    { .mk = {      0x37, 0 }, .brk = {             0xb7, 0 } }, /* 137 */
+    { .mk = {      0x38, 0 }, .brk = {             0xb8, 0 } }, /* 138 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 139 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 13f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 140 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 141 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 142 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 143 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 144 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 145 */
+    { .mk = {      0x46, 0 }, .brk = {             0xc6, 0 } }, /* 146 */
+    { .mk = {      0x47, 0 }, .brk = {             0xc7, 0 } }, /* 147 */
+    { .mk = {      0x48, 0 }, .brk = {             0xc8, 0 } }, /* 148 */
+    { .mk = {      0x49, 0 }, .brk = {             0xc9, 0 } }, /* 149 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14a */
+    { .mk = {      0x4b, 0 }, .brk = {             0xcb, 0 } }, /* 14b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14c */
+    { .mk = {      0x4d, 0 }, .brk = {             0xcd, 0 } }, /* 14d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 14e */
+    { .mk = {      0x4f, 0 }, .brk = {             0xcf, 0 } }, /* 14f */
+    { .mk = {      0x50, 0 }, .brk = {             0xd0, 0 } }, /* 150 */
+    { .mk = {      0x51, 0 }, .brk = {             0xd1, 0 } }, /* 151 */
+    { .mk = {      0x52, 0 }, .brk = {             0xd2, 0 } }, /* 152 */
+    { .mk = {      0x53, 0 }, .brk = {             0xd3, 0 } }, /* 153 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 154 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 155 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 156 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 157 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 158 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 159 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 15c */
+    { .mk = {      0x54, 0 }, .brk = {             0xd4, 0 } }, /* 15d */
+    { .mk = {      0x56, 0 }, .brk = {             0xd6, 0 } }, /* 15e */
+    { .mk = {      0x5c, 0 }, .brk = {             0xdc, 0 } }, /* 15f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 160 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 161 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 162 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 163 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 164 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 165 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 166 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 167 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 168 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 169 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 16f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 170 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 171 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 172 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 173 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 174 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 175 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 176 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 177 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 178 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 179 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 17f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 180 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 181 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 182 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 183 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 184 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 185 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 186 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 187 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 188 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 189 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 18f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 190 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 191 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 192 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 193 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 194 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 195 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 196 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 197 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 198 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 199 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19a */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19b */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19c */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19d */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19e */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 19f */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1a9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1aa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ab */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ac */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ad */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ae */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1af */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1b9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ba */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1be */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1bf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1c9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ca */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ce */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1cf */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1d9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1da */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1db */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1dd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1de */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1df */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1e9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ea */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1eb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ec */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ed */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ee */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1ef */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f0 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f1 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f2 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f3 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f4 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f5 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f6 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f7 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f8 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1f9 */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fa */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fb */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fc */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fd */
+    { .mk = {            0 }, .brk = {                   0 } }, /* 1fe */
+    { .mk = {            0 }, .brk = {                   0 } }  /* 1ff */
   // clang-format on
 };
 
@@ -1405,7 +1919,7 @@ m19_vid_out(uint16_t addr, uint8_t val, void *priv)
     /* activating plantronics mode */
     if (addr == 0x3dd) {
         /* already in graphics mode */
-        if ((val & 0x30) && (vid->ogc.cga.cgamode & 0x2))
+        if ((val & 0x30) && (vid->ogc.cga.cgamode & CGA_MODE_FLAG_GRAPHICS))
             vid->mode = PLANTRONICS_MODE;
         else
             vid->mode = OLIVETTI_OGC_MODE;
@@ -1526,6 +2040,8 @@ m19_vid_init(m19_vid_t *vid)
         vid->ogc.mono_display = 0;
     else
         vid->ogc.mono_display = 1;
+
+    vid->ogc.ctrl_addr = 0x3db;
     /* OGC emulation part end */
 
     /* Plantronics emulation part begin*/
@@ -1561,7 +2077,7 @@ const device_t m24_kbd_device = {
     .init          = NULL,
     .close         = m24_kbd_close,
     .reset         = m24_kbd_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1605,7 +2121,7 @@ const device_t m19_vid_device = {
     .init          = NULL,
     .close         = m19_vid_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = m19_vid_speed_changed,
     .force_redraw  = NULL,
     .config        = m19_vid_config
@@ -1707,7 +2223,7 @@ m24_read(uint16_t port, UNUSED(void *priv))
                           "Reserved for HDU", same as for Switch 3 */
 
             /* Switch 3 - Disable internal BIOS HD */
-            if (hdc_current != HDC_INTERNAL)
+            if (hdc_current[0] != HDC_INTERNAL)
                 ret |= 0x4;
 
             /* Switch 2 - Set fast startup */
@@ -1799,27 +2315,25 @@ machine_xt_m24_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    m24_kbd = (m24_kbd_t *) malloc(sizeof(m24_kbd_t));
-    memset(m24_kbd, 0x00, sizeof(m24_kbd_t));
+    m24_kbd = (m24_kbd_t *) calloc(1, sizeof(m24_kbd_t));
 
     machine_common_init(model);
 
     /* On-board FDC can be disabled only on M24SP */
-    if (fdc_type == FDC_INTERNAL)
+    if (fdc_current[0] == FDC_INTERNAL)
         device_add(&fdc_xt_device);
 
     /* Address 66-67 = mainboard dip-switch settings */
     io_sethandler(0x0065, 3, m24_read, NULL, NULL, NULL, NULL, NULL, NULL);
 
-    standalone_gameport_type = &gameport_device;
+    standalone_gameport_type = &gameport_200_device;
 
     nmi_init();
 
     /* Allocate an NVR for this machine. */
-    nvr = (nvr_t *) malloc(sizeof(nvr_t));
+    nvr = (nvr_t *) calloc(1, sizeof(nvr_t));
     if (nvr == NULL)
         return 0;
-    memset(nvr, 0x00, sizeof(nvr_t));
 
     mm58174_init(nvr, model->nvrmask + 1);
 
@@ -1837,7 +2351,7 @@ machine_xt_m24_init(const machine_t *model)
     m24_kbd_init(m24_kbd);
     device_add_ex(&m24_kbd_device, m24_kbd);
 
-    if (hdc_current == HDC_INTERNAL)
+    if (hdc_current[0] == HDC_INTERNAL)
         device_add(&st506_xt_wd1002a_wx1_nobios_device);
 
     return ret;
@@ -1853,15 +2367,14 @@ machine_xt_m240_init(const machine_t *model)
     m24_kbd_t *m24_kbd;
     nvr_t     *nvr;
 
-    ret = bios_load_interleaved("roms/machines/m240/olivetti_m240_pch6_2.04_low.bin",
-                                "roms/machines/m240/olivetti_m240_pch5_2.04_high.bin",
+    ret = bios_load_interleaved("roms/machines/m240/olivetti_m240_pchm_2.12_low.bin",
+                                "roms/machines/m240/olivetti_m240_pchl_2.12_high.bin",
                                 0x000f8000, 32768, 0);
 
     if (bios_only || !ret)
         return ret;
 
-    m24_kbd = (m24_kbd_t *) malloc(sizeof(m24_kbd_t));
-    memset(m24_kbd, 0x00, sizeof(m24_kbd_t));
+    m24_kbd = (m24_kbd_t *) calloc(1, sizeof(m24_kbd_t));
 
     machine_common_init(model);
 
@@ -1881,23 +2394,22 @@ machine_xt_m240_init(const machine_t *model)
     m24_kbd_init(m24_kbd);
     device_add_ex(&m24_kbd_device, m24_kbd);
 
-    if (fdc_type == FDC_INTERNAL)
+    if (fdc_current[0] == FDC_INTERNAL)
         device_add(&fdc_at_device); /* io.c logs clearly show it using port 3F7 */
 
-    if (joystick_type)
-        device_add(&gameport_device);
+    if (joystick_type[0])
+        device_add(&gameport_200_device);
 
     nmi_init();
 
     /* Allocate an NVR for this machine. */
-    nvr = (nvr_t *) malloc(sizeof(nvr_t));
+    nvr = (nvr_t *) calloc(1, sizeof(nvr_t));
     if (nvr == NULL)
         return 0;
-    memset(nvr, 0x00, sizeof(nvr_t));
 
     mm58274_init(nvr, model->nvrmask + 1);
 
-    if (hdc_current == HDC_INTERNAL)
+    if (hdc_current[0] == HDC_INTERNAL)
         device_add(&st506_xt_wd1002a_wx1_nobios_device);
 
     return ret;
@@ -1924,8 +2436,7 @@ machine_xt_m19_init(const machine_t *model)
     m19_vid_t *vid;
 
     /* Do not move memory allocation elsewhere. */
-    vid = (m19_vid_t *) malloc(sizeof(m19_vid_t));
-    memset(vid, 0x00, sizeof(m19_vid_t));
+    vid = (m19_vid_t *) calloc(1, sizeof(m19_vid_t));
 
     machine_common_init(model);
 
@@ -1941,7 +2452,7 @@ machine_xt_m19_init(const machine_t *model)
     m19_vid_init(vid);
     device_add_ex(&m19_vid_device, vid);
 
-    device_add(&keyboard_xt_olivetti_device);
+    device_add(&kbc_xt_olivetti_device);
 
     pit_set_clock((uint32_t) 14318184.0);
 
diff --git a/src/machine/m_xt_t1000.c b/src/machine/m_xt_t1000.c
index a12fa4e96..080a03d19 100644
--- a/src/machine/m_xt_t1000.c
+++ b/src/machine/m_xt_t1000.c
@@ -899,7 +899,7 @@ machine_xt_t1000_init(const machine_t *model)
     machine_common_init(model);
 
     pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_xt);
-    device_add(&keyboard_xt_t1x00_device);
+    device_add(&kbc_xt_t1x00_device);
     t1000.fdc = device_add(&fdc_xt_device);
     nmi_init();
 
@@ -957,7 +957,7 @@ machine_xt_t1200_init(const machine_t *model)
                     NULL, MEM_MAPPING_EXTERNAL, &t1000);
 
     pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_xt);
-    device_add(&keyboard_xt_t1x00_device);
+    device_add(&kbc_xt_t1x00_device);
     t1000.fdc = device_add(&fdc_xt_t1x00_device);
     nmi_init();
 
@@ -969,7 +969,7 @@ machine_xt_t1200_init(const machine_t *model)
     if (gfxcard[0] == VID_INTERNAL)
         device_add(&t1200_video_device);
 
-    if (hdc_current <= 1)
+    if (hdc_current[0] <= HDC_INTERNAL)
         device_add(&st506_xt_toshiba_t1200_device);
 
     return ret;
diff --git a/src/machine/m_xt_xi8088.c b/src/machine/m_xt_xi8088.c
index 3f07e6a4e..756432405 100644
--- a/src/machine/m_xt_xi8088.c
+++ b/src/machine/m_xt_xi8088.c
@@ -110,11 +110,11 @@ static const device_config_t xi8088_config[] = {
         .type = CONFIG_SELECTION,
         .selection = {
             {
-                .description = "64KB starting from 0xF0000",
+                .description = "64 KB starting from F0000",
                 .value = 0
             },
             {
-                .description = "128KB starting from 0xE0000 (address MSB inverted, last 64KB first)",
+                .description = "128 KB starting from E0000 (address MSB inverted, last 64 KB first)",
                 .value = 1
             }
         },
@@ -122,37 +122,37 @@ static const device_config_t xi8088_config[] = {
     },
     {
         .name = "umb_c0000h_c7fff",
-        .description = "Map 0xc0000-0xc7fff as UMB",
+        .description = "Map C0000-C7FFF as UMB",
         .type = CONFIG_BINARY,
         .default_int = 0
     },
     {
         .name = "umb_c8000h_cffff",
-        .description = "Map 0xc8000-0xcffff as UMB",
+        .description = "Map C8000-CFFFF as UMB",
         .type = CONFIG_BINARY,
         .default_int = 0
     },
     {
         .name = "umb_d0000h_d7fff",
-        .description = "Map 0xd0000-0xd7fff as UMB",
+        .description = "Map D0000-D7FFF as UMB",
         .type = CONFIG_BINARY,
         .default_int = 0
     },
     {
         .name = "umb_d8000h_dffff",
-        .description = "Map 0xd8000-0xdffff as UMB",
+        .description = "Map D8000-DFFFF as UMB",
         .type = CONFIG_BINARY,
         .default_int = 0
     },
     {
         .name = "umb_e0000h_e7fff",
-        .description = "Map 0xe0000-0xe7fff as UMB",
+        .description = "Map E0000-E7FFF as UMB",
         .type = CONFIG_BINARY,
         .default_int = 0
     },
     {
         .name = "umb_e8000h_effff",
-        .description = "Map 0xe8000-0xeffff as UMB",
+        .description = "Map E8000-EFFFF as UMB",
         .type = CONFIG_BINARY,
         .default_int = 0
     },
@@ -168,7 +168,7 @@ const device_t xi8088_device = {
     .init          = xi8088_init,
     .close         = NULL,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = xi8088_config
@@ -201,15 +201,15 @@ machine_xt_xi8088_init(const machine_t *model)
 
     machine_common_init(model);
 
-    if (fdc_type == FDC_INTERNAL)
+    if (fdc_current[0] == FDC_INTERNAL)
         device_add(&fdc_at_device);
 
-    device_add(&keyboard_ps2_xi8088_device);
+    device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
     device_add(&port_6x_xi8088_device);
     nmi_init();
     device_add(&ibmat_nvr_device);
     pic2_init();
-    standalone_gameport_type = &gameport_device;
+    standalone_gameport_type = &gameport_200_device;
     device_add(&sst_flash_39sf010_device);
 
     return ret;
diff --git a/src/machine/machine.c b/src/machine/machine.c
index a2cc29322..b7e43c7d3 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -39,6 +39,7 @@
 #include <86box/video.h>
 #include <86box/machine.h>
 #include <86box/isamem.h>
+#include <86box/isarom.h>
 #include <86box/pci.h>
 #include <86box/plat_unused.h>
 
@@ -99,8 +100,6 @@ machine_init_ex(int m)
         mem_reset();
         smbase = is_am486dxl ? 0x00060000 : 0x00030000;
 
-        lpt_init();
-
         if (cassette_enable)
             device_add(&cassette_device);
 
@@ -113,12 +112,19 @@ machine_init_ex(int m)
         /* Reset any ISA memory cards. */
         isamem_reset();
 
+#if 0
+        /* Reset any ISA ROM cards. */
+        isarom_reset();
+#endif
+
         /* Reset the fast off stuff. */
         cpu_fast_off_reset();
 
         pci_flags = 0x00000000;
     }
 
+    is_pcjr = 0;
+
     /* All good, boot the machine! */
     if (machines[m].init)
         ret = machines[m].init(&machines[m]);
@@ -135,30 +141,40 @@ void
 machine_init(void)
 {
     bios_only = 0;
+
+    machine_set_p1_default(machines[machine].kbc_p1);
+    machine_set_ps2();
+
     (void) machine_init_ex(machine);
 }
 
 int
 machine_available(int m)
 {
-    int             ret;
+    int             ret = 0;
     const device_t *dev = machine_get_device(m);
 
-    bios_only = 1;
+    if (dev != NULL)
+        ret = machine_device_available(dev);
+    /*
+       Only via machine_init_ex() if the device is NULL or
+       it lacks a CONFIG_BIOS field (or the CONFIG_BIOS field
+       is not the first in list.
+     */
+    if (ret == 0) {
+        bios_only = 1;
 
-    ret = device_available(dev);
-    /* Do not check via machine_init_ex() if the device is not NULL and
-       it has a CONFIG_BIOS field. */
-    if ((dev == NULL) || (ret != -1))
         ret = machine_init_ex(m);
 
-    bios_only = 0;
+        bios_only = 0;
+    } else if (ret == -2)
+        ret = 0;
 
     return !!ret;
 }
 
 void
-pit_irq0_timer(int new_out, int old_out)
+pit_irq0_timer(int new_out, int old_out, UNUSED(void *priv))
 {
     if (new_out && !old_out)
         picint(1);
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 13a5d5452..7891bb3db 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -8,16 +8,13 @@
  *
  *          Handling of the emulated machines.
  *
- * NOTES:   OpenAT wip for 286-class machine with open BIOS.
- *          PS2_M80-486 wip, pending receipt of TRM's for machine.
- *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *          Fred N. van Kempen, <decwiz@yahoo.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
- *          Copyright 2016-2020 Miran Grca.
- *          Copyright 2017-2020 Fred N. van Kempen.
+ *          Copyright 2016-2025 Miran Grca.
+ *          Copyright 2017-2025 Fred N. van Kempen.
+ *          Copyright 2025      Jasmine Iwanek.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -28,57 +25,48 @@
 #include <86box/mem.h>
 #include <86box/rom.h>
 #include <86box/device.h>
-#include <86box/machine.h>
+#include <86box/chipset.h>
+#include <86box/timer.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
 #include <86box/keyboard.h>
+#include <86box/sio.h>
 #include <86box/sound.h>
 #include <86box/video.h>
+#include <86box/vid_cga.h>
 #include <86box/plat_unused.h>
-#include <86box/net_pcnet.h>
-
-// Temporarily here till we move everything out into the right files
-extern const device_t pcjr_device;
-extern const device_t m19_vid_device;
-extern const device_t vid_device;
-extern const device_t vid_device_hx;
-extern const device_t t1000_video_device;
-extern const device_t xi8088_device;
-extern const device_t cga_device;
-extern const device_t vid_1512_device;
-extern const device_t vid_1640_device;
-extern const device_t vid_pc2086_device;
-extern const device_t vid_pc3086_device;
-extern const device_t vid_200_device;
-extern const device_t vid_ppc512_device;
-extern const device_t vid_device_sl;
-extern const device_t t1200_video_device;
-extern const device_t compaq_plasma_device;
-extern const device_t ps1_2011_device;
+#include <86box/thread.h>
+#include <86box/network.h>
+#include <86box/machine.h>
 
 const machine_filter_t machine_types[] = {
-    { "None",                      MACHINE_TYPE_NONE       },
-    { "8088",                      MACHINE_TYPE_8088       },
-    { "8086",                      MACHINE_TYPE_8086       },
-    { "80286",                     MACHINE_TYPE_286        },
-    { "i386SX",                    MACHINE_TYPE_386SX      },
-    { "486SLC",                    MACHINE_TYPE_486SLC     },
-    { "i386DX",                    MACHINE_TYPE_386DX      },
-    { "i386DX/i486",               MACHINE_TYPE_386DX_486  },
-    { "i486 (Socket 168 and 1)",   MACHINE_TYPE_486        },
-    { "i486 (Socket 2)",           MACHINE_TYPE_486_S2     },
-    { "i486 (Socket 3)",           MACHINE_TYPE_486_S3     },
-    { "i486 (Miscellaneous)",      MACHINE_TYPE_486_MISC   },
-    { "Socket 4",                  MACHINE_TYPE_SOCKET4    },
-    { "Socket 5",                  MACHINE_TYPE_SOCKET5    },
-    { "Socket 7 (Single Voltage)", MACHINE_TYPE_SOCKET7_3V },
-    { "Socket 7 (Dual Voltage)",   MACHINE_TYPE_SOCKET7    },
-    { "Super Socket 7",            MACHINE_TYPE_SOCKETS7   },
-    { "Socket 8",                  MACHINE_TYPE_SOCKET8    },
-    { "Slot 1",                    MACHINE_TYPE_SLOT1      },
-    { "Slot 1/2",                  MACHINE_TYPE_SLOT1_2    },
-    { "Slot 1/Socket 370",         MACHINE_TYPE_SLOT1_370  },
-    { "Slot 2",                    MACHINE_TYPE_SLOT2      },
-    { "Socket 370",                MACHINE_TYPE_SOCKET370  },
-    { "Miscellaneous",             MACHINE_TYPE_MISC       }
+    { "None",                             MACHINE_TYPE_NONE       },
+    { "[1979] 8088",                      MACHINE_TYPE_8088       },
+    { "[1978] 8086",                      MACHINE_TYPE_8086       },
+    { "[1982] 80286",                     MACHINE_TYPE_286        },
+    { "[1988] i386SX",                    MACHINE_TYPE_386SX      },
+    { "[1988] ALi M6117",                 MACHINE_TYPE_M6117      },
+    { "[1992] 486SLC",                    MACHINE_TYPE_486SLC     },
+    { "[1985] i386DX",                    MACHINE_TYPE_386DX      },
+    { "[1989] i386DX/i486",               MACHINE_TYPE_386DX_486  },
+    { "[1992] i486 (Socket 168 and 1)",   MACHINE_TYPE_486        },
+    { "[1992] i486 (Socket 2)",           MACHINE_TYPE_486_S2     },
+    { "[1994] i486 (Socket 3)",           MACHINE_TYPE_486_S3     },
+    { "[1994] i486 (Socket 3 PCI)",       MACHINE_TYPE_486_S3_PCI },
+    { "[1992] i486 (Miscellaneous)",      MACHINE_TYPE_486_MISC   },
+    { "[1993] Socket 4",                  MACHINE_TYPE_SOCKET4    },
+    { "[1994] Socket 4/5",                MACHINE_TYPE_SOCKET4_5  },
+    { "[1994] Socket 5",                  MACHINE_TYPE_SOCKET5    },
+    { "[1995] Socket 7 (Single Voltage)", MACHINE_TYPE_SOCKET7_3V },
+    { "[1996] Socket 7 (Dual Voltage)",   MACHINE_TYPE_SOCKET7    },
+    { "[1998] Super Socket 7",            MACHINE_TYPE_SOCKETS7   },
+    { "[1995] Socket 8",                  MACHINE_TYPE_SOCKET8    },
+    { "[1997] Slot 1",                    MACHINE_TYPE_SLOT1      },
+    { "[1998] Slot 1/2",                  MACHINE_TYPE_SLOT1_2    },
+    { "[1998] Slot 1/Socket 370",         MACHINE_TYPE_SLOT1_370  },
+    { "[1998] Slot 2",                    MACHINE_TYPE_SLOT2      },
+    { "[1998] Socket 370",                MACHINE_TYPE_SOCKET370  },
+    { "Miscellaneous",                    MACHINE_TYPE_MISC       }
 };
 
 const machine_filter_t machine_chipsets[] = {
@@ -88,6 +76,7 @@ const machine_filter_t machine_chipsets[] = {
     { "Headland GC100A",            MACHINE_CHIPSET_GC100A              },
     { "Headland GC103",             MACHINE_CHIPSET_GC103               },
     { "Headland HT18",              MACHINE_CHIPSET_HT18                },
+    { "ACC 2036",                   MACHINE_CHIPSET_ACC_2036            },
     { "ACC 2168",                   MACHINE_CHIPSET_ACC_2168            },
     { "ALi M1217",                  MACHINE_CHIPSET_ALI_M1217           },
     { "ALi M6117",                  MACHINE_CHIPSET_ALI_M6117           },
@@ -98,9 +87,12 @@ const machine_filter_t machine_chipsets[] = {
     { "ALi ALADDiN IV+",            MACHINE_CHIPSET_ALI_ALADDIN_IV_PLUS },
     { "ALi ALADDiN V",              MACHINE_CHIPSET_ALI_ALADDIN_V       },
     { "ALi ALADDiN-PRO II",         MACHINE_CHIPSET_ALI_ALADDIN_PRO_II  },
+    { "C&T PC/AT",                  MACHINE_CHIPSET_CT_AT               },
+    { "C&T 386/AT",                 MACHINE_CHIPSET_CT_386              },
     { "C&T 82C235 SCAT",            MACHINE_CHIPSET_SCAT                },
-    { "C&T CS8121 NEAT",            MACHINE_CHIPSET_NEAT                },
-    { "C&T 386",                    MACHINE_CHIPSET_CT_386              },
+    { "C&T 82C236 SCATsx",          MACHINE_CHIPSET_SCAT_SX             },
+    { "C&T CS8221 NEAT",            MACHINE_CHIPSET_NEAT                },
+    { "C&T CS8281 NEATsx",          MACHINE_CHIPSET_NEAT_SX             },
     { "C&T CS4031",                 MACHINE_CHIPSET_CT_CS4031           },
     { "Contaq 82C596",              MACHINE_CHIPSET_CONTAQ_82C596       },
     { "Contaq 82C597",              MACHINE_CHIPSET_CONTAQ_82C597       },
@@ -124,8 +116,14 @@ const machine_filter_t machine_chipsets[] = {
     { "Intel 440GX",                MACHINE_CHIPSET_INTEL_440GX         },
     { "OPTi 283",                   MACHINE_CHIPSET_OPTI_283            },
     { "OPTi 291",                   MACHINE_CHIPSET_OPTI_291            },
+    { "OPTi 381",                   MACHINE_CHIPSET_OPTI_381            },
+    { "OPTi 391",                   MACHINE_CHIPSET_OPTI_391            },
+    { "OPTi 481",                   MACHINE_CHIPSET_OPTI_481            },
     { "OPTi 493",                   MACHINE_CHIPSET_OPTI_493            },
-    { "OPTi 495",                   MACHINE_CHIPSET_OPTI_495            },
+    { "OPTi 495SLC",                MACHINE_CHIPSET_OPTI_495SLC         },
+    { "OPTi 495SX",                 MACHINE_CHIPSET_OPTI_495SX          },
+    { "OPTi 496",                   MACHINE_CHIPSET_OPTI_496            },
+    { "OPTi 498",                   MACHINE_CHIPSET_OPTI_498            },
     { "OPTi 499",                   MACHINE_CHIPSET_OPTI_499            },
     { "OPTi 895/802G",              MACHINE_CHIPSET_OPTI_895_802G       },
     { "OPTi 547/597",               MACHINE_CHIPSET_OPTI_547_597        },
@@ -137,8 +135,12 @@ const machine_filter_t machine_chipsets[] = {
     { "SiS 471",                    MACHINE_CHIPSET_SIS_471             },
     { "SiS 496",                    MACHINE_CHIPSET_SIS_496             },
     { "SiS 501",                    MACHINE_CHIPSET_SIS_501             },
+    { "SiS 5501",                   MACHINE_CHIPSET_SIS_5501            },
     { "SiS 5511",                   MACHINE_CHIPSET_SIS_5511            },
     { "SiS 5571",                   MACHINE_CHIPSET_SIS_5571            },
+    { "SiS 5581",                   MACHINE_CHIPSET_SIS_5581            },
+    { "SiS 5591",                   MACHINE_CHIPSET_SIS_5591            },
+    { "SiS (5)600",                 MACHINE_CHIPSET_SIS_5600            },
     { "SMSC VictoryBX-66",          MACHINE_CHIPSET_SMSC_VICTORYBX_66   },
     { "STPC Client",                MACHINE_CHIPSET_STPC_CLIENT         },
     { "STPC Consumer-II",           MACHINE_CHIPSET_STPC_CONSUMER_II    },
@@ -164,10 +166,7 @@ const machine_filter_t machine_chipsets[] = {
     { "WD76C10",                    MACHINE_CHIPSET_WD76C10             }
 };
 
-/* Machines to add before machine freeze:
-   - TMC Mycomp PCI54ST;
-   - Zeos Quadtel 486.
-
+/*
    NOTE: The AMI MegaKey tests were done on a real Intel Advanced/ATX
      (thanks, MrKsoft for running my AMIKEY.COM on it), but the
      technical specifications of the other Intel machines confirm
@@ -182,16 +181,6 @@ const machine_filter_t machine_chipsets[] = {
      BIOS (likely a laptop one since the AMIKey-3 is a laptop KBC
      firmware!) Intel forked.
 
-   NOTE: The VIA VT82C42N returns 0x46 ('F') in command 0xA1 (so it
-     emulates the AMI KF/AMIKey KBC firmware), and 0x42 ('B') in
-     command 0xAF.
-     The version on the VIA VT82C686B southbridge also returns
-     'F' in command 0xA1, but 0x45 ('E') in command 0xAF.
-     The version on the VIA VT82C586B southbridge also returns
-     'F' in command 0xA1, but 0x44 ('D') in command 0xAF.
-     The version on the VIA VT82C586A southbridge also returns
-     'F' in command 0xA1, but 0x43 ('C') in command 0xAF.
-
    NOTE: The AMI MegaKey commands blanked in the technical reference
      are CC and and C4, which are Set P14 High and Set P14 Low,
      respectively. Also, AMI KBC command C1, mysteriously missing
@@ -207,7 +196,7 @@ const machine_t machines[] = {
         .internal_name = "ibmpc",
         .type = MACHINE_TYPE_8088,
         .chipset = MACHINE_CHIPSET_DISCRETE,
-        .init = machine_pc_init,
+        .init = machine_ibmpc_init,
         .p1_handler = NULL,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
@@ -230,11 +219,15 @@ const machine_t machines[] = {
             .step = 16
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_pc_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_pc_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &ibmpc_device,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -246,7 +239,7 @@ const machine_t machines[] = {
         .internal_name = "ibmpc82",
         .type = MACHINE_TYPE_8088,
         .chipset = MACHINE_CHIPSET_DISCRETE,
-        .init = machine_pc82_init,
+        .init = machine_ibmpc82_init,
         .p1_handler = NULL,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
@@ -269,11 +262,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_pc82_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_pc82_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &ibmpc82_device,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -301,18 +298,22 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PCJR,
-        .flags = MACHINE_VIDEO_FIXED,
+        .flags = MACHINE_VIDEO_FIXED | MACHINE_KEYBOARD | MACHINE_CARTRIDGE,
         .ram = {
             .min = 64,
             .max = 640,
             .step = 64
         },
         .nvrmask = 0,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL, /* TODO: No specific kbd_device yet */
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &pcjr_device,
@@ -324,7 +325,7 @@ const machine_t machines[] = {
         .internal_name = "ibmxt",
         .type = MACHINE_TYPE_8088,
         .chipset = MACHINE_CHIPSET_DISCRETE,
-        .init = machine_xt_init,
+        .init = machine_ibmxt_init,
         .p1_handler = NULL,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
@@ -347,11 +348,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xt_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &ibmxt_device,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -363,7 +368,7 @@ const machine_t machines[] = {
         .internal_name = "ibmxt86",
         .type = MACHINE_TYPE_8088,
         .chipset = MACHINE_CHIPSET_DISCRETE,
-        .init = machine_xt86_init,
+        .init = machine_ibmxt86_init,
         .p1_handler = NULL,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
@@ -386,11 +391,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xt86_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt86_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &ibmxt86_device,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -425,11 +434,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -464,11 +477,58 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    {
+        .name = "[8088] Atari PC 3",
+        .internal_name = "ataripc3",
+        .type = MACHINE_TYPE_8088,
+        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .init = machine_xt_ataripc3_init,
+        .p1_handler = NULL,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_8088,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PC,
+        .flags = MACHINE_FDC, /* Machine has internal video: NSI EVC315-S EGA */
+        .ram = {
+            .min = 64,
+            .max = 640,
+            .step = 64
+        },
+        .nvrmask = 0,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -503,11 +563,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -542,11 +606,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_pc82_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_pc82_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -574,18 +642,22 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_FLAGS_NONE,
+        .flags = MACHINE_KEYBOARD,
         .ram = {
             .min = 128,
             .max = 640,
             .step = 128
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xt_compaq_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_compaq_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -620,11 +692,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -659,11 +735,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_pc82_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_pc82_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -698,11 +778,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xt_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -737,11 +821,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xt_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -769,19 +857,23 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_FLAGS_NONE,
+        .flags = MACHINE_FDC, /* Machine has internal video: Paradise PVC2 */
         .ram = {
             .min = 128,
             .max = 640,
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
-        .fdc_device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
+        .fdc_device = &fdc_xt_device,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
@@ -801,26 +893,30 @@ const machine_t machines[] = {
             .package = CPU_PKG_8088,
             .block = CPU_BLOCK_NONE,
             .min_bus = 4772728,
-            .max_bus = 7159092,
+            .max_bus = 8000000,
             .min_voltage = 0,
             .max_voltage = 0,
             .min_multi = 0,
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_FLAGS_NONE,
+        .flags = MACHINE_FDC,
         .ram = {
             .min = 128,
             .max = 640,
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
-        .fdc_device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
+        .fdc_device = &fdc_xt_device,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
@@ -847,19 +943,23 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_FLAGS_NONE,
+        .flags = MACHINE_FDC,
         .ram = {
             .min = 128,
             .max = 640,
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
-        .fdc_device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
+        .fdc_device = &fdc_xt_device,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
@@ -893,11 +993,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &jukopc_device,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -932,11 +1036,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -944,7 +1052,7 @@ const machine_t machines[] = {
         .net_device = NULL
     },
     {
-        .name = "[8088] Micoms XL-7 Turbo",
+        .name = "[8088] Micoms XL-7 Turbo/Pravetz-16ES",
         .internal_name = "mxl7t",
         .type = MACHINE_TYPE_8088,
         .chipset = MACHINE_CHIPSET_DISCRETE,
@@ -971,11 +1079,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xt_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -1010,11 +1122,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_pc_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_pc_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -1049,11 +1165,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_pc_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_pc_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -1088,11 +1208,15 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -1120,18 +1244,22 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_VIDEO_FIXED,
+        .flags = MACHINE_VIDEO_FIXED | MACHINE_KEYBOARD,
         .ram = {
             .min = 256,
             .max = 640,
             .step = 128
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xt_olivetti_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_olivetti_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &m19_vid_device,
@@ -1166,50 +1294,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    {
-        .name = "[8088] Packard Bell PB8810",
-        .internal_name = "pb8810",
-        .type = MACHINE_TYPE_8088,
-        .chipset = MACHINE_CHIPSET_DISCRETE,
-        .init = machine_xt_pb8810_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_8088,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_PC,
-        .flags = MACHINE_FLAGS_NONE,
-        .ram = {
-            .min = 256,
-            .max = 640,
-            .step = 128
-        },
-        .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -1244,11 +1337,15 @@ const machine_t machines[] = {
             .step = 256
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_pc_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_pc_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -1283,11 +1380,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -1322,11 +1423,101 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_pravetz_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_pravetz_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    {
+        .name = "[8088] Pravetz 16S / CPU12 Plus",
+        .internal_name = "pravetz16s",
+        .type = MACHINE_TYPE_8088,
+        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .init = machine_xt_pravetz16s_cpu12p_init,
+        .p1_handler = NULL,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_8088,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 4772728,
+            .max_bus = 12000000,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PC,
+        .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 512,
+            .max = 1024,
+            .step = 128
+        },
+        .nvrmask = 0,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    {
+        .name = "[8088] Samsung SPC-3000V/Packard Bell PB500/PB8810",
+        .internal_name = "pb8810",
+        .type = MACHINE_TYPE_8088,
+        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .init = machine_xt_pb8810_init,
+        .p1_handler = NULL,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_8088,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PC,
+        .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 256,
+            .max = 640,
+            .step = 128
+        },
+        .nvrmask = 0,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -1354,19 +1545,23 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_FLAGS_NONE,
+        .flags = MACHINE_FDC,
         .ram = {
             .min = 256,
             .max = 640,
             .step = 128
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
-        .fdc_device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
+        .fdc_device = &fdc_xt_device,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
@@ -1393,18 +1588,22 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_XTA | MACHINE_MOUSE,
+        .flags = MACHINE_XTA | MACHINE_KEYBOARD | MACHINE_MOUSE, /* Machine has internal video: Paradise PVC4 */
         .ram = {
             .min = 512,
             .max = 640,
             .step = 128
         },
         .nvrmask = 15,
-        .kbc_device = &keyboard_xt_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -1439,11 +1638,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -1451,17 +1654,17 @@ const machine_t machines[] = {
         .net_device = NULL
     },
     {
-        .name = "[8088] Tandy 1000",
-        .internal_name = "tandy",
+        .name = "[8088] Tandy 1000 SX",
+        .internal_name = "tandy1000sx",
         .type = MACHINE_TYPE_8088,
         .chipset = MACHINE_CHIPSET_PROPRIETARY,
-        .init = machine_tandy_init,
+        .init = machine_tandy1000sx_init,
         .p1_handler = NULL,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
-            .package = CPU_PKG_8088_EUROPC,
+            .package = CPU_PKG_8088,
             .block = CPU_BLOCK_NONE,
             .min_bus = 0,
             .max_bus = 0,
@@ -1471,21 +1674,25 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_VIDEO_FIXED,
+        .flags = MACHINE_VIDEO_FIXED | MACHINE_KEYBOARD,
         .ram = {
-            .min = 128,
+            .min = 384,
             .max = 640,
             .step = 128
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_tandy_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_tandy_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
-        .vid_device = &vid_device,
+        .vid_device = &tandy_1000_video_device,
         .snd_device = NULL,
         .net_device = NULL
     },
@@ -1500,7 +1707,7 @@ const machine_t machines[] = {
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
-            .package = CPU_PKG_8088_EUROPC,
+            .package = CPU_PKG_8088,
             .block = CPU_BLOCK_NONE,
             .min_bus = 0,
             .max_bus = 0,
@@ -1510,21 +1717,25 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_VIDEO_FIXED,
+        .flags = MACHINE_VIDEO_FIXED | MACHINE_KEYBOARD,
         .ram = {
-            .min = 384,
+            .min = 256,
             .max = 640,
             .step = 128
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_tandy_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_tandy_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
-        .vid_device = &vid_device_hx,
+        .vid_device = &tandy_1000hx_video_device,
         .snd_device = NULL,
         .net_device = NULL
     },
@@ -1549,18 +1760,22 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_VIDEO,
+        .flags = MACHINE_VIDEO | MACHINE_KEYBOARD,
         .ram = {
             .min = 512,
             .max = 1280,
             .step = 768
         },
         .nvrmask = 63,
-        .kbc_device = &keyboard_xt_t1x00_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_t1x00_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &t1000_video_device,
@@ -1588,25 +1803,28 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_FLAGS_NONE,
+        .flags = MACHINE_FDC,
         .ram = {
             .min = 256,
             .max = 768,
             .step = 256
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
+        .device = &vendex_device,
+        .kbd_device = &keyboard_pc_xt_device,
+        .fdc_device = &fdc_xt_device,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-#if defined(DEV_BRANCH) && defined(USE_LASERXT)
     {
         .name = "[8088] VTech Laser Turbo XT",
         .internal_name = "ltxt",
@@ -1618,7 +1836,7 @@ const machine_t machines[] = {
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
-            .package = CPU_PKG_8088,
+            .package = CPU_PKG_8088_VTECH,
             .block = CPU_BLOCK_NONE,
             .min_bus = 0,
             .max_bus = 0,
@@ -1632,21 +1850,24 @@ const machine_t machines[] = {
         .ram = {
             .min = 256,
             .max = 640,
-            .step = 256
+            .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xt_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &laserxt_device,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-#endif /* defined(DEV_BRANCH) && defined(USE_LASERXT) */
     /* Has a standard PS/2 KBC (so, use IBM PS/2 Type 1). */
     {
         .name = "[8088] Xi8088",
@@ -1654,7 +1875,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_8088,
         .chipset = MACHINE_CHIPSET_DISCRETE,
         .init = machine_xt_xi8088_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -1676,11 +1897,14 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = &keyboard_ps2_xi8088_device,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_p1 = 0x00400cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = &xi8088_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -1715,11 +1939,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -1754,11 +1982,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xt_zenith_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_zenith_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -1793,11 +2025,15 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xt_zenith_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_zenith_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -1832,11 +2068,15 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xt_zenith_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_zenith_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &cga_device,
@@ -1871,11 +2111,15 @@ const machine_t machines[] = {
             .step = 256
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_pc_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_pc_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -1910,11 +2154,58 @@ const machine_t machines[] = {
             .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    {
+        .name = "[V20] Tulip PC Compact 2",
+        .internal_name = "tuliptc8",
+        .type = MACHINE_TYPE_8088,
+        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .init = machine_xt_tuliptc8_init,
+        .p1_handler = NULL,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_8088,
+            .block = CPU_BLOCK(CPU_8088),
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PC,
+        .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 64,
+            .max = 640,
+            .step = 64
+        },
+        .nvrmask = 63,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -1944,18 +2235,22 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_VIDEO_FIXED | MACHINE_MOUSE,
+        .flags = MACHINE_VIDEO_FIXED | MACHINE_KEYBOARD | MACHINE_MOUSE,
         .ram = {
             .min = 512,
             .max = 640,
             .step = 128
         },
         .nvrmask = 63,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL /* TODO: No specific kbd_device yet */,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &vid_1512_device,
@@ -1983,18 +2278,22 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_VIDEO | MACHINE_MOUSE,
+        .flags = MACHINE_VIDEO | MACHINE_KEYBOARD | MACHINE_MOUSE,
         .ram = {
             .min = 640,
             .max = 640,
             .step = 640
         },
         .nvrmask = 63,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL /* TODO: No specific kbd_device yet */,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &vid_1640_device,
@@ -2022,18 +2321,22 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_VIDEO_FIXED | MACHINE_MOUSE,
+        .flags = MACHINE_VIDEO_FIXED | MACHINE_KEYBOARD | MACHINE_MOUSE,
         .ram = {
             .min = 640,
             .max = 640,
             .step = 640
         },
         .nvrmask = 63,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL /* TODO: No specific kbd_device yet */,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &vid_pc2086_device,
@@ -2061,18 +2364,22 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_VIDEO_FIXED | MACHINE_MOUSE,
+        .flags = MACHINE_XTA | MACHINE_VIDEO_FIXED | MACHINE_KEYBOARD | MACHINE_MOUSE,
         .ram = {
             .min = 640,
             .max = 640,
             .step = 640
         },
         .nvrmask = 63,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL /* TODO: No specific kbd_device yet */,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &vid_pc3086_device,
@@ -2100,24 +2407,71 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_VIDEO | MACHINE_MOUSE,
+        .flags = MACHINE_VIDEO | MACHINE_KEYBOARD | MACHINE_MOUSE,
         .ram = {
             .min = 512,
             .max = 640,
             .step = 128
         },
         .nvrmask = 63,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL /* TODO: No specific kbd_device yet */,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &vid_200_device,
         .snd_device = NULL,
         .net_device = NULL
     },
+    {
+        .name = "[8086] Amstrad PC5086",
+        .internal_name = "pc5086",
+        .type = MACHINE_TYPE_8086,
+        .chipset = MACHINE_CHIPSET_PROPRIETARY,
+        .init = machine_xt_pc5086_init,
+        .p1_handler = NULL,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_8086,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PC | MACHINE_BUS_PS2,
+        .flags = MACHINE_XTA,
+        .ram = {
+            .min = 512,
+            .max = 640,
+            .step = 128
+        },
+        .nvrmask = 63,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &f82c710_pc5086_device,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
     {
         .name = "[8086] Amstrad PPC512/640",
         .internal_name = "ppc512",
@@ -2139,18 +2493,22 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_VIDEO | MACHINE_MOUSE,
+        .flags = MACHINE_VIDEO | MACHINE_KEYBOARD | MACHINE_MOUSE,
         .ram = {
             .min = 512,
             .max = 640,
             .step = 128
         },
         .nvrmask = 63,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL /* TODO: No specific kbd_device yet */,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &vid_ppc512_device,
@@ -2185,11 +2543,15 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xt_compaq_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_compaq_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -2224,11 +2586,15 @@ const machine_t machines[] = {
             .step = 640
         },
         .nvrmask = 0x3f,
-        .kbc_device = &keyboard_xt_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -2236,7 +2602,49 @@ const machine_t machines[] = {
         .net_device = NULL
     },
     {
-        .name = "[8086] Olivetti M21/24/24SP",
+        .name = "[8086] Mazovia 1016",
+        .internal_name = "maz1016",
+        .type = MACHINE_TYPE_8086,
+        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .init = machine_xt_maz1016_init,
+        .p1_handler = NULL,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_8086_MAZOVIA,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PC,
+        .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 256,
+            .max = 640,
+            .step = 384
+        },
+        .nvrmask = 0,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    {
+        .name = "[8086] Olivetti M21/24/24SP/AT&T PC 6300",
         .internal_name = "m24",
         .type = MACHINE_TYPE_8086,
         .chipset = MACHINE_CHIPSET_PROPRIETARY,
@@ -2256,18 +2664,22 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_VIDEO | MACHINE_MOUSE | MACHINE_MFM,
+        .flags = MACHINE_VIDEO | MACHINE_KEYBOARD | MACHINE_MOUSE | MACHINE_MFM,
         .ram = {
             .min = 128,
             .max = 640,
             .step = 128
         },
         .nvrmask = 15,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL /* TODO: No specific kbd_device yet */,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &ogc_m24_device,
@@ -2276,7 +2688,7 @@ const machine_t machines[] = {
     },
     /* Has Olivetti KBC firmware. */
     {
-        .name = "[8086] Olivetti M240",
+        .name = "[8086] Olivetti M240/AT&T PC 6300 WGS",
         .internal_name = "m240",
         .type = MACHINE_TYPE_8086,
         .chipset = MACHINE_CHIPSET_PROPRIETARY,
@@ -2296,18 +2708,22 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_MFM,
+        .flags = MACHINE_KEYBOARD | MACHINE_MFM,
         .ram = {
             .min = 128,
             .max = 640,
             .step = 128
         },
         .nvrmask = 15,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL /* TODO: No specific kbd_device yet */,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -2342,11 +2758,15 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xtclone_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xtclone_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -2374,21 +2794,25 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_VIDEO_FIXED,
+        .flags = MACHINE_VIDEO_FIXED | MACHINE_KEYBOARD,
         .ram = {
             .min = 512,
             .max = 768,
             .step = 128
         },
         .nvrmask = 0,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL /* TODO: No specific kbd_device yet */,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
-        .vid_device = &vid_device_sl,
+        .vid_device = &tandy_1000sl_video_device,
         .snd_device = NULL,
         .net_device = NULL
     },
@@ -2413,18 +2837,22 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_VIDEO | MACHINE_MFM,
+        .flags = MACHINE_VIDEO | MACHINE_KEYBOARD | MACHINE_MFM,
         .ram = {
             .min = 1024,
             .max = 2048,
             .step = 1024
         },
         .nvrmask = 63,
-        .kbc_device = &keyboard_xt_t1x00_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_t1x00_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &t1200_video_device,
@@ -2452,26 +2880,28 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_VIDEO | MACHINE_MFM,
+        .flags = MACHINE_VIDEO | MACHINE_KEYBOARD | MACHINE_MFM,
         .ram = {
             .min = 512,
             .max = 1024,
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = &keyboard_xt_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-
-#if defined(DEV_BRANCH) && defined(USE_LASERXT)
     {
         .name = "[8086] VTech Laser XT3",
         .internal_name = "lxt3",
@@ -2483,7 +2913,7 @@ const machine_t machines[] = {
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
-            .package = CPU_PKG_8086,
+            .package = CPU_PKG_8086_VTECH,
             .block = CPU_BLOCK_NONE,
             .min_bus = 0,
             .max_bus = 0,
@@ -2495,23 +2925,26 @@ const machine_t machines[] = {
         .bus_flags = MACHINE_PC,
         .flags = MACHINE_FLAGS_NONE,
         .ram = {
-            .min = 256,
+            .min = 512,
             .max = 640,
-            .step = 256
+            .step = 64
         },
         .nvrmask = 0,
-        .kbc_device = &keyboard_xt_lxt3_device,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_xt_lxt3_device,
+        .kbc_params = 0x00000000,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &lxt3_device,
+        .kbd_device = &keyboard_pc_xt_device,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-#endif /* defined(DEV_BRANCH) && defined(USE_LASERXT) */
 
     /* 286 AT machines */
     /* Has IBM AT KBC firmware. */
@@ -2520,8 +2953,8 @@ const machine_t machines[] = {
         .internal_name = "ibmat",
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_DISCRETE,
-        .init = machine_at_ibm_init,
-        .p1_handler = NULL,
+        .init = machine_at_ibmat_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -2539,15 +2972,19 @@ const machine_t machines[] = {
         .flags = MACHINE_FLAGS_NONE,
         .ram = {
             .min = 256,
-            .max = 15872,
-            .step = 128
+            .max = 512,
+            .step = 256
         },
         .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &ibmat_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -2561,7 +2998,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_PROPRIETARY,
         .init = machine_ps1_m2011_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_ps1_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -2579,15 +3016,19 @@ const machine_t machines[] = {
         .flags = MACHINE_XTA | MACHINE_VIDEO_FIXED,
         .ram = {
             .min = 512,
-            .max = 16384,
+            .max = 15360,
             .step = 512
         },
         .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = &ps1_2011_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -2601,7 +3042,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_PROPRIETARY,
         .init = machine_ps2_m30_286_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -2618,16 +3059,20 @@ const machine_t machines[] = {
         .bus_flags = MACHINE_PS2,
         .flags = MACHINE_XTA | MACHINE_VIDEO_FIXED,
         .ram = {
-            .min = 1024,
+            .min = 512,
             .max = 16384,
-            .step = 1024
+            .step = 512
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -2641,7 +3086,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_DISCRETE,
         .init = machine_at_ibmxt286_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -2659,55 +3104,19 @@ const machine_t machines[] = {
         .flags = MACHINE_FLAGS_NONE,
         .ram = {
             .min = 256,
-            .max = 15872,
+            .max = 640,
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* AMI BIOS for a chipset-less machine, most likely has AMI 'F' KBC firmware. */
-    {
-        .name = "[ISA] AMI IBM AT",
-        .internal_name = "ibmatami",
-        .type = MACHINE_TYPE_286,
-        .chipset = MACHINE_CHIPSET_DISCRETE,
-        .init = machine_at_ibmatami_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_286,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_AT,
-        .flags = MACHINE_FLAGS_NONE,
-        .ram = {
-            .min = 256,
-            .max = 15872,
-            .step = 128
-        },
-        .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &ibmxt286_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -2720,17 +3129,17 @@ const machine_t machines[] = {
         .name = "[ISA] Commodore PC 30 III",
         .internal_name = "cmdpc30",
         .type = MACHINE_TYPE_286,
-        .chipset = MACHINE_CHIPSET_PROPRIETARY,
+        .chipset = MACHINE_CHIPSET_PROPRIETARY, /* Machine has chipset: Faraday FE3400B */
         .init = machine_at_cmdpc_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
             .package = CPU_PKG_286,
             .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
+            .min_bus = 6000000,
+            .max_bus = 12500000,
             .min_voltage = 0,
             .max_voltage = 0,
             .min_multi = 0,
@@ -2740,15 +3149,19 @@ const machine_t machines[] = {
         .flags = MACHINE_FLAGS_NONE,
         .ram = {
             .min = 640,
-            .max = 16384,
-            .step = 128
+            .max = 14912,
+            .step = 64
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -2762,7 +3175,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_PROPRIETARY,
         .init = machine_at_portableii_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -2777,18 +3190,22 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_AT,
-        .flags = MACHINE_FLAGS_NONE,
+        .flags = MACHINE_KEYBOARD,
         .ram = {
             .min = 640,
             .max = 16384,
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -2802,7 +3219,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_PROPRIETARY,
         .init = machine_at_portableiii_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -2817,24 +3234,71 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_AT,
-        .flags = MACHINE_IDE | MACHINE_VIDEO,
+        .flags = MACHINE_IDE | MACHINE_VIDEO | MACHINE_KEYBOARD,
         .ram = {
             .min = 640,
             .max = 16384,
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &compaq_plasma_device,
         .snd_device = NULL,
         .net_device = NULL
     },
+    {
+        .name = "[ISA] GRiD GRiDcase 1520",
+        .internal_name = "grid1520",
+        .type = MACHINE_TYPE_286,
+        .chipset = MACHINE_CHIPSET_PROPRIETARY, /* Machine has chipset: Faraday FE3400B */
+        .init = machine_at_grid1520_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_286,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 6000000,
+            .max_bus = 10000000,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_IDE /*| MACHINE_VIDEO_FIXED*/ | MACHINE_KEYBOARD,
+        .ram = {
+            .min = 1024,
+            .max = 8192,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
     /* Has IBM AT KBC firmware. */
     {
         .name = "[ISA] MR BIOS 286 clone",
@@ -2842,7 +3306,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_DISCRETE,
         .init = machine_at_mr286_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -2864,11 +3328,15 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -2882,7 +3350,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_DISCRETE,
         .init = machine_at_pc8_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_ncr_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -2904,26 +3372,29 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_NCR,
+        .kbc_p1 = 0x000004df,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-#if defined(DEV_BRANCH) && defined(USE_OLIVETTI)
     /* Has Olivetti KBC firmware. */
     {
-        .name = "[ISA] Olivetti M290",
+        .name = "[ISA] Olivetti M290/AT&T 6286 WGS",
         .internal_name = "m290",
         .type = MACHINE_TYPE_286,
-        .chipset = MACHINE_CHIPSET_PROPRIETARY,
+        .chipset = MACHINE_CHIPSET_PROPRIETARY, /* Yes, it's M290 with 98/86 gate array, not M290-30 with VLSI TOPCAT chipset. */
         .init = machine_at_m290_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -2940,73 +3411,34 @@ const machine_t machines[] = {
         .bus_flags = MACHINE_AT,
         .flags = MACHINE_FLAGS_NONE,
         .ram = {
-            .min = 640,
+            .min = 1024,
             .max = 16384,
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_OLIVETTI,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-#endif /* defined(DEV_BRANCH) && defined(USE_OLIVETTI) */
-#if defined(DEV_BRANCH) && defined(USE_OPEN_AT)
     /* Has IBM AT KBC firmware. */
     {
-        .name = "[ISA] OpenAT",
-        .internal_name = "openat",
-        .type = MACHINE_TYPE_286,
-        .chipset = MACHINE_CHIPSET_DISCRETE,
-        .init = machine_at_openat_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_286,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_AT,
-        .flags = MACHINE_FLAGS_NONE,
-        .ram = {
-            .min = 256,
-            .max = 15872,
-            .step = 128
-        },
-        .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-#endif /* defined(DEV_BRANCH) && defined(USE_OPEN_AT) */
-    /* Has IBM AT KBC firmware. */
-    {
-        .name = "[ISA] Phoenix IBM AT",
+        .name = "[ISA] Phoenix AT clone",
         .internal_name = "ibmatpx",
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_DISCRETE,
-        .init = machine_at_ibmatpx_init,
-        .p1_handler = NULL,
+        .init = machine_at_pxat_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3024,15 +3456,19 @@ const machine_t machines[] = {
         .flags = MACHINE_FLAGS_NONE,
         .ram = {
             .min = 256,
-            .max = 15872,
-            .step = 128
+            .max = 512,
+            .step = 256
         },
         .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -3041,12 +3477,12 @@ const machine_t machines[] = {
     },
     /* Has Quadtel KBC firmware. */
     {
-        .name = "[ISA] Quadtel IBM AT",
+        .name = "[ISA] Quadtel AT clone",
         .internal_name = "ibmatquadtel",
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_DISCRETE,
-        .init = machine_at_ibmatquadtel_init,
-        .p1_handler = NULL,
+        .init = machine_at_quadtat_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3064,15 +3500,153 @@ const machine_t machines[] = {
         .flags = MACHINE_FLAGS_NONE,
         .ram = {
             .min = 256,
-            .max = 15872,
-            .step = 128
+            .max = 512,
+            .step = 256
         },
         .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_QUADTEL,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has IBM AT KBC firmware. */
+    /* To configure the BIOS, use PB_2330a_diag.IMA from MS-DOS 3.30 Packard Bell OEM, GSETUP might work too*/
+    {
+        .name = "[ISA] Packard Bell PB286",
+        .internal_name = "pb286",
+        .type = MACHINE_TYPE_286,
+        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .init = machine_at_pb286_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_286,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 256,
+            .max = 1024,
+            .step = 128
+        },
+        .nvrmask = 63,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has unknown KBC firmware. */
+    {
+        .name = "[ISA] Sanyo MBC-17PLUS",
+        .internal_name = "mbc17",
+        .type = MACHINE_TYPE_286,
+        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .init = machine_at_mbc17_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_286,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 12000000,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_IDE,
+        .ram = {
+            .min = 512,
+            .max = 16384,
+            .step = 128
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has unknown KBC firmware. */
+    {
+        .name = "[ISA] Sharp AX286D",
+        .internal_name = "ax286",
+        .type = MACHINE_TYPE_286,
+        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .init = machine_at_ax286_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_286,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_IDE,
+        .ram = {
+            .min = 512,
+            .max = 16384,
+            .step = 128
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        /* The version number is a guess - we have no probe of this machine's controller. */
+        .kbc_params = KBC_VEN_PHOENIX | 0x00010500,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -3086,7 +3660,95 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_DISCRETE,
         .init = machine_at_siemens_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_286,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 6000000,
+            .max_bus = 12500000,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 256,
+            .max = 15872,
+            .step = 128
+        },
+        .nvrmask = 63,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_SIEMENS,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* This has Toshiba's proprietary KBC, which is already implemented. */
+    {
+        .name = "[ISA] Toshiba T3100e",
+        .internal_name = "t3100e",
+        .type = MACHINE_TYPE_286,
+        .chipset = MACHINE_CHIPSET_PROPRIETARY,
+        .init = machine_at_t3100e_init,
+        .p1_handler = machine_t3100e_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_286,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_IDE | MACHINE_VIDEO_FIXED | MACHINE_KEYBOARD,
+        .ram = {
+            .min = 1024,
+            .max = 5120,
+            .step = 256
+        },
+        .nvrmask = 63,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_TOSHIBA,
+        .kbc_p1 = 0x0000bfff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* AMI BIOS for a chipset-less machine, most likely has AMI 'F' KBC firmware. */
+    {
+        .name = "[ISA] Trangg Bow Unknown 286",
+        .internal_name = "ibmatami",
+        .type = MACHINE_TYPE_286,
+        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .init = machine_at_tbunk286_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3104,12 +3766,15 @@ const machine_t machines[] = {
         .flags = MACHINE_FLAGS_NONE,
         .ram = {
             .min = 256,
-            .max = 15872,
-            .step = 128
+            .max = 512,
+            .step = 256
         },
         .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00003800,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
@@ -3119,14 +3784,59 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* This has Toshiba's proprietary KBC, which is already implemented. */
+    /* No proper pictures of the KBC exist, though it seems to have the IBM AT KBC
+       firmware. */
     {
-        .name = "[ISA] Toshiba T3100e",
-        .internal_name = "t3100e",
+        .name = "[C&T PC/AT] Dell System 200",
+        .internal_name = "dells200",
         .type = MACHINE_TYPE_286,
-        .chipset = MACHINE_CHIPSET_PROPRIETARY,
-        .init = machine_at_t3100e_init,
-        .p1_handler = NULL,
+        .chipset = MACHINE_CHIPSET_CT_AT,
+        .init = machine_at_dells200_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_286,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 6000000,
+            .max_bus = 12000000,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 640,
+            .max = 16384,
+            .step = 128
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* has an Award-branded KBC controller */
+    {
+        .name = "[NEAT] Hyundai Super-286C",
+        .internal_name = "super286c",
+        .type = MACHINE_TYPE_286,
+        .chipset = MACHINE_CHIPSET_NEAT,
+        .init = machine_at_super286c_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3141,15 +3851,18 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_AT,
-        .flags = MACHINE_IDE | MACHINE_VIDEO_FIXED,
+        .flags = MACHINE_FLAGS_NONE,
         .ram = {
-            .min = 1024,
-            .max = 5120,
-            .step = 256
+            .min = 512,
+            .max = 1024,
+            .step = 128
         },
-        .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AWARD | 0x00424600,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
@@ -3159,6 +3872,140 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
+    /* No proper pictures of the KBC exist, though it seems to have the IBM AT KBC
+       firmware. */
+    {
+        .name = "[C&T PC/AT] PC's Limited (Dell) 28608L/AT122",
+        .internal_name = "at122",
+        .type = MACHINE_TYPE_286,
+        .chipset = MACHINE_CHIPSET_CT_AT,
+        .init = machine_at_at122_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_286,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 6000000,
+            .max_bus = 12000000,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 640,
+            .max = 16384,
+            .step = 128
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* No proper pictures of the KBC exist, though it seems to have the IBM AT KBC
+       firmware. */
+    {
+        .name = "[C&T PC/AT] Tulip AT Compact",
+        .internal_name = "tuliptc7",
+        .type = MACHINE_TYPE_286,
+        .chipset = MACHINE_CHIPSET_CT_AT,
+        .init = machine_at_tuliptc7_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_286,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 6000000,
+            .max_bus = 12000000,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 640,
+            .max = 16384,
+            .step = 128
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has Chips & Technologies KBC firmware. */
+    {
+        .name = "[C&T PC/AT] Wells American A*Star",
+        .internal_name = "wellamerastar",
+        .type = MACHINE_TYPE_286,
+        .chipset = MACHINE_CHIPSET_CT_AT,
+        .init = machine_at_wellamerastar_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_286,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 6000000,
+            .max_bus = 14000000,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 512,
+            .max = 1024,
+            .step = 512
+        },
+        .nvrmask = 63,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_CHIPS | 0x0000a600,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
     /* Has Quadtel KBC firmware. */
     {
         .name = "[GC103] Quadtel 286 clone",
@@ -3166,7 +4013,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_GC103,
         .init = machine_at_quadt286_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3188,25 +4035,29 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_QUADTEL,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Most likely has AMI 'F' KBC firmware. */
+    /* Has AMI 'B' KBC firmware. */
     {
         .name = "[GC103] TriGem 286M",
         .internal_name = "tg286m",
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_GC103,
         .init = machine_at_tg286m_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3228,25 +4079,73 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004200,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* This has "AMI KEYBOARD BIOS", most likely 'F'. */
+    /* Most likely has Chips & Technologies KBC firmware. */
+    {
+        .name = "[NEAT] Atari PC 4",
+        .internal_name = "ataripc4",
+        .type = MACHINE_TYPE_286,
+        .chipset = MACHINE_CHIPSET_NEAT,
+        .init = machine_at_ataripc4_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_286,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_FDC, /* Machine has video: Paradise PVGA1A */
+        .ram = {
+            .min = 512,
+            .max = 8192,
+            .step = 128
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_CHIPS | 0x0000a600,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* This has an AMIKey-2, which is 'H'. */
     {
         .name = "[NEAT] DataExpert 286",
         .internal_name = "ami286",
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_NEAT,
         .init = machine_at_neat_ami_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3268,65 +4167,29 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* has an Award-branded KBC controller */
-    {
-        .name = "[NEAT] Hyundai Super-286C",
-        .internal_name = "super286c",
-        .type = MACHINE_TYPE_286,
-        .chipset = MACHINE_CHIPSET_NEAT,
-        .init = machine_at_super286c_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_286,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_AT,
-        .flags = MACHINE_FLAGS_NONE,
-        .ram = {
-            .min = 512,
-            .max = 1024,
-            .step = 128
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has IBM AT KBC firmware. */
+    /* Has NCR KBC firmware. */
     {
         .name = "[NEAT] NCR 3302",
         .internal_name = "3302",
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_NEAT,
         .init = machine_at_3302_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_ncr_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3344,29 +4207,33 @@ const machine_t machines[] = {
         .flags = MACHINE_IDE | MACHINE_VIDEO,
         .ram = {
             .min = 512,
-            .max = 16384,
+            .max = 5120,
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_NCR,
+        .kbc_p1 = 0x000004df,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
-        .vid_device = NULL,
+        .vid_device = &paradise_pvga1a_ncr3302_device,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has IBM AT KBC firmware. */
+    /* Has Phoenix MultiKey/42 KBC firmware. */
     {
         .name = "[NEAT] Arche AMA-2010",
         .internal_name = "px286",
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_NEAT,
         .init = machine_at_px286_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3382,17 +4249,109 @@ const machine_t machines[] = {
         },
         .bus_flags = MACHINE_AT,
         .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 512,
+            .max = 8192,
+            .step = 128
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        /* The version number is a guess - we have no probe of this machine's controller. */
+        .kbc_params = KBC_VEN_PHOENIX | 0x00010500,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has the VLSI 82C113 with on-chip KBC. */
+    {
+        .name = "[SCAMP] Amstrad PC7286",
+        .internal_name = "pc7286",
+        .type = MACHINE_TYPE_286,
+        .chipset = MACHINE_CHIPSET_VLSI_SCAMP,
+        .init = machine_at_pc7286_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_286,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2,
+        .flags = MACHINE_IDE | MACHINE_VIDEO,
+        .ram = {
+            .min = 1024,
+            .max = 32768,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has unknown KBC firmware. */
+    {
+        .name = "[SCAT] Amstrad PC5286",
+        .internal_name = "pc5286",
+        .type = MACHINE_TYPE_286,
+        .chipset = MACHINE_CHIPSET_SCAT,
+        .init = machine_at_pc5286_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_286,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT | MACHINE_BUS_PS2,
+        .flags = MACHINE_IDE,
         .ram = {
             .min = 512,
             .max = 16384,
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &f82c710_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -3406,7 +4365,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_SCAT,
         .init = machine_at_gw286ct_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3428,25 +4387,31 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_CHIPS | 0x0000a600,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &f82c710_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has IBM PS/2 Type 1 KBC firmware. */
+    /* Has IBM PS/2 Type 1 KBC firmware - that's actually a guess since we
+       do not currently have a picture of the motherboard.
+       In the code, we actually give it the AMI PS/2 controller. */
     {
         .name = "[SCAT] Goldstar GDC-212M",
         .internal_name = "gdc212m",
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_SCAT,
         .init = machine_at_gdc212m_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3468,11 +4433,15 @@ const machine_t machines[] = {
             .step = 512
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -3486,7 +4455,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_SCAT,
         .init = machine_at_award286_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3503,16 +4472,20 @@ const machine_t machines[] = {
         .bus_flags = MACHINE_AT,
         .flags = MACHINE_IDE,
         .ram = {
-            .min = 512,
-            .max = 16384,
+            .min = 640,
+            .max = 8192,
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -3526,7 +4499,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_SCAT,
         .init = machine_at_super286tr_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3543,30 +4516,122 @@ const machine_t machines[] = {
         .bus_flags = MACHINE_AT,
         .flags = MACHINE_FLAGS_NONE,
         .ram = {
-            .min = 512,
-            .max = 16384,
+            .min = 640,
+            .max = 8192,
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has IBM PS/2 Type 1 KBC firmware. */
+    {
+        .name = "[SCAT] ICL DRS M35/286",
+        .internal_name = "drsm35286",
+        .type = MACHINE_TYPE_286,
+        .chipset = MACHINE_CHIPSET_SCAT,
+        .init = machine_at_drsm35286_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_286,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2,
+        .flags = MACHINE_IDE | MACHINE_VIDEO, /* Machine has Super I/O: C&T F82C711 */
+        .ram = {
+            .min = 512,
+            .max = 5120,
+            .step = 128
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &gd5401_onboard_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has IBM AT KBC firmware. */
+    {
+        .name = "[SCAT] Samsung Deskmaster 286",
+        .internal_name = "deskmaster286",
+        .type = MACHINE_TYPE_286,
+        .chipset = MACHINE_CHIPSET_SCAT,
+        .init = machine_at_deskmaster286_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_286,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2,
+        .flags = MACHINE_IDE, /* Has internal video: C&T VGA 411 */
+        .ram = {
+            .min = 512,
+            .max = 8192,
+            .step = 128
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has a Samsung (SEC) V1.4 KBC firmware. */
+    /* TODO: Do kbc_at.c logging to see if the BIOS sends any proprietary commands. */
     {
         .name = "[SCAT] Samsung SPC-4200P",
         .internal_name = "spc4200p",
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_SCAT,
         .init = machine_at_spc4200p_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3588,25 +4653,29 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has IBM PS/2 Type 1 KBC firmware. */
+    /* Most likely has a Samsung (SEC) V1.4 KBC firmware like the SPC-4200P above. */
     {
         .name = "[SCAT] Samsung SPC-4216P",
         .internal_name = "spc4216p",
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_SCAT,
         .init = machine_at_spc4216p_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3628,25 +4697,29 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has IBM PS/2 Type 1 KBC firmware. */
+    /* Most likely has a Samsung (SEC) V1.4 KBC firmware like the SPC-4200P above. */
     {
         .name = "[SCAT] Samsung SPC-4620P",
         .internal_name = "spc4620p",
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_SCAT,
         .init = machine_at_spc4620p_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3668,25 +4741,29 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has IBM AT KBC firmware. */
+    /* Has AMI '8' KBC firmware. */
     {
-        .name = "[SCAT] Samsung Deskmaster 286",
-        .internal_name = "deskmaster286",
+        .name = "[SCAT] Senor Science Co. SCAT-286-003",
+        .internal_name = "senorscat286",
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_SCAT,
-        .init = machine_at_deskmaster286_init,
-        .p1_handler = NULL,
+        .init = machine_at_senor_scat286_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3700,26 +4777,29 @@ const machine_t machines[] = {
             .min_multi = 0,
             .max_multi = 0
         },
-        .bus_flags = MACHINE_PS2,
-        .flags = MACHINE_IDE, /* Has internal video: C&T VGA 411 */
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_IDE,
         .ram = {
-            .min = 512,
-            .max = 16384,
-            .step = 128
+            .min = 1024,
+            .max = 4096,
+            .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00003800,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-
     /* 286 machines that utilize the MCA bus */
     /* Has IBM PS/2 Type 2 KBC firmware. */
     {
@@ -3728,7 +4808,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_PROPRIETARY,
         .init = machine_ps2_model_50_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3750,11 +4830,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_IBM | KBC_FLAG_IS_TYPE2,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &ps2_model_50_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -3768,7 +4852,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_286,
         .chipset = MACHINE_CHIPSET_PROPRIETARY,
         .init = machine_ps2_model_60_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3790,11 +4874,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_IBM | KBC_FLAG_IS_TYPE2,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -3811,7 +4899,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_386SX,
         .chipset = MACHINE_CHIPSET_PROPRIETARY,
         .init = machine_ps1_m2121_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_ps1_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3833,8 +4921,11 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
@@ -3844,14 +4935,14 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has IBM AT KBC firmware. */
+    /* Has NCR KBC firmware. */
     {
         .name = "[ISA] NCR PC916SX",
         .internal_name = "pc916sx",
         .type = MACHINE_TYPE_386SX,
-        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .chipset = MACHINE_CHIPSET_DISCRETE, /* Machine has chipset: TI TACT82000 */
         .init = machine_at_pc916sx_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_ncr_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3873,11 +4964,15 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_NCR,
+        .kbc_p1 = 0x000004df,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -3889,9 +4984,9 @@ const machine_t machines[] = {
         .name = "[ISA] QTC-SXM KT X20T02/HI",
         .internal_name = "quadt386sx",
         .type = MACHINE_TYPE_386SX,
-        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .chipset = MACHINE_CHIPSET_DISCRETE, /* Machine has chipset: VLSI TOPCAT */
         .init = machine_at_quadt386sx_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3913,25 +5008,29 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_QUADTEL,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* This has an AMIKey-2, which is an updated version of type 'H'. */
+    /* Most likely has Phonenix KBC firmware. */
     {
-        .name = "[ALi M1217] Acrosser AR-B1374",
-        .internal_name = "arb1374",
+        .name = "[ACC 2036] Packard Bell Legend 300SX",
+        .internal_name = "pbl300sx",
         .type = MACHINE_TYPE_386SX,
-        .chipset = MACHINE_CHIPSET_ALI_M1217,
-        .init = machine_at_arb1374_init,
-        .p1_handler = NULL,
+        .chipset = MACHINE_CHIPSET_ACC_2036,
+        .init = machine_at_pbl300sx_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3945,7 +5044,52 @@ const machine_t machines[] = {
             .min_multi = 0,
             .max_multi = 0
         },
-        .bus_flags = MACHINE_AT,
+        .bus_flags = MACHINE_PS2,
+        .flags = MACHINE_IDE | MACHINE_VIDEO,
+        .ram = {
+            .min = 1024,
+            .max = 16384,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        /* The version number is a guess - we have no probe of this machine's controller. */
+        .kbc_params = KBC_VEN_PHOENIX | 0x00010500,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &pbl300sx_device,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &oti037_pbl300sx_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* This has a Holtek keyboard controller which clones AMI 'H'. */
+    {
+        .name = "[ALi M1217] Acrosser AR-B1374",
+        .internal_name = "arb1374",
+        .type = MACHINE_TYPE_386SX,
+        .chipset = MACHINE_CHIPSET_ALI_M1217,
+        .init = machine_at_arb1374_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_386SX,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2,
         .flags = MACHINE_IDE,
         .ram = {
             .min = 1024,
@@ -3953,25 +5097,30 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_HOLTEK | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has the AMIKey-2 KBC. */
+    /* Has the AMIKey-2 KBC - that's actually a guess since we
+       do not currently have a picture of the motherboard. */
     {
         .name = "[ALi M1217] AAEON SBC-350A",
         .internal_name = "sbc350a",
         .type = MACHINE_TYPE_386SX,
         .chipset = MACHINE_CHIPSET_ALI_M1217,
         .init = machine_at_sbc350a_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -3993,11 +5142,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -4011,7 +5164,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_386SX,
         .chipset = MACHINE_CHIPSET_ALI_M1217,
         .init = machine_at_flytech386_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -4033,25 +5186,29 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &tvga8900d_device,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has a JetKey KBC without version, shows up as a 'H'. */
+    /* Has a JetKey KBC without version, which is a clone of AMI '8'. */
     {
         .name = "[ALi M1217] Chaintech 325AX",
         .internal_name = "325ax",
         .type = MACHINE_TYPE_386SX,
         .chipset = MACHINE_CHIPSET_ALI_M1217,
         .init = machine_at_325ax_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -4073,134 +5230,63 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00003800,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &c325ax_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has a JetKey KBC without version, shows up as a 'H'. */
+    /* Uses a NEC/Acer 90M002A.
+       This is a strange one - it has command AF but it returns 0x00. */
     {
-        .name = "[ALi M1217] Chaintech 325AX (MR BIOS)",
-        .internal_name = "mr1217",
+        .name = "[ALi M1409] Acer 100T",
+        .internal_name = "acer100t",
         .type = MACHINE_TYPE_386SX,
-        .chipset = MACHINE_CHIPSET_ALI_M1217,
-        .init = machine_at_mr1217_init,
-        .p1_handler = NULL,
+        .chipset = MACHINE_CHIPSET_ALI_M1409,
+        .init = machine_at_acer100t_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
             .package = CPU_PKG_386SX,
             .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
+            .min_bus = 16000000,
+            .max_bus = 25000000, /* Limited to 25 due a inaccurate cpu speed */
             .min_voltage = 0,
             .max_voltage = 0,
             .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_AT,
-        .flags = MACHINE_FLAGS_NONE,
-        .ram = {
-            .min = 1024,
-            .max = 16384,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has IBM PS/2 Type 1 KBC firmware. */
-    {
-        .name = "[ALi M6117] Acrosser PJ-A511M",
-        .internal_name = "pja511m",
-        .type = MACHINE_TYPE_386SX,
-        .chipset = MACHINE_CHIPSET_ALI_M6117,
-        .init = machine_at_pja511m_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_M6117,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
+            .max_multi = 0,
         },
         .bus_flags = MACHINE_PS2,
-        .flags = MACHINE_IDE,
+        .flags = MACHINE_IDE | MACHINE_VIDEO , /* Machine has internal OTI 077 Video card*/
         .ram = {
-            .min = 1024,
-            .max = 32768,
-            .step = 1024
+            .min = 2048,
+            .max = 16256,
+            .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_ACER,
+        .kbc_p1 = 0x004008f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has IBM PS/2 Type 1 KBC firmware. */
-    {
-        .name = "[ALi M6117] Protech ProX-1332",
-        .internal_name = "prox1332",
-        .type = MACHINE_TYPE_386SX,
-        .chipset = MACHINE_CHIPSET_ALI_M6117,
-        .init = machine_at_prox1332_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_M6117,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_PS2,
-        .flags = MACHINE_IDE,
-        .ram = {
-            .min = 1024,
-            .max = 32768,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
+        .vid_device = &oti077_acer100t_device,
         .snd_device = NULL,
         .net_device = NULL
     },
@@ -4208,12 +5294,12 @@ const machine_t machines[] = {
        for me to read what's on the KBC chip, so I'm going to assume AMI 'F'
        based on the other known HT18 AMI BIOS strings. */
     {
-        .name = "[HT18] AMA-932J",
+        .name = "[HT18] Arche AMA-932J",
         .internal_name = "ama932j",
         .type = MACHINE_TYPE_386SX,
         .chipset = MACHINE_CHIPSET_HT18,
         .init = machine_at_ama932j_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -4235,27 +5321,29 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &oti067_ama932j_device,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has an unknown KBC firmware with commands B8 and BB in the style of
-       Phoenix MultiKey and AMIKey-3(!), but also commands E1 and EA with
-       unknown functions. */
+    /* Most likely has a Phoenix MultiKey/42 keyboard controller. */
     {
         .name = "[Intel 82335] ADI 386SX",
         .internal_name = "adi386sx",
         .type = MACHINE_TYPE_386SX,
         .chipset = MACHINE_CHIPSET_INTEL_82335,
         .init = machine_at_adi386sx_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -4277,11 +5365,15 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00010500, /* Guess. */
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -4294,7 +5386,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_386SX,
         .chipset = MACHINE_CHIPSET_INTEL_82335,
         .init = machine_at_shuttle386sx_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -4316,11 +5408,15 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004400, /* Guess. */
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -4336,7 +5432,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_386SX,
         .chipset = MACHINE_CHIPSET_NEAT,
         .init = machine_at_cmdsl386sx16_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -4358,11 +5454,15 @@ const machine_t machines[] = {
             .step = 512
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -4371,12 +5471,12 @@ const machine_t machines[] = {
     },
     /* Has IBM AT KBC firmware. */
     {
-        .name = "[NEAT] DTK 386SX clone",
+        .name = "[NEAT] DTK PM-1630C",
         .internal_name = "dtk386",
         .type = MACHINE_TYPE_386SX,
         .chipset = MACHINE_CHIPSET_NEAT,
         .init = machine_at_neat_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -4398,11 +5498,102 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    { .name = "[NEATsx] OKI if386AX30L",
+        .internal_name = "if386sx",
+        .type = MACHINE_TYPE_386SX,
+        .chipset = MACHINE_CHIPSET_NEAT_SX,
+        .init = machine_at_if386sx_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_386SX,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_VIDEO_FIXED | MACHINE_KEYBOARD | MACHINE_KEYBOARD_JIS | MACHINE_AX,
+        .ram = {
+            .min = 1024,
+            .max = 4096,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        /* The version number is a guess - we have no probe of this machine's controller. */
+        .kbc_params = KBC_VEN_PHOENIX | 0x00010500,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has AMI KBC firmware of uknown revision, maybe '8'. */
+    {
+        .name = "[OPTi 283] Silicon Valley Computer SVC386SX/P1",
+        .internal_name = "svc386sxp1",
+        .type = MACHINE_TYPE_386SX,
+        .chipset = MACHINE_CHIPSET_OPTI_283,
+        .init = machine_at_svc386sxp1_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_386SX,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 16384,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00003800, /* Guess. */
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -4416,7 +5607,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_386SX,
         .chipset = MACHINE_CHIPSET_OPTI_291,
         .init = machine_at_awardsx_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -4438,11 +5629,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -4458,7 +5653,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_386SX,
         .chipset = MACHINE_CHIPSET_VLSI_SCAMP,
         .init = machine_at_cmdsl386sx25_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -4480,11 +5675,15 @@ const machine_t machines[] = {
             .step = 512
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL, /* The keyboard controller is part of the VL82c113. */
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &gd5402_onboard_device,
@@ -4500,7 +5699,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_386SX,
         .chipset = MACHINE_CHIPSET_VLSI_SCAMP,
         .init = machine_at_dataexpert386sx_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -4522,25 +5721,75 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004400, /* Guess. */
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has IBM PS/2 Type 1 KBC firmware. */
+    /* No proper pictures of the KBC exist, though it seems to have the IBM AT KBC
+       firmware. */
+    {
+        .name = "[SCAMP] Dell System 333s/L",
+        .internal_name = "dells333sl",
+        .type = MACHINE_TYPE_386SX,
+        .chipset = MACHINE_CHIPSET_VLSI_SCAMP,
+        .init = machine_at_dells333sl_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_386SX,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 10000000,
+            .max_bus = 33333333,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2,
+        .flags = MACHINE_IDE | MACHINE_VIDEO,
+        .ram = {
+            .min = 1024,
+            .max = 16384,
+            .step = 128
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00002020,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &dells333sl_device,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &gd5420_onboard_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* The only photo we have is too blurry to read the marking on the
+       the keyboard controller, but it's possibly a Phoenix. */
     {
         .name = "[SCAMP] Samsung SPC-6033P",
         .internal_name = "spc6033p",
         .type = MACHINE_TYPE_386SX,
         .chipset = MACHINE_CHIPSET_VLSI_SCAMP,
         .init = machine_at_spc6033p_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -4562,11 +5811,15 @@ const machine_t machines[] = {
             .step = 2048
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device, /* Possibly. */
+        .kbc_params = KBC_VEN_PHOENIX | 0x00012900, /* Guess. */
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &ati28800k_spc6033p_device,
@@ -4576,12 +5829,12 @@ const machine_t machines[] = {
     /* Has an unknown AMI KBC firmware, I'm going to assume 'F' until a
        photo or real hardware BIOS string is found. */
     {
-        .name = "[SCAT] Kaimei KMX-C-02",
+        .name = "[SCATsx] Kaimei KMX-C-02",
         .internal_name = "kmxc02",
         .type = MACHINE_TYPE_386SX,
-        .chipset = MACHINE_CHIPSET_SCAT,
+        .chipset = MACHINE_CHIPSET_SCAT_SX,
         .init = machine_at_kmxc02_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -4603,11 +5856,15 @@ const machine_t machines[] = {
             .step = 512
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device, /* Possibly. */
+        .kbc_params = KBC_VEN_AMI | 0x00004600, /* Guess. */
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -4621,7 +5878,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_386SX,
         .chipset = MACHINE_CHIPSET_WD76C10,
         .init = machine_at_wd76c10_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -4643,11 +5900,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_QUADTEL,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -4663,7 +5924,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_386SX,
         .chipset = MACHINE_CHIPSET_PROPRIETARY,
         .init = machine_ps2_model_55sx_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -4685,11 +5946,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_IBM,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -4703,7 +5968,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_386SX,
         .chipset = MACHINE_CHIPSET_PROPRIETARY,
         .init = machine_ps2_model_65sx_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -4725,8 +5990,9 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_IBM,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
@@ -4737,6 +6003,96 @@ const machine_t machines[] = {
         .net_device = NULL
     },
 
+    /* ALi M6117 machines */
+    /* Has IBM PS/2 Type 1 KBC firmware. */
+    {
+        .name = "[ALi M6117] Acrosser PJ-A511M",
+        .internal_name = "pja511m",
+        .type = MACHINE_TYPE_M6117,
+        .chipset = MACHINE_CHIPSET_ALI_M6117,
+        .init = machine_at_pja511m_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_M6117,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2,
+        .flags = MACHINE_IDE,
+        .ram = {
+            .min = 1024,
+            .max = 32768,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has IBM PS/2 Type 1 KBC firmware. */
+    {
+        .name = "[ALi M6117] Protech ProX-1332",
+        .internal_name = "prox1332",
+        .type = MACHINE_TYPE_M6117,
+        .chipset = MACHINE_CHIPSET_ALI_M6117,
+        .init = machine_at_prox1332_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_M6117,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2,
+        .flags = MACHINE_IDE,
+        .ram = {
+            .min = 1024,
+            .max = 32768,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+
     /* 486SLC machines */
     /* 486SLC machines with just the ISA slot */
     /* Has AMIKey H KBC firmware. */
@@ -4746,7 +6102,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_486SLC,
         .chipset = MACHINE_CHIPSET_OPTI_283,
         .init = machine_at_rycleopardlx_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -4768,11 +6124,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -4781,120 +6141,44 @@ const machine_t machines[] = {
     },
 
     /* 386DX machines */
-    /* Has a Jetkey V3, which identifies as a 'B'. */
+    /* Uses Compaq KBC firmware. */
     {
-        .name = "[ACC 2168] Juko AT046DX3",
-        .internal_name = "acc386",
+        .name = "[ISA] Compaq Deskpro 386",
+        .internal_name = "deskpro386",
         .type = MACHINE_TYPE_386DX,
-        .chipset = MACHINE_CHIPSET_ACC_2168,
-        .init = machine_at_acc386_init,
-        .p1_handler = NULL,
+        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .init = machine_at_deskpro386_init,
+        .p1_handler = machine_compaq_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
-            .package = CPU_PKG_386DX,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
+            .package = CPU_PKG_386DX_DESKPRO386,
+            .block = CPU_BLOCK(CPU_486DLC, CPU_RAPIDCAD),
+            .min_bus = 16000000,
+            .max_bus = 25000000,
             .min_voltage = 0,
             .max_voltage = 0,
             .min_multi = 0,
             .max_multi = 0
         },
         .bus_flags = MACHINE_AT,
-        .flags = MACHINE_APM,
+        .flags = MACHINE_FLAGS_NONE,
         .ram = {
             .min = 1024,
             .max = 16384,
             .step = 1024
         },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .nvrmask = 63,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_COMPAQ,
+        .kbc_p1 = 0x000000f4,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has an AMI Keyboard BIOS PLUS KBC firmware ('8'). */
-    {
-        .name = "[C&T 386] ECS 386/32",
-        .internal_name = "ecs386",
-        .type = MACHINE_TYPE_386DX,
-        .chipset = MACHINE_CHIPSET_CT_386,
-        .init = machine_at_ecs386_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_386DX,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_AT,
-        .flags = MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 16384,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has IBM AT KBC firmware. */
-    {
-        .name = "[C&T 386] Samsung SPC-6000A",
-        .internal_name = "spc6000a",
-        .type = MACHINE_TYPE_386DX,
-        .chipset = MACHINE_CHIPSET_CT_386,
-        .init = machine_at_spc6000a_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_386DX,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_AT,
-        .flags = MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 32768,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &deskpro386_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -4902,91 +6186,13 @@ const machine_t machines[] = {
         .net_device = NULL
     },
     /* Uses Compaq KBC firmware. */
-    {
-        .name = "[ISA] Compaq Deskpro 386 (September 1986)",
-        .internal_name = "deskpro386",
-        .type = MACHINE_TYPE_386DX,
-        .chipset = MACHINE_CHIPSET_DISCRETE,
-        .init = machine_at_deskpro386_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_386DX_DESKPRO386,
-            .block = CPU_BLOCK(CPU_486DLC, CPU_RAPIDCAD),
-            .min_bus = 16000000,
-            .max_bus = 25000000,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_AT,
-        .flags = MACHINE_FLAGS_NONE,
-        .ram = {
-            .min = 1024,
-            .max = 16384,
-            .step = 1024
-        },
-        .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    {
-        .name = "[ISA] Compaq Deskpro 386 (May 1988)",
-        .internal_name = "deskpro386_05_1988",
-        .type = MACHINE_TYPE_386DX,
-        .chipset = MACHINE_CHIPSET_DISCRETE,
-        .init = machine_at_deskpro386_05_1988_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_386DX_DESKPRO386,
-            .block = CPU_BLOCK(CPU_486DLC, CPU_RAPIDCAD),
-            .min_bus = 16000000,
-            .max_bus = 25000000,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_AT,
-        .flags = MACHINE_FLAGS_NONE,
-        .ram = {
-            .min = 1024,
-            .max = 16384,
-            .step = 1024
-        },
-        .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
     {
         .name = "[ISA] Compaq Portable III (386)",
         .internal_name = "portableiii386",
         .type = MACHINE_TYPE_386DX,
         .chipset = MACHINE_CHIPSET_DISCRETE,
         .init = machine_at_portableiii386_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_compaq_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5001,32 +6207,36 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_AT,
-        .flags = MACHINE_IDE | MACHINE_VIDEO,
+        .flags = MACHINE_IDE | MACHINE_VIDEO | MACHINE_KEYBOARD,
         .ram = {
             .min = 1024,
             .max = 14336,
             .step = 1024
         },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .nvrmask = 63,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_COMPAQ,
+        .kbc_p1 = 0x000000f4,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &compaq_plasma_device,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has IBM AT KBC firmware. */
+    /* Has Phoenix MultiKey/42 KBC firmware. */
     {
-        .name = "[ISA] Micronics 09-00021",
+        .name = "[ISA] Micronics 09-00021 (Tandon BIOS)",
         .internal_name = "micronics386",
         .type = MACHINE_TYPE_386DX,
         .chipset = MACHINE_CHIPSET_DISCRETE,
         .init = machine_at_micronics386_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5048,25 +6258,251 @@ const machine_t machines[] = {
             .step = 128
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00012900, /* Guess. */
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has a Lance LT38C41 with AMI Megakey P KBC firmware */
+    /* Has IBM AT KBC firmware. */
+    {
+        .name = "[ISA] Micronics 09-00021 (Phoenix BIOS)",
+        .internal_name = "micronics386px",
+        .type = MACHINE_TYPE_386DX,
+        .chipset = MACHINE_CHIPSET_DISCRETE,
+        .init = machine_at_micronics386px_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_386DX,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 512,
+            .max = 8192,
+            .step = 128
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has a Jetkey V3, which we currently lack a probe of, but an
+       old test by Carlos showed it as being 'F'. */
+    {
+        .name = "[ACC 2168] Juko AT046DX3",
+        .internal_name = "acc386",
+        .type = MACHINE_TYPE_386DX,
+        .chipset = MACHINE_CHIPSET_ACC_2168,
+        .init = machine_at_acc386_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_386DX,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 16384,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has an AMI Keyboard BIOS PLUS KBC firmware ('8'). */
+    {
+        .name = "[C&T 386/AT] ECS 386/32",
+        .internal_name = "ecs386",
+        .type = MACHINE_TYPE_386DX,
+        .chipset = MACHINE_CHIPSET_CT_386,
+        .init = machine_at_ecs386_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_386DX,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 16384,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00003800,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Unknown - we give it an AT Award keyboard controller. */
+    {
+        .name = "[C&T 386/AT] Samsung SPC-6000A",
+        .internal_name = "spc6000a",
+        .type = MACHINE_TYPE_386DX,
+        .chipset = MACHINE_CHIPSET_CT_386,
+        .init = machine_at_spc6000a_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_386DX,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 32768,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AWARD | 0x00424600,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* I found one board picture of it and I can't really read the
+       keyboard controller markings from it, but it may be Phoenix. */
+    {
+        .name = "[C&T 386/AT] Tandy 4000",
+        .internal_name = "tandy4000",
+        .type = MACHINE_TYPE_386DX,
+        .chipset = MACHINE_CHIPSET_CT_386,
+        .init = machine_at_tandy4000_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_386DX,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 16384,
+            .step = 1024
+        },
+        .nvrmask = 63,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00012900, /* Guess. */
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has a Lance LT38C41 that clones an AMIKEY ('F'). */
     {
         .name = "[ALi M1429] ECS Panda 386V",
         .internal_name = "ecs386v",
         .type = MACHINE_TYPE_386DX,
         .chipset = MACHINE_CHIPSET_ALI_M1429,
         .init = machine_at_ecs386v_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5088,8 +6524,11 @@ const machine_t machines[] = {
             .step = 1024,
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device, /* TODO: Lance LT38C41. */
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
@@ -5097,16 +6536,60 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
-     /* The board has a "ASII KB-100" which I was not able to find any information about, 
+    /* Has AMIKey 'F' KBC firmware. */
+    {
+        .name = "[OPTi 391] DataExpert 386WB",
+        .internal_name = "dataexpert386wb",
+        .type = MACHINE_TYPE_386DX,
+        .chipset = MACHINE_CHIPSET_OPTI_391,
+        .init = machine_at_dataexpert386wb_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_386DX, /* Actual machine only supports 386DXes */
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_FLAGS_NONE,
+        .ram = {
+            .min = 1024,
+            .max = 32768,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | KBC_FLAG_IS_CLONE | 0x00004600,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+     /* The board has a "ASII KB-100" which I was not able to find any information about,
         but the BIOS sends commands C9 without a parameter and D5, both of which are
         Phoenix MultiKey commands. */
     {
-        .name = "[OPTi 495] U-Board OPTi 495SLC",
+        .name = "[OPTi 495SLC] U-Board OPTi 495SLC",
         .internal_name = "award495",
         .type = MACHINE_TYPE_386DX,
-        .chipset = MACHINE_CHIPSET_OPTI_495,
+        .chipset = MACHINE_CHIPSET_OPTI_495SLC,
         .init = machine_at_opti495_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5128,11 +6611,59 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00012900, /* Guess. */
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has Award KBC firmware. */
+    {
+        .name = "[SiS 310] ASUS 386/33-64K",
+        .internal_name = "asus3863364k",
+        .type = MACHINE_TYPE_386DX,
+        .chipset = MACHINE_CHIPSET_SIS_310,
+        .init = machine_at_asus3863364k_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_386DX,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 16384,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AWARD | 0x00424600,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -5146,7 +6677,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_386DX,
         .chipset = MACHINE_CHIPSET_SIS_310,
         .init = machine_at_asus386_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5168,11 +6699,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -5188,7 +6723,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_386DX,
         .chipset = MACHINE_CHIPSET_PROPRIETARY,
         .init = machine_ps2_model_80_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5210,11 +6745,103 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_IBM,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has IBM PS/55 5551-Sxx, Txx stage 2 firmware. */
+    {
+        .name = "[MCA] IBM PS/55 model 5550-T",
+        .internal_name = "ibmps55_m50t",
+        .type = MACHINE_TYPE_386DX,
+        .chipset = MACHINE_CHIPSET_PROPRIETARY,
+        .init = machine_ps55_model_50t_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_386DX | CPU_PKG_486BL,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2_MCA,
+        .flags = MACHINE_VIDEO | MACHINE_KEYBOARD_JIS | MACHINE_APM,
+        .ram = {
+            .min = 2048,
+            .max = 16384,
+            .step = 2048
+        },
+        .nvrmask = 63,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_IBM,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has IBM PS/55 5551-V0x, V1x firmware. */
+    {
+        .name = "[MCA] IBM PS/55 model 5550-V",
+        .internal_name = "ibmps55_m50v",
+        .type = MACHINE_TYPE_386DX,
+        .chipset = MACHINE_CHIPSET_PROPRIETARY,
+        .init = machine_ps55_model_50v_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_386DX | CPU_PKG_486BL,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2_MCA,
+        .flags = MACHINE_VIDEO | MACHINE_KEYBOARD_JIS | MACHINE_APM,
+        .ram = {
+            .min = 4096,
+            .max = 16384,
+            .step = 4096
+        },
+        .nvrmask = 63,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_IBM,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -5223,94 +6850,14 @@ const machine_t machines[] = {
     },
 
     /* 386DX/486 machines */
-    /* Has AMIKey F KBC firmware. */
-    {
-        .name = "[OPTi 495] DataExpert SX495",
-        .internal_name = "ami495",
-        .type = MACHINE_TYPE_386DX_486,
-        .chipset = MACHINE_CHIPSET_OPTI_495,
-        .init = machine_at_opti495_ami_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_386DX | CPU_PKG_SOCKET1,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_VLB,
-        .flags = MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 32768,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has AMIKey F KBC firmware (it's just the MR BIOS for the above machine). */
-    {
-        .name = "[OPTi 495] DataExpert SX495 (MR BIOS)",
-        .internal_name = "mr495",
-        .type = MACHINE_TYPE_386DX_486,
-        .chipset = MACHINE_CHIPSET_OPTI_495,
-        .init = machine_at_opti495_mr_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_386DX | CPU_PKG_SOCKET1,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_VLB,
-        .flags = MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 32768,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Winbond W83C42 with unknown firmware. */
+    /* Winbond W83C42 - ASIC that clones AMI 'F'. */
     {
         .name = "[ALi M1429G] DataExpert EXP4349",
         .internal_name = "exp4349",
         .type = MACHINE_TYPE_386DX_486,
         .chipset = MACHINE_CHIPSET_ALI_M1429G,
         .init = machine_at_exp4349_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5328,15 +6875,108 @@ const machine_t machines[] = {
         .flags = MACHINE_APM,
         .ram = {
             .min = 1024,
-            .max = 49152,
+            .max = 65536,
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00021400,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has AMIKey F KBC firmware. The EFAR chipst is a rebrand of OPTi 495SX. */
+    {
+        .name = "[OPTi 495SX] CAF Technology C747",
+        .internal_name = "c747",
+        .type = MACHINE_TYPE_386DX_486,
+        .chipset = MACHINE_CHIPSET_OPTI_495SX,
+        .init = machine_at_c747_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_386DX | CPU_PKG_SOCKET1,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_APM | MACHINE_IDE,
+        .ram = {
+            .min = 1024,
+            .max = 32768,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_SIEMENS,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has AMIKey 'F' or MR BIOS 'M' KBC firmware, we give it the latter
+       for the sake of keyboard controller diversity. */
+    {
+        .name = "[OPTi 495SX] DataExpert SX495",
+        .internal_name = "ami495",
+        .type = MACHINE_TYPE_386DX_486,
+        .chipset = MACHINE_CHIPSET_OPTI_495SX,
+        .init = machine_at_opti495_ami_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_386DX | CPU_PKG_SOCKET1,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_VLB,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 32768,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004d00,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &opti495_ami_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -5350,7 +6990,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_386DX_486,
         .chipset = MACHINE_CHIPSET_PROPRIETARY,
         .init = machine_ps2_model_70_type3_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5372,11 +7012,15 @@ const machine_t machines[] = {
             .step = 2048
         },
         .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_IBM,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -5390,7 +7034,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_386DX_486,
         .chipset = MACHINE_CHIPSET_PROPRIETARY,
         .init = machine_ps2_model_80_axx_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5412,11 +7056,15 @@ const machine_t machines[] = {
             .step = 2048
         },
         .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_IBM,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -5425,60 +7073,15 @@ const machine_t machines[] = {
     },
 
     /* 486 machines - Socket 1 */
-    /* Has JetKey 5 KBC Firmware which looks like it is a clone of AMIKey type F.
-       It also has those Ex commands also seen on the VIA VT82C42N (the BIOS
-       supposedly sends command EF.
-       The board was also seen in 2003 with a -H string - perhaps someone swapped
-       the KBC? */
-    {
-        .name = "[ALi M1429] Olystar LIL1429",
-        .internal_name = "ali1429",
-        .type = MACHINE_TYPE_486,
-        .chipset = MACHINE_CHIPSET_ALI_M1429,
-        .init = machine_at_ali1429_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET1,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_VLB,
-        .flags = MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 32768,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has JetKey 5 KBC Firmware - but the BIOS string ends in a hardcoded -F, and
-       the BIOS also explicitly expects command A1 to return a 'F', so it looks like
-       the JetKey 5 is a clone of AMIKey type F. */
+    /* Has JetKey V5 KBC Firmware - we now have a photo of the board and its POST
+       screen, so we can match JetKey V5 to 'F'. */
     {
         .name = "[CS4031] AMI 486 CS4031",
         .internal_name = "cs4031",
         .type = MACHINE_TYPE_486,
         .chipset = MACHINE_CHIPSET_CT_CS4031,
         .init = machine_at_cs4031_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5500,11 +7103,103 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has AMI KF KBC firmware. */
+    {
+        .name = "[OPTi 381] Gigabyte GA-486L",
+        .internal_name = "ga486l",
+        .type = MACHINE_TYPE_486,
+        .chipset = MACHINE_CHIPSET_OPTI_381,
+        .init = machine_at_ga486l_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET1,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 16384,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Uses the AMIKey 'F' keyboard controller firmware. */
+    {
+        .name = "[OPTi 493] Silicon Valley Computer 486WB",
+        .internal_name = "svc486wb",
+        .type = MACHINE_TYPE_486,
+        .chipset = MACHINE_CHIPSET_OPTI_493,
+        .init = machine_at_svc486wb_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET1,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 20000000,
+            .max_bus = 33333333,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 2.0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_IDE | MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 32768,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -5514,12 +7209,12 @@ const machine_t machines[] = {
     /* Uses some variant of Phoenix MultiKey/42 as the Intel 8242 chip has a Phoenix
        copyright. */
     {
-        .name = "[OPTi 895] Mylex MVI486",
+        .name = "[OPTi 498] Mylex MVI486",
         .internal_name = "mvi486",
         .type = MACHINE_TYPE_486,
-        .chipset = MACHINE_CHIPSET_OPTI_895_802G,
+        .chipset = MACHINE_CHIPSET_OPTI_498,
         .init = machine_at_mvi486_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5541,11 +7236,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00012900, /* Guess. */
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -5559,7 +7258,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_486,
         .chipset = MACHINE_CHIPSET_SIS_401,
         .init = machine_at_isa486_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5581,25 +7280,30 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has AMIKey H KBC firmware, per the screenshot in "How computers & MS-DOS work". */
+    /* Has AMIKey H KBC firmware, per the screenshot in "How computers & MS-DOS work".
+       Also seen with an AMI 'F'. */
     {
         .name = "[SiS 401] Chaintech 433SC",
         .internal_name = "sis401",
         .type = MACHINE_TYPE_486,
         .chipset = MACHINE_CHIPSET_SIS_401,
         .init = machine_at_sis401_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5621,26 +7325,29 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has AMIKey F KBC firmware, per a photo of a monitor with the BIOS screen on
-       eBay. */
+    /* Seen with both AMIKey F and AMIKey-2 H KBC firmwares. */
     {
         .name = "[SiS 460] ABIT AV4",
         .internal_name = "av4",
         .type = MACHINE_TYPE_486,
         .chipset = MACHINE_CHIPSET_SIS_460,
         .init = machine_at_av4_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5662,25 +7369,73 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Uses an NEC 90M002A (UPD82C42C, 8042 clone) with unknown firmware. */
+    /* Has Phoenix KBC firmware. */
     {
-        .name = "[SiS 461] Acer V10",
-        .internal_name = "acerv10",
+        .name = "[SiS 471] AST Advantage! 40xxd",
+        .internal_name = "advantage40xxd",
         .type = MACHINE_TYPE_486,
-        .chipset = MACHINE_CHIPSET_SIS_461,
-        .init = machine_at_acerv10_init,
-        .p1_handler = NULL,
+        .chipset = MACHINE_CHIPSET_SIS_471,
+        .init = machine_at_advantage40xxd_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET1,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 2
+        },
+        .bus_flags = MACHINE_PS2_VLB,
+        .flags = MACHINE_IDE | MACHINE_VIDEO | MACHINE_APM,
+        .ram = {
+            .min = 4096,
+            .max = 36864,
+            .step = 4096
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00012900, /* Guess. */
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &gd5424_onboard_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has AMIKey F KBC firmware. */
+    {
+        .name = "[Symphony SL42C460] DTK PKM-0031Y",
+        .internal_name = "dtk461",
+        .type = MACHINE_TYPE_486,
+        .chipset = MACHINE_CHIPSET_SYMPHONY_SL82C460,
+        .init = machine_at_dtk461_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5694,59 +7449,23 @@ const machine_t machines[] = {
             .min_multi = 0,
             .max_multi = 0
         },
-        .bus_flags = MACHINE_PS2_VLB,
-        .flags = MACHINE_IDE | MACHINE_APM, /* Machine has internal SCSI: Adaptec AIC-6360 */
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_APM,
         .ram = {
             .min = 1024,
             .max = 32768,
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has MR (!) KBC firmware, which is a clone of the standard IBM PS/2 KBC firmware. */
-    {
-        .name = "[SiS 471] SiS VL-BUS 471 REV. A1",
-        .internal_name = "px471",
-        .type = MACHINE_TYPE_486,
-        .chipset = MACHINE_CHIPSET_SIS_471,
-        .init = machine_at_px471_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET1,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_VLB,
-        .flags = MACHINE_IDE | MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 131072,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -5756,14 +7475,15 @@ const machine_t machines[] = {
     /* The chip is a Lance LT38C41, a clone of the Intel 8041, and the BIOS sends
        commands BC, BD, and C9 which exist on both AMIKey and Phoenix MultiKey/42,
        but it does not write a byte after C9, which is consistent with AMIKey, so
-       this must have some form of AMIKey. */
+       this must have some form of AMIKey.
+       This is also seen with a genuine AMI 'F' (one of the photos on TheRetroWeb). */
     {
         .name = "[VIA VT82C495] FIC 486-VC-HD",
         .internal_name = "486vchd",
         .type = MACHINE_TYPE_486,
         .chipset = MACHINE_CHIPSET_VIA_VT82C495,
         .init = machine_at_486vchd_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5785,11 +7505,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -5803,7 +7527,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_486,
         .chipset = MACHINE_CHIPSET_VLSI_VL82C480,
         .init = machine_at_vect486vl_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5825,11 +7549,15 @@ const machine_t machines[] = {
             .step = 2048
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL, /* The keyboard controller is part of the VL82c113. */
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL, /*Has SIO (sorta): VLSI VL82C113A SCAMP Combination I/O*/
         .vid_device = &gd5428_onboard_device,
@@ -5843,7 +7571,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_486,
         .chipset = MACHINE_CHIPSET_VLSI_VL82C481,
         .init = machine_at_d824_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5864,18 +7592,198 @@ const machine_t machines[] = {
             .max = 32768,
             .step = 2048
         },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &gd5428_onboard_device,
         .snd_device = NULL,
         .net_device = NULL
     },
+    /* Has a VLSI VL82C113A SCAMP Combination I/O which holds the KBC. */
+    {
+        .name = "[VLSI 82C486] Olivetti PCS 44/C",
+        .internal_name = "pcs44c",
+        .type = MACHINE_TYPE_486,
+        .chipset = MACHINE_CHIPSET_VLSI_VL82C486,
+        .init = machine_at_pcs44c_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET1,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2,
+        .flags = MACHINE_IDE | MACHINE_VIDEO | MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 20480,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &oti077_pcs44c_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has a VLSI VL82C113A SCAMP Combination I/O which holds the KBC. */
+    {
+        .name = "[VLSI 82C486] Tulip 486 DC/DT",
+        .internal_name = "tuliptc38",
+        .type = MACHINE_TYPE_486,
+        .chipset = MACHINE_CHIPSET_VLSI_VL82C486,
+        .init = machine_at_tuliptc38_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET1,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_IDE | MACHINE_VIDEO | MACHINE_APM,
+        .ram = {
+            .min = 2048,
+            .max = 32768,
+            .step = 2048
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL, /*Has SIO (sorta): VLSI VL82C113A SCAMP Combination I/O*/
+        .vid_device = &gd5426_onboard_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has Award KBC firmware. */
+    {
+        .name = "[ZyMOS Poach] ASUS ISA-486C",
+        .internal_name = "isa486c",
+        .type = MACHINE_TYPE_486,
+        .chipset = MACHINE_CHIPSET_ZYMOS_POACH,
+        .init = machine_at_isa486c_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET1,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 16384,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AWARD | 0x00424600,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has AMI KF KBC firmware. */
+    {
+        .name = "[ZyMOS Poach] Genoa Unknown 486",
+        .internal_name = "genoa486",
+        .type = MACHINE_TYPE_486,
+        .chipset = MACHINE_CHIPSET_ZYMOS_POACH,
+        .init = machine_at_genoa486_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET1,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_AT,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 16384,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
     /* Has IBM PS/2 Type 1 KBC firmware. */
     {
         .name = "[MCA] IBM PS/2 model 70 (type 4)",
@@ -5883,7 +7791,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_486,
         .chipset = MACHINE_CHIPSET_PROPRIETARY,
         .init = machine_ps2_model_70_type4_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5905,11 +7813,15 @@ const machine_t machines[] = {
             .step = 2048
         },
         .nvrmask = 63,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_IBM,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -5926,7 +7838,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_486_S2,
         .chipset = MACHINE_CHIPSET_ACC_2168,
         .init = machine_at_pb410a_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5941,21 +7853,25 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PS2,
-        .flags = MACHINE_IDE | MACHINE_VIDEO | MACHINE_APM,
+        .flags = MACHINE_IDE | MACHINE_VIDEO | MACHINE_APM | MACHINE_GAMEPORT,
         .ram = {
             .min = 4096,
             .max = 36864,
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00012900 /* Guess. */,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
-        .vid_device = NULL,
+        .vid_device = &ht216_32_pb410a_device,
         .snd_device = NULL,
         .net_device = NULL
     },
@@ -5966,7 +7882,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_486_S2,
         .chipset = MACHINE_CHIPSET_ALI_M1429G,
         .init = machine_at_acera1g_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -5988,11 +7904,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_ACER,
+        .kbc_p1 = 0x004008f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &gd5428_onboard_device,
@@ -6006,7 +7926,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_486_S2,
         .chipset = MACHINE_CHIPSET_ALI_M1429G,
         .init = machine_at_winbios1429_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -6028,25 +7948,30 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* This has a standalone AMI Megakey 1993, which is type 'P'. */
+    /* Has JetKey V5.0 KBC Firmware which clones an AMI 'H'.
+       The board was also seen 2003 with a -F string. */
     {
-        .name = "[IMS 8848] Tekram G486IP",
-        .internal_name = "g486ip",
+        .name = "[ALi M1429] Olystar LIL1429",
+        .internal_name = "ali1429",
         .type = MACHINE_TYPE_486_S2,
-        .chipset = MACHINE_CHIPSET_IMS_8848,
-        .init = machine_at_g486ip_init,
-        .p1_handler = NULL,
+        .chipset = MACHINE_CHIPSET_ALI_M1429,
+        .init = machine_at_ali1429_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -6060,114 +7985,37 @@ const machine_t machines[] = {
             .min_multi = 0,
             .max_multi = 0
         },
-        .bus_flags = MACHINE_PCI,
+        .bus_flags = MACHINE_VLB,
         .flags = MACHINE_APM,
-        .ram = {
-            .min = 2048,
-            .max = 131072,
-            .step = 2048
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Uses an Intel KBC with Phoenix MultiKey KBC firmware. */
-    {
-        .name = "[SiS 461] DEC DECpc LPV",
-        .internal_name = "decpclpv",
-        .type = MACHINE_TYPE_486_S2,
-        .chipset = MACHINE_CHIPSET_SIS_461,
-        .init = machine_at_decpclpv_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_PS2,
-        .flags = MACHINE_IDE | MACHINE_VIDEO | MACHINE_APM,
         .ram = {
             .min = 1024,
             .max = 32768,
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = &s3_86c805_onboard_vlb_device,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* The BIOS does not send any non-standard keyboard controller commands and wants
-       a PS/2 mouse, so it's an IBM PS/2 KBC (Type 1) firmware. */
-    {
-        .name = "[SiS 461] IBM PS/ValuePoint 433DX/Si",
-        .internal_name = "valuepoint433",
-        .type = MACHINE_TYPE_486_S2,
-        .chipset = MACHINE_CHIPSET_SIS_461,
-        .init = machine_at_valuepoint433_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_PS2,
-        .flags = MACHINE_IDE | MACHINE_VIDEO | MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 65536,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has AMI MegaKey KBC.  */
+    /* Has AMI 'H' KBC.  */
     {
         .name = "[i420TX] J-Bond PCI400C-A",
         .internal_name = "pci400ca",
         .type = MACHINE_TYPE_486_S2,
         .chipset = MACHINE_CHIPSET_INTEL_420TX,
         .init = machine_at_pci400ca_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -6189,29 +8037,29 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = &keyboard_ps2_ami_device,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-
-
-    /* 486 machines - Socket 3 */
-    /* 486 machines with just the ISA slot */
-    /* Has a Fujitsu MBL8042H KBC. */
+    /* This has a standalone AMI Megakey 1993, which is type 'P'. */
     {
-        .name = "[Contaq 82C596A] A-Trend 4GPV5",
-        .internal_name = "4gpv5",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_CONTAQ_82C596,
-        .init = machine_at_4gpv5_init,
-        .p1_handler = NULL,
+        .name = "[IMS 8848] Tekram G486IP",
+        .internal_name = "g486ip",
+        .type = MACHINE_TYPE_486_S2,
+        .chipset = MACHINE_CHIPSET_IMS_8848,
+        .init = machine_at_g486ip_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -6225,321 +8073,43 @@ const machine_t machines[] = {
             .min_multi = 0,
             .max_multi = 0
         },
-        .bus_flags = MACHINE_VLB,
+        .bus_flags = MACHINE_PCI,
         .flags = MACHINE_APM,
         .ram = {
-            .min = 1024,
-            .max = 65536,
-            .step = 1024
+            .min = 2048,
+            .max = 131072,
+            .step = 2048
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00005000,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has AMI MegaKey KBC firmware. */
+    /* Has AMIKey-2 'H' KBC firmware. */
     {
-        .name = "[Contaq 82C597] Visionex Green-B",
-        .internal_name = "greenb",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_CONTAQ_82C597,
-        .init = machine_at_greenb_init,
-        .p1_handler = NULL,
+        .name = "[OPTi 499] Alaris Cobalt LPX",
+        .internal_name = "cobalt",
+        .type = MACHINE_TYPE_486_S2,
+        .chipset = MACHINE_CHIPSET_OPTI_499,
+        .init = machine_at_cobalt_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_VLB,
-        .flags = MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 65536,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Version 1.0 has an AMIKEY-2, version 2.0 has a VIA VT82C42N KBC. */
-    {
-        .name = "[OPTi 895] Jetway J-403TG",
-        .internal_name = "403tg",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_OPTI_895_802G,
-        .init = machine_at_403tg_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_VLB,
-        .flags = MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 65536,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has JetKey 5 KBC Firmware which looks like it is a clone of AMIKey type F. */
-    {
-        .name = "[OPTi 895] Jetway J-403TG Rev D",
-        .internal_name = "403tg_d",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_OPTI_895_802G,
-        .init = machine_at_403tg_d_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_VLB,
-        .flags = MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 65536,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has JetKey 5 KBC Firmware which looks like it is a clone of AMIKey type F. */
-    {
-        .name = "[OPTi 895] Jetway J-403TG Rev D (MR BIOS)",
-        .internal_name = "403tg_d_mr",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_OPTI_895_802G,
-        .init = machine_at_403tg_d_mr_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_VLB,
-        .flags = MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 65536,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* has a Phoenix PLCC Multikey copyrighted 1993, version unknown. */
-    {
-        .name = "[OPTi 895] Packard Bell PB450",
-        .internal_name = "pb450",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_OPTI_895_802G,
-        .init = machine_at_pb450_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_SUPER_IO | MACHINE_IDE_DUAL | MACHINE_VIDEO,
-        .ram = {
-            .min = 1024,
-            .max = 65536,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = &gd5428_vlb_onboard_device,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* The BIOS string ends in -U, unless command 0xA1 (AMIKey get version) returns an
-       'F', in which case, it ends in -F, so it has an AMIKey F KBC firmware.
-       The photo of the board shows an AMIKey KBC which is indeed F. */
-    {
-        .name = "[SiS 471] ABIT AB-AH4",
-        .internal_name = "win471",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_SIS_471,
-        .init = machine_at_win471_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_VLB,
-        .flags = MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 65536,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has AMIKey-2 'H' keyboard BIOS. */
-    {
-        .name = "[SiS 471] AOpen Vi15G",
-        .internal_name = "vi15g",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_SIS_471,
-        .init = machine_at_vi15g_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_VLB,
-        .flags = MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 65536,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* This has an AMIKey-2, which is an updated version of type 'H'. */
-    {
-        .name = "[SiS 471] ASUS VL/I-486SV2G (GX4)",
-        .internal_name = "vli486sv2g",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_SIS_471,
-        .init = machine_at_vli486sv2g_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
+            .package = CPU_PKG_SOCKET3 | CPU_PKG_486BL,
+            .block = CPU_BLOCK(CPU_P24T),
             .min_bus = 0,
             .max_bus = 0,
             .min_voltage = 0,
@@ -6548,37 +8118,41 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PS2_VLB,
-        .flags = MACHINE_APM,
+        .flags = MACHINE_APM | MACHINE_VIDEO | MACHINE_IDE_DUAL,
         .ram = {
             .min = 1024,
             .max = 65536,
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
-        .vid_device = NULL,
+        .vid_device = &gd5428_vlb_onboard_device,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has JetKey 5 KBC Firmware which looks like it is a clone of AMIKey type F. */
+    /* Has AMIKey-2 'H' KBC firmware. */
     {
-        .name = "[SiS 471] DTK PKM-0038S E-2",
-        .internal_name = "dtk486",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_SIS_471,
-        .init = machine_at_dtk486_init,
-        .p1_handler = NULL,
+        .name = "[OPTi 499] Alaris COUGAR 486BL",
+        .internal_name = "cougar",
+        .type = MACHINE_TYPE_486_S2,
+        .chipset = MACHINE_CHIPSET_OPTI_499,
+        .init = machine_at_cougar_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
-            .package = CPU_PKG_SOCKET3,
+            .package = CPU_PKG_SOCKET3 | CPU_PKG_486BL,
             .block = CPU_BLOCK_NONE,
             .min_bus = 0,
             .max_bus = 0,
@@ -6588,112 +8162,36 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_VLB,
-        .flags = MACHINE_APM,
+        .flags = MACHINE_APM, /* Machine has IDE with controller: Appian ADI/2 */
         .ram = {
             .min = 1024,
             .max = 65536,
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has a Lance LT38C41L with AMIKey F keyboard BIOS. */
+    /* Uses an Intel KBC with Phoenix MultiKey KBC firmware. */
     {
-        .name = "[SiS 471] Epox GXA486SG",
-        .internal_name = "ami471",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_SIS_471,
-        .init = machine_at_ami471_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_VLB,
-        .flags = MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 65536,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* TriGem AMIBIOS Pre-Color with TriGem AMI 'Z' keyboard controller */
-    {
-        .name = "[SiS 471] TriGem 486G",
-        .internal_name = "tg486g",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_SIS_471,
-        .init = machine_at_tg486g_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_PS2_VLB,
-        .flags = MACHINE_IDE | MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 65536,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Unknown revision phoenix 1993 multikey */
-    {
-        .name = "[SiS 471] DEC Venturis 4xx",
-        .internal_name = "dvent4xx",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_SIS_471,
-        .init = machine_at_dvent4xx_init,
-        .p1_handler = NULL,
+        .name = "[SiS 461] DEC DECpc LPV",
+        .internal_name = "decpclpv",
+        .type = MACHINE_TYPE_486_S2,
+        .chipset = MACHINE_CHIPSET_SIS_461,
+        .init = machine_at_decpclpv_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -6708,18 +8206,202 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PS2,
-        .flags = MACHINE_IDE_DUAL | MACHINE_SUPER_IO | MACHINE_APM | MACHINE_VIDEO,
+        .flags = MACHINE_IDE | MACHINE_VIDEO | MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 32768,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00012900, /* Guess. */
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &s3_86c805_onboard_vlb_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Uses a ???? KBC. */
+    {
+        .name = "[SiS 461] Dell 466/NP",
+        .internal_name = "dell466np",
+        .type = MACHINE_TYPE_486_S2,
+        .chipset = MACHINE_CHIPSET_SIS_461,
+        .init = machine_at_dell466np_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2,
+        .flags = MACHINE_IDE | MACHINE_VIDEO | MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 32768,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00012900, /* Guess. */
+        .kbc_p1 = 0x00002420,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &gd5428_onboard_vlb_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* The BIOS does not send any non-standard keyboard controller commands and wants
+       a PS/2 mouse, so it's an IBM PS/2 KBC (Type 1) firmware. */
+    {
+        .name = "[SiS 461] IBM PS/ValuePoint 433DX/Si",
+        .internal_name = "valuepoint433",
+        .type = MACHINE_TYPE_486_S2,
+        .chipset = MACHINE_CHIPSET_SIS_461,
+        .init = machine_at_valuepoint433_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2,
+        .flags = MACHINE_IDE | MACHINE_VIDEO | MACHINE_APM,
         .ram = {
             .min = 1024,
             .max = 65536,
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = &s3_phoenix_trio32_onboard_vlb_device,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has a VLSI VL82C113A SCAMP Combination I/O which holds the KBC. */
+    {
+        .name = "[VLSI 82C480] ZEOS Martin",
+        .internal_name = "martin",
+        .type = MACHINE_TYPE_486_S2,
+        .chipset = MACHINE_CHIPSET_VLSI_VL82C480,
+        .init = machine_at_martin_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_VLB,
+        .flags = MACHINE_IDE | MACHINE_APM,
+        .ram = {
+            .min = 2048,
+            .max = 65536,
+            .step = 2048
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+
+    /* 486 machines - Socket 3 */
+    /* 486 machines with just the ISA slot */
+    /* JETKey V5.0 */
+    {
+        .name = "[ALi M1429G] A-Trend ATC-1762",
+        .internal_name = "atc1762",
+        .type = MACHINE_TYPE_486_S3,
+        .chipset = MACHINE_CHIPSET_ALI_M1429G,
+        .init = machine_at_atc1762_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_VLB,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 131072,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | KBC_FLAG_IS_CLONE | KBC_FLAG_IS_ASIC | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -6733,7 +8415,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_486_S3,
         .chipset = MACHINE_CHIPSET_ALI_M1429G,
         .init = machine_at_ecsal486_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -6755,25 +8437,30 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* This uses a VIA VT82C42N KBC, which is a clone of type 'F' with additional commands */
+    /* This uses a VIA VT82C42N KBC, which is a clone of type 'F' with additional commands.
+       It's really an ASIC clone of the Award KBC, which is itself an extended clone of AMI 'F'. */
     {
         .name = "[ALi M1429G] Lanner Electronics AP-4100AA",
         .internal_name = "ap4100aa",
         .type = MACHINE_TYPE_486_S3,
         .chipset = MACHINE_CHIPSET_ALI_M1429G,
         .init = machine_at_ap4100aa_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -6791,29 +8478,33 @@ const machine_t machines[] = {
         .flags = MACHINE_SUPER_IO | MACHINE_IDE | MACHINE_APM,
         .ram = {
             .min = 1024,
-            .max = 32768,
+            .max = 131072,
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
-        .vid_device = &tgui9440_onboard_pci_device,
+        .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* JETKey V5.0 */
+    /* Has a Fujitsu MBL8042H KBC. */
     {
-        .name = "[ALi M1429G] A-Trend ATC-1762",
-        .internal_name = "atc1762",
+        .name = "[Contaq 82C596A] A-Trend 4GPV5",
+        .internal_name = "4gpv5",
         .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_ALI_M1429G,
-        .init = machine_at_atc1762_init,
-        .p1_handler = NULL,
+        .chipset = MACHINE_CHIPSET_CONTAQ_82C596,
+        .init = machine_at_4gpv5_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -6831,15 +8522,506 @@ const machine_t machines[] = {
         .flags = MACHINE_APM,
         .ram = {
             .min = 1024,
-            .max = 40960,
+            .max = 65536,
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has AMI MegaKey 'P' KBC firmware. */
+    {
+        .name = "[Contaq 82C597] Visionex Green-B",
+        .internal_name = "greenb",
+        .type = MACHINE_TYPE_486_S3,
+        .chipset = MACHINE_CHIPSET_CONTAQ_82C597,
+        .init = machine_at_greenb_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_VLB,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 65536,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00005000,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Version 1.0 has an AMIKEY-2, version 2.0 has a VIA VT82C42N KBC. */
+    {
+        .name = "[OPTi 895] Jetway J-403TG",
+        .internal_name = "403tg",
+        .type = MACHINE_TYPE_486_S3,
+        .chipset = MACHINE_CHIPSET_OPTI_895_802G,
+        .init = machine_at_403tg_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_VLB,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 65536,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &j403tg_device,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Uses an Acer 90M002A.
+       This is a strange one - it has command AF but it returns 0x00. */
+    {
+        .name = "[SiS 461] Acer V10",
+        .internal_name = "acerv10",
+        .type = MACHINE_TYPE_486_S3,
+        .chipset = MACHINE_CHIPSET_SIS_461,
+        .init = machine_at_acerv10_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2_VLB,
+        .flags = MACHINE_IDE | MACHINE_APM, /* Machine has internal SCSI: Adaptec AIC-6360 */
+        .ram = {
+            .min = 1024,
+            .max = 32768,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_ACER,
+        .kbc_p1 = 0x004008f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* The BIOS string ends in -U, unless command 0xA1 (AMIKey get version) returns an
+       'F', in which case, it ends in -F, so it has an AMIKey F KBC firmware.
+       The photo of the board shows an AMIKey KBC which is indeed F. */
+    {
+        .name = "[SiS 471] ABIT AB-AH4",
+        .internal_name = "win471",
+        .type = MACHINE_TYPE_486_S3,
+        .chipset = MACHINE_CHIPSET_SIS_471,
+        .init = machine_at_win471_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_VLB,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 131072,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has AMIKey-2 'H' keyboard BIOS. */
+    {
+        .name = "[SiS 471] AOpen Vi15G",
+        .internal_name = "vi15g",
+        .type = MACHINE_TYPE_486_S3,
+        .chipset = MACHINE_CHIPSET_SIS_471,
+        .init = machine_at_vi15g_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_VLB,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 131072,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* This has an AMIKey-2, which is an updated version of type 'H'. */
+    {
+        .name = "[SiS 471] ASUS VL/I-486SV2GX4",
+        .internal_name = "vli486sv2g",
+        .type = MACHINE_TYPE_486_S3,
+        .chipset = MACHINE_CHIPSET_SIS_471,
+        .init = machine_at_vli486sv2g_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2_VLB,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 65536,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has an Intel 82C42PE with Phoenix MultiKey/C42 KBC firmware, copyrighted 1993. */
+    {
+        .name = "[SiS 471] DEC Venturis 4xx",
+        .internal_name = "dvent4xx",
+        .type = MACHINE_TYPE_486_S3,
+        .chipset = MACHINE_CHIPSET_SIS_471,
+        .init = machine_at_dvent4xx_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2,
+        .flags = MACHINE_IDE_DUAL | MACHINE_SUPER_IO | MACHINE_APM | MACHINE_VIDEO,
+        .ram = {
+            .min = 4096,
+            .max = 69632,
+            .step = 4096
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED,
+        .default_jumpered_ecp_dma = 4,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00021400, /* Guess. */
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &s3_phoenix_trio32_onboard_vlb_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has JetKey v5.0G KBC Firmware which is a clone of AMIKey type F. */
+    {
+        .name = "[SiS 471] DTK PKM-0038S E-2",
+        .internal_name = "dtk486",
+        .type = MACHINE_TYPE_486_S3,
+        .chipset = MACHINE_CHIPSET_SIS_471,
+        .init = machine_at_dtk486_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_VLB,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 131072,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | KBC_FLAG_IS_CLONE | KBC_FLAG_IS_ASIC | 0x00004600,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has a Lance LT38C41L with AMIKey F keyboard BIOS. */
+    {
+        .name = "[SiS 471] Epox GXA486SG",
+        .internal_name = "ami471",
+        .type = MACHINE_TYPE_486_S3,
+        .chipset = MACHINE_CHIPSET_SIS_471,
+        .init = machine_at_ami471_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_VLB,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 131072,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | KBC_FLAG_IS_CLONE | KBC_FLAG_IS_ASIC | 0x00004600,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has MR BIOS V307UT KBC firmware, which, bizarrely enough, is actually  a genuine AMI 'H'. */
+    {
+        .name = "[SiS 471] SiS VL-BUS 471 REV. A1",
+        .internal_name = "px471",
+        .type = MACHINE_TYPE_486_S3,
+        .chipset = MACHINE_CHIPSET_SIS_471,
+        .init = machine_at_px471_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_VLB,
+        .flags = MACHINE_IDE | MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 131072,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* TriGem AMIBIOS Pre-Color with TriGem AMI 'Z' keyboard controller */
+    {
+        .name = "[SiS 471] TriGem 486G (Olympia-K)",
+        .internal_name = "tg486g",
+        .type = MACHINE_TYPE_486_S3,
+        .chipset = MACHINE_CHIPSET_SIS_471,
+        .init = machine_at_tg486g_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2_VLB,
+        .flags = MACHINE_IDE | MACHINE_APM, /* Has internal video: Western Digital WD90C33-ZZ */
+        .ram = {
+            .min = 4096,
+            .max = 40960,
+            .step = 4096
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI_TRIGEM | 0x00005a00,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -6847,16 +9029,17 @@ const machine_t machines[] = {
         .net_device = NULL
     },
 
+    /* 486 machines - Socket 3 PCI */
     /* 486 machines which utilize the PCI bus */
     /* Machine with ALi M1429G chipset and M1435 southbridge */
-    /* Has an AMIKEY-2 KBC. */
+    /* Has an AMIKEY-2 KBC which is type 'H'. */
     {
         .name = "[ALi M1429G] MSI MS-4134",
         .internal_name = "ms4134",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_ALI_M1429G,
         .init = machine_at_ms4134_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -6878,11 +9061,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -6891,12 +9078,12 @@ const machine_t machines[] = {
     },
     /* TriGem machine with M1429G and PhoenixBIOS */
     {
-        .name = "[ALi M1429G] TriGem 486GP",
+        .name = "[ALi M1429G] TriGem 486GP (Talent)",
         .internal_name = "tg486gp",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_ALI_M1429G,
         .init = machine_at_tg486gp_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -6918,11 +9105,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI_TRIGEM | 0x00005a00,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -6933,10 +9124,10 @@ const machine_t machines[] = {
     {
         .name = "[ALi M1489] AAEON SBC-490",
         .internal_name = "sbc490",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_ALI_M1489,
         .init = machine_at_sbc490_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -6958,14 +9149,18 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_0 | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = &tgui9440_onboard_pci_device,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
-        .vid_device = NULL,
+        .vid_device = &tgui9440_onboard_pci_device,
         .snd_device = NULL,
         .net_device = NULL
     },
@@ -6974,10 +9169,10 @@ const machine_t machines[] = {
     {
         .name = "[ALi M1489] ABIT AB-PB4",
         .internal_name = "abpb4",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_ALI_M1489,
         .init = machine_at_abpb4_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -6999,11 +9194,59 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_ALI | 0x00004600,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has an ALi M5042 with phoenix firmware like the ESA TF-486. */
+    {
+        .name = "[ALi M1489] Acrosser AR-B1476",
+        .internal_name = "arb1476",
+        .type = MACHINE_TYPE_486_S3_PCI,
+        .chipset = MACHINE_CHIPSET_ALI_M1489,
+        .init = machine_at_arb1476_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2,
+        .flags = MACHINE_SUPER_IO | MACHINE_IDE | MACHINE_APM, /* Has onboard video: C&T F65545 */
+        .ram = {
+            .min = 8192,
+            .max = 73728,
+            .step = 1024
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00014000, /* Guess. */
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -7018,10 +9261,10 @@ const machine_t machines[] = {
     {
         .name = "[ALi M1489] AMI WinBIOS 486 PCI",
         .internal_name = "win486pci",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_ALI_M1489,
         .init = machine_at_win486pci_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -7043,55 +9286,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has the ALi M1487/9's on-chip keyboard controller which clones a standard AT
-       KBC.
-       The known BIOS string ends in -E, and the BIOS returns whatever command 0xA1
-       returns (but only if command 0xA1 is instant response), so said ALi keyboard
-       controller likely returns 'E'. */
-    {
-        .name = "[ALi M1489] MSI MS-4145",
-        .internal_name = "ms4145",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_ALI_M1489,
-        .init = machine_at_ms4145_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 65536,
-            .step = 1024
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00005500,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -7102,10 +9305,10 @@ const machine_t machines[] = {
     {
         .name = "[ALi M1489] ESA TF-486",
         .internal_name = "tf486",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_ALI_M1489,
         .init = machine_at_tf486_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -7127,25 +9330,33 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00014000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has an ALi M5042 with phoenix firmware like the ESA TF-486. */
+    /* Has the ALi M1487/9's on-chip keyboard controller which clones a standard AT
+       KBC.
+       The known BIOS string ends in -E, and the BIOS returns whatever command 0xA1
+       returns (but only if command 0xA1 is instant response), so said ALi keyboard
+       controller likely returns 'E'. */
     {
-        .name = "[ALi M1489] Acrosser AR-B1476",
-        .internal_name = "arb1476",
-        .type = MACHINE_TYPE_486_S3,
+        .name = "[ALi M1489] MSI MS-4145",
+        .internal_name = "ms4145",
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_ALI_M1489,
-        .init = machine_at_arb1476_init,
-        .p1_handler = NULL,
+        .init = machine_at_ms4145_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -7159,19 +9370,23 @@ const machine_t machines[] = {
             .min_multi = 0,
             .max_multi = 0
         },
-        .bus_flags = MACHINE_PS2,
-        .flags = MACHINE_SUPER_IO | MACHINE_IDE | MACHINE_APM,
+        .bus_flags = MACHINE_PCI,
+        .flags = MACHINE_PS2_KBC | MACHINE_IDE_DUAL | MACHINE_APM,
         .ram = {
             .min = 1024,
-            .max = 32768,
+            .max = 65536,
             .step = 1024
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_ALI | 0x00004600,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -7182,10 +9397,10 @@ const machine_t machines[] = {
     {
         .name = "[OPTi 802G] IBM PC 330 (type 6573)",
         .internal_name = "pc330_6573",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_OPTI_895_802G,
         .init = machine_at_pc330_6573_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -7207,14 +9422,150 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &pc330_6573_device,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &gd5430_onboard_vlb_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* has a Phoenix PLCC Multikey copyrighted 1993, version unknown. */
+    {
+        .name = "[OPTi 895] Packard Bell PB450",
+        .internal_name = "pb450",
+        .type = MACHINE_TYPE_486_S3_PCI,
+        .chipset = MACHINE_CHIPSET_OPTI_895_802G,
+        .init = machine_at_pb450_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_SUPER_IO | MACHINE_IDE_DUAL | MACHINE_VIDEO,
+        .ram = {
+            .min = 1024,
+            .max = 65536,
+            .step = 1024
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00021400, /* Guess. */
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &pb450_device,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &gd5428_vlb_onboard_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* This has an AMIKey-2, which is an updated version of type 'H'. */
+    {
+        .name = "[i420EX] Advanced Integration Research 486PI",
+        .internal_name = "486pi",
+        .type = MACHINE_TYPE_486_S3_PCI,
+        .chipset = MACHINE_CHIPSET_INTEL_420EX,
+        .init = machine_at_486pi_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2_PCIV,
+        .flags = MACHINE_SUPER_IO | MACHINE_IDE | MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 131072,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
-        .vid_device = &gd5430_onboard_pci_device,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has Phoenix Multikey/42 PS/2 KBC, but unknown version */
+    {
+        .name = "[i420EX] Anigma BAT4IP3e",
+        .internal_name = "bat4ip3e",
+        .type = MACHINE_TYPE_486_S3_PCI,
+        .chipset = MACHINE_CHIPSET_INTEL_420EX,
+        .init = machine_at_bat4ip3e_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_SUPER_IO | MACHINE_IDE_DUAL | MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 131072,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00021400, /* Guess. */
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
@@ -7222,10 +9573,10 @@ const machine_t machines[] = {
     {
         .name = "[i420EX] ASUS PVI-486AP4",
         .internal_name = "486ap4",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_INTEL_420EX,
         .init = machine_at_486ap4_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -7247,11 +9598,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -7260,12 +9615,12 @@ const machine_t machines[] = {
     },
     /* This has the Phoenix MultiKey KBC firmware. */
     {
-        .name = "[i420EX] Intel Classic/PCI ED",
+        .name = "[i420EX] Intel Classic/PCI ED (Ninja)",
         .internal_name = "ninja",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_INTEL_420EX,
         .init = machine_at_ninja_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -7280,32 +9635,80 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PCI,
-        .flags = MACHINE_IDE | MACHINE_APM,
+        .flags = MACHINE_PS2_KBC | MACHINE_IDE | MACHINE_APM,
         .ram = {
             .min = 1024,
             .max = 131072,
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED,
+        .default_jumpered_ecp_dma = 4,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00012900, /* Guess. */
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has Phoenix Multikey/42 PS/2 KBC, but unknown version */
+    /* absolutely no KBC info */
     {
-        .name = "[i420EX] Anigma BAT4IP3e",
-        .internal_name = "bat4ip3e",
-        .type = MACHINE_TYPE_486_S3,
+        .name = "[i420EX] ICS SB486P",
+        .internal_name = "sb486p",
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_INTEL_420EX,
-        .init = machine_at_bat4ip3e_init,
-        .p1_handler = NULL,
+        .init = machine_at_sb486p_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PCI,
+        .flags = MACHINE_SUPER_IO | MACHINE_IDE | MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 131072,
+            .step = 1024
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00005200, /* Guess. */
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* According to another string seen on the UH19 website, this has AMI 'H' KBC. */
+    {
+        .name = "[i420TX] AMI Super Voyager PCI",
+        .internal_name = "amis76",
+        .type = MACHINE_TYPE_486_S3_PCI,
+        .chipset = MACHINE_CHIPSET_INTEL_420TX,
+        .init = machine_at_amis76_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -7327,105 +9730,32 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* This has an AMIKey-2, which is an updated version of type 'H'. */
-    {
-        .name = "[i420EX] Advanced Integration Research 486PI",
-        .internal_name = "486pi",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_INTEL_420EX,
-        .init = machine_at_486pi_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_PCIV,
-        .flags = MACHINE_SUPER_IO | MACHINE_IDE | MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 131072,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* absolutely no KBC info */
-    {
-        .name = "[i420EX] ICS SB486P",
-        .internal_name = "sb486p",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_INTEL_420EX,
-        .init = machine_at_sb486p_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_PCI,
-        .flags = MACHINE_SUPER_IO | MACHINE_IDE | MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 131072,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* I'm going to assume this as an AMIKey-2 like the other two 486SP3's. */
+    /*
+       This has an AMIKey (and an on-board NCR 53C810 PCI SCSI controller), thanks, eBay!
+       The keyboard port is AT.
+     */
     {
         .name = "[i420TX] ASUS PCI/I-486SP3",
         .internal_name = "486sp3",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_INTEL_420TX,
         .init = machine_at_486sp3_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -7447,11 +9777,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800, /* Guess. */
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -7460,12 +9794,12 @@ const machine_t machines[] = {
     },
     /* This has the Phoenix MultiKey KBC firmware. */
     {
-        .name = "[i420TX] Intel Classic/PCI",
+        .name = "[i420TX] Intel Classic/PCI (Alfredo)",
         .internal_name = "alfredo",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_INTEL_420TX,
         .init = machine_at_alfredo_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -7487,51 +9821,15 @@ const machine_t machines[] = {
             .step = 2048
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* According to another string seen on the UH19 website, this has AMI 'H' KBC. */
-    {
-        .name = "[i420TX] AMI Super Voyager PCI",
-        .internal_name = "amis76",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_INTEL_420TX,
-        .init = machine_at_amis76_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_PCI,
-        .flags = MACHINE_SUPER_IO | MACHINE_IDE_DUAL | MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 131072,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00012900, /* Guess. */
+        .kbc_p1 = 0x00000ce0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -7543,10 +9841,10 @@ const machine_t machines[] = {
     {
         .name = "[i420ZX] ASUS PCI/I-486SP3G",
         .internal_name = "486sp3g",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_INTEL_420ZX,
         .init = machine_at_486sp3g_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -7568,25 +9866,74 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
+    /* This has an AMI MEGAKey 'P' or 'R' keyboard controller. */
+    {
+        .name = "[i420ZX] ICS SB486PV",
+        .internal_name = "sb486pv",
+        .type = MACHINE_TYPE_486_S3_PCI,
+        .chipset = MACHINE_CHIPSET_INTEL_420ZX,
+        .init = machine_at_sb486pv_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        /* Has PCI but no user-facing slots. */
+        .bus_flags = MACHINE_PCI,
+        .flags = MACHINE_PS2_KBC | MACHINE_IDE | MACHINE_VIDEO | MACHINE_APM | MACHINE_PCI_INTERNAL,
+        .ram = {
+            .min = 2048,
+            .max = 65536,
+            .step = 2048
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00005000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &sb486pv_device,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &gd5436_onboard_pci_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
     /* This most likely has a standalone AMI Megakey 1993, which is type 'P', like the below Tekram board. */
     {
         .name = "[IMS 8848] J-Bond PCI400C-B",
         .internal_name = "pci400cb",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_IMS_8848,
         .init = machine_at_pci400cb_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -7608,25 +9955,73 @@ const machine_t machines[] = {
             .step = 2048
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00005000, /* Guess. */
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* This has an AMIKey-2, which is an updated version of type 'H'. */
+    /* Has Acer KBC firmware. */
+    {
+        .name = "[SiS 496] Acer P3",
+        .internal_name = "acerp3",
+        .type = MACHINE_TYPE_486_S3_PCI,
+        .chipset = MACHINE_CHIPSET_SIS_496,
+        .init = machine_at_acerp3_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_VIDEO,
+        .ram = {
+            .min = 2048,
+            .max = 131072,
+            .step = 1024
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_ACER | 0x00004200,
+        .kbc_p1 = 0x004008f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &gd5434_onboard_pci_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* This has an AMIKey-2, which is type 'H'. */
     {
         .name = "[SiS 496] ASUS PVI-486SP3C",
         .internal_name = "486sp3c",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_SIS_496,
         .init = machine_at_486sp3c_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -7648,11 +10043,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -7663,10 +10062,10 @@ const machine_t machines[] = {
     {
         .name = "[SiS 496] Lucky Star LS-486E",
         .internal_name = "ls486e",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_SIS_496,
         .init = machine_at_ls486e_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -7680,19 +10079,23 @@ const machine_t machines[] = {
             .min_multi = 0,
             .max_multi = 0
         },
-        .bus_flags = MACHINE_BUS_PS2_LATCH | MACHINE_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .bus_flags = MACHINE_PCI,
+        .flags = MACHINE_PS2_KBC | MACHINE_IDE_DUAL | MACHINE_APM,
         .ram = {
             .min = 1024,
             .max = 131072,
             .step = 1024
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -7703,10 +10106,10 @@ const machine_t machines[] = {
     {
         .name = "[SiS 496] Micronics M4Li",
         .internal_name = "m4li",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_SIS_496,
         .init = machine_at_m4li_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -7728,133 +10131,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Revision 1 has a Lance LT38C41L, revision 2 has a Holtek HT6542B. Another variant with a Bestkey KBC might exist as well. */
-    {
-        .name = "[SiS 496] Rise Computer R418",
-        .internal_name = "r418",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_SIS_496,
-        .init = machine_at_r418_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_BUS_PS2_LATCH | MACHINE_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 261120,
-            .step = 1024
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* This has a Holtek HT6542B KBC and the BIOS does not send a single non-standard KBC command, so it
-       must be an ASIC that clones the standard IBM PS/2 KBC. */
-    {
-        .name = "[SiS 496] Soyo 4SAW2",
-        .internal_name = "4saw2",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_SIS_496,
-        .init = machine_at_4saw2_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK(CPU_i486SX, CPU_i486DX, CPU_Am486SX, CPU_Am486DX),
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_PS2_PCIV,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
-        .ram = {
-            .min = 2048,
-            .max = 261120,
-            .step = 1024
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* According to MrKsoft, his real 4DPS has an AMIKey-2, which is an updated version
-       of type 'H'. There are other variants of the board with Holtek HT6542B KBCs. */
-    {
-        .name = "[SiS 496] Zida Tomato 4DP",
-        .internal_name = "4dps",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_SIS_496,
-        .init = machine_at_4dps_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
-        .ram = {
-            .min = 2048,
-            .max = 261120,
-            .step = 1024
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -7865,10 +10150,10 @@ const machine_t machines[] = {
     {
         .name = "[SiS 496] MSI MS-4144",
         .internal_name = "ms4144",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_SIS_496,
         .init = machine_at_ms4144_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -7890,11 +10175,150 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Revision 1 has a Lance LT38C41L, revision 2 has a Holtek HT6542B.
+       Another variant with a Bestkey KBC might exist as well. */
+    {
+        .name = "[SiS 496] Rise Computer R418",
+        .internal_name = "r418",
+        .type = MACHINE_TYPE_486_S3_PCI,
+        .chipset = MACHINE_CHIPSET_SIS_496,
+        .init = machine_at_r418_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PCI,
+        .flags = MACHINE_PS2_KBC | MACHINE_IDE_DUAL | MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 261120,
+            .step = 1024
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_HOLTEK | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* This has a Holtek HT6542B KBC and the BIOS does not send a single non-standard KBC command.
+       The Holtek is an ASIC clone of AMI 'H' with a Holtek copyright string. */
+    {
+        .name = "[SiS 496] Soyo 4SAW2",
+        .internal_name = "4saw2",
+        .type = MACHINE_TYPE_486_S3_PCI,
+        .chipset = MACHINE_CHIPSET_SIS_496,
+        .init = machine_at_4saw2_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK(CPU_i486SX, CPU_i486DX, CPU_Am486SX, CPU_Am486DX),
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2_PCIV,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .ram = {
+            .min = 2048,
+            .max = 261120,
+            .step = 1024
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_HOLTEK | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* According to MrKsoft, his real 4DPS has an AMIKey-2, which is an updated version
+       of type 'H'. There are other variants of the board with Holtek HT6542B KBCs. */
+    {
+        .name = "[SiS 496] Zida Tomato 4DP",
+        .internal_name = "4dps",
+        .type = MACHINE_TYPE_486_S3_PCI,
+        .chipset = MACHINE_CHIPSET_SIS_496,
+        .init = machine_at_4dps_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT,
+        .ram = {
+            .min = 2048,
+            .max = 261120,
+            .step = 1024
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -7905,10 +10329,10 @@ const machine_t machines[] = {
     {
         .name = "[UMC 8881] A-Trend ATC-1415",
         .internal_name = "atc1415",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_UMC_UM8881,
         .init = machine_at_atc1415_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -7930,65 +10354,30 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL, /* UMC UM8886 on-chip KBC. */
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* This has an AMIKey-2, which is an updated version of type 'H'. */
+    /* This has the UMC 88xx on-chip KBC. All the copies of the BIOS string I can find, end in
+       in -H, so the UMC on-chip KBC likely emulates the AMI 'H' KBC firmware. */
     {
-        .name = "[UMC 8881] ECS Elite UM8810P-AIO",
-        .internal_name = "ecs486",
-        .type = MACHINE_TYPE_486_S3,
+        .name = "[UMC 8881] Biostar MB-84xxUUD-A",
+        .internal_name = "84xxuuda",
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_UMC_UM8881,
-        .init = machine_at_ecs486_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_PCI | MACHINE_BUS_PS2_LATCH,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 131072,
-            .step = 1024
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has AMIKey Z(!) KBC firmware. */
-    {
-        .name = "[UMC 8881] Epson ActionPC 2600",
-        .internal_name = "actionpc2600",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_UMC_UM8881,
-        .init = machine_at_actionpc2600_init,
-        .p1_handler = NULL,
+        .init = machine_at_84xxuuda_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8004,20 +10393,157 @@ const machine_t machines[] = {
         },
         .bus_flags = MACHINE_PS2_PCI,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 131072,
+            .step = 1024
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = NULL,
+        .kbc_params = 0x00004800,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Compaq Presario 7100 / 7200 Series, using MiTAC/Trigon PL4600C (486). */
+    /* Has a VIA VT82C42N KBC. */
+    {
+        .name = "[UMC 8881] Compaq Presario 7100/7200 Series 486",
+        .internal_name = "pl4600c",
+        .type = MACHINE_TYPE_486_S3_PCI,
+        .chipset = MACHINE_CHIPSET_UMC_UM8881,
+        .init = machine_at_pl4600c_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_SOUND | MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 65536,
+            .step = 1024
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &gd5430_onboard_pci_device,
+        .snd_device = &ess_1688_device,
+        .net_device = NULL
+    },
+    /* This has an AMIKey-2, which is an updated version of type 'H'. */
+    {
+        .name = "[UMC 8881] ECS Elite UM8810P-AIO",
+        .internal_name = "ecs486",
+        .type = MACHINE_TYPE_486_S3_PCI,
+        .chipset = MACHINE_CHIPSET_UMC_UM8881,
+        .init = machine_at_ecs486_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PCI,
+        .flags = MACHINE_PS2_KBC | MACHINE_IDE_DUAL | MACHINE_APM,
+        .ram = {
+            .min = 1024,
+            .max = 131072,
+            .step = 1024
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has AMIKey Z(!) KBC firmware. */
+    {
+        .name = "[UMC 8881] Epson ActionPC 2600",
+        .internal_name = "actionpc2600",
+        .type = MACHINE_TYPE_486_S3_PCI,
+        .chipset = MACHINE_CHIPSET_UMC_UM8881,
+        .init = machine_at_actionpc2600_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_VIDEO,
         .ram = {
             .min = 1024,
             .max = 262144,
             .step = 1024
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI_TRIGEM | 0x00005a00,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
-        .vid_device = NULL,
+        .vid_device = &tgui9440_onboard_pci_device,
         .snd_device = NULL,
         .net_device = NULL
     },
@@ -8026,10 +10552,10 @@ const machine_t machines[] = {
     {
         .name = "[UMC 8881] Epson ActionTower 8400",
         .internal_name = "actiontower8400",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_UMC_UM8881,
         .init = machine_at_actiontower8400_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8051,14 +10577,18 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI_TRIGEM | 0x00005a00, /* Guess. */
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
-        .vid_device = NULL,
+        .vid_device = &gd5430_onboard_pci_device,
         .snd_device = NULL,
         .net_device = NULL
     },
@@ -8067,10 +10597,10 @@ const machine_t machines[] = {
     {
         .name = "[UMC 8881] PC Chips M919",
         .internal_name = "m919",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_UMC_UM8881,
         .init = machine_at_m919_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8092,11 +10622,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = NULL, /* UMC UM8886 on-chip KBC. */
+        .kbc_params = 0x00004800,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -8107,10 +10641,10 @@ const machine_t machines[] = {
     {
         .name = "[UMC 8881] Samsung SPC7700P-LW",
         .internal_name = "spc7700plw",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_UMC_UM8881,
         .init = machine_at_spc7700plw_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8132,11 +10666,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = NULL, /* UMC UM8886 on-chip KBC. */
+        .kbc_params = 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -8147,10 +10685,10 @@ const machine_t machines[] = {
     {
         .name = "[UMC 8881] Shuttle HOT-433A",
         .internal_name = "hot433a",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_UMC_UM8881,
         .init = machine_at_hot433a_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8164,7 +10702,7 @@ const machine_t machines[] = {
             .min_multi = 0,
             .max_multi = 0
         },
-        .bus_flags = MACHINE_PCI,
+        .bus_flags = MACHINE_PS2_PCI,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM,
         .ram = {
             .min = 1024,
@@ -8172,11 +10710,15 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_HOLTEK | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &hot433a_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -8187,50 +10729,10 @@ const machine_t machines[] = {
     {
         .name = "[VIA VT82C496G] DFI G486VPA",
         .internal_name = "g486vpa",
-        .type = MACHINE_TYPE_486_S3,
+        .type = MACHINE_TYPE_486_S3_PCI,
         .chipset = MACHINE_CHIPSET_VIA_VT82C496G,
         .init = machine_at_g486vpa_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_PCIV,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 131072,
-            .step = 1024
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has a VIA VT82C42N KBC. */
-    {
-        .name = "[VIA VT82C496G] FIC VIP-IO2",
-        .internal_name = "486vipio2",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_VIA_VT82C496G,
-        .init = machine_at_486vipio2_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8252,11 +10754,59 @@ const machine_t machines[] = {
             .step = 1024
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has a VIA VT82C42N KBC. */
+    {
+        .name = "[VIA VT82C496G] FIC VIP-IO2",
+        .internal_name = "486vipio2",
+        .type = MACHINE_TYPE_486_S3_PCI,
+        .chipset = MACHINE_CHIPSET_VIA_VT82C496G,
+        .init = machine_at_486vipio2_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2_PCIV,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT,
+        .ram = {
+            .min = 1024,
+            .max = 131072,
+            .step = 1024
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -8274,7 +10824,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_486_MISC,
         .chipset = MACHINE_CHIPSET_STPC_CLIENT,
         .init = machine_at_itoxstar_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8289,18 +10839,22 @@ const machine_t machines[] = {
             .max_multi = 1.0
         },
         .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM, /* Machine has internal video: ST STPC Atlas */
         .ram = {
             .min = 8192,
             .max = 131072,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -8315,7 +10869,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_486_MISC,
         .chipset = MACHINE_CHIPSET_STPC_CONSUMER_II,
         .init = machine_at_arb1423c_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8330,18 +10884,22 @@ const machine_t machines[] = {
             .max_multi = 2.0
         },
         .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_PCI_INTERNAL, /* Machine has internal video: ST STPC Atlas */
         .ram = {
             .min = 32768,
             .max = 163840,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -8356,7 +10914,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_486_MISC,
         .chipset = MACHINE_CHIPSET_STPC_CONSUMER_II,
         .init = machine_at_arb1479_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8370,19 +10928,23 @@ const machine_t machines[] = {
             .min_multi = 2.0,
             .max_multi = 2.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_PCI_INTERNAL | MACHINE_USB, /* Machine has internal video: ST STPC Atlas */
         .ram = {
             .min = 32768,
             .max = 163840,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -8397,7 +10959,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_486_MISC,
         .chipset = MACHINE_CHIPSET_STPC_CONSUMER_II,
         .init = machine_at_iach488_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8412,18 +10974,22 @@ const machine_t machines[] = {
             .max_multi = 2.0
         },
         .bus_flags = MACHINE_PS2,
-        .flags = MACHINE_IDE | MACHINE_APM,
+        .flags = MACHINE_IDE | MACHINE_APM | MACHINE_PCI_INTERNAL, /* Machine has internal video: ST STPC Atlas and NIC: Realtek RTL8139C+ */
         .ram = {
             .min = 32768,
             .max = 131072,
             .step = 32768
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -8438,7 +11004,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_486_MISC,
         .chipset = MACHINE_CHIPSET_STPC_ELITE,
         .init = machine_at_pcm9340_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8453,18 +11019,22 @@ const machine_t machines[] = {
             .max_multi = 2.0
         },
         .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_PCI_INTERNAL, /* Machine has internal video: SMI LynxEM+ 712 */
         .ram = {
             .min = 32768,
             .max = 98304,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -8479,7 +11049,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_486_MISC,
         .chipset = MACHINE_CHIPSET_STPC_ATLAS,
         .init = machine_at_pcm5330_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8494,18 +11064,22 @@ const machine_t machines[] = {
             .max_multi = 2.0
         },
         .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_PCI_INTERNAL, /* Machine has internal video: ST STPC Atlas */
         .ram = {
             .min = 32768,
             .max = 131072,
             .step = 32768
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -8515,6 +11089,50 @@ const machine_t machines[] = {
 
     /* Socket 4 machines */
     /* 430LX */
+    /* Hacer Acer 90M002A V4.10H KBC. */
+    {
+        .name = "[i430LX] Acer V12P",
+        .internal_name = "v12p",
+        .type = MACHINE_TYPE_SOCKET4,
+        .chipset = MACHINE_CHIPSET_INTEL_430LX,
+        .init = machine_at_v12p_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET4,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 60000000,
+            .max_bus = 66666667,
+            .min_voltage = 5000,
+            .max_voltage = 5000,
+            .min_multi = MACHINE_MULTIPLIER_FIXED,
+            .max_multi = MACHINE_MULTIPLIER_FIXED
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE | MACHINE_APM,
+        .ram = {
+            .min = 2048,
+            .max = 196608,
+            .step = 2048
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_ACER | 0x00000000,
+        .kbc_p1 = 0x004008f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &v12p_device,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
     /* Has AMIKey H KBC firmware (AMIKey-2), per POST screen with BIOS string
        shown in the manual. Has PS/2 mouse support with serial-style (DB9)
        connector.
@@ -8526,7 +11144,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET4,
         .chipset = MACHINE_CHIPSET_INTEL_430LX,
         .init = machine_at_excaliburpci_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8548,11 +11166,15 @@ const machine_t machines[] = {
             .step = 2048
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -8566,7 +11188,95 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET4,
         .chipset = MACHINE_CHIPSET_INTEL_430LX,
         .init = machine_at_p5mp3_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET4,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 60000000,
+            .max_bus = 66666667,
+            .min_voltage = 5000,
+            .max_voltage = 5000,
+            .min_multi = MACHINE_MULTIPLIER_FIXED,
+            .max_multi = MACHINE_MULTIPLIER_FIXED
+        },
+        .bus_flags = MACHINE_PCI,
+        .flags = MACHINE_PS2_KBC | MACHINE_APM,
+        .ram = {
+            .min = 2048,
+            .max = 196608,
+            .step = 2048
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has IBM PS/2 Type 1 KBC firmware. */
+    {
+        .name = "[i430LX] Dell OptiPlex 560/L",
+        .internal_name = "opti560l",
+        .type = MACHINE_TYPE_SOCKET4,
+        .chipset = MACHINE_CHIPSET_INTEL_430LX,
+        .init = machine_at_opti560l_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET4,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 60000000,
+            .max_bus = 66666667,
+            .min_voltage = 5000,
+            .max_voltage = 5000,
+            .min_multi = MACHINE_MULTIPLIER_FIXED,
+            .max_multi = MACHINE_MULTIPLIER_FIXED
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE | MACHINE_APM,
+        .ram = {
+            .min = 2048,
+            .max = 131072,
+            .step = 2048
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00012900,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has AMI MegaKey 'H' KBC firmware. */
+    {
+        .name = "[i430LX] Gigabyte GA-586IS",
+        .internal_name = "586is",
+        .type = MACHINE_TYPE_SOCKET4,
+        .chipset = MACHINE_CHIPSET_INTEL_430LX,
+        .init = machine_at_586is_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8582,139 +11292,21 @@ const machine_t machines[] = {
         },
         .bus_flags = MACHINE_PCI,
         .flags = MACHINE_APM,
-        .ram = {
-            .min = 2048,
-            .max = 196608,
-            .step = 2048
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has IBM PS/2 Type 1 KBC firmware. */
-    {
-        .name = "[i430LX] Dell Dimension XPS P60",
-        .internal_name = "dellxp60",
-        .type = MACHINE_TYPE_SOCKET4,
-        .chipset = MACHINE_CHIPSET_INTEL_430LX,
-        .init = machine_at_dellxp60_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET4,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 60000000,
-            .max_bus = 66666667,
-            .min_voltage = 5000,
-            .max_voltage = 5000,
-            .min_multi = MACHINE_MULTIPLIER_FIXED,
-            .max_multi = MACHINE_MULTIPLIER_FIXED
-        },
-        .bus_flags = MACHINE_PCI,
-        .flags = MACHINE_IDE | MACHINE_APM,
         .ram = {
             .min = 2048,
             .max = 131072,
             .step = 2048
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has IBM PS/2 Type 1 KBC firmware. */
-    {
-        .name = "[i430LX] Dell OptiPlex 560/L",
-        .internal_name = "opti560l",
-        .type = MACHINE_TYPE_SOCKET4,
-        .chipset = MACHINE_CHIPSET_INTEL_430LX,
-        .init = machine_at_opti560l_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET4,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 60000000,
-            .max_bus = 66666667,
-            .min_voltage = 5000,
-            .max_voltage = 5000,
-            .min_multi = MACHINE_MULTIPLIER_FIXED,
-            .max_multi = MACHINE_MULTIPLIER_FIXED
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE | MACHINE_APM,
-        .ram = {
-            .min = 2048,
-            .max = 131072,
-            .step = 2048
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* This has the Phoenix MultiKey KBC firmware.
-       This is basically an Intel Batman (*NOT* Batman's Revenge) with a fancier
-       POST screen */
-    {
-        .name = "[i430LX] AMBRA DP60 PCI",
-        .internal_name = "ambradp60",
-        .type = MACHINE_TYPE_SOCKET4,
-        .chipset = MACHINE_CHIPSET_INTEL_430LX,
-        .init = machine_at_ambradp60_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET4,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 60000000,
-            .max_bus = 66666667,
-            .min_voltage = 5000,
-            .max_voltage = 5000,
-            .min_multi = MACHINE_MULTIPLIER_FIXED,
-            .max_multi = MACHINE_MULTIPLIER_FIXED
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE | MACHINE_APM,
-        .ram = {
-            .min = 2048,
-            .max = 131072,
-            .step = 2048
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -8728,7 +11320,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET4,
         .chipset = MACHINE_CHIPSET_INTEL_430LX,
         .init = machine_at_valuepointp60_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8750,11 +11342,15 @@ const machine_t machines[] = {
             .step = 2048
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &mach32_onboard_pci_device,
@@ -8763,12 +11359,56 @@ const machine_t machines[] = {
     },
     /* This has the Phoenix MultiKey KBC firmware. */
     {
-        .name = "[i430LX] Intel Premiere/PCI",
+        .name = "[i430LX] Intel Premiere/PCI (Batman)",
+        .internal_name = "batman",
+        .type = MACHINE_TYPE_SOCKET4,
+        .chipset = MACHINE_CHIPSET_INTEL_430LX,
+        .init = machine_at_batman_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET4,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 60000000,
+            .max_bus = 66666667,
+            .min_voltage = 5000,
+            .max_voltage = 5000,
+            .min_multi = MACHINE_MULTIPLIER_FIXED,
+            .max_multi = MACHINE_MULTIPLIER_FIXED
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE | MACHINE_APM,
+        .ram = {
+            .min = 2048,
+            .max = 131072,
+            .step = 2048
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00012900,
+        .kbc_p1 = 0x00001030,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &batman_device,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* This has the Phoenix MultiKey KBC firmware. */
+    {
+        .name = "[i430LX] Intel Premiere/PCI (Batman's Revenge)",
         .internal_name = "revenge",
         .type = MACHINE_TYPE_SOCKET4,
         .chipset = MACHINE_CHIPSET_INTEL_430LX,
         .init = machine_at_revenge_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8790,25 +11430,29 @@ const machine_t machines[] = {
             .step = 2048
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00012900,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has AMI MegaKey 'H' KBC firmware. */
+    /* The M5Pi appears to have a Phoenix MultiKey KBC firmware according to photos. */	
     {
-        .name = "[i430LX] Gigabyte GA-586IS",
-        .internal_name = "586is",
+        .name = "[i430LX] Micronics M5Pi",
+        .internal_name = "m5pi",
         .type = MACHINE_TYPE_SOCKET4,
         .chipset = MACHINE_CHIPSET_INTEL_430LX,
-        .init = machine_at_586is_init,
-        .p1_handler = NULL,
+        .init = machine_at_m5pi_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8823,18 +11467,22 @@ const machine_t machines[] = {
             .max_multi = MACHINE_MULTIPLIER_FIXED
         },
         .bus_flags = MACHINE_PCI,
-        .flags = MACHINE_APM,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
         .ram = {
             .min = 2048,
             .max = 131072,
             .step = 2048
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00012900,    /* Guess. */
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -8848,7 +11496,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET4,
         .chipset = MACHINE_CHIPSET_INTEL_430LX,
         .init = machine_at_pb520r_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8870,11 +11518,15 @@ const machine_t machines[] = {
             .step = 2048
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00012900,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &gd5434_onboard_pci_device,
@@ -8892,7 +11544,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET4,
         .chipset = MACHINE_CHIPSET_OPTI_547_597,
         .init = machine_at_excalibur_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8914,11 +11566,15 @@ const machine_t machines[] = {
             .step = 2048
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00005000,    /* Guess. */
+        .kbc_p1 = 0x000044f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -8927,6 +11583,50 @@ const machine_t machines[] = {
     },
 
     /* OPTi 596/597/822 */
+    /* Has a VIA VT82C42N KBC with AMI 'F' firmware */
+    {
+        .name = "[OPTi 597] AT&T Globalyst 330 (Pentium)",
+        .internal_name = "globalyst330_p5",
+        .type = MACHINE_TYPE_SOCKET4,
+        .chipset = MACHINE_CHIPSET_OPTI_547_597,
+        .init = machine_at_globalyst330_p5_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET4,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 60000000,
+            .max_bus = 66666667,
+            .min_voltage = 5000,
+            .max_voltage = 5000,
+            .min_multi = MACHINE_MULTIPLIER_FIXED,
+            .max_multi = MACHINE_MULTIPLIER_FIXED
+        },
+        .bus_flags = MACHINE_PCIV,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 8192,
+            .max = 65536,
+            .step = 8192
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
     /* This has AMIKey 'F' KBC firmware. */
     {
         .name = "[OPTi 597] Supermicro P5VL-PCI",
@@ -8934,7 +11634,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET4,
         .chipset = MACHINE_CHIPSET_OPTI_547_597,
         .init = machine_at_p5vl_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8956,11 +11656,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -8976,7 +11680,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET4,
         .chipset = MACHINE_CHIPSET_SIS_501,
         .init = machine_at_excaliburpci2_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -8998,25 +11702,29 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_0 | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00005200,    /* Guess. */
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* This has an AMIKey-2, which is an updated version of type 'H'. */
+    /* This has an AMIKey-2, which is type 'H'. */
     {
         .name = "[SiS 501] ASUS PCI/I-P5SP4",
         .internal_name = "p5sp4",
         .type = MACHINE_TYPE_SOCKET4,
         .chipset = MACHINE_CHIPSET_SIS_501,
         .init = machine_at_p5sp4_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -9038,34 +11746,130 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
+    /* This has an AMIKey-2, which is type 'H'. */
+    {
+        .name = "[SiS 501] ECS SI5PI AIO",
+        .internal_name = "ecs50x",
+        .type = MACHINE_TYPE_SOCKET4,
+        .chipset = MACHINE_CHIPSET_SIS_501,
+        .init = machine_at_ecs50x_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET4,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 60000000,
+            .max_bus = 66666667,
+            .min_voltage = 5000,
+            .max_voltage = 5000,
+            .min_multi = MACHINE_MULTIPLIER_FIXED,
+            .max_multi = MACHINE_MULTIPLIER_FIXED
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .ram = {
+            .min = 8192,
+            .max = 131072,
+            .step = 8192
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+
+    /* Socket 4/5 machines */
+    /* OPTi 596/597 */
+    /* This has AMIKey-2 'H' KBC firmware. */
+    {
+        .name = "[OPTi 597] Taken PCI560-01",
+        .internal_name = "pci56001",
+        .type = MACHINE_TYPE_SOCKET4_5,
+        .chipset = MACHINE_CHIPSET_OPTI_547_597,
+        .init = machine_at_pci56001_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET4 | CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 50000000,
+            .max_bus = 66666667,
+            .min_voltage = 3520,
+            .max_voltage = 5000,
+            .min_multi = 1.0,
+            .max_multi = 1.5
+        },
+        .bus_flags = MACHINE_PCI,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 8192,
+            .max = 131072,
+            .step = 8192
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+
     /* Socket 5 machines */
     /* 430NX */
-    /* This has the Phoenix MultiKey KBC firmware. */
+    /* Has AMI 'H' KBC firmware. */
     {
-        .name = "[i430NX] Intel Premiere/PCI II",
-        .internal_name = "plato",
+        .name = "[i430NX] ASUS PCI/I-P54NP4",
+        .internal_name = "p54np4",
         .type = MACHINE_TYPE_SOCKET5,
         .chipset = MACHINE_CHIPSET_INTEL_430NX,
-        .init = machine_at_plato_init,
-        .p1_handler = NULL,
+        .init = machine_at_p54np4_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
             .package = CPU_PKG_SOCKET5_7,
             .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
+            .min_bus = 60000000,
             .max_bus = 66666667,
             .min_voltage = 3520,
             .max_voltage = 3520,
@@ -9073,99 +11877,22 @@ const machine_t machines[] = {
             .max_multi = 1.5
         },
         .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .flags = MACHINE_IDE /*| MACHINE_SCSI */ | MACHINE_APM,
         .ram = {
             .min = 2048,
-            .max = 131072,
+            .max = 524288,
             .step = 2048
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Same as Intel Premiere PCI/II, but with a Dell OEM BIOS */
-    {
-        .name = "[i430NX] Dell Dimension XPS Pxxx",
-        .internal_name = "dellplato",
-        .type = MACHINE_TYPE_SOCKET5,
-        .chipset = MACHINE_CHIPSET_INTEL_430NX,
-        .init = machine_at_dellplato_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
-            .max_bus = 66666667,
-            .min_voltage = 3520,
-            .max_voltage = 3520,
-            .min_multi = 1.5,
-            .max_multi = 1.5
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
-        .ram = {
-            .min = 2048,
-            .max = 131072,
-            .step = 2048
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* This has the Phoenix MultiKey KBC firmware.
-       This is basically an Intel Premiere/PCI II with a fancier POST screen. */
-    {
-        .name = "[i430NX] AMBRA DP90 PCI",
-        .internal_name = "ambradp90",
-        .type = MACHINE_TYPE_SOCKET5,
-        .chipset = MACHINE_CHIPSET_INTEL_430NX,
-        .init = machine_at_ambradp90_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
-            .max_bus = 66666667,
-            .min_voltage = 3380,
-            .max_voltage = 3520,
-            .min_multi = 1.5,
-            .max_multi = 1.5
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
-        .ram = {
-            .min = 2048,
-            .max = 131072,
-            .step = 2048
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -9179,7 +11906,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET5,
         .chipset = MACHINE_CHIPSET_INTEL_430NX,
         .init = machine_at_586ip_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -9201,11 +11928,103 @@ const machine_t machines[] = {
             .step = 2048
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* This has the Phoenix MultiKey KBC firmware. */
+    {
+        .name = "[i430NX] Intel Premiere/PCI II (Plato)",
+        .internal_name = "plato",
+        .type = MACHINE_TYPE_SOCKET5,
+        .chipset = MACHINE_CHIPSET_INTEL_430NX,
+        .init = machine_at_plato_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK(CPU_K5, CPU_5K86, CPU_Cx6x86),
+            .min_bus = 50000000,
+            .max_bus = 66666667,
+            .min_voltage = 3520,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 1.5
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .ram = {
+            .min = 2048,
+            .max = 131072,
+            .step = 2048
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00012900,
+        .kbc_p1 = 0x00001030,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &plato_device,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has unknown KBC firmware. */
+    {
+        .name = "[i430NX] Siemens-Nixdorf D842",
+        .internal_name = "d842",
+        .type = MACHINE_TYPE_SOCKET5,
+        .chipset = MACHINE_CHIPSET_INTEL_430NX,
+        .init = machine_at_d842_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 50000000,
+            .max_bus = 66666667,
+            .min_voltage = 3380,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 2.0
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM, /* Machine has onboard video: TLI ET4000/w32p */
+        .ram = {
+            .min = 2048,
+            .max = 131072,
+            .step = 2048
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &d842_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -9219,7 +12038,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET5,
         .chipset = MACHINE_CHIPSET_INTEL_430NX,
         .init = machine_at_tek932_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -9234,18 +12053,22 @@ const machine_t machines[] = {
             .max_multi = 1.5
         },
         .bus_flags = MACHINE_PCI,
-        .flags = MACHINE_IDE | MACHINE_APM,
+        .flags = MACHINE_PS2_KBC | MACHINE_IDE | MACHINE_APM,
         .ram = {
             .min = 2048,
             .max = 262144,
             .step = 2048
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00005200,    /* Guess. */
+        .kbc_p1 = 0x000044f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -9261,7 +12084,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET5,
         .chipset = MACHINE_CHIPSET_INTEL_430FX,
         .init = machine_at_acerv30_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -9283,11 +12106,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_ACER | 0x00000000,
+        .kbc_p1 = 0x004008f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -9301,7 +12128,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET5,
         .chipset = MACHINE_CHIPSET_INTEL_430FX,
         .init = machine_at_apollo_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -9323,11 +12150,103 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_USE_MBDMA,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has Dell KBC firmware. */
+    {
+        .name = "[i430FX] Dell OptiPlex GXL/GXM",
+        .internal_name = "optiplexgxl",
+        .type = MACHINE_TYPE_SOCKET5,
+        .chipset = MACHINE_CHIPSET_INTEL_430FX,
+        .init = machine_at_optiplexgxl_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK(CPU_Cx6x86),
+            .min_bus = 60000000,
+            .max_bus = 66666667,
+            .min_voltage = 3380,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 3.0
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_SOUND | MACHINE_APM, /* Video: S3 Trio64V+ (86C765), Sound: Creative ViBRA 16S (CT2504), Network: 3Com ETHERLINK III (3C509B) */
+        .ram = {
+            .min = 8192,
+            .max = 131072,
+            .step = 8192
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &s3_phoenix_trio64vplus_onboard_pci_device,
+        .snd_device = &sb_vibra16s_onboard_device,
+        .net_device = NULL /* not yet emulated */
+    },
+    /* KBC On-Chip the VT82C406MV. */
+    {
+        .name = "[i430FX] FIC PT-2000",
+        .internal_name = "pt2000",
+        .type = MACHINE_TYPE_SOCKET5,
+        .chipset = MACHINE_CHIPSET_INTEL_430FX,
+        .init = machine_at_pt2000_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 50000000,
+            .max_bus = 66666667,
+            .min_voltage = 3380,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 2.0
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .ram = {
+            .min = 8192,
+            .max = 131072,
+            .step = 8192
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = MACHINE_DMA_USE_MBDMA,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -9338,18 +12257,18 @@ const machine_t machines[] = {
        PC87306 Super I/O chip, command 0xA1 returns '5'.
        Command 0xA0 copyright string: (C)1994 AMI . */
     {
-        .name = "[i430FX] Intel Advanced/ZP",
+        .name = "[i430FX] Intel Advanced/ZP (Zappa)",
         .internal_name = "zappa",
         .type = MACHINE_TYPE_SOCKET5,
         .chipset = MACHINE_CHIPSET_INTEL_430FX,
         .init = machine_at_zappa_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
             .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
+            .block = CPU_BLOCK(CPU_K5, CPU_5K86, CPU_Cx6x86),
             .min_bus = 50000000,
             .max_bus = 66666667,
             .min_voltage = 3380,
@@ -9365,11 +12284,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -9383,7 +12306,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET5,
         .chipset = MACHINE_CHIPSET_INTEL_430FX,
         .init = machine_at_powermatev_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -9405,11 +12328,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_USE_MBDMA,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -9423,7 +12350,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET5,
         .chipset = MACHINE_CHIPSET_INTEL_430FX,
         .init = machine_at_hawk_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -9445,51 +12372,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* KBC On-Chip the VT82C406MV. */
-    {
-        .name = "[i430FX] FIC PT-2000",
-        .internal_name = "pt2000",
-        .type = MACHINE_TYPE_SOCKET5,
-        .chipset = MACHINE_CHIPSET_INTEL_430FX,
-        .init = machine_at_pt2000_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
-            .max_bus = 66666667,
-            .min_voltage = 3380,
-            .max_voltage = 3520,
-            .min_multi = 1.5,
-            .max_multi = 2.0
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
-        .ram = {
-            .min = 8192,
-            .max = 131072,
-            .step = 8192
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_USE_MBDMA,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI_TRIGEM | KBC_FLAG_IS_GREEN | 0x00005a00,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -9498,96 +12389,14 @@ const machine_t machines[] = {
     },
 
     /* OPTi 596/597 */
-    /* This uses an AMI KBC firmware in PS/2 mode (it sends command A5 with the
-       PS/2 "Load Security" meaning), most likely MegaKey as it sends command AF
-       (Set Extended Controller RAM) just like the later Intel AMI BIOS'es. */
-    {
-        .name = "[OPTi 597] TMC PAT54PV",
-        .internal_name = "pat54pv",
-        .type = MACHINE_TYPE_SOCKET5,
-        .chipset = MACHINE_CHIPSET_OPTI_547_597,
-        .init = machine_at_pat54pv_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK(CPU_K5, CPU_5K86),
-            .min_bus = 50000000,
-            .max_bus = 66666667,
-            .min_voltage = 3520,
-            .max_voltage = 3520,
-            .min_multi = 1.5,
-            .max_multi = 1.5
-        },
-        .bus_flags = MACHINE_VLB,
-        .flags = MACHINE_APM,
-        .ram = {
-            .min = 2048,
-            .max = 65536,
-            .step = 2048
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-
-    /* OPTi 596/597/822 */
-    {
-        .name = "[OPTi 597] Shuttle HOT-543",
-        .internal_name = "hot543",
-        .type = MACHINE_TYPE_SOCKET5,
-        .chipset = MACHINE_CHIPSET_OPTI_547_597,
-        .init = machine_at_hot543_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
-            .max_bus = 66666667,
-            .min_voltage = 3520,
-            .max_voltage = 3520,
-            .min_multi = 1.5,
-            .max_multi = 2.0
-        },
-        .bus_flags = MACHINE_PCIV,
-        .flags = MACHINE_APM,
-        .ram = {
-            .min = 8192,
-            .max = 131072,
-            .step = 8192
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
+    /* Has unknown KBC firmware. */
     {
         .name = "[OPTi 597] Northgate Computer Systems Elegance Pentium 90",
         .internal_name = "ncselp90",
         .type = MACHINE_TYPE_SOCKET5,
         .chipset = MACHINE_CHIPSET_OPTI_547_597,
         .init = machine_at_ncselp90_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -9609,11 +12418,105 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004d00,    /* Guess */
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has unknown KBC firmware. */
+    {
+        .name = "[OPTi 597] Shuttle HOT-543",
+        .internal_name = "hot543",
+        .type = MACHINE_TYPE_SOCKET5,
+        .chipset = MACHINE_CHIPSET_OPTI_547_597,
+        .init = machine_at_hot543_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 50000000,
+            .max_bus = 66666667,
+            .min_voltage = 3520,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 2.0
+        },
+        .bus_flags = MACHINE_PCIV,
+        .flags = MACHINE_APM,
+        .ram = {
+            .min = 8192,
+            .max = 131072,
+            .step = 8192
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* This uses an AMI KBC firmware in PS/2 mode (it sends command A5 with the
+       PS/2 "Load Security" meaning), most likely MegaKey as it sends command AF
+       (Set Extended Controller RAM) just like the later Intel AMI BIOS'es. */
+    {
+        .name = "[OPTi 597] TMC PAT54PV",
+        .internal_name = "pat54pv",
+        .type = MACHINE_TYPE_SOCKET5,
+        .chipset = MACHINE_CHIPSET_OPTI_547_597,
+        .init = machine_at_pat54pv_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK(CPU_K5, CPU_5K86),
+            .min_bus = 50000000,
+            .max_bus = 66666667,
+            .min_voltage = 3520,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 1.5
+        },
+        .bus_flags = MACHINE_VLB,
+        .flags = MACHINE_PS2_KBC | MACHINE_APM,
+        .ram = {
+            .min = 2048,
+            .max = 65536,
+            .step = 2048
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00005000,    /* Guess. */
+        .kbc_p1 = 0x000044f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -9622,14 +12525,14 @@ const machine_t machines[] = {
     },
 
     /* SiS 85C50x */
-    /* This has an AMIKey-2, which is an updated version of type 'H'. */
+    /* This has an AMIKey-2, which is type 'H'. */
     {
         .name = "[SiS 501] ASUS PCI/I-P54SP4",
         .internal_name = "p54sp4",
         .type = MACHINE_TYPE_SOCKET5,
         .chipset = MACHINE_CHIPSET_SIS_501,
         .init = machine_at_p54sp4_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -9651,25 +12554,29 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* This has an AMIKey-2, which is an updated version of type 'H'. */
+    /* This has an AMIKey-2, which is type 'H'. */
     {
         .name = "[SiS 501] BCM SQ-588",
         .internal_name = "sq588",
         .type = MACHINE_TYPE_SOCKET5,
         .chipset = MACHINE_CHIPSET_SIS_501,
         .init = machine_at_sq588_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -9691,11 +12598,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -9709,7 +12620,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET5,
         .chipset = MACHINE_CHIPSET_SIS_501,
         .init = machine_at_p54sps_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -9731,11 +12642,149 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = &keyboard_at_ami_device,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_PHOENIX | 0x00021400,    /* Guess. */
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* This has an AMIKey-2, which is type 'H'. */
+    {
+        .name = "[SiS 5501] MSI MS-5109",
+        .internal_name = "ms5109",
+        .type = MACHINE_TYPE_SOCKET5,
+        .chipset = MACHINE_CHIPSET_SIS_5501,
+        .init = machine_at_ms5109_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+        CPU_BLOCK(CPU_PENTIUMMMX),
+            .min_bus = 50000000,
+            .max_bus = 66666667,
+            .min_voltage = 3520,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 1.5
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .ram = {
+            .min = 8192,
+            .max = 131072,
+            .step = 8192
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_0 | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has AMIKey Z(!) KBC firmware. */
+    {
+        .name = "[SiS 5501] Olivetti (TriGem) Torino",
+        .internal_name = "torino",
+        .type = MACHINE_TYPE_SOCKET5,
+        .chipset = MACHINE_CHIPSET_SIS_5501,
+        .init = machine_at_torino_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+        CPU_BLOCK(CPU_PENTIUMMMX),
+            .min_bus = 50000000,
+            .max_bus = 66666667,
+            .min_voltage = 3520,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 1.5
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM,
+        .ram = {
+            .min = 8192,
+            .max = 131072,
+            .step = 8192
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI_TRIGEM | KBC_FLAG_IS_GREEN | 0x00005a00,
+        .kbc_p1 = 0x000004f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &tgui9660_onboard_pci_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+
+    /* UMC 889x */
+    /* This has an AMIKey-2, which is type 'H'. */
+    {
+        .name = "[UMC 889x] Shuttle HOT-539",
+        .internal_name = "hot539",
+        .type = MACHINE_TYPE_SOCKET5,
+        .chipset = MACHINE_CHIPSET_UMC_UM8890BF,
+        .init = machine_at_hot539_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK(CPU_K5, CPU_5K86),
+            .min_bus = 40000000,
+            .max_bus = 66666667,
+            .min_voltage = 3380,
+            .max_voltage = 3600,
+            .min_multi = 1.5,
+            .max_multi = 2.0
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .ram = {
+            .min = 8192,
+            .max = 262144,
+            .step = 8192
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -9745,7 +12794,7 @@ const machine_t machines[] = {
 
     /* Socket 7 (Single Voltage) machines */
     /* 430FX */
-    /* This has an AMIKey-2, which is an updated version of type 'H'.
+    /* This has an AMIKey-2, which is type 'H'.
        This also seems to be revision 2.1 with the FDC37C665 SIO. */
     {
         .name = "[i430FX] ASUS P/I-P55TP4XE",
@@ -9753,7 +12802,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET7_3V,
         .chipset = MACHINE_CHIPSET_INTEL_430FX,
         .init = machine_at_p54tp4xe_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -9775,51 +12824,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_USE_MBDMA,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* This has an AMIKey-2, which is an updated version of type 'H'. */
-    {
-        .name = "[i430FX] ASUS P/I-P55TP4XE (MR BIOS)",
-        .internal_name = "p54tp4xe_mr",
-        .type = MACHINE_TYPE_SOCKET7_3V,
-        .chipset = MACHINE_CHIPSET_INTEL_430FX,
-        .init = machine_at_p54tp4xe_mr_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
-            .max_bus = 66666667,
-            .min_voltage = 3380,
-            .max_voltage = 3600,
-            .min_multi = 1.5,
-            .max_multi = 3.0
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
-        .ram = {
-            .min = 8192,
-            .max = 131072,
-            .step = 8192
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &p54tp4xe_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -9833,7 +12846,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET7_3V,
         .chipset = MACHINE_CHIPSET_INTEL_430FX,
         .init = machine_at_exp8551_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -9855,68 +12868,30 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
-       PC87306 Super I/O chip, command 0xA1 returns '5'.
-       Command 0xA0 copyright string: (C)1994 AMI . */
-    {
-        .name = "[i430FX] Gateway 2000 Thor",
-        .internal_name = "gw2katx",
-        .type = MACHINE_TYPE_SOCKET7_3V,
-        .chipset = MACHINE_CHIPSET_INTEL_430FX,
-        .init = machine_at_gw2katx_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
-            .max_bus = 66666667,
-            .min_voltage = 3380,
-            .max_voltage = 3520,
-            .min_multi = 1.5,
-            .max_multi = 3.0
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT,
-        .ram = {
-            .min = 8192,
-            .max = 131072,
-            .step = 8192
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* The BIOS does not send a single non-standard KBC command, but the board has a SMC Super I/O
-       chip with on-chip KBC and AMI MegaKey KBC firmware. */
+    /* Has a SM(S)C FDC37C932 Super I/O chip with on-chip KBC with AMI
+       MegaKey (revision '5') KBC firmware. */
     {
         .name = "[i430FX] HP Vectra VL 5 Series 4",
         .internal_name = "vectra54",
         .type = MACHINE_TYPE_SOCKET7_3V,
         .chipset = MACHINE_CHIPSET_INTEL_430FX,
         .init = machine_at_vectra54_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -9930,7 +12905,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 2.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -9938,11 +12913,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &s3_phoenix_trio64_onboard_pci_device,
@@ -9953,18 +12932,18 @@ const machine_t machines[] = {
        PC87306 Super I/O chip, command 0xA1 returns '5'.
        Command 0xA0 copyright string: (C)1994 AMI . */
     {
-        .name = "[i430FX] Intel Advanced/ATX",
+        .name = "[i430FX] Intel Advanced/ATX (Thor)",
         .internal_name = "thor",
         .type = MACHINE_TYPE_SOCKET7_3V,
         .chipset = MACHINE_CHIPSET_INTEL_430FX,
         .init = machine_at_thor_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
             .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
+            .block = CPU_BLOCK(CPU_K5, CPU_5K86, CPU_Cx6x86),
             .min_bus = 50000000,
             .max_bus = 66666667,
             .min_voltage = 3380,
@@ -9973,18 +12952,22 @@ const machine_t machines[] = {
             .max_multi = 3.0
         },
         .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM | MACHINE_GAMEPORT,
+        .flags = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM | MACHINE_GAMEPORT, /* Machine has optional onboard sound: Crystal CS4232-KQ */
         .ram = {
             .min = 8192,
             .max = 131072,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &thor_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &s3_phoenix_trio64vplus_onboard_pci_device,
@@ -9995,60 +12978,18 @@ const machine_t machines[] = {
        PC87306 Super I/O chip, command 0xA1 returns '5'.
        Command 0xA0 copyright string: (C)1994 AMI . */
     {
-        .name = "[i430FX] Intel Advanced/ATX (MR BIOS)",
-        .internal_name = "mrthor",
-        .type = MACHINE_TYPE_SOCKET7_3V,
-        .chipset = MACHINE_CHIPSET_INTEL_430FX,
-        .init = machine_at_mrthor_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
-            .max_bus = 66666667,
-            .min_voltage = 3380,
-            .max_voltage = 3520,
-            .min_multi = 1.5,
-            .max_multi = 3.0
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT,
-        .ram = {
-            .min = 8192,
-            .max = 131072,
-            .step = 8192
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
-       PC87306 Super I/O chip, command 0xA1 returns '5'.
-       Command 0xA0 copyright string: (C)1994 AMI . */
-    {
-        .name = "[i430FX] Intel Advanced/EV",
+        .name = "[i430FX] Intel Advanced/EV (Endeavor)",
         .internal_name = "endeavor",
         .type = MACHINE_TYPE_SOCKET7_3V,
         .chipset = MACHINE_CHIPSET_INTEL_430FX,
         .init = machine_at_endeavor_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = machine_at_endeavor_gpio_handler,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
             .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
+            .block = CPU_BLOCK(CPU_K5, CPU_5K86, CPU_Cx6x86),
             .min_bus = 50000000,
             .max_bus = 66666667,
             .min_voltage = 3380,
@@ -10064,25 +13005,29 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &s3_phoenix_trio64_onboard_pci_device,
         .snd_device = &sb_vibra16s_onboard_device,
         .net_device = NULL
     },
-    /* This has an AMIKey-2, which is an updated version of type 'H'. */
+    /* This has an AMIKey-2, which is type 'H'. */
     {
         .name = "[i430FX] MSI MS-5119",
         .internal_name = "ms5119",
         .type = MACHINE_TYPE_SOCKET7_3V,
         .chipset = MACHINE_CHIPSET_INTEL_430FX,
         .init = machine_at_ms5119_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -10104,11 +13049,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_USE_MBDMA,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -10123,13 +13072,13 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET7_3V,
         .chipset = MACHINE_CHIPSET_INTEL_430FX,
         .init = machine_at_pb640_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
             .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
+            .block = CPU_BLOCK(CPU_K5, CPU_5K86, CPU_Cx6x86),
             .min_bus = 50000000,
             .max_bus = 66666667,
             .min_voltage = 3380,
@@ -10145,11 +13094,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &gd5440_onboard_pci_device,
@@ -10163,7 +13116,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET7_3V,
         .chipset = MACHINE_CHIPSET_INTEL_430FX,
         .init = machine_at_mb500n_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -10185,25 +13138,29 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_0 | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has an AMI MegaKey 'H' KBC firmware (1992). */
+    /* Has an AMIKEY-2 'H' KBC firmware (1992). */
     {
         .name = "[i430FX] QDI FMB",
         .internal_name = "fmb",
         .type = MACHINE_TYPE_SOCKET7_3V,
         .chipset = MACHINE_CHIPSET_INTEL_430FX,
         .init = machine_at_fmb_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -10225,11 +13182,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -10238,54 +13199,16 @@ const machine_t machines[] = {
     },
 
     /* 430HX */
-    /* Has a Phoenix Multikey KBC in the SM(S)C SIO. */
+    /* Has SST Flash. */
+    /* Has a SM(S)C FDC37C935 Super I/O chip with on-chip KBC with Phoenix
+       MultiKey/42 (version 1.38) KBC firmware. */
     {
-        .name = "[i430HX] Acer M3A",
-        .internal_name = "acerm3a",
+        .name = "[i430HX] Acer V35N",
+        .internal_name = "acerv35n",
         .type = MACHINE_TYPE_SOCKET7_3V,
         .chipset = MACHINE_CHIPSET_INTEL_430HX,
-        .init = machine_at_acerm3a_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
-            .max_bus = 66666667,
-            .min_voltage = 3300,
-            .max_voltage = 3520,
-            .min_multi = 1.5,
-            .max_multi = 3.0
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB, /* Machine has internal SCSI */
-        .ram = {
-            .min = 8192,
-            .max = 196608,
-            .step = 8192
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has AMIKey-2 or VIA VT82C42N KBC (depending on the revision) with AMIKEY 'F' KBC firmware. */
-    {
-        .name = "[i430HX] AOpen AP53",
-        .internal_name = "ap53",
-        .type = MACHINE_TYPE_SOCKET7_3V,
-        .chipset = MACHINE_CHIPSET_INTEL_430HX,
-        .init = machine_at_ap53_init,
-        .p1_handler = NULL,
+        .init = machine_at_acerv35n_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -10302,30 +13225,78 @@ const machine_t machines[] = {
         .bus_flags = MACHINE_PS2_PCI,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM,
         .ram = {
-            .min = 8192,
+            .min = 4096,
             .max = 524288,
-            .step = 8192
+            .step = 4096
         },
-        .nvrmask = 127,
+        .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* [TEST] Has a VIA 82C42N KBC, with AMIKey F KBC firmware. */
+    /* Has AMIKey-2 or VIA VT82C42N KBC (depending on the revision) with AMIKEY 'F' KBC firmware. */
+    {
+        .name = "[i430HX] AOpen AP53",
+        .internal_name = "ap53",
+        .type = MACHINE_TYPE_SOCKET7_3V,
+        .chipset = MACHINE_CHIPSET_INTEL_430HX,
+        .init = machine_at_ap53_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 50000000,
+            .max_bus = 66666667,
+            .min_voltage = 3450,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 2.5
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .ram = {
+            .min = 4096,
+            .max = 524288,
+            .step = 4096
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* [TEST] Has a VIA 82C42N KBC that emulates the AMIKey F KBC firmware. */
     {
         .name = "[i430HX] Biostar MB-8500TUC",
         .internal_name = "8500tuc",
         .type = MACHINE_TYPE_SOCKET7_3V,
         .chipset = MACHINE_CHIPSET_INTEL_430HX,
         .init = machine_at_8500tuc_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -10339,34 +13310,37 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 3.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram = {
-            .min = 8192,
+            .min = 4096,
             .max = 524288,
-            .step = 8192
+            .step = 4096
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* [TEST] The board doesn't seem to have a KBC at all, which probably means it's an on-chip one on the PC87306 SIO. 
-       A list on a Danish site shows the BIOS as having a -0 string, indicating non-AMI KBC firmware. */
+    /* It possible has AMIKEY-2 'H' KBC firmware. */
     {
-        .name = "[i430HX] Supermicro P55T2S",
-        .internal_name = "p55t2s",
+        .name = "[i430HX] Siemens-Nixdorf D943",
+        .internal_name = "d943",
         .type = MACHINE_TYPE_SOCKET7_3V,
         .chipset = MACHINE_CHIPSET_INTEL_430HX,
-        .init = machine_at_p55t2s_init,
-        .p1_handler = NULL,
+        .init = machine_at_d943_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -10375,48 +13349,51 @@ const machine_t machines[] = {
             .block = CPU_BLOCK_NONE,
             .min_bus = 50000000,
             .max_bus = 66666667,
-            .min_voltage = 3300,
+            .min_voltage = 2800,
             .max_voltage = 3520,
             .min_multi = 1.5,
             .max_multi = 3.0
         },
         .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_AV | MACHINE_GAMEPORT | MACHINE_APM,
         .ram = {
             .min = 8192,
-            .max = 786432,
-            .step = 8192
+            .max = 131072,
+            .step = 4096
         },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &d943_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
+        .vid_device = &gd5436_onboard_pci_device,
+        .snd_device = &sb_vibra16c_onboard_device,
         .net_device = NULL
     },
 
     /* 430VX */
-    /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
-       PC87306 Super I/O chip, command 0xA1 returns '5'.
-       Command 0xA0 copyright string: (C)1994 AMI . */
+    /* Has a SM(S)C FDC37C932FR Super I/O chip with on-chip KBC with AMI
+       MegaKey (revision '5') KBC firmware. */
     {
-        .name = "[i430VX] Dell Hannibal+",
-        .internal_name = "dellhannibalp",
+        .name = "[i430VX] Gateway 2000 Mailman",
+        .internal_name = "gw2kma",
         .type = MACHINE_TYPE_SOCKET7_3V,
         .chipset = MACHINE_CHIPSET_INTEL_430VX,
-        .init = machine_at_dellhannibalp_init,
-        .p1_handler = NULL,
+        .init = machine_at_gw2kma_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
             .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
+            .block = CPU_BLOCK(CPU_K5, CPU_5K86, CPU_Cx6x86),
             .min_bus = 50000000,
             .max_bus = 66666667,
             .min_voltage = 3380,
@@ -10424,33 +13401,39 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 3.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB, /* Machine has internal video: ATI Mach64GT-B 3D Rage II */
         .ram = {
             .min = 8192,
             .max = 131072,
-            .step = 8192
+            .step = 4096
         },
-        .nvrmask = 127,
+        .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
-        .snd_device = NULL,
+        .snd_device = &sb_vibra16c_onboard_device,
         .net_device = NULL
     },
-    /* Has AMIKey H KBC firmware (AMIKey-2). */
+
+    /* SiS 5501 */
+    /* Has the Lance LT38C41 KBC. */
     {
-        .name = "[i430VX] ECS P5VX-B",
-        .internal_name = "p5vxb",
+        .name = "[SiS 5501] Chaintech 5SBM/5SBM2 (M103)",
+        .internal_name = "5sbm2",
         .type = MACHINE_TYPE_SOCKET7_3V,
-        .chipset = MACHINE_CHIPSET_INTEL_430VX,
-        .init = machine_at_p5vxb_init,
-        .p1_handler = NULL,
+        .chipset = MACHINE_CHIPSET_SIS_5501,
+        .init = machine_at_5sbm2_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -10464,61 +13447,23 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 3.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
+        .bus_flags = MACHINE_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
         .ram = {
             .min = 8192,
             .max = 131072,
             .step = 8192
         },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x000004f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
-       PC87306 Super I/O chip, command 0xA1 returns '5'.
-       Command 0xA0 copyright string: (C)1994 AMI . */
-    {
-        .name = "[i430VX] Gateway 2000 Tigereye",
-        .internal_name = "gw2kte",
-        .type = MACHINE_TYPE_SOCKET7_3V,
-        .chipset = MACHINE_CHIPSET_INTEL_430VX,
-        .init = machine_at_gw2kte_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
-            .max_bus = 66666667,
-            .min_voltage = 3380,
-            .max_voltage = 3520,
-            .min_multi = 1.5,
-            .max_multi = 3.0
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB,
-        .ram = {
-            .min = 8192,
-            .max = 131072,
-            .step = 8192
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &c5sbm2_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -10527,14 +13472,14 @@ const machine_t machines[] = {
     },
 
     /* SiS 5511 */
-    /* Has AMIKey H KBC firmware (AMIKey-2). */
+    /* Has Megakey 'R' KBC */
     {
-        .name = "[SiS 5511] AOpen AP5S",
-        .internal_name = "ap5s",
+        .name = "[SiS 5511] AMI Atlas PCI-II",
+        .internal_name = "amis727",
         .type = MACHINE_TYPE_SOCKET7_3V,
         .chipset = MACHINE_CHIPSET_SIS_5511,
-        .init = machine_at_ap5s_init,
-        .p1_handler = NULL,
+        .init = machine_at_amis727_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -10556,11 +13501,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00005200,
+        .kbc_p1 = 0x000044f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -10568,13 +13517,101 @@ const machine_t machines[] = {
         .net_device = NULL
     },
     /* Has AMIKey H KBC firmware (AMIKey-2). */
+    {
+        .name = "[SiS 5511] AOpen AP5S",
+        .internal_name = "ap5s",
+        .type = MACHINE_TYPE_SOCKET7_3V,
+        .chipset = MACHINE_CHIPSET_SIS_5511,
+        .init = machine_at_ap5s_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 50000000,
+            .max_bus = 66666667,
+            .min_voltage = 3380,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 3.0
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .ram = {
+            .min = 8192,
+            .max = 524288,
+            .step = 8192
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &ap5s_device,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has an SMC FDC37C669QF Super I/O. */
+    {
+        .name = "[SiS 5511] IBM PC 140 (type 6260)",
+        .internal_name = "pc140_6260",
+        .type = MACHINE_TYPE_SOCKET7_3V,
+        .chipset = MACHINE_CHIPSET_SIS_5511,
+        .init = machine_at_pc140_6260_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK(CPU_WINCHIP, CPU_WINCHIP2, CPU_Cx6x86, CPU_Cx6x86L, CPU_Cx6x86MX, CPU_PENTIUMMMX),
+            .min_bus = 50000000,
+            .max_bus = 66666667,
+            .min_voltage = 3380,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 3.0
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM,
+        .ram = {
+            .min = 8192,
+            .max = 131072,
+            .step = 8192
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,    /* Guess. */
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &gd5436_onboard_pci_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has AMIKey H KBC firmware (AMIKey-2). */
     {
         .name = "[SiS 5511] MSI MS-5124",
         .internal_name = "ms5124",
         .type = MACHINE_TYPE_SOCKET7_3V,
         .chipset = MACHINE_CHIPSET_SIS_5511,
         .init = machine_at_ms5124_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -10596,51 +13633,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has Megakey 'R' KBC */
-    {
-        .name = "[SiS 5511] AMI Atlas PCI-II",
-        .internal_name = "amis727",
-        .type = MACHINE_TYPE_SOCKET7_3V,
-        .chipset = MACHINE_CHIPSET_SIS_5511,
-        .init = machine_at_amis727_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
-            .max_bus = 66666667,
-            .min_voltage = 3380,
-            .max_voltage = 3520,
-            .min_multi = 1.5,
-            .max_multi = 3.0
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
-        .ram = {
-            .min = 8192,
-            .max = 524288,
-            .step = 8192
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_USE_MBDMA,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -10650,14 +13651,15 @@ const machine_t machines[] = {
 
     /* Socket 7 (Dual Voltage) machines */
     /* 430HX */
-    /* Has SST flash and the SMC FDC73C935's on-chip KBC with Phoenix MultiKey firmware. */
+    /* Has a SM(S)C FDC37C935 Super I/O chip with on-chip KBC with Phoenix
+       MultiKey/42 (version 1.38) KBC firmware. */
     {
-        .name = "[i430HX] Acer V35N",
-        .internal_name = "acerv35n",
+        .name = "[i430HX] Acer AcerPower Ultima",
+        .internal_name = "acerm3a",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430HX,
-        .init = machine_at_acerv35n_init,
-        .p1_handler = NULL,
+        .init = machine_at_acerm3a_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -10671,19 +13673,23 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 3.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB, /* Machine has internal SCSI */
         .ram = {
-            .min = 8192,
-            .max = 196608,
-            .step = 8192
+            .min = 4096,
+            .max = 524288,
+            .step = 4096
         },
-        .nvrmask = 127,
+        .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -10697,7 +13703,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430HX,
         .init = machine_at_p55t2p4_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -10705,284 +13711,43 @@ const machine_t machines[] = {
             .package = CPU_PKG_SOCKET5_7,
             .block = CPU_BLOCK_NONE,
             .min_bus = 50000000,
-            .max_bus = 83333333,
-            .min_voltage = 2500,
+            .max_bus = 75000000,
+            .min_voltage = 2100,
             .max_voltage = 3520,
             .min_multi = 1.5,
-            .max_multi = 3.0
+            .max_multi = 4.0
         },
         .bus_flags = MACHINE_PS2_PCI,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM,
         .ram = {
-            .min = 8192,
-            .max = 262144,
-            .step = 8192
+            .min = 4096,
+            .max = 524288,
+            .step = 4096
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has the SMC FDC73C935's on-chip KBC with Phoenix MultiKey firmware. */
-    {
-        .name = "[i430HX] Micronics M7S-Hi",
-        .internal_name = "m7shi",
-        .type = MACHINE_TYPE_SOCKET7,
-        .chipset = MACHINE_CHIPSET_INTEL_430HX,
-        .init = machine_at_m7shi_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
-            .max_bus = 66666667,
-            .min_voltage = 2800,
-            .max_voltage = 3520,
-            .min_multi = 1.5,
-            .max_multi = 3.0
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB,
-        .ram = {
-            .min = 8192,
-            .max = 131072,
-            .step = 8192
-        },
-        .nvrmask = 511,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
-       PC87306 Super I/O chip, command 0xA1 returns '5'.
-       Command 0xA0 copyright string: (C)1994 AMI . */
-    {
-        .name = "[i430HX] Intel TC430HX",
-        .internal_name = "tc430hx",
-        .type = MACHINE_TYPE_SOCKET7,
-        .chipset = MACHINE_CHIPSET_INTEL_430HX,
-        .init = machine_at_tc430hx_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
-            .max_bus = 66666667,
-            .min_voltage = 2800,
-            .max_voltage = 3520,
-            .min_multi = 1.5,
-            .max_multi = 3.0
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_VIDEO | MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB, /* Has internal sound: Yamaha YMF701-S */
-        .ram = {
-            .min = 8192,
-            .max = 131072,
-            .step = 8192
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = &s3_virge_375_pci_device,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* OEM version of Intel TC430HX, has AMI MegaKey KBC firmware on the PC87306 Super I/O chip. */
-    {
-        .name = "[i430HX] Toshiba Infinia 7200",
-        .internal_name = "infinia7200",
-        .type = MACHINE_TYPE_SOCKET7,
-        .chipset = MACHINE_CHIPSET_INTEL_430HX,
-        .init = machine_at_infinia7200_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
-            .max_bus = 66666667,
-            .min_voltage = 2800,
-            .max_voltage = 3520,
-            .min_multi = 1.5,
-            .max_multi = 3.0
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_VIDEO | MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB, /* Has internal sound: Yamaha YMF701-S */
-        .ram = {
-            .min = 8192,
-            .max = 131072,
-            .step = 8192
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = &s3_virge_375_pci_device,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* OEM-only Intel CU430HX, has AMI MegaKey KBC firmware on the PC87306 Super I/O chip. */
-    {
-        .name = "[i430HX] Intel CU430HX",
-        .internal_name = "cu430hx",
-        .type = MACHINE_TYPE_SOCKET7,
-        .chipset = MACHINE_CHIPSET_INTEL_430HX,
-        .init = machine_at_cu430hx_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
-            .max_bus = 66666667,
-            .min_voltage = 2800,
-            .max_voltage = 3520,
-            .min_multi = 1.5,
-            .max_multi = 3.0
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_USB,
-        .ram = {
-            .min = 8192,
-            .max = 196608,
-            .step = 8192
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = &sb_vibra16c_onboard_device,
-        .net_device = NULL
-    },
-    /* OEM-only Intel CU430HX, has AMI MegaKey KBC firmware on the PC87306 Super I/O chip. */
-    {
-        .name = "[i430HX] Toshiba Equium 5200D",
-        .internal_name = "equium5200",
-        .type = MACHINE_TYPE_SOCKET7,
-        .chipset = MACHINE_CHIPSET_INTEL_430HX,
-        .init = machine_at_equium5200_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
-            .max_bus = 66666667,
-            .min_voltage = 2800,
-            .max_voltage = 3520,
-            .min_multi = 1.5,
-            .max_multi = 3.0
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_USB,
-        .ram = {
-            .min = 8192,
-            .max = 196608,
-            .step = 8192
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = &sb_vibra16c_onboard_device,
-        .net_device = NULL
-    },
-    /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
-       PC87306 Super I/O chip, command 0xA1 returns '5'.
-       Command 0xA0 copyright string: (C)1994 AMI .
-       Yes, this is an Intel AMI BIOS with a fancy splash screen. */
-    {
-        .name = "[i430HX] Sony Vaio PCV-90",
-        .internal_name = "pcv90",
-        .type = MACHINE_TYPE_SOCKET7,
-        .chipset = MACHINE_CHIPSET_INTEL_430HX,
-        .init = machine_at_pcv90_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
-            .max_bus = 66666667,
-            .min_voltage = 2800,
-            .max_voltage = 3520,
-            .min_multi = 1.5,
-            .max_multi = 3.0
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
-        .ram = {
-            .min = 8192,
-            .max = 196608,
-            .step = 8192
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* The base board has a Holtek HT6542B with the AMIKey-2 (updated 'H') KBC firmware. */
+    /* The base board has a Holtek HT6542B which emulates the AMIKey-2 ('H') KBC firmware. */
     {
         .name = "[i430HX] ASUS P/I-P65UP5 (C-P55T2D)",
         .internal_name = "p65up5_cp55t2d",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430HX,
         .init = machine_at_p65up5_cp55t2d_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -10994,21 +13759,162 @@ const machine_t machines[] = {
             .min_voltage = 2500,
             .max_voltage = 3520,
             .min_multi = 1.5,
-            .max_multi = 3.0
+            .max_multi = 3.5
         },
-        .bus_flags = MACHINE_PS2_PCI, /* Machine has AMB */
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB, /* Machine has AMB */
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram = {
-            .min = 8192,
+            .min = 4096,
             .max = 524288,
-            .step = 8192
+            .step = 4096
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_HOLTEK | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* OEM-only Intel CU430HX, has AMI MegaKey KBC firmware on the PC87306 Super I/O chip. */
+    {
+        .name = "[i430HX] Intel CU430HX (Cumberland)",
+        .internal_name = "cu430hx",
+        .type = MACHINE_TYPE_SOCKET7,
+        .chipset = MACHINE_CHIPSET_INTEL_430HX,
+        .init = machine_at_cu430hx_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK(CPU_K5, CPU_5K86, CPU_K6, CPU_K6_2, CPU_K6_2C, CPU_K6_3, CPU_K6_2P,
+                               CPU_K6_3P, CPU_Cx6x86, CPU_Cx6x86MX, CPU_Cx6x86L),
+            .min_bus = 50000000,
+            .max_bus = 66666667,
+            .min_voltage = 2800,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 3.5
+        },
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_USB, /* Machine has internal video: ATI Mach64GT 3D Rage and internal NIC: Intel 82557 */
+        .ram = {
+            .min = 8192,
+            .max = 524288,
+            .step = 4096
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &cu430hx_device,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = &sb_vibra16c_onboard_device,
+        .net_device = NULL
+    },
+    /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
+       PC87306 Super I/O chip, command 0xA1 returns '5'.
+       Command 0xA0 copyright string: (C)1994 AMI . */
+    {
+        .name = "[i430HX] Intel TC430HX (Tucson)",
+        .internal_name = "tc430hx",
+        .type = MACHINE_TYPE_SOCKET7,
+        .chipset = MACHINE_CHIPSET_INTEL_430HX,
+        .init = machine_at_tc430hx_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK(CPU_K5, CPU_5K86, CPU_K6, CPU_K6_2, CPU_K6_2C, CPU_K6_3, CPU_K6_2P,
+                               CPU_K6_3P, CPU_Cx6x86, CPU_Cx6x86MX, CPU_Cx6x86L),
+            .min_bus = 50000000,
+            .max_bus = 66666667,
+            .min_voltage = 2800,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 3.5
+        },
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_VIDEO | MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB, /* Has internal sound: Yamaha YMF701-S */
+        .ram = {
+            .min = 8192,
+            .max = 524288,
+            .step = 4096
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &tc430hx_device,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &s3_virge_375_pci_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has a SM(S)C FDC37C935 Super I/O chip with on-chip KBC with Phoenix
+       MultiKey/42 (version 1.38) KBC firmware. */
+    {
+        .name = "[i430HX] Micronics M7S-Hi",
+        .internal_name = "m7shi",
+        .type = MACHINE_TYPE_SOCKET7,
+        .chipset = MACHINE_CHIPSET_INTEL_430HX,
+        .init = machine_at_m7shi_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 60000000,
+            .max_bus = 66666667,
+            .min_voltage = 2800,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 3.0
+        },
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB,
+        .ram = {
+            .min = 4096,
+            .max = 524288,
+            .step = 4096
+        },
+        .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -11022,7 +13928,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430HX,
         .init = machine_at_epc2102_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -11030,25 +13936,122 @@ const machine_t machines[] = {
             .package = CPU_PKG_SOCKET5_7,
             .block = CPU_BLOCK_NONE,
             .min_bus = 50000000,
-            .max_bus = 83333333,
+            .max_bus = 66666667,
             .min_voltage = 2500,
             .max_voltage = 3520,
             .min_multi = 1.5,
+            .max_multi = 3.5
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .ram = {
+            .min = 4096,
+            .max = 524288,
+            .step = 4096
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = MACHINE_DMA_USE_CONFIG,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00005200,    /* Guess. */
+        .kbc_p1 = 0x000044f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
+       PC87306 Super I/O chip, command 0xA1 returns '5'.
+       Command 0xA0 copyright string: (C)1994 AMI .
+       Yes, this is an Intel AMI BIOS with a fancy splash screen. */
+    {
+        .name = "[i430HX] Sony Vaio PCV-90",
+        .internal_name = "pcv90",
+        .type = MACHINE_TYPE_SOCKET7,
+        .chipset = MACHINE_CHIPSET_INTEL_430HX,
+        .init = machine_at_pcv90_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK(CPU_K5, CPU_5K86, CPU_K6, CPU_K6_2, CPU_K6_2C, CPU_K6_3, CPU_K6_2P,
+                               CPU_K6_3P, CPU_Cx6x86, CPU_Cx6x86MX, CPU_Cx6x86L),
+            .min_bus = 50000000,
+            .max_bus = 66666667,
+            .min_voltage = 2800,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
             .max_multi = 3.0
         },
         .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM, /* Machine has internal video: ATI Mach64GT-B 3D Rage II */
         .ram = {
             .min = 8192,
-            .max = 262144,
-            .step = 8192
+            .max = 524288,
+            .step = 4096
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* [TEST] The board doesn't seem to have a KBC at all, which probably means it's an on-chip one on the PC87306 SIO.
+       A list on a Danish site shows the BIOS as having a -0 string, indicating non-AMI KBC firmware. */
+    {
+        .name = "[i430HX] Supermicro P55T2S",
+        .internal_name = "p55t2s",
+        .type = MACHINE_TYPE_SOCKET7,
+        .chipset = MACHINE_CHIPSET_INTEL_430HX,
+        .init = machine_at_p55t2s_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 50000000,
+            .max_bus = 66666667,
+            .min_voltage = 2800,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 3.0
+        },
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
+        .ram = {
+            .min = 4096,
+            .max = 524288,
+            .step = 4096
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -11064,7 +14067,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430VX,
         .init = machine_at_ap5vm_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -11078,19 +14081,23 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 3.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_SCSI | MACHINE_APM | MACHINE_USB,
         .ram = {
-            .min = 8192,
+            .min = 4096,
             .max = 131072,
-            .step = 8192
+            .step = 4096
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -11104,7 +14111,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430VX,
         .init = machine_at_p55tvp4_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -11116,21 +14123,25 @@ const machine_t machines[] = {
             .min_voltage = 2500,
             .max_voltage = 3520,
             .min_multi = 1.5,
-            .max_multi = 3.0
+            .max_multi = 3.5
         },
-        .bus_flags = MACHINE_PS2_PCI, /* Machine has AMB */
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB, /* Machine has AMB */
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram = {
-            .min = 8192,
+            .min = 4096,
             .max = 131072,
-            .step = 8192
+            .step = 4096
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -11145,7 +14156,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430VX,
         .init = machine_at_5ivg_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -11157,35 +14168,39 @@ const machine_t machines[] = {
             .min_voltage = 2500,
             .max_voltage = 3520,
             .min_multi = 1.5,
-            .max_multi = 3.0
+            .max_multi = 3.5
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram = {
-            .min = 8192,
+            .min = 4096,
             .max = 131072,
-            .step = 8192
+            .step = 4096
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,    /* Guess. */
+        .kbc_params = KBC_VEN_AMI | 0x00004800,    /* Guess. */
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* [TEST] Has AMIKey 'F' KBC firmware on a VIA VT82C42N KBC. */
+    /* [TEST] Has a VIA VT82C42N KBC. */
     {
         .name = "[i430VX] Biostar MB-8500TVX-A",
         .internal_name = "8500tvxa",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430VX,
         .init = machine_at_8500tvxa_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -11199,114 +14214,173 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 3.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram = {
-            .min = 8192,
+            .min = 4096,
             .max = 131072,
-            .step = 8192
+            .step = 4096
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* The BIOS does not send a single non-standard KBC command, but the board has a SMC Super I/O
-       chip with on-chip KBC and AMI MegaKey KBC firmware. */
+    /* Has a SM(S)C FDC37C932QF Super I/O chip with on-chip KBC with AMI
+       MegaKey (revision '5') KBC firmware. */
     {
-        .name = "[i430VX] Compaq Presario 2240",
+        .name = "[i430VX] Compaq Presario 224x",
         .internal_name = "presario2240",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430VX,
         .init = machine_at_presario2240_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
             .package = CPU_PKG_SOCKET5_7,
             .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
+            .min_bus = 66666667,
             .max_bus = 66666667,
             .min_voltage = 2800,
             .max_voltage = 3520,
             .min_multi = 1.5,
-            .max_multi = 3.0
+            .max_multi = 3.5
         },
         .bus_flags = MACHINE_PS2_PCI,
         .flags = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM | MACHINE_ACPI,
         .ram = {
-            .min = 8192,
-            .max = 131072,
-            .step = 8192
+            .min = 16384,
+            .max = 49152,
+            .step = 4096
         },
-        .nvrmask = 127,
+        .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &s3_trio64v2_dx_onboard_pci_device,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* This most likely has AMI MegaKey as above. */
+    /* Has a SM(S)C FDC37C931APM Super I/O chip with on-chip KBC with Compaq
+       KBC firmware. */
     {
-        .name = "[i430VX] Compaq Presario 4500",
+        .name = "[i430VX] Compaq Presario 45xx",
         .internal_name = "presario4500",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430VX,
         .init = machine_at_presario4500_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
             .package = CPU_PKG_SOCKET5_7,
             .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
+            .min_bus = 66666667,
             .max_bus = 66666667,
             .min_voltage = 2800,
             .max_voltage = 3520,
             .min_multi = 1.5,
-            .max_multi = 3.0
+            .max_multi = 3.5
         },
         .bus_flags = MACHINE_PS2_PCI,
         .flags = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM | MACHINE_ACPI,
         .ram = {
-            .min = 8192,
-            .max = 131072,
-            .step = 8192
+            .min = 16384,
+            .max = 49152,
+            .step = 4096
         },
-        .nvrmask = 127,
+        .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &s3_trio64v2_dx_onboard_pci_device,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* The BIOS sends KBC command CB which is an AMI KBC command, so it has an AMI KBC firmware. */
+    /* Has a SM(S)C FDC37C932FR Super I/O chip with on-chip KBC with AMI
+       MegaKey (revision '5') KBC firmware. */
     {
-        .name = "[i430VX] Epox P55-VA",
-        .internal_name = "p55va",
+        .name = "[i430VX] Dell Dimension XPS Pxxxa/Mxxxa",
+        .internal_name = "dellhannibalp",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430VX,
-        .init = machine_at_p55va_init,
-        .p1_handler = NULL,
+        .init = machine_at_dellhannibalp_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK(CPU_K5, CPU_5K86, CPU_K6, CPU_K6_2, CPU_K6_2C, CPU_K6_3, CPU_K6_2P,
+                               CPU_K6_3P, CPU_Cx6x86, CPU_Cx6x86MX, CPU_Cx6x86L),
+            .min_bus = 50000000,
+            .max_bus = 66666667,
+            .min_voltage = 2500,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 3.5
+        },
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB, /* Machine has internal video: S3 Trio64V+ */
+        .ram = {
+            .min = 8192,
+            .max = 131072,
+            .step = 4096
+        },
+        .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has AMIKey H KBC firmware (AMIKey-2). */
+    {
+        .name = "[i430VX] ECS P5VX-B",
+        .internal_name = "p5vxb",
+        .type = MACHINE_TYPE_SOCKET7,
+        .chipset = MACHINE_CHIPSET_INTEL_430VX,
+        .init = machine_at_p5vxb_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -11320,33 +14394,129 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 3.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram = {
-            .min = 8192,
+            .min = 4096,
             .max = 131072,
-            .step = 8192
+            .step = 4096
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* The BIOS does not send a single non-standard KBC command. */
+    /* Has a SM(S)C FDC37C932FR Super I/O chip with on-chip KBC with AMI
+       MegaKey (revision '5') KBC firmware. */
+    {
+        .name = "[i430VX] Epox P55-VA",
+        .internal_name = "p55va",
+        .type = MACHINE_TYPE_SOCKET7,
+        .chipset = MACHINE_CHIPSET_INTEL_430VX,
+        .init = machine_at_p55va_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 50000000,
+            .max_bus = 75000000,
+            .min_voltage = 2500,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 3.0
+        },
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
+        .ram = {
+            .min = 4096,
+            .max = 131072,
+            .step = 4096
+        },
+        .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has a SM(S)C FDC37C932FR Super I/O chip with on-chip KBC with AMI
+       MegaKey (revision '5') KBC firmware. */
+    {
+        .name = "[i430VX] Gateway 2000 Hitman",
+        .internal_name = "gw2kte",
+        .type = MACHINE_TYPE_SOCKET7,
+        .chipset = MACHINE_CHIPSET_INTEL_430VX,
+        .init = machine_at_gw2kte_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK(CPU_K5, CPU_5K86, CPU_K6, CPU_K6_2, CPU_K6_2C, CPU_K6_3, CPU_K6_2P,
+                               CPU_K6_3P, CPU_Cx6x86, CPU_Cx6x86MX, CPU_Cx6x86L),
+            .min_bus = 50000000,
+            .max_bus = 66666667,
+            .min_voltage = 2200,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 3.0
+        },
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB,
+        .ram = {
+            .min = 8192,
+            .max = 131072,
+            .step = 4096
+        },
+        .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = &sb_vibra16c_onboard_device,
+        .net_device = NULL
+    },
+    /* Has a SM(S)C FDC37C935 Super I/O chip with on-chip KBC with Phoenix
+       MultiKey/42 (version 1.38) KBC firmware. */
     {
         .name = "[i430VX] HP Brio 80xx",
         .internal_name = "brio80xx",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430VX,
         .init = machine_at_brio80xx_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -11358,21 +14528,69 @@ const machine_t machines[] = {
             .min_voltage = 2200,
             .max_voltage = 3520,
             .min_multi = 1.5,
-            .max_multi = 3.0
+            .max_multi = 3.5
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM, /* Machine has internal video: S3 Trio64V2/DX */
+        .ram = {
+            .min = 8192,
+            .max = 131072,
+            .step = 4096
+        },
+        .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has the AMIKey-2 ('H') KBC firmware. */
+    {
+        .name = "[i430VX] LG IBM Multinet x52 (MSI MS-5136)",
+        .internal_name = "lgibmx52",
+        .type = MACHINE_TYPE_SOCKET7,
+        .chipset = MACHINE_CHIPSET_INTEL_430VX,
+        .init = machine_at_lgibmx52_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 50000000,
+            .max_bus = 75000000,
+            .min_voltage = 2100,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 4.0
         },
         .bus_flags = MACHINE_PS2_PCI,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM,
         .ram = {
-            .min = 16384,
+            .min = 8192,
             .max = 131072,
-            .step = 8192
+            .step = 4096
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
-        .device = NULL,
+        .device = &lgibmx52_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -11383,18 +14601,19 @@ const machine_t machines[] = {
        PC87306 Super I/O chip, command 0xA1 returns '5'.
        Command 0xA0 copyright string: (C)1994 AMI . */
     {
-        .name = "[i430VX] Packard Bell PB680",
+        .name = "[i430VX] Packard Bell Multimedia C110 (PB680/PB682/PB685)",
         .internal_name = "pb680",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430VX,
         .init = machine_at_pb680_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
             .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
+            .block = CPU_BLOCK(CPU_K5, CPU_5K86, CPU_K6, CPU_K6_2, CPU_K6_2C, CPU_K6_3, CPU_K6_2P,
+                               CPU_K6_3P, CPU_Cx6x86, CPU_Cx6x86MX, CPU_Cx6x86L),
             .min_bus = 50000000,
             .max_bus = 66666667,
             .min_voltage = 2800,
@@ -11402,33 +14621,38 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 3.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_VIDEO | MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram = {
             .min = 8192,
             .max = 131072,
-            .step = 8192
+            .step = 4096
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &s3_phoenix_trio64vplus_onboard_pci_device,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* This machine has Phoenix MultiKey/42i KBC */
+    /* Has a SM(S)C FDC37C935 Super I/O chip with on-chip KBC with Phoenix
+       MultiKey/42 (version 1.38) KBC firmware. */
     {
-        .name = "[i430VX] Packard Bell PB810",
+        .name = "[i430VX] Packard Bell Multimedia M415 (PB810)",
         .internal_name = "pb810",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430VX,
         .init = machine_at_pb810_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -11440,21 +14664,25 @@ const machine_t machines[] = {
             .min_voltage = 2500,
             .max_voltage = 3520,
             .min_multi = 1.5,
-            .max_multi = 3.0
+            .max_multi = 4.0
         },
         .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM,
+        .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM, /* Machine has internal video: S3 Trio64V2/DX */
         .ram = {
-            .min = 8192,
+            .min = 4096,
             .max = 131072,
-            .step = 8192
+            .step = 4096
         },
-        .nvrmask = 127,
+        .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -11469,7 +14697,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430VX,
         .init = machine_at_mb520n_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -11481,21 +14709,25 @@ const machine_t machines[] = {
             .min_voltage = 2600,
             .max_voltage = 3520,
             .min_multi = 1.5,
-            .max_multi = 3.0
+            .max_multi = 3.5
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram = {
-            .min = 8192,
+            .min = 4096,
             .max = 131072,
-            .step = 8192
+            .step = 4096
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -11510,7 +14742,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430VX,
         .init = machine_at_i430vx_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -11524,19 +14756,23 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 3.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_GAMEPORT | MACHINE_APM | MACHINE_USB,
         .ram = {
-            .min = 8192,
+            .min = 4096,
             .max = 131072,
-            .step = 8192
+            .step = 4096
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -11547,12 +14783,12 @@ const machine_t machines[] = {
     /* 430TX */
     /* The BIOS sends KBC command B8, CA, and CB, so it has an AMI KBC firmware. */
     {
-        .name = "[i430TX] ADLink NuPRO-592",
+        .name = "[i430TX] ADLink NuPRO-591/592",
         .internal_name = "nupro592",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430TX,
         .init = machine_at_nupro592_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -11567,32 +14803,36 @@ const machine_t machines[] = {
             .max_multi = 5.5
         },
         .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI, /* Has internal video: C&T B69000 */
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_VIDEO,
         .ram = {
             .min = 8192,
             .max = 262144,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
-        .vid_device = NULL,
+        .vid_device = &chips_69000_onboard_device,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* This has the AMIKey KBC firmware, which is an updated 'F' type (YM430TX is based on the TX97). */
+    /* This has the AMIKey KBC firmware, which is type 'F' (YM430TX is based on the TX97). */
     {
         .name = "[i430TX] ASUS TX97",
         .internal_name = "tx97",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430TX,
         .init = machine_at_tx97_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -11601,12 +14841,12 @@ const machine_t machines[] = {
             .block = CPU_BLOCK_NONE,
             .min_bus = 50000000,
             .max_bus = 75000000,
-            .min_voltage = 2500,
+            .min_voltage = 2100,
             .max_voltage = 3520,
             .min_multi = 1.5,
-            .max_multi = 3.0
+            .max_multi = 3.5
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -11614,25 +14854,37 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004600,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* [TEST] Has AMI Megakey '5' KBC firmware on the SM(S)C FDC37C67x Super I/O chip. */
+    /*
+       According to Dell specifications, it can have either National Semiconductor
+       PC87307 or PC87309 Super I/O. All known instances have the former, although
+       other similar Dells of the era have pinouts for accompanying either so this
+       likely also does.
+
+       The KBC is either an AMI '5' MegaKey, Phoenix MultiKey/42 1.37, or Phoenix
+       MultiKey/42i 4.16.
+     */
     {
-        .name = "[i430TX] Gateway Tomahawk",
-        .internal_name = "tomahawk",
+        .name = "[i430TX] Dell OptiPlex GN+",
+        .internal_name = "optiplexgn",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430TX,
-        .init = machine_at_tomahawk_init,
-        .p1_handler = NULL,
+        .init = machine_at_optiplexgn_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -11641,12 +14893,58 @@ const machine_t machines[] = {
             .block = CPU_BLOCK_NONE,
             .min_bus = 50000000,
             .max_bus = 66666667,
+            .min_voltage = 2500,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 3.5
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        /* Video: S3 86C785 (Trio64V2/GX), ethernet: 3C905. */
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_VIDEO | MACHINE_SOUND,
+        .ram = {
+            .min = 8192,
+            .max = 262144,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        /* Stop-gap measure until the Trio64V2/GX is emulated, as both use the same VBIOS. */
+        .vid_device = &s3_trio64v2_dx_onboard_pci_device,
+        .snd_device = &sb_vibra16xv_onboard_device,
+        .net_device = NULL
+    },
+    /* [TEST] Has AMI Megakey '5' KBC firmware on the SM(S)C FDC37C67x Super I/O chip. */
+    {
+        .name = "[i430TX] Gateway E-1000",
+        .internal_name = "tomahawk",
+        .type = MACHINE_TYPE_SOCKET7,
+        .chipset = MACHINE_CHIPSET_INTEL_430TX,
+        .init = machine_at_tomahawk_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 60000000,
+            .max_bus = 66666667,
             .min_voltage = 2100,
             .max_voltage = 3520,
             .min_multi = 1.5,
-            .max_multi = 3.0
+            .max_multi = 5.5
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_VIDEO | MACHINE_SOUND | MACHINE_NIC | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -11654,133 +14952,201 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &s3_trio64v2_dx_onboard_pci_device,
         .snd_device = &cs4236b_device,
         .net_device = &pcnet_am79c973_onboard_device
     },
-#if defined(DEV_BRANCH) && defined(USE_AN430TX)
-    /* This has the Phoenix MultiKey KBC firmware. */
+    /* This has the Winbond W83977 Super I/O Chip with AMIKey-2 KBC firmware, which is type 'H'. */
     {
-        .name = "[i430TX] Intel AN430TX",
-        .internal_name = "an430tx",
-        .type = MACHINE_TYPE_SOCKET7,
-        .chipset = MACHINE_CHIPSET_INTEL_430TX,
-        .init = machine_at_an430tx_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 60000000,
-            .max_bus = 66666667,
-            .min_voltage = 2800,
-            .max_voltage = 3520,
-            .min_multi = 1.5,
-            .max_multi = 3.0
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI,
-        .ram = {
-            .min = 8192,
-            .max = 262144,
-            .step = 8192
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-#endif /* defined(DEV_BRANCH) && defined(USE_AN430TX) */
-    /* This has the AMIKey KBC firmware, which is an updated 'F' type. */
-    {
-        .name = "[i430TX] Intel YM430TX",
+        .name = "[i430TX] Intel YM430TX (Yamamoto)",
         .internal_name = "ym430tx",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430TX,
         .init = machine_at_ym430tx_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
             .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
+            .block = CPU_BLOCK(CPU_K5, CPU_5K86, CPU_K6, CPU_K6_2, CPU_K6_2C, CPU_K6_3, CPU_K6_2P,
+                               CPU_K6_3P, CPU_Cx6x86, CPU_Cx6x86MX, CPU_Cx6x86L),
             .min_bus = 60000000,
             .max_bus = 66666667,
             .min_voltage = 2800,
             .max_voltage = 3520,
             .min_multi = 1.5,
-            .max_multi = 3.0
+            .max_multi = 3.5
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
-            .min = 8192,
+            .min = 4096,
             .max = 262144,
-            .step = 8192
+            .step = 4096
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-	/* PhoenixBIOS 4.0 Rel 6.0 for 430TX, most likely has AMI KBC of some sort. Also has onboard Yamaha YMF701 which can't be emulated yet. */
+    /*
+       PhoenixBIOS 4.0 Rel 6.0 for 430TX, has onboard Yamaha YMF701 which
+       is not emulated yet.
+
+       Has a SM(S)C FDC37C935 Super I/O chip with on-chip KBC with Phoenix
+       MultiKey/42 (version 1.38) KBC firmware.
+     */
     {
         .name = "[i430TX] Micronics Thunderbolt",
         .internal_name = "thunderbolt",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430TX,
         .init = machine_at_thunderbolt_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
             .package = CPU_PKG_SOCKET5_7,
             .block = CPU_BLOCK(CPU_WINCHIP, CPU_WINCHIP2),
-            .min_bus = 50000000,
+            .min_bus = 60000000,
             .max_bus = 66666667,
             .min_voltage = 2500,
             .max_voltage = 3520,
             .min_multi = 1.5,
-            .max_multi = 3.0
+            .max_multi = 3.5
         },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB, /* Machine has internal sound: Yamaha YMF701-S */
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        /* Machine has internal sound: Yamaha YMF701-S */
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB,
         .ram = {
             .min = 8192,
             .max = 262144,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has a SM(S)C FDC37C67x Super I/O chip with on-chip KBC with Phoenix or
+       AMI MEGAKEY '5' KBC firmware. */
+    {
+        .name = "[i430TX] NEC Mate NX MA23C",
+        .internal_name = "ma23c",
+        .type = MACHINE_TYPE_SOCKET7,
+        .chipset = MACHINE_CHIPSET_INTEL_430TX,
+        .init = machine_at_ma23c_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 60000000,
+            .max_bus = 66666667,
+            .min_voltage = 2700,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 3.5
+        },
+        .bus_flags = MACHINE_PS2_PCIONLY | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, /* Machine has internal video: Cirrus Logic CL-GD5465 and internal sound: Yamaha YMF715 */
+        .ram = {
+            .min = 8192,
+            .max = 262144,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* This has the Phoenix MultiKey KBC firmware on the NSC Suepr I/O chip. */
+    {
+        .name = "[i430TX] Packard Bell PB790",
+        .internal_name = "an430tx",
+        .type = MACHINE_TYPE_SOCKET7,
+        .chipset = MACHINE_CHIPSET_INTEL_430TX,
+        .init = machine_at_an430tx_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK(CPU_K5, CPU_5K86, CPU_K6, CPU_K6_2, CPU_K6_2C, CPU_K6_3, CPU_K6_2P,
+                               CPU_K6_3P, CPU_Cx6x86, CPU_Cx6x86MX, CPU_Cx6x86L),
+            .min_bus = 60000000,
+            .max_bus = 66666667,
+            .min_voltage = 2800,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 3.5
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI, /* Machine has internal video: ATI Mach64GT-B 3D Rage II */
+        .ram = {
+            .min = 8192,
+            .max = 262144,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -11795,7 +15161,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430TX,
         .init = machine_at_mb540n_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -11807,21 +15173,25 @@ const machine_t machines[] = {
             .min_voltage = 2700,
             .max_voltage = 3520,
             .min_multi = 1.5,
-            .max_multi = 3.0
+            .max_multi = 3.5
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
-            .min = 8192,
+            .min = 4096,
             .max = 262144,
-            .step = 8192
+            .step = 4096
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -11835,47 +15205,51 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430TX,
         .init = machine_at_56a5_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
             .package = CPU_PKG_SOCKET5_7,
             .block = CPU_BLOCK_NONE,
-            .min_bus = 55000000,
-            .max_bus = 75000000,
+            .min_bus = 60000000,
+            .max_bus = 66666667,
             .min_voltage = 2800,
             .max_voltage = 3520,
             .min_multi = 1.5,
             .max_multi = 5.5
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
-            .min = 8192,
+            .min = 4096,
             .max = 262144,
-            .step = 8192
+            .step = 4096
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* [TEST] Has AMIKey 'H' KBC firmware. */
+    /* [TEST] Has AMIKey 'H' KBC firmware on the Winbond W83967 Super I/O chip. */
     {
         .name = "[i430TX] Supermicro P5MMS98",
         .internal_name = "p5mms98",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430TX,
         .init = machine_at_p5mms98_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -11883,25 +15257,29 @@ const machine_t machines[] = {
             .package = CPU_PKG_SOCKET5_7,
             .block = CPU_BLOCK_NONE,
             .min_bus = 50000000,
-            .max_bus = 66666667,
+            .max_bus = 75000000,
             .min_voltage = 2100,
             .max_voltage = 3520,
             .min_multi = 1.5,
-            .max_multi = 3.0
+            .max_multi = 3.5
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
-            .min = 8192,
+            .min = 4096,
             .max = 262144,
-            .step = 8192
+            .step = 4096
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -11910,26 +15288,26 @@ const machine_t machines[] = {
     },
     /* [TEST] Has AMIKey 'H' KBC firmware. */
     {
-        .name = "[i430TX] TriGem Richmond",
+        .name = "[i430TX] TriGem RD535 (Richmond)",
         .internal_name = "richmond",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430TX,
         .init = machine_at_richmond_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
             .package = CPU_PKG_SOCKET5_7,
             .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
+            .min_bus = 60000000,
             .max_bus = 66666667,
             .min_voltage = 2100,
             .max_voltage = 3520,
             .min_multi = 1.5,
-            .max_multi = 3.0
+            .max_multi = 3.5
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -11937,11 +15315,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -11958,7 +15340,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_VIA_APOLLO_VPX,
         .init = machine_at_ficva502_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -11972,7 +15354,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 3.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -11980,11 +15362,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -12001,7 +15387,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_VIA_APOLLO_VP3,
         .init = machine_at_ficpa2012_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12015,7 +15401,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 5.5
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -12023,11 +15409,60 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has the VIA VT82C586B southbridge with on-chip KBC identical to the VIA
+       VT82C42N. */
+    {
+        .name = "[VIA VP3] PC Partner VIA809DS",
+        .internal_name = "via809ds",
+        .type = MACHINE_TYPE_SOCKET7,
+        .chipset = MACHINE_CHIPSET_VIA_APOLLO_VP3,
+        .init = machine_at_via809ds_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 50000000,
+            .max_bus = 75000000,
+            .min_voltage = 2100,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 5.5
+        },
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .ram = {
+            .min = 8192,
+            .max = 1048576,
+            .step = 8192
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -12038,12 +15473,12 @@ const machine_t machines[] = {
     /* SiS 5571 */
     /* Has the SiS 5571 chipset with on-chip KBC. */
     {
-        .name = "[SiS 5571] Daewoo CB52X-SI",
+        .name = "[SiS 5571] Daewoo CD520",
         .internal_name = "cb52xsi",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_SIS_5571,
         .init = machine_at_cb52xsi_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12057,7 +15492,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 3.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -12065,11 +15500,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -12083,7 +15522,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_SIS_5571,
         .init = machine_at_ms5146_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12097,7 +15536,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 3.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -12105,11 +15544,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -12123,7 +15566,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_SIS_5571,
         .init = machine_at_r534f_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12137,7 +15580,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 3.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -12145,11 +15588,151 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &r534f_device,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+
+    /* SiS 5581 */
+    /* Has the SiS 5581 chipset with on-chip KBC. */
+    {
+        .name = "[SiS 5581] ASUS SP97-XV",
+        .internal_name = "sp97xv",
+        .type = MACHINE_TYPE_SOCKET7,
+        .chipset = MACHINE_CHIPSET_SIS_5581,
+        .init = machine_at_sp97xv_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 50000000,
+            .max_bus = 75000000,
+            .min_voltage = 2500,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 3.0
+        },
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .ram = {
+            .min = 8192,
+            .max = 1572864,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has the SiS 5581 chipset with on-chip KBC. */
+    {
+        .name = "[SiS 5581] BCM SQ-578",
+        .internal_name = "sq578",
+        .type = MACHINE_TYPE_SOCKET7,
+        .chipset = MACHINE_CHIPSET_SIS_5581,
+        .init = machine_at_sq578_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 50000000,
+            .max_bus = 75000000,
+            .min_voltage = 2500,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 3.0
+        },
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .ram = {
+            .min = 8192,
+            .max = 1572864,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+
+    /* SiS 5591 */
+    /* Has the SiS 5591 chipset with on-chip KBC. */
+    {
+        .name = "[SiS 5591] MSI MS-5172",
+        .internal_name = "ms5172",
+        .type = MACHINE_TYPE_SOCKET7,
+        .chipset = MACHINE_CHIPSET_SIS_5591,
+        .init = machine_at_ms5172_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 50000000,
+            .max_bus = 75000000,
+            .min_voltage = 2500,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 3.0
+        },
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .ram = {
+            .min = 8192,
+            .max = 786432,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -12159,13 +15742,57 @@ const machine_t machines[] = {
 
     /* ALi ALADDiN IV+ */
     /* Has the ALi M1543 southbridge with on-chip KBC. */
+    {
+        .name = "[ALi ALADDiN IV+] Biostar M5ATA",
+        .internal_name = "m5ata",
+        .type = MACHINE_TYPE_SOCKET7,
+        .chipset = MACHINE_CHIPSET_ALI_ALADDIN_IV_PLUS,
+        .init = machine_at_m5ata_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 60000000,
+            .max_bus = 66666667,
+            .min_voltage = 2100,
+            .max_voltage = 3500,
+            .min_multi = 1.5,
+            .max_multi = 4.5
+        },
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
+        .ram = {
+            .min = 8192,
+            .max = 262144,
+            .step = 8192
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &m5ata_device,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has the ALi M1543 southbridge with on-chip KBC. */
     {
         .name = "[ALi ALADDiN IV+] MSI MS-5164",
         .internal_name = "ms5164",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_ALI_ALADDIN_IV_PLUS,
         .init = machine_at_ms5164_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12179,7 +15806,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 3.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -12187,11 +15814,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -12205,7 +15836,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_ALI_ALADDIN_IV_PLUS,
         .init = machine_at_m560_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12214,12 +15845,12 @@ const machine_t machines[] = {
             .block = CPU_BLOCK_NONE,
             .min_bus = 50000000,
             .max_bus = 83333333,
-            .min_voltage = 2500,
+            .min_voltage = 2100,
             .max_voltage = 3520,
             .min_multi = 1.5,
             .max_multi = 3.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -12227,11 +15858,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -12248,7 +15883,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKETS7,
         .chipset = MACHINE_CHIPSET_ALI_ALADDIN_V,
         .init = machine_at_p5a_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12262,19 +15897,23 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 5.5
         },
-        .bus_flags = MACHINE_PS2_AGP,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB, /* Machine has internal sound: ESS Solo-1 */
         .ram = {
-            .min = 1024,
+            .min = 8192,
             .max = 1572864,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -12289,7 +15928,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKETS7,
         .chipset = MACHINE_CHIPSET_ALI_ALADDIN_V,
         .init = machine_at_m579_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12303,19 +15942,23 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 5.5
         },
-        .bus_flags = MACHINE_PS2_AGP,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, /* Machine has internal sound: C-Media CMI8330 */
         .ram = {
-            .min = 1024,
+            .min = 8192,
             .max = 1572864,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -12329,7 +15972,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKETS7,
         .chipset = MACHINE_CHIPSET_ALI_ALADDIN_V,
         .init = machine_at_gwlucas_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12343,23 +15986,27 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 5.5
         },
-        .bus_flags = MACHINE_PS2_PCIONLY,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB, /* Has internal video: ATI 3D Rage Pro Turbo AGP and sound: Ensoniq ES1373*/
+        .bus_flags = MACHINE_PS2_PCIONLY | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB, /* Has internal video: ATI 3D Rage Pro Turbo AGP and sound: Ensoniq ES1373 */
         .ram = {
             .min = 8192,
             .max = 262144,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
-        .snd_device = NULL,
+        .snd_device = &es1373_onboard_device,
         .net_device = NULL
     },
     /* Has the ALi M1543C southbridge with on-chip KBC. */
@@ -12369,7 +16016,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKETS7,
         .chipset = MACHINE_CHIPSET_ALI_ALADDIN_V,
         .init = machine_at_5aa_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12383,19 +16030,23 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 5.5
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
-            .min = 1024,
+            .min = 8192,
             .max = 1572864,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -12409,7 +16060,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKETS7,
         .chipset = MACHINE_CHIPSET_ALI_ALADDIN_V,
         .init = machine_at_5ax_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12423,19 +16074,23 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 5.5
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
-            .min = 1024,
+            .min = 8192,
             .max = 1572864,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -12452,7 +16107,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKETS7,
         .chipset = MACHINE_CHIPSET_VIA_APOLLO_MVP3,
         .init = machine_at_ax59pro_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12466,7 +16121,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 5.5
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -12474,17 +16129,66 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
+    /* Has the VIA VT82C596A southbridge with on-chip KBC identical to the VIA
+       VT82C42N. Sadly likely abuses cache on Cyrix 6x86MX and MII CPUs (Cyrix MII being what most socket 7 eMachines PCs used) , so they are blocked and it's thus named after the only known eMachines with an AMD K6-2 CPU here */
+    {
+        .name = "[VIA MVP3] eMachines eTower 300k",
+        .internal_name = "delhi3",
+        .type = MACHINE_TYPE_SOCKETS7,
+        .chipset = MACHINE_CHIPSET_VIA_APOLLO_MVP3,
+        .init = machine_at_delhi3_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK(CPU_Cx6x86MX),
+            .min_bus = 66666667,
+            .max_bus = 124242424,
+            .min_voltage = 2000,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 5.5
+        },
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB, /* Has internal video: ATI 3D Rage IIc AGP (Rage 2) */
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_SOUND | MACHINE_USB,
+        .ram = {
+            .min = 8192,
+            .max = 524288,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = &cs4235_onboard_device,
+        .net_device = NULL
+    },
     /* Has the VIA VT82C586B southbridge with on-chip KBC identical to the VIA
        VT82C42N. */
     {
@@ -12493,7 +16197,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKETS7,
         .chipset = MACHINE_CHIPSET_VIA_APOLLO_MVP3,
         .init = machine_at_mvp3_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12507,7 +16211,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 5.5
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -12515,11 +16219,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -12534,7 +16242,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKETS7,
         .chipset = MACHINE_CHIPSET_VIA_APOLLO_MVP3,
         .init = machine_at_ficva503a_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12548,19 +16256,23 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 5.5
         },
-        .bus_flags = MACHINE_PS2_A97,
-        .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB, 
+        .bus_flags = MACHINE_PS2_A97 | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB,
         .ram = {
             .min = 8192,
             .max = 786432,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -12575,7 +16287,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKETS7,
         .chipset = MACHINE_CHIPSET_VIA_APOLLO_MVP3,
         .init = machine_at_5emapro_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12589,7 +16301,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 5.5
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -12597,11 +16309,61 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+
+    /* SiS 5591 */
+    /* Has the SiS 5591 chipset with on-chip KBC. */
+    {
+        .name = "[SiS 5591] Gigabyte GA-5SG100",
+        .internal_name = "5sg100",
+        .type = MACHINE_TYPE_SOCKETS7,
+        .chipset = MACHINE_CHIPSET_SIS_5591,
+        .init = machine_at_5sg100_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET5_7,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 60000000,
+            .max_bus = 100000000,
+            .min_voltage = 2000,
+            .max_voltage = 3520,
+            .min_multi = 1.5,
+            .max_multi = 5.5
+        },
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .ram = {
+            .min = 8192,
+            .max = 786432,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -12611,14 +16373,14 @@ const machine_t machines[] = {
 
     /* Socket 8 machines */
     /* 450KX */
-    /* This has an AMIKey-2, which is an updated version of type 'H'. */
+    /* This has an AMIKey-2, which is type 'H'. */
     {
         .name = "[i450KX] AOpen AP61",
         .internal_name = "ap61",
         .type = MACHINE_TYPE_SOCKET8,
         .chipset = MACHINE_CHIPSET_INTEL_450KX,
         .init = machine_at_ap61_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12640,25 +16402,29 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_DISABLED | MACHINE_DMA_1 | MACHINE_DMA_3,
+        .default_jumpered_ecp_dma = 3,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x000008f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* This has an AMIKey-2, which is an updated version of type 'H'. */
+    /* This has an AMIKey-2, which is type 'H'. */
     {
         .name = "[i450KX] ASUS P/I-P6RP4",
         .internal_name = "p6rp4",
         .type = MACHINE_TYPE_SOCKET8,
         .chipset = MACHINE_CHIPSET_INTEL_450KX,
         .init = machine_at_p6rp4_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12680,11 +16446,59 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = MACHINE_DMA_1,
+        .default_jumpered_ecp_dma = 1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* This has a PC87306 with unknown keyboard controller firmware (Phoenix?). */
+    {
+        .name = "[i450KX] FIC PO-6000",
+        .internal_name = "ficpo6000",
+        .type = MACHINE_TYPE_SOCKET8,
+        .chipset = MACHINE_CHIPSET_INTEL_450KX,
+        .init = machine_at_ficpo6000_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET8,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 60000000,
+            .max_bus = 66666667,
+            .min_voltage = 2100,
+            .max_voltage = 3500,
+            .min_multi = 1.5,
+            .max_multi = 8.0
+        },
+        .bus_flags = MACHINE_PS2_PCI, /* Machine has AMB */
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM,
+        .ram = {
+            .min = 8192,
+            .max = 524288,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = MACHINE_DMA_1,
+        .default_jumpered_ecp_dma = 1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &ficpo6000_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -12693,14 +16507,15 @@ const machine_t machines[] = {
     },
 
     /* 440FX */
-    /* Has the SMC FDC73C935's on-chip KBC with Phoenix MultiKey firmware. */
+    /* Has a SM(S)C FDC37C935 Super I/O chip with on-chip KBC with Phoenix
+       MultiKey/42 (version 1.38) KBC firmware. */
     {
         .name = "[i440FX] Acer V60N",
         .internal_name = "acerv60n",
         .type = MACHINE_TYPE_SOCKET8,
         .chipset = MACHINE_CHIPSET_INTEL_440FX,
         .init = machine_at_acerv60n_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12714,33 +16529,37 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram = {
             .min = 8192,
-            .max = 524288,
+            .max = 393216,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* The base board has a Holtek HT6542B with AMIKey-2 (updated 'H') KBC firmware. */
+    /* The base board has a Holtek HT6542B with AMIKey-2 ('H') KBC firmware. */
     {
         .name = "[i440FX] ASUS P/I-P65UP5 (C-P6ND)",
         .internal_name = "p65up5_cp6nd",
         .type = MACHINE_TYPE_SOCKET8,
         .chipset = MACHINE_CHIPSET_INTEL_440FX,
         .init = machine_at_p65up5_cp6nd_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12754,7 +16573,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_PCI, /* Machine has AMB */
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB, /* Machine has AMB */
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -12762,25 +16581,29 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_HOLTEK | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has a VIA VT82C42N with likely AMIKey 'F' KBC firmware. */
+    /* Has a VIA VT82C42N KBC. */
     {
         .name = "[i440FX] Biostar MB-8600TTC",
         .internal_name = "8600ttc",
         .type = MACHINE_TYPE_SOCKET8,
         .chipset = MACHINE_CHIPSET_INTEL_440FX,
         .init = machine_at_8600ttc_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12794,73 +16617,37 @@ const machine_t machines[] = {
             .min_multi = 2.0,
             .max_multi = 5.5
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
-        .ram = {
-            .min = 8192,
-            .max = 1048576,
-            .step = 8192
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* It's a Intel VS440FX with a Gateway 2000 OEM BIOS */
-    {
-        .name = "[i440FX] Gateway 2000 Venus",
-        .internal_name = "gw2kvenus",
-        .type = MACHINE_TYPE_SOCKET8,
-        .chipset = MACHINE_CHIPSET_INTEL_440FX,
-        .init = machine_at_gw2kvenus_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET8,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 60000000,
-            .max_bus = 66666667,
-            .min_voltage = 2100,
-            .max_voltage = 3500,
-            .min_multi = 2.0,
-            .max_multi = 3.5
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB,
         .ram = {
             .min = 8192,
             .max = 524288,
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has the AMIKey-2 (updated 'H') KBC firmware. */
+    /* Has the AMIKey-2 ('H') KBC firmware. */
     {
         .name = "[i440FX] Gigabyte GA-686NX",
         .internal_name = "686nx",
         .type = MACHINE_TYPE_SOCKET8,
         .chipset = MACHINE_CHIPSET_INTEL_440FX,
         .init = machine_at_686nx_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12874,7 +16661,7 @@ const machine_t machines[] = {
             .min_multi = 2.0,
             .max_multi = 5.5
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -12882,11 +16669,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -12897,12 +16688,12 @@ const machine_t machines[] = {
        PC87306 Super I/O chip, command 0xA1 returns '5'.
        Command 0xA0 copyright string: (C)1994 AMI . */
     {
-        .name = "[i440FX] Intel AP440FX",
+        .name = "[i440FX] Intel AP440FX (Apollo)",
         .internal_name = "ap440fx",
         .type = MACHINE_TYPE_SOCKET8,
         .chipset = MACHINE_CHIPSET_INTEL_440FX,
         .init = machine_at_ap440fx_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12916,75 +16707,83 @@ const machine_t machines[] = {
             .min_multi = 2.0,
             .max_multi = 3.5
         },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB, /* Machine has internal video: S3 ViRGE/DX and sound: Crystal CS4236B */
-        .ram = {
-            .min = 8192,
-            .max = 131072,
-            .step = 8192
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
-       PC87306 Super I/O chip, command 0xA1 returns '5'.
-       Command 0xA0 copyright string: (C)1994 AMI . */
-    {
-        .name = "[i440FX] Intel VS440FX",
-        .internal_name = "vs440fx",
-        .type = MACHINE_TYPE_SOCKET8,
-        .chipset = MACHINE_CHIPSET_INTEL_440FX,
-        .init = machine_at_vs440fx_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET8,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 60000000,
-            .max_bus = 66666667,
-            .min_voltage = 2100,
-            .max_voltage = 3500,
-            .min_multi = 2.0,
-            .max_multi = 3.5
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_SOUND | MACHINE_VIDEO | MACHINE_USB, /* Machine has internal video: S3 ViRGE/DX and sound: Crystal CS4236B */
         .ram = {
             .min = 8192,
             .max = 524288,
             .step = 8192
         },
         .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &s3_virge_325_onboard_pci_device,
+        .snd_device = &cs4236b_onboard_device,
+        .net_device = NULL
+    },
+    /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the
+       PC87306 Super I/O chip, command 0xA1 returns '5'.
+       Command 0xA0 copyright string: (C)1994 AMI . */
+    {
+        .name = "[i440FX] Intel VS440FX (Venus)",
+        .internal_name = "vs440fx",
+        .type = MACHINE_TYPE_SOCKET8,
+        .chipset = MACHINE_CHIPSET_INTEL_440FX,
+        .init = machine_at_vs440fx_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET8,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 60000000,
+            .max_bus = 66666667,
+            .min_voltage = 2100,
+            .max_voltage = 3500,
+            .min_multi = 2.0,
+            .max_multi = 3.5
+        },
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB,
+        .ram = {
+            .min = 8192,
+            .max = 524288,
+            .step = 8192
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = &vs440fx_device,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
-        .snd_device = NULL,
+        .snd_device = &cs4236_onboard_device,
         .net_device = NULL
     },
-    /* Has the AMIKey-2 (updated 'H') KBC firmware. */
+    /* Has the AMIKey-2 ('H') KBC firmware. */
     {
         .name = "[i440FX] LG IBM Multinet x61 (MSI MS-6106)",
         .internal_name = "lgibmx61",
         .type = MACHINE_TYPE_SOCKET8,
         .chipset = MACHINE_CHIPSET_INTEL_440FX,
         .init = machine_at_lgibmx61_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -12998,33 +16797,38 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB, /* Machine has internal SCSI: Adaptec AIC-78xx */
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB, /* Machine has internal SCSI: Adaptec AIC-7880U */
         .ram = {
             .min = 40960,
             .max = 524288,
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has the SMC FDC73C935's on-chip KBC with Phoenix MultiKey firmware. */
+    /* Has a SM(S)C FDC37C935 Super I/O chip with on-chip KBC with Phoenix
+       MultiKey/42 (version 1.38) KBC firmware. */
     {
         .name = "[i440FX] Micronics M6Mi",
         .internal_name = "m6mi",
         .type = MACHINE_TYPE_SOCKET8,
         .chipset = MACHINE_CHIPSET_INTEL_440FX,
         .init = machine_at_m6mi_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13038,33 +16842,37 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB, /* Machine has internal sound: Creative Vibra 16C */
         .ram = {
             .min = 8192,
             .max = 786432,
             .step = 8192
         },
-        .nvrmask = 127,
+        .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has a VIA VT82C42N KBC with likely AMI MegaKey firmware. */
+    /* Has a VIA VT82C42N KBC. */
     {
         .name = "[i440FX] PC Partner MB600N",
         .internal_name = "mb600n",
         .type = MACHINE_TYPE_SOCKET8,
         .chipset = MACHINE_CHIPSET_INTEL_440FX,
         .init = machine_at_mb600n_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13078,7 +16886,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -13086,11 +16894,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_VIA | 0x00424600,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -13099,7 +16911,7 @@ const machine_t machines[] = {
     },
 
     /* Slot 1 machines */
-    /* ALi ALADDiN V */
+    /* ALi ALADDiN-PRO II */
     /* Has the ALi M1543C southbridge with on-chip KBC. */
     {
         .name = "[ALi ALADDiN-PRO II] PC Chips M729",
@@ -13107,7 +16919,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_ALI_ALADDIN_PRO_II,
         .init = machine_at_m729_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13121,19 +16933,23 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB, /* Machine has internal sound: C-Media CMI8330 */
         .ram = {
-            .min = 1024,
+            .min = 8192,
             .max = 1572864,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -13142,55 +16958,15 @@ const machine_t machines[] = {
     },
 
     /* 440FX */
-    /* The base board has a Holtek HT6542B KBC with AMIKey-2 (updated 'H') KBC firmware. */
+    /* Has a SM(S)C FDC37C935 Super I/O chip with on-chip KBC with Phoenix
+       MultiKey/42 (version 1.38) KBC firmware. */
     {
-        .name = "[i440FX] ASUS P/I-P65UP5 (C-PKND)",
-        .internal_name = "p65up5_cpknd",
+        .name = "[i440FX] Acer V62X",
+        .internal_name = "acerv62x",
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_INTEL_440FX,
-        .init = machine_at_p65up5_cpknd_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SLOT1,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
-            .max_bus = 66666667,
-            .min_voltage = 1800,
-            .max_voltage = 3500,
-            .min_multi = 1.5,
-            .max_multi = 8.0
-        },
-        .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
-        .ram = {
-            .min = 8192,
-            .max = 1048576,
-            .step = 8192
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* This has a Holtek KBC and the BIOS does not send a single non-standard KBC command, so it
-       must be an ASIC that clones the standard IBM PS/2 KBC. */
-    {
-        .name = "[i440FX] ASUS KN97",
-        .internal_name = "kn97",
-        .type = MACHINE_TYPE_SLOT1,
-        .chipset = MACHINE_CHIPSET_INTEL_440FX,
-        .init = machine_at_kn97_init,
-        .p1_handler = NULL,
+        .init = machine_at_acerv62x_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13204,7 +16980,95 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
+        .ram = {
+            .min = 8192,
+            .max = 393216,
+            .step = 8192
+        },
+        .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* The base board has a Holtek HT6542B KBC which emulates the AMIKEY-2 'H' KBC firmware. */
+    {
+        .name = "[i440FX] ASUS P/I-P65UP5 (C-PKND)",
+        .internal_name = "p65up5_cpknd",
+        .type = MACHINE_TYPE_SLOT1,
+        .chipset = MACHINE_CHIPSET_INTEL_440FX,
+        .init = machine_at_p65up5_cpknd_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SLOT1,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 50000000,
+            .max_bus = 66666667,
+            .min_voltage = 1800,
+            .max_voltage = 3500,
+            .min_multi = 1.5,
+            .max_multi = 8.0
+        },
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
+        .ram = {
+            .min = 8192,
+            .max = 1048576,
+            .step = 8192
+        },
+        .nvrmask = 127,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_HOLTEK | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* This has a Holtek KBC. */
+    {
+        .name = "[i440FX] ASUS KN97",
+        .internal_name = "kn97",
+        .type = MACHINE_TYPE_SLOT1,
+        .chipset = MACHINE_CHIPSET_INTEL_440FX,
+        .init = machine_at_kn97_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SLOT1,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 60000000,
+            .max_bus = 83333333,
+            .min_voltage = 2800,
+            .max_voltage = 3500,
+            .min_multi = 1.5,
+            .max_multi = 8.0
+        },
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -13212,11 +17076,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_HOLTEK | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -13233,7 +17101,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_INTEL_440LX,
         .init = machine_at_lx6_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13241,13 +17109,13 @@ const machine_t machines[] = {
             .package = CPU_PKG_SLOT1,
             .block = CPU_BLOCK_NONE,
             .min_bus = 60000000,
-            .max_bus = 100000000,
+            .max_bus = 83333333,
             .min_voltage = 1500,
             .max_voltage = 3500,
             .min_multi = 2.0,
             .max_multi = 5.5
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -13255,26 +17123,75 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
+    /* Has a National Semiconductor PC87307 Super I/O with on-chip KBC, which has one of these
+       firmwares: AMI '5' MegaKey, Phoenix MultiKey/42 1.37, or Phoenix MultiKey/42i 4.16. */
+    {
+        .name = "[i440LX] Dell OptiPlex GXa",
+        .internal_name = "optiplexgxa",
+        .type = MACHINE_TYPE_SLOT1,
+        .chipset = MACHINE_CHIPSET_INTEL_440LX,
+        .init = machine_at_optiplexgxa_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SLOT1,
+            .block = CPU_BLOCK(CPU_PENTIUMPRO, CPU_CYRIX3S),
+            .min_bus = 66666667,
+            .max_bus = 66666667,
+            .min_voltage = 1800,
+            .max_voltage = 3500,
+            .min_multi = 1.5,
+            .max_multi = 5.0
+        },
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, /* Video: ATi 3D Rage Pro, Network: 3Com 3C905, Sound: Crystal CS4236B */
+        .ram = {
+            .min = 8192,
+            .max = 786432,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL, /* not yet emulated */
+        .snd_device = &cs4236b_device,
+        .net_device = NULL /* not yet emulated */
+    },
     /* Has a SM(S)C FDC37C935 Super I/O chip with on-chip KBC with Phoenix
-       MultiKey KBC firmware. */
+       MultiKey/42 (version 1.38) KBC firmware. */
     {
         .name = "[i440LX] Micronics Spitfire",
         .internal_name = "spitfire",
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_INTEL_440LX,
         .init = machine_at_spitfire_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13288,26 +17205,30 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, /* Machine has internal sound: Yamaha YMF701 */
         .ram = {
             .min = 8192,
             .max = 1048576,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Has a SM(S)C FDC37M60x Super I/O chip with on-chip KBC with Phoenix or
+    /* Has a SM(S)C FDC37C67x Super I/O chip with on-chip KBC with Phoenix or
        AMIKey-2 KBC firmware. */
     {
         .name = "[i440LX] NEC Mate NX MA30D/23D",
@@ -13315,7 +17236,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_INTEL_440LX,
         .init = machine_at_ma30d_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13329,7 +17250,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_PCIONLY | MACHINE_BUS_USB, /* Has internal video: SGS Thompson Riva 128 AGP, network: NEC PK-UG-X006 (Intel 82558B chip) and sound: OAK Audia 3D (OTI-610) for MA23D or YAMAHA YMF724 for MA30D */
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -13337,11 +17258,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x0000044f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -13358,7 +17283,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_INTEL_440EX,
         .init = machine_at_p6i440e2_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13372,7 +17297,7 @@ const machine_t machines[] = {
             .min_multi = 3.0,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -13380,11 +17305,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -13393,88 +17322,6 @@ const machine_t machines[] = {
     },
 
     /* 440BX */
-    /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
-       firmware. */
-    {
-        .name = "[i440BX] ASUS P2B-LS",
-        .internal_name = "p2bls",
-        .type = MACHINE_TYPE_SLOT1,
-        .chipset = MACHINE_CHIPSET_INTEL_440BX,
-        .init = machine_at_p2bls_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SLOT1,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 50000000,
-            .max_bus = 112121212,
-            .min_voltage = 1300,
-            .max_voltage = 3500,
-            .min_multi = 1.5,
-            .max_multi = 8.0
-        },
-        .bus_flags = MACHINE_PS2_AGP,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, /* Machine has internal SCSI: Adaptec AIC-7890AB */
-        .ram = {
-            .min = 8192,
-            .max = 1048576,
-            .step = 8192
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
-       firmware. */
-    {
-        .name = "[i440BX] ASUS P3B-F",
-        .internal_name = "p3bf",
-        .type = MACHINE_TYPE_SLOT1,
-        .chipset = MACHINE_CHIPSET_INTEL_440BX,
-        .init = machine_at_p3bf_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SLOT1,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 66666667,
-            .max_bus = 150000000,
-            .min_voltage = 1300,
-            .max_voltage = 3500,
-            .min_multi = 1.5,
-            .max_multi = 8.0
-        },
-        .bus_flags = MACHINE_PS2_AGP,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
-        .ram = {
-            .min = 8192,
-            .max = 1048576,
-            .step = 8192
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
     /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
     {
@@ -13483,7 +17330,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_INTEL_440BX,
         .init = machine_at_bf6_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13497,7 +17344,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -13505,11 +17352,60 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has a Winbond W83977TF Super I/O chip with on-chip KBC with AMIKey-2 KBC
+       firmware. */
+    {
+        .name = "[i440BX] ABIT BX6",
+        .internal_name = "bx6",
+        .type = MACHINE_TYPE_SLOT1,
+        .chipset = MACHINE_CHIPSET_INTEL_440BX,
+        .init = machine_at_bx6_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SLOT1,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 66666667,
+            .max_bus = 133333333,
+            .min_voltage = 1500,
+            .max_voltage = 3500,
+            .min_multi = 2.0,
+            .max_multi = 5.5
+        },
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .ram = {
+            .min = 8192,
+            .max = 524288,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -13524,7 +17420,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_INTEL_440BX,
         .init = machine_at_ax6bc_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13538,7 +17434,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -13546,11 +17442,105 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
+       firmware. */
+    {
+        .name = "[i440BX] ASUS P2B-LS",
+        .internal_name = "p2bls",
+        .type = MACHINE_TYPE_SLOT1,
+        .chipset = MACHINE_CHIPSET_INTEL_440BX,
+        .init = machine_at_p2bls_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SLOT1,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 50000000,
+            .max_bus = 112121212,
+            .min_voltage = 1300,
+            .max_voltage = 3500,
+            .min_multi = 1.5,
+            .max_multi = 8.0
+        },
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, /* Machine has internal SCSI: Adaptec AIC-7890AB */
+        .ram = {
+            .min = 8192,
+            .max = 1048576,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
+       firmware. */
+    {
+        .name = "[i440BX] ASUS P3B-F",
+        .internal_name = "p3bf",
+        .type = MACHINE_TYPE_SLOT1,
+        .chipset = MACHINE_CHIPSET_INTEL_440BX,
+        .init = machine_at_p3bf_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SLOT1,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 66666667,
+            .max_bus = 150000000,
+            .min_voltage = 1300,
+            .max_voltage = 3500,
+            .min_multi = 1.5,
+            .max_multi = 8.0
+        },
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .ram = {
+            .min = 8192,
+            .max = 1048576,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -13565,7 +17555,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_INTEL_440BX,
         .init = machine_at_686bx_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13579,7 +17569,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -13587,52 +17577,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has a SM(S)C FDC37M60x Super I/O chip with on-chip KBC with most likely
-       AMIKey-2 KBC firmware. */
-    {
-        .name = "[i440BX] HP Vectra VEi 8",
-        .internal_name = "vei8",
-        .type = MACHINE_TYPE_SLOT1,
-        .chipset = MACHINE_CHIPSET_INTEL_440BX,
-        .init = machine_at_vei8_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SLOT1,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 66666667,
-            .max_bus = 100000000,
-            .min_voltage = 1800,
-            .max_voltage = 3500,
-            .min_multi = 1.5,
-            .max_multi = 8.0
-        },
-        .bus_flags = MACHINE_PS2_AGP,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB, /* Machine has internal video: Matrox MGA-G200 and sound: Crystal CS4820 */
-        .ram = {
-            .min = 8192,
-            .max = 1048576,
-            .step = 8192
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -13646,7 +17599,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_INTEL_440BX,
         .init = machine_at_lgibmx7g_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13660,7 +17613,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -13668,11 +17621,60 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has a Winbond W83977TF Super I/O chip with on-chip KBC with AMIKey-2 KBC
+       firmware. */
+    {
+        .name = "[i440BX] Supermicro P6SBA",
+        .internal_name = "p6sba",
+        .type = MACHINE_TYPE_SLOT1,
+        .chipset = MACHINE_CHIPSET_INTEL_440BX,
+        .init = machine_at_p6sba_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SLOT1,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 66666667,
+            .max_bus = 100000000,
+            .min_voltage = 1800,
+            .max_voltage = 3500,
+            .min_multi = 1.5,
+            .max_multi = 8.0
+        },
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .ram = {
+            .min = 8192,
+            .max = 786432,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -13687,7 +17689,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_INTEL_440BX,
         .init = machine_at_s1846_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13701,34 +17703,40 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
-        .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, /* Machine has internal sound: Ensoniq ES1373 */
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, /* Machine has internal sound: Ensoniq ES1371 */
         .ram = {
             .min = 8192,
-            .max = 1048576,
+            .max = 786432,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = &es1371_onboard_device,
         .net_device = NULL
     },
-    /* Has a Winbond W83977TF Super I/O chip with on-chip KBC with AMIKey-2 KBC
-       firmware. */
+
+    /* 440ZX */
+    /* Has a SM(S)C FDC37M60x Super I/O chip with on-chip KBC with most likely
+       AMIKey-2 KBC firmware. */
     {
-        .name = "[i440BX] Supermicro P6SBA",
-        .internal_name = "p6sba",
+        .name = "[i440ZX] HP Vectra VEi 8",
+        .internal_name = "vei8",
         .type = MACHINE_TYPE_SLOT1,
-        .chipset = MACHINE_CHIPSET_INTEL_440BX,
-        .init = machine_at_p6sba_init,
-        .p1_handler = NULL,
+        .chipset = MACHINE_CHIPSET_INTEL_440ZX,
+        .init = machine_at_vei8_init,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13742,27 +17750,29 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB, /* Machine has internal video: Matrox MGA-G200 and sound: Crystal CS4820 */
         .ram = {
             .min = 8192,
-            .max = 786432,
+            .max = 524288,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = NULL,
         .net_device = NULL
     },
-
-    /* 440ZX */
     /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
     {
@@ -13771,7 +17781,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_INTEL_440ZX,
         .init = machine_at_ms6168_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13785,7 +17795,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP, /* AGP is reserved for the internal video */
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB, /* AGP is reserved for the internal video */
         .flags = MACHINE_IDE_DUAL | MACHINE_AV | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -13793,26 +17803,30 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &voodoo_3_2000_agp_onboard_8m_device,
-        .snd_device = NULL,
+        .snd_device = &es1373_onboard_device,
         .net_device = NULL
     },
     /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
     {
-        .name = "[i440ZX] Packard Bell Bora Pro",
+        .name = "[i440ZX] Packard Bell Bora Pro (MSI MS-6168)",
         .internal_name = "borapro",
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_INTEL_440ZX,
         .init = machine_at_borapro_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13820,13 +17834,13 @@ const machine_t machines[] = {
             .package = CPU_PKG_SLOT1,
             .block = CPU_BLOCK_NONE,
             .min_bus = 66666667,
-            .max_bus = 66666667,
+            .max_bus = 100000000,
             .min_voltage = 1800,
             .max_voltage = 3500,
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP, /* AGP is reserved for the internal video */
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB, /* AGP is reserved for the internal video */
         .flags = MACHINE_IDE_DUAL | MACHINE_AV | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -13834,15 +17848,19 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &voodoo_3_2000_agp_onboard_8m_device,
-        .snd_device = NULL,
+        .snd_device = &es1373_onboard_device,
         .net_device = NULL
     },
 
@@ -13850,12 +17868,12 @@ const machine_t machines[] = {
     /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
     {
-        .name = "[SMSC VictoryBX-66] A-Trend ATC-6310BXII",
+        .name = "[SMSC VictoryBX-66] A-Trend ATC6310BXII",
         .internal_name = "atc6310bxii",
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_SMSC_VICTORYBX_66,
         .init = machine_at_atc6310bxii_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13869,7 +17887,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -13877,11 +17895,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -13898,7 +17920,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_VIA_APOLLO_PRO,
         .init = machine_at_ficka6130_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13912,7 +17934,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB, /* Machine has internal sound: ESS ES1938S */
         .ram = {
             .min = 8192,
@@ -13920,11 +17942,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -13939,7 +17965,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_VIA_APOLLO_PRO_133,
         .init = machine_at_p3v133_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -13953,7 +17979,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -13961,11 +17987,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -13980,13 +18010,13 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_VIA_APOLLO_PRO_133A,
         .init = machine_at_p3v4x_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
             .package = CPU_PKG_SLOT1,
-            .block = CPU_BLOCK_NONE,
+            .block = CPU_BLOCK(CPU_PENTIUMPRO),
             .min_bus = 66666667,
             .max_bus = 150000000,
             .min_voltage = 1300,
@@ -13994,7 +18024,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -14002,11 +18032,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -14021,7 +18055,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_VIA_APOLLO_PRO_133A,
         .init = machine_at_gt694va_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -14035,7 +18069,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB, /* Machine has internal sound: Ensoniq ES1373 */
         .ram = {
             .min = 8192,
@@ -14043,15 +18077,109 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = &kbc_at_device,
+        .kbc_params = KBC_VEN_AMI | 0x00004800,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
-        .snd_device = &es1371_onboard_device,
+        .snd_device = &es1373_onboard_device,
+        .net_device = NULL
+    },
+
+    /* SiS (5)600 */
+    /* Has the SiS (5)600 chipset with on-chip KBC. */
+    {
+        .name = "[SiS 5600] Freetech/Flexus P6F99",
+        .internal_name = "p6f99",
+        .type = MACHINE_TYPE_SLOT1,
+        .chipset = MACHINE_CHIPSET_SIS_5600,
+        .init = machine_at_p6f99_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SLOT1,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 66666667,
+            .max_bus = 100000000,
+            .min_voltage = 1300,
+            .max_voltage = 3500,
+            .min_multi = 1.5,
+            .max_multi = 8.0
+        },
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB, /* Machine has internal sound: Ensoniq ES1373 */
+        .ram = {
+            .min = 8192,
+            .max = 1572864,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = &es1373_onboard_device,
+        .net_device = NULL
+    },
+    /* Has the SiS (5)600 chipset with on-chip KBC. */
+    {
+        .name = "[SiS 5600] PC Chips M747",
+        .internal_name = "m747",
+        .type = MACHINE_TYPE_SLOT1,
+        .chipset = MACHINE_CHIPSET_SIS_5600,
+        .init = machine_at_m747_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SLOT1,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 66666667,
+            .max_bus = 100000000,
+            .min_voltage = 1300,
+            .max_voltage = 3500,
+            .min_multi = 1.5,
+            .max_multi = 8.0
+        },
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB, /* Machine has internal video: SiS 6326 and internal sound: C-Media CMI8330 */
+        .ram = {
+            .min = 8192,
+            .max = 1572864,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
         .net_device = NULL
     },
 
@@ -14065,7 +18193,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT1_2,
         .chipset = MACHINE_CHIPSET_INTEL_440GX,
         .init = machine_at_fw6400gx_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -14079,7 +18207,7 @@ const machine_t machines[] = {
             .min_multi = 3.0,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_NOISA,
+        .bus_flags = MACHINE_PS2_NOISA | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 16384,
@@ -14087,11 +18215,15 @@ const machine_t machines[] = {
             .step = 16384
         },
         .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x000044f0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -14101,6 +18233,51 @@ const machine_t machines[] = {
 
     /* Slot 1/Socket 370 machines */
     /* 440BX */
+    /* OEM version of ECS P6BXT-A+ REV 1.3x/2.2x. Has a Winbond W83977EF Super
+       I/O chip with on-chip KBC with AMIKey-2 KBC firmware.*/
+    {
+        .name = "[i440BX] Compaq ProSignia S316/318 (Intel)",
+        .internal_name = "prosignias31x_bx",
+        .type = MACHINE_TYPE_SLOT1_370,
+        .chipset = MACHINE_CHIPSET_VIA_APOLLO_PRO_133,
+        .init = machine_at_prosignias31x_bx_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SLOT1 | CPU_PKG_SOCKET370,
+            .block = CPU_BLOCK(CPU_PENTIUMPRO, CPU_CYRIX3S), /* Instability issues with PPro, and garbled text in POST with Cyrix */
+            .min_bus = 66666667,
+            .max_bus = 100000000,
+            .min_voltage = 1300,
+            .max_voltage = 3500,
+            .min_multi = 1.5,
+            .max_multi = 8.0
+        },
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .ram = {
+            .min = 8192,
+            .max = 786432,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = &cmi8738_onboard_device,
+        .net_device = NULL
+    },
     /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
     {
@@ -14109,7 +18286,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT1_370,
         .chipset = MACHINE_CHIPSET_INTEL_440BX,
         .init = machine_at_s1857_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -14123,23 +18300,27 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
             .max = 786432,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
-        .snd_device = &es1371_onboard_device,
+        .snd_device = &es1373_onboard_device,
         .net_device = NULL
     },
     /* VIA Apollo Pro */
@@ -14151,7 +18332,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT1_370,
         .chipset = MACHINE_CHIPSET_VIA_APOLLO_PRO_133,
         .init = machine_at_p6bat_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -14165,19 +18346,23 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
-            .max = 786432,
+            .max = 1572864,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -14195,7 +18380,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT2,
         .chipset = MACHINE_CHIPSET_INTEL_440GX,
         .init = machine_at_6gxu_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -14203,13 +18388,13 @@ const machine_t machines[] = {
             .package = CPU_PKG_SLOT2,
             .block = CPU_BLOCK_NONE,
             .min_bus = 100000000,
-            .max_bus = 133333333,
+            .max_bus = 100000000,
             .min_voltage = 1800,
             .max_voltage = 3500,
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, /* Machine has internal SCSI */
         .ram = {
             .min = 16384,
@@ -14217,11 +18402,15 @@ const machine_t machines[] = {
             .step = 16384
         },
         .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -14236,7 +18425,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SLOT2,
         .chipset = MACHINE_CHIPSET_INTEL_440GX,
         .init = machine_at_s2dge_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -14250,7 +18439,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 16384,
@@ -14258,11 +18447,15 @@ const machine_t machines[] = {
             .step = 16384
         },
         .nvrmask = 511,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -14280,7 +18473,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET370,
         .chipset = MACHINE_CHIPSET_INTEL_440LX,
         .init = machine_at_s370slm_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -14294,7 +18487,7 @@ const machine_t machines[] = {
             .min_multi = MACHINE_MULTIPLIER_FIXED,
             .max_multi = MACHINE_MULTIPLIER_FIXED,
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -14302,11 +18495,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -14323,7 +18520,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET370,
         .chipset = MACHINE_CHIPSET_INTEL_440BX,
         .init = machine_at_awo671r_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -14337,19 +18534,69 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0 /* limits assumed */
         },
-        .bus_flags = MACHINE_PS2_PCI, /* Machine has EISA, possibly for a riser? */
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, /* Machine has internal video: C&T B69000, sound: ESS ES1938S and NIC: Realtek RTL8139C */
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB, /* Machine has EISA, possibly for a riser? */
+                                                        /* Yes, that's a rise slot, not EISA. */
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB | MACHINE_VIDEO, /* Machine has internal video: C&T B69000, sound: ESS ES1938S and NIC: Realtek RTL8139C */
         .ram = {
             .min = 8192,
             .max = 524288,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = &chips_69000_onboard_device,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
+    /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
+       firmware. */
+    {
+        .name = "[i440BX] AmazePC AM-BX133",
+        .internal_name = "ambx133",
+        .type = MACHINE_TYPE_SOCKET370,
+        .chipset = MACHINE_CHIPSET_INTEL_440BX,
+        .init = machine_at_ambx133_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET370,
+            .block = CPU_BLOCK_NONE,
+            .min_bus = 66666667,
+            .max_bus = 133333333,
+            .min_voltage = 1300,
+            .max_voltage = 3500,
+            .min_multi = 1.5,
+            .max_multi = 8.0 /* limits assumed */
+        },
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .ram = {
+            .min = 8192,
+            .max = 786432,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -14364,7 +18611,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET370,
         .chipset = MACHINE_CHIPSET_INTEL_440BX,
         .init = machine_at_cubx_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -14378,60 +18625,23 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, /* Machine has quad channel IDE with internal controller: CMD PCI-0648 */
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_QUAD | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, /* Machine has quad channel IDE with internal controller: CMD PCI-0648 */
         .ram = {
             .min = 8192,
             .max = 1048576,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
-    /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
-       firmware. */
-    {
-        .name = "[i440BX] AmazePC AM-BX133",
-        .internal_name = "ambx133",
-        .type = MACHINE_TYPE_SOCKET370,
-        .chipset = MACHINE_CHIPSET_INTEL_440BX,
-        .init = machine_at_ambx133_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET370,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 66666667,
-            .max_bus = 133333333,
-            .min_voltage = 1300,
-            .max_voltage = 3500,
-            .min_multi = 1.5,
-            .max_multi = 8.0 /* limits assumed */
-        },
-        .bus_flags = MACHINE_PS2_AGP,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
-        .ram = {
-            .min = 8192,
-            .max = 786432,
-            .step = 8192
-        },
-        .nvrmask = 255,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -14448,7 +18658,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET370,
         .chipset = MACHINE_CHIPSET_INTEL_440ZX,
         .init = machine_at_63a1_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -14462,7 +18672,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -14470,11 +18680,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -14486,12 +18700,12 @@ const machine_t machines[] = {
     /* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
        firmware. */
     {
-        .name = "[SMSC VictoryBX-66] A-Trend ATC-7020BXII",
+        .name = "[SMSC VictoryBX-66] A-Trend ATC7020BXII",
         .internal_name = "atc7020bxii",
         .type = MACHINE_TYPE_SOCKET370,
         .chipset = MACHINE_CHIPSET_SMSC_VICTORYBX_66,
         .init = machine_at_atc7020bxii_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -14505,7 +18719,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -14513,11 +18727,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -14532,7 +18750,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET370,
         .chipset = MACHINE_CHIPSET_SMSC_VICTORYBX_66,
         .init = machine_at_m773_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -14546,7 +18764,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -14554,11 +18772,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -14575,7 +18797,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET370,
         .chipset = MACHINE_CHIPSET_VIA_APOLLO_PRO,
         .init = machine_at_apas3_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -14589,19 +18811,23 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
-        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, /* Machine has internal video: Creative Vibra 16XV */
         .ram = {
             .min = 8192,
             .max = 786432,
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -14616,7 +18842,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET370,
         .chipset = MACHINE_CHIPSET_VIA_APOLLO_PRO_133,
         .init = machine_at_p6bap_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -14630,7 +18856,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_AGP,
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB | MACHINE_SOUND,
         .ram = {
             .min = 8192,
@@ -14638,11 +18864,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -14657,7 +18887,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET370,
         .chipset = MACHINE_CHIPSET_VIA_APOLLO_PRO_133A,
         .init = machine_at_6via90ap_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -14671,7 +18901,7 @@ const machine_t machines[] = {
             .min_multi = MACHINE_MULTIPLIER_FIXED,
             .max_multi = MACHINE_MULTIPLIER_FIXED
         },
-        .bus_flags = MACHINE_PS2_A97,
+        .bus_flags = MACHINE_PS2_A97 | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_AG | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB,
         .ram = {
             .min = 16384,
@@ -14679,11 +18909,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -14698,7 +18932,7 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_SOCKET370,
         .chipset = MACHINE_CHIPSET_VIA_APOLLO_PRO_133A,
         .init = machine_at_cuv4xls_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
@@ -14712,7 +18946,7 @@ const machine_t machines[] = {
             .min_multi = 1.5,
             .max_multi = 8.0
         },
-        .bus_flags = MACHINE_PS2_NOI97, /* Has Asus-proprietary LAN/SCSI slot */
+        .bus_flags = MACHINE_PS2_NOI97 | MACHINE_BUS_USB, /* Has Asus-proprietary LAN/SCSI slot */
         .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB,
         .ram = {
             .min = 16384,
@@ -14720,17 +18954,67 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
         .snd_device = &cmi8738_onboard_device,
         .net_device = NULL
     },
+    /* SiS (5)600 */
+    /* Has the SiS 600 chipset, which is a re-brand of the 5600, with
+       on-chip KBC. */
+    {
+        .name = "[SiS 600] Soyo SY-7SBB",
+        .internal_name = "7sbb",
+        .type = MACHINE_TYPE_SOCKET370,
+        .chipset = MACHINE_CHIPSET_SIS_5600,
+        .init = machine_at_7sbb_init,
+        .p1_handler = machine_generic_p1_handler,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET370,
+            .block = CPU_BLOCK(CPU_CYRIX3S),
+            .min_bus = 60000000,
+            .max_bus = 100000000,
+            .min_voltage = 1800,
+            .max_voltage = 3500,
+            .min_multi = 1.5,
+            .max_multi = 8.0
+        },
+        .bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
+        .ram = {
+            .min = 8192,
+            .max = 1572864,
+            .step = 8192
+        },
+        .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device = NULL,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .kbd_device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
 
     /* Miscellaneous/Fake/Hypervisor machines */
     /* Has a Winbond W83977F Super I/O chip with on-chip KBC with AMIKey-2 KBC
@@ -14741,13 +19025,13 @@ const machine_t machines[] = {
         .type = MACHINE_TYPE_MISC,
         .chipset = MACHINE_CHIPSET_INTEL_440BX,
         .init = machine_at_vpc2007_init,
-        .p1_handler = NULL,
+        .p1_handler = machine_generic_p1_handler,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
         .gpio_acpi_handler = NULL,
         .cpu = {
             .package = CPU_PKG_SLOT1,
-            .block = CPU_BLOCK(CPU_PENTIUM2, CPU_CYRIX3S),
+            .block = CPU_BLOCK(CPU_PENTIUMPRO, CPU_PENTIUM2, CPU_CYRIX3S),
             .min_bus = 0,
             .max_bus = 66666667,
             .min_voltage = 0,
@@ -14755,7 +19039,7 @@ const machine_t machines[] = {
             .min_multi = 0,
             .max_multi = 0
         },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
         .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
         .ram = {
             .min = 8192,
@@ -14763,11 +19047,15 @@ const machine_t machines[] = {
             .step = 8192
         },
         .nvrmask = 255,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000cf0,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -14803,11 +19091,15 @@ const machine_t machines[] = {
             .step = 0
         },
         .nvrmask = 0,
+        .jumpered_ecp_dma = 0,
+        .default_jumpered_ecp_dma = -1,
         .kbc_device = NULL,
-        .kbc_p1 = 0xff,
+        .kbc_params = 0x00000000,
+        .kbc_p1 = 0x00000000,
         .gpio = 0xffffffff,
         .gpio_acpi = 0xffffffff,
         .device = NULL,
+        .kbd_device = NULL,
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
@@ -14817,10 +19109,14 @@ const machine_t machines[] = {
   // clang-format on
 };
 
+/* This is so Disabled comes first. */
+static const int   dma_mapping[9] = { DMA_NONE, DMA_DISABLED, 0, 1, 2, 3, 5, 6, 7 };
+static const char *dma_names[9]   = { "None", "Disabled", "0", "1", "2", "3", "5", "6", "7" };
+
 /* Saved copies - jumpers get applied to these.
    We use also machine_gpio to store IBM PC/XT jumpers as they need more than one byte. */
-static uint8_t machine_p1_default;
-static uint8_t machine_p1;
+static uint32_t machine_p1_default;
+static uint32_t machine_p1;
 
 static uint32_t machine_gpio_default;
 static uint32_t machine_gpio;
@@ -14828,6 +19124,8 @@ static uint32_t machine_gpio;
 static uint32_t machine_gpio_acpi_default;
 static uint32_t machine_gpio_acpi;
 
+static int      machine_is_ps2 = 0;
+
 void *machine_snd = NULL;
 
 uint8_t
@@ -14836,12 +19134,6 @@ machine_get_p1_default(void)
     return machine_p1_default;
 }
 
-uint8_t
-machine_get_p1(void)
-{
-    return machine_p1;
-}
-
 void
 machine_set_p1_default(uint8_t val)
 {
@@ -14861,18 +19153,29 @@ machine_and_p1(uint8_t val)
 }
 
 uint8_t
-machine_handle_p1(uint8_t write, uint8_t val)
+machine_generic_p1_handler(void)
 {
-    uint8_t ret = 0xff;
+    return video_is_mda() ? 0xf0 : 0xb0;
+}
+
+uint8_t
+machine_get_p1(uint8_t kbc_p1)
+{
+    uint8_t low_bits = ((machine_p1 >> 8) + 1) & 0x03;
+    uint8_t ret      = 0xff;
 
     if (machines[machine].p1_handler)
-        ret = machines[machine].p1_handler(write, val);
-    else {
-        if (write)
-            machine_p1 = machine_p1_default & val;
-        else
-            ret = machine_p1;
-    }
+        ret = machines[machine].p1_handler();
+
+    ret &= (machine_p1 & 0xff);
+
+    ret |= ((machine_p1 >> 8) & 0xff);
+
+    ret ^= ((machine_p1 >> 16) & 0xff);
+
+    ret &= kbc_p1;
+
+    machine_p1 = (machine_p1 & 0xfffffcff) | (low_bits << 8);
 
     return ret;
 }
@@ -15091,19 +19394,102 @@ machine_get_nvrmask(int m)
 int
 machine_has_flags(int m, int flags)
 {
-    return (machines[m].flags & flags);
+    int ret = machines[m].flags & flags;
+
+    /* Can't have PS/2 ports with an AT KBC. */
+    if ((flags & MACHINE_PS2_KBC) &&
+        (machines[m].bus_flags & MACHINE_BUS_PS2_PORTS))
+        ret |= MACHINE_PS2_KBC;
+
+    return ret;
+}
+
+void
+machine_set_ps2(void)
+{
+    if (machines[machine].bus_flags & MACHINE_BUS_PS2_PORTS)
+        machine_is_ps2 = 1;
+    else
+        machine_is_ps2 = 0;
+}
+
+void
+machine_force_ps2(int is_ps2)
+{
+    machine_is_ps2 = is_ps2;
+}
+
+int
+machine_has_flags_ex(int flags)
+{
+    int ret = machine_has_flags(machine, flags);
+
+    if (flags & MACHINE_PS2_KBC) {
+        if (machine_is_ps2)
+            ret |= MACHINE_PS2_KBC;
+        else
+            ret &= ~MACHINE_PS2_KBC;
+    }
+
+    return ret;
 }
 
 int
 machine_has_bus(int m, int bus_flags)
 {
-    return (machines[m].bus_flags & bus_flags);
+    int ret = machines[m].bus_flags & bus_flags;
+
+    /* TODO: Move the KBD flags to the machine table! */
+    if ((bus_flags & MACHINE_BUS_XT_KBD) &&
+        !(machines[m].bus_flags & MACHINE_BUS_ISA16) &&
+        (!(machines[m].bus_flags & MACHINE_BUS_PS2_PORTS) ||
+        !(strcmp(machine_get_internal_name(), "pc5086"))))
+        ret |= MACHINE_BUS_XT_KBD;
+
+#ifdef ONLY_AT_KBD_ON_AT_KBC
+    if ((bus_flags & MACHINE_BUS_AT_KBD) &&
+        (IS_AT(m)) &&
+        !(machines[m].bus_flags & MACHINE_BUS_PS2_PORTS))
+        ret |= MACHINE_BUS_AT_KBD;
+#else
+    if ((bus_flags & MACHINE_BUS_AT_KBD) && (IS_AT(m)))
+        ret |= MACHINE_BUS_AT_KBD;
+#endif
+
+    return ret;
 }
 
 int
 machine_has_cartridge(int m)
 {
-    return (machine_has_bus(m, MACHINE_CARTRIDGE) ? 1 : 0);
+    return (machine_has_flags(m, MACHINE_CARTRIDGE) ? 1 : 0);
+}
+
+int
+machine_has_jumpered_ecp_dma(int m, int dma)
+{
+    if (dma == DMA_ANY)
+        return !!(machines[m].jumpered_ecp_dma & MACHINE_DMA_JUMPERS_MASK);
+    else
+        return !!(machines[m].jumpered_ecp_dma & (1 << dma));
+}
+
+int
+machine_get_default_jumpered_ecp_dma(int m)
+{
+    return machines[m].default_jumpered_ecp_dma;
+}
+
+int
+machine_map_jumpered_ecp_dma(int dma)
+{
+    return dma_mapping[dma];
+}
+
+const char *
+machine_get_jumpered_ecp_dma_name(int dma)
+{
+    return dma_names[dma];
 }
 
 int
@@ -15134,6 +19520,12 @@ machine_get_type(int m)
     return (machines[m].type);
 }
 
+int
+machine_get_chipset(int m)
+{
+    return (machines[m].chipset);
+}
+
 int
 machine_get_machine_from_internal_name(const char *s)
 {
@@ -15159,3 +19551,26 @@ machine_is_sony(void)
 {
     return (!strcmp(machines[machine].internal_name, "pcv90"));
 }
+
+const char *
+machine_get_nvr_name_ex(int m)
+{
+    const char     *ret = machines[m].internal_name;
+    const device_t *dev = machine_get_device(m);
+
+    if (dev != NULL) {
+        device_context(dev);
+        const char *bios = device_get_config_string("bios");
+        if ((bios != NULL) && (strcmp(bios, "") != 0))
+            ret = bios;
+        device_context_restore();
+    }
+
+    return ret;
+}
+
+const char *
+machine_get_nvr_name(void)
+{
+    return machine_get_nvr_name_ex(machine);
+}
diff --git a/src/machine_status.c b/src/machine_status.c
index 65f4704b4..c1396975d 100644
--- a/src/machine_status.c
+++ b/src/machine_status.c
@@ -16,7 +16,7 @@
 #include <86box/cartridge.h>
 #include <86box/cassette.h>
 #include <86box/cdrom.h>
-#include <86box/zip.h>
+#include <86box/rdisk.h>
 #include <86box/mo.h>
 #include <86box/hdd.h>
 #include <86box/thread.h>
@@ -33,26 +33,28 @@ machine_status_init(void)
         machine_status.fdd[i].active = false;
     }
     for (size_t i = 0; i < CDROM_NUM; ++i) {
-        machine_status.cdrom[i].empty  = cdrom[i].host_drive != 200 || (strlen(cdrom[i].image_path) == 0);
+        machine_status.cdrom[i].empty  = (strlen(cdrom[i].image_path) == 0);
         machine_status.cdrom[i].active = false;
     }
-    for (size_t i = 0; i < ZIP_NUM; i++) {
-        machine_status.zip[i].empty  = (strlen(zip_drives[i].image_path) == 0);
-        machine_status.zip[i].active = false;
+    for (size_t i = 0; i < RDISK_NUM; i++) {
+        machine_status.rdisk[i].empty  = (strlen(rdisk_drives[i].image_path) == 0);
+        machine_status.rdisk[i].active = false;
     }
     for (size_t i = 0; i < MO_NUM; i++) {
         machine_status.mo[i].empty  = (strlen(mo_drives[i].image_path) == 0);
         machine_status.mo[i].active = false;
     }
 
+    for (size_t i = 0; i < 2; i++)
+        machine_status.cartridge[i].empty  = (strlen(cart_fns[i]) == 0);
+
     machine_status.cassette.empty = (strlen(cassette_fname) == 0);
 
-    for (size_t i = 0; i < HDD_BUS_USB; i++) {
+    for (size_t i = 0; i < HDD_BUS_USB; i++)
         machine_status.hdd[i].active = false;
-    }
 
     for (size_t i = 0; i < NET_CARD_MAX; i++) {
         machine_status.net[i].active = false;
         machine_status.net[i].empty  = !network_is_connected(i);
     }
-}
\ No newline at end of file
+}
diff --git a/src/mca.c b/src/mca.c
index 871060bb4..a14fea6fa 100644
--- a/src/mca.c
+++ b/src/mca.c
@@ -101,3 +101,19 @@ mca_add(uint8_t (*read)(int addr, void *priv), void (*write)(int addr, uint8_t v
         }
     }
 }
+
+void
+mca_add_to_slot(uint8_t (*read)(int addr, void* priv), void (*write)(int addr, uint8_t val, void* priv), uint8_t(*feedb)(void* priv), void (*reset)(void* priv), void* priv, int c)
+{
+    if (mca_card_read[c] || mca_card_write[c])
+    {
+        //pclog("cannot add the device to slot %d\n", num);
+        return;
+    }
+    mca_card_read[c] = read;
+    mca_card_write[c] = write;
+    mca_card_feedb[c] = feedb;
+    mca_card_reset[c] = reset;
+    mca_priv[c] = priv;
+    return;
+}
diff --git a/src/mem/CMakeLists.txt b/src/mem/CMakeLists.txt
index d3d5d1ce7..3984c2d02 100644
--- a/src/mem/CMakeLists.txt
+++ b/src/mem/CMakeLists.txt
@@ -9,9 +9,22 @@
 #          CMake build script.
 #
 # Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
 #
 #          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2024      Jasmine Iwanek.
 #
 
-add_library(mem OBJECT catalyst_flash.c i2c_eeprom.c intel_flash.c mem.c mmu_2386.c
-    rom.c row.c smram.c spd.c sst_flash.c)
+add_library(mem OBJECT
+    catalyst_flash.c
+    i2c_eeprom.c
+    intel_flash.c
+    mem.c
+    mmu_2386.c
+    nmc93cxx.c
+    rom.c
+    row.c
+    smram.c
+    spd.c
+    sst_flash.c
+)
diff --git a/src/mem/catalyst_flash.c b/src/mem/catalyst_flash.c
index 7cd40e9d7..5c8812464 100644
--- a/src/mem/catalyst_flash.c
+++ b/src/mem/catalyst_flash.c
@@ -29,6 +29,7 @@
 #include <86box/timer.h>
 #include <86box/nvr.h>
 #include <86box/plat.h>
+#include <86box/plat_fallthrough.h>
 
 #define FLAG_WORD    4
 #define FLAG_BXB     2
@@ -44,21 +45,22 @@ enum {
 };
 
 enum {
-    CMD_SET_READ       = 0x00,
-    CMD_READ_SIGNATURE = 0x90,
-    CMD_ERASE          = 0x20,
-    CMD_ERASE_CONFIRM  = 0x20,
-    CMD_ERASE_VERIFY   = 0xA0,
-    CMD_PROGRAM        = 0x40,
-    CMD_PROGRAM_VERIFY = 0xC0,
-    CMD_RESET          = 0xFF
+    CMD_SET_READ         = 0x00,
+    CMD_READ_AUTO_SELECT = 0x80,
+    CMD_READ_SIGNATURE   = 0x90,
+    CMD_ERASE            = 0x20,
+    CMD_ERASE_CONFIRM    = 0x20,
+    CMD_ERASE_VERIFY     = 0xA0,
+    CMD_PROGRAM          = 0x40,
+    CMD_PROGRAM_VERIFY   = 0xC0,
+    CMD_RESET            = 0xFF
 };
 
 typedef struct flash_t {
     uint8_t command;
+    uint8_t is_amd;
     uint8_t pad;
     uint8_t pad0;
-    uint8_t pad1;
     uint8_t *array;
 
     mem_mapping_t mapping;
@@ -83,11 +85,22 @@ flash_read(uint32_t addr, void *priv)
             ret = dev->array[addr];
             break;
 
+        case CMD_READ_AUTO_SELECT:
+            if (!dev->is_amd)
+                break;
+            fallthrough;
         case CMD_READ_SIGNATURE:
-            if (addr == 0x00000)
-                ret = 0x31; /* CATALYST */
-            else if (addr == 0x00001)
-                ret = 0xB4; /* 28F010 */
+            if (dev->is_amd) {
+                if (addr == 0x00000)
+                    ret = 0x01; /* AMD */
+                else if (addr == 0x00001)
+                    ret = 0xa7; /* Am28F010 */
+            } else {
+                if (addr == 0x00000)
+                    ret = 0x31; /* CATALYST */
+                else if (addr == 0x00001)
+                    ret = 0xb4; /* 28F010 */
+            }
             break;
 
         default:
@@ -192,10 +205,9 @@ catalyst_flash_init(UNUSED(const device_t *info))
     FILE    *fp;
     flash_t *dev;
 
-    dev = malloc(sizeof(flash_t));
-    memset(dev, 0, sizeof(flash_t));
+    dev = calloc(1, sizeof(flash_t));
 
-    sprintf(flash_path, "%s.bin", machine_get_internal_name_ex(machine));
+    sprintf(flash_path, "%s.bin", machine_get_nvr_name_ex(machine));
 
     mem_mapping_disable(&bios_mapping);
     mem_mapping_disable(&bios_high_mapping);
@@ -206,6 +218,7 @@ catalyst_flash_init(UNUSED(const device_t *info))
     catalyst_flash_add_mappings(dev);
 
     dev->command = CMD_RESET;
+    dev->is_amd  = info->local;
 
     fp = nvr_fopen(flash_path, "rb");
     if (fp) {
@@ -240,7 +253,21 @@ const device_t catalyst_flash_device = {
     .init          = catalyst_flash_init,
     .close         = catalyst_flash_close,
     .reset         = catalyst_flash_reset,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t amd_am28f010_flash_device = {
+    .name          = "AMD Am28F010-D Flash BIOS",
+    .internal_name = "amd_am28f010_flash",
+    .flags         = DEVICE_PCI,
+    .local         = 1,
+    .init          = catalyst_flash_init,
+    .close         = catalyst_flash_close,
+    .reset         = catalyst_flash_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/mem/i2c_eeprom.c b/src/mem/i2c_eeprom.c
index 8e4a6cc14..a8ae7ed04 100644
--- a/src/mem/i2c_eeprom.c
+++ b/src/mem/i2c_eeprom.c
@@ -128,8 +128,7 @@ log2i(uint32_t i)
 void *
 i2c_eeprom_init(void *i2c, uint8_t addr, uint8_t *data, uint32_t size, uint8_t writable)
 {
-    i2c_eeprom_t *dev = (i2c_eeprom_t *) malloc(sizeof(i2c_eeprom_t));
-    memset(dev, 0, sizeof(i2c_eeprom_t));
+    i2c_eeprom_t *dev = (i2c_eeprom_t *) calloc(1, sizeof(i2c_eeprom_t));
 
     /* Round size up to the next power of 2. */
     uint32_t pow_size = 1 << log2i(size);
diff --git a/src/mem/intel_flash.c b/src/mem/intel_flash.c
index 7949f302a..e193f3545 100644
--- a/src/mem/intel_flash.c
+++ b/src/mem/intel_flash.c
@@ -351,10 +351,9 @@ intel_flash_init(const device_t *info)
     flash_t *dev;
     uint8_t  type = info->local & 0xff;
 
-    dev = malloc(sizeof(flash_t));
-    memset(dev, 0, sizeof(flash_t));
+    dev = calloc(1, sizeof(flash_t));
 
-    sprintf(flash_path, "%s.bin", machine_get_internal_name_ex(machine));
+    sprintf(flash_path, "%s.bin", machine_get_nvr_name_ex(machine));
 
     dev->flags = info->local & 0xff;
 
@@ -564,7 +563,7 @@ const device_t intel_flash_bxt_ami_device = {
     .init          = intel_flash_init,
     .close         = intel_flash_close,
     .reset         = intel_flash_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -578,7 +577,7 @@ const device_t intel_flash_bxt_device = {
     .init          = intel_flash_init,
     .close         = intel_flash_close,
     .reset         = intel_flash_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -592,7 +591,7 @@ const device_t intel_flash_bxb_device = {
     .init          = intel_flash_init,
     .close         = intel_flash_close,
     .reset         = intel_flash_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/mem/mem.c b/src/mem/mem.c
index 188aa49d0..a544f333c 100644
--- a/src/mem/mem.c
+++ b/src/mem/mem.c
@@ -67,7 +67,9 @@ mem_mapping_t bios_mapping;
 mem_mapping_t bios_high_mapping;
 
 page_t  *pages;       /* RAM page table */
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
 page_t **page_lookup; /* pagetable lookup */
+#endif
 uint32_t pages_sz;    /* #pages in table */
 
 uint8_t *ram;  /* the virtual RAM */
@@ -85,12 +87,23 @@ uint8_t *pccache2;
 
 int        readlnext;
 int        readlookup[256];
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
 uintptr_t *readlookup2;
+#endif
 uintptr_t  old_rl2;
 uint8_t    uncached = 0;
 int        writelnext;
 int        writelookup[256];
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
 uintptr_t *writelookup2;
+#endif
+
+#if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
+/* The lookup tables. */
+page_t *page_lookup[1048576] = { 0 };
+uintptr_t readlookup2[1048576] = { 0 };
+uintptr_t writelookup2[1048576] = { 0 };
+#endif
 
 uint32_t mem_logical_addr;
 
@@ -108,7 +121,6 @@ int mem_a20_alt   = 0;
 int mem_a20_state = 0;
 
 int mmuflush = 0;
-int mmu_perm = 4;
 
 #ifdef USE_NEW_DYNAREC
 uint64_t *byte_dirty_mask;
@@ -123,15 +135,12 @@ uint8_t high_page = 0; /* if a high (> 4 gb) page was detected */
 mem_mapping_t        *read_mapping[MEM_MAPPINGS_NO];
 mem_mapping_t        *write_mapping[MEM_MAPPINGS_NO];
 
-/* FIXME: re-do this with a 'mem_ops' struct. */
-static uint8_t       *page_lookupp; /* pagetable mmu_perm lookup */
-static uint8_t       *readlookupp;
-static uint8_t       *writelookupp;
+uint8_t              *_mem_exec[MEM_MAPPINGS_NO];
+
 static mem_mapping_t *base_mapping;
 static mem_mapping_t *last_mapping;
 static mem_mapping_t *read_mapping_bus[MEM_MAPPINGS_NO];
 static mem_mapping_t *write_mapping_bus[MEM_MAPPINGS_NO];
-static uint8_t       *_mem_exec[MEM_MAPPINGS_NO];
 static uint8_t       _mem_wp[MEM_MAPPINGS_NO];
 static uint8_t       _mem_wp_bus[MEM_MAPPINGS_NO];
 static uint8_t        ff_pccache[4] = { 0xff, 0xff, 0xff, 0xff };
@@ -186,10 +195,8 @@ resetreadlookup(void)
 
     /* Initialize the tables for high (> 1024K) RAM. */
     memset(readlookup2, 0xff, (1 << 20) * sizeof(uintptr_t));
-    memset(readlookupp, 0x04, (1 << 20) * sizeof(uint8_t));
 
     memset(writelookup2, 0xff, (1 << 20) * sizeof(uintptr_t));
-    memset(writelookupp, 0x04, (1 << 20) * sizeof(uint8_t));
 
     readlnext  = 0;
     writelnext = 0;
@@ -203,14 +210,11 @@ flushmmucache(void)
     for (uint16_t c = 0; c < 256; c++) {
         if (readlookup[c] != (int) 0xffffffff) {
             readlookup2[readlookup[c]] = LOOKUP_INV;
-            readlookupp[readlookup[c]] = 4;
             readlookup[c]              = 0xffffffff;
         }
         if (writelookup[c] != (int) 0xffffffff) {
             page_lookup[writelookup[c]]  = NULL;
-            page_lookupp[writelookup[c]] = 4;
             writelookup2[writelookup[c]] = LOOKUP_INV;
-            writelookupp[writelookup[c]] = 4;
             writelookup[c]               = 0xffffffff;
         }
     }
@@ -224,20 +228,43 @@ flushmmucache(void)
 #endif
 }
 
+void
+flushmmucache_write(void)
+{
+    for (uint16_t c = 0; c < 256; c++) {
+        if (writelookup[c] != (int) 0xffffffff) {
+            page_lookup[writelookup[c]]  = NULL;
+            writelookup2[writelookup[c]] = LOOKUP_INV;
+            writelookup[c]               = 0xffffffff;
+        }
+    }
+    mmuflush++;
+}
+
+void
+flushmmucache_pc(void)
+{
+    mmuflush++;
+
+    pccache  = (uint32_t) 0xffffffff;
+    pccache2 = (uint8_t *) 0xffffffff;
+
+#ifdef USE_DYNAREC
+    codegen_flush();
+#endif
+}
+
 void
 flushmmucache_nopc(void)
 {
     for (uint16_t c = 0; c < 256; c++) {
         if (readlookup[c] != (int) 0xffffffff) {
             readlookup2[readlookup[c]] = LOOKUP_INV;
-            readlookupp[readlookup[c]] = 4;
             readlookup[c]              = 0xffffffff;
         }
         if (writelookup[c] != (int) 0xffffffff) {
             page_lookup[writelookup[c]]  = NULL;
-            page_lookupp[writelookup[c]] = 4;
             writelookup2[writelookup[c]] = LOOKUP_INV;
-            writelookupp[writelookup[c]] = 4;
             writelookup[c]               = 0xffffffff;
         }
     }
@@ -306,7 +333,7 @@ mmutranslatereal_normal(uint32_t addr, int rw)
 
     if ((temp & 0x80) && (cr4 & CR4_PSE)) {
         /*4MB page*/
-        if (((CPL == 3) && !(temp & 4) && !cpl_override) || (rw && !(temp & 2) && (((CPL == 3) && !cpl_override) || ((is486 || isibm486) && (cr0 & WP_FLAG))))) {
+        if (((CPL == 3) && !(temp & 4) && !cpl_override) || (rw && !cpl_override && !(temp & 2) && (((CPL == 3) && !cpl_override) || ((is486 || isibm486) && (cr0 & WP_FLAG))))) {
             cr2 = addr;
             temp &= 1;
             if (CPL == 3)
@@ -319,15 +346,17 @@ mmutranslatereal_normal(uint32_t addr, int rw)
             return 0xffffffffffffffffULL;
         }
 
-        mmu_perm = temp & 4;
         rammap(addr2) |= (rw ? 0x60 : 0x20);
 
-        return (temp & ~0x3fffff) + (addr & 0x3fffff);
+        uint64_t page = temp & ~0x3fffff;
+        if (cpu_features & CPU_FEATURE_PSE36)
+            page |= (uint64_t) (temp & 0x1e000) << 19;
+        return page + (addr & 0x3fffff);
     }
 
     temp  = rammap((temp & ~0xfff) + ((addr >> 10) & 0xffc));
     temp3 = temp & temp2;
-    if (!(temp & 1) || ((CPL == 3) && !(temp3 & 4) && !cpl_override) || (rw && !(temp3 & 2) && (((CPL == 3) && !cpl_override) || ((is486 || isibm486) && (cr0 & WP_FLAG))))) {
+    if (!(temp & 1) || ((CPL == 3) && !(temp3 & 4) && !cpl_override) || (rw && !cpl_override && !(temp3 & 2) && (((CPL == 3) && !cpl_override) || ((is486 || isibm486) && (cr0 & WP_FLAG))))) {
         cr2 = addr;
         temp &= 1;
         if (CPL == 3)
@@ -339,7 +368,6 @@ mmutranslatereal_normal(uint32_t addr, int rw)
         return 0xffffffffffffffffULL;
     }
 
-    mmu_perm = temp & 4;
     rammap(addr2) |= 0x20;
     rammap((temp2 & ~0xfff) + ((addr >> 10) & 0xffc)) |= (rw ? 0x60 : 0x20);
 
@@ -391,7 +419,7 @@ mmutranslatereal_pae(uint32_t addr, int rw)
 
     if (temp & 0x80) {
         /*2MB page*/
-        if (((CPL == 3) && !(temp & 4) && !cpl_override) || (rw && !(temp & 2) && (((CPL == 3) && !cpl_override) || (cr0 & WP_FLAG)))) {
+        if (((CPL == 3) && !(temp & 4) && !cpl_override) || (rw && !cpl_override && !(temp & 2) && (((CPL == 3) && !cpl_override) || (cr0 & WP_FLAG)))) {
             cr2 = addr;
             temp &= 1;
             if (CPL == 3)
@@ -403,7 +431,6 @@ mmutranslatereal_pae(uint32_t addr, int rw)
 
             return 0xffffffffffffffffULL;
         }
-        mmu_perm = temp & 4;
         rammap64(addr3) |= (rw ? 0x60 : 0x20);
 
         return ((temp & ~0x1fffffULL) + (addr & 0x1fffffULL)) & 0x000000ffffffffffULL;
@@ -412,7 +439,7 @@ mmutranslatereal_pae(uint32_t addr, int rw)
     addr4 = (temp & ~0xfffULL) + ((addr >> 9) & 0xff8);
     temp  = rammap64(addr4) & 0x000000ffffffffffULL;
     temp3 = temp & temp4;
-    if (!(temp & 1) || ((CPL == 3) && !(temp3 & 4) && !cpl_override) || (rw && !(temp3 & 2) && (((CPL == 3) && !cpl_override) || (cr0 & WP_FLAG)))) {
+    if (!(temp & 1) || ((CPL == 3) && !(temp3 & 4) && !cpl_override) || (rw && !cpl_override && !(temp3 & 2) && (((CPL == 3) && !cpl_override) || (cr0 & WP_FLAG)))) {
         cr2 = addr;
         temp &= 1;
         if (CPL == 3)
@@ -424,7 +451,6 @@ mmutranslatereal_pae(uint32_t addr, int rw)
         return 0xffffffffffffffffULL;
     }
 
-    mmu_perm = temp & 4;
     rammap64(addr3) |= 0x20;
     rammap64(addr4) |= (rw ? 0x60 : 0x20);
 
@@ -474,16 +500,19 @@ mmutranslate_noabrt_normal(uint32_t addr, int rw)
 
     if ((temp & 0x80) && (cr4 & CR4_PSE)) {
         /*4MB page*/
-        if (((CPL == 3) && !(temp & 4) && !cpl_override) || (rw && !(temp & 2) && ((CPL == 3) || (cr0 & WP_FLAG))))
+        if (((CPL == 3) && !(temp & 4) && !cpl_override) || (rw && !cpl_override && !(temp & 2) && ((CPL == 3) || (cr0 & WP_FLAG))))
             return 0xffffffffffffffffULL;
 
-        return (temp & ~0x3fffff) + (addr & 0x3fffff);
+        uint64_t page = temp & ~0x3fffff;
+        if (cpu_features & CPU_FEATURE_PSE36)
+            page |= (uint64_t) (temp & 0x1e000) << 19;
+        return page + (addr & 0x3fffff);
     }
 
     temp  = rammap((temp & ~0xfff) + ((addr >> 10) & 0xffc));
     temp3 = temp & temp2;
 
-    if (!(temp & 1) || ((CPL == 3) && !(temp3 & 4) && !cpl_override) || (rw && !(temp3 & 2) && ((CPL == 3) || (cr0 & WP_FLAG))))
+    if (!(temp & 1) || ((CPL == 3) && !(temp3 & 4) && !cpl_override) || (rw && !cpl_override && !(temp3 & 2) && ((CPL == 3) || (cr0 & WP_FLAG))))
         return 0xffffffffffffffffULL;
 
     return (uint64_t) ((temp & ~0xfff) + (addr & 0xfff));
@@ -518,7 +547,7 @@ mmutranslate_noabrt_pae(uint32_t addr, int rw)
 
     if (temp & 0x80) {
         /*2MB page*/
-        if (((CPL == 3) && !(temp & 4) && !cpl_override) || (rw && !(temp & 2) && ((CPL == 3) || (cr0 & WP_FLAG))))
+        if (((CPL == 3) && !(temp & 4) && !cpl_override) || (rw && !cpl_override && !(temp & 2) && ((CPL == 3) || (cr0 & WP_FLAG))))
             return 0xffffffffffffffffULL;
 
         return ((temp & ~0x1fffffULL) + (addr & 0x1fffff)) & 0x000000ffffffffffULL;
@@ -529,7 +558,7 @@ mmutranslate_noabrt_pae(uint32_t addr, int rw)
 
     temp3 = temp & temp4;
 
-    if (!(temp & 1) || ((CPL == 3) && !(temp3 & 4) && !cpl_override) || (rw && !(temp3 & 2) && ((CPL == 3) || (cr0 & WP_FLAG))))
+    if (!(temp & 1) || ((CPL == 3) && !(temp3 & 4) && !cpl_override) || (rw && !cpl_override && !(temp3 & 2) && ((CPL == 3) || (cr0 & WP_FLAG))))
         return 0xffffffffffffffffULL;
 
     return ((temp & ~0xfffULL) + ((uint64_t) (addr & 0xfff))) & 0x000000ffffffffffULL;
@@ -596,7 +625,6 @@ addreadlookup(uint32_t virt, uint32_t phys)
     else
         readlookup2[virt >> 12] = (uintptr_t) &ram[a];
 #endif
-    readlookupp[virt >> 12] = mmu_perm;
 
     readlookup[readlnext++] = virt >> 12;
     readlnext &= (cachesize - 1);
@@ -636,7 +664,6 @@ addwritelookup(uint32_t virt, uint32_t phys)
 #    endif
 #endif
         page_lookup[virt >> 12]  = &pages[phys >> 12];
-        page_lookupp[virt >> 12] = mmu_perm;
     } else {
 #if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
         writelookup2[virt >> 12] = (uintptr_t) &ram[(uintptr_t) (phys & ~0xFFF) - (uintptr_t) (virt & ~0xfff)];
@@ -649,7 +676,6 @@ addwritelookup(uint32_t virt, uint32_t phys)
             writelookup2[virt >> 12] = (uintptr_t) &ram[a];
 #endif
     }
-    writelookupp[virt >> 12] = mmu_perm;
 
     writelookup[writelnext++] = virt >> 12;
     writelnext &= (cachesize - 1);
@@ -792,6 +818,9 @@ readmembl(uint32_t addr)
     uint64_t       a;
 
     GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 1);
+#ifdef USE_DEBUG_REGS_486
+    mem_debug_check_addr(addr, read_type);
+#endif
 
     addr64           = (uint64_t) addr;
     mem_logical_addr = addr;
@@ -821,6 +850,9 @@ writemembl(uint32_t addr, uint8_t val)
     uint64_t       a;
 
     GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_WRITE, 1);
+#ifdef USE_DEBUG_REGS_486
+    mem_debug_check_addr(addr, 2);
+#endif
 
     addr64           = (uint64_t) addr;
     mem_logical_addr = addr;
@@ -907,6 +939,10 @@ readmemwl(uint32_t addr)
 
     addr64a[0] = addr;
     addr64a[1] = addr + 1;
+#ifdef USE_DEBUG_REGS_486
+    mem_debug_check_addr(addr, read_type);
+    mem_debug_check_addr(addr + 1, read_type);
+#endif
     GDBSTUB_MEM_ACCESS_FAST(addr64a, GDBSTUB_MEM_READ, 2);
 
     mem_logical_addr = addr;
@@ -928,10 +964,8 @@ readmemwl(uint32_t addr)
             }
 
             return readmembl_no_mmut(addr, addr64a[0]) | (((uint16_t) readmembl_no_mmut(addr + 1, addr64a[1])) << 8);
-        } else if (readlookup2[addr >> 12] != (uintptr_t) LOOKUP_INV) {
-            mmu_perm = readlookupp[addr >> 12];
+        } else if (readlookup2[addr >> 12] != (uintptr_t) LOOKUP_INV)
             return *(uint16_t *) (readlookup2[addr >> 12] + addr);
-        }
     }
 
     if (cr0 >> 31) {
@@ -965,6 +999,10 @@ writememwl(uint32_t addr, uint16_t val)
 
     addr64a[0] = addr;
     addr64a[1] = addr + 1;
+#ifdef USE_DEBUG_REGS_486
+    mem_debug_check_addr(addr, 2);
+    mem_debug_check_addr(addr + 1, 2);
+#endif
     GDBSTUB_MEM_ACCESS_FAST(addr64a, GDBSTUB_MEM_WRITE, 2);
 
     mem_logical_addr = addr;
@@ -995,7 +1033,6 @@ writememwl(uint32_t addr, uint16_t val)
             writemembl_no_mmut(addr + 1, addr64a[1], val >> 8);
             return;
         } else if (writelookup2[addr >> 12] != (uintptr_t) LOOKUP_INV) {
-            mmu_perm                                        = writelookupp[addr >> 12];
             *(uint16_t *) (writelookup2[addr >> 12] + addr) = val;
             return;
         }
@@ -1003,7 +1040,6 @@ writememwl(uint32_t addr, uint16_t val)
 
     if (page_lookup[addr >> 12] && page_lookup[addr >> 12]->write_w) {
         page_lookup[addr >> 12]->write_w(addr, val, page_lookup[addr >> 12]);
-        mmu_perm = page_lookupp[addr >> 12];
         return;
     }
 
@@ -1051,10 +1087,8 @@ readmemwl_no_mmut(uint32_t addr, uint32_t *a64)
             }
 
             return readmembl_no_mmut(addr, a64[0]) | (((uint16_t) readmembl_no_mmut(addr + 1, a64[1])) << 8);
-        } else if (readlookup2[addr >> 12] != (uintptr_t) LOOKUP_INV) {
-            mmu_perm = readlookupp[addr >> 12];
+        } else if (readlookup2[addr >> 12] != (uintptr_t) LOOKUP_INV)
             return *(uint16_t *) (readlookup2[addr >> 12] + addr);
-        }
     }
 
     if (cr0 >> 31) {
@@ -1100,14 +1134,12 @@ writememwl_no_mmut(uint32_t addr, uint32_t *a64, uint16_t val)
             writemembl_no_mmut(addr + 1, a64[1], val >> 8);
             return;
         } else if (writelookup2[addr >> 12] != (uintptr_t) LOOKUP_INV) {
-            mmu_perm                                        = writelookupp[addr >> 12];
             *(uint16_t *) (writelookup2[addr >> 12] + addr) = val;
             return;
         }
     }
 
     if (page_lookup[addr >> 12] && page_lookup[addr >> 12]->write_w) {
-        mmu_perm = page_lookupp[addr >> 12];
         page_lookup[addr >> 12]->write_w(addr, val, page_lookup[addr >> 12]);
         return;
     }
@@ -1141,8 +1173,12 @@ readmemll(uint32_t addr)
     int            i;
     uint64_t       a = 0x0000000000000000ULL;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < 4; i++) {
         addr64a[i] = (uint64_t) (addr + i);
+#ifdef USE_DEBUG_REGS_486
+        mem_debug_check_addr(addr + i, read_type);
+#endif
+    }
     GDBSTUB_MEM_ACCESS_FAST(addr64a, GDBSTUB_MEM_READ, 4);
 
     mem_logical_addr = addr;
@@ -1178,10 +1214,8 @@ readmemll(uint32_t addr)
             /* No need to waste precious CPU host cycles on mmutranslate's that were already done, just pass
                their result as a parameter to be used if needed. */
             return readmemwl_no_mmut(addr, addr64a) | (((uint32_t) readmemwl_no_mmut(addr + 2, &(addr64a[2]))) << 16);
-        } else if (readlookup2[addr >> 12] != (uintptr_t) LOOKUP_INV) {
-            mmu_perm = readlookupp[addr >> 12];
+        } else if (readlookup2[addr >> 12] != (uintptr_t) LOOKUP_INV)
             return *(uint32_t *) (readlookup2[addr >> 12] + addr);
-        }
     }
 
     if (cr0 >> 31) {
@@ -1215,8 +1249,12 @@ writememll(uint32_t addr, uint32_t val)
     int            i;
     uint64_t       a = 0x0000000000000000ULL;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < 4; i++) {
         addr64a[i] = (uint64_t) (addr + i);
+#ifdef USE_DEBUG_REGS_486
+        mem_debug_check_addr(addr + i, 2);
+#endif
+    }
     GDBSTUB_MEM_ACCESS_FAST(addr64a, GDBSTUB_MEM_WRITE, 4);
 
     mem_logical_addr = addr;
@@ -1259,14 +1297,12 @@ writememll(uint32_t addr, uint32_t val)
             writememwl_no_mmut(addr + 2, &(addr64a[2]), val >> 16);
             return;
         } else if (writelookup2[addr >> 12] != (uintptr_t) LOOKUP_INV) {
-            mmu_perm                                        = writelookupp[addr >> 12];
             *(uint32_t *) (writelookup2[addr >> 12] + addr) = val;
             return;
         }
     }
 
     if (page_lookup[addr >> 12] && page_lookup[addr >> 12]->write_l) {
-        mmu_perm = page_lookupp[addr >> 12];
         page_lookup[addr >> 12]->write_l(addr, val, page_lookup[addr >> 12]);
         return;
     }
@@ -1321,10 +1357,8 @@ readmemll_no_mmut(uint32_t addr, uint32_t *a64)
             }
 
             return readmemwl_no_mmut(addr, a64) | ((uint32_t) (readmemwl_no_mmut(addr + 2, &(a64[2]))) << 16);
-        } else if (readlookup2[addr >> 12] != (uintptr_t) LOOKUP_INV) {
-            mmu_perm = readlookupp[addr >> 12];
+        } else if (readlookup2[addr >> 12] != (uintptr_t) LOOKUP_INV)
             return *(uint32_t *) (readlookup2[addr >> 12] + addr);
-        }
     }
 
     if (cr0 >> 31) {
@@ -1372,14 +1406,12 @@ writememll_no_mmut(uint32_t addr, uint32_t *a64, uint32_t val)
             writememwl_no_mmut(addr + 2, &(a64[2]), val >> 16);
             return;
         } else if (writelookup2[addr >> 12] != (uintptr_t) LOOKUP_INV) {
-            mmu_perm                                        = writelookupp[addr >> 12];
             *(uint32_t *) (writelookup2[addr >> 12] + addr) = val;
             return;
         }
     }
 
     if (page_lookup[addr >> 12] && page_lookup[addr >> 12]->write_l) {
-        mmu_perm = page_lookupp[addr >> 12];
         page_lookup[addr >> 12]->write_l(addr, val, page_lookup[addr >> 12]);
         return;
     }
@@ -1419,8 +1451,12 @@ readmemql(uint32_t addr)
     int            i;
     uint64_t       a = 0x0000000000000000ULL;
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < 8; i++) {
         addr64a[i] = (uint64_t) (addr + i);
+#ifdef USE_DEBUG_REGS_486
+        mem_debug_check_addr(addr + i, read_type);
+#endif
+    }
     GDBSTUB_MEM_ACCESS_FAST(addr64a, GDBSTUB_MEM_READ, 8);
 
     mem_logical_addr = addr;
@@ -1455,10 +1491,8 @@ readmemql(uint32_t addr)
             /* No need to waste precious CPU host cycles on mmutranslate's that were already done, just pass
                their result as a parameter to be used if needed. */
             return readmemll_no_mmut(addr, addr64a) | (((uint64_t) readmemll_no_mmut(addr + 4, &(addr64a[4]))) << 32);
-        } else if (readlookup2[addr >> 12] != (uintptr_t) LOOKUP_INV) {
-            mmu_perm = readlookupp[addr >> 12];
+        } else if (readlookup2[addr >> 12] != (uintptr_t) LOOKUP_INV)
             return *(uint64_t *) (readlookup2[addr >> 12] + addr);
-        }
     }
 
     if (cr0 >> 31) {
@@ -1472,10 +1506,28 @@ readmemql(uint32_t addr)
     addr = addr64a[0] & rammask;
 
     map = read_mapping[addr >> MEM_GRANULARITY_BITS];
-    if (map && map->read_l)
-        return map->read_l(addr, map->priv) | ((uint64_t) map->read_l(addr + 4, map->priv) << 32);
 
-    return readmemll(addr) | ((uint64_t) readmemll(addr + 4) << 32);
+    if (map && map->read_l)
+        return map->read_l(addr, map->priv) |
+               ((uint64_t) map->read_l(addr + 4, map->priv) << 32);
+
+    if (map && map->read_w)
+        return map->read_w(addr, map->priv) |
+               ((uint64_t) map->read_w(addr + 2, map->priv) << 16) |
+               ((uint64_t) map->read_w(addr + 4, map->priv) << 32) |
+               ((uint64_t) map->read_w(addr + 6, map->priv) << 48);
+
+    if (map && map->read_b)
+        return map->read_b(addr, map->priv) |
+               ((uint64_t) map->read_b(addr + 1, map->priv) << 8) |
+               ((uint64_t) map->read_b(addr + 2, map->priv) << 16) |
+               ((uint64_t) map->read_b(addr + 3, map->priv) << 24) |
+               ((uint64_t) map->read_b(addr + 4, map->priv) << 32) |
+               ((uint64_t) map->read_b(addr + 5, map->priv) << 40) |
+               ((uint64_t) map->read_b(addr + 6, map->priv) << 48) |
+               ((uint64_t) map->read_b(addr + 7, map->priv) << 56);
+
+    return 0xffffffffffffffffULL;
 }
 
 void
@@ -1485,8 +1537,12 @@ writememql(uint32_t addr, uint64_t val)
     int            i;
     uint64_t       a = 0x0000000000000000ULL;
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < 8; i++) {
         addr64a[i] = (uint64_t) (addr + i);
+#ifdef USE_DEBUG_REGS_486
+        mem_debug_check_addr(addr + i, 2);
+#endif
+    }
     GDBSTUB_MEM_ACCESS_FAST(addr64a, GDBSTUB_MEM_WRITE, 8);
 
     mem_logical_addr = addr;
@@ -1528,14 +1584,12 @@ writememql(uint32_t addr, uint64_t val)
             writememll_no_mmut(addr + 4, &(addr64a[4]), val >> 32);
             return;
         } else if (writelookup2[addr >> 12] != (uintptr_t) LOOKUP_INV) {
-            mmu_perm                                        = writelookupp[addr >> 12];
             *(uint64_t *) (writelookup2[addr >> 12] + addr) = val;
             return;
         }
     }
 
     if (page_lookup[addr >> 12] && page_lookup[addr >> 12]->write_l) {
-        mmu_perm = page_lookupp[addr >> 12];
         page_lookup[addr >> 12]->write_l(addr, val, page_lookup[addr >> 12]);
         page_lookup[addr >> 12]->write_l(addr + 4, val >> 32, page_lookup[addr >> 12]);
         return;
@@ -1583,7 +1637,9 @@ do_mmutranslate(uint32_t addr, uint32_t *a64, int num, int write)
     int      cond = 1;
     uint32_t last_addr = addr + (num - 1);
     uint64_t a         = 0x0000000000000000ULL;
-
+#ifdef USE_DEBUG_REGS_486
+    mem_debug_check_addr(addr, write ? 2 : read_type);
+#endif
     for (i = 0; i < num; i++)
         a64[i] = (uint64_t) addr;
 
@@ -1617,8 +1673,7 @@ do_mmutranslate(uint32_t addr, uint32_t *a64, int num, int write)
                 a      = (a & 0xfffffffffffff000ULL) | ((uint64_t) (addr & 0xfff));
                 a64[i] = (uint32_t) a;
             }
-        } else
-            mmu_perm = page_lookupp[addr >> 12];
+        }
 
         addr++;
     }
@@ -1785,6 +1840,9 @@ mem_read_ram(uint32_t addr, UNUSED(void *priv))
         mem_log("Read  B       %02X from %08X\n", ram[addr], addr);
 #endif
 
+    if (is_pcjr)
+        pcjr_waitstates(NULL);
+
     if (cpu_use_exec)
         addreadlookup(mem_logical_addr, addr);
 
@@ -2045,6 +2103,9 @@ mem_write_ram(uint32_t addr, uint8_t val, UNUSED(void *priv))
     if ((addr >= 0xa0000) && (addr <= 0xbffff))
         mem_log("Write B       %02X to   %08X\n", val, addr);
 #endif
+    if (is_pcjr)
+        pcjr_waitstates(NULL);
+
     if (cpu_use_exec) {
         addwritelookup(mem_logical_addr, addr);
         mem_write_ramb_page(addr, val, &pages[addr >> 12]);
@@ -2305,41 +2366,47 @@ mem_mapping_recalc(uint64_t base, uint64_t size)
         /* In range? */
         if (map->enable && (uint64_t) map->base < ((uint64_t) base + (uint64_t) size) &&
             ((uint64_t) map->base + (uint64_t) map->size) > (uint64_t) base) {
+            uint64_t i_a   = ((~map->base_ignore) & 0xffffffffULL) + 0x00000001ULL;
+            uint64_t i_s   = 0x00000000ULL;
+            uint64_t i_e   = map->base_ignore;
+            uint64_t i_c   = 0x00000000ULL;
             uint64_t start = (map->base < base) ? map->base : base;
             uint64_t end   = (((uint64_t) map->base + (uint64_t) map->size) < (base + size)) ?
                              ((uint64_t) map->base + (uint64_t) map->size) : (base + size);
             if (start < map->base)
                 start = map->base;
 
-            for (c = start; c < end; c += MEM_GRANULARITY_SIZE) {
-                /* CPU */
-                n = !!in_smm;
-                wp = _mem_wp[c >> MEM_GRANULARITY_BITS];
+            for (i_c = i_s; i_c <= i_e; i_c += i_a) {
+                for (c = (start + i_c); c < (end + i_c); c += MEM_GRANULARITY_SIZE) {
+                    /* CPU */
+                    n = (!!in_smm) || (is_cxsmm && (ccr1 & CCR1_SMAC));
+                    wp = _mem_wp[c >> MEM_GRANULARITY_BITS];
 
-                if (map->exec && mem_mapping_access_allowed(map->flags,
-                                 _mem_state[c >> MEM_GRANULARITY_BITS].states[n].x))
-                    _mem_exec[c >> MEM_GRANULARITY_BITS] = map->exec + (c - map->base);
-                if (!wp && (map->write_b || map->write_w || map->write_l) &&
-                    mem_mapping_access_allowed(map->flags,
-                                               _mem_state[c >> MEM_GRANULARITY_BITS].states[n].w))
-                    write_mapping[c >> MEM_GRANULARITY_BITS] = map;
-                if ((map->read_b || map->read_w || map->read_l) &&
-                    mem_mapping_access_allowed(map->flags,
-                                               _mem_state[c >> MEM_GRANULARITY_BITS].states[n].r))
-                    read_mapping[c >> MEM_GRANULARITY_BITS] = map;
+                    if (map->exec && mem_mapping_access_allowed(map->flags,
+                                                                _mem_state[c >> MEM_GRANULARITY_BITS].states[n].x))
+                        _mem_exec[c >> MEM_GRANULARITY_BITS] = map->exec + (c - map->base);
+                    if (!wp && (map->write_b || map->write_w || map->write_l) &&
+                        mem_mapping_access_allowed(map->flags,
+                                                   _mem_state[c >> MEM_GRANULARITY_BITS].states[n].w))
+                        write_mapping[c >> MEM_GRANULARITY_BITS] = map;
+                    if ((map->read_b || map->read_w || map->read_l) &&
+                        mem_mapping_access_allowed(map->flags,
+                                                   _mem_state[c >> MEM_GRANULARITY_BITS].states[n].r))
+                        read_mapping[c >> MEM_GRANULARITY_BITS] = map;
 
-                /* Bus */
-                n |= STATE_BUS;
-                wp = _mem_wp_bus[c >> MEM_GRANULARITY_BITS];
+                    /* Bus */
+                    n |= STATE_BUS;
+                    wp = _mem_wp_bus[c >> MEM_GRANULARITY_BITS];
 
-                if (!wp && (map->write_b || map->write_w || map->write_l) &&
-                    mem_mapping_access_allowed(map->flags,
-                                               _mem_state[c >> MEM_GRANULARITY_BITS].states[n].w))
-                    write_mapping_bus[c >> MEM_GRANULARITY_BITS] = map;
-                if ((map->read_b || map->read_w || map->read_l) &&
-                    mem_mapping_access_allowed(map->flags,
-                                               _mem_state[c >> MEM_GRANULARITY_BITS].states[n].r))
-                    read_mapping_bus[c >> MEM_GRANULARITY_BITS] = map;
+                    if (!wp && (map->write_b || map->write_w || map->write_l) &&
+                        mem_mapping_access_allowed(map->flags,
+                                                   _mem_state[c >> MEM_GRANULARITY_BITS].states[n].w))
+                        write_mapping_bus[c >> MEM_GRANULARITY_BITS] = map;
+                    if ((map->read_b || map->read_w || map->read_l) &&
+                        mem_mapping_access_allowed(map->flags,
+                                                   _mem_state[c >> MEM_GRANULARITY_BITS].states[n].r))
+                        read_mapping_bus[c >> MEM_GRANULARITY_BITS] = map;
+                }
             }
         }
         map = map->next;
@@ -2523,6 +2590,19 @@ mem_mapping_set_handler(mem_mapping_t *map,
     mem_mapping_recalc(map->base, map->size);
 }
 
+void
+mem_mapping_set_write_handler(mem_mapping_t *map,
+                              void (*write_b)(uint32_t addr, uint8_t val, void *priv),
+                              void (*write_w)(uint32_t addr, uint16_t val, void *priv),
+                              void (*write_l)(uint32_t addr, uint32_t val, void *priv))
+{
+    map->write_b = write_b;
+    map->write_w = write_w;
+    map->write_l = write_l;
+
+    mem_mapping_recalc(map->base, map->size);
+}
+
 void
 mem_mapping_set_addr(mem_mapping_t *map, uint32_t base, uint32_t size)
 {
@@ -2538,6 +2618,20 @@ mem_mapping_set_addr(mem_mapping_t *map, uint32_t base, uint32_t size)
     mem_mapping_recalc(map->base, map->size);
 }
 
+void
+mem_mapping_set_base_ignore(mem_mapping_t *map, uint32_t base_ignore)
+{
+    /* Remove old mapping. */
+    map->enable      = 0;
+    mem_mapping_recalc(map->base, map->size);
+
+    /* Set new mapping. */
+    map->enable      = 1;
+    map->base_ignore = base_ignore;
+
+    mem_mapping_recalc(map->base, map->size);
+}
+
 void
 mem_mapping_set_exec(mem_mapping_t *map, uint8_t *exec)
 {
@@ -2674,6 +2768,17 @@ mem_init_ram_mapping(mem_mapping_t *mapping, uint32_t base, uint32_t size)
     mem_add_ram_mapping(mapping, base, size);
 }
 
+void
+mem_zero(void)
+{
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
+    if (mem_size > 1048576)
+        memset(ram2, 0x00, ram2_size + 16);
+#endif
+
+    memset(ram, 0x00, ram_size + 16);
+}
+
 /* Reset the memory state. */
 void
 mem_reset(void)
@@ -2749,8 +2854,10 @@ mem_reset(void)
             return;
         }
         memset(ram, 0x00, ram_size + 16);
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
         if (mem_size > 1048576)
             ram2 = &(ram[1 << 30]);
+#endif
     }
 
     /*
@@ -2760,8 +2867,8 @@ mem_reset(void)
      */
     if (is286) {
         if (cpu_16bitbus) {
-            /* 80286/386SX; maximum address space is 16MB. */
-            m = 4096;
+            /* 80286/386SX; maximum address space is 16MB + 16 MB for EMS. */
+            m = 8192;
             /* ALi M6117; maximum address space is 64MB. */
             if (is6117)
                 m <<= 2;
@@ -2783,7 +2890,6 @@ mem_reset(void)
     pages    = (page_t *) malloc(m * sizeof(page_t));
 
     memset(page_lookup, 0x00, (1 << 20) * sizeof(page_t *));
-    memset(page_lookupp, 0x04, (1 << 20) * sizeof(uint8_t));
 
     memset(pages, 0x00, pages_sz * sizeof(page_t));
 
@@ -2845,6 +2951,7 @@ mem_reset(void)
         else if (cpu_16bitbus && is6117 && mem_size > 65408)
             mem_init_ram_mapping(&ram_high_mapping, 0x100000, (65408 - 1024) * 1024);
         else {
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
             if (mem_size > 1048576) {
                 mem_init_ram_mapping(&ram_high_mapping, 0x100000, (1048576 - 1024) * 1024);
 
@@ -2857,6 +2964,9 @@ mem_reset(void)
                                 ram2, MEM_MAPPING_INTERNAL, NULL);
             } else
                 mem_init_ram_mapping(&ram_high_mapping, 0x100000, (mem_size - 1024) * 1024);
+#else
+            mem_init_ram_mapping(&ram_high_mapping, 0x100000, (mem_size - 1024) * 1024);
+#endif
         }
     }
 
@@ -2896,20 +3006,32 @@ mem_init(void)
     ram2      = NULL;
     pages     = NULL;
 
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
     /* Allocate the lookup tables. */
     page_lookup  = (page_t **) malloc((1 << 20) * sizeof(page_t *));
-    page_lookupp = (uint8_t *) malloc((1 << 20) * sizeof(uint8_t));
     readlookup2  = malloc((1 << 20) * sizeof(uintptr_t));
-    readlookupp  = malloc((1 << 20) * sizeof(uint8_t));
     writelookup2 = malloc((1 << 20) * sizeof(uintptr_t));
-    writelookupp = malloc((1 << 20) * sizeof(uint8_t));
+#endif
 }
 
-static void
-umc_page_recalc(uint32_t c, int set)
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
+void
+mem_free(void)
 {
+    free(page_lookup);
+    free(readlookup2);
+    free(writelookup2);
+}
+#endif
+
+
+static void
+umc_page_recalc(uint32_t c, uint32_t phys, int set)
+{
+    uint32_t target = set ? phys : c;
+
     if (set) {
-        pages[c].mem = &ram[(c & 0xff) << 12];
+        pages[c].mem = &ram[(target & 0xff) << 12];
         pages[c].write_b = mem_write_ramb_page;
         pages[c].write_w = mem_write_ramw_page;
         pages[c].write_l = mem_write_raml_page;
@@ -2922,8 +3044,8 @@ umc_page_recalc(uint32_t c, int set)
 
 #ifdef USE_NEW_DYNAREC
     pages[c].evict_prev             = EVICT_NOT_IN_LIST;
-    pages[c].byte_dirty_mask        = &byte_dirty_mask[(c & 0xff) * 64];
-    pages[c].byte_code_present_mask = &byte_code_present_mask[(c & 0xff) * 64];
+    pages[c].byte_dirty_mask        = &byte_dirty_mask[(target & 0xff) * 64];
+    pages[c].byte_code_present_mask = &byte_code_present_mask[(target & 0xff) * 64];
 #endif
 }
 
@@ -2931,14 +3053,13 @@ void
 umc_smram_recalc(uint32_t start, int set)
 {
     for (uint32_t c = start; c < (start + 0x0020); c++)
-        umc_page_recalc(c, set);
+        umc_page_recalc(c, c - start + 0x000a0000, set);
 }
 
-void
-mem_remap_top(int kb)
+static void
+mem_remap_top_ex_common(int kb, uint32_t start, int mid)
 {
     uint32_t   c;
-    uint32_t   start = (mem_size >= 1024) ? mem_size : 1024;
     int        offset;
     int        size = mem_size - 640;
     int        set        = 1;
@@ -3039,31 +3160,61 @@ mem_remap_top(int kb)
             mem_mapping_set_addr(&ram_remapped_mapping2, (start * 1024) + 0x00020000, 0x00020000);
             mem_mapping_set_exec(&ram_remapped_mapping2, ram + 0x000d0000);
 
-            mem_mapping_set_addr(&ram_mid_mapping, 0x000c0000, 0x00010000);
-            mem_mapping_set_exec(&ram_mid_mapping, ram + 0x000c0000);
-            mem_mapping_set_addr(&ram_mid_mapping2, 0x000f0000, 0x00010000);
-            mem_mapping_set_exec(&ram_mid_mapping2, ram + 0x000f0000);
+            if (mid) {
+                mem_mapping_set_addr(&ram_mid_mapping, 0x000c0000, 0x00010000);
+                mem_mapping_set_exec(&ram_mid_mapping, ram + 0x000c0000);
+                mem_mapping_set_addr(&ram_mid_mapping2, 0x000f0000, 0x00010000);
+                mem_mapping_set_exec(&ram_mid_mapping2, ram + 0x000f0000);
+            }
         } else {
             mem_mapping_set_addr(&ram_remapped_mapping, start * 1024, size * 1024);
             mem_mapping_set_exec(&ram_remapped_mapping, ram + start_addr);
             mem_mapping_disable(&ram_remapped_mapping2);
 
-            mem_mapping_set_addr(&ram_mid_mapping, 0x000a0000, 0x00060000);
-            mem_mapping_set_exec(&ram_mid_mapping, ram + 0x000a0000);
-            mem_mapping_disable(&ram_mid_mapping2);
+            if (mid) {
+                mem_mapping_set_addr(&ram_mid_mapping, 0x000a0000, 0x00060000);
+                mem_mapping_set_exec(&ram_mid_mapping, ram + 0x000a0000);
+                mem_mapping_disable(&ram_mid_mapping2);
+            }
         }
     } else {
         mem_mapping_disable(&ram_remapped_mapping);
         mem_mapping_disable(&ram_remapped_mapping2);
 
-        mem_mapping_set_addr(&ram_mid_mapping, 0x000a0000, 0x00060000);
-        mem_mapping_set_exec(&ram_mid_mapping, ram + 0x000a0000);
-        mem_mapping_disable(&ram_mid_mapping2);
+        if (mid) {
+            mem_mapping_set_addr(&ram_mid_mapping, 0x000a0000, 0x00060000);
+            mem_mapping_set_exec(&ram_mid_mapping, ram + 0x000a0000);
+            mem_mapping_disable(&ram_mid_mapping2);
+        }
     }
 
     flushmmucache();
 }
 
+void
+mem_remap_top_ex(int kb, uint32_t start)
+{
+    mem_remap_top_ex_common(kb, start, 1);
+}
+
+void
+mem_remap_top_ex_nomid(int kb, uint32_t start)
+{
+    mem_remap_top_ex_common(kb, start, 0);
+}
+
+void
+mem_remap_top(int kb)
+{
+    mem_remap_top_ex(kb, (mem_size >= 1024) ? mem_size : 1024);
+}
+
+void
+mem_remap_top_nomid(int kb)
+{
+    mem_remap_top_ex_nomid(kb, (mem_size >= 1024) ? mem_size : 1024);
+}
+
 void
 mem_reset_page_blocks(void)
 {
diff --git a/src/mem/mmu_2386.c b/src/mem/mmu_2386.c
index 9ed26edfa..ebf062d95 100644
--- a/src/mem/mmu_2386.c
+++ b/src/mem/mmu_2386.c
@@ -39,52 +39,42 @@
 #include <86box/rom.h>
 #include <86box/gdbstub.h>
 
-/* Set trap for data address breakpoints. */
-void
-mem_debug_check_addr(uint32_t addr, int write)
-{
-    int i = 0;
-    int set_trap = 0;
+/* As below, 1 = exec, 4 = read. */
+int    read_type = 4;
 
-    if (!(dr[7] & 0xFF))
+/* Set trap for data address breakpoints - 1 = exec, 2 = write, 4 = read. */
+void
+mem_debug_check_addr(uint32_t addr, int flags)
+{
+    uint32_t bp_addr;
+    uint32_t bp_mask;
+    uint32_t len_type_pair;
+    int bp_enabled;
+    uint8_t match_flags[4] = { 0, 2, 0, 6 };
+
+    if (cpu_state.abrt || ((flags == 1) && (cpu_state.eflags & RF_FLAG)))
         return;
 
-    for (i = 0; i < 4; i++) {
-        uint32_t dr_addr = dr[i];
-        int breakpoint_enabled = !!(dr[7] & (0x3 << (2 * i)));
-        int len_type_pair = ((dr[7] >> 16) & (0xF << (4 * i))) >> (4 * i);
-        if (!breakpoint_enabled)
-            continue;
-        if (!write && (len_type_pair & 3) != 3)
-            continue;
-        if ((len_type_pair & 3) != 1)
-            continue;
-        
-        switch ((len_type_pair >> 2) & 3)
-        {
-            case 0x00:
-                if (dr_addr == addr) {
-                    set_trap = 1;
-                    dr[6] |= (1 << i);
-                }
-                break;
-            case 0x01:
-                if ((dr_addr & ~1) == addr || ((dr_addr & ~1) + 1) == (addr + 1)) {
-                    set_trap = 1;
-                    dr[6] |= (1 << i);
-                }
-                break;
-            case 0x03:
-                dr_addr &= ~3;
-                if (addr >= dr_addr && addr < (dr_addr + 4)) {
-                    set_trap = 1;
-                    dr[6] |= (1 << i);
-                }
-                break;
+    if (dr[7] & 0x000000ff)  for (uint8_t i = 0; i < 4; i++) {
+        bp_addr = dr[i];
+        bp_enabled = (dr[7] >> (i << 1)) & 0x03;
+        len_type_pair = (dr[7] >> (16 + (i << 2))) & 0x0f;
+        bp_mask = ~((len_type_pair >> 2) & 0x03);
+
+        if ((flags & match_flags[len_type_pair & 0x03]) && ((bp_addr & bp_mask) == (addr & bp_mask))) {
+            /*
+               From the Intel i386 documemntation:
+
+               (Note that the processor sets Bn regardless of whether Gn or
+               Ln is set. If more than one breakpoint condition occurs at one time and if
+               the breakpoint trap occurs due to an enabled condition other than n, Bn may
+               be set, even though neither Gn nor Ln is set.)
+             */
+            dr[6] |= (1 << i);
+            if (bp_enabled)
+                trap |= (read_type == 1) ? 8 : 4;
         }
     }
-    if (set_trap)
-        trap |= 4;
 }
 
 uint8_t
@@ -112,8 +102,8 @@ mem_readw_map(uint32_t addr)
     if (((addr & MEM_GRANULARITY_MASK) <= MEM_GRANULARITY_HBOUND) && (map && map->read_w))
         ret = map->read_w(addr, map->priv);
     else {
-        ret = mem_readb_phys(addr + 1) << 8;
-        ret |= mem_readb_phys(addr);
+        ret = mem_readb_map(addr);
+        ret |= ((uint16_t) mem_readb_map(addr + 1)) << 8;
     }
 
     return ret;
@@ -130,8 +120,8 @@ mem_readl_map(uint32_t addr)
     if (!cpu_16bitbus && ((addr & MEM_GRANULARITY_MASK) <= MEM_GRANULARITY_QBOUND) && (map && map->read_l))
         ret = map->read_l(addr, map->priv);
     else {
-        ret = mem_readw_phys(addr + 2) << 16;
-        ret |= mem_readw_phys(addr);
+        ret = mem_readw_map(addr);
+        ret |= ((uint32_t) mem_readw_map(addr + 2)) << 16;
     }
 
     return ret;
@@ -158,8 +148,8 @@ mem_writew_map(uint32_t addr, uint16_t val)
     if (((addr & MEM_GRANULARITY_MASK) <= MEM_GRANULARITY_HBOUND) && (map && map->write_w))
         map->write_w(addr, val, map->priv);
     else {
-        mem_writeb_phys(addr, val & 0xff);
-        mem_writeb_phys(addr + 1, val >> 8);
+        mem_writeb_map(addr, val & 0xff);
+        mem_writeb_map(addr + 1, val >> 8);
     }
 }
 
@@ -171,10 +161,10 @@ mem_writel_map(uint32_t addr, uint32_t val)
     mem_logical_addr = 0xffffffff;
 
     if (!cpu_16bitbus && ((addr & MEM_GRANULARITY_MASK) <= MEM_GRANULARITY_QBOUND) && (map && map->write_l))
-         map->write_l(addr, val, map->priv);
+        map->write_l(addr, val, map->priv);
     else {
-        mem_writew_phys(addr, val & 0xffff);
-        mem_writew_phys(addr + 2, val >> 16);
+        mem_writew_map(addr, val & 0xffff);
+        mem_writew_map(addr + 2, val >> 16);
     }
 }
 
@@ -208,7 +198,7 @@ mmutranslatereal_2386(uint32_t addr, int rw)
 
     if ((temp & 0x80) && (cr4 & CR4_PSE)) {
         /*4MB page*/
-        if (((CPL == 3) && !(temp & 4) && !cpl_override) || (rw && !(temp & 2) && (((CPL == 3) && !cpl_override) || ((is486 || isibm486) && (cr0 & WP_FLAG))))) {
+        if (((CPL == 3) && !(temp & 4) && !cpl_override) || (rw && !cpl_override && !(temp & 2) && (((CPL == 3) && !cpl_override) || ((is486 || isibm486) && (cr0 & WP_FLAG))))) {
             cr2 = addr;
             temp &= 1;
             if (CPL == 3)
@@ -221,7 +211,6 @@ mmutranslatereal_2386(uint32_t addr, int rw)
             return 0xffffffffffffffffULL;
         }
 
-        mmu_perm = temp & 4;
         mem_writel_map(addr2, mem_readl_map(addr2) | (rw ? 0x60 : 0x20));
 
         return (temp & ~0x3fffff) + (addr & 0x3fffff);
@@ -229,7 +218,7 @@ mmutranslatereal_2386(uint32_t addr, int rw)
 
     temp = mem_readl_map((temp & ~0xfff) + ((addr >> 10) & 0xffc));
     temp3 = temp & temp2;
-    if (!(temp & 1) || ((CPL == 3) && !(temp3 & 4) && !cpl_override) || (rw && !(temp3 & 2) && (((CPL == 3) && !cpl_override) || ((is486 || isibm486) && (cr0 & WP_FLAG))))) {
+    if (!(temp & 1) || ((CPL == 3) && !(temp3 & 4) && !cpl_override) || (rw && !cpl_override && !(temp3 & 2) && (((CPL == 3) && !cpl_override) || ((is486 || isibm486) && (cr0 & WP_FLAG))))) {
         cr2 = addr;
         temp &= 1;
         if (CPL == 3)
@@ -241,7 +230,6 @@ mmutranslatereal_2386(uint32_t addr, int rw)
         return 0xffffffffffffffffULL;
     }
 
-    mmu_perm = temp & 4;
     mem_writel_map(addr2, mem_readl_map(addr2) | 0x20);
     mem_writel_map((temp2 & ~0xfff) + ((addr >> 10) & 0xffc),
                    mem_readl_map((temp2 & ~0xfff) + ((addr >> 10) & 0xffc)) | (rw ? 0x60 : 0x20));
@@ -268,7 +256,7 @@ mmutranslate_noabrt_2386(uint32_t addr, int rw)
 
     if ((temp & 0x80) && (cr4 & CR4_PSE)) {
         /*4MB page*/
-        if (((CPL == 3) && !(temp & 4) && !cpl_override) || (rw && !(temp & 2) && ((CPL == 3) || (cr0 & WP_FLAG))))
+        if (((CPL == 3) && !(temp & 4) && !cpl_override) || (rw && !cpl_override && !(temp & 2) && ((CPL == 3) || (cr0 & WP_FLAG))))
             return 0xffffffffffffffffULL;
 
         return (temp & ~0x3fffff) + (addr & 0x3fffff);
@@ -277,7 +265,7 @@ mmutranslate_noabrt_2386(uint32_t addr, int rw)
     temp  = mem_readl_map((temp & ~0xfff) + ((addr >> 10) & 0xffc));
     temp3 = temp & temp2;
 
-    if (!(temp & 1) || ((CPL == 3) && !(temp3 & 4) && !cpl_override) || (rw && !(temp3 & 2) && ((CPL == 3) || (cr0 & WP_FLAG))))
+    if (!(temp & 1) || ((CPL == 3) && !(temp3 & 4) && !cpl_override) || (rw && !cpl_override && !(temp3 & 2) && ((CPL == 3) || (cr0 & WP_FLAG))))
         return 0xffffffffffffffffULL;
 
     return (uint64_t) ((temp & ~0xfff) + (addr & 0xfff));
@@ -288,16 +276,17 @@ readmembl_2386(uint32_t addr)
 {
     mem_mapping_t *map;
     uint64_t       a;
+    uint32_t       temp_cr0 = cpu_old_paging ? (cr0 ^ 0x80000000) : cr0;
 
     GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 1);
 
-    mem_debug_check_addr(addr, 0);
+    mem_debug_check_addr(addr, read_type);
     addr64           = (uint64_t) addr;
     mem_logical_addr = addr;
 
     high_page = 0;
 
-    if (cr0 >> 31) {
+    if (temp_cr0 >> 31) {
         a      = mmutranslate_read_2386(addr);
         addr64 = (uint32_t) a;
 
@@ -318,8 +307,9 @@ writemembl_2386(uint32_t addr, uint8_t val)
 {
     mem_mapping_t *map;
     uint64_t       a;
+    uint32_t       temp_cr0 = cpu_old_paging ? (cr0 ^ 0x80000000) : cr0;
 
-    mem_debug_check_addr(addr, 1);
+    mem_debug_check_addr(addr, 2);
     GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_WRITE, 1);
 
     addr64           = (uint64_t) addr;
@@ -327,7 +317,7 @@ writemembl_2386(uint32_t addr, uint8_t val)
 
     high_page = 0;
 
-    if (cr0 >> 31) {
+    if (temp_cr0 >> 31) {
         a      = mmutranslate_write_2386(addr);
         addr64 = (uint32_t) a;
 
@@ -346,12 +336,13 @@ uint8_t
 readmembl_no_mmut_2386(uint32_t addr, uint32_t a64)
 {
     mem_mapping_t *map;
+    uint32_t       temp_cr0 = cpu_old_paging ? (cr0 ^ 0x80000000) : cr0;
 
     GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 1);
 
     mem_logical_addr = addr;
 
-    if (cr0 >> 31) {
+    if (temp_cr0 >> 31) {
         if (cpu_state.abrt || high_page)
             return 0xff;
 
@@ -371,12 +362,13 @@ void
 writemembl_no_mmut_2386(uint32_t addr, uint32_t a64, uint8_t val)
 {
     mem_mapping_t *map;
+    uint32_t       temp_cr0 = cpu_old_paging ? (cr0 ^ 0x80000000) : cr0;
 
     GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_WRITE, 1);
 
     mem_logical_addr = addr;
 
-    if (cr0 >> 31) {
+    if (temp_cr0 >> 31) {
         if (cpu_state.abrt || high_page)
             return;
 
@@ -394,11 +386,12 @@ readmemwl_2386(uint32_t addr)
 {
     mem_mapping_t *map;
     uint64_t       a;
+    uint32_t       temp_cr0 = cpu_old_paging ? (cr0 ^ 0x80000000) : cr0;
 
     addr64a[0] = addr;
     addr64a[1] = addr + 1;
-    mem_debug_check_addr(addr, 0);
-    mem_debug_check_addr(addr + 1, 0);
+    mem_debug_check_addr(addr, read_type);
+    mem_debug_check_addr(addr + 1, read_type);
     GDBSTUB_MEM_ACCESS_FAST(addr64a, GDBSTUB_MEM_READ, 2);
 
     mem_logical_addr = addr;
@@ -409,7 +402,7 @@ readmemwl_2386(uint32_t addr)
         if (!cpu_cyrix_alignment || (addr & 7) == 7)
             cycles -= timing_misaligned;
         if ((addr & 0xfff) > 0xffe) {
-            if (cr0 >> 31) {
+            if (temp_cr0 >> 31) {
                 for (uint8_t i = 0; i < 2; i++) {
                     a          = mmutranslate_read_2386(addr + i);
                     addr64a[i] = (uint32_t) a;
@@ -419,11 +412,12 @@ readmemwl_2386(uint32_t addr)
                 }
             }
 
-            return readmembl_no_mmut(addr, addr64a[0]) | (((uint16_t) readmembl_no_mmut(addr + 1, addr64a[1])) << 8);
+            return readmembl_no_mmut_2386(addr, addr64a[0]) |
+                   (((uint16_t) readmembl_no_mmut_2386(addr + 1, addr64a[1])) << 8);
         }
     }
 
-    if (cr0 >> 31) {
+    if (temp_cr0 >> 31) {
         a          = mmutranslate_read_2386(addr);
         addr64a[0] = (uint32_t) a;
 
@@ -451,11 +445,12 @@ writememwl_2386(uint32_t addr, uint16_t val)
 {
     mem_mapping_t *map;
     uint64_t       a;
+    uint32_t       temp_cr0 = cpu_old_paging ? (cr0 ^ 0x80000000) : cr0;
 
     addr64a[0] = addr;
     addr64a[1] = addr + 1;
-    mem_debug_check_addr(addr, 1);
-    mem_debug_check_addr(addr + 1, 1);
+    mem_debug_check_addr(addr, 2);
+    mem_debug_check_addr(addr + 1, 2);
     GDBSTUB_MEM_ACCESS_FAST(addr64a, GDBSTUB_MEM_WRITE, 2);
 
     mem_logical_addr = addr;
@@ -466,7 +461,7 @@ writememwl_2386(uint32_t addr, uint16_t val)
         if (!cpu_cyrix_alignment || (addr & 7) == 7)
             cycles -= timing_misaligned;
         if ((addr & 0xfff) > 0xffe) {
-            if (cr0 >> 31) {
+            if (temp_cr0 >> 31) {
                 for (uint8_t i = 0; i < 2; i++) {
                     /* Do not translate a page that has a valid lookup, as that is by definition valid
                        and the whole purpose of the lookup is to avoid repeat identical translations. */
@@ -482,13 +477,13 @@ writememwl_2386(uint32_t addr, uint16_t val)
 
             /* No need to waste precious CPU host cycles on mmutranslate's that were already done, just pass
                their result as a parameter to be used if needed. */
-            writemembl_no_mmut(addr, addr64a[0], val);
-            writemembl_no_mmut(addr + 1, addr64a[1], val >> 8);
+            writemembl_no_mmut_2386(addr, addr64a[0], val);
+            writemembl_no_mmut_2386(addr + 1, addr64a[1], val >> 8);
             return;
         }
     }
 
-    if (cr0 >> 31) {
+    if (temp_cr0 >> 31) {
         a          = mmutranslate_write_2386(addr);
         addr64a[0] = (uint32_t) a;
 
@@ -517,6 +512,7 @@ uint16_t
 readmemwl_no_mmut_2386(uint32_t addr, uint32_t *a64)
 {
     mem_mapping_t *map;
+    uint32_t       temp_cr0 = cpu_old_paging ? (cr0 ^ 0x80000000) : cr0;
 
     GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 2);
 
@@ -526,16 +522,17 @@ readmemwl_no_mmut_2386(uint32_t addr, uint32_t *a64)
         if (!cpu_cyrix_alignment || (addr & 7) == 7)
             cycles -= timing_misaligned;
         if ((addr & 0xfff) > 0xffe) {
-            if (cr0 >> 31) {
+            if (temp_cr0 >> 31) {
                 if (cpu_state.abrt || high_page)
                     return 0xffff;
             }
 
-            return readmembl_no_mmut(addr, a64[0]) | (((uint16_t) readmembl_no_mmut(addr + 1, a64[1])) << 8);
+            return readmembl_no_mmut_2386(addr, a64[0]) |
+                   (((uint16_t) readmembl_no_mmut_2386(addr + 1, a64[1])) << 8);
         }
     }
 
-    if (cr0 >> 31) {
+    if (temp_cr0 >> 31) {
         if (cpu_state.abrt || high_page)
             return 0xffff;
 
@@ -560,6 +557,7 @@ void
 writememwl_no_mmut_2386(uint32_t addr, uint32_t *a64, uint16_t val)
 {
     mem_mapping_t *map;
+    uint32_t       temp_cr0 = cpu_old_paging ? (cr0 ^ 0x80000000) : cr0;
 
     GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_WRITE, 2);
 
@@ -569,18 +567,18 @@ writememwl_no_mmut_2386(uint32_t addr, uint32_t *a64, uint16_t val)
         if (!cpu_cyrix_alignment || (addr & 7) == 7)
             cycles -= timing_misaligned;
         if ((addr & 0xfff) > 0xffe) {
-            if (cr0 >> 31) {
+            if (temp_cr0 >> 31) {
                 if (cpu_state.abrt || high_page)
                     return;
             }
 
-            writemembl_no_mmut(addr, a64[0], val);
-            writemembl_no_mmut(addr + 1, a64[1], val >> 8);
+            writemembl_no_mmut_2386(addr, a64[0], val);
+            writemembl_no_mmut_2386(addr + 1, a64[1], val >> 8);
             return;
         }
     }
 
-    if (cr0 >> 31) {
+    if (temp_cr0 >> 31) {
         if (cpu_state.abrt || high_page)
             return;
 
@@ -608,10 +606,11 @@ readmemll_2386(uint32_t addr)
     mem_mapping_t *map;
     int            i;
     uint64_t       a = 0x0000000000000000ULL;
+    uint32_t       temp_cr0 = cpu_old_paging ? (cr0 ^ 0x80000000) : cr0;
 
     for (i = 0; i < 4; i++) {
         addr64a[i] = (uint64_t) (addr + i);
-        mem_debug_check_addr(addr + i, 0);
+        mem_debug_check_addr(addr + i, read_type);
     }
     GDBSTUB_MEM_ACCESS_FAST(addr64a, GDBSTUB_MEM_READ, 4);
 
@@ -619,11 +618,11 @@ readmemll_2386(uint32_t addr)
 
     high_page = 0;
 
-    if (addr & 3) {
-        if (!cpu_cyrix_alignment || (addr & 7) > 4)
+    if (cpu_16bitbus || (addr & 3)) {
+        if ((addr & 3) && (!cpu_cyrix_alignment || (addr & 7) > 4))
             cycles -= timing_misaligned;
         if ((addr & 0xfff) > 0xffc) {
-            if (cr0 >> 31) {
+            if (temp_cr0 >> 31) {
                 for (i = 0; i < 4; i++) {
                     if (i == 0) {
                         a          = mmutranslate_read_2386(addr + i);
@@ -647,11 +646,12 @@ readmemll_2386(uint32_t addr)
 
             /* No need to waste precious CPU host cycles on mmutranslate's that were already done, just pass
                their result as a parameter to be used if needed. */
-            return readmemwl_no_mmut(addr, addr64a) | (((uint32_t) readmemwl_no_mmut(addr + 2, &(addr64a[2]))) << 16);
+            return readmemwl_no_mmut_2386(addr, addr64a) |
+                   (((uint32_t) readmemwl_no_mmut_2386(addr + 2, &(addr64a[2]))) << 16);
         }
     }
 
-    if (cr0 >> 31) {
+    if (temp_cr0 >> 31) {
         a          = mmutranslate_read_2386(addr);
         addr64a[0] = (uint32_t) a;
 
@@ -681,10 +681,11 @@ writememll_2386(uint32_t addr, uint32_t val)
     mem_mapping_t *map;
     int            i;
     uint64_t       a = 0x0000000000000000ULL;
+    uint32_t       temp_cr0 = cpu_old_paging ? (cr0 ^ 0x80000000) : cr0;
 
     for (i = 0; i < 4; i++) {
         addr64a[i] = (uint64_t) (addr + i);
-        mem_debug_check_addr(addr + i, 1);
+        mem_debug_check_addr(addr + i, 2);
     }
     GDBSTUB_MEM_ACCESS_FAST(addr64a, GDBSTUB_MEM_WRITE, 4);
 
@@ -692,11 +693,11 @@ writememll_2386(uint32_t addr, uint32_t val)
 
     high_page = 0;
 
-    if (addr & 3) {
-        if (!cpu_cyrix_alignment || (addr & 7) > 4)
+    if (cpu_16bitbus || (addr & 3)) {
+        if ((addr & 3) && (!cpu_cyrix_alignment || (addr & 7) > 4))
             cycles -= timing_misaligned;
         if ((addr & 0xfff) > 0xffc) {
-            if (cr0 >> 31) {
+            if (temp_cr0 >> 31) {
                 for (i = 0; i < 4; i++) {
                     /* Do not translate a page that has a valid lookup, as that is by definition valid
                        and the whole purpose of the lookup is to avoid repeat identical translations. */
@@ -724,13 +725,13 @@ writememll_2386(uint32_t addr, uint32_t val)
 
             /* No need to waste precious CPU host cycles on mmutranslate's that were already done, just pass
                their result as a parameter to be used if needed. */
-            writememwl_no_mmut(addr, &(addr64a[0]), val);
-            writememwl_no_mmut(addr + 2, &(addr64a[2]), val >> 16);
+            writememwl_no_mmut_2386(addr, &(addr64a[0]), val);
+            writememwl_no_mmut_2386(addr + 2, &(addr64a[2]), val >> 16);
             return;
         }
     }
 
-    if (cr0 >> 31) {
+    if (temp_cr0 >> 31) {
         a          = mmutranslate_write_2386(addr);
         addr64a[0] = (uint32_t) a;
 
@@ -765,25 +766,27 @@ uint32_t
 readmemll_no_mmut_2386(uint32_t addr, uint32_t *a64)
 {
     mem_mapping_t *map;
+    uint32_t       temp_cr0 = cpu_old_paging ? (cr0 ^ 0x80000000) : cr0;
 
     GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 4);
 
     mem_logical_addr = addr;
 
-    if (addr & 3) {
-        if (!cpu_cyrix_alignment || (addr & 7) > 4)
+    if (cpu_16bitbus || (addr & 3)) {
+        if ((addr & 3) && (!cpu_cyrix_alignment || (addr & 7) > 4))
             cycles -= timing_misaligned;
         if ((addr & 0xfff) > 0xffc) {
-            if (cr0 >> 31) {
+            if (temp_cr0 >> 31) {
                 if (cpu_state.abrt || high_page)
                     return 0xffffffff;
             }
 
-            return readmemwl_no_mmut(addr, a64) | ((uint32_t) (readmemwl_no_mmut(addr + 2, &(a64[2]))) << 16);
+            return readmemwl_no_mmut_2386(addr, a64) |
+                   ((uint32_t) (readmemwl_no_mmut_2386(addr + 2, &(a64[2]))) << 16);
         }
     }
 
-    if (cr0 >> 31) {
+    if (temp_cr0 >> 31) {
         if (cpu_state.abrt || high_page)
             return 0xffffffff;
 
@@ -810,27 +813,28 @@ void
 writememll_no_mmut_2386(uint32_t addr, uint32_t *a64, uint32_t val)
 {
     mem_mapping_t *map;
+    uint32_t       temp_cr0 = cpu_old_paging ? (cr0 ^ 0x80000000) : cr0;
 
     GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_WRITE, 4);
 
     mem_logical_addr = addr;
 
-    if (addr & 3) {
-        if (!cpu_cyrix_alignment || (addr & 7) > 4)
+    if (cpu_16bitbus || (addr & 3)) {
+        if ((addr & 3) && (!cpu_cyrix_alignment || (addr & 7) > 4))
             cycles -= timing_misaligned;
         if ((addr & 0xfff) > 0xffc) {
-            if (cr0 >> 31) {
+            if (temp_cr0 >> 31) {
                 if (cpu_state.abrt || high_page)
                     return;
             }
 
-            writememwl_no_mmut(addr, &(a64[0]), val);
-            writememwl_no_mmut(addr + 2, &(a64[2]), val >> 16);
+            writememwl_no_mmut_2386(addr, &(a64[0]), val);
+            writememwl_no_mmut_2386(addr + 2, &(a64[2]), val >> 16);
             return;
         }
     }
 
-    if (cr0 >> 31) {
+    if (temp_cr0 >> 31) {
         if (cpu_state.abrt || high_page)
             return;
 
@@ -864,10 +868,11 @@ readmemql_2386(uint32_t addr)
     mem_mapping_t *map;
     int            i;
     uint64_t       a = 0x0000000000000000ULL;
+    uint32_t       temp_cr0 = cpu_old_paging ? (cr0 ^ 0x80000000) : cr0;
 
     for (i = 0; i < 8; i++) {
         addr64a[i] = (uint64_t) (addr + i);
-        mem_debug_check_addr(addr + i, 0);
+        mem_debug_check_addr(addr + i, read_type);
     }
     GDBSTUB_MEM_ACCESS_FAST(addr64a, GDBSTUB_MEM_READ, 8);
 
@@ -878,7 +883,7 @@ readmemql_2386(uint32_t addr)
     if (addr & 7) {
         cycles -= timing_misaligned;
         if ((addr & 0xfff) > 0xff8) {
-            if (cr0 >> 31) {
+            if (temp_cr0 >> 31) {
                 for (i = 0; i < 8; i++) {
                     if (i == 0) {
                         a          = mmutranslate_read_2386(addr + i);
@@ -902,11 +907,12 @@ readmemql_2386(uint32_t addr)
 
             /* No need to waste precious CPU host cycles on mmutranslate's that were already done, just pass
                their result as a parameter to be used if needed. */
-            return readmemll_no_mmut(addr, addr64a) | (((uint64_t) readmemll_no_mmut(addr + 4, &(addr64a[4]))) << 32);
+            return readmemll_no_mmut_2386(addr, addr64a) |
+                   (((uint64_t) readmemll_no_mmut_2386(addr + 4, &(addr64a[4]))) << 32);
         }
     }
 
-    if (cr0 >> 31) {
+    if (temp_cr0 >> 31) {
         a          = mmutranslate_read_2386(addr);
         addr64a[0] = (uint32_t) a;
 
@@ -917,10 +923,28 @@ readmemql_2386(uint32_t addr)
     addr = addr64a[0] & rammask;
 
     map = read_mapping[addr >> MEM_GRANULARITY_BITS];
-    if (map && map->read_l)
-        return map->read_l(addr, map->priv) | ((uint64_t) map->read_l(addr + 4, map->priv) << 32);
 
-    return readmemll(addr) | ((uint64_t) readmemll(addr + 4) << 32);
+    if (map && map->read_l)
+        return map->read_l(addr, map->priv) |
+               ((uint64_t) map->read_l(addr + 4, map->priv) << 32);
+
+    if (map && map->read_w)
+        return map->read_w(addr, map->priv) |
+               ((uint64_t) map->read_w(addr + 2, map->priv) << 16) |
+               ((uint64_t) map->read_w(addr + 4, map->priv) << 32) |
+               ((uint64_t) map->read_w(addr + 6, map->priv) << 48);
+
+    if (map && map->read_b)
+        return map->read_b(addr, map->priv) |
+               ((uint64_t) map->read_b(addr + 1, map->priv) << 8) |
+               ((uint64_t) map->read_b(addr + 2, map->priv) << 16) |
+               ((uint64_t) map->read_b(addr + 3, map->priv) << 24) |
+               ((uint64_t) map->read_b(addr + 4, map->priv) << 32) |
+               ((uint64_t) map->read_b(addr + 5, map->priv) << 40) |
+               ((uint64_t) map->read_b(addr + 6, map->priv) << 48) |
+               ((uint64_t) map->read_b(addr + 7, map->priv) << 56);
+
+    return 0xffffffffffffffffULL;
 }
 
 void
@@ -929,10 +953,11 @@ writememql_2386(uint32_t addr, uint64_t val)
     mem_mapping_t *map;
     int            i;
     uint64_t       a = 0x0000000000000000ULL;
+    uint32_t       temp_cr0 = cpu_old_paging ? (cr0 ^ 0x80000000) : cr0;
 
     for (i = 0; i < 8; i++) {
         addr64a[i] = (uint64_t) (addr + i);
-        mem_debug_check_addr(addr + i, 1);
+        mem_debug_check_addr(addr + i, 2);
     }
     GDBSTUB_MEM_ACCESS_FAST(addr64a, GDBSTUB_MEM_WRITE, 8);
 
@@ -943,7 +968,7 @@ writememql_2386(uint32_t addr, uint64_t val)
     if (addr & 7) {
         cycles -= timing_misaligned;
         if ((addr & 0xfff) > 0xff8) {
-            if (cr0 >> 31) {
+            if (temp_cr0 >> 31) {
                 for (i = 0; i < 8; i++) {
                     /* Do not translate a page that has a valid lookup, as that is by definition valid
                        and the whole purpose of the lookup is to avoid repeat identical translations. */
@@ -971,13 +996,13 @@ writememql_2386(uint32_t addr, uint64_t val)
 
             /* No need to waste precious CPU host cycles on mmutranslate's that were already done, just pass
                their result as a parameter to be used if needed. */
-            writememll_no_mmut(addr, addr64a, val);
-            writememll_no_mmut(addr + 4, &(addr64a[4]), val >> 32);
+            writememll_no_mmut_2386(addr, addr64a, val);
+            writememll_no_mmut_2386(addr + 4, &(addr64a[4]), val >> 32);
             return;
         }
     }
 
-    if (cr0 >> 31) {
+    if (temp_cr0 >> 31) {
         addr64a[0] = mmutranslate_write_2386(addr);
         if (addr64a[0] > 0xffffffffULL)
             return;
@@ -1018,13 +1043,14 @@ do_mmutranslate_2386(uint32_t addr, uint32_t *a64, int num, int write)
     int i;
     uint32_t last_addr = addr + (num - 1);
     uint64_t a = 0x0000000000000000ULL;
+    uint32_t temp_cr0 = cpu_old_paging ? (cr0 ^ 0x80000000) : cr0;
 
-    mem_debug_check_addr(addr, write);
+    mem_debug_check_addr(addr, write ? 2 : read_type);
 
     for (i = 0; i < num; i++)
 	a64[i] = (uint64_t) addr;
 
-    if (!(cr0 >> 31))
+    if (!(temp_cr0 >> 31))
         return;
 
     for (i = 0; i < num; i++) {
diff --git a/src/network/net_eeprom_nmc93cxx.c b/src/mem/nmc93cxx.c
similarity index 91%
rename from src/network/net_eeprom_nmc93cxx.c
rename to src/mem/nmc93cxx.c
index 681263717..50905bae2 100644
--- a/src/network/net_eeprom_nmc93cxx.c
+++ b/src/mem/nmc93cxx.c
@@ -28,19 +28,9 @@
 #include <86box/device.h>
 #include <86box/timer.h>
 #include <86box/nvr.h>
-#include <86box/vid_ati_eeprom.h>
-#include <86box/net_eeprom_nmc93cxx.h>
+#include <86box/nmc93cxx.h>
 #include <86box/plat_unused.h>
 
-struct nmc93cxx_eeprom_t {
-    ati_eeprom_t dev;
-    uint8_t  addrbits;
-    uint16_t size;
-    char     filename[1024];
-};
-
-typedef struct nmc93cxx_eeprom_t nmc93cxx_eeprom_t;
-
 #ifdef ENABLE_NMC93CXX_EEPROM_LOG
 int nmc93cxx_eeprom_do_log = ENABLE_NMC93CXX_EEPROM_LOG;
 
@@ -60,14 +50,14 @@ nmc93cxx_eeprom_log(int lvl, const char *fmt, ...)
 #endif
 
 static void *
-nmc93cxx_eeprom_init_params(UNUSED(const device_t *info), void *params)
+nmc93cxx_eeprom_init(const device_t *info)
 {
     uint16_t                  nwords         = 64;
     uint8_t                   addrbits       = 6;
     uint8_t                   filldefault    = 1;
-    nmc93cxx_eeprom_params_t *params_details = (nmc93cxx_eeprom_params_t *) params;
+    nmc93cxx_eeprom_params_t *params_details = (nmc93cxx_eeprom_params_t *) info->local;
     nmc93cxx_eeprom_t        *eeprom         = NULL;
-    if (!params)
+    if (info->local == 0)
         return NULL;
 
     nwords = params_details->nwords;
@@ -110,6 +100,16 @@ nmc93cxx_eeprom_init_params(UNUSED(const device_t *info), void *params)
     return eeprom;
 }
 
+static void
+nmc93cxx_eeprom_save(nmc93cxx_eeprom_t *eeprom)
+{
+    FILE *fp = nvr_fopen(eeprom->filename, "wb");
+    if (!fp)
+        return;
+    fwrite(eeprom->dev.data, 2, eeprom->size, fp);
+    fclose(fp);
+}
+
 void
 nmc93cxx_eeprom_write(nmc93cxx_eeprom_t *eeprom, int eecs, int eesk, int eedi)
 {
@@ -133,21 +133,25 @@ nmc93cxx_eeprom_write(nmc93cxx_eeprom_t *eeprom, int eecs, int eesk, int eedi)
             uint8_t subcommand = address >> (eeprom->addrbits - 2);
             if (command == 0 && subcommand == 2) {
                 /* Erase all. */
-                for (address = 0; address < eeprom->size; address++) {
+                for (address = 0; address < eeprom->size; address++)
                     eeprom->dev.data[address] = 0xffff;
-                }
+
+                nmc93cxx_eeprom_save(eeprom);
             } else if (command == 3) {
                 /* Erase word. */
                 eeprom->dev.data[address] = 0xffff;
-            } else if (tick >= 2 + 2 + eeprom->addrbits + 16) {
+                nmc93cxx_eeprom_save(eeprom);
+            } else if (tick >= (2 + 2 + eeprom->addrbits + 16)) {
                 if (command == 1) {
                     /* Write word. */
                     eeprom->dev.data[address] &= eeprom->dev.dat;
+                    nmc93cxx_eeprom_save(eeprom);
                 } else if (command == 0 && subcommand == 1) {
                     /* Write all. */
-                    for (address = 0; address < eeprom->size; address++) {
+                    for (address = 0; address < eeprom->size; address++)
                         eeprom->dev.data[address] &= eeprom->dev.dat;
-                    }
+
+                    nmc93cxx_eeprom_save(eeprom);
                 }
             }
         }
@@ -263,7 +267,7 @@ nmc93cxx_eeprom_close(void *priv)
 uint16_t *
 nmc93cxx_eeprom_data(nmc93cxx_eeprom_t *eeprom)
 {
-    if (UNLIKELY(!eeprom))
+    if (UNLIKELY(eeprom == NULL))
         return NULL;
     /* Get EEPROM data array. */
     return &eeprom->dev.data[0];
@@ -272,12 +276,12 @@ nmc93cxx_eeprom_data(nmc93cxx_eeprom_t *eeprom)
 const device_t nmc93cxx_device = {
     .name          = "National Semiconductor NMC93Cxx",
     .internal_name = "nmc93cxx",
-    .flags         = DEVICE_EXTPARAMS,
+    .flags         = 0,
     .local         = 0,
-    .init_ext      = nmc93cxx_eeprom_init_params,
+    .init          = nmc93cxx_eeprom_init,
     .close         = nmc93cxx_eeprom_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/mem/rom.c b/src/mem/rom.c
index 4a20e8ebc..f7b2b2b0d 100644
--- a/src/mem/rom.c
+++ b/src/mem/rom.c
@@ -86,12 +86,58 @@ rom_add_path(const char *path)
     path_slash(rom_path->path);
 }
 
+static int
+rom_check(const char *fn)
+{
+    FILE *fp = NULL;
+    int ret = 0;
+
+    if ((fn[strlen(fn) - 1] == '/') || (fn[strlen(fn) - 1] == '\\'))
+        ret = plat_dir_check((char *) fn);
+    else {
+        fp = fopen(fn, "rb");
+        ret = (fp != NULL);
+        if (fp != NULL)
+            fclose(fp);
+    }
+
+    return ret;
+}
+
+void
+rom_get_full_path(char *dest, const char *fn)
+{
+    char temp[1024] = { 0 };
+
+    dest[0] = 0x00;
+
+    if (strstr(fn, "roms/") == fn) {
+        /* Relative path */
+        for (rom_path_t *rom_path = &rom_paths; rom_path != NULL; rom_path = rom_path->next) {
+            path_append_filename(temp, rom_path->path, fn + 5);
+
+            if (rom_check(temp)) {
+                strcpy(dest, temp);
+                return;
+            }
+        }
+
+        return;
+    } else {
+        /* Absolute path */
+        strcpy(dest, fn);
+    }
+}
+
 FILE *
 rom_fopen(const char *fn, char *mode)
 {
     char        temp[1024];
     FILE       *fp = NULL;
 
+    if ((fn == NULL) || (mode == NULL))
+        return NULL;
+
     if (strstr(fn, "roms/") == fn) {
         /* Relative path */
         for (rom_path_t *rom_path = &rom_paths; rom_path != NULL; rom_path = rom_path->next) {
@@ -202,6 +248,57 @@ rom_readl(uint32_t addr, void *priv)
     return (*(uint32_t *) &rom->rom[(addr - rom->mapping.base) & rom->mask]);
 }
 
+void
+rom_write(uint32_t addr, uint8_t val, void *priv)
+{
+    const rom_t *rom = (rom_t *) priv;
+
+#ifdef ROM_TRACE
+    if (rom->mapping.base == ROM_TRACE)
+        rom_log("ROM: write byte from BIOS at %06lX\n", addr);
+#endif
+
+    if (addr < rom->mapping.base)
+        return;
+    if (addr >= (rom->mapping.base + rom->sz))
+        return;
+    rom->rom[(addr - rom->mapping.base) & rom->mask] = val;
+}
+
+void
+rom_writew(uint32_t addr, uint16_t val, void *priv)
+{
+    rom_t *rom = (rom_t *) priv;
+
+#ifdef ROM_TRACE
+    if (rom->mapping.base == ROM_TRACE)
+        rom_log("ROM: write word from BIOS at %06lX\n", addr);
+#endif
+
+    if (addr < (rom->mapping.base - 1))
+        return;
+    if (addr >= (rom->mapping.base + rom->sz))
+        return;
+    *(uint16_t *) &rom->rom[(addr - rom->mapping.base) & rom->mask] = val;
+}
+
+void
+rom_writel(uint32_t addr, uint32_t val, void *priv)
+{
+    rom_t *rom = (rom_t *) priv;
+
+#ifdef ROM_TRACE
+    if (rom->mapping.base == ROM_TRACE)
+        rom_log("ROM: write long from BIOS at %06lX\n", addr);
+#endif
+
+    if (addr < (rom->mapping.base - 3))
+        return;
+    if (addr >= (rom->mapping.base + rom->sz))
+        return;
+    *(uint32_t *) &rom->rom[(addr - rom->mapping.base) & rom->mask] = val;
+}
+
 int
 rom_load_linear_oddeven(const char *fn, uint32_t addr, int sz, int off, uint8_t *ptr)
 {
@@ -227,11 +324,12 @@ rom_load_linear_oddeven(const char *fn, uint32_t addr, int sz, int off, uint8_t
         }
         for (int i = 0; i < (sz >> 1); i++) {
             if (fread(ptr + (addr + (i << 1) + 1), 1, 1, fp) != 1)
-                fatal("rom_load_linear(): Error reading od data\n");
+                fatal("rom_load_linear(): Error reading odd data\n");
         }
     }
 
-    (void) fclose(fp);
+    if (fp != NULL)
+        (void) fclose(fp);
 
     return 1;
 }
@@ -260,7 +358,8 @@ rom_load_linear(const char *fn, uint32_t addr, int sz, int off, uint8_t *ptr)
             fatal("rom_load_linear(): Error reading data\n");
     }
 
-    (void) fclose(fp);
+    if (fp != NULL)
+        (void) fclose(fp);
 
     return 1;
 }
@@ -296,9 +395,16 @@ rom_load_linear_inverted(const char *fn, uint32_t addr, int sz, int off, uint8_t
             fatal("rom_load_linear_inverted(): Error reading the upper half of the data\n");
         if (fread(ptr + addr, sz >> 1, 1, fp) > (sz >> 1))
             fatal("rom_load_linear_inverted(): Error reading the lower half of the data\n");
+        if (sz == 0x40000) {
+            if (fread(ptr + addr + 0x30000, 1, sz >> 1, fp) > (sz >> 1))
+                fatal("rom_load_linear_inverted(): Error reading the upper half of the data\n");
+            if (fread(ptr + addr + 0x20000, sz >> 1, 1, fp) > (sz >> 1))
+                fatal("rom_load_linear_inverted(): Error reading the lower half of the data\n");
+        }
     }
 
-    (void) fclose(fp);
+    if (fp != NULL)
+        (void) fclose(fp);
 
     return 1;
 }
@@ -339,8 +445,10 @@ rom_load_interleaved(const char *fnl, const char *fnh, uint32_t addr, int sz, in
         }
     }
 
-    (void) fclose(fph);
-    (void) fclose(fpl);
+    if (fph != NULL)
+        (void) fclose(fph);
+    if (fpl != NULL)
+        (void) fclose(fpl);
 
     return 1;
 }
diff --git a/src/mem/row.c b/src/mem/row.c
index ccd0325a4..c3e10841f 100644
--- a/src/mem/row.c
+++ b/src/mem/row.c
@@ -334,15 +334,15 @@ row_init(const device_t *info)
 
 /* NOTE: NOT const, so that we can patch it at init. */
 device_t row_device = {
-    .name = "DRAM Rows",
+    .name          = "DRAM Rows",
     .internal_name = "dram_rows",
-    .flags = DEVICE_AT,
-    .local = 0x0000,
-    .init = row_init,
-    .close = row_close,
-    .reset = row_reset,
-    { .available = NULL },
+    .flags         = DEVICE_ISA16,
+    .local         = 0x0000,
+    .init          = row_init,
+    .close         = row_close,
+    .reset         = row_reset,
+    .available     = NULL,
     .speed_changed = NULL,
-    .force_redraw = NULL,
-    .config = NULL
+    .force_redraw  = NULL,
+    .config        = NULL
 };
diff --git a/src/mem/smram.c b/src/mem/smram.c
index 0532e2dd5..928760f3a 100644
--- a/src/mem/smram.c
+++ b/src/mem/smram.c
@@ -59,9 +59,12 @@ smram_read(uint32_t addr, void *priv)
     const smram_t *dev      = (smram_t *) priv;
     uint32_t       new_addr = addr - dev->host_base + dev->ram_base;
 
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
     if (new_addr >= (1 << 30))
         return mem_read_ram_2gb(new_addr, priv);
-    else if (!use_separate_smram || (new_addr >= 0xa0000))
+    else
+#endif
+    if (!use_separate_smram || (new_addr >= 0xa0000))
         return mem_read_ram(new_addr, priv);
     else
         return dev->mapping.exec[addr - dev->host_base];
@@ -73,9 +76,12 @@ smram_readw(uint32_t addr, void *priv)
     smram_t *dev      = (smram_t *) priv;
     uint32_t new_addr = addr - dev->host_base + dev->ram_base;
 
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
     if (new_addr >= (1 << 30))
         return mem_read_ram_2gbw(new_addr, priv);
-    else if (!use_separate_smram || (new_addr >= 0xa0000))
+    else
+#endif
+    if (!use_separate_smram || (new_addr >= 0xa0000))
         return mem_read_ramw(new_addr, priv);
     else
         return *(uint16_t *) &(dev->mapping.exec[addr - dev->host_base]);
@@ -87,9 +93,12 @@ smram_readl(uint32_t addr, void *priv)
     smram_t *dev      = (smram_t *) priv;
     uint32_t new_addr = addr - dev->host_base + dev->ram_base;
 
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
     if (new_addr >= (1 << 30))
         return mem_read_ram_2gbl(new_addr, priv);
-    else if (!use_separate_smram || (new_addr >= 0xa0000))
+    else
+#endif
+    if (!use_separate_smram || (new_addr >= 0xa0000))
         return mem_read_raml(new_addr, priv);
     else
         return *(uint32_t *) &(dev->mapping.exec[addr - dev->host_base]);
@@ -245,12 +254,11 @@ smram_add(void)
         return NULL;
     }
 
-    temp_smram = (smram_t *) malloc(sizeof(smram_t));
+    temp_smram = (smram_t *) calloc(1, sizeof(smram_t));
     if (temp_smram == NULL) {
-        fatal("smram_add(): temp_smram malloc failed\n");
+        fatal("smram_add(): temp_smram calloc failed\n");
         return NULL;
     }
-    memset(temp_smram, 0x00, sizeof(smram_t));
     memset(&(temp_smram->mapping), 0x00, sizeof(mem_mapping_t));
 
     /* Add struct to the beginning of the list if necessary.*/
diff --git a/src/mem/spd.c b/src/mem/spd.c
index a3bcba46d..01cd7b464 100644
--- a/src/mem/spd.c
+++ b/src/mem/spd.c
@@ -136,7 +136,7 @@ spd_populate(uint16_t *rows, uint8_t slot_count, uint16_t total_size, uint16_t m
         /* Look for a module to split. */
         split = 0;
         for (row = 0; row < slot_count; row++) {
-            if ((rows[row] < (min_module_size << 1)) || (rows[row] != (1 << log2i(rows[row]))))
+            if ((rows[row] <= (min_module_size << 1)) || (rows[row] != (1 << log2i(rows[row]))))
                 continue; /* no module here, module is too small to be split, or asymmetric module */
 
             /* Find next empty row. */
@@ -221,8 +221,7 @@ spd_register(uint8_t ram_type, uint8_t slot_mask, uint16_t max_module_size)
         if (!(slot_mask & (1 << slot)))
             continue; /* slot disabled */
 
-        spd_modules[slot] = (spd_t *) malloc(sizeof(spd_t));
-        memset(spd_modules[slot], 0, sizeof(spd_t));
+        spd_modules[slot] = (spd_t *) calloc(1, sizeof(spd_t));
         spd_modules[slot]->slot = slot;
         spd_modules[slot]->size = rows[row];
 
@@ -595,7 +594,7 @@ static const device_t spd_device = {
     .init          = spd_init,
     .close         = spd_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/mem/sst_flash.c b/src/mem/sst_flash.c
index cd6ec7cd9..34bfae83a 100644
--- a/src/mem/sst_flash.c
+++ b/src/mem/sst_flash.c
@@ -25,6 +25,7 @@
 #include <86box/device.h>
 #include <86box/mem.h>
 #include <86box/machine.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/nvr.h>
 #include <86box/plat.h>
@@ -505,10 +506,9 @@ static void *
 sst_init(const device_t *info)
 {
     FILE  *fp;
-    sst_t *dev = malloc(sizeof(sst_t));
-    memset(dev, 0, sizeof(sst_t));
+    sst_t *dev = calloc(1, sizeof(sst_t));
 
-    sprintf(flash_path, "%s.bin", machine_get_internal_name_ex(machine));
+    sprintf(flash_path, "%s.bin", machine_get_nvr_name_ex(machine));
 
     mem_mapping_disable(&bios_mapping);
     mem_mapping_disable(&bios_high_mapping);
@@ -576,7 +576,7 @@ const device_t sst_flash_29ee010_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -590,7 +590,7 @@ const device_t sst_flash_29ee020_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -604,7 +604,7 @@ const device_t winbond_flash_w29c512_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -618,7 +618,7 @@ const device_t winbond_flash_w29c010_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -632,7 +632,7 @@ const device_t winbond_flash_w29c020_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -646,7 +646,7 @@ const device_t winbond_flash_w29c040_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -660,7 +660,7 @@ const device_t sst_flash_39sf512_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -674,7 +674,7 @@ const device_t sst_flash_39sf010_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -688,7 +688,7 @@ const device_t sst_flash_39sf020_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -702,7 +702,7 @@ const device_t sst_flash_39sf040_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -716,7 +716,7 @@ const device_t sst_flash_39lf512_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -730,7 +730,7 @@ const device_t sst_flash_39lf010_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -744,7 +744,7 @@ const device_t sst_flash_39lf020_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -758,7 +758,7 @@ const device_t sst_flash_39lf040_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -772,7 +772,7 @@ const device_t sst_flash_39lf080_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -786,7 +786,7 @@ const device_t sst_flash_39lf016_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -808,7 +808,7 @@ const device_t sst_flash_49lf002_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -822,7 +822,7 @@ const device_t sst_flash_49lf020_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -836,7 +836,7 @@ const device_t sst_flash_49lf020a_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -850,7 +850,7 @@ const device_t sst_flash_49lf003_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -864,7 +864,7 @@ const device_t sst_flash_49lf030_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -878,7 +878,7 @@ const device_t sst_flash_49lf004_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -892,7 +892,7 @@ const device_t sst_flash_49lf004c_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -906,7 +906,7 @@ const device_t sst_flash_49lf040_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -920,7 +920,7 @@ const device_t sst_flash_49lf008_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -934,7 +934,7 @@ const device_t sst_flash_49lf008c_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -948,7 +948,7 @@ const device_t sst_flash_49lf080_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -962,7 +962,7 @@ const device_t sst_flash_49lf016_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -977,7 +977,7 @@ const device_t sst_flash_49lf160_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -991,7 +991,7 @@ const device_t amd_flash_29f020a_device = {
     .init          = sst_init,
     .close         = sst_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index b0ba913d5..0943a9258 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -9,20 +9,44 @@
 #          CMake build script.
 #
 # Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
 #
 #          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2024      Jasmine Iwanek.
 #
 set(net_sources)
-list(APPEND net_sources network.c net_pcap.c net_slirp.c net_dp8390.c net_3c501.c
-    net_3c503.c net_ne2000.c net_pcnet.c net_wd8003.c net_plip.c net_event.c net_null.c
-    net_eeprom_nmc93cxx.c net_tulip.c net_rtl8139.c net_l80225.c)
+list(APPEND net_sources
+    network.c
+    net_pcap.c
+    net_slirp.c
+    net_dp8390.c
+    net_3c501.c
+    net_3c503.c
+    net_ne2000.c
+    net_pcnet.c
+    net_wd8003.c
+    net_plip.c
+    net_event.c
+    net_null.c
+    net_tulip.c
+    net_rtl8139.c
+    net_l80225.c
+    net_modem.c
+    utils/getline.c
+)
 
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(SLIRP REQUIRED IMPORTED_TARGET slirp)
 target_link_libraries(86Box PkgConfig::SLIRP)
 
 if(WIN32)
-    target_link_libraries(PkgConfig::SLIRP INTERFACE wsock32 ws2_32 iphlpapi iconv)
+    target_link_libraries(PkgConfig::SLIRP INTERFACE wsock32 ws2_32 iphlpapi)
+    if (NOT MSVC)
+        target_link_libraries(PkgConfig::SLIRP INTERFACE iconv)
+    endif()
+    if(STATIC_BUILD)
+        add_compile_definitions(LIBSLIRP_STATIC)
+    endif()
 endif()
 
 if (HAIKU)
@@ -33,7 +57,22 @@ if(WIN32)
     target_link_libraries(86Box ws2_32)
 endif()
 
+if(NETSWITCH)
+    add_compile_definitions(USE_NETSWITCH)
+    list(APPEND net_sources
+	    net_netswitch.c
+        netswitch.c
+        pb_common.c
+        pb_encode.c
+        pb_decode.c
+        networkmessage.pb.c
+    )
+endif()
+
 if (UNIX)
+    if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+	set_source_files_properties(net_slirp.c PROPERTIES COMPILE_FLAGS "-I/usr/local/include")
+    endif()
     find_path(HAS_VDE "libvdeplug.h" PATHS ${VDE_INCLUDE_DIR} "/usr/include /usr/local/include" "/opt/homebrew/include" )
     if(HAS_VDE)
         find_library(VDE_LIB vdeplug)
@@ -45,5 +84,14 @@ if (UNIX)
         endif()
     endif()
 endif()
+if (UNIX AND NOT APPLE) # Support for TAP on Linux and BSD, supposedly.
+    find_path(HAS_TAP "linux/if_tun.h" PATHS ${TAP_INCLUDE_DIR} "/usr/include /usr/local/include" "/opt/homebrew/include" )
+    if(HAS_TAP)
+        add_compile_definitions(HAS_TAP)
+        list(APPEND net_sources net_tap.c)
+    else()
+        message(WARNING "TAP support not available. Are you on some BSD?")
+    endif()
+endif()
 
 add_library(net OBJECT ${net_sources})
diff --git a/src/network/net_3c501.c b/src/network/net_3c501.c
index 5b9fc0cac..f5809afb1 100644
--- a/src/network/net_3c501.c
+++ b/src/network/net_3c501.c
@@ -56,8 +56,6 @@
 #include <86box/thread.h>
 #include <86box/timer.h>
 #include <86box/network.h>
-#include <86box/net_3c501.h>
-#include <86box/bswap.h>
 #include <86box/plat_unused.h>
 
 /* Maximum number of times we report a link down to the guest (failure to send frame) */
@@ -1081,8 +1079,7 @@ threec501_nic_init(UNUSED(const device_t *info))
     uint32_t     mac;
     threec501_t *dev;
 
-    dev = malloc(sizeof(threec501_t));
-    memset(dev, 0x00, sizeof(threec501_t));
+    dev = calloc(1, sizeof(threec501_t));
     dev->maclocal[0] = 0x02; /* 02:60:8C (3Com OID) */
     dev->maclocal[1] = 0x60;
     dev->maclocal[2] = 0x8C;
@@ -1157,30 +1154,31 @@ threec501_nic_close(void *priv)
 
 static const device_config_t threec501_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x300,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x300,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "0x280", .value = 0x280 },
             { .description = "0x300", .value = 0x300 },
             { .description = "0x310", .value = 0x310 },
             { .description = "0x320", .value = 0x320 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 3,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 3,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "IRQ 2/9", .value = 9 },
             { .description = "IRQ 3", .value = 3 },
             { .description = "IRQ 4", .value = 4 },
@@ -1189,28 +1187,34 @@ static const device_config_t threec501_config[] = {
             { .description = "IRQ 7", .value = 7 },
             { .description = ""                  }
         },
+        .bios           = { { 0 } }
     },
     {
         .name = "dma",
-        .description = "DMA channel",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 3,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .description = "DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 3,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "DMA 1", .value = 1 },
             { .description = "DMA 2", .value = 2 },
             { .description = "DMA 3", .value = 3 },
             { .description = ""                  }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "mac",
-        .description = "MAC Address",
-        .type = CONFIG_MAC,
-        .default_string = "",
-        .default_int = -1
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
@@ -1223,7 +1227,7 @@ const device_t threec501_device = {
     .init          = threec501_nic_init,
     .close         = threec501_nic_close,
     .reset         = elnkR3Reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = threec501_config
diff --git a/src/network/net_3c503.c b/src/network/net_3c503.c
index d01b423ae..ea64633bc 100644
--- a/src/network/net_3c503.c
+++ b/src/network/net_3c503.c
@@ -45,6 +45,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <stdarg.h>
 #include <wchar.h>
 #include <time.h>
@@ -60,8 +61,6 @@
 #include <86box/timer.h>
 #include <86box/network.h>
 #include <86box/net_dp8390.h>
-#include <86box/net_3c503.h>
-#include <86box/bswap.h>
 #include <86box/plat_unused.h>
 
 typedef struct threec503_t {
@@ -574,8 +573,7 @@ threec503_nic_init(UNUSED(const device_t *info))
     uint32_t     mac;
     threec503_t *dev;
 
-    dev = malloc(sizeof(threec503_t));
-    memset(dev, 0x00, sizeof(threec503_t));
+    dev = calloc(1, sizeof(threec503_t));
     dev->maclocal[0] = 0x02; /* 02:60:8C (3Com OID) */
     dev->maclocal[1] = 0x60;
     dev->maclocal[2] = 0x8C;
@@ -657,14 +655,14 @@ threec503_nic_close(void *priv)
 static const device_config_t threec503_config[] = {
     // clang-format off
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x300,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x300,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "0x250", .value = 0x250 },
             { .description = "0x280", .value = 0x280 },
             { .description = "0x2a0", .value = 0x2a0 },
@@ -675,80 +673,83 @@ static const device_config_t threec503_config[] = {
             { .description = "0x350", .value = 0x350 },
             { .description = "",      .value =     0 }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 3,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 3,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "IRQ 2", .value = 2 },
             { .description = "IRQ 3", .value = 3 },
             { .description = "IRQ 4", .value = 4 },
             { .description = "IRQ 5", .value = 5 },
             { .description = "",      .value = 0 }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dma",
-        .description = "DMA",
-        .type = CONFIG_SELECTION,
+        .name           = "dma",
+        .description    = "DMA",
+        .type           = CONFIG_SELECTION,
         .default_string = "",
-        .default_int = 3,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .default_int    = 3,
+        .file_filter    = "",
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "DMA 1", .value = 1 },
             { .description = "DMA 2", .value = 2 },
             { .description = "DMA 3", .value = 3 },
             { .description = "",      .value = 0 }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "mac",
-        .description = "MAC Address",
-        .type = CONFIG_MAC,
-        .default_string = "",
-        .default_int = -1,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "", .value = 0 }
-        },
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "bios_addr",
-        .description = "BIOS address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0xCC000,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xCC000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "DC00", .value = 0xDC000 },
             { .description = "D800", .value = 0xD8000 },
             { .description = "C800", .value = 0xC8000 },
             { .description = "CC00", .value = 0xCC000 },
-            { .description = "",     .value = 0 }
+            { .description = "",     .value =       0 }
         },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 // clang-format off
 };
 
 const device_t threec503_device = {
-    .name = "3Com EtherLink II",
+    .name          = "3Com EtherLink II",
     .internal_name = "3c503",
-    .flags = DEVICE_ISA,
-    .local = 0,
-    .init = threec503_nic_init,
-    .close = threec503_nic_close,
-    .reset = NULL,
-    { .available = NULL },
+    .flags         = DEVICE_ISA,
+    .local         = 0,
+    .init          = threec503_nic_init,
+    .close         = threec503_nic_close,
+    .reset         = NULL,
+    .available     = NULL,
     .speed_changed = NULL,
-    .force_redraw = NULL,
-    .config = threec503_config
+    .force_redraw  = NULL,
+    .config        = threec503_config
 };
diff --git a/src/network/net_dp8390.c b/src/network/net_dp8390.c
index 1c308e913..a0e0e7129 100644
--- a/src/network/net_dp8390.c
+++ b/src/network/net_dp8390.c
@@ -19,6 +19,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <stdarg.h>
 #include <wchar.h>
 #include <time.h>
@@ -198,6 +199,11 @@ dp8390_write_cr(dp8390_t *dev, uint32_t val)
         if (dev->TCR.loop_cntl) {
             dp8390_rx_common(dev, &dev->mem[((dev->tx_page_start * 256) - dev->mem_start) & dev->mem_wrap],
                              dev->tx_bytes);
+
+            if (dev->IMR.rx_inte && !dev->ISR.pkt_tx && dev->interrupt)
+                dev->interrupt(dev->priv, 1);
+
+            dev->ISR.pkt_tx = 1;
         }
     } else if (val & 0x04) {
         if (dev->CR.stop || (!dev->CR.start && (dev->flags & DP8390_FLAG_CHECK_CR))) {
@@ -220,12 +226,6 @@ dp8390_write_cr(dp8390_t *dev, uint32_t val)
         if (!(dev->card->link_state & NET_LINK_DOWN))
             network_tx(dev->card, &dev->mem[((dev->tx_page_start * 256) - dev->mem_start) & dev->mem_wrap], dev->tx_bytes);
 
-            /* some more debug */
-#ifdef ENABLE_DP8390_LOG
-        if (dev->tx_timer_active)
-            dp8390_log("DP8390: CR write, tx timer still active\n");
-#endif
-
         dp8390_tx(dev, val);
     }
 
@@ -247,12 +247,12 @@ dp8390_tx(dp8390_t *dev, UNUSED(uint32_t val))
 {
     dev->CR.tx_packet = 0;
     dev->TSR.tx_ok    = 1;
-    dev->ISR.pkt_tx   = 1;
 
     /* Generate an interrupt if not masked */
-    if (dev->IMR.tx_inte && dev->interrupt)
+    if (dev->IMR.tx_inte && !dev->ISR.pkt_tx && dev->interrupt)
         dev->interrupt(dev->priv, 1);
-    dev->tx_timer_active = 0;
+
+    dev->ISR.pkt_tx   = 1;
 }
 
 /*
@@ -384,14 +384,19 @@ dp8390_rx_common(void *priv, uint8_t *buf, int io_len)
                pkthdr[0], pkthdr[1], pkthdr[2], pkthdr[3]);
 
     /* Copy into buffer, update curpage, and signal interrupt if config'd */
-    startptr = &dev->mem[(dev->curr_page * 256) - dev->mem_start];
+    if (((dev->curr_page * 256) - dev->mem_start) >= dev->mem_size)
+        /* Do this to fix Windows 2000 crashing the emulator when its
+           MPU-401 probe hits the NIC. */
+        startptr = dev->sink_buffer;
+    else
+        startptr = &dev->mem[(dev->curr_page * 256) - dev->mem_start];
     memcpy(startptr, pkthdr, sizeof(pkthdr));
     if ((nextpage > dev->curr_page) || ((dev->curr_page + pages) == dev->page_stop)) {
         memcpy(startptr + sizeof(pkthdr), buf, io_len);
     } else {
         endbytes = (dev->page_stop - dev->curr_page) * 256;
         memcpy(startptr + sizeof(pkthdr), buf, endbytes - sizeof(pkthdr));
-        startptr = &dev->mem[((dev->tx_page_start * 256) - dev->mem_start) & dev->mem_wrap];
+        startptr = &dev->mem[((dev->page_start * 256) - dev->mem_start) & dev->mem_wrap];
         memcpy(startptr, buf + endbytes - sizeof(pkthdr), io_len - endbytes + 8);
     }
     dev->curr_page = nextpage;
@@ -913,8 +918,7 @@ dp8390_set_defaults(dp8390_t *dev, uint8_t flags)
 void
 dp8390_mem_alloc(dp8390_t *dev, uint32_t start, uint32_t size)
 {
-    dev->mem = (uint8_t *) malloc(size * sizeof(uint8_t));
-    memset(dev->mem, 0, size * sizeof(uint8_t));
+    dev->mem = (uint8_t *) calloc(size, sizeof(uint8_t));
     dev->mem_start = start;
     dev->mem_end   = start + size;
     dev->mem_size  = size;
@@ -956,7 +960,6 @@ dp8390_reset(dp8390_t *dev)
     memset(&dev->TCR, 0x00, sizeof(dev->TCR));
     memset(&dev->TSR, 0x00, sizeof(dev->TSR));
     memset(&dev->RSR, 0x00, sizeof(dev->RSR));
-    dev->tx_timer_active = 0;
     dev->local_dma       = 0;
     dev->page_start      = 0;
     dev->page_stop       = 0;
@@ -1002,8 +1005,7 @@ dp8390_soft_reset(dp8390_t *dev)
 static void *
 dp8390_init(UNUSED(const device_t *info))
 {
-    dp8390_t *dp8390 = (dp8390_t *) malloc(sizeof(dp8390_t));
-    memset(dp8390, 0, sizeof(dp8390_t));
+    dp8390_t *dp8390 = (dp8390_t *) calloc(1, sizeof(dp8390_t));
 
     /* Set values assuming WORD and only the clear IRQ flag -
        - the NIC can then call dp8390_set_defaults() again to
@@ -1042,7 +1044,7 @@ const device_t dp8390_device = {
     .init          = dp8390_init,
     .close         = dp8390_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/network/net_modem.c b/src/network/net_modem.c
new file mode 100644
index 000000000..af97a16db
--- /dev/null
+++ b/src/network/net_modem.c
@@ -0,0 +1,1634 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Hayes AT-compliant modem emulation.
+ *
+ *
+ *
+ * Authors: Cacodemon345
+ *          The DOSBox Team
+ *
+ *          Copyright 2024 Cacodemon345
+ *          Copyright (C) 2022       The DOSBox Staging Team
+ *          Copyright (C) 2002-2021  The DOSBox Team
+ */
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <wchar.h>
+#include <stdbool.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/thread.h>
+#include <86box/fifo.h>
+#include <86box/fifo8.h>
+#include <86box/timer.h>
+#include <86box/serial.h>
+#include <86box/plat.h>
+#include <86box/network.h>
+#include <86box/version.h>
+#include <86box/plat_unused.h>
+#include <86box/plat_netsocket.h>
+
+#ifdef ENABLE_MODEM_LOG
+int modem_do_log = ENABLE_MODEM_LOG;
+
+static void
+modem_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (modem_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define modem_log(fmt, ...)
+#endif
+
+/* From RFC 1055. */
+#define END     0300 /* indicates end of packet */
+#define ESC     0333 /* indicates byte stuffing */
+#define ESC_END 0334 /* ESC ESC_END means END data byte */
+#define ESC_ESC 0335 /* ESC ESC_ESC means ESC data byte */
+
+typedef enum ResTypes {
+    ResNONE,
+    ResOK,
+    ResERROR,
+    ResCONNECT,
+    ResRING,
+    ResBUSY,
+    ResNODIALTONE,
+    ResNOCARRIER,
+    ResNOANSWER
+} ResTypes;
+
+enum modem_types {
+    MODEM_TYPE_SLIP  = 1,
+    MODEM_TYPE_PPP   = 2,
+    MODEM_TYPE_TCPIP = 3
+};
+
+typedef enum modem_mode_t {
+    MODEM_MODE_COMMAND = 0,
+    MODEM_MODE_DATA    = 1
+} modem_mode_t;
+
+typedef enum modem_slip_stage_t {
+    MODEM_SLIP_STAGE_USERNAME,
+    MODEM_SLIP_STAGE_PASSWORD
+} modem_slip_stage_t;
+
+#define COMMAND_BUFFER_SIZE 512
+#define NUMBER_BUFFER_SIZE  128
+#define PHONEBOOK_SIZE      200
+
+typedef struct modem_phonebook_entry_t {
+    char phone[NUMBER_BUFFER_SIZE];
+    char address[NUMBER_BUFFER_SIZE];
+} modem_phonebook_entry_t;
+
+typedef struct modem_t {
+    uint8_t   mac[6];
+    serial_t *serial;
+    uint32_t  baudrate;
+
+    modem_mode_t mode;
+
+    uint8_t    esc_character_expected;
+    pc_timer_t host_to_serial_timer;
+    pc_timer_t dtr_timer;
+    pc_timer_t cmdpause_timer;
+
+    uint8_t  tx_pkt_ser_line[0x10000]; /* SLIP-encoded. */
+    uint32_t tx_count;
+
+    Fifo8   rx_data; /* Data received from the network. */
+    uint8_t reg[100];
+
+    Fifo8 data_pending; /* Data yet to be sent to the host. */
+
+    char     cmdbuf[COMMAND_BUFFER_SIZE];
+    char     prevcmdbuf[COMMAND_BUFFER_SIZE];
+    char     numberinprogress[NUMBER_BUFFER_SIZE];
+    char     lastnumber[NUMBER_BUFFER_SIZE];
+    uint32_t cmdpos;
+    uint32_t port;
+    int      plusinc, flowcontrol;
+    int      in_warmup, dtrmode;
+    int      dcdmode;
+
+    bool     connected, ringing;
+    bool     echo, numericresponse;
+    bool     tcpIpMode, tcpIpConnInProgress;
+    bool     cooldown;
+    bool     telnet_mode;
+    bool     dtrstate;
+    uint32_t tcpIpConnCounter;
+
+    int doresponse;
+    int cmdpause;
+    int listen_port;
+    int ringtimer;
+
+    SOCKET serversocket;
+    SOCKET clientsocket;
+    SOCKET waitingclientsocket;
+
+    struct {
+        bool    binary[2];
+        bool    echo[2];
+        bool    supressGA[2];
+        bool    timingMark[2];
+        bool    inIAC;
+        bool    recCommand;
+        uint8_t command;
+    } telClient;
+
+    modem_phonebook_entry_t entries[PHONEBOOK_SIZE];
+    uint32_t                entries_num;
+
+    netcard_t *card;
+} modem_t;
+
+#define MREG_AUTOANSWER_COUNT 0
+#define MREG_RING_COUNT       1
+#define MREG_ESCAPE_CHAR      2
+#define MREG_CR_CHAR          3
+#define MREG_LF_CHAR          4
+#define MREG_BACKSPACE_CHAR   5
+#define MREG_GUARD_TIME       12
+#define MREG_DTR_DELAY        25
+
+static void modem_do_command(modem_t *modem, int repeat);
+static void modem_accept_incoming_call(modem_t *modem);
+
+extern ssize_t local_getline(char **buf, size_t *bufsiz, FILE *fp);
+
+// https://stackoverflow.com/a/122974
+char *
+trim(char *str)
+{
+    size_t len    = 0;
+    char  *frontp = str;
+    char  *endp   = NULL;
+
+    if (str == NULL) {
+        return NULL;
+    }
+    if (str[0] == '\0') {
+        return str;
+    }
+
+    len  = strlen(str);
+    endp = str + len;
+
+    /* Move the front and back pointers to address the first non-whitespace
+     * characters from each end.
+     */
+    while (isspace((unsigned char) *frontp)) {
+        ++frontp;
+    }
+    if (endp != frontp) {
+        while (isspace((unsigned char) *(--endp)) && endp != frontp) { }
+    }
+
+    if (frontp != str && endp == frontp)
+        *str = '\0';
+    else if (str + len - 1 != endp)
+        *(endp + 1) = '\0';
+
+    /* Shift the string so that it starts at str so that if it's dynamically
+     * allocated, we can still free it on the returned pointer.  Note the reuse
+     * of endp to mean the front of the string buffer now.
+     */
+    endp = str;
+    if (frontp != str) {
+        while (*frontp) {
+            *endp++ = *frontp++;
+        }
+        *endp = '\0';
+    }
+
+    return str;
+}
+
+static void
+modem_read_phonebook_file(modem_t *modem, const char *path)
+{
+    FILE  *file = plat_fopen(path, "r");
+    char  *buf  = NULL;
+    char  *buf2 = NULL;
+    size_t size = 0;
+    if (!file)
+        return;
+
+    modem->entries_num = 0;
+
+    modem_log("Modem: Reading phone book file %s...\n", path);
+    while (local_getline(&buf, &size, file) != -1) {
+        modem_phonebook_entry_t entry = { { 0 }, { 0 } };
+        buf[strcspn(buf, "\r\n")]     = '\0';
+
+        /* Remove surrounding whitespace from the input line and find the address part. */
+        buf  = trim(buf);
+        buf2 = &buf[strcspn(buf, " \t")];
+
+        /* Remove surrounding whitespace and any extra text from the address part, then store it. */
+        buf2                       = trim(buf2);
+        buf2[strcspn(buf2, " \t")] = '\0';
+        strncpy(entry.address, buf2, sizeof(entry.address) - 1);
+
+        /* Split the line to get the phone number part, then store it. */
+        buf2[0] = '\0';
+        strncpy(entry.phone, buf, sizeof(entry.phone) - 1);
+
+        if ((entry.phone[0] == '\0') || (entry.address[0] == '\0')) {
+            /* Appears to be a bad line. */
+            modem_log("Modem: Skipped a bad line\n");
+            continue;
+        }
+
+        if (strspn(entry.phone, "01234567890*=,;#+>") != strlen(entry.phone)) {
+            /* Invalid characters. */
+            modem_log("Modem: Invalid character in phone number %s\n", entry.phone);
+            continue;
+        }
+
+        modem_log("Modem: Mapped phone number %s to address %s\n", entry.phone, entry.address);
+        modem->entries[modem->entries_num++] = entry;
+        if (modem->entries_num >= PHONEBOOK_SIZE)
+            break;
+    }
+    fclose(file);
+}
+
+static void
+modem_echo(modem_t *modem, uint8_t c)
+{
+    if (modem->echo && fifo8_num_free(&modem->data_pending))
+        fifo8_push(&modem->data_pending, c);
+}
+
+static uint32_t
+modem_scan_number(char **scan)
+{
+    char     c   = 0;
+    uint32_t ret = 0;
+    while (1) {
+        c = **scan;
+        if (c == 0)
+            break;
+        if (c >= '0' && c <= '9') {
+            ret *= 10;
+            ret += c - '0';
+            *scan = *scan + 1;
+        } else
+            break;
+    }
+    return ret;
+}
+
+static uint8_t
+modem_fetch_character(char **scan)
+{
+    uint8_t c = **scan;
+    *scan     = *scan + 1;
+    return c;
+}
+
+static void
+modem_speed_changed(void *priv)
+{
+    modem_t *dev = (modem_t *) priv;
+    if (!dev)
+        return;
+
+    timer_stop(&dev->host_to_serial_timer);
+    /* FIXME: do something to dev->baudrate */
+    timer_on_auto(&dev->host_to_serial_timer, (1000000.0 / (double) dev->baudrate) * 9);
+#if 0
+    serial_clear_fifo(dev->serial);
+#endif
+}
+
+static void
+modem_send_line(modem_t *modem, const char *line)
+{
+    fifo8_push(&modem->data_pending, modem->reg[MREG_CR_CHAR]);
+    fifo8_push(&modem->data_pending, modem->reg[MREG_LF_CHAR]);
+    fifo8_push_all(&modem->data_pending, (uint8_t *) line, strlen(line));
+    fifo8_push(&modem->data_pending, modem->reg[MREG_CR_CHAR]);
+    fifo8_push(&modem->data_pending, modem->reg[MREG_LF_CHAR]);
+}
+
+static void
+modem_send_number(modem_t *modem, uint32_t val)
+{
+    fifo8_push(&modem->data_pending, modem->reg[MREG_CR_CHAR]);
+    fifo8_push(&modem->data_pending, modem->reg[MREG_LF_CHAR]);
+
+    fifo8_push(&modem->data_pending, val / 100 + '0');
+    val = val % 100;
+    fifo8_push(&modem->data_pending, val / 10 + '0');
+    val = val % 10;
+    fifo8_push(&modem->data_pending, val + '0');
+
+    fifo8_push(&modem->data_pending, modem->reg[MREG_CR_CHAR]);
+    fifo8_push(&modem->data_pending, modem->reg[MREG_LF_CHAR]);
+}
+
+static void
+process_tx_packet(modem_t *modem, uint8_t *p, uint32_t len)
+{
+    int      received            = 0;
+    uint32_t pos                 = 0;
+    uint8_t *processed_tx_packet = calloc(len, 1);
+    uint8_t  c                   = 0;
+
+    modem_log("Processing SLIP packet of %u bytes\n", len);
+
+    while (pos < len) {
+        c = p[pos];
+        pos++;
+        switch (c) {
+            case END:
+                if (received)
+                    goto send_tx_packet;
+                else
+                    break;
+
+            case ESC:
+                {
+                    c = p[pos];
+                    pos++;
+
+                    switch (c) {
+                        case ESC_END:
+                            c = END;
+                            break;
+                        case ESC_ESC:
+                            c = ESC;
+                            break;
+                    }
+                }
+
+            default:
+                if (received < len)
+                    processed_tx_packet[received++] = c;
+                break;
+        }
+    }
+
+send_tx_packet:
+    if (received) {
+        uint8_t *buf = calloc(received + 14, 1);
+        buf[0] = buf[1] = buf[2] = buf[3] = buf[4] = buf[5] = 0xFF;
+        buf[6] = buf[7] = buf[8] = buf[9] = buf[10] = buf[11] = 0xFC;
+        buf[12]                                               = 0x08;
+        buf[13]                                               = 0x00;
+        memcpy(buf + 14, processed_tx_packet, received);
+        network_tx(modem->card, buf, received + 14);
+        free(buf);
+    }
+    free(processed_tx_packet);
+    return;
+}
+
+static void
+modem_data_mode_process_byte(modem_t *modem, uint8_t data)
+{
+    if (modem->reg[MREG_ESCAPE_CHAR] <= 127) {
+        if (modem->plusinc >= 1 && modem->plusinc <= 3 && modem->reg[MREG_ESCAPE_CHAR] == data) {
+            modem->plusinc++;
+        } else {
+            modem->plusinc = 0;
+        }
+    }
+    modem->cmdpause = 0;
+
+    if (modem->tx_count < 0x10000 && modem->connected) {
+        modem->tx_pkt_ser_line[modem->tx_count++] = data;
+        if (data == END && !modem->tcpIpMode) {
+            process_tx_packet(modem, modem->tx_pkt_ser_line, (uint32_t) modem->tx_count);
+            modem->tx_count = 0;
+        }
+    }
+}
+
+static void
+host_to_modem_cb(void *priv)
+{
+    modem_t *modem = (modem_t *) priv;
+
+    if (modem->in_warmup || (modem->serial == NULL))
+        goto no_write_to_machine;
+
+    if ((modem->serial->type >= SERIAL_16550) && modem->serial->fifo_enabled) {
+        if (fifo_get_full(modem->serial->rcvr_fifo)) {
+            goto no_write_to_machine;
+        }
+    } else {
+        if (modem->serial->lsr & 1) {
+            goto no_write_to_machine;
+        }
+    }
+
+    if (!((modem->serial->mctrl & 2) || modem->flowcontrol != 3))
+        goto no_write_to_machine;
+
+    if (modem->mode == MODEM_MODE_DATA && fifo8_num_used(&modem->rx_data) && !modem->cooldown) {
+        serial_write_fifo(modem->serial, fifo8_pop(&modem->rx_data));
+    } else if (fifo8_num_used(&modem->data_pending)) {
+        uint8_t val = fifo8_pop(&modem->data_pending);
+        serial_write_fifo(modem->serial, val);
+    }
+
+    if (fifo8_num_used(&modem->data_pending) == 0) {
+        modem->cooldown = false;
+    }
+
+no_write_to_machine:
+    timer_on_auto(&modem->host_to_serial_timer, (1000000.0 / (double) modem->baudrate) * (double) 9);
+}
+
+static void
+modem_write(UNUSED(serial_t *s), void *priv, uint8_t txval)
+{
+    modem_t *modem = (modem_t *) priv;
+
+    if (modem->mode == MODEM_MODE_COMMAND) {
+        if (modem->cmdpos < 2) {
+            // Ignore everything until we see "AT" sequence.
+            if (modem->cmdpos == 0 && toupper(txval) != 'A') {
+                return;
+            }
+
+            if (modem->cmdpos == 1 && toupper(txval) != 'T') {
+                if (txval == '/') {
+                    // Repeat the last command.
+                    modem_echo(modem, txval);
+                    modem_log("Repeat last command (%s)\n", modem->prevcmdbuf);
+                    modem_do_command(modem, 1);
+                } else {
+                    modem_echo(modem, modem->reg[MREG_BACKSPACE_CHAR]);
+                    modem->cmdpos = 0;
+                }
+                return;
+            }
+        } else {
+            // Now entering command.
+            if (txval == modem->reg[MREG_BACKSPACE_CHAR]) {
+                if (modem->cmdpos > 2) {
+                    modem_echo(modem, txval);
+                    modem->cmdpos--;
+                }
+                return;
+            }
+
+            if (txval == modem->reg[MREG_LF_CHAR]) {
+                return; // Real modem doesn't seem to skip this?
+            }
+
+            if (txval == modem->reg[MREG_CR_CHAR]) {
+                modem_echo(modem, txval);
+                modem_do_command(modem, 0);
+                return;
+            }
+        }
+
+        if (modem->cmdpos < 99) {
+            modem_echo(modem, txval);
+            modem->cmdbuf[modem->cmdpos] = txval;
+            modem->cmdpos++;
+        }
+    } else {
+        modem_data_mode_process_byte(modem, txval);
+    }
+}
+
+void
+modem_send_res(modem_t *modem, const ResTypes response)
+{
+    char        response_str_connect[256] = { 0 };
+    const char *response_str              = NULL;
+    uint32_t    code                      = -1;
+
+    snprintf(response_str_connect, sizeof(response_str_connect), "CONNECT %u", modem->baudrate);
+
+    switch (response) {
+        case ResOK:
+            code         = 0;
+            response_str = "OK";
+            break;
+        case ResCONNECT:
+            code         = 1;
+            response_str = response_str_connect;
+            break;
+        case ResRING:
+            code         = 2;
+            response_str = "RING";
+            break;
+        case ResNOCARRIER:
+            code         = 3;
+            response_str = "NO CARRIER";
+            break;
+        case ResERROR:
+            code         = 4;
+            response_str = "ERROR";
+            break;
+        case ResNODIALTONE:
+            code         = 6;
+            response_str = "NO DIALTONE";
+            break;
+        case ResBUSY:
+            code         = 7;
+            response_str = "BUSY";
+            break;
+        case ResNOANSWER:
+            code         = 8;
+            response_str = "NO ANSWER";
+            break;
+        case ResNONE:
+            return;
+    }
+
+    if (modem->doresponse != 1) {
+        if (modem->doresponse == 2 && (response == ResRING || response == ResCONNECT || response == ResNOCARRIER)) {
+            return;
+        }
+        modem_log("Modem response: %s\n", response_str);
+        if (modem->numericresponse && code != ~0) {
+            modem_send_number(modem, code);
+        } else if (response_str != NULL) {
+            modem_send_line(modem, response_str);
+        }
+    }
+}
+
+void
+modem_enter_idle_state(modem_t *modem)
+{
+    timer_disable(&modem->dtr_timer);
+    modem->connected           = false;
+    modem->ringing             = false;
+    modem->mode                = MODEM_MODE_COMMAND;
+    modem->in_warmup           = 0;
+    modem->tcpIpConnInProgress = 0;
+    modem->tcpIpConnCounter    = 0;
+
+    if (modem->waitingclientsocket != (SOCKET) -1)
+        plat_netsocket_close(modem->waitingclientsocket);
+
+    if (modem->clientsocket != (SOCKET) -1)
+        plat_netsocket_close(modem->clientsocket);
+
+    modem->clientsocket = modem->waitingclientsocket = (SOCKET) -1;
+    if (modem->serversocket != (SOCKET) -1) {
+        modem->waitingclientsocket = plat_netsocket_accept(modem->serversocket);
+        while (modem->waitingclientsocket != (SOCKET) -1) {
+            plat_netsocket_close(modem->waitingclientsocket);
+            modem->waitingclientsocket = plat_netsocket_accept(modem->serversocket);
+        }
+        plat_netsocket_close(modem->serversocket);
+        modem->serversocket = (SOCKET) -1;
+    }
+
+    if (modem->waitingclientsocket != (SOCKET) -1)
+        plat_netsocket_close(modem->waitingclientsocket);
+
+    modem->waitingclientsocket = (SOCKET) -1;
+    modem->tcpIpMode           = false;
+    modem->tcpIpConnInProgress = false;
+
+    if (modem->listen_port) {
+        modem->serversocket = plat_netsocket_create_server(NET_SOCKET_TCP, modem->listen_port);
+        if (modem->serversocket == (SOCKET) -1) {
+            modem_log("Failed to set up server on port %d\n", modem->listen_port);
+        }
+    }
+
+    if (modem->serial != NULL) {
+        serial_set_cts(modem->serial, 1);
+        serial_set_dsr(modem->serial, 1);
+        serial_set_dcd(modem->serial, (!modem->dcdmode ? 1 : 0));
+        serial_set_ri(modem->serial, 0);
+    }
+}
+
+void
+modem_enter_connected_state(modem_t *modem)
+{
+    modem_send_res(modem, ResCONNECT);
+    modem->mode      = MODEM_MODE_DATA;
+    modem->ringing   = false;
+    modem->connected = true;
+    modem->tcpIpMode = true;
+    modem->cooldown  = true;
+    modem->tx_count  = 0;
+    plat_netsocket_close(modem->serversocket);
+    modem->serversocket = -1;
+    memset(&modem->telClient, 0, sizeof(modem->telClient));
+
+    if (modem->serial != NULL) {
+        serial_set_dcd(modem->serial, 1);
+        serial_set_ri(modem->serial, 0);
+    }
+}
+
+void
+modem_reset(modem_t *modem)
+{
+    modem->dcdmode = 1;
+    modem_enter_idle_state(modem);
+    modem->cmdpos              = 0;
+    modem->cmdbuf[0]           = 0;
+    modem->prevcmdbuf[0]       = 0;
+    modem->lastnumber[0]       = 0;
+    modem->numberinprogress[0] = 0;
+    modem->flowcontrol         = 0;
+    modem->cmdpause            = 0;
+    modem->plusinc             = 0;
+    modem->dtrmode             = 2;
+
+    memset(&modem->reg, 0, sizeof(modem->reg));
+    modem->reg[MREG_AUTOANSWER_COUNT] = 0; // no autoanswer
+    modem->reg[MREG_RING_COUNT]       = 1;
+    modem->reg[MREG_ESCAPE_CHAR]      = '+';
+    modem->reg[MREG_CR_CHAR]          = '\r';
+    modem->reg[MREG_LF_CHAR]          = '\n';
+    modem->reg[MREG_BACKSPACE_CHAR]   = '\b';
+    modem->reg[MREG_GUARD_TIME]       = 50;
+    modem->reg[MREG_DTR_DELAY]        = 5;
+
+    modem->echo            = true;
+    modem->doresponse      = 0;
+    modem->numericresponse = false;
+}
+
+void
+modem_dial(modem_t *modem, const char *str)
+{
+    modem->tcpIpConnCounter = 0;
+    modem->tcpIpMode        = false;
+    if (!strcmp(str, "0.0.0.0") || !strcmp(str, "0000")) {
+        modem_log("Turning on SLIP\n");
+        modem_enter_connected_state(modem);
+        modem->numberinprogress[0] = 0;
+        modem->tcpIpMode           = false;
+    } else {
+        char buf[NUMBER_BUFFER_SIZE] = "";
+        strncpy(buf, str, sizeof(buf) - 1);
+        strncpy(modem->lastnumber, str, sizeof(modem->lastnumber) - 1);
+        modem_log("Connecting to %s...\n", buf);
+
+        // Scan host for port
+        uint16_t port;
+        char    *hasport = strrchr(buf, ':');
+        if (hasport) {
+            *hasport++ = 0;
+            port       = (uint16_t) atoi(hasport);
+        } else {
+            port = 23;
+        }
+
+        modem->numberinprogress[0] = 0;
+        modem->clientsocket        = plat_netsocket_create(NET_SOCKET_TCP);
+        if (modem->clientsocket == -1) {
+            modem_log("Failed to create client socket\n");
+            modem_send_res(modem, ResNOCARRIER);
+            modem_enter_idle_state(modem);
+            return;
+        }
+
+        if (-1 == plat_netsocket_connect(modem->clientsocket, buf, port)) {
+            modem_log("Failed to connect to %s\n", buf);
+            modem_send_res(modem, ResNOCARRIER);
+            modem_enter_idle_state(modem);
+            return;
+        }
+        modem->tcpIpConnInProgress = 1;
+        modem->tcpIpConnCounter    = 0;
+    }
+}
+
+static bool
+is_next_token(const char *a, size_t N, const char *b)
+{
+    // Is 'b' at least as long as 'a'?
+    size_t N_without_null = N - 1;
+    if (strnlen(b, N) < N_without_null)
+        return false;
+    return (strncmp(a, b, N_without_null) == 0);
+}
+
+static const char *
+modem_get_address_from_phonebook(modem_t *modem, const char *input)
+{
+    int i = 0;
+    for (i = 0; i < modem->entries_num; i++) {
+        if (strcmp(input, modem->entries[i].phone) == 0)
+            return modem->entries[i].address;
+    }
+
+    return NULL;
+}
+
+static void
+modem_do_command(modem_t *modem, int repeat)
+{
+    int   i       = 0;
+    char *scanbuf = NULL;
+
+    if (repeat) {
+        /* Handle the case of A/ being invoked without a previous command to run */
+        if (modem->prevcmdbuf[0] == '\0') {
+            modem_send_res(modem, ResOK);
+            return;
+        }
+        /* Load the stored previous command line */
+        strncpy(modem->cmdbuf, modem->prevcmdbuf, sizeof(modem->cmdbuf) - 1);
+        modem->cmdbuf[COMMAND_BUFFER_SIZE - 1] = '\0';
+    } else {
+        /* Store the command line to be recalled */
+        strncpy(modem->prevcmdbuf, modem->cmdbuf, sizeof(modem->prevcmdbuf) - 1);
+        modem->prevcmdbuf[COMMAND_BUFFER_SIZE - 1] = '\0';
+        modem->cmdbuf[modem->cmdpos] = modem->prevcmdbuf[modem->cmdpos] = '\0';
+    }
+    modem->cmdpos = 0;
+    for (i = 0; i < sizeof(modem->cmdbuf); i++) {
+        modem->cmdbuf[i] = toupper(modem->cmdbuf[i]);
+    }
+
+    /* AT command set interpretation */
+    if ((modem->cmdbuf[0] != 'A') || (modem->cmdbuf[1] != 'T')) {
+        modem_send_res(modem, ResERROR);
+        return;
+    }
+
+    modem_log("Command received: %s (doresponse = %d)\n", modem->cmdbuf, modem->doresponse);
+
+    scanbuf = &modem->cmdbuf[2];
+
+    while (1) {
+        char chr = modem_fetch_character(&scanbuf);
+        switch (chr) {
+            case '+':
+                if (is_next_token("NET", sizeof("NET"), scanbuf)) {
+                    // only walk the pointer ahead if the command matches
+                    scanbuf += 3;
+                    const uint32_t requested_mode = modem_scan_number(&scanbuf);
+
+                    // If the mode isn't valid then stop parsing
+                    if (requested_mode != 1 && requested_mode != 0) {
+                        modem_send_res(modem, ResERROR);
+                        return;
+                    }
+                    // Inform the user on changes
+                    if (modem->telnet_mode != !!requested_mode) {
+                        modem->telnet_mode = !!requested_mode;
+                    }
+                    break;
+                }
+                modem_send_res(modem, ResERROR);
+                return;
+            case 'D':
+                { // Dial.
+                    char        buffer[NUMBER_BUFFER_SIZE];
+                    char        obuffer[NUMBER_BUFFER_SIZE];
+                    char       *foundstr   = &scanbuf[0];
+                    const char *mappedaddr = NULL;
+                    size_t      i          = 0;
+
+                    if (*foundstr == 'T' || *foundstr == 'P') // Tone/pulse dialing
+                        foundstr++;
+                    else if (*foundstr == 'L') { // Redial last number
+                        if (modem->lastnumber[0] == 0)
+                            modem_send_res(modem, ResERROR);
+                        else {
+                            modem_log("Redialing number %s\n", modem->lastnumber);
+                            modem_dial(modem, modem->lastnumber);
+                        }
+                        return;
+                    }
+
+                    if ((!foundstr[0] && !modem->numberinprogress[0]) || ((strlen(modem->numberinprogress) + strlen(foundstr)) > (NUMBER_BUFFER_SIZE - 1))) {
+                        // Check for empty or too long strings
+                        modem_send_res(modem, ResERROR);
+                        modem->numberinprogress[0] = 0;
+                        return;
+                    }
+
+                    foundstr = trim(foundstr);
+
+                    // Check for ; and return to command mode if found
+                    char *semicolon = strchr(foundstr, ';');
+                    if (semicolon != NULL) {
+                        modem_log("Semicolon found in number, returning to command mode\n");
+                        strncat(modem->numberinprogress, foundstr, strcspn(foundstr, ";"));
+                        scanbuf = semicolon + 1;
+                        break;
+                    } else {
+                        strcat(modem->numberinprogress, foundstr);
+                        foundstr = modem->numberinprogress;
+                    }
+
+                    modem_log("Dialing number %s\n", foundstr);
+                    mappedaddr = modem_get_address_from_phonebook(modem, foundstr);
+                    if (mappedaddr) {
+                        modem_dial(modem, mappedaddr);
+                        return;
+                    }
+
+                    if (strlen(foundstr) >= 12) {
+                        // Check if supplied parameter only consists of digits
+                        bool   isNum = true;
+                        size_t fl    = strlen(foundstr);
+                        for (i = 0; i < fl; i++)
+                            if (foundstr[i] < '0' || foundstr[i] > '9')
+                                isNum = false;
+                        if (isNum && (fl > (NUMBER_BUFFER_SIZE - 5))) {
+                            // Check if the number is long enough to cause buffer
+                            // overflows during the number => IP transformation
+                            modem_send_res(modem, ResERROR);
+                            modem->numberinprogress[0] = 0;
+                            return;
+                        } else if (isNum) {
+                            // Parameter is a number with at least 12 digits => this cannot
+                            // be a valid IP/name
+                            // Transform by adding dots
+                            size_t       j        = 0;
+                            const size_t foundlen = strlen(foundstr);
+                            for (i = 0; i < foundlen; i++) {
+                                buffer[j++] = foundstr[i];
+                                // Add a dot after the third, sixth and ninth number
+                                if (i == 2 || i == 5 || i == 8)
+                                    buffer[j++] = '.';
+                                // If the string is longer than 12 digits,
+                                // interpret the rest as port
+                                if (i == 11 && foundlen > 12)
+                                    buffer[j++] = ':';
+                            }
+                            buffer[j] = 0;
+                            foundstr  = buffer;
+
+                            // Remove Zeros from beginning of octets
+                            size_t k         = 0;
+                            size_t foundlen2 = strlen(foundstr);
+                            for (i = 0; i < foundlen2; i++) {
+                                if (i == 0 && foundstr[0] == '0')
+                                    continue;
+                                if (i == 1 && foundstr[0] == '0' && foundstr[1] == '0')
+                                    continue;
+                                if (foundstr[i] == '0' && foundstr[i - 1] == '.')
+                                    continue;
+                                if (foundstr[i] == '0' && foundstr[i - 1] == '0' && foundstr[i - 2] == '.')
+                                    continue;
+                                obuffer[k++] = foundstr[i];
+                            }
+                            obuffer[k] = 0;
+                            foundstr   = obuffer;
+                        }
+                    }
+                    modem_dial(modem, foundstr);
+                    return;
+                }
+            case 'I': // Some strings about firmware
+                switch (modem_scan_number(&scanbuf)) {
+                    case 3:
+                        modem_send_line(modem, "86Box Emulated Modem Firmware V1.00");
+                        break;
+                    case 4:
+                        modem_send_line(modem, "Modem compiled for 86Box version " EMU_VERSION);
+                        break;
+                }
+                break;
+            case 'E': // Echo on/off
+                switch (modem_scan_number(&scanbuf)) {
+                    case 0:
+                        modem->echo = false;
+                        break;
+                    case 1:
+                        modem->echo = true;
+                        break;
+                }
+                break;
+            case 'V':
+                switch (modem_scan_number(&scanbuf)) {
+                    case 0:
+                        modem->numericresponse = true;
+                        break;
+                    case 1:
+                        modem->numericresponse = false;
+                        break;
+                }
+                break;
+            case 'H': // Hang up
+                switch (modem_scan_number(&scanbuf)) {
+                    case 0:
+                        modem->numberinprogress[0] = 0;
+                        if (modem->connected) {
+                            modem_send_res(modem, ResNOCARRIER);
+                            modem_enter_idle_state(modem);
+                            return;
+                        }
+                        // else return ok
+                }
+                break;
+            case 'O': // Return to data mode
+                switch (modem_scan_number(&scanbuf)) {
+                    case 0:
+                        if (modem->connected) {
+                            modem->mode = MODEM_MODE_DATA;
+                            return;
+                        } else {
+                            modem_send_res(modem, ResERROR);
+                            return;
+                        }
+                }
+                break;
+            case 'T': // Tone Dial
+            case 'P': // Pulse Dial
+                break;
+            case 'M': // Monitor
+            case 'L': // Volume
+            case 'W':
+            case 'X':
+                modem_scan_number(&scanbuf);
+                break;
+            case 'A': // Answer call
+                {
+                    if (modem->waitingclientsocket == -1) {
+                        modem_send_res(modem, ResERROR);
+                        return;
+                    }
+                    modem_accept_incoming_call(modem);
+                    break;
+                }
+                return;
+            case 'Z':
+                { // Reset and load profiles
+                    // scan the number away, if any
+                    modem_scan_number(&scanbuf);
+                    if (modem->connected)
+                        modem_send_res(modem, ResNOCARRIER);
+                    modem_reset(modem);
+                    break;
+                }
+            case ' ': // skip space
+                break;
+            case 'Q':
+                {
+                    // Response options
+                    // 0 = all on, 1 = all off,
+                    // 2 = no ring and no connect/carrier in answermode
+                    const uint32_t val = modem_scan_number(&scanbuf);
+                    if (!(val > 2)) {
+                        modem->doresponse = val;
+                        break;
+                    } else {
+                        modem_send_res(modem, ResERROR);
+                        return;
+                    }
+                }
+
+            case 'S':
+                { // Registers
+                    const uint32_t index = modem_scan_number(&scanbuf);
+                    if (index >= 100) {
+                        modem_send_res(modem, ResERROR);
+                        return; // goto ret_none;
+                    }
+
+                    while (scanbuf[0] == ' ')
+                        scanbuf++; // skip spaces
+
+                    if (scanbuf[0] == '=') { // set register
+                        scanbuf++;
+                        while (scanbuf[0] == ' ')
+                            scanbuf++; // skip spaces
+                        const uint32_t val = modem_scan_number(&scanbuf);
+                        modem->reg[index]  = val;
+                        break;
+                    } else if (scanbuf[0] == '?') { // get register
+                        modem_send_number(modem, modem->reg[index]);
+                        scanbuf++;
+                        break;
+                    }
+                    // else
+                    // LOG_MSG("SERIAL: Port %" PRIu8 " print reg %" PRIu32
+                    //         " with %" PRIu8 ".",
+                    //         GetPortNumber(), index, reg[index]);
+                }
+                break;
+            case '&':
+                { // & escaped commands
+                    char cmdchar = modem_fetch_character(&scanbuf);
+                    switch (cmdchar) {
+                        case 'C':
+                            {
+                                const uint32_t val = modem_scan_number(&scanbuf);
+                                if (val < 2)
+                                    modem->dcdmode = val;
+                                else {
+                                    modem_send_res(modem, ResERROR);
+                                    return;
+                                }
+                                break;
+                            }
+                        case 'K':
+                            {
+                                const uint32_t val = modem_scan_number(&scanbuf);
+                                if (val < 5)
+                                    modem->flowcontrol = val;
+                                else {
+                                    modem_send_res(modem, ResERROR);
+                                    return;
+                                }
+                                break;
+                            }
+                        case 'D':
+                            {
+                                const uint32_t val = modem_scan_number(&scanbuf);
+                                if (val < 4)
+                                    modem->dtrmode = val;
+                                else {
+                                    modem_send_res(modem, ResERROR);
+                                    return;
+                                }
+                                break;
+                            }
+                        case '\0':
+                            // end of string
+                            modem_send_res(modem, ResERROR);
+                            return;
+                    }
+                    break;
+                }
+                break;
+            case '\\':
+                { // \ escaped commands
+                    char cmdchar = modem_fetch_character(&scanbuf);
+                    switch (cmdchar) {
+                        case 'N':
+                            // error correction stuff - not emulated
+                            if (modem_scan_number(&scanbuf) > 5) {
+                                modem_send_res(modem, ResERROR);
+                                return;
+                            }
+                            break;
+                        case '\0':
+                            // end of string
+                            modem_send_res(modem, ResERROR);
+                            return;
+                    }
+                    break;
+                }
+            case '%': // % escaped commands
+                // Windows 98 modem prober sends unknown command AT%V
+                modem_send_res(modem, ResERROR);
+                return;
+            case '\0':
+                modem_send_res(modem, ResOK);
+                return;
+        }
+    }
+}
+
+void
+modem_dtr_callback_timer(void *priv)
+{
+    modem_t *dev = (modem_t *) priv;
+    if (dev->connected) {
+        switch (dev->dtrmode) {
+            case 1:
+                modem_log("DTR dropped, returning to command mode (dtrmode = %i)\n", dev->dtrmode);
+                dev->mode = MODEM_MODE_COMMAND;
+                break;
+            case 2:
+                modem_log("DTR dropped, hanging up (dtrmode = %i)\n", dev->dtrmode);
+                modem_send_res(dev, ResNOCARRIER);
+                modem_enter_idle_state(dev);
+                break;
+            case 3:
+                modem_log("DTR dropped, resetting modem (dtrmode = %i)\n", dev->dtrmode);
+                modem_send_res(dev, ResNOCARRIER);
+                modem_reset(dev);
+                break;
+        }
+    }
+}
+
+void
+modem_dtr_callback(UNUSED(serial_t *serial), int status, void *priv)
+{
+    modem_t *dev  = (modem_t *) priv;
+    dev->dtrstate = !!status;
+    if (status == 1)
+        timer_disable(&dev->dtr_timer);
+    else if (!timer_is_enabled(&dev->dtr_timer))
+        timer_on_auto(&dev->dtr_timer, 1000000);
+}
+
+static void
+fifo8_resize_2x(Fifo8 *fifo)
+{
+    uint32_t pos  = 0;
+    uint32_t size = fifo->capacity * 2;
+    uint32_t used = fifo8_num_used(fifo);
+    if (!used)
+        return;
+
+    uint8_t *temp_buf = calloc(size, 1);
+    if (!temp_buf) {
+        fatal("net_modem: Out Of Memory!\n");
+    }
+    while (!fifo8_is_empty(fifo)) {
+        temp_buf[pos] = fifo8_pop(fifo);
+        pos++;
+    }
+    pos = 0;
+    fifo8_destroy(fifo);
+    fifo8_create(fifo, size);
+    fifo8_push_all(fifo, temp_buf, used);
+    free(temp_buf);
+}
+
+#define TEL_CLIENT 0
+#define TEL_SERVER 1
+void
+modem_process_telnet(modem_t *modem, uint8_t *data, uint32_t size)
+{
+    uint32_t i = 0;
+    for (i = 0; i < size; i++) {
+        uint8_t c = data[i];
+        if (modem->telClient.inIAC) {
+            if (modem->telClient.recCommand) {
+                modem_log("modem_process_telnet: received command %i, option %i\n", modem->telClient.command, c);
+
+                if ((c != 0) && (c != 1) && (c != 3)) {
+                    /* Reject anything we don't recognize */
+                    if (modem->telClient.command == 251 || modem->telClient.command == 252) {
+                        modem_data_mode_process_byte(modem, 0xff);
+                        modem_data_mode_process_byte(modem, 254);
+                        modem_data_mode_process_byte(modem, c); /* Don't do crap! */
+                    } else if (modem->telClient.command == 253 || modem->telClient.command == 254) {
+                        modem_data_mode_process_byte(modem, 0xff);
+                        modem_data_mode_process_byte(modem, 252);
+                        modem_data_mode_process_byte(modem, c); /* We won't do crap! */
+                    }
+                }
+                switch (modem->telClient.command) {
+                    case 251: /* Will */
+                        if (c == 0)
+                            modem->telClient.binary[TEL_SERVER] = true;
+                        if (c == 1)
+                            modem->telClient.echo[TEL_SERVER] = true;
+                        if (c == 3)
+                            modem->telClient.supressGA[TEL_SERVER] = true;
+                        break;
+                    case 252: /* Won't */
+                        if (c == 0)
+                            modem->telClient.binary[TEL_SERVER] = false;
+                        if (c == 1)
+                            modem->telClient.echo[TEL_SERVER] = false;
+                        if (c == 3)
+                            modem->telClient.supressGA[TEL_SERVER] = false;
+                        break;
+                    case 253: /* Do */
+                        if (c == 0) {
+                            modem->telClient.binary[TEL_CLIENT] = true;
+                            modem_data_mode_process_byte(modem, 0xff);
+                            modem_data_mode_process_byte(modem, 251);
+                            modem_data_mode_process_byte(modem, 0); /* Will do binary transfer */
+                        }
+                        if (c == 1) {
+                            modem->telClient.echo[TEL_CLIENT] = false;
+                            modem_data_mode_process_byte(modem, 0xff);
+                            modem_data_mode_process_byte(modem, 252);
+                            modem_data_mode_process_byte(modem, 1); /* Won't echo (too lazy) */
+                        }
+                        if (c == 3) {
+                            modem->telClient.supressGA[TEL_CLIENT] = true;
+                            modem_data_mode_process_byte(modem, 0xff);
+                            modem_data_mode_process_byte(modem, 251);
+                            modem_data_mode_process_byte(modem, 3); /* Will Suppress GA */
+                        }
+                        break;
+                    case 254: /* Don't */
+                        if (c == 0) {
+                            modem->telClient.binary[TEL_CLIENT] = false;
+                            modem_data_mode_process_byte(modem, 0xff);
+                            modem_data_mode_process_byte(modem, 252);
+                            modem_data_mode_process_byte(modem, 0); /* Won't do binary transfer */
+                        }
+                        if (c == 1) {
+                            modem->telClient.echo[TEL_CLIENT] = false;
+                            modem_data_mode_process_byte(modem, 0xff);
+                            modem_data_mode_process_byte(modem, 252);
+                            modem_data_mode_process_byte(modem, 1); /* Won't echo (fine by me) */
+                        }
+                        if (c == 3) {
+                            modem->telClient.supressGA[TEL_CLIENT] = true;
+                            modem_data_mode_process_byte(modem, 0xff);
+                            modem_data_mode_process_byte(modem, 251);
+                            modem_data_mode_process_byte(modem, 3); /* Will Suppress GA (too lazy) */
+                        }
+                        break;
+                    default:
+                        break;
+                }
+                modem->telClient.inIAC      = false;
+                modem->telClient.recCommand = false;
+                continue;
+            } else {
+                if (c == 249) {
+                    /* Go Ahead received */
+                    modem->telClient.inIAC = false;
+                    continue;
+                }
+                modem->telClient.command    = c;
+                modem->telClient.recCommand = true;
+
+                if ((modem->telClient.binary[TEL_SERVER]) && (c == 0xff)) {
+                    /* Binary data with value of 255 */
+                    modem->telClient.inIAC      = false;
+                    modem->telClient.recCommand = false;
+                    fifo8_push(&modem->rx_data, 0xff);
+                    continue;
+                }
+            }
+        } else {
+            if (c == 0xff) {
+                modem->telClient.inIAC = true;
+                continue;
+            }
+            fifo8_push(&modem->rx_data, c);
+        }
+    }
+}
+
+static int
+modem_rx(void *priv, uint8_t *buf, int io_len)
+{
+    modem_t *modem = (modem_t *) priv;
+    uint32_t i     = 0;
+
+    if (modem->tcpIpMode)
+        return 0;
+
+    if (!modem->connected) {
+        /* Drop packet. */
+        modem_log("Dropping %d bytes\n", io_len - 14);
+        return 0;
+    }
+
+    while ((io_len) >= (fifo8_num_free(&modem->rx_data) / 2)) {
+        fifo8_resize_2x(&modem->rx_data);
+    }
+
+    if (!(buf[12] == 0x08 && buf[13] == 0x00)) {
+        modem_log("Dropping %d bytes (non-IP packet (ethtype 0x%02X%02X))\n", io_len - 14, buf[12], buf[13]);
+        return 0;
+    }
+
+    modem_log("Receiving %d bytes\n", io_len - 14);
+    /* Strip the Ethernet header. */
+    io_len -= 14;
+    buf += 14;
+
+    fifo8_push(&modem->rx_data, END);
+    for (i = 0; i < io_len; i++) {
+        switch (buf[i]) {
+            case END:
+                fifo8_push(&modem->rx_data, ESC);
+                fifo8_push(&modem->rx_data, ESC_END);
+                break;
+            case ESC:
+                fifo8_push(&modem->rx_data, ESC);
+                fifo8_push(&modem->rx_data, ESC_ESC);
+                break;
+            default:
+                fifo8_push(&modem->rx_data, buf[i]);
+                break;
+        }
+    }
+    fifo8_push(&modem->rx_data, END);
+    return 1;
+}
+
+static void
+modem_rcr_cb(UNUSED(struct serial_s *serial), void *priv)
+{
+    modem_t *dev = (modem_t *) priv;
+
+    timer_stop(&dev->host_to_serial_timer);
+    /* FIXME: do something to dev->baudrate */
+    timer_on_auto(&dev->host_to_serial_timer, (1000000.0 / (double) dev->baudrate) * (double) 9);
+#if 0
+    serial_clear_fifo(dev->serial);
+#endif
+}
+
+static void
+modem_accept_incoming_call(modem_t *modem)
+{
+    if (modem->waitingclientsocket != -1) {
+        modem->clientsocket        = modem->waitingclientsocket;
+        modem->waitingclientsocket = -1;
+        modem_enter_connected_state(modem);
+        modem->in_warmup = 250;
+    } else {
+        modem_enter_idle_state(modem);
+    }
+}
+
+static void
+modem_cmdpause_timer_callback(void *priv)
+{
+    modem_t *modem            = (modem_t *) priv;
+    uint32_t guard_threshold = 0;
+    timer_on_auto(&modem->cmdpause_timer, 1000);
+
+    if (modem->tcpIpConnInProgress) {
+        do {
+            int status = plat_netsocket_connected(modem->clientsocket);
+
+            if (status == -1) {
+                plat_netsocket_close(modem->clientsocket);
+                modem->clientsocket = -1;
+                modem_enter_idle_state(modem);
+                modem_send_res(modem, ResNOCARRIER);
+                modem->tcpIpConnInProgress = 0;
+                break;
+            } else if (status == 1) {
+                modem_enter_connected_state(modem);
+                modem->tcpIpConnInProgress = 0;
+                break;
+            }
+
+            modem->tcpIpConnCounter++;
+
+            if (status < 0 || (status == 0 && modem->tcpIpConnCounter >= 5000)) {
+                plat_netsocket_close(modem->clientsocket);
+                modem->clientsocket = -1;
+                modem_enter_idle_state(modem);
+                modem_send_res(modem, ResNOANSWER);
+                modem->tcpIpConnInProgress = 0;
+                modem->tcpIpMode           = 0;
+                break;
+            }
+        } while (0);
+    }
+
+    if (!modem->connected && modem->waitingclientsocket == -1 && modem->serversocket != -1) {
+        modem->waitingclientsocket = plat_netsocket_accept(modem->serversocket);
+        if (modem->waitingclientsocket != -1) {
+            if (modem->dtrstate == 0 && modem->dtrmode != 0) {
+                modem_enter_idle_state(modem);
+            } else {
+                modem->ringing = true;
+                modem_send_res(modem, ResRING);
+                if (modem->serial != NULL)
+                    serial_set_ri(modem->serial, !serial_get_ri(modem->serial));
+                modem->ringtimer            = 3000;
+                modem->reg[MREG_RING_COUNT] = 0;
+            }
+        }
+    }
+    if (modem->ringing) {
+        if (modem->ringtimer <= 0) {
+            modem->reg[MREG_RING_COUNT]++;
+            if ((modem->reg[MREG_AUTOANSWER_COUNT] > 0) && (modem->reg[MREG_RING_COUNT] >= modem->reg[MREG_AUTOANSWER_COUNT])) {
+                modem_accept_incoming_call(modem);
+                return;
+            }
+            modem_send_res(modem, ResRING);
+            if (modem->serial != NULL)
+                serial_set_ri(modem->serial, !serial_get_ri(modem->serial));
+
+            modem->ringtimer = 3000;
+        }
+        --modem->ringtimer;
+    }
+
+    if (modem->in_warmup) {
+        modem->in_warmup--;
+        if (modem->in_warmup == 0) {
+            modem->tx_count = 0;
+            fifo8_reset(&modem->rx_data);
+        }
+    } else if (modem->connected && modem->tcpIpMode) {
+        if (modem->tx_count) {
+            int wouldblock = 0;
+            int res        = plat_netsocket_send(modem->clientsocket, modem->tx_pkt_ser_line, modem->tx_count, &wouldblock);
+
+            if (res <= 0 && !wouldblock) {
+                /* No bytes sent or error. */
+                modem->tx_count = 0;
+                modem_enter_idle_state(modem);
+                modem_send_res(modem, ResNOCARRIER);
+            } else if (res > 0) {
+                if (res == modem->tx_count) {
+                    modem->tx_count = 0;
+                } else {
+                    memmove(modem->tx_pkt_ser_line, &modem->tx_pkt_ser_line[res], modem->tx_count - res);
+                    modem->tx_count -= res;
+                }
+            }
+        }
+        if (modem->connected) {
+            uint8_t buffer[16];
+            int     wouldblock = 0;
+            int     recv       = MIN(modem->rx_data.capacity - modem->rx_data.num, sizeof(buffer));
+            int     res        = plat_netsocket_receive(modem->clientsocket, buffer, recv, &wouldblock);
+
+            if (res > 0) {
+                if (modem->telnet_mode)
+                    modem_process_telnet(modem, buffer, res);
+                else
+                    fifo8_push_all(&modem->rx_data, buffer, res);
+            } else if (res == 0) {
+                modem->tx_count = 0;
+                modem_enter_idle_state(modem);
+                modem_send_res(modem, ResNOCARRIER);
+            } else if (!wouldblock) {
+                modem->tx_count = 0;
+                modem_enter_idle_state(modem);
+                modem_send_res(modem, ResNOCARRIER);
+            }
+        }
+    }
+
+    modem->cmdpause++;
+    guard_threshold = (uint32_t) (modem->reg[MREG_GUARD_TIME] * 20);
+    if (modem->cmdpause > guard_threshold) {
+        if (modem->plusinc == 0) {
+            modem->plusinc = 1;
+        } else if (modem->plusinc == 4) {
+            modem_log("Escape sequence triggered, returning to command mode\n");
+            modem->mode = MODEM_MODE_COMMAND;
+            modem_send_res(modem, ResOK);
+            modem->plusinc = 0;
+        }
+    }
+}
+
+/* Initialize the device for use by the user. */
+static void *
+modem_init(UNUSED(const device_t *info))
+{
+    modem_t    *modem          = (modem_t *) calloc(1, sizeof(modem_t));
+    const char *phonebook_file = NULL;
+    memset(modem->mac, 0xfc, 6);
+
+    modem->port        = device_get_config_int("port");
+    modem->baudrate    = device_get_config_int("baudrate");
+    modem->listen_port = device_get_config_int("listen_port");
+    modem->telnet_mode = device_get_config_int("telnet_mode");
+
+    modem->clientsocket = modem->serversocket = modem->waitingclientsocket = -1;
+
+    fifo8_create(&modem->data_pending, 0x40000);
+    fifo8_create(&modem->rx_data, 0x40000);
+
+    timer_add(&modem->dtr_timer, modem_dtr_callback_timer, modem, 0);
+    timer_add(&modem->host_to_serial_timer, host_to_modem_cb, modem, 0);
+    timer_add(&modem->cmdpause_timer, modem_cmdpause_timer_callback, modem, 0);
+    timer_on_auto(&modem->cmdpause_timer, 1000);
+    modem->serial = serial_attach_ex_2(modem->port, modem_rcr_cb, modem_write, modem_dtr_callback, modem);
+
+    modem_reset(modem);
+    modem->card = network_attach(modem, modem->mac, modem_rx, NULL);
+
+    phonebook_file = device_get_config_string("phonebook_file");
+    if (phonebook_file && phonebook_file[0] != 0) {
+        modem_read_phonebook_file(modem, phonebook_file);
+    }
+
+    return modem;
+}
+
+void
+modem_close(void *priv)
+{
+    modem_t *modem     = (modem_t *) priv;
+    modem->listen_port = 0;
+    modem_reset(modem);
+    fifo8_destroy(&modem->data_pending);
+    fifo8_destroy(&modem->rx_data);
+    netcard_close(modem->card);
+    free(priv);
+}
+
+// clang-format off
+static const device_config_t modem_config[] = {
+    {
+        .name           = "port",
+        .description    = "Serial Port",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "COM1", .value = 0 },
+            { .description = "COM2", .value = 1 },
+            { .description = "COM3", .value = 2 },
+            { .description = "COM4", .value = 3 },
+            { .description = ""                 }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "baudrate",
+        .description    = "Baud Rate",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 115200,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "115200", .value = 115200 },
+            { .description =  "57600", .value =  57600 },
+            { .description =  "56000", .value =  56000 },
+            { .description =  "38400", .value =  38400 },
+            { .description =  "19200", .value =  19200 },
+            { .description =  "14400", .value =  14400 },
+            { .description =   "9600", .value =   9600 },
+            { .description =   "7200", .value =   7200 },
+            { .description =   "4800", .value =   4800 },
+            { .description =   "2400", .value =   2400 },
+            { .description =   "1800", .value =   1800 },
+            { .description =   "1200", .value =   1200 },
+            { .description =    "600", .value =    600 },
+            { .description =    "300", .value =    300 },
+            { .description = ""                        }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "listen_port",
+        .description    = "TCP/IP listening port",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min =     0,
+            .max = 32767
+        },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "phonebook_file",
+        .description    = "Phonebook File",
+        .type           = CONFIG_FNAME,
+        .default_string = NULL,
+        .file_filter    = "Text files (*.txt)|*.txt",
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "telnet_mode",
+        .description    = "Telnet emulation",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+// clang-format on
+
+const device_t modem_device = {
+    .name          = "Standard Hayes-compliant Modem",
+    .internal_name = "modem",
+    .flags         = DEVICE_COM,
+    .local         = 0,
+    .init          = modem_init,
+    .close         = modem_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = modem_speed_changed,
+    .force_redraw  = NULL,
+    .config        = modem_config
+};
diff --git a/src/network/net_ne2000.c b/src/network/net_ne2000.c
index c7fba404f..0174ef098 100644
--- a/src/network/net_ne2000.c
+++ b/src/network/net_ne2000.c
@@ -48,6 +48,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <stdarg.h>
 #include <wchar.h>
 #include <time.h>
@@ -66,7 +67,6 @@
 #include <86box/network.h>
 #include <86box/net_dp8390.h>
 #include <86box/net_ne2000.h>
-#include <86box/bswap.h>
 #include <86box/isapnp.h>
 #include <86box/plat_fallthrough.h>
 #include <86box/plat_unused.h>
@@ -82,19 +82,6 @@
 #define PCI_DEVID   0x8029 /* RTL8029AS */
 #define PCI_REGSIZE 256    /* size of PCI space */
 
-static uint8_t rtl8019as_pnp_rom[] = {
-    0x4a, 0x8c, 0x80, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                                                                        /* RTL8019, dummy checksum (filled in by isapnp_add_card) */
-    0x0a, 0x10, 0x10,                                                                                                                                                                            /* PnP version 1.0, vendor version 1.0 */
-    0x82, 0x22, 0x00, 'R', 'E', 'A', 'L', 'T', 'E', 'K', ' ', 'P', 'L', 'U', 'G', ' ', '&', ' ', 'P', 'L', 'A', 'Y', ' ', 'E', 'T', 'H', 'E', 'R', 'N', 'E', 'T', ' ', 'C', 'A', 'R', 'D', 0x00, /* ANSI identifier */
-
-    0x16, 0x4a, 0x8c, 0x80, 0x19, 0x02, 0x00,       /* logical device RTL8019 */
-    0x1c, 0x41, 0xd0, 0x80, 0xd6,                   /* compatible device PNP80D6 */
-    0x47, 0x00, 0x20, 0x02, 0x80, 0x03, 0x20, 0x20, /* I/O 0x220-0x380, decodes 10-bit, 32-byte alignment, 32 addresses */
-    0x23, 0x38, 0x9e, 0x01,                         /* IRQ 3/4/5/9/10/11/12/15, high true edge sensitive */
-
-    0x79, 0x00 /* end tag, dummy checksum (filled in by isapnp_add_card) */
-};
-
 typedef struct nic_t {
     dp8390_t   *dp8390;
 
@@ -326,7 +313,7 @@ asic_write(nic_t *dev, uint32_t off, uint32_t val, unsigned len)
 static uint32_t
 page3_read(nic_t *dev, uint32_t off, UNUSED(unsigned int len))
 {
-    if (dev->board >= NE2K_RTL8019AS)
+    if (dev->board >= NE2K_RTL8019AS_PNP)
         switch (off) {
             case 0x1: /* 9346CR */
                 return (dev->_9346cr);
@@ -341,7 +328,7 @@ page3_read(nic_t *dev, uint32_t off, UNUSED(unsigned int len))
                 return (dev->config3 & 0x46);
 
             case 0x8: /* CSNSAV */
-                return ((dev->board == NE2K_RTL8019AS) ? dev->pnp_csnsav : 0x00);
+                return ((dev->board == NE2K_RTL8019AS_PNP) ? dev->pnp_csnsav : 0x00);
 
             case 0xe: /* 8029ASID0 */
                 if (dev->board == NE2K_RTL8029AS)
@@ -364,7 +351,7 @@ page3_read(nic_t *dev, uint32_t off, UNUSED(unsigned int len))
 static void
 page3_write(nic_t *dev, uint32_t off, uint32_t val, UNUSED(unsigned len))
 {
-    if (dev->board >= NE2K_RTL8019AS) {
+    if (dev->board >= NE2K_RTL8019AS_PNP) {
         nelog(3, "%s: Page2 write to register 0x%02x, len=%u, value=0x%04x\n",
               dev->name, off, len, val);
 
@@ -924,16 +911,16 @@ static void *
 nic_init(const device_t *info)
 {
     uint32_t mac;
-    char    *rom;
+    uint32_t mac_oui;
+    char    *rom = NULL;
     nic_t   *dev;
+    int      set_oui = 0;
 
-    dev = malloc(sizeof(nic_t));
-    memset(dev, 0x00, sizeof(nic_t));
+    dev = calloc(1, sizeof(nic_t));
     dev->name  = info->name;
     dev->board = info->local;
-    rom        = NULL;
 
-    if (dev->board >= NE2K_RTL8019AS) {
+    if (dev->board >= NE2K_RTL8019AS_PNP) {
         dev->base_address = 0x340;
         dev->base_irq     = 12;
         if (dev->board == NE2K_RTL8029AS) {
@@ -947,7 +934,8 @@ nic_init(const device_t *info)
         if (dev->board != NE2K_ETHERNEXT_MC) {
             dev->base_address = device_get_config_hex16("base");
             dev->base_irq     = device_get_config_int("irq");
-            if (dev->board == NE2K_NE2000) {
+            if ((dev->board == NE2K_NE2000) || (dev->board == NE2K_NE2000_COMPAT) ||
+                (dev->board == NE2K_NE2000_COMPAT_8BIT) ) {
                 dev->bios_addr = device_get_config_hex20("bios_addr");
                 dev->has_bios  = !!dev->bios_addr;
             } else {
@@ -969,8 +957,8 @@ nic_init(const device_t *info)
         dev->maclocal[4] = random_generate();
         dev->maclocal[5] = random_generate();
         mac              = (((int) dev->maclocal[3]) << 16);
-        mac |= (((int) dev->maclocal[4]) << 8);
-        mac |= ((int) dev->maclocal[5]);
+        mac             |= (((int) dev->maclocal[4]) << 8);
+        mac             |= ((int) dev->maclocal[5]);
         device_set_config_mac("mac", mac);
     } else {
         dev->maclocal[3] = (mac >> 16) & 0xff;
@@ -993,6 +981,17 @@ nic_init(const device_t *info)
             dp8390_mem_alloc(dev->dp8390, 0x2000, 0x2000);
             break;
 
+        case NE2K_NE1000_COMPAT:
+            dev->maclocal[0] = 0x00; /* 00:86:B0 (86Box OID) */
+            dev->maclocal[1] = 0x86;
+            dev->maclocal[2] = 0xB0;
+            dev->is_8bit     = 1;
+            rom              = NULL;
+            set_oui          = 1;
+            dp8390_set_defaults(dev->dp8390, DP8390_FLAG_CHECK_CR | DP8390_FLAG_CLEAR_IRQ);
+            dp8390_mem_alloc(dev->dp8390, 0x2000, 0x2000);
+            break;
+
         case NE2K_NE2000:
             dev->maclocal[0] = 0x00; /* 00:00:D8 (Novell OID) */
             dev->maclocal[1] = 0x00;
@@ -1002,6 +1001,27 @@ nic_init(const device_t *info)
             dp8390_mem_alloc(dev->dp8390, 0x4000, 0x4000);
             break;
 
+        case NE2K_NE2000_COMPAT:
+            dev->maclocal[0] = 0x00; /* 00:86:B0 (86Box OID) */
+            dev->maclocal[1] = 0x86;
+            dev->maclocal[2] = 0xB0;
+            rom              = ROM_PATH_NE2000;
+            set_oui          = 1;
+            dp8390_set_defaults(dev->dp8390, DP8390_FLAG_EVEN_MAC | DP8390_FLAG_CHECK_CR | DP8390_FLAG_CLEAR_IRQ);
+            dp8390_mem_alloc(dev->dp8390, 0x4000, 0x4000);
+            break;
+
+        case NE2K_NE2000_COMPAT_8BIT:
+            dev->maclocal[0] = 0x00; /* 00:86:B0 (86Box OID) */
+            dev->maclocal[1] = 0x86;
+            dev->maclocal[2] = 0xB0;
+            dev->is_8bit     = 1;
+            rom              = ROM_PATH_NE2000;
+            set_oui          = 1;
+            dp8390_set_defaults(dev->dp8390, DP8390_FLAG_EVEN_MAC | DP8390_FLAG_CHECK_CR | DP8390_FLAG_CLEAR_IRQ);
+            dp8390_mem_alloc(dev->dp8390, 0x4000, 0x4000);
+            break;
+
         case NE2K_ETHERNEXT_MC:
             dev->maclocal[0] = 0x00; /* 00:00:D8 (Networth Inc. OID) */
             dev->maclocal[1] = 0x00;
@@ -1013,18 +1033,28 @@ nic_init(const device_t *info)
             dp8390_mem_alloc(dev->dp8390, 0x4000, 0x4000);
             break;
 
-        case NE2K_RTL8019AS:
+        case NE2K_DE220P:
+            dev->maclocal[0] = 0x00; /* 00:80:C8 (D-Link OID) */
+            dev->maclocal[1] = 0x80;
+            dev->maclocal[2] = 0xC8;
+            rom              = NULL;
+            dp8390_set_defaults(dev->dp8390, DP8390_FLAG_EVEN_MAC | DP8390_FLAG_CLEAR_IRQ);
+            dp8390_set_id(dev->dp8390, 0x50, 0x70);
+            dp8390_mem_alloc(dev->dp8390, 0x4000, 0x8000);
+            break;
+
+        case NE2K_RTL8019AS_PNP:
         case NE2K_RTL8029AS:
             dev->is_pci      = (dev->board == NE2K_RTL8029AS) ? 1 : 0;
             dev->maclocal[0] = 0x00; /* 00:E0:4C (Realtek OID) */
             dev->maclocal[1] = 0xE0;
             dev->maclocal[2] = 0x4C;
-            rom              = (dev->board == NE2K_RTL8019AS) ? ROM_PATH_RTL8019 : ROM_PATH_RTL8029;
+            rom              = (dev->board == NE2K_RTL8019AS_PNP) ? ROM_PATH_RTL8019 : ROM_PATH_RTL8029;
             if (dev->is_pci)
                 dp8390_set_defaults(dev->dp8390, DP8390_FLAG_EVEN_MAC);
             else
                 dp8390_set_defaults(dev->dp8390, DP8390_FLAG_EVEN_MAC | DP8390_FLAG_CLEAR_IRQ);
-            dp8390_set_id(dev->dp8390, 0x50, (dev->board == NE2K_RTL8019AS) ? 0x70 : 0x43);
+            dp8390_set_id(dev->dp8390, 0x50, (dev->board == NE2K_RTL8019AS_PNP) ? 0x70 : 0x43);
             dp8390_mem_alloc(dev->dp8390, 0x4000, 0x8000);
             break;
 
@@ -1032,6 +1062,24 @@ nic_init(const device_t *info)
             break;
     }
 
+
+    if (set_oui) {
+        /* See if we have a local MAC address configured. */
+        mac_oui = device_get_config_mac("mac_oui", -1);
+
+        /* Set up our BIA. */
+        if (mac_oui & 0xff000000) {
+            mac_oui          = (((int) dev->maclocal[0]) << 16);
+            mac_oui         |= (((int) dev->maclocal[1]) << 8);
+            mac_oui         |= ((int) dev->maclocal[2]);
+            device_set_config_mac("mac_oui", mac_oui);
+        } else {
+            dev->maclocal[0] = (mac_oui >> 16) & 0xff;
+            dev->maclocal[1] = (mac_oui >> 8) & 0xff;
+            dev->maclocal[2] = (mac_oui & 0xff);
+        }
+    }
+
     memcpy(dev->dp8390->physaddr, dev->maclocal, sizeof(dev->maclocal));
 
     nelog(2, "%s: I/O=%04x, IRQ=%d, MAC=%02x:%02x:%02x:%02x:%02x:%02x\n",
@@ -1043,13 +1091,13 @@ nic_init(const device_t *info)
      * Make this device known to the I/O system.
      * PnP and PCI devices start with address spaces inactive.
      */
-    if (dev->board < NE2K_RTL8019AS && dev->board != NE2K_ETHERNEXT_MC)
+    if ((dev->board < NE2K_RTL8019AS_PNP) && (dev->board != NE2K_ETHERNEXT_MC))
         nic_ioset(dev, dev->base_address);
 
     /* Set up our BIOS ROM space, if any. */
     nic_rom_init(dev, rom);
 
-    if (dev->board >= NE2K_RTL8019AS) {
+    if (dev->board >= NE2K_RTL8019AS_PNP) {
         if (dev->is_pci) {
             /*
              * Configure the PCI space registers.
@@ -1097,7 +1145,7 @@ nic_init(const device_t *info)
             pci_add_card(PCI_ADD_NORMAL, nic_pci_read, nic_pci_write, dev, &dev->pci_slot);
         }
 
-        /* Initialize the RTL8029 EEPROM. */
+        /* Initialize the RTL80x9 EEPROM. */
         memset(dev->eeprom, 0x00, sizeof(dev->eeprom));
 
         if (dev->board == NE2K_RTL8029AS) {
@@ -1108,9 +1156,44 @@ nic_init(const device_t *info)
             dev->eeprom[0x78] = dev->eeprom[0x7C] = (PCI_VENDID & 0xff);
             dev->eeprom[0x79] = dev->eeprom[0x7D] = (PCI_VENDID >> 8);
         } else {
-            memcpy(&dev->eeprom[0x12], rtl8019as_pnp_rom, sizeof(rtl8019as_pnp_rom));
+            const char *pnp_rom_file = NULL;
+            int pnp_rom_len = 0x4a;
+            switch (dev->board) {
+                case NE2K_RTL8019AS_PNP:
+                    pnp_rom_file = "roms/network/rtl8019as/RTL8019A.BIN";
+                    break;
 
-            dev->pnp_card = isapnp_add_card(&dev->eeprom[0x12], sizeof(rtl8019as_pnp_rom), nic_pnp_config_changed, nic_pnp_csn_changed, nic_pnp_read_vendor_reg, nic_pnp_write_vendor_reg, dev);
+                case NE2K_DE220P:
+                    pnp_rom_file = "roms/network/de220p/dlk2201a.bin";
+                    pnp_rom_len = 0x43;
+                    break;
+
+                default:
+                    break;
+            }
+
+            uint8_t *pnp_rom = NULL;
+            if (pnp_rom_file) {
+                FILE *fp = rom_fopen(pnp_rom_file, "rb");
+                if (fp) {
+                    if (fread(&dev->eeprom[0x12], 1, pnp_rom_len, fp) == pnp_rom_len)
+                        pnp_rom = &dev->eeprom[0x12];
+                    fclose(fp);
+                }
+            }
+
+            switch (info->local) {
+                case NE2K_RTL8019AS_PNP:
+                case NE2K_DE220P:
+                    dev->pnp_card = isapnp_add_card(pnp_rom, pnp_rom_len,
+                                                    nic_pnp_config_changed, nic_pnp_csn_changed,
+                                                    nic_pnp_read_vendor_reg, nic_pnp_write_vendor_reg,
+                                                    dev);
+                    break;
+
+                default:
+                    break;
+            }
         }
     }
 
@@ -1137,153 +1220,465 @@ nic_close(void *priv)
     free(dev);
 }
 
+static int
+rtl8019as_available(void)
+{
+    return rom_present("roms/network/rtl8019as/RTL8019A.BIN");
+}
+
+static int
+de220p_available(void)
+{
+    return rom_present("roms/network/de220p/dlk2201a.bin");
+}
+
 // clang-format off
 static const device_config_t ne1000_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x300,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x300,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            /* Source: Windows 95 .INF file. */
+            { .description = "0x300", .value = 0x300 },
+            { .description = "0x320", .value = 0x320 },
+            { .description = "0x340", .value = 0x340 },
+            { .description = "0x360", .value = 0x360 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 3,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            /* Source: Windows 95 .INF file. */
+            { .description = "IRQ 2",  .value =  2 },
+            { .description = "IRQ 3",  .value =  3 },
+            { .description = "IRQ 4",  .value =  4 },
+            { .description = "IRQ 5",  .value =  5 },
+            { .description = "IRQ 9",  .value =  9 },
+            { .description = ""                    }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t ne1000_compat_config[] = {
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x300,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            /* Source: Windows 95 .INF file. */
+            { .description = "0x200", .value = 0x200 },
+            { .description = "0x220", .value = 0x220 },
+            { .description = "0x240", .value = 0x240 },
+            { .description = "0x260", .value = 0x260 },
             { .description = "0x280", .value = 0x280 },
+            { .description = "0x2a0", .value = 0x2a0 },
+            { .description = "0x2c0", .value = 0x2c0 },
+            { .description = "0x2e0", .value = 0x2e0 },
             { .description = "0x300", .value = 0x300 },
             { .description = "0x320", .value = 0x320 },
             { .description = "0x340", .value = 0x340 },
             { .description = "0x360", .value = 0x360 },
             { .description = "0x380", .value = 0x380 },
+            { .description = "0x3a0", .value = 0x3a0 },
+            { .description = "0x3c0", .value = 0x3c0 },
+            { .description = "0x3e0", .value = 0x3e0 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 3,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 3,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            /* Source: Windows 95 .INF file. */
             { .description = "IRQ 2",  .value =  2 },
             { .description = "IRQ 3",  .value =  3 },
+            { .description = "IRQ 4",  .value =  4 },
             { .description = "IRQ 5",  .value =  5 },
             { .description = "IRQ 7",  .value =  7 },
-            { .description = "IRQ 10", .value = 10 },
-            { .description = "IRQ 11", .value = 11 },
+            { .description = "IRQ 9",  .value =  9 },
             { .description = ""                    }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "mac",
-        .description = "MAC Address",
-        .type = CONFIG_MAC,
-        .default_string = "",
-        .default_int = -1
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "mac_oui",
+        .description    = "MAC Address OUI",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t ne2000_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x300,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "0x280", .value = 0x280 },
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x300,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            /* Source: Windows 95 .INF file. */
             { .description = "0x300", .value = 0x300 },
             { .description = "0x320", .value = 0x320 },
             { .description = "0x340", .value = 0x340 },
             { .description = "0x360", .value = 0x360 },
-            { .description = "0x380", .value = 0x380 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 10,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 3,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            /* Source: Windows 95 .INF file. */
             { .description = "IRQ 2",  .value =  2 },
             { .description = "IRQ 3",  .value =  3 },
+            { .description = "IRQ 4",  .value =  4 },
             { .description = "IRQ 5",  .value =  5 },
-            { .description = "IRQ 7",  .value =  7 },
-            { .description = "IRQ 10", .value = 10 },
-            { .description = "IRQ 11", .value = 11 },
+            { .description = "IRQ 9",  .value =  9 },
             { .description = ""                    }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "mac",
-        .description = "MAC Address",
-        .type = CONFIG_MAC,
-        .default_string = "",
-        .default_int = -1
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
         .name = "bios_addr",
         .description = "BIOS address",
         .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Disabled", .value = 0x00000 },
             { .description = "D000",     .value = 0xD0000 },
             { .description = "D800",     .value = 0xD8000 },
             { .description = "C800",     .value = 0xC8000 },
             { .description = ""                           }
         },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
+static const device_config_t ne2000_compat_config[] = {
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x300,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            /* Source: Windows 95 .INF file. */
+            { .description = "0x200", .value = 0x200 },
+            { .description = "0x220", .value = 0x220 },
+            { .description = "0x240", .value = 0x240 },
+            { .description = "0x260", .value = 0x260 },
+            { .description = "0x280", .value = 0x280 },
+            { .description = "0x2a0", .value = 0x2a0 },
+            { .description = "0x2c0", .value = 0x2c0 },
+            { .description = "0x2e0", .value = 0x2e0 },
+            { .description = "0x300", .value = 0x300 },
+            { .description = "0x320", .value = 0x320 },
+            { .description = "0x340", .value = 0x340 },
+            { .description = "0x360", .value = 0x360 },
+            { .description = "0x380", .value = 0x380 },
+            { .description = "0x3a0", .value = 0x3a0 },
+            { .description = "0x3c0", .value = 0x3c0 },
+            { .description = "0x3e0", .value = 0x3e0 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 10,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            /* Source: Windows 95 .INF file - not giving impossible IRQ's
+                       such as 6, 8, or 13. */
+            { .description = "IRQ 3",  .value =  3 },
+            { .description = "IRQ 4",  .value =  4 },
+            { .description = "IRQ 5",  .value =  5 },
+            { .description = "IRQ 7",  .value =  7 },
+            { .description = "IRQ 9",  .value =  9 },
+            { .description = "IRQ 10", .value = 10 },
+            { .description = "IRQ 11", .value = 11 },
+            { .description = "IRQ 12", .value = 12 },
+            { .description = "IRQ 14", .value = 14 },
+            { .description = "IRQ 15", .value = 15 },
+            { .description = ""                    }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "mac_oui",
+        .description    = "MAC Address OUI",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled", .value = 0x00000 },
+            { .description = "D000",     .value = 0xD0000 },
+            { .description = "D800",     .value = 0xD8000 },
+            { .description = "C800",     .value = 0xC8000 },
+            { .description = ""                           }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t ne2000_compat_8bit_config[] = {
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x320,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            /* Source: board docs, https://github.com/skiselev/isa8_eth */
+            { .description = "0x200", .value = 0x200 },
+            { .description = "0x220", .value = 0x220 },
+            { .description = "0x240", .value = 0x240 },
+            { .description = "0x260", .value = 0x260 },
+            { .description = "0x280", .value = 0x280 },
+            { .description = "0x2a0", .value = 0x2a0 },
+            { .description = "0x2c0", .value = 0x2c0 },
+            { .description = "0x2e0", .value = 0x2e0 },
+            { .description = "0x300", .value = 0x300 },
+            { .description = "0x320", .value = 0x320 },
+            { .description = "0x340", .value = 0x340 },
+            { .description = "0x360", .value = 0x360 },
+            { .description = "0x380", .value = 0x380 },
+            { .description = "0x3a0", .value = 0x3a0 },
+            { .description = "0x3c0", .value = 0x3c0 },
+            { .description = "0x3e0", .value = 0x3e0 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 3,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            /* Source: board docs, https://github.com/skiselev/isa8_eth */
+            { .description = "IRQ 2",  .value =  2 },
+            { .description = "IRQ 3",  .value =  3 },
+            { .description = "IRQ 4",  .value =  4 },
+            { .description = "IRQ 5",  .value =  5 },
+            { .description = "IRQ 9",  .value =  9 },
+            { .description = ""                    }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "mac_oui",
+        .description    = "MAC Address OUI",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+			/* Source: board docs, https://github.com/skiselev/isa8_eth */
+            { .description = "Disabled", .value = 0x00000 },
+            { .description = "C000",     .value = 0xC0000 },
+            { .description = "C400",     .value = 0xC4000 },
+            { .description = "C800",     .value = 0xC8000 },
+            { .description = "CC00",     .value = 0xCC000 },
+            { .description = "D000",     .value = 0xD0000 },
+            { .description = "D400",     .value = 0xD4000 },
+            { .description = "D800",     .value = 0xD8000 },
+            { .description = "DC00",     .value = 0xDC000 },
+            { .description = ""                           }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+
 static const device_config_t rtl8019as_config[] = {
     {
-        .name = "mac",
-        .description = "MAC Address",
-        .type = CONFIG_MAC,
-        .default_string = "",
-        .default_int = -1
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t rtl8029as_config[] = {
     {
-        .name = "bios",
-        .description = "Enable BIOS",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "bios",
+        .description    = "Enable BIOS",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "mac",
-        .description = "MAC Address",
-        .type = CONFIG_MAC,
-        .default_string = "",
-        .default_int = -1
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t mca_mac_config[] = {
     {
-        .name = "mac",
-        .description = "MAC Address",
-        .type = CONFIG_MAC,
-        .default_string = "",
-        .default_int = -1
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
@@ -1291,32 +1686,74 @@ static const device_config_t mca_mac_config[] = {
 
 const device_t ne1000_device = {
     .name          = "Novell NE1000",
-    .internal_name = "ne1k",
+    .internal_name = "novell_ne1k",
     .flags         = DEVICE_ISA,
     .local         = NE2K_NE1000,
     .init          = nic_init,
     .close         = nic_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = ne1000_config
 };
 
+const device_t ne1000_compat_device = {
+    .name          = "NE1000 Compatible",
+    .internal_name = "ne1k",
+    .flags         = DEVICE_ISA,
+    .local         = NE2K_NE1000_COMPAT,
+    .init          = nic_init,
+    .close         = nic_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ne1000_compat_config
+};
+
 const device_t ne2000_device = {
     .name          = "Novell NE2000",
-    .internal_name = "ne2k",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .internal_name = "novell_ne2k",
+    .flags         = DEVICE_ISA16,
     .local         = NE2K_NE2000,
     .init          = nic_init,
     .close         = nic_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = ne2000_config
 };
 
+const device_t ne2000_compat_device = {
+    .name          = "NE2000 Compatible",
+    .internal_name = "ne2k",
+    .flags         = DEVICE_ISA16,
+    .local         = NE2K_NE2000_COMPAT,
+    .init          = nic_init,
+    .close         = nic_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ne2000_compat_config
+};
+
+const device_t ne2000_compat_8bit_device = {
+    .name          = "NE2000 Compatible 8-bit",
+    .internal_name = "ne2k8",
+    .flags         = DEVICE_ISA,
+    .local         = NE2K_NE2000_COMPAT_8BIT,
+    .init          = nic_init,
+    .close         = nic_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ne2000_compat_8bit_config
+};
+
 const device_t ethernext_mc_device = {
     .name          = "NetWorth EtherNext/MC",
     .internal_name = "ethernextmc",
@@ -1325,21 +1762,35 @@ const device_t ethernext_mc_device = {
     .init          = nic_init,
     .close         = nic_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = mca_mac_config
 };
 
-const device_t rtl8019as_device = {
+const device_t rtl8019as_pnp_device = {
     .name          = "Realtek RTL8019AS",
     .internal_name = "ne2kpnp",
-    .flags         = DEVICE_ISA | DEVICE_AT,
-    .local         = NE2K_RTL8019AS,
+    .flags         = DEVICE_ISA16,
+    .local         = NE2K_RTL8019AS_PNP,
     .init          = nic_init,
     .close         = nic_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = rtl8019as_available,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = rtl8019as_config
+};
+
+const device_t de220p_device = {
+    .name          = "D-Link DE-220P",
+    .internal_name = "de220p",
+    .flags         = DEVICE_ISA16,
+    .local         = NE2K_DE220P,
+    .init          = nic_init,
+    .close         = nic_close,
+    .reset         = NULL,
+    .available     = de220p_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = rtl8019as_config
@@ -1353,7 +1804,7 @@ const device_t rtl8029as_device = {
     .init          = nic_init,
     .close         = nic_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = rtl8029as_config
diff --git a/src/network/net_netswitch.c b/src/network/net_netswitch.c
new file mode 100644
index 000000000..336895dc6
--- /dev/null
+++ b/src/network/net_netswitch.c
@@ -0,0 +1,500 @@
+/*
+* 86Box    A hypervisor and IBM PC system emulator that specializes in
+*          running old operating systems and software designed for IBM
+*          PC systems and compatibles from 1981 through fairly recent
+*          system designs based on the PCI bus.
+*
+*          This file is part of the 86Box distribution.
+*
+*          Network Switch network driver
+*
+*
+*
+* Authors: cold-brewed
+*
+*          Copyright 2024 cold-brewed
+ */
+
+
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <errno.h>
+#ifdef _WIN32
+#    define WIN32_LEAN_AND_MEAN
+#    include <windows.h>
+#    include <winsock2.h>
+#else
+#    include <poll.h>
+#endif
+
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/thread.h>
+#include <86box/timer.h>
+#include <86box/network.h>
+#include <86box/net_event.h>
+#include "netswitch.h"
+#include "networkmessage.pb.h"
+
+enum {
+    NET_EVENT_STOP = 0,
+    NET_EVENT_TX,
+    NET_EVENT_RX,
+    NET_EVENT_SWITCH,
+    NET_EVENT_MAX
+};
+
+/* Special define for the windows portion. We only need to poll up to
+ * NET_EVENT_SWITCH. NET_EVENT_SWITCH gives us a different NET_EVENT_MAX
+ * excluding the others, and windows does not like polling events that
+ * do not exist. */
+#define NET_EVENT_WIN_MAX NET_EVENT_SWITCH
+
+#define SWITCH_PKT_BATCH NET_QUEUE_LEN
+/* In µs, how often to send a keepalive and perform connection maintenance */
+#define SWITCH_KEEPALIVE_INTERVAL 5000000
+/* In ms, how long until we consider a connection gone? */
+#define SWITCH_MAX_INTERVAL 10000
+
+typedef struct {
+    void           *nsconn;
+    uint8_t         mac_addr[6];
+    netcard_t      *card;
+    thread_t       *poll_tid;
+    net_evt_t       tx_event;
+    net_evt_t       stop_event;
+    netpkt_t        pktv[SWITCH_PKT_BATCH];
+    pc_timer_t      stats_timer;
+    pc_timer_t      maintenance_timer;
+    ns_rx_packet_t  rx_packet;
+    char            switch_type[16];
+#ifdef _WIN32
+    HANDLE sock_event;
+#endif
+} net_netswitch_t;
+
+// Used for debugging, needs to be moved to an official location
+void print_packet(const netpkt_t netpkt) {
+#ifdef NET_SWITCH_LOG
+    if(netpkt.len == 0) {
+        net_switch_log("Something is wrong, len is %d\n", netpkt.len);
+        return;
+    }
+    /* Temporarily disable log suppression for packet dumping to allow specific formatting */
+    pclog_toggle_suppr();
+    uint8_t linebuff[17] = "\0";
+    char src_mac_buf[32] = "";
+    char dst_mac_buf[32] = "";
+    for(int m_i=0; m_i < 6; m_i++) {
+        char src_octet[4];
+        char dst_octet[4];
+        snprintf(src_octet, sizeof(src_octet), "%02X%s", netpkt.data[m_i+6], m_i < 5 ? ":" : "");
+        strncat(src_mac_buf, src_octet, sizeof (src_mac_buf) - 1);
+
+        snprintf(dst_octet, sizeof(dst_octet), "%02X%s", netpkt.data[m_i], m_i < 5 ? ":" : "");
+        strncat(dst_mac_buf, dst_octet, sizeof (dst_mac_buf) - 1);
+    }
+    net_switch_log("%s -> %s\n\n", src_mac_buf, dst_mac_buf);
+
+    // Payload length (bytes 12-13 with zero index)
+    uint16_t payload_length = (netpkt.data[12] & 0xFF) << 8;
+    payload_length |= (netpkt.data[13] & 0xFF);
+    const uint16_t actual_length = netpkt.len - 14;
+    if(payload_length <= 1500) {
+        // 802.3 / 802.2
+        net_switch_log("Payload length according to frame: %i\n", payload_length);
+        // remaining length of packet (len - 14) to calculate padding
+        net_switch_log("Actual payload length: %i\n", actual_length);
+        if(payload_length <=46 ) {
+            net_switch_log("Likely has %d bytes padding\n", actual_length - payload_length);
+        }
+    } else {
+        // Type II
+        net_switch_log("EtherType: 0x%04X\n", payload_length);
+    }
+    // actual packet size
+    net_switch_log("Full frame size: %i\n", netpkt.len);
+    net_switch_log("\n");
+
+    for(int i=0; i< netpkt.len; i++) {
+
+        net_switch_log("%02x ", netpkt.data[i]);
+        if ((netpkt.data[i] < 0x20) || (netpkt.data[i] > 0x7e)) {
+            linebuff[i % 16] = '.';
+        } else {
+            linebuff[i % 16] = netpkt.data[i];
+        }
+
+        if( (i+1) % 8 == 0) {
+            net_switch_log(" ");
+        }
+
+        if( (i+1) % 16 == 0) {
+            net_switch_log("| %s |\n", (char *)linebuff);
+            linebuff[0] = '\0';
+        }
+
+        // last char?
+        if(i+1 == netpkt.len) {
+            const int togo = 16 - (i % 16);
+            for(int remaining = 0; remaining < togo-1; remaining++) {
+                // This would represent the byte display and the space
+                net_switch_log("   ");
+            }
+            // spacing between byte groupings
+            if(togo > 8) {
+                net_switch_log(" ");
+            }
+            linebuff[(i % 16) +1] = '\0';
+            net_switch_log(" | %s", (char *)linebuff);
+
+            for(int remaining = 0; remaining < togo-1; remaining++) {
+                // This would represent the remaining bytes on the right
+                net_switch_log(" ");
+            }
+            net_switch_log(" |\n");
+        }
+    }
+    net_switch_log("\n");
+    pclog_toggle_suppr();
+#endif /* NET_SWITCH_LOG*/
+}
+
+#ifdef ENABLE_NET_SWITCH_STATS
+static void
+stats_timer(void *priv)
+{
+    /* Get the device state structure. */
+    net_netswitch_t *netswitch = priv;
+    const NSCONN    *nsconn    = netswitch->nsconn;
+    net_switch_log("Max (frame / packet)  TX (%zu/%zu)  RX (%zu/%zu)\n",
+           nsconn->stats.max_tx_frame, nsconn->stats.max_tx_packet,
+           nsconn->stats.max_rx_frame, nsconn->stats.max_rx_packet);
+    net_switch_log("Last ethertype (TX/RX) (%02x%02x/%02x%02x)\n", nsconn->stats.last_tx_ethertype[0], nsconn->stats.last_tx_ethertype[1],
+           nsconn->stats.last_rx_ethertype[0], nsconn->stats.last_rx_ethertype[1]);
+    net_switch_log("Packet totals (all/tx/rx/would fragment/max vec) (%zu/%zu/%zu/%zu/%i)\n", nsconn->stats.total_tx_packets + nsconn->stats.total_rx_packets,
+           nsconn->stats.total_tx_packets, nsconn->stats.total_rx_packets, nsconn->stats.total_fragments, nsconn->stats.max_vec);
+    net_switch_log("---\n");
+    /* Restart the timer */
+    timer_on_auto(&netswitch->stats_timer, 60000000);
+}
+#endif
+
+static void
+maintenance_timer(void *priv)
+{
+    /* Get the device state structure. */
+    net_netswitch_t *netswitch = (net_netswitch_t *) priv;
+    NSCONN         *nsconn = (NSCONN *) netswitch->nsconn;
+    if (!ns_send_control(nsconn, MessageType_MESSAGE_TYPE_KEEPALIVE)) {
+        net_switch_log("Failed to send keepalive packet\n");
+    }
+    const int64_t interval = ns_get_current_millis() - nsconn->last_packet_stamp;
+//    net_switch_log("Last packet time: %lld ago\n", interval);
+//    net_switch_log("Last packet time: %lld ago\n", interval);
+
+    /* A timeout has likely occurred, try to fix the connection if type is REMOTE */
+    if((interval > SWITCH_MAX_INTERVAL) && nsconn->switch_type == SWITCH_TYPE_REMOTE) {
+        /* FIXME: This is really rough, needs moar logic */
+        nsconn->client_state = CONNECTING;
+        net_switch_log("We appear to be disconnected, attempting to reconnect\n");
+        /* TODO: Proper connect function! This is duplicated code */
+        if(!ns_send_control(nsconn, MessageType_MESSAGE_TYPE_CONNECT_REQUEST)) {
+            /* TODO: Failure */
+        }
+    }
+    /* Restart the timer */
+    timer_on_auto(&netswitch->maintenance_timer, SWITCH_KEEPALIVE_INTERVAL);
+}
+
+/* Lots of #ifdef madness here thanks to the polling differences on windows */
+static void
+net_netswitch_thread(void *priv)
+{
+    net_netswitch_t *net_netswitch = (net_netswitch_t *) priv;
+    NSCONN         *nsconn        = (NSCONN *) net_netswitch->nsconn;
+    bool status;
+    char switch_type[32];
+    snprintf(switch_type, sizeof(switch_type), "%s", nsconn->switch_type == SWITCH_TYPE_REMOTE ? "Remote" : "Local");
+
+    net_switch_log("%s Net Switch: polling started.\n", switch_type);
+
+#ifdef _WIN32
+    WSAEventSelect(ns_pollfd(net_netswitch->nsconn), net_netswitch->sock_event, FD_READ);
+
+    HANDLE events[NET_EVENT_MAX];
+    events[NET_EVENT_STOP] = net_event_get_handle(&net_netswitch->stop_event);
+    events[NET_EVENT_TX]   = net_event_get_handle(&net_netswitch->tx_event);
+    events[NET_EVENT_RX]   = net_netswitch->sock_event;
+
+    bool run = true;
+#else
+    struct pollfd pfd[NET_EVENT_MAX];
+    pfd[NET_EVENT_STOP].fd     = net_event_get_fd(&net_netswitch->stop_event);
+    pfd[NET_EVENT_STOP].events = POLLIN | POLLPRI;
+
+    pfd[NET_EVENT_TX].fd     = net_event_get_fd(&net_netswitch->tx_event);
+    pfd[NET_EVENT_TX].events = POLLIN | POLLPRI;
+
+    pfd[NET_EVENT_RX].fd     = ns_pollfd(net_netswitch->nsconn);
+    pfd[NET_EVENT_RX].events = POLLIN | POLLPRI;
+#endif
+
+#ifdef _WIN32
+    while (run) {
+        int ret = WaitForMultipleObjects(NET_EVENT_WIN_MAX, events, FALSE, INFINITE);
+
+        switch (ret - WAIT_OBJECT_0) {
+#else
+    while (1) {
+        poll(pfd, NET_EVENT_MAX, -1);
+#endif
+
+#ifdef _WIN32
+            case NET_EVENT_STOP:
+                net_event_clear(&net_netswitch->stop_event);
+                run = false;
+                break;
+            case NET_EVENT_TX:
+#else
+        if (pfd[NET_EVENT_STOP].revents & POLLIN) {
+            net_event_clear(&net_netswitch->stop_event);
+            break;
+        }
+        if (pfd[NET_EVENT_TX].revents & POLLIN) {
+#endif
+                net_event_clear(&net_netswitch->tx_event);
+
+                const int packets = network_tx_popv(net_netswitch->card, net_netswitch->pktv, SWITCH_PKT_BATCH);
+                if (packets > nsconn->stats.max_vec) {
+                    nsconn->stats.max_vec = packets;
+                }
+                for (int i = 0; i < packets; i++) {
+                    //                net_switch_log("%d packet(s) to send\n", packets);
+#if defined(NET_PRINT_PACKET_TX) || defined(NET_PRINT_PACKET_ALL)
+                    data_packet_info_t packet_info = get_data_packet_info(&net_netswitch->pktv[i], net_netswitch->mac_addr);
+                    /* Temporarily disable log suppression for packet logging */
+                    pclog_toggle_suppr();
+                    net_switch_log("%s Net Switch: TX: %s\n", switch_type, packet_info.printable);
+                    pclog_toggle_suppr();
+                    print_packet(net_netswitch->pktv[i]);
+#endif
+                    /* Only send if we're in a connected state (always true for local) */
+                    if(ns_connected(net_netswitch->nsconn)) {
+                        const ssize_t nc = ns_send_pb(net_netswitch->nsconn, &net_netswitch->pktv[i], 0);
+                        if (nc < 1) {
+                            perror("Got");
+                            net_switch_log("%s Net Switch: Problem, no bytes sent. Got back %i\n", switch_type, nc);
+                        }
+                    }
+                }
+#ifdef _WIN32
+                break;
+            case NET_EVENT_RX:
+#else
+        }
+        if (pfd[NET_EVENT_RX].revents & POLLIN) {
+#endif
+
+                /* Packets are available for reading */
+                status = ns_recv_pb(net_netswitch->nsconn, &net_netswitch->rx_packet, NET_MAX_FRAME, 0);
+                if (!status) {
+                    net_switch_log("Receive packet failed. Skipping.\n");
+                    continue;
+                }
+
+                /* These types are handled in the backend and don't need to be considered */
+                if (is_control_packet(&net_netswitch->rx_packet) || is_fragment_packet(&net_netswitch->rx_packet)) {
+                    continue;
+                }
+                data_packet_info_t packet_info = get_data_packet_info(&net_netswitch->rx_packet.pkt, net_netswitch->mac_addr);
+#if defined(NET_PRINT_PACKET_RX) || defined(NET_PRINT_PACKET_ALL)
+                print_packet(net_netswitch->rx_packet.pkt);
+#endif
+                /*
+                 * Accept packets that are
+                   * Unicast for us
+                   * Broadcasts that are not from us
+                   * All other packets *if* promiscuous mode is enabled (excluding our own)
+                 */
+                if (packet_info.is_packet_for_me || (packet_info.is_broadcast && !packet_info.is_packet_from_me)) {
+                    /* Temporarily disable log suppression for packet logging */
+                    pclog_toggle_suppr();
+                    net_switch_log("%s Net Switch: RX: %s\n", switch_type, packet_info.printable);
+                    pclog_toggle_suppr();
+                    network_rx_put_pkt(net_netswitch->card, &net_netswitch->rx_packet.pkt);
+                } else if (packet_info.is_packet_from_me) {
+                    net_switch_log("%s Net Switch: Got my own packet... ignoring\n", switch_type);
+                } else {
+                    /* Not our packet. Pass it along if promiscuous mode is enabled. */
+                    if (ns_flags(net_netswitch->nsconn) & FLAGS_PROMISC) {
+                        net_switch_log("%s Net Switch: Got packet from %s (not mine, promiscuous is set, getting)\n", switch_type, packet_info.src_mac_h);
+                        network_rx_put_pkt(net_netswitch->card, &net_netswitch->rx_packet.pkt);
+                    } else {
+                        net_switch_log("%s Net Switch: RX: %s (not mine, dest %s != %s, promiscuous not set, ignoring)\n", switch_type, packet_info.printable, packet_info.dest_mac_h, packet_info.my_mac_h);
+                    }
+                }
+#ifdef _WIN32
+                break;
+        }
+#else
+        }
+#endif
+    }
+
+    net_switch_log("%s Net Switch: polling stopped.\n", switch_type);
+}
+
+void
+net_netswitch_error(char *errbuf, const char *message) {
+    strncpy(errbuf, message, NET_DRV_ERRBUF_SIZE);
+    net_switch_log("Net Switch: %s\n", message);
+}
+
+void *
+net_netswitch_init(const netcard_t *card, const uint8_t *mac_addr, void *priv, char *netdrv_errbuf)
+{
+    net_switch_log("Net Switch: Init\n");
+
+    netcard_conf_t *netcard = (netcard_conf_t *) priv;
+
+    ns_flags_t flags = FLAGS_NONE;
+    ns_type_t  switch_type;
+
+    const int net_type = netcard->net_type;
+    if(net_type == NET_TYPE_NRSWITCH) {
+        net_switch_log("Switch type: Remote\n");
+        switch_type = SWITCH_TYPE_REMOTE;
+    } else if (net_type == NET_TYPE_NMSWITCH) {
+        net_switch_log("Switch type: Local Multicast\n");
+        switch_type = SWITCH_TYPE_LOCAL;
+        if(netcard->promisc_mode) {
+            flags |= FLAGS_PROMISC;
+        }
+    } else {
+        net_switch_log("Failed: Unknown net switch type %d\n", net_type);
+        return NULL;
+    }
+
+    // FIXME: Only here during dev. This would be an error otherwise (hostname not specified)
+    if(strlen(netcard->nrs_hostname) == 0) {
+        strncpy(netcard->nrs_hostname, "127.0.0.1", 128 - 1);
+    }
+
+    net_netswitch_t *net_netswitch = calloc(1, sizeof(net_netswitch_t));
+    net_netswitch->card           = (netcard_t *) card;
+    memcpy(net_netswitch->mac_addr, mac_addr, sizeof(net_netswitch->mac_addr));
+    snprintf(net_netswitch->switch_type, sizeof(net_netswitch->switch_type), "%s", net_type == NET_TYPE_NRSWITCH ? "Remote" : "Local");
+
+//    net_switch_log("%s Net Switch: mode: %d, group %d, hostname %s len %lu\n", net_netswitch->switch_type, netcard->promisc_mode, netcard->switch_group, netcard->nrs_hostname, strlen(netcard->nrs_hostname));
+
+    struct ns_open_args ns_args;
+    ns_args.type = switch_type;
+    /* Setting FLAGS_PROMISC here lets all packets through except the ones from us */
+    ns_args.flags = flags;
+    /* This option sets which switch group you want to be a part of.
+     * Functionally equivalent to being plugged into a different switch */
+    ns_args.group = netcard->switch_group;
+    /* You could also set the client_id here. If 0, it will be generated. */
+    ns_args.client_id = 0;
+    memcpy(ns_args.mac_addr, net_netswitch->mac_addr, 6);
+    /* The remote switch hostname */
+    strncpy(ns_args.nrs_hostname, netcard->nrs_hostname, sizeof(ns_args.nrs_hostname) - 1);
+
+    net_switch_log("%s Net Switch: Starting up virtual switch with group %d, flags %d\n", net_netswitch->switch_type, ns_args.group, ns_args.flags);
+
+    if ((net_netswitch->nsconn = ns_open(&ns_args)) == NULL) {
+        char buf[NET_DRV_ERRBUF_SIZE];
+        /* We're using some errnos for our own purposes */
+        switch (errno) {
+            case EFAULT:
+                snprintf(buf, NET_DRV_ERRBUF_SIZE, "Unable to open switch group %d: Cannot resolve remote switch hostname %s", ns_args.group, ns_args.nrs_hostname);
+                break;
+            default:
+                snprintf(buf, NET_DRV_ERRBUF_SIZE, "Unable to open switch group %d (%s)", ns_args.group, strerror(errno));
+                break;
+
+        }
+        net_netswitch_error(netdrv_errbuf, buf);
+        free(net_netswitch);
+        return NULL;
+    }
+
+    for (int i = 0; i < SWITCH_PKT_BATCH; i++) {
+        net_netswitch->pktv[i].data = calloc(1, NET_MAX_FRAME);
+    }
+    net_netswitch->rx_packet.pkt.data = calloc(1, NET_MAX_FRAME);
+
+    net_event_init(&net_netswitch->tx_event);
+    net_event_init(&net_netswitch->stop_event);
+#ifdef _WIN32
+    net_netswitch->sock_event = CreateEvent(NULL, FALSE, FALSE, NULL);
+#endif
+    net_netswitch->poll_tid = thread_create(net_netswitch_thread, net_netswitch);
+
+    /* Add the timers */
+#ifdef ENABLE_NET_SWITCH_STATS
+    timer_add(&net_netswitch->stats_timer, stats_timer, net_netswitch, 0);
+    timer_on_auto(&net_netswitch->stats_timer, 5000000);
+#endif
+    timer_add(&net_netswitch->maintenance_timer, maintenance_timer, net_netswitch, 0);
+    timer_on_auto(&net_netswitch->maintenance_timer, SWITCH_KEEPALIVE_INTERVAL);
+
+    /* Send join message. Return status not checked here. */
+    ns_send_control(net_netswitch->nsconn, MessageType_MESSAGE_TYPE_JOIN);
+
+    return net_netswitch;
+}
+
+void
+net_netswitch_in_available(void *priv)
+{
+    net_netswitch_t *net_netswitch = (net_netswitch_t *) priv;
+    net_event_set(&net_netswitch->tx_event);
+}
+
+void
+net_netswitch_close(void *priv)
+{
+    if (priv == NULL)
+        return;
+
+    net_netswitch_t *net_netswitch = (net_netswitch_t *) priv;
+
+    net_switch_log("%s Net Switch: closing.\n", net_netswitch->switch_type);
+
+    /* Tell the thread to terminate. */
+    net_event_set(&net_netswitch->stop_event);
+
+    /* Wait for the thread to finish. */
+    net_switch_log("%s Net Switch: waiting for thread to end...\n", net_netswitch->switch_type);
+    thread_wait(net_netswitch->poll_tid);
+    net_switch_log("%s Net Switch: thread ended\n", net_netswitch->switch_type);
+
+    for (int i = 0; i < SWITCH_PKT_BATCH; i++) {
+        free(net_netswitch->pktv[i].data);
+    }
+    free(net_netswitch->rx_packet.pkt.data);
+
+    net_event_close(&net_netswitch->tx_event);
+    net_event_close(&net_netswitch->stop_event);
+
+#ifdef _WIN32
+    WSACleanup();
+#endif
+
+    ns_close(net_netswitch->nsconn);
+    free(net_netswitch);
+}
+
+const netdrv_t net_netswitch_drv = {
+    .notify_in = &net_netswitch_in_available,
+    .init      = &net_netswitch_init,
+    .close     = &net_netswitch_close,
+    .priv      = NULL,
+};
diff --git a/src/network/net_null.c b/src/network/net_null.c
index 6fb3f3440..6d5f68e46 100644
--- a/src/network/net_null.c
+++ b/src/network/net_null.c
@@ -218,8 +218,8 @@ net_null_close(void *priv)
 }
 
 const netdrv_t net_null_drv = {
-    &net_null_in_available,
-    &net_null_init,
-    &net_null_close,
-    NULL
+    .notify_in = &net_null_in_available,
+    .init      = &net_null_init,
+    .close     = &net_null_close,
+    .priv      = NULL
 };
diff --git a/src/network/net_pcap.c b/src/network/net_pcap.c
index e1747580b..2af34d786 100644
--- a/src/network/net_pcap.c
+++ b/src/network/net_pcap.c
@@ -365,7 +365,13 @@ net_pcap_prepare(netdev_t *list)
 
     /* Try loading the DLL. */
 #ifdef _WIN32
+    /* Add the Npcap directory to the DLL search path. */
+    char npcap_dir[512];
+    GetSystemDirectoryA(npcap_dir, 480);
+    strcat(npcap_dir, "\\Npcap");
+    SetDllDirectoryA(npcap_dir);
     libpcap_handle = dynld_module("wpcap.dll", pcap_imports);
+    SetDllDirectoryA(NULL); /* reset the DLL search path */
 #elif defined __APPLE__
     libpcap_handle = dynld_module("libpcap.dylib", pcap_imports);
 #else
@@ -494,7 +500,7 @@ net_pcap_init(const netcard_t *card, const uint8_t *mac_addr, void *priv, char *
     pcap_log("PCAP: installing filter for MAC=%02x:%02x:%02x:%02x:%02x:%02x\n",
              mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]);
     sprintf(filter_exp,
-            "( ((ether dst ff:ff:ff:ff:ff:ff) or (ether dst %02x:%02x:%02x:%02x:%02x:%02x)) and not (ether src %02x:%02x:%02x:%02x:%02x:%02x) )",
+            "( ((ether broadcast) or (ether multicast) or (ether dst %02x:%02x:%02x:%02x:%02x:%02x)) and not (ether src %02x:%02x:%02x:%02x:%02x:%02x) )",
             mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5],
             mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]);
     if (f_pcap_compile(pcap->pcap, &fp, filter_exp, 0, 0xffffffff) != -1) {
@@ -566,8 +572,8 @@ net_pcap_close(void *priv)
 }
 
 const netdrv_t net_pcap_drv = {
-    &net_pcap_in_available,
-    &net_pcap_init,
-    &net_pcap_close,
-    NULL
+    .notify_in = &net_pcap_in_available,
+    .init      = &net_pcap_init,
+    .close     = &net_pcap_close,
+    .priv      = NULL
 };
diff --git a/src/network/net_pcnet.c b/src/network/net_pcnet.c
index 9ddcfe29d..16fd7c65c 100644
--- a/src/network/net_pcnet.c
+++ b/src/network/net_pcnet.c
@@ -46,9 +46,9 @@
 #include <86box/thread.h>
 #include <86box/network.h>
 #include <86box/net_pcnet.h>
-#include <86box/bswap.h>
 #include <86box/plat_fallthrough.h>
 #include <86box/plat_unused.h>
+#include <86box/bswap.h>
 
 /* PCI info. */
 #define PCI_VENDID  0x1022 /* AMD */
@@ -787,8 +787,9 @@ static int
 ladr_match(nic_t *dev, const uint8_t *buf, UNUSED(size_t size))
 {
     const struct ether_header *hdr = (const struct ether_header *) buf;
+    uint64_t *p = (uint64_t *) &dev->aCSR[8];
 
-    if ((hdr->ether_dhost[0] & 0x01) && ((uint64_t *) &dev->aCSR[8])[0] != 0LL) {
+    if ((hdr->ether_dhost[0] & 0x01) && p[0] != 0LL) {
         int     index;
         uint8_t ladr[8];
         ladr[0] = dev->aCSR[8] & 0xff;
@@ -2480,36 +2481,58 @@ pcnet_readl(uint16_t addr, void *priv)
 static void
 pcnet_mmio_writeb(uint32_t addr, uint8_t val, void *priv)
 {
+    if (!(addr & 0x10)) {
+        pcnet_aprom_writeb((nic_t *) priv, addr, val);
+        return;
+    }
     pcnet_write((nic_t *) priv, addr, val, 1);
 }
 
 static void
 pcnet_mmio_writew(uint32_t addr, uint16_t val, void *priv)
 {
+    if (!(addr & 0x10)) {
+        pcnet_aprom_writeb((nic_t *) priv, addr, val);
+        pcnet_aprom_writeb((nic_t *) priv, addr + 1, val >> 8);
+        return;
+    }
     pcnet_write((nic_t *) priv, addr, val, 2);
 }
 
 static void
 pcnet_mmio_writel(uint32_t addr, uint32_t val, void *priv)
 {
+    if (!(addr & 0x10)) {
+        pcnet_aprom_writeb((nic_t *) priv, addr, val);
+        pcnet_aprom_writeb((nic_t *) priv, addr + 1, val >> 8);
+        pcnet_aprom_writeb((nic_t *) priv, addr + 2, val >> 16);
+        pcnet_aprom_writeb((nic_t *) priv, addr + 3, val >> 24);
+        return;
+    }
     pcnet_write((nic_t *) priv, addr, val, 4);
 }
 
 static uint8_t
 pcnet_mmio_readb(uint32_t addr, void *priv)
 {
+    if (!(addr & 0x10))
+        return pcnet_aprom_readb((nic_t *) priv, addr);
     return (pcnet_read((nic_t *) priv, addr, 1));
 }
 
 static uint16_t
 pcnet_mmio_readw(uint32_t addr, void *priv)
 {
+    if (!(addr & 0x10))
+        return pcnet_aprom_readb((nic_t *) priv, addr) | (pcnet_aprom_readb((nic_t *) priv, addr + 1) << 8);
     return (pcnet_read((nic_t *) priv, addr, 2));
 }
 
 static uint32_t
 pcnet_mmio_readl(uint32_t addr, void *priv)
 {
+    if (!(addr & 0x10))
+        return pcnet_aprom_readb((nic_t *) priv, addr) | (pcnet_aprom_readb((nic_t *) priv, addr + 1) << 8) | (pcnet_aprom_readb((nic_t *) priv, addr + 2) << 16) | (pcnet_aprom_readb((nic_t *) priv, addr + 3) << 24);
     return (pcnet_read((nic_t *) priv, addr, 4));
 }
 
@@ -2606,7 +2629,7 @@ pcnet_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
             /* Then let's set the PCI regs. */
             pcnet_pci_bar[0].addr_regs[addr & 3] = val;
             /* Then let's calculate the new I/O base. */
-            pcnet_pci_bar[0].addr &= 0xff00;
+            pcnet_pci_bar[0].addr &= 0xffe0;
             dev->PCIBase = pcnet_pci_bar[0].addr;
             /* Log the new base. */
             pcnet_log(4, "%s: New I/O base is %04X\n", dev->name, dev->PCIBase);
@@ -2684,7 +2707,7 @@ pcnet_pci_read(UNUSED(int func), int addr, void *priv)
         case 0x0E:
             return 0; /*Header type */
         case 0x10:
-            return 1; /*I/O space*/
+            return pcnet_pci_bar[0].addr_regs[0] | 1; /*I/O space*/
         case 0x11:
             return pcnet_pci_bar[0].addr_regs[1];
         case 0x12:
@@ -2893,14 +2916,13 @@ pcnet_init(const device_t *info)
     int      c;
     uint16_t checksum;
 
-    dev = malloc(sizeof(nic_t));
-    memset(dev, 0x00, sizeof(nic_t));
+    dev = calloc(1, sizeof(nic_t));
     dev->name  = info->name;
     dev->board = info->local & 0xff;
 
     dev->is_pci = !!(info->flags & DEVICE_PCI);
     dev->is_vlb = !!(info->flags & DEVICE_VLB);
-    dev->is_isa = !!(info->flags & (DEVICE_ISA | DEVICE_AT));
+    dev->is_isa = !!(info->flags & (DEVICE_ISA16));
 
     if (dev->is_pci || dev->is_vlb)
         dev->transfer_size = 4;
@@ -3066,62 +3088,68 @@ pcnet_close(void *priv)
 // clang-format off
 static const device_config_t pcnet_pci_config[] = {
     {
-        .name = "mac",
-        .description = "MAC Address",
-        .type = CONFIG_MAC,
-        .default_string = "",
-        .default_int = -1
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t pcnet_isa_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x300,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x300,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "0x300", .value = 0x300 },
             { .description = "0x320", .value = 0x320 },
             { .description = "0x340", .value = 0x340 },
             { .description = "0x360", .value = 0x360 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 3,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "IRQ 3", .value = 3 },
-            { .description = "IRQ 4", .value = 4 },
-            { .description = "IRQ 5", .value = 5 },
-            { .description = "IRQ 7", .value = 7 },
-            { .description = "IRQ 9", .value = 9 },
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 3,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 3",  .value =  3 },
+            { .description = "IRQ 4",  .value =  4 },
+            { .description = "IRQ 5",  .value =  5 },
+            { .description = "IRQ 7",  .value =  7 },
+            { .description = "IRQ 9",  .value =  9 },
             { .description = "IRQ 10", .value = 10 },
             { .description = "IRQ 11", .value = 11 },
             { .description = "IRQ 12", .value = 12 },
             { .description = "IRQ 15", .value = 15 },
-            { .description = ""                  }
+            { .description = ""                    }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dma",
-        .description = "DMA channel",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "dma",
+        .description    = "DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "DMA 0", .value = 0 },
             { .description = "DMA 3", .value = 3 },
             { .description = "DMA 5", .value = 5 },
@@ -3129,61 +3157,72 @@ static const device_config_t pcnet_isa_config[] = {
             { .description = "DMA 7", .value = 7 },
             { .description = ""                  }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "mac",
-        .description = "MAC Address",
-        .type = CONFIG_MAC,
-        .default_string = "",
-        .default_int = -1
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t pcnet_vlb_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x300,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x300,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "0x300", .value = 0x300 },
             { .description = "0x320", .value = 0x320 },
             { .description = "0x340", .value = 0x340 },
             { .description = "0x360", .value = 0x360 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 3,
-        .file_filter = "",
-        .spinner = { 0 },
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 3,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
         .selection = {
-            { .description = "IRQ 3", .value = 3 },
-            { .description = "IRQ 4", .value = 4 },
-            { .description = "IRQ 5", .value = 5 },
-            { .description = "IRQ 7", .value = 7 },
-            { .description = "IRQ 9", .value = 9 },
+            { .description = "IRQ 3",  .value =  3 },
+            { .description = "IRQ 4",  .value =  4 },
+            { .description = "IRQ 5",  .value =  5 },
+            { .description = "IRQ 7",  .value =  7 },
+            { .description = "IRQ 9",  .value =  9 },
             { .description = "IRQ 10", .value = 10 },
             { .description = "IRQ 11", .value = 11 },
             { .description = "IRQ 12", .value = 12 },
             { .description = "IRQ 15", .value = 15 },
-            { .description = ""                  }
+            { .description = ""                    }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "mac",
-        .description = "MAC Address",
-        .type = CONFIG_MAC,
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
         .default_string = "",
-        .default_int = -1
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
@@ -3192,12 +3231,12 @@ static const device_config_t pcnet_vlb_config[] = {
 const device_t pcnet_am79c960_device = {
     .name          = "AMD PCnet-ISA",
     .internal_name = "pcnetisa",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = DEV_AM79C960,
     .init          = pcnet_init,
     .close         = pcnet_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = pcnet_isa_config
@@ -3206,26 +3245,30 @@ const device_t pcnet_am79c960_device = {
 const device_t pcnet_am79c960_eb_device = {
     .name          = "Racal Interlan EtherBlaster",
     .internal_name = "pcnetracal",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = DEV_AM79C960_EB,
     .init          = pcnet_init,
     .close         = pcnet_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = pcnet_isa_config
 };
 
+/*
+   Used to be incorrectly called "AMD PCnet-VL" but the real name of the chip is "AMD PCnet-32" per the relevant datasheet.
+   https://theretroweb.com/chip/documentation/am79c965-66c24a7e6969d347126123.pdf
+*/
 const device_t pcnet_am79c960_vlb_device = {
-    .name          = "AMD PCnet-VL",
+    .name          = "AMD PCnet-32",
     .internal_name = "pcnetvlb",
     .flags         = DEVICE_VLB,
     .local         = DEV_AM79C960_VLB,
     .init          = pcnet_init,
     .close         = pcnet_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = pcnet_vlb_config
@@ -3234,12 +3277,12 @@ const device_t pcnet_am79c960_vlb_device = {
 const device_t pcnet_am79c961_device = {
     .name          = "AMD PCnet-ISA+",
     .internal_name = "pcnetisaplus",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = DEV_AM79C961,
     .init          = pcnet_init,
     .close         = pcnet_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = pcnet_pci_config
@@ -3253,7 +3296,7 @@ const device_t pcnet_am79c970a_device = {
     .init          = pcnet_init,
     .close         = pcnet_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = pcnet_pci_config
@@ -3267,7 +3310,7 @@ const device_t pcnet_am79c973_device = {
     .init          = pcnet_init,
     .close         = pcnet_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = pcnet_pci_config
@@ -3281,7 +3324,7 @@ const device_t pcnet_am79c973_onboard_device = {
     .init          = pcnet_init,
     .close         = pcnet_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = pcnet_pci_config
diff --git a/src/network/net_plip.c b/src/network/net_plip.c
index f622d455b..5eacc5536 100644
--- a/src/network/net_plip.c
+++ b/src/network/net_plip.c
@@ -26,15 +26,13 @@
 #include <stdarg.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
-#include <86box/language.h>
+#include <86box/timer.h>
+#include <86box/device.h>
 #include <86box/lpt.h>
 #include <86box/timer.h>
 #include <86box/pit.h>
-#include <86box/device.h>
 #include <86box/thread.h>
-#include <86box/timer.h>
 #include <86box/network.h>
-#include <86box/net_plip.h>
 #include <86box/plat_unused.h>
 
 enum {
@@ -447,8 +445,7 @@ plip_rx(void *priv, uint8_t *buf, int io_len)
 static void *
 plip_lpt_init(void *lpt)
 {
-    plip_t *dev = (plip_t *) malloc(sizeof(plip_t));
-    memset(dev, 0, sizeof(plip_t));
+    plip_t *dev = (plip_t *) calloc(1, sizeof(plip_t));
 
     plip_log(1, "PLIP: lpt_init()\n");
 
@@ -491,15 +488,19 @@ plip_close(void *priv)
 }
 
 const lpt_device_t lpt_plip_device = {
-    .name          = "Parallel Line Internet Protocol",
-    .internal_name = "plip",
-    .init          = plip_lpt_init,
-    .close         = plip_close,
-    .write_data    = plip_write_data,
-    .write_ctrl    = plip_write_ctrl,
-    .read_data     = NULL,
-    .read_status   = plip_read_status,
-    .read_ctrl     = NULL
+    .name             = "Parallel Line Internet Protocol",
+    .internal_name    = "plip",
+    .init             = plip_lpt_init,
+    .close            = plip_close,
+    .write_data       = plip_write_data,
+    .write_ctrl       = plip_write_ctrl,
+    .strobe           = NULL,
+    .read_status      = plip_read_status,
+    .read_ctrl        = NULL,
+    .epp_write_data   = NULL,
+    .epp_request_read = NULL,
+    .priv             = NULL,
+    .lpt              = NULL
 };
 
 const device_t plip_device = {
@@ -510,7 +511,7 @@ const device_t plip_device = {
     .init          = plip_net_init,
     .close         = NULL,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/network/net_rtl8139.c b/src/network/net_rtl8139.c
index 8afb7b4b8..41ce86f6b 100644
--- a/src/network/net_rtl8139.c
+++ b/src/network/net_rtl8139.c
@@ -22,13 +22,17 @@
  *          Copyright 2011-2023 Benjamin Poirier.
  *          Copyright 2023 Cacodemon345.
  */
+#include <stdarg.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdio.h>
+#ifdef _MVC_VER
+#include <stddef.h>
+#endif
 #include <time.h>
-
+#define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/timer.h>
 #include <86box/pci.h>
@@ -39,12 +43,11 @@
 #include <86box/device.h>
 #include <86box/thread.h>
 #include <86box/network.h>
-#include <86box/net_eeprom_nmc93cxx.h>
-#include <86box/bswap.h>
+#include <86box/nmc93cxx.h>
 #include <86box/nvr.h>
 #include "cpu.h"
-#include <86box/net_rtl8139.h>
 #include <86box/plat_unused.h>
+#include <86box/bswap.h>
 
 #define PCI_PERIOD 30 /* 30 ns period = 33.333333 Mhz frequency */
 
@@ -352,7 +355,8 @@ enum chip_flags {
 #define RTL8139_PCI_REVID_8139      0x10
 #define RTL8139_PCI_REVID_8139CPLUS 0x20
 
-#define RTL8139_PCI_REVID           RTL8139_PCI_REVID_8139CPLUS
+/* Return 0x10 - the RTL8139C+ datasheet and Windows 2000 driver both confirm this. */
+#define RTL8139_PCI_REVID           RTL8139_PCI_REVID_8139
 
 #pragma pack(push, 1)
 typedef struct RTL8139TallyCounters {
@@ -530,14 +534,14 @@ rtl8139_write_buffer(RTL8139State *s, const void *buf, int size)
 
             if (size > wrapped) {
                 dma_bm_write(s->RxBuf + s->RxBufAddr,
-                             buf, size - wrapped, 1);
+                             (uint8_t *) buf, size - wrapped, 1);
             }
 
             /* reset buffer pointer */
             s->RxBufAddr = 0;
 
             dma_bm_write(s->RxBuf + s->RxBufAddr,
-                         buf + (size - wrapped), wrapped, 1);
+                         (uint8_t *) buf + (size - wrapped), wrapped, 1);
 
             s->RxBufAddr = wrapped;
 
@@ -1075,10 +1079,11 @@ rtl8139_reset(void *priv)
     s->cplus_enabled = 0;
 
 #if 0
-    s->BasicModeCtrl = 0x3100; // 100Mbps, full duplex, autonegotiation
     s->BasicModeCtrl = 0x2100; // 100Mbps, full duplex
-#endif
+    s->BasicModeCtrl = 0x3100; // 100Mbps, full duplex, autonegotiation
     s->BasicModeCtrl = 0x1000; // autonegotiation
+#endif
+    s->BasicModeCtrl = 0x1100; // full duplex, autonegotiation
 
     rtl8139_reset_phy(s);
 
@@ -1205,7 +1210,7 @@ rtl8139_CpCmd_read(RTL8139State *s)
 }
 
 static void
-rtl8139_IntrMitigate_write(UNUSED(RTL8139State *s), uint32_t val)
+rtl8139_IntrMitigate_write(UNUSED(RTL8139State *s), UNUSED(uint32_t val))
 {
     rtl8139_log("C+ IntrMitigate register write(w) val=0x%04x\n", val);
 }
@@ -2544,6 +2549,12 @@ rtl8139_io_writeb(uint32_t addr, uint8_t val, void *priv)
 
             break;
 
+        case RxConfig:
+            rtl8139_log("RxConfig write(b) val=0x%02x\n", val);
+            rtl8139_RxConfig_write(s,
+                (rtl8139_RxConfig_read(s) & 0xFFFFFF00) | val);
+            break;
+
         default:
             rtl8139_log("not implemented write(b) addr=0x%x val=0x%02x\n", addr, val);
             break;
@@ -3111,7 +3122,7 @@ rtl8139_pci_read(UNUSED(int func), int addr, void *priv)
         case 0x05:
             return s->pci_conf[addr & 0xFF] & 1;
         case 0x08:
-            return 0x20;
+            return RTL8139_PCI_REVID;
         case 0x09:
             return 0x0;
         case 0x0a:
@@ -3146,7 +3157,7 @@ rtl8139_pci_read(UNUSED(int func), int addr, void *priv)
 }
 
 static void
-rtl8139_pci_write(int func, int addr, uint8_t val, void *priv)
+rtl8139_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
 {
     RTL8139State *s = (RTL8139State *) priv;
 
@@ -3283,9 +3294,9 @@ nic_init(const device_t *info)
     params.nwords          = 64;
     params.default_content = (uint16_t *) s->eeprom_data;
     params.filename        = filename;
-    snprintf(filename, sizeof(filename), "nmc93cxx_eeprom_%s_%d.nvr", info->internal_name, device_get_instance());
-    s->eeprom = device_add_parameters(&nmc93cxx_device, &params);
-    if (!s->eeprom) {
+    snprintf(filename, sizeof(filename), "nmc93cxx_eeprom_%s_%d.nvr", info->internal_name, s->inst);
+    s->eeprom = device_add_inst_params(&nmc93cxx_device, s->inst, &params);
+    if (s->eeprom == NULL) {
         free(s);
         return NULL;
     }
@@ -3310,11 +3321,15 @@ nic_close(void *priv)
 // clang-format off
 static const device_config_t rtl8139c_config[] = {
     {
-        .name = "mac",
-        .description = "MAC Address",
-        .type = CONFIG_MAC,
-        .default_string = "",
-        .default_int = -1
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
@@ -3328,7 +3343,7 @@ const device_t rtl8139c_plus_device = {
     .init          = nic_init,
     .close         = nic_close,
     .reset         = rtl8139_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = rtl8139c_config
diff --git a/src/network/net_slirp.c b/src/network/net_slirp.c
index 6aff76a90..9bf1f63d4 100644
--- a/src/network/net_slirp.c
+++ b/src/network/net_slirp.c
@@ -37,6 +37,7 @@
 #include <86box/ini.h>
 #include <86box/config.h>
 #include <86box/video.h>
+#include <86box/bswap.h>
 
 #define _SSIZE_T_DEFINED
 #include <slirp/libslirp.h>
@@ -59,16 +60,19 @@ enum {
 };
 
 typedef struct net_slirp_t {
-    Slirp     *slirp;
-    uint8_t    mac_addr[6];
-    netcard_t *card; /* netcard attached to us */
-    thread_t  *poll_tid;
-    net_evt_t  tx_event;
-    net_evt_t  stop_event;
-    netpkt_t   pkt;
-    netpkt_t   pkt_tx_v[SLIRP_PKT_BATCH];
+    Slirp *        slirp;
+    uint8_t        mac_addr[6];
+    netcard_t *    card; /* netcard attached to us */
+    thread_t *     poll_tid;
+    net_evt_t      rx_event;
+    net_evt_t      tx_event;
+    net_evt_t      stop_event;
+    netpkt_t       pkt;
+    netpkt_t       pkt_tx_v[SLIRP_PKT_BATCH];
+    int            during_tx;
+    int            recv_on_tx;
 #ifdef _WIN32
-    HANDLE     sock_event;
+    HANDLE         sock_event;
 #else
     uint32_t       pfd_len;
     uint32_t       pfd_size;
@@ -76,6 +80,29 @@ typedef struct net_slirp_t {
 #endif
 } net_slirp_t;
 
+/* Pulled off from libslirp code. This is only needed for modem. */
+#pragma pack(push, 1)
+struct arphdr_local {
+    unsigned char h_dest[6]; /* destination eth addr */
+    unsigned char h_source[6]; /* source ether addr    */
+    unsigned short h_proto; /* packet type ID field */
+
+    unsigned short ar_hrd; /* format of hardware address */
+    unsigned short ar_pro; /* format of protocol address */
+    unsigned char ar_hln; /* length of hardware address */
+    unsigned char ar_pln; /* length of protocol address */
+    unsigned short ar_op; /* ARP opcode (command)       */
+
+    /*
+     *  Ethernet looks like this : This bit is variable sized however...
+     */
+    uint8_t ar_sha[6]; /* sender hardware address */
+    uint32_t ar_sip; /* sender IP address       */
+    uint8_t ar_tha[6]; /* target hardware address */
+    uint32_t ar_tip; /* target IP address       */
+};
+#pragma pack(pop)
+
 #ifdef ENABLE_SLIRP_LOG
 int slirp_do_log = ENABLE_SLIRP_LOG;
 
@@ -109,7 +136,7 @@ net_slirp_clock_get_ns(UNUSED(void *opaque))
 static void *
 net_slirp_timer_new(SlirpTimerCb cb, void *cb_opaque, UNUSED(void *opaque))
 {
-    pc_timer_t *timer = malloc(sizeof(pc_timer_t));
+    pc_timer_t *timer = calloc(1, sizeof(pc_timer_t));
     timer_add(timer, cb, cb_opaque, 0);
     return timer;
 }
@@ -128,14 +155,22 @@ net_slirp_timer_mod(void *timer, int64_t expire_timer, UNUSED(void *opaque))
 }
 
 static void
+#if SLIRP_CHECK_VERSION(4, 9, 0)
+net_slirp_register_poll_socket(slirp_os_socket fd, void *opaque)
+#else
 net_slirp_register_poll_fd(int fd, void *opaque)
+#endif
 {
     (void) fd;
     (void) opaque;
 }
 
 static void
+#if SLIRP_CHECK_VERSION(4, 9, 0)
+net_slirp_unregister_poll_socket(slirp_os_socket fd, void *opaque)
+#else
 net_slirp_unregister_poll_fd(int fd, void *opaque)
+#endif
 {
     (void) fd;
     (void) opaque;
@@ -147,7 +182,11 @@ net_slirp_notify(void *opaque)
     (void) opaque;
 }
 
+#if SLIRP_CHECK_VERSION(4, 8, 0)
+slirp_ssize_t
+#else
 ssize_t
+#endif
 net_slirp_send_packet(const void *qp, size_t pkt_len, void *opaque)
 {
     net_slirp_t *slirp = (net_slirp_t *) opaque;
@@ -156,14 +195,22 @@ net_slirp_send_packet(const void *qp, size_t pkt_len, void *opaque)
 
     memcpy(slirp->pkt.data, (uint8_t *) qp, pkt_len);
     slirp->pkt.len = pkt_len;
-    network_rx_put_pkt(slirp->card, &slirp->pkt);
+    if (slirp->during_tx) {
+        network_rx_on_tx_put_pkt(slirp->card, &slirp->pkt);
+        slirp->recv_on_tx = 1;
+    } else
+        network_rx_put_pkt(slirp->card, &slirp->pkt);
 
     return pkt_len;
 }
 
 #ifdef _WIN32
 static int
+#    if SLIRP_CHECK_VERSION(4, 9, 0)
+net_slirp_add_poll(slirp_os_socket fd, int events, void *opaque)
+#    else
 net_slirp_add_poll(int fd, int events, void *opaque)
+#    endif
 {
     net_slirp_t *slirp   = (net_slirp_t *) opaque;
     long         bitmask = 0;
@@ -181,7 +228,11 @@ net_slirp_add_poll(int fd, int events, void *opaque)
 }
 #else
 static int
+#    if SLIRP_CHECK_VERSION(4, 9, 0)
+net_slirp_add_poll(slirp_os_socket fd, int events, void *opaque)
+#    else
 net_slirp_add_poll(int fd, int events, void *opaque)
+#    endif
 {
     net_slirp_t *slirp = (net_slirp_t *) opaque;
 
@@ -240,8 +291,12 @@ net_slirp_get_revents(int idx, void *opaque)
     WSA_TO_POLL(FD_WRITE, SLIRP_POLL_OUT);
     WSA_TO_POLL(FD_CONNECT, SLIRP_POLL_OUT);
     WSA_TO_POLL(FD_OOB, SLIRP_POLL_PRI);
+    WSA_TO_POLL(FD_CLOSE, SLIRP_POLL_IN);
     WSA_TO_POLL(FD_CLOSE, SLIRP_POLL_HUP);
 
+    if (ret == 0)
+        ret |= SLIRP_POLL_IN;
+
     return ret;
 }
 #else
@@ -272,8 +327,13 @@ static const SlirpCb slirp_cb = {
     .timer_new          = net_slirp_timer_new,
     .timer_free         = net_slirp_timer_free,
     .timer_mod          = net_slirp_timer_mod,
+#if SLIRP_CHECK_VERSION(4, 9, 0)
+    .register_poll_socket   = net_slirp_register_poll_socket,
+    .unregister_poll_socket = net_slirp_unregister_poll_socket,
+#else
     .register_poll_fd   = net_slirp_register_poll_fd,
     .unregister_poll_fd = net_slirp_unregister_poll_fd,
+#endif
     .notify             = net_slirp_notify
 };
 
@@ -296,6 +356,21 @@ net_slirp_in_available(void *priv)
     net_event_set(&slirp->tx_event);
 }
 
+static void
+net_slirp_rx_deferred_packets(net_slirp_t *slirp)
+{
+    int packets = 0;
+
+    if (slirp->recv_on_tx) {
+        do {
+            packets = network_rx_on_tx_popv(slirp->card, slirp->pkt_tx_v, SLIRP_PKT_BATCH);
+            for (int i = 0; i < packets; i++)
+                 network_rx_put_pkt(slirp->card, &(slirp->pkt_tx_v[i]));
+        } while (packets > 0);
+        slirp->recv_on_tx = 0;
+    }
+}
+
 #ifdef _WIN32
 static void
 net_slirp_thread(void *priv)
@@ -312,7 +387,11 @@ net_slirp_thread(void *priv)
     bool run               = true;
     while (run) {
         uint32_t timeout = -1;
+#    if SLIRP_CHECK_VERSION(4, 9, 0)
+        slirp_pollfds_fill_socket(slirp->slirp, &timeout, net_slirp_add_poll, slirp);
+#    else
         slirp_pollfds_fill(slirp->slirp, &timeout, net_slirp_add_poll, slirp);
+#    endif
         if (timeout < 0)
             timeout = INFINITE;
 
@@ -324,10 +403,13 @@ net_slirp_thread(void *priv)
 
             case NET_EVENT_TX:
                 {
+                    slirp->during_tx = 1;
                     int packets = network_tx_popv(slirp->card, slirp->pkt_tx_v, SLIRP_PKT_BATCH);
-                    for (int i = 0; i < packets; i++) {
+                    for (int i = 0; i < packets; i++)
                         net_slirp_in(slirp, slirp->pkt_tx_v[i].data, slirp->pkt_tx_v[i].len);
-                    }
+                    slirp->during_tx = 0;
+
+                    net_slirp_rx_deferred_packets(slirp);
                 }
                 break;
 
@@ -356,7 +438,11 @@ net_slirp_thread(void *priv)
         net_slirp_add_poll(net_event_get_fd(&slirp->stop_event), SLIRP_POLL_IN, slirp);
         net_slirp_add_poll(net_event_get_fd(&slirp->tx_event), SLIRP_POLL_IN, slirp);
 
+#    if SLIRP_CHECK_VERSION(4, 9, 0)
+        slirp_pollfds_fill_socket(slirp->slirp, &timeout, net_slirp_add_poll, slirp);
+#    else
         slirp_pollfds_fill(slirp->slirp, &timeout, net_slirp_add_poll, slirp);
+#    endif
 
         int ret = poll(slirp->pfd, slirp->pfd_len, timeout);
 
@@ -370,10 +456,13 @@ net_slirp_thread(void *priv)
         if (slirp->pfd[NET_EVENT_TX].revents & POLLIN) {
             net_event_clear(&slirp->tx_event);
 
+            slirp->during_tx = 1;
             int packets = network_tx_popv(slirp->card, slirp->pkt_tx_v, SLIRP_PKT_BATCH);
-            for (int i = 0; i < packets; i++) {
+            for (int i = 0; i < packets; i++)
                 net_slirp_in(slirp, slirp->pkt_tx_v[i].data, slirp->pkt_tx_v[i].len);
-            }
+            slirp->during_tx = 0;
+
+            net_slirp_rx_deferred_packets(slirp);
         }
     }
 
@@ -381,21 +470,20 @@ net_slirp_thread(void *priv)
 }
 #endif
 
-static int slirp_card_num = 2;
+int slirp_card_num = 2;
 
 /* Initialize SLiRP for use. */
 void *
 net_slirp_init(const netcard_t *card, const uint8_t *mac_addr, UNUSED(void *priv), char *netdrv_errbuf)
 {
-    slirp_log("SLiRP: initializing...\n");
+    slirp_log("SLiRP: initializing with range %d...\n", slirp_card_num);
     net_slirp_t *slirp = calloc(1, sizeof(net_slirp_t));
     memcpy(slirp->mac_addr, mac_addr, sizeof(slirp->mac_addr));
     slirp->card = (netcard_t *) card;
 
 #ifndef _WIN32
     slirp->pfd_size = 16 * sizeof(struct pollfd);
-    slirp->pfd      = malloc(slirp->pfd_size);
-    memset(slirp->pfd, 0, slirp->pfd_size);
+    slirp->pfd      = calloc(1, slirp->pfd_size);
 #endif
 
     /* Set the IP addresses to use. */
@@ -405,10 +493,47 @@ net_slirp_init(const netcard_t *card, const uint8_t *mac_addr, UNUSED(void *priv
     struct in_addr  dhcp       = { .s_addr = htonl(0x0a00000f | (slirp_card_num << 8)) }; /* 10.0.x.15 */
     struct in_addr  dns        = { .s_addr = htonl(0x0a000003 | (slirp_card_num << 8)) }; /* 10.0.x.3 */
     struct in_addr  bind       = { .s_addr = htonl(0x00000000) };                         /* 0.0.0.0 */
-    struct in6_addr ipv6_dummy = { 0 };                                                   /* contents don't matter; we're not using IPv6 */
+
+    const SlirpConfig slirp_config = {
+#if SLIRP_CHECK_VERSION(4, 9, 0)
+        .version = 6,
+#else
+        .version = 1,
+#endif
+        .restricted            = 0,
+        .in_enabled            = 1,
+        .vnetwork              = net,
+        .vnetmask              = mask,
+        .vhost                 = host,
+        .in6_enabled           = 0,
+        .vprefix_addr6         = { .s6_addr = { 0xfe, 0xc0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, /* fec0:: - unused */
+        .vprefix_len           = 64,
+        .vhost6                = { .s6_addr = { 0xfe, 0xc0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x02 } }, /* fec0::2 - unused */
+        .vhostname             = "86Box",
+        .tftp_server_name      = NULL,
+        .tftp_path             = NULL,
+        .bootfile              = NULL,
+        .vdhcp_start           = dhcp,
+        .vnameserver           = dns,
+        .vnameserver6          = { .s6_addr = { 0xfe, 0xc0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x03 } }, /* fec0::3 - unused */
+        .vdnssearch            = NULL,
+        .vdomainname           = NULL,
+        .if_mtu                = 0,
+        .if_mru                = 0,
+        .disable_host_loopback = 0,
+        .enable_emu            = 0,
+#if SLIRP_CHECK_VERSION(4, 9, 0)
+        .outbound_addr         = NULL,
+        .outbound_addr6        = NULL,
+        .disable_dns           = 0,
+        .disable_dhcp          = 0,
+        .mfr_id                = 0,
+        .oob_eth_addr          = { 0, 0, 0, 0, 0, 0 }
+#endif
+    };
 
     /* Initialize SLiRP. */
-    slirp->slirp = slirp_init(0, 1, net, mask, host, 0, ipv6_dummy, 0, ipv6_dummy, NULL, NULL, NULL, NULL, dhcp, dns, ipv6_dummy, NULL, NULL, &slirp_cb, slirp);
+    slirp->slirp = slirp_new(&slirp_config, &slirp_cb, slirp);
     if (!slirp->slirp) {
         slirp_log("SLiRP: initialization failed\n");
         snprintf(netdrv_errbuf, NET_DRV_ERRBUF_SIZE, "SLiRP initialization failed");
@@ -450,11 +575,38 @@ net_slirp_init(const netcard_t *card, const uint8_t *mac_addr, UNUSED(void *priv
         slirp->pkt_tx_v[i].data = calloc(1, NET_MAX_FRAME);
     }
     slirp->pkt.data = calloc(1, NET_MAX_FRAME);
+    net_event_init(&slirp->rx_event);
     net_event_init(&slirp->tx_event);
     net_event_init(&slirp->stop_event);
 #ifdef _WIN32
     slirp->sock_event = CreateEvent(NULL, FALSE, FALSE, NULL);
 #endif
+
+    if (!strcmp(network_card_get_internal_name(net_cards_conf[net_card_current].device_num), "modem")) {
+        /* Send a gratuitous ARP here to make SLiRP work properly with SLIP connections. */
+        struct arphdr_local arphdr;
+        /* ARP part. */
+        arphdr.ar_hrd      = bswap16(1);
+        arphdr.ar_pro      = bswap16(0x0800);
+        arphdr.ar_hln      = 6;
+        arphdr.ar_pln      = 4;
+        arphdr.ar_op       = bswap16(1);
+        memcpy(&arphdr.ar_sha, mac_addr, 6);
+        memcpy(&arphdr.ar_tha, mac_addr, 6);
+        arphdr.ar_sip      = dhcp.s_addr;
+        arphdr.ar_tip      = dhcp.s_addr;
+
+        /* Ethernet header part. */
+        arphdr.h_proto     = bswap16(0x0806);
+        memset(arphdr.h_dest, 0xff, 6);
+        memset(arphdr.h_source, 0x52, 6);
+        arphdr.h_source[2] = 0x0a;
+        arphdr.h_source[3] = 0x00;
+        arphdr.h_source[4] = slirp_card_num;
+        arphdr.h_source[5] = 2;
+        slirp_input(slirp->slirp, (const uint8_t *)&arphdr, sizeof(struct arphdr_local));
+    }
+
     slirp_log("SLiRP: creating thread...\n");
     slirp->poll_tid = thread_create(net_slirp_thread, slirp);
 
@@ -478,19 +630,20 @@ net_slirp_close(void *priv)
     slirp_log("SLiRP: waiting for thread to end...\n");
     thread_wait(slirp->poll_tid);
 
-    net_event_close(&slirp->tx_event);
     net_event_close(&slirp->stop_event);
+    net_event_close(&slirp->tx_event);
+    net_event_close(&slirp->rx_event);
     slirp_cleanup(slirp->slirp);
     for (int i = 0; i < SLIRP_PKT_BATCH; i++) {
         free(slirp->pkt_tx_v[i].data);
     }
     free(slirp->pkt.data);
     free(slirp);
-    slirp_card_num--;
 }
 
 const netdrv_t net_slirp_drv = {
-    &net_slirp_in_available,
-    &net_slirp_init,
-    &net_slirp_close
+    .notify_in = &net_slirp_in_available,
+    .init      = &net_slirp_init,
+    .close     = &net_slirp_close,
+	.priv      = NULL
 };
diff --git a/src/network/net_tap.c b/src/network/net_tap.c
new file mode 100644
index 000000000..762f68b60
--- /dev/null
+++ b/src/network/net_tap.c
@@ -0,0 +1,353 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Linux TAP network interface for 86box.
+ *
+ *          This file was created by looking at the VDE network backend
+ *          as a reference, credit to jguillaumes.
+ *
+ * Authors: Doug Johnson <dougvj@gmail.com>
+ *
+ *
+ *          Copyright 2023 Doug Johnson
+ *
+ *          Redistribution and  use  in source  and binary forms, with
+ *          or  without modification, are permitted  provided that the
+ *          following conditions are met:
+ *
+ *          1. Redistributions of  source  code must retain the entire
+ *             above notice, this list of conditions and the following
+ *             disclaimer.
+ *
+ *          2. Redistributions in binary form must reproduce the above
+ *             copyright  notice,  this list  of  conditions  and  the
+ *             following disclaimer in  the documentation and/or other
+ *             materials provided with the distribution.
+ *
+ *          3. Neither the  name of the copyright holder nor the names
+ *             of  its  contributors may be used to endorse or promote
+ *             products  derived from  this  software without specific
+ *             prior written permission.
+ *
+ * THIS SOFTWARE  IS  PROVIDED BY THE  COPYRIGHT  HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND  ANY EXPRESS  OR  IMPLIED  WARRANTIES,  INCLUDING, BUT  NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE  ARE  DISCLAIMED. IN  NO  EVENT  SHALL THE COPYRIGHT
+ * HOLDER OR  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL  DAMAGES  (INCLUDING,  BUT  NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE  GOODS OR SERVICES;  LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  AND ON  ANY
+ * THEORY OF  LIABILITY, WHETHER IN  CONTRACT, STRICT  LIABILITY, OR  TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef _WIN32
+#    error TAP networking is only supported on Linux
+#endif
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdbool.h>
+#include <poll.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/select.h>
+#include <sys/ioctl.h>
+#include <errno.h>
+#include <linux/if.h>
+#include <linux/if_tun.h>
+#include <linux/if_arp.h>
+#include <linux/sockios.h>
+
+#define HAVE_STDARG_H
+
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/plat.h>
+#include <86box/plat_dynld.h>
+#include <86box/thread.h>
+#include <86box/timer.h>
+#include <86box/network.h>
+#include <86box/net_event.h>
+
+typedef struct net_tap_t {
+    int        fd; // tap device file descriptor
+    netcard_t *card;
+    thread_t  *poll_tid;
+    net_evt_t  tx_event;
+    net_evt_t  stop_event;
+    netpkt_t   pkt_rx;
+    netpkt_t   pkts_tx[NET_QUEUE_LEN];
+} net_tap_t;
+
+#ifdef ENABLE_TAP_LOG
+int tap_do_log = ENABLE_TAP_LOG;
+
+
+static void tap_logv(const char *fmt, va_list ap)
+{
+    if (tap_do_log) {
+        pclog_ex(fmt, ap);
+    }
+}
+
+static void tap_log(const char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    if (tap_do_log) {
+        va_start(ap, fmt);
+        tap_logv(fmt, ap);
+        va_end(ap);
+    }
+    va_end(ap);
+}
+
+#else
+#    define tap_log(...) \
+        do {             \
+        } while (0)
+#    define tap_logv(...) \
+        do {              \
+        } while (0)
+#endif
+
+static void net_tap_thread(void *priv) {
+    enum {
+        NET_EVENT_STOP = 0,
+        NET_EVENT_TX,
+        NET_EVENT_RX,
+        NET_EVENT_TAP,
+        NET_EVENT_MAX,
+    };
+    net_tap_t *tap = priv;
+    tap_log("TAP: poll thread started.\n");
+    struct pollfd pfd[NET_EVENT_MAX];
+    pfd[NET_EVENT_STOP].fd = net_event_get_fd(&tap->stop_event);
+    pfd[NET_EVENT_STOP].events = POLLIN | POLLPRI;
+
+    pfd[NET_EVENT_TX].fd = net_event_get_fd(&tap->tx_event);
+    pfd[NET_EVENT_TX].events = POLLIN | POLLPRI;
+
+    pfd[NET_EVENT_RX].fd = tap->fd;
+    pfd[NET_EVENT_RX].events = POLLIN | POLLPRI;
+
+    pfd[NET_EVENT_TAP].fd = tap->fd;
+    pfd[NET_EVENT_TAP].events = POLLERR | POLLHUP | POLLPRI;
+    fcntl(tap->fd, F_SETFL, O_NONBLOCK);
+    while(1) {
+        ssize_t ret = poll(pfd, NET_EVENT_MAX, -1);
+        if (ret < 0) {
+            tap_log("TAP: poll error: %s\n", strerror(errno));
+            net_event_set(&tap->stop_event);
+            break;
+        }
+        if (pfd[NET_EVENT_TAP].revents) {
+            tap_log("TAP: tap close/error event received.\n");
+            net_event_set(&tap->stop_event);
+        }
+        if (pfd[NET_EVENT_TX].revents & POLLIN) {
+            net_event_clear(&tap->tx_event);
+            int packets = network_tx_popv(tap->card, tap->pkts_tx,
+                                          NET_QUEUE_LEN);
+            for(int i = 0; i < packets; i++) {
+                netpkt_t *pkt = &tap->pkts_tx[i];
+                ssize_t ret = write(tap->fd, pkt->data, pkt->len);
+                if (ret < 0) {
+                    tap_log("TAP: write error: %s\n", strerror(errno));
+                }
+            }
+        }
+        if (pfd[NET_EVENT_RX].revents & POLLIN) {
+            ssize_t len = read(tap->fd, tap->pkt_rx.data, NET_MAX_FRAME);
+            if (len < 0) {
+                tap_log("TAP: read error: %s\n", strerror(errno));
+                continue;
+            }
+            tap->pkt_rx.len = len;
+            network_rx_put_pkt(tap->card, &tap->pkt_rx);
+        }
+        if (pfd[NET_EVENT_STOP].revents & POLLIN) {
+            net_event_clear(&tap->stop_event);
+            break;
+        }
+    }
+}
+
+void net_tap_close(void *priv)
+{
+    if (!priv) {
+        return;
+    }
+    net_tap_t *tap = priv;
+    tap_log("TAP: closing.\n");
+    net_event_set(&tap->stop_event);
+    tap_log("TAP: waiting for poll thread to exit.\n");
+    thread_wait(tap->poll_tid);
+    tap_log("TAP: poll thread exited.\n");
+    for(int i = 0; i < NET_QUEUE_LEN; i++) {
+        free(tap->pkts_tx[i].data);
+    }
+    free(tap->pkt_rx.data);
+    if (tap->fd >= 0) {
+        close(tap->fd);
+    }
+    free(tap);
+}
+
+void net_tap_error(char *errbuf, const char* format, ...)
+{
+    va_list ap;
+    va_start(ap, format);
+    vsnprintf(errbuf, NET_DRV_ERRBUF_SIZE, format, ap);
+    tap_log("TAP: %s", errbuf);
+    va_end(ap);
+}
+
+// Error handling macro for the many ioctl calls we use in net_tap_alloc
+#define ioctl_or_fail(fd, request, argp) \
+    do {                                 \
+        if ((err = ioctl(fd, request, argp)) < 0) { \
+            tap_log("TAP: ioctl " #request " error: %s\n", strerror(errno)); \
+            goto fail; \
+        } \
+    } while (0)
+
+// Returns -ERRNO so we can get an idea what's wrong
+int net_tap_alloc(const uint8_t *mac_addr, const char* bridge_dev)
+{
+    int fd;
+    struct ifreq ifr = {0};
+    if ((fd = open("/dev/net/tun", O_RDWR)) < 0) {
+        tap_log("TAP: open error: %s\n", strerror(errno));
+        return -errno;
+    }
+    ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
+    int err;
+    if ((err = ioctl(fd, TUNSETIFF, &ifr)) < 0) {
+        tap_log("TAP: ioctl TUNSETIFF error: %s\n", strerror(errno));
+        close(fd);
+        return -errno;
+    }
+    // Create a socket for ioctl operations
+    int sock;
+    if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+        tap_log("TAP: socket error: %s\n", strerror(errno));
+        close(fd);
+        return -errno;
+    }
+    // Bring the interface up
+    tap_log("TAP: Bringing interface '%s' up.\n", ifr.ifr_name);
+    ifr.ifr_flags = IFF_UP;
+    ioctl_or_fail(sock, SIOCSIFFLAGS, &ifr);
+    // Add interface to bridge, if specified
+    if (bridge_dev && bridge_dev[0] != '\0') {
+        // First see if the bridge exists
+        struct ifreq ifr_bridge;
+        //NOTE strncpy does not null terminate if the string is too long, I use
+        //     snprintf or strlcpy instead
+        //strncpy(ifr_bridge.ifr_name, bridge_dev, IFNAMSIZ);
+        snprintf(ifr_bridge.ifr_name, IFNAMSIZ, "%s", bridge_dev);
+        if ((err = ioctl(sock, SIOCGIFINDEX, &ifr_bridge)) < 0) {
+            if (errno != ENODEV) {
+                tap_log("TAP: ioctl SIOCGIFINDEX error: %s\n", strerror(errno));
+                goto fail;
+            } else {
+                // Create the bridge
+                ioctl_or_fail(sock, SIOCBRADDBR, &ifr_bridge);
+                // Set the bridge up
+                ifr_bridge.ifr_flags = IFF_UP;
+                ioctl_or_fail(sock, SIOCSIFFLAGS, &ifr_bridge);
+            }
+        }
+        // Get TAP index
+        ioctl_or_fail(sock, SIOCGIFINDEX, &ifr);
+        // Add the tap device to the bridge
+        ifr_bridge.ifr_ifindex = ifr.ifr_ifindex;
+        ioctl_or_fail(sock, SIOCBRADDIF, &ifr_bridge);
+    }
+    // close the socket we used for ioctl operations
+    close(sock);
+    tap_log("Allocated tap device %s\n", ifr.ifr_name);
+    return fd;
+    // cleanup point used by ioctl_or_fail macro
+fail:
+    close(sock);
+    close(fd);
+    return -errno;
+}
+
+void net_tap_in_available(void *priv)
+{
+    net_tap_t *tap = priv;
+    net_event_set(&tap->tx_event);
+}
+
+void *
+net_tap_init(
+        const netcard_t *card,
+        const uint8_t *mac_addr,
+        void *priv,
+        char *netdrv_errbuf)
+{
+    const char *bridge_dev = (void *) priv;
+    int tap_fd = net_tap_alloc(mac_addr, bridge_dev);
+    if (tap_fd < 0) {
+        if (tap_fd == -EPERM) {
+            net_tap_error(
+                    netdrv_errbuf,
+                    "No permissions to allocate tap device. "
+                    "Try adding NET_CAP_ADMIN,NET_CAP_RAW to 86box ("
+                    "sudo setcap 'CAP_NET_RAW,CAP_NET_ADMIN=eip')");
+        } else {
+            net_tap_error(
+                    netdrv_errbuf,
+                    "Unable to allocate TAP device: %s",
+                    strerror(-tap_fd));
+        }
+        return NULL;
+    }
+    if (bridge_dev && bridge_dev[0] != '\0') {
+    }
+    net_tap_t *tap = calloc(1, sizeof(net_tap_t));
+    if (!tap) {
+        goto alloc_fail;
+    }
+    tap->pkt_rx.data = calloc(1, NET_MAX_FRAME);
+    if (!tap->pkt_rx.data) {
+        goto alloc_fail;
+    }
+    for(int i = 0; i < NET_QUEUE_LEN; i++) {
+        tap->pkts_tx[i].data = calloc(1, NET_MAX_FRAME);
+        if (!tap->pkts_tx[i].data) {
+            goto alloc_fail;
+        }
+    }
+    tap->fd   = tap_fd;
+    tap->card = (netcard_t *) card;
+    net_event_init(&tap->tx_event);
+    net_event_init(&tap->stop_event);
+    tap->poll_tid = thread_create(net_tap_thread, tap);
+    return tap;
+alloc_fail:
+    net_tap_error(netdrv_errbuf, "Failed to allocate memory");
+    close(tap_fd);
+    free(tap);
+    return NULL;
+}
+
+const netdrv_t net_tap_drv = {
+    &net_tap_in_available,
+    &net_tap_init,
+    &net_tap_close,
+    NULL
+};
diff --git a/src/network/net_tulip.c b/src/network/net_tulip.c
index 5fed7f1d1..cbf3b704e 100644
--- a/src/network/net_tulip.c
+++ b/src/network/net_tulip.c
@@ -31,11 +31,10 @@
 #include <86box/device.h>
 #include <86box/thread.h>
 #include <86box/network.h>
-#include <86box/net_eeprom_nmc93cxx.h>
-#include <86box/net_tulip.h>
-#include <86box/bswap.h>
+#include <86box/nmc93cxx.h>
 #include <86box/plat_fallthrough.h>
 #include <86box/plat_unused.h>
+#include <86box/bswap.h>
 
 #define ROM_PATH_DEC21140            "roms/network/dec21140/BIOS13502.BIN"
 
@@ -453,7 +452,9 @@ tulip_copy_rx_bytes(TULIPState *s, struct tulip_descriptor *desc)
 static bool
 tulip_filter_address(TULIPState *s, const uint8_t *addr)
 {
+#ifdef BLOCK_BROADCAST
     static const char broadcast[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+#endif
     bool              ret         = false;
 
     for (uint8_t i = 0; i < 16 && ret == false; i++) {
@@ -462,9 +463,15 @@ tulip_filter_address(TULIPState *s, const uint8_t *addr)
         }
     }
 
+/*
+   Do not block broadcast packets - needed for connections to the guest
+   to succeed when using SLiRP.
+ */
+#ifdef BLOCK_BROADCAST
     if (!memcmp(addr, broadcast, ETH_ALEN)) {
         return true;
     }
+#endif
 
     if (s->csr[6] & (CSR6_PR | CSR6_RA)) {
         /* Promiscuous mode enabled */
@@ -489,7 +496,7 @@ tulip_receive(void *priv, uint8_t *buf, int size)
 {
     struct tulip_descriptor desc;
     TULIPState             *s = (TULIPState *) priv;
-
+    int                     first = 1;
 
     if (size < 14 || size > sizeof(s->rx_frame) - 4
         || s->rx_frame_len || tulip_rx_stopped(s))
@@ -507,7 +514,11 @@ tulip_receive(void *priv, uint8_t *buf, int size)
         if (!(desc.status & RDES0_OWN)) {
             s->csr[5] |= CSR5_RU;
             tulip_update_int(s);
-            return s->rx_frame_size - s->rx_frame_len;
+            if (first)
+                /* Stop at the very beginning, tell the host 0 bytes have been received. */
+                return 0;
+            else
+                return (s->rx_frame_size - s->rx_frame_len) % s->rx_frame_size;
         }
         desc.status = 0;
 
@@ -528,6 +539,7 @@ tulip_receive(void *priv, uint8_t *buf, int size)
         }
         tulip_desc_write(s, s->current_rx_desc, &desc);
         tulip_next_rx_descriptor(s, &desc);
+        first = 0;
     } while (s->rx_frame_len);
 
     return 1;
@@ -959,7 +971,8 @@ tulip_write(uint32_t addr, uint32_t data, void *opaque)
 
         case CSR(7):
             s->csr[7] = data;
-            tulip_update_int(s);
+            if (s->device_info->local)
+                tulip_update_int(s);
             break;
 
         case CSR(8):
@@ -994,7 +1007,7 @@ tulip_write(uint32_t addr, uint32_t data, void *opaque)
 
         case CSR(13):
             s->csr[13] = data;
-            if (s->device_info->local == 3 && (data & 0x4)) {
+            if ((s->device_info->local == 3) && (data & 0x4)) {
                 s->csr[13] = 0x8f01;
                 s->csr[14] = 0xfffd;
                 s->csr[15] = 0;
@@ -1395,7 +1408,7 @@ nic_init(const device_t *info)
     if (!s)
         return NULL;
 
-    if (info->local && info->local != 3) {
+    if (info->local && (info->local != 3)) {
         s->bios_addr = 0xD0000;
         s->has_bios  = device_get_config_int("bios");
     } else {
@@ -1422,7 +1435,7 @@ nic_init(const device_t *info)
             s->eeprom_data[2] = 0x14;
             s->eeprom_data[3] = 0x21;
         } else {
-           /*Subsystem Vendor ID*/
+            /*Subsystem Vendor ID*/
             s->eeprom_data[0] = info->local ? 0x25 : 0x11;
             s->eeprom_data[1] = 0x10;
 
@@ -1531,26 +1544,46 @@ nic_init(const device_t *info)
             s->eeprom_data[40] = 0x00;
             s->eeprom_data[41] = 0x00;
         } else {
+            /*SROM Format Version 3*/
+            s->eeprom_data[18] = 0x03;
+
             /*Block Count*/
             s->eeprom_data[32] = 0x01;
 
-            /*Extended Format - Block Type 2 for 21142/21143*/
+            /*Extended Format - Block Type 3 for 21142/21143*/
             /*Length (0:6) and Format Indicator (7)*/
-            s->eeprom_data[33] = 0x86;
+            s->eeprom_data[33] = 0x8d;
 
             /*Block Type*/
-            s->eeprom_data[34] = 0x02;
+            s->eeprom_data[34] = 0x03;
 
-            /*Media Code (0:5), EXT (6), Reserved (7)*/
-            s->eeprom_data[35] = 0x01;
+            /*PHY Number*/
+            s->eeprom_data[35] = 0x00;
 
-            /*General Purpose Control*/
-            s->eeprom_data[36] = 0xff;
-            s->eeprom_data[37] = 0xff;
+            /*GPR Length*/
+            s->eeprom_data[36] = 0x00;
 
-            /*General Purpose Data*/
+            /*Reset Length*/
+            s->eeprom_data[37] = 0x00;
+
+            /*Media Capabilities*/
             s->eeprom_data[38] = 0x00;
-            s->eeprom_data[39] = 0x00;
+            s->eeprom_data[39] = 0x78;
+
+            /*Nway Advertisement*/
+            s->eeprom_data[40] = 0xe0;
+            s->eeprom_data[41] = 0x01;
+
+            /*FDX Bit Map*/
+            s->eeprom_data[42] = 0x00;
+            s->eeprom_data[43] = 0x50;
+
+            /*TTM Bit Map*/
+            s->eeprom_data[44] = 0x00;
+            s->eeprom_data[45] = 0x18;
+
+            /*MII PHY Insertion/removal Indication*/
+            s->eeprom_data[46] = 0x00;
         }
 
         s->eeprom_data[126] = tulip_srom_crc(s->eeprom_data) & 0xff;
@@ -1593,7 +1626,7 @@ nic_init(const device_t *info)
         checksum *= 2;
         if (checksum > 65535)
             checksum = checksum % 65535;
-        
+
         /* 3rd pair. */
         checksum += (s->eeprom_data[4] * 256) | s->eeprom_data[5];
         if (checksum > 65535)
@@ -1601,7 +1634,7 @@ nic_init(const device_t *info)
 
         if (checksum >= 65535)
             checksum = 0;
-        
+
         s->eeprom_data[6] = (checksum >> 8) & 0xFF;
         s->eeprom_data[7] = checksum & 0xFF;
     }
@@ -1610,9 +1643,10 @@ nic_init(const device_t *info)
         params.nwords          = 64;
         params.default_content = (uint16_t *) s->eeprom_data;
         params.filename        = filename;
-        snprintf(filename, sizeof(filename), "nmc93cxx_eeprom_%s_%d.nvr", info->internal_name, device_get_instance());
-        s->eeprom = device_add_parameters(&nmc93cxx_device, &params);
-        if (!s->eeprom) {
+        int inst               = device_get_instance();
+        snprintf(filename, sizeof(filename), "nmc93cxx_eeprom_%s_%d.nvr", info->internal_name, inst);
+        s->eeprom = device_add_inst_params(&nmc93cxx_device, inst, &params);
+        if (s->eeprom == NULL) {
             free(s);
             return NULL;
         }
@@ -1623,7 +1657,7 @@ nic_init(const device_t *info)
     s->pci_conf[0x04]             = 7;
 
     /* Enable our BIOS space in PCI, if needed. */
-    if (s->bios_addr > 0) {
+    if (s->has_bios) {
         rom_init(&s->bios_rom, ROM_PATH_DEC21140, s->bios_addr, 0x10000, 0xffff, 0, MEM_MAPPING_EXTERNAL);
         tulip_pci_bar[2].addr         = 0xffff0000;
     } else
@@ -1649,43 +1683,55 @@ nic_close(void *priv)
 // clang-format off
 static const device_config_t dec_tulip_21143_config[] = {
     {
-        .name = "mac",
-        .description = "MAC Address",
-        .type = CONFIG_MAC,
-        .default_string = "",
-        .default_int = -1
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t dec_tulip_21140_config[] = {
     {
-        .name = "bios",
-        .description = "Enable BIOS",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "bios",
+        .description    = "Enable BIOS",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "mac",
-        .description = "MAC Address",
-        .type = CONFIG_MAC,
-        .default_string = "",
-        .default_int = -1
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 // clang-format on
 
 const device_t dec_tulip_device = {
-    .name          = "DE500A Fast Ethernet (DECchip 21143 \"Tulip\")",
+    .name          = "DEC DE-500A Fast Ethernet (DECchip 21143 \"Tulip\")",
     .internal_name = "dec_21143_tulip",
     .flags         = DEVICE_PCI,
     .local         = 0,
     .init          = nic_init,
     .close         = nic_close,
     .reset         = tulip_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = dec_tulip_21143_config
@@ -1699,7 +1745,7 @@ const device_t dec_tulip_21140_device = {
     .init          = nic_init,
     .close         = nic_close,
     .reset         = tulip_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = dec_tulip_21140_config
@@ -1713,7 +1759,7 @@ const device_t dec_tulip_21140_vpc_device = {
     .init          = nic_init,
     .close         = nic_close,
     .reset         = tulip_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = dec_tulip_21140_config
@@ -1727,7 +1773,7 @@ const device_t dec_tulip_21040_device = {
     .init          = nic_init,
     .close         = nic_close,
     .reset         = tulip_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = dec_tulip_21143_config
diff --git a/src/network/net_vde.c b/src/network/net_vde.c
index afeeaac9c..4f8d5c21f 100644
--- a/src/network/net_vde.c
+++ b/src/network/net_vde.c
@@ -274,7 +274,7 @@ void *net_vde_init(const netcard_t *card, const uint8_t *mac_addr, void *priv, c
 
     vde_args.group = 0;
     vde_args.port  = 0;
-    vde_args.mode  = 0;
+    vde_args.mode  = 0700;  // Allow the switch to connect back to our socket if it is run by the same user
 
     // We are calling vde_open_real(), not the vde_open() macro...
     if ((vde->vdeconn = f_vde_open(socket_name, VDE_DESCRIPTION, 
@@ -302,9 +302,9 @@ void *net_vde_init(const netcard_t *card, const uint8_t *mac_addr, void *priv, c
 // VDE Driver structure
 //-
 const netdrv_t net_vde_drv =  {
-    &net_vde_in_available,
-    &net_vde_init,
-    &net_vde_close,
-    NULL
+    .notify_in = &net_vde_in_available,
+    .init      = &net_vde_init,
+    .close     = &net_vde_close,
+    .priv      = NULL
 };
 
diff --git a/src/network/net_wd8003.c b/src/network/net_wd8003.c
index 04b922aaf..890b221e2 100644
--- a/src/network/net_wd8003.c
+++ b/src/network/net_wd8003.c
@@ -44,6 +44,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <stdarg.h>
 #include <wchar.h>
 #include <time.h>
@@ -63,7 +64,6 @@
 #include <86box/network.h>
 #include <86box/net_dp8390.h>
 #include <86box/net_wd8003.h>
-#include <86box/bswap.h>
 #include <86box/plat_fallthrough.h>
 #include <86box/plat_unused.h>
 
@@ -651,8 +651,7 @@ wd_init(const device_t *info)
     uint32_t mac;
     wd_t    *dev;
 
-    dev = malloc(sizeof(wd_t));
-    memset(dev, 0x00, sizeof(wd_t));
+    dev = calloc(1, sizeof(wd_t));
     dev->name  = info->name;
     dev->board = info->local;
 
@@ -808,46 +807,48 @@ wd_close(void *priv)
 // clang-format off
 static const device_config_t wd8003_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x300,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x300,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "0x240", .value = 0x240 },
             { .description = "0x280", .value = 0x280 },
             { .description = "0x300", .value = 0x300 },
             { .description = "0x380", .value = 0x380 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 3,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 3,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "IRQ 2", .value = 2 },
             { .description = "IRQ 3", .value = 3 },
             { .description = "IRQ 5", .value = 5 },
             { .description = "IRQ 7", .value = 7 },
             { .description = ""                  }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "ram_addr",
-        .description = "RAM address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0xD0000,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "ram_addr",
+        .description    = "RAM Address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xD0000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "C800", .value = 0xC8000 },
             { .description = "CC00", .value = 0xCC000 },
             { .description = "D000", .value = 0xD0000 },
@@ -856,27 +857,32 @@ static const device_config_t wd8003_config[] = {
             { .description = "DC00", .value = 0xDC000 },
             { .description = ""                       }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "mac",
-        .description = "MAC Address",
-        .type = CONFIG_MAC,
-        .default_string = "",
-        .default_int = -1
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t wd8003eb_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x280,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x280,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "0x200", .value = 0x200 },
             { .description = "0x220", .value = 0x220 },
             { .description = "0x240", .value = 0x240 },
@@ -889,32 +895,34 @@ static const device_config_t wd8003eb_config[] = {
             { .description = "0x380", .value = 0x380 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 3,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 3,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "IRQ 2/9", .value = 9 },
             { .description = "IRQ 3",   .value = 3 },
             { .description = "IRQ 4",   .value = 4 },
             { .description = "IRQ 7",   .value = 7 },
             { .description = ""                    }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "ram_addr",
-        .description = "RAM address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0xD0000,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "ram_addr",
+        .description    = "RAM Address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xD0000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "C000", .value = 0xC0000 },
             { .description = "C400", .value = 0xC4000 },
             { .description = "C800", .value = 0xC8000 },
@@ -925,27 +933,33 @@ static const device_config_t wd8003eb_config[] = {
             { .description = "DC00", .value = 0xDC000 },
             { .description = ""                       }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "ram_size",
-        .description = "RAM size",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 8192,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "8 kB",  .value =  8192 },
-            { .description = "32 kB", .value = 32768 },
+        .name           = "ram_size",
+        .description    = "RAM size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 8192,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "8 KB",  .value =  8192 },
+            { .description = "32 KB", .value = 32768 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "mac",
-        .description = "MAC Address",
-        .type = CONFIG_MAC,
-        .default_string = "",
-        .default_int = -1
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
@@ -954,14 +968,14 @@ static const device_config_t wd8003eb_config[] = {
    http://www.stack.nl/~marcolz/network/wd80x3.html#WD8013EBT */
 static const device_config_t wd8013_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x280,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x280,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "0x200", .value = 0x200 },
             { .description = "0x220", .value = 0x220 },
             { .description = "0x240", .value = 0x240 },
@@ -974,16 +988,17 @@ static const device_config_t wd8013_config[] = {
             { .description = "0x380", .value = 0x380 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 3,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 3,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "IRQ 2/9", .value =  9 },
             { .description = "IRQ 3",   .value =  3 },
             { .description = "IRQ 4",   .value =  4 },
@@ -994,16 +1009,17 @@ static const device_config_t wd8013_config[] = {
             { .description = "IRQ 15",  .value = 15 },
             { .description = ""                     }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "ram_addr",
-        .description = "RAM address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0xD0000,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "ram_addr",
+        .description    = "RAM Address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xD0000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "C000", .value = 0xC0000 },
             { .description = "C400", .value = 0xC4000 },
             { .description = "C800", .value = 0xC8000 },
@@ -1014,63 +1030,78 @@ static const device_config_t wd8013_config[] = {
             { .description = "DC00", .value = 0xDC000 },
             { .description = ""                       }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "ram_size",
-        .description = "RAM size",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 16384,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "16 kB", .value = 16384 },
-            { .description = "64 kB", .value = 65536 },
+        .name           = "ram_size",
+        .description    = "RAM size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 16384,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "16 KB", .value = 16384 },
+            { .description = "64 KB", .value = 65536 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "mac",
-        .description = "MAC Address",
-        .type = CONFIG_MAC,
-        .default_string = "",
-        .default_int = -1
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t wd8013epa_config[] = {
     {
-        .name = "ram_size",
-        .description = "Initial RAM size",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 16384,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "8 kB",  .value = 8192  },
-            { .description = "16 kB", .value = 16384 },
+        .name           = "ram_size",
+        .description    = "Initial RAM size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 16384,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "8 KB",  .value = 8192  },
+            { .description = "16 KB", .value = 16384 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "mac",
-        .description = "MAC Address",
-        .type = CONFIG_MAC,
-        .default_string = "",
-        .default_int = -1
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t mca_mac_config[] = {
     {
-        .name = "mac",
-        .description = "MAC Address",
-        .type = CONFIG_MAC,
-        .default_string = "",
-        .default_int = -1
+        .name           = "mac",
+        .description    = "MAC Address",
+        .type           = CONFIG_MAC,
+        .default_string = NULL,
+        .default_int    = -1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
@@ -1084,7 +1115,7 @@ const device_t wd8003e_device = {
     .init          = wd_init,
     .close         = wd_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = wd8003_config
@@ -1098,7 +1129,7 @@ const device_t wd8003eb_device = {
     .init          = wd_init,
     .close         = wd_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = wd8003eb_config
@@ -1112,7 +1143,7 @@ const device_t wd8013ebt_device = {
     .init          = wd_init,
     .close         = wd_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = wd8013_config
@@ -1126,7 +1157,7 @@ const device_t wd8003eta_device = {
     .init          = wd_init,
     .close         = wd_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = mca_mac_config
@@ -1140,7 +1171,7 @@ const device_t wd8003ea_device = {
     .init          = wd_init,
     .close         = wd_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = mca_mac_config
@@ -1154,7 +1185,7 @@ const device_t wd8013epa_device = {
     .init          = wd_init,
     .close         = wd_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = wd8013epa_config
diff --git a/src/network/netswitch.c b/src/network/netswitch.c
new file mode 100644
index 000000000..54815a682
--- /dev/null
+++ b/src/network/netswitch.c
@@ -0,0 +1,973 @@
+/*
+* 86Box    A hypervisor and IBM PC system emulator that specializes in
+*          running old operating systems and software designed for IBM
+*          PC systems and compatibles from 1981 through fairly recent
+*          system designs based on the PCI bus.
+*
+*          This file is part of the 86Box distribution.
+*
+*          Network Switch backend
+*
+*
+*
+* Authors: cold-brewed
+*
+*          Copyright 2024 cold-brewed
+*/
+
+
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdbool.h>
+#include <errno.h>
+#include <fcntl.h>
+#ifdef _WIN32
+#    define WIN32_LEAN_AND_MEAN
+#    include <windows.h>
+#    include <winsock2.h>
+#else
+#    include <poll.h>
+#    include <netdb.h>
+#endif
+
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/thread.h>
+#include <86box/timer.h>
+#include <86box/network.h>
+#include <86box/net_event.h>
+#include <86box/random.h>
+#include <sys/time.h>
+#include "netswitch.h"
+#include "pb_encode.h"
+#include "pb_decode.h"
+
+#include "networkmessage.pb.h"
+
+bool ns_socket_setup(NSCONN *conn) {
+
+    if(conn == NULL) {
+        errno=EINVAL;
+        return false;
+    }
+
+#ifdef _WIN32
+    // Initialize Windows Socket API with the given version.
+    WSADATA wsaData;
+    if (WSAStartup(MAKEWORD(2, 0), &wsaData)) {
+        perror("WSAStartup");
+        return false;
+    }
+#endif
+
+    /* Create the "main" socket
+        * Local mode: the listener socket for multicast packets
+        * Remote mode: the "main" socket for send and receive */
+    conn->fddata = socket(AF_INET, SOCK_DGRAM, 0);
+    if (conn->fddata < 0) {
+        perror("socket");
+        return false;
+    }
+
+    /* Here things diverge depending on local or remote type */
+    if(conn->switch_type == SWITCH_TYPE_LOCAL) {
+
+        /* Set socket options - allow multiple sockets to use the same address */
+        u_int on = 1;
+        if (setsockopt(conn->fddata, SOL_SOCKET, SO_REUSEADDR, (char *) &on, sizeof(on)) < 0) {
+            perror("Reusing ADDR failed");
+            return false;
+        }
+#ifndef _WIN32
+        /* ... and same port number
+         * Not needed on windows because SO_REUSEPORT doesn't exist there. However, the same
+         * functionality comes along with SO_REUSEADDR. */
+        if (setsockopt(conn->fddata, SOL_SOCKET, SO_REUSEPORT, (char *) &on, sizeof(on)) < 0) {
+            perror("Reusing PORT failed");
+            return false;
+        }
+#endif
+
+        memset(&conn->addr, 0, sizeof(conn->addr));
+        conn->addr.sin_family      = AF_INET;
+        conn->addr.sin_addr.s_addr = htonl(INADDR_ANY);
+        conn->addr.sin_port        = htons(conn->local_multicast_port);
+
+        /* Bind to receive address */
+        if (bind(conn->fddata, (struct sockaddr *) &conn->addr, sizeof(conn->addr)) < 0) {
+            perror("bind");
+            return false;
+        }
+
+        /* Request to join multicast group */
+        /*** NOTE: intermittent airplane (non-connected wifi) failures with 239.255.86.86 - needs more investigation */
+        struct ip_mreq mreq;
+        mreq.imr_multiaddr.s_addr = inet_addr(conn->mcast_group);
+        mreq.imr_interface.s_addr = htonl(INADDR_ANY);
+        if (setsockopt(conn->fddata, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *) &mreq, sizeof(mreq)) < 0) {
+            perror("setsockopt");
+            return false;
+        }
+
+        /* Now create the outgoing data socket */
+        conn->fdout = socket(AF_INET, SOCK_DGRAM, 0);
+        if (conn->fdout < 0) {
+            perror("out socket");
+            return false;
+        }
+
+        /* Set up destination address */
+        memset(&conn->outaddr, 0, sizeof(conn->outaddr));
+        conn->outaddr.sin_family      = AF_INET;
+        conn->outaddr.sin_addr.s_addr = inet_addr(conn->mcast_group);
+        conn->outaddr.sin_port        = htons(conn->local_multicast_port);
+    } else if (conn->switch_type == SWITCH_TYPE_REMOTE) {
+        /* Remote switch path */
+        int status;
+        struct addrinfo hints;
+        struct addrinfo *servinfo;
+        char connect_ip[128] = "\0";
+
+        memset(&hints, 0, sizeof hints);
+        hints.ai_family = AF_INET;
+        hints.ai_socktype = SOCK_DGRAM;
+        hints.ai_flags = AI_PASSIVE; // not sure?
+
+        if((status = getaddrinfo(conn->nrs_hostname, NULL, &hints, &servinfo)) != 0) {
+            net_switch_log("getaddrinfo error: %s\n", gai_strerror(status));
+            errno=EFAULT;
+            return false;
+        }
+
+        for(const struct addrinfo *p = servinfo; p != NULL; p = p->ai_next) { // NOLINT (only want the first result)
+            /* Take the first result, ipv4 since AF_INET was set in the hints */
+            const struct sockaddr_in *ipv4 = (struct sockaddr_in *) p->ai_addr;
+            const void               *addr = &(ipv4->sin_addr);
+            inet_ntop(p->ai_family, addr, connect_ip, sizeof connect_ip);
+            break;
+        }
+        freeaddrinfo(servinfo);
+
+        if(strlen(connect_ip) == 0) {
+            /* Couldn't look up the hostname */
+            net_switch_log("Hostname lookup failure?\n");
+            errno=EFAULT;
+            return false;
+        }
+
+        /* Set up local socket address and port */
+        memset(&conn->addr, 0, sizeof(conn->addr));
+        conn->addr.sin_family      = AF_INET;
+        conn->addr.sin_addr.s_addr = htonl(INADDR_ANY);
+        conn->addr.sin_port        = htons(conn->remote_source_port);
+
+        /* Bind to receive address. Try the first 100 ports to allow the use of multiple systems simultaneously */
+        for(int i=0; i<100; i++) {
+            if(i==99) {
+                net_switch_log("Unable to find an available port to bind\n");
+                return false;
+            }
+            if (bind(conn->fddata, (struct sockaddr *) &conn->addr, sizeof(conn->addr)) < 0) {
+                net_switch_log("local port %d unavailable, trying next..\n", conn->remote_source_port);
+                conn->remote_source_port += 1;
+                conn->addr.sin_port = htons(conn->remote_source_port);
+                continue ;
+            } else {
+                net_switch_log("** Local port for net remote switch is %d\n", conn->remote_source_port);
+                break;
+            }
+
+        }
+
+
+        /* Set up remote address and port */
+        memset(&conn->outaddr, 0, sizeof(conn->outaddr));
+        conn->outaddr.sin_family      = AF_INET;
+        conn->outaddr.sin_addr.s_addr = inet_addr(connect_ip);
+        conn->outaddr.sin_port        = htons(conn->remote_network_port);
+
+        /* In remote mode the file descriptor for send (fdout) is the same as receive */
+        conn->fdout = conn->fddata;
+
+    } else {
+        errno=EINVAL;
+        return false;
+    }
+
+    return true;
+}
+
+NSCONN *
+ns_open(struct ns_open_args *open_args) {
+    struct nsconn *conn=NULL;
+
+    /* Each "group" is really just the base port + group number
+     * A different group effectively gets you a different switch
+     * Clamp the group at MAX_SWITCH_GROUP */
+    if(open_args->group > MAX_SWITCH_GROUP) {
+        open_args->group = MAX_SWITCH_GROUP;
+    }
+    // FIXME: hardcoded for testing
+    char *mcast_group = "239.255.86.86"; // Admin scope
+    // char *mcast_group = "224.0.0.86"; // Local scope
+
+    if ( (conn=calloc(1,sizeof(struct nsconn)))==NULL) {
+        errno=ENOMEM;
+        return NULL;
+    }
+
+    /* Type */
+    conn->switch_type = open_args->type;
+
+    /* Allocate the fragment buffer */
+    for (int i = 0; i < FRAGMENT_BUFFER_LENGTH; i++) {
+        conn->fragment_buffer[i] = calloc(1, sizeof(ns_fragment_t));
+        /* Set the default size to 0 and null data buffer to indicate it is unused.
+         * The data buffer will be allocated as needed. */
+        conn->fragment_buffer[i]->size = 0;
+        conn->fragment_buffer[i]->data = NULL;
+    }
+//    net_switch_log("Fragment buffers: %d total, %d each\n", FRAGMENT_BUFFER_LENGTH, MAX_FRAME_SEND_SIZE);
+
+    snprintf(conn->mcast_group, MAX_MCAST_GROUP_LEN, "%s", mcast_group);
+    conn->flags = open_args->flags;
+
+    /* Increment the multicast port by the switch group number. Each group is
+     * just a different port. */
+    conn->local_multicast_port = open_args->group + NET_SWITCH_MULTICAST_PORT;
+    conn->remote_network_port = NET_SWITCH_REMOTE_PORT;
+    /* Source ports for remote switch will start here and be incremented until an available port is found */
+    conn->remote_source_port = NET_SWITCH_REMOTE_PORT + NET_SWITCH_RECV_PORT_OFFSET;
+
+    /* Remote switch hostname */
+    strncpy(conn->nrs_hostname, open_args->nrs_hostname, sizeof(conn->nrs_hostname) - 1);
+
+    /* Switch type */
+    if(conn->switch_type == SWITCH_TYPE_REMOTE) {
+        net_switch_log("Connecting to remote %s:%d, initial local port %d, group %d\n", conn->nrs_hostname, conn->remote_network_port, conn->remote_source_port, open_args->group);
+    } else {
+        net_switch_log("Opening IP %s, port %d, group %d\n", mcast_group, conn->local_multicast_port, open_args->group);
+    }
+
+    /* Client state, disconnected by default.
+     * Primarily used in remote mode */
+    conn->client_state = DISCONNECTED;
+
+    /* Client ID. Generate the ID if set to zero. */
+    if(open_args->client_id == 0) {
+        conn->client_id = ns_gen_client_id();
+    }
+
+    /* MAC address is set from the emulated card */
+    memcpy(conn->mac_addr, open_args->mac_addr, PB_MAC_ADDR_SIZE);
+
+    /* Protocol version */
+    conn->version = NS_PROTOCOL_VERSION;
+
+    if(!ns_socket_setup(conn)) {
+        goto fail;
+    }
+
+    if (conn->switch_type == SWITCH_TYPE_REMOTE) {
+        /* Perhaps one day do the entire handshake process here */
+        if(!ns_send_control(conn, MessageType_MESSAGE_TYPE_CONNECT_REQUEST)) {
+            goto fail;
+        }
+        conn->client_state = CONNECTING;
+        net_switch_log("Client state is now CONNECTING\n");
+    } else {
+        conn->client_state = LOCAL;
+    }
+
+    /* Initialize sequence numbers */
+    conn->sequence = 1;
+    conn->remote_sequence = 1;
+
+    /* Initialize stats */
+    conn->stats.max_tx_frame = 0;
+    conn->stats.max_tx_packet = 0;
+    conn->stats.max_rx_frame = 0;
+    conn->stats.max_rx_packet = 0;
+    conn->stats.total_rx_packets = 0;
+    conn->stats.total_tx_packets = 0;
+    conn->stats.total_fragments  = 0;
+    conn->stats.max_vec = 0;
+    memcpy(conn->stats.last_tx_ethertype, (uint8_t []) { 0, 0}, sizeof(conn->stats.last_tx_ethertype));
+    memcpy(conn->stats.last_rx_ethertype, (uint8_t []) { 0, 0}, sizeof(conn->stats.last_rx_ethertype));
+
+    /* Assuming all went well we have our sockets */
+    return conn;
+
+    /* Cleanup */
+fail:
+    for (int i = 0; i < FRAGMENT_BUFFER_LENGTH; i++) {
+        free(conn->fragment_buffer[i]);
+    }
+    return NULL;
+}
+
+int
+ns_pollfd(const NSCONN *conn) {
+    if (conn->fddata != 0)
+        return conn->fddata;
+    else {
+        errno=EBADF;
+        return -1;
+    }
+}
+
+ssize_t
+ns_sock_recv(const NSCONN *conn,void *buf, const size_t len, const int flags) {
+    if (fd_valid(conn->fddata))
+        return recv(conn->fddata,buf,len,0);
+    else {
+        errno=EBADF;
+        return -1;
+    }
+}
+
+ssize_t
+ns_sock_send(NSCONN *conn,const void *buf, const size_t len, const int flags) {
+    if (fd_valid(conn->fddata)) {
+        /* Use the outgoing socket for sending, set elsewhere:
+             * Remote mode: same as sending
+             * Local mode: different from sending */
+        return sendto(conn->fdout, buf, len, 0, (struct sockaddr *) &conn->outaddr, sizeof(conn->outaddr));
+    } else {
+        errno=EBADF;
+        return -1;
+    }
+}
+
+ssize_t
+ns_send_pb(NSCONN *conn, const netpkt_t *packet,int flags) {
+
+    NetworkMessage network_message = NetworkMessage_init_zero;
+    uint8_t fragment_count;
+
+    /* Do we need to fragment? First, determine how many packets we will be sending */
+    if(packet->len <= MAX_FRAME_SEND_SIZE) {
+        fragment_count = 1;
+//        net_switch_log("No Fragmentation. Frame size %d is less than max size %d\n", packet->len, MAX_FRAME_SEND_SIZE);
+    } else {
+        /* Since we're using integer math and the remainder is
+         * discarded we'll add one to the result *unless* the result can be evenly divided. */
+        const uint8_t extra = (packet->len % MAX_FRAME_SEND_SIZE) == 0 ? 0 : 1;
+             fragment_count = (packet->len / MAX_FRAME_SEND_SIZE) + extra;
+//        net_switch_log("Fragmentation required, frame size %d exceeds max size %d\n", packet->len, MAX_FRAME_SEND_SIZE);
+    }
+
+    /* Loop here for each fragment. Send each fragment. In the even that the packet is *not* a fragment (regular data packet)
+     * this will only execute once. */
+    const uint32_t fragment_sequence = conn->sequence;
+    const int64_t  packet_timestamp  = ns_get_current_millis();
+    for (uint8_t fragment_index = 0; fragment_index < fragment_count; fragment_index++) {
+        uint8_t buffer[NET_SWITCH_BUFFER_LENGTH];
+        pb_ostream_t stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
+#ifdef ENABLE_NET_SWITCH_PB_FILE_DEBUG
+        uint8_t file_buffer[NET_SWITCH_BUFFER_LENGTH];
+        /* file_stream used for debugging and writing the message to a file */
+        pb_ostream_t file_stream = pb_ostream_from_buffer(file_buffer, sizeof(file_buffer));
+#endif
+        /* Single frame is type DATA, fragments are FRAGMENT */
+        network_message.message_type = fragment_count > 1 ? MessageType_MESSAGE_TYPE_FRAGMENT : MessageType_MESSAGE_TYPE_DATA;
+        network_message.client_id = conn->client_id;
+        network_message.timestamp = packet_timestamp;
+        network_message.version = conn->version;
+
+        /* Need some additional data if we're a fragment */
+        if(fragment_count > 1) {
+            network_message.fragment.total = fragment_count;
+            network_message.fragment.id = fragment_sequence;
+            network_message.fragment.sequence = fragment_index + 1;
+            network_message.has_fragment = true;
+        }
+
+        /* TODO: Better / real ack logic. Needs its own function. Currently just putting in dummy data. */
+        network_message.ack.id = 1;
+        network_message.ack.history = 1;
+        network_message.has_ack = true;
+        network_message.sequence = conn->sequence;
+
+        /* Frame data must be allocated */
+        network_message.frame = calloc(1, PB_BYTES_ARRAY_T_ALLOCSIZE(packet->len));
+
+        /* Calculate offsets based on our position in the fragment.
+         * For anything other than the *last* packet, we'll have a max frame size */
+        uint16_t       copy_length;
+        const uint16_t copy_offset = fragment_index * MAX_FRAME_SEND_SIZE;
+        if(fragment_index == (fragment_count - 1)) {
+            copy_length = packet->len % MAX_FRAME_SEND_SIZE == 0 ? MAX_FRAME_SEND_SIZE : packet->len % MAX_FRAME_SEND_SIZE;
+        } else {
+            copy_length = MAX_FRAME_SEND_SIZE;
+        }
+        if(fragment_count > 1) {
+//            net_switch_log("Fragment %d/%d, %d bytes\n", fragment_index + 1, fragment_count, copy_length);
+        }
+        network_message.frame->size = copy_length;
+        memcpy(network_message.frame->bytes, packet->data + copy_offset, copy_length);
+
+        /* mac address must be allocated */
+        network_message.mac = calloc(1, PB_BYTES_ARRAY_T_ALLOCSIZE(PB_MAC_ADDR_SIZE));
+        network_message.mac->size = PB_MAC_ADDR_SIZE;
+        memcpy(network_message.mac->bytes, conn->mac_addr, PB_MAC_ADDR_SIZE);
+
+        /* Encode the protobuf message */
+        if (!pb_encode_ex(&stream, NetworkMessage_fields, &network_message,PB_ENCODE_DELIMITED)) {
+            net_switch_log("Encoding failed: %s\n", PB_GET_ERROR(&stream));
+            errno = EBADF;
+            return -1;
+        }
+
+        /* Send on the socket */
+        const ssize_t nc = ns_sock_send(conn, buffer, stream.bytes_written, 0);
+        if(!nc) {
+            net_switch_log("Error sending data on the socket\n");
+            errno=EBADF;
+            pb_release(NetworkMessage_fields, &network_message);
+            return -1;
+        }
+#ifdef ENABLE_NET_SWITCH_PB_FILE_DEBUG
+        /* File writing for troubleshooting when needed */
+        FILE *f = fopen("/var/tmp/pbuf", "wb");
+        if (f) {
+            if (!pb_encode(&file_stream, NetworkMessage_fields, &network_message)) {
+                net_switch_log("File encoding failed: %s\n", PB_GET_ERROR(&file_stream));
+            }
+            fwrite(file_buffer, file_stream.bytes_written, 1, f);
+            fclose(f);
+        } else {
+            net_switch_log("file open failed\n");
+        }
+#endif
+
+        /* Stats */
+        if(network_message.frame->size > conn->stats.max_tx_frame) {
+            conn->stats.max_tx_frame = network_message.frame->size;
+        }
+        if(nc > conn->stats.max_tx_packet) {
+            conn->stats.max_tx_packet = nc;
+        }
+        if(nc > MAX_FRAME_SEND_SIZE) {
+            conn->stats.total_fragments = fragment_count > 1 ? conn->stats.total_fragments + fragment_count : conn->stats.total_fragments;
+        }
+        conn->stats.total_tx_packets++;
+        memcpy(conn->stats.last_tx_ethertype, &packet->data[12], 2);
+
+        /* Increment the sequence number */
+        seq_increment(conn);
+
+        /* nanopb will free all the allocated entries for us */
+        pb_release(NetworkMessage_fields, &network_message);
+
+    }
+
+    return packet->len;
+}
+
+bool store_fragment(const NSCONN *conn, const NetworkMessage *network_message) {
+
+    if(conn == NULL || network_message == NULL) {
+        return false;
+    }
+
+    /* The fragment sequence indicates which fragment this is in the overall fragment
+     * collection. This is used to index the fragments while being stored for reassembly
+     * (zero indexed locally) */
+    const uint32_t fragment_index = network_message->fragment.sequence - 1;
+    const uint32_t fragment_size  = network_message->frame->size;
+
+    /* Make sure the fragments aren't too small
+     * (see header notes about size requirements for MIN_FRAG_RECV_SIZE and FRAGMENT_BUFFER_LENGTH)
+     * NOTE: The last packet is exempt from this rule because it can have a smaller amount.
+     * This is primarily to ensure there's enough space to fit all the fragments. */
+    if(network_message->fragment.sequence != network_message->fragment.total) {
+        if (network_message->frame->size < MIN_FRAG_RECV_SIZE) {
+            net_switch_log("size: %d < %d\n", network_message->frame->size, MIN_FRAG_RECV_SIZE);
+            return false;
+        }
+    }
+
+    /* Make sure we can handle the amount of incoming fragments */
+    if (network_message->fragment.total > FRAGMENT_BUFFER_LENGTH) {
+        net_switch_log("buflen: %d > %d\n", network_message->fragment.total, FRAGMENT_BUFFER_LENGTH);
+        return false;
+    }
+
+    /* Allocate or reallocate as needed.
+     * size > 0 indicates this buffer has already been allocated. */
+    if(conn->fragment_buffer[fragment_index]->size > 0) {
+        conn->fragment_buffer[fragment_index]->data = realloc(conn->fragment_buffer[fragment_index]->data, sizeof(char) * fragment_size);
+    } else {
+        conn->fragment_buffer[fragment_index]->data = calloc(1, sizeof(char) * fragment_size);
+    }
+
+    if (conn->fragment_buffer[fragment_index]->data == NULL) {
+        net_switch_log("Failed to allocate / reallocate fragment buffer space\n");
+        return false;
+    }
+
+    /* Each fragment will belong to a particular ID. All members will have the same ID,
+     * which is generally set to the sequence number of the first fragment */
+    conn->fragment_buffer[fragment_index]->id       = network_message->fragment.id;
+    /* The sequence here is set to the index of the packet in the total fragment collection
+     * (network_message->fragment.sequence) */
+    conn->fragment_buffer[fragment_index]->sequence = fragment_index;
+    /* Total number of fragments in this set */
+    conn->fragment_buffer[fragment_index]->total    = network_message->fragment.total;
+    /* The sequence number from the packet that contained the fragment */
+    conn->fragment_buffer[fragment_index]->packet_sequence = network_message->sequence;
+    /* Copy the fragment data and size */
+    /* The size of fragment_buffer[fragment_index]->data is checked against MAX_FRAME_SEND_SIZE above */
+    memcpy(conn->fragment_buffer[fragment_index]->data, network_message->frame->bytes, fragment_size);
+    conn->fragment_buffer[fragment_index]->size     = fragment_size;
+    /* 10 seconds for a TTL */
+    conn->fragment_buffer[fragment_index]->ttl      = ns_get_current_millis() + 10000;
+
+    return true;
+}
+
+bool
+reassemble_fragment(const NSCONN *conn, netpkt_t *pkt, const uint32_t packet_count)
+{
+    uint32_t total = 0;
+
+    /* Make sure the reassembled packet doesn't exceed NET_MAX_FRAME */
+//    if (packet_count * MAX_FRAME_SEND_SIZE > NET_MAX_FRAME) {
+//        return false;
+//    }
+
+    /* Too many packets! */
+    if (packet_count > FRAGMENT_BUFFER_LENGTH) {
+        return false;
+    }
+
+    // TODO: Check fragment ID
+    // TODO: Check TTL
+
+    /* Get the fragment size from the first entry. All fragments in a particular
+     * set must be of the same size except the last fragment, which may be smaller.
+     * The fragment size will be used to determine the offset. */
+    const uint16_t fragment_size = conn->fragment_buffer[0]->size;
+
+//    net_switch_log("Reassembling %d fragments\n", packet_count);
+
+    for(int i = 0; i < packet_count; i++) {
+        /* Size of zero means we're trying to assemble from a bad fragment */
+        if(conn->fragment_buffer[i]->size == 0) {
+            net_switch_log("Fragment size 0 when trying to reassemble (id %i/index %i/seq %i/ total %i)\n",conn->fragment_buffer[i]->id, i, conn->fragment_buffer[i]->sequence, conn->fragment_buffer[i]->total);
+            return false;
+        }
+        if(conn->fragment_buffer[i]->data == NULL) {
+            net_switch_log("Missing fragment data when trying to reassemble\n");
+            return false;
+        }
+
+        memcpy(pkt->data + (fragment_size * i), conn->fragment_buffer[i]->data, conn->fragment_buffer[i]->size);
+        total += conn->fragment_buffer[i]->size;
+
+        /* Zero out the size to indicate the slot is unused */
+        conn->fragment_buffer[i]->size = 0;
+        free(conn->fragment_buffer[i]->data);
+        conn->fragment_buffer[i]->data = NULL;
+    }
+
+    /* Set the size, must cast due to netpkt_t (len is int)  */
+    pkt->len = (int) total;
+//    net_switch_log("%d bytes reassembled and converted to data packet.\n", pkt->len);
+
+    return true;
+}
+
+bool
+ns_recv_pb(NSCONN *conn, ns_rx_packet_t *packet,size_t len,int flags) {
+    NetworkMessage  network_message = NetworkMessage_init_zero;
+    ns_rx_packet_t *ns_packet       = packet;
+
+    uint8_t buffer[NET_SWITCH_BUFFER_LENGTH];
+
+    /* TODO: Use the passed len? Most likely not needed */
+    const ssize_t nc = ns_sock_recv(conn, buffer, NET_SWITCH_BUFFER_LENGTH, 0);
+    if(!nc) {
+        net_switch_log("Error receiving data on the socket\n");
+        errno=EBADF;
+        return false;
+    }
+    pb_istream_t stream = pb_istream_from_buffer(buffer, sizeof(buffer));
+
+    if (!pb_decode_delimited(&stream, NetworkMessage_fields, &network_message)) {
+        /* Decode failed */
+        net_switch_log("PB decoding failed: %s\n", PB_GET_ERROR(&stream));
+        /* Allocated fields are automatically released upon failure */
+        return false;
+    }
+
+    /* Basic checks for validity */
+    if(network_message.mac == NULL || network_message.message_type == MessageType_MESSAGE_TYPE_UNSPECIFIED ||
+        network_message.client_id == 0) {
+        net_switch_log("Invalid packet received! Skipping..\n");
+        goto fail;
+    }
+
+    /* These fields should always be set. Start copying into our packet structure. */
+    ns_packet->client_id    = network_message.client_id;
+    ns_packet->type         = network_message.message_type;
+    memcpy(ns_packet->mac, network_message.mac->bytes, PB_MAC_ADDR_SIZE);
+    ns_packet->timestamp    = network_message.timestamp;
+    ns_packet->version      = network_message.version;
+    conn->remote_sequence   = network_message.sequence;
+    conn->last_packet_stamp = network_message.timestamp;
+
+    /* Control messages take a different path */
+    if(network_message.message_type != MessageType_MESSAGE_TYPE_DATA &&
+        network_message.message_type != MessageType_MESSAGE_TYPE_FRAGMENT) {
+        process_control_packet(conn, ns_packet);
+        pb_release(NetworkMessage_fields, &network_message);
+        return true;
+    }
+
+    /* All packets should be DATA or FRAGMENT at this point and have a frame */
+    if(network_message.frame == NULL) {
+        net_switch_log("Invalid data packet received! Frame is null. Skipping..\n");
+        goto fail;
+    }
+
+    /* Fragment path first */
+    if(network_message.message_type == MessageType_MESSAGE_TYPE_FRAGMENT) {
+
+        /* Store fragment */
+        if(!store_fragment(conn, &network_message)) {
+            net_switch_log("Failed to store fragment\n");
+            goto fail;
+        }
+
+        /* Is this the last fragment? If not, return */
+        if(network_message.fragment.sequence != network_message.fragment.total) {
+            // FIXME: Really dumb, needs to be smarter
+            pb_release(NetworkMessage_fields, &network_message);
+            return true;
+        }
+
+        /* This is the last fragment. Attempt to reassemble */
+        if(!reassemble_fragment(conn, &ns_packet->pkt, network_message.fragment.total)) {
+            net_switch_log("Failed to reassemble fragment\n");
+            goto fail;
+        }
+        /* Change the type to DATA */
+        ns_packet->type = MessageType_MESSAGE_TYPE_DATA;
+
+    } else {
+        /* Standard DATA packet path. Copy frame from the message */
+        memcpy(ns_packet->pkt.data, network_message.frame->bytes, network_message.frame->size);
+        ns_packet->pkt.len = network_message.frame->size;
+    }
+
+    /* Stats */
+    if(network_message.frame->size > conn->stats.max_rx_frame) {
+        conn->stats.max_rx_frame = network_message.frame->size;
+    }
+    if(nc > conn->stats.max_rx_packet) {
+        conn->stats.max_rx_packet = nc;
+    }
+    memcpy(conn->stats.last_rx_ethertype, &packet->pkt.data[12], 2);
+    conn->stats.total_rx_packets++;
+    /* End Stats */
+
+    /* nanopb allocates the necessary fields while serializing.
+       They need to be manually released once you are done with the message */
+    pb_release(NetworkMessage_fields, &network_message);
+    return true;
+fail:
+    pb_release(NetworkMessage_fields, &network_message);
+    return false;
+}
+
+bool process_control_packet(NSCONN *conn, const ns_rx_packet_t *packet) {
+
+    control_packet_info_t packet_info = get_control_packet_info(*packet, conn->mac_addr);
+//    net_switch_log("Last timestamp: %lld\n", ns_get_current_millis());
+//    net_switch_log("(%lld ms) [%03d] ", ns_get_current_millis() - packet_info.timestamp, conn->sequence);
+
+    /* I probably want to eventually differentiate between local and remote here, kind of basic now */
+    if(!packet_info.is_packet_from_me) { /* in case of local mode */
+        switch (packet_info.type) {
+            case MessageType_MESSAGE_TYPE_JOIN:
+                net_switch_log("Client ID 0x%08llx (MAC %s) has joined the chat\n", packet_info.client_id, packet_info.src_mac_h);
+                break;
+            case MessageType_MESSAGE_TYPE_LEAVE:
+                net_switch_log("Client ID 0x%08llx (MAC %s) has left us\n", packet_info.client_id, packet_info.src_mac_h);
+                break;
+            case MessageType_MESSAGE_TYPE_KEEPALIVE:
+//                net_switch_log("Client ID 0x%08llx (MAC %s) is still alive\n", packet_info.client_id, packet_info.src_mac_h);
+                break;
+            case MessageType_MESSAGE_TYPE_ACK:
+//                net_switch_log("Client ID 0x%08llx (MAC %s) has sent an ACK\n", packet_info.client_id, packet_info.src_mac_h);
+                break;
+            case MessageType_MESSAGE_TYPE_CONNECT_REPLY:
+                conn->client_state = CONNECTED;
+                net_switch_log("Client ID 0x%08llx (MAC %s) has sent a connection reply\n", packet_info.client_id, packet_info.src_mac_h);
+                net_switch_log("Client state is now CONNECTED\n");
+                break;
+            case MessageType_MESSAGE_TYPE_FRAGMENT:
+                net_switch_log("Client ID 0x%08llx (MAC %s) has sent a fragment\n", packet_info.client_id, packet_info.src_mac_h);
+                break;
+            default:
+                net_switch_log("Client ID 0x%08llx (MAC %s) has sent a message that we don't understand (type %d)\n", packet_info.client_id, packet_info.src_mac_h, packet_info.type);
+                break;
+        }
+    }
+    return true;
+
+}
+
+bool
+ns_send_control(NSCONN *conn, const MessageType type) {
+
+    NetworkMessage network_message = NetworkMessage_init_zero;
+    uint8_t buffer[NET_SWITCH_BUFFER_LENGTH];
+
+    pb_ostream_t stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
+    network_message.message_type = type;
+    network_message.client_id = conn->client_id;
+
+    /* No frame data so we only need to allocate mac address */
+    network_message.mac = calloc(1, PB_BYTES_ARRAY_T_ALLOCSIZE(PB_MAC_ADDR_SIZE));
+    network_message.mac->size = PB_MAC_ADDR_SIZE;
+    memcpy(network_message.mac->bytes, conn->mac_addr, PB_MAC_ADDR_SIZE);
+
+    network_message.timestamp = ns_get_current_millis();
+    network_message.version   = conn->version;
+    network_message.sequence  = conn->sequence;
+
+    if (!pb_encode_ex(&stream, NetworkMessage_fields, &network_message, PB_ENCODE_DELIMITED)) {
+        net_switch_log("Encoding failed: %s\n", PB_GET_ERROR(&stream));
+        errno = EBADF;
+        return false;
+    }
+
+    const ssize_t nc = ns_sock_send(conn, buffer, stream.bytes_written, 0);
+    if(!nc) {
+        net_switch_log("Error sending control message on the socket\n");
+        errno=EBADF;
+        pb_release(NetworkMessage_fields, &network_message);
+        return -1;
+    }
+    /* Increment the sequence number */
+    seq_increment(conn);
+
+    /* Stats */
+    conn->stats.total_tx_packets++;
+
+    /* Must release allocated data */
+    pb_release(NetworkMessage_fields, &network_message);
+
+    return true;
+}
+
+uint32_t
+ns_gen_client_id(void) {
+    uint32_t msb;
+    do {
+        msb = random_generate();
+    } while (msb < 0x10);
+    return ( random_generate() | (random_generate() << 8) | (random_generate() << 16) | (msb << 24));
+}
+
+const char *
+ns_printable_message_type(const MessageType type)
+{
+    switch (type) {
+        case MessageType_MESSAGE_TYPE_DATA:
+                return "Data";
+        case MessageType_MESSAGE_TYPE_JOIN:
+                return "Join";
+        case MessageType_MESSAGE_TYPE_LEAVE:
+                return "Leave";
+        case MessageType_MESSAGE_TYPE_KEEPALIVE:
+                return "Keepalive";
+        case MessageType_MESSAGE_TYPE_FRAGMENT:
+                return "Fragment";
+        case MessageType_MESSAGE_TYPE_ACK:
+                return "Ack";
+        case MessageType_MESSAGE_TYPE_UNSPECIFIED:
+                return "Unspecified (shouldn't get this)";
+        default:
+                return "Unknown message type - probably hasn't been added yet!";
+    }
+}
+
+int64_t
+ns_get_current_millis(void) {
+    struct timeval time;
+    gettimeofday(&time, NULL);
+    /* Windows won't properly promote integers so this is necessary */
+    const int64_t seconds = (int64_t) time.tv_sec * 1000;
+
+    return seconds + (time.tv_usec / 1000);
+}
+
+int
+ns_flags(const NSCONN *conn) {
+    return conn->flags;
+}
+
+int
+ns_close(NSCONN *conn) {
+    if(conn->switch_type == SWITCH_TYPE_REMOTE) {
+        /* TBD */
+    }
+    /* No need to check the return here as we're closing out */
+    ns_send_control(conn, MessageType_MESSAGE_TYPE_LEAVE);
+    for (int i = 0; i < FRAGMENT_BUFFER_LENGTH; i++) {
+        if (conn->fragment_buffer[i]->size > 0) {
+            free(conn->fragment_buffer[i]->data);
+            conn->fragment_buffer[i]->data = NULL;
+        }
+        free(conn->fragment_buffer[i]);
+    }
+    close(conn->fddata);
+    close(conn->fdout);
+    return 0;
+}
+
+bool is_control_packet(const ns_rx_packet_t *packet) {
+    return packet->type != MessageType_MESSAGE_TYPE_DATA;
+}
+
+bool is_fragment_packet(const ns_rx_packet_t *packet) {
+    return packet->type == MessageType_MESSAGE_TYPE_FRAGMENT;
+}
+
+bool ns_connected(const NSCONN *conn) {
+    if(conn->switch_type == SWITCH_TYPE_LOCAL) {
+        return true;
+    }
+
+    if(conn->switch_type == SWITCH_TYPE_REMOTE) {
+        if(conn->client_state == CONNECTED) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+char* formatted_mac(uint8_t mac_addr[6])
+{
+    char *mac_h = calloc(1, sizeof(char)* 32);
+    for(int i=0; i < 6; i++) {
+        char octet[4];
+        snprintf(octet, sizeof(octet), "%02X%s", mac_addr[i], i < 5 ? ":" : "");
+        strncat(mac_h, octet, sizeof(mac_h) - 1);
+    }
+    return mac_h;
+}
+
+control_packet_info_t get_control_packet_info(const ns_rx_packet_t packet, const uint8_t *my_mac)
+{
+    control_packet_info_t packet_info;
+
+    packet_info.src_mac_h[0]  = '\0';
+    packet_info.printable[0]  = '\0';
+    packet_info.client_id = packet.client_id;
+    memcpy(packet_info.src_mac, &packet.mac, 6);
+    packet_info.type = packet.type;
+    packet_info.is_packet_from_me = (memcmp(my_mac, packet_info.src_mac, sizeof(uint8_t) * 6) == 0);
+    char *formatted_mac_h = formatted_mac(packet_info.src_mac);
+    strncpy(packet_info.src_mac_h, formatted_mac_h, MAX_PRINTABLE_MAC);
+    free(formatted_mac_h);
+    snprintf(packet_info.printable, sizeof(packet_info.printable), "%s", ns_printable_message_type(packet_info.type));
+    packet_info.timestamp = packet.timestamp;
+
+    return packet_info;
+}
+
+data_packet_info_t
+get_data_packet_info(const netpkt_t *packet, const uint8_t *my_mac) {
+    data_packet_info_t packet_info;
+
+    packet_info.src_mac_h[0]  = '\0';
+    packet_info.dest_mac_h[0] = '\0';
+    packet_info.my_mac_h[0]   = '\0';
+    packet_info.printable[0]  = '\0';
+
+    memcpy(packet_info.dest_mac,&packet->data[0], 6);
+    memcpy(packet_info.src_mac, &packet->data[6], 6);
+
+    /* Broadcast and multicast are treated the same at L2 and both will have the
+     * least significant bit of 1 in the first transmitted byte.
+     * The below test matches 0xFF for standard broadcast along with 0x01 and 0x33 for multicast */
+    packet_info.is_broadcast      = ((packet->data[0] & 1) == 1);
+    packet_info.is_packet_for_me  = (memcmp(my_mac, packet_info.dest_mac, sizeof(uint8_t) * 6) == 0);
+    packet_info.is_packet_from_me = (memcmp(my_mac, packet_info.src_mac, sizeof(uint8_t) * 6) == 0);
+    packet_info.is_data_packet    = packet->len > 0;
+    packet_info.size = packet->len;
+
+    /* Since this function is applied to every packet, only enable the pretty formatting below
+     * if logging is specifically enabled. */
+#ifdef ENABLE_NET_SWITCH_LOG
+    /* Pretty formatting for hardware addresses */
+    for(int i=0; i < 6; i++) {
+        char octet[4];
+        snprintf(octet, sizeof(octet), "%02X%s", packet_info.src_mac[i], i < 5 ? ":" : "");
+        strncat(packet_info.src_mac_h, octet, sizeof (packet_info.src_mac_h) - 1);
+
+        snprintf(octet, sizeof(octet), "%02X%s", packet_info.dest_mac[i], i < 5 ? ":" : "");
+        strncat(packet_info.dest_mac_h, octet, sizeof (packet_info.dest_mac_h) - 1);
+
+        snprintf(octet, sizeof(octet), "%02X%s", my_mac[i], i < 5 ? ":" : "");
+        strncat(packet_info.my_mac_h, octet, sizeof (packet_info.my_mac_h) - 1);
+    }
+
+    /* Printable output formatting */
+    if(packet_info.is_broadcast) {
+        if(packet_info.is_packet_from_me) {
+            snprintf(packet_info.printable, sizeof(packet_info.printable), "(broadcast)");
+        } else {
+            snprintf(packet_info.printable, sizeof(packet_info.printable), "%s (broadcast)", packet_info.src_mac_h);
+        }
+    } else {
+        snprintf(packet_info.printable, sizeof(packet_info.printable), "%s%s -> %s%s", packet_info.src_mac_h, packet_info.is_packet_from_me ? " (me)" : "     ",
+                 packet_info.dest_mac_h, packet_info.is_packet_for_me ? " (me)" : "");
+    }
+#endif
+    return packet_info;
+}
+
+bool
+fd_valid(const int fd)
+{
+#ifdef _WIN32
+    int error_code;
+    int error_code_size = sizeof(error_code);
+    getsockopt(fd, SOL_SOCKET, SO_ERROR, (char *) &error_code, &error_code_size);
+    if (error_code == WSAENOTSOCK) {
+        return false;
+    }
+    return true;
+#else
+    if (fcntl(fd, F_GETFD) == -1) {
+        return false;
+    }
+    /* All other values will be a valid fd */
+    return true;
+#endif
+}
+
+bool
+seq_increment(NSCONN *conn)
+{
+    if(conn == NULL) {
+        return false;
+    }
+    conn->sequence++;
+    if (conn->sequence == 0) {
+        conn->sequence = 1;
+    }
+    return true;
+}
diff --git a/src/network/netswitch.h b/src/network/netswitch.h
new file mode 100644
index 000000000..02534ff30
--- /dev/null
+++ b/src/network/netswitch.h
@@ -0,0 +1,298 @@
+/*
+* 86Box    A hypervisor and IBM PC system emulator that specializes in
+*          running old operating systems and software designed for IBM
+*          PC systems and compatibles from 1981 through fairly recent
+*          system designs based on the PCI bus.
+*
+*          This file is part of the 86Box distribution.
+*
+*          Network Switch backend
+*
+*
+*
+* Authors: cold-brewed
+*
+*          Copyright 2024 cold-brewed
+*/
+
+#ifndef NET_SWITCH_H
+#define NET_SWITCH_H
+
+#ifdef _WIN32
+#include <Winsock2.h> // before Windows.h, else Winsock 1 conflict
+#include <Ws2tcpip.h> // needed for ip_mreq definition for multicast
+#include <Windows.h>
+#else
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <time.h>
+#endif
+#include <unistd.h>
+#include "pb.h"
+#include "networkmessage.pb.h"
+
+/* Local switch multicast port */
+#define NET_SWITCH_MULTICAST_PORT 8086
+/* Remote switch connect port */
+#define NET_SWITCH_REMOTE_PORT 8088
+/* Remove switch. This offset is where the local source ports will begin. */
+#define NET_SWITCH_RECV_PORT_OFFSET 198
+/* Multicast group (IP Address) maximum length. String representation. */
+#define MAX_MCAST_GROUP_LEN  32
+/* The buffer length used for both receiving on sockets and protobuf serialize / deserialize */
+#define NET_SWITCH_BUFFER_LENGTH 2048
+
+/* Any frame above this size gets fragmented */
+#define MAX_FRAME_SEND_SIZE 1200
+/* Minimum fragment size we'll accept */
+#define MIN_FRAG_RECV_SIZE  12
+/*
+   Size of the fragment buffer - how many can we hold?
+   Note: FRAGMENT_BUFFER_LENGTH * MIN_FRAG_RECV_SIZE *must* be greater
+   than NET_MAX_FRAME or bad things will happen with large packets!
+*/
+#define FRAGMENT_BUFFER_LENGTH 128
+/* Maximum number of switch groups */
+#define MAX_SWITCH_GROUP 31
+/* Size of a mac address in bytes. Used for the protobuf serializing / deserializing  */
+#define PB_MAC_ADDR_SIZE 6
+/* This will define the version in use and the minimum required for communication */
+#define NS_PROTOCOL_VERSION 1
+/* Maximum string size for a printable (formatted) mac address */
+#define MAX_PRINTABLE_MAC 32
+/* Maximum hostname length for a remote switch host */
+#define MAX_HOSTNAME 128
+
+typedef enum {
+    FLAGS_NONE    =      0,
+    FLAGS_PROMISC = 1 << 0,
+} ns_flags_t;
+
+typedef enum {
+    SWITCH_TYPE_LOCAL = 0,
+    SWITCH_TYPE_REMOTE,
+} ns_type_t;
+
+typedef enum {
+    DISCONNECTED,
+    CONNECTING,
+    CONNECTED,
+    LOCAL,
+} ns_client_state_t;
+
+struct ns_open_args {
+    uint8_t    group;
+    ns_flags_t flags;
+    ns_type_t  type;
+    char      *client_id;
+    uint8_t    mac_addr[6];
+    char       nrs_hostname[MAX_HOSTNAME];
+};
+
+struct nsconn;
+
+typedef struct nsconn NSCONN;
+
+struct ns_stats {
+    size_t  max_tx_frame;
+    size_t  max_tx_packet;
+    size_t  max_rx_frame;
+    size_t  max_rx_packet;
+    uint8_t last_tx_ethertype[2];
+    uint8_t last_rx_ethertype[2];
+    u_long  total_rx_packets;
+    u_long  total_tx_packets;
+    u_long  total_fragments;
+    uint8_t max_vec;
+};
+
+typedef struct {
+    /* The ID of the fragment. All fragments in a set should have the same ID. */
+    uint32_t id;
+    /* The fragment index in the sequence of fragments. NOTE: one indexed, not zero!
+     * Example: the first fragment of three would be 1 in the sequence */
+    uint32_t sequence;
+    /* Total number of fragments for the collection */
+    uint32_t total;
+    /* The sequence number of the packet that delivered the fragment. Not the same as fragment sequence above! */
+    uint32_t packet_sequence;
+    /* Frame data */
+    char     *data;
+    /* Frame size. A size of zero indicates an unused fragment slot and unallocated data field. */
+    uint32_t size;
+    /* Epoch time (in ms) that the fragment is valid until */
+    uint64_t ttl;
+} ns_fragment_t;
+
+struct nsconn {
+    uint16_t           flags;
+    int                fdctl;
+    int                fddata;
+    int                fdout;
+    char               mcast_group[MAX_MCAST_GROUP_LEN];
+    struct sockaddr_in addr;
+    struct sockaddr_in outaddr;
+    size_t             outlen;
+    struct sockaddr   *sock;
+    struct sockaddr   *outsock;
+    struct ns_stats    stats;
+    uint32_t           client_id;
+    uint8_t            mac_addr[6];
+    uint16_t           sequence;
+    uint16_t           remote_sequence;
+    uint8_t            version;
+    uint8_t            switch_type;
+    ns_client_state_t  client_state;
+    int64_t            last_packet_stamp;
+    /* Remote switch hostname */
+    char               nrs_hostname[MAX_HOSTNAME];
+    /* Remote connect port for remote network switch */
+    uint16_t           remote_network_port;
+    /* Local multicast port for the local network switch */
+    uint16_t           local_multicast_port;
+    /*
+     * The source port to receive packets. Only applies to remote mode.
+     * This will also be the source port for sent packets in order to aid
+     * NAT
+     */
+    uint16_t           remote_source_port;
+    ns_fragment_t      *fragment_buffer[FRAGMENT_BUFFER_LENGTH];
+};
+
+typedef struct {
+    uint32_t id;
+    uint32_t history;
+} ns_ack_t;
+
+typedef struct {
+    uint32_t id;
+    uint32_t sequence;
+    uint32_t total;
+} ns_fragment_info_t;
+
+typedef struct {
+    netpkt_t           pkt;
+    MessageType        type;
+    uint32_t           client_id;
+    uint8_t            mac[6];
+    uint32_t           flags;
+    int64_t            timestamp;
+    ns_ack_t           ack;
+    ns_fragment_info_t fragment;
+    uint32_t           version;
+} ns_rx_packet_t;
+
+typedef struct {
+    size_t size;
+    char    src_mac_h[MAX_PRINTABLE_MAC];
+    char    dest_mac_h[MAX_PRINTABLE_MAC];
+    char    my_mac_h[MAX_PRINTABLE_MAC];
+    uint8_t src_mac[6];
+    uint8_t dest_mac[6];
+    bool    is_packet_from_me;
+    bool    is_broadcast;
+    bool    is_packet_for_me;
+    bool    is_data_packet;
+    char    printable[128];
+} data_packet_info_t;
+
+typedef struct {
+    uint8_t     src_mac[6];
+    char        src_mac_h[MAX_PRINTABLE_MAC];
+    bool        is_packet_from_me;
+    MessageType type;
+    char        printable[128];
+    uint64_t    client_id;
+    int64_t     timestamp;
+} control_packet_info_t;
+
+/* Initializes and opens the Net Multicast Switch */
+NSCONN *ns_open(struct ns_open_args *open_args);
+
+/* Returns the flags */
+int ns_flags(const NSCONN *conn);
+
+/* Returns the file descriptor for polling */
+int ns_pollfd(const NSCONN *conn);
+
+/* This should be used to receive serialized protobuf packets
+ * and have the output placed in the packet struct */
+bool ns_recv_pb(NSCONN *conn, ns_rx_packet_t *packet,size_t len,int flags);
+
+/* Do not call directly! Used internally */
+ssize_t ns_sock_recv(const NSCONN *conn,void *buf,size_t len,int flags);
+
+/* This should be used to send serialized protobuf packets
+* and have the output placed in the packet struct */
+ssize_t ns_send_pb(NSCONN *conn, const netpkt_t *packet,int flags);
+
+/* Send control messages */
+bool ns_send_control(NSCONN *conn, MessageType type);
+
+const char* ns_printable_message_type(MessageType type);
+
+/* Do not call directly! Used internally */
+ssize_t ns_sock_send(NSCONN *conn,const void *buf,size_t len,int flags);
+
+uint32_t ns_gen_client_id(void);
+
+/* Closes and cleans up */
+int ns_close(NSCONN *conn);
+
+/* Return current time in milliseconds */
+int64_t ns_get_current_millis(void);
+
+/* Is the packet a control packet?
+ * Any type other than DATA is a control packet, including fragments */
+bool is_control_packet(const ns_rx_packet_t *packet);
+
+/* Logic for handling control packets */
+bool process_control_packet(NSCONN *conn, const ns_rx_packet_t *packet);
+
+/* Is the packet a fragment packet? */
+bool is_fragment_packet(const ns_rx_packet_t *packet);
+
+/* Store a fragment in the fragment buffer */
+bool store_fragment(const NSCONN *conn, const NetworkMessage *network_message);
+
+/* Reassemble a fragment from the fragment buffer */
+bool reassemble_fragment(const NSCONN *conn, netpkt_t *pkt, uint32_t packet_count);
+
+/* Set up the socket. Accounts for the differences between local and remote modes */
+bool ns_socket_setup(NSCONN *conn);
+
+/* Is the switch in a connected state? Always returns true in local mode */
+bool ns_connected(const NSCONN *conn);
+
+/* Return a string with a properly formatted mac address.
+ * Note: Caller must free! */
+char* formatted_mac(uint8_t mac_addr[6]);
+
+/* Used for control packet info and logic */
+control_packet_info_t get_control_packet_info(ns_rx_packet_t packet, const uint8_t *my_mac);
+
+/* Used for data packet info and logic */
+data_packet_info_t get_data_packet_info(const netpkt_t *packet, const uint8_t *my_mac);
+
+/* Checks for a valid file descriptor */
+bool fd_valid(int fd);
+
+/* Wrapping increment for the sequence number */
+bool seq_increment(NSCONN *conn);
+
+#ifdef ENABLE_NET_SWITCH_LOG
+static void
+net_switch_log(const char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    pclog_ex(fmt, ap);
+    va_end(ap);
+}
+#else
+#    define net_switch_log(fmt, ...)
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/network/network.c b/src/network/network.c
index 4d11ba955..661da7250 100644
--- a/src/network/network.c
+++ b/src/network/network.c
@@ -54,9 +54,9 @@
 #include <stdlib.h>
 #include <wchar.h>
 #include <time.h>
-#ifndef _WIN32
-#    include <sys/time.h>
-#endif /* _WIN32 */
+#ifndef _MSC_VER
+#include <sys/time.h>
+#endif
 #include <stdbool.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
@@ -67,14 +67,9 @@
 #include <86box/ui.h>
 #include <86box/timer.h>
 #include <86box/network.h>
-#include <86box/net_3c501.h>
-#include <86box/net_3c503.h>
 #include <86box/net_ne2000.h>
 #include <86box/net_pcnet.h>
-#include <86box/net_plip.h>
 #include <86box/net_wd8003.h>
-#include <86box/net_tulip.h>
-#include <86box/net_rtl8139.h>
 
 #ifdef _WIN32
 #    define WIN32_LEAN_AND_MEAN
@@ -82,63 +77,53 @@
 #    include <winsock2.h>
 #endif
 
-static const device_t net_none_device = {
-    .name          = "None",
-    .internal_name = "none",
-    .flags         = 0,
-    .local         = NET_TYPE_NONE,
-    .init          = NULL,
-    .close         = NULL,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
+typedef struct {
+    const device_t *device;
+} NETWORK_CARD;
 
-static const device_t net_internal_device = {
-    .name          = "Internal",
-    .internal_name = "internal",
-    .flags         = 0,
-    .local         = NET_TYPE_NONE,
-    .init          = NULL,
-    .close         = NULL,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-static const device_t *net_cards[] = {
-    &net_none_device,
-    &net_internal_device,
-    &threec501_device,
-    &threec503_device,
-    &pcnet_am79c960_device,
-    &pcnet_am79c961_device,
-    &ne1000_device,
-    &ne2000_device,
-    &pcnet_am79c960_eb_device,
-    &rtl8019as_device,
-    &wd8003e_device,
-    &wd8003eb_device,
-    &wd8013ebt_device,
-    &plip_device,
-    &ethernext_mc_device,
-    &wd8003eta_device,
-    &wd8003ea_device,
-    &wd8013epa_device,
-    &pcnet_am79c973_device,
-    &pcnet_am79c970a_device,
-    &dec_tulip_device,
-    &rtl8029as_device,
-    &rtl8139c_plus_device,
-    &dec_tulip_21140_device,
-    &dec_tulip_21140_vpc_device,
-    &dec_tulip_21040_device,
-    &pcnet_am79c960_vlb_device,
-    NULL
+static const NETWORK_CARD net_cards[] = {
+    // clang-format off
+    { &device_none                },
+    { &device_internal            },
+    /* ISA */
+    { &threec501_device           },
+    { &threec503_device           },
+    { &ne1000_compat_device       },
+    { &ne2000_compat_8bit_device  },
+    { &ne1000_device              },
+    { &wd8003e_device             },
+    { &wd8003eb_device            },
+    { &wd8013ebt_device           },
+    /* COM */
+    { &modem_device               },
+    /* LPT */
+    { &plip_device                },
+    /* ISA16 */
+    { &pcnet_am79c960_device      },
+    { &pcnet_am79c961_device      },
+    { &de220p_device              },
+    { &ne2000_compat_device       },
+    { &ne2000_device              },
+    { &pcnet_am79c960_eb_device   },
+    { &rtl8019as_pnp_device       },
+    /* MCA */
+    { &ethernext_mc_device        },
+    { &wd8003eta_device           },
+    { &wd8003ea_device            },
+    { &wd8013epa_device           },
+    /* VLB */
+    { &pcnet_am79c960_vlb_device  },
+    /* PCI */
+    { &pcnet_am79c973_device      },
+    { &pcnet_am79c970a_device     },
+    { &dec_tulip_21140_device     },
+    { &dec_tulip_21040_device     },
+    { &dec_tulip_device           },
+    { &dec_tulip_21140_vpc_device },
+    { &rtl8029as_device           },
+    { &rtl8139c_plus_device       },
+    { NULL                        }
+    // clang-format on
 };
 
 netcard_conf_t net_cards_conf[NET_CARD_MAX];
@@ -150,8 +135,7 @@ int  network_ndev;
 netdev_t network_devs[NET_HOST_INTF_MAX];
 
 /* Local variables. */
-
-#if defined     ENABLE_NETWORK_LOG && !defined(_WIN32)
+#ifdef ENABLE_NETWORK_LOG
 int             network_do_log = ENABLE_NETWORK_LOG;
 static FILE    *network_dump   = NULL;
 static mutex_t *network_dump_mutex;
@@ -177,9 +161,15 @@ network_dump_packet(netpkt_t *pkt)
     struct timeval tv;
     gettimeofday(&tv, NULL);
     struct {
-        uint32_t ts_sec, ts_usec, incl_len, orig_len;
+        uint32_t ts_sec;
+        uint32_t ts_usec;
+        uint32_t incl_len;
+        uint32_t orig_len;
     } pcap_packet_hdr = {
-        tv.tv_sec, tv.tv_usec, pkt->len, pkt->len
+          .ts_sec = tv.tv_sec,
+         .ts_usec = tv.tv_usec,
+        .incl_len = pkt->len,
+        .orig_len = pkt->len
     };
 
     if (network_dump_mutex)
@@ -193,8 +183,9 @@ network_dump_packet(netpkt_t *pkt)
         if ((written = fwrite(pkt->data, 1, pkt->len, network_dump)) < pkt->len) {
             network_log("NETWORK: failed to write dump packet data\n");
             fseek(network_dump, -written - sizeof(pcap_packet_hdr), SEEK_CUR);
+        } else {
+            fflush(network_dump);
         }
-        fflush(network_dump);
     }
 
     if (network_dump_mutex)
@@ -247,28 +238,41 @@ network_init(void)
     
 #ifdef HAS_VDE
     // Try to load the VDE plug library
-    if(net_vde_prepare()==0) {
+    if (!net_vde_prepare())
         network_devmap.has_vde = 1;
-    }
 #endif
 
-#if defined ENABLE_NETWORK_LOG && !defined(_WIN32)
+#ifdef ENABLE_NETWORK_LOG
     /* Start packet dump. */
     network_dump = fopen("network.pcap", "wb");
-
-    struct {
-        uint32_t magic_number;
-        uint16_t version_major, version_minor;
-        int32_t  thiszone;
-        uint32_t sigfigs, snaplen, network;
-    } pcap_hdr = {
-        0xa1b2c3d4,
-        2, 4,
-        0,
-        0, 65535, 1
-    };
-    fwrite(&pcap_hdr, sizeof(pcap_hdr), 1, network_dump);
-    fflush(network_dump);
+    if (network_dump) {
+        struct {
+            uint32_t magic_number;
+            uint16_t version_major;
+            uint16_t version_minor;
+            int32_t  thiszone;
+            uint32_t sigfigs;
+            uint32_t snaplen;
+            uint32_t network;
+        } pcap_hdr = {
+             .magic_number = 0xa1b2c3d4,
+            .version_major = 2,
+            .version_minor = 4,
+                 .thiszone = 0,
+                  .sigfigs = 0,
+                  .snaplen = 65535,
+                  .network = 1
+        };
+        if (fwrite(&pcap_hdr, 1, sizeof(pcap_hdr), network_dump) < sizeof(pcap_hdr)) {
+            network_log("NETWORK: failed to write dump header\n");
+            fclose(network_dump);
+            network_dump = NULL;
+        } else {
+            fflush(network_dump);
+        }
+    } else {
+        network_log("NETWORK: failed to open dump file\n");
+    }
 #endif
 }
 
@@ -325,10 +329,8 @@ network_queue_put_swap(netqueue_t *queue, netpkt_t *src_pkt)
             network_log("Discarded zero length packet.\n");
         } else if (src_pkt->len > NET_MAX_FRAME) {
             network_log("Discarded oversized packet of len=%d.\n", src_pkt->len);
-            network_dump_packet(src_pkt);
         } else {
             network_log("Discarded %d bytes packet because the queue is full.\n", src_pkt->len);
-            network_dump_packet(src_pkt);
         }
 #endif
         return 0;
@@ -437,7 +439,8 @@ network_rx_queue(void *priv)
     bool activity = rx_bytes || tx_bytes;
     bool led_on   = card->led_timer & 0x80000000;
     if ((activity && !led_on) || (card->led_timer & 0x7fffffff) >= 150000) {
-        ui_sb_update_icon(SB_NETWORK | card->card_num, activity);
+        ui_sb_update_icon(SB_NETWORK | card->card_num, !!(rx_bytes));
+        ui_sb_update_icon_write(SB_NETWORK | card->card_num, !!(tx_bytes));
         card->led_timer = 0 | (activity << 31);
     }
 
@@ -455,6 +458,7 @@ netcard_t *
 network_attach(void *card_drv, uint8_t *mac, NETRXCB rx, NETSETLINKSTATE set_link_state)
 {
     netcard_t *card       = calloc(1, sizeof(netcard_t));
+    int net_type          = net_cards_conf[net_card_current].net_type;
     card->queued_pkt.data = calloc(1, NET_MAX_FRAME);
     card->card_drv        = card_drv;
     card->rx              = rx;
@@ -471,7 +475,13 @@ network_attach(void *card_drv, uint8_t *mac, NETRXCB rx, NETSETLINKSTATE set_lin
         network_queue_init(&card->queues[i]);
     }
 
-    switch (net_cards_conf[net_card_current].net_type) {
+    if ((!strcmp(network_card_get_internal_name(net_cards_conf[net_card_current].device_num), "modem") ||
+         !strcmp(network_card_get_internal_name(net_cards_conf[net_card_current].device_num), "plip")) && (net_type >= NET_TYPE_PCAP)) {
+        /* Force SLiRP here. Modem and PLIP only operate on non-Ethernet frames. */
+        net_type = NET_TYPE_SLIRP;
+    }
+
+    switch (net_type) {
         case NET_TYPE_SLIRP:
             card->host_drv      = net_slirp_drv;
             card->host_drv.priv = card->host_drv.init(card, mac, NULL, net_drv_error);
@@ -487,6 +497,19 @@ network_attach(void *card_drv, uint8_t *mac, NETRXCB rx, NETSETLINKSTATE set_lin
             card->host_drv.priv = card->host_drv.init(card, mac, net_cards_conf[net_card_current].host_dev_name, net_drv_error);
             break;
 #endif
+#ifdef HAS_TAP
+        case NET_TYPE_TAP:
+            card->host_drv      = net_tap_drv;
+            card->host_drv.priv = card->host_drv.init(card, mac, net_cards_conf[net_card_current].host_dev_name, net_drv_error);
+            break;
+#endif
+#ifdef USE_NETSWITCH
+        case NET_TYPE_NMSWITCH:
+        case NET_TYPE_NRSWITCH:
+            card->host_drv      = net_netswitch_drv;
+            card->host_drv.priv = card->host_drv.init(card, mac, &net_cards_conf[net_card_current], net_drv_error);
+            break;
+#endif /* USE_NETSWITCH */
         default:
             card->host_drv.priv = NULL;
             break;
@@ -498,8 +521,16 @@ network_attach(void *card_drv, uint8_t *mac, NETRXCB rx, NETSETLINKSTATE set_lin
     if (!card->host_drv.priv) {
 
         if(net_cards_conf[net_card_current].net_type != NET_TYPE_NONE) {
+#ifdef USE_NETSWITCH
+            // FIXME: Hardcoded during dev
+            // FIXME: Remove when done!
+            if((net_cards_conf[net_card_current].net_type == NET_TYPE_NMSWITCH) ||
+                (net_cards_conf[net_card_current].net_type == NET_TYPE_NRSWITCH))
+                fatal("%s", net_drv_error);
+#endif /* USE_NETSWITCH */
+
             // We're here because of a failure
-            swprintf(tempmsg, sizeof_w(tempmsg), L"%ls:<br /><br />%s<br /><br />%ls", plat_get_string(IDS_2167), net_drv_error, plat_get_string(IDS_2168));
+            swprintf(tempmsg, sizeof_w(tempmsg), L"%ls:\n\n%s\n\n%ls", plat_get_string(STRING_NET_ERROR), net_drv_error, plat_get_string(STRING_NET_ERROR_DESC));
             ui_msgbox(MBX_ERROR, tempmsg);
             net_cards_conf[net_card_current].net_type = NET_TYPE_NONE;
         }
@@ -523,7 +554,7 @@ network_attach(void *card_drv, uint8_t *mac, NETRXCB rx, NETSETLINKSTATE set_lin
             free(card->queued_pkt.data);
             free(card);
             // Placeholder - insert the error message
-            fatal("Error initializing the network device: Null driver initialization failed");
+            fatal("Error initializing the network device: Null driver initialization failed\n");
             return NULL;
         }
 
@@ -555,7 +586,7 @@ netcard_close(netcard_t *card)
 void
 network_close(void)
 {
-#if defined ENABLE_NETWORK_LOG && !defined(_WIN32)
+#ifdef ENABLE_NETWORK_LOG
     thread_close_mutex(network_dump_mutex);
     network_dump_mutex = NULL;
 #endif
@@ -575,8 +606,10 @@ void
 network_reset(void)
 {
     ui_sb_update_icon(SB_NETWORK, 0);
+    ui_sb_update_icon_write(SB_NETWORK, 0);
 
-#if defined ENABLE_NETWORK_LOG && !defined(_WIN32)
+    slirp_card_num = 2;
+#ifdef ENABLE_NETWORK_LOG
     network_dump_mutex = thread_create_mutex();
 #endif
 
@@ -587,7 +620,7 @@ network_reset(void)
 
         net_card_current = i;
         if (net_cards_conf[i].device_num > NET_INTERNAL)
-            device_add_inst(net_cards[net_cards_conf[i].device_num], i + 1);
+            device_add_inst(net_cards[net_cards_conf[i].device_num].device, i + 1);
     }
 }
 
@@ -620,6 +653,7 @@ network_tx_popv(netcard_t *card, netpkt_t *pkt_vec, int vec_size)
     for (int i = 0; i < vec_size; i++) {
         if (!network_queue_get_swap(queue, pkt_vec))
             break;
+        network_dump_packet(pkt_vec);
         pkt_count++;
         pkt_vec++;
     }
@@ -640,6 +674,43 @@ network_rx_put(netcard_t *card, uint8_t *bufp, int len)
     return ret;
 }
 
+int
+network_rx_on_tx_popv(netcard_t *card, netpkt_t *pkt_vec, int vec_size)
+{
+    int pkt_count = 0;
+
+    netqueue_t *queue = &card->queues[NET_QUEUE_RX_ON_TX];
+    for (int i = 0; i < vec_size; i++) {
+        if (!network_queue_get_swap(queue, pkt_vec))
+            break;
+        network_dump_packet(pkt_vec);
+        pkt_count++;
+        pkt_vec++;
+    }
+
+    return pkt_count;
+}
+
+int
+network_rx_on_tx_put(netcard_t *card, uint8_t *bufp, int len)
+{
+    int ret = 0;
+
+    ret = network_queue_put(&card->queues[NET_QUEUE_RX_ON_TX], bufp, len);
+
+    return ret;
+}
+
+int
+network_rx_on_tx_put_pkt(netcard_t *card, netpkt_t *pkt)
+{
+    int ret = 0;
+
+    ret = network_queue_put_swap(&card->queues[NET_QUEUE_RX_ON_TX], pkt);
+
+    return ret;
+}
+
 int
 network_rx_put_pkt(netcard_t *card, netpkt_t *pkt)
 {
@@ -717,8 +788,8 @@ network_available(void)
 int
 network_card_available(int card)
 {
-    if (net_cards[card])
-        return (device_available(net_cards[card]));
+    if (net_cards[card].device)
+        return (device_available(net_cards[card].device));
 
     return 1;
 }
@@ -727,24 +798,24 @@ network_card_available(int card)
 const device_t *
 network_card_getdevice(int card)
 {
-    return (net_cards[card]);
+    return (net_cards[card].device);
 }
 
 /* UI */
 int
 network_card_has_config(int card)
 {
-    if (!net_cards[card])
+    if (!net_cards[card].device)
         return 0;
 
-    return (device_has_config(net_cards[card]) ? 1 : 0);
+    return (device_has_config(net_cards[card].device) ? 1 : 0);
 }
 
 /* UI */
 const char *
 network_card_get_internal_name(int card)
 {
-    return device_get_internal_name(net_cards[card]);
+    return device_get_internal_name(net_cards[card].device);
 }
 
 /* UI */
@@ -753,8 +824,8 @@ network_card_get_from_internal_name(char *s)
 {
     int c = 0;
 
-    while (net_cards[c] != NULL) {
-        if (!strcmp(net_cards[c]->internal_name, s))
+    while (net_cards[c].device != NULL) {
+        if (!strcmp(net_cards[c].device->internal_name, s))
             return c;
         c++;
     }
diff --git a/src/network/networkmessage.pb.c b/src/network/networkmessage.pb.c
new file mode 100644
index 000000000..c15f03e01
--- /dev/null
+++ b/src/network/networkmessage.pb.c
@@ -0,0 +1,19 @@
+/* Automatically generated nanopb constant definitions */
+/* Generated by nanopb-0.4.8-dev */
+
+#include "networkmessage.pb.h"
+#if PB_PROTO_HEADER_VERSION != 40
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+PB_BIND(Fragment, Fragment, AUTO)
+
+
+PB_BIND(Ack, Ack, AUTO)
+
+
+PB_BIND(NetworkMessage, NetworkMessage, AUTO)
+
+
+
+
diff --git a/src/network/networkmessage.pb.h b/src/network/networkmessage.pb.h
new file mode 100644
index 000000000..0a74e55b9
--- /dev/null
+++ b/src/network/networkmessage.pb.h
@@ -0,0 +1,140 @@
+/* Automatically generated nanopb header */
+/* Generated by nanopb-0.4.8-dev */
+
+#ifndef PB_NETWORKMESSAGE_PB_H_INCLUDED
+#define PB_NETWORKMESSAGE_PB_H_INCLUDED
+#include "pb.h"
+
+#if PB_PROTO_HEADER_VERSION != 40
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+/* Enum definitions */
+typedef enum _MessageType {
+    MessageType_MESSAGE_TYPE_UNSPECIFIED = 0,
+    MessageType_MESSAGE_TYPE_DATA = 1,
+    MessageType_MESSAGE_TYPE_JOIN = 2,
+    MessageType_MESSAGE_TYPE_LEAVE = 3,
+    MessageType_MESSAGE_TYPE_KEEPALIVE = 4,
+    MessageType_MESSAGE_TYPE_FRAGMENT = 5,
+    MessageType_MESSAGE_TYPE_ACK = 6,
+    MessageType_MESSAGE_TYPE_CONNECT_REQUEST = 7,
+    MessageType_MESSAGE_TYPE_CONNECT_REPLY = 8
+} MessageType;
+
+/* Struct definitions */
+typedef struct _Fragment {
+    uint32_t id;
+    uint32_t sequence;
+    uint32_t total;
+} Fragment;
+
+typedef struct _Ack {
+    uint32_t id;
+    uint32_t history;
+} Ack;
+
+typedef struct _NetworkMessage {
+    MessageType message_type;
+    uint32_t client_id;
+    pb_bytes_array_t *mac;
+    pb_bytes_array_t *frame;
+    uint32_t flags;
+    uint32_t version;
+    bool has_ack;
+    Ack ack;
+    bool has_fragment;
+    Fragment fragment;
+    int64_t timestamp;
+    uint32_t sequence;
+} NetworkMessage;
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Helper constants for enums */
+#define _MessageType_MIN MessageType_MESSAGE_TYPE_UNSPECIFIED
+#define _MessageType_MAX MessageType_MESSAGE_TYPE_CONNECT_REPLY
+#define _MessageType_ARRAYSIZE ((MessageType)(MessageType_MESSAGE_TYPE_CONNECT_REPLY+1))
+
+
+
+#define NetworkMessage_message_type_ENUMTYPE MessageType
+
+
+/* Initializer values for message structs */
+#define Fragment_init_default                    {0, 0, 0}
+#define Ack_init_default                         {0, 0}
+#define NetworkMessage_init_default              {_MessageType_MIN, 0, NULL, NULL, 0, 0, false, Ack_init_default, false, Fragment_init_default, 0, 0}
+#define Fragment_init_zero                       {0, 0, 0}
+#define Ack_init_zero                            {0, 0}
+#define NetworkMessage_init_zero                 {_MessageType_MIN, 0, NULL, NULL, 0, 0, false, Ack_init_zero, false, Fragment_init_zero, 0, 0}
+
+/* Field tags (for use in manual encoding/decoding) */
+#define Fragment_id_tag                          1
+#define Fragment_sequence_tag                    2
+#define Fragment_total_tag                       3
+#define Ack_id_tag                               1
+#define Ack_history_tag                          2
+#define NetworkMessage_message_type_tag          1
+#define NetworkMessage_client_id_tag             2
+#define NetworkMessage_mac_tag                   3
+#define NetworkMessage_frame_tag                 4
+#define NetworkMessage_flags_tag                 5
+#define NetworkMessage_version_tag               6
+#define NetworkMessage_ack_tag                   7
+#define NetworkMessage_fragment_tag              8
+#define NetworkMessage_timestamp_tag             9
+#define NetworkMessage_sequence_tag              10
+
+/* Struct field encoding specification for nanopb */
+#define Fragment_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   id,                1) \
+X(a, STATIC,   SINGULAR, UINT32,   sequence,          2) \
+X(a, STATIC,   SINGULAR, UINT32,   total,             3)
+#define Fragment_CALLBACK NULL
+#define Fragment_DEFAULT NULL
+
+#define Ack_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   id,                1) \
+X(a, STATIC,   SINGULAR, UINT32,   history,           2)
+#define Ack_CALLBACK NULL
+#define Ack_DEFAULT NULL
+
+#define NetworkMessage_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UENUM,    message_type,      1) \
+X(a, STATIC,   SINGULAR, UINT32,   client_id,         2) \
+X(a, POINTER,  SINGULAR, BYTES,    mac,               3) \
+X(a, POINTER,  SINGULAR, BYTES,    frame,             4) \
+X(a, STATIC,   SINGULAR, UINT32,   flags,             5) \
+X(a, STATIC,   SINGULAR, UINT32,   version,           6) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  ack,               7) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  fragment,          8) \
+X(a, STATIC,   SINGULAR, INT64,    timestamp,         9) \
+X(a, STATIC,   SINGULAR, UINT32,   sequence,         10)
+#define NetworkMessage_CALLBACK NULL
+#define NetworkMessage_DEFAULT NULL
+#define NetworkMessage_ack_MSGTYPE Ack
+#define NetworkMessage_fragment_MSGTYPE Fragment
+
+extern const pb_msgdesc_t Fragment_msg;
+extern const pb_msgdesc_t Ack_msg;
+extern const pb_msgdesc_t NetworkMessage_msg;
+
+/* Defines for backwards compatibility with code written before nanopb-0.4.0 */
+#define Fragment_fields &Fragment_msg
+#define Ack_fields &Ack_msg
+#define NetworkMessage_fields &NetworkMessage_msg
+
+/* Maximum encoded size of messages (where known) */
+/* NetworkMessage_size depends on runtime parameters */
+#define Ack_size                                 12
+#define Fragment_size                            18
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif
diff --git a/src/network/networkmessage.proto.txt b/src/network/networkmessage.proto.txt
new file mode 100644
index 000000000..9511f17c8
--- /dev/null
+++ b/src/network/networkmessage.proto.txt
@@ -0,0 +1,38 @@
+syntax = "proto3";
+import "nanopb.proto";
+
+enum MessageType {
+    MESSAGE_TYPE_UNSPECIFIED = 0;
+    MESSAGE_TYPE_DATA = 1;
+    MESSAGE_TYPE_JOIN = 2;
+    MESSAGE_TYPE_LEAVE = 3;
+    MESSAGE_TYPE_KEEPALIVE = 4;
+    MESSAGE_TYPE_FRAGMENT = 5;
+    MESSAGE_TYPE_ACK = 6;
+    MESSAGE_TYPE_CONNECT_REQUEST = 7;
+    MESSAGE_TYPE_CONNECT_REPLY = 8;
+}
+
+message Fragment {
+    uint32 id = 1;
+    uint32 sequence = 2;
+    uint32 total = 3;
+}
+
+message Ack {
+    uint32 id = 1;
+    uint32 history = 2;
+}
+
+message NetworkMessage {
+    MessageType message_type = 1;
+    uint32 client_id = 2;
+    bytes mac = 3 [(nanopb).type = FT_POINTER];
+    bytes frame = 4 [(nanopb).type = FT_POINTER];
+    uint32 flags = 5;
+    uint32 version = 6;
+    Ack ack = 7;
+    Fragment fragment = 8;
+    int64 timestamp = 9;
+    uint32 sequence = 10;
+}
\ No newline at end of file
diff --git a/src/network/pb.h b/src/network/pb.h
new file mode 100644
index 000000000..7433ac24b
--- /dev/null
+++ b/src/network/pb.h
@@ -0,0 +1,917 @@
+/* Common parts of the nanopb library. Most of these are quite low-level
+ * stuff. For the high-level interface, see pb_encode.h and pb_decode.h.
+ */
+
+#ifndef PB_H_INCLUDED
+#define PB_H_INCLUDED
+
+/*****************************************************************
+ * Nanopb compilation time options. You can change these here by *
+ * uncommenting the lines, or on the compiler command line.      *
+ *****************************************************************/
+
+/* Enable support for dynamically allocated fields */
+#define PB_ENABLE_MALLOC 1
+
+/* Define this if your CPU / compiler combination does not support
+ * unaligned memory access to packed structures. Note that packed
+ * structures are only used when requested in .proto options. */
+/* #define PB_NO_PACKED_STRUCTS 1 */
+
+/* Increase the number of required fields that are tracked.
+ * A compiler warning will tell if you need this. */
+/* #define PB_MAX_REQUIRED_FIELDS 256 */
+
+/* Add support for tag numbers > 65536 and fields larger than 65536 bytes. */
+/* #define PB_FIELD_32BIT 1 */
+
+/* Disable support for error messages in order to save some code space. */
+/* #define PB_NO_ERRMSG 1 */
+
+/* Disable support for custom streams (support only memory buffers). */
+#define PB_BUFFER_ONLY 1
+
+/* Disable support for 64-bit datatypes, for compilers without int64_t
+   or to save some code space. */
+/* #define PB_WITHOUT_64BIT 1 */
+
+/* Don't encode scalar arrays as packed. This is only to be used when
+ * the decoder on the receiving side cannot process packed scalar arrays.
+ * Such example is older protobuf.js. */
+/* #define PB_ENCODE_ARRAYS_UNPACKED 1 */
+
+/* Enable conversion of doubles to floats for platforms that do not
+ * support 64-bit doubles. Most commonly AVR. */
+/* #define PB_CONVERT_DOUBLE_FLOAT 1 */
+
+/* Check whether incoming strings are valid UTF-8 sequences. Slows down
+ * the string processing slightly and slightly increases code size. */
+/* #define PB_VALIDATE_UTF8 1 */
+
+/* This can be defined if the platform is little-endian and has 8-bit bytes.
+ * Normally it is automatically detected based on __BYTE_ORDER__ macro. */
+/* #define PB_LITTLE_ENDIAN_8BIT 1 */
+
+/* Configure static assert mechanism. Instead of changing these, set your
+ * compiler to C11 standard mode if possible. */
+/* #define PB_C99_STATIC_ASSERT 1 */
+/* #define PB_NO_STATIC_ASSERT 1 */
+
+/******************************************************************
+ * You usually don't need to change anything below this line.     *
+ * Feel free to look around and use the defined macros, though.   *
+ ******************************************************************/
+
+
+/* Version of the nanopb library. Just in case you want to check it in
+ * your own program. */
+#define NANOPB_VERSION "nanopb-0.4.8-dev"
+
+/* Include all the system headers needed by nanopb. You will need the
+ * definitions of the following:
+ * - strlen, memcpy, memset functions
+ * - [u]int_least8_t, uint_fast8_t, [u]int_least16_t, [u]int32_t, [u]int64_t
+ * - size_t
+ * - bool
+ *
+ * If you don't have the standard header files, you can instead provide
+ * a custom header that defines or includes all this. In that case,
+ * define PB_SYSTEM_HEADER to the path of this file.
+ */
+#ifdef PB_SYSTEM_HEADER
+#include PB_SYSTEM_HEADER
+#else
+#include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
+#include <string.h>
+#include <limits.h>
+
+#ifdef PB_ENABLE_MALLOC
+#include <stdlib.h>
+#endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Macro for defining packed structures (compiler dependent).
+ * This just reduces memory requirements, but is not required.
+ */
+#if defined(PB_NO_PACKED_STRUCTS)
+    /* Disable struct packing */
+#   define PB_PACKED_STRUCT_START
+#   define PB_PACKED_STRUCT_END
+#   define pb_packed
+#elif defined(__GNUC__) || defined(__clang__)
+    /* For GCC and clang */
+#   define PB_PACKED_STRUCT_START
+#   define PB_PACKED_STRUCT_END
+#   define pb_packed __attribute__((packed))
+#elif defined(__ICCARM__) || defined(__CC_ARM)
+    /* For IAR ARM and Keil MDK-ARM compilers */
+#   define PB_PACKED_STRUCT_START _Pragma("pack(push, 1)")
+#   define PB_PACKED_STRUCT_END _Pragma("pack(pop)")
+#   define pb_packed
+#elif defined(_MSC_VER) && (_MSC_VER >= 1500)
+    /* For Microsoft Visual C++ */
+#   define PB_PACKED_STRUCT_START __pragma(pack(push, 1))
+#   define PB_PACKED_STRUCT_END __pragma(pack(pop))
+#   define pb_packed
+#else
+    /* Unknown compiler */
+#   define PB_PACKED_STRUCT_START
+#   define PB_PACKED_STRUCT_END
+#   define pb_packed
+#endif
+
+/* Detect endianness */
+#ifndef PB_LITTLE_ENDIAN_8BIT
+#if ((defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN) || \
+     (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) || \
+      defined(__LITTLE_ENDIAN__) || defined(__ARMEL__) || \
+      defined(__THUMBEL__) || defined(__AARCH64EL__) || defined(_MIPSEL) || \
+      defined(_M_IX86) || defined(_M_X64) || defined(_M_ARM)) \
+     && CHAR_BIT == 8
+#define PB_LITTLE_ENDIAN_8BIT 1
+#endif
+#endif
+
+/* Handly macro for suppressing unreferenced-parameter compiler warnings. */
+#ifndef PB_UNUSED
+#define PB_UNUSED(x) (void)(x)
+#endif
+
+/* Harvard-architecture processors may need special attributes for storing
+ * field information in program memory. */
+#ifndef PB_PROGMEM
+#ifdef __AVR__
+#include <avr/pgmspace.h>
+#define PB_PROGMEM             PROGMEM
+#define PB_PROGMEM_READU32(x)  pgm_read_dword(&x)
+#else
+#define PB_PROGMEM
+#define PB_PROGMEM_READU32(x)  (x)
+#endif
+#endif
+
+/* Compile-time assertion, used for checking compatible compilation options.
+ * If this does not work properly on your compiler, use
+ * #define PB_NO_STATIC_ASSERT to disable it.
+ *
+ * But before doing that, check carefully the error message / place where it
+ * comes from to see if the error has a real cause. Unfortunately the error
+ * message is not always very clear to read, but you can see the reason better
+ * in the place where the PB_STATIC_ASSERT macro was called.
+ */
+#ifndef PB_NO_STATIC_ASSERT
+#  ifndef PB_STATIC_ASSERT
+#    if defined(__ICCARM__)
+       /* IAR has static_assert keyword but no _Static_assert */
+#      define PB_STATIC_ASSERT(COND,MSG) static_assert(COND,#MSG);
+#    elif defined(_MSC_VER) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 201112)
+       /* MSVC in C89 mode supports static_assert() keyword anyway */
+#      define PB_STATIC_ASSERT(COND,MSG) static_assert(COND,#MSG);
+#    elif defined(PB_C99_STATIC_ASSERT)
+       /* Classic negative-size-array static assert mechanism */
+#      define PB_STATIC_ASSERT(COND,MSG) typedef char PB_STATIC_ASSERT_MSG(MSG, __LINE__, __COUNTER__)[(COND)?1:-1];
+#      define PB_STATIC_ASSERT_MSG(MSG, LINE, COUNTER) PB_STATIC_ASSERT_MSG_(MSG, LINE, COUNTER)
+#      define PB_STATIC_ASSERT_MSG_(MSG, LINE, COUNTER) pb_static_assertion_##MSG##_##LINE##_##COUNTER
+#    elif defined(__cplusplus)
+       /* C++11 standard static_assert mechanism */
+#      define PB_STATIC_ASSERT(COND,MSG) static_assert(COND,#MSG);
+#    else
+       /* C11 standard _Static_assert mechanism */
+#      define PB_STATIC_ASSERT(COND,MSG) _Static_assert(COND,#MSG);
+#    endif
+#  endif
+#else
+   /* Static asserts disabled by PB_NO_STATIC_ASSERT */
+#  define PB_STATIC_ASSERT(COND,MSG)
+#endif
+
+/* Test that PB_STATIC_ASSERT works
+ * If you get errors here, you may need to do one of these:
+ * - Enable C11 standard support in your compiler
+ * - Define PB_C99_STATIC_ASSERT to enable C99 standard support
+ * - Define PB_NO_STATIC_ASSERT to disable static asserts altogether
+ */
+PB_STATIC_ASSERT(1, STATIC_ASSERT_IS_NOT_WORKING)
+
+/* Number of required fields to keep track of. */
+#ifndef PB_MAX_REQUIRED_FIELDS
+#define PB_MAX_REQUIRED_FIELDS 64
+#endif
+
+#if PB_MAX_REQUIRED_FIELDS < 64
+#error You should not lower PB_MAX_REQUIRED_FIELDS from the default value (64).
+#endif
+
+#ifdef PB_WITHOUT_64BIT
+#ifdef PB_CONVERT_DOUBLE_FLOAT
+/* Cannot use doubles without 64-bit types */
+#undef PB_CONVERT_DOUBLE_FLOAT
+#endif
+#endif
+
+/* List of possible field types. These are used in the autogenerated code.
+ * Least-significant 4 bits tell the scalar type
+ * Most-significant 4 bits specify repeated/required/packed etc.
+ */
+
+typedef uint_least8_t pb_type_t;
+
+/**** Field data types ****/
+
+/* Numeric types */
+#define PB_LTYPE_BOOL    0x00U /* bool */
+#define PB_LTYPE_VARINT  0x01U /* int32, int64, enum, bool */
+#define PB_LTYPE_UVARINT 0x02U /* uint32, uint64 */
+#define PB_LTYPE_SVARINT 0x03U /* sint32, sint64 */
+#define PB_LTYPE_FIXED32 0x04U /* fixed32, sfixed32, float */
+#define PB_LTYPE_FIXED64 0x05U /* fixed64, sfixed64, double */
+
+/* Marker for last packable field type. */
+#define PB_LTYPE_LAST_PACKABLE 0x05U
+
+/* Byte array with pre-allocated buffer.
+ * data_size is the length of the allocated PB_BYTES_ARRAY structure. */
+#define PB_LTYPE_BYTES 0x06U
+
+/* String with pre-allocated buffer.
+ * data_size is the maximum length. */
+#define PB_LTYPE_STRING 0x07U
+
+/* Submessage
+ * submsg_fields is pointer to field descriptions */
+#define PB_LTYPE_SUBMESSAGE 0x08U
+
+/* Submessage with pre-decoding callback
+ * The pre-decoding callback is stored as pb_callback_t right before pSize.
+ * submsg_fields is pointer to field descriptions */
+#define PB_LTYPE_SUBMSG_W_CB 0x09U
+
+/* Extension pseudo-field
+ * The field contains a pointer to pb_extension_t */
+#define PB_LTYPE_EXTENSION 0x0AU
+
+/* Byte array with inline, pre-allocated byffer.
+ * data_size is the length of the inline, allocated buffer.
+ * This differs from PB_LTYPE_BYTES by defining the element as
+ * pb_byte_t[data_size] rather than pb_bytes_array_t. */
+#define PB_LTYPE_FIXED_LENGTH_BYTES 0x0BU
+
+/* Number of declared LTYPES */
+#define PB_LTYPES_COUNT 0x0CU
+#define PB_LTYPE_MASK 0x0FU
+
+/**** Field repetition rules ****/
+
+#define PB_HTYPE_REQUIRED 0x00U
+#define PB_HTYPE_OPTIONAL 0x10U
+#define PB_HTYPE_SINGULAR 0x10U
+#define PB_HTYPE_REPEATED 0x20U
+#define PB_HTYPE_FIXARRAY 0x20U
+#define PB_HTYPE_ONEOF    0x30U
+#define PB_HTYPE_MASK     0x30U
+
+/**** Field allocation types ****/
+
+#define PB_ATYPE_STATIC   0x00U
+#define PB_ATYPE_POINTER  0x80U
+#define PB_ATYPE_CALLBACK 0x40U
+#define PB_ATYPE_MASK     0xC0U
+
+#define PB_ATYPE(x) ((x) & PB_ATYPE_MASK)
+#define PB_HTYPE(x) ((x) & PB_HTYPE_MASK)
+#define PB_LTYPE(x) ((x) & PB_LTYPE_MASK)
+#define PB_LTYPE_IS_SUBMSG(x) (PB_LTYPE(x) == PB_LTYPE_SUBMESSAGE || \
+                               PB_LTYPE(x) == PB_LTYPE_SUBMSG_W_CB)
+
+/* Data type used for storing sizes of struct fields
+ * and array counts.
+ */
+#if defined(PB_FIELD_32BIT)
+    typedef uint32_t pb_size_t;
+    typedef int32_t pb_ssize_t;
+#else
+    typedef uint_least16_t pb_size_t;
+    typedef int_least16_t pb_ssize_t;
+#endif
+#define PB_SIZE_MAX ((pb_size_t)-1)
+
+/* Data type for storing encoded data and other byte streams.
+ * This typedef exists to support platforms where uint8_t does not exist.
+ * You can regard it as equivalent on uint8_t on other platforms.
+ */
+typedef uint_least8_t pb_byte_t;
+
+/* Forward declaration of struct types */
+typedef struct pb_istream_s pb_istream_t;
+typedef struct pb_ostream_s pb_ostream_t;
+typedef struct pb_field_iter_s pb_field_iter_t;
+
+/* This structure is used in auto-generated constants
+ * to specify struct fields.
+ */
+typedef struct pb_msgdesc_s pb_msgdesc_t;
+struct pb_msgdesc_s {
+    const uint32_t *field_info;
+    const pb_msgdesc_t * const * submsg_info;
+    const pb_byte_t *default_value;
+
+    bool (*field_callback)(pb_istream_t *istream, pb_ostream_t *ostream, const pb_field_iter_t *field);
+
+    pb_size_t field_count;
+    pb_size_t required_field_count;
+    pb_size_t largest_tag;
+};
+
+/* Iterator for message descriptor */
+struct pb_field_iter_s {
+    const pb_msgdesc_t *descriptor;  /* Pointer to message descriptor constant */
+    void *message;                   /* Pointer to start of the structure */
+
+    pb_size_t index;                 /* Index of the field */
+    pb_size_t field_info_index;      /* Index to descriptor->field_info array */
+    pb_size_t required_field_index;  /* Index that counts only the required fields */
+    pb_size_t submessage_index;      /* Index that counts only submessages */
+
+    pb_size_t tag;                   /* Tag of current field */
+    pb_size_t data_size;             /* sizeof() of a single item */
+    pb_size_t array_size;            /* Number of array entries */
+    pb_type_t type;                  /* Type of current field */
+
+    void *pField;                    /* Pointer to current field in struct */
+    void *pData;                     /* Pointer to current data contents. Different than pField for arrays and pointers. */
+    void *pSize;                     /* Pointer to count/has field */
+
+    const pb_msgdesc_t *submsg_desc; /* For submessage fields, pointer to field descriptor for the submessage. */
+};
+
+/* For compatibility with legacy code */
+typedef pb_field_iter_t pb_field_t;
+
+/* Make sure that the standard integer types are of the expected sizes.
+ * Otherwise fixed32/fixed64 fields can break.
+ *
+ * If you get errors here, it probably means that your stdint.h is not
+ * correct for your platform.
+ */
+#ifndef PB_WITHOUT_64BIT
+PB_STATIC_ASSERT(sizeof(int64_t) == 2 * sizeof(int32_t), INT64_T_WRONG_SIZE)
+PB_STATIC_ASSERT(sizeof(uint64_t) == 2 * sizeof(uint32_t), UINT64_T_WRONG_SIZE)
+#endif
+
+/* This structure is used for 'bytes' arrays.
+ * It has the number of bytes in the beginning, and after that an array.
+ * Note that actual structs used will have a different length of bytes array.
+ */
+#define PB_BYTES_ARRAY_T(n) struct { pb_size_t size; pb_byte_t bytes[n]; }
+#define PB_BYTES_ARRAY_T_ALLOCSIZE(n) ((size_t)n + offsetof(pb_bytes_array_t, bytes))
+
+struct pb_bytes_array_s {
+    pb_size_t size;
+    pb_byte_t bytes[1];
+};
+typedef struct pb_bytes_array_s pb_bytes_array_t;
+
+/* This structure is used for giving the callback function.
+ * It is stored in the message structure and filled in by the method that
+ * calls pb_decode.
+ *
+ * The decoding callback will be given a limited-length stream
+ * If the wire type was string, the length is the length of the string.
+ * If the wire type was a varint/fixed32/fixed64, the length is the length
+ * of the actual value.
+ * The function may be called multiple times (especially for repeated types,
+ * but also otherwise if the message happens to contain the field multiple
+ * times.)
+ *
+ * The encoding callback will receive the actual output stream.
+ * It should write all the data in one call, including the field tag and
+ * wire type. It can write multiple fields.
+ *
+ * The callback can be null if you want to skip a field.
+ */
+typedef struct pb_callback_s pb_callback_t;
+struct pb_callback_s {
+    /* Callback functions receive a pointer to the arg field.
+     * You can access the value of the field as *arg, and modify it if needed.
+     */
+    union {
+        bool (*decode)(pb_istream_t *stream, const pb_field_t *field, void **arg);
+        bool (*encode)(pb_ostream_t *stream, const pb_field_t *field, void * const *arg);
+    } funcs;
+
+    /* Free arg for use by callback */
+    void *arg;
+};
+
+extern bool pb_default_field_callback(pb_istream_t *istream, pb_ostream_t *ostream, const pb_field_t *field);
+
+/* Wire types. Library user needs these only in encoder callbacks. */
+typedef enum {
+    PB_WT_VARINT = 0,
+    PB_WT_64BIT  = 1,
+    PB_WT_STRING = 2,
+    PB_WT_32BIT  = 5,
+    PB_WT_PACKED = 255 /* PB_WT_PACKED is internal marker for packed arrays. */
+} pb_wire_type_t;
+
+/* Structure for defining the handling of unknown/extension fields.
+ * Usually the pb_extension_type_t structure is automatically generated,
+ * while the pb_extension_t structure is created by the user. However,
+ * if you want to catch all unknown fields, you can also create a custom
+ * pb_extension_type_t with your own callback.
+ */
+typedef struct pb_extension_type_s pb_extension_type_t;
+typedef struct pb_extension_s pb_extension_t;
+struct pb_extension_type_s {
+    /* Called for each unknown field in the message.
+     * If you handle the field, read off all of its data and return true.
+     * If you do not handle the field, do not read anything and return true.
+     * If you run into an error, return false.
+     * Set to NULL for default handler.
+     */
+    bool (*decode)(pb_istream_t *stream, pb_extension_t *extension,
+                   uint32_t tag, pb_wire_type_t wire_type);
+
+    /* Called once after all regular fields have been encoded.
+     * If you have something to write, do so and return true.
+     * If you do not have anything to write, just return true.
+     * If you run into an error, return false.
+     * Set to NULL for default handler.
+     */
+    bool (*encode)(pb_ostream_t *stream, const pb_extension_t *extension);
+
+    /* Free field for use by the callback. */
+    const void *arg;
+};
+
+struct pb_extension_s {
+    /* Type describing the extension field. Usually you'll initialize
+     * this to a pointer to the automatically generated structure. */
+    const pb_extension_type_t *type;
+
+    /* Destination for the decoded data. This must match the datatype
+     * of the extension field. */
+    void *dest;
+
+    /* Pointer to the next extension handler, or NULL.
+     * If this extension does not match a field, the next handler is
+     * automatically called. */
+    pb_extension_t *next;
+
+    /* The decoder sets this to true if the extension was found.
+     * Ignored for encoding. */
+    bool found;
+};
+
+#define pb_extension_init_zero {NULL,NULL,NULL,false}
+
+/* Memory allocation functions to use. You can define pb_realloc and
+ * pb_free to custom functions if you want. */
+#ifdef PB_ENABLE_MALLOC
+#   ifndef pb_realloc
+#       define pb_realloc(ptr, size) realloc(ptr, size)
+#   endif
+#   ifndef pb_free
+#       define pb_free(ptr) free(ptr)
+#   endif
+#endif
+
+/* This is used to inform about need to regenerate .pb.h/.pb.c files. */
+#define PB_PROTO_HEADER_VERSION 40
+
+/* These macros are used to declare pb_field_t's in the constant array. */
+/* Size of a structure member, in bytes. */
+#define pb_membersize(st, m) (sizeof ((st*)0)->m)
+/* Number of entries in an array. */
+#define pb_arraysize(st, m) (pb_membersize(st, m) / pb_membersize(st, m[0]))
+/* Delta from start of one member to the start of another member. */
+#define pb_delta(st, m1, m2) ((int)offsetof(st, m1) - (int)offsetof(st, m2))
+
+/* Force expansion of macro value */
+#define PB_EXPAND(x) x
+
+/* Binding of a message field set into a specific structure */
+#define PB_BIND(msgname, structname, width) \
+    const uint32_t structname ## _field_info[] PB_PROGMEM = \
+    { \
+        msgname ## _FIELDLIST(PB_GEN_FIELD_INFO_ ## width, structname) \
+        0 \
+    }; \
+    const pb_msgdesc_t* const structname ## _submsg_info[] = \
+    { \
+        msgname ## _FIELDLIST(PB_GEN_SUBMSG_INFO, structname) \
+        NULL \
+    }; \
+    const pb_msgdesc_t structname ## _msg = \
+    { \
+       structname ## _field_info, \
+       structname ## _submsg_info, \
+       msgname ## _DEFAULT, \
+       msgname ## _CALLBACK, \
+       0 msgname ## _FIELDLIST(PB_GEN_FIELD_COUNT, structname), \
+       0 msgname ## _FIELDLIST(PB_GEN_REQ_FIELD_COUNT, structname), \
+       0 msgname ## _FIELDLIST(PB_GEN_LARGEST_TAG, structname), \
+    }; \
+    msgname ## _FIELDLIST(PB_GEN_FIELD_INFO_ASSERT_ ## width, structname)
+
+#define PB_GEN_FIELD_COUNT(structname, atype, htype, ltype, fieldname, tag) +1
+#define PB_GEN_REQ_FIELD_COUNT(structname, atype, htype, ltype, fieldname, tag) \
+    + (PB_HTYPE_ ## htype == PB_HTYPE_REQUIRED)
+#define PB_GEN_LARGEST_TAG(structname, atype, htype, ltype, fieldname, tag) \
+    * 0 + tag
+
+/* X-macro for generating the entries in struct_field_info[] array. */
+#define PB_GEN_FIELD_INFO_1(structname, atype, htype, ltype, fieldname, tag) \
+    PB_FIELDINFO_1(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
+                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+
+#define PB_GEN_FIELD_INFO_2(structname, atype, htype, ltype, fieldname, tag) \
+    PB_FIELDINFO_2(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
+                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+
+#define PB_GEN_FIELD_INFO_4(structname, atype, htype, ltype, fieldname, tag) \
+    PB_FIELDINFO_4(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
+                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+
+#define PB_GEN_FIELD_INFO_8(structname, atype, htype, ltype, fieldname, tag) \
+    PB_FIELDINFO_8(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
+                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+
+#define PB_GEN_FIELD_INFO_AUTO(structname, atype, htype, ltype, fieldname, tag) \
+    PB_FIELDINFO_AUTO2(PB_FIELDINFO_WIDTH_AUTO(_PB_ATYPE_ ## atype, _PB_HTYPE_ ## htype, _PB_LTYPE_ ## ltype), \
+                   tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
+                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+
+#define PB_FIELDINFO_AUTO2(width, tag, type, data_offset, data_size, size_offset, array_size) \
+    PB_FIELDINFO_AUTO3(width, tag, type, data_offset, data_size, size_offset, array_size)
+
+#define PB_FIELDINFO_AUTO3(width, tag, type, data_offset, data_size, size_offset, array_size) \
+    PB_FIELDINFO_ ## width(tag, type, data_offset, data_size, size_offset, array_size)
+
+/* X-macro for generating asserts that entries fit in struct_field_info[] array.
+ * The structure of macros here must match the structure above in PB_GEN_FIELD_INFO_x(),
+ * but it is not easily reused because of how macro substitutions work. */
+#define PB_GEN_FIELD_INFO_ASSERT_1(structname, atype, htype, ltype, fieldname, tag) \
+    PB_FIELDINFO_ASSERT_1(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
+                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+
+#define PB_GEN_FIELD_INFO_ASSERT_2(structname, atype, htype, ltype, fieldname, tag) \
+    PB_FIELDINFO_ASSERT_2(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
+                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+
+#define PB_GEN_FIELD_INFO_ASSERT_4(structname, atype, htype, ltype, fieldname, tag) \
+    PB_FIELDINFO_ASSERT_4(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
+                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+
+#define PB_GEN_FIELD_INFO_ASSERT_8(structname, atype, htype, ltype, fieldname, tag) \
+    PB_FIELDINFO_ASSERT_8(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
+                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+
+#define PB_GEN_FIELD_INFO_ASSERT_AUTO(structname, atype, htype, ltype, fieldname, tag) \
+    PB_FIELDINFO_ASSERT_AUTO2(PB_FIELDINFO_WIDTH_AUTO(_PB_ATYPE_ ## atype, _PB_HTYPE_ ## htype, _PB_LTYPE_ ## ltype), \
+                   tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
+                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
+                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+
+#define PB_FIELDINFO_ASSERT_AUTO2(width, tag, type, data_offset, data_size, size_offset, array_size) \
+    PB_FIELDINFO_ASSERT_AUTO3(width, tag, type, data_offset, data_size, size_offset, array_size)
+
+#define PB_FIELDINFO_ASSERT_AUTO3(width, tag, type, data_offset, data_size, size_offset, array_size) \
+    PB_FIELDINFO_ASSERT_ ## width(tag, type, data_offset, data_size, size_offset, array_size)
+
+#define PB_DATA_OFFSET_STATIC(htype, structname, fieldname) PB_DO ## htype(structname, fieldname)
+#define PB_DATA_OFFSET_POINTER(htype, structname, fieldname) PB_DO ## htype(structname, fieldname)
+#define PB_DATA_OFFSET_CALLBACK(htype, structname, fieldname) PB_DO ## htype(structname, fieldname)
+#define PB_DO_PB_HTYPE_REQUIRED(structname, fieldname) offsetof(structname, fieldname)
+#define PB_DO_PB_HTYPE_SINGULAR(structname, fieldname) offsetof(structname, fieldname)
+#define PB_DO_PB_HTYPE_ONEOF(structname, fieldname) offsetof(structname, PB_ONEOF_NAME(FULL, fieldname))
+#define PB_DO_PB_HTYPE_OPTIONAL(structname, fieldname) offsetof(structname, fieldname)
+#define PB_DO_PB_HTYPE_REPEATED(structname, fieldname) offsetof(structname, fieldname)
+#define PB_DO_PB_HTYPE_FIXARRAY(structname, fieldname) offsetof(structname, fieldname)
+
+#define PB_SIZE_OFFSET_STATIC(htype, structname, fieldname) PB_SO ## htype(structname, fieldname)
+#define PB_SIZE_OFFSET_POINTER(htype, structname, fieldname) PB_SO_PTR ## htype(structname, fieldname)
+#define PB_SIZE_OFFSET_CALLBACK(htype, structname, fieldname) PB_SO_CB ## htype(structname, fieldname)
+#define PB_SO_PB_HTYPE_REQUIRED(structname, fieldname) 0
+#define PB_SO_PB_HTYPE_SINGULAR(structname, fieldname) 0
+#define PB_SO_PB_HTYPE_ONEOF(structname, fieldname) PB_SO_PB_HTYPE_ONEOF2(structname, PB_ONEOF_NAME(FULL, fieldname), PB_ONEOF_NAME(UNION, fieldname))
+#define PB_SO_PB_HTYPE_ONEOF2(structname, fullname, unionname) PB_SO_PB_HTYPE_ONEOF3(structname, fullname, unionname)
+#define PB_SO_PB_HTYPE_ONEOF3(structname, fullname, unionname) pb_delta(structname, fullname, which_ ## unionname)
+#define PB_SO_PB_HTYPE_OPTIONAL(structname, fieldname) pb_delta(structname, fieldname, has_ ## fieldname)
+#define PB_SO_PB_HTYPE_REPEATED(structname, fieldname) pb_delta(structname, fieldname, fieldname ## _count)
+#define PB_SO_PB_HTYPE_FIXARRAY(structname, fieldname) 0
+#define PB_SO_PTR_PB_HTYPE_REQUIRED(structname, fieldname) 0
+#define PB_SO_PTR_PB_HTYPE_SINGULAR(structname, fieldname) 0
+#define PB_SO_PTR_PB_HTYPE_ONEOF(structname, fieldname) PB_SO_PB_HTYPE_ONEOF(structname, fieldname)
+#define PB_SO_PTR_PB_HTYPE_OPTIONAL(structname, fieldname) 0
+#define PB_SO_PTR_PB_HTYPE_REPEATED(structname, fieldname) PB_SO_PB_HTYPE_REPEATED(structname, fieldname)
+#define PB_SO_PTR_PB_HTYPE_FIXARRAY(structname, fieldname) 0
+#define PB_SO_CB_PB_HTYPE_REQUIRED(structname, fieldname) 0
+#define PB_SO_CB_PB_HTYPE_SINGULAR(structname, fieldname) 0
+#define PB_SO_CB_PB_HTYPE_ONEOF(structname, fieldname) PB_SO_PB_HTYPE_ONEOF(structname, fieldname)
+#define PB_SO_CB_PB_HTYPE_OPTIONAL(structname, fieldname) 0
+#define PB_SO_CB_PB_HTYPE_REPEATED(structname, fieldname) 0
+#define PB_SO_CB_PB_HTYPE_FIXARRAY(structname, fieldname) 0
+
+#define PB_ARRAY_SIZE_STATIC(htype, structname, fieldname) PB_AS ## htype(structname, fieldname)
+#define PB_ARRAY_SIZE_POINTER(htype, structname, fieldname) PB_AS_PTR ## htype(structname, fieldname)
+#define PB_ARRAY_SIZE_CALLBACK(htype, structname, fieldname) 1
+#define PB_AS_PB_HTYPE_REQUIRED(structname, fieldname) 1
+#define PB_AS_PB_HTYPE_SINGULAR(structname, fieldname) 1
+#define PB_AS_PB_HTYPE_OPTIONAL(structname, fieldname) 1
+#define PB_AS_PB_HTYPE_ONEOF(structname, fieldname) 1
+#define PB_AS_PB_HTYPE_REPEATED(structname, fieldname) pb_arraysize(structname, fieldname)
+#define PB_AS_PB_HTYPE_FIXARRAY(structname, fieldname) pb_arraysize(structname, fieldname)
+#define PB_AS_PTR_PB_HTYPE_REQUIRED(structname, fieldname) 1
+#define PB_AS_PTR_PB_HTYPE_SINGULAR(structname, fieldname) 1
+#define PB_AS_PTR_PB_HTYPE_OPTIONAL(structname, fieldname) 1
+#define PB_AS_PTR_PB_HTYPE_ONEOF(structname, fieldname) 1
+#define PB_AS_PTR_PB_HTYPE_REPEATED(structname, fieldname) 1
+#define PB_AS_PTR_PB_HTYPE_FIXARRAY(structname, fieldname) pb_arraysize(structname, fieldname[0])
+
+#define PB_DATA_SIZE_STATIC(htype, structname, fieldname) PB_DS ## htype(structname, fieldname)
+#define PB_DATA_SIZE_POINTER(htype, structname, fieldname) PB_DS_PTR ## htype(structname, fieldname)
+#define PB_DATA_SIZE_CALLBACK(htype, structname, fieldname) PB_DS_CB ## htype(structname, fieldname)
+#define PB_DS_PB_HTYPE_REQUIRED(structname, fieldname) pb_membersize(structname, fieldname)
+#define PB_DS_PB_HTYPE_SINGULAR(structname, fieldname) pb_membersize(structname, fieldname)
+#define PB_DS_PB_HTYPE_OPTIONAL(structname, fieldname) pb_membersize(structname, fieldname)
+#define PB_DS_PB_HTYPE_ONEOF(structname, fieldname) pb_membersize(structname, PB_ONEOF_NAME(FULL, fieldname))
+#define PB_DS_PB_HTYPE_REPEATED(structname, fieldname) pb_membersize(structname, fieldname[0])
+#define PB_DS_PB_HTYPE_FIXARRAY(structname, fieldname) pb_membersize(structname, fieldname[0])
+#define PB_DS_PTR_PB_HTYPE_REQUIRED(structname, fieldname) pb_membersize(structname, fieldname[0])
+#define PB_DS_PTR_PB_HTYPE_SINGULAR(structname, fieldname) pb_membersize(structname, fieldname[0])
+#define PB_DS_PTR_PB_HTYPE_OPTIONAL(structname, fieldname) pb_membersize(structname, fieldname[0])
+#define PB_DS_PTR_PB_HTYPE_ONEOF(structname, fieldname) pb_membersize(structname, PB_ONEOF_NAME(FULL, fieldname)[0])
+#define PB_DS_PTR_PB_HTYPE_REPEATED(structname, fieldname) pb_membersize(structname, fieldname[0])
+#define PB_DS_PTR_PB_HTYPE_FIXARRAY(structname, fieldname) pb_membersize(structname, fieldname[0][0])
+#define PB_DS_CB_PB_HTYPE_REQUIRED(structname, fieldname) pb_membersize(structname, fieldname)
+#define PB_DS_CB_PB_HTYPE_SINGULAR(structname, fieldname) pb_membersize(structname, fieldname)
+#define PB_DS_CB_PB_HTYPE_OPTIONAL(structname, fieldname) pb_membersize(structname, fieldname)
+#define PB_DS_CB_PB_HTYPE_ONEOF(structname, fieldname) pb_membersize(structname, PB_ONEOF_NAME(FULL, fieldname))
+#define PB_DS_CB_PB_HTYPE_REPEATED(structname, fieldname) pb_membersize(structname, fieldname)
+#define PB_DS_CB_PB_HTYPE_FIXARRAY(structname, fieldname) pb_membersize(structname, fieldname)
+
+#define PB_ONEOF_NAME(type, tuple) PB_EXPAND(PB_ONEOF_NAME_ ## type tuple)
+#define PB_ONEOF_NAME_UNION(unionname,membername,fullname) unionname
+#define PB_ONEOF_NAME_MEMBER(unionname,membername,fullname) membername
+#define PB_ONEOF_NAME_FULL(unionname,membername,fullname) fullname
+
+#define PB_GEN_SUBMSG_INFO(structname, atype, htype, ltype, fieldname, tag) \
+    PB_SUBMSG_INFO_ ## htype(_PB_LTYPE_ ## ltype, structname, fieldname)
+
+#define PB_SUBMSG_INFO_REQUIRED(ltype, structname, fieldname) PB_SI ## ltype(structname ## _ ## fieldname ## _MSGTYPE)
+#define PB_SUBMSG_INFO_SINGULAR(ltype, structname, fieldname) PB_SI ## ltype(structname ## _ ## fieldname ## _MSGTYPE)
+#define PB_SUBMSG_INFO_OPTIONAL(ltype, structname, fieldname) PB_SI ## ltype(structname ## _ ## fieldname ## _MSGTYPE)
+#define PB_SUBMSG_INFO_ONEOF(ltype, structname, fieldname) PB_SUBMSG_INFO_ONEOF2(ltype, structname, PB_ONEOF_NAME(UNION, fieldname), PB_ONEOF_NAME(MEMBER, fieldname))
+#define PB_SUBMSG_INFO_ONEOF2(ltype, structname, unionname, membername) PB_SUBMSG_INFO_ONEOF3(ltype, structname, unionname, membername)
+#define PB_SUBMSG_INFO_ONEOF3(ltype, structname, unionname, membername) PB_SI ## ltype(structname ## _ ## unionname ## _ ## membername ## _MSGTYPE)
+#define PB_SUBMSG_INFO_REPEATED(ltype, structname, fieldname) PB_SI ## ltype(structname ## _ ## fieldname ## _MSGTYPE)
+#define PB_SUBMSG_INFO_FIXARRAY(ltype, structname, fieldname) PB_SI ## ltype(structname ## _ ## fieldname ## _MSGTYPE)
+#define PB_SI_PB_LTYPE_BOOL(t)
+#define PB_SI_PB_LTYPE_BYTES(t)
+#define PB_SI_PB_LTYPE_DOUBLE(t)
+#define PB_SI_PB_LTYPE_ENUM(t)
+#define PB_SI_PB_LTYPE_UENUM(t)
+#define PB_SI_PB_LTYPE_FIXED32(t)
+#define PB_SI_PB_LTYPE_FIXED64(t)
+#define PB_SI_PB_LTYPE_FLOAT(t)
+#define PB_SI_PB_LTYPE_INT32(t)
+#define PB_SI_PB_LTYPE_INT64(t)
+#define PB_SI_PB_LTYPE_MESSAGE(t)  PB_SUBMSG_DESCRIPTOR(t)
+#define PB_SI_PB_LTYPE_MSG_W_CB(t) PB_SUBMSG_DESCRIPTOR(t)
+#define PB_SI_PB_LTYPE_SFIXED32(t)
+#define PB_SI_PB_LTYPE_SFIXED64(t)
+#define PB_SI_PB_LTYPE_SINT32(t)
+#define PB_SI_PB_LTYPE_SINT64(t)
+#define PB_SI_PB_LTYPE_STRING(t)
+#define PB_SI_PB_LTYPE_UINT32(t)
+#define PB_SI_PB_LTYPE_UINT64(t)
+#define PB_SI_PB_LTYPE_EXTENSION(t)
+#define PB_SI_PB_LTYPE_FIXED_LENGTH_BYTES(t)
+#define PB_SUBMSG_DESCRIPTOR(t)    &(t ## _msg),
+
+/* The field descriptors use a variable width format, with width of either
+ * 1, 2, 4 or 8 of 32-bit words. The two lowest bytes of the first byte always
+ * encode the descriptor size, 6 lowest bits of field tag number, and 8 bits
+ * of the field type.
+ *
+ * Descriptor size is encoded as 0 = 1 word, 1 = 2 words, 2 = 4 words, 3 = 8 words.
+ *
+ * Formats, listed starting with the least significant bit of the first word.
+ * 1 word:  [2-bit len] [6-bit tag] [8-bit type] [8-bit data_offset] [4-bit size_offset] [4-bit data_size]
+ *
+ * 2 words: [2-bit len] [6-bit tag] [8-bit type] [12-bit array_size] [4-bit size_offset]
+ *          [16-bit data_offset] [12-bit data_size] [4-bit tag>>6]
+ *
+ * 4 words: [2-bit len] [6-bit tag] [8-bit type] [16-bit array_size]
+ *          [8-bit size_offset] [24-bit tag>>6]
+ *          [32-bit data_offset]
+ *          [32-bit data_size]
+ *
+ * 8 words: [2-bit len] [6-bit tag] [8-bit type] [16-bit reserved]
+ *          [8-bit size_offset] [24-bit tag>>6]
+ *          [32-bit data_offset]
+ *          [32-bit data_size]
+ *          [32-bit array_size]
+ *          [32-bit reserved]
+ *          [32-bit reserved]
+ *          [32-bit reserved]
+ */
+
+#define PB_FIELDINFO_1(tag, type, data_offset, data_size, size_offset, array_size) \
+    (0 | (((tag) << 2) & 0xFF) | ((type) << 8) | (((uint32_t)(data_offset) & 0xFF) << 16) | \
+     (((uint32_t)(size_offset) & 0x0F) << 24) | (((uint32_t)(data_size) & 0x0F) << 28)),
+
+#define PB_FIELDINFO_2(tag, type, data_offset, data_size, size_offset, array_size) \
+    (1 | (((tag) << 2) & 0xFF) | ((type) << 8) | (((uint32_t)(array_size) & 0xFFF) << 16) | (((uint32_t)(size_offset) & 0x0F) << 28)), \
+    (((uint32_t)(data_offset) & 0xFFFF) | (((uint32_t)(data_size) & 0xFFF) << 16) | (((uint32_t)(tag) & 0x3c0) << 22)),
+
+#define PB_FIELDINFO_4(tag, type, data_offset, data_size, size_offset, array_size) \
+    (2 | (((tag) << 2) & 0xFF) | ((type) << 8) | (((uint32_t)(array_size) & 0xFFFF) << 16)), \
+    ((uint32_t)(int_least8_t)(size_offset) | (((uint32_t)(tag) << 2) & 0xFFFFFF00)), \
+    (data_offset), (data_size),
+
+#define PB_FIELDINFO_8(tag, type, data_offset, data_size, size_offset, array_size) \
+    (3 | (((tag) << 2) & 0xFF) | ((type) << 8)), \
+    ((uint32_t)(int_least8_t)(size_offset) | (((uint32_t)(tag) << 2) & 0xFFFFFF00)), \
+    (data_offset), (data_size), (array_size), 0, 0, 0,
+
+/* These assertions verify that the field information fits in the allocated space.
+ * The generator tries to automatically determine the correct width that can fit all
+ * data associated with a message. These asserts will fail only if there has been a
+ * problem in the automatic logic - this may be worth reporting as a bug. As a workaround,
+ * you can increase the descriptor width by defining PB_FIELDINFO_WIDTH or by setting
+ * descriptorsize option in .options file.
+ */
+#define PB_FITS(value,bits) ((uint32_t)(value) < ((uint32_t)1<<bits))
+#define PB_FIELDINFO_ASSERT_1(tag, type, data_offset, data_size, size_offset, array_size) \
+    PB_STATIC_ASSERT(PB_FITS(tag,6) && PB_FITS(data_offset,8) && PB_FITS(size_offset,4) && PB_FITS(data_size,4) && PB_FITS(array_size,1), FIELDINFO_DOES_NOT_FIT_width1_field ## tag)
+
+#define PB_FIELDINFO_ASSERT_2(tag, type, data_offset, data_size, size_offset, array_size) \
+    PB_STATIC_ASSERT(PB_FITS(tag,10) && PB_FITS(data_offset,16) && PB_FITS(size_offset,4) && PB_FITS(data_size,12) && PB_FITS(array_size,12), FIELDINFO_DOES_NOT_FIT_width2_field ## tag)
+
+#ifndef PB_FIELD_32BIT
+/* Maximum field sizes are still 16-bit if pb_size_t is 16-bit */
+#define PB_FIELDINFO_ASSERT_4(tag, type, data_offset, data_size, size_offset, array_size) \
+    PB_STATIC_ASSERT(PB_FITS(tag,16) && PB_FITS(data_offset,16) && PB_FITS((int_least8_t)size_offset,8) && PB_FITS(data_size,16) && PB_FITS(array_size,16), FIELDINFO_DOES_NOT_FIT_width4_field ## tag)
+
+#define PB_FIELDINFO_ASSERT_8(tag, type, data_offset, data_size, size_offset, array_size) \
+    PB_STATIC_ASSERT(PB_FITS(tag,16) && PB_FITS(data_offset,16) && PB_FITS((int_least8_t)size_offset,8) && PB_FITS(data_size,16) && PB_FITS(array_size,16), FIELDINFO_DOES_NOT_FIT_width8_field ## tag)
+#else
+/* Up to 32-bit fields supported.
+ * Note that the checks are against 31 bits to avoid compiler warnings about shift wider than type in the test.
+ * I expect that there is no reasonable use for >2GB messages with nanopb anyway.
+ */
+#define PB_FIELDINFO_ASSERT_4(tag, type, data_offset, data_size, size_offset, array_size) \
+    PB_STATIC_ASSERT(PB_FITS(tag,30) && PB_FITS(data_offset,31) && PB_FITS(size_offset,8) && PB_FITS(data_size,31) && PB_FITS(array_size,16), FIELDINFO_DOES_NOT_FIT_width4_field ## tag)
+
+#define PB_FIELDINFO_ASSERT_8(tag, type, data_offset, data_size, size_offset, array_size) \
+    PB_STATIC_ASSERT(PB_FITS(tag,30) && PB_FITS(data_offset,31) && PB_FITS(size_offset,8) && PB_FITS(data_size,31) && PB_FITS(array_size,31), FIELDINFO_DOES_NOT_FIT_width8_field ## tag)
+#endif
+
+
+/* Automatic picking of FIELDINFO width:
+ * Uses width 1 when possible, otherwise resorts to width 2.
+ * This is used when PB_BIND() is called with "AUTO" as the argument.
+ * The generator will give explicit size argument when it knows that a message
+ * structure grows beyond 1-word format limits.
+ */
+#define PB_FIELDINFO_WIDTH_AUTO(atype, htype, ltype) PB_FI_WIDTH ## atype(htype, ltype)
+#define PB_FI_WIDTH_PB_ATYPE_STATIC(htype, ltype) PB_FI_WIDTH ## htype(ltype)
+#define PB_FI_WIDTH_PB_ATYPE_POINTER(htype, ltype) PB_FI_WIDTH ## htype(ltype)
+#define PB_FI_WIDTH_PB_ATYPE_CALLBACK(htype, ltype) 2
+#define PB_FI_WIDTH_PB_HTYPE_REQUIRED(ltype) PB_FI_WIDTH ## ltype
+#define PB_FI_WIDTH_PB_HTYPE_SINGULAR(ltype) PB_FI_WIDTH ## ltype
+#define PB_FI_WIDTH_PB_HTYPE_OPTIONAL(ltype) PB_FI_WIDTH ## ltype
+#define PB_FI_WIDTH_PB_HTYPE_ONEOF(ltype) PB_FI_WIDTH ## ltype
+#define PB_FI_WIDTH_PB_HTYPE_REPEATED(ltype) 2
+#define PB_FI_WIDTH_PB_HTYPE_FIXARRAY(ltype) 2
+#define PB_FI_WIDTH_PB_LTYPE_BOOL      1
+#define PB_FI_WIDTH_PB_LTYPE_BYTES     2
+#define PB_FI_WIDTH_PB_LTYPE_DOUBLE    1
+#define PB_FI_WIDTH_PB_LTYPE_ENUM      1
+#define PB_FI_WIDTH_PB_LTYPE_UENUM     1
+#define PB_FI_WIDTH_PB_LTYPE_FIXED32   1
+#define PB_FI_WIDTH_PB_LTYPE_FIXED64   1
+#define PB_FI_WIDTH_PB_LTYPE_FLOAT     1
+#define PB_FI_WIDTH_PB_LTYPE_INT32     1
+#define PB_FI_WIDTH_PB_LTYPE_INT64     1
+#define PB_FI_WIDTH_PB_LTYPE_MESSAGE   2
+#define PB_FI_WIDTH_PB_LTYPE_MSG_W_CB  2
+#define PB_FI_WIDTH_PB_LTYPE_SFIXED32  1
+#define PB_FI_WIDTH_PB_LTYPE_SFIXED64  1
+#define PB_FI_WIDTH_PB_LTYPE_SINT32    1
+#define PB_FI_WIDTH_PB_LTYPE_SINT64    1
+#define PB_FI_WIDTH_PB_LTYPE_STRING    2
+#define PB_FI_WIDTH_PB_LTYPE_UINT32    1
+#define PB_FI_WIDTH_PB_LTYPE_UINT64    1
+#define PB_FI_WIDTH_PB_LTYPE_EXTENSION 1
+#define PB_FI_WIDTH_PB_LTYPE_FIXED_LENGTH_BYTES 2
+
+/* The mapping from protobuf types to LTYPEs is done using these macros. */
+#define PB_LTYPE_MAP_BOOL               PB_LTYPE_BOOL
+#define PB_LTYPE_MAP_BYTES              PB_LTYPE_BYTES
+#define PB_LTYPE_MAP_DOUBLE             PB_LTYPE_FIXED64
+#define PB_LTYPE_MAP_ENUM               PB_LTYPE_VARINT
+#define PB_LTYPE_MAP_UENUM              PB_LTYPE_UVARINT
+#define PB_LTYPE_MAP_FIXED32            PB_LTYPE_FIXED32
+#define PB_LTYPE_MAP_FIXED64            PB_LTYPE_FIXED64
+#define PB_LTYPE_MAP_FLOAT              PB_LTYPE_FIXED32
+#define PB_LTYPE_MAP_INT32              PB_LTYPE_VARINT
+#define PB_LTYPE_MAP_INT64              PB_LTYPE_VARINT
+#define PB_LTYPE_MAP_MESSAGE            PB_LTYPE_SUBMESSAGE
+#define PB_LTYPE_MAP_MSG_W_CB           PB_LTYPE_SUBMSG_W_CB
+#define PB_LTYPE_MAP_SFIXED32           PB_LTYPE_FIXED32
+#define PB_LTYPE_MAP_SFIXED64           PB_LTYPE_FIXED64
+#define PB_LTYPE_MAP_SINT32             PB_LTYPE_SVARINT
+#define PB_LTYPE_MAP_SINT64             PB_LTYPE_SVARINT
+#define PB_LTYPE_MAP_STRING             PB_LTYPE_STRING
+#define PB_LTYPE_MAP_UINT32             PB_LTYPE_UVARINT
+#define PB_LTYPE_MAP_UINT64             PB_LTYPE_UVARINT
+#define PB_LTYPE_MAP_EXTENSION          PB_LTYPE_EXTENSION
+#define PB_LTYPE_MAP_FIXED_LENGTH_BYTES PB_LTYPE_FIXED_LENGTH_BYTES
+
+/* These macros are used for giving out error messages.
+ * They are mostly a debugging aid; the main error information
+ * is the true/false return value from functions.
+ * Some code space can be saved by disabling the error
+ * messages if not used.
+ *
+ * PB_SET_ERROR() sets the error message if none has been set yet.
+ *                msg must be a constant string literal.
+ * PB_GET_ERROR() always returns a pointer to a string.
+ * PB_RETURN_ERROR() sets the error and returns false from current
+ *                   function.
+ */
+#ifdef PB_NO_ERRMSG
+#define PB_SET_ERROR(stream, msg) PB_UNUSED(stream)
+#define PB_GET_ERROR(stream) "(errmsg disabled)"
+#else
+#define PB_SET_ERROR(stream, msg) (stream->errmsg = (stream)->errmsg ? (stream)->errmsg : (msg))
+#define PB_GET_ERROR(stream) ((stream)->errmsg ? (stream)->errmsg : "(none)")
+#endif
+
+#define PB_RETURN_ERROR(stream, msg) return PB_SET_ERROR(stream, msg), false
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#ifdef __cplusplus
+#if __cplusplus >= 201103L
+#define PB_CONSTEXPR constexpr
+#else  // __cplusplus >= 201103L
+#define PB_CONSTEXPR
+#endif  // __cplusplus >= 201103L
+
+#if __cplusplus >= 201703L
+#define PB_INLINE_CONSTEXPR inline constexpr
+#else  // __cplusplus >= 201703L
+#define PB_INLINE_CONSTEXPR PB_CONSTEXPR
+#endif  // __cplusplus >= 201703L
+
+extern "C++"
+{
+namespace nanopb {
+// Each type will be partially specialized by the generator.
+template <typename GenMessageT> struct MessageDescriptor;
+}  // namespace nanopb
+}
+#endif  /* __cplusplus */
+
+#endif
diff --git a/src/network/pb_common.c b/src/network/pb_common.c
new file mode 100644
index 000000000..6aee76b1e
--- /dev/null
+++ b/src/network/pb_common.c
@@ -0,0 +1,388 @@
+/* pb_common.c: Common support functions for pb_encode.c and pb_decode.c.
+ *
+ * 2014 Petteri Aimonen <jpa@kapsi.fi>
+ */
+
+#include "pb_common.h"
+
+static bool load_descriptor_values(pb_field_iter_t *iter)
+{
+    uint32_t word0;
+    uint32_t data_offset;
+    int_least8_t size_offset;
+
+    if (iter->index >= iter->descriptor->field_count)
+        return false;
+
+    word0 = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index]);
+    iter->type = (pb_type_t)((word0 >> 8) & 0xFF);
+
+    switch(word0 & 3)
+    {
+        case 0: {
+            /* 1-word format */
+            iter->array_size = 1;
+            iter->tag = (pb_size_t)((word0 >> 2) & 0x3F);
+            size_offset = (int_least8_t)((word0 >> 24) & 0x0F);
+            data_offset = (word0 >> 16) & 0xFF;
+            iter->data_size = (pb_size_t)((word0 >> 28) & 0x0F);
+            break;
+        }
+
+        case 1: {
+            /* 2-word format */
+            uint32_t word1 = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index + 1]);
+
+            iter->array_size = (pb_size_t)((word0 >> 16) & 0x0FFF);
+            iter->tag = (pb_size_t)(((word0 >> 2) & 0x3F) | ((word1 >> 28) << 6));
+            size_offset = (int_least8_t)((word0 >> 28) & 0x0F);
+            data_offset = word1 & 0xFFFF;
+            iter->data_size = (pb_size_t)((word1 >> 16) & 0x0FFF);
+            break;
+        }
+
+        case 2: {
+            /* 4-word format */
+            uint32_t word1 = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index + 1]);
+            uint32_t word2 = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index + 2]);
+            uint32_t word3 = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index + 3]);
+
+            iter->array_size = (pb_size_t)(word0 >> 16);
+            iter->tag = (pb_size_t)(((word0 >> 2) & 0x3F) | ((word1 >> 8) << 6));
+            size_offset = (int_least8_t)(word1 & 0xFF);
+            data_offset = word2;
+            iter->data_size = (pb_size_t)word3;
+            break;
+        }
+
+        default: {
+            /* 8-word format */
+            uint32_t word1 = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index + 1]);
+            uint32_t word2 = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index + 2]);
+            uint32_t word3 = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index + 3]);
+            uint32_t word4 = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index + 4]);
+
+            iter->array_size = (pb_size_t)word4;
+            iter->tag = (pb_size_t)(((word0 >> 2) & 0x3F) | ((word1 >> 8) << 6));
+            size_offset = (int_least8_t)(word1 & 0xFF);
+            data_offset = word2;
+            iter->data_size = (pb_size_t)word3;
+            break;
+        }
+    }
+
+    if (!iter->message)
+    {
+        /* Avoid doing arithmetic on null pointers, it is undefined */
+        iter->pField = NULL;
+        iter->pSize = NULL;
+    }
+    else
+    {
+        iter->pField = (char*)iter->message + data_offset;
+
+        if (size_offset)
+        {
+            iter->pSize = (char*)iter->pField - size_offset;
+        }
+        else if (PB_HTYPE(iter->type) == PB_HTYPE_REPEATED &&
+                 (PB_ATYPE(iter->type) == PB_ATYPE_STATIC ||
+                  PB_ATYPE(iter->type) == PB_ATYPE_POINTER))
+        {
+            /* Fixed count array */
+            iter->pSize = &iter->array_size;
+        }
+        else
+        {
+            iter->pSize = NULL;
+        }
+
+        if (PB_ATYPE(iter->type) == PB_ATYPE_POINTER && iter->pField != NULL)
+        {
+            iter->pData = *(void**)iter->pField;
+        }
+        else
+        {
+            iter->pData = iter->pField;
+        }
+    }
+
+    if (PB_LTYPE_IS_SUBMSG(iter->type))
+    {
+        iter->submsg_desc = iter->descriptor->submsg_info[iter->submessage_index];
+    }
+    else
+    {
+        iter->submsg_desc = NULL;
+    }
+
+    return true;
+}
+
+static void advance_iterator(pb_field_iter_t *iter)
+{
+    iter->index++;
+
+    if (iter->index >= iter->descriptor->field_count)
+    {
+        /* Restart */
+        iter->index = 0;
+        iter->field_info_index = 0;
+        iter->submessage_index = 0;
+        iter->required_field_index = 0;
+    }
+    else
+    {
+        /* Increment indexes based on previous field type.
+         * All field info formats have the following fields:
+         * - lowest 2 bits tell the amount of words in the descriptor (2^n words)
+         * - bits 2..7 give the lowest bits of tag number.
+         * - bits 8..15 give the field type.
+         */
+        uint32_t prev_descriptor = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index]);
+        pb_type_t prev_type = (prev_descriptor >> 8) & 0xFF;
+        pb_size_t descriptor_len = (pb_size_t)(1 << (prev_descriptor & 3));
+
+        /* Add to fields.
+         * The cast to pb_size_t is needed to avoid -Wconversion warning.
+         * Because the data is is constants from generator, there is no danger of overflow.
+         */
+        iter->field_info_index = (pb_size_t)(iter->field_info_index + descriptor_len);
+        iter->required_field_index = (pb_size_t)(iter->required_field_index + (PB_HTYPE(prev_type) == PB_HTYPE_REQUIRED));
+        iter->submessage_index = (pb_size_t)(iter->submessage_index + PB_LTYPE_IS_SUBMSG(prev_type));
+    }
+}
+
+bool pb_field_iter_begin(pb_field_iter_t *iter, const pb_msgdesc_t *desc, void *message)
+{
+    memset(iter, 0, sizeof(*iter));
+
+    iter->descriptor = desc;
+    iter->message = message;
+
+    return load_descriptor_values(iter);
+}
+
+bool pb_field_iter_begin_extension(pb_field_iter_t *iter, pb_extension_t *extension)
+{
+    const pb_msgdesc_t *msg = (const pb_msgdesc_t*)extension->type->arg;
+    bool status;
+
+    uint32_t word0 = PB_PROGMEM_READU32(msg->field_info[0]);
+    if (PB_ATYPE(word0 >> 8) == PB_ATYPE_POINTER)
+    {
+        /* For pointer extensions, the pointer is stored directly
+         * in the extension structure. This avoids having an extra
+         * indirection. */
+        status = pb_field_iter_begin(iter, msg, &extension->dest);
+    }
+    else
+    {
+        status = pb_field_iter_begin(iter, msg, extension->dest);
+    }
+
+    iter->pSize = &extension->found;
+    return status;
+}
+
+bool pb_field_iter_next(pb_field_iter_t *iter)
+{
+    advance_iterator(iter);
+    (void)load_descriptor_values(iter);
+    return iter->index != 0;
+}
+
+bool pb_field_iter_find(pb_field_iter_t *iter, uint32_t tag)
+{
+    if (iter->tag == tag)
+    {
+        return true; /* Nothing to do, correct field already. */
+    }
+    else if (tag > iter->descriptor->largest_tag)
+    {
+        return false;
+    }
+    else
+    {
+        pb_size_t start = iter->index;
+        uint32_t fieldinfo;
+
+        if (tag < iter->tag)
+        {
+            /* Fields are in tag number order, so we know that tag is between
+             * 0 and our start position. Setting index to end forces
+             * advance_iterator() call below to restart from beginning. */
+            iter->index = iter->descriptor->field_count;
+        }
+
+        do
+        {
+            /* Advance iterator but don't load values yet */
+            advance_iterator(iter);
+
+            /* Do fast check for tag number match */
+            fieldinfo = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index]);
+
+            if (((fieldinfo >> 2) & 0x3F) == (tag & 0x3F))
+            {
+                /* Good candidate, check further */
+                (void)load_descriptor_values(iter);
+
+                if (iter->tag == tag &&
+                    PB_LTYPE(iter->type) != PB_LTYPE_EXTENSION)
+                {
+                    /* Found it */
+                    return true;
+                }
+            }
+        } while (iter->index != start);
+
+        /* Searched all the way back to start, and found nothing. */
+        (void)load_descriptor_values(iter);
+        return false;
+    }
+}
+
+bool pb_field_iter_find_extension(pb_field_iter_t *iter)
+{
+    if (PB_LTYPE(iter->type) == PB_LTYPE_EXTENSION)
+    {
+        return true;
+    }
+    else
+    {
+        pb_size_t start = iter->index;
+        uint32_t fieldinfo;
+
+        do
+        {
+            /* Advance iterator but don't load values yet */
+            advance_iterator(iter);
+
+            /* Do fast check for field type */
+            fieldinfo = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index]);
+
+            if (PB_LTYPE((fieldinfo >> 8) & 0xFF) == PB_LTYPE_EXTENSION)
+            {
+                return load_descriptor_values(iter);
+            }
+        } while (iter->index != start);
+
+        /* Searched all the way back to start, and found nothing. */
+        (void)load_descriptor_values(iter);
+        return false;
+    }
+}
+
+static void *pb_const_cast(const void *p)
+{
+    /* Note: this casts away const, in order to use the common field iterator
+     * logic for both encoding and decoding. The cast is done using union
+     * to avoid spurious compiler warnings. */
+    union {
+        void *p1;
+        const void *p2;
+    } t;
+    t.p2 = p;
+    return t.p1;
+}
+
+bool pb_field_iter_begin_const(pb_field_iter_t *iter, const pb_msgdesc_t *desc, const void *message)
+{
+    return pb_field_iter_begin(iter, desc, pb_const_cast(message));
+}
+
+bool pb_field_iter_begin_extension_const(pb_field_iter_t *iter, const pb_extension_t *extension)
+{
+    return pb_field_iter_begin_extension(iter, (pb_extension_t*)pb_const_cast(extension));
+}
+
+bool pb_default_field_callback(pb_istream_t *istream, pb_ostream_t *ostream, const pb_field_t *field)
+{
+    if (field->data_size == sizeof(pb_callback_t))
+    {
+        pb_callback_t *pCallback = (pb_callback_t*)field->pData;
+
+        if (pCallback != NULL)
+        {
+            if (istream != NULL && pCallback->funcs.decode != NULL)
+            {
+                return pCallback->funcs.decode(istream, field, &pCallback->arg);
+            }
+
+            if (ostream != NULL && pCallback->funcs.encode != NULL)
+            {
+                return pCallback->funcs.encode(ostream, field, &pCallback->arg);
+            }
+        }
+    }
+
+    return true; /* Success, but didn't do anything */
+
+}
+
+#ifdef PB_VALIDATE_UTF8
+
+/* This function checks whether a string is valid UTF-8 text.
+ *
+ * Algorithm is adapted from https://www.cl.cam.ac.uk/~mgk25/ucs/utf8_check.c
+ * Original copyright: Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/> 2005-03-30
+ * Licensed under "Short code license", which allows use under MIT license or
+ * any compatible with it.
+ */
+
+bool pb_validate_utf8(const char *str)
+{
+    const pb_byte_t *s = (const pb_byte_t*)str;
+    while (*s)
+    {
+        if (*s < 0x80)
+        {
+            /* 0xxxxxxx */
+            s++;
+        }
+        else if ((s[0] & 0xe0) == 0xc0)
+        {
+            /* 110XXXXx 10xxxxxx */
+            if ((s[1] & 0xc0) != 0x80 ||
+                (s[0] & 0xfe) == 0xc0)                        /* overlong? */
+                return false;
+            else
+                s += 2;
+        }
+        else if ((s[0] & 0xf0) == 0xe0)
+        {
+            /* 1110XXXX 10Xxxxxx 10xxxxxx */
+            if ((s[1] & 0xc0) != 0x80 ||
+                (s[2] & 0xc0) != 0x80 ||
+                (s[0] == 0xe0 && (s[1] & 0xe0) == 0x80) ||    /* overlong? */
+                (s[0] == 0xed && (s[1] & 0xe0) == 0xa0) ||    /* surrogate? */
+                (s[0] == 0xef && s[1] == 0xbf &&
+                (s[2] & 0xfe) == 0xbe))                 /* U+FFFE or U+FFFF? */
+                return false;
+            else
+                s += 3;
+        }
+        else if ((s[0] & 0xf8) == 0xf0)
+        {
+            /* 11110XXX 10XXxxxx 10xxxxxx 10xxxxxx */
+            if ((s[1] & 0xc0) != 0x80 ||
+                (s[2] & 0xc0) != 0x80 ||
+                (s[3] & 0xc0) != 0x80 ||
+                (s[0] == 0xf0 && (s[1] & 0xf0) == 0x80) ||    /* overlong? */
+                (s[0] == 0xf4 && s[1] > 0x8f) || s[0] > 0xf4) /* > U+10FFFF? */
+                return false;
+            else
+                s += 4;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+#endif
+
diff --git a/src/network/pb_common.h b/src/network/pb_common.h
new file mode 100644
index 000000000..58aa90f76
--- /dev/null
+++ b/src/network/pb_common.h
@@ -0,0 +1,49 @@
+/* pb_common.h: Common support functions for pb_encode.c and pb_decode.c.
+ * These functions are rarely needed by applications directly.
+ */
+
+#ifndef PB_COMMON_H_INCLUDED
+#define PB_COMMON_H_INCLUDED
+
+#include "pb.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Initialize the field iterator structure to beginning.
+ * Returns false if the message type is empty. */
+bool pb_field_iter_begin(pb_field_iter_t *iter, const pb_msgdesc_t *desc, void *message);
+
+/* Get a field iterator for extension field. */
+bool pb_field_iter_begin_extension(pb_field_iter_t *iter, pb_extension_t *extension);
+
+/* Same as pb_field_iter_begin(), but for const message pointer.
+ * Note that the pointers in pb_field_iter_t will be non-const but shouldn't
+ * be written to when using these functions. */
+bool pb_field_iter_begin_const(pb_field_iter_t *iter, const pb_msgdesc_t *desc, const void *message);
+bool pb_field_iter_begin_extension_const(pb_field_iter_t *iter, const pb_extension_t *extension);
+
+/* Advance the iterator to the next field.
+ * Returns false when the iterator wraps back to the first field. */
+bool pb_field_iter_next(pb_field_iter_t *iter);
+
+/* Advance the iterator until it points at a field with the given tag.
+ * Returns false if no such field exists. */
+bool pb_field_iter_find(pb_field_iter_t *iter, uint32_t tag);
+
+/* Find a field with type PB_LTYPE_EXTENSION, or return false if not found.
+ * There can be only one extension range field per message. */
+bool pb_field_iter_find_extension(pb_field_iter_t *iter);
+
+#ifdef PB_VALIDATE_UTF8
+/* Validate UTF-8 text string */
+bool pb_validate_utf8(const char *s);
+#endif
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif
+
diff --git a/src/network/pb_decode.c b/src/network/pb_decode.c
new file mode 100644
index 000000000..788998eb9
--- /dev/null
+++ b/src/network/pb_decode.c
@@ -0,0 +1,1727 @@
+/* pb_decode.c -- decode a protobuf using minimal resources
+ *
+ * 2011 Petteri Aimonen <jpa@kapsi.fi>
+ */
+
+/* Use the GCC warn_unused_result attribute to check that all return values
+ * are propagated correctly. On other compilers and gcc before 3.4.0 just
+ * ignore the annotation.
+ */
+#if !defined(__GNUC__) || ( __GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
+    #define checkreturn
+#else
+    #define checkreturn __attribute__((warn_unused_result))
+#endif
+
+#include "pb.h"
+#include "pb_decode.h"
+#include "pb_common.h"
+
+/**************************************
+ * Declarations internal to this file *
+ **************************************/
+
+static bool checkreturn buf_read(pb_istream_t *stream, pb_byte_t *buf, size_t count);
+static bool checkreturn pb_decode_varint32_eof(pb_istream_t *stream, uint32_t *dest, bool *eof);
+static bool checkreturn read_raw_value(pb_istream_t *stream, pb_wire_type_t wire_type, pb_byte_t *buf, size_t *size);
+static bool checkreturn decode_basic_field(pb_istream_t *stream, pb_wire_type_t wire_type, pb_field_iter_t *field);
+static bool checkreturn decode_static_field(pb_istream_t *stream, pb_wire_type_t wire_type, pb_field_iter_t *field);
+static bool checkreturn decode_pointer_field(pb_istream_t *stream, pb_wire_type_t wire_type, pb_field_iter_t *field);
+static bool checkreturn decode_callback_field(pb_istream_t *stream, pb_wire_type_t wire_type, pb_field_iter_t *field);
+static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_type, pb_field_iter_t *field);
+static bool checkreturn default_extension_decoder(pb_istream_t *stream, pb_extension_t *extension, uint32_t tag, pb_wire_type_t wire_type);
+static bool checkreturn decode_extension(pb_istream_t *stream, uint32_t tag, pb_wire_type_t wire_type, pb_extension_t *extension);
+static bool pb_field_set_to_default(pb_field_iter_t *field);
+static bool pb_message_set_to_defaults(pb_field_iter_t *iter);
+static bool checkreturn pb_dec_bool(pb_istream_t *stream, const pb_field_iter_t *field);
+static bool checkreturn pb_dec_varint(pb_istream_t *stream, const pb_field_iter_t *field);
+static bool checkreturn pb_dec_bytes(pb_istream_t *stream, const pb_field_iter_t *field);
+static bool checkreturn pb_dec_string(pb_istream_t *stream, const pb_field_iter_t *field);
+static bool checkreturn pb_dec_submessage(pb_istream_t *stream, const pb_field_iter_t *field);
+static bool checkreturn pb_dec_fixed_length_bytes(pb_istream_t *stream, const pb_field_iter_t *field);
+static bool checkreturn pb_skip_varint(pb_istream_t *stream);
+static bool checkreturn pb_skip_string(pb_istream_t *stream);
+
+#ifdef PB_ENABLE_MALLOC
+static bool checkreturn allocate_field(pb_istream_t *stream, void *pData, size_t data_size, size_t array_size);
+static void initialize_pointer_field(void *pItem, pb_field_iter_t *field);
+static bool checkreturn pb_release_union_field(pb_istream_t *stream, pb_field_iter_t *field);
+static void pb_release_single_field(pb_field_iter_t *field);
+#endif
+
+#ifdef PB_WITHOUT_64BIT
+#define pb_int64_t int32_t
+#define pb_uint64_t uint32_t
+#else
+#define pb_int64_t int64_t
+#define pb_uint64_t uint64_t
+#endif
+
+typedef struct {
+    uint32_t bitfield[(PB_MAX_REQUIRED_FIELDS + 31) / 32];
+} pb_fields_seen_t;
+
+/*******************************
+ * pb_istream_t implementation *
+ *******************************/
+
+static bool checkreturn buf_read(pb_istream_t *stream, pb_byte_t *buf, size_t count)
+{
+    const pb_byte_t *source = (const pb_byte_t*)stream->state;
+    stream->state = (pb_byte_t*)stream->state + count;
+    
+    if (buf != NULL)
+    {
+        memcpy(buf, source, count * sizeof(pb_byte_t));
+    }
+    
+    return true;
+}
+
+bool checkreturn pb_read(pb_istream_t *stream, pb_byte_t *buf, size_t count)
+{
+    if (count == 0)
+        return true;
+
+#ifndef PB_BUFFER_ONLY
+	if (buf == NULL && stream->callback != buf_read)
+	{
+		/* Skip input bytes */
+		pb_byte_t tmp[16];
+		while (count > 16)
+		{
+			if (!pb_read(stream, tmp, 16))
+				return false;
+			
+			count -= 16;
+		}
+		
+		return pb_read(stream, tmp, count);
+	}
+#endif
+
+    if (stream->bytes_left < count)
+        PB_RETURN_ERROR(stream, "end-of-stream");
+    
+#ifndef PB_BUFFER_ONLY
+    if (!stream->callback(stream, buf, count))
+        PB_RETURN_ERROR(stream, "io error");
+#else
+    if (!buf_read(stream, buf, count))
+        return false;
+#endif
+    
+    if (stream->bytes_left < count)
+        stream->bytes_left = 0;
+    else
+        stream->bytes_left -= count;
+
+    return true;
+}
+
+/* Read a single byte from input stream. buf may not be NULL.
+ * This is an optimization for the varint decoding. */
+static bool checkreturn pb_readbyte(pb_istream_t *stream, pb_byte_t *buf)
+{
+    if (stream->bytes_left == 0)
+        PB_RETURN_ERROR(stream, "end-of-stream");
+
+#ifndef PB_BUFFER_ONLY
+    if (!stream->callback(stream, buf, 1))
+        PB_RETURN_ERROR(stream, "io error");
+#else
+    *buf = *(const pb_byte_t*)stream->state;
+    stream->state = (pb_byte_t*)stream->state + 1;
+#endif
+
+    stream->bytes_left--;
+    
+    return true;    
+}
+
+pb_istream_t pb_istream_from_buffer(const pb_byte_t *buf, size_t msglen)
+{
+    pb_istream_t stream;
+    /* Cast away the const from buf without a compiler error.  We are
+     * careful to use it only in a const manner in the callbacks.
+     */
+    union {
+        void *state;
+        const void *c_state;
+    } state;
+#ifdef PB_BUFFER_ONLY
+    stream.callback = NULL;
+#else
+    stream.callback = &buf_read;
+#endif
+    state.c_state = buf;
+    stream.state = state.state;
+    stream.bytes_left = msglen;
+#ifndef PB_NO_ERRMSG
+    stream.errmsg = NULL;
+#endif
+    return stream;
+}
+
+/********************
+ * Helper functions *
+ ********************/
+
+static bool checkreturn pb_decode_varint32_eof(pb_istream_t *stream, uint32_t *dest, bool *eof)
+{
+    pb_byte_t byte;
+    uint32_t result;
+    
+    if (!pb_readbyte(stream, &byte))
+    {
+        if (stream->bytes_left == 0)
+        {
+            if (eof)
+            {
+                *eof = true;
+            }
+        }
+
+        return false;
+    }
+    
+    if ((byte & 0x80) == 0)
+    {
+        /* Quick case, 1 byte value */
+        result = byte;
+    }
+    else
+    {
+        /* Multibyte case */
+        uint_fast8_t bitpos = 7;
+        result = byte & 0x7F;
+        
+        do
+        {
+            if (!pb_readbyte(stream, &byte))
+                return false;
+            
+            if (bitpos >= 32)
+            {
+                /* Note: The varint could have trailing 0x80 bytes, or 0xFF for negative. */
+                pb_byte_t sign_extension = (bitpos < 63) ? 0xFF : 0x01;
+                bool valid_extension = ((byte & 0x7F) == 0x00 ||
+                         ((result >> 31) != 0 && byte == sign_extension));
+
+                if (bitpos >= 64 || !valid_extension)
+                {
+                    PB_RETURN_ERROR(stream, "varint overflow");
+                }
+            }
+            else if (bitpos == 28)
+            {
+                if ((byte & 0x70) != 0 && (byte & 0x78) != 0x78)
+                {
+                    PB_RETURN_ERROR(stream, "varint overflow");
+                }
+                result |= (uint32_t)(byte & 0x0F) << bitpos;
+            }
+            else
+            {
+                result |= (uint32_t)(byte & 0x7F) << bitpos;
+            }
+            bitpos = (uint_fast8_t)(bitpos + 7);
+        } while (byte & 0x80);
+   }
+   
+   *dest = result;
+   return true;
+}
+
+bool checkreturn pb_decode_varint32(pb_istream_t *stream, uint32_t *dest)
+{
+    return pb_decode_varint32_eof(stream, dest, NULL);
+}
+
+#ifndef PB_WITHOUT_64BIT
+bool checkreturn pb_decode_varint(pb_istream_t *stream, uint64_t *dest)
+{
+    pb_byte_t byte;
+    uint_fast8_t bitpos = 0;
+    uint64_t result = 0;
+    
+    do
+    {
+        if (!pb_readbyte(stream, &byte))
+            return false;
+
+        if (bitpos >= 63 && (byte & 0xFE) != 0)
+            PB_RETURN_ERROR(stream, "varint overflow");
+
+        result |= (uint64_t)(byte & 0x7F) << bitpos;
+        bitpos = (uint_fast8_t)(bitpos + 7);
+    } while (byte & 0x80);
+    
+    *dest = result;
+    return true;
+}
+#endif
+
+bool checkreturn pb_skip_varint(pb_istream_t *stream)
+{
+    pb_byte_t byte;
+    do
+    {
+        if (!pb_read(stream, &byte, 1))
+            return false;
+    } while (byte & 0x80);
+    return true;
+}
+
+bool checkreturn pb_skip_string(pb_istream_t *stream)
+{
+    uint32_t length;
+    if (!pb_decode_varint32(stream, &length))
+        return false;
+    
+    if ((size_t)length != length)
+    {
+        PB_RETURN_ERROR(stream, "size too large");
+    }
+
+    return pb_read(stream, NULL, (size_t)length);
+}
+
+bool checkreturn pb_decode_tag(pb_istream_t *stream, pb_wire_type_t *wire_type, uint32_t *tag, bool *eof)
+{
+    uint32_t temp;
+    *eof = false;
+    *wire_type = (pb_wire_type_t) 0;
+    *tag = 0;
+    
+    if (!pb_decode_varint32_eof(stream, &temp, eof))
+    {
+        return false;
+    }
+    
+    *tag = temp >> 3;
+    *wire_type = (pb_wire_type_t)(temp & 7);
+    return true;
+}
+
+bool checkreturn pb_skip_field(pb_istream_t *stream, pb_wire_type_t wire_type)
+{
+    switch (wire_type)
+    {
+        case PB_WT_VARINT: return pb_skip_varint(stream);
+        case PB_WT_64BIT: return pb_read(stream, NULL, 8);
+        case PB_WT_STRING: return pb_skip_string(stream);
+        case PB_WT_32BIT: return pb_read(stream, NULL, 4);
+        default: PB_RETURN_ERROR(stream, "invalid wire_type");
+    }
+}
+
+/* Read a raw value to buffer, for the purpose of passing it to callback as
+ * a substream. Size is maximum size on call, and actual size on return.
+ */
+static bool checkreturn read_raw_value(pb_istream_t *stream, pb_wire_type_t wire_type, pb_byte_t *buf, size_t *size)
+{
+    size_t max_size = *size;
+    switch (wire_type)
+    {
+        case PB_WT_VARINT:
+            *size = 0;
+            do
+            {
+                (*size)++;
+                if (*size > max_size)
+                    PB_RETURN_ERROR(stream, "varint overflow");
+
+                if (!pb_read(stream, buf, 1))
+                    return false;
+            } while (*buf++ & 0x80);
+            return true;
+            
+        case PB_WT_64BIT:
+            *size = 8;
+            return pb_read(stream, buf, 8);
+        
+        case PB_WT_32BIT:
+            *size = 4;
+            return pb_read(stream, buf, 4);
+        
+        case PB_WT_STRING:
+            /* Calling read_raw_value with a PB_WT_STRING is an error.
+             * Explicitly handle this case and fallthrough to default to avoid
+             * compiler warnings.
+             */
+
+        default: PB_RETURN_ERROR(stream, "invalid wire_type");
+    }
+}
+
+/* Decode string length from stream and return a substream with limited length.
+ * Remember to close the substream using pb_close_string_substream().
+ */
+bool checkreturn pb_make_string_substream(pb_istream_t *stream, pb_istream_t *substream)
+{
+    uint32_t size;
+    if (!pb_decode_varint32(stream, &size))
+        return false;
+    
+    *substream = *stream;
+    if (substream->bytes_left < size)
+        PB_RETURN_ERROR(stream, "parent stream too short");
+    
+    substream->bytes_left = (size_t)size;
+    stream->bytes_left -= (size_t)size;
+    return true;
+}
+
+bool checkreturn pb_close_string_substream(pb_istream_t *stream, pb_istream_t *substream)
+{
+    if (substream->bytes_left) {
+        if (!pb_read(substream, NULL, substream->bytes_left))
+            return false;
+    }
+
+    stream->state = substream->state;
+
+#ifndef PB_NO_ERRMSG
+    stream->errmsg = substream->errmsg;
+#endif
+    return true;
+}
+
+/*************************
+ * Decode a single field *
+ *************************/
+
+static bool checkreturn decode_basic_field(pb_istream_t *stream, pb_wire_type_t wire_type, pb_field_iter_t *field)
+{
+    switch (PB_LTYPE(field->type))
+    {
+        case PB_LTYPE_BOOL:
+            if (wire_type != PB_WT_VARINT && wire_type != PB_WT_PACKED)
+                PB_RETURN_ERROR(stream, "wrong wire type");
+
+            return pb_dec_bool(stream, field);
+
+        case PB_LTYPE_VARINT:
+        case PB_LTYPE_UVARINT:
+        case PB_LTYPE_SVARINT:
+            if (wire_type != PB_WT_VARINT && wire_type != PB_WT_PACKED)
+                PB_RETURN_ERROR(stream, "wrong wire type");
+
+            return pb_dec_varint(stream, field);
+
+        case PB_LTYPE_FIXED32:
+            if (wire_type != PB_WT_32BIT && wire_type != PB_WT_PACKED)
+                PB_RETURN_ERROR(stream, "wrong wire type");
+
+            return pb_decode_fixed32(stream, field->pData);
+
+        case PB_LTYPE_FIXED64:
+            if (wire_type != PB_WT_64BIT && wire_type != PB_WT_PACKED)
+                PB_RETURN_ERROR(stream, "wrong wire type");
+
+#ifdef PB_CONVERT_DOUBLE_FLOAT
+            if (field->data_size == sizeof(float))
+            {
+                return pb_decode_double_as_float(stream, (float*)field->pData);
+            }
+#endif
+
+#ifdef PB_WITHOUT_64BIT
+            PB_RETURN_ERROR(stream, "invalid data_size");
+#else
+            return pb_decode_fixed64(stream, field->pData);
+#endif
+
+        case PB_LTYPE_BYTES:
+            if (wire_type != PB_WT_STRING)
+                PB_RETURN_ERROR(stream, "wrong wire type");
+
+            return pb_dec_bytes(stream, field);
+
+        case PB_LTYPE_STRING:
+            if (wire_type != PB_WT_STRING)
+                PB_RETURN_ERROR(stream, "wrong wire type");
+
+            return pb_dec_string(stream, field);
+
+        case PB_LTYPE_SUBMESSAGE:
+        case PB_LTYPE_SUBMSG_W_CB:
+            if (wire_type != PB_WT_STRING)
+                PB_RETURN_ERROR(stream, "wrong wire type");
+
+            return pb_dec_submessage(stream, field);
+
+        case PB_LTYPE_FIXED_LENGTH_BYTES:
+            if (wire_type != PB_WT_STRING)
+                PB_RETURN_ERROR(stream, "wrong wire type");
+
+            return pb_dec_fixed_length_bytes(stream, field);
+
+        default:
+            PB_RETURN_ERROR(stream, "invalid field type");
+    }
+}
+
+static bool checkreturn decode_static_field(pb_istream_t *stream, pb_wire_type_t wire_type, pb_field_iter_t *field)
+{
+    switch (PB_HTYPE(field->type))
+    {
+        case PB_HTYPE_REQUIRED:
+            return decode_basic_field(stream, wire_type, field);
+            
+        case PB_HTYPE_OPTIONAL:
+            if (field->pSize != NULL)
+                *(bool*)field->pSize = true;
+            return decode_basic_field(stream, wire_type, field);
+    
+        case PB_HTYPE_REPEATED:
+            if (wire_type == PB_WT_STRING
+                && PB_LTYPE(field->type) <= PB_LTYPE_LAST_PACKABLE)
+            {
+                /* Packed array */
+                bool status = true;
+                pb_istream_t substream;
+                pb_size_t *size = (pb_size_t*)field->pSize;
+                field->pData = (char*)field->pField + field->data_size * (*size);
+
+                if (!pb_make_string_substream(stream, &substream))
+                    return false;
+
+                while (substream.bytes_left > 0 && *size < field->array_size)
+                {
+                    if (!decode_basic_field(&substream, PB_WT_PACKED, field))
+                    {
+                        status = false;
+                        break;
+                    }
+                    (*size)++;
+                    field->pData = (char*)field->pData + field->data_size;
+                }
+
+                if (substream.bytes_left != 0)
+                    PB_RETURN_ERROR(stream, "array overflow");
+                if (!pb_close_string_substream(stream, &substream))
+                    return false;
+
+                return status;
+            }
+            else
+            {
+                /* Repeated field */
+                pb_size_t *size = (pb_size_t*)field->pSize;
+                field->pData = (char*)field->pField + field->data_size * (*size);
+
+                if ((*size)++ >= field->array_size)
+                    PB_RETURN_ERROR(stream, "array overflow");
+
+                return decode_basic_field(stream, wire_type, field);
+            }
+
+        case PB_HTYPE_ONEOF:
+            if (PB_LTYPE_IS_SUBMSG(field->type) &&
+                *(pb_size_t*)field->pSize != field->tag)
+            {
+                /* We memset to zero so that any callbacks are set to NULL.
+                 * This is because the callbacks might otherwise have values
+                 * from some other union field.
+                 * If callbacks are needed inside oneof field, use .proto
+                 * option submsg_callback to have a separate callback function
+                 * that can set the fields before submessage is decoded.
+                 * pb_dec_submessage() will set any default values. */
+                memset(field->pData, 0, (size_t)field->data_size);
+
+                /* Set default values for the submessage fields. */
+                if (field->submsg_desc->default_value != NULL ||
+                    field->submsg_desc->field_callback != NULL ||
+                    field->submsg_desc->submsg_info[0] != NULL)
+                {
+                    pb_field_iter_t submsg_iter;
+                    if (pb_field_iter_begin(&submsg_iter, field->submsg_desc, field->pData))
+                    {
+                        if (!pb_message_set_to_defaults(&submsg_iter))
+                            PB_RETURN_ERROR(stream, "failed to set defaults");
+                    }
+                }
+            }
+            *(pb_size_t*)field->pSize = field->tag;
+
+            return decode_basic_field(stream, wire_type, field);
+
+        default:
+            PB_RETURN_ERROR(stream, "invalid field type");
+    }
+}
+
+#ifdef PB_ENABLE_MALLOC
+/* Allocate storage for the field and store the pointer at iter->pData.
+ * array_size is the number of entries to reserve in an array.
+ * Zero size is not allowed, use pb_free() for releasing.
+ */
+static bool checkreturn allocate_field(pb_istream_t *stream, void *pData, size_t data_size, size_t array_size)
+{    
+    void *ptr = *(void**)pData;
+    
+    if (data_size == 0 || array_size == 0)
+        PB_RETURN_ERROR(stream, "invalid size");
+    
+#ifdef __AVR__
+    /* Workaround for AVR libc bug 53284: http://savannah.nongnu.org/bugs/?53284
+     * Realloc to size of 1 byte can cause corruption of the malloc structures.
+     */
+    if (data_size == 1 && array_size == 1)
+    {
+        data_size = 2;
+    }
+#endif
+
+    /* Check for multiplication overflows.
+     * This code avoids the costly division if the sizes are small enough.
+     * Multiplication is safe as long as only half of bits are set
+     * in either multiplicand.
+     */
+    {
+        const size_t check_limit = (size_t)1 << (sizeof(size_t) * 4);
+        if (data_size >= check_limit || array_size >= check_limit)
+        {
+            const size_t size_max = (size_t)-1;
+            if (size_max / array_size < data_size)
+            {
+                PB_RETURN_ERROR(stream, "size too large");
+            }
+        }
+    }
+    
+    /* Allocate new or expand previous allocation */
+    /* Note: on failure the old pointer will remain in the structure,
+     * the message must be freed by caller also on error return. */
+    ptr = pb_realloc(ptr, array_size * data_size);
+    if (ptr == NULL)
+        PB_RETURN_ERROR(stream, "realloc failed");
+    
+    *(void**)pData = ptr;
+    return true;
+}
+
+/* Clear a newly allocated item in case it contains a pointer, or is a submessage. */
+static void initialize_pointer_field(void *pItem, pb_field_iter_t *field)
+{
+    if (PB_LTYPE(field->type) == PB_LTYPE_STRING ||
+        PB_LTYPE(field->type) == PB_LTYPE_BYTES)
+    {
+        *(void**)pItem = NULL;
+    }
+    else if (PB_LTYPE_IS_SUBMSG(field->type))
+    {
+        /* We memset to zero so that any callbacks are set to NULL.
+         * Default values will be set by pb_dec_submessage(). */
+        memset(pItem, 0, field->data_size);
+    }
+}
+#endif
+
+static bool checkreturn decode_pointer_field(pb_istream_t *stream, pb_wire_type_t wire_type, pb_field_iter_t *field)
+{
+#ifndef PB_ENABLE_MALLOC
+    PB_UNUSED(wire_type);
+    PB_UNUSED(field);
+    PB_RETURN_ERROR(stream, "no malloc support");
+#else
+    switch (PB_HTYPE(field->type))
+    {
+        case PB_HTYPE_REQUIRED:
+        case PB_HTYPE_OPTIONAL:
+        case PB_HTYPE_ONEOF:
+            if (PB_LTYPE_IS_SUBMSG(field->type) && *(void**)field->pField != NULL)
+            {
+                /* Duplicate field, have to release the old allocation first. */
+                /* FIXME: Does this work correctly for oneofs? */
+                pb_release_single_field(field);
+            }
+        
+            if (PB_HTYPE(field->type) == PB_HTYPE_ONEOF)
+            {
+                *(pb_size_t*)field->pSize = field->tag;
+            }
+
+            if (PB_LTYPE(field->type) == PB_LTYPE_STRING ||
+                PB_LTYPE(field->type) == PB_LTYPE_BYTES)
+            {
+                /* pb_dec_string and pb_dec_bytes handle allocation themselves */
+                field->pData = field->pField;
+                return decode_basic_field(stream, wire_type, field);
+            }
+            else
+            {
+                if (!allocate_field(stream, field->pField, field->data_size, 1))
+                    return false;
+                
+                field->pData = *(void**)field->pField;
+                initialize_pointer_field(field->pData, field);
+                return decode_basic_field(stream, wire_type, field);
+            }
+    
+        case PB_HTYPE_REPEATED:
+            if (wire_type == PB_WT_STRING
+                && PB_LTYPE(field->type) <= PB_LTYPE_LAST_PACKABLE)
+            {
+                /* Packed array, multiple items come in at once. */
+                bool status = true;
+                pb_size_t *size = (pb_size_t*)field->pSize;
+                size_t allocated_size = *size;
+                pb_istream_t substream;
+                
+                if (!pb_make_string_substream(stream, &substream))
+                    return false;
+                
+                while (substream.bytes_left)
+                {
+                    if (*size == PB_SIZE_MAX)
+                    {
+#ifndef PB_NO_ERRMSG
+                        stream->errmsg = "too many array entries";
+#endif
+                        status = false;
+                        break;
+                    }
+
+                    if ((size_t)*size + 1 > allocated_size)
+                    {
+                        /* Allocate more storage. This tries to guess the
+                         * number of remaining entries. Round the division
+                         * upwards. */
+                        size_t remain = (substream.bytes_left - 1) / field->data_size + 1;
+                        if (remain < PB_SIZE_MAX - allocated_size)
+                            allocated_size += remain;
+                        else
+                            allocated_size += 1;
+                        
+                        if (!allocate_field(&substream, field->pField, field->data_size, allocated_size))
+                        {
+                            status = false;
+                            break;
+                        }
+                    }
+
+                    /* Decode the array entry */
+                    field->pData = *(char**)field->pField + field->data_size * (*size);
+                    if (field->pData == NULL)
+                    {
+                        /* Shouldn't happen, but satisfies static analyzers */
+                        status = false;
+                        break;
+                    }
+                    initialize_pointer_field(field->pData, field);
+                    if (!decode_basic_field(&substream, PB_WT_PACKED, field))
+                    {
+                        status = false;
+                        break;
+                    }
+                    
+                    (*size)++;
+                }
+                if (!pb_close_string_substream(stream, &substream))
+                    return false;
+                
+                return status;
+            }
+            else
+            {
+                /* Normal repeated field, i.e. only one item at a time. */
+                pb_size_t *size = (pb_size_t*)field->pSize;
+
+                if (*size == PB_SIZE_MAX)
+                    PB_RETURN_ERROR(stream, "too many array entries");
+                
+                if (!allocate_field(stream, field->pField, field->data_size, (size_t)(*size + 1)))
+                    return false;
+            
+                field->pData = *(char**)field->pField + field->data_size * (*size);
+                (*size)++;
+                initialize_pointer_field(field->pData, field);
+                return decode_basic_field(stream, wire_type, field);
+            }
+
+        default:
+            PB_RETURN_ERROR(stream, "invalid field type");
+    }
+#endif
+}
+
+static bool checkreturn decode_callback_field(pb_istream_t *stream, pb_wire_type_t wire_type, pb_field_iter_t *field)
+{
+    if (!field->descriptor->field_callback)
+        return pb_skip_field(stream, wire_type);
+
+    if (wire_type == PB_WT_STRING)
+    {
+        pb_istream_t substream;
+        size_t prev_bytes_left;
+        
+        if (!pb_make_string_substream(stream, &substream))
+            return false;
+        
+        do
+        {
+            prev_bytes_left = substream.bytes_left;
+            if (!field->descriptor->field_callback(&substream, NULL, field))
+            {
+                PB_SET_ERROR(stream, substream.errmsg ? substream.errmsg : "callback failed");
+                return false;
+            }
+        } while (substream.bytes_left > 0 && substream.bytes_left < prev_bytes_left);
+        
+        if (!pb_close_string_substream(stream, &substream))
+            return false;
+
+        return true;
+    }
+    else
+    {
+        /* Copy the single scalar value to stack.
+         * This is required so that we can limit the stream length,
+         * which in turn allows to use same callback for packed and
+         * not-packed fields. */
+        pb_istream_t substream;
+        pb_byte_t buffer[10];
+        size_t size = sizeof(buffer);
+        
+        if (!read_raw_value(stream, wire_type, buffer, &size))
+            return false;
+        substream = pb_istream_from_buffer(buffer, size);
+        
+        return field->descriptor->field_callback(&substream, NULL, field);
+    }
+}
+
+static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_type, pb_field_iter_t *field)
+{
+#ifdef PB_ENABLE_MALLOC
+    /* When decoding an oneof field, check if there is old data that must be
+     * released first. */
+    if (PB_HTYPE(field->type) == PB_HTYPE_ONEOF)
+    {
+        if (!pb_release_union_field(stream, field))
+            return false;
+    }
+#endif
+
+    switch (PB_ATYPE(field->type))
+    {
+        case PB_ATYPE_STATIC:
+            return decode_static_field(stream, wire_type, field);
+        
+        case PB_ATYPE_POINTER:
+            return decode_pointer_field(stream, wire_type, field);
+        
+        case PB_ATYPE_CALLBACK:
+            return decode_callback_field(stream, wire_type, field);
+        
+        default:
+            PB_RETURN_ERROR(stream, "invalid field type");
+    }
+}
+
+/* Default handler for extension fields. Expects to have a pb_msgdesc_t
+ * pointer in the extension->type->arg field, pointing to a message with
+ * only one field in it.  */
+static bool checkreturn default_extension_decoder(pb_istream_t *stream,
+    pb_extension_t *extension, uint32_t tag, pb_wire_type_t wire_type)
+{
+    pb_field_iter_t iter;
+
+    if (!pb_field_iter_begin_extension(&iter, extension))
+        PB_RETURN_ERROR(stream, "invalid extension");
+
+    if (iter.tag != tag || !iter.message)
+        return true;
+
+    extension->found = true;
+    return decode_field(stream, wire_type, &iter);
+}
+
+/* Try to decode an unknown field as an extension field. Tries each extension
+ * decoder in turn, until one of them handles the field or loop ends. */
+static bool checkreturn decode_extension(pb_istream_t *stream,
+    uint32_t tag, pb_wire_type_t wire_type, pb_extension_t *extension)
+{
+    size_t pos = stream->bytes_left;
+    
+    while (extension != NULL && pos == stream->bytes_left)
+    {
+        bool status;
+        if (extension->type->decode)
+            status = extension->type->decode(stream, extension, tag, wire_type);
+        else
+            status = default_extension_decoder(stream, extension, tag, wire_type);
+
+        if (!status)
+            return false;
+        
+        extension = extension->next;
+    }
+    
+    return true;
+}
+
+/* Initialize message fields to default values, recursively */
+static bool pb_field_set_to_default(pb_field_iter_t *field)
+{
+    pb_type_t type;
+    type = field->type;
+
+    if (PB_LTYPE(type) == PB_LTYPE_EXTENSION)
+    {
+        pb_extension_t *ext = *(pb_extension_t* const *)field->pData;
+        while (ext != NULL)
+        {
+            pb_field_iter_t ext_iter;
+            if (pb_field_iter_begin_extension(&ext_iter, ext))
+            {
+                ext->found = false;
+                if (!pb_message_set_to_defaults(&ext_iter))
+                    return false;
+            }
+            ext = ext->next;
+        }
+    }
+    else if (PB_ATYPE(type) == PB_ATYPE_STATIC)
+    {
+        bool init_data = true;
+        if (PB_HTYPE(type) == PB_HTYPE_OPTIONAL && field->pSize != NULL)
+        {
+            /* Set has_field to false. Still initialize the optional field
+             * itself also. */
+            *(bool*)field->pSize = false;
+        }
+        else if (PB_HTYPE(type) == PB_HTYPE_REPEATED ||
+                 PB_HTYPE(type) == PB_HTYPE_ONEOF)
+        {
+            /* REPEATED: Set array count to 0, no need to initialize contents.
+               ONEOF: Set which_field to 0. */
+            *(pb_size_t*)field->pSize = 0;
+            init_data = false;
+        }
+
+        if (init_data)
+        {
+            if (PB_LTYPE_IS_SUBMSG(field->type) &&
+                (field->submsg_desc->default_value != NULL ||
+                 field->submsg_desc->field_callback != NULL ||
+                 field->submsg_desc->submsg_info[0] != NULL))
+            {
+                /* Initialize submessage to defaults.
+                 * Only needed if it has default values
+                 * or callback/submessage fields. */
+                pb_field_iter_t submsg_iter;
+                if (pb_field_iter_begin(&submsg_iter, field->submsg_desc, field->pData))
+                {
+                    if (!pb_message_set_to_defaults(&submsg_iter))
+                        return false;
+                }
+            }
+            else
+            {
+                /* Initialize to zeros */
+                memset(field->pData, 0, (size_t)field->data_size);
+            }
+        }
+    }
+    else if (PB_ATYPE(type) == PB_ATYPE_POINTER)
+    {
+        /* Initialize the pointer to NULL. */
+        *(void**)field->pField = NULL;
+
+        /* Initialize array count to 0. */
+        if (PB_HTYPE(type) == PB_HTYPE_REPEATED ||
+            PB_HTYPE(type) == PB_HTYPE_ONEOF)
+        {
+            *(pb_size_t*)field->pSize = 0;
+        }
+    }
+    else if (PB_ATYPE(type) == PB_ATYPE_CALLBACK)
+    {
+        /* Don't overwrite callback */
+    }
+
+    return true;
+}
+
+static bool pb_message_set_to_defaults(pb_field_iter_t *iter)
+{
+    pb_istream_t defstream = PB_ISTREAM_EMPTY;
+    uint32_t tag = 0;
+    pb_wire_type_t wire_type = PB_WT_VARINT;
+    bool eof;
+
+    if (iter->descriptor->default_value)
+    {
+        defstream = pb_istream_from_buffer(iter->descriptor->default_value, (size_t)-1);
+        if (!pb_decode_tag(&defstream, &wire_type, &tag, &eof))
+            return false;
+    }
+
+    do
+    {
+        if (!pb_field_set_to_default(iter))
+            return false;
+
+        if (tag != 0 && iter->tag == tag)
+        {
+            /* We have a default value for this field in the defstream */
+            if (!decode_field(&defstream, wire_type, iter))
+                return false;
+            if (!pb_decode_tag(&defstream, &wire_type, &tag, &eof))
+                return false;
+
+            if (iter->pSize)
+                *(bool*)iter->pSize = false;
+        }
+    } while (pb_field_iter_next(iter));
+
+    return true;
+}
+
+/*********************
+ * Decode all fields *
+ *********************/
+
+static bool checkreturn pb_decode_inner(pb_istream_t *stream, const pb_msgdesc_t *fields, void *dest_struct, unsigned int flags)
+{
+    uint32_t extension_range_start = 0;
+    pb_extension_t *extensions = NULL;
+
+    /* 'fixed_count_field' and 'fixed_count_size' track position of a repeated fixed
+     * count field. This can only handle _one_ repeated fixed count field that
+     * is unpacked and unordered among other (non repeated fixed count) fields.
+     */
+    pb_size_t fixed_count_field = PB_SIZE_MAX;
+    pb_size_t fixed_count_size = 0;
+    pb_size_t fixed_count_total_size = 0;
+
+    pb_fields_seen_t fields_seen = {{0, 0}};
+    const uint32_t allbits = ~(uint32_t)0;
+    pb_field_iter_t iter;
+
+    if (pb_field_iter_begin(&iter, fields, dest_struct))
+    {
+        if ((flags & PB_DECODE_NOINIT) == 0)
+        {
+            if (!pb_message_set_to_defaults(&iter))
+                PB_RETURN_ERROR(stream, "failed to set defaults");
+        }
+    }
+
+    while (stream->bytes_left)
+    {
+        uint32_t tag;
+        pb_wire_type_t wire_type;
+        bool eof;
+
+        if (!pb_decode_tag(stream, &wire_type, &tag, &eof))
+        {
+            if (eof)
+                break;
+            else
+                return false;
+        }
+
+        if (tag == 0)
+        {
+          if (flags & PB_DECODE_NULLTERMINATED)
+          {
+            break;
+          }
+          else
+          {
+            PB_RETURN_ERROR(stream, "zero tag");
+          }
+        }
+
+        if (!pb_field_iter_find(&iter, tag) || PB_LTYPE(iter.type) == PB_LTYPE_EXTENSION)
+        {
+            /* No match found, check if it matches an extension. */
+            if (extension_range_start == 0)
+            {
+                if (pb_field_iter_find_extension(&iter))
+                {
+                    extensions = *(pb_extension_t* const *)iter.pData;
+                    extension_range_start = iter.tag;
+                }
+
+                if (!extensions)
+                {
+                    extension_range_start = (uint32_t)-1;
+                }
+            }
+
+            if (tag >= extension_range_start)
+            {
+                size_t pos = stream->bytes_left;
+
+                if (!decode_extension(stream, tag, wire_type, extensions))
+                    return false;
+
+                if (pos != stream->bytes_left)
+                {
+                    /* The field was handled */
+                    continue;
+                }
+            }
+
+            /* No match found, skip data */
+            if (!pb_skip_field(stream, wire_type))
+                return false;
+            continue;
+        }
+
+        /* If a repeated fixed count field was found, get size from
+         * 'fixed_count_field' as there is no counter contained in the struct.
+         */
+        if (PB_HTYPE(iter.type) == PB_HTYPE_REPEATED && iter.pSize == &iter.array_size)
+        {
+            if (fixed_count_field != iter.index) {
+                /* If the new fixed count field does not match the previous one,
+                 * check that the previous one is NULL or that it finished
+                 * receiving all the expected data.
+                 */
+                if (fixed_count_field != PB_SIZE_MAX &&
+                    fixed_count_size != fixed_count_total_size)
+                {
+                    PB_RETURN_ERROR(stream, "wrong size for fixed count field");
+                }
+
+                fixed_count_field = iter.index;
+                fixed_count_size = 0;
+                fixed_count_total_size = iter.array_size;
+            }
+
+            iter.pSize = &fixed_count_size;
+        }
+
+        if (PB_HTYPE(iter.type) == PB_HTYPE_REQUIRED
+            && iter.required_field_index < PB_MAX_REQUIRED_FIELDS)
+        {
+            uint32_t tmp = ((uint32_t)1 << (iter.required_field_index & 31));
+            fields_seen.bitfield[iter.required_field_index >> 5] |= tmp;
+        }
+
+        if (!decode_field(stream, wire_type, &iter))
+            return false;
+    }
+
+    /* Check that all elements of the last decoded fixed count field were present. */
+    if (fixed_count_field != PB_SIZE_MAX &&
+        fixed_count_size != fixed_count_total_size)
+    {
+        PB_RETURN_ERROR(stream, "wrong size for fixed count field");
+    }
+
+    /* Check that all required fields were present. */
+    {
+        pb_size_t req_field_count = iter.descriptor->required_field_count;
+
+        if (req_field_count > 0)
+        {
+            pb_size_t i;
+
+            if (req_field_count > PB_MAX_REQUIRED_FIELDS)
+                req_field_count = PB_MAX_REQUIRED_FIELDS;
+
+            /* Check the whole words */
+            for (i = 0; i < (req_field_count >> 5); i++)
+            {
+                if (fields_seen.bitfield[i] != allbits)
+                    PB_RETURN_ERROR(stream, "missing required field");
+            }
+
+            /* Check the remaining bits (if any) */
+            if ((req_field_count & 31) != 0)
+            {
+                if (fields_seen.bitfield[req_field_count >> 5] !=
+                    (allbits >> (uint_least8_t)(32 - (req_field_count & 31))))
+                {
+                    PB_RETURN_ERROR(stream, "missing required field");
+                }
+            }
+        }
+    }
+
+    return true;
+}
+
+bool checkreturn pb_decode_ex(pb_istream_t *stream, const pb_msgdesc_t *fields, void *dest_struct, unsigned int flags)
+{
+    bool status;
+
+    if ((flags & PB_DECODE_DELIMITED) == 0)
+    {
+      status = pb_decode_inner(stream, fields, dest_struct, flags);
+    }
+    else
+    {
+      pb_istream_t substream;
+      if (!pb_make_string_substream(stream, &substream))
+        return false;
+
+      status = pb_decode_inner(&substream, fields, dest_struct, flags);
+
+      if (!pb_close_string_substream(stream, &substream))
+        return false;
+    }
+    
+#ifdef PB_ENABLE_MALLOC
+    if (!status)
+        pb_release(fields, dest_struct);
+#endif
+    
+    return status;
+}
+
+bool checkreturn pb_decode(pb_istream_t *stream, const pb_msgdesc_t *fields, void *dest_struct)
+{
+    bool status;
+
+    status = pb_decode_inner(stream, fields, dest_struct, 0);
+
+#ifdef PB_ENABLE_MALLOC
+    if (!status)
+        pb_release(fields, dest_struct);
+#endif
+
+    return status;
+}
+
+#ifdef PB_ENABLE_MALLOC
+/* Given an oneof field, if there has already been a field inside this oneof,
+ * release it before overwriting with a different one. */
+static bool pb_release_union_field(pb_istream_t *stream, pb_field_iter_t *field)
+{
+    pb_field_iter_t old_field = *field;
+    pb_size_t old_tag = *(pb_size_t*)field->pSize; /* Previous which_ value */
+    pb_size_t new_tag = field->tag; /* New which_ value */
+
+    if (old_tag == 0)
+        return true; /* Ok, no old data in union */
+
+    if (old_tag == new_tag)
+        return true; /* Ok, old data is of same type => merge */
+
+    /* Release old data. The find can fail if the message struct contains
+     * invalid data. */
+    if (!pb_field_iter_find(&old_field, old_tag))
+        PB_RETURN_ERROR(stream, "invalid union tag");
+
+    pb_release_single_field(&old_field);
+
+    if (PB_ATYPE(field->type) == PB_ATYPE_POINTER)
+    {
+        /* Initialize the pointer to NULL to make sure it is valid
+         * even in case of error return. */
+        *(void**)field->pField = NULL;
+        field->pData = NULL;
+    }
+
+    return true;
+}
+
+static void pb_release_single_field(pb_field_iter_t *field)
+{
+    pb_type_t type;
+    type = field->type;
+
+    if (PB_HTYPE(type) == PB_HTYPE_ONEOF)
+    {
+        if (*(pb_size_t*)field->pSize != field->tag)
+            return; /* This is not the current field in the union */
+    }
+
+    /* Release anything contained inside an extension or submsg.
+     * This has to be done even if the submsg itself is statically
+     * allocated. */
+    if (PB_LTYPE(type) == PB_LTYPE_EXTENSION)
+    {
+        /* Release fields from all extensions in the linked list */
+        pb_extension_t *ext = *(pb_extension_t**)field->pData;
+        while (ext != NULL)
+        {
+            pb_field_iter_t ext_iter;
+            if (pb_field_iter_begin_extension(&ext_iter, ext))
+            {
+                pb_release_single_field(&ext_iter);
+            }
+            ext = ext->next;
+        }
+    }
+    else if (PB_LTYPE_IS_SUBMSG(type) && PB_ATYPE(type) != PB_ATYPE_CALLBACK)
+    {
+        /* Release fields in submessage or submsg array */
+        pb_size_t count = 1;
+        
+        if (PB_ATYPE(type) == PB_ATYPE_POINTER)
+        {
+            field->pData = *(void**)field->pField;
+        }
+        else
+        {
+            field->pData = field->pField;
+        }
+        
+        if (PB_HTYPE(type) == PB_HTYPE_REPEATED)
+        {
+            count = *(pb_size_t*)field->pSize;
+
+            if (PB_ATYPE(type) == PB_ATYPE_STATIC && count > field->array_size)
+            {
+                /* Protect against corrupted _count fields */
+                count = field->array_size;
+            }
+        }
+        
+        if (field->pData)
+        {
+            for (; count > 0; count--)
+            {
+                pb_release(field->submsg_desc, field->pData);
+                field->pData = (char*)field->pData + field->data_size;
+            }
+        }
+    }
+    
+    if (PB_ATYPE(type) == PB_ATYPE_POINTER)
+    {
+        if (PB_HTYPE(type) == PB_HTYPE_REPEATED &&
+            (PB_LTYPE(type) == PB_LTYPE_STRING ||
+             PB_LTYPE(type) == PB_LTYPE_BYTES))
+        {
+            /* Release entries in repeated string or bytes array */
+            void **pItem = *(void***)field->pField;
+            pb_size_t count = *(pb_size_t*)field->pSize;
+            for (; count > 0; count--)
+            {
+                pb_free(*pItem);
+                *pItem++ = NULL;
+            }
+        }
+        
+        if (PB_HTYPE(type) == PB_HTYPE_REPEATED)
+        {
+            /* We are going to release the array, so set the size to 0 */
+            *(pb_size_t*)field->pSize = 0;
+        }
+        
+        /* Release main pointer */
+        pb_free(*(void**)field->pField);
+        *(void**)field->pField = NULL;
+    }
+}
+
+void pb_release(const pb_msgdesc_t *fields, void *dest_struct)
+{
+    pb_field_iter_t iter;
+    
+    if (!dest_struct)
+        return; /* Ignore NULL pointers, similar to free() */
+
+    if (!pb_field_iter_begin(&iter, fields, dest_struct))
+        return; /* Empty message type */
+    
+    do
+    {
+        pb_release_single_field(&iter);
+    } while (pb_field_iter_next(&iter));
+}
+#else
+void pb_release(const pb_msgdesc_t *fields, void *dest_struct)
+{
+    /* Nothing to release without PB_ENABLE_MALLOC. */
+    PB_UNUSED(fields);
+    PB_UNUSED(dest_struct);
+}
+#endif
+
+/* Field decoders */
+
+bool pb_decode_bool(pb_istream_t *stream, bool *dest)
+{
+    uint32_t value;
+    if (!pb_decode_varint32(stream, &value))
+        return false;
+
+    *(bool*)dest = (value != 0);
+    return true;
+}
+
+bool pb_decode_svarint(pb_istream_t *stream, pb_int64_t *dest)
+{
+    pb_uint64_t value;
+    if (!pb_decode_varint(stream, &value))
+        return false;
+    
+    if (value & 1)
+        *dest = (pb_int64_t)(~(value >> 1));
+    else
+        *dest = (pb_int64_t)(value >> 1);
+    
+    return true;
+}
+
+bool pb_decode_fixed32(pb_istream_t *stream, void *dest)
+{
+    union {
+        uint32_t fixed32;
+        pb_byte_t bytes[4];
+    } u;
+
+    if (!pb_read(stream, u.bytes, 4))
+        return false;
+
+#if defined(PB_LITTLE_ENDIAN_8BIT) && PB_LITTLE_ENDIAN_8BIT == 1
+    /* fast path - if we know that we're on little endian, assign directly */
+    *(uint32_t*)dest = u.fixed32;
+#else
+    *(uint32_t*)dest = ((uint32_t)u.bytes[0] << 0) |
+                       ((uint32_t)u.bytes[1] << 8) |
+                       ((uint32_t)u.bytes[2] << 16) |
+                       ((uint32_t)u.bytes[3] << 24);
+#endif
+    return true;
+}
+
+#ifndef PB_WITHOUT_64BIT
+bool pb_decode_fixed64(pb_istream_t *stream, void *dest)
+{
+    union {
+        uint64_t fixed64;
+        pb_byte_t bytes[8];
+    } u;
+
+    if (!pb_read(stream, u.bytes, 8))
+        return false;
+
+#if defined(PB_LITTLE_ENDIAN_8BIT) && PB_LITTLE_ENDIAN_8BIT == 1
+    /* fast path - if we know that we're on little endian, assign directly */
+    *(uint64_t*)dest = u.fixed64;
+#else
+    *(uint64_t*)dest = ((uint64_t)u.bytes[0] << 0) |
+                       ((uint64_t)u.bytes[1] << 8) |
+                       ((uint64_t)u.bytes[2] << 16) |
+                       ((uint64_t)u.bytes[3] << 24) |
+                       ((uint64_t)u.bytes[4] << 32) |
+                       ((uint64_t)u.bytes[5] << 40) |
+                       ((uint64_t)u.bytes[6] << 48) |
+                       ((uint64_t)u.bytes[7] << 56);
+#endif
+    return true;
+}
+#endif
+
+static bool checkreturn pb_dec_bool(pb_istream_t *stream, const pb_field_iter_t *field)
+{
+    return pb_decode_bool(stream, (bool*)field->pData);
+}
+
+static bool checkreturn pb_dec_varint(pb_istream_t *stream, const pb_field_iter_t *field)
+{
+    if (PB_LTYPE(field->type) == PB_LTYPE_UVARINT)
+    {
+        pb_uint64_t value, clamped;
+        if (!pb_decode_varint(stream, &value))
+            return false;
+
+        /* Cast to the proper field size, while checking for overflows */
+        if (field->data_size == sizeof(pb_uint64_t))
+            clamped = *(pb_uint64_t*)field->pData = value;
+        else if (field->data_size == sizeof(uint32_t))
+            clamped = *(uint32_t*)field->pData = (uint32_t)value;
+        else if (field->data_size == sizeof(uint_least16_t))
+            clamped = *(uint_least16_t*)field->pData = (uint_least16_t)value;
+        else if (field->data_size == sizeof(uint_least8_t))
+            clamped = *(uint_least8_t*)field->pData = (uint_least8_t)value;
+        else
+            PB_RETURN_ERROR(stream, "invalid data_size");
+
+        if (clamped != value)
+            PB_RETURN_ERROR(stream, "integer too large");
+
+        return true;
+    }
+    else
+    {
+        pb_uint64_t value;
+        pb_int64_t svalue;
+        pb_int64_t clamped;
+
+        if (PB_LTYPE(field->type) == PB_LTYPE_SVARINT)
+        {
+            if (!pb_decode_svarint(stream, &svalue))
+                return false;
+        }
+        else
+        {
+            if (!pb_decode_varint(stream, &value))
+                return false;
+
+            /* See issue 97: Google's C++ protobuf allows negative varint values to
+            * be cast as int32_t, instead of the int64_t that should be used when
+            * encoding. Nanopb versions before 0.2.5 had a bug in encoding. In order to
+            * not break decoding of such messages, we cast <=32 bit fields to
+            * int32_t first to get the sign correct.
+            */
+            if (field->data_size == sizeof(pb_int64_t))
+                svalue = (pb_int64_t)value;
+            else
+                svalue = (int32_t)value;
+        }
+
+        /* Cast to the proper field size, while checking for overflows */
+        if (field->data_size == sizeof(pb_int64_t))
+            clamped = *(pb_int64_t*)field->pData = svalue;
+        else if (field->data_size == sizeof(int32_t))
+            clamped = *(int32_t*)field->pData = (int32_t)svalue;
+        else if (field->data_size == sizeof(int_least16_t))
+            clamped = *(int_least16_t*)field->pData = (int_least16_t)svalue;
+        else if (field->data_size == sizeof(int_least8_t))
+            clamped = *(int_least8_t*)field->pData = (int_least8_t)svalue;
+        else
+            PB_RETURN_ERROR(stream, "invalid data_size");
+
+        if (clamped != svalue)
+            PB_RETURN_ERROR(stream, "integer too large");
+
+        return true;
+    }
+}
+
+static bool checkreturn pb_dec_bytes(pb_istream_t *stream, const pb_field_iter_t *field)
+{
+    uint32_t size;
+    size_t alloc_size;
+    pb_bytes_array_t *dest;
+    
+    if (!pb_decode_varint32(stream, &size))
+        return false;
+    
+    if (size > PB_SIZE_MAX)
+        PB_RETURN_ERROR(stream, "bytes overflow");
+    
+    alloc_size = PB_BYTES_ARRAY_T_ALLOCSIZE(size);
+    if (size > alloc_size)
+        PB_RETURN_ERROR(stream, "size too large");
+    
+    if (PB_ATYPE(field->type) == PB_ATYPE_POINTER)
+    {
+#ifndef PB_ENABLE_MALLOC
+        PB_RETURN_ERROR(stream, "no malloc support");
+#else
+        if (stream->bytes_left < size)
+            PB_RETURN_ERROR(stream, "end-of-stream");
+
+        if (!allocate_field(stream, field->pData, alloc_size, 1))
+            return false;
+        dest = *(pb_bytes_array_t**)field->pData;
+#endif
+    }
+    else
+    {
+        if (alloc_size > field->data_size)
+            PB_RETURN_ERROR(stream, "bytes overflow");
+        dest = (pb_bytes_array_t*)field->pData;
+    }
+
+    dest->size = (pb_size_t)size;
+    return pb_read(stream, dest->bytes, (size_t)size);
+}
+
+static bool checkreturn pb_dec_string(pb_istream_t *stream, const pb_field_iter_t *field)
+{
+    uint32_t size;
+    size_t alloc_size;
+    pb_byte_t *dest = (pb_byte_t*)field->pData;
+
+    if (!pb_decode_varint32(stream, &size))
+        return false;
+
+    if (size == (uint32_t)-1)
+        PB_RETURN_ERROR(stream, "size too large");
+
+    /* Space for null terminator */
+    alloc_size = (size_t)(size + 1);
+
+    if (alloc_size < size)
+        PB_RETURN_ERROR(stream, "size too large");
+
+    if (PB_ATYPE(field->type) == PB_ATYPE_POINTER)
+    {
+#ifndef PB_ENABLE_MALLOC
+        PB_RETURN_ERROR(stream, "no malloc support");
+#else
+        if (stream->bytes_left < size)
+            PB_RETURN_ERROR(stream, "end-of-stream");
+
+        if (!allocate_field(stream, field->pData, alloc_size, 1))
+            return false;
+        dest = *(pb_byte_t**)field->pData;
+#endif
+    }
+    else
+    {
+        if (alloc_size > field->data_size)
+            PB_RETURN_ERROR(stream, "string overflow");
+    }
+    
+    dest[size] = 0;
+
+    if (!pb_read(stream, dest, (size_t)size))
+        return false;
+
+#ifdef PB_VALIDATE_UTF8
+    if (!pb_validate_utf8((const char*)dest))
+        PB_RETURN_ERROR(stream, "invalid utf8");
+#endif
+
+    return true;
+}
+
+static bool checkreturn pb_dec_submessage(pb_istream_t *stream, const pb_field_iter_t *field)
+{
+    bool status = true;
+    bool submsg_consumed = false;
+    pb_istream_t substream;
+
+    if (!pb_make_string_substream(stream, &substream))
+        return false;
+    
+    if (field->submsg_desc == NULL)
+        PB_RETURN_ERROR(stream, "invalid field descriptor");
+    
+    /* Submessages can have a separate message-level callback that is called
+     * before decoding the message. Typically it is used to set callback fields
+     * inside oneofs. */
+    if (PB_LTYPE(field->type) == PB_LTYPE_SUBMSG_W_CB && field->pSize != NULL)
+    {
+        /* Message callback is stored right before pSize. */
+        pb_callback_t *callback = (pb_callback_t*)field->pSize - 1;
+        if (callback->funcs.decode)
+        {
+            status = callback->funcs.decode(&substream, field, &callback->arg);
+
+            if (substream.bytes_left == 0)
+            {
+                submsg_consumed = true;
+            }
+        }
+    }
+
+    /* Now decode the submessage contents */
+    if (status && !submsg_consumed)
+    {
+        unsigned int flags = 0;
+
+        /* Static required/optional fields are already initialized by top-level
+         * pb_decode(), no need to initialize them again. */
+        if (PB_ATYPE(field->type) == PB_ATYPE_STATIC &&
+            PB_HTYPE(field->type) != PB_HTYPE_REPEATED)
+        {
+            flags = PB_DECODE_NOINIT;
+        }
+
+        status = pb_decode_inner(&substream, field->submsg_desc, field->pData, flags);
+    }
+    
+    if (!pb_close_string_substream(stream, &substream))
+        return false;
+
+    return status;
+}
+
+static bool checkreturn pb_dec_fixed_length_bytes(pb_istream_t *stream, const pb_field_iter_t *field)
+{
+    uint32_t size;
+
+    if (!pb_decode_varint32(stream, &size))
+        return false;
+
+    if (size > PB_SIZE_MAX)
+        PB_RETURN_ERROR(stream, "bytes overflow");
+
+    if (size == 0)
+    {
+        /* As a special case, treat empty bytes string as all zeros for fixed_length_bytes. */
+        memset(field->pData, 0, (size_t)field->data_size);
+        return true;
+    }
+
+    if (size != field->data_size)
+        PB_RETURN_ERROR(stream, "incorrect fixed length bytes size");
+
+    return pb_read(stream, (pb_byte_t*)field->pData, (size_t)field->data_size);
+}
+
+#ifdef PB_CONVERT_DOUBLE_FLOAT
+bool pb_decode_double_as_float(pb_istream_t *stream, float *dest)
+{
+    uint_least8_t sign;
+    int exponent;
+    uint32_t mantissa;
+    uint64_t value;
+    union { float f; uint32_t i; } out;
+
+    if (!pb_decode_fixed64(stream, &value))
+        return false;
+
+    /* Decompose input value */
+    sign = (uint_least8_t)((value >> 63) & 1);
+    exponent = (int)((value >> 52) & 0x7FF) - 1023;
+    mantissa = (value >> 28) & 0xFFFFFF; /* Highest 24 bits */
+
+    /* Figure if value is in range representable by floats. */
+    if (exponent == 1024)
+    {
+        /* Special value */
+        exponent = 128;
+        mantissa >>= 1;
+    }
+    else
+    {
+        if (exponent > 127)
+        {
+            /* Too large, convert to infinity */
+            exponent = 128;
+            mantissa = 0;
+        }
+        else if (exponent < -150)
+        {
+            /* Too small, convert to zero */
+            exponent = -127;
+            mantissa = 0;
+        }
+        else if (exponent < -126)
+        {
+            /* Denormalized */
+            mantissa |= 0x1000000;
+            mantissa >>= (-126 - exponent);
+            exponent = -127;
+        }
+
+        /* Round off mantissa */
+        mantissa = (mantissa + 1) >> 1;
+
+        /* Check if mantissa went over 2.0 */
+        if (mantissa & 0x800000)
+        {
+            exponent += 1;
+            mantissa &= 0x7FFFFF;
+            mantissa >>= 1;
+        }
+    }
+
+    /* Combine fields */
+    out.i = mantissa;
+    out.i |= (uint32_t)(exponent + 127) << 23;
+    out.i |= (uint32_t)sign << 31;
+
+    *dest = out.f;
+    return true;
+}
+#endif
diff --git a/src/network/pb_decode.h b/src/network/pb_decode.h
new file mode 100644
index 000000000..ae1d3ccf2
--- /dev/null
+++ b/src/network/pb_decode.h
@@ -0,0 +1,193 @@
+/* pb_decode.h: Functions to decode protocol buffers. Depends on pb_decode.c.
+ * The main function is pb_decode. You also need an input stream, and the
+ * field descriptions created by nanopb_generator.py.
+ */
+
+#ifndef PB_DECODE_H_INCLUDED
+#define PB_DECODE_H_INCLUDED
+
+#include "pb.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Structure for defining custom input streams. You will need to provide
+ * a callback function to read the bytes from your storage, which can be
+ * for example a file or a network socket.
+ * 
+ * The callback must conform to these rules:
+ *
+ * 1) Return false on IO errors. This will cause decoding to abort.
+ * 2) You can use state to store your own data (e.g. buffer pointer),
+ *    and rely on pb_read to verify that no-body reads past bytes_left.
+ * 3) Your callback may be used with substreams, in which case bytes_left
+ *    is different than from the main stream. Don't use bytes_left to compute
+ *    any pointers.
+ */
+struct pb_istream_s
+{
+#ifdef PB_BUFFER_ONLY
+    /* Callback pointer is not used in buffer-only configuration.
+     * Having an int pointer here allows binary compatibility but
+     * gives an error if someone tries to assign callback function.
+     */
+    int *callback;
+#else
+    bool (*callback)(pb_istream_t *stream, pb_byte_t *buf, size_t count);
+#endif
+
+    void *state; /* Free field for use by callback implementation */
+    size_t bytes_left;
+    
+#ifndef PB_NO_ERRMSG
+    const char *errmsg;
+#endif
+};
+
+#ifndef PB_NO_ERRMSG
+#define PB_ISTREAM_EMPTY {0,0,0,0}
+#else
+#define PB_ISTREAM_EMPTY {0,0,0}
+#endif
+
+/***************************
+ * Main decoding functions *
+ ***************************/
+ 
+/* Decode a single protocol buffers message from input stream into a C structure.
+ * Returns true on success, false on any failure.
+ * The actual struct pointed to by dest must match the description in fields.
+ * Callback fields of the destination structure must be initialized by caller.
+ * All other fields will be initialized by this function.
+ *
+ * Example usage:
+ *    MyMessage msg = {};
+ *    uint8_t buffer[64];
+ *    pb_istream_t stream;
+ *    
+ *    // ... read some data into buffer ...
+ *
+ *    stream = pb_istream_from_buffer(buffer, count);
+ *    pb_decode(&stream, MyMessage_fields, &msg);
+ */
+bool pb_decode(pb_istream_t *stream, const pb_msgdesc_t *fields, void *dest_struct);
+
+/* Extended version of pb_decode, with several options to control
+ * the decoding process:
+ *
+ * PB_DECODE_NOINIT:         Do not initialize the fields to default values.
+ *                           This is slightly faster if you do not need the default
+ *                           values and instead initialize the structure to 0 using
+ *                           e.g. memset(). This can also be used for merging two
+ *                           messages, i.e. combine already existing data with new
+ *                           values.
+ *
+ * PB_DECODE_DELIMITED:      Input message starts with the message size as varint.
+ *                           Corresponds to parseDelimitedFrom() in Google's
+ *                           protobuf API.
+ *
+ * PB_DECODE_NULLTERMINATED: Stop reading when field tag is read as 0. This allows
+ *                           reading null terminated messages.
+ *                           NOTE: Until nanopb-0.4.0, pb_decode() also allows
+ *                           null-termination. This behaviour is not supported in
+ *                           most other protobuf implementations, so PB_DECODE_DELIMITED
+ *                           is a better option for compatibility.
+ *
+ * Multiple flags can be combined with bitwise or (| operator)
+ */
+#define PB_DECODE_NOINIT          0x01U
+#define PB_DECODE_DELIMITED       0x02U
+#define PB_DECODE_NULLTERMINATED  0x04U
+bool pb_decode_ex(pb_istream_t *stream, const pb_msgdesc_t *fields, void *dest_struct, unsigned int flags);
+
+/* Defines for backwards compatibility with code written before nanopb-0.4.0 */
+#define pb_decode_noinit(s,f,d) pb_decode_ex(s,f,d, PB_DECODE_NOINIT)
+#define pb_decode_delimited(s,f,d) pb_decode_ex(s,f,d, PB_DECODE_DELIMITED)
+#define pb_decode_delimited_noinit(s,f,d) pb_decode_ex(s,f,d, PB_DECODE_DELIMITED | PB_DECODE_NOINIT)
+#define pb_decode_nullterminated(s,f,d) pb_decode_ex(s,f,d, PB_DECODE_NULLTERMINATED)
+
+/* Release any allocated pointer fields. If you use dynamic allocation, you should
+ * call this for any successfully decoded message when you are done with it. If
+ * pb_decode() returns with an error, the message is already released.
+ */
+void pb_release(const pb_msgdesc_t *fields, void *dest_struct);
+
+/**************************************
+ * Functions for manipulating streams *
+ **************************************/
+
+/* Create an input stream for reading from a memory buffer.
+ *
+ * msglen should be the actual length of the message, not the full size of
+ * allocated buffer.
+ *
+ * Alternatively, you can use a custom stream that reads directly from e.g.
+ * a file or a network socket.
+ */
+pb_istream_t pb_istream_from_buffer(const pb_byte_t *buf, size_t msglen);
+
+/* Function to read from a pb_istream_t. You can use this if you need to
+ * read some custom header data, or to read data in field callbacks.
+ */
+bool pb_read(pb_istream_t *stream, pb_byte_t *buf, size_t count);
+
+
+/************************************************
+ * Helper functions for writing field callbacks *
+ ************************************************/
+
+/* Decode the tag for the next field in the stream. Gives the wire type and
+ * field tag. At end of the message, returns false and sets eof to true. */
+bool pb_decode_tag(pb_istream_t *stream, pb_wire_type_t *wire_type, uint32_t *tag, bool *eof);
+
+/* Skip the field payload data, given the wire type. */
+bool pb_skip_field(pb_istream_t *stream, pb_wire_type_t wire_type);
+
+/* Decode an integer in the varint format. This works for enum, int32,
+ * int64, uint32 and uint64 field types. */
+#ifndef PB_WITHOUT_64BIT
+bool pb_decode_varint(pb_istream_t *stream, uint64_t *dest);
+#else
+#define pb_decode_varint pb_decode_varint32
+#endif
+
+/* Decode an integer in the varint format. This works for enum, int32,
+ * and uint32 field types. */
+bool pb_decode_varint32(pb_istream_t *stream, uint32_t *dest);
+
+/* Decode a bool value in varint format. */
+bool pb_decode_bool(pb_istream_t *stream, bool *dest);
+
+/* Decode an integer in the zig-zagged svarint format. This works for sint32
+ * and sint64. */
+#ifndef PB_WITHOUT_64BIT
+bool pb_decode_svarint(pb_istream_t *stream, int64_t *dest);
+#else
+bool pb_decode_svarint(pb_istream_t *stream, int32_t *dest);
+#endif
+
+/* Decode a fixed32, sfixed32 or float value. You need to pass a pointer to
+ * a 4-byte wide C variable. */
+bool pb_decode_fixed32(pb_istream_t *stream, void *dest);
+
+#ifndef PB_WITHOUT_64BIT
+/* Decode a fixed64, sfixed64 or double value. You need to pass a pointer to
+ * a 8-byte wide C variable. */
+bool pb_decode_fixed64(pb_istream_t *stream, void *dest);
+#endif
+
+#ifdef PB_CONVERT_DOUBLE_FLOAT
+/* Decode a double value into float variable. */
+bool pb_decode_double_as_float(pb_istream_t *stream, float *dest);
+#endif
+
+/* Make a limited-length substream for reading a PB_WT_STRING field. */
+bool pb_make_string_substream(pb_istream_t *stream, pb_istream_t *substream);
+bool pb_close_string_substream(pb_istream_t *stream, pb_istream_t *substream);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif
diff --git a/src/network/pb_encode.c b/src/network/pb_encode.c
new file mode 100644
index 000000000..7f5620125
--- /dev/null
+++ b/src/network/pb_encode.c
@@ -0,0 +1,1000 @@
+/* pb_encode.c -- encode a protobuf using minimal resources
+ *
+ * 2011 Petteri Aimonen <jpa@kapsi.fi>
+ */
+
+#include "pb.h"
+#include "pb_encode.h"
+#include "pb_common.h"
+
+/* Use the GCC warn_unused_result attribute to check that all return values
+ * are propagated correctly. On other compilers and gcc before 3.4.0 just
+ * ignore the annotation.
+ */
+#if !defined(__GNUC__) || ( __GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
+    #define checkreturn
+#else
+    #define checkreturn __attribute__((warn_unused_result))
+#endif
+
+/**************************************
+ * Declarations internal to this file *
+ **************************************/
+static bool checkreturn buf_write(pb_ostream_t *stream, const pb_byte_t *buf, size_t count);
+static bool checkreturn encode_array(pb_ostream_t *stream, pb_field_iter_t *field);
+static bool checkreturn pb_check_proto3_default_value(const pb_field_iter_t *field);
+static bool checkreturn encode_basic_field(pb_ostream_t *stream, const pb_field_iter_t *field);
+static bool checkreturn encode_callback_field(pb_ostream_t *stream, const pb_field_iter_t *field);
+static bool checkreturn encode_field(pb_ostream_t *stream, pb_field_iter_t *field);
+static bool checkreturn encode_extension_field(pb_ostream_t *stream, const pb_field_iter_t *field);
+static bool checkreturn default_extension_encoder(pb_ostream_t *stream, const pb_extension_t *extension);
+static bool checkreturn pb_encode_varint_32(pb_ostream_t *stream, uint32_t low, uint32_t high);
+static bool checkreturn pb_enc_bool(pb_ostream_t *stream, const pb_field_iter_t *field);
+static bool checkreturn pb_enc_varint(pb_ostream_t *stream, const pb_field_iter_t *field);
+static bool checkreturn pb_enc_fixed(pb_ostream_t *stream, const pb_field_iter_t *field);
+static bool checkreturn pb_enc_bytes(pb_ostream_t *stream, const pb_field_iter_t *field);
+static bool checkreturn pb_enc_string(pb_ostream_t *stream, const pb_field_iter_t *field);
+static bool checkreturn pb_enc_submessage(pb_ostream_t *stream, const pb_field_iter_t *field);
+static bool checkreturn pb_enc_fixed_length_bytes(pb_ostream_t *stream, const pb_field_iter_t *field);
+
+#ifdef PB_WITHOUT_64BIT
+#define pb_int64_t int32_t
+#define pb_uint64_t uint32_t
+#else
+#define pb_int64_t int64_t
+#define pb_uint64_t uint64_t
+#endif
+
+/*******************************
+ * pb_ostream_t implementation *
+ *******************************/
+
+static bool checkreturn buf_write(pb_ostream_t *stream, const pb_byte_t *buf, size_t count)
+{
+    pb_byte_t *dest = (pb_byte_t*)stream->state;
+    stream->state = dest + count;
+    
+    memcpy(dest, buf, count * sizeof(pb_byte_t));
+    
+    return true;
+}
+
+pb_ostream_t pb_ostream_from_buffer(pb_byte_t *buf, size_t bufsize)
+{
+    pb_ostream_t stream;
+#ifdef PB_BUFFER_ONLY
+    /* In PB_BUFFER_ONLY configuration the callback pointer is just int*.
+     * NULL pointer marks a sizing field, so put a non-NULL value to mark a buffer stream.
+     */
+    static const int marker = 0;
+    stream.callback = &marker;
+#else
+    stream.callback = &buf_write;
+#endif
+    stream.state = buf;
+    stream.max_size = bufsize;
+    stream.bytes_written = 0;
+#ifndef PB_NO_ERRMSG
+    stream.errmsg = NULL;
+#endif
+    return stream;
+}
+
+bool checkreturn pb_write(pb_ostream_t *stream, const pb_byte_t *buf, size_t count)
+{
+    if (count > 0 && stream->callback != NULL)
+    {
+        if (stream->bytes_written + count < stream->bytes_written ||
+            stream->bytes_written + count > stream->max_size)
+        {
+            PB_RETURN_ERROR(stream, "stream full");
+        }
+
+#ifdef PB_BUFFER_ONLY
+        if (!buf_write(stream, buf, count))
+            PB_RETURN_ERROR(stream, "io error");
+#else        
+        if (!stream->callback(stream, buf, count))
+            PB_RETURN_ERROR(stream, "io error");
+#endif
+    }
+    
+    stream->bytes_written += count;
+    return true;
+}
+
+/*************************
+ * Encode a single field *
+ *************************/
+
+/* Read a bool value without causing undefined behavior even if the value
+ * is invalid. See issue #434 and
+ * https://stackoverflow.com/questions/27661768/weird-results-for-conditional
+ */
+static bool safe_read_bool(const void *pSize)
+{
+    const char *p = (const char *)pSize;
+    size_t i;
+    for (i = 0; i < sizeof(bool); i++)
+    {
+        if (p[i] != 0)
+            return true;
+    }
+    return false;
+}
+
+/* Encode a static array. Handles the size calculations and possible packing. */
+static bool checkreturn encode_array(pb_ostream_t *stream, pb_field_iter_t *field)
+{
+    pb_size_t i;
+    pb_size_t count;
+#ifndef PB_ENCODE_ARRAYS_UNPACKED
+    size_t size;
+#endif
+
+    count = *(pb_size_t*)field->pSize;
+
+    if (count == 0)
+        return true;
+
+    if (PB_ATYPE(field->type) != PB_ATYPE_POINTER && count > field->array_size)
+        PB_RETURN_ERROR(stream, "array max size exceeded");
+    
+#ifndef PB_ENCODE_ARRAYS_UNPACKED
+    /* We always pack arrays if the datatype allows it. */
+    if (PB_LTYPE(field->type) <= PB_LTYPE_LAST_PACKABLE)
+    {
+        if (!pb_encode_tag(stream, PB_WT_STRING, field->tag))
+            return false;
+        
+        /* Determine the total size of packed array. */
+        if (PB_LTYPE(field->type) == PB_LTYPE_FIXED32)
+        {
+            size = 4 * (size_t)count;
+        }
+        else if (PB_LTYPE(field->type) == PB_LTYPE_FIXED64)
+        {
+            size = 8 * (size_t)count;
+        }
+        else
+        { 
+            pb_ostream_t sizestream = PB_OSTREAM_SIZING;
+            void *pData_orig = field->pData;
+            for (i = 0; i < count; i++)
+            {
+                if (!pb_enc_varint(&sizestream, field))
+                    PB_RETURN_ERROR(stream, PB_GET_ERROR(&sizestream));
+                field->pData = (char*)field->pData + field->data_size;
+            }
+            field->pData = pData_orig;
+            size = sizestream.bytes_written;
+        }
+        
+        if (!pb_encode_varint(stream, (pb_uint64_t)size))
+            return false;
+        
+        if (stream->callback == NULL)
+            return pb_write(stream, NULL, size); /* Just sizing.. */
+        
+        /* Write the data */
+        for (i = 0; i < count; i++)
+        {
+            if (PB_LTYPE(field->type) == PB_LTYPE_FIXED32 || PB_LTYPE(field->type) == PB_LTYPE_FIXED64)
+            {
+                if (!pb_enc_fixed(stream, field))
+                    return false;
+            }
+            else
+            {
+                if (!pb_enc_varint(stream, field))
+                    return false;
+            }
+
+            field->pData = (char*)field->pData + field->data_size;
+        }
+    }
+    else /* Unpacked fields */
+#endif
+    {
+        for (i = 0; i < count; i++)
+        {
+            /* Normally the data is stored directly in the array entries, but
+             * for pointer-type string and bytes fields, the array entries are
+             * actually pointers themselves also. So we have to dereference once
+             * more to get to the actual data. */
+            if (PB_ATYPE(field->type) == PB_ATYPE_POINTER &&
+                (PB_LTYPE(field->type) == PB_LTYPE_STRING ||
+                 PB_LTYPE(field->type) == PB_LTYPE_BYTES))
+            {
+                bool status;
+                void *pData_orig = field->pData;
+                field->pData = *(void* const*)field->pData;
+
+                if (!field->pData)
+                {
+                    /* Null pointer in array is treated as empty string / bytes */
+                    status = pb_encode_tag_for_field(stream, field) &&
+                             pb_encode_varint(stream, 0);
+                }
+                else
+                {
+                    status = encode_basic_field(stream, field);
+                }
+
+                field->pData = pData_orig;
+
+                if (!status)
+                    return false;
+            }
+            else
+            {
+                if (!encode_basic_field(stream, field))
+                    return false;
+            }
+            field->pData = (char*)field->pData + field->data_size;
+        }
+    }
+    
+    return true;
+}
+
+/* In proto3, all fields are optional and are only encoded if their value is "non-zero".
+ * This function implements the check for the zero value. */
+static bool checkreturn pb_check_proto3_default_value(const pb_field_iter_t *field)
+{
+    pb_type_t type = field->type;
+
+    if (PB_ATYPE(type) == PB_ATYPE_STATIC)
+    {
+        if (PB_HTYPE(type) == PB_HTYPE_REQUIRED)
+        {
+            /* Required proto2 fields inside proto3 submessage, pretty rare case */
+            return false;
+        }
+        else if (PB_HTYPE(type) == PB_HTYPE_REPEATED)
+        {
+            /* Repeated fields inside proto3 submessage: present if count != 0 */
+            return *(const pb_size_t*)field->pSize == 0;
+        }
+        else if (PB_HTYPE(type) == PB_HTYPE_ONEOF)
+        {
+            /* Oneof fields */
+            return *(const pb_size_t*)field->pSize == 0;
+        }
+        else if (PB_HTYPE(type) == PB_HTYPE_OPTIONAL && field->pSize != NULL)
+        {
+            /* Proto2 optional fields inside proto3 message, or proto3
+             * submessage fields. */
+            return safe_read_bool(field->pSize) == false;
+        }
+        else if (field->descriptor->default_value)
+        {
+            /* Proto3 messages do not have default values, but proto2 messages
+             * can contain optional fields without has_fields (generator option 'proto3').
+             * In this case they must always be encoded, to make sure that the
+             * non-zero default value is overwritten.
+             */
+            return false;
+        }
+
+        /* Rest is proto3 singular fields */
+        if (PB_LTYPE(type) <= PB_LTYPE_LAST_PACKABLE)
+        {
+            /* Simple integer / float fields */
+            pb_size_t i;
+            const char *p = (const char*)field->pData;
+            for (i = 0; i < field->data_size; i++)
+            {
+                if (p[i] != 0)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+        else if (PB_LTYPE(type) == PB_LTYPE_BYTES)
+        {
+            const pb_bytes_array_t *bytes = (const pb_bytes_array_t*)field->pData;
+            return bytes->size == 0;
+        }
+        else if (PB_LTYPE(type) == PB_LTYPE_STRING)
+        {
+            return *(const char*)field->pData == '\0';
+        }
+        else if (PB_LTYPE(type) == PB_LTYPE_FIXED_LENGTH_BYTES)
+        {
+            /* Fixed length bytes is only empty if its length is fixed
+             * as 0. Which would be pretty strange, but we can check
+             * it anyway. */
+            return field->data_size == 0;
+        }
+        else if (PB_LTYPE_IS_SUBMSG(type))
+        {
+            /* Check all fields in the submessage to find if any of them
+             * are non-zero. The comparison cannot be done byte-per-byte
+             * because the C struct may contain padding bytes that must
+             * be skipped. Note that usually proto3 submessages have
+             * a separate has_field that is checked earlier in this if.
+             */
+            pb_field_iter_t iter;
+            if (pb_field_iter_begin(&iter, field->submsg_desc, field->pData))
+            {
+                do
+                {
+                    if (!pb_check_proto3_default_value(&iter))
+                    {
+                        return false;
+                    }
+                } while (pb_field_iter_next(&iter));
+            }
+            return true;
+        }
+    }
+    else if (PB_ATYPE(type) == PB_ATYPE_POINTER)
+    {
+        return field->pData == NULL;
+    }
+    else if (PB_ATYPE(type) == PB_ATYPE_CALLBACK)
+    {
+        if (PB_LTYPE(type) == PB_LTYPE_EXTENSION)
+        {
+            const pb_extension_t *extension = *(const pb_extension_t* const *)field->pData;
+            return extension == NULL;
+        }
+        else if (field->descriptor->field_callback == pb_default_field_callback)
+        {
+            pb_callback_t *pCallback = (pb_callback_t*)field->pData;
+            return pCallback->funcs.encode == NULL;
+        }
+        else
+        {
+            return field->descriptor->field_callback == NULL;
+        }
+    }
+
+    return false; /* Not typically reached, safe default for weird special cases. */
+}
+
+/* Encode a field with static or pointer allocation, i.e. one whose data
+ * is available to the encoder directly. */
+static bool checkreturn encode_basic_field(pb_ostream_t *stream, const pb_field_iter_t *field)
+{
+    if (!field->pData)
+    {
+        /* Missing pointer field */
+        return true;
+    }
+
+    if (!pb_encode_tag_for_field(stream, field))
+        return false;
+
+    switch (PB_LTYPE(field->type))
+    {
+        case PB_LTYPE_BOOL:
+            return pb_enc_bool(stream, field);
+
+        case PB_LTYPE_VARINT:
+        case PB_LTYPE_UVARINT:
+        case PB_LTYPE_SVARINT:
+            return pb_enc_varint(stream, field);
+
+        case PB_LTYPE_FIXED32:
+        case PB_LTYPE_FIXED64:
+            return pb_enc_fixed(stream, field);
+
+        case PB_LTYPE_BYTES:
+            return pb_enc_bytes(stream, field);
+
+        case PB_LTYPE_STRING:
+            return pb_enc_string(stream, field);
+
+        case PB_LTYPE_SUBMESSAGE:
+        case PB_LTYPE_SUBMSG_W_CB:
+            return pb_enc_submessage(stream, field);
+
+        case PB_LTYPE_FIXED_LENGTH_BYTES:
+            return pb_enc_fixed_length_bytes(stream, field);
+
+        default:
+            PB_RETURN_ERROR(stream, "invalid field type");
+    }
+}
+
+/* Encode a field with callback semantics. This means that a user function is
+ * called to provide and encode the actual data. */
+static bool checkreturn encode_callback_field(pb_ostream_t *stream, const pb_field_iter_t *field)
+{
+    if (field->descriptor->field_callback != NULL)
+    {
+        if (!field->descriptor->field_callback(NULL, stream, field))
+            PB_RETURN_ERROR(stream, "callback error");
+    }
+    return true;
+}
+
+/* Encode a single field of any callback, pointer or static type. */
+static bool checkreturn encode_field(pb_ostream_t *stream, pb_field_iter_t *field)
+{
+    /* Check field presence */
+    if (PB_HTYPE(field->type) == PB_HTYPE_ONEOF)
+    {
+        if (*(const pb_size_t*)field->pSize != field->tag)
+        {
+            /* Different type oneof field */
+            return true;
+        }
+    }
+    else if (PB_HTYPE(field->type) == PB_HTYPE_OPTIONAL)
+    {
+        if (field->pSize)
+        {
+            if (safe_read_bool(field->pSize) == false)
+            {
+                /* Missing optional field */
+                return true;
+            }
+        }
+        else if (PB_ATYPE(field->type) == PB_ATYPE_STATIC)
+        {
+            /* Proto3 singular field */
+            if (pb_check_proto3_default_value(field))
+                return true;
+        }
+    }
+
+    if (!field->pData)
+    {
+        if (PB_HTYPE(field->type) == PB_HTYPE_REQUIRED)
+            PB_RETURN_ERROR(stream, "missing required field");
+
+        /* Pointer field set to NULL */
+        return true;
+    }
+
+    /* Then encode field contents */
+    if (PB_ATYPE(field->type) == PB_ATYPE_CALLBACK)
+    {
+        return encode_callback_field(stream, field);
+    }
+    else if (PB_HTYPE(field->type) == PB_HTYPE_REPEATED)
+    {
+        return encode_array(stream, field);
+    }
+    else
+    {
+        return encode_basic_field(stream, field);
+    }
+}
+
+/* Default handler for extension fields. Expects to have a pb_msgdesc_t
+ * pointer in the extension->type->arg field, pointing to a message with
+ * only one field in it.  */
+static bool checkreturn default_extension_encoder(pb_ostream_t *stream, const pb_extension_t *extension)
+{
+    pb_field_iter_t iter;
+
+    if (!pb_field_iter_begin_extension_const(&iter, extension))
+        PB_RETURN_ERROR(stream, "invalid extension");
+
+    return encode_field(stream, &iter);
+}
+
+
+/* Walk through all the registered extensions and give them a chance
+ * to encode themselves. */
+static bool checkreturn encode_extension_field(pb_ostream_t *stream, const pb_field_iter_t *field)
+{
+    const pb_extension_t *extension = *(const pb_extension_t* const *)field->pData;
+
+    while (extension)
+    {
+        bool status;
+        if (extension->type->encode)
+            status = extension->type->encode(stream, extension);
+        else
+            status = default_extension_encoder(stream, extension);
+
+        if (!status)
+            return false;
+        
+        extension = extension->next;
+    }
+    
+    return true;
+}
+
+/*********************
+ * Encode all fields *
+ *********************/
+
+bool checkreturn pb_encode(pb_ostream_t *stream, const pb_msgdesc_t *fields, const void *src_struct)
+{
+    pb_field_iter_t iter;
+    if (!pb_field_iter_begin_const(&iter, fields, src_struct))
+        return true; /* Empty message type */
+    
+    do {
+        if (PB_LTYPE(iter.type) == PB_LTYPE_EXTENSION)
+        {
+            /* Special case for the extension field placeholder */
+            if (!encode_extension_field(stream, &iter))
+                return false;
+        }
+        else
+        {
+            /* Regular field */
+            if (!encode_field(stream, &iter))
+                return false;
+        }
+    } while (pb_field_iter_next(&iter));
+    
+    return true;
+}
+
+bool checkreturn pb_encode_ex(pb_ostream_t *stream, const pb_msgdesc_t *fields, const void *src_struct, unsigned int flags)
+{
+  if ((flags & PB_ENCODE_DELIMITED) != 0)
+  {
+    return pb_encode_submessage(stream, fields, src_struct);
+  }
+  else if ((flags & PB_ENCODE_NULLTERMINATED) != 0)
+  {
+    const pb_byte_t zero = 0;
+
+    if (!pb_encode(stream, fields, src_struct))
+        return false;
+
+    return pb_write(stream, &zero, 1);
+  }
+  else
+  {
+    return pb_encode(stream, fields, src_struct);
+  }
+}
+
+bool pb_get_encoded_size(size_t *size, const pb_msgdesc_t *fields, const void *src_struct)
+{
+    pb_ostream_t stream = PB_OSTREAM_SIZING;
+    
+    if (!pb_encode(&stream, fields, src_struct))
+        return false;
+    
+    *size = stream.bytes_written;
+    return true;
+}
+
+/********************
+ * Helper functions *
+ ********************/
+
+/* This function avoids 64-bit shifts as they are quite slow on many platforms. */
+static bool checkreturn pb_encode_varint_32(pb_ostream_t *stream, uint32_t low, uint32_t high)
+{
+    size_t i = 0;
+    pb_byte_t buffer[10];
+    pb_byte_t byte = (pb_byte_t)(low & 0x7F);
+    low >>= 7;
+
+    while (i < 4 && (low != 0 || high != 0))
+    {
+        byte |= 0x80;
+        buffer[i++] = byte;
+        byte = (pb_byte_t)(low & 0x7F);
+        low >>= 7;
+    }
+
+    if (high)
+    {
+        byte = (pb_byte_t)(byte | ((high & 0x07) << 4));
+        high >>= 3;
+
+        while (high)
+        {
+            byte |= 0x80;
+            buffer[i++] = byte;
+            byte = (pb_byte_t)(high & 0x7F);
+            high >>= 7;
+        }
+    }
+
+    buffer[i++] = byte;
+
+    return pb_write(stream, buffer, i);
+}
+
+bool checkreturn pb_encode_varint(pb_ostream_t *stream, pb_uint64_t value)
+{
+    if (value <= 0x7F)
+    {
+        /* Fast path: single byte */
+        pb_byte_t byte = (pb_byte_t)value;
+        return pb_write(stream, &byte, 1);
+    }
+    else
+    {
+#ifdef PB_WITHOUT_64BIT
+        return pb_encode_varint_32(stream, value, 0);
+#else
+        return pb_encode_varint_32(stream, (uint32_t)value, (uint32_t)(value >> 32));
+#endif
+    }
+}
+
+bool checkreturn pb_encode_svarint(pb_ostream_t *stream, pb_int64_t value)
+{
+    pb_uint64_t zigzagged;
+    pb_uint64_t mask = ((pb_uint64_t)-1) >> 1; /* Satisfy clang -fsanitize=integer */
+    if (value < 0)
+        zigzagged = ~(((pb_uint64_t)value & mask) << 1);
+    else
+        zigzagged = (pb_uint64_t)value << 1;
+    
+    return pb_encode_varint(stream, zigzagged);
+}
+
+bool checkreturn pb_encode_fixed32(pb_ostream_t *stream, const void *value)
+{
+#if defined(PB_LITTLE_ENDIAN_8BIT) && PB_LITTLE_ENDIAN_8BIT == 1
+    /* Fast path if we know that we're on little endian */
+    return pb_write(stream, (const pb_byte_t*)value, 4);
+#else
+    uint32_t val = *(const uint32_t*)value;
+    pb_byte_t bytes[4];
+    bytes[0] = (pb_byte_t)(val & 0xFF);
+    bytes[1] = (pb_byte_t)((val >> 8) & 0xFF);
+    bytes[2] = (pb_byte_t)((val >> 16) & 0xFF);
+    bytes[3] = (pb_byte_t)((val >> 24) & 0xFF);
+    return pb_write(stream, bytes, 4);
+#endif
+}
+
+#ifndef PB_WITHOUT_64BIT
+bool checkreturn pb_encode_fixed64(pb_ostream_t *stream, const void *value)
+{
+#if defined(PB_LITTLE_ENDIAN_8BIT) && PB_LITTLE_ENDIAN_8BIT == 1
+    /* Fast path if we know that we're on little endian */
+    return pb_write(stream, (const pb_byte_t*)value, 8);
+#else
+    uint64_t val = *(const uint64_t*)value;
+    pb_byte_t bytes[8];
+    bytes[0] = (pb_byte_t)(val & 0xFF);
+    bytes[1] = (pb_byte_t)((val >> 8) & 0xFF);
+    bytes[2] = (pb_byte_t)((val >> 16) & 0xFF);
+    bytes[3] = (pb_byte_t)((val >> 24) & 0xFF);
+    bytes[4] = (pb_byte_t)((val >> 32) & 0xFF);
+    bytes[5] = (pb_byte_t)((val >> 40) & 0xFF);
+    bytes[6] = (pb_byte_t)((val >> 48) & 0xFF);
+    bytes[7] = (pb_byte_t)((val >> 56) & 0xFF);
+    return pb_write(stream, bytes, 8);
+#endif
+}
+#endif
+
+bool checkreturn pb_encode_tag(pb_ostream_t *stream, pb_wire_type_t wiretype, uint32_t field_number)
+{
+    pb_uint64_t tag = ((pb_uint64_t)field_number << 3) | wiretype;
+    return pb_encode_varint(stream, tag);
+}
+
+bool pb_encode_tag_for_field ( pb_ostream_t* stream, const pb_field_iter_t* field )
+{
+    pb_wire_type_t wiretype;
+    switch (PB_LTYPE(field->type))
+    {
+        case PB_LTYPE_BOOL:
+        case PB_LTYPE_VARINT:
+        case PB_LTYPE_UVARINT:
+        case PB_LTYPE_SVARINT:
+            wiretype = PB_WT_VARINT;
+            break;
+        
+        case PB_LTYPE_FIXED32:
+            wiretype = PB_WT_32BIT;
+            break;
+        
+        case PB_LTYPE_FIXED64:
+            wiretype = PB_WT_64BIT;
+            break;
+        
+        case PB_LTYPE_BYTES:
+        case PB_LTYPE_STRING:
+        case PB_LTYPE_SUBMESSAGE:
+        case PB_LTYPE_SUBMSG_W_CB:
+        case PB_LTYPE_FIXED_LENGTH_BYTES:
+            wiretype = PB_WT_STRING;
+            break;
+        
+        default:
+            PB_RETURN_ERROR(stream, "invalid field type");
+    }
+    
+    return pb_encode_tag(stream, wiretype, field->tag);
+}
+
+bool checkreturn pb_encode_string(pb_ostream_t *stream, const pb_byte_t *buffer, size_t size)
+{
+    if (!pb_encode_varint(stream, (pb_uint64_t)size))
+        return false;
+    
+    return pb_write(stream, buffer, size);
+}
+
+bool checkreturn pb_encode_submessage(pb_ostream_t *stream, const pb_msgdesc_t *fields, const void *src_struct)
+{
+    /* First calculate the message size using a non-writing substream. */
+    pb_ostream_t substream = PB_OSTREAM_SIZING;
+    size_t size;
+    bool status;
+    
+    if (!pb_encode(&substream, fields, src_struct))
+    {
+#ifndef PB_NO_ERRMSG
+        stream->errmsg = substream.errmsg;
+#endif
+        return false;
+    }
+    
+    size = substream.bytes_written;
+    
+    if (!pb_encode_varint(stream, (pb_uint64_t)size))
+        return false;
+    
+    if (stream->callback == NULL)
+        return pb_write(stream, NULL, size); /* Just sizing */
+    
+    if (stream->bytes_written + size > stream->max_size)
+        PB_RETURN_ERROR(stream, "stream full");
+        
+    /* Use a substream to verify that a callback doesn't write more than
+     * what it did the first time. */
+    substream.callback = stream->callback;
+    substream.state = stream->state;
+    substream.max_size = size;
+    substream.bytes_written = 0;
+#ifndef PB_NO_ERRMSG
+    substream.errmsg = NULL;
+#endif
+    
+    status = pb_encode(&substream, fields, src_struct);
+    
+    stream->bytes_written += substream.bytes_written;
+    stream->state = substream.state;
+#ifndef PB_NO_ERRMSG
+    stream->errmsg = substream.errmsg;
+#endif
+    
+    if (substream.bytes_written != size)
+        PB_RETURN_ERROR(stream, "submsg size changed");
+    
+    return status;
+}
+
+/* Field encoders */
+
+static bool checkreturn pb_enc_bool(pb_ostream_t *stream, const pb_field_iter_t *field)
+{
+    uint32_t value = safe_read_bool(field->pData) ? 1 : 0;
+    PB_UNUSED(field);
+    return pb_encode_varint(stream, value);
+}
+
+static bool checkreturn pb_enc_varint(pb_ostream_t *stream, const pb_field_iter_t *field)
+{
+    if (PB_LTYPE(field->type) == PB_LTYPE_UVARINT)
+    {
+        /* Perform unsigned integer extension */
+        pb_uint64_t value = 0;
+
+        if (field->data_size == sizeof(uint_least8_t))
+            value = *(const uint_least8_t*)field->pData;
+        else if (field->data_size == sizeof(uint_least16_t))
+            value = *(const uint_least16_t*)field->pData;
+        else if (field->data_size == sizeof(uint32_t))
+            value = *(const uint32_t*)field->pData;
+        else if (field->data_size == sizeof(pb_uint64_t))
+            value = *(const pb_uint64_t*)field->pData;
+        else
+            PB_RETURN_ERROR(stream, "invalid data_size");
+
+        return pb_encode_varint(stream, value);
+    }
+    else
+    {
+        /* Perform signed integer extension */
+        pb_int64_t value = 0;
+
+        if (field->data_size == sizeof(int_least8_t))
+            value = *(const int_least8_t*)field->pData;
+        else if (field->data_size == sizeof(int_least16_t))
+            value = *(const int_least16_t*)field->pData;
+        else if (field->data_size == sizeof(int32_t))
+            value = *(const int32_t*)field->pData;
+        else if (field->data_size == sizeof(pb_int64_t))
+            value = *(const pb_int64_t*)field->pData;
+        else
+            PB_RETURN_ERROR(stream, "invalid data_size");
+
+        if (PB_LTYPE(field->type) == PB_LTYPE_SVARINT)
+            return pb_encode_svarint(stream, value);
+#ifdef PB_WITHOUT_64BIT
+        else if (value < 0)
+            return pb_encode_varint_32(stream, (uint32_t)value, (uint32_t)-1);
+#endif
+        else
+            return pb_encode_varint(stream, (pb_uint64_t)value);
+
+    }
+}
+
+static bool checkreturn pb_enc_fixed(pb_ostream_t *stream, const pb_field_iter_t *field)
+{
+#ifdef PB_CONVERT_DOUBLE_FLOAT
+    if (field->data_size == sizeof(float) && PB_LTYPE(field->type) == PB_LTYPE_FIXED64)
+    {
+        return pb_encode_float_as_double(stream, *(float*)field->pData);
+    }
+#endif
+
+    if (field->data_size == sizeof(uint32_t))
+    {
+        return pb_encode_fixed32(stream, field->pData);
+    }
+#ifndef PB_WITHOUT_64BIT
+    else if (field->data_size == sizeof(uint64_t))
+    {
+        return pb_encode_fixed64(stream, field->pData);
+    }
+#endif
+    else
+    {
+        PB_RETURN_ERROR(stream, "invalid data_size");
+    }
+}
+
+static bool checkreturn pb_enc_bytes(pb_ostream_t *stream, const pb_field_iter_t *field)
+{
+    const pb_bytes_array_t *bytes = NULL;
+
+    bytes = (const pb_bytes_array_t*)field->pData;
+    
+    if (bytes == NULL)
+    {
+        /* Treat null pointer as an empty bytes field */
+        return pb_encode_string(stream, NULL, 0);
+    }
+    
+    if (PB_ATYPE(field->type) == PB_ATYPE_STATIC &&
+        bytes->size > field->data_size - offsetof(pb_bytes_array_t, bytes))
+    {
+        PB_RETURN_ERROR(stream, "bytes size exceeded");
+    }
+    
+    return pb_encode_string(stream, bytes->bytes, (size_t)bytes->size);
+}
+
+static bool checkreturn pb_enc_string(pb_ostream_t *stream, const pb_field_iter_t *field)
+{
+    size_t size = 0;
+    size_t max_size = (size_t)field->data_size;
+    const char *str = (const char*)field->pData;
+    
+    if (PB_ATYPE(field->type) == PB_ATYPE_POINTER)
+    {
+        max_size = (size_t)-1;
+    }
+    else
+    {
+        /* pb_dec_string() assumes string fields end with a null
+         * terminator when the type isn't PB_ATYPE_POINTER, so we
+         * shouldn't allow more than max-1 bytes to be written to
+         * allow space for the null terminator.
+         */
+        if (max_size == 0)
+            PB_RETURN_ERROR(stream, "zero-length string");
+
+        max_size -= 1;
+    }
+
+
+    if (str == NULL)
+    {
+        size = 0; /* Treat null pointer as an empty string */
+    }
+    else
+    {
+        const char *p = str;
+
+        /* strnlen() is not always available, so just use a loop */
+        while (size < max_size && *p != '\0')
+        {
+            size++;
+            p++;
+        }
+
+        if (*p != '\0')
+        {
+            PB_RETURN_ERROR(stream, "unterminated string");
+        }
+    }
+
+#ifdef PB_VALIDATE_UTF8
+    if (!pb_validate_utf8(str))
+        PB_RETURN_ERROR(stream, "invalid utf8");
+#endif
+
+    return pb_encode_string(stream, (const pb_byte_t*)str, size);
+}
+
+static bool checkreturn pb_enc_submessage(pb_ostream_t *stream, const pb_field_iter_t *field)
+{
+    if (field->submsg_desc == NULL)
+        PB_RETURN_ERROR(stream, "invalid field descriptor");
+
+    if (PB_LTYPE(field->type) == PB_LTYPE_SUBMSG_W_CB && field->pSize != NULL)
+    {
+        /* Message callback is stored right before pSize. */
+        pb_callback_t *callback = (pb_callback_t*)field->pSize - 1;
+        if (callback->funcs.encode)
+        {
+            if (!callback->funcs.encode(stream, field, &callback->arg))
+                return false;
+        }
+    }
+    
+    return pb_encode_submessage(stream, field->submsg_desc, field->pData);
+}
+
+static bool checkreturn pb_enc_fixed_length_bytes(pb_ostream_t *stream, const pb_field_iter_t *field)
+{
+    return pb_encode_string(stream, (const pb_byte_t*)field->pData, (size_t)field->data_size);
+}
+
+#ifdef PB_CONVERT_DOUBLE_FLOAT
+bool pb_encode_float_as_double(pb_ostream_t *stream, float value)
+{
+    union { float f; uint32_t i; } in;
+    uint_least8_t sign;
+    int exponent;
+    uint64_t mantissa;
+
+    in.f = value;
+
+    /* Decompose input value */
+    sign = (uint_least8_t)((in.i >> 31) & 1);
+    exponent = (int)((in.i >> 23) & 0xFF) - 127;
+    mantissa = in.i & 0x7FFFFF;
+
+    if (exponent == 128)
+    {
+        /* Special value (NaN etc.) */
+        exponent = 1024;
+    }
+    else if (exponent == -127)
+    {
+        if (!mantissa)
+        {
+            /* Zero */
+            exponent = -1023;
+        }
+        else
+        {
+            /* Denormalized */
+            mantissa <<= 1;
+            while (!(mantissa & 0x800000))
+            {
+                mantissa <<= 1;
+                exponent--;
+            }
+            mantissa &= 0x7FFFFF;
+        }
+    }
+
+    /* Combine fields */
+    mantissa <<= 29;
+    mantissa |= (uint64_t)(exponent + 1023) << 52;
+    mantissa |= (uint64_t)sign << 63;
+
+    return pb_encode_fixed64(stream, &mantissa);
+}
+#endif
diff --git a/src/network/pb_encode.h b/src/network/pb_encode.h
new file mode 100644
index 000000000..891368322
--- /dev/null
+++ b/src/network/pb_encode.h
@@ -0,0 +1,185 @@
+/* pb_encode.h: Functions to encode protocol buffers. Depends on pb_encode.c.
+ * The main function is pb_encode. You also need an output stream, and the
+ * field descriptions created by nanopb_generator.py.
+ */
+
+#ifndef PB_ENCODE_H_INCLUDED
+#define PB_ENCODE_H_INCLUDED
+
+#include "pb.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Structure for defining custom output streams. You will need to provide
+ * a callback function to write the bytes to your storage, which can be
+ * for example a file or a network socket.
+ *
+ * The callback must conform to these rules:
+ *
+ * 1) Return false on IO errors. This will cause encoding to abort.
+ * 2) You can use state to store your own data (e.g. buffer pointer).
+ * 3) pb_write will update bytes_written after your callback runs.
+ * 4) Substreams will modify max_size and bytes_written. Don't use them
+ *    to calculate any pointers.
+ */
+struct pb_ostream_s
+{
+#ifdef PB_BUFFER_ONLY
+    /* Callback pointer is not used in buffer-only configuration.
+     * Having an int pointer here allows binary compatibility but
+     * gives an error if someone tries to assign callback function.
+     * Also, NULL pointer marks a 'sizing stream' that does not
+     * write anything.
+     */
+    const int *callback;
+#else
+    bool (*callback)(pb_ostream_t *stream, const pb_byte_t *buf, size_t count);
+#endif
+    void *state;          /* Free field for use by callback implementation. */
+    size_t max_size;      /* Limit number of output bytes written (or use SIZE_MAX). */
+    size_t bytes_written; /* Number of bytes written so far. */
+    
+#ifndef PB_NO_ERRMSG
+    const char *errmsg;
+#endif
+};
+
+/***************************
+ * Main encoding functions *
+ ***************************/
+
+/* Encode a single protocol buffers message from C structure into a stream.
+ * Returns true on success, false on any failure.
+ * The actual struct pointed to by src_struct must match the description in fields.
+ * All required fields in the struct are assumed to have been filled in.
+ *
+ * Example usage:
+ *    MyMessage msg = {};
+ *    uint8_t buffer[64];
+ *    pb_ostream_t stream;
+ *
+ *    msg.field1 = 42;
+ *    stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
+ *    pb_encode(&stream, MyMessage_fields, &msg);
+ */
+bool pb_encode(pb_ostream_t *stream, const pb_msgdesc_t *fields, const void *src_struct);
+
+/* Extended version of pb_encode, with several options to control the
+ * encoding process:
+ *
+ * PB_ENCODE_DELIMITED:      Prepend the length of message as a varint.
+ *                           Corresponds to writeDelimitedTo() in Google's
+ *                           protobuf API.
+ *
+ * PB_ENCODE_NULLTERMINATED: Append a null byte to the message for termination.
+ *                           NOTE: This behaviour is not supported in most other
+ *                           protobuf implementations, so PB_ENCODE_DELIMITED
+ *                           is a better option for compatibility.
+ */
+#define PB_ENCODE_DELIMITED       0x02U
+#define PB_ENCODE_NULLTERMINATED  0x04U
+bool pb_encode_ex(pb_ostream_t *stream, const pb_msgdesc_t *fields, const void *src_struct, unsigned int flags);
+
+/* Defines for backwards compatibility with code written before nanopb-0.4.0 */
+#define pb_encode_delimited(s,f,d) pb_encode_ex(s,f,d, PB_ENCODE_DELIMITED)
+#define pb_encode_nullterminated(s,f,d) pb_encode_ex(s,f,d, PB_ENCODE_NULLTERMINATED)
+
+/* Encode the message to get the size of the encoded data, but do not store
+ * the data. */
+bool pb_get_encoded_size(size_t *size, const pb_msgdesc_t *fields, const void *src_struct);
+
+/**************************************
+ * Functions for manipulating streams *
+ **************************************/
+
+/* Create an output stream for writing into a memory buffer.
+ * The number of bytes written can be found in stream.bytes_written after
+ * encoding the message.
+ *
+ * Alternatively, you can use a custom stream that writes directly to e.g.
+ * a file or a network socket.
+ */
+pb_ostream_t pb_ostream_from_buffer(pb_byte_t *buf, size_t bufsize);
+
+/* Pseudo-stream for measuring the size of a message without actually storing
+ * the encoded data.
+ * 
+ * Example usage:
+ *    MyMessage msg = {};
+ *    pb_ostream_t stream = PB_OSTREAM_SIZING;
+ *    pb_encode(&stream, MyMessage_fields, &msg);
+ *    printf("Message size is %d\n", stream.bytes_written);
+ */
+#ifndef PB_NO_ERRMSG
+#define PB_OSTREAM_SIZING {0,0,0,0,0}
+#else
+#define PB_OSTREAM_SIZING {0,0,0,0}
+#endif
+
+/* Function to write into a pb_ostream_t stream. You can use this if you need
+ * to append or prepend some custom headers to the message.
+ */
+bool pb_write(pb_ostream_t *stream, const pb_byte_t *buf, size_t count);
+
+
+/************************************************
+ * Helper functions for writing field callbacks *
+ ************************************************/
+
+/* Encode field header based on type and field number defined in the field
+ * structure. Call this from the callback before writing out field contents. */
+bool pb_encode_tag_for_field(pb_ostream_t *stream, const pb_field_iter_t *field);
+
+/* Encode field header by manually specifying wire type. You need to use this
+ * if you want to write out packed arrays from a callback field. */
+bool pb_encode_tag(pb_ostream_t *stream, pb_wire_type_t wiretype, uint32_t field_number);
+
+/* Encode an integer in the varint format.
+ * This works for bool, enum, int32, int64, uint32 and uint64 field types. */
+#ifndef PB_WITHOUT_64BIT
+bool pb_encode_varint(pb_ostream_t *stream, uint64_t value);
+#else
+bool pb_encode_varint(pb_ostream_t *stream, uint32_t value);
+#endif
+
+/* Encode an integer in the zig-zagged svarint format.
+ * This works for sint32 and sint64. */
+#ifndef PB_WITHOUT_64BIT
+bool pb_encode_svarint(pb_ostream_t *stream, int64_t value);
+#else
+bool pb_encode_svarint(pb_ostream_t *stream, int32_t value);
+#endif
+
+/* Encode a string or bytes type field. For strings, pass strlen(s) as size. */
+bool pb_encode_string(pb_ostream_t *stream, const pb_byte_t *buffer, size_t size);
+
+/* Encode a fixed32, sfixed32 or float value.
+ * You need to pass a pointer to a 4-byte wide C variable. */
+bool pb_encode_fixed32(pb_ostream_t *stream, const void *value);
+
+#ifndef PB_WITHOUT_64BIT
+/* Encode a fixed64, sfixed64 or double value.
+ * You need to pass a pointer to a 8-byte wide C variable. */
+bool pb_encode_fixed64(pb_ostream_t *stream, const void *value);
+#endif
+
+#ifdef PB_CONVERT_DOUBLE_FLOAT
+/* Encode a float value so that it appears like a double in the encoded
+ * message. */
+bool pb_encode_float_as_double(pb_ostream_t *stream, float value);
+#endif
+
+/* Encode a submessage field.
+ * You need to pass the pb_field_t array and pointer to struct, just like
+ * with pb_encode(). This internally encodes the submessage twice, first to
+ * calculate message size and then to actually write it out.
+ */
+bool pb_encode_submessage(pb_ostream_t *stream, const pb_msgdesc_t *fields, const void *src_struct);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif
diff --git a/src/network/pcap_if.c b/src/network/pcap_if.c
deleted file mode 100644
index 1d3e39221..000000000
--- a/src/network/pcap_if.c
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * VARCem   Virtual ARchaeological Computer EMulator.
- *          An emulator of (mostly) x86-based PC systems and devices,
- *          using the ISA,EISA,VLB,MCA  and PCI system buses, roughly
- *          spanning the era between 1981 and 1995.
- *
- *          Simple program to show usage of (Win)Pcap.
- *
- *          Based on the "libpcap" examples.
- *
- *
- *
- * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
- *
- *          Copyright 2017-2018 Fred N. van Kempen.
- *
- *          Redistribution and  use  in source  and binary forms, with
- *          or  without modification, are permitted  provided that the
- *          following conditions are met:
- *
- *          1. Redistributions of  source  code must retain the entire
- *             above notice, this list of conditions and the following
- *             disclaimer.
- *
- *          2. Redistributions in binary form must reproduce the above
- *             copyright  notice,  this list  of  conditions  and  the
- *             following disclaimer in  the documentation and/or other
- *             materials provided with the distribution.
- *
- *          3. Neither the  name of the copyright holder nor the names
- *             of  its  contributors may be used to endorse or promote
- *             products  derived from  this  software without specific
- *             prior written permission.
- *
- * THIS SOFTWARE  IS  PROVIDED BY THE  COPYRIGHT  HOLDERS AND CONTRIBUTORS
- * "AS IS" AND  ANY EXPRESS  OR  IMPLIED  WARRANTIES,  INCLUDING, BUT  NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE  ARE  DISCLAIMED. IN  NO  EVENT  SHALL THE COPYRIGHT
- * HOLDER OR  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL  DAMAGES  (INCLUDING,  BUT  NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE  GOODS OR SERVICES;  LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  AND ON  ANY
- * THEORY OF  LIABILITY, WHETHER IN  CONTRACT, STRICT  LIABILITY, OR  TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include <pcap/pcap.h>
-#include <time.h>
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include <86box/plat.h>
-#include <86box/plat_dynld.h>
-
-static void *pcap_handle; /* handle to WinPcap DLL */
-
-/* Pointers to the real functions. */
-static int (*f_pcap_findalldevs)(pcap_if_t **, char *);
-static void (*f_pcap_freealldevs)(pcap_if_t *);
-static pcap_t *(*f_pcap_open_live)(const char *, int, int, int, char *);
-static int (*f_pcap_next_ex)(pcap_t *, struct pcap_pkthdr **, const unsigned char **);
-static void (*f_pcap_close)(pcap_t *);
-static dllimp_t pcap_imports[] = {
-  // clang-format off
-  { "pcap_findalldevs", &f_pcap_findalldevs },
-  { "pcap_freealldevs", &f_pcap_freealldevs },
-  { "pcap_open_live",   &f_pcap_open_live   },
-  { "pcap_next_ex",     &f_pcap_next_ex     },
-  { "pcap_close",       &f_pcap_close       },
-  { NULL,               NULL                },
-  // clang-format on
-};
-
-typedef struct {
-    char device[128];
-    char description[128];
-} capdev_t;
-
-/* Retrieve an easy-to-use list of devices. */
-static int
-get_devlist(capdev_t *list)
-{
-    char       errbuf[PCAP_ERRBUF_SIZE];
-    pcap_if_t *devlist;
-    int        i = 0;
-
-    /* Retrieve the device list from the local machine */
-    if (f_pcap_findalldevs(&devlist, errbuf) == -1) {
-        fprintf(stderr, "Error in pcap_findalldevs_ex: %s\n", errbuf);
-        return (-1);
-    }
-
-    for (pcap_if_t *dev = devlist; dev != NULL; dev = dev->next) {
-        strcpy(list->device, dev->name);
-        if (dev->description)
-            strcpy(list->description, dev->description);
-        else
-            memset(list->description, '\0', sizeof(list->description));
-        list++;
-        i++;
-    }
-
-    /* Release the memory. */
-    f_pcap_freealldevs(devlist);
-
-    return i;
-}
-
-/* Simple HEXDUMP routine for raw data. */
-static void
-hex_dump(unsigned char *bufp, int len)
-{
-    char          asci[20];
-    unsigned char c;
-    long          addr;
-
-    addr = 0;
-    while (len-- > 0) {
-        c = bufp[addr];
-        if ((addr % 16) == 0)
-            printf("%04lx  %02x", addr, c);
-        else
-            printf(" %02x", c);
-        asci[addr & 15] = (uint8_t) isprint(c) ? c : '.';
-        if ((++addr % 16) == 0) {
-            asci[16] = '\0';
-            printf("  | %s |\n", asci);
-        }
-    }
-
-    if (addr % 16) {
-        while (addr % 16) {
-            printf("   ");
-            asci[addr & 15] = ' ';
-            addr++;
-        }
-        asci[16] = '\0';
-        printf("  | %s |\n", asci);
-    }
-}
-
-/* Print a standard Ethernet MAC address. */
-static void
-eth_praddr(unsigned char *ptr)
-{
-    printf("%02x:%02x:%02x:%02x:%02x:%02x",
-           ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5]);
-}
-
-/* Print a standard Ethernet header. */
-static int
-eth_prhdr(unsigned char *ptr)
-{
-    unsigned short type;
-
-    printf("Ethernet ");
-    eth_praddr(ptr + 6);
-    printf(" > ");
-    eth_praddr(ptr);
-    type = (ptr[12] << 8) | ptr[13];
-    printf(" type %04x\n", type);
-
-    return 14;
-}
-
-/* Capture packets from the network, and print them. */
-static int
-start_cap(char *dev)
-{
-    char                 temp[PCAP_ERRBUF_SIZE];
-    struct pcap_pkthdr  *hdr;
-    const unsigned char *pkt;
-    const struct tm     *ltime;
-    time_t               now;
-    pcap_t              *pcap;
-    int                  rc;
-
-    /* Open the device for reading from it. */
-    pcap = f_pcap_open_live(dev,
-                            1518, /* MTU */
-                            1,    /* promisc mode */
-                            10,   /* timeout */
-                            temp);
-    if (pcap == NULL) {
-        fprintf(stderr, "Pcap: open_live(%s): %s\n", dev, temp);
-        return 2;
-    }
-
-    printf("Listening on '%s'..\n", dev);
-    for (;;) {
-        rc = f_pcap_next_ex(pcap, &hdr, &pkt);
-        if (rc < 0)
-            break;
-
-        /* Did we time out? */
-        if (rc == 0)
-            continue;
-
-        /* Convert the timestamp to readable format. */
-        now   = hdr->ts.tv_sec;
-        ltime = localtime(&now);
-        strftime(temp, sizeof(temp), "%H:%M:%S", ltime);
-
-        /* Process and print the packet. */
-        printf("\n<< %s,%.6ld len=%u\n",
-               temp, hdr->ts.tv_usec, hdr->len);
-        rc = eth_prhdr((unsigned char *) pkt);
-        hex_dump((unsigned char *) pkt + rc, hdr->len - rc);
-    }
-
-    /* All done, close up. */
-    f_pcap_close(pcap);
-
-    return 0;
-}
-
-/* Show a list of available network interfaces. */
-static void
-show_devs(capdev_t *list, int num)
-{
-    if (num > 0) {
-        printf("Available network interfaces:\n\n");
-
-        for (int i = 0; i < num; i++) {
-            printf(" %d - %s\n", i + 1, list->device);
-            if (list->description[0] != '\0')
-                printf("     (%s)\n", list->description);
-            else
-                printf("     (No description available)\n");
-            list++;
-            printf("\n");
-        }
-    } else {
-        printf("No interfaces found!\nMake sure WinPcap is installed.\n");
-    }
-}
-
-int
-main(int argc, char **argv)
-{
-    capdev_t interfaces[32];
-    int      numdev;
-    int      i;
-
-    /* Try loading the DLL. */
-#ifdef _WIN32
-    pcap_handle = dynld_module("wpcap.dll", pcap_imports);
-#elif defined __APPLE__
-    pcap_handle = dynld_module("libpcap.dylib", pcap_imports);
-#else
-    pcap_handle = dynld_module("libpcap.so", pcap_imports);
-#endif
-    if (pcap_handle == NULL) {
-#ifdef _WIN32
-        fprintf(stderr, "Unable to load WinPcap DLL !\n");
-#else
-        fprintf(stderr, "Unable to load libpcap.so !\n");
-#endif
-        return 1;
-    }
-
-    /* Get the list. */
-    numdev = get_devlist(interfaces);
-
-    if (argc == 1) {
-        /* No arguments, just show the list. */
-        show_devs(interfaces, numdev);
-
-        dynld_close(pcap_handle);
-
-        return numdev;
-    }
-
-    /* Assume argument to be the interface number to listen on. */
-    i = atoi(argv[1]);
-    if (i < 0 || i > numdev) {
-        fprintf(stderr, "Invalid interface number %d !\n", i);
-
-        dynld_close(pcap_handle);
-
-        return 1;
-    }
-
-    /* Looks good, go and listen.. */
-    i = start_cap(interfaces[i - 1].device);
-
-    dynld_close(pcap_handle);
-
-    return i;
-}
diff --git a/src/network/utils/getline.c b/src/network/utils/getline.c
new file mode 100644
index 000000000..69ee258fd
--- /dev/null
+++ b/src/network/utils/getline.c
@@ -0,0 +1,81 @@
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+ssize_t
+local_getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp)
+{
+	char *ptr, *eptr;
+
+
+	if (*buf == NULL || *bufsiz == 0) {
+		*bufsiz = BUFSIZ;
+		if ((*buf = malloc(*bufsiz)) == NULL)
+			return -1;
+	}
+
+	for (ptr = *buf, eptr = *buf + *bufsiz;;) {
+		int c = fgetc(fp);
+		if (c == -1) {
+			if (feof(fp)) {
+				ssize_t diff = (ssize_t)(ptr - *buf);
+				if (diff != 0) {
+					*ptr = '\0';
+					return diff;
+				}
+			}
+			return -1;
+		}
+		*ptr++ = c;
+		if (c == delimiter) {
+			*ptr = '\0';
+			return ptr - *buf;
+		}
+		if (ptr + 2 >= eptr) {
+			char *nbuf;
+			size_t nbufsiz = *bufsiz * 2;
+			ssize_t d = ptr - *buf;
+			if ((nbuf = realloc(*buf, nbufsiz)) == NULL)
+				return -1;
+			*buf = nbuf;
+			*bufsiz = nbufsiz;
+			eptr = nbuf + nbufsiz;
+			ptr = nbuf + d;
+		}
+	}
+}
+
+ssize_t
+local_getline(char **buf, size_t *bufsiz, FILE *fp)
+{
+	return local_getdelim(buf, bufsiz, '\n', fp);
+}
diff --git a/src/nvr.c b/src/nvr.c
index d833618d0..b6bf2a5a5 100644
--- a/src/nvr.c
+++ b/src/nvr.c
@@ -161,9 +161,9 @@ nvr_init(nvr_t *nvr)
     int c;
 
     /* Set up the NVR file's name. */
-    c       = strlen(machine_get_internal_name()) + 5;
+    c       = strlen(machine_get_nvr_name()) + 5;
     nvr->fn = (char *) malloc(c + 1);
-    sprintf(nvr->fn, "%s.nvr", machine_get_internal_name());
+    sprintf(nvr->fn, "%s.nvr", machine_get_nvr_name());
 
     /* Initialize the internal clock as needed. */
     memset(&intclk, 0x00, sizeof(intclk));
@@ -310,30 +310,38 @@ nvr_close(void)
 void
 nvr_time_sync(void)
 {
-    struct tm *tm;
-    time_t     now;
+    struct tm tm;
+    time_t    now;
 
     /* Get the current time of day, and convert to local time. */
     (void) time(&now);
-    if (time_sync & TIME_SYNC_UTC)
-        tm = gmtime(&now);
-    else
-        tm = localtime(&now);
 
-    /* Set the internal clock. */
-    nvr_time_set(tm);
+#ifdef _WIN32
+    if (time_sync & TIME_SYNC_UTC)
+        gmtime_s(&tm, &now);
+    else
+        localtime_s(&tm, &now);
+#else
+    if (time_sync & TIME_SYNC_UTC)
+        gmtime_r(&now, &tm);
+    else
+        localtime_r(&now, &tm);
+#endif
+
+    nvr_time_set(&tm);
 }
 
 /* Get current time from internal clock. */
 void
-nvr_time_get(struct tm *tm)
+nvr_time_get(void *priv)
 {
-    uint8_t  dom;
-    uint8_t  mon;
-    uint8_t  sum;
-    uint8_t  wd;
-    uint16_t cent;
-    uint16_t yr;
+    struct tm *tm   = (struct tm *) priv;
+    uint8_t    dom;
+    uint8_t    mon;
+    uint8_t    sum;
+    uint8_t    wd;
+    uint16_t   cent;
+    uint16_t   yr;
 
     tm->tm_sec  = intclk.tm_sec;
     tm->tm_min  = intclk.tm_min;
@@ -352,8 +360,10 @@ nvr_time_get(struct tm *tm)
 
 /* Set internal clock time. */
 void
-nvr_time_set(struct tm *tm)
+nvr_time_set(void *priv)
 {
+    struct tm *tm   = (struct tm *) priv;
+
     intclk.tm_sec  = tm->tm_sec;
     intclk.tm_min  = tm->tm_min;
     intclk.tm_hour = tm->tm_hour;
diff --git a/src/nvr_at.c b/src/nvr_at.c
index 7e356f55d..6853867ec 100644
--- a/src/nvr_at.c
+++ b/src/nvr_at.c
@@ -296,6 +296,7 @@
 #define FLAG_P6RP4_HACK    0x10
 #define FLAG_PIIX4         0x20
 #define FLAG_MULTI_BANK    0x40
+#define FLAG_MARTIN_HACK   0x80
 
 typedef struct local_t {
     int8_t stat;
@@ -309,7 +310,6 @@ typedef struct local_t {
     uint8_t irq_state;
     uint8_t smi_status;
 
-    uint8_t  addr[8];
     uint8_t  wp[2];
     uint8_t  bank[8];
     uint8_t *lock;
@@ -317,6 +317,8 @@ typedef struct local_t {
     int16_t count;
     int16_t state;
 
+    uint16_t  addr[8];
+
     int32_t smi_enable;
 
     uint64_t   ecount;
@@ -686,6 +688,19 @@ nvr_write(uint16_t addr, uint8_t val, void *priv)
     }
 }
 
+/* Get the NVR register index (used for APC). */
+uint8_t
+nvr_get_index(void *priv, uint8_t addr_id)
+{
+    nvr_t   *nvr     = (nvr_t *) priv;
+    local_t *local   = (local_t *) nvr->data;
+    uint8_t  ret;
+
+    ret = local->addr[addr_id];
+
+    return ret;
+}
+
 /* Read from one of the NVR registers. */
 static uint8_t
 nvr_read(uint16_t addr, void *priv)
@@ -719,6 +734,13 @@ nvr_read(uint16_t addr, void *priv)
                 ret = REGD_VRT;
                 break;
 
+            case 0x11:
+                if (local->flags & FLAG_MARTIN_HACK)
+                    ret = nvr->regs[local->addr[addr_id]] | 0x02;
+                else
+                    ret = nvr->regs[local->addr[addr_id]];
+                break;
+
             case 0x2c:
                 if (!nvr->is_new && (local->flags & FLAG_AMI_1994_HACK))
                     ret = nvr->regs[local->addr[addr_id]] & 0x7f;
@@ -757,6 +779,17 @@ nvr_read(uint16_t addr, void *priv)
                         ret = checksum >> 8;
                     else
                         ret = checksum & 0xff;
+                } else if (!nvr->is_new && (local->flags & FLAG_MARTIN_HACK)) {
+                    for (i = 0x10; i <= 0x2d; i++) {
+                        if (i == 0x11)
+                            checksum += (nvr->regs[i] | 0x02);
+                        else
+                            checksum += nvr->regs[i];
+                    }
+                    if (local->addr[addr_id] == 0x2e)
+                        ret = checksum >> 8;
+                    else
+                        ret = checksum & 0xff;
                 } else
                     ret = nvr->regs[local->addr[addr_id]];
                 break;
@@ -932,6 +965,17 @@ nvr_at_index_read_handler(int set, uint16_t base, nvr_t *nvr)
     }
 }
 
+void
+nvr_at_data_port(int set, nvr_t *nvr)
+{
+    io_handler(0, 0x71, 1,
+               nvr_read, NULL, NULL, nvr_write, NULL, NULL, nvr);
+
+    if (set)
+        io_handler(1, 0x71, 1,
+                   nvr_read, NULL, NULL, nvr_write, NULL, NULL, nvr);
+}
+
 void
 nvr_at_sec_handler(int set, uint16_t base, nvr_t *nvr)
 {
@@ -1063,9 +1107,10 @@ nvr_at_init(const device_t *info)
         case 1: /* standard AT */
         case 5: /* AMI WinBIOS 1994 */
         case 6: /* AMI BIOS 1995 */
-            if ((info->local & 0x1f) == 0x11)
+            if ((info->local & 0x1f) == 0x11) {
                 local->flags |= FLAG_PIIX4;
-            else {
+                local->def = 0x00;
+            } else {
                 local->def = 0x00;
                 if ((info->local & 0x1f) == 0x15)
                     local->flags |= FLAG_AMI_1994_HACK;
@@ -1098,9 +1143,11 @@ nvr_at_init(const device_t *info)
             if (info->local & 0x10) {
                 local->def = 0x00;
                 local->flags |= FLAG_AMI_1992_HACK;
-            } else if (info->local == 36)
+            } else if ((info->local == 36) || (info->local == 68)) {
                 local->def = 0x00;
-            else
+                if (info->local == 68)
+                    local->flags |= FLAG_MARTIN_HACK;
+            } else
                 local->def = 0xff;
             nvr->irq    = 8;
             local->cent = RTC_CENTURY_AT;
@@ -1135,6 +1182,9 @@ nvr_at_init(const device_t *info)
     /* Initialize the generic NVR. */
     nvr_init(nvr);
 
+    if (nvr->is_new && (local->flags & FLAG_MARTIN_HACK))
+        nvr->regs[0x11] = nvr->regs[0x2f] = 0x02;
+
     if (nvr_at_inited == 0) {
         /* Start the timers. */
         timer_add(&local->update_timer, timer_update, nvr, 0);
@@ -1162,6 +1212,10 @@ nvr_at_init(const device_t *info)
         nvr_at_inited = 1;
     }
 
+    /* This is a hack but it is required for the machine to boot properly, no idea why. */
+    if (nvr->is_new && !strcmp(machine_get_internal_name(), "spitfire"))
+        nvr->regs[0x33] = nvr->regs[0x34] = 0xff;
+
     return nvr;
 }
 
@@ -1194,12 +1248,12 @@ nvr_at_close(void *priv)
 const device_t at_nvr_old_device = {
     .name          = "PC/AT NVRAM (No century)",
     .internal_name = "at_nvr_old",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0,
     .init          = nvr_at_init,
     .close         = nvr_at_close,
     .reset         = nvr_at_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = nvr_at_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1208,12 +1262,12 @@ const device_t at_nvr_old_device = {
 const device_t at_nvr_device = {
     .name          = "PC/AT NVRAM",
     .internal_name = "at_nvr",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 1,
     .init          = nvr_at_init,
     .close         = nvr_at_close,
     .reset         = nvr_at_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = nvr_at_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1222,12 +1276,12 @@ const device_t at_nvr_device = {
 const device_t at_mb_nvr_device = {
     .name          = "PC/AT NVRAM",
     .internal_name = "at_nvr",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0x40 | 0x20 | 1,
     .init          = nvr_at_init,
     .close         = nvr_at_close,
     .reset         = nvr_at_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = nvr_at_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1236,12 +1290,12 @@ const device_t at_mb_nvr_device = {
 const device_t ps_nvr_device = {
     .name          = "PS/1 or PS/2 NVRAM",
     .internal_name = "ps_nvr",
-    .flags         = DEVICE_PS2,
+    .flags         = DEVICE_ISA16,
     .local         = 2,
     .init          = nvr_at_init,
     .close         = nvr_at_close,
     .reset         = nvr_at_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = nvr_at_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1250,12 +1304,12 @@ const device_t ps_nvr_device = {
 const device_t amstrad_nvr_device = {
     .name          = "Amstrad NVRAM",
     .internal_name = "amstrad_nvr",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 3,
     .init          = nvr_at_init,
     .close         = nvr_at_close,
     .reset         = nvr_at_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = nvr_at_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1264,12 +1318,12 @@ const device_t amstrad_nvr_device = {
 const device_t ibmat_nvr_device = {
     .name          = "IBM AT NVRAM",
     .internal_name = "ibmat_nvr",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 4,
     .init          = nvr_at_init,
     .close         = nvr_at_close,
     .reset         = nvr_at_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = nvr_at_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1278,12 +1332,12 @@ const device_t ibmat_nvr_device = {
 const device_t piix4_nvr_device = {
     .name          = "Intel PIIX4 PC/AT NVRAM",
     .internal_name = "piix4_nvr",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0x10 | 1,
     .init          = nvr_at_init,
     .close         = nvr_at_close,
     .reset         = nvr_at_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = nvr_at_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1292,12 +1346,12 @@ const device_t piix4_nvr_device = {
 const device_t ps_no_nmi_nvr_device = {
     .name          = "PS/1 or PS/2 NVRAM (No NMI)",
     .internal_name = "ps1_nvr",
-    .flags         = DEVICE_PS2,
+    .flags         = DEVICE_ISA16,
     .local         = 0x10 | 2,
     .init          = nvr_at_init,
     .close         = nvr_at_close,
     .reset         = nvr_at_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = nvr_at_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1306,12 +1360,12 @@ const device_t ps_no_nmi_nvr_device = {
 const device_t amstrad_no_nmi_nvr_device = {
     .name          = "Amstrad NVRAM (No NMI)",
     .internal_name = "amstrad_nvr",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0x10 | 3,
     .init          = nvr_at_init,
     .close         = nvr_at_close,
     .reset         = nvr_at_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = nvr_at_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1320,12 +1374,12 @@ const device_t amstrad_no_nmi_nvr_device = {
 const device_t ami_1992_nvr_device = {
     .name          = "AMI Color 1992 PC/AT NVRAM",
     .internal_name = "ami_1992_nvr",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0x10 | 4,
     .init          = nvr_at_init,
     .close         = nvr_at_close,
     .reset         = nvr_at_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = nvr_at_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1334,12 +1388,12 @@ const device_t ami_1992_nvr_device = {
 const device_t ami_1994_nvr_device = {
     .name          = "AMI WinBIOS 1994 PC/AT NVRAM",
     .internal_name = "ami_1994_nvr",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0x10 | 5,
     .init          = nvr_at_init,
     .close         = nvr_at_close,
     .reset         = nvr_at_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = nvr_at_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1348,12 +1402,12 @@ const device_t ami_1994_nvr_device = {
 const device_t ami_1995_nvr_device = {
     .name          = "AMI WinBIOS 1995 PC/AT NVRAM",
     .internal_name = "ami_1995_nvr",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0x10 | 6,
     .init          = nvr_at_init,
     .close         = nvr_at_close,
     .reset         = nvr_at_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = nvr_at_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1362,12 +1416,12 @@ const device_t ami_1995_nvr_device = {
 const device_t via_nvr_device = {
     .name          = "VIA PC/AT NVRAM",
     .internal_name = "via_nvr",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0x10 | 7,
     .init          = nvr_at_init,
     .close         = nvr_at_close,
     .reset         = nvr_at_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = nvr_at_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1376,12 +1430,12 @@ const device_t via_nvr_device = {
 const device_t p6rp4_nvr_device = {
     .name          = "ASUS P/I-P6RP4 PC/AT NVRAM",
     .internal_name = "p6rp4_nvr",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 32,
     .init          = nvr_at_init,
     .close         = nvr_at_close,
     .reset         = nvr_at_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = nvr_at_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1390,12 +1444,26 @@ const device_t p6rp4_nvr_device = {
 const device_t amstrad_megapc_nvr_device = {
     .name          = "Amstrad MegaPC NVRAM",
     .internal_name = "amstrad_megapc_nvr",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 36,
     .init          = nvr_at_init,
     .close         = nvr_at_close,
     .reset         = nvr_at_reset,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = nvr_at_speed_changed,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t martin_nvr_device = {
+    .name          = "Zeos Martin NVRAM",
+    .internal_name = "martin_nvr",
+    .flags         = DEVICE_ISA16,
+    .local         = 68,
+    .init          = nvr_at_init,
+    .close         = nvr_at_close,
+    .reset         = nvr_at_reset,
+    .available     = NULL,
     .speed_changed = nvr_at_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1409,7 +1477,7 @@ const device_t elt_nvr_device = {
     .init          = nvr_at_init,
     .close         = nvr_at_close,
     .reset         = nvr_at_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = nvr_at_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/nvr_ps2.c b/src/nvr_ps2.c
index 67eaccc38..febf6c165 100644
--- a/src/nvr_ps2.c
+++ b/src/nvr_ps2.c
@@ -114,8 +114,7 @@ ps2_nvr_init(const device_t *info)
     FILE      *fp = NULL;
     int        c;
 
-    nvr = (ps2_nvr_t *) malloc(sizeof(ps2_nvr_t));
-    memset(nvr, 0x00, sizeof(ps2_nvr_t));
+    nvr = (ps2_nvr_t *) calloc(1, sizeof(ps2_nvr_t));
 
     if (info->local)
         nvr->size = 2048;
@@ -123,9 +122,9 @@ ps2_nvr_init(const device_t *info)
         nvr->size = 8192;
 
     /* Set up the NVR file's name. */
-    c       = strlen(machine_get_internal_name()) + 9;
+    c       = strlen(machine_get_nvr_name()) + 9;
     nvr->fn = (char *) malloc(c + 1);
-    sprintf(nvr->fn, "%s_sec.nvr", machine_get_internal_name());
+    sprintf(nvr->fn, "%s_sec.nvr", machine_get_nvr_name());
 
     io_sethandler(0x0074, 3,
                   ps2_nvr_read, NULL, NULL, ps2_nvr_write, NULL, NULL, nvr);
@@ -170,7 +169,7 @@ const device_t ps2_nvr_device = {
     .init          = ps2_nvr_init,
     .close         = ps2_nvr_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -184,7 +183,7 @@ const device_t ps2_nvr_55ls_device = {
     .init          = ps2_nvr_init,
     .close         = ps2_nvr_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/pci.c b/src/pci.c
index 15a119cb7..94ab9d5f2 100644
--- a/src/pci.c
+++ b/src/pci.c
@@ -23,6 +23,7 @@
 #include <86box/86box.h>
 #include <86box/machine.h>
 #include "cpu.h"
+#include "x86.h"
 #include <86box/io.h>
 #include <86box/pic.h>
 #include <86box/mem.h>
@@ -92,7 +93,7 @@ static int         pci_card;
 static int         pci_bus;
 static int         pci_key;
 static int         pci_trc_reg = 0;
-static uint32      pci_enable = 0x00000000;
+static uint32_t    pci_enable = 0x00000000;
 
 static void        pci_reset_regs(void);
 
@@ -204,6 +205,21 @@ pci_irq(uint8_t slot, uint8_t pci_int, int level, int set, uint8_t *irq_state)
                 }
             }
             break;
+        case (PCI_IIRQ_BASE | 0x00) ... (PCI_IIRQ_BASE | PCI_IIRQS_NUM):
+            /* PCI internal routing. */
+            if (slot > 0x00) {
+                slot = (slot - 1) & PCI_INT_PINS_MAX;
+
+                irq_line    = pci_irqs[slot];
+
+                /* Ignore what was provided to us as a parameter and override it with whatever
+                   the chipset is set to. */
+                level       = !!pci_irq_level[slot];
+            } else {
+                irq_line    = 0xff;
+                level       = 0;
+            }
+            break;
         case (PCI_MIRQ_BASE | 0x00) ... (PCI_MIRQ_BASE | PCI_MIRQ_MAX):
             /* MIRQ */
             slot &= PCI_MIRQ_MAX;
@@ -403,9 +419,19 @@ pci_trc_reset(uint8_t val)
         mem_a20_recalc();
 
         flushmmucache();
+
+        if (is_p6)
+            mem_zero();
     }
 
+#ifdef USE_DYNAREC
+    if (cpu_use_dynarec)
+        cpu_init = 1;
+    else
+        resetx86();
+#else
     resetx86();
+#endif
 }
 
 void
@@ -767,7 +793,7 @@ pci_add_card(uint8_t add_type, uint8_t (*read)(int func, int addr, void *priv),
     if (next_pci_card < PCI_CARDS_NUM) {
         dev = &pci_card_descs[next_pci_card];
 
-        dev->type = add_type;
+        dev->type  = add_type | PCI_ADD_STRICT;
         dev->read  = read;
         dev->write = write;
         dev->priv  = priv;
@@ -829,10 +855,10 @@ pci_register_card(int pci_card)
 
 /* Add an instance of the PCI bridge. */
 void
-pci_add_bridge(uint8_t agp, uint8_t (*read)(int func, int addr, void *priv), void (*write)(int func, int addr, uint8_t val, void *priv), void *priv, uint8_t *slot)
+pci_add_bridge(uint8_t add_type, uint8_t (*read)(int func, int addr, void *priv), void (*write)(int func, int addr, uint8_t val, void *priv), void *priv, uint8_t *slot)
 {
     pci_card_t *card;
-    uint8_t bridge_slot = agp ? pci_find_slot(PCI_ADD_AGPBRIDGE, 0xff) : last_normal_pci_card_id;
+    uint8_t bridge_slot = (add_type == PCI_ADD_NORMAL) ? last_normal_pci_card_id : pci_find_slot(add_type, 0xff);
 
     if (bridge_slot != PCI_CARD_INVALID) {
         card = &pci_cards[bridge_slot];
@@ -862,7 +888,7 @@ pci_register_cards(void)
             type = pci_card_descs[i].type;
             slot = pci_card_descs[i].slot;
 #endif
-            normal = (pci_card_descs[i].type == PCI_CARD_NORMAL);
+            normal = ((pci_card_descs[i].type & ~PCI_ADD_STRICT) == PCI_CARD_NORMAL);
 
             /* If this is a normal card, increase the next normal card index. */
             if (normal)
diff --git a/src/pci_dummy.c b/src/pci_dummy.c
index 704f85d8c..bceb58c22 100644
--- a/src/pci_dummy.c
+++ b/src/pci_dummy.c
@@ -278,7 +278,7 @@ pci_dummy_card_init(UNUSED(const device_t *info))
 {
     pci_dummy_t *dev = (pci_dummy_t *) calloc(1, sizeof(pci_dummy_t));
 
-    pci_add_card(PCI_ADD_NORMAL, pci_dummy_pci_read, pci_dummy_pci_write, dev,  &dev->pci_slot);
+    pci_add_card(PCI_ADD_NORMAL, pci_dummy_pci_read, pci_dummy_pci_write, dev, &dev->pci_slot);
 
     return dev;
 }
@@ -291,7 +291,7 @@ const device_t pci_dummy_device = {
     .init          = pci_dummy_card_init,
     .close         = pci_dummy_close,
     .reset         = pci_dummy_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/pic.c b/src/pic.c
index b06501ea0..500380785 100644
--- a/src/pic.c
+++ b/src/pic.c
@@ -17,6 +17,7 @@
  *          Copyright 2015-2020 Andrew Jenner.
  *          Copyright 2016-2020 Miran Grca.
  */
+#include <inttypes.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -244,7 +245,7 @@ pic_update_pending_at(void)
 }
 
 static void
-pic_callback(void *priv)
+pic_callback(UNUSED(void *priv))
 {
     update_pending();
 }
@@ -522,7 +523,7 @@ pic_read(uint16_t addr, void *priv)
            simply read whatever is currently on the data bus. */
     }
 
-    pic_log("pic_read(%04X, %08X) = %02X\n", addr, priv, dev->data_bus);
+    pic_log("pic_read(%04X) = %02X\n", addr, dev->data_bus);
 
     return dev->data_bus;
 }
@@ -654,7 +655,7 @@ pic_reset_hard(void)
     /* The situation is as follows: There is a giant mess when it comes to these latches on real hardware,
        to the point that there's even boards with board-level latched that get used in place of the latches
        on the chipset, therefore, I'm just doing this here for the sake of simplicity. */
-    if (machine_has_bus(machine, MACHINE_BUS_PS2_LATCH)) {
+    if (machine_has_flags(machine, MACHINE_PS2_KBC)) {
         pic_kbd_latch(0x01);
         pic_mouse_latch(0x01);
     } else {
@@ -673,6 +674,25 @@ pic_pc98_reset_hard(void)
     latched_irqs = 0x0000;
 }
 
+void
+pic_toggle_latch(int is_ps2)
+{
+    pic_kbd_latch(0x00);
+    pic_mouse_latch(0x00);
+
+    /* Explicitly reset the latches. */
+    kbd_latch = mouse_latch = 0;
+    latched_irqs = 0x0000;
+
+    /* The situation is as follows: There is a giant mess when it comes to these latches on real hardware,
+       to the point that there's even boards with board-level latched that get used in place of the latches
+       on the chipset, therefore, I'm just doing this here for the sake of simplicity. */
+    if (is_ps2) {
+        pic_kbd_latch(0x01);
+        pic_mouse_latch(0x01);
+    }
+}
+
 void
 pic_init(void)
 {
@@ -725,6 +745,13 @@ picint_common(uint16_t num, int level, int set, uint8_t *irq_state)
     uint16_t lines = level ? 0x0000 : num;
     pic_t   *dev;
 
+    /*
+       Do this because some emulated cards will, for whatever reason, attempt to
+       raise an IRQ at init when the PIC has not yet been properly initialized.
+     */
+    if (update_pending == NULL)
+        return;
+
     /* Make sure to ignore all slave IRQ's, and in case of AT+,
        translate IRQ 2 to IRQ 9. */
     for (uint8_t i = 0; i < 8; i++) {
diff --git a/src/pit.c b/src/pit.c
index 55406ed4c..e1ba3b92e 100644
--- a/src/pit.c
+++ b/src/pit.c
@@ -47,6 +47,9 @@ pit_intf_t pit_devs[2];
 
 double cpuclock;
 double PITCONSTD;
+double PAS16CONSTD;
+double PAS16CONST2D;
+double PASSCSICONSTD;
 double SYSCLK;
 double isa_timing;
 double bus_timing;
@@ -56,6 +59,9 @@ double PCICLK;
 double AGPCLK;
 
 uint64_t PITCONST;
+uint64_t PAS16CONST;
+uint64_t PAS16CONST2;
+uint64_t PASSCSICONST;
 uint64_t ISACONST;
 uint64_t CGACONST;
 uint64_t MDACONST;
@@ -94,13 +100,16 @@ pit_log(const char *fmt, ...)
 #endif
 
 static void
-ctr_set_out(ctr_t *ctr, int out)
+ctr_set_out(ctr_t *ctr, int out, void *priv)
 {
+    pit_t *pit = (pit_t *)priv;
+
     if (ctr == NULL)
         return;
 
     if (ctr->out_func != NULL)
-        ctr->out_func(out, ctr->out);
+        ctr->out_func(out, ctr->out, pit);
+
     ctr->out = out;
 }
 
@@ -146,8 +155,9 @@ ctr_load_count(ctr_t *ctr)
 }
 
 static void
-ctr_tick(ctr_t *ctr)
+ctr_tick(ctr_t *ctr, void *priv)
 {
+    pit_t *pit = (pit_t *)priv;
     uint8_t state = ctr->state;
 
     if ((state & 0x03) == 0x01) {
@@ -155,7 +165,7 @@ ctr_tick(ctr_t *ctr)
         ctr_load_count(ctr);
         ctr->state++;
         if (((ctr->m & 0x07) == 0x01) && (ctr->state == 2))
-            ctr_set_out(ctr, 0);
+            ctr_set_out(ctr, 0, pit);
     } else  switch (ctr->m & 0x07) {
         case 0:
             /* Interrupt on terminal count */
@@ -165,7 +175,7 @@ ctr_tick(ctr_t *ctr)
                         ctr_decrease_count(ctr);
                         if (ctr->count < 1) {
                             ctr->state = 3;
-                            ctr_set_out(ctr, 1);
+                            ctr_set_out(ctr, 1, pit);
                         }
                     }
                     break;
@@ -185,7 +195,7 @@ ctr_tick(ctr_t *ctr)
                         ctr_decrease_count(ctr);
                         if (ctr->count < 1) {
                             ctr->state = 3;
-                            ctr_set_out(ctr, 1);
+                            ctr_set_out(ctr, 1, pit);
                         }
                     }
                     break;
@@ -205,7 +215,7 @@ ctr_tick(ctr_t *ctr)
                 case 3:
                     ctr_load_count(ctr);
                     ctr->state = 2;
-                    ctr_set_out(ctr, 1);
+                    ctr_set_out(ctr, 1, pit);
                     break;
                 case 2:
                     if (ctr->gate == 0)
@@ -214,7 +224,7 @@ ctr_tick(ctr_t *ctr)
                         ctr_decrease_count(ctr);
                         if (ctr->count < 2) {
                             ctr->state = 3;
-                            ctr_set_out(ctr, 0);
+                            ctr_set_out(ctr, 0, pit);
                         }
                     }
                     break;
@@ -237,10 +247,10 @@ ctr_tick(ctr_t *ctr)
                                 ctr_decrease_count(ctr);
                         } else
                             ctr->count -= (ctr->newcount ? 1 : 2);
-                        if (ctr->count < 0) {
+                        if (ctr->count == 0) {
+                            ctr_set_out(ctr, 0, pit);
                             ctr_load_count(ctr);
                             ctr->state = 3;
-                            ctr_set_out(ctr, 0);
                         } else if (ctr->newcount)
                             ctr->newcount = 0;
                     }
@@ -256,10 +266,10 @@ ctr_tick(ctr_t *ctr)
                                 ctr_decrease_count(ctr);
                         } else
                             ctr->count -= (ctr->newcount ? 3 : 2);
-                        if (ctr->count < 0) {
+                        if (ctr->count == 0) {
+                            ctr_set_out(ctr, 1, pit);
                             ctr_load_count(ctr);
                             ctr->state = 2;
-                            ctr_set_out(ctr, 1);
                         } else if (ctr->newcount)
                             ctr->newcount = 0;
                     }
@@ -284,13 +294,13 @@ ctr_tick(ctr_t *ctr)
                             ctr_decrease_count(ctr);
                             if (ctr->count < 1) {
                                 ctr->state = 3;
-                                ctr_set_out(ctr, 0);
+                                ctr_set_out(ctr, 0, pit);
                             }
                         }
                         break;
                     case 3:
                         ctr->state = 0;
-                        ctr_set_out(ctr, 1);
+                        ctr_set_out(ctr, 1, pit);
                         break;
 
                     default:
@@ -303,7 +313,7 @@ ctr_tick(ctr_t *ctr)
     }
 }
 
-static void
+void
 ctr_clock(void *data, int counter_id)
 {
     pit_t *pit = (pit_t *) data;
@@ -316,7 +326,7 @@ ctr_clock(void *data, int counter_id)
     if (ctr->using_timer)
         return;
 
-    ctr_tick(ctr);
+    ctr_tick(ctr, pit);
 }
 
 static void
@@ -324,7 +334,7 @@ ctr_set_state_1(ctr_t *ctr)
 {
     uint8_t mode = (ctr->m & 0x03);
     int do_reload = !!ctr->incomplete || (mode == 0) || (ctr->state == 0);
-
+ 
     ctr->incomplete = 0;
 
     if (do_reload)
@@ -348,10 +358,20 @@ ctr_load(ctr_t *ctr)
     else
         ctr_set_state_1(ctr);
 
-    if (ctr->load_func != NULL)
-        ctr->load_func(ctr->m, ctr->l ? ctr->l : 0x10000);
+    if (ctr->load_func != NULL) {
+        uint32_t count = ctr->l ? ctr->l : 0x10000;
+        if (ctr->bcd) {
+            uint32_t bcd_count = (((count >> 16) & 0xf) * 10000) |
+                                 (((count >> 12) & 0xf) * 1000 ) |
+                                 (((count >> 8 ) & 0xf) * 100  ) |
+                                 (((count >> 4 ) & 0xf) * 10   ) |
+                                 (count & 0xf);
+            ctr->load_func(ctr->m, bcd_count);
+        } else
+            ctr->load_func(ctr->m, ctr->l ? ctr->l : 0x10000);
+    }
 
-    pit_log("Counter loaded, state = %i, gate = %i\n", ctr->state, ctr->gate);
+    pit_log("Counter loaded, state = %i, gate = %i, latch = %i\n", ctr->state, ctr->gate, ctr->latch);
 }
 
 static __inline void
@@ -390,7 +410,7 @@ ctr_latch_count(ctr_t *ctr)
             break;
     }
 
-    pit_log("latched counter = %04X\n", ctr->rl & 0xffff);
+    pit_log("rm = %x, latched counter = %04X\n", ctr->rm & 0x03, ctr->rl & 0xffff);
 }
 
 uint16_t
@@ -415,7 +435,7 @@ pit_ctr_set_load_func(void *data, int counter_id, void (*func)(uint8_t new_m, in
 }
 
 void
-pit_ctr_set_out_func(void *data, int counter_id, void (*func)(int new_out, int old_out))
+pit_ctr_set_out_func(void *data, int counter_id, void (*func)(int new_out, int old_out, void *priv))
 {
     if (data == NULL)
         return;
@@ -435,8 +455,6 @@ pit_ctr_set_gate(void *data, int counter_id, int gate)
     int     old  = ctr->gate;
     uint8_t mode = ctr->m & 3;
 
-    ctr->gate = gate;
-
     switch (mode) {
         case 1:
         case 2:
@@ -448,25 +466,28 @@ pit_ctr_set_gate(void *data, int counter_id, int gate)
                 /* Here we handle the rising edges. */
                 if (mode & 1) {
                     if (mode != 1)
-                        ctr_set_out(ctr, 1);
+                        ctr_set_out(ctr, 1, pit);
                     ctr->state = 1;
                 } else if (mode == 2)
                     ctr->state = 3;
             } else if (old && !gate) {
                 /* Here we handle the lowering edges. */
                 if (mode & 2)
-                    ctr_set_out(ctr, 1);
+                    ctr_set_out(ctr, 1, pit);
             }
             break;
 
         default:
             break;
     }
+
+    ctr->gate = gate;
 }
 
 static __inline void
-pit_ctr_set_clock_common(ctr_t *ctr, int clock)
+pit_ctr_set_clock_common(ctr_t *ctr, int clock, void *priv)
 {
+    pit_t *pit = (pit_t *)priv;
     int old = ctr->clock;
 
     ctr->clock = clock;
@@ -484,18 +505,18 @@ pit_ctr_set_clock_common(ctr_t *ctr, int clock)
                 ctr->s1_det++; /* Falling edge. */
                 if (ctr->s1_det >= 2) {
                     ctr->s1_det = 0;
-                    ctr_tick(ctr);
+                    ctr_tick(ctr, pit);
                 }
             }
         } else if (old && !ctr->clock)
-            ctr_tick(ctr);
+            ctr_tick(ctr, pit);
     }
 }
 
 void
-pit_ctr_set_clock(ctr_t *ctr, int clock)
+pit_ctr_set_clock(ctr_t *ctr, int clock, void *priv)
 {
-    pit_ctr_set_clock_common(ctr, clock);
+    pit_ctr_set_clock_common(ctr, clock, priv);
 }
 
 void
@@ -515,10 +536,10 @@ pit_timer_over(void *priv)
 
     dev->clock ^= 1;
 
-    for (uint8_t i = 0; i < 3; i++)
-        pit_ctr_set_clock_common(&dev->counters[i], dev->clock);
+    for (uint8_t i = 0; i < NUM_COUNTERS; i++)
+        pit_ctr_set_clock_common(&dev->counters[i], dev->clock, dev);
 
-    timer_advance_u64(&dev->callback_timer, PITCONST >> 1ULL);
+    timer_advance_u64(&dev->callback_timer, dev->pit_const >> 1ULL);
 }
 
 static void
@@ -528,7 +549,10 @@ pit_write(uint16_t addr, uint8_t val, void *priv)
     int    t   = (addr & 3);
     ctr_t *ctr;
 
-    pit_log("[%04X:%08X] pit_write(%04X, %02X, %08X)\n", CS, cpu_state.pc, addr, val, priv);
+    if ((dev->flags & (PIT_8254 | PIT_EXT_IO))) {
+        pit_log("[%04X:%08X] pit_write(%04X, %02X, %016" PRIX64 ")\n",
+                CS, cpu_state.pc, addr, val, (uint64_t) (uintptr_t) priv);
+    }
 
     switch (addr & 3) {
         case 3: /* control */
@@ -544,7 +568,9 @@ pit_write(uint16_t addr, uint8_t val, void *priv)
                             ctr_latch_count(&dev->counters[1]);
                         if (val & 8)
                             ctr_latch_count(&dev->counters[2]);
-                        pit_log("PIT %i: Initiated readback command\n", t);
+                        if ((dev->flags & (PIT_8254 | PIT_EXT_IO))) {
+                            pit_log("PIT %i: Initiated readback command\n", t);
+                        }
                     }
                     if (!(val & 0x10)) {
                         if (val & 2)
@@ -561,8 +587,10 @@ pit_write(uint16_t addr, uint8_t val, void *priv)
 
                 if (!(dev->ctrl & 0x30)) {
                     ctr_latch_count(ctr);
-                    pit_log("PIT %i: Initiated latched read, %i bytes latched\n",
+                    if ((dev->flags & (PIT_8254 | PIT_EXT_IO))) {
+                        pit_log("PIT %i: Initiated latched read, %i bytes latched\n",
                             t, ctr->latched);
+                    }
                 } else {
                     ctr->ctrl = val;
                     ctr->rm = ctr->wm = (ctr->ctrl >> 4) & 3;
@@ -571,14 +599,18 @@ pit_write(uint16_t addr, uint8_t val, void *priv)
                         ctr->m &= 3;
                     ctr->null_count = 1;
                     ctr->bcd        = (ctr->ctrl & 0x01);
-                    ctr_set_out(ctr, !!ctr->m);
+                    ctr_set_out(ctr, !!ctr->m, dev);
                     ctr->state = 0;
                     if (ctr->latched) {
-                        pit_log("PIT %i: Reload while counter is latched\n", t);
+                        if ((dev->flags & (PIT_8254 | PIT_EXT_IO))) {
+                            pit_log("PIT %i: Reload while counter is latched\n", t);
+                        }
                         ctr->rl--;
                     }
 
-                    pit_log("PIT %i: M = %i, RM/WM = %i, State = %i, Out = %i\n", t, ctr->m, ctr->rm, ctr->state, ctr->out);
+                    if ((dev->flags & (PIT_8254 | PIT_EXT_IO))) {
+                        pit_log("PIT %i: M = %i, RM/WM = %i, State = %i, Out = %i\n", t, ctr->m, ctr->rm, ctr->state, ctr->out);
+                    }
                 }
             }
             break;
@@ -594,31 +626,48 @@ pit_write(uint16_t addr, uint8_t val, void *priv)
                     break;
                 case 1:
                     ctr->l = val;
+                    ctr->lback = ctr->l;
+                    ctr->lback2 = ctr->l;
+                    if ((dev->flags & (PIT_8254 | PIT_EXT_IO))) {
+                        pit_log("PIT %i (1): Written byte %02X, latch now %04X\n", t, val, ctr->l);
+                    }
                     if (ctr->m == 0)
-                        ctr_set_out(ctr, 0);
+                        ctr_set_out(ctr, 0, dev);
                     ctr_load(ctr);
                     break;
                 case 2:
                     ctr->l = (val << 8);
+                    ctr->lback = ctr->l;
+                    ctr->lback2 = ctr->l;
+                    if ((dev->flags & (PIT_8254 | PIT_EXT_IO))) {
+                        pit_log("PIT %i (2): Written byte %02X, latch now %04X\n", t, val, ctr->l);
+                    }
                     if (ctr->m == 0)
-                        ctr_set_out(ctr, 0);
+                        ctr_set_out(ctr, 0, dev);
                     ctr_load(ctr);
                     break;
                 case 3:
                 case 0x83:
                     if (ctr->wm & 0x80) {
                         ctr->l = (ctr->l & 0x00ff) | (val << 8);
-                        pit_log("PIT %i: Written high byte %02X, latch now %04X\n", t, val, ctr->l);
+                        ctr->lback = ctr->l;
+                        ctr->lback2 = ctr->l;
+                        if ((dev->flags & (PIT_8254 | PIT_EXT_IO))) {
+                            pit_log("PIT %i (0x83): Written high byte %02X, latch now %04X\n", t, val, ctr->l);
+                        }
                         ctr_load(ctr);
                     } else {
                         ctr->l = (ctr->l & 0xff00) | val;
-                        pit_log("PIT %i: Written low byte %02X, latch now %04X\n", t, val, ctr->l);
+                        ctr->lback = ctr->l;
+                        ctr->lback2 = ctr->l;
+                        if ((dev->flags & (PIT_8254 | PIT_EXT_IO))) {
+                            pit_log("PIT %i (3): Written low byte %02X, latch now %04X\n", t, val, ctr->l);
+                        }
                         if (ctr->m == 0) {
                             ctr->state = 0;
-                            ctr_set_out(ctr, 0);
+                            ctr_set_out(ctr, 0, dev);
                         }
                     }
-
                     if (ctr->wm & 0x80)
                         ctr->wm &= ~0x80;
                     else
@@ -749,13 +798,16 @@ pit_read(uint16_t addr, void *priv)
             break;
     }
 
-    pit_log("[%04X:%08X] pit_read(%04X, %08X) = %02X\n", CS, cpu_state.pc, addr, priv, ret);
+    if ((dev->flags & (PIT_8254 | PIT_EXT_IO))) {
+        pit_log("[%04X:%08X] pit_read(%04X, %016" PRIX64 ") = %02X\n",
+                CS, cpu_state.pc, addr, (uint64_t) (uintptr_t) priv, ret);
+    }
 
     return ret;
 }
 
 void
-pit_irq0_timer_ps2(int new_out, int old_out)
+pit_irq0_timer_ps2(int new_out, int old_out, UNUSED(void *priv))
 {
     if (new_out && !old_out) {
         picint(1);
@@ -770,21 +822,21 @@ pit_irq0_timer_ps2(int new_out, int old_out)
 }
 
 void
-pit_refresh_timer_xt(int new_out, int old_out)
+pit_refresh_timer_xt(int new_out, int old_out, UNUSED(void *priv))
 {
     if (new_out && !old_out)
         dma_channel_read(0);
 }
 
 void
-pit_refresh_timer_at(int new_out, int old_out)
+pit_refresh_timer_at(int new_out, int old_out, UNUSED(void *priv))
 {
     if (refresh_at_enable && new_out && !old_out)
         ppi.pb ^= 0x10;
 }
 
 void
-pit_speaker_timer(int new_out, UNUSED(int old_out))
+pit_speaker_timer(int new_out, UNUSED(int old_out), UNUSED(void *priv))
 {
     int l;
 
@@ -804,7 +856,7 @@ pit_speaker_timer(int new_out, UNUSED(int old_out))
 }
 
 void
-pit_nmi_timer_ps2(int new_out, UNUSED(int old_out))
+pit_nmi_timer_ps2(int new_out, UNUSED(int old_out), UNUSED(void *priv))
 {
     nmi = new_out;
 
@@ -829,6 +881,15 @@ ctr_reset(ctr_t *ctr)
     ctr->l_det  = 0;
 }
 
+void
+pit_device_reset(pit_t *dev)
+{
+    dev->clock = 0;
+
+    for (uint8_t i = 0; i < NUM_COUNTERS; i++)
+        ctr_reset(&dev->counters[i]);
+}
+
 void
 pit_reset(pit_t *dev)
 {
@@ -836,7 +897,7 @@ pit_reset(pit_t *dev)
 
     dev->clock = 0;
 
-    for (uint8_t i = 0; i < 3; i++)
+    for (uint8_t i = 0; i < NUM_COUNTERS; i++)
         ctr_reset(&dev->counters[i]);
 
     /* Disable speaker gate. */
@@ -849,6 +910,20 @@ pit_handler(int set, uint16_t base, int size, void *priv)
     io_handler(set, base, size, pit_read, NULL, NULL, pit_write, NULL, NULL, priv);
 }
 
+void
+pit_set_pit_const(void *data, uint64_t pit_const)
+{
+    pit_t *pit = (pit_t *) data;
+
+    pit->pit_const = pit_const;
+}
+
+static void
+pit_speed_changed(void *priv)
+{
+    pit_set_pit_const(priv, PITCONST);
+}
+
 static void
 pit_close(void *priv)
 {
@@ -868,14 +943,18 @@ static void *
 pit_init(const device_t *info)
 {
     pit_t *dev = (pit_t *) malloc(sizeof(pit_t));
+
     pit_reset(dev);
 
+    pit_set_pit_const(dev, PITCONST);
+
     if (!(dev->flags & PIT_PS2) && !(dev->flags & PIT_CUSTOM_CLOCK)) {
         timer_add(&dev->callback_timer, pit_timer_over, (void *) dev, 0);
-        timer_set_delay_u64(&dev->callback_timer, PITCONST >> 1ULL);
+        timer_set_delay_u64(&dev->callback_timer, dev->pit_const >> 1ULL);
     }
 
     dev->flags = info->local;
+    dev->dev_priv = NULL;
 
     if (!(dev->flags & PIT_EXT_IO)) {
         io_sethandler((dev->flags & PIT_SECONDARY) ? 0x0048 : 0x0040, 0x0004,
@@ -910,7 +989,21 @@ const device_t i8253_device = {
     .init          = pit_init,
     .close         = pit_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = pit_speed_changed,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t i8253_ext_io_device = {
+    .name          = "Intel 8253 Programmable Interval Timer (External I/O)",
+    .internal_name = "i8253_ext_io",
+    .flags         = DEVICE_ISA,
+    .local         = PIT_8253 | PIT_EXT_IO,
+    .init          = pit_init,
+    .close         = pit_close,
+    .reset         = NULL,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -938,8 +1031,8 @@ const device_t i8254_device = {
     .init          = pit_init,
     .close         = pit_close,
     .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
+    .available     = NULL,
+    .speed_changed = pit_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
 };
@@ -952,8 +1045,8 @@ const device_t i8254_sec_device = {
     .init          = pit_init,
     .close         = pit_close,
     .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
+    .available     = NULL,
+    .speed_changed = pit_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
 };
@@ -966,7 +1059,7 @@ const device_t i8254_ext_io_device = {
     .init          = pit_init,
     .close         = pit_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -980,14 +1073,14 @@ const device_t i8254_ps2_device = {
     .init          = pit_init,
     .close         = pit_close,
     .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
+    .available     = NULL,
+    .speed_changed = pit_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
 };
 
 pit_t *
-pit_common_init(int type, void (*out0)(int new_out, int old_out), void (*out1)(int new_out, int old_out))
+pit_common_init(int type, void (*out0)(int new_out, int old_out, void *priv), void (*out1)(int new_out, int old_out, void *priv))
 {
     void *pit;
 
@@ -1066,6 +1159,13 @@ pit_ps2_init(int type)
     return pit;
 }
 
+void
+pit_change_pas16_consts(double prescale)
+{
+    PAS16CONST  = (uint64_t) ((PAS16CONSTD / prescale) * (double) (1ULL << 32));
+    PAS16CONST2 = (uint64_t) ((PAS16CONST2D / prescale) * (double) (1ULL << 32));
+}
+
 void
 pit_set_clock(uint32_t clock)
 {
@@ -1169,6 +1269,15 @@ pit_set_clock(uint32_t clock)
 
     TIMER_USEC = (uint64_t) ((cpuclock / 1000000.0) * (double) (1ULL << 32));
 
+    PAS16CONSTD = (cpuclock / 441000.0);
+    PAS16CONST  = (uint64_t) (PAS16CONSTD * (double) (1ULL << 32));
+
+    PAS16CONST2D = (cpuclock / 1008000.0);
+    PAS16CONST2  = (uint64_t) (PAS16CONST2D * (double) (1ULL << 32));
+
+    PASSCSICONSTD = (cpuclock / (28224000.0 / 14.0));
+    PASSCSICONST  = (uint64_t) (PASSCSICONSTD * (double) (1ULL << 32));
+
     isa_timing = (cpuclock / (double) cpu_isa_speed);
     if (cpu_64bitbus)
         bus_timing = (cpuclock / (cpu_busspeed / 2));
@@ -1192,13 +1301,14 @@ pit_set_clock(uint32_t clock)
 }
 
 const pit_intf_t pit_classic_intf = {
-    &pit_read,
-    &pit_write,
-    &pit_ctr_get_count,
-    &pit_ctr_set_gate,
-    &pit_ctr_set_using_timer,
-    &pit_ctr_set_out_func,
-    &pit_ctr_set_load_func,
-    &ctr_clock,
-    NULL,
+    .read            = &pit_read,
+    .write           = &pit_write,
+    .get_count       = &pit_ctr_get_count,
+    .set_gate        = &pit_ctr_set_gate,
+    .set_using_timer = &pit_ctr_set_using_timer,
+    .set_out_func    = &pit_ctr_set_out_func,
+    .set_load_func   = &pit_ctr_set_load_func,
+    .ctr_clock       = &ctr_clock,
+    .set_pit_const   = &pit_set_pit_const,
+    .data            = NULL,
 };
diff --git a/src/pit_fast.c b/src/pit_fast.c
index dc3a79131..2ea2bd26e 100644
--- a/src/pit_fast.c
+++ b/src/pit_fast.c
@@ -47,32 +47,34 @@
 #define PIT_CUSTOM_CLOCK 64  /* The PIT uses custom clock inputs provided by another provider. */
 #define PIT_SECONDARY    128 /* The PIT is secondary (ports 0048-004B). */
 
-#ifdef ENABLE_PIT_LOG
-int pit_do_log = ENABLE_PIT_LOG;
+#ifdef ENABLE_PIT_FAST_LOG
+int pit_fast_do_log = ENABLE_PIT_FAST_LOG;
 
 static void
-pit_log(const char *fmt, ...)
+pit_fast_log(const char *fmt, ...)
 {
     va_list ap;
 
-    if (pit_do_log) {
+    if (pit_fast_do_log) {
         va_start(ap, fmt);
         pclog_ex(fmt, ap);
         va_end(ap);
     }
 }
 #else
-#    define pit_log(fmt, ...)
+#    define pit_fast_log(fmt, ...)
 #endif
 
 static void
-pitf_ctr_set_out(ctrf_t *ctr, int out)
+pitf_ctr_set_out(ctrf_t *ctr, int out, void *priv)
 {
+    pitf_t *pit = (pitf_t *)priv;
+
     if (ctr == NULL)
         return;
 
     if (ctr->out_func != NULL)
-        ctr->out_func(out, ctr->out);
+        ctr->out_func(out, ctr->out, pit);
     ctr->out = out;
 }
 
@@ -97,8 +99,8 @@ pitf_ctr_get_count(void *data, int counter_id)
     return (uint16_t) ctr->l;
 }
 
-static void
-pitf_ctr_set_out_func(void *data, int counter_id, void (*func)(int new_out, int old_out))
+void
+pitf_ctr_set_out_func(void *data, int counter_id, void (*func)(int new_out, int old_out, void *priv))
 {
     if (data == NULL)
         return;
@@ -109,7 +111,7 @@ pitf_ctr_set_out_func(void *data, int counter_id, void (*func)(int new_out, int
     ctr->out_func = func;
 }
 
-static void
+void
 pitf_ctr_set_using_timer(void *data, int counter_id, int using_timer)
 {
     if (tsc > 0)
@@ -124,14 +126,14 @@ static int
 pitf_read_timer(ctrf_t *ctr)
 {
     if (ctr->using_timer && !(ctr->m == 3 && !ctr->gate) && timer_is_enabled(&ctr->timer)) {
-        int read = (int) ((timer_get_remaining_u64(&ctr->timer)) / PITCONST);
+        int read = (int) ((timer_get_remaining_u64(&ctr->timer)) / ctr->pit_const);
         if (ctr->m == 2)
             read++;
         if (read < 0)
             read = 0;
         if (read > 0x10000)
             read = 0x10000;
-        if (ctr->m == 3)
+        if ((ctr->m == 3) && ctr->using_timer)
             read <<= 1;
         return read;
     }
@@ -154,8 +156,9 @@ pitf_dump_and_disable_timer(ctrf_t *ctr)
 }
 
 static void
-pitf_ctr_load(ctrf_t *ctr)
+pitf_ctr_load(ctrf_t *ctr, void *priv)
 {
+    pitf_t *pit = (pitf_t *)priv;
     int l = ctr->l ? ctr->l : 0x10000;
 
     ctr->newcount = 0;
@@ -165,8 +168,8 @@ pitf_ctr_load(ctrf_t *ctr)
         case 0: /*Interrupt on terminal count*/
             ctr->count = l;
             if (ctr->using_timer)
-                timer_set_delay_u64(&ctr->timer, (uint64_t) (l * PITCONST));
-            pitf_ctr_set_out(ctr, 0);
+                timer_set_delay_u64(&ctr->timer, (uint64_t) (l * ctr->pit_const));
+            pitf_ctr_set_out(ctr, 0, pit);
             ctr->thit    = 0;
             ctr->enabled = ctr->gate;
             break;
@@ -177,8 +180,8 @@ pitf_ctr_load(ctrf_t *ctr)
             if (ctr->initial) {
                 ctr->count = l - 1;
                 if (ctr->using_timer)
-                    timer_set_delay_u64(&ctr->timer, (uint64_t) ((l - 1) * PITCONST));
-                pitf_ctr_set_out(ctr, 1);
+                    timer_set_delay_u64(&ctr->timer, (uint64_t) ((l - 1) * ctr->pit_const));
+                pitf_ctr_set_out(ctr, 1, pit);
                 ctr->thit = 0;
             }
             ctr->enabled = ctr->gate;
@@ -187,8 +190,10 @@ pitf_ctr_load(ctrf_t *ctr)
             if (ctr->initial) {
                 ctr->count = l;
                 if (ctr->using_timer)
-                    timer_set_delay_u64(&ctr->timer, (uint64_t) (((l + 1) >> 1) * PITCONST));
-                pitf_ctr_set_out(ctr, 1);
+                    timer_set_delay_u64(&ctr->timer, (uint64_t) (((l + 1) >> 1) * ctr->pit_const));
+                else
+                    ctr->newcount = (l & 1);
+                pitf_ctr_set_out(ctr, 1, pit);
                 ctr->thit = 0;
             }
             ctr->enabled = ctr->gate;
@@ -199,8 +204,8 @@ pitf_ctr_load(ctrf_t *ctr)
             else {
                 ctr->count = l;
                 if (ctr->using_timer)
-                    timer_set_delay_u64(&ctr->timer, (uint64_t) (l * PITCONST));
-                pitf_ctr_set_out(ctr, 0);
+                    timer_set_delay_u64(&ctr->timer, (uint64_t) (l * ctr->pit_const));
+                pitf_ctr_set_out(ctr, 0, pit);
                 ctr->thit = 0;
             }
             ctr->enabled = ctr->gate;
@@ -223,8 +228,9 @@ pitf_ctr_load(ctrf_t *ctr)
 }
 
 static void
-pitf_set_gate_no_timer(ctrf_t *ctr, int gate)
+pitf_set_gate_no_timer(ctrf_t *ctr, int gate, void *priv)
 {
+    pitf_t *pit = (pitf_t *)priv;
     int l = ctr->l ? ctr->l : 0x10000;
 
     if (ctr->disabled) {
@@ -236,7 +242,7 @@ pitf_set_gate_no_timer(ctrf_t *ctr, int gate)
         case 0: /*Interrupt on terminal count*/
         case 4: /*Software triggered stobe*/
             if (ctr->using_timer && !ctr->running)
-                timer_set_delay_u64(&ctr->timer, (uint64_t) (l * PITCONST));
+                timer_set_delay_u64(&ctr->timer, (uint64_t) (l * ctr->pit_const));
             ctr->enabled = gate;
             break;
         case 1: /*Hardware retriggerable one-shot*/
@@ -244,8 +250,8 @@ pitf_set_gate_no_timer(ctrf_t *ctr, int gate)
             if (gate && !ctr->gate) {
                 ctr->count = l;
                 if (ctr->using_timer)
-                    timer_set_delay_u64(&ctr->timer, (uint64_t) (l * PITCONST));
-                pitf_ctr_set_out(ctr, 0);
+                    timer_set_delay_u64(&ctr->timer, (uint64_t) (l * ctr->pit_const));
+                pitf_ctr_set_out(ctr, 0, pit);
                 ctr->thit    = 0;
                 ctr->enabled = 1;
             }
@@ -254,8 +260,8 @@ pitf_set_gate_no_timer(ctrf_t *ctr, int gate)
             if (gate && !ctr->gate) {
                 ctr->count = l - 1;
                 if (ctr->using_timer)
-                    timer_set_delay_u64(&ctr->timer, (uint64_t) (l * PITCONST));
-                pitf_ctr_set_out(ctr, 1);
+                    timer_set_delay_u64(&ctr->timer, (uint64_t) (l * ctr->pit_const));
+                pitf_ctr_set_out(ctr, 1, pit);
                 ctr->thit = 0;
             }
             ctr->enabled = gate;
@@ -264,8 +270,10 @@ pitf_set_gate_no_timer(ctrf_t *ctr, int gate)
             if (gate && !ctr->gate) {
                 ctr->count = l;
                 if (ctr->using_timer)
-                    timer_set_delay_u64(&ctr->timer, (uint64_t) (((l + 1) >> 1) * PITCONST));
-                pitf_ctr_set_out(ctr, 1);
+                    timer_set_delay_u64(&ctr->timer, (uint64_t) (((l + 1) >> 1) * ctr->pit_const));
+                else
+                    ctr->newcount = (l & 1);
+                pitf_ctr_set_out(ctr, 1, pit);
                 ctr->thit = 0;
             }
             ctr->enabled = gate;
@@ -280,7 +288,7 @@ pitf_set_gate_no_timer(ctrf_t *ctr, int gate)
         pitf_dump_and_disable_timer(ctr);
 }
 
-static void
+void
 pitf_ctr_set_gate(void *data, int counter_id, int gate)
 {
     pitf_t *pit = (pitf_t *) data;
@@ -291,17 +299,18 @@ pitf_ctr_set_gate(void *data, int counter_id, int gate)
         return;
     }
 
-    pitf_set_gate_no_timer(ctr, gate);
+    pitf_set_gate_no_timer(ctr, gate, pit);
 }
 
 static void
-pitf_over(ctrf_t *ctr)
+pitf_over(ctrf_t *ctr, void *priv)
 {
+    pitf_t *pit = (pitf_t *)priv;
     int l = ctr->l ? ctr->l : 0x10000;
     if (ctr->disabled) {
         ctr->count += 0xffff;
         if (ctr->using_timer)
-            timer_advance_u64(&ctr->timer, (uint64_t) (0xffff * PITCONST));
+            timer_advance_u64(&ctr->timer, (uint64_t) (0xffff * ctr->pit_const));
         return;
     }
 
@@ -309,62 +318,71 @@ pitf_over(ctrf_t *ctr)
         case 0: /*Interrupt on terminal count*/
         case 1: /*Hardware retriggerable one-shot*/
             if (!ctr->thit)
-                pitf_ctr_set_out(ctr, 1);
+                pitf_ctr_set_out(ctr, 1, pit);
             ctr->thit = 1;
             ctr->count += 0xffff;
             if (ctr->using_timer)
-                timer_advance_u64(&ctr->timer, (uint64_t) (0xffff * PITCONST));
+                timer_advance_u64(&ctr->timer, (uint64_t) (0xffff * ctr->pit_const));
             break;
         case 2: /*Rate generator*/
             ctr->count += l;
             if (ctr->using_timer)
-                timer_advance_u64(&ctr->timer, (uint64_t) (l * PITCONST));
-            pitf_ctr_set_out(ctr, 0);
-            pitf_ctr_set_out(ctr, 1);
+                timer_advance_u64(&ctr->timer, (uint64_t) (l * ctr->pit_const));
+            pitf_ctr_set_out(ctr, 0, pit);
+            pitf_ctr_set_out(ctr, 1, pit);
             break;
         case 3: /*Square wave mode*/
             if (ctr->out) {
-                pitf_ctr_set_out(ctr, 0);
-                ctr->count += (l >> 1);
-                if (ctr->using_timer)
-                    timer_advance_u64(&ctr->timer, (uint64_t) ((l >> 1) * PITCONST));
+                pitf_ctr_set_out(ctr, 0, pit);
+                if (ctr->using_timer) {
+                    ctr->count += (l >> 1);
+                    timer_advance_u64(&ctr->timer, (uint64_t) ((l >> 1) * ctr->pit_const));
+                } else {
+                    ctr->count += l;
+                    ctr->newcount = (l & 1);
+                }
             } else {
-                pitf_ctr_set_out(ctr, 1);
+                pitf_ctr_set_out(ctr, 1, pit);
                 ctr->count += ((l + 1) >> 1);
-                if (ctr->using_timer)
-                    timer_advance_u64(&ctr->timer, (uint64_t) (((l + 1) >> 1) * PITCONST));
+                if (ctr->using_timer) {
+                    ctr->count += (l >> 1);
+                    timer_advance_u64(&ctr->timer, (uint64_t) (((l + 1) >> 1) * ctr->pit_const));
+                } else {
+                    ctr->count += l;
+                    ctr->newcount = (l & 1);
+                }
             }
 #if 0
             if (!t)
-                pclog("pit_over: square wave mode c=%x  %lli  %f\n", pit.c[t], tsc, PITCONST);
+                pclog("pit_over: square wave mode c=%x  %lli  %f\n", pit.c[t], tsc, ctr->pit_const);
 #endif
             break;
         case 4: /*Software triggered strove*/
             if (!ctr->thit) {
-                pitf_ctr_set_out(ctr, 0);
-                pitf_ctr_set_out(ctr, 1);
+                pitf_ctr_set_out(ctr, 0, pit);
+                pitf_ctr_set_out(ctr, 1, pit);
             }
             if (ctr->newcount) {
                 ctr->newcount = 0;
                 ctr->count += l;
                 if (ctr->using_timer)
-                    timer_advance_u64(&ctr->timer, (uint64_t) (l * PITCONST));
+                    timer_advance_u64(&ctr->timer, (uint64_t) (l * ctr->pit_const));
             } else {
                 ctr->thit = 1;
                 ctr->count += 0xffff;
                 if (ctr->using_timer)
-                    timer_advance_u64(&ctr->timer, (uint64_t) (0xffff * PITCONST));
+                    timer_advance_u64(&ctr->timer, (uint64_t) (0xffff * ctr->pit_const));
             }
             break;
         case 5: /*Hardware triggered strove*/
             if (!ctr->thit) {
-                pitf_ctr_set_out(ctr, 0);
-                pitf_ctr_set_out(ctr, 1);
+                pitf_ctr_set_out(ctr, 0, pit);
+                pitf_ctr_set_out(ctr, 1, pit);
             }
             ctr->thit = 1;
             ctr->count += 0xffff;
             if (ctr->using_timer)
-                timer_advance_u64(&ctr->timer, (uint64_t) (0xffff * PITCONST));
+                timer_advance_u64(&ctr->timer, (uint64_t) (0xffff * ctr->pit_const));
             break;
 
         default:
@@ -402,7 +420,7 @@ pitf_write(uint16_t addr, uint8_t val, void *priv)
     int     t   = (addr & 3);
     ctrf_t *ctr;
 
-    pit_log("[%04X:%08X] pit_write(%04X, %02X, %08X)\n", CS, cpu_state.pc, addr, val, priv);
+    pit_fast_log("[%04X:%08X] pit_write(%04X, %02X, %08X)\n", CS, cpu_state.pc, addr, val, priv);
 
     cycles -= ISA_CYCLES(8);
 
@@ -420,7 +438,7 @@ pitf_write(uint16_t addr, uint8_t val, void *priv)
                             pitf_ctr_latch_count(&dev->counters[1]);
                         if (val & 8)
                             pitf_ctr_latch_count(&dev->counters[2]);
-                        pit_log("PIT %i: Initiated readback command\n", t);
+                        pit_fast_log("PIT %i: Initiated readback command\n", t);
                     }
                     if (!(val & 0x10)) {
                         if (val & 2)
@@ -438,7 +456,7 @@ pitf_write(uint16_t addr, uint8_t val, void *priv)
                 if (!(dev->ctrl & 0x30)) {
                     pitf_ctr_latch_count(ctr);
                     dev->ctrl |= 0x30;
-                    pit_log("PIT %i: Initiated latched read, %i bytes latched\n",
+                    pit_fast_log("PIT %i: Initiated latched read, %i bytes latched\n",
                             t, ctr->latched);
                 } else {
                     ctr->ctrl = val;
@@ -453,12 +471,12 @@ pitf_write(uint16_t addr, uint8_t val, void *priv)
                     ctr->rereadlatch = 1;
                     ctr->initial     = 1;
                     if (!ctr->m)
-                        pitf_ctr_set_out(ctr, 0);
+                        pitf_ctr_set_out(ctr, 0, dev);
                     else
-                        pitf_ctr_set_out(ctr, 1);
+                        pitf_ctr_set_out(ctr, 1, dev);
                     ctr->disabled = 1;
 
-                    pit_log("PIT %i: M = %i, RM/WM = %i, State = %i, Out = %i\n", t, ctr->m, ctr->rm, ctr->state, ctr->out);
+                    pit_fast_log("PIT %i: M = %i, RM/WM = %i, Out = %i\n", t, ctr->m, ctr->rm, ctr->out);
                 }
                 ctr->thit = 0;
             }
@@ -472,16 +490,16 @@ pitf_write(uint16_t addr, uint8_t val, void *priv)
             switch (ctr->wm) {
                 case 1:
                     ctr->l = val;
-                    pitf_ctr_load(ctr);
+                    pitf_ctr_load(ctr, dev);
                     break;
                 case 2:
                     ctr->l = (val << 8);
-                    pitf_ctr_load(ctr);
+                    pitf_ctr_load(ctr, dev);
                     break;
                 case 0:
                     ctr->l &= 0xFF;
                     ctr->l |= (val << 8);
-                    pitf_ctr_load(ctr);
+                    pitf_ctr_load(ctr, dev);
                     ctr->wm = 3;
                     break;
                 case 3:
@@ -601,7 +619,7 @@ pitf_read(uint16_t addr, void *priv)
             break;
     }
 
-    pit_log("[%04X:%08X] pit_read(%04X, %08X) = %02X\n", CS, cpu_state.pc, addr, priv, ret);
+    pit_fast_log("[%04X:%08X] pit_read(%04X, %08X) = %02X\n", CS, cpu_state.pc, addr, priv, ret);
 
     return ret;
 }
@@ -610,10 +628,11 @@ static void
 pitf_timer_over(void *priv)
 {
     ctrf_t *ctr = (ctrf_t *) priv;
-    pitf_over(ctr);
+    pit_t *pit = (pit_t *)ctr->priv;
+    pitf_over(ctr, pit);
 }
 
-static void
+void
 pitf_ctr_clock(void *data, int counter_id)
 {
     pitf_t *pit = (pitf_t *) data;
@@ -625,9 +644,14 @@ pitf_ctr_clock(void *data, int counter_id)
     if (ctr->using_timer)
         return;
 
-    ctr->count -= (ctr->m == 3) ? 2 : 1;
+    if ((ctr->m == 3) && ctr->newcount) {
+        ctr->count -= ctr->out ? 1 : 3;
+        ctr->newcount = 0;
+    } else
+        ctr->count -= (ctr->m == 3) ? 2 : 1;
+
     if (!ctr->count)
-        pitf_over(ctr);
+        pitf_over(ctr, pit);
 }
 
 static void
@@ -646,13 +670,31 @@ pitf_reset(pitf_t *dev)
 {
     memset(dev, 0, sizeof(pitf_t));
 
-    for (uint8_t i = 0; i < 3; i++)
+    for (uint8_t i = 0; i < NUM_COUNTERS; i++)
         ctr_reset(&dev->counters[i]);
 
     /* Disable speaker gate. */
     dev->counters[2].gate = 0;
 }
 
+void
+pitf_set_pit_const(void *data, uint64_t pit_const)
+{
+    pitf_t *pit = (pitf_t *) data;
+    ctrf_t *ctr;
+
+    for (uint8_t i = 0; i < NUM_COUNTERS; i++) {
+        ctr = &pit->counters[i];
+        ctr->pit_const = pit_const;
+    }
+}
+
+static void
+pitf_speed_changed(void *priv)
+{
+    pitf_set_pit_const(priv, PITCONST);
+}
+
 static void
 pitf_close(void *priv)
 {
@@ -668,17 +710,27 @@ pitf_close(void *priv)
         free(dev);
 }
 
+void
+pitf_handler(int set, uint16_t base, int size, void *priv)
+{
+    io_handler(set, base, size, pitf_read, NULL, NULL, pitf_write, NULL, NULL, priv);
+}
+
 static void *
 pitf_init(const device_t *info)
 {
     pitf_t *dev = (pitf_t *) malloc(sizeof(pitf_t));
+
     pitf_reset(dev);
 
+    pitf_set_pit_const(dev, PITCONST);
+
     dev->flags = info->local;
 
     if (!(dev->flags & PIT_PS2) && !(dev->flags & PIT_CUSTOM_CLOCK)) {
-        for (int i = 0; i < 3; i++) {
+        for (int i = 0; i < NUM_COUNTERS; i++) {
             ctrf_t *ctr = &dev->counters[i];
+            ctr->priv = dev;
             timer_add(&ctr->timer, pitf_timer_over, (void *) ctr, 0);
         }
     }
@@ -718,8 +770,8 @@ const device_t i8253_fast_device = {
     .init          = pitf_init,
     .close         = pitf_close,
     .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
+    .available     = NULL,
+    .speed_changed = pitf_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
 };
@@ -746,8 +798,8 @@ const device_t i8254_fast_device = {
     .init          = pitf_init,
     .close         = pitf_close,
     .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
+    .available     = NULL,
+    .speed_changed = pitf_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
 };
@@ -760,8 +812,8 @@ const device_t i8254_sec_fast_device = {
     .init          = pitf_init,
     .close         = pitf_close,
     .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
+    .available     = NULL,
+    .speed_changed = pitf_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
 };
@@ -774,7 +826,7 @@ const device_t i8254_ext_io_fast_device = {
     .init          = pitf_init,
     .close         = pitf_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -788,20 +840,21 @@ const device_t i8254_ps2_fast_device = {
     .init          = pitf_init,
     .close         = pitf_close,
     .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
+    .available     = NULL,
+    .speed_changed = pitf_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
 };
 
 const pit_intf_t pit_fast_intf = {
-    &pitf_read,
-    &pitf_write,
-    &pitf_ctr_get_count,
-    &pitf_ctr_set_gate,
-    &pitf_ctr_set_using_timer,
-    &pitf_ctr_set_out_func,
-    &pitf_ctr_set_load_func,
-    &pitf_ctr_clock,
-    NULL,
+    .read            = &pitf_read,
+    .write           = &pitf_write,
+    .get_count       = &pitf_ctr_get_count,
+    .set_gate        = &pitf_ctr_set_gate,
+    .set_using_timer = &pitf_ctr_set_using_timer,
+    .set_out_func    = &pitf_ctr_set_out_func,
+    .set_load_func   = &pitf_ctr_set_load_func,
+    .ctr_clock       = &pitf_ctr_clock,
+    .set_pit_const   = &pitf_set_pit_const,
+    .data            = NULL,
 };
diff --git a/src/port_6x.c b/src/port_6x.c
index 971b92d28..b8183d651 100644
--- a/src/port_6x.c
+++ b/src/port_6x.c
@@ -212,7 +212,7 @@ const device_t port_6x_device = {
     .init          = port_6x_init,
     .close         = port_6x_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -226,7 +226,7 @@ const device_t port_6x_xi8088_device = {
     .init          = port_6x_init,
     .close         = port_6x_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -240,7 +240,7 @@ const device_t port_6x_ps2_device = {
     .init          = port_6x_init,
     .close         = port_6x_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -254,7 +254,7 @@ const device_t port_6x_olivetti_device = {
     .init          = port_6x_init,
     .close         = port_6x_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/port_92.c b/src/port_92.c
index 1307ecba9..d1a53a321 100644
--- a/src/port_92.c
+++ b/src/port_92.c
@@ -36,6 +36,7 @@
 #define PORT_92_PCI   4
 #define PORT_92_RESET 8
 #define PORT_92_A20   16
+#define PORT_92_KEY   32
 
 static uint8_t
 port_92_readb(uint16_t port, void *priv)
@@ -46,7 +47,10 @@ port_92_readb(uint16_t port, void *priv)
     if (port == 0x92) {
         /* Return bit 1 directly from mem_a20_alt, so the
            pin can be reset independently of the device. */
-        ret = (dev->reg & ~0x03) | (mem_a20_alt & 2) | (cpu_alt_reset & 1);
+        if (dev->flags & PORT_92_KEY)
+            ret = (dev->reg & ~0x03) | (mem_a20_key & 2) | (cpu_alt_reset & 1);
+        else
+            ret = (dev->reg & ~0x03) | (mem_a20_alt & 2) | (cpu_alt_reset & 1);
 
         if (dev->flags & PORT_92_INV)
             ret |= 0xfc;
@@ -94,8 +98,11 @@ port_92_writeb(uint16_t port, uint8_t val, void *priv)
 
     dev->reg = val & 0x03;
 
-    if ((mem_a20_alt ^ val) & 2) {
-        mem_a20_alt = (val & 2);
+    if (dev->flags & PORT_92_KEY) {
+        mem_a20_key = val & 2;
+        mem_a20_recalc();
+    } else if ((mem_a20_alt ^ val) & 2) {
+        mem_a20_alt = (mem_a20_alt & 0xfd) | (val & 2);
         mem_a20_recalc();
     }
 
@@ -228,7 +235,21 @@ const device_t port_92_device = {
     .init          = port_92_init,
     .close         = port_92_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t port_92_key_device = {
+    .name          = "Port 92 Register (using A20 key)",
+    .internal_name = "port_92_key",
+    .flags         = 0,
+    .local         = PORT_92_KEY,
+    .init          = port_92_init,
+    .close         = port_92_close,
+    .reset         = NULL,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -242,7 +263,7 @@ const device_t port_92_inv_device = {
     .init          = port_92_init,
     .close         = port_92_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -256,7 +277,7 @@ const device_t port_92_word_device = {
     .init          = port_92_init,
     .close         = port_92_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -270,7 +291,7 @@ const device_t port_92_pci_device = {
     .init          = port_92_init,
     .close         = port_92_close,
     .reset         = port_92_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/printer/CMakeLists.txt b/src/printer/CMakeLists.txt
index dea0c7fbe..0efb2aec2 100644
--- a/src/printer/CMakeLists.txt
+++ b/src/printer/CMakeLists.txt
@@ -9,11 +9,23 @@
 #          CMake build script.
 #
 # Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
 #
 #          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2024      Jasmine Iwanek.
 #
 
-add_library(print OBJECT png.c prt_cpmap.c prt_escp.c prt_text.c prt_ps.c)
+add_library(print OBJECT
+    png.c
+    prt_cpmap.c
+    prt_escp.c
+    prt_text.c
+    prt_ps.c
+)
+
+if(PCL)
+    target_compile_definitions(print PRIVATE USE_PCL)
+endif()
 
 if(APPLE)
     find_library(GHOSTSCRIPT_LIB gs)
@@ -25,10 +37,14 @@ endif()
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(FREETYPE REQUIRED IMPORTED_TARGET freetype2)
 target_link_libraries(86Box PkgConfig::FREETYPE)
+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+	target_include_directories(print PRIVATE /usr/local/include)
+	target_include_directories(print PRIVATE /usr/local/include/freetype2)
+endif()
 if(STATIC_BUILD)
-    if(QT)
+    # if(QT)
         # Qt provides its own version of harfbuzz which leads to duplicated symbols.
         target_link_options(86Box PRIVATE "LINKER:--allow-multiple-definition")
-    endif()
+    # endif()
     target_link_libraries(86Box -static ${FREETYPE_STATIC_LIBRARIES})
 endif()
diff --git a/src/printer/prt_escp.c b/src/printer/prt_escp.c
index 8247ecfab..8fb6a1059 100644
--- a/src/printer/prt_escp.c
+++ b/src/printer/prt_escp.c
@@ -4,7 +4,7 @@
  *          using the ISA,EISA,VLB,MCA  and PCI system buses, roughly
  *          spanning the era between 1981 and 1995.
  *
- *          Implementation of the Generic ESC/P Dot-Matrix printer.
+ *          Implementation of the Generic ESC/P 2 Dot-Matrix printer.
  *
  *
  *
@@ -57,6 +57,7 @@
 #include FT_FREETYPE_H
 #define HAVE_STDARG_H
 #include <86box/86box.h>
+#include <86box/device.h>
 #include "cpu.h"
 #include <86box/machine.h>
 #include <86box/timer.h>
@@ -71,15 +72,18 @@
 #include <86box/png_struct.h>
 #include <86box/printer.h>
 #include <86box/prt_devs.h>
+#include <86box/prt_papersizes.h>
 
 /* Default page values (for now.) */
 #define COLOR_BLACK  7 << 5
-#define PAGE_WIDTH   8.5 /* standard U.S. Letter */
-#define PAGE_HEIGHT  11.0
+#define PAGE_WIDTH  LETTER_PAGE_WIDTH
+#define PAGE_HEIGHT LETTER_PAGE_HEIGHT
+#if 0
 #define PAGE_LMARGIN 0.0
 #define PAGE_RMARGIN PAGE_WIDTH
 #define PAGE_TMARGIN 0.0
 #define PAGE_BMARGIN PAGE_HEIGHT
+#endif
 #define PAGE_DPI     360
 #define PAGE_CPI     10.0 /* standard 10 cpi */
 #define PAGE_LPI     6.0  /* standard 6 lpi */
@@ -279,10 +283,9 @@ static const uint16_t codepages[15] = {
 /* "patches" to the codepage for the international charsets
  * these bytes patch the following 12 positions of the char table, in order:
  * 0x23  0x24  0x40  0x5b  0x5c  0x5d  0x5e  0x60  0x7b  0x7c  0x7d  0x7e
- * TODO: Implement the missing international charsets
  */
 static const uint16_t intCharSets[15][12] = {
-    {0x0023,  0x0024, 0x0040, 0x005b, 0x005c, 0x005d, /* 0 USA */
+    { 0x0023, 0x0024, 0x0040, 0x005b, 0x005c, 0x005d, /* 0 USA */
       0x005e, 0x0060, 0x007b, 0x007c, 0x007d, 0x007e},
 
     { 0x0023, 0x0024, 0x00e0, 0x00ba, 0x00e7, 0x00a7, /* 1 France */
@@ -294,7 +297,7 @@ static const uint16_t intCharSets[15][12] = {
     { 0x00a3, 0x0024, 0x0040, 0x005b, 0x005c, 0x005d, /* 3 UK */
       0x005e, 0x0060, 0x007b, 0x007c, 0x007d, 0x007e},
 
-    { 0x0023, 0x0024, 0x0040, 0x00c6, 0x00d8, 0x00c5, /* 4 Denmark (1) */
+    { 0x0023, 0x0024, 0x0040, 0x00c6, 0x00d8, 0x00c5, /* 4 Denmark I */
       0x005e, 0x0060, 0x00e6, 0x00f8, 0x00e5, 0x007e},
 
     { 0x0023, 0x00a4, 0x00c9, 0x00c4, 0x00d6, 0x00c5, /* 5 Sweden */
@@ -303,28 +306,28 @@ static const uint16_t intCharSets[15][12] = {
     { 0x0023, 0x0024, 0x0040, 0x00ba, 0x005c, 0x00e9, /* 6 Italy */
       0x005e, 0x00f9, 0x00e0, 0x00f2, 0x00e8, 0x00ec},
 
-    { 0x0023, 0x0024, 0x0040, 0x005b, 0x005c, 0x005d, /* 7 Spain 1 */
-      0x005e, 0x0060, 0x007b, 0x007c, 0x007d, 0x007e}, /* TODO */
+    { 0x20a7, 0x0024, 0x0040, 0x00a1, 0x00d1, 0x00bf, /* 7 Spain I */
+      0x005e, 0x0060, 0x00a8, 0x00f1, 0x007d, 0x007e},
 
-    { 0x0023, 0x0024, 0x0040, 0x005b, 0x005c, 0x005d, /* 8 Japan (English) */
-      0x005e, 0x0060, 0x007b, 0x007c, 0x007d, 0x007e}, /* TODO */
+    { 0x0023, 0x0024, 0x0040, 0x005b, 0x00a5, 0x005d, /* 8 Japan (Eng) */
+      0x005e, 0x0060, 0x007b, 0x007c, 0x007d, 0x007e},
 
-    { 0x0023, 0x0024, 0x0040, 0x005b, 0x005c, 0x005d, /* 9 Norway */
-      0x005e, 0x0060, 0x007b, 0x007c, 0x007d, 0x007e}, /* TODO */
+    { 0x0023, 0x00a4, 0x00c9, 0x00c6, 0x00d8, 0x00c5, /* 9 Norway */
+      0x00dc, 0x00e9, 0x00e6, 0x00f8, 0x00e5, 0x00fc},
 
-    { 0x0023, 0x0024, 0x0040, 0x005b, 0x005c, 0x005d, /* 10 Denmark (2) */
-      0x005e, 0x0060, 0x007b, 0x007c, 0x007d, 0x007e}, /* TODO */
+    { 0x0023, 0x0024, 0x00c9, 0x00c6, 0x00d8, 0x00c5, /* 10 Denmark II */
+      0x00dc, 0x00e9, 0x00e6, 0x00f8, 0x00e5, 0x00fc},
 
-    { 0x0023, 0x0024, 0x0040, 0x005b, 0x005c, 0x005d, /* 11 Spain (2) */
-      0x005e, 0x0060, 0x007b, 0x007c, 0x007d, 0x007e}, /* TODO */
+    { 0x0023, 0x0024, 0x00e1, 0x00a1, 0x00d1, 0x00bf, /* 11 Spain II */
+      0x00e9, 0x0060, 0x00ed, 0x00f1, 0x00f3, 0x00fa},
 
-    { 0x0023, 0x0024, 0x0040, 0x005b, 0x005c, 0x005d, /* 12 Latin America */
-      0x005e, 0x0060, 0x007b, 0x007c, 0x007d, 0x007e}, /* TODO */
+    { 0x0023, 0x0024, 0x00e1, 0x00a1, 0x00d1, 0x00bf, /* 12 Lat America */
+      0x00e9, 0x00fc, 0x00ed, 0x00f1, 0x00f3, 0x00fa},
 
-    { 0x0023, 0x0024, 0x0040, 0x005b, 0x005c, 0x005d, /* 13 Korea */
-      0x005e, 0x0060, 0x007b, 0x007c, 0x007d, 0x007e}, /* TODO */
+    { 0x0023, 0x0024, 0x0040, 0x005b, 0x20a9, 0x005d, /* 13 Korea */
+      0x005e, 0x0060, 0x007b, 0x007c, 0x007d, 0x007e},
 
-    { 0x0023, 0x0024, 0x00a7, 0x00c4, 0x0027, 0x0022, /* 14 Legal */
+    { 0x0023, 0x0024, 0x00a7, 0x00ba, 0x2019, 0x201d, /* 64 Legal */
       0x00b6, 0x0060, 0x00a9, 0x00ae, 0x2020, 0x2122}
 };
 
@@ -398,7 +401,7 @@ timeout_timer(void *priv)
     if (dev->page->dirty)
         new_page(dev, 1, 1);
 
-    timer_disable(&dev->timeout_timer);
+    timer_stop(&dev->timeout_timer);
 }
 
 static void
@@ -480,7 +483,7 @@ reset_printer_hard(escp_t *dev)
 {
     dev->ack = 0;
     timer_disable(&dev->pulse_timer);
-    timer_disable(&dev->timeout_timer);
+    timer_stop(&dev->timeout_timer);
     reset_printer(dev);
 }
 
@@ -517,7 +520,7 @@ update_font(escp_t *dev)
     } else
         switch (dev->lq_typeface) {
             case TYPEFACE_ROMAN:
-                fn = FONT_FILE_ROMAN;
+                fn = (dev->font_style & STYLE_PROP) ? FONT_FILE_ROMAN : FONT_FILE_COURIER;
                 break;
             case TYPEFACE_SANSSERIF:
                 fn = FONT_FILE_SANSSERIF;
@@ -887,7 +890,7 @@ process_char(escp_t *dev, uint8_t ch)
                 break;
 
             case 0x21: /* master select (ESC !) */
-                dev->cpi = dev->esc_parms[0] & 0x01 ? 12.0 : 10.0;
+                dev->cpi = (dev->esc_parms[0]) & 0x01 ? 12.0 : 10.0;
 
                 /* Reset first seven bits. */
                 dev->font_style &= 0xFF80;
@@ -1042,7 +1045,7 @@ process_char(escp_t *dev, uint8_t ch)
                 update_font(dev);
                 break;
 
-            case 0x47: /* select dobule-strike printing (ESC G) */
+            case 0x47: /* select double-strike printing (ESC G) */
                 dev->font_style |= STYLE_DOUBLESTRIKE;
                 break;
 
@@ -1095,8 +1098,8 @@ process_char(escp_t *dev, uint8_t ch)
                 break;
 
             case 0x52: /* select an intl character set (ESC R) */
-                if (dev->esc_parms[0] <= 13 || dev->esc_parms[0] == '@') {
-                    if (dev->esc_parms[0] == '@')
+                if ((dev->esc_parms[0] <= 13) || (dev->esc_parms[0] == 64)) {
+                    if (dev->esc_parms[0] == 64)
                         dev->esc_parms[0] = 14;
 
                     dev->curr_cpmap[0x23] = intCharSets[dev->esc_parms[0]][0];
@@ -1115,9 +1118,9 @@ process_char(escp_t *dev, uint8_t ch)
                 break;
 
             case 0x53: /* select superscript/subscript printing (ESC S) */
-                if (dev->esc_parms[0] == 0 || dev->esc_parms[0] == '0')
+                if ((dev->esc_parms[0] == 0) || (dev->esc_parms[0] == '0'))
                     dev->font_style |= STYLE_SUBSCRIPT;
-                if (dev->esc_parms[0] == 1 || dev->esc_parms[1] == '1')
+                if ((dev->esc_parms[0] == 1) || (dev->esc_parms[1] == '1'))
                     dev->font_style |= STYLE_SUPERSCRIPT;
                 update_font(dev);
                 break;
@@ -1134,9 +1137,9 @@ process_char(escp_t *dev, uint8_t ch)
             case 0x57: /* turn double-width printing on/off (ESC W) */
                 if (!dev->multipoint_mode) {
                     dev->hmi = -1;
-                    if (dev->esc_parms[0] == 0 || dev->esc_parms[0] == '0')
+                    if ((dev->esc_parms[0] == 0) || (dev->esc_parms[0] == '0'))
                         dev->font_style &= ~STYLE_DOUBLEWIDTH;
-                    if (dev->esc_parms[0] == 1 || dev->esc_parms[0] == '1')
+                    if ((dev->esc_parms[0] == 1) || (dev->esc_parms[0] == '1'))
                         dev->font_style |= STYLE_DOUBLEWIDTH;
                     update_font(dev);
                 }
@@ -1213,9 +1216,9 @@ process_char(escp_t *dev, uint8_t ch)
                 break;
 
             case 0x6b: /* select typeface (ESC k) */
-                if (dev->esc_parms[0] <= 11 || dev->esc_parms[0] == 30 || dev->esc_parms[0] == 31) {
+                if ((dev->esc_parms[0] <= 11) || (dev->esc_parms[0] == 30) ||
+                    (dev->esc_parms[0] == 31))
                     dev->lq_typeface = dev->esc_parms[0];
-                }
                 update_font(dev);
                 break;
 
@@ -1226,9 +1229,9 @@ process_char(escp_t *dev, uint8_t ch)
                 break;
 
             case 0x70: /* Turn proportional mode on/off (ESC p) */
-                if (dev->esc_parms[0] == 0 || dev->esc_parms[0] == '0')
+                if ((dev->esc_parms[0] == 0) || (dev->esc_parms[0] == '0'))
                     dev->font_style &= ~STYLE_PROP;
-                if (dev->esc_parms[0] == 1 || dev->esc_parms[0] == '1') {
+                if ((dev->esc_parms[0] == 1) || (dev->esc_parms[0] == '1')) {
                     dev->font_style |= STYLE_PROP;
                     dev->print_quality = QUALITY_LQ;
                 }
@@ -1261,20 +1264,20 @@ process_char(escp_t *dev, uint8_t ch)
 
             case 0x77: /* turn double-height printing on/off (ESC w) */
                 if (!dev->multipoint_mode) {
-                    if (dev->esc_parms[0] == 0 || dev->esc_parms[0] == '0')
+                    if ((dev->esc_parms[0] == 0) || (dev->esc_parms[0] == '0'))
                         dev->font_style &= ~STYLE_DOUBLEHEIGHT;
-                    if (dev->esc_parms[0] == 1 || dev->esc_parms[0] == '1')
+                    if ((dev->esc_parms[0] == 1) || (dev->esc_parms[0] == '1'))
                         dev->font_style |= STYLE_DOUBLEHEIGHT;
                     update_font(dev);
                 }
                 break;
 
             case 0x78: /* select LQ or draft (ESC x) */
-                if (dev->esc_parms[0] == 0 || dev->esc_parms[0] == '0') {
+                if ((dev->esc_parms[0] == 0) || (dev->esc_parms[0] == '0')) {
                     dev->print_quality = QUALITY_DRAFT;
                     dev->font_style |= STYLE_CONDENSED;
                 }
-                if (dev->esc_parms[0] == 1 || dev->esc_parms[0] == '1') {
+                if ((dev->esc_parms[0] == 1) || (dev->esc_parms[0] == '1')) {
                     dev->print_quality = QUALITY_LQ;
                     dev->font_style &= ~STYLE_CONDENSED;
                 }
@@ -1475,7 +1478,7 @@ process_char(escp_t *dev, uint8_t ch)
             }
             dev->curr_x = dev->left_margin;
             dev->curr_y += dev->linespacing;
-            if (dev->curr_y > dev->bottom_margin)
+            if ((dev->curr_y + 0.0001f) > dev->bottom_margin)
                 new_page(dev, 1, 0);
             return 1;
 
@@ -1881,6 +1884,35 @@ write_data(uint8_t val, void *priv)
     dev->data = val;
 }
 
+static void
+strobe(uint8_t old, uint8_t val, void *priv)
+{
+    escp_t *dev = (escp_t *) priv;
+
+    if (dev == NULL)
+        return;
+
+    /* Data is strobed to the parallel printer on the falling edge of the
+       strobe bit. */
+    if (!(val & 0x01) && (old & 0x01)) {
+        /* Process incoming character. */
+        handle_char(dev, dev->data);
+
+        if (timer_is_on(&dev->timeout_timer)) {
+            timer_stop(&dev->timeout_timer);
+#ifdef USE_DYNAREC
+            if (cpu_use_dynarec)
+                update_tsc();
+#endif
+        }
+        /* ACK it, will be read on next READ STATUS. */
+        dev->ack = 1;
+        timer_set_delay_u64(&dev->pulse_timer, ISACONST);
+
+        timer_on_auto(&dev->timeout_timer, 5000000.0);
+    }
+}
+
 static void
 write_ctrl(uint8_t val, void *priv)
 {
@@ -1907,11 +1939,18 @@ write_ctrl(uint8_t val, void *priv)
         /* Process incoming character. */
         handle_char(dev, dev->data);
 
+        if (timer_is_on(&dev->timeout_timer)) {
+            timer_stop(&dev->timeout_timer);
+#ifdef USE_DYNAREC
+            if (cpu_use_dynarec)
+                update_tsc();
+#endif
+        }
         /* ACK it, will be read on next READ STATUS. */
         dev->ack = 1;
         timer_set_delay_u64(&dev->pulse_timer, ISACONST);
 
-        timer_set_delay_u64(&dev->timeout_timer, 5000000 * TIMER_USEC);
+        timer_on_auto(&dev->timeout_timer, 5000000.0);
     }
 
     dev->ctrl = val;
@@ -1919,14 +1958,6 @@ write_ctrl(uint8_t val, void *priv)
     dev->autofeed = ((val & 0x02) > 0);
 }
 
-static uint8_t
-read_data(void *priv)
-{
-    const escp_t *dev = (escp_t *) priv;
-
-    return dev->data;
-}
-
 static uint8_t
 read_ctrl(void *priv)
 {
@@ -1952,7 +1983,7 @@ read_status(void *priv)
 static void *
 escp_init(void *lpt)
 {
-    escp_t *dev;
+    escp_t *dev = NULL;
 
     /* Initialize FreeType. */
     if (ft_lib == NULL) {
@@ -1964,21 +1995,20 @@ escp_init(void *lpt)
     }
 
     /* Initialize a device instance. */
-    dev = (escp_t *) malloc(sizeof(escp_t));
-    memset(dev, 0x00, sizeof(escp_t));
+    dev = (escp_t *) calloc(1, sizeof(escp_t));
     dev->ctrl = 0x04;
     dev->lpt  = lpt;
 
+    rom_get_full_path(dev->fontpath, "roms/printer/fonts/");
+
     /* Create a full pathname for the font files. */
-    if (strlen(exe_path) >= sizeof(dev->fontpath)) {
+    if (strlen(dev->fontpath) == 0) {
+        ui_msgbox_header(MBX_ERROR, plat_get_string(STRING_ESCP_ERROR_TITLE),
+                         plat_get_string(STRING_ESCP_ERROR_DESC));
         free(dev);
         return (NULL);
     }
 
-    strcpy(dev->fontpath, exe_path);
-    path_slash(dev->fontpath);
-    strcat(dev->fontpath, "roms/printer/fonts/");
-
     /* Create the full path for the page images. */
     path_append_filename(dev->pagepath, usr_path, "printer");
     if (!plat_dir_check(dev->pagepath))
@@ -2054,17 +2084,64 @@ escp_close(void *priv)
         free(dev->page);
     }
 
+    FT_Done_Face(dev->fontface);
     free(dev);
 }
 
-const lpt_device_t lpt_prt_escp_device = {
-    .name          = "Generic ESC/P Dot-Matrix",
-    .internal_name = "dot_matrix",
-    .init          = escp_init,
-    .close         = escp_close,
-    .write_data    = write_data,
-    .write_ctrl    = write_ctrl,
-    .read_data     = read_data,
-    .read_status   = read_status,
-    .read_ctrl     = read_ctrl
+// clang-format off
+#if 0
+static const device_config_t lpt_prt_escp_config[] = {
+    {
+        .name           = "paper_size",
+        .description    = "Paper Size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Letter", .value = 0 },
+            { .description = "A4",     .value = 1 },
+            { .description = ""                   }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+#endif
+// clang-format on
+
+const device_t prt_escp_device = {
+    .name          = "Generic ESC/P 2 Dot-Matrix Printer",
+    .internal_name = "dot_matrix",
+    .flags         = DEVICE_LPT,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+#if 0
+    .config        = lpt_prt_escp_config
+#else
+    .config        = NULL
+#endif
+};
+
+const lpt_device_t lpt_prt_escp_device = {
+    .name             = "Generic ESC/P 2 Dot-Matrix Printer",
+    .internal_name    = "dot_matrix",
+    .init             = escp_init,
+    .close            = escp_close,
+    .write_data       = write_data,
+    .write_ctrl       = write_ctrl,
+    .strobe           = strobe,
+    .read_status      = read_status,
+    .read_ctrl        = read_ctrl,
+    .epp_write_data   = NULL,
+    .epp_request_read = NULL,
+    .priv             = NULL,
+    .lpt              = NULL,
+    .cfgdevice        = (device_t *) &prt_escp_device
 };
diff --git a/src/printer/prt_ps.c b/src/printer/prt_ps.c
index c0e3958b2..9c54dccab 100644
--- a/src/printer/prt_ps.c
+++ b/src/printer/prt_ps.c
@@ -6,13 +6,16 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          Implementation of a generic PostScript printer.
+ *          Implementation of a generic PostScript printer and a
+ *          generic PCL 5e printer.
  *
  *
  *
  * Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+ *          Cacodemon345
  *
  *          Copyright 2019 David Hrdlička.
+ *          Copyright 2024 Cacodemon345.
  */
 
 #include <inttypes.h>
@@ -23,15 +26,17 @@
 #include <string.h>
 #include <wchar.h>
 #include <86box/86box.h>
-#include <86box/language.h>
-#include <86box/lpt.h>
+#include <86box/device.h>
 #include <86box/timer.h>
+#include <86box/device.h>
+#include <86box/lpt.h>
 #include <86box/pit.h>
 #include <86box/path.h>
 #include <86box/plat.h>
 #include <86box/plat_dynld.h>
 #include <86box/ui.h>
 #include <86box/prt_devs.h>
+#include "cpu.h"
 
 #ifdef _WIN32
 #    define GSDLLAPI __stdcall
@@ -45,15 +50,21 @@
 #ifdef _WIN32
 #    if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
 #        define PATH_GHOSTSCRIPT_DLL "gsdll32.dll"
+#        define PATH_GHOSTPCL_DLL    "gpcl6dll32.dll"
 #    else
 #        define PATH_GHOSTSCRIPT_DLL "gsdll64.dll"
+#        define PATH_GHOSTPCL_DLL    "gpcl6dll64.dll"
 #    endif
 #elif defined __APPLE__
 #    define PATH_GHOSTSCRIPT_DLL "libgs.dylib"
+#    define PATH_GHOSTPCL_DLL    "libgpcl6.9.54.dylib"
 #else
 #    define PATH_GHOSTSCRIPT_DLL      "libgs.so.9"
 #    define PATH_GHOSTSCRIPT_DLL_ALT1 "libgs.so.10"
 #    define PATH_GHOSTSCRIPT_DLL_ALT2 "libgs.so"
+#    define PATH_GHOSTPCL_DLL         "libgpcl6.so.9"
+#    define PATH_GHOSTPCL_DLL_ALT1    "libgpcl6.so.10"
+#    define PATH_GHOSTPCL_DLL_ALT2    "libgpcl6.so"
 #endif
 
 #define POSTSCRIPT_BUFFER_LENGTH 65536
@@ -73,6 +84,8 @@ typedef struct ps_t {
     bool    int_pending;
     bool    error;
     bool    autofeed;
+    bool    pcl;
+    bool    pcl_escape;
     uint8_t ctrl;
 
     char printer_path[260];
@@ -123,7 +136,7 @@ reset_ps(ps_t *dev)
     dev->buffer_pos = 0;
 
     timer_disable(&dev->pulse_timer);
-    timer_disable(&dev->timeout_timer);
+    timer_stop(&dev->timeout_timer);
 }
 
 static void
@@ -142,28 +155,32 @@ pulse_timer(void *priv)
 static int
 convert_to_pdf(ps_t *dev)
 {
-    volatile int code;
+    volatile int code, arg = 0;
     void        *instance = NULL;
     char         input_fn[1024];
     char         output_fn[1024];
-    char        *gsargv[9];
+    char        *gsargv[11];
 
     strcpy(input_fn, dev->printer_path);
     path_slash(input_fn);
     strcat(input_fn, dev->filename);
 
     strcpy(output_fn, input_fn);
-    strcpy(output_fn + strlen(output_fn) - 3, ".pdf");
+    strcpy(output_fn + strlen(output_fn) - (dev->pcl ? 4 : 3), ".pdf");
 
-    gsargv[0] = "";
-    gsargv[1] = "-dNOPAUSE";
-    gsargv[2] = "-dBATCH";
-    gsargv[3] = "-dSAFER";
-    gsargv[4] = "-sDEVICE=pdfwrite";
-    gsargv[5] = "-q";
-    gsargv[6] = "-o";
-    gsargv[7] = output_fn;
-    gsargv[8] = input_fn;
+    gsargv[arg++] = "";
+    gsargv[arg++] = "-dNOPAUSE";
+    gsargv[arg++] = "-dBATCH";
+    gsargv[arg++] = "-dSAFER";
+    gsargv[arg++] = "-sDEVICE=pdfwrite";
+    if (dev->pcl) {
+        gsargv[arg++] = "-LPCL";
+        gsargv[arg++] = "-lPCL5E";
+    }
+    gsargv[arg++] = "-q";
+    gsargv[arg++] = "-o";
+    gsargv[arg++] = output_fn;
+    gsargv[arg++] = input_fn;
 
     code = gsapi_new_instance(&instance, dev);
     if (code < 0)
@@ -172,7 +189,7 @@ convert_to_pdf(ps_t *dev)
     code = gsapi_set_arg_encoding(instance, GS_ARG_ENCODING_UTF8);
 
     if (code == 0)
-        code = gsapi_init_with_args(instance, 9, gsargv);
+        code = gsapi_init_with_args(instance, arg, gsargv);
 
     if (code == 0 || code == gs_error_Quit)
         code = gsapi_exit(instance);
@@ -199,19 +216,22 @@ write_buffer(ps_t *dev, bool finish)
         return;
 
     if (dev->filename[0] == 0)
-        plat_tempfile(dev->filename, NULL, ".ps");
+        plat_tempfile(dev->filename, NULL, dev->pcl ? ".pcl" : ".ps");
 
     strcpy(path, dev->printer_path);
     path_slash(path);
     strcat(path, dev->filename);
 
-    fp = plat_fopen(path, "a");
+    fp = plat_fopen(path, dev->pcl ? "ab" : "a");
     if (fp == NULL)
         return;
 
     fseek(fp, 0, SEEK_END);
 
-    fprintf(fp, "%.*s", POSTSCRIPT_BUFFER_LENGTH, dev->buffer);
+    if (dev->pcl)
+        fwrite(dev->buffer, 1, dev->buffer_pos, fp);
+    else
+        fprintf(fp, "%.*s", POSTSCRIPT_BUFFER_LENGTH, dev->buffer);
 
     fclose(fp);
 
@@ -233,7 +253,7 @@ timeout_timer(void *priv)
 
     write_buffer(dev, true);
 
-    timer_disable(&dev->timeout_timer);
+    timer_stop(&dev->timeout_timer);
 }
 
 static void
@@ -250,8 +270,25 @@ ps_write_data(uint8_t val, void *priv)
 static void
 process_data(ps_t *dev)
 {
-    /* Check for non-printable characters */
-    if ((dev->data < 0x20) || (dev->data == 0x7f)) {
+    /* On PCL, check for escape sequences. */
+    if (dev->pcl) {
+        if (dev->data == 0x1B)
+            dev->pcl_escape = true;
+        else if (dev->pcl_escape) {
+            dev->pcl_escape = false;
+            if (dev->data == 0xE) {
+                dev->buffer[dev->buffer_pos++] = dev->data;
+                dev->buffer[dev->buffer_pos]   = 0;
+
+                if (dev->buffer_pos > 2)
+                    write_buffer(dev, true);
+
+                return;
+            }
+        }
+    }
+    /* On PostScript, check for non-printable characters. */
+    else if ((dev->data < 0x20) || (dev->data == 0x7f)) {
         switch (dev->data) {
             /* The following characters are considered white-space
                by the PostScript specification */
@@ -285,6 +322,32 @@ process_data(ps_t *dev)
     dev->buffer[dev->buffer_pos]   = 0;
 }
 
+static void
+ps_strobe(uint8_t old, uint8_t val, void *priv)
+{
+    ps_t *dev = (ps_t *) priv;
+
+    if (dev == NULL)
+        return;
+
+    if (!(val & 0x01) && (old & 0x01)) {
+        process_data(dev);
+
+        if (timer_is_on(&dev->timeout_timer)) {
+            timer_stop(&dev->timeout_timer);
+#ifdef USE_DYNAREC
+            if (cpu_use_dynarec)
+                update_tsc();
+#endif
+        }
+
+        dev->ack = true;
+
+        timer_set_delay_u64(&dev->pulse_timer, ISACONST);
+        timer_on_auto(&dev->timeout_timer, 5000000.0);
+    }
+}
+
 static void
 ps_write_ctrl(uint8_t val, void *priv)
 {
@@ -308,10 +371,18 @@ ps_write_ctrl(uint8_t val, void *priv)
     if (!(val & 0x01) && (dev->ctrl & 0x01)) {
         process_data(dev);
 
+        if (timer_is_on(&dev->timeout_timer)) {
+            timer_stop(&dev->timeout_timer);
+#ifdef USE_DYNAREC
+            if (cpu_use_dynarec)
+                update_tsc();
+#endif
+        }
+
         dev->ack = true;
 
         timer_set_delay_u64(&dev->pulse_timer, ISACONST);
-        timer_set_delay_u64(&dev->timeout_timer, 5000000 * TIMER_USEC);
+        timer_on_auto(&dev->timeout_timer, 5000000.0);
     }
 
     dev->ctrl = val;
@@ -332,13 +403,12 @@ ps_read_status(void *priv)
 static void *
 ps_init(void *lpt)
 {
-    ps_t            *dev;
+    ps_t            *dev = (ps_t *) calloc(1, sizeof(ps_t));
     gsapi_revision_t rev;
 
-    dev = (ps_t *) malloc(sizeof(ps_t));
-    memset(dev, 0x00, sizeof(ps_t));
     dev->ctrl = 0x04;
     dev->lpt  = lpt;
+    dev->pcl  = false;
 
     /* Try loading the DLL. */
     ghostscript_handle = dynld_module(PATH_GHOSTSCRIPT_DLL, ghostscript_imports);
@@ -352,7 +422,7 @@ ps_init(void *lpt)
     }
 #endif
     if (ghostscript_handle == NULL) {
-        ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2115, (wchar_t *) IDS_2133);
+        ui_msgbox_header(MBX_ERROR, plat_get_string(STRING_GHOSTSCRIPT_ERROR_TITLE), plat_get_string(STRING_GHOSTSCRIPT_ERROR_DESC));
     } else {
         if (gsapi_revision(&rev, sizeof(rev)) == 0) {
             pclog("Loaded %s, rev %ld (%ld)\n", rev.product, rev.revision, rev.revisiondate);
@@ -377,6 +447,55 @@ ps_init(void *lpt)
     return dev;
 }
 
+#ifdef USE_PCL
+static void *
+pcl_init(void *lpt)
+{
+    ps_t            *dev = (ps_t *) calloc(1, sizeof(ps_t));
+    gsapi_revision_t rev;
+
+    dev->ctrl = 0x04;
+    dev->lpt  = lpt;
+    dev->pcl  = true;
+
+    /* Try loading the DLL. */
+    ghostscript_handle = dynld_module(PATH_GHOSTPCL_DLL, ghostscript_imports);
+#ifdef PATH_GHOSTPCL_DLL_ALT1
+    if (ghostscript_handle == NULL) {
+        ghostscript_handle = dynld_module(PATH_GHOSTPCL_DLL_ALT1, ghostscript_imports);
+#    ifdef PATH_GHOSTPCL_DLL_ALT2
+        if (ghostscript_handle == NULL)
+            ghostscript_handle = dynld_module(PATH_GHOSTPCL_DLL_ALT2, ghostscript_imports);
+#    endif
+    }
+#endif
+    if (ghostscript_handle == NULL) {
+        ui_msgbox_header(MBX_ERROR, plat_get_string(STRING_GHOSTPCL_ERROR_TITLE), plat_get_string(STRING_GHOSTPCL_ERROR_DESC));
+    } else {
+        if (gsapi_revision(&rev, sizeof(rev)) == 0) {
+            pclog("Loaded %s, rev %ld (%ld)\n", rev.product, rev.revision, rev.revisiondate);
+        } else {
+            dynld_close(ghostscript_handle);
+            ghostscript_handle = NULL;
+        }
+    }
+
+    /* Cache print folder path. */
+    memset(dev->printer_path, 0x00, sizeof(dev->printer_path));
+    path_append_filename(dev->printer_path, usr_path, "printer");
+    if (!plat_dir_check(dev->printer_path))
+        plat_dir_create(dev->printer_path);
+    path_slash(dev->printer_path);
+
+    timer_add(&dev->pulse_timer, pulse_timer, dev, 0);
+    timer_add(&dev->timeout_timer, timeout_timer, dev, 0);
+
+    reset_ps(dev);
+
+    return dev;
+}
+#endif
+
 static void
 ps_close(void *priv)
 {
@@ -397,13 +516,35 @@ ps_close(void *priv)
 }
 
 const lpt_device_t lpt_prt_ps_device = {
-    .name          = "Generic PostScript Printer",
-    .internal_name = "postscript",
-    .init          = ps_init,
-    .close         = ps_close,
-    .write_data    = ps_write_data,
-    .write_ctrl    = ps_write_ctrl,
-    .read_data     = NULL,
-    .read_status   = ps_read_status,
-    .read_ctrl     = NULL
+    .name             = "Generic PostScript Printer",
+    .internal_name    = "postscript",
+    .init             = ps_init,
+    .close            = ps_close,
+    .write_data       = ps_write_data,
+    .write_ctrl       = ps_write_ctrl,
+    .strobe           = ps_strobe,
+    .read_status      = ps_read_status,
+    .read_ctrl        = NULL,
+    .epp_write_data   = NULL,
+    .epp_request_read = NULL,
+    .priv             = NULL,
+    .lpt              = NULL
 };
+
+#ifdef USE_PCL
+const lpt_device_t lpt_prt_pcl_device = {
+    .name             = "Generic PCL5e Printer",
+    .internal_name    = "pcl",
+    .init             = pcl_init,
+    .close            = ps_close,
+    .write_data       = ps_write_data,
+    .write_ctrl       = ps_write_ctrl,
+    .strobe           = ps_strobe,
+    .read_status      = ps_read_status,
+    .read_ctrl        = NULL,
+    .epp_write_data   = NULL,
+    .epp_request_read = NULL,
+    .priv             = NULL,
+    .lpt              = NULL
+};
+#endif
diff --git a/src/printer/prt_text.c b/src/printer/prt_text.c
index ddf9faf53..41d3737d1 100644
--- a/src/printer/prt_text.c
+++ b/src/printer/prt_text.c
@@ -63,12 +63,14 @@
 #include <86box/lpt.h>
 #include <86box/printer.h>
 #include <86box/prt_devs.h>
+#include "cpu.h"
+#include <86box/prt_papersizes.h>
 
 #define FULL_PAGE 1 /* set if no top/bot margins */
 
 /* Default page values (for now.) */
-#define PAGE_WIDTH   8.5 /* standard U.S. Letter */
-#define PAGE_HEIGHT  11
+#define PAGE_WIDTH  LETTER_PAGE_WIDTH
+#define PAGE_HEIGHT LETTER_PAGE_HEIGHT
 #define PAGE_LMARGIN 0.25 /* 0.25" left and right */
 #define PAGE_RMARGIN 0.25
 #if FULL_PAGE
@@ -212,7 +214,7 @@ timeout_timer(void *priv)
     if (dev->page->dirty)
         new_page(dev);
 
-    timer_disable(&dev->timeout_timer);
+    timer_stop(&dev->timeout_timer);
 }
 
 static void
@@ -242,7 +244,7 @@ reset_printer(prnt_t *dev)
     plat_tempfile(dev->filename, NULL, ".txt");
 
     timer_disable(&dev->pulse_timer);
-    timer_disable(&dev->timeout_timer);
+    timer_stop(&dev->timeout_timer);
 }
 
 static int
@@ -367,6 +369,34 @@ write_data(uint8_t val, void *priv)
     dev->data = val;
 }
 
+static void
+strobe(uint8_t old, uint8_t val, void *priv)
+{
+    prnt_t *dev = (prnt_t *) priv;
+
+    if (dev == NULL)
+        return;
+
+    if (!(val & 0x01) && (old & 0x01)) { /* STROBE */
+        /* Process incoming character. */
+        handle_char(dev);
+
+        if (timer_is_on(&dev->timeout_timer)) {
+            timer_stop(&dev->timeout_timer);
+#ifdef USE_DYNAREC
+            if (cpu_use_dynarec)
+                update_tsc();
+#endif
+        }
+
+        /* ACK it, will be read on next READ STATUS. */
+        dev->ack = 1;
+
+        timer_set_delay_u64(&dev->pulse_timer, ISACONST);
+        timer_on_auto(&dev->timeout_timer, 5000000.0);
+    }
+}
+
 static void
 write_ctrl(uint8_t val, void *priv)
 {
@@ -376,7 +406,7 @@ write_ctrl(uint8_t val, void *priv)
         return;
 
     /* set autofeed value */
-    dev->autofeed = val & 0x02 ? 1 : 0;
+    dev->autofeed = (val & 0x02) ? 1 : 0;
 
     if (val & 0x08) { /* SELECT */
         /* select printer */
@@ -397,8 +427,16 @@ write_ctrl(uint8_t val, void *priv)
         /* ACK it, will be read on next READ STATUS. */
         dev->ack = 1;
 
+        if (timer_is_on(&dev->timeout_timer)) {
+            timer_stop(&dev->timeout_timer);
+#ifdef USE_DYNAREC
+            if (cpu_use_dynarec)
+                update_tsc();
+#endif
+        }
+
         timer_set_delay_u64(&dev->pulse_timer, ISACONST);
-        timer_set_delay_u64(&dev->timeout_timer, 5000000 * TIMER_USEC);
+        timer_on_auto(&dev->timeout_timer, 5000000.0);
     }
 
     dev->ctrl = val;
@@ -421,11 +459,9 @@ read_status(void *priv)
 static void *
 prnt_init(void *lpt)
 {
-    prnt_t *dev;
-
     /* Initialize a device instance. */
-    dev = (prnt_t *) malloc(sizeof(prnt_t));
-    memset(dev, 0x00, sizeof(prnt_t));
+    prnt_t *dev = (prnt_t *) calloc(1, sizeof(prnt_t));
+
     dev->ctrl = 0x04;
     dev->lpt  = lpt;
 
@@ -466,14 +502,60 @@ prnt_close(void *priv)
     free(dev);
 }
 
-const lpt_device_t lpt_prt_text_device = {
+// clang-format off
+#if 0
+static const device_config_t lpt_prt_text_config[] = {
+    {
+        .name           = "paper_size",
+        .description    = "Paper Size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Letter", .value = 0 },
+            { .description = "A4",     .value = 1 },
+            { .description = ""                   }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+#endif
+// clang-format on
+
+const device_t prt_text_device = {
     .name          = "Generic Text Printer",
     .internal_name = "text_prt",
-    .init          = prnt_init,
-    .close         = prnt_close,
-    .write_data    = write_data,
-    .write_ctrl    = write_ctrl,
-    .read_data     = NULL,
-    .read_status   = read_status,
-    .read_ctrl     = NULL
+    .flags         = DEVICE_LPT,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+#if 0
+    .config        = lpt_prt_text_config
+#else
+    .config        = NULL
+#endif
+};
+
+const lpt_device_t lpt_prt_text_device = {
+    .name             = "Generic Text Printer",
+    .internal_name    = "text_prt",
+    .init             = prnt_init,
+    .close            = prnt_close,
+    .write_data       = write_data,
+    .write_ctrl       = write_ctrl,
+    .strobe           = strobe,
+    .read_status      = read_status,
+    .read_ctrl        = NULL,
+    .epp_write_data   = NULL,
+    .epp_request_read = NULL,
+    .priv             = NULL,
+    .lpt              = NULL,
+    .cfgdevice        = (device_t *) &prt_text_device
 };
diff --git a/src/win/86Box-qt.rc b/src/qt/86Box-qt.rc
similarity index 100%
rename from src/win/86Box-qt.rc
rename to src/qt/86Box-qt.rc
diff --git a/src/win/86Box.manifest b/src/qt/86Box.manifest
similarity index 100%
rename from src/win/86Box.manifest
rename to src/qt/86Box.manifest
diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt
index fb96de1ea..1a004d958 100644
--- a/src/qt/CMakeLists.txt
+++ b/src/qt/CMakeLists.txt
@@ -8,6 +8,11 @@
 #
 #          CMake build script.
 #
+# Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
+#
+#          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2024      Jasmine Iwanek.
 
 # Find includes in corresponding build directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -41,8 +46,12 @@ endif()
 set(CMAKE_FIND_PACKAGE_PREFER_CONFIG OFF)
 
 find_package(Threads REQUIRED)
-find_package(Qt${QT_MAJOR} COMPONENTS Core Widgets Network OpenGL REQUIRED)
+find_package(Qt${QT_MAJOR} COMPONENTS Core Widgets Network OpenGL Gui REQUIRED)
 find_package(Qt${QT_MAJOR}LinguistTools REQUIRED NO_CMAKE_FIND_ROOT_PATH)
+if(NOT USE_QT6)
+    # For <qpa/qplatformwindow.h>  in src/qt/qt_mainwindow.cpp
+    include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
+endif ()
 
 # TODO: Is this the correct way to do this, and is it required on any
 # other platforms or with Qt 5?
@@ -53,6 +62,26 @@ if(APPLE AND USE_QT6)
     find_package(Qt6Gui/Qt6QICNSPlugin REQUIRED)
 endif()
 
+if (UNIX)
+    find_path(HAS_VDE "libvdeplug.h" PATHS ${VDE_INCLUDE_DIR} "/usr/include /usr/local/include" "/opt/homebrew/include" )
+    if(HAS_VDE)
+        find_library(VDE_LIB vdeplug)
+        if (NOT VDE_LIB)
+            message(WARNING "Could not find VDE. The library will not be bundled and any related features will be disabled.")
+        else()
+            add_compile_definitions(HAS_VDE)
+        endif()
+    endif()
+endif()
+if (UNIX AND NOT APPLE) # Support for TAP on Linux and BSD, supposedly.
+    find_path(HAS_TAP "linux/if_tun.h" PATHS ${TAP_INCLUDE_DIR} "/usr/include /usr/local/include" "/opt/homebrew/include" )
+    if(HAS_TAP)
+        add_compile_definitions(HAS_TAP)
+    else()
+        message(WARNING "TAP support not available. Are you on some BSD?")
+    endif()
+endif()
+
 add_library(plat STATIC
     qt.c
     qt_main.cpp
@@ -61,7 +90,6 @@ add_library(plat STATIC
 
 add_library(ui STATIC
     qt_ui.cpp
-    qt_cdrom.c
 
     qt_mainwindow.cpp
     qt_mainwindow.hpp
@@ -77,15 +105,11 @@ add_library(ui STATIC
     qt_renderercommon.hpp
     qt_softwarerenderer.cpp
     qt_softwarerenderer.hpp
-    qt_hardwarerenderer.cpp
-    qt_hardwarerenderer.hpp
     qt_openglrenderer.cpp
     qt_openglrenderer.hpp
-    qt_opengloptions.cpp
-    qt_opengloptions.hpp
-    qt_opengloptionsdialog.cpp
-    qt_opengloptionsdialog.hpp
-    qt_opengloptionsdialog.ui
+    qt_glsl_parser.cpp
+    qt_about.cpp
+    qt_about.hpp
 
     qt_settings.cpp
     qt_settings.hpp
@@ -133,6 +157,11 @@ add_library(ui STATIC
     qt_joystickconfiguration.cpp
     qt_joystickconfiguration.hpp
     qt_joystickconfiguration.ui
+    qt_keybind.cpp
+    qt_keybind.hpp
+    qt_keybind.ui
+    qt_singlekeyseqedit.cpp
+    qt_singlekeyseqedit.hpp
 
     qt_filefield.cpp
     qt_filefield.hpp
@@ -180,25 +209,91 @@ add_library(ui STATIC
     qt_mediahistorymanager.cpp
     qt_mediahistorymanager.hpp
 
+    qt_downloader.cpp
+    qt_downloader.hpp
+
+    qt_vmmanager_clientsocket.cpp
+    qt_vmmanager_clientsocket.hpp
+    qt_vmmanager_serversocket.cpp
+    qt_vmmanager_serversocket.hpp
+    qt_vmmanager_protocol.cpp
+    qt_vmmanager_protocol.hpp
+    qt_vmmanager_details.hpp
+    qt_vmmanager_details.cpp
+    qt_vmmanager_details.ui
+    qt_vmmanager_addmachine.cpp
+    qt_vmmanager_addmachine.hpp
+    qt_vmmanager_detailsection.cpp
+    qt_vmmanager_detailsection.hpp
+    qt_vmmanager_detailsection.ui
+    qt_vmmanager_listviewdelegate.hpp
+    qt_vmmanager_listviewdelegate.cpp
+    qt_vmmanager_preferences.cpp
+    qt_vmmanager_preferences.hpp
+    qt_vmmanager_preferences.ui
+    qt_vmmanager_main.hpp
+    qt_vmmanager_main.cpp
+    qt_vmmanager_main.ui
+    qt_vmmanager_model.cpp
+    qt_vmmanager_model.hpp
+    qt_vmmanager_system.cpp
+    qt_vmmanager_system.hpp
+    qt_vmmanager_config.cpp
+    qt_vmmanager_config.hpp
+    qt_vmmanager_mainwindow.cpp
+    qt_vmmanager_mainwindow.hpp
+    qt_vmmanager_mainwindow.ui
+
     ../qt_resources.qrc
+    ./qdarkstyle/dark/darkstyle.qrc
+
+    qt_openglshadermanagerdialog.hpp
+    qt_openglshadermanagerdialog.cpp
+    qt_openglshadermanagerdialog.ui
+
+    qt_openglshaderconfig.hpp
+    qt_openglshaderconfig.cpp
+    qt_openglshaderconfig.ui
+
+    qt_iconindicators.hpp
+    qt_iconindicators.cpp
+    qt_cgasettingsdialog.hpp qt_cgasettingsdialog.cpp qt_cgasettingsdialog.ui
 )
 
+if(EMU_BUILD_NUM)
+    target_sources(ui PRIVATE
+        qt_updatecheck.cpp
+        qt_updatecheck.hpp
+        qt_updatecheckdialog.cpp
+        qt_updatecheckdialog.hpp
+        qt_updatecheckdialog.ui
+        qt_updatedetails.cpp
+        qt_updatedetails.hpp
+        qt_updatedetails.ui
+    )
+endif()
+
+if(NETSWITCH)
+    target_compile_definitions(ui PRIVATE USE_NETSWITCH)
+endif()
+
 if(RTMIDI)
     target_compile_definitions(ui PRIVATE USE_RTMIDI)
 endif()
 
+if(WACOM)
+    target_compile_definitions(ui PRIVATE USE_WACOM)
+endif()
+
+if(CDROM_MITSUMI)
+    target_compile_definitions(ui PRIVATE USE_CDROM_MITSUMI)
+endif()
+
 if(WIN32)
     enable_language(RC)
-    target_sources(86Box PUBLIC ../win/86Box-qt.rc)
+    target_sources(86Box PUBLIC 86Box-qt.rc)
     target_sources(plat PRIVATE win_dynld.c)
-    if(DINPUT)
-        target_sources(plat PRIVATE win_joystick.cpp)
-        target_link_libraries(86Box dinput8)
-    else()
-        target_sources(plat PRIVATE win_joystick_rawinput.c)
-    endif()
-    target_sources(ui PRIVATE qt_d3d9renderer.hpp qt_d3d9renderer.cpp)
-    target_link_libraries(86Box hid d3d9)
+    target_link_libraries(86Box dwmapi)
 
     # CMake 3.22 messed this up for clang/clang++
     # See https://gitlab.kitware.com/cmake/cmake/-/issues/22611
@@ -206,25 +301,58 @@ if(WIN32)
         # MSVC linker adds its own manifest to the executable, which fails if
         # we include ours in 86Box.rc. We therefore need to pass the manifest
         # directly as as a source file, so the linker can use that instead.
-        set_property(SOURCE ../win/86Box-qt.rc DIRECTORY .. PROPERTY COMPILE_DEFINITIONS NO_INCLUDE_MANIFEST)
-        target_sources(86Box PRIVATE ../win/86Box.manifest)
+        set_property(SOURCE 86Box-qt.rc DIRECTORY .. PROPERTY COMPILE_DEFINITIONS NO_INCLUDE_MANIFEST)
+        target_sources(86Box PRIVATE 86Box.manifest)
     endif()
 
     if (MINGW)
         add_compile_definitions(NTDDI_VERSION=0x06010000)
     endif()
+
+    option(SDL_JOYSTICK "Use SDL2 joystick backend instead of raw input" OFF)
+endif()
+
+if(WIN32 AND NOT SDL_JOYSTICK)
+    target_sources(plat PRIVATE win_joystick_rawinput.c)
+    target_link_libraries(86Box hid)
 else()
-    target_sources(plat PRIVATE sdl_joystick.cpp)
+    find_package(SDL2 REQUIRED)
+    include_directories(${SDL2_INCLUDE_DIRS})
+    if(STATIC_BUILD AND TARGET SDL2::SDL2-static)
+        target_link_libraries(86Box SDL2::SDL2-static)
+    elseif(TARGET SDL2::SDL2)
+        target_link_libraries(86Box SDL2::SDL2)
+    else()
+        target_link_libraries(86Box ${SDL2_LIBRARIES})
+    endif()
+    target_sources(plat PRIVATE sdl_joystick.c)
 endif()
 
 if(WIN32 AND NOT MINGW)
-    target_sources(plat PRIVATE ../win/win_opendir.c)
+    target_sources(plat PRIVATE win_opendir.c)
+endif()
+
+if(WIN32 AND NOT CPPTHREADS)
+    target_sources(plat PRIVATE win_thread.c)
 endif()
 
 if(WIN32)
-    target_sources(plat PRIVATE ../win/win_serial_passthrough.c)
+    target_sources(plat PRIVATE
+        win_serial_passthrough.c
+        win_netsocket.c
+    )
 else()
-    target_sources(plat PRIVATE ../unix/unix_serial_passthrough.c)
+    target_sources(plat PRIVATE
+        ../unix/unix_serial_passthrough.c
+        ../unix/unix_netsocket.c
+    )
+endif()
+
+if(WIN32)
+    target_sources(plat PRIVATE win_cdrom_ioctl.c)
+else()
+# Replace with proper *nix and mac handler files once they are done.
+    target_sources(plat PRIVATE dummy_cdrom_ioctl.c)
 endif()
 
 if (APPLE)
@@ -246,23 +374,21 @@ if (WIN32)
     target_sources(ui PRIVATE
         qt_winrawinputfilter.hpp
         qt_winrawinputfilter.cpp
+        qt_vmmanager_windarkmodefilter.hpp
+        qt_vmmanager_windarkmodefilter.cpp
         qt_winmanagerfilter.hpp
         qt_winmanagerfilter.cpp
     )
 endif()
 
-target_link_libraries(
-    plat
-    PRIVATE
+target_link_libraries(plat PRIVATE
     Qt${QT_MAJOR}::Widgets
     Qt${QT_MAJOR}::Gui
     Qt${QT_MAJOR}::Network
     Threads::Threads
 )
 
-target_link_libraries(
-    ui
-    PRIVATE
+target_link_libraries(ui PRIVATE
     Qt${QT_MAJOR}::Widgets
     Qt${QT_MAJOR}::Gui
     Qt${QT_MAJOR}::OpenGL
@@ -372,6 +498,7 @@ endif()
 
 if (UNIX AND NOT APPLE AND NOT HAIKU)
     target_sources(ui PRIVATE x11_util.c)
+    target_link_libraries(plat PRIVATE ${CMAKE_DL_LIBS})
 
     find_package(X11 REQUIRED)
     target_link_libraries(ui PRIVATE X11::X11 X11::Xi)
@@ -395,7 +522,7 @@ if (UNIX AND NOT APPLE AND NOT HAIKU)
                 target_compile_definitions(ui PRIVATE XKBCOMMON_X11)
                 target_link_libraries(ui PRIVATE X11::xcb PUBLIC PkgConfig::XKBCOMMON_X11)
                 target_sources(ui PRIVATE xkbcommon_x11_keyboard.cpp)
-                set(QT5_PRIVATE_HEADERS ON)
+                set(QT_PRIVATE_HEADERS ON)
             endif()
         endif()
     endif()
@@ -411,29 +538,70 @@ if (UNIX AND NOT APPLE AND NOT HAIKU)
                 set(WL_SOURCE_VAR)
                 ecm_add_wayland_client_protocol(WL_SOURCE_VAR PROTOCOL ${CMAKE_SOURCE_DIR}/wl_protocols/relative-pointer-unstable-v1.xml BASENAME relative-pointer-unstable-v1)
                 ecm_add_wayland_client_protocol(WL_SOURCE_VAR PROTOCOL ${CMAKE_SOURCE_DIR}/wl_protocols/pointer-constraints-unstable-v1.xml BASENAME pointer-constraints-unstable-v1)
+                ecm_add_wayland_client_protocol(WL_SOURCE_VAR PROTOCOL ${CMAKE_SOURCE_DIR}/wl_protocols/keyboard-shortcuts-inhibit-unstable-v1.xml BASENAME keyboard-shortcuts-inhibit-unstable-v1)
                 target_include_directories(ui PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${Qt${QT_MAJOR}Gui_PRIVATE_INCLUDE_DIRS})
                 target_sources(ui PRIVATE ${WL_SOURCE_VAR} wl_mouse.cpp)
                 if (XKBCOMMON_FOUND)
                     target_sources(ui PRIVATE xkbcommon_wl_keyboard.cpp)
                 endif()
                 target_compile_definitions(ui PRIVATE WAYLAND)
-                set(QT5_PRIVATE_HEADERS ON)
+                set(QT_PRIVATE_HEADERS ON)
             endif()
         endif()
     endif()
 
     # Add private headers for Qt5 if required.
-    if (NOT USE_QT6 AND DEFINED QT5_PRIVATE_HEADERS)
+    if (DEFINED QT_PRIVATE_HEADERS)
         find_package(Qt${QT_MAJOR}Gui)
         if (Qt${QT_MAJOR}Gui_FOUND)
             include_directories(${Qt${QT_MAJOR}Gui_PRIVATE_INCLUDE_DIRS})
         endif()
     endif()
 endif()
+
+option(EMBED_QTBASE_TRANSLATIONS "Embed the base Qt translations into the executable" ON)
+
+if (EMBED_QTBASE_TRANSLATIONS)
+    # Get the Qt translations directory
+    get_target_property(QT_QMAKE_EXECUTABLE Qt${QT_MAJOR}::qmake IMPORTED_LOCATION)
+    execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_TRANSLATIONS OUTPUT_VARIABLE QT_TRANSLATIONS_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif()
+
 set(QM_FILES)
 file(GLOB po_files "${CMAKE_CURRENT_SOURCE_DIR}/languages/*.po")
 foreach(po_file ${po_files})
     get_filename_component(PO_FILE_NAME ${po_file} NAME_WE)
+
+    if (EMBED_QTBASE_TRANSLATIONS)
+        # Get the language and country
+        string(REGEX MATCH "^[a-z]+" PO_LANGUAGE ${PO_FILE_NAME})
+        string(REGEX MATCH "[A-Z]+$" PO_COUNTRY ${PO_FILE_NAME})
+
+        # Find the base Qt translation for the language and country
+        if (EXISTS "${QT_TRANSLATIONS_DIR}/qtbase_${PO_LANGUAGE}_${PO_COUNTRY}.qm")
+            set(qt_translation_file "qtbase_${PO_LANGUAGE}_${PO_COUNTRY}.qm")
+        # Fall back to just the language if country isn't found
+        elseif (EXISTS "${QT_TRANSLATIONS_DIR}/qtbase_${PO_LANGUAGE}.qm")
+            set(qt_translation_file "qtbase_${PO_LANGUAGE}.qm")
+        # If the translation is still not found, try the legacy Qt one
+        elseif (EXISTS "${QT_TRANSLATIONS_DIR}/qt_${PO_LANGUAGE}_${PO_COUNTRY}.qm")
+            set(qt_translation_file "qt_${PO_LANGUAGE}_${PO_COUNTRY}.qm")
+        # Fall back to just the language again
+        elseif (EXISTS "${QT_TRANSLATIONS_DIR}/qt_${PO_LANGUAGE}.qm")
+            set(qt_translation_file "qt_${PO_LANGUAGE}.qm")
+        else()
+            unset(qt_translation_file)
+        endif()
+
+        # Copy the translation file to the build directory
+        if (qt_translation_file)
+            file(COPY "${QT_TRANSLATIONS_DIR}/${qt_translation_file}" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+            # Add the file to the translations list
+            string(APPEND QT_TRANSLATIONS_LIST "        <file>${qt_translation_file}</file>\n")
+            list(APPEND QM_FILES "${CMAKE_CURRENT_BINARY_DIR}/${qt_translation_file}")
+        endif()
+    endif()
+
     add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/86box_${PO_FILE_NAME}.qm"
                        COMMAND "$<TARGET_FILE:Qt${QT_MAJOR}::lconvert>" -i ${po_file} -o ${CMAKE_CURRENT_BINARY_DIR}/86box_${PO_FILE_NAME}.qm
                        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
@@ -441,5 +609,6 @@ foreach(po_file ${po_files})
     list(APPEND QM_FILES "${CMAKE_CURRENT_BINARY_DIR}/86box_${PO_FILE_NAME}.qm")
     list(APPEND QM_FILES "${po_file}")
 endforeach()
-configure_file(qt_translations.qrc ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
+
+configure_file(qt_translations.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/qt_translations.qrc)
 target_sources(ui PRIVATE ${QM_FILES} ${CMAKE_CURRENT_BINARY_DIR}/qt_translations.qrc)
diff --git a/src/win/assets/86Box-green.png b/src/qt/assets/86Box-green.png
similarity index 100%
rename from src/win/assets/86Box-green.png
rename to src/qt/assets/86Box-green.png
diff --git a/src/win/assets/86box-rb.png b/src/qt/assets/86box-rb.png
similarity index 100%
rename from src/win/assets/86box-rb.png
rename to src/qt/assets/86box-rb.png
diff --git a/src/win/assets/86box-red.png b/src/qt/assets/86box-red.png
similarity index 100%
rename from src/win/assets/86box-red.png
rename to src/qt/assets/86box-red.png
diff --git a/src/qt/assets/86box-wizard.png b/src/qt/assets/86box-wizard.png
new file mode 100644
index 000000000..19ecda8c7
Binary files /dev/null and b/src/qt/assets/86box-wizard.png differ
diff --git a/src/win/assets/86box-yellow.png b/src/qt/assets/86box-yellow.png
similarity index 100%
rename from src/win/assets/86box-yellow.png
rename to src/qt/assets/86box-yellow.png
diff --git a/src/win/assets/86box.png b/src/qt/assets/86box.png
similarity index 100%
rename from src/win/assets/86box.png
rename to src/qt/assets/86box.png
diff --git a/src/qt/assets/addvm-logo.png b/src/qt/assets/addvm-logo.png
new file mode 100644
index 000000000..926daf342
Binary files /dev/null and b/src/qt/assets/addvm-logo.png differ
diff --git a/src/qt/assets/addvm-logo.svg b/src/qt/assets/addvm-logo.svg
new file mode 100644
index 000000000..ab7a032ea
--- /dev/null
+++ b/src/qt/assets/addvm-logo.svg
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
+   version="1.1"
+   id="svg1"
+   inkscape:export-filename="addvm-logo.png"
+   inkscape:export-xdpi="36"
+   inkscape:export-ydpi="36"
+   inkscape:version="1.4.2 (f4327f4, 2025-05-13)"
+   sodipodi:docname="addvm-logo.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
+     inkscape:document-units="px"
+     inkscape:zoom="8"
+     inkscape:cx="74.6875"
+     inkscape:cy="59.8125"
+     inkscape:window-width="3440"
+     inkscape:window-height="1369"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g72" />
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g72">
+      <rect
+         style="fill:#000080;stroke:#f9f9f9;stroke-width:8;stroke-dasharray:none"
+         id="rect63"
+         width="120"
+         height="119.99999"
+         x="4"
+         y="4" />
+      <g
+         id="g47"
+         transform="translate(24,20)">
+        <path
+           style="fill:#ffffff;stroke:none;stroke-width:1;stroke-dasharray:none"
+           d="M 0,53 41,74 75,57 33.5,36.25 Z"
+           id="path5"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           id="path1"
+           style="fill:#000080;stroke:#000080;stroke-width:4;stroke-dasharray:none"
+           d="M 0,53 V 68.5 L 41,89 75,72 V 57 L 41,74 Z" />
+        <path
+           id="path43"
+           style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+           d="M 0,53 V 68.5 L 41,89 75,72 V 57 L 41,74 Z m 2,3.271484 38,19.464844 v 10.527344 l -38,-19 z m 71,3.964844 v 10.527344 l -31,15.5 V 75.736328 Z"
+           sodipodi:nodetypes="ccccccccccccccccc" />
+        <path
+           style="fill:#ffffff;stroke:none;stroke-width:1;stroke-dasharray:none"
+           d="m 4,61 2,1 v 2 L 4,63 Z"
+           id="path14"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#ffffff;stroke:none;stroke-width:1;stroke-dasharray:none"
+           d="m 24,71 12,6 v 2 L 24,73 Z"
+           id="path15"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <g
+         id="g75">
+        <path
+           id="path3"
+           style="fill:#ffffff;stroke:none;stroke-width:1;stroke-dasharray:none"
+           d="M 74,20 44,26 40,24 29,29 64,47 74,41 95,31 Z" />
+        <path
+           id="path2"
+           style="fill:#000080;stroke:#000080;stroke-width:4;stroke-dasharray:none"
+           d="M 29 29 L 29 68 L 64 85 L 74 81 L 75 80.599609 L 75 74.5 L 93 65.5 L 93 52 L 95 50 L 95 31 L 74 41 L 64 47 L 29 29 z " />
+        <path
+           style="fill:#ffffff;stroke:none;stroke-width:1;stroke-dasharray:none"
+           d="M 34,38 V 62 L 60,75 V 51 Z"
+           id="path10"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#f9f9f9;stroke:none;stroke-width:1;stroke-dasharray:none"
+           d="m 55,74 2,1 v 2 l -2,-1 z"
+           id="path14-2"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           id="path63"
+           style="fill:#ffffff;stroke:none;stroke-width:2;stroke-dasharray:none"
+           d="m 29,29 v 39 l 35,17 10,-4 1,-0.400391 V 74.5 l 18,-9 V 53.414062 L 95,51.414 V 31 L 74,41 64,47 Z m 2,3.277344 32,16.457031 V 82.291016 L 31,66.748047 Z m 62,1.890625 v 16.417969 l -18,18 V 42.738281 Z m -20,9.763672 v 35.314453 l -8,3.199218 v -33.71289 z m 18,11.482421 v 8.84961 l -16,8 v -0.84961 z"
+           sodipodi:nodetypes="ccccccccccccccccccccccccccccccccc" />
+      </g>
+      <path
+         style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;fill:#f9f9f9;stroke:#000080;stroke-width:8;stroke-dasharray:none;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+         d="M 80,64 V 80 H 64 v 16 h 16 v 16 H 96 V 96 h 16 V 80 H 96 V 64 Z"
+         id="path72" />
+    </g>
+  </g>
+</svg>
diff --git a/src/qt/assets/addvm-watermark.png b/src/qt/assets/addvm-watermark.png
new file mode 100644
index 000000000..8d8983342
Binary files /dev/null and b/src/qt/assets/addvm-watermark.png differ
diff --git a/src/qt/assets/addvm-watermark.svg b/src/qt/assets/addvm-watermark.svg
new file mode 100644
index 000000000..e46171186
--- /dev/null
+++ b/src/qt/assets/addvm-watermark.svg
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="256"
+   height="512"
+   viewBox="0 0 256 512"
+   version="1.1"
+   id="svg1"
+   inkscape:export-filename="addvm-watermark.png"
+   inkscape:export-xdpi="60"
+   inkscape:export-ydpi="60"
+   inkscape:version="1.4.2 (f4327f4, 2025-05-13)"
+   sodipodi:docname="addvm-watermark.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
+     inkscape:document-units="px"
+     inkscape:zoom="1.0064533"
+     inkscape:cx="-9.4390871"
+     inkscape:cy="139.59913"
+     inkscape:window-width="3440"
+     inkscape:window-height="1369"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g4-4" />
+  <defs
+     id="defs1">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath29">
+      <rect
+         style="fill:#000080;stroke:#000080;stroke-width:0.515789;stroke-dasharray:none"
+         id="rect30"
+         width="52.300762"
+         height="105.11731"
+         x="-128.85944"
+         y="277.26517" />
+    </clipPath>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g72"
+       transform="matrix(0.75,0,0,0.75,128,32)">
+      <rect
+         style="fill:#000080;stroke:#000080;stroke-width:3.33335;stroke-dasharray:none"
+         id="rect4"
+         width="338"
+         height="679.33331"
+         x="-44.305092"
+         y="-335.05698"
+         transform="translate(-124.69491,294.05695)" />
+      <g
+         id="g6"
+         transform="matrix(6.4626209,0,0,6.4626209,663.76968,-1832.8597)"
+         clip-path="url(#clipPath29)">
+        <g
+           id="g47-0"
+           transform="translate(-124.69491,294.05695)">
+          <path
+             style="fill:#0000ff;stroke:none;stroke-width:1;stroke-dasharray:none"
+             d="M 0,53 41,74 75,57 33.5,36.25 Z"
+             id="path5-1"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             id="path1-6"
+             style="fill:#000080;stroke:#000080;stroke-width:3.33333;stroke-dasharray:none"
+             d="M 0,53 V 68.5 L 41,89 75,72 V 57 L 41,74 Z" />
+          <path
+             id="path43-5"
+             style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#0000ff;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+             d="M 0,53 V 68.5 L 41,89 75,72 V 57 L 41,74 Z m 2,3.271484 38,19.464844 v 10.527344 l -38,-19 z m 71,3.964844 v 10.527344 l -31,15.5 V 75.736328 Z"
+             sodipodi:nodetypes="ccccccccccccccccc" />
+          <path
+             style="fill:#0000ff;stroke:none;stroke-width:1;stroke-dasharray:none"
+             d="m 4,61 2,1 v 2 L 4,63 Z"
+             id="path14-7"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             style="fill:#0000ff;stroke:none;stroke-width:1;stroke-dasharray:none"
+             d="m 24,71 12,6 v 2 L 24,73 Z"
+             id="path15-5"
+             sodipodi:nodetypes="ccccc" />
+        </g>
+        <g
+           id="g4-4"
+           transform="translate(-148.69491,274.05693)">
+          <path
+             id="path3-1"
+             style="fill:#0000ff;stroke:none;stroke-width:0.999997;stroke-dasharray:none"
+             d="m 73.999991,20.000012 -29.999993,6.000001 -3.999999,-2 -10.999997,5 34.999991,17.999999 9.999998,-6 20.999995,-9.999999 z" />
+          <path
+             id="path2-2"
+             style="fill:#000080;stroke:#000080;stroke-width:3.33333;stroke-dasharray:none"
+             d="m 29.000002,29.000013 v 38.999999 l 34.999991,17.000001 9.999998,-4.000005 0.999996,-0.400387 V 74.500012 L 92.999984,65.500011 V 52.000012 l 2.000002,-2 V 31.000013 l -20.999995,9.999999 -9.999998,6 z" />
+          <path
+             style="fill:#0000ff;stroke:none;stroke-width:0.999997;stroke-dasharray:none"
+             d="m 34,38.000012 v 24 L 59.999994,75.000016 V 51.000012 Z"
+             id="path10-0"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             style="fill:#0000ff;stroke:none;stroke-width:0.999997;stroke-dasharray:none"
+             d="m 54.999996,74.000012 1.999999,1.000004 v 1.999995 l -1.999999,-0.999998 z"
+             id="path14-2-0"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             id="path63-1"
+             style="fill:#0000ff;stroke:none;stroke-width:2;stroke-dasharray:none"
+             d="m 29.000002,29.000013 v 38.999999 l 34.999991,17.000001 9.999998,-4.000005 0.999996,-0.400387 V 74.500012 L 92.999984,65.500011 V 53.414074 l 2.000002,-2.000062 V 31.000013 l -20.999995,9.999999 -9.999998,6 z m 1.999999,3.277344 31.999993,16.45703 V 82.291028 L 31.000001,66.748058 Z m 61.999983,1.890625 V 50.58595 l -17.999997,18 V 42.738293 Z m -19.999993,9.763671 v 35.31445 l -7.999998,3.199223 V 48.732434 Z m 17.999998,11.482421 v 8.849609 l -16.000002,8.000001 v -0.84961 z"
+             sodipodi:nodetypes="ccccccccccccccccccccccccccccccccc" />
+        </g>
+      </g>
+      <g
+         id="g5">
+        <rect
+           style="fill:#000055;stroke:#f9f9f9;stroke-width:8.00002;stroke-dasharray:none"
+           id="rect63"
+           width="119.99998"
+           height="119.99998"
+           x="4.00001"
+           y="4.0000124" />
+        <g
+           id="g47"
+           transform="translate(24.000003,20.000012)">
+          <path
+             style="fill:#ffffff;stroke:none;stroke-width:1;stroke-dasharray:none"
+             d="M 0,53 41,74 75,57 33.5,36.25 Z"
+             id="path5"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             id="path1"
+             style="fill:#000055;stroke:#000055;stroke-width:3.33333333;stroke-dasharray:none"
+             d="M 0,53 V 68.5 L 41,89 75,72 V 57 L 41,74 Z" />
+          <path
+             id="path43"
+             style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+             d="M 0,53 V 68.5 L 41,89 75,72 V 57 L 41,74 Z m 2,3.271484 38,19.464844 v 10.527344 l -38,-19 z m 71,3.964844 v 10.527344 l -31,15.5 V 75.736328 Z"
+             sodipodi:nodetypes="ccccccccccccccccc" />
+          <path
+             style="fill:#ffffff;stroke:none;stroke-width:1;stroke-dasharray:none"
+             d="m 4,61 2,1 v 2 L 4,63 Z"
+             id="path14"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             style="fill:#ffffff;stroke:none;stroke-width:1;stroke-dasharray:none"
+             d="m 24,71 12,6 v 2 L 24,73 Z"
+             id="path15"
+             sodipodi:nodetypes="ccccc" />
+        </g>
+        <g
+           id="g4">
+          <path
+             id="path3"
+             style="fill:#ffffff;stroke:none;stroke-width:0.999997;stroke-dasharray:none"
+             d="m 73.999991,20.000012 -29.999993,6.000001 -3.999999,-2 -10.999997,5 34.999991,17.999999 9.999998,-6 20.999995,-9.999999 z" />
+          <path
+             id="path2"
+             style="fill:#000055;stroke:#000055;stroke-width:3.33333333;stroke-dasharray:none"
+             d="m 29.000002,29.000013 v 38.999999 l 34.999991,17.000001 9.999998,-4.000005 0.999996,-0.400387 V 74.500012 L 92.999984,65.500011 V 52.000012 l 2.000002,-2 V 31.000013 l -20.999995,9.999999 -9.999998,6 z" />
+          <path
+             style="fill:#ffffff;stroke:none;stroke-width:0.999997;stroke-dasharray:none"
+             d="m 34,38.000012 v 24 L 59.999994,75.000016 V 51.000012 Z"
+             id="path10"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             style="fill:#f9f9f9;stroke:none;stroke-width:0.999997;stroke-dasharray:none"
+             d="m 54.999996,74.000012 1.999999,1.000004 v 1.999995 l -1.999999,-0.999998 z"
+             id="path14-2"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             id="path63"
+             style="fill:#ffffff;stroke:none;stroke-width:2;stroke-dasharray:none"
+             d="m 29.000002,29.000013 v 38.999999 l 34.999991,17.000001 9.999998,-4.000005 0.999996,-0.400387 V 74.500012 L 92.999984,65.500011 V 53.414074 l 2.000002,-2.000062 V 31.000013 l -20.999995,9.999999 -9.999998,6 z m 1.999999,3.277344 31.999993,16.45703 V 82.291028 L 31.000001,66.748058 Z m 61.999983,1.890625 V 50.58595 l -17.999997,18 V 42.738293 Z m -19.999993,9.763671 v 35.31445 l -7.999998,3.199223 V 48.732434 Z m 17.999998,11.482421 v 8.849609 l -16.000002,8.000001 v -0.84961 z"
+             sodipodi:nodetypes="ccccccccccccccccccccccccccccccccc" />
+        </g>
+        <path
+           style="baseline-shift:baseline;display:inline;overflow:visible;fill:#f9f9f9;stroke:#000055;stroke-width:8.00002;stroke-dasharray:none;enable-background:accumulate;stop-color:#000000"
+           d="m 79.999989,64.000011 v 16 H 63.999993 V 96.000008 H 79.999989 V 112 H 95.999991 V 96.000008 H 111.99998 V 80.000011 H 95.999991 v -16 z"
+           id="path72" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/src/win/assets/status-paused.png b/src/qt/assets/status-paused.png
similarity index 100%
rename from src/win/assets/status-paused.png
rename to src/qt/assets/status-paused.png
diff --git a/src/win/assets/status-running.png b/src/qt/assets/status-running.png
similarity index 100%
rename from src/win/assets/status-running.png
rename to src/qt/assets/status-running.png
diff --git a/src/qt/assets/systemicons/cpq_deskpro.png b/src/qt/assets/systemicons/cpq_deskpro.png
new file mode 100644
index 000000000..1bbca68a3
Binary files /dev/null and b/src/qt/assets/systemicons/cpq_deskpro.png differ
diff --git a/src/qt/assets/systemicons/cpq_port_386.png b/src/qt/assets/systemicons/cpq_port_386.png
new file mode 100644
index 000000000..4c55b3559
Binary files /dev/null and b/src/qt/assets/systemicons/cpq_port_386.png differ
diff --git a/src/qt/assets/systemicons/cpq_port_II.png b/src/qt/assets/systemicons/cpq_port_II.png
new file mode 100644
index 000000000..3254d9b5e
Binary files /dev/null and b/src/qt/assets/systemicons/cpq_port_II.png differ
diff --git a/src/qt/assets/systemicons/cpq_port_III.png b/src/qt/assets/systemicons/cpq_port_III.png
new file mode 100644
index 000000000..65d2f714e
Binary files /dev/null and b/src/qt/assets/systemicons/cpq_port_III.png differ
diff --git a/src/qt/assets/systemicons/cpq_portable.png b/src/qt/assets/systemicons/cpq_portable.png
new file mode 100644
index 000000000..d3dc381e4
Binary files /dev/null and b/src/qt/assets/systemicons/cpq_portable.png differ
diff --git a/src/qt/assets/systemicons/cpq_pres_2240.png b/src/qt/assets/systemicons/cpq_pres_2240.png
new file mode 100644
index 000000000..c50043cdd
Binary files /dev/null and b/src/qt/assets/systemicons/cpq_pres_2240.png differ
diff --git a/src/qt/assets/systemicons/cpq_pres_4500.png b/src/qt/assets/systemicons/cpq_pres_4500.png
new file mode 100644
index 000000000..edd955b5a
Binary files /dev/null and b/src/qt/assets/systemicons/cpq_pres_4500.png differ
diff --git a/src/qt/assets/systemicons/ibm330.png b/src/qt/assets/systemicons/ibm330.png
new file mode 100644
index 000000000..90637dc4c
Binary files /dev/null and b/src/qt/assets/systemicons/ibm330.png differ
diff --git a/src/qt/assets/systemicons/ibm_at.png b/src/qt/assets/systemicons/ibm_at.png
new file mode 100644
index 000000000..e6710180e
Binary files /dev/null and b/src/qt/assets/systemicons/ibm_at.png differ
diff --git a/src/qt/assets/systemicons/ibm_pc_81.png b/src/qt/assets/systemicons/ibm_pc_81.png
new file mode 100644
index 000000000..4f398d468
Binary files /dev/null and b/src/qt/assets/systemicons/ibm_pc_81.png differ
diff --git a/src/qt/assets/systemicons/ibm_pc_82.png b/src/qt/assets/systemicons/ibm_pc_82.png
new file mode 100644
index 000000000..4f398d468
Binary files /dev/null and b/src/qt/assets/systemicons/ibm_pc_82.png differ
diff --git a/src/qt/assets/systemicons/ibm_pcjr.png b/src/qt/assets/systemicons/ibm_pcjr.png
new file mode 100644
index 000000000..1f3014bb4
Binary files /dev/null and b/src/qt/assets/systemicons/ibm_pcjr.png differ
diff --git a/src/qt/assets/systemicons/ibm_ps2_m70.png b/src/qt/assets/systemicons/ibm_ps2_m70.png
new file mode 100644
index 000000000..af433ebb3
Binary files /dev/null and b/src/qt/assets/systemicons/ibm_ps2_m70.png differ
diff --git a/src/qt/assets/systemicons/ibm_ps2_m80.png b/src/qt/assets/systemicons/ibm_ps2_m80.png
new file mode 100644
index 000000000..9df02adff
Binary files /dev/null and b/src/qt/assets/systemicons/ibm_ps2_m80.png differ
diff --git a/src/qt/assets/systemicons/ibm_psvp_486.png b/src/qt/assets/systemicons/ibm_psvp_486.png
new file mode 100644
index 000000000..af5a95675
Binary files /dev/null and b/src/qt/assets/systemicons/ibm_psvp_486.png differ
diff --git a/src/qt/assets/systemicons/ibm_psvp_p60.png b/src/qt/assets/systemicons/ibm_psvp_p60.png
new file mode 100644
index 000000000..af5a95675
Binary files /dev/null and b/src/qt/assets/systemicons/ibm_psvp_p60.png differ
diff --git a/src/qt/assets/systemicons/ibm_xt_82.png b/src/qt/assets/systemicons/ibm_xt_82.png
new file mode 100644
index 000000000..4f398d468
Binary files /dev/null and b/src/qt/assets/systemicons/ibm_xt_82.png differ
diff --git a/src/qt/assets/systemicons/ibm_xt_86.png b/src/qt/assets/systemicons/ibm_xt_86.png
new file mode 100644
index 000000000..4f398d468
Binary files /dev/null and b/src/qt/assets/systemicons/ibm_xt_86.png differ
diff --git a/src/qt/assets/systemicons/olivetti_m19.png b/src/qt/assets/systemicons/olivetti_m19.png
new file mode 100644
index 000000000..766e335f7
Binary files /dev/null and b/src/qt/assets/systemicons/olivetti_m19.png differ
diff --git a/src/qt/assets/systemicons/olivetti_m21.png b/src/qt/assets/systemicons/olivetti_m21.png
new file mode 100644
index 000000000..5e0ee4b52
Binary files /dev/null and b/src/qt/assets/systemicons/olivetti_m21.png differ
diff --git a/src/qt/assets/systemicons/olivetti_m24.png b/src/qt/assets/systemicons/olivetti_m24.png
new file mode 100644
index 000000000..e48356c32
Binary files /dev/null and b/src/qt/assets/systemicons/olivetti_m24.png differ
diff --git a/src/qt/assets/systemicons/olivetti_m24sp.png b/src/qt/assets/systemicons/olivetti_m24sp.png
new file mode 100644
index 000000000..e48356c32
Binary files /dev/null and b/src/qt/assets/systemicons/olivetti_m24sp.png differ
diff --git a/src/qt/assets/systemicons/os_archlinux_x2.png b/src/qt/assets/systemicons/os_archlinux_x2.png
new file mode 100644
index 000000000..1b218a76f
Binary files /dev/null and b/src/qt/assets/systemicons/os_archlinux_x2.png differ
diff --git a/src/qt/assets/systemicons/os_cloud_x2.png b/src/qt/assets/systemicons/os_cloud_x2.png
new file mode 100644
index 000000000..9bd42f9ac
Binary files /dev/null and b/src/qt/assets/systemicons/os_cloud_x2.png differ
diff --git a/src/qt/assets/systemicons/os_debian_x2.png b/src/qt/assets/systemicons/os_debian_x2.png
new file mode 100644
index 000000000..a6644c33d
Binary files /dev/null and b/src/qt/assets/systemicons/os_debian_x2.png differ
diff --git a/src/qt/assets/systemicons/os_dos_x2.png b/src/qt/assets/systemicons/os_dos_x2.png
new file mode 100644
index 000000000..b6df56ef5
Binary files /dev/null and b/src/qt/assets/systemicons/os_dos_x2.png differ
diff --git a/src/qt/assets/systemicons/os_fedora_x2.png b/src/qt/assets/systemicons/os_fedora_x2.png
new file mode 100644
index 000000000..120d247a8
Binary files /dev/null and b/src/qt/assets/systemicons/os_fedora_x2.png differ
diff --git a/src/qt/assets/systemicons/os_freebsd_x2.png b/src/qt/assets/systemicons/os_freebsd_x2.png
new file mode 100644
index 000000000..dd6f88d41
Binary files /dev/null and b/src/qt/assets/systemicons/os_freebsd_x2.png differ
diff --git a/src/qt/assets/systemicons/os_gentoo_x2.png b/src/qt/assets/systemicons/os_gentoo_x2.png
new file mode 100644
index 000000000..f27afa5fc
Binary files /dev/null and b/src/qt/assets/systemicons/os_gentoo_x2.png differ
diff --git a/src/qt/assets/systemicons/os_jrockitve_x2.png b/src/qt/assets/systemicons/os_jrockitve_x2.png
new file mode 100644
index 000000000..4283cad5e
Binary files /dev/null and b/src/qt/assets/systemicons/os_jrockitve_x2.png differ
diff --git a/src/qt/assets/systemicons/os_l4_x2.png b/src/qt/assets/systemicons/os_l4_x2.png
new file mode 100644
index 000000000..9fbbaa183
Binary files /dev/null and b/src/qt/assets/systemicons/os_l4_x2.png differ
diff --git a/src/qt/assets/systemicons/os_linux22_x2.png b/src/qt/assets/systemicons/os_linux22_x2.png
new file mode 100644
index 000000000..0de56653a
Binary files /dev/null and b/src/qt/assets/systemicons/os_linux22_x2.png differ
diff --git a/src/qt/assets/systemicons/os_linux24_x2.png b/src/qt/assets/systemicons/os_linux24_x2.png
new file mode 100644
index 000000000..b3df83b7f
Binary files /dev/null and b/src/qt/assets/systemicons/os_linux24_x2.png differ
diff --git a/src/qt/assets/systemicons/os_linux26_x2.png b/src/qt/assets/systemicons/os_linux26_x2.png
new file mode 100644
index 000000000..8fdf52df7
Binary files /dev/null and b/src/qt/assets/systemicons/os_linux26_x2.png differ
diff --git a/src/qt/assets/systemicons/os_linux_x2.png b/src/qt/assets/systemicons/os_linux_x2.png
new file mode 100644
index 000000000..d4c2eeebe
Binary files /dev/null and b/src/qt/assets/systemicons/os_linux_x2.png differ
diff --git a/src/qt/assets/systemicons/os_macosx_x2.png b/src/qt/assets/systemicons/os_macosx_x2.png
new file mode 100644
index 000000000..38eb2e5a7
Binary files /dev/null and b/src/qt/assets/systemicons/os_macosx_x2.png differ
diff --git a/src/qt/assets/systemicons/os_mandriva_x2.png b/src/qt/assets/systemicons/os_mandriva_x2.png
new file mode 100644
index 000000000..a09e9c170
Binary files /dev/null and b/src/qt/assets/systemicons/os_mandriva_x2.png differ
diff --git a/src/qt/assets/systemicons/os_netbsd_x2.png b/src/qt/assets/systemicons/os_netbsd_x2.png
new file mode 100644
index 000000000..9fa38a7a6
Binary files /dev/null and b/src/qt/assets/systemicons/os_netbsd_x2.png differ
diff --git a/src/qt/assets/systemicons/os_netware_x2.png b/src/qt/assets/systemicons/os_netware_x2.png
new file mode 100644
index 000000000..4bcc96521
Binary files /dev/null and b/src/qt/assets/systemicons/os_netware_x2.png differ
diff --git a/src/qt/assets/systemicons/os_openbsd_x2.png b/src/qt/assets/systemicons/os_openbsd_x2.png
new file mode 100644
index 000000000..13ae3a0db
Binary files /dev/null and b/src/qt/assets/systemicons/os_openbsd_x2.png differ
diff --git a/src/qt/assets/systemicons/os_opensuse_x2.png b/src/qt/assets/systemicons/os_opensuse_x2.png
new file mode 100644
index 000000000..4d1696d9b
Binary files /dev/null and b/src/qt/assets/systemicons/os_opensuse_x2.png differ
diff --git a/src/qt/assets/systemicons/os_oracle_x2.png b/src/qt/assets/systemicons/os_oracle_x2.png
new file mode 100644
index 000000000..545e885cb
Binary files /dev/null and b/src/qt/assets/systemicons/os_oracle_x2.png differ
diff --git a/src/qt/assets/systemicons/os_oraclesolaris_x2.png b/src/qt/assets/systemicons/os_oraclesolaris_x2.png
new file mode 100644
index 000000000..8db66abe3
Binary files /dev/null and b/src/qt/assets/systemicons/os_oraclesolaris_x2.png differ
diff --git a/src/qt/assets/systemicons/os_os2_other_x2.png b/src/qt/assets/systemicons/os_os2_other_x2.png
new file mode 100644
index 000000000..2d37846a0
Binary files /dev/null and b/src/qt/assets/systemicons/os_os2_other_x2.png differ
diff --git a/src/qt/assets/systemicons/os_os2ecs_x2.png b/src/qt/assets/systemicons/os_os2ecs_x2.png
new file mode 100644
index 000000000..261f9f56c
Binary files /dev/null and b/src/qt/assets/systemicons/os_os2ecs_x2.png differ
diff --git a/src/qt/assets/systemicons/os_os2warp3_x2.png b/src/qt/assets/systemicons/os_os2warp3_x2.png
new file mode 100644
index 000000000..1be5a696c
Binary files /dev/null and b/src/qt/assets/systemicons/os_os2warp3_x2.png differ
diff --git a/src/qt/assets/systemicons/os_os2warp45_x2.png b/src/qt/assets/systemicons/os_os2warp45_x2.png
new file mode 100644
index 000000000..d1a4df0c2
Binary files /dev/null and b/src/qt/assets/systemicons/os_os2warp45_x2.png differ
diff --git a/src/qt/assets/systemicons/os_os2warp4_x2.png b/src/qt/assets/systemicons/os_os2warp4_x2.png
new file mode 100644
index 000000000..0a81c8759
Binary files /dev/null and b/src/qt/assets/systemicons/os_os2warp4_x2.png differ
diff --git a/src/qt/assets/systemicons/os_other_x2.png b/src/qt/assets/systemicons/os_other_x2.png
new file mode 100644
index 000000000..9602353c0
Binary files /dev/null and b/src/qt/assets/systemicons/os_other_x2.png differ
diff --git a/src/qt/assets/systemicons/os_qnx_x2.png b/src/qt/assets/systemicons/os_qnx_x2.png
new file mode 100644
index 000000000..b124cfa6e
Binary files /dev/null and b/src/qt/assets/systemicons/os_qnx_x2.png differ
diff --git a/src/qt/assets/systemicons/os_redhat_x2.png b/src/qt/assets/systemicons/os_redhat_x2.png
new file mode 100644
index 000000000..a756e8aac
Binary files /dev/null and b/src/qt/assets/systemicons/os_redhat_x2.png differ
diff --git a/src/qt/assets/systemicons/os_solaris_x2.png b/src/qt/assets/systemicons/os_solaris_x2.png
new file mode 100644
index 000000000..2dfd2ac74
Binary files /dev/null and b/src/qt/assets/systemicons/os_solaris_x2.png differ
diff --git a/src/qt/assets/systemicons/os_turbolinux_x2.png b/src/qt/assets/systemicons/os_turbolinux_x2.png
new file mode 100644
index 000000000..4d5ee4ab1
Binary files /dev/null and b/src/qt/assets/systemicons/os_turbolinux_x2.png differ
diff --git a/src/qt/assets/systemicons/os_ubuntu_x2.png b/src/qt/assets/systemicons/os_ubuntu_x2.png
new file mode 100644
index 000000000..9b6302b37
Binary files /dev/null and b/src/qt/assets/systemicons/os_ubuntu_x2.png differ
diff --git a/src/qt/assets/systemicons/os_win10_x2.png b/src/qt/assets/systemicons/os_win10_x2.png
new file mode 100644
index 000000000..1d6e81392
Binary files /dev/null and b/src/qt/assets/systemicons/os_win10_x2.png differ
diff --git a/src/qt/assets/systemicons/os_win2k3_x2.png b/src/qt/assets/systemicons/os_win2k3_x2.png
new file mode 100644
index 000000000..45bec005d
Binary files /dev/null and b/src/qt/assets/systemicons/os_win2k3_x2.png differ
diff --git a/src/qt/assets/systemicons/os_win2k8_x2.png b/src/qt/assets/systemicons/os_win2k8_x2.png
new file mode 100644
index 000000000..d97a2789d
Binary files /dev/null and b/src/qt/assets/systemicons/os_win2k8_x2.png differ
diff --git a/src/qt/assets/systemicons/os_win2k_x2.png b/src/qt/assets/systemicons/os_win2k_x2.png
new file mode 100644
index 000000000..a773288ed
Binary files /dev/null and b/src/qt/assets/systemicons/os_win2k_x2.png differ
diff --git a/src/qt/assets/systemicons/os_win31_x2.png b/src/qt/assets/systemicons/os_win31_x2.png
new file mode 100644
index 000000000..5ca2005d6
Binary files /dev/null and b/src/qt/assets/systemicons/os_win31_x2.png differ
diff --git a/src/qt/assets/systemicons/os_win7_x2.png b/src/qt/assets/systemicons/os_win7_x2.png
new file mode 100644
index 000000000..c8ce57a2b
Binary files /dev/null and b/src/qt/assets/systemicons/os_win7_x2.png differ
diff --git a/src/qt/assets/systemicons/os_win81_x2.png b/src/qt/assets/systemicons/os_win81_x2.png
new file mode 100644
index 000000000..07131ed6c
Binary files /dev/null and b/src/qt/assets/systemicons/os_win81_x2.png differ
diff --git a/src/qt/assets/systemicons/os_win8_x2.png b/src/qt/assets/systemicons/os_win8_x2.png
new file mode 100644
index 000000000..ff94c2dd1
Binary files /dev/null and b/src/qt/assets/systemicons/os_win8_x2.png differ
diff --git a/src/qt/assets/systemicons/os_win95_x2.png b/src/qt/assets/systemicons/os_win95_x2.png
new file mode 100644
index 000000000..efd62799e
Binary files /dev/null and b/src/qt/assets/systemicons/os_win95_x2.png differ
diff --git a/src/qt/assets/systemicons/os_win98_x2.png b/src/qt/assets/systemicons/os_win98_x2.png
new file mode 100644
index 000000000..c8fa4e7bb
Binary files /dev/null and b/src/qt/assets/systemicons/os_win98_x2.png differ
diff --git a/src/qt/assets/systemicons/os_win_other_x2.png b/src/qt/assets/systemicons/os_win_other_x2.png
new file mode 100644
index 000000000..fac95889f
Binary files /dev/null and b/src/qt/assets/systemicons/os_win_other_x2.png differ
diff --git a/src/qt/assets/systemicons/os_winme_x2.png b/src/qt/assets/systemicons/os_winme_x2.png
new file mode 100644
index 000000000..1c268c84b
Binary files /dev/null and b/src/qt/assets/systemicons/os_winme_x2.png differ
diff --git a/src/qt/assets/systemicons/os_winnt4_x2.png b/src/qt/assets/systemicons/os_winnt4_x2.png
new file mode 100644
index 000000000..c3352abcd
Binary files /dev/null and b/src/qt/assets/systemicons/os_winnt4_x2.png differ
diff --git a/src/qt/assets/systemicons/os_winvista_x2.png b/src/qt/assets/systemicons/os_winvista_x2.png
new file mode 100644
index 000000000..7b633b79f
Binary files /dev/null and b/src/qt/assets/systemicons/os_winvista_x2.png differ
diff --git a/src/qt/assets/systemicons/os_winxp_x2.png b/src/qt/assets/systemicons/os_winxp_x2.png
new file mode 100644
index 000000000..b97e6b51d
Binary files /dev/null and b/src/qt/assets/systemicons/os_winxp_x2.png differ
diff --git a/src/qt/assets/systemicons/os_xandros_x2.png b/src/qt/assets/systemicons/os_xandros_x2.png
new file mode 100644
index 000000000..23de5ca91
Binary files /dev/null and b/src/qt/assets/systemicons/os_xandros_x2.png differ
diff --git a/src/qt/assets/systemicons/pb_bora_pro.png b/src/qt/assets/systemicons/pb_bora_pro.png
new file mode 100644
index 000000000..6aaaf9d26
Binary files /dev/null and b/src/qt/assets/systemicons/pb_bora_pro.png differ
diff --git a/src/qt/assets/systemicons/pb_pb410.png b/src/qt/assets/systemicons/pb_pb410.png
new file mode 100644
index 000000000..c78c0496b
Binary files /dev/null and b/src/qt/assets/systemicons/pb_pb410.png differ
diff --git a/src/qt/assets/systemicons/pb_pb640.png b/src/qt/assets/systemicons/pb_pb640.png
new file mode 100644
index 000000000..d0be550f1
Binary files /dev/null and b/src/qt/assets/systemicons/pb_pb640.png differ
diff --git a/src/qt/assets/systemicons/pb_pb680.png b/src/qt/assets/systemicons/pb_pb680.png
new file mode 100644
index 000000000..a697d5dd0
Binary files /dev/null and b/src/qt/assets/systemicons/pb_pb680.png differ
diff --git a/src/qt/assets/systemicons/tandy_1000.png b/src/qt/assets/systemicons/tandy_1000.png
new file mode 100644
index 000000000..b50f2c1e6
Binary files /dev/null and b/src/qt/assets/systemicons/tandy_1000.png differ
diff --git a/src/qt/assets/systemicons/tandy_1000_hx.png b/src/qt/assets/systemicons/tandy_1000_hx.png
new file mode 100644
index 000000000..b770a6b7c
Binary files /dev/null and b/src/qt/assets/systemicons/tandy_1000_hx.png differ
diff --git a/src/qt/assets/systemicons/tandy_1000_sl2.png b/src/qt/assets/systemicons/tandy_1000_sl2.png
new file mode 100644
index 000000000..b7feae92a
Binary files /dev/null and b/src/qt/assets/systemicons/tandy_1000_sl2.png differ
diff --git a/src/qt/assets/systemicons/toshiba_t1000.png b/src/qt/assets/systemicons/toshiba_t1000.png
new file mode 100644
index 000000000..a2dbfc382
Binary files /dev/null and b/src/qt/assets/systemicons/toshiba_t1000.png differ
diff --git a/src/qt/assets/systemicons/toshiba_t1200.png b/src/qt/assets/systemicons/toshiba_t1200.png
new file mode 100644
index 000000000..8c3cf0c37
Binary files /dev/null and b/src/qt/assets/systemicons/toshiba_t1200.png differ
diff --git a/src/qt/assets/systemicons/toshiba_t1200_hdd.png b/src/qt/assets/systemicons/toshiba_t1200_hdd.png
new file mode 100644
index 000000000..8c3cf0c37
Binary files /dev/null and b/src/qt/assets/systemicons/toshiba_t1200_hdd.png differ
diff --git a/src/qt/dummy_cdrom_ioctl.c b/src/qt/dummy_cdrom_ioctl.c
new file mode 100644
index 000000000..8dffc6758
--- /dev/null
+++ b/src/qt/dummy_cdrom_ioctl.c
@@ -0,0 +1,244 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Win32 CD-ROM support via IOCTL.
+ *
+ *
+ *
+ * Authors: TheCollector1995, <mariogplayer@gmail.com>,
+ *          Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2023 TheCollector1995.
+ *          Copyright 2023 Miran Grca.
+ */
+#include <inttypes.h>
+#ifdef ENABLE_IOCTL_LOG
+#include <stdarg.h>
+#endif
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/scsi_device.h>
+#include <86box/cdrom.h>
+#include <86box/log.h>
+#include <86box/plat_unused.h>
+#include <86box/plat_cdrom_ioctl.h>
+
+/* The addresses sent from the guest are absolute, ie. a LBA of 0 corresponds to a MSF of 00:00:00. Otherwise, the counter displayed by the guest is wrong:
+   there is a seeming 2 seconds in which audio plays but counter does not move, while a data track before audio jumps to 2 seconds before the actual start
+   of the audio while audio still plays. With an absolute conversion, the counter is fine. */
+#define MSFtoLBA(m, s, f) ((((m * 60) + s) * 75) + f)
+
+typedef struct ioctl_t {
+    cdrom_t                *dev;
+    void                   *log;
+    void                   *handle;
+    char                    path[256];
+} ioctl_t;
+
+#ifdef ENABLE_IOCTL_LOG
+int ioctl_do_log = ENABLE_IOCTL_LOG;
+
+void
+ioctl_log(void *priv, const char *fmt, ...)
+{
+    if (ioctl_do_log) {
+        va_list ap;
+        va_start(ap, fmt);
+        log_out(priv, fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define ioctl_log(priv, fmt, ...)
+#endif
+
+/* Internal functions. */
+static void
+ioctl_close_handle(UNUSED(const ioctl_t *ioctl))
+{
+}
+
+static int
+ioctl_open_handle(UNUSED(ioctl_t *ioctl))
+{
+    return 0;
+}
+
+static void
+ioctl_read_toc(ioctl_t *ioctl)
+{
+}
+
+/* Shared functions. */
+static int
+ioctl_get_track_info(UNUSED(const void *local), UNUSED(const uint32_t track),
+                     UNUSED(int end), UNUSED(track_info_t *ti))
+{
+    return 0;
+}
+
+static void
+ioctl_get_raw_track_info(UNUSED(const void *local), int *num, uint8_t *rti)
+{
+    *num = 1;
+    memset(rti, 0x00, 11);
+}
+
+static int
+ioctl_is_track_pre(const void *local, UNUSED(const uint32_t sector))
+{
+    ioctl_t *ioctl = (ioctl_t *) local;
+
+    ioctl_read_toc(ioctl);
+
+    const int ret = 0;
+
+    ioctl_log("ioctl_is_track_audio(%08X): %i\n", sector, ret);
+
+    return ret;
+}
+
+static int
+ioctl_read_sector(const void *local, UNUSED(uint8_t *buffer), UNUSED(uint32_t const sector))
+{
+    ioctl_t *ioctl = (ioctl_t *) local;
+
+    ioctl_open_handle(ioctl);
+
+    ioctl_close_handle(ioctl);
+
+    ioctl_log("ReadSector sector=%d.\n", sector);
+
+    return 0;
+}
+
+static uint8_t
+ioctl_get_track_type(UNUSED(const void *local), UNUSED(const uint32_t sector))
+{
+    return 0x00;
+}
+
+static uint32_t
+ioctl_get_last_block(const void *local)
+{
+    ioctl_t *ioctl = (ioctl_t *) local;
+
+    ioctl_read_toc(ioctl);
+
+    return 0x00000000;
+}
+
+static int
+ioctl_read_dvd_structure(UNUSED(const void *local), UNUSED(const uint8_t layer), UNUSED(const uint8_t format),
+                         UNUSED(uint8_t *buffer), UNUSED(uint32_t *info))
+{
+    return -0x00052100;
+}
+
+static int
+ioctl_is_dvd(UNUSED(const void *local))
+{
+    return 0;
+}
+
+static int
+ioctl_has_audio(UNUSED(const void *local))
+{
+    return 0;
+}
+
+static int
+ioctl_is_empty(const void *local)
+{
+    return 1;
+}
+
+#if 0
+static int
+ioctl_ext_medium_changed(UNUSED(void *local))
+{
+#if 0
+    ioctl_t *ioctl = (ioctl_t *) local;
+#endif
+    int                  ret   = 0;
+
+    ioctl_log("ioctl_ext_medium_changed(): %i\n", ret);
+
+    return ret;
+}
+#endif
+
+static void
+ioctl_close(void *local)
+{
+    ioctl_t *ioctl = (ioctl_t *) local;
+
+    ioctl_close_handle(ioctl);
+    ioctl->handle = NULL;
+
+    ioctl_log(ioctl->log, "Log closed\n");
+
+    log_close(ioctl->log);
+    ioctl->log = NULL;
+}
+
+static void
+ioctl_load(const void *local)
+{
+    const ioctl_t *ioctl = (const ioctl_t *) local;
+
+    if (ioctl_open_handle((ioctl_t *) ioctl)) {
+        ioctl_close_handle((ioctl_t *) ioctl);
+
+        ioctl_read_toc((ioctl_t *) ioctl);
+    }
+}
+
+static const cdrom_ops_t ioctl_ops = {
+    ioctl_get_track_info,
+    ioctl_get_raw_track_info,
+    ioctl_is_track_pre,
+    ioctl_read_sector,
+    ioctl_get_track_type,
+    ioctl_get_last_block,
+    ioctl_read_dvd_structure,
+    ioctl_is_dvd,
+    ioctl_has_audio,
+    ioctl_is_empty,
+    ioctl_close,
+    ioctl_load
+};
+
+/* Public functions. */
+void *
+ioctl_open(cdrom_t *dev, const char *drv)
+{
+    ioctl_t *ioctl = (ioctl_t *) calloc(1, sizeof(ioctl_t));
+
+    if (ioctl != NULL) {
+        char n[1024]        = { 0 };
+
+        sprintf(n, "CD-ROM %i IOCtl", dev->id + 1);
+        ioctl->log          = log_open(n);
+
+        memset(ioctl->path, 0x00, sizeof(ioctl->path));
+
+        sprintf(ioctl->path, "%s", drv);
+        ioctl_log(ioctl->log, "Path is %s\n", ioctl->path);
+
+        ioctl->dev          = dev;
+
+        dev->ops            = &ioctl_ops;
+    }
+
+    return ioctl;
+}
diff --git a/src/win/icons/86Box-gray.ico b/src/qt/icons/86Box-gray.ico
similarity index 100%
rename from src/win/icons/86Box-gray.ico
rename to src/qt/icons/86Box-gray.ico
diff --git a/src/win/icons/86Box-green.ico b/src/qt/icons/86Box-green.ico
similarity index 100%
rename from src/win/icons/86Box-green.ico
rename to src/qt/icons/86Box-green.ico
diff --git a/src/win/icons/86Box-red.ico b/src/qt/icons/86Box-red.ico
similarity index 100%
rename from src/win/icons/86Box-red.ico
rename to src/qt/icons/86Box-red.ico
diff --git a/src/win/icons/86Box-yellow.ico b/src/qt/icons/86Box-yellow.ico
similarity index 100%
rename from src/win/icons/86Box-yellow.ico
rename to src/qt/icons/86Box-yellow.ico
diff --git a/src/win/icons/acpi_shutdown.ico b/src/qt/icons/acpi_shutdown.ico
similarity index 100%
rename from src/win/icons/acpi_shutdown.ico
rename to src/qt/icons/acpi_shutdown.ico
diff --git a/src/qt/icons/active.ico b/src/qt/icons/active.ico
new file mode 100644
index 000000000..9569a3962
Binary files /dev/null and b/src/qt/icons/active.ico differ
diff --git a/src/qt/icons/browse.ico b/src/qt/icons/browse.ico
new file mode 100644
index 000000000..8a947ae9d
Binary files /dev/null and b/src/qt/icons/browse.ico differ
diff --git a/src/qt/icons/caps_lock_off.ico b/src/qt/icons/caps_lock_off.ico
new file mode 100644
index 000000000..6895c735c
Binary files /dev/null and b/src/qt/icons/caps_lock_off.ico differ
diff --git a/src/qt/icons/caps_lock_on.ico b/src/qt/icons/caps_lock_on.ico
new file mode 100644
index 000000000..2cfd48aad
Binary files /dev/null and b/src/qt/icons/caps_lock_on.ico differ
diff --git a/src/win/icons/cartridge.ico b/src/qt/icons/cartridge.ico
similarity index 100%
rename from src/win/icons/cartridge.ico
rename to src/qt/icons/cartridge.ico
diff --git a/src/qt/icons/cartridge_image.ico b/src/qt/icons/cartridge_image.ico
new file mode 100644
index 000000000..4f01aa1a9
Binary files /dev/null and b/src/qt/icons/cartridge_image.ico differ
diff --git a/src/win/icons/cassette.ico b/src/qt/icons/cassette.ico
similarity index 100%
rename from src/win/icons/cassette.ico
rename to src/qt/icons/cassette.ico
diff --git a/src/qt/icons/cassette_image.ico b/src/qt/icons/cassette_image.ico
new file mode 100644
index 000000000..fa6358050
Binary files /dev/null and b/src/qt/icons/cassette_image.ico differ
diff --git a/src/win/icons/cdrom.ico b/src/qt/icons/cdrom.ico
similarity index 100%
rename from src/win/icons/cdrom.ico
rename to src/qt/icons/cdrom.ico
diff --git a/src/win/icons/cdrom_disabled.ico b/src/qt/icons/cdrom_disabled.ico
similarity index 100%
rename from src/win/icons/cdrom_disabled.ico
rename to src/qt/icons/cdrom_disabled.ico
diff --git a/src/qt/icons/cdrom_folder.ico b/src/qt/icons/cdrom_folder.ico
new file mode 100644
index 000000000..be8386b87
Binary files /dev/null and b/src/qt/icons/cdrom_folder.ico differ
diff --git a/src/qt/icons/cdrom_host.ico b/src/qt/icons/cdrom_host.ico
new file mode 100644
index 000000000..5065f347a
Binary files /dev/null and b/src/qt/icons/cdrom_host.ico differ
diff --git a/src/qt/icons/cdrom_image.ico b/src/qt/icons/cdrom_image.ico
new file mode 100644
index 000000000..84fc233e2
Binary files /dev/null and b/src/qt/icons/cdrom_image.ico differ
diff --git a/src/qt/icons/cdrom_mute.ico b/src/qt/icons/cdrom_mute.ico
new file mode 100644
index 000000000..237c8b065
Binary files /dev/null and b/src/qt/icons/cdrom_mute.ico differ
diff --git a/src/qt/icons/cdrom_nomedia.ico b/src/qt/icons/cdrom_nomedia.ico
new file mode 100644
index 000000000..ca3c58920
Binary files /dev/null and b/src/qt/icons/cdrom_nomedia.ico differ
diff --git a/src/qt/icons/cdrom_unmute.ico b/src/qt/icons/cdrom_unmute.ico
new file mode 100644
index 000000000..8e4cc70ed
Binary files /dev/null and b/src/qt/icons/cdrom_unmute.ico differ
diff --git a/src/qt/icons/disabled.ico b/src/qt/icons/disabled.ico
new file mode 100644
index 000000000..e2114db54
Binary files /dev/null and b/src/qt/icons/disabled.ico differ
diff --git a/src/win/icons/display.ico b/src/qt/icons/display.ico
similarity index 100%
rename from src/win/icons/display.ico
rename to src/qt/icons/display.ico
diff --git a/src/qt/icons/eject.ico b/src/qt/icons/eject.ico
new file mode 100644
index 000000000..1bfead4d6
Binary files /dev/null and b/src/qt/icons/eject.ico differ
diff --git a/src/qt/icons/export.ico b/src/qt/icons/export.ico
new file mode 100644
index 000000000..5076182dc
Binary files /dev/null and b/src/qt/icons/export.ico differ
diff --git a/src/qt/icons/fast_forward.ico b/src/qt/icons/fast_forward.ico
new file mode 100644
index 000000000..6bc5eeaff
Binary files /dev/null and b/src/qt/icons/fast_forward.ico differ
diff --git a/src/win/icons/floppy_35.ico b/src/qt/icons/floppy_35.ico
similarity index 100%
rename from src/win/icons/floppy_35.ico
rename to src/qt/icons/floppy_35.ico
diff --git a/src/qt/icons/floppy_35_image.ico b/src/qt/icons/floppy_35_image.ico
new file mode 100644
index 000000000..d27b4be02
Binary files /dev/null and b/src/qt/icons/floppy_35_image.ico differ
diff --git a/src/win/icons/floppy_525.ico b/src/qt/icons/floppy_525.ico
similarity index 100%
rename from src/win/icons/floppy_525.ico
rename to src/qt/icons/floppy_525.ico
diff --git a/src/qt/icons/floppy_525_image.ico b/src/qt/icons/floppy_525_image.ico
new file mode 100644
index 000000000..ae3a4d8a4
Binary files /dev/null and b/src/qt/icons/floppy_525_image.ico differ
diff --git a/src/win/icons/floppy_and_cdrom_drives.ico b/src/qt/icons/floppy_and_cdrom_drives.ico
similarity index 100%
rename from src/win/icons/floppy_and_cdrom_drives.ico
rename to src/qt/icons/floppy_and_cdrom_drives.ico
diff --git a/src/win/icons/floppy_disabled.ico b/src/qt/icons/floppy_disabled.ico
similarity index 100%
rename from src/win/icons/floppy_disabled.ico
rename to src/qt/icons/floppy_disabled.ico
diff --git a/src/qt/icons/green-square-16.png b/src/qt/icons/green-square-16.png
new file mode 100644
index 000000000..cb42c38eb
Binary files /dev/null and b/src/qt/icons/green-square-16.png differ
diff --git a/src/win/icons/hard_disk.ico b/src/qt/icons/hard_disk.ico
similarity index 100%
rename from src/win/icons/hard_disk.ico
rename to src/qt/icons/hard_disk.ico
diff --git a/src/win/icons/hard_reset.ico b/src/qt/icons/hard_reset.ico
similarity index 100%
rename from src/win/icons/hard_reset.ico
rename to src/qt/icons/hard_reset.ico
diff --git a/src/win/icons/input_devices.ico b/src/qt/icons/input_devices.ico
similarity index 100%
rename from src/win/icons/input_devices.ico
rename to src/qt/icons/input_devices.ico
diff --git a/src/qt/icons/kana_lock_off.ico b/src/qt/icons/kana_lock_off.ico
new file mode 100644
index 000000000..27c9b88c2
Binary files /dev/null and b/src/qt/icons/kana_lock_off.ico differ
diff --git a/src/qt/icons/kana_lock_on.ico b/src/qt/icons/kana_lock_on.ico
new file mode 100644
index 000000000..ec171b52b
Binary files /dev/null and b/src/qt/icons/kana_lock_on.ico differ
diff --git a/src/win/icons/machine.ico b/src/qt/icons/machine.ico
similarity index 100%
rename from src/win/icons/machine.ico
rename to src/qt/icons/machine.ico
diff --git a/src/win/icons/mo.ico b/src/qt/icons/mo.ico
similarity index 100%
rename from src/win/icons/mo.ico
rename to src/qt/icons/mo.ico
diff --git a/src/win/icons/mo_disabled.ico b/src/qt/icons/mo_disabled.ico
similarity index 100%
rename from src/win/icons/mo_disabled.ico
rename to src/qt/icons/mo_disabled.ico
diff --git a/src/qt/icons/mo_image.ico b/src/qt/icons/mo_image.ico
new file mode 100644
index 000000000..c445ce385
Binary files /dev/null and b/src/qt/icons/mo_image.ico differ
diff --git a/src/win/icons/network.ico b/src/qt/icons/network.ico
similarity index 100%
rename from src/win/icons/network.ico
rename to src/qt/icons/network.ico
diff --git a/src/qt/icons/new.ico b/src/qt/icons/new.ico
new file mode 100644
index 000000000..b3e0c16b0
Binary files /dev/null and b/src/qt/icons/new.ico differ
diff --git a/src/qt/icons/num_lock_off.ico b/src/qt/icons/num_lock_off.ico
new file mode 100644
index 000000000..5b14da1d4
Binary files /dev/null and b/src/qt/icons/num_lock_off.ico differ
diff --git a/src/qt/icons/num_lock_on.ico b/src/qt/icons/num_lock_on.ico
new file mode 100644
index 000000000..0dd08d7ae
Binary files /dev/null and b/src/qt/icons/num_lock_on.ico differ
diff --git a/src/win/icons/other_peripherals.ico b/src/qt/icons/other_peripherals.ico
similarity index 100%
rename from src/win/icons/other_peripherals.ico
rename to src/qt/icons/other_peripherals.ico
diff --git a/src/win/icons/other_removable_devices.ico b/src/qt/icons/other_removable_devices.ico
similarity index 100%
rename from src/win/icons/other_removable_devices.ico
rename to src/qt/icons/other_removable_devices.ico
diff --git a/src/qt/icons/pause-16.png b/src/qt/icons/pause-16.png
new file mode 100644
index 000000000..375780232
Binary files /dev/null and b/src/qt/icons/pause-16.png differ
diff --git a/src/win/icons/pause.ico b/src/qt/icons/pause.ico
similarity index 100%
rename from src/win/icons/pause.ico
rename to src/qt/icons/pause.ico
diff --git a/src/qt/icons/play-16.png b/src/qt/icons/play-16.png
new file mode 100644
index 000000000..bde40f503
Binary files /dev/null and b/src/qt/icons/play-16.png differ
diff --git a/src/win/icons/ports.ico b/src/qt/icons/ports.ico
similarity index 100%
rename from src/win/icons/ports.ico
rename to src/qt/icons/ports.ico
diff --git a/src/win/icons/zip.ico b/src/qt/icons/rdisk.ico
similarity index 100%
rename from src/win/icons/zip.ico
rename to src/qt/icons/rdisk.ico
diff --git a/src/win/icons/zip_disabled.ico b/src/qt/icons/rdisk_disabled.ico
similarity index 100%
rename from src/win/icons/zip_disabled.ico
rename to src/qt/icons/rdisk_disabled.ico
diff --git a/src/qt/icons/rdisk_image.ico b/src/qt/icons/rdisk_image.ico
new file mode 100644
index 000000000..82fd868fd
Binary files /dev/null and b/src/qt/icons/rdisk_image.ico differ
diff --git a/src/qt/icons/record.ico b/src/qt/icons/record.ico
new file mode 100644
index 000000000..357563594
Binary files /dev/null and b/src/qt/icons/record.ico differ
diff --git a/src/qt/icons/red-power-16.png b/src/qt/icons/red-power-16.png
new file mode 100644
index 000000000..c90ef491f
Binary files /dev/null and b/src/qt/icons/red-power-16.png differ
diff --git a/src/qt/icons/red-square-16.png b/src/qt/icons/red-square-16.png
new file mode 100644
index 000000000..32faa7cdc
Binary files /dev/null and b/src/qt/icons/red-square-16.png differ
diff --git a/src/qt/icons/rewind.ico b/src/qt/icons/rewind.ico
new file mode 100644
index 000000000..b18c1a66d
Binary files /dev/null and b/src/qt/icons/rewind.ico differ
diff --git a/src/win/icons/run.ico b/src/qt/icons/run.ico
similarity index 98%
rename from src/win/icons/run.ico
rename to src/qt/icons/run.ico
index 90a7f2886..c088eb59d 100644
Binary files a/src/win/icons/run.ico and b/src/qt/icons/run.ico differ
diff --git a/src/qt/icons/scroll_lock_off.ico b/src/qt/icons/scroll_lock_off.ico
new file mode 100644
index 000000000..85cb09ec6
Binary files /dev/null and b/src/qt/icons/scroll_lock_off.ico differ
diff --git a/src/qt/icons/scroll_lock_on.ico b/src/qt/icons/scroll_lock_on.ico
new file mode 100644
index 000000000..33476406a
Binary files /dev/null and b/src/qt/icons/scroll_lock_on.ico differ
diff --git a/src/win/icons/send_cad.ico b/src/qt/icons/send_cad.ico
similarity index 100%
rename from src/win/icons/send_cad.ico
rename to src/qt/icons/send_cad.ico
diff --git a/src/win/icons/send_cae.ico b/src/qt/icons/send_cae.ico
similarity index 100%
rename from src/win/icons/send_cae.ico
rename to src/qt/icons/send_cae.ico
diff --git a/src/win/icons/settings.ico b/src/qt/icons/settings.ico
similarity index 100%
rename from src/win/icons/settings.ico
rename to src/qt/icons/settings.ico
diff --git a/src/win/icons/sound.ico b/src/qt/icons/sound.ico
similarity index 100%
rename from src/win/icons/sound.ico
rename to src/qt/icons/sound.ico
diff --git a/src/qt/icons/stop-16.png b/src/qt/icons/stop-16.png
new file mode 100644
index 000000000..d73cad140
Binary files /dev/null and b/src/qt/icons/stop-16.png differ
diff --git a/src/win/icons/storage_controllers.ico b/src/qt/icons/storage_controllers.ico
similarity index 100%
rename from src/win/icons/storage_controllers.ico
rename to src/qt/icons/storage_controllers.ico
diff --git a/src/qt/icons/superdisk.ico b/src/qt/icons/superdisk.ico
new file mode 100644
index 000000000..ac5cc5fb0
Binary files /dev/null and b/src/qt/icons/superdisk.ico differ
diff --git a/src/qt/icons/superdisk_disabled.ico b/src/qt/icons/superdisk_disabled.ico
new file mode 100644
index 000000000..e4fa80370
Binary files /dev/null and b/src/qt/icons/superdisk_disabled.ico differ
diff --git a/src/qt/icons/superdisk_image.ico b/src/qt/icons/superdisk_image.ico
new file mode 100644
index 000000000..b8c854fd2
Binary files /dev/null and b/src/qt/icons/superdisk_image.ico differ
diff --git a/src/qt/icons/warning.ico b/src/qt/icons/warning.ico
new file mode 100644
index 000000000..2f283e2c4
Binary files /dev/null and b/src/qt/icons/warning.ico differ
diff --git a/src/sound/resid-fp/wave6581_PST.dat b/src/qt/icons/write_active.ico
similarity index 50%
rename from src/sound/resid-fp/wave6581_PST.dat
rename to src/qt/icons/write_active.ico
index 5afe75e22..babf8c86c 100644
Binary files a/src/sound/resid-fp/wave6581_PST.dat and b/src/qt/icons/write_active.ico differ
diff --git a/src/qt/icons/write_protected.ico b/src/qt/icons/write_protected.ico
new file mode 100644
index 000000000..f4ba2aa7a
Binary files /dev/null and b/src/qt/icons/write_protected.ico differ
diff --git a/src/qt/icons/yellow-square-16.png b/src/qt/icons/yellow-square-16.png
new file mode 100644
index 000000000..197cf394e
Binary files /dev/null and b/src/qt/icons/yellow-square-16.png differ
diff --git a/src/qt/languages/86box.pot b/src/qt/languages/86box.pot
new file mode 100644
index 000000000..a65578eae
--- /dev/null
+++ b/src/qt/languages/86box.pot
@@ -0,0 +1,2986 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: \n"
+"X-Source-Language: en_US\n"
+
+msgid "&Action"
+msgstr ""
+
+msgid "&Keyboard requires capture"
+msgstr ""
+
+msgid "&Right CTRL is left ALT"
+msgstr ""
+
+msgid "&Hard Reset..."
+msgstr ""
+
+msgid "&Ctrl+Alt+Del"
+msgstr ""
+
+msgid "Ctrl+Alt+&Esc"
+msgstr ""
+
+msgid "&Pause"
+msgstr ""
+
+msgid "Pause"
+msgstr ""
+
+msgid "Re&sume"
+msgstr ""
+
+msgid "E&xit"
+msgstr ""
+
+msgid "&View"
+msgstr ""
+
+msgid "&Hide status bar"
+msgstr ""
+
+msgid "Hide &toolbar"
+msgstr ""
+
+msgid "&Resizeable window"
+msgstr ""
+
+msgid "R&emember size && position"
+msgstr ""
+
+msgid "Re&nderer"
+msgstr ""
+
+msgid "&Qt (Software)"
+msgstr ""
+
+msgid "Open&GL (3.0 Core)"
+msgstr ""
+
+msgid "&VNC"
+msgstr ""
+
+msgid "Specify &dimensions..."
+msgstr ""
+
+msgid "Force &4:3 display ratio"
+msgstr ""
+
+msgid "&Window scale factor"
+msgstr ""
+
+msgid "&0.5x"
+msgstr ""
+
+msgid "&1x"
+msgstr ""
+
+msgid "1.&5x"
+msgstr ""
+
+msgid "&2x"
+msgstr ""
+
+msgid "&3x"
+msgstr ""
+
+msgid "&4x"
+msgstr ""
+
+msgid "&5x"
+msgstr ""
+
+msgid "&6x"
+msgstr ""
+
+msgid "&7x"
+msgstr ""
+
+msgid "&8x"
+msgstr ""
+
+msgid "Fi&lter method"
+msgstr ""
+
+msgid "&Nearest"
+msgstr ""
+
+msgid "&Linear"
+msgstr ""
+
+msgid "Hi&DPI scaling"
+msgstr ""
+
+msgid "&Fullscreen"
+msgstr ""
+
+msgid "Fullscreen &stretch mode"
+msgstr ""
+
+msgid "&Full screen stretch"
+msgstr ""
+
+msgid "&4:3"
+msgstr ""
+
+msgid "&Square pixels (Keep ratio)"
+msgstr ""
+
+msgid "&Integer scale"
+msgstr ""
+
+msgid "4:&3 Integer scale"
+msgstr ""
+
+msgid "EGA/(S)&VGA settings"
+msgstr ""
+
+msgid "&Inverted VGA monitor"
+msgstr ""
+
+msgid "VGA screen &type"
+msgstr ""
+
+msgid "RGB &Color"
+msgstr ""
+
+msgid "RGB (no brown)"
+msgstr ""
+
+msgid "&RGB Grayscale"
+msgstr ""
+
+msgid "Generic RGBI color monitor"
+msgstr ""
+
+msgid "&Amber monitor"
+msgstr ""
+
+msgid "&Green monitor"
+msgstr ""
+
+msgid "&White monitor"
+msgstr ""
+
+msgid "Grayscale &conversion type"
+msgstr ""
+
+msgid "BT&601 (NTSC/PAL)"
+msgstr ""
+
+msgid "BT&709 (HDTV)"
+msgstr ""
+
+msgid "&Average"
+msgstr ""
+
+msgid "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
+msgstr ""
+
+msgid "Change contrast for &monochrome display"
+msgstr ""
+
+msgid "&Media"
+msgstr ""
+
+msgid "&Tools"
+msgstr ""
+
+msgid "&Settings..."
+msgstr ""
+
+msgid "Settings..."
+msgstr ""
+
+msgid "&Update status bar icons"
+msgstr ""
+
+msgid "Take s&creenshot"
+msgstr ""
+
+msgid "S&ound"
+msgstr ""
+
+msgid "&Preferences..."
+msgstr ""
+
+msgid "Enable &Discord integration"
+msgstr ""
+
+msgid "Sound &gain..."
+msgstr ""
+
+msgid "Begin trace"
+msgstr ""
+
+msgid "End trace"
+msgstr ""
+
+msgid "&Help"
+msgstr ""
+
+msgid "&Documentation..."
+msgstr ""
+
+msgid "&About 86Box..."
+msgstr ""
+
+msgid "&New image..."
+msgstr ""
+
+msgid "&Existing image..."
+msgstr ""
+
+msgid "Existing image (&Write-protected)..."
+msgstr ""
+
+msgid "&Record"
+msgstr ""
+
+msgid "&Play"
+msgstr ""
+
+msgid "&Rewind to the beginning"
+msgstr ""
+
+msgid "&Fast forward to the end"
+msgstr ""
+
+msgid "E&ject"
+msgstr ""
+
+msgid "&Image..."
+msgstr ""
+
+msgid "E&xport to 86F..."
+msgstr ""
+
+msgid "&Mute"
+msgstr ""
+
+msgid "E&mpty"
+msgstr ""
+
+msgid "Reload previous image"
+msgstr ""
+
+msgid "&Folder..."
+msgstr ""
+
+msgid "Target &framerate"
+msgstr ""
+
+msgid "&Sync with video"
+msgstr ""
+
+msgid "&25 fps"
+msgstr ""
+
+msgid "&30 fps"
+msgstr ""
+
+msgid "&50 fps"
+msgstr ""
+
+msgid "&60 fps"
+msgstr ""
+
+msgid "&75 fps"
+msgstr ""
+
+msgid "&VSync"
+msgstr ""
+
+msgid "&Select shader..."
+msgstr ""
+
+msgid "&Remove shader"
+msgstr ""
+
+msgid "Preferences"
+msgstr ""
+
+msgid "Sound Gain"
+msgstr ""
+
+msgid "New Image"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "Specify Main Window Dimensions"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
+msgid "&Default"
+msgstr ""
+
+msgid "Language:"
+msgstr ""
+
+msgid "Gain"
+msgstr ""
+
+msgid "File name:"
+msgstr ""
+
+msgid "Disk size:"
+msgstr ""
+
+msgid "RPM mode:"
+msgstr ""
+
+msgid "Progress:"
+msgstr ""
+
+msgid "Width:"
+msgstr ""
+
+msgid "Height:"
+msgstr ""
+
+msgid "Lock to this size"
+msgstr ""
+
+msgid "Machine type:"
+msgstr ""
+
+msgid "Machine:"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "CPU:"
+msgstr ""
+
+msgid "CPU type:"
+msgstr ""
+
+msgid "Speed:"
+msgstr ""
+
+msgid "Frequency:"
+msgstr ""
+
+msgid "FPU:"
+msgstr ""
+
+msgid "Wait states:"
+msgstr ""
+
+msgid "MB"
+msgstr ""
+
+msgid "Memory:"
+msgstr ""
+
+msgid "Time synchronization"
+msgstr ""
+
+msgid "Disabled"
+msgstr ""
+
+msgid "Enabled (local time)"
+msgstr ""
+
+msgid "Enabled (UTC)"
+msgstr ""
+
+msgid "Dynamic Recompiler"
+msgstr ""
+
+msgid "CPU frame size"
+msgstr ""
+
+msgid "Larger frames (less smooth)"
+msgstr ""
+
+msgid "Smaller frames (smoother)"
+msgstr ""
+
+msgid "Video:"
+msgstr ""
+
+msgid "Video #2:"
+msgstr ""
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr ""
+
+msgid "IBM 8514/A Graphics"
+msgstr ""
+
+msgid "XGA Graphics"
+msgstr ""
+
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr ""
+
+msgid "Keyboard:"
+msgstr ""
+
+msgid "Keyboard"
+msgstr ""
+
+msgid "Mouse:"
+msgstr ""
+
+msgid "Mouse"
+msgstr ""
+
+msgid "Joystick:"
+msgstr ""
+
+msgid "Joystick"
+msgstr ""
+
+msgid "Joystick 1..."
+msgstr ""
+
+msgid "Joystick 2..."
+msgstr ""
+
+msgid "Joystick 3..."
+msgstr ""
+
+msgid "Joystick 4..."
+msgstr ""
+
+msgid "Sound card #1:"
+msgstr ""
+
+msgid "Sound card #2:"
+msgstr ""
+
+msgid "Sound card #3:"
+msgstr ""
+
+msgid "Sound card #4:"
+msgstr ""
+
+msgid "MIDI Out Device:"
+msgstr ""
+
+msgid "MIDI In Device:"
+msgstr ""
+
+msgid "MIDI Out:"
+msgstr ""
+
+msgid "Standalone MPU-401"
+msgstr ""
+
+msgid "Use FLOAT32 sound"
+msgstr ""
+
+msgid "FM synth driver"
+msgstr ""
+
+msgid "Nuked (more accurate)"
+msgstr ""
+
+msgid "YMFM (faster)"
+msgstr ""
+
+msgid "COM1 Device:"
+msgstr ""
+
+msgid "COM2 Device:"
+msgstr ""
+
+msgid "COM3 Device:"
+msgstr ""
+
+msgid "COM4 Device:"
+msgstr ""
+
+msgid "LPT1 Device:"
+msgstr ""
+
+msgid "LPT2 Device:"
+msgstr ""
+
+msgid "LPT3 Device:"
+msgstr ""
+
+msgid "LPT4 Device:"
+msgstr ""
+
+msgid "Internal LPT ECP DMA:"
+msgstr ""
+
+msgid "Serial port 1"
+msgstr ""
+
+msgid "Serial port 2"
+msgstr ""
+
+msgid "Serial port 3"
+msgstr ""
+
+msgid "Serial port 4"
+msgstr ""
+
+msgid "Parallel port 1"
+msgstr ""
+
+msgid "Parallel port 2"
+msgstr ""
+
+msgid "Parallel port 3"
+msgstr ""
+
+msgid "Parallel port 4"
+msgstr ""
+
+msgid "FD Controller:"
+msgstr ""
+
+msgid "CD-ROM Controller:"
+msgstr ""
+
+msgid "Tertiary IDE Controller"
+msgstr ""
+
+msgid "Quaternary IDE Controller"
+msgstr ""
+
+msgid "Hard disk"
+msgstr ""
+
+msgid "SCSI"
+msgstr ""
+
+msgid "Controller 1:"
+msgstr ""
+
+msgid "Controller 2:"
+msgstr ""
+
+msgid "Controller 3:"
+msgstr ""
+
+msgid "Controller 4:"
+msgstr ""
+
+msgid "Cassette"
+msgstr ""
+
+msgid "Hard disks:"
+msgstr ""
+
+msgid "Firmware Version"
+msgstr ""
+
+msgid "&New..."
+msgstr ""
+
+msgid "&Existing..."
+msgstr ""
+
+msgid "&Remove"
+msgstr ""
+
+msgid "Bus:"
+msgstr ""
+
+msgid "Channel:"
+msgstr ""
+
+msgid "ID:"
+msgstr ""
+
+msgid "&Specify..."
+msgstr ""
+
+msgid "Sectors:"
+msgstr ""
+
+msgid "Heads:"
+msgstr ""
+
+msgid "Cylinders:"
+msgstr ""
+
+msgid "Size (MB):"
+msgstr ""
+
+msgid "Type:"
+msgstr ""
+
+msgid "Image Format:"
+msgstr ""
+
+msgid "Block Size:"
+msgstr ""
+
+msgid "Floppy drives:"
+msgstr ""
+
+msgid "Turbo timings"
+msgstr ""
+
+msgid "Check BPB"
+msgstr ""
+
+msgid "CD-ROM drives:"
+msgstr ""
+
+msgid "MO drives:"
+msgstr ""
+
+msgid "MO:"
+msgstr ""
+
+msgid "Removable disks:"
+msgstr ""
+
+msgid "Removable disk drives:"
+msgstr ""
+
+msgid "ZIP 250"
+msgstr ""
+
+msgid "ISA RTC:"
+msgstr ""
+
+msgid "ISA Memory Expansion"
+msgstr ""
+
+msgid "ISA ROM Cards"
+msgstr ""
+
+msgid "Card 1:"
+msgstr ""
+
+msgid "Card 2:"
+msgstr ""
+
+msgid "Card 3:"
+msgstr ""
+
+msgid "Card 4:"
+msgstr ""
+
+msgid "Generic ISA ROM Board"
+msgstr ""
+
+msgid "Generic Dual ISA ROM Board"
+msgstr ""
+
+msgid "Generic Quad ISA ROM Board"
+msgstr ""
+
+msgid "ISABugger device"
+msgstr ""
+
+msgid "POST card"
+msgstr ""
+
+msgid "86Box"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Fatal error"
+msgstr ""
+
+msgid " - PAUSED"
+msgstr ""
+
+msgid "Speed"
+msgstr ""
+
+msgid "Removable disk %1 (%2): %3"
+msgstr ""
+
+msgid "&Removable disk %1 (%2): %3"
+msgstr ""
+
+msgid "Removable disk images"
+msgstr ""
+
+msgid "Image %1"
+msgstr ""
+
+msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
+msgstr ""
+
+msgid "(empty)"
+msgstr ""
+
+msgid "All files"
+msgstr ""
+
+msgid "Turbo"
+msgstr ""
+
+msgid "On"
+msgstr ""
+
+msgid "Off"
+msgstr ""
+
+msgid "All images"
+msgstr ""
+
+msgid "Basic sector images"
+msgstr ""
+
+msgid "Surface images"
+msgstr ""
+
+msgid "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
+msgstr ""
+
+msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
+msgstr ""
+
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr ""
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr ""
+
+msgid "Machine"
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Input devices"
+msgstr ""
+
+msgid "Sound"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Ports (COM & LPT)"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Serial ports:"
+msgstr ""
+
+msgid "Parallel ports:"
+msgstr ""
+
+msgid "Storage controllers"
+msgstr ""
+
+msgid "Hard disks"
+msgstr ""
+
+msgid "Disks:"
+msgstr ""
+
+msgid "Floppy:"
+msgstr ""
+
+msgid "Controllers:"
+msgstr ""
+
+msgid "Floppy & CD-ROM drives"
+msgstr ""
+
+msgid "Other removable devices"
+msgstr ""
+
+msgid "Other peripherals"
+msgstr ""
+
+msgid "Other devices"
+msgstr ""
+
+msgid "Click to capture mouse"
+msgstr ""
+
+msgid "Press %1 to release mouse"
+msgstr ""
+
+msgid "Press %1 or middle button to release mouse"
+msgstr ""
+
+msgid "Bus"
+msgstr ""
+
+msgid "File"
+msgstr ""
+
+msgid "C"
+msgstr ""
+
+msgid "H"
+msgstr ""
+
+msgid "S"
+msgstr ""
+
+msgid "KB"
+msgstr ""
+
+msgid "Default"
+msgstr ""
+
+msgid "%1 Wait state(s)"
+msgstr ""
+
+msgid "Type"
+msgstr ""
+
+msgid "No PCap devices found"
+msgstr ""
+
+msgid "Invalid PCap device"
+msgstr ""
+
+msgid "2-axis, 2-button joystick(s)"
+msgstr ""
+
+msgid "2-axis, 4-button joystick"
+msgstr ""
+
+msgid "2-axis, 6-button joystick"
+msgstr ""
+
+msgid "2-axis, 8-button joystick"
+msgstr ""
+
+msgid "3-axis, 2-button joystick"
+msgstr ""
+
+msgid "3-axis, 4-button joystick"
+msgstr ""
+
+msgid "4-axis, 4-button joystick"
+msgstr ""
+
+msgid "CH Flightstick Pro"
+msgstr ""
+
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr ""
+
+msgid "Microsoft SideWinder Pad"
+msgstr ""
+
+msgid "Thrustmaster Flight Control System"
+msgstr ""
+
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr ""
+
+msgid "2-button gamepad(s)"
+msgstr ""
+
+msgid "2-button flight yoke"
+msgstr ""
+
+msgid "4-button gamepad"
+msgstr ""
+
+msgid "4-button flight yoke"
+msgstr ""
+
+msgid "2-button flight yoke with throttle"
+msgstr ""
+
+msgid "4-button flight yoke with throttle"
+msgstr ""
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr ""
+
+msgid "Floppy %1 (%2): %3"
+msgstr ""
+
+msgid "&Floppy %1 (%2): %3"
+msgstr ""
+
+msgid "Advanced sector images"
+msgstr ""
+
+msgid "Flux images"
+msgstr ""
+
+msgid "Are you sure you want to hard reset the emulated machine?"
+msgstr ""
+
+msgid "Are you sure you want to exit 86Box?"
+msgstr ""
+
+msgid "Unable to initialize Ghostscript"
+msgstr ""
+
+msgid "Unable to initialize GhostPCL"
+msgstr ""
+
+msgid "MO %1 (%2): %3"
+msgstr ""
+
+msgid "&MO %1 (%2): %3"
+msgstr ""
+
+msgid "MO images"
+msgstr ""
+
+msgid "Welcome to 86Box!"
+msgstr ""
+
+msgid "Internal device"
+msgstr ""
+
+msgid "&File"
+msgstr ""
+
+msgid "&New machine..."
+msgstr ""
+
+msgid "&Check for updates..."
+msgstr ""
+
+msgid "Exit"
+msgstr ""
+
+msgid "No ROMs found"
+msgstr ""
+
+msgid "Do you want to save the settings?"
+msgstr ""
+
+msgid "This will hard reset the emulated machine."
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "About 86Box"
+msgstr ""
+
+msgid "86Box v"
+msgstr ""
+
+msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
+msgstr ""
+
+msgid "Hardware not available"
+msgstr ""
+
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr ""
+
+msgid "Invalid configuration"
+msgstr ""
+
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr ""
+
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr ""
+
+msgid "Don't show this message again"
+msgstr ""
+
+msgid "Don't exit"
+msgstr ""
+
+msgid "Reset"
+msgstr ""
+
+msgid "Don't reset"
+msgstr ""
+
+msgid "CD-ROM images"
+msgstr ""
+
+msgid "%1 Device Configuration"
+msgstr ""
+
+msgid "Monitor in sleep mode"
+msgstr ""
+
+msgid "GLSL shaders"
+msgstr ""
+
+msgid "You are loading an unsupported configuration"
+msgstr ""
+
+msgid "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
+msgstr ""
+
+msgid "Continue"
+msgstr ""
+
+msgid "Cassette: %1"
+msgstr ""
+
+msgid "C&assette: %1"
+msgstr ""
+
+msgid "Cassette images"
+msgstr ""
+
+msgid "Cartridge %1: %2"
+msgstr ""
+
+msgid "Car&tridge %1: %2"
+msgstr ""
+
+msgid "Cartridge images"
+msgstr ""
+
+msgid "Resume execution"
+msgstr ""
+
+msgid "Pause execution"
+msgstr ""
+
+msgid "Ctrl+Alt+Del"
+msgstr ""
+
+msgid "Press Ctrl+Alt+Del"
+msgstr ""
+
+msgid "Press Ctrl+Alt+Esc"
+msgstr ""
+
+msgid "Hard reset"
+msgstr ""
+
+msgid "Force shutdown"
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "Not running"
+msgstr ""
+
+msgid "Running"
+msgstr ""
+
+msgid "Paused"
+msgstr ""
+
+msgid "Waiting"
+msgstr ""
+
+msgid "Powered Off"
+msgstr ""
+
+msgid "%n running"
+msgstr ""
+
+msgid "%n paused"
+msgstr ""
+
+msgid "%n waiting"
+msgstr ""
+
+msgid "%1 total"
+msgstr ""
+
+msgid "VMs: %1"
+msgstr ""
+
+msgid "System Directory:"
+msgstr ""
+
+msgid "Choose directory"
+msgstr ""
+
+msgid "Choose configuration file"
+msgstr ""
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr ""
+
+msgid "Configuration read failed"
+msgstr ""
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr ""
+
+msgid "Use regular expressions in search box"
+msgstr ""
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr ""
+
+msgid "Add new system wizard"
+msgstr ""
+
+msgid "Introduction"
+msgstr ""
+
+msgid "This will help you add a new system to 86Box."
+msgstr ""
+
+msgid "New configuration"
+msgstr ""
+
+msgid "Complete"
+msgstr ""
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr ""
+
+msgid "Use existing configuration"
+msgstr ""
+
+msgid "Type some notes here"
+msgstr ""
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr ""
+
+msgid "Load configuration from file"
+msgstr ""
+
+msgid "System name"
+msgstr ""
+
+msgid "System name:"
+msgstr ""
+
+msgid "System name cannot contain certain characters"
+msgstr ""
+
+msgid "System name already exists"
+msgstr ""
+
+msgid "Please enter a directory for the system"
+msgstr ""
+
+msgid "Directory does not exist"
+msgstr ""
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr ""
+
+msgid "System location:"
+msgstr ""
+
+msgid "System name and location"
+msgstr ""
+
+msgid "Enter the name of the system and choose the location"
+msgstr ""
+
+msgid "Enter the name of the system"
+msgstr ""
+
+msgid "Please enter a system name"
+msgstr ""
+
+msgid "Display name (optional):"
+msgstr ""
+
+msgid "Display name:"
+msgstr ""
+
+msgid "Set display name"
+msgstr ""
+
+msgid "Enter the new display name (blank to reset)"
+msgstr ""
+
+msgid "Change &display name..."
+msgstr ""
+
+msgid "Context Menu"
+msgstr ""
+
+msgid "&Open folder..."
+msgstr ""
+
+msgid "Open p&rinter tray..."
+msgstr ""
+
+msgid "Set &icon..."
+msgstr ""
+
+msgid "Select an icon"
+msgstr ""
+
+msgid "C&lone..."
+msgstr ""
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr ""
+
+msgid "Directory %1 already exists"
+msgstr ""
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr ""
+
+msgid "Clone"
+msgstr ""
+
+msgid "Failed to create directory for cloned VM"
+msgstr ""
+
+msgid "Failed to clone VM."
+msgstr ""
+
+msgid "Directory in use"
+msgstr ""
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr ""
+
+msgid "Create directory failed"
+msgstr ""
+
+msgid "Unable to create the directory for the new system"
+msgstr ""
+
+msgid "Configuration write failed"
+msgstr ""
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr ""
+
+msgid "Error adding system"
+msgstr ""
+
+msgid "Remove directory failed"
+msgstr ""
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr ""
+
+msgid "Build"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr ""
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr ""
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr ""
+
+msgid "Warning"
+msgstr ""
+
+msgid "&Kill"
+msgstr ""
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr ""
+
+msgid "&Delete"
+msgstr ""
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr ""
+
+msgid "Show &config file"
+msgstr ""
+
+msgid "No screenshot"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Searching for VMs..."
+msgstr ""
+
+msgid "Found %1"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "Storage"
+msgstr ""
+
+msgid "Disk %1: "
+msgstr ""
+
+msgid "No disks"
+msgstr ""
+
+msgid "Audio"
+msgstr ""
+
+msgid "Audio:"
+msgstr ""
+
+msgid "ACPI shutdown"
+msgstr ""
+
+msgid "ACP&I shutdown"
+msgstr ""
+
+msgid "Hard disk (%1)"
+msgstr ""
+
+msgid "MFM/RLL or ESDI CD-ROM drives never existed"
+msgstr ""
+
+msgid "Custom..."
+msgstr ""
+
+msgid "Custom (large)..."
+msgstr ""
+
+msgid "Add New Hard Disk"
+msgstr ""
+
+msgid "Add Existing Hard Disk"
+msgstr ""
+
+msgid "HDI disk images cannot be larger than 4 GB."
+msgstr ""
+
+msgid "Disk images cannot be larger than 127 GB."
+msgstr ""
+
+msgid "Hard disk images"
+msgstr ""
+
+msgid "Unable to read file"
+msgstr ""
+
+msgid "Unable to write file"
+msgstr ""
+
+msgid "HDI or HDX images with a sector size other than 512 are not supported."
+msgstr ""
+
+msgid "Disk image file already exists"
+msgstr ""
+
+msgid "Please specify a valid file name."
+msgstr ""
+
+msgid "Disk image created"
+msgstr ""
+
+msgid "Make sure the file exists and is readable."
+msgstr ""
+
+msgid "Make sure the file is being saved to a writable directory."
+msgstr ""
+
+msgid "Disk image too large"
+msgstr ""
+
+msgid "Remember to partition and format the newly-created drive."
+msgstr ""
+
+msgid "The selected file will be overwritten. Are you sure you want to use it?"
+msgstr ""
+
+msgid "Unsupported disk image"
+msgstr ""
+
+msgid "Overwrite"
+msgstr ""
+
+msgid "Don't overwrite"
+msgstr ""
+
+msgid "Raw image"
+msgstr ""
+
+msgid "HDI image"
+msgstr ""
+
+msgid "HDX image"
+msgstr ""
+
+msgid "Fixed-size VHD"
+msgstr ""
+
+msgid "Dynamic-size VHD"
+msgstr ""
+
+msgid "Differencing VHD"
+msgstr ""
+
+msgid "(N/A)"
+msgstr ""
+
+msgid "Raw image (.img)"
+msgstr ""
+
+msgid "HDI image (.hdi)"
+msgstr ""
+
+msgid "HDX image (.hdx)"
+msgstr ""
+
+msgid "Fixed-size VHD (.vhd)"
+msgstr ""
+
+msgid "Dynamic-size VHD (.vhd)"
+msgstr ""
+
+msgid "Differencing VHD (.vhd)"
+msgstr ""
+
+msgid "Large blocks (2 MB)"
+msgstr ""
+
+msgid "Small blocks (512 KB)"
+msgstr ""
+
+msgid "VHD files"
+msgstr ""
+
+msgid "Select the parent VHD"
+msgstr ""
+
+msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
+msgstr ""
+
+msgid "Parent and child disk timestamps do not match"
+msgstr ""
+
+msgid "Could not fix VHD timestamp."
+msgstr ""
+
+msgid "MFM/RLL"
+msgstr ""
+
+msgid "XTA"
+msgstr ""
+
+msgid "ESDI"
+msgstr ""
+
+msgid "IDE"
+msgstr ""
+
+msgid "ATAPI"
+msgstr ""
+
+msgid "CD-ROM %1 (%2): %3"
+msgstr ""
+
+msgid "&CD-ROM %1 (%2): %3"
+msgstr ""
+
+msgid "160 KB"
+msgstr ""
+
+msgid "180 KB"
+msgstr ""
+
+msgid "320 KB"
+msgstr ""
+
+msgid "360 KB"
+msgstr ""
+
+msgid "640 KB"
+msgstr ""
+
+msgid "720 KB"
+msgstr ""
+
+msgid "1.2 MB"
+msgstr ""
+
+msgid "1.25 MB"
+msgstr ""
+
+msgid "1.44 MB"
+msgstr ""
+
+msgid "DMF (cluster 1024)"
+msgstr ""
+
+msgid "DMF (cluster 2048)"
+msgstr ""
+
+msgid "2.88 MB"
+msgstr ""
+
+msgid "ZIP 100"
+msgstr ""
+
+msgid "3.5\" 128 MB (ISO 10090)"
+msgstr ""
+
+msgid "3.5\" 230 MB (ISO 13963)"
+msgstr ""
+
+msgid "3.5\" 540 MB (ISO 15498)"
+msgstr ""
+
+msgid "3.5\" 640 MB (ISO 15498)"
+msgstr ""
+
+msgid "3.5\" 1.3 GB (GigaMO)"
+msgstr ""
+
+msgid "3.5\" 2.3 GB (GigaMO 2)"
+msgstr ""
+
+msgid "5.25\" 600 MB"
+msgstr ""
+
+msgid "5.25\" 650 MB"
+msgstr ""
+
+msgid "5.25\" 1 GB"
+msgstr ""
+
+msgid "5.25\" 1.3 GB"
+msgstr ""
+
+msgid "Perfect RPM"
+msgstr ""
+
+msgid "1% below perfect RPM"
+msgstr ""
+
+msgid "1.5% below perfect RPM"
+msgstr ""
+
+msgid "2% below perfect RPM"
+msgstr ""
+
+msgid "(System Default)"
+msgstr ""
+
+msgid "Failed to initialize network driver"
+msgstr ""
+
+msgid "The network configuration will be switched to the null driver"
+msgstr ""
+
+msgid "Mouse sensitivity:"
+msgstr ""
+
+msgid "Select media images from program working directory"
+msgstr ""
+
+msgid "PIT mode:"
+msgstr ""
+
+msgid "Auto"
+msgstr ""
+
+msgid "Slow"
+msgstr ""
+
+msgid "Fast"
+msgstr ""
+
+msgid "&Auto-pause on focus loss"
+msgstr ""
+
+msgid "WinBox is no longer supported"
+msgstr ""
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr ""
+
+msgid "Generate"
+msgstr ""
+
+msgid "Joystick configuration"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid "%1 (X axis)"
+msgstr ""
+
+msgid "%1 (Y axis)"
+msgstr ""
+
+msgid "MCA devices"
+msgstr ""
+
+msgid "List of MCA devices:"
+msgstr ""
+
+msgid "&Tablet tool"
+msgstr ""
+
+msgid "About &Qt"
+msgstr ""
+
+msgid "&MCA devices..."
+msgstr ""
+
+msgid "Show non-&primary monitors"
+msgstr ""
+
+msgid "Open screenshots &folder..."
+msgstr ""
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr ""
+
+msgid "&Cursor/Puck"
+msgstr ""
+
+msgid "&Pen"
+msgstr ""
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr ""
+
+msgid "&Connected"
+msgstr ""
+
+msgid "Clear image &history"
+msgstr ""
+
+msgid "Create..."
+msgstr ""
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr ""
+
+msgid "Unknown Bus"
+msgstr ""
+
+msgid "Null Driver"
+msgstr ""
+
+msgid "NIC:"
+msgstr ""
+
+msgid "NIC %1 (%2) %3"
+msgstr ""
+
+msgid "&NIC %1 (%2) %3"
+msgstr ""
+
+msgid "Render behavior"
+msgstr ""
+
+msgid "Use target framerate:"
+msgstr ""
+
+msgid " fps"
+msgstr ""
+
+msgid "VSync"
+msgstr ""
+
+msgid "Synchronize with video"
+msgstr ""
+
+msgid "Shaders"
+msgstr ""
+
+msgid "Remove"
+msgstr ""
+
+msgid "Browse..."
+msgstr ""
+
+msgid "Couldn't create OpenGL context."
+msgstr ""
+
+msgid "Couldn't switch to OpenGL context."
+msgstr ""
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr ""
+
+msgid "Error initializing OpenGL"
+msgstr ""
+
+msgid "\nFalling back to software rendering."
+msgstr ""
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr ""
+
+msgid "This machine might have been moved or copied."
+msgstr ""
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr ""
+
+msgid "I Moved It"
+msgstr ""
+
+msgid "I Copied It"
+msgstr ""
+
+msgid "86Box Monitor #"
+msgstr ""
+
+msgid "No MCA devices."
+msgstr ""
+
+msgid "MiB"
+msgstr ""
+
+msgid "GiB"
+msgstr ""
+
+msgid "Network Card #1"
+msgstr ""
+
+msgid "Network Card #2"
+msgstr ""
+
+msgid "Network Card #3"
+msgstr ""
+
+msgid "Network Card #4"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Interface:"
+msgstr ""
+
+msgid "Adapter:"
+msgstr ""
+
+msgid "VDE Socket:"
+msgstr ""
+
+msgid "86Box Unit Tester"
+msgstr ""
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr ""
+
+msgid "Serial port passthrough 1"
+msgstr ""
+
+msgid "Serial port passthrough 2"
+msgstr ""
+
+msgid "Serial port passthrough 3"
+msgstr ""
+
+msgid "Serial port passthrough 4"
+msgstr ""
+
+msgid "Renderer &options..."
+msgstr ""
+
+msgid "PC/XT Keyboard"
+msgstr ""
+
+msgid "AT Keyboard"
+msgstr ""
+
+msgid "AX Keyboard"
+msgstr ""
+
+msgid "PS/2 Keyboard"
+msgstr ""
+
+msgid "PS/55 Keyboard"
+msgstr ""
+
+msgid "Keys"
+msgstr ""
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr ""
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr ""
+
+msgid "Mouse Systems Serial Mouse"
+msgstr ""
+
+msgid "Mouse Systems Bus Mouse"
+msgstr ""
+
+msgid "Microsoft Serial Mouse"
+msgstr ""
+
+msgid "Microsoft Serial BallPoint"
+msgstr ""
+
+msgid "Logitech Serial Mouse"
+msgstr ""
+
+msgid "PS/2 Mouse"
+msgstr ""
+
+msgid "PS/2 QuickPort Mouse"
+msgstr ""
+
+msgid "3M MicroTouch (Serial)"
+msgstr ""
+
+msgid "Default Baud rate"
+msgstr ""
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr ""
+
+msgid "Roland MT-32 Emulation"
+msgstr ""
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr ""
+
+msgid "Roland CM-32L Emulation"
+msgstr ""
+
+msgid "Roland CM-32LN Emulation"
+msgstr ""
+
+msgid "OPL4-ML Daughterboard"
+msgstr ""
+
+msgid "System MIDI"
+msgstr ""
+
+msgid "MIDI Input Device"
+msgstr ""
+
+msgid "BIOS file"
+msgstr ""
+
+msgid "BIOS file (ROM #1)"
+msgstr ""
+
+msgid "BIOS file (ROM #2)"
+msgstr ""
+
+msgid "BIOS file (ROM #3)"
+msgstr ""
+
+msgid "BIOS file (ROM #4)"
+msgstr ""
+
+msgid "BIOS address"
+msgstr ""
+
+msgid "BIOS address (ROM #1)"
+msgstr ""
+
+msgid "BIOS address (ROM #2)"
+msgstr ""
+
+msgid "BIOS address (ROM #3)"
+msgstr ""
+
+msgid "BIOS address (ROM #4)"
+msgstr ""
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr ""
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr ""
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr ""
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr ""
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr ""
+
+msgid "Linear framebuffer base"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "IRQ"
+msgstr ""
+
+msgid "Serial port IRQ"
+msgstr ""
+
+msgid "Parallel port IRQ"
+msgstr ""
+
+msgid "BIOS Revision"
+msgstr ""
+
+msgid "BIOS Version"
+msgstr ""
+
+msgid "BIOS Language"
+msgstr ""
+
+msgid "IBM 5161 Expansion Unit"
+msgstr ""
+
+msgid "IBM Cassette Basic"
+msgstr ""
+
+msgid "Translate 26 -> 17"
+msgstr ""
+
+msgid "Language"
+msgstr ""
+
+msgid "Enable backlight"
+msgstr ""
+
+msgid "Invert colors"
+msgstr ""
+
+msgid "BIOS size"
+msgstr ""
+
+msgid "BIOS size (ROM #1)"
+msgstr ""
+
+msgid "BIOS size (ROM #2)"
+msgstr ""
+
+msgid "BIOS size (ROM #3)"
+msgstr ""
+
+msgid "BIOS size (ROM #4)"
+msgstr ""
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr ""
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr ""
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr ""
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr ""
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr ""
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr ""
+
+msgid "JS9 Jumper (JIM)"
+msgstr ""
+
+msgid "MIDI Output Device"
+msgstr ""
+
+msgid "MIDI Real time"
+msgstr ""
+
+msgid "MIDI Thru"
+msgstr ""
+
+msgid "MIDI Clockout"
+msgstr ""
+
+msgid "SoundFont"
+msgstr ""
+
+msgid "Output Gain"
+msgstr ""
+
+msgid "Chorus"
+msgstr ""
+
+msgid "Chorus Voices"
+msgstr ""
+
+msgid "Chorus Level"
+msgstr ""
+
+msgid "Chorus Speed"
+msgstr ""
+
+msgid "Chorus Depth"
+msgstr ""
+
+msgid "Chorus Waveform"
+msgstr ""
+
+msgid "Reverb"
+msgstr ""
+
+msgid "Reverb Room Size"
+msgstr ""
+
+msgid "Reverb Damping"
+msgstr ""
+
+msgid "Reverb Width"
+msgstr ""
+
+msgid "Reverb Level"
+msgstr ""
+
+msgid "Interpolation Method"
+msgstr ""
+
+msgid "Dynamic Sample Loading"
+msgstr ""
+
+msgid "Reverb Output Gain"
+msgstr ""
+
+msgid "Reversed stereo"
+msgstr ""
+
+msgid "Nice ramp"
+msgstr ""
+
+msgid "Hz"
+msgstr ""
+
+msgid "Buttons"
+msgstr ""
+
+msgid "Serial Port"
+msgstr ""
+
+msgid "RTS toggle"
+msgstr ""
+
+msgid "Revision"
+msgstr ""
+
+msgid "Controller"
+msgstr ""
+
+msgid "Show Crosshair"
+msgstr ""
+
+msgid "DMA"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC Address OUI"
+msgstr ""
+
+msgid "Enable BIOS"
+msgstr ""
+
+msgid "Baud Rate"
+msgstr ""
+
+msgid "TCP/IP listening port"
+msgstr ""
+
+msgid "Phonebook File"
+msgstr ""
+
+msgid "Telnet emulation"
+msgstr ""
+
+msgid "RAM Address"
+msgstr ""
+
+msgid "RAM size"
+msgstr ""
+
+msgid "Initial RAM size"
+msgstr ""
+
+msgid "Serial Number"
+msgstr ""
+
+msgid "Host ID"
+msgstr ""
+
+msgid "FDC Address"
+msgstr ""
+
+msgid "MPU-401 Address"
+msgstr ""
+
+msgid "MPU-401 IRQ"
+msgstr ""
+
+msgid "Receive MIDI input"
+msgstr ""
+
+msgid "Low DMA"
+msgstr ""
+
+msgid "Enable Game port"
+msgstr ""
+
+msgid "SID Model"
+msgstr ""
+
+msgid "SID Filter Strength"
+msgstr ""
+
+msgid "Surround module"
+msgstr ""
+
+msgid "CODEC"
+msgstr ""
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr ""
+
+msgid "SB Address"
+msgstr ""
+
+msgid "Adlib Address"
+msgstr ""
+
+msgid "Use EEPROM setting"
+msgstr ""
+
+msgid "WSS IRQ"
+msgstr ""
+
+msgid "WSS DMA"
+msgstr ""
+
+msgid "Enable OPL"
+msgstr ""
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr ""
+
+msgid "SB low DMA"
+msgstr ""
+
+msgid "6CH variant (6-channel)"
+msgstr ""
+
+msgid "Enable CMS"
+msgstr ""
+
+msgid "Mixer"
+msgstr ""
+
+msgid "High DMA"
+msgstr ""
+
+msgid "Control PC speaker"
+msgstr ""
+
+msgid "Memory size"
+msgstr ""
+
+msgid "EMU8000 Address"
+msgstr ""
+
+msgid "IDE Controller"
+msgstr ""
+
+msgid "Codec"
+msgstr ""
+
+msgid "GUS type"
+msgstr ""
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr ""
+
+msgid "Display type"
+msgstr ""
+
+msgid "Composite type"
+msgstr ""
+
+msgid "RGB type"
+msgstr ""
+
+msgid "Line doubling type"
+msgstr ""
+
+msgid "Snow emulation"
+msgstr ""
+
+msgid "Monitor type"
+msgstr ""
+
+msgid "Character set"
+msgstr ""
+
+msgid "XGA type"
+msgstr ""
+
+msgid "Instance"
+msgstr ""
+
+msgid "MMIO Address"
+msgstr ""
+
+msgid "RAMDAC type"
+msgstr ""
+
+msgid "Blend"
+msgstr ""
+
+msgid "Font"
+msgstr ""
+
+msgid "Bilinear filtering"
+msgstr ""
+
+msgid "Video chroma-keying"
+msgstr ""
+
+msgid "Dithering"
+msgstr ""
+
+msgid "Enable NMI for CGA emulation"
+msgstr ""
+
+msgid "Voodoo type"
+msgstr ""
+
+msgid "Framebuffer memory size"
+msgstr ""
+
+msgid "Texture memory size"
+msgstr ""
+
+msgid "Dither subtraction"
+msgstr ""
+
+msgid "Screen Filter"
+msgstr ""
+
+msgid "Render threads"
+msgstr ""
+
+msgid "SLI"
+msgstr ""
+
+msgid "Start Address"
+msgstr ""
+
+msgid "Contiguous Size"
+msgstr ""
+
+msgid "I/O Width"
+msgstr ""
+
+msgid "Transfer Speed"
+msgstr ""
+
+msgid "EMS mode"
+msgstr ""
+
+msgid "EMS Address"
+msgstr ""
+
+msgid "EMS 1 Address"
+msgstr ""
+
+msgid "EMS 2 Address"
+msgstr ""
+
+msgid "EMS Memory Size"
+msgstr ""
+
+msgid "EMS 1 Memory Size"
+msgstr ""
+
+msgid "EMS 2 Memory Size"
+msgstr ""
+
+msgid "Enable EMS"
+msgstr ""
+
+msgid "Enable EMS 1"
+msgstr ""
+
+msgid "Enable EMS 2"
+msgstr ""
+
+msgid "Address for > 2 MB"
+msgstr ""
+
+msgid "Frame Address"
+msgstr ""
+
+msgid "USA"
+msgstr ""
+
+msgid "Danish"
+msgstr ""
+
+msgid "Always at selected speed"
+msgstr ""
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr ""
+
+msgid "64 KB starting from F0000"
+msgstr ""
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr ""
+
+msgid "Sine"
+msgstr ""
+
+msgid "Triangle"
+msgstr ""
+
+msgid "Linear"
+msgstr ""
+
+msgid "4th Order"
+msgstr ""
+
+msgid "7th Order"
+msgstr ""
+
+msgid "Non-timed (original)"
+msgstr ""
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr ""
+
+msgid "Two"
+msgstr ""
+
+msgid "Three"
+msgstr ""
+
+msgid "Wheel"
+msgstr ""
+
+msgid "Five + Wheel"
+msgstr ""
+
+msgid "Five + 2 Wheels"
+msgstr ""
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr ""
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr ""
+
+msgid "8 KB"
+msgstr ""
+
+msgid "32 KB"
+msgstr ""
+
+msgid "16 KB"
+msgstr ""
+
+msgid "64 KB"
+msgstr ""
+
+msgid "Disable BIOS"
+msgstr ""
+
+msgid "512 KB"
+msgstr ""
+
+msgid "2 MB"
+msgstr ""
+
+msgid "8 MB"
+msgstr ""
+
+msgid "28 MB"
+msgstr ""
+
+msgid "1 MB"
+msgstr ""
+
+msgid "4 MB"
+msgstr ""
+
+msgid "12 MB"
+msgstr ""
+
+msgid "16 MB"
+msgstr ""
+
+msgid "20 MB"
+msgstr ""
+
+msgid "24 MB"
+msgstr ""
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr ""
+
+msgid "Classic"
+msgstr ""
+
+msgid "256 KB"
+msgstr ""
+
+msgid "Composite"
+msgstr ""
+
+msgid "True color"
+msgstr ""
+
+msgid "Old"
+msgstr ""
+
+msgid "New"
+msgstr ""
+
+msgid "Color (generic)"
+msgstr ""
+
+msgid "Green Monochrome"
+msgstr ""
+
+msgid "Amber Monochrome"
+msgstr ""
+
+msgid "Gray Monochrome"
+msgstr ""
+
+msgid "Color (no brown)"
+msgstr ""
+
+msgid "Color (IBM 5153)"
+msgstr ""
+
+msgid "Simple doubling"
+msgstr ""
+
+msgid "sRGB interpolation"
+msgstr ""
+
+msgid "Linear interpolation"
+msgstr ""
+
+msgid "Has secondary 8x8 character set"
+msgstr ""
+
+msgid "Has Quadcolor II daughter board"
+msgstr ""
+
+msgid "Alternate monochrome contrast"
+msgstr ""
+
+msgid "128 KB"
+msgstr ""
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr ""
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr ""
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr ""
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr ""
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr ""
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr ""
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "Amber"
+msgstr ""
+
+msgid "Gray"
+msgstr ""
+
+msgid "Grayscale"
+msgstr ""
+
+msgid "Color"
+msgstr ""
+
+msgid "U.S. English"
+msgstr ""
+
+msgid "Scandinavian"
+msgstr ""
+
+msgid "Other languages"
+msgstr ""
+
+msgid "Bochs latest"
+msgstr ""
+
+msgid "Apply overscan deltas"
+msgstr ""
+
+msgid "Mono Interlaced"
+msgstr ""
+
+msgid "Mono Non-Interlaced"
+msgstr ""
+
+msgid "Color Interlaced"
+msgstr ""
+
+msgid "Color Non-Interlaced"
+msgstr ""
+
+msgid "3Dfx Voodoo Graphics"
+msgstr ""
+
+msgid "3Dfx Voodoo 2"
+msgstr ""
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr ""
+
+msgid "8-bit"
+msgstr ""
+
+msgid "16-bit"
+msgstr ""
+
+msgid "Standard (150ns)"
+msgstr ""
+
+msgid "High-Speed (120ns)"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Standard"
+msgstr ""
+
+msgid "High-Speed"
+msgstr ""
+
+msgid "Stereo LPT DAC"
+msgstr ""
+
+msgid "Generic Text Printer"
+msgstr ""
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr ""
+
+msgid "Generic PostScript Printer"
+msgstr ""
+
+msgid "Generic PCL5e Printer"
+msgstr ""
+
+msgid "Parallel Line Internet Protocol"
+msgstr ""
+
+msgid "Protection Dongle for Savage Quest"
+msgstr ""
+
+msgid "Serial Passthrough Device"
+msgstr ""
+
+msgid "Passthrough Mode"
+msgstr ""
+
+msgid "Host Serial Device"
+msgstr ""
+
+msgid "Name of pipe"
+msgstr ""
+
+msgid "Data bits"
+msgstr ""
+
+msgid "Stop bits"
+msgstr ""
+
+msgid "Baud Rate of Passthrough"
+msgstr ""
+
+msgid "Named Pipe (Server)"
+msgstr ""
+
+msgid "Named Pipe (Client)"
+msgstr ""
+
+msgid "Host Serial Passthrough"
+msgstr ""
+
+msgid "E&ject %1"
+msgstr ""
+
+msgid "&Unmute"
+msgstr ""
+
+msgid "Softfloat FPU"
+msgstr ""
+
+msgid "High performance impact"
+msgstr ""
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr ""
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr ""
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr ""
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr ""
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr ""
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr ""
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr ""
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr ""
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr ""
+
+msgid "Vendor"
+msgstr ""
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr ""
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr ""
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr ""
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr ""
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr ""
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr ""
+
+msgid "Inhibit multimedia keys"
+msgstr ""
+
+msgid "Ask for confirmation before saving settings"
+msgstr ""
+
+msgid "Ask for confirmation before hard resetting"
+msgstr ""
+
+msgid "Ask for confirmation before quitting"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Model"
+msgstr ""
+
+msgid "Model:"
+msgstr ""
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr ""
+
+msgid "GLSL Error"
+msgstr ""
+
+msgid "Could not load shader: %1"
+msgstr ""
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr ""
+
+msgid "Could not load texture: %1"
+msgstr ""
+
+msgid "Could not compile shader:\n\n%1"
+msgstr ""
+
+msgid "Program not linked:\n\n%1"
+msgstr ""
+
+msgid "Shader Manager"
+msgstr ""
+
+msgid "Shader Configuration"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
+msgid "Move down"
+msgstr ""
+
+msgid "Could not load file %1"
+msgstr ""
+
+msgid "Key Bindings:"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Keybind"
+msgstr ""
+
+msgid "Clear binding"
+msgstr ""
+
+msgid "Bind"
+msgstr ""
+
+msgid "Bind Key"
+msgstr ""
+
+msgid "Enter key combo:"
+msgstr ""
+
+msgid "Bind conflict"
+msgstr ""
+
+msgid "This key combo is already in use."
+msgstr ""
+
+msgid "Send Control+Alt+Del"
+msgstr ""
+
+msgid "Send Control+Alt+Escape"
+msgstr ""
+
+msgid "Toggle fullscreen"
+msgstr ""
+
+msgid "Screenshot"
+msgstr ""
+
+msgid "Release mouse pointer"
+msgstr ""
+
+msgid "Toggle pause"
+msgstr ""
+
+msgid "Toggle mute"
+msgstr ""
+
+msgid "Text files"
+msgstr ""
+
+msgid "ROM files"
+msgstr ""
+
+msgid "SoundFont files"
+msgstr ""
+
+msgid "Local Switch"
+msgstr ""
+
+msgid "Remote Switch"
+msgstr ""
+
+msgid "Switch:"
+msgstr ""
+
+msgid "Hub Mode"
+msgstr ""
+
+msgid "Hostname:"
+msgstr ""
+
+msgid "ISA RAM:"
+msgstr ""
+
+msgid "ISA ROM:"
+msgstr ""
+
+msgid "&Wipe NVRAM"
+msgstr ""
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr ""
+
+msgid "Success"
+msgstr ""
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr ""
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr ""
+
+msgid "%1 VM Manager"
+msgstr ""
+
+msgid "%n disk(s)"
+msgstr ""
+
+msgid "Unknown Status"
+msgstr ""
+
+msgid "No Machines Found!"
+msgstr ""
+
+msgid "Check for updates on startup"
+msgstr ""
+
+msgid "Unable to determine release information"
+msgstr ""
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr ""
+
+msgid "Update check complete"
+msgstr ""
+
+msgid "stable"
+msgstr ""
+
+msgid "beta"
+msgstr ""
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr ""
+
+msgid "version"
+msgstr ""
+
+msgid "build"
+msgstr ""
+
+msgid "You are currently running version <b>%1</b>."
+msgstr ""
+
+msgid "<b>Version %1</b> is now available."
+msgstr ""
+
+msgid "You are currently running build <b>%1</b>."
+msgstr ""
+
+msgid "<b>Build %1</b> is now available."
+msgstr ""
+
+msgid "Would you like to visit the download page?"
+msgstr ""
+
+msgid "Visit download page"
+msgstr ""
+
+msgid "Update check"
+msgstr ""
+
+msgid "Checking for updates..."
+msgstr ""
+
+msgid "86Box Update"
+msgstr ""
+
+msgid "Release notes:"
+msgstr ""
+
+msgid "%1 Hz"
+msgstr ""
+
+msgid "Virtual machine crash"
+msgstr ""
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr ""
+
+msgid "The system will not be added."
+msgstr ""
+
+msgid "&Update mouse every CPU frame"
+msgstr ""
+
+msgid "Hue"
+msgstr ""
+
+msgid "Saturation"
+msgstr ""
+
+msgid "Contrast"
+msgstr ""
+
+msgid "Brightness"
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "&CGA composite settings..."
+msgstr ""
+
+msgid "CGA composite settings"
+msgstr ""
+
+msgid "Monitor EDID"
+msgstr ""
+
+msgid "Export..."
+msgstr ""
+
+msgid "Export EDID"
+msgstr ""
+
+msgid "EDID file \"%ls\" is too large."
+msgstr ""
+
+msgid "OpenGL input scale"
+msgstr ""
+
+msgid "OpenGL input stretch mode"
+msgstr ""
+
+msgid "Color scheme"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "Light"
+msgstr ""
+
+msgid "Dark"
+msgstr ""
diff --git a/src/qt/languages/ca-ES.po b/src/qt/languages/ca-ES.po
deleted file mode 100644
index 71b643220..000000000
--- a/src/qt/languages/ca-ES.po
+++ /dev/null
@@ -1,1229 +0,0 @@
-msgid "&Action"
-msgstr "&Acció"
-
-msgid "&Keyboard requires capture"
-msgstr "&Teclat requereix captura"
-
-msgid "&Right CTRL is left ALT"
-msgstr "CTRL &dret és ALT esquerre"
-
-msgid "&Hard Reset..."
-msgstr "&Reinicialització completa..."
-
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Ctrl+Alt+Del\tCtrl+F12"
-
-msgid "Ctrl+Alt+&Esc"
-msgstr "Ctrl+Alt+&Esc"
-
-msgid "&Pause"
-msgstr "&Pausa"
-
-msgid "E&xit..."
-msgstr "&Sortir..."
-
-msgid "&View"
-msgstr "&Vista"
-
-msgid "&Hide status bar"
-msgstr "&Amagar barra d'estat"
-
-msgid "Hide &toolbar"
-msgstr "Amagar &barra d'eines"
-
-msgid "&Resizeable window"
-msgstr "&Finestra redimensionable"
-
-msgid "R&emember size && position"
-msgstr "&Recordar mida i posició"
-
-msgid "Re&nderer"
-msgstr "Re&nderitzador"
-
-msgid "&SDL (Software)"
-msgstr "&SDL (Software)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (&Hardware)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
-
-msgid "Open&GL (3.0 Core)"
-msgstr "Open&GL (3.0 Core)"
-
-msgid "&VNC"
-msgstr "&VNC"
-
-msgid "Specify dimensions..."
-msgstr "E&specificar dimensions..."
-
-msgid "F&orce 4:3 display ratio"
-msgstr "F&orçar ràtio 4:3"
-
-msgid "&Window scale factor"
-msgstr "&Factor d'escalat de finestra"
-
-msgid "&0.5x"
-msgstr "&0.5x"
-
-msgid "&1x"
-msgstr "&1x"
-
-msgid "1.&5x"
-msgstr "1.&5x"
-
-msgid "&2x"
-msgstr "&2x"
-
-msgid "&3x"
-msgstr "&3x"
-
-msgid "&4x"
-msgstr "&4x"
-
-msgid "&5x"
-msgstr "&5x"
-
-msgid "&6x"
-msgstr "&6x"
-
-msgid "&7x"
-msgstr "&7x"
-
-msgid "&8x"
-msgstr "&8x"
-
-msgid "Filter method"
-msgstr "&Mètode de filtrat"
-
-msgid "&Nearest"
-msgstr "&Més proper"
-
-msgid "&Linear"
-msgstr "&Lineal"
-
-msgid "Hi&DPI scaling"
-msgstr "&Escalat alta densitat"
-
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "&Pantalla completa\tCtrl+Alt+PgUp"
-
-msgid "Fullscreen &stretch mode"
-msgstr "Escalat pantalla completa"
-
-msgid "&Full screen stretch"
-msgstr "&Estirar"
-
-msgid "&4:3"
-msgstr "&4:3"
-
-msgid "&Square pixels (Keep ratio)"
-msgstr "&Píxels quadrats (Mant. aspecte)"
-
-msgid "&Integer scale"
-msgstr "&Escala de valor enter"
-
-msgid "4:&3 Integer scale"
-msgstr "Escala de valor enter 4:&3"
-
-msgid "E&GA/(S)VGA settings"
-msgstr "&Ajustaments EGA/(S)VGA"
-
-msgid "&Inverted VGA monitor"
-msgstr "&Monitor VGA invertit"
-
-msgid "VGA screen &type"
-msgstr "&Tipus de pantalla VGA"
-
-msgid "RGB &Color"
-msgstr "RGB &Color"
-
-msgid "&RGB Grayscale"
-msgstr "RGB &Grisos"
-
-msgid "&Amber monitor"
-msgstr "Monitor & Ambre"
-
-msgid "&Green monitor"
-msgstr "Monitor &Verd"
-
-msgid "&White monitor"
-msgstr "Monitor &Blanc"
-
-msgid "Grayscale &conversion type"
-msgstr "&Conversió a grisos"
-
-msgid "BT&601 (NTSC/PAL)"
-msgstr "BT&601 (NTSC/PAL)"
-
-msgid "BT&709 (HDTV)"
-msgstr "BT&709 (HDTV)"
-
-msgid "&Average"
-msgstr "&Mitjana"
-
-msgid "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
-msgstr "&Overscan CGA/PCjr/Tandy/EGA/(S)VGA"
-
-msgid "Change contrast for &monochrome display"
-msgstr "Canviar contrast per a pantalla &monocroma"
-
-msgid "&Media"
-msgstr "&Mitjans"
-
-msgid "&Tools"
-msgstr "&Eines"
-
-msgid "&Settings..."
-msgstr "&Ajustaments..."
-
-msgid "&Update status bar icons"
-msgstr "&Actualitzar icones a la barra d'estat"
-
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "Prendre c&aptura\tCtrl+F11"
-
-msgid "&Preferences..."
-msgstr "&Preferències..."
-
-msgid "Enable &Discord integration"
-msgstr "Habilita la integració amb el &Discord"
-
-msgid "Sound &gain..."
-msgstr "&Guany de so..."
-
-msgid "Begin trace\tCtrl+T"
-msgstr "Començar traça\tCtrl+T"
-
-msgid "End trace\tCtrl+T"
-msgstr "Acabar traça\tCtrl+T"
-
-msgid "&Help"
-msgstr "&Ajuda"
-
-msgid "&Documentation..."
-msgstr "&Documentació..."
-
-msgid "&About 86Box..."
-msgstr "&Quant a 86Box..."
-
-msgid "&New image..."
-msgstr "&Nova imatge..."
-
-msgid "&Existing image..."
-msgstr "Imatge &Existent..."
-
-msgid "Existing image (&Write-protected)..."
-msgstr "Imatge Existent (&Només-lectura)..."
-
-msgid "&Record"
-msgstr "&Gravar"
-
-msgid "&Play"
-msgstr "&Reproduir"
-
-msgid "&Rewind to the beginning"
-msgstr "&Rebobinar a l'inici"
-
-msgid "&Fast forward to the end"
-msgstr "&Avanç ràpid al final"
-
-msgid "E&ject"
-msgstr "E&xtreure"
-
-msgid "&Image..."
-msgstr "&Imatge..."
-
-msgid "E&xport to 86F..."
-msgstr "E&xportar a 86F..."
-
-msgid "&Mute"
-msgstr "&Silenciar"
-
-msgid "E&mpty"
-msgstr "E&xtreure disc"
-
-msgid "&Reload previous image"
-msgstr "&Recarregar imatge prèvia"
-
-msgid "&Folder..."
-msgstr "&Carpeta..."
-
-msgid "Target &framerate"
-msgstr "&Taxa de refresc objectiu"
-
-msgid "&Sync with video"
-msgstr "&Sincronitzar amb vídeo"
-
-msgid "&25 fps"
-msgstr "&25 fps"
-
-msgid "&30 fps"
-msgstr "&30 fps"
-
-msgid "&50 fps"
-msgstr "&50 fps"
-
-msgid "&60 fps"
-msgstr "&60 fps"
-
-msgid "&75 fps"
-msgstr "&75 fps"
-
-msgid "&VSync"
-msgstr "&VSync"
-
-msgid "&Select shader..."
-msgstr "&Seleccionar shader..."
-
-msgid "&Remove shader"
-msgstr "&Eliminar shader"
-
-msgid "Preferences"
-msgstr "Preferències"
-
-msgid "Sound Gain"
-msgstr "Guany de So"
-
-msgid "New Image"
-msgstr "Nova Imatge"
-
-msgid "Settings"
-msgstr "Ajustaments"
-
-msgid "Specify Main Window Dimensions"
-msgstr "Especificar Dimensions de la Finestra Principal"
-
-msgid "OK"
-msgstr "D'acord"
-
-msgid "Cancel"
-msgstr "Anuŀlació"
-
-msgid "Save these settings as &global defaults"
-msgstr "Salvar aquests paràmetres com per &defecte globalment"
-
-msgid "&Default"
-msgstr "&Per defecte"
-
-msgid "Language:"
-msgstr "Idioma:"
-
-msgid "Icon set:"
-msgstr "Conjunt d'icones:"
-
-msgid "Gain"
-msgstr "Guany"
-
-msgid "File name:"
-msgstr "Nom del fitxer:"
-
-msgid "Disk size:"
-msgstr "Grandària de disc:"
-
-msgid "RPM mode:"
-msgstr "Mode RPM:"
-
-msgid "Progress:"
-msgstr "Progrés:"
-
-msgid "Width:"
-msgstr "Amplada:"
-
-msgid "Height:"
-msgstr "Alçada:"
-
-msgid "Lock to this size"
-msgstr "Bloquejar aquesta mida"
-
-msgid "Machine type:"
-msgstr "Tipus de màquina:"
-
-msgid "Machine:"
-msgstr "Màquina:"
-
-msgid "Configure"
-msgstr "Configurar"
-
-msgid "CPU type:"
-msgstr "Tipus de CPU:"
-
-msgid "Speed:"
-msgstr "Velocitat:"
-
-msgid "Frequency:"
-msgstr "Freqüència:"
-
-msgid "FPU:"
-msgstr "FPU:"
-
-msgid "Wait states:"
-msgstr "Estats en espera:"
-
-msgid "MB"
-msgstr "MB"
-
-msgid "Memory:"
-msgstr "Memòria:"
-
-msgid "Time synchronization"
-msgstr "Sincronització horària"
-
-msgid "Disabled"
-msgstr "Desactuvat"
-
-msgid "Enabled (local time)"
-msgstr "Activat (hora local)"
-
-msgid "Enabled (UTC)"
-msgstr "Activat (UTC)"
-
-msgid "Dynamic Recompiler"
-msgstr "Recopilador Dinàmic"
-
-msgid "Video:"
-msgstr "Vídeo:"
-
-msgid "Voodoo Graphics"
-msgstr "Gràfics Voodoo"
-
-msgid "IBM 8514/A Graphics"
-msgstr "Gràfics IBM 8514/A"
-
-msgid "XGA Graphics"
-msgstr "Gràfics XGA"
-
-msgid "Mouse:"
-msgstr "Ratolí:"
-
-msgid "Joystick:"
-msgstr "Joystick:"
-
-msgid "Joystick 1..."
-msgstr "Joystick 1..."
-
-msgid "Joystick 2..."
-msgstr "Joystick 2..."
-
-msgid "Joystick 3..."
-msgstr "Joystick 3..."
-
-msgid "Joystick 4..."
-msgstr "Joystick 4..."
-
-msgid "Sound card #1:"
-msgstr "Targeta de so 1:"
-
-msgid "Sound card #2:"
-msgstr "Targeta de so 2:"
-
-msgid "Sound card #3:"
-msgstr "Targeta de so 3:"
-
-msgid "Sound card #4:"
-msgstr "Targeta de so 4:"
-
-msgid "MIDI Out Device:"
-msgstr "Dispositiu de sortida MIDI:"
-
-msgid "MIDI In Device:"
-msgstr "Dispositiu d'entrada MIDI:"
-
-msgid "Standalone MPU-401"
-msgstr "MPU-401 autònom"
-
-msgid "Use FLOAT32 sound"
-msgstr "Usar so FLOAT32"
-
-msgid "FM synth driver"
-msgstr "Manejador de sintet. FM"
-
-msgid "Nuked (more accurate)"
-msgstr "Nuked (més acurat)"
-
-msgid "YMFM (faster)"
-msgstr "YMFM (més ràpid)"
-
-msgid "Network type:"
-msgstr "Tipus de xarxa:"
-
-msgid "PCap device:"
-msgstr "Dispositiu PCap:"
-
-msgid "Network adapter:"
-msgstr "Adaptador de xarxa:"
-
-msgid "COM1 Device:"
-msgstr "Dispositiu COM1:"
-
-msgid "COM2 Device:"
-msgstr "Dispositiu COM2:"
-
-msgid "COM3 Device:"
-msgstr "Dispositiu COM3:"
-
-msgid "COM4 Device:"
-msgstr "Dispositiu COM4:"
-
-msgid "LPT1 Device:"
-msgstr "Dispositiu LPT1:"
-
-msgid "LPT2 Device:"
-msgstr "Dispositiu LPT2:"
-
-msgid "LPT3 Device:"
-msgstr "Dispositiu LPT3:"
-
-msgid "LPT4 Device:"
-msgstr "Dispositiu LPT4:"
-
-msgid "Serial port 1"
-msgstr "Port sèrie 1"
-
-msgid "Serial port 2"
-msgstr "Port sèrie 2"
-
-msgid "Serial port 3"
-msgstr "Port sèrie 3"
-
-msgid "Serial port 4"
-msgstr "Port sèrie 4"
-
-msgid "Parallel port 1"
-msgstr "Port paral·lel 1"
-
-msgid "Parallel port 2"
-msgstr "Port paral·lel 2"
-
-msgid "Parallel port 3"
-msgstr "Port paral·lel 3"
-
-msgid "Parallel port 4"
-msgstr "Port paral·lel 4"
-
-msgid "HD Controller:"
-msgstr "Controlador de HD:"
-
-msgid "FD Controller:"
-msgstr "Controlador de FD:"
-
-msgid "Tertiary IDE Controller"
-msgstr "Controlador IDE terciari"
-
-msgid "Quaternary IDE Controller"
-msgstr "Controlador IDE quaternari"
-
-msgid "SCSI"
-msgstr "SCSI"
-
-msgid "Controller 1:"
-msgstr "Controlador 1:"
-
-msgid "Controller 2:"
-msgstr "Controlador 2:"
-
-msgid "Controller 3:"
-msgstr "Controlador 3:"
-
-msgid "Controller 4:"
-msgstr "Controlador 4:"
-
-msgid "Cassette"
-msgstr "Casset"
-
-msgid "Hard disks:"
-msgstr "Discs durs:"
-
-msgid "&New..."
-msgstr "&Nou..."
-
-msgid "&Existing..."
-msgstr "&Existent..."
-
-msgid "&Remove"
-msgstr "E&liminar"
-
-msgid "Bus:"
-msgstr "Bus:"
-
-msgid "Channel:"
-msgstr "Canal:"
-
-msgid "ID:"
-msgstr "ID:"
-
-msgid "&Specify..."
-msgstr "E&specificar..."
-
-msgid "Sectors:"
-msgstr "Sectors:"
-
-msgid "Heads:"
-msgstr "Caps:"
-
-msgid "Cylinders:"
-msgstr "Cilindres:"
-
-msgid "Size (MB):"
-msgstr "Mida (MB):"
-
-msgid "Type:"
-msgstr "Tipus:"
-
-msgid "Image Format:"
-msgstr "Format d'imatge:"
-
-msgid "Block Size:"
-msgstr "Mida del bloc:"
-
-msgid "Floppy drives:"
-msgstr "Unitats de disquet:"
-
-msgid "Turbo timings"
-msgstr "Temps turbo"
-
-msgid "Check BPB"
-msgstr "Comprovar BPB"
-
-msgid "CD-ROM drives:"
-msgstr "Unitats de CD-ROM:"
-
-msgid "Earlier drive"
-msgstr "Unitat anterior"
-
-msgid "MO drives:"
-msgstr "Unitats MO:"
-
-msgid "ZIP drives:"
-msgstr "Unitats ZIP:"
-
-msgid "ZIP 250"
-msgstr "ZIP 250"
-
-msgid "ISA RTC:"
-msgstr "ISA RTC:"
-
-msgid "ISA Memory Expansion"
-msgstr "Expansió de memòria ISA"
-
-msgid "Card 1:"
-msgstr "Targeta 1:"
-
-msgid "Card 2:"
-msgstr "Targeta 2:"
-
-msgid "Card 3:"
-msgstr "Targeta 3:"
-
-msgid "Card 4:"
-msgstr "Targeta 4:"
-
-msgid "ISABugger device"
-msgstr "Dispositiu ISABugger"
-
-msgid "POST card"
-msgstr "Targeta POST"
-
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
-
-msgid "86Box"
-msgstr "86Box"
-
-msgid "Error"
-msgstr "Error"
-
-msgid "Fatal error"
-msgstr "Error fatal"
-
-msgid " - PAUSED"
-msgstr " - EN PAUSA"
-
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Premeu Ctrl+Alt+PgDn per tornar al mode de finestra."
-
-msgid "Speed"
-msgstr "Velocitat"
-
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
-
-msgid "ZIP images"
-msgstr "Imatges ZIP"
-
-msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
-msgstr "86Box no ha pogut trobar cap imatge ROM utilitzable.\n\nSi us plau, <a href=\"https://github.com/86Box/roms/releases/latest\">descarregueu</a> un conjunt de ROM i extreu-lo al directori \"roms\"."
-
-msgid "(empty)"
-msgstr "(buit)"
-
-msgid "All files"
-msgstr "Tots els fitxers"
-
-msgid "Turbo"
-msgstr "Turbo"
-
-msgid "On"
-msgstr "On"
-
-msgid "Off"
-msgstr "Off"
-
-msgid "All images"
-msgstr "Totes les imatges"
-
-msgid "Basic sector images"
-msgstr "Imatges sectorials bàsiques"
-
-msgid "Surface images"
-msgstr "Imatges superficials"
-
-msgid "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
-msgstr "La màquina \"%hs\" no està disponible perquè falten ROM al directori roms/machines. Canvi a una màquina disponible."
-
-msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
-msgstr "La targeta de vídeo \"%hs\" no està disponible perquè falten ROM al directori roms/video. Canvi a una targeta de vídeo disponible."
-
-msgid "Machine"
-msgstr "Màquina"
-
-msgid "Display"
-msgstr "Vídeo"
-
-msgid "Input devices"
-msgstr "Dispositius d'entrada"
-
-msgid "Sound"
-msgstr "So"
-
-msgid "Network"
-msgstr "Xarxa"
-
-msgid "Ports (COM & LPT)"
-msgstr "Ports (COM i LPT)"
-
-msgid "Storage controllers"
-msgstr "Controladors d'emmagatzematge"
-
-msgid "Hard disks"
-msgstr "Discs durs"
-
-msgid "Floppy & CD-ROM drives"
-msgstr "Unitats de disquet i CD-ROM"
-
-msgid "Other removable devices"
-msgstr "Altres dispositius extraïbles"
-
-msgid "Other peripherals"
-msgstr "Altres perifèrics"
-
-msgid "Click to capture mouse"
-msgstr "Feu clic per capturar el ratolí"
-
-msgid "Press F8+F12 to release mouse"
-msgstr "Premeu F8+F12 per alliberar el ratolí"
-
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Premeu F8+F12 o el botó central per alliberar el ratolí"
-
-msgid "Bus"
-msgstr "Bus"
-
-msgid "File"
-msgstr "Fitxer"
-
-msgid "C"
-msgstr "C"
-
-msgid "H"
-msgstr "H"
-
-msgid "S"
-msgstr "S"
-
-msgid "KB"
-msgstr "KB"
-
-msgid "Could not initialize the video renderer."
-msgstr "No has estat possible inicialitzar el renderitzador de vídeo."
-
-msgid "Default"
-msgstr "Per defecte"
-
-msgid "%i estat(s) d'espera"
-msgstr "%i estado(s) de Espera"
-
-msgid "Type"
-msgstr "Tipus"
-
-msgid "Failed to set up PCap"
-msgstr "No s'ha pogut configurar PCap"
-
-msgid "No PCap devices found"
-msgstr "No s'han trobat dispositius PCap"
-
-msgid "Invalid PCap device"
-msgstr "El dispositiu PCap no és vàlid"
-
-msgid "Standard 2-button joystick(s)"
-msgstr "Joystick(s) estàndard de 2 botons"
-
-msgid "Standard 4-button joystick"
-msgstr "Joystick(s) estàndard de 4 botons"
-
-msgid "Standard 6-button joystick"
-msgstr "Joystick(s) estàndard de 6 botons"
-
-msgid "Standard 8-button joystick"
-msgstr "Joystick(s) estàndard de 8 botons"
-
-msgid "CH Flightstick Pro"
-msgstr "CH Flightstick Pro"
-
-msgid "Microsoft SideWinder Pad"
-msgstr "Microsoft SideWinder Pad"
-
-msgid "Thrustmaster Flight Control System"
-msgstr "Thrustmaster Flight Control System"
-
-msgid "None"
-msgstr "Cap"
-
-msgid "Unable to load keyboard accelerators."
-msgstr "No has estat possible carregar els acceleradors del teclat."
-
-msgid "Unable to register raw input."
-msgstr "No has estat possible registrar l'entrada en brut."
-
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Disquet %i (%s): %ls"
-
-msgid "Advanced sector images"
-msgstr "Imatges avançates del sector"
-
-msgid "Flux images"
-msgstr "Imatges de flux"
-
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "No has estat possible inicialitzar SDL, és necessari SDL2.dll"
-
-msgid "Are you sure you want to hard reset the emulated machine?"
-msgstr "Esteu segur que voleu restablir la màquina emulada?"
-
-msgid "Are you sure you want to exit 86Box?"
-msgstr "Esteu segur que voleu sortir de 86Box?"
-
-msgid "Unable to initialize Ghostscript"
-msgstr "No es pot inicialitzar Ghostscript"
-
-msgid "MO %i (%ls): %ls"
-msgstr "MO %i (%ls): %ls"
-
-msgid "MO images"
-msgstr "Imatges MO"
-
-msgid "Welcome to 86Box!"
-msgstr "Benvingut a 86Box!"
-
-msgid "Internal controller"
-msgstr "Controlador intern"
-
-msgid "Exit"
-msgstr "Sortir"
-
-msgid "No ROMs found"
-msgstr "No s'ha trobat cap ROM"
-
-msgid "Do you want to save the settings?"
-msgstr "Voleu desar les configuracions?"
-
-msgid "This will hard reset the emulated machine."
-msgstr "Es farà una reinicialització completa de la màquina emulada."
-
-msgid "Save"
-msgstr "Desar"
-
-msgid "About 86Box"
-msgstr "Quant a 86Box"
-
-msgid "86Box v"
-msgstr "86Box v"
-
-msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "Un emulador d'ordinadors antics\n\nAutors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne i altres.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho i altres.\n\nAlliberat sota la GNU General Public License versió 2 o posterior. Veure LLICENSE per a més informació."
-
-msgid "Hardware not available"
-msgstr "Maquinari no disponible"
-
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Assegureu-vos que el libpcap està instal·lat i que està en una connexió de xarxa compatible amb libpcap."
-
-msgid "Invalid configuration"
-msgstr "Configuració invàlida"
-
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
-
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " és necessària per a la conversió automàtica de fitxers PostScript a PDF.\n\nQualsevol document enviat a la impressora genèrica postScript es desarà com a fitxer PostScript (.ps)."
-
-msgid "Entering fullscreen mode"
-msgstr "Entrant en mode pantalla completa"
-
-msgid "Don't show this message again"
-msgstr "No mostreu més aquest missatge"
-
-msgid "Don't exit"
-msgstr "No sortir"
-
-msgid "Reset"
-msgstr "Resetejar"
-
-msgid "Don't reset"
-msgstr "No resetejar"
-
-msgid "CD-ROM images"
-msgstr "Imatges de CD-ROM"
-
-msgid "%hs Device Configuration"
-msgstr "%hs Configuració de Dispositiu"
-
-msgid "Monitor in sleep mode"
-msgstr "Monitor en mode estalvi"
-
-msgid "OpenGL Shaders"
-msgstr "Shaders OpenGL"
-
-msgid "OpenGL options"
-msgstr "Opcions OpenGL"
-
-msgid "You are loading an unsupported configuration"
-msgstr "S'està carregant una configuració no suportada"
-
-msgid "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
-msgstr "El Filtratge de tipus de CPU basat en màquina seleccionada està deshabilitat per a aquesta màquina.\n\nAixò fa possible seleccionar una CPU que sigui incompatible amb aquesta màquina. Per això, poden aparèixer incompatibilitat amb la BIOS de la màquina o un altre programari.\n\nActivar aquest ajustament no està oficialment suportat i qualsevol informe de fallada pot ser tancat com a invàlid."
-
-msgid "Continue"
-msgstr "Continuar"
-
-msgid "Cassette: %s"
-msgstr "Casset: %s"
-
-msgid "Cassette images"
-msgstr "Imatges de casset"
-
-msgid "Cartridge %i: %ls"
-msgstr "Cartutx %i: %ls"
-
-msgid "Cartridge images"
-msgstr "Imatges de cartutx"
-
-msgid "Error initializing renderer"
-msgstr "Error en inicialitzar el renderitzador"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "No has estat possible inicialitzar el renderitzador OpenGL (3.0 Core). Utilitzar un altre renderitzador."
-
-msgid "Resume execution"
-msgstr "Reprendre l'execució"
-
-msgid "Pause execution"
-msgstr "Pausar l'execució"
-
-msgid "Press Ctrl+Alt+Del"
-msgstr "Pulsar Ctrl+Alt+Supr"
-
-msgid "Press Ctrl+Alt+Esc"
-msgstr "Pulsar Ctrl+Alt+Esc"
-
-msgid "Hard reset"
-msgstr "Reinicialització completa"
-
-msgid "ACPI shutdown"
-msgstr "Apagada ACPI"
-
-msgid "Hard disk (%s)"
-msgstr "Disc dur (%s)"
-
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
-
-msgid "MFM/RLL or ESDI CD-ROM drives never existed"
-msgstr "Les unitats de CD-ROM MFM/RLL o ESDI no van existir mai"
-
-msgid "Custom..."
-msgstr "Personalitzat..."
-
-msgid "Custom (large)..."
-msgstr "Personalitzat (gran)..."
-
-msgid "Add New Hard Disk"
-msgstr "Afegir disc dur nou"
-
-msgid "Add Existing Hard Disk"
-msgstr "Afegir disc dur existent"
-
-msgid "HDI disk images cannot be larger than 4 GB."
-msgstr "Les imatges de disc HDI no poden superar els 4 GB."
-
-msgid "Disk images cannot be larger than 127 GB."
-msgstr "Les imatges del disc no poden superar els 127 GB."
-
-msgid "Hard disk images"
-msgstr "Imatges del disc dur"
-
-msgid "Unable to read file"
-msgstr "No has estat possible llegir el fitxer"
-
-msgid "Unable to write file"
-msgstr "No has estat possible escriure el fitxer"
-
-msgid "HDI or HDX images with a sector size other than 512 are not supported."
-msgstr "Les imatges HDI o HDX amb una mida de sector diferent de 512 no s'admeten."
-
-msgid "USB is not yet supported"
-msgstr "L'USB encara no s'admete"
-
-msgid "Disk image file already exists"
-msgstr "El fitxer d'imatge de disc ja existeix"
-
-msgid "Please specify a valid file name."
-msgstr "Especifiqueu un nom de fitxer vàlid."
-
-msgid "Disk image created"
-msgstr "La imatge de disc ha estat creada"
-
-msgid "Make sure the file exists and is readable."
-msgstr "Assegureu-vos que el fitxer existeix i és llegible."
-
-msgid "Make sure the file is being saved to a writable directory."
-msgstr "Assegureu-vos que el fitxer s'està desant en un directori que es pugui escriure."
-
-msgid "Disk image too large"
-msgstr "La imatge del disc és massa gran"
-
-msgid "Remember to partition and format the newly-created drive."
-msgstr "Recordeu particionar i formatar la unitat de nova creació."
-
-msgid "The selected file will be overwritten. Are you sure you want to use it?"
-msgstr "El fitxer seleccionat se sobreescriurà. Esteu segur que voleu utilitzar-lo?"
-
-msgid "Unsupported disk image"
-msgstr "Imatge de disc no compatible"
-
-msgid "Overwrite"
-msgstr "Sobreescriure"
-
-msgid "Don't overwrite"
-msgstr "No sobreescriure"
-
-msgid "Raw image (.img)"
-msgstr "Imatge crua (.img)"
-
-msgid "HDI image (.hdi)"
-msgstr "Imatge HDI (.hdi)"
-
-msgid "HDX image (.hdx)"
-msgstr "Imatge HDX (.hdx)"
-
-msgid "Fixed-size VHD (.vhd)"
-msgstr "VHD de mida fixa (.vhd)"
-
-msgid "Dynamic-size VHD (.vhd)"
-msgstr "VHD de mida dinàmica (.vhd)"
-
-msgid "Differencing VHD (.vhd)"
-msgstr "VHD diferencial (.vhd)"
-
-msgid "Large blocks (2 MB)"
-msgstr "Blocs grans (2 MB)"
-
-msgid "Small blocks (512 KB)"
-msgstr "Blocs petits (512 KB)"
-
-msgid "VHD files"
-msgstr "Fitxers VHD"
-
-msgid "Select the parent VHD"
-msgstr "Seleccioneu el VHD pare"
-
-msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
-msgstr "Això pot ser perquè la imatge pare es va modificar després que la imatge diferencial es creés.\n\nTambé pot passar si les imatges van ser mogudes o copiades, o per una fallada al programa que va crear aquest disc.\n\n¿ Voleu corregir els registres de temps?"
-
-msgid "Parent and child disk timestamps do not match"
-msgstr "Les marques de temps del pare i el fill no coincideixen"
-
-msgid "Could not fix VHD timestamp."
-msgstr "No has estat possible corregir la marca de temps del VHD."
-
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
-
-msgid "MFM/RLL"
-msgstr "MFM/RLL"
-
-msgid "XTA"
-msgstr "XTA"
-
-msgid "ESDI"
-msgstr "ESDI"
-
-msgid "IDE"
-msgstr "IDE"
-
-msgid "ATAPI"
-msgstr "ATAPI"
-
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
-
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
-
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
-
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
-
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
-
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
-
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
-
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
-
-msgid "1.2 MB"
-msgstr "1.2 MB"
-
-msgid "1.25 MB"
-msgstr "1.25 MB"
-
-msgid "1.44 MB"
-msgstr "1.44 MB"
-
-msgid "DMF (cluster 1024)"
-msgstr "DMF (clúster 1024)"
-
-msgid "DMF (cluster 2048)"
-msgstr "DMF (clúster 2048)"
-
-msgid "2.88 MB"
-msgstr "2.88 MB"
-
-msgid "ZIP 100"
-msgstr "ZIP 100"
-
-msgid "3.5\" 128 MB (ISO 10090)"
-msgstr "3.5\" 128 MB (ISO 10090)"
-
-msgid "3.5\" 230 MB (ISO 13963)"
-msgstr "3.5\" 230 MB (ISO 13963)"
-
-msgid "3.5\" 540 MB (ISO 15498)"
-msgstr "3.5\" 540 MB (ISO 15498)"
-
-msgid "3.5\" 640 MB (ISO 15498)"
-msgstr "3.5\" 640 MB (ISO 15498)"
-
-msgid "3.5\" 1.3 GB (GigaMO)"
-msgstr "3.5\" 1.3 GB (GigaMO)"
-
-msgid "3.5\" 2.3 GB (GigaMO 2)"
-msgstr "3.5\" 2.3 GB (GigaMO 2)"
-
-msgid "5.25\" 600 MB"
-msgstr "5.25\" 600 MB"
-
-msgid "5.25\" 650 MB"
-msgstr "5.25\" 650 MB"
-
-msgid "5.25\" 1 GB"
-msgstr "5.25\" 1 GB"
-
-msgid "5.25\" 1.3 GB"
-msgstr "5.25\" 1.3 GB"
-
-msgid "Perfect RPM"
-msgstr "RPM perfectes"
-
-msgid "1% below perfect RPM"
-msgstr "1% per sota de RPM perfectes"
-
-msgid "1.5% below perfect RPM"
-msgstr "1.5% per sota de RPM perfectes"
-
-msgid "2% below perfect RPM"
-msgstr "2% per sota de RPM perfectes"
-
-msgid "(System Default)"
-msgstr "(Per defecte del sistema)"
-
-msgid "Failed to initialize network driver"
-msgstr "No has estat possible inicialitzar el controlador de xarxa"
-
-msgid "The network configuration will be switched to the null driver"
-msgstr "La configuració de la xarxa es canviarà al controlador nul"
-
-msgid "Mouse sensitivity:"
-msgstr "Sensibilitat del ratolí:"
-
-msgid "Select media images from program working directory"
-msgstr "Seleccioneu imatges multimèdia del directori de treball del programa"
-
-msgid "PIT mode:"
-msgstr "Mode PIT:"
-
-msgid "Auto"
-msgstr "Automàtic"
-
-msgid "Slow"
-msgstr "Lent"
-
-msgid "Fast"
-msgstr "Ràpid"
-
-msgid "&Auto-pause on focus loss"
-msgstr "&Pausa automàtica en la pèrdua del focus"
diff --git a/src/qt/languages/cs-CZ.po b/src/qt/languages/cs-CZ.po
index 0069f245b..ae265593c 100644
--- a/src/qt/languages/cs-CZ.po
+++ b/src/qt/languages/cs-CZ.po
@@ -1,8 +1,16 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: cs_CZ\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
 msgstr "&Akce"
 
 msgid "&Keyboard requires capture"
-msgstr "&Klávesnice vyžaduje záběr"
+msgstr "&Klávesnice vyžaduje záběr myši"
 
 msgid "&Right CTRL is left ALT"
 msgstr "&Pravý Ctrl je levý Alt"
@@ -10,8 +18,8 @@ msgstr "&Pravý Ctrl je levý Alt"
 msgid "&Hard Reset..."
 msgstr "&Resetovat"
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Ctrl+Alt+Del\tCtrl+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "&Ctrl+Alt+Del"
 
 msgid "Ctrl+Alt+&Esc"
 msgstr "Ctrl+Alt+&Esc"
@@ -19,7 +27,13 @@ msgstr "Ctrl+Alt+&Esc"
 msgid "&Pause"
 msgstr "P&ozastavit"
 
-msgid "E&xit..."
+msgid "Pause"
+msgstr "Pozastavit"
+
+msgid "Re&sume"
+msgstr "&Obnovit"
+
+msgid "E&xit"
 msgstr "&Ukončit"
 
 msgid "&View"
@@ -40,14 +54,8 @@ msgstr "&Pamatovat velikost a pozici"
 msgid "Re&nderer"
 msgstr "&Renderer"
 
-msgid "&SDL (Software)"
-msgstr "&SDL (Software)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (&Hardware)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
+msgid "&Qt (Software)"
+msgstr "&Qt (Software)"
 
 msgid "Open&GL (3.0 Core)"
 msgstr "Open&GL (3.0 Core)"
@@ -55,11 +63,11 @@ msgstr "Open&GL (3.0 Core)"
 msgid "&VNC"
 msgstr "&VNC"
 
-msgid "Specify dimensions..."
+msgid "Specify &dimensions..."
 msgstr "&Zadat velikost..."
 
-msgid "F&orce 4:3 display ratio"
-msgstr "&Dodržovat poměr stran 4:3"
+msgid "Force &4:3 display ratio"
+msgstr "Dodržovat poměr stran &4:3"
 
 msgid "&Window scale factor"
 msgstr "&Násobek zvětšení okna"
@@ -94,7 +102,7 @@ msgstr "&7x"
 msgid "&8x"
 msgstr "&8x"
 
-msgid "Filter method"
+msgid "Fi&lter method"
 msgstr "Metoda &filtrování"
 
 msgid "&Nearest"
@@ -106,8 +114,8 @@ msgstr "&Lineární"
 msgid "Hi&DPI scaling"
 msgstr "Š&kálování HiDPI"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "&Celá obrazovka\tCtrl+Alt+PgUp"
+msgid "&Fullscreen"
+msgstr "&Celá obrazovka"
 
 msgid "Fullscreen &stretch mode"
 msgstr "Režím roztá&hnutí při celé obrazovce"
@@ -127,8 +135,8 @@ msgstr "&Celočíselné škálování"
 msgid "4:&3 Integer scale"
 msgstr "4:&3 Celočíselné škálování"
 
-msgid "E&GA/(S)VGA settings"
-msgstr "Nastavení pro E&GA a (S)VGA"
+msgid "EGA/(S)&VGA settings"
+msgstr "Nastavení pro EGA a (S)&VGA"
 
 msgid "&Inverted VGA monitor"
 msgstr "&Převrátit barvy"
@@ -139,17 +147,23 @@ msgstr "&Typ VGA monitoru"
 msgid "RGB &Color"
 msgstr "RGB &barevný"
 
+msgid "RGB (no brown)"
+msgstr "RGB (bez hnědé)"
+
 msgid "&RGB Grayscale"
 msgstr "&Odstíny šedi"
 
+msgid "Generic RGBI color monitor"
+msgstr "Obecný RGBI barevný monitor"
+
 msgid "&Amber monitor"
-msgstr "&Jantarová obrazovka"
+msgstr "&Jantarový monitor"
 
 msgid "&Green monitor"
-msgstr "&Zelená obrazovka"
+msgstr "&Zelený monitor"
 
 msgid "&White monitor"
-msgstr "&Bílá obrazovka"
+msgstr "&Bílý monitor"
 
 msgid "Grayscale &conversion type"
 msgstr "Převod na &odstíny šedi"
@@ -178,11 +192,17 @@ msgstr "&Nástroje"
 msgid "&Settings..."
 msgstr "&Nastavení..."
 
+msgid "Settings..."
+msgstr "Nastavení..."
+
 msgid "&Update status bar icons"
 msgstr "&Aktualizovat ikony stavového řádku"
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "Pořídit &screenshot\tCtrl+F11"
+msgid "Take s&creenshot"
+msgstr "Pořídit &screenshot"
+
+msgid "S&ound"
+msgstr "&Zvuk"
 
 msgid "&Preferences..."
 msgstr "&Předvolby..."
@@ -193,11 +213,11 @@ msgstr "Povolit integraci s &Discordem"
 msgid "Sound &gain..."
 msgstr "&Zesílení zvuku"
 
-msgid "Begin trace\tCtrl+T"
-msgstr "Začít trace\tCtrl+T"
+msgid "Begin trace"
+msgstr "Začít trace"
 
-msgid "End trace\tCtrl+T"
-msgstr "Zastavit trace\tCtrl+T"
+msgid "End trace"
+msgstr "Zastavit trace"
 
 msgid "&Help"
 msgstr "Ná&pověda"
@@ -244,8 +264,8 @@ msgstr "&Ztišit"
 msgid "E&mpty"
 msgstr "&Vyjmout"
 
-msgid "&Reload previous image"
-msgstr "&Načíst znova předchozí obraz"
+msgid "Reload previous image"
+msgstr "Načíst znova předchozí obraz"
 
 msgid "&Folder..."
 msgstr "&Složka..."
@@ -301,18 +321,12 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Storno"
 
-msgid "Save these settings as &global defaults"
-msgstr "Uložit toto nastavení jako &globální výchozí stav"
-
 msgid "&Default"
 msgstr "&Výchozí"
 
 msgid "Language:"
 msgstr "Jazyk:"
 
-msgid "Icon set:"
-msgstr "Sada ikon:"
-
 msgid "Gain"
 msgstr "Zesílení"
 
@@ -346,9 +360,12 @@ msgstr "Počítač:"
 msgid "Configure"
 msgstr "Nastavit"
 
-msgid "CPU type:"
+msgid "CPU:"
 msgstr "Procesor:"
 
+msgid "CPU type:"
+msgstr "Typ procesoru:"
+
 msgid "Speed:"
 msgstr "Rychlost:"
 
@@ -382,11 +399,23 @@ msgstr "Zapnuta (UTC)"
 msgid "Dynamic Recompiler"
 msgstr "Dynamický překladač"
 
+msgid "CPU frame size"
+msgstr "Velikost CPU rámců"
+
+msgid "Larger frames (less smooth)"
+msgstr "Větší rámce (méně plynulé)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Menší rámce (plynulejší)"
+
 msgid "Video:"
 msgstr "Grafika:"
 
-msgid "Voodoo Graphics"
-msgstr "Použít grafický akcelerátor Voodoo"
+msgid "Video #2:"
+msgstr "Grafika 2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Použít grafický akcelerátor Voodoo 1 nebo 2"
 
 msgid "IBM 8514/A Graphics"
 msgstr "Grafika IBM 8514/A"
@@ -394,12 +423,27 @@ msgstr "Grafika IBM 8514/A"
 msgid "XGA Graphics"
 msgstr "Grafika XGA"
 
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "Grafika zobrazovacího adaptéru IBM PS/55"
+
+msgid "Keyboard:"
+msgstr "Klávesnice:"
+
+msgid "Keyboard"
+msgstr "Klávesnice"
+
 msgid "Mouse:"
 msgstr "Myš:"
 
+msgid "Mouse"
+msgstr "Myš"
+
 msgid "Joystick:"
 msgstr "Joystick:"
 
+msgid "Joystick"
+msgstr "Joystick"
+
 msgid "Joystick 1..."
 msgstr "Joystick 1..."
 
@@ -425,10 +469,13 @@ msgid "Sound card #4:"
 msgstr "Zvuková karta 4:"
 
 msgid "MIDI Out Device:"
-msgstr "MIDI výstup:"
+msgstr "Zařízení pro MIDI výstup:"
 
 msgid "MIDI In Device:"
-msgstr "MIDI vstup:"
+msgstr "Zařízení pro MIDI vstup:"
+
+msgid "MIDI Out:"
+msgstr "MIDI výstup:"
 
 msgid "Standalone MPU-401"
 msgstr "Samostatný MPU-401"
@@ -437,7 +484,7 @@ msgid "Use FLOAT32 sound"
 msgstr "Použít zvuk FLOAT32"
 
 msgid "FM synth driver"
-msgstr "FM synth driver"
+msgstr "Ovladač syntezátoru FM"
 
 msgid "Nuked (more accurate)"
 msgstr "Nuked (přesnější)"
@@ -445,15 +492,6 @@ msgstr "Nuked (přesnější)"
 msgid "YMFM (faster)"
 msgstr "YMFM (rychlejší)"
 
-msgid "Network type:"
-msgstr "Druh sítě:"
-
-msgid "PCap device:"
-msgstr "PCap zařízení:"
-
-msgid "Network adapter:"
-msgstr "Síťový adaptér:"
-
 msgid "COM1 Device:"
 msgstr "Zařízení na COM1:"
 
@@ -478,6 +516,9 @@ msgstr "Zařízení na LPT3:"
 msgid "LPT4 Device:"
 msgstr "Zařízení na LPT4:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr "DMA kanál ECP interního LPT portu:"
+
 msgid "Serial port 1"
 msgstr "Povolit port COM1"
 
@@ -502,18 +543,21 @@ msgstr "Povolit port LPT3"
 msgid "Parallel port 4"
 msgstr "Povolit port LPT4"
 
-msgid "HD Controller:"
-msgstr "Řadič disku:"
-
 msgid "FD Controller:"
 msgstr "Disketový řadič:"
 
+msgid "CD-ROM Controller:"
+msgstr "Řadič CD-ROM:"
+
 msgid "Tertiary IDE Controller"
 msgstr "Třetí řadič IDE"
 
 msgid "Quaternary IDE Controller"
 msgstr "Čtvrtý řadič IDE"
 
+msgid "Hard disk"
+msgstr "Pevný disk"
+
 msgid "SCSI"
 msgstr "SCSI"
 
@@ -535,6 +579,9 @@ msgstr "Kazeta"
 msgid "Hard disks:"
 msgstr "Pevné disky:"
 
+msgid "Firmware Version"
+msgstr "Verze firmware"
+
 msgid "&New..."
 msgstr "&Nový..."
 
@@ -589,14 +636,17 @@ msgstr "Kontrola BPB"
 msgid "CD-ROM drives:"
 msgstr "Mechaniky CD-ROM:"
 
-msgid "Earlier drive"
-msgstr "Časná mechanika"
-
 msgid "MO drives:"
 msgstr "Magnetooptické mechaniky:"
 
-msgid "ZIP drives:"
-msgstr "Mechaniky ZIP:"
+msgid "MO:"
+msgstr "Magnetooptické jednotky:"
+
+msgid "Removable disks:"
+msgstr "Vyměnitelné disky:"
+
+msgid "Removable disk drives:"
+msgstr "Mechaniky vyměnitelných disků:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
@@ -607,6 +657,9 @@ msgstr "ISA hodiny:"
 msgid "ISA Memory Expansion"
 msgstr "ISA rozšíření paměti"
 
+msgid "ISA ROM Cards"
+msgstr "ISA karty s pamětí ROM"
+
 msgid "Card 1:"
 msgstr "Karta 1:"
 
@@ -619,18 +672,21 @@ msgstr "Karta 3:"
 msgid "Card 4:"
 msgstr "Karta 4:"
 
+msgid "Generic ISA ROM Board"
+msgstr "Obecná ISA karta s pamětí ROM"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "Obecná ISA karta se dvěmi pamětmi ROM"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "Obecná ISA karta se čtyřmi pamětmi ROM"
+
 msgid "ISABugger device"
 msgstr "Zařízení ISABugger"
 
 msgid "POST card"
 msgstr "Karta pro kódy POST"
 
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
-
 msgid "86Box"
 msgstr "86Box"
 
@@ -641,22 +697,25 @@ msgid "Fatal error"
 msgstr "Kritická chyba"
 
 msgid " - PAUSED"
-msgstr " - PAUSED"
-
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Stiskněte Ctrl+Alt+PgDn pro návrat z režimu celé obrazovky."
+msgstr " - POZASTAVENO"
 
 msgid "Speed"
 msgstr "Rychlost"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "Vyměnitelný disk %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "Obrazy ZIP disků"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "&Vyměnitelný disk %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Obrazy vyměnitelných disků"
+
+msgid "Image %1"
+msgstr "Obraz %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
-msgstr "86Box nenalezl žádné použitelné image pamětí ROM.\n\n<a href=\"https://github.com/86Box/roms/releases/latest\">Stáhněte</a> sadu obrazů ROM a extrahujte ji do složky \"roms\"."
+msgstr "86Box nenalezl žádné použitelné obrazy pamětí ROM.\n\n<a href=\"https://github.com/86Box/roms/releases/latest\">Stáhněte</a> sadu obrazů ROM a extrahujte ji do složky \"roms\"."
 
 msgid "(empty)"
 msgstr "(prázdné)"
@@ -688,6 +747,12 @@ msgstr "Počítač \"%hs\" není dostupný, jelikož chybí obraz jeho paměti R
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
 msgstr "Video adaptér \"%hs\" není dostupný, jelikož chybí obraz jeho paměti ROM ve složce \"roms/video\". Konfigurace se přepne na jiný dostupný adaptér."
 
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "Video adaptér 2 \"%hs\" není dostupný, jelikož chybí obraz jeho paměti ROM ve složce \"roms/video\". Druhá grafická karta se zakáže."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "Zařízení \"%hs\" není dostupné, jelikož chybí obraz jeho paměti ROM. Zařízení je ignorováno."
+
 msgid "Machine"
 msgstr "Počítač"
 
@@ -706,12 +771,30 @@ msgstr "Síť"
 msgid "Ports (COM & LPT)"
 msgstr "COM a LPT porty"
 
+msgid "Ports"
+msgstr "Porty"
+
+msgid "Serial ports:"
+msgstr "Sériové porty:"
+
+msgid "Parallel ports:"
+msgstr "Paralelní porty:"
+
 msgid "Storage controllers"
 msgstr "Řadiče úložiště"
 
 msgid "Hard disks"
 msgstr "Pevné disky"
 
+msgid "Disks:"
+msgstr "Disky:"
+
+msgid "Floppy:"
+msgstr "Disketové jednotky:"
+
+msgid "Controllers:"
+msgstr "Řadiče:"
+
 msgid "Floppy & CD-ROM drives"
 msgstr "Disketové a CD-ROM mechaniky"
 
@@ -721,14 +804,17 @@ msgstr "Další vyměnitelná zařízení"
 msgid "Other peripherals"
 msgstr "Jiné příslušenství"
 
+msgid "Other devices"
+msgstr "Jiná zařízení"
+
 msgid "Click to capture mouse"
 msgstr "Klikněte pro zabraní myši"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "Stiskněte F8+F12 pro uvolnění myši"
+msgid "Press %1 to release mouse"
+msgstr "Stiskněte %1 pro uvolnění myši"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Stiskněte F8+F12 nebo prostřední tlačítko pro uvolnění myši"
+msgid "Press %1 or middle button to release mouse"
+msgstr "Stiskněte %1 nebo prostřední tlačítko pro uvolnění myši"
 
 msgid "Bus"
 msgstr "Sběrnice"
@@ -748,65 +834,89 @@ msgstr "S"
 msgid "KB"
 msgstr "KB"
 
-msgid "Could not initialize the video renderer."
-msgstr "Nastala chyba při inicializaci video rendereru."
-
 msgid "Default"
 msgstr "Výchozí"
 
-msgid "%i Wait state(s)"
-msgstr "%i čekací stav(y)"
+msgid "%1 Wait state(s)"
+msgstr "%1 čekací stav(y)"
 
 msgid "Type"
 msgstr "Typ"
 
-msgid "Failed to set up PCap"
-msgstr "Nastala chyba při inicializaci knihovny PCap"
-
 msgid "No PCap devices found"
 msgstr "Nebyla nalezena žádná PCap zařízení"
 
 msgid "Invalid PCap device"
 msgstr "Neplatné PCap zařízení"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "Standardní 2tlačítkový joystick"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "Joystick s 2 osami a 2 tlačítky"
 
-msgid "Standard 4-button joystick"
-msgstr "Standardní 4tlačítkový joystick"
+msgid "2-axis, 4-button joystick"
+msgstr "Joystick s 2 osami a 4 tlačítky"
 
-msgid "Standard 6-button joystick"
-msgstr "Standardní 6tlačítkový joystick"
+msgid "2-axis, 6-button joystick"
+msgstr "Joystick s 2 osami a 6 tlačítky"
 
-msgid "Standard 8-button joystick"
-msgstr "Standardní 8tlačítkový joystick"
+msgid "2-axis, 8-button joystick"
+msgstr "Joystick s 2 osami a 8 tlačítky"
+
+msgid "3-axis, 2-button joystick"
+msgstr "Joystick s 3 osami a 2 tlačítky"
+
+msgid "3-axis, 4-button joystick"
+msgstr "Joystick s 3 osami a 4 tlačítky"
+
+msgid "4-axis, 4-button joystick"
+msgstr "Joystick s 4 osami a 4 tlačítky"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH Pedals"
+
 msgid "Microsoft SideWinder Pad"
 msgstr "Microsoft SideWinder Pad"
 
 msgid "Thrustmaster Flight Control System"
 msgstr "Thrustmaster Flight Control System"
 
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Rudder Control System"
+
+msgid "2-button gamepad(s)"
+msgstr "Ovladač se 2 tlačítky"
+
+msgid "2-button flight yoke"
+msgstr "Letecký knipl se 2 tlačítky"
+
+msgid "4-button gamepad"
+msgstr "Ovladač se 4 tlačítky"
+
+msgid "4-button flight yoke"
+msgstr "Letecký knipl se 4 tlačítky"
+
+msgid "2-button flight yoke with throttle"
+msgstr "Letecký knipl s 2 tlačítky a pákou"
+
+msgid "4-button flight yoke with throttle"
+msgstr "Letecký knipl s 4 tlačítky a pákou"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Volant pro Windows 95 (3 osy, 4 tlačítka)"
+
 msgid "None"
 msgstr "Žadné"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "Nebylo možné nahrát klávesnicové zkratky."
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CHS: %2, %3, %4)"
 
-msgid "Unable to register raw input."
-msgstr "Nebylo možné zaregistrovat raw input."
+msgid "Floppy %1 (%2): %3"
+msgstr "Disketová mechanika %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Disketová mechanika %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "&Disketová mechanika %1 (%2): %3"
 
 msgid "Advanced sector images"
 msgstr "Rozšířené sektorové obrazy"
@@ -814,9 +924,6 @@ msgstr "Rozšířené sektorové obrazy"
 msgid "Flux images"
 msgstr "Obrazy magnetického toku"
 
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "Nastala chyba při inicializaci knihovny SDL, je potřeba SDL2.dll"
-
 msgid "Are you sure you want to hard reset the emulated machine?"
 msgstr "Opravdu chcete resetovat emulovaný počítač?"
 
@@ -826,8 +933,14 @@ msgstr "Opravdu chcete ukončit 86Box?"
 msgid "Unable to initialize Ghostscript"
 msgstr "Nastala chyba při inicializaci knihovny Ghostscript"
 
-msgid "MO %i (%ls): %ls"
-msgstr "MO %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "Nastala chyba při inicializaci knihovny GhostPCL"
+
+msgid "MO %1 (%2): %3"
+msgstr "MO %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&MO %1 (%2): %3"
 
 msgid "MO images"
 msgstr "Obrazy MO"
@@ -835,8 +948,17 @@ msgstr "Obrazy MO"
 msgid "Welcome to 86Box!"
 msgstr "Vítejte v programu 86Box!"
 
-msgid "Internal controller"
-msgstr "Vestavěný řadič"
+msgid "Internal device"
+msgstr "Vestavěné zařízení"
+
+msgid "&File"
+msgstr "&Soubor"
+
+msgid "&New machine..."
+msgstr "&Nový počítač..."
+
+msgid "&Check for updates..."
+msgstr "&Zkontrolovat aktualizace..."
 
 msgid "Exit"
 msgstr "Ukončit"
@@ -860,34 +982,22 @@ msgid "86Box v"
 msgstr "86Box v"
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "Emulátor starých počítačů\n\nAutoři: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nZveřejněno pod licencí GNU General Public License verze 2 nebo novější. Viz soubor LICENSE pro více informací."
+msgstr "Emulátor starých počítačů\n\nAutoři: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nS předchozími příspěvky od Sarah Walker, leilei, JohnElliott, greatpsycho a dalších.\n\nZveřejněno pod licencí GNU General Public License verze 2 nebo novější. Viz soubor LICENSE pro více informací."
 
 msgid "Hardware not available"
 msgstr "Hardware není dostupný"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Ujistěte se, že je nainstalován libpcap a používáte síťové připojení s ním kompatibilní."
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "Ujistěte se, že je nainstalován %1 a používáte síťové připojení s ním kompatibilní."
 
 msgid "Invalid configuration"
 msgstr "Neplatná konfigurace"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 je potřeba pro automatický převod PostScript dokumentů do PDF.\n\nJakékoliv dokumenty vytisknuté přes obecnou PostScriptovou tiskárnu budou uloženy jako PostScript (.ps) soubory."
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " je potřeba pro automatický převod PostScript dokumentů do PDF.\n\nJakékoliv dokumenty vytisknuté přes obecnou PostScriptovou tiskárnu budou uloženy jako PostScript (.ps) soubory."
-
-msgid "Entering fullscreen mode"
-msgstr "Vstup do režimu celé obrazovky"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 je potřeba pro automatický převod PCL dokumentů do PDF.\n\nJakékoliv dokumenty vytisknuté přes obecnou PCL-ovou tiskárnu budou uloženy jako Printer Command Language (.pcl) soubory."
 
 msgid "Don't show this message again"
 msgstr "Nezobrazovat dále tuto zprávu"
@@ -904,17 +1014,14 @@ msgstr "Neresetovat"
 msgid "CD-ROM images"
 msgstr "Obraz CD-ROM disku"
 
-msgid "%hs Device Configuration"
-msgstr "Konfigurace zařízení %hs"
+msgid "%1 Device Configuration"
+msgstr "Nastavení zařízení %1"
 
 msgid "Monitor in sleep mode"
 msgstr "Monitor je v režimu spánku"
 
-msgid "OpenGL Shaders"
-msgstr "Shadery OpenGL"
-
-msgid "OpenGL options"
-msgstr "Možnosti OpenGL"
+msgid "GLSL shaders"
+msgstr "Shadery GLSL"
 
 msgid "You are loading an unsupported configuration"
 msgstr "Pokoušíte se spustit nepodporovanou konfiguraci"
@@ -925,30 +1032,33 @@ msgstr "Pro tuto konfiguraci bylo vypnuto filtrování procesorů podle zvolené
 msgid "Continue"
 msgstr "Pokračovat"
 
-msgid "Cassette: %s"
-msgstr "Kazeta: %s"
+msgid "Cassette: %1"
+msgstr "Kazeta: %1"
+
+msgid "C&assette: %1"
+msgstr "K&azeta: %1"
 
 msgid "Cassette images"
 msgstr "Kazetové nahrávky"
 
-msgid "Cartridge %i: %ls"
-msgstr "Cartridge %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "Cartridge %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "Car&tridge %1: %2"
 
 msgid "Cartridge images"
 msgstr "Obrazy cartridge"
 
-msgid "Error initializing renderer"
-msgstr "Chyba při inicializaci vykreslovače"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "Vykreslovač OpenGL (3.0 Core) se nepodařilo inicializovat. Použijte jiný renderer."
-
 msgid "Resume execution"
 msgstr "Obnovit"
 
 msgid "Pause execution"
 msgstr "Pozastavit"
 
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del"
+
 msgid "Press Ctrl+Alt+Del"
 msgstr "Stisknout Ctrl+Alt+Delete"
 
@@ -958,17 +1068,281 @@ msgstr "Stisknout Ctrl+Alt+Esc"
 msgid "Hard reset"
 msgstr "Resetovat"
 
+msgid "Force shutdown"
+msgstr "Vynutit vypnutí"
+
+msgid "Start"
+msgstr "Spustit"
+
+msgid "Not running"
+msgstr "Neběží"
+
+msgid "Running"
+msgstr "Běží"
+
+msgid "Paused"
+msgstr "Pozastaveno"
+
+msgid "Waiting"
+msgstr "Čeká"
+
+msgid "Powered Off"
+msgstr "Vypnuto"
+
+msgid "%n running"
+msgstr "%n běžících"
+
+msgid "%n paused"
+msgstr "%n pozastavených"
+
+msgid "%n waiting"
+msgstr "%n čekajících"
+
+msgid "%1 total"
+msgstr "%1 celkem"
+
+msgid "VMs: %1"
+msgstr "Počet virtuálních počítačů: %1"
+
+msgid "System Directory:"
+msgstr "Systémový adresář:"
+
+msgid "Choose directory"
+msgstr "Vyberte adresář"
+
+msgid "Choose configuration file"
+msgstr "Vyberte konfigurační soubor"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "Konfigurační soubory 86Box (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Čtení konfigurace selhalo"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "Nebylo možné otevřít vybraný konfigurační soubor pro čtení: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "Použít ve vyhledávacím poli regulární výrazy"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "%1 počítač(ů) je stále aktivních. Opravdu chcete ukončit správce virtuálních počítačů?"
+
+msgid "Add new system wizard"
+msgstr "Průvodce přidáním nového systému"
+
+msgid "Introduction"
+msgstr "Úvod"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "Tento průvodce vám pomůže přidat nový systém do programu 86Box."
+
+msgid "New configuration"
+msgstr "Nová konfigurace"
+
+msgid "Complete"
+msgstr "Závěr"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "Průvodce nyní spustí konfiguraci nového systému."
+
+msgid "Use existing configuration"
+msgstr "Použít existující konfiguraci"
+
+msgid "Type some notes here"
+msgstr "Zde zadejte nějaké poznámky"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Vložte obsah stávajícího konfiguračního souboru do pole níže."
+
+msgid "Load configuration from file"
+msgstr "Načíst konfiguraci ze souboru"
+
+msgid "System name"
+msgstr "Název systému"
+
+msgid "System name:"
+msgstr "Název systému:"
+
+msgid "System name cannot contain certain characters"
+msgstr "Název systému nesmí obsahovat určité znaky"
+
+msgid "System name already exists"
+msgstr "Název systému již existuje"
+
+msgid "Please enter a directory for the system"
+msgstr "Zadejte adresář pro systém"
+
+msgid "Directory does not exist"
+msgstr "Adresář neexistuje"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "Pro tento systém bude vytvořen nový adresář ve výše zvoleném adresáři."
+
+msgid "System location:"
+msgstr "Umístění systému:"
+
+msgid "System name and location"
+msgstr "Název systému a umístění"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Zadejte název systému a vyberte umístění"
+
+msgid "Enter the name of the system"
+msgstr "Zadejte název systému"
+
+msgid "Please enter a system name"
+msgstr "Zadejte název systému"
+
+msgid "Display name (optional):"
+msgstr "Zobrazované jméno (volitelné):"
+
+msgid "Display name:"
+msgstr "Zobrazované jméno:"
+
+msgid "Set display name"
+msgstr "Nastavit zobrazované jméno"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Zadejte nové zobrazované jméno (prázdné pole pro vymazání)"
+
+msgid "Change &display name..."
+msgstr "Změnit &zobrazované jméno..."
+
+msgid "Context Menu"
+msgstr "Kontextová nabídka"
+
+msgid "&Open folder..."
+msgstr "&Otevřít složku..."
+
+msgid "Open p&rinter tray..."
+msgstr "Otevřít zásobník &tiskárny..."
+
+msgid "Set &icon..."
+msgstr "Nastavit &ikonu..."
+
+msgid "Select an icon"
+msgstr "Vyberte ikonu"
+
+msgid "C&lone..."
+msgstr "K&lonovat..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "Virtuální počítač \"%1\" (%2) bude naklonován do:"
+
+msgid "Directory %1 already exists"
+msgstr "Adresář %1 již existuje."
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "V názvu nelze použít následující znaky: %1"
+
+msgid "Clone"
+msgstr "Klonovat"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Nepodařilo se vytvořit adresář pro klonovaný virtuální počítač"
+
+msgid "Failed to clone VM."
+msgstr "Klonování virtuálního počítače se nezdařilo."
+
+msgid "Directory in use"
+msgstr "Adresář se již používá"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "Vybraný adresář je již používán. Vyberte prosím jiný adresář."
+
+msgid "Create directory failed"
+msgstr "Vytvoření adresáře se nezdařilo"
+
+msgid "Unable to create the directory for the new system"
+msgstr "Nelze vytvořit adresář pro nový systém"
+
+msgid "Configuration write failed"
+msgstr "Selhal zápis konfigurace"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "Nebylo možné otevřít konfigurační soubor %1 pro zápis"
+
+msgid "Error adding system"
+msgstr "Chyba při přidávání systému"
+
+msgid "Remove directory failed"
+msgstr "Odstranění adresáře se nezdařilo"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "Některé soubory v adresáři zařízení nebylo možné odstranit. Odstraňte je prosím ručně."
+
+msgid "Build"
+msgstr "Build"
+
+msgid "Version"
+msgstr "Verze"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "Je k dispozici aktualizace pro 86Box: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "Při kontrole aktualizací došlo k chybě: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>Je k dispozici aktualizace pro 86Box!</b>"
+
+msgid "Warning"
+msgstr "Varování"
+
+msgid "&Kill"
+msgstr "Vynutit &ukončení"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "Ukončení virtuálního počítače může způsobit ztrátu dat. Proveďte to pouze v případě, že proces programu 86Box zamrzne.\n\nOpravdu chcete ukončit virtuální počítač \"%1\"?"
+
+msgid "&Delete"
+msgstr "&Odstranit"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "Opravdu chcete odstranit virtuální počítač \"%1\" a všechny jeho soubory? Tuto akci nelze vrátit zpět!"
+
+msgid "Show &config file"
+msgstr "Zobrazit &konfigurační soubor"
+
+msgid "No screenshot"
+msgstr "Žádný snímek obrazovky"
+
+msgid "Search"
+msgstr "Hledat"
+
+msgid "Searching for VMs..."
+msgstr "Hledání virtuálních počítačů..."
+
+msgid "Found %1"
+msgstr "Nalezeno %1"
+
+msgid "System"
+msgstr "Systém"
+
+msgid "Storage"
+msgstr "Úložiště"
+
+msgid "Disk %1: "
+msgstr "Disk %1: "
+
+msgid "No disks"
+msgstr "Žádné disky"
+
+msgid "Audio"
+msgstr "Zvuk"
+
+msgid "Audio:"
+msgstr "Zvuk:"
+
 msgid "ACPI shutdown"
 msgstr "Vypnout skrze rozhraní ACPI"
 
-msgid "Hard disk (%s)"
-msgstr "Pevný disk (%s)"
+msgid "ACP&I shutdown"
+msgstr "Vypnout skrze rozhraní ACP&I"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "Pevný disk (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
 msgstr "CD-ROM mechaniky pro rozhraní MFM/RLL nebo ESDI nikdy neexistovaly"
@@ -986,10 +1360,10 @@ msgid "Add Existing Hard Disk"
 msgstr "Přidat existující pevný disk"
 
 msgid "HDI disk images cannot be larger than 4 GB."
-msgstr "Obraz disku formátu HDI nemůžou být větší než 4 GB."
+msgstr "Obrazy disku formátu HDI nemůžou být větší než 4 GB."
 
 msgid "Disk images cannot be larger than 127 GB."
-msgstr "Obraz disku nemůžou být větší než 127 GB."
+msgstr "Obrazy disku nemůžou být větší než 127 GB."
 
 msgid "Hard disk images"
 msgstr "Obrazy pevného disku"
@@ -1001,10 +1375,7 @@ msgid "Unable to write file"
 msgstr "Nebylo možné zapisovat do souboru"
 
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
-msgstr "Obraz disku ve formátu HDI nebo HDX s velikostí sektoru jinou než 512 bajtů nejsou podporovány."
-
-msgid "USB is not yet supported"
-msgstr "USB zatím není podporováno."
+msgstr "Obrazy disku ve formátu HDI nebo HDX s velikostí sektoru jinou než 512 bajtů nejsou podporovány."
 
 msgid "Disk image file already exists"
 msgstr "Soubor obrazu disku již existuje"
@@ -1039,6 +1410,27 @@ msgstr "Přepsat"
 msgid "Don't overwrite"
 msgstr "Nepřepisovat"
 
+msgid "Raw image"
+msgstr "Surový obraz"
+
+msgid "HDI image"
+msgstr "HDI obraz"
+
+msgid "HDX image"
+msgstr "HDX obraz"
+
+msgid "Fixed-size VHD"
+msgstr "VHD s pevnou velikostí"
+
+msgid "Dynamic-size VHD"
+msgstr "VHD s dynamickou velikostí"
+
+msgid "Differencing VHD"
+msgstr "Rozdílový VHD"
+
+msgid "(N/A)"
+msgstr "(Žadné)"
+
 msgid "Raw image (.img)"
 msgstr "Surový obraz (.img)"
 
@@ -1067,19 +1459,16 @@ msgid "VHD files"
 msgstr "Soubory VHD"
 
 msgid "Select the parent VHD"
-msgstr "Vyberte nadřazený virtuální disk"
+msgstr "Vyberte nadřazený VHD disk"
 
 msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
-msgstr "To může znamenat, že se obsahy nadřazeného disku změnily po vytvoření rozdílového disku.\n\nTato chyba také může nastat, pokud byl obraz disku kopírován nebo přesunut, nebo kvůli chybě v programu, který jej vytvořil.\n\nChcete časová razítka opravit?"
+msgstr "Toto může znamenat, že se obsahy nadřazeného disku změnily po vytvoření rozdílového disku.\n\nTato chyba také může nastat, pokud byl obraz disku kopírován nebo přesunut, nebo kvůli chybě v programu, který jej vytvořil.\n\nChcete časová razítka opravit?"
 
 msgid "Parent and child disk timestamps do not match"
 msgstr "Časová razítka nadřazeného a podřazeného disku nesouhlasí"
 
 msgid "Could not fix VHD timestamp."
-msgstr "Nebylo možné opravit časové razítko VHD."
-
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
+msgstr "Nebylo možné opravit časové razítko VHD disku."
 
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
@@ -1096,44 +1485,29 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
+msgid "160 KB"
+msgstr "160 KB"
 
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
+msgid "180 KB"
+msgstr "180 KB"
 
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
+msgid "320 KB"
+msgstr "320 KB"
 
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
+msgid "360 KB"
+msgstr "360 KB"
 
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
+msgid "640 KB"
+msgstr "640 KB"
 
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
+msgid "720 KB"
+msgstr "720 KB"
 
 msgid "1.2 MB"
 msgstr "1.2 MB"
@@ -1227,3 +1601,1383 @@ msgstr "Rychlý"
 
 msgid "&Auto-pause on focus loss"
 msgstr "&Automatická pauza při ztrátě zaměření okna"
+
+msgid "WinBox is no longer supported"
+msgstr "WinBox již není podporován"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "Vývoj manažéru WinBox skončil v roce 2022 kvůli nedostatku vývojářů. Jelikož směřujeme naše úsilí k tomu, abychom udělali 86Box ještě lepší, rozhodli jsme se dále nepodporovat WinBox jakožto manažér.\n\nŽádné další aktualizace nebudou skrze WinBox nabízeny a můžete se setkat s nesprávným chováním při běhu s novejšími verzemi emulátoru 86Box. Jakékoliv nahlášené chyby související s manažérem WinBox budou řešeny jako neplatné.\n\nVizte 86box.net pro seznam jiných manažérů, které můžete používat."
+
+msgid "Generate"
+msgstr "Generovat"
+
+msgid "Joystick configuration"
+msgstr "Konfigurace joysticku"
+
+msgid "Device"
+msgstr "Zařízení"
+
+msgid "%1 (X axis)"
+msgstr "%1 (os X)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (os Y)"
+
+msgid "MCA devices"
+msgstr "Zařízení MCA"
+
+msgid "List of MCA devices:"
+msgstr "Seznam zařízení MCA:"
+
+msgid "&Tablet tool"
+msgstr "Nástroj pro tablety"
+
+msgid "About &Qt"
+msgstr "O platformě &Qt"
+
+msgid "&MCA devices..."
+msgstr "Zařízení MCA ..."
+
+msgid "Show non-&primary monitors"
+msgstr "Zobrazit neprimární monitory"
+
+msgid "Open screenshots &folder..."
+msgstr "Otevřít složku se snímky obrazovky"
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Použít režim roztá&hnutí při celé obrazovce pro maximalizované okno"
+
+msgid "&Cursor/Puck"
+msgstr "&Kurzor/Puk"
+
+msgid "&Pen"
+msgstr "&Pero"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "&Jednotka CD/DVD hostitele (%1:)"
+
+msgid "&Connected"
+msgstr "&Připojeno"
+
+msgid "Clear image &history"
+msgstr "Vymaž &historie snímků"
+
+msgid "Create..."
+msgstr "Vytvořit..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "Jednotka CD/DVD hostitele (%1)"
+
+msgid "Unknown Bus"
+msgstr "Neznámá sběrnice"
+
+msgid "Null Driver"
+msgstr "Nulový ovladač"
+
+msgid "NIC:"
+msgstr "Síťový adaptér:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "Síťový adaptér %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&Síťový adaptér %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "Chování vykreslování"
+
+msgid "Use target framerate:"
+msgstr "Použít cílovou snímkovou frekvenci:"
+
+msgid " fps"
+msgstr " fps"
+
+msgid "VSync"
+msgstr "VSync"
+
+msgid "Synchronize with video"
+msgstr "Synchronizovat s obrazem"
+
+msgid "Shaders"
+msgstr "Shadery"
+
+msgid "Remove"
+msgstr "Odstranit"
+
+msgid "Browse..."
+msgstr "Browse..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "Nepodařilo se vytvořit kontext OpenGL."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "Nepodařilo se přepnout na kontext OpenGL."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "Je vyžadována verze OpenGL 3.0 nebo vyšší. Aktuální verze je %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "Chyba při inicializaci OpenGL"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nNávrat k softwarovému vykreslování."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>Při výběru obrazů médií (CD-ROM, disketa atd.) se otevřené dialogové okno spustí ve stejném adresáři jako konfigurační soubor 86Box. Toto nastavení bude mít pravděpodobně význam pouze v systému MacOS.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "Tento počítač mohl být přemístěn nebo zkopírován."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "Pro zajištění správné funkce sítě potřebuje 86Box vědět, zda byl tento počítač přesunut nebo zkopírován.\n\nJestliže si nejste jisti, zvolte možnost \"Zkopíroval jsem jej\"."
+
+msgid "I Moved It"
+msgstr "Přesunul jsem jej"
+
+msgid "I Copied It"
+msgstr "Zkopíroval jsem jej"
+
+msgid "86Box Monitor #"
+msgstr "86Box Monitor "
+
+msgid "No MCA devices."
+msgstr "Žádné zařízení MCA."
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "Síťový adaptér 1"
+
+msgid "Network Card #2"
+msgstr "Síťový adaptér 2"
+
+msgid "Network Card #3"
+msgstr "Síťový adaptér 3"
+
+msgid "Network Card #4"
+msgstr "Síťový adaptér 4"
+
+msgid "Mode:"
+msgstr "Režim:"
+
+msgid "Interface:"
+msgstr "Rozhraní:"
+
+msgid "Adapter:"
+msgstr "Adaptér:"
+
+msgid "VDE Socket:"
+msgstr "Zásuvka VDE:"
+
+msgid "86Box Unit Tester"
+msgstr "86Box Unit Tester"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Karta s klíčem pro Novell NetWare 2.x"
+
+msgid "Serial port passthrough 1"
+msgstr "Průchod sériového portu 1"
+
+msgid "Serial port passthrough 2"
+msgstr "Průchod sériového portu 2"
+
+msgid "Serial port passthrough 3"
+msgstr "Průchod sériového portu 3"
+
+msgid "Serial port passthrough 4"
+msgstr "Průchod sériového portu 4"
+
+msgid "Renderer &options..."
+msgstr "Možnosti rendereru..."
+
+msgid "PC/XT Keyboard"
+msgstr "PC/XT klávesnice"
+
+msgid "AT Keyboard"
+msgstr "AT klávesnice"
+
+msgid "AX Keyboard"
+msgstr "AX klávesnice"
+
+msgid "PS/2 Keyboard"
+msgstr "PS/2 klávesnice"
+
+msgid "PS/55 Keyboard"
+msgstr "PS/55 klávesnice"
+
+msgid "Keys"
+msgstr "Klávesy"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Sběrnicová myš Logitech/Microsoft"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Sběrnicová myš Microsoft (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Sériová myš Mouse Systems"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Sběrnicová myš Mouse Systems"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Sériová myš Microsoft"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Sériová myš Microsoft BallPoint"
+
+msgid "Logitech Serial Mouse"
+msgstr "Sériová myš Logitech"
+
+msgid "PS/2 Mouse"
+msgstr "PS/2 myš"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "PS/2 myš QuickPort"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (sériová)"
+
+msgid "Default Baud rate"
+msgstr "Výchozí přenosová rychlost"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] Modem kompatibilní se standardem Hayes"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Emulace Roland MT-32"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Emulace Roland MT-32 (nový)"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Emulace Roland CM-32L"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Emulace Roland CM-32LN"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "Dceřinná deska OPL4-ML"
+
+msgid "System MIDI"
+msgstr "Systémové MIDI"
+
+msgid "MIDI Input Device"
+msgstr "Vstupní zařízení MIDI"
+
+msgid "BIOS file"
+msgstr "Soubor BIOS"
+
+msgid "BIOS file (ROM #1)"
+msgstr "Soubor BIOS (ROM 1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "Soubor BIOS (ROM 2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "Soubor BIOS (ROM 3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "Soubor BIOS (ROM 4)"
+
+msgid "BIOS address"
+msgstr "Adresa BIOS"
+
+msgid "BIOS address (ROM #1)"
+msgstr "Adresa BIOS (ROM 4)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "Adresa BIOS (ROM 4)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "Adresa BIOS (ROM 4)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "Adresa BIOS (ROM 4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "Povolit zápis do paměti ROM s rozšířením BIOS"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "Povolit zápis do paměti ROM s rozšířením BIOS (ROM 1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "Povolit zápis do paměti ROM s rozšířením BIOS (ROM 2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "Povolit zápis do paměti ROM s rozšířením BIOS (ROM 3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "Povolit zápis do paměti ROM s rozšířením BIOS (ROM 4)"
+
+msgid "Linear framebuffer base"
+msgstr "Začátek lineárního framebufferu"
+
+msgid "Address"
+msgstr "Adresa"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "Přerušení sériového portu"
+
+msgid "Parallel port IRQ"
+msgstr "Přerušení paralelního portu"
+
+msgid "BIOS Revision"
+msgstr "Revize BIOS"
+
+msgid "BIOS Version"
+msgstr "Verze BIOS"
+
+msgid "BIOS Language"
+msgstr "Jazyk BIOS"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "Rozšiřující jednotka IBM 5161"
+
+msgid "IBM Cassette Basic"
+msgstr "Kazetový Basic IBM"
+
+msgid "Translate 26 -> 17"
+msgstr "Překládat 26 -> 17"
+
+msgid "Language"
+msgstr "Jazyk"
+
+msgid "Enable backlight"
+msgstr "Povolit podsvícení"
+
+msgid "Invert colors"
+msgstr "Převrátit barvy"
+
+msgid "BIOS size"
+msgstr "Velikost BIOS"
+
+msgid "BIOS size (ROM #1)"
+msgstr "Velikost BIOS (ROM 1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "Velikost BIOS (ROM 2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "Velikost BIOS (ROM 3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "Velikost BIOS (ROM 4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "Namapovat C0000-C7FFF jako UMB"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "Namapovat C8000-CFFFF jako UMB"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "Namapovat D0000-D7FFF jako UMB"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "Namapovat D8000-DFFFF jako UMB"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "Namapovat E0000-E7FFF jako UMB"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "Namapovat E8000-EFFFF jako UMB"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "Jumper JS9 (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "Výstupní zařízení MIDI"
+
+msgid "MIDI Real time"
+msgstr "MIDI v reálném čase"
+
+msgid "MIDI Thru"
+msgstr "Průchod vstupu MIDI"
+
+msgid "MIDI Clockout"
+msgstr "Výstup MIDI hodin"
+
+msgid "SoundFont"
+msgstr "SoundFont"
+
+msgid "Output Gain"
+msgstr "Zesílení výstupu"
+
+msgid "Chorus"
+msgstr "Sbor"
+
+msgid "Chorus Voices"
+msgstr "Hlasy sboru"
+
+msgid "Chorus Level"
+msgstr "Úroveň sboru"
+
+msgid "Chorus Speed"
+msgstr "Rychlost sboru"
+
+msgid "Chorus Depth"
+msgstr "Hloubka sboru"
+
+msgid "Chorus Waveform"
+msgstr "Průběh sboru"
+
+msgid "Reverb"
+msgstr "Dozvuk"
+
+msgid "Reverb Room Size"
+msgstr "Velikost místnosti pro dozvuk"
+
+msgid "Reverb Damping"
+msgstr "Tlumení dozvuku"
+
+msgid "Reverb Width"
+msgstr "Šířka dozvuku"
+
+msgid "Reverb Level"
+msgstr "Úroveň dozvuku"
+
+msgid "Interpolation Method"
+msgstr "Metoda interpolace"
+
+msgid "Dynamic Sample Loading"
+msgstr "Dynamické načítání vzorků"
+
+msgid "Reverb Output Gain"
+msgstr "Zesílení výstupu dozvuku"
+
+msgid "Reversed stereo"
+msgstr "Obrácené stereo"
+
+msgid "Nice ramp"
+msgstr "Pěkná rampa"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "Tlačítka"
+
+msgid "Serial Port"
+msgstr "Sériový port"
+
+msgid "RTS toggle"
+msgstr "Přepínač RTS"
+
+msgid "Revision"
+msgstr "Revize"
+
+msgid "Controller"
+msgstr "Řadič"
+
+msgid "Show Crosshair"
+msgstr "Zobrazit zaměřovací kříž"
+
+msgid "DMA"
+msgstr "DMA kanál"
+
+msgid "MAC Address"
+msgstr "Adresa MAC"
+
+msgid "MAC Address OUI"
+msgstr "OUI adresy MAC"
+
+msgid "Enable BIOS"
+msgstr "Povolit BIOS"
+
+msgid "Baud Rate"
+msgstr "Přenosová rychlost"
+
+msgid "TCP/IP listening port"
+msgstr "Naslouchací port TCP/IP"
+
+msgid "Phonebook File"
+msgstr "Soubor s telefonním seznamem"
+
+msgid "Telnet emulation"
+msgstr "Emulace Telnetu"
+
+msgid "RAM Address"
+msgstr "Adresa RAMu"
+
+msgid "RAM size"
+msgstr "Velikost RAMu"
+
+msgid "Initial RAM size"
+msgstr "Počáteční velikost RAM"
+
+msgid "Serial Number"
+msgstr "Sériové číslo"
+
+msgid "Host ID"
+msgstr "ID hostitele"
+
+msgid "FDC Address"
+msgstr "Adresa FDC"
+
+msgid "MPU-401 Address"
+msgstr "Adresa MPU-401"
+
+msgid "MPU-401 IRQ"
+msgstr "Přerušení MPU-401"
+
+msgid "Receive MIDI input"
+msgstr "Přijímat vstup MIDI"
+
+msgid "Low DMA"
+msgstr "Nízký DMA kanál"
+
+msgid "Enable Game port"
+msgstr "Povolit herní port"
+
+msgid "SID Model"
+msgstr "Model SID"
+
+msgid "SID Filter Strength"
+msgstr "Síla filtru SID"
+
+msgid "Surround module"
+msgstr "Modul Surround"
+
+msgid "CODEC"
+msgstr "CODEC"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "Vyvolát přerušení CODEC při nastavení CODEC (potřebují některé ovladače)"
+
+msgid "SB Address"
+msgstr "Adresa SB"
+
+msgid "Adlib Address"
+msgstr "Adresa Adlib"
+
+msgid "Use EEPROM setting"
+msgstr "Použít nastavení EEPROM"
+
+msgid "WSS IRQ"
+msgstr "IRQ WSS"
+
+msgid "WSS DMA"
+msgstr "DMA kanál WSS"
+
+msgid "Enable OPL"
+msgstr "Povolit OPL"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "Příjem vstupu MIDI (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "Nízký DMA kanál SB"
+
+msgid "6CH variant (6-channel)"
+msgstr "Varianta 6CH (6 kanálů)"
+
+msgid "Enable CMS"
+msgstr "Povolit CMS"
+
+msgid "Mixer"
+msgstr "Mixér"
+
+msgid "High DMA"
+msgstr "Vysoký DMA kanál"
+
+msgid "Control PC speaker"
+msgstr "Ovládat PC Speaker"
+
+msgid "Memory size"
+msgstr "Velikost pamĕti"
+
+msgid "EMU8000 Address"
+msgstr "Adresa EMU8000"
+
+msgid "IDE Controller"
+msgstr "Řadič IDE"
+
+msgid "Codec"
+msgstr "Kodek"
+
+msgid "GUS type"
+msgstr "Type GUSu"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "Povolit příkaz 0x04 \"Ukončit 86Box\""
+
+msgid "Display type"
+msgstr "Typ obrazu"
+
+msgid "Composite type"
+msgstr "Typ kompozitního obrazu"
+
+msgid "RGB type"
+msgstr "Typ obrazu RGB"
+
+msgid "Line doubling type"
+msgstr "Typ zdvojení řádku"
+
+msgid "Snow emulation"
+msgstr "Emulace sněhu"
+
+msgid "Monitor type"
+msgstr "Typ monitoru"
+
+msgid "Character set"
+msgstr "Znaková sada"
+
+msgid "XGA type"
+msgstr "Typ XGA"
+
+msgid "Instance"
+msgstr "Instance"
+
+msgid "MMIO Address"
+msgstr "Adresa MMIO"
+
+msgid "RAMDAC type"
+msgstr "Typ RAMDAC"
+
+msgid "Blend"
+msgstr "Smísit"
+
+msgid "Font"
+msgstr "Písmo"
+
+msgid "Bilinear filtering"
+msgstr "Bilineární filtrování"
+
+msgid "Video chroma-keying"
+msgstr "Barevné klíčování obrazu"
+
+msgid "Dithering"
+msgstr "Dithering"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "Povolit NMI pro emulace CGA"
+
+msgid "Voodoo type"
+msgstr "Typ karty Voodoo"
+
+msgid "Framebuffer memory size"
+msgstr "Velikost paměti framebufferu"
+
+msgid "Texture memory size"
+msgstr "Velikost paměti textur"
+
+msgid "Dither subtraction"
+msgstr "Odečítání ditheru"
+
+msgid "Screen Filter"
+msgstr "Filtr obrazovky"
+
+msgid "Render threads"
+msgstr "Vlákna vykreslování"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Počáteční adresa"
+
+msgid "Contiguous Size"
+msgstr "Souvislá velikost"
+
+msgid "I/O Width"
+msgstr "Šířka I/O"
+
+msgid "Transfer Speed"
+msgstr "Rychlost přenosu"
+
+msgid "EMS mode"
+msgstr "Režim EMS"
+
+msgid "EMS Address"
+msgstr "Adresa EMS"
+
+msgid "EMS 1 Address"
+msgstr "Adresa EMS 1"
+
+msgid "EMS 2 Address"
+msgstr "Adresa EMS 2"
+
+msgid "EMS Memory Size"
+msgstr "Velikost paměti EMS"
+
+msgid "EMS 1 Memory Size"
+msgstr "Velikost paměti EMS 1"
+
+msgid "EMS 2 Memory Size"
+msgstr "Velikost paměti EMS 2"
+
+msgid "Enable EMS"
+msgstr "Povolit EMS"
+
+msgid "Enable EMS 1"
+msgstr "Povolit EMS 1"
+
+msgid "Enable EMS 2"
+msgstr "Povolit EMS 2"
+
+msgid "Address for > 2 MB"
+msgstr "Adresa pro > 2 MB"
+
+msgid "Frame Address"
+msgstr "Adresa rámce"
+
+msgid "USA"
+msgstr "Spojené státy"
+
+msgid "Danish"
+msgstr "Dánština"
+
+msgid "Always at selected speed"
+msgstr "Vždy při zvolené rychlosti"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "Nastavení BIOS + klávesové zkratky (vypnuto během POST)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 KB od F0000"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 KB od E0000 (invertovaný MSB adresy, nejprve posledních 64 KB)"
+
+msgid "Sine"
+msgstr "Sinusový"
+
+msgid "Triangle"
+msgstr "Trojúhelníkový"
+
+msgid "Linear"
+msgstr "Lineární"
+
+msgid "4th Order"
+msgstr "4. řádu"
+
+msgid "7th Order"
+msgstr "7. řádu"
+
+msgid "Non-timed (original)"
+msgstr "Bez časování (originální)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (JMP2 není osazen)"
+
+msgid "Two"
+msgstr "Dvě"
+
+msgid "Three"
+msgstr "Tři"
+
+msgid "Wheel"
+msgstr "Kolečko"
+
+msgid "Five + Wheel"
+msgstr "Pět s kolečkem"
+
+msgid "Five + 2 Wheels"
+msgstr "Pět se 2 kolečky"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 sériová / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) sériová"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "Zakázat BIOS"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2 MB"
+
+msgid "8 MB"
+msgstr "8 MB"
+
+msgid "28 MB"
+msgstr "28 MB"
+
+msgid "1 MB"
+msgstr "1 MB"
+
+msgid "4 MB"
+msgstr "4 MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16 MB"
+
+msgid "20 MB"
+msgstr "20 MB"
+
+msgid "24 MB"
+msgstr "24 MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (stereo)"
+
+msgid "Classic"
+msgstr "Klasické"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "Kompozitní"
+
+msgid "True color"
+msgstr "True Color"
+
+msgid "Old"
+msgstr "Starý"
+
+msgid "New"
+msgstr "Nový"
+
+msgid "Color (generic)"
+msgstr "Barevný (obecný)"
+
+msgid "Green Monochrome"
+msgstr "Zelený monochromatický"
+
+msgid "Amber Monochrome"
+msgstr "Jantarový monochromatický"
+
+msgid "Gray Monochrome"
+msgstr "Šedý monochromatický"
+
+msgid "Color (no brown)"
+msgstr "Barevný (bez hnědé)"
+
+msgid "Color (IBM 5153)"
+msgstr "Barevný (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Prosté zdvojení"
+
+msgid "sRGB interpolation"
+msgstr "Interpolace sRGB"
+
+msgid "Linear interpolation"
+msgstr "Lineární interpolace"
+
+msgid "Has secondary 8x8 character set"
+msgstr "Má druhou sadu 8x8 znaků"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Má dceřinnou desků Quadcolor II"
+
+msgid "Alternate monochrome contrast"
+msgstr "Alternativní monochromatický kontrast"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Monochromatický (5151/MDA) (bílý)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Monochromatický (5151/MDA) (zelený)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Monochromatický (5151/MDA) (jantarový)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Barevný 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Barevný 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Rozšířený barevný - normální režim (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Rozšířený barevný - rozšířený režim (5154/ECD)"
+
+msgid "Green"
+msgstr "Zelený"
+
+msgid "Amber"
+msgstr "Jantarový"
+
+msgid "Gray"
+msgstr "Šedý"
+
+msgid "Grayscale"
+msgstr "Odstíny šedi"
+
+msgid "Color"
+msgstr "Barevný"
+
+msgid "U.S. English"
+msgstr "Americká angličtina"
+
+msgid "Scandinavian"
+msgstr "Skandinávské"
+
+msgid "Other languages"
+msgstr "Ostatní jazyky"
+
+msgid "Bochs latest"
+msgstr "Nejnovější Bochs"
+
+msgid "Apply overscan deltas"
+msgstr "Použít delty přesahu"
+
+msgid "Mono Interlaced"
+msgstr "Monochromatický s prokládaním"
+
+msgid "Mono Non-Interlaced"
+msgstr "Monochromatický bez prokládání"
+
+msgid "Color Interlaced"
+msgstr "Barevný s prokládaním"
+
+msgid "Color Non-Interlaced"
+msgstr "Barevný bez prokládání"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "Grafický akcelerátor 3dfx Voodoo"
+
+msgid "3Dfx Voodoo 2"
+msgstr "Grafický akcelerátor 3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 jednotky TMU)"
+
+msgid "8-bit"
+msgstr "8-bitové"
+
+msgid "16-bit"
+msgstr "16-bitové"
+
+msgid "Standard (150ns)"
+msgstr "Standardní (150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "Vysokorychlostní (120ns)"
+
+msgid "Enabled"
+msgstr "Zapnuta"
+
+msgid "Standard"
+msgstr "Standardní"
+
+msgid "High-Speed"
+msgstr "Vysokorychlostní"
+
+msgid "Stereo LPT DAC"
+msgstr "Stereofonní převodník LPT"
+
+msgid "Generic Text Printer"
+msgstr "Obecná textová tiskárna"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Obecná jehličková tiskárna ESC/P 2"
+
+msgid "Generic PostScript Printer"
+msgstr "Obecná tiskárna PostScript"
+
+msgid "Generic PCL5e Printer"
+msgstr "Obecná tiskárna PCL5e"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Internetový protokol paralelní linky"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Ochranný klíč pro Savage Quest"
+
+msgid "Serial Passthrough Device"
+msgstr "Zařízení průchodu sériového portu"
+
+msgid "Passthrough Mode"
+msgstr "Režim průchodu"
+
+msgid "Host Serial Device"
+msgstr "Hostitelské sériové zařízení"
+
+msgid "Name of pipe"
+msgstr "Název pojmenované roury"
+
+msgid "Data bits"
+msgstr "Datové bity"
+
+msgid "Stop bits"
+msgstr "Stop bity"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Přenosová rychlost průchodu"
+
+msgid "Named Pipe (Server)"
+msgstr "Pojmenovaná roura (server)"
+
+msgid "Named Pipe (Client)"
+msgstr "Pojmenovaná roura (klient)"
+
+msgid "Host Serial Passthrough"
+msgstr "Průchod sériového portu hostitele"
+
+msgid "E&ject %1"
+msgstr "&Vyjmout %1"
+
+msgid "&Unmute"
+msgstr "&Zrušit ztišení"
+
+msgid "Softfloat FPU"
+msgstr "Softfloat FPU"
+
+msgid "High performance impact"
+msgstr "Vysoký dopad na výkon"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Obecný] Disk RAM (max. rychlost)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Obecný] 1989 (3500 ot./m)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Obecný] 1992 (3600 ot./m)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Obecný] 1994 (4500 ot./m)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Obecný] 1996 (5400 ot./m)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Obecný] 1997 (5400 ot./m)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Obecný] 1998 (5400 ot./m)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Obecný] 2000 (7200 ot./m)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "Klon IBM 8514/A (ISA)"
+
+msgid "Vendor"
+msgstr "Výrobce"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Obecné rozšíření paměti PC/XT"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Obecné rozšíření paměti PC/AT"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "Nebylo možné nalézt písma pro jehličkovou tiskárnu"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "Pro emulaci obecné jehličkové tiskárny ESC/P 2 jsou vyžadována písma TrueType ve složce \"roms/printer/fonts\"."
+
+msgid "Inhibit multimedia keys"
+msgstr "Potlačit stisk multimediálních kláves"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Vyžadovat potvrzení před uložením nastavení"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Vyžadovat potvrzení před resetováním"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Vyžadovat potvrzení před ukončením"
+
+msgid "Options"
+msgstr "Možnosti"
+
+msgid "Model"
+msgstr "Model"
+
+msgid "Model:"
+msgstr "Model:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Selhala inicializace rendereru Vulkan."
+
+msgid "GLSL Error"
+msgstr "Chyba GLSL"
+
+msgid "Could not load shader: %1"
+msgstr "Nebylo možné načíst shader: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "Je vyžadováno OpenGL verze 3.0 nebo větší. Současná verze GLSL je %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "Nebylo možné načíst texturu: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "Nebylo možné zkompilovat shader:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "Program nebyl spojen:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "Správce shaderů"
+
+msgid "Shader Configuration"
+msgstr "Konfigurace shaderu"
+
+msgid "Add"
+msgstr "Přidat"
+
+msgid "Move up"
+msgstr "Posunout výš"
+
+msgid "Move down"
+msgstr "Posunout níž"
+
+msgid "Could not load file %1"
+msgstr "Nebylo možné načíst soubor %1"
+
+msgid "Key Bindings:"
+msgstr "Nastavení kláves"
+
+msgid "Action"
+msgstr "Akce"
+
+msgid "Keybind"
+msgstr "Klávesy"
+
+msgid "Clear binding"
+msgstr "Smazat nastavení"
+
+msgid "Bind"
+msgstr "Nastavit"
+
+msgid "Bind Key"
+msgstr "Nastavit klávesu"
+
+msgid "Enter key combo:"
+msgstr "Zadejte kombinaci kláves"
+
+msgid "Bind conflict"
+msgstr "Konflikt nastavení"
+
+msgid "This key combo is already in use."
+msgstr "Tato kombinace kláves je již použita."
+
+msgid "Send Control+Alt+Del"
+msgstr "Stisknout Ctrl+Alt+Del"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Stisknout Ctrl+Alt+Esc"
+
+msgid "Toggle fullscreen"
+msgstr "Přepnout režim celé obrazovky"
+
+msgid "Screenshot"
+msgstr "Pořídit snímek obrazovky"
+
+msgid "Release mouse pointer"
+msgstr "Uvolnit kurzor myši"
+
+msgid "Toggle pause"
+msgstr "Pozastavit nebo obnovit"
+
+msgid "Toggle mute"
+msgstr "Přepnout ztišení"
+
+msgid "Text files"
+msgstr "Textové soubory"
+
+msgid "ROM files"
+msgstr "Soubory ROM"
+
+msgid "SoundFont files"
+msgstr "Soubory SoundFont"
+
+msgid "Local Switch"
+msgstr "Lokální switch"
+
+msgid "Remote Switch"
+msgstr "Vzdálený switch"
+
+msgid "Switch:"
+msgstr "Switch:"
+
+msgid "Hub Mode"
+msgstr "Režim hubu"
+
+msgid "Hostname:"
+msgstr "Hostitelské jméno"
+
+msgid "ISA RAM:"
+msgstr "ISA paměť RAM:"
+
+msgid "ISA ROM:"
+msgstr "ISA paměť ROM:"
+
+msgid "&Wipe NVRAM"
+msgstr "&Vymazat NVRAM"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "Tímto se smažou všechny soubory NVRAM (a související soubory) virtuálního počítače umístěné v podadresáři \"nvr\". V případě potřeby budete muset znovu nakonfigurovat nastavení systému BIOS (a případně i dalších zařízení uvnitř virtuálního počítače).\n\nOpravdu chcete smazat veškerý obsah NVRAM virtuálního počítače \"%1\"?"
+
+msgid "Success"
+msgstr "Úspěch"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "Úspěšně vymazán obsah NVRAM virtuálního počítače \"%1\""
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "Při pokusu o vymazání obsahu NVRAM virtuálního počítače \"%1\" došlo k chybě"
+
+msgid "%1 VM Manager"
+msgstr "Správce virtuálních počítačů %1"
+
+msgid "%n disk(s)"
+msgstr "%n disk(ů)"
+
+msgid "Unknown Status"
+msgstr "Neznámý stav"
+
+msgid "No Machines Found!"
+msgstr "Žádné počítače nebyly nalezeny!"
+
+msgid "Check for updates on startup"
+msgstr "Zkontrolovat aktualizace při spuštění"
+
+msgid "Unable to determine release information"
+msgstr "Nebylo možné zjistit informace o vydání"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Při kontrole aktualizací došlo k chybě:\n\n%1\n\nZkuste to prosím znovu později."
+
+msgid "Update check complete"
+msgstr "Kontrola aktualizací dokončena"
+
+msgid "stable"
+msgstr "stabilní"
+
+msgid "beta"
+msgstr "beta"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Používáte nejnovější %1 verzi 86Boxu: %2"
+
+msgid "version"
+msgstr "verze"
+
+msgid "build"
+msgstr "build"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Právě používáte verzi <b>%1</b>."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "K dispozici je nyní <b>verze %1</b>."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Právě používáte build <b>%1</b>."
+
+msgid "<b>Build %1</b> is now available."
+msgstr "K dispozici je nyní <b>build %1</b>."
+
+msgid "Would you like to visit the download page?"
+msgstr "Chcete navštívit stránku pro stažení?"
+
+msgid "Visit download page"
+msgstr "Navštívit stránku pro stažení"
+
+msgid "Update check"
+msgstr "Kontrola aktualizací"
+
+msgid "Checking for updates..."
+msgstr "Probíhá kontrola aktualizací..."
+
+msgid "86Box Update"
+msgstr "Aktualizace 86Box"
+
+msgid "Release notes:"
+msgstr "Poznámky k vydání:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "Havárie virtuálního počítače"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "Proces virtuálního počítače \"%1\" byl neočekávaně ukončen s kódem ukončení %2."
+
+msgid "The system will not be added."
+msgstr "Systém nebude přidán."
+
+msgid "&Update mouse every CPU frame"
+msgstr "&Aktualizovat myš při každém CPU rámci"
+
+msgid "Hue"
+msgstr "Odstín"
+
+msgid "Saturation"
+msgstr "Sytost"
+
+msgid "Contrast"
+msgstr "Kontrast"
+
+msgid "Brightness"
+msgstr "Jas"
+
+msgid "Sharpness"
+msgstr "Ostrost"
+
+msgid "&CGA composite settings..."
+msgstr "Nastavení kompozitního výstupu &CGA..."
+
+msgid "CGA composite settings"
+msgstr "Nastavení kompozitního výstupu CGA"
+
+msgid "Monitor EDID"
+msgstr "EDID monitoru"
+
+msgid "Export..."
+msgstr "Exportovat..."
+
+msgid "Export EDID"
+msgstr "Exportovat EDID"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "Soubor EDID \"%ls\" je příliš velký."
+
+msgid "OpenGL input scale"
+msgstr "Vstupní měřítko OpenGL"
+
+msgid "OpenGL input stretch mode"
+msgstr "režim roztažení vstupu OpenGL"
+
+msgid "Color scheme"
+msgstr "Barevné schéma"
+
+msgid "Light"
+msgstr "Světlo"
+
+msgid "Dark"
+msgstr "Tmavá"
diff --git a/src/qt/languages/de-DE.po b/src/qt/languages/de-DE.po
index ed8e57ffa..4385811c0 100644
--- a/src/qt/languages/de-DE.po
+++ b/src/qt/languages/de-DE.po
@@ -1,3 +1,11 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: de_DE\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
 msgstr "&Aktionen"
 
@@ -5,25 +13,31 @@ msgid "&Keyboard requires capture"
 msgstr "&Tastatur benötigt das Einfangen des Mauszeigers"
 
 msgid "&Right CTRL is left ALT"
-msgstr "&Die rechte Strg-Taste ist die Linke Alt-Taste"
+msgstr "&Die rechte Strg-Taste ist die linke Alt-Taste"
 
 msgid "&Hard Reset..."
-msgstr "&Hard-Reset..."
+msgstr "&Kaltstart..."
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Strg+Alt+Entf\tStrg+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "&Strg+Alt+Entf"
 
 msgid "Ctrl+Alt+&Esc"
 msgstr "Strg+Alt+&Esc"
 
 msgid "&Pause"
-msgstr "&Pause"
+msgstr "&Pausieren"
 
-msgid "E&xit..."
-msgstr "Be&enden..."
+msgid "Pause"
+msgstr "Pausieren"
+
+msgid "Re&sume"
+msgstr "&Fortsetzen"
+
+msgid "E&xit"
+msgstr "&Beenden"
 
 msgid "&View"
-msgstr "&Ansicht"
+msgstr "A&nsicht"
 
 msgid "&Hide status bar"
 msgstr "&Statusleiste ausblenden"
@@ -32,33 +46,27 @@ msgid "Hide &toolbar"
 msgstr "&Werkzeugleiste ausblenden"
 
 msgid "&Resizeable window"
-msgstr "&Größenverstellbares Fenster"
+msgstr "G&rößenverstellbares Fenster"
 
 msgid "R&emember size && position"
-msgstr "&Größe && Position merken"
+msgstr "Größe && &Position merken"
 
 msgid "Re&nderer"
 msgstr "Re&nderer"
 
-msgid "&SDL (Software)"
-msgstr "&SDL (Software)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (&Hardware)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
+msgid "&Qt (Software)"
+msgstr "&Qt (Software)"
 
 msgid "Open&GL (3.0 Core)"
-msgstr "Open&GL (3.0-Kern)"
+msgstr "Open&GL (3.0 Core)"
 
 msgid "&VNC"
 msgstr "&VNC"
 
-msgid "Specify dimensions..."
-msgstr "Fenstergröße einstellen..."
+msgid "Specify &dimensions..."
+msgstr "Fenstergröße &einstellen..."
 
-msgid "F&orce 4:3 display ratio"
+msgid "Force &4:3 display ratio"
 msgstr "&4:3-Seitenverhältnis erzwingen"
 
 msgid "&Window scale factor"
@@ -94,11 +102,11 @@ msgstr "&7x"
 msgid "&8x"
 msgstr "&8x"
 
-msgid "Filter method"
-msgstr "Filteringmethode"
+msgid "Fi&lter method"
+msgstr "Filterungsmet&hode"
 
 msgid "&Nearest"
-msgstr "&Nächst"
+msgstr "&Nächster Nachbar"
 
 msgid "&Linear"
 msgstr "&Linear"
@@ -106,14 +114,14 @@ msgstr "&Linear"
 msgid "Hi&DPI scaling"
 msgstr "Hi&DPI-Skalierung"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "&Vollbild\tStrg+Alt+Bild auf"
+msgid "&Fullscreen"
+msgstr "Vo&llbild"
 
 msgid "Fullscreen &stretch mode"
-msgstr "&Stretching-Modus im Vollbildmodus"
+msgstr "Vollbild-S&kalierungsmodus"
 
 msgid "&Full screen stretch"
-msgstr "&Vollbild-Stretching"
+msgstr "&Vollbild-Streckung"
 
 msgid "&4:3"
 msgstr "&4:3-Seitenverhältnis erzwingen"
@@ -127,8 +135,8 @@ msgstr "&Integer-Skalierung"
 msgid "4:&3 Integer scale"
 msgstr "4:&3 Integer-Skalierung"
 
-msgid "E&GA/(S)VGA settings"
-msgstr "E&GA/(S)VGA-Einstellungen"
+msgid "EGA/(S)&VGA settings"
+msgstr "EGA/(S)&VGA-Einstellungen"
 
 msgid "&Inverted VGA monitor"
 msgstr "&Invertierte VGA-Anzeige"
@@ -137,11 +145,17 @@ msgid "VGA screen &type"
 msgstr "&VGA-Bildschirmtyp"
 
 msgid "RGB &Color"
-msgstr "&RGB-Farbe"
+msgstr "RGB-&Farbe"
+
+msgid "RGB (no brown)"
+msgstr "RGB (ohne Braun)"
 
 msgid "&RGB Grayscale"
 msgstr "&RGB-Graustufen"
 
+msgid "Generic RGBI color monitor"
+msgstr "Generischer RGBI-Farbmonitor"
+
 msgid "&Amber monitor"
 msgstr "&Bernstein-Monitor"
 
@@ -164,10 +178,10 @@ msgid "&Average"
 msgstr "&Durchschnittsmethode"
 
 msgid "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
-msgstr "Overscan für CGA/PCjr/Tandy/E&GA/(S)VGA-Displays"
+msgstr "Overscan für CGA/PCjr/Tandy/E&GA/(S)VGA-Monitore"
 
 msgid "Change contrast for &monochrome display"
-msgstr "Kontrast für &monochrome Displays ändern"
+msgstr "Kontrast für &monochrome Monitore ändern"
 
 msgid "&Media"
 msgstr "&Medien"
@@ -178,26 +192,32 @@ msgstr "&Werkzeuge"
 msgid "&Settings..."
 msgstr "&Optionen..."
 
+msgid "Settings..."
+msgstr "Einstellungen..."
+
 msgid "&Update status bar icons"
 msgstr "&Statusleistenicons aktualisieren"
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "S&creenshot aufnehmen\tStrg+F11"
+msgid "Take s&creenshot"
+msgstr "S&creenshot aufnehmen"
+
+msgid "S&ound"
+msgstr "&Ton"
 
 msgid "&Preferences..."
 msgstr "&Einstellungen..."
 
 msgid "Enable &Discord integration"
-msgstr "&Discord-Integration aktivieren"
+msgstr "&Discord-Integration einschalten"
 
 msgid "Sound &gain..."
 msgstr "&Klangverstärkung..."
 
-msgid "Begin trace\tCtrl+T"
-msgstr "Tracing starten\tStrg+T"
+msgid "Begin trace"
+msgstr "Tracing starten"
 
-msgid "End trace\tCtrl+T"
-msgstr "Tracing beenden\tStrg+T"
+msgid "End trace"
+msgstr "Tracing beenden"
 
 msgid "&Help"
 msgstr "&Hilfe"
@@ -209,13 +229,13 @@ msgid "&About 86Box..."
 msgstr "&Über 86Box..."
 
 msgid "&New image..."
-msgstr "&Neues Image..."
+msgstr "&Neues Abbild..."
 
 msgid "&Existing image..."
-msgstr "&Bestehendes Image..."
+msgstr "&Bestehendes Abbild..."
 
 msgid "Existing image (&Write-protected)..."
-msgstr "Bestehendes Image (&schreibgeschützt)..."
+msgstr "Bestehendes Abbild (&schreibgeschützt)..."
 
 msgid "&Record"
 msgstr "&Aufnehmen"
@@ -233,7 +253,7 @@ msgid "E&ject"
 msgstr "A&uswerfen"
 
 msgid "&Image..."
-msgstr "&Cartridgeimage..."
+msgstr "&Abbild..."
 
 msgid "E&xport to 86F..."
 msgstr "&In das 86F-Format e&xportieren..."
@@ -244,8 +264,8 @@ msgstr "&Stummschalten"
 msgid "E&mpty"
 msgstr "L&eer"
 
-msgid "&Reload previous image"
-msgstr "&Voriges Image neu laden"
+msgid "Reload previous image"
+msgstr "Voriges Abbild neu laden"
 
 msgid "&Folder..."
 msgstr "&Verzeichnis..."
@@ -287,7 +307,7 @@ msgid "Sound Gain"
 msgstr "Klangverstärkung"
 
 msgid "New Image"
-msgstr "Neues Image"
+msgstr "Neues Abbild"
 
 msgid "Settings"
 msgstr "Optionen"
@@ -301,18 +321,12 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-msgid "Save these settings as &global defaults"
-msgstr "Einstellungen als &globalen Standard speichern"
-
 msgid "&Default"
 msgstr "&Standard"
 
 msgid "Language:"
 msgstr "Sprache:"
 
-msgid "Icon set:"
-msgstr "Icon-Satz:"
-
 msgid "Gain"
 msgstr "Verstärkung"
 
@@ -320,7 +334,7 @@ msgid "File name:"
 msgstr "Dateiname:"
 
 msgid "Disk size:"
-msgstr "Plattengröße:"
+msgstr "Datenträgergröße:"
 
 msgid "RPM mode:"
 msgstr "Drehzahlmodus:"
@@ -344,13 +358,16 @@ msgid "Machine:"
 msgstr "System:"
 
 msgid "Configure"
-msgstr "Einstellen"
+msgstr "Konfigurieren"
+
+msgid "CPU:"
+msgstr "Prozessor:"
 
 msgid "CPU type:"
-msgstr "CPU-Typ:"
+msgstr "Prozessor-Typ:"
 
 msgid "Speed:"
-msgstr "Takt:"
+msgstr "Geschwindigkeit:"
 
 msgid "Frequency:"
 msgstr "Frequenz:"
@@ -371,22 +388,34 @@ msgid "Time synchronization"
 msgstr "Zeitsynchronisierung"
 
 msgid "Disabled"
-msgstr "Deaktiviert"
+msgstr "Ohne"
 
 msgid "Enabled (local time)"
-msgstr "Aktiviert (Lokale Uhrzeit)"
+msgstr "Eingeschaltet (Lokale Uhrzeit)"
 
 msgid "Enabled (UTC)"
-msgstr "Aktiviert (UTC)"
+msgstr "Eingeschaltet (UTC)"
 
 msgid "Dynamic Recompiler"
 msgstr "Dynamischer Recompiler"
 
-msgid "Video:"
-msgstr "Videokarte:"
+msgid "CPU frame size"
+msgstr "CPU-Framegröße"
 
-msgid "Voodoo Graphics"
-msgstr "Voodoo-Grafik"
+msgid "Larger frames (less smooth)"
+msgstr "Größere Frames (weniger flüssig)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Kleinere Frames (flüssiger)"
+
+msgid "Video:"
+msgstr "Grafikkarte:"
+
+msgid "Video #2:"
+msgstr "Grafikkarte 2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Voodoo 1 oder 2 Grafik"
 
 msgid "IBM 8514/A Graphics"
 msgstr "IBM 8514/A-Grafik"
@@ -394,12 +423,27 @@ msgstr "IBM 8514/A-Grafik"
 msgid "XGA Graphics"
 msgstr "XGA-Grafik"
 
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "IBM PS/55 Grafik-Adapter"
+
+msgid "Keyboard:"
+msgstr "Tastatur:"
+
+msgid "Keyboard"
+msgstr "Tastatur"
+
 msgid "Mouse:"
 msgstr "Maus:"
 
+msgid "Mouse"
+msgstr "Maus"
+
 msgid "Joystick:"
 msgstr "Joystick:"
 
+msgid "Joystick"
+msgstr "Joystick"
+
 msgid "Joystick 1..."
 msgstr "Joystick 1..."
 
@@ -425,13 +469,16 @@ msgid "Sound card #4:"
 msgstr "Soundkarte 4:"
 
 msgid "MIDI Out Device:"
-msgstr "MIDI Out-Gerät:"
+msgstr "MIDI Ausgabegerät:"
 
 msgid "MIDI In Device:"
-msgstr "MIDI In-Gerät:"
+msgstr "MIDI Eingabegerät:"
+
+msgid "MIDI Out:"
+msgstr ""
 
 msgid "Standalone MPU-401"
-msgstr "Standalone-MPU-401-Gerät"
+msgstr "Eigenständiges-MPU-401-Gerät"
 
 msgid "Use FLOAT32 sound"
 msgstr "FLOAT32-Wiedergabe benutzen"
@@ -445,15 +492,6 @@ msgstr "Nuked (genauer)"
 msgid "YMFM (faster)"
 msgstr "YMFM (schneller)"
 
-msgid "Network type:"
-msgstr "Netzwerktyp:"
-
-msgid "PCap device:"
-msgstr "PCap-Gerät:"
-
-msgid "Network adapter:"
-msgstr "Netzwerkadapter:"
-
 msgid "COM1 Device:"
 msgstr "COM1-Gerät:"
 
@@ -478,6 +516,9 @@ msgstr "LPT3-Gerät:"
 msgid "LPT4 Device:"
 msgstr "LPT4-Gerät:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr ""
+
 msgid "Serial port 1"
 msgstr "Serielle Schnittstelle 1"
 
@@ -502,11 +543,11 @@ msgstr "Parallelport 3"
 msgid "Parallel port 4"
 msgstr "Parallelport 4"
 
-msgid "HD Controller:"
-msgstr "HDD-Controller:"
-
 msgid "FD Controller:"
-msgstr "FD-Controller:"
+msgstr "Disketten-Controller:"
+
+msgid "CD-ROM Controller:"
+msgstr "CD-ROM-Controller:"
 
 msgid "Tertiary IDE Controller"
 msgstr "Tertiärer IDE-Controller"
@@ -514,6 +555,9 @@ msgstr "Tertiärer IDE-Controller"
 msgid "Quaternary IDE Controller"
 msgstr "Quartärer IDE-Controller"
 
+msgid "Hard disk"
+msgstr "Festplatte"
+
 msgid "SCSI"
 msgstr "SCSI"
 
@@ -535,6 +579,9 @@ msgstr "Kassette"
 msgid "Hard disks:"
 msgstr "Festplatten:"
 
+msgid "Firmware Version"
+msgstr "Firmware-Version"
+
 msgid "&New..."
 msgstr "&Neu..."
 
@@ -572,7 +619,7 @@ msgid "Type:"
 msgstr "Typ:"
 
 msgid "Image Format:"
-msgstr "Imageformat:"
+msgstr "Abbildformat:"
 
 msgid "Block Size:"
 msgstr "Blockgröße:"
@@ -589,14 +636,17 @@ msgstr "BPB überprüfen"
 msgid "CD-ROM drives:"
 msgstr "CD-ROM-Laufwerke:"
 
-msgid "Earlier drive"
-msgstr "Früheres Laufwerk"
-
 msgid "MO drives:"
 msgstr "MO-Laufwerke:"
 
-msgid "ZIP drives:"
-msgstr "ZIP-Laufwerke:"
+msgid "MO:"
+msgstr ""
+
+msgid "Removable disks:"
+msgstr "Wechseldatenträger:"
+
+msgid "Removable disk drives:"
+msgstr "Wechseldatenträger:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
@@ -605,7 +655,10 @@ msgid "ISA RTC:"
 msgstr "ISA-Echtzeituhr:"
 
 msgid "ISA Memory Expansion"
-msgstr "ISA-Speichererweiterung:"
+msgstr "ISA-Speichererweiterung"
+
+msgid "ISA ROM Cards"
+msgstr "ISA-ROM-Karte"
 
 msgid "Card 1:"
 msgstr "Steckkarte 1:"
@@ -619,18 +672,21 @@ msgstr "Steckkarte 3:"
 msgid "Card 4:"
 msgstr "Steckkarte 4:"
 
+msgid "Generic ISA ROM Board"
+msgstr "Generische ISA-ROM-Platine"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "Generische Dual-ISA-ROM-Platine"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "Generische Quad-ISA-ROM-Platine"
+
 msgid "ISABugger device"
 msgstr "ISABugger-Gerät"
 
 msgid "POST card"
 msgstr "POST-Code-Karte"
 
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
-
 msgid "86Box"
 msgstr "86Box"
 
@@ -641,22 +697,25 @@ msgid "Fatal error"
 msgstr "Fataler Fehler"
 
 msgid " - PAUSED"
-msgstr " - PAUSED"
-
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Bitte Strg+Alt+Bild ab zur Rückkehr in den Fenstermodus drücken."
+msgstr " - PAUSIERT"
 
 msgid "Speed"
 msgstr "Geschwindigkeit"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "Wechseldatenträger %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "ZIP-Images"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "&Wechseldatenträger %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Wechseldatenträgerabbilder"
+
+msgid "Image %1"
+msgstr "Abbild %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
-msgstr "86Box konnte keine nutzbaren ROM-Dateien finden.\n\nBitte besuchen Sie <a href=\"https://github.com/86Box/roms/releases/latest\">download</a>, laden ein ROM-Set herunter und extrahieren dies in das \"roms\"-Verzeichnis."
+msgstr "86Box konnte keine nutzbaren ROM-Dateien finden.\n\nBitte besuchen Sie <a href=\"https://github.com/86Box/roms/releases/latest\">die Download-Seite</a>, laden ein ROM-Set herunter und extrahieren es in das \"roms\"-Verzeichnis."
 
 msgid "(empty)"
 msgstr "(leer)"
@@ -668,19 +727,19 @@ msgid "Turbo"
 msgstr "Turbo"
 
 msgid "On"
-msgstr "An"
+msgstr "Ein"
 
 msgid "Off"
 msgstr "Aus"
 
 msgid "All images"
-msgstr "Alle Images"
+msgstr "Alle Abbilder"
 
 msgid "Basic sector images"
-msgstr "Basissektorimages"
+msgstr "Basissektorabbilder"
 
 msgid "Surface images"
-msgstr "Oberflächenimages"
+msgstr "Oberflächenabbilder"
 
 msgid "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
 msgstr "Das System \"%hs\" ist aufgrund von fehlenden ROMs im Verzeichnis roms/machines nicht verfügbar. Es wird auf ein verfügbares System gewechselt."
@@ -688,6 +747,12 @@ msgstr "Das System \"%hs\" ist aufgrund von fehlenden ROMs im Verzeichnis roms/m
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
 msgstr "Die Videokarte \"%hs\" ist aufgrund von fehlenden ROMs im Verzeichnis roms/video nicht verfügbar. Es wird auf eine verfügbare Videokarte gewechselt."
 
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "Das Gerät \"%hs\" ist aufgrund von fehlenden ROMs nicht verfügbar. Es wird ignoriert."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "Die Videokarte 2 \"%hs\" ist aufgrund von fehlenden ROMs im Verzeichnis roms/video nicht verfügbar. Es wird deaktiviert."
+
 msgid "Machine"
 msgstr "System"
 
@@ -698,13 +763,22 @@ msgid "Input devices"
 msgstr "Eingabegeräte"
 
 msgid "Sound"
-msgstr "Multimedia"
+msgstr "Ton"
 
 msgid "Network"
 msgstr "Netzwerk"
 
 msgid "Ports (COM & LPT)"
-msgstr "Anschlüsse (COM & LPT)"
+msgstr "Anschlüsse (COM + LPT)"
+
+msgid "Ports"
+msgstr "Anschlüsse"
+
+msgid "Serial ports:"
+msgstr "Serielle Anschlüsse:"
+
+msgid "Parallel ports:"
+msgstr "Parallele Anschlüsse:"
 
 msgid "Storage controllers"
 msgstr "Speichercontroller"
@@ -712,6 +786,15 @@ msgstr "Speichercontroller"
 msgid "Hard disks"
 msgstr "Festplatten"
 
+msgid "Disks:"
+msgstr ""
+
+msgid "Floppy:"
+msgstr "Diskette:"
+
+msgid "Controllers:"
+msgstr "Controller:"
+
 msgid "Floppy & CD-ROM drives"
 msgstr "Disketten- & CD-ROM-Laufwerke"
 
@@ -721,14 +804,17 @@ msgstr "Andere Wechsellaufwerke"
 msgid "Other peripherals"
 msgstr "Andere Peripheriegeräte"
 
+msgid "Other devices"
+msgstr "Andere Geräte"
+
 msgid "Click to capture mouse"
-msgstr "Zum Einfangen des Mauszeigers bitte klicken"
+msgstr "Klicken zum Einfangen des Mauszeigers"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "Bitte F8+F12 zur Mausfreigabe drücken"
+msgid "Press %1 to release mouse"
+msgstr "Drücke %1 zur Mausfreigabe"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Bitte F8+F12 oder die mittlere Maustaste zur Mausfreigabe drücken"
+msgid "Press %1 or middle button to release mouse"
+msgstr "Drücke %1 oder die mittlere Maustaste zur Mausfreigabe"
 
 msgid "Bus"
 msgstr "Bus"
@@ -748,77 +834,98 @@ msgstr "S"
 msgid "KB"
 msgstr "KB"
 
-msgid "Could not initialize the video renderer."
-msgstr "Der Videorenderer konnte nicht initialisiert werden."
-
 msgid "Default"
 msgstr "Standard"
 
-msgid "%i Wait state(s)"
-msgstr "%i Wartezustände"
+msgid "%1 Wait state(s)"
+msgstr "%1 Wartezustände"
 
 msgid "Type"
 msgstr "Typ"
 
-msgid "Failed to set up PCap"
-msgstr "PCap konnte nicht eingerichtet werden"
-
 msgid "No PCap devices found"
 msgstr "Keine PCap-Geräte gefunden"
 
 msgid "Invalid PCap device"
 msgstr "Ungültiges PCap-Gerät"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "Standard 2-Tasten-Joystick(s)"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "2-Achsen-, 2-Tasten-Joystick(s)"
 
-msgid "Standard 4-button joystick"
-msgstr "Standard 4-Tasten-Joystick"
+msgid "2-axis, 4-button joystick"
+msgstr "2-Achsen-, 4-Tasten-Joystick"
 
-msgid "Standard 6-button joystick"
-msgstr "Standard 6-Tasten-Joystick"
+msgid "2-axis, 6-button joystick"
+msgstr "2-Achsen-, 6-Tasten-Joystick"
 
-msgid "Standard 8-button joystick"
-msgstr "Standard 8-Tasten-Joystick"
+msgid "2-axis, 8-button joystick"
+msgstr "2-Achsen-, 8-Tasten-Joystick"
+
+msgid "3-axis, 2-button joystick"
+msgstr "3-Achsen-, 2-Tasten-Joystick"
+
+msgid "3-axis, 4-button joystick"
+msgstr "3-Achsen-, 4-Tasten-Joystick"
+
+msgid "4-axis, 4-button joystick"
+msgstr "4-Achsen-, 4-Tasten-Joystick"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH Pedale"
+
 msgid "Microsoft SideWinder Pad"
 msgstr "Microsoft SideWinder Pad"
 
 msgid "Thrustmaster Flight Control System"
 msgstr "Thrustmaster Flight Control System"
 
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Rudder Control System"
+
+msgid "2-button gamepad(s)"
+msgstr "2-Tasten-Gamepad(s)"
+
+msgid "2-button flight yoke"
+msgstr "2-Tasten-Steuerhorn"
+
+msgid "4-button gamepad"
+msgstr "4-Tasten-Gamepad"
+
+msgid "4-button flight yoke"
+msgstr "4-Tasten-Steuerhorn"
+
+msgid "2-button flight yoke with throttle"
+msgstr "2-Tasten-Steuerhorn mit Schubregler"
+
+msgid "4-button flight yoke with throttle"
+msgstr "4-Tasten-Steuerhorn mit Schubregler"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Win95 Lenkrad (3-Achsen, 4-Tasten)"
+
 msgid "None"
 msgstr "Ohne"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "Tastaturbeschleuniger konnten nicht geladen werden."
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CHS: %2, %3, %4)"
 
-msgid "Unable to register raw input."
-msgstr "Roheingaben konnten nicht registriert werden."
+msgid "Floppy %1 (%2): %3"
+msgstr "Diskette %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Diskette %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "&Diskette %1 (%2): %3"
 
 msgid "Advanced sector images"
-msgstr "Fortgeschrittene Sektorimages"
+msgstr "Fortgeschrittene Sektorabbilder"
 
 msgid "Flux images"
-msgstr "Fluximages"
-
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "SDL konnte nicht initialisiert werden, die Datei SDL2.dll wird benötigt"
+msgstr "Fluxabbilder"
 
 msgid "Are you sure you want to hard reset the emulated machine?"
-msgstr "Sind Sie sich sicher, dass Sie einen Hard-Reset für das emulierte System durchführen wollen?"
+msgstr "Sind Sie sich sicher, dass Sie einen Kaltstart für das emulierte System durchführen wollen?"
 
 msgid "Are you sure you want to exit 86Box?"
 msgstr "Sind Sie sich sicher, dass Sie 86Box beenden wollen?"
@@ -826,17 +933,32 @@ msgstr "Sind Sie sich sicher, dass Sie 86Box beenden wollen?"
 msgid "Unable to initialize Ghostscript"
 msgstr "Ghostscript konnte nicht initialisiert werden"
 
-msgid "MO %i (%ls): %ls"
-msgstr "MO %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "GhostPCL konnte nicht initialisiert werden"
+
+msgid "MO %1 (%2): %3"
+msgstr "MO %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&MO %1 (%2): %3"
 
 msgid "MO images"
-msgstr "MO-Images"
+msgstr "MO-Abbilder"
 
 msgid "Welcome to 86Box!"
 msgstr "Willkommen bei 86Box!"
 
-msgid "Internal controller"
-msgstr "Interner Controller"
+msgid "Internal device"
+msgstr "Internes Gerät"
+
+msgid "&File"
+msgstr "&Datei"
+
+msgid "&New machine..."
+msgstr "&Neue Maschine"
+
+msgid "&Check for updates..."
+msgstr "&Auf Aktualisierungen prüfen..."
 
 msgid "Exit"
 msgstr "Beenden"
@@ -845,10 +967,10 @@ msgid "No ROMs found"
 msgstr "Keine ROMs gefunden"
 
 msgid "Do you want to save the settings?"
-msgstr "Möchten Sie die Einstellungen speichern?"
+msgstr "Sollen die Einstellungen gespeichert werden?"
 
 msgid "This will hard reset the emulated machine."
-msgstr "Dies wird zu einem Hard-Reset des emulierten Systems führen."
+msgstr "Dies wird zu einem Kaltstart des emulierten Systems führen."
 
 msgid "Save"
 msgstr "Speichern"
@@ -857,37 +979,25 @@ msgid "About 86Box"
 msgstr "Über 86Box"
 
 msgid "86Box v"
-msgstr "86Box Version "
+msgstr "86Box v"
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "Ein Emulator für alte Computer\n\nAutoren: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne sowie andere.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho sowie andere.\n\nÜbersetzt von: dob205\n\nVeröffentlicht unter der GNU General Public License in der Version 2 oder neuer. Siehe LICENSE für mehr Informationen."
+msgstr "Ein Emulator für alte Computer\n\nAutoren: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne sowie andere.\n\nMit früheren Kernbeiträgen von Sarah Walker, leilei, JohnElliott, greatpsycho sowie andere.\n\nÜbersetzt von: dob205\n\nVeröffentlicht unter der GNU General Public License in der Version 2 oder neuer. Siehe LICENSE für mehr Informationen."
 
 msgid "Hardware not available"
-msgstr "Hardware nicht verfügbar"
+msgstr "Diese Hardware ist nicht verfügbar"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Bitte stellen Sie sicher, dass libpcap installiert ist und sie eine libpcap-kompatible Netzwerkverbindung nutzen."
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "Überprüfe, dass %1 installiert ist, und eine %1-kompatible Netzwerkverbindung genutzt wird."
 
 msgid "Invalid configuration"
 msgstr "Ungültige Konfiguration"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 wird zur automatischen Konvertierung von PostScript-Dateien ins PDF-Format benötigt.\n\nSämtliche an den generischen PostScript-Drucker gesendete Dateien werden als PostScript (*.ps) Dateien gesichert."
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " wird zur automatischen Konversion von PostScript-Dateien in das PDF-Format benötigt.\n\nSämtliche an den generischen PostScript-Drucker gesendete Dateien werden als PostScript (.ps)-Dateien gesichert."
-
-msgid "Entering fullscreen mode"
-msgstr "Vollbildmodus wird aktiviert"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 wird zur automatischen Konvertierung von PCL-Dateien ins PDF-Format benötigt.\n\nSämtliche an den generischen PCL-Drucker gesendete Dateien werden als Printer Command Language (*.pcl) Dateien gesichert."
 
 msgid "Don't show this message again"
 msgstr "Diese Nachricht nicht mehr anzeigen"
@@ -902,46 +1012,43 @@ msgid "Don't reset"
 msgstr "Nicht zurücksetzen"
 
 msgid "CD-ROM images"
-msgstr "CD-ROM-Images"
+msgstr "CD-ROM-Abbilder"
 
-msgid "%hs Device Configuration"
-msgstr "%hs-Gerätekonfiguration"
+msgid "%1 Device Configuration"
+msgstr "%1-Gerätekonfiguration"
 
 msgid "Monitor in sleep mode"
 msgstr "Monitor im Standbymodus"
 
-msgid "OpenGL Shaders"
-msgstr "OpenGL-Shader"
-
-msgid "OpenGL options"
-msgstr "OpenGL-Optionen"
+msgid "GLSL shaders"
+msgstr "GLSL-Shader"
 
 msgid "You are loading an unsupported configuration"
-msgstr "Sie laden gerade eine nicht unterstützte Konfiguration"
+msgstr "Zur Zeit wird eine nicht unterstützte Konfiguration geladen"
 
 msgid "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
-msgstr "Das Filtern der CPU-Typen basierend auf dem ausgewählten System ist für dieses System deaktiviert.\n\nDies ermöglicht es, dass man eine sonst nicht mit dem ausgewählten System inkompatible CPU auswählen kann. Allerdings kann dies zu Inkompatiblilitäten mit dem BIOS des Systems oder anderen Programmen kommen.\n\nDas Aktivieren dieser Einstellung wird nicht unterstützt und sämtliche Bugreports können als \"invalid\" geschlossen werden."
+msgstr "Das Filtern der CPU-Typen basierend auf dem ausgewählten System ist für dieses System deaktiviert.\n\nDies ermöglicht es, eine mit dem ausgewählten System inkompatible CPU auszuwählen. Allerdings kann dies zu Inkompatiblilitäten mit dem BIOS des Systems oder anderen Programmen kommen.\n\nDas Aktivieren dieser Einstellung wird nicht unterstützt und sämtliche Bugreports können als \"ungültig\" geschlossen werden."
 
 msgid "Continue"
 msgstr "Fortfahren"
 
-msgid "Cassette: %s"
-msgstr "Kassette: %s"
+msgid "Cassette: %1"
+msgstr "Kassette: %1"
+
+msgid "C&assette: %1"
+msgstr "K&assette: %1"
 
 msgid "Cassette images"
-msgstr "Kassettenimages"
+msgstr "Kassettenabbilder"
 
-msgid "Cartridge %i: %ls"
-msgstr "Cartridge %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "Cartridge %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "Car&tridge %1: %2"
 
 msgid "Cartridge images"
-msgstr "Cartridgeimages"
-
-msgid "Error initializing renderer"
-msgstr "Fehler bei der Rendererinitialisierung"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "Der OpenGL (3.0-Kern)-Renderer konnte nicht initialisiert werden. Bitte benutzen Sie einen anderen Renderer."
+msgstr "Cartridgeabbilder"
 
 msgid "Resume execution"
 msgstr "Fortsetzen"
@@ -949,6 +1056,9 @@ msgstr "Fortsetzen"
 msgid "Pause execution"
 msgstr "Pausieren"
 
+msgid "Ctrl+Alt+Del"
+msgstr "Strg+Alt+Entf"
+
 msgid "Press Ctrl+Alt+Del"
 msgstr "Strg+Alt+Entf drücken"
 
@@ -956,28 +1066,292 @@ msgid "Press Ctrl+Alt+Esc"
 msgstr "Strg+Alt+Esc drücken"
 
 msgid "Hard reset"
-msgstr "Hard-Reset"
+msgstr "Kaltstart"
+
+msgid "Force shutdown"
+msgstr "Abschaltung erzwingen"
+
+msgid "Start"
+msgstr "Einschalten"
+
+msgid "Not running"
+msgstr "Läuft nicht"
+
+msgid "Running"
+msgstr "Läuft"
+
+msgid "Paused"
+msgstr "Pausiert"
+
+msgid "Waiting"
+msgstr "Wartend"
+
+msgid "Powered Off"
+msgstr "Ausgeschaltet"
+
+msgid "%n running"
+msgstr "%n laufend"
+
+msgid "%n paused"
+msgstr "%n pausiert"
+
+msgid "%n waiting"
+msgstr "%n wartend"
+
+msgid "%1 total"
+msgstr "%1 insgesamt"
+
+msgid "VMs: %1"
+msgstr ""
+
+msgid "System Directory:"
+msgstr "Systemverzeichnis"
+
+msgid "Choose directory"
+msgstr "Verzeichnis auswählen"
+
+msgid "Choose configuration file"
+msgstr "Konfigurationsdatei auswählen"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "86Box Konfigurationsdateien (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Lesen der Konfiguration fehlgeschlagen"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "Die ausgewählte Konfigurationsdatei konnte nicht eingelesen werden: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "Benutze reguläre Ausdrücke in der Suche"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "%1 Maschinen sind aktuell aktiv. Bist du sicher, dass du den VM Manager trotzdem schließen möchtest?"
+
+msgid "Add new system wizard"
+msgstr "Assistent für ein neues System"
+
+msgid "Introduction"
+msgstr "Einleitung"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "Hilft dir ein neues System zu 86Box hinzuzufügen"
+
+msgid "New configuration"
+msgstr "Neue Konfiguration"
+
+msgid "Complete"
+msgstr "Abgeschlossen"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "Der Assistent wird nun die Konfiguration für das neue System starten."
+
+msgid "Use existing configuration"
+msgstr "Vorhande Konfiguration benutzen"
+
+msgid "Type some notes here"
+msgstr "Trage hier Notizen ein"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Füge den Inhalt einer bereits existierenden Konfigurationsdatei in das untere Feld ein."
+
+msgid "Load configuration from file"
+msgstr "Lade Konfiguration aus Datei"
+
+msgid "System name"
+msgstr "Systemname"
+
+msgid "System name:"
+msgstr "Systemname:"
+
+msgid "System name cannot contain certain characters"
+msgstr "Der Name des Systems darf bestimmte Zeichen nicht enthalten"
+
+msgid "System name already exists"
+msgstr "Das System existiert bereits"
+
+msgid "Please enter a directory for the system"
+msgstr "Bitte gebe ein Verzeichnis für das System ein"
+
+msgid "Directory does not exist"
+msgstr "Das Verzeichnis existiert nicht"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "Ein neues Systemverzeichnis wird in dem oben angegebenen Verzeichnis erstellt werden"
+
+msgid "System location:"
+msgstr "Systemverzeichnis:"
+
+msgid "System name and location"
+msgstr "Systemname und Verzeichnis"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Gebe einen Namen für das System ein und wähle ein Verzeichnis"
+
+msgid "Enter the name of the system"
+msgstr "Gebe den Namen des Systems ein"
+
+msgid "Please enter a system name"
+msgstr "Bitte gebe einen Systemnamen ein"
+
+msgid "Display name (optional):"
+msgstr "Anzeigename (optional):"
+
+msgid "Display name:"
+msgstr "Anzeigename:"
+
+msgid "Set display name"
+msgstr "Anzeigename festlegen"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Gebe den neuen Anzeigenamen ein (leer lassen zum Zurücksetzen)"
+
+msgid "Change &display name..."
+msgstr "&Anzeigename ändern"
+
+msgid "Context Menu"
+msgstr "Kontextmenü"
+
+msgid "&Open folder..."
+msgstr "&Ordner öffnen"
+
+msgid "Open p&rinter tray..."
+msgstr "D&ruckerausgabe öffnen..."
+
+msgid "Set &icon..."
+msgstr "&Symbol setzen"
+
+msgid "Select an icon"
+msgstr "Wähle ein Symbol aus"
+
+msgid "C&lone..."
+msgstr "K&lonen..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "Virtuelle Maschine \"%1\" (%2) wird geklont werden nach:"
+
+msgid "Directory %1 already exists"
+msgstr "Das Verzeichnis %1 existiert bereits"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "Folgene Zeichen können nicht für den Namen verwendet werden: %1"
+
+msgid "Clone"
+msgstr "Klonen"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Fehler bei Erstellung des Verzeichnisses für die zu klonende VM"
+
+msgid "Failed to clone VM."
+msgstr "Klonen der VM fehlgeschlagen."
+
+msgid "Directory in use"
+msgstr "Verzeichnis bereits in Benutzung"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "Das ausgewählte Verzeichnis wird bereits benutzt. Bitte wähle ein anderes Verzeichnis."
+
+msgid "Create directory failed"
+msgstr "Erstellung des Verzeichnisses fehlgeschlagen"
+
+msgid "Unable to create the directory for the new system"
+msgstr "Das Verzeichnis für das neue System könnte nicht erstellt werden"
+
+msgid "Configuration write failed"
+msgstr "Schreiben der Konfiguration fehlgeschlagen"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "Die Konfigurationsdatei %1 konnte nicht zum Schreiben geöffnet werden"
+
+msgid "Error adding system"
+msgstr "Fehler beim Hinzufügen des Systems"
+
+msgid "Remove directory failed"
+msgstr "Fehler beim Entfernen des Verzeichnisses"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "Eine Dateien im Verzeichnis der Maschine konnten nicht gelöscht werden, bitte lösche diese manuell."
+
+msgid "Build"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "Eine Aktualisierung für 86Box is verfügbar: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "Bei der Suche nach Aktualisierungen trat ein fehler auf: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>Eine Aktualisierung für 86Box ist verfügbar!</b>"
+
+msgid "Warning"
+msgstr "Warnung"
+
+msgid "&Kill"
+msgstr "&Beenden erzwingen"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "Das Erzwingen des Beendens einer virtuellen Maschine kann zu Datenverlust führen. Führe dies nur durch wenn der 86Box sich aufgehangen hat.\n\nBist du sicher das du das Beenden der virtuellen Maschine erzwingen möchtest \"%1\"?"
+
+msgid "&Delete"
+msgstr "&Löschen"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "Bist du sicher das du die virtuelle Maschine inklusive all ihrer Dateien löschen möchtest? Diese Aktion kann nicht rückgängig gemacht werden!"
+
+msgid "Show &config file"
+msgstr "&Konfigurationsdatei anzeigen"
+
+msgid "No screenshot"
+msgstr "Keine Bildschirmaufnahme"
+
+msgid "Search"
+msgstr "Suche"
+
+msgid "Searching for VMs..."
+msgstr "Suche nach VMs..."
+
+msgid "Found %1"
+msgstr "Gefunden %1"
+
+msgid "System"
+msgstr ""
+
+msgid "Storage"
+msgstr "Speicherplatz"
+
+msgid "Disk %1: "
+msgstr ""
+
+msgid "No disks"
+msgstr "Keine Disks"
+
+msgid "Audio"
+msgstr ""
+
+msgid "Audio:"
+msgstr ""
 
 msgid "ACPI shutdown"
-msgstr "ACPI-basiertes Herunterfahren"
+msgstr "Über ACPI herunterfahren"
 
-msgid "Hard disk (%s)"
-msgstr "Festplatte (%s)"
+msgid "ACP&I shutdown"
+msgstr "Über ACP&I herunterfahren"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "Festplatte (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
-msgstr "MFM/RLL- oder ESDI CD-ROM-Laufwerke hat es niemals gegeben"
+msgstr "MFM/RLL- oder ESDI-CD-ROM-Laufwerke existieren nicht"
 
 msgid "Custom..."
 msgstr "Angepasst..."
 
 msgid "Custom (large)..."
-msgstr "Angepasst (Groß)..."
+msgstr "Angepasst (groß)..."
 
 msgid "Add New Hard Disk"
 msgstr "Neue Festplatte hinzufügen"
@@ -986,13 +1360,13 @@ msgid "Add Existing Hard Disk"
 msgstr "Bestehende Festplatte hinzufügen"
 
 msgid "HDI disk images cannot be larger than 4 GB."
-msgstr "HDI-Diskimages können nicht größer als 4 GB groß sein."
+msgstr "HDI-Abbilder können nicht größer als 4 GB sein."
 
 msgid "Disk images cannot be larger than 127 GB."
-msgstr "Festplattenimages können nicht größer als 127 GB groß sein."
+msgstr "Festplattenabbilder können nicht größer als 127 GB sein."
 
 msgid "Hard disk images"
-msgstr "Festplattenimages"
+msgstr "Festplattenabbilder"
 
 msgid "Unable to read file"
 msgstr "Die Datei konnte nicht gelesen werden"
@@ -1001,37 +1375,34 @@ msgid "Unable to write file"
 msgstr "Die Datei konnte nicht beschrieben werden"
 
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
-msgstr "HDI- oder HDX-Images mit einer Sektorgröße größer als 512 kB werden nicht unterstützt."
-
-msgid "USB is not yet supported"
-msgstr "USB wird noch nicht unterstützt"
+msgstr "HDI- oder HDX-Abbilder mit einer Sektorgröße größer als 512 kB werden nicht unterstützt."
 
 msgid "Disk image file already exists"
-msgstr "Die Festplattenimagedatei existiert bereits"
+msgstr "Das Festplattenabbild existiert bereits"
 
 msgid "Please specify a valid file name."
-msgstr "Bitte geben Sie einen gültigen Dateinamen ein."
+msgstr "Gültiger Dateinamen eingeben."
 
 msgid "Disk image created"
-msgstr "Disk-Image wurde erstellt"
+msgstr "Disk-Abbild wurde erstellt"
 
 msgid "Make sure the file exists and is readable."
-msgstr "Bitte stellen Sie sicher, dass die Datei existiert und lesbar ist."
+msgstr "Stelle sicher, dass die Datei existiert und lesbar ist."
 
 msgid "Make sure the file is being saved to a writable directory."
-msgstr "Bitte stellen Sie sicher, dass die Datei in ein Verzeichnis mit Schreibberechtigungen gespeichert wird."
+msgstr "Stelle sicher, dass die Datei in ein Verzeichnis mit Schreibberechtigungen gespeichert wird."
 
 msgid "Disk image too large"
-msgstr "Festplattenimage ist zu groß"
+msgstr "Das Festplattenabbild ist zu groß"
 
 msgid "Remember to partition and format the newly-created drive."
-msgstr "Bitte denken Sie an das Partitionieren und Formatieren des neu erstellten Laufwerks."
+msgstr "Stellen Sie sicher, dass das neu erstellte Laufwerk partitioniert und formatiert wird."
 
 msgid "The selected file will be overwritten. Are you sure you want to use it?"
-msgstr "Die ausgewählte Datei wird überschrieben. Möchten Sie diese Datei nutzen?"
+msgstr "Die ausgewählte Datei wird überschrieben. Soll diese Datei genutzen werden?"
 
 msgid "Unsupported disk image"
-msgstr "Nicht unterstütztes Festplattenimage"
+msgstr "Nicht unterstütztes Festplattenabbild"
 
 msgid "Overwrite"
 msgstr "Überschreiben"
@@ -1039,14 +1410,35 @@ msgstr "Überschreiben"
 msgid "Don't overwrite"
 msgstr "Nicht überschreiben"
 
+msgid "Raw image"
+msgstr "Rohdatenabbilder"
+
+msgid "HDI image"
+msgstr "HDI-Abbild"
+
+msgid "HDX image"
+msgstr "HDX-Abbild"
+
+msgid "Fixed-size VHD"
+msgstr "VHD mit fester Größe"
+
+msgid "Dynamic-size VHD"
+msgstr "VHD mit dynamischer Größe"
+
+msgid "Differencing VHD"
+msgstr "Differenzierende VHD"
+
+msgid "(N/A)"
+msgstr "(Kein)"
+
 msgid "Raw image (.img)"
-msgstr "Rohdatenimages (.img)"
+msgstr "Rohdatenabbild (.img)"
 
 msgid "HDI image (.hdi)"
-msgstr "HDI-Images (.hdi)"
+msgstr "HDI-Abbild (.hdi)"
 
 msgid "HDX image (.hdx)"
-msgstr "HDX-Images (.hdx)"
+msgstr "HDX-Abbild (.hdx)"
 
 msgid "Fixed-size VHD (.vhd)"
 msgstr "VHD mit fester Größe (.vhd)"
@@ -1070,7 +1462,7 @@ msgid "Select the parent VHD"
 msgstr "Eltern-VHD-Datei bitte auswählen"
 
 msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
-msgstr "Dies bedeutet, dass das Elternimage nach der Erstellung des differenzierenden Images erzeugt wurde.\n\nDies kann auch passieren, falls die Image-Dateien verschoben oder kopiert wurden. Ebenso kann auch dies durch einen Bug im Programm, welches das Image erstellt hat, passieren.\n\nMöchten Sie die Zeitstempel korrigieren?"
+msgstr "Dies bedeutet, dass das Elternabbild nach der Erstellung des differenzierenden Abbild erzeugt wurde.\n\nDies kann auch passieren, falls die Abbild-Dateien verschoben oder kopiert wurden. Ebenso kann auch dies durch einen Bug im Programm, welches das Abbild erstellt hat, passieren.\n\nSoll der Zeitstempel korrigiert werden?"
 
 msgid "Parent and child disk timestamps do not match"
 msgstr "Die Zeitstempel der Eltern- und der Kindesplatte stimmen nicht überein"
@@ -1078,9 +1470,6 @@ msgstr "Die Zeitstempel der Eltern- und der Kindesplatte stimmen nicht überein"
 msgid "Could not fix VHD timestamp."
 msgstr "Der Zeitstempel der VHD konnte nicht korrigiert werden."
 
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
-
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
 
@@ -1096,53 +1485,38 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
+msgid "160 KB"
+msgstr "160 KB"
 
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
+msgid "180 KB"
+msgstr "180 KB"
 
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
+msgid "320 KB"
+msgstr "320 KB"
 
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
+msgid "360 KB"
+msgstr "360 KB"
 
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
+msgid "640 KB"
+msgstr "640 KB"
 
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
+msgid "720 KB"
+msgstr "720 KB"
 
 msgid "1.2 MB"
-msgstr "1,2 MB"
+msgstr "1.2 MB"
 
 msgid "1.25 MB"
-msgstr "1,25 MB"
+msgstr "1.25 MB"
 
 msgid "1.44 MB"
-msgstr "1,44 MB"
+msgstr "1.44 MB"
 
 msgid "DMF (cluster 1024)"
 msgstr "DMF (1024 Cluster)"
@@ -1151,40 +1525,40 @@ msgid "DMF (cluster 2048)"
 msgstr "DMF (2048 Cluster)"
 
 msgid "2.88 MB"
-msgstr "2,88 MB"
+msgstr "2.88 MB"
 
 msgid "ZIP 100"
-msgstr "ZIP 100"
+msgstr "ZIP-DRIVE 100"
 
 msgid "3.5\" 128 MB (ISO 10090)"
-msgstr "3,5-Zoll 128 MB (ISO 10090)"
+msgstr "3.5-Zoll 128 MB (ISO 10090)"
 
 msgid "3.5\" 230 MB (ISO 13963)"
-msgstr "3,5-Zoll 230 MB (ISO 13963)"
+msgstr "3.5-Zoll 230 MB (ISO 13963)"
 
 msgid "3.5\" 540 MB (ISO 15498)"
-msgstr "3,5-Zoll 540 MB (ISO 15498)"
+msgstr "3.5-Zoll 540 MB (ISO 15498)"
 
 msgid "3.5\" 640 MB (ISO 15498)"
-msgstr "3,5-Zoll 640 MB (ISO 15498)"
+msgstr "3.5-Zoll 640 MB (ISO 15498)"
 
 msgid "3.5\" 1.3 GB (GigaMO)"
-msgstr "3,5-Zoll 1,3 GB (GigaMO)"
+msgstr "3.5-Zoll 1,3 GB (GigaMO)"
 
 msgid "3.5\" 2.3 GB (GigaMO 2)"
-msgstr "3,5-Zoll 2,3 GB (GigaMO 2)"
+msgstr "3.5-Zoll 2,3 GB (GigaMO 2)"
 
 msgid "5.25\" 600 MB"
-msgstr "5,25-Zoll 600 MB"
+msgstr "5.25-Zoll 600 MB"
 
 msgid "5.25\" 650 MB"
-msgstr "5,25-Zoll 650 MB"
+msgstr "5.25-Zoll 650 MB"
 
 msgid "5.25\" 1 GB"
 msgstr "5,25-Zoll 1 GB"
 
 msgid "5.25\" 1.3 GB"
-msgstr "5,25-Zoll 1,3 GB"
+msgstr "5.25-Zoll 1,3 GB"
 
 msgid "Perfect RPM"
 msgstr "Perfekte Drehzahl"
@@ -1193,7 +1567,7 @@ msgid "1% below perfect RPM"
 msgstr "1% unterhalb der perfekten Drehzahl"
 
 msgid "1.5% below perfect RPM"
-msgstr "1,5% unterhalb der perfekten Drehzahl"
+msgstr "1.5% unterhalb der perfekten Drehzahl"
 
 msgid "2% below perfect RPM"
 msgstr "2% unterhalb der perfekten Drehzahl"
@@ -1227,3 +1601,1383 @@ msgstr "Schnell"
 
 msgid "&Auto-pause on focus loss"
 msgstr "&Auto-Pause bei Fokusverlust"
+
+msgid "WinBox is no longer supported"
+msgstr "Der WinBox Manager wird nicht mehr unterstützt"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "Die Entwicklung des WinBox-Managers wurde im Jahr 2022 eingestellt, da es an Betreuern mangelte. Da wir unsere Bemühungen darauf richten, 86Box noch besser zu machen, haben wir uns entschlossen, WinBox nicht mehr als Manager zu unterstützen.\n\nEs werden keine weiteren Updates für WinBox zur Verfügung gestellt, und es kann zu fehlerhaftem Verhalten kommen, wenn WinBox weiterhin mit neueren Versionen von 86Box verwendet wird. Alle Fehlerberichte, die sich auf das Verhalten von WinBox beziehen, werden als ungültig geschlossen.\n\nAuf 86box.net ist eine Liste anderer Manager zu finden, die verwendet werden können."
+
+msgid "Generate"
+msgstr "Erzeugen"
+
+msgid "Joystick configuration"
+msgstr "Joystick-Konfiguration"
+
+msgid "Device"
+msgstr "Gerät"
+
+msgid "%1 (X axis)"
+msgstr "%1 (X-Achse)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (Y-Achse)"
+
+msgid "MCA devices"
+msgstr "MCA-Geräte"
+
+msgid "List of MCA devices:"
+msgstr "Liste die MCA-Geräte:"
+
+msgid "&Tablet tool"
+msgstr "Tablet-Werkzeug"
+
+msgid "About &Qt"
+msgstr "Über &Qt"
+
+msgid "&MCA devices..."
+msgstr "MCA-Geräte..."
+
+msgid "Show non-&primary monitors"
+msgstr "Nicht-primäre Monitore anzeigen"
+
+msgid "Open screenshots &folder..."
+msgstr "Ordner „screenshots“ ö&ffnen..."
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Vollbild-S&treckmodus aktivieren, wenn das Fenster maximiert ist"
+
+msgid "&Cursor/Puck"
+msgstr "&Mauszeiger/Puck"
+
+msgid "&Pen"
+msgstr "&Stift"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "&Host-CD/DVD-Laufwerk (%1:)"
+
+msgid "&Connected"
+msgstr "&Verbunden"
+
+msgid "Clear image &history"
+msgstr "&Abbildverlauf löschen"
+
+msgid "Create..."
+msgstr "Erstellen..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "Host-CD/DVD-Laufwerk (%1)"
+
+msgid "Unknown Bus"
+msgstr "Unbekannter Bus"
+
+msgid "Null Driver"
+msgstr "Nulltreiber"
+
+msgid "NIC:"
+msgstr "Netzwerkkarte:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "Netzwerkkarte %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&Netzwerkkarte %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "Rendering-Verhalten"
+
+msgid "Use target framerate:"
+msgstr "Zielbildwiederholrate verwenden:"
+
+msgid " fps"
+msgstr " fps"
+
+msgid "VSync"
+msgstr "VSync"
+
+msgid "Synchronize with video"
+msgstr "Mit Videoausgabe synchronisieren"
+
+msgid "Shaders"
+msgstr "Shader"
+
+msgid "Remove"
+msgstr "Entfernen"
+
+msgid "Browse..."
+msgstr "Durchsuchen..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "OpenGL-Kontext konnte nicht erstellt werden."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "Konnte nicht in den OpenGL-Kontext wechseln."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "OpenGL-Version 3.0 oder höher ist erforderlich. Die aktuelle Version ist %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "Fehler beim Initialisieren von OpenGL"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nRückgriff auf Software-Rendering."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>Bei der Auswahl von Medien-Abbildern (CD-ROM, Diskette usw.) wird der Öffnungsdialog im selben Verzeichnis wie die 86Box-Konfigurationsdatei gestartet. Diese Einstellung macht wahrscheinlich nur unter macOS einen Unterschied.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "Dieses System wurde möglicherweise verschoben oder kopiert."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "Um eine ordnungsgemäße Netzwerkfunktionalität zu gewährleisten, muss 86Box wissen, ob dieses System verschoben oder kopiert wurde. \n\nWählen Sie \"Ich habe es kopiert\", wenn Sie sich nicht sicher sind."
+
+msgid "I Moved It"
+msgstr "Ich habe es verschoben"
+
+msgid "I Copied It"
+msgstr "Ich habe es kopiert"
+
+msgid "86Box Monitor #"
+msgstr "86Box-Monitor #"
+
+msgid "No MCA devices."
+msgstr "Keine MCA-Geräte."
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "Netzwerkkarte 1"
+
+msgid "Network Card #2"
+msgstr "Netzwerkkarte 2"
+
+msgid "Network Card #3"
+msgstr "Netzwerkkarte 3"
+
+msgid "Network Card #4"
+msgstr "Netzwerkkarte 4"
+
+msgid "Mode:"
+msgstr "Modus:"
+
+msgid "Interface:"
+msgstr "Schnittstelle:"
+
+msgid "Adapter:"
+msgstr "Adapter:"
+
+msgid "VDE Socket:"
+msgstr "VDE Anschluss:"
+
+msgid "86Box Unit Tester"
+msgstr "86Box-Gerätetester"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Novell NetWare 2.x Schlüsselkarte"
+
+msgid "Serial port passthrough 1"
+msgstr "Serielle Schnittstelle 1 durchreichen"
+
+msgid "Serial port passthrough 2"
+msgstr "Serielle Schnittstelle 2 durchreichen"
+
+msgid "Serial port passthrough 3"
+msgstr "Serielle Schnittstelle 3 durchreichen"
+
+msgid "Serial port passthrough 4"
+msgstr "Serielle Schnittstelle 4 durchreichen"
+
+msgid "Renderer &options..."
+msgstr "Renderer-&Optionen..."
+
+msgid "PC/XT Keyboard"
+msgstr "PC/XT-Tastatur"
+
+msgid "AT Keyboard"
+msgstr "AT-Tastatur"
+
+msgid "AX Keyboard"
+msgstr "AX-Tastatur"
+
+msgid "PS/2 Keyboard"
+msgstr "PS/2-Tastatur"
+
+msgid "PS/55 Keyboard"
+msgstr "PS/55-Tastatur"
+
+msgid "Keys"
+msgstr "Tasten"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Logitech/Microsoft Bus-Maus"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Microsoft Bus-Maus (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Mouse Systems Serielle Maus"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Mouse Systems Bus-Maus"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Microsoft Serielle Maus"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Microsoft Serial BallPoint"
+
+msgid "Logitech Serial Mouse"
+msgstr "Logitech Serielle Maus"
+
+msgid "PS/2 Mouse"
+msgstr "PS/2-Maus"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "PS/2-QuickPort-Maus"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (Seriell)"
+
+msgid "Default Baud rate"
+msgstr "Standard-Baudrate"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] Standard Hayes-kompatibles Modem"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Roland MT-32-Emulation"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Roland MT-32 (Neu)-Emulation"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Roland CM-32L-Emulation"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Roland CM-32LN-Emulation"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "OPL4-ML-Tochterplatine"
+
+msgid "System MIDI"
+msgstr "System MIDI"
+
+msgid "MIDI Input Device"
+msgstr "MIDI-Eingabegerät"
+
+msgid "BIOS file"
+msgstr "BIOS-Datei"
+
+msgid "BIOS file (ROM #1)"
+msgstr "BIOS-Datei (ROM #1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "BIOS-Datei (ROM #2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "BIOS-Datei (ROM #3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "BIOS-Datei (ROM #4)"
+
+msgid "BIOS address"
+msgstr "BIOS-Adresse"
+
+msgid "BIOS address (ROM #1)"
+msgstr "BIOS-Adresse (ROM #1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "BIOS-Adresse (ROM #2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "BIOS-Adresse (ROM #3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "BIOS-Adresse (ROM #4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "Schreiben in BIOS Erweiterungs ROMs zulassen"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "Schreiben in BIOS-Erweiterungs-ROMs (ROM #1) zulassen"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "Schreiben in BIOS-Erweiterungs-ROMs (ROM #2) zulassen"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "Schreiben in BIOS-Erweiterungs-ROMs (ROM #3) zulassen"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "Schreiben in BIOS-Erweiterungs-ROMs (ROM #4) zulassen"
+
+msgid "Linear framebuffer base"
+msgstr "Lineare Framebuffer-Basis"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "IRQ des seriellen Ports"
+
+msgid "Parallel port IRQ"
+msgstr "IRQ des parallelen Ports"
+
+msgid "BIOS Revision"
+msgstr "BIOS-Revision"
+
+msgid "BIOS Version"
+msgstr "BIOS-Version"
+
+msgid "BIOS Language"
+msgstr "BIOS-Sprache"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "IBM 5161 Erweiterungseinheit"
+
+msgid "IBM Cassette Basic"
+msgstr "IBM Kassetten-Basic"
+
+msgid "Translate 26 -> 17"
+msgstr "Übersetzen 26 -> 17"
+
+msgid "Language"
+msgstr "Sprache"
+
+msgid "Enable backlight"
+msgstr "Hintergrundbeleuchtung einschalten"
+
+msgid "Invert colors"
+msgstr "Farben invertieren"
+
+msgid "BIOS size"
+msgstr "BIOS-Größe"
+
+msgid "BIOS size (ROM #1)"
+msgstr "BIOS-Größe (ROM #1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "BIOS-Größe (ROM #2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "BIOS-Größe (ROM #3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "BIOS-Größe (ROM #4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "C0000-C7FFF als UMB zuordnen"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "C8000-CFFFF als UMB zuordnen"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "D0000-D7FFF als UMB zuordnen"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "D8000-DFFFF als UMB zuordnen"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "E0000-E7FFF als UMB zuordnen"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "E8000-EFFFF als UMB zuordnen"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "JS9 Steckbrücke (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "MIDI-Ausgabegerät"
+
+msgid "MIDI Real time"
+msgstr "MIDI in Echtzeit"
+
+msgid "MIDI Thru"
+msgstr "MIDI-Durchgang"
+
+msgid "MIDI Clockout"
+msgstr "MIDI-Taktausgabe"
+
+msgid "SoundFont"
+msgstr "SoundFont"
+
+msgid "Output Gain"
+msgstr "Ausgangsverstärkung"
+
+msgid "Chorus"
+msgstr "Chor"
+
+msgid "Chorus Voices"
+msgstr "Chorstimmen"
+
+msgid "Chorus Level"
+msgstr "Chorpegel"
+
+msgid "Chorus Speed"
+msgstr "Chorgeschwindigkeit"
+
+msgid "Chorus Depth"
+msgstr "Chortiefe"
+
+msgid "Chorus Waveform"
+msgstr "Chor-Wellenform"
+
+msgid "Reverb"
+msgstr "Nachhall"
+
+msgid "Reverb Room Size"
+msgstr "Größe des Nachhallraums"
+
+msgid "Reverb Damping"
+msgstr "Nachhalldämpfung"
+
+msgid "Reverb Width"
+msgstr "Nachhall-Breite"
+
+msgid "Reverb Level"
+msgstr "Nachhall-Pegel"
+
+msgid "Interpolation Method"
+msgstr "Interpolationsmethode"
+
+msgid "Dynamic Sample Loading"
+msgstr "Dynamisches Sample-Laden"
+
+msgid "Reverb Output Gain"
+msgstr "Nachhall-Ausgangsverstärkung"
+
+msgid "Reversed stereo"
+msgstr "Umgekehrtes Stereo"
+
+msgid "Nice ramp"
+msgstr "Schöne Rampe"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "Tasten"
+
+msgid "Serial Port"
+msgstr "Serielle Schnittstelle"
+
+msgid "RTS toggle"
+msgstr "RTS-Umschaltung"
+
+msgid "Revision"
+msgstr "Revision"
+
+msgid "Controller"
+msgstr "Controller"
+
+msgid "Show Crosshair"
+msgstr "Fadenkreuz anzeigen"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "MAC-Adresse"
+
+msgid "MAC Address OUI"
+msgstr "OUI der MAC-Adresse"
+
+msgid "Enable BIOS"
+msgstr "BIOS einschalten"
+
+msgid "Baud Rate"
+msgstr "Baudrate"
+
+msgid "TCP/IP listening port"
+msgstr "TCP/IP-Warteport"
+
+msgid "Phonebook File"
+msgstr "Telefonbuch-Datei"
+
+msgid "Telnet emulation"
+msgstr "Telnet-Emulation"
+
+msgid "RAM Address"
+msgstr "RAM-Adresse"
+
+msgid "RAM size"
+msgstr "RAM-Größe"
+
+msgid "Initial RAM size"
+msgstr "Ursprüngliche RAM-Größe"
+
+msgid "Serial Number"
+msgstr "Seriennummer"
+
+msgid "Host ID"
+msgstr "Host-ID"
+
+msgid "FDC Address"
+msgstr "FDC-Adresse"
+
+msgid "MPU-401 Address"
+msgstr "MPU-401-Adresse"
+
+msgid "MPU-401 IRQ"
+msgstr "MPU-401-RQ"
+
+msgid "Receive MIDI input"
+msgstr "MIDI-Eingang empfangen"
+
+msgid "Low DMA"
+msgstr "Niedrige DMA"
+
+msgid "Enable Game port"
+msgstr "Game-Port einschalten"
+
+msgid "SID Model"
+msgstr "SID-Modell"
+
+msgid "SID Filter Strength"
+msgstr "SID-Filterstärke"
+
+msgid "Surround module"
+msgstr "Surround-Modul"
+
+msgid "CODEC"
+msgstr "CODEC"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "CODEC-Interrupt bei CODEC-Einrichtung auslösen (wird von einigen Treibern benötigt)"
+
+msgid "SB Address"
+msgstr "SB-Adresse"
+
+msgid "Adlib Address"
+msgstr "Adlib-Adresse"
+
+msgid "Use EEPROM setting"
+msgstr "EEPROM-Einstellung verwenden"
+
+msgid "WSS IRQ"
+msgstr "WSS-IRQ"
+
+msgid "WSS DMA"
+msgstr "WSS-DMA"
+
+msgid "Enable OPL"
+msgstr "OPL einschalten"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "MIDI-Eingang empfangen (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "Niedrige SB-DMA"
+
+msgid "6CH variant (6-channel)"
+msgstr "6CH-Variante (6-Kanal)"
+
+msgid "Enable CMS"
+msgstr "CMS einschalten"
+
+msgid "Mixer"
+msgstr "Mixer"
+
+msgid "High DMA"
+msgstr "Hohe DMA"
+
+msgid "Control PC speaker"
+msgstr "PC-Lautsprecher steuern"
+
+msgid "Memory size"
+msgstr "Speichergröße"
+
+msgid "EMU8000 Address"
+msgstr "EMU8000-Adresse"
+
+msgid "IDE Controller"
+msgstr "IDE-Controller"
+
+msgid "Codec"
+msgstr "Codec"
+
+msgid "GUS type"
+msgstr "GUS-Typ"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "Befehl 0x04 \"86Box beenden\" einschalten"
+
+msgid "Display type"
+msgstr "Anzeigetyp"
+
+msgid "Composite type"
+msgstr "Composite-Anzeigetyp"
+
+msgid "RGB type"
+msgstr "RGB-Anzeigetyp"
+
+msgid "Line doubling type"
+msgstr "Typ der Zeilenverdopplung"
+
+msgid "Snow emulation"
+msgstr "Schnee-Emulation"
+
+msgid "Monitor type"
+msgstr "Monitor-Typ"
+
+msgid "Character set"
+msgstr "Zeichensatz"
+
+msgid "XGA type"
+msgstr "XGA-Typ"
+
+msgid "Instance"
+msgstr "Instanz"
+
+msgid "MMIO Address"
+msgstr "MMIO-Adresse"
+
+msgid "RAMDAC type"
+msgstr "RAMDAC-Typ"
+
+msgid "Blend"
+msgstr "Mischung"
+
+msgid "Font"
+msgstr "Schriftart"
+
+msgid "Bilinear filtering"
+msgstr "Bilineare Filterung"
+
+msgid "Video chroma-keying"
+msgstr "Video-Chroma-Keying"
+
+msgid "Dithering"
+msgstr "Dithering"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "NMI für CGA-Emulation einschalten"
+
+msgid "Voodoo type"
+msgstr "Voodoo-typ"
+
+msgid "Framebuffer memory size"
+msgstr "Größe des Framebufferspeichers"
+
+msgid "Texture memory size"
+msgstr "Größe des Texturspeichers"
+
+msgid "Dither subtraction"
+msgstr "Dither-Subtraktion"
+
+msgid "Screen Filter"
+msgstr "Bildschirm-Filter"
+
+msgid "Render threads"
+msgstr "Render-Threads"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Startadresse"
+
+msgid "Contiguous Size"
+msgstr "Zusammenhängende Größe"
+
+msgid "I/O Width"
+msgstr "E/A-Breite"
+
+msgid "Transfer Speed"
+msgstr "Übertragungsgeschwindigkeit"
+
+msgid "EMS mode"
+msgstr "EMS-Modus"
+
+msgid "EMS Address"
+msgstr "EMS-Adresse"
+
+msgid "EMS 1 Address"
+msgstr "EMS 1-Adresse"
+
+msgid "EMS 2 Address"
+msgstr "EMS 2-Adresse"
+
+msgid "EMS Memory Size"
+msgstr "EMS-Speichergröße"
+
+msgid "EMS 1 Memory Size"
+msgstr "EMS 1-Speichergröße"
+
+msgid "EMS 2 Memory Size"
+msgstr "EMS 2-Speichergröße"
+
+msgid "Enable EMS"
+msgstr "EMS einschalten"
+
+msgid "Enable EMS 1"
+msgstr "EMS 1 einschalten"
+
+msgid "Enable EMS 2"
+msgstr "EMS 2 einschalten"
+
+msgid "Address for > 2 MB"
+msgstr "Adresse für > 2 MB"
+
+msgid "Frame Address"
+msgstr "Rahmenadresse"
+
+msgid "USA"
+msgstr "USA"
+
+msgid "Danish"
+msgstr "Dänisch"
+
+msgid "Always at selected speed"
+msgstr "Immer mit der gewählten Geschwindigkeit"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "BIOS-Einstellung + Hotkeys (aus während POST)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 KB ab F0000"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 KB ab E0000 (MSB der Adresse invertiert, letzte 64 KB zuerst)"
+
+msgid "Sine"
+msgstr "Sinus"
+
+msgid "Triangle"
+msgstr "Dreieck"
+
+msgid "Linear"
+msgstr "Lineare"
+
+msgid "4th Order"
+msgstr "4. Ordnung"
+
+msgid "7th Order"
+msgstr "7. Ordnung"
+
+msgid "Non-timed (original)"
+msgstr "Nicht zeitgesteuert (Original)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (JMP2 nicht bestückt)"
+
+msgid "Two"
+msgstr "Zwei"
+
+msgid "Three"
+msgstr "Drei"
+
+msgid "Wheel"
+msgstr "Rad"
+
+msgid "Five + Wheel"
+msgstr "Fünf + Rad"
+
+msgid "Five + 2 Wheels"
+msgstr "Fünf + 2 Räder"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 Seriell / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) Seriell"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "BIOS ausschalten"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2 MB"
+
+msgid "8 MB"
+msgstr "8 MB"
+
+msgid "28 MB"
+msgstr "28 MB"
+
+msgid "1 MB"
+msgstr "1 MB"
+
+msgid "4 MB"
+msgstr "4 MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16 MB"
+
+msgid "20 MB"
+msgstr "20 MB"
+
+msgid "24 MB"
+msgstr "24 MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (Stereo)"
+
+msgid "Classic"
+msgstr "Klassisch"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "Composite"
+
+msgid "True color"
+msgstr "True color"
+
+msgid "Old"
+msgstr "Alt"
+
+msgid "New"
+msgstr "Neu"
+
+msgid "Color (generic)"
+msgstr "Farbe (generisch)"
+
+msgid "Green Monochrome"
+msgstr "Grünes Monochrom"
+
+msgid "Amber Monochrome"
+msgstr "Bernsteinfarbenes Monochrom"
+
+msgid "Gray Monochrome"
+msgstr "Graues Monochrom"
+
+msgid "Color (no brown)"
+msgstr "Farbe (kein Braun)"
+
+msgid "Color (IBM 5153)"
+msgstr "Farbe (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Einfache Verdoppelung"
+
+msgid "sRGB interpolation"
+msgstr "sRGB-Interpolation"
+
+msgid "Linear interpolation"
+msgstr "Lineare Interpolation"
+
+msgid "Has secondary 8x8 character set"
+msgstr "Hat sekundären 8x8-Zeichensatz"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Hat Quadcolor II-Tochterplatine"
+
+msgid "Alternate monochrome contrast"
+msgstr "Alternativer Monochrom-Kontrast"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Monochrom (5151/MDA) (weiß)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Monochrom (5151/MDA) (grün)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Monochrom (5151/MDA) (bernsteinfarben)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Farbe 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Farbe 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Erweiterte Farbe - Normaler Modus (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Erweiterte Farbe - Erweiterter Modus (5154/ECD)"
+
+msgid "Green"
+msgstr "Grün"
+
+msgid "Amber"
+msgstr "Bernsteinfarben"
+
+msgid "Gray"
+msgstr "Graues"
+
+msgid "Grayscale"
+msgstr "Graustufen"
+
+msgid "Color"
+msgstr "Farbe"
+
+msgid "U.S. English"
+msgstr "Amerikanisches Englisch"
+
+msgid "Scandinavian"
+msgstr "Skandinavisch"
+
+msgid "Other languages"
+msgstr "Andere Sprachen"
+
+msgid "Bochs latest"
+msgstr "Bochs neueste"
+
+msgid "Apply overscan deltas"
+msgstr "Overscan-Deltas anwenden"
+
+msgid "Mono Interlaced"
+msgstr "Monochrom (Mit Zeilensprungverfahren)"
+
+msgid "Mono Non-Interlaced"
+msgstr "Monochrom (Kein Zeilensprungverfahren)"
+
+msgid "Color Interlaced"
+msgstr "Farbe (Mit Zeilensprungverfahren)"
+
+msgid "Color Non-Interlaced"
+msgstr "Farbe (Kein Zeilensprungverfahren)"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "3Dfx Voodoo Grafik"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 TMUs)"
+
+msgid "8-bit"
+msgstr "8-Bit"
+
+msgid "16-bit"
+msgstr "16-Bit"
+
+msgid "Standard (150ns)"
+msgstr "Standard (150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "Höchstgeschwindigkeit (120ns)"
+
+msgid "Enabled"
+msgstr "Eingeschaltet"
+
+msgid "Standard"
+msgstr "Standard"
+
+msgid "High-Speed"
+msgstr "Höchstgeschwindigkeit"
+
+msgid "Stereo LPT DAC"
+msgstr "Stereo-LPT-DAC"
+
+msgid "Generic Text Printer"
+msgstr "Generischer Textdrucker"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Allgemeiner ESC/P 2-Nadel-Drucker"
+
+msgid "Generic PostScript Printer"
+msgstr "Generischer PostScript-Drucker"
+
+msgid "Generic PCL5e Printer"
+msgstr "Generischer PCL5e-Drucker"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Parallel Line Internet Protokoll"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Kopierschutz-Dongle für Savage Quest"
+
+msgid "Serial Passthrough Device"
+msgstr "Serielles Gerät durchreichen"
+
+msgid "Passthrough Mode"
+msgstr "Durchreich-Modus"
+
+msgid "Host Serial Device"
+msgstr "Serielles Gerät des Hosts"
+
+msgid "Name of pipe"
+msgstr "Name der Pipe"
+
+msgid "Data bits"
+msgstr "Datenbits"
+
+msgid "Stop bits"
+msgstr "Stoppbits"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Durchreich-Baudrate"
+
+msgid "Named Pipe (Server)"
+msgstr "Benannte Pipe (Server)"
+
+msgid "Named Pipe (Client)"
+msgstr "Benannte Pipe (Client)"
+
+msgid "Host Serial Passthrough"
+msgstr "Serielle Schnittstelle des Hosts durchreichen"
+
+msgid "E&ject %1"
+msgstr "%1 a&uswerfen"
+
+msgid "&Unmute"
+msgstr "&Ton einschalten"
+
+msgid "Softfloat FPU"
+msgstr "Softfloat-FPU"
+
+msgid "High performance impact"
+msgstr "Hohe Auswirkung auf die Leistung"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Generisch] RAM-Disk (maximale Geschwindigkeit)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Generisch] 1989 (3500 U/min)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Generisch] 1992 (3600 U/min)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Generisch] 1994 (4500 U/min)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Generisch] 1996 (5400 U/min)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Generisch] 1997 (5400 U/min)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Generisch] 1998 (5400 U/min)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Generisch] 2000 (7200 U/min)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "IBM 8514/A-Klon (ISA)"
+
+msgid "Vendor"
+msgstr "Hersteller"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Generische PC/XT-Speichererweiterung"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Generische PC/AT-Speichererweiterung"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "Nadel-Schriften konnten nicht gefunden werden"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "TrueType-Schriften in das \"roms/printer/fonts\"-Verzeichnis sind für die Allgemeines ESC/P 2 Nadel-Druckers erforderlich."
+
+msgid "Inhibit multimedia keys"
+msgstr "Multimedia-Tasten unterdrücken"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Vor dem Speichern der Einstellungen um Bestätigung bitten"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Vor dem Kaltstart um Bestätigung bitten"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Vor dem Beenden um Bestätigung bitten"
+
+msgid "Options"
+msgstr "Optionen"
+
+msgid "Model"
+msgstr "Modell"
+
+msgid "Model:"
+msgstr "Modell:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Fehler bei der Initialisierung des Vulkan-Renderers."
+
+msgid "GLSL Error"
+msgstr "GLSL-Fehler"
+
+msgid "Could not load shader: %1"
+msgstr "Shader konnte nicht geladen werden: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "OpenGL-Version 3.0 oder höher ist erforderlich. Die aktuelle GLSL-Version ist %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "Textur konnte nicht geladen werden: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "Shader konnte nicht kompiliert werden:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "Programm nicht verknüpft:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "Shader-Manager"
+
+msgid "Shader Configuration"
+msgstr "Shader-Konfiguration"
+
+msgid "Add"
+msgstr "Hinzufügen"
+
+msgid "Move up"
+msgstr "Nach oben verschieben"
+
+msgid "Move down"
+msgstr "Nach unten verschieben"
+
+msgid "Could not load file %1"
+msgstr "Datei %1 konnte nicht geladen werden"
+
+msgid "Key Bindings:"
+msgstr "Tastenbelegungen:"
+
+msgid "Action"
+msgstr "Aktion"
+
+msgid "Keybind"
+msgstr "Tastenbelegung"
+
+msgid "Clear binding"
+msgstr "Belegung löschen"
+
+msgid "Bind"
+msgstr "Belegen"
+
+msgid "Bind Key"
+msgstr "Taste belegen"
+
+msgid "Enter key combo:"
+msgstr "Tastenkombination eingeben:"
+
+msgid "Bind conflict"
+msgstr "Belegungskonflikt"
+
+msgid "This key combo is already in use."
+msgstr "Diese Tastenkombination wird bereits verwendet."
+
+msgid "Send Control+Alt+Del"
+msgstr "Strg+Alt+Entf senden"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Strg+Alt+Esc senden"
+
+msgid "Toggle fullscreen"
+msgstr "Vollbild umschalten"
+
+msgid "Screenshot"
+msgstr "Bildschirmaufnahme"
+
+msgid "Release mouse pointer"
+msgstr "Mauszeiger freigeben"
+
+msgid "Toggle pause"
+msgstr "Pause umschalten"
+
+msgid "Toggle mute"
+msgstr "Stummschaltung umschalten"
+
+msgid "Text files"
+msgstr "Textdateien"
+
+msgid "ROM files"
+msgstr "ROM-Dateien"
+
+msgid "SoundFont files"
+msgstr "SoundFont-Dateien"
+
+msgid "Local Switch"
+msgstr "Lokaler Schalter"
+
+msgid "Remote Switch"
+msgstr "Entfernter Schalter"
+
+msgid "Switch:"
+msgstr "Schalter:"
+
+msgid "Hub Mode"
+msgstr "Hub-Modus"
+
+msgid "Hostname:"
+msgstr "Hostname:"
+
+msgid "ISA RAM:"
+msgstr ""
+
+msgid "ISA ROM:"
+msgstr ""
+
+msgid "&Wipe NVRAM"
+msgstr "NVRAM leeren"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "Dadurch werden alle NVRAM-Dateien (und zugehörige Dateien) der virtuellen Maschine im Unterverzeichnis \"nvr\" werden gelöscht. Gegebenenfalls müssen die BIOS-Einstellungen (und möglicherweise auch die Einstellungen anderer Geräte innerhalb der VM) erneut konfiguriert werden. Möchtest du wirklich den gesamten NVRAM-Inhalt der virtuellen Maschine \"%1\" löschen?"
+
+msgid "Success"
+msgstr "Erfolgreich"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "Der NVRAM-Inhlat der virtuellen Maschine wurde erfolgreich geleert \"%1\""
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "Beim Leeren des NVRAMs der virtuellen Maschine ist ein Fehler aufgetreten \"%1\""
+
+msgid "%1 VM Manager"
+msgstr ""
+
+msgid "%n disk(s)"
+msgstr ""
+
+msgid "Unknown Status"
+msgstr "Unbekannter Status"
+
+msgid "No Machines Found!"
+msgstr "Keine Maschinen gefunden!"
+
+msgid "Check for updates on startup"
+msgstr "Beim Programmstart auf Aktualisierungen prüfen"
+
+msgid "Unable to determine release information"
+msgstr "Die Veröffentlichungsinformationen können nicht ermittelt werden."
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Bei der Prüfung auf Aktualisierungen trat ein Fehler auf:\n\n%1\n\nBitte versuche es später erneut."
+
+msgid "Update check complete"
+msgstr "Prüfung auf Aktualisierungen abgeschlossen"
+
+msgid "stable"
+msgstr "Stabil"
+
+msgid "beta"
+msgstr "Beta"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Du nutzt bereits die aktuelleste %1 Version von 86Box: %2"
+
+msgid "version"
+msgstr "Version"
+
+msgid "build"
+msgstr "Build"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Du nutzt bereits die aktuelleste version <b>%1</b>."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "<b>Version %1</b> ist nun verfügbar."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Du nutzt aktuell Build <b>%1</b>."
+
+msgid "<b>Build %1</b> is now available."
+msgstr "<b>Build %1</b> ist nun verfügbar."
+
+msgid "Would you like to visit the download page?"
+msgstr "Möchtest du die Download-Webseite besuchen?"
+
+msgid "Visit download page"
+msgstr "Download-Webseite besuchen"
+
+msgid "Update check"
+msgstr "Aktualisierungsprüfung"
+
+msgid "Checking for updates..."
+msgstr "Prüfe auf Aktualisierungen..."
+
+msgid "86Box Update"
+msgstr "86Box Aktualisierung"
+
+msgid "Release notes:"
+msgstr "Versionshinweise:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "Absturz der virtuellen Maschine"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "Der Prozess der virtuellen Maschine \"%1\" wurde unerwartet mit dem Exit-Code %2 beendet."
+
+msgid "The system will not be added."
+msgstr "Das System wird nicht hinzugefügt werden."
+
+msgid "&Update mouse every CPU frame"
+msgstr "&Maus bei jedem CPU-Frame aktualisieren"
+
+msgid "Hue"
+msgstr "Farbton"
+
+msgid "Saturation"
+msgstr "Sättigung"
+
+msgid "Contrast"
+msgstr "Kontrast"
+
+msgid "Brightness"
+msgstr "Helligkeit"
+
+msgid "Sharpness"
+msgstr "Schärfe"
+
+msgid "&CGA composite settings..."
+msgstr "Optionen des &CGA-Composite-Modus..."
+
+msgid "CGA composite settings"
+msgstr "Optionen des CGA-Composite-Modus"
+
+msgid "Monitor EDID"
+msgstr "EDID des Monitors"
+
+msgid "Export..."
+msgstr "Exportieren..."
+
+msgid "Export EDID"
+msgstr "EDID exportieren"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "Die EDID-Datei \"%ls\" ist zu groß."
+
+msgid "OpenGL input scale"
+msgstr "Eingabeskala von OpenGL"
+
+msgid "OpenGL input stretch mode"
+msgstr "Eingabestreckungsmodus von OpenGL"
+
+msgid "Color scheme"
+msgstr "Farbschema"
+
+msgid "Light"
+msgstr "Licht"
+
+msgid "Dark"
+msgstr "Dunkel"
diff --git a/src/qt/languages/en-GB.po b/src/qt/languages/en-GB.po
index b56c274d3..ba9f30421 100644
--- a/src/qt/languages/en-GB.po
+++ b/src/qt/languages/en-GB.po
@@ -1,140 +1,10 @@
-msgid "&Action"
-msgstr "&Action"
-
-msgid "&Keyboard requires capture"
-msgstr "&Keyboard requires capture"
-
-msgid "&Right CTRL is left ALT"
-msgstr "&Right CTRL is left ALT"
-
-msgid "&Hard Reset..."
-msgstr "&Hard Reset..."
-
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Ctrl+Alt+Del\tCtrl+F12"
-
-msgid "Ctrl+Alt+&Esc"
-msgstr "Ctrl+Alt+&Esc"
-
-msgid "&Pause"
-msgstr "&Pause"
-
-msgid "E&xit..."
-msgstr "E&xit..."
-
-msgid "&View"
-msgstr "&View"
-
-msgid "&Hide status bar"
-msgstr "&Hide status bar"
-
-msgid "Hide &toolbar"
-msgstr "Hide &toolbar"
-
-msgid "&Resizeable window"
-msgstr "&Resizeable window"
-
-msgid "R&emember size && position"
-msgstr "R&emember size && position"
-
-msgid "Re&nderer"
-msgstr "Re&nderer"
-
-msgid "&SDL (Software)"
-msgstr "&SDL (Software)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (&Hardware)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
-
-msgid "Open&GL (3.0 Core)"
-msgstr "Open&GL (3.0 Core)"
-
-msgid "&VNC"
-msgstr "&VNC"
-
-msgid "Specify dimensions..."
-msgstr "Specify dimensions..."
-
-msgid "F&orce 4:3 display ratio"
-msgstr "F&orce 4:3 display ratio"
-
-msgid "&Window scale factor"
-msgstr "&Window scale factor"
-
-msgid "&0.5x"
-msgstr "&0.5x"
-
-msgid "&1x"
-msgstr "&1x"
-
-msgid "1.&5x"
-msgstr "1.&5x"
-
-msgid "&2x"
-msgstr "&2x"
-
-msgid "&3x"
-msgstr "&3x"
-
-msgid "&4x"
-msgstr "&4x"
-
-msgid "&5x"
-msgstr "&5x"
-
-msgid "&6x"
-msgstr "&6x"
-
-msgid "&7x"
-msgstr "&7x"
-
-msgid "&8x"
-msgstr "&8x"
-
-msgid "Filter method"
-msgstr "Filter method"
-
-msgid "&Nearest"
-msgstr "&Nearest"
-
-msgid "&Linear"
-msgstr "&Linear"
-
-msgid "Hi&DPI scaling"
-msgstr "Hi&DPI scaling"
-
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "&Fullscreen\tCtrl+Alt+PgUp"
-
-msgid "Fullscreen &stretch mode"
-msgstr "Fullscreen &stretch mode"
-
-msgid "&Full screen stretch"
-msgstr "&Full screen stretch"
-
-msgid "&4:3"
-msgstr "&4:3"
-
-msgid "&Square pixels (Keep ratio)"
-msgstr "&Square pixels (Keep ratio)"
-
-msgid "&Integer scale"
-msgstr "&Integer scale"
-
-msgid "4:&3 Integer scale"
-msgstr "4:&3 Integer scale"
-
-msgid "E&GA/(S)VGA settings"
-msgstr "E&GA/(S)VGA settings"
-
-msgid "&Inverted VGA monitor"
-msgstr "&Inverted VGA monitor"
-
-msgid "VGA screen &type"
-msgstr "VGA screen &type"
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: en_GB\n"
+"X-Source-Language: en_US\n"
 
 msgid "RGB &Color"
 msgstr "RGB &Colour"
@@ -142,1088 +12,68 @@ msgstr "RGB &Colour"
 msgid "&RGB Grayscale"
 msgstr "&RGB Greyscale"
 
-msgid "&Amber monitor"
-msgstr "&Amber monitor"
-
-msgid "&Green monitor"
-msgstr "&Green monitor"
-
-msgid "&White monitor"
-msgstr "&White monitor"
-
-msgid "Grayscale &conversion type"
-msgstr "Grayscale &conversion type"
-
-msgid "BT&601 (NTSC/PAL)"
-msgstr "BT&601 (NTSC/PAL)"
-
-msgid "BT&709 (HDTV)"
-msgstr "BT&709 (HDTV)"
-
-msgid "&Average"
-msgstr "&Average"
-
-msgid "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
-msgstr "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
-
-msgid "Change contrast for &monochrome display"
-msgstr "Change contrast for &monochrome display"
-
-msgid "&Media"
-msgstr "&Media"
-
-msgid "&Tools"
-msgstr "&Tools"
-
-msgid "&Settings..."
-msgstr "&Settings..."
-
-msgid "&Update status bar icons"
-msgstr "&Update status bar icons"
-
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "Take s&creenshot\tCtrl+F11"
-
-msgid "&Preferences..."
-msgstr "&Preferences..."
-
-msgid "Enable &Discord integration"
-msgstr "Enable &Discord integration"
-
-msgid "Sound &gain..."
-msgstr "Sound &gain..."
-
-msgid "Begin trace\tCtrl+T"
-msgstr "Begin trace\tCtrl+T"
-
-msgid "End trace\tCtrl+T"
-msgstr "End trace\tCtrl+T"
-
-msgid "&Help"
-msgstr "&Help"
-
-msgid "&Documentation..."
-msgstr "&Documentation..."
-
-msgid "&About 86Box..."
-msgstr "&About 86Box..."
-
-msgid "&New image..."
-msgstr "&New image..."
-
-msgid "&Existing image..."
-msgstr "&Existing image..."
-
-msgid "Existing image (&Write-protected)..."
-msgstr "Existing image (&Write-protected)..."
-
-msgid "&Record"
-msgstr "&Record"
-
-msgid "&Play"
-msgstr "&Play"
-
-msgid "&Rewind to the beginning"
-msgstr "&Rewind to the beginning"
-
-msgid "&Fast forward to the end"
-msgstr "&Fast forward to the end"
-
-msgid "E&ject"
-msgstr "E&ject"
-
-msgid "&Image..."
-msgstr "&Image..."
-
-msgid "E&xport to 86F..."
-msgstr "E&xport to 86F..."
-
-msgid "&Mute"
-msgstr "&Mute"
-
-msgid "E&mpty"
-msgstr "E&mpty"
-
-msgid "&Reload previous image"
-msgstr "&Reload previous image"
-
-msgid "&Folder..."
-msgstr "&Folder..."
-
-msgid "Target &framerate"
-msgstr "Target &framerate"
-
-msgid "&Sync with video"
-msgstr "&Sync with video"
-
-msgid "&25 fps"
-msgstr "&25 fps"
-
-msgid "&30 fps"
-msgstr "&30 fps"
-
-msgid "&50 fps"
-msgstr "&50 fps"
-
-msgid "&60 fps"
-msgstr "&60 fps"
-
-msgid "&75 fps"
-msgstr "&75 fps"
-
-msgid "&VSync"
-msgstr "&VSync"
-
-msgid "&Select shader..."
-msgstr "&Select shader..."
-
-msgid "&Remove shader"
-msgstr "&Remove shader"
-
-msgid "Preferences"
-msgstr "Preferences"
-
-msgid "Sound Gain"
-msgstr "Sound Gain"
-
-msgid "New Image"
-msgstr "New Image"
-
-msgid "Settings"
-msgstr "Settings"
-
-msgid "Specify Main Window Dimensions"
-msgstr "Specify Main Window Dimensions"
-
-msgid "OK"
-msgstr "OK"
-
-msgid "Cancel"
-msgstr "Cancel"
-
-msgid "Save these settings as &global defaults"
-msgstr "Save these settings as &global defaults"
-
-msgid "&Default"
-msgstr "&Default"
-
-msgid "Language:"
-msgstr "Language:"
-
-msgid "Icon set:"
-msgstr "Icon set:"
-
-msgid "Gain"
-msgstr "Gain"
-
-msgid "File name:"
-msgstr "File name:"
-
-msgid "Disk size:"
-msgstr "Disk size:"
-
-msgid "RPM mode:"
-msgstr "RPM mode:"
-
-msgid "Progress:"
-msgstr "Progress:"
-
-msgid "Width:"
-msgstr "Width:"
-
-msgid "Height:"
-msgstr "Height:"
-
-msgid "Lock to this size"
-msgstr "Lock to this size"
-
-msgid "Machine type:"
-msgstr "Machine type:"
-
-msgid "Machine:"
-msgstr "Machine:"
-
-msgid "Configure"
-msgstr "Configure"
-
-msgid "CPU type:"
-msgstr "CPU type:"
-
-msgid "Speed:"
-msgstr "Speed:"
-
-msgid "Frequency:"
-msgstr "Frequency:"
-
-msgid "FPU:"
-msgstr "FPU:"
-
-msgid "Wait states:"
-msgstr "Wait states:"
-
-msgid "MB"
-msgstr "MB"
-
-msgid "Memory:"
-msgstr "Memory:"
-
 msgid "Time synchronization"
-msgstr "Time synchronization"
-
-msgid "Disabled"
-msgstr "Disabled"
-
-msgid "Enabled (local time)"
-msgstr "Enabled (local time)"
-
-msgid "Enabled (UTC)"
-msgstr "Enabled (UTC)"
-
-msgid "Dynamic Recompiler"
-msgstr "Dynamic Recompiler"
-
-msgid "Video:"
-msgstr "Video:"
-
-msgid "Voodoo Graphics"
-msgstr "Voodoo Graphics"
-
-msgid "IBM 8514/A Graphics"
-msgstr "IBM 8514/A Graphics"
-
-msgid "XGA Graphics"
-msgstr "XGA Graphics"
-
-msgid "Mouse:"
-msgstr "Mouse:"
-
-msgid "Joystick:"
-msgstr "Joystick:"
-
-msgid "Joystick 1..."
-msgstr "Joystick 1..."
-
-msgid "Joystick 2..."
-msgstr "Joystick 2..."
-
-msgid "Joystick 3..."
-msgstr "Joystick 3..."
-
-msgid "Joystick 4..."
-msgstr "Joystick 4..."
-
-msgid "Sound card #1:"
-msgstr "Sound card #1:"
-
-msgid "Sound card #2:"
-msgstr "Sound card #2:"
-
-msgid "Sound card #3:"
-msgstr "Sound card #3:"
-
-msgid "Sound card #4:"
-msgstr "Sound card #4:"
-
-msgid "MIDI Out Device:"
-msgstr "MIDI Out Device:"
-
-msgid "MIDI In Device:"
-msgstr "MIDI In Device:"
-
-msgid "Standalone MPU-401"
-msgstr "Standalone MPU-401"
-
-msgid "Use FLOAT32 sound"
-msgstr "Use FLOAT32 sound"
-
-msgid "FM synth driver"
-msgstr "FM synth driver"
-
-msgid "Nuked (more accurate)"
-msgstr "Nuked (more accurate)"
-
-msgid "YMFM (faster)"
-msgstr "YMFM (faster)"
-
-msgid "Network type:"
-msgstr "Network type:"
-
-msgid "PCap device:"
-msgstr "PCap device:"
-
-msgid "Network adapter:"
-msgstr "Network adapter:"
-
-msgid "COM1 Device:"
-msgstr "COM1 Device:"
-
-msgid "COM2 Device:"
-msgstr "COM2 Device:"
-
-msgid "COM3 Device:"
-msgstr "COM3 Device:"
-
-msgid "COM4 Device:"
-msgstr "COM4 Device:"
-
-msgid "LPT1 Device:"
-msgstr "LPT1 Device:"
-
-msgid "LPT2 Device:"
-msgstr "LPT2 Device:"
-
-msgid "LPT3 Device:"
-msgstr "LPT3 Device:"
-
-msgid "LPT4 Device:"
-msgstr "LPT4 Device:"
-
-msgid "Serial port 1"
-msgstr "Serial port 1"
-
-msgid "Serial port 2"
-msgstr "Serial port 2"
-
-msgid "Serial port 3"
-msgstr "Serial port 3"
-
-msgid "Serial port 4"
-msgstr "Serial port 4"
-
-msgid "Parallel port 1"
-msgstr "Parallel port 1"
-
-msgid "Parallel port 2"
-msgstr "Parallel port 2"
-
-msgid "Parallel port 3"
-msgstr "Parallel port 3"
-
-msgid "Parallel port 4"
-msgstr "Parallel port 4"
-
-msgid "HD Controller:"
-msgstr "HD Controller:"
-
-msgid "FD Controller:"
-msgstr "FD Controller:"
-
-msgid "Tertiary IDE Controller"
-msgstr "Tertiary IDE Controller"
-
-msgid "Quaternary IDE Controller"
-msgstr "Quaternary IDE Controller"
-
-msgid "SCSI"
-msgstr "SCSI"
-
-msgid "Controller 1:"
-msgstr "Controller 1:"
-
-msgid "Controller 2:"
-msgstr "Controller 2:"
-
-msgid "Controller 3:"
-msgstr "Controller 3:"
-
-msgid "Controller 4:"
-msgstr "Controller 4:"
-
-msgid "Cassette"
-msgstr "Cassette"
-
-msgid "Hard disks:"
-msgstr "Hard disks:"
-
-msgid "&New..."
-msgstr "&New..."
-
-msgid "&Existing..."
-msgstr "&Existing..."
-
-msgid "&Remove"
-msgstr "&Remove"
-
-msgid "Bus:"
-msgstr "Bus:"
-
-msgid "Channel:"
-msgstr "Channel:"
-
-msgid "ID:"
-msgstr "ID:"
-
-msgid "&Specify..."
-msgstr "&Specify..."
-
-msgid "Sectors:"
-msgstr "Sectors:"
-
-msgid "Heads:"
-msgstr "Heads:"
-
-msgid "Cylinders:"
-msgstr "Cylinders:"
-
-msgid "Size (MB):"
-msgstr "Size (MB):"
-
-msgid "Type:"
-msgstr "Type:"
-
-msgid "Image Format:"
-msgstr "Image Format:"
-
-msgid "Block Size:"
-msgstr "Block Size:"
-
-msgid "Floppy drives:"
-msgstr "Floppy drives:"
-
-msgid "Turbo timings"
-msgstr "Turbo timings"
-
-msgid "Check BPB"
-msgstr "Check BPB"
-
-msgid "CD-ROM drives:"
-msgstr "CD-ROM drives:"
-
-msgid "Earlier drive"
-msgstr "Earlier drive"
-
-msgid "MO drives:"
-msgstr "MO drives:"
-
-msgid "ZIP drives:"
-msgstr "ZIP drives:"
-
-msgid "ZIP 250"
-msgstr "ZIP 250"
-
-msgid "ISA RTC:"
-msgstr "ISA RTC:"
-
-msgid "ISA Memory Expansion"
-msgstr "ISA Memory Expansion"
-
-msgid "Card 1:"
-msgstr "Card 1:"
-
-msgid "Card 2:"
-msgstr "Card 2:"
-
-msgid "Card 3:"
-msgstr "Card 3:"
-
-msgid "Card 4:"
-msgstr "Card 4:"
-
-msgid "ISABugger device"
-msgstr "ISABugger device"
-
-msgid "POST card"
-msgstr "POST card"
-
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
-
-msgid "86Box"
-msgstr "86Box"
-
-msgid "Error"
-msgstr "Error"
-
-msgid "Fatal error"
-msgstr "Fatal error"
-
-msgid " - PAUSED"
-msgstr " - PAUSED"
-
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Press Ctrl+Alt+PgDn to return to windowed mode."
-
-msgid "Speed"
-msgstr "Speed"
-
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
-
-msgid "ZIP images"
-msgstr "ZIP images"
-
-msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
-msgstr "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
-
-msgid "(empty)"
-msgstr "(empty)"
-
-msgid "All files"
-msgstr "All files"
-
-msgid "Turbo"
-msgstr "Turbo"
-
-msgid "On"
-msgstr "On"
-
-msgid "Off"
-msgstr "Off"
-
-msgid "All images"
-msgstr "All images"
-
-msgid "Basic sector images"
-msgstr "Basic sector images"
-
-msgid "Surface images"
-msgstr "Surface images"
-
-msgid "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
-msgstr "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
-
-msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
-msgstr "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
-
-msgid "Machine"
-msgstr "Machine"
-
-msgid "Display"
-msgstr "Display"
-
-msgid "Input devices"
-msgstr "Input devices"
-
-msgid "Sound"
-msgstr "Sound"
-
-msgid "Network"
-msgstr "Network"
-
-msgid "Ports (COM & LPT)"
-msgstr "Ports (COM & LPT)"
-
-msgid "Storage controllers"
-msgstr "Storage controllers"
-
-msgid "Hard disks"
-msgstr "Hard disks"
-
-msgid "Floppy & CD-ROM drives"
-msgstr "Floppy & CD-ROM drives"
-
-msgid "Other removable devices"
-msgstr "Other removable devices"
-
-msgid "Other peripherals"
-msgstr "Other peripherals"
-
-msgid "Click to capture mouse"
-msgstr "Click to capture mouse"
-
-msgid "Press F8+F12 to release mouse"
-msgstr "Press F8+F12 to release mouse"
-
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Press F8+F12 or middle button to release mouse"
-
-msgid "Bus"
-msgstr "Bus"
-
-msgid "File"
-msgstr "File"
-
-msgid "C"
-msgstr "C"
-
-msgid "H"
-msgstr "H"
-
-msgid "S"
-msgstr "S"
-
-msgid "KB"
-msgstr "KB"
-
-msgid "Could not initialize the video renderer."
-msgstr "Could not initialize the video renderer."
-
-msgid "Default"
-msgstr "Default"
-
-msgid "%i Wait state(s)"
-msgstr "%i Wait state(s)"
-
-msgid "Type"
-msgstr "Type"
-
-msgid "Failed to set up PCap"
-msgstr "Failed to set up PCap"
-
-msgid "No PCap devices found"
-msgstr "No PCap devices found"
-
-msgid "Invalid PCap device"
-msgstr "Invalid PCap device"
-
-msgid "Standard 2-button joystick(s)"
-msgstr "Standard 2-button joystick(s)"
-
-msgid "Standard 4-button joystick"
-msgstr "Standard 4-button joystick"
-
-msgid "Standard 6-button joystick"
-msgstr "Standard 6-button joystick"
-
-msgid "Standard 8-button joystick"
-msgstr "Standard 8-button joystick"
-
-msgid "CH Flightstick Pro"
-msgstr "CH Flightstick Pro"
-
-msgid "Microsoft SideWinder Pad"
-msgstr "Microsoft SideWinder Pad"
-
-msgid "Thrustmaster Flight Control System"
-msgstr "Thrustmaster Flight Control System"
-
-msgid "None"
-msgstr "None"
-
-msgid "Unable to load keyboard accelerators."
-msgstr "Unable to load keyboard accelerators."
-
-msgid "Unable to register raw input."
-msgstr "Unable to register raw input."
-
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Floppy %i (%s): %ls"
-
-msgid "Advanced sector images"
-msgstr "Advanced sector images"
-
-msgid "Flux images"
-msgstr "Flux images"
-
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "Unable to initialize SDL, SDL2.dll is required"
-
-msgid "Are you sure you want to hard reset the emulated machine?"
-msgstr "Are you sure you want to hard reset the emulated machine?"
-
-msgid "Are you sure you want to exit 86Box?"
-msgstr "Are you sure you want to exit 86Box?"
+msgstr "Time synchronisation"
 
 msgid "Unable to initialize Ghostscript"
-msgstr "Unable to initialize Ghostscript"
+msgstr "Unable to initialise Ghostscript"
 
-msgid "MO %i (%ls): %ls"
-msgstr "MO %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "Unable to initialise GhostPCL"
 
-msgid "MO images"
-msgstr "MO images"
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behaviour will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
 
-msgid "Welcome to 86Box!"
-msgstr "Welcome to 86Box!"
-
-msgid "Internal controller"
-msgstr "Internal controller"
-
-msgid "Exit"
-msgstr "Exit"
-
-msgid "No ROMs found"
-msgstr "No ROMs found"
-
-msgid "Do you want to save the settings?"
-msgstr "Do you want to save the settings?"
-
-msgid "This will hard reset the emulated machine."
-msgstr "This will hard reset the emulated machine."
-
-msgid "Save"
-msgstr "Save"
-
-msgid "About 86Box"
-msgstr "About 86Box"
-
-msgid "86Box v"
-msgstr "86Box v"
-
-msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-
-msgid "Hardware not available"
-msgstr "Hardware not available"
-
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-
-msgid "Invalid configuration"
-msgstr "Invalid configuration"
-
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
-
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-
-msgid "Entering fullscreen mode"
-msgstr "Entering fullscreen mode"
-
-msgid "Don't show this message again"
-msgstr "Don't show this message again"
-
-msgid "Don't exit"
-msgstr "Don't exit"
-
-msgid "Reset"
-msgstr "Reset"
-
-msgid "Don't reset"
-msgstr "Don't reset"
-
-msgid "CD-ROM images"
-msgstr "CD-ROM images"
-
-msgid "%hs Device Configuration"
-msgstr "%hs Device Configuration"
-
-msgid "Monitor in sleep mode"
-msgstr "Monitor in sleep mode"
-
-msgid "OpenGL Shaders"
-msgstr "OpenGL Shaders"
-
-msgid "OpenGL options"
-msgstr "OpenGL options"
-
-msgid "You are loading an unsupported configuration"
-msgstr "You are loading an unsupported configuration"
-
-msgid "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
-msgstr "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
-
-msgid "Continue"
-msgstr "Continue"
-
-msgid "Cassette: %s"
-msgstr "Cassette: %s"
-
-msgid "Cassette images"
-msgstr "Cassette images"
-
-msgid "Cartridge %i: %ls"
-msgstr "Cartridge %i: %ls"
-
-msgid "Cartridge images"
-msgstr "Cartridge images"
-
-msgid "Error initializing renderer"
-msgstr "Error initializing renderer"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-
-msgid "Resume execution"
-msgstr "Resume execution"
-
-msgid "Pause execution"
-msgstr "Pause execution"
-
-msgid "Press Ctrl+Alt+Del"
-msgstr "Press Ctrl+Alt+Del"
-
-msgid "Press Ctrl+Alt+Esc"
-msgstr "Press Ctrl+Alt+Esc"
-
-msgid "Hard reset"
-msgstr "Hard reset"
-
-msgid "ACPI shutdown"
-msgstr "ACPI shutdown"
-
-msgid "Hard disk (%s)"
-msgstr "Hard disk (%s)"
-
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
-
-msgid "MFM/RLL or ESDI CD-ROM drives never existed"
-msgstr "MFM/RLL or ESDI CD-ROM drives never existed"
-
-msgid "Custom..."
-msgstr "Custom..."
-
-msgid "Custom (large)..."
-msgstr "Custom (large)..."
-
-msgid "Add New Hard Disk"
-msgstr "Add New Hard Disk"
-
-msgid "Add Existing Hard Disk"
-msgstr "Add Existing Hard Disk"
-
-msgid "HDI disk images cannot be larger than 4 GB."
-msgstr "HDI disk images cannot be larger than 4 GB."
-
-msgid "Disk images cannot be larger than 127 GB."
-msgstr "Disk images cannot be larger than 127 GB."
-
-msgid "Hard disk images"
-msgstr "Hard disk images"
-
-msgid "Unable to read file"
-msgstr "Unable to read file"
-
-msgid "Unable to write file"
-msgstr "Unable to write file"
-
-msgid "HDI or HDX images with a sector size other than 512 are not supported."
-msgstr "HDI or HDX images with a sector size other than 512 are not supported."
-
-msgid "USB is not yet supported"
-msgstr "USB is not yet supported"
-
-msgid "Disk image file already exists"
-msgstr "Disk image file already exists"
-
-msgid "Please specify a valid file name."
-msgstr "Please specify a valid file name."
-
-msgid "Disk image created"
-msgstr "Disk image created"
-
-msgid "Make sure the file exists and is readable."
-msgstr "Make sure the file exists and is readable."
-
-msgid "Make sure the file is being saved to a writable directory."
-msgstr "Make sure the file is being saved to a writable directory."
-
-msgid "Disk image too large"
-msgstr "Disk image too large"
-
-msgid "Remember to partition and format the newly-created drive."
-msgstr "Remember to partition and format the newly-created drive."
-
-msgid "The selected file will be overwritten. Are you sure you want to use it?"
-msgstr "The selected file will be overwritten. Are you sure you want to use it?"
-
-msgid "Unsupported disk image"
-msgstr "Unsupported disk image"
-
-msgid "Overwrite"
-msgstr "Overwrite"
-
-msgid "Don't overwrite"
-msgstr "Don't overwrite"
-
-msgid "Raw image (.img)"
-msgstr "Raw image (.img)"
-
-msgid "HDI image (.hdi)"
-msgstr "HDI image (.hdi)"
-
-msgid "HDX image (.hdx)"
-msgstr "HDX image (.hdx)"
-
-msgid "Fixed-size VHD (.vhd)"
-msgstr "Fixed-size VHD (.vhd)"
-
-msgid "Dynamic-size VHD (.vhd)"
-msgstr "Dynamic-size VHD (.vhd)"
-
-msgid "Differencing VHD (.vhd)"
-msgstr "Differencing VHD (.vhd)"
-
-msgid "Large blocks (2 MB)"
-msgstr "Large blocks (2 MB)"
-
-msgid "Small blocks (512 KB)"
-msgstr "Small blocks (512 KB)"
-
-msgid "VHD files"
-msgstr "VHD files"
-
-msgid "Select the parent VHD"
-msgstr "Select the parent VHD"
-
-msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
-msgstr "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
-
-msgid "Parent and child disk timestamps do not match"
-msgstr "Parent and child disk timestamps do not match"
-
-msgid "Could not fix VHD timestamp."
-msgstr "Could not fix VHD timestamp."
-
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
-
-msgid "MFM/RLL"
-msgstr "MFM/RLL"
-
-msgid "XTA"
-msgstr "XTA"
-
-msgid "ESDI"
-msgstr "ESDI"
-
-msgid "IDE"
-msgstr "IDE"
-
-msgid "ATAPI"
-msgstr "ATAPI"
-
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
-
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
-
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
-
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
-
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
-
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
-
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
-
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
-
-msgid "1.2 MB"
-msgstr "1.2 MB"
-
-msgid "1.25 MB"
-msgstr "1.25 MB"
-
-msgid "1.44 MB"
-msgstr "1.44 MB"
-
-msgid "DMF (cluster 1024)"
-msgstr "DMF (cluster 1024)"
-
-msgid "DMF (cluster 2048)"
-msgstr "DMF (cluster 2048)"
-
-msgid "2.88 MB"
-msgstr "2.88 MB"
-
-msgid "ZIP 100"
-msgstr "ZIP 100"
-
-msgid "3.5\" 128 MB (ISO 10090)"
-msgstr "3.5\" 128 MB (ISO 10090)"
-
-msgid "3.5\" 230 MB (ISO 13963)"
-msgstr "3.5\" 230 MB (ISO 13963)"
-
-msgid "3.5\" 540 MB (ISO 15498)"
-msgstr "3.5\" 540 MB (ISO 15498)"
-
-msgid "3.5\" 640 MB (ISO 15498)"
-msgstr "3.5\" 640 MB (ISO 15498)"
-
-msgid "3.5\" 1.3 GB (GigaMO)"
-msgstr "3.5\" 1.3 GB (GigaMO)"
-
-msgid "3.5\" 2.3 GB (GigaMO 2)"
-msgstr "3.5\" 2.3 GB (GigaMO 2)"
-
-msgid "5.25\" 600 MB"
-msgstr "5.25\" 600 MB"
-
-msgid "5.25\" 650 MB"
-msgstr "5.25\" 650 MB"
-
-msgid "5.25\" 1 GB"
-msgstr "5.25\" 1 GB"
-
-msgid "5.25\" 1.3 GB"
-msgstr "5.25\" 1.3 GB"
-
-msgid "Perfect RPM"
-msgstr "Perfect RPM"
-
-msgid "1% below perfect RPM"
-msgstr "1% below perfect RPM"
-
-msgid "1.5% below perfect RPM"
-msgstr "1.5% below perfect RPM"
-
-msgid "2% below perfect RPM"
-msgstr "2% below perfect RPM"
-
-msgid "(System Default)"
-msgstr "(System Default)"
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Appl&y fullscreen stretch mode when maximised"
 
 msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
+msgstr "Failed to initialise network driver"
 
-msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
+msgid "Render behavior"
+msgstr "Render behaviour"
 
-msgid "Mouse sensitivity:"
-msgstr "Mouse sensitivity:"
+msgid "Synchronize with video"
+msgstr "Synchronise with video"
 
-msgid "Select media images from program working directory"
-msgstr "Select media images from program working directory"
+msgid "Error initializing OpenGL"
+msgstr "Error initialising OpenGL"
 
-msgid "PIT mode:"
-msgstr "PIT mode:"
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialogue will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
 
-msgid "Auto"
-msgstr "Auto"
+msgid "Color (generic)"
+msgstr "Colour (generic)"
 
-msgid "Slow"
-msgstr "Slow"
+msgid "Gray Monochrome"
+msgstr "Grey Monochrome"
 
-msgid "Fast"
-msgstr "Fast"
+msgid "Color (no brown)"
+msgstr "Colour (no brown)"
 
-msgid "&Auto-pause on focus loss"
-msgstr "&Auto-pause on focus loss"
+msgid "Color (IBM 5153)"
+msgstr "Colour (IBM 5153)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Colour 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Colour 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Enhanced Colour - Normal Mode (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Enhanced Colour - Enhanced Mode (5154/ECD)"
+
+msgid "Gray"
+msgstr "Grey"
+
+msgid "Color"
+msgstr "Colour"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Failed to initialise Vulkan renderer."
+
+msgid "True color"
+msgstr "True colour"
diff --git a/src/qt/languages/en-US.po b/src/qt/languages/en-US.po
index e3cfa3f77..e78536c66 100644
--- a/src/qt/languages/en-US.po
+++ b/src/qt/languages/en-US.po
@@ -1,1229 +1,7 @@
-msgid "&Action"
-msgstr "&Action"
-
-msgid "&Keyboard requires capture"
-msgstr "&Keyboard requires capture"
-
-msgid "&Right CTRL is left ALT"
-msgstr "&Right CTRL is left ALT"
-
-msgid "&Hard Reset..."
-msgstr "&Hard Reset..."
-
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Ctrl+Alt+Del\tCtrl+F12"
-
-msgid "Ctrl+Alt+&Esc"
-msgstr "Ctrl+Alt+&Esc"
-
-msgid "&Pause"
-msgstr "&Pause"
-
-msgid "E&xit..."
-msgstr "E&xit..."
-
-msgid "&View"
-msgstr "&View"
-
-msgid "&Hide status bar"
-msgstr "&Hide status bar"
-
-msgid "Hide &toolbar"
-msgstr "Hide &toolbar"
-
-msgid "&Resizeable window"
-msgstr "&Resizeable window"
-
-msgid "R&emember size && position"
-msgstr "R&emember size && position"
-
-msgid "Re&nderer"
-msgstr "Re&nderer"
-
-msgid "&SDL (Software)"
-msgstr "&SDL (Software)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (&Hardware)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
-
-msgid "Open&GL (3.0 Core)"
-msgstr "Open&GL (3.0 Core)"
-
-msgid "&VNC"
-msgstr "&VNC"
-
-msgid "Specify dimensions..."
-msgstr "Specify dimensions..."
-
-msgid "F&orce 4:3 display ratio"
-msgstr "F&orce 4:3 display ratio"
-
-msgid "&Window scale factor"
-msgstr "&Window scale factor"
-
-msgid "&0.5x"
-msgstr "&0.5x"
-
-msgid "&1x"
-msgstr "&1x"
-
-msgid "1.&5x"
-msgstr "1.&5x"
-
-msgid "&2x"
-msgstr "&2x"
-
-msgid "&3x"
-msgstr "&3x"
-
-msgid "&4x"
-msgstr "&4x"
-
-msgid "&5x"
-msgstr "&5x"
-
-msgid "&6x"
-msgstr "&6x"
-
-msgid "&7x"
-msgstr "&7x"
-
-msgid "&8x"
-msgstr "&8x"
-
-msgid "Filter method"
-msgstr "Filter method"
-
-msgid "&Nearest"
-msgstr "&Nearest"
-
-msgid "&Linear"
-msgstr "&Linear"
-
-msgid "Hi&DPI scaling"
-msgstr "Hi&DPI scaling"
-
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "&Fullscreen\tCtrl+Alt+PgUp"
-
-msgid "Fullscreen &stretch mode"
-msgstr "Fullscreen &stretch mode"
-
-msgid "&Full screen stretch"
-msgstr "&Full screen stretch"
-
-msgid "&4:3"
-msgstr "&4:3"
-
-msgid "&Square pixels (Keep ratio)"
-msgstr "&Square pixels (Keep ratio)"
-
-msgid "&Integer scale"
-msgstr "&Integer scale"
-
-msgid "4:&3 Integer scale"
-msgstr "4:&3 Integer scale"
-
-msgid "E&GA/(S)VGA settings"
-msgstr "E&GA/(S)VGA settings"
-
-msgid "&Inverted VGA monitor"
-msgstr "&Inverted VGA monitor"
-
-msgid "VGA screen &type"
-msgstr "VGA screen &type"
-
-msgid "RGB &Color"
-msgstr "RGB &Color"
-
-msgid "&RGB Grayscale"
-msgstr "&RGB Grayscale"
-
-msgid "&Amber monitor"
-msgstr "&Amber monitor"
-
-msgid "&Green monitor"
-msgstr "&Green monitor"
-
-msgid "&White monitor"
-msgstr "&White monitor"
-
-msgid "Grayscale &conversion type"
-msgstr "Grayscale &conversion type"
-
-msgid "BT&601 (NTSC/PAL)"
-msgstr "BT&601 (NTSC/PAL)"
-
-msgid "BT&709 (HDTV)"
-msgstr "BT&709 (HDTV)"
-
-msgid "&Average"
-msgstr "&Average"
-
-msgid "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
-msgstr "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
-
-msgid "Change contrast for &monochrome display"
-msgstr "Change contrast for &monochrome display"
-
-msgid "&Media"
-msgstr "&Media"
-
-msgid "&Tools"
-msgstr "&Tools"
-
-msgid "&Settings..."
-msgstr "&Settings..."
-
-msgid "&Update status bar icons"
-msgstr "&Update status bar icons"
-
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "Take s&creenshot\tCtrl+F11"
-
-msgid "&Preferences..."
-msgstr "&Preferences..."
-
-msgid "Enable &Discord integration"
-msgstr "Enable &Discord integration"
-
-msgid "Sound &gain..."
-msgstr "Sound &gain..."
-
-msgid "Begin trace\tCtrl+T"
-msgstr "Begin trace\tCtrl+T"
-
-msgid "End trace\tCtrl+T"
-msgstr "End trace\tCtrl+T"
-
-msgid "&Help"
-msgstr "&Help"
-
-msgid "&Documentation..."
-msgstr "&Documentation..."
-
-msgid "&About 86Box..."
-msgstr "&About 86Box..."
-
-msgid "&New image..."
-msgstr "&New image..."
-
-msgid "&Existing image..."
-msgstr "&Existing image..."
-
-msgid "Existing image (&Write-protected)..."
-msgstr "Existing image (&Write-protected)..."
-
-msgid "&Record"
-msgstr "&Record"
-
-msgid "&Play"
-msgstr "&Play"
-
-msgid "&Rewind to the beginning"
-msgstr "&Rewind to the beginning"
-
-msgid "&Fast forward to the end"
-msgstr "&Fast forward to the end"
-
-msgid "E&ject"
-msgstr "E&ject"
-
-msgid "&Image..."
-msgstr "&Image..."
-
-msgid "E&xport to 86F..."
-msgstr "E&xport to 86F..."
-
-msgid "&Mute"
-msgstr "&Mute"
-
-msgid "E&mpty"
-msgstr "E&mpty"
-
-msgid "&Reload previous image"
-msgstr "&Reload previous image"
-
-msgid "&Folder..."
-msgstr "&Folder..."
-
-msgid "Target &framerate"
-msgstr "Target &framerate"
-
-msgid "&Sync with video"
-msgstr "&Sync with video"
-
-msgid "&25 fps"
-msgstr "&25 fps"
-
-msgid "&30 fps"
-msgstr "&30 fps"
-
-msgid "&50 fps"
-msgstr "&50 fps"
-
-msgid "&60 fps"
-msgstr "&60 fps"
-
-msgid "&75 fps"
-msgstr "&75 fps"
-
-msgid "&VSync"
-msgstr "&VSync"
-
-msgid "&Select shader..."
-msgstr "&Select shader..."
-
-msgid "&Remove shader"
-msgstr "&Remove shader"
-
-msgid "Preferences"
-msgstr "Preferences"
-
-msgid "Sound Gain"
-msgstr "Sound Gain"
-
-msgid "New Image"
-msgstr "New Image"
-
-msgid "Settings"
-msgstr "Settings"
-
-msgid "Specify Main Window Dimensions"
-msgstr "Specify Main Window Dimensions"
-
-msgid "OK"
-msgstr "OK"
-
-msgid "Cancel"
-msgstr "Cancel"
-
-msgid "Save these settings as &global defaults"
-msgstr "Save these settings as &global defaults"
-
-msgid "&Default"
-msgstr "&Default"
-
-msgid "Language:"
-msgstr "Language:"
-
-msgid "Icon set:"
-msgstr "Icon set:"
-
-msgid "Gain"
-msgstr "Gain"
-
-msgid "File name:"
-msgstr "File name:"
-
-msgid "Disk size:"
-msgstr "Disk size:"
-
-msgid "RPM mode:"
-msgstr "RPM mode:"
-
-msgid "Progress:"
-msgstr "Progress:"
-
-msgid "Width:"
-msgstr "Width:"
-
-msgid "Height:"
-msgstr "Height:"
-
-msgid "Lock to this size"
-msgstr "Lock to this size"
-
-msgid "Machine type:"
-msgstr "Machine type:"
-
-msgid "Machine:"
-msgstr "Machine:"
-
-msgid "Configure"
-msgstr "Configure"
-
-msgid "CPU type:"
-msgstr "CPU type:"
-
-msgid "Speed:"
-msgstr "Speed:"
-
-msgid "Frequency:"
-msgstr "Frequency:"
-
-msgid "FPU:"
-msgstr "FPU:"
-
-msgid "Wait states:"
-msgstr "Wait states:"
-
-msgid "MB"
-msgstr "MB"
-
-msgid "Memory:"
-msgstr "Memory:"
-
-msgid "Time synchronization"
-msgstr "Time synchronization"
-
-msgid "Disabled"
-msgstr "Disabled"
-
-msgid "Enabled (local time)"
-msgstr "Enabled (local time)"
-
-msgid "Enabled (UTC)"
-msgstr "Enabled (UTC)"
-
-msgid "Dynamic Recompiler"
-msgstr "Dynamic Recompiler"
-
-msgid "Video:"
-msgstr "Video:"
-
-msgid "Voodoo Graphics"
-msgstr "Voodoo Graphics"
-
-msgid "IBM 8514/A Graphics"
-msgstr "IBM 8514/A Graphics"
-
-msgid "XGA Graphics"
-msgstr "XGA Graphics"
-
-msgid "Mouse:"
-msgstr "Mouse:"
-
-msgid "Joystick:"
-msgstr "Joystick:"
-
-msgid "Joystick 1..."
-msgstr "Joystick 1..."
-
-msgid "Joystick 2..."
-msgstr "Joystick 2..."
-
-msgid "Joystick 3..."
-msgstr "Joystick 3..."
-
-msgid "Joystick 4..."
-msgstr "Joystick 4..."
-
-msgid "Sound card #1:"
-msgstr "Sound card #1:"
-
-msgid "Sound card #2:"
-msgstr "Sound card #2:"
-
-msgid "Sound card #3:"
-msgstr "Sound card #3:"
-
-msgid "Sound card #4:"
-msgstr "Sound card #4:"
-
-msgid "MIDI Out Device:"
-msgstr "MIDI Out Device:"
-
-msgid "MIDI In Device:"
-msgstr "MIDI In Device:"
-
-msgid "Standalone MPU-401"
-msgstr "Standalone MPU-401"
-
-msgid "Use FLOAT32 sound"
-msgstr "Use FLOAT32 sound"
-
-msgid "FM synth driver"
-msgstr "FM synth driver"
-
-msgid "Nuked (more accurate)"
-msgstr "Nuked (more accurate)"
-
-msgid "YMFM (faster)"
-msgstr "YMFM (faster)"
-
-msgid "Network type:"
-msgstr "Network type:"
-
-msgid "PCap device:"
-msgstr "PCap device:"
-
-msgid "Network adapter:"
-msgstr "Network adapter:"
-
-msgid "COM1 Device:"
-msgstr "COM1 Device:"
-
-msgid "COM2 Device:"
-msgstr "COM2 Device:"
-
-msgid "COM3 Device:"
-msgstr "COM3 Device:"
-
-msgid "COM4 Device:"
-msgstr "COM4 Device:"
-
-msgid "LPT1 Device:"
-msgstr "LPT1 Device:"
-
-msgid "LPT2 Device:"
-msgstr "LPT2 Device:"
-
-msgid "LPT3 Device:"
-msgstr "LPT3 Device:"
-
-msgid "LPT4 Device:"
-msgstr "LPT4 Device:"
-
-msgid "Serial port 1"
-msgstr "Serial port 1"
-
-msgid "Serial port 2"
-msgstr "Serial port 2"
-
-msgid "Serial port 3"
-msgstr "Serial port 3"
-
-msgid "Serial port 4"
-msgstr "Serial port 4"
-
-msgid "Parallel port 1"
-msgstr "Parallel port 1"
-
-msgid "Parallel port 2"
-msgstr "Parallel port 2"
-
-msgid "Parallel port 3"
-msgstr "Parallel port 3"
-
-msgid "Parallel port 4"
-msgstr "Parallel port 4"
-
-msgid "HD Controller:"
-msgstr "HD Controller:"
-
-msgid "FD Controller:"
-msgstr "FD Controller:"
-
-msgid "Tertiary IDE Controller"
-msgstr "Tertiary IDE Controller"
-
-msgid "Quaternary IDE Controller"
-msgstr "Quaternary IDE Controller"
-
-msgid "SCSI"
-msgstr "SCSI"
-
-msgid "Controller 1:"
-msgstr "Controller 1:"
-
-msgid "Controller 2:"
-msgstr "Controller 2:"
-
-msgid "Controller 3:"
-msgstr "Controller 3:"
-
-msgid "Controller 4:"
-msgstr "Controller 4:"
-
-msgid "Cassette"
-msgstr "Cassette"
-
-msgid "Hard disks:"
-msgstr "Hard disks:"
-
-msgid "&New..."
-msgstr "&New..."
-
-msgid "&Existing..."
-msgstr "&Existing..."
-
-msgid "&Remove"
-msgstr "&Remove"
-
-msgid "Bus:"
-msgstr "Bus:"
-
-msgid "Channel:"
-msgstr "Channel:"
-
-msgid "ID:"
-msgstr "ID:"
-
-msgid "&Specify..."
-msgstr "&Specify..."
-
-msgid "Sectors:"
-msgstr "Sectors:"
-
-msgid "Heads:"
-msgstr "Heads:"
-
-msgid "Cylinders:"
-msgstr "Cylinders:"
-
-msgid "Size (MB):"
-msgstr "Size (MB):"
-
-msgid "Type:"
-msgstr "Type:"
-
-msgid "Image Format:"
-msgstr "Image Format:"
-
-msgid "Block Size:"
-msgstr "Block Size:"
-
-msgid "Floppy drives:"
-msgstr "Floppy drives:"
-
-msgid "Turbo timings"
-msgstr "Turbo timings"
-
-msgid "Check BPB"
-msgstr "Check BPB"
-
-msgid "CD-ROM drives:"
-msgstr "CD-ROM drives:"
-
-msgid "Earlier drive"
-msgstr "Earlier drive"
-
-msgid "MO drives:"
-msgstr "MO drives:"
-
-msgid "ZIP drives:"
-msgstr "ZIP drives:"
-
-msgid "ZIP 250"
-msgstr "ZIP 250"
-
-msgid "ISA RTC:"
-msgstr "ISA RTC:"
-
-msgid "ISA Memory Expansion"
-msgstr "ISA Memory Expansion"
-
-msgid "Card 1:"
-msgstr "Card 1:"
-
-msgid "Card 2:"
-msgstr "Card 2:"
-
-msgid "Card 3:"
-msgstr "Card 3:"
-
-msgid "Card 4:"
-msgstr "Card 4:"
-
-msgid "ISABugger device"
-msgstr "ISABugger device"
-
-msgid "POST card"
-msgstr "POST card"
-
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
-
-msgid "86Box"
-msgstr "86Box"
-
-msgid "Error"
-msgstr "Error"
-
-msgid "Fatal error"
-msgstr "Fatal error"
-
-msgid " - PAUSED"
-msgstr " - PAUSED"
-
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Press Ctrl+Alt+PgDn to return to windowed mode."
-
-msgid "Speed"
-msgstr "Speed"
-
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
-
-msgid "ZIP images"
-msgstr "ZIP images"
-
-msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
-msgstr "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
-
-msgid "(empty)"
-msgstr "(empty)"
-
-msgid "All files"
-msgstr "All files"
-
-msgid "Turbo"
-msgstr "Turbo"
-
-msgid "On"
-msgstr "On"
-
-msgid "Off"
-msgstr "Off"
-
-msgid "All images"
-msgstr "All images"
-
-msgid "Basic sector images"
-msgstr "Basic sector images"
-
-msgid "Surface images"
-msgstr "Surface images"
-
-msgid "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
-msgstr "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
-
-msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
-msgstr "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
-
-msgid "Machine"
-msgstr "Machine"
-
-msgid "Display"
-msgstr "Display"
-
-msgid "Input devices"
-msgstr "Input devices"
-
-msgid "Sound"
-msgstr "Sound"
-
-msgid "Network"
-msgstr "Network"
-
-msgid "Ports (COM & LPT)"
-msgstr "Ports (COM & LPT)"
-
-msgid "Storage controllers"
-msgstr "Storage controllers"
-
-msgid "Hard disks"
-msgstr "Hard disks"
-
-msgid "Floppy & CD-ROM drives"
-msgstr "Floppy & CD-ROM drives"
-
-msgid "Other removable devices"
-msgstr "Other removable devices"
-
-msgid "Other peripherals"
-msgstr "Other peripherals"
-
-msgid "Click to capture mouse"
-msgstr "Click to capture mouse"
-
-msgid "Press F8+F12 to release mouse"
-msgstr "Press F8+F12 to release mouse"
-
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Press F8+F12 or middle button to release mouse"
-
-msgid "Bus"
-msgstr "Bus"
-
-msgid "File"
-msgstr "File"
-
-msgid "C"
-msgstr "C"
-
-msgid "H"
-msgstr "H"
-
-msgid "S"
-msgstr "S"
-
-msgid "KB"
-msgstr "KB"
-
-msgid "Could not initialize the video renderer."
-msgstr "Could not initialize the video renderer."
-
-msgid "Default"
-msgstr "Default"
-
-msgid "%i Wait state(s)"
-msgstr "%i Wait state(s)"
-
-msgid "Type"
-msgstr "Type"
-
-msgid "Failed to set up PCap"
-msgstr "Failed to set up PCap"
-
-msgid "No PCap devices found"
-msgstr "No PCap devices found"
-
-msgid "Invalid PCap device"
-msgstr "Invalid PCap device"
-
-msgid "Standard 2-button joystick(s)"
-msgstr "Standard 2-button joystick(s)"
-
-msgid "Standard 4-button joystick"
-msgstr "Standard 4-button joystick"
-
-msgid "Standard 6-button joystick"
-msgstr "Standard 6-button joystick"
-
-msgid "Standard 8-button joystick"
-msgstr "Standard 8-button joystick"
-
-msgid "CH Flightstick Pro"
-msgstr "CH Flightstick Pro"
-
-msgid "Microsoft SideWinder Pad"
-msgstr "Microsoft SideWinder Pad"
-
-msgid "Thrustmaster Flight Control System"
-msgstr "Thrustmaster Flight Control System"
-
-msgid "None"
-msgstr "None"
-
-msgid "Unable to load keyboard accelerators."
-msgstr "Unable to load keyboard accelerators."
-
-msgid "Unable to register raw input."
-msgstr "Unable to register raw input."
-
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Floppy %i (%s): %ls"
-
-msgid "Advanced sector images"
-msgstr "Advanced sector images"
-
-msgid "Flux images"
-msgstr "Flux images"
-
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "Unable to initialize SDL, SDL2.dll is required"
-
-msgid "Are you sure you want to hard reset the emulated machine?"
-msgstr "Are you sure you want to hard reset the emulated machine?"
-
-msgid "Are you sure you want to exit 86Box?"
-msgstr "Are you sure you want to exit 86Box?"
-
-msgid "Unable to initialize Ghostscript"
-msgstr "Unable to initialize Ghostscript"
-
-msgid "MO %i (%ls): %ls"
-msgstr "MO %i (%ls): %ls"
-
-msgid "MO images"
-msgstr "MO images"
-
-msgid "Welcome to 86Box!"
-msgstr "Welcome to 86Box!"
-
-msgid "Internal controller"
-msgstr "Internal controller"
-
-msgid "Exit"
-msgstr "Exit"
-
-msgid "No ROMs found"
-msgstr "No ROMs found"
-
-msgid "Do you want to save the settings?"
-msgstr "Do you want to save the settings?"
-
-msgid "This will hard reset the emulated machine."
-msgstr "This will hard reset the emulated machine."
-
-msgid "Save"
-msgstr "Save"
-
-msgid "About 86Box"
-msgstr "About 86Box"
-
-msgid "86Box v"
-msgstr "86Box v"
-
-msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-
-msgid "Hardware not available"
-msgstr "Hardware not available"
-
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-
-msgid "Invalid configuration"
-msgstr "Invalid configuration"
-
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
-
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-
-msgid "Entering fullscreen mode"
-msgstr "Entering fullscreen mode"
-
-msgid "Don't show this message again"
-msgstr "Don't show this message again"
-
-msgid "Don't exit"
-msgstr "Don't exit"
-
-msgid "Reset"
-msgstr "Reset"
-
-msgid "Don't reset"
-msgstr "Don't reset"
-
-msgid "CD-ROM images"
-msgstr "CD-ROM images"
-
-msgid "%hs Device Configuration"
-msgstr "%hs Device Configuration"
-
-msgid "Monitor in sleep mode"
-msgstr "Monitor in sleep mode"
-
-msgid "OpenGL Shaders"
-msgstr "OpenGL Shaders"
-
-msgid "OpenGL options"
-msgstr "OpenGL options"
-
-msgid "You are loading an unsupported configuration"
-msgstr "You are loading an unsupported configuration"
-
-msgid "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
-msgstr "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
-
-msgid "Continue"
-msgstr "Continue"
-
-msgid "Cassette: %s"
-msgstr "Cassette: %s"
-
-msgid "Cassette images"
-msgstr "Cassette images"
-
-msgid "Cartridge %i: %ls"
-msgstr "Cartridge %i: %ls"
-
-msgid "Cartridge images"
-msgstr "Cartridge images"
-
-msgid "Error initializing renderer"
-msgstr "Error initializing renderer"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-
-msgid "Resume execution"
-msgstr "Resume execution"
-
-msgid "Pause execution"
-msgstr "Pause execution"
-
-msgid "Press Ctrl+Alt+Del"
-msgstr "Press Ctrl+Alt+Del"
-
-msgid "Press Ctrl+Alt+Esc"
-msgstr "Press Ctrl+Alt+Esc"
-
-msgid "Hard reset"
-msgstr "Hard reset"
-
-msgid "ACPI shutdown"
-msgstr "ACPI shutdown"
-
-msgid "Hard disk (%s)"
-msgstr "Hard disk (%s)"
-
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
-
-msgid "MFM/RLL or ESDI CD-ROM drives never existed"
-msgstr "MFM/RLL or ESDI CD-ROM drives never existed"
-
-msgid "Custom..."
-msgstr "Custom..."
-
-msgid "Custom (large)..."
-msgstr "Custom (large)..."
-
-msgid "Add New Hard Disk"
-msgstr "Add New Hard Disk"
-
-msgid "Add Existing Hard Disk"
-msgstr "Add Existing Hard Disk"
-
-msgid "HDI disk images cannot be larger than 4 GB."
-msgstr "HDI disk images cannot be larger than 4 GB."
-
-msgid "Disk images cannot be larger than 127 GB."
-msgstr "Disk images cannot be larger than 127 GB."
-
-msgid "Hard disk images"
-msgstr "Hard disk images"
-
-msgid "Unable to read file"
-msgstr "Unable to read file"
-
-msgid "Unable to write file"
-msgstr "Unable to write file"
-
-msgid "HDI or HDX images with a sector size other than 512 are not supported."
-msgstr "HDI or HDX images with a sector size other than 512 are not supported."
-
-msgid "USB is not yet supported"
-msgstr "USB is not yet supported"
-
-msgid "Disk image file already exists"
-msgstr "Disk image file already exists"
-
-msgid "Please specify a valid file name."
-msgstr "Please specify a valid file name."
-
-msgid "Disk image created"
-msgstr "Disk image created"
-
-msgid "Make sure the file exists and is readable."
-msgstr "Make sure the file exists and is readable."
-
-msgid "Make sure the file is being saved to a writable directory."
-msgstr "Make sure the file is being saved to a writable directory."
-
-msgid "Disk image too large"
-msgstr "Disk image too large"
-
-msgid "Remember to partition and format the newly-created drive."
-msgstr "Remember to partition and format the newly-created drive."
-
-msgid "The selected file will be overwritten. Are you sure you want to use it?"
-msgstr "The selected file will be overwritten. Are you sure you want to use it?"
-
-msgid "Unsupported disk image"
-msgstr "Unsupported disk image"
-
-msgid "Overwrite"
-msgstr "Overwrite"
-
-msgid "Don't overwrite"
-msgstr "Don't overwrite"
-
-msgid "Raw image (.img)"
-msgstr "Raw image (.img)"
-
-msgid "HDI image (.hdi)"
-msgstr "HDI image (.hdi)"
-
-msgid "HDX image (.hdx)"
-msgstr "HDX image (.hdx)"
-
-msgid "Fixed-size VHD (.vhd)"
-msgstr "Fixed-size VHD (.vhd)"
-
-msgid "Dynamic-size VHD (.vhd)"
-msgstr "Dynamic-size VHD (.vhd)"
-
-msgid "Differencing VHD (.vhd)"
-msgstr "Differencing VHD (.vhd)"
-
-msgid "Large blocks (2 MB)"
-msgstr "Large blocks (2 MB)"
-
-msgid "Small blocks (512 KB)"
-msgstr "Small blocks (512 KB)"
-
-msgid "VHD files"
-msgstr "VHD files"
-
-msgid "Select the parent VHD"
-msgstr "Select the parent VHD"
-
-msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
-msgstr "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
-
-msgid "Parent and child disk timestamps do not match"
-msgstr "Parent and child disk timestamps do not match"
-
-msgid "Could not fix VHD timestamp."
-msgstr "Could not fix VHD timestamp."
-
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
-
-msgid "MFM/RLL"
-msgstr "MFM/RLL"
-
-msgid "XTA"
-msgstr "XTA"
-
-msgid "ESDI"
-msgstr "ESDI"
-
-msgid "IDE"
-msgstr "IDE"
-
-msgid "ATAPI"
-msgstr "ATAPI"
-
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
-
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
-
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
-
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
-
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
-
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
-
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
-
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
-
-msgid "1.2 MB"
-msgstr "1.2 MB"
-
-msgid "1.25 MB"
-msgstr "1.25 MB"
-
-msgid "1.44 MB"
-msgstr "1.44 MB"
-
-msgid "DMF (cluster 1024)"
-msgstr "DMF (cluster 1024)"
-
-msgid "DMF (cluster 2048)"
-msgstr "DMF (cluster 2048)"
-
-msgid "2.88 MB"
-msgstr "2.88 MB"
-
-msgid "ZIP 100"
-msgstr "ZIP 100"
-
-msgid "3.5\" 128 MB (ISO 10090)"
-msgstr "3.5\" 128 MB (ISO 10090)"
-
-msgid "3.5\" 230 MB (ISO 13963)"
-msgstr "3.5\" 230 MB (ISO 13963)"
-
-msgid "3.5\" 540 MB (ISO 15498)"
-msgstr "3.5\" 540 MB (ISO 15498)"
-
-msgid "3.5\" 640 MB (ISO 15498)"
-msgstr "3.5\" 640 MB (ISO 15498)"
-
-msgid "3.5\" 1.3 GB (GigaMO)"
-msgstr "3.5\" 1.3 GB (GigaMO)"
-
-msgid "3.5\" 2.3 GB (GigaMO 2)"
-msgstr "3.5\" 2.3 GB (GigaMO 2)"
-
-msgid "5.25\" 600 MB"
-msgstr "5.25\" 600 MB"
-
-msgid "5.25\" 650 MB"
-msgstr "5.25\" 650 MB"
-
-msgid "5.25\" 1 GB"
-msgstr "5.25\" 1 GB"
-
-msgid "5.25\" 1.3 GB"
-msgstr "5.25\" 1.3 GB"
-
-msgid "Perfect RPM"
-msgstr "Perfect RPM"
-
-msgid "1% below perfect RPM"
-msgstr "1% below perfect RPM"
-
-msgid "1.5% below perfect RPM"
-msgstr "1.5% below perfect RPM"
-
-msgid "2% below perfect RPM"
-msgstr "2% below perfect RPM"
-
-msgid "(System Default)"
-msgstr "(System Default)"
-
-msgid "Failed to initialize network driver"
-msgstr "Failed to initialize network driver"
-
-msgid "The network configuration will be switched to the null driver"
-msgstr "The network configuration will be switched to the null driver"
-
-msgid "Mouse sensitivity:"
-msgstr "Mouse sensitivity:"
-
-msgid "Select media images from program working directory"
-msgstr "Select media images from program working directory"
-
-msgid "PIT mode:"
-msgstr "PIT mode:"
-
-msgid "Auto"
-msgstr "Auto"
-
-msgid "Slow"
-msgstr "Slow"
-
-msgid "Fast"
-msgstr "Fast"
-
-msgid "&Auto-pause on focus loss"
-msgstr "&Auto-pause on focus loss"
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: en_US\n"
+"X-Source-Language: en_US\n"
diff --git a/src/qt/languages/es-ES.po b/src/qt/languages/es-ES.po
index c0f38893d..b3d8835cf 100644
--- a/src/qt/languages/es-ES.po
+++ b/src/qt/languages/es-ES.po
@@ -1,3 +1,11 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: es_ES\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
 msgstr "&Acción"
 
@@ -10,8 +18,8 @@ msgstr "CTRL &derecho es ALT izquierdo"
 msgid "&Hard Reset..."
 msgstr "&Hard Reset..."
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Ctrl+Alt+Del\tCtrl+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "&Ctrl+Alt+Del"
 
 msgid "Ctrl+Alt+&Esc"
 msgstr "Ctrl+Alt+&Esc"
@@ -19,8 +27,14 @@ msgstr "Ctrl+Alt+&Esc"
 msgid "&Pause"
 msgstr "&Pausa"
 
-msgid "E&xit..."
-msgstr "&Salir..."
+msgid "Pause"
+msgstr "Pausa"
+
+msgid "Re&sume"
+msgstr "Co&ntinuar"
+
+msgid "E&xit"
+msgstr "&Salir"
 
 msgid "&View"
 msgstr "&Vista"
@@ -32,7 +46,7 @@ msgid "Hide &toolbar"
 msgstr "Ocultar &barra de herramientas"
 
 msgid "&Resizeable window"
-msgstr "&Ventana redimensionable"
+msgstr "Ven&tana redimensionable"
 
 msgid "R&emember size && position"
 msgstr "&Recordar tamaño y posición"
@@ -40,14 +54,8 @@ msgstr "&Recordar tamaño y posición"
 msgid "Re&nderer"
 msgstr "Re&nderizador"
 
-msgid "&SDL (Software)"
-msgstr "&SDL (Software)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (&Hardware)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
+msgid "&Qt (Software)"
+msgstr "&Qt (Software)"
 
 msgid "Open&GL (3.0 Core)"
 msgstr "Open&GL (3.0 Core)"
@@ -55,11 +63,11 @@ msgstr "Open&GL (3.0 Core)"
 msgid "&VNC"
 msgstr "&VNC"
 
-msgid "Specify dimensions..."
+msgid "Specify &dimensions..."
 msgstr "E&specificar dimensiones..."
 
-msgid "F&orce 4:3 display ratio"
-msgstr "F&orzar ratio 4:3"
+msgid "Force &4:3 display ratio"
+msgstr "Forzar ratio &4:3"
 
 msgid "&Window scale factor"
 msgstr "&Factor de escalado de ventana"
@@ -94,7 +102,7 @@ msgstr "&7x"
 msgid "&8x"
 msgstr "&8x"
 
-msgid "Filter method"
+msgid "Fi&lter method"
 msgstr "&Método de filtrado"
 
 msgid "&Nearest"
@@ -106,11 +114,11 @@ msgstr "&Lineal"
 msgid "Hi&DPI scaling"
 msgstr "&Escalado alta densidad"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "&Pantalla completa\tCtrl+Alt+PgUp"
+msgid "&Fullscreen"
+msgstr "&Pantalla completa"
 
 msgid "Fullscreen &stretch mode"
-msgstr "Escalado pantalla completa"
+msgstr "Esca&lado pantalla completa"
 
 msgid "&Full screen stretch"
 msgstr "&Estirar"
@@ -127,8 +135,8 @@ msgstr "&Escalado valor entero"
 msgid "4:&3 Integer scale"
 msgstr "Escalado valor entero 4:&3"
 
-msgid "E&GA/(S)VGA settings"
-msgstr "&Configuraciones EGA/(S)VGA"
+msgid "EGA/(S)&VGA settings"
+msgstr "Configuraciones EGA/(S)&VGA"
 
 msgid "&Inverted VGA monitor"
 msgstr "&Monitor VGA invertido"
@@ -139,11 +147,17 @@ msgstr "&Tipo de pantalla VGA"
 msgid "RGB &Color"
 msgstr "RGB &Color"
 
+msgid "RGB (no brown)"
+msgstr "RGB (sin marrón)"
+
 msgid "&RGB Grayscale"
 msgstr "RGB &Grises"
 
+msgid "Generic RGBI color monitor"
+msgstr "Monitor a colores RGBI genérico"
+
 msgid "&Amber monitor"
-msgstr "Monitor &Ámbar"
+msgstr "Monitor Ámb&ar"
 
 msgid "&Green monitor"
 msgstr "Monitor &Verde"
@@ -164,7 +178,7 @@ msgid "&Average"
 msgstr "&Media"
 
 msgid "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
-msgstr "&Overscan CGA/PCjr/Tandy/EGA/(S)VGA"
+msgstr "Overscan CGA/PCjr/Tandy/E&GA/(S)VGA"
 
 msgid "Change contrast for &monochrome display"
 msgstr "Cambiar contraste para pantalla &monocroma"
@@ -178,11 +192,17 @@ msgstr "&Herramientas"
 msgid "&Settings..."
 msgstr "&Configuraciones..."
 
+msgid "Settings..."
+msgstr "Configuraciones..."
+
 msgid "&Update status bar icons"
 msgstr "&Actualizar iconos en barra de estado"
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "Tomar c&aptura\tCtrl+F11"
+msgid "Take s&creenshot"
+msgstr "Tomar cap&tura"
+
+msgid "S&ound"
+msgstr "S&onido"
 
 msgid "&Preferences..."
 msgstr "&Preferencias..."
@@ -193,14 +213,14 @@ msgstr "Habilitar integración con &Discord"
 msgid "Sound &gain..."
 msgstr "&Ganancia de sonido..."
 
-msgid "Begin trace\tCtrl+T"
-msgstr "Comenzar traza\tCtrl+T"
+msgid "Begin trace"
+msgstr "Comenzar traza"
 
-msgid "End trace\tCtrl+T"
-msgstr "Terminar traza\tCtrl+T"
+msgid "End trace"
+msgstr "Terminar traza"
 
 msgid "&Help"
-msgstr "&Ayuda"
+msgstr "Ay&uda"
 
 msgid "&Documentation..."
 msgstr "&Documentación..."
@@ -244,14 +264,14 @@ msgstr "&Silenciar"
 msgid "E&mpty"
 msgstr "E&xtraer disco"
 
-msgid "&Reload previous image"
-msgstr "&Recargar imagen previa"
+msgid "Reload previous image"
+msgstr "Recargar imagen previa"
 
 msgid "&Folder..."
 msgstr "&Carpeta..."
 
 msgid "Target &framerate"
-msgstr "&Tasa de refresco objetivo"
+msgstr "Objetivo de &tasa de refresco"
 
 msgid "&Sync with video"
 msgstr "&Sincronizar con vídeo"
@@ -301,18 +321,12 @@ msgstr "Aceptar"
 msgid "Cancel"
 msgstr "Cancelar"
 
-msgid "Save these settings as &global defaults"
-msgstr "Salvar estos configuraciones como por &defecto globalmente"
-
 msgid "&Default"
 msgstr "&Por defecto"
 
 msgid "Language:"
 msgstr "Idioma:"
 
-msgid "Icon set:"
-msgstr "Juego de iconos:"
-
 msgid "Gain"
 msgstr "Ganancia"
 
@@ -346,6 +360,9 @@ msgstr "Máquina:"
 msgid "Configure"
 msgstr "Configurar"
 
+msgid "CPU:"
+msgstr "CPU:"
+
 msgid "CPU type:"
 msgstr "Tipo de CPU:"
 
@@ -382,24 +399,51 @@ msgstr "Habilitado (UTC)"
 msgid "Dynamic Recompiler"
 msgstr "Recompilador Dinámico"
 
+msgid "CPU frame size"
+msgstr "Tamaño de blocos de CPU"
+
+msgid "Larger frames (less smooth)"
+msgstr "Blocos más grandes (menos suave)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Blocos más pequeños (más suave)"
+
 msgid "Video:"
 msgstr "Vídeo:"
 
-msgid "Voodoo Graphics"
-msgstr "Voodoo Graphics"
+msgid "Video #2:"
+msgstr "Vídeo 2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Gráficos Voodoo 1 o 2"
 
 msgid "IBM 8514/A Graphics"
-msgstr "IBM 8514/A Graphics"
+msgstr "Gráficos IBM 8514/A"
 
 msgid "XGA Graphics"
-msgstr "XGA Graphics"
+msgstr "Gráficos XGA"
+
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "Adaptador de gráficos de pantalla IBM PS/55"
+
+msgid "Keyboard:"
+msgstr "Teclado:"
+
+msgid "Keyboard"
+msgstr "Teclado"
 
 msgid "Mouse:"
 msgstr "Ratón:"
 
+msgid "Mouse"
+msgstr "Ratón"
+
 msgid "Joystick:"
 msgstr "Mando:"
 
+msgid "Joystick"
+msgstr "Mando"
+
 msgid "Joystick 1..."
 msgstr "Mando 1..."
 
@@ -430,6 +474,9 @@ msgstr "Dispositivo MIDI de salida:"
 msgid "MIDI In Device:"
 msgstr "Dispositivo MIDI de entrada:"
 
+msgid "MIDI Out:"
+msgstr "Salida MIDI"
+
 msgid "Standalone MPU-401"
 msgstr "MPU-401 independiente"
 
@@ -445,15 +492,6 @@ msgstr "Nuked (más preciso)"
 msgid "YMFM (faster)"
 msgstr "YMFM (más rápido)"
 
-msgid "Network type:"
-msgstr "Tipo de red:"
-
-msgid "PCap device:"
-msgstr "Dispositivo PCap:"
-
-msgid "Network adapter:"
-msgstr "Adaptador de red:"
-
 msgid "COM1 Device:"
 msgstr "Dispositivo COM1:"
 
@@ -478,6 +516,9 @@ msgstr "Dispositivo LPT3:"
 msgid "LPT4 Device:"
 msgstr "Dispositivo LPT4:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr "DMA de ECP del LPT interno:"
+
 msgid "Serial port 1"
 msgstr "Puerto serie 1"
 
@@ -502,18 +543,21 @@ msgstr "Puerto paralelo 3"
 msgid "Parallel port 4"
 msgstr "Puerto paralelo 4"
 
-msgid "HD Controller:"
-msgstr "Controladora HD:"
-
 msgid "FD Controller:"
 msgstr "Controladora FD:"
 
+msgid "CD-ROM Controller:"
+msgstr "Controladora CD-ROM:"
+
 msgid "Tertiary IDE Controller"
 msgstr "Tercera controladora IDE"
 
 msgid "Quaternary IDE Controller"
 msgstr "Cuarta controladora IDE"
 
+msgid "Hard disk"
+msgstr "Disco duro"
+
 msgid "SCSI"
 msgstr "SCSI"
 
@@ -535,6 +579,9 @@ msgstr "Cassette"
 msgid "Hard disks:"
 msgstr "Discos duros:"
 
+msgid "Firmware Version"
+msgstr "Versión de firmware"
+
 msgid "&New..."
 msgstr "&Nuevo..."
 
@@ -560,7 +607,7 @@ msgid "Sectors:"
 msgstr "Sectores:"
 
 msgid "Heads:"
-msgstr "Cabezas:"
+msgstr "Cabezales:"
 
 msgid "Cylinders:"
 msgstr "Cilindros:"
@@ -589,14 +636,17 @@ msgstr "Chequear BPB"
 msgid "CD-ROM drives:"
 msgstr "Unidades de CD-ROM:"
 
-msgid "Earlier drive"
-msgstr "Unidad anterior"
-
 msgid "MO drives:"
 msgstr "Unidades MO:"
 
-msgid "ZIP drives:"
-msgstr "Unidades ZIP:"
+msgid "MO:"
+msgstr "MO:"
+
+msgid "Removable disks:"
+msgstr "Discos removibles:"
+
+msgid "Removable disk drives:"
+msgstr "Unidades de disco removible:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
@@ -607,6 +657,9 @@ msgstr "ISA RTC:"
 msgid "ISA Memory Expansion"
 msgstr "Expansión de Memoria ISA"
 
+msgid "ISA ROM Cards"
+msgstr "Tarjetas ROM ISA"
+
 msgid "Card 1:"
 msgstr "Tarjeta 1:"
 
@@ -619,18 +672,21 @@ msgstr "Tarjeta 3:"
 msgid "Card 4:"
 msgstr "Tarjeta 4:"
 
+msgid "Generic ISA ROM Board"
+msgstr "Tarjeta ROM ISA genérica"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "Tarjeta ROM ISA genérica doble"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "Tarjeta ROM ISA genérica cuádruple"
+
 msgid "ISABugger device"
 msgstr "Dispositivo ISABugger"
 
 msgid "POST card"
 msgstr "Tarjeta POST"
 
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
-
 msgid "86Box"
 msgstr "86Box"
 
@@ -641,19 +697,22 @@ msgid "Fatal error"
 msgstr "Error fatal"
 
 msgid " - PAUSED"
-msgstr " - PAUSED"
-
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Pulsa Ctrl+Alt+PgDn para volver a modo ventana."
+msgstr " - EN PAUSA"
 
 msgid "Speed"
 msgstr "Velocidad"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "Disco removible %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "Imagenes ZIP"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "&Disco removible %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Imagenes de disco removible"
+
+msgid "Image %1"
+msgstr "Imagen %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
 msgstr "86Box no pudo encontrar ninguna imagen ROM usable.\n\nPor favor <a href=\"https://github.com/86Box/roms/releases/latest\">descargue</a> un conjunte de ROMs y extráigalo en el directorio \"roms\"."
@@ -688,6 +747,12 @@ msgstr "La máquina \"%hs\" no está disponible debido a ROMs faltantes en el di
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
 msgstr "La tarjeta de vídeo \"%hs\" no está disponible debido a ROMs faltantes en el directorio roms/machines. Cambiando a una tarjeta de vídeo disponible."
 
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "La tarjeta de vídeo 2 \"%hs\" no está disponible debido a ROMs faltantes en el directorio roms/machines. Deshabilitanto la segunda tarjeta de vídeo."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "El dispositivo \"%hs\" no está disponible debido a ROMs faltantes. Ignorando el dispositivo."
+
 msgid "Machine"
 msgstr "Máquina"
 
@@ -706,12 +771,30 @@ msgstr "Red"
 msgid "Ports (COM & LPT)"
 msgstr "Puertos (COM y LPT)"
 
+msgid "Ports"
+msgstr "Puertos"
+
+msgid "Serial ports:"
+msgstr "Puertos serie:"
+
+msgid "Parallel ports:"
+msgstr "Puertos paralelos:"
+
 msgid "Storage controllers"
 msgstr "Controladoras de Almacenamiento"
 
 msgid "Hard disks"
 msgstr "Discos Duros"
 
+msgid "Disks:"
+msgstr "Discos:"
+
+msgid "Floppy:"
+msgstr "Disquete:"
+
+msgid "Controllers:"
+msgstr "Controladoras:"
+
 msgid "Floppy & CD-ROM drives"
 msgstr "Disquetes y unidades de CD-ROM"
 
@@ -721,14 +804,17 @@ msgstr "Otros dispositivos extraíbles"
 msgid "Other peripherals"
 msgstr "Otros periféricos"
 
+msgid "Other devices"
+msgstr "Otros dispositivos"
+
 msgid "Click to capture mouse"
 msgstr "Haga click para capturar el ratón"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "Pulse F8+F12 para liberar el ratón"
+msgid "Press %1 to release mouse"
+msgstr "Pulse %1 para liberar el ratón"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Pulse F8+F12 o el botón central para liberar el ratón"
+msgid "Press %1 or middle button to release mouse"
+msgstr "Pulse %1 o el botón central para liberar el ratón"
 
 msgid "Bus"
 msgstr "Bus"
@@ -748,65 +834,89 @@ msgstr "S"
 msgid "KB"
 msgstr "KB"
 
-msgid "Could not initialize the video renderer."
-msgstr "No fué posible inicializar el renderizador de vídeo."
-
 msgid "Default"
 msgstr "Por defecto"
 
-msgid "%i Wait state(s)"
-msgstr "%i estado(s) de Espera"
+msgid "%1 Wait state(s)"
+msgstr "%1 estado(s) de Espera"
 
 msgid "Type"
 msgstr "Tipo"
 
-msgid "Failed to set up PCap"
-msgstr "Incapaz de configurar PCap"
-
 msgid "No PCap devices found"
 msgstr "No se encontraron dispositivos PCap"
 
 msgid "Invalid PCap device"
 msgstr "Dispositivo PCap inválido"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "Mando(s) de 2 botones estándar"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "Mando(s) de 2 ejes, 2 botones"
 
-msgid "Standard 4-button joystick"
-msgstr "Mando de 4 botones estándar"
+msgid "2-axis, 4-button joystick"
+msgstr "Mando de 2 ejes, 4 botones"
 
-msgid "Standard 6-button joystick"
-msgstr "Mando de 6 botones estándar"
+msgid "2-axis, 6-button joystick"
+msgstr "Mando de 2 ejes, 6 botones"
 
-msgid "Standard 8-button joystick"
-msgstr "Mando de 8 botones estándar"
+msgid "2-axis, 8-button joystick"
+msgstr "Mando de 2 ejes, 8 botones"
+
+msgid "3-axis, 2-button joystick"
+msgstr "Mando de 3 ejes, 2 botones"
+
+msgid "3-axis, 4-button joystick"
+msgstr "Mando de 3 ejes, 4 botones"
+
+msgid "4-axis, 4-button joystick"
+msgstr "Mando de 4 ejes, 4 botones"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH Pedals"
+
 msgid "Microsoft SideWinder Pad"
 msgstr "Microsoft SideWinder Pad"
 
 msgid "Thrustmaster Flight Control System"
 msgstr "Thrustmaster Flight Control System"
 
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Rudder Control System"
+
+msgid "2-button gamepad(s)"
+msgstr "Mando(s) de juegos de 2 botones"
+
+msgid "2-button flight yoke"
+msgstr "Yugo de vuelo de 2 botones"
+
+msgid "4-button gamepad"
+msgstr "Mando de juegos de 4 botones"
+
+msgid "4-button flight yoke"
+msgstr "Yugo de vuelo de 4 botones"
+
+msgid "2-button flight yoke with throttle"
+msgstr "Yugo de vuelo de 2 botones con acelerador"
+
+msgid "4-button flight yoke with throttle"
+msgstr "Yugo de vuelo de 4 botones con acelerador"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Volante Win95 (de 3 ejes, 4 botones)"
+
 msgid "None"
 msgstr "Ninguno"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "No fué posible cargar aceleradores de teclado."
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CHS: %2, %3, %4)"
 
-msgid "Unable to register raw input."
-msgstr "No fué posible registrar entrada directa."
+msgid "Floppy %1 (%2): %3"
+msgstr "Disquete %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Disquete %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "&Disquete %1 (%2): %3"
 
 msgid "Advanced sector images"
 msgstr "Imágenes avanzadas de sector"
@@ -814,9 +924,6 @@ msgstr "Imágenes avanzadas de sector"
 msgid "Flux images"
 msgstr "Imágenes de fluxo"
 
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "Incapaz de inicializar SDL, se requiere SDL2.dll"
-
 msgid "Are you sure you want to hard reset the emulated machine?"
 msgstr "¿Está seguro de que quieres hacer una reinicialización completa de la máquina emulada?"
 
@@ -826,8 +933,14 @@ msgstr "¿Está seguro de que quiere cerrar a 86Box?"
 msgid "Unable to initialize Ghostscript"
 msgstr "No fué posible inicializar Ghostscript"
 
-msgid "MO %i (%ls): %ls"
-msgstr "MO %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "No fué posible inicializar GhostPCL"
+
+msgid "MO %1 (%2): %3"
+msgstr "MO %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&MO %1 (%2): %3"
 
 msgid "MO images"
 msgstr "Imágenes de MO"
@@ -835,8 +948,17 @@ msgstr "Imágenes de MO"
 msgid "Welcome to 86Box!"
 msgstr "¡Bienvenido a 86Box!"
 
-msgid "Internal controller"
-msgstr "Controladora interna"
+msgid "Internal device"
+msgstr "Dispositivo interno"
+
+msgid "&File"
+msgstr "&Archivo"
+
+msgid "&New machine..."
+msgstr "&Nueva máquina..."
+
+msgid "&Check for updates..."
+msgstr "&Verifica actualizaciones..."
 
 msgid "Exit"
 msgstr "Salir"
@@ -860,34 +982,22 @@ msgid "86Box v"
 msgstr "86Box v"
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "Un emulador de ordenadores antigüos\n\nAutores: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, y otros.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, y otros.\n\nLiberado bajo la GNU General Public License versión 2 o posterior. Ver LICENSE para más información."
+msgstr "Un emulador de ordenadores antigüos\n\nAutores: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, y otros.\n\nCon contribuciones anteriores de Sarah Walker, leilei, JohnElliott, greatpsycho y otros.\n\nLiberado bajo la GNU General Public License versión 2 o posterior. Ver LICENSE para más información."
 
 msgid "Hardware not available"
 msgstr "Equipo no disponible"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Asegúrate de que libpcap está instalado y de que estás en una conexión de red compatible con libpcap."
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "Asegúrate de que %1 está instalado y de que estás en una conexión de red compatible con %1."
 
 msgid "Invalid configuration"
 msgstr "Configuración inválida"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 es necesaria para la conversión automática de archivos PostScript a PDF.\n\nCualquier documento enviado a la impresora genérica postScript se guardará como archivo PostScript (.ps)."
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " es necesaria para la conversión automática de archivos PostScript a PDF.\n\nCualquier documento enviado a la impresora genérica postScript se guardará como archivo PostScript (.ps)."
-
-msgid "Entering fullscreen mode"
-msgstr "Entrando en modo pantalla completa"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 es necesaria para la conversión automática de archivos PCL a PDF.\n\nCualquier documento enviado a la impresora genérica PCL se guardará como archivo Printer Command Language (.pcl)."
 
 msgid "Don't show this message again"
 msgstr "No mostrar más este mensaje"
@@ -904,17 +1014,14 @@ msgstr "No reinicializar"
 msgid "CD-ROM images"
 msgstr "Imágenes de CD-ROM"
 
-msgid "%hs Device Configuration"
-msgstr "%hs Configuración de Dispositivo"
+msgid "%1 Device Configuration"
+msgstr "%1 Configuración de Dispositivo"
 
 msgid "Monitor in sleep mode"
 msgstr "Monitor en modo ahorro"
 
-msgid "OpenGL Shaders"
-msgstr "Shaders OpenGL"
-
-msgid "OpenGL options"
-msgstr "Opciones OpenGL"
+msgid "GLSL shaders"
+msgstr "Shaders GLSL"
 
 msgid "You are loading an unsupported configuration"
 msgstr "Está cargando una configuración no soportada"
@@ -925,30 +1032,33 @@ msgstr "El Filtrado de tipo de CPU basado en máquina seleccionada está deshabi
 msgid "Continue"
 msgstr "Continuar"
 
-msgid "Cassette: %s"
-msgstr "Cassette: %s"
+msgid "Cassette: %1"
+msgstr "Cassette: %1"
+
+msgid "C&assette: %1"
+msgstr "C&assette: %1"
 
 msgid "Cassette images"
 msgstr "Imágenes de Cassette"
 
-msgid "Cartridge %i: %ls"
-msgstr "Cartucho %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "Cartucho %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "Car&tucho %1: %2"
 
 msgid "Cartridge images"
 msgstr "Imágenes de Cartucho"
 
-msgid "Error initializing renderer"
-msgstr "Error al inicializar el renderizador"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "No fué posible inicializar el renderizador OpenGL (3.0 Core). Utilice otro renderizador."
-
 msgid "Resume execution"
 msgstr "Retomar la ejecución"
 
 msgid "Pause execution"
 msgstr "Pausar la ejecución"
 
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del"
+
 msgid "Press Ctrl+Alt+Del"
 msgstr "Pulsar Ctrl+Alt+Supr"
 
@@ -958,17 +1068,281 @@ msgstr "Pulsar Ctrl+Alt+Esc"
 msgid "Hard reset"
 msgstr "Hard reset"
 
+msgid "Force shutdown"
+msgstr "Apagqar forzadamente"
+
+msgid "Start"
+msgstr "Iniciar"
+
+msgid "Not running"
+msgstr "No en ejecución"
+
+msgid "Running"
+msgstr "En ejeución"
+
+msgid "Paused"
+msgstr "En pausa"
+
+msgid "Waiting"
+msgstr "En espera"
+
+msgid "Powered Off"
+msgstr "Apagado"
+
+msgid "%n running"
+msgstr "%n en ejecución"
+
+msgid "%n paused"
+msgstr "%n en pausa"
+
+msgid "%n waiting"
+msgstr "%n en espera"
+
+msgid "%1 total"
+msgstr "%1 total"
+
+msgid "VMs: %1"
+msgstr "MV: %1"
+
+msgid "System Directory:"
+msgstr "Directório de sistema:"
+
+msgid "Choose directory"
+msgstr "Escoger disctorio"
+
+msgid "Choose configuration file"
+msgstr "Escoger archivo de configuración"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "Archivos de configuración de 86Box (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Error al leer"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "No fúe posible abrir el archivo de configuración seleccionado para leer: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "Utilizar expresiones regulares en la caja de búsqueda"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "%1 máquina(s) son activas en este momento. ¿Está seguro de que quiere salir del administrador de MV?"
+
+msgid "Add new system wizard"
+msgstr "Asistente para la adición de un nuevo sistema"
+
+msgid "Introduction"
+msgstr "Introducción"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "Esto le ayudará a añadir un nuevo sistema a 86Box."
+
+msgid "New configuration"
+msgstr "Nueva configuración"
+
+msgid "Complete"
+msgstr "Completar"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "El asistente agora ejecutará la configuración para el nuevo sistema."
+
+msgid "Use existing configuration"
+msgstr "Utilizar configuración existente"
+
+msgid "Type some notes here"
+msgstr "Escribir algunas notas aquí"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Pegar el contenido del archivo de configuración existente en el cuadro que aparece a continuación."
+
+msgid "Load configuration from file"
+msgstr "Cargar la configuración desde un archivo"
+
+msgid "System name"
+msgstr "Nombre del sistema"
+
+msgid "System name:"
+msgstr "Nombre del sistema:"
+
+msgid "System name cannot contain certain characters"
+msgstr "El nombre del sistema no puede contener algunos carácteres"
+
+msgid "System name already exists"
+msgstr "El nombre del sistema ya existe"
+
+msgid "Please enter a directory for the system"
+msgstr "Por favor, escriba un directório para el sistema"
+
+msgid "Directory does not exist"
+msgstr "El directório no existe"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "Un nuevo directório para el sistema será creado en el directório escogido en cima"
+
+msgid "System location:"
+msgstr "Ubicación del sistema:"
+
+msgid "System name and location"
+msgstr "Nombre y ubicaciónd el sistema"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Escribir el nombre del sistema y escoger la ubicación"
+
+msgid "Enter the name of the system"
+msgstr "Escribir el nombre del sistema"
+
+msgid "Please enter a system name"
+msgstr "Por favor, entre un nome del sistema"
+
+msgid "Display name (optional):"
+msgstr "Nombre mostrado (opcional):"
+
+msgid "Display name:"
+msgstr "Nombre mostrado:"
+
+msgid "Set display name"
+msgstr "Establecer nombre mostrado"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Escribir el nuevo nombre mostrado (vacío para restablecer)"
+
+msgid "Change &display name..."
+msgstr "Cambiar nombre &mostrado..."
+
+msgid "Context Menu"
+msgstr "Menú de contexto"
+
+msgid "&Open folder..."
+msgstr "&Abrir carpeta..."
+
+msgid "Open p&rinter tray..."
+msgstr "Abrir bandeja de la &impresora..."
+
+msgid "Set &icon..."
+msgstr "Establecer &icono..."
+
+msgid "Select an icon"
+msgstr "Escoger un icono"
+
+msgid "C&lone..."
+msgstr "C&lonar"
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "La máquina virtual \"%1\" (%2) será clonada para:"
+
+msgid "Directory %1 already exists"
+msgstr "El directório %1 ya existe"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "No se puede usar los siguientes carácteres en el nombre: %1"
+
+msgid "Clone"
+msgstr "Cloner"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Error al crear el directório para la MV clonada"
+
+msgid "Failed to clone VM."
+msgstr "Error al clonar la VM."
+
+msgid "Directory in use"
+msgstr "Directório en uso"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "El directório escogido ya está en uso. Por favor, seleccione otro directório."
+
+msgid "Create directory failed"
+msgstr "Error al crear el directório"
+
+msgid "Unable to create the directory for the new system"
+msgstr "No fué posible crear el directório para el nuevo sistema"
+
+msgid "Configuration write failed"
+msgstr "Error al escrbir la configuración"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "No fué posible abrir el archivo de configuración en %1 para escribir"
+
+msgid "Error adding system"
+msgstr "Error al añadir el sistema"
+
+msgid "Remove directory failed"
+msgstr "Error al remover el directório"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "No fué posible borrar algunos archivos en el directório de la máquina. Por favor, borrelos manualmente."
+
+msgid "Build"
+msgstr "Compilación"
+
+msgid "Version"
+msgstr "Versión"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "Está disponible una actualización para 86Box: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "Ha ocurrido un error al verificar las actualizacioens: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>¡Una actualización para 86Box está disponible!</b>"
+
+msgid "Warning"
+msgstr "Advertencia"
+
+msgid "&Kill"
+msgstr "&Terminar forzadamente"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "Terminar forzadamente a la máquina virtual puede cusar la pérdida de datos. Lo haga solamente si el processo de 86Box se bloqueó.\n\n¿De verdad quiere terminar forzadamente a la máquina virtual \"%1\"?"
+
+msgid "&Delete"
+msgstr "&Borrar"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "¿De verdad quiere borrar la máquina virtual \"%1\" y todos sus archivos? ¡Esta acción no se puede deshacer!"
+
+msgid "Show &config file"
+msgstr "Mostrar archivo de &configuración"
+
+msgid "No screenshot"
+msgstr "Sin captura de pantalla"
+
+msgid "Search"
+msgstr "Buscar"
+
+msgid "Searching for VMs..."
+msgstr "Buscar para MV..."
+
+msgid "Found %1"
+msgstr "%1 encontrada"
+
+msgid "System"
+msgstr "Sistema"
+
+msgid "Storage"
+msgstr "Almacenamiento"
+
+msgid "Disk %1: "
+msgstr "Disco"
+
+msgid "No disks"
+msgstr "Sin disco"
+
+msgid "Audio"
+msgstr "Sonido"
+
+msgid "Audio:"
+msgstr "Sonido:"
+
 msgid "ACPI shutdown"
 msgstr "Parada ACPI"
 
-msgid "Hard disk (%s)"
-msgstr "Disco duro (%s)"
+msgid "ACP&I shutdown"
+msgstr "Parada ACP&I"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "Disco duro (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
 msgstr "Nunca existieron unidades de CD-ROM MFM/RLL o ESDI"
@@ -1003,9 +1377,6 @@ msgstr "No se pudo escribir el archivo"
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
 msgstr "No se soportan las imágenes HDI o HDX con un tamaño de sector diferente a 512."
 
-msgid "USB is not yet supported"
-msgstr "No se soporta aún el USB"
-
 msgid "Disk image file already exists"
 msgstr "La imagen de disco ya existe"
 
@@ -1039,6 +1410,27 @@ msgstr "Sobreescribir"
 msgid "Don't overwrite"
 msgstr "No sobreescribir"
 
+msgid "Raw image"
+msgstr "Imagen plana"
+
+msgid "HDI image"
+msgstr "Imagen HDI"
+
+msgid "HDX image"
+msgstr "Imagen HDX"
+
+msgid "Fixed-size VHD"
+msgstr "VHD de tamaño fijo"
+
+msgid "Dynamic-size VHD"
+msgstr "VHD de tamaño dinámico"
+
+msgid "Differencing VHD"
+msgstr "VHD diferencial"
+
+msgid "(N/A)"
+msgstr "(Ninguno)"
+
 msgid "Raw image (.img)"
 msgstr "Imagen plana (.img)"
 
@@ -1078,9 +1470,6 @@ msgstr "Las marcas de tiempo del padre e hijo no coinciden"
 msgid "Could not fix VHD timestamp."
 msgstr "No fué posible corregir la marca de tiempo del VHD."
 
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
-
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
 
@@ -1096,44 +1485,29 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
+msgid "160 KB"
+msgstr "160 KB"
 
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
+msgid "180 KB"
+msgstr "180 KB"
 
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
+msgid "320 KB"
+msgstr "320 KB"
 
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
+msgid "360 KB"
+msgstr "360 KB"
 
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
+msgid "640 KB"
+msgstr "640 KB"
 
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
+msgid "720 KB"
+msgstr "720 KB"
 
 msgid "1.2 MB"
 msgstr "1.2 MB"
@@ -1226,4 +1600,1384 @@ msgid "Fast"
 msgstr "Rápida"
 
 msgid "&Auto-pause on focus loss"
-msgstr "&Pausa automática al perder el foco"
+msgstr "Pa&usa automática al perder el foco"
+
+msgid "WinBox is no longer supported"
+msgstr "WinBox ya no recibe soporte"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "El desarrollo del gestor WinBox se detuvo en 2022 debido a la falta de mantenedores. Como dirigimos nuestros esfuerzos a hacer 86Box aún mejor, hemos tomado la decisión de dejar de dar soporte a WinBox como gestor.\n\nNo se proporcionarán más actualizaciones a través de WinBox, y puede encontrar un comportamiento incorrecto si continúa usándolo con versiones más nuevas de 86Box. Cualquier informe de error relacionado con el comportamiento de WinBox será cerrado como inválido.\n\nVaya a 86box.net para una lista de otros gestores que puede utilizar."
+
+msgid "Generate"
+msgstr "Generar"
+
+msgid "Joystick configuration"
+msgstr "Configuración del mando"
+
+msgid "Device"
+msgstr "Dispositivo"
+
+msgid "%1 (X axis)"
+msgstr "%1 (eje X)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (eje Y)"
+
+msgid "MCA devices"
+msgstr "Dispositivos MCA"
+
+msgid "List of MCA devices:"
+msgstr "Lista de dispositivos MCA:"
+
+msgid "&Tablet tool"
+msgstr "Herramienta de tableta"
+
+msgid "About &Qt"
+msgstr "Acerca de &Qt"
+
+msgid "&MCA devices..."
+msgstr "Dispositivos MCA ..."
+
+msgid "Show non-&primary monitors"
+msgstr "Mostrar monitores no prim&arios"
+
+msgid "Open screenshots &folder..."
+msgstr "Abrir la ca&rpeta screenshots..."
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "&Usar escalado pantalla completa en modalidad maximizada"
+
+msgid "&Cursor/Puck"
+msgstr "&Cursor/Puck"
+
+msgid "&Pen"
+msgstr "&Bolígrafo"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "&Unidad de CD/DVD anfitriona (%1:)"
+
+msgid "&Connected"
+msgstr "&Conectrado"
+
+msgid "Clear image &history"
+msgstr "Eliminar &historia de imágenes"
+
+msgid "Create..."
+msgstr "Crear..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "Unidad de CD/DVD anfitriona (%1)"
+
+msgid "Unknown Bus"
+msgstr "Bus desconocido"
+
+msgid "Null Driver"
+msgstr "Controlador nulo"
+
+msgid "NIC:"
+msgstr "NIC:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "NIC %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&NIC %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "Comportamiento del renderizador"
+
+msgid "Use target framerate:"
+msgstr "Usar objetivo de tasa de refresco:"
+
+msgid " fps"
+msgstr " fps"
+
+msgid "VSync"
+msgstr "VSync"
+
+msgid "Synchronize with video"
+msgstr "Sincronizar con los gráficos"
+
+msgid "Shaders"
+msgstr "Shaders"
+
+msgid "Remove"
+msgstr "Eliminar"
+
+msgid "Browse..."
+msgstr "Buscar..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "No ha sido posible crear el contexto OpenGL."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "No ha sido posible cambiar al contexto OpenGL."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "Es requerida la versión 3.0 o más alta de OpenGL. La versión actual es %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "Error al inicializar OpenGL"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nRecurrir al renderizado por software."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>Al seleccionar imágenes multimedia (CD-ROM, disquete, etc.), el diálogo de apertura se iniciará en el mismo directorio que el archivo de configuración de 86Box. Es probable que este ajuste sólo suponga una diferencia en macOS.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "Esta máquina puede haber sido movida o copiado."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "Para acertarse de que la funcionalidad de red funcione correctamente, 86Box tiene que saber si esta máquina ha sido movida o copiada.\n\nSi no está seguro, escoge \"La he copiado\"."
+
+msgid "I Moved It"
+msgstr "La he movido"
+
+msgid "I Copied It"
+msgstr "La he copiado"
+
+msgid "86Box Monitor #"
+msgstr "Monitor de 86Box "
+
+msgid "No MCA devices."
+msgstr "No hay dispositovos MCA."
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "Tarjeta de red 1"
+
+msgid "Network Card #2"
+msgstr "Tarjeta de red 2"
+
+msgid "Network Card #3"
+msgstr "Tarjeta de red 3"
+
+msgid "Network Card #4"
+msgstr "Tarjeta de red 4"
+
+msgid "Mode:"
+msgstr "Modalidad:"
+
+msgid "Interface:"
+msgstr "Interfaz:"
+
+msgid "Adapter:"
+msgstr "Adaptador:"
+
+msgid "VDE Socket:"
+msgstr "Toma VDE:"
+
+msgid "86Box Unit Tester"
+msgstr "Comprobador de unidad 86Box"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Tarjeta de llave Novell NetWare 2.x"
+
+msgid "Serial port passthrough 1"
+msgstr "Paso de puerto serie 1"
+
+msgid "Serial port passthrough 2"
+msgstr "Paso de puerto serie 2"
+
+msgid "Serial port passthrough 3"
+msgstr "Paso de puerto serie 3"
+
+msgid "Serial port passthrough 4"
+msgstr "Paso de puerto serie 4"
+
+msgid "Renderer &options..."
+msgstr "Opc&iones del renderizador..."
+
+msgid "PC/XT Keyboard"
+msgstr "Teclado PC/XT"
+
+msgid "AT Keyboard"
+msgstr "Teclado AT"
+
+msgid "AX Keyboard"
+msgstr "Teclado AX"
+
+msgid "PS/2 Keyboard"
+msgstr "Teclado PS/2"
+
+msgid "PS/55 Keyboard"
+msgstr "Teclado PS/55"
+
+msgid "Keys"
+msgstr "Teclas"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Ratón de bus Logitech/Microsoft"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Ratón de bus Microsoft (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Ratón serie Mouse Systems"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Ratón de bus Mouse Systems"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Ratón serie Microsoft"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Ratón serie Microsoft BallPoint"
+
+msgid "Logitech Serial Mouse"
+msgstr "Ratón serie Logitech"
+
+msgid "PS/2 Mouse"
+msgstr "Ratón PS/2"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "Ratón PS/2 QuickPort"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (serie)"
+
+msgid "Default Baud rate"
+msgstr "Velocidad de transmisión pretederminada"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] Módem estándar compatible con Hayes"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Emulación Roland MT-32"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Emulación Roland MT-32 (nuevo)"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Emulación Roland CM-32L"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Emulación Roland CM-32LN"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "Placa hija OPL4-ML"
+
+msgid "System MIDI"
+msgstr "MIDI del sistema"
+
+msgid "MIDI Input Device"
+msgstr "Dispositivo de entrada MIDI"
+
+msgid "BIOS file"
+msgstr "Archivo de BIOS"
+
+msgid "BIOS file (ROM #1)"
+msgstr "Archivo de BIOS (ROM no. 1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "Archivo de BIOS (ROM no. 2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "Archivo de BIOS (ROM no. 3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "Archivo de BIOS (ROM no. 4)"
+
+msgid "BIOS address"
+msgstr "Dirección de BIOS"
+
+msgid "BIOS address (ROM #1)"
+msgstr "Dirección de BIOS (ROM no. 1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "Dirección de BIOS (ROM no. 2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "Dirección de BIOS (ROM no. 3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "Dirección de BIOS (ROM no. 4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "Habilitar escrituras para el ROM de extensión de BIOS"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "Habilitar escrituras para el ROM de extensión de BIOS (ROM no. 1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "Habilitar escrituras para el ROM de extensión de BIOS (ROM no. 2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "Habilitar escrituras para el ROM de extensión de BIOS (ROM no. 3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "Habilitar escrituras para el ROM de extensión de BIOS (ROM no. 4)"
+
+msgid "Linear framebuffer base"
+msgstr "Base del búfer de trama lineal"
+
+msgid "Address"
+msgstr "Dirección"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "IRQ del puerto serie"
+
+msgid "Parallel port IRQ"
+msgstr "IRQ del puerto paralelo"
+
+msgid "BIOS Revision"
+msgstr "Revisión de BIOS"
+
+msgid "BIOS Version"
+msgstr "Versión de BIOS"
+
+msgid "BIOS Language"
+msgstr "Idioma de BIOS"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "Unidad de expansión IBM 5161"
+
+msgid "IBM Cassette Basic"
+msgstr "BASIC de casete IBM"
+
+msgid "Translate 26 -> 17"
+msgstr "Traducir 26 -> 17"
+
+msgid "Language"
+msgstr "Idioma"
+
+msgid "Enable backlight"
+msgstr "Habilitar retroiluminación"
+
+msgid "Invert colors"
+msgstr "Invertir colores"
+
+msgid "BIOS size"
+msgstr "Tamaño de BIOS"
+
+msgid "BIOS size (ROM #1)"
+msgstr "Tamaño de BIOS (ROM no. 1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "Tamaño de BIOS (ROM no. 2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "Tamaño de BIOS (ROM no. 3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "Tamaño de BIOS (ROM no. 4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "Mapear a C0000-C7FFF como UMB"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "Mapear a C8000-CFFFF como UMB"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "Mapear a D0000-D7FFF como UMB"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "Mapear a D8000-DFFFF como UMB"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "Mapear a E0000-E7FFF como UMB"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "Mapear a E8000-EFFFF como UMB"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "Puente JS9 (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "Dispositivo de salida MIDI"
+
+msgid "MIDI Real time"
+msgstr "MIDI en tiempo real"
+
+msgid "MIDI Thru"
+msgstr "Atravesar la entrada MIDI"
+
+msgid "MIDI Clockout"
+msgstr "Salida de reloj MIDI"
+
+msgid "SoundFont"
+msgstr "SoundFont"
+
+msgid "Output Gain"
+msgstr "Ganancia de salida"
+
+msgid "Chorus"
+msgstr "Coro"
+
+msgid "Chorus Voices"
+msgstr "Voces del coro"
+
+msgid "Chorus Level"
+msgstr "Nível del coro"
+
+msgid "Chorus Speed"
+msgstr "Velocidad del coro"
+
+msgid "Chorus Depth"
+msgstr "Profundidad del coro"
+
+msgid "Chorus Waveform"
+msgstr "Forma de onda del coro"
+
+msgid "Reverb"
+msgstr "Reverberación"
+
+msgid "Reverb Room Size"
+msgstr "Tamaño del lugar de reverberación"
+
+msgid "Reverb Damping"
+msgstr "Amortiguación de reverberación"
+
+msgid "Reverb Width"
+msgstr "Anchura de reverberación"
+
+msgid "Reverb Level"
+msgstr "Nível de reverberación"
+
+msgid "Interpolation Method"
+msgstr "Método de interpolación"
+
+msgid "Dynamic Sample Loading"
+msgstr "Carga dinámica de muestras"
+
+msgid "Reverb Output Gain"
+msgstr "Ganancia de salida de reverberación"
+
+msgid "Reversed stereo"
+msgstr "Estéreo invertido"
+
+msgid "Nice ramp"
+msgstr "Rama bonita"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "Botones"
+
+msgid "Serial Port"
+msgstr "Puerto serie"
+
+msgid "RTS toggle"
+msgstr "Conmutación RTS"
+
+msgid "Revision"
+msgstr "Revisión"
+
+msgid "Controller"
+msgstr "Controlador"
+
+msgid "Show Crosshair"
+msgstr "Mostrar retícula"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "Dirección MAC"
+
+msgid "MAC Address OUI"
+msgstr "OUI de dirección MAC"
+
+msgid "Enable BIOS"
+msgstr "Habilitar BIOS"
+
+msgid "Baud Rate"
+msgstr "Tasa de baudios"
+
+msgid "TCP/IP listening port"
+msgstr "Puerto de escucha TCP/IP"
+
+msgid "Phonebook File"
+msgstr "Archivo de agenda telefónica"
+
+msgid "Telnet emulation"
+msgstr "Emulación Telnet"
+
+msgid "RAM Address"
+msgstr "Dirección de RAM"
+
+msgid "RAM size"
+msgstr "Tamaño de RAM"
+
+msgid "Initial RAM size"
+msgstr "Tamaño inicial de RAM"
+
+msgid "Serial Number"
+msgstr "Número de serie"
+
+msgid "Host ID"
+msgstr "ID de anfitrión"
+
+msgid "FDC Address"
+msgstr "Dirección del FDC"
+
+msgid "MPU-401 Address"
+msgstr "Dirección del MPU-401"
+
+msgid "MPU-401 IRQ"
+msgstr "IQ del MPU-401"
+
+msgid "Receive MIDI input"
+msgstr "Recebir entrada MIDI"
+
+msgid "Low DMA"
+msgstr "DMA bajo"
+
+msgid "Enable Game port"
+msgstr "Habilitar puerto de juegos"
+
+msgid "SID Model"
+msgstr "Modelo de SID"
+
+msgid "SID Filter Strength"
+msgstr "Fuerza del filtro de SID"
+
+msgid "Surround module"
+msgstr "Módulo Surround"
+
+msgid "CODEC"
+msgstr "CODEC"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "Activar la interrupción CODEC en la configuración CODEC (necesario para algunos controladores)"
+
+msgid "SB Address"
+msgstr "Dirección del SB"
+
+msgid "Adlib Address"
+msgstr "Dirección del Adlib"
+
+msgid "Use EEPROM setting"
+msgstr "Uitilizar la configuración del EEPROM"
+
+msgid "WSS IRQ"
+msgstr "IRQ de WSS"
+
+msgid "WSS DMA"
+msgstr "DMA de WSS"
+
+msgid "Enable OPL"
+msgstr "Habilitar OPL"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "Recebir entrada MIDI (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "DMA bajo del SB"
+
+msgid "6CH variant (6-channel)"
+msgstr "Variante 6CH (6 canales)"
+
+msgid "Enable CMS"
+msgstr "Habilitar CMS"
+
+msgid "Mixer"
+msgstr "Mezclador"
+
+msgid "High DMA"
+msgstr "DMA alto"
+
+msgid "Control PC speaker"
+msgstr "Controlar el altavoz del PC"
+
+msgid "Memory size"
+msgstr "Tamaño de memoria"
+
+msgid "EMU8000 Address"
+msgstr "Dirección de EMU8000"
+
+msgid "IDE Controller"
+msgstr "Controlador IDE"
+
+msgid "Codec"
+msgstr "Codec"
+
+msgid "GUS type"
+msgstr "Tipo de GUS"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "Habilitar comando 0x04 \"Salir de 86Box\""
+
+msgid "Display type"
+msgstr "Tipo de pantalla"
+
+msgid "Composite type"
+msgstr "Tipo de pantalla compuesta"
+
+msgid "RGB type"
+msgstr "Tipo de pantalla RGB"
+
+msgid "Line doubling type"
+msgstr "Tipo de duplicación de línea"
+
+msgid "Snow emulation"
+msgstr "Emulación de nieve"
+
+msgid "Monitor type"
+msgstr "Tipo de monitor"
+
+msgid "Character set"
+msgstr "Conjunto de caracteres"
+
+msgid "XGA type"
+msgstr "Tipo de XGA"
+
+msgid "Instance"
+msgstr "Instancia"
+
+msgid "MMIO Address"
+msgstr "Dirección de MMIO"
+
+msgid "RAMDAC type"
+msgstr "Tipo de RAMDAC"
+
+msgid "Blend"
+msgstr "Mezclar"
+
+msgid "Font"
+msgstr "Fuente"
+
+msgid "Bilinear filtering"
+msgstr "Filtrado bilineal"
+
+msgid "Video chroma-keying"
+msgstr "Clave cromática para vídeo"
+
+msgid "Dithering"
+msgstr "Dithering"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "Habilitar NMI para emulación CGA"
+
+msgid "Voodoo type"
+msgstr "Tipo de Voodoo"
+
+msgid "Framebuffer memory size"
+msgstr "Tamaño de memoria del framebuffer"
+
+msgid "Texture memory size"
+msgstr "Tamaño de memoria de textura"
+
+msgid "Dither subtraction"
+msgstr "Sustracción de dither"
+
+msgid "Screen Filter"
+msgstr "Filtro de pantalla"
+
+msgid "Render threads"
+msgstr "Hilos de renderización"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Dirección inicial"
+
+msgid "Contiguous Size"
+msgstr "Tamaño contiguo"
+
+msgid "I/O Width"
+msgstr "Anchura de E/S"
+
+msgid "Transfer Speed"
+msgstr "Velocidad de transferencia"
+
+msgid "EMS mode"
+msgstr "Modo EMS"
+
+msgid "EMS Address"
+msgstr "Dirección de EMS"
+
+msgid "EMS 1 Address"
+msgstr "Dirección de EMS 1"
+
+msgid "EMS 2 Address"
+msgstr "Dirección de EMS 2"
+
+msgid "EMS Memory Size"
+msgstr "Dirección de EMS"
+
+msgid "EMS 1 Memory Size"
+msgstr "Dirección de EMS 1"
+
+msgid "EMS 2 Memory Size"
+msgstr "Dirección de EMS 2"
+
+msgid "Enable EMS"
+msgstr "Habilitar EMS"
+
+msgid "Enable EMS 1"
+msgstr "Habilitar EMS 1"
+
+msgid "Enable EMS 2"
+msgstr "Habilitar EMS 2"
+
+msgid "Address for > 2 MB"
+msgstr "Dirección para > 2 MB"
+
+msgid "Frame Address"
+msgstr "Dirección del marco"
+
+msgid "USA"
+msgstr "EE.UU."
+
+msgid "Danish"
+msgstr "Danés"
+
+msgid "Always at selected speed"
+msgstr "Siempre a la velocidad seleccionada"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "Configuración de la BIOS + Teclas de acceso rápido (desactivadas durante la POST)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 KB desde F0000"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 KB desde E0000 (MSB de dirección invertido, últimas 64 KB primero)"
+
+msgid "Sine"
+msgstr "Sinusoidal"
+
+msgid "Triangle"
+msgstr "Triangular"
+
+msgid "Linear"
+msgstr "Lineal"
+
+msgid "4th Order"
+msgstr "De 4º orden"
+
+msgid "7th Order"
+msgstr "De 7º orden"
+
+msgid "Non-timed (original)"
+msgstr "No cronometrado (original)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (JMP2 no poblado)"
+
+msgid "Two"
+msgstr "Dos"
+
+msgid "Three"
+msgstr "Tres"
+
+msgid "Wheel"
+msgstr "Rueda"
+
+msgid "Five + Wheel"
+msgstr "Cinco + rueda"
+
+msgid "Five + 2 Wheels"
+msgstr "Cinco + 2 ruedas"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 serie / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) serie"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "Deshabilitar BIOS"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2 MB"
+
+msgid "8 MB"
+msgstr "8 MB"
+
+msgid "28 MB"
+msgstr "28 MB"
+
+msgid "1 MB"
+msgstr "1 MB"
+
+msgid "4 MB"
+msgstr "4 MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16 MB"
+
+msgid "20 MB"
+msgstr "20 MB"
+
+msgid "24 MB"
+msgstr "24 MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (estéreo)"
+
+msgid "Classic"
+msgstr "Clásico"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "Compuesto"
+
+msgid "True color"
+msgstr "Verdadero color"
+
+msgid "Old"
+msgstr "Viejo"
+
+msgid "New"
+msgstr "Nuevo"
+
+msgid "Color (generic)"
+msgstr "Color (genérico)"
+
+msgid "Green Monochrome"
+msgstr "Monocromo verde"
+
+msgid "Amber Monochrome"
+msgstr "Monocromo ámbar"
+
+msgid "Gray Monochrome"
+msgstr "Monocromo gris"
+
+msgid "Color (no brown)"
+msgstr "Color (sin marrón)"
+
+msgid "Color (IBM 5153)"
+msgstr "Color (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Duplicación simple"
+
+msgid "sRGB interpolation"
+msgstr "Interpolación sRGB"
+
+msgid "Linear interpolation"
+msgstr "Interpolación lineare"
+
+msgid "Has secondary 8x8 character set"
+msgstr "Tiene conjunto de carácteres 8x8 secundário"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Tiene tarjeta hija Quadcolor II"
+
+msgid "Alternate monochrome contrast"
+msgstr "Contraste monocromo alternativo"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Monocromo (5151/MDA) (blanco)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Monocromo (5151/MDA) (verde)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Monocromo (5151/MDA) (ámbar)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Color 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Color 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Color mejorado - modo normal (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Color mejorado - modo mejorado (5154/ECD)"
+
+msgid "Green"
+msgstr "Verde"
+
+msgid "Amber"
+msgstr "Ámbar"
+
+msgid "Gray"
+msgstr "Gris"
+
+msgid "Grayscale"
+msgstr "Escala de gris"
+
+msgid "Color"
+msgstr "Color"
+
+msgid "U.S. English"
+msgstr "Inglés de EE.UU."
+
+msgid "Scandinavian"
+msgstr "Escandinavo"
+
+msgid "Other languages"
+msgstr "Otros idiomas"
+
+msgid "Bochs latest"
+msgstr "Bochs más nuevo"
+
+msgid "Apply overscan deltas"
+msgstr "Aplicar deltas de overscan"
+
+msgid "Mono Interlaced"
+msgstr "Monocromo entrelazado"
+
+msgid "Mono Non-Interlaced"
+msgstr "Monocromo no entrelazado"
+
+msgid "Color Interlaced"
+msgstr "Color entrelazado"
+
+msgid "Color Non-Interlaced"
+msgstr "Color no entrelazado"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "Gráficos 3dfx Voodoo"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 unidades TMU)"
+
+msgid "8-bit"
+msgstr "8 bitss"
+
+msgid "16-bit"
+msgstr "16 bits"
+
+msgid "Standard (150ns)"
+msgstr "Estándar (150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "Alta velocidad (120ns)"
+
+msgid "Enabled"
+msgstr "Habilitado"
+
+msgid "Standard"
+msgstr "Estándar"
+
+msgid "High-Speed"
+msgstr "Alta velocidad"
+
+msgid "Stereo LPT DAC"
+msgstr "DAC LPT estéreo"
+
+msgid "Generic Text Printer"
+msgstr "Impresora genérica de texto"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Impresora matricial ESC/P 2 genérica"
+
+msgid "Generic PostScript Printer"
+msgstr "Impresora genérica PostScript"
+
+msgid "Generic PCL5e Printer"
+msgstr "Impresora genérica PCL5e"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Protocolo de Internet de línea paralela"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Dongle de protección para Savage Quest"
+
+msgid "Serial Passthrough Device"
+msgstr "Dispositivo de paso de puerto serie"
+
+msgid "Passthrough Mode"
+msgstr "Modo de paso"
+
+msgid "Host Serial Device"
+msgstr "Dispositivo serie anfitrión"
+
+msgid "Name of pipe"
+msgstr "Nombre de tubería"
+
+msgid "Data bits"
+msgstr "Bits de datos"
+
+msgid "Stop bits"
+msgstr "Bits de parada"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Tasa de baudios de paso"
+
+msgid "Named Pipe (Server)"
+msgstr "Tubería con nombre (servidor)"
+
+msgid "Named Pipe (Client)"
+msgstr "Tubería con nombre (cliente)"
+
+msgid "Host Serial Passthrough"
+msgstr "Paso del puerto serie del host"
+
+msgid "E&ject %1"
+msgstr "E&xtraer %1"
+
+msgid "&Unmute"
+msgstr "&Reactivar sonido"
+
+msgid "Softfloat FPU"
+msgstr "FPU Softfloat"
+
+msgid "High performance impact"
+msgstr "Alto impact en el rendimiento"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Genérico] Disco RAM (velocidad máxima)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Genérico] 1989 (3500 RPM)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Genérico] 1992 (3600 RPM)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Genérico] 1994 (4500 RPM)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Genérico] 1996 (5400 RPM)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Genérico] 1997 (5400 RPM)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Genérico] 1998 (5400 RPM)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Genérico] 2000 (7200 RPM)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "Clon IBM 8514/A (ISA)"
+
+msgid "Vendor"
+msgstr "Fabricante"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Expansión de Memoria Generica PC/XT"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Expansión de Memoria Generica PC/AT"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "No fué posible encontrar las fuentes matriciales"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "Las fuentes TrueType en el directorio \"roms/printer/fonts\" son necesarias para la emulación de la impresora matricial ESC/P 2 genérica."
+
+msgid "Inhibit multimedia keys"
+msgstr "Inhibir teclas multimedia"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Pedir confirmación antes de guardar la configuración"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Pedir confirmación antes del hard reset"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Pedir confirmación antes de salir"
+
+msgid "Options"
+msgstr "Opciones"
+
+msgid "Model"
+msgstr "Modelo"
+
+msgid "Model:"
+msgstr "Modelo:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Error al inicializar el renderizador Vulkan."
+
+msgid "GLSL Error"
+msgstr "Error de GLSL"
+
+msgid "Could not load shader: %1"
+msgstr "No fué posible cargar el shader: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "Se requiere la versión 3.0 o superior de OpenGL. La versión actual de GLSL es %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "Error al cargar la textura: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "Error al compilar el shader:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "Programa no vinculado:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "Administrador de shaders"
+
+msgid "Shader Configuration"
+msgstr "Configuración de shaders"
+
+msgid "Add"
+msgstr "Añadir"
+
+msgid "Move up"
+msgstr "Mover para arriba"
+
+msgid "Move down"
+msgstr "Mover para abajo"
+
+msgid "Could not load file %1"
+msgstr "Error al cargar el archivo %1"
+
+msgid "Key Bindings:"
+msgstr "Atajos de teclado:"
+
+msgid "Action"
+msgstr "Acción"
+
+msgid "Keybind"
+msgstr "Atajo"
+
+msgid "Clear binding"
+msgstr "Limpiar atajo"
+
+msgid "Bind"
+msgstr "Vincular"
+
+msgid "Bind Key"
+msgstr "Vincular tecla"
+
+msgid "Enter key combo:"
+msgstr "Escribir combinación de teclas:"
+
+msgid "Bind conflict"
+msgstr "Conflicto entre atajos"
+
+msgid "This key combo is already in use."
+msgstr "Esta combinación de teclas ya está en uso."
+
+msgid "Send Control+Alt+Del"
+msgstr "Enviar Control+Alt+Del"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Enviar Control+Alt+Escape"
+
+msgid "Toggle fullscreen"
+msgstr "Alternar pantalla completa"
+
+msgid "Screenshot"
+msgstr "Captura de pantalla"
+
+msgid "Release mouse pointer"
+msgstr "Soltar el puntero del ratón"
+
+msgid "Toggle pause"
+msgstr "Alternar pausa"
+
+msgid "Toggle mute"
+msgstr "Alternar silencio"
+
+msgid "Text files"
+msgstr "Archivos de texto"
+
+msgid "ROM files"
+msgstr "Archivos de ROM"
+
+msgid "SoundFont files"
+msgstr "Archivos SoundFont"
+
+msgid "Local Switch"
+msgstr "Conmutador local"
+
+msgid "Remote Switch"
+msgstr "Conmutador remoto"
+
+msgid "Switch:"
+msgstr "Conmutador:"
+
+msgid "Hub Mode"
+msgstr "Modo de concentrador"
+
+msgid "Hostname:"
+msgstr "Nombre de host:"
+
+msgid "ISA RAM:"
+msgstr "RAM ISA:"
+
+msgid "ISA ROM:"
+msgstr "ROM ISA:"
+
+msgid "&Wipe NVRAM"
+msgstr "&Limpiar el NVRAM"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "Estó borrará todos los archivos de NVRAM (y relacionados) de la máquina virtual ubicados en el subdirectório \"nvr\". Tendrá que reconifigurar la definiciones del BIOS (y talvez de otros dispositivoes dentro de la MV) otra vez si aplicable.\n\n¿Está seguro de que quierere limpiar todos los contenidos de la NVRAM de la máquina virtual \"%1\"?"
+
+msgid "Success"
+msgstr "Éxito"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "Los contenidos de la NVRAM de la máquina virtual \"%1\" han sido limpiadas con éxito"
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "Ha ocurrido un error al intentar de limpiar los contenidos de la NVRAM de la máquina virtual \"%1\""
+
+msgid "%1 VM Manager"
+msgstr "Administrador de MV de %1"
+
+msgid "%n disk(s)"
+msgstr "%n disco(s)"
+
+msgid "Unknown Status"
+msgstr "Estado desconocido"
+
+msgid "No Machines Found!"
+msgstr "¡No fueron encontradas máquinas!"
+
+msgid "Check for updates on startup"
+msgstr "Contorlar actualizaciones al iniciar"
+
+msgid "Unable to determine release information"
+msgstr "No fué posible determinar informaciones de la versión"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Ha ocurrido un error al verificar actualizaciones:\n\n%1\n\nPor favor, intente otra vez más tarde."
+
+msgid "Update check complete"
+msgstr "Verificación de actualizaciones completada"
+
+msgid "stable"
+msgstr "estable"
+
+msgid "beta"
+msgstr "beta"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Está ejecutando la última versión %1 de 86Box: %2"
+
+msgid "version"
+msgstr "versión"
+
+msgid "build"
+msgstr "compilación"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Actualmente está a ejecutar la versión <b>%1</b>."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "<b>La versión %1</b> está ahora disponible."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Actualmente está a ejecutar la compialación <b>%1</b>."
+
+msgid "<b>Build %1</b> is now available."
+msgstr "<b>La compilación %1</b> está ahora disponible."
+
+msgid "Would you like to visit the download page?"
+msgstr "¿Quería visitar a la página de descargas?"
+
+msgid "Visit download page"
+msgstr "Visitar a la página de descargas"
+
+msgid "Update check"
+msgstr "Verificación de actualizaciones"
+
+msgid "Checking for updates..."
+msgstr "Verificando las actualizaciones..."
+
+msgid "86Box Update"
+msgstr "Actualización de 86Box"
+
+msgid "Release notes:"
+msgstr "Notas de versión:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "Terminación inesperada de la máquina virtual"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "El proceso de la máquina virtual \"%1\" terminó inesperadamente con el código de salida %2."
+
+msgid "The system will not be added."
+msgstr "El sistema no será añadido."
+
+msgid "&Update mouse every CPU frame"
+msgstr "&Actualiza el estado del ratón en cada bloco de CPU"
+
+msgid "Hue"
+msgstr "Tono"
+
+msgid "Saturation"
+msgstr "Saturación"
+
+msgid "Contrast"
+msgstr "Contraste"
+
+msgid "Brightness"
+msgstr "Brillo"
+
+msgid "Sharpness"
+msgstr "Nitidez"
+
+msgid "&CGA composite settings..."
+msgstr "Configuración del modo compuesto &CGA..."
+
+msgid "CGA composite settings"
+msgstr "Configuración del modo compuesto CGA"
+
+msgid "Monitor EDID"
+msgstr "EDID du moniteur"
+
+msgid "Export..."
+msgstr "Exporter..."
+
+msgid "Export EDID"
+msgstr "EDID exportieren"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "El archivo EDID \"%ls\" es demasiado grande."
+
+msgid "OpenGL input scale"
+msgstr "Escala de entrada de OpenGL"
+
+msgid "OpenGL input stretch mode"
+msgstr "Modo de estiramiento de entrada de OpenGL"
+
+msgid "Color scheme"
+msgstr "Esquema de colores"
+
+msgid "Light"
+msgstr "Luz"
+
+msgid "Dark"
+msgstr "Oscuro"
diff --git a/src/qt/languages/fi-FI.po b/src/qt/languages/fi-FI.po
index 4998d008b..475d94b7b 100644
--- a/src/qt/languages/fi-FI.po
+++ b/src/qt/languages/fi-FI.po
@@ -1,3 +1,11 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: fi_FI\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
 msgstr "&Toiminto"
 
@@ -10,8 +18,8 @@ msgstr "&Oikea CTRL on vasen ALT"
 msgid "&Hard Reset..."
 msgstr "&Uudelleenkäynnistys (kylmä)..."
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Ctrl+Alt+Del\tCtrl+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "&Ctrl+Alt+Del"
 
 msgid "Ctrl+Alt+&Esc"
 msgstr "Ctrl+Alt+&Esc"
@@ -19,8 +27,14 @@ msgstr "Ctrl+Alt+&Esc"
 msgid "&Pause"
 msgstr "&Tauko"
 
-msgid "E&xit..."
-msgstr "&Poistu..."
+msgid "Pause"
+msgstr ""
+
+msgid "Re&sume"
+msgstr ""
+
+msgid "E&xit"
+msgstr "&Poistu"
 
 msgid "&View"
 msgstr "&Näytä"
@@ -40,14 +54,8 @@ msgstr "&Muista koko ja sijainti"
 msgid "Re&nderer"
 msgstr "&Renderöijä"
 
-msgid "&SDL (Software)"
-msgstr "&SDL (ohjelmistopohjainen)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (&laitteistokiihdytetty)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
+msgid "&Qt (Software)"
+msgstr "&Qt (ohjelmistopohjainen)"
 
 msgid "Open&GL (3.0 Core)"
 msgstr "Open&GL (3.0 Core)"
@@ -55,11 +63,11 @@ msgstr "Open&GL (3.0 Core)"
 msgid "&VNC"
 msgstr "&VNC"
 
-msgid "Specify dimensions..."
+msgid "Specify &dimensions..."
 msgstr "&Määritä koko..."
 
-msgid "F&orce 4:3 display ratio"
-msgstr "Pakota 4:3-näyttösuhde"
+msgid "Force &4:3 display ratio"
+msgstr "Pakota &4:3-kuvasuhde"
 
 msgid "&Window scale factor"
 msgstr "&Ikkunan kokokerroin"
@@ -94,7 +102,7 @@ msgstr "&7x"
 msgid "&8x"
 msgstr "&8x"
 
-msgid "Filter method"
+msgid "Fi&lter method"
 msgstr "&Suodatusmetodi"
 
 msgid "&Nearest"
@@ -106,8 +114,8 @@ msgstr "Li&neaarinen interpolaatio"
 msgid "Hi&DPI scaling"
 msgstr "&Suuri DPI-skaalaus"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "&Koko näytön tila\tCtrl+Alt+PgUp"
+msgid "&Fullscreen"
+msgstr "&Koko näytön tila"
 
 msgid "Fullscreen &stretch mode"
 msgstr "Koko näytön &skaalaustila"
@@ -127,7 +135,7 @@ msgstr "&Kokonaislukuskaalaus"
 msgid "4:&3 Integer scale"
 msgstr "4:&3 Kokonaislukuskaalaus"
 
-msgid "E&GA/(S)VGA settings"
+msgid "EGA/(S)&VGA settings"
 msgstr "&EGA/(S)VGA-asetukset"
 
 msgid "&Inverted VGA monitor"
@@ -139,9 +147,15 @@ msgstr "VGA-näytön &tyyppi"
 msgid "RGB &Color"
 msgstr "RGB, &värit"
 
+msgid "RGB (no brown)"
+msgstr "RGB (ei ruskeaa)"
+
 msgid "&RGB Grayscale"
 msgstr "&RGB, harmaasävy"
 
+msgid "Generic RGBI color monitor"
+msgstr ""
+
 msgid "&Amber monitor"
 msgstr "&Meripihkanvärinen"
 
@@ -164,7 +178,7 @@ msgid "&Average"
 msgstr "&Keskiarvo"
 
 msgid "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
-msgstr "CGA/PCjr/Tandy/E&GA/(S)VGA &yliskannaus"
+msgstr "CGA/PCjr/Tandy/E&GA/(S)VGA-&yliskannaus"
 
 msgid "Change contrast for &monochrome display"
 msgstr "&Muuta harmaavärinäytön kontrastia"
@@ -176,28 +190,34 @@ msgid "&Tools"
 msgstr "Työ&kalut"
 
 msgid "&Settings..."
-msgstr "&Kokoonpano..."
+msgstr "&Asetukset..."
+
+msgid "Settings..."
+msgstr "Asetukset..."
 
 msgid "&Update status bar icons"
 msgstr "&Päivitä tilapalkin kuvakkeita"
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "Ota &kuvakaappaus\tCtrl+F11"
+msgid "Take s&creenshot"
+msgstr "Ota &kuvakaappaus"
+
+msgid "S&ound"
+msgstr "&Ääni"
 
 msgid "&Preferences..."
 msgstr "&Sovellusasetukset..."
 
 msgid "Enable &Discord integration"
-msgstr "Käytä &Discord-integraatiota"
+msgstr "&Discord-integraatio"
 
 msgid "Sound &gain..."
 msgstr "&Äänitasot..."
 
-msgid "Begin trace\tCtrl+T"
-msgstr "Aloita jäljitys\tCtrl+T"
+msgid "Begin trace"
+msgstr "Aloita jäljitys"
 
-msgid "End trace\tCtrl+T"
-msgstr "Lopeta jäljitys\tCtrl+T"
+msgid "End trace"
+msgstr "Lopeta jäljitys"
 
 msgid "&Help"
 msgstr "&Ohje"
@@ -209,13 +229,13 @@ msgid "&About 86Box..."
 msgstr "&Tietoja 86Boxista..."
 
 msgid "&New image..."
-msgstr "&Uusi kasettikuva..."
+msgstr "&Uusi levykuva..."
 
 msgid "&Existing image..."
-msgstr "&Olemassaoleva kasettikuva..."
+msgstr "&Olemassaoleva levykuva..."
 
 msgid "Existing image (&Write-protected)..."
-msgstr "Olemassaoleva kasettikuva (&kirjoitussuojattu)..."
+msgstr "Olemassaoleva levykuva (&kirjoitussuojattu)..."
 
 msgid "&Record"
 msgstr "&Nauhoita"
@@ -230,10 +250,10 @@ msgid "&Fast forward to the end"
 msgstr "Kelaa &loppuun"
 
 msgid "E&ject"
-msgstr "&Poista kasettipesästä"
+msgstr "&Irrota"
 
 msgid "&Image..."
-msgstr "&ROM-moduulikuva..."
+msgstr "&Levykuva..."
 
 msgid "E&xport to 86F..."
 msgstr "&Vie 86F-tiedostoon..."
@@ -244,8 +264,8 @@ msgstr "&Mykistä"
 msgid "E&mpty"
 msgstr "&Tyhjä"
 
-msgid "&Reload previous image"
-msgstr "&Lataa edellinen levykuva uudelleen"
+msgid "Reload previous image"
+msgstr "Lataa edellinen levykuva uudelleen"
 
 msgid "&Folder..."
 msgstr "&Kansio..."
@@ -301,18 +321,12 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Peruuta"
 
-msgid "Save these settings as &global defaults"
-msgstr "Tallenna nämä asetukset &globaaleiksi oletuksiksi"
-
 msgid "&Default"
 msgstr "&Oletus"
 
 msgid "Language:"
 msgstr "Kieli:"
 
-msgid "Icon set:"
-msgstr "Kuvakkeet:"
-
 msgid "Gain"
 msgstr "Taso"
 
@@ -346,6 +360,9 @@ msgstr "Tietokone:"
 msgid "Configure"
 msgstr "Määritys"
 
+msgid "CPU:"
+msgstr ""
+
 msgid "CPU type:"
 msgstr "Suorittimen tyyppi:"
 
@@ -382,11 +399,23 @@ msgstr "Käytössä (UTC)"
 msgid "Dynamic Recompiler"
 msgstr "Dynaaminen uudelleenkääntäjä"
 
+msgid "CPU frame size"
+msgstr "CPU frame-koko"
+
+msgid "Larger frames (less smooth)"
+msgstr "Suuret framet (vähemmän sulava)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Pienemmät framet (sulavampi)"
+
 msgid "Video:"
 msgstr "Näytönohjain:"
 
-msgid "Voodoo Graphics"
-msgstr "Voodoo-grafiikkasuoritin"
+msgid "Video #2:"
+msgstr "Toinen näytönohjain:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Voodoo 1 tai 2-grafiikkasuoritin"
 
 msgid "IBM 8514/A Graphics"
 msgstr "IBM 8514/A-grafiikkasuoritin"
@@ -394,12 +423,27 @@ msgstr "IBM 8514/A-grafiikkasuoritin"
 msgid "XGA Graphics"
 msgstr "XGA-grafiikkasuoritin"
 
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "IBM PS/55-näyttöadapteri"
+
+msgid "Keyboard:"
+msgstr "Näppäimistö:"
+
+msgid "Keyboard"
+msgstr "Näppäimistö"
+
 msgid "Mouse:"
 msgstr "Hiiri:"
 
+msgid "Mouse"
+msgstr ""
+
 msgid "Joystick:"
 msgstr "Peliohjain:"
 
+msgid "Joystick"
+msgstr ""
+
 msgid "Joystick 1..."
 msgstr "Peliohjain 1..."
 
@@ -430,6 +474,9 @@ msgstr "MIDI-ulostulo:"
 msgid "MIDI In Device:"
 msgstr "MIDI-sisääntulo:"
 
+msgid "MIDI Out:"
+msgstr "MIDI-ulostulo:"
+
 msgid "Standalone MPU-401"
 msgstr "Erillinen MPU-401"
 
@@ -445,15 +492,6 @@ msgstr "Nuked (tarkempi)"
 msgid "YMFM (faster)"
 msgstr "YMFM (nopeampi)"
 
-msgid "Network type:"
-msgstr "Verkon tyyppi:"
-
-msgid "PCap device:"
-msgstr "PCap-laite:"
-
-msgid "Network adapter:"
-msgstr "Verkkokortti:"
-
 msgid "COM1 Device:"
 msgstr "COM1-laite:"
 
@@ -478,6 +516,9 @@ msgstr "LPT3-laite:"
 msgid "LPT4 Device:"
 msgstr "LPT4-laite:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr "Sisäisen LPT:n ECP DMA:"
+
 msgid "Serial port 1"
 msgstr "Sarjaportti 1"
 
@@ -502,18 +543,21 @@ msgstr "Rinnakkaisportti 3"
 msgid "Parallel port 4"
 msgstr "Rinnakkaisportti 4"
 
-msgid "HD Controller:"
-msgstr "Kiintolevyohjain:"
-
 msgid "FD Controller:"
 msgstr "Levykeohjain:"
 
+msgid "CD-ROM Controller:"
+msgstr "CD-ohjain:"
+
 msgid "Tertiary IDE Controller"
 msgstr "Kolmas IDE-ohjain"
 
 msgid "Quaternary IDE Controller"
 msgstr "Neljäs IDE-ohjain"
 
+msgid "Hard disk"
+msgstr "Kiintolevy"
+
 msgid "SCSI"
 msgstr "SCSI"
 
@@ -535,6 +579,9 @@ msgstr "Kasettiasema"
 msgid "Hard disks:"
 msgstr "Kiintolevyt:"
 
+msgid "Firmware Version"
+msgstr "Laiteohjelmiston versio"
+
 msgid "&New..."
 msgstr "&Uusi..."
 
@@ -589,14 +636,17 @@ msgstr "Tarkista BPB"
 msgid "CD-ROM drives:"
 msgstr "CD-ROM-asemat:"
 
-msgid "Earlier drive"
-msgstr "Aiemmat asemat"
-
 msgid "MO drives:"
 msgstr "Magneettisoptiset asemat (MO):"
 
-msgid "ZIP drives:"
-msgstr "ZIP-asemat:"
+msgid "MO:"
+msgstr ""
+
+msgid "Removable disks:"
+msgstr "Irrotettavat levyt:"
+
+msgid "Removable disk drives:"
+msgstr "Irrotettavat levyasemat:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
@@ -607,6 +657,9 @@ msgstr "ISA-RTC (kello):"
 msgid "ISA Memory Expansion"
 msgstr "ISA-muistilaajennus"
 
+msgid "ISA ROM Cards"
+msgstr "ISA ROM-kortit"
+
 msgid "Card 1:"
 msgstr "Kortti 1:"
 
@@ -619,18 +672,21 @@ msgstr "Kortti 3:"
 msgid "Card 4:"
 msgstr "Kortti 4:"
 
+msgid "Generic ISA ROM Board"
+msgstr ""
+
+msgid "Generic Dual ISA ROM Board"
+msgstr ""
+
+msgid "Generic Quad ISA ROM Board"
+msgstr ""
+
 msgid "ISABugger device"
 msgstr "ISABugger-laite"
 
 msgid "POST card"
 msgstr "POST-kortti"
 
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
-
 msgid "86Box"
 msgstr "86Box"
 
@@ -643,17 +699,20 @@ msgstr "Vakava virhe"
 msgid " - PAUSED"
 msgstr " - TAUKO"
 
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Paina Ctrl+Alt+PgDn palataksesi ikkunoituun tilaan."
-
 msgid "Speed"
 msgstr "Nopeus"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "Irrotettava levy %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "ZIP-levykuvat"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "&Irrotettava levy %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Irrotettavat levykuvat"
+
+msgid "Image %1"
+msgstr "Levykuva %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
 msgstr "86Box ei löytänyt käyttökelpoisia ROM-tiedostoja.\n\nVoit <a href=\"https://github.com/86Box/roms/releases/latest\">ladata</a> ROM-paketin ja purkaa sen \"roms\"-hakemistoon."
@@ -683,10 +742,16 @@ msgid "Surface images"
 msgstr "Pintalevykuvat"
 
 msgid "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
-msgstr "Konetta \"%hs\" ei voi käyttää puuttuvien ROM-tiedostojen vuoksi. Vaihdetaan käyttökelpoiseen koneeseen."
+msgstr "Konetta \"%hs\" ei voida käyttää, koska roms/machines-hakemistosta puuttuu ROM-tiedostoja. Vaihdetaan käyttökelpoiseen koneeseen."
 
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
-msgstr "Näytönohjainta \"%hs\" ei voi käyttää puuttuvien ROM-tiedostojen vuoksi. Vaihdetaan käyttökelpoiseen näytönohjaimeen."
+msgstr "Näytönohjainta \"%hs\" ei voida käyttää, koska roms/video-hakemistosta puuttuu ROM-tiedostoja. Vaihdetaan käyttökelpoiseen näytönohjaimeen."
+
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "Toista näytönohjainta \"%hs\" ei voida käyttää, koska roms/video-hakemistosta puuttuu ROM-tiedostoja. Toinen näytönohjain poistetaan käytöstä."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "Laitetta \"%hs\" ei voida käyttää puuttuvien ROM-tiedostojen vuoksi. Laite jätetään huomiotta."
 
 msgid "Machine"
 msgstr "Tietokone"
@@ -706,29 +771,50 @@ msgstr "Verkko"
 msgid "Ports (COM & LPT)"
 msgstr "Portit (COM & LPT)"
 
+msgid "Ports"
+msgstr "Portit"
+
+msgid "Serial ports:"
+msgstr "Sarjaportit:"
+
+msgid "Parallel ports:"
+msgstr "Rinnakkaisportit:"
+
 msgid "Storage controllers"
 msgstr "Tallennusohjaimet"
 
 msgid "Hard disks"
 msgstr "Kiintolevyt"
 
+msgid "Disks:"
+msgstr "Levyt:"
+
+msgid "Floppy:"
+msgstr "Levyke:"
+
+msgid "Controllers:"
+msgstr "Ohjaimet:"
+
 msgid "Floppy & CD-ROM drives"
-msgstr "Levyke ja CD-ROM"
+msgstr "Levyke- ja CD-ROM-asemat"
 
 msgid "Other removable devices"
-msgstr "Muut tallennuslaitteet"
+msgstr "Muut irrotettavat laitteet"
 
 msgid "Other peripherals"
 msgstr "Muut oheislaitteet"
 
+msgid "Other devices"
+msgstr "Muut laitteet"
+
 msgid "Click to capture mouse"
 msgstr "Kaappaa hiiri klikkaamalla"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "Paina F8+F12 vapauttaaksesi hiiren"
+msgid "Press %1 to release mouse"
+msgstr "Paina %1 vapauttaaksesi hiiren"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Paina F8+F12 tai keskipainiketta vapauttaaksesi hiiren"
+msgid "Press %1 or middle button to release mouse"
+msgstr "Paina %1 tai keskipainiketta vapauttaaksesi hiiren"
 
 msgid "Bus"
 msgstr "Väylä"
@@ -746,67 +832,91 @@ msgid "S"
 msgstr "S"
 
 msgid "KB"
-msgstr "kt"
-
-msgid "Could not initialize the video renderer."
-msgstr "Videorenderöijän alustus epäonnistui"
+msgstr "Kt"
 
 msgid "Default"
 msgstr "Oletus"
 
-msgid "%i Wait state(s)"
-msgstr "%i odotustilaa"
+msgid "%1 Wait state(s)"
+msgstr "%1 odotustilaa"
 
 msgid "Type"
 msgstr "Tyyppi"
 
-msgid "Failed to set up PCap"
-msgstr "PCap-asennus epäonnistui"
-
 msgid "No PCap devices found"
 msgstr "PCap-laitteita ei löytynyt"
 
 msgid "Invalid PCap device"
 msgstr "Virheellinen PCap-laite"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "Standardi 2-painikkeinen peliohjain/-ohjaimet"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "2-akseliset 2-painikkeiset peliohjaimet"
 
-msgid "Standard 4-button joystick"
-msgstr "Standardi 4-painikkeinen peliohjain"
+msgid "2-axis, 4-button joystick"
+msgstr "2-akselinen 4-painikkeinen peliohjain"
 
-msgid "Standard 6-button joystick"
-msgstr "Standardi 6-painikkeinen peliohjain"
+msgid "2-axis, 6-button joystick"
+msgstr "2-akselinen 6-painikkeinen peliohjain"
 
-msgid "Standard 8-button joystick"
-msgstr "Standardi 8-painikkeinen peliohjain"
+msgid "2-axis, 8-button joystick"
+msgstr "2-akselinen 8-painikkeinen peliohjain"
+
+msgid "3-axis, 2-button joystick"
+msgstr "3-akselinen 2-painikkeinen peliohjain"
+
+msgid "3-axis, 4-button joystick"
+msgstr "3-akselinen 4-painikkeinen peliohjain"
+
+msgid "4-axis, 4-button joystick"
+msgstr "4-akselinen 4-painikkeinen peliohjain"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr ""
+
 msgid "Microsoft SideWinder Pad"
 msgstr "Microsoft SideWinder Pad"
 
 msgid "Thrustmaster Flight Control System"
 msgstr "Thrustmaster Flight Control System"
 
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr ""
+
+msgid "2-button gamepad(s)"
+msgstr "2-painikkeiset peliohjaimet"
+
+msgid "2-button flight yoke"
+msgstr "2-painikkeinen lento-ohjain"
+
+msgid "4-button gamepad"
+msgstr "4-painikkeinen peliohjain"
+
+msgid "4-button flight yoke"
+msgstr "4-painikkeinen lento-ohjain"
+
+msgid "2-button flight yoke with throttle"
+msgstr "2-painikkeinen lento-ohjain kaasuvivulla"
+
+msgid "4-button flight yoke with throttle"
+msgstr "4-painikkeinen lento-ohjain kaasuvivulla"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Win95-ratti (3-akselinen, 4-painikkeinen)"
+
 msgid "None"
 msgstr "Ei mikään"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "Näppäinkiihdyttimien lataus epäonnistui"
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 Mt (CHS: %2, %3, %4)"
 
-msgid "Unable to register raw input."
-msgstr "Raakasyötteen rekisteröinti epäonnistui"
+msgid "Floppy %1 (%2): %3"
+msgstr "Levyke %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u Mt (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Levyke %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "&Levyke %1 (%2): %3"
 
 msgid "Advanced sector images"
 msgstr "Kehittyneet sektorilevykuvat"
@@ -814,9 +924,6 @@ msgstr "Kehittyneet sektorilevykuvat"
 msgid "Flux images"
 msgstr "Flux-levykuvat"
 
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "SDL:n alustus epäonnistui. Tarvitaan SDL2.dll"
-
 msgid "Are you sure you want to hard reset the emulated machine?"
 msgstr "Haluatko varmasti käynnistää emuloidun tietokoneen uudelleen?"
 
@@ -826,8 +933,14 @@ msgstr "Haluatko varmasti sulkea 86Boxin?"
 msgid "Unable to initialize Ghostscript"
 msgstr "Ghostscriptin alustus epäonnistui"
 
-msgid "MO %i (%ls): %ls"
-msgstr "MO %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "GhostPCLin alustus epäonnistui"
+
+msgid "MO %1 (%2): %3"
+msgstr "MO %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&MO %1 (%2): %3"
 
 msgid "MO images"
 msgstr "MO-levykuvat"
@@ -835,8 +948,17 @@ msgstr "MO-levykuvat"
 msgid "Welcome to 86Box!"
 msgstr "Tervetuloa 86Boxiin!"
 
-msgid "Internal controller"
-msgstr "Sisäinen ohjain"
+msgid "Internal device"
+msgstr "Sisäinen laite"
+
+msgid "&File"
+msgstr "&Tiedosto"
+
+msgid "&New machine..."
+msgstr "&Uusi kone..."
+
+msgid "&Check for updates..."
+msgstr "T&arkista päivitykset..."
 
 msgid "Exit"
 msgstr "Poistu"
@@ -860,34 +982,22 @@ msgid "86Box v"
 msgstr "86Box v"
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "Vanhojen tietokoneiden emulaattori\n\nTekijät: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne ja muut.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho ja muut.\n\nJulkaistu GNU General Public License 2. version tai myöhemmän alaisena. Tarkempia tietoja LICENSE-tiedostossa."
+msgstr "Vanhojen tietokoneiden emulaattori\n\nTekijät: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne ja muut.\n\nSisältää Sarah Walkerin, leilein, JohnElliottin, greatpsychon ja muiden aiemmat keskeiset työpanokset.\n\nJulkaistu GNU General Public License 2. version tai myöhemmän alaisena. Tarkempia tietoja LICENSE-tiedostossa."
 
 msgid "Hardware not available"
 msgstr "Laitteisto ei ole saatavilla"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Varmista, että libpcap on asennettu ja että verkkoyhteytesi on libpcap-yhteensopiva."
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "Varmista, että %1 on asennettu ja että verkkoyhteytesi on %1-yhteensopiva."
 
 msgid "Invalid configuration"
-msgstr "Virheelliset määritykset"
+msgstr "Virheellinen määritys"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 vaaditaan PostScript-tiedostojen automaattiseen muuntamiseen PDF-tiedostoiksi.\n\nKaikki geneeriselle PostScript-tulostimelle lähetetyt asiakirjat tallennetaan PostScript (.ps) -tiedostoina."
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " vaaditaan PostScript-tiedostojen automaattiseen muuntamiseen PDF-tiedostoiksi.\n\nKaikki geneeriselle PostScript-tulostimelle lähetetyt asiakirjat tallennetaan PostScript (.ps) -tiedostoina."
-
-msgid "Entering fullscreen mode"
-msgstr "Siirrytään koko näytön tilaan"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 vaaditaan PCL-tiedostojen automaattiseen muuntamiseen PDF-tiedostoiksi.\n\nKaikki geneeriselle PCL-tulostimelle lähetetyt asiakirjat tallennetaan Printer Command Language (.ps) -tiedostoina."
 
 msgid "Don't show this message again"
 msgstr "Älä näytä tätä viestiä uudelleen"
@@ -904,20 +1014,17 @@ msgstr "Älä käynnistä uudelleen"
 msgid "CD-ROM images"
 msgstr "CD-ROM-levykuvat"
 
-msgid "%hs Device Configuration"
-msgstr "%hs - Laitteen määritykset"
+msgid "%1 Device Configuration"
+msgstr "%1 - Laitteen määritykset"
 
 msgid "Monitor in sleep mode"
 msgstr "Näyttö lepotilassa"
 
-msgid "OpenGL Shaders"
-msgstr "OpenGL-varjostinohjelmat"
-
-msgid "OpenGL options"
-msgstr "OpenGL-asetukset"
+msgid "GLSL shaders"
+msgstr "GLSL-varjostinohjelmat"
 
 msgid "You are loading an unsupported configuration"
-msgstr "Olet lataamassa ei-tuettuja määrittelyjä"
+msgstr "Olet lataamassa ei-tuettua määritystä"
 
 msgid "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
 msgstr "Valittuun tietokoneeseen perustuva suoritintyypin suodatus ei ole käytössä tällä emuloidulla koneella.\n\nTämä mahdollistaa muutoin yhteensopimattoman suorittimen valinnan kyseisen tietokoneen kanssa. Voit kuitenkin kohdata ongelmia tietokoneen BIOS:in tai muun ohjelmiston kanssa.\n\nTämän asetuksen käyttö ei ole virallisesti tuettua ja kaikki tehdyt virheraportit voidaan sulkea epäpätevinä."
@@ -925,30 +1032,33 @@ msgstr "Valittuun tietokoneeseen perustuva suoritintyypin suodatus ei ole käyt
 msgid "Continue"
 msgstr "Jatka"
 
-msgid "Cassette: %s"
-msgstr "Kasetti: %s"
+msgid "Cassette: %1"
+msgstr "Kasetti: %1"
+
+msgid "C&assette: %1"
+msgstr "K&asetti: %1"
 
 msgid "Cassette images"
 msgstr "Kasettitiedostot"
 
-msgid "Cartridge %i: %ls"
-msgstr "ROM-moduuli %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "ROM-moduuli %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "R&OM-moduuli %1: %2"
 
 msgid "Cartridge images"
 msgstr "ROM-moduulikuvat"
 
-msgid "Error initializing renderer"
-msgstr "Virhe renderöijän alustuksessa"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "OpenGL (3.0 Core) -renderöijän alustus epäonnistui. Käytä toista renderöijää."
-
 msgid "Resume execution"
 msgstr "Jatka suoritusta"
 
 msgid "Pause execution"
 msgstr "Pysäytä suoritus"
 
+msgid "Ctrl+Alt+Del"
+msgstr ""
+
 msgid "Press Ctrl+Alt+Del"
 msgstr "Paina Ctrl+Alt+Del"
 
@@ -958,17 +1068,281 @@ msgstr "Paina Ctrl+Alt+Esc"
 msgid "Hard reset"
 msgstr "Kylmä uudelleenkäynnistys"
 
+msgid "Force shutdown"
+msgstr "Pakota sammutus"
+
+msgid "Start"
+msgstr "Käynnistä"
+
+msgid "Not running"
+msgstr "Ei käynnissä"
+
+msgid "Running"
+msgstr "Käynnissä"
+
+msgid "Paused"
+msgstr "Pysäytetty"
+
+msgid "Waiting"
+msgstr "Odottaa"
+
+msgid "Powered Off"
+msgstr "Sammutettu"
+
+msgid "%n running"
+msgstr "%n käynnissä"
+
+msgid "%n paused"
+msgstr "%n pysäytetty"
+
+msgid "%n waiting"
+msgstr "%n odottaa"
+
+msgid "%1 total"
+msgstr "yhteensä %1"
+
+msgid "VMs: %1"
+msgstr "Virtuaalikoneita: %1"
+
+msgid "System Directory:"
+msgstr "Konekansio:"
+
+msgid "Choose directory"
+msgstr "Valitse kansio"
+
+msgid "Choose configuration file"
+msgstr "Valitse konemääritystiedosto"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "86Box-konemääritystiedostot (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Määrityksen lukeminen epäonnistui"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "Valittua määritystä ei voitu avata: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "Käytä säännöllisiä lausekkeita (regex) hakukentässä"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "%1 konetta on tällä hetkellä aktiivisena. Haluatko silti sulkea virtuaalikoneiden hallinnan?"
+
+msgid "Add new system wizard"
+msgstr "Koneenlisäysohjelma"
+
+msgid "Introduction"
+msgstr "Johdanto"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "Tämä ohjelma auttaa sinua lisäämään uuden koneen 86Boxiin."
+
+msgid "New configuration"
+msgstr "Uusi määritys"
+
+msgid "Complete"
+msgstr "Valmis"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "Ohjelma käynnistää koneen määrityksen."
+
+msgid "Use existing configuration"
+msgstr "Käytä olemassaolevaa määritystä"
+
+msgid "Type some notes here"
+msgstr "Kirjoita muistiinpanoja"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Liitä olemassaolevan määrityksen sisälto alla olevaan tekstikenttään."
+
+msgid "Load configuration from file"
+msgstr "Lataa määritys tiedostosta"
+
+msgid "System name"
+msgstr "Koneen nimi"
+
+msgid "System name:"
+msgstr "Koneen nimi:"
+
+msgid "System name cannot contain certain characters"
+msgstr "Koneen nimi ei voi sisältää joitakin merkkejä"
+
+msgid "System name already exists"
+msgstr "Koneen nimi on jo olemassa"
+
+msgid "Please enter a directory for the system"
+msgstr "Anna kansio koneelle"
+
+msgid "Directory does not exist"
+msgstr "Kansiota ei ole olemassa"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "Koneelle luodaan uusi kansio valittuun kansioon"
+
+msgid "System location:"
+msgstr "Koneen sijainti:"
+
+msgid "System name and location"
+msgstr "Koneen nimi ja sijainti:"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Anna koneen nimi ja valitse sijainti"
+
+msgid "Enter the name of the system"
+msgstr "Kirjoita koneen nimi"
+
+msgid "Please enter a system name"
+msgstr "Anna koneelle nimi"
+
+msgid "Display name (optional):"
+msgstr "Valinnainen näyttönimi:"
+
+msgid "Display name:"
+msgstr "Näyttönimi:"
+
+msgid "Set display name"
+msgstr "Aseta näyttönimi"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Anna uusi näyttönimi tai poista se"
+
+msgid "Change &display name..."
+msgstr "Vaihda &näyttönimi"
+
+msgid "Context Menu"
+msgstr "Kontekstivalikko"
+
+msgid "&Open folder..."
+msgstr "&Avaa kansio..."
+
+msgid "Open p&rinter tray..."
+msgstr "Avaa &tulostimen lokero..."
+
+msgid "Set &icon..."
+msgstr "Aseta &kuvake..."
+
+msgid "Select an icon"
+msgstr "Valitse kuvake"
+
+msgid "C&lone..."
+msgstr "K&loonaa..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "Virtuaalikone \"%1\" (%2) kloonataan tänne:"
+
+msgid "Directory %1 already exists"
+msgstr "Hakemisto %1 on jo olemassa"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "Et voi käyttää seuraavia merkkejä nimessä: %1"
+
+msgid "Clone"
+msgstr "Kloonaa"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Kloonatulle virtuaalikoneelle ei voitu luoda hakemistoa"
+
+msgid "Failed to clone VM."
+msgstr "Virtuaalikoneen kloonaus epäonnistui."
+
+msgid "Directory in use"
+msgstr "Hakemisto käytössä"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "Valittu hakemisto on jo käytössä. Valitse toinen hakemisto."
+
+msgid "Create directory failed"
+msgstr "Hakemiston luominen epäonnistui"
+
+msgid "Unable to create the directory for the new system"
+msgstr "Uudelle koneelle ei voitu luoda hakemistoa"
+
+msgid "Configuration write failed"
+msgstr "Määrityksen kirjoitus epäonnistui"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "Asetustiedostoa %1 ei voitu avata kirjoittamista varten"
+
+msgid "Error adding system"
+msgstr "Koneenlisäysvirhe"
+
+msgid "Remove directory failed"
+msgstr "Hakemiston poistaminen epäonnistui"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "Joitakin konehakemiston tiedostoista ei voitu poistaa. Poista ne käsin."
+
+msgid "Build"
+msgstr "Käännös"
+
+msgid "Version"
+msgstr "Versio"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "86Box-päivitys on saatavilla: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "Päivityksiä ei voitu tarkistaa: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>86Box-päivitys on saatavilla!</b>"
+
+msgid "Warning"
+msgstr "Varoitus"
+
+msgid "&Kill"
+msgstr "P&akkopysäytä"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "Virtuaalikoneen pakkopysäytys saattaa johtaa datan menettämiseen. Tee niin ainoastaan jos 86Box-prosessi on jumissa.\n\nHaluatko varmasti pakkopysäyttää \"%1\"-virtuaalikoneen?"
+
+msgid "&Delete"
+msgstr "&Poista"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "Haluatko varmasti poistaa \"%1\"-virtuaalikoneen ja kaikki sen tiedostot? Poistamista ei voi perua!"
+
+msgid "Show &config file"
+msgstr "Näytä &määritystiedosto"
+
+msgid "No screenshot"
+msgstr "Ei kuvakaappausta"
+
+msgid "Search"
+msgstr "Hae"
+
+msgid "Searching for VMs..."
+msgstr "Haetaan virtuaalikoneita..."
+
+msgid "Found %1"
+msgstr "%1 löydetty"
+
+msgid "System"
+msgstr "Kone"
+
+msgid "Storage"
+msgstr "Tallennus"
+
+msgid "Disk %1: "
+msgstr "Levy %1: "
+
+msgid "No disks"
+msgstr "Ei levyjä"
+
+msgid "Audio"
+msgstr "Ääni"
+
+msgid "Audio:"
+msgstr "Ääni:"
+
 msgid "ACPI shutdown"
 msgstr "ACPI-sammutus"
 
-msgid "Hard disk (%s)"
-msgstr "Kiintolevy (%s)"
+msgid "ACP&I shutdown"
+msgstr "ACP&I-sammutus"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "Kiintolevy (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
 msgstr "MFM/RLL- tai ESDI-CD-ROM-asemia ei ole koskaan ollut olemassa"
@@ -995,17 +1369,14 @@ msgid "Hard disk images"
 msgstr "Kiintolevykuvat"
 
 msgid "Unable to read file"
-msgstr "Tiedostoa ei voi lukea"
+msgstr "Tiedostoa ei voitu lukea"
 
 msgid "Unable to write file"
-msgstr "Tiedostoon ei voi kirjoittaa"
+msgstr "Tiedostoa ei voitu kirjoittaa"
 
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
 msgstr "HDI- ja HDX-levykuvien ainoa tuettu sektorikoko on 512"
 
-msgid "USB is not yet supported"
-msgstr "USB-tukea ei vielä ole"
-
 msgid "Disk image file already exists"
 msgstr "Levykuva on jo olemassa"
 
@@ -1019,7 +1390,7 @@ msgid "Make sure the file exists and is readable."
 msgstr "Varmista, että tiedosto on olemassa ja lukukelpoinen"
 
 msgid "Make sure the file is being saved to a writable directory."
-msgstr "Varmista, että tiedoston tallennuskansioon on kirjoitusoikeus"
+msgstr "Varmista, että tiedoston tallennuskansioon pystyy kirjoittamaan."
 
 msgid "Disk image too large"
 msgstr "Liian suuri levykuva"
@@ -1039,6 +1410,27 @@ msgstr "Korvaa"
 msgid "Don't overwrite"
 msgstr "Älä korvaa"
 
+msgid "Raw image"
+msgstr "Raaka levykuva"
+
+msgid "HDI image"
+msgstr "HDI-levykuva"
+
+msgid "HDX image"
+msgstr "HDX-levykuva"
+
+msgid "Fixed-size VHD"
+msgstr "Kiinteä VHD"
+
+msgid "Dynamic-size VHD"
+msgstr "Dynaaminen VHD"
+
+msgid "Differencing VHD"
+msgstr "Differentiaalinen VHD"
+
+msgid "(N/A)"
+msgstr "(Ei mikään)"
+
 msgid "Raw image (.img)"
 msgstr "Raaka levykuva (.img)"
 
@@ -1076,10 +1468,7 @@ msgid "Parent and child disk timestamps do not match"
 msgstr "Ylä- ja alatason levyjen aikaleimat eivät täsmää"
 
 msgid "Could not fix VHD timestamp."
-msgstr "VHD aikaleimaa ei pystytty korjaamaan."
-
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
+msgstr "VHD:n aikaleimaa ei pystytty korjaamaan."
 
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
@@ -1096,44 +1485,29 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
+msgid "160 KB"
+msgstr "160 Kt"
 
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
+msgid "180 KB"
+msgstr "180 Kt"
 
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
+msgid "320 KB"
+msgstr "320 Kt"
 
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
+msgid "360 KB"
+msgstr "360 Kt"
 
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
+msgid "640 KB"
+msgstr "640 Kt"
 
-msgid "160 kB"
-msgstr "160 kt"
-
-msgid "180 kB"
-msgstr "180 kt"
-
-msgid "320 kB"
-msgstr "320 kt"
-
-msgid "360 kB"
-msgstr "360 kt"
-
-msgid "640 kB"
-msgstr "640 kt"
-
-msgid "720 kB"
-msgstr "720 kt"
+msgid "720 KB"
+msgstr "720 Kt"
 
 msgid "1.2 MB"
 msgstr "1.2 Mt"
@@ -1211,7 +1585,7 @@ msgid "Mouse sensitivity:"
 msgstr "Hiiren herkkyys:"
 
 msgid "Select media images from program working directory"
-msgstr "Valitse mediakuvat ohjelman työhakemistosta"
+msgstr "Valitse levykuvat ohjelman työhakemistosta"
 
 msgid "PIT mode:"
 msgstr "PIT-tila:"
@@ -1227,3 +1601,1383 @@ msgstr "Nopea"
 
 msgid "&Auto-pause on focus loss"
 msgstr "&Automaattinen tauko tarkennuksen hävitessä"
+
+msgid "WinBox is no longer supported"
+msgstr "WinBoxia ei enää tueta"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "WinBox-managerin kehitys lopetettiin vuonna 2022, koska ylläpitäjiä ei ollut riittävästi. Koska suuntaamme ponnistuksemme 86Boxin parantamiseen entisestään, olemme päättäneet olla enää tukematta WinBoxia managerina.\n\nWinBoxin kautta ei enää toimiteta päivityksiä, ja saatat kohdata virheellistä käyttäytymistä, jos jatkat sen käyttöä 86Boxin uudemmissa versioissa. Kaikki WinBoxin käyttäytymiseen liittyvät vikailmoitukset suljetaan virheellisinä.\n\nSiirry osoitteeseen 86box.net saadaksesi luettelon muista hallintaohjelmista."
+
+msgid "Generate"
+msgstr "Luo"
+
+msgid "Joystick configuration"
+msgstr "Peliohjaimen määritys"
+
+msgid "Device"
+msgstr "Laite"
+
+msgid "%1 (X axis)"
+msgstr "%1 (X-akseli)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (Y-akseli)"
+
+msgid "MCA devices"
+msgstr "MCA-laitteet"
+
+msgid "List of MCA devices:"
+msgstr "Luettelo MCA-laitteista:"
+
+msgid "&Tablet tool"
+msgstr "Tablettityökalu"
+
+msgid "About &Qt"
+msgstr "Tietoja &Qt:sta"
+
+msgid "&MCA devices..."
+msgstr "MCA-laitteet..."
+
+msgid "Show non-&primary monitors"
+msgstr "Näytä muut kuin ensisijaiset näytöt"
+
+msgid "Open screenshots &folder..."
+msgstr "Avaa kuvakaappaukset-kansio..."
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Sovella koko näytön venytystilaa maksimoidessa"
+
+msgid "&Cursor/Puck"
+msgstr "&Kursori/Kiekko"
+
+msgid "&Pen"
+msgstr "K&ynä"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "&Isäntä CD/DVD-asema (%1:)"
+
+msgid "&Connected"
+msgstr "&Yhdistetty"
+
+msgid "Clear image &history"
+msgstr "Tyhjennä levykuva&historia"
+
+msgid "Create..."
+msgstr "Luo..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "Isännän CD/DVD-asema (%1)"
+
+msgid "Unknown Bus"
+msgstr "Tuntematon väylä"
+
+msgid "Null Driver"
+msgstr "Nolla-ajuri"
+
+msgid "NIC:"
+msgstr "Verkkokortti:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "Verkkokortti %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&Verkkokortti %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "Renderöintikäyttäytyminen"
+
+msgid "Use target framerate:"
+msgstr "Kuvataajuustavoite:"
+
+msgid " fps"
+msgstr " ruutua/s"
+
+msgid "VSync"
+msgstr "VSync"
+
+msgid "Synchronize with video"
+msgstr "Synkronisoi videoon"
+
+msgid "Shaders"
+msgstr "Varjostinohjelmat"
+
+msgid "Remove"
+msgstr "Poista"
+
+msgid "Browse..."
+msgstr "Selaa..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "OpenGL-kontekstia ei voitu luoda."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "Ei voitu siirtyä OpenGL-kontekstiin."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "Tarvitaan OpenGL-versio 3.0 tai uudempi. Nykyinen versio on %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "Virhe OpenGL:n alustamisessa"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nPalataan ohjelmistopohjaiseen renderöintiin."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>Kun valitset levykuvia (CD-ROM, levykkeet jne.), avausikkuna aukeaa 86Boxin määritystiedoston hakemistoon. Tällä asetuksella on todennäköisesti merkitystä vain macOS-käyttöjärjestelmässä.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "Kone on saatettu siirtää tai kopioida."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "Varmistaakseen asianmukaisen verkkotoiminnan 86Boxin on tiedettävä, onko tämä kone siirretty vai kopioitu.\n\nValitse \"Kopioin sen\", jos et ole varma."
+
+msgid "I Moved It"
+msgstr "Siirsin sen"
+
+msgid "I Copied It"
+msgstr "Kopioin sen"
+
+msgid "86Box Monitor #"
+msgstr "86Box Monitor "
+
+msgid "No MCA devices."
+msgstr "Ei MCA-laitteita."
+
+msgid "MiB"
+msgstr ""
+
+msgid "GiB"
+msgstr ""
+
+msgid "Network Card #1"
+msgstr "Verkkokortti 1"
+
+msgid "Network Card #2"
+msgstr "Verkkokortti 2"
+
+msgid "Network Card #3"
+msgstr "Verkkokortti 3"
+
+msgid "Network Card #4"
+msgstr "Verkkokortti 4"
+
+msgid "Mode:"
+msgstr "Tila:"
+
+msgid "Interface:"
+msgstr "Liitäntä:"
+
+msgid "Adapter:"
+msgstr "Sovitin:"
+
+msgid "VDE Socket:"
+msgstr "VDE-socket:"
+
+msgid "86Box Unit Tester"
+msgstr "86Box Unit Tester"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Novell NetWare 2.x-avainkortti"
+
+msgid "Serial port passthrough 1"
+msgstr "Sarjaportin läpivienti 1"
+
+msgid "Serial port passthrough 2"
+msgstr "Sarjaportin läpivienti 2"
+
+msgid "Serial port passthrough 3"
+msgstr "Sarjaportin läpivienti 3"
+
+msgid "Serial port passthrough 4"
+msgstr "Sarjaportin läpivienti 4"
+
+msgid "Renderer &options..."
+msgstr "Renderöijän &asetukset..."
+
+msgid "PC/XT Keyboard"
+msgstr "PC/XT-näppäimistö"
+
+msgid "AT Keyboard"
+msgstr "AT-näppäimistö"
+
+msgid "AX Keyboard"
+msgstr "AX-näppäimistö"
+
+msgid "PS/2 Keyboard"
+msgstr "PS/2-näppäimistö"
+
+msgid "PS/55 Keyboard"
+msgstr "PS/55-näppäimistö"
+
+msgid "Keys"
+msgstr "Näppäimet"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Logitech/Microsoft-väylähiiri"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Microsoft-väylähiiri (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Mouse Systems-sarjahiiri"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr ""
+
+msgid "Microsoft Serial Mouse"
+msgstr "Microsoft-sarjahiiri"
+
+msgid "Microsoft Serial BallPoint"
+msgstr ""
+
+msgid "Logitech Serial Mouse"
+msgstr "Logitech-sarjahiiri"
+
+msgid "PS/2 Mouse"
+msgstr "PS/2-hiiri"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "PS/2 QuickPort-hiiri"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (sarja)"
+
+msgid "Default Baud rate"
+msgstr "Oletussiirtonopeus"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] Tavallinen Hayes-yhteensopiva modeemi"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Roland MT-32-emulointi"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Roland MT-32 (uusi)-emulointi"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Roland CM-32L-emulointi"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Roland CM-32LN-emulointi"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "OPL4-ML-tytärlevy"
+
+msgid "System MIDI"
+msgstr "Järjestelmän MIDI"
+
+msgid "MIDI Input Device"
+msgstr "MIDI-syöttölaite"
+
+msgid "BIOS file"
+msgstr "BIOS-tiedosto"
+
+msgid "BIOS file (ROM #1)"
+msgstr "BIOS-tiedosto (ROM #1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "BIOS-tiedosto (ROM #2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "BIOS-tiedosto (ROM #3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "BIOS-tiedosto (ROM #4)"
+
+msgid "BIOS address"
+msgstr "BIOS-osoite"
+
+msgid "BIOS address (ROM #1)"
+msgstr "BIOS-osoite (ROM #1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "BIOS-osoite (ROM #2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "BIOS-osoite (ROM #3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "BIOS-osoite (ROM #4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "Salli BIOS-laajennuksen ROM-kirjoitukset"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "Salli BIOS-laajennuksen ROM-kirjoitukset (ROM #1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "Salli BIOS-laajennuksen ROM-kirjoitukset (ROM #2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "Salli BIOS-laajennuksen ROM-kirjoitukset (ROM #3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "Salli BIOS-laajennuksen ROM-kirjoitukset (ROM #4)"
+
+msgid "Linear framebuffer base"
+msgstr ""
+
+msgid "Address"
+msgstr "Osoite"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "Sarjaportin IRQ"
+
+msgid "Parallel port IRQ"
+msgstr "Rinnakkaisportin IRQ"
+
+msgid "BIOS Revision"
+msgstr "BIOS-versio"
+
+msgid "BIOS Version"
+msgstr "BIOS-versio"
+
+msgid "BIOS Language"
+msgstr "BIOS-kieli"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "IBM 5161-laajennusyksikkö"
+
+msgid "IBM Cassette Basic"
+msgstr ""
+
+msgid "Translate 26 -> 17"
+msgstr "Muunna 26 -> 17"
+
+msgid "Language"
+msgstr "Kieli"
+
+msgid "Enable backlight"
+msgstr "Taustavalo"
+
+msgid "Invert colors"
+msgstr "Käänteiset värit"
+
+msgid "BIOS size"
+msgstr "BIOS:in koko"
+
+msgid "BIOS size (ROM #1)"
+msgstr "BIOS:in koko (ROM #1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "BIOS:in koko (ROM #2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "BIOS:in koko (ROM #3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "BIOS:in koko (ROM #4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "Kartoita C0000-C7FFF UMB:nä"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "Kartoita C8000-CFFFF UMB:nä"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "Kartoita D0000-D7FFF UMB:nä"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "Kartoita D8000-DFFFF UMB:nä"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "Kartoita E0000-E7FFF UMB:nä"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "Kartoita E8000-EFFFF UMB:nä"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "JS9-jumpperi (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "MIDI-lähtölaite"
+
+msgid "MIDI Real time"
+msgstr "Reaaliaikainen MIDI"
+
+msgid "MIDI Thru"
+msgstr "MIDI-läpivienti"
+
+msgid "MIDI Clockout"
+msgstr "MIDI-kellon ulostulo"
+
+msgid "SoundFont"
+msgstr "SoundFont"
+
+msgid "Output Gain"
+msgstr "Lähtötaso"
+
+msgid "Chorus"
+msgstr ""
+
+msgid "Chorus Voices"
+msgstr ""
+
+msgid "Chorus Level"
+msgstr ""
+
+msgid "Chorus Speed"
+msgstr ""
+
+msgid "Chorus Depth"
+msgstr ""
+
+msgid "Chorus Waveform"
+msgstr ""
+
+msgid "Reverb"
+msgstr "Jälkikaiunta"
+
+msgid "Reverb Room Size"
+msgstr ""
+
+msgid "Reverb Damping"
+msgstr ""
+
+msgid "Reverb Width"
+msgstr ""
+
+msgid "Reverb Level"
+msgstr ""
+
+msgid "Interpolation Method"
+msgstr "Interpolointimenetelmä"
+
+msgid "Dynamic Sample Loading"
+msgstr "Dynaaminen näytteiden lataus"
+
+msgid "Reverb Output Gain"
+msgstr "Jälkikaiunnan lähtötaso"
+
+msgid "Reversed stereo"
+msgstr "Käänteinen stereo"
+
+msgid "Nice ramp"
+msgstr ""
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "Painikkeet"
+
+msgid "Serial Port"
+msgstr "Sarjaportti"
+
+msgid "RTS toggle"
+msgstr ""
+
+msgid "Revision"
+msgstr "Versio"
+
+msgid "Controller"
+msgstr "Ohjain"
+
+msgid "Show Crosshair"
+msgstr "Näytä tähtäin"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "MAC-osoite"
+
+msgid "MAC Address OUI"
+msgstr "MAC-osoitteen OUI"
+
+msgid "Enable BIOS"
+msgstr "BIOS"
+
+msgid "Baud Rate"
+msgstr "Baudinopeus"
+
+msgid "TCP/IP listening port"
+msgstr "TCP/IP-kuunteluportti"
+
+msgid "Phonebook File"
+msgstr "Puhelinluettelotiedosto"
+
+msgid "Telnet emulation"
+msgstr "Telnet-emulointi"
+
+msgid "RAM Address"
+msgstr "RAM-osoite"
+
+msgid "RAM size"
+msgstr "RAM-koko"
+
+msgid "Initial RAM size"
+msgstr "RAM-muistin alkukoko"
+
+msgid "Serial Number"
+msgstr "Sarjanumero"
+
+msgid "Host ID"
+msgstr "Isännän ID"
+
+msgid "FDC Address"
+msgstr "FDC-osoite"
+
+msgid "MPU-401 Address"
+msgstr "MPU-401-osoite"
+
+msgid "MPU-401 IRQ"
+msgstr "MPU-401-IRQ"
+
+msgid "Receive MIDI input"
+msgstr "Vastaanota MIDI-tulo"
+
+msgid "Low DMA"
+msgstr "Matala DMA"
+
+msgid "Enable Game port"
+msgstr "Peliportti"
+
+msgid "SID Model"
+msgstr "SID-malli"
+
+msgid "SID Filter Strength"
+msgstr "SID-filtterin vahvuus"
+
+msgid "Surround module"
+msgstr "Surround-moduuli"
+
+msgid "CODEC"
+msgstr "CODEC"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "CODEC-keskeytys CODEC-asennuksen yhteydessä (jotkut ohjaimet tarvitsevat sitä)"
+
+msgid "SB Address"
+msgstr "SB-osoite"
+
+msgid "Adlib Address"
+msgstr "Adlib-osoite"
+
+msgid "Use EEPROM setting"
+msgstr "Käytä EEPROM-asetusta"
+
+msgid "WSS IRQ"
+msgstr "WSS-IRQ"
+
+msgid "WSS DMA"
+msgstr "WSS-DMA"
+
+msgid "Enable OPL"
+msgstr "OPL"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "Vastaanota MIDI-tulo (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "Matala SB-DMA"
+
+msgid "6CH variant (6-channel)"
+msgstr "6CH-versio (6-kanavainen)"
+
+msgid "Enable CMS"
+msgstr "CMS"
+
+msgid "Mixer"
+msgstr "Mikseri"
+
+msgid "High DMA"
+msgstr "Korkea DMA"
+
+msgid "Control PC speaker"
+msgstr "Ohjaa PC-kaiutinta"
+
+msgid "Memory size"
+msgstr "Muistin koko"
+
+msgid "EMU8000 Address"
+msgstr "EMU8000-osoite"
+
+msgid "IDE Controller"
+msgstr "IDE-ohjain"
+
+msgid "Codec"
+msgstr "Koodekki"
+
+msgid "GUS type"
+msgstr "GUS-tyyppi"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "Salli 0x04-komento \"Sulje 86Box\""
+
+msgid "Display type"
+msgstr "Näytön tyyppi"
+
+msgid "Composite type"
+msgstr "Komposiittityyppi"
+
+msgid "RGB type"
+msgstr "RGB-tyyppi"
+
+msgid "Line doubling type"
+msgstr "Linjan kaksinkertaistamistyyppi"
+
+msgid "Snow emulation"
+msgstr "Lumiemulointi"
+
+msgid "Monitor type"
+msgstr "Näytön tyyppi"
+
+msgid "Character set"
+msgstr "Merkistö"
+
+msgid "XGA type"
+msgstr "XGA-tyyppi"
+
+msgid "Instance"
+msgstr "Instanssi"
+
+msgid "MMIO Address"
+msgstr "MMIO-osoite"
+
+msgid "RAMDAC type"
+msgstr "RAMDAC-tyyppi"
+
+msgid "Blend"
+msgstr "Sekoita"
+
+msgid "Font"
+msgstr "Fontti"
+
+msgid "Bilinear filtering"
+msgstr "Bilineaarinen suodatus"
+
+msgid "Video chroma-keying"
+msgstr "Videon väriavainnus"
+
+msgid "Dithering"
+msgstr "Sekoitussävytys"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "NMI CGA-emulointia varten"
+
+msgid "Voodoo type"
+msgstr "Voodoo-tyyppi"
+
+msgid "Framebuffer memory size"
+msgstr "Framebuffer-muistin koko"
+
+msgid "Texture memory size"
+msgstr "Tekstuurimuistin koko"
+
+msgid "Dither subtraction"
+msgstr "Sekoitussävytyksen vähennys"
+
+msgid "Screen Filter"
+msgstr "Näyttösuodatin"
+
+msgid "Render threads"
+msgstr "Renderöintisäikeet"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Aloitusosoite"
+
+msgid "Contiguous Size"
+msgstr "Vierekkäinen koko"
+
+msgid "I/O Width"
+msgstr "I/O-leveys"
+
+msgid "Transfer Speed"
+msgstr "Siirtonopeus"
+
+msgid "EMS mode"
+msgstr "EMS-tila"
+
+msgid "EMS Address"
+msgstr "EMS-osoite"
+
+msgid "EMS 1 Address"
+msgstr "EMS 1-osoite"
+
+msgid "EMS 2 Address"
+msgstr "EMS 2-osoite"
+
+msgid "EMS Memory Size"
+msgstr "EMS-muistin koko"
+
+msgid "EMS 1 Memory Size"
+msgstr "EMS 1-muistin koko"
+
+msgid "EMS 2 Memory Size"
+msgstr "EMS 2-muistin koko"
+
+msgid "Enable EMS"
+msgstr "EMS"
+
+msgid "Enable EMS 1"
+msgstr "EMS 1"
+
+msgid "Enable EMS 2"
+msgstr "EMS 2"
+
+msgid "Address for > 2 MB"
+msgstr "> 2 Mt-osoite"
+
+msgid "Frame Address"
+msgstr "Kehyksen osoite"
+
+msgid "USA"
+msgstr "USA"
+
+msgid "Danish"
+msgstr "Tanskalainen"
+
+msgid "Always at selected speed"
+msgstr "Aina valitulla nopeudella"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "BIOS-asetus + pikanäppäimet (pois päältä POST:in aikana)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 Kt alkaen F0000:sta"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 Kt alkaen E0000:sta (osoitteen käänteinen MSB, viimeiset 64 Kt ensin)"
+
+msgid "Sine"
+msgstr "Sini"
+
+msgid "Triangle"
+msgstr "Kolmio"
+
+msgid "Linear"
+msgstr "Lineaarinen"
+
+msgid "4th Order"
+msgstr ""
+
+msgid "7th Order"
+msgstr ""
+
+msgid "Non-timed (original)"
+msgstr "Ajastamaton (alkuperäinen)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (JMP2 ei käytössä)"
+
+msgid "Two"
+msgstr "Kaksi"
+
+msgid "Three"
+msgstr "Kolme"
+
+msgid "Wheel"
+msgstr "Rulla"
+
+msgid "Five + Wheel"
+msgstr "Viisi + rulla"
+
+msgid "Five + 2 Wheels"
+msgstr "Viisi + kaksi rullaa"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 sarja / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) sarja"
+
+msgid "8 KB"
+msgstr "8 Kt"
+
+msgid "32 KB"
+msgstr "32 Kt"
+
+msgid "16 KB"
+msgstr "16 Kt"
+
+msgid "64 KB"
+msgstr "64 Kt"
+
+msgid "Disable BIOS"
+msgstr "BIOS pois käytöstä"
+
+msgid "512 KB"
+msgstr "512 Kt"
+
+msgid "2 MB"
+msgstr "2 Mt"
+
+msgid "8 MB"
+msgstr "8 Mt"
+
+msgid "28 MB"
+msgstr "28 Mt"
+
+msgid "1 MB"
+msgstr "1 Mt"
+
+msgid "4 MB"
+msgstr "4 Mt"
+
+msgid "12 MB"
+msgstr "12 Mt"
+
+msgid "16 MB"
+msgstr "16 Mt"
+
+msgid "20 MB"
+msgstr "20 Mt"
+
+msgid "24 MB"
+msgstr "24 Mt"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (stereo)"
+
+msgid "Classic"
+msgstr "Klassinen"
+
+msgid "256 KB"
+msgstr "256 Kt"
+
+msgid "Composite"
+msgstr "Komposiitti"
+
+msgid "True color"
+msgstr ""
+
+msgid "Old"
+msgstr "Vanha"
+
+msgid "New"
+msgstr "Uusi"
+
+msgid "Color (generic)"
+msgstr "Väri (yleinen)"
+
+msgid "Green Monochrome"
+msgstr "Vihreä yksivärinen"
+
+msgid "Amber Monochrome"
+msgstr "Meripihkan värinen yksivärinen"
+
+msgid "Gray Monochrome"
+msgstr "Harmaa yksivärinen"
+
+msgid "Color (no brown)"
+msgstr "Väri (ei ruskeaa)"
+
+msgid "Color (IBM 5153)"
+msgstr "Väri (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Yksinkertainen kaksinkertaistaminen"
+
+msgid "sRGB interpolation"
+msgstr "sRGB-interpolointi"
+
+msgid "Linear interpolation"
+msgstr "Lineaarinen interpolointi"
+
+msgid "Has secondary 8x8 character set"
+msgstr ""
+
+msgid "Has Quadcolor II daughter board"
+msgstr ""
+
+msgid "Alternate monochrome contrast"
+msgstr "Vaihtoehtoinen yksivärikontrasti"
+
+msgid "128 KB"
+msgstr "128 Kt"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Yksivärinen (5151/MDA) (valkoinen)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Yksivärinen (5151/MDA) (vihreä)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Yksivärinen (5151/MDA) (keltainen)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Väri 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Väri 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Parannettu väri - Normaali tila (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Parannettu väri - Parannettu tila (5154/ECD)"
+
+msgid "Green"
+msgstr "Vihreä"
+
+msgid "Amber"
+msgstr "Meripihka"
+
+msgid "Gray"
+msgstr "Harmaa"
+
+msgid "Grayscale"
+msgstr "Harmaasävy"
+
+msgid "Color"
+msgstr "Väri"
+
+msgid "U.S. English"
+msgstr "Amerikanenglanti"
+
+msgid "Scandinavian"
+msgstr "Skandinaavinen"
+
+msgid "Other languages"
+msgstr "Muut kielet"
+
+msgid "Bochs latest"
+msgstr "Uusin Bochs"
+
+msgid "Apply overscan deltas"
+msgstr ""
+
+msgid "Mono Interlaced"
+msgstr "Lomitettu yksivärinen"
+
+msgid "Mono Non-Interlaced"
+msgstr "Ei-lomitettu yksivärinen"
+
+msgid "Color Interlaced"
+msgstr "Lomitettu väri"
+
+msgid "Color Non-Interlaced"
+msgstr "Ei-lomitettu väri"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "3dfx Voodoo-grafiikkasuoritin"
+
+msgid "3Dfx Voodoo 2"
+msgstr ""
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 TMU:ta)"
+
+msgid "8-bit"
+msgstr "8-bittinen"
+
+msgid "16-bit"
+msgstr "16-bittinen"
+
+msgid "Standard (150ns)"
+msgstr "Vakio (150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "Nopea (120ns)"
+
+msgid "Enabled"
+msgstr "Käytössä"
+
+msgid "Standard"
+msgstr "Vakio"
+
+msgid "High-Speed"
+msgstr "Nopea"
+
+msgid "Stereo LPT DAC"
+msgstr "Stereo-LPT-DAC"
+
+msgid "Generic Text Printer"
+msgstr "Yleinen tekstitulostin"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Yleinen ESC/P 2 pistematriisitulostin"
+
+msgid "Generic PostScript Printer"
+msgstr "Yleinen PostScript-tulostin"
+
+msgid "Generic PCL5e Printer"
+msgstr "Yleinen PCL5e-tulostin"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Rinnakkaislinjan Internet-protokolla"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Savage Questin suojausdongle"
+
+msgid "Serial Passthrough Device"
+msgstr "Sarjaportin läpivientilaite"
+
+msgid "Passthrough Mode"
+msgstr "Läpivientitila"
+
+msgid "Host Serial Device"
+msgstr "Isäntäkoneen sarjalaiten"
+
+msgid "Name of pipe"
+msgstr "Putken nimi"
+
+msgid "Data bits"
+msgstr "Databitit"
+
+msgid "Stop bits"
+msgstr "Pysäytysbitit"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Läpiviennin baudinopeus"
+
+msgid "Named Pipe (Server)"
+msgstr "Nimetty putki (palvelin)"
+
+msgid "Named Pipe (Client)"
+msgstr "Nimettu putki (päätelaite)"
+
+msgid "Host Serial Passthrough"
+msgstr "Isännän sarjaportin läpivienti"
+
+msgid "E&ject %1"
+msgstr "&Poista %1"
+
+msgid "&Unmute"
+msgstr "&Poista mykistys"
+
+msgid "Softfloat FPU"
+msgstr "Softfloat-FPU"
+
+msgid "High performance impact"
+msgstr "Merkittävä vaikutus suorituskykyyn"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Yleinen] RAM-levy (maksiminopeus)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Yleinen] 1989 (3500 RPM)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Yleinen] 1992 (3600 RPM)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Yleinen] 1994 (4500 RPM)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Yleinen] 1996 (5400 RPM)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Yleinen] 1997 (5400 RPM)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Yleinen] 1998 (5400 RPM)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Yleinen] 2000 (7200 RPM)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "IBM 8514/A-klooni (ISA)"
+
+msgid "Vendor"
+msgstr "Valmistaja"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr ""
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr ""
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Yleinen PC/XT-muistilaajennus"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Yleinen PC/AT-muistilaajennus"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "Pistematriisifontteja ei löydy"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "\"roms/printer/fonts\"-hakemiston TrueType-fontteja vaaditaan ESC/P 2-pistematriisitulostimen emulointiin."
+
+msgid "Inhibit multimedia keys"
+msgstr "Estä multimedianäppäimet"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Kysy varmistusta ennen asetusten tallentamista"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Kysy varmistusta ennen uudelleenkäynnistystä"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Kysy varmistusta ennen lopettamista"
+
+msgid "Options"
+msgstr "Asetukset"
+
+msgid "Model"
+msgstr "Malli"
+
+msgid "Model:"
+msgstr "Malli:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Vulkan-rendereriä ei voitu alustaa."
+
+msgid "GLSL Error"
+msgstr "GLSL-virhe"
+
+msgid "Could not load shader: %1"
+msgstr "Varjostinta %1 ei voitu ladata"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "Vähintään OpenGL-versio 3.0 vaaditaan. Tämänhetkinen GLSL-versio on %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "Tekstuuria ei voitu ladata: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "Varjostinta ei voitu kääntää:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "Ohjelmaa ei linkitetty:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "Varjostinhallinta"
+
+msgid "Shader Configuration"
+msgstr "Varjostinasetukset"
+
+msgid "Add"
+msgstr "Lisää"
+
+msgid "Move up"
+msgstr "Siirrä ylös"
+
+msgid "Move down"
+msgstr "Siirrä alas"
+
+msgid "Could not load file %1"
+msgstr "Tiedostoa %1 ei voitu ladata"
+
+msgid "Key Bindings:"
+msgstr "Pikanäppäimet:"
+
+msgid "Action"
+msgstr "Toiminto"
+
+msgid "Keybind"
+msgstr "Pikanäppäin"
+
+msgid "Clear binding"
+msgstr "Tyhjennä pikanäppäin"
+
+msgid "Bind"
+msgstr "Määritä"
+
+msgid "Bind Key"
+msgstr "Määritä pikanäppäin"
+
+msgid "Enter key combo:"
+msgstr "Anna näppäinyhdistelmä:"
+
+msgid "Bind conflict"
+msgstr "Pikanäppäinkonflikti"
+
+msgid "This key combo is already in use."
+msgstr "Näppäinyhdistelmä on jo käytössä."
+
+msgid "Send Control+Alt+Del"
+msgstr "Läheta Control+Alt+Del"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Lähetä Control+Alt+Escape"
+
+msgid "Toggle fullscreen"
+msgstr "Koko näyttö"
+
+msgid "Screenshot"
+msgstr "Kuvakaappaus"
+
+msgid "Release mouse pointer"
+msgstr "Vapauta hiiren osoitin"
+
+msgid "Toggle pause"
+msgstr "Pysäytä"
+
+msgid "Toggle mute"
+msgstr "Mykistä"
+
+msgid "Text files"
+msgstr "Tekstitiedostot"
+
+msgid "ROM files"
+msgstr "ROM-tiedostot"
+
+msgid "SoundFont files"
+msgstr "SoundFont-tiedostot"
+
+msgid "Local Switch"
+msgstr "Paikallinen kytkin"
+
+msgid "Remote Switch"
+msgstr "Etäkytkin"
+
+msgid "Switch:"
+msgstr "Kytkin:"
+
+msgid "Hub Mode"
+msgstr "Hubitila"
+
+msgid "Hostname:"
+msgstr "Isäntänimi:"
+
+msgid "ISA RAM:"
+msgstr ""
+
+msgid "ISA ROM:"
+msgstr ""
+
+msgid "&Wipe NVRAM"
+msgstr "&Tyhjennä NVRAM"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "Tämä poistaa kaikki NVRAM:iin liittyvät tiedostot \"nvr\"-kansiossa. Joudut määrittämään BIOS:in ja mahdollisesti muut laitteet uudelleen.\n\nHaluatko varmasti tyhjentää \"%1\"-virtuaalikoneen kaiken NVRAM-sisällön?"
+
+msgid "Success"
+msgstr "Onnistui"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "\"%1\"-virtuaalikoneen NVRAM-sisällön tyhjentäminen onnistui"
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "\"%1\"-virtuaalikoneen NVRAM-sisällön tyhjentäminen epäonnistui"
+
+msgid "%1 VM Manager"
+msgstr "%1 - virtuaalikoneiden hallinta"
+
+msgid "%n disk(s)"
+msgstr "%n levy(ä)"
+
+msgid "Unknown Status"
+msgstr "Tuntematon tila"
+
+msgid "No Machines Found!"
+msgstr "Koneita ei löytynyt!"
+
+msgid "Check for updates on startup"
+msgstr "Tarkista päivitykset käynnistyksen yhteydessä"
+
+msgid "Unable to determine release information"
+msgstr "Julkaisutietoja ei voitu hakea"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Päivitystenhakuvirhe:\n\n%1\n\nYritä uudelleen myöhemmin."
+
+msgid "Update check complete"
+msgstr "Päivitystarkastus on valmis"
+
+msgid "stable"
+msgstr "vakaa"
+
+msgid "beta"
+msgstr ""
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Sinulla on käytössä uusin %1-versio 86Boxista: %2"
+
+msgid "version"
+msgstr "versio"
+
+msgid "build"
+msgstr "käännös"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Käytät versiota <b>%1</b>."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "<b>Versio %1</b> on nyt saatavilla."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Käytät käännöstä <b>%1</b>"
+
+msgid "<b>Build %1</b> is now available."
+msgstr "<b>Käännös %1</b> on nyt saatavilla."
+
+msgid "Would you like to visit the download page?"
+msgstr "Haluatko siirtyä lataussivulle?"
+
+msgid "Visit download page"
+msgstr "Siirry lataussivulle"
+
+msgid "Update check"
+msgstr "Päivitystarkistus"
+
+msgid "Checking for updates..."
+msgstr "Tarkistetaan päivityksiä..."
+
+msgid "86Box Update"
+msgstr "86Box-päivitys"
+
+msgid "Release notes:"
+msgstr "Julkaisutiedot:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "Virtuaalikone kaatui"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "\"%1\"-virtuaalikoneen prosessi kaatui yllättäen. Poistumiskoodi %2."
+
+msgid "The system will not be added."
+msgstr "Konetta ei lisätä."
+
+msgid "&Update mouse every CPU frame"
+msgstr "&Päivitä hiiri jokaisen CPU framen yhteydessä"
+
+msgid "Hue"
+msgstr "Sävy"
+
+msgid "Saturation"
+msgstr "Värikylläisyys"
+
+msgid "Contrast"
+msgstr "Kontrasti"
+
+msgid "Brightness"
+msgstr "Kirkkaus"
+
+msgid "Sharpness"
+msgstr "Terävyys"
+
+msgid "&CGA composite settings..."
+msgstr "&CGA:n komposiittiasetukset..."
+
+msgid "CGA composite settings"
+msgstr "CGA:n komposiittiasetukset"
+
+msgid "Monitor EDID"
+msgstr "Monitorin EDID"
+
+msgid "Export..."
+msgstr "Viedä..."
+
+msgid "Export EDID"
+msgstr "Vie EDID"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "EDID-tiedosto \"%ls\" on liian suuri."
+
+msgid "OpenGL input scale"
+msgstr "OpenGL:n syöttöasteikko"
+
+msgid "OpenGL input stretch mode"
+msgstr "OpenGL:n syötteen venytystila"
+
+msgid "Color scheme"
+msgstr "Värimaailma"
+
+msgid "Light"
+msgstr "Valo"
+
+msgid "Dark"
+msgstr "Tumma"
diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po
index 0c50b3e46..3f28b4af8 100644
--- a/src/qt/languages/fr-FR.po
+++ b/src/qt/languages/fr-FR.po
@@ -1,8 +1,16 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: fr_FR\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
 msgstr "&Action"
 
 msgid "&Keyboard requires capture"
-msgstr "&Capturer le clavier"
+msgstr "C&apturer le clavier"
 
 msgid "&Right CTRL is left ALT"
 msgstr "CTRL &Droite devient ALT Gauche"
@@ -10,8 +18,8 @@ msgstr "CTRL &Droite devient ALT Gauche"
 msgid "&Hard Reset..."
 msgstr "&Hard Reset..."
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Ctrl+Alt+Del\tCtrl+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "&Ctrl+Alt+Suppr"
 
 msgid "Ctrl+Alt+&Esc"
 msgstr "Ctrl+Alt+&Esc"
@@ -19,35 +27,35 @@ msgstr "Ctrl+Alt+&Esc"
 msgid "&Pause"
 msgstr "&Pause"
 
-msgid "E&xit..."
-msgstr "&Quitter..."
+msgid "Pause"
+msgstr "Pause"
+
+msgid "Re&sume"
+msgstr "Re&prendre"
+
+msgid "E&xit"
+msgstr "&Quitter"
 
 msgid "&View"
 msgstr "&Vue"
 
 msgid "&Hide status bar"
-msgstr "&Masquer la barre de status"
+msgstr "Masquer &la barre de status"
 
 msgid "Hide &toolbar"
-msgstr "Hide &toolbar"
+msgstr "Masquer la &barre d'outils"
 
 msgid "&Resizeable window"
-msgstr "Fenètre &Retaillable"
+msgstr "Fenêtre &redimensionnable"
 
 msgid "R&emember size && position"
 msgstr "S&auvegarder taille && position"
 
 msgid "Re&nderer"
-msgstr "Moteur de &rendu vidéo"
+msgstr "Moteur de re&ndu vidéo"
 
-msgid "&SDL (Software)"
-msgstr "&SDL (Logiciel)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (&Materiel)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
+msgid "&Qt (Software)"
+msgstr "&Qt (Logiciel)"
 
 msgid "Open&GL (3.0 Core)"
 msgstr "Open&GL (3.0 Core)"
@@ -55,14 +63,14 @@ msgstr "Open&GL (3.0 Core)"
 msgid "&VNC"
 msgstr "&VNC"
 
-msgid "Specify dimensions..."
-msgstr "Specifier dimensions..."
+msgid "Specify &dimensions..."
+msgstr "Spécifier dimen&sions..."
 
-msgid "F&orce 4:3 display ratio"
-msgstr "F&orcer 4:3"
+msgid "Force &4:3 display ratio"
+msgstr "Forcer le ratio &4:3"
 
 msgid "&Window scale factor"
-msgstr "&Echelle facteur"
+msgstr "Facteur d'&Echelle"
 
 msgid "&0.5x"
 msgstr "&0.5x"
@@ -94,8 +102,8 @@ msgstr "&7x"
 msgid "&8x"
 msgstr "&8x"
 
-msgid "Filter method"
-msgstr "Methode Filtre"
+msgid "Fi&lter method"
+msgstr "Mét&hode de Filtre"
 
 msgid "&Nearest"
 msgstr "&Plus proche"
@@ -106,11 +114,11 @@ msgstr "&Lineaire"
 msgid "Hi&DPI scaling"
 msgstr "Mise à l'échelle Hi&DPI"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "&Plein Ecran\tCtrl+Alt+PgUp"
+msgid "&Fullscreen"
+msgstr "&Plein écran"
 
 msgid "Fullscreen &stretch mode"
-msgstr "Mode &Elargi plein écran"
+msgstr "Mode plein écran é&tiré"
 
 msgid "&Full screen stretch"
 msgstr "&Plein écran étiré"
@@ -119,28 +127,34 @@ msgid "&4:3"
 msgstr "&4:3"
 
 msgid "&Square pixels (Keep ratio)"
-msgstr "pixels &Carrés(Keep ratio)"
+msgstr "Pixels &carrés (Conserver le ratio)"
 
 msgid "&Integer scale"
-msgstr "Echelle &Entière"
+msgstr "&Echelle entière"
 
 msgid "4:&3 Integer scale"
-msgstr "Echelle Entière 4:&3"
+msgstr "Echelle entière 4:&3"
 
-msgid "E&GA/(S)VGA settings"
-msgstr "Réglages E&GA/(S)VGA"
+msgid "EGA/(S)&VGA settings"
+msgstr "Réglages EGA/(S)&VGA"
 
 msgid "&Inverted VGA monitor"
 msgstr "Moniteur VGA &Inversé"
 
 msgid "VGA screen &type"
-msgstr "&Type Ecran VGA"
+msgstr "&Type d'écran VGA"
 
 msgid "RGB &Color"
-msgstr "RGB &Couleur"
+msgstr "&Couleurs RVB"
+
+msgid "RGB (no brown)"
+msgstr "RVB (sans brun)"
 
 msgid "&RGB Grayscale"
-msgstr "&RGB Ton de Gris"
+msgstr "Niveau de Gris &RVB"
+
+msgid "Generic RGBI color monitor"
+msgstr "Moniteur couleur RVB générique"
 
 msgid "&Amber monitor"
 msgstr "Moniteur &Ambre"
@@ -152,7 +166,7 @@ msgid "&White monitor"
 msgstr "Moniteur &Blanc"
 
 msgid "Grayscale &conversion type"
-msgstr "Grayscale &conversion type"
+msgstr "Type de &conversion du niveau de Gris"
 
 msgid "BT&601 (NTSC/PAL)"
 msgstr "BT&601 (NTSC/PAL)"
@@ -161,16 +175,16 @@ msgid "BT&709 (HDTV)"
 msgstr "BT&709 (HDTV)"
 
 msgid "&Average"
-msgstr "&Moyenne"
+msgstr "&Moyen"
 
 msgid "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
 msgstr "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
 
 msgid "Change contrast for &monochrome display"
-msgstr "Modifier contraste affichage  &monochrome"
+msgstr "Modifier le contraste de l'affichage &monochrome"
 
 msgid "&Media"
-msgstr "&Media"
+msgstr "&Média"
 
 msgid "&Tools"
 msgstr "Ou&tils"
@@ -178,29 +192,35 @@ msgstr "Ou&tils"
 msgid "&Settings..."
 msgstr "&Réglages..."
 
+msgid "Settings..."
+msgstr "Réglages..."
+
 msgid "&Update status bar icons"
 msgstr "Mettre à jour la barre de stat&us"
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "Copie &Ecran\tCtrl+F11"
+msgid "Take s&creenshot"
+msgstr "Copie d'é&cran"
+
+msgid "S&ound"
+msgstr "S&on"
 
 msgid "&Preferences..."
 msgstr "&Préférences..."
 
 msgid "Enable &Discord integration"
-msgstr "Activer intégration &Discord"
+msgstr "Activer l'intégration &Discord"
 
 msgid "Sound &gain..."
 msgstr "&Gain Son..."
 
-msgid "Begin trace\tCtrl+T"
-msgstr "Démarrer traces\tCtrl+T"
+msgid "Begin trace"
+msgstr "Démarrer traces"
 
-msgid "End trace\tCtrl+T"
-msgstr "Finir traces\tCtrl+T"
+msgid "End trace"
+msgstr "Arrêter traces"
 
 msgid "&Help"
-msgstr "&Aide"
+msgstr "Ai&de"
 
 msgid "&Documentation..."
 msgstr "&Documentation..."
@@ -215,7 +235,7 @@ msgid "&Existing image..."
 msgstr "Image &Existante..."
 
 msgid "Existing image (&Write-protected)..."
-msgstr "Image Existante(&Lecture seule)..."
+msgstr "Image Existante (&Lecture seule)..."
 
 msgid "&Record"
 msgstr "En&registrer"
@@ -227,10 +247,10 @@ msgid "&Rewind to the beginning"
 msgstr "&Revenir au debut"
 
 msgid "&Fast forward to the end"
-msgstr "Aller à la &Fin"
+msgstr "Avance rapide jusqu'à la &Fin"
 
 msgid "E&ject"
-msgstr "E&jecter"
+msgstr "É&jecter"
 
 msgid "&Image..."
 msgstr "&Image..."
@@ -242,10 +262,10 @@ msgid "&Mute"
 msgstr "&Couper"
 
 msgid "E&mpty"
-msgstr "E&jecter"
+msgstr "V&ide"
 
-msgid "&Reload previous image"
-msgstr "&Recharger image précedente"
+msgid "Reload previous image"
+msgstr "Recharger image précedente"
 
 msgid "&Folder..."
 msgstr "&Dossier..."
@@ -272,7 +292,7 @@ msgid "&75 fps"
 msgstr "&75 images par seconde"
 
 msgid "&VSync"
-msgstr "Synchronisation &verticale"
+msgstr "Synchronisation &Verticale"
 
 msgid "&Select shader..."
 msgstr "Sé&lectionnez le shader..."
@@ -293,7 +313,7 @@ msgid "Settings"
 msgstr "Réglages"
 
 msgid "Specify Main Window Dimensions"
-msgstr "Spécifier le détournement de la fenêtre principale"
+msgstr "Spécifier les dimensions de la fenêtre principale"
 
 msgid "OK"
 msgstr "OK"
@@ -301,18 +321,12 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Annuler"
 
-msgid "Save these settings as &global defaults"
-msgstr "Sauvegarder ces paramètres comme valeurs par défaut &globales"
-
 msgid "&Default"
 msgstr "&Défaut"
 
 msgid "Language:"
 msgstr "Langue:"
 
-msgid "Icon set:"
-msgstr "Ensemble d'icônes:"
-
 msgid "Gain"
 msgstr "Gain"
 
@@ -326,7 +340,7 @@ msgid "RPM mode:"
 msgstr "Mode RPM:"
 
 msgid "Progress:"
-msgstr "Progrès:"
+msgstr "Progression:"
 
 msgid "Width:"
 msgstr "Largeur:"
@@ -346,8 +360,11 @@ msgstr "Machine:"
 msgid "Configure"
 msgstr "Configurer"
 
+msgid "CPU:"
+msgstr "Processeur:"
+
 msgid "CPU type:"
-msgstr "Type du processeur:"
+msgstr "Type de processeur:"
 
 msgid "Speed:"
 msgstr "Vitesse:"
@@ -382,11 +399,23 @@ msgstr "Activé (UTC)"
 msgid "Dynamic Recompiler"
 msgstr "Recompilateur dynamique"
 
+msgid "CPU frame size"
+msgstr "Taille du bloc de processeur"
+
+msgid "Larger frames (less smooth)"
+msgstr "Blocs plus grands (moins fluide)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Blocs plus petits (plus fluide)"
+
 msgid "Video:"
 msgstr "Vidéo:"
 
-msgid "Voodoo Graphics"
-msgstr "Graphique Voodoo"
+msgid "Video #2:"
+msgstr "Vidéo 2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Graphique Voodoo 1 ou 2"
 
 msgid "IBM 8514/A Graphics"
 msgstr "Graphique IBM 8514/A"
@@ -394,11 +423,26 @@ msgstr "Graphique IBM 8514/A"
 msgid "XGA Graphics"
 msgstr "Graphique XGA"
 
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "Graphique du adaptateur IBM PS/55"
+
+msgid "Keyboard:"
+msgstr "Clavier:"
+
+msgid "Keyboard"
+msgstr "Clavier"
+
 msgid "Mouse:"
 msgstr "Souris:"
 
+msgid "Mouse"
+msgstr "Souris"
+
 msgid "Joystick:"
-msgstr "Manette de commande:"
+msgstr "Manette:"
+
+msgid "Joystick"
+msgstr "Joystick"
 
 msgid "Joystick 1..."
 msgstr "Manette 1..."
@@ -430,6 +474,9 @@ msgstr "Sortie MIDI:"
 msgid "MIDI In Device:"
 msgstr "Entrée MIDI:"
 
+msgid "MIDI Out:"
+msgstr "Sortie MIDI:"
+
 msgid "Standalone MPU-401"
 msgstr "MPU-401 autonome"
 
@@ -445,15 +492,6 @@ msgstr "Nuked (plus précis)"
 msgid "YMFM (faster)"
 msgstr "YMFM (plus rapide)"
 
-msgid "Network type:"
-msgstr "Type de réseau:"
-
-msgid "PCap device:"
-msgstr "Dispositif PCap:"
-
-msgid "Network adapter:"
-msgstr "Adaptateur de réseau:"
-
 msgid "COM1 Device:"
 msgstr "Dispositif COM1:"
 
@@ -478,6 +516,9 @@ msgstr "Dispositif LPT3:"
 msgid "LPT4 Device:"
 msgstr "Dispositif LPT4:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr "DMA de l'ECP du LPT interne:"
+
 msgid "Serial port 1"
 msgstr "Port série 1"
 
@@ -502,17 +543,20 @@ msgstr "Port parallèle 3"
 msgid "Parallel port 4"
 msgstr "Port parallèle 4"
 
-msgid "HD Controller:"
-msgstr "Contrôleur HD:"
-
 msgid "FD Controller:"
 msgstr "Contrôleur FD:"
 
+msgid "CD-ROM Controller:"
+msgstr "Contrôleur CD-ROM:"
+
 msgid "Tertiary IDE Controller"
-msgstr "Contrôleur IDE tertiaire"
+msgstr "Troisième contrôleur IDE"
 
 msgid "Quaternary IDE Controller"
-msgstr "Contrôleur IDE quaternair"
+msgstr "Quatrième contrôleur IDE"
+
+msgid "Hard disk"
+msgstr "Disque dur"
 
 msgid "SCSI"
 msgstr "SCSI"
@@ -535,6 +579,9 @@ msgstr "Cassette"
 msgid "Hard disks:"
 msgstr "Disques durs:"
 
+msgid "Firmware Version"
+msgstr "Version du micrologiciel"
+
 msgid "&New..."
 msgstr "&Nouveau..."
 
@@ -587,16 +634,19 @@ msgid "Check BPB"
 msgstr "Vérifier BPB"
 
 msgid "CD-ROM drives:"
-msgstr "Lecterus CD-ROM:"
-
-msgid "Earlier drive"
-msgstr "Lecteur plus tôt"
+msgstr "Lecteurs CD-ROM:"
 
 msgid "MO drives:"
 msgstr "Lecteurs magnéto-optiques:"
 
-msgid "ZIP drives:"
-msgstr "Lecteurs ZIP:"
+msgid "MO:"
+msgstr "Magnéto-optiques:"
+
+msgid "Removable disks:"
+msgstr "Disques amovibles:"
+
+msgid "Removable disk drives:"
+msgstr "Lecteurs de disques amovibles:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
@@ -605,7 +655,10 @@ msgid "ISA RTC:"
 msgstr "Horloge temps réel ISA:"
 
 msgid "ISA Memory Expansion"
-msgstr "Expansion de la mémoire ISA"
+msgstr "Extension de la mémoire ISA"
+
+msgid "ISA ROM Cards"
+msgstr "Cartes ROM ISA"
 
 msgid "Card 1:"
 msgstr "Carte 1:"
@@ -619,18 +672,21 @@ msgstr "Carte 3:"
 msgid "Card 4:"
 msgstr "Carte 4:"
 
+msgid "Generic ISA ROM Board"
+msgstr "Carte ROM ISA générique"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "Carte ROM ISA double générique"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "Carte ROM ISA quadruple générique"
+
 msgid "ISABugger device"
 msgstr "Dispositif ISABugger"
 
 msgid "POST card"
 msgstr "Carte POST"
 
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
-
 msgid "86Box"
 msgstr "86Box"
 
@@ -641,19 +697,22 @@ msgid "Fatal error"
 msgstr "Erreur fatale"
 
 msgid " - PAUSED"
-msgstr " - PAUSED"
-
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Appuyez sur Ctrl+Alt+PgDn pour revenir au mode fenêtré."
+msgstr " - EN PAUSE"
 
 msgid "Speed"
 msgstr "Vitesse"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "Disque amovible %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "Images ZIP"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "&Disque amovible %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Imges de disque amovible"
+
+msgid "Image %1"
+msgstr "Image %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
 msgstr "86Box n'a pas pu trouver d'images ROM utilisables.\n\nS'il vous plait, <a href=\"https://github.com/86Box/roms/releases/latest\">téléchargez</a> un ensemble ROM et extrayez-le dans le répertoire \"roms\"."
@@ -674,10 +733,10 @@ msgid "Off"
 msgstr "Désactivé"
 
 msgid "All images"
-msgstr "Tous les images"
+msgstr "Toutes les images"
 
 msgid "Basic sector images"
-msgstr "Images basiques du secteur"
+msgstr "Images secteur basique"
 
 msgid "Surface images"
 msgstr "Images de la surface"
@@ -688,6 +747,12 @@ msgstr "La machine \"%hs\" n'est pas disponible en raison de l'absence de ROMs d
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
 msgstr "La carte vidéo \"%hs\" n'est pas disponible en raison de l'absence de ROMs dans le répertoire roms/video. Basculer vers une carte vidéo disponible."
 
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "La carte vidéo 2 \"%hs\" n'est pas disponible en raison de l'absence de ROMs dans le répertoire roms/video. Désactiver la deuxième carte vidéo."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "Le dispositif \"%hs\" n'est pas disponible en raison de l'absence de ROMs. Ignorer le dispositif."
+
 msgid "Machine"
 msgstr "Machine"
 
@@ -706,12 +771,30 @@ msgstr "Réseau"
 msgid "Ports (COM & LPT)"
 msgstr "Ports (COM et LPT)"
 
+msgid "Ports"
+msgstr "Ports"
+
+msgid "Serial ports:"
+msgstr "Ports série:"
+
+msgid "Parallel ports:"
+msgstr "Ports parallèles:"
+
 msgid "Storage controllers"
 msgstr "Contrôleurs de stockage"
 
 msgid "Hard disks"
 msgstr "Disques durs"
 
+msgid "Disks:"
+msgstr "Disques:"
+
+msgid "Floppy:"
+msgstr "Disquettes:"
+
+msgid "Controllers:"
+msgstr "Contrôleurs:"
+
 msgid "Floppy & CD-ROM drives"
 msgstr "Lecteurs de disquette et CD-ROM"
 
@@ -719,22 +802,25 @@ msgid "Other removable devices"
 msgstr "Autres dispositifs amovibles"
 
 msgid "Other peripherals"
-msgstr "Autres périfériques"
+msgstr "Autres périphériques"
+
+msgid "Other devices"
+msgstr "Autres dispositifs"
 
 msgid "Click to capture mouse"
 msgstr "Cliquer pour capturer la souris"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "Appuyer sur F8+F12 pour libérer la souris"
+msgid "Press %1 to release mouse"
+msgstr "Appuyer sur %1 pour libérer la souris"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Appuyer sur F8+F12 ou le bouton central pour libérer la souris"
+msgid "Press %1 or middle button to release mouse"
+msgstr "Appuyer sur %1 ou le bouton central pour libérer la souris"
 
 msgid "Bus"
 msgstr "Bus"
 
 msgid "File"
-msgstr "File"
+msgstr "Fichier"
 
 msgid "C"
 msgstr "C"
@@ -748,74 +834,95 @@ msgstr "S"
 msgid "KB"
 msgstr "Ko"
 
-msgid "Could not initialize the video renderer."
-msgstr "Impossible d'initialiser le moteur de rendu vidéo."
-
 msgid "Default"
 msgstr "Défaut"
 
-msgid "%i Wait state(s)"
-msgstr "%i état(s) d'attente"
+msgid "%1 Wait state(s)"
+msgstr "%1 état(s) d'attente"
 
 msgid "Type"
 msgstr "Type"
 
-msgid "Failed to set up PCap"
-msgstr "Impossible d'initialiser PCap"
-
 msgid "No PCap devices found"
 msgstr "Aucun dispositif PCap trouvé"
 
 msgid "Invalid PCap device"
-msgstr "Dispositif PCap non valide"
+msgstr "Dispositif PCap invalide"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "Manette(s) standard avec 2 boutons"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "Manette(s) avec 2 axes, 2 boutons"
 
-msgid "Standard 4-button joystick"
-msgstr "Manette standard avec 4 boutons"
+msgid "2-axis, 4-button joystick"
+msgstr "Manette avec 2 axes, 4 boutons"
 
-msgid "Standard 6-button joystick"
-msgstr "Manette standard avec 6 boutons"
+msgid "2-axis, 6-button joystick"
+msgstr "Manette avec 2 axes, 6 boutons"
 
-msgid "Standard 8-button joystick"
-msgstr "Manette standard avec 6 boutons"
+msgid "2-axis, 8-button joystick"
+msgstr "Manette avec 2 axes, 8 boutons"
+
+msgid "3-axis, 2-button joystick"
+msgstr "Manette avec 3 axes, 2 boutons"
+
+msgid "3-axis, 4-button joystick"
+msgstr "Manette avec 3 axes, 4 boutons"
+
+msgid "4-axis, 4-button joystick"
+msgstr "Manette avec 4 axes, 4 boutons"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH Pedals"
+
 msgid "Microsoft SideWinder Pad"
 msgstr "Microsoft SideWinder Pad"
 
 msgid "Thrustmaster Flight Control System"
 msgstr "Système de contrôle de vol Thrustmaster"
 
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "SCV Thrustmaster + Système de commande de gouvernail"
+
+msgid "2-button gamepad(s)"
+msgstr "Manette(s) de jeu à 2 boutons"
+
+msgid "2-button flight yoke"
+msgstr "Manette de vol à 2 boutons"
+
+msgid "4-button gamepad"
+msgstr "Manette de jeu à 2 boutons"
+
+msgid "4-button flight yoke"
+msgstr "Manette de vol à 4 boutons"
+
+msgid "2-button flight yoke with throttle"
+msgstr "Manette de vol à 2 boutons avec manette des gaz"
+
+msgid "4-button flight yoke with throttle"
+msgstr "Manette de vol à 4 boutons avec manette des gaz"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Volant Win95 (3 axes, 4 boutons)"
+
 msgid "None"
 msgstr "Aucun"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "Impossible de charger les accélérateurs de clavier."
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 Mo (CTS: %2, %3, %4)"
 
-msgid "Unable to register raw input."
-msgstr "Impossible de charger l'entrée raw."
+msgid "Floppy %1 (%2): %3"
+msgstr "Disquette %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u Mo (CTS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Disquette %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "&Disquette %1 (%2): %3"
 
 msgid "Advanced sector images"
-msgstr "Images du secteur avancés"
+msgstr "Images secteur avancé"
 
 msgid "Flux images"
-msgstr "Images du flux"
-
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "Impossible d'initialiser SDL, SDL2.dll est nécessaire"
+msgstr "Images Flux"
 
 msgid "Are you sure you want to hard reset the emulated machine?"
 msgstr "Etes-vous sûr de vouloir réinitialiser la machine émulée ?"
@@ -826,8 +933,14 @@ msgstr "Etes-vous sûr de vouloir quitter 86Box?"
 msgid "Unable to initialize Ghostscript"
 msgstr "Impossible d'initialiser Ghostscript"
 
-msgid "MO %i (%ls): %ls"
-msgstr "Magnéto-optique %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "Impossible d'initialiser GhostPCL"
+
+msgid "MO %1 (%2): %3"
+msgstr "Magnéto-optique %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&Magnéto-optique %1 (%2): %3"
 
 msgid "MO images"
 msgstr "Images magnéto-optiques"
@@ -835,8 +948,17 @@ msgstr "Images magnéto-optiques"
 msgid "Welcome to 86Box!"
 msgstr "Bienvenue dans 86Box !"
 
-msgid "Internal controller"
-msgstr "Côntrolleur interne"
+msgid "Internal device"
+msgstr "Dispositif interne"
+
+msgid "&File"
+msgstr "&Fichier"
+
+msgid "&New machine..."
+msgstr "&Nouvelle machine..."
+
+msgid "&Check for updates..."
+msgstr "&Vérifier les mises à jour..."
 
 msgid "Exit"
 msgstr "Sortir"
@@ -860,34 +982,22 @@ msgid "86Box v"
 msgstr "86Box v"
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "Un émulateur de vieux ordinateurs\n\nAuteurs: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nLibéré sous la licence GNU General Public License version 2 ou ultérieure. Pour plus d'informations, voir le fichier LICENSE."
+msgstr "Un émulateur d'ordinateurs du passé\n\nAuteurs: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nAvec les contributions de Sarah Walker, leilei, JohnElliott, greatpsycho et d'autres.\n\nLibéré sous la licence GNU General Public License version 2 ou ultérieure. Pour plus d'informations, voir le fichier LICENSE."
 
 msgid "Hardware not available"
 msgstr "Matériel non disponible"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Assurez-vous que libpcap est installé et que vou utilisez une connexion réseau compatible avec libpcap."
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "Assurez-vous que %1 est installé et que vous utilisez une connexion réseau compatible avec %1."
 
 msgid "Invalid configuration"
-msgstr "Configuration non valide"
+msgstr "Configuration invalide"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 est nécessaire pour la conversion automatique des fichiers PostScript en PDF.\n\nTous les documents envoyés à l'imprimante générique PostScript seront sauvés en tant que fichiers PostScript (.ps)."
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " est nécessair pour la conversion automatique des fichiers PostScript dans PDF.\n\nTous les documents envoyés à l'imprimante générique PostScript seront sauvés comme des fichiers PostScript (.ps)."
-
-msgid "Entering fullscreen mode"
-msgstr "Entrer en mode plein écran"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 est nécessaire pour la conversion automatique des fichiers PCL en PDF.\n\nTous les documents envoyés à l'imprimante générique PCL seront sauvés en tant quefichiers Printer Command Language (.pcl)."
 
 msgid "Don't show this message again"
 msgstr "Ne pas montrer ce message à nouveau"
@@ -904,53 +1014,53 @@ msgstr "Ne pas réinitialiser"
 msgid "CD-ROM images"
 msgstr "Images CD-ROM"
 
-msgid "%hs Device Configuration"
-msgstr "Configuration du dispositif %hs"
+msgid "%1 Device Configuration"
+msgstr "Configuration du dispositif %1"
 
 msgid "Monitor in sleep mode"
 msgstr "Moniteur en mode veille"
 
-msgid "OpenGL Shaders"
-msgstr "Shaders OpenGL"
-
-msgid "OpenGL options"
-msgstr "Options OpenGL"
+msgid "GLSL shaders"
+msgstr "Shaders GLSL"
 
 msgid "You are loading an unsupported configuration"
 msgstr "Vous chargez une configuration non prise en charge"
 
 msgid "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
-msgstr "La filtrage du type du processeur sur la base de la machine sélectionné est désactivé pur cette machine émulée.\n\nCela permet de sélectionner une processeur que est sinon incompatible avec la machine sélectionné. Cependant, il pourrait y avoir des incompatibilités avec le BIOS de la machine ou autres logiciels.\n\nL'activatione de cette configuration non est officiellement prise en charge et tout rapport de bogue peut être fermé comme étant invalide."
+msgstr "Le filtre du type du processeur basé par rapport à la machine sélectionnée est désactivé pour cette machine émulée.\n\nCela permet de sélectionner un processeur qui est de base incompatible avec la machine sélectionnée. Cependant, il pourrait y avoir des incompatibilités avec le BIOS de la machine ou autres logiciels.\n\nL'activation de cette configuration non officiellement prise en charge implique que tout rapport de bogue peut être fermé étant considéré comme invalide."
 
 msgid "Continue"
 msgstr "Continuer"
 
-msgid "Cassette: %s"
-msgstr "Cassette: %s"
+msgid "Cassette: %1"
+msgstr "Cassette: %1"
+
+msgid "C&assette: %1"
+msgstr "C&assette: %1"
 
 msgid "Cassette images"
 msgstr "Images cassette"
 
-msgid "Cartridge %i: %ls"
-msgstr "Cartouche %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "Cartouche %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "Car&touche %1: %2"
 
 msgid "Cartridge images"
 msgstr "Images cartouche"
 
-msgid "Error initializing renderer"
-msgstr "Erreur d'initialisation du moteur de rendu"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "Le moteur de rendu OpenGL (3.0 Core) n'a pas pu être initialisé. Utilisez un autre moteur de rendu."
-
 msgid "Resume execution"
 msgstr "Reprendre l'exécution"
 
 msgid "Pause execution"
 msgstr "Pause de l'exécution"
 
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Suppr"
+
 msgid "Press Ctrl+Alt+Del"
-msgstr "Appuyer sur Ctrl+Alt+Suppr."
+msgstr "Appuyer sur Ctrl+Alt+Suppr"
 
 msgid "Press Ctrl+Alt+Esc"
 msgstr "Appuyer sur Ctrl+Alt+Esc"
@@ -958,17 +1068,281 @@ msgstr "Appuyer sur Ctrl+Alt+Esc"
 msgid "Hard reset"
 msgstr "Hard reset"
 
+msgid "Force shutdown"
+msgstr "Arrêt forcé"
+
+msgid "Start"
+msgstr "Démarrer"
+
+msgid "Not running"
+msgstr "Inactive"
+
+msgid "Running"
+msgstr "Active"
+
+msgid "Paused"
+msgstr "En pause"
+
+msgid "Waiting"
+msgstr "En attente"
+
+msgid "Powered Off"
+msgstr "Éteinte"
+
+msgid "%n running"
+msgstr "%n démarrée"
+
+msgid "%n paused"
+msgstr "%n en pause"
+
+msgid "%n waiting"
+msgstr "%n en attente"
+
+msgid "%1 total"
+msgstr "%1 total"
+
+msgid "VMs: %1"
+msgstr "Machines virtuelles: %1"
+
+msgid "System Directory:"
+msgstr "Répertoire du système:"
+
+msgid "Choose directory"
+msgstr "Sélectionner le répertoire"
+
+msgid "Choose configuration file"
+msgstr "Sélectionner le fichier de configuration"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "Fichiers de configuration 86Box (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Échec de la lecture de la configuration"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "Impossible d'ouvrir le fichier de configuration sélectionné pour lecture : %1"
+
+msgid "Use regular expressions in search box"
+msgstr "Utilisez des expressions régulières dans le champ de recherche"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "%1 machine(s) sont actuellement actives. Êtes-vous sûr de vouloir quitter le gestionnaire de machines virtuelles malgré tout ?"
+
+msgid "Add new system wizard"
+msgstr "Assistant pour ajouter un nouveau système"
+
+msgid "Introduction"
+msgstr "Introduction"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "Cela vous aidera à ajouter un nouveau système à 86Box."
+
+msgid "New configuration"
+msgstr "Nouvelle configuration"
+
+msgid "Complete"
+msgstr "Terminer"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "L'assistant va maintenant lancer la configuration du nouveau système."
+
+msgid "Use existing configuration"
+msgstr "Utiliser la configuration existante"
+
+msgid "Type some notes here"
+msgstr "Tapez vos notes ici"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Collez le contenu du fichier de configuration existant dans la zone ci-dessous."
+
+msgid "Load configuration from file"
+msgstr "Charger la configuration à partir du fichier"
+
+msgid "System name"
+msgstr "Nom du système"
+
+msgid "System name:"
+msgstr "Nom du système:"
+
+msgid "System name cannot contain certain characters"
+msgstr "Le nom du système ne peut pas contenir certains caractères"
+
+msgid "System name already exists"
+msgstr "Le nom du système existe déjà"
+
+msgid "Please enter a directory for the system"
+msgstr "Veuillez saisir un répertoire pour le système"
+
+msgid "Directory does not exist"
+msgstr "Le répertoire n'existe pas"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "Un nouveau répertoire pour le système sera créé dans le répertoire sélectionné ci-dessus"
+
+msgid "System location:"
+msgstr "Emplacement du système:"
+
+msgid "System name and location"
+msgstr "Nom et emplacement du système"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Entrez le nom du système et choisissez l'emplacement"
+
+msgid "Enter the name of the system"
+msgstr "Entrez le nom du système"
+
+msgid "Please enter a system name"
+msgstr "Veuillez entrer un nom de système"
+
+msgid "Display name (optional):"
+msgstr "Nom d'affichage (facultatif):"
+
+msgid "Display name:"
+msgstr "Nom d'affichage:"
+
+msgid "Set display name"
+msgstr "Définir le nom d'affichage"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Entrez le nouveau nom d'affichage (laissez vide pour réinitialiser)"
+
+msgid "Change &display name..."
+msgstr "Modifier le nom &d'affichage..."
+
+msgid "Context Menu"
+msgstr "Menu contextuel"
+
+msgid "&Open folder..."
+msgstr "&Ouvrir le dossier..."
+
+msgid "Open p&rinter tray..."
+msgstr "Ouvrez le bac de l'&imprimante..."
+
+msgid "Set &icon..."
+msgstr "Définir l'&icône..."
+
+msgid "Select an icon"
+msgstr "Sélectionnez une icône"
+
+msgid "C&lone..."
+msgstr "C&loner..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "La machine virtuelle \"%1\" (%2) sera clonée dans :"
+
+msgid "Directory %1 already exists"
+msgstr "Le répertoire %1 existe déjà"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "Vous ne pouvez pas utiliser les caractères suivants dans le nom : %1"
+
+msgid "Clone"
+msgstr "Cloner"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Échec de la création du répertoire pour la machine virtuelle clonée"
+
+msgid "Failed to clone VM."
+msgstr "Échec du clonage de la machine virtuelle."
+
+msgid "Directory in use"
+msgstr "Répertoire utilisé"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "Le répertoire sélectionné est déjà utilisé. Veuillez sélectionner un autre répertoire."
+
+msgid "Create directory failed"
+msgstr "Échec de la création du répertoire"
+
+msgid "Unable to create the directory for the new system"
+msgstr "Impossible de créer le répertoire pour le nouveau système"
+
+msgid "Configuration write failed"
+msgstr "Échec de l'écriture de la configuration"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "Impossible d'ouvrir le fichier de configuration à l'emplacement %1 pour l'écriture"
+
+msgid "Error adding system"
+msgstr "Erreur lors de l'ajout du système"
+
+msgid "Remove directory failed"
+msgstr "Échec de la suppression du répertoire"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "Certains fichiers du répertoire de la machine n'ont pas pu être supprimés. Veuillez les supprimer manuellement."
+
+msgid "Build"
+msgstr "Build"
+
+msgid "Version"
+msgstr "Version"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "Une mise à jour de 86Box est disponible : %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "Une erreur s'est produite lors de la vérification des mises à jour : %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>Une mise à jour de 86Box est disponible !</b>"
+
+msgid "Warning"
+msgstr "Avertissement"
+
+msgid "&Kill"
+msgstr "Fo&rcer Extinction"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "La fermeture forcée d'une machine virtuelle peut entraîner une perte de données. Ne procédez ainsi que si le processus 86Box est bloqué.\n\nVoulez-vous vraiment fermer la machine virtuelle \"%1\" ?"
+
+msgid "&Delete"
+msgstr "&Supprimer"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "Voulez-vous vraiment supprimer la machine virtuelle \"%1\" et tous ses fichiers ? Cette action ne peut pas être annulée !"
+
+msgid "Show &config file"
+msgstr "Afficher le fichier de &configuration"
+
+msgid "No screenshot"
+msgstr "Pas de capture d'écran"
+
+msgid "Search"
+msgstr "Rechercher"
+
+msgid "Searching for VMs..."
+msgstr "Recherche de machines virtuelles..."
+
+msgid "Found %1"
+msgstr "Trouvé %1"
+
+msgid "System"
+msgstr "Système"
+
+msgid "Storage"
+msgstr "Stockage"
+
+msgid "Disk %1: "
+msgstr "Disque %1: "
+
+msgid "No disks"
+msgstr "Pas de disques"
+
+msgid "Audio"
+msgstr "Audio"
+
+msgid "Audio:"
+msgstr "Audio:"
+
 msgid "ACPI shutdown"
 msgstr "Arrêt ACPI"
 
-msgid "Hard disk (%s)"
-msgstr "Disque dur (%s)"
+msgid "ACP&I shutdown"
+msgstr "Arrêt ACP&I"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "Disque dur (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
 msgstr "Les lecteurs de CD-ROM MFM/RLL ou ESDI n'ont jamais existé"
@@ -986,13 +1360,13 @@ msgid "Add Existing Hard Disk"
 msgstr "Ajouter un disque dur existant"
 
 msgid "HDI disk images cannot be larger than 4 GB."
-msgstr "Les images de disque HDI ne peuvent pas avoir une taille supériure à Go."
+msgstr "Les images de disque HDI ne peuvent pas avoir une taille supérieure à 4 Go."
 
 msgid "Disk images cannot be larger than 127 GB."
-msgstr "Les images de disque ne peuvent pas avoir un taille supérieure à 127 Go."
+msgstr "Les images de disque ne peuvent pas avoir une taille supérieure à 127 Go."
 
 msgid "Hard disk images"
-msgstr "Images de dique dur"
+msgstr "Images de disque dur"
 
 msgid "Unable to read file"
 msgstr "Impossible de lire le fichier"
@@ -1001,13 +1375,10 @@ msgid "Unable to write file"
 msgstr "Impossible d'écrire le fichier"
 
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
-msgstr "Les images HDI ou HDX avec une taille de secteur différente de 512 non sont pas prises en charge."
-
-msgid "USB is not yet supported"
-msgstr "USB n'est pas encore pris en charge."
+msgstr "Les images HDI ou HDX avec une taille de secteur différente de 512 ne sont pas prises en charge."
 
 msgid "Disk image file already exists"
-msgstr "Le fichier de l'image disque existe déjà."
+msgstr "Le fichier de l'image disque existe déjà"
 
 msgid "Please specify a valid file name."
 msgstr "Veuillez spécifier un nom de fichier valide."
@@ -1028,7 +1399,7 @@ msgid "Remember to partition and format the newly-created drive."
 msgstr "N'oubliez pas de partitionner et de formater le nouveau disque créé."
 
 msgid "The selected file will be overwritten. Are you sure you want to use it?"
-msgstr "Le fichier sélectionné sera écrasé. Etes-vous sûr de vouloir l'utiliser?"
+msgstr "Le fichier sélectionné sera écrasé. Etes-vous sûr de vouloir l'utiliser ?"
 
 msgid "Unsupported disk image"
 msgstr "Image disque non prise en charge"
@@ -1039,6 +1410,27 @@ msgstr "Écraser"
 msgid "Don't overwrite"
 msgstr "Ne pas écraser"
 
+msgid "Raw image"
+msgstr "Image brute"
+
+msgid "HDI image"
+msgstr "Image HDI"
+
+msgid "HDX image"
+msgstr "Image HDX"
+
+msgid "Fixed-size VHD"
+msgstr "VHD de taille fixe"
+
+msgid "Dynamic-size VHD"
+msgstr "VHD de taille dynamique"
+
+msgid "Differencing VHD"
+msgstr "VHD différentiel"
+
+msgid "(N/A)"
+msgstr "(N.D.)"
+
 msgid "Raw image (.img)"
 msgstr "Image brute (.img)"
 
@@ -1049,19 +1441,19 @@ msgid "HDX image (.hdx)"
 msgstr "Image HDX (.hdx)"
 
 msgid "Fixed-size VHD (.vhd)"
-msgstr "VHD à taille fixe (.vhd)"
+msgstr "VHD de taille fixe (.vhd)"
 
 msgid "Dynamic-size VHD (.vhd)"
-msgstr "VHD à taille dynamique (.vhd)"
+msgstr "VHD de taille dynamique (.vhd)"
 
 msgid "Differencing VHD (.vhd)"
-msgstr "VHD à différenciation (.vhd)"
+msgstr "VHD différentiel (.vhd)"
 
 msgid "Large blocks (2 MB)"
-msgstr "Blocs grands (2 Mo)"
+msgstr "Grands Blocs (2 Mo)"
 
 msgid "Small blocks (512 KB)"
-msgstr "Blocs petits (512 Ko)"
+msgstr "Petits Blocs (512 Ko)"
 
 msgid "VHD files"
 msgstr "Fichiers VHD"
@@ -1070,17 +1462,14 @@ msgid "Select the parent VHD"
 msgstr "Sélectionnez le VHD parent"
 
 msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
-msgstr "Il est possible que l'image parente a été modifié après la création de l'image à différenciation.\n\nIl est même possible que les fichiers de l'mage ont été déplacés ou copiés ou il existe un bogue dans le programme que a créé ce disque.\n\nVoulez-vous réparer l'horodatage?"
+msgstr "Il est possible que l'image parente ai été modifiée après la création de l'image différentielle.\n\nIl est même possible que les fichiers de l’image ont été déplacés ou copiés ou il existe un bogue dans le programme qui a créé ce disque.\n\nVoulez-vous réparer l'horodatage ?"
 
 msgid "Parent and child disk timestamps do not match"
-msgstr "Les horodatages des disques parent et enfant ne correspondent pas"
+msgstr "Les horodatages des disques parents et enfants ne correspondent pas"
 
 msgid "Could not fix VHD timestamp."
 msgstr "Impossible de réparer l'horodatage du VHD."
 
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
-
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
 
@@ -1096,43 +1485,28 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
-
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
-
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
-
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
-
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
-
-msgid "160 kB"
+msgid "160 KB"
 msgstr "160 Ko"
 
-msgid "180 kB"
+msgid "180 KB"
 msgstr "180 Ko"
 
-msgid "320 kB"
+msgid "320 KB"
 msgstr "320 Ko"
 
-msgid "360 kB"
+msgid "360 KB"
 msgstr "360 Ko"
 
-msgid "640 kB"
+msgid "640 KB"
 msgstr "640 Ko"
 
-msgid "720 kB"
+msgid "720 KB"
 msgstr "720 Ko"
 
 msgid "1.2 MB"
@@ -1205,7 +1579,7 @@ msgid "Failed to initialize network driver"
 msgstr "Échec de l'initialisation du pilote réseau"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "La configuration du réseau passera au pilote nul"
+msgstr "La configuration du réseau passera au pilote NULL"
 
 msgid "Mouse sensitivity:"
 msgstr "Sensibilité de la souris:"
@@ -1226,5 +1600,1384 @@ msgid "Fast"
 msgstr "Rapide"
 
 msgid "&Auto-pause on focus loss"
-msgstr "&Pause automatique à perte de mise au point"
+msgstr "Pa&use automatique à perte de focus"
 
+msgid "WinBox is no longer supported"
+msgstr "WinBox n'est plus pris en charge"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "Le développement du gestionnaire WinBox s'est arrêté en 2022 en raison d'un manque de mainteneurs. Comme nous concentrons nos efforts sur l'amélioration de 86Box, nous avons pris la décision de ne plus supporter WinBox en tant que gestionnaire.\n\nAucune mise à jour ne sera fournie par WinBox et vous pourriez rencontrer des comportements incorrects si vous continuez à l'utiliser avec des versions plus récentes de 86Box. Tous les rapports de bogues relatifs au comportement de WinBox seront classés comme non valides.\n\nAllez sur 86box.net pour une liste d'autres gestionnaires que vous pouvez utiliser."
+
+msgid "Generate"
+msgstr "Générer"
+
+msgid "Joystick configuration"
+msgstr "Configuration de manette"
+
+msgid "Device"
+msgstr "Dispositif"
+
+msgid "%1 (X axis)"
+msgstr "%1 (axe X)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (axe Y)"
+
+msgid "MCA devices"
+msgstr "Dispositifs MCA"
+
+msgid "List of MCA devices:"
+msgstr "Liste des dispositifs MCA :"
+
+msgid "&Tablet tool"
+msgstr "Outil Tablette"
+
+msgid "About &Qt"
+msgstr "A propos de &Qt"
+
+msgid "&MCA devices..."
+msgstr "Dispositifs MCA..."
+
+msgid "Show non-&primary monitors"
+msgstr "Afficher les moniteurs non pr&imaires"
+
+msgid "Open screenshots &folder..."
+msgstr "Ouvrir le do&ssier des captures d'écran..."
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Appli&quer le mode élargi plein écran lorsque la fenêtre est maximisée"
+
+msgid "&Cursor/Puck"
+msgstr "&Curseur/Palette"
+
+msgid "&Pen"
+msgstr "&Stylo"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "&Lecteur CD/DVD hôte (%1:)"
+
+msgid "&Connected"
+msgstr "&Connecté"
+
+msgid "Clear image &history"
+msgstr "Effacer l'&historique de l'image"
+
+msgid "Create..."
+msgstr "Créer..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "Lecteur CD/DVD hôte (%1)"
+
+msgid "Unknown Bus"
+msgstr "Bus inconnu"
+
+msgid "Null Driver"
+msgstr "Pilote NULL"
+
+msgid "NIC:"
+msgstr "NIC:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "NIC %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&NIC %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "Comportement du rendu"
+
+msgid "Use target framerate:"
+msgstr "Utiliser le taux de rafraîchissement cible:"
+
+msgid " fps"
+msgstr " Images par seconde"
+
+msgid "VSync"
+msgstr "VSync"
+
+msgid "Synchronize with video"
+msgstr "Synchronisation avec la vidéo"
+
+msgid "Shaders"
+msgstr "Shaders"
+
+msgid "Remove"
+msgstr "Retirer"
+
+msgid "Browse..."
+msgstr "Parcourir..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "Impossible de créer un contexte OpenGL."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "Impossible de passer au contexte OpenGL."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "La version 3.0 ou supérieure d'OpenGL est requise. La version actuelle est %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "Erreur d'initialisation d'OpenGL"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nRevenir au rendu logiciel."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>Lors de la sélection d'images multimédia (CD-ROM, disquette, etc.), la boîte de dialogue d'ouverture démarrera dans le même répertoire que le fichier de configuration de 86Box. Ce paramètre ne fera probablement une différence que sur macOS.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "Cette machine peut avoir été déplacée ou copiée."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "Afin d'assurer le bon fonctionnement du réseau, 86Box doit savoir si cette machine a été déplacée ou copiée.\n\nSélectionnez « Je l'ai copié » si vous n'êtes pas sûr."
+
+msgid "I Moved It"
+msgstr "Je l'ai déplacé"
+
+msgid "I Copied It"
+msgstr "Je l'ai copié"
+
+msgid "86Box Monitor #"
+msgstr "Moniteur 86Box"
+
+msgid "No MCA devices."
+msgstr "Pas de dispositifs MCA."
+
+msgid "MiB"
+msgstr "Mio"
+
+msgid "GiB"
+msgstr "Gio"
+
+msgid "Network Card #1"
+msgstr "Carte réseau 1"
+
+msgid "Network Card #2"
+msgstr "Carte réseau 2"
+
+msgid "Network Card #3"
+msgstr "Carte réseau 3"
+
+msgid "Network Card #4"
+msgstr "Carte réseau 4"
+
+msgid "Mode:"
+msgstr "Mode:"
+
+msgid "Interface:"
+msgstr "Interface:"
+
+msgid "Adapter:"
+msgstr "Adaptateur:"
+
+msgid "VDE Socket:"
+msgstr "Prise VDE:"
+
+msgid "86Box Unit Tester"
+msgstr "Testeur d'unité de 86Box"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Carte clé Novell NetWare 2.x"
+
+msgid "Serial port passthrough 1"
+msgstr "Transfert du port série 1"
+
+msgid "Serial port passthrough 2"
+msgstr "Transfert du port série 2"
+
+msgid "Serial port passthrough 3"
+msgstr "Transfert du port série 3"
+
+msgid "Serial port passthrough 4"
+msgstr "Transfert du port série 4"
+
+msgid "Renderer &options..."
+msgstr "&Options du rendu..."
+
+msgid "PC/XT Keyboard"
+msgstr "Clavier PC/XT"
+
+msgid "AT Keyboard"
+msgstr "Clavier AT"
+
+msgid "AX Keyboard"
+msgstr "Clavier AX"
+
+msgid "PS/2 Keyboard"
+msgstr "Clavier PS/2"
+
+msgid "PS/55 Keyboard"
+msgstr "Clavier PS/55"
+
+msgid "Keys"
+msgstr "Touches"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Souris bus Logitech/Microsoft"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Souris bus Microsoft (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Souris série Mouse Systems"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Souris bus Mouse Systems"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Souris série Microsoft"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Souris série Microsoft BallPoint"
+
+msgid "Logitech Serial Mouse"
+msgstr "Souris série Logitech"
+
+msgid "PS/2 Mouse"
+msgstr "Souris PS/2"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "Souris PS/2 QuickPort"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (série)"
+
+msgid "Default Baud rate"
+msgstr "Vitesse de transmission par défaut"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] Modem standard conforme à la norme Hayes"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Émulation Roland MT-32"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Émulation Roland MT-32 (nouveau)"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Émulation Roland CM-32L"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Émulation Roland CM-32LN"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "Carte fille OPL4-ML"
+
+msgid "System MIDI"
+msgstr "Système MIDI"
+
+msgid "MIDI Input Device"
+msgstr "Dispositif d'entrée MIDI"
+
+msgid "BIOS file"
+msgstr "Fichier BIOS"
+
+msgid "BIOS file (ROM #1)"
+msgstr "Fichier BIOS (ROM 1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "Fichier BIOS (ROM 2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "Fichier BIOS (ROM 3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "Fichier BIOS (ROM 4)"
+
+msgid "BIOS address"
+msgstr "Adresse BIOS"
+
+msgid "BIOS address (ROM #1)"
+msgstr "Adresse BIOS (ROM 1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "Adresse BIOS (ROM 2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "Adresse BIOS (ROM 3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "Adresse BIOS (ROM 4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "Activer les écritures au ROM d'extension du BIOS"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "Activer les écritures au ROM d'extension du BIOS (ROM 1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "Activer les écritures au ROM d'extension du BIOS (ROM 2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "Activer les écritures au ROM d'extension du BIOS (ROM 3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "Activer les écritures au ROM d'extension du BIOS (ROM 4)"
+
+msgid "Linear framebuffer base"
+msgstr "Base du tampon graphique linéaire"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "IRQ du port série"
+
+msgid "Parallel port IRQ"
+msgstr "IRQ du port parallèle"
+
+msgid "BIOS Revision"
+msgstr "Révision du BIOS"
+
+msgid "BIOS Version"
+msgstr "Version du BIOS"
+
+msgid "BIOS Language"
+msgstr "Langue du BIOS"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "Unité d'extension IBM 5161"
+
+msgid "IBM Cassette Basic"
+msgstr "BASIC Cassette IBM"
+
+msgid "Translate 26 -> 17"
+msgstr "Traduire 26 -> 17"
+
+msgid "Language"
+msgstr "Langage"
+
+msgid "Enable backlight"
+msgstr "Activer le rétro-éclairage"
+
+msgid "Invert colors"
+msgstr "Inversion des couleurs"
+
+msgid "BIOS size"
+msgstr "Taille du BIOS"
+
+msgid "BIOS size (ROM #1)"
+msgstr "Taille du BIOS (ROM 1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "Taille du BIOS (ROM 2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "Taille du BIOS (ROM 3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "Taille du BIOS (ROM 4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "Mapper C0000-C7FFF en tant qu'UMB"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "Mapper C8000-CFFFF en tant qu'UMB"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "Mapper D0000-D7FFF en tant qu'UMB"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "Mapper D8000-DFFFF en tant qu'UMB"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "Mapper E0000-E7FFF en tant qu'UMB"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "Mapper E8000-EFFFF en tant qu'UMB"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "Cavalier JS9 (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "Dispositif de sortie MIDI"
+
+msgid "MIDI Real time"
+msgstr "MIDI en temps réel"
+
+msgid "MIDI Thru"
+msgstr "Transfert MIDI"
+
+msgid "MIDI Clockout"
+msgstr "Horloge MIDI"
+
+msgid "SoundFont"
+msgstr "SoundFont"
+
+msgid "Output Gain"
+msgstr "Gain sortie"
+
+msgid "Chorus"
+msgstr "Chœur"
+
+msgid "Chorus Voices"
+msgstr "Voix du chœur"
+
+msgid "Chorus Level"
+msgstr "Niveau du chœur"
+
+msgid "Chorus Speed"
+msgstr "Vitesse du chœur"
+
+msgid "Chorus Depth"
+msgstr "Profondeur du chœur"
+
+msgid "Chorus Waveform"
+msgstr "Forme d'onde du chœur"
+
+msgid "Reverb"
+msgstr "Réverbération"
+
+msgid "Reverb Room Size"
+msgstr "Taille de la salle de réverbération"
+
+msgid "Reverb Damping"
+msgstr "Amortissement de réverbération"
+
+msgid "Reverb Width"
+msgstr "Largeur de réverbération"
+
+msgid "Reverb Level"
+msgstr "Niveau de réverbération"
+
+msgid "Interpolation Method"
+msgstr "Méthode d'interpolation"
+
+msgid "Dynamic Sample Loading"
+msgstr "Chargement dynamique des échantillons"
+
+msgid "Reverb Output Gain"
+msgstr "Gain de sortie réverbération"
+
+msgid "Reversed stereo"
+msgstr "Stéréo inversée"
+
+msgid "Nice ramp"
+msgstr "Belle rampe"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "Boutons"
+
+msgid "Serial Port"
+msgstr "Port série"
+
+msgid "RTS toggle"
+msgstr "Basculement RTS"
+
+msgid "Revision"
+msgstr "Révision"
+
+msgid "Controller"
+msgstr "Contrôleur"
+
+msgid "Show Crosshair"
+msgstr "Afficher le réticule"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "Adresse MAC"
+
+msgid "MAC Address OUI"
+msgstr "Adresse MAC OUI"
+
+msgid "Enable BIOS"
+msgstr "Activer BIOS"
+
+msgid "Baud Rate"
+msgstr "Taux de bauds"
+
+msgid "TCP/IP listening port"
+msgstr "Port d'écoute TCP/IP"
+
+msgid "Phonebook File"
+msgstr "Fichier d'annuaire"
+
+msgid "Telnet emulation"
+msgstr "Émulation Telnet"
+
+msgid "RAM Address"
+msgstr "Adresse RAM"
+
+msgid "RAM size"
+msgstr "Taille du RAM"
+
+msgid "Initial RAM size"
+msgstr "Taille initiale du RAM"
+
+msgid "Serial Number"
+msgstr "Numéro de série"
+
+msgid "Host ID"
+msgstr "ID de l'hôte"
+
+msgid "FDC Address"
+msgstr "Adresse FDC"
+
+msgid "MPU-401 Address"
+msgstr "Adresse MPU-401"
+
+msgid "MPU-401 IRQ"
+msgstr "IRQ MPU-401"
+
+msgid "Receive MIDI input"
+msgstr "Réception de l'entrée MIDI"
+
+msgid "Low DMA"
+msgstr "DMA bas"
+
+msgid "Enable Game port"
+msgstr "Activer le port de jeu"
+
+msgid "SID Model"
+msgstr "Modèle SID"
+
+msgid "SID Filter Strength"
+msgstr "Intensité du filtre SID"
+
+msgid "Surround module"
+msgstr "Module Surround"
+
+msgid "CODEC"
+msgstr "CODEC"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "Lever l'interruption CODEC lors de la configuration du CODEC (nécessaire pour certains pilotes)"
+
+msgid "SB Address"
+msgstr "Adresse SB"
+
+msgid "Adlib Address"
+msgstr "Adresse Adlib"
+
+msgid "Use EEPROM setting"
+msgstr "Utilisez le paramètre de l'EEPROM"
+
+msgid "WSS IRQ"
+msgstr "IRQ WSS"
+
+msgid "WSS DMA"
+msgstr "DMA WSS"
+
+msgid "Enable OPL"
+msgstr "Activer OPL"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "Réception de l'entrée MIDI (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "DMA bas SB"
+
+msgid "6CH variant (6-channel)"
+msgstr "Variante 6CH (6 canaux)"
+
+msgid "Enable CMS"
+msgstr "Activer CMS"
+
+msgid "Mixer"
+msgstr "Mixeur"
+
+msgid "High DMA"
+msgstr "DMA haut"
+
+msgid "Control PC speaker"
+msgstr "Contrôler le haut-parleur du PC"
+
+msgid "Memory size"
+msgstr "Taille mémoire"
+
+msgid "EMU8000 Address"
+msgstr "Adresse EMU8000"
+
+msgid "IDE Controller"
+msgstr "Contrôleur IDE"
+
+msgid "Codec"
+msgstr "Codec"
+
+msgid "GUS type"
+msgstr "Type de GUS"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "Activer la commande 0x04 « Sortir de 86Box »"
+
+msgid "Display type"
+msgstr "Type d'écran"
+
+msgid "Composite type"
+msgstr "Type de composite"
+
+msgid "RGB type"
+msgstr "Type de RVB"
+
+msgid "Line doubling type"
+msgstr "Type de doublage de ligne"
+
+msgid "Snow emulation"
+msgstr "Émulation de neige"
+
+msgid "Monitor type"
+msgstr "Type de moniteur"
+
+msgid "Character set"
+msgstr "Jeu de caractères"
+
+msgid "XGA type"
+msgstr "Type de XGA"
+
+msgid "Instance"
+msgstr "Instance"
+
+msgid "MMIO Address"
+msgstr "Adresse MMIO"
+
+msgid "RAMDAC type"
+msgstr "Type de RAMDAC"
+
+msgid "Blend"
+msgstr "Mélanger"
+
+msgid "Font"
+msgstr "Police"
+
+msgid "Bilinear filtering"
+msgstr "Filtrage bilinéaire"
+
+msgid "Video chroma-keying"
+msgstr "Incrustation vidéo par chrominance"
+
+msgid "Dithering"
+msgstr "Tramage"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "Activer NMI pour l'émulation CGA"
+
+msgid "Voodoo type"
+msgstr "Type de Voodoo"
+
+msgid "Framebuffer memory size"
+msgstr "Taille mémoire du tampon d'images"
+
+msgid "Texture memory size"
+msgstr "Taille mémoire des textures"
+
+msgid "Dither subtraction"
+msgstr "Soustraction de tramage"
+
+msgid "Screen Filter"
+msgstr "Filtre d'écran"
+
+msgid "Render threads"
+msgstr "Tâches du rendu"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Adresse de départ"
+
+msgid "Contiguous Size"
+msgstr "Taille contiguë"
+
+msgid "I/O Width"
+msgstr "Largeur E/S"
+
+msgid "Transfer Speed"
+msgstr "Vitesse de transfert"
+
+msgid "EMS mode"
+msgstr "Mode EMS"
+
+msgid "EMS Address"
+msgstr "Adresse EMS"
+
+msgid "EMS 1 Address"
+msgstr "Adresse EMS 1"
+
+msgid "EMS 2 Address"
+msgstr "Adresse EMS 2"
+
+msgid "EMS Memory Size"
+msgstr "Taille de la mémoire EMS"
+
+msgid "EMS 1 Memory Size"
+msgstr "Taille de la mémoire EMS 1"
+
+msgid "EMS 2 Memory Size"
+msgstr "Taille de la mémoire EMS 2"
+
+msgid "Enable EMS"
+msgstr "Activer EMS"
+
+msgid "Enable EMS 1"
+msgstr "Activer EMS 1"
+
+msgid "Enable EMS 2"
+msgstr "Activer EMS 2"
+
+msgid "Address for > 2 MB"
+msgstr "Adresse pour > 2 MB"
+
+msgid "Frame Address"
+msgstr "Adresse du frame"
+
+msgid "USA"
+msgstr "États-Unis"
+
+msgid "Danish"
+msgstr "Danois"
+
+msgid "Always at selected speed"
+msgstr "Toujours à la vitesse sélectionnée"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "Paramètres du BIOS + touches de raccourci (désactivées pendant le POST)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 Ko à partir de F0000"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 Ko à partir de E0000 (adresse MSB inversée, derniers 64 Ko en premier)"
+
+msgid "Sine"
+msgstr "Sinusoïdale"
+
+msgid "Triangle"
+msgstr "Triangulaire"
+
+msgid "Linear"
+msgstr "Linéaire"
+
+msgid "4th Order"
+msgstr "4e ordre"
+
+msgid "7th Order"
+msgstr "7e ordre"
+
+msgid "Non-timed (original)"
+msgstr "Non temporisé (original)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (JMP2 non alimenté)"
+
+msgid "Two"
+msgstr "Deux"
+
+msgid "Three"
+msgstr "Trois"
+
+msgid "Wheel"
+msgstr "Molette"
+
+msgid "Five + Wheel"
+msgstr "Cinq + molette"
+
+msgid "Five + 2 Wheels"
+msgstr "Cinq + 2 molettes"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 série / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) série"
+
+msgid "8 KB"
+msgstr "8 Ko"
+
+msgid "32 KB"
+msgstr "32 Ko"
+
+msgid "16 KB"
+msgstr "16 Ko"
+
+msgid "64 KB"
+msgstr "64 Ko"
+
+msgid "Disable BIOS"
+msgstr "Désactiver BIOS"
+
+msgid "512 KB"
+msgstr "512 Ko"
+
+msgid "2 MB"
+msgstr "2 Mo"
+
+msgid "8 MB"
+msgstr "8 Mo"
+
+msgid "28 MB"
+msgstr "28 Mo"
+
+msgid "1 MB"
+msgstr "1 Mo"
+
+msgid "4 MB"
+msgstr "4 Mo"
+
+msgid "12 MB"
+msgstr "12 Mo"
+
+msgid "16 MB"
+msgstr "16 Mo"
+
+msgid "20 MB"
+msgstr "20 Mo"
+
+msgid "24 MB"
+msgstr "24 Mo"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (stéréo)"
+
+msgid "Classic"
+msgstr "Classique"
+
+msgid "256 KB"
+msgstr "256 Ko"
+
+msgid "Composite"
+msgstr "Composite"
+
+msgid "True color"
+msgstr "Couleur réelle"
+
+msgid "Old"
+msgstr "Ancien"
+
+msgid "New"
+msgstr "Nouveau"
+
+msgid "Color (generic)"
+msgstr "Couleur (générique)"
+
+msgid "Green Monochrome"
+msgstr "Monochrome vert"
+
+msgid "Amber Monochrome"
+msgstr "Monochrome ambre"
+
+msgid "Gray Monochrome"
+msgstr "Monochrome gris"
+
+msgid "Color (no brown)"
+msgstr "Couleur (sans brun)"
+
+msgid "Color (IBM 5153)"
+msgstr "Couleur (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Doublage simple"
+
+msgid "sRGB interpolation"
+msgstr "Interpolation sRVB"
+
+msgid "Linear interpolation"
+msgstr "Interpolation linéaire"
+
+msgid "Has secondary 8x8 character set"
+msgstr "Dispose d'un jeu de caractères secondaire 8x8"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Dispose d'une carte fille Quadcolor II"
+
+msgid "Alternate monochrome contrast"
+msgstr "Contraste monochrome alternatif"
+
+msgid "128 KB"
+msgstr "128 Ko"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Monochrome (5151/MDA) (blanc)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Monochrome (5151/MDA) (vert)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Monochrome (5151/MDA) (ambre)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Couleur 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Couleur 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Couleur améliorée - Mode normal (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Couleur améliorée - Mode amélioré (5154/ECD)"
+
+msgid "Green"
+msgstr "Vert"
+
+msgid "Amber"
+msgstr "Ambre"
+
+msgid "Gray"
+msgstr "Gris"
+
+msgid "Grayscale"
+msgstr "Niveaux de gris"
+
+msgid "Color"
+msgstr "Couleur"
+
+msgid "U.S. English"
+msgstr "Anglais des États-Unis"
+
+msgid "Scandinavian"
+msgstr "Scandinave"
+
+msgid "Other languages"
+msgstr "Autres langues"
+
+msgid "Bochs latest"
+msgstr "Bochs dernière"
+
+msgid "Apply overscan deltas"
+msgstr "Appliquer les deltas d'overscan"
+
+msgid "Mono Interlaced"
+msgstr "Monochrome entrelacé"
+
+msgid "Mono Non-Interlaced"
+msgstr "Monochrome non entrelacé"
+
+msgid "Color Interlaced"
+msgstr "Couleur entrelacé"
+
+msgid "Color Non-Interlaced"
+msgstr "Couleur non entrelacé"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "Graphique 3dfx Voodoo"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 unités TMU)"
+
+msgid "8-bit"
+msgstr "8 bits"
+
+msgid "16-bit"
+msgstr "16 bits"
+
+msgid "Standard (150ns)"
+msgstr "Standard (150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "Haute vitesse (120ns)"
+
+msgid "Enabled"
+msgstr "Activé"
+
+msgid "Standard"
+msgstr "Standard"
+
+msgid "High-Speed"
+msgstr "Haute vitesse"
+
+msgid "Stereo LPT DAC"
+msgstr "Convertisseur numérique stéréo LPT"
+
+msgid "Generic Text Printer"
+msgstr "Imprimante texte générique"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Imprimante matricielle générique ESC/P 2"
+
+msgid "Generic PostScript Printer"
+msgstr "Imprimante PostScript générique"
+
+msgid "Generic PCL5e Printer"
+msgstr "Imprimante PCL5e générique"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Protocole Internet à ligne parallèle"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Clé de protection pour Savage Quest"
+
+msgid "Serial Passthrough Device"
+msgstr "Dispositif de transfert du port série"
+
+msgid "Passthrough Mode"
+msgstr "Mode de transfert"
+
+msgid "Host Serial Device"
+msgstr "Dispositif série de l'hôte"
+
+msgid "Name of pipe"
+msgstr "Nom du pipeline"
+
+msgid "Data bits"
+msgstr "Bits de données"
+
+msgid "Stop bits"
+msgstr "Bits d'arrêt"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Taux de bauds du transfert"
+
+msgid "Named Pipe (Server)"
+msgstr "Pipeline nommé (serveur)"
+
+msgid "Named Pipe (Client)"
+msgstr "Pipeline nommé (client)"
+
+msgid "Host Serial Passthrough"
+msgstr "Transfert du port série de l'hôte"
+
+msgid "E&ject %1"
+msgstr "É&jecter %1"
+
+msgid "&Unmute"
+msgstr "&Réactiver son"
+
+msgid "Softfloat FPU"
+msgstr "FPU Softfloat"
+
+msgid "High performance impact"
+msgstr "Impact important sur la performance"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Generic] Disque RAM (vitesse maximale)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Generic] 1989 (3500 RPM)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Generic] 1992 (3600 RPM)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Generic] 1994 (4500 RPM)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Generic] 1996 (5400 RPM)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Generic] 1997 (5400 RPM)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Generic] 1998 (5400 RPM)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Generic] 2000 (7200 RPM)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "Clone IBM 8514/A (ISA)"
+
+msgid "Vendor"
+msgstr "Fabricant"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Extension mémoire générique PC/XT"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Extension mémoire générique PC/AT"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "Impossible de trouver les polices matricielles"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "Les polices TrueType dans le répertoire \"roms/printer/fonts\" sont nécessaires à l'émulation de l'imprimante générique ESC/P 2 matricielle."
+
+msgid "Inhibit multimedia keys"
+msgstr "Désactiver les touches multimédia"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Demander confirmation avant de sauvegarder les réglages"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Demander confirmation avant Hard Reset"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Demander confirmation avant de quitter"
+
+msgid "Options"
+msgstr "Options"
+
+msgid "Model"
+msgstr "Modèle"
+
+msgid "Model:"
+msgstr "Modèle:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Impossible d’initialiser le moteur de rendu Vulkan."
+
+msgid "GLSL Error"
+msgstr "Erreur GLSL"
+
+msgid "Could not load shader: %1"
+msgstr "Impossible de charger le shader %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "OpenGL version 3.0 ou supérieure requis. Version installée: %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "Impossible de charger la texture %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "Impossible de compiler le shader:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "Programme non linké:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "Gestionnaire de shader"
+
+msgid "Shader Configuration"
+msgstr "Configuration Shader"
+
+msgid "Add"
+msgstr "Ajouter"
+
+msgid "Move up"
+msgstr "Monter"
+
+msgid "Move down"
+msgstr "Descendre"
+
+msgid "Could not load file %1"
+msgstr "Impossible de charger le fichier %1"
+
+msgid "Key Bindings:"
+msgstr "Raccourcis clavier:"
+
+msgid "Action"
+msgstr "Action"
+
+msgid "Keybind"
+msgstr "Raccourci clavier"
+
+msgid "Clear binding"
+msgstr "Supprimer le raccourci"
+
+msgid "Bind"
+msgstr "Lier"
+
+msgid "Bind Key"
+msgstr "Lier touche"
+
+msgid "Enter key combo:"
+msgstr "Entrez la combinaison de touches:"
+
+msgid "Bind conflict"
+msgstr "Conflit de raccourci"
+
+msgid "This key combo is already in use."
+msgstr "Cette combinaison de touches est déjà utilisée."
+
+msgid "Send Control+Alt+Del"
+msgstr "Envoyer Ctrl+Alt+Suppr"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Envoyer Ctrl+Alt+Échap"
+
+msgid "Toggle fullscreen"
+msgstr "Activer/désactiver le mode plein écran"
+
+msgid "Screenshot"
+msgstr "Capture d'écran"
+
+msgid "Release mouse pointer"
+msgstr "Relâcher le pointeur de la souris"
+
+msgid "Toggle pause"
+msgstr "Activer/désactiver la pause"
+
+msgid "Toggle mute"
+msgstr "Activer/désactiver le mode silencieux"
+
+msgid "Text files"
+msgstr "Fichiers texte"
+
+msgid "ROM files"
+msgstr "Fichiers ROM"
+
+msgid "SoundFont files"
+msgstr "Fichiers SoundFont"
+
+msgid "Local Switch"
+msgstr "Commutateur local"
+
+msgid "Remote Switch"
+msgstr "Commutateur distant"
+
+msgid "Switch:"
+msgstr "Commutateur:"
+
+msgid "Hub Mode"
+msgstr "Mode concentrateur"
+
+msgid "Hostname:"
+msgstr "Nom d'hôte:"
+
+msgid "ISA RAM:"
+msgstr "RAM ISA:"
+
+msgid "ISA ROM:"
+msgstr "ROM ISA:"
+
+msgid "&Wipe NVRAM"
+msgstr "&Effacer la mémoire NVRAM"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "Cela supprimera tous les fichiers NVRAM (et associés) de la machine virtuelle situés dans le sous-répertoire \"nvr\". Vous devrez reconfigurer les paramètres du BIOS (et éventuellement d'autres périphériques à l'intérieur de la machine virtuelle) si nécessaire. \n\nÊtes-vous sûr de vouloir effacer tout le contenu NVRAM de la machine virtuelle \"%1\" ?"
+
+msgid "Success"
+msgstr "Succès"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "Le contenu de la NVRAM de la machine virtuelle \"%1\" a été effacé avec succès"
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "Une erreur s'est produite lors de la tentative d'effacement du contenu NVRAM de la machine virtuelle \"%1\""
+
+msgid "%1 VM Manager"
+msgstr "Gestionnaire de machines virtuelles de %1"
+
+msgid "%n disk(s)"
+msgstr "%n disque(s)"
+
+msgid "Unknown Status"
+msgstr "Statut inconnu"
+
+msgid "No Machines Found!"
+msgstr "Aucune machine trouvée !"
+
+msgid "Check for updates on startup"
+msgstr "Vérifier les mises à jour au démarrage"
+
+msgid "Unable to determine release information"
+msgstr "Impossible de déterminer les informations relatives à la version"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Une erreur s'est produite lors de la vérification des mises à jour :\n\n%1\n\nVeuillez réessayer plus tard."
+
+msgid "Update check complete"
+msgstr "Vérification des mises à jour terminée"
+
+msgid "stable"
+msgstr "stable"
+
+msgid "beta"
+msgstr "bêta"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Vous utilisez la dernière version %1 de 86Box : %2"
+
+msgid "version"
+msgstr "version"
+
+msgid "build"
+msgstr "build"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Vous utilisez actuellement la version <b>%1</b>."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "<b>La version %1</b> est désormais disponible."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Vous exécutez actuellement le build <b>%1</b>."
+
+msgid "<b>Build %1</b> is now available."
+msgstr "<b>Le Build %1</b> est désormais disponible."
+
+msgid "Would you like to visit the download page?"
+msgstr "Souhaitez-vous visiter la page de téléchargement ?"
+
+msgid "Visit download page"
+msgstr "Visiter la page de téléchargement"
+
+msgid "Update check"
+msgstr "Vérification des mises à jour"
+
+msgid "Checking for updates..."
+msgstr "Recherche de mises à jour..."
+
+msgid "86Box Update"
+msgstr "Mise à jour de 86Box"
+
+msgid "Release notes:"
+msgstr "Notes de mise à jour :"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "Panne de la machine virtuelle"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "Le processus de la machine virtuelle \"%1\" s'est arrêté de manière inattendue avec le code de sortie %2."
+
+msgid "The system will not be added."
+msgstr "Le système ne sera pas ajouté."
+
+msgid "&Update mouse every CPU frame"
+msgstr "&Mettre à jour le statut souris à chaque frame CPU"
+
+msgid "Hue"
+msgstr "Teinte"
+
+msgid "Saturation"
+msgstr "Saturation"
+
+msgid "Contrast"
+msgstr "Contraste"
+
+msgid "Brightness"
+msgstr "Luminosité"
+
+msgid "Sharpness"
+msgstr "Netteté"
+
+msgid "&CGA composite settings..."
+msgstr "Réglages du mode composite &CGA..."
+
+msgid "CGA composite settings"
+msgstr "Réglages du mode composite CGA"
+
+msgid "Monitor EDID"
+msgstr "Écran EDID"
+
+msgid "Export..."
+msgstr "Exporter..."
+
+msgid "Export EDID"
+msgstr "Exporter l'EDID"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "Le fichier EDID \"%ls\" est trop volumineux."
+
+msgid "OpenGL input scale"
+msgstr "Échelle d'entrée d'OpenGL"
+
+msgid "OpenGL input stretch mode"
+msgstr "Mode d'étirement des données d'entrée d'OpenGL"
+
+msgid "Color scheme"
+msgstr "Palette de couleurs"
+
+msgid "Light"
+msgstr "Lumière"
+
+msgid "Dark"
+msgstr "Sombre"
diff --git a/src/qt/languages/hr-HR.po b/src/qt/languages/hr-HR.po
index 436bae5c5..4996db404 100644
--- a/src/qt/languages/hr-HR.po
+++ b/src/qt/languages/hr-HR.po
@@ -1,3 +1,11 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: hr_HR\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
 msgstr "&Radnje"
 
@@ -10,8 +18,8 @@ msgstr "&Desni CTRL je lijevi ALT"
 msgid "&Hard Reset..."
 msgstr "&Ponovno pokretanje..."
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Ctrl+Alt+Del\tCtrl+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "&Ctrl+Alt+Del"
 
 msgid "Ctrl+Alt+&Esc"
 msgstr "Ctrl+Alt+&Esc"
@@ -19,8 +27,14 @@ msgstr "Ctrl+Alt+&Esc"
 msgid "&Pause"
 msgstr "&Pauza"
 
-msgid "E&xit..."
-msgstr "Iz&laz..."
+msgid "Pause"
+msgstr "Pauza"
+
+msgid "Re&sume"
+msgstr "Na&stavi"
+
+msgid "E&xit"
+msgstr "Iz&laz"
 
 msgid "&View"
 msgstr "&Pogled"
@@ -40,14 +54,8 @@ msgstr "&Zapamtite veličinu i položaj"
 msgid "Re&nderer"
 msgstr "&Renderer"
 
-msgid "&SDL (Software)"
-msgstr "&SDL (Softver)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (&Hardver)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
+msgid "&Qt (Software)"
+msgstr "&Qt (Softver)"
 
 msgid "Open&GL (3.0 Core)"
 msgstr "Open&GL (3.0 jezgra)"
@@ -55,10 +63,10 @@ msgstr "Open&GL (3.0 jezgra)"
 msgid "&VNC"
 msgstr "&VNC"
 
-msgid "Specify dimensions..."
+msgid "Specify &dimensions..."
 msgstr "Odrediti veličinu..."
 
-msgid "F&orce 4:3 display ratio"
+msgid "Force &4:3 display ratio"
 msgstr "&4:3 omjer prikaza"
 
 msgid "&Window scale factor"
@@ -94,7 +102,7 @@ msgstr "&7x"
 msgid "&8x"
 msgstr "&8x"
 
-msgid "Filter method"
+msgid "Fi&lter method"
 msgstr "Metoda filtriranja"
 
 msgid "&Nearest"
@@ -106,8 +114,8 @@ msgstr "&Linearna"
 msgid "Hi&DPI scaling"
 msgstr "&HiDPI skaliranje"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "&Cijelozaslonski način\tCtrl+Alt+PgUp"
+msgid "&Fullscreen"
+msgstr "&Cijelozaslonski način"
 
 msgid "Fullscreen &stretch mode"
 msgstr "&Način cijelozaslonskog rastezanja"
@@ -127,8 +135,8 @@ msgstr "&Cijelobrojno skaliranje"
 msgid "4:&3 Integer scale"
 msgstr "4:&3 Cijelobrojno skaliranje"
 
-msgid "E&GA/(S)VGA settings"
-msgstr "E&GA/(S)VGA postavke"
+msgid "EGA/(S)&VGA settings"
+msgstr "EGA/(S)&VGA postavke"
 
 msgid "&Inverted VGA monitor"
 msgstr "&Obrni boje zaslona VGA"
@@ -139,9 +147,15 @@ msgstr "&Tip zaslona VGA"
 msgid "RGB &Color"
 msgstr "RGB u &boji"
 
+msgid "RGB (no brown)"
+msgstr "RGB (bez smeđe)"
+
 msgid "&RGB Grayscale"
 msgstr "&RGB u nijansama sive boje"
 
+msgid "Generic RGBI color monitor"
+msgstr "Generični RGBI monitor u boji"
+
 msgid "&Amber monitor"
 msgstr "&Jantarni zaslon"
 
@@ -178,11 +192,17 @@ msgstr "&Alati"
 msgid "&Settings..."
 msgstr "&Opcije..."
 
+msgid "Settings..."
+msgstr "Opcije..."
+
 msgid "&Update status bar icons"
 msgstr "&Ažuriraj ikone statusnog redka"
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "Napravi &snimku zaslona\tCtrl+F11"
+msgid "Take s&creenshot"
+msgstr "Napravi &snimku zaslona"
+
+msgid "S&ound"
+msgstr "&Zvuk"
 
 msgid "&Preferences..."
 msgstr "&Postavke..."
@@ -191,16 +211,16 @@ msgid "Enable &Discord integration"
 msgstr "Omogući integraciju sa programom &Discord"
 
 msgid "Sound &gain..."
-msgstr "&Pojačanje zvuka..."
+msgstr "&Pojačavanje zvuka..."
 
-msgid "Begin trace\tCtrl+T"
-msgstr "Z&apočni praćenje\tCtrl+T"
+msgid "Begin trace"
+msgstr "Z&apočni praćenje"
 
-msgid "End trace\tCtrl+T"
-msgstr "&Svrši praćenje\tCtrl+T"
+msgid "End trace"
+msgstr "&Svrši praćenje"
 
 msgid "&Help"
-msgstr "&Pomoć"
+msgstr "P&omoć"
 
 msgid "&Documentation..."
 msgstr "&Dokumentacija..."
@@ -244,8 +264,8 @@ msgstr "&Isključi zvuk"
 msgid "E&mpty"
 msgstr "&Prazno"
 
-msgid "&Reload previous image"
-msgstr "&Ponovo učitaj prethodnu sliku"
+msgid "Reload previous image"
+msgstr "Ponovo učitaj prethodnu sliku"
 
 msgid "&Folder..."
 msgstr "&Mapa..."
@@ -301,18 +321,12 @@ msgstr "U redu"
 msgid "Cancel"
 msgstr "Otkaži"
 
-msgid "Save these settings as &global defaults"
-msgstr "Spremite ove postavke kao &globalne zadane postavke"
-
 msgid "&Default"
 msgstr "Zadano"
 
 msgid "Language:"
 msgstr "Jezik:"
 
-msgid "Icon set:"
-msgstr "Paket ikona:"
-
 msgid "Gain"
 msgstr "Pojačavanje"
 
@@ -346,6 +360,9 @@ msgstr "Sistem:"
 msgid "Configure"
 msgstr "Namjesti"
 
+msgid "CPU:"
+msgstr "Procesor:"
+
 msgid "CPU type:"
 msgstr "Tip procesora:"
 
@@ -382,11 +399,23 @@ msgstr "Uključeno (UTC)"
 msgid "Dynamic Recompiler"
 msgstr "Dinamički rekompilator"
 
+msgid "CPU frame size"
+msgstr "Veličina blokova procesora"
+
+msgid "Larger frames (less smooth)"
+msgstr "Veći blokovi (manje glatko)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Manji blokovi (glatkije)"
+
 msgid "Video:"
 msgstr "Video:"
 
-msgid "Voodoo Graphics"
-msgstr "Voodoo grafika"
+msgid "Video #2:"
+msgstr "Video 2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Voodoo 1 ili 2 grafika"
 
 msgid "IBM 8514/A Graphics"
 msgstr "IBM 8514/A grafika"
@@ -394,12 +423,27 @@ msgstr "IBM 8514/A grafika"
 msgid "XGA Graphics"
 msgstr "XGA grafika"
 
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "Grafika adaptera za prikaz IBM PS/55"
+
+msgid "Keyboard:"
+msgstr "Tipkovinca:"
+
+msgid "Keyboard"
+msgstr "Tipkovnica"
+
 msgid "Mouse:"
 msgstr "Miš:"
 
+msgid "Mouse"
+msgstr "Miš"
+
 msgid "Joystick:"
 msgstr "Palica za igru:"
 
+msgid "Joystick"
+msgstr "Palica za igru"
+
 msgid "Joystick 1..."
 msgstr "Palica za igru 1..."
 
@@ -430,6 +474,9 @@ msgstr "Izlazni uređaj MIDI:"
 msgid "MIDI In Device:"
 msgstr "Ulazni uređaj MIDI:"
 
+msgid "MIDI Out:"
+msgstr "Izlaz MIDI:"
+
 msgid "Standalone MPU-401"
 msgstr "Samostalni MPU-401"
 
@@ -445,15 +492,6 @@ msgstr "Nuked (precizniji)"
 msgid "YMFM (faster)"
 msgstr "YMFM (brži)"
 
-msgid "Network type:"
-msgstr "Tip mreže:"
-
-msgid "PCap device:"
-msgstr "Uređaj PCap:"
-
-msgid "Network adapter:"
-msgstr "Mrežna kartica:"
-
 msgid "COM1 Device:"
 msgstr "Uređaj COM1:"
 
@@ -478,6 +516,9 @@ msgstr "Uređaj LPT3:"
 msgid "LPT4 Device:"
 msgstr "Uređaj LPT4:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr "DMA ECP unutrašnjeg LPT-a:"
+
 msgid "Serial port 1"
 msgstr "Serijska vrata 1"
 
@@ -502,18 +543,21 @@ msgstr "Paralelna vrata 3"
 msgid "Parallel port 4"
 msgstr "Paralelna vrata 4"
 
-msgid "HD Controller:"
-msgstr "Kontroler tvrdog diska:"
-
 msgid "FD Controller:"
 msgstr "Kontroler diskete:"
 
+msgid "CD-ROM Controller:"
+msgstr "Kontroler CD-ROM:"
+
 msgid "Tertiary IDE Controller"
 msgstr "Tercijarni IDE kontroler"
 
 msgid "Quaternary IDE Controller"
 msgstr "Kvaternarni IDE kontroler"
 
+msgid "Hard disk"
+msgstr "Tvrdi disk"
+
 msgid "SCSI"
 msgstr "SCSI"
 
@@ -535,6 +579,9 @@ msgstr "Audio kaseta"
 msgid "Hard disks:"
 msgstr "Tvrdi diskovi:"
 
+msgid "Firmware Version"
+msgstr "Verzija firmvera"
+
 msgid "&New..."
 msgstr "&Novi..."
 
@@ -589,14 +636,17 @@ msgstr "Provjeraj BPB"
 msgid "CD-ROM drives:"
 msgstr "CD-ROM pogoni:"
 
-msgid "Earlier drive"
-msgstr "Raniji pogon"
-
 msgid "MO drives:"
 msgstr "MO pogoni:"
 
-msgid "ZIP drives:"
-msgstr "ZIP pogoni:"
+msgid "MO:"
+msgstr "MO:"
+
+msgid "Removable disks:"
+msgstr "Izmjenjivi diskovi:"
+
+msgid "Removable disk drives:"
+msgstr "Pogoni izmjenjivih diskova:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
@@ -607,6 +657,9 @@ msgstr "Sat stvarnog vremena (RTC):"
 msgid "ISA Memory Expansion"
 msgstr "Proširenje memorije ISA"
 
+msgid "ISA ROM Cards"
+msgstr "Kartice ISA sa ROM-om"
+
 msgid "Card 1:"
 msgstr "Kartica 1:"
 
@@ -619,18 +672,21 @@ msgstr "Kartica 3:"
 msgid "Card 4:"
 msgstr "Kartica 4:"
 
+msgid "Generic ISA ROM Board"
+msgstr "Generična kartica ISA s ROM-om"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "Generična kartica ISA s dva ROM-a"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "Generična kartica ISA s četiri ROM-a"
+
 msgid "ISABugger device"
 msgstr "Uređaj ISABugger"
 
 msgid "POST card"
 msgstr "Kartica POST"
 
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
-
 msgid "86Box"
 msgstr "86Box"
 
@@ -641,22 +697,25 @@ msgid "Fatal error"
 msgstr "Fatalna greška"
 
 msgid " - PAUSED"
-msgstr " - PAUSED"
-
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Pritisnite Ctrl+Alt+PgDn za povratak u prozorski način rada."
+msgstr " - ZASTAO"
 
 msgid "Speed"
 msgstr "Brzina"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "Izmjenjivi disk %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "ZIP slike"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "&Izmjenjivi disk %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Slike izmjenjivih diskova"
+
+msgid "Image %1"
+msgstr "Slika %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
-msgstr "86Box nije mogao pronaći upotrebljive ROM datoteke.\n\nMolimte posjetite <a href=\"https://github.com/86Box/roms/releases/latest\"></a> sknite paket s ROM datotekama i ekstrahirajte paket u \"roms\" mapu."
+msgstr "86Box nije mogao pronaći upotrebljive ROM datoteke.\n\nMolimte posjetite <a href=\"https://github.com/86Box/roms/releases/latest\"></a> sknite paket s ROM datotekama i ekstrahirajte paket u mapu \"roms\"."
 
 msgid "(empty)"
 msgstr "(prazno)"
@@ -688,6 +747,12 @@ msgstr "Sistem \"%hs\" nije dostupan jer ne postoje potrebni ROM-ovi u mapu roms
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
 msgstr "Video kartica \"%hs\" nije dostupna jer ne postoje potrebni ROM-ovi u mapu roms/video. Prebacivanje na dostupnu video karticu."
 
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "Video kartica 2 \"%hs\" nije dostupna jer ne postoje potrebni ROM-ovi u mapu roms/video. Isključivanje druge video karice."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "Uređaj \"%hs\" nije dostupan jer ne postoje potrebni ROM-ovi. Ignoriranje uređaja."
+
 msgid "Machine"
 msgstr "Sistem"
 
@@ -706,12 +771,30 @@ msgstr "Mreža"
 msgid "Ports (COM & LPT)"
 msgstr "Vrata (COM & LPT)"
 
+msgid "Ports"
+msgstr "Vrata"
+
+msgid "Serial ports:"
+msgstr "Serijska vrata:"
+
+msgid "Parallel ports:"
+msgstr "Paralelna vrata:"
+
 msgid "Storage controllers"
 msgstr "Kontroleri za diskove"
 
 msgid "Hard disks"
 msgstr "Tvrdi diskovi"
 
+msgid "Disks:"
+msgstr "Diskovi:"
+
+msgid "Floppy:"
+msgstr "Diskete:"
+
+msgid "Controllers:"
+msgstr "Kontroleri:"
+
 msgid "Floppy & CD-ROM drives"
 msgstr "Floppy & CD-ROM pogoni"
 
@@ -721,14 +804,17 @@ msgstr "Ostali uklonjivi uređaji"
 msgid "Other peripherals"
 msgstr "Ostali periferni uređaji"
 
+msgid "Other devices"
+msgstr "Ostali uređaji"
+
 msgid "Click to capture mouse"
 msgstr "Kliknite da uhvatite miš"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "Pritisnite F8+F12 za otpustanje miša"
+msgid "Press %1 to release mouse"
+msgstr "Pritisnite %1 za otpustanje miša"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Pritisnite F8+F12 ili srednji gumb miša za otpuštanje miša"
+msgid "Press %1 or middle button to release mouse"
+msgstr "Pritisnite %1 ili srednji gumb miša za otpuštanje miša"
 
 msgid "Bus"
 msgstr "Bus"
@@ -748,65 +834,89 @@ msgstr "S"
 msgid "KB"
 msgstr "KB"
 
-msgid "Could not initialize the video renderer."
-msgstr "Nije moguće inicijalizirati renderer."
-
 msgid "Default"
 msgstr "Standard"
 
-msgid "%i Wait state(s)"
-msgstr "%i stanje čekanja"
+msgid "%1 Wait state(s)"
+msgstr "%1 stanje čekanja"
 
 msgid "Type"
 msgstr "Tip"
 
-msgid "Failed to set up PCap"
-msgstr "Postavljanje PCap-a nije uspjelo"
-
 msgid "No PCap devices found"
 msgstr "Nema PCap uređaja"
 
 msgid "Invalid PCap device"
 msgstr "Nevažeći PCap uređaj"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "Standardna palica za igru s 2 tipke"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "Palica za igru s 2 osi, 2 tipke"
 
-msgid "Standard 4-button joystick"
-msgstr "Standardna palica za igru s 4 tipke"
+msgid "2-axis, 4-button joystick"
+msgstr "Palica za igru s 2 osi, 4 tipke"
 
-msgid "Standard 6-button joystick"
-msgstr "Standardna palica za igru s 6 tipke"
+msgid "2-axis, 6-button joystick"
+msgstr "Palica za igru s 2 osi, 6 tipke"
 
-msgid "Standard 8-button joystick"
-msgstr "Standardna palica za igru s 8 tipke"
+msgid "2-axis, 8-button joystick"
+msgstr "Palica za igru s 2 osi, 8 tipke"
+
+msgid "3-axis, 2-button joystick"
+msgstr "Palica za igru s 3 osi, 2 tipke"
+
+msgid "3-axis, 4-button joystick"
+msgstr "Palica za igru s 3 osi, 4 tipke"
+
+msgid "4-axis, 4-button joystick"
+msgstr "Palica za igru s 4 osi, 4 tipke"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH Pedals"
+
 msgid "Microsoft SideWinder Pad"
 msgstr "Microsoft SideWinder Pad"
 
 msgid "Thrustmaster Flight Control System"
 msgstr "Thrustmaster Flight Control System"
 
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Rudder Control System"
+
+msgid "2-button gamepad(s)"
+msgstr "Gamepad(ovi) s 2 tipke"
+
+msgid "2-button flight yoke"
+msgstr "Jaram za letenje s 2 tipke"
+
+msgid "4-button gamepad"
+msgstr "Gamepad s 4 tipke"
+
+msgid "4-button flight yoke"
+msgstr "Jaram za letenje s 4 tipke"
+
+msgid "2-button flight yoke with throttle"
+msgstr "Jaram za letenje s 2 tipke i gasom"
+
+msgid "4-button flight yoke with throttle"
+msgstr "Jaram za letenje s 4 tipke i gasom"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Volan Win95 (3 osi, 4 tipke)"
+
 msgid "None"
 msgstr "Bez"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "Nije moguće učitati ubrzivače tipkovnice."
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CHS: %2, %3, %4)"
 
-msgid "Unable to register raw input."
-msgstr "Nije moguće registrirati neobrađeni unos."
+msgid "Floppy %1 (%2): %3"
+msgstr "Disketa %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Disketa %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "&Disketa %1 (%2): %3"
 
 msgid "Advanced sector images"
 msgstr "Napredne sektorske slike"
@@ -814,9 +924,6 @@ msgstr "Napredne sektorske slike"
 msgid "Flux images"
 msgstr "Flux slike"
 
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "Nije moguće inicijalizirati SDL, SDL2.dll je potrebno"
-
 msgid "Are you sure you want to hard reset the emulated machine?"
 msgstr "Jeste li sigurni da želite hard resetirati emulirani sistem?"
 
@@ -826,8 +933,14 @@ msgstr "Jeste li sigurni da želite zatvoriti 86Box?"
 msgid "Unable to initialize Ghostscript"
 msgstr "Nije moguće inicijalizirati GhostScript"
 
-msgid "MO %i (%ls): %ls"
-msgstr "MO %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "Nije moguće inicijalizirati GhostPCL"
+
+msgid "MO %1 (%2): %3"
+msgstr "MO %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&MO %1 (%2): %3"
 
 msgid "MO images"
 msgstr "MO slike"
@@ -835,8 +948,17 @@ msgstr "MO slike"
 msgid "Welcome to 86Box!"
 msgstr "Dobrodošli u 86Box!"
 
-msgid "Internal controller"
-msgstr "Uunutarnji kontroler"
+msgid "Internal device"
+msgstr "Uunutarnji uređaj"
+
+msgid "&File"
+msgstr "&Datoteka"
+
+msgid "&New machine..."
+msgstr "&Novi sistem..."
+
+msgid "&Check for updates..."
+msgstr "&Provjeri ažuriranja..."
 
 msgid "Exit"
 msgstr "Izlazi"
@@ -860,34 +982,22 @@ msgid "86Box v"
 msgstr "86Box verzija "
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "Emulator starih računala\n\nAutori: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, i drugi.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, i drugi.\n\nPreveo: dob205\n\nObjavljeno pod licencom GNU General Public License, verzija 2 ili novije. Za više informacija pogledajte datoteku LICENCE."
+msgstr "Emulator starih računala\n\nAutori: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, i drugi.\n\nS prethodnim osnovnim doprinosima Sarah Walker, Leilei, JohnElliott, greatpsycho i drugih.\n\nPreveo: dob205\n\nObjavljeno pod licencom GNU General Public License, verzija 2 ili novije. Za više informacija pogledajte datoteku LICENCE."
 
 msgid "Hardware not available"
 msgstr "Hardver nije dostupan"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Provjerite je li libpcap instaliran i jeste li na mreži, kompadibilnoj s libpcap."
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "Provjerite je li %1 instaliran i jeste li na mreži, kompadibilnoj s %1."
 
 msgid "Invalid configuration"
 msgstr "Nevažeća konfiguracija"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 je potrebno za automatsku konverziju PostScript datoteke u PDF datoteke.\n\nSvi dokumenti poslani na generički PostScript pisač bit će spremljeni kao PostScript (.ps) datoteke."
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " je potrebno za automatsku konverziju PostScript datoteke u PDF datoteke.\n\nSvi dokumenti poslani na generički PostScript pisač bit će spremljeni kao PostScript (.ps) datoteke."
-
-msgid "Entering fullscreen mode"
-msgstr "Ulazim u cijelozaslonski način"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 je potrebno za automatsku konverziju PCL datoteke u PDF datoteke.\n\nSvi dokumenti poslani na generički PCL pisač bit će spremljeni kao Printer Command Language (.pcl) datoteke."
 
 msgid "Don't show this message again"
 msgstr "Ne pokazi više ovu poruku"
@@ -904,17 +1014,14 @@ msgstr "Ne resetiraj"
 msgid "CD-ROM images"
 msgstr "CD-ROM slike"
 
-msgid "%hs Device Configuration"
-msgstr "Konfiguracija uređaja %hs "
+msgid "%1 Device Configuration"
+msgstr "Konfiguracija uređaja %1"
 
 msgid "Monitor in sleep mode"
 msgstr "Ekran u stanju mirovanja"
 
-msgid "OpenGL Shaders"
-msgstr "OpenGL shaderi"
-
-msgid "OpenGL options"
-msgstr "OpenGL opcije"
+msgid "GLSL shaders"
+msgstr "GLSL shaderi"
 
 msgid "You are loading an unsupported configuration"
 msgstr "Učitavate nepodržanu konfiguraciju"
@@ -925,30 +1032,33 @@ msgstr "Filtriranje tipa CPU-a na temelju odabranog sistema onemogućeno je za o
 msgid "Continue"
 msgstr "Nastavi"
 
-msgid "Cassette: %s"
-msgstr "Audio kaseta: %s"
+msgid "Cassette: %1"
+msgstr "Audio kaseta: %1"
+
+msgid "C&assette: %1"
+msgstr "&Audio kaseta: %1"
 
 msgid "Cassette images"
 msgstr "Slike audio kasete"
 
-msgid "Cartridge %i: %ls"
-msgstr "Kaseta %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "Kaseta %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "&Kaseta %1: %2"
 
 msgid "Cartridge images"
 msgstr "Slike kasete"
 
-msgid "Error initializing renderer"
-msgstr "Nije moguće inicijalizirati renderer"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "Nije moguće inicijalizirati OpenGL (3.0 jezgra) renderer. Molimte koristite drugi renderer."
-
 msgid "Resume execution"
 msgstr "Nastavi"
 
 msgid "Pause execution"
 msgstr "Pauziraj"
 
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del"
+
 msgid "Press Ctrl+Alt+Del"
 msgstr "Stisni Ctrl+Alt+Del"
 
@@ -958,17 +1068,281 @@ msgstr "Stisni Ctrl+Alt+Esc"
 msgid "Hard reset"
 msgstr "Ponovno pokretanje"
 
+msgid "Force shutdown"
+msgstr "Prisilno isključi"
+
+msgid "Start"
+msgstr "Pokreni"
+
+msgid "Not running"
+msgstr "Se ne pokreće"
+
+msgid "Running"
+msgstr "Se pokreće"
+
+msgid "Paused"
+msgstr "Pauziran"
+
+msgid "Waiting"
+msgstr "Čeka"
+
+msgid "Powered Off"
+msgstr "Isključen"
+
+msgid "%n running"
+msgstr "%n se ppokreće"
+
+msgid "%n paused"
+msgstr "%n pauziranih"
+
+msgid "%n waiting"
+msgstr "%n čeka"
+
+msgid "%1 total"
+msgstr "%1 ukupno"
+
+msgid "VMs: %1"
+msgstr "Virtualnih sistema: %1"
+
+msgid "System Directory:"
+msgstr "Sistemski direktorij:"
+
+msgid "Choose directory"
+msgstr "Odaberite direktorij"
+
+msgid "Choose configuration file"
+msgstr "Odaberite datoteku s konfiguracijom"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "Konfiguracijske datoteke programa 86Box (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Čitanje konfiguracije nije uspjelo"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "Nije moguće otvoriti odabranu konfiguracijsku datoteku za čitanje: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "U polju za pretraživanje koristite regularne izraze"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "Broj trenutno aktivnih računala je %1. Jeste li sigurni da ipak želite izaći iz upravitelja virtualnih sistema?"
+
+msgid "Add new system wizard"
+msgstr "Čarobnjak za dodavanje novog sistema"
+
+msgid "Introduction"
+msgstr "Uvod"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "Ovo će vam pomoći da dodate novi sistem u 86Box."
+
+msgid "New configuration"
+msgstr "Nova konfiguracija"
+
+msgid "Complete"
+msgstr "Završi"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "Čarobnjak će sada pokrenuti konfiguraciju za novi sustav."
+
+msgid "Use existing configuration"
+msgstr "Koristi postojeću konfiguraciju"
+
+msgid "Type some notes here"
+msgstr "Ovdje upišite neke bilješke"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Zalijepite sadržaj postojeće konfiguracijske datoteke u okvir ispod."
+
+msgid "Load configuration from file"
+msgstr "Učitaj konfiguraciju iz datoteke"
+
+msgid "System name"
+msgstr "Naziv sistema"
+
+msgid "System name:"
+msgstr "Naziv sistema:"
+
+msgid "System name cannot contain certain characters"
+msgstr "Naziv sistema ne može sadržavati određene znakove"
+
+msgid "System name already exists"
+msgstr "Naziv sistema već postoji"
+
+msgid "Please enter a directory for the system"
+msgstr "Molimo unesite direktorij za sistem"
+
+msgid "Directory does not exist"
+msgstr "Direktorij ne postoji"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "Novi direktorij za sistem bit će kreiran u odabranom direktoriju iznad"
+
+msgid "System location:"
+msgstr "Lokacija sistema:"
+
+msgid "System name and location"
+msgstr "Naziv i lokacija sistema"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Unesite naziv sistema i odaberite lokaciju"
+
+msgid "Enter the name of the system"
+msgstr "Unesite naziv sistema"
+
+msgid "Please enter a system name"
+msgstr "Unesite naziv sistema"
+
+msgid "Display name (optional):"
+msgstr "Prikazno ime (neobavezno):"
+
+msgid "Display name:"
+msgstr "Prikazno ime:"
+
+msgid "Set display name"
+msgstr "Postavi prikazno ime"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Unesite novo prikazno ime (prazno za ponovo postaviti)"
+
+msgid "Change &display name..."
+msgstr "Promijeni &prikazno ime..."
+
+msgid "Context Menu"
+msgstr "Kontekstni izbornik"
+
+msgid "&Open folder..."
+msgstr "&Otvori mapu..."
+
+msgid "Open p&rinter tray..."
+msgstr "Otvori ladicu &pisača..."
+
+msgid "Set &icon..."
+msgstr "Postavi &ikonu..."
+
+msgid "Select an icon"
+msgstr "Odaberite ikonu"
+
+msgid "C&lone..."
+msgstr "K&loniraj..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "Virtualni sistem \"%1\" (%2) bit će kloniran u:"
+
+msgid "Directory %1 already exists"
+msgstr "Direktorij %1 već postoji"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "U nazivu ne možete koristiti sljedeće znakove: %1"
+
+msgid "Clone"
+msgstr "Kloniraj"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Nije uspjelo stvaranje direktorija za klonirani VM"
+
+msgid "Failed to clone VM."
+msgstr "Kloniranje virtualnog stroja nije uspjelo."
+
+msgid "Directory in use"
+msgstr "Direktorij u uporebi"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "Odabrani direktorij je već u upotrebi. Molimo odaberite drugi direktorij."
+
+msgid "Create directory failed"
+msgstr "Izrada direktorija nije uspjela"
+
+msgid "Unable to create the directory for the new system"
+msgstr "Nije moguće stvoriti direktorij za novi sustav"
+
+msgid "Configuration write failed"
+msgstr "Pisanje konfiguracije nije uspjelo"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "Nije moguće otvoriti konfiguracijsku datoteku na %1 za pisanje"
+
+msgid "Error adding system"
+msgstr "Pogreška pri dodavanju sistema"
+
+msgid "Remove directory failed"
+msgstr "Uklanjanje direktorija nije uspjelo"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "Neke datoteke u direktoriju sistema nisu mogle biti izbrisane. Izbrišite ih ručno."
+
+msgid "Build"
+msgstr "Build"
+
+msgid "Version"
+msgstr "Verzija"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "Dostupno je ažuriranje za 86Box: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "Došlo je do greške prilikom provjere ažuriranja: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>Dostupno je ažuriranje za 86Box!</b>"
+
+msgid "Warning"
+msgstr "Upozorenje"
+
+msgid "&Kill"
+msgstr "&Prisilno prekini"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "Prisilno prekidanje virtualnog stroja može uzrokovati gubitak podataka. Učinite to samo ako se 86Box proces zaglavi.\n\nŽelite li zaista ubiti virtualni stroj \"%1\"?"
+
+msgid "&Delete"
+msgstr "&Izbriši"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "Želite li zaista izbrisati virtualni stroj \"%1\" i sve njegove datoteke? Ovu radnju nije moguće poništiti!"
+
+msgid "Show &config file"
+msgstr "Prikaži &konfiguracijsku datoteku"
+
+msgid "No screenshot"
+msgstr "Nema snimke zaslona"
+
+msgid "Search"
+msgstr "Pretraživanje"
+
+msgid "Searching for VMs..."
+msgstr "Traženje virtualnih sistema..."
+
+msgid "Found %1"
+msgstr "Pronađeno %1"
+
+msgid "System"
+msgstr "Sistem"
+
+msgid "Storage"
+msgstr "Diskovi"
+
+msgid "Disk %1: "
+msgstr "Disk %1: "
+
+msgid "No disks"
+msgstr "Nema diskova"
+
+msgid "Audio"
+msgstr "Zvuk"
+
+msgid "Audio:"
+msgstr "Zvuk:"
+
 msgid "ACPI shutdown"
 msgstr "ACPI bazirano gašenje"
 
-msgid "Hard disk (%s)"
-msgstr "Tvrdi disk (%s)"
+msgid "ACP&I shutdown"
+msgstr "ACP&I bazirano gašenje"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "Tvrdi disk (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
 msgstr "MFM/RLL ili ESDI CD-ROM pogoni nisu nikada postojali"
@@ -1003,9 +1377,6 @@ msgstr "Nije moguće napisati datoteku"
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
 msgstr "HDI ili HDX slike s veličinom sektora koja nije 512 kB nisu podržane."
 
-msgid "USB is not yet supported"
-msgstr "USB nije još podržano"
-
 msgid "Disk image file already exists"
 msgstr "Slika diska već postoji"
 
@@ -1039,6 +1410,27 @@ msgstr "Prepiši"
 msgid "Don't overwrite"
 msgstr "Ne prepiši"
 
+msgid "Raw image"
+msgstr "Slika neobrađenih podataka"
+
+msgid "HDI image"
+msgstr "HDI slika"
+
+msgid "HDX image"
+msgstr "HDX slika"
+
+msgid "Fixed-size VHD"
+msgstr "VHD fiksne veličine"
+
+msgid "Dynamic-size VHD"
+msgstr "VHD dinamičke veličine"
+
+msgid "Differencing VHD"
+msgstr "Različiti VHD"
+
+msgid "(N/A)"
+msgstr "(Bez)"
+
 msgid "Raw image (.img)"
 msgstr "Slika neobrađenih podataka (.img)"
 
@@ -1078,9 +1470,6 @@ msgstr "Vremenske ozanke matične i poređenog diska ne odgovaraju."
 msgid "Could not fix VHD timestamp."
 msgstr "Ne mogu popraviti vremensku oznaku slike VHD."
 
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
-
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
 
@@ -1096,44 +1485,29 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
+msgid "160 KB"
+msgstr "160 KB"
 
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
+msgid "180 KB"
+msgstr "180 KB"
 
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
+msgid "320 KB"
+msgstr "320 KB"
 
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
+msgid "360 KB"
+msgstr "360 KB"
 
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
+msgid "640 KB"
+msgstr "640 KB"
 
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
+msgid "720 KB"
+msgstr "720 KB"
 
 msgid "1.2 MB"
 msgstr "1,2 MB"
@@ -1227,3 +1601,1383 @@ msgstr "Brzi"
 
 msgid "&Auto-pause on focus loss"
 msgstr "&Automatska pauza pri gubitku fokusa"
+
+msgid "WinBox is no longer supported"
+msgstr "WinBox seviše ne podržava"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "Razvoj menadžera WinBox zaustavio se 2022. zbog nedostatka održavača. Dok usmjeravamo svoje napore, da 86Box bude još bolji, odlučili smo se, da više ne podržavmo Winbox kao menadžer.\n\nDaljnja ažuriranja neće bit više osigurana putem WinBox-a i možete naići na pogrešno ponašanje ako ga nastavite koristiti s novijim verzijama 86Box-a. Sva izvješća o pogreškama u vezi s ponašanjem WinBox-a bit će zatvorena kao nevaljana.\n\nZa popis drugih menadžera koje možete koristiti, idite na 86box.net."
+
+msgid "Generate"
+msgstr "Generiraj"
+
+msgid "Joystick configuration"
+msgstr "Konfiguracija palice za igru"
+
+msgid "Device"
+msgstr "Uređaj"
+
+msgid "%1 (X axis)"
+msgstr "%1 (os X)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (os Y)"
+
+msgid "MCA devices"
+msgstr "Uređaji MCA"
+
+msgid "List of MCA devices:"
+msgstr "Spisak uređaja MCA:"
+
+msgid "&Tablet tool"
+msgstr "Alat za tablet"
+
+msgid "About &Qt"
+msgstr "O programu &Qt"
+
+msgid "&MCA devices..."
+msgstr "Uređaji MCA ..."
+
+msgid "Show non-&primary monitors"
+msgstr "Prikaži neprimarne monitore"
+
+msgid "Open screenshots &folder..."
+msgstr "Otvori mapu snimaka zaslona..."
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Primijeni način cijelozaslonskog rastezanja u maksimiziranom načinu"
+
+msgid "&Cursor/Puck"
+msgstr "&Kursor/Pak"
+
+msgid "&Pen"
+msgstr "&Olovka"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "CD/DVD pogon &nositelja (%1:)"
+
+msgid "&Connected"
+msgstr "&Povezan"
+
+msgid "Clear image &history"
+msgstr "Očisti &povijest slika"
+
+msgid "Create..."
+msgstr "Stvori..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "CD/DVD pogon nositelja (%1)"
+
+msgid "Unknown Bus"
+msgstr "Nepoznata sabirnica"
+
+msgid "Null Driver"
+msgstr "Nulti upravljački program"
+
+msgid "NIC:"
+msgstr "Mrežna kartica:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "Mrežna kartica %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&Mrežna kartica %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "Ponašanje rendera"
+
+msgid "Use target framerate:"
+msgstr "Koristi ciljni broj okvira u sekundi:"
+
+msgid " fps"
+msgstr " fps"
+
+msgid "VSync"
+msgstr "VSync"
+
+msgid "Synchronize with video"
+msgstr "Sinkroniziraj s videom"
+
+msgid "Shaders"
+msgstr "Shaderi"
+
+msgid "Remove"
+msgstr "Ukloni"
+
+msgid "Browse..."
+msgstr "Pregledajte..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "Nije moguće stvoriti kontekst OpenGL."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "Nije se moguće prebaciti na kontekst OpenGL."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "Potrebna je OpenGL verzija 3.0 ili više. Trenutna verzija je %1. %2"
+
+msgid "Error initializing OpenGL"
+msgstr "Nije moguće inicijalizirati OpenGL"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nVraća se na softverski renderer."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>Prilikom odabira medijskih slika (CD-ROM, diskete itd.), otvoreni dijalog zopočet će u istom direktoriju kao i konfiguracijska datoteka 86Box-a. Razlika će vjerojatno biti primjetna samo na macOS-u.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "Ovaj je sistem mogao biti premješten ili kopiran."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "Kako bi se osigurala pravilna funkcionalnost mreže, 86Box mora znati, je li ovaj sistem bio premješten ili kopiran.\n\nAko niste sigurni, odaberite \"Kopirao sam ga\"."
+
+msgid "I Moved It"
+msgstr "Premjestio sam ga"
+
+msgid "I Copied It"
+msgstr "Kopirao sam ga"
+
+msgid "86Box Monitor #"
+msgstr "Monitor 86Box-a "
+
+msgid "No MCA devices."
+msgstr "Nema uređaja MCA."
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "Mrežna kartica 1"
+
+msgid "Network Card #2"
+msgstr "Mrežna kartica 2"
+
+msgid "Network Card #3"
+msgstr "Mrežna kartica 3"
+
+msgid "Network Card #4"
+msgstr "Mrežna kartica 4"
+
+msgid "Mode:"
+msgstr "Način:"
+
+msgid "Interface:"
+msgstr "Sučelje:"
+
+msgid "Adapter:"
+msgstr "Adapter:"
+
+msgid "VDE Socket:"
+msgstr "VDE utičnica:"
+
+msgid "86Box Unit Tester"
+msgstr "Jedinični ispitivač 86Box-a"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Kjučna kartica za Novell Netware 2.x"
+
+msgid "Serial port passthrough 1"
+msgstr "Prolaz serijskih vrata 1"
+
+msgid "Serial port passthrough 2"
+msgstr "Prolaz serijskih vrata 2"
+
+msgid "Serial port passthrough 3"
+msgstr "Prolaz serijskih vrata 3"
+
+msgid "Serial port passthrough 4"
+msgstr "Prolaz serijskih vrata 4"
+
+msgid "Renderer &options..."
+msgstr "Opcije rendera..."
+
+msgid "PC/XT Keyboard"
+msgstr "Tipkovnica PC/XT"
+
+msgid "AT Keyboard"
+msgstr "Tipkovnica AT"
+
+msgid "AX Keyboard"
+msgstr "Tipkovnica AX"
+
+msgid "PS/2 Keyboard"
+msgstr "Tipkovnica PS/2"
+
+msgid "PS/55 Keyboard"
+msgstr "Tipkovnica PS/55"
+
+msgid "Keys"
+msgstr "Tipke"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Sabirnički miš Logitech/Microsoft"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Sabirnički miš Microsoft (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Serijski miš Mouse Systems"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Sabirnički miš Mouse Systems"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Serijski miš Microsoft"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Serijski miš Microsoft BallPoint"
+
+msgid "Logitech Serial Mouse"
+msgstr "Serijski miš Logitech"
+
+msgid "PS/2 Mouse"
+msgstr "Miš PS/2"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "Miš PS/2 QuickPort"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (serijski)"
+
+msgid "Default Baud rate"
+msgstr "Zadana brzina prijenosa podataka"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] Standardni modem, usklađen s standardom Hayesom"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Emulacija Rolanda MT-32"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Emulacija Rolanda MT-32 (novog)"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Emulacija Rolanda CM-32L"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Emulacija Rolanda CM-32LN"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "Kartica kćerka OPL4-ML"
+
+msgid "System MIDI"
+msgstr "Sistemski MIDI"
+
+msgid "MIDI Input Device"
+msgstr "Ulazni uređaj MIDI"
+
+msgid "BIOS file"
+msgstr "Datoteka BIOS-a"
+
+msgid "BIOS file (ROM #1)"
+msgstr "Datoteka BIOS-a (ROM 1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "Datoteka BIOS-a (ROM 2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "Datoteka BIOS-a (ROM 3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "Datoteka BIOS-a (ROM 4)"
+
+msgid "BIOS address"
+msgstr "Adresa BIOS-a"
+
+msgid "BIOS address (ROM #1)"
+msgstr "Adresa BIOS-a (ROM 1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "Adresa BIOS-a (ROM 2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "Adresa BIOS-a (ROM 3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "Adresa BIOS-a (ROM 4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "Omogući pisanje u ROM proširenja BIOS-a"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "Omogući pisanje u ROM proširenja BIOS-a (ROM 1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "Omogući pisanje u ROM proširenja BIOS-a (ROM 2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "Omogući pisanje u ROM proširenja BIOS-a (ROM 3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "Omogući pisanje u ROM proširenja BIOS-a (ROM 4)"
+
+msgid "Linear framebuffer base"
+msgstr "Osnovna adresa linearnog framebuffera"
+
+msgid "Address"
+msgstr "Adresa"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "IRQ serijskih vrata"
+
+msgid "Parallel port IRQ"
+msgstr "IRQ paralelnih vrata"
+
+msgid "BIOS Revision"
+msgstr "Revizija BIOS-a"
+
+msgid "BIOS Version"
+msgstr "Verzija BIOS-a"
+
+msgid "BIOS Language"
+msgstr "Jezik BIOS-a"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "Jedinica za proširenj IBM 5161"
+
+msgid "IBM Cassette Basic"
+msgstr "Kasetni BASIC IBM"
+
+msgid "Translate 26 -> 17"
+msgstr "Prevedi 26 -> 17"
+
+msgid "Language"
+msgstr "Jezik"
+
+msgid "Enable backlight"
+msgstr "Omogući pozadinsko osvjetljenje"
+
+msgid "Invert colors"
+msgstr "Invertiraj boje"
+
+msgid "BIOS size"
+msgstr "Veličina BIOS-a"
+
+msgid "BIOS size (ROM #1)"
+msgstr "Veličina BIOS-a (ROM 1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "Veličina BIOS-a (ROM 2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "Veličina BIOS-a (ROM 3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "Veličina BIOS-a (ROM 4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "Mapiraj C0000-C7FFF kao UMB"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "Mapiraj C8000-CFFFF kao UMB"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "Mapiraj D0000-D7FFF kao UMB"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "Mapiraj D8000-DFFFF kao UMB"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "Mapiraj E0000-E7FFF kao UMB"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "Mapiraj E8000-EFFFF kao UMB"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "Džemper JS9 (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "Izlazni uređaj MIDI"
+
+msgid "MIDI Real time"
+msgstr "MIDI u realnom vremenu"
+
+msgid "MIDI Thru"
+msgstr "Prolaz ulaza MIDI"
+
+msgid "MIDI Clockout"
+msgstr "Taktovit MIDI"
+
+msgid "SoundFont"
+msgstr "SoundFont"
+
+msgid "Output Gain"
+msgstr "Pojačavanje izlaza"
+
+msgid "Chorus"
+msgstr "Zbor"
+
+msgid "Chorus Voices"
+msgstr "Glasovi zbora"
+
+msgid "Chorus Level"
+msgstr "Nivo zbora"
+
+msgid "Chorus Speed"
+msgstr "Brzina zbora"
+
+msgid "Chorus Depth"
+msgstr "Dubina zbora"
+
+msgid "Chorus Waveform"
+msgstr "Valni oblik zbora"
+
+msgid "Reverb"
+msgstr "Odjek"
+
+msgid "Reverb Room Size"
+msgstr "Veličina sobe odjeka"
+
+msgid "Reverb Damping"
+msgstr "Prigušivanje odjeka"
+
+msgid "Reverb Width"
+msgstr "Širina odjeka"
+
+msgid "Reverb Level"
+msgstr "Nivo odjeka"
+
+msgid "Interpolation Method"
+msgstr "Metoda interpolacije"
+
+msgid "Dynamic Sample Loading"
+msgstr "Dinamičko učitavanje uzoraka"
+
+msgid "Reverb Output Gain"
+msgstr "Pojačavanje izlaza odjeka"
+
+msgid "Reversed stereo"
+msgstr "Obrnuti stereo"
+
+msgid "Nice ramp"
+msgstr "Lijepa rampa"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "Gumbi"
+
+msgid "Serial Port"
+msgstr "Serijska vrata"
+
+msgid "RTS toggle"
+msgstr "Prebacivanje RTS"
+
+msgid "Revision"
+msgstr "Revizija"
+
+msgid "Controller"
+msgstr "Kontroler"
+
+msgid "Show Crosshair"
+msgstr "Pokaži nišanski kursor"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "Adresa MAC"
+
+msgid "MAC Address OUI"
+msgstr "OUI adrese MAC"
+
+msgid "Enable BIOS"
+msgstr "Omogući BIOS"
+
+msgid "Baud Rate"
+msgstr "Baudova brzina"
+
+msgid "TCP/IP listening port"
+msgstr "Port za slušanje TCP/IP"
+
+msgid "Phonebook File"
+msgstr "Datoteka telefonskog imenika"
+
+msgid "Telnet emulation"
+msgstr "Emulacija Telneta"
+
+msgid "RAM Address"
+msgstr "Adresa RAM-a"
+
+msgid "RAM size"
+msgstr "Veličina RAM-a"
+
+msgid "Initial RAM size"
+msgstr "Početna veličina RAM-a"
+
+msgid "Serial Number"
+msgstr "Serijski broj"
+
+msgid "Host ID"
+msgstr "ID nositelja"
+
+msgid "FDC Address"
+msgstr "Adresa FDC-a"
+
+msgid "MPU-401 Address"
+msgstr "Adresa MPU-401-a"
+
+msgid "MPU-401 IRQ"
+msgstr "IRQ MPU-401-a"
+
+msgid "Receive MIDI input"
+msgstr "Primaj ulaz MIDI"
+
+msgid "Low DMA"
+msgstr "Niski DMA"
+
+msgid "Enable Game port"
+msgstr "Omogoći vrata za igru"
+
+msgid "SID Model"
+msgstr "Model SID-a"
+
+msgid "SID Filter Strength"
+msgstr "Jačina filtra SID-a"
+
+msgid "Surround module"
+msgstr "Modul Surround"
+
+msgid "CODEC"
+msgstr "CODEC"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "Podigni prekid CODEC na postavljanju CODEC-a (potrebno nekim upravljačkim programima)"
+
+msgid "SB Address"
+msgstr "Adresa SB-a"
+
+msgid "Adlib Address"
+msgstr "Adresa Adlib"
+
+msgid "Use EEPROM setting"
+msgstr "Koristi postavku iz EEPROM-a"
+
+msgid "WSS IRQ"
+msgstr "IRQ WSS-a"
+
+msgid "WSS DMA"
+msgstr "DMA WSS-a"
+
+msgid "Enable OPL"
+msgstr "Omogući OPL"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "Primaj ulaz MIDI (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "Niski DMA SB-a"
+
+msgid "6CH variant (6-channel)"
+msgstr "Varianta 6CH (6 kanala)"
+
+msgid "Enable CMS"
+msgstr "Omogući CMS"
+
+msgid "Mixer"
+msgstr "Mikser"
+
+msgid "High DMA"
+msgstr "Visoki DMA"
+
+msgid "Control PC speaker"
+msgstr "Kontroliraj zvučnik računala"
+
+msgid "Memory size"
+msgstr "Veličina memorije"
+
+msgid "EMU8000 Address"
+msgstr "Adresa EMU8000-a"
+
+msgid "IDE Controller"
+msgstr "Kontroler IDE"
+
+msgid "Codec"
+msgstr "Kodek"
+
+msgid "GUS type"
+msgstr "Vrsta GUS-a"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "Omogući naredbu 0x04 \"Izlazi iz 86Box-a\""
+
+msgid "Display type"
+msgstr "Vrsta zaslona"
+
+msgid "Composite type"
+msgstr "Vrsta kompozitnog zaslona"
+
+msgid "RGB type"
+msgstr "Vrsta zaslona RGB"
+
+msgid "Line doubling type"
+msgstr "Vrsta udvostručenja linija"
+
+msgid "Snow emulation"
+msgstr "Emulacija snijega"
+
+msgid "Monitor type"
+msgstr "Vrsta monitora"
+
+msgid "Character set"
+msgstr "Set znakova"
+
+msgid "XGA type"
+msgstr "Vrsta kartice XGA"
+
+msgid "Instance"
+msgstr "Primjer"
+
+msgid "MMIO Address"
+msgstr "Adresa MMIO-a"
+
+msgid "RAMDAC type"
+msgstr "Vrsta RAMDAC-a"
+
+msgid "Blend"
+msgstr "Miješaj"
+
+msgid "Font"
+msgstr "Font"
+
+msgid "Bilinear filtering"
+msgstr "Bilinearno filtriranje"
+
+msgid "Video chroma-keying"
+msgstr "Kroma ključanje prikaza"
+
+msgid "Dithering"
+msgstr "Podrhtavanje"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "Omogući NMI za emulaciju CGA"
+
+msgid "Voodoo type"
+msgstr "Vrsta kartice Voodoo"
+
+msgid "Framebuffer memory size"
+msgstr "Veličina memorije za framebuffer"
+
+msgid "Texture memory size"
+msgstr "Veličina memorije za teksturu"
+
+msgid "Dither subtraction"
+msgstr "Oduzivanje podrhtaja"
+
+msgid "Screen Filter"
+msgstr "Filtar zaslona"
+
+msgid "Render threads"
+msgstr "Niti za render"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Početna adresa"
+
+msgid "Contiguous Size"
+msgstr "Susjedna veličina"
+
+msgid "I/O Width"
+msgstr "Širina I/O"
+
+msgid "Transfer Speed"
+msgstr "Brzina prijenosa"
+
+msgid "EMS mode"
+msgstr "Načina EMS"
+
+msgid "EMS Address"
+msgstr "Adresa EMS"
+
+msgid "EMS 1 Address"
+msgstr "Adresa EMS 1"
+
+msgid "EMS 2 Address"
+msgstr "Adresa EMS 2"
+
+msgid "EMS Memory Size"
+msgstr "Veličina memorije EMS"
+
+msgid "EMS 1 Memory Size"
+msgstr "Veličina memorije EMS 1"
+
+msgid "EMS 2 Memory Size"
+msgstr "Veličina memorije EMS 2"
+
+msgid "Enable EMS"
+msgstr "Omogući EMS"
+
+msgid "Enable EMS 1"
+msgstr "Omogući EMS 1"
+
+msgid "Enable EMS 2"
+msgstr "Omogući EMS 2"
+
+msgid "Address for > 2 MB"
+msgstr "Adresa za > 2 MB"
+
+msgid "Frame Address"
+msgstr "Adresa za frame"
+
+msgid "USA"
+msgstr "SAD"
+
+msgid "Danish"
+msgstr "Danski"
+
+msgid "Always at selected speed"
+msgstr "Uvijek na odabranoj brzini"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "Konfiguracija BIOS-a + Tipkovni prečaci (onemogućeni tekom POST-a)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 KB od F0000"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 KB od E0000 (MSB adrese invertiran, poslednjih 64 KB prvo)"
+
+msgid "Sine"
+msgstr "Sinusni"
+
+msgid "Triangle"
+msgstr "Trokutni"
+
+msgid "Linear"
+msgstr "Linearna"
+
+msgid "4th Order"
+msgstr "4. reda"
+
+msgid "7th Order"
+msgstr "7. reda"
+
+msgid "Non-timed (original)"
+msgstr "Bez tajmera (originalni)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (JMP2 prazan)"
+
+msgid "Two"
+msgstr "Dva"
+
+msgid "Three"
+msgstr "Tri"
+
+msgid "Wheel"
+msgstr "Kotač"
+
+msgid "Five + Wheel"
+msgstr "Pet + kotač"
+
+msgid "Five + 2 Wheels"
+msgstr "Pet + 2 kotača"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 serijski / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) serijski"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "Onemogući BIOS"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2 MB"
+
+msgid "8 MB"
+msgstr "8 MB"
+
+msgid "28 MB"
+msgstr "28 MB"
+
+msgid "1 MB"
+msgstr "1 MB"
+
+msgid "4 MB"
+msgstr "4 MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16 MB"
+
+msgid "20 MB"
+msgstr "20 MB"
+
+msgid "24 MB"
+msgstr "24 MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (stereo)"
+
+msgid "Classic"
+msgstr "Klasičan"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "Kompozitni"
+
+msgid "True color"
+msgstr "Prave boje"
+
+msgid "Old"
+msgstr "Stara"
+
+msgid "New"
+msgstr "Nova"
+
+msgid "Color (generic)"
+msgstr "Bojni (generični)"
+
+msgid "Green Monochrome"
+msgstr "Crno-bijeli zeleni"
+
+msgid "Amber Monochrome"
+msgstr "Crno-bijeli jantarni"
+
+msgid "Gray Monochrome"
+msgstr "Crno-biljeli sivi"
+
+msgid "Color (no brown)"
+msgstr "Bojni (bez smeđe)"
+
+msgid "Color (IBM 5153)"
+msgstr "Bojni (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Jednostavno udvostručenje"
+
+msgid "sRGB interpolation"
+msgstr "Interpolacija sRGB"
+
+msgid "Linear interpolation"
+msgstr "Linearna interpolacija"
+
+msgid "Has secondary 8x8 character set"
+msgstr "Ima sekundarni skup znakova 8x8"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Ima kćerinsku ploču Quadcolor II"
+
+msgid "Alternate monochrome contrast"
+msgstr "Alternativni crno-bijeli kontrast"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Crno-bijeli (5151/MDA) (bijeli)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Crno-bijeli (5151/MDA) (zeleni)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Crno-bijeli (5151/MDA) (jantarni)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Bojni 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Bojni 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Bojni pojačani - normalni način (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Bojni pojačani - pojačani način (5154/ECD)"
+
+msgid "Green"
+msgstr "Zelena"
+
+msgid "Amber"
+msgstr "Jantarna"
+
+msgid "Gray"
+msgstr "Siva"
+
+msgid "Grayscale"
+msgstr "Nijanse sive"
+
+msgid "Color"
+msgstr "Bojna"
+
+msgid "U.S. English"
+msgstr "Američki engleski"
+
+msgid "Scandinavian"
+msgstr "Skandinavski"
+
+msgid "Other languages"
+msgstr "Ostali jezici"
+
+msgid "Bochs latest"
+msgstr "Bochs poslednji"
+
+msgid "Apply overscan deltas"
+msgstr "Primijeni delte viška slike"
+
+msgid "Mono Interlaced"
+msgstr "Crno-bijeli s preplitanjem"
+
+msgid "Mono Non-Interlaced"
+msgstr "Crno-bijeli bez preplitanja"
+
+msgid "Color Interlaced"
+msgstr "Bojni s preplitanjem"
+
+msgid "Color Non-Interlaced"
+msgstr "Bojni bez preplitanja"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "3dfx Voodoo grafika"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 jednote TMU)"
+
+msgid "8-bit"
+msgstr "8-bitna"
+
+msgid "16-bit"
+msgstr "16-bitna"
+
+msgid "Standard (150ns)"
+msgstr "Standardna (150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "Visoka brzina (120ns)"
+
+msgid "Enabled"
+msgstr "Omogoći"
+
+msgid "Standard"
+msgstr "Standardna"
+
+msgid "High-Speed"
+msgstr "Visoka brzina"
+
+msgid "Stereo LPT DAC"
+msgstr "Stereo DAC za LPT"
+
+msgid "Generic Text Printer"
+msgstr "Generični tekstovni pisač"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Generični matrični pisač ESC/P 2"
+
+msgid "Generic PostScript Printer"
+msgstr "Generični pisač PostScript"
+
+msgid "Generic PCL5e Printer"
+msgstr "Generični pisač PCL5e"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Internet protokol za paralelnu liniju"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Zaštitni uređaj za Savage Quest"
+
+msgid "Serial Passthrough Device"
+msgstr "Uređaj prolaza serijskih vrata"
+
+msgid "Passthrough Mode"
+msgstr "Način prolaza"
+
+msgid "Host Serial Device"
+msgstr "Serijska vrata nositelja"
+
+msgid "Name of pipe"
+msgstr "Ime voda"
+
+msgid "Data bits"
+msgstr "Bitovi podataka"
+
+msgid "Stop bits"
+msgstr "Stop bitovi"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Baudova brzina prolaza"
+
+msgid "Named Pipe (Server)"
+msgstr "Imenovani vod (server)"
+
+msgid "Named Pipe (Client)"
+msgstr "Imenovani vod (klijent)"
+
+msgid "Host Serial Passthrough"
+msgstr "Prolaz serijskih vrata nositelja"
+
+msgid "E&ject %1"
+msgstr "&Izbaci %1"
+
+msgid "&Unmute"
+msgstr "&Uključi zvuk"
+
+msgid "Softfloat FPU"
+msgstr "Softfloat FPU"
+
+msgid "High performance impact"
+msgstr "Visoki učinak na brzinu izvršavanja"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Generični] Disk RAM (najviša brzina)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Generični] 1989 (3500 okr./min)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Generični] 1992 (3600 okr./min)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Generični] 1994 (4500 okr./min)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Generični] (5400 okr./min)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Generični] (5400 okr./min)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Generični] (5400 okr./min)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Generični] (7200 okr./min)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "Klon IBM 8514/A (ISA)"
+
+msgid "Vendor"
+msgstr "Proizvođać"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Generičko proširenje memorije PC/XT"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Generičko proširenje memorije PC/AT"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "Nije moguće pronaći matrične fontove"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "TrueType fontovi u mapi \"roms/printer/fonts\" potrebni su za emulaciju generičnog matričnog pisača ESC/P 2."
+
+msgid "Inhibit multimedia keys"
+msgstr "Blokiraj multimedijske tipke"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Zatraži potvrdu prije spremanja opcija"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Zatraži potvrdu prije ponovnog pokretanja"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Zatraži potvrdu prije izlaza"
+
+msgid "Options"
+msgstr "Opcije"
+
+msgid "Model"
+msgstr "Model"
+
+msgid "Model:"
+msgstr "Model:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Nije uspjelo inicijaliziranje renderera Vulkan."
+
+msgid "GLSL Error"
+msgstr "Greška GLSL"
+
+msgid "Could not load shader: %1"
+msgstr "Nije moguće učitati shader: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "Potrebna je OpenGL verzija 3.0 ili novija. Trenutna GLSL verzija je %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "Nije moguće učitati teksturu: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "Nije moguće kompajlirati shader:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "Program nije povezan:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "Upravitelj shadera"
+
+msgid "Shader Configuration"
+msgstr "Konfiguracija shadera"
+
+msgid "Add"
+msgstr "Dodaj"
+
+msgid "Move up"
+msgstr "Pomakni gore"
+
+msgid "Move down"
+msgstr "Pomakni dolje"
+
+msgid "Could not load file %1"
+msgstr "Nije moguće učitati datoteku %1"
+
+msgid "Key Bindings:"
+msgstr "Veze tipki:"
+
+msgid "Action"
+msgstr "Akcija"
+
+msgid "Keybind"
+msgstr "Povezivanje tipki"
+
+msgid "Clear binding"
+msgstr "Očisti vezivanje"
+
+msgid "Bind"
+msgstr "Poveži"
+
+msgid "Bind Key"
+msgstr "Poveži tipku"
+
+msgid "Enter key combo:"
+msgstr "Unesite kombinaciju tipki:"
+
+msgid "Bind conflict"
+msgstr "Sukob vezanja"
+
+msgid "This key combo is already in use."
+msgstr "Ova kombinacija tipki je već u upotrebi."
+
+msgid "Send Control+Alt+Del"
+msgstr "Pošalji Control+Alt+Del"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Pošalji Control+Alt+Escape"
+
+msgid "Toggle fullscreen"
+msgstr "Uključi/isključi cijelozaslonski način"
+
+msgid "Screenshot"
+msgstr "Snimka zaslona"
+
+msgid "Release mouse pointer"
+msgstr "Otpusti pokazivač miša"
+
+msgid "Toggle pause"
+msgstr "Uključi/isključi pauzu"
+
+msgid "Toggle mute"
+msgstr "Uključi/isključi zvuk"
+
+msgid "Text files"
+msgstr "Tekstualne datoteke"
+
+msgid "ROM files"
+msgstr "Datoteke ROM"
+
+msgid "SoundFont files"
+msgstr "Datoteke SoundFont"
+
+msgid "Local Switch"
+msgstr "Lokalni prekidač"
+
+msgid "Remote Switch"
+msgstr "Udaljeni prekidač"
+
+msgid "Switch:"
+msgstr "Prekidač:"
+
+msgid "Hub Mode"
+msgstr "Način čvorišta"
+
+msgid "Hostname:"
+msgstr "Naziv hosta:"
+
+msgid "ISA RAM:"
+msgstr "RAM ISA:"
+
+msgid "ISA ROM:"
+msgstr "ROM ISA:"
+
+msgid "&Wipe NVRAM"
+msgstr "&Obriši NVRAM"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "Ovim će se izbrisati sve NVRAM (i povezane) datoteke virtualnog sistema koji se nalazi u poddirektoriju \"nvr\". Morat ćete ponovno konfigurirati postavke BIOS-a (i eventualno drugih uređaja unutar virtualnog sistema) ako je primjenjivo.\n\nJeste li sigurni da želite izbrisati sav NVRAM sadržaj virtualnog sistema \"%1\"?"
+
+msgid "Success"
+msgstr "Uspjeh"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "Uspješno obrisan sadržaj NVRAM-a virtualnog sistema \"%1\""
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "Došlo je do pogreške pri pokušaju brisanja NVRAM sadržaja virtualnog sistema \"%1\""
+
+msgid "%1 VM Manager"
+msgstr "Upravitelj virtualnih sistema programa %1"
+
+msgid "%n disk(s)"
+msgstr "%n disk(ova)"
+
+msgid "Unknown Status"
+msgstr "Nepoznat status"
+
+msgid "No Machines Found!"
+msgstr "Nisu pronađeni sistemovi!"
+
+msgid "Check for updates on startup"
+msgstr "Provjeri ažuriranja pri pokretanju"
+
+msgid "Unable to determine release information"
+msgstr "Nije moguće utvrditi informacije o izdanju"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Došlo je do pogreške prilikom provjere ažuriranja:\n\n%1\n\nMolimo pokušajte ponovno kasnije."
+
+msgid "Update check complete"
+msgstr "Provjera ažuriranja dovršena"
+
+msgid "stable"
+msgstr "stabilnu"
+
+msgid "beta"
+msgstr "beta"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Koristite najnoviju %1 verziju programa 86Box: %2"
+
+msgid "version"
+msgstr "verzija"
+
+msgid "build"
+msgstr "build"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Trenutno koristite verziju <b>%1</b>."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "<b>Verzija %1</b> je sada dostupna."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Trenutno koristite build <b>%1</b>."
+
+msgid "<b>Build %1</b> is now available."
+msgstr "<b>Build %1</b> je sada dostupan."
+
+msgid "Would you like to visit the download page?"
+msgstr "Želite li posjetiti stranicu za preuzimanje?"
+
+msgid "Visit download page"
+msgstr "Posjetiti stranicu za preuzimanje"
+
+msgid "Update check"
+msgstr "Provjera ažuriranja"
+
+msgid "Checking for updates..."
+msgstr "Provjera ažuriranja..."
+
+msgid "86Box Update"
+msgstr "Ažuriranje programa 86Box"
+
+msgid "Release notes:"
+msgstr "Bilješke o izdanju:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "Neočekivani prekid rada virtualnog sistema"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "Proces virtualnog sistema \"%1\" neočekivano je završio s izlaznim kodom %2."
+
+msgid "The system will not be added."
+msgstr "Sistem neće biti dodan."
+
+msgid "&Update mouse every CPU frame"
+msgstr "&Ažuriraj status miša kod skavog bloka procesora"
+
+msgid "Hue"
+msgstr "Boja"
+
+msgid "Saturation"
+msgstr "Zasićenost"
+
+msgid "Contrast"
+msgstr "Konstrast"
+
+msgid "Brightness"
+msgstr "Svjetlina"
+
+msgid "Sharpness"
+msgstr "Oštrina"
+
+msgid "&CGA composite settings..."
+msgstr "Opcije kompozitnog načina &CGA..."
+
+msgid "CGA composite settings"
+msgstr "Opcije kompozitnog načina CGA"
+
+msgid "Monitor EDID"
+msgstr "EDID monitora"
+
+msgid "Export..."
+msgstr "Izvoz..."
+
+msgid "Export EDID"
+msgstr "Izvoz EDID-a"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "EDID datoteka \"%ls\" je prevelika."
+
+msgid "OpenGL input scale"
+msgstr "Ulazna skala OpenGL-a"
+
+msgid "OpenGL input stretch mode"
+msgstr "Način rastezanja ulaza u OpenGL-u"
+
+msgid "Color scheme"
+msgstr "Shema boja"
+
+msgid "Light"
+msgstr "Svjetlo"
+
+msgid "Dark"
+msgstr "Tamno"
diff --git a/src/qt/languages/hu-HU.po b/src/qt/languages/hu-HU.po
deleted file mode 100644
index 129df1e2b..000000000
--- a/src/qt/languages/hu-HU.po
+++ /dev/null
@@ -1,1229 +0,0 @@
-msgid "&Action"
-msgstr "&Művelet"
-
-msgid "&Keyboard requires capture"
-msgstr "A &billentyűzet elfogást igényel"
-
-msgid "&Right CTRL is left ALT"
-msgstr "A &jobb oldali CTRL a bal ALT"
-
-msgid "&Hard Reset..."
-msgstr "Hardveres &újraindítás..."
-
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Ctrl+Alt+Del\tCtrl+F12"
-
-msgid "Ctrl+Alt+&Esc"
-msgstr "Ctrl+Alt+&Esc"
-
-msgid "&Pause"
-msgstr "&Szüneteltetés"
-
-msgid "E&xit..."
-msgstr "&Kilépés..."
-
-msgid "&View"
-msgstr "&Nézet"
-
-msgid "&Hide status bar"
-msgstr "Állapotsor &elrejtése"
-
-msgid "Hide &toolbar"
-msgstr "Hide &toolbar"
-
-msgid "&Resizeable window"
-msgstr "&Átméretezhető ablak"
-
-msgid "R&emember size && position"
-msgstr "Méret és pozíció &megjegyzése"
-
-msgid "Re&nderer"
-msgstr "&Megjelenítő"
-
-msgid "&SDL (Software)"
-msgstr "&SDL (Szoftveres)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (&Hardveres)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
-
-msgid "Open&GL (3.0 Core)"
-msgstr "Open&GL (3.0 Core)"
-
-msgid "&VNC"
-msgstr "&VNC"
-
-msgid "Specify dimensions..."
-msgstr "Méretek kézi megadása..."
-
-msgid "F&orce 4:3 display ratio"
-msgstr "&Rögzített 4:3 képarány"
-
-msgid "&Window scale factor"
-msgstr "&Ablak méretezési tényező"
-
-msgid "&0.5x"
-msgstr "&0,5x"
-
-msgid "&1x"
-msgstr "&1x"
-
-msgid "1.&5x"
-msgstr "1,&5x"
-
-msgid "&2x"
-msgstr "&2x"
-
-msgid "&3x"
-msgstr "&3x"
-
-msgid "&4x"
-msgstr "&4x"
-
-msgid "&5x"
-msgstr "&5x"
-
-msgid "&6x"
-msgstr "&6x"
-
-msgid "&7x"
-msgstr "&7x"
-
-msgid "&8x"
-msgstr "&8x"
-
-msgid "Filter method"
-msgstr "Szűrési mód"
-
-msgid "&Nearest"
-msgstr "&Szomszédos"
-
-msgid "&Linear"
-msgstr "&Lineáris"
-
-msgid "Hi&DPI scaling"
-msgstr "Hi&DPI méretezés"
-
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "&Teljes képernyő\tCtrl+Alt+PgUp"
-
-msgid "Fullscreen &stretch mode"
-msgstr "Teljes képernyős &méretezés"
-
-msgid "&Full screen stretch"
-msgstr "&Nyújtás a teljes képernyőre"
-
-msgid "&4:3"
-msgstr "&4:3"
-
-msgid "&Square pixels (Keep ratio)"
-msgstr "&Négyzetes képpontok (aránytartás)"
-
-msgid "&Integer scale"
-msgstr "&Egész tényezős nagyítás"
-
-msgid "4:&3 Integer scale"
-msgstr "4:&3 Egész tényezős nagyítás"
-
-msgid "E&GA/(S)VGA settings"
-msgstr "E&GA/(S)VGA beállítások"
-
-msgid "&Inverted VGA monitor"
-msgstr "&Invertált VGA kijelző"
-
-msgid "VGA screen &type"
-msgstr "VGA képernyő &típusa"
-
-msgid "RGB &Color"
-msgstr "RGB &színes"
-
-msgid "&RGB Grayscale"
-msgstr "&RGB szürkeárnyalatos"
-
-msgid "&Amber monitor"
-msgstr "&Gyömbér kijelző"
-
-msgid "&Green monitor"
-msgstr "&Zöld kijelző"
-
-msgid "&White monitor"
-msgstr "&Fehér kijelző"
-
-msgid "Grayscale &conversion type"
-msgstr "Szürkéskála &konzerziós eljárás"
-
-msgid "BT&601 (NTSC/PAL)"
-msgstr "BT&601 (NTSC/PAL)"
-
-msgid "BT&709 (HDTV)"
-msgstr "BT&709 (HDTV)"
-
-msgid "&Average"
-msgstr "&Átlag szerint"
-
-msgid "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
-msgstr "CGA/PCjr/Tandy/E&GA/(S)VGA túlpásztázás"
-
-msgid "Change contrast for &monochrome display"
-msgstr "Kontraszt illesztése &monokróm kijelzőhöz"
-
-msgid "&Media"
-msgstr "&Média"
-
-msgid "&Tools"
-msgstr "&Eszközök"
-
-msgid "&Settings..."
-msgstr "&Konfigurálás..."
-
-msgid "&Update status bar icons"
-msgstr "Állapotsori ikonok &frissítése"
-
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "&Képernyőkép készítése\tCtrl+F11"
-
-msgid "&Preferences..."
-msgstr "&Beállítások..."
-
-msgid "Enable &Discord integration"
-msgstr "&Discord integráció engedélyezése"
-
-msgid "Sound &gain..."
-msgstr "&Hangerőszabályzó..."
-
-msgid "Begin trace\tCtrl+T"
-msgstr "Nyomkövetés megkezdése\tCtrl+T"
-
-msgid "End trace\tCtrl+T"
-msgstr "Nyomkövetés befejezése\tCtrl+T"
-
-msgid "&Help"
-msgstr "&Súgó"
-
-msgid "&Documentation..."
-msgstr "&Dokumentáció..."
-
-msgid "&About 86Box..."
-msgstr "A 86Box &névjegye..."
-
-msgid "&New image..."
-msgstr "&Új képfájl létrehozása..."
-
-msgid "&Existing image..."
-msgstr "Meglévő képfájl &megnyitása..."
-
-msgid "Existing image (&Write-protected)..."
-msgstr "Meglévő képfájl megnyitása (&írásvédett)..."
-
-msgid "&Record"
-msgstr "&Felvétel"
-
-msgid "&Play"
-msgstr "&Lejátszás"
-
-msgid "&Rewind to the beginning"
-msgstr "&Visszatekerés az elejére"
-
-msgid "&Fast forward to the end"
-msgstr "&Előretekerés a végére"
-
-msgid "E&ject"
-msgstr "&Kiadás"
-
-msgid "&Image..."
-msgstr "Kép&fájl..."
-
-msgid "E&xport to 86F..."
-msgstr "E&xportálás 86F formátumba..."
-
-msgid "&Mute"
-msgstr "&Némítás"
-
-msgid "E&mpty"
-msgstr "&Kiadás"
-
-msgid "&Reload previous image"
-msgstr "Előző képfájl &újratöltése"
-
-msgid "&Folder..."
-msgstr "&Mappa..."
-
-msgid "Target &framerate"
-msgstr "Cél &képkockasebesség"
-
-msgid "&Sync with video"
-msgstr "&Szinkronizálás a videóval "
-
-msgid "&25 fps"
-msgstr "&25 fps"
-
-msgid "&30 fps"
-msgstr "&30 fps"
-
-msgid "&50 fps"
-msgstr "&50 fps"
-
-msgid "&60 fps"
-msgstr "&60 fps"
-
-msgid "&75 fps"
-msgstr "&75 fps"
-
-msgid "&VSync"
-msgstr "&VSync"
-
-msgid "&Select shader..."
-msgstr "Shader &kiválasztása..."
-
-msgid "&Remove shader"
-msgstr "Shader &eltávolítása"
-
-msgid "Preferences"
-msgstr "Beállítások"
-
-msgid "Sound Gain"
-msgstr "Hangerőszabályzó"
-
-msgid "New Image"
-msgstr "Új képfájl létrehozása"
-
-msgid "Settings"
-msgstr "Konfigurálás"
-
-msgid "Specify Main Window Dimensions"
-msgstr "Főablak méreteinek megadása"
-
-msgid "OK"
-msgstr "OK"
-
-msgid "Cancel"
-msgstr "Mégse"
-
-msgid "Save these settings as &global defaults"
-msgstr "Beállítások mentése &globális alapértékként"
-
-msgid "&Default"
-msgstr "&Alapértelmezett"
-
-msgid "Language:"
-msgstr "Nyelv:"
-
-msgid "Icon set:"
-msgstr "Ikonkészlet:"
-
-msgid "Gain"
-msgstr "Hangerő"
-
-msgid "File name:"
-msgstr "Fájlnév:"
-
-msgid "Disk size:"
-msgstr "Méret:"
-
-msgid "RPM mode:"
-msgstr "RPM-mód:"
-
-msgid "Progress:"
-msgstr "Folyamat:"
-
-msgid "Width:"
-msgstr "Szélesség:"
-
-msgid "Height:"
-msgstr "Magasság:"
-
-msgid "Lock to this size"
-msgstr "Rögzítés a megadott méretre"
-
-msgid "Machine type:"
-msgstr "Géptípus:"
-
-msgid "Machine:"
-msgstr "Számítógép:"
-
-msgid "Configure"
-msgstr "Beállítások..."
-
-msgid "CPU type:"
-msgstr "Processzor:"
-
-msgid "Speed:"
-msgstr "Seb.:"
-
-msgid "Frequency:"
-msgstr "Frekvencia:"
-
-msgid "FPU:"
-msgstr "FPU-egység:"
-
-msgid "Wait states:"
-msgstr "Várak. ciklusok:"
-
-msgid "MB"
-msgstr "MB"
-
-msgid "Memory:"
-msgstr "Memória:"
-
-msgid "Time synchronization"
-msgstr "Idő szinkronizáció"
-
-msgid "Disabled"
-msgstr "Letiltva"
-
-msgid "Enabled (local time)"
-msgstr "Engedélyezve (helyi idő)"
-
-msgid "Enabled (UTC)"
-msgstr "Engedélyezve (UTC)"
-
-msgid "Dynamic Recompiler"
-msgstr "Dinamikus újrafordítás"
-
-msgid "Video:"
-msgstr "Videokártya:"
-
-msgid "Voodoo Graphics"
-msgstr "Voodoo-gyorsítókártya"
-
-msgid "IBM 8514/A Graphics"
-msgstr "IBM 8514/A-gyorsítókártya"
-
-msgid "XGA Graphics"
-msgstr "XGA-gyorsítókártya"
-
-msgid "Mouse:"
-msgstr "Egér:"
-
-msgid "Joystick:"
-msgstr "Játékvezérlő:"
-
-msgid "Joystick 1..."
-msgstr "Játékvez. 1..."
-
-msgid "Joystick 2..."
-msgstr "Játékvez. 2..."
-
-msgid "Joystick 3..."
-msgstr "Játékvez. 3..."
-
-msgid "Joystick 4..."
-msgstr "Játékvez. 4..."
-
-msgid "Sound card #1:"
-msgstr "Hangkártya 1:"
-
-msgid "Sound card #2:"
-msgstr "Hangkártya 2:"
-
-msgid "Sound card #3:"
-msgstr "Hangkártya 3:"
-
-msgid "Sound card #4:"
-msgstr "Hangkártya 4:"
-
-msgid "MIDI Out Device:"
-msgstr "MIDI-kimenet:"
-
-msgid "MIDI In Device:"
-msgstr "MIDI-bemenet:"
-
-msgid "Standalone MPU-401"
-msgstr "Különálló MPU-401"
-
-msgid "Use FLOAT32 sound"
-msgstr "FLOAT32 használata"
-
-msgid "FM synth driver"
-msgstr "FM szintetizátor meghajtó"
-
-msgid "Nuked (more accurate)"
-msgstr "Nuked (pontosabb)"
-
-msgid "YMFM (faster)"
-msgstr "YMFM (gyorsabb)"
-
-msgid "Network type:"
-msgstr "Hálózati típusa:"
-
-msgid "PCap device:"
-msgstr "PCap eszköz:"
-
-msgid "Network adapter:"
-msgstr "Hálózati kártya:"
-
-msgid "COM1 Device:"
-msgstr "COM1 eszköz:"
-
-msgid "COM2 Device:"
-msgstr "COM2 eszköz:"
-
-msgid "COM3 Device:"
-msgstr "COM3 eszköz:"
-
-msgid "COM4 Device:"
-msgstr "COM4 eszköz:"
-
-msgid "LPT1 Device:"
-msgstr "LPT1 eszköz:"
-
-msgid "LPT2 Device:"
-msgstr "LPT2 eszköz:"
-
-msgid "LPT3 Device:"
-msgstr "LPT3 eszköz:"
-
-msgid "LPT4 Device:"
-msgstr "LPT4 eszköz:"
-
-msgid "Serial port 1"
-msgstr "Soros port 1"
-
-msgid "Serial port 2"
-msgstr "Soros port 2"
-
-msgid "Serial port 3"
-msgstr "Soros port 3"
-
-msgid "Serial port 4"
-msgstr "Soros port 4"
-
-msgid "Parallel port 1"
-msgstr "Párhuzamos port 1"
-
-msgid "Parallel port 2"
-msgstr "Párhuzamos port 2"
-
-msgid "Parallel port 3"
-msgstr "Párhuzamos port 3"
-
-msgid "Parallel port 4"
-msgstr "Párhuzamos port 4"
-
-msgid "HD Controller:"
-msgstr "Merevl.-vezérlő:"
-
-msgid "FD Controller:"
-msgstr "Floppy-vezérlő:"
-
-msgid "Tertiary IDE Controller"
-msgstr "Harmadlagos IDE-vezérlő"
-
-msgid "Quaternary IDE Controller"
-msgstr "Negyedleges IDE-vezérlő"
-
-msgid "SCSI"
-msgstr "SCSI"
-
-msgid "Controller 1:"
-msgstr "Gazdaadapt. 1:"
-
-msgid "Controller 2:"
-msgstr "Gazdaadapt. 2:"
-
-msgid "Controller 3:"
-msgstr "Gazdaadapt. 3:"
-
-msgid "Controller 4:"
-msgstr "Gazdaadapt. 4:"
-
-msgid "Cassette"
-msgstr "Magnókazetta"
-
-msgid "Hard disks:"
-msgstr "Merevlemezek:"
-
-msgid "&New..."
-msgstr "&Új..."
-
-msgid "&Existing..."
-msgstr "&Megnyitás..."
-
-msgid "&Remove"
-msgstr "&Eltávolítás"
-
-msgid "Bus:"
-msgstr "Busz:"
-
-msgid "Channel:"
-msgstr "Csatorna:"
-
-msgid "ID:"
-msgstr "ID:"
-
-msgid "&Specify..."
-msgstr "&Kiválasztás..."
-
-msgid "Sectors:"
-msgstr "Szektor:"
-
-msgid "Heads:"
-msgstr "Fej:"
-
-msgid "Cylinders:"
-msgstr "Cilinder:"
-
-msgid "Size (MB):"
-msgstr "Méret (MB):"
-
-msgid "Type:"
-msgstr "Típus:"
-
-msgid "Image Format:"
-msgstr "Formátum:"
-
-msgid "Block Size:"
-msgstr "Blokkméret:"
-
-msgid "Floppy drives:"
-msgstr "Floppy-meghajtók:"
-
-msgid "Turbo timings"
-msgstr "Turbó időzítés"
-
-msgid "Check BPB"
-msgstr "BPB ellenőrzés"
-
-msgid "CD-ROM drives:"
-msgstr "CD-ROM meghajtók:"
-
-msgid "Earlier drive"
-msgstr "Korábbi meghajtó"
-
-msgid "MO drives:"
-msgstr "MO-meghajtók:"
-
-msgid "ZIP drives:"
-msgstr "ZIP-meghajtók:"
-
-msgid "ZIP 250"
-msgstr "ZIP 250"
-
-msgid "ISA RTC:"
-msgstr "ISA RTC (óra):"
-
-msgid "ISA Memory Expansion"
-msgstr "ISA memóriabővítők"
-
-msgid "Card 1:"
-msgstr "Kártya 1:"
-
-msgid "Card 2:"
-msgstr "Kártya 2:"
-
-msgid "Card 3:"
-msgstr "Kártya 3:"
-
-msgid "Card 4:"
-msgstr "Kártya 4:"
-
-msgid "ISABugger device"
-msgstr "ISABugger eszköz"
-
-msgid "POST card"
-msgstr "POST kártya"
-
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
-
-msgid "86Box"
-msgstr "86Box"
-
-msgid "Error"
-msgstr "Hiba"
-
-msgid "Fatal error"
-msgstr "Végzetes hiba"
-
-msgid " - PAUSED"
-msgstr " - PAUSED"
-
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Használja a Ctrl+Alt+PgDn gombokat az ablakhoz való visszatéréshez."
-
-msgid "Speed"
-msgstr "Sebesség"
-
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
-
-msgid "ZIP images"
-msgstr "ZIP-lemezképek"
-
-msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
-msgstr "A 86Box nem talált használható ROM-képeket\n\nKérem <a href=\"https://github.com/86Box/roms/releases/latest\">töltse le</a> a ROM készletet és bontsa ki a \"roms\" könyvtárba."
-
-msgid "(empty)"
-msgstr "(üres)"
-
-msgid "All files"
-msgstr "Minden fájl"
-
-msgid "Turbo"
-msgstr "Turbó"
-
-msgid "On"
-msgstr "Bekapcsolva"
-
-msgid "Off"
-msgstr "Kikapcsolva"
-
-msgid "All images"
-msgstr "Minden képfájl"
-
-msgid "Basic sector images"
-msgstr "Alapvető szektor képfájlok"
-
-msgid "Surface images"
-msgstr "Felületi képfájlok"
-
-msgid "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
-msgstr "A számítógép \"%hs\" nem elérhető a \"roms/machines\" mappából hiányzó ROM-képek miatt. Ehelyett egy másik gép kerül futtatásra."
-
-msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
-msgstr "A videokártya \"%hs\" nem elérhető a \"roms/video\" mappából hiányzó ROM-képek miatt. Ehelyett egy másik kártya kerül futtatásra."
-
-msgid "Machine"
-msgstr "Számítógép"
-
-msgid "Display"
-msgstr "Megjelenítő"
-
-msgid "Input devices"
-msgstr "Beviteli eszközök"
-
-msgid "Sound"
-msgstr "Hang"
-
-msgid "Network"
-msgstr "Hálózat"
-
-msgid "Ports (COM & LPT)"
-msgstr "Portok (COM és LPT)"
-
-msgid "Storage controllers"
-msgstr "Tárolóvezérlők"
-
-msgid "Hard disks"
-msgstr "Merevlemezek"
-
-msgid "Floppy & CD-ROM drives"
-msgstr "Floppy és CD-ROM meghajtók"
-
-msgid "Other removable devices"
-msgstr "Egyéb cserélhető tárolók"
-
-msgid "Other peripherals"
-msgstr "Egyéb perifériák"
-
-msgid "Click to capture mouse"
-msgstr "Kattintson az egér elfogásához"
-
-msgid "Press F8+F12 to release mouse"
-msgstr "Nyomja meg az F8+F12-t az egér elengédéséhez"
-
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Nyomja meg az F8+F12-t vagy a középső gombot az egér elengédéséhez"
-
-msgid "Bus"
-msgstr "Busz"
-
-msgid "File"
-msgstr "Fájl"
-
-msgid "C"
-msgstr "C"
-
-msgid "H"
-msgstr "H"
-
-msgid "S"
-msgstr "S"
-
-msgid "KB"
-msgstr "KB"
-
-msgid "Could not initialize the video renderer."
-msgstr "Nem sikerült inicializálni a videó megjelenítőt."
-
-msgid "Default"
-msgstr "Alapértelmezett"
-
-msgid "%i Wait state(s)"
-msgstr "%i várakozási ciklus(ok)"
-
-msgid "Type"
-msgstr "Típus"
-
-msgid "Failed to set up PCap"
-msgstr "Nem sikerült a PCap beállítása"
-
-msgid "No PCap devices found"
-msgstr "Nem találhatóak PCap eszközök"
-
-msgid "Invalid PCap device"
-msgstr "Érvénytelen PCap eszköz"
-
-msgid "Standard 2-button joystick(s)"
-msgstr "Szabványos 2-gombos játékvezérlő(k)"
-
-msgid "Standard 4-button joystick"
-msgstr "Szabványos 4-gombos játékvezérlő"
-
-msgid "Standard 6-button joystick"
-msgstr "Szabványos 6-gombos játékvezérlő"
-
-msgid "Standard 8-button joystick"
-msgstr "Szabványos 8-gombos játékvezérlő"
-
-msgid "CH Flightstick Pro"
-msgstr "CH Flightstick Pro"
-
-msgid "Microsoft SideWinder Pad"
-msgstr "Microsoft SideWinder Pad"
-
-msgid "Thrustmaster Flight Control System"
-msgstr "Thrustmaster Flight Control System"
-
-msgid "None"
-msgstr "Nincs"
-
-msgid "Unable to load keyboard accelerators."
-msgstr "Nem lehet betölteni a billentyűzetgyorsítókat."
-
-msgid "Unable to register raw input."
-msgstr "A közvetlen nyers bevitel regisztrálása nem sikerült."
-
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Floppy %i (%s): %ls"
-
-msgid "Advanced sector images"
-msgstr "Továbbfejlesztett szektor képek"
-
-msgid "Flux images"
-msgstr "Flux képekfájlok"
-
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "Az SDL inicializálása nem lehetséges, az SDL2.dll fájl szükséges"
-
-msgid "Are you sure you want to hard reset the emulated machine?"
-msgstr "Biztosan szeretné újraindítani az emulált gépet?"
-
-msgid "Are you sure you want to exit 86Box?"
-msgstr "Biztos benne, hogy ki szeretne lépni a 86Box-ból?"
-
-msgid "Unable to initialize Ghostscript"
-msgstr "Nem sikerült inicializálni a Ghostscript-et"
-
-msgid "MO %i (%ls): %ls"
-msgstr "MO %i (%ls): %ls"
-
-msgid "MO images"
-msgstr "MO-képfájlok"
-
-msgid "Welcome to 86Box!"
-msgstr "Üdvözli önt az 86Box!"
-
-msgid "Internal controller"
-msgstr "Integrált vezérlő"
-
-msgid "Exit"
-msgstr "Kilépés"
-
-msgid "No ROMs found"
-msgstr "Nem találhatóak meg a ROM-képek"
-
-msgid "Do you want to save the settings?"
-msgstr "Szeretné menteni a beállításokat?"
-
-msgid "This will hard reset the emulated machine."
-msgstr "Ezzel hardveresen újraindítja az emulált gépet."
-
-msgid "Save"
-msgstr "Mentés"
-
-msgid "About 86Box"
-msgstr "A 86Box névjegye"
-
-msgid "86Box v"
-msgstr "86Box v"
-
-msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "Régi számítógépek emulátora\n\nFejlesztők: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nFordította: Laci bá'\n\nMegjelent a GNU General Public License v2 vagy újabb alatt. További információért lásd a LICENSE fájlt."
-
-msgid "Hardware not available"
-msgstr "Hardver nem elérhető"
-
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Győződjön meg hogy a(z) libpcap telepítve van és jelenleg a libpcap-kompatibilis kapcsolatot használja."
-
-msgid "Invalid configuration"
-msgstr "Érvénytelen konfiguráció"
-
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
-
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " szükséges a PostScript fájlok PDF formátumba való automatikus konvertálásához.\n\nAz általános PostScript nyomtatóra küldött dokumentumok PostScript (.ps) fájlként kerülnek mentésre."
-
-msgid "Entering fullscreen mode"
-msgstr "Teljes képernyős módra váltás"
-
-msgid "Don't show this message again"
-msgstr "Ne jelenítse meg újra ezt az üzenetet "
-
-msgid "Don't exit"
-msgstr "Ne lépjen ki"
-
-msgid "Reset"
-msgstr "Újraindítás"
-
-msgid "Don't reset"
-msgstr "Ne indítsa újra"
-
-msgid "CD-ROM images"
-msgstr "CD-ROM-képek"
-
-msgid "%hs Device Configuration"
-msgstr "%hs eszközkonfiguráció"
-
-msgid "Monitor in sleep mode"
-msgstr "Képernyő alvó módban"
-
-msgid "OpenGL Shaders"
-msgstr "OpenGL Shaderek"
-
-msgid "OpenGL options"
-msgstr "OpenGL beállítások"
-
-msgid "You are loading an unsupported configuration"
-msgstr "Egy nem támogatott konfigurációt tölt be"
-
-msgid "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
-msgstr "A kiválasztott gépen alapuló CPU-típusszűrés le van tiltva ezen az emulált gépen.\n\nEz lehetővé teszi olyan CPU kiválasztását, amely egyébként nem kompatibilis a kiválasztott géppel. Előfordulhat azonban, hogy nem kompatibilis a gép BIOS-ával vagy más szoftverekkel.\n\nA beállítás engedélyezése hivatalosan nem támogatott, és a benyújtott hibajelentéseket érvénytelenként lezárhatjuk."
-
-msgid "Continue"
-msgstr "Folytatás"
-
-msgid "Cassette: %s"
-msgstr "Magnókazetta: %s"
-
-msgid "Cassette images"
-msgstr "Magnókazetta-képek"
-
-msgid "Cartridge %i: %ls"
-msgstr "ROM-kazetta %i: %ls"
-
-msgid "Cartridge images"
-msgstr "ROM-kazetta képek"
-
-msgid "Error initializing renderer"
-msgstr "Hiba történt a renderelő inicializálásakor"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "Az OpenGL (3.0 Core) megjelenítő-motort nem sikerült inicializálni. Kérem használjon másik renderelőt."
-
-msgid "Resume execution"
-msgstr "Folytassa a végrehajtást"
-
-msgid "Pause execution"
-msgstr "Kivitelezés szüneteltetése"
-
-msgid "Press Ctrl+Alt+Del"
-msgstr "Nyomja meg a Ctrl+Alt+Del"
-
-msgid "Press Ctrl+Alt+Esc"
-msgstr "Nyomja meg a Ctrl+Alt+Esc"
-
-msgid "Hard reset"
-msgstr "Hardveres újraindítás"
-
-msgid "ACPI shutdown"
-msgstr "ACPI leállítás"
-
-msgid "Hard disk (%s)"
-msgstr "Merevlemez (%s)"
-
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
-
-msgid "MFM/RLL or ESDI CD-ROM drives never existed"
-msgstr "MFM/RLL vagy ESDI CD-ROM meghajtók soha nem léteztek"
-
-msgid "Custom..."
-msgstr "Egyéni..."
-
-msgid "Custom (large)..."
-msgstr "Egyéni (nagy)..."
-
-msgid "Add New Hard Disk"
-msgstr "Új merevlemez hozzáadása"
-
-msgid "Add Existing Hard Disk"
-msgstr "Meglévő merevlemez hozzáadása"
-
-msgid "HDI disk images cannot be larger than 4 GB."
-msgstr "A HDI lemezképek nem lehetnek nagyobbak 4 GB-nál."
-
-msgid "Disk images cannot be larger than 127 GB."
-msgstr "A lemezképek mérete nem haladhatja meg a 127 GB-ot."
-
-msgid "Hard disk images"
-msgstr "Merevlemez-képfájlok"
-
-msgid "Unable to read file"
-msgstr "A fájl nem olvasható"
-
-msgid "Unable to write file"
-msgstr "A fájl nem írható"
-
-msgid "HDI or HDX images with a sector size other than 512 are not supported."
-msgstr "Az 512-től eltérő szektorméretű HDI vagy HDX képek nem támogatottak."
-
-msgid "USB is not yet supported"
-msgstr "Az USB még nem támogatott"
-
-msgid "Disk image file already exists"
-msgstr "A lemezképfájl már létezik"
-
-msgid "Please specify a valid file name."
-msgstr "Adjon meg egy érvényes fájlnevet."
-
-msgid "Disk image created"
-msgstr "A lemezképfájl létrehozásra került"
-
-msgid "Make sure the file exists and is readable."
-msgstr "Győződjön meg arról, hogy a fájl létezik és olvasható."
-
-msgid "Make sure the file is being saved to a writable directory."
-msgstr "Győződjön meg arról, hogy a fájlt egy írható könyvtárba menti."
-
-msgid "Disk image too large"
-msgstr "A lemezképfájl túl nagy"
-
-msgid "Remember to partition and format the newly-created drive."
-msgstr "Ne felejtse el particionálni és formázni az újonnan létrehozott meghajtót."
-
-msgid "The selected file will be overwritten. Are you sure you want to use it?"
-msgstr "A kiválasztott fájl felülírásra kerül. Biztos, hogy ezt kívánja használni?"
-
-msgid "Unsupported disk image"
-msgstr "Nem támogatott lemezkép"
-
-msgid "Overwrite"
-msgstr "Felülírás"
-
-msgid "Don't overwrite"
-msgstr "Ne írja felül"
-
-msgid "Raw image (.img)"
-msgstr "Nyers lemezkép (.img)"
-
-msgid "HDI image (.hdi)"
-msgstr "HDI-lemezkép (.hdi)"
-
-msgid "HDX image (.hdx)"
-msgstr "HDX-lemezkép (.hdx)"
-
-msgid "Fixed-size VHD (.vhd)"
-msgstr "Rögzített méretű VHD (.vhd)"
-
-msgid "Dynamic-size VHD (.vhd)"
-msgstr "Dinamikusan bővülő VHD (.vhd)"
-
-msgid "Differencing VHD (.vhd)"
-msgstr "Különbség-VHD (.vhd)"
-
-msgid "Large blocks (2 MB)"
-msgstr "Nagy blokkméret (2 MB)"
-
-msgid "Small blocks (512 KB)"
-msgstr "Kis blokkméret (512 KB)"
-
-msgid "VHD files"
-msgstr "VHD fájlok"
-
-msgid "Select the parent VHD"
-msgstr "Válassza ki a szülő VHD-t"
-
-msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
-msgstr "Ez azt jelentheti, hogy a szülőkép módosult az eltérő kép létrehozása után.\n\nEz akkor is előfordulhat, ha a képfájlokat áthelyezték vagy másolták, vagy a lemezt létrehozó program hibája miatt.\n\nSzeretné kijavítani az időbélyegeket?"
-
-msgid "Parent and child disk timestamps do not match"
-msgstr "A szülő- és a gyermeklemez időbélyegei nem egyeznek"
-
-msgid "Could not fix VHD timestamp."
-msgstr "Nem sikerült kijavítani a VHD időbélyegét."
-
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
-
-msgid "MFM/RLL"
-msgstr "MFM/RLL"
-
-msgid "XTA"
-msgstr "XTA"
-
-msgid "ESDI"
-msgstr "ESDI"
-
-msgid "IDE"
-msgstr "IDE"
-
-msgid "ATAPI"
-msgstr "ATAPI"
-
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
-
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
-
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
-
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
-
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
-
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
-
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
-
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
-
-msgid "1.2 MB"
-msgstr "1.2 MB"
-
-msgid "1.25 MB"
-msgstr "1.25 MB"
-
-msgid "1.44 MB"
-msgstr "1.44 MB"
-
-msgid "DMF (cluster 1024)"
-msgstr "DMF (1024 klaszter)"
-
-msgid "DMF (cluster 2048)"
-msgstr "DMF (2048 klaszter)"
-
-msgid "2.88 MB"
-msgstr "2.88 MB"
-
-msgid "ZIP 100"
-msgstr "ZIP 100"
-
-msgid "3.5\" 128 MB (ISO 10090)"
-msgstr "3.5\" 128 MB (ISO 10090)"
-
-msgid "3.5\" 230 MB (ISO 13963)"
-msgstr "3.5\" 230 MB (ISO 13963)"
-
-msgid "3.5\" 540 MB (ISO 15498)"
-msgstr "3.5\" 540 MB (ISO 15498)"
-
-msgid "3.5\" 640 MB (ISO 15498)"
-msgstr "3.5\" 640 MB (ISO 15498)"
-
-msgid "3.5\" 1.3 GB (GigaMO)"
-msgstr "3.5\" 1.3 GB (GigaMO)"
-
-msgid "3.5\" 2.3 GB (GigaMO 2)"
-msgstr "3.5\" 2.3 GB (GigaMO 2)"
-
-msgid "5.25\" 600 MB"
-msgstr "5.25\" 600 MB"
-
-msgid "5.25\" 650 MB"
-msgstr "5.25\" 650 MB"
-
-msgid "5.25\" 1 GB"
-msgstr "5.25\" 1 GB"
-
-msgid "5.25\" 1.3 GB"
-msgstr "5.25\" 1.3 GB"
-
-msgid "Perfect RPM"
-msgstr "Tökéletes RPM"
-
-msgid "1% below perfect RPM"
-msgstr "1%-kal a tökéletes RPM alatt"
-
-msgid "1.5% below perfect RPM"
-msgstr "1.5%-kal a tökéletes RPM alatt"
-
-msgid "2% below perfect RPM"
-msgstr "2%-kal a tökéletes RPM alatt"
-
-msgid "(System Default)"
-msgstr "(A rendszer nyelve)"
-
-msgid "Failed to initialize network driver"
-msgstr "Nem sikerült inicializálni a hálózati illesztőprogramot"
-
-msgid "The network configuration will be switched to the null driver"
-msgstr "A hálózati konfiguráció átvált a null illesztőprogramra"
-
-msgid "Mouse sensitivity:"
-msgstr "Egér érzékenység:"
-
-msgid "Select media images from program working directory"
-msgstr "Médiaképek kiválasztása a program munkakönyvtárából"
-
-msgid "PIT mode:"
-msgstr "PIT üzemmód:"
-
-msgid "Auto"
-msgstr "Automatikus"
-
-msgid "Slow"
-msgstr "Lassú"
-
-msgid "Fast"
-msgstr "Gyors"
-
-msgid "&Auto-pause on focus loss"
-msgstr "&Automatikus szünet fókuszvesztéskor"
diff --git a/src/qt/languages/it-IT.po b/src/qt/languages/it-IT.po
index 334ecadaa..f0806bf7b 100644
--- a/src/qt/languages/it-IT.po
+++ b/src/qt/languages/it-IT.po
@@ -1,3 +1,11 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: it_IT\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
 msgstr "&Azione"
 
@@ -5,13 +13,13 @@ msgid "&Keyboard requires capture"
 msgstr "&Tastiera richiede la cattura"
 
 msgid "&Right CTRL is left ALT"
-msgstr "&CTRL destro è ALT sinistro"
+msgstr "CTRL &destro è ALT sinistro"
 
 msgid "&Hard Reset..."
 msgstr "&Riavvia..."
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Ctrl+Alt+Del\tCtrl+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "&Ctrl+Alt+Canc"
 
 msgid "Ctrl+Alt+&Esc"
 msgstr "Ctrl+Alt+&Esc"
@@ -19,17 +27,23 @@ msgstr "Ctrl+Alt+&Esc"
 msgid "&Pause"
 msgstr "&Pausa"
 
-msgid "E&xit..."
-msgstr "E&sci..."
+msgid "Pause"
+msgstr "Pausa"
+
+msgid "Re&sume"
+msgstr "R&iprendi"
+
+msgid "E&xit"
+msgstr "E&sci"
 
 msgid "&View"
 msgstr "&Visualizza"
 
 msgid "&Hide status bar"
-msgstr "&Nascondi barra di stato"
+msgstr "Nascondi ba&rra di stato"
 
 msgid "Hide &toolbar"
-msgstr "Hide &toolbar"
+msgstr "Nascondi &barra degli strumenti"
 
 msgid "&Resizeable window"
 msgstr "&Finestra ridimensionabile"
@@ -38,16 +52,10 @@ msgid "R&emember size && position"
 msgstr "R&icorda dimensioni e posizione"
 
 msgid "Re&nderer"
-msgstr "Re&nderer"
+msgstr "Re&nderizzatore"
 
-msgid "&SDL (Software)"
-msgstr "&SDL (Software)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (&Hardware)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
+msgid "&Qt (Software)"
+msgstr "&Qt (Software)"
 
 msgid "Open&GL (3.0 Core)"
 msgstr "Open&GL (3.0 Core)"
@@ -55,23 +63,23 @@ msgstr "Open&GL (3.0 Core)"
 msgid "&VNC"
 msgstr "&VNC"
 
-msgid "Specify dimensions..."
-msgstr "Specifica dimensioni..."
+msgid "Specify &dimensions..."
+msgstr "Specifica dim&ensioni..."
 
-msgid "F&orce 4:3 display ratio"
-msgstr "F&orza display 4:3"
+msgid "Force &4:3 display ratio"
+msgstr "Forza rapporto d'aspetto &4:3"
 
 msgid "&Window scale factor"
-msgstr "&Fattore scalare della finestra"
+msgstr "Fa&ttore di scala della finestra"
 
 msgid "&0.5x"
-msgstr "&0.5x"
+msgstr "&0,5x"
 
 msgid "&1x"
 msgstr "&1x"
 
 msgid "1.&5x"
-msgstr "1.&5x"
+msgstr "1,&5x"
 
 msgid "&2x"
 msgstr "&2x"
@@ -94,11 +102,11 @@ msgstr "&7x"
 msgid "&8x"
 msgstr "&8x"
 
-msgid "Filter method"
-msgstr "Metodo filtro"
+msgid "Fi&lter method"
+msgstr "Metodo fi&ltro"
 
 msgid "&Nearest"
-msgstr "&Dal più vicino"
+msgstr "&Più vicino"
 
 msgid "&Linear"
 msgstr "&Lineare"
@@ -106,11 +114,11 @@ msgstr "&Lineare"
 msgid "Hi&DPI scaling"
 msgstr "Scala Hi&DPI"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "&Schermo intero\tCtrl+Alt+PgUp"
+msgid "&Fullscreen"
+msgstr "&Schermo intero"
 
 msgid "Fullscreen &stretch mode"
-msgstr "Modalità adattamento &schermo intero"
+msgstr "Modalità &adattamento schermo intero"
 
 msgid "&Full screen stretch"
 msgstr "&Adatta a schermo intero"
@@ -119,7 +127,7 @@ msgid "&4:3"
 msgstr "&4:3"
 
 msgid "&Square pixels (Keep ratio)"
-msgstr "&Pixel quadrati (mantiene l'aspetto)"
+msgstr "&Pixel quadrati (mantieni proporzioni)"
 
 msgid "&Integer scale"
 msgstr "&Scala intera"
@@ -127,32 +135,38 @@ msgstr "&Scala intera"
 msgid "4:&3 Integer scale"
 msgstr "Scala intera 4:&3"
 
-msgid "E&GA/(S)VGA settings"
-msgstr "Impostazioni E&GA/(S)VGA"
+msgid "EGA/(S)&VGA settings"
+msgstr "Impostazioni EGA/(S)&VGA"
 
 msgid "&Inverted VGA monitor"
-msgstr "&Invertire monitor VGA"
+msgstr "&Monitor VGA invertito"
 
 msgid "VGA screen &type"
-msgstr "Schermi VGA &"
+msgstr "Schermi &VGA"
 
 msgid "RGB &Color"
-msgstr "RGB &Color"
+msgstr "RGB a &Colori"
+
+msgid "RGB (no brown)"
+msgstr "RGB (senza marrone)"
 
 msgid "&RGB Grayscale"
-msgstr "&RGB Monocroma"
+msgstr "&RGB a Scala di grigi"
+
+msgid "Generic RGBI color monitor"
+msgstr "Monitor a colori RGBI generico"
 
 msgid "&Amber monitor"
-msgstr "&Monitor ambra"
+msgstr "Monitor &ambra"
 
 msgid "&Green monitor"
-msgstr "&Monitor verde"
+msgstr "Monitor &verde"
 
 msgid "&White monitor"
-msgstr "&Monitor bianco"
+msgstr "Monitor &bianco"
 
 msgid "Grayscale &conversion type"
-msgstr "Conversione &scala grigia"
+msgstr "Conversione &scala di grigi"
 
 msgid "BT&601 (NTSC/PAL)"
 msgstr "BT&601 (NTSC/PAL)"
@@ -161,13 +175,13 @@ msgid "BT&709 (HDTV)"
 msgstr "BT&709 (HDTV)"
 
 msgid "&Average"
-msgstr "&AMedia"
+msgstr "&Media"
 
 msgid "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
 msgstr "Sovrascansione CGA/PCjr/Tandy/E&GA/(S)VGA"
 
 msgid "Change contrast for &monochrome display"
-msgstr "Cambia il contrasto per &display monocromatici"
+msgstr "Modifica il contrasto per schermi &monocromatici"
 
 msgid "&Media"
 msgstr "&Dispositivi"
@@ -178,29 +192,35 @@ msgstr "&Strumenti"
 msgid "&Settings..."
 msgstr "&Impostazioni..."
 
+msgid "Settings..."
+msgstr "Impostazioni..."
+
 msgid "&Update status bar icons"
 msgstr "&Aggiorna icone della barra di stato"
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "Cattura schermata\tCtrl+F11"
+msgid "Take s&creenshot"
+msgstr "&Cattura schermata"
+
+msgid "S&ound"
+msgstr "A&udio"
 
 msgid "&Preferences..."
 msgstr "&Preferenze..."
 
 msgid "Enable &Discord integration"
-msgstr "Abilita &integrazione Discord"
+msgstr "Abilita integrazione &Discord"
 
 msgid "Sound &gain..."
 msgstr "Guadagno &suono..."
 
-msgid "Begin trace\tCtrl+T"
-msgstr "Inizia traccia\tCtrl+T"
+msgid "Begin trace"
+msgstr "Inizio traccia"
 
-msgid "End trace\tCtrl+T"
-msgstr "Ferma traccia\tCtrl+T"
+msgid "End trace"
+msgstr "Fine traccia"
 
 msgid "&Help"
-msgstr "&?"
+msgstr "Ai&uto"
 
 msgid "&Documentation..."
 msgstr "&Documentazione..."
@@ -227,7 +247,7 @@ msgid "&Rewind to the beginning"
 msgstr "Ri&avvolgi all'inizio"
 
 msgid "&Fast forward to the end"
-msgstr "A&vanti veloce alla fine"
+msgstr "A&vanti veloce fino alla fine"
 
 msgid "E&ject"
 msgstr "&Espelli"
@@ -244,14 +264,14 @@ msgstr "&Muto"
 msgid "E&mpty"
 msgstr "&Espelli"
 
-msgid "&Reload previous image"
-msgstr "&Ricarica l'immagine precedente"
+msgid "Reload previous image"
+msgstr "Ricarica l'immagine precedente"
 
 msgid "&Folder..."
 msgstr "&Cartella..."
 
 msgid "Target &framerate"
-msgstr "Imposta obiettivo &fotogrammi"
+msgstr "Obiettivo &fotogrammi"
 
 msgid "&Sync with video"
 msgstr "&Sincronizza col video"
@@ -272,7 +292,7 @@ msgid "&75 fps"
 msgstr "&75 FPS"
 
 msgid "&VSync"
-msgstr "&VSync"
+msgstr "Sincronizzazione &verticale"
 
 msgid "&Select shader..."
 msgstr "&Seleziona shader..."
@@ -284,7 +304,7 @@ msgid "Preferences"
 msgstr "Preferenze"
 
 msgid "Sound Gain"
-msgstr "Guadagno del suono"
+msgstr "Guadagno suono"
 
 msgid "New Image"
 msgstr "Nuova immagine"
@@ -301,18 +321,12 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Annulla"
 
-msgid "Save these settings as &global defaults"
-msgstr "Salva queste impostazioni come &predefinite globali"
-
 msgid "&Default"
 msgstr "&Predefinito"
 
 msgid "Language:"
 msgstr "Lingua:"
 
-msgid "Icon set:"
-msgstr "Pacchetto di icone:"
-
 msgid "Gain"
 msgstr "Guadagno"
 
@@ -335,22 +349,25 @@ msgid "Height:"
 msgstr "Altezza:"
 
 msgid "Lock to this size"
-msgstr "Blocca in queste dimensioni"
+msgstr "Blocca su questa dimensione"
 
 msgid "Machine type:"
-msgstr "Tipo di piastra madre:"
+msgstr "Tipo di macchina:"
 
 msgid "Machine:"
-msgstr "Piastra madre:"
+msgstr "Macchina:"
 
 msgid "Configure"
 msgstr "Configura"
 
+msgid "CPU:"
+msgstr "CPU:"
+
 msgid "CPU type:"
-msgstr "Tipo del CPU:"
+msgstr "Tipo di CPU:"
 
 msgid "Speed:"
-msgstr "Veloc.:"
+msgstr "Velocità:"
 
 msgid "Frequency:"
 msgstr "Frequenza:"
@@ -371,35 +388,62 @@ msgid "Time synchronization"
 msgstr "Sincronizzazione dell'ora"
 
 msgid "Disabled"
-msgstr "Disabilitata"
+msgstr "Disabilitato"
 
 msgid "Enabled (local time)"
-msgstr "Abilitata (ora locale)"
+msgstr "Abilitato (ora locale)"
 
 msgid "Enabled (UTC)"
-msgstr "Abilitata (UTC)"
+msgstr "Abilitato (UTC)"
 
 msgid "Dynamic Recompiler"
 msgstr "Ricompilatore dinamico"
 
+msgid "CPU frame size"
+msgstr "Dimensione blocchi CPU"
+
+msgid "Larger frames (less smooth)"
+msgstr "Blocchi più grandi (meno fluido)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Blocchi più piccoli (più fluido)"
+
 msgid "Video:"
 msgstr "Video:"
 
-msgid "Voodoo Graphics"
-msgstr "Grafica Voodoo"
+msgid "Video #2:"
+msgstr "Video #2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Scheda grafica Voodoo 1 o 2"
 
 msgid "IBM 8514/A Graphics"
-msgstr "Grafica IBM 8514/A"
+msgstr "Scheda grafica IBM 8514/A"
 
 msgid "XGA Graphics"
-msgstr "Grafica XGA"
+msgstr "Scheda grafica XGA"
+
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "Scheda grafica IBM PS/55 Display Adapter"
+
+msgid "Keyboard:"
+msgstr "Tastiera:"
+
+msgid "Keyboard"
+msgstr "Tastiera"
 
 msgid "Mouse:"
 msgstr "Mouse:"
 
+msgid "Mouse"
+msgstr "Mouse"
+
 msgid "Joystick:"
 msgstr "Joystick:"
 
+msgid "Joystick"
+msgstr "Joystick"
+
 msgid "Joystick 1..."
 msgstr "Joystick 1..."
 
@@ -413,25 +457,28 @@ msgid "Joystick 4..."
 msgstr "Joystick 4..."
 
 msgid "Sound card #1:"
-msgstr "Scheda audio 1:"
+msgstr "Scheda audio #1:"
 
 msgid "Sound card #2:"
-msgstr "Scheda audio 2:"
+msgstr "Scheda audio #2:"
 
 msgid "Sound card #3:"
-msgstr "Scheda audio 3:"
+msgstr "Scheda audio #3:"
 
 msgid "Sound card #4:"
-msgstr "Scheda audio 4:"
+msgstr "Scheda audio #4:"
 
 msgid "MIDI Out Device:"
-msgstr "Uscita MIDI:"
+msgstr "Dispositivo uscita MIDI:"
 
 msgid "MIDI In Device:"
-msgstr "Entrata MIDI:"
+msgstr "Dispositivo ingresso MIDI:"
+
+msgid "MIDI Out:"
+msgstr "Uscita MIDI:"
 
 msgid "Standalone MPU-401"
-msgstr "MPU-401 autonomo"
+msgstr "Scheda dedicata MPU-401"
 
 msgid "Use FLOAT32 sound"
 msgstr "Usa suono FLOAT32"
@@ -445,15 +492,6 @@ msgstr "Nuked (più accurato)"
 msgid "YMFM (faster)"
 msgstr "YMFM (più veloce)"
 
-msgid "Network type:"
-msgstr "Tipo di rete:"
-
-msgid "PCap device:"
-msgstr "Dispositivo PCap:"
-
-msgid "Network adapter:"
-msgstr "Scheda di rete:"
-
 msgid "COM1 Device:"
 msgstr "Dispositivo COM1:"
 
@@ -478,6 +516,9 @@ msgstr "Dispositivo LPT3:"
 msgid "LPT4 Device:"
 msgstr "Dispositivo LPT4:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr "DMA LPT ECP interna"
+
 msgid "Serial port 1"
 msgstr "Porta seriale 1"
 
@@ -502,18 +543,21 @@ msgstr "Porta parallela 3"
 msgid "Parallel port 4"
 msgstr "Porta parallela 4"
 
-msgid "HD Controller:"
-msgstr "Controller HD:"
-
 msgid "FD Controller:"
 msgstr "Controller FD:"
 
+msgid "CD-ROM Controller:"
+msgstr "Controller CD-ROM:"
+
 msgid "Tertiary IDE Controller"
 msgstr "Controller IDE terziario"
 
 msgid "Quaternary IDE Controller"
 msgstr "Controller IDE quaternario"
 
+msgid "Hard disk"
+msgstr "Disco rigido"
+
 msgid "SCSI"
 msgstr "SCSI"
 
@@ -533,7 +577,10 @@ msgid "Cassette"
 msgstr "Cassetta"
 
 msgid "Hard disks:"
-msgstr "Hard disk:"
+msgstr "Dischi rigidi:"
+
+msgid "Firmware Version"
+msgstr "Versione firmware"
 
 msgid "&New..."
 msgstr "&Nuovo..."
@@ -542,7 +589,7 @@ msgid "&Existing..."
 msgstr "&Esistente..."
 
 msgid "&Remove"
-msgstr "&Rimouvi"
+msgstr "&Rimuovi"
 
 msgid "Bus:"
 msgstr "Bus:"
@@ -589,14 +636,17 @@ msgstr "Verifica BPB"
 msgid "CD-ROM drives:"
 msgstr "Unità CD-ROM:"
 
-msgid "Earlier drive"
-msgstr "Unità anteriore"
-
 msgid "MO drives:"
 msgstr "Unità magneto-ottiche:"
 
-msgid "ZIP drives:"
-msgstr "Unità ZIP:"
+msgid "MO:"
+msgstr "Magneto-ottiche:"
+
+msgid "Removable disks:"
+msgstr "Dischi rimovibili:"
+
+msgid "Removable disk drives:"
+msgstr "Unità disco rimovibili:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
@@ -607,6 +657,9 @@ msgstr "RTC ISA:"
 msgid "ISA Memory Expansion"
 msgstr "Espansione memoria ISA"
 
+msgid "ISA ROM Cards"
+msgstr "Schede ROM ISA"
+
 msgid "Card 1:"
 msgstr "Scheda 1:"
 
@@ -619,17 +672,20 @@ msgstr "Scheda 3:"
 msgid "Card 4:"
 msgstr "Scheda 4:"
 
+msgid "Generic ISA ROM Board"
+msgstr "Scheda ROM ISA generica"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "Scheda Dual ROM ISA generica"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "Scheda Quad ROM ISA generica"
+
 msgid "ISABugger device"
 msgstr "Dispositivo ISABugger"
 
 msgid "POST card"
-msgstr "Scheda POST"
-
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
+msgstr "Scheda di diagnostica"
 
 msgid "86Box"
 msgstr "86Box"
@@ -641,25 +697,28 @@ msgid "Fatal error"
 msgstr "Errore fatale"
 
 msgid " - PAUSED"
-msgstr " - PAUSED"
-
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Usa Ctrl+Alt+PgDn per tornare alla modalità finestra."
+msgstr " - IN PAUSA"
 
 msgid "Speed"
 msgstr "Velocità"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "Disco rimovibile %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "Immagini ZIP"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "&Disco rimovibile %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Immagini dischi rimovibili"
+
+msgid "Image %1"
+msgstr "Immagine %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
-msgstr "86Box non può trovare immagini ROM utilizzabili.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
+msgstr "86Box non è in grado di trovare immagini ROM utilizzabili.\n\nSi prega di <a href=\"https://github.com/86Box/roms/releases/latest\">scaricare</a> un set di ROM ed estrarlo nella cartella \"roms\"."
 
 msgid "(empty)"
-msgstr "(empty)"
+msgstr "(vuoto)"
 
 msgid "All files"
 msgstr "Tutti i file"
@@ -683,19 +742,25 @@ msgid "Surface images"
 msgstr "Immagini di superficie"
 
 msgid "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
-msgstr "La macchina \"%hs\" non è disponibile a causa di immagini ROM mancanti nella directory roms/machines. Cambiando ad una macchina disponibile."
+msgstr "La macchina \"%hs\" non è disponibile a causa di immagini ROM mancanti nella directory roms/machines. Passaggio ad una macchina disponibile."
 
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
-msgstr "La scheda video \"%hs\" non è disponibile a causa di immagini ROM mancanti nella directory roms/video. Cambiando ad una scheda video disponibile."
+msgstr "La scheda video \"%hs\" non è disponibile a causa di immagini ROM mancanti nella directory roms/video. Passaggio ad una scheda video disponibile."
+
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "La scheda video 2 \"%hs\" non è disponibile a causa di immagini ROM mancanti nella directory roms/video. Disabilitazione della seconda scheda video."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "Il dispositivo \"%hs\" non è disponibile a causa di immagini ROM mancanti. Dispositivo ignorato."
 
 msgid "Machine"
-msgstr "Piastra madre"
+msgstr "Macchina"
 
 msgid "Display"
 msgstr "Schermo"
 
 msgid "Input devices"
-msgstr "Dispositivi di entrata"
+msgstr "Dispositivi di ingresso"
 
 msgid "Sound"
 msgstr "Audio"
@@ -704,31 +769,52 @@ msgid "Network"
 msgstr "Rete"
 
 msgid "Ports (COM & LPT)"
-msgstr "Porte (COM & LPT)"
+msgstr "Porte (COM e LPT)"
+
+msgid "Ports"
+msgstr "Porte"
+
+msgid "Serial ports:"
+msgstr "Porte seriali:"
+
+msgid "Parallel ports:"
+msgstr "Porte parallele:"
 
 msgid "Storage controllers"
-msgstr "Controller memoria"
+msgstr "Controller di archiviazione"
 
 msgid "Hard disks"
-msgstr "Hard disk"
+msgstr "Dischi rigidi"
+
+msgid "Disks:"
+msgstr "Dischi:"
+
+msgid "Floppy:"
+msgstr "Floppy:"
+
+msgid "Controllers:"
+msgstr "Controller:"
 
 msgid "Floppy & CD-ROM drives"
 msgstr "Unità CD-ROM e Floppy"
 
 msgid "Other removable devices"
-msgstr "Altri dispositivi rimuovibili"
+msgstr "Altri dispositivi rimovibili"
 
 msgid "Other peripherals"
 msgstr "Altre periferiche"
 
+msgid "Other devices"
+msgstr "Altri dispositivi"
+
 msgid "Click to capture mouse"
-msgstr "Fare clic per catturare mouse"
+msgstr "Fare clic per catturare il mouse"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "Premi F8+F12 per rilasciare il mouse"
+msgid "Press %1 to release mouse"
+msgstr "Premi %1 per rilasciare il mouse"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Premi F8+F12 o pulsante centrale per rilasciare il mouse"
+msgid "Press %1 or middle button to release mouse"
+msgstr "Premi %1 o pulsante centrale per rilasciare il mouse"
 
 msgid "Bus"
 msgstr "Bus"
@@ -740,7 +826,7 @@ msgid "C"
 msgstr "C"
 
 msgid "H"
-msgstr "H"
+msgstr "T"
 
 msgid "S"
 msgstr "S"
@@ -748,74 +834,95 @@ msgstr "S"
 msgid "KB"
 msgstr "KB"
 
-msgid "Could not initialize the video renderer."
-msgstr "Impossibile inizializzare il renderer video."
-
 msgid "Default"
 msgstr "Predefinito"
 
-msgid "%i Wait state(s)"
-msgstr "%i stati d'attesa"
+msgid "%1 Wait state(s)"
+msgstr "%1 stato/i d'attesa"
 
 msgid "Type"
 msgstr "Tipo"
 
-msgid "Failed to set up PCap"
-msgstr "Impossibile impostare PCap"
-
 msgid "No PCap devices found"
 msgstr "Nessun dispositivo PCap trovato"
 
 msgid "Invalid PCap device"
-msgstr "Dispositivo PCap invalido"
+msgstr "Dispositivo PCap non valido"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "Joystick comune da 2 pulsanti"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "Joystick a 2 assi, 2 pulsanti"
 
-msgid "Standard 4-button joystick"
-msgstr "Joystick comune da 4 pulsanti"
+msgid "2-axis, 4-button joystick"
+msgstr "Joystick a 2 assi, 4 pulsanti"
 
-msgid "Standard 6-button joystick"
-msgstr "Joystick comune da 6 pulsanti"
+msgid "2-axis, 6-button joystick"
+msgstr "Joystick a 2 assi, 6 pulsanti"
 
-msgid "Standard 8-button joystick"
-msgstr "Joystick comune da 8 pulsanti"
+msgid "2-axis, 8-button joystick"
+msgstr "Joystick a 2 assi, 8 pulsanti"
+
+msgid "3-axis, 2-button joystick"
+msgstr "Joystick a 3 assi, 2 pulsanti"
+
+msgid "3-axis, 4-button joystick"
+msgstr "Joystick a 3 assi, 4 pulsanti"
+
+msgid "4-axis, 4-button joystick"
+msgstr "Joystick a 4 assi, 4 pulsanti"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + Pedali CH"
+
 msgid "Microsoft SideWinder Pad"
-msgstr "Microsoft SideWinder Pad"
+msgstr "Microsoft SideWinder"
 
 msgid "Thrustmaster Flight Control System"
-msgstr "Thrustmaster Flight Control System"
+msgstr "Sistema di controllo Thrustmaster Flight"
+
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Sistema di controllo timone"
+
+msgid "2-button gamepad(s)"
+msgstr "Gamepad a 2 pulsanti"
+
+msgid "2-button flight yoke"
+msgstr "Barra di comando a 2 pulsanti"
+
+msgid "4-button gamepad"
+msgstr "Gamepad a 4 pulsanti"
+
+msgid "4-button flight yoke"
+msgstr "Barra di comando a 4 pulsanti"
+
+msgid "2-button flight yoke with throttle"
+msgstr "Barra di comando a 2 pulsanti con acceleratore"
+
+msgid "4-button flight yoke with throttle"
+msgstr "Barra di comando a 4 pulsanti con acceleratore"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Volante Win95 (3 assi, 4 pulsanti)"
 
 msgid "None"
 msgstr "Nessuno"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "Impossibile caricare gli acceleratori da tastiera."
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CTS: %2, %3, %4)"
 
-msgid "Unable to register raw input."
-msgstr "Impossibile registrare input raw."
+msgid "Floppy %1 (%2): %3"
+msgstr "Floppy %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Floppy %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "&Floppy %1 (%2): %3"
 
 msgid "Advanced sector images"
-msgstr "Immagini da settori avanzati"
+msgstr "Immagini di settore avanzate"
 
 msgid "Flux images"
-msgstr "Immagini flusso"
-
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "Impossibile inizializzare SDL, SDL2.dll è necessario"
+msgstr "Immagini di flusso"
 
 msgid "Are you sure you want to hard reset the emulated machine?"
 msgstr "Sei sicuro di voler riavviare la macchina emulata?"
@@ -826,26 +933,41 @@ msgstr "Sei sicuro di voler uscire da 86Box?"
 msgid "Unable to initialize Ghostscript"
 msgstr "Impossibile inizializzare Ghostscript"
 
-msgid "MO %i (%ls): %ls"
-msgstr "MO %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "Impossibile inizializzare GhostPCL"
+
+msgid "MO %1 (%2): %3"
+msgstr "magneto-ottico %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&magneto-ottico %1 (%2): %3"
 
 msgid "MO images"
-msgstr "Immagini MO"
+msgstr "Immagini magneto-ottiche"
 
 msgid "Welcome to 86Box!"
 msgstr "Benvenuti in 86Box!"
 
-msgid "Internal controller"
-msgstr "Controller interno"
+msgid "Internal device"
+msgstr "Dispositivo integrato"
+
+msgid "&File"
+msgstr "&File"
+
+msgid "&New machine..."
+msgstr "&Nuova macchina..."
+
+msgid "&Check for updates..."
+msgstr "&Controlla gli aggiornamenti..."
 
 msgid "Exit"
 msgstr "Esci"
 
 msgid "No ROMs found"
-msgstr "Nessune immagini ROM trovate"
+msgstr "Nessuna ROM trovata"
 
 msgid "Do you want to save the settings?"
-msgstr "Vuole salvare queste impostazioni?"
+msgstr "Vuoi salvare le impostazioni?"
 
 msgid "This will hard reset the emulated machine."
 msgstr "Questo riavvierà la macchina emulata."
@@ -860,34 +982,22 @@ msgid "86Box v"
 msgstr "86Box v"
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "Un emulatore di computer vecchi\n\nAutori: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nTradotto da: explorerdotexe\n\nRilasciato sotto la Licenza Pubblica GNU versione 2 o dopo. Vedi LICENSE per maggior informazioni."
+msgstr "Un emulatore di vecchi computer\n\nAutori: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne e altri.\n\nCon i precedenti contributi fondamentali di Sarah Walker, leilei, JohnElliott, greatpsycho e altri.\n\nRilasciato sotto la Licenza Pubblica Generale GNU versione 2 o successiva. Per ulteriori informazioni, consultare il file LICENSE."
 
 msgid "Hardware not available"
 msgstr "Hardware non disponibile"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Controllare se libpcap è installato e che tu sia connesso ad una connessione libpcap compatibile."
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "Assicurati che %1 sia installato e che la connessione di rete sia compatibile con %1."
 
 msgid "Invalid configuration"
-msgstr "Configurazione invalida"
+msgstr "Configurazione non valida"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 è richiesto per la conversione automatica di file PostScript in PDF.\n\nQualsiasi documento inviato alla stampante PostScript generica verrà salvato come file PostScript (.ps)."
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " è richiesto per la conversione automatica di file PostScript a file PDF.\n\nQualsiasi documento mandato alla stampante generica PostScript sarà salvato come file PostScript. (.ps)"
-
-msgid "Entering fullscreen mode"
-msgstr "Entrando nella modalità schermo intero"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 è richiesto per la conversione automatica di file PCL in PDF.\n\nQualsiasi documento inviato alla stampante PCL generica verrà salvato come file Printer Command Language (.pcl)."
 
 msgid "Don't show this message again"
 msgstr "Non mostrare più questo messaggio"
@@ -904,50 +1014,50 @@ msgstr "Non riavviare"
 msgid "CD-ROM images"
 msgstr "Immagini CD-ROM"
 
-msgid "%hs Device Configuration"
-msgstr "Configurazione del dispositivo %hs"
+msgid "%1 Device Configuration"
+msgstr "Configurazione del dispositivo %1"
 
 msgid "Monitor in sleep mode"
 msgstr "Monitor in modalità riposo"
 
-msgid "OpenGL Shaders"
-msgstr "Shader OpenGL"
-
-msgid "OpenGL options"
-msgstr "Impostazioni OpenGL"
+msgid "GLSL shaders"
+msgstr "Shader GLSL"
 
 msgid "You are loading an unsupported configuration"
 msgstr "Stai caricando una configurazione non supportata"
 
 msgid "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
-msgstr "Il filtraggio della tipologia di CPU è disabilitato per la macchina selezionata.\n\nQuesto lo rende possibile scegliere un CPU che è altrimenti incompatibile con la macchina selezionata. Tuttavia, portresti incorrere in incompatibilità con il BIOS della macchina o altri programmi. \n\nL'abilitare di questa impostazione non è ufficialmente supportato e tutte le segnalazioni di errori saranno considerate invalide."
+msgstr "Il filtro del tipo di CPU in base alla macchina selezionata è disabilitato.\n\nCiò consente di scegliere una CPU altrimenti incompatibile con la macchina selezionata. Tuttavia, potrebbero verificarsi incompatibilità con il BIOS della macchina o con altri programmi. \n\nL'abilitazione di questa impostazione non è ufficialmente supportata e qualsiasi segnalazione di errore potrebbe essere chiusa come non valida."
 
 msgid "Continue"
 msgstr "Continua"
 
-msgid "Cassette: %s"
-msgstr "Cassetta: %s"
+msgid "Cassette: %1"
+msgstr "Cassetta: %1"
+
+msgid "C&assette: %1"
+msgstr "C&assetta: %1"
 
 msgid "Cassette images"
 msgstr "Immagini cassetta"
 
-msgid "Cartridge %i: %ls"
-msgstr "Cartuccia %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "Cartuccia %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "Car&tuccia %1: %2"
 
 msgid "Cartridge images"
 msgstr "Immagini cartuccia"
 
-msgid "Error initializing renderer"
-msgstr "Errore nell'inizializzazione del renderer"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "Non è stato possibile inizializzare il renderer OpenGL (3.0 Core). Utilizzare un altro renderer."
-
 msgid "Resume execution"
-msgstr "Riprendere l'esecuzione"
+msgstr "Riprendi l'esecuzione"
 
 msgid "Pause execution"
-msgstr "Sospendere l'esecuzione"
+msgstr "Sospendi l'esecuzione"
+
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Canc"
 
 msgid "Press Ctrl+Alt+Del"
 msgstr "Premere Ctrl+Alt+Canc"
@@ -958,20 +1068,284 @@ msgstr "Premere Ctrl+Alt+Esc"
 msgid "Hard reset"
 msgstr "Riavvia"
 
+msgid "Force shutdown"
+msgstr "Forza arresto"
+
+msgid "Start"
+msgstr "Avvia"
+
+msgid "Not running"
+msgstr "Inattivo"
+
+msgid "Running"
+msgstr "In esecuzione"
+
+msgid "Paused"
+msgstr "In pausa"
+
+msgid "Waiting"
+msgstr "In attesa"
+
+msgid "Powered Off"
+msgstr "Spento"
+
+msgid "%n running"
+msgstr "%n in esecuzione"
+
+msgid "%n paused"
+msgstr "%n in pausa"
+
+msgid "%n waiting"
+msgstr "%n in attesa"
+
+msgid "%1 total"
+msgstr "%1 totale"
+
+msgid "VMs: %1"
+msgstr "Macchine virtuali: %1"
+
+msgid "System Directory:"
+msgstr "Directory Sistema:"
+
+msgid "Choose directory"
+msgstr "Scegli la directory"
+
+msgid "Choose configuration file"
+msgstr "Scegli il file di configurazione"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "File di configurazione di 86Box (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Lettura del file di configurazione non riuscita"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "Impossibile aprire il file di configurazione selezionato per la lettura: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "Utilizza espressioni regolari nella casella di ricerca"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "Sono attualmente attive %1 macchina/e. Vuoi comunque uscire dal gestore delle macchine virtuali?"
+
+msgid "Add new system wizard"
+msgstr "Procedura guidata nuovo sistema"
+
+msgid "Introduction"
+msgstr "Introduzione"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "Questo ti aiuterà ad aggiungere un nuovo sistema ad 86Box."
+
+msgid "New configuration"
+msgstr "Nuova configurazione"
+
+msgid "Complete"
+msgstr "Completamento"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "La procedura guidata avvierà ora la configurazione del nuovo sistema."
+
+msgid "Use existing configuration"
+msgstr "Utilizza configurazione esistente"
+
+msgid "Type some notes here"
+msgstr "Scrivi qui alcune note"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Incolla il contenuto del file di configurazione esistente nella casella sottostante."
+
+msgid "Load configuration from file"
+msgstr "Carica configurazione da file"
+
+msgid "System name"
+msgstr "Nome sistema"
+
+msgid "System name:"
+msgstr "Nome sistema:"
+
+msgid "System name cannot contain certain characters"
+msgstr "Il nome del sistema non può contenere determinati caratteri"
+
+msgid "System name already exists"
+msgstr "Il nome del sistema esiste già"
+
+msgid "Please enter a directory for the system"
+msgstr "Inserisci una directory per il sistema"
+
+msgid "Directory does not exist"
+msgstr "La directory non esiste"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "Verrà creata una nuova cartella per il sistema nella directory selezionata sopra"
+
+msgid "System location:"
+msgstr "Posizione sistema:"
+
+msgid "System name and location"
+msgstr "Nome e posizione del sistema"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Inserisci il nome del sistema e scegli la posizione"
+
+msgid "Enter the name of the system"
+msgstr "Inserisci il nome del sistema"
+
+msgid "Please enter a system name"
+msgstr "Inserisci il nome del sistema"
+
+msgid "Display name (optional):"
+msgstr "Nome visualizzato (opzionale):"
+
+msgid "Display name:"
+msgstr "Nome visualizzato:"
+
+msgid "Set display name"
+msgstr "Imposta il nome da visualizzare"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Inserisci il nuovo nome da visualizzare (vuoto per reimpostarlo)"
+
+msgid "Change &display name..."
+msgstr "Modifica &nome visualizzato..."
+
+msgid "Context Menu"
+msgstr "Menu contestuale"
+
+msgid "&Open folder..."
+msgstr "&Apri cartella..."
+
+msgid "Open p&rinter tray..."
+msgstr "Apri vassoio &stampante..."
+
+msgid "Set &icon..."
+msgstr "Imposta &icona..."
+
+msgid "Select an icon"
+msgstr "Seleziona un'icona"
+
+msgid "C&lone..."
+msgstr "C&lona..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "La macchina virtuale \"%1\" (%2) sarà clonata in:"
+
+msgid "Directory %1 already exists"
+msgstr "La directory %1 esiste già"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "Non è possibile utilizzare i seguenti caratteri nel nome: %1"
+
+msgid "Clone"
+msgstr "Clona"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Impossibile creare la directory per la macchina virtuale clonata"
+
+msgid "Failed to clone VM."
+msgstr "Impossibile clonare la macchina virtuale."
+
+msgid "Directory in use"
+msgstr "Directory in uso"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "La directory selezionata è già in uso. Selezionane una diversa."
+
+msgid "Create directory failed"
+msgstr "Creazione directory non riuscita"
+
+msgid "Unable to create the directory for the new system"
+msgstr "Impossibile creare la directory per il nuovo sistema"
+
+msgid "Configuration write failed"
+msgstr "Scrittura del file di configurazione non riuscita"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "Impossibile aprire il file di configurazione in %1 per la scrittura"
+
+msgid "Error adding system"
+msgstr "Errore durante l'aggiunta del sistema"
+
+msgid "Remove directory failed"
+msgstr "Rimozione directory non riuscita"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "Non è stato possibile eliminare alcuni file nella directory della macchina. Sarà necessario eliminarli manualmente."
+
+msgid "Build"
+msgstr "Build"
+
+msgid "Version"
+msgstr "Versione"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "È disponibile un aggiornamento per 86Box: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "Si è verificato un errore durante la ricerca degli aggiornamenti: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>È disponibile un aggiornamento per 86Box!</b>"
+
+msgid "Warning"
+msgstr "Avviso"
+
+msgid "&Kill"
+msgstr "&Forza chiusura"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "Forzare la chiusura di una macchina virtuale può causare la perdita di dati. Eseguire questa operazione solo se il processo di 86Box si blocca.\n\nDesideri davvero forzare la chiusura della macchina virtuale \"%1\"?"
+
+msgid "&Delete"
+msgstr "&Elimina"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "Vuoi davvero eliminare la macchina virtuale \"%1\" e tutti i suoi file? Questa operazione è irreversibile!"
+
+msgid "Show &config file"
+msgstr "Mostra file di &configurazione"
+
+msgid "No screenshot"
+msgstr "Nessuna istantanea dello schermo"
+
+msgid "Search"
+msgstr "Cerca"
+
+msgid "Searching for VMs..."
+msgstr "Ricerca delle macchine virtuali..."
+
+msgid "Found %1"
+msgstr "Trovato %1"
+
+msgid "System"
+msgstr "Sistema"
+
+msgid "Storage"
+msgstr "Archiviazione"
+
+msgid "Disk %1: "
+msgstr "Disco %1: "
+
+msgid "No disks"
+msgstr "Nessun disco"
+
+msgid "Audio"
+msgstr "Audio"
+
+msgid "Audio:"
+msgstr "Audio:"
+
 msgid "ACPI shutdown"
 msgstr "Arresto ACPI"
 
-msgid "Hard disk (%s)"
-msgstr "Hard disk (%s)"
+msgid "ACP&I shutdown"
+msgstr "Arresto ACP&I"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "Disco rigido (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
-msgstr "Le unità CD-ROM MFM/RLL o ESDI non sono mai esistite."
+msgstr "Le unità CD-ROM MFM/RLL o ESDI non sono mai esistite"
 
 msgid "Custom..."
 msgstr "Personalizzata..."
@@ -986,10 +1360,10 @@ msgid "Add Existing Hard Disk"
 msgstr "Aggiungi un disco rigido esistente"
 
 msgid "HDI disk images cannot be larger than 4 GB."
-msgstr "Le immagini HDI non possono essere più grandi di 4 GB."
+msgstr "Le immagini disco HDI non possono essere più grandi di 4 GB."
 
 msgid "Disk images cannot be larger than 127 GB."
-msgstr "Le immmagini disco non possono essere più grandi di 127 GB."
+msgstr "Le immagini disco non possono essere più grandi di 127 GB."
 
 msgid "Hard disk images"
 msgstr "Immagini disco rigido"
@@ -998,16 +1372,13 @@ msgid "Unable to read file"
 msgstr "Impossibile leggere il file"
 
 msgid "Unable to write file"
-msgstr "Impossibile scrivere al file"
+msgstr "Impossibile scrivere il file"
 
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
 msgstr "Le immagini HDI o HDX con settori di dimensioni diverse da 512 non sono supportati."
 
-msgid "USB is not yet supported"
-msgstr "USB non è ancora supportato"
-
 msgid "Disk image file already exists"
-msgstr "Immagine disco già esiste"
+msgstr "L'immagine disco esiste già"
 
 msgid "Please specify a valid file name."
 msgstr "Specifica un nome file valido."
@@ -1016,10 +1387,10 @@ msgid "Disk image created"
 msgstr "Immagine disco creata"
 
 msgid "Make sure the file exists and is readable."
-msgstr "Controlla che il file esiste e che sia leggibile."
+msgstr "Assicurarsi che il file esista e sia leggibile."
 
 msgid "Make sure the file is being saved to a writable directory."
-msgstr "Controlla che il file viene salvato ad un percorso con diritti di scrittura"
+msgstr "Assicurarsi che il file venga salvato in un percorso con permessi di scrittura."
 
 msgid "Disk image too large"
 msgstr "Immagine disco troppo grande"
@@ -1028,7 +1399,7 @@ msgid "Remember to partition and format the newly-created drive."
 msgstr "Ricordati di partizionare e formattare il disco appena creato."
 
 msgid "The selected file will be overwritten. Are you sure you want to use it?"
-msgstr "Il file selezionato sarà sovrascritto, sei sicuro di volerlo usare?"
+msgstr "Il file selezionato verrà sovrascritto. Sei sicuro di volerlo usare?"
 
 msgid "Unsupported disk image"
 msgstr "Immagine disco non supportata"
@@ -1039,8 +1410,29 @@ msgstr "Sovrascrivi"
 msgid "Don't overwrite"
 msgstr "Non sovrascrivere"
 
+msgid "Raw image"
+msgstr "Immagine RAW"
+
+msgid "HDI image"
+msgstr "Immagine HDI"
+
+msgid "HDX image"
+msgstr "Immagine HDX"
+
+msgid "Fixed-size VHD"
+msgstr "VHD di dimensioni fisse"
+
+msgid "Dynamic-size VHD"
+msgstr "VHD di dimensioni dinamiche"
+
+msgid "Differencing VHD"
+msgstr "VHD differenziato"
+
+msgid "(N/A)"
+msgstr "(N/D)"
+
 msgid "Raw image (.img)"
-msgstr "Immagine raw (.img)"
+msgstr "Immagine RAW (.img)"
 
 msgid "HDI image (.hdi)"
 msgstr "Immagine HDI (.hdi)"
@@ -1067,19 +1459,16 @@ msgid "VHD files"
 msgstr "File VHD"
 
 msgid "Select the parent VHD"
-msgstr "Seleziona il VHD padre."
+msgstr "Seleziona il VHD padre"
 
 msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
-msgstr "Questo potrebbe significare che l'immagine padre sia stata modificata dopo la creazione dell'immagine  di differenziazione.\n\nPuò anche succedere se i file immagini sono stati spostati o copiati, o da un errore nel programma che ha creato questo disco.\n\nVuoi aggiustare le marcature di tempo?"
+msgstr "Ciò potrebbe significare che l'immagine padre è stata modificata dopo la creazione dell'immagine di differenziazione.\n\nPuò verificarsi anche se i file immagine sono stati spostati o copiati, oppure a causa di un errore del programma che ha creato il disco.\n\nVuoi correggere la marca temporale?"
 
 msgid "Parent and child disk timestamps do not match"
-msgstr "Le marcature di tempo padre e figlio non corrispondono"
+msgstr "Le marche temporali del disco padre e figlio non corrispondono"
 
 msgid "Could not fix VHD timestamp."
-msgstr "Impossibile aggiustare marcature di tempo VHD."
-
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
+msgstr "Impossibile correggere la marca temporale VHD."
 
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
@@ -1096,44 +1485,29 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
+msgid "160 KB"
+msgstr "160 KB"
 
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
+msgid "180 KB"
+msgstr "180 KB"
 
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
+msgid "320 KB"
+msgstr "320 KB"
 
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
+msgid "360 KB"
+msgstr "360 KB"
 
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
+msgid "640 KB"
+msgstr "640 KB"
 
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
+msgid "720 KB"
+msgstr "720 KB"
 
 msgid "1.2 MB"
 msgstr "1.2 MB"
@@ -1187,16 +1561,16 @@ msgid "5.25\" 1.3 GB"
 msgstr "5.25\" 1.3 GB"
 
 msgid "Perfect RPM"
-msgstr "RPM perfette"
+msgstr "RPM ideale"
 
 msgid "1% below perfect RPM"
-msgstr "RPM 1% sotto perfezione"
+msgstr "1% al di sotto di RPM ideale"
 
 msgid "1.5% below perfect RPM"
-msgstr "RPM 1.5% sotto perfezione"
+msgstr "1,5% al di sotto di RPM ideale"
 
 msgid "2% below perfect RPM"
-msgstr "RPM 2% sotto perfezione"
+msgstr "2% al di sotto di RPM ideale"
 
 msgid "(System Default)"
 msgstr "(Predefinito del sistema)"
@@ -1205,13 +1579,13 @@ msgid "Failed to initialize network driver"
 msgstr "Impossibile inizializzare il driver di rete"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "La configurazione di rete verrà commutata sul driver nullo"
+msgstr "La configurazione di rete verrà commutata sul driver Null"
 
 msgid "Mouse sensitivity:"
-msgstr "Sensitività del mouse:"
+msgstr "Sensibilità del mouse:"
 
 msgid "Select media images from program working directory"
-msgstr "Seleziona le immagini media dalla directory di lavoro del programma"
+msgstr "Seleziona le immagini dalla directory di lavoro del programma"
 
 msgid "PIT mode:"
 msgstr "Modalità PIT:"
@@ -1226,4 +1600,1384 @@ msgid "Fast"
 msgstr "Veloce"
 
 msgid "&Auto-pause on focus loss"
-msgstr "&Pausa automatica alla perdita della messa a fuoco"
+msgstr "Pa&usa automatica se in secondo piano"
+
+msgid "WinBox is no longer supported"
+msgstr "WinBox non è più supportato"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "Lo sviluppo del gestore WinBox si è interrotto nel 2022 per mancanza di manutentori. Poiché i nostri sforzi sono rivolti a rendere 86Box ancora migliore, abbiamo deciso di non supportare più WinBox come gestore.\n\nNon saranno forniti ulteriori aggiornamenti tramite WinBox e si potrebbe riscontrare un comportamento non corretto se si continua a utilizzarlo con le versioni più recenti di 86Box. Tutte le segnalazioni di errori relative al comportamento di WinBox saranno chiuse in quanto non valide.\n\nPer un elenco di altri gestori utilizzabili, visitare 86box.net."
+
+msgid "Generate"
+msgstr "Genera"
+
+msgid "Joystick configuration"
+msgstr "Configurazione del joystick"
+
+msgid "Device"
+msgstr "Dispositivo"
+
+msgid "%1 (X axis)"
+msgstr "%1 (asse X)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (asse Y)"
+
+msgid "MCA devices"
+msgstr "Dispositivi MCA"
+
+msgid "List of MCA devices:"
+msgstr "Elenco dei dispositivi MCA:"
+
+msgid "&Tablet tool"
+msgstr "Strumento tablet"
+
+msgid "About &Qt"
+msgstr "Informazioni su &Qt"
+
+msgid "&MCA devices..."
+msgstr "Dispositivi MCA..."
+
+msgid "Show non-&primary monitors"
+msgstr "Mostra i monitor non &primari"
+
+msgid "Open screenshots &folder..."
+msgstr "Apri la ca&rtella screenshots..."
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Applica adattamento sc&hermo intero in modalità massimizzata"
+
+msgid "&Cursor/Puck"
+msgstr "&Cursore/Puck"
+
+msgid "&Pen"
+msgstr "&Penna"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "&Unità CD/DVD host (%1:)"
+
+msgid "&Connected"
+msgstr "&Connesso"
+
+msgid "Clear image &history"
+msgstr "Cancella la cr&onologia delle immagini"
+
+msgid "Create..."
+msgstr "Crea..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "Unità CD/DVD host (%1)"
+
+msgid "Unknown Bus"
+msgstr "Bus sconosciuto"
+
+msgid "Null Driver"
+msgstr "Driver Null"
+
+msgid "NIC:"
+msgstr "Scheda di rete:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "Scheda di rete %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&Scheda di rete %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "Impostazioni di renderizzazione"
+
+msgid "Use target framerate:"
+msgstr "Utilizza l'obiettivo &fotogrammi:"
+
+msgid " fps"
+msgstr " fps"
+
+msgid "VSync"
+msgstr "Sincronizzazione verticale"
+
+msgid "Synchronize with video"
+msgstr "Sincronizza col video"
+
+msgid "Shaders"
+msgstr "Shader"
+
+msgid "Remove"
+msgstr "Rimuovi"
+
+msgid "Browse..."
+msgstr "Sfoglia..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "Impossibile creare il contesto OpenGL."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "Impossibile passare al contesto OpenGL."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "È richiesta la versione OpenGL 3.0 o superiore. La versione attuale è %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "Errore nell'inizializzazione di OpenGL"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nPassaggio alla renderizzazione software."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>Quando si selezionano le immagini (CD-ROM, floppy, ecc.), la finestra di dialogo di apertura si avvia nella stessa directory del file di configurazione di 86Box. Questa impostazione probabilmente farà la differenza solo su MacOS.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "Questa macchina potrebbe essere stata spostata o copiata."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "Per garantire la corretta funzionalità di rete, 86Box deve sapere se la macchina è stata spostata o copiata.\n\nSelezionare \"L'ho copiata\" se non si è sicuri."
+
+msgid "I Moved It"
+msgstr "L'ho spostata"
+
+msgid "I Copied It"
+msgstr "L'ho copiata"
+
+msgid "86Box Monitor #"
+msgstr "Monitor 86Box #"
+
+msgid "No MCA devices."
+msgstr "Nessun dispositivo MCA."
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "Scheda di rete #1"
+
+msgid "Network Card #2"
+msgstr "Scheda di rete #2"
+
+msgid "Network Card #3"
+msgstr "Scheda di rete #3"
+
+msgid "Network Card #4"
+msgstr "Scheda di rete #4"
+
+msgid "Mode:"
+msgstr "Modalità:"
+
+msgid "Interface:"
+msgstr "Interfaccia:"
+
+msgid "Adapter:"
+msgstr "Adattatore:"
+
+msgid "VDE Socket:"
+msgstr "Presa VDE:"
+
+msgid "86Box Unit Tester"
+msgstr "Tester di unità 86Box"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Chiave magnetica Novell NetWare 2.x"
+
+msgid "Serial port passthrough 1"
+msgstr "Porta seriale passante 1"
+
+msgid "Serial port passthrough 2"
+msgstr "Porta seriale passante 2"
+
+msgid "Serial port passthrough 3"
+msgstr "Porta seriale passante 3"
+
+msgid "Serial port passthrough 4"
+msgstr "Porta seriale passante 4"
+
+msgid "Renderer &options..."
+msgstr "&Opzioni renderizzatore..."
+
+msgid "PC/XT Keyboard"
+msgstr "Tastiera PC/XT"
+
+msgid "AT Keyboard"
+msgstr "Tastiera AT"
+
+msgid "AX Keyboard"
+msgstr "Tastiera AX"
+
+msgid "PS/2 Keyboard"
+msgstr "Tastiera PS/2"
+
+msgid "PS/55 Keyboard"
+msgstr "Tastiera PS/55"
+
+msgid "Keys"
+msgstr "Tasti"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Mouse bus Logitech/Microsoft"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Mouse bus Microsoft (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Mouse seriale Mouse Systems"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Mouse bus Mouse Systems"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Mouse seriale Microsoft"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Mouse seriale Microsoft BallPoint"
+
+msgid "Logitech Serial Mouse"
+msgstr "Mouse seriale Logitech"
+
+msgid "PS/2 Mouse"
+msgstr "Mouse PS/2"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "Mouse PS/2 QuickPort"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (seriale)"
+
+msgid "Default Baud rate"
+msgstr "Velocità di trasmissione predefinita"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] Modem standard conforme a Hayes"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Emulazione Roland MT-32"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Emulazione Roland MT-32 (nuovo)"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Emulazione Roland CM-32L"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Emulazione Roland CM-32LN"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "Scheda figlia OPL4-ML"
+
+msgid "System MIDI"
+msgstr "MIDI di sistema"
+
+msgid "MIDI Input Device"
+msgstr "Dispositivo di ingresso MIDI"
+
+msgid "BIOS file"
+msgstr "File BIOS"
+
+msgid "BIOS file (ROM #1)"
+msgstr "File BIOS (ROM #1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "File BIOS (ROM #2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "File BIOS (ROM #3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "File BIOS (ROM #4)"
+
+msgid "BIOS address"
+msgstr "Indirizzo BIOS"
+
+msgid "BIOS address (ROM #1)"
+msgstr "Indirizzo BIOS (ROM #1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "Indirizzo BIOS (ROM #2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "Indirizzo BIOS (ROM #3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "Indirizzo BIOS (ROM #4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "Abilita scritture ROM di espansione del BIOS"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "Abilita scritture ROM di espansione del BIOS (ROM #1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "Abilita scritture ROM di espansione del BIOS (ROM #2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "Abilita scritture ROM di espansione del BIOS (ROM #3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "Abilita scritture ROM di espansione del BIOS (ROM #4)"
+
+msgid "Linear framebuffer base"
+msgstr "Base del framebuffer lineare"
+
+msgid "Address"
+msgstr "Indirizzo"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "IRQ porta seriale"
+
+msgid "Parallel port IRQ"
+msgstr "IRQ porta parallela"
+
+msgid "BIOS Revision"
+msgstr "Revisione BIOS"
+
+msgid "BIOS Version"
+msgstr "Versione BIOS"
+
+msgid "BIOS Language"
+msgstr "Lingua BIOS"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "Unità di espansione IBM 5161"
+
+msgid "IBM Cassette Basic"
+msgstr "Cassetta Basic IBM"
+
+msgid "Translate 26 -> 17"
+msgstr "Tradurre 26 -> 17"
+
+msgid "Language"
+msgstr "Lingua"
+
+msgid "Enable backlight"
+msgstr "Abilita la retroilluminazione"
+
+msgid "Invert colors"
+msgstr "Inverti i colori"
+
+msgid "BIOS size"
+msgstr "Dimensione BIOS"
+
+msgid "BIOS size (ROM #1)"
+msgstr "Dimensione BIOS (ROM #1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "Dimensione BIOS (ROM #2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "Dimensione BIOS (ROM #3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "Dimensione BIOS (ROM #4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "Mappa C0000-C7FFF come UMB"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "Mappa C8000-CFFFF come UMB"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "Mappa D0000-D7FFF come UMB"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "Mappa D8000-DFFFF come UMB"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "Mappa E0000-E7FFF come UMB"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "Mappa E8000-EFFFF come UMB"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "Ponticello JS9 (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "Dispositivo di uscita MIDI"
+
+msgid "MIDI Real time"
+msgstr "MIDI in tempo reale"
+
+msgid "MIDI Thru"
+msgstr "Ingresso passante MIDI"
+
+msgid "MIDI Clockout"
+msgstr "Sincronizzazione MIDI"
+
+msgid "SoundFont"
+msgstr "SoundFont"
+
+msgid "Output Gain"
+msgstr "Guadagno uscita"
+
+msgid "Chorus"
+msgstr "Coro"
+
+msgid "Chorus Voices"
+msgstr "Voci coro"
+
+msgid "Chorus Level"
+msgstr "Livello coro"
+
+msgid "Chorus Speed"
+msgstr "Velocità coro"
+
+msgid "Chorus Depth"
+msgstr "Profondità coro"
+
+msgid "Chorus Waveform"
+msgstr "Forma d'onda coro"
+
+msgid "Reverb"
+msgstr "Riverbero"
+
+msgid "Reverb Room Size"
+msgstr "Dimensioni stanza riverbero"
+
+msgid "Reverb Damping"
+msgstr "Smorzamento riverbero"
+
+msgid "Reverb Width"
+msgstr "Ampiezza riverbero"
+
+msgid "Reverb Level"
+msgstr "Livello riverbero"
+
+msgid "Interpolation Method"
+msgstr "Metodo di interpolazione"
+
+msgid "Dynamic Sample Loading"
+msgstr "Caricamento dinamico dei campioni"
+
+msgid "Reverb Output Gain"
+msgstr "Guadagno uscita riverbero"
+
+msgid "Reversed stereo"
+msgstr "Stereo invertito"
+
+msgid "Nice ramp"
+msgstr "Rampa di ampl. migliorata"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "Pulsanti"
+
+msgid "Serial Port"
+msgstr "Porta seriale"
+
+msgid "RTS toggle"
+msgstr "Commutazione RTS"
+
+msgid "Revision"
+msgstr "Revisione"
+
+msgid "Controller"
+msgstr "Controller"
+
+msgid "Show Crosshair"
+msgstr "Mostra mirino"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "Indirizzo MAC"
+
+msgid "MAC Address OUI"
+msgstr "Indirizzo MAC OUI"
+
+msgid "Enable BIOS"
+msgstr "Abilita il BIOS"
+
+msgid "Baud Rate"
+msgstr "Velocità di trasmissione"
+
+msgid "TCP/IP listening port"
+msgstr "Porta di ascolto TCP/IP"
+
+msgid "Phonebook File"
+msgstr "File di rubrica"
+
+msgid "Telnet emulation"
+msgstr "Emulazione Telnet"
+
+msgid "RAM Address"
+msgstr "Indirizzo RAM"
+
+msgid "RAM size"
+msgstr "Dimensione RAM"
+
+msgid "Initial RAM size"
+msgstr "Dimensione iniziale RAM"
+
+msgid "Serial Number"
+msgstr "Numero di serie"
+
+msgid "Host ID"
+msgstr "ID host"
+
+msgid "FDC Address"
+msgstr "Indirizzo FDC"
+
+msgid "MPU-401 Address"
+msgstr "Indirizzo MPU-401"
+
+msgid "MPU-401 IRQ"
+msgstr "IRQ MPU-401"
+
+msgid "Receive MIDI input"
+msgstr "Ricezione dell'ingresso MIDI"
+
+msgid "Low DMA"
+msgstr "DMA basso"
+
+msgid "Enable Game port"
+msgstr "Abilita la porta giochi"
+
+msgid "SID Model"
+msgstr "Modello SID"
+
+msgid "SID Filter Strength"
+msgstr "Intensità filtro SID"
+
+msgid "Surround module"
+msgstr "Modulo surround"
+
+msgid "CODEC"
+msgstr "CODEC"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "Incrementa l'interrupt CODEC nella configurazione CODEC (necessario per alcuni driver)"
+
+msgid "SB Address"
+msgstr "Indirizzo SB"
+
+msgid "Adlib Address"
+msgstr "Indirizzo Adlib"
+
+msgid "Use EEPROM setting"
+msgstr "Utilizza impostazione EEPROM"
+
+msgid "WSS IRQ"
+msgstr "IRQ WSS"
+
+msgid "WSS DMA"
+msgstr "DMA WSS"
+
+msgid "Enable OPL"
+msgstr "Abilita OPL"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "Ricezione dell'ingresso MIDI (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "DMA basso SB"
+
+msgid "6CH variant (6-channel)"
+msgstr "Variante 6CH (6 canali)"
+
+msgid "Enable CMS"
+msgstr "Abilita CMS"
+
+msgid "Mixer"
+msgstr "Mixer"
+
+msgid "High DMA"
+msgstr "DMA alto"
+
+msgid "Control PC speaker"
+msgstr "Controlla l'altoparlante del PC"
+
+msgid "Memory size"
+msgstr "Dimensione della memoria"
+
+msgid "EMU8000 Address"
+msgstr "Indirizzo EMU8000"
+
+msgid "IDE Controller"
+msgstr "Controller IDE"
+
+msgid "Codec"
+msgstr "Codec"
+
+msgid "GUS type"
+msgstr "Tipo di GUS"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "Abilita il comando 0x04 \"Esci da 86Box\""
+
+msgid "Display type"
+msgstr "Tipo di schermo"
+
+msgid "Composite type"
+msgstr "Tipo di composito"
+
+msgid "RGB type"
+msgstr "Tipo di RGB"
+
+msgid "Line doubling type"
+msgstr "Tipo di raddoppio della linea"
+
+msgid "Snow emulation"
+msgstr "Emulazione effetto neve CGA"
+
+msgid "Monitor type"
+msgstr "Tipo di monitor"
+
+msgid "Character set"
+msgstr "Set di caratteri"
+
+msgid "XGA type"
+msgstr "Tipo di XGA"
+
+msgid "Instance"
+msgstr "Istanza"
+
+msgid "MMIO Address"
+msgstr "Indirizzo MMIO"
+
+msgid "RAMDAC type"
+msgstr "Tipo di RAMDAC"
+
+msgid "Blend"
+msgstr "Miscela"
+
+msgid "Font"
+msgstr "Carattere"
+
+msgid "Bilinear filtering"
+msgstr "Filtro bilineare"
+
+msgid "Video chroma-keying"
+msgstr "Chiave cromatica video"
+
+msgid "Dithering"
+msgstr "Retinatura"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "Abilita l'NMI per l'emulazione CGA"
+
+msgid "Voodoo type"
+msgstr "Tipo di scheda Voodoo"
+
+msgid "Framebuffer memory size"
+msgstr "Dimensione memoria framebuffer"
+
+msgid "Texture memory size"
+msgstr "Dimensione memoria texture"
+
+msgid "Dither subtraction"
+msgstr "Sottrazione retinatura"
+
+msgid "Screen Filter"
+msgstr "Filtro a schermo"
+
+msgid "Render threads"
+msgstr "Thread di renderizzazione"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Indirizzo di partenza"
+
+msgid "Contiguous Size"
+msgstr "Dimensione contigua"
+
+msgid "I/O Width"
+msgstr "Larghezza I/O"
+
+msgid "Transfer Speed"
+msgstr "Velocità di trasferimento"
+
+msgid "EMS mode"
+msgstr "Modalità EMS"
+
+msgid "EMS Address"
+msgstr "Indirizzo EMS"
+
+msgid "EMS 1 Address"
+msgstr "Indirizzo EMS 1"
+
+msgid "EMS 2 Address"
+msgstr "Indirizzo EMS 2"
+
+msgid "EMS Memory Size"
+msgstr "Dimensione memoria EMS"
+
+msgid "EMS 1 Memory Size"
+msgstr "Dimensione memoria EMS 1"
+
+msgid "EMS 2 Memory Size"
+msgstr "Dimensione memoria EMS 2"
+
+msgid "Enable EMS"
+msgstr "Abilita EMS"
+
+msgid "Enable EMS 1"
+msgstr "Abilita EMS 1"
+
+msgid "Enable EMS 2"
+msgstr "Abilita EMS 2"
+
+msgid "Address for > 2 MB"
+msgstr "Indirizzo per > 2 MB"
+
+msgid "Frame Address"
+msgstr "Indirizzo frame"
+
+msgid "USA"
+msgstr "Stati Uniti"
+
+msgid "Danish"
+msgstr "Danese"
+
+msgid "Always at selected speed"
+msgstr "Sempre alla velocità selezionata"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "Impostazione BIOS + Tasti di scelta rapida (disattivati durante il POST)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 KB a partire da F0000"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 KB a partire da E0000 (indirizzo MSB invertito, prima gli ultimi 64 KB)"
+
+msgid "Sine"
+msgstr "Sinusoidale"
+
+msgid "Triangle"
+msgstr "Triangolare"
+
+msgid "Linear"
+msgstr "Lineare"
+
+msgid "4th Order"
+msgstr "Del 4° ordine"
+
+msgid "7th Order"
+msgstr "Del 7° ordine"
+
+msgid "Non-timed (original)"
+msgstr "Non temporizzato (originale)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (nessun ponticello su JMP2)"
+
+msgid "Two"
+msgstr "Due"
+
+msgid "Three"
+msgstr "Tre"
+
+msgid "Wheel"
+msgstr "Rotellina"
+
+msgid "Five + Wheel"
+msgstr "Cinque + Rotellina"
+
+msgid "Five + 2 Wheels"
+msgstr "Cinque + 2 Rotelline"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 seriale / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) seriale"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "Disabilita BIOS"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2 MB"
+
+msgid "8 MB"
+msgstr "8 MB"
+
+msgid "28 MB"
+msgstr "28 MB"
+
+msgid "1 MB"
+msgstr "1 MB"
+
+msgid "4 MB"
+msgstr "4 MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16 MB"
+
+msgid "20 MB"
+msgstr "20 MB"
+
+msgid "24 MB"
+msgstr "24 MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (stereo)"
+
+msgid "Classic"
+msgstr "Classico"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "Composito"
+
+msgid "True color"
+msgstr "Milioni di colori"
+
+msgid "Old"
+msgstr "Vecchio"
+
+msgid "New"
+msgstr "Nuovo"
+
+msgid "Color (generic)"
+msgstr "Colore (generico)"
+
+msgid "Green Monochrome"
+msgstr "Monocromatico verde"
+
+msgid "Amber Monochrome"
+msgstr "Monocromatico ambra"
+
+msgid "Gray Monochrome"
+msgstr "Monocromatico grigio"
+
+msgid "Color (no brown)"
+msgstr "Colore (senza marrone)"
+
+msgid "Color (IBM 5153)"
+msgstr "Colore (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Raddoppio semplice"
+
+msgid "sRGB interpolation"
+msgstr "Interpolazione sRGB"
+
+msgid "Linear interpolation"
+msgstr "Interpolazione lineare"
+
+msgid "Has secondary 8x8 character set"
+msgstr "Ha un set di caratteri 8x8 secondario"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Ha una scheda figlia Quadcolor II"
+
+msgid "Alternate monochrome contrast"
+msgstr "Contrasto monocromatico alternativo"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Monocromatico (5151/MDA) (bianco)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Monocromatico (5151/MDA) (verde)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Monocromatico (5151/MDA) (ambra)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Colore 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Colore 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Colore migliorato - Modalità normale (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Colore migliorato - Modalità avanzata (5154/ECD)"
+
+msgid "Green"
+msgstr "Verde"
+
+msgid "Amber"
+msgstr "Ambra"
+
+msgid "Gray"
+msgstr "Grigio"
+
+msgid "Grayscale"
+msgstr "Scala di grigi"
+
+msgid "Color"
+msgstr "Colore"
+
+msgid "U.S. English"
+msgstr "Inglese statunitense"
+
+msgid "Scandinavian"
+msgstr "Scandinavo"
+
+msgid "Other languages"
+msgstr "Altre lingue"
+
+msgid "Bochs latest"
+msgstr "Ultima versione di Bochs"
+
+msgid "Apply overscan deltas"
+msgstr "Applicare delta di sovrascansione"
+
+msgid "Mono Interlaced"
+msgstr "Monocromatico interlacciato"
+
+msgid "Mono Non-Interlaced"
+msgstr "Monocromatico non interlacciato"
+
+msgid "Color Interlaced"
+msgstr "A colori interlacciato"
+
+msgid "Color Non-Interlaced"
+msgstr "A colori non interlacciato"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "Grafica 3Dfx Voodoo"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 TMU)"
+
+msgid "8-bit"
+msgstr "8-bit"
+
+msgid "16-bit"
+msgstr "16 bit"
+
+msgid "Standard (150ns)"
+msgstr "Standard (150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "Alta velocità (120ns)"
+
+msgid "Enabled"
+msgstr "Abilitato"
+
+msgid "Standard"
+msgstr "Standard"
+
+msgid "High-Speed"
+msgstr "Alta velocità"
+
+msgid "Stereo LPT DAC"
+msgstr "DAC LPT stereo"
+
+msgid "Generic Text Printer"
+msgstr "Stampante di testo generica"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Stampante a matrice di punti ESC/P 2 generica"
+
+msgid "Generic PostScript Printer"
+msgstr "Stampante PostScript generica"
+
+msgid "Generic PCL5e Printer"
+msgstr "Stampante PCL5e generica"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Protocollo Internet a linea parallela"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Supporto di protezione per Savage Quest"
+
+msgid "Serial Passthrough Device"
+msgstr "Dispositivo passaggio porta seriale"
+
+msgid "Passthrough Mode"
+msgstr "Modalità passaggio"
+
+msgid "Host Serial Device"
+msgstr "Dispositivo seriale host"
+
+msgid "Name of pipe"
+msgstr "Nome pipe"
+
+msgid "Data bits"
+msgstr "Bit di dati"
+
+msgid "Stop bits"
+msgstr "Bit di stop"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Velocità di trasmissione in baud del passaggio"
+
+msgid "Named Pipe (Server)"
+msgstr "Pipe denominata (Server)"
+
+msgid "Named Pipe (Client)"
+msgstr "Pipe denominata (Client)"
+
+msgid "Host Serial Passthrough"
+msgstr "Passaggio porta seriale host"
+
+msgid "E&ject %1"
+msgstr "&Espelli %1"
+
+msgid "&Unmute"
+msgstr "&Riattiva l'audio"
+
+msgid "Softfloat FPU"
+msgstr "FPU Softfloat"
+
+msgid "High performance impact"
+msgstr "Impatto elevato sulle prestazioni"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Generico] Disco RAM (velocità massima)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Generico] 1989 (3500 RPM)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Generico] 1992 (3600 RPM)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Generico] 1994 (4500 RPM)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Generico] 1996 (5400 RPM)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Generico] 1997 (5400 RPM)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Generico] 1998 (5400 RPM)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Generico] 2000 (7200 RPM)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "Clone IBM 8514/A (ISA)"
+
+msgid "Vendor"
+msgstr "Produttore"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Espansione di memoria PC/XT generica"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Espansione di memoria PC/AT generica"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "Impossibile trovare i caratteri a matrice di punti"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "I caratteri TrueType presenti nella directory \"roms/printer/fonts\" sono necessari per l'emulazione della stampante a matrice di punti ESC/P 2 generica."
+
+msgid "Inhibit multimedia keys"
+msgstr "Inibisci i tasti multimediali"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Chiedi conferma prima di salvare le impostazioni"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Chiedi conferma prima di riavviare"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Chiedi conferma prima di uscire"
+
+msgid "Options"
+msgstr "Opzioni"
+
+msgid "Model"
+msgstr "Modello"
+
+msgid "Model:"
+msgstr "Modello:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Impossibile inizializzare il renderizzatore Vulkan."
+
+msgid "GLSL Error"
+msgstr "Errore GLSL"
+
+msgid "Could not load shader: %1"
+msgstr "Impossibile caricare lo shader: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "È richiesta la versione 3.0 di OpenGL o successiva. La versione GLSL corrente è %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "Impossibile caricare la texture: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "Impossibile compilare lo shader:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "Programma non collegato:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "Gestore shader"
+
+msgid "Shader Configuration"
+msgstr "Configurazione shader"
+
+msgid "Add"
+msgstr "Aggiungi"
+
+msgid "Move up"
+msgstr "Sposta su"
+
+msgid "Move down"
+msgstr "Sposta giù"
+
+msgid "Could not load file %1"
+msgstr "Impossibile caricare il file %1"
+
+msgid "Key Bindings:"
+msgstr "Associazione dei tasti:"
+
+msgid "Action"
+msgstr "Azione"
+
+msgid "Keybind"
+msgstr "Tasto associato"
+
+msgid "Clear binding"
+msgstr "Rimuovi associazione"
+
+msgid "Bind"
+msgstr "Associa"
+
+msgid "Bind Key"
+msgstr "Associa tasto"
+
+msgid "Enter key combo:"
+msgstr "Inserisci combinazione tasti:"
+
+msgid "Bind conflict"
+msgstr "Associazione in conflitto"
+
+msgid "This key combo is already in use."
+msgstr "Questa combinazione di tasti è già in uso."
+
+msgid "Send Control+Alt+Del"
+msgstr "Invia Ctrl+Alt+Canc"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Invia Ctrl+Alt+Esc"
+
+msgid "Toggle fullscreen"
+msgstr "Attiva/disattiva schermo intero"
+
+msgid "Screenshot"
+msgstr "Istantanea dello schermo"
+
+msgid "Release mouse pointer"
+msgstr "Rilascia il puntatore del mouse"
+
+msgid "Toggle pause"
+msgstr "Attiva/disattiva pausa"
+
+msgid "Toggle mute"
+msgstr "Attiva/disattiva audio"
+
+msgid "Text files"
+msgstr "File di testo"
+
+msgid "ROM files"
+msgstr "File ROM"
+
+msgid "SoundFont files"
+msgstr "File SoundFont"
+
+msgid "Local Switch"
+msgstr "Commutatore locale"
+
+msgid "Remote Switch"
+msgstr "Commutatore remoto"
+
+msgid "Switch:"
+msgstr "Commutatore:"
+
+msgid "Hub Mode"
+msgstr "Modalità Hub"
+
+msgid "Hostname:"
+msgstr "Nome host:"
+
+msgid "ISA RAM:"
+msgstr "RAM ISA:"
+
+msgid "ISA ROM:"
+msgstr "ROM ISA:"
+
+msgid "&Wipe NVRAM"
+msgstr "&Cancella NVRAM"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "Questa operazione eliminerà tutti i file NVRAM (e correlati) della macchina virtuale situati nella sottodirectory \"nvr\". Sarà necessario riconfigurare nuovamente le impostazioni del BIOS e, eventualmente, di altri dispositivi all'interno della macchina virtuale.\n\nSei sicuro di voler cancellare tutto il contenuto della NVRAM della macchina virtuale \"%1\"?"
+
+msgid "Success"
+msgstr "Successo"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "Contenuto della NVRAM della macchina virtuale \"%1\" cancellato con successo"
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "Si è verificato un errore durante il tentativo di cancellare il contenuto della NVRAM della macchina virtuale \"%1\""
+
+msgid "%1 VM Manager"
+msgstr "Gestore macchine virtuali di %1"
+
+msgid "%n disk(s)"
+msgstr "%n disco/i"
+
+msgid "Unknown Status"
+msgstr "Stato sconosciuto"
+
+msgid "No Machines Found!"
+msgstr "Nessuna macchina trovata!"
+
+msgid "Check for updates on startup"
+msgstr "Verifica la disponibilità degli aggiornamenti all'avvio"
+
+msgid "Unable to determine release information"
+msgstr "Impossibile determinare le informazioni sulla versione"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Si è verificato un errore durante la verifica degli aggiornamenti:\n\n%1\n\nRiprova più tardi."
+
+msgid "Update check complete"
+msgstr "Ricerca degli aggiornamenti completata"
+
+msgid "stable"
+msgstr "stabile"
+
+msgid "beta"
+msgstr "beta"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Stai utilizzando l'ultima versione %1 di 86Box: %2"
+
+msgid "version"
+msgstr "versione"
+
+msgid "build"
+msgstr "build"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Stai attualmente utilizzando la versione <b>%1</b>."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "La <b>versione %1</b> è ora disponibile."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Stai attualmente utilizzando la build <b>%1</b>."
+
+msgid "<b>Build %1</b> is now available."
+msgstr "La <b>build %1</b> è ora disponibile."
+
+msgid "Would you like to visit the download page?"
+msgstr "Vuoi visitare la pagina per scaricare la nuova versione?"
+
+msgid "Visit download page"
+msgstr "Visita la pagina"
+
+msgid "Update check"
+msgstr "Verifica disponibilità degli aggiornamenti"
+
+msgid "Checking for updates..."
+msgstr "Ricerca degli aggiornamenti..."
+
+msgid "86Box Update"
+msgstr "Aggiornamento di 86Box"
+
+msgid "Release notes:"
+msgstr "Note di rilascio:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "Arresto anomalo della macchina virtuale"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "Il processo della macchina virtuale \"%1\" è terminato inaspettatamente con il codice di uscita %2."
+
+msgid "The system will not be added."
+msgstr "Il sistema non verrà aggiunto."
+
+msgid "&Update mouse every CPU frame"
+msgstr "Forza &aggiornamento stato del mouse"
+
+msgid "Hue"
+msgstr "Tinta"
+
+msgid "Saturation"
+msgstr "Saturazione"
+
+msgid "Contrast"
+msgstr "Contrasto"
+
+msgid "Brightness"
+msgstr "Luminosità"
+
+msgid "Sharpness"
+msgstr "Nitidezza"
+
+msgid "&CGA composite settings..."
+msgstr "Impostazioni video composito &CGA..."
+
+msgid "CGA composite settings"
+msgstr "Impostazioni video composito CGA"
+
+msgid "Monitor EDID"
+msgstr "EDID del monitor"
+
+msgid "Export..."
+msgstr "Esporta..."
+
+msgid "Export EDID"
+msgstr "Esporta EDID"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "Il file EDID \"%ls\" è troppo grande."
+
+msgid "OpenGL input scale"
+msgstr "Scala ingresso OpenGL"
+
+msgid "OpenGL input stretch mode"
+msgstr "Modalità adattamento ingresso OpenGL"
+
+msgid "Color scheme"
+msgstr "Modalità colori"
+
+msgid "Light"
+msgstr "Chiara"
+
+msgid "Dark"
+msgstr "Scura"
diff --git a/src/qt/languages/ja-JP.po b/src/qt/languages/ja-JP.po
index 32236adaa..be01430f9 100644
--- a/src/qt/languages/ja-JP.po
+++ b/src/qt/languages/ja-JP.po
@@ -1,3 +1,11 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: ja_JP\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
 msgstr "操作(&A)"
 
@@ -10,8 +18,8 @@ msgstr "右CTRLを左ALTへ変換(&R)"
 msgid "&Hard Reset..."
 msgstr "ハード リセット(&H)..."
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "Ctrl+Alt+Del(&C)\tCtrl+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del(&C)"
 
 msgid "Ctrl+Alt+&Esc"
 msgstr "Ctrl+Alt+Esc(&E)"
@@ -19,8 +27,14 @@ msgstr "Ctrl+Alt+Esc(&E)"
 msgid "&Pause"
 msgstr "一時停止(&P)"
 
-msgid "E&xit..."
-msgstr "終了(&X)..."
+msgid "Pause"
+msgstr "一時停止"
+
+msgid "Re&sume"
+msgstr "再開する(&S)"
+
+msgid "E&xit"
+msgstr "終了(&X)"
 
 msgid "&View"
 msgstr "表示(&V)"
@@ -40,26 +54,20 @@ msgstr "ウィンドウのサイズと位置を保存(&E)"
 msgid "Re&nderer"
 msgstr "レンダラー(&N)"
 
-msgid "&SDL (Software)"
-msgstr "SDL (ソフトウェア)(&S)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (ハードウェア)(&H)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (OpenGL)(&O)"
+msgid "&Qt (Software)"
+msgstr "Qt (ソフトウェア)(&Q)"
 
 msgid "Open&GL (3.0 Core)"
-msgstr "OpenGL (3.0コア)(&G)"
+msgstr "OpenGL (3.0 Core)(&G)"
 
 msgid "&VNC"
 msgstr "VNC(&V)"
 
-msgid "Specify dimensions..."
-msgstr "ディメンションを指定..."
+msgid "Specify &dimensions..."
+msgstr "ディメンションを指定...(&D)"
 
-msgid "F&orce 4:3 display ratio"
-msgstr "4:3の縦横比を強制表示(&O)"
+msgid "Force &4:3 display ratio"
+msgstr "4:3の縦横比を強制表示(&4)"
 
 msgid "&Window scale factor"
 msgstr "ウィンドウの表示倍率(&W)"
@@ -94,8 +102,8 @@ msgstr "7x(&7)"
 msgid "&8x"
 msgstr "8x(&8)"
 
-msgid "Filter method"
-msgstr "フィルター方式"
+msgid "Fi&lter method"
+msgstr "フィルター方式(&L)"
 
 msgid "&Nearest"
 msgstr "最近傍補間(&N)"
@@ -106,8 +114,8 @@ msgstr "線形補間(&L)"
 msgid "Hi&DPI scaling"
 msgstr "HiDPIスケーリング(&D)"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "全画面表示(&F)\tCtrl+Alt+PgUp"
+msgid "&Fullscreen"
+msgstr "全画面表示(&F)"
 
 msgid "Fullscreen &stretch mode"
 msgstr "全画面の拡大表示モード(&S)"
@@ -127,8 +135,8 @@ msgstr "整数倍(&I)"
 msgid "4:&3 Integer scale"
 msgstr "4:3 整数倍(&3)"
 
-msgid "E&GA/(S)VGA settings"
-msgstr "E&GA/(S)VGAの設定"
+msgid "EGA/(S)&VGA settings"
+msgstr "EGA/(S)&VGAの設定"
 
 msgid "&Inverted VGA monitor"
 msgstr "色反転(&I)"
@@ -139,9 +147,15 @@ msgstr "画面タイプ(&T)"
 msgid "RGB &Color"
 msgstr "RGB(カラー)(&C)"
 
+msgid "RGB (no brown)"
+msgstr "RGB(茶色なし)"
+
 msgid "&RGB Grayscale"
 msgstr "RGB(グレースケール)(&R)"
 
+msgid "Generic RGBI color monitor"
+msgstr "汎用RGBIカラーモニター"
+
 msgid "&Amber monitor"
 msgstr "モニター(黄色)(&A)"
 
@@ -178,11 +192,17 @@ msgstr "ツール(&T)"
 msgid "&Settings..."
 msgstr "設定(&S)..."
 
+msgid "Settings..."
+msgstr "設定..."
+
 msgid "&Update status bar icons"
 msgstr "ステータスバーのアイコンを更新(&U)"
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "スクリーンショットを撮る(&C)\tCtrl+F11"
+msgid "Take s&creenshot"
+msgstr "スクリーンショットを撮る(&C)"
+
+msgid "S&ound"
+msgstr "サウンド(&O)"
 
 msgid "&Preferences..."
 msgstr "環境設定(&P)..."
@@ -193,11 +213,11 @@ msgstr "Discord連携機能(&D)"
 msgid "Sound &gain..."
 msgstr "音量調整(&G)..."
 
-msgid "Begin trace\tCtrl+T"
-msgstr "トレース開始\tCtrl+T"
+msgid "Begin trace"
+msgstr "トレース開始"
 
-msgid "End trace\tCtrl+T"
-msgstr "トレース終了\tCtrl+T"
+msgid "End trace"
+msgstr "トレース終了"
 
 msgid "&Help"
 msgstr "ヘルプ(&H)"
@@ -244,8 +264,8 @@ msgstr "ミュート(&M)"
 msgid "E&mpty"
 msgstr "なし(&M)"
 
-msgid "&Reload previous image"
-msgstr "前のイメージを再読み込み(&R)"
+msgid "Reload previous image"
+msgstr "前のイメージを再読み込み"
 
 msgid "&Folder..."
 msgstr "フォルダ(&F)..."
@@ -301,18 +321,12 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "キャンセル"
 
-msgid "Save these settings as &global defaults"
-msgstr "これらの設定をグローバル既定値として保存(&G)"
-
 msgid "&Default"
 msgstr "既定値(&D)"
 
 msgid "Language:"
 msgstr "言語:"
 
-msgid "Icon set:"
-msgstr "アイコンセット:"
-
 msgid "Gain"
 msgstr "音量"
 
@@ -346,6 +360,9 @@ msgstr "マシン:"
 msgid "Configure"
 msgstr "設定"
 
+msgid "CPU:"
+msgstr "CPU:"
+
 msgid "CPU type:"
 msgstr "CPUタイプ:"
 
@@ -382,11 +399,23 @@ msgstr "有効(UTC)"
 msgid "Dynamic Recompiler"
 msgstr "動的再コンパイル"
 
+msgid "CPU frame size"
+msgstr "CPUフレームサイズ"
+
+msgid "Larger frames (less smooth)"
+msgstr "より大きなフレーム(滑らかさが劣る)"
+
+msgid "Smaller frames (smoother)"
+msgstr "より小さなフレーム(より滑らか)"
+
 msgid "Video:"
 msgstr "ビデオカード:"
 
-msgid "Voodoo Graphics"
-msgstr "Voodooグラフィック"
+msgid "Video #2:"
+msgstr "ビデオカード2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Voodoo1または2グラフィック"
 
 msgid "IBM 8514/A Graphics"
 msgstr "IBM 8514/Aグラフィック"
@@ -394,12 +423,27 @@ msgstr "IBM 8514/Aグラフィック"
 msgid "XGA Graphics"
 msgstr "XGAグラフィック"
 
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "IBM PS/55ディスプレイアダプターグラフィックス"
+
+msgid "Keyboard:"
+msgstr "キーボード:"
+
+msgid "Keyboard"
+msgstr "キーボード"
+
 msgid "Mouse:"
 msgstr "マウス:"
 
+msgid "Mouse"
+msgstr "マウス"
+
 msgid "Joystick:"
 msgstr "ジョイスティック:"
 
+msgid "Joystick"
+msgstr "ジョイスティック"
+
 msgid "Joystick 1..."
 msgstr "ジョイスティック1..."
 
@@ -430,6 +474,9 @@ msgstr "MIDI出力デバイス:"
 msgid "MIDI In Device:"
 msgstr "MIDI入力デバイス:"
 
+msgid "MIDI Out:"
+msgstr "MIDI出力"
+
 msgid "Standalone MPU-401"
 msgstr "独立型MPU-401"
 
@@ -445,15 +492,6 @@ msgstr "Nuked(高精度化)"
 msgid "YMFM (faster)"
 msgstr "YMFM(より速く)"
 
-msgid "Network type:"
-msgstr "ネットワーク タイプ:"
-
-msgid "PCap device:"
-msgstr "PCapデバイス:"
-
-msgid "Network adapter:"
-msgstr "ネットワークアダプター:"
-
 msgid "COM1 Device:"
 msgstr "COM1デバイス:"
 
@@ -478,6 +516,9 @@ msgstr "LPT3デバイス:"
 msgid "LPT4 Device:"
 msgstr "LPT4デバイス:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr "内部LPTのECPのDMA:"
+
 msgid "Serial port 1"
 msgstr "シリアルポート1"
 
@@ -502,18 +543,21 @@ msgstr "パラレルポート3"
 msgid "Parallel port 4"
 msgstr "パラレルポート4"
 
-msgid "HD Controller:"
-msgstr "HDDコントローラー:"
-
 msgid "FD Controller:"
 msgstr "FDDコントローラー:"
 
+msgid "CD-ROM Controller:"
+msgstr "CD-ROMコントローラー:"
+
 msgid "Tertiary IDE Controller"
 msgstr "第三IDEコントローラー"
 
 msgid "Quaternary IDE Controller"
 msgstr "第四IDEコントローラー"
 
+msgid "Hard disk"
+msgstr "ハードディスク"
+
 msgid "SCSI"
 msgstr "SCSI"
 
@@ -535,6 +579,9 @@ msgstr "カセット"
 msgid "Hard disks:"
 msgstr "ハード ディスク:"
 
+msgid "Firmware Version"
+msgstr "ファームウェアバージョン"
+
 msgid "&New..."
 msgstr "新規(&N)..."
 
@@ -589,14 +636,17 @@ msgstr "BPBチェック"
 msgid "CD-ROM drives:"
 msgstr "CD-ROMドライブ:"
 
-msgid "Earlier drive"
-msgstr "先のドライブ"
-
 msgid "MO drives:"
 msgstr "光磁気ドライブ:"
 
-msgid "ZIP drives:"
-msgstr "ZIPドライブ:"
+msgid "MO:"
+msgstr "光磁気:"
+
+msgid "Removable disks:"
+msgstr "取り外し可能なディスク:"
+
+msgid "Removable disk drives:"
+msgstr "取り外し可能なディスクドライブ:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
@@ -607,6 +657,9 @@ msgstr "ISA RTCカード:"
 msgid "ISA Memory Expansion"
 msgstr "ISAメモリ拡張カード"
 
+msgid "ISA ROM Cards"
+msgstr "ISA ROMカード"
+
 msgid "Card 1:"
 msgstr "カード1:"
 
@@ -619,18 +672,21 @@ msgstr "カード3:"
 msgid "Card 4:"
 msgstr "カード4:"
 
+msgid "Generic ISA ROM Board"
+msgstr "汎用ISA ROMボード"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "汎用デュアルISA ROMボード"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "汎用クアッドISA ROMボード"
+
 msgid "ISABugger device"
 msgstr "ISABuggerデバイス"
 
 msgid "POST card"
 msgstr "POSTカード"
 
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Meiryo UI"
-
 msgid "86Box"
 msgstr "86Box"
 
@@ -643,17 +699,20 @@ msgstr "致命的なエラー"
 msgid " - PAUSED"
 msgstr " - 一時停止"
 
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Ctrl+Alt+PgDnでウィンドウ モードに戻ります。"
-
 msgid "Speed"
 msgstr "速度"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "取り外し可能なディスク %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "ZIPイメージ"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "取り外し可能なディスク(&R) %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "取り外し可能なディスクイメージ"
+
+msgid "Image %1"
+msgstr "イメージ %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
 msgstr "86Boxで使用可能なROMイメージが見つかりません。\n\nROMセットを<a href=\"https://github.com/86Box/roms/releases/latest\">ダウンロード</a>して、roms ディレクトリに解凍してください。"
@@ -688,6 +747,12 @@ msgstr "roms/machines ディレクトリにROMがないため、マシン「%hs
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
 msgstr "roms/video ディレクトリにROMがないため、ビデオ カード「%hs」は使用できません。使用可能なビデオカードに切り替えます。"
 
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "roms/video ディレクトリにROMがないため、ビデオ カード2「%hs」は使用できません。2枚目のビデオカードを無効にします。"
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "ROMがないため、デバイス「%hs」は使用できません。装置を無視する。"
+
 msgid "Machine"
 msgstr "マシン"
 
@@ -706,12 +771,30 @@ msgstr "ネットワーク"
 msgid "Ports (COM & LPT)"
 msgstr "ポート (COM/LPT)"
 
+msgid "Ports"
+msgstr "ポート"
+
+msgid "Serial ports:"
+msgstr "シリアルポート:"
+
+msgid "Parallel ports:"
+msgstr "パラレルポート:"
+
 msgid "Storage controllers"
 msgstr "ストレージコントローラ"
 
 msgid "Hard disks"
 msgstr "ハードディスク"
 
+msgid "Disks:"
+msgstr "ディスク:"
+
+msgid "Floppy:"
+msgstr "フロッピー:"
+
+msgid "Controllers:"
+msgstr "コントローラ:"
+
 msgid "Floppy & CD-ROM drives"
 msgstr "フロッピー／CD-ROMドライブ"
 
@@ -721,14 +804,17 @@ msgstr "他のリムーバブルデバイス"
 msgid "Other peripherals"
 msgstr "他の周辺デバイス"
 
+msgid "Other devices"
+msgstr "他のデバイス"
+
 msgid "Click to capture mouse"
 msgstr "左クリックでマウスをキャプチャします"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "F8+F12キーでマウスを解放します"
+msgid "Press %1 to release mouse"
+msgstr "%1キーでマウスを解放します"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "F8+F12キーまたは中クリックでマウスを解放します"
+msgid "Press %1 or middle button to release mouse"
+msgstr "%1キーまたは中クリックでマウスを解放します"
 
 msgid "Bus"
 msgstr "バス"
@@ -748,65 +834,89 @@ msgstr "S"
 msgid "KB"
 msgstr "KB"
 
-msgid "Could not initialize the video renderer."
-msgstr "ビデオレンダラーが初期化できません。"
-
 msgid "Default"
 msgstr "既定値"
 
-msgid "%i Wait state(s)"
-msgstr "%iつのウェイト ステート"
+msgid "%1 Wait state(s)"
+msgstr "%1つのウェイト ステート"
 
 msgid "Type"
 msgstr "タイプ"
 
-msgid "Failed to set up PCap"
-msgstr "PCapのセットアップに失敗しました"
-
 msgid "No PCap devices found"
 msgstr "PCapデバイスがありません"
 
 msgid "Invalid PCap device"
 msgstr "不正なPCapデバイス"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "標準ジョイスティック(2ボタン)"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "ジョイスティック(2軸、2ボタン)"
 
-msgid "Standard 4-button joystick"
-msgstr "標準ジョイスティック(4ボタン)"
+msgid "2-axis, 4-button joystick"
+msgstr "ジョイスティック(2軸、4ボタン)"
 
-msgid "Standard 6-button joystick"
-msgstr "標準ジョイスティック(6ボタン)"
+msgid "2-axis, 6-button joystick"
+msgstr "ジョイスティック(2軸、6ボタン)"
 
-msgid "Standard 8-button joystick"
-msgstr "標準ジョイスティック(8ボタン)"
+msgid "2-axis, 8-button joystick"
+msgstr "ジョイスティック(2軸、8ボタン)"
+
+msgid "3-axis, 2-button joystick"
+msgstr "ジョイスティック(3軸、2ボタン)"
+
+msgid "3-axis, 4-button joystick"
+msgstr "ジョイスティック(3軸、4ボタン)"
+
+msgid "4-axis, 4-button joystick"
+msgstr "ジョイスティック(4軸、4ボタン)"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH Pedals"
+
 msgid "Microsoft SideWinder Pad"
 msgstr "Microsoft SideWinderパッド"
 
 msgid "Thrustmaster Flight Control System"
-msgstr "Thrustmaster飛行制御システム"
+msgstr "Thrustmaster Flight Control System"
+
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Rudder Control System"
+
+msgid "2-button gamepad(s)"
+msgstr "2ボタン式ゲームパッド"
+
+msgid "2-button flight yoke"
+msgstr "2ボタン式操縦桿"
+
+msgid "4-button gamepad"
+msgstr "4ボタン式ゲームパッド"
+
+msgid "4-button flight yoke"
+msgstr "4ボタン式操縦桿"
+
+msgid "2-button flight yoke with throttle"
+msgstr "2ボタン式フライトヨーク(スロットル付き)"
+
+msgid "4-button flight yoke with throttle"
+msgstr "4ボタン式フライトヨーク(スロットル付き)"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Win95 ステアリングホイール(3軸、4ボタン)"
 
 msgid "None"
 msgstr "なし"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "キーボードアクセラレータを読み込めません。"
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CHS値: %2、%3、%4)"
 
-msgid "Unable to register raw input."
-msgstr "生入力が登録できません。"
+msgid "Floppy %1 (%2): %3"
+msgstr "フロッピー %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CHS値: %i、%i、%i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "フロッピー %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "フロッピー %1 (%2): %3(&F)"
 
 msgid "Advanced sector images"
 msgstr "アドバンスドセクターイメージ"
@@ -814,9 +924,6 @@ msgstr "アドバンスドセクターイメージ"
 msgid "Flux images"
 msgstr "Fluxイメージ"
 
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "SDLが初期化できません。SDL2.dllが必要です"
-
 msgid "Are you sure you want to hard reset the emulated machine?"
 msgstr "使用中のマシンをハード リセットしますか？"
 
@@ -826,8 +933,14 @@ msgstr "86Boxを終了しますか？"
 msgid "Unable to initialize Ghostscript"
 msgstr "Ghostscriptが初期化できません"
 
-msgid "MO %i (%ls): %ls"
-msgstr "光磁気 %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "GhostPCLが初期化できません"
+
+msgid "MO %1 (%2): %3"
+msgstr "光磁気 %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "光磁気 %1 (%2): %3(&M)"
 
 msgid "MO images"
 msgstr "光磁気イメージ"
@@ -835,8 +948,17 @@ msgstr "光磁気イメージ"
 msgid "Welcome to 86Box!"
 msgstr "86Boxへようこそ！"
 
-msgid "Internal controller"
-msgstr "内蔵コントローラー"
+msgid "Internal device"
+msgstr "内蔵デバイス"
+
+msgid "&File"
+msgstr "ファイル(&F)"
+
+msgid "&New machine..."
+msgstr "新しいマシン(&N)"
+
+msgid "&Check for updates..."
+msgstr "アップデートを確認中(&C)..."
 
 msgid "Exit"
 msgstr "終了"
@@ -860,34 +982,22 @@ msgid "86Box v"
 msgstr "86Box v"
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "古いパソコンのエミュレーター\n\n著者: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nGNU General Public License version 2以降でリリースされています。詳しくは LICENSE をご覧ください。"
+msgstr "古いパソコンのエミュレーター\n\n著者: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nSarah Walker, leilei, JohnElliott, greatpsycho, その他の方々による以前からの多大な貢献。\n\nGNU General Public License version 2以降でリリースされています。詳しくは LICENSE をご覧ください。"
 
 msgid "Hardware not available"
 msgstr "ハードウェアが利用できません"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "がインストールされてるか、libpcapに対応したネットワークに接続されてるか確認してください。"
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "%1がインストールされていてかつ、%1に対応したネットワークに接続されてるか確認してください。"
 
 msgid "Invalid configuration"
 msgstr "不正な設定です"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "PostScriptファイルをPDFに自動変換するには%1が必要です。\n\n汎用PostScriptプリンターに送信された文書は、PostScript (.ps) ファイルとして保存されます。"
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr "PostScriptファイルをPDFに自動変換するにはlibgsが必要です。\n\n汎用PostScriptプリンターに送信された文書は、PostScript (.ps) ファイルとして保存されます。"
-
-msgid "Entering fullscreen mode"
-msgstr "全画面モードを入力"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "PCLファイルをPDFに自動変換するには%1が必要です。\n\n汎用PCLプリンターに送信された文書は、Printer Command Language (.pcl) ファイルとして保存されます。"
 
 msgid "Don't show this message again"
 msgstr "今後、このメッセージを表示しない"
@@ -904,51 +1014,51 @@ msgstr "リセットしない"
 msgid "CD-ROM images"
 msgstr "CD-ROMイメージ"
 
-msgid "%hs Device Configuration"
-msgstr "%hs のデバイス設定"
+msgid "%1 Device Configuration"
+msgstr "%1 のデバイス設定"
 
 msgid "Monitor in sleep mode"
 msgstr "モニターのスリープモード"
 
-msgid "OpenGL Shaders"
-msgstr "OpenGLシェーダー"
-
-msgid "OpenGL options"
-msgstr "OpenGL設定"
+msgid "GLSL shaders"
+msgstr "GLSLシェーダー"
 
 msgid "You are loading an unsupported configuration"
-msgstr "読み込んでいる設定がサポートされません"
+msgstr "サポートされていないコンフィグを読み込んでいます"
 
 msgid "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
-msgstr "選択したマシンに基づくCPUタイプのフィルター機能は、使用中のマシンでは無効になっています。\n\nこれにより、選択したマシンと互換性のないCPUが選択できます。しかし、マシンのBIOSや他のソフトウェアと互換性がない場合があります。\n\nこの設定を有効にすることは公式にはサポートされておらず、バグレポートは無効として中止される可能性があります。"
+msgstr "選択したマシンに基づくCPUタイプのフィルター機能は、使用中のマシンでは無効になっています。\n\nこれにより、選択したマシンと互換性のないCPUが選択できます。しかし、マシンのBIOSや他のソフトウェアと互換性がない場合があります。\n\nこの設定を有効にすることは公式にはサポートされておらず、バグレポートは無効としてクローズされる可能性があります。"
 
 msgid "Continue"
 msgstr "続行"
 
-msgid "Cassette: %s"
-msgstr "カセット: %s"
+msgid "Cassette: %1"
+msgstr "カセット: %1"
+
+msgid "C&assette: %1"
+msgstr "カセット: %1(&A)"
 
 msgid "Cassette images"
 msgstr "カセットイメージ"
 
-msgid "Cartridge %i: %ls"
-msgstr "カートリッジ %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "カートリッジ %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "カートリッジ %1: %2(&T)"
 
 msgid "Cartridge images"
 msgstr "カートリッジイメージ"
 
-msgid "Error initializing renderer"
-msgstr "レンダラーの初期化エラー"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "OpenGL (3.0コア) レンダラーが初期化できません。別のレンダラーを使用してください。"
-
 msgid "Resume execution"
 msgstr "実行を再開"
 
 msgid "Pause execution"
 msgstr "実行を一時停止"
 
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del"
+
 msgid "Press Ctrl+Alt+Del"
 msgstr "Ctrl+Alt+DELを押す"
 
@@ -958,17 +1068,281 @@ msgstr "Ctrl+Alt+Escを押す"
 msgid "Hard reset"
 msgstr "ハードリセット"
 
+msgid "Force shutdown"
+msgstr "強制終了"
+
+msgid "Start"
+msgstr "スタート"
+
+msgid "Not running"
+msgstr "停止した"
+
+msgid "Running"
+msgstr "実行中"
+
+msgid "Paused"
+msgstr "一時停止中"
+
+msgid "Waiting"
+msgstr "待機中"
+
+msgid "Powered Off"
+msgstr "電源オフ"
+
+msgid "%n running"
+msgstr "%n 実行中"
+
+msgid "%n paused"
+msgstr "%n 停止した"
+
+msgid "%n waiting"
+msgstr "%n 待機中"
+
+msgid "%1 total"
+msgstr "%1 は総数です"
+
+msgid "VMs: %1"
+msgstr "仮想マシン: %1"
+
+msgid "System Directory:"
+msgstr "システムディレクトリ:"
+
+msgid "Choose directory"
+msgstr "ディレクトリを選択する"
+
+msgid "Choose configuration file"
+msgstr "設定ファイルを選択する"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "86Box 設定ファイル (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "設定の読み込みに失敗しました"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "選択した設定ファイルを読み込むことができませんでした: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "検索ボックスで正規表現を使用する"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "現在、%1台の仮想マシンがアクティブです。それでもVMマネージャーを終了しますか？"
+
+msgid "Add new system wizard"
+msgstr "新しいシステムを追加するためのウィザード"
+
+msgid "Introduction"
+msgstr "序文"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "これにより、86Boxに新しいシステムを追加することができます。"
+
+msgid "New configuration"
+msgstr "新しい構成"
+
+msgid "Complete"
+msgstr "完了"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "ウィザードは、新しいシステムの構成を開始します。"
+
+msgid "Use existing configuration"
+msgstr "既存の設定を使用する"
+
+msgid "Type some notes here"
+msgstr "ここにメモを入力してください"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "既存の設定ファイルの内容を、以下のボックスに貼り付けてください。"
+
+msgid "Load configuration from file"
+msgstr "ファイルから設定を読み込む"
+
+msgid "System name"
+msgstr "システム名"
+
+msgid "System name:"
+msgstr "システム名:"
+
+msgid "System name cannot contain certain characters"
+msgstr "システム名には特定の文字を含めることはできません"
+
+msgid "System name already exists"
+msgstr "システム名が既に存在しています"
+
+msgid "Please enter a directory for the system"
+msgstr "システム用のディレクトリを入力してください"
+
+msgid "Directory does not exist"
+msgstr "ディレクトリが存在しません"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "選択したディレクトリ上に、システム用の新しいディレクトリが作成されます"
+
+msgid "System location:"
+msgstr "システム場所:"
+
+msgid "System name and location"
+msgstr "システム名と場所"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "システムの名前を入力し、場所を選択してください"
+
+msgid "Enter the name of the system"
+msgstr "システムの名前を入力してください"
+
+msgid "Please enter a system name"
+msgstr "システムの名前を入力してください"
+
+msgid "Display name (optional):"
+msgstr "表示名(任意):"
+
+msgid "Display name:"
+msgstr "表示名:"
+
+msgid "Set display name"
+msgstr "表示名を設定する"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "新しい表示名を入力してください(空白にするとリセットされます)"
+
+msgid "Change &display name..."
+msgstr "表示名を変更(&D)..."
+
+msgid "Context Menu"
+msgstr "コンテキストメニュー"
+
+msgid "&Open folder..."
+msgstr "フォルダーを開く(&O)..."
+
+msgid "Open p&rinter tray..."
+msgstr "プリンタートレイを開く(&R)..."
+
+msgid "Set &icon..."
+msgstr "アイコンを設定(&I)..."
+
+msgid "Select an icon"
+msgstr "アイコンを選択してください"
+
+msgid "C&lone..."
+msgstr "クローン(&L)..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "仮想マシン\"%1\" (%2)は、以下の場所にクローンされます:"
+
+msgid "Directory %1 already exists"
+msgstr "ディレクトリ %1 は既に存在します"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "名前には以下の文字を使用できません: %1"
+
+msgid "Clone"
+msgstr "クローン"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "クローンされたVM用のディレクトリを作成できませんでした"
+
+msgid "Failed to clone VM."
+msgstr "仮想マシンのクローン作成に失敗しました。"
+
+msgid "Directory in use"
+msgstr "使用中のディレクトリ"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "選択したディレクトリは既に使用中です。別のディレクトリを選択してください。"
+
+msgid "Create directory failed"
+msgstr "ディレクトリの作成に失敗しました"
+
+msgid "Unable to create the directory for the new system"
+msgstr "新しいシステム用のディレクトリを作成できませんでした"
+
+msgid "Configuration write failed"
+msgstr "設定の書き込みに失敗しました"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "%1 の設定ファイルを書き込み用に開くことができません"
+
+msgid "Error adding system"
+msgstr "システム追加エラー"
+
+msgid "Remove directory failed"
+msgstr "ディレクトリの削除に失敗しました"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "マシンのディレクトリ内のいくつかのファイルが削除できませんでした。手動で削除してください。"
+
+msgid "Build"
+msgstr "ビルド"
+
+msgid "Version"
+msgstr "バージョン"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "86Boxのアップデートが利用可能です: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "アップデートの確認中にエラーが発生しました: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>86Boxのアップデートが利用可能になりました!</b>"
+
+msgid "Warning"
+msgstr "警告"
+
+msgid "&Kill"
+msgstr "強制的に終了する(&K)"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "仮想マシンを強制終了すると、データが失われる可能性があります。86Boxプロセスが応答しなくなった場合のみ、この操作を行ってください。\n\n本当に仮想マシン\"%1\"を終了しますか？"
+
+msgid "&Delete"
+msgstr "削除(&D)"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "本当に仮想マシン\"%1\"とそのすべてのファイルを削除しますか? この操作は元に戻せません!"
+
+msgid "Show &config file"
+msgstr "設定ファイルを表示する(&C)"
+
+msgid "No screenshot"
+msgstr "スクリーンショットなし"
+
+msgid "Search"
+msgstr "検索"
+
+msgid "Searching for VMs..."
+msgstr "仮想マシンを検索中..."
+
+msgid "Found %1"
+msgstr "%1が見つかりました"
+
+msgid "System"
+msgstr "システム"
+
+msgid "Storage"
+msgstr "ストレージ"
+
+msgid "Disk %1: "
+msgstr "ディスク %1:"
+
+msgid "No disks"
+msgstr "ディスクなし"
+
+msgid "Audio"
+msgstr "音声"
+
+msgid "Audio:"
+msgstr "音声:"
+
 msgid "ACPI shutdown"
 msgstr "ACPIシャットダウン"
 
-msgid "Hard disk (%s)"
-msgstr "ハードディスク (%s)"
+msgid "ACP&I shutdown"
+msgstr "ACP&Iシャットダウン"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "ハードディスク (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
 msgstr "MFM/RLLやESDI CD-ROMドライブが存在しません"
@@ -1003,9 +1377,6 @@ msgstr "ファイルの書き込みができません"
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
 msgstr "512以外のセクタサイズを持つHDIまたはHDXイメージはサポートされていません。"
 
-msgid "USB is not yet supported"
-msgstr "USBはまだ非対応です"
-
 msgid "Disk image file already exists"
 msgstr "ディスクイメージファイルが既に存在します"
 
@@ -1031,7 +1402,7 @@ msgid "The selected file will be overwritten. Are you sure you want to use it?"
 msgstr "選択したファイルは上書きされます。よろしいですか？"
 
 msgid "Unsupported disk image"
-msgstr "非対応のディスクイメージジ"
+msgstr "非対応のディスクイメージ"
 
 msgid "Overwrite"
 msgstr "上書き"
@@ -1039,6 +1410,27 @@ msgstr "上書き"
 msgid "Don't overwrite"
 msgstr "上書きしない"
 
+msgid "Raw image"
+msgstr "Rawイメージ"
+
+msgid "HDI image"
+msgstr "HDIイメージ"
+
+msgid "HDX image"
+msgstr "HDXイメージ"
+
+msgid "Fixed-size VHD"
+msgstr "VHD (容量固定)"
+
+msgid "Dynamic-size VHD"
+msgstr "VHD (容量可変)"
+
+msgid "Differencing VHD"
+msgstr "VHD (差分)"
+
+msgid "(N/A)"
+msgstr "(該当なし)"
+
 msgid "Raw image (.img)"
 msgstr "Rawイメージ (.img)"
 
@@ -1078,9 +1470,6 @@ msgstr "親ディスクと子ディスクのタイムス タンプが一致し
 msgid "Could not fix VHD timestamp."
 msgstr "VHD のタイムスタンプを修正できません。"
 
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
-
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
 
@@ -1096,44 +1485,29 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
+msgid "160 KB"
+msgstr "160 KB"
 
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
+msgid "180 KB"
+msgstr "180 KB"
 
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
+msgid "320 KB"
+msgstr "320 KB"
 
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
+msgid "360 KB"
+msgstr "360 KB"
 
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
+msgid "640 KB"
+msgstr "640 KB"
 
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
+msgid "720 KB"
+msgstr "720 KB"
 
 msgid "1.2 MB"
 msgstr "1.2 MB"
@@ -1227,3 +1601,1383 @@ msgstr "速い"
 
 msgid "&Auto-pause on focus loss"
 msgstr "フォーカスが奪われると自動停止(&A)"
+
+msgid "WinBox is no longer supported"
+msgstr "WinBoxはサポート終了"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "WinBoxマネージャーの開発は、メンテナ不足のため2022年に停止しました。86Boxをより良いものにするため、WinBoxをマネージャーとしてサポートしないことを決定しました。\n\nWinBoxを使ったアップデートは今後提供されませんし、86Boxの新しいバージョンでWinBoxを使い続けると、正しくない動作に遭遇するかもしれません。WinBoxの動作に関連するバグレポートは無効としてクローズされます。\n\n86box.netに他のマネージャのリストがあります。"
+
+msgid "Generate"
+msgstr "生成する"
+
+msgid "Joystick configuration"
+msgstr "ジョイスティックの構成"
+
+msgid "Device"
+msgstr "デバイス"
+
+msgid "%1 (X axis)"
+msgstr "1（X軸）"
+
+msgid "%1 (Y axis)"
+msgstr "1（Y軸）"
+
+msgid "MCA devices"
+msgstr "MCAデバイス"
+
+msgid "List of MCA devices:"
+msgstr "MCAデバイスのリスト："
+
+msgid "&Tablet tool"
+msgstr "タブレットツール(&T)"
+
+msgid "About &Qt"
+msgstr "&Qtについて"
+
+msgid "&MCA devices..."
+msgstr "&MCAデバイス..."
+
+msgid "Show non-&primary monitors"
+msgstr "プライマリーモニター以外のモニターを表示する(&P)"
+
+msgid "Open screenshots &folder..."
+msgstr "スクリーンショットフォルダを開く(&F)"
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "最大化時にフルスクリーンストレッチモードを適用(&Y)"
+
+msgid "&Cursor/Puck"
+msgstr "カーソル/パック(&C)"
+
+msgid "&Pen"
+msgstr "ペン(&P)"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "ホスト CD/DVD ドライブ (%1:) (&H)"
+
+msgid "&Connected"
+msgstr "コネクテッド"
+
+msgid "Clear image &history"
+msgstr "クリア画像履歴(&H)"
+
+msgid "Create..."
+msgstr "作成..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "ホスト CD/DVD ドライブ (%1)"
+
+msgid "Unknown Bus"
+msgstr "不明なバス"
+
+msgid "Null Driver"
+msgstr "ヌル・ドライバー"
+
+msgid "NIC:"
+msgstr "NIC:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "NIC %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&NIC %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "レンダリング動作"
+
+msgid "Use target framerate:"
+msgstr "目標フレームレートを使用する："
+
+msgid " fps"
+msgstr " fps"
+
+msgid "VSync"
+msgstr "VSシンク"
+
+msgid "Synchronize with video"
+msgstr "ビデオと同期"
+
+msgid "Shaders"
+msgstr "シェーダー"
+
+msgid "Remove"
+msgstr "削除"
+
+msgid "Browse..."
+msgstr "ブラウズ..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "OpenGLコンテキストを作成できませんでした。"
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "OpenGLコンテキストに切り替えられなかった。"
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "OpenGLのバージョン3.0以上が必要です。現在のバージョンは %1.%2 です。"
+
+msgid "Error initializing OpenGL"
+msgstr "OpenGLの初期化エラー"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nソフトウェアレンダリングに逆戻り。"
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>メディアイメージ（CD-ROM、フロッピーなど）を選択するとき、オープンダイアログは86Box設定ファイルと同じディレクトリで開始します。この設定は、おそらく macOS でのみ違いがあります。</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "このマシンは移動されたかコピーされた可能性がある。"
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "ネットワーク機能を正しく動作させるために、86Boxはこのマシンが移動されたかコピーされたかを知る必要があります。「コピーした」を選択してください。"
+
+msgid "I Moved It"
+msgstr "動かした"
+
+msgid "I Copied It"
+msgstr "コピーした"
+
+msgid "86Box Monitor #"
+msgstr "86Box モニター"
+
+msgid "No MCA devices."
+msgstr "MCAデバイスはない。"
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "ネットワークカード 1"
+
+msgid "Network Card #2"
+msgstr "ネットワークカード 2"
+
+msgid "Network Card #3"
+msgstr "ネットワークカード 3"
+
+msgid "Network Card #4"
+msgstr "ネットワークカード 4"
+
+msgid "Mode:"
+msgstr "モード:"
+
+msgid "Interface:"
+msgstr "インターフェース:"
+
+msgid "Adapter:"
+msgstr "アダプター:"
+
+msgid "VDE Socket:"
+msgstr "VDEソケット:"
+
+msgid "86Box Unit Tester"
+msgstr "86Boxユニットテスター"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Novell NetWare 2.xキーカード"
+
+msgid "Serial port passthrough 1"
+msgstr "シリアル・ポート・パススルー 1"
+
+msgid "Serial port passthrough 2"
+msgstr "シリアル・ポート・パススルー 2"
+
+msgid "Serial port passthrough 3"
+msgstr "シリアル・ポート・パススルー 3"
+
+msgid "Serial port passthrough 4"
+msgstr "シリアル・ポート・パススルー 4"
+
+msgid "Renderer &options..."
+msgstr "レンダラー設定...(&O)"
+
+msgid "PC/XT Keyboard"
+msgstr "PC/XT キーボード"
+
+msgid "AT Keyboard"
+msgstr "AT キーボード"
+
+msgid "AX Keyboard"
+msgstr "AX キーボード"
+
+msgid "PS/2 Keyboard"
+msgstr "PS/2 キーボード"
+
+msgid "PS/55 Keyboard"
+msgstr "PS/55 キーボード"
+
+msgid "Keys"
+msgstr "キー"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Logitech/Microsoft バスマウス"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Microsoft バスマウス（InPort）"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Mouse Systems シリアルマウス"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Mouse Systems バスマウス"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Microsoft シリアルマウス"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Microsoft BallPoint シリアルマウス"
+
+msgid "Logitech Serial Mouse"
+msgstr "Logitech シリアルマウス"
+
+msgid "PS/2 Mouse"
+msgstr "PS/2マウス"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "PS/2 QuickPortマウス"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3Mマイクロタッチ（シリアル）"
+
+msgid "Default Baud rate"
+msgstr "デフォルトのボーレート"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] 標準ヘイズ準拠モデム"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Roland MT-32エミュレーション"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Roland MT-32（新しい）エミュレーション"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Roland CM-32Lエミュレーション"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Roland CM-32LNエミュレーション"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "OPL4-MLドーターボード"
+
+msgid "System MIDI"
+msgstr "システムMIDI"
+
+msgid "MIDI Input Device"
+msgstr "MIDI入力デバイス"
+
+msgid "BIOS file"
+msgstr "BIOSファイル"
+
+msgid "BIOS file (ROM #1)"
+msgstr "BIOSファイル (ROM 1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "BIOSファイル (ROM 2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "BIOSファイル (ROM 3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "BIOSファイル (ROM 4)"
+
+msgid "BIOS address"
+msgstr "BIOSアドレス"
+
+msgid "BIOS address (ROM #1)"
+msgstr "BIOSアドレス (ROM 1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "BIOSアドレス (ROM 2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "BIOSアドレス (ROM 3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "BIOSアドレス (ROM 4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "BIOS拡張ROM書き込みを有効にする"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "BIOS拡張ROM書き込みを有効にする (ROM 1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "BIOS拡張ROM書き込みを有効にする (ROM 2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "BIOS拡張ROM書き込みを有効にする (ROM 3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "BIOS拡張ROM書き込みを有効にする (ROM 4)"
+
+msgid "Linear framebuffer base"
+msgstr "線形フレームバッファのベースアドレス"
+
+msgid "Address"
+msgstr "アドレス"
+
+msgid "IRQ"
+msgstr "割り込み要求"
+
+msgid "Serial port IRQ"
+msgstr "シリアルポートのIRQ"
+
+msgid "Parallel port IRQ"
+msgstr "パラレルポートのIRQ"
+
+msgid "BIOS Revision"
+msgstr "BIOSリビジョン"
+
+msgid "BIOS Version"
+msgstr "BIOSバージョン"
+
+msgid "BIOS Language"
+msgstr "BIOS言語"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "IBM 5161拡張ユニット"
+
+msgid "IBM Cassette Basic"
+msgstr "IBM カセット BASIC"
+
+msgid "Translate 26 -> 17"
+msgstr "26→17を翻訳"
+
+msgid "Language"
+msgstr "言語"
+
+msgid "Enable backlight"
+msgstr "バックライトを有効にする"
+
+msgid "Invert colors"
+msgstr "色の反転"
+
+msgid "BIOS size"
+msgstr "BIOSサイズ"
+
+msgid "BIOS size (ROM #1)"
+msgstr "BIOSサイズ (ROM 1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "BIOSサイズ (ROM 2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "BIOSサイズ (ROM 3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "BIOSサイズ (ROM 4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "C0000-C7FFFをUMBとしてマップ"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "C8000-CFFFFをUMBとしてマップ"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "D0000-D7FFFをUMBとしてマップ"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "D8000-DFFFFをUMBとしてマップ"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "E0000～E7FFFをUMBとしてマップ"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "E8000-EFFFFをUMBとしてマップ"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "JS9ジャンパ（JIM）"
+
+msgid "MIDI Output Device"
+msgstr "MIDI出力デバイス"
+
+msgid "MIDI Real time"
+msgstr "リアルタイムMIDI"
+
+msgid "MIDI Thru"
+msgstr "MIDI入力のパススルー"
+
+msgid "MIDI Clockout"
+msgstr "MIDIクロックの出力"
+
+msgid "SoundFont"
+msgstr "サウンドフォント"
+
+msgid "Output Gain"
+msgstr "出力ゲイン"
+
+msgid "Chorus"
+msgstr "コーラス"
+
+msgid "Chorus Voices"
+msgstr "コーラスの声"
+
+msgid "Chorus Level"
+msgstr "コーラス・レベル"
+
+msgid "Chorus Speed"
+msgstr "コーラス・スピード"
+
+msgid "Chorus Depth"
+msgstr "コーラスの深さ"
+
+msgid "Chorus Waveform"
+msgstr "コーラス波形"
+
+msgid "Reverb"
+msgstr "リバーブ"
+
+msgid "Reverb Room Size"
+msgstr "リバーブ・ルームの大きさ"
+
+msgid "Reverb Damping"
+msgstr "リバーブ・ダンピング"
+
+msgid "Reverb Width"
+msgstr "リバーブ幅"
+
+msgid "Reverb Level"
+msgstr "リバーブ・レベル"
+
+msgid "Interpolation Method"
+msgstr "補間法"
+
+msgid "Dynamic Sample Loading"
+msgstr "サンプルの動的ロード"
+
+msgid "Reverb Output Gain"
+msgstr "リバーブ出力のゲイン"
+
+msgid "Reversed stereo"
+msgstr "逆ステレオ"
+
+msgid "Nice ramp"
+msgstr "ナイス・スロープ"
+
+msgid "Hz"
+msgstr "ヘルツ"
+
+msgid "Buttons"
+msgstr "ボタン"
+
+msgid "Serial Port"
+msgstr "シリアルポート"
+
+msgid "RTS toggle"
+msgstr "RTSトグル"
+
+msgid "Revision"
+msgstr "改訂"
+
+msgid "Controller"
+msgstr "コントローラー"
+
+msgid "Show Crosshair"
+msgstr "十字線を表示"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "MACアドレス"
+
+msgid "MAC Address OUI"
+msgstr "MACアドレスのOUI"
+
+msgid "Enable BIOS"
+msgstr "BIOSを有効にする"
+
+msgid "Baud Rate"
+msgstr "ボーレート"
+
+msgid "TCP/IP listening port"
+msgstr "TCP/IPリスニングポート"
+
+msgid "Phonebook File"
+msgstr "電話帳ファイル"
+
+msgid "Telnet emulation"
+msgstr "Telnetエミュレーション"
+
+msgid "RAM Address"
+msgstr "RAMアドレス"
+
+msgid "RAM size"
+msgstr "RAMサイズ"
+
+msgid "Initial RAM size"
+msgstr "初期RAMサイズ"
+
+msgid "Serial Number"
+msgstr "シリアル番号"
+
+msgid "Host ID"
+msgstr "ホストID"
+
+msgid "FDC Address"
+msgstr "FDCアドレス"
+
+msgid "MPU-401 Address"
+msgstr "MPU-401 アドレス"
+
+msgid "MPU-401 IRQ"
+msgstr "MPU-401 IRQ"
+
+msgid "Receive MIDI input"
+msgstr "MIDI入力を受信する"
+
+msgid "Low DMA"
+msgstr "低DMA"
+
+msgid "Enable Game port"
+msgstr "ゲームポートを有効にする"
+
+msgid "SID Model"
+msgstr "SIDモデル"
+
+msgid "SID Filter Strength"
+msgstr "SIDフィルターの強度"
+
+msgid "Surround module"
+msgstr "サラウンド・モジュール"
+
+msgid "CODEC"
+msgstr "コーデック"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "CODECセットアップ時にCODEC割り込みを発生させる(一部のドライバで必要)"
+
+msgid "SB Address"
+msgstr "SBアドレス"
+
+msgid "Adlib Address"
+msgstr "Adlibアドレス"
+
+msgid "Use EEPROM setting"
+msgstr "EEPROMの設定を使用する"
+
+msgid "WSS IRQ"
+msgstr "WSS IRQ"
+
+msgid "WSS DMA"
+msgstr "WSS DMA"
+
+msgid "Enable OPL"
+msgstr "OPLを有効にする"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "MIDI入力を受信する（MPU-401）"
+
+msgid "SB low DMA"
+msgstr "SBローDMA"
+
+msgid "6CH variant (6-channel)"
+msgstr "6CHバリアント（6チャンネル）"
+
+msgid "Enable CMS"
+msgstr "CMSを有効にする"
+
+msgid "Mixer"
+msgstr "ミキサー"
+
+msgid "High DMA"
+msgstr "ハイDMA"
+
+msgid "Control PC speaker"
+msgstr "コントロールPCスピーカー"
+
+msgid "Memory size"
+msgstr "メモリーサイズ"
+
+msgid "EMU8000 Address"
+msgstr "EMU8000 アドレス"
+
+msgid "IDE Controller"
+msgstr "IDEコントローラ"
+
+msgid "Codec"
+msgstr "コーデック"
+
+msgid "GUS type"
+msgstr "GUSタイプ"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "コマンド 0x04 \"86Boxを終了する\"を有効にする"
+
+msgid "Display type"
+msgstr "表示タイプ"
+
+msgid "Composite type"
+msgstr "コンポジット・タイプ"
+
+msgid "RGB type"
+msgstr "RGBタイプ"
+
+msgid "Line doubling type"
+msgstr "ライン倍増タイプ"
+
+msgid "Snow emulation"
+msgstr "スノー・エミュレーション"
+
+msgid "Monitor type"
+msgstr "モニタータイプ"
+
+msgid "Character set"
+msgstr "文字セット"
+
+msgid "XGA type"
+msgstr "XGAタイプ"
+
+msgid "Instance"
+msgstr "インスタンス"
+
+msgid "MMIO Address"
+msgstr "MMIOアドレス"
+
+msgid "RAMDAC type"
+msgstr "RAMDACタイプ"
+
+msgid "Blend"
+msgstr "ブレンド"
+
+msgid "Font"
+msgstr "フォント"
+
+msgid "Bilinear filtering"
+msgstr "バイリニア・フィルタリング"
+
+msgid "Video chroma-keying"
+msgstr "ビデオのクロマキー処理"
+
+msgid "Dithering"
+msgstr "ディザリング"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "CGAエミュレーションのNMIを有効にする"
+
+msgid "Voodoo type"
+msgstr "Voodooタイプ"
+
+msgid "Framebuffer memory size"
+msgstr "フレームバッファのメモリサイズ"
+
+msgid "Texture memory size"
+msgstr "テクスチャメモリサイズ"
+
+msgid "Dither subtraction"
+msgstr "ディザ減算"
+
+msgid "Screen Filter"
+msgstr "スクリーンフィルター"
+
+msgid "Render threads"
+msgstr "レンダリングスレッド"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "開始アドレス"
+
+msgid "Contiguous Size"
+msgstr "連続サイズ"
+
+msgid "I/O Width"
+msgstr "I/O幅"
+
+msgid "Transfer Speed"
+msgstr "転送速度"
+
+msgid "EMS mode"
+msgstr "EMSモード"
+
+msgid "EMS Address"
+msgstr "EMSアドレス"
+
+msgid "EMS 1 Address"
+msgstr "EMS 1アドレス"
+
+msgid "EMS 2 Address"
+msgstr "EMS 2アドレス"
+
+msgid "EMS Memory Size"
+msgstr "EMSメモリ容量"
+
+msgid "EMS 1 Memory Size"
+msgstr "EMS 1メモリ容量"
+
+msgid "EMS 2 Memory Size"
+msgstr "EMS 2メモリ容量"
+
+msgid "Enable EMS"
+msgstr "EMSを有効にする"
+
+msgid "Enable EMS 1"
+msgstr "EMS 1を有効にする"
+
+msgid "Enable EMS 2"
+msgstr "EMS 2を有効にする"
+
+msgid "Address for > 2 MB"
+msgstr "2MB以上のアドレス"
+
+msgid "Frame Address"
+msgstr "フレームアドレス"
+
+msgid "USA"
+msgstr "アメリカ"
+
+msgid "Danish"
+msgstr "デンマーク語"
+
+msgid "Always at selected speed"
+msgstr "常に選択された速度"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "BIOS設定＋ホットキー（POST中はオフ）"
+
+msgid "64 KB starting from F0000"
+msgstr "F0000から始まる64キロバイト"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "E0000から始まる128キロバイト（アドレスMSBが反転、最後の64キロバイトが最初）"
+
+msgid "Sine"
+msgstr "正弦"
+
+msgid "Triangle"
+msgstr "三角"
+
+msgid "Linear"
+msgstr "線形"
+
+msgid "4th Order"
+msgstr "4次"
+
+msgid "7th Order"
+msgstr "7次"
+
+msgid "Non-timed (original)"
+msgstr "タイマーなし（オリジナル）"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz（JMP2にジャンパーなし）"
+
+msgid "Two"
+msgstr "二つ"
+
+msgid "Three"
+msgstr "三つ"
+
+msgid "Wheel"
+msgstr "ホイール"
+
+msgid "Five + Wheel"
+msgstr "五つ＋ホイール"
+
+msgid "Five + 2 Wheels"
+msgstr "五つ＋2輪のホイール"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 シリアル / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R)シリアル"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "BIOSを無効にする"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2 MB"
+
+msgid "8 MB"
+msgstr "8 MB"
+
+msgid "28 MB"
+msgstr "28 MB"
+
+msgid "1 MB"
+msgstr "1 MB"
+
+msgid "4 MB"
+msgstr "4 MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16 MB"
+
+msgid "20 MB"
+msgstr "20 MB"
+
+msgid "24 MB"
+msgstr "24 MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "シグマテル STAC9721T（ステレオ）"
+
+msgid "Classic"
+msgstr "クラシック"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "コンポジット"
+
+msgid "True color"
+msgstr "真の色"
+
+msgid "Old"
+msgstr "古い"
+
+msgid "New"
+msgstr "新しい"
+
+msgid "Color (generic)"
+msgstr "カラー（ジェネリック）"
+
+msgid "Green Monochrome"
+msgstr "みどりのモノクローム"
+
+msgid "Amber Monochrome"
+msgstr "鼈甲色のモノクローム"
+
+msgid "Gray Monochrome"
+msgstr "ねずみ色のモノクローム"
+
+msgid "Color (no brown)"
+msgstr "カラー（ブラウンなし）"
+
+msgid "Color (IBM 5153)"
+msgstr "カラー（IBM 5153）"
+
+msgid "Simple doubling"
+msgstr "単純な倍加"
+
+msgid "sRGB interpolation"
+msgstr "sRGB補間"
+
+msgid "Linear interpolation"
+msgstr "線形補間"
+
+msgid "Has secondary 8x8 character set"
+msgstr "8×8のセカンダリ文字セット"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Quadcolor IIの拡張ボード"
+
+msgid "Alternate monochrome contrast"
+msgstr "代替モノクロームコントラスト"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "モノクローム（5151/MDA）（白い）"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "モノクローム（5151/MDA）（みどり）"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "モノクローム（5151/MDA）（鼈甲色）"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "カラー40x25（5153/CGA）"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "カラー80x25（5153/CGA）"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "エンハンスト・カラー - ノーマルモード（5154/ECD）"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "エンハンスト・カラー - エンハンスト・モード（5154/ECD）"
+
+msgid "Green"
+msgstr "みどり"
+
+msgid "Amber"
+msgstr "鼈甲色"
+
+msgid "Gray"
+msgstr "ねずみ色"
+
+msgid "Grayscale"
+msgstr "グレイスケール"
+
+msgid "Color"
+msgstr "カラー"
+
+msgid "U.S. English"
+msgstr "アメリカ英語"
+
+msgid "Scandinavian"
+msgstr "スカンジナビア"
+
+msgid "Other languages"
+msgstr "その他の言語"
+
+msgid "Bochs latest"
+msgstr "Bochs latest"
+
+msgid "Apply overscan deltas"
+msgstr "オーバースキャンデルタを適用する"
+
+msgid "Mono Interlaced"
+msgstr "モノラル・インターレース"
+
+msgid "Mono Non-Interlaced"
+msgstr "モノラル・ノンインターレース"
+
+msgid "Color Interlaced"
+msgstr "カラー・インターレース"
+
+msgid "Color Non-Interlaced"
+msgstr "カラー・ノンインターレース"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "3dfx Voodooグラフィック"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst（2 TMU単位）"
+
+msgid "8-bit"
+msgstr "8ビット"
+
+msgid "16-bit"
+msgstr "16ビット"
+
+msgid "Standard (150ns)"
+msgstr "標準（150ns）"
+
+msgid "High-Speed (120ns)"
+msgstr "高速（120ns）"
+
+msgid "Enabled"
+msgstr "有効"
+
+msgid "Standard"
+msgstr "スタンダード"
+
+msgid "High-Speed"
+msgstr "高速"
+
+msgid "Stereo LPT DAC"
+msgstr "ステレオLPT DAC"
+
+msgid "Generic Text Printer"
+msgstr "汎用テキスト・プリンタ"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "汎用ESC/P 2ドットマトリクスプリンタ"
+
+msgid "Generic PostScript Printer"
+msgstr "汎用ポストスクリプトプリンタ"
+
+msgid "Generic PCL5e Printer"
+msgstr "汎用PCL5eプリンタ"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "パラレルライン・インターネット・プロトコル"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "サベージ・クエスト用プロテクション・ドングル"
+
+msgid "Serial Passthrough Device"
+msgstr "シリアル・ポート・パススルー・デバイス"
+
+msgid "Passthrough Mode"
+msgstr "パススルーモード"
+
+msgid "Host Serial Device"
+msgstr "ホスト・シリアル・デバイス"
+
+msgid "Name of pipe"
+msgstr "パイプ名"
+
+msgid "Data bits"
+msgstr "データビット"
+
+msgid "Stop bits"
+msgstr "ストップビット"
+
+msgid "Baud Rate of Passthrough"
+msgstr "パススルーのボーレート"
+
+msgid "Named Pipe (Server)"
+msgstr "名前付きパイプ(サーバー)"
+
+msgid "Named Pipe (Client)"
+msgstr "名前付きパイプ(クライアント)"
+
+msgid "Host Serial Passthrough"
+msgstr "ホストシリアルポートのパススルー"
+
+msgid "E&ject %1"
+msgstr "%1を取り出す(&J)"
+
+msgid "&Unmute"
+msgstr "ミュート解除(&U)"
+
+msgid "Softfloat FPU"
+msgstr "Softfloat FPU"
+
+msgid "High performance impact"
+msgstr "パフォーマンスへの影響が大きい"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[汎用] RAMディスク（最高速度）"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[汎用] 1989 (3500 RPM)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[汎用] 1992 (3600 RPM)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[汎用] 1994 (4500 RPM)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[汎用] 1996 (5400 RPM)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[汎用] 1997 (5400 RPM)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[汎用] 1998 (5400 RPM)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[汎用] 2000 (7200 RPM)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "IBM 8514/A クローン（ISA）"
+
+msgid "Vendor"
+msgstr "業者"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "汎用PC/XTメモリ拡張カード"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "汎用PC/ATメモリ拡張カード"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "ドットマトリクスフォントが見つかりません"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "汎用ESC/P 2ドットマトリクスプリンタのエミュレーションには、roms/printer/fontsディレクトリ内のTrueTypeフォントが必要です。"
+
+msgid "Inhibit multimedia keys"
+msgstr "マルチメディアキーを無効にする"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "設定を保存する前に確認を求めます"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "ハードリセットを行う前に確認を求めます"
+
+msgid "Ask for confirmation before quitting"
+msgstr "終了する前に確認を求めます"
+
+msgid "Options"
+msgstr "オプション"
+
+msgid "Model"
+msgstr "モデル"
+
+msgid "Model:"
+msgstr "モデル:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Vulkanレンダラーの初期化に失敗しました。"
+
+msgid "GLSL Error"
+msgstr "GLSLエラー"
+
+msgid "Could not load shader: %1"
+msgstr "シェーダーを読み込めませんでした: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "OpenGLバージョン 3.0 以上が必要です。現在のGLSLバージョンは %1.%2 です。"
+
+msgid "Could not load texture: %1"
+msgstr "テクスチャを読み込めませんでした: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "シェーダーをコンパイルできませんでした:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "プログラムがリンクされていません:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "シェーダーマネージャー"
+
+msgid "Shader Configuration"
+msgstr "シェーダー設定"
+
+msgid "Add"
+msgstr "追加"
+
+msgid "Move up"
+msgstr "昇進する"
+
+msgid "Move down"
+msgstr "下に移動する"
+
+msgid "Could not load file %1"
+msgstr "ファイル %1 をロードできませんでした"
+
+msgid "Key Bindings:"
+msgstr "キーバインド:"
+
+msgid "Action"
+msgstr "アクション"
+
+msgid "Keybind"
+msgstr "キーバインド"
+
+msgid "Clear binding"
+msgstr "バインドを解除する"
+
+msgid "Bind"
+msgstr "バインド"
+
+msgid "Bind Key"
+msgstr "キーのバインド"
+
+msgid "Enter key combo:"
+msgstr "キーの組み合わせを入力してください:"
+
+msgid "Bind conflict"
+msgstr "バインド競合"
+
+msgid "This key combo is already in use."
+msgstr "このキーの組み合わせは既に使用中です。"
+
+msgid "Send Control+Alt+Del"
+msgstr "Ctrl+Alt+Delを送信"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Ctrl+Alt+Escを送信"
+
+msgid "Toggle fullscreen"
+msgstr "フルスクリーン表示を切り替える"
+
+msgid "Screenshot"
+msgstr "スクリーンショット"
+
+msgid "Release mouse pointer"
+msgstr "マウスポインターを解放する"
+
+msgid "Toggle pause"
+msgstr "一時停止を切り替える"
+
+msgid "Toggle mute"
+msgstr "ミュートを切り替える"
+
+msgid "Text files"
+msgstr "テキストファイル"
+
+msgid "ROM files"
+msgstr "ROMファイル"
+
+msgid "SoundFont files"
+msgstr "SoundFontファイル"
+
+msgid "Local Switch"
+msgstr "ローカルスイッチ"
+
+msgid "Remote Switch"
+msgstr "リモートスイッチ"
+
+msgid "Switch:"
+msgstr "スイッチ:"
+
+msgid "Hub Mode"
+msgstr "ハブモード"
+
+msgid "Hostname:"
+msgstr "ホスト名:"
+
+msgid "ISA RAM:"
+msgstr "ISA RAM:"
+
+msgid "ISA ROM:"
+msgstr "ISA ROM:"
+
+msgid "&Wipe NVRAM"
+msgstr "NVRAMを消去する(&W)"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "これによって、仮想マシン内の\"nvr\"サブディレクトリに格納されているすべてのNVRAM(および関連)ファイルが削除されます。必要に応じて、BIOSの設定(および仮想マシン内の他のデバイス設定)を再構成する必要があります。\n\n仮想マシン\"%1\"のすべてのNVRAM内容を削除してもよろしいですか?"
+
+msgid "Success"
+msgstr "成功"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "仮想マシン\"%1\"のNVRAMの内容を正常に消去しました"
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "仮想マシン\"%1\"のNVRAMの内容を消去しようとした際にエラーが発生しました"
+
+msgid "%1 VM Manager"
+msgstr "%1 VMマネージャー"
+
+msgid "%n disk(s)"
+msgstr "%n ディスク"
+
+msgid "Unknown Status"
+msgstr "不明な状態"
+
+msgid "No Machines Found!"
+msgstr "マシンが検出されません!"
+
+msgid "Check for updates on startup"
+msgstr "起動時にアップデートを確認する"
+
+msgid "Unable to determine release information"
+msgstr "リリース情報を確認できません"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "アップデートの確認中にエラーが発生しました:\n\n%1\n\n後ほどもう一度お試しください。"
+
+msgid "Update check complete"
+msgstr "アップデートチェック完了"
+
+msgid "stable"
+msgstr "安定"
+
+msgid "beta"
+msgstr "ベータ"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "あなたは最新の%1版の86Boxを実行しています: %2"
+
+msgid "version"
+msgstr "バージョン"
+
+msgid "build"
+msgstr "ビルド"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "現在、バージョン<b>%1</b>を実行中です。"
+
+msgid "<b>Version %1</b> is now available."
+msgstr "<b>バージョン %1</b> が現在利用可能です。"
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "現在、ビルド<b>%1</b>を実行中です。"
+
+msgid "<b>Build %1</b> is now available."
+msgstr "<b>ビルド %1</b> が現在利用可能です。"
+
+msgid "Would you like to visit the download page?"
+msgstr "ダウンロードページをご覧になりたいですか？"
+
+msgid "Visit download page"
+msgstr "ダウンロードページをご覧ください"
+
+msgid "Update check"
+msgstr "アップデートチェック"
+
+msgid "Checking for updates..."
+msgstr "アップデートを確認中..."
+
+msgid "86Box Update"
+msgstr "86Box アップデート"
+
+msgid "Release notes:"
+msgstr "リリースノート:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "仮想マシンの予期せぬ終了"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "仮想マシン\"%1\"のプロセスが、終了コード %2 で予期せず終了しました。"
+
+msgid "The system will not be added."
+msgstr "システムは追加されません。"
+
+msgid "&Update mouse every CPU frame"
+msgstr "マウスをCPUフレームごとに更新(&U)"
+
+msgid "Hue"
+msgstr "色相"
+
+msgid "Saturation"
+msgstr "飽和"
+
+msgid "Contrast"
+msgstr "対比"
+
+msgid "Brightness"
+msgstr "明るさ"
+
+msgid "Sharpness"
+msgstr "シャープネス"
+
+msgid "&CGA composite settings..."
+msgstr "CGA複合モードの設定...(&C)"
+
+msgid "CGA composite settings"
+msgstr "CGA複合モードの設定"
+
+msgid "Monitor EDID"
+msgstr "モニターのEDID"
+
+msgid "Export..."
+msgstr "エクスポート..."
+
+msgid "Export EDID"
+msgstr "EDIDのエクスポート"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "EDIDファイル \"%ls\" が大きすぎます。"
+
+msgid "OpenGL input scale"
+msgstr "OpenGLの入力スケール"
+
+msgid "OpenGL input stretch mode"
+msgstr "OpenGLの入力ストレッチモード"
+
+msgid "Color scheme"
+msgstr "配色"
+
+msgid "Light"
+msgstr "光"
+
+msgid "Dark"
+msgstr "暗闇"
diff --git a/src/qt/languages/ko-KR.po b/src/qt/languages/ko-KR.po
index a8ff2723d..14da0ec8b 100644
--- a/src/qt/languages/ko-KR.po
+++ b/src/qt/languages/ko-KR.po
@@ -1,3 +1,11 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: ko_KR\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
 msgstr "동작(&A)"
 
@@ -10,8 +18,8 @@ msgstr "우측CTRL로 좌측ALT 입력(&R)"
 msgid "&Hard Reset..."
 msgstr "재시작(&H)..."
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "Ctrl+Alt+Del(&C)\tCtrl+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del(&C)"
 
 msgid "Ctrl+Alt+&Esc"
 msgstr "Ctrl+Alt+Esc(&E)"
@@ -19,8 +27,14 @@ msgstr "Ctrl+Alt+Esc(&E)"
 msgid "&Pause"
 msgstr "일시정지(&P)"
 
-msgid "E&xit..."
-msgstr "끝내기(&X)..."
+msgid "Pause"
+msgstr "일시정지"
+
+msgid "Re&sume"
+msgstr "상태에서 재개"
+
+msgid "E&xit"
+msgstr "끝내기(&X)"
 
 msgid "&View"
 msgstr "표시(&V)"
@@ -40,26 +54,20 @@ msgstr "창 크기와 위치를 기억하기(&E)"
 msgid "Re&nderer"
 msgstr "렌더러(&N)"
 
-msgid "&SDL (Software)"
-msgstr "SDL (소프트웨어)(&S)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (하드웨어)(&H)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (OpenGL)(&O)"
+msgid "&Qt (Software)"
+msgstr "Qt (소프트웨어)(&Q)"
 
 msgid "Open&GL (3.0 Core)"
-msgstr "OpenGL (3.0 코어)(&G)"
+msgstr "OpenGL (3.0 Core)(&G)"
 
 msgid "&VNC"
 msgstr "VNC(&V)"
 
-msgid "Specify dimensions..."
-msgstr "창 크기 지정하기..."
+msgid "Specify &dimensions..."
+msgstr "창 크기 지정하기...(&D)"
 
-msgid "F&orce 4:3 display ratio"
-msgstr "화면 비율을 4:3으로 맞추기(&O)"
+msgid "Force &4:3 display ratio"
+msgstr "화면 비율을 4:3으로 맞추기(&4)"
 
 msgid "&Window scale factor"
 msgstr "창 표시 배율(&W)"
@@ -94,8 +102,8 @@ msgstr "7배(&7)"
 msgid "&8x"
 msgstr "8배(&8)"
 
-msgid "Filter method"
-msgstr "필터 형식"
+msgid "Fi&lter method"
+msgstr "필터 형식(&L)"
 
 msgid "&Nearest"
 msgstr "최근방 이웃 보간법(&N)"
@@ -106,8 +114,8 @@ msgstr "선형 보간법(&L)"
 msgid "Hi&DPI scaling"
 msgstr "HiDPI 스케일링(&D)"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "전체 화면(&F)\tCtrl+Alt+PgUp"
+msgid "&Fullscreen"
+msgstr "전체 화면(&F)"
 
 msgid "Fullscreen &stretch mode"
 msgstr "전체 화면 비율(&S)"
@@ -127,8 +135,8 @@ msgstr "정수배 확대(&I)"
 msgid "4:&3 Integer scale"
 msgstr "4:3 정수배 확대(&3)"
 
-msgid "E&GA/(S)VGA settings"
-msgstr "E&GA/(S)VGA 설정"
+msgid "EGA/(S)&VGA settings"
+msgstr "EGA/(S)&VGA 설정"
 
 msgid "&Inverted VGA monitor"
 msgstr "색상 반전된 VGA 모니터(&I)"
@@ -139,9 +147,15 @@ msgstr "VGA 화면 종류(&T)"
 msgid "RGB &Color"
 msgstr "RGB 천연색(&C)"
 
+msgid "RGB (no brown)"
+msgstr "RGB (갈색 없음)"
+
 msgid "&RGB Grayscale"
 msgstr "RGB 회색조(&R)"
 
+msgid "Generic RGBI color monitor"
+msgstr "일반 RGBI 컬러 모니터"
+
 msgid "&Amber monitor"
 msgstr "주황색 모니터(&A)"
 
@@ -178,11 +192,17 @@ msgstr "도구(&T)"
 msgid "&Settings..."
 msgstr "설정(&S)..."
 
+msgid "Settings..."
+msgstr "설정..."
+
 msgid "&Update status bar icons"
 msgstr "상태 바 아이콘 갱신하기(&U)"
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "스크린샷 찍기(&C)\tCtrl+F11"
+msgid "Take s&creenshot"
+msgstr "스크린샷 찍기(&C)"
+
+msgid "S&ound"
+msgstr "사운드(&O)"
 
 msgid "&Preferences..."
 msgstr "환경설정(&P)..."
@@ -193,11 +213,11 @@ msgstr "디스코드 연동 활성화하기(&D)"
 msgid "Sound &gain..."
 msgstr "음량 증폭(&G)..."
 
-msgid "Begin trace\tCtrl+T"
-msgstr "추적 시작하기\tCtrl+T"
+msgid "Begin trace"
+msgstr "추적 시작하기"
 
-msgid "End trace\tCtrl+T"
-msgstr "추적 끝내기\tCtrl+T"
+msgid "End trace"
+msgstr "추적 끝내기"
 
 msgid "&Help"
 msgstr "도움말(&H)"
@@ -244,8 +264,8 @@ msgstr "음소거(&M)"
 msgid "E&mpty"
 msgstr "비었음(&M)"
 
-msgid "&Reload previous image"
-msgstr "이전 이미지 다시 불러오기(&R)"
+msgid "Reload previous image"
+msgstr "이전 이미지 다시 불러오기"
 
 msgid "&Folder..."
 msgstr "폴더(&F)..."
@@ -301,18 +321,12 @@ msgstr "확인"
 msgid "Cancel"
 msgstr "취소"
 
-msgid "Save these settings as &global defaults"
-msgstr "이 설정들을 전역 기본값으로 저장하기(&G)"
-
 msgid "&Default"
 msgstr "기본값(&D)"
 
 msgid "Language:"
 msgstr "언어:"
 
-msgid "Icon set:"
-msgstr "아이콘셋:"
-
 msgid "Gain"
 msgstr "증가값"
 
@@ -346,6 +360,9 @@ msgstr "기종:"
 msgid "Configure"
 msgstr "설정"
 
+msgid "CPU:"
+msgstr "CPU:"
+
 msgid "CPU type:"
 msgstr "CPU 종류:"
 
@@ -382,11 +399,23 @@ msgstr "사용 (UTC)"
 msgid "Dynamic Recompiler"
 msgstr "동적 재컴파일"
 
+msgid "CPU frame size"
+msgstr "CPU 프레임 크기"
+
+msgid "Larger frames (less smooth)"
+msgstr "더 큰 프레임 (덜 부드럽음)"
+
+msgid "Smaller frames (smoother)"
+msgstr "더 작은 프레임 (더 부드러운)"
+
 msgid "Video:"
 msgstr "비디오 카드:"
 
-msgid "Voodoo Graphics"
-msgstr "Voodoo 그래픽"
+msgid "Video #2:"
+msgstr "비디오 카드 2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Voodoo 1 또는 2 그래픽"
 
 msgid "IBM 8514/A Graphics"
 msgstr "IBM 8514/A 그래픽"
@@ -394,12 +423,27 @@ msgstr "IBM 8514/A 그래픽"
 msgid "XGA Graphics"
 msgstr "XGA 그래픽"
 
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "IBM PS/55 디스플레이 어댑터 그래픽스"
+
+msgid "Keyboard:"
+msgstr "키보드:"
+
+msgid "Keyboard"
+msgstr "키보드"
+
 msgid "Mouse:"
 msgstr "마우스:"
 
+msgid "Mouse"
+msgstr "마우스"
+
 msgid "Joystick:"
 msgstr "조이스틱:"
 
+msgid "Joystick"
+msgstr "조이스틱"
+
 msgid "Joystick 1..."
 msgstr "조이스틱 1..."
 
@@ -430,6 +474,9 @@ msgstr "MIDI 출력 장치:"
 msgid "MIDI In Device:"
 msgstr "MIDI 입력 장치:"
 
+msgid "MIDI Out:"
+msgstr "MIDI 출력:"
+
 msgid "Standalone MPU-401"
 msgstr "MPU-401 단독 사용"
 
@@ -445,15 +492,6 @@ msgstr "Nuked (더 정확한)"
 msgid "YMFM (faster)"
 msgstr "YMFM (더 빠르게)"
 
-msgid "Network type:"
-msgstr "네트워크 종류:"
-
-msgid "PCap device:"
-msgstr "PCap 장치:"
-
-msgid "Network adapter:"
-msgstr "네트워크 어댑터:"
-
 msgid "COM1 Device:"
 msgstr "COM1 장치:"
 
@@ -478,6 +516,9 @@ msgstr "LPT3 장치:"
 msgid "LPT4 Device:"
 msgstr "LPT4 장치:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr "내부 LPT의 ECP의 DMA:"
+
 msgid "Serial port 1"
 msgstr "직렬 포트 1"
 
@@ -502,18 +543,21 @@ msgstr "병렬 포트 3"
 msgid "Parallel port 4"
 msgstr "병렬 포트 4"
 
-msgid "HD Controller:"
-msgstr "HD 컨트롤러:"
-
 msgid "FD Controller:"
 msgstr "FD 컨트롤러:"
 
+msgid "CD-ROM Controller:"
+msgstr "CD-ROM 컨트롤러:"
+
 msgid "Tertiary IDE Controller"
 msgstr "제3의 IDE 컨트롤러"
 
 msgid "Quaternary IDE Controller"
 msgstr "제4의 IDE 컨트롤러"
 
+msgid "Hard disk"
+msgstr "하드 디스크"
+
 msgid "SCSI"
 msgstr "SCSI"
 
@@ -535,6 +579,9 @@ msgstr "카세트 테이프"
 msgid "Hard disks:"
 msgstr "하드 디스크:"
 
+msgid "Firmware Version"
+msgstr "펌웨어 버전"
+
 msgid "&New..."
 msgstr "새로 만들기(&N)..."
 
@@ -589,14 +636,17 @@ msgstr "BPB 확인"
 msgid "CD-ROM drives:"
 msgstr "CD-ROM 드라이브:"
 
-msgid "Earlier drive"
-msgstr "이전 드라이브"
-
 msgid "MO drives:"
 msgstr "광자기 드라이브:"
 
-msgid "ZIP drives:"
-msgstr "ZIP 드라이브:"
+msgid "MO:"
+msgstr "광자기:"
+
+msgid "Removable disks:"
+msgstr "제거 가능한 디스크:"
+
+msgid "Removable disk drives:"
+msgstr "제거 가능한 디스크 드라이브:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
@@ -607,6 +657,9 @@ msgstr "ISA RTC 카드:"
 msgid "ISA Memory Expansion"
 msgstr "ISA 메모리 확장 카드"
 
+msgid "ISA ROM Cards"
+msgstr "ISA ROM 카드"
+
 msgid "Card 1:"
 msgstr "카드 1:"
 
@@ -619,18 +672,21 @@ msgstr "카드 3:"
 msgid "Card 4:"
 msgstr "카드 4:"
 
+msgid "Generic ISA ROM Board"
+msgstr "일반 ISA ROM 보드"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "일반 듀얼 ISA ROM 보드"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "일반 쿼드 ISA ROM 보드"
+
 msgid "ISABugger device"
 msgstr "ISABugger 장치"
 
 msgid "POST card"
 msgstr "POST 카드"
 
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Malgun Gothic"
-
 msgid "86Box"
 msgstr "86Box"
 
@@ -641,19 +697,22 @@ msgid "Fatal error"
 msgstr "치명적인 오류"
 
 msgid " - PAUSED"
-msgstr " - PAUSED"
-
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Ctrl+Alt+PgDn 키를 누르면 창 모드로 전환합니다."
+msgstr " - 일시 중지됨"
 
 msgid "Speed"
 msgstr "속도"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "제거 가능한 디스크 %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "ZIP 이미지"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "제거 가능한 디스크(&R) %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "제거 가능한 디스크 이미지"
+
+msgid "Image %1"
+msgstr "이미지 %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
 msgstr "86Box에서 사용 가능한 ROM 이미지를 찾을 수 없습니다.\n\nROM 세트를<a href=\"https://github.com/86Box/roms/releases/latest\">다운로드</a> 후 \"roms\" 디렉토리에 압축을 풀어 주세요."
@@ -688,6 +747,12 @@ msgstr "roms/machines 디렉토리에 필요한 롬파일이 없어 기종 \"%hs
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
 msgstr "roms/video 디렉토리에 필요한 롬파일이 없어 비디오 카드 \"%hs\"을(를) 사용할 수 없습니다. 사용 가능한 기종으로 변경합니다."
 
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "roms/video 디렉토리에 필요한 롬파일이 없어 비디오 카드 2 \"%hs\"을(를) 사용할 수 없습니다. 두 번째 비디오 카드를 비활성화합니다."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "필요한 롬파일이 없어 장치 \"%hs\"을(를) 사용할 수 없습니다. 장치를 무시합니다."
+
 msgid "Machine"
 msgstr "기종"
 
@@ -706,12 +771,30 @@ msgstr "네트워크"
 msgid "Ports (COM & LPT)"
 msgstr "포트 (COM & LPT)"
 
+msgid "Ports"
+msgstr "포트"
+
+msgid "Serial ports:"
+msgstr "시리얼 포트:"
+
+msgid "Parallel ports:"
+msgstr "병렬 포트:"
+
 msgid "Storage controllers"
 msgstr "장치 컨트롤러"
 
 msgid "Hard disks"
 msgstr "하드 디스크"
 
+msgid "Disks:"
+msgstr "디스크:"
+
+msgid "Floppy:"
+msgstr "플로피:"
+
+msgid "Controllers:"
+msgstr "컨트롤러:"
+
 msgid "Floppy & CD-ROM drives"
 msgstr "플로피 / CD-ROM"
 
@@ -721,14 +804,17 @@ msgstr "기타 이동식 저장장치"
 msgid "Other peripherals"
 msgstr "기타 주변기기"
 
+msgid "Other devices"
+msgstr "기타 저장장치"
+
 msgid "Click to capture mouse"
 msgstr "이 창을 클릭하면 마우스를 사용합니다"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "F12+F8키를 누르면 마우스를 해제합니다"
+msgid "Press %1 to release mouse"
+msgstr "%1키를 누르면 마우스를 해제합니다"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "F12+F8키 또는 가운데 버튼을 클릭하면 마우스를 해제합니다"
+msgid "Press %1 or middle button to release mouse"
+msgstr "%1키 또는 가운데 버튼을 클릭하면 마우스를 해제합니다"
 
 msgid "Bus"
 msgstr "버스"
@@ -748,65 +834,89 @@ msgstr "S"
 msgid "KB"
 msgstr "KB"
 
-msgid "Could not initialize the video renderer."
-msgstr "비디오 렌더러를 초기화할 수 없습니다."
-
 msgid "Default"
 msgstr "기본값"
 
-msgid "%i Wait state(s)"
-msgstr "%i 대기 상태"
+msgid "%1 Wait state(s)"
+msgstr "%1 대기 상태"
 
 msgid "Type"
 msgstr "형식"
 
-msgid "Failed to set up PCap"
-msgstr "PCap 설정에 실패했습니다"
-
 msgid "No PCap devices found"
 msgstr "PCap 장치가 없습니다"
 
 msgid "Invalid PCap device"
 msgstr "PCap 장치가 올바르지 않습니다"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "표준 2버튼 조이스틱"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "2축, 2버튼 조이스틱"
 
-msgid "Standard 4-button joystick"
-msgstr "표준 4버튼 조이스틱"
+msgid "2-axis, 4-button joystick"
+msgstr "2축, 4버튼 조이스틱"
 
-msgid "Standard 6-button joystick"
-msgstr "표준 6버튼 조이스틱"
+msgid "2-axis, 6-button joystick"
+msgstr "2축, 6버튼 조이스틱"
 
-msgid "Standard 8-button joystick"
-msgstr "표준 8버튼 조이스틱"
+msgid "2-axis, 8-button joystick"
+msgstr "2축, 8버튼 조이스틱"
+
+msgid "3-axis, 2-button joystick"
+msgstr "3축, 2버튼 조이스틱"
+
+msgid "3-axis, 4-button joystick"
+msgstr "3축, 4버튼 조이스틱"
+
+msgid "4-axis, 4-button joystick"
+msgstr "4축, 4버튼 조이스틱"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH Pedals"
+
 msgid "Microsoft SideWinder Pad"
 msgstr "Microsoft SideWinder Pad"
 
 msgid "Thrustmaster Flight Control System"
 msgstr "Thrustmaster Flight Control System"
 
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Rudder Control System"
+
+msgid "2-button gamepad(s)"
+msgstr "2버튼 게임패드"
+
+msgid "2-button flight yoke"
+msgstr "2버튼 비행 조종간"
+
+msgid "4-button gamepad"
+msgstr "4버튼 게임패드"
+
+msgid "4-button flight yoke"
+msgstr "4버튼 비행 조종간"
+
+msgid "2-button flight yoke with throttle"
+msgstr "2버튼 비행 조종간과 스로틀"
+
+msgid "4-button flight yoke with throttle"
+msgstr "4버튼 비행 조종간과 스로틀"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Win95 조타륜 (3축, 4버튼)"
+
 msgid "None"
 msgstr "없음"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "키보드 가속기를 불러올 수 없습니다."
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CHS: %2, %3, %4)"
 
-msgid "Unable to register raw input."
-msgstr "Raw 입력을 등록할 수 없습니다."
+msgid "Floppy %1 (%2): %3"
+msgstr "플로피 %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "플로피 %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "플로피 %1 (%2): %3(&F)"
 
 msgid "Advanced sector images"
 msgstr "어드밴스드 섹터 이미지"
@@ -814,9 +924,6 @@ msgstr "어드밴스드 섹터 이미지"
 msgid "Flux images"
 msgstr "플럭스 이미지"
 
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "SDL을 초기화할 수 없습니다. SDL2.dll이 필요합니다"
-
 msgid "Are you sure you want to hard reset the emulated machine?"
 msgstr "실행중인 머신을 재시작하시겠습니까?"
 
@@ -826,8 +933,14 @@ msgstr "86Box를 끝내시겠습니까?"
 msgid "Unable to initialize Ghostscript"
 msgstr "Ghostscript를 초기화할 수 없습니다"
 
-msgid "MO %i (%ls): %ls"
-msgstr "광자기 %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "GhostPCL를 초기화할 수 없습니다"
+
+msgid "MO %1 (%2): %3"
+msgstr "광자기 %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "광자기 %1 (%2): %3(&M)"
 
 msgid "MO images"
 msgstr "광자기 이미지"
@@ -835,8 +948,17 @@ msgstr "광자기 이미지"
 msgid "Welcome to 86Box!"
 msgstr "86Box에 어서오세요!"
 
-msgid "Internal controller"
-msgstr "내부 컨트롤러"
+msgid "Internal device"
+msgstr "내부 장치"
+
+msgid "&File"
+msgstr "파일(&F)"
+
+msgid "&New machine..."
+msgstr "새로운 기계(&N)..."
+
+msgid "&Check for updates..."
+msgstr "업데이트 확인 중(&C)..."
 
 msgid "Exit"
 msgstr "끝내기"
@@ -860,34 +982,22 @@ msgid "86Box v"
 msgstr "86Box v"
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "고전 컴퓨터 에뮬레이터\n\n저자: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nGNU General Public 라이선스 (버전 2 이상)에 의해 배포되었습니다. 자세한 내용은 LICENSE 파일을 읽어 주세요."
+msgstr "고전 컴퓨터 에뮬레이터\n\n저자: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\n이전 핵심 기여자로는 Sarah Walker, leilei, JohnElliott, greatpsycho 등이 있습니다.\n\nGNU General Public 라이선스 (버전 2 이상)에 의해 배포되었습니다. 자세한 내용은 LICENSE 파일을 읽어 주세요."
 
 msgid "Hardware not available"
 msgstr "하드웨어를 이용할 수 없습니다"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "이 설치되었는지 libpcap에 대응하는 네트워크에 접속되어 있는지 확인해 주세요."
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "이 설치되었는지 %1에 대응하는 네트워크에 접속되어 있는지 확인해 주세요."
 
 msgid "Invalid configuration"
 msgstr "올바르지 않은 설정입니다"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1은(는) PostScript 파일을 PDF로 자동변환하는 데에 필요합니다.\n\n표준 PostScript 프린터로 보내신 임의의 문서는 PostScript (.ps) 파일로 저장됩니다."
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr "은(는) PostScript 파일을 PDF로 자동변환하는 데에 필요합니다.\n\n표준 PostScript 프린터로 보내신 임의의 문서는 PostScript (.ps) 파일로 저장됩니다."
-
-msgid "Entering fullscreen mode"
-msgstr "전체 화면으로 전환"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1은(는) PCL 파일을 PDF로 자동변환하는 데에 필요합니다.\n\n표준 PCL 프린터로 보내신 임의의 문서는 Printer Command Language (.pcl) 파일로 저장됩니다."
 
 msgid "Don't show this message again"
 msgstr "이 메시지 그만 보기"
@@ -904,17 +1014,14 @@ msgstr "재시작 안함"
 msgid "CD-ROM images"
 msgstr "CD-ROM 이미지"
 
-msgid "%hs Device Configuration"
-msgstr "%hs 장치 설정"
+msgid "%1 Device Configuration"
+msgstr "%1 장치 설정"
 
 msgid "Monitor in sleep mode"
 msgstr "모니터 절전 모드"
 
-msgid "OpenGL Shaders"
-msgstr "OpenGL 쉐이더"
-
-msgid "OpenGL options"
-msgstr "OpenGL 설정"
+msgid "GLSL shaders"
+msgstr "GLSL 쉐이더"
 
 msgid "You are loading an unsupported configuration"
 msgstr "지원하지 않는 설정입니다"
@@ -925,30 +1032,33 @@ msgstr "이 에뮬레이트된 기종에 대해 선택한 기종을 기반으로
 msgid "Continue"
 msgstr "계속"
 
-msgid "Cassette: %s"
-msgstr "카세트: %s"
+msgid "Cassette: %1"
+msgstr "카세트: %1"
+
+msgid "C&assette: %1"
+msgstr "카세트: %1(&A)"
 
 msgid "Cassette images"
 msgstr "카세트 이미지"
 
-msgid "Cartridge %i: %ls"
-msgstr "카트리지 %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "카트리지 %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "카트리지 %1: %2(&T)"
 
 msgid "Cartridge images"
 msgstr "카트리지 이미지"
 
-msgid "Error initializing renderer"
-msgstr "렌더러 초기화 오류"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "OpenGL (3.0 Core) 렌더러를 초기화할 수 없습니다. 다른 렌더러를 사용하십시오."
-
 msgid "Resume execution"
 msgstr "실행 재개"
 
 msgid "Pause execution"
 msgstr "실행 일시 중지"
 
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del"
+
 msgid "Press Ctrl+Alt+Del"
 msgstr "Ctrl+Alt+Del"
 
@@ -958,17 +1068,281 @@ msgstr "Ctrl+Alt+Esc"
 msgid "Hard reset"
 msgstr "재시작"
 
+msgid "Force shutdown"
+msgstr "강제 종료"
+
+msgid "Start"
+msgstr "시작"
+
+msgid "Not running"
+msgstr "실행 중이 아닙니다"
+
+msgid "Running"
+msgstr "실행 중입니다"
+
+msgid "Paused"
+msgstr "일시 중지되었습니다"
+
+msgid "Waiting"
+msgstr "대기 중입니다"
+
+msgid "Powered Off"
+msgstr "전원이 꺼져 있습니다"
+
+msgid "%n running"
+msgstr "%n 실행 중입니다"
+
+msgid "%n paused"
+msgstr "%n 일시 중지되었습니다"
+
+msgid "%n waiting"
+msgstr "%n 대기 중입니다"
+
+msgid "%1 total"
+msgstr "%1 총계"
+
+msgid "VMs: %1"
+msgstr "가상 머신: %1"
+
+msgid "System Directory:"
+msgstr "시스템 디렉토리:"
+
+msgid "Choose directory"
+msgstr "디렉토리 선택"
+
+msgid "Choose configuration file"
+msgstr "구성 파일 선택"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "86Box 구성 파일 (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "구성 읽기 실패"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "선택한 구성 파일을 읽기 위해 열 수 없습니다: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "검색 상자에 정규 표현식 사용"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "현재 %1대의 머신이 활성화되어 있습니다. 가상 머신 관리자를 종료하시겠습니까?"
+
+msgid "Add new system wizard"
+msgstr "새로운 시스템을 추가하는 마법사"
+
+msgid "Introduction"
+msgstr "서론"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "이것은 86Box에 새로운 시스템을 추가하는 데 도움이 될 것입니다."
+
+msgid "New configuration"
+msgstr "새로운 구성"
+
+msgid "Complete"
+msgstr "완료"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "마법사가 이제 새로운 시스템의 설정을 시작합니다."
+
+msgid "Use existing configuration"
+msgstr "기존 구성 사용"
+
+msgid "Type some notes here"
+msgstr "여기 메모를 입력하세요"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "기존 구성 파일의 내용을 아래 상자에 붙여넣으세요."
+
+msgid "Load configuration from file"
+msgstr "파일에서 구성 로드"
+
+msgid "System name"
+msgstr "시스템 이름"
+
+msgid "System name:"
+msgstr "시스템 이름:"
+
+msgid "System name cannot contain certain characters"
+msgstr "시스템 이름에는 특정 문자를 포함할 수 없습니다"
+
+msgid "System name already exists"
+msgstr "시스템 이름이 이미 존재합니다"
+
+msgid "Please enter a directory for the system"
+msgstr "시스템을 위한 디렉토리를 입력해 주세요"
+
+msgid "Directory does not exist"
+msgstr "디렉토리가 존재하지 않습니다"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "위에서 선택한 디렉토리에 시스템용 새로운 디렉토리가 생성됩니다"
+
+msgid "System location:"
+msgstr "시스템 위치:"
+
+msgid "System name and location"
+msgstr "시스템 이름 및 위치"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "시스템 이름을 입력하고 위치를 선택하세요"
+
+msgid "Enter the name of the system"
+msgstr "시스템 이름을 입력하세요"
+
+msgid "Please enter a system name"
+msgstr "시스템 이름을 입력해 주세요"
+
+msgid "Display name (optional):"
+msgstr "표시 이름 (선택 사항):"
+
+msgid "Display name:"
+msgstr "표시 이름:"
+
+msgid "Set display name"
+msgstr "표시 이름 설정"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "새 표시 이름을 입력하세요 (비워두면 초기화됩니다)"
+
+msgid "Change &display name..."
+msgstr "표시 이름 변경(&D)..."
+
+msgid "Context Menu"
+msgstr "컨텍스트 메뉴"
+
+msgid "&Open folder..."
+msgstr "폴더 열기(&O)..."
+
+msgid "Open p&rinter tray..."
+msgstr "프린터 트레이를 열기(&R)..."
+
+msgid "Set &icon..."
+msgstr "아이콘 설정(&I)..."
+
+msgid "Select an icon"
+msgstr "아이콘을 선택하세요"
+
+msgid "C&lone..."
+msgstr "클론(&L)..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "가상 머신 \"%1\" (%2)는 다음으로 복제됩니다:"
+
+msgid "Directory %1 already exists"
+msgstr "%1 디렉토리가 이미 존재합니다"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "이름에 다음 문자를 사용할 수 없습니다: %1"
+
+msgid "Clone"
+msgstr "클론"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "클론된 가상 머신을 위한 디렉토리를 생성하지 못했습니다"
+
+msgid "Failed to clone VM."
+msgstr "가상 머신 복제에 실패했습니다."
+
+msgid "Directory in use"
+msgstr "사용 중인 디렉토리"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "선택한 디렉토리가 이미 사용 중입니다. 다른 디렉토리를 선택해 주시기 바랍니다."
+
+msgid "Create directory failed"
+msgstr "디렉토리 생성 실패"
+
+msgid "Unable to create the directory for the new system"
+msgstr "새 시스템용 디렉토리를 생성할 수 없습니다"
+
+msgid "Configuration write failed"
+msgstr "구성 쓰기 실패"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "%1에서 구성 파일을 쓰기 위해 열 수 없습니다"
+
+msgid "Error adding system"
+msgstr "시스템 추가 오류"
+
+msgid "Remove directory failed"
+msgstr "디렉토리 제거에 실패했습니다"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "기계 디렉토리 내의 일부 파일이 삭제되지 않았습니다. 해당 파일을 수동으로 삭제해 주시기 바랍니다."
+
+msgid "Build"
+msgstr "빌드"
+
+msgid "Version"
+msgstr "버전"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "86Box의 업데이트가 가능합니다: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "업데이트 확인 중 오류가 발생했습니다: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>86Box의 업데이트가 제공됩니다!</b>"
+
+msgid "Warning"
+msgstr "경고"
+
+msgid "&Kill"
+msgstr "강제 종료(&K)"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "가상 머신을 강제 종료하면 데이터 손실이 발생할 수 있습니다. 86Box 프로세스가 멈춘 경우에만 이 작업을 수행하십시오.\n\n가상 머신 \"%1\"을 정말로 종료하시겠습니까?"
+
+msgid "&Delete"
+msgstr "삭제(&D)"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "정말 가상 머신 \"%1\"과 모든 파일을 삭제하시겠습니까? 이 작업은 되돌릴 수 없습니다!"
+
+msgid "Show &config file"
+msgstr "구성 파일 표시(&C)"
+
+msgid "No screenshot"
+msgstr "스크린샷 없음"
+
+msgid "Search"
+msgstr "검색"
+
+msgid "Searching for VMs..."
+msgstr "가상 머신을 검색 중입니다..."
+
+msgid "Found %1"
+msgstr "%1 발견됨"
+
+msgid "System"
+msgstr "시스템"
+
+msgid "Storage"
+msgstr "장치"
+
+msgid "Disk %1: "
+msgstr "디스크 %1: "
+
+msgid "No disks"
+msgstr "디스크 없음"
+
+msgid "Audio"
+msgstr "오디오"
+
+msgid "Audio:"
+msgstr "오디오:"
+
 msgid "ACPI shutdown"
 msgstr "ACPI 종료"
 
-msgid "Hard disk (%s)"
-msgstr "하드 디스크 (%s)"
+msgid "ACP&I shutdown"
+msgstr "ACP&I 종료"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "하드 디스크 (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
 msgstr "MFM/RLL 또는 ESDI CD-ROM 드라이브가 존재하지 않습니다"
@@ -1003,9 +1377,6 @@ msgstr "파일을 저장할 수 없습니다"
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
 msgstr "512 바이트 이외의 섹터 크기를 가진 HDI 또는 HDX 형식의 이미지를 생성할 수 없습니다"
 
-msgid "USB is not yet supported"
-msgstr "USB는 아직 지원하지 않습니다"
-
 msgid "Disk image file already exists"
 msgstr "디스크 이미지 파일이 이미 존재합니다"
 
@@ -1039,6 +1410,27 @@ msgstr "덮어쓰기"
 msgid "Don't overwrite"
 msgstr "덮어쓰지 않음"
 
+msgid "Raw image"
+msgstr "Raw 이미지"
+
+msgid "HDI image"
+msgstr "HDI 이미지"
+
+msgid "HDX image"
+msgstr "HDX 이미지"
+
+msgid "Fixed-size VHD"
+msgstr "고정 사이즈 VHD"
+
+msgid "Dynamic-size VHD"
+msgstr "동적 사이즈 VHD"
+
+msgid "Differencing VHD"
+msgstr "디퍼런싱 VHD"
+
+msgid "(N/A)"
+msgstr "(해당 없음)"
+
 msgid "Raw image (.img)"
 msgstr "Raw 이미지 (.img)"
 
@@ -1078,9 +1470,6 @@ msgstr "부모 디스크와 자식 디스크의 타임스탬프가 일치하지
 msgid "Could not fix VHD timestamp."
 msgstr "VHD 타임스탬프를 고칠 수 없습니다"
 
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
-
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
 
@@ -1096,44 +1485,29 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "CD-ROM(&C) %1 (%2): %3"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
+msgid "160 KB"
+msgstr "160 KB"
 
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
+msgid "180 KB"
+msgstr "180 KB"
 
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
+msgid "320 KB"
+msgstr "320 KB"
 
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
+msgid "360 KB"
+msgstr "360 KB"
 
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
+msgid "640 KB"
+msgstr "640 KB"
 
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
+msgid "720 KB"
+msgstr "720 KB"
 
 msgid "1.2 MB"
 msgstr "1.2 MB"
@@ -1227,3 +1601,1383 @@ msgstr "빠른"
 
 msgid "&Auto-pause on focus loss"
 msgstr "집중력 저하 시 자동 일시 중지(&A)"
+
+msgid "WinBox is no longer supported"
+msgstr "WinBox는 더 이상 지원되지 않습니다"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "WinBox 매니저의 개발은 유지 관리자의 부족으로 인해 2022년에 중단되었습니다. 86Box를 더욱 개선하기 위한 노력의 일환으로 WinBox 매니저를 더 이상 지원하지 않기로 결정했습니다.\n\nWinBox를 통해 더 이상의 업데이트는 제공되지 않으며, 최신 버전의 86Box를 계속 사용할 경우 잘못된 동작이 발생할 수 있습니다. WinBox 동작과 관련된 모든 버그 보고는 유효하지 않은 것으로 종료됩니다.\n\n사용할 수 있는 다른 관리자 목록을 보려면 86box.net으로 이동하세요."
+
+msgid "Generate"
+msgstr "생성"
+
+msgid "Joystick configuration"
+msgstr "조이스틱 구성"
+
+msgid "Device"
+msgstr "장치"
+
+msgid "%1 (X axis)"
+msgstr "1(X 축)"
+
+msgid "%1 (Y axis)"
+msgstr "1(Y 축)"
+
+msgid "MCA devices"
+msgstr "MCA 장치"
+
+msgid "List of MCA devices:"
+msgstr "MCA 장치 목록:"
+
+msgid "&Tablet tool"
+msgstr "태블릿 도구(&T)"
+
+msgid "About &Qt"
+msgstr "&Qt 소개"
+
+msgid "&MCA devices..."
+msgstr "&MCA 장치..."
+
+msgid "Show non-&primary monitors"
+msgstr "기본 모니터가 아닌 모니터 표시(&P)"
+
+msgid "Open screenshots &folder..."
+msgstr "스크린샷 폴더 열기...(&F)"
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "최대화 시 전체 화면 비율 적용(&Y)"
+
+msgid "&Cursor/Puck"
+msgstr "커서/퍽(&P)"
+
+msgid "&Pen"
+msgstr "펜(&P)"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "호스트 CD/DVD 드라이브(%1:) (&H)"
+
+msgid "&Connected"
+msgstr "&커넥티드"
+
+msgid "Clear image &history"
+msgstr "이미지 기록 지우기(&H)"
+
+msgid "Create..."
+msgstr "만들기..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "호스트 CD/DVD 드라이브 (%1)"
+
+msgid "Unknown Bus"
+msgstr "알 수 없는 버스"
+
+msgid "Null Driver"
+msgstr "Null 드라이버"
+
+msgid "NIC:"
+msgstr "NIC:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "NIC %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&NIC %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "렌더링 동작"
+
+msgid "Use target framerate:"
+msgstr "목표 프레임 레이트를 사용합니다:"
+
+msgid " fps"
+msgstr " fps"
+
+msgid "VSync"
+msgstr "VSync"
+
+msgid "Synchronize with video"
+msgstr "비디오와 동기"
+
+msgid "Shaders"
+msgstr "셰이더"
+
+msgid "Remove"
+msgstr "제거"
+
+msgid "Browse..."
+msgstr "찾아보기..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "OpenGL 컨텍스트를 만들 수 없습니다."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "OpenGL 컨텍스트로 전환할 수 없습니다."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "OpenGL 버전 3.0 이상이 필요합니다. 현재 버전은 %1.%2입니다."
+
+msgid "Error initializing OpenGL"
+msgstr "OpenGL 초기화 중 오류 발생"
+
+msgid "\nFalling back to software rendering."
+msgstr "\n소프트웨어 렌더링으로 돌아가기."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>미디어 이미지(CD-ROM, 플로피 등)를 선택하면 86Box 구성 파일과 동일한 디렉터리에서 열기 대화 상자가 시작됩니다. 이 설정은 macOS에서만 차이가 있을 수 있습니다.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "이 컴퓨터가 이동되었거나 복사되었을 수 있습니다."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "적절한 네트워킹 기능을 보장하기 위해 86Box는 이 머신이 이동 또는 복사되었는지 여부를 알아야 합니다.\n\n확실하지 않은 경우 \"복사했습니다\"를 선택합니다."
+
+msgid "I Moved It"
+msgstr "옮겼어요"
+
+msgid "I Copied It"
+msgstr "복사했습니다"
+
+msgid "86Box Monitor #"
+msgstr "86Box 모니터 "
+
+msgid "No MCA devices."
+msgstr "MCA 장치가 없습니다."
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "네트워크 카드 1"
+
+msgid "Network Card #2"
+msgstr "네트워크 카드 2"
+
+msgid "Network Card #3"
+msgstr "네트워크 카드 3"
+
+msgid "Network Card #4"
+msgstr "네트워크 카드 4"
+
+msgid "Mode:"
+msgstr "모드:"
+
+msgid "Interface:"
+msgstr "인터페이스:"
+
+msgid "Adapter:"
+msgstr "어댑터:"
+
+msgid "VDE Socket:"
+msgstr "VDE 소켓:"
+
+msgid "86Box Unit Tester"
+msgstr "86Box 유닛 테스터"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Novell NetWare 2.x 키 카드"
+
+msgid "Serial port passthrough 1"
+msgstr "직렬 포트 패스스루 1"
+
+msgid "Serial port passthrough 2"
+msgstr "직렬 포트 패스스루 2"
+
+msgid "Serial port passthrough 3"
+msgstr "직렬 포트 패스스루 3"
+
+msgid "Serial port passthrough 4"
+msgstr "직렬 포트 패스스루 4"
+
+msgid "Renderer &options..."
+msgstr "렌더러 옵션...(&O)"
+
+msgid "PC/XT Keyboard"
+msgstr "PC/XT 키보드"
+
+msgid "AT Keyboard"
+msgstr "AT 키보드"
+
+msgid "AX Keyboard"
+msgstr "AX 키보드"
+
+msgid "PS/2 Keyboard"
+msgstr "PS/2 키보드"
+
+msgid "PS/55 Keyboard"
+msgstr "PS/55 키보드"
+
+msgid "Keys"
+msgstr "키"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "로지텍/마이크로소프트 버스 마우스"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "마이크로소프트 버스 마우스(인포트)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "마우스 시스템 시리얼 마우스"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "마우스 시스템 버스 마우스"
+
+msgid "Microsoft Serial Mouse"
+msgstr "마이크로소프트 시리얼 마우스"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "마이크로소프트 볼펜 시리얼 마우스"
+
+msgid "Logitech Serial Mouse"
+msgstr "로지텍 시리얼 마우스"
+
+msgid "PS/2 Mouse"
+msgstr "PS/2 마우스"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "PS/2 QuickPort 마우스"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M 마이크로터치(직렬)"
+
+msgid "Default Baud rate"
+msgstr "기본 보드 속도"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] 표준 헤이즈 호환 모뎀"
+
+msgid "Roland MT-32 Emulation"
+msgstr "롤랜드 MT-32 에뮬레이션"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "롤랜드 MT-32(신규) 에뮬레이션"
+
+msgid "Roland CM-32L Emulation"
+msgstr "롤랜드 CM-32L 에뮬레이션"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "롤랜드 CM-32LN 에뮬레이션"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "OPL4-ML 도터보드"
+
+msgid "System MIDI"
+msgstr "시스템 미디"
+
+msgid "MIDI Input Device"
+msgstr "미디 입력 장치"
+
+msgid "BIOS file"
+msgstr "BIOS 파일"
+
+msgid "BIOS file (ROM #1)"
+msgstr "BIOS 파일 (ROM 1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "BIOS 파일 (ROM 2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "BIOS 파일 (ROM 3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "BIOS 파일 (ROM 4)"
+
+msgid "BIOS address"
+msgstr "BIOS 주소"
+
+msgid "BIOS address (ROM #1)"
+msgstr "BIOS 주소 (ROM 1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "BIOS 주소 (ROM 2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "BIOS 주소 (ROM 3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "BIOS 주소 (ROM 4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "BIOS 확장 ROM 쓰기 활성화"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "BIOS 확장 ROM 쓰기 활성화 (ROM 1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "BIOS 확장 ROM 쓰기 활성화 (ROM 2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "BIOS 확장 ROM 쓰기 활성화 (ROM 3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "BIOS 확장 ROM 쓰기 활성화 (ROM 4)"
+
+msgid "Linear framebuffer base"
+msgstr "선형 프레임버퍼의 기본 주소"
+
+msgid "Address"
+msgstr "주소"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "시리얼 포트 IRQ"
+
+msgid "Parallel port IRQ"
+msgstr "병렬 포트 IRQ"
+
+msgid "BIOS Revision"
+msgstr "BIOS 개정"
+
+msgid "BIOS Version"
+msgstr "BIOS 버전"
+
+msgid "BIOS Language"
+msgstr "BIOS 언어"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "IBM 5161 확장 유닛"
+
+msgid "IBM Cassette Basic"
+msgstr "IBM 카세트 베이직"
+
+msgid "Translate 26 -> 17"
+msgstr "번역 26 -> 17"
+
+msgid "Language"
+msgstr "언어"
+
+msgid "Enable backlight"
+msgstr "백라이트 사용"
+
+msgid "Invert colors"
+msgstr "색상 반전"
+
+msgid "BIOS size"
+msgstr "BIOS 크기"
+
+msgid "BIOS size (ROM #1)"
+msgstr "BIOS 크기 (ROM 1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "BIOS 크기 (ROM 2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "BIOS 크기 (ROM 3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "BIOS 크기 (ROM 4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "C0000-C7FFF를 UMB로 매핑하기"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "C8000-CFFFF를 UMB로 매핑하기"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "D0000-D7FFF를 UMB로 매핑하기"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "D8000-DFFFF를 UMB로 매핑하기"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "E0000-E7FFF를 UMB로 매핑하기"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "E8000-EFFFF를 UMB로 매핑하기"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "JS9 점퍼(JIM)"
+
+msgid "MIDI Output Device"
+msgstr "미디 출력 장치"
+
+msgid "MIDI Real time"
+msgstr "실시간 MIDI"
+
+msgid "MIDI Thru"
+msgstr "미디 입력 패스스루"
+
+msgid "MIDI Clockout"
+msgstr "미디 클럭 출력"
+
+msgid "SoundFont"
+msgstr "사운드 글꼴"
+
+msgid "Output Gain"
+msgstr "출력 게인"
+
+msgid "Chorus"
+msgstr "코러스"
+
+msgid "Chorus Voices"
+msgstr "코러스 보이스"
+
+msgid "Chorus Level"
+msgstr "코러스 레벨"
+
+msgid "Chorus Speed"
+msgstr "코러스 속도"
+
+msgid "Chorus Depth"
+msgstr "코러스 깊이"
+
+msgid "Chorus Waveform"
+msgstr "코러스 파형"
+
+msgid "Reverb"
+msgstr "리버브"
+
+msgid "Reverb Room Size"
+msgstr "리버브 룸의 크기"
+
+msgid "Reverb Damping"
+msgstr "리버브 댐핑"
+
+msgid "Reverb Width"
+msgstr "리버브 폭"
+
+msgid "Reverb Level"
+msgstr "리버브 레벨"
+
+msgid "Interpolation Method"
+msgstr "보간 방법"
+
+msgid "Dynamic Sample Loading"
+msgstr "샘플의 동적 로딩"
+
+msgid "Reverb Output Gain"
+msgstr "리버브 출력의 게인"
+
+msgid "Reversed stereo"
+msgstr "리버시블 스테레오"
+
+msgid "Nice ramp"
+msgstr "멋진 경사로"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "버튼"
+
+msgid "Serial Port"
+msgstr "직렬 포트"
+
+msgid "RTS toggle"
+msgstr "RTS 토글"
+
+msgid "Revision"
+msgstr "개정"
+
+msgid "Controller"
+msgstr "컨트롤러"
+
+msgid "Show Crosshair"
+msgstr "십자선 표시"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "MAC 주소"
+
+msgid "MAC Address OUI"
+msgstr "MAC 주소 OUI"
+
+msgid "Enable BIOS"
+msgstr "BIOS 활성화"
+
+msgid "Baud Rate"
+msgstr "전송 속도"
+
+msgid "TCP/IP listening port"
+msgstr "TCP/IP 수신 포트"
+
+msgid "Phonebook File"
+msgstr "전화번호부 파일"
+
+msgid "Telnet emulation"
+msgstr "텔넷 에뮬레이션"
+
+msgid "RAM Address"
+msgstr "RAM 주소"
+
+msgid "RAM size"
+msgstr "RAM 크기"
+
+msgid "Initial RAM size"
+msgstr "초기 RAM 크기"
+
+msgid "Serial Number"
+msgstr "일련 번호"
+
+msgid "Host ID"
+msgstr "호스트 ID"
+
+msgid "FDC Address"
+msgstr "FDC 주소"
+
+msgid "MPU-401 Address"
+msgstr "MPU-401 주소"
+
+msgid "MPU-401 IRQ"
+msgstr "MPU-401 IRQ"
+
+msgid "Receive MIDI input"
+msgstr "미디 입력 받기"
+
+msgid "Low DMA"
+msgstr "낮은 DMA"
+
+msgid "Enable Game port"
+msgstr "게임 포트 사용"
+
+msgid "SID Model"
+msgstr "SID 모델"
+
+msgid "SID Filter Strength"
+msgstr "SID 필터 강도"
+
+msgid "Surround module"
+msgstr "서라운드 모듈"
+
+msgid "CODEC"
+msgstr "코덱"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "코덱 설정 시 코덱 인터럽트 올리기(일부 드라이버에 필요)"
+
+msgid "SB Address"
+msgstr "SB 주소"
+
+msgid "Adlib Address"
+msgstr "Adlib 주소"
+
+msgid "Use EEPROM setting"
+msgstr "EEPROM 설정 사용"
+
+msgid "WSS IRQ"
+msgstr "WSS IRQ"
+
+msgid "WSS DMA"
+msgstr "WSS DMA"
+
+msgid "Enable OPL"
+msgstr "OPL 사용"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "미디 입력 수신(MPU-401)"
+
+msgid "SB low DMA"
+msgstr "SB 낮은 DMA"
+
+msgid "6CH variant (6-channel)"
+msgstr "6채널 변형(6채널)"
+
+msgid "Enable CMS"
+msgstr "CMS 사용"
+
+msgid "Mixer"
+msgstr "믹서"
+
+msgid "High DMA"
+msgstr "높은 DMA"
+
+msgid "Control PC speaker"
+msgstr "PC 스피커 제어"
+
+msgid "Memory size"
+msgstr "메모리 크기"
+
+msgid "EMU8000 Address"
+msgstr "EMU8000 주소"
+
+msgid "IDE Controller"
+msgstr "IDE 컨트롤러"
+
+msgid "Codec"
+msgstr "코덱"
+
+msgid "GUS type"
+msgstr "GUS 유형"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "명령 0x04 활성화 \"86Box 종료\""
+
+msgid "Display type"
+msgstr "디스플레이 유형"
+
+msgid "Composite type"
+msgstr "복합 유형"
+
+msgid "RGB type"
+msgstr "RGB 유형"
+
+msgid "Line doubling type"
+msgstr "라인 두 배 유형"
+
+msgid "Snow emulation"
+msgstr "눈 에뮬레이션"
+
+msgid "Monitor type"
+msgstr "모니터 유형"
+
+msgid "Character set"
+msgstr "문자 집합"
+
+msgid "XGA type"
+msgstr "XGA 유형"
+
+msgid "Instance"
+msgstr "인스턴스"
+
+msgid "MMIO Address"
+msgstr "MMIO 주소"
+
+msgid "RAMDAC type"
+msgstr "램닥 유형"
+
+msgid "Blend"
+msgstr "블렌드"
+
+msgid "Font"
+msgstr "폰트"
+
+msgid "Bilinear filtering"
+msgstr "이중선형 필터링"
+
+msgid "Video chroma-keying"
+msgstr "비디오 크로마 키잉"
+
+msgid "Dithering"
+msgstr "디더링"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "CGA 에뮬레이션을 위한 NMI 활성화"
+
+msgid "Voodoo type"
+msgstr "부두 유형"
+
+msgid "Framebuffer memory size"
+msgstr "프레임버퍼 메모리 크기"
+
+msgid "Texture memory size"
+msgstr "텍스처 메모리 크기"
+
+msgid "Dither subtraction"
+msgstr "디더 빼기"
+
+msgid "Screen Filter"
+msgstr "화면 필터"
+
+msgid "Render threads"
+msgstr "렌더 스레드"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "시작 주소"
+
+msgid "Contiguous Size"
+msgstr "연속 크기"
+
+msgid "I/O Width"
+msgstr "I/O 폭"
+
+msgid "Transfer Speed"
+msgstr "전송 속도"
+
+msgid "EMS mode"
+msgstr "EMS 모드"
+
+msgid "EMS Address"
+msgstr "EMS 주소"
+
+msgid "EMS 1 Address"
+msgstr "EMS 1 주소"
+
+msgid "EMS 2 Address"
+msgstr "EMS 2 주소"
+
+msgid "EMS Memory Size"
+msgstr "EMS 메모리 용량"
+
+msgid "EMS 1 Memory Size"
+msgstr "EMS 1 메모리 용량"
+
+msgid "EMS 2 Memory Size"
+msgstr "EMS 2 메모리 용량"
+
+msgid "Enable EMS"
+msgstr "EMS 활성화"
+
+msgid "Enable EMS 1"
+msgstr "EMS 1 활성화"
+
+msgid "Enable EMS 2"
+msgstr "EMS 2 활성화"
+
+msgid "Address for > 2 MB"
+msgstr "2MB 이상의 주소"
+
+msgid "Frame Address"
+msgstr "프레임 주소"
+
+msgid "USA"
+msgstr "미국"
+
+msgid "Danish"
+msgstr "덴마크어"
+
+msgid "Always at selected speed"
+msgstr "항상 선택한 속도로"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "BIOS 설정 + 핫키(POST 중 꺼짐)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 KB부터 F0000"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "E0000에서 시작하는 128KB(주소 MSB 반전, 마지막 64 KB 먼저)"
+
+msgid "Sine"
+msgstr "사인"
+
+msgid "Triangle"
+msgstr "삼각형"
+
+msgid "Linear"
+msgstr "선형"
+
+msgid "4th Order"
+msgstr "4차 주문"
+
+msgid "7th Order"
+msgstr "7차 주문"
+
+msgid "Non-timed (original)"
+msgstr "타이머 없음(원본)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45Hz(JMP2에서 점퍼 없음)"
+
+msgid "Two"
+msgstr "Two"
+
+msgid "Three"
+msgstr "세"
+
+msgid "Wheel"
+msgstr "휠"
+
+msgid "Five + Wheel"
+msgstr "5개 + 휠"
+
+msgid "Five + 2 Wheels"
+msgstr "5개 + 2휠"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 직렬/SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) 직렬"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "BIOS 비활성화"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2MB"
+
+msgid "8 MB"
+msgstr "8MB"
+
+msgid "28 MB"
+msgstr "28MB"
+
+msgid "1 MB"
+msgstr "1MB"
+
+msgid "4 MB"
+msgstr "4MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16MB"
+
+msgid "20 MB"
+msgstr "20MB"
+
+msgid "24 MB"
+msgstr "24MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "시그마텔 STAC9721T(스테레오)"
+
+msgid "Classic"
+msgstr "클래식"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "합성"
+
+msgid "True color"
+msgstr "진정한 색상"
+
+msgid "Old"
+msgstr "Old"
+
+msgid "New"
+msgstr "신규"
+
+msgid "Color (generic)"
+msgstr "색상(일반)"
+
+msgid "Green Monochrome"
+msgstr "녹색 단색"
+
+msgid "Amber Monochrome"
+msgstr "앰버 모노크롬"
+
+msgid "Gray Monochrome"
+msgstr "회색 단색"
+
+msgid "Color (no brown)"
+msgstr "색상(갈색 없음)"
+
+msgid "Color (IBM 5153)"
+msgstr "색상(IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "간단한 두 배로 늘리기"
+
+msgid "sRGB interpolation"
+msgstr "sRGB 보간"
+
+msgid "Linear interpolation"
+msgstr "선형 보간"
+
+msgid "Has secondary 8x8 character set"
+msgstr "8x8 보조 문자 집합"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "쿼드컬러 II 딸보드"
+
+msgid "Alternate monochrome contrast"
+msgstr "대체 단색 대비"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "흑백(5151/MDA)(흰색)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "흑백(5151/MDA)(녹색)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "흑백(5151/MDA)(호박색)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "컬러 40x25(5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "컬러 80x25(5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "향상된 색상 - 일반 모드(5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "향상된 색상 - 향상된 모드(5154/ECD)"
+
+msgid "Green"
+msgstr "녹색"
+
+msgid "Amber"
+msgstr "Amber"
+
+msgid "Gray"
+msgstr "회색"
+
+msgid "Grayscale"
+msgstr "그레이스케일"
+
+msgid "Color"
+msgstr "색상"
+
+msgid "U.S. English"
+msgstr "미국 영어"
+
+msgid "Scandinavian"
+msgstr "스칸디나비아"
+
+msgid "Other languages"
+msgstr "기타 언어"
+
+msgid "Bochs latest"
+msgstr "Bochs 최신 정보"
+
+msgid "Apply overscan deltas"
+msgstr "오버스캔 델타 적용"
+
+msgid "Mono Interlaced"
+msgstr "모노 인터레이스"
+
+msgid "Mono Non-Interlaced"
+msgstr "모노 비인터레이스"
+
+msgid "Color Interlaced"
+msgstr "컬러 인터레이스"
+
+msgid "Color Non-Interlaced"
+msgstr "컬러 비인터레이스"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "3Dfx 부두 그래픽"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "옵시디언 SB50 + 자수정(TMU 2개)"
+
+msgid "8-bit"
+msgstr "8비트"
+
+msgid "16-bit"
+msgstr "16비트"
+
+msgid "Standard (150ns)"
+msgstr "표준(150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "고속(120ns)"
+
+msgid "Enabled"
+msgstr "활성화됨"
+
+msgid "Standard"
+msgstr "표준"
+
+msgid "High-Speed"
+msgstr "고속"
+
+msgid "Stereo LPT DAC"
+msgstr "스테레오 LPT DAC"
+
+msgid "Generic Text Printer"
+msgstr "일반 텍스트 프린터"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "일반 ESC/P 2 도트 매트릭스 프린터"
+
+msgid "Generic PostScript Printer"
+msgstr "일반 포스트스크립트 프린터"
+
+msgid "Generic PCL5e Printer"
+msgstr "일반 PCL5e 프린터"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "병렬 인터넷 프로토콜"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "새비지 퀘스트용 보호 동글"
+
+msgid "Serial Passthrough Device"
+msgstr "직렬 포트 패스스루 장치"
+
+msgid "Passthrough Mode"
+msgstr "패스스루 모드"
+
+msgid "Host Serial Device"
+msgstr "호스트 직렬 장치"
+
+msgid "Name of pipe"
+msgstr "파이프 이름"
+
+msgid "Data bits"
+msgstr "데이터 비트"
+
+msgid "Stop bits"
+msgstr "비트 중지"
+
+msgid "Baud Rate of Passthrough"
+msgstr "통과 속도"
+
+msgid "Named Pipe (Server)"
+msgstr "네임드 파이프(서버)"
+
+msgid "Named Pipe (Client)"
+msgstr "네임드 파이프(클라이언트)"
+
+msgid "Host Serial Passthrough"
+msgstr "호스트 직렬 포트 패스스루"
+
+msgid "E&ject %1"
+msgstr "%1 꺼내기(&J)"
+
+msgid "&Unmute"
+msgstr "음소거 해제(&U)"
+
+msgid "Softfloat FPU"
+msgstr "소프트플로트 FPU"
+
+msgid "High performance impact"
+msgstr "성능에 미치는 영향"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[일반] RAM 디스크(최대 속도)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[일반] 1989 (3500 RPM)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[일반] 1992 (3600 RPM)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[일반] 1994 (4500 RPM)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[일반] 1996 (5400 RPM)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[일반] 1997 (5400 RPM)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[일반] 1998 (5400 RPM)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[일반] 2000 (7200 RPM)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "IBM 8514/A 클론(ISA)"
+
+msgid "Vendor"
+msgstr "제조사"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "일반 PC/XT 메모리 확장 카드"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "일반 PC/AT 메모리 확장 카드"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "도트 매트릭스 글꼴을 찾을 수 없습니다"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "일반 ESC/P 2 도트 매트릭스 프린터의 에뮬레이션을 사용하려면 \"roms/printer/fonts\" 디렉터리에 있는 트루타입 글꼴이 필요합니다."
+
+msgid "Inhibit multimedia keys"
+msgstr "멀티미디어 키 사용 금지"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "설정을 저장하기 전에 확인을 요청합니다"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "하드 리셋을 실행하기 전에 확인을 요청합니다"
+
+msgid "Ask for confirmation before quitting"
+msgstr "종료하기 전에 확인을 요청합니다"
+
+msgid "Options"
+msgstr "옵션"
+
+msgid "Model"
+msgstr "모델"
+
+msgid "Model:"
+msgstr "모델:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Vulkan 렌더러 초기화 실패."
+
+msgid "GLSL Error"
+msgstr "GLSL 오류"
+
+msgid "Could not load shader: %1"
+msgstr "셰이더를 로드할 수 없습니다: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "OpenGL 버전 3.0 이상이 필요합니다. 현재 GLSL 버전은 %1.%2입니다"
+
+msgid "Could not load texture: %1"
+msgstr "텍스처를 로드할 수 없습니다: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "셰이더를 컴파일할 수 없습니다:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "프로그램이 연결되지 않았습니다:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "셰이더 관리자"
+
+msgid "Shader Configuration"
+msgstr "셰이더 구성"
+
+msgid "Add"
+msgstr "추가"
+
+msgid "Move up"
+msgstr "위쪽으로 이동"
+
+msgid "Move down"
+msgstr "아래로 이동"
+
+msgid "Could not load file %1"
+msgstr "파일 %1을 로드할 수 없습니다"
+
+msgid "Key Bindings:"
+msgstr "키 바인딩:"
+
+msgid "Action"
+msgstr "행동"
+
+msgid "Keybind"
+msgstr "키 바인딩"
+
+msgid "Clear binding"
+msgstr "바인딩 해제"
+
+msgid "Bind"
+msgstr "묶습니다"
+
+msgid "Bind Key"
+msgstr "키를 묶습니다"
+
+msgid "Enter key combo:"
+msgstr "키 조합을 입력하세요:"
+
+msgid "Bind conflict"
+msgstr "바인딩 충돌"
+
+msgid "This key combo is already in use."
+msgstr "이 키 조합은 이미 사용 중입니다."
+
+msgid "Send Control+Alt+Del"
+msgstr "Ctrl+Alt+Del 보내기"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Ctrl+Alt+Esc 보내기"
+
+msgid "Toggle fullscreen"
+msgstr "전체 화면 모드 전환"
+
+msgid "Screenshot"
+msgstr "스크린샷"
+
+msgid "Release mouse pointer"
+msgstr "마우스 포인터를 해제합니다"
+
+msgid "Toggle pause"
+msgstr "일시정지 토글"
+
+msgid "Toggle mute"
+msgstr "음소거 켜기/끄기"
+
+msgid "Text files"
+msgstr "텍스트 파일"
+
+msgid "ROM files"
+msgstr "ROM 파일"
+
+msgid "SoundFont files"
+msgstr "SoundFont 파일"
+
+msgid "Local Switch"
+msgstr "로컬 스위치"
+
+msgid "Remote Switch"
+msgstr "원격 스위치"
+
+msgid "Switch:"
+msgstr "스위치:"
+
+msgid "Hub Mode"
+msgstr "허브 모드"
+
+msgid "Hostname:"
+msgstr "호스트 이름:"
+
+msgid "ISA RAM:"
+msgstr "ISA RAM:"
+
+msgid "ISA ROM:"
+msgstr "ISA ROM:"
+
+msgid "&Wipe NVRAM"
+msgstr "NVRAM 지우기(&W)"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "이 작업은 가상 머신에 위치한 \"nvr\" 하위 디렉토리 내의 모든 NVRAM(및 관련) 파일을 삭제합니다. 해당 가상 머신의 BIOS 설정(및 가상 머신 내의 다른 장치 설정)을 다시 구성해야 할 수 있습니다.\n\n가상 머신 \"%1\"의 모든 NVRAM 내용을 삭제하시겠습니까?"
+
+msgid "Success"
+msgstr "성공"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "가상 머신 \"%1\"의 NVRAM 내용을 성공적으로 지웠습니다"
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "가상 머신 \"%1\"의 NVRAM 내용을 지우려고 시도하는 과정에서 오류가 발생했습니다"
+
+msgid "%1 VM Manager"
+msgstr "%1 가상 머신 관리자"
+
+msgid "%n disk(s)"
+msgstr "%n 디스크"
+
+msgid "Unknown Status"
+msgstr "알 수 없는 상태"
+
+msgid "No Machines Found!"
+msgstr "기계가 없습니다!"
+
+msgid "Check for updates on startup"
+msgstr "시작 시 업데이트 확인"
+
+msgid "Unable to determine release information"
+msgstr "출시 정보를 확인할 수 없습니다"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "업데이트 확인 중 오류가 발생했습니다:\n\n%1\n\n나중에 다시 시도해 주시기 바랍니다."
+
+msgid "Update check complete"
+msgstr "업데이트 확인 완료"
+
+msgid "stable"
+msgstr "안정"
+
+msgid "beta"
+msgstr "베타"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "현재 86Box의 최신 %1 버전을 실행 중입니다: %2"
+
+msgid "version"
+msgstr "버전"
+
+msgid "build"
+msgstr "빌드"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "현재 <b>%1</b> 버전을 실행 중입니다."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "<b>버전 %1</b>이 이제 사용 가능합니다."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "현재 <b>%1</b> 빌드를 실행 중입니다."
+
+msgid "<b>Build %1</b> is now available."
+msgstr "<b>빌드 %1</b>이 이제 사용 가능합니다."
+
+msgid "Would you like to visit the download page?"
+msgstr "다운로드 페이지로 이동하시겠습니까?"
+
+msgid "Visit download page"
+msgstr "다운로드 페이지 방문"
+
+msgid "Update check"
+msgstr "업데이트 확인"
+
+msgid "Checking for updates..."
+msgstr "업데이트 확인 중..."
+
+msgid "86Box Update"
+msgstr "86Box 업데이트"
+
+msgid "Release notes:"
+msgstr "릴리스 노트:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "가상 머신의 예상치 못한 종료"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "가상 머신 \"%1\"의 프로세스가 예상치 않게 종료되었으며 종료 코드는 %2입니다."
+
+msgid "The system will not be added."
+msgstr "시스템은 추가되지 않을 것입니다."
+
+msgid "&Update mouse every CPU frame"
+msgstr "마우스를 각 CPU 프레임마다 업데이트합니다(&U)"
+
+msgid "Hue"
+msgstr "색조"
+
+msgid "Saturation"
+msgstr "포화도"
+
+msgid "Contrast"
+msgstr "대조"
+
+msgid "Brightness"
+msgstr "밝기"
+
+msgid "Sharpness"
+msgstr "선명도"
+
+msgid "&CGA composite settings..."
+msgstr "CGA 복합 모드의 설정...(&C)"
+
+msgid "CGA composite settings"
+msgstr "CGA 복합 모드의 설정"
+
+msgid "Monitor EDID"
+msgstr "모니터의 EDID"
+
+msgid "Export..."
+msgstr "수출..."
+
+msgid "Export EDID"
+msgstr "EDID 내보내기"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "EDID 파일 \"%ls\"가 너무 큽니다."
+
+msgid "OpenGL input scale"
+msgstr "OpenGL 입력 스케일"
+
+msgid "OpenGL input stretch mode"
+msgstr "OpenGL 입력 스트레치 모드"
+
+msgid "Color scheme"
+msgstr "색상 구성"
+
+msgid "Light"
+msgstr "빛"
+
+msgid "Dark"
+msgstr "어둠"
diff --git a/src/qt/languages/nb-NO.po b/src/qt/languages/nb-NO.po
new file mode 100644
index 000000000..8d9f97521
--- /dev/null
+++ b/src/qt/languages/nb-NO.po
@@ -0,0 +1,2983 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: nb_NO\n"
+"X-Source-Language: en_US\n"
+
+msgid "&Action"
+msgstr "&Handling"
+
+msgid "&Keyboard requires capture"
+msgstr "&Tastatur krever opptak"
+
+msgid "&Right CTRL is left ALT"
+msgstr "&Høyre CTRL er venstre ALT"
+
+msgid "&Hard Reset..."
+msgstr "&Hard tilbakestilling..."
+
+msgid "&Ctrl+Alt+Del"
+msgstr "&Ctrl+Alt+Del"
+
+msgid "Ctrl+Alt+&Esc"
+msgstr "Ctrl+Alt+&Esc"
+
+msgid "&Pause"
+msgstr "&Pause"
+
+msgid "Pause"
+msgstr "&Pause"
+
+msgid "Re&sume"
+msgstr "Fo&rtsett"
+
+msgid "E&xit"
+msgstr "A&vslutt"
+
+msgid "&View"
+msgstr "&Vis"
+
+msgid "&Hide status bar"
+msgstr "&Skjul statuslinje"
+
+msgid "Hide &toolbar"
+msgstr "Skjul &verktøylinje"
+
+msgid "&Resizeable window"
+msgstr "&Justerbart vindu"
+
+msgid "R&emember size && position"
+msgstr "H&usk størrelse &og plassering"
+
+msgid "Re&nderer"
+msgstr "Re&nderer"
+
+msgid "&Qt (Software)"
+msgstr "&Qt (Programvare)"
+
+msgid "Open&GL (3.0 Core)"
+msgstr "Open&GL (3.0 Core)"
+
+msgid "&VNC"
+msgstr "&VNC"
+
+msgid "Specify &dimensions..."
+msgstr "Angi &dimensjoner..."
+
+msgid "Force &4:3 display ratio"
+msgstr "Tving &4:3-bildeforhold"
+
+msgid "&Window scale factor"
+msgstr "&Vinduets skaleringsfaktor"
+
+msgid "&0.5x"
+msgstr "&0,5x"
+
+msgid "&1x"
+msgstr "&1x"
+
+msgid "1.&5x"
+msgstr "1,&5x"
+
+msgid "&2x"
+msgstr "&2x"
+
+msgid "&3x"
+msgstr "&3x"
+
+msgid "&4x"
+msgstr "&4x"
+
+msgid "&5x"
+msgstr "&5x"
+
+msgid "&6x"
+msgstr "&6x"
+
+msgid "&7x"
+msgstr "&7x"
+
+msgid "&8x"
+msgstr "&8x"
+
+msgid "Fi&lter method"
+msgstr "Fi&ltreringsmetode"
+
+msgid "&Nearest"
+msgstr "&Nærmeste"
+
+msgid "&Linear"
+msgstr "&Lineær"
+
+msgid "Hi&DPI scaling"
+msgstr "Hi&DPI-skalert"
+
+msgid "&Fullscreen"
+msgstr "&Fullskjerm"
+
+msgid "Fullscreen &stretch mode"
+msgstr "Fullskjerm&strekkmodus"
+
+msgid "&Full screen stretch"
+msgstr "&Fullskjermstrekk"
+
+msgid "&4:3"
+msgstr "&4:3"
+
+msgid "&Square pixels (Keep ratio)"
+msgstr "&Kvadratiske piksler (Behold forhold)"
+
+msgid "&Integer scale"
+msgstr "Heltallsskala"
+
+msgid "4:&3 Integer scale"
+msgstr "4:&3 Heltallsskala"
+
+msgid "EGA/(S)&VGA settings"
+msgstr "EGA/(S)&VGA-innstillinger"
+
+msgid "&Inverted VGA monitor"
+msgstr "&Invertert VGA-skjerm"
+
+msgid "VGA screen &type"
+msgstr "VGA-skjerm&type"
+
+msgid "RGB &Color"
+msgstr "RGB-&farger"
+
+msgid "RGB (no brown)"
+msgstr "RGB (uten brun)"
+
+msgid "&RGB Grayscale"
+msgstr "&RGB-gråskala"
+
+msgid "Generic RGBI color monitor"
+msgstr "Generisk RGBI-fargeskjerm"
+
+msgid "&Amber monitor"
+msgstr "&Amber-skjerm"
+
+msgid "&Green monitor"
+msgstr "&Grønn-skjerm"
+
+msgid "&White monitor"
+msgstr "&Hvit-skjerm"
+
+msgid "Grayscale &conversion type"
+msgstr "Gråskala-&konverteringsmetode"
+
+msgid "BT&601 (NTSC/PAL)"
+msgstr "BT&601 (NTSC/PAL)"
+
+msgid "BT&709 (HDTV)"
+msgstr "BT&709 (HDTV)"
+
+msgid "&Average"
+msgstr "&Gjennomsnitt"
+
+msgid "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
+msgstr "CGA/PCjr/Tandy/E&GA/(S)VGA-overscan"
+
+msgid "Change contrast for &monochrome display"
+msgstr "Endre kontrast for &monokrom skjerm"
+
+msgid "&Media"
+msgstr "&Medie"
+
+msgid "&Tools"
+msgstr "&Verktøy"
+
+msgid "&Settings..."
+msgstr "&Innstillinger..."
+
+msgid "Settings..."
+msgstr "Innstillinger..."
+
+msgid "&Update status bar icons"
+msgstr "&Oppdater statuslinjeikoner"
+
+msgid "Take s&creenshot"
+msgstr "Ta s&kjermbilde"
+
+msgid "S&ound"
+msgstr "L&yd"
+
+msgid "&Preferences..."
+msgstr "&Valg..."
+
+msgid "Enable &Discord integration"
+msgstr "Aktiver &Discord-integrasjon"
+
+msgid "Sound &gain..."
+msgstr "Lyd&forsterkning..."
+
+msgid "Begin trace"
+msgstr "Start sporing"
+
+msgid "End trace"
+msgstr "Stopp sporing"
+
+msgid "&Help"
+msgstr "&Hjelp"
+
+msgid "&Documentation..."
+msgstr "&Dokumentasjon..."
+
+msgid "&About 86Box..."
+msgstr "&Om 86Box..."
+
+msgid "&New image..."
+msgstr "&Ny diskfil..."
+
+msgid "&Existing image..."
+msgstr "&Eksisterende diskfil..."
+
+msgid "Existing image (&Write-protected)..."
+msgstr "Eksisterende diskfil (&skrivbeskyttet)..."
+
+msgid "&Record"
+msgstr "&Spill inn"
+
+msgid "&Play"
+msgstr "&Spill av"
+
+msgid "&Rewind to the beginning"
+msgstr "&Spol tilbake til starten"
+
+msgid "&Fast forward to the end"
+msgstr "&Spol frem til slutten"
+
+msgid "E&ject"
+msgstr "M&at ut"
+
+msgid "&Image..."
+msgstr "&Diskfil..."
+
+msgid "E&xport to 86F..."
+msgstr "E&ksporter til 86F..."
+
+msgid "&Mute"
+msgstr "&Demp"
+
+msgid "E&mpty"
+msgstr "T&øm"
+
+msgid "Reload previous image"
+msgstr "Last inn forrige diskfil"
+
+msgid "&Folder..."
+msgstr "&Mappe..."
+
+msgid "Target &framerate"
+msgstr "Mål-&bildefrekvens"
+
+msgid "&Sync with video"
+msgstr "&Synkroniser med video"
+
+msgid "&25 fps"
+msgstr "&25 fps"
+
+msgid "&30 fps"
+msgstr "&30 fps"
+
+msgid "&50 fps"
+msgstr "&50 fps"
+
+msgid "&60 fps"
+msgstr "&60 fps"
+
+msgid "&75 fps"
+msgstr "&75 fps"
+
+msgid "&VSync"
+msgstr "&VSync"
+
+msgid "&Select shader..."
+msgstr "&Velg shader..."
+
+msgid "&Remove shader"
+msgstr "&Fjern shader"
+
+msgid "Preferences"
+msgstr "Valg"
+
+msgid "Sound Gain"
+msgstr "Lydforsterkning"
+
+msgid "New Image"
+msgstr "Ny diskfil"
+
+msgid "Settings"
+msgstr "Innstillinger"
+
+msgid "Specify Main Window Dimensions"
+msgstr "Angi hovedvinduets dimensjoner"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Cancel"
+msgstr "Avbryt"
+
+msgid "&Default"
+msgstr "&Standard"
+
+msgid "Language:"
+msgstr "Språk"
+
+msgid "Gain"
+msgstr "Forsterkning"
+
+msgid "File name:"
+msgstr "Filnavn:"
+
+msgid "Disk size:"
+msgstr "Diskstørrelse:"
+
+msgid "RPM mode:"
+msgstr "RPM-modus:"
+
+msgid "Progress:"
+msgstr "Fremdrift:"
+
+msgid "Width:"
+msgstr "Bredde:"
+
+msgid "Height:"
+msgstr "Høyde:"
+
+msgid "Lock to this size"
+msgstr "Lås til denne størrelsen"
+
+msgid "Machine type:"
+msgstr "Maskintype:"
+
+msgid "Machine:"
+msgstr "Maskin:"
+
+msgid "Configure"
+msgstr "Konfigurer"
+
+msgid "CPU:"
+msgstr "CPU:"
+
+msgid "CPU type:"
+msgstr "CPU-type:"
+
+msgid "Speed:"
+msgstr "Hastighet:"
+
+msgid "Frequency:"
+msgstr "Frekvens:"
+
+msgid "FPU:"
+msgstr "FPU:"
+
+msgid "Wait states:"
+msgstr "Ventetilstander:"
+
+msgid "MB"
+msgstr "MB"
+
+msgid "Memory:"
+msgstr "Minne:"
+
+msgid "Time synchronization"
+msgstr "Tids-synkronisering"
+
+msgid "Disabled"
+msgstr "Deaktivert"
+
+msgid "Enabled (local time)"
+msgstr "Aktivert (lokal tid)"
+
+msgid "Enabled (UTC)"
+msgstr "Aktivert (UTC)"
+
+msgid "Dynamic Recompiler"
+msgstr "Dynamisk recompilator"
+
+msgid "CPU frame size"
+msgstr "CPU-rammestørrelse"
+
+msgid "Larger frames (less smooth)"
+msgstr "Større rammer (mindre jevn)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Mindre rammer (jevnere)"
+
+msgid "Video:"
+msgstr "Video:"
+
+msgid "Video #2:"
+msgstr "Video #2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Voodoo 1- eller 2-grafikk"
+
+msgid "IBM 8514/A Graphics"
+msgstr "IBM 8514/A-grafikk"
+
+msgid "XGA Graphics"
+msgstr "XGA-grafikk"
+
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "IBM PS/55 skjermadapter-grafikk"
+
+msgid "Keyboard:"
+msgstr "Tastatur:"
+
+msgid "Keyboard"
+msgstr "Tastatur"
+
+msgid "Mouse:"
+msgstr "Mus:"
+
+msgid "Mouse"
+msgstr "Mus"
+
+msgid "Joystick:"
+msgstr "Styrespak:"
+
+msgid "Joystick"
+msgstr "Styrespak"
+
+msgid "Joystick 1..."
+msgstr "Styrespak 1..."
+
+msgid "Joystick 2..."
+msgstr "Styrespak 2..."
+
+msgid "Joystick 3..."
+msgstr "Styrespak 3..."
+
+msgid "Joystick 4..."
+msgstr "Styrespak 4..."
+
+msgid "Sound card #1:"
+msgstr "Lydkort #1:"
+
+msgid "Sound card #2:"
+msgstr "Lydkort #2:"
+
+msgid "Sound card #3:"
+msgstr "Lydkort #3:"
+
+msgid "Sound card #4:"
+msgstr "Lydkort #4:"
+
+msgid "MIDI Out Device:"
+msgstr "MIDI-ut-enhet:"
+
+msgid "MIDI In Device:"
+msgstr "MIDI-in-enhet:"
+
+msgid "MIDI Out:"
+msgstr "MIDI-ut:"
+
+msgid "Standalone MPU-401"
+msgstr "Selvstendig MPU-401"
+
+msgid "Use FLOAT32 sound"
+msgstr "Bruk FLOAT32-lyd"
+
+msgid "FM synth driver"
+msgstr "FM-synth-driver"
+
+msgid "Nuked (more accurate)"
+msgstr "Nuked (mer nøyaktig)"
+
+msgid "YMFM (faster)"
+msgstr "YMFM (raskere)"
+
+msgid "COM1 Device:"
+msgstr "COM1-enhet:"
+
+msgid "COM2 Device:"
+msgstr "COM2-enhet:"
+
+msgid "COM3 Device:"
+msgstr "COM3-enhet:"
+
+msgid "COM4 Device:"
+msgstr "COM4-enhet:"
+
+msgid "LPT1 Device:"
+msgstr "LPT1-enhet:"
+
+msgid "LPT2 Device:"
+msgstr "LPT2-enhet:"
+
+msgid "LPT3 Device:"
+msgstr "LPT3-enhet:"
+
+msgid "LPT4 Device:"
+msgstr "LPT4-enhet:"
+
+msgid "Internal LPT ECP DMA:"
+msgstr "Intern LPT ECP DMA:"
+
+msgid "Serial port 1"
+msgstr "Seriell port 1"
+
+msgid "Serial port 2"
+msgstr "Seriell port 2"
+
+msgid "Serial port 3"
+msgstr "Seriell port 3"
+
+msgid "Serial port 4"
+msgstr "Seriell port 4"
+
+msgid "Parallel port 1"
+msgstr "Parallellport 1"
+
+msgid "Parallel port 2"
+msgstr "Parallellport 2"
+
+msgid "Parallel port 3"
+msgstr "Parallellport 3"
+
+msgid "Parallel port 4"
+msgstr "Parallellport 4"
+
+msgid "FD Controller:"
+msgstr "FD-kontroller:"
+
+msgid "CD-ROM Controller:"
+msgstr "CD-ROM-kontroller:"
+
+msgid "Tertiary IDE Controller"
+msgstr "Tertiær IDE-kontroller"
+
+msgid "Quaternary IDE Controller"
+msgstr "Kvartær IDE-kontroller"
+
+msgid "Hard disk"
+msgstr "Harddisk"
+
+msgid "SCSI"
+msgstr "SCSI"
+
+msgid "Controller 1:"
+msgstr "Kontroller 1:"
+
+msgid "Controller 2:"
+msgstr "Kontroller 2:"
+
+msgid "Controller 3:"
+msgstr "Kontroller 3:"
+
+msgid "Controller 4:"
+msgstr "Kontroller 4:"
+
+msgid "Cassette"
+msgstr "Kassett"
+
+msgid "Hard disks:"
+msgstr "Harddisker:"
+
+msgid "Firmware Version"
+msgstr "Firmware-versjon"
+
+msgid "&New..."
+msgstr "&Ny..."
+
+msgid "&Existing..."
+msgstr "&Eksisterende..."
+
+msgid "&Remove"
+msgstr "&Fjern"
+
+msgid "Bus:"
+msgstr "Buss:"
+
+msgid "Channel:"
+msgstr "Kanal:"
+
+msgid "ID:"
+msgstr "ID:"
+
+msgid "&Specify..."
+msgstr "&Angi..."
+
+msgid "Sectors:"
+msgstr "Sektorer:"
+
+msgid "Heads:"
+msgstr "Hoder:"
+
+msgid "Cylinders:"
+msgstr "Sylindre:"
+
+msgid "Size (MB):"
+msgstr "Størrelse (MB):"
+
+msgid "Type:"
+msgstr "Type:"
+
+msgid "Image Format:"
+msgstr "Image-format:"
+
+msgid "Block Size:"
+msgstr "Blokkstørrelse:"
+
+msgid "Floppy drives:"
+msgstr "Diskettstasjoner:"
+
+msgid "Turbo timings"
+msgstr "Turbo-timing"
+
+msgid "Check BPB"
+msgstr "Sjekk BPB"
+
+msgid "CD-ROM drives:"
+msgstr "CD-ROM-stasjoner:"
+
+msgid "MO drives:"
+msgstr "MO-stasjoner:"
+
+msgid "MO:"
+msgstr "MO:"
+
+msgid "Removable disks:"
+msgstr "Flyttbare disker:"
+
+msgid "Removable disk drives:"
+msgstr "Flyttbare stasjoner:"
+
+msgid "ZIP 250"
+msgstr "ZIP 250"
+
+msgid "ISA RTC:"
+msgstr "ISA RTC:"
+
+msgid "ISA Memory Expansion"
+msgstr "ISA-minneutvidelse"
+
+msgid "ISA ROM Cards"
+msgstr "ISA ROM-kort"
+
+msgid "Card 1:"
+msgstr "Kort 1:"
+
+msgid "Card 2:"
+msgstr "Kort 2:"
+
+msgid "Card 3:"
+msgstr "Kort 3:"
+
+msgid "Card 4:"
+msgstr "Kort 4:"
+
+msgid "Generic ISA ROM Board"
+msgstr "Generisk ISA ROM-kort"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "Generisk dobbel ISA ROM-kort"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "Generisk kvart ISA ROM-kort"
+
+msgid "ISABugger device"
+msgstr "ISABugger-enhet"
+
+msgid "POST card"
+msgstr "POST-kort"
+
+msgid "86Box"
+msgstr "86Box"
+
+msgid "Error"
+msgstr "Feil"
+
+msgid "Fatal error"
+msgstr "Kritisk feil"
+
+msgid " - PAUSED"
+msgstr " - PAUSERT"
+
+msgid "Speed"
+msgstr "Hastighet"
+
+msgid "Removable disk %1 (%2): %3"
+msgstr "Flyttbar disk %1 (%2): %3"
+
+msgid "&Removable disk %1 (%2): %3"
+msgstr "&Flyttbar disk %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Flyttbare diskfiler"
+
+msgid "Image %1"
+msgstr "Diskfil %1"
+
+msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
+msgstr "86Box fant ingen brukbare ROM-filer.\n\nVennligst <a href=\"https://github.com/86Box/roms/releases/latest\">last ned</a> et ROM-sett og pakk det ut i \"roms\"-mappen."
+
+msgid "(empty)"
+msgstr "(tom)"
+
+msgid "All files"
+msgstr "Alle filer"
+
+msgid "Turbo"
+msgstr "Turbo"
+
+msgid "On"
+msgstr "På"
+
+msgid "Off"
+msgstr "Av"
+
+msgid "All images"
+msgstr "Alle diskfiler"
+
+msgid "Basic sector images"
+msgstr "Basis sektorfiler"
+
+msgid "Surface images"
+msgstr "Surface-diskfiler"
+
+msgid "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
+msgstr "Maskin \"%hs\" er ikke tilgjengelig på grunn av manglende ROM-er i roms/machines-mappen. Bytter til en tilgjengelig maskin."
+
+msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
+msgstr "Grafikkort \"%hs\" er ikke tilgjengelig på grunn av manglende ROM-er i roms/video-mappen. Bytter til et tilgjengelig grafikkort."
+
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "Grafikkort #2 \"%hs\" er ikke tilgjengelig på grunn av manglende ROM-er i roms/video-mappen. Deaktiverer det andre grafikkortet."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "Enhet \"%hs\" er ikke tilgjengelig på grunn av manglende ROM-er. Ignorerer enheten."
+
+msgid "Machine"
+msgstr "Maskin"
+
+msgid "Display"
+msgstr "Skjerm"
+
+msgid "Input devices"
+msgstr "Inndataenheter"
+
+msgid "Sound"
+msgstr "Lyd"
+
+msgid "Network"
+msgstr "Nettverk"
+
+msgid "Ports (COM & LPT)"
+msgstr "Porter (COM & LPT)"
+
+msgid "Ports"
+msgstr "Porter"
+
+msgid "Serial ports:"
+msgstr "Seriellporter:"
+
+msgid "Parallel ports:"
+msgstr "Parallellporter:"
+
+msgid "Storage controllers"
+msgstr "Lagringskontrollere"
+
+msgid "Hard disks"
+msgstr "Harddisker"
+
+msgid "Disks:"
+msgstr "Disker:"
+
+msgid "Floppy:"
+msgstr "Diskett:"
+
+msgid "Controllers:"
+msgstr "Kontrollere:"
+
+msgid "Floppy & CD-ROM drives"
+msgstr "Diskett- og CD-ROM-stasjoner"
+
+msgid "Other removable devices"
+msgstr "Andre flyttbare enheter"
+
+msgid "Other peripherals"
+msgstr "Andre eksterne enheter"
+
+msgid "Other devices"
+msgstr "Andre enheter"
+
+msgid "Click to capture mouse"
+msgstr "Klikk for å fange mus"
+
+msgid "Press %1 to release mouse"
+msgstr "Trykk %1 for å slippe mus"
+
+msgid "Press %1 or middle button to release mouse"
+msgstr "Trykk %1 eller midtknappen for å slippe mus"
+
+msgid "Bus"
+msgstr "Buss"
+
+msgid "File"
+msgstr "Fil"
+
+msgid "C"
+msgstr "C"
+
+msgid "H"
+msgstr "H"
+
+msgid "S"
+msgstr "S"
+
+msgid "KB"
+msgstr "KB"
+
+msgid "Default"
+msgstr "Standard"
+
+msgid "%1 Wait state(s)"
+msgstr "%1 ventetilstand(er)"
+
+msgid "Type"
+msgstr "Type"
+
+msgid "No PCap devices found"
+msgstr "Ingen PCap-enheter funnet"
+
+msgid "Invalid PCap device"
+msgstr "Ugyldig PCap-enhet"
+
+msgid "2-axis, 2-button joystick(s)"
+msgstr "2-akset, 2-knapps styrespak(er)"
+
+msgid "2-axis, 4-button joystick"
+msgstr "2-akset, 4-knapps styrespak"
+
+msgid "2-axis, 6-button joystick"
+msgstr "2-akset, 6-knapps styrespak"
+
+msgid "2-axis, 8-button joystick"
+msgstr "2-akset, 8-knapps styrespak"
+
+msgid "3-axis, 2-button joystick"
+msgstr "3-akset, 2-knapps styrespak"
+
+msgid "3-axis, 4-button joystick"
+msgstr "3-akset, 4-knapps styrespak"
+
+msgid "4-axis, 4-button joystick"
+msgstr "4-akset, 4-knapps styrespak"
+
+msgid "CH Flightstick Pro"
+msgstr "CH Flightstick Pro"
+
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH Pedaler"
+
+msgid "Microsoft SideWinder Pad"
+msgstr "Microsoft SideWinder Pad"
+
+msgid "Thrustmaster Flight Control System"
+msgstr "Thrustmaster Flight Control System"
+
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Ror-kontrollsystem"
+
+msgid "2-button gamepad(s)"
+msgstr "2-knapps gamepad(er)"
+
+msgid "2-button flight yoke"
+msgstr "2-knapps flystyre"
+
+msgid "4-button gamepad"
+msgstr "4-knapps gamepad"
+
+msgid "4-button flight yoke"
+msgstr "4-knapps flystyre"
+
+msgid "2-button flight yoke with throttle"
+msgstr "2-knapps flystyre med gass"
+
+msgid "4-button flight yoke with throttle"
+msgstr "4-knapps flystyre med gass"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Win95 Ratt (3-akset, 4-knapps)"
+
+msgid "None"
+msgstr "Ingen"
+
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CHS: %2, %3, %4)"
+
+msgid "Floppy %1 (%2): %3"
+msgstr "Diskett %1 (%2): %3"
+
+msgid "&Floppy %1 (%2): %3"
+msgstr "&Diskett %1 (%2): %3"
+
+msgid "Advanced sector images"
+msgstr "Avanserte sektorfiler"
+
+msgid "Flux images"
+msgstr "Flux-diskfiler"
+
+msgid "Are you sure you want to hard reset the emulated machine?"
+msgstr "Er du sikker på at du vil utføre en hard tilbakestilling på den emulerte maskinen?"
+
+msgid "Are you sure you want to exit 86Box?"
+msgstr "Er du sikker på at du vil avslutte 86Box?"
+
+msgid "Unable to initialize Ghostscript"
+msgstr "Kan ikke initialisere Ghostscript"
+
+msgid "Unable to initialize GhostPCL"
+msgstr "Kan ikke initialisere GhostPCL"
+
+msgid "MO %1 (%2): %3"
+msgstr "MO %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&MO %1 (%2): %3"
+
+msgid "MO images"
+msgstr "MO-filer"
+
+msgid "Welcome to 86Box!"
+msgstr "Velkommen til 86Box!"
+
+msgid "Internal device"
+msgstr "Intern enhet"
+
+msgid "&File"
+msgstr "&Fil"
+
+msgid "&New machine..."
+msgstr "&Ny maskin..."
+
+msgid "&Check for updates..."
+msgstr "&Sjekk etter oppdateringer..."
+
+msgid "Exit"
+msgstr "Avslutt"
+
+msgid "No ROMs found"
+msgstr "Ingen ROM-er funnet"
+
+msgid "Do you want to save the settings?"
+msgstr "Vil du lagre innstillingene?"
+
+msgid "This will hard reset the emulated machine."
+msgstr "Dette vil hard-resette den emulerte maskinen."
+
+msgid "Save"
+msgstr "Lagre"
+
+msgid "About 86Box"
+msgstr "Om 86Box"
+
+msgid "86Box v"
+msgstr "86Box v"
+
+msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
+msgstr "En emulator for gamle datamaskiner\n\nForfattere: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne og andre.\n\nMed tidligere kjernebidrag fra Sarah Walker, leilei, JohnElliott, greatpsycho og andre.\n\nUtgitt under GNU General Public License versjon 2 eller senere. Se LICENSE for mer informasjon."
+
+msgid "Hardware not available"
+msgstr "Maskinvare ikke tilgjengelig"
+
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "Sørg for at %1 er installert og at du er på en %1-kompatibel nettverkstilkobling."
+
+msgid "Invalid configuration"
+msgstr "Ugyldig konfigurasjon"
+
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 kreves for automatisk konvertering av PostScript-filer til PDF.\n\nDokumenter sendt til den generiske PostScript-skriveren vil lagres som PostScript (.ps)-filer."
+
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 kreves for automatisk konvertering av PCL-filer til PDF.\n\nDokumenter sendt til den generiske PCL-skriveren vil lagres som Printer Command Language (.pcl)-filer."
+
+msgid "Don't show this message again"
+msgstr "Ikke vis denne meldingen igjen"
+
+msgid "Don't exit"
+msgstr "Ikke avslutt"
+
+msgid "Reset"
+msgstr "Nullstill"
+
+msgid "Don't reset"
+msgstr "Ikke nullstill"
+
+msgid "CD-ROM images"
+msgstr "CD-ROM-filer"
+
+msgid "%1 Device Configuration"
+msgstr "%1 Enhetskonfigurasjon"
+
+msgid "Monitor in sleep mode"
+msgstr "Skjerm i hvilemodus"
+
+msgid "GLSL shaders"
+msgstr "GLSL-shadere"
+
+msgid "You are loading an unsupported configuration"
+msgstr "Du laster en ikke-støttet konfigurasjon"
+
+msgid "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
+msgstr "CPU-typefiltrering basert på valgt maskin er deaktivert for denne emulerte maskinen.\n\nDette gjør det mulig å velge en CPU som ellers er inkompatibel med den valgte maskinen. Du kan imidlertid støte på inkompatibilitet med maskinens BIOS eller annen programvare.\n\nAktivering av denne innstillingen er ikke offisielt støttet, og eventuelle innsendte feilrapporter kan bli avvist som ugyldige."
+
+msgid "Continue"
+msgstr "Fortsett"
+
+msgid "Cassette: %1"
+msgstr "Kassett: %1"
+
+msgid "C&assette: %1"
+msgstr "K&assett: %1"
+
+msgid "Cassette images"
+msgstr "Kassettfiler"
+
+msgid "Cartridge %1: %2"
+msgstr "Kassett %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "Kas&sett %1: %2"
+
+msgid "Cartridge images"
+msgstr "Kassettfiler"
+
+msgid "Resume execution"
+msgstr "Fortsett kjøring"
+
+msgid "Pause execution"
+msgstr "Pause kjøring"
+
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del"
+
+msgid "Press Ctrl+Alt+Del"
+msgstr "Trykk Ctrl+Alt+Del"
+
+msgid "Press Ctrl+Alt+Esc"
+msgstr "Trykk Ctrl+Alt+Esc"
+
+msgid "Hard reset"
+msgstr "Hard-tilbakestilling"
+
+msgid "Force shutdown"
+msgstr "Tvangsavslutt"
+
+msgid "Start"
+msgstr "Start"
+
+msgid "Not running"
+msgstr "Ikke kjørende"
+
+msgid "Running"
+msgstr "Kjører"
+
+msgid "Paused"
+msgstr "Satt på pause"
+
+msgid "Waiting"
+msgstr "Venter"
+
+msgid "Powered Off"
+msgstr "Slått av"
+
+msgid "%n running"
+msgstr "%n kjørende"
+
+msgid "%n paused"
+msgstr "%n satt på pause"
+
+msgid "%n waiting"
+msgstr "%n venter"
+
+msgid "%1 total"
+msgstr "%1 totalt"
+
+msgid "VMs: %1"
+msgstr "VM-er: %1"
+
+msgid "System Directory:"
+msgstr "Systemmappe:"
+
+msgid "Choose directory"
+msgstr "Velg mappe"
+
+msgid "Choose configuration file"
+msgstr "Velg konfigurasjonsfil"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "86Box konfigurasjonsfiler (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Lesing av konfigurasjon mislyktes"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "Kan ikke åpne valgt konfigurasjonsfil for lesing: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "Bruk regulære uttrykk i søkeboksen"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "%1 maskin(er) er for øyeblikket aktive. Er du sikker på at du vil avslutte VM-administratoren uansett?"
+
+msgid "Add new system wizard"
+msgstr "Legg til ny system-veiviser"
+
+msgid "Introduction"
+msgstr "Introduksjon"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "Dette vil hjelpe deg med å legge til et nytt system i 86Box."
+
+msgid "New configuration"
+msgstr "Ny konfigurasjon"
+
+msgid "Complete"
+msgstr "Fullfør"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "Veiviseren vil nå starte konfigurasjonen for det nye systemet."
+
+msgid "Use existing configuration"
+msgstr "Bruk eksisterende konfigurasjon"
+
+msgid "Type some notes here"
+msgstr "Skriv noen notater her"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Lim inn innholdet fra den eksisterende konfigurasjonsfilen i boksen nedenfor."
+
+msgid "Load configuration from file"
+msgstr "Last konfigurasjon fra fil"
+
+msgid "System name"
+msgstr "Systemnavn"
+
+msgid "System name:"
+msgstr "Systemnavn:"
+
+msgid "System name cannot contain certain characters"
+msgstr "Systemnavnet kan ikke inneholde visse tegn"
+
+msgid "System name already exists"
+msgstr "Systemnavnet finnes allerede"
+
+msgid "Please enter a directory for the system"
+msgstr "Vennligst skriv inn en mappe for systemet"
+
+msgid "Directory does not exist"
+msgstr "Mappen eksisterer ikke"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "En ny mappe for systemet vil bli opprettet i den valgte mappen ovenfor"
+
+msgid "System location:"
+msgstr "Systemplassering:"
+
+msgid "System name and location"
+msgstr "Systemnavn og plassering"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Skriv inn systemets navn og velg plassering"
+
+msgid "Enter the name of the system"
+msgstr "Skriv inn systemnavnet"
+
+msgid "Please enter a system name"
+msgstr "Vennligst skriv inn et systemnavn"
+
+msgid "Display name (optional):"
+msgstr "Visningsnavn (valgfritt):"
+
+msgid "Display name:"
+msgstr "Visningsnavn:"
+
+msgid "Set display name"
+msgstr "Angi visningsnavn"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Skriv inn nytt visningsnavn (tomt for å tilbakestille)"
+
+msgid "Change &display name..."
+msgstr "Endre &visningsnavn..."
+
+msgid "Context Menu"
+msgstr "Kontekstmeny"
+
+msgid "&Open folder..."
+msgstr "&Åpne mappe..."
+
+msgid "Open p&rinter tray..."
+msgstr "Åpne p&rinter-skuff..."
+
+msgid "Set &icon..."
+msgstr "Angi &ikon..."
+
+msgid "Select an icon"
+msgstr "Velg et ikon"
+
+msgid "C&lone..."
+msgstr "K&lon..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "Virtuell maskin \"%1\" (%2) vil bli klonet til:"
+
+msgid "Directory %1 already exists"
+msgstr "Mappen %1 finnes allerede"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "Du kan ikke bruke følgende tegn i navnet: %1"
+
+msgid "Clone"
+msgstr "Klon"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Kunne ikke opprette mappe for klonet VM"
+
+msgid "Failed to clone VM."
+msgstr "Kloning av VM mislyktes."
+
+msgid "Directory in use"
+msgstr "Mappe i bruk"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "Den valgte mappen er allerede i bruk. Vennligst velg en annen mappe."
+
+msgid "Create directory failed"
+msgstr "Oppretting av mappe mislyktes"
+
+msgid "Unable to create the directory for the new system"
+msgstr "Kunne ikke opprette mappe for det nye systemet"
+
+msgid "Configuration write failed"
+msgstr "Skriving av konfigurasjon mislyktes"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "Kunne ikke åpne konfigurasjonsfilen på %1 for skriving"
+
+msgid "Error adding system"
+msgstr "Feil ved legg til system"
+
+msgid "Remove directory failed"
+msgstr "Fjerning av mappe mislyktes"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "Noen filer i maskinens mappe kunne ikke slettes. Vennligst slett dem manuelt."
+
+msgid "Build"
+msgstr "Bygg"
+
+msgid "Version"
+msgstr "Versjon"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "En oppdatering til 86Box er tilgjengelig: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "En feil oppstod under sjekking av oppdateringer: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>En oppdatering til 86Box er tilgjengelig!</b>"
+
+msgid "Warning"
+msgstr "Advarsel"
+
+msgid "&Kill"
+msgstr "&Avslutt prosess"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "Å avslutte en virtuell maskin kan føre til datatap. Gjør dette kun hvis 86Box-prosessen henger.\n\nVil du virkelig avslutte den virtuelle maskinen \"%1\"?"
+
+msgid "&Delete"
+msgstr "&Slett"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "Vil du virkelig slette den virtuelle maskinen \"%1\" og alle dens filer? Denne handlingen kan ikke angres!"
+
+msgid "Show &config file"
+msgstr "Vis &konfigurasjonsfil"
+
+msgid "No screenshot"
+msgstr "Ingen skjermbilde"
+
+msgid "Search"
+msgstr "Søk"
+
+msgid "Searching for VMs..."
+msgstr "Søker etter VMer..."
+
+msgid "Found %1"
+msgstr "Fant %1"
+
+msgid "System"
+msgstr "System"
+
+msgid "Storage"
+msgstr "Lagring"
+
+msgid "Disk %1: "
+msgstr "Disk %1:"
+
+msgid "No disks"
+msgstr "Ingen disker"
+
+msgid "Audio"
+msgstr "Lyd"
+
+msgid "Audio:"
+msgstr "Lyd:"
+
+msgid "ACPI shutdown"
+msgstr "ACPI-avstenging"
+
+msgid "ACP&I shutdown"
+msgstr "ACP&I-avstenging"
+
+msgid "Hard disk (%1)"
+msgstr "Harddisk (%1)"
+
+msgid "MFM/RLL or ESDI CD-ROM drives never existed"
+msgstr "MFM/RLL eller ESDI CD-ROM-stasjoner eksisterte aldri"
+
+msgid "Custom..."
+msgstr "Tilpasset..."
+
+msgid "Custom (large)..."
+msgstr "Tilpasset (stor)..."
+
+msgid "Add New Hard Disk"
+msgstr "Legg til ny harddisk"
+
+msgid "Add Existing Hard Disk"
+msgstr "Legg til eksisterende harddisk"
+
+msgid "HDI disk images cannot be larger than 4 GB."
+msgstr "HDI-diskbilder kan ikke være større enn 4 GB."
+
+msgid "Disk images cannot be larger than 127 GB."
+msgstr "Diskbilder kan ikke være større enn 127 GB."
+
+msgid "Hard disk images"
+msgstr "Harddiskbilder"
+
+msgid "Unable to read file"
+msgstr "Kunne ikke lese fil"
+
+msgid "Unable to write file"
+msgstr "Kunne ikke skrive fil"
+
+msgid "HDI or HDX images with a sector size other than 512 are not supported."
+msgstr "HDI- eller HDX-bilder med en sektorstørrelse annen enn 512 støttes ikke."
+
+msgid "Disk image file already exists"
+msgstr "Diskbildefilen finnes allerede"
+
+msgid "Please specify a valid file name."
+msgstr "Vennligst spesifiser et gyldig filnavn."
+
+msgid "Disk image created"
+msgstr "Diskbilde opprettet"
+
+msgid "Make sure the file exists and is readable."
+msgstr "Sørg for at filen eksisterer og kan leses."
+
+msgid "Make sure the file is being saved to a writable directory."
+msgstr "Sørg for at filen lagres i en skrivbar mappe."
+
+msgid "Disk image too large"
+msgstr "Diskbilde for stort"
+
+msgid "Remember to partition and format the newly-created drive."
+msgstr "Husk å partisjonere og formatere den nyopprettede disken."
+
+msgid "The selected file will be overwritten. Are you sure you want to use it?"
+msgstr "Den valgte filen vil bli overskrevet. Er du sikker på at du vil bruke den?"
+
+msgid "Unsupported disk image"
+msgstr "Ustøttet diskbilde"
+
+msgid "Overwrite"
+msgstr "Overskriv"
+
+msgid "Don't overwrite"
+msgstr "Ikke overskriv"
+
+msgid "Raw image"
+msgstr "Råbilde"
+
+msgid "HDI image"
+msgstr "HDI-bilde"
+
+msgid "HDX image"
+msgstr "HDX-bilde"
+
+msgid "Fixed-size VHD"
+msgstr "VHD med fast størrelse"
+
+msgid "Dynamic-size VHD"
+msgstr "VHD med dynamisk størrelse"
+
+msgid "Differencing VHD"
+msgstr "Differensierende VHD"
+
+msgid "(N/A)"
+msgstr "(N/A)"
+
+msgid "Raw image (.img)"
+msgstr "Råbilde (.img)"
+
+msgid "HDI image (.hdi)"
+msgstr "HDI-bilde (.hdi)"
+
+msgid "HDX image (.hdx)"
+msgstr "HDX-bilde (.hdx)"
+
+msgid "Fixed-size VHD (.vhd)"
+msgstr "VHD med fast størrelse (.vhd)"
+
+msgid "Dynamic-size VHD (.vhd)"
+msgstr "VHD med dynamisk størrelse (.vhd)"
+
+msgid "Differencing VHD (.vhd)"
+msgstr "Differensierende VHD (.vhd)"
+
+msgid "Large blocks (2 MB)"
+msgstr "Store blokker (2 MB)"
+
+msgid "Small blocks (512 KB)"
+msgstr "Små blokker (512 KB)"
+
+msgid "VHD files"
+msgstr "VHD-filer"
+
+msgid "Select the parent VHD"
+msgstr "Velg overordnet VHD"
+
+msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
+msgstr "Dette kan bety at det overordnede bildet ble endret etter at differansebildet ble opprettet.\n\nDet kan også skje hvis bildefilene ble flyttet eller kopiert, eller på grunn av en feil i programmet som opprettet denne disken.\n\nVil du rette tidsstemplene?"
+
+msgid "Parent and child disk timestamps do not match"
+msgstr "Tidsstemplene til overordnet og underordnet disk samsvarer ikke"
+
+msgid "Could not fix VHD timestamp."
+msgstr "Kunne ikke rette VHD-tidsstempel."
+
+msgid "MFM/RLL"
+msgstr "MFM/RLL"
+
+msgid "XTA"
+msgstr "XTA"
+
+msgid "ESDI"
+msgstr "ESDI"
+
+msgid "IDE"
+msgstr "IDE"
+
+msgid "ATAPI"
+msgstr "ATAPI"
+
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
+
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
+
+msgid "160 KB"
+msgstr "160 KB"
+
+msgid "180 KB"
+msgstr "180 KB"
+
+msgid "320 KB"
+msgstr "320 KB"
+
+msgid "360 KB"
+msgstr "360 KB"
+
+msgid "640 KB"
+msgstr "640 KB"
+
+msgid "720 KB"
+msgstr "720 KB"
+
+msgid "1.2 MB"
+msgstr "1,2 MB"
+
+msgid "1.25 MB"
+msgstr "1,25 MB"
+
+msgid "1.44 MB"
+msgstr "1,44 MB"
+
+msgid "DMF (cluster 1024)"
+msgstr "DMF (klynge 1024)"
+
+msgid "DMF (cluster 2048)"
+msgstr "DMF (klynge 2048)"
+
+msgid "2.88 MB"
+msgstr "2,88 MB"
+
+msgid "ZIP 100"
+msgstr "ZIP 100"
+
+msgid "3.5\" 128 MB (ISO 10090)"
+msgstr "3,5\" 128 MB (ISO 10090)"
+
+msgid "3.5\" 230 MB (ISO 13963)"
+msgstr "3,5\" 230 MB (ISO 13963)"
+
+msgid "3.5\" 540 MB (ISO 15498)"
+msgstr "3,5\" 540 MB (ISO 15498)"
+
+msgid "3.5\" 640 MB (ISO 15498)"
+msgstr "3,5\" 640 MB (ISO 15498)"
+
+msgid "3.5\" 1.3 GB (GigaMO)"
+msgstr "3,5\" 1,3 GB (GigaMO)"
+
+msgid "3.5\" 2.3 GB (GigaMO 2)"
+msgstr "3,5\" 2,3 GB (GigaMO 2)"
+
+msgid "5.25\" 600 MB"
+msgstr "5,25\" 600 MB"
+
+msgid "5.25\" 650 MB"
+msgstr "5,25\" 650 MB"
+
+msgid "5.25\" 1 GB"
+msgstr "5,25\" 1 GB"
+
+msgid "5.25\" 1.3 GB"
+msgstr "5,25\" 1,3 GB"
+
+msgid "Perfect RPM"
+msgstr "Perfekt RPM"
+
+msgid "1% below perfect RPM"
+msgstr "1 % under perfekt RPM"
+
+msgid "1.5% below perfect RPM"
+msgstr "1,5 % under perfekt RPM"
+
+msgid "2% below perfect RPM"
+msgstr "2 % under perfekt RPM"
+
+msgid "(System Default)"
+msgstr "(Systemstandard)"
+
+msgid "Failed to initialize network driver"
+msgstr "Kunne ikke initialisere nettverksdriver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "Nettverkskonfigurasjonen vil bli byttet til null-driver"
+
+msgid "Mouse sensitivity:"
+msgstr "Musesensitivitet:"
+
+msgid "Select media images from program working directory"
+msgstr "Velg mediebilder fra programmets arbeidsmappe"
+
+msgid "PIT mode:"
+msgstr "PIT-modus:"
+
+msgid "Auto"
+msgstr "Auto"
+
+msgid "Slow"
+msgstr "Sakte"
+
+msgid "Fast"
+msgstr "Rask"
+
+msgid "&Auto-pause on focus loss"
+msgstr "&Automatisk pause ved tap av fokus"
+
+msgid "WinBox is no longer supported"
+msgstr "WinBox støttes ikke lenger"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "Utviklingen av WinBox-behandleren ble stoppet i 2022 på grunn av mangel på vedlikeholdere. Siden vi fokuserer på å gjøre 86Box enda bedre, har vi besluttet å ikke lenger støtte WinBox som behandler.\n\nIngen flere oppdateringer vil bli gitt gjennom WinBox, og du kan oppleve feil oppførsel hvis du fortsetter å bruke den med nyere versjoner av 86Box. Feilrapporter relatert til WinBox vil bli lukket som ugyldige.\n\nGå til 86box.net for en liste over andre behandlere du kan bruke."
+
+msgid "Generate"
+msgstr "Generer"
+
+msgid "Joystick configuration"
+msgstr "Styrespak-konfigurasjon"
+
+msgid "Device"
+msgstr "Enhet"
+
+msgid "%1 (X axis)"
+msgstr "%1 (X-akse)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (Y-akse)"
+
+msgid "MCA devices"
+msgstr "MCA-enheter"
+
+msgid "List of MCA devices:"
+msgstr "Liste over MCA-enheter:"
+
+msgid "&Tablet tool"
+msgstr "&Tegnebrettverktøy"
+
+msgid "About &Qt"
+msgstr "Om &Qt"
+
+msgid "&MCA devices..."
+msgstr "&MCA-enheter..."
+
+msgid "Show non-&primary monitors"
+msgstr "Vis ikke-&primære skjermer"
+
+msgid "Open screenshots &folder..."
+msgstr "Åpne skjermbilde&mappe..."
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Bruk fullskjerms&strekkmodus ved maksimering"
+
+msgid "&Cursor/Puck"
+msgstr "&Markør/pekeplate"
+
+msgid "&Pen"
+msgstr "&Penn"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "&Vert CD/DVD-stasjon (%1:)"
+
+msgid "&Connected"
+msgstr "&Koblet til"
+
+msgid "Clear image &history"
+msgstr "Tøm bilde&historikk"
+
+msgid "Create..."
+msgstr "Opprett..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "Vert CD/DVD-stasjon (%1)"
+
+msgid "Unknown Bus"
+msgstr "Ukjent buss"
+
+msgid "Null Driver"
+msgstr "Null-driver"
+
+msgid "NIC:"
+msgstr "Nettverkskort:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "Nettverkskort %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&Nettverkskort %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "Gjengivelsesatferd"
+
+msgid "Use target framerate:"
+msgstr "Bruk mål-bilderate:"
+
+msgid " fps"
+msgstr " bps"
+
+msgid "VSync"
+msgstr "VSync"
+
+msgid "Synchronize with video"
+msgstr "Synkroniser med video"
+
+msgid "Shaders"
+msgstr "Shader-programmer"
+
+msgid "Remove"
+msgstr "Fjern"
+
+msgid "Browse..."
+msgstr "Bla gjennom..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "Kunne ikke opprette OpenGL-kontekst."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "Kunne ikke bytte til OpenGL-kontekst."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "OpenGL versjon 3.0 eller høyere kreves. Nåværende versjon er %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "Feil ved initialisering av OpenGL"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nFaller tilbake til programvaregjengivelse."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>Når du velger mediebilder (CD-ROM, diskett osv.), vil åpningsdialogen starte i samme mappe som 86Box-konfigurasjonsfilen. Denne innstillingen vil sannsynligvis bare ha betydning på macOS.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "Denne maskinen kan ha blitt flyttet eller kopiert."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "For å sikre korrekt nettverksfunksjonalitet, må 86Box vite om denne maskinen ble flyttet eller kopiert.\n\nVelg \"Jeg kopierte den\" hvis du er usikker."
+
+msgid "I Moved It"
+msgstr "Jeg flyttet den"
+
+msgid "I Copied It"
+msgstr "Jeg kopierte den"
+
+msgid "86Box Monitor #"
+msgstr "86Box-skjerm #"
+
+msgid "No MCA devices."
+msgstr "Ingen MCA-enheter."
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "Nettverkskort #1"
+
+msgid "Network Card #2"
+msgstr "Nettverkskort #2"
+
+msgid "Network Card #3"
+msgstr "Nettverkskort #3"
+
+msgid "Network Card #4"
+msgstr "Nettverkskort #4"
+
+msgid "Mode:"
+msgstr "Modus:"
+
+msgid "Interface:"
+msgstr "Grensesnitt:"
+
+msgid "Adapter:"
+msgstr "Adapter:"
+
+msgid "VDE Socket:"
+msgstr "VDE-kontakt:"
+
+msgid "86Box Unit Tester"
+msgstr "86Box-enhetstester"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Novell NetWare 2.x nøkkelkort"
+
+msgid "Serial port passthrough 1"
+msgstr "Seriell port-gjennomkobling 1"
+
+msgid "Serial port passthrough 2"
+msgstr "Seriell port-gjennomkobling 2"
+
+msgid "Serial port passthrough 3"
+msgstr "Seriell port-gjennomkobling 3"
+
+msgid "Serial port passthrough 4"
+msgstr "Seriell port-gjennomkobling 4"
+
+msgid "Renderer &options..."
+msgstr "Gjengivelses&alternativer..."
+
+msgid "PC/XT Keyboard"
+msgstr "PC/XT-tastatur"
+
+msgid "AT Keyboard"
+msgstr "AT-tastatur"
+
+msgid "AX Keyboard"
+msgstr "AX-tastatur"
+
+msgid "PS/2 Keyboard"
+msgstr "PS/2-tastatur"
+
+msgid "PS/55 Keyboard"
+msgstr "PS/55-tastatur"
+
+msgid "Keys"
+msgstr "Taster"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Logitech/Microsoft-bussmus"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Microsoft-bussmus (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Mouse Systems-seriell mus"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Mouse Systems-bussmus"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Microsoft-seriell mus"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Microsoft-seriell BallPoint"
+
+msgid "Logitech Serial Mouse"
+msgstr "Logitech-seriell mus"
+
+msgid "PS/2 Mouse"
+msgstr "PS/2-mus"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "PS/2 QuickPort-mus"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (seriell)"
+
+msgid "Default Baud rate"
+msgstr "Standard baudrate"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] Standard Hayes-kompatibelt modem"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Roland MT-32-emulering"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Roland MT-32 (Ny)-emulering"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Roland CM-32L-emulering"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Roland CM-32LN-emulering"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "OPL4-ML-tilleggskort"
+
+msgid "System MIDI"
+msgstr "System-MIDI"
+
+msgid "MIDI Input Device"
+msgstr "MIDI-inngangsenhet"
+
+msgid "BIOS file"
+msgstr "BIOS-fil"
+
+msgid "BIOS file (ROM #1)"
+msgstr "BIOS-fil (ROM #1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "BIOS-fil (ROM #2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "BIOS-fil (ROM #3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "BIOS-fil (ROM #4)"
+
+msgid "BIOS address"
+msgstr "BIOS-adresse"
+
+msgid "BIOS address (ROM #1)"
+msgstr "BIOS-adresse (ROM #1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "BIOS-adresse (ROM #2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "BIOS-adresse (ROM #3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "BIOS-adresse (ROM #4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "Aktiver skriving til BIOS-utvidelses-ROM"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "Aktiver skriving til BIOS-utvidelses-ROM (ROM #1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "Aktiver skriving til BIOS-utvidelses-ROM (ROM #2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "Aktiver skriving til BIOS-utvidelses-ROM (ROM #3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "Aktiver skriving til BIOS-utvidelses-ROM (ROM #4)"
+
+msgid "Linear framebuffer base"
+msgstr "Grunnadresse for lineært framebuffer"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "Serieport-IRQ"
+
+msgid "Parallel port IRQ"
+msgstr "Parallellport-IRQ"
+
+msgid "BIOS Revision"
+msgstr "BIOS-revisjon"
+
+msgid "BIOS Version"
+msgstr "BIOS-versjon"
+
+msgid "BIOS Language"
+msgstr "BIOS-språk"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "IBM 5161-utvidelsesenhet"
+
+msgid "IBM Cassette Basic"
+msgstr "IBM Kassett-Basic"
+
+msgid "Translate 26 -> 17"
+msgstr "Oversett 26 -> 17"
+
+msgid "Language"
+msgstr "Språk"
+
+msgid "Enable backlight"
+msgstr "Aktiver bakgrunnsbelysning"
+
+msgid "Invert colors"
+msgstr "Inverter farger"
+
+msgid "BIOS size"
+msgstr "BIOS-størrelse"
+
+msgid "BIOS size (ROM #1)"
+msgstr "BIOS-størrelse (ROM #1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "BIOS-størrelse (ROM #2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "BIOS-størrelse (ROM #3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "BIOS-størrelse (ROM #4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "Kartlegg C0000-C7FFF som UMB"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "Kartlegg C8000-CFFFF som UMB"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "Kartlegg D0000-D7FFF som UMB"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "Kartlegg D8000-DFFFF som UMB"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "Kartlegg E0000-E7FFF som UMB"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "Kartlegg E8000-EFFFF som UMB"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "JS9-bygel (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "MIDI-utgangsenhet"
+
+msgid "MIDI Real time"
+msgstr "MIDI sanntid"
+
+msgid "MIDI Thru"
+msgstr "MIDI gjennom"
+
+msgid "MIDI Clockout"
+msgstr "MIDI-klokkeutgang"
+
+msgid "SoundFont"
+msgstr "SoundFont"
+
+msgid "Output Gain"
+msgstr "Utgangsforsterkning"
+
+msgid "Chorus"
+msgstr "Chorus"
+
+msgid "Chorus Voices"
+msgstr "Chorus-stemmer"
+
+msgid "Chorus Level"
+msgstr "Chorus-nivå"
+
+msgid "Chorus Speed"
+msgstr "Chorus-hastighet"
+
+msgid "Chorus Depth"
+msgstr "Chorus-dybde"
+
+msgid "Chorus Waveform"
+msgstr "Chorus-bølgeform"
+
+msgid "Reverb"
+msgstr "Reverb"
+
+msgid "Reverb Room Size"
+msgstr "Reverb-romstørrelse"
+
+msgid "Reverb Damping"
+msgstr "Reverb-demping"
+
+msgid "Reverb Width"
+msgstr "Reverb-bredde"
+
+msgid "Reverb Level"
+msgstr "Reverb-nivå"
+
+msgid "Interpolation Method"
+msgstr "Interpolasjonsmetode"
+
+msgid "Dynamic Sample Loading"
+msgstr "Dynamisk sample-lasting"
+
+msgid "Reverb Output Gain"
+msgstr "Reverb-utgangsforsterkning"
+
+msgid "Reversed stereo"
+msgstr "Omvendt stereo"
+
+msgid "Nice ramp"
+msgstr "Myk overgang"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "Knapper"
+
+msgid "Serial Port"
+msgstr "Serieport"
+
+msgid "RTS toggle"
+msgstr "RTS-veksling"
+
+msgid "Revision"
+msgstr "Revisjon"
+
+msgid "Controller"
+msgstr "Kontroller"
+
+msgid "Show Crosshair"
+msgstr "Vis siktekorn"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "MAC-adresse"
+
+msgid "MAC Address OUI"
+msgstr "MAC-adresse OUI"
+
+msgid "Enable BIOS"
+msgstr "Aktiver BIOS"
+
+msgid "Baud Rate"
+msgstr "Baudrate"
+
+msgid "TCP/IP listening port"
+msgstr "TCP/IP-lytteport"
+
+msgid "Phonebook File"
+msgstr "Telefonbokfil"
+
+msgid "Telnet emulation"
+msgstr "Telnet-emulering"
+
+msgid "RAM Address"
+msgstr "RAM-adresse"
+
+msgid "RAM size"
+msgstr "RAM-størrelse"
+
+msgid "Initial RAM size"
+msgstr "Opprinnelig RAM-størrelse"
+
+msgid "Serial Number"
+msgstr "Serienummer"
+
+msgid "Host ID"
+msgstr "Vert-ID"
+
+msgid "FDC Address"
+msgstr "FDC-adresse"
+
+msgid "MPU-401 Address"
+msgstr "MPU-401-adresse"
+
+msgid "MPU-401 IRQ"
+msgstr "MPU-401-IRQ"
+
+msgid "Receive MIDI input"
+msgstr "Motta MIDI-inngang"
+
+msgid "Low DMA"
+msgstr "Lav DMA"
+
+msgid "Enable Game port"
+msgstr "Aktiver spillport"
+
+msgid "SID Model"
+msgstr "SID-modell"
+
+msgid "SID Filter Strength"
+msgstr "SID-filterstyrke"
+
+msgid "Surround module"
+msgstr "Surround-modul"
+
+msgid "CODEC"
+msgstr "Kodek"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "Generer kodek-avbrudd ved kodek-oppsett (nødvendig for noen drivere)"
+
+msgid "SB Address"
+msgstr "SB-adresse"
+
+msgid "Adlib Address"
+msgstr "Adlib-adresse"
+
+msgid "Use EEPROM setting"
+msgstr "Bruk EEPROM-innstilling"
+
+msgid "WSS IRQ"
+msgstr "WSS-IRQ"
+
+msgid "WSS DMA"
+msgstr "WSS-DMA"
+
+msgid "Enable OPL"
+msgstr "Aktiver OPL"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "Motta MIDI-inngang (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "SB lav DMA"
+
+msgid "6CH variant (6-channel)"
+msgstr "6CH-variant (6-kanals)"
+
+msgid "Enable CMS"
+msgstr "Aktiver CMS"
+
+msgid "Mixer"
+msgstr "Mikser"
+
+msgid "High DMA"
+msgstr "Høy DMA"
+
+msgid "Control PC speaker"
+msgstr "Kontroller PC-høyttaler"
+
+msgid "Memory size"
+msgstr "Minnestørrelse"
+
+msgid "EMU8000 Address"
+msgstr "EMU8000-adresse"
+
+msgid "IDE Controller"
+msgstr "IDE-kontroller"
+
+msgid "Codec"
+msgstr "Kodek"
+
+msgid "GUS type"
+msgstr "GUS-type"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "Aktiver 0x04-kommandoen \"Avslutt 86Box\""
+
+msgid "Display type"
+msgstr "Skjermtype"
+
+msgid "Composite type"
+msgstr "Kompositt-type"
+
+msgid "RGB type"
+msgstr "RGB-type"
+
+msgid "Line doubling type"
+msgstr "Linjefordoblingstype"
+
+msgid "Snow emulation"
+msgstr "Snøeffekt-emulering"
+
+msgid "Monitor type"
+msgstr "Skjermtype"
+
+msgid "Character set"
+msgstr "Tegnsett"
+
+msgid "XGA type"
+msgstr "XGA-type"
+
+msgid "Instance"
+msgstr "Forekomst"
+
+msgid "MMIO Address"
+msgstr "MMIO-adresse"
+
+msgid "RAMDAC type"
+msgstr "RAMDAC-type"
+
+msgid "Blend"
+msgstr "Blanding"
+
+msgid "Font"
+msgstr "Skrifttype"
+
+msgid "Bilinear filtering"
+msgstr "Bilineær filtrering"
+
+msgid "Video chroma-keying"
+msgstr "Video chroma-key"
+
+msgid "Dithering"
+msgstr "Dithering"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "Aktiver NMI for CGA-emulering"
+
+msgid "Voodoo type"
+msgstr "Voodoo-type"
+
+msgid "Framebuffer memory size"
+msgstr "Framebuffer-minnestørrelse"
+
+msgid "Texture memory size"
+msgstr "Teksturminnestørrelse"
+
+msgid "Dither subtraction"
+msgstr "Dither-subtraksjon"
+
+msgid "Screen Filter"
+msgstr "Skjermfilter"
+
+msgid "Render threads"
+msgstr "Render-tråder"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Startadresse"
+
+msgid "Contiguous Size"
+msgstr "Sammenhengende størrelse"
+
+msgid "I/O Width"
+msgstr "I/U-bredde"
+
+msgid "Transfer Speed"
+msgstr "Overføringshastighet"
+
+msgid "EMS mode"
+msgstr "EMS-modus"
+
+msgid "EMS Address"
+msgstr "EMS-adresse"
+
+msgid "EMS 1 Address"
+msgstr "EMS 1-adresse"
+
+msgid "EMS 2 Address"
+msgstr "EMS 2-adresse"
+
+msgid "EMS Memory Size"
+msgstr "EMS-minnestørrelse"
+
+msgid "EMS 1 Memory Size"
+msgstr "EMS 1-minnestørrelse"
+
+msgid "EMS 2 Memory Size"
+msgstr "EMS 2-minnestørrelse"
+
+msgid "Enable EMS"
+msgstr "Aktiver EMS"
+
+msgid "Enable EMS 1"
+msgstr "Aktiver EMS 1"
+
+msgid "Enable EMS 2"
+msgstr "Aktiver EMS 2"
+
+msgid "Address for > 2 MB"
+msgstr "Adresse for > 2 MB"
+
+msgid "Frame Address"
+msgstr "Rammeadresse"
+
+msgid "USA"
+msgstr "USA"
+
+msgid "Danish"
+msgstr "Dansk"
+
+msgid "Always at selected speed"
+msgstr "Alltid på valgt hastighet"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "BIOS-innstilling + hurtigtaster (av under POST)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 KB fra F0000"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 KB fra E0000 (adresse-MSB invertert, siste 64 KB først)"
+
+msgid "Sine"
+msgstr "Sinus"
+
+msgid "Triangle"
+msgstr "Trekant"
+
+msgid "Linear"
+msgstr "Lineær"
+
+msgid "4th Order"
+msgstr "4. orden"
+
+msgid "7th Order"
+msgstr "7. orden"
+
+msgid "Non-timed (original)"
+msgstr "Ikke-timet (original)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (JMP2 ikke koblet)"
+
+msgid "Two"
+msgstr "To"
+
+msgid "Three"
+msgstr "Tre"
+
+msgid "Wheel"
+msgstr "Hjul"
+
+msgid "Five + Wheel"
+msgstr "Fem + hjul"
+
+msgid "Five + 2 Wheels"
+msgstr "Fem + 2 hjul"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2-seriell / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R)-seriell"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "Deaktiver BIOS"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2 MB"
+
+msgid "8 MB"
+msgstr "8 MB"
+
+msgid "28 MB"
+msgstr "28 MB"
+
+msgid "1 MB"
+msgstr "1 MB"
+
+msgid "4 MB"
+msgstr "4 MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16 MB"
+
+msgid "20 MB"
+msgstr "20 MB"
+
+msgid "24 MB"
+msgstr "24 MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (stereo)"
+
+msgid "Classic"
+msgstr "Klassisk"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "Kompositt"
+
+msgid "True color"
+msgstr "Ekte farger"
+
+msgid "Old"
+msgstr "Gammel"
+
+msgid "New"
+msgstr "Ny"
+
+msgid "Color (generic)"
+msgstr "Farge (generisk)"
+
+msgid "Green Monochrome"
+msgstr "Grønn monokrom"
+
+msgid "Amber Monochrome"
+msgstr "Ravgul monokrom"
+
+msgid "Gray Monochrome"
+msgstr "Grå monokrom"
+
+msgid "Color (no brown)"
+msgstr "Farge (ingen brun)"
+
+msgid "Color (IBM 5153)"
+msgstr "Farge (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Enkel dobling"
+
+msgid "sRGB interpolation"
+msgstr "sRGB-interpolering"
+
+msgid "Linear interpolation"
+msgstr "Lineær interpolering"
+
+msgid "Has secondary 8x8 character set"
+msgstr "Har sekundært 8x8-tegnsett"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Har Quadcolor II-datterkort"
+
+msgid "Alternate monochrome contrast"
+msgstr "Alternativ monokrom kontrast"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Monokrom (5151/MDA) (hvit)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Monokrom (5151/MDA) (grønn)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Monokrom (5151/MDA) (ravgul)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Farge 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Farge 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Forbedret farge – normalmodus (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Forbedret farge – forbedret modus (5154/ECD)"
+
+msgid "Green"
+msgstr "Grønn"
+
+msgid "Amber"
+msgstr "Ravgul"
+
+msgid "Gray"
+msgstr "Grå"
+
+msgid "Grayscale"
+msgstr "Gråtoner"
+
+msgid "Color"
+msgstr "Farge"
+
+msgid "U.S. English"
+msgstr "Amerikansk engelsk"
+
+msgid "Scandinavian"
+msgstr "Skandinavisk"
+
+msgid "Other languages"
+msgstr "Andre språk"
+
+msgid "Bochs latest"
+msgstr "Bochs nyeste"
+
+msgid "Apply overscan deltas"
+msgstr "Bruk overskann-endringer"
+
+msgid "Mono Interlaced"
+msgstr "Mono-flettet"
+
+msgid "Mono Non-Interlaced"
+msgstr "Mono-ikke-flettet"
+
+msgid "Color Interlaced"
+msgstr "Farge-flettet"
+
+msgid "Color Non-Interlaced"
+msgstr "Farge-ikke-flettet"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "3Dfx Voodoo-grafikk"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 TMU-er)"
+
+msgid "8-bit"
+msgstr "8-bit"
+
+msgid "16-bit"
+msgstr "16-bit"
+
+msgid "Standard (150ns)"
+msgstr "Standard (150 ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "Høyhastighet (120 ns)"
+
+msgid "Enabled"
+msgstr "Aktivert"
+
+msgid "Standard"
+msgstr "Standard"
+
+msgid "High-Speed"
+msgstr "Høyhastighet"
+
+msgid "Stereo LPT DAC"
+msgstr "Stereo LPT-DAC"
+
+msgid "Generic Text Printer"
+msgstr "Generisk tekstskriver"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Generisk ESC/P 2-matriseskriver"
+
+msgid "Generic PostScript Printer"
+msgstr "Generisk PostScript-skriver"
+
+msgid "Generic PCL5e Printer"
+msgstr "Generisk PCL5e-skriver"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Parallell linje-internettprotokoll"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Beskyttelsesdongle for Savage Quest"
+
+msgid "Serial Passthrough Device"
+msgstr "Seriell gjennomkoblingsenhet"
+
+msgid "Passthrough Mode"
+msgstr "Gjennomkoblingsmodus"
+
+msgid "Host Serial Device"
+msgstr "Verts-seriellenhet"
+
+msgid "Name of pipe"
+msgstr "Navn på pipe"
+
+msgid "Data bits"
+msgstr "Databiter"
+
+msgid "Stop bits"
+msgstr "Stoppbiter"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Baudrate for gjennomkobling"
+
+msgid "Named Pipe (Server)"
+msgstr "Navngitt pipe (server)"
+
+msgid "Named Pipe (Client)"
+msgstr "Navngitt pipe (klient)"
+
+msgid "Host Serial Passthrough"
+msgstr "Verts-seriell gjennomkobling"
+
+msgid "E&ject %1"
+msgstr "M&at ut %1"
+
+msgid "&Unmute"
+msgstr "&Slå på lyd"
+
+msgid "Softfloat FPU"
+msgstr "Softfloat FPU"
+
+msgid "High performance impact"
+msgstr "Høy ytelsespåvirkning"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Generisk] RAM-disk (maks hastighet)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Generisk] 1989 (3500 RPM)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Generisk] 1992 (3600 RPM)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Generisk] 1994 (4500 RPM)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Generisk] 1996 (5400 RPM)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Generisk] 1997 (5400 RPM)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Generisk] 1998 (5400 RPM)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Generisk] 2000 (7200 RPM)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "IBM 8514/A-klone (ISA)"
+
+msgid "Vendor"
+msgstr "Leverandør"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Generisk PC/XT-minneutvidelse"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Generisk PC/AT-minneutvidelse"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "Kan ikke finne matriseskriver-fonter"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "TrueType-fonter i mappen \"roms/printer/fonts\" kreves for emulering av generisk ESC/P 2-matriseskriver."
+
+msgid "Inhibit multimedia keys"
+msgstr "Deaktiver multimedietaster"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Be om bekreftelse før innstillingene lagres"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Be om bekreftelse før hard reset"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Be om bekreftelse før avslutning"
+
+msgid "Options"
+msgstr "Alternativer"
+
+msgid "Model"
+msgstr "Modell"
+
+msgid "Model:"
+msgstr "Modell:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Kunne ikke initialisere Vulkan-gjengiver."
+
+msgid "GLSL Error"
+msgstr "GLSL-feil"
+
+msgid "Could not load shader: %1"
+msgstr "Kunne ikke laste shader: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "OpenGL versjon 3.0 eller høyere kreves. Nåværende GLSL-versjon er %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "Kunne ikke laste tekstur: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "Kunne ikke kompilere shader:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "Program ikke koblet:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "Shader-håndtering"
+
+msgid "Shader Configuration"
+msgstr "Shader-konfigurasjon"
+
+msgid "Add"
+msgstr "Legg til"
+
+msgid "Move up"
+msgstr "Flytt opp"
+
+msgid "Move down"
+msgstr "Flytt ned"
+
+msgid "Could not load file %1"
+msgstr "Kunne ikke laste fil %1"
+
+msgid "Key Bindings:"
+msgstr "Tastebindinger:"
+
+msgid "Action"
+msgstr "Handling"
+
+msgid "Keybind"
+msgstr "Tastebinding"
+
+msgid "Clear binding"
+msgstr "Fjern binding"
+
+msgid "Bind"
+msgstr "Bind"
+
+msgid "Bind Key"
+msgstr "Bind tast"
+
+msgid "Enter key combo:"
+msgstr "Skriv inn tastekombinasjon:"
+
+msgid "Bind conflict"
+msgstr "Bindingkonflikt"
+
+msgid "This key combo is already in use."
+msgstr "Denne tastekombinasjonen er allerede i bruk."
+
+msgid "Send Control+Alt+Del"
+msgstr "Send Control+Alt+Del"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Send Control+Alt+Escape"
+
+msgid "Toggle fullscreen"
+msgstr "Veksle fullskjerm"
+
+msgid "Screenshot"
+msgstr "Skjermbilde"
+
+msgid "Release mouse pointer"
+msgstr "Frigi musepeker"
+
+msgid "Toggle pause"
+msgstr "Veksle pause"
+
+msgid "Toggle mute"
+msgstr "Veksle lyd av/på"
+
+msgid "Text files"
+msgstr "Tekstfiler"
+
+msgid "ROM files"
+msgstr "ROM-filer"
+
+msgid "SoundFont files"
+msgstr "SoundFont-filer"
+
+msgid "Local Switch"
+msgstr "Lokal svitsj"
+
+msgid "Remote Switch"
+msgstr "Ekstern svitsj"
+
+msgid "Switch:"
+msgstr "Svitsj:"
+
+msgid "Hub Mode"
+msgstr "Hub-modus"
+
+msgid "Hostname:"
+msgstr "Vertsnavn:"
+
+msgid "ISA RAM:"
+msgstr "ISA-RAM:"
+
+msgid "ISA ROM:"
+msgstr "ISA-ROM:"
+
+msgid "&Wipe NVRAM"
+msgstr "&Tøm NVRAM"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "Dette vil slette all NVRAM (og relaterte) filer for den virtuelle maskinen som ligger i undermappen «nvr». Du må konfigurere BIOS (og eventuelt andre enheter i VM-en) på nytt om nødvendig.\n\nEr du sikker på at du vil tømme alt innhold i NVRAM for den virtuelle maskinen «%1»?"
+
+msgid "Success"
+msgstr "Vellykket"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "Tømming av NVRAM-innholdet for den virtuelle maskinen «%1» var vellykket"
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "En feil oppstod under tømming av NVRAM-innholdet for den virtuelle maskinen «%1»"
+
+msgid "%1 VM Manager"
+msgstr "%1 VM-håndtering"
+
+msgid "%n disk(s)"
+msgstr "%n disk(er)"
+
+msgid "Unknown Status"
+msgstr "Ukjent status"
+
+msgid "No Machines Found!"
+msgstr "Ingen maskiner funnet!"
+
+msgid "Check for updates on startup"
+msgstr "Se etter oppdateringer ved oppstart"
+
+msgid "Unable to determine release information"
+msgstr "Kunne ikke fastslå versjonsinformasjon"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Det oppstod en feil ved søk etter oppdateringer:\n\n%1\n\nPrøv igjen senere."
+
+msgid "Update check complete"
+msgstr "Oppdateringssjekk fullført"
+
+msgid "stable"
+msgstr "stabil"
+
+msgid "beta"
+msgstr "beta"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Du kjører den nyeste %1-versjonen av 86Box: %2"
+
+msgid "version"
+msgstr "versjon"
+
+msgid "build"
+msgstr "bygg"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Du kjører for øyeblikket versjon <b>%1</b>."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "<b>Versjon %1</b> er nå tilgjengelig."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Du kjører for øyeblikket bygg <b>%1</b>."
+
+msgid "<b>Build %1</b> is now available."
+msgstr "<b>Bygg %1</b> er nå tilgjengelig."
+
+msgid "Would you like to visit the download page?"
+msgstr "Vil du besøke nedlastingssiden?"
+
+msgid "Visit download page"
+msgstr "Besøk nedlastingssiden"
+
+msgid "Update check"
+msgstr "Oppdateringssjekk"
+
+msgid "Checking for updates..."
+msgstr "Ser etter oppdateringer..."
+
+msgid "86Box Update"
+msgstr "86Box-oppdatering"
+
+msgid "Release notes:"
+msgstr "Versjonsnotater:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "Virtuell maskin krasjet"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "Prosessen til den virtuelle maskinen «%1» ble uventet avsluttet med avslutningskode %2."
+
+msgid "The system will not be added."
+msgstr "Systemet vil ikke bli lagt til."
+
+msgid "&Update mouse every CPU frame"
+msgstr "&Oppdater musen for hver CPU-ramme"
+
+msgid "Hue"
+msgstr "Fargetone"
+
+msgid "Saturation"
+msgstr "Metning"
+
+msgid "Contrast"
+msgstr "Kontrast"
+
+msgid "Brightness"
+msgstr "Lysstyrke"
+
+msgid "Sharpness"
+msgstr "Skarphet"
+
+msgid "&CGA composite settings..."
+msgstr "&CGA-komposittinnstillinger..."
+
+msgid "CGA composite settings"
+msgstr "CGA-komposittinnstillinger"
+
+msgid "Monitor EDID"
+msgstr "EDID for skjerm"
+
+msgid "Export..."
+msgstr "Eksporter..."
+
+msgid "Export EDID"
+msgstr "Eksporter EDID"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "EDID-filen \"%ls\" er for stor."
+
+msgid "OpenGL input scale"
+msgstr "Inngangsskala for OpenGL"
+
+msgid "OpenGL input stretch mode"
+msgstr "Inngangsstrekkmodus for OpenGL"
+
+msgid "Color scheme"
+msgstr "Fargevalg"
+
+msgid "Light"
+msgstr "Lys"
+
+msgid "Dark"
+msgstr "Mørk"
diff --git a/src/qt/languages/nl-NL.po b/src/qt/languages/nl-NL.po
new file mode 100644
index 000000000..d28a72651
--- /dev/null
+++ b/src/qt/languages/nl-NL.po
@@ -0,0 +1,2983 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: nl_NL\n"
+"X-Source-Language: en_US\n"
+
+msgid "&Action"
+msgstr "&Actie"
+
+msgid "&Keyboard requires capture"
+msgstr "&Keyboard vereist vastleggen"
+
+msgid "&Right CTRL is left ALT"
+msgstr "&Rechtse CTRL is linkse ALT"
+
+msgid "&Hard Reset..."
+msgstr "&Harde Reset..."
+
+msgid "&Ctrl+Alt+Del"
+msgstr "&Ctrl+Alt+Del"
+
+msgid "Ctrl+Alt+&Esc"
+msgstr "Ctrl+Alt+&Esc"
+
+msgid "&Pause"
+msgstr "&Pauze"
+
+msgid "Pause"
+msgstr "Pauze"
+
+msgid "Re&sume"
+msgstr "He&rvatten"
+
+msgid "E&xit"
+msgstr "&Afsluiten"
+
+msgid "&View"
+msgstr "&Beeld"
+
+msgid "&Hide status bar"
+msgstr "&Statusbalk verbergen"
+
+msgid "Hide &toolbar"
+msgstr "Verberg &toolbar"
+
+msgid "&Resizeable window"
+msgstr "&Venster met aanpasbare grootte"
+
+msgid "R&emember size && position"
+msgstr "&Onthoud grootte && positie"
+
+msgid "Re&nderer"
+msgstr "Re&nderer"
+
+msgid "&Qt (Software)"
+msgstr "&Qt (software)"
+
+msgid "Open&GL (3.0 Core)"
+msgstr "Open&GL (3.0 Core)"
+
+msgid "&VNC"
+msgstr "&VNC"
+
+msgid "Specify &dimensions..."
+msgstr "Afmetingen opgeven..."
+
+msgid "Force &4:3 display ratio"
+msgstr "Forceer &4:3 beeldverhouding"
+
+msgid "&Window scale factor"
+msgstr "&Venster schaalfactor"
+
+msgid "&0.5x"
+msgstr "&0,5x"
+
+msgid "&1x"
+msgstr "&1x"
+
+msgid "1.&5x"
+msgstr "1,&5x"
+
+msgid "&2x"
+msgstr "&2x"
+
+msgid "&3x"
+msgstr "&3x"
+
+msgid "&4x"
+msgstr "&4x"
+
+msgid "&5x"
+msgstr "&5x"
+
+msgid "&6x"
+msgstr "&6x"
+
+msgid "&7x"
+msgstr "&7x"
+
+msgid "&8x"
+msgstr "&8x"
+
+msgid "Fi&lter method"
+msgstr "Filtermethode"
+
+msgid "&Nearest"
+msgstr "&Dichtsbijzijnde"
+
+msgid "&Linear"
+msgstr "&Lineair"
+
+msgid "Hi&DPI scaling"
+msgstr "Hi&DPI-schaling"
+
+msgid "&Fullscreen"
+msgstr "&Volledig scherm"
+
+msgid "Fullscreen &stretch mode"
+msgstr "Volledig scherm &uitrekmodus"
+
+msgid "&Full screen stretch"
+msgstr "&Volledig scherm uitrekken"
+
+msgid "&4:3"
+msgstr "&4:3"
+
+msgid "&Square pixels (Keep ratio)"
+msgstr "&Vierkante pixels (behoud verhouding)"
+
+msgid "&Integer scale"
+msgstr "&Integerschaal"
+
+msgid "4:&3 Integer scale"
+msgstr "4:&3 integerschaal"
+
+msgid "EGA/(S)&VGA settings"
+msgstr "EGA/(S)&VGA-instellingen"
+
+msgid "&Inverted VGA monitor"
+msgstr "Ge&ïnverteerde VGA-monitor"
+
+msgid "VGA screen &type"
+msgstr "VGA-scherm &type"
+
+msgid "RGB &Color"
+msgstr "RGB &Kleur"
+
+msgid "RGB (no brown)"
+msgstr "RGN (geen bruin)"
+
+msgid "&RGB Grayscale"
+msgstr "&RGB grijstinten"
+
+msgid "Generic RGBI color monitor"
+msgstr "Generieke RGBI kleuren monitor"
+
+msgid "&Amber monitor"
+msgstr "&Amber monitor"
+
+msgid "&Green monitor"
+msgstr "&Groene monitor"
+
+msgid "&White monitor"
+msgstr "&Witte monitor"
+
+msgid "Grayscale &conversion type"
+msgstr "Grijstinten &conversietype"
+
+msgid "BT&601 (NTSC/PAL)"
+msgstr "BT&601 (NTSC/PAL)"
+
+msgid "BT&709 (HDTV)"
+msgstr "BT&709 (HDTV)"
+
+msgid "&Average"
+msgstr "&Gemiddelde"
+
+msgid "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
+msgstr "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
+
+msgid "Change contrast for &monochrome display"
+msgstr "Contrast wijzigen voor &monochroom beeldscherm"
+
+msgid "&Media"
+msgstr "&Media"
+
+msgid "&Tools"
+msgstr "&Tools"
+
+msgid "&Settings..."
+msgstr "&Instellingen..."
+
+msgid "Settings..."
+msgstr "Instellingen..."
+
+msgid "&Update status bar icons"
+msgstr "&Statusbalkpictogrammen bijwerken"
+
+msgid "Take s&creenshot"
+msgstr "Maak een schermafbeelding"
+
+msgid "S&ound"
+msgstr "&Geluid"
+
+msgid "&Preferences..."
+msgstr "&Voorkeuren..."
+
+msgid "Enable &Discord integration"
+msgstr "&Discord integratie inschakelen"
+
+msgid "Sound &gain..."
+msgstr "&Geluidsversterking..."
+
+msgid "Begin trace"
+msgstr "Begin traceren"
+
+msgid "End trace"
+msgstr "Traceren beëindigen"
+
+msgid "&Help"
+msgstr "&Help"
+
+msgid "&Documentation..."
+msgstr "&Documentatie..."
+
+msgid "&About 86Box..."
+msgstr "&Over 86Box..."
+
+msgid "&New image..."
+msgstr "&Nieuw image..."
+
+msgid "&Existing image..."
+msgstr "&Bestaande image..."
+
+msgid "Existing image (&Write-protected)..."
+msgstr "Bestaande image (&Schrijfbeveiligd)..."
+
+msgid "&Record"
+msgstr "&Opnemen"
+
+msgid "&Play"
+msgstr "&Play"
+
+msgid "&Rewind to the beginning"
+msgstr "&Terugspoelen naar het begin"
+
+msgid "&Fast forward to the end"
+msgstr "&Snel vooruit naar het einde"
+
+msgid "E&ject"
+msgstr "&Uitwerpen"
+
+msgid "&Image..."
+msgstr "&Image..."
+
+msgid "E&xport to 86F..."
+msgstr "E&xporteer naar 86F..."
+
+msgid "&Mute"
+msgstr "&Mute"
+
+msgid "E&mpty"
+msgstr "E&mpty"
+
+msgid "Reload previous image"
+msgstr "Herlaad vorige image"
+
+msgid "&Folder..."
+msgstr "&Map..."
+
+msgid "Target &framerate"
+msgstr "Doel &framerate"
+
+msgid "&Sync with video"
+msgstr "&Synchroniseer met video"
+
+msgid "&25 fps"
+msgstr "&25 fps"
+
+msgid "&30 fps"
+msgstr "&30 fps"
+
+msgid "&50 fps"
+msgstr "&50 fps"
+
+msgid "&60 fps"
+msgstr "&60 fps"
+
+msgid "&75 fps"
+msgstr "&75 fps"
+
+msgid "&VSync"
+msgstr "&VSync"
+
+msgid "&Select shader..."
+msgstr "&Selecteer shader..."
+
+msgid "&Remove shader"
+msgstr "&Remove shader"
+
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+msgid "Sound Gain"
+msgstr "Geluidsversterking"
+
+msgid "New Image"
+msgstr "Nieuw image"
+
+msgid "Settings"
+msgstr "Instellingen"
+
+msgid "Specify Main Window Dimensions"
+msgstr "Afmetingen hoofdvenster opgeven"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Cancel"
+msgstr "Annuleren"
+
+msgid "&Default"
+msgstr "&Standaard"
+
+msgid "Language:"
+msgstr "Taal:"
+
+msgid "Gain"
+msgstr "Versterking"
+
+msgid "File name:"
+msgstr "Bestandsnaam:"
+
+msgid "Disk size:"
+msgstr "Schijfgrootte:"
+
+msgid "RPM mode:"
+msgstr "RPM-modus:"
+
+msgid "Progress:"
+msgstr "Vooruitgang:"
+
+msgid "Width:"
+msgstr "Breedte:"
+
+msgid "Height:"
+msgstr "Hoogte:"
+
+msgid "Lock to this size"
+msgstr "Leg vast op deze grootte"
+
+msgid "Machine type:"
+msgstr "Machinetype:"
+
+msgid "Machine:"
+msgstr "Machine:"
+
+msgid "Configure"
+msgstr "Configureren"
+
+msgid "CPU:"
+msgstr "CPU:"
+
+msgid "CPU type:"
+msgstr "CPU type:"
+
+msgid "Speed:"
+msgstr "Snelheid:"
+
+msgid "Frequency:"
+msgstr "Frequentie:"
+
+msgid "FPU:"
+msgstr "FPU:"
+
+msgid "Wait states:"
+msgstr "Wachttoestanden:"
+
+msgid "MB"
+msgstr "MB"
+
+msgid "Memory:"
+msgstr "Geheugen:"
+
+msgid "Time synchronization"
+msgstr "Tijdsynchronisatie"
+
+msgid "Disabled"
+msgstr "Uitgeschakeld"
+
+msgid "Enabled (local time)"
+msgstr "Ingeschakeld (lokale tijd)"
+
+msgid "Enabled (UTC)"
+msgstr "Ingeschakeld (UTC)"
+
+msgid "Dynamic Recompiler"
+msgstr "Dynamische Recompiler"
+
+msgid "CPU frame size"
+msgstr "CPU frame grootte"
+
+msgid "Larger frames (less smooth)"
+msgstr "Groter frames (minder vloeiend)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Kleinere frames (vloeiender)"
+
+msgid "Video:"
+msgstr "Video:"
+
+msgid "Video #2:"
+msgstr "Video #2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Voodoo 1 of 2 graphics"
+
+msgid "IBM 8514/A Graphics"
+msgstr "IBM 8514/A-graphics"
+
+msgid "XGA Graphics"
+msgstr "XGA Graphics"
+
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "IBM PS/55 Display Adapter Graphics"
+
+msgid "Keyboard:"
+msgstr "Toetsenbord"
+
+msgid "Keyboard"
+msgstr "Toetsenbord"
+
+msgid "Mouse:"
+msgstr "Muis:"
+
+msgid "Mouse"
+msgstr "Muis"
+
+msgid "Joystick:"
+msgstr "Joystick:"
+
+msgid "Joystick"
+msgstr "Joystick"
+
+msgid "Joystick 1..."
+msgstr "Joystick 1..."
+
+msgid "Joystick 2..."
+msgstr "Joystick 2..."
+
+msgid "Joystick 3..."
+msgstr "Joystick 3..."
+
+msgid "Joystick 4..."
+msgstr "Joystick 4..."
+
+msgid "Sound card #1:"
+msgstr "Geluidskaart #1:"
+
+msgid "Sound card #2:"
+msgstr "Geluidskaart #2:"
+
+msgid "Sound card #3:"
+msgstr "Geluidskaart #3:"
+
+msgid "Sound card #4:"
+msgstr "Geluidskaart #4:"
+
+msgid "MIDI Out Device:"
+msgstr "MIDI Out-apparaat:"
+
+msgid "MIDI In Device:"
+msgstr "MIDI In-apparaat:"
+
+msgid "MIDI Out:"
+msgstr "Midi Out:"
+
+msgid "Standalone MPU-401"
+msgstr "Standalone MPU-401"
+
+msgid "Use FLOAT32 sound"
+msgstr "Gebruik FLOAT32-geluid"
+
+msgid "FM synth driver"
+msgstr "FM-synthesizer"
+
+msgid "Nuked (more accurate)"
+msgstr "Nuked (nauwkeuriger)"
+
+msgid "YMFM (faster)"
+msgstr "YMFM (sneller)"
+
+msgid "COM1 Device:"
+msgstr "COM1-apparaat:"
+
+msgid "COM2 Device:"
+msgstr "COM2-apparaat:"
+
+msgid "COM3 Device:"
+msgstr "COM3-apparaat:"
+
+msgid "COM4 Device:"
+msgstr "COM4-apparaat:"
+
+msgid "LPT1 Device:"
+msgstr "LPT1-apparaat:"
+
+msgid "LPT2 Device:"
+msgstr "LPT2-apparaat:"
+
+msgid "LPT3 Device:"
+msgstr "LPT3-apparaat:"
+
+msgid "LPT4 Device:"
+msgstr "LPT4-apparaat:"
+
+msgid "Internal LPT ECP DMA:"
+msgstr "Interne LPT ECP DMA:"
+
+msgid "Serial port 1"
+msgstr "Seriële poort 1"
+
+msgid "Serial port 2"
+msgstr "Seriële poort 2"
+
+msgid "Serial port 3"
+msgstr "Seriële poort 3"
+
+msgid "Serial port 4"
+msgstr "Seriële poort 4"
+
+msgid "Parallel port 1"
+msgstr "Parallelle poort 1"
+
+msgid "Parallel port 2"
+msgstr "Parallelle poort 2"
+
+msgid "Parallel port 3"
+msgstr "Parallelle poort 3"
+
+msgid "Parallel port 4"
+msgstr "Parallelle poort 4"
+
+msgid "FD Controller:"
+msgstr "FD-Controller:"
+
+msgid "CD-ROM Controller:"
+msgstr "CD-ROM controller"
+
+msgid "Tertiary IDE Controller"
+msgstr "Tertiaire IDE-controller"
+
+msgid "Quaternary IDE Controller"
+msgstr "Quaternaire IDE-controller"
+
+msgid "Hard disk"
+msgstr "Harde schijf"
+
+msgid "SCSI"
+msgstr "SCSI"
+
+msgid "Controller 1:"
+msgstr "Controller 1:"
+
+msgid "Controller 2:"
+msgstr "Controller 2:"
+
+msgid "Controller 3:"
+msgstr "Controller 3:"
+
+msgid "Controller 4:"
+msgstr "Controller 4:"
+
+msgid "Cassette"
+msgstr "Cassette"
+
+msgid "Hard disks:"
+msgstr "Harde schijven:"
+
+msgid "Firmware Version"
+msgstr "Firmware Versie"
+
+msgid "&New..."
+msgstr "&Nieuw..."
+
+msgid "&Existing..."
+msgstr "&Bestaande..."
+
+msgid "&Remove"
+msgstr "&Verwijderen"
+
+msgid "Bus:"
+msgstr "Bus:"
+
+msgid "Channel:"
+msgstr "Kanaal:"
+
+msgid "ID:"
+msgstr "ID:"
+
+msgid "&Specify..."
+msgstr "&Specificeer..."
+
+msgid "Sectors:"
+msgstr "Sectoren:"
+
+msgid "Heads:"
+msgstr "Heads:"
+
+msgid "Cylinders:"
+msgstr "Cilinders:"
+
+msgid "Size (MB):"
+msgstr "Grootte (MB):"
+
+msgid "Type:"
+msgstr "Type:"
+
+msgid "Image Format:"
+msgstr "Imageformaat:"
+
+msgid "Block Size:"
+msgstr "Blokgrootte:"
+
+msgid "Floppy drives:"
+msgstr "Floppy-schijfstations:"
+
+msgid "Turbo timings"
+msgstr "Turbo timings"
+
+msgid "Check BPB"
+msgstr "Controleer BPB"
+
+msgid "CD-ROM drives:"
+msgstr "CD-ROM-stations:"
+
+msgid "MO drives:"
+msgstr "MO-schijven:"
+
+msgid "MO:"
+msgstr "MO:"
+
+msgid "Removable disks:"
+msgstr "Verwisselbare schijven:"
+
+msgid "Removable disk drives:"
+msgstr "Verwisselbare schijfstations"
+
+msgid "ZIP 250"
+msgstr "ZIP 250"
+
+msgid "ISA RTC:"
+msgstr "ISA RTC:"
+
+msgid "ISA Memory Expansion"
+msgstr "ISA-geheugenuitbreiding"
+
+msgid "ISA ROM Cards"
+msgstr "ISA ROM-kaart"
+
+msgid "Card 1:"
+msgstr "Kaart 1:"
+
+msgid "Card 2:"
+msgstr "Kaart 2:"
+
+msgid "Card 3:"
+msgstr "Kaart 3:"
+
+msgid "Card 4:"
+msgstr "Kaart 4:"
+
+msgid "Generic ISA ROM Board"
+msgstr "Generieke ISA ROM-kaart"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "Generieke Dubbele ISA ROM-kaart"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "Generieke Viervoudige ISA ROM-kaart"
+
+msgid "ISABugger device"
+msgstr "ISABugger-apparaat"
+
+msgid "POST card"
+msgstr "POST-kaart"
+
+msgid "86Box"
+msgstr "86Box"
+
+msgid "Error"
+msgstr "Fout"
+
+msgid "Fatal error"
+msgstr "Fatale fout"
+
+msgid " - PAUSED"
+msgstr " - GEPAUZEERD"
+
+msgid "Speed"
+msgstr "Snelheid"
+
+msgid "Removable disk %1 (%2): %3"
+msgstr "Verwijderbare schijf  %1 (%2): %3"
+
+msgid "&Removable disk %1 (%2): %3"
+msgstr "&Verwijderbare schijf  %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Verwijderbare schijf image"
+
+msgid "Image %1"
+msgstr "Image %1"
+
+msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
+msgstr "86Box kon geen bruikbare ROM images vinden.\n\n<a href=\"https://github.com/86Box/roms/releases/latest\">Download</a> een ROM set en pak deze uit in de map \"roms\"."
+
+msgid "(empty)"
+msgstr "(leeg)"
+
+msgid "All files"
+msgstr "Alle bestanden"
+
+msgid "Turbo"
+msgstr "Turbo"
+
+msgid "On"
+msgstr "Aan"
+
+msgid "Off"
+msgstr "Uit"
+
+msgid "All images"
+msgstr "Alle schijfimages"
+
+msgid "Basic sector images"
+msgstr "Basissectorimages"
+
+msgid "Surface images"
+msgstr "Oppervlakte-images"
+
+msgid "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
+msgstr "Machine \"%hs\" is niet beschikbaar door ontbrekende ROMs in de map roms/machines. Er wordt overgeschakeld naar een beschikbare machine."
+
+msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
+msgstr "Videokaart \"%hs\" is niet beschikbaar door ontbrekende ROMs in de map roms/video. Er wordt overgeschakeld naar een beschikbare videokaart."
+
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "Videokaart #2 \"%hs\" is niet beschikbaar door ontbrekende ROMs in de map roms/video. De tweede videokaart wordt uitgeschakeld."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "Het apparaat \"%hs\" is niet beschikbaar door ontbrekende ROMs. Het apparaat wordt genegeerd."
+
+msgid "Machine"
+msgstr "Machine"
+
+msgid "Display"
+msgstr "Scherm"
+
+msgid "Input devices"
+msgstr "Invoerapparaten"
+
+msgid "Sound"
+msgstr "Geluid"
+
+msgid "Network"
+msgstr "Netwerk"
+
+msgid "Ports (COM & LPT)"
+msgstr "Poorten (COM & LPT)"
+
+msgid "Ports"
+msgstr "Poorten"
+
+msgid "Serial ports:"
+msgstr "Seriële poorten:"
+
+msgid "Parallel ports:"
+msgstr "Parallelle poorten:"
+
+msgid "Storage controllers"
+msgstr "Opslagcontrollers"
+
+msgid "Hard disks"
+msgstr "Harde schijven"
+
+msgid "Disks:"
+msgstr "Schijven:"
+
+msgid "Floppy:"
+msgstr "Floppy:"
+
+msgid "Controllers:"
+msgstr "Controllers:"
+
+msgid "Floppy & CD-ROM drives"
+msgstr "Floppy- en CD-ROM-stations"
+
+msgid "Other removable devices"
+msgstr "Andere verwijderbare apparaten"
+
+msgid "Other peripherals"
+msgstr "Andere randapparatuur"
+
+msgid "Other devices"
+msgstr "Andere apparaten"
+
+msgid "Click to capture mouse"
+msgstr "Klik om muis vast te leggen"
+
+msgid "Press %1 to release mouse"
+msgstr "Druk op %1 om de muis los te laten"
+
+msgid "Press %1 or middle button to release mouse"
+msgstr "Druk op %1 of middelste knop om de muis los te laten"
+
+msgid "Bus"
+msgstr "Bus"
+
+msgid "File"
+msgstr "Bestand"
+
+msgid "C"
+msgstr "C"
+
+msgid "H"
+msgstr "H"
+
+msgid "S"
+msgstr "S"
+
+msgid "KB"
+msgstr "KB"
+
+msgid "Default"
+msgstr "Standaard"
+
+msgid "%1 Wait state(s)"
+msgstr "%1 Wachttoestand(en)"
+
+msgid "Type"
+msgstr "Type"
+
+msgid "No PCap devices found"
+msgstr "Geen PCap-apparaten gevonden"
+
+msgid "Invalid PCap device"
+msgstr "Ongeldig PCap-apparaat"
+
+msgid "2-axis, 2-button joystick(s)"
+msgstr "Joystick(s) met 2 assen en 2 knoppen"
+
+msgid "2-axis, 4-button joystick"
+msgstr "Joystick met 2 assen en 4 knoppen"
+
+msgid "2-axis, 6-button joystick"
+msgstr "Joystick met 2 assen en 6 knoppen"
+
+msgid "2-axis, 8-button joystick"
+msgstr "Joystick met 2 assen en 8 knoppen"
+
+msgid "3-axis, 2-button joystick"
+msgstr "Joystick met 3 assen en 2 knoppen"
+
+msgid "3-axis, 4-button joystick"
+msgstr "Joystick met 3 assen en 4 knoppen"
+
+msgid "4-axis, 4-button joystick"
+msgstr "Joystick met 4 assen en 4 knoppen"
+
+msgid "CH Flightstick Pro"
+msgstr "CH Flightstick Pro"
+
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH Pedalen"
+
+msgid "Microsoft SideWinder Pad"
+msgstr "Microsoft SideWinder Pad"
+
+msgid "Thrustmaster Flight Control System"
+msgstr "Thrustmaster Flight Control systeem"
+
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Roer Control Systeem"
+
+msgid "2-button gamepad(s)"
+msgstr "2-knops gamepad(s)"
+
+msgid "2-button flight yoke"
+msgstr "2-knops stuurknuppel"
+
+msgid "4-button gamepad"
+msgstr "4-knops gamepad"
+
+msgid "4-button flight yoke"
+msgstr "4-knops stuurknuppel"
+
+msgid "2-button flight yoke with throttle"
+msgstr "2-kops stuurknuppel met gashendel "
+
+msgid "4-button flight yoke with throttle"
+msgstr "2-kops stuurknuppel met gashendel"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Win95 Stuurwiel (3 assen, 4 knoppen)"
+
+msgid "None"
+msgstr "Geen"
+
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CHS: %2, %3, %4)"
+
+msgid "Floppy %1 (%2): %3"
+msgstr "Floppy %1 (%2): %3"
+
+msgid "&Floppy %1 (%2): %3"
+msgstr "&Floppy %1 (%2): %3"
+
+msgid "Advanced sector images"
+msgstr "Geavanceerde sector-images"
+
+msgid "Flux images"
+msgstr "Flux images"
+
+msgid "Are you sure you want to hard reset the emulated machine?"
+msgstr "Weet je zeker dat je de geëmuleerde machine wilt resetten?"
+
+msgid "Are you sure you want to exit 86Box?"
+msgstr "Weet je zeker dat je 86Box wilt verlaten?"
+
+msgid "Unable to initialize Ghostscript"
+msgstr "Kan Ghostscript niet initialiseren"
+
+msgid "Unable to initialize GhostPCL"
+msgstr "Kan GhostPCL niet initialiseren"
+
+msgid "MO %1 (%2): %3"
+msgstr "MO %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&MO %1 (%2): %3"
+
+msgid "MO images"
+msgstr "MO-images"
+
+msgid "Welcome to 86Box!"
+msgstr "Welkom bij 86Box!"
+
+msgid "Internal device"
+msgstr "Intern apparaat"
+
+msgid "&File"
+msgstr "&Bestand"
+
+msgid "&New machine..."
+msgstr "&Nieuwe machine..."
+
+msgid "&Check for updates..."
+msgstr "&Controleren op updates..."
+
+msgid "Exit"
+msgstr "&Afsluiten"
+
+msgid "No ROMs found"
+msgstr "Geen ROMs gevonden"
+
+msgid "Do you want to save the settings?"
+msgstr "Wil je de instellingen opslaan?"
+
+msgid "This will hard reset the emulated machine."
+msgstr "Dit zal de geëmuleerde machine een hard reset geven."
+
+msgid "Save"
+msgstr "Opslaan"
+
+msgid "About 86Box"
+msgstr "Over 86Box"
+
+msgid "86Box v"
+msgstr "86Box v"
+
+msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
+msgstr "Een emulator van oude computers\n\nAuteurs: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nMet eerdere bijdragen van Sarah Walker, leilei, JohnElliott, greatpsycho en anderen.\n\nUitgebracht onder de GNU General Public License versie 2 of later. Zie LICENSE voor meer informatie."
+
+msgid "Hardware not available"
+msgstr "Hardware niet beschikbaar"
+
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "Zorg ervoor dat %1 is geïnstalleerd en dat je een %1-compatibele netwerkverbinding hebt."
+
+msgid "Invalid configuration"
+msgstr "Ongeldige configuratie"
+
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 is vereist voor automatische conversie van PostScript-bestanden naar PDF.\n\nAlle documenten die naar de generieke PostScript-printer worden gestuurd, worden opgeslagen als PostScript-bestanden (.ps)."
+
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 is vereist voor automatische conversie van PCL-bestanden naar PDF.\n\nAlle documenten die naar de generieke PCL-printer worden gestuurd, worden opgeslagen als Printer Command Language (.pcl) bestanden."
+
+msgid "Don't show this message again"
+msgstr "Dit bericht niet meer tonen"
+
+msgid "Don't exit"
+msgstr "Niet afsluiten"
+
+msgid "Reset"
+msgstr "Reset"
+
+msgid "Don't reset"
+msgstr "Niet resetten"
+
+msgid "CD-ROM images"
+msgstr "CD-ROM-images"
+
+msgid "%1 Device Configuration"
+msgstr "%1 Apparaatconfiguratie"
+
+msgid "Monitor in sleep mode"
+msgstr "Monitor in slaapstand"
+
+msgid "GLSL shaders"
+msgstr "GLSL Shaders"
+
+msgid "You are loading an unsupported configuration"
+msgstr "U laadt een configuratie die niet wordt ondersteund"
+
+msgid "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
+msgstr "Filteren op CPU type voor de geselecteerde machine is niet mogelijk met de geselecteerde machine.\n\nDit maakt het mogelijk een CPU te kunnen kiezen die anders niet compatible zou zijn met de geselecteerde machine. Je kunt hiermee echter compatibiliteitsproblemen krijgen met de BIOS van de machine of met andere software.\n\nHet inschakelen van deze instelling wordt niet officieel ondersteund en bugrapporten die worden ingediend kunnen als ongeldig worden gesloten."
+
+msgid "Continue"
+msgstr "Doorgaan"
+
+msgid "Cassette: %1"
+msgstr "Cassette: %1"
+
+msgid "C&assette: %1"
+msgstr "C&assette: %1"
+
+msgid "Cassette images"
+msgstr "Cassette-images"
+
+msgid "Cartridge %1: %2"
+msgstr "Cartridge %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "Car&tridge %1: %2"
+
+msgid "Cartridge images"
+msgstr "Cartridge-images"
+
+msgid "Resume execution"
+msgstr "Hervat executie"
+
+msgid "Pause execution"
+msgstr "Pauze executie"
+
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del"
+
+msgid "Press Ctrl+Alt+Del"
+msgstr "Druk op Ctrl+Alt+Del"
+
+msgid "Press Ctrl+Alt+Esc"
+msgstr "Druk op Ctrl+Alt+Esc"
+
+msgid "Hard reset"
+msgstr "Harde reset"
+
+msgid "Force shutdown"
+msgstr "Forceer afsluiten"
+
+msgid "Start"
+msgstr "Start"
+
+msgid "Not running"
+msgstr "Niet actied"
+
+msgid "Running"
+msgstr "Actief"
+
+msgid "Paused"
+msgstr "Gepauzeerd"
+
+msgid "Waiting"
+msgstr "aan het wachtend"
+
+msgid "Powered Off"
+msgstr "Sluit af"
+
+msgid "%n running"
+msgstr "%n actief"
+
+msgid "%n paused"
+msgstr "%n gepauzeerd"
+
+msgid "%n waiting"
+msgstr "%n aan het wachten"
+
+msgid "%1 total"
+msgstr "%1 totaal"
+
+msgid "VMs: %1"
+msgstr "VMs: %1"
+
+msgid "System Directory:"
+msgstr "Systeemmap:"
+
+msgid "Choose directory"
+msgstr "Kies map"
+
+msgid "Choose configuration file"
+msgstr "Kies configuratiebestand"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "86Box configuratiebestanden (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Lezen configuratie mislukt"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "Openen van geselecteerd configuratiebestand voor lezen niet mogelijk: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "Gebruik reguliere expressies in zoekveld"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "%1 machine(s) zijn nu actief. Weet je zeker dat je de VM manager wil afsluiten?"
+
+msgid "Add new system wizard"
+msgstr "Assistent voor toevoegen van nieuw systeem"
+
+msgid "Introduction"
+msgstr "Introductie"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "Dit helpt je een nieuw systeem toe te voegen aan 86Box."
+
+msgid "New configuration"
+msgstr "Nieuwe configuratie"
+
+msgid "Complete"
+msgstr "Compleet"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "De assistent zal nu de configuratie van het nieuwe systeem starten."
+
+msgid "Use existing configuration"
+msgstr "Gebruik bestaande configuratie"
+
+msgid "Type some notes here"
+msgstr "Ruimte voor notities"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Plak de inhoud van het bestaande configuratiebestand in het vak hieronder."
+
+msgid "Load configuration from file"
+msgstr "Laad configuratie van bestand"
+
+msgid "System name"
+msgstr "Systeemnaam"
+
+msgid "System name:"
+msgstr "Systeemnaam:"
+
+msgid "System name cannot contain certain characters"
+msgstr "Systeemnaam mag bepaalde tekens niet bevatten"
+
+msgid "System name already exists"
+msgstr "Systeemnaam bestaat al"
+
+msgid "Please enter a directory for the system"
+msgstr "Geef een map op voor het systeem"
+
+msgid "Directory does not exist"
+msgstr "Map bestaat niet"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "Een nieuwe map voor het systeem wordt aangemaakt in de boven geselecteerde map"
+
+msgid "System location:"
+msgstr "Systeemlocatie:"
+
+msgid "System name and location"
+msgstr "Systeemnaam en -locatie"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Voer de naam in van het systeem en kies een locatie"
+
+msgid "Enter the name of the system"
+msgstr "Voer de naam in van het systeem"
+
+msgid "Please enter a system name"
+msgstr "Voer een naam in van het systeem"
+
+msgid "Display name (optional):"
+msgstr "Weergavenaam (optioneel):"
+
+msgid "Display name:"
+msgstr "Weergavenaam:"
+
+msgid "Set display name"
+msgstr "Weergavenaam instellen"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Voer een nieuwe weergavenaam in (laat leeg om te herstellen)"
+
+msgid "Change &display name..."
+msgstr "Pas &weergavenaam aan..."
+
+msgid "Context Menu"
+msgstr "Contextmenu"
+
+msgid "&Open folder..."
+msgstr "&Open map..."
+
+msgid "Open p&rinter tray..."
+msgstr "Open &papierlade..."
+
+msgid "Set &icon..."
+msgstr "Stel &icoon in..."
+
+msgid "Select an icon"
+msgstr "Selecteer een icoon"
+
+msgid "C&lone..."
+msgstr "K&lonen..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "Virtuele machine \"%1\" (%2) zal gekloond worden naar:"
+
+msgid "Directory %1 already exists"
+msgstr "Map %1 bestaat al"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "De volgende tekens mogen niet gebruikt worden in de naam: %1"
+
+msgid "Clone"
+msgstr "Klonen"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Map aanmaken voor gekloonde VM mislukt"
+
+msgid "Failed to clone VM."
+msgstr "Kolen van VM mislukt."
+
+msgid "Directory in use"
+msgstr "Map in gebruik"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "De geselecteerde map is al in gebruik. Selecteer een andere map."
+
+msgid "Create directory failed"
+msgstr "Map aanmaken mislukt"
+
+msgid "Unable to create the directory for the new system"
+msgstr "Map aanmaken voor het nieuwe systeem niet mogelijk"
+
+msgid "Configuration write failed"
+msgstr "Wegschrijven configuratie mislukt"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "Openen van configuratiebestand %1 voor wegschrijven niet mogelijk"
+
+msgid "Error adding system"
+msgstr "Fout bij toevoegen van systeem"
+
+msgid "Remove directory failed"
+msgstr "Verwijderen map mislukt"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "Enkele bestanden in de machinemap konden niet verwijderd worden. Verwijder deze handmatig."
+
+msgid "Build"
+msgstr "Build"
+
+msgid "Version"
+msgstr "Versie"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "Een update van 86Box is beschikbaar: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "Er is een fout opgetreden tijdens het controleren op updates: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b> Een update van 86Box is beschikbaar!</b>"
+
+msgid "Warning"
+msgstr "Waarschuwing"
+
+msgid "&Kill"
+msgstr "&Gedwongen beëindigen"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "Gedwongen beëindiging van een virtuele machine kan dataverlies veroorzaken. Doe dit alleen wanneer het 86Box process is vast gelopen.\n\nWeet je zeker dat je de virtuele machine \"%1\" wil beëindigen?"
+
+msgid "&Delete"
+msgstr "&Verwijderen"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "Weet je zeker dat je de virtuele machine \"%1\" en al haar bestanden wil verwijderen? Deze actie kan niet ongedaan gemaakt worden!"
+
+msgid "Show &config file"
+msgstr "Toon &configuratiebestand"
+
+msgid "No screenshot"
+msgstr "Geen schermafbeelding"
+
+msgid "Search"
+msgstr "Zoeken"
+
+msgid "Searching for VMs..."
+msgstr "Zoeken naar VMs..."
+
+msgid "Found %1"
+msgstr "Gevonden %1"
+
+msgid "System"
+msgstr "Systeem"
+
+msgid "Storage"
+msgstr "Opslag"
+
+msgid "Disk %1: "
+msgstr "Schijf %1: "
+
+msgid "No disks"
+msgstr "Geen schijven"
+
+msgid "Audio"
+msgstr "Audio"
+
+msgid "Audio:"
+msgstr "Audio:"
+
+msgid "ACPI shutdown"
+msgstr "ACPI uitschakeling"
+
+msgid "ACP&I shutdown"
+msgstr "ACP&I uitschakeling"
+
+msgid "Hard disk (%1)"
+msgstr "Harde schijf (%1)"
+
+msgid "MFM/RLL or ESDI CD-ROM drives never existed"
+msgstr "MFM/RLL of ESDI CD-ROM-stations hebben nooit bestaan"
+
+msgid "Custom..."
+msgstr "Aangepast..."
+
+msgid "Custom (large)..."
+msgstr "Aangepast (groot)..."
+
+msgid "Add New Hard Disk"
+msgstr "Nieuwe harde schijf toevoegen"
+
+msgid "Add Existing Hard Disk"
+msgstr "Bestaande harde schijf toevoegen"
+
+msgid "HDI disk images cannot be larger than 4 GB."
+msgstr "HDI-schijfimages kunnen niet groter zijn dan 4 GB."
+
+msgid "Disk images cannot be larger than 127 GB."
+msgstr "Schijfimages kunnen niet groter zijn dan 127 GB."
+
+msgid "Hard disk images"
+msgstr "Harde schijf-image"
+
+msgid "Unable to read file"
+msgstr "Kan bestand niet lezen"
+
+msgid "Unable to write file"
+msgstr "Kan bestand niet schrijven"
+
+msgid "HDI or HDX images with a sector size other than 512 are not supported."
+msgstr "HDI- of HDX-image met een andere sectorgrootte dan 512 worden niet ondersteund."
+
+msgid "Disk image file already exists"
+msgstr "Schijfimagebestand bestaat al"
+
+msgid "Please specify a valid file name."
+msgstr "Geef een geldige bestandsnaam op."
+
+msgid "Disk image created"
+msgstr "Schijfimage gemaakt"
+
+msgid "Make sure the file exists and is readable."
+msgstr "Controleer of het bestand bestaat en leesbaar is."
+
+msgid "Make sure the file is being saved to a writable directory."
+msgstr "Zorg ervoor dat het bestand wordt opgeslagen in een schrijfbare map."
+
+msgid "Disk image too large"
+msgstr "Schijfimage te groot"
+
+msgid "Remember to partition and format the newly-created drive."
+msgstr "Vergeet niet om de nieuw aangemaakte schijf te partitioneren en te formatteren."
+
+msgid "The selected file will be overwritten. Are you sure you want to use it?"
+msgstr "Het geselecteerde bestand wordt overschreven. Weet u zeker dat u het wilt gebruiken?"
+
+msgid "Unsupported disk image"
+msgstr "Niet-ondersteunde schijfimage"
+
+msgid "Overwrite"
+msgstr "Overschrijven"
+
+msgid "Don't overwrite"
+msgstr "Niet overschrijven"
+
+msgid "Raw image"
+msgstr "Ruw image"
+
+msgid "HDI image"
+msgstr "HDI-image"
+
+msgid "HDX image"
+msgstr "HDX-image"
+
+msgid "Fixed-size VHD"
+msgstr "VHD met vaste grootte"
+
+msgid "Dynamic-size VHD"
+msgstr "VHD met dynamisch grootte"
+
+msgid "Differencing VHD"
+msgstr "Verschil-VHD"
+
+msgid "(N/A)"
+msgstr "(N/B)"
+
+msgid "Raw image (.img)"
+msgstr "Ruw image (.img)"
+
+msgid "HDI image (.hdi)"
+msgstr "HDI-image (.hdi)"
+
+msgid "HDX image (.hdx)"
+msgstr "HDX-image (.hdx)"
+
+msgid "Fixed-size VHD (.vhd)"
+msgstr "VHD met vaste grootte (.vhd)"
+
+msgid "Dynamic-size VHD (.vhd)"
+msgstr "VHD met dynamisch grootte (.vhd)"
+
+msgid "Differencing VHD (.vhd)"
+msgstr "Verschil-VHD (.vhd)"
+
+msgid "Large blocks (2 MB)"
+msgstr "Grote blokken (2 MB)"
+
+msgid "Small blocks (512 KB)"
+msgstr "Kleine blokken (512 KB)"
+
+msgid "VHD files"
+msgstr "VHD-bestanden"
+
+msgid "Select the parent VHD"
+msgstr "Selecteer de bovenliggende VHD"
+
+msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
+msgstr "Dit kan betekenen dat de bovenliggende image is gewijzigd nadat de verschil-image is gemaakt.\n\nDit kan ook gebeuren als de imagebestanden zijn verplaatst of gekopieerd, of door een fout in het programma waarmee deze schijf is gemaakt.\n\nWil je de tijdstempels herstellen?"
+
+msgid "Parent and child disk timestamps do not match"
+msgstr "Bovenliggende en onderliggende schijftijdstempels komen niet overeen"
+
+msgid "Could not fix VHD timestamp."
+msgstr "Kan VHD tijdstempel niet herstellen."
+
+msgid "MFM/RLL"
+msgstr "MFM/RLL"
+
+msgid "XTA"
+msgstr "XTA"
+
+msgid "ESDI"
+msgstr "ESDI"
+
+msgid "IDE"
+msgstr "IDE"
+
+msgid "ATAPI"
+msgstr "ATAPI"
+
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
+
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
+
+msgid "160 KB"
+msgstr "160 KB"
+
+msgid "180 KB"
+msgstr "180 KB"
+
+msgid "320 KB"
+msgstr "320 KB"
+
+msgid "360 KB"
+msgstr "360 KB"
+
+msgid "640 KB"
+msgstr "640 KB"
+
+msgid "720 KB"
+msgstr "720 KB"
+
+msgid "1.2 MB"
+msgstr "1,2 MB"
+
+msgid "1.25 MB"
+msgstr "1,25 MB"
+
+msgid "1.44 MB"
+msgstr "1,44 MB"
+
+msgid "DMF (cluster 1024)"
+msgstr "DMF (cluster 1024)"
+
+msgid "DMF (cluster 2048)"
+msgstr "DMF (cluster 2048)"
+
+msgid "2.88 MB"
+msgstr "2,88 MB"
+
+msgid "ZIP 100"
+msgstr "ZIP 100"
+
+msgid "3.5\" 128 MB (ISO 10090)"
+msgstr "3,5\" 128 MB (ISO 10090)"
+
+msgid "3.5\" 230 MB (ISO 13963)"
+msgstr "3,5\" 230 MB (ISO 13963)"
+
+msgid "3.5\" 540 MB (ISO 15498)"
+msgstr "3,5\" 540 MB (ISO 15498)"
+
+msgid "3.5\" 640 MB (ISO 15498)"
+msgstr "3,5\" 640 MB (ISO 15498)"
+
+msgid "3.5\" 1.3 GB (GigaMO)"
+msgstr "3,5\" 1,3 GB (GigaMO)"
+
+msgid "3.5\" 2.3 GB (GigaMO 2)"
+msgstr "3,5\" 2,3 GB (GigaMO 2)"
+
+msgid "5.25\" 600 MB"
+msgstr "5,25\" 600 MB"
+
+msgid "5.25\" 650 MB"
+msgstr "5,25\" 650 MB"
+
+msgid "5.25\" 1 GB"
+msgstr "5,25\" 1 GB"
+
+msgid "5.25\" 1.3 GB"
+msgstr "5,25\" 1,3 GB"
+
+msgid "Perfect RPM"
+msgstr "Perfecte RPM"
+
+msgid "1% below perfect RPM"
+msgstr "1% onder perfecte RPM"
+
+msgid "1.5% below perfect RPM"
+msgstr "1,5% onder perfecte RPM"
+
+msgid "2% below perfect RPM"
+msgstr "2% onder perfecte RPM"
+
+msgid "(System Default)"
+msgstr "(Systeemstandaard)"
+
+msgid "Failed to initialize network driver"
+msgstr "Netwerkstuurprogramma niet geïnitialiseerd"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "De netwerkconfiguratie wordt overgeschakeld naar de nul-driver"
+
+msgid "Mouse sensitivity:"
+msgstr "Muisgevoeligheid:"
+
+msgid "Select media images from program working directory"
+msgstr "Selecteer media-images uit de werkmap van het programma"
+
+msgid "PIT mode:"
+msgstr "PIT-modus:"
+
+msgid "Auto"
+msgstr "Auto"
+
+msgid "Slow"
+msgstr "Langzaam"
+
+msgid "Fast"
+msgstr "Snel"
+
+msgid "&Auto-pause on focus loss"
+msgstr "&Autopauze bij focusverlies"
+
+msgid "WinBox is no longer supported"
+msgstr "WinBox wordt niet langer ondersteund"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "De ontwikkeling van de WinBox manager is gestopt in 2022 door een gebrek aan beheerders. Omdat we onze inspanningen richten op het nog beter maken van 86Box, hebben we de beslissing genomen om WinBox niet langer te ondersteunen als een manager.\n\nEr zullen geen verdere updates worden geleverd door WinBox. Je kunt onjuist gedrag tegenkomen als je het blijft gebruiken met nieuwere versies van 86Box. Alle bugrapporten gerelateerd aan het gedrag van WinBox zullen worden gesloten als ongeldig.\n\nGa naar 86box.net voor een lijst van andere managers die je kunt gebruiken."
+
+msgid "Generate"
+msgstr "Genereren"
+
+msgid "Joystick configuration"
+msgstr "Joystick configuratie "
+
+msgid "Device"
+msgstr "Apparaat"
+
+msgid "%1 (X axis)"
+msgstr "%1 (X-as)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (Y-as)"
+
+msgid "MCA devices"
+msgstr "MCA-apparaten"
+
+msgid "List of MCA devices:"
+msgstr "Lijst van MCA-apparaten:"
+
+msgid "&Tablet tool"
+msgstr "Tablet-hulpmiddel"
+
+msgid "About &Qt"
+msgstr "Over &Qt"
+
+msgid "&MCA devices..."
+msgstr "MCA-apparaten..."
+
+msgid "Show non-&primary monitors"
+msgstr "Toon niet-primaire monitors"
+
+msgid "Open screenshots &folder..."
+msgstr "Map met schermafbeeldingen openen..."
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Schakel de volledig scherm-uitrekmodus in bij maximaliseren"
+
+msgid "&Cursor/Puck"
+msgstr "&Cursor/Puck"
+
+msgid "&Pen"
+msgstr "&Pen"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "&Host cd/dvd-station (%1:)"
+
+msgid "&Connected"
+msgstr "&Verbonden"
+
+msgid "Clear image &history"
+msgstr "Imagegeschiedenis verwijderen(&H)"
+
+msgid "Create..."
+msgstr "Creëer..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "Host CD/DVD-station (%1)"
+
+msgid "Unknown Bus"
+msgstr "Onbekende bus"
+
+msgid "Null Driver"
+msgstr "Null Driver"
+
+msgid "NIC:"
+msgstr "NIC:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "NIC %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&NIC %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "Rendergedrag"
+
+msgid "Use target framerate:"
+msgstr "Gebruik doelframerate:"
+
+msgid " fps"
+msgstr " fps"
+
+msgid "VSync"
+msgstr "VSync"
+
+msgid "Synchronize with video"
+msgstr "Synchroniseren met video"
+
+msgid "Shaders"
+msgstr "Shaders"
+
+msgid "Remove"
+msgstr "Verwijderen"
+
+msgid "Browse..."
+msgstr "Bladeren..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "Kan OpenGL context niet aanmaken."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "Kan niet overschakelen naar OpenGL context."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "OpenGL versie 3.0 of hoger is vereist. De huidige versie is %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "Fout bij het initialiseren van OpenGL"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nTerugvallen op software rendering."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>Bij het selecteren van media-images (CD-ROM, floppy, etc.) zal de \"open dialoog\" starten in dezelfde map als het 86Box configuratiebestand. Deze instelling is doet er waarschijnlijk alleen toe op macOS.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "Deze machine is misschien verplaatst of gekopieerd."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "Om een goede netwerkfunctionaliteit te garanderen, moet 86Box weten of deze machine verplaatst of gekopieerd is.\n\nSelecteer \"Ik heb het gekopieerd\" als u het niet zeker weet."
+
+msgid "I Moved It"
+msgstr "Ik heb het verplaatst"
+
+msgid "I Copied It"
+msgstr "Ik heb het gekopieerd"
+
+msgid "86Box Monitor #"
+msgstr "86Box Monitor #"
+
+msgid "No MCA devices."
+msgstr "Geen MCA-apparaten."
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "Netwerkkaart #1"
+
+msgid "Network Card #2"
+msgstr "Netwerkkaart #2"
+
+msgid "Network Card #3"
+msgstr "Netwerkkaart #3"
+
+msgid "Network Card #4"
+msgstr "Netwerkkaart #4"
+
+msgid "Mode:"
+msgstr "Modus:"
+
+msgid "Interface:"
+msgstr "Interface:"
+
+msgid "Adapter:"
+msgstr "Adapter:"
+
+msgid "VDE Socket:"
+msgstr "VDE-socket:"
+
+msgid "86Box Unit Tester"
+msgstr "86Box apparaattester"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Novell NetWare 2.x Key Card"
+
+msgid "Serial port passthrough 1"
+msgstr "Seriële poort doorvoer 1"
+
+msgid "Serial port passthrough 2"
+msgstr "Seriële poort doorvoer 2"
+
+msgid "Serial port passthrough 3"
+msgstr "Seriële poort doorvoer 3"
+
+msgid "Serial port passthrough 4"
+msgstr "Seriële poort doorvoer 4"
+
+msgid "Renderer &options..."
+msgstr "Renderer-opties..."
+
+msgid "PC/XT Keyboard"
+msgstr "PC/XT Toetsenbord"
+
+msgid "AT Keyboard"
+msgstr "AT Toetsenbord"
+
+msgid "AX Keyboard"
+msgstr "AX Toetsenbord"
+
+msgid "PS/2 Keyboard"
+msgstr "PS/2 Toetsenbord"
+
+msgid "PS/55 Keyboard"
+msgstr "PS/55Toetsenbord"
+
+msgid "Keys"
+msgstr "Toetsen"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Logitech/Microsoft busmuis"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Microsoft busmuis (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Mouse Systems seriële muis"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Mouse Systems busmuis"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Microsoft Seriële muis"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Microsoft seriële balmuis"
+
+msgid "Logitech Serial Mouse"
+msgstr "Logitech seriële muis"
+
+msgid "PS/2 Mouse"
+msgstr "PS/2-muis"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "PS/2 QuickPort muis"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (serieel)"
+
+msgid "Default Baud rate"
+msgstr "Standaard baudrate"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "COM] Standaard Hayes-compatibele modem "
+
+msgid "Roland MT-32 Emulation"
+msgstr "Roland MT-32-emulatie"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Roland MT-32 (nieuwe) emulatie"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Roland CM-32L-emulatie"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Roland CM-32LN-emulatie"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "OPL4-ML-dochterbord"
+
+msgid "System MIDI"
+msgstr "Systeem MIDI"
+
+msgid "MIDI Input Device"
+msgstr "MIDI-ingangsapparaat"
+
+msgid "BIOS file"
+msgstr "BIOS-bestand"
+
+msgid "BIOS file (ROM #1)"
+msgstr "BIOS-bestand (ROM #1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "BIOS-bestand (ROM #2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "BIOS-bestand (ROM #3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "BIOS-bestand (ROM #4)"
+
+msgid "BIOS address"
+msgstr "BIOS-adres"
+
+msgid "BIOS address (ROM #1)"
+msgstr "BIOS-adres (ROM #1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "BIOS-adres (ROM #2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "BIOS-adres (ROM #3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "BIOS-adres (ROM #4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "BIOS-extensie ROM Writes inschakelen"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "BIOS-extensie ROM Writes inschakelen (ROM #1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "BIOS-extensie ROM Writes inschakelen (ROM #2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "BIOS-extensie ROM Writes inschakelen (ROM #3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "BIOS-extensie ROM Writes inschakelen (ROM #4)"
+
+msgid "Linear framebuffer base"
+msgstr "Lineaire framebuffer-basis"
+
+msgid "Address"
+msgstr "Adres"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "Seriële poort IRQ"
+
+msgid "Parallel port IRQ"
+msgstr "Parallelle poort IRQ"
+
+msgid "BIOS Revision"
+msgstr "BIOS Revisie"
+
+msgid "BIOS Version"
+msgstr "BIOS-versie"
+
+msgid "BIOS Language"
+msgstr "BIOS-taal"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "IBM 5161 Uitbreidingseenheid"
+
+msgid "IBM Cassette Basic"
+msgstr "IBM Cassette Basic"
+
+msgid "Translate 26 -> 17"
+msgstr "Vertaal 26 -> 17"
+
+msgid "Language"
+msgstr "Taal"
+
+msgid "Enable backlight"
+msgstr "Backlight inschakelen"
+
+msgid "Invert colors"
+msgstr "Kleuren inverteren"
+
+msgid "BIOS size"
+msgstr "BIOS-grootte"
+
+msgid "BIOS size (ROM #1)"
+msgstr "BIOS-grootte (ROM #1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "BIOS-grootte (ROM #1)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "BIOS-grootte (ROM #3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "BIOS-grootte (ROM #4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "Geheugenadres C0000-C7FFF toewijzen aan UMB"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "Geheugenadres C8000-CFFFF toewijzen aan UMB"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "Geheugenadres D0000-D7FFF toewijzen aan UMB"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "Geheugenadres D8000-DFFFF toewijzen aan UMB"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "Geheugenadres E0000-E7FFF toewijzen aan UMB"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "Geheugenadres E8000-EFFFF toewijzen aan UMB"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "JS9 Jumper (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "MIDI-uitgangsapparaat"
+
+msgid "MIDI Real time"
+msgstr "MIDI real-time"
+
+msgid "MIDI Thru"
+msgstr "MIDI doorvoer"
+
+msgid "MIDI Clockout"
+msgstr "MIDI Clockout"
+
+msgid "SoundFont"
+msgstr "SoundFont"
+
+msgid "Output Gain"
+msgstr "Output Gain"
+
+msgid "Chorus"
+msgstr "Chorus"
+
+msgid "Chorus Voices"
+msgstr "Chorus-stemmen"
+
+msgid "Chorus Level"
+msgstr "Chorus-niveau"
+
+msgid "Chorus Speed"
+msgstr "Chorus-snelheid"
+
+msgid "Chorus Depth"
+msgstr "Chorus-diepte"
+
+msgid "Chorus Waveform"
+msgstr "Chorus-golfvorm"
+
+msgid "Reverb"
+msgstr "Reverb"
+
+msgid "Reverb Room Size"
+msgstr "Reverbkamer afmetingen"
+
+msgid "Reverb Damping"
+msgstr "Reverbdemping"
+
+msgid "Reverb Width"
+msgstr "Reverbbreedte"
+
+msgid "Reverb Level"
+msgstr "Reverbniveau"
+
+msgid "Interpolation Method"
+msgstr "Interpolatiemethode"
+
+msgid "Dynamic Sample Loading"
+msgstr "Dynamische sample-lading"
+
+msgid "Reverb Output Gain"
+msgstr "Reverbuitgang Versterking"
+
+msgid "Reversed stereo"
+msgstr "Omgekeerde stereo"
+
+msgid "Nice ramp"
+msgstr "Mooie helling"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "Knoppen"
+
+msgid "Serial Port"
+msgstr "Seriële poort"
+
+msgid "RTS toggle"
+msgstr "RTS toggle"
+
+msgid "Revision"
+msgstr "Revisie"
+
+msgid "Controller"
+msgstr "Controller"
+
+msgid "Show Crosshair"
+msgstr "Toon dradenkruis"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "MAC-adres"
+
+msgid "MAC Address OUI"
+msgstr "MAC-adres OUI"
+
+msgid "Enable BIOS"
+msgstr "BIOS inschakelen"
+
+msgid "Baud Rate"
+msgstr "Baud-snelheid"
+
+msgid "TCP/IP listening port"
+msgstr "TCP/IP-luisterpoort"
+
+msgid "Phonebook File"
+msgstr "Telefoonboekbestand"
+
+msgid "Telnet emulation"
+msgstr "Telnet-emulatie"
+
+msgid "RAM Address"
+msgstr "RAM-adres"
+
+msgid "RAM size"
+msgstr "RAM-grootte"
+
+msgid "Initial RAM size"
+msgstr "Oorspronkelijke RAM-grootte"
+
+msgid "Serial Number"
+msgstr "Serienummer"
+
+msgid "Host ID"
+msgstr "Host-ID"
+
+msgid "FDC Address"
+msgstr "FDC Adres"
+
+msgid "MPU-401 Address"
+msgstr "MPU-401 Adres"
+
+msgid "MPU-401 IRQ"
+msgstr "MPU-401 IRQ"
+
+msgid "Receive MIDI input"
+msgstr "MIDI-ingang ontvangen"
+
+msgid "Low DMA"
+msgstr "Lage DMA"
+
+msgid "Enable Game port"
+msgstr "Game-poort inschakelen"
+
+msgid "SID Model"
+msgstr "SID-model"
+
+msgid "SID Filter Strength"
+msgstr "SID-filtersterkte"
+
+msgid "Surround module"
+msgstr "Surroundmodule"
+
+msgid "CODEC"
+msgstr "Codec"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "Verhoog CODEC interrupt bij CODEC setup (nodig voor sommige stuurprogramma's)"
+
+msgid "SB Address"
+msgstr "SB-adres"
+
+msgid "Adlib Address"
+msgstr "Adlib-adres"
+
+msgid "Use EEPROM setting"
+msgstr "Gebruik EEPROM-instelling"
+
+msgid "WSS IRQ"
+msgstr "WSS IRQ"
+
+msgid "WSS DMA"
+msgstr "WSS DMA"
+
+msgid "Enable OPL"
+msgstr "OPL inschakelen"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "MIDI-ingang ontvangen (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "SB lage DMA"
+
+msgid "6CH variant (6-channel)"
+msgstr "6CH-variant (6-kanaals)"
+
+msgid "Enable CMS"
+msgstr "CMS inschakelen"
+
+msgid "Mixer"
+msgstr "Mixer"
+
+msgid "High DMA"
+msgstr "Hoge DMA"
+
+msgid "Control PC speaker"
+msgstr "Bestuur pc-luidspreker"
+
+msgid "Memory size"
+msgstr "Geheugengrootte"
+
+msgid "EMU8000 Address"
+msgstr "EMU8000 Adres"
+
+msgid "IDE Controller"
+msgstr "IDE-controller"
+
+msgid "Codec"
+msgstr "Codec"
+
+msgid "GUS type"
+msgstr "GUS-type"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "Schakel het commando 0x04 \"Exit 86Box\" in"
+
+msgid "Display type"
+msgstr "Scherm type"
+
+msgid "Composite type"
+msgstr "Composite type"
+
+msgid "RGB type"
+msgstr "RGB-type"
+
+msgid "Line doubling type"
+msgstr "Type lijnverdubbeling"
+
+msgid "Snow emulation"
+msgstr "Sneeuwemulatie"
+
+msgid "Monitor type"
+msgstr "Type monitor"
+
+msgid "Character set"
+msgstr "Tekenset"
+
+msgid "XGA type"
+msgstr "XGA-type"
+
+msgid "Instance"
+msgstr "Instantie"
+
+msgid "MMIO Address"
+msgstr "MMIO-adres"
+
+msgid "RAMDAC type"
+msgstr "RAMDAC type"
+
+msgid "Blend"
+msgstr "Mengen"
+
+msgid "Font"
+msgstr "Lettertype"
+
+msgid "Bilinear filtering"
+msgstr "Bilineaire filtering"
+
+msgid "Video chroma-keying"
+msgstr "Video chroma-keying"
+
+msgid "Dithering"
+msgstr "Dithering"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "NMI inschakelen voor CGA-emulatie"
+
+msgid "Voodoo type"
+msgstr "Voodoo-type"
+
+msgid "Framebuffer memory size"
+msgstr "Framebuffer geheugengrootte"
+
+msgid "Texture memory size"
+msgstr "Grootte textuurgeheugen"
+
+msgid "Dither subtraction"
+msgstr "Dither aftrekken"
+
+msgid "Screen Filter"
+msgstr "Schermfilter"
+
+msgid "Render threads"
+msgstr "Render threads"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Startadres"
+
+msgid "Contiguous Size"
+msgstr "Aaneengesloten grootte"
+
+msgid "I/O Width"
+msgstr "I/O-breedte"
+
+msgid "Transfer Speed"
+msgstr "Overdrachtssnelheid"
+
+msgid "EMS mode"
+msgstr "EMS-modus"
+
+msgid "EMS Address"
+msgstr "EMS-adres"
+
+msgid "EMS 1 Address"
+msgstr "EMS 1 adres"
+
+msgid "EMS 2 Address"
+msgstr "EMS 2 adres"
+
+msgid "EMS Memory Size"
+msgstr "EMS-geheugengrootte"
+
+msgid "EMS 1 Memory Size"
+msgstr "EMS 1 geheugengrootte"
+
+msgid "EMS 2 Memory Size"
+msgstr "EMS 3 geheugengrootte"
+
+msgid "Enable EMS"
+msgstr "Schakel EMS in"
+
+msgid "Enable EMS 1"
+msgstr "Schakel EMS 1 in"
+
+msgid "Enable EMS 2"
+msgstr "Schakel EMS 2 in"
+
+msgid "Address for > 2 MB"
+msgstr "Adres voor > 2 MB"
+
+msgid "Frame Address"
+msgstr "Frameadres"
+
+msgid "USA"
+msgstr "USA"
+
+msgid "Danish"
+msgstr "Deens"
+
+msgid "Always at selected speed"
+msgstr "Altijd op geselecteerde snelheid"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "BIOS-instelling + Sneltoetsen (niet actief tijdens POST)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 KB vanaf F0000"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 KB vanaf E0000 (geïnverteerd MSB adres, laatste 64 KB eerst)"
+
+msgid "Sine"
+msgstr "Sinus"
+
+msgid "Triangle"
+msgstr "Driehoek"
+
+msgid "Linear"
+msgstr "Lineair"
+
+msgid "4th Order"
+msgstr "4e Orde"
+
+msgid "7th Order"
+msgstr "7e Orde"
+
+msgid "Non-timed (original)"
+msgstr "Niet-getimed (origineel)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (JMP2 niet gezet)"
+
+msgid "Two"
+msgstr "Twee"
+
+msgid "Three"
+msgstr "Drie"
+
+msgid "Wheel"
+msgstr "Wiel"
+
+msgid "Five + Wheel"
+msgstr "Vijf + Wiel"
+
+msgid "Five + 2 Wheels"
+msgstr "Vijf + 2 Wielen"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 Serieel / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) Serieel"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "BIOS uitschakelen"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2 MB"
+
+msgid "8 MB"
+msgstr "8 MB"
+
+msgid "28 MB"
+msgstr "28 MB"
+
+msgid "1 MB"
+msgstr "1 MB"
+
+msgid "4 MB"
+msgstr "4 MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16 MB"
+
+msgid "20 MB"
+msgstr "20 MB"
+
+msgid "24 MB"
+msgstr "24 MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (stereo)"
+
+msgid "Classic"
+msgstr "Klassiek"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "Composite"
+
+msgid "True color"
+msgstr "Echte kleur"
+
+msgid "Old"
+msgstr "Oud"
+
+msgid "New"
+msgstr "Nieuw"
+
+msgid "Color (generic)"
+msgstr "Kleur (algemeen)"
+
+msgid "Green Monochrome"
+msgstr "Groen monochroom"
+
+msgid "Amber Monochrome"
+msgstr "Amber Monochroom"
+
+msgid "Gray Monochrome"
+msgstr "Grijs monochroom"
+
+msgid "Color (no brown)"
+msgstr "Kleur (geen bruin)"
+
+msgid "Color (IBM 5153)"
+msgstr "Kleur (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Eenvoudige verdubbeling"
+
+msgid "sRGB interpolation"
+msgstr "sRGB-interpolatie"
+
+msgid "Linear interpolation"
+msgstr "Lineaire interpolatie"
+
+msgid "Has secondary 8x8 character set"
+msgstr "Heeft secundaire 8x8 karakterset"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Heeft Quadcolor II dochterkaart"
+
+msgid "Alternate monochrome contrast"
+msgstr "Alternatief monochroom contrast"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Monochroom (5151/MDA) (wit)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Monochroom (5151/MDA) (groen)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Monochroom (5151/MDA) (amber)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Kleur 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Kleur 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Verbeterde kleur - normale modus (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Verbeterde kleur - Verbeterde modus (5154/ECD)"
+
+msgid "Green"
+msgstr "Groen"
+
+msgid "Amber"
+msgstr "Amber"
+
+msgid "Gray"
+msgstr "Grijs"
+
+msgid "Grayscale"
+msgstr "Grijstinten"
+
+msgid "Color"
+msgstr "Kleur"
+
+msgid "U.S. English"
+msgstr "Amerikaans Engels"
+
+msgid "Scandinavian"
+msgstr "Scandinavisch"
+
+msgid "Other languages"
+msgstr "Andere talen"
+
+msgid "Bochs latest"
+msgstr "Bochs nieuwste"
+
+msgid "Apply overscan deltas"
+msgstr "Overscan-delta’s toepassen"
+
+msgid "Mono Interlaced"
+msgstr "Mono geïnterlaced "
+
+msgid "Mono Non-Interlaced"
+msgstr "Mono niet geïnterlaced"
+
+msgid "Color Interlaced"
+msgstr "Kleur interlaced"
+
+msgid "Color Non-Interlaced"
+msgstr "Kleur niet geïnterlaced"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "3Dfx Voodoo Graphics"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 TMU's)"
+
+msgid "8-bit"
+msgstr "8-bit"
+
+msgid "16-bit"
+msgstr "16-bit"
+
+msgid "Standard (150ns)"
+msgstr "Standaard (150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "Hoge snelheid (120ns)"
+
+msgid "Enabled"
+msgstr "Ingeschakeld"
+
+msgid "Standard"
+msgstr "Standaard"
+
+msgid "High-Speed"
+msgstr "Hoge snelheid"
+
+msgid "Stereo LPT DAC"
+msgstr "Stereo LPT DAC"
+
+msgid "Generic Text Printer"
+msgstr "Generieke tekstprinter"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Generieke ESC/P 2 dot-matrix-printer"
+
+msgid "Generic PostScript Printer"
+msgstr "Generieke PostScript-printer"
+
+msgid "Generic PCL5e Printer"
+msgstr "Generieke PCL5e-printer"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Internetprotocol voor parallelle lijnen"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Beschermingsdongle voor Savage Quest"
+
+msgid "Serial Passthrough Device"
+msgstr "Serieel doorvoerapparaat"
+
+msgid "Passthrough Mode"
+msgstr "Doorgeefmodus"
+
+msgid "Host Serial Device"
+msgstr "Host Serieel Apparaat"
+
+msgid "Name of pipe"
+msgstr "Naam van de pipe"
+
+msgid "Data bits"
+msgstr "Databits"
+
+msgid "Stop bits"
+msgstr "Stopbits"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Baud-snelheid van doorvoer"
+
+msgid "Named Pipe (Server)"
+msgstr "Named Pipe (Server)"
+
+msgid "Named Pipe (Client)"
+msgstr "Named Pipe (Client)"
+
+msgid "Host Serial Passthrough"
+msgstr "Host seriële doorgave"
+
+msgid "E&ject %1"
+msgstr "&Uitwerpen %1"
+
+msgid "&Unmute"
+msgstr "&Geluid aanzetten"
+
+msgid "Softfloat FPU"
+msgstr "Softfloat FPU"
+
+msgid "High performance impact"
+msgstr "Hoge prestatie-impact"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Generiek] RAM-schijf (max. snelheid)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Generiek] 1989 (3500 RPM)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Generiek] 1992 (3600 RPM)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Generiek] 1994 (4500 RPM)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Generiek] 1996 (5400 RPM)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Generiek] 1997 (5400 RPM)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Generiek] 1998 (5400 RPM)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Generiek] 2000 (7200 RPM)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "IBM 8514/A-kloon (ISA)"
+
+msgid "Vendor"
+msgstr "Leverancier"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Generieke PC/XT geheugenuitbreiding"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Generieke PC/AT geheugenuitbreiding"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "Dot-matrix-lettertypen niet gevonden"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "TrueType lettertypen in de map \"roms/printer/fonts\" zijn nodig voor de emulatie van de generieke ESC/P 2 dot-matrix-printer."
+
+msgid "Inhibit multimedia keys"
+msgstr "Multimedia-toetsen blokkeren"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Vraag om bevestiging voor het opslaan van instellingen"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Vraag om bevestiging voor een harde reset"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Vraag om bevestiging voor afsluiten"
+
+msgid "Options"
+msgstr "Opties"
+
+msgid "Model"
+msgstr "Model"
+
+msgid "Model:"
+msgstr "Model:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Initialisatie van de Vulkan-renderer is mislukt."
+
+msgid "GLSL Error"
+msgstr "GLSL-fout"
+
+msgid "Could not load shader: %1"
+msgstr "Kon de shader niet laden: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "OpenGL versie 3.0 of hoger is vereist. Huidige GLSL-versie is %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "Kon de textuur niet laden: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "Kon de shader niet compileren:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "Programma niet gelinkt:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "Shaderbeheer"
+
+msgid "Shader Configuration"
+msgstr "Shaderconfiguratie"
+
+msgid "Add"
+msgstr "Toevoegen"
+
+msgid "Move up"
+msgstr "Omhoog verplaatsen"
+
+msgid "Move down"
+msgstr "Omlaag verplaatsen"
+
+msgid "Could not load file %1"
+msgstr "Kon bestand %1 niet laden"
+
+msgid "Key Bindings:"
+msgstr "Toetskoppelingen"
+
+msgid "Action"
+msgstr "Actie"
+
+msgid "Keybind"
+msgstr "Toetskoppeling"
+
+msgid "Clear binding"
+msgstr "Wis koppelinh"
+
+msgid "Bind"
+msgstr "Koppel"
+
+msgid "Bind Key"
+msgstr "Koppel toets"
+
+msgid "Enter key combo:"
+msgstr "Geef toetsencombinatie in:"
+
+msgid "Bind conflict"
+msgstr "Koppelconflict"
+
+msgid "This key combo is already in use."
+msgstr "Deze toetsencombinatie is al in gebruik"
+
+msgid "Send Control+Alt+Del"
+msgstr "Stuur Control+Alt+Del"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Stuur Control+Alt+Escape"
+
+msgid "Toggle fullscreen"
+msgstr "Volledig scherm omschakelen"
+
+msgid "Screenshot"
+msgstr "Schermafbeelding"
+
+msgid "Release mouse pointer"
+msgstr "Geef muis vrij"
+
+msgid "Toggle pause"
+msgstr "Pause omschakelen"
+
+msgid "Toggle mute"
+msgstr "Geluiddemping omschakelen"
+
+msgid "Text files"
+msgstr "Tekstbestanden"
+
+msgid "ROM files"
+msgstr "ROM-bestanden"
+
+msgid "SoundFont files"
+msgstr "SoundFont-bestanden"
+
+msgid "Local Switch"
+msgstr "Lokale Switch"
+
+msgid "Remote Switch"
+msgstr "Externe Switch"
+
+msgid "Switch:"
+msgstr "Switch"
+
+msgid "Hub Mode"
+msgstr "Hub-modus"
+
+msgid "Hostname:"
+msgstr "Hostname"
+
+msgid "ISA RAM:"
+msgstr "ISA RAM:"
+
+msgid "ISA ROM:"
+msgstr "ISA ROM:"
+
+msgid "&Wipe NVRAM"
+msgstr "NVRAM &wissen"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "Dit verwijdert alle NVRAM-bestanden (en gerelateerde bestanden) van de virtuele machine die zich in de submap \"nvr\" bevinden. Je zult de BIOS-instellingen (en mogelijk ook andere apparaten in de VM) opnieuw moeten configureren indien van toepassing.\n\nWeet je zeker dat je alle NVRAM-gegevens van de virtuele machine \"%1\" wilt wissen?"
+
+msgid "Success"
+msgstr "Succes"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "Wissen van NVRAM-inhoud van de virtuele machine \"%1\" geslaagd"
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "Fout bij Wissen van NVRAM-inhoud van de virtuele machine \"%1\""
+
+msgid "%1 VM Manager"
+msgstr "%1 VM Manager"
+
+msgid "%n disk(s)"
+msgstr "%n schijf(en)"
+
+msgid "Unknown Status"
+msgstr "Onbekende Status"
+
+msgid "No Machines Found!"
+msgstr "Geen Machines Gevonden!"
+
+msgid "Check for updates on startup"
+msgstr "Controleer op updates bij start"
+
+msgid "Unable to determine release information"
+msgstr "Kan release-informatie niet bepalen"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Er is een fout opgetreden bij het controleren op updates:\n\n%1\n\nProbeer later opnieuw."
+
+msgid "Update check complete"
+msgstr "Controleren op updates voltooid"
+
+msgid "stable"
+msgstr "stabiel"
+
+msgid "beta"
+msgstr "beta"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Je gebruikt de nieuwste %1-versie van 86Box: %2"
+
+msgid "version"
+msgstr "versie"
+
+msgid "build"
+msgstr "build"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Je gebruikt versie <b>%1</b>."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "<b>Versie %1</b> is nu beschikbaar."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Je gebruikt build <b>%1</b>."
+
+msgid "<b>Build %1</b> is now available."
+msgstr "<b>Build %1</b> is nu beschikbaar."
+
+msgid "Would you like to visit the download page?"
+msgstr "Wil je de downloadpagina bezoeken?"
+
+msgid "Visit download page"
+msgstr "Bezoek downloadpagina"
+
+msgid "Update check"
+msgstr "Updatecontrole"
+
+msgid "Checking for updates..."
+msgstr "Controleren op updates..."
+
+msgid "86Box Update"
+msgstr "86Box Update"
+
+msgid "Release notes:"
+msgstr "Release-opmerkingen:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "Crash van virtuele machine"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "Het proces van de virtuele machine \"%1\" is onverwacht beëindigd met exitcode %2."
+
+msgid "The system will not be added."
+msgstr "Het systeem wordt niet toegevoegd."
+
+msgid "&Update mouse every CPU frame"
+msgstr "&Muis bijwerken bij elk CPU-frame"
+
+msgid "Hue"
+msgstr "Kleurtoon"
+
+msgid "Saturation"
+msgstr "Verzadiging"
+
+msgid "Contrast"
+msgstr "Contrast"
+
+msgid "Brightness"
+msgstr "Helderheid"
+
+msgid "Sharpness"
+msgstr "Scherpte"
+
+msgid "&CGA composite settings..."
+msgstr "Instellingen van de &CGA-compositemodus..."
+
+msgid "CGA composite settings"
+msgstr "Instellingen van de CGA-compositemodus"
+
+msgid "Monitor EDID"
+msgstr "EDID-monitor"
+
+msgid "Export..."
+msgstr "Exporteren..."
+
+msgid "Export EDID"
+msgstr "EDID exporteren"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "Het EDID-bestand \"%ls\" is te groot."
+
+msgid "OpenGL input scale"
+msgstr "Invoerschaal van OpenGL"
+
+msgid "OpenGL input stretch mode"
+msgstr "Input stretch-modus van OpenGL"
+
+msgid "Color scheme"
+msgstr "Kleurenschema"
+
+msgid "Light"
+msgstr "Licht"
+
+msgid "Dark"
+msgstr "Donker"
diff --git a/src/qt/languages/pl-PL.po b/src/qt/languages/pl-PL.po
index a449d8951..2a0cde697 100644
--- a/src/qt/languages/pl-PL.po
+++ b/src/qt/languages/pl-PL.po
@@ -1,17 +1,25 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: pl_PL\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
 msgstr "&Akcje"
 
 msgid "&Keyboard requires capture"
-msgstr "&Klawaitura wymaga przechwytu myszy"
+msgstr "&Klawiatura wymaga przechwytu myszy"
 
 msgid "&Right CTRL is left ALT"
-msgstr "&Prawy CTRL to lewy Alt"
+msgstr "Prawy C&TRL to lewy ALT"
 
 msgid "&Hard Reset..."
-msgstr "&Twardy reset..."
+msgstr "Twardy &reset..."
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Ctrl+Alt+Del\tCtrl+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "&Ctrl+Alt+Del"
 
 msgid "Ctrl+Alt+&Esc"
 msgstr "Ctrl+Alt+&Esc"
@@ -19,8 +27,14 @@ msgstr "Ctrl+Alt+&Esc"
 msgid "&Pause"
 msgstr "&Pauza"
 
-msgid "E&xit..."
-msgstr "W&yjdź..."
+msgid "Pause"
+msgstr "Pauza"
+
+msgid "Re&sume"
+msgstr "&Wznów"
+
+msgid "E&xit"
+msgstr "W&yjście"
 
 msgid "&View"
 msgstr "&Widok"
@@ -35,19 +49,13 @@ msgid "&Resizeable window"
 msgstr "&Okno o zmiennym rozmiarze"
 
 msgid "R&emember size && position"
-msgstr "P&amiętaj rozmiar &i pozycję"
+msgstr "P&amiętaj rozmiar i pozycję"
 
 msgid "Re&nderer"
 msgstr "Re&nderer"
 
-msgid "&SDL (Software)"
-msgstr "&SDL (Software)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (&Hardware)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
+msgid "&Qt (Software)"
+msgstr "&Qt (programowy)"
 
 msgid "Open&GL (3.0 Core)"
 msgstr "Open&GL (3.0 Core)"
@@ -55,14 +63,14 @@ msgstr "Open&GL (3.0 Core)"
 msgid "&VNC"
 msgstr "&VNC"
 
-msgid "Specify dimensions..."
-msgstr "Określ rozmiary..."
+msgid "Specify &dimensions..."
+msgstr "Określ wymiary..."
 
-msgid "F&orce 4:3 display ratio"
-msgstr "&Wymuś proporcje wyświetlania 4:3"
+msgid "Force &4:3 display ratio"
+msgstr "Wymuś proporcje wyświetlania &4:3"
 
 msgid "&Window scale factor"
-msgstr "&Czynnik skalowania okna"
+msgstr "Współ&czynnik skalowania okna"
 
 msgid "&0.5x"
 msgstr "&0.5x"
@@ -94,26 +102,26 @@ msgstr "&7x"
 msgid "&8x"
 msgstr "&8x"
 
-msgid "Filter method"
+msgid "Fi&lter method"
 msgstr "Metoda filtrowania"
 
 msgid "&Nearest"
-msgstr "&Nearest"
+msgstr "&Najbliższa"
 
 msgid "&Linear"
-msgstr "&Linear"
+msgstr "&Liniowa"
 
 msgid "Hi&DPI scaling"
 msgstr "Skalowanie Hi&DPI"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "&Pełny ekran\tCtrl+Alt+PgUp"
+msgid "&Fullscreen"
+msgstr "&Pełny ekran"
 
 msgid "Fullscreen &stretch mode"
-msgstr "Fullscreen &stretch mode"
+msgstr "Tryb rozciągania na pełnym ekranie"
 
 msgid "&Full screen stretch"
-msgstr "&Tryb rozciągania na pełnym ekranie"
+msgstr "&Rozciągnij na pełny ekran"
 
 msgid "&4:3"
 msgstr "&4:3"
@@ -127,8 +135,8 @@ msgstr "&Skalowanie całkowite"
 msgid "4:&3 Integer scale"
 msgstr "Skalowanie całkowite 4:&3"
 
-msgid "E&GA/(S)VGA settings"
-msgstr "Ustawienia E&GA/(S)VGA"
+msgid "EGA/(S)&VGA settings"
+msgstr "Ustawienia EGA/(S)&VGA"
 
 msgid "&Inverted VGA monitor"
 msgstr "&Odwrócony monitor VGA"
@@ -139,8 +147,14 @@ msgstr "Rodzaj ekranu &VGA"
 msgid "RGB &Color"
 msgstr "RGB - &Kolorowy"
 
+msgid "RGB (no brown)"
+msgstr "RGB (bez brązowego)"
+
 msgid "&RGB Grayscale"
-msgstr "&RGB - Skala szarości"
+msgstr "&RGB - Skala odcieni szarości"
+
+msgid "Generic RGBI color monitor"
+msgstr "Generyczny kolorowy monitor RGBI"
 
 msgid "&Amber monitor"
 msgstr "&Bursztynowy monitor"
@@ -152,7 +166,7 @@ msgid "&White monitor"
 msgstr "&Biały monitor"
 
 msgid "Grayscale &conversion type"
-msgstr "Typ konwersji &w skali szarości"
+msgstr "Typ konwersji &w skali odcieni szarości"
 
 msgid "BT&601 (NTSC/PAL)"
 msgstr "BT&601 (NTSC/PAL)"
@@ -161,16 +175,16 @@ msgid "BT&709 (HDTV)"
 msgstr "BT&709 (HDTV)"
 
 msgid "&Average"
-msgstr "&Średni"
+msgstr "&Średnia"
 
 msgid "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
 msgstr "Overscan dla CGA/PCjr/Tandy/E&GA/(S)VGA"
 
 msgid "Change contrast for &monochrome display"
-msgstr "Zmień kontrast dla &monochromatycznego ekranu"
+msgstr "Zmień kontrast dla ekranu &monochromatycznego"
 
 msgid "&Media"
-msgstr "&Nośnik"
+msgstr "N&ośnik"
 
 msgid "&Tools"
 msgstr "&Narzędzia"
@@ -178,35 +192,41 @@ msgstr "&Narzędzia"
 msgid "&Settings..."
 msgstr "&Ustawienia..."
 
+msgid "Settings..."
+msgstr "Ustawienia..."
+
 msgid "&Update status bar icons"
 msgstr "&Aktualizuj ikony na pasku statusu"
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "Zrób &zrzut ekranu\tCtrl+F11"
+msgid "Take s&creenshot"
+msgstr "Zrób &zrzut ekranu"
+
+msgid "S&ound"
+msgstr "Dź&więk"
 
 msgid "&Preferences..."
 msgstr "&Preferencje..."
 
 msgid "Enable &Discord integration"
-msgstr "Włącz integrację z &Discord"
+msgstr "Włącz integrację z &Discordem"
 
 msgid "Sound &gain..."
 msgstr "Wzmocnienie &dźwięku..."
 
-msgid "Begin trace\tCtrl+T"
-msgstr "Rozpocznij śledzenie\tCtrl+T"
+msgid "Begin trace"
+msgstr "Rozpocznij śledzenie"
 
-msgid "End trace\tCtrl+T"
-msgstr "Zakończ śledzenie\tCtrl+T"
+msgid "End trace"
+msgstr "Zakończ śledzenie"
 
 msgid "&Help"
-msgstr "&Pomoc"
+msgstr "Pomo&c"
 
 msgid "&Documentation..."
 msgstr "&Dokumentacja..."
 
 msgid "&About 86Box..."
-msgstr "&O 86Box..."
+msgstr "&O 86Boxie..."
 
 msgid "&New image..."
 msgstr "&Nowy obraz..."
@@ -239,22 +259,22 @@ msgid "E&xport to 86F..."
 msgstr "E&ksportuj do 86F..."
 
 msgid "&Mute"
-msgstr "&Ścisz"
+msgstr "&Wycisz"
 
 msgid "E&mpty"
 msgstr "P&usty"
 
-msgid "&Reload previous image"
-msgstr "&Przeładuj poprzedni obraz"
+msgid "Reload previous image"
+msgstr "Przeładuj poprzedni obraz"
 
 msgid "&Folder..."
-msgstr "&Teczka..."
+msgstr "&Folder..."
 
 msgid "Target &framerate"
 msgstr "Docelowa &liczba klatek na sekundę"
 
 msgid "&Sync with video"
-msgstr "&Zsynchronizuj z wideo"
+msgstr "&Zsynchronizuj z obrazem"
 
 msgid "&25 fps"
 msgstr "&25 fps"
@@ -301,18 +321,12 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Anuluj"
 
-msgid "Save these settings as &global defaults"
-msgstr "Zapisz ustawienia jako &globalne ustawienia domyślne"
-
 msgid "&Default"
 msgstr "&Domyślny"
 
 msgid "Language:"
 msgstr "Język:"
 
-msgid "Icon set:"
-msgstr "Zestaw ikon:"
-
 msgid "Gain"
 msgstr "Wzmacniacz"
 
@@ -346,6 +360,9 @@ msgstr "Maszyna:"
 msgid "Configure"
 msgstr "Konfiguruj"
 
+msgid "CPU:"
+msgstr "Procesor:"
+
 msgid "CPU type:"
 msgstr "Rodzaj procesora:"
 
@@ -353,7 +370,7 @@ msgid "Speed:"
 msgstr "Szybkość:"
 
 msgid "Frequency:"
-msgstr "Częstotliwość:"
+msgstr "Taktowanie:"
 
 msgid "FPU:"
 msgstr "Jednostka FPU:"
@@ -382,11 +399,23 @@ msgstr "Włączona (UTC)"
 msgid "Dynamic Recompiler"
 msgstr "Dynamiczny rekompilator"
 
+msgid "CPU frame size"
+msgstr "Rozmiar ramki CPU"
+
+msgid "Larger frames (less smooth)"
+msgstr "Większe ramki (mniej płynne)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Mniejsze ramki (płynniejsze)"
+
 msgid "Video:"
 msgstr "Wideo:"
 
-msgid "Voodoo Graphics"
-msgstr "Grafika Voodoo"
+msgid "Video #2:"
+msgstr "Wideo 2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Grafika Voodoo 1 lub 2"
 
 msgid "IBM 8514/A Graphics"
 msgstr "Grafika IBM 8514/A"
@@ -394,12 +423,27 @@ msgstr "Grafika IBM 8514/A"
 msgid "XGA Graphics"
 msgstr "Grafika XGA"
 
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "Karta graficzna IBM PS/55"
+
+msgid "Keyboard:"
+msgstr "Klawiatura:"
+
+msgid "Keyboard"
+msgstr "Klawiatura"
+
 msgid "Mouse:"
 msgstr "Mysz:"
 
+msgid "Mouse"
+msgstr "Mysz"
+
 msgid "Joystick:"
 msgstr "Joystick:"
 
+msgid "Joystick"
+msgstr "Joystick"
+
 msgid "Joystick 1..."
 msgstr "Joystick 1..."
 
@@ -413,16 +457,16 @@ msgid "Joystick 4..."
 msgstr "Joystick 4..."
 
 msgid "Sound card #1:"
-msgstr "Karta dźwiękowa 1:"
+msgstr "Karta dźwiękowa nr 1:"
 
 msgid "Sound card #2:"
-msgstr "Karta dźwiękowa 2:"
+msgstr "Karta dźwiękowa nr 2:"
 
 msgid "Sound card #3:"
-msgstr "Karta dźwiękowa 3:"
+msgstr "Karta dźwiękowa nr 3:"
 
 msgid "Sound card #4:"
-msgstr "Karta dźwiękowa 4:"
+msgstr "Karta dźwiękowa nr 4:"
 
 msgid "MIDI Out Device:"
 msgstr "Urządzenie wyjściowe MIDI:"
@@ -430,6 +474,9 @@ msgstr "Urządzenie wyjściowe MIDI:"
 msgid "MIDI In Device:"
 msgstr "Urządzenie wejściowe MIDI:"
 
+msgid "MIDI Out:"
+msgstr "Wyjście MIDI:"
+
 msgid "Standalone MPU-401"
 msgstr "Samodzielne urządzenie MPU-401"
 
@@ -445,15 +492,6 @@ msgstr "Nuked (dokładniejszy)"
 msgid "YMFM (faster)"
 msgstr "YMFM (szybszy)"
 
-msgid "Network type:"
-msgstr "Rodzaj sieci:"
-
-msgid "PCap device:"
-msgstr "Urządzenie PCap:"
-
-msgid "Network adapter:"
-msgstr "Karta sieciowa:"
-
 msgid "COM1 Device:"
 msgstr "Urządzenie COM1:"
 
@@ -478,6 +516,9 @@ msgstr "Urządzenie LPT3:"
 msgid "LPT4 Device:"
 msgstr "Urządzenie LPT4:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr "Wewnętrzne DMA LPT ECP:"
+
 msgid "Serial port 1"
 msgstr "Port szeregowy 1"
 
@@ -502,17 +543,20 @@ msgstr "Port równoległy 3"
 msgid "Parallel port 4"
 msgstr "Port równoległy 4"
 
-msgid "HD Controller:"
-msgstr "Kontroler dysku twardego:"
-
 msgid "FD Controller:"
 msgstr "Kontroler dyskietek:"
 
+msgid "CD-ROM Controller:"
+msgstr "Kontroler CD-ROM:"
+
 msgid "Tertiary IDE Controller"
-msgstr "Trzeciorzędowy kontroler IDE"
+msgstr "Trzeciorzędny kontroler IDE"
 
 msgid "Quaternary IDE Controller"
-msgstr "Czwartorzędowy kontroler IDE"
+msgstr "Czwartorzędny kontroler IDE"
+
+msgid "Hard disk"
+msgstr "Dysk twardy"
 
 msgid "SCSI"
 msgstr "SCSI"
@@ -535,6 +579,9 @@ msgstr "Kaseta"
 msgid "Hard disks:"
 msgstr "Dyski twarde:"
 
+msgid "Firmware Version"
+msgstr "Wersja firmware'u"
+
 msgid "&New..."
 msgstr "&Nowy..."
 
@@ -581,7 +628,7 @@ msgid "Floppy drives:"
 msgstr "Napędy dyskietek:"
 
 msgid "Turbo timings"
-msgstr "Rozrządy Turbo"
+msgstr "Timing Turbo"
 
 msgid "Check BPB"
 msgstr "Sprawdzaj BPB"
@@ -589,14 +636,17 @@ msgstr "Sprawdzaj BPB"
 msgid "CD-ROM drives:"
 msgstr "Napędy CD-ROM:"
 
-msgid "Earlier drive"
-msgstr "Wcześniejszy napęd"
-
 msgid "MO drives:"
 msgstr "Napędy MO:"
 
-msgid "ZIP drives:"
-msgstr "Napędy ZIP:"
+msgid "MO:"
+msgstr "MO:"
+
+msgid "Removable disks:"
+msgstr "Dyski wymienne:"
+
+msgid "Removable disk drives:"
+msgstr "Stacje dysków wymiennych:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
@@ -607,6 +657,9 @@ msgstr "ISA RTC:"
 msgid "ISA Memory Expansion"
 msgstr "Rozszerzenie pamięci ISA"
 
+msgid "ISA ROM Cards"
+msgstr "Karty ROM ISA"
+
 msgid "Card 1:"
 msgstr "Karta 1:"
 
@@ -619,18 +672,21 @@ msgstr "Karta 3:"
 msgid "Card 4:"
 msgstr "Karta 4:"
 
+msgid "Generic ISA ROM Board"
+msgstr "Generyczna płyta ROM ISA"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "Generyczna podwójna płyta ROM ISA"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "Generyczna poczwórna płyta ROM ISA"
+
 msgid "ISABugger device"
 msgstr "Urządzenie ISABugger"
 
 msgid "POST card"
 msgstr "Karta POST"
 
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
-
 msgid "86Box"
 msgstr "86Box"
 
@@ -641,19 +697,22 @@ msgid "Fatal error"
 msgstr "Fatalny błąd"
 
 msgid " - PAUSED"
-msgstr " - PAUSED"
-
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Naciśnij klawisze Ctrl+Alt+PgDn aby wrócić to trybu okna."
+msgstr " - PAUZA"
 
 msgid "Speed"
 msgstr "Szybkość"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "Dysk wymienny %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "Obrazy ZIP"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "Dysk &wymienny %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Obrazy dysków wymiennych"
+
+msgid "Image %1"
+msgstr "Obraz %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
 msgstr "86Box nie może znaleźć obrazów ROM nadających się do użytku.\n\nProszę pobrać zestaw obrazów ROM ze strony <a href=\"https://github.com/86Box/roms/releases/latest\">download</a>, i rozpakować je do katalogu \"roms\"."
@@ -680,13 +739,19 @@ msgid "Basic sector images"
 msgstr "Podstawowe obrazy sektorów"
 
 msgid "Surface images"
-msgstr "Obrazy powierzchniowe"
+msgstr "Obrazy powierzchni"
 
 msgid "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
-msgstr "Maszyna \"%hs\" nie jest dostępna, ponieważ brakuje obrazów ROM w katalogu roms/machines. Przełączanie na dostępną maszynę."
+msgstr "Maszyna „%hs” nie jest dostępna, ponieważ brakuje ROM-ów w katalogu roms/machines. Przełączanie na dostępną maszynę."
 
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
-msgstr "Karta wideo \"%hs\" nie jest dostępna, ponieważ brakuje obrazów ROM w katalogu roms/video. Przełączanie na dostępną kartę wideo."
+msgstr "Karta wideo „%hs” nie jest dostępna, ponieważ brakuje ROM-ów w katalogu roms/video. Przełączanie na dostępną kartę graficzną."
+
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "Karta wideo 2 „%hs” nie jest dostępna, ponieważ brakuje ROM-ów w katalogu roms/video. Wyłączenie drugiej karty graficznej."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "Urządzenie „%hs” nie jest dostępne, ponieważ brakuje ROM-ów. Ignorowanie urządzenia."
 
 msgid "Machine"
 msgstr "Maszyna"
@@ -706,12 +771,30 @@ msgstr "Sieć"
 msgid "Ports (COM & LPT)"
 msgstr "Porty (COM & LPT)"
 
+msgid "Ports"
+msgstr "Porty"
+
+msgid "Serial ports:"
+msgstr "Porty szeregowe:"
+
+msgid "Parallel ports:"
+msgstr "Porty równoległe:"
+
 msgid "Storage controllers"
-msgstr "Kontrolery pamięci"
+msgstr "Kontrolery pamięci masowej"
 
 msgid "Hard disks"
 msgstr "Dyski twarde"
 
+msgid "Disks:"
+msgstr "Dyski:"
+
+msgid "Floppy:"
+msgstr "Dyskietki:"
+
+msgid "Controllers:"
+msgstr "Kontrolery:"
+
 msgid "Floppy & CD-ROM drives"
 msgstr "Napędy dyskietek i CD-ROM"
 
@@ -721,14 +804,17 @@ msgstr "Inne urządzenia wymienne"
 msgid "Other peripherals"
 msgstr "Inne urządzenia peryferyjne"
 
+msgid "Other devices"
+msgstr "Inne urządzenia"
+
 msgid "Click to capture mouse"
-msgstr "Kliknij w celu przechwycenia myszy"
+msgstr "Kliknij, by przechwycić mysz"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "Naciśnij klawisze F8+F12 w celu uwolnienia myszy"
+msgid "Press %1 to release mouse"
+msgstr "Naciśnij %1, by wypuścić mysz"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Naciśnij klawisze F8+F12 lub środkowy przycisk w celu uwolnienia myszy"
+msgid "Press %1 or middle button to release mouse"
+msgstr "Naciśnij %1 lub środkowy przycisk, by wypuścić mysz"
 
 msgid "Bus"
 msgstr "Magistrala"
@@ -748,101 +834,137 @@ msgstr "S"
 msgid "KB"
 msgstr "KB"
 
-msgid "Could not initialize the video renderer."
-msgstr "Nie można zainicjować renderera wideo."
-
 msgid "Default"
 msgstr "Domyślny"
 
-msgid "%i Wait state(s)"
-msgstr "%i Stany oczekiwania"
+msgid "%1 Wait state(s)"
+msgstr "%1 stan(y/ów) oczekiwania"
 
 msgid "Type"
 msgstr "Rodzaj"
 
-msgid "Failed to set up PCap"
-msgstr "Nie udało się ustawić PCap"
-
 msgid "No PCap devices found"
 msgstr "Nie znaleziono urządzeń PCap"
 
 msgid "Invalid PCap device"
 msgstr "Nieprawidłowe urządzenie PCap"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "Standardowe joysticki 2-przyciskowe"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "Joysticki 2-osiowe, 2-przyciskowe"
 
-msgid "Standard 4-button joystick"
-msgstr "Standardowy joystick 4-przyciskowy"
+msgid "2-axis, 4-button joystick"
+msgstr "Joystick 2-osiowy, 4-przyciskowy"
 
-msgid "Standard 6-button joystick"
-msgstr "Standardowy joystick 6-przyciskowy"
+msgid "2-axis, 6-button joystick"
+msgstr "Joystick 2-osiowy, 6-przyciskowy"
 
-msgid "Standard 8-button joystick"
-msgstr "Standardowy joystick 8-przyciskowy"
+msgid "2-axis, 8-button joystick"
+msgstr "Joystick 2-osiowy, 8-przyciskowy"
+
+msgid "3-axis, 2-button joystick"
+msgstr "Joystick 3-osiowy, 2-przyciskowy"
+
+msgid "3-axis, 4-button joystick"
+msgstr "Joystick 3-osiowy, 4-przyciskowy"
+
+msgid "4-axis, 4-button joystick"
+msgstr "Joystick 4-osiowy, 4-przyciskowy"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH Pedals"
+
 msgid "Microsoft SideWinder Pad"
 msgstr "Microsoft SideWinder Pad"
 
 msgid "Thrustmaster Flight Control System"
 msgstr "Thrustmaster Flight Control System"
 
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Rudder Control System"
+
+msgid "2-button gamepad(s)"
+msgstr "Pad(y) z dwoma przyciskami"
+
+msgid "2-button flight yoke"
+msgstr "Wolant z dwoma przyciskami"
+
+msgid "4-button gamepad"
+msgstr "Pad z czterema przyciskami"
+
+msgid "4-button flight yoke"
+msgstr "Wolant z czterema przyciskami"
+
+msgid "2-button flight yoke with throttle"
+msgstr "Wolant z dwoma przyciskami i przepustnicą"
+
+msgid "4-button flight yoke with throttle"
+msgstr "Wolant z czterema przyciskami i przepustnicą"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Kierownica Win95 (3 osie, 4 przyciski)"
+
 msgid "None"
 msgstr "Żaden"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "Nie można załadować akceleratorów klawiaturowych."
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CHS: %2, %3, %4)"
 
-msgid "Unable to register raw input."
-msgstr "Nie można zarejestrować surowych danych wejściowych."
+msgid "Floppy %1 (%2): %3"
+msgstr "Dyskietka %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Dyskietka %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "&Dyskietka %1 (%2): %3"
 
 msgid "Advanced sector images"
 msgstr "Zaawansowane obrazy sektorów"
 
 msgid "Flux images"
-msgstr "Flux images"
-
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "Nie można zainicjować SDL, wymagany SDL2.dll"
+msgstr "Obrazy flux"
 
 msgid "Are you sure you want to hard reset the emulated machine?"
-msgstr "Jesteś pewien że chcesz wykonać twardy reset emulowanej maszyny?"
+msgstr "Czy na pewno chcesz wykonać twardy reset emulowanej maszyny?"
 
 msgid "Are you sure you want to exit 86Box?"
-msgstr "Jesteś pewien że chcesz zakończyć 86Box?"
+msgstr "Czy na pewno chcesz zakończyć 86Box?"
 
 msgid "Unable to initialize Ghostscript"
-msgstr "Nie można zainicjować Ghostscript"
+msgstr "Nie można zainicjować Ghostscriptu"
 
-msgid "MO %i (%ls): %ls"
-msgstr "MO %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "Nie można zainicjować GhostPCL"
+
+msgid "MO %1 (%2): %3"
+msgstr "MO %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&MO %1 (%2): %3"
 
 msgid "MO images"
 msgstr "Obrazy MO"
 
 msgid "Welcome to 86Box!"
-msgstr "Witamy w 86Box!"
+msgstr "Witamy w 86Boxie!"
 
-msgid "Internal controller"
-msgstr "Kontroler wewnętrzny"
+msgid "Internal device"
+msgstr "Urządzenie wewnętrzne"
+
+msgid "&File"
+msgstr "&Plik"
+
+msgid "&New machine..."
+msgstr "&Nowa maszyna..."
+
+msgid "&Check for updates..."
+msgstr "&Sprawdź aktualizacje..."
 
 msgid "Exit"
-msgstr "Zakończ"
+msgstr "Za&kończ"
 
 msgid "No ROMs found"
-msgstr "Nie znaleziono obrazów ROM"
+msgstr "Nie znaleziono ROM-ów"
 
 msgid "Do you want to save the settings?"
 msgstr "Czy chcesz zapisać ustawienia?"
@@ -860,34 +982,22 @@ msgid "86Box v"
 msgstr "86Box v"
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "Emulator starych komputerów\n\nAutorzy: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, i inni.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, i inni.\n\nPrzetłumaczony przez: Fanta-Shokata\n\nWydany na licencji GNU General Public License w wersji 2 lub nowszej. Zobacz LICENSE aby uzyskać więcej informacji."
+msgstr "Emulator starych komputerów\n\nAutorzy: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, i inni.\n\nZ wcześniejszym wkładem od Sarah Walker, leilei, JohnElliott, greatpsycho i innych.\n\nPrzetłumaczony przez: Lili1228\n\nWydany na licencji GNU General Public License w wersji 2 lub nowszej. Zobacz LICENSE aby uzyskać więcej informacji."
 
 msgid "Hardware not available"
 msgstr "Sprzęt niedostępny"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Sprawdź, czy libpcap jest zainstalowany i czy posiadasz połączenie sieciowe kompatybilne z libpcap."
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "Sprawdź, czy %1 jest zainstalowany i czy posiadasz połączenie sieciowe kompatybilne z %1."
 
 msgid "Invalid configuration"
 msgstr "Nieprawidłowa konfiguracja"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 jest wymagany do automatycznej konwersji plików PostScript do PDF.\n\nDokumenty wysłane do generycznej drukarki PostScript zostaną zapisane jako pliki PostScript (.ps)."
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " jest wymagany do automatycznej konwersji plików PostScript do PDF.\n\nDokumenty wysłane do ogólnej drukarki PostScript zostaną zapisane jako pliki PostScript (.ps)."
-
-msgid "Entering fullscreen mode"
-msgstr "Przechodzenie do trybu pełnoekranowego"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 jest wymagany do automatycznej konwersji plików PCL do PDF.\n\nDokumenty wysłane do generycznej drukarki PCL zostaną zapisane jako pliki Printer Command Language (.pcl)."
 
 msgid "Don't show this message again"
 msgstr "Nie pokazuj więcej tego komunikatu"
@@ -896,52 +1006,49 @@ msgid "Don't exit"
 msgstr "Nie kończ"
 
 msgid "Reset"
-msgstr "Przywróć"
+msgstr "Resetuj"
 
 msgid "Don't reset"
-msgstr "Nie przywracaj"
+msgstr "Nie resetuj"
 
 msgid "CD-ROM images"
 msgstr "Obrazy CD-ROM"
 
-msgid "%hs Device Configuration"
-msgstr "Konfiguracja urządzenia %hs"
+msgid "%1 Device Configuration"
+msgstr "Konfiguracja urządzenia %1"
 
 msgid "Monitor in sleep mode"
 msgstr "Monitor w trybie czuwania"
 
-msgid "OpenGL Shaders"
-msgstr "Shadery OpenGL"
-
-msgid "OpenGL options"
-msgstr "Opcje OpenGL"
+msgid "GLSL shaders"
+msgstr "Shadery GLSL"
 
 msgid "You are loading an unsupported configuration"
-msgstr "Ładujesz nieobsługiwaną konfigurację"
+msgstr "Wczytujesz nieobsługiwaną konfigurację"
 
 msgid "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
-msgstr "Wybór rodzaju procesora oparty na wybranej maszynie jest wyłączony dla tej emulowanej maszyny.\n\nPozwala to na wybór procesora który jest niekompatybilny z wybraną maszyną. Jednak możesz napotkać niezgodności z BIOS-em maszyny lub innym oprogramowaniem.\n\nAktywacja tego ustawienia nie jest wspierana i każde zgłoszenie błędu może zostać zamknięte jako nieważne."
+msgstr "Filtrowanie rodzaju procesora na podstawie wybranej maszyny jest wyłączone dla tej emulowanej maszyny.\n\nPozwala to na wybór procesora, który jest niekompatybilny z wybraną maszyną, jednak możesz napotkać niezgodności z BIOS-em maszyny lub innym oprogramowaniem.\n\nAktywacja tego ustawienia nie jest wspierana i każde zgłoszenie błędu może zostać zamknięte jako nieprawidłowe."
 
 msgid "Continue"
 msgstr "Kontynuuj"
 
-msgid "Cassette: %s"
-msgstr "Kaseta: %s"
+msgid "Cassette: %1"
+msgstr "Kaseta: %1"
+
+msgid "C&assette: %1"
+msgstr "K&aseta: %1"
 
 msgid "Cassette images"
 msgstr "Obrazy kaset"
 
-msgid "Cartridge %i: %ls"
-msgstr "Kartrydż %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "Kartridż %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "Kar&tridż %1: %2"
 
 msgid "Cartridge images"
-msgstr "Obrazy kartrydżu"
-
-msgid "Error initializing renderer"
-msgstr "Błąd inicjalizacji renderera"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "Nie można zainicjować renderera OpenGL (3.0 Core). Użyj innego."
+msgstr "Obrazy kartridżów"
 
 msgid "Resume execution"
 msgstr "Wznów wykonywanie"
@@ -949,6 +1056,9 @@ msgstr "Wznów wykonywanie"
 msgid "Pause execution"
 msgstr "Zatrzymaj wykonywanie"
 
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del"
+
 msgid "Press Ctrl+Alt+Del"
 msgstr "Naciśnij Ctrl+Alt+Del"
 
@@ -958,17 +1068,281 @@ msgstr "Naciśnij Ctrl+Alt+Esc"
 msgid "Hard reset"
 msgstr "Twardy reset"
 
+msgid "Force shutdown"
+msgstr "Wymuś zamknięcie"
+
+msgid "Start"
+msgstr "Uruchom"
+
+msgid "Not running"
+msgstr "Wyłączona"
+
+msgid "Running"
+msgstr "Uruchomiona"
+
+msgid "Paused"
+msgstr "Wstrzymana"
+
+msgid "Waiting"
+msgstr "Oczekiwanie"
+
+msgid "Powered Off"
+msgstr "Wyłączona"
+
+msgid "%n running"
+msgstr "%n uruchomion(a/e/ych)"
+
+msgid "%n paused"
+msgstr "%n wstrzyman(a/e/ych)"
+
+msgid "%n waiting"
+msgstr "%n oczekując(a/e/ych)"
+
+msgid "%1 total"
+msgstr "Łącznie %1"
+
+msgid "VMs: %1"
+msgstr "Maszyny wirtualne: %1"
+
+msgid "System Directory:"
+msgstr "Folder systemowy:"
+
+msgid "Choose directory"
+msgstr "Wybierz folder"
+
+msgid "Choose configuration file"
+msgstr "Wybierz plik konfiguracyjny"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "Pliki konfiguracyjne 86Boxa (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Nieudany odczyt konfiguracji"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "Nie udało się otworzyć wybranego pliku konfiguracyjnego do odczytu: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "Użyj wyrażeń regularnych w polu wyszukiwania"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "Liczba obecnie aktywnych maszyn: %1. Czy na pewno chcesz, mimo to, wyjść z menedżera maszyn wirtualnych?"
+
+msgid "Add new system wizard"
+msgstr "Kreator dodawania nowego systemu"
+
+msgid "Introduction"
+msgstr "Wstęp"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "Ten kreator pomoże Ci dodać nowy system do 86Boxa."
+
+msgid "New configuration"
+msgstr "Nowa konfiguracja"
+
+msgid "Complete"
+msgstr "Ukończono"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "Kreator teraz uruchomi konfigurację dla nowego systemu."
+
+msgid "Use existing configuration"
+msgstr "Użyj istniejącej konfiguracji"
+
+msgid "Type some notes here"
+msgstr "Wpisz tutaj swoje notatki"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Wklej zawartość istniejącego pliku konfiguracyjnego w poniższe pole."
+
+msgid "Load configuration from file"
+msgstr "Wczytaj konfigurację z pliku"
+
+msgid "System name"
+msgstr "Nazwa systemu"
+
+msgid "System name:"
+msgstr "Nazwa systemu:"
+
+msgid "System name cannot contain certain characters"
+msgstr "Nazwa systemu nie może zawierać niektórych znaków"
+
+msgid "System name already exists"
+msgstr "Nazwa systemu już istnieje"
+
+msgid "Please enter a directory for the system"
+msgstr "Wprowadź folder dla systemu"
+
+msgid "Directory does not exist"
+msgstr "Folder nie istnieje"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "Zostanie utworzony nowy folder dla systemu w wybranym powyżej folderze"
+
+msgid "System location:"
+msgstr "Lokalizacja systemu:"
+
+msgid "System name and location"
+msgstr "Nazwa i lokalizacja systemu"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Podaj nazwę system i wybierz jego lokalizację"
+
+msgid "Enter the name of the system"
+msgstr "Podaj nazwę systemu"
+
+msgid "Please enter a system name"
+msgstr "Proszę podać nazwę systemu"
+
+msgid "Display name (optional):"
+msgstr "Nazwa wyświetlana (opcjonalne):"
+
+msgid "Display name:"
+msgstr "Nazwa wyświetlana:"
+
+msgid "Set display name"
+msgstr "Ustaw nazwę wyświetlaną"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Podaj nową nazwę wyświetlaną (wyczyść, by zresetować)"
+
+msgid "Change &display name..."
+msgstr "Zmień wyświetlaną &nazwę..."
+
+msgid "Context Menu"
+msgstr "Menu kontekstowe"
+
+msgid "&Open folder..."
+msgstr "&Otwórz folder..."
+
+msgid "Open p&rinter tray..."
+msgstr "Otwórz &tackę drukarki..."
+
+msgid "Set &icon..."
+msgstr "&Ustaw ikonę..."
+
+msgid "Select an icon"
+msgstr "Wybierz ikonę"
+
+msgid "C&lone..."
+msgstr "&Klonuj..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "Maszyna wirtualna „%1” (%2) zostanie sklonowana jako:"
+
+msgid "Directory %1 already exists"
+msgstr "Folder %1 już istnieje"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "Nie możesz użyć następujących znaków w nazwie: %1"
+
+msgid "Clone"
+msgstr "Klonuj"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Nie udało się stworzyć folderu dla klonowanej maszyny wirtualnej"
+
+msgid "Failed to clone VM."
+msgstr "Nie udało się sklonować maszyny wirtualnej."
+
+msgid "Directory in use"
+msgstr "Folder w użyciu"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "Wybrany folder jest już w użyciu. Proszę wybrać inny folder."
+
+msgid "Create directory failed"
+msgstr "Nieudane utworzenie folderu"
+
+msgid "Unable to create the directory for the new system"
+msgstr "Nie udało się utworzyć folderu dla nowego systemu"
+
+msgid "Configuration write failed"
+msgstr "Nieudany zapis konfiguracji"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "Nie udało się otworzyć pliku %1 do zapisu"
+
+msgid "Error adding system"
+msgstr "Błąd dodawania systemu"
+
+msgid "Remove directory failed"
+msgstr "Nieudane usunięcie folderu"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "Nie udało się usunąć niektórych plików w folderze maszyny wirtualnej. Proszę usunąć je ręcznie."
+
+msgid "Build"
+msgstr "Kompilacja"
+
+msgid "Version"
+msgstr "Wersja"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "Dostępna jest aktualizacja 86Boxa: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "Wystąpił błąd podczas sprawdzania aktualizacji %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>Dostępna jest aktualizacja 86Boxa!</b>"
+
+msgid "Warning"
+msgstr "Ostrzeżenie"
+
+msgid "&Kill"
+msgstr "&Zabij"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "Zabicie maszyny wirtualnej może spowodować utratę danych. Zrób to tylko, jeśli proces 86Boxa się zawiesił.\n\nCzy na pewno chcesz zabić maszynę wirtualną „%1”?"
+
+msgid "&Delete"
+msgstr "&Usuń"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "Czy na pewno chcesz usunąć maszynę wirtualną „%1” i jej wszystkie pliki? Tej operacji nie można cofnąć!"
+
+msgid "Show &config file"
+msgstr "&Pokaż plik konfiguracyjny"
+
+msgid "No screenshot"
+msgstr "Brak zrzutów ekranu"
+
+msgid "Search"
+msgstr "Szukanie"
+
+msgid "Searching for VMs..."
+msgstr "Szukanie maszyn wirtualnych..."
+
+msgid "Found %1"
+msgstr "Znaleziono %1"
+
+msgid "System"
+msgstr "System"
+
+msgid "Storage"
+msgstr "Pamięć"
+
+msgid "Disk %1: "
+msgstr "Dysk %1: "
+
+msgid "No disks"
+msgstr "Brak dysków"
+
+msgid "Audio"
+msgstr "Dźwięk"
+
+msgid "Audio:"
+msgstr "Dźwięk:"
+
 msgid "ACPI shutdown"
 msgstr "Wyłączenie ACPI"
 
-msgid "Hard disk (%s)"
-msgstr "Dysk twardy (%s)"
+msgid "ACP&I shutdown"
+msgstr "Wyłączenie ACP&I"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "Dysk twardy (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
 msgstr "Napędy CD-ROM MFM/RLL lub ESDI nigdy nie istniały"
@@ -1003,9 +1377,6 @@ msgstr "Nie można zapisać pliku"
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
 msgstr "Obrazy HDI lub HDX z rozmiarem sektora innym niż 512 nie są wspierane."
 
-msgid "USB is not yet supported"
-msgstr "USB nie jest jeszcze wspierane"
-
 msgid "Disk image file already exists"
 msgstr "Plik obrazu dysku już istnieje"
 
@@ -1025,7 +1396,7 @@ msgid "Disk image too large"
 msgstr "Obraz dysku jest za duży"
 
 msgid "Remember to partition and format the newly-created drive."
-msgstr "Nie zapomnij o partycjonowaniu i sformatowaniu nowo utworzego dysku"
+msgstr "Nie zapomnij o partycjonowaniu i sformatowaniu nowo utworzonego dysku."
 
 msgid "The selected file will be overwritten. Are you sure you want to use it?"
 msgstr "Wybrany plik zostanie nadpisany. Czy na pewno chcesz użyć tego pliku?"
@@ -1039,8 +1410,29 @@ msgstr "Nadpisz"
 msgid "Don't overwrite"
 msgstr "Nie nadpisuj"
 
+msgid "Raw image"
+msgstr "Surowy obraz"
+
+msgid "HDI image"
+msgstr "Obraz HDI"
+
+msgid "HDX image"
+msgstr "Obraz HDX"
+
+msgid "Fixed-size VHD"
+msgstr "VHD o stałym rozmiarze"
+
+msgid "Dynamic-size VHD"
+msgstr "VHD o dynamicznym rozmiarze"
+
+msgid "Differencing VHD"
+msgstr "VHD różnicujący"
+
+msgid "(N/A)"
+msgstr "(nd.)"
+
 msgid "Raw image (.img)"
-msgstr "Obraz surowy (.img)"
+msgstr "Surowy obraz (.img)"
 
 msgid "HDI image (.hdi)"
 msgstr "Obraz HDI (.hdi)"
@@ -1055,7 +1447,7 @@ msgid "Dynamic-size VHD (.vhd)"
 msgstr "VHD o dynamicznym rozmiarze (.vhd)"
 
 msgid "Differencing VHD (.vhd)"
-msgstr "VHD różnicujący (.vhd)"
+msgstr "VHD różnicowy (.vhd)"
 
 msgid "Large blocks (2 MB)"
 msgstr "Duże bloki (2 MB)"
@@ -1070,7 +1462,7 @@ msgid "Select the parent VHD"
 msgstr "Wybierz nadrzędny plik VHD"
 
 msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
-msgstr "Może to oznaczać, że obraz nadrzędny został zmodyfikowany po utworzeniu obrazu różnicującego.\n\nMoże się to również zdarzyć, jeśli pliki obrazów zostały przeniesione lub skopiowane, lub wystąpił błąd w programie, który utworzył ten dysk\n\nCzy chcesz naprawić sygnatury czasowe?"
+msgstr "Może to oznaczać, że obraz nadrzędny został zmodyfikowany po utworzeniu obrazu różnicowego.\n\nMoże się to również zdarzyć, jeśli pliki obrazów zostały przeniesione lub skopiowane, lub wystąpił błąd w programie, który utworzył ten dysk.\n\nCzy chcesz naprawić sygnatury czasowe?"
 
 msgid "Parent and child disk timestamps do not match"
 msgstr "Sygnatury czasowe dysku nadrzędnego i podrzędnego nie zgadzają się"
@@ -1078,9 +1470,6 @@ msgstr "Sygnatury czasowe dysku nadrzędnego i podrzędnego nie zgadzają się"
 msgid "Could not fix VHD timestamp."
 msgstr "Nie można naprawić sygnatury czasowej VHD."
 
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
-
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
 
@@ -1096,44 +1485,29 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
+msgid "160 KB"
+msgstr "160 KB"
 
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
+msgid "180 KB"
+msgstr "180 KB"
 
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
+msgid "320 KB"
+msgstr "320 KB"
 
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
+msgid "360 KB"
+msgstr "360 KB"
 
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
+msgid "640 KB"
+msgstr "640 KB"
 
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
+msgid "720 KB"
+msgstr "720 KB"
 
 msgid "1.2 MB"
 msgstr "1,2 MB"
@@ -1208,10 +1582,10 @@ msgid "The network configuration will be switched to the null driver"
 msgstr "Konfiguracja sieci zostanie przełączona na sterownik null"
 
 msgid "Mouse sensitivity:"
-msgstr "Wrażliwość myszy:"
+msgstr "Czułość myszy:"
 
 msgid "Select media images from program working directory"
-msgstr "Wybór obrazów multimedialnych z katalogu roboczego programu"
+msgstr "Wybór obrazów nośników z katalogu roboczego programu"
 
 msgid "PIT mode:"
 msgstr "Tryb PIT:"
@@ -1227,3 +1601,1383 @@ msgstr "Szybki"
 
 msgid "&Auto-pause on focus loss"
 msgstr "&Automatyczna pauza po utracie fokusu"
+
+msgid "WinBox is no longer supported"
+msgstr "WinBox nie jest już wspierany"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "Menedżer WinBox przestał być rozwijany w 2022 roku z powodu braku opiekunów. Ponieważ kierujemy nasze wysiłki na uczynienie 86Box jeszcze lepszym, podjęliśmy decyzję o zaprzestaniu wspierania WinBox jako menedżera.\n\nŻadne dalsze aktualizacje nie będą dostarczane za pośrednictwem WinBoxa i możesz napotkać nieprawidłowe zachowanie, jeśli będziesz go nadal używać z nowszymi wersjami 86Box. Wszelkie zgłoszenia błędów związane z działaniem WinBox zostaną zamknięte jako nieważne.\n\nLista innych menedżerów, z których można korzystać, znajduje się na stronie 86box.net."
+
+msgid "Generate"
+msgstr "Generuj"
+
+msgid "Joystick configuration"
+msgstr "Konfiguracja joysticka"
+
+msgid "Device"
+msgstr "Urządzenie"
+
+msgid "%1 (X axis)"
+msgstr "%1 (oś X)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (oś Y)"
+
+msgid "MCA devices"
+msgstr "Urządzenia MCA"
+
+msgid "List of MCA devices:"
+msgstr "Lista urządzeń MCA:"
+
+msgid "&Tablet tool"
+msgstr "Narzędzie do tabletów"
+
+msgid "About &Qt"
+msgstr "O &Qt"
+
+msgid "&MCA devices..."
+msgstr "Urządzenia MCA..."
+
+msgid "Show non-&primary monitors"
+msgstr "Pokaż monitory &inne niż podstawowe"
+
+msgid "Open screenshots &folder..."
+msgstr "Otwórz folder zrzutów &ekranu..."
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Zastosowanie trybu rozciągania na pełnym ekranie w stanie zmaksymalizowanym"
+
+msgid "&Cursor/Puck"
+msgstr "&Kursor/krążek"
+
+msgid "&Pen"
+msgstr "P&ióro"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "&Napęd CD/DVD hosta (%1:)"
+
+msgid "&Connected"
+msgstr "&Podłączone"
+
+msgid "Clear image &history"
+msgstr "Wyczyść historię obrazów(&H)"
+
+msgid "Create..."
+msgstr "Stwórz..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "Napęd CD/DVD hosta (%1)"
+
+msgid "Unknown Bus"
+msgstr "Nieznana magistrala"
+
+msgid "Null Driver"
+msgstr "Null Driver"
+
+msgid "NIC:"
+msgstr "NIC:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "NIC %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&NIC %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "Zachowanie renderowania"
+
+msgid "Use target framerate:"
+msgstr "Użyj docelowej liczby klatek na sekundę:"
+
+msgid " fps"
+msgstr " fps"
+
+msgid "VSync"
+msgstr "VSync"
+
+msgid "Synchronize with video"
+msgstr "Synchronizuj z obrazem"
+
+msgid "Shaders"
+msgstr "Shadery"
+
+msgid "Remove"
+msgstr "Usuń"
+
+msgid "Browse..."
+msgstr "Przeglądaj..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "Nie można utworzyć kontekstu OpenGL."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "Nie można przełączyć na kontekst OpenGL."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "Wymagana jest wersja OpenGL 3.0 lub wyższa. Aktualna wersja to %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "Błąd inicjalizacji OpenGL"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nPowrót do renderowania programowego."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>Podczas wybierania obrazów nośników (CD-ROM, dyskietka itd.), otwarte okno dialogowe rozpocznie się w tym samym katalogu, co plik konfiguracyjny 86Box. To ustawienie prawdopodobnie będzie miało znaczenie tylko na macOS.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "To urządzenie mogło zostać przeniesione lub skopiowane."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "Aby zapewnić prawidłową funkcjonalność sieci, 86Box musi wiedzieć, czy to maszyna zostało przeniesiona albo skopiowana.\n\nW przypadku braku pewności, wybierz opcję „Została skopiowana”."
+
+msgid "I Moved It"
+msgstr "Została przeniesiona"
+
+msgid "I Copied It"
+msgstr "Została skopiowana"
+
+msgid "86Box Monitor #"
+msgstr "86Box Monitor "
+
+msgid "No MCA devices."
+msgstr "Brak urządzeń MCA."
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "Karta sieciowa nr 1"
+
+msgid "Network Card #2"
+msgstr "Karta sieciowa nr 2"
+
+msgid "Network Card #3"
+msgstr "Karta sieciowa nr 3"
+
+msgid "Network Card #4"
+msgstr "Karta sieciowa nr 4"
+
+msgid "Mode:"
+msgstr "Tryb:"
+
+msgid "Interface:"
+msgstr "Interfejs:"
+
+msgid "Adapter:"
+msgstr "Adapter:"
+
+msgid "VDE Socket:"
+msgstr "Gniazdo VDE:"
+
+msgid "86Box Unit Tester"
+msgstr "Tester urządzeń 86Box"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Karta klucza Novell NetWare 2.x"
+
+msgid "Serial port passthrough 1"
+msgstr "Przelotka portu szeregowego 1"
+
+msgid "Serial port passthrough 2"
+msgstr "Przelotka portu szeregowego 2"
+
+msgid "Serial port passthrough 3"
+msgstr "Przelotka portu szeregowego 3"
+
+msgid "Serial port passthrough 4"
+msgstr "Przelotka portu szeregowego 4"
+
+msgid "Renderer &options..."
+msgstr "Opcje renderowania..."
+
+msgid "PC/XT Keyboard"
+msgstr "Klawiatura PC/XT"
+
+msgid "AT Keyboard"
+msgstr "Klawiatura AT"
+
+msgid "AX Keyboard"
+msgstr "Klawiatura AX"
+
+msgid "PS/2 Keyboard"
+msgstr "Klawiatura PS/2"
+
+msgid "PS/55 Keyboard"
+msgstr "Klawiatura PS/55"
+
+msgid "Keys"
+msgstr "Klawisze"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Mysz magistralowa Logitech/Microsoft"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Mysz magistralowa Microsoft (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Mysz szeregowa Mouse Systems"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Mysz magistralowa Mouse Systems"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Mysz szeregowa Microsoft"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Microsoft Serial BallPoint"
+
+msgid "Logitech Serial Mouse"
+msgstr "Mysz szeregowa Logitech"
+
+msgid "PS/2 Mouse"
+msgstr "Mysz PS/2"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "PS/2 QuickPort Mouse"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (szeregowy)"
+
+msgid "Default Baud rate"
+msgstr "Domyślna szybkość transmisji"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] Standardowy modem zgodny z Hayes"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Emulacja Roland MT-32"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "(Nowa) emulacja Roland MT-32"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Emulacja Roland CM-32L"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Emulacja Roland CM-32LN"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "Płyta-córka OPL4-ML"
+
+msgid "System MIDI"
+msgstr "System MIDI"
+
+msgid "MIDI Input Device"
+msgstr "Urządzenie wejściowe MIDI"
+
+msgid "BIOS file"
+msgstr "Plik BIOS"
+
+msgid "BIOS file (ROM #1)"
+msgstr "Plik BIOS (ROM nr 1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "Plik BIOS (ROM nr 2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "Plik BIOS (ROM nr 3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "Plik BIOS (ROM nr 4)"
+
+msgid "BIOS address"
+msgstr "Adres BIOS"
+
+msgid "BIOS address (ROM #1)"
+msgstr "Adres BIOS (ROM nr 1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "Adres BIOS (ROM nr 2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "Adres BIOS (ROM nr 3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "Adres BIOS (ROM nr 4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "Włącz zapis do pamięci ROM rozszerzenia BIOS"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "Włącz zapis do pamięci ROM rozszerzenia BIOS (ROM nr 1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "Włącz zapis do pamięci ROM rozszerzenia BIOS (ROM nr 2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "Włącz zapis do pamięci ROM rozszerzenia BIOS (ROM nr 3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "Włącz zapis do pamięci ROM rozszerzenia BIOS (ROM nr 4)"
+
+msgid "Linear framebuffer base"
+msgstr "Adres bazowy liniowego buforu ramki"
+
+msgid "Address"
+msgstr "Adres"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "IRQ portu szeregowego"
+
+msgid "Parallel port IRQ"
+msgstr "IRQ portu równoległego"
+
+msgid "BIOS Revision"
+msgstr "Rewizja BIOS-u"
+
+msgid "BIOS Version"
+msgstr "Wersja BIOS-u"
+
+msgid "BIOS Language"
+msgstr "Język BIOS-u"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "IBM 5161 Expansion Unit"
+
+msgid "IBM Cassette Basic"
+msgstr "IBM Cassette Basic"
+
+msgid "Translate 26 -> 17"
+msgstr "Przetłumacz 26 -> 17"
+
+msgid "Language"
+msgstr "Język"
+
+msgid "Enable backlight"
+msgstr "Włącz podświetlenie"
+
+msgid "Invert colors"
+msgstr "Odwracanie kolorów"
+
+msgid "BIOS size"
+msgstr "Rozmiar BIOS-u"
+
+msgid "BIOS size (ROM #1)"
+msgstr "Rozmiar BIOS-u (ROM nr 1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "Rozmiar BIOS-u (ROM nr 2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "Rozmiar BIOS-u (ROM nr 3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "Rozmiar BIOS-u (ROM nr 4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "Mapowanie C0000-C7FFF jako UMB"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "Mapowanie C8000-CFFFF jako UMB"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "Mapowanie D0000-D7FFF jako UMB"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "Mapowanie D8000-DFFFF jako UMB"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "Mapowanie E0000-E7FFF jako UMB"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "Mapowanie E8000-EFFFF jako UMB"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "Zworka JS9 (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "Urządzenie wyjściowe MIDI"
+
+msgid "MIDI Real time"
+msgstr "MIDI w czasie rzeczywistym"
+
+msgid "MIDI Thru"
+msgstr "Przejście wejścia MIDI"
+
+msgid "MIDI Clockout"
+msgstr "Wyjście zegara MIDI"
+
+msgid "SoundFont"
+msgstr "SoundFont"
+
+msgid "Output Gain"
+msgstr "Wzmocnienie wyjściowe"
+
+msgid "Chorus"
+msgstr "Chór"
+
+msgid "Chorus Voices"
+msgstr "Głosy chóru"
+
+msgid "Chorus Level"
+msgstr "Poziom chóru"
+
+msgid "Chorus Speed"
+msgstr "Prędkość chóru"
+
+msgid "Chorus Depth"
+msgstr "Głębokość chóru"
+
+msgid "Chorus Waveform"
+msgstr "Kształt fali chóru"
+
+msgid "Reverb"
+msgstr "Pogłos"
+
+msgid "Reverb Room Size"
+msgstr "Rozmiar pomieszczenia pogłosu"
+
+msgid "Reverb Damping"
+msgstr "Tłumienie pogłosu"
+
+msgid "Reverb Width"
+msgstr "Szerokość pogłosu"
+
+msgid "Reverb Level"
+msgstr "Poziom pogłosu"
+
+msgid "Interpolation Method"
+msgstr "Metoda interpolacji"
+
+msgid "Dynamic Sample Loading"
+msgstr "Dynamiczne wczytywanie sampli"
+
+msgid "Reverb Output Gain"
+msgstr "Wzmocnienie sygnału wyjściowego pogłosu"
+
+msgid "Reversed stereo"
+msgstr "Odwrócone stereo"
+
+msgid "Nice ramp"
+msgstr "Niezła rampa"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "Przyciski"
+
+msgid "Serial Port"
+msgstr "Port szeregowy"
+
+msgid "RTS toggle"
+msgstr "Przełącznik RTS"
+
+msgid "Revision"
+msgstr "Rewizja"
+
+msgid "Controller"
+msgstr "Kontroler"
+
+msgid "Show Crosshair"
+msgstr "Pokaż celownik"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "Adres MAC"
+
+msgid "MAC Address OUI"
+msgstr "OUI adresu MAC"
+
+msgid "Enable BIOS"
+msgstr "Włącz BIOS"
+
+msgid "Baud Rate"
+msgstr "Szybkość transmisji"
+
+msgid "TCP/IP listening port"
+msgstr "Port nasłuchiwania TCP/IP"
+
+msgid "Phonebook File"
+msgstr "Plik książki telefonicznej"
+
+msgid "Telnet emulation"
+msgstr "Emulacja Telnet"
+
+msgid "RAM Address"
+msgstr "Adres RAM"
+
+msgid "RAM size"
+msgstr "Rozmiar pamięci RAM"
+
+msgid "Initial RAM size"
+msgstr "Początkowy rozmiar pamięci RAM"
+
+msgid "Serial Number"
+msgstr "Numer seryjny"
+
+msgid "Host ID"
+msgstr "Identyfikator hosta"
+
+msgid "FDC Address"
+msgstr "Adres FDC"
+
+msgid "MPU-401 Address"
+msgstr "Adres MPU-401"
+
+msgid "MPU-401 IRQ"
+msgstr "MPU-401 IRQ"
+
+msgid "Receive MIDI input"
+msgstr "Odbiór sygnału wejściowego MIDI"
+
+msgid "Low DMA"
+msgstr "Niski poziom DMA"
+
+msgid "Enable Game port"
+msgstr "Włącz port gier"
+
+msgid "SID Model"
+msgstr "Model SID"
+
+msgid "SID Filter Strength"
+msgstr "Siła filtra SID"
+
+msgid "Surround module"
+msgstr "Moduł Surround"
+
+msgid "CODEC"
+msgstr "CODEC"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "Podnieś przerwanie CODEC podczas konfiguracji CODEC-a (wymagane przez niektóre sterowniki)"
+
+msgid "SB Address"
+msgstr "Adres SB"
+
+msgid "Adlib Address"
+msgstr "Adres Adlib"
+
+msgid "Use EEPROM setting"
+msgstr "Użyj ustawień z EEPROM"
+
+msgid "WSS IRQ"
+msgstr "WSS IRQ"
+
+msgid "WSS DMA"
+msgstr "WSS DMA"
+
+msgid "Enable OPL"
+msgstr "Włącz OPL"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "Odbiór wejścia MIDI (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "Low DMA SB"
+
+msgid "6CH variant (6-channel)"
+msgstr "Wariant 6CH (6-kanałowy)"
+
+msgid "Enable CMS"
+msgstr "Włącz CMS"
+
+msgid "Mixer"
+msgstr "Mikser"
+
+msgid "High DMA"
+msgstr "Wysokie DMA"
+
+msgid "Control PC speaker"
+msgstr "Kontroluj PC speaker"
+
+msgid "Memory size"
+msgstr "Rozmiar pamięci"
+
+msgid "EMU8000 Address"
+msgstr "Adres EMU8000"
+
+msgid "IDE Controller"
+msgstr "Kontroler IDE"
+
+msgid "Codec"
+msgstr "Kodek"
+
+msgid "GUS type"
+msgstr "Typ GUS"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "Włącz polecenie 0x04 „Wyjdź z 86Boxa”"
+
+msgid "Display type"
+msgstr "Typ ekranu"
+
+msgid "Composite type"
+msgstr "Typ kompozytowy"
+
+msgid "RGB type"
+msgstr "Typ RGB"
+
+msgid "Line doubling type"
+msgstr "Typ podwojenia linii"
+
+msgid "Snow emulation"
+msgstr "Emulacja śniegu"
+
+msgid "Monitor type"
+msgstr "Typ monitora"
+
+msgid "Character set"
+msgstr "Zestaw znaków"
+
+msgid "XGA type"
+msgstr "Typ XGA"
+
+msgid "Instance"
+msgstr "Instancja"
+
+msgid "MMIO Address"
+msgstr "Adres MMIO"
+
+msgid "RAMDAC type"
+msgstr "Typ RAMDAC"
+
+msgid "Blend"
+msgstr "Mieszanka"
+
+msgid "Font"
+msgstr "Font"
+
+msgid "Bilinear filtering"
+msgstr "Filtrowanie dwuliniowe"
+
+msgid "Video chroma-keying"
+msgstr "Chroma-keying obrazu"
+
+msgid "Dithering"
+msgstr "Dithering"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "Włącz NMI dla emulacji CGA"
+
+msgid "Voodoo type"
+msgstr "Typ Voodoo"
+
+msgid "Framebuffer memory size"
+msgstr "Rozmiar pamięci bufora ramki"
+
+msgid "Texture memory size"
+msgstr "Rozmiar pamięci tekstur"
+
+msgid "Dither subtraction"
+msgstr "Odejmowanie ditheru"
+
+msgid "Screen Filter"
+msgstr "Filtr ekranowy"
+
+msgid "Render threads"
+msgstr "Wątki renderowania"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Adres początkowy"
+
+msgid "Contiguous Size"
+msgstr "Przyległy rozmiar"
+
+msgid "I/O Width"
+msgstr "Szerokość wejścia/wyjścia"
+
+msgid "Transfer Speed"
+msgstr "Prędkość transferu"
+
+msgid "EMS mode"
+msgstr "Tryb EMS"
+
+msgid "EMS Address"
+msgstr "Adres EMS"
+
+msgid "EMS 1 Address"
+msgstr "Adres EMS 1"
+
+msgid "EMS 2 Address"
+msgstr "Adres EMS 2"
+
+msgid "EMS Memory Size"
+msgstr "Rozmiar pamięci EMS"
+
+msgid "EMS 1 Memory Size"
+msgstr "Rozmiar pamięci EMS 1"
+
+msgid "EMS 2 Memory Size"
+msgstr "Rozmiar pamięci EMS 2"
+
+msgid "Enable EMS"
+msgstr "Włącz EMS"
+
+msgid "Enable EMS 1"
+msgstr "Włącz EMS 1"
+
+msgid "Enable EMS 2"
+msgstr "Włącz EMS 2"
+
+msgid "Address for > 2 MB"
+msgstr "Adres dla > 2 MB"
+
+msgid "Frame Address"
+msgstr "Adres ramki"
+
+msgid "USA"
+msgstr "USA"
+
+msgid "Danish"
+msgstr "Duński"
+
+msgid "Always at selected speed"
+msgstr "Zawsze z wybraną prędkością"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "Ustawienia BIOS + klawisze skrótu (wyłączone podczas testu POST)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 KB począwszy od F0000"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 KB począwszy od E0000 (adres MSB odwrócony, najpierw ostatnie 64 KB)"
+
+msgid "Sine"
+msgstr "Sinusoidalny"
+
+msgid "Triangle"
+msgstr "Trójkątny"
+
+msgid "Linear"
+msgstr "Liniowy"
+
+msgid "4th Order"
+msgstr "4. rzędu"
+
+msgid "7th Order"
+msgstr "7. rzędu"
+
+msgid "Non-timed (original)"
+msgstr "Bez timera (oryginał)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (bez zworki na JMP2)"
+
+msgid "Two"
+msgstr "Dwa"
+
+msgid "Three"
+msgstr "Trzy"
+
+msgid "Wheel"
+msgstr "Rolka"
+
+msgid "Five + Wheel"
+msgstr "Pięć + rolka"
+
+msgid "Five + 2 Wheels"
+msgstr "Pięć + dwie rolki"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 szeregowa / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) szeregowa"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "Wyłącz BIOS"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2 MB"
+
+msgid "8 MB"
+msgstr "8 MB"
+
+msgid "28 MB"
+msgstr "28 MB"
+
+msgid "1 MB"
+msgstr "1 MB"
+
+msgid "4 MB"
+msgstr "4 MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16 MB"
+
+msgid "20 MB"
+msgstr "20 MB"
+
+msgid "24 MB"
+msgstr "24 MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (stereo)"
+
+msgid "Classic"
+msgstr "Klasyczny"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "Kompozyt"
+
+msgid "True color"
+msgstr "Prawdziwy kolor"
+
+msgid "Old"
+msgstr "Stary"
+
+msgid "New"
+msgstr "Nowość"
+
+msgid "Color (generic)"
+msgstr "Kolorowy (generyczny)"
+
+msgid "Green Monochrome"
+msgstr "Zielony monochromatyczny"
+
+msgid "Amber Monochrome"
+msgstr "Bursztynowy monochromatyczny"
+
+msgid "Gray Monochrome"
+msgstr "Szary monochromatyczny"
+
+msgid "Color (no brown)"
+msgstr "Kolorowy (bez brązowego)"
+
+msgid "Color (IBM 5153)"
+msgstr "Kolorowy (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Proste podwojenie"
+
+msgid "sRGB interpolation"
+msgstr "Interpolacja sRGB"
+
+msgid "Linear interpolation"
+msgstr "Interpolacja liniowa"
+
+msgid "Has secondary 8x8 character set"
+msgstr "Posiada pomocniczy zestaw znaków 8x8"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Posiada płytę rozszerzeń Quadcolor II"
+
+msgid "Alternate monochrome contrast"
+msgstr "Alternatywny kontrast monochromatyczny"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Monochromatyczny (5151/MDA) (biały)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Monochromatyczny (5151/MDA) (zielony)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Monochromatyczny (5151/MDA) (bursztynowy)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Kolor 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Kolor 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Rozszerzony kolor - tryb zwykły (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Rozszerzony kolor - tryb rozszerzony (5154/ECD)"
+
+msgid "Green"
+msgstr "Zielony"
+
+msgid "Amber"
+msgstr "Bursztynowy"
+
+msgid "Gray"
+msgstr "Szary"
+
+msgid "Grayscale"
+msgstr "Skala odcieni szarości"
+
+msgid "Color"
+msgstr "Kolorowy"
+
+msgid "U.S. English"
+msgstr "Angielski (USA)"
+
+msgid "Scandinavian"
+msgstr "Skandynawski"
+
+msgid "Other languages"
+msgstr "Inne języki"
+
+msgid "Bochs latest"
+msgstr "Najnowszy Bochs"
+
+msgid "Apply overscan deltas"
+msgstr "Zastosuj delty overscanu"
+
+msgid "Mono Interlaced"
+msgstr "Monochromatyczny z przeplotem"
+
+msgid "Mono Non-Interlaced"
+msgstr "Monochromatyczny bez przeplotu"
+
+msgid "Color Interlaced"
+msgstr "Kolorowy z przeplotem"
+
+msgid "Color Non-Interlaced"
+msgstr "Kolor bez przeplotu"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "Grafika 3Dfx Voodoo"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 jednostki TMU)"
+
+msgid "8-bit"
+msgstr "8-bitowy"
+
+msgid "16-bit"
+msgstr "16-bitowy"
+
+msgid "Standard (150ns)"
+msgstr "Standard (150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "Wysoka prędkość (120ns)"
+
+msgid "Enabled"
+msgstr "Włączone"
+
+msgid "Standard"
+msgstr "Standard"
+
+msgid "High-Speed"
+msgstr "Wysoka prędkość"
+
+msgid "Stereo LPT DAC"
+msgstr "Stereo LPT DAC"
+
+msgid "Generic Text Printer"
+msgstr "Generyczna drukarka tekstowa"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Generyczna drukarka igłowa ESC/P 2"
+
+msgid "Generic PostScript Printer"
+msgstr "Generyczna drukarka PostScript"
+
+msgid "Generic PCL5e Printer"
+msgstr "Generyczna drukarka PCL5e"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Parallel Line Internet Protocol"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Klucz ochronny dla Savage Quest"
+
+msgid "Serial Passthrough Device"
+msgstr "Urządzenie przelotowe portu szeregowego"
+
+msgid "Passthrough Mode"
+msgstr "Tryb przelotowy"
+
+msgid "Host Serial Device"
+msgstr "Urządzenie szeregowe hosta"
+
+msgid "Name of pipe"
+msgstr "Nazwa potoku"
+
+msgid "Data bits"
+msgstr "Bity danych"
+
+msgid "Stop bits"
+msgstr "Bity stopu"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Szybkość transmisji przelotowej"
+
+msgid "Named Pipe (Server)"
+msgstr "Nazwany potok (serwer)"
+
+msgid "Named Pipe (Client)"
+msgstr "Nazwany potok (klient)"
+
+msgid "Host Serial Passthrough"
+msgstr "Przelot przez port szeregowy hosta"
+
+msgid "E&ject %1"
+msgstr "W&yjmij %1"
+
+msgid "&Unmute"
+msgstr "&Odcisz"
+
+msgid "Softfloat FPU"
+msgstr "FPU Softfloat"
+
+msgid "High performance impact"
+msgstr "Wysoki wpływ na wydajność"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[generyczny] Dysk RAM (maks. prędkość)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[generyczny] 1989 (3500 RPM)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[generyczny] 1992 (3600 RPM)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[generyczny] 1994 (4500 RPM)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[generyczny] 1996 (5400 RPM)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[generyczny] 1997 (5400 RPM)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[generyczny] 1998 (5400 RPM)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[generyczny] 2000 (7200 RPM)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "Klon IBM 8514/A (ISA)"
+
+msgid "Vendor"
+msgstr "Producent"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Generyczne rozszerzenie pamięci PC/XT"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Generyczne rozszerzenie pamięci PC/AT"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "Nie można znaleźć fontów igłowych"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "Fonty TrueType w katalogu „roms/printer/fonts” są wymagane do emulacji generycznej drukarki igłowej ESC/P 2."
+
+msgid "Inhibit multimedia keys"
+msgstr "Przejmij klawisze multimedialne"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Pytaj o potwierdzenie przed zapisaniem ustawień"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Pytaj o potwierdzenie przed twardym resetem"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Pytaj o potwierdzenie przed wyjściem"
+
+msgid "Options"
+msgstr "Opcje"
+
+msgid "Model"
+msgstr "Model"
+
+msgid "Model:"
+msgstr "Model:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Nie udało się zainicjować renderera Vulkan."
+
+msgid "GLSL Error"
+msgstr "Błąd GLSL"
+
+msgid "Could not load shader: %1"
+msgstr "Nie udało się wczytać shadera: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "Wymagana jest wersja OpenGL 3.0 lub wyższa. Aktualna wersja GLSL to %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "Nie udało się wczytać tekstury: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "Nie udało się skompilować shadera:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "Program niezalinkowany:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "Menedżer shaderów"
+
+msgid "Shader Configuration"
+msgstr "Konfiguracja shadera"
+
+msgid "Add"
+msgstr "Dodaj"
+
+msgid "Move up"
+msgstr "Przesuń w górę"
+
+msgid "Move down"
+msgstr "Przesuń w dół"
+
+msgid "Could not load file %1"
+msgstr "Nie można wczytać pliku %1"
+
+msgid "Key Bindings:"
+msgstr "Przypisania klawiszy:"
+
+msgid "Action"
+msgstr "Akcja"
+
+msgid "Keybind"
+msgstr "Przypisane klawisze"
+
+msgid "Clear binding"
+msgstr "Wyczyść przypisanie"
+
+msgid "Bind"
+msgstr "Przypisanie"
+
+msgid "Bind Key"
+msgstr "Przypisanie klawiszy"
+
+msgid "Enter key combo:"
+msgstr "Wciśnij kombinację klawiszy:"
+
+msgid "Bind conflict"
+msgstr "Konflikt przypisań"
+
+msgid "This key combo is already in use."
+msgstr "Ta kombinacja klawiszy jest już w użyciu."
+
+msgid "Send Control+Alt+Del"
+msgstr "Wyślij Control+Alt+Del"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Wyślij Control+Alt+Escape"
+
+msgid "Toggle fullscreen"
+msgstr "Przełącz pełny ekran"
+
+msgid "Screenshot"
+msgstr "Zrzut ekranu"
+
+msgid "Release mouse pointer"
+msgstr "Wypuść wskaźnik myszy"
+
+msgid "Toggle pause"
+msgstr "Przełącz pauzę"
+
+msgid "Toggle mute"
+msgstr "Przełącz wyciszenie"
+
+msgid "Text files"
+msgstr "Pliki tekstowe"
+
+msgid "ROM files"
+msgstr "Pliki ROM"
+
+msgid "SoundFont files"
+msgstr "Pliki SoundFont"
+
+msgid "Local Switch"
+msgstr "Switch lokalny"
+
+msgid "Remote Switch"
+msgstr "Switch zdalny"
+
+msgid "Switch:"
+msgstr "Switch:"
+
+msgid "Hub Mode"
+msgstr "Tryb hub"
+
+msgid "Hostname:"
+msgstr "Nazwa komputera:"
+
+msgid "ISA RAM:"
+msgstr "ISA RAM:"
+
+msgid "ISA ROM:"
+msgstr "ISA ROM:"
+
+msgid "&Wipe NVRAM"
+msgstr "&Wyczyść NVRAM"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "To usunie wszystkie pliki NVRAM (i powiązane) maszyny wirtualnej, zlokalizowane w podkatalogu „nvr”. Będziesz musieć przekonfigurować BIOS (i prawdopodobnie inne urządzenia w maszynie wirtualnej), jeśli dotyczy.\n\nCzy na pewno chcesz wyczyścić całą zawartość NVRAM maszyny wirtualnej \"%1\"?"
+
+msgid "Success"
+msgstr "Sukces"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "Pomyślnie wyczyszczono zawartość NVRAM maszyny wirtualnej „%1”"
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "Wystąpił błąd podczas próby wyczyszczenia zawartości NVRAM maszyny wirtualnej „%1”"
+
+msgid "%1 VM Manager"
+msgstr "Menedżer maszyn wirtualnych %1"
+
+msgid "%n disk(s)"
+msgstr "%n dysk(i/ów)"
+
+msgid "Unknown Status"
+msgstr "Status nieznany"
+
+msgid "No Machines Found!"
+msgstr "Nie znaleziono maszyn!"
+
+msgid "Check for updates on startup"
+msgstr "Sprawdzaj aktualizacje przy starcie"
+
+msgid "Unable to determine release information"
+msgstr "Nie udało się ustalić informacji o wydaniu"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Wystąpił błąd podczas sprawdzania aktualizacji:\n\n%1\n\nSpróbuj ponownie później."
+
+msgid "Update check complete"
+msgstr "Sprawdzanie aktualizacji ukończone"
+
+msgid "stable"
+msgstr "stabilnej"
+
+msgid "beta"
+msgstr "beta"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Używasz najnowszej wersji %1 86Boxa: %2"
+
+msgid "version"
+msgstr "wersja"
+
+msgid "build"
+msgstr "kompilacja"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Aktualnie używasz wersji <b>%1</b>."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "<b>Wersja %1</b> jest teraz dostępna."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Aktualnie używasz kompilacji <b>%1</b>."
+
+msgid "<b>Build %1</b> is now available."
+msgstr "<b>Kompilacja %1</b> jest teraz dostępna."
+
+msgid "Would you like to visit the download page?"
+msgstr "Czy chcesz odwiedzić stronę pobierania?"
+
+msgid "Visit download page"
+msgstr "Odwiedź stronę pobierania"
+
+msgid "Update check"
+msgstr "Sprawdzanie aktualizacji"
+
+msgid "Checking for updates..."
+msgstr "Sprawdzanie aktualizacji..."
+
+msgid "86Box Update"
+msgstr "Aktualizacja 86Boxa"
+
+msgid "Release notes:"
+msgstr "Uwagi do wydania:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "Awaria maszyny wirtualnej"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "Proces maszyny wirtualnej „%1” zakończył się nieoczekiwanie z kodem błędu %2."
+
+msgid "The system will not be added."
+msgstr "System nie będzie dodany."
+
+msgid "&Update mouse every CPU frame"
+msgstr "Aktualizuj &mysz z każdą ramką CPU"
+
+msgid "Hue"
+msgstr "Barwa"
+
+msgid "Saturation"
+msgstr "Nasycenie"
+
+msgid "Contrast"
+msgstr "Kontrast"
+
+msgid "Brightness"
+msgstr "Jasność"
+
+msgid "Sharpness"
+msgstr "Ostrość"
+
+msgid "&CGA composite settings..."
+msgstr "Ustawienia trybu kompozytowego &CGA..."
+
+msgid "CGA composite settings"
+msgstr "Ustawienia trybu kompozytowego CGA"
+
+msgid "Monitor EDID"
+msgstr "EDID monitora"
+
+msgid "Export..."
+msgstr "Eksportuj..."
+
+msgid "Export EDID"
+msgstr "Eksportuj EDID"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "Plik EDID \"%ls\" jest zbyt duży."
+
+msgid "OpenGL input scale"
+msgstr "Skala wejściowa OpenGL"
+
+msgid "OpenGL input stretch mode"
+msgstr "Tryb rozciągania wejściowego OpenGL"
+
+msgid "Color scheme"
+msgstr "Schemat kolorów"
+
+msgid "Light"
+msgstr "Światło"
+
+msgid "Dark"
+msgstr "Ciemny"
diff --git a/src/qt/languages/pt-BR.po b/src/qt/languages/pt-BR.po
index c06f24835..63a17871b 100644
--- a/src/qt/languages/pt-BR.po
+++ b/src/qt/languages/pt-BR.po
@@ -1,17 +1,25 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: pt_BR\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
 msgstr "&Ação"
 
 msgid "&Keyboard requires capture"
-msgstr "&Teclado requer captura"
+msgstr "O &teclado requer captura"
 
 msgid "&Right CTRL is left ALT"
-msgstr "CTRL &direito é o ALT esquerdo"
+msgstr "CTR&L direito é o ALT esquerdo"
 
 msgid "&Hard Reset..."
 msgstr "&Reinicialização completa..."
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Ctrl+Alt+Del\tCtrl+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+&Del"
 
 msgid "Ctrl+Alt+&Esc"
 msgstr "Ctrl+Alt+&Esc"
@@ -19,17 +27,23 @@ msgstr "Ctrl+Alt+&Esc"
 msgid "&Pause"
 msgstr "&Pausar"
 
-msgid "E&xit..."
-msgstr "&Sair..."
+msgid "Pause"
+msgstr "Pausa"
+
+msgid "Re&sume"
+msgstr "&Continuar"
+
+msgid "E&xit"
+msgstr "&Sair"
 
 msgid "&View"
 msgstr "&Exibir"
 
 msgid "&Hide status bar"
-msgstr "&Ocultar barra de status"
+msgstr "Ocultar barra de &status"
 
 msgid "Hide &toolbar"
-msgstr "Ocultar &barra de ferramenta"
+msgstr "Ocultar barra de &ferramentas"
 
 msgid "&Resizeable window"
 msgstr "&Janela redimensionável"
@@ -40,14 +54,8 @@ msgstr "&Lembrar tamanho e posição"
 msgid "Re&nderer"
 msgstr "&Renderizador"
 
-msgid "&SDL (Software)"
-msgstr "&SDL (Software)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (&Hardware)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
+msgid "&Qt (Software)"
+msgstr "&Qt (Software)"
 
 msgid "Open&GL (3.0 Core)"
 msgstr "Open&GL (Núcleo 3.0)"
@@ -55,14 +63,14 @@ msgstr "Open&GL (Núcleo 3.0)"
 msgid "&VNC"
 msgstr "&VNC"
 
-msgid "Specify dimensions..."
-msgstr "Especificar as dimensões..."
+msgid "Specify &dimensions..."
+msgstr "Especificar as dime&nsões..."
 
-msgid "F&orce 4:3 display ratio"
-msgstr "F&orçar proporção de tela em 4:3"
+msgid "Force &4:3 display ratio"
+msgstr "Forçar proporção de tela em &4:3"
 
 msgid "&Window scale factor"
-msgstr "&Fator de redimensionamento da janela"
+msgstr "F&ator de redimensionamento da janela"
 
 msgid "&0.5x"
 msgstr "&0,5x"
@@ -94,8 +102,8 @@ msgstr "&7x"
 msgid "&8x"
 msgstr "&8x"
 
-msgid "Filter method"
-msgstr "Método de filtragem"
+msgid "Fi&lter method"
+msgstr "Método d&e filtragem"
 
 msgid "&Nearest"
 msgstr "&Mais próximo"
@@ -104,22 +112,22 @@ msgid "&Linear"
 msgstr "&Linear"
 
 msgid "Hi&DPI scaling"
-msgstr "Escala Hi&DPI"
+msgstr "Escala &HiDPI"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "&Tela cheia\tCtrl+Alt+PgUp"
+msgid "&Fullscreen"
+msgstr "&Tela cheia"
 
 msgid "Fullscreen &stretch mode"
-msgstr "Modo de &redimensionamento da tela cheia"
+msgstr "Modo de re&dimensionamento da tela cheia"
 
 msgid "&Full screen stretch"
-msgstr "&Tela cheia esticada"
+msgstr "&Tela cheia redimensionada"
 
 msgid "&4:3"
 msgstr "&4:3"
 
 msgid "&Square pixels (Keep ratio)"
-msgstr "Pixel&s quadrados (manter proporção)"
+msgstr "Píxeis &quadrados (manter proporção)"
 
 msgid "&Integer scale"
 msgstr "&Redimensionamento com valores inteiros"
@@ -127,8 +135,8 @@ msgstr "&Redimensionamento com valores inteiros"
 msgid "4:&3 Integer scale"
 msgstr "Redimensionamento com valores inteiros 4:&3"
 
-msgid "E&GA/(S)VGA settings"
-msgstr "Configurações E&GA/(S)VGA"
+msgid "EGA/(S)&VGA settings"
+msgstr "Configurações de EGA/(S)&VGA"
 
 msgid "&Inverted VGA monitor"
 msgstr "Monitor VGA &invertido"
@@ -137,13 +145,19 @@ msgid "VGA screen &type"
 msgstr "&Tipo de tela VGA"
 
 msgid "RGB &Color"
-msgstr "&Cores RGB"
+msgstr "&Cor RGB"
+
+msgid "RGB (no brown)"
+msgstr "RGB (sem marrom)"
 
 msgid "&RGB Grayscale"
 msgstr "Tons de cinza &RGB"
 
+msgid "Generic RGBI color monitor"
+msgstr "Monitor colorido RGBI genérico"
+
 msgid "&Amber monitor"
-msgstr "Monitor &âmbar"
+msgstr "Monitor âmb&ar"
 
 msgid "&Green monitor"
 msgstr "Monitor &verde"
@@ -178,11 +192,17 @@ msgstr "&Ferramentas"
 msgid "&Settings..."
 msgstr "&Configurações..."
 
+msgid "Settings..."
+msgstr "Configurações..."
+
 msgid "&Update status bar icons"
 msgstr "&Atualizar ícones da barra de status"
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "Capturar &tela\tCtrl+F11"
+msgid "Take s&creenshot"
+msgstr "Capturar &tela"
+
+msgid "S&ound"
+msgstr "&Som"
 
 msgid "&Preferences..."
 msgstr "&Preferências..."
@@ -193,14 +213,14 @@ msgstr "Ativar integração com o &Discord"
 msgid "Sound &gain..."
 msgstr "&Ganho de som..."
 
-msgid "Begin trace\tCtrl+T"
-msgstr "Inicio do rastreamento\tCtrl+T"
+msgid "Begin trace"
+msgstr "Inicio do rastreamento"
 
-msgid "End trace\tCtrl+T"
-msgstr "Fim do rastreamento\tCtrl+T"
+msgid "End trace"
+msgstr "Finalizar rastreamento"
 
 msgid "&Help"
-msgstr "&Ajuda"
+msgstr "Aj&uda"
 
 msgid "&Documentation..."
 msgstr "&Documentação..."
@@ -215,7 +235,7 @@ msgid "&Existing image..."
 msgstr "&Imagem existente..."
 
 msgid "Existing image (&Write-protected)..."
-msgstr "Imagem existente (&protegida contra escrita)..."
+msgstr "Imagem existente (&protegida contra gravação)..."
 
 msgid "&Record"
 msgstr "&Gravar"
@@ -224,7 +244,7 @@ msgid "&Play"
 msgstr "&Reproduzir"
 
 msgid "&Rewind to the beginning"
-msgstr "&Rebobinar até o começo"
+msgstr "Re&troceder até o começo"
 
 msgid "&Fast forward to the end"
 msgstr "&Avançar até o fim"
@@ -239,19 +259,19 @@ msgid "E&xport to 86F..."
 msgstr "E&xportar para 86F..."
 
 msgid "&Mute"
-msgstr "&Sem som"
+msgstr "&Silenciar"
 
 msgid "E&mpty"
 msgstr "&Vazio"
 
-msgid "&Reload previous image"
-msgstr "&Recarregar imagem anterior"
+msgid "Reload previous image"
+msgstr "Recarregar imagem anterior"
 
 msgid "&Folder..."
 msgstr "&Pasta..."
 
 msgid "Target &framerate"
-msgstr "&Taxa de quadro pretendida"
+msgstr "&Taxa de quadros pretendida"
 
 msgid "&Sync with video"
 msgstr "&Sincronizar com vídeo"
@@ -293,7 +313,7 @@ msgid "Settings"
 msgstr "Configurações"
 
 msgid "Specify Main Window Dimensions"
-msgstr "Especifique as dimensões da janela principal"
+msgstr "Especificar dimensões da janela principal"
 
 msgid "OK"
 msgstr "OK"
@@ -301,18 +321,12 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Cancelar"
 
-msgid "Save these settings as &global defaults"
-msgstr "Usar estas configurações como &padrões globais"
-
 msgid "&Default"
 msgstr "&Padrão"
 
 msgid "Language:"
 msgstr "Idioma:"
 
-msgid "Icon set:"
-msgstr "Pacote de ícones:"
-
 msgid "Gain"
 msgstr "Ganho"
 
@@ -346,11 +360,14 @@ msgstr "Máquina:"
 msgid "Configure"
 msgstr "Configurar"
 
+msgid "CPU:"
+msgstr "Processador:"
+
 msgid "CPU type:"
 msgstr "Tipo de CPU:"
 
 msgid "Speed:"
-msgstr "Veloc.:"
+msgstr "Velocidade:"
 
 msgid "Frequency:"
 msgstr "Frequência:"
@@ -368,7 +385,7 @@ msgid "Memory:"
 msgstr "Memória:"
 
 msgid "Time synchronization"
-msgstr "Sincronização da hora"
+msgstr "Sincronização de hora"
 
 msgid "Disabled"
 msgstr "Desativar"
@@ -382,11 +399,23 @@ msgstr "Ativar (UTC)"
 msgid "Dynamic Recompiler"
 msgstr "Recompilador dinâmico"
 
+msgid "CPU frame size"
+msgstr "Tamanho do quadro da CPU"
+
+msgid "Larger frames (less smooth)"
+msgstr "Quadros maiores (menos suave)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Quadros menores (mais suave)"
+
 msgid "Video:"
 msgstr "Vídeo:"
 
-msgid "Voodoo Graphics"
-msgstr "3DFX Voodoo"
+msgid "Video #2:"
+msgstr "Vídeo nº 2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Gráficos Voodoo 1 ou 2"
 
 msgid "IBM 8514/A Graphics"
 msgstr "Gráficos IBM 8514/A"
@@ -394,12 +423,27 @@ msgstr "Gráficos IBM 8514/A"
 msgid "XGA Graphics"
 msgstr "Gráficos XGA"
 
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "Gráficos do Adaptador de Vídeo IBM PS/55"
+
+msgid "Keyboard:"
+msgstr "Teclado:"
+
+msgid "Keyboard"
+msgstr "Teclado"
+
 msgid "Mouse:"
 msgstr "Mouse:"
 
+msgid "Mouse"
+msgstr "Mouse"
+
 msgid "Joystick:"
 msgstr "Joystick:"
 
+msgid "Joystick"
+msgstr "Joystick"
+
 msgid "Joystick 1..."
 msgstr "Joystick 1..."
 
@@ -413,16 +457,16 @@ msgid "Joystick 4..."
 msgstr "Joystick 4..."
 
 msgid "Sound card #1:"
-msgstr "Placa de som 1:"
+msgstr "Placa de som nº 1:"
 
 msgid "Sound card #2:"
-msgstr "Placa de som 2:"
+msgstr "Placa de som nº 2:"
 
 msgid "Sound card #3:"
-msgstr "Placa de som 3:"
+msgstr "Placa de som nº 3:"
 
 msgid "Sound card #4:"
-msgstr "Placa de som 4:"
+msgstr "Placa de som nº 4:"
 
 msgid "MIDI Out Device:"
 msgstr "Disp. de saída MIDI:"
@@ -430,6 +474,9 @@ msgstr "Disp. de saída MIDI:"
 msgid "MIDI In Device:"
 msgstr "Disp. de entrada MIDI:"
 
+msgid "MIDI Out:"
+msgstr "Saída MIDI:"
+
 msgid "Standalone MPU-401"
 msgstr "MPU-401 autônomo"
 
@@ -437,7 +484,7 @@ msgid "Use FLOAT32 sound"
 msgstr "Usar som FLOAT32"
 
 msgid "FM synth driver"
-msgstr "Controlador de sint. FM"
+msgstr "Driver de sintetizador FM"
 
 msgid "Nuked (more accurate)"
 msgstr "Nuked (mais preciso)"
@@ -445,15 +492,6 @@ msgstr "Nuked (mais preciso)"
 msgid "YMFM (faster)"
 msgstr "YMFM (mais rápido)"
 
-msgid "Network type:"
-msgstr "Tipo de rede:"
-
-msgid "PCap device:"
-msgstr "Dispositivo PCap:"
-
-msgid "Network adapter:"
-msgstr "Adaptador de rede:"
-
 msgid "COM1 Device:"
 msgstr "Dispositivo COM1:"
 
@@ -478,6 +516,9 @@ msgstr "Dispositivo LPT3:"
 msgid "LPT4 Device:"
 msgstr "Dispositivo LPT4:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr "DMA ECP LPT Interna:"
+
 msgid "Serial port 1"
 msgstr "Porta serial 1"
 
@@ -502,11 +543,11 @@ msgstr "Porta paralela 3"
 msgid "Parallel port 4"
 msgstr "Porta paralela 4"
 
-msgid "HD Controller:"
-msgstr "Controlador HD:"
-
 msgid "FD Controller:"
-msgstr "Controlador FD:"
+msgstr "Controlador de disquete:"
+
+msgid "CD-ROM Controller:"
+msgstr "Controlador de CD-ROM:"
 
 msgid "Tertiary IDE Controller"
 msgstr "Controlador IDE terciário"
@@ -514,6 +555,9 @@ msgstr "Controlador IDE terciário"
 msgid "Quaternary IDE Controller"
 msgstr "Controlador IDE quaternário"
 
+msgid "Hard disk"
+msgstr "Disco rígido"
+
 msgid "SCSI"
 msgstr "SCSI"
 
@@ -535,6 +579,9 @@ msgstr "Cassete"
 msgid "Hard disks:"
 msgstr "Discos rígidos:"
 
+msgid "Firmware Version"
+msgstr "Versão do Firmware"
+
 msgid "&New..."
 msgstr "&Novo..."
 
@@ -589,14 +636,17 @@ msgstr "Verificar BPB"
 msgid "CD-ROM drives:"
 msgstr "Unidades de CD-ROM:"
 
-msgid "Earlier drive"
-msgstr "Unidade anterior"
-
 msgid "MO drives:"
 msgstr "Unidades magneto-ópticas:"
 
-msgid "ZIP drives:"
-msgstr "Unidades ZIP:"
+msgid "MO:"
+msgstr "Magneto-ópticas:"
+
+msgid "Removable disks:"
+msgstr "Discos removíveis:"
+
+msgid "Removable disk drives:"
+msgstr "Unidades de disco removível:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
@@ -607,6 +657,9 @@ msgstr "RTC ISA:"
 msgid "ISA Memory Expansion"
 msgstr "Expansão de memória ISA"
 
+msgid "ISA ROM Cards"
+msgstr "Placas ROM ISA"
+
 msgid "Card 1:"
 msgstr "Placa 1:"
 
@@ -619,18 +672,21 @@ msgstr "Placa 3:"
 msgid "Card 4:"
 msgstr "Placa 4:"
 
+msgid "Generic ISA ROM Board"
+msgstr "Placa de ROM ISA Genérica"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "Placa de ROM ISA Dupla Genérica"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "Placa de ROM ISA Quádrupla Genérica"
+
 msgid "ISABugger device"
 msgstr "Dispositivo ISABugger"
 
 msgid "POST card"
 msgstr "Placa de diagnóstico"
 
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
-
 msgid "86Box"
 msgstr "86Box"
 
@@ -643,20 +699,23 @@ msgstr "Erro fatal"
 msgid " - PAUSED"
 msgstr " - PAUSADO"
 
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Use Ctrl+Alt+PgDn para retornar ao modo janela"
-
 msgid "Speed"
 msgstr "Velocidade"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "Disco removível %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "Imagens ZIP"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "Disco &removível %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Imagens de disco removível"
+
+msgid "Image %1"
+msgstr "Imagem %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
-msgstr "O 86Box não conseguiu encontrar nenhuma imagem de ROM utilizável.\n\nPor favor, <a href=\"https://github.com/86Box/roms/releases/latest\">baixe</a> um conjunto de ROM e extraia no diretório \"roms\"."
+msgstr "O 86Box não conseguiu encontrar nenhuma imagem de ROM utilizável.\n\nPor favor, <a href=\"https://github.com/86Box/roms/releases/latest\">baixe</a> um conjunto de ROMs e extraia-o para o diretório \"roms\"."
 
 msgid "(empty)"
 msgstr "(vazio)"
@@ -677,7 +736,7 @@ msgid "All images"
 msgstr "Todas as imagens"
 
 msgid "Basic sector images"
-msgstr "Imagens de setor básico"
+msgstr "Imagens de setores básicos"
 
 msgid "Surface images"
 msgstr "Imagens de superfície"
@@ -688,6 +747,12 @@ msgstr "A máquina \"%hs\" não está disponível devido à falta de ROMs no dir
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
 msgstr "A placa de vídeo \"%hs\" não está disponível devido à falta de ROMs no diretório roms/video. Mudando para uma placa de vídeo disponível."
 
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "A placa de vídeo 2 \"%hs\" não está disponível devido à falta de ROMs no diretório roms/video. Desativando a segunda placa de vídeo."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "O dispositivo \"%hs\" não está disponível devido à falta de ROMs. Ignorando o dispositivo."
+
 msgid "Machine"
 msgstr "Máquina"
 
@@ -706,12 +771,30 @@ msgstr "Rede"
 msgid "Ports (COM & LPT)"
 msgstr "Portas (COM & LPT)"
 
+msgid "Ports"
+msgstr "Portas"
+
+msgid "Serial ports:"
+msgstr "Portas seriais:"
+
+msgid "Parallel ports:"
+msgstr "Portas Paralelas:"
+
 msgid "Storage controllers"
 msgstr "Controladores de armaz."
 
 msgid "Hard disks"
 msgstr "Discos rígidos"
 
+msgid "Disks:"
+msgstr "Discos:"
+
+msgid "Floppy:"
+msgstr "Disquete:"
+
+msgid "Controllers:"
+msgstr "Controladores:"
+
 msgid "Floppy & CD-ROM drives"
 msgstr "Disquete & CD-ROM"
 
@@ -721,14 +804,17 @@ msgstr "Dispos. removíveis"
 msgid "Other peripherals"
 msgstr "Outros periféricos"
 
+msgid "Other devices"
+msgstr "Outros dispositivos"
+
 msgid "Click to capture mouse"
 msgstr "Clique para capturar o mouse"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "Aperte F8+F12 para liberar o mouse"
+msgid "Press %1 to release mouse"
+msgstr "Aperte %1 para liberar o mouse"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Aperte F8+F12 ou botão do meio para liberar o mouse"
+msgid "Press %1 or middle button to release mouse"
+msgstr "Aperte %1 ou botão do meio para liberar o mouse"
 
 msgid "Bus"
 msgstr "Barramento"
@@ -748,65 +834,89 @@ msgstr "SE"
 msgid "KB"
 msgstr "KB"
 
-msgid "Could not initialize the video renderer."
-msgstr "Não foi possível inicializar o renderizador de vídeo."
-
 msgid "Default"
 msgstr "Padrão"
 
-msgid "%i Wait state(s)"
-msgstr "%i estado(s) de espera"
+msgid "%1 Wait state(s)"
+msgstr "%1 estado(s) de espera"
 
 msgid "Type"
 msgstr "Tipo"
 
-msgid "Failed to set up PCap"
-msgstr "Não foi possível configurar o PCap"
-
 msgid "No PCap devices found"
 msgstr "Nenhum dispositivo PCap encontrado"
 
 msgid "Invalid PCap device"
 msgstr "Dispositivo PCap inválido"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "Joystick padrão de 2 botões"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "Joystick(s) de 2 eixos, 2 botões"
 
-msgid "Standard 4-button joystick"
-msgstr "Joystick padrão de 4 botões"
+msgid "2-axis, 4-button joystick"
+msgstr "Joystick de 2 eixos, 4 botões"
 
-msgid "Standard 6-button joystick"
-msgstr "Joystick padrão de 6 botões"
+msgid "2-axis, 6-button joystick"
+msgstr "Joystick de 2 eixos, 6 botões"
 
-msgid "Standard 8-button joystick"
-msgstr "Joystick padrão de 8 botões"
+msgid "2-axis, 8-button joystick"
+msgstr "Joystick de 2 eixos, 8 botões"
+
+msgid "3-axis, 2-button joystick"
+msgstr "Joystick de 3 eixos, 2 botões"
+
+msgid "3-axis, 4-button joystick"
+msgstr "Joystick de 3 eixos, 4 botões"
+
+msgid "4-axis, 4-button joystick"
+msgstr "Joystick de 4 eixos, 4 botões"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + Pedais CH"
+
 msgid "Microsoft SideWinder Pad"
 msgstr "Microsoft SideWinder Pad"
 
 msgid "Thrustmaster Flight Control System"
 msgstr "Sistema de Controle de Voo Thrustmaster"
 
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "SCV Thrustmaster + Sistema de Controle de Leme"
+
+msgid "2-button gamepad(s)"
+msgstr "Gamepad(s) de 2 botões"
+
+msgid "2-button flight yoke"
+msgstr "Manche de voo de 2 botões"
+
+msgid "4-button gamepad"
+msgstr "Gamepad de 4 botões"
+
+msgid "4-button flight yoke"
+msgstr "Manche de voo de 4 botões"
+
+msgid "2-button flight yoke with throttle"
+msgstr "Manche de voo de 2 botões com acelerador"
+
+msgid "4-button flight yoke with throttle"
+msgstr "Manche de voo de 4 botões com acelerador"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Volante Win95 (3 eixos, 4 botões)"
+
 msgid "None"
-msgstr "Nada"
+msgstr "Nenhum"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "Não foi possível carregar os aceleradores do teclado."
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CCS: %2, %3, %4)"
 
-msgid "Unable to register raw input."
-msgstr "Não foi possível registrar a entrada bruta."
+msgid "Floppy %1 (%2): %3"
+msgstr "Disquete %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Disquete %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "&Disquete %1 (%2): %3"
 
 msgid "Advanced sector images"
 msgstr "Imagens de setor avançado"
@@ -814,9 +924,6 @@ msgstr "Imagens de setor avançado"
 msgid "Flux images"
 msgstr "Imagens de fluxo"
 
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "Não é possível inicializar o SDL, é necessário o SDL2.dll"
-
 msgid "Are you sure you want to hard reset the emulated machine?"
 msgstr "Tem certeza de que deseja reiniciar completamente a máquina emulada?"
 
@@ -824,10 +931,16 @@ msgid "Are you sure you want to exit 86Box?"
 msgstr "Tem certeza de que deseja sair do 86Box?"
 
 msgid "Unable to initialize Ghostscript"
-msgstr "Não é possível inicializar o Ghostscript"
+msgstr "Não foi possível inicializar o Ghostscript"
 
-msgid "MO %i (%ls): %ls"
-msgstr "Magneto-óptico %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "Não foi possível inicializar o GhostPCL"
+
+msgid "MO %1 (%2): %3"
+msgstr "Magneto-óptico %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&Magneto-óptico %1 (%2): %3"
 
 msgid "MO images"
 msgstr "Imagens magneto-ópticas"
@@ -835,14 +948,23 @@ msgstr "Imagens magneto-ópticas"
 msgid "Welcome to 86Box!"
 msgstr "Bem-vindo ao 86Box!"
 
-msgid "Internal controller"
-msgstr "Controlador interno"
+msgid "Internal device"
+msgstr "Dispositivo interno"
+
+msgid "&File"
+msgstr "&Arquivo"
+
+msgid "&New machine..."
+msgstr "&Nova máquina..."
+
+msgid "&Check for updates..."
+msgstr "&Verificar por atualizações..."
 
 msgid "Exit"
 msgstr "Sair"
 
 msgid "No ROMs found"
-msgstr "Nenhum ROM encontrada"
+msgstr "Nenhuma ROM encontrada"
 
 msgid "Do you want to save the settings?"
 msgstr "Você deseja salvar as configurações?"
@@ -857,37 +979,25 @@ msgid "About 86Box"
 msgstr "Sobre o 86Box"
 
 msgid "86Box v"
-msgstr "86Box versão"
+msgstr "86Box versão "
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "Um emulador de computadores antigos\n\nAutores: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, e outros.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, e outros.\n\nTraduzido por: Altieres Lima da Silva\n\nLançado sob a Licença Pública Geral GNU versão 2 ou posterior. Veja o arquivo LICENSE para mais informações."
+msgstr "Um emulador de computadores antigos\n\nAutores: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, e outros.\n\nCom contribuições anteriores de Sarah Walker, leilei, JohnElliott, greatpsycho, e outros.\n\nTraduzido por: Altieres Lima da Silva, Nelson K. Hennemann Filho\n\nLançado sob a Licença Pública Geral GNU, versão 2 ou posterior. Veja o arquivo LICENSE para mais informações."
 
 msgid "Hardware not available"
 msgstr "Hardware não disponível"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Certifique-se de que libpcap esteja instalado e que você tenha uma conexão de rede compatível com libpcap."
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "Certifique-se de que %1 esteja instalado e que você tenha uma conexão de rede compatível com %1."
 
 msgid "Invalid configuration"
 msgstr "Configuração inválida"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 é necessário para a conversão automática de arquivos PostScript para PDF.\n\nQualquer documento enviado para a impressora genérica PostScript será salvo como arquivos PostScript (.ps)."
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " é necessário para a conversão automática de arquivos PostScript para PDF.\n\nQualquer documento enviado para a impressora genérica PostScript será salvo como arquivos PostScript (.ps)."
-
-msgid "Entering fullscreen mode"
-msgstr "Entrando no modo de tela cheia"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 é necessário para a conversão automática de arquivos PCL para PDF.\n\nQualquer documento enviado para a impressora genérica PCL será salvo como arquivos Printer Command Language (.pcl)."
 
 msgid "Don't show this message again"
 msgstr "Não exibir esta mensagem novamente"
@@ -904,51 +1014,51 @@ msgstr "Não reiniciar"
 msgid "CD-ROM images"
 msgstr "Imagens de CD-ROM"
 
-msgid "%hs Device Configuration"
-msgstr "Configuração do dispositivo %hs"
+msgid "%1 Device Configuration"
+msgstr "Configuração do dispositivo %1"
 
 msgid "Monitor in sleep mode"
 msgstr "Monitor em modo de suspensão"
 
-msgid "OpenGL Shaders"
-msgstr "Shaders OpenGL"
-
-msgid "OpenGL options"
-msgstr "Opções do OpenGL"
+msgid "GLSL shaders"
+msgstr "Shaders GLSL"
 
 msgid "You are loading an unsupported configuration"
 msgstr "Você está carregando uma configuração não suportada"
 
 msgid "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
-msgstr "A filtragem do tipo CPU baseada na máquina selecionada é desativada para esta máquina emulada.\n\nIsto torna possível escolher uma CPU que de outra forma seria incompatível com a máquina selecionada. Entretanto, você pode encontrar incompatibilidades com a BIOS da máquina ou outro software.\n\nA ativação desta configuração não é oficialmente suportada e qualquer relatório de erro arquivado pode ser fechado como inválido."
+msgstr "A filtragem do tipo de CPU baseada na máquina selecionada está desativada para esta máquina emulada.\n\nIsto torna possível escolher uma CPU que, de outra forma, seria incompatível com a máquina selecionada. No entanto, você pode encontrar incompatibilidades com a BIOS da máquina ou outro software.\n\nA ativação desta configuração não é oficialmente suportada, e qualquer relatório de erro arquivado pode ser fechado como inválido."
 
 msgid "Continue"
 msgstr "Continuar"
 
-msgid "Cassette: %s"
-msgstr "Cassete: %s"
+msgid "Cassette: %1"
+msgstr "Cassete: %1"
+
+msgid "C&assette: %1"
+msgstr "C&assete: %1"
 
 msgid "Cassette images"
 msgstr "Imagens de cassete"
 
-msgid "Cartridge %i: %ls"
-msgstr "Cartucho %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "Cartucho %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "Car&tucho %1: %2"
 
 msgid "Cartridge images"
 msgstr "Imagens de cartucho"
 
-msgid "Error initializing renderer"
-msgstr "Erro ao inicializar o renderizador"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "O renderizador OpenGL (Núcleo 3.0) não pôde ser inicializado. Use outro renderizador."
-
 msgid "Resume execution"
 msgstr "Continuar a execução"
 
 msgid "Pause execution"
 msgstr "Pausar a execução"
 
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del"
+
 msgid "Press Ctrl+Alt+Del"
 msgstr "Pressionar Ctrl+Alt+Del"
 
@@ -958,17 +1068,281 @@ msgstr "Pressionar Ctrl+Alt+Esc"
 msgid "Hard reset"
 msgstr "Reinicialização completa"
 
+msgid "Force shutdown"
+msgstr "Forçar desligamento"
+
+msgid "Start"
+msgstr "Iniciar"
+
+msgid "Not running"
+msgstr "Parado"
+
+msgid "Running"
+msgstr "Rodando"
+
+msgid "Paused"
+msgstr "Pausada"
+
+msgid "Waiting"
+msgstr "Esperando"
+
+msgid "Powered Off"
+msgstr "Desligada"
+
+msgid "%n running"
+msgstr "%n executando"
+
+msgid "%n paused"
+msgstr "%n pausada"
+
+msgid "%n waiting"
+msgstr "%n esperando"
+
+msgid "%1 total"
+msgstr "%1 total"
+
+msgid "VMs: %1"
+msgstr "MVs: %1"
+
+msgid "System Directory:"
+msgstr "Diretório do Sistema:"
+
+msgid "Choose directory"
+msgstr "Escolha o diretório"
+
+msgid "Choose configuration file"
+msgstr "Escolha o arquivo de configuração"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "Arquivos de configuração 86Box (86Box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Falha ao ler a configuração"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "Não foi possível abrir o arquivo de configuração selecionado para leitura: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "Usar expressões regulares na caixa de pesquisa"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "%1 máquina(s) estão ativas atualmente. Tem certeza que deseja encerrar o gerenciador de MV mesmo assim?"
+
+msgid "Add new system wizard"
+msgstr "Assistente para novo sistema"
+
+msgid "Introduction"
+msgstr "Introdução"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "Isso irá ajudá-lo a adicionar um novo sistema ao 86Box."
+
+msgid "New configuration"
+msgstr "Nova configuração"
+
+msgid "Complete"
+msgstr "Completado"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "O assistente vai iniciar a configuração para o novo sistema."
+
+msgid "Use existing configuration"
+msgstr "Usar configuração existente"
+
+msgid "Type some notes here"
+msgstr "Digite algumas notas aqui"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Cole o conteúdo de uma configuração existente na caixa abaixo."
+
+msgid "Load configuration from file"
+msgstr "Carregar configuração do arquivo"
+
+msgid "System name"
+msgstr "Nome do sistema"
+
+msgid "System name:"
+msgstr "Nome do sistema:"
+
+msgid "System name cannot contain certain characters"
+msgstr "O nome do sistema não pode conter certos caracteres"
+
+msgid "System name already exists"
+msgstr "O nome do sistema já existe"
+
+msgid "Please enter a directory for the system"
+msgstr "Por favor, digite um diretório para o sistema"
+
+msgid "Directory does not exist"
+msgstr "O diretório não existe"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "Um novo diretório para o sistema será criado no diretório acima"
+
+msgid "System location:"
+msgstr "Local do sistema:"
+
+msgid "System name and location"
+msgstr "Nome e local do sistema"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Digite o nome do sistema e escolha o local"
+
+msgid "Enter the name of the system"
+msgstr "Digite o nome do sistema"
+
+msgid "Please enter a system name"
+msgstr "Por favor digite um nome de sistema"
+
+msgid "Display name (optional):"
+msgstr "Nome de exibição (opcional):"
+
+msgid "Display name:"
+msgstr "Nome de exibição:"
+
+msgid "Set display name"
+msgstr "Defina o nome de exibição"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Digite o novo nome de exibição (em branco para restaurar)"
+
+msgid "Change &display name..."
+msgstr "Mudar o &nome de exibição..."
+
+msgid "Context Menu"
+msgstr "Menu de contexto"
+
+msgid "&Open folder..."
+msgstr "Abrir &pasta..."
+
+msgid "Open p&rinter tray..."
+msgstr "Abrir fila da &impressora..."
+
+msgid "Set &icon..."
+msgstr "&Definir ícone..."
+
+msgid "Select an icon"
+msgstr "Selecione um ícone"
+
+msgid "C&lone..."
+msgstr "&Clonar..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "A máquina virtual \"%1\" (%2) será clonada em:"
+
+msgid "Directory %1 already exists"
+msgstr "O diretório %1 já existe"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "Você não pode usar os seguintes caracteres no nome: %1"
+
+msgid "Clone"
+msgstr "Clonar"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Falha ao criar o diretório para a MV clonada"
+
+msgid "Failed to clone VM."
+msgstr "Falha ao clonar MV."
+
+msgid "Directory in use"
+msgstr "Diretório em uso"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "O diretório selecionado já está em uso. Por favor escolha um diretório diferente."
+
+msgid "Create directory failed"
+msgstr "Falha ao criar diretório"
+
+msgid "Unable to create the directory for the new system"
+msgstr "Impossível criar o diretório para o novo sistema"
+
+msgid "Configuration write failed"
+msgstr "Falha ao gravar a configuração"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "Impossível abrir o arquivo de configuração %1 para escrita"
+
+msgid "Error adding system"
+msgstr "Erro adicionando sistema"
+
+msgid "Remove directory failed"
+msgstr "Falha ao remover diretório"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "Alguns arquivos no diretório da máquina não puderam ser apagados. Por favor apágue-os manualmente."
+
+msgid "Build"
+msgstr "Compilação"
+
+msgid "Version"
+msgstr "Versão"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "Uma atualização do 86Box está disponível: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "Ocorreu um erro ao verificar por atualizações: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>Uma atualização do 86Box está disponível!</b>"
+
+msgid "Warning"
+msgstr "Aviso"
+
+msgid "&Kill"
+msgstr "&Forçar encerramento"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "Forçar o encerramento de uma máquina virtual pode causar perda de dados. Só faça isso se o processo do 86Box travar.\n\nTem certeza que deseja forçar o encerramento da máquina virtual \"%1\"?"
+
+msgid "&Delete"
+msgstr "&Apagar"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "Deseja realmente apagar a máquina virtual \"%1\" e todos os seus arquivos? Essa ação não pode ser desfeita!"
+
+msgid "Show &config file"
+msgstr "Mostrar arquivo de &configuração"
+
+msgid "No screenshot"
+msgstr "Nenhuma captura de tela"
+
+msgid "Search"
+msgstr "Procurar"
+
+msgid "Searching for VMs..."
+msgstr "Procurando por MVs..."
+
+msgid "Found %1"
+msgstr "Encontrado %1"
+
+msgid "System"
+msgstr "Sistema"
+
+msgid "Storage"
+msgstr "Armazenamento"
+
+msgid "Disk %1: "
+msgstr "Disco %1: "
+
+msgid "No disks"
+msgstr "Sem discos"
+
+msgid "Audio"
+msgstr "Som"
+
+msgid "Audio:"
+msgstr "Som:"
+
 msgid "ACPI shutdown"
 msgstr "Desligamento por ACPI"
 
-msgid "Hard disk (%s)"
-msgstr "Disco rígido (%s)"
+msgid "ACP&I shutdown"
+msgstr "Desligamento por ACP&I"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "Disco rígido (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
 msgstr "As unidades de CD-ROM MFM/RLL ou ESDI nunca existiram"
@@ -1003,17 +1377,14 @@ msgstr "Não foi possível escrever o arquivo"
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
 msgstr "Imagens HDI ou HDX com um tamanho de setor que não seja 512 não são suportadas."
 
-msgid "USB is not yet supported"
-msgstr "O USB ainda não é suportado"
-
 msgid "Disk image file already exists"
-msgstr "Esta imagem existe"
+msgstr "A imagem de disco já existe"
 
 msgid "Please specify a valid file name."
 msgstr "Digite um nome de arquivo válido."
 
 msgid "Disk image created"
-msgstr "A imagem foi criada com sucesso"
+msgstr "A imagem de disco foi criada"
 
 msgid "Make sure the file exists and is readable."
 msgstr "Certifique-se de que o arquivo existe e é legível."
@@ -1022,7 +1393,7 @@ msgid "Make sure the file is being saved to a writable directory."
 msgstr "Certifique-se de que o arquivo está sendo salvo em um diretório gravável."
 
 msgid "Disk image too large"
-msgstr "A imagem do disco é muito grande"
+msgstr "A imagem de disco é muito grande"
 
 msgid "Remember to partition and format the newly-created drive."
 msgstr "Lembre-se de particionar e formatar a unidade recém-criada."
@@ -1031,7 +1402,7 @@ msgid "The selected file will be overwritten. Are you sure you want to use it?"
 msgstr "O arquivo selecionado será sobrescrito. Você tem certeza de que deseja usá-lo?"
 
 msgid "Unsupported disk image"
-msgstr "Imagem de disco sem suporte"
+msgstr "Imagem de disco não suportada"
 
 msgid "Overwrite"
 msgstr "Sobrescrever"
@@ -1039,6 +1410,27 @@ msgstr "Sobrescrever"
 msgid "Don't overwrite"
 msgstr "Não sobrescrever"
 
+msgid "Raw image"
+msgstr "Imagem bruta"
+
+msgid "HDI image"
+msgstr "Imagem HDI"
+
+msgid "HDX image"
+msgstr "Imagem HDX"
+
+msgid "Fixed-size VHD"
+msgstr "VHD de tamanho fixo"
+
+msgid "Dynamic-size VHD"
+msgstr "VHD de tamanho dinâmico"
+
+msgid "Differencing VHD"
+msgstr "VHD diferencial"
+
+msgid "(N/A)"
+msgstr "(N/D)"
+
 msgid "Raw image (.img)"
 msgstr "Imagem bruta (.img)"
 
@@ -1070,16 +1462,13 @@ msgid "Select the parent VHD"
 msgstr "Selecione o VHD pai"
 
 msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
-msgstr "Isto pode significar que a imagem de origem foi modificada após a criação da imagem diferencial.\n\nTambém pode acontecer caso os arquivos de imagem tenham sido movidos ou copiados, ou por um erro no programa que criou este disco.\n\nVocê quer consertar os marcadores de tempo?"
+msgstr "Isto pode significar que a imagem original foi modificada após a criação da imagem diferencial.\n\nIsso também pode ocorrer se os arquivos de imagem tiverem sido movidos ou copiados, ou por um erro no programa que criou este disco.\n\nVocê deseja corrigir os marcadores de tempo?"
 
 msgid "Parent and child disk timestamps do not match"
-msgstr "A data/hora dos arquivos de pais e filhos não correspondem"
+msgstr "Os marcadores de tempo do disco pai e do disco filho não coincidem"
 
 msgid "Could not fix VHD timestamp."
-msgstr "Não foi possível consertar o carimbo de data/hora da VHD."
-
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
+msgstr "Não foi possível corrigir o marcador de tempo do VHD."
 
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
@@ -1096,44 +1485,29 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
+msgid "160 KB"
+msgstr "160 KB"
 
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
+msgid "180 KB"
+msgstr "180 KB"
 
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
+msgid "320 KB"
+msgstr "320 KB"
 
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
+msgid "360 KB"
+msgstr "360 KB"
 
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
+msgid "640 KB"
+msgstr "640 KB"
 
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
+msgid "720 KB"
+msgstr "720 KB"
 
 msgid "1.2 MB"
 msgstr "1.2 MB"
@@ -1187,16 +1561,16 @@ msgid "5.25\" 1.3 GB"
 msgstr "5.25\" 1.3 GB"
 
 msgid "Perfect RPM"
-msgstr "RPM perfeita"
+msgstr "Rotação ideal"
 
 msgid "1% below perfect RPM"
-msgstr "1% abaixo das RPM perfeita"
+msgstr "1% abaixo da rotação ideal"
 
 msgid "1.5% below perfect RPM"
-msgstr "1.5% abaixo das RPM perfeita"
+msgstr "1.5% abaixo da rotação ideal"
 
 msgid "2% below perfect RPM"
-msgstr "2% abaixo das RPM perfeita"
+msgstr "2% abaixo da rotação ideal"
 
 msgid "(System Default)"
 msgstr "(Padrão do sistema)"
@@ -1208,7 +1582,7 @@ msgid "The network configuration will be switched to the null driver"
 msgstr "A configuração de rede será alterada para o driver nulo"
 
 msgid "Mouse sensitivity:"
-msgstr "Sensibilidade do rato:"
+msgstr "Sensibilidade do mouse:"
 
 msgid "Select media images from program working directory"
 msgstr "Selecione imagens de mídia do diretório de trabalho do programa"
@@ -1226,4 +1600,1384 @@ msgid "Fast"
 msgstr "Rápido"
 
 msgid "&Auto-pause on focus loss"
-msgstr "Pausa &automática ao perder o foco"
+msgstr "Pa&usa automática ao perder o foco"
+
+msgid "WinBox is no longer supported"
+msgstr "O WinBox não é mais suportado"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "O desenvolvimento do gerenciador WinBox foi interrompido em 2022 devido à falta de mantenedores. À medida que direcionamos nossos esforços para tornar o 86Box ainda melhor, tomamos a decisão de não oferecer mais suporte ao WinBox como gerenciador.\n\nNão serão mais fornecidas atualizações através do WinBox, e você poderá encontrar comportamentos incorretos caso continue a usá-lo com versões mais recentes do 86Box. Quaisquer relatórios de erros relacionados ao comportamento do WinBox serão fechados como inválidos.\n\nAcesse 86box.net para obter uma lista de outros gerenciadores que você pode usar."
+
+msgid "Generate"
+msgstr "Gerar"
+
+msgid "Joystick configuration"
+msgstr "Configuração do joystick"
+
+msgid "Device"
+msgstr "Dispositivo"
+
+msgid "%1 (X axis)"
+msgstr "%1 (eixo X)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (eixo Y)"
+
+msgid "MCA devices"
+msgstr "Dispositivos MCA"
+
+msgid "List of MCA devices:"
+msgstr "Lista de dispositivos MCA:"
+
+msgid "&Tablet tool"
+msgstr "Ferramenta para &tablet"
+
+msgid "About &Qt"
+msgstr "Sobre o &Qt"
+
+msgid "&MCA devices..."
+msgstr "Dispositivos &MCA..."
+
+msgid "Show non-&primary monitors"
+msgstr "Mostrar monitores não &primários"
+
+msgid "Open screenshots &folder..."
+msgstr "Ab&rir pasta de capturas de tela..."
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Apl&icar modo de ampliação em tela cheia quando maximizado"
+
+msgid "&Cursor/Puck"
+msgstr "&Cursor/Puck"
+
+msgid "&Pen"
+msgstr "C&aneta"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "&Unidade de CD/DVD do anfitrião (%1:)"
+
+msgid "&Connected"
+msgstr "&Conectado"
+
+msgid "Clear image &history"
+msgstr "Limpar &histórico de imagens"
+
+msgid "Create..."
+msgstr "Criar..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "Unidade de CD/DVD do anfitrião (%1)"
+
+msgid "Unknown Bus"
+msgstr "Barramento desconhecido"
+
+msgid "Null Driver"
+msgstr "Driver nulo"
+
+msgid "NIC:"
+msgstr "Placa de Rede:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "NIC %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&NIC %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "Comportamento de renderização"
+
+msgid "Use target framerate:"
+msgstr "Usar taxa de quadros pretendida:"
+
+msgid " fps"
+msgstr " fps"
+
+msgid "VSync"
+msgstr "VSync"
+
+msgid "Synchronize with video"
+msgstr "Sincronizar com o vídeo"
+
+msgid "Shaders"
+msgstr "Shaders"
+
+msgid "Remove"
+msgstr "Remover"
+
+msgid "Browse..."
+msgstr "Procurar..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "Não foi possível criar o contexto OpenGL."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "Não foi possível alternar para o contexto OpenGL."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "É necessária a versão 3.0 ou superior do OpenGL. A versão atual é %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "Erro ao inicializar o OpenGL"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nVoltando à renderização de software."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>Ao selecionar imagens de mídia (CD-ROM, disquete, etc.), a caixa de diálogo de abertura será iniciada no mesmo diretório do arquivo de configuração do 86Box. Essa configuração provavelmente só fará diferença no macOS.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "Essa máquina pode ter sido movida ou copiada."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "Para garantir a funcionalidade adequada da rede, o 86Box precisa saber se essa máquina foi movida ou copiada.\n\nSelecione \"Copiei\" se não tiver certeza."
+
+msgid "I Moved It"
+msgstr "Movi"
+
+msgid "I Copied It"
+msgstr "Copiei"
+
+msgid "86Box Monitor #"
+msgstr "Monitor 86Box nº"
+
+msgid "No MCA devices."
+msgstr "Nenhum dispositivo MCA."
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "Placa de rede nº 1"
+
+msgid "Network Card #2"
+msgstr "Placa de rede nº 2"
+
+msgid "Network Card #3"
+msgstr "Placa de rede nº 3"
+
+msgid "Network Card #4"
+msgstr "Placa de rede nº 4"
+
+msgid "Mode:"
+msgstr "Modo:"
+
+msgid "Interface:"
+msgstr "Interface:"
+
+msgid "Adapter:"
+msgstr "Adaptador:"
+
+msgid "VDE Socket:"
+msgstr "Soquete VDE:"
+
+msgid "86Box Unit Tester"
+msgstr "Testador de unidade 86Box"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Cartão de Autenticação Novell NetWare 2.x"
+
+msgid "Serial port passthrough 1"
+msgstr "Passagem de porta serial 1"
+
+msgid "Serial port passthrough 2"
+msgstr "Passagem de porta serial 2"
+
+msgid "Serial port passthrough 3"
+msgstr "Passagem de porta serial 3"
+
+msgid "Serial port passthrough 4"
+msgstr "Passagem de porta serial 4"
+
+msgid "Renderer &options..."
+msgstr "&Opções do renderizador..."
+
+msgid "PC/XT Keyboard"
+msgstr "Teclado PC/XT"
+
+msgid "AT Keyboard"
+msgstr "Teclado AT"
+
+msgid "AX Keyboard"
+msgstr "Teclado AX"
+
+msgid "PS/2 Keyboard"
+msgstr "Teclado PS/2"
+
+msgid "PS/55 Keyboard"
+msgstr "Teclado PS/55"
+
+msgid "Keys"
+msgstr "Teclas"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Mouse de barramento Logitech/Microsoft"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Mouse de barramento Microsoft (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Mouse serial Mouse Systems"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Mouse de barramento Mouse Systems"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Mouse serial Microsoft"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Mouse serial Microsoft BallPoint"
+
+msgid "Logitech Serial Mouse"
+msgstr "Mouse serial Logitech"
+
+msgid "PS/2 Mouse"
+msgstr "Mouse PS/2"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "Mouse PS/2 QuickPort"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (serial)"
+
+msgid "Default Baud rate"
+msgstr "Taxa de transmissão padrão"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] Modem padrão compatível com Hayes"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Emulação do Roland MT-32"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Emulação do Roland MT-32 (novo)"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Emulação do Roland CM-32L"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Emulação do Roland CM-32LN"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "Placa-filha OPL4-ML"
+
+msgid "System MIDI"
+msgstr "Sistema MIDI"
+
+msgid "MIDI Input Device"
+msgstr "Dispositivo de entrada MIDI"
+
+msgid "BIOS file"
+msgstr "Arquivo do BIOS"
+
+msgid "BIOS file (ROM #1)"
+msgstr "Arquivo do BIOS (ROM nº 1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "Arquivo do BIOS (ROM nº 2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "Arquivo do BIOS (ROM nº 3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "Arquivo do BIOS (ROM nº 4)"
+
+msgid "BIOS address"
+msgstr "Endereço do BIOS"
+
+msgid "BIOS address (ROM #1)"
+msgstr "Endereço do BIOS (ROM nº 1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "Endereço do BIOS (ROM nº 2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "Endereço do BIOS (ROM nº 3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "Endereço do BIOS (ROM nº 4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "Habilitar gravações na ROM de extensão do BIOS"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "Habilitar gravações na ROM de extensão do BIOS (ROM nº 1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "Habilitar gravações na ROM de extensão do BIOS (ROM nº 2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "Habilitar gravações na ROM de extensão do BIOS (ROM nº 3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "Habilitar gravações na ROM de extensão do BIOS (ROM nº 4)"
+
+msgid "Linear framebuffer base"
+msgstr "Base do framebuffer linear"
+
+msgid "Address"
+msgstr "Endereço"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "IRQ da porta serial"
+
+msgid "Parallel port IRQ"
+msgstr "IRQ da porta paralela"
+
+msgid "BIOS Revision"
+msgstr "Revisão do BIOS"
+
+msgid "BIOS Version"
+msgstr "Versão do BIOS"
+
+msgid "BIOS Language"
+msgstr "Idioma do BIOS"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "Unidade de Expansão IBM 5161"
+
+msgid "IBM Cassette Basic"
+msgstr "Cassete BASIC IBM"
+
+msgid "Translate 26 -> 17"
+msgstr "Traduzir 26 -> 17"
+
+msgid "Language"
+msgstr "Idioma"
+
+msgid "Enable backlight"
+msgstr "Ativar luz de fundo"
+
+msgid "Invert colors"
+msgstr "Inverter cores"
+
+msgid "BIOS size"
+msgstr "Tamanho do BIOS"
+
+msgid "BIOS size (ROM #1)"
+msgstr "Tamanho do BIOS (ROM nº 1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "Tamanho do BIOS (ROM nº 2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "Tamanho do BIOS (ROM nº 3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "Tamanho do BIOS (ROM nº 4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "Mapear C0000-C7FFF como UMB"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "Mapear C8000-CFFFF como UMB"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "Mapear D0000-D7FFF como UMB"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "Mapear D8000-DFFFF como UMB"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "Mapear E0000-E7FFF como UMB"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "Mapear E8000-EFFFF como UMB"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "Jumper JS9 (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "Dispositivo de saída MIDI"
+
+msgid "MIDI Real time"
+msgstr "MIDI em tempo real"
+
+msgid "MIDI Thru"
+msgstr "Passagem da entrada MIDI"
+
+msgid "MIDI Clockout"
+msgstr "Saída do relógio MIDI"
+
+msgid "SoundFont"
+msgstr "SoundFont"
+
+msgid "Output Gain"
+msgstr "Ganho de saída"
+
+msgid "Chorus"
+msgstr "Coro"
+
+msgid "Chorus Voices"
+msgstr "Vozes do coro"
+
+msgid "Chorus Level"
+msgstr "Nível do coro"
+
+msgid "Chorus Speed"
+msgstr "Velocidade do coro"
+
+msgid "Chorus Depth"
+msgstr "Profundidade do coro"
+
+msgid "Chorus Waveform"
+msgstr "Forma de onda do coro"
+
+msgid "Reverb"
+msgstr "Reverberação"
+
+msgid "Reverb Room Size"
+msgstr "Tamanho da sala de reverberação"
+
+msgid "Reverb Damping"
+msgstr "Amortecimento de reverberação"
+
+msgid "Reverb Width"
+msgstr "Largura de reverberação"
+
+msgid "Reverb Level"
+msgstr "Nível de reverberação"
+
+msgid "Interpolation Method"
+msgstr "Método de interpolação"
+
+msgid "Dynamic Sample Loading"
+msgstr "Carregamento dinâmico de amostras"
+
+msgid "Reverb Output Gain"
+msgstr "Ganho da saída da reverberação"
+
+msgid "Reversed stereo"
+msgstr "Estéreo invertido"
+
+msgid "Nice ramp"
+msgstr "Rampa suave"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "Botões"
+
+msgid "Serial Port"
+msgstr "Porta serial"
+
+msgid "RTS toggle"
+msgstr "Alternância de RTS"
+
+msgid "Revision"
+msgstr "Revisão"
+
+msgid "Controller"
+msgstr "Controlador"
+
+msgid "Show Crosshair"
+msgstr "Mostrar mira"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "Endereço MAC"
+
+msgid "MAC Address OUI"
+msgstr "OUI do Endereço MAC"
+
+msgid "Enable BIOS"
+msgstr "Habilitar BIOS"
+
+msgid "Baud Rate"
+msgstr "Taxa de transmissão"
+
+msgid "TCP/IP listening port"
+msgstr "Porta de escuta TCP/IP"
+
+msgid "Phonebook File"
+msgstr "Arquivo de lista telefônica"
+
+msgid "Telnet emulation"
+msgstr "Emulação Telnet"
+
+msgid "RAM Address"
+msgstr "Endereço da RAM"
+
+msgid "RAM size"
+msgstr "Tamanho da RAM"
+
+msgid "Initial RAM size"
+msgstr "Tamanho inicial da RAM"
+
+msgid "Serial Number"
+msgstr "Número de série"
+
+msgid "Host ID"
+msgstr "ID do anfitrião"
+
+msgid "FDC Address"
+msgstr "Endereço da FDC"
+
+msgid "MPU-401 Address"
+msgstr "Endereço da MPU-401"
+
+msgid "MPU-401 IRQ"
+msgstr "IRQ MPU-401"
+
+msgid "Receive MIDI input"
+msgstr "Receber entrada MIDI"
+
+msgid "Low DMA"
+msgstr "DMA baixo"
+
+msgid "Enable Game port"
+msgstr "Ativar a porta do jogo"
+
+msgid "SID Model"
+msgstr "Modelo do SID"
+
+msgid "SID Filter Strength"
+msgstr "Força do Filtro SID"
+
+msgid "Surround module"
+msgstr "Módulo surround"
+
+msgid "CODEC"
+msgstr "CODEC"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "Aumentar a interrupção do CODEC na configuração do CODEC (necessário para alguns drivers)"
+
+msgid "SB Address"
+msgstr "Endereço da SB"
+
+msgid "Adlib Address"
+msgstr "Endereço da Adlib"
+
+msgid "Use EEPROM setting"
+msgstr "Usar configuração da EEPROM"
+
+msgid "WSS IRQ"
+msgstr "IRQ WSS"
+
+msgid "WSS DMA"
+msgstr "DMA WSS"
+
+msgid "Enable OPL"
+msgstr "Ativar OPL"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "Receber entrada MIDI (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "DMA baixo SB"
+
+msgid "6CH variant (6-channel)"
+msgstr "Variante 6CH (6 canais)"
+
+msgid "Enable CMS"
+msgstr "Ativar o CMS"
+
+msgid "Mixer"
+msgstr "Mixer"
+
+msgid "High DMA"
+msgstr "DMA alto"
+
+msgid "Control PC speaker"
+msgstr "Controlar alto-falante do PC"
+
+msgid "Memory size"
+msgstr "Tamanho da memória"
+
+msgid "EMU8000 Address"
+msgstr "Endereço da EMU8000"
+
+msgid "IDE Controller"
+msgstr "Controlador IDE"
+
+msgid "Codec"
+msgstr "Codec"
+
+msgid "GUS type"
+msgstr "Tipo de GUS"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "Ativar o comando 0x04 \"Sair do 86Box\""
+
+msgid "Display type"
+msgstr "Tipo de tela"
+
+msgid "Composite type"
+msgstr "Tipo de composto"
+
+msgid "RGB type"
+msgstr "Tipo de RGB"
+
+msgid "Line doubling type"
+msgstr "Tipo de duplicação de linha"
+
+msgid "Snow emulation"
+msgstr "Emulação de neve"
+
+msgid "Monitor type"
+msgstr "Tipo de monitor"
+
+msgid "Character set"
+msgstr "Conjunto de caracteres"
+
+msgid "XGA type"
+msgstr "Tipo de XGA"
+
+msgid "Instance"
+msgstr "Instância"
+
+msgid "MMIO Address"
+msgstr "Endereço da MMIO"
+
+msgid "RAMDAC type"
+msgstr "Tipo de RAMDAC"
+
+msgid "Blend"
+msgstr "Mistura"
+
+msgid "Font"
+msgstr "Fonte"
+
+msgid "Bilinear filtering"
+msgstr "Filtragem bilinear"
+
+msgid "Video chroma-keying"
+msgstr "Chroma key de vídeo"
+
+msgid "Dithering"
+msgstr "Pontilhamento"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "Ativar NMI para emulação CGA"
+
+msgid "Voodoo type"
+msgstr "Tipo de Voodoo"
+
+msgid "Framebuffer memory size"
+msgstr "Tamanho da memória do framebuffer"
+
+msgid "Texture memory size"
+msgstr "Tamanho da memória da textura"
+
+msgid "Dither subtraction"
+msgstr "Subtração de pontilhado"
+
+msgid "Screen Filter"
+msgstr "Filtro de tela"
+
+msgid "Render threads"
+msgstr "Threads de renderização"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Endereço inicial"
+
+msgid "Contiguous Size"
+msgstr "Tamanho contíguo"
+
+msgid "I/O Width"
+msgstr "Largura de E/S"
+
+msgid "Transfer Speed"
+msgstr "Velocidade de transferência"
+
+msgid "EMS mode"
+msgstr "Modo EMS"
+
+msgid "EMS Address"
+msgstr "Endereço EMS"
+
+msgid "EMS 1 Address"
+msgstr "Endereço EMS 1"
+
+msgid "EMS 2 Address"
+msgstr "Endereço EMS 2"
+
+msgid "EMS Memory Size"
+msgstr "Tamanho de Memória EMS"
+
+msgid "EMS 1 Memory Size"
+msgstr "Tamanho de Memória EMS 1"
+
+msgid "EMS 2 Memory Size"
+msgstr "Tamanho de Memória EMS 2"
+
+msgid "Enable EMS"
+msgstr "Habilitar EMS"
+
+msgid "Enable EMS 1"
+msgstr "Habilitar EMS 1"
+
+msgid "Enable EMS 2"
+msgstr "Habilitar EMS 2"
+
+msgid "Address for > 2 MB"
+msgstr "Endereço para > 2 MB"
+
+msgid "Frame Address"
+msgstr "Endereço do quadro"
+
+msgid "USA"
+msgstr "EUA"
+
+msgid "Danish"
+msgstr "Dinamarquês"
+
+msgid "Always at selected speed"
+msgstr "Sempre na velocidade selecionada"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "Configuração do BIOS + teclas de atalho (desativadas durante o POST)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 KB a partir de F0000"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 KB a partir de E0000 (endereço MSB invertido, os últimos 64 KB primeiro)"
+
+msgid "Sine"
+msgstr "Senoidal"
+
+msgid "Triangle"
+msgstr "Triangular"
+
+msgid "Linear"
+msgstr "Linear"
+
+msgid "4th Order"
+msgstr "De 4ª ordem"
+
+msgid "7th Order"
+msgstr "De 7ª ordem"
+
+msgid "Non-timed (original)"
+msgstr "Sem cronômetro (original)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (sem jumper em JMP2)"
+
+msgid "Two"
+msgstr "Dois"
+
+msgid "Three"
+msgstr "Três"
+
+msgid "Wheel"
+msgstr "Roda"
+
+msgid "Five + Wheel"
+msgstr "Cinco + Roda"
+
+msgid "Five + 2 Wheels"
+msgstr "Cinco + 2 Rodas"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 Serial / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) Serial"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "Desativar o BIOS"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2 MB"
+
+msgid "8 MB"
+msgstr "8 MB"
+
+msgid "28 MB"
+msgstr "28 MB"
+
+msgid "1 MB"
+msgstr "1 MB"
+
+msgid "4 MB"
+msgstr "4 MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16 MB"
+
+msgid "20 MB"
+msgstr "20 MB"
+
+msgid "24 MB"
+msgstr "24 MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (estéreo)"
+
+msgid "Classic"
+msgstr "Clássico"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "Composto"
+
+msgid "True color"
+msgstr "Cor real"
+
+msgid "Old"
+msgstr "Antigo"
+
+msgid "New"
+msgstr "Novo"
+
+msgid "Color (generic)"
+msgstr "Colorido (genérico)"
+
+msgid "Green Monochrome"
+msgstr "Monocromático verde"
+
+msgid "Amber Monochrome"
+msgstr "Monocromático âmbar"
+
+msgid "Gray Monochrome"
+msgstr "Monocromático cinza"
+
+msgid "Color (no brown)"
+msgstr "Colorido (sem marrom)"
+
+msgid "Color (IBM 5153)"
+msgstr "Colorido (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Duplicação simples"
+
+msgid "sRGB interpolation"
+msgstr "Interpolação sRGB"
+
+msgid "Linear interpolation"
+msgstr "Interpolação linear"
+
+msgid "Has secondary 8x8 character set"
+msgstr "Tem conjunto secundário de caracteres 8x8"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Tem placa filha Quadcolor II"
+
+msgid "Alternate monochrome contrast"
+msgstr "Contraste monocromático alternativo"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Monocromático (5151/MDA) (branco)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Monocromático (5151/MDA) (verde)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Monocromático (5151/MDA) (âmbar)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Colorido 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Colorido 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Colorido aprimorado - Modo normal (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Colorido aprimorado - Modo aprimorado (5154/ECD)"
+
+msgid "Green"
+msgstr "Verde"
+
+msgid "Amber"
+msgstr "Âmbar"
+
+msgid "Gray"
+msgstr "Cinza"
+
+msgid "Grayscale"
+msgstr "Escala de cinza"
+
+msgid "Color"
+msgstr "Colorido"
+
+msgid "U.S. English"
+msgstr "Inglês Americano"
+
+msgid "Scandinavian"
+msgstr "Escandinavo"
+
+msgid "Other languages"
+msgstr "Outros idiomas"
+
+msgid "Bochs latest"
+msgstr "Bochs mais recente"
+
+msgid "Apply overscan deltas"
+msgstr "Aplicar deltas de overscan"
+
+msgid "Mono Interlaced"
+msgstr "Monocromático entrelaçado"
+
+msgid "Mono Non-Interlaced"
+msgstr "Monocromático não entrelaçado"
+
+msgid "Color Interlaced"
+msgstr "Colorido entrelaçado"
+
+msgid "Color Non-Interlaced"
+msgstr "Colorido não entrelaçado"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "3Dfx Voodoo Graphics"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 unidades TMU)"
+
+msgid "8-bit"
+msgstr "8 bits"
+
+msgid "16-bit"
+msgstr "16 bits"
+
+msgid "Standard (150ns)"
+msgstr "Padrão (150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "Alta velocidade (120 ns)"
+
+msgid "Enabled"
+msgstr "Ativado"
+
+msgid "Standard"
+msgstr "Padrão"
+
+msgid "High-Speed"
+msgstr "Alta velocidade"
+
+msgid "Stereo LPT DAC"
+msgstr "DAC LPT estéreo"
+
+msgid "Generic Text Printer"
+msgstr "Impressora de texto genérica"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Impressora matricial ESC/P 2 genérica"
+
+msgid "Generic PostScript Printer"
+msgstr "Impressora PostScript genérica"
+
+msgid "Generic PCL5e Printer"
+msgstr "Impressora PCL5e genérica"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Protocolo de Internet de linha paralela"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Dongle de proteção para Savage Quest"
+
+msgid "Serial Passthrough Device"
+msgstr "Dispositivo de passagem de porta serial"
+
+msgid "Passthrough Mode"
+msgstr "Modo de passagem"
+
+msgid "Host Serial Device"
+msgstr "Dispositivo serial host"
+
+msgid "Name of pipe"
+msgstr "Nome do pipe"
+
+msgid "Data bits"
+msgstr "Bits de dados"
+
+msgid "Stop bits"
+msgstr "Bits de parada"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Taxa de transmissão de passagem"
+
+msgid "Named Pipe (Server)"
+msgstr "Pipe nomeado (Servidor)"
+
+msgid "Named Pipe (Client)"
+msgstr "Pipe nomeado (Cliente)"
+
+msgid "Host Serial Passthrough"
+msgstr "Passagem da porta serial do host"
+
+msgid "E&ject %1"
+msgstr "E&jetar %1"
+
+msgid "&Unmute"
+msgstr "&Reativar som"
+
+msgid "Softfloat FPU"
+msgstr "FPU Softfloat"
+
+msgid "High performance impact"
+msgstr "Alto impacto no desempenho"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Genérico] Disco RAM (velocidade máx.)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Genérico] 1989 (3500 RPM)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Genérico] 1992 (3600 RPM)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Genérico] 1994 (4500 RPM)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Genérico] 1996 (5400 RPM)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Genérico] 1997 (5400 RPM)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Genérico] 1998 (5400 RPM)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Genérico] 2000 (7200 RPM)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "Clone IBM 8514/A (ISA)"
+
+msgid "Vendor"
+msgstr "Fabricante"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Expansão de memória genérica PC/XT"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Expansão de memória genérica PC/AT"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "Não foi possível localizar as fontes matriciais"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "As fontes TrueType no diretório \"roms/printer/fonts\" são necessárias para a emulação da impressora matricial ESC/P 2 genérica."
+
+msgid "Inhibit multimedia keys"
+msgstr "Inibir teclas multimídia"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Perguntar antes de salvar configurações"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Perguntar antes de reinicialização completa"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Perguntar antes de sair"
+
+msgid "Options"
+msgstr "Opções"
+
+msgid "Model"
+msgstr "Modelo"
+
+msgid "Model:"
+msgstr "Modelo:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Falha ao inicializar o renderizador Vulkan."
+
+msgid "GLSL Error"
+msgstr "Erro GLSL"
+
+msgid "Could not load shader: %1"
+msgstr "Não foi possível carregar o shader: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "OpenGL versão 3.0 ou superior é exigido. Versão atual GLSL é %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "Não foi possível carregar a textura: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "Não foi possível compilar o shader:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "Programa não vinculado:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "Gerenciador de Shaders"
+
+msgid "Shader Configuration"
+msgstr "Configuração de Shaders"
+
+msgid "Add"
+msgstr "Adicionar"
+
+msgid "Move up"
+msgstr "Mover para cima"
+
+msgid "Move down"
+msgstr "Mover para baixo"
+
+msgid "Could not load file %1"
+msgstr "Não foi possível carregar o arquivo %1"
+
+msgid "Key Bindings:"
+msgstr "Atalhos:"
+
+msgid "Action"
+msgstr "Ação"
+
+msgid "Keybind"
+msgstr "Atalho"
+
+msgid "Clear binding"
+msgstr "Limpar atalho"
+
+msgid "Bind"
+msgstr "Vincular"
+
+msgid "Bind Key"
+msgstr "Vincular tecla"
+
+msgid "Enter key combo:"
+msgstr "Pressione combinação de teclas:"
+
+msgid "Bind conflict"
+msgstr "Conflito de atalho"
+
+msgid "This key combo is already in use."
+msgstr "Esta combinação de teclas já está em uso."
+
+msgid "Send Control+Alt+Del"
+msgstr "Enviar Control+Alt+Del"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Enviar Control+Alt+Escape"
+
+msgid "Toggle fullscreen"
+msgstr "Alternar tela cheia"
+
+msgid "Screenshot"
+msgstr "Captura de tela"
+
+msgid "Release mouse pointer"
+msgstr "Liberar ponteiro do mouse"
+
+msgid "Toggle pause"
+msgstr "Alternar pausa"
+
+msgid "Toggle mute"
+msgstr "Alternar mudo"
+
+msgid "Text files"
+msgstr "Arquivos de texto"
+
+msgid "ROM files"
+msgstr "Arquivos de ROM"
+
+msgid "SoundFont files"
+msgstr "Arquivos SoundFont"
+
+msgid "Local Switch"
+msgstr "Switch Local"
+
+msgid "Remote Switch"
+msgstr "Switch Remoto"
+
+msgid "Switch:"
+msgstr "Switch:"
+
+msgid "Hub Mode"
+msgstr "Modo Hub"
+
+msgid "Hostname:"
+msgstr "Nome do anfitrião:"
+
+msgid "ISA RAM:"
+msgstr "RAM ISA:"
+
+msgid "ISA ROM:"
+msgstr "ROM ISA:"
+
+msgid "&Wipe NVRAM"
+msgstr "&Limpar NVRAM"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "Isso irá apagar todos os arquivos NVRAM (e relacionados) da máquina virtual localizada no subdiretório \"nvr\". Você terá que reconfigurar as configurações do BIOS (e possívelmente outros dispositivos dentro da MV) novamente se aplicável.\n\nTem certeza que quer apagar todo o conteúdo NVRAM da máquina virtual \"%1\"?"
+
+msgid "Success"
+msgstr "Sucesso"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "Conteúdo NVRAM da máquina virtual \"%1\" apagado com sucesso"
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "Um erro ocorreu ao tentar apagar o conteúdo NVRAM da máquina virtual \"%1\""
+
+msgid "%1 VM Manager"
+msgstr "Gerenciador de MV do %1"
+
+msgid "%n disk(s)"
+msgstr "%1 disco(s)"
+
+msgid "Unknown Status"
+msgstr "Estado desconhecido"
+
+msgid "No Machines Found!"
+msgstr "Nenhuma Máquina Encontrada!"
+
+msgid "Check for updates on startup"
+msgstr "Verificar atualizações ao iniciar"
+
+msgid "Unable to determine release information"
+msgstr "Não foi possível determinar as informações da versão"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Ocorreu um erro ao verificar por atualizações:\n\n%1\n\nPor favor tente mais tarde."
+
+msgid "Update check complete"
+msgstr "Verificação de atualização completada"
+
+msgid "stable"
+msgstr "estável"
+
+msgid "beta"
+msgstr "beta"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Você está executando a última versão %1 do 86Box: %2"
+
+msgid "version"
+msgstr "versão"
+
+msgid "build"
+msgstr "compilação"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Você está executando atualmente a versão <b>%1</b>."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "A <b>versão %1</b> já está disponível."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Você está executando atualmente a compilação <b>%1</b>."
+
+msgid "<b>Build %1</b> is now available."
+msgstr "A <b>compilação %1</b> já está disponível."
+
+msgid "Would you like to visit the download page?"
+msgstr "Gostaria de visitar a página de download?"
+
+msgid "Visit download page"
+msgstr "Visitar página de download"
+
+msgid "Update check"
+msgstr "Verificação de atualização"
+
+msgid "Checking for updates..."
+msgstr "Verificando por atualizações..."
+
+msgid "86Box Update"
+msgstr "Atualização do 86Box"
+
+msgid "Release notes:"
+msgstr "Notas de lançamento:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "Falha da máquina virtual"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "O processo da máquina virtual \"%1\" terminou inesperadamente com o código de saída %2."
+
+msgid "The system will not be added."
+msgstr "O sistema não será adicionado."
+
+msgid "&Update mouse every CPU frame"
+msgstr "&Atualiza o estado do mouse em cada quadro da CPU"
+
+msgid "Hue"
+msgstr "Matiz"
+
+msgid "Saturation"
+msgstr "Saturação"
+
+msgid "Contrast"
+msgstr "Contraste"
+
+msgid "Brightness"
+msgstr "Brilho"
+
+msgid "Sharpness"
+msgstr "Nitidez"
+
+msgid "&CGA composite settings..."
+msgstr "Configurações do modo composto &CGA..."
+
+msgid "CGA composite settings"
+msgstr "Configurações do modo composto CGA"
+
+msgid "Monitor EDID"
+msgstr "EDID do monitor"
+
+msgid "Export..."
+msgstr "Exportar..."
+
+msgid "Export EDID"
+msgstr "Exportar EDID"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "O arquivo EDID \"%ls\" é muito grande."
+
+msgid "OpenGL input scale"
+msgstr "Escala de entrada do OpenGL"
+
+msgid "OpenGL input stretch mode"
+msgstr "Modo de expansão de entrada do OpenGL"
+
+msgid "Color scheme"
+msgstr "Esquema de cores"
+
+msgid "Light"
+msgstr "Claro"
+
+msgid "Dark"
+msgstr "Escuro"
diff --git a/src/qt/languages/pt-PT.po b/src/qt/languages/pt-PT.po
index 9743bc83c..4c7866f41 100644
--- a/src/qt/languages/pt-PT.po
+++ b/src/qt/languages/pt-PT.po
@@ -1,3 +1,11 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: pt_PT\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
 msgstr "&Ação"
 
@@ -5,13 +13,13 @@ msgid "&Keyboard requires capture"
 msgstr "&Teclado requere captura"
 
 msgid "&Right CTRL is left ALT"
-msgstr "&CTRL direito é ALT esquerdo"
+msgstr "CTRL &direito é ALT esquerdo"
 
 msgid "&Hard Reset..."
 msgstr "&Reinicialização completa..."
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Ctrl+Alt+Del\tCtrl+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "&Ctrl+Alt+Del"
 
 msgid "Ctrl+Alt+&Esc"
 msgstr "Ctrl+Alt+&Esc"
@@ -19,17 +27,23 @@ msgstr "Ctrl+Alt+&Esc"
 msgid "&Pause"
 msgstr "&Pausa"
 
-msgid "E&xit..."
-msgstr "&Sair..."
+msgid "Pause"
+msgstr "Pausa"
+
+msgid "Re&sume"
+msgstr "Reto&mar"
+
+msgid "E&xit"
+msgstr "&Sair"
 
 msgid "&View"
 msgstr "&Ver"
 
 msgid "&Hide status bar"
-msgstr "&Ocultar barra de estado"
+msgstr "Ocultar &barra de estado"
 
 msgid "Hide &toolbar"
-msgstr "Hide &toolbar"
+msgstr "Ocultar barra de &ferramentas"
 
 msgid "&Resizeable window"
 msgstr "&Janela redimensionável"
@@ -40,14 +54,8 @@ msgstr "&Lembrar tamanho e posição"
 msgid "Re&nderer"
 msgstr "&Renderizador"
 
-msgid "&SDL (Software)"
-msgstr "&SDL (Software)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (&Hardware)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
+msgid "&Qt (Software)"
+msgstr "&Qt (Software)"
 
 msgid "Open&GL (3.0 Core)"
 msgstr "Open&GL (Núcleo 3.0)"
@@ -55,11 +63,11 @@ msgstr "Open&GL (Núcleo 3.0)"
 msgid "&VNC"
 msgstr "&VNC"
 
-msgid "Specify dimensions..."
+msgid "Specify &dimensions..."
 msgstr "&Especificar dimensões..."
 
-msgid "F&orce 4:3 display ratio"
-msgstr "&Forçar rácio de visualização 4:3"
+msgid "Force &4:3 display ratio"
+msgstr "Forçar rácio de visualização &4:3"
 
 msgid "&Window scale factor"
 msgstr "F&actor de escala de janela"
@@ -94,8 +102,8 @@ msgstr "&7x"
 msgid "&8x"
 msgstr "&8x"
 
-msgid "Filter method"
-msgstr "Método de filtragem"
+msgid "Fi&lter method"
+msgstr "Método de fil&tragem"
 
 msgid "&Nearest"
 msgstr "&Mais próximo"
@@ -106,14 +114,14 @@ msgstr "&Linear"
 msgid "Hi&DPI scaling"
 msgstr "Escala Hi&DPI"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "E&crã cheio\tCtrl+Alt+PgUp"
+msgid "&Fullscreen"
+msgstr "Ecrã c&heio"
 
 msgid "Fullscreen &stretch mode"
-msgstr "Modo &de estiramento em ecrã cheio"
+msgstr "M&odo de estiramento na tela cheia"
 
 msgid "&Full screen stretch"
-msgstr "&Estiramento em ecrã cheio"
+msgstr "&Estiramento na tela cheia"
 
 msgid "&4:3"
 msgstr "&4:3"
@@ -127,8 +135,8 @@ msgstr "Escala &inteira"
 msgid "4:&3 Integer scale"
 msgstr "Escala inteira 4:&3"
 
-msgid "E&GA/(S)VGA settings"
-msgstr "Definições E&GA/(S)VGA"
+msgid "EGA/(S)&VGA settings"
+msgstr "Definições EGA/(S)&VGA"
 
 msgid "&Inverted VGA monitor"
 msgstr "Monitor VGA &invertido"
@@ -139,9 +147,15 @@ msgstr "&Tipo de ecrã VGA"
 msgid "RGB &Color"
 msgstr "&Cores RGB"
 
+msgid "RGB (no brown)"
+msgstr "RGB (sem castanho)"
+
 msgid "&RGB Grayscale"
 msgstr "&RGB em escala de cinzentos"
 
+msgid "Generic RGBI color monitor"
+msgstr "Monitor RGBI genérico em cores"
+
 msgid "&Amber monitor"
 msgstr "Monitor âmb&ar"
 
@@ -167,7 +181,7 @@ msgid "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
 msgstr "Overscan de CGA/PCjr/Tandy/E&GA/(S)VGA"
 
 msgid "Change contrast for &monochrome display"
-msgstr "Mudar &contraste para ecrã monocromático"
+msgstr "Mudar contraste para ecrã &monocromático"
 
 msgid "&Media"
 msgstr "&Media"
@@ -178,29 +192,35 @@ msgstr "&Ferramentas"
 msgid "&Settings..."
 msgstr "&Definições..."
 
+msgid "Settings..."
+msgstr "Definições..."
+
 msgid "&Update status bar icons"
 msgstr "&Atualizar ícones da barra de estado"
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "Gravar imagem de ecrã\tCtrl+F11"
+msgid "Take s&creenshot"
+msgstr "Gravar imagem de &ecrã"
+
+msgid "S&ound"
+msgstr "&Som"
 
 msgid "&Preferences..."
 msgstr "&Preferências..."
 
 msgid "Enable &Discord integration"
-msgstr "Ativar integração com &Discord"
+msgstr "Ativar integração com D&iscord"
 
 msgid "Sound &gain..."
 msgstr "&Ganho de som..."
 
-msgid "Begin trace\tCtrl+T"
-msgstr "Iniciar o rastreio\tCtrl+T"
+msgid "Begin trace"
+msgstr "Iniciar o rastreio"
 
-msgid "End trace\tCtrl+T"
-msgstr "Terminar o rastreio\tCtrl+T"
+msgid "End trace"
+msgstr "Terminar o rastreio"
 
 msgid "&Help"
-msgstr "&Ajuda"
+msgstr "Aj&uda"
 
 msgid "&Documentation..."
 msgstr "&Documentação..."
@@ -239,13 +259,13 @@ msgid "E&xport to 86F..."
 msgstr "E&xportar para 86F..."
 
 msgid "&Mute"
-msgstr "&Mute"
+msgstr "&Desativar som"
 
 msgid "E&mpty"
 msgstr "&CDROM vazio"
 
-msgid "&Reload previous image"
-msgstr "&Recarregar imagem anterior"
+msgid "Reload previous image"
+msgstr "Recarregar imagem anterior"
 
 msgid "&Folder..."
 msgstr "&Pasta..."
@@ -301,18 +321,12 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Cancelar"
 
-msgid "Save these settings as &global defaults"
-msgstr "Guardar estas definições como padrões &globais"
-
 msgid "&Default"
 msgstr "&Padrão"
 
 msgid "Language:"
 msgstr "Idioma:"
 
-msgid "Icon set:"
-msgstr "Pacote de ícones:"
-
 msgid "Gain"
 msgstr "Ganho"
 
@@ -346,6 +360,9 @@ msgstr "Máquina:"
 msgid "Configure"
 msgstr "Configurar"
 
+msgid "CPU:"
+msgstr ""
+
 msgid "CPU type:"
 msgstr "Tipo do CPU:"
 
@@ -382,11 +399,23 @@ msgstr "Ativada (UTC)"
 msgid "Dynamic Recompiler"
 msgstr "Recompilador dinâmico"
 
+msgid "CPU frame size"
+msgstr "Tamanho de blocos do CPU"
+
+msgid "Larger frames (less smooth)"
+msgstr "Blocos mais grandes (menos suave)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Blocos mais pequenos (mais suave)"
+
 msgid "Video:"
 msgstr "Vídeo:"
 
-msgid "Voodoo Graphics"
-msgstr "Gráficos Voodoo"
+msgid "Video #2:"
+msgstr "Vídeo 2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Gráficos Voodoo 1 ou 2"
 
 msgid "IBM 8514/A Graphics"
 msgstr "Gráficos IBM 8514/A"
@@ -394,12 +423,27 @@ msgstr "Gráficos IBM 8514/A"
 msgid "XGA Graphics"
 msgstr "Gráficos XGA"
 
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "Adaptador de apresentação gráfica IBM PS/55"
+
+msgid "Keyboard:"
+msgstr "Teclado:"
+
+msgid "Keyboard"
+msgstr "Teclado"
+
 msgid "Mouse:"
 msgstr "Rato:"
 
+msgid "Mouse"
+msgstr "Rato"
+
 msgid "Joystick:"
 msgstr "Joystick:"
 
+msgid "Joystick"
+msgstr "Joystick"
+
 msgid "Joystick 1..."
 msgstr "Joystick 1..."
 
@@ -430,6 +474,9 @@ msgstr "Disp. saída MIDI:"
 msgid "MIDI In Device:"
 msgstr "Disp. entrada MIDI:"
 
+msgid "MIDI Out:"
+msgstr "Saída MIDI:"
+
 msgid "Standalone MPU-401"
 msgstr "MPU-401 autónomo"
 
@@ -445,15 +492,6 @@ msgstr "Nuked (mais exacto)"
 msgid "YMFM (faster)"
 msgstr "YMFM (mais rápido)"
 
-msgid "Network type:"
-msgstr "Tipo de rede:"
-
-msgid "PCap device:"
-msgstr "Dispositivo PCap:"
-
-msgid "Network adapter:"
-msgstr "Placa de rede:"
-
 msgid "COM1 Device:"
 msgstr "Dispositivo COM1:"
 
@@ -478,6 +516,9 @@ msgstr "Dispositivo LPT3:"
 msgid "LPT4 Device:"
 msgstr "Dispositivo LPT4:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr "DMA do ECP do LPT interno:"
+
 msgid "Serial port 1"
 msgstr "Porta de série 1"
 
@@ -502,18 +543,21 @@ msgstr "Porta paralela 3"
 msgid "Parallel port 4"
 msgstr "Porta paralela 4"
 
-msgid "HD Controller:"
-msgstr "Controlador HD:"
-
 msgid "FD Controller:"
 msgstr "Controlador FD:"
 
+msgid "CD-ROM Controller:"
+msgstr "Controlador CD-ROM:"
+
 msgid "Tertiary IDE Controller"
 msgstr "Controlador IDE terciário"
 
 msgid "Quaternary IDE Controller"
 msgstr "Controlador IDE quaternário"
 
+msgid "Hard disk"
+msgstr "Disco rígido"
+
 msgid "SCSI"
 msgstr "SCSI"
 
@@ -535,6 +579,9 @@ msgstr "Cassete"
 msgid "Hard disks:"
 msgstr "Discos rígidos:"
 
+msgid "Firmware Version"
+msgstr "Versão de firmware"
+
 msgid "&New..."
 msgstr "&Novo..."
 
@@ -589,14 +636,17 @@ msgstr "Verificar BPB"
 msgid "CD-ROM drives:"
 msgstr "Unidades CD-ROM:"
 
-msgid "Earlier drive"
-msgstr "Unidade anterior"
-
 msgid "MO drives:"
 msgstr "Unidades magneto-ópticas:"
 
-msgid "ZIP drives:"
-msgstr "Unidades ZIP:"
+msgid "MO:"
+msgstr "Magneto-ópticos:"
+
+msgid "Removable disks:"
+msgstr "Discos amovíveis:"
+
+msgid "Removable disk drives:"
+msgstr "Unidades de disco amovível:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
@@ -607,6 +657,9 @@ msgstr "ISA RTC:"
 msgid "ISA Memory Expansion"
 msgstr "Expansão de memória ISA"
 
+msgid "ISA ROM Cards"
+msgstr "Placas ROM ISA"
+
 msgid "Card 1:"
 msgstr "Placa 1:"
 
@@ -619,18 +672,21 @@ msgstr "Placa 3:"
 msgid "Card 4:"
 msgstr "Placa 4:"
 
+msgid "Generic ISA ROM Board"
+msgstr "Placa ROM ISA genérica"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "Placa ROM ISA dual genérica"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "Placa ROM ISA quad genérica"
+
 msgid "ISABugger device"
 msgstr "Dispositivo ISABugger"
 
 msgid "POST card"
 msgstr "Placa POST"
 
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
-
 msgid "86Box"
 msgstr "86Box"
 
@@ -641,22 +697,25 @@ msgid "Fatal error"
 msgstr "Erro fatal"
 
 msgid " - PAUSED"
-msgstr " - PAUSED"
-
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Pressione Ctrl+Alt+PgDn para voltar ao modo de janela."
+msgstr " - EM PAUSA"
 
 msgid "Speed"
 msgstr "Velocidade"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "Disco amovível %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "Imagens ZIP"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "&Disco amovível %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Imagens de disco amovível"
+
+msgid "Image %1"
+msgstr "Imagem %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
-msgstr "O 86Box não conseguiu encontrar nenhuma imagem ROM utilizável.\n\nPor favor, vá a href=\"https://github.com/86Box/roms/releases/latest\">descarregue</a> um pacote ROM e instale-o na pasta \"roms\"."
+msgstr "O 86Box não conseguiu encontrar nenhuma imagem ROM utilizável.\n\nPor favor, vá a <a href=\"https://github.com/86Box/roms/releases/latest\">descarregue</a> um pacote ROM e instale-o na pasta \"roms\"."
 
 msgid "(empty)"
 msgstr "(empty)"
@@ -688,6 +747,12 @@ msgstr "A máquina \"%hs\" não está disponível devido à falta de ROMs na pas
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
 msgstr "A placa vídeo \"%hs\" não está disponível devido à falta de ROMs na pasta roms/video. A mudar para uma placa vídeo disponível."
 
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "A placa vídeo 2 \"%hs\" não está disponível devido à falta de ROMs na pasta roms/video. A desativar a segunda placa vídeo."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "O dispositivo \"%hs\" não está disponível devido à falta de ROMs A ignorar o dispositivo."
+
 msgid "Machine"
 msgstr "Máquina"
 
@@ -706,12 +771,30 @@ msgstr "Rede"
 msgid "Ports (COM & LPT)"
 msgstr "Portas (COM e LPT)"
 
+msgid "Ports"
+msgstr "Portas"
+
+msgid "Serial ports:"
+msgstr "Portas série:"
+
+msgid "Parallel ports:"
+msgstr "Portas paralelas:"
+
 msgid "Storage controllers"
 msgstr "Dispositivos de armazenamento"
 
 msgid "Hard disks"
 msgstr "Discos rígidos"
 
+msgid "Disks:"
+msgstr "Discos:"
+
+msgid "Floppy:"
+msgstr "Disquete:"
+
+msgid "Controllers:"
+msgstr "Controladores:"
+
 msgid "Floppy & CD-ROM drives"
 msgstr "Unidades de disquete e CD-ROM"
 
@@ -721,14 +804,17 @@ msgstr "Outros dispostivos removíveis"
 msgid "Other peripherals"
 msgstr "Outros dispositivos"
 
+msgid "Other devices"
+msgstr "Outros dispositivos"
+
 msgid "Click to capture mouse"
 msgstr "Clique para capturar o rato"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "Pressione F8+F12 para soltar o rato"
+msgid "Press %1 to release mouse"
+msgstr "Pressione %1 para soltar o rato"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Pressione F8+F12 ou tecla média para soltar o rato"
+msgid "Press %1 or middle button to release mouse"
+msgstr "Pressione %1 ou tecla média para soltar o rato"
 
 msgid "Bus"
 msgstr "Barramento"
@@ -748,65 +834,89 @@ msgstr "S"
 msgid "KB"
 msgstr "KB"
 
-msgid "Could not initialize the video renderer."
-msgstr "Não foi possível inicializar o renderizador vídeo."
-
 msgid "Default"
 msgstr "Padrão"
 
-msgid "%i Wait state(s)"
-msgstr "%i estado(s) de espera"
+msgid "%1 Wait state(s)"
+msgstr "%1 estado(s) de espera"
 
 msgid "Type"
 msgstr "Tipo"
 
-msgid "Failed to set up PCap"
-msgstr "Falha na configuração de PCap"
-
 msgid "No PCap devices found"
 msgstr "Não foi encontrado um dispositivo PCap"
 
 msgid "Invalid PCap device"
 msgstr "Dispositivo PCap inválido"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "Joystick(s) standard de 2 botões"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "Joystick(s) de 2 eixos, 2 botões"
 
-msgid "Standard 4-button joystick"
-msgstr "Joystick(s) standard de 4 botões"
+msgid "2-axis, 4-button joystick"
+msgstr "Joystick de 2 eixos, 4 botões"
 
-msgid "Standard 6-button joystick"
-msgstr "Joystick(s) standard de 6 botões"
+msgid "2-axis, 6-button joystick"
+msgstr "Joystick de 2 eixos, 6 botões"
 
-msgid "Standard 8-button joystick"
-msgstr "Joystick(s) standard de 8 botões"
+msgid "2-axis, 8-button joystick"
+msgstr "Joystick de 2 eixos, 8 botões"
+
+msgid "3-axis, 2-button joystick"
+msgstr "Joystick de 3 eixos, 2 botões"
+
+msgid "3-axis, 4-button joystick"
+msgstr "Joystick de 3 eixos, 4 botões"
+
+msgid "4-axis, 4-button joystick"
+msgstr "Joystick de 4 eixos, 4 botões"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH Pedals"
+
 msgid "Microsoft SideWinder Pad"
 msgstr "Microsoft SideWinder Pad"
 
 msgid "Thrustmaster Flight Control System"
 msgstr "Thrustmaster Flight Control System"
 
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Rudder Control System"
+
+msgid "2-button gamepad(s)"
+msgstr "Manípulo(s) de jogos de 2 botões"
+
+msgid "2-button flight yoke"
+msgstr "Manípulo de voo de 2 botões"
+
+msgid "4-button gamepad"
+msgstr "Manípulo(s) de jogos de 4 botões"
+
+msgid "4-button flight yoke"
+msgstr "Manípulo de voo de 4 botões"
+
+msgid "2-button flight yoke with throttle"
+msgstr "Manípulo de voo de 2 botões com acelerador"
+
+msgid "4-button flight yoke with throttle"
+msgstr "Manípulo de voo de 4 botões com acelerador"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Volante Win95 (de 3 eixos, 4 botões)"
+
 msgid "None"
 msgstr "Nenhum"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "Não foi possível inicializar os aceleradores de teclado."
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CCS: %2, %3, %4)"
 
-msgid "Unable to register raw input."
-msgstr "Não foi possível registar a entrada bruta."
+msgid "Floppy %1 (%2): %3"
+msgstr "Disquete %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CCS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Disquete %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "&Disquete %1 (%2): %3"
 
 msgid "Advanced sector images"
 msgstr "Imagens avançadas de sector"
@@ -814,9 +924,6 @@ msgstr "Imagens avançadas de sector"
 msgid "Flux images"
 msgstr "Imagens de fluxo"
 
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "Não foi possível inicializar o SDL. O ficheiro SDL2.dll é necessário!"
-
 msgid "Are you sure you want to hard reset the emulated machine?"
 msgstr "Tem a certeza de que quer um reinício completo da máquina emulada?"
 
@@ -826,8 +933,14 @@ msgstr "Tem a certeza de que quer sair do 86Box?"
 msgid "Unable to initialize Ghostscript"
 msgstr "Não foi possível inicializar o Ghostscript"
 
-msgid "MO %i (%ls): %ls"
-msgstr "Magneto-óptico %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "Não foi possível inicializar o GhostPCL"
+
+msgid "MO %1 (%2): %3"
+msgstr "Magneto-óptico %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&Magneto-óptico %1 (%2): %3"
 
 msgid "MO images"
 msgstr "Imagens magneto-ópticas"
@@ -835,8 +948,17 @@ msgstr "Imagens magneto-ópticas"
 msgid "Welcome to 86Box!"
 msgstr "Bem-vindos ao 86Box!"
 
-msgid "Internal controller"
-msgstr "Controlador interno"
+msgid "Internal device"
+msgstr "Dispositivo integrado"
+
+msgid "&File"
+msgstr "F&icheiro"
+
+msgid "&New machine..."
+msgstr "&Nova máquina"
+
+msgid "&Check for updates..."
+msgstr "&Verificar para atualizações..."
 
 msgid "Exit"
 msgstr "Sair"
@@ -860,34 +982,22 @@ msgid "86Box v"
 msgstr "86Box v"
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "Um emulador de computadores antigos\n\nAutores: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nUsado sob a licença GNU General Public License versão 2 ou posterior. Veja o ficheiro LICENSE para mais informações."
+msgstr "Um emulador de computadores antigos\n\nAutores: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nCom contribuições anteriores de Sarah Walker, leilei, JohnElliott, greatpsycho e outros.\n\nUsado sob a licença GNU General Public License versão 2 ou posterior. Veja o ficheiro LICENSE para mais informações."
 
 msgid "Hardware not available"
 msgstr "Hardware não disponível"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Certifique-se de que a biblioteca libpcap está instalada e de que está a utilizar uma ligação de rede compatível com a biblioteca libpcap."
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "Certifique-se de que a biblioteca %1 está instalada e de que está a utilizar uma ligação de rede compatível com a biblioteca %1."
 
 msgid "Invalid configuration"
 msgstr "Configuração inválida"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 é requerido para a conversão automática de ficheiros PostScript para ficheiros PDF.\n\nQualquer documento enviado para a impressora PostScript genérica será gravado como um ficheiro PostScript (.ps)."
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " é requerido para a conversão automática de ficheiros PostScript para ficheiros PDF.\n\nQualquer documento enviado para a impressora PostScript genérica será gravado como um ficheiro PostScript (.ps)."
-
-msgid "Entering fullscreen mode"
-msgstr "A entrar no modo de ecrã cheio"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 é requerido para a conversão automática de ficheiros PCL para ficheiros PDF.\n\nQualquer documento enviado para a impressora PCL genérica será gravado como um ficheiro Printer Command Language (.pcl)."
 
 msgid "Don't show this message again"
 msgstr "Não mostrar mais esta mensagem"
@@ -904,17 +1014,14 @@ msgstr "Não reiniciar"
 msgid "CD-ROM images"
 msgstr "Imagens CD-ROM"
 
-msgid "%hs Device Configuration"
-msgstr "Configuração de dispositivo %hs"
+msgid "%1 Device Configuration"
+msgstr "Configuração de dispositivo %1"
 
 msgid "Monitor in sleep mode"
 msgstr "Ecrã em modo de sono"
 
-msgid "OpenGL Shaders"
-msgstr "Shaders OpenGL"
-
-msgid "OpenGL options"
-msgstr "Opções de OpenGL"
+msgid "GLSL shaders"
+msgstr "Shaders GLSL"
 
 msgid "You are loading an unsupported configuration"
 msgstr "Está a carregar uma configuração sem suporte!"
@@ -925,30 +1032,33 @@ msgstr "A filtragem do tipo de CPU baseada na máquina escolhida está desativad
 msgid "Continue"
 msgstr "Continuar"
 
-msgid "Cassette: %s"
-msgstr "Cassete: %s"
+msgid "Cassette: %1"
+msgstr "Cassete: %1"
+
+msgid "C&assette: %1"
+msgstr "C&assete: %1"
 
 msgid "Cassette images"
 msgstr "Imagens de cassete"
 
-msgid "Cartridge %i: %ls"
-msgstr "Cartucho %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "Cartucho %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "Car&tucho %1: %2"
 
 msgid "Cartridge images"
 msgstr "Imagens de cartucho"
 
-msgid "Error initializing renderer"
-msgstr "Erro na inicialização do renderizador"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "Não foi possível inicializar o renderizador OpenGL (3.0 Core). Utilize outro renderizador."
-
 msgid "Resume execution"
 msgstr "Retomar execução"
 
 msgid "Pause execution"
 msgstr "Pausar execução"
 
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del"
+
 msgid "Press Ctrl+Alt+Del"
 msgstr "Ctrl+Alt+Del"
 
@@ -958,17 +1068,281 @@ msgstr "Ctrl+Alt+Esc"
 msgid "Hard reset"
 msgstr "Reinicialização completa"
 
+msgid "Force shutdown"
+msgstr "Desligamento forçado"
+
+msgid "Start"
+msgstr "Iniciar"
+
+msgid "Not running"
+msgstr "Não em execução"
+
+msgid "Running"
+msgstr "Em execução"
+
+msgid "Paused"
+msgstr "Em pausa"
+
+msgid "Waiting"
+msgstr "Em espera"
+
+msgid "Powered Off"
+msgstr "Desligado"
+
+msgid "%n running"
+msgstr "%n em execução"
+
+msgid "%n paused"
+msgstr "%n em pausa"
+
+msgid "%n waiting"
+msgstr "%n em espera"
+
+msgid "%1 total"
+msgstr "%1 total"
+
+msgid "VMs: %1"
+msgstr "MVs: %1"
+
+msgid "System Directory:"
+msgstr "Directório de sistema:"
+
+msgid "Choose directory"
+msgstr "Escolher directório"
+
+msgid "Choose configuration file"
+msgstr "Escolher ficheiro de configuração"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "Ficheiros de configuração do 86Box (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Falha na leitura da configuração"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "Não foi possível abrir o ficheir de configurção seleccionado para leitura: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "Usa expressões regulares na caixa de procura"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "%1 máquina(s) estão actualmente activas. Quer mesmo sair do gerenciador de MVs"
+
+msgid "Add new system wizard"
+msgstr "Assistende de adicionamento do novo sistema"
+
+msgid "Introduction"
+msgstr "Introdução"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "Esto ajudará-lhe a adicinar um novo sistema ao 86Box."
+
+msgid "New configuration"
+msgstr "Nova configuração"
+
+msgid "Complete"
+msgstr "Completar"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "Este assistente agora vai abrir as definições do novo sistema."
+
+msgid "Use existing configuration"
+msgstr "Utilizar configuração existente"
+
+msgid "Type some notes here"
+msgstr "Escreve algumas notas aqui"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Colar o conteúdo do firecheiro da configuração existente na caixa em baixo."
+
+msgid "Load configuration from file"
+msgstr "Carregar configuração a partir do ficheiro"
+
+msgid "System name"
+msgstr "Nome do sistema"
+
+msgid "System name:"
+msgstr "Nome do sistema:"
+
+msgid "System name cannot contain certain characters"
+msgstr "O nome do sistem não pode conter alguns caracteres"
+
+msgid "System name already exists"
+msgstr "O nome do sistema já existe"
+
+msgid "Please enter a directory for the system"
+msgstr "Por favor entre o directório para o sistema"
+
+msgid "Directory does not exist"
+msgstr "O directório não existe"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "O novo directório para o sistema será criado no directorio selecciado em cima"
+
+msgid "System location:"
+msgstr "Localização do sistema:"
+
+msgid "System name and location"
+msgstr "Nome e localização do sistema"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Escreve o nome do sistema e escolha a localização"
+
+msgid "Enter the name of the system"
+msgstr "Escreve o nome do sistema"
+
+msgid "Please enter a system name"
+msgstr "Por favor, escreve o nome do sistema"
+
+msgid "Display name (optional):"
+msgstr "Nome apresentado (opcional):"
+
+msgid "Display name:"
+msgstr "Nome apresentado:"
+
+msgid "Set display name"
+msgstr "Definir o nome apresentado"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Escreve o nome apresentado (vazio para repor)"
+
+msgid "Change &display name..."
+msgstr "Alterar o nome &apresentado..."
+
+msgid "Context Menu"
+msgstr "Menu de contexto"
+
+msgid "&Open folder..."
+msgstr "&Abrir pasta..."
+
+msgid "Open p&rinter tray..."
+msgstr "Abrir &bandeja de impressora..."
+
+msgid "Set &icon..."
+msgstr "Definir &ícone..."
+
+msgid "Select an icon"
+msgstr "Seleccionar um ícone"
+
+msgid "C&lone..."
+msgstr "C&lonar..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "A máquina virtual \"%1\" (%2) será clonada para:"
+
+msgid "Directory %1 already exists"
+msgstr "O directório %1 já existe"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "Não pode usar os caracteres seguintes no nome: %1"
+
+msgid "Clone"
+msgstr "Clonar"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Falha na criação do directório para a MV clonada"
+
+msgid "Failed to clone VM."
+msgstr "Falha na clonaçào da MV."
+
+msgid "Directory in use"
+msgstr "Directório em uso"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "O directório seleccionado já está em uso. Por favor, escolhe um directório differente."
+
+msgid "Create directory failed"
+msgstr "Falha na criação do directório"
+
+msgid "Unable to create the directory for the new system"
+msgstr "Não foi possível criar a pasta para o novo sistema"
+
+msgid "Configuration write failed"
+msgstr "Falha na escritura da configuração"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "Não foi possível abrir o ficheiro de configuração em %1 para a escritura"
+
+msgid "Error adding system"
+msgstr "Error ao adicionar o sistema"
+
+msgid "Remove directory failed"
+msgstr "Falha na remoção do directório"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "Não foi possível eliminar alguns ficheiros no directório da máquina. Por favor, elimene-las manualmente."
+
+msgid "Build"
+msgstr "Compilação"
+
+msgid "Version"
+msgstr "Versão"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "Está disponível uma atualização pelo 86Box: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "Ha occurrido um error na verificação das atualizações: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>É disponível uma atualização para o 86Box!</b>"
+
+msgid "Warning"
+msgstr "Aviso"
+
+msgid "&Kill"
+msgstr "&Terminar"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "Terminar uma máquina virtual pode causar a perdida de dados. Faça-o só se o processo 86Box bloqueia-se.\n\nTem cerza que quiser terminal a máquina virtual \"%1\"?"
+
+msgid "&Delete"
+msgstr "&Apagar"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "Tem certeza de que quiser apagar a máquina virtual \"%1\" e todos os seus ficheiros? Esta ação não pode ser desfeita!"
+
+msgid "Show &config file"
+msgstr "Mostrar ficheiro de &configuração"
+
+msgid "No screenshot"
+msgstr "Sem capturas de ecrã"
+
+msgid "Search"
+msgstr "Procurar"
+
+msgid "Searching for VMs..."
+msgstr "A procurar para MVs..."
+
+msgid "Found %1"
+msgstr "%1 encontrado"
+
+msgid "System"
+msgstr "Sistema"
+
+msgid "Storage"
+msgstr "Armazenamento"
+
+msgid "Disk %1: "
+msgstr "Disco %1: "
+
+msgid "No disks"
+msgstr "Sem discos"
+
+msgid "Audio"
+msgstr "Som"
+
+msgid "Audio:"
+msgstr "Som:"
+
 msgid "ACPI shutdown"
 msgstr "Encerramento ACPI"
 
-msgid "Hard disk (%s)"
-msgstr "Disco rígido (%s)"
+msgid "ACP&I shutdown"
+msgstr "Encerramento ACP&I"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "Disco rígido (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
 msgstr "Unidades CD-ROM com barramento MFM/RLL ou ESDI nunca existiram!"
@@ -1003,9 +1377,6 @@ msgstr "Não foi possível escrever o ficheiro"
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
 msgstr "Imagens HDI ou HDX com um tamanho de sector diferente de 512 não são suportadas."
 
-msgid "USB is not yet supported"
-msgstr "O barramento USB ainda não tem suporte"
-
 msgid "Disk image file already exists"
 msgstr "A imagem de disco já existe"
 
@@ -1039,6 +1410,27 @@ msgstr "Sobrescrever"
 msgid "Don't overwrite"
 msgstr "Não sobrescrever"
 
+msgid "Raw image"
+msgstr "Imagem bruta"
+
+msgid "HDI image"
+msgstr "Imagem HDI"
+
+msgid "HDX image"
+msgstr "Imagem HDX"
+
+msgid "Fixed-size VHD"
+msgstr "VHD com tamanho fixo"
+
+msgid "Dynamic-size VHD"
+msgstr "VHD com tamanho dinâmico"
+
+msgid "Differencing VHD"
+msgstr "VHD diferenciador"
+
+msgid "(N/A)"
+msgstr "(N/D)"
+
 msgid "Raw image (.img)"
 msgstr "Imagem bruta (.img)"
 
@@ -1078,9 +1470,6 @@ msgstr "Os carimbos de data/hora dos discos pai e filho não correspondem!"
 msgid "Could not fix VHD timestamp."
 msgstr "Não foi possível corrigir o carimbo de data/hora do VHD."
 
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
-
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
 
@@ -1096,44 +1485,29 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
+msgid "160 KB"
+msgstr "160 KB"
 
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
+msgid "180 KB"
+msgstr "180 KB"
 
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
+msgid "320 KB"
+msgstr "320 KB"
 
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
+msgid "360 KB"
+msgstr "360 KB"
 
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
+msgid "640 KB"
+msgstr "640 KB"
 
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
+msgid "720 KB"
+msgstr "720 KB"
 
 msgid "1.2 MB"
 msgstr "1.2 MB"
@@ -1226,4 +1600,1384 @@ msgid "Fast"
 msgstr "Rápido"
 
 msgid "&Auto-pause on focus loss"
-msgstr "Pausa &automática na perda de focagem"
+msgstr "Pa&usa automática na perda de focagem"
+
+msgid "WinBox is no longer supported"
+msgstr "O WinBox não é mais suportado"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "O desenvolvimento do gerenciador WinBox parou em 2022 devido à falta de mantenedores. Como direcionamos nossos esforços para tornar o 86Box ainda melhor, tomamos a decisão de não mais suportar o WinBox como um gerenciador.\n\nNão serão fornecidas mais actualizações através do WinBox, e poderá encontrar um comportamento incorreto se continuar a usá-lo com versões mais recentes do 86Box. Quaisquer relatórios de erros relacionados com o comportamento do WinBox serão fechados como inválidos.\n\nVá a 86box.net para uma lista de outros gestores que pode utilizar."
+
+msgid "Generate"
+msgstr "Gerar"
+
+msgid "Joystick configuration"
+msgstr "Configuração do joystick"
+
+msgid "Device"
+msgstr "Dispositivo"
+
+msgid "%1 (X axis)"
+msgstr "%1 (eixo X)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (eixo Y)"
+
+msgid "MCA devices"
+msgstr "Dispositivos MCA"
+
+msgid "List of MCA devices:"
+msgstr "Lista de dispositivos MCA:"
+
+msgid "&Tablet tool"
+msgstr "Ferramenta para tablet"
+
+msgid "About &Qt"
+msgstr "Acerca do &Qt"
+
+msgid "&MCA devices..."
+msgstr "Dispositivos MCA..."
+
+msgid "Show non-&primary monitors"
+msgstr "Mostrar monitores não &primários"
+
+msgid "Open screenshots &folder..."
+msgstr "Abrir a pas&ta de capturas de ecrã..."
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Apl&icar o modo de estiramento na tela cheia quando maximizado"
+
+msgid "&Cursor/Puck"
+msgstr "&Cursor/Puck"
+
+msgid "&Pen"
+msgstr "C&aneta"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "&Unidade de CD/DVD do anfitrião (%1:)"
+
+msgid "&Connected"
+msgstr "&Conectado"
+
+msgid "Clear image &history"
+msgstr "Limpar o histórico de imagens(&H)"
+
+msgid "Create..."
+msgstr "Criar..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "Unidade de CD/DVD do anfitrião (%1)"
+
+msgid "Unknown Bus"
+msgstr "Autocarro desconhecido"
+
+msgid "Null Driver"
+msgstr "Condutor nulo"
+
+msgid "NIC:"
+msgstr "Placa de rede:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "NIC %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&NIC %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "Comportamento de renderização"
+
+msgid "Use target framerate:"
+msgstr "Utilizar a taxa de quadros de destino:"
+
+msgid " fps"
+msgstr " fps"
+
+msgid "VSync"
+msgstr "VSync"
+
+msgid "Synchronize with video"
+msgstr "Sincronizar com vídeo"
+
+msgid "Shaders"
+msgstr "Shaders"
+
+msgid "Remove"
+msgstr "Remover"
+
+msgid "Browse..."
+msgstr "Navegar..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "Não foi possível criar o contexto OpenGL."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "Não foi possível mudar para o contexto OpenGL."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "É necessária a versão 3.0 ou superior do OpenGL. A versão atual é %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "Erro ao inicializar o OpenGL"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nRecuando para a renderização de software."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>Ao selecionar imagens multimédia (CD-ROM, disquete, etc.) a caixa de diálogo de abertura irá começar no mesmo diretório que o ficheiro de configuração da 86Box. Esta configuração provavelmente só fará diferença no macOS.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "Esta máquina pode ter sido deslocada ou copiada."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "Para garantir a funcionalidade de rede adequada, o 86Box precisa de saber se esta máquina foi movida ou copiada.\n\nSeleccione \"Copiei-a\" se não tiver a certeza."
+
+msgid "I Moved It"
+msgstr "Movi-a"
+
+msgid "I Copied It"
+msgstr "Copiei-a"
+
+msgid "86Box Monitor #"
+msgstr "Monitor 86Box "
+
+msgid "No MCA devices."
+msgstr "Não há dispositivos MCA."
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "Placa de rede 1"
+
+msgid "Network Card #2"
+msgstr "Placa de rede 2"
+
+msgid "Network Card #3"
+msgstr "Placa de rede 3"
+
+msgid "Network Card #4"
+msgstr "Placa de rede 4"
+
+msgid "Mode:"
+msgstr "Modo:"
+
+msgid "Interface:"
+msgstr "Interface:"
+
+msgid "Adapter:"
+msgstr "Adaptador:"
+
+msgid "VDE Socket:"
+msgstr "Tomada VDE:"
+
+msgid "86Box Unit Tester"
+msgstr "Testador de unidades 86Box"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Cartão-chave do Novell NetWare 2.x"
+
+msgid "Serial port passthrough 1"
+msgstr "Passagem da porta de série 1"
+
+msgid "Serial port passthrough 2"
+msgstr "Passagem da porta de série 2"
+
+msgid "Serial port passthrough 3"
+msgstr "Passagem da porta de série 3"
+
+msgid "Serial port passthrough 4"
+msgstr "Passagem da porta de série 4"
+
+msgid "Renderer &options..."
+msgstr "Opções do re&nderizador..."
+
+msgid "PC/XT Keyboard"
+msgstr "Teclado PC/XT"
+
+msgid "AT Keyboard"
+msgstr "Teclado AT"
+
+msgid "AX Keyboard"
+msgstr "Teclado AX"
+
+msgid "PS/2 Keyboard"
+msgstr "Teclado PS/2"
+
+msgid "PS/55 Keyboard"
+msgstr "Teclado PS/55"
+
+msgid "Keys"
+msgstr "Teclas"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Rato bus Logitech/Microsoft"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Rato bus Microsoft (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Rato de série Mouse Systems"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Rato bus Mouse Systems"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Rato de série Microsoft"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Rato de série Microsoft BallPoint"
+
+msgid "Logitech Serial Mouse"
+msgstr "Rato de série Logitech"
+
+msgid "PS/2 Mouse"
+msgstr "Rato PS/2"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "Rato PS/2 QuickPort"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (série)"
+
+msgid "Default Baud rate"
+msgstr "Velocidade de transmissão padrão"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] Modem padrão compatível com Hayes"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Emulação do Roland MT-32"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Emulação do Roland MT-32 (novo)"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Emulação Roland CM-32L"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Emulação Roland CM-32LN"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "Placa filha OPL4-ML"
+
+msgid "System MIDI"
+msgstr "Sistema MIDI"
+
+msgid "MIDI Input Device"
+msgstr "Dispositivo de entrada MIDI"
+
+msgid "BIOS file"
+msgstr "Ficheiro BIOS"
+
+msgid "BIOS file (ROM #1)"
+msgstr "Ficheiro BIOS (ROM no. 1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "Ficheiro BIOS (ROM no. 2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "Ficheiro BIOS (ROM no. 3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "Ficheiro BIOS (ROM no. 4)"
+
+msgid "BIOS address"
+msgstr "Endereço da BIOS"
+
+msgid "BIOS address (ROM #1)"
+msgstr "Endereço da BIOS (ROM no. 1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "Endereço da BIOS (ROM no. 2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "Endereço da BIOS (ROM no. 3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "Endereço da BIOS (ROM no. 4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "Ativar as escritas de ROM de extensão da BIOS"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "Ativar as escritas de ROM de extensão da BIOS (ROM no. 1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "Ativar as escritas de ROM de extensão da BIOS (ROM no. 2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "Ativar as escritas de ROM de extensão da BIOS (ROM no. 3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "Ativar as escritas de ROM de extensão da BIOS (ROM no. 4)"
+
+msgid "Linear framebuffer base"
+msgstr "Base do buffer de quadros linear"
+
+msgid "Address"
+msgstr "Endereço"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "IRQ da porta série"
+
+msgid "Parallel port IRQ"
+msgstr "IRQ da porta paralela"
+
+msgid "BIOS Revision"
+msgstr "Revisão da BIOS"
+
+msgid "BIOS Version"
+msgstr "Versão da BIOS"
+
+msgid "BIOS Language"
+msgstr "Idioma da BIOS"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "Unidade de expansão IBM 5161"
+
+msgid "IBM Cassette Basic"
+msgstr "BASIC de cassete IBM"
+
+msgid "Translate 26 -> 17"
+msgstr "Traduzir 26 -> 17"
+
+msgid "Language"
+msgstr "Língua"
+
+msgid "Enable backlight"
+msgstr "Ativar a retroiluminação"
+
+msgid "Invert colors"
+msgstr "Inverter cores"
+
+msgid "BIOS size"
+msgstr "Tamanho da BIOS"
+
+msgid "BIOS size (ROM #1)"
+msgstr "Tamanho da BIOS (ROM no. 1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "Tamanho da BIOS (ROM no. 2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "Tamanho da BIOS (ROM no. 3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "Tamanho da BIOS (ROM no. 4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "Mapear C0000-C7FFF como UMB"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "Mapear C8000-CFFFF como UMB"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "Mapear D0000-D7FFF como UMB"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "Mapear D8000-DFFFF como UMB"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "Mapear E0000-E7FFF como UMB"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "Mapear E8000-EFFFF como UMB"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "Jumper JS9 (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "Dispositivo de saída MIDI"
+
+msgid "MIDI Real time"
+msgstr "MIDI em tempo real"
+
+msgid "MIDI Thru"
+msgstr "Passagem da entrada MIDI"
+
+msgid "MIDI Clockout"
+msgstr "Saída do relógio MIDI"
+
+msgid "SoundFont"
+msgstr "Fonte de som"
+
+msgid "Output Gain"
+msgstr "Ganho de saída"
+
+msgid "Chorus"
+msgstr "Coro"
+
+msgid "Chorus Voices"
+msgstr "Vozes do coro"
+
+msgid "Chorus Level"
+msgstr "Nível de coro"
+
+msgid "Chorus Speed"
+msgstr "Velocidade do coro"
+
+msgid "Chorus Depth"
+msgstr "Profundidade do coro"
+
+msgid "Chorus Waveform"
+msgstr "Forma de onda do coro"
+
+msgid "Reverb"
+msgstr "Reverberação"
+
+msgid "Reverb Room Size"
+msgstr "Tamanho da sala de reverberação"
+
+msgid "Reverb Damping"
+msgstr "Amortecimento de reverberação"
+
+msgid "Reverb Width"
+msgstr "Largura de reverberação"
+
+msgid "Reverb Level"
+msgstr "Nível de reverberação"
+
+msgid "Interpolation Method"
+msgstr "Método de interpolação"
+
+msgid "Dynamic Sample Loading"
+msgstr "Carregamento dinámico de amostras"
+
+msgid "Reverb Output Gain"
+msgstr "Ganho da saída do reverb"
+
+msgid "Reversed stereo"
+msgstr "Estéreo invertido"
+
+msgid "Nice ramp"
+msgstr "Bela rampa"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "Botões"
+
+msgid "Serial Port"
+msgstr "Porta de série"
+
+msgid "RTS toggle"
+msgstr "Alternância RTS"
+
+msgid "Revision"
+msgstr "Revisão"
+
+msgid "Controller"
+msgstr "Controlador"
+
+msgid "Show Crosshair"
+msgstr "Mostrar mira"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "Endereço MAC"
+
+msgid "MAC Address OUI"
+msgstr "OUI do endereço MAC"
+
+msgid "Enable BIOS"
+msgstr "Ativar a BIOS"
+
+msgid "Baud Rate"
+msgstr "Taxa de transmissão"
+
+msgid "TCP/IP listening port"
+msgstr "Porta de escuta TCP/IP"
+
+msgid "Phonebook File"
+msgstr "Ficheiro da lista telefónica"
+
+msgid "Telnet emulation"
+msgstr "Emulação Telnet"
+
+msgid "RAM Address"
+msgstr "Endereço RAM"
+
+msgid "RAM size"
+msgstr "Tamanho da RAM"
+
+msgid "Initial RAM size"
+msgstr "Tamanho inicial da RAM"
+
+msgid "Serial Number"
+msgstr "Número de série"
+
+msgid "Host ID"
+msgstr "ID do anfitrião"
+
+msgid "FDC Address"
+msgstr "Endereço da FDC"
+
+msgid "MPU-401 Address"
+msgstr "Endereço MPU-401"
+
+msgid "MPU-401 IRQ"
+msgstr "MPU-401 IRQ"
+
+msgid "Receive MIDI input"
+msgstr "Receber entrada MIDI"
+
+msgid "Low DMA"
+msgstr "DMA baixo"
+
+msgid "Enable Game port"
+msgstr "Ativar a porta de jogos"
+
+msgid "SID Model"
+msgstr "Modelo do SID"
+
+msgid "SID Filter Strength"
+msgstr "Força do filtro do SID"
+
+msgid "Surround module"
+msgstr "Módulo Surround"
+
+msgid "CODEC"
+msgstr "CODEC"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "Ativar a interrupção do CODEC na configuração do CODEC (necessário para alguns controladores)"
+
+msgid "SB Address"
+msgstr "Endereço SB"
+
+msgid "Adlib Address"
+msgstr "Endereço Adlib"
+
+msgid "Use EEPROM setting"
+msgstr "Utilizar a definição da EEPROM"
+
+msgid "WSS IRQ"
+msgstr "WSS IRQ"
+
+msgid "WSS DMA"
+msgstr "WSS DMA"
+
+msgid "Enable OPL"
+msgstr "Ativar OPL"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "Receber entrada MIDI (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "SB baixo DMA"
+
+msgid "6CH variant (6-channel)"
+msgstr "Variante 6CH (6 canais)"
+
+msgid "Enable CMS"
+msgstr "Ativar CMS"
+
+msgid "Mixer"
+msgstr "Misturador"
+
+msgid "High DMA"
+msgstr "DMA elevado"
+
+msgid "Control PC speaker"
+msgstr "Controlo do altifalante do PC"
+
+msgid "Memory size"
+msgstr "Tamanho da memória"
+
+msgid "EMU8000 Address"
+msgstr "Endereço da EMU8000"
+
+msgid "IDE Controller"
+msgstr "Controlador IDE"
+
+msgid "Codec"
+msgstr "Codec"
+
+msgid "GUS type"
+msgstr "Tipo GUS"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "Ativar o comando 0x04 \"Sair do 86Box\""
+
+msgid "Display type"
+msgstr "Tipo de ecrã"
+
+msgid "Composite type"
+msgstr "Tipo compósito"
+
+msgid "RGB type"
+msgstr "Tipo RGB"
+
+msgid "Line doubling type"
+msgstr "Tipo de duplicação de linha"
+
+msgid "Snow emulation"
+msgstr "Emulação de neve"
+
+msgid "Monitor type"
+msgstr "Tipo de monitor"
+
+msgid "Character set"
+msgstr "Conjunto de caracteres"
+
+msgid "XGA type"
+msgstr "Tipo XGA"
+
+msgid "Instance"
+msgstr "Instância"
+
+msgid "MMIO Address"
+msgstr "Endereço MMIO"
+
+msgid "RAMDAC type"
+msgstr "Tipo de RAMDAC"
+
+msgid "Blend"
+msgstr "Mistura"
+
+msgid "Font"
+msgstr "Tipo de letra"
+
+msgid "Bilinear filtering"
+msgstr "Filtragem bilinear"
+
+msgid "Video chroma-keying"
+msgstr "Utilizar a chave chroma do vídeo"
+
+msgid "Dithering"
+msgstr "Dithering"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "Ativar NMI para emulação CGA"
+
+msgid "Voodoo type"
+msgstr "Tipo Voodoo"
+
+msgid "Framebuffer memory size"
+msgstr "Tamanho da memória do framebuffer"
+
+msgid "Texture memory size"
+msgstr "Tamanho da memória da textura"
+
+msgid "Dither subtraction"
+msgstr "Subtração de dither"
+
+msgid "Screen Filter"
+msgstr "Filtro de tela"
+
+msgid "Render threads"
+msgstr "Renderizar threads"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Endereço inicial"
+
+msgid "Contiguous Size"
+msgstr "Tamanho contíguo"
+
+msgid "I/O Width"
+msgstr "Largura de E/S"
+
+msgid "Transfer Speed"
+msgstr "Velocidade de transferência"
+
+msgid "EMS mode"
+msgstr "Modo EMS"
+
+msgid "EMS Address"
+msgstr "Endereço da EMS"
+
+msgid "EMS 1 Address"
+msgstr "Endereço da EMS 1"
+
+msgid "EMS 2 Address"
+msgstr "Endereço da EMS 2"
+
+msgid "EMS Memory Size"
+msgstr "Tamanho da memória EMS"
+
+msgid "EMS 1 Memory Size"
+msgstr "Tamanho da memória EMS 1"
+
+msgid "EMS 2 Memory Size"
+msgstr "Tamanho da memória EMS 2"
+
+msgid "Enable EMS"
+msgstr "Activar a EMS"
+
+msgid "Enable EMS 1"
+msgstr "Activar a EMS 1"
+
+msgid "Enable EMS 2"
+msgstr "Activar a EMS 2"
+
+msgid "Address for > 2 MB"
+msgstr "Endereço para > 2 MB"
+
+msgid "Frame Address"
+msgstr "Endereço do quadro"
+
+msgid "USA"
+msgstr "EUA"
+
+msgid "Danish"
+msgstr "Dinamarquesa"
+
+msgid "Always at selected speed"
+msgstr "Sempre à velocidade selecionada"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "Definição da BIOS + Teclas de atalho (desligadas durante o POST)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 KB a partir de F0000"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 KB a partir de E0000 (endereço MSB invertido, os últimos 64 KB primeiro)"
+
+msgid "Sine"
+msgstr "Sinusoidal"
+
+msgid "Triangle"
+msgstr "Triangular"
+
+msgid "Linear"
+msgstr "Linear"
+
+msgid "4th Order"
+msgstr "De 4ª ordem"
+
+msgid "7th Order"
+msgstr "De 7ª ordem"
+
+msgid "Non-timed (original)"
+msgstr "Sem temporizador (original)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (sem jumper em JMP2)"
+
+msgid "Two"
+msgstr "Dois"
+
+msgid "Three"
+msgstr "Três"
+
+msgid "Wheel"
+msgstr "Roda"
+
+msgid "Five + Wheel"
+msgstr "Cinco + Roda"
+
+msgid "Five + 2 Wheels"
+msgstr "Cinco + 2 Rodas"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 série / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) série"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "Desativar a BIOS"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2 MB"
+
+msgid "8 MB"
+msgstr "8 MB"
+
+msgid "28 MB"
+msgstr "28 MB"
+
+msgid "1 MB"
+msgstr "1 MB"
+
+msgid "4 MB"
+msgstr "4 MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16 MB"
+
+msgid "20 MB"
+msgstr "20 MB"
+
+msgid "24 MB"
+msgstr "24 MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (estéreo)"
+
+msgid "Classic"
+msgstr "Clássico"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "Compósito"
+
+msgid "True color"
+msgstr "Cor verdadeira"
+
+msgid "Old"
+msgstr "Antigo"
+
+msgid "New"
+msgstr "Novo"
+
+msgid "Color (generic)"
+msgstr "Cor (genérico)"
+
+msgid "Green Monochrome"
+msgstr "Monocromático verde"
+
+msgid "Amber Monochrome"
+msgstr "Monocromático âmbar"
+
+msgid "Gray Monochrome"
+msgstr "Monocromático cinzento"
+
+msgid "Color (no brown)"
+msgstr "Cor (sem castanho)"
+
+msgid "Color (IBM 5153)"
+msgstr "Cor (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Duplicação simples"
+
+msgid "sRGB interpolation"
+msgstr "interpolação sRGB"
+
+msgid "Linear interpolation"
+msgstr "Interpolação linear"
+
+msgid "Has secondary 8x8 character set"
+msgstr "Tem conjunto de caracters 8x8 secundário"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Tem a placa filha Quadcolor II"
+
+msgid "Alternate monochrome contrast"
+msgstr "Contrasto monocromático alternativo"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Monocromático (5151/MDA) (branco)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Monocromático (5151/MDA) (verde)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Monocromático (5151/MDA) (âmbar)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Cor 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Cor 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Cor melhorada - Modo normal (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Cor melhorada - Modo melhorado (5154/ECD)"
+
+msgid "Green"
+msgstr "Verde"
+
+msgid "Amber"
+msgstr "Âmbar"
+
+msgid "Gray"
+msgstr "Cinzento"
+
+msgid "Grayscale"
+msgstr "Escala de cinzentos"
+
+msgid "Color"
+msgstr "Cor"
+
+msgid "U.S. English"
+msgstr "Inglês dos E.U.A."
+
+msgid "Scandinavian"
+msgstr "Escandinavo"
+
+msgid "Other languages"
+msgstr "Outros idiomas"
+
+msgid "Bochs latest"
+msgstr "Bochs mais recente"
+
+msgid "Apply overscan deltas"
+msgstr "Aplicr deltas do overscan"
+
+msgid "Mono Interlaced"
+msgstr "Monocromático entrelaçado"
+
+msgid "Mono Non-Interlaced"
+msgstr "Monocromático não entrelaçado"
+
+msgid "Color Interlaced"
+msgstr "Cor entrelaçado"
+
+msgid "Color Non-Interlaced"
+msgstr "Cor não entrelaçado"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "Gráficos 3Dfx Voodoo"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 unidades TMU)"
+
+msgid "8-bit"
+msgstr "8 bits"
+
+msgid "16-bit"
+msgstr "16 bits"
+
+msgid "Standard (150ns)"
+msgstr "Padrão (150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "Alta velocidade (120ns)"
+
+msgid "Enabled"
+msgstr "Ativado"
+
+msgid "Standard"
+msgstr "Padrão"
+
+msgid "High-Speed"
+msgstr "Alta velocidade"
+
+msgid "Stereo LPT DAC"
+msgstr "DAC LPT estéreo"
+
+msgid "Generic Text Printer"
+msgstr "Impressora de texto genérica"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Impressora matricial de pontos ESC/P 2 genérica"
+
+msgid "Generic PostScript Printer"
+msgstr "Impressora PostScript genérica"
+
+msgid "Generic PCL5e Printer"
+msgstr "Impressora genérica PCL5e"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Protocolo Internet de linha paralela"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Dongle de proteção para Savage Quest"
+
+msgid "Serial Passthrough Device"
+msgstr "Dispositivo de passagem de porta de série"
+
+msgid "Passthrough Mode"
+msgstr "Modo de passagem"
+
+msgid "Host Serial Device"
+msgstr "Dispositivo de série anfitrião"
+
+msgid "Name of pipe"
+msgstr "Nome do tubo"
+
+msgid "Data bits"
+msgstr "Bits de dados"
+
+msgid "Stop bits"
+msgstr "Bits de paragem"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Taxa de transmissão de passagem"
+
+msgid "Named Pipe (Server)"
+msgstr "Tubo nomeado (servidor)"
+
+msgid "Named Pipe (Client)"
+msgstr "Tubo nomeado (cliente)"
+
+msgid "Host Serial Passthrough"
+msgstr "Passagem da porta de série do anfitrião"
+
+msgid "E&ject %1"
+msgstr "E&jetar %1"
+
+msgid "&Unmute"
+msgstr "&Reativar som"
+
+msgid "Softfloat FPU"
+msgstr "FPU Softfloat"
+
+msgid "High performance impact"
+msgstr "Elevado impacto no desempenho"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Genérico] Disco RAM (velocidade máxima)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Genérico] 1989 (3500 RPM)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Genérico] 1992 (3600 RPM)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Genérico] 1994 (4500 RPM)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Genérico] 1996 (5400 RPM)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Genérico] 1997 (5400 RPM)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Genérico] 1998 (5400 RPM)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Genérico] 2000 (7200 RPM)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "Clone IBM 8514/A (ISA)"
+
+msgid "Vendor"
+msgstr "Fabricante"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Expansão de memória genérica PC/XT"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Expansão de memória genérica PC/AT"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "Não foi possível encontrar os fontes matriciais de pontos"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "As fontes TrueType no diretório \"roms/printer/fonts\" são necessárias para a emulação da impressora matricial de pontos ESC/P 2 genérica"
+
+msgid "Inhibit multimedia keys"
+msgstr "Deshabilitar teclas de multimídia"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Pedir confirmação antes de salvar as definições"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Pedir confirmação antes da reinicialização completa"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Pedir confirmação antes de sair"
+
+msgid "Options"
+msgstr "Opções"
+
+msgid "Model"
+msgstr "Modelo"
+
+msgid "Model:"
+msgstr "Modelo:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Falha na inicialização do renderizador Vulkan."
+
+msgid "GLSL Error"
+msgstr "Erro de GLSL"
+
+msgid "Could not load shader: %1"
+msgstr "Não foi possível carregar o shader: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "É requerida a versão 3.0 ou mais nova do OpenGL. A versão actual de GLSL é %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "Não foi possível carregar a textura: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "Não foi possível compilar o shader:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "Programa não ligado:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "Gerenciador de shaders"
+
+msgid "Shader Configuration"
+msgstr "Configuração do shader"
+
+msgid "Add"
+msgstr "Adicionar"
+
+msgid "Move up"
+msgstr "Mover para cima"
+
+msgid "Move down"
+msgstr "Mover para baixo"
+
+msgid "Could not load file %1"
+msgstr "Não foi possível carregar o ficheiro %1"
+
+msgid "Key Bindings:"
+msgstr "Teclas de atalho:"
+
+msgid "Action"
+msgstr "Ação"
+
+msgid "Keybind"
+msgstr "Atalho"
+
+msgid "Clear binding"
+msgstr "Limpar atalho"
+
+msgid "Bind"
+msgstr "Definir"
+
+msgid "Bind Key"
+msgstr "Definir tecla"
+
+msgid "Enter key combo:"
+msgstr "Escrever a combinação de teclas:"
+
+msgid "Bind conflict"
+msgstr "Conflicto entre atalhos"
+
+msgid "This key combo is already in use."
+msgstr "Esta combinação de teclas já está em uso."
+
+msgid "Send Control+Alt+Del"
+msgstr "Enviar Control+Alt+Del"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Enviar Control+Alt+Escape"
+
+msgid "Toggle fullscreen"
+msgstr "Alternar o modo em ecrã cheio"
+
+msgid "Screenshot"
+msgstr "Captura de ecrã"
+
+msgid "Release mouse pointer"
+msgstr "Soltar o ponteiro do rato"
+
+msgid "Toggle pause"
+msgstr "Alternar a pausa"
+
+msgid "Toggle mute"
+msgstr "Alternar o estado silenciado"
+
+msgid "Text files"
+msgstr "Ficheiros de texto"
+
+msgid "ROM files"
+msgstr "Ficheiros da ROM"
+
+msgid "SoundFont files"
+msgstr "Ficheiros SoundFont"
+
+msgid "Local Switch"
+msgstr "Comutador local"
+
+msgid "Remote Switch"
+msgstr "Comutador remoto"
+
+msgid "Switch:"
+msgstr "Comutador"
+
+msgid "Hub Mode"
+msgstr "Modo de concentrador"
+
+msgid "Hostname:"
+msgstr "Nome de anfitrião:"
+
+msgid "ISA RAM:"
+msgstr "RAM ISA:"
+
+msgid "ISA ROM:"
+msgstr "ROM ISA:"
+
+msgid "&Wipe NVRAM"
+msgstr "&Limpar a NVRAM"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "Esto vai apagar todos of ficheirosa da NVRAM (e relacionados) da máquina virtual localizados no subdirectório \"nvr\". Terá que reconfigurar as definições da BIOS (e possívelmente dos outros dispositivos na MV) de novo se aplicável.\n\nTem certeza de que quiser limpar todos os conteúdos da NVRAM da máquina virtual \"%1\"?"
+
+msgid "Success"
+msgstr "Éxito"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "Os conteúdos da NVRAM da máquina virtual \"%1\" foram limpados com éxito"
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "Occorreu um error na tentativa de limpar os conteúdos da NVRAM da máquina virtual \"%1\""
+
+msgid "%1 VM Manager"
+msgstr "Gerenciador de MVs de %1"
+
+msgid "%n disk(s)"
+msgstr "%n disco(s)"
+
+msgid "Unknown Status"
+msgstr "Estado desconhecido"
+
+msgid "No Machines Found!"
+msgstr "Nenhuma máquina encontrada!"
+
+msgid "Check for updates on startup"
+msgstr "Verificar para atualizações ao iniciar"
+
+msgid "Unable to determine release information"
+msgstr "Não foi possível determinar as informações da versão"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Occorreu um error na verificação para atualizações:\n\n%1\n\nPor favor, entente de novo mais tarde."
+
+msgid "Update check complete"
+msgstr "Verificaçõ para atualizacões completeda"
+
+msgid "stable"
+msgstr "estável"
+
+msgid "beta"
+msgstr "beta"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Está a utilizar a última versão %1 do 86Box: %2"
+
+msgid "version"
+msgstr "versão"
+
+msgid "build"
+msgstr "compilação"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Atualmente está a utilizar a versão <b>%1</b>."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "<b>A versão %1</b> está agora disponível."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Atualmente está a utilizar a compilação <b>%1</b>."
+
+msgid "<b>Build %1</b> is now available."
+msgstr "<b>A compilação %1</b> está agora disponível."
+
+msgid "Would you like to visit the download page?"
+msgstr "Quiser visitar a pagina de transferências?"
+
+msgid "Visit download page"
+msgstr "Visitar a pagina de transferências"
+
+msgid "Update check"
+msgstr "Verificar atualizações"
+
+msgid "Checking for updates..."
+msgstr "A verificar para atualizações..."
+
+msgid "86Box Update"
+msgstr "Atualização do 86Box"
+
+msgid "Release notes:"
+msgstr "Notas da versão:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "Falecimento da máquina virtual"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "O processo da máquina virtual \"%1\" terminou inesperadamente com o código de saída %2."
+
+msgid "The system will not be added."
+msgstr "O sistema não será adicionado."
+
+msgid "&Update mouse every CPU frame"
+msgstr "&Atualiza o estado do rato em cada bloco do CPU"
+
+msgid "Hue"
+msgstr "Matiz"
+
+msgid "Saturation"
+msgstr "Saturação"
+
+msgid "Contrast"
+msgstr "Contraste"
+
+msgid "Brightness"
+msgstr "Brilho"
+
+msgid "Sharpness"
+msgstr "Nitidez"
+
+msgid "&CGA composite settings..."
+msgstr "Definições do modo compósito &CGA..."
+
+msgid "CGA composite settings"
+msgstr "Definições do modo compósito CGA"
+
+msgid "Monitor EDID"
+msgstr "EDID do monitor"
+
+msgid "Export..."
+msgstr "Exportar..."
+
+msgid "Export EDID"
+msgstr "Exportar EDID"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "O ficheiro EDID \"%ls\" é demasiado grande."
+
+msgid "OpenGL input scale"
+msgstr "Escala de entrada do OpenGL"
+
+msgid "OpenGL input stretch mode"
+msgstr "Modo de expansão de entrada do OpenGL"
+
+msgid "Color scheme"
+msgstr "Esquema de cores"
+
+msgid "Light"
+msgstr "Claro"
+
+msgid "Dark"
+msgstr "Escuro"
diff --git a/src/qt/languages/ru-RU.po b/src/qt/languages/ru-RU.po
index 04f3bc5b3..904757d74 100644
--- a/src/qt/languages/ru-RU.po
+++ b/src/qt/languages/ru-RU.po
@@ -1,3 +1,11 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: ru_RU\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
 msgstr "&Действие"
 
@@ -10,8 +18,8 @@ msgstr "&Правый CTRL - это левый ALT"
 msgid "&Hard Reset..."
 msgstr "&Холодная перезагрузка..."
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Ctrl+Alt+Del\tCtrl+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "&Ctrl+Alt+Del"
 
 msgid "Ctrl+Alt+&Esc"
 msgstr "Ctrl+Alt+&Esc"
@@ -19,8 +27,14 @@ msgstr "Ctrl+Alt+&Esc"
 msgid "&Pause"
 msgstr "&Пауза"
 
-msgid "E&xit..."
-msgstr "&Выход..."
+msgid "Pause"
+msgstr "Пауза"
+
+msgid "Re&sume"
+msgstr "В&озобновить"
+
+msgid "E&xit"
+msgstr "&Выход"
 
 msgid "&View"
 msgstr "&Вид"
@@ -31,12 +45,6 @@ msgstr "&Скрыть строку состояния"
 msgid "Hide &toolbar"
 msgstr "С&крыть панель инструментов"
 
-msgid "Show status icons in fullscreen"
-msgstr "Показывать значки состояния в полноэкранном режиме"
-
-msgid "Show non-primary monitors"
-msgstr "&Показывать неосновные мониторы"
-
 msgid "&Resizeable window"
 msgstr "&Изменяемый размер окна"
 
@@ -46,50 +54,20 @@ msgstr "&Запомнить размер и положение"
 msgid "Re&nderer"
 msgstr "&Рендеринг"
 
-msgid "&SDL (Software)"
-msgstr "&SDL (Software)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (&Hardware)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
+msgid "&Qt (Software)"
+msgstr "&Qt (Software)"
 
 msgid "Open&GL (3.0 Core)"
-msgstr "Open&GL (3.0)"
+msgstr "Open&GL (3.0 Core)"
 
 msgid "&VNC"
 msgstr "&VNC"
 
-msgid "Renderer options..."
-msgstr "Параметры рендеринга..."
-
-msgid "OpenGL 3.0 renderer options"
-msgstr "Параметры рендеринга OpenGL 3.0"
-
-msgid "Render behavior"
-msgstr "Режим рендеринга"
-
-msgid "Synchronize with video"
-msgstr "Синхронизировать с видео"
-
-msgid "Use target framerate:"
-msgstr "Использовать целевую частоту кадров:"
-
-msgid "VSync"
-msgstr "Вертикальная синхронизация"
-
-msgid "Shaders"
-msgstr "Шейдеры"
-
-msgid "No shader selected"
-msgstr "Шейдер не выбран"
-
-msgid "Specify dimensions..."
+msgid "Specify &dimensions..."
 msgstr "&Указать размеры главного окна..."
 
-msgid "F&orce 4:3 display ratio"
-msgstr "У&становить соотношение сторон 4:3"
+msgid "Force &4:3 display ratio"
+msgstr "Установить соотношение сторон &4:3"
 
 msgid "&Window scale factor"
 msgstr "&Масштаб окна"
@@ -124,8 +102,8 @@ msgstr "&7x"
 msgid "&8x"
 msgstr "&8x"
 
-msgid "Filter method"
-msgstr "Метод фильтрации"
+msgid "Fi&lter method"
+msgstr "Метод &фильтрации"
 
 msgid "&Nearest"
 msgstr "&Ближайший"
@@ -136,8 +114,8 @@ msgstr "&Линейный"
 msgid "Hi&DPI scaling"
 msgstr "Масштабирование Hi&DPI"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "&Полноэкранный режим\tCtrl+Alt+PgUp"
+msgid "&Fullscreen"
+msgstr "&Полноэкранный режим"
 
 msgid "Fullscreen &stretch mode"
 msgstr "&Растягивание в полноэкранном режиме"
@@ -157,11 +135,8 @@ msgstr "&Целочисленное масштабирование"
 msgid "4:&3 Integer scale"
 msgstr "4:&3 Целочисленное масштабирование"
 
-msgid "Apply fullscreen stretch mode when maximized"
-msgstr "Применить полноэкранный режим растяжения при разворачивании окна"
-
-msgid "E&GA/(S)VGA settings"
-msgstr "Настройки E&GA/(S)VGA"
+msgid "EGA/(S)&VGA settings"
+msgstr "Настройки EGA/(S)&VGA"
 
 msgid "&Inverted VGA monitor"
 msgstr "&Инвертировать цвета VGA"
@@ -172,9 +147,15 @@ msgstr "&Тип экрана VGA"
 msgid "RGB &Color"
 msgstr "RGB &цветной"
 
+msgid "RGB (no brown)"
+msgstr "RGB (без коричневого)"
+
 msgid "&RGB Grayscale"
 msgstr "&RGB монохромный"
 
+msgid "Generic RGBI color monitor"
+msgstr "Стандартный цветной монитор RGBI"
+
 msgid "&Amber monitor"
 msgstr "&Янтарный оттенок"
 
@@ -211,11 +192,17 @@ msgstr "&Инструменты"
 msgid "&Settings..."
 msgstr "&Настройки машины..."
 
+msgid "Settings..."
+msgstr "Настройки машины..."
+
 msgid "&Update status bar icons"
 msgstr "&Обновление значков строки состояния"
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "Сделать с&криншот\tCtrl+F11"
+msgid "Take s&creenshot"
+msgstr "Сделать с&криншот"
+
+msgid "S&ound"
+msgstr "&Звук"
 
 msgid "&Preferences..."
 msgstr "&Параметры..."
@@ -226,23 +213,20 @@ msgstr "Включить интеграцию &Discord"
 msgid "Sound &gain..."
 msgstr "&Усиление звука..."
 
-msgid "Open screenshots folder..."
-msgstr "Открыть папку скриншотов..."
+msgid "Begin trace"
+msgstr "Начать трассировку"
 
-msgid "Begin trace\tCtrl+T"
-msgstr "Начать трассировку\tCtrl+T"
-
-msgid "End trace\tCtrl+T"
-msgstr "Завершить трассировку\tCtrl+T"
+msgid "End trace"
+msgstr "Завершить трассировку"
 
 msgid "&Help"
-msgstr "&Помощь"
+msgstr "&Справка"
 
 msgid "&Documentation..."
 msgstr "&Документация..."
 
 msgid "&About 86Box..."
-msgstr "&О программе 86Box..."
+msgstr "&О 86Box..."
 
 msgid "&New image..."
 msgstr "&Новый образ..."
@@ -268,9 +252,6 @@ msgstr "&Перемотка в конец"
 msgid "E&ject"
 msgstr "И&звлечь"
 
-msgid "Eject %s"
-msgstr "Извлечь %s"
-
 msgid "&Image..."
 msgstr "&Образ..."
 
@@ -280,14 +261,11 @@ msgstr "Э&кспорт в 86F..."
 msgid "&Mute"
 msgstr "О&тключить звук"
 
-msgid "&Unmute"
-msgstr "В&ключить звук"
-
 msgid "E&mpty"
 msgstr "П&устой"
 
-msgid "&Reload previous image"
-msgstr "&Снова загрузить предыдущий образ"
+msgid "Reload previous image"
+msgstr "Перезагрузить предыдущий образ"
 
 msgid "&Folder..."
 msgstr "&Папка..."
@@ -343,18 +321,12 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Отмена"
 
-msgid "Save these settings as &global defaults"
-msgstr "Сохранить эти параметры как &глобальные по умолчанию"
-
 msgid "&Default"
 msgstr "&По умолчанию"
 
 msgid "Language:"
 msgstr "Язык:"
 
-msgid "Icon set:"
-msgstr "Набор иконок:"
-
 msgid "Gain"
 msgstr "Усиление"
 
@@ -388,6 +360,9 @@ msgstr "Системная плата:"
 msgid "Configure"
 msgstr "Настройка"
 
+msgid "CPU:"
+msgstr "ЦП:"
+
 msgid "CPU type:"
 msgstr "Тип ЦП:"
 
@@ -424,14 +399,23 @@ msgstr "Включено (UTC)"
 msgid "Dynamic Recompiler"
 msgstr "Динамический рекомпилятор"
 
+msgid "CPU frame size"
+msgstr "Размер кадра ЦП"
+
+msgid "Larger frames (less smooth)"
+msgstr "Большие кадры (менее плавные)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Меньшие кадры (более плавные)"
+
 msgid "Video:"
 msgstr "Видеокарта 1:"
 
 msgid "Video #2:"
 msgstr "Видеокарта 2:"
 
-msgid "Voodoo Graphics"
-msgstr "Ускоритель Voodoo"
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Ускоритель Voodoo 1 или 2"
 
 msgid "IBM 8514/A Graphics"
 msgstr "Ускоритель IBM 8514/A"
@@ -439,12 +423,27 @@ msgstr "Ускоритель IBM 8514/A"
 msgid "XGA Graphics"
 msgstr "Ускоритель XGA"
 
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "IBM PS/55 Display Adapter Graphics"
+
+msgid "Keyboard:"
+msgstr "Клавиатура:"
+
+msgid "Keyboard"
+msgstr "Клавиатура"
+
 msgid "Mouse:"
 msgstr "Мышь:"
 
+msgid "Mouse"
+msgstr "Мышь"
+
 msgid "Joystick:"
 msgstr "Джойстик:"
 
+msgid "Joystick"
+msgstr "Джойстик"
+
 msgid "Joystick 1..."
 msgstr "Джойстик 1..."
 
@@ -470,10 +469,13 @@ msgid "Sound card #4:"
 msgstr "Звуковая карта 4:"
 
 msgid "MIDI Out Device:"
-msgstr "MIDI Out устройство:"
+msgstr "Устройство вывода MIDI:"
 
 msgid "MIDI In Device:"
-msgstr "MIDI In устройство:"
+msgstr "Устройство ввода MIDI:"
+
+msgid "MIDI Out:"
+msgstr "Вывод MIDI:"
 
 msgid "Standalone MPU-401"
 msgstr "Отдельный MPU-401"
@@ -490,39 +492,6 @@ msgstr "Nuked (более точный)"
 msgid "YMFM (faster)"
 msgstr "YMFM (быстрее)"
 
-msgid "Network type:"
-msgstr "Тип сети:"
-
-msgid "PCap device:"
-msgstr "Устройство PCap:"
-
-msgid "Network adapter:"
-msgstr "Сетевая карта:"
-
-msgid "Network Card #1"
-msgstr "Сетевая карта 1:"
-
-msgid "Network Card #2"
-msgstr "Сетевая карта 2:"
-
-msgid "Network Card #3"
-msgstr "Сетевая карта 3:"
-
-msgid "Network Card #4"
-msgstr "Сетевая карта 4:"
-
-msgid "Mode"
-msgstr "Режим:"
-
-msgid "Interface"
-msgstr "Интерфейс:"
-
-msgid "Adapter"
-msgstr "Адаптер:"
-
-msgid "VDE Socket"
-msgstr "VDE Socket:"
-
 msgid "COM1 Device:"
 msgstr "Устройство COM1:"
 
@@ -547,6 +516,9 @@ msgstr "Устройство LPT3:"
 msgid "LPT4 Device:"
 msgstr "Устройство LPT4:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr "DMA ECP встроенного LPT:"
+
 msgid "Serial port 1"
 msgstr "Последовательный порт COM1"
 
@@ -559,18 +531,6 @@ msgstr "Последовательный порт COM3"
 msgid "Serial port 4"
 msgstr "Последовательный порт COM4"
 
-msgid "Serial port passthrough 1"
-msgstr "Сквозной последовательный порт COM1"
-
-msgid "Serial port passthrough 2"
-msgstr "Сквозной последовательный порт COM2"
-
-msgid "Serial port passthrough 3"
-msgstr "Сквозной последовательный порт COM3"
-
-msgid "Serial port passthrough 4"
-msgstr "Сквозной последовательный порт COM4"
-
 msgid "Parallel port 1"
 msgstr "Параллельный порт LPT1"
 
@@ -583,18 +543,21 @@ msgstr "Параллельный порт LPT3"
 msgid "Parallel port 4"
 msgstr "Параллельный порт LPT4"
 
-msgid "HD Controller:"
-msgstr "Контроллер HD:"
-
 msgid "FD Controller:"
 msgstr "Контроллер FD:"
 
+msgid "CD-ROM Controller:"
+msgstr "Контроллер CD-ROM:"
+
 msgid "Tertiary IDE Controller"
 msgstr "Третичный IDE контроллер"
 
 msgid "Quaternary IDE Controller"
 msgstr "Четвертичный IDE контроллер"
 
+msgid "Hard disk"
+msgstr "Жёсткий диск"
+
 msgid "SCSI"
 msgstr "SCSI"
 
@@ -616,21 +579,18 @@ msgstr "Кассета"
 msgid "Hard disks:"
 msgstr "Жёсткие диски:"
 
+msgid "Firmware Version"
+msgstr "Версия прошивки"
+
 msgid "&New..."
 msgstr "&Создать..."
 
 msgid "&Existing..."
 msgstr "&Выбрать..."
 
-msgid "Browse..."
-msgstr "Выбрать..."
-
 msgid "&Remove"
 msgstr "&Удалить"
 
-msgid "Remove"
-msgstr "Удалить"
-
 msgid "Bus:"
 msgstr "Шина:"
 
@@ -676,14 +636,17 @@ msgstr "Проверять BPB"
 msgid "CD-ROM drives:"
 msgstr "Дисководы CD-ROM:"
 
-msgid "Earlier drive"
-msgstr "Предыдущий дисковод"
-
 msgid "MO drives:"
 msgstr "Магнитооптические дисководы:"
 
-msgid "ZIP drives:"
-msgstr "ZIP дисководы:"
+msgid "MO:"
+msgstr "Дисководы MO:"
+
+msgid "Removable disks:"
+msgstr "Cъёмные диски:"
+
+msgid "Removable disk drives:"
+msgstr "Дисководы съёмных дисков:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
@@ -692,7 +655,10 @@ msgid "ISA RTC:"
 msgstr "ISA RTC:"
 
 msgid "ISA Memory Expansion"
-msgstr "Карта расширения памяти ISA"
+msgstr "Карты расширения памяти ISA"
+
+msgid "ISA ROM Cards"
+msgstr "Карты ПЗУ ISA"
 
 msgid "Card 1:"
 msgstr "Карта 1:"
@@ -706,21 +672,21 @@ msgstr "Карта 3:"
 msgid "Card 4:"
 msgstr "Карта 4:"
 
+msgid "Generic ISA ROM Board"
+msgstr "Стандартная плата ПЗУ ISA"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "Стандартная плата на 2 ПЗУ ISA"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "Стандартная плата на 4 ПЗУ ISA"
+
 msgid "ISABugger device"
 msgstr "Устройство ISABugger"
 
 msgid "POST card"
 msgstr "Карта POST"
 
-msgid "86Box Unit Tester"
-msgstr "Модульный Тестер 86Box"
-
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
-
 msgid "86Box"
 msgstr "86Box"
 
@@ -733,17 +699,20 @@ msgstr "Неустранимая ошибка"
 msgid " - PAUSED"
 msgstr " - ПАУЗА"
 
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Нажмите Ctrl+Alt+PgDn для возврата в оконный режим."
-
 msgid "Speed"
 msgstr "Скорость"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "Съёмный диск %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "Образы ZIP"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "&Съёмный диск %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Образы съёмных дисков"
+
+msgid "Image %1"
+msgstr "Образ %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
 msgstr "86Box не смог найти ни одного подходящего для использования файла с ПЗУ.\n\nПожалуйста <a href=\"https://github.com/86Box/roms/releases/latest\">скачайте</a> набор ПЗУ и извлеките его в каталог \"roms\"."
@@ -751,9 +720,6 @@ msgstr "86Box не смог найти ни одного подходящего
 msgid "(empty)"
 msgstr "(пусто)"
 
-msgid "Clear image history"
-msgstr "Очистить историю образов"
-
 msgid "All files"
 msgstr "Все файлы"
 
@@ -781,6 +747,12 @@ msgstr "Системная плата \"%hs\" недоступна из-за о
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
 msgstr "Видеокарта \"%hs\" недоступна из-за отсутствия файла её ПЗУ в каталоге roms/video. Переключение на доступную видеокарту."
 
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "Видеокарта 2 \"%hs\" недоступна из-за отсутствия файла её ПЗУ в каталоге roms/video. Вторая видеокарта отключена."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "Устройство \"%hs\" недоступно из-за отсутствия файла его ПЗУ. Устройство проигнорировано."
+
 msgid "Machine"
 msgstr "Компьютер"
 
@@ -799,12 +771,30 @@ msgstr "Сеть"
 msgid "Ports (COM & LPT)"
 msgstr "Порты (COM и LPT)"
 
+msgid "Ports"
+msgstr "Порты"
+
+msgid "Serial ports:"
+msgstr "Последовательные порты:"
+
+msgid "Parallel ports:"
+msgstr "Параллельные порты:"
+
 msgid "Storage controllers"
 msgstr "Контроллеры дисков"
 
 msgid "Hard disks"
 msgstr "Жёсткие диски"
 
+msgid "Disks:"
+msgstr "Диски:"
+
+msgid "Floppy:"
+msgstr "Дисководы:"
+
+msgid "Controllers:"
+msgstr "Контроллеры:"
+
 msgid "Floppy & CD-ROM drives"
 msgstr "Гибкие диски и CD-ROM"
 
@@ -814,14 +804,17 @@ msgstr "Другие съёмные устройства"
 msgid "Other peripherals"
 msgstr "Другая периферия"
 
+msgid "Other devices"
+msgstr "Другие устройства"
+
 msgid "Click to capture mouse"
 msgstr "Щёлкните мышью для захвата курсора"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "Нажмите F8+F12 чтобы освободить курсор"
+msgid "Press %1 to release mouse"
+msgstr "Нажмите %1, чтобы освободить курсор"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Нажмите F8+F12 или среднюю кнопку мыши чтобы освободить курсор"
+msgid "Press %1 or middle button to release mouse"
+msgstr "Нажмите %1 или среднюю кнопку мыши, чтобы освободить курсор"
 
 msgid "Bus"
 msgstr "Шина"
@@ -841,65 +834,89 @@ msgstr "S"
 msgid "KB"
 msgstr "КБ"
 
-msgid "Could not initialize the video renderer."
-msgstr "Не удалось инициализировать рендерер видео."
-
 msgid "Default"
 msgstr "По умолчанию"
 
-msgid "%i Wait state(s)"
-msgstr "%i WS"
+msgid "%1 Wait state(s)"
+msgstr "%1 WS"
 
 msgid "Type"
 msgstr "Тип"
 
-msgid "Failed to set up PCap"
-msgstr "Не удалось настроить PCap"
-
 msgid "No PCap devices found"
 msgstr "Устройства PCap не найдены"
 
 msgid "Invalid PCap device"
 msgstr "Неверное устройство PCap"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "Стандартный 2-кнопочный джойстик"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "2-осевой, 2-кнопочный джойстик"
 
-msgid "Standard 4-button joystick"
-msgstr "Стандартный 4-кнопочный джойстик"
+msgid "2-axis, 4-button joystick"
+msgstr "2-осевой, 4-кнопочный джойстик"
 
-msgid "Standard 6-button joystick"
-msgstr "Стандартный 6-кнопочный джойстик"
+msgid "2-axis, 6-button joystick"
+msgstr "2-осевой, 6-кнопочный джойстик"
 
-msgid "Standard 8-button joystick"
-msgstr "Стандартный 8-кнопочный джойстик"
+msgid "2-axis, 8-button joystick"
+msgstr "2-осевой, 8-кнопочный джойстик"
+
+msgid "3-axis, 2-button joystick"
+msgstr "3-осевой, 2-кнопочный джойстик"
+
+msgid "3-axis, 4-button joystick"
+msgstr "3-осевой, 4-кнопочный джойстик"
+
+msgid "4-axis, 4-button joystick"
+msgstr "4-осевой, 4-кнопочный джойстик"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH Педали"
+
 msgid "Microsoft SideWinder Pad"
 msgstr "Microsoft SideWinder Pad"
 
 msgid "Thrustmaster Flight Control System"
 msgstr "Система управления полётом Thrustmaster"
 
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Система управления рулем"
+
+msgid "2-button gamepad(s)"
+msgstr "2-кнопочный геймпад"
+
+msgid "2-button flight yoke"
+msgstr "2-кнопочный flight yoke"
+
+msgid "4-button gamepad"
+msgstr "4-кнопочный геймпад"
+
+msgid "4-button flight yoke"
+msgstr "4-кнопочный flight yoke"
+
+msgid "2-button flight yoke with throttle"
+msgstr "2-кнопочный flight yoke с дросселем"
+
+msgid "4-button flight yoke with throttle"
+msgstr "4-кнопочный flight yoke с дросселем"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Руль Win95 (3-осевой, 4-кнопочный)"
+
 msgid "None"
 msgstr "Нет"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "Невозможно загрузить ускорители клавиатуры."
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 МБ (CHS: %2, %3, %4)"
 
-msgid "Unable to register raw input."
-msgstr "Невозможно зарегистрировать необработанный (RAW) ввод."
+msgid "Floppy %1 (%2): %3"
+msgstr "Дисковод %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u МБ (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Дисковод %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "&Дисковод %1 (%2): %3"
 
 msgid "Advanced sector images"
 msgstr "Расширенные образы секторов"
@@ -907,9 +924,6 @@ msgstr "Расширенные образы секторов"
 msgid "Flux images"
 msgstr "Образы Flux"
 
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "Невозможно инициализировать SDL, требуется SDL2.dll"
-
 msgid "Are you sure you want to hard reset the emulated machine?"
 msgstr "Вы уверены, что хотите выполнить холодную перезагрузку эмулируемой машины?"
 
@@ -919,8 +933,14 @@ msgstr "Вы уверены, что хотите выйти из 86Box?"
 msgid "Unable to initialize Ghostscript"
 msgstr "Невозможно инициализировать Ghostscript"
 
-msgid "MO %i (%ls): %ls"
-msgstr "Магнитооптический %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "Невозможно инициализировать GhostPCL"
+
+msgid "MO %1 (%2): %3"
+msgstr "Магнитооптический %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&Магнитооптический %1 (%2): %3"
 
 msgid "MO images"
 msgstr "Образы магнитооптических дисков"
@@ -928,8 +948,17 @@ msgstr "Образы магнитооптических дисков"
 msgid "Welcome to 86Box!"
 msgstr "Добро пожаловать в 86Box!"
 
-msgid "Internal controller"
-msgstr "Встроенный контроллер"
+msgid "Internal device"
+msgstr "Встроенное устройство"
+
+msgid "&File"
+msgstr "&Файл"
+
+msgid "&New machine..."
+msgstr "&Новая машина..."
+
+msgid "&Check for updates..."
+msgstr "&Проверить обновления..."
 
 msgid "Exit"
 msgstr "Выход"
@@ -953,34 +982,22 @@ msgid "86Box v"
 msgstr "86Box v"
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "Эмулятор старых компьютеров\n\nАвторы: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nВыпускается под лицензией GNU General Public License версии 2 или более поздней. Дополнительную информацию см. в файле LICENSE."
+msgstr "Эмулятор старых компьютеров\n\nАвторы: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nС предыдущими основными материалами от Sarah Walker, leilei, JohnElliott, greatpsycho и других.\n\nВыпускается под лицензией GNU General Public License версии 2 или более поздней. Дополнительную информацию см. в файле LICENSE."
 
 msgid "Hardware not available"
 msgstr "Оборудование недоступно"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Убедитесь, что libpcap установлен и ваше сетевое соединение, совместимо с libpcap."
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "Убедитесь, что %1 установлен и ваше сетевое соединение совместимо с %1."
 
 msgid "Invalid configuration"
 msgstr "Недопустимая конфигурация"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "Для автоматического преобразования файлов PostScript в PDF требуется %1.\n\nВсе документы, отправленные на стандартный принтер PostScript, будут сохранены в виде файлов PostScript (.ps)."
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " требуется для автоматического преобразования файлов PostScript в PDF.\n\nВсе документы, отправленные на общий принтер PostScript, будут сохранены в виде файлов PostScript (.ps)."
-
-msgid "Entering fullscreen mode"
-msgstr "Вход в полноэкранный режим"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "Для автоматического преобразования файлов PCL в PDF требуется %1.\n\nВсе документы, отправленные на стандартный принтер PCL, будут сохранены в виде файлов Printer Command Language (.pcl)."
 
 msgid "Don't show this message again"
 msgstr "Больше не показывать это сообщение"
@@ -997,17 +1014,14 @@ msgstr "Не перезагружать"
 msgid "CD-ROM images"
 msgstr "Образы CD-ROM"
 
-msgid "%hs Device Configuration"
-msgstr "Конфигурация устройства %hs"
+msgid "%1 Device Configuration"
+msgstr "Конфигурация устройства %1"
 
 msgid "Monitor in sleep mode"
 msgstr "Монитор в спящем режиме"
 
-msgid "OpenGL Shaders"
-msgstr "Шейдеры OpenGL"
-
-msgid "OpenGL options"
-msgstr "Параметры OpenGL"
+msgid "GLSL shaders"
+msgstr "Шейдеры GLSL"
 
 msgid "You are loading an unsupported configuration"
 msgstr "Вы загружаете неподдерживаемую конфигурацию"
@@ -1018,30 +1032,33 @@ msgstr "Выбор типов ЦП для этой системной платы
 msgid "Continue"
 msgstr "Продолжить"
 
-msgid "Cassette: %s"
-msgstr "Кассета: %s"
+msgid "Cassette: %1"
+msgstr "Кассета: %1"
+
+msgid "C&assette: %1"
+msgstr "&Кассета: %1"
 
 msgid "Cassette images"
 msgstr "Образы кассет"
 
-msgid "Cartridge %i: %ls"
-msgstr "Картридж %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "Картридж %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "Кар&тридж %1: %2"
 
 msgid "Cartridge images"
 msgstr "Образы картриджей"
 
-msgid "Error initializing renderer"
-msgstr "Ошибка инициализации рендерера"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "Невозможно инициализировать рендерер OpenGL (3.0). Пожалуйста, используйте другой рендерер."
-
 msgid "Resume execution"
 msgstr "Возобновить выполнение"
 
 msgid "Pause execution"
 msgstr "Приостановить выполнение"
 
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del"
+
 msgid "Press Ctrl+Alt+Del"
 msgstr "Нажать Ctrl+Alt+Del"
 
@@ -1051,17 +1068,281 @@ msgstr "Нажать Ctrl+Alt+Esc"
 msgid "Hard reset"
 msgstr "Холодная перезагрузка"
 
+msgid "Force shutdown"
+msgstr "Принудительное завершение работы"
+
+msgid "Start"
+msgstr "Пуск"
+
+msgid "Not running"
+msgstr "Не работает"
+
+msgid "Running"
+msgstr "Работает"
+
+msgid "Paused"
+msgstr "Приостановлена"
+
+msgid "Waiting"
+msgstr "Ожидание"
+
+msgid "Powered Off"
+msgstr "Выключена"
+
+msgid "%n running"
+msgstr "%n работает"
+
+msgid "%n paused"
+msgstr "%n приостановлено"
+
+msgid "%n waiting"
+msgstr "%n ожидает"
+
+msgid "%1 total"
+msgstr "всего %1"
+
+msgid "VMs: %1"
+msgstr "Машин: %1"
+
+msgid "System Directory:"
+msgstr "Системная папка:"
+
+msgid "Choose directory"
+msgstr "Выбрать папку"
+
+msgid "Choose configuration file"
+msgstr "Выбрать файл конфигурации"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "Файлы конфигурации 86Box (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Сбой при чтении конфигурации"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "Невозможно открыть выбранный файл конфигурации для чтения: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "Использовать регулярные выражения в поле поиска"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "%1 машина(ы) в настоящее время активна(ы). Вы уверены, что всё равно хотите выйти из менеджера виртуальной машины?"
+
+msgid "Add new system wizard"
+msgstr "Мастер добавления новой системы"
+
+msgid "Introduction"
+msgstr "Введение"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "Это поможет вам добавить новую систему в 86Box."
+
+msgid "New configuration"
+msgstr "Новая конфигурация"
+
+msgid "Complete"
+msgstr "Завершено"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "Мастер теперь запустит конфигурацию для новой системы."
+
+msgid "Use existing configuration"
+msgstr "Использовать существующую конфигурацию"
+
+msgid "Type some notes here"
+msgstr "Введите здесь несколько заметок"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Вставьте содержимое существующего файла конфигурации в поле ниже."
+
+msgid "Load configuration from file"
+msgstr "Загрузить конфигурацию из файла"
+
+msgid "System name"
+msgstr "Название системы"
+
+msgid "System name:"
+msgstr "Название системы:"
+
+msgid "System name cannot contain certain characters"
+msgstr "Название системы не может содержать определённые символы"
+
+msgid "System name already exists"
+msgstr "Название системы уже существует"
+
+msgid "Please enter a directory for the system"
+msgstr "Пожалуйста, введите папку для системы"
+
+msgid "Directory does not exist"
+msgstr "Папка не существует"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "Новая папка для системы будет создана в выбранной папке выше"
+
+msgid "System location:"
+msgstr "Расположение системы:"
+
+msgid "System name and location"
+msgstr "Название системы и расположение"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Введите название системы и выберите расположение"
+
+msgid "Enter the name of the system"
+msgstr "Введите название системы"
+
+msgid "Please enter a system name"
+msgstr "Пожалуйста, введите название системы"
+
+msgid "Display name (optional):"
+msgstr "Отображаемое имя (необязательно):"
+
+msgid "Display name:"
+msgstr "Отображаемое имя:"
+
+msgid "Set display name"
+msgstr "Установить отображаемое имя"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Введите новое отображаемое имя (пусто, чтобы сбросить)"
+
+msgid "Change &display name..."
+msgstr "Изменить &отображаемое имя..."
+
+msgid "Context Menu"
+msgstr "Контекстное меню"
+
+msgid "&Open folder..."
+msgstr "&Открыть папку..."
+
+msgid "Open p&rinter tray..."
+msgstr "Открыть папку &принтера..."
+
+msgid "Set &icon..."
+msgstr "Установить &значок..."
+
+msgid "Select an icon"
+msgstr "Выберите значок"
+
+msgid "C&lone..."
+msgstr "К&лонировать..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "Виртуальная машина \"%1\" (%2) будет клонирована в:"
+
+msgid "Directory %1 already exists"
+msgstr "Папка %1 уже существует"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "Вы не можете использовать следующие символы в имени: %1"
+
+msgid "Clone"
+msgstr "Клонировать"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Не удалось создать папку для клонированной виртуальной машины"
+
+msgid "Failed to clone VM."
+msgstr "Не удалось клонировать виртуальную машину."
+
+msgid "Directory in use"
+msgstr "Папка используется"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "Выбранная папка уже используется. Пожалуйста, выберите другую папку."
+
+msgid "Create directory failed"
+msgstr "Не удалось создать папку"
+
+msgid "Unable to create the directory for the new system"
+msgstr "Невозможно создать папку для новой системы"
+
+msgid "Configuration write failed"
+msgstr "Не удалось записать файл конфигурации"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "Невозможно открыть файл конфигурации в %1 для записи"
+
+msgid "Error adding system"
+msgstr "Ошибка добавления системы"
+
+msgid "Remove directory failed"
+msgstr "Сбой при удалении папки"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "Некоторые файлы в папке машины невозможно удалить. Пожалуйста, удалите их вручную."
+
+msgid "Build"
+msgstr "Сборка"
+
+msgid "Version"
+msgstr "Версия"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "Доступно обновление для 86Box: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "При проверке обновлений произошла ошибка: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>Доступно обновление для 86Box!</b>"
+
+msgid "Warning"
+msgstr "Внимание"
+
+msgid "&Kill"
+msgstr "&Завершить процесс"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "Принудительное завершение процесса виртуальной машины может привести к потере данных. Делайте это только в том случае, если процесс 86Box завис.\n\nВы действительно хотите принудительно завершить процесс виртуальной машины \"%1\"?"
+
+msgid "&Delete"
+msgstr "&Удалить"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "Вы действительно хотите удалить виртуальную машину \"%1\" и все её файлы? Это действие не может быть отменено!"
+
+msgid "Show &config file"
+msgstr "Показать файл &конфигурации"
+
+msgid "No screenshot"
+msgstr "Нет скриншота"
+
+msgid "Search"
+msgstr "Поиск"
+
+msgid "Searching for VMs..."
+msgstr "Поиск виртуальных машин..."
+
+msgid "Found %1"
+msgstr "Найдено %1"
+
+msgid "System"
+msgstr "Система"
+
+msgid "Storage"
+msgstr "Диски"
+
+msgid "Disk %1: "
+msgstr "Диск %1: "
+
+msgid "No disks"
+msgstr "Нет дисков"
+
+msgid "Audio"
+msgstr "Аудио"
+
+msgid "Audio:"
+msgstr "Аудио:"
+
 msgid "ACPI shutdown"
 msgstr "Сигнал завершения ACPI"
 
-msgid "Hard disk (%s)"
-msgstr "Жёсткий диск (%s)"
+msgid "ACP&I shutdown"
+msgstr "Сигнал завершения ACP&I"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "Жёсткий диск (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
 msgstr "MFM/RLL или ESDI дисководов CD-ROM никогда не существовало"
@@ -1096,9 +1377,6 @@ msgstr "Невозможно записать файл"
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
 msgstr "Образы HDI или HDX с размером сектора, отличным от 512, не поддерживаются."
 
-msgid "USB is not yet supported"
-msgstr "USB пока не поддерживается"
-
 msgid "Disk image file already exists"
 msgstr "Файл образа диска уже существует"
 
@@ -1132,6 +1410,27 @@ msgstr "Перезаписать"
 msgid "Don't overwrite"
 msgstr "Не перезаписывать"
 
+msgid "Raw image"
+msgstr "RAW образ"
+
+msgid "HDI image"
+msgstr "Образ HDI"
+
+msgid "HDX image"
+msgstr "Образ HDX"
+
+msgid "Fixed-size VHD"
+msgstr "Образ VHD фиксированного размера"
+
+msgid "Dynamic-size VHD"
+msgstr "Образ VHD динамического размера"
+
+msgid "Differencing VHD"
+msgstr "Дифференцированный образ VHD"
+
+msgid "(N/A)"
+msgstr "(Нет)"
+
 msgid "Raw image (.img)"
 msgstr "RAW образ (.img)"
 
@@ -1142,10 +1441,10 @@ msgid "HDX image (.hdx)"
 msgstr "Образ HDX (.hdx)"
 
 msgid "Fixed-size VHD (.vhd)"
-msgstr "VHD фиксированного размера (.vhd)"
+msgstr "Образ VHD фиксированного размера (.vhd)"
 
 msgid "Dynamic-size VHD (.vhd)"
-msgstr "VHD динамического размера (.vhd)"
+msgstr "Образ VHD динамического размера (.vhd)"
 
 msgid "Differencing VHD (.vhd)"
 msgstr "Дифференцированный образ VHD (.vhd)"
@@ -1171,9 +1470,6 @@ msgstr "Временные метки родительского и дочерн
 msgid "Could not fix VHD timestamp."
 msgstr "Не удалось исправить временную метку VHD."
 
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
-
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
 
@@ -1189,44 +1485,29 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
+msgid "160 KB"
+msgstr "160 КБ"
 
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
+msgid "180 KB"
+msgstr "180 КБ"
 
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
+msgid "320 KB"
+msgstr "320 КБ"
 
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
+msgid "360 KB"
+msgstr "360 КБ"
 
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
+msgid "640 KB"
+msgstr "640 КБ"
 
-msgid "160 kB"
-msgstr "160 кБ"
-
-msgid "180 kB"
-msgstr "180 кБ"
-
-msgid "320 kB"
-msgstr "320 кБ"
-
-msgid "360 kB"
-msgstr "360 кБ"
-
-msgid "640 kB"
-msgstr "640 кБ"
-
-msgid "720 kB"
-msgstr "720 кБ"
+msgid "720 KB"
+msgstr "720 КБ"
 
 msgid "1.2 MB"
 msgstr "1.2 МБ"
@@ -1320,3 +1601,1383 @@ msgstr "Быстрый"
 
 msgid "&Auto-pause on focus loss"
 msgstr "&Автопауза при потере фокуса"
+
+msgid "WinBox is no longer supported"
+msgstr "WinBox больше не поддерживается"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "Разработка менеджера WinBox прекратилась в 2022 году из-за отсутствия сопровождающих. Поскольку мы направляем наши усилия на то, чтобы сделать 86Box еще лучше, мы приняли решение больше не поддерживать WinBox в качестве менеджера.\n\nWinBox больше не будет обновляться, и вы можете столкнуться с некорректным поведением, если продолжите использовать его с новыми версиями 86Box. Любые сообщения об ошибках, связанных с поведением WinBox, будут закрыты как недействительные.\n\nПерейдите на сайт 86box.net для получения списка других менеджеров, которые вы можете использовать."
+
+msgid "Generate"
+msgstr "Создать"
+
+msgid "Joystick configuration"
+msgstr "Конфигурация джойстика"
+
+msgid "Device"
+msgstr "Устройство"
+
+msgid "%1 (X axis)"
+msgstr "%1 (ось X)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (ось Y)"
+
+msgid "MCA devices"
+msgstr "Устройства MCA"
+
+msgid "List of MCA devices:"
+msgstr "Список устройств MCA:"
+
+msgid "&Tablet tool"
+msgstr "Планшетный &инструмент"
+
+msgid "About &Qt"
+msgstr "О &Qt"
+
+msgid "&MCA devices..."
+msgstr "Устройства &MCA..."
+
+msgid "Show non-&primary monitors"
+msgstr "&Показывать неосновные мониторы"
+
+msgid "Open screenshots &folder..."
+msgstr "Открыть папку &скриншотов..."
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Применить полно&экранный режим растяжения при разворачивании окна"
+
+msgid "&Cursor/Puck"
+msgstr "&Курсор/шайба"
+
+msgid "&Pen"
+msgstr "&Ручка"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "CD/DVD Привод &хоста (%1:)"
+
+msgid "&Connected"
+msgstr "&Кабель подключен"
+
+msgid "Clear image &history"
+msgstr "Очистить &историю образов"
+
+msgid "Create..."
+msgstr "Создать..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "CD/DVD Привод хоста (%1)"
+
+msgid "Unknown Bus"
+msgstr "Неизвестная шина"
+
+msgid "Null Driver"
+msgstr "Нулевой драйвер"
+
+msgid "NIC:"
+msgstr "Сетевой адаптер:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "NIC %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&NIC %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "Режим рендеринга"
+
+msgid "Use target framerate:"
+msgstr "Использовать целевую частоту кадров:"
+
+msgid " fps"
+msgstr " fps"
+
+msgid "VSync"
+msgstr "Вертикальная синхронизация"
+
+msgid "Synchronize with video"
+msgstr "Синхронизировать с видео"
+
+msgid "Shaders"
+msgstr "Шейдеры"
+
+msgid "Remove"
+msgstr "Удалить"
+
+msgid "Browse..."
+msgstr "Обзор..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "Не удалось создать контекст OpenGL."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "Не удалось переключиться на контекст OpenGL."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "Требуется OpenGL версии 3.0 или выше. Текущая версия %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "Ошибка инициализации OpenGL"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nПереключение на программный рендеринг."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>При выборе образов носителей (CD-ROM, дискет и т. д.) диалог открытия будет запускаться в том же каталоге, что и файл конфигурации 86Box. Эта настройка, скорее всего, будет иметь значение только на macOS.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "Возможно, эта машина была перемещена или скопирована."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "Чтобы обеспечить правильную работу сети, 86Box должен знать, была ли эта машина перемещена или скопирована.\n\nЕсли вы не уверены, выберите \"Скопирована\"."
+
+msgid "I Moved It"
+msgstr "Перемещена"
+
+msgid "I Copied It"
+msgstr "Скопирована"
+
+msgid "86Box Monitor #"
+msgstr "86Box Monitor #"
+
+msgid "No MCA devices."
+msgstr "Нет устройств MCA."
+
+msgid "MiB"
+msgstr "МиБ"
+
+msgid "GiB"
+msgstr "ГиБ"
+
+msgid "Network Card #1"
+msgstr "Сетевая карта 1"
+
+msgid "Network Card #2"
+msgstr "Сетевая карта 2"
+
+msgid "Network Card #3"
+msgstr "Сетевая карта 3"
+
+msgid "Network Card #4"
+msgstr "Сетевая карта 4"
+
+msgid "Mode:"
+msgstr "Режим:"
+
+msgid "Interface:"
+msgstr "Интерфейс:"
+
+msgid "Adapter:"
+msgstr "Адаптер:"
+
+msgid "VDE Socket:"
+msgstr "VDE сокет:"
+
+msgid "86Box Unit Tester"
+msgstr "Модульный Тестер 86Box"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Карта ключей Novell NetWare 2.x"
+
+msgid "Serial port passthrough 1"
+msgstr "Сквозной последовательный порт COM1"
+
+msgid "Serial port passthrough 2"
+msgstr "Сквозной последовательный порт COM2"
+
+msgid "Serial port passthrough 3"
+msgstr "Сквозной последовательный порт COM3"
+
+msgid "Serial port passthrough 4"
+msgstr "Сквозной последовательный порт COM4"
+
+msgid "Renderer &options..."
+msgstr "Параметры &рендеринга..."
+
+msgid "PC/XT Keyboard"
+msgstr "Клавиатура PC/XT"
+
+msgid "AT Keyboard"
+msgstr "Клавиатура AT"
+
+msgid "AX Keyboard"
+msgstr "Клавиатура AX"
+
+msgid "PS/2 Keyboard"
+msgstr "Клавиатура PS/2"
+
+msgid "PS/55 Keyboard"
+msgstr "Клавиатура PS/55"
+
+msgid "Keys"
+msgstr "Клавиши"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Bus-мышь Logitech/Microsoft"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Bus-мышь Microsoft (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "COM-мышь Mouse Systems"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Bus-мышь Mouse Systems"
+
+msgid "Microsoft Serial Mouse"
+msgstr "COM-мышь Microsoft"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "COM-мышь Microsoft BallPoint"
+
+msgid "Logitech Serial Mouse"
+msgstr "COM-мышь Logitech"
+
+msgid "PS/2 Mouse"
+msgstr "Мышь PS/2"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "Мышь PS/2 QuickPort"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (последовательный)"
+
+msgid "Default Baud rate"
+msgstr "Скорость передачи данных по умолчанию"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] Стандартный Hayes-совместимый модем"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Эмуляция Roland MT-32"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Эмуляция Roland MT-32 (Новый)"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Эмуляция Roland CM-32L"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Эмуляция Roland CM-32LN"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "Дочерняя плата OPL4-ML"
+
+msgid "System MIDI"
+msgstr "Системный MIDI"
+
+msgid "MIDI Input Device"
+msgstr "Устройство ввода MIDI"
+
+msgid "BIOS file"
+msgstr "Файл BIOS"
+
+msgid "BIOS file (ROM #1)"
+msgstr "Файл BIOS (ПЗУ #1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "Файл BIOS (ПЗУ #2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "Файл BIOS (ПЗУ #3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "Файл BIOS (ПЗУ #4)"
+
+msgid "BIOS address"
+msgstr "Адрес BIOS"
+
+msgid "BIOS address (ROM #1)"
+msgstr "Адрес BIOS (ПЗУ #1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "Адрес BIOS (ПЗУ #2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "Адрес BIOS (ПЗУ #3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "Адрес BIOS (ПЗУ #4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "Разрешить запись в ПЗУ расширения BIOS"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "Разрешить запись в ПЗУ расширения BIOS (ПЗУ #1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "Разрешить запись в ПЗУ расширения BIOS (ПЗУ #2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "Разрешить запись в ПЗУ расширения BIOS (ПЗУ #3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "Разрешить запись в ПЗУ расширения BIOS (ПЗУ #4)"
+
+msgid "Linear framebuffer base"
+msgstr "Линейный фреймбуфер"
+
+msgid "Address"
+msgstr "Адрес"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "IRQ последовательного порта"
+
+msgid "Parallel port IRQ"
+msgstr "IRQ параллельного порта"
+
+msgid "BIOS Revision"
+msgstr "Версия BIOS"
+
+msgid "BIOS Version"
+msgstr "Версия BIOS"
+
+msgid "BIOS Language"
+msgstr "Язык BIOS"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "Блок расширения IBM 5161"
+
+msgid "IBM Cassette Basic"
+msgstr "Кассетный бейсик IBM"
+
+msgid "Translate 26 -> 17"
+msgstr "Переводить 26 -> 17"
+
+msgid "Language"
+msgstr "Язык"
+
+msgid "Enable backlight"
+msgstr "Включить подсветку"
+
+msgid "Invert colors"
+msgstr "Инвертировать цвета"
+
+msgid "BIOS size"
+msgstr "Размер BIOS"
+
+msgid "BIOS size (ROM #1)"
+msgstr "Размер BIOS (ПЗУ #1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "Размер BIOS (ПЗУ #2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "Размер BIOS (ПЗУ #3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "Размер BIOS (ПЗУ #4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "Отображение C0000-C7FFF в качестве UMB"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "Отображение C8000-CFFFF в качестве UMB"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "Отображение D0000-D7FFF в качестве UMB"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "Отображение D8000-DFFFF в качестве UMB"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "Отображение E0000-E7FFF в качестве UMB"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "Отображение E8000-EFFFF в качестве UMB"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "Джампер JS9 (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "Устройство вывода MIDI"
+
+msgid "MIDI Real time"
+msgstr "MIDI в реальном времени"
+
+msgid "MIDI Thru"
+msgstr "Пропускание MIDI-входа"
+
+msgid "MIDI Clockout"
+msgstr "MIDI Clockout"
+
+msgid "SoundFont"
+msgstr "SoundFont"
+
+msgid "Output Gain"
+msgstr "Усиление выхода"
+
+msgid "Chorus"
+msgstr "Хорус"
+
+msgid "Chorus Voices"
+msgstr "Голоса хоруса"
+
+msgid "Chorus Level"
+msgstr "Уровень хоруса"
+
+msgid "Chorus Speed"
+msgstr "Скорость хоруса"
+
+msgid "Chorus Depth"
+msgstr "Глубина хоруса"
+
+msgid "Chorus Waveform"
+msgstr "Форма волны хоруса"
+
+msgid "Reverb"
+msgstr "Реверберация"
+
+msgid "Reverb Room Size"
+msgstr "Размер комнаты реверберации"
+
+msgid "Reverb Damping"
+msgstr "Демпфирование реверберации"
+
+msgid "Reverb Width"
+msgstr "Ширина реверберации"
+
+msgid "Reverb Level"
+msgstr "Уровень реверберации"
+
+msgid "Interpolation Method"
+msgstr "Метод интерполяции"
+
+msgid "Dynamic Sample Loading"
+msgstr "Динамическая загрузка сэмплов"
+
+msgid "Reverb Output Gain"
+msgstr "Усиление выходного сигнала ревербератора"
+
+msgid "Reversed stereo"
+msgstr "Реверс стерео"
+
+msgid "Nice ramp"
+msgstr "Улучшение рампы"
+
+msgid "Hz"
+msgstr "Гц"
+
+msgid "Buttons"
+msgstr "Кнопки"
+
+msgid "Serial Port"
+msgstr "Последовательный порт"
+
+msgid "RTS toggle"
+msgstr "Переключатель RTS"
+
+msgid "Revision"
+msgstr "Версия"
+
+msgid "Controller"
+msgstr "Контроллер"
+
+msgid "Show Crosshair"
+msgstr "Показать перекрестие"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "MAC-адрес"
+
+msgid "MAC Address OUI"
+msgstr "OUI MAC-адреса"
+
+msgid "Enable BIOS"
+msgstr "Включить BIOS"
+
+msgid "Baud Rate"
+msgstr "Скорость передачи данных"
+
+msgid "TCP/IP listening port"
+msgstr "Порт прослушивания TCP/IP"
+
+msgid "Phonebook File"
+msgstr "Файл телефонной книги"
+
+msgid "Telnet emulation"
+msgstr "Эмуляция Telnet"
+
+msgid "RAM Address"
+msgstr "Адрес оперативной памяти"
+
+msgid "RAM size"
+msgstr "Размер оперативной памяти"
+
+msgid "Initial RAM size"
+msgstr "Начальный размер оперативной памяти"
+
+msgid "Serial Number"
+msgstr "Серийный номер"
+
+msgid "Host ID"
+msgstr "Идентификатор хоста"
+
+msgid "FDC Address"
+msgstr "Адрес FDC"
+
+msgid "MPU-401 Address"
+msgstr "Адрес MPU-401"
+
+msgid "MPU-401 IRQ"
+msgstr "IRQ MPU-401"
+
+msgid "Receive MIDI input"
+msgstr "Включить MIDI-вход"
+
+msgid "Low DMA"
+msgstr "Низкий DMA"
+
+msgid "Enable Game port"
+msgstr "Включить игровой порт"
+
+msgid "SID Model"
+msgstr "Модель SID"
+
+msgid "SID Filter Strength"
+msgstr "Сила фильтра SID"
+
+msgid "Surround module"
+msgstr "Модуль объёмного звучания"
+
+msgid "CODEC"
+msgstr "Кодек"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "Поднимать прерывание кодека при настройке кодека (необходимо некоторым драйверам)"
+
+msgid "SB Address"
+msgstr "Адрес SB"
+
+msgid "Adlib Address"
+msgstr "Адрес AdLib"
+
+msgid "Use EEPROM setting"
+msgstr "Использовать настройку EEPROM"
+
+msgid "WSS IRQ"
+msgstr "IRQ WSS"
+
+msgid "WSS DMA"
+msgstr "DMA WSS"
+
+msgid "Enable OPL"
+msgstr "Включить OPL"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "Включить MIDI-вход (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "Низкий DMA SB"
+
+msgid "6CH variant (6-channel)"
+msgstr "Вариант 6CH (6-канальный)"
+
+msgid "Enable CMS"
+msgstr "Включить CMS"
+
+msgid "Mixer"
+msgstr "Микшер"
+
+msgid "High DMA"
+msgstr "Высокий DMA"
+
+msgid "Control PC speaker"
+msgstr "Управление динамиком ПК"
+
+msgid "Memory size"
+msgstr "Размер памяти"
+
+msgid "EMU8000 Address"
+msgstr "Адрес EMU8000"
+
+msgid "IDE Controller"
+msgstr "Контроллер IDE"
+
+msgid "Codec"
+msgstr "Кодек"
+
+msgid "GUS type"
+msgstr "Тип GUS"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "Включить команду 0x04 \"Выход из 86Box\""
+
+msgid "Display type"
+msgstr "Тип дисплея"
+
+msgid "Composite type"
+msgstr "Тип композитного видео"
+
+msgid "RGB type"
+msgstr "Тип видео RGB"
+
+msgid "Line doubling type"
+msgstr "Тип удвоения линии"
+
+msgid "Snow emulation"
+msgstr "Эмуляция снега"
+
+msgid "Monitor type"
+msgstr "Тип монитора"
+
+msgid "Character set"
+msgstr "Набор символов"
+
+msgid "XGA type"
+msgstr "Тип XGA"
+
+msgid "Instance"
+msgstr "Экземпляр"
+
+msgid "MMIO Address"
+msgstr "Адрес MMIO"
+
+msgid "RAMDAC type"
+msgstr "Тип RAMDAC"
+
+msgid "Blend"
+msgstr "Смесь"
+
+msgid "Font"
+msgstr "Шрифт"
+
+msgid "Bilinear filtering"
+msgstr "Билинейная фильтрация"
+
+msgid "Video chroma-keying"
+msgstr "Видео хромакеинг"
+
+msgid "Dithering"
+msgstr "Дизеринг"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "Включить NMI для эмуляции CGA"
+
+msgid "Voodoo type"
+msgstr "Тип Voodoo"
+
+msgid "Framebuffer memory size"
+msgstr "Размер памяти фреймбуфера"
+
+msgid "Texture memory size"
+msgstr "Размер памяти текстур"
+
+msgid "Dither subtraction"
+msgstr "Вычитание дизеринга"
+
+msgid "Screen Filter"
+msgstr "Экранный фильтр"
+
+msgid "Render threads"
+msgstr "Потоки рендеринга"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Стартовый адрес"
+
+msgid "Contiguous Size"
+msgstr "Смежный размер"
+
+msgid "I/O Width"
+msgstr "Ширина ввода/вывода"
+
+msgid "Transfer Speed"
+msgstr "Скорость передачи данных"
+
+msgid "EMS mode"
+msgstr "Режим EMS"
+
+msgid "EMS Address"
+msgstr "Адрес EMS"
+
+msgid "EMS 1 Address"
+msgstr "Адрес EMS 1"
+
+msgid "EMS 2 Address"
+msgstr "Адрес EMS 2"
+
+msgid "EMS Memory Size"
+msgstr "Размер памяти EMS"
+
+msgid "EMS 1 Memory Size"
+msgstr "Размер памяти EMS 1"
+
+msgid "EMS 2 Memory Size"
+msgstr "Размер памяти EMS 2"
+
+msgid "Enable EMS"
+msgstr "Включить EMS"
+
+msgid "Enable EMS 1"
+msgstr "Включить EMS 1"
+
+msgid "Enable EMS 2"
+msgstr "Включить EMS 2"
+
+msgid "Address for > 2 MB"
+msgstr "Адрес для > 2 МБ"
+
+msgid "Frame Address"
+msgstr "Адрес кадра"
+
+msgid "USA"
+msgstr "США"
+
+msgid "Danish"
+msgstr "Датский"
+
+msgid "Always at selected speed"
+msgstr "Всегда на выбранной скорости"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "Настройка BIOS + горячие клавиши (отключается во время POST)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 КБ, начиная с F0000"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 КБ, начиная с E0000 (адрес MSB инвертирован, сначала последние 64 КБ)"
+
+msgid "Sine"
+msgstr "Синусоидальная"
+
+msgid "Triangle"
+msgstr "Треугольная"
+
+msgid "Linear"
+msgstr "Линейный"
+
+msgid "4th Order"
+msgstr "4-го порядка"
+
+msgid "7th Order"
+msgstr "7-го порядка"
+
+msgid "Non-timed (original)"
+msgstr "Без таймера (оригинал)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Гц (без джампера на JMP2)"
+
+msgid "Two"
+msgstr "Две"
+
+msgid "Three"
+msgstr "Три"
+
+msgid "Wheel"
+msgstr "Колесо"
+
+msgid "Five + Wheel"
+msgstr "Пять + колесо"
+
+msgid "Five + 2 Wheels"
+msgstr "Пять + 2 колеса"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 последовательная / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) последовательная"
+
+msgid "8 KB"
+msgstr "8 КБ"
+
+msgid "32 KB"
+msgstr "32 КБ"
+
+msgid "16 KB"
+msgstr "16 КБ"
+
+msgid "64 KB"
+msgstr "64 КБ"
+
+msgid "Disable BIOS"
+msgstr "Отключить BIOS"
+
+msgid "512 KB"
+msgstr "512 КБ"
+
+msgid "2 MB"
+msgstr "2 МБ"
+
+msgid "8 MB"
+msgstr "8 МБ"
+
+msgid "28 MB"
+msgstr "28 МБ"
+
+msgid "1 MB"
+msgstr "1 МБ"
+
+msgid "4 MB"
+msgstr "4 МБ"
+
+msgid "12 MB"
+msgstr "12 МБ"
+
+msgid "16 MB"
+msgstr "16 МБ"
+
+msgid "20 MB"
+msgstr "20 МБ"
+
+msgid "24 MB"
+msgstr "24 МБ"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (стерео)"
+
+msgid "Classic"
+msgstr "Классический"
+
+msgid "256 KB"
+msgstr "256 КБ"
+
+msgid "Composite"
+msgstr "Композитное видео"
+
+msgid "True color"
+msgstr "True Color"
+
+msgid "Old"
+msgstr "Старый"
+
+msgid "New"
+msgstr "Новый"
+
+msgid "Color (generic)"
+msgstr "Цветной (стандартный)"
+
+msgid "Green Monochrome"
+msgstr "Зелёный монохромный"
+
+msgid "Amber Monochrome"
+msgstr "Янтарный монохромный"
+
+msgid "Gray Monochrome"
+msgstr "Серый монохромный"
+
+msgid "Color (no brown)"
+msgstr "Цветной (без коричневого)"
+
+msgid "Color (IBM 5153)"
+msgstr "Цветной (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Простое удвоение"
+
+msgid "sRGB interpolation"
+msgstr "Интерполяция sRGB"
+
+msgid "Linear interpolation"
+msgstr "Линейная интерполяция"
+
+msgid "Has secondary 8x8 character set"
+msgstr "Вторичный набор символов 8x8"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Дочерняя плата Quadcolor II"
+
+msgid "Alternate monochrome contrast"
+msgstr "Альтернативный монохромный контраст"
+
+msgid "128 KB"
+msgstr "128 КБ"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Монохромный (5151/MDA) (белый)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Монохромный (5151/MDA) (зелёный)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Монохромный (5151/MDA) (янтарный)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Цветной 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Цветной 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Улучшенный цветной - нормальный режим (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Улучшенный цветной - улучшенный режим (5154/ECD)"
+
+msgid "Green"
+msgstr "Зелёный"
+
+msgid "Amber"
+msgstr "Янтарный"
+
+msgid "Gray"
+msgstr "Серый"
+
+msgid "Grayscale"
+msgstr "Монохромный"
+
+msgid "Color"
+msgstr "Цветной"
+
+msgid "U.S. English"
+msgstr "Английский США"
+
+msgid "Scandinavian"
+msgstr "Скандинавский"
+
+msgid "Other languages"
+msgstr "Другие языки"
+
+msgid "Bochs latest"
+msgstr "Bochs последний"
+
+msgid "Apply overscan deltas"
+msgstr "Применить дельты вылетов развёртки"
+
+msgid "Mono Interlaced"
+msgstr "Монохромный с чересстрочной развёрткой"
+
+msgid "Mono Non-Interlaced"
+msgstr "Монохромный без чересстрочной развёртки"
+
+msgid "Color Interlaced"
+msgstr "Цветной с чересстрочной развёрткой"
+
+msgid "Color Non-Interlaced"
+msgstr "Цветной без чересстрочной развёртки"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "Ускоритель 3Dfx Voodoo"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 TMU)"
+
+msgid "8-bit"
+msgstr "8-бит"
+
+msgid "16-bit"
+msgstr "16-бит"
+
+msgid "Standard (150ns)"
+msgstr "Стандартный (150 нс)"
+
+msgid "High-Speed (120ns)"
+msgstr "Высокоскоростной (120 нс)"
+
+msgid "Enabled"
+msgstr "Включено"
+
+msgid "Standard"
+msgstr "Стандарт"
+
+msgid "High-Speed"
+msgstr "Высокоскоростной"
+
+msgid "Stereo LPT DAC"
+msgstr "Стереофонический ЦАП LPT"
+
+msgid "Generic Text Printer"
+msgstr "Стандартный текстовый принтер"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Стандартный матричный принтер ESC/P 2"
+
+msgid "Generic PostScript Printer"
+msgstr "Стандартный принтер PostScript"
+
+msgid "Generic PCL5e Printer"
+msgstr "Стандартный принтер PCL5e"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Parallel Line Internet Protocol"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Защитный донгл для Savage Quest"
+
+msgid "Serial Passthrough Device"
+msgstr "Устройство проброса через последовательный порт"
+
+msgid "Passthrough Mode"
+msgstr "Режим проброса"
+
+msgid "Host Serial Device"
+msgstr "Последовательное устройство хоста"
+
+msgid "Name of pipe"
+msgstr "Название пайпа"
+
+msgid "Data bits"
+msgstr "Биты данных"
+
+msgid "Stop bits"
+msgstr "Стоп-биты"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Скорость передачи данных через канал"
+
+msgid "Named Pipe (Server)"
+msgstr "Именованный пайп (Сервер)"
+
+msgid "Named Pipe (Client)"
+msgstr "Именованный пайп (Клиент)"
+
+msgid "Host Serial Passthrough"
+msgstr "Последовательный порт хоста"
+
+msgid "E&ject %1"
+msgstr "И&звлечь %1"
+
+msgid "&Unmute"
+msgstr "В&ключить звук"
+
+msgid "Softfloat FPU"
+msgstr "Softfloat FPU"
+
+msgid "High performance impact"
+msgstr "Сильное влияние на производительность"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Стандартный] RAM-диск (макс. скорость)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Стандартный] 1989 (3500 RPM)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Стандартный] 1992 (3600 RPM)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Стандартный] 1994 (4500 RPM)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Стандартный] 1996 (5400 RPM)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Стандартный] 1997 (5400 RPM)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Стандартный] 1998 (5400 RPM)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Стандартный] 2000 (7200 RPM)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "Клон IBM 8514/A (ISA)"
+
+msgid "Vendor"
+msgstr "Производитель"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Гц (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Гц (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Стандартное расширение памяти PC/XT"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Стандартное расширение памяти PC/AT"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "Невозможно найти матричные шрифты"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "Шрифты TrueType в каталоге \"roms/printer/fonts\" необходимы для эмуляции стандартного матричного принтера ESC/P 2."
+
+msgid "Inhibit multimedia keys"
+msgstr "Перехватывать мультимедийные клавиши"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Запрашивать подтверждение перед сохранением настроек"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Запрашивать подтверждение перед холодной перезагрузкой"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Запрашивать подтверждение перед выходом"
+
+msgid "Options"
+msgstr "Параметры"
+
+msgid "Model"
+msgstr "Модель"
+
+msgid "Model:"
+msgstr "Модель:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Не удалось инициализировать рендерер Vulkan."
+
+msgid "GLSL Error"
+msgstr "Ошибка GLSL"
+
+msgid "Could not load shader: %1"
+msgstr "Не удалось загрузить шейдер: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "Требуется OpenGL версии 3.0 или выше. Текущая версия GLSL %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "Не удалось загрузить текстуру: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "Не удалось скомпилировать шейдер:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "Не удалось скомпоновать шейдер:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "Управление шейдерами"
+
+msgid "Shader Configuration"
+msgstr "Конфигурация шейдера"
+
+msgid "Add"
+msgstr "Добавить"
+
+msgid "Move up"
+msgstr "Вверх"
+
+msgid "Move down"
+msgstr "Вниз"
+
+msgid "Could not load file %1"
+msgstr "Не удалось загрузить файл %1"
+
+msgid "Key Bindings:"
+msgstr "Привязки клавиш:"
+
+msgid "Action"
+msgstr "Действие"
+
+msgid "Keybind"
+msgstr "Привязка клавиш"
+
+msgid "Clear binding"
+msgstr "Очистить привязку"
+
+msgid "Bind"
+msgstr "Привязка"
+
+msgid "Bind Key"
+msgstr "Привязать клавишу"
+
+msgid "Enter key combo:"
+msgstr "Введите комбинацию клавиш:"
+
+msgid "Bind conflict"
+msgstr "Конфликт привязки"
+
+msgid "This key combo is already in use."
+msgstr "Эта комбинация клавиш уже используется."
+
+msgid "Send Control+Alt+Del"
+msgstr "Отправить Control+Alt+Del"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Отправить Control+Alt+Escape"
+
+msgid "Toggle fullscreen"
+msgstr "Переключить полноэкранный режим"
+
+msgid "Screenshot"
+msgstr "Скриншот"
+
+msgid "Release mouse pointer"
+msgstr "Отпустить указатель мыши"
+
+msgid "Toggle pause"
+msgstr "Переключить паузу"
+
+msgid "Toggle mute"
+msgstr "Переключить беззвучный режим"
+
+msgid "Text files"
+msgstr "Текстовые файлы"
+
+msgid "ROM files"
+msgstr "Файлы ПЗУ"
+
+msgid "SoundFont files"
+msgstr "Файлы SoundFont"
+
+msgid "Local Switch"
+msgstr "Локальный коммутатор"
+
+msgid "Remote Switch"
+msgstr "Удалённый коммутатор"
+
+msgid "Switch:"
+msgstr "Номер коммутатора:"
+
+msgid "Hub Mode"
+msgstr "Режим концентратора"
+
+msgid "Hostname:"
+msgstr "Имя хоста:"
+
+msgid "ISA RAM:"
+msgstr "ISA ОЗУ:"
+
+msgid "ISA ROM:"
+msgstr "ISA ПЗУ:"
+
+msgid "&Wipe NVRAM"
+msgstr "&Стереть NVRAM"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "Это удалит все файлы NVRAM (и связанные) виртуальной машины, расположенной в подпапке \"nvr\". Вам придётся снова реконфигурировать настройки BIOS (и, возможно, другие устройства внутри виртуальной машины), если применимо.\n\nВы уверены, что хотите стереть всё содержимое NVRAM виртуальной машины \"%1\"?"
+
+msgid "Success"
+msgstr "Успешно"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "Успешно стёрто содержимое NVRAM виртуальной машины \"%1\""
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "Произошла ошибка при попытке стереть содержимое NVRAM виртуальной машины \"%1\""
+
+msgid "%1 VM Manager"
+msgstr "Менеджер виртуальных машин %1"
+
+msgid "%n disk(s)"
+msgstr "%n диск(ов)"
+
+msgid "Unknown Status"
+msgstr "Неизвестный статус"
+
+msgid "No Machines Found!"
+msgstr "Машины не найдены!"
+
+msgid "Check for updates on startup"
+msgstr "Проверять обновления при запуске"
+
+msgid "Unable to determine release information"
+msgstr "Невозможно определить информацию о релизе"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Произошла ошибка при проверке обновлений:\n\n%1\n\nПожалуйста, попробуйте еще раз позже."
+
+msgid "Update check complete"
+msgstr "Проверка обновлений завершена"
+
+msgid "stable"
+msgstr "стабильную"
+
+msgid "beta"
+msgstr "бета"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Вы используете последнюю %1 версию 86Box: %2"
+
+msgid "version"
+msgstr "версия"
+
+msgid "build"
+msgstr "сборка"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Вы сейчас используете версию <b>%1</b>."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "Доступна <b>версия %1</b>."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Вы сейчас используете сборку <b>%1</b>."
+
+msgid "<b>Build %1</b> is now available."
+msgstr "Доступна <b>сборка %1</b>."
+
+msgid "Would you like to visit the download page?"
+msgstr "Открыть страницу загрузки?"
+
+msgid "Visit download page"
+msgstr "Открыть страницу загрузки"
+
+msgid "Update check"
+msgstr "Проверка обновлений"
+
+msgid "Checking for updates..."
+msgstr "Проверка обновлений..."
+
+msgid "86Box Update"
+msgstr "Обновление 86Box"
+
+msgid "Release notes:"
+msgstr "Примечания к релизу:"
+
+msgid "%1 Hz"
+msgstr "%1 Гц"
+
+msgid "Virtual machine crash"
+msgstr "Сбой виртуальной машины"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "Процесс виртуальной машины \"%1\" неожиданно завершился с кодом завершения %2."
+
+msgid "The system will not be added."
+msgstr "Система не будет добавлена."
+
+msgid "&Update mouse every CPU frame"
+msgstr "&Обновлять мышь при каждом кадре ЦП"
+
+msgid "Hue"
+msgstr "Тон"
+
+msgid "Saturation"
+msgstr "Насыщенность"
+
+msgid "Contrast"
+msgstr "Контраст"
+
+msgid "Brightness"
+msgstr "Яркость"
+
+msgid "Sharpness"
+msgstr "Резкость"
+
+msgid "&CGA composite settings..."
+msgstr "Настройки композитного видео &CGA..."
+
+msgid "CGA composite settings"
+msgstr "Настройки композитного видео CGA"
+
+msgid "Monitor EDID"
+msgstr "EDID монитора"
+
+msgid "Export..."
+msgstr "Экспорт..."
+
+msgid "Export EDID"
+msgstr "Экспорт EDID"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "Файл EDID \"%ls\" слишком велик."
+
+msgid "OpenGL input scale"
+msgstr "Масштаб ввода OpenGL"
+
+msgid "OpenGL input stretch mode"
+msgstr "Режим растяжения ввода OpenGL"
+
+msgid "Color scheme"
+msgstr "Цветовая схема"
+
+msgid "Light"
+msgstr "Светлая"
+
+msgid "Dark"
+msgstr "Тёмная"
diff --git a/src/qt/languages/sk-SK.po b/src/qt/languages/sk-SK.po
index c2f129a3d..3a5e3b863 100644
--- a/src/qt/languages/sk-SK.po
+++ b/src/qt/languages/sk-SK.po
@@ -1,3 +1,11 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: sk_SK\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
 msgstr "&Podujatia"
 
@@ -10,8 +18,8 @@ msgstr "&Pravý Ctrl je ľavý Alt"
 msgid "&Hard Reset..."
 msgstr "&Resetovať"
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Ctrl+Alt+Del\tCtrl+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "&Ctrl+Alt+Del"
 
 msgid "Ctrl+Alt+&Esc"
 msgstr "Ctrl+Alt+&Esc"
@@ -19,7 +27,13 @@ msgstr "Ctrl+Alt+&Esc"
 msgid "&Pause"
 msgstr "P&ozastaviť"
 
-msgid "E&xit..."
+msgid "Pause"
+msgstr "Pozastaviť"
+
+msgid "Re&sume"
+msgstr "&Obnoviť"
+
+msgid "E&xit"
 msgstr "&Ukončiť"
 
 msgid "&View"
@@ -40,14 +54,8 @@ msgstr "&Pamätať si veľkosť a polohu"
 msgid "Re&nderer"
 msgstr "&Renderer"
 
-msgid "&SDL (Software)"
-msgstr "&SDL (Software)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (&Hardware)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
+msgid "&Qt (Software)"
+msgstr "&Qt (Software)"
 
 msgid "Open&GL (3.0 Core)"
 msgstr "Open&GL (3.0 Core)"
@@ -55,11 +63,11 @@ msgstr "Open&GL (3.0 Core)"
 msgid "&VNC"
 msgstr "&VNC"
 
-msgid "Specify dimensions..."
+msgid "Specify &dimensions..."
 msgstr "&Zadať veľkosť..."
 
-msgid "F&orce 4:3 display ratio"
-msgstr "&Zachovať pomer strán 4:3"
+msgid "Force &4:3 display ratio"
+msgstr "Zachovať pomer strán &4:3"
 
 msgid "&Window scale factor"
 msgstr "&Násobné zväčšenie okna"
@@ -94,7 +102,7 @@ msgstr "&7x"
 msgid "&8x"
 msgstr "&8x"
 
-msgid "Filter method"
+msgid "Fi&lter method"
 msgstr "Spôsob &filtrovania"
 
 msgid "&Nearest"
@@ -106,8 +114,8 @@ msgstr "&Lineárny"
 msgid "Hi&DPI scaling"
 msgstr "Š&kálovanie HiDPI"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "&Celá obrazovka\tCtrl+Alt+PgUp"
+msgid "&Fullscreen"
+msgstr "&Celá obrazovka"
 
 msgid "Fullscreen &stretch mode"
 msgstr "Režim roztia&hnutia na celú obrazovku"
@@ -127,8 +135,8 @@ msgstr "&Celočíselné škálovanie"
 msgid "4:&3 Integer scale"
 msgstr "4:&3 Celočíselné škálovanie"
 
-msgid "E&GA/(S)VGA settings"
-msgstr "Nastavenia pre E&GA a (S)VGA"
+msgid "EGA/(S)&VGA settings"
+msgstr "Nastavenia pre EGA a (S)&VGA"
 
 msgid "&Inverted VGA monitor"
 msgstr "&Obrátiť farby"
@@ -139,9 +147,15 @@ msgstr "&Typ monitora VGA"
 msgid "RGB &Color"
 msgstr "RGB &farebný"
 
+msgid "RGB (no brown)"
+msgstr "RGB (bez hnedej)"
+
 msgid "&RGB Grayscale"
 msgstr "&Odtiene sivej"
 
+msgid "Generic RGBI color monitor"
+msgstr "Obecný RGBI farebný monitor"
+
 msgid "&Amber monitor"
 msgstr "&Jantárová obrazovka"
 
@@ -178,11 +192,17 @@ msgstr "&Nástroje"
 msgid "&Settings..."
 msgstr "&Nastavenia..."
 
+msgid "Settings..."
+msgstr "Nastavenia..."
+
 msgid "&Update status bar icons"
 msgstr "&Aktualizovať ikony na stavovom riadku"
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "Urobiť snímku &obrazovky\tCtrl+F11"
+msgid "Take s&creenshot"
+msgstr "Urobiť snímku &obrazovky"
+
+msgid "S&ound"
+msgstr "&Zvuk"
 
 msgid "&Preferences..."
 msgstr "&Predvoľby..."
@@ -193,11 +213,11 @@ msgstr "Povolenie integrácie s &Discordem"
 msgid "Sound &gain..."
 msgstr "&Zosilnenie zvuku"
 
-msgid "Begin trace\tCtrl+T"
-msgstr "Začať trace\tCtrl+T"
+msgid "Begin trace"
+msgstr "Začať trace"
 
-msgid "End trace\tCtrl+T"
-msgstr "Zastaviť trace\tCtrl+T"
+msgid "End trace"
+msgstr "Zastaviť trace"
 
 msgid "&Help"
 msgstr "&Pomoc"
@@ -244,8 +264,8 @@ msgstr "&Stíšiť"
 msgid "E&mpty"
 msgstr "&Vystrihnúť"
 
-msgid "&Reload previous image"
-msgstr "&Načítať znova predchádzajúci obraz"
+msgid "Reload previous image"
+msgstr "Načítať znova predchádzajúci obraz"
 
 msgid "&Folder..."
 msgstr "&Zložka..."
@@ -301,18 +321,12 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Storno"
 
-msgid "Save these settings as &global defaults"
-msgstr "Uložiť toto nastavenie ako &globálny východiskový stav"
-
 msgid "&Default"
 msgstr "&Východiskové"
 
 msgid "Language:"
 msgstr "Jazyk:"
 
-msgid "Icon set:"
-msgstr "Súprava ikon:"
-
 msgid "Gain"
 msgstr "Zosilnenie"
 
@@ -346,6 +360,9 @@ msgstr "Počítač:"
 msgid "Configure"
 msgstr "Nastaviť"
 
+msgid "CPU:"
+msgstr "Procesor:"
+
 msgid "CPU type:"
 msgstr "Procesor:"
 
@@ -382,11 +399,23 @@ msgstr "Zapnutá (UTC)"
 msgid "Dynamic Recompiler"
 msgstr "Dynamický prekladač"
 
+msgid "CPU frame size"
+msgstr "Veľkosť rámcov CPU"
+
+msgid "Larger frames (less smooth)"
+msgstr "Väčšie rámce (menej plynulé)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Menšie rámce (plynulejšie)"
+
 msgid "Video:"
 msgstr "Grafika:"
 
-msgid "Voodoo Graphics"
-msgstr "Použiť grafický akcelerátor Voodoo"
+msgid "Video #2:"
+msgstr "Grafika 2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Grafický akcelerátor Voodoo 1 alebo 2"
 
 msgid "IBM 8514/A Graphics"
 msgstr "Grafika IBM 8514/A"
@@ -394,12 +423,27 @@ msgstr "Grafika IBM 8514/A"
 msgid "XGA Graphics"
 msgstr "Grafika XGA"
 
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "Grafika zobrazovacieho adaptéru IBM PS/55"
+
+msgid "Keyboard:"
+msgstr "Klávesnica:"
+
+msgid "Keyboard"
+msgstr "Klávesnica"
+
 msgid "Mouse:"
 msgstr "Myš:"
 
+msgid "Mouse"
+msgstr "Myš"
+
 msgid "Joystick:"
 msgstr "Joystick:"
 
+msgid "Joystick"
+msgstr "Joystick"
+
 msgid "Joystick 1..."
 msgstr "Joystick 1..."
 
@@ -425,10 +469,13 @@ msgid "Sound card #4:"
 msgstr "Zvuková karta 4:"
 
 msgid "MIDI Out Device:"
-msgstr "MIDI výstup:"
+msgstr "Zariadenie pre MIDI výstup:"
 
 msgid "MIDI In Device:"
-msgstr "MIDI vstup:"
+msgstr "Zariadenie pre MIDI vstup:"
+
+msgid "MIDI Out:"
+msgstr "MIDI výstup"
 
 msgid "Standalone MPU-401"
 msgstr "Samostatný MPU-401"
@@ -445,15 +492,6 @@ msgstr "Nuked (presnejší)"
 msgid "YMFM (faster)"
 msgstr "YMFM (rýchlejší)"
 
-msgid "Network type:"
-msgstr "Druh siete:"
-
-msgid "PCap device:"
-msgstr "PCap zariadenia:"
-
-msgid "Network adapter:"
-msgstr "Sieťový adaptér:"
-
 msgid "COM1 Device:"
 msgstr "Zariadenie na COM1:"
 
@@ -478,6 +516,9 @@ msgstr "Zariadenie na LPT3:"
 msgid "LPT4 Device:"
 msgstr "Zariadenie na LPT4:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr "DMA kanál ECP interného LPT portu:"
+
 msgid "Serial port 1"
 msgstr "Povoliť port COM1"
 
@@ -502,18 +543,21 @@ msgstr "Povoliť port LPT3"
 msgid "Parallel port 4"
 msgstr "Povoliť port LPT4"
 
-msgid "HD Controller:"
-msgstr "Radič disku:"
-
 msgid "FD Controller:"
 msgstr "Disketový radič:"
 
+msgid "CD-ROM Controller:"
+msgstr "Radič CD-ROM:"
+
 msgid "Tertiary IDE Controller"
 msgstr "Tretí radič IDE"
 
 msgid "Quaternary IDE Controller"
 msgstr "Štvrtý radič IDE"
 
+msgid "Hard disk"
+msgstr "Radič CD-ROM:"
+
 msgid "SCSI"
 msgstr "SCSI"
 
@@ -535,6 +579,9 @@ msgstr "Kazeta"
 msgid "Hard disks:"
 msgstr "Pevné disky:"
 
+msgid "Firmware Version"
+msgstr "Verzia firmvéru"
+
 msgid "&New..."
 msgstr "&Nový..."
 
@@ -589,14 +636,17 @@ msgstr "Kontrola BPB"
 msgid "CD-ROM drives:"
 msgstr "Mechaniky CD-ROM:"
 
-msgid "Earlier drive"
-msgstr "Skorá mechanika"
-
 msgid "MO drives:"
 msgstr "Magnetooptické mechaniky:"
 
-msgid "ZIP drives:"
-msgstr "Mechaniky ZIP:"
+msgid "MO:"
+msgstr "Magnetooptické jednotky:"
+
+msgid "Removable disks:"
+msgstr "Vymeniteľné disky:"
+
+msgid "Removable disk drives:"
+msgstr "Mechaniky vymeniteľných diskov:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
@@ -607,6 +657,9 @@ msgstr "ISA hodiny:"
 msgid "ISA Memory Expansion"
 msgstr "ISA rozšírenie pamäte"
 
+msgid "ISA ROM Cards"
+msgstr "ISA karty s pamäťou ROM"
+
 msgid "Card 1:"
 msgstr "Karta 1:"
 
@@ -619,18 +672,21 @@ msgstr "Karta 3:"
 msgid "Card 4:"
 msgstr "Karta 4:"
 
+msgid "Generic ISA ROM Board"
+msgstr "Obecná ISA karta s pamäťou ROM"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "Obecná karta ISA s dvoma pamäťami ROM"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "Obecná karta ISA so štyrmi pamäťami ROM"
+
 msgid "ISABugger device"
 msgstr "Zariadenie ISABugger"
 
 msgid "POST card"
 msgstr "Karta pre kódy POST"
 
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
-
 msgid "86Box"
 msgstr "86Box"
 
@@ -643,17 +699,20 @@ msgstr "Kritická chyba"
 msgid " - PAUSED"
 msgstr " - POZASTAVENÝ"
 
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Stlačte Ctrl+Alt+PgDn pre návrat z režimu celej obrazovky."
-
 msgid "Speed"
 msgstr "Rýchlosť"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "Vymeniteľný disk %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "Obrazy ZIP diskov"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "&Vymeniteľný disk %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Obrazy vymeniteľných diskov"
+
+msgid "Image %1"
+msgstr "Obraz %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
 msgstr "86Box nenašiel žiadne použiteľné imidž pamätí ROM.\n\n<a href=\"https://github.com/86Box/roms/releases/latest\">Stiahnite</a> sadu obrazov ROM a extrahujte ju do zložky \"roms\"."
@@ -688,6 +747,12 @@ msgstr "Počítač \"%hs\" ie je dostupný, pretože chýba obraz jeho pamäte R
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
 msgstr "Video adaptér \"%hs\" nie je dostupný, pretože chýba obraz jeho pamäte ROM v zložke \"roms/video\". Konfigurácia sa prepne na iný dostupný adaptér."
 
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "Video adaptér 2 \"%hs\" nie je dostupný, pretože chýba obraz jeho pamäte ROM v zložke \"roms/video\". Druhá grafická karta sa zakáže."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "Zariadenie \"%hs\" nie je dostupné, pretože chýba obraz jeho pamäte ROM. Zariadenie sa ignoruje."
+
 msgid "Machine"
 msgstr "Počítač"
 
@@ -706,12 +771,30 @@ msgstr "Sieť"
 msgid "Ports (COM & LPT)"
 msgstr "COM a LPT porty"
 
+msgid "Ports"
+msgstr "Porty"
+
+msgid "Serial ports:"
+msgstr "Sériové porty:"
+
+msgid "Parallel ports:"
+msgstr "Paralelné porty:"
+
 msgid "Storage controllers"
 msgstr "Radiče úložiska"
 
 msgid "Hard disks"
 msgstr "Pevné disky"
 
+msgid "Disks:"
+msgstr "Disky:"
+
+msgid "Floppy:"
+msgstr "Disketové jednotky:"
+
+msgid "Controllers:"
+msgstr "Radiče:"
+
 msgid "Floppy & CD-ROM drives"
 msgstr "Disketové a CD-ROM mechaniky"
 
@@ -721,14 +804,17 @@ msgstr "Ďalšie vymeniteľné zariadenia"
 msgid "Other peripherals"
 msgstr "Iné príslušenstvo"
 
+msgid "Other devices"
+msgstr "Iné zariadenia"
+
 msgid "Click to capture mouse"
 msgstr "Kliknite pre zabráni myši"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "Stlačte F8+F12 pre uvoľnenie myši"
+msgid "Press %1 to release mouse"
+msgstr "Stlačte %1 pre uvoľnenie myši"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Stlačte F8+F12 alebo prostredné tlačidlo na uvoľnenie myši"
+msgid "Press %1 or middle button to release mouse"
+msgstr "Stlačte %1 alebo prostredné tlačidlo na uvoľnenie myši"
 
 msgid "Bus"
 msgstr "Zbernica"
@@ -748,65 +834,89 @@ msgstr "S"
 msgid "KB"
 msgstr "KB"
 
-msgid "Could not initialize the video renderer."
-msgstr "Nastala chyba pri inicializácii video renderera."
-
 msgid "Default"
 msgstr "Východiskové"
 
-msgid "%i Wait state(s)"
-msgstr "%i čakací stav(y)"
+msgid "%1 Wait state(s)"
+msgstr "%1 čakací stav(y)"
 
 msgid "Type"
 msgstr "Typ"
 
-msgid "Failed to set up PCap"
-msgstr "Nastala chyba pri inicializácii knižnice PCap"
-
 msgid "No PCap devices found"
 msgstr "Neboli nájdené žiadne PCap zariadenia"
 
 msgid "Invalid PCap device"
 msgstr "Neplatné PCap zariadenie"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "Štandardný 2tlačidlový joystick"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "2-osový, 2-tlačidlový joystick"
 
-msgid "Standard 4-button joystick"
-msgstr "Štandardný 4tlačidlový joystick"
+msgid "2-axis, 4-button joystick"
+msgstr "2-osový, 4-tlačidlový joystick"
 
-msgid "Standard 6-button joystick"
-msgstr "Štandardný 6tlačidlový joystick"
+msgid "2-axis, 6-button joystick"
+msgstr "2-osový, 6-tlačidlový joystick"
 
-msgid "Standard 8-button joystick"
-msgstr "Štandardný 8tlačidlový joystick"
+msgid "2-axis, 8-button joystick"
+msgstr "2-osový, 8-tlačidlový joystick"
+
+msgid "3-axis, 2-button joystick"
+msgstr "3-osový, 2-tlačidlový joystick"
+
+msgid "3-axis, 4-button joystick"
+msgstr "3-osový, 4-tlačidlový joystick"
+
+msgid "4-axis, 4-button joystick"
+msgstr "4-osový, 4-tlačidlový joystick"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH Pedals"
+
 msgid "Microsoft SideWinder Pad"
 msgstr "Microsoft SideWinder Pad"
 
 msgid "Thrustmaster Flight Control System"
 msgstr "Thrustmaster Flight Control System"
 
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Rudder Control System"
+
+msgid "2-button gamepad(s)"
+msgstr "Ovládač s 2 tlačidlami"
+
+msgid "2-button flight yoke"
+msgstr "Letecký knipl s 2 tlačidlami"
+
+msgid "4-button gamepad"
+msgstr "Ovládač so 4 tlačidlami"
+
+msgid "4-button flight yoke"
+msgstr "Letecký knipl so 4 tlačidlami"
+
+msgid "2-button flight yoke with throttle"
+msgstr "Letecký knipl s 2 tlačidlami a pákou"
+
+msgid "4-button flight yoke with throttle"
+msgstr "Letecký knipl s 4 tlačidlami a pákou"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Volant pre Windows 95 (3 osy, 4 tlačítka)"
+
 msgid "None"
 msgstr "Žiadne"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "Nebolo možné nahrať klávesnicové skratky."
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CHS: %2, %3, %4)"
 
-msgid "Unable to register raw input."
-msgstr "Nebolo možné zaregistrovať raw input."
+msgid "Floppy %1 (%2): %3"
+msgstr "Disketová mechanika %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Disketová mechanika %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "&Disketová mechanika %1 (%2): %3"
 
 msgid "Advanced sector images"
 msgstr "Rozšírené sektorové obrazy"
@@ -814,9 +924,6 @@ msgstr "Rozšírené sektorové obrazy"
 msgid "Flux images"
 msgstr "Obrazy magnetického toku"
 
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "Nastala chyba pri inicializácii knižnice SDL, je potreba SDL2.dll"
-
 msgid "Are you sure you want to hard reset the emulated machine?"
 msgstr "Naozaj chcete resetovať emulovaný počítač?"
 
@@ -826,8 +933,14 @@ msgstr "Naozaj chcete ukončiť 86Box?"
 msgid "Unable to initialize Ghostscript"
 msgstr "Nastala chyba pri inicializácii knižnice Ghostscript"
 
-msgid "MO %i (%ls): %ls"
-msgstr "MO %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "Nastala chyba pri inicializácii knižnice GhostPCL"
+
+msgid "MO %1 (%2): %3"
+msgstr "MO %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&MO %1 (%2): %3"
 
 msgid "MO images"
 msgstr "Obrazy MO"
@@ -835,8 +948,17 @@ msgstr "Obrazy MO"
 msgid "Welcome to 86Box!"
 msgstr "Vitajte v programe 86Box!"
 
-msgid "Internal controller"
-msgstr "Vstavaný radič"
+msgid "Internal device"
+msgstr "Vstavané zariadenie"
+
+msgid "&File"
+msgstr "&Súbor"
+
+msgid "&New machine..."
+msgstr "&Nový počítač..."
+
+msgid "&Check for updates..."
+msgstr "&Skontroluj aktualizácie..."
 
 msgid "Exit"
 msgstr "Ukončiť"
@@ -860,34 +982,22 @@ msgid "86Box v"
 msgstr "86Box v"
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "Emulátor starých počítačov\n\nAutori: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nZverejnené pod licenciou GNU General Public License verzie 2 alebo novšej. Pozri súbor LICENSE pre viac informácií."
+msgstr "Emulátor starých počítačov\n\nAutori: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nS predchádzajúcimi hlavnými príspevkami od Sarah Walker, leilei, JohnElliott, greatpsycho a ďalších.\n\nZverejnené pod licenciou GNU General Public License verzie 2 alebo novšej. Pozri súbor LICENSE pre viac informácií."
 
 msgid "Hardware not available"
 msgstr "Hardvér nie je dostupný"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Uistite sa, že je nainštalovaný libpcap a používate sieťové pripojenie s ním kompatibilné."
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "Uistite sa, že je nainštalovaný %1 a používate sieťové pripojenie s ním kompatibilné."
 
 msgid "Invalid configuration"
 msgstr "Neplatná konfigurácia"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 je potrebná pre automatický prevod PostScript dokumentov do PDF.\n\nAkékoľvek dokumenty vytlačené cez všeobecnú PostScriptovú tlačiareň budú uložené ako PostScript (.ps) súbory."
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " je potrebná pre automatický prevod PostScript dokumentov do PDF.\n\nAkékoľvek dokumenty vytlačené cez všeobecnú PostScriptovú tlačiareň budú uložené ako PostScript (.ps) súbory."
-
-msgid "Entering fullscreen mode"
-msgstr "Vstup do režimu celej obrazovky"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 je potrebná pre automatický prevod PCL dokumentov do PDF.\n\nAkékoľvek dokumenty vytlačené cez všeobecnú PCLovú tlačiareň budú uložené ako Printer Command Language (.pcl) súbory."
 
 msgid "Don't show this message again"
 msgstr "Nezobrazovať ďalej túto správu"
@@ -904,17 +1014,14 @@ msgstr "Neresetovať"
 msgid "CD-ROM images"
 msgstr "Obraz CD-ROM disku"
 
-msgid "%hs Device Configuration"
-msgstr "Konfigurácia zariadenia %hs"
+msgid "%1 Device Configuration"
+msgstr "Konfigurácia zariadenia %1"
 
 msgid "Monitor in sleep mode"
 msgstr "Monitor je v režime spánku"
 
-msgid "OpenGL Shaders"
-msgstr "Shadery OpenGL"
-
-msgid "OpenGL options"
-msgstr "Možnosti OpenGL"
+msgid "GLSL shaders"
+msgstr "Shadery GLSL"
 
 msgid "You are loading an unsupported configuration"
 msgstr "Pokúšate sa spustiť nepodporovanú konfiguráciu"
@@ -925,30 +1032,33 @@ msgstr "Pre túto konfiguráciu bolo vypnuté filtrovanie procesorov podľa zvol
 msgid "Continue"
 msgstr "Pokračovať"
 
-msgid "Cassette: %s"
-msgstr "Kazeta: %s"
+msgid "Cassette: %1"
+msgstr "Kazeta: %1"
+
+msgid "C&assette: %1"
+msgstr "K&azeta: %1"
 
 msgid "Cassette images"
 msgstr "Kazetové nahrávky"
 
-msgid "Cartridge %i: %ls"
-msgstr "Cartridge %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "Cartridge %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "Car&tridge %1: %2"
 
 msgid "Cartridge images"
 msgstr "Obrazy cartridge"
 
-msgid "Error initializing renderer"
-msgstr "Chyba pri inicializácii vykresľovača"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "Vykresľovač OpenGL (3.0 Core) sa nepodarilo inicializovať. Použite iný renderer."
-
 msgid "Resume execution"
 msgstr "Obnoviť"
 
 msgid "Pause execution"
 msgstr "Pozastaviť"
 
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del"
+
 msgid "Press Ctrl+Alt+Del"
 msgstr "Stlačiť Ctrl+Alt+Delete"
 
@@ -958,17 +1068,281 @@ msgstr "Stlačiť Ctrl+Alt+Esc"
 msgid "Hard reset"
 msgstr "Resetovať"
 
+msgid "Force shutdown"
+msgstr "Vynútiť vypnutie"
+
+msgid "Start"
+msgstr "Spustiť"
+
+msgid "Not running"
+msgstr "Nebeží"
+
+msgid "Running"
+msgstr "Beží"
+
+msgid "Paused"
+msgstr "Pozastavené"
+
+msgid "Waiting"
+msgstr "Čeká"
+
+msgid "Powered Off"
+msgstr "Vypnuté"
+
+msgid "%n running"
+msgstr "%n beží"
+
+msgid "%n paused"
+msgstr "%n pozostavené"
+
+msgid "%n waiting"
+msgstr "%n čeká"
+
+msgid "%1 total"
+msgstr "%1 celkom"
+
+msgid "VMs: %1"
+msgstr "Virtuálnych počítačov: %1"
+
+msgid "System Directory:"
+msgstr "Systémový adresár:"
+
+msgid "Choose directory"
+msgstr "Vyberte adresár"
+
+msgid "Choose configuration file"
+msgstr "Vyberte konfiguračný súbor"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "Konfiguračné súbory 86Box (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Čítanie konfigurácie zlyhalo"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "Nie je možné otvoriť vybraný konfiguračný súbor na čítanie: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "Použiť v poli vyhľadávania regulárne výrazy"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "%1 počítač(ov) je stále aktívnych. Naozaj chcete ukončiť správcu virtuálnych počítačov?"
+
+msgid "Add new system wizard"
+msgstr "Sprievodca pridávaním nového systému"
+
+msgid "Introduction"
+msgstr "Úvod"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "Tento sprievodca vám pomôže pridať nový systém do programu 86Box."
+
+msgid "New configuration"
+msgstr "Nová konfigurácia"
+
+msgid "Complete"
+msgstr "Dokončiť"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "Sprievodca teraz spustí konfiguráciu nového systému."
+
+msgid "Use existing configuration"
+msgstr "Použiť existujúcu konfiguráciu"
+
+msgid "Type some notes here"
+msgstr "Tu zadajte nejaké poznámky"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Vložte obsah existujúceho konfiguračného súboru do poľa nižšie."
+
+msgid "Load configuration from file"
+msgstr "Načítať konfiguráciu zo súboru"
+
+msgid "System name"
+msgstr "Názov systému"
+
+msgid "System name:"
+msgstr "Názov systému:"
+
+msgid "System name cannot contain certain characters"
+msgstr "Názov systému nesmie obsahovať určité znaky"
+
+msgid "System name already exists"
+msgstr "Názov systému už existuje"
+
+msgid "Please enter a directory for the system"
+msgstr "Zadajte adresár pre systém"
+
+msgid "Directory does not exist"
+msgstr "Adresár neexistuje"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "Pre tento systém bude vytvorený nový adresár vo vyššie zvolenom adresári."
+
+msgid "System location:"
+msgstr "Umiestnenie systému:"
+
+msgid "System name and location"
+msgstr "Názov systému a umiestnenie"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Zadajte názov systému a vyberte umiestnenie"
+
+msgid "Enter the name of the system"
+msgstr "Zadajte názov systému"
+
+msgid "Please enter a system name"
+msgstr "Zadajte názov systému"
+
+msgid "Display name (optional):"
+msgstr "Zobrazené meno (voliteľné):"
+
+msgid "Display name:"
+msgstr "Zobrazené meno:"
+
+msgid "Set display name"
+msgstr "Nastaviť zobrazené meno"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Zadajte nové zobrazené meno (prázdne pole pre vymazanie)"
+
+msgid "Change &display name..."
+msgstr "Zmeniť &zobrazené meno..."
+
+msgid "Context Menu"
+msgstr "Kontextové menu"
+
+msgid "&Open folder..."
+msgstr "&Otvoriť priečinok..."
+
+msgid "Open p&rinter tray..."
+msgstr "Otvoriť zásobník &tlačiarne..."
+
+msgid "Set &icon..."
+msgstr "Nastaviť &ikonu..."
+
+msgid "Select an icon"
+msgstr "Vyberte ikonu"
+
+msgid "C&lone..."
+msgstr "K&lonovať..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "Virtuálny počítač \"%1\" (%2) bude klonovaný do:"
+
+msgid "Directory %1 already exists"
+msgstr "Adresár %1 už existuje."
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "V názve nemožno použiť nasledujúce znaky: %1"
+
+msgid "Clone"
+msgstr "Klonovať"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Nepodarilo sa vytvoriť adresár pre klonovaný virtuálny počítač"
+
+msgid "Failed to clone VM."
+msgstr "Klonovanie virtuálneho počítača sa nepodarilo."
+
+msgid "Directory in use"
+msgstr "Adresár sa už používa"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "Vybraný adresár je už používaný. Vyberte prosím iný adresár."
+
+msgid "Create directory failed"
+msgstr "Vytvorenie adresára sa nepodarilo"
+
+msgid "Unable to create the directory for the new system"
+msgstr "Nie je možné vytvoriť adresár pre nový systém"
+
+msgid "Configuration write failed"
+msgstr "Zlyhal zápis konfigurácie"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "Nepodarilo sa otvoriť konfiguračný súbor %1 na zápis"
+
+msgid "Error adding system"
+msgstr "Chyba pri pridávaní systému"
+
+msgid "Remove directory failed"
+msgstr "Odstránenie adresára sa nepodarilo"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "Niektoré súbory v adresári zariadenia nebolo možné odstrániť. Odstráňte ich prosím ručne."
+
+msgid "Build"
+msgstr "Build"
+
+msgid "Version"
+msgstr "Verzia"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "Je k dispozícii aktualizácia pre 86Box: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "Pri kontrole aktualizácií došlo k chybe: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>Je k dispozícii aktualizácia pre 86Box!</b>"
+
+msgid "Warning"
+msgstr "Upozornenie"
+
+msgid "&Kill"
+msgstr "Vynútiť &ukončenie"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "Ukončenie virtuálneho počítača môže spôsobiť stratu údajov. Ukončite ho len v prípade, ak proces programu 86Box zamrzne.\n\nNaozaj chcete ukončiť virtuálny počítač \"%1\"?"
+
+msgid "&Delete"
+msgstr "&Odstrániť"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "Naozaj chcete odstrániť virtuálny počítač \"%1\" a všetky jeho súbory? Táto akcia sa nedá vrátiť späť!"
+
+msgid "Show &config file"
+msgstr "Zobraziť &konfiguračný súbor"
+
+msgid "No screenshot"
+msgstr "Žiadny snímok obrazovky"
+
+msgid "Search"
+msgstr "Hľadať"
+
+msgid "Searching for VMs..."
+msgstr "Hľadanie virtuálnych počítačov..."
+
+msgid "Found %1"
+msgstr "Nájdené %1"
+
+msgid "System"
+msgstr "Systém"
+
+msgid "Storage"
+msgstr "Úložisko"
+
+msgid "Disk %1: "
+msgstr "Disk %1: "
+
+msgid "No disks"
+msgstr "Žiadne disky"
+
+msgid "Audio"
+msgstr "Zvuk"
+
+msgid "Audio:"
+msgstr "Zvuk:"
+
 msgid "ACPI shutdown"
 msgstr "Vypnúť cez rozhranie ACPI"
 
-msgid "Hard disk (%s)"
-msgstr "Pevný disk (%s)"
+msgid "ACP&I shutdown"
+msgstr "Vypnúť cez rozhranie ACP&I"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "Pevný disk (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
 msgstr "CD-ROM mechaniky pre rozhranie MFM/RLL alebo ESDI nikdy neexistovali"
@@ -1003,9 +1377,6 @@ msgstr "Nebolo možné zapisovať do súboru"
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
 msgstr "Obraz disku vo formáte HDI alebo HDX s veľkosťou sektora inou ako 512 bajtov nie sú podporované."
 
-msgid "USB is not yet supported"
-msgstr "USB zatiaľ nie je podporované."
-
 msgid "Disk image file already exists"
 msgstr "Súbor obrazu disku už existuje"
 
@@ -1039,6 +1410,27 @@ msgstr "Prepísať"
 msgid "Don't overwrite"
 msgstr "Neprepisovať"
 
+msgid "Raw image"
+msgstr "Surový obraz"
+
+msgid "HDI image"
+msgstr "HDI obraz"
+
+msgid "HDX image"
+msgstr "HDX obraz"
+
+msgid "Fixed-size VHD"
+msgstr "VHD s pevnou veľkosťou"
+
+msgid "Dynamic-size VHD"
+msgstr "VHD s dynamickou veľkosťou"
+
+msgid "Differencing VHD"
+msgstr "Rozdielový VHD"
+
+msgid "(N/A)"
+msgstr "(Žiadne)"
+
 msgid "Raw image (.img)"
 msgstr "Surový obraz (.img)"
 
@@ -1078,9 +1470,6 @@ msgstr "Časové pečiatky nadradeného a podradeného disku nesúhlasia"
 msgid "Could not fix VHD timestamp."
 msgstr "Nebolo možné opraviť časovú pečiatku VHD."
 
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
-
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
 
@@ -1096,44 +1485,29 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
+msgid "160 KB"
+msgstr "160 KB"
 
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
+msgid "180 KB"
+msgstr "180 KB"
 
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
+msgid "320 KB"
+msgstr "320 KB"
 
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
+msgid "360 KB"
+msgstr "360 KB"
 
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
+msgid "640 KB"
+msgstr "640 KB"
 
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
+msgid "720 KB"
+msgstr "720 KB"
 
 msgid "1.2 MB"
 msgstr "1.2 MB"
@@ -1227,3 +1601,1383 @@ msgstr "Rýchly"
 
 msgid "&Auto-pause on focus loss"
 msgstr "&Automatická pauza pri strate fokusu okna"
+
+msgid "WinBox is no longer supported"
+msgstr "WinBox už nie je podporovaný"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "Vývoj správcu WinBox sa zastavil v roku 2022 z dôvodu nedostatku správcov. Keďže naše úsilie smerujeme k ešte lepšiemu systému 86Box, rozhodli sme sa, že správca WinBox už nebude podporovaný.\n\nProstredníctvom WinBoxu nebudú poskytované žiadne ďalšie aktualizácie a v prípade, že ho budete naďalej používať s novšími verziami programu 86Box, môžete sa stretnúť s nesprávnym správaním. Všetky hlásenia o chybách týkajúce sa správania WinBoxu budú uzavreté ako neplatné.\n\nNa stránke 86box.net nájdete zoznam iných správcov, ktoré môžete používať."
+
+msgid "Generate"
+msgstr "Generovať"
+
+msgid "Joystick configuration"
+msgstr "Konfigurácia joysticku"
+
+msgid "Device"
+msgstr "Zariadenie"
+
+msgid "%1 (X axis)"
+msgstr "%1 (os X)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (os Y)"
+
+msgid "MCA devices"
+msgstr "Zariadenia MCA"
+
+msgid "List of MCA devices:"
+msgstr "Zoznam zariadení MCA:"
+
+msgid "&Tablet tool"
+msgstr "Nástroj pre tablety"
+
+msgid "About &Qt"
+msgstr "O &Qt"
+
+msgid "&MCA devices..."
+msgstr "Zariadenia MCA..."
+
+msgid "Show non-&primary monitors"
+msgstr "Zobrazenie iných ako primárnych monitorov"
+
+msgid "Open screenshots &folder..."
+msgstr "Otvorte priečinok so snímkami obrazovky..."
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Použitie režimu roztiahnutia na celú obrazovku pri maximalizácii"
+
+msgid "&Cursor/Puck"
+msgstr "&Kurzor/Puck"
+
+msgid "&Pen"
+msgstr "&Pero"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "&Hostiteľská jednotka CD/DVD (%1:)"
+
+msgid "&Connected"
+msgstr "&Pripojené"
+
+msgid "Clear image &history"
+msgstr "Vymazanie histórie obrázkov"
+
+msgid "Create..."
+msgstr "Vytvorte..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "Jednotka CD/DVD hostiteľa (%1)"
+
+msgid "Unknown Bus"
+msgstr "Neznáma zbernica"
+
+msgid "Null Driver"
+msgstr "Nulový ovládač"
+
+msgid "NIC:"
+msgstr "Sieťový adaptér:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "Sieťový adaptér %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&Sieťový adaptér %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "Správanie pri vykresľovaní"
+
+msgid "Use target framerate:"
+msgstr "Použite cieľovú snímkovú frekvenciu:"
+
+msgid " fps"
+msgstr " fps"
+
+msgid "VSync"
+msgstr "VSync"
+
+msgid "Synchronize with video"
+msgstr "Synchronizovať s obrazom"
+
+msgid "Shaders"
+msgstr "Shadery"
+
+msgid "Remove"
+msgstr "Odstránenie stránky"
+
+msgid "Browse..."
+msgstr "Prehľadávať..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "Nepodarilo sa vytvoriť kontext OpenGL."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "Nepodarilo sa prepnúť na kontext OpenGL."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "Vyžaduje sa verzia OpenGL 3.0 alebo vyššia. Aktuálna verzia je %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "Chyba pri inicializácii OpenGL"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nNávrat k softvérovému vykresľovaniu."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>Pri výbere multimediálnych obrazov (CD-ROM, disketa atď.) sa dialógové okno otvorenia spustí v rovnakom adresári ako konfiguračný súbor 86Box. Toto nastavenie bude mať pravdepodobne význam len v systéme MacOS.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "Tento stroj mohol byť premiestnený alebo skopírovaný."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "Aby sa zabezpečila správna funkčnosť siete, 86Box potrebuje vedieť, či bol tento počítač presunutý alebo skopírovaný.\n\nAk si nie ste istí, vyberte možnosť \"Skopíroval som ho."
+
+msgid "I Moved It"
+msgstr "Presunul som ho"
+
+msgid "I Copied It"
+msgstr "Skopíroval som ho"
+
+msgid "86Box Monitor #"
+msgstr "86Box Monitor "
+
+msgid "No MCA devices."
+msgstr "Žiadne zariadenia MCA."
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "Sieťová karta 1"
+
+msgid "Network Card #2"
+msgstr "Sieťová karta 2"
+
+msgid "Network Card #3"
+msgstr "Sieťová karta 3"
+
+msgid "Network Card #4"
+msgstr "Sieťová karta 4"
+
+msgid "Mode:"
+msgstr "Režim:"
+
+msgid "Interface:"
+msgstr "Rozhranie:"
+
+msgid "Adapter:"
+msgstr "Adaptér:"
+
+msgid "VDE Socket:"
+msgstr "Zásuvka VDE:"
+
+msgid "86Box Unit Tester"
+msgstr "86Box Unit Tester"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Kľúčová karta Novell NetWare 2.x"
+
+msgid "Serial port passthrough 1"
+msgstr "Priechod sériového portu 1"
+
+msgid "Serial port passthrough 2"
+msgstr "Priechod sériového portu 2"
+
+msgid "Serial port passthrough 3"
+msgstr "Priechod sériového portu 3"
+
+msgid "Serial port passthrough 4"
+msgstr "Priechod cez sériový port 4"
+
+msgid "Renderer &options..."
+msgstr "Možnosti vykresľovača..."
+
+msgid "PC/XT Keyboard"
+msgstr "Klávesnica PC/XT"
+
+msgid "AT Keyboard"
+msgstr "Klávesnica AT"
+
+msgid "AX Keyboard"
+msgstr "Klávesnica AX"
+
+msgid "PS/2 Keyboard"
+msgstr "Klávesnica PS/2"
+
+msgid "PS/55 Keyboard"
+msgstr "Klávesnica PS/55"
+
+msgid "Keys"
+msgstr "Klávesy"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Zbernicová myš Logitech/Microsoft"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Zbernicová myš Microsoft (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Sériová myš Mouse Systems"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Zbernicová myš Mouse Systems"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Sériová myš Microsoft"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Sériová myš Microsoft BallPoint"
+
+msgid "Logitech Serial Mouse"
+msgstr "Sériová myš Logitech"
+
+msgid "PS/2 Mouse"
+msgstr "Myš PS/2"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "Myš PS/2 QuickPort"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (sériová)"
+
+msgid "Default Baud rate"
+msgstr "Východná prenosová rýchlosť"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] Štandardný modem kompatibilný s Hayesom"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Emulácia Roland MT-32"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Emulácia Roland MT-32 (nová)"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Emulácia Roland CM-32L"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Emulácia Roland CM-32LN"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "Dcérska doska OPL4-ML"
+
+msgid "System MIDI"
+msgstr "Systém MIDI"
+
+msgid "MIDI Input Device"
+msgstr "Vstupné zariadenie MIDI"
+
+msgid "BIOS file"
+msgstr "Súbor BIOS"
+
+msgid "BIOS file (ROM #1)"
+msgstr "Súbor BIOS (ROM 1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "Súbor BIOS (ROM 2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "Súbor BIOS (ROM 3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "Súbor BIOS (ROM 4)"
+
+msgid "BIOS address"
+msgstr "Adresa BIOS"
+
+msgid "BIOS address (ROM #1)"
+msgstr "Adresa BIOS (ROM 1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "Adresa BIOS (ROM 2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "Adresa BIOS (ROM 3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "Adresa BIOS (ROM 4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "Povolenie zápisu do pamäte ROM s rozšírením BIOS"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "Povolenie zápisu do pamäte ROM s rozšírením BIOS (ROM 1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "Povolenie zápisu do pamäte ROM s rozšírením BIOS (ROM 2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "Povolenie zápisu do pamäte ROM s rozšírením BIOS (ROM 3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "Povolenie zápisu do pamäte ROM s rozšírením BIOS (ROM 4)"
+
+msgid "Linear framebuffer base"
+msgstr "Začiatok lineárneho framebufferu"
+
+msgid "Address"
+msgstr "Adresa"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "Prerušenie sériového portu"
+
+msgid "Parallel port IRQ"
+msgstr "Prerušenie paralelného portu"
+
+msgid "BIOS Revision"
+msgstr "Revízia BIOS"
+
+msgid "BIOS Version"
+msgstr "Verzia BIOS"
+
+msgid "BIOS Language"
+msgstr "Jazyk BIOS"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "Rozširujúca jednotka IBM 5161"
+
+msgid "IBM Cassette Basic"
+msgstr "Kazetový Basic IBM"
+
+msgid "Translate 26 -> 17"
+msgstr "Preložiť 26 -> 17"
+
+msgid "Language"
+msgstr "Jazyk"
+
+msgid "Enable backlight"
+msgstr "Povolenie podsvietenia"
+
+msgid "Invert colors"
+msgstr "Invertovanie farieb"
+
+msgid "BIOS size"
+msgstr "Veľkosť BIOS"
+
+msgid "BIOS size (ROM #1)"
+msgstr "Veľkosť BIOS (ROM 1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "Veľkosť BIOS (ROM 2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "Veľkosť BIOS (ROM 3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "Veľkosť BIOS (ROM 4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "Mapa C0000-C7FFF ako UMB"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "Mapa C8000-CFFFF ako UMB"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "Mapa D0000-D7FFF ako UMB"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "Mapa D8000-DFFFF ako UMB"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "Mapa E0000-E7FFF ako UMB"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "Mapa E8000-EFFFF ako UMB"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "Prepojka JS9 (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "Výstupné zariadenie MIDI"
+
+msgid "MIDI Real time"
+msgstr "MIDI v reálnom čase"
+
+msgid "MIDI Thru"
+msgstr "Priechodnosť vstupu MIDI"
+
+msgid "MIDI Clockout"
+msgstr "Výstup hodín MIDI"
+
+msgid "SoundFont"
+msgstr "SoundFont"
+
+msgid "Output Gain"
+msgstr "Zosilnenie výstupu"
+
+msgid "Chorus"
+msgstr "Zbor"
+
+msgid "Chorus Voices"
+msgstr "Hlasy zboru"
+
+msgid "Chorus Level"
+msgstr "Úroveň zboru"
+
+msgid "Chorus Speed"
+msgstr "Rýchlosť zboru"
+
+msgid "Chorus Depth"
+msgstr "Hĺbka zboru"
+
+msgid "Chorus Waveform"
+msgstr "Priebeh zboru"
+
+msgid "Reverb"
+msgstr "Dozvuk"
+
+msgid "Reverb Room Size"
+msgstr "Veľkosť dozvukovej miestnosti"
+
+msgid "Reverb Damping"
+msgstr "Tlmenie dozvuku"
+
+msgid "Reverb Width"
+msgstr "Šírka dozvuku"
+
+msgid "Reverb Level"
+msgstr "Úroveň dozvuku"
+
+msgid "Interpolation Method"
+msgstr "Metóda interpolácie"
+
+msgid "Dynamic Sample Loading"
+msgstr "Dynamické načítanie vzoriek"
+
+msgid "Reverb Output Gain"
+msgstr "Zosilnenie výstupu dozvuku"
+
+msgid "Reversed stereo"
+msgstr "Obrátené stereo"
+
+msgid "Nice ramp"
+msgstr "Pekná rampa"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "Tlačidlá"
+
+msgid "Serial Port"
+msgstr "Sériový port"
+
+msgid "RTS toggle"
+msgstr "Prepínač RTS"
+
+msgid "Revision"
+msgstr "Revízia"
+
+msgid "Controller"
+msgstr "Ovládač"
+
+msgid "Show Crosshair"
+msgstr "Zobrazenie kríža"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "Adresa MAC"
+
+msgid "MAC Address OUI"
+msgstr "Adresa MAC OUI"
+
+msgid "Enable BIOS"
+msgstr "Povolenie systému BIOS"
+
+msgid "Baud Rate"
+msgstr "Prenosová rýchlosť"
+
+msgid "TCP/IP listening port"
+msgstr "Počúvajúci port TCP/IP"
+
+msgid "Phonebook File"
+msgstr "Súbor telefónneho zoznamu"
+
+msgid "Telnet emulation"
+msgstr "Emulácia siete Telnet"
+
+msgid "RAM Address"
+msgstr "Adresa pamäte RAM"
+
+msgid "RAM size"
+msgstr "Veľkosť pamäte RAM"
+
+msgid "Initial RAM size"
+msgstr "Počiatočná veľkosť pamäte RAM"
+
+msgid "Serial Number"
+msgstr "Sériové číslo"
+
+msgid "Host ID"
+msgstr "ID hostiteľa"
+
+msgid "FDC Address"
+msgstr "Adresa FDC"
+
+msgid "MPU-401 Address"
+msgstr "Adresa MPU-401"
+
+msgid "MPU-401 IRQ"
+msgstr "MPU-401 IRQ"
+
+msgid "Receive MIDI input"
+msgstr "Príjem vstupu MIDI"
+
+msgid "Low DMA"
+msgstr "Nízka hodnota DMA"
+
+msgid "Enable Game port"
+msgstr "Povolenie herného portu"
+
+msgid "SID Model"
+msgstr "Model SID"
+
+msgid "SID Filter Strength"
+msgstr "Sila filtra SID"
+
+msgid "Surround module"
+msgstr "Surround modul"
+
+msgid "CODEC"
+msgstr "CODEC"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "Zvýšenie prerušenia CODEC pri nastavení CODEC (potrebné v niektorých ovládačoch)"
+
+msgid "SB Address"
+msgstr "Adresa SB"
+
+msgid "Adlib Address"
+msgstr "Adresa Adlib"
+
+msgid "Use EEPROM setting"
+msgstr "Použiť nastavenie EEPROM"
+
+msgid "WSS IRQ"
+msgstr "WSS IRQ"
+
+msgid "WSS DMA"
+msgstr "WSS DMA"
+
+msgid "Enable OPL"
+msgstr "Povolenie OPL"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "Príjem vstupu MIDI (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "SB low DMA"
+
+msgid "6CH variant (6-channel)"
+msgstr "Variant 6CH (6-kanálový)"
+
+msgid "Enable CMS"
+msgstr "Povolenie CMS"
+
+msgid "Mixer"
+msgstr "Mixér"
+
+msgid "High DMA"
+msgstr "Vysoký DMA"
+
+msgid "Control PC speaker"
+msgstr "Ovládací reproduktor PC"
+
+msgid "Memory size"
+msgstr "Veľkosť pamäte"
+
+msgid "EMU8000 Address"
+msgstr "Adresa EMU8000"
+
+msgid "IDE Controller"
+msgstr "Radič IDE"
+
+msgid "Codec"
+msgstr "Kodek"
+
+msgid "GUS type"
+msgstr "Typ GUS"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "Povolenie príkazu 0x04 \"Ukončiť 86Box\""
+
+msgid "Display type"
+msgstr "Typ displeja"
+
+msgid "Composite type"
+msgstr "Kompozitný typ"
+
+msgid "RGB type"
+msgstr "Typ RGB"
+
+msgid "Line doubling type"
+msgstr "Typ zdvojenia linky"
+
+msgid "Snow emulation"
+msgstr "Emulácia snehu"
+
+msgid "Monitor type"
+msgstr "Typ monitora"
+
+msgid "Character set"
+msgstr "Súbor znakov"
+
+msgid "XGA type"
+msgstr "Typ XGA"
+
+msgid "Instance"
+msgstr "Inštancia"
+
+msgid "MMIO Address"
+msgstr "Adresa MMIO"
+
+msgid "RAMDAC type"
+msgstr "Typ RAMDAC"
+
+msgid "Blend"
+msgstr "Zmes"
+
+msgid "Font"
+msgstr "Písmo"
+
+msgid "Bilinear filtering"
+msgstr "Bilineárne filtrovanie"
+
+msgid "Video chroma-keying"
+msgstr "Farebné kľúčovanie obrazu"
+
+msgid "Dithering"
+msgstr "Dithering"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "Povolenie NMI pre emuláciu CGA"
+
+msgid "Voodoo type"
+msgstr "Typ Voodoo"
+
+msgid "Framebuffer memory size"
+msgstr "Veľkosť pamäte Framebuffer"
+
+msgid "Texture memory size"
+msgstr "Veľkosť pamäte textúr"
+
+msgid "Dither subtraction"
+msgstr "Odčítanie ditheru"
+
+msgid "Screen Filter"
+msgstr "Filter obrazovky"
+
+msgid "Render threads"
+msgstr "Vlákna vykresľovania"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Počiatočná adresa"
+
+msgid "Contiguous Size"
+msgstr "Súvislá veľkosť"
+
+msgid "I/O Width"
+msgstr "Šírka I/O"
+
+msgid "Transfer Speed"
+msgstr "Rýchlosť prenosu"
+
+msgid "EMS mode"
+msgstr "Režim EMS"
+
+msgid "EMS Address"
+msgstr "Adresa EMS"
+
+msgid "EMS 1 Address"
+msgstr "Adresa EMS 1"
+
+msgid "EMS 2 Address"
+msgstr "Adresa EMS 2"
+
+msgid "EMS Memory Size"
+msgstr "Veľkosť pamäte EMS"
+
+msgid "EMS 1 Memory Size"
+msgstr "Veľkosť pamäte EMS 1"
+
+msgid "EMS 2 Memory Size"
+msgstr "Veľkosť pamäte EMS 2"
+
+msgid "Enable EMS"
+msgstr "Povoliť EMS"
+
+msgid "Enable EMS 1"
+msgstr "Povoliť EMS 1"
+
+msgid "Enable EMS 2"
+msgstr "Povoliť EMS 2"
+
+msgid "Address for > 2 MB"
+msgstr "Adresa pre > 2 MB"
+
+msgid "Frame Address"
+msgstr "Adresa rámu"
+
+msgid "USA"
+msgstr "Spojené štáty"
+
+msgid "Danish"
+msgstr "Dánsky"
+
+msgid "Always at selected speed"
+msgstr "Vždy pri zvolenej rýchlosti"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "Nastavenie BIOS + klávesové skratky (vypnuté počas POST)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 KB od F0000"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 KB od E0000 (adresa MSB invertovaná, najprv posledných 64 KB)"
+
+msgid "Sine"
+msgstr "Sinusový"
+
+msgid "Triangle"
+msgstr "Trojuholníkový"
+
+msgid "Linear"
+msgstr "Lineárna"
+
+msgid "4th Order"
+msgstr "4. rádu"
+
+msgid "7th Order"
+msgstr "7. rádu"
+
+msgid "Non-timed (original)"
+msgstr "Bez časovača (originál)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (bez prepojky na JMP2)"
+
+msgid "Two"
+msgstr "Dve stránky"
+
+msgid "Three"
+msgstr "Tri"
+
+msgid "Wheel"
+msgstr "Koliesko"
+
+msgid "Five + Wheel"
+msgstr "Päť s kolieskom"
+
+msgid "Five + 2 Wheels"
+msgstr "Päť s 2 kolieskami"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 sériová / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) sériová"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "Zakázať BIOS"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2 MB"
+
+msgid "8 MB"
+msgstr "8 MB"
+
+msgid "28 MB"
+msgstr "28 MB"
+
+msgid "1 MB"
+msgstr "1 MB"
+
+msgid "4 MB"
+msgstr "4 MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16 MB"
+
+msgid "20 MB"
+msgstr "20 MB"
+
+msgid "24 MB"
+msgstr "24 MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (stereo)"
+
+msgid "Classic"
+msgstr "Klasické"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "Kompozitný"
+
+msgid "True color"
+msgstr "True color"
+
+msgid "Old"
+msgstr "Staré"
+
+msgid "New"
+msgstr "Nový"
+
+msgid "Color (generic)"
+msgstr "Farebný (všeobecný)"
+
+msgid "Green Monochrome"
+msgstr "Zelený jednofarebný"
+
+msgid "Amber Monochrome"
+msgstr "Oranžový jednofarebný"
+
+msgid "Gray Monochrome"
+msgstr "Šedý jednofarebný"
+
+msgid "Color (no brown)"
+msgstr "Farebný (bez hnedej)"
+
+msgid "Color (IBM 5153)"
+msgstr "Farebný (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Jednoduché zdvojenie"
+
+msgid "sRGB interpolation"
+msgstr "Interpolácia sRGB"
+
+msgid "Linear interpolation"
+msgstr "Lineárna interpolácia"
+
+msgid "Has secondary 8x8 character set"
+msgstr "Má druhú sadu 8x8 znakov"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Má dcérsku dosku Quadcolor II"
+
+msgid "Alternate monochrome contrast"
+msgstr "Alternatívny monochromatický kontrast"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Jednofarebný (5151/MDA) (biely)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Jednofarebný (5151/MDA) (zelený)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Jednofarebný (5151/MDA) (oranžový)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Farebný 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Farebný 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Rozšírený farebný - normálny režim (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Rozšírený farebný - rozšírený režim (5154/ECD)"
+
+msgid "Green"
+msgstr "Zelený"
+
+msgid "Amber"
+msgstr "Oranžový"
+
+msgid "Gray"
+msgstr "Šedý"
+
+msgid "Grayscale"
+msgstr "Odtiene šedej"
+
+msgid "Color"
+msgstr "Farebný"
+
+msgid "U.S. English"
+msgstr "Americká angličtina"
+
+msgid "Scandinavian"
+msgstr "Škandinávske"
+
+msgid "Other languages"
+msgstr "Ostatné jazyky"
+
+msgid "Bochs latest"
+msgstr "Bochs najnovšie"
+
+msgid "Apply overscan deltas"
+msgstr "Použiť delty presahu"
+
+msgid "Mono Interlaced"
+msgstr "Monochromatický s prekladaním"
+
+msgid "Mono Non-Interlaced"
+msgstr "Monochromatický bez prekladania"
+
+msgid "Color Interlaced"
+msgstr "Farebný s prekladaním"
+
+msgid "Color Non-Interlaced"
+msgstr "Farebny bez prekladania"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "Grafický akcelerátor 3dfx Voodoo"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 zariadenia TMU)"
+
+msgid "8-bit"
+msgstr "8-bitové"
+
+msgid "16-bit"
+msgstr "16-bitové"
+
+msgid "Standard (150ns)"
+msgstr "Štandardné (150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "Vysoká rýchlosť (120ns)"
+
+msgid "Enabled"
+msgstr "Povolené"
+
+msgid "Standard"
+msgstr "Štandard"
+
+msgid "High-Speed"
+msgstr "Vysokorýchlostný"
+
+msgid "Stereo LPT DAC"
+msgstr "Stereofónny prevodník LPT DAC"
+
+msgid "Generic Text Printer"
+msgstr "Generická textová tlačiareň"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Generická ihličková tlačiareň ESC/P 2"
+
+msgid "Generic PostScript Printer"
+msgstr "Generická tlačiareň PostScript"
+
+msgid "Generic PCL5e Printer"
+msgstr "Generická tlačiareň PCL5e"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Internetový protokol paralelnej linky"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Ochranný kľúč pre Savage Quest"
+
+msgid "Serial Passthrough Device"
+msgstr "Zariadenie priechodu sériového portu"
+
+msgid "Passthrough Mode"
+msgstr "Režim priechodu"
+
+msgid "Host Serial Device"
+msgstr "Hostiteľské sériové zariadenie"
+
+msgid "Name of pipe"
+msgstr "Názov potrubia"
+
+msgid "Data bits"
+msgstr "Dátové bity"
+
+msgid "Stop bits"
+msgstr "Stop bity"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Prenosová rýchlosť priechodu"
+
+msgid "Named Pipe (Server)"
+msgstr "Pomenovaná rúrka (server)"
+
+msgid "Named Pipe (Client)"
+msgstr "Pomenovaná rúrka (klient)"
+
+msgid "Host Serial Passthrough"
+msgstr "Priechod sériového portu hostiteľa"
+
+msgid "E&ject %1"
+msgstr "&Vystrihnúť %1"
+
+msgid "&Unmute"
+msgstr "&Roztíšiť"
+
+msgid "Softfloat FPU"
+msgstr "Softfloat FPU"
+
+msgid "High performance impact"
+msgstr "Vysoký vplyv na výkon"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Všeobecný] Disk RAM (max. rýchlosť)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Všeobecný] 1989 (3500 ot./m)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Všeobecný] 1992 (3600 ot./m)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Všeobecný] 1994 (4500 ot./m)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Všeobecný] 1996 (5400 ot./m)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Všeobecný] 1997 (5400 ot./m)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Všeobecný] 1998 (5400 ot./m)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Všeobecný] 2000 (7200 ot./m)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "Klon IBM 8514/A (ISA)"
+
+msgid "Vendor"
+msgstr "Výrobca"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Všeobecné rozšírenie pamäte PC/XT"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Všeobecné rozšírenie pamäte PC/AT"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "Nastala chyba pri hľadaní ihličkových písem"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "Písma TrueType v adresári \"roms/printer/fonts\" sú potrebné na emuláciu generickej ihličkovej tlačiarne ESC/P 2."
+
+msgid "Inhibit multimedia keys"
+msgstr "Potlačiť stlačenie multimediálnych klávesov"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Vyžadovať potvrdenie pred uložením nastavení"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Vyžadovať potvrdenie pred resetovaním"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Vyžadovať potvrdenie pred ukončením"
+
+msgid "Options"
+msgstr "Možnosti"
+
+msgid "Model"
+msgstr "Model"
+
+msgid "Model:"
+msgstr "Model:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Inicializácia renderera Vulkan zlyhala."
+
+msgid "GLSL Error"
+msgstr "Chyba GLSL"
+
+msgid "Could not load shader: %1"
+msgstr "Nebol možné načítať shader: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "Je vyžadovaná verzia OpenGL 3.0 alebo vyššia. Aktuálna verzia GLSL je %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "Nebolo možné načítať textúru: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "Nebolo možné skompilovať shader:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "Program nebol spojený:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "Správca shaderov"
+
+msgid "Shader Configuration"
+msgstr "Konfigurácia shaderu"
+
+msgid "Add"
+msgstr "Pridať"
+
+msgid "Move up"
+msgstr "Posunúť vyššie"
+
+msgid "Move down"
+msgstr "Posunúť nižšie"
+
+msgid "Could not load file %1"
+msgstr "Nebolo možné možné načítať súbor %1"
+
+msgid "Key Bindings:"
+msgstr "Nastavenie klávesov"
+
+msgid "Action"
+msgstr "Akcia"
+
+msgid "Keybind"
+msgstr "Klávesy"
+
+msgid "Clear binding"
+msgstr "Vymazať nastavenia"
+
+msgid "Bind"
+msgstr "Nastaviť"
+
+msgid "Bind Key"
+msgstr "Nastaviť klávesu"
+
+msgid "Enter key combo:"
+msgstr "Zadajte kombináciu klávesov"
+
+msgid "Bind conflict"
+msgstr "Konflikt nastavení"
+
+msgid "This key combo is already in use."
+msgstr "Táto kombinácia klávesov je už použitá."
+
+msgid "Send Control+Alt+Del"
+msgstr "Stlačte Ctrl+Alt+Del"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Stlačte Ctrl+Alt+Esc"
+
+msgid "Toggle fullscreen"
+msgstr "Prepnúť režim celej obrazovky"
+
+msgid "Screenshot"
+msgstr "Zhotoviť snímku obrazovky"
+
+msgid "Release mouse pointer"
+msgstr "Uvoľniť kurzor myši"
+
+msgid "Toggle pause"
+msgstr "Pozastaviť alebo obnoviť"
+
+msgid "Toggle mute"
+msgstr "Prepnúť stlmenie"
+
+msgid "Text files"
+msgstr "Textové súbory"
+
+msgid "ROM files"
+msgstr "Súbory ROM"
+
+msgid "SoundFont files"
+msgstr "Súbory SoundFont"
+
+msgid "Local Switch"
+msgstr "Lokálny prepínač"
+
+msgid "Remote Switch"
+msgstr "Vzdialený prepínač"
+
+msgid "Switch:"
+msgstr "Prepínač:"
+
+msgid "Hub Mode"
+msgstr "Režim hubu"
+
+msgid "Hostname:"
+msgstr "Hostiteľské meno"
+
+msgid "ISA RAM:"
+msgstr "ISA pamäť RAM:"
+
+msgid "ISA ROM:"
+msgstr "ISA pamäť ROM:"
+
+msgid "&Wipe NVRAM"
+msgstr "&Vymazať NVRAM"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "Týmto sa vymažú všetky súbory NVRAM (a súvisiace súbory) virtuálneho počítača umiestnené v podadresári „nvr“. V prípade potreby budete musieť znovu nakonfigurovať nastavenia systému BIOS (a prípadne aj ďalších zariadení vo vnútri virtuálneho počítača).\n\nNaozaj chcete vymazať celý obsah NVRAM virtuálneho počítača \"%1\"?"
+
+msgid "Success"
+msgstr "Úspech"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "Obsah NVRAM virtuálneho počítača \"%1\" bol úspešne vymazaný."
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "Pri pokuse o vymazanie obsahu NVRAM virtuálneho počítača \"%1\" došlo k chybe"
+
+msgid "%1 VM Manager"
+msgstr "Správca virtuálnych počítačov %1"
+
+msgid "%n disk(s)"
+msgstr "%n disk(ov)"
+
+msgid "Unknown Status"
+msgstr "Neznámy stav"
+
+msgid "No Machines Found!"
+msgstr "Žádné počítače nalezeny!"
+
+msgid "Check for updates on startup"
+msgstr "Skontroluj aktualizácie pri spustení"
+
+msgid "Unable to determine release information"
+msgstr "Nebolo možné zistiť informácie o vydaní"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Pri kontrole aktualizácií došlo k chybe:\n\n%1\n\nSkúste to prosím neskôr znova."
+
+msgid "Update check complete"
+msgstr "Kontrola aktualizácií dokončená"
+
+msgid "stable"
+msgstr "stabilnú"
+
+msgid "beta"
+msgstr "beta"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Používáte najnovšiu %1 verziu 86Boxu: %2"
+
+msgid "version"
+msgstr "verzia"
+
+msgid "build"
+msgstr "build"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Práve používate verziu <b>%1</b>."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "K dispozícii je teraz <b>verzia %1</b>."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Práve používate build <b>%1</b>."
+
+msgid "<b>Build %1</b> is now available."
+msgstr "K dispozícii je teraz <b>build %1</b>."
+
+msgid "Would you like to visit the download page?"
+msgstr "Chcete navštíviť stránku na stiahnutie?"
+
+msgid "Visit download page"
+msgstr "Navštíviť stránku na stiahnutie"
+
+msgid "Update check"
+msgstr "Kontrola aktualizácií"
+
+msgid "Checking for updates..."
+msgstr "Prebieha kontrola aktualizácií..."
+
+msgid "86Box Update"
+msgstr "Aktualizácia 86Box"
+
+msgid "Release notes:"
+msgstr "Poznámky k vydaniu:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "Havária virtuálneho počítača"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "Proces virtuálneho počítača \"%1\" bol neočakávane ukončený s kódom ukončenia %2."
+
+msgid "The system will not be added."
+msgstr "Systém nebude pridaný."
+
+msgid "&Update mouse every CPU frame"
+msgstr "&Aktualizovať myš pri každom rámci CPU"
+
+msgid "Hue"
+msgstr "Odtieň"
+
+msgid "Saturation"
+msgstr "Saturácia"
+
+msgid "Contrast"
+msgstr "Kontrast"
+
+msgid "Brightness"
+msgstr "Jas"
+
+msgid "Sharpness"
+msgstr "Ostrota"
+
+msgid "&CGA composite settings..."
+msgstr "Nastavenia kompozitného režimu &CGA..."
+
+msgid "CGA composite settings"
+msgstr "Nastavenia kompozitného režimu CGA"
+
+msgid "Monitor EDID"
+msgstr "EDID monitora"
+
+msgid "Export..."
+msgstr "Exportovať..."
+
+msgid "Export EDID"
+msgstr "Exportovať EDID"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "Súbor EDID \"%ls\" je príliš veľký."
+
+msgid "OpenGL input scale"
+msgstr "Vstupná stupnica OpenGL"
+
+msgid "OpenGL input stretch mode"
+msgstr "Režim rozťahovania vstupu OpenGL"
+
+msgid "Color scheme"
+msgstr "Farebná schéma"
+
+msgid "Light"
+msgstr "Svetlo"
+
+msgid "Dark"
+msgstr "Tmavá"
diff --git a/src/qt/languages/sl-SI.po b/src/qt/languages/sl-SI.po
index 8c1d62ded..c23024a33 100644
--- a/src/qt/languages/sl-SI.po
+++ b/src/qt/languages/sl-SI.po
@@ -1,3 +1,11 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: sl_SI\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
 msgstr "&Dejanja"
 
@@ -10,8 +18,8 @@ msgstr "&Desni CTRL je levi ALT"
 msgid "&Hard Reset..."
 msgstr "&Ponovni zagon..."
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Ctrl+Alt+Del\tCtrl+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "&Ctrl+Alt+Del"
 
 msgid "Ctrl+Alt+&Esc"
 msgstr "Ctrl+Alt+&Esc"
@@ -19,8 +27,14 @@ msgstr "Ctrl+Alt+&Esc"
 msgid "&Pause"
 msgstr "&Premor"
 
-msgid "E&xit..."
-msgstr "Iz&hod..."
+msgid "Pause"
+msgstr "Premor"
+
+msgid "Re&sume"
+msgstr "&Nadaljuj"
+
+msgid "E&xit"
+msgstr "Iz&hod"
 
 msgid "&View"
 msgstr "&Pogled"
@@ -29,7 +43,7 @@ msgid "&Hide status bar"
 msgstr "&Skrij statusno vrstico"
 
 msgid "Hide &toolbar"
-msgstr "Hide &toolbar"
+msgstr "Skrij &orodno vrstico"
 
 msgid "&Resizeable window"
 msgstr "S&premenljiva velikost okna"
@@ -40,29 +54,23 @@ msgstr "&Zapomni si velikost in položaj"
 msgid "Re&nderer"
 msgstr "&Upodabljanje"
 
-msgid "&SDL (Software)"
-msgstr "&SDL (programsko)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (s&trojno)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
+msgid "&Qt (Software)"
+msgstr "&Qt (programsko)"
 
 msgid "Open&GL (3.0 Core)"
-msgstr "Open&GL (Jedro 3.0)"
+msgstr "Open&GL (jedro 3.0)"
 
 msgid "&VNC"
 msgstr "&VNC"
 
-msgid "Specify dimensions..."
+msgid "Specify &dimensions..."
 msgstr "&Določi velikost..."
 
-msgid "F&orce 4:3 display ratio"
-msgstr "&Vsili 4:3 razmerje zaslona"
+msgid "Force &4:3 display ratio"
+msgstr "Vsili razmerje zaslona &4:3"
 
 msgid "&Window scale factor"
-msgstr "&Faktor velikosti okna"
+msgstr "&Faktor povečave okna"
 
 msgid "&0.5x"
 msgstr "&0.5x"
@@ -94,8 +102,8 @@ msgstr "&7x"
 msgid "&8x"
 msgstr "&8x"
 
-msgid "Filter method"
-msgstr "&Metoda filtriranja"
+msgid "Fi&lter method"
+msgstr "&Vrsta filtriranja"
 
 msgid "&Nearest"
 msgstr "&Najbližja"
@@ -106,8 +114,8 @@ msgstr "&Linearna"
 msgid "Hi&DPI scaling"
 msgstr "&Raztezanje za visok DPI"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "&Celozaslonski način\tCtrl+Alt+PgUp"
+msgid "&Fullscreen"
+msgstr "&Celozaslonski način"
 
 msgid "Fullscreen &stretch mode"
 msgstr "&Način celozaslonskega raztezanja"
@@ -127,8 +135,8 @@ msgstr "&Celoštevilsko raztezanje"
 msgid "4:&3 Integer scale"
 msgstr "Celoštevilsko raztezanje 4:&3"
 
-msgid "E&GA/(S)VGA settings"
-msgstr "Nastavitve E&GA/(S)VGA"
+msgid "EGA/(S)&VGA settings"
+msgstr "Nastavitve EGA/(S)&VGA"
 
 msgid "&Inverted VGA monitor"
 msgstr "&Obrni barve zaslona VGA"
@@ -139,9 +147,15 @@ msgstr "&Vrsta zaslona VGA"
 msgid "RGB &Color"
 msgstr "&Barvni RGB"
 
+msgid "RGB (no brown)"
+msgstr "RGB (brez rjave)"
+
 msgid "&RGB Grayscale"
 msgstr "&Sivinski RGB"
 
+msgid "Generic RGBI color monitor"
+msgstr "Generični RGBI barvni monitor"
+
 msgid "&Amber monitor"
 msgstr "&Rumeni zaslon"
 
@@ -178,11 +192,17 @@ msgstr "&Orodja"
 msgid "&Settings..."
 msgstr "&Nastavitve..."
 
+msgid "Settings..."
+msgstr "Nastavitve..."
+
 msgid "&Update status bar icons"
 msgstr "&Posodabljaj ikone statusne vrstice"
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "&Zajemi posnetek zaslona\tCtrl+F11"
+msgid "Take s&creenshot"
+msgstr "&Zajemi posnetek zaslona"
+
+msgid "S&ound"
+msgstr "Z&vok"
 
 msgid "&Preferences..."
 msgstr "&Možnosti..."
@@ -193,11 +213,11 @@ msgstr "Omogoči integracijo s programom &Discord"
 msgid "Sound &gain..."
 msgstr "&Ojačanje zvoka..."
 
-msgid "Begin trace\tCtrl+T"
-msgstr "Z&ačni sledenje\tCtrl+T"
+msgid "Begin trace"
+msgstr "Z&ačni sledenje"
 
-msgid "End trace\tCtrl+T"
-msgstr "&Končaj sledenje\tCtrl+T"
+msgid "End trace"
+msgstr "&Končaj sledenje"
 
 msgid "&Help"
 msgstr "&Pomoč"
@@ -230,10 +250,10 @@ msgid "&Fast forward to the end"
 msgstr "Preskoči na konec"
 
 msgid "E&ject"
-msgstr "Izvrzi"
+msgstr "I&zvrzi"
 
 msgid "&Image..."
-msgstr "Slika..."
+msgstr "S&lika..."
 
 msgid "E&xport to 86F..."
 msgstr "&Izvozi v 86F..."
@@ -244,14 +264,14 @@ msgstr "&Utišaj"
 msgid "E&mpty"
 msgstr "&Prazen"
 
-msgid "&Reload previous image"
-msgstr "&Naloži zadnjo sliko"
+msgid "Reload previous image"
+msgstr "Naloži zadnjo sliko"
 
 msgid "&Folder..."
 msgstr "&Mapa..."
 
 msgid "Target &framerate"
-msgstr "&Ciljno št. sličic na sekundo"
+msgstr "&Ciljno št. kadrov na sekundo"
 
 msgid "&Sync with video"
 msgstr "&Sinhroniziraj z videom"
@@ -301,18 +321,12 @@ msgstr "V redu"
 msgid "Cancel"
 msgstr "Prekliči"
 
-msgid "Save these settings as &global defaults"
-msgstr "Shrani te nastavitve kot globalne privzete"
-
 msgid "&Default"
 msgstr "Privzeto"
 
 msgid "Language:"
 msgstr "Jezik:"
 
-msgid "Icon set:"
-msgstr "Komplet ikon:"
-
 msgid "Gain"
 msgstr "Ojačanje"
 
@@ -346,6 +360,9 @@ msgstr "Sistem:"
 msgid "Configure"
 msgstr "Nastavi"
 
+msgid "CPU:"
+msgstr "Procesor:"
+
 msgid "CPU type:"
 msgstr "Vrsta procesorja:"
 
@@ -353,7 +370,7 @@ msgid "Speed:"
 msgstr "Hitrost:"
 
 msgid "Frequency:"
-msgstr "Pogostost:"
+msgstr "Takt:"
 
 msgid "FPU:"
 msgstr "Procesor plavajoče vejice:"
@@ -365,7 +382,7 @@ msgid "MB"
 msgstr "MB"
 
 msgid "Memory:"
-msgstr "Spomin:"
+msgstr "Pomnilnik:"
 
 msgid "Time synchronization"
 msgstr "Sinhronizacija časa"
@@ -382,24 +399,51 @@ msgstr "Omogočeno (UTC)"
 msgid "Dynamic Recompiler"
 msgstr "Dinamični prevajalnik"
 
+msgid "CPU frame size"
+msgstr "Velikost blokov procesorja"
+
+msgid "Larger frames (less smooth)"
+msgstr "Večji bloki (manj gladko)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Manjši bloki (bolj gladko)"
+
 msgid "Video:"
 msgstr "Video:"
 
-msgid "Voodoo Graphics"
-msgstr "Voodoo grafika"
+msgid "Video #2:"
+msgstr "Video 2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Grafika Voodoo 1 ali 2"
 
 msgid "IBM 8514/A Graphics"
-msgstr "IBM 8514/A grafika"
+msgstr "Grafika IBM 8514/A"
 
 msgid "XGA Graphics"
-msgstr "XGA grafika"
+msgstr "Grafika XGA"
+
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "Grafika prikazovalnika IBM PS/55"
+
+msgid "Keyboard:"
+msgstr "Tipkovnica:"
+
+msgid "Keyboard"
+msgstr "Tipkovnica"
 
 msgid "Mouse:"
 msgstr "Miška:"
 
+msgid "Mouse"
+msgstr "Miška"
+
 msgid "Joystick:"
 msgstr "Igralna palica:"
 
+msgid "Joystick"
+msgstr "Igralna palica"
+
 msgid "Joystick 1..."
 msgstr "Igralna palica 1..."
 
@@ -430,6 +474,9 @@ msgstr "Izhodna naprava MIDI:"
 msgid "MIDI In Device:"
 msgstr "Vhodna naprava MIDI:"
 
+msgid "MIDI Out:"
+msgstr "Izhod MIDI:"
+
 msgid "Standalone MPU-401"
 msgstr "Samostojen MPU-401"
 
@@ -440,20 +487,11 @@ msgid "FM synth driver"
 msgstr "Gonilnik sintetizacije FM"
 
 msgid "Nuked (more accurate)"
-msgstr "Nuked (točnejši)"
+msgstr "Nuked (natančnejši)"
 
 msgid "YMFM (faster)"
 msgstr "YMFM (hitrejši)"
 
-msgid "Network type:"
-msgstr "Vrsta omrežja:"
-
-msgid "PCap device:"
-msgstr "Naprava PCap:"
-
-msgid "Network adapter:"
-msgstr "Omrežna kartica:"
-
 msgid "COM1 Device:"
 msgstr "Naprava COM1:"
 
@@ -478,6 +516,9 @@ msgstr "Naprava LPT3:"
 msgid "LPT4 Device:"
 msgstr "Naprava LPT4:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr "DMA ECP-ja notranjega LPT-ja:"
+
 msgid "Serial port 1"
 msgstr "Serijska vrata 1"
 
@@ -491,22 +532,22 @@ msgid "Serial port 4"
 msgstr "Serijska vrata 4"
 
 msgid "Parallel port 1"
-msgstr "Paralelna vrata 1"
+msgstr "Vzporedna vrata 1"
 
 msgid "Parallel port 2"
-msgstr "Paralelna vrata 2"
+msgstr "Vzporedna vrata 2"
 
 msgid "Parallel port 3"
-msgstr "Paralelna vrata 3"
+msgstr "Vzporedna vrata 3"
 
 msgid "Parallel port 4"
-msgstr "Paralelna vrata 4"
-
-msgid "HD Controller:"
-msgstr "Krmilnik trdega diska:"
+msgstr "Vzporedna vrata 4"
 
 msgid "FD Controller:"
-msgstr "Krmilnik disketnika:"
+msgstr "Disketni krmilnik:"
+
+msgid "CD-ROM Controller:"
+msgstr "Krmilnik CD-ROM:"
 
 msgid "Tertiary IDE Controller"
 msgstr "Terciarni krmilnik IDE"
@@ -514,6 +555,9 @@ msgstr "Terciarni krmilnik IDE"
 msgid "Quaternary IDE Controller"
 msgstr "Kvartarni krmilnik IDE"
 
+msgid "Hard disk"
+msgstr "Trdi disk"
+
 msgid "SCSI"
 msgstr "SCSI"
 
@@ -535,6 +579,9 @@ msgstr "Kasetnik"
 msgid "Hard disks:"
 msgstr "Trdi diski:"
 
+msgid "Firmware Version"
+msgstr "Različica programske opreme"
+
 msgid "&New..."
 msgstr "Nov..."
 
@@ -554,7 +601,7 @@ msgid "ID:"
 msgstr "ID:"
 
 msgid "&Specify..."
-msgstr "Določi..."
+msgstr "&Določi..."
 
 msgid "Sectors:"
 msgstr "Sektorji:"
@@ -589,23 +636,29 @@ msgstr "Preverjaj BPB"
 msgid "CD-ROM drives:"
 msgstr "Pogoni CD-ROM:"
 
-msgid "Earlier drive"
-msgstr "Zgodnejši pogon"
-
 msgid "MO drives:"
 msgstr "Magnetno-optični pogoni:"
 
-msgid "ZIP drives:"
-msgstr "Pogoni ZIP:"
+msgid "MO:"
+msgstr "Magneto-optični:"
+
+msgid "Removable disks:"
+msgstr "Odstranljivi diski:"
+
+msgid "Removable disk drives:"
+msgstr "Odstranljivi diskovni pogoni:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
 
 msgid "ISA RTC:"
-msgstr "Ura v realnem času ISA:"
+msgstr "Ura realnega časa ISA:"
 
 msgid "ISA Memory Expansion"
-msgstr "Razširitev spomina ISA"
+msgstr "Razširitev pomnilnika ISA"
+
+msgid "ISA ROM Cards"
+msgstr "Kartice ISA z ROM-i"
 
 msgid "Card 1:"
 msgstr "Kartica 1:"
@@ -619,18 +672,21 @@ msgstr "Kartica 3:"
 msgid "Card 4:"
 msgstr "Kartica 4:"
 
+msgid "Generic ISA ROM Board"
+msgstr "Generična plošča ISA z ROM-om"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "Generična plošča ISA z dvema ROM-oma"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "Generična plošča ISA s štirimi ROM-i"
+
 msgid "ISABugger device"
 msgstr "Naprava ISABugger"
 
 msgid "POST card"
 msgstr "Kartica POST"
 
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
-
 msgid "86Box"
 msgstr "86Box"
 
@@ -641,22 +697,25 @@ msgid "Fatal error"
 msgstr "Kritična napaka"
 
 msgid " - PAUSED"
-msgstr " - PAUSED"
-
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Pritisnite Ctrl+Alt+PgDn za povratek iz celozaslonskega načina."
+msgstr " - ZAUSTAVLJEN"
 
 msgid "Speed"
 msgstr "Hitrost"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "Odstranljivi disk %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "ZIP slike"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "&Odstranljivi disk %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Slike odstranljivih diskov"
+
+msgid "Image %1"
+msgstr "Slika %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
-msgstr "86Box ni našel nobenih uporabnih ROM slik.\n\nProsim <a href=\"https://github.com/86Box/roms/releases/latest\">prenesite</a> set ROM-ov in ga razširite v mapo \"roms\"."
+msgstr "86Box ni našel nobenih uporabnih ROM slik.\n\nProsim <a href=\"https://github.com/86Box/roms/releases/latest\">prenesite</a> komplet ROM-ov in ga razširite v mapo \"roms\"."
 
 msgid "(empty)"
 msgstr "(prazno)"
@@ -686,7 +745,13 @@ msgid "Machine \"%hs\" is not available due to missing ROMs in the roms/machines
 msgstr "Sistem \"%hs\" ni na voljo zaradi manjkajočih ROM-ov v mapi roms/machines. Preklapljam na drug sistem, ki je na voljo."
 
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
-msgstr "Grafična kartica \"%hs\" ni na voljo zaradi manjkajočih ROM-ov v mapi roms/video. Preklapljam na drugo grafično kartico, ki je na voljo.."
+msgstr "Grafična kartica \"%hs\" ni na voljo zaradi manjkajočih ROM-ov v mapi roms/video. Preklapljam na drugo grafično kartico, ki je na voljo."
+
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "Grafična kartica 2 \"%hs\" ni na voljo zaradi manjkajočih ROM-ov v mapi roms/video. Onemogočam drugo grafično kartico."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "Naprava \"%hs\" ni na voljo zaradi manjkajočih ROM-ov. Preziram napravo."
 
 msgid "Machine"
 msgstr "Sistem"
@@ -706,12 +771,30 @@ msgstr "Omrežje"
 msgid "Ports (COM & LPT)"
 msgstr "Vrata (COM & LPT)"
 
+msgid "Ports"
+msgstr "Vrata"
+
+msgid "Serial ports:"
+msgstr "Serijska vrata:"
+
+msgid "Parallel ports:"
+msgstr "Paralelna vrata:"
+
 msgid "Storage controllers"
 msgstr "Krmilniki shrambe"
 
 msgid "Hard disks"
 msgstr "Trdi diski"
 
+msgid "Disks:"
+msgstr "Diski:"
+
+msgid "Floppy:"
+msgstr "Diskete:"
+
+msgid "Controllers:"
+msgstr "Krmilniki:"
+
 msgid "Floppy & CD-ROM drives"
 msgstr "Disketni in CD-ROM pogoni"
 
@@ -721,14 +804,17 @@ msgstr "Druge odstranljive naprave"
 msgid "Other peripherals"
 msgstr "Druga periferija"
 
+msgid "Other devices"
+msgstr "Druge naprave"
+
 msgid "Click to capture mouse"
 msgstr "Kliknite za zajem miške"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "Pritisnite F8+F12 za izpust miške"
+msgid "Press %1 to release mouse"
+msgstr "Pritisnite %1 za izpust miške"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Pritisnite F8+F12 ali srednji gumb za izpust miške"
+msgid "Press %1 or middle button to release mouse"
+msgstr "Pritisnite %1 ali srednji gumb za izpust miške"
 
 msgid "Bus"
 msgstr "Vodilo"
@@ -748,65 +834,89 @@ msgstr "S"
 msgid "KB"
 msgstr "KB"
 
-msgid "Could not initialize the video renderer."
-msgstr "Ne morem inicializirati pogona upodabljanja."
-
 msgid "Default"
 msgstr "Privzeto"
 
-msgid "%i Wait state(s)"
-msgstr "%i stanj čakanja"
+msgid "%1 Wait state(s)"
+msgstr "%1 stanj čakanja"
 
 msgid "Type"
 msgstr "Vrsta"
 
-msgid "Failed to set up PCap"
-msgstr "Nastavitev PCap ni uspela"
-
 msgid "No PCap devices found"
-msgstr "Nobena naprava PCap ni bila najdena"
+msgstr "Najdena ni bila nobena naprava PCap"
 
 msgid "Invalid PCap device"
 msgstr "Neveljavna naprava PCap"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "Standardna krmilna palica z 2 gumboma"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "Igralna palica z 2 osema, 2 gumboma"
 
-msgid "Standard 4-button joystick"
-msgstr "Standardna krmilna palica s 4 gumbi"
+msgid "2-axis, 4-button joystick"
+msgstr "Igralna palica z 2 osema, 4 gumbi"
 
-msgid "Standard 6-button joystick"
-msgstr "Standardna krmilna palica s 6 gumbi"
+msgid "2-axis, 6-button joystick"
+msgstr "Igralna palica z 2 osema, 6 gumbi"
 
-msgid "Standard 8-button joystick"
-msgstr "Standardna krmilna palica z 8 gumbi"
+msgid "2-axis, 8-button joystick"
+msgstr "Igralna palica z 2 osema, 8 gumbi"
+
+msgid "3-axis, 2-button joystick"
+msgstr "Igralna palica s 3 osmi, 2 gumboma"
+
+msgid "3-axis, 4-button joystick"
+msgstr "Igralna palica s 3 osmi, 4 gumbi"
+
+msgid "4-axis, 4-button joystick"
+msgstr "Igralna palica s 4 osmi, 4 gumbi"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH Pedals"
+
 msgid "Microsoft SideWinder Pad"
 msgstr "Microsoft SideWinder Pad"
 
 msgid "Thrustmaster Flight Control System"
 msgstr "Thrustmaster Flight Control System"
 
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Rudder Control System"
+
+msgid "2-button gamepad(s)"
+msgstr "Igralna ploščica z 2 gumboma"
+
+msgid "2-button flight yoke"
+msgstr "Letalski krmilni drog z 2 gumbi"
+
+msgid "4-button gamepad"
+msgstr "Igralna ploščica s 4 gumbi"
+
+msgid "4-button flight yoke"
+msgstr "Letalski krmilni drog s 4 gumbi"
+
+msgid "2-button flight yoke with throttle"
+msgstr "Letalski krmilni drog z 2 gumbi gumboma ročico za plin"
+
+msgid "4-button flight yoke with throttle"
+msgstr "Letalski krmilni drog s 4 gumbi z ročico za plin"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Volan Win95 s 3 osmi, 4 gumbi"
+
 msgid "None"
 msgstr "Brez"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "Ne morem naložiti pospeševalnikov tipkovnice."
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CHS: %2, %3, %4)"
 
-msgid "Unable to register raw input."
-msgstr "Ne morem registrirati neobdelanega vnosa."
+msgid "Floppy %1 (%2): %3"
+msgstr "Disketa %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Disketa %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "&Disketa %1 (%2): %3"
 
 msgid "Advanced sector images"
 msgstr "Napredne sektorske slike"
@@ -814,9 +924,6 @@ msgstr "Napredne sektorske slike"
 msgid "Flux images"
 msgstr "Tokovne slike"
 
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "Ne morem inicializirati SDL, potrebna je knjižica SDL2.dll"
-
 msgid "Are you sure you want to hard reset the emulated machine?"
 msgstr "Ste prepričani, da želite ponovno zagnati emulirani sistem?"
 
@@ -824,10 +931,16 @@ msgid "Are you sure you want to exit 86Box?"
 msgstr "Ste prepričani, da želite zapreti 86Box?"
 
 msgid "Unable to initialize Ghostscript"
-msgstr "Ne morem inicializirati Ghostscript"
+msgstr "Ghostscript-a ni bilo mogoče inicializirati"
 
-msgid "MO %i (%ls): %ls"
-msgstr "MO %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "GhostPCL-ja ni bilo mogoče inicializirati"
+
+msgid "MO %1 (%2): %3"
+msgstr "MO %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&MO %1 (%2): %3"
 
 msgid "MO images"
 msgstr "Slike MO"
@@ -835,8 +948,17 @@ msgstr "Slike MO"
 msgid "Welcome to 86Box!"
 msgstr "Dobrodošli v 86Box!"
 
-msgid "Internal controller"
-msgstr "Notranji krmilnik"
+msgid "Internal device"
+msgstr "Vgrajena naprava"
+
+msgid "&File"
+msgstr "&Datoteka"
+
+msgid "&New machine..."
+msgstr "&Nova naprava..."
+
+msgid "&Check for updates..."
+msgstr "&Preveri obstoj posodobitev..."
 
 msgid "Exit"
 msgstr "Izhod"
@@ -860,34 +982,22 @@ msgid "86Box v"
 msgstr "86Box v"
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "Emulator starih računalnikov\n\nAvtorji: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne in drugi.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho in drugi.\n\nIzdano pod licenco GNU General Public License različica 2 ali novejša. Glej datoteko LICENSE za več informacij."
+msgstr "Emulator starih računalnikov\n\nAvtorji: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne in drugi.\n\nS prejšnjimi prispevki Sarah Walker, leilei, JohnElliott, greatpsycho in drugih.\n\nIzdano pod licenco GNU General Public License različica 2 ali novejša. Glej datoteko LICENSE za več informacij."
 
 msgid "Hardware not available"
 msgstr "Strojna oprema ni na voljo"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Prepičajte se, da je nameščen libpcap in da ste na omrežni povezavi, združljivi z "
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "Prepičajte se, da je nameščen %1 in da ste na omrežni povezavi, združljivi z %1."
 
 msgid "Invalid configuration"
 msgstr "Neveljavna konfiguracija"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 je potreben za samodejno pretvorbo datotek PostScript v PDF.\n\nVsi dokumenti, poslani generičnemu tiskalniku PostScript bodo shranjeni kot datoteke PostScript (.ps)."
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " je potreben za samodejno pretvorbo PostScript datotek v PDF.\n\nVsi dokumenti, poslani generičnemu PostScript tiskalniku bodo shranjeni kot PostScript (.ps) datoteke."
-
-msgid "Entering fullscreen mode"
-msgstr "Preklapljam v celozaslonski način"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 je potreben za samodejno pretvorbo datotek PCL v PDF.\n\nVsi dokumenti, poslani generičnemu tiskalniku PCL bodo shranjeni kot datoteke Printer Command Language (.pcl)."
 
 msgid "Don't show this message again"
 msgstr "Ne pokaži več tega sporočila"
@@ -896,25 +1006,22 @@ msgid "Don't exit"
 msgstr "Prekliči izhod"
 
 msgid "Reset"
-msgstr "Resetiraj"
+msgstr "Znova zaženi"
 
 msgid "Don't reset"
-msgstr "Ne resetiraj"
+msgstr "Ne zaženi znova"
 
 msgid "CD-ROM images"
 msgstr "Slike CD-ROM"
 
-msgid "%hs Device Configuration"
-msgstr "Konfiguracija naprave %hs"
+msgid "%1 Device Configuration"
+msgstr "Nastavitev naprave %1"
 
 msgid "Monitor in sleep mode"
 msgstr "Zaslon v načinu spanja"
 
-msgid "OpenGL Shaders"
-msgstr "Senčilniki OpenGL"
-
-msgid "OpenGL options"
-msgstr "Možnosti OpenGL"
+msgid "GLSL shaders"
+msgstr "Senčilniki GLSL"
 
 msgid "You are loading an unsupported configuration"
 msgstr "Nalagate nepodprto konfiguracijo"
@@ -925,30 +1032,33 @@ msgstr "Filtriranje vrste procesorja glede na izbran sistem je onemogočeno za t
 msgid "Continue"
 msgstr "Nadaljuj"
 
-msgid "Cassette: %s"
-msgstr "Kaseta: %s"
+msgid "Cassette: %1"
+msgstr "Kaseta: %1"
+
+msgid "C&assette: %1"
+msgstr "K&aseta: %1"
 
 msgid "Cassette images"
 msgstr "Slike kaset"
 
-msgid "Cartridge %i: %ls"
-msgstr "Spominski vložek %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "Spominski vložek %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "S&pominski vložek %1: %2"
 
 msgid "Cartridge images"
 msgstr "Slike spominskega vložka"
 
-msgid "Error initializing renderer"
-msgstr "Napaka pri zagonu sistema za upodabljanje"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "Sistema za upodabljanje OpenGL (3.0 Core) ni bilo mogoče zagnati. Uporabite drug sistem za upodabljanje."
-
 msgid "Resume execution"
 msgstr "Nadaljuj izvajanje"
 
 msgid "Pause execution"
 msgstr "Prekini izvajanje"
 
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del"
+
 msgid "Press Ctrl+Alt+Del"
 msgstr "Pritisni Ctrl+Alt+Del"
 
@@ -958,17 +1068,281 @@ msgstr "Pritisni Ctrl+Alt+Esc"
 msgid "Hard reset"
 msgstr "Ponovni zagon"
 
+msgid "Force shutdown"
+msgstr "Prisilno prekini"
+
+msgid "Start"
+msgstr "Zaženi"
+
+msgid "Not running"
+msgstr "Se ne izvaja"
+
+msgid "Running"
+msgstr "Se izvaja"
+
+msgid "Paused"
+msgstr "Premor"
+
+msgid "Waiting"
+msgstr "Čaka"
+
+msgid "Powered Off"
+msgstr "Izklopljena"
+
+msgid "%n running"
+msgstr "%n se izvaja"
+
+msgid "%n paused"
+msgstr "%n v pavzi"
+
+msgid "%n waiting"
+msgstr "%n čaka"
+
+msgid "%1 total"
+msgstr "%1 skupno"
+
+msgid "VMs: %1"
+msgstr "Navideznih naprav: %1"
+
+msgid "System Directory:"
+msgstr "Imenik sistema:"
+
+msgid "Choose directory"
+msgstr "Izberi imenik"
+
+msgid "Choose configuration file"
+msgstr "Izberi datoteko z nastavitvami"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "Datoteke z nastavitvami programa 86Box (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Napaka pri branju nastavitev"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "Ni bilo mogože odpreti izbrane datoteke z nastavitvami za branje: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "V iskalnem polju uporabi regularne ekspresije"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "Št. trenutno dejavnih naprav je %1. Ali vseeno želite izstopiti iz upravitelja navideznih naprav?"
+
+msgid "Add new system wizard"
+msgstr "Čarovnik za dodajanje novega sistema"
+
+msgid "Introduction"
+msgstr "Predstavitev"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "To Vam bo pomagalo dodati nov sistem v program 86Box."
+
+msgid "New configuration"
+msgstr "Nove nastavitve"
+
+msgid "Complete"
+msgstr "Dokončaj"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "Čarovnik bo zdaj zagnal nastavitev novega sistema."
+
+msgid "Use existing configuration"
+msgstr "Uporabi obstoječe nastavitve"
+
+msgid "Type some notes here"
+msgstr "Tukaj vpišite nekaj opomb"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Prilepite vsebino obstoječe datoteke z nastavitvami v spodnje polje."
+
+msgid "Load configuration from file"
+msgstr "Naloži nastavitve iz datoteke"
+
+msgid "System name"
+msgstr "Ime sistema"
+
+msgid "System name:"
+msgstr "Ime sistema:"
+
+msgid "System name cannot contain certain characters"
+msgstr "Ime sistema ne sme vsebovati določenih znakov"
+
+msgid "System name already exists"
+msgstr "Ime sistema že obstaja"
+
+msgid "Please enter a directory for the system"
+msgstr "Prosimo vpišite imenik za sistem"
+
+msgid "Directory does not exist"
+msgstr "Imenik ne obstaja"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "Nov imenik sistema bo ustvarjen v zgoraj izbranem imeniku"
+
+msgid "System location:"
+msgstr "Lokacija sistema:"
+
+msgid "System name and location"
+msgstr "Ime sistema in lokacija"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Vpišite ime sistema in izberite lokacijo"
+
+msgid "Enter the name of the system"
+msgstr "Vpišite ime sistema"
+
+msgid "Please enter a system name"
+msgstr "Prosimo, vpišite ime sistema"
+
+msgid "Display name (optional):"
+msgstr "Prikazano ime (neobvezno):"
+
+msgid "Display name:"
+msgstr "Prikazano ime:"
+
+msgid "Set display name"
+msgstr "Nastavi prikazano ime"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Vstavi novo prikazano ime (prazno za ponastavitev)"
+
+msgid "Change &display name..."
+msgstr "Spremeni &prikazano ime..."
+
+msgid "Context Menu"
+msgstr "Kontekstni meni"
+
+msgid "&Open folder..."
+msgstr "&Odpri mapo..."
+
+msgid "Open p&rinter tray..."
+msgstr "Odpri pladenj &tiskalnika..."
+
+msgid "Set &icon..."
+msgstr "Izberi &ikono"
+
+msgid "Select an icon"
+msgstr "Izberi ikono"
+
+msgid "C&lone..."
+msgstr "K&loniraj..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "Navidezna naprava \"%1\" (%2) bo klonirana v:"
+
+msgid "Directory %1 already exists"
+msgstr "Direktorij %1 že obstaja"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "V imenu ne smete uporabiti sledečih znakov: %1"
+
+msgid "Clone"
+msgstr "Kloniraj"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Napaka pri izdelavi imenika za klonirani navidezni stroj"
+
+msgid "Failed to clone VM."
+msgstr "Napaka pri kloniranju navidezne naprave."
+
+msgid "Directory in use"
+msgstr "Direktorij v uporabi"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "Izbrani imenik je že v uporabi. Prosimo, izberite drug imenik."
+
+msgid "Create directory failed"
+msgstr "Napaka pri ustvarjanju imenika"
+
+msgid "Unable to create the directory for the new system"
+msgstr "Napaka pri ustvarjanju imenika za nov sistem"
+
+msgid "Configuration write failed"
+msgstr "Napaka pri pisanju nastavitev"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "Napaka pri odpiranju datoteke z nastavitvami %1 za pisanje"
+
+msgid "Error adding system"
+msgstr "Napaka pri dodajanju sistema"
+
+msgid "Remove directory failed"
+msgstr "Napaka pri odstranjevanju imenika"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "Nekaterih datotek v imeniku naprave ni bilo mogoče izbrisati. Prosimo, izbrišite jih ročno."
+
+msgid "Build"
+msgstr "Kompilacija"
+
+msgid "Version"
+msgstr "Različica"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "Posodobitev programa 86Box je na voljo: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "Prišlo je do napake med preverjanjem obstoja posodobitev: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>Posodobitev programa 86Box je na voljo!</b>"
+
+msgid "Warning"
+msgstr "Opozorilo"
+
+msgid "&Kill"
+msgstr "&Prisilno končaj"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "Prisilno končanje navidezne naprave lahko povzroči izgubo podatkov. To storite samo, če je proces 86Box postal neodziven.\n\nAli res želite prisilno končaiti navidzeno napravo \"%1\"?"
+
+msgid "&Delete"
+msgstr "Iz&briši"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "Ali res želite izbrisati navidezno napravo \"%1\" in vse njene datoteke? Preklic teka dejanja ni mogoč!"
+
+msgid "Show &config file"
+msgstr "Prikaži datoteko z &nastavitvami"
+
+msgid "No screenshot"
+msgstr "Ni zajemov zaslona"
+
+msgid "Search"
+msgstr "Išči"
+
+msgid "Searching for VMs..."
+msgstr "Iskanje navideznih naprav..."
+
+msgid "Found %1"
+msgstr "%1 najden"
+
+msgid "System"
+msgstr "Sistem"
+
+msgid "Storage"
+msgstr "Shramba"
+
+msgid "Disk %1: "
+msgstr "Disk %1: "
+
+msgid "No disks"
+msgstr "Ni diskov"
+
+msgid "Audio"
+msgstr "Zvok"
+
+msgid "Audio:"
+msgstr "Zvok:"
+
 msgid "ACPI shutdown"
 msgstr "Zaustavitev ACPI"
 
-msgid "Hard disk (%s)"
-msgstr "Trdi disk (%s)"
+msgid "ACP&I shutdown"
+msgstr "Zaustavitev ACP&I"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "Trdi disk (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
 msgstr "MFM/RLL ali ESDI pogoni CD-ROM niso nikoli obstajali"
@@ -983,7 +1357,7 @@ msgid "Add New Hard Disk"
 msgstr "Dodaj nov trdi disk"
 
 msgid "Add Existing Hard Disk"
-msgstr "Dodaj obstoječ trdi disk"
+msgstr "Dodaj obstoječi trdi disk"
 
 msgid "HDI disk images cannot be larger than 4 GB."
 msgstr "Slike diska HDI ne morejo biti večje od 4 GB."
@@ -1003,9 +1377,6 @@ msgstr "Ne morem pisati v datoteko"
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
 msgstr "Slike HDI ali HDX, ki nimajo sektorjev velikosti 512 bajtov, niso podprte."
 
-msgid "USB is not yet supported"
-msgstr "USB še ni podprt"
-
 msgid "Disk image file already exists"
 msgstr "Datoteka s sliko diska že obstaja"
 
@@ -1039,6 +1410,27 @@ msgstr "Prepiši"
 msgid "Don't overwrite"
 msgstr "Ne prepiši"
 
+msgid "Raw image"
+msgstr "Surova slika"
+
+msgid "HDI image"
+msgstr "Slika HDI"
+
+msgid "HDX image"
+msgstr "Slika HDX"
+
+msgid "Fixed-size VHD"
+msgstr "VHD fiksne velikosti"
+
+msgid "Dynamic-size VHD"
+msgstr "Dinamičen VHD"
+
+msgid "Differencing VHD"
+msgstr "Diferencialni VHD"
+
+msgid "(N/A)"
+msgstr "(Ni na voljo)"
+
 msgid "Raw image (.img)"
 msgstr "Surova slika (.img)"
 
@@ -1067,20 +1459,17 @@ msgid "VHD files"
 msgstr "Datoteke VHD"
 
 msgid "Select the parent VHD"
-msgstr "Izberite starševsko sliko VHD"
+msgstr "Izberite nadrejeno sliko VHD"
 
 msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
-msgstr "To lahko pomeni, da je bila starševska slika spremenjena potem, ko je že bila ustvarjena diferencialna slika.\n\nDo tega lahko pride tudi kadar so datoteke slik diska premaknjene ali kopirane, ali pa gre za hrošča v programu, ki je ustvaril ta disk.\n\nŽelite popraviti časovni žig?"
+msgstr "To lahko pomeni, da je bila nadrejena slika spremenjena po ustvaritvi diferencialne slike.\n\nDo tega lahko pride tudi kadar so datoteke slik diska premaknjene ali kopirane, ali pa gre za hrošča v programu, ki je ustvaril ta disk.\n\nŽelite popraviti časovni žig?"
 
 msgid "Parent and child disk timestamps do not match"
-msgstr "Časovna žiga starševske slike diska in slike diska otroka se ne ujemata"
+msgstr "Časovna žiga nadrejene in podrejene slike diska se ne ujemata"
 
 msgid "Could not fix VHD timestamp."
 msgstr "Ne morem popraviti časovnega žiga slike VHD."
 
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
-
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
 
@@ -1096,44 +1485,29 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
+msgid "160 KB"
+msgstr "160 KB"
 
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
+msgid "180 KB"
+msgstr "180 KB"
 
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
+msgid "320 KB"
+msgstr "320 KB"
 
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
+msgid "360 KB"
+msgstr "360 KB"
 
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
+msgid "640 KB"
+msgstr "640 KB"
 
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
+msgid "720 KB"
+msgstr "720 KB"
 
 msgid "1.2 MB"
 msgstr "1.2 MB"
@@ -1145,10 +1519,10 @@ msgid "1.44 MB"
 msgstr "1.44 MB"
 
 msgid "DMF (cluster 1024)"
-msgstr "DMF (grozd 1024)"
+msgstr "DMF (gruča 1024)"
 
 msgid "DMF (cluster 2048)"
-msgstr "DMF (grozd 2048)"
+msgstr "DMF (gruča 2048)"
 
 msgid "2.88 MB"
 msgstr "2.88 MB"
@@ -1202,7 +1576,7 @@ msgid "(System Default)"
 msgstr "(Sistemsko privzeto)"
 
 msgid "Failed to initialize network driver"
-msgstr "Ni uspelo inicializirati omrežnega gonilnika"
+msgstr "Inicializacija omrežnega gonilnika ni uspela"
 
 msgid "The network configuration will be switched to the null driver"
 msgstr "Omrežne nastavitve bodo preklopljene na ničelni gonilnik"
@@ -1227,3 +1601,1383 @@ msgstr "Hitri"
 
 msgid "&Auto-pause on focus loss"
 msgstr "&Samodejni premor ob izgubi fokusa"
+
+msgid "WinBox is no longer supported"
+msgstr "WinBox ni več podprt"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "Razvoj upravitelja WinBox se je leta 2022 ustavil zaradi pomanjkanja vzdrževalcev. Ker svoja prizadevanja usmerjamo v še boljše delovanje programa 86Box, smo se odločili, da programa WinBox kot upravitelja ne bomo več podpirali.\n\nWinBox ne bo več zagotavljal posodobitev, če ga boste še naprej uporabljali z novejšimi različicami programa 86Box, pa lahko naletite na nepravilno obnašanje. Vsa poročila o napakah, povezana z obnašanjem programa WinBox, bodo zaprta kot neveljavna.\n\nZa seznam drugih upraviteljev, ki jih lahko uporabite, obiščite spletno stran 86box.net."
+
+msgid "Generate"
+msgstr "Ustvarjanje"
+
+msgid "Joystick configuration"
+msgstr "Konfiguracija igralne palice"
+
+msgid "Device"
+msgstr "Naprava"
+
+msgid "%1 (X axis)"
+msgstr "%1 (os X)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (os Y)"
+
+msgid "MCA devices"
+msgstr "Naprave MCA"
+
+msgid "List of MCA devices:"
+msgstr "Seznam naprav MCA:"
+
+msgid "&Tablet tool"
+msgstr "Orodje za tablico"
+
+msgid "About &Qt"
+msgstr "O programu &Qt"
+
+msgid "&MCA devices..."
+msgstr "Naprave MCA..."
+
+msgid "Show non-&primary monitors"
+msgstr "Prikaži neprimarne monitorje"
+
+msgid "Open screenshots &folder..."
+msgstr "Odprite mapo s posnetki zaslona..."
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Uporabi način celozaslonskega raztezanja v maksimiranem stanju"
+
+msgid "&Cursor/Puck"
+msgstr "&Kazalec/ključ"
+
+msgid "&Pen"
+msgstr "&Pisalo"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "&Gostiteljski pogon CD/DVD (%1:)"
+
+msgid "&Connected"
+msgstr "&Povezan"
+
+msgid "Clear image &history"
+msgstr "Počisti zgodovino slik"
+
+msgid "Create..."
+msgstr "Ustvari..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "Gostiteljski pogon CD/DVD (%1)"
+
+msgid "Unknown Bus"
+msgstr "Neznano vodilo"
+
+msgid "Null Driver"
+msgstr "Ničelni gonilnik"
+
+msgid "NIC:"
+msgstr "Omrežna kartica:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "NIC %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&NIC %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "Obnašanje pri upodabljanju"
+
+msgid "Use target framerate:"
+msgstr "Uporabi ciljno št. kadrov na sekundo:"
+
+msgid " fps"
+msgstr " fps"
+
+msgid "VSync"
+msgstr "VSync"
+
+msgid "Synchronize with video"
+msgstr "Sinhroniziraj z videom"
+
+msgid "Shaders"
+msgstr "Senčilniki"
+
+msgid "Remove"
+msgstr "Odstrani"
+
+msgid "Browse..."
+msgstr "Prerskaj..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "Ni bilo mogoče ustvariti konteksta OpenGL."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "Ni bilo mogoče preklopiti na kontekst OpenGL."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "Potrebna je OpenGL različica 3.0 ali novejša. Trenutna različica je %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "Napaka pri inicializaciji OpenGL"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nVrnitev na programsko upodabljanje."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>Pri izbiri medijskih slik (CD-ROM, disketa itd.) se bo odprto pogovorno okno začelo v istem imeniku kot konfiguracijska datoteka 86Box. Ta nastavitev bo verjetno imela pomen le v operacijskem sistemu MacOS.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "Ta naprava je bila morda premeščena ali kopirana."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "Da bi zagotovili pravilno delovanje omrežja, mora 86Box vedeti, ali je bil ta virtualna naprava prestavljena ali kopirana.\n\nČe niste prepričani, izberite \"Kopiral sem jo\"."
+
+msgid "I Moved It"
+msgstr "Premaknil sem jo"
+
+msgid "I Copied It"
+msgstr "Kopiral sem jo"
+
+msgid "86Box Monitor #"
+msgstr "86Box Monitor "
+
+msgid "No MCA devices."
+msgstr "Ni naprav MCA."
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "Omrežna kartica 1"
+
+msgid "Network Card #2"
+msgstr "Omrežna kartica 2"
+
+msgid "Network Card #3"
+msgstr "Omrežna kartica 3"
+
+msgid "Network Card #4"
+msgstr "Omrežna kartica 4"
+
+msgid "Mode:"
+msgstr "Način:"
+
+msgid "Interface:"
+msgstr "Vmesnik:"
+
+msgid "Adapter:"
+msgstr "Mrežna kartica:"
+
+msgid "VDE Socket:"
+msgstr "Vtičnica VDE:"
+
+msgid "86Box Unit Tester"
+msgstr "Tester enote 86Box"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Novell NetWare 2.x Key Card"
+
+msgid "Serial port passthrough 1"
+msgstr "Prepust za serijska vrata 1"
+
+msgid "Serial port passthrough 2"
+msgstr "Prepust za serijska vrata 2"
+
+msgid "Serial port passthrough 3"
+msgstr "Prepust za serijska vrata 3"
+
+msgid "Serial port passthrough 4"
+msgstr "Prepust za serijska vrata 4"
+
+msgid "Renderer &options..."
+msgstr "Možnosti sistema za upodabljanje..."
+
+msgid "PC/XT Keyboard"
+msgstr "Tipkovnica PC/XT"
+
+msgid "AT Keyboard"
+msgstr "Tipkovnica AT"
+
+msgid "AX Keyboard"
+msgstr "Tipkovnica AX"
+
+msgid "PS/2 Keyboard"
+msgstr "Tipkovnica PS/2"
+
+msgid "PS/55 Keyboard"
+msgstr "Tipkovnica PS/55"
+
+msgid "Keys"
+msgstr "Tipke"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Miška na vodilu Logitech/Microsoft"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Miška na vodilu Microsoft (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Serijska miška Mouse Systems"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Miška na vodilu Mouse Systems"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Serijska miška Microsoft"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Serijka miška Microsoft BallPoint"
+
+msgid "Logitech Serial Mouse"
+msgstr "Serijska miška Logitech"
+
+msgid "PS/2 Mouse"
+msgstr "Miška PS/2"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "Miška PS/2 QuickPort"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (serijska)"
+
+msgid "Default Baud rate"
+msgstr "Privzeta baudna hitrost"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] Standardni modem v skladen s Hayes"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Emulacija Roland MT-32"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Emulacija Roland MT-32 (novo)"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Emulacija Roland CM-32L"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Emulacija Roland CM-32LN"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "Dodatna kartica OPL4-ML"
+
+msgid "System MIDI"
+msgstr "Sistemski MIDI"
+
+msgid "MIDI Input Device"
+msgstr "Vhodna naprava MIDI"
+
+msgid "BIOS file"
+msgstr "Datoteka BIOS-a"
+
+msgid "BIOS file (ROM #1)"
+msgstr "Datoteka BIOS-a (ROM št. 1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "Datoteka BIOS-a (ROM št. 2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "Datoteka BIOS-a (ROM št. 3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "Datoteka BIOS-a (ROM št. 4)"
+
+msgid "BIOS address"
+msgstr "Naslov BIOS-a"
+
+msgid "BIOS address (ROM #1)"
+msgstr "Naslov BIOS-a (ROM št. 1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "Naslov BIOS-a (ROM št. 2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "Naslov BIOS-a (ROM št. 3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "Naslov BIOS-a (ROM št. 4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "Omogoči zapisovanje razširitev BIOS ROM-a"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "Omogoči pisanje v razširitveni ROM BIOS-a (ROM št. 1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "Omogoči pisanje v razširitveni ROM BIOS-a (ROM št. 2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "Omogoči pisanje v razširitveni ROM BIOS-a (ROM št. 3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "Omogoči pisanje v razširitveni ROM BIOS-a (ROM št. 4)"
+
+msgid "Linear framebuffer base"
+msgstr "Naslov linearnega pomnilnika"
+
+msgid "Address"
+msgstr "Naslov"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "IRQ serijskih vrat"
+
+msgid "Parallel port IRQ"
+msgstr "IRQ paralelnih vrat"
+
+msgid "BIOS Revision"
+msgstr "Revizija BIOS-a"
+
+msgid "BIOS Version"
+msgstr "Različica BIOS-a"
+
+msgid "BIOS Language"
+msgstr "Jezik BIOS-a"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "Razširitvena enota IBM 5161"
+
+msgid "IBM Cassette Basic"
+msgstr "Kasetni BASIC IBM"
+
+msgid "Translate 26 -> 17"
+msgstr "Prevedi 26 -> 17"
+
+msgid "Language"
+msgstr "Jezik"
+
+msgid "Enable backlight"
+msgstr "Omogoči osvetlitev ozadja"
+
+msgid "Invert colors"
+msgstr "Invertiraj barve"
+
+msgid "BIOS size"
+msgstr "Velikost BIOS-a"
+
+msgid "BIOS size (ROM #1)"
+msgstr "Velikost BIOS-a (ROM št. 1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "Velikost BIOS-a (ROM št. 2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "Velikost BIOS-a (ROM št. 3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "Velikost BIOS-a (ROM št. 4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "Preslikaj C0000-C7FFF kot UMB"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "Preslikaj C8000-CFFFF kot UMB"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "Preslikaj D0000-D7FFF kot UMB"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "Preslikaj D8000-DFFFF kot UMB"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "Preslikaj E0000-E7FFF kot UMB"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "Preslikaj E8000-EFFFF kot UMB"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "JS9 mostiček (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "Izhodna naprava MIDI"
+
+msgid "MIDI Real time"
+msgstr "MIDI v realnem času"
+
+msgid "MIDI Thru"
+msgstr "Prepust vhoda MIDI"
+
+msgid "MIDI Clockout"
+msgstr "Izhod ure MIDI"
+
+msgid "SoundFont"
+msgstr "SoundFont"
+
+msgid "Output Gain"
+msgstr "Ojačanje izhoda"
+
+msgid "Chorus"
+msgstr "Zbor"
+
+msgid "Chorus Voices"
+msgstr "Glasovi zbora"
+
+msgid "Chorus Level"
+msgstr "Raven zbora"
+
+msgid "Chorus Speed"
+msgstr "Hitrost zbora"
+
+msgid "Chorus Depth"
+msgstr "Globina zbora"
+
+msgid "Chorus Waveform"
+msgstr "Valovna oblika zbora"
+
+msgid "Reverb"
+msgstr "Odmev"
+
+msgid "Reverb Room Size"
+msgstr "Velikost prostora za odmev"
+
+msgid "Reverb Damping"
+msgstr "Dušenje odmeva"
+
+msgid "Reverb Width"
+msgstr "Širina odmeva"
+
+msgid "Reverb Level"
+msgstr "Raven odmeva"
+
+msgid "Interpolation Method"
+msgstr "Metoda interpolacije"
+
+msgid "Dynamic Sample Loading"
+msgstr "Dinamično nalaganje vzorcev"
+
+msgid "Reverb Output Gain"
+msgstr "Ojačanje izhoda odmeva"
+
+msgid "Reversed stereo"
+msgstr "Obrnjeni stereo"
+
+msgid "Nice ramp"
+msgstr "Lepa rampa"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "Gumbi"
+
+msgid "Serial Port"
+msgstr "Serijska vrata"
+
+msgid "RTS toggle"
+msgstr "Preklapljanje RTS"
+
+msgid "Revision"
+msgstr "Revizija"
+
+msgid "Controller"
+msgstr "Krmilnik"
+
+msgid "Show Crosshair"
+msgstr "Prikaži križišče"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "Naslov MAC"
+
+msgid "MAC Address OUI"
+msgstr "OUI naslova MAC"
+
+msgid "Enable BIOS"
+msgstr "Omogoči BIOS"
+
+msgid "Baud Rate"
+msgstr "Hitrost Baud"
+
+msgid "TCP/IP listening port"
+msgstr "Vrata TCP/IP za poslušanje"
+
+msgid "Phonebook File"
+msgstr "Datoteka s telefonskim imenikom"
+
+msgid "Telnet emulation"
+msgstr "Emulacija Telneta"
+
+msgid "RAM Address"
+msgstr "Naslov RAM"
+
+msgid "RAM size"
+msgstr "Velikost pomnilnika"
+
+msgid "Initial RAM size"
+msgstr "Začetna velikost pomnilnika"
+
+msgid "Serial Number"
+msgstr "Serijska številka"
+
+msgid "Host ID"
+msgstr "ID gostitelja"
+
+msgid "FDC Address"
+msgstr "Naslov FDC"
+
+msgid "MPU-401 Address"
+msgstr "Naslov MPU-401"
+
+msgid "MPU-401 IRQ"
+msgstr "MPU-401 IRQ"
+
+msgid "Receive MIDI input"
+msgstr "Sprejemaj vhod MIDI"
+
+msgid "Low DMA"
+msgstr "Nizki DMA"
+
+msgid "Enable Game port"
+msgstr "Omogočanje igralnih vrat"
+
+msgid "SID Model"
+msgstr "Model SID-a"
+
+msgid "SID Filter Strength"
+msgstr "Jakost filtra SID-a"
+
+msgid "Surround module"
+msgstr "Prostorski modul"
+
+msgid "CODEC"
+msgstr "CODEC"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "Dvigni prekinitev za CODEC ob nastavitvi CODEC-a (to potrebujejo nekateri gonilniki)"
+
+msgid "SB Address"
+msgstr "Naslov SB"
+
+msgid "Adlib Address"
+msgstr "Naslov Adlib"
+
+msgid "Use EEPROM setting"
+msgstr "Uporabi nastavitve z EEPROM-a"
+
+msgid "WSS IRQ"
+msgstr "IRQ WSS"
+
+msgid "WSS DMA"
+msgstr "DMA WSS"
+
+msgid "Enable OPL"
+msgstr "Omogoči OPL"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "Vhod MIDI za sprejem (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "Nizki DMA SB"
+
+msgid "6CH variant (6-channel)"
+msgstr "Različica 6CH (6-kanalni)"
+
+msgid "Enable CMS"
+msgstr "Omogoči CMS"
+
+msgid "Mixer"
+msgstr "Mešalnik"
+
+msgid "High DMA"
+msgstr "Visoki DMA"
+
+msgid "Control PC speaker"
+msgstr "Nadzoruj zvočnik računalnika"
+
+msgid "Memory size"
+msgstr "Velikost pomnilnika"
+
+msgid "EMU8000 Address"
+msgstr "Naslov EMU8000"
+
+msgid "IDE Controller"
+msgstr "Krmilnik IDE"
+
+msgid "Codec"
+msgstr "Kodek"
+
+msgid "GUS type"
+msgstr "Vrsta GUS"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "Omogoči ukaz 0x04 \"Zapusti 86Box\""
+
+msgid "Display type"
+msgstr "Vrsta zaslona"
+
+msgid "Composite type"
+msgstr "Vsta kompozitnega zaslona"
+
+msgid "RGB type"
+msgstr "Vrsta RGB zaslona"
+
+msgid "Line doubling type"
+msgstr "Vrsta podvojevanja črt"
+
+msgid "Snow emulation"
+msgstr "Emulacija snega"
+
+msgid "Monitor type"
+msgstr "Vrsta monitorja"
+
+msgid "Character set"
+msgstr "Nabor znakov"
+
+msgid "XGA type"
+msgstr "Vrsta kartice XGA"
+
+msgid "Instance"
+msgstr "Primerek"
+
+msgid "MMIO Address"
+msgstr "Naslov MMIO"
+
+msgid "RAMDAC type"
+msgstr "Vrsta RAMDAC"
+
+msgid "Blend"
+msgstr "Mešanica"
+
+msgid "Font"
+msgstr "Pisava"
+
+msgid "Bilinear filtering"
+msgstr "Bilinearno filtriranje"
+
+msgid "Video chroma-keying"
+msgstr "Barvni ključ za videoposneke"
+
+msgid "Dithering"
+msgstr "Barvno stresanje"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "Omogoči NMI za emulacijo CGA"
+
+msgid "Voodoo type"
+msgstr "Vrsta kartice Voodoo"
+
+msgid "Framebuffer memory size"
+msgstr "Velikost videopomnilnika"
+
+msgid "Texture memory size"
+msgstr "Velikost pomnilnika tekstur"
+
+msgid "Dither subtraction"
+msgstr "Odštevanje barvnega stresanja"
+
+msgid "Screen Filter"
+msgstr "Filter zaslona"
+
+msgid "Render threads"
+msgstr "Niti za upodabljanje"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Začetni naslov"
+
+msgid "Contiguous Size"
+msgstr "Pripadajoča velikost"
+
+msgid "I/O Width"
+msgstr "Širina V/I"
+
+msgid "Transfer Speed"
+msgstr "Hitrost prenosa"
+
+msgid "EMS mode"
+msgstr "Način EMS"
+
+msgid "EMS Address"
+msgstr "Naslov EMS"
+
+msgid "EMS 1 Address"
+msgstr "Naslov EMS 1"
+
+msgid "EMS 2 Address"
+msgstr "Naslov EMS 2"
+
+msgid "EMS Memory Size"
+msgstr "Velikost pomnilnika EMS"
+
+msgid "EMS 1 Memory Size"
+msgstr "Velikost pomnilnika EMS 1"
+
+msgid "EMS 2 Memory Size"
+msgstr "Velikost pomnilnika EMS 2"
+
+msgid "Enable EMS"
+msgstr "Omogoči EMS"
+
+msgid "Enable EMS 1"
+msgstr "Omogoči EMS 1"
+
+msgid "Enable EMS 2"
+msgstr "Omogoči EMS 2"
+
+msgid "Address for > 2 MB"
+msgstr "Naslov za > 2 MB"
+
+msgid "Frame Address"
+msgstr "Naslov okvirja"
+
+msgid "USA"
+msgstr "ZDA"
+
+msgid "Danish"
+msgstr "Danski"
+
+msgid "Always at selected speed"
+msgstr "Vedno pri izbrani hitrosti"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "Nastavitev BIOS-a + Vroče tipke (izklopljeno med POST)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 KB od F0000"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 KB od E0000 (MSB naslova invertiran, najprej zadnjih 64 KB)"
+
+msgid "Sine"
+msgstr "Sinusna"
+
+msgid "Triangle"
+msgstr "Trikotna"
+
+msgid "Linear"
+msgstr "Linearna"
+
+msgid "4th Order"
+msgstr "4. reda"
+
+msgid "7th Order"
+msgstr "7. reda"
+
+msgid "Non-timed (original)"
+msgstr "Brez časovnika (izvirnik)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (brez mostička JMP2)"
+
+msgid "Two"
+msgstr "Dva"
+
+msgid "Three"
+msgstr "Tri"
+
+msgid "Wheel"
+msgstr "Kolesce"
+
+msgid "Five + Wheel"
+msgstr "Pet + kolesce"
+
+msgid "Five + 2 Wheels"
+msgstr "Pet + 2 kolesci"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 serijska / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) serijska"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "Onemogoči BIOS"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2 MB"
+
+msgid "8 MB"
+msgstr "8 MB"
+
+msgid "28 MB"
+msgstr "28 MB"
+
+msgid "1 MB"
+msgstr "1 MB"
+
+msgid "4 MB"
+msgstr "4 MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16 MB"
+
+msgid "20 MB"
+msgstr "20 MB"
+
+msgid "24 MB"
+msgstr "24 MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (stereo)"
+
+msgid "Classic"
+msgstr "Klasični"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "Kompozitni"
+
+msgid "True color"
+msgstr "Pravobarvni"
+
+msgid "Old"
+msgstr "Stari"
+
+msgid "New"
+msgstr "Novi"
+
+msgid "Color (generic)"
+msgstr "Barvni (generični)"
+
+msgid "Green Monochrome"
+msgstr "Zeleni monokromatski"
+
+msgid "Amber Monochrome"
+msgstr "Jantarni monokromatski"
+
+msgid "Gray Monochrome"
+msgstr "Sivi monokromatski"
+
+msgid "Color (no brown)"
+msgstr "Barvni (brez rjave)"
+
+msgid "Color (IBM 5153)"
+msgstr "Barvni (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Enostavno podvajanje"
+
+msgid "sRGB interpolation"
+msgstr "Interpolacija sRGB"
+
+msgid "Linear interpolation"
+msgstr "Linearna interpolacija"
+
+msgid "Has secondary 8x8 character set"
+msgstr "Ima sekundarni nabor znakov 8x8"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Ima hčerinsko ploščo Quadcolor II"
+
+msgid "Alternate monochrome contrast"
+msgstr "Alternativni enobarvni kontrast"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Monokromatski (5151/MDA) (beli)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Monokromatski (5151/MDA) (zeleni)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Monokromatski (5151/MDA) (jantarni)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Barvni 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Barvni 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Izboljšani barvni - običajni način (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Izboljšani barvni - izboljšani način (5154/ECD)"
+
+msgid "Green"
+msgstr "Zeleni"
+
+msgid "Amber"
+msgstr "Jantarni"
+
+msgid "Gray"
+msgstr "Sivi"
+
+msgid "Grayscale"
+msgstr "Sivinski"
+
+msgid "Color"
+msgstr "Barvni"
+
+msgid "U.S. English"
+msgstr "Ameriška angleščina"
+
+msgid "Scandinavian"
+msgstr "Skandinavščina"
+
+msgid "Other languages"
+msgstr "Drugi jeziki"
+
+msgid "Bochs latest"
+msgstr "Bochs najnovejše"
+
+msgid "Apply overscan deltas"
+msgstr "Nanesi razlike v okvirju"
+
+msgid "Mono Interlaced"
+msgstr "Enobarvni s prepletanjem"
+
+msgid "Mono Non-Interlaced"
+msgstr "Enobarvni brez prepletanja"
+
+msgid "Color Interlaced"
+msgstr "Barvni s prepletanjem"
+
+msgid "Color Non-Interlaced"
+msgstr "Barvni brez prepletanja"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "3Dfx Voodoo Graphics"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 enoti TMU)"
+
+msgid "8-bit"
+msgstr "8-bitni"
+
+msgid "16-bit"
+msgstr "16-bitni"
+
+msgid "Standard (150ns)"
+msgstr "Standardna (150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "Visoka hitrost (120ns)"
+
+msgid "Enabled"
+msgstr "Omogočeno"
+
+msgid "Standard"
+msgstr "Standardni"
+
+msgid "High-Speed"
+msgstr "Visoke hitrosti"
+
+msgid "Stereo LPT DAC"
+msgstr "Stereo DAC LPT"
+
+msgid "Generic Text Printer"
+msgstr "Generični besedilni tiskalnik"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Generični matrični tiskalnik ESC/P 2"
+
+msgid "Generic PostScript Printer"
+msgstr "Generični tiskalnik PostScript"
+
+msgid "Generic PCL5e Printer"
+msgstr "Generični tiskalnik PCL5e"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Internetni protokol za vzporedno linijo"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Zaščitni ključek za Savage Quest"
+
+msgid "Serial Passthrough Device"
+msgstr "Naprava za prepust serijskih vrat"
+
+msgid "Passthrough Mode"
+msgstr "Način prepusta"
+
+msgid "Host Serial Device"
+msgstr "Gostiteljska serijska naprava"
+
+msgid "Name of pipe"
+msgstr "Ime cevi"
+
+msgid "Data bits"
+msgstr "Podatkovni biti"
+
+msgid "Stop bits"
+msgstr "Zaključni biti"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Baudna hitrost prepusta"
+
+msgid "Named Pipe (Server)"
+msgstr "Poimenovana cev (Strežnik)"
+
+msgid "Named Pipe (Client)"
+msgstr "Poimenovana cev (Odjemalec)"
+
+msgid "Host Serial Passthrough"
+msgstr "Prepust serijskih vrat gostitelja"
+
+msgid "E&ject %1"
+msgstr "I&zvrzi %1"
+
+msgid "&Unmute"
+msgstr "&Vklopi zvok"
+
+msgid "Softfloat FPU"
+msgstr "Softfloat FPU"
+
+msgid "High performance impact"
+msgstr "Visok učinek na hitrost delovanja"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Generični] Pomnilniški disk (največja hitrost)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Generični] 1989 (3500 vrtlj./min.)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Generični] 1992 (3600 vrtlj./min.)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Generični] 1994 (4500 vrtlj./min.)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Generični] 1996 (5400 vrtlj./min.)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Generični] 1997 (5400 vrtlj./min.)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Generični] 1998 (5400 vrtlj./min.)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Generični] 2000 (7200 vrtlj./min.)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "Klon IBM 8514/A (ISA)"
+
+msgid "Vendor"
+msgstr "Proizvajalec"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Generična razširitev pomnilnika PC/XT"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Generična razširitev pomnilnika PC/AT"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "Ni bilo mogoče najti matričnih pisav"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "Za emulacijo generičnega ESC/P 2 matričnega tiskalnika so potrebne TrueType pisave v imeniku \"roms/printer/fonts\"."
+
+msgid "Inhibit multimedia keys"
+msgstr "Blokiraj multimedijske tipke"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Vprašaj za potrditev pred shranjevanjem nastavitev"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Vprašaj za potrditev pred ponovnim zagonom"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Vprašaj za potrditev pred izhodom"
+
+msgid "Options"
+msgstr "Možnosti"
+
+msgid "Model"
+msgstr "Model"
+
+msgid "Model:"
+msgstr "Model:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Inicializacija upodobljevalnika Vulkan ni uspela."
+
+msgid "GLSL Error"
+msgstr "Napaka GLSL"
+
+msgid "Could not load shader: %1"
+msgstr "Ni bilo mogoče naložiti senčilnika: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "Potrebna je OpenGL različica 3.0 ali novejša. Trenutna različica GLSL je %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "Ni bilo mogoče naložiti teksture: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "Ni bilo mogoče prevesti senčilnika:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "Program ni povezan:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "Upravljalnik senčilnikov"
+
+msgid "Shader Configuration"
+msgstr "Nastavitve senčilnikov"
+
+msgid "Add"
+msgstr "Dodaj"
+
+msgid "Move up"
+msgstr "Premakni gor"
+
+msgid "Move down"
+msgstr "Premakni dol"
+
+msgid "Could not load file %1"
+msgstr "Ni bilo mogoče naložiti datoteke %1"
+
+msgid "Key Bindings:"
+msgstr "Kombinacije tipk"
+
+msgid "Action"
+msgstr "Dejanje"
+
+msgid "Keybind"
+msgstr "Kombinacija"
+
+msgid "Clear binding"
+msgstr "Počisti kombinacijo"
+
+msgid "Bind"
+msgstr "Dodeli"
+
+msgid "Bind Key"
+msgstr "Dodeli tipko"
+
+msgid "Enter key combo:"
+msgstr "Vpiši kombinacijo tipk:"
+
+msgid "Bind conflict"
+msgstr "Konflikt med kombinacijami"
+
+msgid "This key combo is already in use."
+msgstr "Ta kombinacija tipk je že v uporabi."
+
+msgid "Send Control+Alt+Del"
+msgstr "Pošlji Control+Alt+Del"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Pošlji Control+Alt+Escape"
+
+msgid "Toggle fullscreen"
+msgstr "Preklopi celozaslonski način"
+
+msgid "Screenshot"
+msgstr "Zajem zaslona"
+
+msgid "Release mouse pointer"
+msgstr "Izpusti kazalec miške"
+
+msgid "Toggle pause"
+msgstr "Preklopi pavzo"
+
+msgid "Toggle mute"
+msgstr "Preklopti tišino"
+
+msgid "Text files"
+msgstr "Datoteke z besedilom"
+
+msgid "ROM files"
+msgstr "Datoteke ROM"
+
+msgid "SoundFont files"
+msgstr "Datoteke SoundFont"
+
+msgid "Local Switch"
+msgstr "Lokalno stikalo"
+
+msgid "Remote Switch"
+msgstr "Oddaljeno stikalo"
+
+msgid "Switch:"
+msgstr "Stikalo:"
+
+msgid "Hub Mode"
+msgstr "Način koncentratorja"
+
+msgid "Hostname:"
+msgstr "Ime gostitelja:"
+
+msgid "ISA RAM:"
+msgstr "RAM ISA:"
+
+msgid "ISA ROM:"
+msgstr "ROM ISA:"
+
+msgid "&Wipe NVRAM"
+msgstr "&Izbriši NVRAM"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "To bo izbrisali vse datoteke NVRAM (in sorodne) navidezne naprave, ki se nahajajo v podimeniku \"nvr\". Morali boste ponovno nastaviti nastavitve BIOS-a (in verjetno tudi drugih naprav znotraj VS), če bo to potrebno.\n\nAli res želite izbrisati vso vsebino NVRAM-a navidezne naprave \"%1\"?"
+
+msgid "Success"
+msgstr "Uspešno"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "Vsebina NVRAM-a navidezne naprave \"%1\" je bila uspešno pobrisana"
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "Med brisanjem vsebine NVRAM-a navidezne naprave \"%1\" je prišlo do napake"
+
+msgid "%1 VM Manager"
+msgstr "Upravitelj navideznih naprav %1"
+
+msgid "%n disk(s)"
+msgstr "Št. diskov: %n"
+
+msgid "Unknown Status"
+msgstr "Neznani status"
+
+msgid "No Machines Found!"
+msgstr "Ni bilo najdenih naprav!"
+
+msgid "Check for updates on startup"
+msgstr "Ob zagonu preveri obstoj posodobitev"
+
+msgid "Unable to determine release information"
+msgstr "Ni bilo mogoče pridobiti informacij o različici"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Med preverjanjem obstoja posodobitev je prišlo do napake:\n\n%1\n\nProsimo, poskusite znova pozneje."
+
+msgid "Update check complete"
+msgstr "Preverjanje obstoja posodobitev končano"
+
+msgid "stable"
+msgstr "stabilno"
+
+msgid "beta"
+msgstr "beta"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Izvajate zadnjo %1 različico programa 86Box: %2"
+
+msgid "version"
+msgstr "različica"
+
+msgid "build"
+msgstr "kompilacija"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Trenutno uporabljate različico <b>%1</b>."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "<b>Različica %1</b> je zdaj na voljo."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Trenutno uporabljate kompilacijo <b>%1</b>."
+
+msgid "<b>Build %1</b> is now available."
+msgstr "<b>Kompilacija %1</b> je zdaj na voljo."
+
+msgid "Would you like to visit the download page?"
+msgstr "Ali želite obiskati stran s prenosi?"
+
+msgid "Visit download page"
+msgstr "Obišči stran s prenosi"
+
+msgid "Update check"
+msgstr "Preveri obstoj posodobitev"
+
+msgid "Checking for updates..."
+msgstr "Poteka preverjanje obstoja posodobitev..."
+
+msgid "86Box Update"
+msgstr "Posodobitev programa 86Box"
+
+msgid "Release notes:"
+msgstr "Opombe različice:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "Sesutje navidezne naprave"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "Proces navidezne naprave \"%1\" se je nepričakovano zaključil z izhodno kodo %2."
+
+msgid "The system will not be added."
+msgstr "Sistem ne bo dodan."
+
+msgid "&Update mouse every CPU frame"
+msgstr "&Posodibi stanje miške ob vsakem bloku procesorja"
+
+msgid "Hue"
+msgstr "Hue"
+
+msgid "Saturation"
+msgstr "Nasičenost"
+
+msgid "Contrast"
+msgstr "Kontrast"
+
+msgid "Brightness"
+msgstr "Svetlost"
+
+msgid "Sharpness"
+msgstr "Ostrina"
+
+msgid "&CGA composite settings..."
+msgstr "Nastavitve kompozitnega načina &CGA..."
+
+msgid "CGA composite settings"
+msgstr "Nastavitve kompozitnega načina CGA"
+
+msgid "Monitor EDID"
+msgstr "EDID monitorja"
+
+msgid "Export..."
+msgstr "Izvoz..."
+
+msgid "Export EDID"
+msgstr "Izvoz EDID"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "Datoteka EDID \"%ls\" je prevelika."
+
+msgid "OpenGL input scale"
+msgstr "Vhodna lestvica OpenGL"
+
+msgid "OpenGL input stretch mode"
+msgstr "Način raztezanja vhoda OpenGL"
+
+msgid "Color scheme"
+msgstr "Barvna shema"
+
+msgid "Light"
+msgstr "Svetloba"
+
+msgid "Dark"
+msgstr "Temno"
diff --git a/src/qt/languages/sv-SE.po b/src/qt/languages/sv-SE.po
new file mode 100644
index 000000000..58ead9405
--- /dev/null
+++ b/src/qt/languages/sv-SE.po
@@ -0,0 +1,2983 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: sv_SE\n"
+"X-Source-Language: en_US\n"
+
+msgid "&Action"
+msgstr "&Handling"
+
+msgid "&Keyboard requires capture"
+msgstr "&Tangentbord behöver uppfångas"
+
+msgid "&Right CTRL is left ALT"
+msgstr "&Höger CTRL är vänster ALT"
+
+msgid "&Hard Reset..."
+msgstr "&Hård omstart..."
+
+msgid "&Ctrl+Alt+Del"
+msgstr "&Ctrl+Alt+Del"
+
+msgid "Ctrl+Alt+&Esc"
+msgstr "Ctrl+Alt+&Esc"
+
+msgid "&Pause"
+msgstr "&Pausa"
+
+msgid "Pause"
+msgstr "&Pausa"
+
+msgid "Re&sume"
+msgstr "Fo&rtsätt"
+
+msgid "E&xit"
+msgstr "A&vsluta"
+
+msgid "&View"
+msgstr "&Visa"
+
+msgid "&Hide status bar"
+msgstr "&Dölj statusfältet"
+
+msgid "Hide &toolbar"
+msgstr "Dölj &verktygsfältet"
+
+msgid "&Resizeable window"
+msgstr "&Ändringsbar fönsterstorlek"
+
+msgid "R&emember size && position"
+msgstr "K&om ihåg storlek && position"
+
+msgid "Re&nderer"
+msgstr "Re&nderare"
+
+msgid "&Qt (Software)"
+msgstr "&Qt (Mjukvara)"
+
+msgid "Open&GL (3.0 Core)"
+msgstr "Open&GL (3.0 Core)"
+
+msgid "&VNC"
+msgstr "&VNC"
+
+msgid "Specify &dimensions..."
+msgstr "Ange &mått..."
+
+msgid "Force &4:3 display ratio"
+msgstr "Tvinga &4:3 bildförhållande"
+
+msgid "&Window scale factor"
+msgstr "&Skalningsfaktor för fönster"
+
+msgid "&0.5x"
+msgstr "&0.5x"
+
+msgid "&1x"
+msgstr "&1x"
+
+msgid "1.&5x"
+msgstr "1.&5x"
+
+msgid "&2x"
+msgstr "&2x"
+
+msgid "&3x"
+msgstr "&3x"
+
+msgid "&4x"
+msgstr "&4x"
+
+msgid "&5x"
+msgstr "&5x"
+
+msgid "&6x"
+msgstr "&6x"
+
+msgid "&7x"
+msgstr "&7x"
+
+msgid "&8x"
+msgstr "&8x"
+
+msgid "Fi&lter method"
+msgstr "Fi&ltermetod"
+
+msgid "&Nearest"
+msgstr "&Närmsta"
+
+msgid "&Linear"
+msgstr "&Linjär"
+
+msgid "Hi&DPI scaling"
+msgstr "Hög &DPI-skalning"
+
+msgid "&Fullscreen"
+msgstr "&Helskärm"
+
+msgid "Fullscreen &stretch mode"
+msgstr "Sträckningsläge för &helskärm"
+
+msgid "&Full screen stretch"
+msgstr "&Sträck till helskärm"
+
+msgid "&4:3"
+msgstr "&4:3"
+
+msgid "&Square pixels (Keep ratio)"
+msgstr "&Fyrkantiga pixlar (Behåll bildförhållande)"
+
+msgid "&Integer scale"
+msgstr "&Skala till heltal"
+
+msgid "4:&3 Integer scale"
+msgstr "Skala till heltal i 4:&3"
+
+msgid "EGA/(S)&VGA settings"
+msgstr "EGA/(S)&VGA-inställningar"
+
+msgid "&Inverted VGA monitor"
+msgstr "&Inverterad VGA-skärm"
+
+msgid "VGA screen &type"
+msgstr "Skärmtyp för &VGA"
+
+msgid "RGB &Color"
+msgstr "RGB &färg"
+
+msgid "RGB (no brown)"
+msgstr "RGB (utan brunt)"
+
+msgid "&RGB Grayscale"
+msgstr "&RGB gråskala"
+
+msgid "Generic RGBI color monitor"
+msgstr "Allmän RGBI färgskärm"
+
+msgid "&Amber monitor"
+msgstr "&Bärnstensfärgad skärm"
+
+msgid "&Green monitor"
+msgstr "&Grön skärm"
+
+msgid "&White monitor"
+msgstr "&Vit skärm"
+
+msgid "Grayscale &conversion type"
+msgstr "Konverteringstyp till &gråskala"
+
+msgid "BT&601 (NTSC/PAL)"
+msgstr "BT&601 (NTSC/PAL)"
+
+msgid "BT&709 (HDTV)"
+msgstr "BT&709 (HDTV)"
+
+msgid "&Average"
+msgstr "&Genomsnittlig"
+
+msgid "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
+msgstr "CGA/PCjr/Tandy/E&GA/(S)VGA överskanning"
+
+msgid "Change contrast for &monochrome display"
+msgstr "Ändra kontrast för &svartvita skärmar"
+
+msgid "&Media"
+msgstr "&Media"
+
+msgid "&Tools"
+msgstr "&Verktyg"
+
+msgid "&Settings..."
+msgstr "&Inställningar..."
+
+msgid "Settings..."
+msgstr "Inställningar..."
+
+msgid "&Update status bar icons"
+msgstr "&Uppdatera statusfältets ikoner"
+
+msgid "Take s&creenshot"
+msgstr "Tag s&kärmbild"
+
+msgid "S&ound"
+msgstr "L&jud"
+
+msgid "&Preferences..."
+msgstr "&Preferenser..."
+
+msgid "Enable &Discord integration"
+msgstr "Aktivera &integration med Discord"
+
+msgid "Sound &gain..."
+msgstr "Ljud&förstärkning..."
+
+msgid "Begin trace"
+msgstr "Börja spårning"
+
+msgid "End trace"
+msgstr "Avsluta spårning"
+
+msgid "&Help"
+msgstr "&Hjälp"
+
+msgid "&Documentation..."
+msgstr "&Dokumentation..."
+
+msgid "&About 86Box..."
+msgstr "&Om 86Box..."
+
+msgid "&New image..."
+msgstr "&Ny avbildning..."
+
+msgid "&Existing image..."
+msgstr "&Befintlig avbildning..."
+
+msgid "Existing image (&Write-protected)..."
+msgstr "Befintlig avbildning (&skrivskyddad)..."
+
+msgid "&Record"
+msgstr "&Spela in"
+
+msgid "&Play"
+msgstr "&Spela upp"
+
+msgid "&Rewind to the beginning"
+msgstr "&Spola tillbaka till början"
+
+msgid "&Fast forward to the end"
+msgstr "&Spola fram till slutet"
+
+msgid "E&ject"
+msgstr "M&ata ut"
+
+msgid "&Image..."
+msgstr "&Avbildning..."
+
+msgid "E&xport to 86F..."
+msgstr "E&xportera till 86F..."
+
+msgid "&Mute"
+msgstr "&Tysta"
+
+msgid "E&mpty"
+msgstr "T&om"
+
+msgid "Reload previous image"
+msgstr "Ladda om föregående avbildning"
+
+msgid "&Folder..."
+msgstr "&Mapp..."
+
+msgid "Target &framerate"
+msgstr "Mål för &bildhastighet"
+
+msgid "&Sync with video"
+msgstr "&Synkronisera med bild"
+
+msgid "&25 fps"
+msgstr "&25 fps"
+
+msgid "&30 fps"
+msgstr "&30 fps"
+
+msgid "&50 fps"
+msgstr "&50 fps"
+
+msgid "&60 fps"
+msgstr "&60 fps"
+
+msgid "&75 fps"
+msgstr "&75 fps"
+
+msgid "&VSync"
+msgstr "&VSync"
+
+msgid "&Select shader..."
+msgstr "&Välj shader..."
+
+msgid "&Remove shader"
+msgstr "&Ta bort shader"
+
+msgid "Preferences"
+msgstr "Preferenser"
+
+msgid "Sound Gain"
+msgstr "Ljudförstärkning"
+
+msgid "New Image"
+msgstr "Ny avbildning"
+
+msgid "Settings"
+msgstr "Inställningar"
+
+msgid "Specify Main Window Dimensions"
+msgstr "Ange mått för huvudfönster"
+
+msgid "OK"
+msgstr "Okej"
+
+msgid "Cancel"
+msgstr "Avbryt"
+
+msgid "&Default"
+msgstr "&Standard"
+
+msgid "Language:"
+msgstr "Språk:"
+
+msgid "Gain"
+msgstr "Förstärkning"
+
+msgid "File name:"
+msgstr "Filnamn:"
+
+msgid "Disk size:"
+msgstr "Storlek på disk:"
+
+msgid "RPM mode:"
+msgstr "Varvtalsläge:"
+
+msgid "Progress:"
+msgstr "Framsteg:"
+
+msgid "Width:"
+msgstr "Bredd:"
+
+msgid "Height:"
+msgstr "Höjd:"
+
+msgid "Lock to this size"
+msgstr "Lås till denna storlek"
+
+msgid "Machine type:"
+msgstr "Maskintyp:"
+
+msgid "Machine:"
+msgstr "Maskin:"
+
+msgid "Configure"
+msgstr "Konfigurera"
+
+msgid "CPU:"
+msgstr "Processor:"
+
+msgid "CPU type:"
+msgstr "Processortyp:"
+
+msgid "Speed:"
+msgstr "Hastighet:"
+
+msgid "Frequency:"
+msgstr "Frekvens:"
+
+msgid "FPU:"
+msgstr "Flyttalsprocessor:"
+
+msgid "Wait states:"
+msgstr "Väntcykler:"
+
+msgid "MB"
+msgstr "MB"
+
+msgid "Memory:"
+msgstr "Minne:"
+
+msgid "Time synchronization"
+msgstr "Synkronisera tid"
+
+msgid "Disabled"
+msgstr "Inaktiverad"
+
+msgid "Enabled (local time)"
+msgstr "Aktiverad (lokal tid)"
+
+msgid "Enabled (UTC)"
+msgstr "Aktiverad (UTC)"
+
+msgid "Dynamic Recompiler"
+msgstr "Dynamisk omkompilering"
+
+msgid "CPU frame size"
+msgstr "Ramstorlek för processor"
+
+msgid "Larger frames (less smooth)"
+msgstr "Större ramar (mindre smidigt)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Mindre ramar (smidigare)"
+
+msgid "Video:"
+msgstr "Bildskärmskort:"
+
+msgid "Video #2:"
+msgstr "Bildskärmskort #2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Voodoo 1 eller 2-grafik"
+
+msgid "IBM 8514/A Graphics"
+msgstr "IBM 8514/A-grafik"
+
+msgid "XGA Graphics"
+msgstr "XGA-grafik"
+
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "IBM PS/55 bildskärmsadapter"
+
+msgid "Keyboard:"
+msgstr "Tangentbord:"
+
+msgid "Keyboard"
+msgstr "Tangentbord"
+
+msgid "Mouse:"
+msgstr "Mus:"
+
+msgid "Mouse"
+msgstr "Mus"
+
+msgid "Joystick:"
+msgstr "Styrspak:"
+
+msgid "Joystick"
+msgstr "Styrspak"
+
+msgid "Joystick 1..."
+msgstr "Styrspak 1..."
+
+msgid "Joystick 2..."
+msgstr "Styrspak 2..."
+
+msgid "Joystick 3..."
+msgstr "Styrspak 3..."
+
+msgid "Joystick 4..."
+msgstr "Styrspak 4..."
+
+msgid "Sound card #1:"
+msgstr "Ljudkort #1:"
+
+msgid "Sound card #2:"
+msgstr "Ljudkort #2:"
+
+msgid "Sound card #3:"
+msgstr "Ljudkort #3:"
+
+msgid "Sound card #4:"
+msgstr "Ljudkort #4:"
+
+msgid "MIDI Out Device:"
+msgstr "Enhet för MIDI-utdata:"
+
+msgid "MIDI In Device:"
+msgstr "Enhet för MIDI-indata:"
+
+msgid "MIDI Out:"
+msgstr "MIDI-utgång:"
+
+msgid "Standalone MPU-401"
+msgstr "Fristående MPU-401"
+
+msgid "Use FLOAT32 sound"
+msgstr "Använd FLOAT32-ljud"
+
+msgid "FM synth driver"
+msgstr "Drivrutin för FM-synt"
+
+msgid "Nuked (more accurate)"
+msgstr "Nuked (mer exakt)"
+
+msgid "YMFM (faster)"
+msgstr "YMFM (snabbare)"
+
+msgid "COM1 Device:"
+msgstr "COM1-enhet:"
+
+msgid "COM2 Device:"
+msgstr "COM2-enhet:"
+
+msgid "COM3 Device:"
+msgstr "COM3-enhet:"
+
+msgid "COM4 Device:"
+msgstr "COM4-enhet:"
+
+msgid "LPT1 Device:"
+msgstr "LPT1-enhet:"
+
+msgid "LPT2 Device:"
+msgstr "LPT2-enhet:"
+
+msgid "LPT3 Device:"
+msgstr "LPT3-enhet:"
+
+msgid "LPT4 Device:"
+msgstr "LPT4-enhet:"
+
+msgid "Internal LPT ECP DMA:"
+msgstr "Intern LPT ECP DMA:"
+
+msgid "Serial port 1"
+msgstr "Serieport 1"
+
+msgid "Serial port 2"
+msgstr "Serieport 2"
+
+msgid "Serial port 3"
+msgstr "Serieport 3"
+
+msgid "Serial port 4"
+msgstr "Serieport 4"
+
+msgid "Parallel port 1"
+msgstr "Parallellport 1"
+
+msgid "Parallel port 2"
+msgstr "Parallellport 2"
+
+msgid "Parallel port 3"
+msgstr "Parallellport 3"
+
+msgid "Parallel port 4"
+msgstr "Parallellport 4"
+
+msgid "FD Controller:"
+msgstr "Styrenhet för diskett:"
+
+msgid "CD-ROM Controller:"
+msgstr "Styrenhet för CD-ROM:"
+
+msgid "Tertiary IDE Controller"
+msgstr "Tertiär IDE-kontroller"
+
+msgid "Quaternary IDE Controller"
+msgstr "Kvartär IDE-kontroller"
+
+msgid "Hard disk"
+msgstr "Hårddisk"
+
+msgid "SCSI"
+msgstr "SCSI"
+
+msgid "Controller 1:"
+msgstr "Styrenhet 1:"
+
+msgid "Controller 2:"
+msgstr "Styrenhet 2:"
+
+msgid "Controller 3:"
+msgstr "Styrenhet 3:"
+
+msgid "Controller 4:"
+msgstr "Styrenhet 4:"
+
+msgid "Cassette"
+msgstr "Kassettband"
+
+msgid "Hard disks:"
+msgstr "Hårddiskar:"
+
+msgid "Firmware Version"
+msgstr "Firmware-version"
+
+msgid "&New..."
+msgstr "&Ny..."
+
+msgid "&Existing..."
+msgstr "&Befintlig..."
+
+msgid "&Remove"
+msgstr "&Ta bort"
+
+msgid "Bus:"
+msgstr "Buss:"
+
+msgid "Channel:"
+msgstr "Kanal:"
+
+msgid "ID:"
+msgstr "ID:"
+
+msgid "&Specify..."
+msgstr "&Specificera..."
+
+msgid "Sectors:"
+msgstr "Sektorer:"
+
+msgid "Heads:"
+msgstr "Läshuvuden:"
+
+msgid "Cylinders:"
+msgstr "Cylindrar:"
+
+msgid "Size (MB):"
+msgstr "Storlek (MB):"
+
+msgid "Type:"
+msgstr "Typ:"
+
+msgid "Image Format:"
+msgstr "Avbildningsformat:"
+
+msgid "Block Size:"
+msgstr "Blockstorlek:"
+
+msgid "Floppy drives:"
+msgstr "Diskettenhet:"
+
+msgid "Turbo timings"
+msgstr "Turbo timings"
+
+msgid "Check BPB"
+msgstr "Kontrollera BPB"
+
+msgid "CD-ROM drives:"
+msgstr "CD-ROM-enheter:"
+
+msgid "MO drives:"
+msgstr "MO-enheter:"
+
+msgid "MO:"
+msgstr "MO:"
+
+msgid "Removable disks:"
+msgstr "Flyttbara diskar:"
+
+msgid "Removable disk drives:"
+msgstr "Enheter för flyttbara diskar:"
+
+msgid "ZIP 250"
+msgstr "ZIP 250"
+
+msgid "ISA RTC:"
+msgstr "ISA realtidsklocka:"
+
+msgid "ISA Memory Expansion"
+msgstr "ISA minnesexpansion"
+
+msgid "ISA ROM Cards"
+msgstr "ISA ROM-kort"
+
+msgid "Card 1:"
+msgstr "Kort 1:"
+
+msgid "Card 2:"
+msgstr "Kort 2:"
+
+msgid "Card 3:"
+msgstr "Kort 3:"
+
+msgid "Card 4:"
+msgstr "Kort 4:"
+
+msgid "Generic ISA ROM Board"
+msgstr "Allmän ISA ROM-kort"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "Allmän dubbel ISA ROM-kort"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "Allmän fyrdubbel ISA ROM-kort"
+
+msgid "ISABugger device"
+msgstr "ISABugger-enhet"
+
+msgid "POST card"
+msgstr "POST-kort"
+
+msgid "86Box"
+msgstr "86Box"
+
+msgid "Error"
+msgstr "Fel"
+
+msgid "Fatal error"
+msgstr "Allvarligt fel"
+
+msgid " - PAUSED"
+msgstr " - PAUSAD"
+
+msgid "Speed"
+msgstr "Hastighet"
+
+msgid "Removable disk %1 (%2): %3"
+msgstr "Flyttbar disk %1 (%2): %3"
+
+msgid "&Removable disk %1 (%2): %3"
+msgstr "&Flyttbar disk %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Flyttbara disk-avbildningar"
+
+msgid "Image %1"
+msgstr "Avbildning %1"
+
+msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
+msgstr "86Box kunde inte hitta några användbara ROM-avbildningar.\n\nVänligen <a href=\"https://github.com/86Box/roms/releases/latest\">ladda ner</a> en ROM-uppsättning och extrahera den till mappen \"roms\"."
+
+msgid "(empty)"
+msgstr "(tom)"
+
+msgid "All files"
+msgstr "Alla filer"
+
+msgid "Turbo"
+msgstr "Turbo"
+
+msgid "On"
+msgstr "På"
+
+msgid "Off"
+msgstr "Av"
+
+msgid "All images"
+msgstr "Alla avbildningar"
+
+msgid "Basic sector images"
+msgstr "Grundläggande sektoravbildningar"
+
+msgid "Surface images"
+msgstr "Ytavbildningar"
+
+msgid "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
+msgstr "Maskinen \"%hs\" är inte tillgänglig på grund av saknade ROM-avbildningar i mappen roms/machines. Byter till en tillgänglig maskin."
+
+msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
+msgstr "Bildskärmskortet \"%hs\" är inte tillgängligt på grund av saknade ROM-avbildningar i mappen roms/video. Byter till ett tillgängligt bildskärmskort."
+
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "Bildskärmskort #2 \"%hs\" är inte tillgängligt på grund av saknade ROM-avbildningar i mappen roms/video. Avaktiverar det andra bildskärmskortet."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "Enheten \"%hs\" är inte tillgänglig på grund av saknade ROM-avbildningar. Ignorerar enheten."
+
+msgid "Machine"
+msgstr "Maskin"
+
+msgid "Display"
+msgstr "Bildskärm"
+
+msgid "Input devices"
+msgstr "Inmatningsenheter"
+
+msgid "Sound"
+msgstr "Ljud"
+
+msgid "Network"
+msgstr "Nätverk"
+
+msgid "Ports (COM & LPT)"
+msgstr "Portar (COM & LPT)"
+
+msgid "Ports"
+msgstr "Portar"
+
+msgid "Serial ports:"
+msgstr "Serieportar:"
+
+msgid "Parallel ports:"
+msgstr "Parallelportar:"
+
+msgid "Storage controllers"
+msgstr "Styrenheter för lagring"
+
+msgid "Hard disks"
+msgstr "Hårddiskar"
+
+msgid "Disks:"
+msgstr "Diskar:"
+
+msgid "Floppy:"
+msgstr "Diskett:"
+
+msgid "Controllers:"
+msgstr "Styrenheter:"
+
+msgid "Floppy & CD-ROM drives"
+msgstr "Diskett- och CD-ROM-enheter"
+
+msgid "Other removable devices"
+msgstr "Andra flyttbara enheter"
+
+msgid "Other peripherals"
+msgstr "Andra tillbehör"
+
+msgid "Other devices"
+msgstr "Andra enheter"
+
+msgid "Click to capture mouse"
+msgstr "Klicka för att fånga upp musen"
+
+msgid "Press %1 to release mouse"
+msgstr "Tryck på %1 för att släppa musen"
+
+msgid "Press %1 or middle button to release mouse"
+msgstr "Tryck på %1 eller mellersta musknappen för att släppa musen"
+
+msgid "Bus"
+msgstr "Buss"
+
+msgid "File"
+msgstr "Fil"
+
+msgid "C"
+msgstr "C"
+
+msgid "H"
+msgstr "H"
+
+msgid "S"
+msgstr "S"
+
+msgid "KB"
+msgstr "KB"
+
+msgid "Default"
+msgstr "Standard"
+
+msgid "%1 Wait state(s)"
+msgstr "%1 Wait state(s)"
+
+msgid "Type"
+msgstr "Typ"
+
+msgid "No PCap devices found"
+msgstr "Inga PCap-enheter hittade"
+
+msgid "Invalid PCap device"
+msgstr "Ogiltig PCap-enhet"
+
+msgid "2-axis, 2-button joystick(s)"
+msgstr "Styrspak med 2 axlar och 2 knappar"
+
+msgid "2-axis, 4-button joystick"
+msgstr "Styrspak med 2 axlar och 4 knappar"
+
+msgid "2-axis, 6-button joystick"
+msgstr "Styrspak med 2 axlar och 6 knappar"
+
+msgid "2-axis, 8-button joystick"
+msgstr "Styrspak med 2 axlar och 8 knappar"
+
+msgid "3-axis, 2-button joystick"
+msgstr "Styrspak med 3 axlar och 2 knappar"
+
+msgid "3-axis, 4-button joystick"
+msgstr "Styrspak med 3 axlar och 4 knappar"
+
+msgid "4-axis, 4-button joystick"
+msgstr "Styrspak med 4 axlar och 4 knappar"
+
+msgid "CH Flightstick Pro"
+msgstr "CH Flightstick Pro"
+
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH-pedaler"
+
+msgid "Microsoft SideWinder Pad"
+msgstr "Microsoft SideWinder Pad"
+
+msgid "Thrustmaster Flight Control System"
+msgstr "Thrustmaster Flight Control System"
+
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Rudder Control System"
+
+msgid "2-button gamepad(s)"
+msgstr "Handkontroll(er) med två knappar"
+
+msgid "2-button flight yoke"
+msgstr "Styrspak med två knappar"
+
+msgid "4-button gamepad"
+msgstr "Handkontroll med fyra knappar"
+
+msgid "4-button flight yoke"
+msgstr "Styrspak med fyra knappar"
+
+msgid "2-button flight yoke with throttle"
+msgstr "Styrspak med två knappar och gas"
+
+msgid "4-button flight yoke with throttle"
+msgstr "Styrspak med fyra knappar och gas"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Win95-ratt (tre axlar, fyra knappar)"
+
+msgid "None"
+msgstr "Ingen"
+
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CHS: %2, %3, %4)"
+
+msgid "Floppy %1 (%2): %3"
+msgstr "Diskett %1 (%2): %3"
+
+msgid "&Floppy %1 (%2): %3"
+msgstr "&Diskett %1 (%2): %3"
+
+msgid "Advanced sector images"
+msgstr "Avancerade sektoravbildningar"
+
+msgid "Flux images"
+msgstr "Flux-avbildningar"
+
+msgid "Are you sure you want to hard reset the emulated machine?"
+msgstr "Är du säker på att du vill göra en hård omstart av den emulerade maskinen?"
+
+msgid "Are you sure you want to exit 86Box?"
+msgstr "Är du säker på att du vill avsluta 86Box?"
+
+msgid "Unable to initialize Ghostscript"
+msgstr "Ej möjligt att initialisera Ghostscript"
+
+msgid "Unable to initialize GhostPCL"
+msgstr "Ej möjligt att initialisera GhostPCL"
+
+msgid "MO %1 (%2): %3"
+msgstr "MO %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&MO %1 (%2): %3"
+
+msgid "MO images"
+msgstr "MO-avbildningar"
+
+msgid "Welcome to 86Box!"
+msgstr "Välkommen till 86Box!"
+
+msgid "Internal device"
+msgstr "Intern enhet"
+
+msgid "&File"
+msgstr "&Fil"
+
+msgid "&New machine..."
+msgstr "&Ny maskin..."
+
+msgid "&Check for updates..."
+msgstr "&Leta efter uppdateringar..."
+
+msgid "Exit"
+msgstr "Avsluta"
+
+msgid "No ROMs found"
+msgstr "Inga ROM-avbildningar hittades"
+
+msgid "Do you want to save the settings?"
+msgstr "Vill du spara inställningarna?"
+
+msgid "This will hard reset the emulated machine."
+msgstr "Detta kommer att göra en hård omstart av den emulerade maskinen."
+
+msgid "Save"
+msgstr "Spara"
+
+msgid "About 86Box"
+msgstr "Om 86Box"
+
+msgid "86Box v"
+msgstr "86Box v"
+
+msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
+msgstr "En emulator av gamla datorer\n\nUpphovsmän: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, med flera.\n\nMed tidigare grundbidrag från Sarah Walker, leilei, JohnElliott, greatpsycho, med flera.\n\nSläppt under GNU General Public License upplaga 2 eller senare. Se LICENSE för mer information."
+
+msgid "Hardware not available"
+msgstr "Hårdvara ej tillgänglig"
+
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "Säkerställ att %1 är installerad och att du använder en %1-kompatibel nätverksanslutning."
+
+msgid "Invalid configuration"
+msgstr "Ogiltig konfiguration"
+
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 krävs för automatisk omvandling av PostScript-filer till PDF.\n\nAlla dokument som skickats till den allmänna PostScript-skrivaren kommer att sparas som PostScript-filer (.ps)."
+
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 krävs för automatisk omvandling av PCL-filer till PDF.\n\nAlla dokument som skickas till den allmänna PCL-skrivaren kommer att sparas som Printer Command Language-filer (.pcl)."
+
+msgid "Don't show this message again"
+msgstr "Visa inte detta meddelande igen"
+
+msgid "Don't exit"
+msgstr "Avsluta inte"
+
+msgid "Reset"
+msgstr "Starta om"
+
+msgid "Don't reset"
+msgstr "Starta inte om"
+
+msgid "CD-ROM images"
+msgstr "CD-ROM-avbildningar"
+
+msgid "%1 Device Configuration"
+msgstr "%1 Enhetskonfiguration"
+
+msgid "Monitor in sleep mode"
+msgstr "Skärm i viloläge"
+
+msgid "GLSL shaders"
+msgstr "GLSL shaders"
+
+msgid "You are loading an unsupported configuration"
+msgstr "Du laddar en konfiguration som inte stöds"
+
+msgid "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
+msgstr "Filtrering av processortyp grundat på den valda maskinen är avaktiverat för denna emulerade maskin.\n\nDetta gör det möjligt att välja en processor som annars är oförenlig med den valda maskinen. Detta kan dock leda till oförenligheter med maskinens BIOS eller annan mjukvara\n\nAtt aktivera denna inställning stöds inte officiellt, och alla felrapporter som lämnas in kan komma att stängas som ogiltiga."
+
+msgid "Continue"
+msgstr "Fortsätt"
+
+msgid "Cassette: %1"
+msgstr "Kassettband: %1"
+
+msgid "C&assette: %1"
+msgstr "K&assettband: %1"
+
+msgid "Cassette images"
+msgstr "Kassettbandsavbildningar"
+
+msgid "Cartridge %1: %2"
+msgstr "Kassett %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "Ka&ssett %1: %2"
+
+msgid "Cartridge images"
+msgstr "Kassettavbildningar"
+
+msgid "Resume execution"
+msgstr "Fortsätt exekvering"
+
+msgid "Pause execution"
+msgstr "Pausa exekvering"
+
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del"
+
+msgid "Press Ctrl+Alt+Del"
+msgstr "Tryck på Ctrl+Alt+Del"
+
+msgid "Press Ctrl+Alt+Esc"
+msgstr "Tryck på Ctrl+Alt+Esc"
+
+msgid "Hard reset"
+msgstr "Hård omstart"
+
+msgid "Force shutdown"
+msgstr "Tvinga avstängning"
+
+msgid "Start"
+msgstr "Starta"
+
+msgid "Not running"
+msgstr "Körs ej"
+
+msgid "Running"
+msgstr "Körs"
+
+msgid "Paused"
+msgstr "Pausad"
+
+msgid "Waiting"
+msgstr "Väntar"
+
+msgid "Powered Off"
+msgstr "Avstängd"
+
+msgid "%n running"
+msgstr "%n körs"
+
+msgid "%n paused"
+msgstr "%n pausad"
+
+msgid "%n waiting"
+msgstr "%n väntar"
+
+msgid "%1 total"
+msgstr "%1 sammanlagt"
+
+msgid "VMs: %1"
+msgstr "VM: %1"
+
+msgid "System Directory:"
+msgstr "Systemmapp:"
+
+msgid "Choose directory"
+msgstr "Välj mapp"
+
+msgid "Choose configuration file"
+msgstr "Välj konfigurationsfil"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "86Box konfigurationsfiler (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Kunde inte läsa konfiguration"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "Kunde inte läsa den valda konfigurationsfilen: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "Använd vanliga uttryck i sökfältet"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "%1 maskin(er) är aktiva. Är du säker på att du vill avsluta VM-hanteraren ändå?"
+
+msgid "Add new system wizard"
+msgstr "Guiden Lägg till nytt system"
+
+msgid "Introduction"
+msgstr "Introduktion"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "Detta kommer att hjälpa dig lägga till ett nytt system till 86Box."
+
+msgid "New configuration"
+msgstr "Ny konfiguration"
+
+msgid "Complete"
+msgstr "Färdig"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "Guiden kommer nu starta konfigurationen för det nya systemet."
+
+msgid "Use existing configuration"
+msgstr "Använd befintlig konfiguration"
+
+msgid "Type some notes here"
+msgstr "Skriv anteckningar här"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Klistra in innehållet i den befintliga konfigurationsfilen i fältet nedanför."
+
+msgid "Load configuration from file"
+msgstr "Ladda konfiguration från fil"
+
+msgid "System name"
+msgstr "Systemnamn"
+
+msgid "System name:"
+msgstr "Systemnamn:"
+
+msgid "System name cannot contain certain characters"
+msgstr "Systemnamnet kan inte innehålla vissa tecken"
+
+msgid "System name already exists"
+msgstr "Systemnamnet finns redan"
+
+msgid "Please enter a directory for the system"
+msgstr "Välj en mapp till systemet"
+
+msgid "Directory does not exist"
+msgstr "Mappen finns inte"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "En ny mapp till systemet kommer att skapas i den valda mappen ovanför"
+
+msgid "System location:"
+msgstr "Systemplats:"
+
+msgid "System name and location"
+msgstr "Systemnamn och plats"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Ange namn på systemet och välj plats"
+
+msgid "Enter the name of the system"
+msgstr "Ange namn på systemet"
+
+msgid "Please enter a system name"
+msgstr "Ange ett systemnamn"
+
+msgid "Display name (optional):"
+msgstr "Visningsnamn (valfritt):"
+
+msgid "Display name:"
+msgstr "Visningsnamn:"
+
+msgid "Set display name"
+msgstr "Ställ in visningsnamn"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Ange nytt visningsnamn (tom för att återställa)"
+
+msgid "Change &display name..."
+msgstr "Ändra &visningsnamn..."
+
+msgid "Context Menu"
+msgstr "Innehållsmeny"
+
+msgid "&Open folder..."
+msgstr "&Öppna mapp..."
+
+msgid "Open p&rinter tray..."
+msgstr "Öppna &skrivarfack..."
+
+msgid "Set &icon..."
+msgstr "Ställ in &ikon..."
+
+msgid "Select an icon"
+msgstr "Välj en ikon"
+
+msgid "C&lone..."
+msgstr "K&lona..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "Virtuell maskin \"%1\" (%2) kommer att klonas till:"
+
+msgid "Directory %1 already exists"
+msgstr "Mapp %1 finns redan"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "Du kan inte använda följande tecken i namnet: %1"
+
+msgid "Clone"
+msgstr "Klona"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Kunde inte skapa mapp för klonad VM"
+
+msgid "Failed to clone VM."
+msgstr "Kunde inte klona VM."
+
+msgid "Directory in use"
+msgstr "Mapp används"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "Den valda mappen används redan. Välj en annan mapp."
+
+msgid "Create directory failed"
+msgstr "Kunde inte skapa mapp"
+
+msgid "Unable to create the directory for the new system"
+msgstr "Kunde inte skapa mapp för nytt system"
+
+msgid "Configuration write failed"
+msgstr "Kunde inte skriva konfiguration"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "Kunde inte skriva till konfigurationsfil på %1"
+
+msgid "Error adding system"
+msgstr "Fel vid tillägg av system"
+
+msgid "Remove directory failed"
+msgstr "Kunde inte ta bort mapp"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "Några filer i maskinens mapp kunde inte tas bort. Ta bort de manuellt."
+
+msgid "Build"
+msgstr "Build"
+
+msgid "Version"
+msgstr "Version"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "En uppdatering till 86Box är tillgänglig: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "Vid kontroll av uppdateringar uppstod ett fel: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>En uppdatering till 86Box är tillgänglig!</b>"
+
+msgid "Warning"
+msgstr "Varning"
+
+msgid "&Kill"
+msgstr "&Döda"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "Att döda en virtuell maskin kan orsaka dataförlust. Gör detta endast om 86Box-processen hänger sig.\n\nVill du verkligen döda virtuella maskinen \"%1\"?"
+
+msgid "&Delete"
+msgstr "&Ta bort"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "Vill du verkligen ta bort virtuella maskinen \"%1\" och alla dess filer? Denna handling kan inte ångras!"
+
+msgid "Show &config file"
+msgstr "Visa &konfigurationsfil"
+
+msgid "No screenshot"
+msgstr "Inga skärmbilder"
+
+msgid "Search"
+msgstr "Sök"
+
+msgid "Searching for VMs..."
+msgstr "Söker efter VM..."
+
+msgid "Found %1"
+msgstr "Hittade %1"
+
+msgid "System"
+msgstr "System"
+
+msgid "Storage"
+msgstr "Lagring"
+
+msgid "Disk %1: "
+msgstr "Disk %1:"
+
+msgid "No disks"
+msgstr "Inga diskar"
+
+msgid "Audio"
+msgstr "Ljud"
+
+msgid "Audio:"
+msgstr "Ljud:"
+
+msgid "ACPI shutdown"
+msgstr "ACPI-avstängning"
+
+msgid "ACP&I shutdown"
+msgstr "ACP&I-avstängning"
+
+msgid "Hard disk (%1)"
+msgstr "Hårddisk (%1)"
+
+msgid "MFM/RLL or ESDI CD-ROM drives never existed"
+msgstr "MFM/RLL eller ESDI CD-ROM-enheter fanns aldrig"
+
+msgid "Custom..."
+msgstr "Egen..."
+
+msgid "Custom (large)..."
+msgstr "Egen (stor)..."
+
+msgid "Add New Hard Disk"
+msgstr "Lägg till ny hårddisk"
+
+msgid "Add Existing Hard Disk"
+msgstr "Lägg till befintlig hårddisk"
+
+msgid "HDI disk images cannot be larger than 4 GB."
+msgstr "Avbildningar i HDI-format kan inte vara större än 4 GB."
+
+msgid "Disk images cannot be larger than 127 GB."
+msgstr "Avbildningar kan inte vara större än 127 GB."
+
+msgid "Hard disk images"
+msgstr "Hårddiskavbilningar"
+
+msgid "Unable to read file"
+msgstr "Kan inte läsa fil"
+
+msgid "Unable to write file"
+msgstr "Kan inte skriva till fil"
+
+msgid "HDI or HDX images with a sector size other than 512 are not supported."
+msgstr "HDI- eller HDX-avbildningar med en sektorstorlek annat än 512 stöds inte."
+
+msgid "Disk image file already exists"
+msgstr "Avbildningsfil finns redan"
+
+msgid "Please specify a valid file name."
+msgstr "Vänligen ange ett giltigt filnamn."
+
+msgid "Disk image created"
+msgstr "Avbildning skapad"
+
+msgid "Make sure the file exists and is readable."
+msgstr "Säkerställ att filen finns och är läsbar."
+
+msgid "Make sure the file is being saved to a writable directory."
+msgstr "Säkerställ att filen sparas till en skrivbar mapp."
+
+msgid "Disk image too large"
+msgstr "Avbildning för stor"
+
+msgid "Remember to partition and format the newly-created drive."
+msgstr "Kom ihåg att partitionera och formatera den skapade enheten."
+
+msgid "The selected file will be overwritten. Are you sure you want to use it?"
+msgstr "Den valda filen kommer att skrivas över. Är du säker på att du vill använda den?"
+
+msgid "Unsupported disk image"
+msgstr "Avbildning stöds inte"
+
+msgid "Overwrite"
+msgstr "Skriv över"
+
+msgid "Don't overwrite"
+msgstr "Skriv inte över"
+
+msgid "Raw image"
+msgstr "Rå avbildning"
+
+msgid "HDI image"
+msgstr "HDI-avbildning"
+
+msgid "HDX image"
+msgstr "HDX-avbildning"
+
+msgid "Fixed-size VHD"
+msgstr "VHD med fastställd storlek"
+
+msgid "Dynamic-size VHD"
+msgstr "VHD med dynamisk storlek"
+
+msgid "Differencing VHD"
+msgstr "Differencing-avbildning av VHD"
+
+msgid "(N/A)"
+msgstr "(ej)"
+
+msgid "Raw image (.img)"
+msgstr "Rå avbildning (.img)"
+
+msgid "HDI image (.hdi)"
+msgstr "HDI-avbildning (.hdi)"
+
+msgid "HDX image (.hdx)"
+msgstr "HDX-avbildning (.hdx)"
+
+msgid "Fixed-size VHD (.vhd)"
+msgstr "VHD med fastställd storlek (.vhd)"
+
+msgid "Dynamic-size VHD (.vhd)"
+msgstr "VHD med dynamisk storlek (.vhd)"
+
+msgid "Differencing VHD (.vhd)"
+msgstr "Differencing-avbildning av VHD (.vhd)"
+
+msgid "Large blocks (2 MB)"
+msgstr "Stora block (2 MB)"
+
+msgid "Small blocks (512 KB)"
+msgstr "Små block (512 KB)"
+
+msgid "VHD files"
+msgstr "VHD-filer"
+
+msgid "Select the parent VHD"
+msgstr "Välj moders-VHDn"
+
+msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
+msgstr "Detta kan betyda att modersavbildningen har ändrats efter att skillnadsavbildningen skapades.\n\nDet kan också hända om avbildningarna har flyttats eller kopierats, eller av en bugg i programmet som skapade denna disk.\n\nVill du laga tidsstämplarna?"
+
+msgid "Parent and child disk timestamps do not match"
+msgstr "Tidsstämpeln på moders- och dotterdisken stämmer inte överens"
+
+msgid "Could not fix VHD timestamp."
+msgstr "Kunde inte laga tidsstämpeln på VHDn."
+
+msgid "MFM/RLL"
+msgstr "MFM/RLL"
+
+msgid "XTA"
+msgstr "XTA"
+
+msgid "ESDI"
+msgstr "ESDI"
+
+msgid "IDE"
+msgstr "IDE"
+
+msgid "ATAPI"
+msgstr "ATAPI"
+
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
+
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
+
+msgid "160 KB"
+msgstr "160 KB"
+
+msgid "180 KB"
+msgstr "180 KB"
+
+msgid "320 KB"
+msgstr "320 KB"
+
+msgid "360 KB"
+msgstr "360 KB"
+
+msgid "640 KB"
+msgstr "640 KB"
+
+msgid "720 KB"
+msgstr "720 KB"
+
+msgid "1.2 MB"
+msgstr "1.2 MB"
+
+msgid "1.25 MB"
+msgstr "1.25 MB"
+
+msgid "1.44 MB"
+msgstr "1.44 MB"
+
+msgid "DMF (cluster 1024)"
+msgstr "DMF (kluster 1024)"
+
+msgid "DMF (cluster 2048)"
+msgstr "DMF (kluster 2048)"
+
+msgid "2.88 MB"
+msgstr "2.88 MB"
+
+msgid "ZIP 100"
+msgstr "ZIP 100"
+
+msgid "3.5\" 128 MB (ISO 10090)"
+msgstr "3.5\" 128 MB (ISO 10090)"
+
+msgid "3.5\" 230 MB (ISO 13963)"
+msgstr "3.5\" 230 MB (ISO 13963)"
+
+msgid "3.5\" 540 MB (ISO 15498)"
+msgstr "3.5\" 540 MB (ISO 15498)"
+
+msgid "3.5\" 640 MB (ISO 15498)"
+msgstr "3.5\" 640 MB (ISO 15498)"
+
+msgid "3.5\" 1.3 GB (GigaMO)"
+msgstr "3.5\" 1.3 GB (GigaMO)"
+
+msgid "3.5\" 2.3 GB (GigaMO 2)"
+msgstr "3.5\" 2.3 GB (GigaMO 2)"
+
+msgid "5.25\" 600 MB"
+msgstr "5.25\" 600 MB"
+
+msgid "5.25\" 650 MB"
+msgstr "5.25\" 650 MB"
+
+msgid "5.25\" 1 GB"
+msgstr "5.25\" 1 GB"
+
+msgid "5.25\" 1.3 GB"
+msgstr "5.25\" 1.3 GB"
+
+msgid "Perfect RPM"
+msgstr "Perfekt varv/min"
+
+msgid "1% below perfect RPM"
+msgstr "1% under perfekt varv/min"
+
+msgid "1.5% below perfect RPM"
+msgstr "1.5% under perfekt varv/min"
+
+msgid "2% below perfect RPM"
+msgstr "2& under perfekt varm/min"
+
+msgid "(System Default)"
+msgstr "(Systemstandard)"
+
+msgid "Failed to initialize network driver"
+msgstr "Kunde inte initialisera drivrutiner för nätverk"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "Nätverkskonfigurationen kommer att bytas till den tomma drivrutinen"
+
+msgid "Mouse sensitivity:"
+msgstr "Muskänslighet:"
+
+msgid "Select media images from program working directory"
+msgstr "Välj medieavbildningar från programmets arbetsmapp"
+
+msgid "PIT mode:"
+msgstr "PIT-läge:"
+
+msgid "Auto"
+msgstr "Automatisk"
+
+msgid "Slow"
+msgstr "Långsam"
+
+msgid "Fast"
+msgstr "Snabb"
+
+msgid "&Auto-pause on focus loss"
+msgstr "&Pausa automatiskt när fokus tappas"
+
+msgid "WinBox is no longer supported"
+msgstr "WinBox stöds inte längre"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "Utvecklingen av hanteraren WinBox stoppades under 2022 på grund av avsaknad av underhållare. När vi nu riktar våra ansträngningar till att göra 86Box ännu bättre så har vi fattat beslutet att inte längre stödja WinBox som en hanterare.\n\nInga framtida uppdateringar kommer att tillhandahållas genom WinBox, och du kan stöta på felaktiga beteenden om du skulle fortsätta att använda det med nyare versioner av 86Box. Alla felrapporter som har att göra med WinBox kommer att stängas som ogiltiga.\n\nGå till 86Box.net för en lista med andra hanterare som du kan använda."
+
+msgid "Generate"
+msgstr "Generera"
+
+msgid "Joystick configuration"
+msgstr "Konfiguration av styrspak"
+
+msgid "Device"
+msgstr "Enhet"
+
+msgid "%1 (X axis)"
+msgstr "%1 (X-axeln)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (Y-axeln)"
+
+msgid "MCA devices"
+msgstr "MCA-enheter"
+
+msgid "List of MCA devices:"
+msgstr "Lista på MCA-enheter:"
+
+msgid "&Tablet tool"
+msgstr "Plattverktyg"
+
+msgid "About &Qt"
+msgstr "Om &Qt"
+
+msgid "&MCA devices..."
+msgstr "MCA-enheter..."
+
+msgid "Show non-&primary monitors"
+msgstr "Visa icke-primära skärmar"
+
+msgid "Open screenshots &folder..."
+msgstr "Öppna skärmbildsmappen..."
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Tillämpa sträckläge för helskärm när den är maximerad"
+
+msgid "&Cursor/Puck"
+msgstr "&Pekare/puck"
+
+msgid "&Pen"
+msgstr "P&enna"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "&Värdenhet för CD/DVD (%1:)"
+
+msgid "&Connected"
+msgstr "&Ansluten"
+
+msgid "Clear image &history"
+msgstr "Rensa historik för avbildningar"
+
+msgid "Create..."
+msgstr "Skapa..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "Värdenhet för CD/DVD (%1)"
+
+msgid "Unknown Bus"
+msgstr "Okänd buss"
+
+msgid "Null Driver"
+msgstr "Tom drivrutin"
+
+msgid "NIC:"
+msgstr "NIC:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "NIC %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&NIC %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "Renderingsbeteende"
+
+msgid "Use target framerate:"
+msgstr "Använd målbildhatighet:"
+
+msgid " fps"
+msgstr " Bildhastighet"
+
+msgid "VSync"
+msgstr "VSync"
+
+msgid "Synchronize with video"
+msgstr "Synkronisera med bild"
+
+msgid "Shaders"
+msgstr "Shaders"
+
+msgid "Remove"
+msgstr "Ta bort"
+
+msgid "Browse..."
+msgstr "Bläddra..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "Kunde inte skapa OpenGL-sammanhang."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "Kunde inte växla till OpenGL-sammanhang."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "OpenGL version 3.0 eller högre krävs. Nuvarande version är %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "Fel vid initialisering av OpenGL"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nFaller tillbaka på mjukvarurendering."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>Vid val av medieavbildningar (CD-ROM, diskett, osv.) så kommer fönstret att börja i samma mapp som 86Box konfigurationsfil. Denna inställning kommer troligtvis endast göra en skillnad på macOS.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "Denna maskin kan ha flyttats eller kopierats."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "För att säkerställa korrekt funktionalitet av nätverk så behöver 86Box veta om denna maskin har flyttats eller kopierats.\n\nVälj \"Jag kopierade den\" om du är osäker."
+
+msgid "I Moved It"
+msgstr "Jag flyttade den"
+
+msgid "I Copied It"
+msgstr "Jag kopierade den"
+
+msgid "86Box Monitor #"
+msgstr "86Box skärm #"
+
+msgid "No MCA devices."
+msgstr "Inga MCA-enheter."
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "Nätverkskort #1"
+
+msgid "Network Card #2"
+msgstr "Nätverkskort #2"
+
+msgid "Network Card #3"
+msgstr "Nätverkskort #3"
+
+msgid "Network Card #4"
+msgstr "Nätverkskort #4"
+
+msgid "Mode:"
+msgstr "Läge:"
+
+msgid "Interface:"
+msgstr "Gränssnitt:"
+
+msgid "Adapter:"
+msgstr "Adapter:"
+
+msgid "VDE Socket:"
+msgstr "VDE-sockel:"
+
+msgid "86Box Unit Tester"
+msgstr "86Box enhetsprövare"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Novell NetWare 2.x nyckelkort"
+
+msgid "Serial port passthrough 1"
+msgstr "Serieport passthrough 1"
+
+msgid "Serial port passthrough 2"
+msgstr "Serieport passthrough 2"
+
+msgid "Serial port passthrough 3"
+msgstr "Serieport passthrough 3"
+
+msgid "Serial port passthrough 4"
+msgstr "Serieport passthrough 4"
+
+msgid "Renderer &options..."
+msgstr "Renderingsalternativ..."
+
+msgid "PC/XT Keyboard"
+msgstr "PC/XT-tangentbord"
+
+msgid "AT Keyboard"
+msgstr "AT-tangenbord"
+
+msgid "AX Keyboard"
+msgstr "AX-tangentbord"
+
+msgid "PS/2 Keyboard"
+msgstr "PS/2-tangentbord"
+
+msgid "PS/55 Keyboard"
+msgstr "PS/55-tangentbord"
+
+msgid "Keys"
+msgstr "Tangenter"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Logitech/Microsoft Bus-mus"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Microsoft Bus-mus (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Mouse Systems seriemus"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Mouse Systems Bus-mus"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Microsoft seriemus"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Microsoft serie-BallPoint"
+
+msgid "Logitech Serial Mouse"
+msgstr "Logitech seriemus"
+
+msgid "PS/2 Mouse"
+msgstr "PS/2-mus"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "PS/2 QuickPort-mus"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (serie)"
+
+msgid "Default Baud rate"
+msgstr "Standard Baudhastighet"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] Standard Hayes-kompatibelt modem"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Roland MT-32 emulering"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Roland MT-32 (ny) emulering"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Roland CM-32L emulering"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Roland CM-32LN emulering"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "OPL4-ML dotterkort"
+
+msgid "System MIDI"
+msgstr "System-MIDI"
+
+msgid "MIDI Input Device"
+msgstr "Indataenhet för MIDI"
+
+msgid "BIOS file"
+msgstr "BIOS-fil"
+
+msgid "BIOS file (ROM #1)"
+msgstr "BIOS-fil (ROM #1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "BIOS-fil (ROM #2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "BIOS-fil (ROM #3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "BIOS-fil (ROM #4)"
+
+msgid "BIOS address"
+msgstr "BIOS-adress"
+
+msgid "BIOS address (ROM #1)"
+msgstr "BIOS-adress (ROM #1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "BIOS-adress (ROM #2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "BIOS-adress (ROM #3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "BIOS-adress (ROM #4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "Aktivera ROM-skrivningar för utökat BIOS"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "Aktivera ROM-skrivningar för utökat BIOS (ROM #1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "Aktivera ROM-skrivningar för utökat BIOS (ROM #2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "Aktivera ROM-skrivningar för utökat BIOS (ROM #3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "Aktivera ROM-skrivningar för utökat BIOS (ROM #4)"
+
+msgid "Linear framebuffer base"
+msgstr "Linjär bas för skärmbuffert"
+
+msgid "Address"
+msgstr "Adress"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "IRQ för serieport"
+
+msgid "Parallel port IRQ"
+msgstr "IRQ för parallelport"
+
+msgid "BIOS Revision"
+msgstr "BIOS-revision"
+
+msgid "BIOS Version"
+msgstr "BIOS-version"
+
+msgid "BIOS Language"
+msgstr "BIOS-språk"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "IBM 5161 expansionsenhet"
+
+msgid "IBM Cassette Basic"
+msgstr "IBM Cassette Basic"
+
+msgid "Translate 26 -> 17"
+msgstr "Översätt 26 -> 17"
+
+msgid "Language"
+msgstr "Språk"
+
+msgid "Enable backlight"
+msgstr "Aktivera bakgrundsbelysning"
+
+msgid "Invert colors"
+msgstr "Invertera färger"
+
+msgid "BIOS size"
+msgstr "Storlek på BIOS"
+
+msgid "BIOS size (ROM #1)"
+msgstr "Storlek på BIOS (ROM #1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "Storlek på BIOS (ROM #2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "Storlek på BIOS (ROM #3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "Storlek på BIOS (BIOS #4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "Kartlägg C0000-C7FFF som UMB"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "Kartlägg C8000-CFFFF som UMB"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "Kartlägg D0000-D7FFF som UMB"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "Kartlägg D8000-DFFFF som UMB"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "Kartlägg E0000-E7FFF som UMB"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "Kartlägg E8000-EFFFF som UMB"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "JS9-bygel (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "Utdataenhet för MIDI"
+
+msgid "MIDI Real time"
+msgstr "Realtid för MIDI"
+
+msgid "MIDI Thru"
+msgstr "MIDI genom"
+
+msgid "MIDI Clockout"
+msgstr "MIDI utklockning"
+
+msgid "SoundFont"
+msgstr "Ljudsnitt"
+
+msgid "Output Gain"
+msgstr "Förstärkning av utmatning"
+
+msgid "Chorus"
+msgstr "Chorus"
+
+msgid "Chorus Voices"
+msgstr "Chorus voices"
+
+msgid "Chorus Level"
+msgstr "Chorus nivå"
+
+msgid "Chorus Speed"
+msgstr "Chorus hastighet"
+
+msgid "Chorus Depth"
+msgstr "Chorus djup"
+
+msgid "Chorus Waveform"
+msgstr "Chorus vågform"
+
+msgid "Reverb"
+msgstr "Reverb"
+
+msgid "Reverb Room Size"
+msgstr "Reverb rumsstorlek"
+
+msgid "Reverb Damping"
+msgstr "Reverb dämpning"
+
+msgid "Reverb Width"
+msgstr "Reverb bredd"
+
+msgid "Reverb Level"
+msgstr "Reverb nivå"
+
+msgid "Interpolation Method"
+msgstr "Interpoleringsmetod"
+
+msgid "Dynamic Sample Loading"
+msgstr "Dynamisk sampelladdning"
+
+msgid "Reverb Output Gain"
+msgstr "Reverb utmatningsförstärkning"
+
+msgid "Reversed stereo"
+msgstr "Omvänd stereo"
+
+msgid "Nice ramp"
+msgstr "Nice ramp"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "Knappar"
+
+msgid "Serial Port"
+msgstr "Serieport"
+
+msgid "RTS toggle"
+msgstr "RTS-brytare"
+
+msgid "Revision"
+msgstr "Revision"
+
+msgid "Controller"
+msgstr "Styrenhet"
+
+msgid "Show Crosshair"
+msgstr "Visa hårkors"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "MAC-adress"
+
+msgid "MAC Address OUI"
+msgstr "MAC-adress OUI"
+
+msgid "Enable BIOS"
+msgstr "Aktivera BIOS"
+
+msgid "Baud Rate"
+msgstr "Baudhastighet"
+
+msgid "TCP/IP listening port"
+msgstr "TCP/IP lyssningsport"
+
+msgid "Phonebook File"
+msgstr "Telefonsboksfil"
+
+msgid "Telnet emulation"
+msgstr "Telnet-emulering"
+
+msgid "RAM Address"
+msgstr "RAM-adress"
+
+msgid "RAM size"
+msgstr "RAM-storlek"
+
+msgid "Initial RAM size"
+msgstr "Ursprunglig RAM-storlek"
+
+msgid "Serial Number"
+msgstr "Serienummer"
+
+msgid "Host ID"
+msgstr "Värd-ID"
+
+msgid "FDC Address"
+msgstr "Adress till diskettstyrenhet"
+
+msgid "MPU-401 Address"
+msgstr "Adress till MPU-401"
+
+msgid "MPU-401 IRQ"
+msgstr "MPU-401 IRQ"
+
+msgid "Receive MIDI input"
+msgstr "Ta emot MIDI-indata"
+
+msgid "Low DMA"
+msgstr "Låg DMA"
+
+msgid "Enable Game port"
+msgstr "Aktivera spelport"
+
+msgid "SID Model"
+msgstr "SID-modell"
+
+msgid "SID Filter Strength"
+msgstr "SID filetstyrka"
+
+msgid "Surround module"
+msgstr "Sorround-modul"
+
+msgid "CODEC"
+msgstr "CODEC"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "Öka avbrottsnummer för CODEC vid CODEC-installation (krävs av vissa drivrutiner)"
+
+msgid "SB Address"
+msgstr "Adress för SB"
+
+msgid "Adlib Address"
+msgstr "Adlib-adress"
+
+msgid "Use EEPROM setting"
+msgstr "Använd EEPROM-inställning"
+
+msgid "WSS IRQ"
+msgstr "WSS IRQ"
+
+msgid "WSS DMA"
+msgstr "WSS DMA"
+
+msgid "Enable OPL"
+msgstr "Aktivera OPL"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "Ta emot MIDI-indata (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "Låg DMA för SB"
+
+msgid "6CH variant (6-channel)"
+msgstr "6CH-variant (6-kanals)"
+
+msgid "Enable CMS"
+msgstr "Aktivera CMS"
+
+msgid "Mixer"
+msgstr "Mixer"
+
+msgid "High DMA"
+msgstr "Hög DMA"
+
+msgid "Control PC speaker"
+msgstr "Styr PC-speaker"
+
+msgid "Memory size"
+msgstr "Minnesstorlek"
+
+msgid "EMU8000 Address"
+msgstr "Adress till EMU8000"
+
+msgid "IDE Controller"
+msgstr "IDE-styrenhet"
+
+msgid "Codec"
+msgstr "Kodek"
+
+msgid "GUS type"
+msgstr "GUS-typ"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "Aktivera kommandot 0x04 \"Avsluta 86Box\""
+
+msgid "Display type"
+msgstr "Skärmtyp"
+
+msgid "Composite type"
+msgstr "Komposittyp"
+
+msgid "RGB type"
+msgstr "RGB-typ"
+
+msgid "Line doubling type"
+msgstr "Linjefördubblingstyp"
+
+msgid "Snow emulation"
+msgstr "Snöemulering"
+
+msgid "Monitor type"
+msgstr "Bildskärmstyp"
+
+msgid "Character set"
+msgstr "Teckenuppsättning"
+
+msgid "XGA type"
+msgstr "XGA-typ"
+
+msgid "Instance"
+msgstr "Instans"
+
+msgid "MMIO Address"
+msgstr "Adress för MMIO"
+
+msgid "RAMDAC type"
+msgstr "RAMDAC-typ"
+
+msgid "Blend"
+msgstr "Blanda"
+
+msgid "Font"
+msgstr "Typsnitt"
+
+msgid "Bilinear filtering"
+msgstr "Bilinjär filtrering"
+
+msgid "Video chroma-keying"
+msgstr "Video chroma-keying"
+
+msgid "Dithering"
+msgstr "Dithering"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "Aktivera NMI till CGA-emulering"
+
+msgid "Voodoo type"
+msgstr "Voodoo-typ"
+
+msgid "Framebuffer memory size"
+msgstr "Minnesstorlek för videobuffert"
+
+msgid "Texture memory size"
+msgstr "Minnesstorlek för texturer"
+
+msgid "Dither subtraction"
+msgstr "Dither subtraktion"
+
+msgid "Screen Filter"
+msgstr "Skärmfilter"
+
+msgid "Render threads"
+msgstr "Renderingstrådar"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Startadress"
+
+msgid "Contiguous Size"
+msgstr "Angränsande storlek"
+
+msgid "I/O Width"
+msgstr "I/O-bredd"
+
+msgid "Transfer Speed"
+msgstr "Överföringshastighet"
+
+msgid "EMS mode"
+msgstr "EMS-läge"
+
+msgid "EMS Address"
+msgstr "EMS-adress"
+
+msgid "EMS 1 Address"
+msgstr "EMS 1-adress"
+
+msgid "EMS 2 Address"
+msgstr "EMS 2-adress"
+
+msgid "EMS Memory Size"
+msgstr "EMS minnesstorlek"
+
+msgid "EMS 1 Memory Size"
+msgstr "EMS 1 minnesstorlek"
+
+msgid "EMS 2 Memory Size"
+msgstr "EMS 2 minnesstorlek"
+
+msgid "Enable EMS"
+msgstr "Aktivera EMS"
+
+msgid "Enable EMS 1"
+msgstr "Aktivera EMS 1"
+
+msgid "Enable EMS 2"
+msgstr "Aktivera EMS 2"
+
+msgid "Address for > 2 MB"
+msgstr "Adress till > 2 MB"
+
+msgid "Frame Address"
+msgstr "Bildadress"
+
+msgid "USA"
+msgstr "Förenta staterna"
+
+msgid "Danish"
+msgstr "Danska"
+
+msgid "Always at selected speed"
+msgstr "Alltid vid den valda hastigheten"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "BIOS-inställningar + Snabbtangenter (av under POST)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 KB som börjar från F0000"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 KB som börjar från E0000 (adress MSB inverterad, de sista 64 KB först)"
+
+msgid "Sine"
+msgstr "Sinus"
+
+msgid "Triangle"
+msgstr "Triangel"
+
+msgid "Linear"
+msgstr "Linjär"
+
+msgid "4th Order"
+msgstr "Fjärde ordningen"
+
+msgid "7th Order"
+msgstr "Sjunde ordningen"
+
+msgid "Non-timed (original)"
+msgstr "Ej tajmad (ursprunglig)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (JMP2 ej byglad)"
+
+msgid "Two"
+msgstr "Två"
+
+msgid "Three"
+msgstr "Tre"
+
+msgid "Wheel"
+msgstr "Hjul"
+
+msgid "Five + Wheel"
+msgstr "Fem med hjul"
+
+msgid "Five + 2 Wheels"
+msgstr "Fem med två hjul"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 serie / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) serie"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "Avaktivera BIOS"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2 MB"
+
+msgid "8 MB"
+msgstr "8 MB"
+
+msgid "28 MB"
+msgstr "28 MB"
+
+msgid "1 MB"
+msgstr "1 MB"
+
+msgid "4 MB"
+msgstr "4 MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16 MB"
+
+msgid "20 MB"
+msgstr "20 MB"
+
+msgid "24 MB"
+msgstr "24 MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (stereo)"
+
+msgid "Classic"
+msgstr "Klassisk"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "Komposit"
+
+msgid "True color"
+msgstr "True color"
+
+msgid "Old"
+msgstr "Gammal"
+
+msgid "New"
+msgstr "Ny"
+
+msgid "Color (generic)"
+msgstr "Färg (allmän)"
+
+msgid "Green Monochrome"
+msgstr "Grön monokrom"
+
+msgid "Amber Monochrome"
+msgstr "Bärnstensfärgad monokrom"
+
+msgid "Gray Monochrome"
+msgstr "Grå monokrom"
+
+msgid "Color (no brown)"
+msgstr "Färg (utan brun)"
+
+msgid "Color (IBM 5153)"
+msgstr "Färg (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Enkel fördubbling"
+
+msgid "sRGB interpolation"
+msgstr "sRGB-interpolering"
+
+msgid "Linear interpolation"
+msgstr "Linjär interpolering"
+
+msgid "Has secondary 8x8 character set"
+msgstr "Har sekundär 8x8 teckenuppsättning"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Har Quadcolor II dotterkort"
+
+msgid "Alternate monochrome contrast"
+msgstr "Alternativ monokrom kontrast"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Monokrom (5151/MDA) (vit)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Monokrom (5151/MDA) (grön)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Monokrom (5151/MDA) (bärnstensfärgad)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Färg 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Färg 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Utökad färg - normalt läge (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Utökad färg - utökat läge (5154/ECD)"
+
+msgid "Green"
+msgstr "Grön"
+
+msgid "Amber"
+msgstr "Bärnstensfärgad"
+
+msgid "Gray"
+msgstr "Grå"
+
+msgid "Grayscale"
+msgstr "Gråskala"
+
+msgid "Color"
+msgstr "Färg"
+
+msgid "U.S. English"
+msgstr "Amerikansk engelska"
+
+msgid "Scandinavian"
+msgstr "Skandinaviska"
+
+msgid "Other languages"
+msgstr "Andra språk"
+
+msgid "Bochs latest"
+msgstr "Bochs senaste"
+
+msgid "Apply overscan deltas"
+msgstr "Tillämpa delta för överskanning"
+
+msgid "Mono Interlaced"
+msgstr "Monokrom sammanflätad"
+
+msgid "Mono Non-Interlaced"
+msgstr "Ej sammanflätad monokrom"
+
+msgid "Color Interlaced"
+msgstr "Sammanflätad färg"
+
+msgid "Color Non-Interlaced"
+msgstr "Ej sammanflätad färg"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "3Dfx Voodoo-grafik"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 TMUs)"
+
+msgid "8-bit"
+msgstr "8-bitar"
+
+msgid "16-bit"
+msgstr "16-bitar"
+
+msgid "Standard (150ns)"
+msgstr "Standard (150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "Höghastighet (120ns)"
+
+msgid "Enabled"
+msgstr "Aktiverad"
+
+msgid "Standard"
+msgstr "Standard"
+
+msgid "High-Speed"
+msgstr "Höghastighet"
+
+msgid "Stereo LPT DAC"
+msgstr "Stereo LPT DAC"
+
+msgid "Generic Text Printer"
+msgstr "Allmän textskrivare"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Allmän ESC/P 2 punktmatrisskrivare"
+
+msgid "Generic PostScript Printer"
+msgstr "Allmän PostScript-skrivare"
+
+msgid "Generic PCL5e Printer"
+msgstr "Allmän PCL5e-skrivare"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Parallel Line Internet Protocol"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Skyddsdongel till Savage Quest"
+
+msgid "Serial Passthrough Device"
+msgstr "Seriepassthrough-enhet"
+
+msgid "Passthrough Mode"
+msgstr "Passthrough-läge"
+
+msgid "Host Serial Device"
+msgstr "Värd-serieenhet"
+
+msgid "Name of pipe"
+msgstr "Namn på pipe"
+
+msgid "Data bits"
+msgstr "Databitar"
+
+msgid "Stop bits"
+msgstr "Stopbitar"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Passthroughns Baudhastighet"
+
+msgid "Named Pipe (Server)"
+msgstr "Namngiven pipe (server)"
+
+msgid "Named Pipe (Client)"
+msgstr "Namngiven pipe (klient)"
+
+msgid "Host Serial Passthrough"
+msgstr "Värd-seriepassthrough"
+
+msgid "E&ject %1"
+msgstr "M&ata ut %1"
+
+msgid "&Unmute"
+msgstr "&Avtysta"
+
+msgid "Softfloat FPU"
+msgstr "Softfloat flyttalsprocessor"
+
+msgid "High performance impact"
+msgstr "Hög påverkan på prestanda"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Allmän] RAM-disk (max hastighet)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Allmän] 1989 (3500 varv/min)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Allmän] 1992 (3600 varv/min)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Allmän] 1994 (4500 varv/min)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Allmän] 1996 (5400 varv/min)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Allmän] 1997 (5400 varv/min)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Allmän] 1998 (5400 varv/min)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Allmän] 2000 (7200 varv/min)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "IBM 8514/A-klon (ISA)"
+
+msgid "Vendor"
+msgstr "Leverantör"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Allmän minnesexpansion för PC/XT"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Allmän minnesexpansion PC/AT"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "Kunde inte hitta typsnitt för punktmatris"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "TrueType-typsnitt i mappen \"roms/printer/fonts\" krävs för emulering av den allmänna ESC/P 2 punktmatrisskrivaren."
+
+msgid "Inhibit multimedia keys"
+msgstr "Hindra multimediatangenter"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Bekräfta innan inställningarna sparas"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Bekräfta innan hård omstart"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Bekräfta innan avslut"
+
+msgid "Options"
+msgstr "Alternativ"
+
+msgid "Model"
+msgstr "Modell"
+
+msgid "Model:"
+msgstr "Modell:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Kunde inte initialisera Vulkan-renderaren."
+
+msgid "GLSL Error"
+msgstr "GLSL-fel"
+
+msgid "Could not load shader: %1"
+msgstr "Kunde inte ladda shader: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "OpenGL version 3.0 eller högre krävs. Nuvarande GLSL-version är %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "Kunde inte ladda textur: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "Kunde inte kompilera shader:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "Program inte länkat:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "Shader-hanterare"
+
+msgid "Shader Configuration"
+msgstr "Shader-inställningar"
+
+msgid "Add"
+msgstr "Lägg till"
+
+msgid "Move up"
+msgstr "Flytta upp"
+
+msgid "Move down"
+msgstr "Flytta ner"
+
+msgid "Could not load file %1"
+msgstr "Kunde inte ladda fil %1"
+
+msgid "Key Bindings:"
+msgstr "Tangentbindningar:"
+
+msgid "Action"
+msgstr "Handling"
+
+msgid "Keybind"
+msgstr "Tangenbindning"
+
+msgid "Clear binding"
+msgstr "Rensa bindningar"
+
+msgid "Bind"
+msgstr "Bind"
+
+msgid "Bind Key"
+msgstr "Bind tangent"
+
+msgid "Enter key combo:"
+msgstr "Ange tangentkombination:"
+
+msgid "Bind conflict"
+msgstr "Bindningskonflikt"
+
+msgid "This key combo is already in use."
+msgstr "Denna tangentkombination används redan."
+
+msgid "Send Control+Alt+Del"
+msgstr "Skicka Ctrl+Alt+Del"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Skicka Ctrl+Alt+Esc"
+
+msgid "Toggle fullscreen"
+msgstr "Helskärm"
+
+msgid "Screenshot"
+msgstr "Skärmbild"
+
+msgid "Release mouse pointer"
+msgstr "Släpp muspekare"
+
+msgid "Toggle pause"
+msgstr "Pausa"
+
+msgid "Toggle mute"
+msgstr "Tysta"
+
+msgid "Text files"
+msgstr "Textfiler"
+
+msgid "ROM files"
+msgstr "ROM-filer"
+
+msgid "SoundFont files"
+msgstr "SoundFont-filer"
+
+msgid "Local Switch"
+msgstr "Lokal switch"
+
+msgid "Remote Switch"
+msgstr "Fjärr-switch"
+
+msgid "Switch:"
+msgstr "Switch:"
+
+msgid "Hub Mode"
+msgstr "Hubb-läge"
+
+msgid "Hostname:"
+msgstr "Värdnamn:"
+
+msgid "ISA RAM:"
+msgstr "ISA RAM:"
+
+msgid "ISA ROM:"
+msgstr "ISA ROM:"
+
+msgid "&Wipe NVRAM"
+msgstr "&Rensa NVRAM"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "Detta kommer att ta bort alla NVRAM och relaterade filer från den virtuella maskinen i undermappen \"nvr\". Du kommer att behöva omkonfigurera BIOS och möjligen andra enheter inuti VM om applicerbart.\n\nÄr du säker på att du vill tömma allt NVRAM-innehåll för den virtuella maskinen \"%1\"?"
+
+msgid "Success"
+msgstr "Lyckades"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "Lyckades tömma allt NVRAM-innehåll för den virtuella maskinen \"%1\"."
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "Ett fel uppstod vid försök att tömma NVRAM-innehållet för den virtuella maskinen \"%1\"."
+
+msgid "%1 VM Manager"
+msgstr "%1 VM-hanterare"
+
+msgid "%n disk(s)"
+msgstr "%n disk(ar)"
+
+msgid "Unknown Status"
+msgstr "Ökänd status"
+
+msgid "No Machines Found!"
+msgstr "Inga maskiner hittades!"
+
+msgid "Check for updates on startup"
+msgstr "Sök efter uppdateringar vid start"
+
+msgid "Unable to determine release information"
+msgstr "Kunde inte bestämma information för släpp"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Ett fel uppstod vid sökning av uppdateringar:\n\n%1\n\nFörsök igen senare."
+
+msgid "Update check complete"
+msgstr "Uppdateringskontroll klar"
+
+msgid "stable"
+msgstr "stable"
+
+msgid "beta"
+msgstr "beta"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Du kör den senaste %1 versionen av 86Box: %2"
+
+msgid "version"
+msgstr "version"
+
+msgid "build"
+msgstr "build"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Du kör just ny version <b>%1</b>."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "<b>Version %1</b> finns nu tillgänglig."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Du kör just nu build <b>%1</b>."
+
+msgid "<b>Build %1</b> is now available."
+msgstr "<b>Build %1</b> finns nu tillgänglig."
+
+msgid "Would you like to visit the download page?"
+msgstr "Vill du besöka nedladdningssidan?"
+
+msgid "Visit download page"
+msgstr "Besök nedladdningssida"
+
+msgid "Update check"
+msgstr "Leta efter uppdateringar"
+
+msgid "Checking for updates..."
+msgstr "Letar efter uppdateringar..."
+
+msgid "86Box Update"
+msgstr "86Box-uppdatering"
+
+msgid "Release notes:"
+msgstr "Information om släpp:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "Virtuell maskin-krasch"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "Den virtuella maskinen \"%1\"s process har avslutats oväntad med kod %2."
+
+msgid "The system will not be added."
+msgstr "Systemet kommer inte att läggas till."
+
+msgid "&Update mouse every CPU frame"
+msgstr "&Uppdatera mus varje processorram"
+
+msgid "Hue"
+msgstr "Färgton"
+
+msgid "Saturation"
+msgstr "Mättnad"
+
+msgid "Contrast"
+msgstr "Kontrast"
+
+msgid "Brightness"
+msgstr "Ljusstyrka"
+
+msgid "Sharpness"
+msgstr "Skärpa"
+
+msgid "&CGA composite settings..."
+msgstr "Inställningar för &CGA-kompositläget..."
+
+msgid "CGA composite settings"
+msgstr "Inställningar för CGA-kompositläget"
+
+msgid "Monitor EDID"
+msgstr "EDID för bildskärm"
+
+msgid "Export..."
+msgstr "Exportera..."
+
+msgid "Export EDID"
+msgstr "Exportera EDID"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "EDID-filen \"%ls\" är för stor."
+
+msgid "OpenGL input scale"
+msgstr "Inmatningsskala för OpenGL"
+
+msgid "OpenGL input stretch mode"
+msgstr "Inmatningssträckningsläge för OpenGL"
+
+msgid "Color scheme"
+msgstr "Färgschema"
+
+msgid "Light"
+msgstr "Ljus"
+
+msgid "Dark"
+msgstr "Mörk"
diff --git a/src/qt/languages/tr-TR.po b/src/qt/languages/tr-TR.po
index 65a039c42..538cc7af6 100644
--- a/src/qt/languages/tr-TR.po
+++ b/src/qt/languages/tr-TR.po
@@ -1,5 +1,13 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: tr_TR\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
-msgstr "&Komutlar"
+msgstr "&Eylem"
 
 msgid "&Keyboard requires capture"
 msgstr "&Klavye sadece fare yakalandığında çalışsın"
@@ -8,61 +16,61 @@ msgid "&Right CTRL is left ALT"
 msgstr "&Sağ CTRL tuşunu sol ALT tuşu olarak ayarla"
 
 msgid "&Hard Reset..."
-msgstr "&Makineyi yeniden başlat..."
+msgstr "Yeniden başlamaya &zorla..."
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Ctrl+Alt+Del\tCtrl+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "&Ctrl+Alt+Del"
 
 msgid "Ctrl+Alt+&Esc"
-msgstr "Ctrl+Alt+&Esc"
+msgstr "Ctrl+&Alt+Esc"
 
 msgid "&Pause"
 msgstr "&Duraklat"
 
-msgid "E&xit..."
-msgstr "Emülatörden &çık..."
+msgid "Pause"
+msgstr "Duraklat"
+
+msgid "Re&sume"
+msgstr "Dev&am et"
+
+msgid "E&xit"
+msgstr "&Çıkış yap"
 
 msgid "&View"
-msgstr "&Görüntüleme"
+msgstr "&Görünüm"
 
 msgid "&Hide status bar"
 msgstr "&Durum çubuğunu gizle"
 
 msgid "Hide &toolbar"
-msgstr "Hide &toolbar"
+msgstr "Araç &çubuğunu gizle"
 
 msgid "&Resizeable window"
-msgstr "&Yeniden boyutlandırılabilir pencere"
+msgstr "&Boyutlandırılabilir pencere"
 
 msgid "R&emember size && position"
-msgstr "&Pencere boyut ve pozisyonunu hatırla"
+msgstr "&Pencere boyut ve pozisyonunu kaydet"
 
 msgid "Re&nderer"
-msgstr "&İşleyici"
+msgstr "Derley&ici"
 
-msgid "&SDL (Software)"
-msgstr "&SDL (Yazılım)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (&Donanım)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
+msgid "&Qt (Software)"
+msgstr "&Qt (Yazılım bazlı)"
 
 msgid "Open&GL (3.0 Core)"
-msgstr "Open&GL (3.0 Core)"
+msgstr "OpenG&L (Sürüm 3.0)"
 
 msgid "&VNC"
 msgstr "&VNC"
 
-msgid "Specify dimensions..."
+msgid "Specify &dimensions..."
 msgstr "Pencere &boyutunu belirle..."
 
-msgid "F&orce 4:3 display ratio"
-msgstr "&4:3 görüntüleme oranına zorla"
+msgid "Force &4:3 display ratio"
+msgstr "&4:3 görüntü oranına zorla"
 
 msgid "&Window scale factor"
-msgstr "Pencere &ölçek çarpanı"
+msgstr "Pencere &boyutu ölçeği"
 
 msgid "&0.5x"
 msgstr "&0.5x"
@@ -94,65 +102,71 @@ msgstr "&7x"
 msgid "&8x"
 msgstr "&8x"
 
-msgid "Filter method"
-msgstr "&Filtre metodu"
+msgid "Fi&lter method"
+msgstr "&Filtreleme yöntemi"
 
 msgid "&Nearest"
-msgstr "&Nearest (En yakın)"
+msgstr "&En yakın"
 
 msgid "&Linear"
-msgstr "&Linear (Doğrusal)"
+msgstr "Doğ&rusal"
 
 msgid "Hi&DPI scaling"
-msgstr "Hi&DPI ölçeklemesi"
+msgstr "HiDPI boyutlandır&ması"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "&Tam ekran\tCtrl+Alt+PgUp"
+msgid "&Fullscreen"
+msgstr "Tam ekran"
 
 msgid "Fullscreen &stretch mode"
-msgstr "Tam ekran &germe modu"
+msgstr "Tam e&kran germe modu"
 
 msgid "&Full screen stretch"
-msgstr "&Tam ekrana ger"
+msgstr "Ekranın &tamamına ger"
 
 msgid "&4:3"
 msgstr "&4:3"
 
 msgid "&Square pixels (Keep ratio)"
-msgstr "&Kare piksel (ölçeği koru)"
+msgstr "&Kare piksel (ölçeği değiştirme)"
 
 msgid "&Integer scale"
 msgstr "Tam &sayı ölçeklemesi"
 
 msgid "4:&3 Integer scale"
-msgstr "4:&3 Tam sayı ölçeklemesi"
+msgstr "Tam sayı ölçeklemesi (4:&3)"
 
-msgid "E&GA/(S)VGA settings"
+msgid "EGA/(S)&VGA settings"
 msgstr "EGA/&(S)VGA ayarları"
 
 msgid "&Inverted VGA monitor"
-msgstr "Ters &renk VGA monitör"
+msgstr "Ters &renkli VGA monitör"
 
 msgid "VGA screen &type"
 msgstr "VGA ekran &tipi"
 
 msgid "RGB &Color"
-msgstr "RGB (&renkli)"
+msgstr "RGB (&Çok renkli)"
+
+msgid "RGB (no brown)"
+msgstr "RGB (kahverengi yok)"
 
 msgid "&RGB Grayscale"
-msgstr "RGB (&gri tonlama)"
+msgstr "RGB (&Gri tonlu)"
+
+msgid "Generic RGBI color monitor"
+msgstr "Genel RGBI renkli monitör"
 
 msgid "&Amber monitor"
-msgstr "&Kehribar rengi monitör"
+msgstr "&Kehribar monitör"
 
 msgid "&Green monitor"
-msgstr "&Yeşil renk monitör"
+msgstr "&Yeşil monitör"
 
 msgid "&White monitor"
-msgstr "&Beyaz renk monitör"
+msgstr "&Beyaz monitör"
 
 msgid "Grayscale &conversion type"
-msgstr "&Gri tonlama dönüştürme tipi"
+msgstr "&Gri tonlu dönüşüm türü"
 
 msgid "BT&601 (NTSC/PAL)"
 msgstr "BT&601 (NTSC/PAL)"
@@ -167,10 +181,10 @@ msgid "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
 msgstr "CGA/PCjr/Tandy/E&GA/(S)VGA aşırı taraması"
 
 msgid "Change contrast for &monochrome display"
-msgstr "Gri to&nlamalı görüntü için kontrastı değiştir"
+msgstr "Gri to&nlu görüntü için kontrastı değiştir"
 
 msgid "&Media"
-msgstr "&Medya"
+msgstr "&Ortam"
 
 msgid "&Tools"
 msgstr "&Araçlar"
@@ -178,11 +192,17 @@ msgstr "&Araçlar"
 msgid "&Settings..."
 msgstr "&Ayarlar..."
 
-msgid "&Update status bar icons"
-msgstr "Durum &çubuğu ikonlarını güncelle"
+msgid "Settings..."
+msgstr "Ayarlar..."
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "&Ekran görüntüsü al\tCtrl+F11"
+msgid "&Update status bar icons"
+msgstr "Durum &çubuğu simgelerini güncelle"
+
+msgid "Take s&creenshot"
+msgstr "&Ekran görüntüsü al"
+
+msgid "S&ound"
+msgstr "&Ses"
 
 msgid "&Preferences..."
 msgstr "&Tercihler..."
@@ -191,31 +211,31 @@ msgid "Enable &Discord integration"
 msgstr "&Discord entegrasyonunu etkinleştir"
 
 msgid "Sound &gain..."
-msgstr "&Ses yükseltici..."
+msgstr "&Sesi artır..."
 
-msgid "Begin trace\tCtrl+T"
-msgstr "Begin trace\tCtrl+T"
+msgid "Begin trace"
+msgstr "İzlemeyi başlat"
 
-msgid "End trace\tCtrl+T"
-msgstr "End trace\tCtrl+T"
+msgid "End trace"
+msgstr "İzlemeyi bitir"
 
 msgid "&Help"
 msgstr "&Yardım"
 
 msgid "&Documentation..."
-msgstr "&Dökümanlar..."
+msgstr "&Belgeler..."
 
 msgid "&About 86Box..."
-msgstr "&86Box Hakkında..."
+msgstr "&86Box hakkında..."
 
 msgid "&New image..."
-msgstr "&Yeni imaj oluştur..."
+msgstr "&Yeni görüntü oluştur..."
 
 msgid "&Existing image..."
-msgstr "&İmaj seç..."
+msgstr "&Görüntü seç..."
 
 msgid "Existing image (&Write-protected)..."
-msgstr "İmaj &seç (Yazma-korumalı)..."
+msgstr "Görüntü &seç (Yazma korumalı)..."
 
 msgid "&Record"
 msgstr "&Kaydet"
@@ -224,34 +244,34 @@ msgid "&Play"
 msgstr "&Oynat"
 
 msgid "&Rewind to the beginning"
-msgstr "&Başlangıca geri sar"
+msgstr "&Başa geri sar"
 
 msgid "&Fast forward to the end"
-msgstr "Sona doğru &ileri sar"
+msgstr "Sona &doğru sar"
 
 msgid "E&ject"
 msgstr "&Çıkar"
 
 msgid "&Image..."
-msgstr "&İmaj..."
+msgstr "&Görüntü seç..."
 
 msgid "E&xport to 86F..."
-msgstr "&86F dosyası olarak aktar..."
+msgstr "&86F olarak kaydet..."
 
 msgid "&Mute"
-msgstr "&Sesi kapat"
+msgstr "&Sessize al"
 
 msgid "E&mpty"
-msgstr "İmajı &çıkar"
+msgstr "Görüntüyü &çıkar"
 
-msgid "&Reload previous image"
-msgstr "&Önceki imajı seç"
+msgid "Reload previous image"
+msgstr "Önceki görüntüyü yeniden seç"
 
 msgid "&Folder..."
-msgstr "&Klasör..."
+msgstr "&Klasör seç..."
 
 msgid "Target &framerate"
-msgstr "Hedef &kare oranı"
+msgstr "Hedef &kare hızı oranı"
 
 msgid "&Sync with video"
 msgstr "Video ile &senkronize et"
@@ -284,10 +304,10 @@ msgid "Preferences"
 msgstr "Tercihler"
 
 msgid "Sound Gain"
-msgstr "Ses Artırma"
+msgstr "Ses Artışı"
 
 msgid "New Image"
-msgstr "Yeni İmaj"
+msgstr "Yeni görüntü"
 
 msgid "Settings"
 msgstr "Ayarlar"
@@ -301,20 +321,14 @@ msgstr "Tamam"
 msgid "Cancel"
 msgstr "İptal et"
 
-msgid "Save these settings as &global defaults"
-msgstr "Bu ayarları &varsayılan olarak kaydet"
-
 msgid "&Default"
 msgstr "&Varsayılan"
 
 msgid "Language:"
 msgstr "Dil:"
 
-msgid "Icon set:"
-msgstr "Simge seti:"
-
 msgid "Gain"
-msgstr "Artırma"
+msgstr "Artış düzeyi"
 
 msgid "File name:"
 msgstr "Dosya adı:"
@@ -338,22 +352,25 @@ msgid "Lock to this size"
 msgstr "Bu boyuta kilitle"
 
 msgid "Machine type:"
-msgstr "Makine türü:"
+msgstr "Anakart türü:"
 
 msgid "Machine:"
-msgstr "Makine:"
+msgstr "Anakart:"
 
 msgid "Configure"
 msgstr "Ayarla"
 
+msgid "CPU:"
+msgstr "İşlemci:"
+
 msgid "CPU type:"
-msgstr "CPU türü:"
+msgstr "İşlemci türü:"
 
 msgid "Speed:"
 msgstr "Hız:"
 
 msgid "Frequency:"
-msgstr "Sıklık:"
+msgstr "Saat hızı:"
 
 msgid "FPU:"
 msgstr "FPU:"
@@ -365,7 +382,7 @@ msgid "MB"
 msgstr "MB"
 
 msgid "Memory:"
-msgstr "Bellek:"
+msgstr "Bellek (RAM):"
 
 msgid "Time synchronization"
 msgstr "Zaman senkronizasyonu"
@@ -382,11 +399,23 @@ msgstr "Etkin (UTC)"
 msgid "Dynamic Recompiler"
 msgstr "Dinamik Derleyici"
 
+msgid "CPU frame size"
+msgstr "İşlemci kare boyutu"
+
+msgid "Larger frames (less smooth)"
+msgstr "Daha büyük kareler (daha az akıcı)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Daha küçük kareler (daha akıcı)"
+
 msgid "Video:"
 msgstr "Ekran kartı:"
 
-msgid "Voodoo Graphics"
-msgstr "Voodoo Grafikleri"
+msgid "Video #2:"
+msgstr "İkincil ekran kartı:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Voodoo 1 veya 2 Grafikleri"
 
 msgid "IBM 8514/A Graphics"
 msgstr "IBM 8514/A Grafikleri"
@@ -394,35 +423,50 @@ msgstr "IBM 8514/A Grafikleri"
 msgid "XGA Graphics"
 msgstr "XGA Grafikleri"
 
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "IBM PS/55 Display Adapter Grafikleri"
+
+msgid "Keyboard:"
+msgstr "Klavye:"
+
+msgid "Keyboard"
+msgstr "Klavye"
+
 msgid "Mouse:"
 msgstr "Fare:"
 
+msgid "Mouse"
+msgstr "Fare"
+
 msgid "Joystick:"
-msgstr "Oyun kolu:"
+msgstr "Oyun Kolu:"
+
+msgid "Joystick"
+msgstr "Oyun Kolu"
 
 msgid "Joystick 1..."
-msgstr "Oyun kolu 1..."
+msgstr "1. Oyun Kolu..."
 
 msgid "Joystick 2..."
-msgstr "Oyun kolu 2..."
+msgstr "2. Oyun Kolu..."
 
 msgid "Joystick 3..."
-msgstr "Oyun kolu 3..."
+msgstr "3. Oyun Kolu..."
 
 msgid "Joystick 4..."
-msgstr "Oyun kolu 4..."
+msgstr "4. Oyun Kolu..."
 
 msgid "Sound card #1:"
-msgstr "Ses kartı 1:"
+msgstr "1. Ses Kartı:"
 
 msgid "Sound card #2:"
-msgstr "Ses kartı 2:"
+msgstr "2. Ses Kartı:"
 
 msgid "Sound card #3:"
-msgstr "Ses kartı 3:"
+msgstr "3. Ses Kartı:"
 
 msgid "Sound card #4:"
-msgstr "Ses kartı 4:"
+msgstr "4. Ses Kartı:"
 
 msgid "MIDI Out Device:"
 msgstr "MIDI Çıkış Cihazı:"
@@ -430,30 +474,24 @@ msgstr "MIDI Çıkış Cihazı:"
 msgid "MIDI In Device:"
 msgstr "MIDI Giriş Cihazı:"
 
+msgid "MIDI Out:"
+msgstr "MIDI Çıkış:"
+
 msgid "Standalone MPU-401"
 msgstr "Bağımsız MPU-401"
 
 msgid "Use FLOAT32 sound"
-msgstr "FLOAT32 ses kullan"
+msgstr "FLOAT32 sesi kullan"
 
 msgid "FM synth driver"
 msgstr "FM sentez sürücüsü"
 
 msgid "Nuked (more accurate)"
-msgstr "Nuked (daha doğru)"
+msgstr "Nuked (daha hassas)"
 
 msgid "YMFM (faster)"
 msgstr "YMFM (daha hızlı)"
 
-msgid "Network type:"
-msgstr "Ağ tipi:"
-
-msgid "PCap device:"
-msgstr "PCap cihazı:"
-
-msgid "Network adapter:"
-msgstr "Ağ cihazı:"
-
 msgid "COM1 Device:"
 msgstr "COM1 Cihazı:"
 
@@ -478,68 +516,77 @@ msgstr "LPT3 Cihazı:"
 msgid "LPT4 Device:"
 msgstr "LPT4 Cihazı:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr "Dahili LPT ECP DMA'sı:"
+
 msgid "Serial port 1"
-msgstr "Seri port 1"
+msgstr "1. Seri bağlantı noktası"
 
 msgid "Serial port 2"
-msgstr "Seri port 2"
+msgstr "2. Seri bağlantı noktası"
 
 msgid "Serial port 3"
-msgstr "Seri port 3"
+msgstr "3. Seri bağlantı noktası"
 
 msgid "Serial port 4"
-msgstr "Seri port 4"
+msgstr "4. Seri bağlantı noktası"
 
 msgid "Parallel port 1"
-msgstr "Paralel port 1"
+msgstr "1. Paralel bağlantı noktası"
 
 msgid "Parallel port 2"
-msgstr "Paralel port 2"
+msgstr "2. Paralel bağlantı noktası"
 
 msgid "Parallel port 3"
-msgstr "Paralel port 3"
+msgstr "3. Paralel bağlantı noktası"
 
 msgid "Parallel port 4"
-msgstr "Paralel port 4"
-
-msgid "HD Controller:"
-msgstr "HD Kontrolcüsü:"
+msgstr "4. Paralel bağlantı noktası"
 
 msgid "FD Controller:"
-msgstr "FD Kontrolcüsü:"
+msgstr "Disket Denetleyicisi:"
+
+msgid "CD-ROM Controller:"
+msgstr "CD-ROM Denetleyicisi:"
 
 msgid "Tertiary IDE Controller"
-msgstr "Üçlü IDE Kontrolcüsü"
+msgstr "Üçüncül IDE Denetleyicisi"
 
 msgid "Quaternary IDE Controller"
-msgstr "Dörtlü IDE Kontrolcüsü"
+msgstr "Dördüncül IDE Denetleyicisi"
+
+msgid "Hard disk"
+msgstr "Sabit disk"
 
 msgid "SCSI"
 msgstr "SCSI"
 
 msgid "Controller 1:"
-msgstr "Kontrolcü 1:"
+msgstr "1. Denetleyici:"
 
 msgid "Controller 2:"
-msgstr "Kontrolcü 2:"
+msgstr "2. Denetleyici:"
 
 msgid "Controller 3:"
-msgstr "Kontrolcü 3:"
+msgstr "3. Denetleyici:"
 
 msgid "Controller 4:"
-msgstr "Kontrolcü 4:"
+msgstr "4. Denetleyici:"
 
 msgid "Cassette"
 msgstr "Kaset"
 
 msgid "Hard disks:"
-msgstr "Hard diskler:"
+msgstr "Sabit diskler:"
+
+msgid "Firmware Version"
+msgstr "Bellenim Sürümü"
 
 msgid "&New..."
-msgstr "&Yeni..."
+msgstr "&Yeni görüntü oluştur"
 
 msgid "&Existing..."
-msgstr "&Var olan..."
+msgstr "&Görüntü dosyası seç"
 
 msgid "&Remove"
 msgstr "&Kaldır"
@@ -560,7 +607,7 @@ msgid "Sectors:"
 msgstr "Sektörler:"
 
 msgid "Heads:"
-msgstr "Veri Kafaları:"
+msgstr "Veri kafaları:"
 
 msgid "Cylinders:"
 msgstr "Silindirler:"
@@ -569,19 +616,19 @@ msgid "Size (MB):"
 msgstr "Boyut (MB):"
 
 msgid "Type:"
-msgstr "Tip:"
+msgstr "Tür:"
 
 msgid "Image Format:"
-msgstr "İmaj Düzeni:"
+msgstr "Görüntü Biçimi:"
 
 msgid "Block Size:"
-msgstr "Blok Boyutu:"
+msgstr "Blok boyutu:"
 
 msgid "Floppy drives:"
 msgstr "Disket sürücüleri:"
 
 msgid "Turbo timings"
-msgstr "Turbo zamanlamaları"
+msgstr "Turbo zamanlaması"
 
 msgid "Check BPB"
 msgstr "BPB'yi denetle"
@@ -589,14 +636,17 @@ msgstr "BPB'yi denetle"
 msgid "CD-ROM drives:"
 msgstr "CD-ROM sürücüleri:"
 
-msgid "Earlier drive"
-msgstr "Daha erken sürüş"
-
 msgid "MO drives:"
 msgstr "MO sürücüleri:"
 
-msgid "ZIP drives:"
-msgstr "ZIP sürücüleri:"
+msgid "MO:"
+msgstr "MO:"
+
+msgid "Removable disks:"
+msgstr "Çıkarılabilir diskler:"
+
+msgid "Removable disk drives:"
+msgstr "Çıkarılabilir disk sürücüleri:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
@@ -605,7 +655,10 @@ msgid "ISA RTC:"
 msgstr "ISA RTC:"
 
 msgid "ISA Memory Expansion"
-msgstr "ISA Bellek Artırma"
+msgstr "ISA Bellek Artırıcı"
+
+msgid "ISA ROM Cards"
+msgstr "ISA ROM Kartları"
 
 msgid "Card 1:"
 msgstr "Kart 1:"
@@ -619,18 +672,21 @@ msgstr "Kart 3:"
 msgid "Card 4:"
 msgstr "Kart 4:"
 
+msgid "Generic ISA ROM Board"
+msgstr "Genel ISA ROM Kartı"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "Genel Çift ISA ROM Kartı"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "Genel Dörtlü ISA ROM Kartı"
+
 msgid "ISABugger device"
 msgstr "ISABugger cihazı"
 
 msgid "POST card"
 msgstr "POST kartı"
 
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
-
 msgid "86Box"
 msgstr "86Box"
 
@@ -641,28 +697,31 @@ msgid "Fatal error"
 msgstr "Kritik hata"
 
 msgid " - PAUSED"
-msgstr " - PAUSED"
-
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Pencere moduna geri dönmek için Ctrl+Alt+PgDn tuşlarına basın."
+msgstr " - DURAKLATILDI"
 
 msgid "Speed"
 msgstr "Hız"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "Çıkarılabilir disk %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "ZIP imajları"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "&Çıkarılabilir disk %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Çıkarılabilir disk görüntüleri"
+
+msgid "Image %1"
+msgstr "Görüntü %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
-msgstr "86Box hiç bir kullanılabilir ROM imajı bulamadı.\n\nLütfen <a href=\"https://github.com/86Box/roms/releases/latest\">ROM setini indirin</a> ve onu \"Roms\" klasörüne çıkarın."
+msgstr "86Box kullanılabilir hiçbir ROM dosyası bulamadı.\n\nLütfen bir ROM seti <a href=\"https://github.com/86Box/roms/releases/latest\">indirip</a> \"roms\" klasörüne çıkarın."
 
 msgid "(empty)"
-msgstr "(empty)"
+msgstr "(boş)"
 
 msgid "All files"
-msgstr "All files"
+msgstr "Tüm dosyalar"
 
 msgid "Turbo"
 msgstr "Turbo"
@@ -674,28 +733,34 @@ msgid "Off"
 msgstr "Kapalı"
 
 msgid "All images"
-msgstr "Tüm imajlar"
+msgstr "Tüm görüntüler"
 
 msgid "Basic sector images"
-msgstr "Basit sektör imajları"
+msgstr "Basit sektör görüntüleri"
 
 msgid "Surface images"
-msgstr "Yüzey imajları"
+msgstr "Yüzey görüntüleri"
 
 msgid "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
-msgstr "\"%hs\" makinesi roms/machines klasöründe mevcut olmayan ROM imajı yüzünden mevcut değil. Mevcut olan bir makineye geçiş yapılıyor."
+msgstr "\"%hs\" anakartı roms/machines klasöründe gerekli ROM dosyalarının mevcut olmaması nedeniyle kullanılamıyor. Kullanılabilen başka bir anakarta geçiş yapılacaktır."
 
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
-msgstr "\"%hs\" ekran kartı roms/video klasöründe mevcut olmayan ROM imajı yüzünden mevcut değil. Mevcut olan bir ekran kartına geçiş yapılıyor."
+msgstr "\"%hs\" ekran kartı roms/video klasöründe gerekli ROM dosyalarının mevcut olmaması nedeniyle kullanılamıyor. Kullanılabilen başka bir ekran kartına geçiş yapılacaktır."
+
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "\"%hs\" ikincil ekran kartı roms/video klasöründe gerekli ROM dosyalarının mevcut olmaması nedeniyle kullanılamıyor. Bu cihaz devre dışı bırakılacaktır."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "\"%hs\" cihazı gerekli ROM dosyalarının mevcut olmaması nedeniyle kullanılamıyor. Bu cihaz yok sayılacaktır."
 
 msgid "Machine"
-msgstr "Makine"
+msgstr "Anakart"
 
 msgid "Display"
 msgstr "Görüntü"
 
 msgid "Input devices"
-msgstr "Giriş aygıtları"
+msgstr "Giriş cihazları"
 
 msgid "Sound"
 msgstr "Ses"
@@ -704,13 +769,31 @@ msgid "Network"
 msgstr "Ağ"
 
 msgid "Ports (COM & LPT)"
-msgstr "Portlar (COM & LPT)"
+msgstr "Bağlantı noktaları (COM & LPT)"
+
+msgid "Ports"
+msgstr "Bağlantı noktaları"
+
+msgid "Serial ports:"
+msgstr "Seri bağlantı noktaları:"
+
+msgid "Parallel ports:"
+msgstr "Paralel bağlantı noktaları:"
 
 msgid "Storage controllers"
-msgstr "Depolama kontrolcüleri"
+msgstr "Depolama denetleyicileri"
 
 msgid "Hard disks"
-msgstr "Hard diskler"
+msgstr "Sabit diskler"
+
+msgid "Disks:"
+msgstr "Diskler:"
+
+msgid "Floppy:"
+msgstr "Disket:"
+
+msgid "Controllers:"
+msgstr "Denetleyiciler:"
 
 msgid "Floppy & CD-ROM drives"
 msgstr "Disket & CD-ROM sürücüleri"
@@ -719,16 +802,19 @@ msgid "Other removable devices"
 msgstr "Diğer kaldırılabilir cihazlar"
 
 msgid "Other peripherals"
+msgstr "Diğer çevre birimleri"
+
+msgid "Other devices"
 msgstr "Diğer cihazlar"
 
 msgid "Click to capture mouse"
 msgstr "Farenin yakalanması için tıklayın"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "Farenin bırakılması için F8+F12 tuşlarına basın"
+msgid "Press %1 to release mouse"
+msgstr "Farenin bırakılması için %1 tuşlarına basın"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Farenin bırakılması için F8+F12 veya farenin orta tuşuna basın"
+msgid "Press %1 or middle button to release mouse"
+msgstr "Farenin bırakılması için %1 veya tekerlek tuşuna basın"
 
 msgid "Bus"
 msgstr "Veri yolu"
@@ -748,77 +834,98 @@ msgstr "S"
 msgid "KB"
 msgstr "KB"
 
-msgid "Could not initialize the video renderer."
-msgstr "Video işleyici başlatılamadı."
-
 msgid "Default"
 msgstr "Varsayılan"
 
-msgid "%i Wait state(s)"
-msgstr "%i Bekleme durumları"
+msgid "%1 Wait state(s)"
+msgstr "%1 Bekleme durumları"
 
 msgid "Type"
 msgstr "Tür"
 
-msgid "Failed to set up PCap"
-msgstr "PCap ayarlanamadı"
-
 msgid "No PCap devices found"
 msgstr "Herhangi bir PCap cihazı bulunamadı"
 
 msgid "Invalid PCap device"
 msgstr "Geçersiz PCap cihazı"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "Standart 2-button oyun kolları"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "2 eksenli, 2 düğmeli oyun kolları"
 
-msgid "Standard 4-button joystick"
-msgstr "Standart 4-button oyun kolu"
+msgid "2-axis, 4-button joystick"
+msgstr "2 eksenli, 4 düğmeli oyun kolu"
 
-msgid "Standard 6-button joystick"
-msgstr "Standart 6-button oyun kolu"
+msgid "2-axis, 6-button joystick"
+msgstr "2 eksenli, 6 düğmeli oyun kolu"
 
-msgid "Standard 8-button joystick"
-msgstr "Standart 8-button oyun kolu"
+msgid "2-axis, 8-button joystick"
+msgstr "2 eksenli, 8 düğmeli oyun kolu"
+
+msgid "3-axis, 2-button joystick"
+msgstr "3 eksenli, 2 düğmeli oyun kollu"
+
+msgid "3-axis, 4-button joystick"
+msgstr "3 eksenli, 4 düğmeli oyun kolu"
+
+msgid "4-axis, 4-button joystick"
+msgstr "4 eksenli, 4 düğmeli oyun kolu"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH Pedals"
+
 msgid "Microsoft SideWinder Pad"
 msgstr "Microsoft SideWinder Pad"
 
 msgid "Thrustmaster Flight Control System"
-msgstr "Thrustmaster Flight Kontrol Sistemi"
+msgstr "Thrustmaster Flight Control System"
+
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Rudder Control System"
+
+msgid "2-button gamepad(s)"
+msgstr "2 düğmeli oyun tablası"
+
+msgid "2-button flight yoke"
+msgstr "2 düğmeli uçuş dümeni"
+
+msgid "4-button gamepad"
+msgstr "4 düğmeli oyun tablası"
+
+msgid "4-button flight yoke"
+msgstr "4 düğmeli uçuş dümeni"
+
+msgid "2-button flight yoke with throttle"
+msgstr "2 düğmeli, gaz kollu uçuş dümeni"
+
+msgid "4-button flight yoke with throttle"
+msgstr "4 düğmeli, gaz kollu uçuş dümeni"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Win95 direksiyonu (3 eksenli, 4 düğmeli)"
 
 msgid "None"
 msgstr "Hiçbiri"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "Klavye ivdirgeçleri yüklenemedi."
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CHS: %2, %3, %4)"
 
-msgid "Unable to register raw input."
-msgstr "Ham girdi kaydedilemedi."
+msgid "Floppy %1 (%2): %3"
+msgstr "Disket %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Disket %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "&Disket %1 (%2): %3"
 
 msgid "Advanced sector images"
-msgstr "Gelişmiş sektör imajları"
+msgstr "Gelişmiş sektör görüntüleri"
 
 msgid "Flux images"
-msgstr "Flux images"
-
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "SDL başlatılamadı, SDL2.dll gerekmektedir"
+msgstr "Flux görüntüleri"
 
 msgid "Are you sure you want to hard reset the emulated machine?"
-msgstr "Emüle edilen makineyi yeniden başlatmak istediğinizden emin misiniz?"
+msgstr "Makineyi yeniden başlamaya zorlamak istediğinizden emin misiniz?"
 
 msgid "Are you sure you want to exit 86Box?"
 msgstr "86Box'tan çıkmak istediğinize emin misiniz?"
@@ -826,68 +933,71 @@ msgstr "86Box'tan çıkmak istediğinize emin misiniz?"
 msgid "Unable to initialize Ghostscript"
 msgstr "Ghostscript başlatılamadı"
 
-msgid "MO %i (%ls): %ls"
-msgstr "MO %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "GhostPCL başlatılamadı"
+
+msgid "MO %1 (%2): %3"
+msgstr "MO %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&MO %1 (%2): %3"
 
 msgid "MO images"
-msgstr "MO imajları"
+msgstr "MO görüntüleri"
 
 msgid "Welcome to 86Box!"
 msgstr "86Box'a hoşgeldiniz!"
 
-msgid "Internal controller"
-msgstr "Dahili kontrolcü"
+msgid "Internal device"
+msgstr "Dahili cihaz"
+
+msgid "&File"
+msgstr "&Dosya"
+
+msgid "&New machine..."
+msgstr "&Yeni makine..."
+
+msgid "&Check for updates..."
+msgstr "&Güncelleştirmeleri kontrol et..."
 
 msgid "Exit"
-msgstr "Çıkış"
+msgstr "Çıkış yap"
 
 msgid "No ROMs found"
-msgstr "Hiçbir ROM imajı bulunamadı"
+msgstr "Hiçbir ROM dosyası bulunamadı"
 
 msgid "Do you want to save the settings?"
 msgstr "Ayarları kaydetmek istediğinizden emin misiniz?"
 
 msgid "This will hard reset the emulated machine."
-msgstr "Bu makineyi yeniden başlatacak."
+msgstr "Bu işlem makineyi yeniden başlamaya zorlayacak."
 
 msgid "Save"
 msgstr "Kaydet"
 
 msgid "About 86Box"
-msgstr "86Box Hakkında"
+msgstr "86Box hakkında"
 
 msgid "86Box v"
 msgstr "86Box v"
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "Bir eski bilgisayar emülatörü\n\nYapanlar: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, ve diğerleri.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, ve diğerleri.\n\nGNU Genel Kamu Lisansı versiyon 2 veya sonrası altında yayınlanmıştır. Daha fazla bilgi için LICENSE'ı gözden geçirin."
+msgstr "Bir eski bilgisayar emülatörü\n\nYapımcılar: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne ve diğerleri.\n\nSarah Walker, leilei, JohnElliott, greatpsycho, ve diğerlerinin önceki katkılarıyla birlikte.\n\nGNU Genel Kamu Lisansı versiyon 2 veya sonrası altında yayınlanmıştır. Daha fazla bilgi için LICENSE kısmını gözden geçirin."
 
 msgid "Hardware not available"
-msgstr "Donanım mevcut değil"
+msgstr "Cihaz mevcut değil"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "libpcap kurulu olduğundan ve libpcap-uyumlu bir internet ağında bulunduğunuzdan emin olun."
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "%1 kurulu olduğundan ve %1 uyumlu bir internet ağı kullandığınızdan emin olun."
 
 msgid "Invalid configuration"
-msgstr "Geçersiz konfigürasyon"
+msgstr "Geçersiz yapılandırma"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 PostScript dosyalarının otomatik olarak PDF dosyasına çevirilmesi için gereklidir.\n\nGenel PostScript yazıcısına gönderilen tüm dökümanlar PostScript (.ps) dosyası olarak kaydedilecektir."
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " PostScript dosyalarının otomatik olarak PDF dosyalarına çevirilmesi için gereklidir.\n\nGenel PostScript yazıcısına gönderilen tüm dökümanlar PostScript (.ps) dosyaları olarak kaydedilecektir."
-
-msgid "Entering fullscreen mode"
-msgstr "Tam ekran moduna geçiliyor"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 PCL dosyalarının otomatik olarak PDF dosyasına çevirilmesi için gereklidir.\n\nGenel PCL yazıcısına gönderilen tüm dökümanlar Printer Command Language (.pcl) dosyası olarak kaydedilecektir."
 
 msgid "Don't show this message again"
 msgstr "Bu mesajı bir daha gösterme"
@@ -896,82 +1006,346 @@ msgid "Don't exit"
 msgstr "Çıkış yapma"
 
 msgid "Reset"
-msgstr "Yeniden başlat"
+msgstr "Evet"
 
 msgid "Don't reset"
-msgstr "Yeniden başlatma"
+msgstr "Hayır"
 
 msgid "CD-ROM images"
-msgstr "CD-ROM imajları"
+msgstr "CD-ROM görüntüleri"
 
-msgid "%hs Device Configuration"
-msgstr "%hs Cihaz Konfigürasyonu"
+msgid "%1 Device Configuration"
+msgstr "%1 Cihaz Yapılandırması"
 
 msgid "Monitor in sleep mode"
 msgstr "Monitör uyku modunda"
 
-msgid "OpenGL Shaders"
-msgstr "OpenGL Gölgelendiricileri"
-
-msgid "OpenGL options"
-msgstr "OpenGL ayarları"
+msgid "GLSL shaders"
+msgstr "GLSL gölgelendiricileri"
 
 msgid "You are loading an unsupported configuration"
-msgstr "Desteklenmeyen bir konfigürasyon yüklüyorsunuz"
+msgstr "Desteklenmeyen bir yapılandırma kullanıyorsunuz"
 
 msgid "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
-msgstr "Seçtiğiniz makineye uygun CPU (işlemci) türü filtrelemesi bu emülasyon için devre dışı bırakıldı.\n\nBu, normalde seçilen makine ile uyumlu olmayan bir CPU seçmenizi mümkün kılmaktadır. Ancak, bundan dolayı seçilen makinenin BIOS'u veya diğer yazılımlar ile uyumsuzluk sorunu yaşayabilirsiniz.\n\nBu filtrelemeyi devre dışı bırakmak emülatör tarafından resmi olarak desteklenmemektedir ve açtığınız bug (hata) raporları geçersiz olarak kapatılabilir."
+msgstr "Seçtiğiniz makineyle uygun işlemci filtresi bu yapılandırma için devre dışı bırakıldı.\n\nBu durum seçili makine ile uyumsuz bir işlemci kullanmanızı mümkün kılmaktadır. Ancak bundan dolayı makinenin BIOS'unda veya çalıştırılan diğer yazılımlarda uyumsuzluk sorunları meydana gelebilir.\n\nİşlemci filtresinin devre dışı bırakılması resmi olarak desteklenmemektedir ve bu esnada açtığınız hata raporları geçersiz sayılabilir."
 
 msgid "Continue"
 msgstr "Devam et"
 
-msgid "Cassette: %s"
-msgstr "Kaset: %s"
+msgid "Cassette: %1"
+msgstr "Kaset: %1"
+
+msgid "C&assette: %1"
+msgstr "K&aset: %1"
 
 msgid "Cassette images"
-msgstr "Kaset imajları"
+msgstr "Kaset görüntüleri"
 
-msgid "Cartridge %i: %ls"
-msgstr "Kartuş %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "Kartuş %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "Kar&tuş %1: %2"
 
 msgid "Cartridge images"
-msgstr "Kartuş imajları"
-
-msgid "Error initializing renderer"
-msgstr "Oluşturucu başlatılırken hata oluştu"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "OpenGL (3.0 Core) görüntüleyici başlatılamadı. Başka bir görüntüleyici kullanın."
+msgstr "Kartuş görüntüleri"
 
 msgid "Resume execution"
-msgstr "Yürütmeye devam et"
+msgstr "Çalıştırmayı sürdür"
 
 msgid "Pause execution"
-msgstr "Yürütmeyi duraklat"
+msgstr "Çalıştırmayı duraklat"
 
-msgid "Press Ctrl+Alt+Del"
+msgid "Ctrl+Alt+Del"
 msgstr "Ctrl+Alt+Del"
 
+msgid "Press Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del tuşlarına bas"
+
 msgid "Press Ctrl+Alt+Esc"
-msgstr "Ctrl+Alt+Esc"
+msgstr "Ctrl+Alt+Esc tuşlarına bas"
 
 msgid "Hard reset"
 msgstr "Makineyi yeniden başlat"
 
+msgid "Force shutdown"
+msgstr "Kapatmaya zorla"
+
+msgid "Start"
+msgstr "Başlat"
+
+msgid "Not running"
+msgstr "Çalışmıyor"
+
+msgid "Running"
+msgstr "Çalışıyor"
+
+msgid "Paused"
+msgstr "Duraklatıldı"
+
+msgid "Waiting"
+msgstr "Bekliyor"
+
+msgid "Powered Off"
+msgstr "Kapalı"
+
+msgid "%n running"
+msgstr "Çalışan %n"
+
+msgid "%n paused"
+msgstr "Duraklatılmış %n"
+
+msgid "%n waiting"
+msgstr "Bekleyen %n"
+
+msgid "%1 total"
+msgstr "Toplam %1"
+
+msgid "VMs: %1"
+msgstr "VM sayısı: %1"
+
+msgid "System Directory:"
+msgstr "Sistem Dizini:"
+
+msgid "Choose directory"
+msgstr "Dizin seç:"
+
+msgid "Choose configuration file"
+msgstr "Yapılandırma dosyası seç"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "86Box yapılandırma dosyaları (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Yapılandırma okuması başarısız"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "Seçili yapılandırma dosyası okunmak için açılamıyor: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "Arama kutusunda düzenli ifadeler kullan"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "%1 makine şu anda aktif. Yine de VM yöneticisinden çıkmak istediğinize emin misiniz?"
+
+msgid "Add new system wizard"
+msgstr "Yeni sistem ekleme sihirbazı"
+
+msgid "Introduction"
+msgstr "Giriş"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "Bu sihirbaz 86Box'a yeni bir sistem eklemenizde yardımcı olacaktır."
+
+msgid "New configuration"
+msgstr "Yeni yapılandırma"
+
+msgid "Complete"
+msgstr "Tamamlandı"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "Sihirbaz şimdi yeni sistemin yapılandırmasını başlatacak."
+
+msgid "Use existing configuration"
+msgstr "Var olan yapılandırma kullan"
+
+msgid "Type some notes here"
+msgstr "Buraya not alın"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Var olan yapılandırma dosyasının içeriklerini aşağıdaki kutuya yapıştırınız."
+
+msgid "Load configuration from file"
+msgstr "Dosyadan yapılandırma yükle"
+
+msgid "System name"
+msgstr "Sistem adı"
+
+msgid "System name:"
+msgstr "Sistem adı:"
+
+msgid "System name cannot contain certain characters"
+msgstr "Sistem adı belirli karakterleri içeremez"
+
+msgid "System name already exists"
+msgstr "Sistem adı zaten var"
+
+msgid "Please enter a directory for the system"
+msgstr "Lütfen sistem için bir dizin girin"
+
+msgid "Directory does not exist"
+msgstr "Dizin yok"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "Sistem için yeni bir dizin yukarıda seçili dizinde oluşturulacak"
+
+msgid "System location:"
+msgstr "Sistem yeri:"
+
+msgid "System name and location"
+msgstr "Sistem adı ve yeri:"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Sistemin adını girin ve yerini seçin"
+
+msgid "Enter the name of the system"
+msgstr "Sistemin adını girin"
+
+msgid "Please enter a system name"
+msgstr "Lütfen bir sistem adı girin"
+
+msgid "Display name (optional):"
+msgstr "Görüntü adı (isteğe bağlı)"
+
+msgid "Display name:"
+msgstr "Görüntü adı:"
+
+msgid "Set display name"
+msgstr "Görüntü adını ayarla"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Yeni görünü adını girin (sıfırlamak için boş bırakın)"
+
+msgid "Change &display name..."
+msgstr "Görüntü adını &değiştirin"
+
+msgid "Context Menu"
+msgstr "Bağlam Menüsü"
+
+msgid "&Open folder..."
+msgstr "Klas&örü aç..."
+
+msgid "Open p&rinter tray..."
+msgstr "Yazıcı te&psisini aç..."
+
+msgid "Set &icon..."
+msgstr "S&imge seç..."
+
+msgid "Select an icon"
+msgstr "Bir simge seç"
+
+msgid "C&lone..."
+msgstr "K&lonla..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "Sanal makine \"%1\" (%2) şuraya klonlanacaktır:"
+
+msgid "Directory %1 already exists"
+msgstr "Dizin &1 zaten var"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "İsimde şu karakterleri kullanamazsınız: %1"
+
+msgid "Clone"
+msgstr "Klonla"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Klonlanmış VM için dizin oluşturulamadı"
+
+msgid "Failed to clone VM."
+msgstr "VM klonlanamadı"
+
+msgid "Directory in use"
+msgstr "Dizin kullanımda"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "Seçili dizin zaten kullanımda. Lütfen farklı bir dizin seçiniz."
+
+msgid "Create directory failed"
+msgstr "Dizin oluşturulamadı"
+
+msgid "Unable to create the directory for the new system"
+msgstr "Yeni sistem için dizin oluşturulamadı"
+
+msgid "Configuration write failed"
+msgstr "Yapılandırmaya yazma başarısız"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "Yapılandırma dosyası %1 yazma için açılamıyor"
+
+msgid "Error adding system"
+msgstr "Sistem eklenirken hata oluştu"
+
+msgid "Remove directory failed"
+msgstr "Dizin kaldırılamadı"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "Makinenin dizinindeki bazı dosyalar silinemedi. Lütfen bu dosyaları elle siliniz."
+
+msgid "Build"
+msgstr "Yapı"
+
+msgid "Version"
+msgstr "Sürüm"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "86Box için bir güncelleme bulunmakta: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "Güncellemeler kontrol edilirken bir hata oluştu: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>86Box için bir güncelleme mevcut!</b>"
+
+msgid "Warning"
+msgstr "Uyarı"
+
+msgid "&Kill"
+msgstr "Durmaya &zorla"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "Bir sanal makineyi durmaya zorlamak veri kaybına yol açabilir. Bunu sadece 86Box işlemi takılı kalırsa uygulayın.\n\nGerçekten \"%1\" adlı sanal makineyi durmaya zorlamak istiyor musunuz?"
+
+msgid "&Delete"
+msgstr "&Sil"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "Gerçekten \"%1\" adlı sanal makineyi tüm dosyalarıyla birlikte silmek istiyor musunuz? Bu eylem geri alınamaz!"
+
+msgid "Show &config file"
+msgstr "Yap&ılandırma dosyasını göster"
+
+msgid "No screenshot"
+msgstr "Ekran görüntüsü yok"
+
+msgid "Search"
+msgstr "Ara"
+
+msgid "Searching for VMs..."
+msgstr "VM'ler aranıyor..."
+
+msgid "Found %1"
+msgstr "%1 bulundu"
+
+msgid "System"
+msgstr "Sistem"
+
+msgid "Storage"
+msgstr "Depolama"
+
+msgid "Disk %1: "
+msgstr "Disk %1: "
+
+msgid "No disks"
+msgstr "Disk yok"
+
+msgid "Audio"
+msgstr "Ses"
+
+msgid "Audio:"
+msgstr "Ses:"
+
 msgid "ACPI shutdown"
-msgstr "ACPI kapatma"
+msgstr "Makineyi ACPI kullanarak kapat"
 
-msgid "Hard disk (%s)"
-msgstr "Hard disk (%s)"
+msgid "ACP&I shutdown"
+msgstr "Makineyi ACP&I kullanarak kapat"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "Sabit disk (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
-msgstr "MFM/RLL veya ESDI CD-ROM sürücüleri hiçbir zaman var olmamıştır"
+msgstr "MFM/RLL veya ESDI CD-ROM sürücüleri hiçbir zaman kullanılmamıştır"
 
 msgid "Custom..."
 msgstr "Diğer..."
@@ -980,19 +1354,19 @@ msgid "Custom (large)..."
 msgstr "Diğer (büyük)..."
 
 msgid "Add New Hard Disk"
-msgstr "Yeni Hard Disk Dosyası Oluştur"
+msgstr "Yeni Sabit Disk Görüntüsü Oluştur"
 
 msgid "Add Existing Hard Disk"
-msgstr "Var Olan Hard Disk Dosyası Ekle"
+msgstr "Var Olan Sabit Disk Görüntüsü Ekleme"
 
 msgid "HDI disk images cannot be larger than 4 GB."
-msgstr "HDI disk imajları 4 GB'tan daha büyük olamaz."
+msgstr "HDI görüntüleri 4 GB boyutundan daha büyük olamaz."
 
 msgid "Disk images cannot be larger than 127 GB."
-msgstr "Disk imajları 127 GB'tan daha büyük olamaz."
+msgstr "Disk görüntüleri 127 GB boyutundan daha büyük olamaz."
 
 msgid "Hard disk images"
-msgstr "Hard disk imajları"
+msgstr "Sabit disk görüntüleri"
 
 msgid "Unable to read file"
 msgstr "Dosya okunamıyor"
@@ -1001,37 +1375,34 @@ msgid "Unable to write file"
 msgstr "Dosyanın üzerine yazılamıyor"
 
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
-msgstr "512 dışında sektör boyutu olan HDI veya HDX imajları desteklenmemektedir."
-
-msgid "USB is not yet supported"
-msgstr "USB şu anda desteklenmemektedir"
+msgstr "512 dışında sektör boyutu olan HDI ve HDX görüntüleri desteklenmemektedir."
 
 msgid "Disk image file already exists"
-msgstr "Disk imaj dosyası zaten var olmakta"
+msgstr "Bu görüntü dosyası zaten mevcuttur"
 
 msgid "Please specify a valid file name."
 msgstr "Lütfen geçerli bir dosya ismi belirleyin."
 
 msgid "Disk image created"
-msgstr "Disk imajı oluşturuldu"
+msgstr "Disk görüntüsü oluşturuldu"
 
 msgid "Make sure the file exists and is readable."
 msgstr "Dosyanın var olduğuna ve okunabildiğine emin olun."
 
 msgid "Make sure the file is being saved to a writable directory."
-msgstr "Dosyanın yazılabilir bir klasöre kaydedildiğinden emin olun."
+msgstr "Dosyanın erişilebilir bir klasöre kaydedildiğinden emin olun."
 
 msgid "Disk image too large"
-msgstr "Disk imajı çok büyük"
+msgstr "Disk görüntüsü çok büyük"
 
 msgid "Remember to partition and format the newly-created drive."
-msgstr "Yeni oluşturulan diski bölmeyi ve formatlamayı unutmayın."
+msgstr "Yeni oluşturulan diskte bölümler oluşturmayı ve bu bölümleri biçimlendirmeyi unutmayın."
 
 msgid "The selected file will be overwritten. Are you sure you want to use it?"
-msgstr "Seçili dosyanın üzerine yazılacaktır. Bunu yapmak istediğinizden emin misiniz?"
+msgstr "Seçili dosyanın üzerine yazılacaktır. Bu dosyayı kullanmak istediğinizden emin misiniz?"
 
 msgid "Unsupported disk image"
-msgstr "Desteklenmeyen disk imajı"
+msgstr "Desteklenmeyen disk görüntüsü"
 
 msgid "Overwrite"
 msgstr "Üzerine yaz"
@@ -1039,23 +1410,44 @@ msgstr "Üzerine yaz"
 msgid "Don't overwrite"
 msgstr "Üzerine yazma"
 
+msgid "Raw image"
+msgstr "Ham görüntü"
+
+msgid "HDI image"
+msgstr "HDI görüntüsü"
+
+msgid "HDX image"
+msgstr "HDX görüntüsü"
+
+msgid "Fixed-size VHD"
+msgstr "Sabit boyutlu VHD"
+
+msgid "Dynamic-size VHD"
+msgstr "Dinamik boyutlu VHD"
+
+msgid "Differencing VHD"
+msgstr "Farklandıran VHD"
+
+msgid "(N/A)"
+msgstr "(yok)"
+
 msgid "Raw image (.img)"
-msgstr "Ham imaj (.img)"
+msgstr "Ham görüntü (.img)"
 
 msgid "HDI image (.hdi)"
-msgstr "HDI imajı (.hdi)"
+msgstr "HDI görüntüsü (.hdi)"
 
 msgid "HDX image (.hdx)"
-msgstr "HDX imajı (.hdx)"
+msgstr "HDX görüntüsü (.hdx)"
 
 msgid "Fixed-size VHD (.vhd)"
-msgstr "Sabit-boyutlu VHD (.vhd)"
+msgstr "Sabit boyutlu VHD (.vhd)"
 
 msgid "Dynamic-size VHD (.vhd)"
-msgstr "Dinamik-boyutlu VHD (.vhd)"
+msgstr "Dinamik boyutlu VHD (.vhd)"
 
 msgid "Differencing VHD (.vhd)"
-msgstr "Differencing VHD (.vhd)"
+msgstr "Farklandıran VHD (.vhd)"
 
 msgid "Large blocks (2 MB)"
 msgstr "Büyük bloklar (2 MB)"
@@ -1070,16 +1462,13 @@ msgid "Select the parent VHD"
 msgstr "Ana VHD dosyasını seçin"
 
 msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
-msgstr "Bu, farkı alınan imaj oluşturulduktan sonra ana imaj dosyasının düzenlendiği anlamına geliyor olabilir.\n\nBu durum ayrıca imaj dosyaları kopyalandığında veya yerleri değiştirildiğinde veya imaj dosyalarını oluşturan programdaki bir hatadan dolayı olmuş olabilir.\n\nZaman damgalarını düzeltmek ister misiniz?"
+msgstr "Bu, farklandırmış görüntü dosyası oluşturulduktan sonra ana görüntü dosyasında bir değişiklik yapıldığı anlamına geliyor olabilir.\n\nBu durum ayrıca görüntü dosyalarının kopyalanmasından, yerlerinin değiştirilmesinden veya dosyaları oluşturan programdaki bir hatadan dolayı da meydana gelmiş olabilir.\n\nZaman damgalarını düzeltmek ister misiniz?"
 
 msgid "Parent and child disk timestamps do not match"
-msgstr "Ana ve ek disk zaman damgaları uyuşmuyor"
+msgstr "Ana ve ek disklerin zaman damgaları uyuşmuyor"
 
 msgid "Could not fix VHD timestamp."
-msgstr "VHD zaman damgası düzeltilemedi."
-
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
+msgstr "VHD'nin zaman damgası düzeltilemedi."
 
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
@@ -1096,44 +1485,29 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
+msgid "160 KB"
+msgstr "160 KB"
 
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
+msgid "180 KB"
+msgstr "180 KB"
 
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
+msgid "320 KB"
+msgstr "320 KB"
 
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
+msgid "360 KB"
+msgstr "360 KB"
 
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
+msgid "640 KB"
+msgstr "640 KB"
 
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
+msgid "720 KB"
+msgstr "720 KB"
 
 msgid "1.2 MB"
 msgstr "1.2 MB"
@@ -1145,10 +1519,10 @@ msgid "1.44 MB"
 msgstr "1.44 MB"
 
 msgid "DMF (cluster 1024)"
-msgstr "DMF (cluster 1024)"
+msgstr "DMF (1024 kümeli)"
 
 msgid "DMF (cluster 2048)"
-msgstr "DMF (cluster 2048)"
+msgstr "DMF (2048 kümeli)"
 
 msgid "2.88 MB"
 msgstr "2.88 MB"
@@ -1190,13 +1564,13 @@ msgid "Perfect RPM"
 msgstr "Mükemmel RPM"
 
 msgid "1% below perfect RPM"
-msgstr "mükemmel RPM değerinin 1% altı"
+msgstr "Mükemmel RPM değerinin 1% altı"
 
 msgid "1.5% below perfect RPM"
-msgstr "mükemmel RPM değerinin 1.5% altı"
+msgstr "Mükemmel RPM değerinin 1.5% altı"
 
 msgid "2% below perfect RPM"
-msgstr "mükemmel RPM değerinin 2% altı"
+msgstr "Mükemmel RPM değerinin 2% altı"
 
 msgid "(System Default)"
 msgstr "(Sistem Varsayılanı)"
@@ -1211,7 +1585,7 @@ msgid "Mouse sensitivity:"
 msgstr "Fare hassasiyeti:"
 
 msgid "Select media images from program working directory"
-msgstr "Program çalışma dizininden medya görüntülerini seçme"
+msgstr "Medya görüntülerini programın çalışma dizininden seç"
 
 msgid "PIT mode:"
 msgstr "PIT modu:"
@@ -1226,4 +1600,1384 @@ msgid "Fast"
 msgstr "Hızlı"
 
 msgid "&Auto-pause on focus loss"
-msgstr "&Odak kaybında otomatik duraklatma"
+msgstr "Pencereye &odaklanmıyorken duraklat"
+
+msgid "WinBox is no longer supported"
+msgstr "WinBox artık desteklenmemektedir"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "WinBox yöneticisinin geliştirilmesi geliştirici eksikliği nedeniyle 2022 yılında durduruldu. 86Box'ı daha iyi hale getirmeye odaklanmak amacıyla bu yöneticiyi artık desteklememe kararı aldık.\n\nArtık WinBox aracılığıyla güncellemeler yayınlanmayacaktır ve bu yöneticiyi 86Box'ın yeni sürümleriyle kullanmanız halinde hatalarla karşılaşabilirsiniz. WinBox'ın kullanımıyla ilgili tüm hata raporları geçersiz sayılacaktır.\n\nKullanabileceğiniz diğer yöneticilerin bir listesi için lütfen 86box.net adresini ziyaret edin."
+
+msgid "Generate"
+msgstr "Oluştur"
+
+msgid "Joystick configuration"
+msgstr "Oyun kolu seçenekleri"
+
+msgid "Device"
+msgstr "Cihaz"
+
+msgid "%1 (X axis)"
+msgstr "1 (X ekseni)"
+
+msgid "%1 (Y axis)"
+msgstr "1 (Y ekseni)"
+
+msgid "MCA devices"
+msgstr "MCA cihazları"
+
+msgid "List of MCA devices:"
+msgstr "MCA cihazlarının listesi:"
+
+msgid "&Tablet tool"
+msgstr "Tablet aracı"
+
+msgid "About &Qt"
+msgstr "&Qt hakkında"
+
+msgid "&MCA devices..."
+msgstr "MCA cihazları..."
+
+msgid "Show non-&primary monitors"
+msgstr "Birincil olmayan monitörleri göster"
+
+msgid "Open screenshots &folder..."
+msgstr "Ekran görüntüsü klasörünü aç..."
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Büyütüldüğünde tam ekran germe modunu uygula"
+
+msgid "&Cursor/Puck"
+msgstr "&İmleç/Puck"
+
+msgid "&Pen"
+msgstr "&Kalem"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "&Ana Sistemin CD/DVD Sürücüsü (%1:)"
+
+msgid "&Connected"
+msgstr "&Bağlı"
+
+msgid "Clear image &history"
+msgstr "Görüntü geçmişini temizle"
+
+msgid "Create..."
+msgstr "Oluştur..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "Ana bilgisayar CD/DVD sürücüsü (%1)"
+
+msgid "Unknown Bus"
+msgstr "Bilinmeyen veri yolu"
+
+msgid "Null Driver"
+msgstr "Null sürücü"
+
+msgid "NIC:"
+msgstr "NIC:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "NIC %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&NIC %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "İşleyiş davranışı"
+
+msgid "Use target framerate:"
+msgstr "Şu hedef kare hızı oranını kullan:"
+
+msgid " fps"
+msgstr " fps"
+
+msgid "VSync"
+msgstr "VSync"
+
+msgid "Synchronize with video"
+msgstr "Video ile senkronize et"
+
+msgid "Shaders"
+msgstr "Gölgelendiriciler"
+
+msgid "Remove"
+msgstr "Kaldır"
+
+msgid "Browse..."
+msgstr "Göz at..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "OpenGL bağlamı oluşturulamadı."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "OpenGL bağlamına geçilemedi."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "OpenGL sürüm 3.0 veya üstü gereklidir. Geçerli sürüm %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "OpenGL başlatılırken hata oluştu"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nYazılım derleyicisine geri dönülüyor."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>Medya görüntüsü (CD-ROM, disket, vb.) seçme diyaloğu 86Box yapılandırma dosyasının bulunduğu dizinde başlayacaktır. Bu ayar muhtemelen sadece macOS üzerinde bir değişiklik meydana getirecektir.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "Bu makine taşınmış veya kopyalanmış olabilir."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "Ağ bağlantısı özelliğinin doğru bir şekilde çalışması için 86Box'ın bu makinenin başka bir konuma taşındığını mı yoksa kopyalandığını mı belirlemesi gerekmektedir.\n\nBundan emin değilseniz \"Kopyalandı\" seçeneğini seçin."
+
+msgid "I Moved It"
+msgstr "Taşındı"
+
+msgid "I Copied It"
+msgstr "Kopyalandı"
+
+msgid "86Box Monitor #"
+msgstr "86Box Monitör #"
+
+msgid "No MCA devices."
+msgstr "MCA cihazı yok."
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "1. Ağ Kartı"
+
+msgid "Network Card #2"
+msgstr "2. Ağ Kartı"
+
+msgid "Network Card #3"
+msgstr "3. Ağ Kartı"
+
+msgid "Network Card #4"
+msgstr "4. Ağ Kartı"
+
+msgid "Mode:"
+msgstr "Mod:"
+
+msgid "Interface:"
+msgstr "Arayüz:"
+
+msgid "Adapter:"
+msgstr "Adaptör:"
+
+msgid "VDE Socket:"
+msgstr "VDE Soketi:"
+
+msgid "86Box Unit Tester"
+msgstr "86Box Test Cihazı"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Novell NetWare 2.x Anahtar Kartı"
+
+msgid "Serial port passthrough 1"
+msgstr "1. Seri bağlantı noktası geçişi"
+
+msgid "Serial port passthrough 2"
+msgstr "2. Seri bağlantı noktası geçişi"
+
+msgid "Serial port passthrough 3"
+msgstr "3. Seri bağlantı noktası geçişi"
+
+msgid "Serial port passthrough 4"
+msgstr "4. Seri bağlantı noktası geçişi"
+
+msgid "Renderer &options..."
+msgstr "Derleyici seçenekleri..."
+
+msgid "PC/XT Keyboard"
+msgstr "PC/XT Klavyesi"
+
+msgid "AT Keyboard"
+msgstr "AT Klavyesi"
+
+msgid "AX Keyboard"
+msgstr "AX Klavyesi"
+
+msgid "PS/2 Keyboard"
+msgstr "PS/2 Klavyesi"
+
+msgid "PS/55 Keyboard"
+msgstr "PS/55 Klavyesi"
+
+msgid "Keys"
+msgstr "Keys"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Logitech/Microsoft Bus Faresi"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Microsoft Bus Faresi (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Mouse Systems Seri Faresi"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Mouse Systems Bus Faresi"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Microsoft Seri Faresi"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Microsoft Seri BallPoint"
+
+msgid "Logitech Serial Mouse"
+msgstr "Logitech Seri Faresi"
+
+msgid "PS/2 Mouse"
+msgstr "PS/2 Faresi"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "PS/2 QuickPort Faresi"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (seri)"
+
+msgid "Default Baud rate"
+msgstr "Varsayılan Baud hızı"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] Standart Hayes Uyumlu Modem"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Roland MT-32 Emülasyonu"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Roland MT-32 (Yeni) Emülasyonu"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Roland CM-32L Emülasyonu"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Roland CM-32LN Emülasyonu"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "OPL4-ML Yankartı"
+
+msgid "System MIDI"
+msgstr "Sistem MIDI'si"
+
+msgid "MIDI Input Device"
+msgstr "MIDI Giriş Cihazı"
+
+msgid "BIOS file"
+msgstr "BIOS dosyası"
+
+msgid "BIOS file (ROM #1)"
+msgstr "BIOS dosyası (ROM #1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "BIOS dosyası (ROM #2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "BIOS dosyası (ROM #3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "BIOS dosyası (ROM #4)"
+
+msgid "BIOS address"
+msgstr "BIOS adresi"
+
+msgid "BIOS address (ROM #1)"
+msgstr "BIOS adresi (ROM #1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "BIOS adresi (ROM #2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "BIOS adresi (ROM #3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "BIOS adresi (ROM #4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "BIOS uzantı ROM yazımlarını etkinleştir"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "BIOS uzantı ROM yazımlarını etkinleştir (ROM #1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "BIOS uzantı ROM yazımlarını etkinleştir (ROM #2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "BIOS uzantı ROM yazımlarını etkinleştir (ROM #3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "BIOS uzantı ROM yazımlarını etkinleştir (ROM #4)"
+
+msgid "Linear framebuffer base"
+msgstr "Doğrusal çerçeve arabelleği baz adresi"
+
+msgid "Address"
+msgstr "Adres"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "Seri bağlantı noktası IRQ'su"
+
+msgid "Parallel port IRQ"
+msgstr "Paralel bağlantı noktası IRQ'su"
+
+msgid "BIOS Revision"
+msgstr "BIOS Revizyonu"
+
+msgid "BIOS Version"
+msgstr "BIOS Sürümü"
+
+msgid "BIOS Language"
+msgstr "BIOS Dili"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "IBM 5161 Genişletme Ünitesi"
+
+msgid "IBM Cassette Basic"
+msgstr "IBM Kaset BASIC"
+
+msgid "Translate 26 -> 17"
+msgstr "26 -> 17 olarak çevir"
+
+msgid "Language"
+msgstr "Dil"
+
+msgid "Enable backlight"
+msgstr "Arka ışığı etkinleştir"
+
+msgid "Invert colors"
+msgstr "Renkleri tersine çevir"
+
+msgid "BIOS size"
+msgstr "BIOS boyutu"
+
+msgid "BIOS size (ROM #1)"
+msgstr "BIOS boyutu (ROM #1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "BIOS boyutu (ROM #2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "BIOS boyutu (ROM #3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "BIOS boyutu (ROM #4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "C0000-C7FFF'yi UMB olarak eşle"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "C8000-CFFFF'yi UMB olarak eşle"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "D0000-D7FFF'yi UMB olarak eşle"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "D8000-DFFFF'yi UMB olarak eşle"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "E0000-E7FFF'yi UMB olarak eşle"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "E8000-EFFFF'yi UMB olarak eşle"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "JS9 Jumper'ı (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "MIDI Çıkış Cihazı"
+
+msgid "MIDI Real time"
+msgstr "MIDI Gerçek Zamanı"
+
+msgid "MIDI Thru"
+msgstr "MIDI Geçişi"
+
+msgid "MIDI Clockout"
+msgstr "MIDI Saat Çıkışı"
+
+msgid "SoundFont"
+msgstr "SoundFont"
+
+msgid "Output Gain"
+msgstr "Çıkış Sesi Artışı"
+
+msgid "Chorus"
+msgstr "Koro"
+
+msgid "Chorus Voices"
+msgstr "Koro Sesleri"
+
+msgid "Chorus Level"
+msgstr "Koro seviyesi"
+
+msgid "Chorus Speed"
+msgstr "Koro Hızı"
+
+msgid "Chorus Depth"
+msgstr "Koro Derinliği"
+
+msgid "Chorus Waveform"
+msgstr "Koro Dalga Biçimi"
+
+msgid "Reverb"
+msgstr "Yankı"
+
+msgid "Reverb Room Size"
+msgstr "Yankı Odası Boyutu"
+
+msgid "Reverb Damping"
+msgstr "Yankı Sönümleme"
+
+msgid "Reverb Width"
+msgstr "Yankı Genişliği"
+
+msgid "Reverb Level"
+msgstr "Yankı Seviyesi"
+
+msgid "Interpolation Method"
+msgstr "Enterpolasyon Yöntemi"
+
+msgid "Dynamic Sample Loading"
+msgstr "Dinamik Kesit Yüklemesi"
+
+msgid "Reverb Output Gain"
+msgstr "Yankı Çıkış Sesi Artışı"
+
+msgid "Reversed stereo"
+msgstr "Tersine çevirilmiş stereo"
+
+msgid "Nice ramp"
+msgstr "Güzel rampa"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "Düğmeler"
+
+msgid "Serial Port"
+msgstr "Seri Bağlantı Noktası"
+
+msgid "RTS toggle"
+msgstr "RTS ayarı"
+
+msgid "Revision"
+msgstr "Sürüm"
+
+msgid "Controller"
+msgstr "Denetleyici"
+
+msgid "Show Crosshair"
+msgstr "Nişangahı Göster"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "MAC Adresi"
+
+msgid "MAC Address OUI"
+msgstr "MAC Adresinin OUI'si"
+
+msgid "Enable BIOS"
+msgstr "BIOS'u Etkinleştir"
+
+msgid "Baud Rate"
+msgstr "Baud Hızı"
+
+msgid "TCP/IP listening port"
+msgstr "TCP/IP dinleme portu"
+
+msgid "Phonebook File"
+msgstr "Telefon rehber dosyası"
+
+msgid "Telnet emulation"
+msgstr "Telnet emülasyonu"
+
+msgid "RAM Address"
+msgstr "Bellek (RAM) Adresi"
+
+msgid "RAM size"
+msgstr "Bellek (RAM) Boyutu"
+
+msgid "Initial RAM size"
+msgstr "İlk Bellek (RAM) boyutu"
+
+msgid "Serial Number"
+msgstr "Seri Numarası"
+
+msgid "Host ID"
+msgstr "Ana sistemin kimliği"
+
+msgid "FDC Address"
+msgstr "FDC Adresi"
+
+msgid "MPU-401 Address"
+msgstr "MPU-401 Adresi"
+
+msgid "MPU-401 IRQ"
+msgstr "MPU-401 IRQ"
+
+msgid "Receive MIDI input"
+msgstr "MIDI girişini dinle"
+
+msgid "Low DMA"
+msgstr "Düşük DMA"
+
+msgid "Enable Game port"
+msgstr "Gameport'ı etkinleştir"
+
+msgid "SID Model"
+msgstr "SID Modeli"
+
+msgid "SID Filter Strength"
+msgstr "SID Filtre Gücü"
+
+msgid "Surround module"
+msgstr "Surround modülü"
+
+msgid "CODEC"
+msgstr "CODEC"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "CODEC kurulumunda CODEC kesmesini yükselt (bazı sürücüler tarafından gereklidir)"
+
+msgid "SB Address"
+msgstr "SB adresi"
+
+msgid "Adlib Address"
+msgstr "AdLib adresi"
+
+msgid "Use EEPROM setting"
+msgstr "EEPROM ayarını kullan"
+
+msgid "WSS IRQ"
+msgstr "WSS IRQ"
+
+msgid "WSS DMA"
+msgstr "WSS DMA"
+
+msgid "Enable OPL"
+msgstr "OPL'yi etkinleştir"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "MIDI girişi al (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "SB düşük DMA"
+
+msgid "6CH variant (6-channel)"
+msgstr "6CH varyantı (6 kanallı)"
+
+msgid "Enable CMS"
+msgstr "CMS'yi Etkinleştir"
+
+msgid "Mixer"
+msgstr "Karıştırıcı"
+
+msgid "High DMA"
+msgstr "Yüksek DMA"
+
+msgid "Control PC speaker"
+msgstr "PC hoparlörünü kontrol et"
+
+msgid "Memory size"
+msgstr "Bellek boyutu"
+
+msgid "EMU8000 Address"
+msgstr "EMU8000 adresi"
+
+msgid "IDE Controller"
+msgstr "IDE Denetleyicisi"
+
+msgid "Codec"
+msgstr "Codec"
+
+msgid "GUS type"
+msgstr "GUS türü"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "0x04 \"86Box'tan çık\" komutunu etkinleştir"
+
+msgid "Display type"
+msgstr "Ekran türü"
+
+msgid "Composite type"
+msgstr "Kompozit türü"
+
+msgid "RGB type"
+msgstr "RGB türü"
+
+msgid "Line doubling type"
+msgstr "Hat ikiye katlama türü"
+
+msgid "Snow emulation"
+msgstr "Kar emülasyonu"
+
+msgid "Monitor type"
+msgstr "Monitör türü"
+
+msgid "Character set"
+msgstr "Karakter seti"
+
+msgid "XGA type"
+msgstr "XGA türü"
+
+msgid "Instance"
+msgstr "Örnek"
+
+msgid "MMIO Address"
+msgstr "MMIO adresi"
+
+msgid "RAMDAC type"
+msgstr "RAMDAC türü"
+
+msgid "Blend"
+msgstr "Karışım"
+
+msgid "Font"
+msgstr "Yazı tipi"
+
+msgid "Bilinear filtering"
+msgstr "Çift doğrusal filtreleme"
+
+msgid "Video chroma-keying"
+msgstr "Video renk anahtarlanması"
+
+msgid "Dithering"
+msgstr "Titreklik"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "CGA öykünmesi için NMI'yi etkinleştir"
+
+msgid "Voodoo type"
+msgstr "Voodoo türü"
+
+msgid "Framebuffer memory size"
+msgstr "Çerçeve arabelleği bellek boyutu"
+
+msgid "Texture memory size"
+msgstr "Doku bellek boyutu"
+
+msgid "Dither subtraction"
+msgstr "Dither çıkarışı"
+
+msgid "Screen Filter"
+msgstr "Ekran filtresi"
+
+msgid "Render threads"
+msgstr "Derleme için iş parçacığı sayısı"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Başlangıç adresi"
+
+msgid "Contiguous Size"
+msgstr "Bitişik boyut"
+
+msgid "I/O Width"
+msgstr "G/Ç genişliği"
+
+msgid "Transfer Speed"
+msgstr "Transfer hızı"
+
+msgid "EMS mode"
+msgstr "EMS modu"
+
+msgid "EMS Address"
+msgstr "EMS adresi"
+
+msgid "EMS 1 Address"
+msgstr "EMS 1 adresi"
+
+msgid "EMS 2 Address"
+msgstr "EMS 2 adresi"
+
+msgid "EMS Memory Size"
+msgstr "EMS bellek büyüklüğü"
+
+msgid "EMS 1 Memory Size"
+msgstr "EMS 1 bellek büyüklüğü"
+
+msgid "EMS 2 Memory Size"
+msgstr "EMS 2 bellek büyüklüğü"
+
+msgid "Enable EMS"
+msgstr "EMS'yi etkinleştir"
+
+msgid "Enable EMS 1"
+msgstr "EMS 1'i etkinleştir"
+
+msgid "Enable EMS 2"
+msgstr "EMS 2'yi etkinleştir"
+
+msgid "Address for > 2 MB"
+msgstr "> 2 MB için adres"
+
+msgid "Frame Address"
+msgstr "Çerçeve adresi"
+
+msgid "USA"
+msgstr "ABD"
+
+msgid "Danish"
+msgstr "Danca"
+
+msgid "Always at selected speed"
+msgstr "Her zaman seçilen hızda"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "BIOS ayarı + Kısayol tuşları (POST sırasında kapalı)"
+
+msgid "64 KB starting from F0000"
+msgstr "F0000'dan başlayarak 64 KB"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "E0000'dan başlayarak 128 KB (adresin MSB'si ters çevirilmiş, önce sondaki 64 KB)"
+
+msgid "Sine"
+msgstr "Sinüs"
+
+msgid "Triangle"
+msgstr "Üçgen"
+
+msgid "Linear"
+msgstr "Doğrusal"
+
+msgid "4th Order"
+msgstr "4. sıra"
+
+msgid "7th Order"
+msgstr "7. sıra"
+
+msgid "Non-timed (original)"
+msgstr "Zamanlanmamış (orijinal)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (JMP2 kullanılmadan)"
+
+msgid "Two"
+msgstr "İki"
+
+msgid "Three"
+msgstr "Üç"
+
+msgid "Wheel"
+msgstr "Tekerlek"
+
+msgid "Five + Wheel"
+msgstr "Beş + Tekerlek"
+
+msgid "Five + 2 Wheels"
+msgstr "Beş + 2 Tekerlek"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 Seri / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) Seri"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "BIOS'u Devre Dışı Bırak"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2 MB"
+
+msgid "8 MB"
+msgstr "8 MB"
+
+msgid "28 MB"
+msgstr "28 MB"
+
+msgid "1 MB"
+msgstr "1 MB"
+
+msgid "4 MB"
+msgstr "4 MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16 MB"
+
+msgid "20 MB"
+msgstr "20 MB"
+
+msgid "24 MB"
+msgstr "24 MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (stereo)"
+
+msgid "Classic"
+msgstr "Klasik"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "Kompozit"
+
+msgid "True color"
+msgstr "Gerçek renk"
+
+msgid "Old"
+msgstr "Eski"
+
+msgid "New"
+msgstr "Yeni"
+
+msgid "Color (generic)"
+msgstr "Çok Renkli (genel)"
+
+msgid "Green Monochrome"
+msgstr "Yeşil Renkli"
+
+msgid "Amber Monochrome"
+msgstr "Kehribar Renkli"
+
+msgid "Gray Monochrome"
+msgstr "Gri Renkli"
+
+msgid "Color (no brown)"
+msgstr "Çok Renkli (kahverengi yok)"
+
+msgid "Color (IBM 5153)"
+msgstr "Çok Renkli (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Basit katlama"
+
+msgid "sRGB interpolation"
+msgstr "sRGB interpolasyonu"
+
+msgid "Linear interpolation"
+msgstr "Doğrusal interpolasyon"
+
+msgid "Has secondary 8x8 character set"
+msgstr "İkincil 8x8 karakter seti var"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Quadcolor II yankartı var"
+
+msgid "Alternate monochrome contrast"
+msgstr "Alternatif tek renkli kontrast"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Tek Renkli (5151/MDA) (beyaz)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Tek Renkli (5151/MDA) (yeşil)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Tek Renkli (5151/MDA) (kehribar)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Çok Renkli 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Çok Renkli 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Gelişmiş Renkli - Normal Mod (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Gelişmiş Renkli - Gelişmiş Mod (5154/ECD)"
+
+msgid "Green"
+msgstr "Yeşil"
+
+msgid "Amber"
+msgstr "Kehribar"
+
+msgid "Gray"
+msgstr "Gri"
+
+msgid "Grayscale"
+msgstr "Gri tonlu"
+
+msgid "Color"
+msgstr "Renk"
+
+msgid "U.S. English"
+msgstr "ABD İngilizcesi"
+
+msgid "Scandinavian"
+msgstr "İskandinav"
+
+msgid "Other languages"
+msgstr "Diğer diller"
+
+msgid "Bochs latest"
+msgstr "Bochs'un en son sürümü"
+
+msgid "Apply overscan deltas"
+msgstr "Aşırı tarama deltalarını uygula"
+
+msgid "Mono Interlaced"
+msgstr "Tek Renkli (Geçiş Taramalı)"
+
+msgid "Mono Non-Interlaced"
+msgstr "Tek Renkli (Geçiş Taramasız)"
+
+msgid "Color Interlaced"
+msgstr "Çok Renkli (Geçiş Taramalı)"
+
+msgid "Color Non-Interlaced"
+msgstr "Çok Renkli (Geçiş Taramasız)"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "3Dfx Voodoo Grafikleri"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 TMU)"
+
+msgid "8-bit"
+msgstr "8-bit"
+
+msgid "16-bit"
+msgstr "16-bit"
+
+msgid "Standard (150ns)"
+msgstr "Standart (150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "Yüksek Hızlı (120ns)"
+
+msgid "Enabled"
+msgstr "Etkin"
+
+msgid "Standard"
+msgstr "Standart"
+
+msgid "High-Speed"
+msgstr "Yüksek Hızlı"
+
+msgid "Stereo LPT DAC"
+msgstr "Stereo LPT DAC"
+
+msgid "Generic Text Printer"
+msgstr "Genel Metin Yazıcı"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Genel ESC/P 2 Dot-Matrix Yazıcı"
+
+msgid "Generic PostScript Printer"
+msgstr "Genel PostScript Yazıcı"
+
+msgid "Generic PCL5e Printer"
+msgstr "Genel PCL5e Yazıcı"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Paralel Hat İnternet Protokolü"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Savage Quest için Koruma Kilidi"
+
+msgid "Serial Passthrough Device"
+msgstr "Seri Geçiş Cihazı"
+
+msgid "Passthrough Mode"
+msgstr "Geçiş Modu"
+
+msgid "Host Serial Device"
+msgstr "Ana Sistemdeki Seri Cihaz"
+
+msgid "Name of pipe"
+msgstr "Boru adı"
+
+msgid "Data bits"
+msgstr "Veri bitleri"
+
+msgid "Stop bits"
+msgstr "Dur bitleri"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Geçişin Baud Hızı"
+
+msgid "Named Pipe (Server)"
+msgstr "Adlandırılmış Boru (Sunucu)"
+
+msgid "Named Pipe (Client)"
+msgstr "Adlandırılmış Boru (İstemci)"
+
+msgid "Host Serial Passthrough"
+msgstr "Ana Sistem Seri Geçişi"
+
+msgid "E&ject %1"
+msgstr "%1 görüntüsünü &çıkar"
+
+msgid "&Unmute"
+msgstr "&Sesi aç"
+
+msgid "Softfloat FPU"
+msgstr "Softfloat FPU"
+
+msgid "High performance impact"
+msgstr "Ciddi performans azalışına neden olabilir"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Genel] RAM Disk (maks. hız)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Genel] 1989 (3500 RPM)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Genel] 1992 (3600 RPM)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Genel] 1994 (4500 RPM)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Genel] 1996 (5400 RPM)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Genel] 1997 (5400 RPM)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Genel] 1998 (5400 RPM)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Genel] 2000 (7200 RPM)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "IBM 8514/A klonu (ISA)"
+
+msgid "Vendor"
+msgstr "Üretici"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Genel PC/XT Bellek Artırıcı"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Genel PC/AT Bellek Artırıcı"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "Dot-Matrix yazı tipleri bulunamıyor"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "Genel ESC/P 2 Dot-Matrix yazıcısının emülasyonu için \"roms/printer/fonts\" dizininde TrueType yazı tiplerinin bulunması gereklidir."
+
+msgid "Inhibit multimedia keys"
+msgstr "Multimedya tuşlarını engelle"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Ayarları kaydetmeden once onay için sor"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Yeniden başlamaya zorlamadan önce onay için sor"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Çıkış yapmadan once onay için sor"
+
+msgid "Options"
+msgstr "Seçenekler"
+
+msgid "Model"
+msgstr "Model"
+
+msgid "Model:"
+msgstr "Model:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Vulkan derleyicisi başlatılamadı."
+
+msgid "GLSL Error"
+msgstr "GLSL Hatası"
+
+msgid "Could not load shader: %1"
+msgstr "%1 gölgelendiricisi yüklenemedi"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "OpenGL sürüm 3.0 veya daha yükseği gereklidir. Şu anki GLSL sürümü %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "%1 dokusu yüklenemedi"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "%1 gölgelendiricisi derlenemedi"
+
+msgid "Program not linked:\n\n%1"
+msgstr "%1 programı bağlanamadı"
+
+msgid "Shader Manager"
+msgstr "Gölgelendirici Yöneticisi"
+
+msgid "Shader Configuration"
+msgstr "Gölgelendirici Seçenekleri"
+
+msgid "Add"
+msgstr "Ekle"
+
+msgid "Move up"
+msgstr "Yukarı taşı"
+
+msgid "Move down"
+msgstr "Aşağı taşı"
+
+msgid "Could not load file %1"
+msgstr "%1 dosyası yüklenemedi"
+
+msgid "Key Bindings:"
+msgstr "Tuş Bağlamaları"
+
+msgid "Action"
+msgstr "Eylem"
+
+msgid "Keybind"
+msgstr "Tuş bağlaması"
+
+msgid "Clear binding"
+msgstr "Bağlamayı sil"
+
+msgid "Bind"
+msgstr "Bağla"
+
+msgid "Bind Key"
+msgstr "Tuş Bağla"
+
+msgid "Enter key combo:"
+msgstr "Tuş kombinasyonunu girin:"
+
+msgid "Bind conflict"
+msgstr "Bağlama çakışması"
+
+msgid "This key combo is already in use."
+msgstr "Bu tuş kombinasyonu zaten kullanılıyor."
+
+msgid "Send Control+Alt+Del"
+msgstr "Control+Alt+Del gönder"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Control+Alt+Escape gönder"
+
+msgid "Toggle fullscreen"
+msgstr "Tam ekran modunu ayarla"
+
+msgid "Screenshot"
+msgstr "Ekran görüntüsü"
+
+msgid "Release mouse pointer"
+msgstr "Fare imlecini serbest bırak"
+
+msgid "Toggle pause"
+msgstr "Duraklamayı ayarla"
+
+msgid "Toggle mute"
+msgstr "Sessize almayı ayarla"
+
+msgid "Text files"
+msgstr "Metin dosyaları"
+
+msgid "ROM files"
+msgstr "ROM dosyaları"
+
+msgid "SoundFont files"
+msgstr "SoundFont dosyaları"
+
+msgid "Local Switch"
+msgstr "Yerel Switch"
+
+msgid "Remote Switch"
+msgstr "Uzak Switch"
+
+msgid "Switch:"
+msgstr "Switch:"
+
+msgid "Hub Mode"
+msgstr "Hub Modu"
+
+msgid "Hostname:"
+msgstr "Ana bilgisayar adı"
+
+msgid "ISA RAM:"
+msgstr "ISA RAM:"
+
+msgid "ISA ROM:"
+msgstr "ISA ROM:"
+
+msgid "&Wipe NVRAM"
+msgstr "NVRAM'i te&mizle"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "Bu işlem, sanal makinenin \"nvr\" altdizininde bulunan tüm NVRAM (ve ilişkili) dosyalarını silecektir. Eğer uygulanabilir ise, Anakartın BIOS'unu (ve muhtemelen VM içindeki diğer cihazları) yeniden yapılandırmanız gerekecektir.\n\nSanal makinenin tüm NVRAM içeriğini silmek istediğinizden emin misiniz?"
+
+msgid "Success"
+msgstr "İşlem başarılı"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "\"%1\" adlı sanal makinenin NVRAM içeriği başarıyla silindi"
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "\"%1\" adlı sanal makinenin NVRAM içeriği silinmeye çalışırken hata oluştu"
+
+msgid "%1 VM Manager"
+msgstr "%1 VM Yöneticisi"
+
+msgid "%n disk(s)"
+msgstr "%n disk"
+
+msgid "Unknown Status"
+msgstr "Bilinmeyen Durum"
+
+msgid "No Machines Found!"
+msgstr "Sanal Makine Bulunamadı!"
+
+msgid "Check for updates on startup"
+msgstr "Başlangıçta güncellemeleri kontrol et"
+
+msgid "Unable to determine release information"
+msgstr "Sürüm bilgisi belirlenemiyor"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Güncellemeler kontrol edilirken bir hata oluştu:\n\n%1\n\nLütfen tekrar deneyin."
+
+msgid "Update check complete"
+msgstr "Güncelleme kontrolü tamamlandı"
+
+msgid "stable"
+msgstr "kararlı"
+
+msgid "beta"
+msgstr "beta"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Şu anda 86Box'ın en yeni %1 sürümünü kullanıyorsunuz: %2"
+
+msgid "version"
+msgstr "sürüm"
+
+msgid "build"
+msgstr "yapı"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Şu anda <b>%1</b> sürümünü kullanıyorsunuz."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "<b>Sürüm %1</b> şimdi mevcut."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Şu anda <b>%1</b> numaralı yapıyı kullanıyorsunuz."
+
+msgid "<b>Build %1</b> is now available."
+msgstr "<b>Yapı %1</b> şimdi mevcut."
+
+msgid "Would you like to visit the download page?"
+msgstr "İndirme sayfasını ziyaret etmek ister misiniz?"
+
+msgid "Visit download page"
+msgstr "İndirme sayfasını ziyaret et"
+
+msgid "Update check"
+msgstr "Güncelleme kontrolü"
+
+msgid "Checking for updates..."
+msgstr "Güncellemeler kontrol ediliyor..."
+
+msgid "86Box Update"
+msgstr "86Box Güncellemesi"
+
+msgid "Release notes:"
+msgstr "Sürüm notları:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "Sanal makine çöktü"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "\"%1\" adlı sanal makinenin işlemi beklenmedik bir şekilde çıkış kodu %2 ile sona erdi."
+
+msgid "The system will not be added."
+msgstr "Sistem eklenmeyecek."
+
+msgid "&Update mouse every CPU frame"
+msgstr "Her CPU karesi ile fareyi güncelle"
+
+msgid "Hue"
+msgstr "Renk tonu"
+
+msgid "Saturation"
+msgstr "Doygunluk"
+
+msgid "Contrast"
+msgstr "Kontrast"
+
+msgid "Brightness"
+msgstr "Parlaklık"
+
+msgid "Sharpness"
+msgstr "Keskinlik"
+
+msgid "&CGA composite settings..."
+msgstr "&CGA kompozit modunun ayarları..."
+
+msgid "CGA composite settings"
+msgstr "CGA kompozit modunun ayarları"
+
+msgid "Monitor EDID"
+msgstr "Monitörün EDID'si"
+
+msgid "Export..."
+msgstr "Dışa aktar..."
+
+msgid "Export EDID"
+msgstr "EDID'i dışa aktar"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "EDID dosyası \"%ls\" çok büyük."
+
+msgid "OpenGL input scale"
+msgstr "OpenGL'nin giriş ölçeği"
+
+msgid "OpenGL input stretch mode"
+msgstr "OpenGL'nin giriş germe modu"
+
+msgid "Color scheme"
+msgstr "Renk şeması"
+
+msgid "Light"
+msgstr "Işık"
+
+msgid "Dark"
+msgstr "Karanlık"
diff --git a/src/qt/languages/uk-UA.po b/src/qt/languages/uk-UA.po
index 0d8522f15..c079fc141 100644
--- a/src/qt/languages/uk-UA.po
+++ b/src/qt/languages/uk-UA.po
@@ -1,3 +1,11 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: uk_UA\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
 msgstr "&Дія"
 
@@ -10,8 +18,8 @@ msgstr "&Правий CTRL - це лівий ALT"
 msgid "&Hard Reset..."
 msgstr "&Холодне перезавантаження..."
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "&Ctrl+Alt+Del\tCtrl+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "&Ctrl+Alt+Del"
 
 msgid "Ctrl+Alt+&Esc"
 msgstr "Ctrl+Alt+&Esc"
@@ -19,8 +27,14 @@ msgstr "Ctrl+Alt+&Esc"
 msgid "&Pause"
 msgstr "&Пауза"
 
-msgid "E&xit..."
-msgstr "&Вихід..."
+msgid "Pause"
+msgstr "Пауза"
+
+msgid "Re&sume"
+msgstr "В&ідновити"
+
+msgid "E&xit"
+msgstr "&Вихід"
 
 msgid "&View"
 msgstr "&Вигляд"
@@ -40,14 +54,8 @@ msgstr "&Запам'ятати розмір і становище"
 msgid "Re&nderer"
 msgstr "&Рендеринг"
 
-msgid "&SDL (Software)"
-msgstr "&SDL (Software)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (&Hardware)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (&OpenGL)"
+msgid "&Qt (Software)"
+msgstr "&Qt (Software)"
 
 msgid "Open&GL (3.0 Core)"
 msgstr "Open&GL (3.0)"
@@ -55,11 +63,11 @@ msgstr "Open&GL (3.0)"
 msgid "&VNC"
 msgstr "&VNC"
 
-msgid "Specify dimensions..."
+msgid "Specify &dimensions..."
 msgstr "&Вказати розміри..."
 
-msgid "F&orce 4:3 display ratio"
-msgstr "&Встановити відношення сторін 4:3"
+msgid "Force &4:3 display ratio"
+msgstr "Встановити відношення сторін &4:3"
 
 msgid "&Window scale factor"
 msgstr "&Масштаб вікна"
@@ -94,7 +102,7 @@ msgstr "&7x"
 msgid "&8x"
 msgstr "&8x"
 
-msgid "Filter method"
+msgid "Fi&lter method"
 msgstr "Метод фільтрації"
 
 msgid "&Nearest"
@@ -106,8 +114,8 @@ msgstr "&Лінійний"
 msgid "Hi&DPI scaling"
 msgstr "Масштабування Hi&DPI"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "&Повноекранний режим\tCtrl+Alt+PgUp"
+msgid "&Fullscreen"
+msgstr "&Повноекранний режим"
 
 msgid "Fullscreen &stretch mode"
 msgstr "&Розстягування у повноекранному режимі"
@@ -127,8 +135,8 @@ msgstr "&Цілісночисленне масштабування"
 msgid "4:&3 Integer scale"
 msgstr "Цілісночисленне масштабування 4:&3"
 
-msgid "E&GA/(S)VGA settings"
-msgstr "Налаштування E&GA/(S)VGA"
+msgid "EGA/(S)&VGA settings"
+msgstr "Налаштування EGA/(S)&VGA"
 
 msgid "&Inverted VGA monitor"
 msgstr "&Інвертувати кольори VGA"
@@ -139,9 +147,15 @@ msgstr "&Тип екрана VGA"
 msgid "RGB &Color"
 msgstr "RGB &кольоровий"
 
+msgid "RGB (no brown)"
+msgstr "RGB (без коричневого)"
+
 msgid "&RGB Grayscale"
 msgstr "&RGB монохромний"
 
+msgid "Generic RGBI color monitor"
+msgstr "Стандартний кольоровий монітор RGBI"
+
 msgid "&Amber monitor"
 msgstr "&Бурштиновий відтінок"
 
@@ -178,11 +192,17 @@ msgstr "&Інструменти"
 msgid "&Settings..."
 msgstr "&Налаштування машини..."
 
+msgid "Settings..."
+msgstr "Налаштування машини..."
+
 msgid "&Update status bar icons"
 msgstr "&Обновлення значків рядка стану"
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "Зробити &знімок\tCtrl+F11"
+msgid "Take s&creenshot"
+msgstr "Зробити &знімок"
+
+msgid "S&ound"
+msgstr "&Звук"
 
 msgid "&Preferences..."
 msgstr "&Параметри..."
@@ -193,11 +213,11 @@ msgstr "Увімкнути інтеграцію &Discord"
 msgid "Sound &gain..."
 msgstr "&Посилення звуку..."
 
-msgid "Begin trace\tCtrl+T"
-msgstr "Почати трасування\tCtrl+T"
+msgid "Begin trace"
+msgstr "Почати трасування"
 
-msgid "End trace\tCtrl+T"
-msgstr "Завершити трасування\tCtrl+T"
+msgid "End trace"
+msgstr "Завершити трасування"
 
 msgid "&Help"
 msgstr "&Допомога"
@@ -244,8 +264,8 @@ msgstr "&Відключити звук"
 msgid "E&mpty"
 msgstr "&Пустий"
 
-msgid "&Reload previous image"
-msgstr "&Знову завантажити попередній образ"
+msgid "Reload previous image"
+msgstr "Знову завантажити попередній образ"
 
 msgid "&Folder..."
 msgstr "&Тека..."
@@ -301,18 +321,12 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Відміна"
 
-msgid "Save these settings as &global defaults"
-msgstr "Зберегти ці параметри як &глобальні за замовчуванням"
-
 msgid "&Default"
 msgstr "&За замовчуванням"
 
 msgid "Language:"
 msgstr "Мова:"
 
-msgid "Icon set:"
-msgstr "Набір іконок:"
-
 msgid "Gain"
 msgstr "Посилення"
 
@@ -346,6 +360,9 @@ msgstr "Системна плата:"
 msgid "Configure"
 msgstr "Налаштування"
 
+msgid "CPU:"
+msgstr "ЦП:"
+
 msgid "CPU type:"
 msgstr "Тип ЦП:"
 
@@ -382,11 +399,23 @@ msgstr "Увімкнути (UTC)"
 msgid "Dynamic Recompiler"
 msgstr "Динамічний рекомпілятор"
 
+msgid "CPU frame size"
+msgstr "Розмір кадру ЦП"
+
+msgid "Larger frames (less smooth)"
+msgstr "Великі кадри (менш плавні)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Менші кадри (більш плавні)"
+
 msgid "Video:"
 msgstr "Відеокарта:"
 
-msgid "Voodoo Graphics"
-msgstr "Прискорювач Voodoo"
+msgid "Video #2:"
+msgstr "Відеокарта 2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Прискорювач Voodoo 1 або 2"
 
 msgid "IBM 8514/A Graphics"
 msgstr "Прискорювач IBM 8514/A"
@@ -394,12 +423,27 @@ msgstr "Прискорювач IBM 8514/A"
 msgid "XGA Graphics"
 msgstr "Прискорювач XGA"
 
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "IBM PS/55 Display Adapter Graphics"
+
+msgid "Keyboard:"
+msgstr "Клавіатура:"
+
+msgid "Keyboard"
+msgstr "Клавіатура"
+
 msgid "Mouse:"
 msgstr "Миша:"
 
+msgid "Mouse"
+msgstr "Миша"
+
 msgid "Joystick:"
 msgstr "Джойстик:"
 
+msgid "Joystick"
+msgstr "Джойстик"
+
 msgid "Joystick 1..."
 msgstr "Джойстик 1..."
 
@@ -430,6 +474,9 @@ msgstr "MIDI Out при-ій:"
 msgid "MIDI In Device:"
 msgstr "MIDI In при-ій:"
 
+msgid "MIDI Out:"
+msgstr "MIDI Out:"
+
 msgid "Standalone MPU-401"
 msgstr "Окремий MPU-401"
 
@@ -445,15 +492,6 @@ msgstr "Nuked (більш точний)"
 msgid "YMFM (faster)"
 msgstr "YMFM (швидший)"
 
-msgid "Network type:"
-msgstr "Тип мережі:"
-
-msgid "PCap device:"
-msgstr "Пристрій PCap:"
-
-msgid "Network adapter:"
-msgstr "Мережевий адаптер:"
-
 msgid "COM1 Device:"
 msgstr "Пристрій COM1:"
 
@@ -478,6 +516,9 @@ msgstr "Пристрій LPT3:"
 msgid "LPT4 Device:"
 msgstr "Пристрій LPT4:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr "DMA ECP вбудованого LPT:"
+
 msgid "Serial port 1"
 msgstr "Послідов. порт COM1"
 
@@ -502,18 +543,21 @@ msgstr "Паралельний порт LPT3"
 msgid "Parallel port 4"
 msgstr "Паралельний порт LPT4"
 
-msgid "HD Controller:"
-msgstr "Контролер HD:"
-
 msgid "FD Controller:"
 msgstr "Контролер FD:"
 
+msgid "CD-ROM Controller:"
+msgstr "Контролер CD-ROM:"
+
 msgid "Tertiary IDE Controller"
 msgstr "Третинний IDE контролер"
 
 msgid "Quaternary IDE Controller"
 msgstr "Четвертинний IDE контролер"
 
+msgid "Hard disk"
+msgstr "Жорсткий диск"
+
 msgid "SCSI"
 msgstr "SCSI"
 
@@ -535,6 +579,9 @@ msgstr "Касета"
 msgid "Hard disks:"
 msgstr "Жорсткі диски:"
 
+msgid "Firmware Version"
+msgstr "Версія прошивки"
+
 msgid "&New..."
 msgstr "&Створити..."
 
@@ -589,14 +636,17 @@ msgstr "Перевіряти BPB"
 msgid "CD-ROM drives:"
 msgstr "Дисководи CD-ROM:"
 
-msgid "Earlier drive"
-msgstr "Більш ранній дисковод"
-
 msgid "MO drives:"
 msgstr "Магнітооптичні дисководи:"
 
-msgid "ZIP drives:"
-msgstr "ZIP дисководи:"
+msgid "MO:"
+msgstr "Дисководи MO:"
+
+msgid "Removable disks:"
+msgstr "Знімні диски:"
+
+msgid "Removable disk drives:"
+msgstr "Дисководи знімних дисків:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
@@ -607,6 +657,9 @@ msgstr "ISA RTC:"
 msgid "ISA Memory Expansion"
 msgstr "Карта розширення пам'яті (ISA)"
 
+msgid "ISA ROM Cards"
+msgstr "Карти ПЗУ ISA"
+
 msgid "Card 1:"
 msgstr "Карта 1:"
 
@@ -619,18 +672,21 @@ msgstr "Карта 3:"
 msgid "Card 4:"
 msgstr "Карта 4:"
 
+msgid "Generic ISA ROM Board"
+msgstr "Стандартна плата ПЗУ ISA"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "Стандартна плата на 2 ПЗУ ISA"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "Стандартна плата на 4 ПЗУ ISA"
+
 msgid "ISABugger device"
 msgstr "Пристрій ISABugger"
 
 msgid "POST card"
 msgstr "Карта POST"
 
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Segoe UI"
-
 msgid "86Box"
 msgstr "86Box"
 
@@ -641,19 +697,22 @@ msgid "Fatal error"
 msgstr "Непереробна помилка"
 
 msgid " - PAUSED"
-msgstr " - PAUSED"
-
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "Натисніть Ctrl+Alt+PgDn для повернення у віконний режим."
+msgstr " - ПРИЗУПИНЕННЯ"
 
 msgid "Speed"
 msgstr "Швидкість"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "Знімний диск %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "Образи ZIP"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "&Знімний диск %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Образи знімних дисків"
+
+msgid "Image %1"
+msgstr "Образ %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
 msgstr "86Box не зміг знайти жодного відповідного для використання файлу з ПЗУ.\n\nБудь ласка <a href=\"https://github.com/86Box/roms/releases/latest\">завантажте</a> набір ПЗУ і витягніть його в каталог \"roms\"."
@@ -688,6 +747,12 @@ msgstr "Системна плата \"%hs\" недоступна через ві
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
 msgstr "Відеокарта \"%hs\" недоступна через відсутність файлу її ПЗУ в каталозі roms/video. Переключення на доступну відеокарту."
 
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "Відеокарта 2 \"%hs\" недоступна через відсутність файлу її ПЗУ в каталозі roms/video. Відключення другої відеокарти."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "Пристрій \"%hs\" недоступний через відсутність файлу його ПЗУ. Ігнорування пристрою."
+
 msgid "Machine"
 msgstr "Комп'ютер"
 
@@ -706,12 +771,30 @@ msgstr "Мережа"
 msgid "Ports (COM & LPT)"
 msgstr "Порти (COM и LPT)"
 
+msgid "Ports"
+msgstr "Порти"
+
+msgid "Serial ports:"
+msgstr "Послідовні порти:"
+
+msgid "Parallel ports:"
+msgstr "Паралельні порти:"
+
 msgid "Storage controllers"
 msgstr "Контролери дисків"
 
 msgid "Hard disks"
 msgstr "Жорсткі диски"
 
+msgid "Disks:"
+msgstr "Диски:"
+
+msgid "Floppy:"
+msgstr "Дисководи:"
+
+msgid "Controllers:"
+msgstr "Контролери:"
+
 msgid "Floppy & CD-ROM drives"
 msgstr "Гнучкі диски і CD-ROM"
 
@@ -721,14 +804,17 @@ msgstr "Інші знімні при-ої"
 msgid "Other peripherals"
 msgstr "Інша периферія"
 
+msgid "Other devices"
+msgstr "Інші пристрої"
+
 msgid "Click to capture mouse"
 msgstr "Клацніть мишею для захвату курсора"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "Натисніть F8+F12, щоб звільнити курсор"
+msgid "Press %1 to release mouse"
+msgstr "Натисніть %1, щоб звільнити курсор"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "Натисніть F8+F12 або середню кнопку миші, щоб звільнити курсор"
+msgid "Press %1 or middle button to release mouse"
+msgstr "Натисніть %1 або середню кнопку миші, щоб звільнити курсор"
 
 msgid "Bus"
 msgstr "Шина"
@@ -748,65 +834,89 @@ msgstr "S"
 msgid "KB"
 msgstr "КБ"
 
-msgid "Could not initialize the video renderer."
-msgstr "Не вдалося ініціалізувати рендер відео."
-
 msgid "Default"
 msgstr "За замовчуванням"
 
-msgid "%i Wait state(s)"
-msgstr "%i WS"
+msgid "%1 Wait state(s)"
+msgstr "%1 WS"
 
 msgid "Type"
 msgstr "Тип"
 
-msgid "Failed to set up PCap"
-msgstr "Не вдалося налаштувати PCap"
-
 msgid "No PCap devices found"
 msgstr "Пристрої PCap не знайдені"
 
 msgid "Invalid PCap device"
 msgstr "Невірний пристрій PCap"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "Стандартний 2-кнопковий джойстик"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "2-осьовий, 2-кнопковий джойстик"
 
-msgid "Standard 4-button joystick"
-msgstr "Стандартний 4-кнопковий джойстик"
+msgid "2-axis, 4-button joystick"
+msgstr "2-осьовий, 4-кнопковий джойстик"
 
-msgid "Standard 6-button joystick"
-msgstr "Стандартний 6-кнопковий джойстик"
+msgid "2-axis, 6-button joystick"
+msgstr "2-осьовий, 6-кнопковий джойстик"
 
-msgid "Standard 8-button joystick"
-msgstr "Стандартний 8-кнопковий джойстик"
+msgid "2-axis, 8-button joystick"
+msgstr "2-осьовий, 8-кнопковий джойстик"
+
+msgid "3-axis, 2-button joystick"
+msgstr "3-осьовий, 2-кнопковий джойстик"
+
+msgid "3-axis, 4-button joystick"
+msgstr "3-осьовий, 4-кнопковий джойстик"
+
+msgid "4-axis, 4-button joystick"
+msgstr "4-осьовий, 4-кнопковий джойстик"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH Педалі"
+
 msgid "Microsoft SideWinder Pad"
 msgstr "Microsoft SideWinder Pad"
 
 msgid "Thrustmaster Flight Control System"
 msgstr "Система управління польотом Thrustmaster"
 
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Система управління кермом"
+
+msgid "2-button gamepad(s)"
+msgstr "4-кнопковий геймпад"
+
+msgid "2-button flight yoke"
+msgstr "2-кнопковий flight yoke"
+
+msgid "4-button gamepad"
+msgstr "4-кнопковий геймпад"
+
+msgid "4-button flight yoke"
+msgstr "4-кнопковий flight yoke"
+
+msgid "2-button flight yoke with throttle"
+msgstr "2-кнопковий flight yoke з дроселем"
+
+msgid "4-button flight yoke with throttle"
+msgstr "4-кнопковий flight yoke з дроселем"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Кермо Win95 (3-осьове, 4-кнопкове)"
+
 msgid "None"
 msgstr "Ні"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "Неможливо завантажити прискорювачі клавіатури."
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 МБ (CHS: %2, %3, %4)"
 
-msgid "Unable to register raw input."
-msgstr "Неможливо зарреєструвати необроблене (RAW) введення."
+msgid "Floppy %1 (%2): %3"
+msgstr "Дисковод %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u МБ (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "Дисковод %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "&Дисковод %1 (%2): %3"
 
 msgid "Advanced sector images"
 msgstr "Розширені образи секторів"
@@ -814,9 +924,6 @@ msgstr "Розширені образи секторів"
 msgid "Flux images"
 msgstr "Образи Flux"
 
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "Неможливо ініціалізувати SDL, потрібно SDL2.dll"
-
 msgid "Are you sure you want to hard reset the emulated machine?"
 msgstr "Ви впевнені, що хочете виконати холодне перезавантаження емульованої машини?"
 
@@ -826,8 +933,14 @@ msgstr "Ви впевнені, що хочете вийти з 86Box?"
 msgid "Unable to initialize Ghostscript"
 msgstr "Неможливо ініціалізувати Ghostscript"
 
-msgid "MO %i (%ls): %ls"
-msgstr "Магнітооптичний %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "Неможливо ініціалізувати GhostPCL"
+
+msgid "MO %1 (%2): %3"
+msgstr "Магнітооптичний %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&Магнітооптичний %1 (%2): %3"
 
 msgid "MO images"
 msgstr "Образи магнітооптичних дисків"
@@ -835,8 +948,17 @@ msgstr "Образи магнітооптичних дисків"
 msgid "Welcome to 86Box!"
 msgstr "Ласкаво просимо в 86Box!"
 
-msgid "Internal controller"
-msgstr "Вбудований контролер"
+msgid "Internal device"
+msgstr "Вбудований пристрій"
+
+msgid "&File"
+msgstr "&Файл"
+
+msgid "&New machine..."
+msgstr "&Нова машина..."
+
+msgid "&Check for updates..."
+msgstr "&Перевірити оновлення..."
 
 msgid "Exit"
 msgstr "Вихід"
@@ -860,34 +982,22 @@ msgid "86Box v"
 msgstr "86Box v"
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "Емулятор старих комп'ютерів\n\nАвтори: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nВипускаєтся під ліцензією GNU General Public License версії 2 або більше пізніше. Додадкову інформацію см. у файлі LICENSE."
+msgstr "Емулятор старих комп'ютерів\n\nАвтори: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nЗ попередніми основними внесками Sarah Walker, leilei, JohnElliott, greatpsycho та інших.\n\nВипускаєтся під ліцензією GNU General Public License версії 2 або більше пізніше. Додадкову інформацію см. у файлі LICENSE."
 
 msgid "Hardware not available"
 msgstr "Обладнання недоступне"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "Переконайтесь, що libpcap встановлений і ваше мережеве з'єднання, сумісне з libpcap."
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "Переконайтесь, що %1 встановлений і ваше мережеве з'єднання, сумісне з %1."
 
 msgid "Invalid configuration"
 msgstr "Неприпустима конфігурація"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 потрібно для автоматичного перетворення файлів PostScript в PDF.\n\nВсі документи, відправлені на загальний принтер PostScript, будуть збережені у вигляді файлів PostScript (.ps)."
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " потрібно для автоматичного перетворення файлів PostScript в PDF.\n\nВсі документи, відправлені на загальний принтер PostScript, будуть збережені у вигляді файлів PostScript (.ps)."
-
-msgid "Entering fullscreen mode"
-msgstr "Вхід у повноекранний режим"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 потрібно для автоматичного перетворення файлів PCL в PDF.\n\nВсі документи, відправлені на загальний принтер PCL, будуть збережені у вигляді файлів Printer Command Language (.ps)."
 
 msgid "Don't show this message again"
 msgstr "Більше не показувати це повідомлення"
@@ -904,17 +1014,14 @@ msgstr "Не перезавантажувати"
 msgid "CD-ROM images"
 msgstr "Образи CD-ROM"
 
-msgid "%hs Device Configuration"
-msgstr "Конфігурація пристрою %hs"
+msgid "%1 Device Configuration"
+msgstr "Конфігурація пристрою %1"
 
 msgid "Monitor in sleep mode"
 msgstr "Монітор у сплячому режимі"
 
-msgid "OpenGL Shaders"
-msgstr "Шейдери OpenGL"
-
-msgid "OpenGL options"
-msgstr "Параметри OpenGL"
+msgid "GLSL shaders"
+msgstr "Шейдери GLSL"
 
 msgid "You are loading an unsupported configuration"
 msgstr "Ви завантажуєте непідтримувану конфігурацію"
@@ -925,30 +1032,33 @@ msgstr "Вибір типів ЦП для цієї системної плати
 msgid "Continue"
 msgstr "Продовжити"
 
-msgid "Cassette: %s"
-msgstr "Касета: %s"
+msgid "Cassette: %1"
+msgstr "Касета: %1"
+
+msgid "C&assette: %1"
+msgstr "К&асета: %1"
 
 msgid "Cassette images"
 msgstr "Образи касет"
 
-msgid "Cartridge %i: %ls"
-msgstr "Картридж %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "Картридж %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "Кар&тридж %1: %2"
 
 msgid "Cartridge images"
 msgstr "Образи картриджів"
 
-msgid "Error initializing renderer"
-msgstr "Помилка ініціалізації рендерера"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "Неможливо ініціалізувати рендерер OpenGL (3.0). Будь ласка, використовуйте інший рендерер."
-
 msgid "Resume execution"
 msgstr "Відновити виконання"
 
 msgid "Pause execution"
 msgstr "Призупинити виконання"
 
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del"
+
 msgid "Press Ctrl+Alt+Del"
 msgstr "Натиснути Ctrl+Alt+Del"
 
@@ -958,17 +1068,281 @@ msgstr "Натиснути Ctrl+Alt+Esc"
 msgid "Hard reset"
 msgstr "Холодне перезавантаження"
 
+msgid "Force shutdown"
+msgstr "Примусове завершення роботи"
+
+msgid "Start"
+msgstr "Пуск"
+
+msgid "Not running"
+msgstr "Не працює"
+
+msgid "Running"
+msgstr "Працює"
+
+msgid "Paused"
+msgstr "Призупинено"
+
+msgid "Waiting"
+msgstr "Очікування"
+
+msgid "Powered Off"
+msgstr "Вимкнено"
+
+msgid "%n running"
+msgstr "%n працює"
+
+msgid "%n paused"
+msgstr "%n призупинено"
+
+msgid "%n waiting"
+msgstr "%n очікує"
+
+msgid "%1 total"
+msgstr "всього %1"
+
+msgid "VMs: %1"
+msgstr "Машин: %1"
+
+msgid "System Directory:"
+msgstr "Системна папка:"
+
+msgid "Choose directory"
+msgstr "Вибрати папку"
+
+msgid "Choose configuration file"
+msgstr "Вибрати файл конфігурації"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "Файли конфігурації 86Box (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Збій під час читання конфігурації"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "Неможливо відкрити вибраний файл конфігурації для читання: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "Використовувати регулярні вирази в полі пошуку"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "%1 машина(и) наразі активна(і). Ви впевнені, що все одно хочете вийти з менеджера віртуальної машини?"
+
+msgid "Add new system wizard"
+msgstr "Майстер додавання нової системи"
+
+msgid "Introduction"
+msgstr "Вступ"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "Це допоможе вам додати нову систему в 86Box."
+
+msgid "New configuration"
+msgstr "Нова конфігурація"
+
+msgid "Complete"
+msgstr "Завершено"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "Майстер тепер запустить конфігурацію для нової системи."
+
+msgid "Use existing configuration"
+msgstr "Використовувати існуючу конфігурацію"
+
+msgid "Type some notes here"
+msgstr "Введіть тут кілька нотаток"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Вставте вміст існуючого файлу конфігурації в поле нижче."
+
+msgid "Load configuration from file"
+msgstr "Завантажити конфігурацію з файлу"
+
+msgid "System name"
+msgstr "Назва системи"
+
+msgid "System name:"
+msgstr "Назва системи:"
+
+msgid "System name cannot contain certain characters"
+msgstr "Назва системи не може містити певні символи"
+
+msgid "System name already exists"
+msgstr "Назва системи вже існує"
+
+msgid "Please enter a directory for the system"
+msgstr "Будь ласка, введіть папку для системи"
+
+msgid "Directory does not exist"
+msgstr "Папка не існує"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "Нова папка для системи буде створена у вибраній папці вище"
+
+msgid "System location:"
+msgstr "Розташування системи:"
+
+msgid "System name and location"
+msgstr "Назва системи та розташування"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Введіть назву системи та виберіть розташування"
+
+msgid "Enter the name of the system"
+msgstr "Введіть назву системи"
+
+msgid "Please enter a system name"
+msgstr "Будь ласка, введіть назву системи"
+
+msgid "Display name (optional):"
+msgstr "Відображуване ім'я (необов'язково):"
+
+msgid "Display name:"
+msgstr "Відображуване ім'я:"
+
+msgid "Set display name"
+msgstr "Встановити відображуване ім'я"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Введіть нове відображуване ім'я (порожнє, щоб скинути)"
+
+msgid "Change &display name..."
+msgstr "Змінити &відображуване ім'я..."
+
+msgid "Context Menu"
+msgstr "Контекстне меню"
+
+msgid "&Open folder..."
+msgstr "&Відкрити папку..."
+
+msgid "Open p&rinter tray..."
+msgstr "Відкрити папку &принтера..."
+
+msgid "Set &icon..."
+msgstr "Встановити &значок..."
+
+msgid "Select an icon"
+msgstr "Виберіть значок"
+
+msgid "C&lone..."
+msgstr "К&лонувати..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "Віртуальна машина \"%1\" (%2) буде клонована в:"
+
+msgid "Directory %1 already exists"
+msgstr "Папка %1 вже існує"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "Ви не можете використовувати наступні символи в імені: %1"
+
+msgid "Clone"
+msgstr "Клонувати"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Не вдалося створити папку для клонованої віртуальної машини"
+
+msgid "Failed to clone VM."
+msgstr "Не вдалося клонувати віртуальну машину."
+
+msgid "Directory in use"
+msgstr "Папка використовується"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "Вибрана папка вже використовується. Будь ласка, виберіть іншу папку."
+
+msgid "Create directory failed"
+msgstr "Не вдалося створити папку"
+
+msgid "Unable to create the directory for the new system"
+msgstr "Неможливо створити папку для нової системи"
+
+msgid "Configuration write failed"
+msgstr "Не вдалося записати файл конфігурації"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "Неможливо відкрити файл конфігурації в %1 для запису"
+
+msgid "Error adding system"
+msgstr "Помилка додавання системи"
+
+msgid "Remove directory failed"
+msgstr "Збій під час видалення папки"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "Деякі файли в папці машини неможливо видалити. Будь ласка, видаліть їх вручну."
+
+msgid "Build"
+msgstr "Збірка"
+
+msgid "Version"
+msgstr "Версія"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "Доступне оновлення для 86Box: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "Під час перевірки оновлень сталася помилка: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>Доступне оновлення для 86Box!</b>"
+
+msgid "Warning"
+msgstr "Увага"
+
+msgid "&Kill"
+msgstr "&Завершити процес"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "Примусове завершення процесу віртуальної машини може призвести до втрати даних. Робіть це тільки в тому випадку, якщо процес 86Box завис.\n\nВи дійсно хочете примусово завершити процес віртуальної машини \"%1\"?"
+
+msgid "&Delete"
+msgstr "&Видалити"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "Ви дійсно хочете видалити віртуальну машину \"%1\" і всі її файли? Цю дію не можна скасувати!"
+
+msgid "Show &config file"
+msgstr "Показати файл &конфігурації"
+
+msgid "No screenshot"
+msgstr "Немає скріншоту"
+
+msgid "Search"
+msgstr "Пошук"
+
+msgid "Searching for VMs..."
+msgstr "Пошук віртуальних машин..."
+
+msgid "Found %1"
+msgstr "Знайдено %1"
+
+msgid "System"
+msgstr "Система"
+
+msgid "Storage"
+msgstr "Диски"
+
+msgid "Disk %1: "
+msgstr "Диск %1: "
+
+msgid "No disks"
+msgstr "Немає дисків"
+
+msgid "Audio"
+msgstr "Аудіо"
+
+msgid "Audio:"
+msgstr "Аудіо:"
+
 msgid "ACPI shutdown"
 msgstr "Сигнал завершення ACPI"
 
-msgid "Hard disk (%s)"
-msgstr "Жорсткий диск (%s)"
+msgid "ACP&I shutdown"
+msgstr "Сигнал завершення ACP&I"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "Жорсткий диск (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
 msgstr "MFM/RLL або ESDI дисководів CD-ROM ніколи не існувало"
@@ -1003,9 +1377,6 @@ msgstr "Неможливо записати файл"
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
 msgstr "Образи HDI або HDX з розміром сектора, відмінним від 512, не підтримуються."
 
-msgid "USB is not yet supported"
-msgstr "USB поки не підтримується"
-
 msgid "Disk image file already exists"
 msgstr "Файл образу диска вже існує"
 
@@ -1039,6 +1410,27 @@ msgstr "Перезаписати"
 msgid "Don't overwrite"
 msgstr "Не перезаписувати"
 
+msgid "Raw image"
+msgstr "RAW образ"
+
+msgid "HDI image"
+msgstr "Образ HDI"
+
+msgid "HDX image"
+msgstr "Образ HDX"
+
+msgid "Fixed-size VHD"
+msgstr "VHD фіксованого розміру"
+
+msgid "Dynamic-size VHD"
+msgstr "VHD динамічного розміру"
+
+msgid "Differencing VHD"
+msgstr "Диференційований образ VHD"
+
+msgid "(N/A)"
+msgstr "(Ні)"
+
 msgid "Raw image (.img)"
 msgstr "RAW образ (.img)"
 
@@ -1070,7 +1462,7 @@ msgid "Select the parent VHD"
 msgstr "Виберіть батьківський VHD"
 
 msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
-msgstr "Це може означати, що батьківський образ був змінений після того, як було створено диференційований образ.\n\nЦе також може статися, якщо файли зображення були переміщені або скопійовані, або через помилку в програмі, що створила цей диск.\n \nВи хочете виправити тимчасові позначки?"
+msgstr "Це може означати, що батьківський образ був змінений після того, як було створено диференційований образ.\n\nЦе також може статися, якщо файли зображення були переміщені або скопійовані, або через помилку в програмі, що створила цей диск.\n\nВи хочете виправити тимчасові позначки?"
 
 msgid "Parent and child disk timestamps do not match"
 msgstr "Тимчасові мітки батьківського та дочірнього дисків не співпадають"
@@ -1078,9 +1470,6 @@ msgstr "Тимчасові мітки батьківського та дочір
 msgid "Could not fix VHD timestamp."
 msgstr "Не вдалося виправити тимчасову позначку VHD."
 
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
-
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
 
@@ -1096,44 +1485,29 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
+msgid "160 KB"
+msgstr "160 КБ"
 
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
+msgid "180 KB"
+msgstr "180 КБ"
 
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
+msgid "320 KB"
+msgstr "320 КБ"
 
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
+msgid "360 KB"
+msgstr "360 КБ"
 
-msgid "CD-ROM %i (%s): %s"
-msgstr "CD-ROM %i (%s): %s"
+msgid "640 KB"
+msgstr "640 КБ"
 
-msgid "160 kB"
-msgstr "160 кБ"
-
-msgid "180 kB"
-msgstr "180 кБ"
-
-msgid "320 kB"
-msgstr "320 кБ"
-
-msgid "360 kB"
-msgstr "360 кБ"
-
-msgid "640 kB"
-msgstr "640 кБ"
-
-msgid "720 kB"
-msgstr "720 кБ"
+msgid "720 KB"
+msgstr "720 КБ"
 
 msgid "1.2 MB"
 msgstr "1.2 МБ"
@@ -1227,3 +1601,1383 @@ msgstr "Швидкий"
 
 msgid "&Auto-pause on focus loss"
 msgstr "&Автопауза при втраті фокусу"
+
+msgid "WinBox is no longer supported"
+msgstr "WinBox більше не підтримується"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "Розробку менеджера WinBox було припинено у 2022 році через брак супровідників. Оскільки ми спрямовуємо наші зусилля на те, щоб зробити 86Box ще кращим, ми прийняли рішення більше не підтримувати WinBox як менеджер.\n\nБільше ніяких оновлень не буде надаватися через WinBox, і ви можете зіткнутися з некоректною поведінкою, якщо продовжите використовувати його з новими версіями 86Box. Будь-які повідомлення про помилки, пов'язані з поведінкою WinBox, будуть закриті як недійсні.\n\nПерейдіть на 86box.net для отримання списку інших менеджерів, які ви можете використовувати."
+
+msgid "Generate"
+msgstr "Згенерувати"
+
+msgid "Joystick configuration"
+msgstr "Конфігурація джойстика"
+
+msgid "Device"
+msgstr "Пристрій"
+
+msgid "%1 (X axis)"
+msgstr "%1 (вісь X)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (вісь Y)"
+
+msgid "MCA devices"
+msgstr "Пристрої MCA"
+
+msgid "List of MCA devices:"
+msgstr "Список пристроїв MCA:"
+
+msgid "&Tablet tool"
+msgstr "Інструмент для планшета"
+
+msgid "About &Qt"
+msgstr "Про &Qt"
+
+msgid "&MCA devices..."
+msgstr "Пристрої &MCA..."
+
+msgid "Show non-&primary monitors"
+msgstr "Показати неосновні монітори"
+
+msgid "Open screenshots &folder..."
+msgstr "Відкрийте папку скріншотів..."
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Застосовувати розстягування у повноекранному режимі у максимізованому стані"
+
+msgid "&Cursor/Puck"
+msgstr "&Курсор/шайба"
+
+msgid "&Pen"
+msgstr "&Ручка"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "CD/DVD &привід хоста (%1:)"
+
+msgid "&Connected"
+msgstr "&Підключено"
+
+msgid "Clear image &history"
+msgstr "Очистити історію образів"
+
+msgid "Create..."
+msgstr "Створити..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "CD/DVD привід хоста (%1)"
+
+msgid "Unknown Bus"
+msgstr "Невідома шина"
+
+msgid "Null Driver"
+msgstr "Нульовий драйвер"
+
+msgid "NIC:"
+msgstr "NIC:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "NIC %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&NIC %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "Поведінка рендерингу"
+
+msgid "Use target framerate:"
+msgstr "Використовувати цільову частоту кадрів:"
+
+msgid " fps"
+msgstr " fps"
+
+msgid "VSync"
+msgstr "VSync"
+
+msgid "Synchronize with video"
+msgstr "Синхронізація з відео"
+
+msgid "Shaders"
+msgstr "Шейдери"
+
+msgid "Remove"
+msgstr "Видалити"
+
+msgid "Browse..."
+msgstr "Переглянути..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "Не вдалося створити контекст OpenGL."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "Не вдалося переключитися на контекст OpenGL."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "Потрібна версія OpenGL 3.0 або новіша. Поточна версія %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "Помилка ініціалізації OpenGL"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nПовернення до програмного рендерингу."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>При виборі медіа-образів (CD-ROM, дискета і т.д.) діалогове вікно буде відкриватися в тому ж каталозі, що і файл конфігурації 86Box. Цей параметр, швидше за все, матиме значення лише на macOS.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "Цю машину могли перемістити або скопіювати."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "Щоб забезпечити належну мережеву функціональність, 86Box повинен знати, чи машина була переміщена або скопійована.\n\nЯкщо ви не впевнені, виберіте \"Скопійована\"."
+
+msgid "I Moved It"
+msgstr "Переміщена"
+
+msgid "I Copied It"
+msgstr "Скопійована"
+
+msgid "86Box Monitor #"
+msgstr "Монітор 86Box "
+
+msgid "No MCA devices."
+msgstr "Ніяких пристроїв MCA."
+
+msgid "MiB"
+msgstr "МіБ"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "Мережева карта 1"
+
+msgid "Network Card #2"
+msgstr "Мережева карта 2"
+
+msgid "Network Card #3"
+msgstr "Мережева карта 3"
+
+msgid "Network Card #4"
+msgstr "Мережева карта 4"
+
+msgid "Mode:"
+msgstr "Режим:"
+
+msgid "Interface:"
+msgstr "Інтерфейс:"
+
+msgid "Adapter:"
+msgstr "Адаптер:"
+
+msgid "VDE Socket:"
+msgstr "VDE сокет:"
+
+msgid "86Box Unit Tester"
+msgstr "Тестер блоків 86Box"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Ключова картка Novell NetWare 2.x"
+
+msgid "Serial port passthrough 1"
+msgstr "Пропуск послідовного порту 1"
+
+msgid "Serial port passthrough 2"
+msgstr "Пропуск послідовного порту 2"
+
+msgid "Serial port passthrough 3"
+msgstr "Пропуск послідовного порту 3"
+
+msgid "Serial port passthrough 4"
+msgstr "Пропуск послідовного порту 4"
+
+msgid "Renderer &options..."
+msgstr "Параметри рендерингу..."
+
+msgid "PC/XT Keyboard"
+msgstr "Клавіатура PC/XT"
+
+msgid "AT Keyboard"
+msgstr "Клавіатура AT"
+
+msgid "AX Keyboard"
+msgstr "Клавіатура AX"
+
+msgid "PS/2 Keyboard"
+msgstr "Клавіатура PS/2"
+
+msgid "PS/55 Keyboard"
+msgstr "Клавіатура PS/55"
+
+msgid "Keys"
+msgstr "Клавіші"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Шинна миша Logitech/Microsoft"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Шинна миша Microsoft (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Послідовна миша Mouse Systems"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Шинна миша Mouse Systems"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Послідовна миша Microsoft"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Послідовна миша Microsoft BallPoint"
+
+msgid "Logitech Serial Mouse"
+msgstr "Послідовна миша Logitech"
+
+msgid "PS/2 Mouse"
+msgstr "Миша PS/2"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "Миша PS/2 QuickPort"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (послідовна)"
+
+msgid "Default Baud rate"
+msgstr "Швидкість передачі даних за замовчуванням"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] Стандартний модем, сумісний зі стандартом Hayes"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Емуляція Roland MT-32"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Емуляція Roland MT-32 (новий)"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Емуляція Roland CM-32L"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Емуляція Roland CM-32LN"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "Дочірня плата OPL4-ML"
+
+msgid "System MIDI"
+msgstr "MIDI системи"
+
+msgid "MIDI Input Device"
+msgstr "Пристрій введення MIDI"
+
+msgid "BIOS file"
+msgstr "Файл BIOS"
+
+msgid "BIOS file (ROM #1)"
+msgstr "Файл BIOS (ПЗУ #1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "Файл BIOS (ПЗУ #2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "Файл BIOS (ПЗУ #3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "Файл BIOS (ПЗУ #4)"
+
+msgid "BIOS address"
+msgstr "Адреса BIOS"
+
+msgid "BIOS address (ROM #1)"
+msgstr "Адреса BIOS (ПЗУ #1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "Адреса BIOS (ПЗУ #2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "Адреса BIOS (ПЗУ #3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "Адреса BIOS (ПЗУ #4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "Увімкнути розширення BIOS Записи в ПЗУ"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "Увімкнути розширення BIOS Записи в ПЗУ (ПЗУ #1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "Увімкнути розширення BIOS Записи в ПЗУ (ПЗУ #2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "Увімкнути розширення BIOS Записи в ПЗУ (ПЗУ #3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "Увімкнути розширення BIOS Записи в ПЗУ (ПЗУ #4)"
+
+msgid "Linear framebuffer base"
+msgstr "Лінійний фреймбуфер"
+
+msgid "Address"
+msgstr "Адреса"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "IRQ послідовного порту"
+
+msgid "Parallel port IRQ"
+msgstr "IRQ паралельного порту"
+
+msgid "BIOS Revision"
+msgstr "Ревізія BIOS"
+
+msgid "BIOS Version"
+msgstr "Версія BIOS"
+
+msgid "BIOS Language"
+msgstr "Мова BIOS"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "Блок розширення IBM 5161"
+
+msgid "IBM Cassette Basic"
+msgstr "Касетний бейсік IBM"
+
+msgid "Translate 26 -> 17"
+msgstr "Перекладіть 26 -> 17"
+
+msgid "Language"
+msgstr "Мова"
+
+msgid "Enable backlight"
+msgstr "Увімкнути підсвічування"
+
+msgid "Invert colors"
+msgstr "Інвертувати кольори"
+
+msgid "BIOS size"
+msgstr "Розмір BIOS"
+
+msgid "BIOS size (ROM #1)"
+msgstr "Розмір BIOS (ПЗУ 1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "Розмір BIOS (ПЗУ 2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "Розмір BIOS (ПЗУ 3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "Розмір BIOS (ПЗУ 4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "Зіставлення C0000-C7FFF як UMB"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "Зіставлення C8000-CFFFF як UMB"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "Зіставлення D0000-D7FFF як UMB"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "Зіставлення D8000-DFFFF як UMB"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "Зіставлення E0000-E7FFF як UMB"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "Зіставлення E8000-EFFFF як UMB"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "Джампер JS9 (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "Вихідний пристрій MIDI"
+
+msgid "MIDI Real time"
+msgstr "MIDI в реальному часі"
+
+msgid "MIDI Thru"
+msgstr "Прохід MIDI-вхіду"
+
+msgid "MIDI Clockout"
+msgstr "Вихід MIDI-годинника"
+
+msgid "SoundFont"
+msgstr "SoundFont"
+
+msgid "Output Gain"
+msgstr "Вихідний коефіцієнт підсилення"
+
+msgid "Chorus"
+msgstr "Приспів"
+
+msgid "Chorus Voices"
+msgstr "Голоси приспіву"
+
+msgid "Chorus Level"
+msgstr "Рівень приспіву"
+
+msgid "Chorus Speed"
+msgstr "Швидкість приспіву"
+
+msgid "Chorus Depth"
+msgstr "Глибина приспіву"
+
+msgid "Chorus Waveform"
+msgstr "Форма сигналу приспіву"
+
+msgid "Reverb"
+msgstr "Реверберація"
+
+msgid "Reverb Room Size"
+msgstr "Розмір ревербераційної кімнати"
+
+msgid "Reverb Damping"
+msgstr "Демпфування реверберації"
+
+msgid "Reverb Width"
+msgstr "Ширина реверберації"
+
+msgid "Reverb Level"
+msgstr "Рівень реверберації"
+
+msgid "Interpolation Method"
+msgstr "Метод інтерполяції"
+
+msgid "Dynamic Sample Loading"
+msgstr "Динамічне завантаження семплів"
+
+msgid "Reverb Output Gain"
+msgstr "Посилення виходу реверберації"
+
+msgid "Reversed stereo"
+msgstr "Реверсивне стерео"
+
+msgid "Nice ramp"
+msgstr "Гарний пандус"
+
+msgid "Hz"
+msgstr "Гц"
+
+msgid "Buttons"
+msgstr "Кнопки"
+
+msgid "Serial Port"
+msgstr "Послідовний порт"
+
+msgid "RTS toggle"
+msgstr "Перемикач RTS"
+
+msgid "Revision"
+msgstr "Ревізія"
+
+msgid "Controller"
+msgstr "Контролер"
+
+msgid "Show Crosshair"
+msgstr "Показати перехрестя"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "MAC-адреса"
+
+msgid "MAC Address OUI"
+msgstr "MAC-адреса OUI"
+
+msgid "Enable BIOS"
+msgstr "Увімкнення BIOS"
+
+msgid "Baud Rate"
+msgstr "Швидкість передачі даних"
+
+msgid "TCP/IP listening port"
+msgstr "Порт прослуховування TCP/IP"
+
+msgid "Phonebook File"
+msgstr "Файл телефонної книги"
+
+msgid "Telnet emulation"
+msgstr "Емуляція Telnet"
+
+msgid "RAM Address"
+msgstr "Адреса оперативної пам'яті"
+
+msgid "RAM size"
+msgstr "Розмір оперативної пам'яті"
+
+msgid "Initial RAM size"
+msgstr "Початковий розмір оперативної пам'яті"
+
+msgid "Serial Number"
+msgstr "Серійний номер"
+
+msgid "Host ID"
+msgstr "Ідентифікатор хоста"
+
+msgid "FDC Address"
+msgstr "Адреса FDC"
+
+msgid "MPU-401 Address"
+msgstr "Адреса MPU-401"
+
+msgid "MPU-401 IRQ"
+msgstr "IRQ MPU-401"
+
+msgid "Receive MIDI input"
+msgstr "Отримання MIDI-входу"
+
+msgid "Low DMA"
+msgstr "Низький рівень DMA"
+
+msgid "Enable Game port"
+msgstr "Увімкнути ігровий порт"
+
+msgid "SID Model"
+msgstr "Модель SID"
+
+msgid "SID Filter Strength"
+msgstr "Сила фільтра SID"
+
+msgid "Surround module"
+msgstr "Модуль об'ємного звучання"
+
+msgid "CODEC"
+msgstr "CODEC"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "Піднімати переривання CODEC під час встановлення CODEC (потрібно для деяких драйверів)"
+
+msgid "SB Address"
+msgstr "Адреса SB"
+
+msgid "Adlib Address"
+msgstr "Адреса AdLib"
+
+msgid "Use EEPROM setting"
+msgstr "Використовувати налаштування EEPROM"
+
+msgid "WSS IRQ"
+msgstr "IRQ WSS"
+
+msgid "WSS DMA"
+msgstr "DMA WSS"
+
+msgid "Enable OPL"
+msgstr "Ввімкнути OPL"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "Отримання MIDI-входу (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "SB низький DMA"
+
+msgid "6CH variant (6-channel)"
+msgstr "Варіант 6CH (6-канальний)"
+
+msgid "Enable CMS"
+msgstr "Ввімкнути CMS"
+
+msgid "Mixer"
+msgstr "Міксер"
+
+msgid "High DMA"
+msgstr "Високий DMA"
+
+msgid "Control PC speaker"
+msgstr "Керування динаміком ПК"
+
+msgid "Memory size"
+msgstr "Обсяг пам'яті"
+
+msgid "EMU8000 Address"
+msgstr "Адреса EMU8000"
+
+msgid "IDE Controller"
+msgstr "Контролер IDE"
+
+msgid "Codec"
+msgstr "Кодек"
+
+msgid "GUS type"
+msgstr "Тип GUS"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "Увімкнути команду 0x04 \"Вихід з 86Box\"."
+
+msgid "Display type"
+msgstr "Тип відображення"
+
+msgid "Composite type"
+msgstr "Композитний тип"
+
+msgid "RGB type"
+msgstr "Тип RGB"
+
+msgid "Line doubling type"
+msgstr "Тип подвоєння лінії"
+
+msgid "Snow emulation"
+msgstr "Емуляція снігу"
+
+msgid "Monitor type"
+msgstr "Тип монітора"
+
+msgid "Character set"
+msgstr "Набір символів"
+
+msgid "XGA type"
+msgstr "Тип XGA"
+
+msgid "Instance"
+msgstr "Примірник"
+
+msgid "MMIO Address"
+msgstr "Адреса MMIO"
+
+msgid "RAMDAC type"
+msgstr "Тип RAMDAC"
+
+msgid "Blend"
+msgstr "Суміш"
+
+msgid "Font"
+msgstr "Шрифт"
+
+msgid "Bilinear filtering"
+msgstr "Білінійна фільтрація"
+
+msgid "Video chroma-keying"
+msgstr "Відео хромакеїнг"
+
+msgid "Dithering"
+msgstr "Дизеринг"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "Увімкнути NMI для емуляції CGA"
+
+msgid "Voodoo type"
+msgstr "Тип вуду"
+
+msgid "Framebuffer memory size"
+msgstr "Розмір пам'яті фреймбуфера"
+
+msgid "Texture memory size"
+msgstr "Розмір пам'яті текстур"
+
+msgid "Dither subtraction"
+msgstr "Віднімання з похибкою"
+
+msgid "Screen Filter"
+msgstr "Сітчастий фільтр"
+
+msgid "Render threads"
+msgstr "Відрендерити потоки"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Початкова адреса"
+
+msgid "Contiguous Size"
+msgstr "Суміжний розмір"
+
+msgid "I/O Width"
+msgstr "Ширина вводу/виводу"
+
+msgid "Transfer Speed"
+msgstr "Швидкість передачі даних"
+
+msgid "EMS mode"
+msgstr "Режим EMS"
+
+msgid "EMS Address"
+msgstr "Адреса EMS"
+
+msgid "EMS 1 Address"
+msgstr "Адреса EMS 1"
+
+msgid "EMS 2 Address"
+msgstr "Адреса EMS 2"
+
+msgid "EMS Memory Size"
+msgstr "Розмір пам'яті EMS"
+
+msgid "EMS 1 Memory Size"
+msgstr "Розмір пам'яті EMS 1"
+
+msgid "EMS 2 Memory Size"
+msgstr "Розмір пам'яті EMS 2"
+
+msgid "Enable EMS"
+msgstr "Увімкнути EMS"
+
+msgid "Enable EMS 1"
+msgstr "Увімкнути EMS 1"
+
+msgid "Enable EMS 2"
+msgstr "Увімкнути EMS 2"
+
+msgid "Address for > 2 MB"
+msgstr "Адреса для > 2 МБ"
+
+msgid "Frame Address"
+msgstr "Адреса кадру"
+
+msgid "USA"
+msgstr "США"
+
+msgid "Danish"
+msgstr "Данська"
+
+msgid "Always at selected speed"
+msgstr "Завжди на обраній швидкості"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "Налаштування BIOS + Гарячі клавіші (вимкнено під час POST)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 KБ, починаючи з F0000"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 KБ, починаючи з E0000 (адреса MSB інвертована, останні 64 KБ першими)"
+
+msgid "Sine"
+msgstr "Синусоїдальна"
+
+msgid "Triangle"
+msgstr "Трикутна"
+
+msgid "Linear"
+msgstr "Лінійний"
+
+msgid "4th Order"
+msgstr "4-го порядку"
+
+msgid "7th Order"
+msgstr "7-го порядку"
+
+msgid "Non-timed (original)"
+msgstr "Без таймера (оригінал)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Гц (без джампера на JMP2)"
+
+msgid "Two"
+msgstr "Два"
+
+msgid "Three"
+msgstr "Три"
+
+msgid "Wheel"
+msgstr "Колесо"
+
+msgid "Five + Wheel"
+msgstr "П'ять + колесо"
+
+msgid "Five + 2 Wheels"
+msgstr "П'ять + 2 колеса"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 послідовна / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) послідовна"
+
+msgid "8 KB"
+msgstr "8 КБ"
+
+msgid "32 KB"
+msgstr "32 КБ"
+
+msgid "16 KB"
+msgstr "16 КБ"
+
+msgid "64 KB"
+msgstr "64 КБ"
+
+msgid "Disable BIOS"
+msgstr "Вимкнення BIOS"
+
+msgid "512 KB"
+msgstr "512 КБ"
+
+msgid "2 MB"
+msgstr "2 МБ"
+
+msgid "8 MB"
+msgstr "8 МБ"
+
+msgid "28 MB"
+msgstr "28 МБ"
+
+msgid "1 MB"
+msgstr "1 МБ"
+
+msgid "4 MB"
+msgstr "4 МБ"
+
+msgid "12 MB"
+msgstr "12 МБ"
+
+msgid "16 MB"
+msgstr "16 МБ"
+
+msgid "20 MB"
+msgstr "20 МБ"
+
+msgid "24 MB"
+msgstr "24 МБ"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (стерео)"
+
+msgid "Classic"
+msgstr "Класичний"
+
+msgid "256 KB"
+msgstr "256 КБ"
+
+msgid "Composite"
+msgstr "Композитний"
+
+msgid "True color"
+msgstr "True Color"
+
+msgid "Old"
+msgstr "Старий"
+
+msgid "New"
+msgstr "Новий"
+
+msgid "Color (generic)"
+msgstr "Кольоровий (загальний)"
+
+msgid "Green Monochrome"
+msgstr "Зелений монохромний"
+
+msgid "Amber Monochrome"
+msgstr "Бурштиновий монохромний"
+
+msgid "Gray Monochrome"
+msgstr "Сірий монохромний"
+
+msgid "Color (no brown)"
+msgstr "Кольоровий (без коричневого)"
+
+msgid "Color (IBM 5153)"
+msgstr "Кольоровий (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Просте подвоєння"
+
+msgid "sRGB interpolation"
+msgstr "sRGB інтерполяція"
+
+msgid "Linear interpolation"
+msgstr "Лінійна інтерполяція"
+
+msgid "Has secondary 8x8 character set"
+msgstr "Вторинний набір символів 8x8"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Дочірня плата Quadcolor II"
+
+msgid "Alternate monochrome contrast"
+msgstr "Альтернативний монохромний контраст"
+
+msgid "128 KB"
+msgstr "128 КБ"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Монохромний (5151/MDA) (білий)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Монохромний (5151/MDA) (зелений)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Монохромний (5151/MDA) (бурштиновий)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Кольоровий 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Кольоровий 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Покращений колір - звичайний режим (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Покращений колір - розширений режим (5154/ECD)"
+
+msgid "Green"
+msgstr "Зелений"
+
+msgid "Amber"
+msgstr "Бурштиновий"
+
+msgid "Gray"
+msgstr "Сірий"
+
+msgid "Grayscale"
+msgstr "Монохромний"
+
+msgid "Color"
+msgstr "Кольоровий"
+
+msgid "U.S. English"
+msgstr "Американський англійський"
+
+msgid "Scandinavian"
+msgstr "Скандинавський"
+
+msgid "Other languages"
+msgstr "Інші мови"
+
+msgid "Bochs latest"
+msgstr "Bochs останній"
+
+msgid "Apply overscan deltas"
+msgstr "Застосувати дельти вильотів розгортки"
+
+msgid "Mono Interlaced"
+msgstr "Монохромний інтерлейсний"
+
+msgid "Mono Non-Interlaced"
+msgstr "Монохромний неінтерлейсний"
+
+msgid "Color Interlaced"
+msgstr "Кольоровий інтерлейсний"
+
+msgid "Color Non-Interlaced"
+msgstr "Кольоровий неінтерлейсний"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "Прискорювач 3Dfx Voodoo"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 TMU)"
+
+msgid "8-bit"
+msgstr "8-розрядний"
+
+msgid "16-bit"
+msgstr "16-розрядний"
+
+msgid "Standard (150ns)"
+msgstr "Стандартний (150 нс)"
+
+msgid "High-Speed (120ns)"
+msgstr "Високошвидкісний (120нс)"
+
+msgid "Enabled"
+msgstr "Увімкнено"
+
+msgid "Standard"
+msgstr "Стандартний"
+
+msgid "High-Speed"
+msgstr "Високошвидкісний"
+
+msgid "Stereo LPT DAC"
+msgstr "Стерео LPT ЦАП"
+
+msgid "Generic Text Printer"
+msgstr "Загальний текстовий принтер"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Загальний матричний принтер ESC/P 2"
+
+msgid "Generic PostScript Printer"
+msgstr "Загальний принтер PostScript"
+
+msgid "Generic PCL5e Printer"
+msgstr "Загальний принтер PCL5e"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Parallel Line Internet Protocol"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Ключовий захист для Savage Quest"
+
+msgid "Serial Passthrough Device"
+msgstr "Пристрій для пропуску послідовного порту"
+
+msgid "Passthrough Mode"
+msgstr "Наскрізний режим"
+
+msgid "Host Serial Device"
+msgstr "Послідовний пристрій хоста"
+
+msgid "Name of pipe"
+msgstr "Назва пайпа"
+
+msgid "Data bits"
+msgstr "Біти даних"
+
+msgid "Stop bits"
+msgstr "Стоп-біти"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Швидкість передачі даних пропуску"
+
+msgid "Named Pipe (Server)"
+msgstr "Іменований пайп (сервер)"
+
+msgid "Named Pipe (Client)"
+msgstr "Іменований пайп (клієнт)"
+
+msgid "Host Serial Passthrough"
+msgstr "Пропуск послідовного порту хоста"
+
+msgid "E&ject %1"
+msgstr "&Вилучити %1"
+
+msgid "&Unmute"
+msgstr "&Увімкнути звук"
+
+msgid "Softfloat FPU"
+msgstr "FPU Softfloat"
+
+msgid "High performance impact"
+msgstr "Високий вплив на продуктивність"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Стандартний] Диск оперативної пам'яті (макс. швидкість)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Стандартний] 1989 (3500 RPM)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Стандартний] 1992 (3600 RPM)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Стандартний] 1994 (4500 RPM)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Стандартний] 1996 (5400 RPM)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Стандартний] 1997 (5400 RPM)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Стандартний] 1998 (5400 RPM)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Стандартний] 2000 (7200 RPM)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "Клон IBM 8514/A (ISA)"
+
+msgid "Vendor"
+msgstr "Виробник"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Гц (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Гц (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Загальне розширення пам'яті PC/XT"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Загальне розширення пам'яті PC/AT"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "Неможливо знайти матричні шрифти"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "Шрифти TrueType у каталозі \"roms/printer/fonts\" потрібні для емуляції загального матричного принтера Generic ESC/P 2."
+
+msgid "Inhibit multimedia keys"
+msgstr "Перехоплювати мультимедійні клавіші"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Запитувати підтвердження перед збереженням налаштувань"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Запитувати підтвердження перед холодним перезавантаженням"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Запитувати підтвердження перед виходом"
+
+msgid "Options"
+msgstr "Параметри"
+
+msgid "Model"
+msgstr "Модель"
+
+msgid "Model:"
+msgstr "Модель:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Не вдалося ініціалізувати рендеринг Vulkan."
+
+msgid "GLSL Error"
+msgstr "Помилка GLSL"
+
+msgid "Could not load shader: %1"
+msgstr "Не вдалося завантажити шейдер: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "Потрібна OpenGL версії 3.0 або вище. Поточна версія GLSL %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "Не вдалося завантажити текстуру: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "Не вдалося скомпілювати шейдер:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "Не вдалося скомпонувати шейдер:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "Управління шейдерами"
+
+msgid "Shader Configuration"
+msgstr "Конфігурація шейдера"
+
+msgid "Add"
+msgstr "Додати"
+
+msgid "Move up"
+msgstr "Вгору"
+
+msgid "Move down"
+msgstr "Вниз"
+
+msgid "Could not load file %1"
+msgstr "Не вдалося завантажити файл %1"
+
+msgid "Key Bindings:"
+msgstr "Прив'язки клавіш:"
+
+msgid "Action"
+msgstr "Дія"
+
+msgid "Keybind"
+msgstr "Прив'язка клавіш"
+
+msgid "Clear binding"
+msgstr "Очистити прив'язку"
+
+msgid "Bind"
+msgstr "Прив'язка"
+
+msgid "Bind Key"
+msgstr "Прив'язати клавішу"
+
+msgid "Enter key combo:"
+msgstr "Введіть комбінацію клавіш:"
+
+msgid "Bind conflict"
+msgstr "Конфлікт прив'язки"
+
+msgid "This key combo is already in use."
+msgstr "Ця комбінація клавіш вже використовується."
+
+msgid "Send Control+Alt+Del"
+msgstr "Надіслати Control+Alt+Del"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Надіслати Control+Alt+Escape"
+
+msgid "Toggle fullscreen"
+msgstr "Переключити повноекранний режим"
+
+msgid "Screenshot"
+msgstr "Скріншот"
+
+msgid "Release mouse pointer"
+msgstr "Відпустити вказівник миші"
+
+msgid "Toggle pause"
+msgstr "Переключити паузу"
+
+msgid "Toggle mute"
+msgstr "Переключити беззвучний режим"
+
+msgid "Text files"
+msgstr "Текстові файли"
+
+msgid "ROM files"
+msgstr "Файли ПЗУ"
+
+msgid "SoundFont files"
+msgstr "Файли SoundFont"
+
+msgid "Local Switch"
+msgstr "Локальний комутатор"
+
+msgid "Remote Switch"
+msgstr "Віддалений комутатор"
+
+msgid "Switch:"
+msgstr "Номер комутатора:"
+
+msgid "Hub Mode"
+msgstr "Режим концентратора"
+
+msgid "Hostname:"
+msgstr "Ім'я хоста:"
+
+msgid "ISA RAM:"
+msgstr "ISA ОЗУ:"
+
+msgid "ISA ROM:"
+msgstr "ISA ПЗУ:"
+
+msgid "&Wipe NVRAM"
+msgstr "&Стерти NVRAM"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "Це видалить всі файли NVRAM (і пов'язані) віртуальної машини, розташованої в підпапці «nvr». Вам доведеться знову налаштувати BIOS (і, можливо, інші пристрої всередині віртуальної машини), якщо це необхідно. Ви впевнені, що хочете стерти весь вміст NVRAM віртуальної машини \"%1\"?"
+
+msgid "Success"
+msgstr "Успішно"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "Успішно стерто вміст NVRAM віртуальної машини \"%1\""
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "Сталася помилка при спробі стерти вміст NVRAM віртуальної машини \"%1\""
+
+msgid "%1 VM Manager"
+msgstr "Менеджер віртуальних машин %1"
+
+msgid "%n disk(s)"
+msgstr "%n диск(ів)"
+
+msgid "Unknown Status"
+msgstr "Невідомий статус"
+
+msgid "No Machines Found!"
+msgstr "Машини не знайдені!"
+
+msgid "Check for updates on startup"
+msgstr "Перевіряти оновлення під час запуску"
+
+msgid "Unable to determine release information"
+msgstr "Неможливо визначити інформацію про реліз"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Сталася помилка під час перевірки оновлень:\n\n%1\n\nБудь ласка, спробуйте ще раз пізніше."
+
+msgid "Update check complete"
+msgstr "Перевірка оновлень завершена"
+
+msgid "stable"
+msgstr "стабільну"
+
+msgid "beta"
+msgstr "бета"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Ви використовуєте останню %1 версію 86Box: %2"
+
+msgid "version"
+msgstr "версія"
+
+msgid "build"
+msgstr "збірка"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Ви зараз використовуєте версію <b>%1</b>."
+
+msgid "<b>Version %1</b> is now available."
+msgstr "Доступна <b>версія %1</b>."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Ви зараз використовуєте збірку <b>%1</b>."
+
+msgid "<b>Build %1</b> is now available."
+msgstr "Доступна <b>збірка %1</b>."
+
+msgid "Would you like to visit the download page?"
+msgstr "Відкрити сторінку завантаження?"
+
+msgid "Visit download page"
+msgstr "Відкрити сторінку завантаження"
+
+msgid "Update check"
+msgstr "Перевірка оновлень"
+
+msgid "Checking for updates..."
+msgstr "Перевірка оновлень..."
+
+msgid "86Box Update"
+msgstr "Оновлення 86Box"
+
+msgid "Release notes:"
+msgstr "Примітки до релізу:"
+
+msgid "%1 Hz"
+msgstr "%1 Гц"
+
+msgid "Virtual machine crash"
+msgstr "Збій віртуальної машини"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "Процес віртуальної машини \"%1\" несподівано завершився з кодом завершення %2."
+
+msgid "The system will not be added."
+msgstr "Система не буде додана."
+
+msgid "&Update mouse every CPU frame"
+msgstr "&Оновлювати мишу при кожному кадрі ЦП"
+
+msgid "Hue"
+msgstr "Відтінок"
+
+msgid "Saturation"
+msgstr "Насичення"
+
+msgid "Contrast"
+msgstr "Контраст"
+
+msgid "Brightness"
+msgstr "Яскравість"
+
+msgid "Sharpness"
+msgstr "Гострота"
+
+msgid "&CGA composite settings..."
+msgstr "Налаштування композитного відео &CGA..."
+
+msgid "CGA composite settings"
+msgstr "Налаштування композитного відео CGA"
+
+msgid "Monitor EDID"
+msgstr "EDID монітора"
+
+msgid "Export..."
+msgstr "Експорт..."
+
+msgid "Export EDID"
+msgstr "Експорт EDID"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "Файл EDID \"%ls\" занадто великий."
+
+msgid "OpenGL input scale"
+msgstr "Шкала введення OpenGL"
+
+msgid "OpenGL input stretch mode"
+msgstr "Режим розтягування вхідних даних OpenGL"
+
+msgid "Color scheme"
+msgstr "Колірна гамма"
+
+msgid "Light"
+msgstr "Світло"
+
+msgid "Dark"
+msgstr "Темний"
diff --git a/src/qt/languages/vi-VN.po b/src/qt/languages/vi-VN.po
new file mode 100644
index 000000000..0190aee4c
--- /dev/null
+++ b/src/qt/languages/vi-VN.po
@@ -0,0 +1,2983 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: vi_VN\n"
+"X-Source-Language: en_US\n"
+
+msgid "&Action"
+msgstr "&Thực hiện"
+
+msgid "&Keyboard requires capture"
+msgstr "Bàn phím &hoạt động cần 'bắt' chuột"
+
+msgid "&Right CTRL is left ALT"
+msgstr "Gắn ALT trái vào CTRL ph&ải"
+
+msgid "&Hard Reset..."
+msgstr "Buộc khởi độn&g lại"
+
+msgid "&Ctrl+Alt+Del"
+msgstr "&Ctrl+Alt+Del"
+
+msgid "Ctrl+Alt+&Esc"
+msgstr "Ctrl+Alt+&Esc"
+
+msgid "&Pause"
+msgstr "Tạm &dừng"
+
+msgid "Pause"
+msgstr "Tạm dừng"
+
+msgid "Re&sume"
+msgstr "Tiếp tục"
+
+msgid "E&xit"
+msgstr "Th&oát"
+
+msgid "&View"
+msgstr "&Xem"
+
+msgid "&Hide status bar"
+msgstr "Ẩn tha&nh trạng thái"
+
+msgid "Hide &toolbar"
+msgstr "Ẩn thanh &công cụ"
+
+msgid "&Resizeable window"
+msgstr "Tùy chỉnh cỡ cử&a sổ"
+
+msgid "R&emember size && position"
+msgstr "Ghi nhớ vị trí và kíc&h thước cửa sổ"
+
+msgid "Re&nderer"
+msgstr "Re&nderer"
+
+msgid "&Qt (Software)"
+msgstr "&Qt (phần mềm)"
+
+msgid "Open&GL (3.0 Core)"
+msgstr "Open&GL (3.0 Core)"
+
+msgid "&VNC"
+msgstr "&VNC"
+
+msgid "Specify &dimensions..."
+msgstr "Tự nhập độ &phân giải..."
+
+msgid "Force &4:3 display ratio"
+msgstr "Giữ nguyên khung hình &4:3"
+
+msgid "&Window scale factor"
+msgstr "Đổi &tỷ lệ cửa sổ"
+
+msgid "&0.5x"
+msgstr "&0.5x"
+
+msgid "&1x"
+msgstr "&1x"
+
+msgid "1.&5x"
+msgstr "1.&5x"
+
+msgid "&2x"
+msgstr "&2x"
+
+msgid "&3x"
+msgstr "&3x"
+
+msgid "&4x"
+msgstr "&4x"
+
+msgid "&5x"
+msgstr "&5x"
+
+msgid "&6x"
+msgstr "&6x"
+
+msgid "&7x"
+msgstr "&7x"
+
+msgid "&8x"
+msgstr "&8x"
+
+msgid "Fi&lter method"
+msgstr "&Bộ lọc hình ảnh"
+
+msgid "&Nearest"
+msgstr "&Cực cận"
+
+msgid "&Linear"
+msgstr "Tu&yến tính"
+
+msgid "Hi&DPI scaling"
+msgstr "Tỷ lệ hinh ảnh phân giải cao"
+
+msgid "&Fullscreen"
+msgstr "Toàn màn &hình"
+
+msgid "Fullscreen &stretch mode"
+msgstr "&Chế độ kéo giãn hình"
+
+msgid "&Full screen stretch"
+msgstr "Kéo giãn hình"
+
+msgid "&4:3"
+msgstr "&4:3"
+
+msgid "&Square pixels (Keep ratio)"
+msgstr "Điểm ảnh vuông (giữ tỷ lệ)"
+
+msgid "&Integer scale"
+msgstr "Căn tỷ lệ số nguyên"
+
+msgid "4:&3 Integer scale"
+msgstr "Căn tỷ lệ 4:3 số nguyên"
+
+msgid "EGA/(S)&VGA settings"
+msgstr "Cài đặt EGA/(S)&VGA"
+
+msgid "&Inverted VGA monitor"
+msgstr "Đảo mà&u VGA"
+
+msgid "VGA screen &type"
+msgstr "L&oại màn VGA"
+
+msgid "RGB &Color"
+msgstr "Màu R&GB"
+
+msgid "RGB (no brown)"
+msgstr "RGB (không nâu)"
+
+msgid "&RGB Grayscale"
+msgstr "Thang xám RG&B"
+
+msgid "Generic RGBI color monitor"
+msgstr "Màn hình màu RGBI chung"
+
+msgid "&Amber monitor"
+msgstr "Màn hình vàng hổ phách (amber)"
+
+msgid "&Green monitor"
+msgstr "Màn hình lục"
+
+msgid "&White monitor"
+msgstr "Màn hinh trắng"
+
+msgid "Grayscale &conversion type"
+msgstr "Chuyển đổi thang &màu xám"
+
+msgid "BT&601 (NTSC/PAL)"
+msgstr "BT&601 (NTSC/PAL)"
+
+msgid "BT&709 (HDTV)"
+msgstr "BT&709 (HDTV)"
+
+msgid "&Average"
+msgstr "&Trung bình"
+
+msgid "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
+msgstr "&Overscan CGA/PCjr/Tandy/EGA/(S)VGA"
+
+msgid "Change contrast for &monochrome display"
+msgstr "Chỉnh tương phản cho màn hình đơn sắc"
+
+msgid "&Media"
+msgstr "&Phương tiện"
+
+msgid "&Tools"
+msgstr "&Công cụ"
+
+msgid "&Settings..."
+msgstr "&Cài đặt..."
+
+msgid "Settings..."
+msgstr "Cài đặt"
+
+msgid "&Update status bar icons"
+msgstr "Cậ&p nhật biểu tượng thanh trạng thái"
+
+msgid "Take s&creenshot"
+msgstr "Chụp &màn hình"
+
+msgid "S&ound"
+msgstr "&Âm thanh"
+
+msgid "&Preferences..."
+msgstr "&Tùy biến..."
+
+msgid "Enable &Discord integration"
+msgstr "Bật trình trạng thái cho Discord"
+
+msgid "Sound &gain..."
+msgstr "Bộ &tăng âm..."
+
+msgid "Begin trace"
+msgstr "Bắt đầu dò"
+
+msgid "End trace"
+msgstr "Ngưng dò"
+
+msgid "&Help"
+msgstr "&Trợ giúp"
+
+msgid "&Documentation..."
+msgstr "&Trợ giúp..."
+
+msgid "&About 86Box..."
+msgstr "&Về 86Box..."
+
+msgid "&New image..."
+msgstr "Tạo file ảnh đĩa mới..."
+
+msgid "&Existing image..."
+msgstr "Ảnh đĩa có sẵn..."
+
+msgid "Existing image (&Write-protected)..."
+msgstr "Ảnh đĩa có sẵn (chống ghi đè)..."
+
+msgid "&Record"
+msgstr "&Ghi lại"
+
+msgid "&Play"
+msgstr "&Phát"
+
+msgid "&Rewind to the beginning"
+msgstr "&Tua về đầu"
+
+msgid "&Fast forward to the end"
+msgstr "T&iến về cuối"
+
+msgid "E&ject"
+msgstr "Đẩy đĩ&a ra"
+
+msgid "&Image..."
+msgstr "&Ảnh đĩa..."
+
+msgid "E&xport to 86F..."
+msgstr "Xuất ra f&ile 86F..."
+
+msgid "&Mute"
+msgstr "Tắt tiến&g"
+
+msgid "E&mpty"
+msgstr "Làm trố&ng đĩa"
+
+msgid "Reload previous image"
+msgstr "Load đĩa trước đó"
+
+msgid "&Folder..."
+msgstr "Thư mụ&c"
+
+msgid "Target &framerate"
+msgstr "Số khung hình mục tiêu"
+
+msgid "&Sync with video"
+msgstr "Đồng bộ &với video"
+
+msgid "&25 fps"
+msgstr "&25 fps"
+
+msgid "&30 fps"
+msgstr "&30 fps"
+
+msgid "&50 fps"
+msgstr "&50 fps"
+
+msgid "&60 fps"
+msgstr "&60 fps"
+
+msgid "&75 fps"
+msgstr "&75 fps"
+
+msgid "&VSync"
+msgstr "&VSync"
+
+msgid "&Select shader..."
+msgstr "&Chọn shader..."
+
+msgid "&Remove shader"
+msgstr "&Bỏ shader"
+
+msgid "Preferences"
+msgstr "Tùy biến"
+
+msgid "Sound Gain"
+msgstr "Tăng âm"
+
+msgid "New Image"
+msgstr "Ảnh đĩa mới"
+
+msgid "Settings"
+msgstr "Cài đặt"
+
+msgid "Specify Main Window Dimensions"
+msgstr "Tùy biến kích thước cửa sổ chính"
+
+msgid "OK"
+msgstr "Đồng ý"
+
+msgid "Cancel"
+msgstr "Thôi"
+
+msgid "&Default"
+msgstr "&Mặc định"
+
+msgid "Language:"
+msgstr "Ngôn ngữ:"
+
+msgid "Gain"
+msgstr "Tăng"
+
+msgid "File name:"
+msgstr "Tên tập tin:"
+
+msgid "Disk size:"
+msgstr "Kích thước đĩa:"
+
+msgid "RPM mode:"
+msgstr "Tốc độ vòng quay:"
+
+msgid "Progress:"
+msgstr "Tiến trình:"
+
+msgid "Width:"
+msgstr "Chiều rộng:"
+
+msgid "Height:"
+msgstr "Chiều cao:"
+
+msgid "Lock to this size"
+msgstr "Cố định kích thước hình hiện tại"
+
+msgid "Machine type:"
+msgstr "Loại máy:"
+
+msgid "Machine:"
+msgstr "Mẫu máy:"
+
+msgid "Configure"
+msgstr "Tinh chỉnh"
+
+msgid "CPU:"
+msgstr "CPU:"
+
+msgid "CPU type:"
+msgstr "Loại CPU:"
+
+msgid "Speed:"
+msgstr "Tốc độ:"
+
+msgid "Frequency:"
+msgstr "Tần số xung:"
+
+msgid "FPU:"
+msgstr "FPU:"
+
+msgid "Wait states:"
+msgstr "Trạng thái chờ:"
+
+msgid "MB"
+msgstr "MB"
+
+msgid "Memory:"
+msgstr "Bộ nhớ (RAM):"
+
+msgid "Time synchronization"
+msgstr "Đồng bộ thời gian"
+
+msgid "Disabled"
+msgstr "Vô hiệu hóa"
+
+msgid "Enabled (local time)"
+msgstr "Bật (giờ địa phương)"
+
+msgid "Enabled (UTC)"
+msgstr "Bật (UTC)"
+
+msgid "Dynamic Recompiler"
+msgstr "Bộ tái biên dịch động (Dynamic Recompiler)"
+
+msgid "CPU frame size"
+msgstr "Cỡ khung CPU"
+
+msgid "Larger frames (less smooth)"
+msgstr "Khung lớn (kém mượt hơn)"
+
+msgid "Smaller frames (smoother)"
+msgstr "Khung nhỏ (mượt hơn)"
+
+msgid "Video:"
+msgstr "Video:"
+
+msgid "Video #2:"
+msgstr "Video 2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Đồ họa Voodoo 1 hoặc 2"
+
+msgid "IBM 8514/A Graphics"
+msgstr "Đồ họa IBM 8514/A"
+
+msgid "XGA Graphics"
+msgstr "Đồ họa XGA"
+
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "Đồ họa adaptor xuất hình IBM PS/55"
+
+msgid "Keyboard:"
+msgstr "Bàn phím:"
+
+msgid "Keyboard"
+msgstr "Bàn phím"
+
+msgid "Mouse:"
+msgstr "Chuột:"
+
+msgid "Mouse"
+msgstr "Chuột"
+
+msgid "Joystick:"
+msgstr "Cần điều khiển:"
+
+msgid "Joystick"
+msgstr "Cần điều khiển"
+
+msgid "Joystick 1..."
+msgstr "Cần điều khiển 1..."
+
+msgid "Joystick 2..."
+msgstr "Cần điều khiển 2..."
+
+msgid "Joystick 3..."
+msgstr "Cần điều khiển 3..."
+
+msgid "Joystick 4..."
+msgstr "Cần điều khiển 4..."
+
+msgid "Sound card #1:"
+msgstr "Card âm thanh 1:"
+
+msgid "Sound card #2:"
+msgstr "Card âm thanh 2:"
+
+msgid "Sound card #3:"
+msgstr "Card âm thanh 3:"
+
+msgid "Sound card #4:"
+msgstr "Card âm thanh 4:"
+
+msgid "MIDI Out Device:"
+msgstr "Thiết bị MIDI out:"
+
+msgid "MIDI In Device:"
+msgstr "Thiết bị MIDI in:"
+
+msgid "MIDI Out:"
+msgstr "MIDI out:"
+
+msgid "Standalone MPU-401"
+msgstr "MPU-401 độc lập"
+
+msgid "Use FLOAT32 sound"
+msgstr "Dùng âm FLOAT32"
+
+msgid "FM synth driver"
+msgstr "Driver bộ tổng hợp âm FM"
+
+msgid "Nuked (more accurate)"
+msgstr "Nuked (chính xác hơn)"
+
+msgid "YMFM (faster)"
+msgstr "YMFM (nhanh hơn)"
+
+msgid "COM1 Device:"
+msgstr "Thiết bị COM1:"
+
+msgid "COM2 Device:"
+msgstr "Thiết bị COM2:"
+
+msgid "COM3 Device:"
+msgstr "Thiết bị COM3:"
+
+msgid "COM4 Device:"
+msgstr "Thiết bị COM4:"
+
+msgid "LPT1 Device:"
+msgstr "Thiết bị LPT1:"
+
+msgid "LPT2 Device:"
+msgstr "Thiết bị LPT2:"
+
+msgid "LPT3 Device:"
+msgstr "Thiết bị LPT3:"
+
+msgid "LPT4 Device:"
+msgstr "Thiết bị LPT4:"
+
+msgid "Internal LPT ECP DMA:"
+msgstr "LPT ECP DMA nội bộ:"
+
+msgid "Serial port 1"
+msgstr "Cổng serial 1"
+
+msgid "Serial port 2"
+msgstr "Cổng serial 2"
+
+msgid "Serial port 3"
+msgstr "Cổng serial 3"
+
+msgid "Serial port 4"
+msgstr "Cổng serial 4"
+
+msgid "Parallel port 1"
+msgstr "Cổng parallel 1"
+
+msgid "Parallel port 2"
+msgstr "Cổng parallel 2"
+
+msgid "Parallel port 3"
+msgstr "Cổng parallel 3"
+
+msgid "Parallel port 4"
+msgstr "Cổng parallel 4"
+
+msgid "FD Controller:"
+msgstr "Bộ điều khiển ổ mềm:"
+
+msgid "CD-ROM Controller:"
+msgstr "Bộ điều khiển CD-ROM:"
+
+msgid "Tertiary IDE Controller"
+msgstr "Bộ điều khiển IDE thứ ba"
+
+msgid "Quaternary IDE Controller"
+msgstr "Bộ điều khiển IDE thứ tư"
+
+msgid "Hard disk"
+msgstr "Ổ cứng"
+
+msgid "SCSI"
+msgstr "SCSI"
+
+msgid "Controller 1:"
+msgstr "Bộ điều khiển 1:"
+
+msgid "Controller 2:"
+msgstr "Bộ điều khiển 2:"
+
+msgid "Controller 3:"
+msgstr "Bộ điều khiển 3:"
+
+msgid "Controller 4:"
+msgstr "Bộ điều khiển 4:"
+
+msgid "Cassette"
+msgstr "Cassette"
+
+msgid "Hard disks:"
+msgstr "Đĩa cứng:"
+
+msgid "Firmware Version"
+msgstr "Phiên bản firmware"
+
+msgid "&New..."
+msgstr "Tạ&o mới..."
+
+msgid "&Existing..."
+msgstr "&Có sẵn..."
+
+msgid "&Remove"
+msgstr "Loạ&i bỏ"
+
+msgid "Bus:"
+msgstr "Bus:"
+
+msgid "Channel:"
+msgstr "Kênh:"
+
+msgid "ID:"
+msgstr "ID:"
+
+msgid "&Specify..."
+msgstr "Chỉ &rõ..."
+
+msgid "Sectors:"
+msgstr "Sector:"
+
+msgid "Heads:"
+msgstr "Đầu ghi:"
+
+msgid "Cylinders:"
+msgstr "Trụ:"
+
+msgid "Size (MB):"
+msgstr "Kích thước (MB):"
+
+msgid "Type:"
+msgstr "Loại:"
+
+msgid "Image Format:"
+msgstr "Định dạng ảnh đĩa:"
+
+msgid "Block Size:"
+msgstr "Kích thước bloc:"
+
+msgid "Floppy drives:"
+msgstr "Ổ đĩa mềm:"
+
+msgid "Turbo timings"
+msgstr "Thời gian turbo"
+
+msgid "Check BPB"
+msgstr "Kiểm tra BPB"
+
+msgid "CD-ROM drives:"
+msgstr "Ổ đĩa CD-ROM:"
+
+msgid "MO drives:"
+msgstr "Ổ đĩa MO:"
+
+msgid "MO:"
+msgstr "MO:"
+
+msgid "Removable disks:"
+msgstr "Đĩa tháo rời được:"
+
+msgid "Removable disk drives:"
+msgstr "Ổ đĩa tháo rời được:"
+
+msgid "ZIP 250"
+msgstr "ZIP 250"
+
+msgid "ISA RTC:"
+msgstr "ISA RTC:"
+
+msgid "ISA Memory Expansion"
+msgstr "Mở rộng bộ nhớ qua ISA"
+
+msgid "ISA ROM Cards"
+msgstr "Thẻ ROM ISA"
+
+msgid "Card 1:"
+msgstr "Thẻ 1:"
+
+msgid "Card 2:"
+msgstr "Thẻ 2:"
+
+msgid "Card 3:"
+msgstr "Thẻ 3:"
+
+msgid "Card 4:"
+msgstr "Thẻ 4:"
+
+msgid "Generic ISA ROM Board"
+msgstr "Bảng mạch ROM ISA chung"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "Bảng mạch đôi ROM ISA chung"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "Bảng mạch bốn ROM ISA chung"
+
+msgid "ISABugger device"
+msgstr "Thiết bị ISABugger"
+
+msgid "POST card"
+msgstr "Thẻ POST"
+
+msgid "86Box"
+msgstr "86Box"
+
+msgid "Error"
+msgstr "Lỗi"
+
+msgid "Fatal error"
+msgstr "Lỗi nghiêm trọng"
+
+msgid " - PAUSED"
+msgstr " - TẠM DỪNG"
+
+msgid "Speed"
+msgstr "Vận tốc"
+
+msgid "Removable disk %1 (%2): %3"
+msgstr "Đĩa tháo rời được %1 (%2): %3"
+
+msgid "&Removable disk %1 (%2): %3"
+msgstr "Đĩa tháo rời được %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "Ảnh đĩa tháo rời được"
+
+msgid "Image %1"
+msgstr "Ảnh %1"
+
+msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
+msgstr "86Box không tìm được bản ROM nào.\n\nVui lòng <a href=\"https://github.com/86Box/roms/releases/latest\">tải về</a> bộ ROM và trích xuất về thư mục \"roms\"."
+
+msgid "(empty)"
+msgstr "(trống trơn)"
+
+msgid "All files"
+msgstr "Tất cả file"
+
+msgid "Turbo"
+msgstr "Turbo"
+
+msgid "On"
+msgstr "Bật"
+
+msgid "Off"
+msgstr "Tắt"
+
+msgid "All images"
+msgstr "Tất cả ảnh"
+
+msgid "Basic sector images"
+msgstr "Ảnh sector cơ bản"
+
+msgid "Surface images"
+msgstr "Ảnh bề mặt"
+
+msgid "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
+msgstr "Mẫu máy \"%hs\" không giả lập được do thiếu file ROM tương ứng trong thư mục roms/machines. Hãy chọn mẫu máy khác."
+
+msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
+msgstr "Card đồ họa \"%hs\" không giả lập được do thiếu file ROM tương ứng trong thư mục roms/video. Hãy chọn card đồ họa khác."
+
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "Card đồ họa 2 \"%hs\" không giả lập được do thiếu file ROM tương ứng trong mục roms/video. Vô hiệu hóa card đồ họa thứ hai."
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "Thiết bị \"%hs\" không giả lập được do thiếu file ROM. Bỏ qua thiết bị."
+
+msgid "Machine"
+msgstr "Mẫu máy"
+
+msgid "Display"
+msgstr "Hiển thị"
+
+msgid "Input devices"
+msgstr "Thiết bị nhập"
+
+msgid "Sound"
+msgstr "Âm thanh"
+
+msgid "Network"
+msgstr "Nối mạng"
+
+msgid "Ports (COM & LPT)"
+msgstr "Cổng (COM và LPT)"
+
+msgid "Ports"
+msgstr "Cổng"
+
+msgid "Serial ports:"
+msgstr "Cổng serial:"
+
+msgid "Parallel ports:"
+msgstr "Cổng parallel:"
+
+msgid "Storage controllers"
+msgstr "Vi điều khiển bộ nhớ ổ cứng"
+
+msgid "Hard disks"
+msgstr "Ổ cứng"
+
+msgid "Disks:"
+msgstr "Đĩa:"
+
+msgid "Floppy:"
+msgstr "Đĩa mềm:"
+
+msgid "Controllers:"
+msgstr "Bộ điều khiển:"
+
+msgid "Floppy & CD-ROM drives"
+msgstr "Ổ (đĩa) mềm và CD-ROM"
+
+msgid "Other removable devices"
+msgstr "Thiết bị tháo rời được khác"
+
+msgid "Other peripherals"
+msgstr "Thiết bị ngoại vi khác"
+
+msgid "Other devices"
+msgstr "Các thiết bị khác"
+
+msgid "Click to capture mouse"
+msgstr "Nhấp vào khung hình để 'nhốt' chuột vào"
+
+msgid "Press %1 to release mouse"
+msgstr "Nhấn %1 để thả chuột"
+
+msgid "Press %1 or middle button to release mouse"
+msgstr "Nhấn %1 hoặc nhấp chuột giữa để thả chuột"
+
+msgid "Bus"
+msgstr "Bus"
+
+msgid "File"
+msgstr "File"
+
+msgid "C"
+msgstr "C"
+
+msgid "H"
+msgstr "H"
+
+msgid "S"
+msgstr "S"
+
+msgid "KB"
+msgstr "KB"
+
+msgid "Default"
+msgstr "Mặc định"
+
+msgid "%1 Wait state(s)"
+msgstr "%1 trạng thái chờ"
+
+msgid "Type"
+msgstr "Loại"
+
+msgid "No PCap devices found"
+msgstr "Không tìm thấy thiết bị PCap"
+
+msgid "Invalid PCap device"
+msgstr "Thiết bị PCap không hợp quy"
+
+msgid "2-axis, 2-button joystick(s)"
+msgstr "Cần điều khiển hai trục, hai nút"
+
+msgid "2-axis, 4-button joystick"
+msgstr "Cần điều khiển hai trục, bốn nút"
+
+msgid "2-axis, 6-button joystick"
+msgstr "Cần điều khiển hai trục, sáu nút"
+
+msgid "2-axis, 8-button joystick"
+msgstr "Cần điều khiển hai trục, tám nút"
+
+msgid "3-axis, 2-button joystick"
+msgstr "Cần điều khiển ba trục, hai nút"
+
+msgid "3-axis, 4-button joystick"
+msgstr "Cần điều khiển ba trục, bốn nút"
+
+msgid "4-axis, 4-button joystick"
+msgstr "Cần điều khiển bốn trục, bốn nút"
+
+msgid "CH Flightstick Pro"
+msgstr "CH Flightstick Pro"
+
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + bàn giậm CH"
+
+msgid "Microsoft SideWinder Pad"
+msgstr "Microsoft SideWinder Pad"
+
+msgid "Thrustmaster Flight Control System"
+msgstr "Thrustmaster Flight Control System"
+
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Hệ thống bánh lái"
+
+msgid "2-button gamepad(s)"
+msgstr "Tay cầm game hai nút"
+
+msgid "2-button flight yoke"
+msgstr "Vô lăng máy bay hai nút"
+
+msgid "4-button gamepad"
+msgstr "Tay cầm game bốn nút"
+
+msgid "4-button flight yoke"
+msgstr "Vô lăng máy bay bốn nút"
+
+msgid "2-button flight yoke with throttle"
+msgstr "Vô lăng máy bay hai nút có cần ga"
+
+msgid "4-button flight yoke with throttle"
+msgstr "Vô lăng máy bay bốn nút có cần ga"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Vô lăng Win95 (ba trục, bốn nút)"
+
+msgid "None"
+msgstr "Không có"
+
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CHS: %2, %3, %4)"
+
+msgid "Floppy %1 (%2): %3"
+msgstr "Đĩa mềm %1 (%2): %3"
+
+msgid "&Floppy %1 (%2): %3"
+msgstr "Đĩa &mềm %1 (%2): %3"
+
+msgid "Advanced sector images"
+msgstr "Ảnh (đĩa) sector nâng cao"
+
+msgid "Flux images"
+msgstr "Ảnh thông lượng (flux)"
+
+msgid "Are you sure you want to hard reset the emulated machine?"
+msgstr "Bạn có thật sự buộc máy khởi động lại không?"
+
+msgid "Are you sure you want to exit 86Box?"
+msgstr "Bạn có muốn thoát 86Box?"
+
+msgid "Unable to initialize Ghostscript"
+msgstr "Không thể khởi tạo Ghostscript"
+
+msgid "Unable to initialize GhostPCL"
+msgstr "Không thể khởi tạo GhostPCL"
+
+msgid "MO %1 (%2): %3"
+msgstr "MO %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "&MO %1 (%2): %3"
+
+msgid "MO images"
+msgstr "Ảnh đĩa MO"
+
+msgid "Welcome to 86Box!"
+msgstr "Chào mừng đến 86Box!"
+
+msgid "Internal device"
+msgstr "Thiết bị nội bộ"
+
+msgid "&File"
+msgstr "&Tập tin"
+
+msgid "&New machine..."
+msgstr "Máy &mới"
+
+msgid "&Check for updates..."
+msgstr "Kiểm tra &cập nhật..."
+
+msgid "Exit"
+msgstr "Thoát"
+
+msgid "No ROMs found"
+msgstr "Không tìm thấy ROM"
+
+msgid "Do you want to save the settings?"
+msgstr "Bạn có muốn lưu cài đặt không?"
+
+msgid "This will hard reset the emulated machine."
+msgstr "Lệnh này sẽ buộc khởi động lại máy ảo."
+
+msgid "Save"
+msgstr "Lưu"
+
+msgid "About 86Box"
+msgstr "Về 86Box"
+
+msgid "86Box v"
+msgstr "86Box v"
+
+msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
+msgstr "Trình giả lập các dòng máy tính cổ.\n\nTác giả: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, cùng những người khác.\n\nCùng với những đóng góp cốt cán từ Sarah Walker, leilei, JohnElliott, greatpsycho, và một số người khác.\n\nPhát hành dưới giấy phép GNU General Public License version 2 trở đi. Đọc LICENSE để biết thêm thông tin."
+
+msgid "Hardware not available"
+msgstr "Phần cứng không có sẵn"
+
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "Đảm bảo rằng %1 đã được cài đặt vào và bạn đang dùng kết nối mạng tương thích %1."
+
+msgid "Invalid configuration"
+msgstr "Tinh chỉnh không hợp lý"
+
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "Cần có %1 để tự động chuyển đổi file PostScript qua PDF.\n\nMọi tài liệu được đưa qua máy in generic PostScript sẽ lưu ở dạng PostScript (.ps)."
+
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "Cần có %1 để tự động chuyển đổi file PCL qua PDF.\n\nMọi tài liệu được đưa qua máy in generic PCL sẽ lưu ở dạng Printer Command Language (.pcl)."
+
+msgid "Don't show this message again"
+msgstr "Không hiện thông báo này nữa"
+
+msgid "Don't exit"
+msgstr "Không thoát"
+
+msgid "Reset"
+msgstr "Khởi động lại"
+
+msgid "Don't reset"
+msgstr "Không khởi động lại"
+
+msgid "CD-ROM images"
+msgstr "Ảnh đĩa CD-ROM"
+
+msgid "%1 Device Configuration"
+msgstr "Tinh chỉnh thiết bị %1"
+
+msgid "Monitor in sleep mode"
+msgstr "Màn hình chế độ chờ/ngủ"
+
+msgid "GLSL shaders"
+msgstr "Shader GLSL"
+
+msgid "You are loading an unsupported configuration"
+msgstr "Bạn đang load tinh chỉnh không được hỗ trợ."
+
+msgid "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
+msgstr "Phần chọn loại CPU dựa trên mẫu máy đã chọn bị vô hiệu hóa.\n\nỞ đây bạn có thể chọn loại CPU có thể không tương thích với mẫu máy hiện tại. Tuy nhiên bạn có thể gặp vấn đề tương khắc với BIOS hay phần mềm khác.\n\nViệc bật tùy chọn này lên không được khuyến cáo chính thức và các bản bug report (báo lỗi) với nội dung tương tự sẽ bị coi là phạm quy và đóng."
+
+msgid "Continue"
+msgstr "Tiếp tục"
+
+msgid "Cassette: %1"
+msgstr "Cassette: %1"
+
+msgid "C&assette: %1"
+msgstr "C&assette: %1"
+
+msgid "Cassette images"
+msgstr "Ảnh đĩa Cassette"
+
+msgid "Cartridge %1: %2"
+msgstr "Băng cartridge %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "Băng car&tridge %1: %2"
+
+msgid "Cartridge images"
+msgstr "Ảnh đĩa băng cartridge"
+
+msgid "Resume execution"
+msgstr "Tiếp tục chạy thực thi"
+
+msgid "Pause execution"
+msgstr "Tạm dừng thực thi"
+
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del"
+
+msgid "Press Ctrl+Alt+Del"
+msgstr "Nhấn Ctrl+Alt+Del"
+
+msgid "Press Ctrl+Alt+Esc"
+msgstr "Nhấn Ctrl+Alt+Esc"
+
+msgid "Hard reset"
+msgstr "Buộc khởi động lại"
+
+msgid "Force shutdown"
+msgstr "Buộc tắt nguồn máy"
+
+msgid "Start"
+msgstr "Khởi động"
+
+msgid "Not running"
+msgstr "Đang không chạy"
+
+msgid "Running"
+msgstr "Đang chạy"
+
+msgid "Paused"
+msgstr "Đã tạm dừng"
+
+msgid "Waiting"
+msgstr "Đang chờ"
+
+msgid "Powered Off"
+msgstr "Đã tắt máy"
+
+msgid "%n running"
+msgstr "%n đang chạy"
+
+msgid "%n paused"
+msgstr "%n đã tạm dừng"
+
+msgid "%n waiting"
+msgstr "%n đang chờ"
+
+msgid "%1 total"
+msgstr "%1 tổng"
+
+msgid "VMs: %1"
+msgstr "Máy ảo: %1"
+
+msgid "System Directory:"
+msgstr "Thư mục hệ thống:"
+
+msgid "Choose directory"
+msgstr "Chọn thư mục"
+
+msgid "Choose configuration file"
+msgstr "Chọn tập tin cấu hình"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "Tập tin cấu hình 86Box (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "Không thể đọc cấu hình"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "Không thể mở cấu hình đã chọn để đọc: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "Dùng regex trong hộp tìm kiếm"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "%1 máy hiện vẫn đang chạy. Bạn có muốn thoát trình quản lý máy ảo không?"
+
+msgid "Add new system wizard"
+msgstr "Thêm trình thuật sĩ hệ thống mới"
+
+msgid "Introduction"
+msgstr "Giới thiệu"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "Hướng dẫn này sẽ giúp bạn thêm hệ thống mới vào 86Box."
+
+msgid "New configuration"
+msgstr "Cấu hình mới"
+
+msgid "Complete"
+msgstr "Hoàn thành"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "Thuật sĩ bây giờ sẽ chạy cấu hình cho hệ thống mới."
+
+msgid "Use existing configuration"
+msgstr "Dùng cấu hình có sẵn"
+
+msgid "Type some notes here"
+msgstr "Nhập ghi chú vào đây"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "Dán nội dung của tập tin cấu hình có sẵn vào hộp bên dưới."
+
+msgid "Load configuration from file"
+msgstr "Nạp cấu hình từ tập tin"
+
+msgid "System name"
+msgstr "Tên hệ thống"
+
+msgid "System name:"
+msgstr "Tên hệ thống:"
+
+msgid "System name cannot contain certain characters"
+msgstr "Tên hệ thống không thể bao gồm các kí tự cụ thể"
+
+msgid "System name already exists"
+msgstr "Tên hệ thống đã tốn tại"
+
+msgid "Please enter a directory for the system"
+msgstr "Vui lòng nhập thư mục cho hệ thống"
+
+msgid "Directory does not exist"
+msgstr "Thư mục không tồn tại"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "Một thư mục mới cho hệ thống sẽ được tạo trong thư mục đã chọn ở trên"
+
+msgid "System location:"
+msgstr "Vị trí hệ thống:"
+
+msgid "System name and location"
+msgstr "Tên và vị trí hệ thống"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "Điền tên của hệ thống và chọn vị trí"
+
+msgid "Enter the name of the system"
+msgstr "Điền tên hệ thống"
+
+msgid "Please enter a system name"
+msgstr "Hãy điền một cái tên"
+
+msgid "Display name (optional):"
+msgstr "Tên hiển thị (tùy chọn):"
+
+msgid "Display name:"
+msgstr "Tên hiển thị:"
+
+msgid "Set display name"
+msgstr "Đặt tên hiển thị"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "Điền tên hiển thị mới (để trống để đặt lại)"
+
+msgid "Change &display name..."
+msgstr "Thay đổi tên hiển thị"
+
+msgid "Context Menu"
+msgstr "Menu ngữ cảnh"
+
+msgid "&Open folder..."
+msgstr "Mở thư mục"
+
+msgid "Open p&rinter tray..."
+msgstr "Mở khay máy in"
+
+msgid "Set &icon..."
+msgstr "Đặt biểu trưng"
+
+msgid "Select an icon"
+msgstr "Chọn một biểu trưng"
+
+msgid "C&lone..."
+msgstr "Tạo bản sao"
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "Máy ảo \"%1\" (%2) sẽ được sao chép vào:"
+
+msgid "Directory %1 already exists"
+msgstr "Thư mục %1 đã tồn tại"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "Bạn không thể sử dụng kí tự này khi đặt tên: %1"
+
+msgid "Clone"
+msgstr "Tạo bản sao"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "Không thể tạo thư mục cho máy ảo đã sao chép"
+
+msgid "Failed to clone VM."
+msgstr "Không thể tạo bản sao của máy ảo."
+
+msgid "Directory in use"
+msgstr "Thư mục đang bị sử dụng"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "Thư mục bạn chọn đang bị sử dụng. Hãy chọn thư mục khác dùng được."
+
+msgid "Create directory failed"
+msgstr "Tạo thư mục không thành công"
+
+msgid "Unable to create the directory for the new system"
+msgstr "Không thể tạo thư mục cho hệ thống mới"
+
+msgid "Configuration write failed"
+msgstr "Không thể ghi cấu hình"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "Không mở được tập tin cấu hình ở %1 để ghi vào"
+
+msgid "Error adding system"
+msgstr "Lỗi khi đang thêm hệ thống"
+
+msgid "Remove directory failed"
+msgstr "Không thể loại bỏ thư mục"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "Một số tập tin trong thư mục máy ảo không thể xóa. Bạn hãy tự xóa ở vị trí đó."
+
+msgid "Build"
+msgstr "Bản dựng"
+
+msgid "Version"
+msgstr "Phiên bản"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "Có cập nhật mới cho 86Box: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "Có lỗi xảy ra khi kiểm tra cập nhật: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>Có cập nhật mới cho 86Box!</b>"
+
+msgid "Warning"
+msgstr "Cảnh báo"
+
+msgid "&Kill"
+msgstr "Buộc dừng"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "Buộc một máy ảo dừng có thể gây ra mất mát dữ liệu. Chỉ nên làm khi tiến trình 86Box bị treo.\n\nBạn có muốn buộc dừng máy ảo \"%1\" không?"
+
+msgid "&Delete"
+msgstr "Xóa"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "Bạn có thật sự muốn xóa máy ảo \"%1\" và tất cả các tập tin của nó không? Thao tác này không thể được phục hồi!"
+
+msgid "Show &config file"
+msgstr "Hiện tập tin cấu hình"
+
+msgid "No screenshot"
+msgstr "Không có ảnh chụp màn hình"
+
+msgid "Search"
+msgstr "Tìm"
+
+msgid "Searching for VMs..."
+msgstr "Đang tìm máy ảo..."
+
+msgid "Found %1"
+msgstr "Đã thấy %1"
+
+msgid "System"
+msgstr "Hệ thống"
+
+msgid "Storage"
+msgstr "Lưu trữ"
+
+msgid "Disk %1: "
+msgstr "Đĩa %1: "
+
+msgid "No disks"
+msgstr "Không có đĩa"
+
+msgid "Audio"
+msgstr "Âm thanh"
+
+msgid "Audio:"
+msgstr "Âm thanh:"
+
+msgid "ACPI shutdown"
+msgstr "Tắt máy theo ACPI"
+
+msgid "ACP&I shutdown"
+msgstr "Tắt máy theo ACP&I"
+
+msgid "Hard disk (%1)"
+msgstr "Ổ cứng (%1)"
+
+msgid "MFM/RLL or ESDI CD-ROM drives never existed"
+msgstr "Không hề có ổ CD-ROM MFM/RLL hay ESDI nào tồn tại"
+
+msgid "Custom..."
+msgstr "Tùy chỉnh..."
+
+msgid "Custom (large)..."
+msgstr "Tùy chỉnh (dung tích lớn)..."
+
+msgid "Add New Hard Disk"
+msgstr "Thêm ổ cứng mới"
+
+msgid "Add Existing Hard Disk"
+msgstr "Thêm ổ cứng đã có"
+
+msgid "HDI disk images cannot be larger than 4 GB."
+msgstr "Ảnh đĩa ổ HDI không to hơn 4 GB."
+
+msgid "Disk images cannot be larger than 127 GB."
+msgstr "Ảnh đĩa không to hơn 127 GB."
+
+msgid "Hard disk images"
+msgstr "Ảnh đĩa ổ cứng"
+
+msgid "Unable to read file"
+msgstr "Không đọc được file"
+
+msgid "Unable to write file"
+msgstr "Không ghi được vào file"
+
+msgid "HDI or HDX images with a sector size other than 512 are not supported."
+msgstr "Ảnh đĩa HDI hoặc HDX với kích thước sector khác 512 không được hỗ trợ."
+
+msgid "Disk image file already exists"
+msgstr "Đã có file ảnh đĩa rồi"
+
+msgid "Please specify a valid file name."
+msgstr "Vui lòng đặt tên hợp lệ."
+
+msgid "Disk image created"
+msgstr "Đã tạo ảnh đĩa"
+
+msgid "Make sure the file exists and is readable."
+msgstr "Chắc chắn rằng file tồn tại và đọc được."
+
+msgid "Make sure the file is being saved to a writable directory."
+msgstr "Chắc chắn rằng file được lưu ở địa chỉ thư mục có thể ghi đè."
+
+msgid "Disk image too large"
+msgstr "Ảnh đĩa quá to"
+
+msgid "Remember to partition and format the newly-created drive."
+msgstr "Nhớ phân vùng và định dạng ổ đĩa mới tạo."
+
+msgid "The selected file will be overwritten. Are you sure you want to use it?"
+msgstr "File được chọn sẽ bị ghi đè lên. Bạn có chắc muốn chọn dùng không?"
+
+msgid "Unsupported disk image"
+msgstr "File ảnh đĩa không được hỗ trợ"
+
+msgid "Overwrite"
+msgstr "Có ghi đè"
+
+msgid "Don't overwrite"
+msgstr "Không ghi đè"
+
+msgid "Raw image"
+msgstr "Ảnh đĩa thô"
+
+msgid "HDI image"
+msgstr "Ảnh đĩa HDI"
+
+msgid "HDX image"
+msgstr "Ảnh đĩa HDX"
+
+msgid "Fixed-size VHD"
+msgstr "Ảnh VHD kích thước cố định"
+
+msgid "Dynamic-size VHD"
+msgstr "Ảnh VHD kích thước tăng dần"
+
+msgid "Differencing VHD"
+msgstr "Ảnh VHD đa chủng (differencing)"
+
+msgid "(N/A)"
+msgstr "(Không có)"
+
+msgid "Raw image (.img)"
+msgstr "Ảnh đĩa thô (.img)"
+
+msgid "HDI image (.hdi)"
+msgstr "Ảnh đĩa HDI (.hdi)"
+
+msgid "HDX image (.hdx)"
+msgstr "Ảnh đĩa HDX (.hdx)"
+
+msgid "Fixed-size VHD (.vhd)"
+msgstr "Ảnh VHD kích thước cố định (.vhd)"
+
+msgid "Dynamic-size VHD (.vhd)"
+msgstr "Ảnh VHD kích thước tăng dần (.vhd)"
+
+msgid "Differencing VHD (.vhd)"
+msgstr "Ảnh VHD đa chủng (differencing) (.vhd)"
+
+msgid "Large blocks (2 MB)"
+msgstr "Bloc lớn (2 MB)"
+
+msgid "Small blocks (512 KB)"
+msgstr "Bloc bé (512 KB)"
+
+msgid "VHD files"
+msgstr "File VHD"
+
+msgid "Select the parent VHD"
+msgstr "Chọn file VHD cha (parent)"
+
+msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
+msgstr "Ở đây tức là ảnh đĩa cha (parent) có thể đã bị chỉnh sửa sau khi ảnh đĩa đa chủng (differencing image) được tạo ra.\n\nCũng có thể do ảnh đĩa bị chuyển đi hay bị copy, hoặc do bug/lỗi của phần mềm tạo ảnh đĩa gây ra.\n\nBạn có muốn sửa lại mốc thời gian (timestamp) không?"
+
+msgid "Parent and child disk timestamps do not match"
+msgstr "Mốc timestamp của đĩa con (child) và đĩa cha (parent) không trùng khớp"
+
+msgid "Could not fix VHD timestamp."
+msgstr "Không thể sửa mốc timestamp cho VHD."
+
+msgid "MFM/RLL"
+msgstr "MFM/RLL"
+
+msgid "XTA"
+msgstr "XTA"
+
+msgid "ESDI"
+msgstr "ESDI"
+
+msgid "IDE"
+msgstr "IDE"
+
+msgid "ATAPI"
+msgstr "ATAPI"
+
+msgid "CD-ROM %1 (%2): %3"
+msgstr "CD-ROM %1 (%2): %3"
+
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "&CD-ROM %1 (%2): %3"
+
+msgid "160 KB"
+msgstr "160 KB"
+
+msgid "180 KB"
+msgstr "180 KB"
+
+msgid "320 KB"
+msgstr "320 KB"
+
+msgid "360 KB"
+msgstr "360 KB"
+
+msgid "640 KB"
+msgstr "640 KB"
+
+msgid "720 KB"
+msgstr "720 KB"
+
+msgid "1.2 MB"
+msgstr "1.2 MB"
+
+msgid "1.25 MB"
+msgstr "1.25 MB"
+
+msgid "1.44 MB"
+msgstr "1.44 MB"
+
+msgid "DMF (cluster 1024)"
+msgstr "DMF (cluster 1024)"
+
+msgid "DMF (cluster 2048)"
+msgstr "DMF (cluster 2048)"
+
+msgid "2.88 MB"
+msgstr "2.88 MB"
+
+msgid "ZIP 100"
+msgstr "ZIP 100"
+
+msgid "3.5\" 128 MB (ISO 10090)"
+msgstr "3.5\" 128 MB (ISO 10090)"
+
+msgid "3.5\" 230 MB (ISO 13963)"
+msgstr "3.5\" 230 MB (ISO 13963)"
+
+msgid "3.5\" 540 MB (ISO 15498)"
+msgstr "3.5\" 540 MB (ISO 15498)"
+
+msgid "3.5\" 640 MB (ISO 15498)"
+msgstr "3.5\" 640 MB (ISO 15498)"
+
+msgid "3.5\" 1.3 GB (GigaMO)"
+msgstr "3.5\" 1.3 GB (GigaMO)"
+
+msgid "3.5\" 2.3 GB (GigaMO 2)"
+msgstr "3.5\" 2.3 GB (GigaMO 2)"
+
+msgid "5.25\" 600 MB"
+msgstr "5.25\" 600 MB"
+
+msgid "5.25\" 650 MB"
+msgstr "5.25\" 650 MB"
+
+msgid "5.25\" 1 GB"
+msgstr "5.25\" 1 GB"
+
+msgid "5.25\" 1.3 GB"
+msgstr "5.25\" 1.3 GB"
+
+msgid "Perfect RPM"
+msgstr "Số RPM(vòng quay đĩa/phút) hoàn thiện"
+
+msgid "1% below perfect RPM"
+msgstr "1% thấp hơn số RPM hoàn thiện"
+
+msgid "1.5% below perfect RPM"
+msgstr "1.5% thấp hơn số RPM hoàn thiện"
+
+msgid "2% below perfect RPM"
+msgstr "2% thấp hơn số RPM hoàn thiện"
+
+msgid "(System Default)"
+msgstr "(Mặc định hệ thống)"
+
+msgid "Failed to initialize network driver"
+msgstr "Không thể khởi tạo trình điều khiển (driver) mạng"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "Cấu hình mạng sẽ chuyển sang null driver (không có mạng)"
+
+msgid "Mouse sensitivity:"
+msgstr "Độ nhạy chuột:"
+
+msgid "Select media images from program working directory"
+msgstr "Chọn ảnh đĩa phương tiện từ thư mục làm việc của chương trình"
+
+msgid "PIT mode:"
+msgstr "Chế độ PIT:"
+
+msgid "Auto"
+msgstr "Tự động"
+
+msgid "Slow"
+msgstr "Chậm"
+
+msgid "Fast"
+msgstr "Nhanh"
+
+msgid "&Auto-pause on focus loss"
+msgstr "&Tự tạm dừng giả lập khi không tập trung ở cửa sổ"
+
+msgid "WinBox is no longer supported"
+msgstr "WinBox không còn được hỗ trợ"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "Trình quản lý phiên WinBox đã bị dừng phát triển năm 2022 do thiếu nhân sự duy trì. Vì những quyết định để cho 86Box trở nên tốt hơn, chúng tôi đã không còn hỗ trợ trình quản lý WinBox.\n\n Sẽ không có bản cập nhật mới cho WinBox nữa, và nếu bạn tiếp tục sử dụng với các bản 86Box mới hơn có thể gặp lỗi. Bất kì các bản bug report liên quan đến lỗi của WinBox sẽ bị coi là không hợp lệ và bị đóng.\n\nTruy cập 86Box.net để tìm qua các trình quản lý phiên/manager khác cho phù hợp."
+
+msgid "Generate"
+msgstr "Tạo"
+
+msgid "Joystick configuration"
+msgstr "Cấu hình cần điều khiển"
+
+msgid "Device"
+msgstr "Thiết bị"
+
+msgid "%1 (X axis)"
+msgstr "%1 (trục x)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (trục y)"
+
+msgid "MCA devices"
+msgstr "Thiết bị MCA"
+
+msgid "List of MCA devices:"
+msgstr "Danh sách các thiết bị MCA:"
+
+msgid "&Tablet tool"
+msgstr "Công cụ bảng nhập liệu"
+
+msgid "About &Qt"
+msgstr "Về &qt"
+
+msgid "&MCA devices..."
+msgstr "Thiết bị MCA..."
+
+msgid "Show non-&primary monitors"
+msgstr "Hiển thị các màn hình phụ"
+
+msgid "Open screenshots &folder..."
+msgstr "Mở thư mục ảnh chụp màn hình..."
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "Co giãn toàn màn hình khi cực đại hóa cửa sổ"
+
+msgid "&Cursor/Puck"
+msgstr "&Con trỏ/puck"
+
+msgid "&Pen"
+msgstr "&Bút"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "&Máy chủ CD/DVD ổ đĩa (%1 :)"
+
+msgid "&Connected"
+msgstr "&Đã kết nối"
+
+msgid "Clear image &history"
+msgstr "Xóa lịch sử ảnh đĩa"
+
+msgid "Create..."
+msgstr "Tạo..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "Máy chủ CD/DVD Drive (%1)"
+
+msgid "Unknown Bus"
+msgstr "Bus không xác định"
+
+msgid "Null Driver"
+msgstr "Trình điều khiển NULL"
+
+msgid "NIC:"
+msgstr "NIC:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "NIC %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "&NIC %1 (%2) %3"
+
+msgid "Render behavior"
+msgstr "Hành vi kết xuất"
+
+msgid "Use target framerate:"
+msgstr "Dùng số khung hình mục tiêu:"
+
+msgid " fps"
+msgstr " khung hình / giây"
+
+msgid "VSync"
+msgstr "Vsync"
+
+msgid "Synchronize with video"
+msgstr "Đồng bộ với video"
+
+msgid "Shaders"
+msgstr "Shaders"
+
+msgid "Remove"
+msgstr "Loại bỏ"
+
+msgid "Browse..."
+msgstr "Duyệt..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "Không thể tạo bối cảnh OpenGL."
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "Không thể chuyển sang bối cảnh OpenGL."
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "OpenGL phiên bản 3.0 trở lên là bắt buộc. Phiên bản hiện tại là %1. %2"
+
+msgid "Error initializing OpenGL"
+msgstr "Lỗi khởi tạo OpenGL"
+
+msgid "\nFalling back to software rendering."
+msgstr "\nQuay trở lại kết xuất phần mềm."
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>Khi chọn hình ảnh phương tiện (CD-ROM, ổ mềm, v.v.), hộp thoại mở sẽ bắt đầu trong cùng thư mục với tệp cấu hình 86box. Cài đặt này có thể sẽ chỉ tạo ra sự khác biệt trên macOS.</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "Cấu hình máy này có thể đã được di chuyển hoặc sao chép."
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "Để đảm bảo chức năng kết nối mạng thích hợp, 86Box cần biết liệu máy này có được di chuyển hay sao chép không.\n\nNếu bạn không chắc chắn, chọn \"Tôi đã sao chép nó\"."
+
+msgid "I Moved It"
+msgstr "Tôi đã di chuyển nó"
+
+msgid "I Copied It"
+msgstr "Tôi đã sao chép nó"
+
+msgid "86Box Monitor #"
+msgstr "Màn hình 86box #"
+
+msgid "No MCA devices."
+msgstr "Không có thiết bị MCA."
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "Thẻ mạng 1"
+
+msgid "Network Card #2"
+msgstr "Thẻ mạng 2"
+
+msgid "Network Card #3"
+msgstr "Thẻ mạng 3"
+
+msgid "Network Card #4"
+msgstr "Thẻ mạng 4"
+
+msgid "Mode:"
+msgstr "Chế độ:"
+
+msgid "Interface:"
+msgstr "Giao diện:"
+
+msgid "Adapter:"
+msgstr "Bộ chuyển đổi:"
+
+msgid "VDE Socket:"
+msgstr "Ổ cắm VDE:"
+
+msgid "86Box Unit Tester"
+msgstr "Trình kiểm tra đơn vị 86box"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Thẻ khóa Novell Netware 2.x"
+
+msgid "Serial port passthrough 1"
+msgstr "Thông qua cổng serial 1"
+
+msgid "Serial port passthrough 2"
+msgstr "Thông qua cổng serial 2"
+
+msgid "Serial port passthrough 3"
+msgstr "Thông qua cổng serial 3"
+
+msgid "Serial port passthrough 4"
+msgstr "Thông qua cổng serial 4"
+
+msgid "Renderer &options..."
+msgstr "Tùy chọn kết xuất ..."
+
+msgid "PC/XT Keyboard"
+msgstr "Bàn phím PC/XT"
+
+msgid "AT Keyboard"
+msgstr "Bàn phím AT"
+
+msgid "AX Keyboard"
+msgstr "Bàn phím AX"
+
+msgid "PS/2 Keyboard"
+msgstr "Bàn phím PS/2"
+
+msgid "PS/55 Keyboard"
+msgstr "Bàn phím PS/55"
+
+msgid "Keys"
+msgstr "Phím"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Chuột bus Logitech/Microsoft"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Chuột bus Microsoft (INPORT)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Chuột serial Mouse Systems"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Chuột bus Mouse Systems"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Chuột serial Microsoft"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Chuột bi serial Microsoft"
+
+msgid "Logitech Serial Mouse"
+msgstr "Chuột serial Logitech"
+
+msgid "PS/2 Mouse"
+msgstr "Chuột PS/2"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "Chuột QuickPort PS/2"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (Serial)"
+
+msgid "Default Baud rate"
+msgstr "Tốc độ baud mặc định"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] Modem tuân thủ tiêu chuẩn Hayes"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Mô phỏng Roland MT-32"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Mô phỏng Roland MT-32 (mới)"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Mô phỏng Roland CM-32L"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Mô phỏng Roland CM-32LN"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "Bo mạch con OPL4-ML"
+
+msgid "System MIDI"
+msgstr "MIDI của hệ thống"
+
+msgid "MIDI Input Device"
+msgstr "Thiết bị nhập MIDI"
+
+msgid "BIOS file"
+msgstr "Tập tin BIOS"
+
+msgid "BIOS file (ROM #1)"
+msgstr "Tập tin BIOS (ROM #1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "Tập tin BIOS (ROM #2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "Tập tin BIOS (ROM #3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "Tập tin BIOS (ROM #4)"
+
+msgid "BIOS address"
+msgstr "Địa chỉ BIOS"
+
+msgid "BIOS address (ROM #1)"
+msgstr "Địa chỉ BIOS (ROM #1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "Địa chỉ BIOS (ROM #2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "Địa chỉ BIOS (ROM #3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "Địa chỉ BIOS (ROM #4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "Kích hoạt ghi ROM mở rộng BIOS"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "Kích hoạt ghi ROM mở rộng BIOS (ROM #1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "Kích hoạt ghi ROM mở rộng BIOS (ROM #2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "Kích hoạt ghi ROM mở rộng BIOS (ROM #3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "Kích hoạt ghi ROM mở rộng BIOS (ROM #4)"
+
+msgid "Linear framebuffer base"
+msgstr "Địa chỉ cơ sở framebuffer tuyến tính"
+
+msgid "Address"
+msgstr "Địa chỉ"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "IRQ cổng serial"
+
+msgid "Parallel port IRQ"
+msgstr "IRQ cổng parallel"
+
+msgid "BIOS Revision"
+msgstr "Sửa đổi BIOS"
+
+msgid "BIOS Version"
+msgstr "Phiên bản BIOS"
+
+msgid "BIOS Language"
+msgstr "Ngôn ngữ BIOS"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "Bộ mở rộng IBM 5161"
+
+msgid "IBM Cassette Basic"
+msgstr "IBM Cassette Basic"
+
+msgid "Translate 26 -> 17"
+msgstr "Dịch 26 -> 17"
+
+msgid "Language"
+msgstr "Ngôn ngữ"
+
+msgid "Enable backlight"
+msgstr "Bật đèn nền"
+
+msgid "Invert colors"
+msgstr "Đảo ngược màu sắc"
+
+msgid "BIOS size"
+msgstr "Kích thước BIOS"
+
+msgid "BIOS size (ROM #1)"
+msgstr "Kích thước BIOS (ROM #1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "Kích thước BIOS (ROM #2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "Kích thước BIOS (ROM #3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "Kích thước BIOS (ROM #4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "Map C0000-C7FFF dưới dạng UMB"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "Map C8000-CFFFF dưới dạng UMB"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "Map D0000-D7FFF dưới dạng UMB"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "Map D8000-Dffff dưới dạng UMB"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "Map E0000-E7FFF dưới dạng UMB"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "Map e8000-effff dưới dạng umb"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "JS9 Jumper (Jim)"
+
+msgid "MIDI Output Device"
+msgstr "Thiết bị đầu ra MIDI"
+
+msgid "MIDI Real time"
+msgstr "MIDI trong thời gian thực"
+
+msgid "MIDI Thru"
+msgstr "Thông qua đầu vào MIDI"
+
+msgid "MIDI Clockout"
+msgstr "MIDI Clockout"
+
+msgid "SoundFont"
+msgstr "Font âm thanh"
+
+msgid "Output Gain"
+msgstr "Tăng đầu ra"
+
+msgid "Chorus"
+msgstr "Điệp khúc"
+
+msgid "Chorus Voices"
+msgstr "Tiếng nói của điệp khúc"
+
+msgid "Chorus Level"
+msgstr "Cấp độ điệp khúc"
+
+msgid "Chorus Speed"
+msgstr "Tốc độ điệp khúc"
+
+msgid "Chorus Depth"
+msgstr "Độ sâu điệp khúc"
+
+msgid "Chorus Waveform"
+msgstr "Dạng sóng điệp khúc"
+
+msgid "Reverb"
+msgstr "Hồi âm"
+
+msgid "Reverb Room Size"
+msgstr "Kích thước phòng hồi âm"
+
+msgid "Reverb Damping"
+msgstr "Giảm chấn hồi âm"
+
+msgid "Reverb Width"
+msgstr "Chiều rộng hồi âm"
+
+msgid "Reverb Level"
+msgstr "Mức độ hồi âm"
+
+msgid "Interpolation Method"
+msgstr "Phương pháp nội suy"
+
+msgid "Dynamic Sample Loading"
+msgstr "Nạp mẫu động"
+
+msgid "Reverb Output Gain"
+msgstr "Tăng đầu ra hồi âm"
+
+msgid "Reversed stereo"
+msgstr "Đảo ngược âm thanh nổi"
+
+msgid "Nice ramp"
+msgstr "Giảm độ dốc âm lượng"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "Nút"
+
+msgid "Serial Port"
+msgstr "Cổng serial"
+
+msgid "RTS toggle"
+msgstr "RT chuyển đổi"
+
+msgid "Revision"
+msgstr "Bản sửa đổi"
+
+msgid "Controller"
+msgstr "Bộ điều khiển"
+
+msgid "Show Crosshair"
+msgstr "Hiển thị hình chữ thập"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "Địa chỉ MAC"
+
+msgid "MAC Address OUI"
+msgstr "OUI địa chỉ MAC"
+
+msgid "Enable BIOS"
+msgstr "Bật BIOS"
+
+msgid "Baud Rate"
+msgstr "Tốc độ baud"
+
+msgid "TCP/IP listening port"
+msgstr "Cổng nghe TCP/IP"
+
+msgid "Phonebook File"
+msgstr "Tệp danh bạ"
+
+msgid "Telnet emulation"
+msgstr "Mô phỏng telnet"
+
+msgid "RAM Address"
+msgstr "Địa chỉ RAM"
+
+msgid "RAM size"
+msgstr "Kích thước ram"
+
+msgid "Initial RAM size"
+msgstr "Kích thước ram ban đầu"
+
+msgid "Serial Number"
+msgstr "Số seri"
+
+msgid "Host ID"
+msgstr "ID máy chủ"
+
+msgid "FDC Address"
+msgstr "Địa chỉ FDC"
+
+msgid "MPU-401 Address"
+msgstr "Địa chỉ MPU-401"
+
+msgid "MPU-401 IRQ"
+msgstr "MPU-401 IRQ"
+
+msgid "Receive MIDI input"
+msgstr "Nhận nhập MIDI"
+
+msgid "Low DMA"
+msgstr "DMA thấp"
+
+msgid "Enable Game port"
+msgstr "Bật cổng trò chơi"
+
+msgid "SID Model"
+msgstr "Mẫu SID"
+
+msgid "SID Filter Strength"
+msgstr "Cường độ bộ lọc SID"
+
+msgid "Surround module"
+msgstr "Mô đun vòm"
+
+msgid "CODEC"
+msgstr "CODEC"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "Tăng ngắt CODEC trên thiết lập CODEC (cần bởi một số trình điều khiển)"
+
+msgid "SB Address"
+msgstr "Địa chỉ SB"
+
+msgid "Adlib Address"
+msgstr "Địa chỉ AdLib"
+
+msgid "Use EEPROM setting"
+msgstr "Dùng cài đặt EEPROM"
+
+msgid "WSS IRQ"
+msgstr "WSS IRQ"
+
+msgid "WSS DMA"
+msgstr "WSS DMA"
+
+msgid "Enable OPL"
+msgstr "Bật OPL"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "Nhận đầu vào MIDI (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "SB DMA thấp"
+
+msgid "6CH variant (6-channel)"
+msgstr "Biến thể 6CH (6 kênh)"
+
+msgid "Enable CMS"
+msgstr "Bật CMS"
+
+msgid "Mixer"
+msgstr "Bộ trộn"
+
+msgid "High DMA"
+msgstr "DMA cao"
+
+msgid "Control PC speaker"
+msgstr "Kiểm soát loa PC"
+
+msgid "Memory size"
+msgstr "Kích thước bộ nhớ"
+
+msgid "EMU8000 Address"
+msgstr "Địa chỉ EMU8000"
+
+msgid "IDE Controller"
+msgstr "Bộ điều khiển IDE"
+
+msgid "Codec"
+msgstr "Codec"
+
+msgid "GUS type"
+msgstr "Loại Gus"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "Bật lệnh 0x04 \" Thoát 86box \""
+
+msgid "Display type"
+msgstr "Loại hiển thị"
+
+msgid "Composite type"
+msgstr "Loại tổng hợp"
+
+msgid "RGB type"
+msgstr "Loại RGB"
+
+msgid "Line doubling type"
+msgstr "Loại dòng kép"
+
+msgid "Snow emulation"
+msgstr "Giả lập hiệu ứng tuyết"
+
+msgid "Monitor type"
+msgstr "Loại màn hình"
+
+msgid "Character set"
+msgstr "Bộ ký tự"
+
+msgid "XGA type"
+msgstr "Loại XGA"
+
+msgid "Instance"
+msgstr "Bản chạy"
+
+msgid "MMIO Address"
+msgstr "Địa chỉ MMIO"
+
+msgid "RAMDAC type"
+msgstr "Loại RAMDAC"
+
+msgid "Blend"
+msgstr "Trộn"
+
+msgid "Font"
+msgstr "Phông"
+
+msgid "Bilinear filtering"
+msgstr "Lọc song tuyến"
+
+msgid "Video chroma-keying"
+msgstr "Tách nền màu (chroma-keying) video"
+
+msgid "Dithering"
+msgstr "Ngân tán"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "Bật NMI cho mô phỏng CGA"
+
+msgid "Voodoo type"
+msgstr "Loại voodoo"
+
+msgid "Framebuffer memory size"
+msgstr "Kích thước bộ nhớ FRAMEBUFFER"
+
+msgid "Texture memory size"
+msgstr "Kích thước bộ nhớ kết cấu"
+
+msgid "Dither subtraction"
+msgstr "Giảm ngân tán"
+
+msgid "Screen Filter"
+msgstr "Bộ lọc màn hình"
+
+msgid "Render threads"
+msgstr "Luồng kết xuất"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "Địa chỉ bắt đầu"
+
+msgid "Contiguous Size"
+msgstr "Kích thước tiếp giáp"
+
+msgid "I/O Width"
+msgstr "Chiều rộng I/O"
+
+msgid "Transfer Speed"
+msgstr "Tốc độ truyền tải"
+
+msgid "EMS mode"
+msgstr "Chế độ EMS"
+
+msgid "EMS Address"
+msgstr "Địa chỉ EMS"
+
+msgid "EMS 1 Address"
+msgstr "Địa chỉ EMS 1"
+
+msgid "EMS 2 Address"
+msgstr "Địa chỉ EMS 2"
+
+msgid "EMS Memory Size"
+msgstr "Cỡ bộ nhớ EMS"
+
+msgid "EMS 1 Memory Size"
+msgstr "Cỡ bộ nhớ EMS 1"
+
+msgid "EMS 2 Memory Size"
+msgstr "Cỡ bộ nhớ EMS 2"
+
+msgid "Enable EMS"
+msgstr "Kích hoạt EMS"
+
+msgid "Enable EMS 1"
+msgstr "Kích hoạt EMS 1"
+
+msgid "Enable EMS 2"
+msgstr "Kích hoạt EMS 2"
+
+msgid "Address for > 2 MB"
+msgstr "Địa chỉ cho > 2 MB"
+
+msgid "Frame Address"
+msgstr "Địa chỉ khung"
+
+msgid "USA"
+msgstr "Hoa Kỳ"
+
+msgid "Danish"
+msgstr "Đan Mạch"
+
+msgid "Always at selected speed"
+msgstr "Luôn ở tốc độ đã chọn"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "Cài đặt BIOS + phím nóng (TẮT trong POST)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 KB bắt đầu từ f0000"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 KB bắt đầu từ E0000 (địa chỉ MSB đảo ngược, 64 KB cuối cùng)"
+
+msgid "Sine"
+msgstr "Sin"
+
+msgid "Triangle"
+msgstr "Tam giác"
+
+msgid "Linear"
+msgstr "Tuyến tính"
+
+msgid "4th Order"
+msgstr "Thứ tự thứ 4"
+
+msgid "7th Order"
+msgstr "Thứ tự thứ 7"
+
+msgid "Non-timed (original)"
+msgstr "Không đúng lúc (bản gốc)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (JMP2 không phổ cập)"
+
+msgid "Two"
+msgstr "Hai"
+
+msgid "Three"
+msgstr "Ba"
+
+msgid "Wheel"
+msgstr "Con lăn"
+
+msgid "Five + Wheel"
+msgstr "Năm + con lăn"
+
+msgid "Five + 2 Wheels"
+msgstr "Năm + hai con lăn"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 Serial / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) Serial"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "Vô hiệu hóa BIOS"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2 MB"
+
+msgid "8 MB"
+msgstr "8 MB"
+
+msgid "28 MB"
+msgstr "28 MB"
+
+msgid "1 MB"
+msgstr "1 MB"
+
+msgid "4 MB"
+msgstr "4 MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16 MB"
+
+msgid "20 MB"
+msgstr "20 MB"
+
+msgid "24 MB"
+msgstr "24 MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "Sigmatel Stac9721T (âm thanh nổi)"
+
+msgid "Classic"
+msgstr "Cổ điển"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "Tổng hợp"
+
+msgid "True color"
+msgstr "Màu chân thật"
+
+msgid "Old"
+msgstr "Cũ"
+
+msgid "New"
+msgstr "Mới"
+
+msgid "Color (generic)"
+msgstr "Màu (chung)"
+
+msgid "Green Monochrome"
+msgstr "Đơn sắc màu xanh lá cây"
+
+msgid "Amber Monochrome"
+msgstr "Đơn sắc màu hổ phách"
+
+msgid "Gray Monochrome"
+msgstr "Đơn sắc màu xám"
+
+msgid "Color (no brown)"
+msgstr "Màu (không có màu nâu)"
+
+msgid "Color (IBM 5153)"
+msgstr "Màu sắc (IBM 5153)"
+
+msgid "Simple doubling"
+msgstr "Nhân đôi đơn giản"
+
+msgid "sRGB interpolation"
+msgstr "Nội suy SRGB"
+
+msgid "Linear interpolation"
+msgstr "Nội suy tuyến tính"
+
+msgid "Has secondary 8x8 character set"
+msgstr "Có bộ kí tự 8x8 thứ hai"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Có bảng mạch con Quadcolor II"
+
+msgid "Alternate monochrome contrast"
+msgstr "Tương phản đơn sắc thay thế"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "Đơn sắc (5151/MDA) (Trắng)"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "Đơn sắc (5151/MDA) (màu xanh lá cây)"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "Đơn sắc (5151/MDA) (Amber)"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "Màu 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "Màu 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "Màu sắc nâng cao - Chế độ bình thường (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "Màu sắc nâng cao - Chế độ nâng cao (5154/ECD)"
+
+msgid "Green"
+msgstr "Màu xanh lá cây"
+
+msgid "Amber"
+msgstr "Màu hổ phách"
+
+msgid "Gray"
+msgstr "Màu xám"
+
+msgid "Grayscale"
+msgstr "Thang màu xám"
+
+msgid "Color"
+msgstr "Màu sắc"
+
+msgid "U.S. English"
+msgstr "Tiếng Anh Mỹ"
+
+msgid "Scandinavian"
+msgstr "Scandinavia"
+
+msgid "Other languages"
+msgstr "Các ngôn ngữ khác"
+
+msgid "Bochs latest"
+msgstr "Bochs mới nhất"
+
+msgid "Apply overscan deltas"
+msgstr "Áp dụng delta quét đè"
+
+msgid "Mono Interlaced"
+msgstr "Đơn sắc xen kẽ"
+
+msgid "Mono Non-Interlaced"
+msgstr "Đơn sắc không xen kẽ"
+
+msgid "Color Interlaced"
+msgstr "Màu sắc xen kẽ"
+
+msgid "Color Non-Interlaced"
+msgstr "Màu sắc không xen kẽ"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "Đồ họa 3Dfx Voodoo"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 TMU)"
+
+msgid "8-bit"
+msgstr "8 bit"
+
+msgid "16-bit"
+msgstr "16 bit"
+
+msgid "Standard (150ns)"
+msgstr "Tiêu chuẩn (150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "Tốc độ cao (120ns)"
+
+msgid "Enabled"
+msgstr "Đã bật"
+
+msgid "Standard"
+msgstr "Tiêu chuẩn"
+
+msgid "High-Speed"
+msgstr "Tốc độ cao"
+
+msgid "Stereo LPT DAC"
+msgstr "STEREO LPT DAC"
+
+msgid "Generic Text Printer"
+msgstr "Máy in generic văn bản"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "Máy in generic ESC/P 2 ma trận chấm"
+
+msgid "Generic PostScript Printer"
+msgstr "Máy in generic PostScript"
+
+msgid "Generic PCL5e Printer"
+msgstr "Máy in generic PCL5E"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Parallel Line Internet Protocol"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Dongle bảo vệ cho Savage Quest"
+
+msgid "Serial Passthrough Device"
+msgstr "Thiết bị thông qua cổng serial"
+
+msgid "Passthrough Mode"
+msgstr "Chế độ thông qua"
+
+msgid "Host Serial Device"
+msgstr "Thiết bị serial máy chủ"
+
+msgid "Name of pipe"
+msgstr "Tên đường ống"
+
+msgid "Data bits"
+msgstr "Bit dữ liệu"
+
+msgid "Stop bits"
+msgstr "Dừng bit"
+
+msgid "Baud Rate of Passthrough"
+msgstr "Tốc độ baud của đường thông"
+
+msgid "Named Pipe (Server)"
+msgstr "Đường ống có tên (máy chủ)"
+
+msgid "Named Pipe (Client)"
+msgstr "Đường ống có tên (máy khách)"
+
+msgid "Host Serial Passthrough"
+msgstr "Thông qua cổng serial của máy chủ"
+
+msgid "E&ject %1"
+msgstr "Đẩy đĩ&a ra %1"
+
+msgid "&Unmute"
+msgstr "&Mở tiếng"
+
+msgid "Softfloat FPU"
+msgstr "Softfloat FPU"
+
+msgid "High performance impact"
+msgstr "Ảnh hưởng lớn đến hiệu suất"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Generic] Đĩa RAM (tốc độ tối đa)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Generic] 1989 (3500 RPM)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Generic] 1992 (3600 RPM)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Generic] 1994 (4500 RPM)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Generic] 1996 (5400 RPM)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Generic] 1997 (5400 RPM)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Generic] 1998 (5400 RPM)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Generic] 2000 (7200 RPM)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "IBM 8514/A bản sao (ISA)"
+
+msgid "Vendor"
+msgstr "Nhà sản xuất"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr ""
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr ""
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "Mở rộng bộ nhớ chung qua PC/XT"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "Mở rộng bộ nhớ chung qua PC/AT"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "Không tìm thấy phông chữ ma trận chấm"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "Cần có phông chữ TrueType trong thư mục \"roms/printer/fonts\" để mô phỏng máy in generic ESC/P 2 ma trận chấm."
+
+msgid "Inhibit multimedia keys"
+msgstr "Không dùng dãy phím multimedia"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "Hỏi xác nhận trước khi lưu cài đặt"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "Hỏi xác nhận trước khi buộc khởi động lại"
+
+msgid "Ask for confirmation before quitting"
+msgstr "Hỏi xác nhận trước khi thoát"
+
+msgid "Options"
+msgstr "Tùy chọn"
+
+msgid "Model"
+msgstr "Mẫu máy"
+
+msgid "Model:"
+msgstr "Mẫu máy:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Không thể khởi tạo renderer Vulkan."
+
+msgid "GLSL Error"
+msgstr "Lỗi GLSL"
+
+msgid "Could not load shader: %1"
+msgstr "Không thể nạp shader: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "Yêu cầu OpenGL bản 3.0 trở lên. Hiện tại bản GLSL là %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "Không thể nạp texture: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "Không thể biên dịch shader: \n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "Chương trình không được liên kết:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "Trình quản lý shader"
+
+msgid "Shader Configuration"
+msgstr "Cấu hình shader"
+
+msgid "Add"
+msgstr "Thêm"
+
+msgid "Move up"
+msgstr "Chuyển lên"
+
+msgid "Move down"
+msgstr "Chuyển xuống"
+
+msgid "Could not load file %1"
+msgstr "Không thể nạp tập tin %1"
+
+msgid "Key Bindings:"
+msgstr "Phím nóng:"
+
+msgid "Action"
+msgstr "Thực hiện"
+
+msgid "Keybind"
+msgstr "Phím nóng"
+
+msgid "Clear binding"
+msgstr "Xóa phím nóng"
+
+msgid "Bind"
+msgstr "Gắn"
+
+msgid "Bind Key"
+msgstr "Gắn phím"
+
+msgid "Enter key combo:"
+msgstr "Nhập tổ hợp phím"
+
+msgid "Bind conflict"
+msgstr "Gắn phím trùng lặp"
+
+msgid "This key combo is already in use."
+msgstr "Tổ hợp này đã được sử dụng."
+
+msgid "Send Control+Alt+Del"
+msgstr "Gửi Control+Alt+Del"
+
+msgid "Send Control+Alt+Escape"
+msgstr "Gửi Control+Alt+Escape"
+
+msgid "Toggle fullscreen"
+msgstr "Bật/tắt toàn màn hình"
+
+msgid "Screenshot"
+msgstr "Chụp màn hình"
+
+msgid "Release mouse pointer"
+msgstr "Thả con trỏ chuột"
+
+msgid "Toggle pause"
+msgstr "Tạm dừng/tiếp tục"
+
+msgid "Toggle mute"
+msgstr "Bật/tắt tiếng"
+
+msgid "Text files"
+msgstr "Tập tin văn bản"
+
+msgid "ROM files"
+msgstr "Tập tin ROM"
+
+msgid "SoundFont files"
+msgstr "Tập tin SoundFont"
+
+msgid "Local Switch"
+msgstr "Công tắc cục bộ"
+
+msgid "Remote Switch"
+msgstr "Công tắc từ xa"
+
+msgid "Switch:"
+msgstr "Công tắc:"
+
+msgid "Hub Mode"
+msgstr "Chế độ hub"
+
+msgid "Hostname:"
+msgstr "Tên host:"
+
+msgid "ISA RAM:"
+msgstr "ISA RAM:"
+
+msgid "ISA ROM:"
+msgstr "ISA ROM:"
+
+msgid "&Wipe NVRAM"
+msgstr "Xóa sạch NVRAM"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "Hành động này sẽ xóa toàn bộ tập tin NVRAM (và các tập tin liên quan) của máy ảo nằm trong thư mục con \"nvr\". Bạn sẽ phải cấu hình lại cài đặt BIOS (và có thể các thiết bị khác nữa bên trong máy ảo) nếu có áp dụng.\n\nBạn có chắc muốn xóa toàn bộ nội dung NVRAM của máy ảo \"%1\" không?"
+
+msgid "Success"
+msgstr "Thành công"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "Đã thành công xóa sạch nội dung NVRAM của máy ảo \"%1\""
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "Có lỗi xảy ra khi thử xóa nội dung NVRAM của máy ảo \"%1\""
+
+msgid "%1 VM Manager"
+msgstr "Trình quản lý máy ảo %1"
+
+msgid "%n disk(s)"
+msgstr "%n đĩa"
+
+msgid "Unknown Status"
+msgstr "Trạng thái không biết"
+
+msgid "No Machines Found!"
+msgstr "Không tìm thấy máy nào!"
+
+msgid "Check for updates on startup"
+msgstr "Kiểm tra cập nhật khi khởi động"
+
+msgid "Unable to determine release information"
+msgstr "Không thể quyết định thông tin phát hành"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "Có lỗi xảy ra khi đang kiểm tra cập nhật:\n\n%1\n\nHãy thử lại sau."
+
+msgid "Update check complete"
+msgstr "Kiểm tra cập nhật hoàn tất"
+
+msgid "stable"
+msgstr "ổn định"
+
+msgid "beta"
+msgstr "thử nghiệm"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "Bạn đang chạy phiên bản %1 mới nhất của 86Box: %2"
+
+msgid "version"
+msgstr "phiên bản"
+
+msgid "build"
+msgstr "bản dựng"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "Bạn đang chạy phiên bản <b>%1</b>"
+
+msgid "<b>Version %1</b> is now available."
+msgstr "<b>Phiên bản %1</b> hiện đã ra mắt."
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "Bạn đang chạy bản dựng <b>%1</b>"
+
+msgid "<b>Build %1</b> is now available."
+msgstr "<b>Bản dựng %1</b> hiện đã ra mắt."
+
+msgid "Would you like to visit the download page?"
+msgstr "Bạn có muốn truy cập trang tải xuống không?"
+
+msgid "Visit download page"
+msgstr "Truy cập trang tải xuống"
+
+msgid "Update check"
+msgstr "Kiểm tra cập nhật"
+
+msgid "Checking for updates..."
+msgstr "Đang kiểm tra cập nhật..."
+
+msgid "86Box Update"
+msgstr "Cập nhật 86Box"
+
+msgid "Release notes:"
+msgstr "Ghi chú bản phát hành:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "Máy ảo bị sập"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "Tiến trình của máy ảo \"%1\" đã bị dừng bất thường với mã thoát %2."
+
+msgid "The system will not be added."
+msgstr "Hệ thống sẽ không được thêm."
+
+msgid "&Update mouse every CPU frame"
+msgstr "&Cập nhật chuột mỗi cỡ khung CPU"
+
+msgid "Hue"
+msgstr "Màu sắc"
+
+msgid "Saturation"
+msgstr "Độ bão hòa"
+
+msgid "Contrast"
+msgstr "Sự tương phản"
+
+msgid "Brightness"
+msgstr "Độ sáng"
+
+msgid "Sharpness"
+msgstr "Độ sắc nét"
+
+msgid "&CGA composite settings..."
+msgstr "Cài đặt chế độ tổng hợp &CGA..."
+
+msgid "CGA composite settings"
+msgstr "Cài đặt chế độ tổng hợp CGA"
+
+msgid "Monitor EDID"
+msgstr "EDID của màn hình"
+
+msgid "Export..."
+msgstr "Xuất khẩu..."
+
+msgid "Export EDID"
+msgstr "Xuất khẩu EDID"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "Tệp EDID \"%ls\" quá lớn."
+
+msgid "OpenGL input scale"
+msgstr "Độ phân giải đầu vào của OpenGL"
+
+msgid "OpenGL input stretch mode"
+msgstr "Chế độ kéo giãn đầu vào của OpenGL"
+
+msgid "Color scheme"
+msgstr "Bảng màu"
+
+msgid "Light"
+msgstr "Ánh sáng"
+
+msgid "Dark"
+msgstr "Tối"
diff --git a/src/qt/languages/zh-CN.po b/src/qt/languages/zh-CN.po
index 0ac54f4e7..7f44fe4fc 100644
--- a/src/qt/languages/zh-CN.po
+++ b/src/qt/languages/zh-CN.po
@@ -1,3 +1,11 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: zh_CN\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
 msgstr "操作(&A)"
 
@@ -10,8 +18,8 @@ msgstr "将右 CTRL 键映射为左 ALT 键(&R)"
 msgid "&Hard Reset..."
 msgstr "硬重置(&H)..."
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "Ctrl+Alt+Del(&C)\tCtrl+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del(&C)"
 
 msgid "Ctrl+Alt+&Esc"
 msgstr "Ctrl+Alt+Esc(&E)"
@@ -19,8 +27,14 @@ msgstr "Ctrl+Alt+Esc(&E)"
 msgid "&Pause"
 msgstr "暂停(&P)"
 
-msgid "E&xit..."
-msgstr "退出(&X)..."
+msgid "Pause"
+msgstr "暂停"
+
+msgid "Re&sume"
+msgstr "恢复(&S)"
+
+msgid "E&xit"
+msgstr "退出(&X)"
 
 msgid "&View"
 msgstr "查看(&V)"
@@ -40,26 +54,20 @@ msgstr "记住窗口大小和位置(&E)"
 msgid "Re&nderer"
 msgstr "渲染器(&N)"
 
-msgid "&SDL (Software)"
-msgstr "SDL (软件)(&S)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (硬件)(&H)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (OpenGL)(&O)"
+msgid "&Qt (Software)"
+msgstr "Qt (软件)(&Q)"
 
 msgid "Open&GL (3.0 Core)"
-msgstr "OpenGL (3.0 核心)(&G)"
+msgstr "OpenGL (3.0 Core)(&G)"
 
 msgid "&VNC"
 msgstr "VNC(&V)"
 
-msgid "Specify dimensions..."
-msgstr "指定窗口大小..."
+msgid "Specify &dimensions..."
+msgstr "指定窗口大小...(&D)"
 
-msgid "F&orce 4:3 display ratio"
-msgstr "强制 4:3 显示比例(&O)"
+msgid "Force &4:3 display ratio"
+msgstr "强制 4:3 显示比例(&4)"
 
 msgid "&Window scale factor"
 msgstr "窗口缩放系数(&W)"
@@ -94,8 +102,8 @@ msgstr "7x(&7)"
 msgid "&8x"
 msgstr "8x(&8)"
 
-msgid "Filter method"
-msgstr "过滤方式"
+msgid "Fi&lter method"
+msgstr "过滤方式(&L)"
 
 msgid "&Nearest"
 msgstr "邻近(&N)"
@@ -106,8 +114,8 @@ msgstr "线性(&L)"
 msgid "Hi&DPI scaling"
 msgstr "HiDPI 缩放(&D)"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "全屏(&F)\tCtrl+Alt+PgUp"
+msgid "&Fullscreen"
+msgstr "全屏(&F)"
 
 msgid "Fullscreen &stretch mode"
 msgstr "全屏拉伸模式(&S)"
@@ -127,8 +135,8 @@ msgstr "整数比例(&I)"
 msgid "4:&3 Integer scale"
 msgstr "4:3 整数比例(&3)"
 
-msgid "E&GA/(S)VGA settings"
-msgstr "EGA/(S)VGA 设置(&G)"
+msgid "EGA/(S)&VGA settings"
+msgstr "EGA/(S)VGA 设置(&V)"
 
 msgid "&Inverted VGA monitor"
 msgstr "VGA 显示器反色显示(&I)"
@@ -139,9 +147,15 @@ msgstr "VGA 屏幕类型(&T)"
 msgid "RGB &Color"
 msgstr "RGB 彩色(&C)"
 
+msgid "RGB (no brown)"
+msgstr "RGB (无棕色)"
+
 msgid "&RGB Grayscale"
 msgstr "RGB 灰度(&R)"
 
+msgid "Generic RGBI color monitor"
+msgstr "通用 RGBI 彩色显示器"
+
 msgid "&Amber monitor"
 msgstr "琥珀色单色显示器(&A)"
 
@@ -178,11 +192,17 @@ msgstr "工具(&T)"
 msgid "&Settings..."
 msgstr "设置(&S)..."
 
+msgid "Settings..."
+msgstr "设置"
+
 msgid "&Update status bar icons"
 msgstr "更新状态栏图标(&U)"
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "截图(&C)\tCtrl+F11"
+msgid "Take s&creenshot"
+msgstr "截图(&C)"
+
+msgid "S&ound"
+msgstr "声音(&O)"
 
 msgid "&Preferences..."
 msgstr "首选项(&P)..."
@@ -193,11 +213,11 @@ msgstr "启用 Discord 集成(&D)"
 msgid "Sound &gain..."
 msgstr "音量增益(&G)..."
 
-msgid "Begin trace\tCtrl+T"
-msgstr "开始追踪\tCtrl+T"
+msgid "Begin trace"
+msgstr "开始追踪"
 
-msgid "End trace\tCtrl+T"
-msgstr "结束追踪\tCtrl+T"
+msgid "End trace"
+msgstr "结束追踪"
 
 msgid "&Help"
 msgstr "帮助(&H)"
@@ -244,8 +264,8 @@ msgstr "静音(&M)"
 msgid "E&mpty"
 msgstr "空置驱动器(&M)"
 
-msgid "&Reload previous image"
-msgstr "载入上一个映像(&R)"
+msgid "Reload previous image"
+msgstr "载入上一个映像"
 
 msgid "&Folder..."
 msgstr "文件夹(&F)..."
@@ -301,18 +321,12 @@ msgstr "确定"
 msgid "Cancel"
 msgstr "取消"
 
-msgid "Save these settings as &global defaults"
-msgstr "将以上设置存储为全局默认值(&G)"
-
 msgid "&Default"
 msgstr "默认(&D)"
 
 msgid "Language:"
 msgstr "语言:"
 
-msgid "Icon set:"
-msgstr "图标集:"
-
 msgid "Gain"
 msgstr "增益"
 
@@ -346,6 +360,9 @@ msgstr "机型:"
 msgid "Configure"
 msgstr "配置"
 
+msgid "CPU:"
+msgstr "CPU:"
+
 msgid "CPU type:"
 msgstr "CPU 类型:"
 
@@ -382,24 +399,51 @@ msgstr "启用 (UTC)"
 msgid "Dynamic Recompiler"
 msgstr "动态重编译器"
 
+msgid "CPU frame size"
+msgstr "CPU 执行帧长度"
+
+msgid "Larger frames (less smooth)"
+msgstr "大执行帧 (操作欠平滑)"
+
+msgid "Smaller frames (smoother)"
+msgstr "小执行帧 (操作更平滑)"
+
 msgid "Video:"
 msgstr "显卡:"
 
-msgid "Voodoo Graphics"
-msgstr "Voodoo Graphics"
+msgid "Video #2:"
+msgstr "显卡 2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Voodoo 1 或 2 图形"
 
 msgid "IBM 8514/A Graphics"
-msgstr "IBM 8514/A Graphics"
+msgstr "IBM 8514/A 图形"
 
 msgid "XGA Graphics"
-msgstr "XGA Graphics"
+msgstr "XGA 图形"
+
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "IBM PS/55 显示适配器图形"
+
+msgid "Keyboard:"
+msgstr "键盘:"
+
+msgid "Keyboard"
+msgstr "键盘"
 
 msgid "Mouse:"
 msgstr "鼠标:"
 
+msgid "Mouse"
+msgstr "鼠标"
+
 msgid "Joystick:"
 msgstr "操纵杆:"
 
+msgid "Joystick"
+msgstr "操纵杆"
+
 msgid "Joystick 1..."
 msgstr "操纵杆 1..."
 
@@ -430,14 +474,17 @@ msgstr "MIDI 输出设备:"
 msgid "MIDI In Device:"
 msgstr "MIDI 输入设备:"
 
+msgid "MIDI Out:"
+msgstr "MIDI 输出:"
+
 msgid "Standalone MPU-401"
 msgstr "独立 MPU-401"
 
 msgid "Use FLOAT32 sound"
-msgstr "使用单精度浮点 (FLOAT32)"
+msgstr "使用单精度浮点 (FLOAT32) 音频"
 
 msgid "FM synth driver"
-msgstr "调频合成器驱动器"
+msgstr "FM synth driver"
 
 msgid "Nuked (more accurate)"
 msgstr "Nuked (更准确)"
@@ -445,15 +492,6 @@ msgstr "Nuked (更准确)"
 msgid "YMFM (faster)"
 msgstr "YMFM (更快)"
 
-msgid "Network type:"
-msgstr "网络类型:"
-
-msgid "PCap device:"
-msgstr "PCap 设备:"
-
-msgid "Network adapter:"
-msgstr "网络适配器:"
-
 msgid "COM1 Device:"
 msgstr "COM1 设备:"
 
@@ -478,6 +516,9 @@ msgstr "LPT3 设备:"
 msgid "LPT4 Device:"
 msgstr "LPT4 设备:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr "内部 LPT 的 ECP DMA:"
+
 msgid "Serial port 1"
 msgstr "串口 1"
 
@@ -502,18 +543,21 @@ msgstr "并口 3"
 msgid "Parallel port 4"
 msgstr "并口 4"
 
-msgid "HD Controller:"
-msgstr "硬盘控制器:"
-
 msgid "FD Controller:"
 msgstr "软盘控制器:"
 
+msgid "CD-ROM Controller:"
+msgstr "CD-ROM 控制器"
+
 msgid "Tertiary IDE Controller"
 msgstr "第三 IDE 控制器"
 
 msgid "Quaternary IDE Controller"
 msgstr "第四 IDE 控制器"
 
+msgid "Hard disk"
+msgstr "硬盘"
+
 msgid "SCSI"
 msgstr "SCSI"
 
@@ -535,6 +579,9 @@ msgstr "磁带"
 msgid "Hard disks:"
 msgstr "硬盘:"
 
+msgid "Firmware Version"
+msgstr "固件版本"
+
 msgid "&New..."
 msgstr "新建(&N)..."
 
@@ -589,14 +636,17 @@ msgstr "检查 BPB"
 msgid "CD-ROM drives:"
 msgstr "光盘驱动器:"
 
-msgid "Earlier drive"
-msgstr "早先的驱动器"
-
 msgid "MO drives:"
 msgstr "磁光盘驱动器:"
 
-msgid "ZIP drives:"
-msgstr "ZIP 驱动器:"
+msgid "MO:"
+msgstr "磁光盘:"
+
+msgid "Removable disks:"
+msgstr "可移动磁盘 (ZIP):"
+
+msgid "Removable disk drives:"
+msgstr "可移动磁盘 (ZIP) 驱动器:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
@@ -607,6 +657,9 @@ msgstr "ISA 实时时钟:"
 msgid "ISA Memory Expansion"
 msgstr "ISA 内存扩展"
 
+msgid "ISA ROM Cards"
+msgstr "ISA ROM 扩展卡"
+
 msgid "Card 1:"
 msgstr "扩展卡 1:"
 
@@ -619,18 +672,21 @@ msgstr "扩展卡 3:"
 msgid "Card 4:"
 msgstr "扩展卡 4:"
 
+msgid "Generic ISA ROM Board"
+msgstr "通用 ISA ROM 卡"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "通用 ISA 双 ROM 卡"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "通用 ISA 四 ROM 卡"
+
 msgid "ISABugger device"
 msgstr "ISABugger 设备"
 
 msgid "POST card"
 msgstr "自检 (POST) 卡"
 
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Microsoft YaHei"
-
 msgid "86Box"
 msgstr "86Box"
 
@@ -643,17 +699,20 @@ msgstr "致命错误"
 msgid " - PAUSED"
 msgstr " - 已暂停"
 
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "按下 Ctrl+Alt+PgDn 返回到窗口模式。"
-
 msgid "Speed"
 msgstr "速度"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "可移动磁盘 (ZIP) %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "ZIP 映像"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "可移动磁盘(&R) (ZIP) %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "可移动磁盘 (ZIP) 映像"
+
+msgid "Image %1"
+msgstr "映像 %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
 msgstr "86Box 找不到任何可用的 ROM 映像。\n\n请<a href=\"https://github.com/86Box/roms/releases/latest\">下载</a> ROM 包并将其解压到 \"roms\" 文件夹中。"
@@ -688,6 +747,12 @@ msgstr "由于 roms/machines 文件夹中缺少合适的 ROM，机型 \"%hs\" 
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
 msgstr "由于 roms/video 文件夹中缺少合适的 ROM，显卡 \"%hs\" 不可用。将切换到其他可用显卡。"
 
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "由于 roms/video 文件夹中缺少合适的 ROM，显卡 2 \"%hs\" 不可用。禁用第二块显卡。"
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "由于缺少合适的 ROM，设备 \"%hs\" 不可用。忽略设备。"
+
 msgid "Machine"
 msgstr "机型"
 
@@ -706,12 +771,30 @@ msgstr "网络"
 msgid "Ports (COM & LPT)"
 msgstr "端口 (COM 和 LPT)"
 
+msgid "Ports"
+msgstr "端口"
+
+msgid "Serial ports:"
+msgstr "串行端口:"
+
+msgid "Parallel ports:"
+msgstr "并行端口:"
+
 msgid "Storage controllers"
 msgstr "存储控制器"
 
 msgid "Hard disks"
 msgstr "硬盘"
 
+msgid "Disks:"
+msgstr "硬盘:"
+
+msgid "Floppy:"
+msgstr "软盘:"
+
+msgid "Controllers:"
+msgstr "控制器:"
+
 msgid "Floppy & CD-ROM drives"
 msgstr "软盘/光盘驱动器"
 
@@ -721,14 +804,17 @@ msgstr "其他可移动设备"
 msgid "Other peripherals"
 msgstr "其他外围设备"
 
+msgid "Other devices"
+msgstr "其他设备"
+
 msgid "Click to capture mouse"
 msgstr "单击窗口捕捉鼠标"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "按下 F8+F12 释放鼠标"
+msgid "Press %1 to release mouse"
+msgstr "按下 %1 释放鼠标"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "按下 F8+F12 或鼠标中键释放鼠标"
+msgid "Press %1 or middle button to release mouse"
+msgstr "按下 %1 或鼠标中键释放鼠标"
 
 msgid "Bus"
 msgstr "总线"
@@ -748,65 +834,89 @@ msgstr "S"
 msgid "KB"
 msgstr "KB"
 
-msgid "Could not initialize the video renderer."
-msgstr "无法初始化视频渲染器。"
-
 msgid "Default"
 msgstr "默认"
 
-msgid "%i Wait state(s)"
-msgstr "%i 等待状态 (WS)"
+msgid "%1 Wait state(s)"
+msgstr "%1 等待状态 (WS)"
 
 msgid "Type"
 msgstr "类型"
 
-msgid "Failed to set up PCap"
-msgstr "设置 PCap 失败"
-
 msgid "No PCap devices found"
 msgstr "未找到 PCap 设备"
 
 msgid "Invalid PCap device"
 msgstr "无效 PCap 设备"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "标准 2 键操纵杆"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "2 轴, 2 键操纵杆"
 
-msgid "Standard 4-button joystick"
-msgstr "标准 4 键操纵杆"
+msgid "2-axis, 4-button joystick"
+msgstr "2 轴, 4 键操纵杆"
 
-msgid "Standard 6-button joystick"
-msgstr "标准 6 键操纵杆"
+msgid "2-axis, 6-button joystick"
+msgstr "2 轴, 6 键操纵杆"
 
-msgid "Standard 8-button joystick"
-msgstr "标准 8 键操纵杆"
+msgid "2-axis, 8-button joystick"
+msgstr "2 轴, 8 键操纵杆"
+
+msgid "3-axis, 2-button joystick"
+msgstr "3 轴, 2 键操纵杆"
+
+msgid "3-axis, 4-button joystick"
+msgstr "3 轴, 4 键操纵杆"
+
+msgid "4-axis, 4-button joystick"
+msgstr "4 轴, 4 键操纵杆"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH Pedals"
+
 msgid "Microsoft SideWinder Pad"
 msgstr "Microsoft SideWinder Pad"
 
 msgid "Thrustmaster Flight Control System"
 msgstr "Thrustmaster Flight Control System"
 
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Rudder Control System"
+
+msgid "2-button gamepad(s)"
+msgstr "2 按钮游戏手柄"
+
+msgid "2-button flight yoke"
+msgstr "2 按钮飞行摇杆"
+
+msgid "4-button gamepad"
+msgstr "4 按钮游戏手柄"
+
+msgid "4-button flight yoke"
+msgstr "4 按钮飞行摇杆"
+
+msgid "2-button flight yoke with throttle"
+msgstr "2 按钮带油门飞行摇杆"
+
+msgid "4-button flight yoke with throttle"
+msgstr "4 按钮带油门飞行摇杆"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Win95 方向盘 (3 轴, 4 键)"
+
 msgid "None"
 msgstr "无"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "无法加载键盘加速器。"
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CHS: %2, %3, %4)"
 
-msgid "Unable to register raw input."
-msgstr "无法注册原始输入。"
+msgid "Floppy %1 (%2): %3"
+msgstr "软盘 %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "软盘 %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "软盘(&F) %1 (%2): %3"
 
 msgid "Advanced sector images"
 msgstr "高级扇区映像"
@@ -814,9 +924,6 @@ msgstr "高级扇区映像"
 msgid "Flux images"
 msgstr "Flux 映像"
 
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "无法初始化 SDL，需要 SDL2.dll"
-
 msgid "Are you sure you want to hard reset the emulated machine?"
 msgstr "确定要硬重置模拟器吗？"
 
@@ -826,8 +933,14 @@ msgstr "确定要退出 86Box 吗？"
 msgid "Unable to initialize Ghostscript"
 msgstr "无法初始化 Ghostscript"
 
-msgid "MO %i (%ls): %ls"
-msgstr "磁光盘 %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "无法初始化 GhostPCL"
+
+msgid "MO %1 (%2): %3"
+msgstr "磁光盘 %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "磁光盘(&M) %1 (%2): %3"
 
 msgid "MO images"
 msgstr "磁光盘映像"
@@ -835,8 +948,17 @@ msgstr "磁光盘映像"
 msgid "Welcome to 86Box!"
 msgstr "欢迎使用 86Box！"
 
-msgid "Internal controller"
-msgstr "内部控制器"
+msgid "Internal device"
+msgstr "内部设备"
+
+msgid "&File"
+msgstr "文件(&F)"
+
+msgid "&New machine..."
+msgstr "新建计算机(&N)..."
+
+msgid "&Check for updates..."
+msgstr "检查更新(&C)..."
 
 msgid "Exit"
 msgstr "退出"
@@ -860,34 +982,22 @@ msgid "86Box v"
 msgstr "86Box v"
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "一个旧式计算机模拟器\n\n作者: Miran Grča (OBattler)、RichardG867、Jasmine Iwanek、TC1995、coldbrewed、Teemu Korhonen (Manaatti)、Joakim L. Gilje、Adrien Moulin (elyosh)、Daniel Balsom (gloriouscow)、Cacodemon345、Fred N. van Kempen (waltje)、Tiseno100、reenigne 等人。\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\n本软件依据 GNU 通用公共许可证第二版或更新版本发布。详情见 LICENSE 文件。"
+msgstr "一个旧式计算机模拟器\n\n作者: Miran Grča (OBattler)、RichardG867、Jasmine Iwanek、TC1995、coldbrewed、Teemu Korhonen (Manaatti)、Joakim L. Gilje、Adrien Moulin (elyosh)、Daniel Balsom (gloriouscow)、Cacodemon345、Fred N. van Kempen (waltje)、Tiseno100、reenigne 等人。\n\n感谢 Sarah Walker、leilei、JohnElliott、greatpsycho 和其他人的核心贡献。\n\n本软件依据 GNU 通用公共许可证第二版或更新版本发布。详情见 LICENSE 文件。"
 
 msgid "Hardware not available"
 msgstr "硬件不可用"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "请确认 libpcap 已安装且使用兼容 libpcap 的网络连接。"
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "请确认 %1 已安装且使用兼容 %1 的网络连接。"
 
 msgid "Invalid configuration"
 msgstr "无效配置"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 是将 PostScript 文件转换为 PDF 所需要的库。\n\n使用通用 PostScript 打印机打印的文档将被保存为 PostScript (.ps) 文件。"
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " 是将 PostScript 文件转换为 PDF 所需要的库。\n\n使用通用 PostScript 打印机打印的文档将被保存为 PostScript (.ps) 文件。"
-
-msgid "Entering fullscreen mode"
-msgstr "正在进入全屏模式"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 是将 PCL 文件转换为 PDF 所需要的库。\n\n使用通用 PCL 打印机打印的文档将被保存为 Printer Command Language (.pcl) 文件。"
 
 msgid "Don't show this message again"
 msgstr "不要再显示此消息"
@@ -904,17 +1014,14 @@ msgstr "不重置"
 msgid "CD-ROM images"
 msgstr "光盘映像"
 
-msgid "%hs Device Configuration"
-msgstr "%hs 设备配置"
+msgid "%1 Device Configuration"
+msgstr "%1 设备配置"
 
 msgid "Monitor in sleep mode"
 msgstr "显示器处在睡眠状态"
 
-msgid "OpenGL Shaders"
-msgstr "OpenGL 着色器"
-
-msgid "OpenGL options"
-msgstr "OpenGL 选项"
+msgid "GLSL shaders"
+msgstr "GLSL 着色器"
 
 msgid "You are loading an unsupported configuration"
 msgstr "正在载入一个不受支持的配置"
@@ -925,30 +1032,33 @@ msgstr "此模拟计算机禁用了基于选定计算机的 CPU 类型过滤。\
 msgid "Continue"
 msgstr "继续"
 
-msgid "Cassette: %s"
-msgstr "磁带: %s"
+msgid "Cassette: %1"
+msgstr "磁带: %1"
+
+msgid "C&assette: %1"
+msgstr "磁带: %1(&A)"
 
 msgid "Cassette images"
 msgstr "磁带映像"
 
-msgid "Cartridge %i: %ls"
-msgstr "卡带 %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "卡带 %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "卡带 %1: %2(&A)"
 
 msgid "Cartridge images"
 msgstr "卡带映像"
 
-msgid "Error initializing renderer"
-msgstr "初始化渲染器时出错"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "无法初始化 OpenGL (3.0 核心) 渲染器。请使用其他渲染器。"
-
 msgid "Resume execution"
 msgstr "恢复执行"
 
 msgid "Pause execution"
 msgstr "暂停执行"
 
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del"
+
 msgid "Press Ctrl+Alt+Del"
 msgstr "按下 Ctrl+Alt+Del"
 
@@ -958,17 +1068,281 @@ msgstr "按下 Ctrl+Alt+Esc"
 msgid "Hard reset"
 msgstr "硬重置"
 
+msgid "Force shutdown"
+msgstr "强制关机"
+
+msgid "Start"
+msgstr "启动"
+
+msgid "Not running"
+msgstr "未在运行"
+
+msgid "Running"
+msgstr "正在运行"
+
+msgid "Paused"
+msgstr "已暂停"
+
+msgid "Waiting"
+msgstr "等待中"
+
+msgid "Powered Off"
+msgstr "已关机"
+
+msgid "%n running"
+msgstr "%n 正在运行"
+
+msgid "%n paused"
+msgstr "%n 已暂停"
+
+msgid "%n waiting"
+msgstr "%n 等待中"
+
+msgid "%1 total"
+msgstr "%1 总计"
+
+msgid "VMs: %1"
+msgstr "虚拟机: %1"
+
+msgid "System Directory:"
+msgstr "系统目录"
+
+msgid "Choose directory"
+msgstr "选择目录"
+
+msgid "Choose configuration file"
+msgstr "选择配置文件"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "86Box 配置文件（86box.cfg）"
+
+msgid "Configuration read failed"
+msgstr "读取配置失败"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "无法打开选定的配置文件进行读取：%1"
+
+msgid "Use regular expressions in search box"
+msgstr "在搜索框中使用正则表达式"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "%1 计算机当前处于活动状态。您确定要退出虚拟机管理器吗？"
+
+msgid "Add new system wizard"
+msgstr "新增系统向导"
+
+msgid "Introduction"
+msgstr "介绍"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "这将帮助您在86Box中添加一个新系统。"
+
+msgid "New configuration"
+msgstr "新配置"
+
+msgid "Complete"
+msgstr "完成"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "向导现在将启动新系统的配置。"
+
+msgid "Use existing configuration"
+msgstr "使用现有配置"
+
+msgid "Type some notes here"
+msgstr "在此处键入一些备注"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "将现有配置文件内容粘贴到下面的框中。"
+
+msgid "Load configuration from file"
+msgstr "从文件加载配置"
+
+msgid "System name"
+msgstr "系统名称"
+
+msgid "System name:"
+msgstr "系统名称:"
+
+msgid "System name cannot contain certain characters"
+msgstr "系统名称不能包含某些字符"
+
+msgid "System name already exists"
+msgstr "系统名称已存在"
+
+msgid "Please enter a directory for the system"
+msgstr "请为系统输入一个目录"
+
+msgid "Directory does not exist"
+msgstr "目录不存在"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "将在上方选定的目录中为系统创建一个新目录"
+
+msgid "System location:"
+msgstr "系统位置:"
+
+msgid "System name and location"
+msgstr "系统名称和位置"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "输入系统名称并选择位置"
+
+msgid "Enter the name of the system"
+msgstr "输入系统名称"
+
+msgid "Please enter a system name"
+msgstr "请输入系统名称"
+
+msgid "Display name (optional):"
+msgstr "显示名称 (可选)"
+
+msgid "Display name:"
+msgstr "显示名称:"
+
+msgid "Set display name"
+msgstr "设置显示名称"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "输入新的显示名称 (留空以重置)"
+
+msgid "Change &display name..."
+msgstr "更改显示名称(&D)..."
+
+msgid "Context Menu"
+msgstr "上下文菜单"
+
+msgid "&Open folder..."
+msgstr "打开文件夹(&O)..."
+
+msgid "Open p&rinter tray..."
+msgstr "打开打印机托盘(&R)..."
+
+msgid "Set &icon..."
+msgstr "设置图标(&I)..."
+
+msgid "Select an icon"
+msgstr "选择一个图标"
+
+msgid "C&lone..."
+msgstr "克隆(&L)..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "虚拟机 \"%1\" (%2) 将被克隆到:"
+
+msgid "Directory %1 already exists"
+msgstr "目录 %1 已存在"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr " %1: 名称中不能使用以下字符: %1"
+
+msgid "Clone"
+msgstr "克隆"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "创建克隆虚拟机目录失败"
+
+msgid "Failed to clone VM."
+msgstr "克隆虚拟机失败。"
+
+msgid "Directory in use"
+msgstr "目录正在使用中"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "所选目录已被占用，请选择另一个目录。"
+
+msgid "Create directory failed"
+msgstr "创建目录失败"
+
+msgid "Unable to create the directory for the new system"
+msgstr "无法为新系统创建目录"
+
+msgid "Configuration write failed"
+msgstr "配置写入失败"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "无法打开 %1 的配置文件进行写入"
+
+msgid "Error adding system"
+msgstr "添加系统时出错"
+
+msgid "Remove directory failed"
+msgstr "移除目录失败"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "无法删除该机器目录中的某些文件。请手动删除。"
+
+msgid "Build"
+msgstr "构建"
+
+msgid "Version"
+msgstr "版本"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "86Box 有可用更新：%1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "检查更新时发生错误：%1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>86Box 有可用更新！</b>"
+
+msgid "Warning"
+msgstr "警告"
+
+msgid "&Kill"
+msgstr "强制终止(&K)"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "强制终止虚拟机可能导致数据丢失。仅在86Box进程卡住时才执行此操作。\n\n您确定要强制终止虚拟机 \"%1\" 吗？"
+
+msgid "&Delete"
+msgstr "删除(&D)"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "你真的想删除虚拟机 \"%1\" 及其所有文件吗？此操作无法撤消！"
+
+msgid "Show &config file"
+msgstr "显示配置文件(&C)"
+
+msgid "No screenshot"
+msgstr "无截图"
+
+msgid "Search"
+msgstr "搜索"
+
+msgid "Searching for VMs..."
+msgstr "正在搜索虚拟机..."
+
+msgid "Found %1"
+msgstr "已找到 %1"
+
+msgid "System"
+msgstr "系统"
+
+msgid "Storage"
+msgstr "存储"
+
+msgid "Disk %1: "
+msgstr "磁盘 %1"
+
+msgid "No disks"
+msgstr "无磁盘"
+
+msgid "Audio"
+msgstr "音频"
+
+msgid "Audio:"
+msgstr "音频:"
+
 msgid "ACPI shutdown"
 msgstr "ACPI 关机"
 
-msgid "Hard disk (%s)"
-msgstr "硬盘 (%s)"
+msgid "ACP&I shutdown"
+msgstr "ACP&I 关机"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "硬盘 (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
 msgstr "不存在 MFM/RLL 或 ESDI CD-ROM 驱动器"
@@ -1003,9 +1377,6 @@ msgstr "无法写入文件"
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
 msgstr "不支持非 512 字节扇区大小的 HDI 或 HDX 映像。"
 
-msgid "USB is not yet supported"
-msgstr "尚未支持 USB"
-
 msgid "Disk image file already exists"
 msgstr "磁盘映像文件已存在"
 
@@ -1016,10 +1387,10 @@ msgid "Disk image created"
 msgstr "已创建磁盘映像"
 
 msgid "Make sure the file exists and is readable."
-msgstr "请确定此文件已存在并可读取。"
+msgstr "请确定此文件存在并可读取。"
 
 msgid "Make sure the file is being saved to a writable directory."
-msgstr "请确定此文件保存在可写目录中。"
+msgstr "请确定此文件保存在可写入目录中。"
 
 msgid "Disk image too large"
 msgstr "磁盘映像太大"
@@ -1039,6 +1410,27 @@ msgstr "覆盖"
 msgid "Don't overwrite"
 msgstr "不覆盖"
 
+msgid "Raw image"
+msgstr "原始映像"
+
+msgid "HDI image"
+msgstr "HDI 映像"
+
+msgid "HDX image"
+msgstr "HDX 映像"
+
+msgid "Fixed-size VHD"
+msgstr "固定大小 VHD"
+
+msgid "Dynamic-size VHD"
+msgstr "动态大小 VHD"
+
+msgid "Differencing VHD"
+msgstr "差分 VHD"
+
+msgid "(N/A)"
+msgstr "(不适用)"
+
 msgid "Raw image (.img)"
 msgstr "原始映像 (.img)"
 
@@ -1078,9 +1470,6 @@ msgstr "父盘与子盘的时间戳不匹配"
 msgid "Could not fix VHD timestamp."
 msgstr "无法修复 VHD 时间戳。"
 
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
-
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
 
@@ -1096,44 +1485,29 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "光盘 %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "光盘 %1 (%2): %3(&C)"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
+msgid "160 KB"
+msgstr "160 KB"
 
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
+msgid "180 KB"
+msgstr "180 KB"
 
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
+msgid "320 KB"
+msgstr "320 KB"
 
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
+msgid "360 KB"
+msgstr "360 KB"
 
-msgid "CD-ROM %i (%s): %s"
-msgstr "光盘 %i (%s): %s"
+msgid "640 KB"
+msgstr "640 KB"
 
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
+msgid "720 KB"
+msgstr "720 KB"
 
 msgid "1.2 MB"
 msgstr "1.2 MB"
@@ -1208,7 +1582,7 @@ msgid "The network configuration will be switched to the null driver"
 msgstr "网络配置将切换为空驱动程序"
 
 msgid "Mouse sensitivity:"
-msgstr "鼠标敏感度:"
+msgstr "鼠标灵敏度:"
 
 msgid "Select media images from program working directory"
 msgstr "从程序工作目录中选择介质映像"
@@ -1228,3 +1602,1382 @@ msgstr "快"
 msgid "&Auto-pause on focus loss"
 msgstr "失去焦点时自动暂停(&A)"
 
+msgid "WinBox is no longer supported"
+msgstr "WinBox 不再受支持"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "由于缺乏维护者，WinBox 管理器的开发工作已于 2022 年停止。由于我们正努力将 86Box 做得更好，因此决定不再支持 WinBox 作为管理器。\n\nWinBox 将不再提供更新，如果你继续在 86Box 的新版本中使用 WinBox，可能会遇到不正确的行为。任何与 WinBox 行为相关的错误报告都将被视为无效而关闭。\n\n请访问 86box.net，查看你可以使用的其他管理器列表。"
+
+msgid "Generate"
+msgstr "生成"
+
+msgid "Joystick configuration"
+msgstr "操纵杆配置"
+
+msgid "Device"
+msgstr "设备"
+
+msgid "%1 (X axis)"
+msgstr "%1（X 轴）"
+
+msgid "%1 (Y axis)"
+msgstr "%1（Y 轴）"
+
+msgid "MCA devices"
+msgstr "MCA 设备"
+
+msgid "List of MCA devices:"
+msgstr "MCA 设备清单："
+
+msgid "&Tablet tool"
+msgstr "平板工具(&T)"
+
+msgid "About &Qt"
+msgstr "关于 &Qt"
+
+msgid "&MCA devices..."
+msgstr "&MCA 设备..."
+
+msgid "Show non-&primary monitors"
+msgstr "显示非主要显示器(&P)"
+
+msgid "Open screenshots &folder..."
+msgstr "打开屏幕截图文件夹...(&F)"
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "最大化时应用全屏拉伸模式(&Y)"
+
+msgid "&Cursor/Puck"
+msgstr "光标/冰球(&C)"
+
+msgid "&Pen"
+msgstr "笔(&P)"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "主机 CD/DVD 驱动器 (%1:) (&H)"
+
+msgid "&Connected"
+msgstr "已连接(&C)"
+
+msgid "Clear image &history"
+msgstr "清除映像历史记录(&H)"
+
+msgid "Create..."
+msgstr "创建..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "主机 CD/DVD 驱动器 (%1)"
+
+msgid "Unknown Bus"
+msgstr "未知总线"
+
+msgid "Null Driver"
+msgstr "空驱动程序"
+
+msgid "NIC:"
+msgstr "网卡:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "NIC %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "NIC %1 (%2) %3(&N)"
+
+msgid "Render behavior"
+msgstr "渲染行为"
+
+msgid "Use target framerate:"
+msgstr "使用目标帧率:"
+
+msgid " fps"
+msgstr " fps"
+
+msgid "VSync"
+msgstr "垂直同步"
+
+msgid "Synchronize with video"
+msgstr "与视频同步"
+
+msgid "Shaders"
+msgstr "着色器"
+
+msgid "Remove"
+msgstr "移除"
+
+msgid "Browse..."
+msgstr "浏览..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "无法创建 OpenGL 上下文。"
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "无法切换到 OpenGL 上下文。"
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "需要 OpenGL 3.0 或更高版本。当前版本为 %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "初始化 OpenGL 时出错"
+
+msgid "\nFalling back to software rendering."
+msgstr "\n回到软件渲染。"
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>选择媒体图像（光盘、软盘等）时，打开对话框将从与 86Box 配置文件相同的目录开始。这一设置可能只会在 macOS 上产生影响。</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "这台机器可能被移动或复制过。"
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "为了确保网络功能正常，86Box 需要知道这台机器是否被移动或复制。\n\n如果您不确定，请选择\"我已复制这台机器\"。"
+
+msgid "I Moved It"
+msgstr "我已移动这台机器"
+
+msgid "I Copied It"
+msgstr "我已复制这台机器"
+
+msgid "86Box Monitor #"
+msgstr "86Box 显示器 #"
+
+msgid "No MCA devices."
+msgstr "无 MCA 设备。"
+
+msgid "MiB"
+msgstr "兆字节"
+
+msgid "GiB"
+msgstr "吉字节"
+
+msgid "Network Card #1"
+msgstr "网卡 1"
+
+msgid "Network Card #2"
+msgstr "网卡 2"
+
+msgid "Network Card #3"
+msgstr "网卡 3"
+
+msgid "Network Card #4"
+msgstr "网卡 4"
+
+msgid "Mode:"
+msgstr "模式:"
+
+msgid "Interface:"
+msgstr "界面:"
+
+msgid "Adapter:"
+msgstr "适配器:"
+
+msgid "VDE Socket:"
+msgstr "VDE 套接字:"
+
+msgid "86Box Unit Tester"
+msgstr "86Box 装置测试仪"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Novell NetWare 2.x 密钥卡"
+
+msgid "Serial port passthrough 1"
+msgstr "串行端口直通 1"
+
+msgid "Serial port passthrough 2"
+msgstr "串行端口直通 2"
+
+msgid "Serial port passthrough 3"
+msgstr "串行端口直通 3"
+
+msgid "Serial port passthrough 4"
+msgstr "串行端口直通 4"
+
+msgid "Renderer &options..."
+msgstr "渲染器选项...(&O)"
+
+msgid "PC/XT Keyboard"
+msgstr "PC/XT 键盘"
+
+msgid "AT Keyboard"
+msgstr "AT 键盘"
+
+msgid "AX Keyboard"
+msgstr "AX 键盘"
+
+msgid "PS/2 Keyboard"
+msgstr "PS/2 键盘"
+
+msgid "PS/55 Keyboard"
+msgstr "PS/55 键盘"
+
+msgid "Keys"
+msgstr "按键"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Logitech/Microsoft 总线鼠标"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Microsoft 总线鼠标（InPort）"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Mouse Systems 串行鼠标"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Mouse Systems 总线鼠标"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Microsoft 串行鼠标"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Microsoft Ballpoint 串行鼠标"
+
+msgid "Logitech Serial Mouse"
+msgstr "Logitech 串行鼠标"
+
+msgid "PS/2 Mouse"
+msgstr "PS/2 鼠标"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "PS/2 QuickPort 鼠标"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (串行)"
+
+msgid "Default Baud rate"
+msgstr "默认波特率"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] 标准 Hayes 兼容调制解调器"
+
+msgid "Roland MT-32 Emulation"
+msgstr "Roland MT-32 仿真"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "Roland MT-32（新）仿真"
+
+msgid "Roland CM-32L Emulation"
+msgstr "Roland CM-32L 仿真"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "Roland CM-32LN 仿真"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "OPL4-ML 子板"
+
+msgid "System MIDI"
+msgstr "系统 MIDI"
+
+msgid "MIDI Input Device"
+msgstr "MIDI 输入设备"
+
+msgid "BIOS file"
+msgstr "BIOS 文件"
+
+msgid "BIOS file (ROM #1)"
+msgstr "BIOS 文件 (ROM 1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "BIOS 文件 (ROM 2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "BIOS 文件 (ROM 3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "BIOS 文件 (ROM 4)"
+
+msgid "BIOS address"
+msgstr "BIOS 地址"
+
+msgid "BIOS address (ROM #1)"
+msgstr "BIOS 地址 (ROM 1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "BIOS 地址 (ROM 2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "BIOS 地址 (ROM 3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "BIOS 地址 (ROM 4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "启用 BIOS 扩展 ROM 写入功能"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "启用 BIOS 扩展 ROM 写入功能 (ROM 1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "启用 BIOS 扩展 ROM 写入功能 (ROM 2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "启用 BIOS 扩展 ROM 写入功能 (ROM 3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "启用 BIOS 扩展 ROM 写入功能 (ROM 4)"
+
+msgid "Linear framebuffer base"
+msgstr "线性帧缓冲基址"
+
+msgid "Address"
+msgstr "地址"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "串口的 IRQ"
+
+msgid "Parallel port IRQ"
+msgstr "并行端口的 IRQ"
+
+msgid "BIOS Revision"
+msgstr "BIOS 修订版"
+
+msgid "BIOS Version"
+msgstr "BIOS 版本"
+
+msgid "BIOS Language"
+msgstr "BIOS 语言"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "IBM 5161 扩展单元"
+
+msgid "IBM Cassette Basic"
+msgstr "IBM 磁带 BASIC"
+
+msgid "Translate 26 -> 17"
+msgstr "翻译 26 -> 17"
+
+msgid "Language"
+msgstr "语言"
+
+msgid "Enable backlight"
+msgstr "启用背光"
+
+msgid "Invert colors"
+msgstr "反转颜色"
+
+msgid "BIOS size"
+msgstr "BIOS 大小"
+
+msgid "BIOS size (ROM #1)"
+msgstr "BIOS 大小 (ROM 1)"
+
+msgid "BIOS size (ROM #2)"
+msgstr "BIOS 大小 (ROM 2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "BIOS 大小 (ROM 3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "BIOS 大小 (ROM 4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "将 C0000-C7FFF 映射为 UMB"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "将 C8000-CFFFF 映射为 UMB"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "将 D0000-D7FFF 映射为 UMB"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "将 D8000-DFFFF 映射为 UMB"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "将 E0000-E7FFF 映射为 UMB"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "将 E8000-EFFFF 映射为 UMB"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "JS9 跳线 (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "MIDI 输出设备"
+
+msgid "MIDI Real time"
+msgstr "实时 MIDI"
+
+msgid "MIDI Thru"
+msgstr "MIDI 输入直通"
+
+msgid "MIDI Clockout"
+msgstr "MIDI 时钟输出"
+
+msgid "SoundFont"
+msgstr "声音字体"
+
+msgid "Output Gain"
+msgstr "输出增益"
+
+msgid "Chorus"
+msgstr "合唱"
+
+msgid "Chorus Voices"
+msgstr "合唱声部"
+
+msgid "Chorus Level"
+msgstr "合唱音量"
+
+msgid "Chorus Speed"
+msgstr "合唱速度"
+
+msgid "Chorus Depth"
+msgstr "合唱深度"
+
+msgid "Chorus Waveform"
+msgstr "合唱波形"
+
+msgid "Reverb"
+msgstr "混响"
+
+msgid "Reverb Room Size"
+msgstr "混响室大小"
+
+msgid "Reverb Damping"
+msgstr "混响阻尼"
+
+msgid "Reverb Width"
+msgstr "混响宽度"
+
+msgid "Reverb Level"
+msgstr "混响电平"
+
+msgid "Interpolation Method"
+msgstr "插值法"
+
+msgid "Dynamic Sample Loading"
+msgstr "动态采样加载"
+
+msgid "Reverb Output Gain"
+msgstr "混响输出增益"
+
+msgid "Reversed stereo"
+msgstr "反转立体声"
+
+msgid "Nice ramp"
+msgstr "平滑渐变曲线"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Buttons"
+msgstr "按钮"
+
+msgid "Serial Port"
+msgstr "串行端口"
+
+msgid "RTS toggle"
+msgstr "RTS 切换"
+
+msgid "Revision"
+msgstr "修订版"
+
+msgid "Controller"
+msgstr "控制器"
+
+msgid "Show Crosshair"
+msgstr "显示十字准线"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "MAC 地址"
+
+msgid "MAC Address OUI"
+msgstr "MAC 地址的 OUI"
+
+msgid "Enable BIOS"
+msgstr "启用 BIOS"
+
+msgid "Baud Rate"
+msgstr "波特率"
+
+msgid "TCP/IP listening port"
+msgstr "TCP/IP 监听端口"
+
+msgid "Phonebook File"
+msgstr "电话簿文件"
+
+msgid "Telnet emulation"
+msgstr "Telnet 仿真"
+
+msgid "RAM Address"
+msgstr "内存地址"
+
+msgid "RAM size"
+msgstr "内存大小"
+
+msgid "Initial RAM size"
+msgstr "初始 RAM 大小"
+
+msgid "Serial Number"
+msgstr "序列号"
+
+msgid "Host ID"
+msgstr "主机 ID"
+
+msgid "FDC Address"
+msgstr "FDC 地址"
+
+msgid "MPU-401 Address"
+msgstr "MPU-401 地址"
+
+msgid "MPU-401 IRQ"
+msgstr "MPU-401 IRQ"
+
+msgid "Receive MIDI input"
+msgstr "接收 MIDI 输入"
+
+msgid "Low DMA"
+msgstr "低 DMA"
+
+msgid "Enable Game port"
+msgstr "启用游戏端口"
+
+msgid "SID Model"
+msgstr "SID 芯片型号"
+
+msgid "SID Filter Strength"
+msgstr "SID 滤镜强度"
+
+msgid "Surround module"
+msgstr "环绕声模块"
+
+msgid "CODEC"
+msgstr "CODEC"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "在 CODEC 设置时引发 CODEC 中断（某些驱动程序需要）。"
+
+msgid "SB Address"
+msgstr "Sound Blaster 地址"
+
+msgid "Adlib Address"
+msgstr "Adlib 地址"
+
+msgid "Use EEPROM setting"
+msgstr "使用 EEPROM 设置"
+
+msgid "WSS IRQ"
+msgstr "WSS IRQ"
+
+msgid "WSS DMA"
+msgstr "WSS DMA"
+
+msgid "Enable OPL"
+msgstr "启用 OPL"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "接收 MIDI 输入（MPU-401）"
+
+msgid "SB low DMA"
+msgstr "Sound Blaster 低 DMA"
+
+msgid "6CH variant (6-channel)"
+msgstr "6 通道变体（6 通道）"
+
+msgid "Enable CMS"
+msgstr "启用 CMS"
+
+msgid "Mixer"
+msgstr "混合器"
+
+msgid "High DMA"
+msgstr "高 DMA"
+
+msgid "Control PC speaker"
+msgstr "控制电脑扬声器"
+
+msgid "Memory size"
+msgstr "内存大小"
+
+msgid "EMU8000 Address"
+msgstr "EMU8000 地址"
+
+msgid "IDE Controller"
+msgstr "IDE 控制器"
+
+msgid "Codec"
+msgstr "编解码器"
+
+msgid "GUS type"
+msgstr "GUS 类型"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "启用命令 0x04 \"退出 86Box\""
+
+msgid "Display type"
+msgstr "显示类型"
+
+msgid "Composite type"
+msgstr "复合视频类型"
+
+msgid "RGB type"
+msgstr "RGB 类型"
+
+msgid "Line doubling type"
+msgstr "线路倍增类型"
+
+msgid "Snow emulation"
+msgstr "雪花模拟"
+
+msgid "Monitor type"
+msgstr "显示器类型"
+
+msgid "Character set"
+msgstr "字符集"
+
+msgid "XGA type"
+msgstr "XGA 类型"
+
+msgid "Instance"
+msgstr "实例"
+
+msgid "MMIO Address"
+msgstr "MMIO 地址"
+
+msgid "RAMDAC type"
+msgstr "RAMDAC 类型"
+
+msgid "Blend"
+msgstr "混合"
+
+msgid "Font"
+msgstr "字体"
+
+msgid "Bilinear filtering"
+msgstr "双线性滤波"
+
+msgid "Video chroma-keying"
+msgstr "视频色键透明处理"
+
+msgid "Dithering"
+msgstr "抖动"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "为 CGA 仿真启用 NMI"
+
+msgid "Voodoo type"
+msgstr "Voodoo 类型"
+
+msgid "Framebuffer memory size"
+msgstr "帧缓冲区内存大小"
+
+msgid "Texture memory size"
+msgstr "纹理内存大小"
+
+msgid "Dither subtraction"
+msgstr "抖动减法"
+
+msgid "Screen Filter"
+msgstr "滤镜"
+
+msgid "Render threads"
+msgstr "渲染线程"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "起始地址"
+
+msgid "Contiguous Size"
+msgstr "连续大小"
+
+msgid "I/O Width"
+msgstr "输入/输出宽度"
+
+msgid "Transfer Speed"
+msgstr "传输速度"
+
+msgid "EMS mode"
+msgstr "EMS (扩展内存)模式"
+
+msgid "EMS Address"
+msgstr "EMS 地址"
+
+msgid "EMS 1 Address"
+msgstr "EMS 1 地址"
+
+msgid "EMS 2 Address"
+msgstr "EMS 2 地址"
+
+msgid "EMS Memory Size"
+msgstr "EMS 内存大小"
+
+msgid "EMS 1 Memory Size"
+msgstr "EMS 1 内存大小"
+
+msgid "EMS 2 Memory Size"
+msgstr "EMS 2 内存大小"
+
+msgid "Enable EMS"
+msgstr "启用 EMS"
+
+msgid "Enable EMS 1"
+msgstr "启用 EMS 1"
+
+msgid "Enable EMS 2"
+msgstr "启用 EMS 2"
+
+msgid "Address for > 2 MB"
+msgstr "地址 > 2 MB"
+
+msgid "Frame Address"
+msgstr "帧地址"
+
+msgid "USA"
+msgstr "美国英语"
+
+msgid "Danish"
+msgstr "丹麦语"
+
+msgid "Always at selected speed"
+msgstr "始终保持选定速度"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "BIOS 设置 + 热键 (开机自检期间关闭)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 KB，从 F0000 开始"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 KB，从 E0000 开始 (地址 MSB 反相，最后 64 KB 优先)"
+
+msgid "Sine"
+msgstr "正弦"
+
+msgid "Triangle"
+msgstr "三角"
+
+msgid "Linear"
+msgstr "线性"
+
+msgid "4th Order"
+msgstr "四阶"
+
+msgid "7th Order"
+msgstr "七阶"
+
+msgid "Non-timed (original)"
+msgstr "没有计时器 (原版)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (JMP2 上无跳线)"
+
+msgid "Two"
+msgstr "两键"
+
+msgid "Three"
+msgstr "三键"
+
+msgid "Wheel"
+msgstr "滚轮"
+
+msgid "Five + Wheel"
+msgstr "五键 + 滚轮"
+
+msgid "Five + 2 Wheels"
+msgstr "五键 + 双滚轮"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 串行 / SMT3（R）V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3（R）串行"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "禁用 BIOS"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2 MB"
+
+msgid "8 MB"
+msgstr "8 MB"
+
+msgid "28 MB"
+msgstr "28 MB"
+
+msgid "1 MB"
+msgstr "1 MB"
+
+msgid "4 MB"
+msgstr "4 MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16 MB"
+
+msgid "20 MB"
+msgstr "20 MB"
+
+msgid "24 MB"
+msgstr "24 MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (立体声)"
+
+msgid "Classic"
+msgstr "经典"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "复合视频"
+
+msgid "True color"
+msgstr "真彩色"
+
+msgid "Old"
+msgstr "旧"
+
+msgid "New"
+msgstr "新"
+
+msgid "Color (generic)"
+msgstr "彩色（通用）"
+
+msgid "Green Monochrome"
+msgstr "绿色单色"
+
+msgid "Amber Monochrome"
+msgstr "琥珀单色"
+
+msgid "Gray Monochrome"
+msgstr "灰色单色"
+
+msgid "Color (no brown)"
+msgstr "彩色（无棕色）"
+
+msgid "Color (IBM 5153)"
+msgstr "彩色（IBM 5153）"
+
+msgid "Simple doubling"
+msgstr "简单加倍"
+
+msgid "sRGB interpolation"
+msgstr "sRGB 插值"
+
+msgid "Linear interpolation"
+msgstr "线性插值"
+
+msgid "Has secondary 8x8 character set"
+msgstr "第二 8x8 字符集"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "Quadcolor II 子卡"
+
+msgid "Alternate monochrome contrast"
+msgstr "翻转单色对比度"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "单色（5151/MDA）（白色）"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "单色（5151/MDA）（绿色）"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "单色 (5151/MDA)（琥珀色）"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "彩色 40x25（5153/CGA）"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "彩色 80x25（5153/CGA）"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "增强色 - 正常模式 (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "增强色 - 增强模式 (5154/ECD)"
+
+msgid "Green"
+msgstr "绿色"
+
+msgid "Amber"
+msgstr "琥珀色"
+
+msgid "Gray"
+msgstr "灰色"
+
+msgid "Grayscale"
+msgstr "灰阶"
+
+msgid "Color"
+msgstr "彩色"
+
+msgid "U.S. English"
+msgstr "美国英语"
+
+msgid "Scandinavian"
+msgstr "斯堪的纳维亚语系"
+
+msgid "Other languages"
+msgstr "其他语言"
+
+msgid "Bochs latest"
+msgstr "Bochs 最新版本"
+
+msgid "Apply overscan deltas"
+msgstr "应用过扫描增量"
+
+msgid "Mono Interlaced"
+msgstr "单色隔行扫描"
+
+msgid "Mono Non-Interlaced"
+msgstr "单色非隔行扫描"
+
+msgid "Color Interlaced"
+msgstr "彩色隔行扫描"
+
+msgid "Color Non-Interlaced"
+msgstr "彩色非隔行扫描"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "3Dfx Voodoo 图形"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst（2 个 TMU）"
+
+msgid "8-bit"
+msgstr "8 位"
+
+msgid "16-bit"
+msgstr "16 位"
+
+msgid "Standard (150ns)"
+msgstr "标准 (150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "高速 (120ns)"
+
+msgid "Enabled"
+msgstr "已启用"
+
+msgid "Standard"
+msgstr "标准"
+
+msgid "High-Speed"
+msgstr "高速"
+
+msgid "Stereo LPT DAC"
+msgstr "立体声 LPT DAC"
+
+msgid "Generic Text Printer"
+msgstr "通用文本打印机"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "通用 ESC/P 2 点阵打印机"
+
+msgid "Generic PostScript Printer"
+msgstr "通用 PostScript 打印机"
+
+msgid "Generic PCL5e Printer"
+msgstr "通用 PCL5e 打印机"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Parallel Line Internet Protocol"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "Savage Quest 保护加密狗"
+
+msgid "Serial Passthrough Device"
+msgstr "串行端口直通设备"
+
+msgid "Passthrough Mode"
+msgstr "直通模式"
+
+msgid "Host Serial Device"
+msgstr "主机串行设备"
+
+msgid "Name of pipe"
+msgstr "管道名称"
+
+msgid "Data bits"
+msgstr "数据位"
+
+msgid "Stop bits"
+msgstr "停止位"
+
+msgid "Baud Rate of Passthrough"
+msgstr "直通波特率"
+
+msgid "Named Pipe (Server)"
+msgstr "命名管道（服务器）"
+
+msgid "Named Pipe (Client)"
+msgstr "命名管道 (客户端) "
+
+msgid "Host Serial Passthrough"
+msgstr "主机串行端口直通"
+
+msgid "E&ject %1"
+msgstr "弹出 %1(&J)"
+
+msgid "&Unmute"
+msgstr "解除静音(&U)"
+
+msgid "Softfloat FPU"
+msgstr "Softfloat FPU"
+
+msgid "High performance impact"
+msgstr "重大性能影响"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[Generic] RAM 磁盘 (最大速度)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[Generic] 1989 (3500 RPM)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[Generic] 1992 (3600 RPM)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[Generic] 1994 (4500 RPM)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[Generic] 1996 (5400 RPM)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[Generic] 1997 (5400 RPM)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[Generic] 1998 (5400 RPM)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[Generic] 2000 (7200 RPM)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "IBM 8514/A 克隆 (ISA)"
+
+msgid "Vendor"
+msgstr "制造商"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "通用 PC/XT 内存扩展"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "通用 PC/AT 内存扩展"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "无法找到点阵字体"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "仿真通用 ESC/P 2 点阵打印机需要使用 \"roms/printer/fonts\" 目录中的 TrueType 字体。"
+
+msgid "Inhibit multimedia keys"
+msgstr "禁止多媒体按键"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "保存设置前要求用户确认"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "硬重置前要求用户确认"
+
+msgid "Ask for confirmation before quitting"
+msgstr "退出前要求用户确认"
+
+msgid "Options"
+msgstr "选项"
+
+msgid "Model"
+msgstr "模型"
+
+msgid "Model:"
+msgstr "模型："
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "Vulkan 渲染器初始化失败。"
+
+msgid "GLSL Error"
+msgstr "GLSL 错误"
+
+msgid "Could not load shader: %1"
+msgstr "无法加载着色器：%1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "OpenGL 版本需要达到 3.0 或更高。当前 GLSL 版本为 %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "无法加载材质：%1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "无法编译着色器：\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "程序未链接：\n\n%1"
+
+msgid "Shader Manager"
+msgstr "着色器管理器"
+
+msgid "Shader Configuration"
+msgstr "着色器配置"
+
+msgid "Add"
+msgstr "添加"
+
+msgid "Move up"
+msgstr "上移"
+
+msgid "Move down"
+msgstr "下移"
+
+msgid "Could not load file %1"
+msgstr "无法加载文件 %1"
+
+msgid "Key Bindings:"
+msgstr "按键绑定"
+
+msgid "Action"
+msgstr "动作"
+
+msgid "Keybind"
+msgstr "绑定的按键"
+
+msgid "Clear binding"
+msgstr "清除绑定"
+
+msgid "Bind"
+msgstr "绑定"
+
+msgid "Bind Key"
+msgstr "绑定按键"
+
+msgid "Enter key combo:"
+msgstr "输入按键组合"
+
+msgid "Bind conflict"
+msgstr "绑定冲突"
+
+msgid "This key combo is already in use."
+msgstr "该按键组合已被使用。"
+
+msgid "Send Control+Alt+Del"
+msgstr "发送 Ctrl+Alt+Del"
+
+msgid "Send Control+Alt+Escape"
+msgstr "发送 Ctrl+Alt+Esc"
+
+msgid "Toggle fullscreen"
+msgstr "切换全屏"
+
+msgid "Screenshot"
+msgstr "截图"
+
+msgid "Release mouse pointer"
+msgstr "释放鼠标"
+
+msgid "Toggle pause"
+msgstr "切换暂停"
+
+msgid "Toggle mute"
+msgstr "切换静音"
+
+msgid "Text files"
+msgstr "文本文件"
+
+msgid "ROM files"
+msgstr "ROM 文件"
+
+msgid "SoundFont files"
+msgstr "SoundFont 文件"
+
+msgid "Local Switch"
+msgstr "本地交换机"
+
+msgid "Remote Switch"
+msgstr "远程交换机"
+
+msgid "Switch:"
+msgstr "交换机："
+
+msgid "Hub Mode"
+msgstr "集线器模式"
+
+msgid "Hostname:"
+msgstr "主机名："
+
+msgid "ISA RAM:"
+msgstr "ISA 内存："
+
+msgid "ISA ROM:"
+msgstr "ISA ROM："
+
+msgid "&Wipe NVRAM"
+msgstr "清除 NVRAM(&W)"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "这将删除虚拟机位于 \"nvr\" 子目录中的所有 NVRAM 文件（及相关文件）。如果应用，您需要重新配置 BIOS（以及虚拟机内可能的其他设备）设置。\n\n您确定要擦除虚拟机 \"%1\" 的所有 NVRAM 内容吗？"
+
+msgid "Success"
+msgstr "成功"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "已成功清除虚拟机 \"%1\" 的 NVRAM 内容"
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "尝试清除虚拟机 \"%1\" 的 NVRAM 内容时发生错误"
+
+msgid "%1 VM Manager"
+msgstr "%1 虚拟机管理器"
+
+msgid "%n disk(s)"
+msgstr "%n 磁盘"
+
+msgid "Unknown Status"
+msgstr "未知状态"
+
+msgid "No Machines Found!"
+msgstr "未找到任何虚拟机！"
+
+msgid "Check for updates on startup"
+msgstr "启动时检查更新"
+
+msgid "Unable to determine release information"
+msgstr "无法确定发行版信息"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "检查更新：\n\n%1 时出错。\n\n请稍后再试。"
+
+msgid "Update check complete"
+msgstr "检查更新已完成"
+
+msgid "stable"
+msgstr "稳定版"
+
+msgid "beta"
+msgstr "测试版"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "您正在运行 86Box 的最新 %1 版本：%2"
+
+msgid "version"
+msgstr "版本"
+
+msgid "build"
+msgstr "构建"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "您当前正在运行版本 <b>%1</b> 。"
+
+msgid "<b>Version %1</b> is now available."
+msgstr "<b>版本 %1</b>现已可用。"
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "您当前正在运行构建 <b>%1</b> 。"
+
+msgid "<b>Build %1</b> is now available."
+msgstr "<b>构建 %1</b>现已可用。"
+
+msgid "Would you like to visit the download page?"
+msgstr "您想访问下载页面吗？"
+
+msgid "Visit download page"
+msgstr "访问下载页面"
+
+msgid "Update check"
+msgstr "更新检查"
+
+msgid "Checking for updates..."
+msgstr "正在检查更新..."
+
+msgid "86Box Update"
+msgstr "86Box 更新"
+
+msgid "Release notes:"
+msgstr "发行版说明"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "虚拟机崩溃"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "虚拟机 \"%1\" 的进程意外终止，退出代码为 %2。"
+
+msgid "The system will not be added."
+msgstr "系统将不会被添加。"
+
+msgid "&Update mouse every CPU frame"
+msgstr "逐 CPU 帧更新鼠标(&U)"
+
+msgid "Hue"
+msgstr "色调"
+
+msgid "Saturation"
+msgstr "饱和度"
+
+msgid "Contrast"
+msgstr "对比"
+
+msgid "Brightness"
+msgstr "亮度"
+
+msgid "Sharpness"
+msgstr "锐度"
+
+msgid "&CGA composite settings..."
+msgstr "CGA 复合模式设置...(&C)"
+
+msgid "CGA composite settings"
+msgstr "CGA 复合模式设置"
+
+msgid "Monitor EDID"
+msgstr "显示器的EDID"
+
+msgid "Export..."
+msgstr "导出..."
+
+msgid "Export EDID"
+msgstr "导出EDID"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "EDID文件 \"%ls\" 过大。"
+
+msgid "OpenGL input scale"
+msgstr "OpenGL的输入比例"
+
+msgid "OpenGL input stretch mode"
+msgstr "OpenGL的输入拉伸模式"
+
+msgid "Color scheme"
+msgstr "配色方案"
+
+msgid "Light"
+msgstr "亮色"
+
+msgid "Dark"
+msgstr "暗色"
diff --git a/src/qt/languages/zh-TW.po b/src/qt/languages/zh-TW.po
index cf53b3488..21a984ebd 100644
--- a/src/qt/languages/zh-TW.po
+++ b/src/qt/languages/zh-TW.po
@@ -1,3 +1,11 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: zh_TW\n"
+"X-Source-Language: en_US\n"
+
 msgid "&Action"
 msgstr "動作(&A)"
 
@@ -10,8 +18,8 @@ msgstr "將右 CTRL 鍵映射為左 ALT 鍵(&R)"
 msgid "&Hard Reset..."
 msgstr "硬重設(&H)..."
 
-msgid "&Ctrl+Alt+Del\tCtrl+F12"
-msgstr "Ctrl+Alt+Del(&C)\tCtrl+F12"
+msgid "&Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del(&C)"
 
 msgid "Ctrl+Alt+&Esc"
 msgstr "Ctrl+Alt+Esc(&E)"
@@ -19,8 +27,14 @@ msgstr "Ctrl+Alt+Esc(&E)"
 msgid "&Pause"
 msgstr "暫停(&P)"
 
-msgid "E&xit..."
-msgstr "退出(&X)..."
+msgid "Pause"
+msgstr "暫停"
+
+msgid "Re&sume"
+msgstr "恢復"
+
+msgid "E&xit"
+msgstr "退出(&X)"
 
 msgid "&View"
 msgstr "檢視(&V)"
@@ -40,26 +54,20 @@ msgstr "記住視窗大小和位置(&E)"
 msgid "Re&nderer"
 msgstr "渲染器(&N)"
 
-msgid "&SDL (Software)"
-msgstr "SDL (軟體)(&S)"
-
-msgid "SDL (&Hardware)"
-msgstr "SDL (硬體)(&H)"
-
-msgid "SDL (&OpenGL)"
-msgstr "SDL (OpenGL)(&O)"
+msgid "&Qt (Software)"
+msgstr "Qt (軟體)(&Q)"
 
 msgid "Open&GL (3.0 Core)"
-msgstr "OpenGL (3.0 核心)(&G)"
+msgstr "OpenGL (3.0 Core)(&G)"
 
 msgid "&VNC"
 msgstr "VNC(&V)"
 
-msgid "Specify dimensions..."
-msgstr "指定視窗大小..."
+msgid "Specify &dimensions..."
+msgstr "指定視窗大小...(&D)"
 
-msgid "F&orce 4:3 display ratio"
-msgstr "強制 4:3 顯示比例(&O)"
+msgid "Force &4:3 display ratio"
+msgstr "強制 4:3 顯示比例(&4)"
 
 msgid "&Window scale factor"
 msgstr "視窗縮放係數(&W)"
@@ -94,8 +102,8 @@ msgstr "7x(&7)"
 msgid "&8x"
 msgstr "8x(&8)"
 
-msgid "Filter method"
-msgstr "過濾方式"
+msgid "Fi&lter method"
+msgstr "過濾方式(&L)"
 
 msgid "&Nearest"
 msgstr "鄰近(&N)"
@@ -106,8 +114,8 @@ msgstr "線性(&L)"
 msgid "Hi&DPI scaling"
 msgstr "HiDPI 縮放(&D)"
 
-msgid "&Fullscreen\tCtrl+Alt+PgUp"
-msgstr "全螢幕(&F)\tCtrl+Alt+PgUp"
+msgid "&Fullscreen"
+msgstr "全螢幕(&F)"
 
 msgid "Fullscreen &stretch mode"
 msgstr "全螢幕拉伸模式(&S)"
@@ -127,8 +135,8 @@ msgstr "整數比例(&I)"
 msgid "4:&3 Integer scale"
 msgstr "4:3 整數比例(&3)"
 
-msgid "E&GA/(S)VGA settings"
-msgstr "EGA/(S)VGA 設定(&G)"
+msgid "EGA/(S)&VGA settings"
+msgstr "EGA/(S)VGA 設定(&V)"
 
 msgid "&Inverted VGA monitor"
 msgstr "VGA 顯示器反色顯示(&I)"
@@ -139,9 +147,15 @@ msgstr "VGA 螢幕類型(&T)"
 msgid "RGB &Color"
 msgstr "RGB 彩色(&C)"
 
+msgid "RGB (no brown)"
+msgstr "RGB (無棕色)"
+
 msgid "&RGB Grayscale"
 msgstr "RGB 灰度(&R)"
 
+msgid "Generic RGBI color monitor"
+msgstr "通用 RGBI 彩色監視器"
+
 msgid "&Amber monitor"
 msgstr "琥珀色單色顯示器(&A)"
 
@@ -178,11 +192,17 @@ msgstr "工具(&T)"
 msgid "&Settings..."
 msgstr "設定(&S)..."
 
+msgid "Settings..."
+msgstr "設定..."
+
 msgid "&Update status bar icons"
 msgstr "更新狀態列圖示(&U)"
 
-msgid "Take s&creenshot\tCtrl+F11"
-msgstr "擷圖(&C)\tCtrl+F11"
+msgid "Take s&creenshot"
+msgstr "擷圖(&C)"
+
+msgid "S&ound"
+msgstr "聲音(&O)"
 
 msgid "&Preferences..."
 msgstr "偏好設定(&P)..."
@@ -193,11 +213,11 @@ msgstr "啟用 Discord 整合(&D)"
 msgid "Sound &gain..."
 msgstr "音量增益(&G)..."
 
-msgid "Begin trace\tCtrl+T"
-msgstr "開始追踪\tCtrl+T"
+msgid "Begin trace"
+msgstr "開始追踪"
 
-msgid "End trace\tCtrl+T"
-msgstr "結束追踪\tCtrl+T"
+msgid "End trace"
+msgstr "結束追踪"
 
 msgid "&Help"
 msgstr "說明(&H)"
@@ -244,14 +264,14 @@ msgstr "靜音(&M)"
 msgid "E&mpty"
 msgstr "空置光碟機(&M)"
 
-msgid "&Reload previous image"
-msgstr "載入上一個映像(&R)"
+msgid "Reload previous image"
+msgstr "載入上一個映像"
 
 msgid "&Folder..."
 msgstr "資料夾(&F)..."
 
 msgid "Target &framerate"
-msgstr "目標幀率(&F)"
+msgstr "目標影格速率(&F)"
 
 msgid "&Sync with video"
 msgstr "與視訊同步(&S)"
@@ -301,18 +321,12 @@ msgstr "確定"
 msgid "Cancel"
 msgstr "取消"
 
-msgid "Save these settings as &global defaults"
-msgstr "將以上設定存儲為全局預設值(&G)"
-
 msgid "&Default"
 msgstr "預設(&D)"
 
 msgid "Language:"
 msgstr "語言:"
 
-msgid "Icon set:"
-msgstr "圖示集:"
-
 msgid "Gain"
 msgstr "增益"
 
@@ -346,6 +360,9 @@ msgstr "機型:"
 msgid "Configure"
 msgstr "設定"
 
+msgid "CPU:"
+msgstr "CPU:"
+
 msgid "CPU type:"
 msgstr "CPU 類型:"
 
@@ -382,11 +399,23 @@ msgstr "啟用 (UTC)"
 msgid "Dynamic Recompiler"
 msgstr "動態重編譯器"
 
+msgid "CPU frame size"
+msgstr "CPU 框架大小"
+
+msgid "Larger frames (less smooth)"
+msgstr "較大的框架 (較不平滑)"
+
+msgid "Smaller frames (smoother)"
+msgstr "更小的框架 (更平滑)"
+
 msgid "Video:"
 msgstr "顯示卡:"
 
-msgid "Voodoo Graphics"
-msgstr "Voodoo Graphics"
+msgid "Video #2:"
+msgstr "顯示卡 2:"
+
+msgid "Voodoo 1 or 2 Graphics"
+msgstr "Voodoo 1 或 2 圖形"
 
 msgid "IBM 8514/A Graphics"
 msgstr "IBM 8514/A Graphics"
@@ -394,12 +423,27 @@ msgstr "IBM 8514/A Graphics"
 msgid "XGA Graphics"
 msgstr "XGA Graphics"
 
+msgid "IBM PS/55 Display Adapter Graphics"
+msgstr "IBM PS/55 顯示介面卡圖形"
+
+msgid "Keyboard:"
+msgstr "鍵盤:"
+
+msgid "Keyboard"
+msgstr "鍵盤"
+
 msgid "Mouse:"
 msgstr "滑鼠:"
 
+msgid "Mouse"
+msgstr "滑鼠"
+
 msgid "Joystick:"
 msgstr "搖桿:"
 
+msgid "Joystick"
+msgstr "搖桿"
+
 msgid "Joystick 1..."
 msgstr "搖桿 1..."
 
@@ -430,14 +474,17 @@ msgstr "MIDI 輸出裝置:"
 msgid "MIDI In Device:"
 msgstr "MIDI 輸入裝置:"
 
+msgid "MIDI Out:"
+msgstr "MIDI 輸出:"
+
 msgid "Standalone MPU-401"
 msgstr "獨立 MPU-401"
 
 msgid "Use FLOAT32 sound"
-msgstr "使用單精度浮點 (FLOAT32)"
+msgstr "使用單精度浮點 (FLOAT32) 音訊"
 
 msgid "FM synth driver"
-msgstr "調頻合成器驅動器"
+msgstr "FM synth driver"
 
 msgid "Nuked (more accurate)"
 msgstr "Nuked (更準確)"
@@ -445,15 +492,6 @@ msgstr "Nuked (更準確)"
 msgid "YMFM (faster)"
 msgstr "YMFM (更快)"
 
-msgid "Network type:"
-msgstr "網路類型:"
-
-msgid "PCap device:"
-msgstr "PCap 裝置:"
-
-msgid "Network adapter:"
-msgstr "網路配接器:"
-
 msgid "COM1 Device:"
 msgstr "COM1 裝置:"
 
@@ -478,6 +516,9 @@ msgstr "LPT3 裝置:"
 msgid "LPT4 Device:"
 msgstr "LPT4 裝置:"
 
+msgid "Internal LPT ECP DMA:"
+msgstr "內部 LPT 的 ECP 的 DMA:"
+
 msgid "Serial port 1"
 msgstr "序列埠 1"
 
@@ -502,18 +543,21 @@ msgstr "並列埠 3"
 msgid "Parallel port 4"
 msgstr "並列埠 4"
 
-msgid "HD Controller:"
-msgstr "硬碟控制器:"
-
 msgid "FD Controller:"
 msgstr "軟碟控制器:"
 
+msgid "CD-ROM Controller:"
+msgstr "CD-ROM 控制器"
+
 msgid "Tertiary IDE Controller"
 msgstr "第三 IDE 控制器"
 
 msgid "Quaternary IDE Controller"
 msgstr "第四 IDE 控制器"
 
+msgid "Hard disk"
+msgstr "硬碟"
+
 msgid "SCSI"
 msgstr "SCSI"
 
@@ -535,6 +579,9 @@ msgstr "磁帶"
 msgid "Hard disks:"
 msgstr "硬碟:"
 
+msgid "Firmware Version"
+msgstr "韌體版本"
+
 msgid "&New..."
 msgstr "新增(&N)..."
 
@@ -589,14 +636,17 @@ msgstr "檢查 BPB"
 msgid "CD-ROM drives:"
 msgstr "光碟機:"
 
-msgid "Earlier drive"
-msgstr "早先的光碟機"
-
 msgid "MO drives:"
 msgstr "磁光碟機:"
 
-msgid "ZIP drives:"
-msgstr "ZIP 磁碟機:"
+msgid "MO:"
+msgstr "磁光:"
+
+msgid "Removable disks:"
+msgstr "可移除:"
+
+msgid "Removable disk drives:"
+msgstr "可移除磁碟:"
 
 msgid "ZIP 250"
 msgstr "ZIP 250"
@@ -607,6 +657,9 @@ msgstr "ISA 實時時鐘:"
 msgid "ISA Memory Expansion"
 msgstr "ISA 記憶體擴充"
 
+msgid "ISA ROM Cards"
+msgstr "ISA ROM 擴充卡"
+
 msgid "Card 1:"
 msgstr "擴充卡 1:"
 
@@ -619,18 +672,21 @@ msgstr "擴充卡 3:"
 msgid "Card 4:"
 msgstr "擴充卡 4:"
 
+msgid "Generic ISA ROM Board"
+msgstr "通用 ISA ROM 板"
+
+msgid "Generic Dual ISA ROM Board"
+msgstr "通用雙 ISA ROM 板"
+
+msgid "Generic Quad ISA ROM Board"
+msgstr "通用四通道 ISA ROM 板"
+
 msgid "ISABugger device"
 msgstr "ISABugger 裝置"
 
 msgid "POST card"
 msgstr "自檢 (POST) 卡"
 
-msgid "FONT_SIZE"
-msgstr "9"
-
-msgid "FONT_NAME"
-msgstr "Microsoft JhengHei"
-
 msgid "86Box"
 msgstr "86Box"
 
@@ -643,17 +699,20 @@ msgstr "致命錯誤"
 msgid " - PAUSED"
 msgstr " - 已暫停"
 
-msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
-msgstr "按下 Ctrl+Alt+PgDn 返回到視窗模式。"
-
 msgid "Speed"
 msgstr "速度"
 
-msgid "ZIP %03i %i (%s): %ls"
-msgstr "ZIP %03i %i (%s): %ls"
+msgid "Removable disk %1 (%2): %3"
+msgstr "可移除磁碟 %1 (%2): %3"
 
-msgid "ZIP images"
-msgstr "ZIP 映像"
+msgid "&Removable disk %1 (%2): %3"
+msgstr "可移除磁碟(&R) %1 (%2): %3"
+
+msgid "Removable disk images"
+msgstr "可移除磁碟影像"
+
+msgid "Image %1"
+msgstr "影像 %1"
 
 msgid "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."
 msgstr "86Box 找不到任何可用的 ROM 映像。\n\n請<a href=\"https://github.com/86Box/roms/releases/latest\">下載</a> ROM 套件並將其解壓到 \"roms\" 資料夾。"
@@ -688,6 +747,12 @@ msgstr "由於 roms/machines 資料夾中缺少合適的 ROM，機型 \"%hs\" 
 msgid "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
 msgstr "由於 roms/video 資料夾中缺少合適的 ROM，顯示卡 \"%hs\" 不可用。將切換到其他可用顯示卡。"
 
+msgid "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
+msgstr "由於 roms/video 資料夾中缺少合適的 ROM，顯示卡 2 \"%hs\" 不可用。禁用第二块显卡。"
+
+msgid "Device \"%hs\" is not available due to missing ROMs. Ignoring the device."
+msgstr "由於缺少合適的 ROM，裝置 \"%hs\" 不可用。忽略设备。"
+
 msgid "Machine"
 msgstr "機型"
 
@@ -706,12 +771,30 @@ msgstr "網路"
 msgid "Ports (COM & LPT)"
 msgstr "連接埠 (COM 和 LPT)"
 
+msgid "Ports"
+msgstr "連接埠"
+
+msgid "Serial ports:"
+msgstr "序列連接埠:"
+
+msgid "Parallel ports:"
+msgstr "平行埠:"
+
 msgid "Storage controllers"
 msgstr "存儲控制器"
 
 msgid "Hard disks"
 msgstr "硬碟"
 
+msgid "Disks:"
+msgstr "磁碟:"
+
+msgid "Floppy:"
+msgstr "軟盤:"
+
+msgid "Controllers:"
+msgstr "控制器:"
+
 msgid "Floppy & CD-ROM drives"
 msgstr "軟碟/光碟機"
 
@@ -721,14 +804,17 @@ msgstr "其他卸除式裝置"
 msgid "Other peripherals"
 msgstr "其他周邊裝置"
 
+msgid "Other devices"
+msgstr "其他裝置"
+
 msgid "Click to capture mouse"
 msgstr "點擊視窗捕捉滑鼠"
 
-msgid "Press F8+F12 to release mouse"
-msgstr "按下 F8+F12 釋放滑鼠"
+msgid "Press %1 to release mouse"
+msgstr "按下 %1 釋放滑鼠"
 
-msgid "Press F8+F12 or middle button to release mouse"
-msgstr "按下 F8+F12 或滑鼠中鍵釋放滑鼠"
+msgid "Press %1 or middle button to release mouse"
+msgstr "按下 %1 或滑鼠中鍵釋放滑鼠"
 
 msgid "Bus"
 msgstr "匯流排"
@@ -748,65 +834,89 @@ msgstr "S"
 msgid "KB"
 msgstr "KB"
 
-msgid "Could not initialize the video renderer."
-msgstr "無法初始化視訊渲染器。"
-
 msgid "Default"
 msgstr "預設"
 
-msgid "%i Wait state(s)"
-msgstr "%i 等待狀態 (WS)"
+msgid "%1 Wait state(s)"
+msgstr "%1 等待狀態 (WS)"
 
 msgid "Type"
 msgstr "類型"
 
-msgid "Failed to set up PCap"
-msgstr "設定 PCap 失敗"
-
 msgid "No PCap devices found"
 msgstr "未找到 PCap 裝置"
 
 msgid "Invalid PCap device"
 msgstr "無效 PCap 裝置"
 
-msgid "Standard 2-button joystick(s)"
-msgstr "標準 2 鍵搖桿"
+msgid "2-axis, 2-button joystick(s)"
+msgstr "2 軸, 2 鍵搖桿"
 
-msgid "Standard 4-button joystick"
-msgstr "標準 4 鍵搖桿"
+msgid "2-axis, 4-button joystick"
+msgstr "2 軸, 4 鍵搖桿"
 
-msgid "Standard 6-button joystick"
-msgstr "標準 6 鍵搖桿"
+msgid "2-axis, 6-button joystick"
+msgstr "2 軸, 6 鍵搖桿"
 
-msgid "Standard 8-button joystick"
-msgstr "標準 8 鍵搖桿"
+msgid "2-axis, 8-button joystick"
+msgstr "2 軸, 8 鍵搖桿"
+
+msgid "3-axis, 2-button joystick"
+msgstr "3 軸, 2 鍵搖桿"
+
+msgid "3-axis, 4-button joystick"
+msgstr "3 軸, 4 鍵搖桿"
+
+msgid "4-axis, 4-button joystick"
+msgstr "4 軸, 4 鍵搖桿"
 
 msgid "CH Flightstick Pro"
 msgstr "CH Flightstick Pro"
 
+msgid "CH Flightstick Pro + CH Pedals"
+msgstr "CH Flightstick Pro + CH Pedals"
+
 msgid "Microsoft SideWinder Pad"
 msgstr "Microsoft SideWinder Pad"
 
 msgid "Thrustmaster Flight Control System"
 msgstr "Thrustmaster Flight Control System"
 
+msgid "Thrustmaster FCS + Rudder Control System"
+msgstr "Thrustmaster FCS + Rudder Control System"
+
+msgid "2-button gamepad(s)"
+msgstr "2 鍵遊戲手柄"
+
+msgid "2-button flight yoke"
+msgstr "2 按鈕飛行搖桿"
+
+msgid "4-button gamepad"
+msgstr "4 鍵遊戲手柄"
+
+msgid "4-button flight yoke"
+msgstr "4 按鈕飛行搖桿"
+
+msgid "2-button flight yoke with throttle"
+msgstr "2 按鈕飛行搖桿，含節流閥"
+
+msgid "4-button flight yoke with throttle"
+msgstr "4 按鈕飛行搖桿，含節流閥"
+
+msgid "Win95 Steering Wheel (3-axis, 4-button)"
+msgstr "Win95 方向盤 (3 軸, 4 鍵搖桿)"
+
 msgid "None"
 msgstr "無"
 
-msgid "Unable to load keyboard accelerators."
-msgstr "無法載入鍵盤加速器。"
+msgid "%1 MB (CHS: %2, %3, %4)"
+msgstr "%1 MB (CHS: %2, %3, %4)"
 
-msgid "Unable to register raw input."
-msgstr "無法註冊原始輸入。"
+msgid "Floppy %1 (%2): %3"
+msgstr "軟碟 %1 (%2): %3"
 
-msgid "%u"
-msgstr "%u"
-
-msgid "%u MB (CHS: %i, %i, %i)"
-msgstr "%u MB (CHS: %i, %i, %i)"
-
-msgid "Floppy %i (%s): %ls"
-msgstr "軟碟 %i (%s): %ls"
+msgid "&Floppy %1 (%2): %3"
+msgstr "軟碟 %1 (%2): %3(&F)"
 
 msgid "Advanced sector images"
 msgstr "進階磁區映像"
@@ -814,9 +924,6 @@ msgstr "進階磁區映像"
 msgid "Flux images"
 msgstr "Flux 映像"
 
-msgid "Unable to initialize SDL, SDL2.dll is required"
-msgstr "無法初始化 SDL，需要 SDL2.dll"
-
 msgid "Are you sure you want to hard reset the emulated machine?"
 msgstr "確定要硬重設模擬器嗎？"
 
@@ -826,8 +933,14 @@ msgstr "確定要退出 86Box 嗎？"
 msgid "Unable to initialize Ghostscript"
 msgstr "無法初始化 Ghostscript"
 
-msgid "MO %i (%ls): %ls"
-msgstr "磁光碟 %i (%ls): %ls"
+msgid "Unable to initialize GhostPCL"
+msgstr "無法初始化 GhostPCL"
+
+msgid "MO %1 (%2): %3"
+msgstr "磁光碟 %1 (%2): %3"
+
+msgid "&MO %1 (%2): %3"
+msgstr "磁光碟 %1 (%2): %3(&M)"
 
 msgid "MO images"
 msgstr "磁光碟映像"
@@ -835,8 +948,17 @@ msgstr "磁光碟映像"
 msgid "Welcome to 86Box!"
 msgstr "歡迎使用 86Box！"
 
-msgid "Internal controller"
-msgstr "內部控制器"
+msgid "Internal device"
+msgstr "內部裝置"
+
+msgid "&File"
+msgstr "檔案(&F)"
+
+msgid "&New machine..."
+msgstr "新機器(&N)..."
+
+msgid "&Check for updates..."
+msgstr "檢查更新(&C)..."
 
 msgid "Exit"
 msgstr "退出"
@@ -860,34 +982,22 @@ msgid "86Box v"
 msgstr "86Box v"
 
 msgid "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-msgstr "一個舊式電腦模擬器\n\n作者: Miran Grča (OBattler)、RichardG867、Jasmine Iwanek、TC1995、coldbrewed、Teemu Korhonen (Manaatti)、Joakim L. Gilje、Adrien Moulin (elyosh)、Daniel Balsom (gloriouscow)、Cacodemon345、Fred N. van Kempen (waltje)、Tiseno100、reenigne 等人。\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\n本軟體依據 GNU 通用公共授權第二版或更新版本發布。詳情見 LICENSE 檔案。"
+msgstr "一個舊式電腦模擬器\n\n作者: Miran Grča (OBattler)、RichardG867、Jasmine Iwanek、TC1995、coldbrewed、Teemu Korhonen (Manaatti)、Joakim L. Gilje、Adrien Moulin (elyosh)、Daniel Balsom (gloriouscow)、Cacodemon345、Fred N. van Kempen (waltje)、Tiseno100、reenigne 等人。\n\n之前的核心貢獻來自 Sarah Walker、leilei、JohnElliott、greatpsycho 等人。\n\n本軟體依據 GNU 通用公共授權第二版或更新版本發布。詳情見 LICENSE 檔案。"
 
 msgid "Hardware not available"
 msgstr "硬體不可用"
 
-msgid "WinPcap"
-msgstr "WinPcap"
-
-msgid "libpcap"
-msgstr "libpcap"
-
-msgid "Make sure libpcap is installed and that you are on a libpcap-compatible network connection."
-msgstr "請確認 libpcap 已安裝且使用相容 libpcap 的網路連線。"
+msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
+msgstr "請確認 %1 已安裝且使用相容 %1 的網路連線。"
 
 msgid "Invalid configuration"
 msgstr "無效設定"
 
-msgid "gsdll32.dll"
-msgstr "gsdll32.dll"
+msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
+msgstr "%1 是將 PostScript 檔案轉換為 PDF 所需要的庫。\n\n使用通用 PostScript 印表機列印的文件將被儲存為 PostScript (.ps) 檔案。"
 
-msgid "libgs"
-msgstr "libgs"
-
-msgid " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr " 是將 PostScript 檔案轉換為 PDF 所需要的庫。\n\n使用通用 PostScript 印表機列印的文件將被儲存為 PostScript (.ps) 檔案。"
-
-msgid "Entering fullscreen mode"
-msgstr "正在進入全螢幕模式"
+msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
+msgstr "%1 是將 PCL 檔案轉換為 PDF 所需要的庫。\n\n使用通用 PCL 印表機列印的文件將被儲存為 Printer Command Language (.pcl) 檔案。"
 
 msgid "Don't show this message again"
 msgstr "不要再顯示此消息"
@@ -904,17 +1014,14 @@ msgstr "不重設"
 msgid "CD-ROM images"
 msgstr "光碟映像"
 
-msgid "%hs Device Configuration"
-msgstr "%hs 裝置設定"
+msgid "%1 Device Configuration"
+msgstr "%1 裝置設定"
 
 msgid "Monitor in sleep mode"
 msgstr "顯示器處在睡眠狀態"
 
-msgid "OpenGL Shaders"
-msgstr "OpenGL 著色器"
-
-msgid "OpenGL options"
-msgstr "OpenGL 選項"
+msgid "GLSL shaders"
+msgstr "GLSL 著色器"
 
 msgid "You are loading an unsupported configuration"
 msgstr "正在載入一個不受支援的設定"
@@ -925,30 +1032,33 @@ msgstr "此模擬電腦停用了基於選定電腦的 CPU 類型過濾。\n\n能
 msgid "Continue"
 msgstr "繼續"
 
-msgid "Cassette: %s"
-msgstr "磁帶: %s"
+msgid "Cassette: %1"
+msgstr "磁帶: %1"
+
+msgid "C&assette: %1"
+msgstr "磁帶: %1(&A)"
 
 msgid "Cassette images"
 msgstr "磁帶映像"
 
-msgid "Cartridge %i: %ls"
-msgstr "卡帶 %i: %ls"
+msgid "Cartridge %1: %2"
+msgstr "卡帶 %1: %2"
+
+msgid "Car&tridge %1: %2"
+msgstr "卡帶 %1: %2(&A)"
 
 msgid "Cartridge images"
 msgstr "卡帶映像"
 
-msgid "Error initializing renderer"
-msgstr "初始化渲染器時出錯"
-
-msgid "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-msgstr "無法初始化 OpenGL (3.0 核心) 渲染器。請使用其他渲染器。"
-
 msgid "Resume execution"
 msgstr "恢復執行"
 
 msgid "Pause execution"
 msgstr "暫停執行"
 
+msgid "Ctrl+Alt+Del"
+msgstr "Ctrl+Alt+Del"
+
 msgid "Press Ctrl+Alt+Del"
 msgstr "按下 Ctrl+Alt+Del"
 
@@ -958,17 +1068,281 @@ msgstr "按下 Ctrl+Alt+Esc"
 msgid "Hard reset"
 msgstr "硬重設"
 
+msgid "Force shutdown"
+msgstr "強制關機"
+
+msgid "Start"
+msgstr "開始"
+
+msgid "Not running"
+msgstr "未執行"
+
+msgid "Running"
+msgstr "運行"
+
+msgid "Paused"
+msgstr "已暫停"
+
+msgid "Waiting"
+msgstr "等待"
+
+msgid "Powered Off"
+msgstr "電源關閉"
+
+msgid "%n running"
+msgstr "%n 運行"
+
+msgid "%n paused"
+msgstr "%n 已暫停"
+
+msgid "%n waiting"
+msgstr "%n 等待"
+
+msgid "%1 total"
+msgstr "%1 總計"
+
+msgid "VMs: %1"
+msgstr "虛擬機器：%1"
+
+msgid "System Directory:"
+msgstr "系統目錄:"
+
+msgid "Choose directory"
+msgstr "選擇目錄"
+
+msgid "Choose configuration file"
+msgstr "選擇組態檔案"
+
+msgid "86Box configuration files (86box.cfg)"
+msgstr "86Box 配置檔案 (86box.cfg)"
+
+msgid "Configuration read failed"
+msgstr "設定讀取失敗"
+
+msgid "Unable to open the selected configuration file for reading: %1"
+msgstr "無法開啟選取的設定檔進行讀取: %1"
+
+msgid "Use regular expressions in search box"
+msgstr "在搜尋方塊中使用正則表達式"
+
+msgid "%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?"
+msgstr "%1 台機器目前處於活動狀態。您確定要退出虛擬機器管理員嗎？"
+
+msgid "Add new system wizard"
+msgstr "新增系統精靈"
+
+msgid "Introduction"
+msgstr "簡介"
+
+msgid "This will help you add a new system to 86Box."
+msgstr "這將有助於您在 86Box 中加入新系統。"
+
+msgid "New configuration"
+msgstr "新配置"
+
+msgid "Complete"
+msgstr "完成"
+
+msgid "The wizard will now launch the configuration for the new system."
+msgstr "精靈現在會啟動新系統的組態。"
+
+msgid "Use existing configuration"
+msgstr "使用現有組態"
+
+msgid "Type some notes here"
+msgstr "在此輸入一些備註"
+
+msgid "Paste the contents of the existing configuration file into the box below."
+msgstr "將現有組態檔案的內容貼到下面的方塊中。"
+
+msgid "Load configuration from file"
+msgstr "從檔案載入設定"
+
+msgid "System name"
+msgstr "系統名稱"
+
+msgid "System name:"
+msgstr "系統名稱:"
+
+msgid "System name cannot contain certain characters"
+msgstr "系統名稱不能包含特定字元"
+
+msgid "System name already exists"
+msgstr "系統名稱已存在"
+
+msgid "Please enter a directory for the system"
+msgstr "請輸入系統目錄"
+
+msgid "Directory does not exist"
+msgstr "目錄不存在"
+
+msgid "A new directory for the system will be created in the selected directory above"
+msgstr "系統的新目錄將會在上述選取的目錄中建立"
+
+msgid "System location:"
+msgstr "系統位置:"
+
+msgid "System name and location"
+msgstr "系統名稱和位置"
+
+msgid "Enter the name of the system and choose the location"
+msgstr "輸入系統名稱並選擇位置"
+
+msgid "Enter the name of the system"
+msgstr "輸入系統名稱"
+
+msgid "Please enter a system name"
+msgstr "請輸入系統名稱"
+
+msgid "Display name (optional):"
+msgstr "顯示名稱 (可選):"
+
+msgid "Display name:"
+msgstr "顯示名稱:"
+
+msgid "Set display name"
+msgstr "設定顯示名稱"
+
+msgid "Enter the new display name (blank to reset)"
+msgstr "輸入新的顯示名稱 (空白表示重設)"
+
+msgid "Change &display name..."
+msgstr "變更顯示名稱(&D)..."
+
+msgid "Context Menu"
+msgstr "內容選單"
+
+msgid "&Open folder..."
+msgstr "開啟資料夾(&O)..."
+
+msgid "Open p&rinter tray..."
+msgstr "打開印表機托盤(&R)..."
+
+msgid "Set &icon..."
+msgstr "設定圖示(&I)..."
+
+msgid "Select an icon"
+msgstr "選擇圖示"
+
+msgid "C&lone..."
+msgstr "克隆(&L)..."
+
+msgid "Virtual machine \"%1\" (%2) will be cloned into:"
+msgstr "虛擬機器 \"%1\" (%2) 將被複製到:"
+
+msgid "Directory %1 already exists"
+msgstr "目錄 %1 已經存在"
+
+msgid "You cannot use the following characters in the name: %1"
+msgstr "您不能在名稱中使用下列字元：%1"
+
+msgid "Clone"
+msgstr "克隆"
+
+msgid "Failed to create directory for cloned VM"
+msgstr "為複製的虛擬機器建立目錄失敗"
+
+msgid "Failed to clone VM."
+msgstr "複製虛擬機器失敗。"
+
+msgid "Directory in use"
+msgstr "使用中的目錄"
+
+msgid "The selected directory is already in use. Please select a different directory."
+msgstr "所選目錄已被使用。請選擇其他目錄。"
+
+msgid "Create directory failed"
+msgstr "建立目錄失敗"
+
+msgid "Unable to create the directory for the new system"
+msgstr "無法為新系統建立目錄"
+
+msgid "Configuration write failed"
+msgstr "設定寫入失敗"
+
+msgid "Unable to open the configuration file at %1 for writing"
+msgstr "無法開啟 %1 的設定檔進行寫入"
+
+msgid "Error adding system"
+msgstr "錯誤新增系統"
+
+msgid "Remove directory failed"
+msgstr "移除目錄失敗"
+
+msgid "Some files in the machine's directory were unable to be deleted. Please delete them manually."
+msgstr "機器目錄中的某些檔案無法刪除。請手動刪除它們。"
+
+msgid "Build"
+msgstr "建置"
+
+msgid "Version"
+msgstr "版本"
+
+msgid "An update to 86Box is available: %1 %2"
+msgstr "86Box 的更新可用: %1 %2"
+
+msgid "An error has occurred while checking for updates: %1"
+msgstr "檢查更新時發生錯誤: %1"
+
+msgid "<b>An update to 86Box is available!</b>"
+msgstr "<b>86Box 的更新可用！</b>"
+
+msgid "Warning"
+msgstr "警告"
+
+msgid "&Kill"
+msgstr "強制終止(&K)"
+
+msgid "Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?"
+msgstr "強行終止虛擬機器可能會導致資料遺失。只有在 86Box 過程卡住時才執行此操作。\n\n您真的希望強制終止虛擬機器 \"%1\"？"
+
+msgid "&Delete"
+msgstr "刪除(&D)"
+
+msgid "Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!"
+msgstr "您真的想要刪除虛擬機器 \"%1\" 及其所有檔案嗎？此操作無法撤銷！"
+
+msgid "Show &config file"
+msgstr "顯示設定檔(&C)"
+
+msgid "No screenshot"
+msgstr "沒有截圖"
+
+msgid "Search"
+msgstr "搜尋"
+
+msgid "Searching for VMs..."
+msgstr "搜尋虛擬機器..."
+
+msgid "Found %1"
+msgstr "找到 %1"
+
+msgid "System"
+msgstr "系統"
+
+msgid "Storage"
+msgstr "儲存"
+
+msgid "Disk %1: "
+msgstr "磁碟 %1: "
+
+msgid "No disks"
+msgstr "無磁碟"
+
+msgid "Audio"
+msgstr "音訊"
+
+msgid "Audio:"
+msgstr "音訊:"
+
 msgid "ACPI shutdown"
 msgstr "ACPI 關機"
 
-msgid "Hard disk (%s)"
-msgstr "硬碟 (%s)"
+msgid "ACP&I shutdown"
+msgstr "ACP&I 關機"
 
-msgid "%01i:%01i"
-msgstr "%01i:%01i"
-
-msgid "%01i"
-msgstr "%01i"
+msgid "Hard disk (%1)"
+msgstr "硬碟 (%1)"
 
 msgid "MFM/RLL or ESDI CD-ROM drives never existed"
 msgstr "不存在 MFM/RLL 或 ESDI CD-ROM 光碟機"
@@ -1003,9 +1377,6 @@ msgstr "無法寫入檔案"
 msgid "HDI or HDX images with a sector size other than 512 are not supported."
 msgstr "不支援非 512 位元組磁區大小的 HDI 或 HDX 映像。"
 
-msgid "USB is not yet supported"
-msgstr "尚未支援 USB"
-
 msgid "Disk image file already exists"
 msgstr "磁碟映像檔案已存在"
 
@@ -1039,6 +1410,27 @@ msgstr "覆蓋"
 msgid "Don't overwrite"
 msgstr "不覆蓋"
 
+msgid "Raw image"
+msgstr "原始映像"
+
+msgid "HDI image"
+msgstr "HDI 映像"
+
+msgid "HDX image"
+msgstr "HDX 映像"
+
+msgid "Fixed-size VHD"
+msgstr "固定大小 VHD"
+
+msgid "Dynamic-size VHD"
+msgstr "動態大小 VHD"
+
+msgid "Differencing VHD"
+msgstr "差分 VHD"
+
+msgid "(N/A)"
+msgstr "(不適用)"
+
 msgid "Raw image (.img)"
 msgstr "原始映像 (.img)"
 
@@ -1078,9 +1470,6 @@ msgstr "父碟與子碟的時間戳不匹配"
 msgid "Could not fix VHD timestamp."
 msgstr "無法修復 VHD 時間戳。"
 
-msgid "%01i:%02i"
-msgstr "%01i:%02i"
-
 msgid "MFM/RLL"
 msgstr "MFM/RLL"
 
@@ -1096,44 +1485,29 @@ msgstr "IDE"
 msgid "ATAPI"
 msgstr "ATAPI"
 
-msgid "MFM/RLL (%01i:%01i)"
-msgstr "MFM/RLL (%01i:%01i)"
+msgid "CD-ROM %1 (%2): %3"
+msgstr "光碟 %1 (%2): %3"
 
-msgid "XTA (%01i:%01i)"
-msgstr "XTA (%01i:%01i)"
+msgid "&CD-ROM %1 (%2): %3"
+msgstr "光碟 %1 (%2): %3(&C)"
 
-msgid "ESDI (%01i:%01i)"
-msgstr "ESDI (%01i:%01i)"
+msgid "160 KB"
+msgstr "160 KB"
 
-msgid "IDE (%01i:%01i)"
-msgstr "IDE (%01i:%01i)"
+msgid "180 KB"
+msgstr "180 KB"
 
-msgid "ATAPI (%01i:%01i)"
-msgstr "ATAPI (%01i:%01i)"
+msgid "320 KB"
+msgstr "320 KB"
 
-msgid "SCSI (%01i:%02i)"
-msgstr "SCSI (%01i:%02i)"
+msgid "360 KB"
+msgstr "360 KB"
 
-msgid "CD-ROM %i (%s): %s"
-msgstr "光碟 %i (%s): %s"
+msgid "640 KB"
+msgstr "640 KB"
 
-msgid "160 kB"
-msgstr "160 kB"
-
-msgid "180 kB"
-msgstr "180 kB"
-
-msgid "320 kB"
-msgstr "320 kB"
-
-msgid "360 kB"
-msgstr "360 kB"
-
-msgid "640 kB"
-msgstr "640 kB"
-
-msgid "720 kB"
-msgstr "720 kB"
+msgid "720 KB"
+msgstr "720 KB"
 
 msgid "1.2 MB"
 msgstr "1.2 MB"
@@ -1214,7 +1588,7 @@ msgid "Select media images from program working directory"
 msgstr "從程式工作目錄中選擇介質映像"
 
 msgid "PIT mode:"
-msgstr "PIT模式:"
+msgstr "PIT 模式:"
 
 msgid "Auto"
 msgstr "自動"
@@ -1227,3 +1601,1383 @@ msgstr "快"
 
 msgid "&Auto-pause on focus loss"
 msgstr "失去焦點時自動暫停(&A)"
+
+msgid "WinBox is no longer supported"
+msgstr "WinBox is no longer supported"
+
+msgid "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+msgstr "Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."
+
+msgid "Generate"
+msgstr "產生"
+
+msgid "Joystick configuration"
+msgstr "搖桿設定"
+
+msgid "Device"
+msgstr "裝置"
+
+msgid "%1 (X axis)"
+msgstr "%1 (X 軸)"
+
+msgid "%1 (Y axis)"
+msgstr "%1 (Y 軸)"
+
+msgid "MCA devices"
+msgstr "MCA 裝置"
+
+msgid "List of MCA devices:"
+msgstr "MCA 裝置清單："
+
+msgid "&Tablet tool"
+msgstr "平板工具(&T)"
+
+msgid "About &Qt"
+msgstr "關於 &Qt"
+
+msgid "&MCA devices..."
+msgstr "&MCA 裝置..."
+
+msgid "Show non-&primary monitors"
+msgstr "顯示非主要顯示器(&P)"
+
+msgid "Open screenshots &folder..."
+msgstr "開啟螢幕截圖資料夾...(&F)"
+
+msgid "Appl&y fullscreen stretch mode when maximized"
+msgstr "最大化時套用全螢幕拉伸模式(&Y)"
+
+msgid "&Cursor/Puck"
+msgstr "游標/球棒(&C)"
+
+msgid "&Pen"
+msgstr "筆(&P)"
+
+msgid "&Host CD/DVD Drive (%1:)"
+msgstr "主機 CD/DVD 光碟機 (%1:) (&H)"
+
+msgid "&Connected"
+msgstr "已連線"
+
+msgid "Clear image &history"
+msgstr "清除映像歷史記錄(&H)"
+
+msgid "Create..."
+msgstr "建立..."
+
+msgid "Host CD/DVD Drive (%1)"
+msgstr "主機 CD/DVD 光碟機 (%1)"
+
+msgid "Unknown Bus"
+msgstr "未知匯流排"
+
+msgid "Null Driver"
+msgstr "空驅動程式"
+
+msgid "NIC:"
+msgstr "NIC:"
+
+msgid "NIC %1 (%2) %3"
+msgstr "網路卡 %1 (%2) %3"
+
+msgid "&NIC %1 (%2) %3"
+msgstr "網路卡 %1 (%2) %3(&N)"
+
+msgid "Render behavior"
+msgstr "渲染行為"
+
+msgid "Use target framerate:"
+msgstr "使用目標影格速率："
+
+msgid " fps"
+msgstr "fps"
+
+msgid "VSync"
+msgstr "VSync"
+
+msgid "Synchronize with video"
+msgstr "與視訊同步"
+
+msgid "Shaders"
+msgstr "著色器"
+
+msgid "Remove"
+msgstr "移除"
+
+msgid "Browse..."
+msgstr "瀏覽..."
+
+msgid "Couldn't create OpenGL context."
+msgstr "無法建立 OpenGL 上下文。"
+
+msgid "Couldn't switch to OpenGL context."
+msgstr "無法切換至 OpenGL 上下文。"
+
+msgid "OpenGL version 3.0 or greater is required. Current version is %1.%2"
+msgstr "需要 OpenGL 版本 3.0 或更高。目前版本為 %1.%2"
+
+msgid "Error initializing OpenGL"
+msgstr "初始化 OpenGL 出錯"
+
+msgid "\nFalling back to software rendering."
+msgstr "\n回退到軟體渲染。"
+
+msgid "<html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html>"
+msgstr "<html><head/><body><p>當選擇媒體映像 (CD-ROM、軟碟等) 時，開啟對話方塊會在與 86Box 設定檔相同的目錄中開始。此設定可能只會在 macOS 上有所影響。</p></body></html>"
+
+msgid "This machine might have been moved or copied."
+msgstr "這台機器可能已被移動或複製。"
+
+msgid "In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."
+msgstr "為了確保正常的網路功能，86Box 需要知道這台機器是否被移動或複製。\n\n如果您不確定，請選擇「我已複製這台機器」。"
+
+msgid "I Moved It"
+msgstr "我已移動這台機器"
+
+msgid "I Copied It"
+msgstr "我已複製這台機器"
+
+msgid "86Box Monitor #"
+msgstr "86Box Monitor "
+
+msgid "No MCA devices."
+msgstr "沒有 MCA 裝置。"
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "Network Card #1"
+msgstr "網路卡 1"
+
+msgid "Network Card #2"
+msgstr "網路卡 2"
+
+msgid "Network Card #3"
+msgstr "網路卡 3"
+
+msgid "Network Card #4"
+msgstr "網路卡 4"
+
+msgid "Mode:"
+msgstr "模式:"
+
+msgid "Interface:"
+msgstr "介面:"
+
+msgid "Adapter:"
+msgstr "配接器:"
+
+msgid "VDE Socket:"
+msgstr "VDE 插座:"
+
+msgid "86Box Unit Tester"
+msgstr "86Box 單元測試器"
+
+msgid "Novell NetWare 2.x Key Card"
+msgstr "Novell NetWare 2.x 密鑰卡"
+
+msgid "Serial port passthrough 1"
+msgstr "序列埠的直通 1"
+
+msgid "Serial port passthrough 2"
+msgstr "序列埠的直通 2"
+
+msgid "Serial port passthrough 3"
+msgstr "序列埠的直通 3"
+
+msgid "Serial port passthrough 4"
+msgstr "序列埠的直通 4"
+
+msgid "Renderer &options..."
+msgstr "渲染器選項...(&O)"
+
+msgid "PC/XT Keyboard"
+msgstr "PC/XT 鍵盤"
+
+msgid "AT Keyboard"
+msgstr "AT 鍵盤"
+
+msgid "AX Keyboard"
+msgstr "AX 鍵盤"
+
+msgid "PS/2 Keyboard"
+msgstr "PS/2 鍵盤"
+
+msgid "PS/55 Keyboard"
+msgstr "PS/55 鍵盤"
+
+msgid "Keys"
+msgstr "鑰匙"
+
+msgid "Logitech/Microsoft Bus Mouse"
+msgstr "Logitech/Microsoft 匯流排滑鼠"
+
+msgid "Microsoft Bus Mouse (InPort)"
+msgstr "Microsoft 匯流排滑鼠 (InPort)"
+
+msgid "Mouse Systems Serial Mouse"
+msgstr "Mouse Systems 序列滑鼠"
+
+msgid "Mouse Systems Bus Mouse"
+msgstr "Mouse Systems 匯流排滑鼠"
+
+msgid "Microsoft Serial Mouse"
+msgstr "Microsoft 序列滑鼠"
+
+msgid "Microsoft Serial BallPoint"
+msgstr "Microsoft BallPoint 序列滑鼠"
+
+msgid "Logitech Serial Mouse"
+msgstr "Logitech 序列滑鼠"
+
+msgid "PS/2 Mouse"
+msgstr "PS/2 滑鼠"
+
+msgid "PS/2 QuickPort Mouse"
+msgstr "PS/2 QuickPort 滑鼠"
+
+msgid "3M MicroTouch (Serial)"
+msgstr "3M MicroTouch (序列)"
+
+msgid "Default Baud rate"
+msgstr "預設波特率"
+
+msgid "[COM] Standard Hayes-compliant Modem"
+msgstr "[COM] 標準 Hayes 相容的數據機"
+
+msgid "Roland MT-32 Emulation"
+msgstr "羅蘭 MT-32 模擬"
+
+msgid "Roland MT-32 (New) Emulation"
+msgstr "羅蘭 MT-32（新）模擬"
+
+msgid "Roland CM-32L Emulation"
+msgstr "羅蘭 CM-32L 模擬"
+
+msgid "Roland CM-32LN Emulation"
+msgstr "羅蘭 CM-32LN 模擬"
+
+msgid "OPL4-ML Daughterboard"
+msgstr "OPL4-ML 子板"
+
+msgid "System MIDI"
+msgstr "系統的 MIDI"
+
+msgid "MIDI Input Device"
+msgstr "MIDI 輸入裝置"
+
+msgid "BIOS file"
+msgstr "BIOS 檔案"
+
+msgid "BIOS file (ROM #1)"
+msgstr "BIOS 檔案 (ROM 1)"
+
+msgid "BIOS file (ROM #2)"
+msgstr "BIOS 檔案 (ROM 2)"
+
+msgid "BIOS file (ROM #3)"
+msgstr "BIOS 檔案 (ROM 3)"
+
+msgid "BIOS file (ROM #4)"
+msgstr "BIOS 檔案 (ROM 4)"
+
+msgid "BIOS address"
+msgstr "BIOS 位址"
+
+msgid "BIOS address (ROM #1)"
+msgstr "BIOS 位址 (ROM 1)"
+
+msgid "BIOS address (ROM #2)"
+msgstr "BIOS 位址 (ROM 2)"
+
+msgid "BIOS address (ROM #3)"
+msgstr "BIOS 位址 (ROM 3)"
+
+msgid "BIOS address (ROM #4)"
+msgstr "BIOS 位址 (ROM 4)"
+
+msgid "Enable BIOS extension ROM Writes"
+msgstr "啟用 BIOS 擴充 ROM 寫入"
+
+msgid "Enable BIOS extension ROM Writes (ROM #1)"
+msgstr "啟用 BIOS 擴充 ROM 寫入 (ROM 1)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #2)"
+msgstr "啟用 BIOS 擴充 ROM 寫入 (ROM 2)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #3)"
+msgstr "啟用 BIOS 擴充 ROM 寫入 (ROM 3)"
+
+msgid "Enable BIOS extension ROM Writes (ROM #4)"
+msgstr "啟用 BIOS 擴充 ROM 寫入 (ROM 4)"
+
+msgid "Linear framebuffer base"
+msgstr "線性圖框緩衝記憶體的底座"
+
+msgid "Address"
+msgstr "位址"
+
+msgid "IRQ"
+msgstr "IRQ"
+
+msgid "Serial port IRQ"
+msgstr "序列埠的 IRQ"
+
+msgid "Parallel port IRQ"
+msgstr "平行埠的 IRQ"
+
+msgid "BIOS Revision"
+msgstr "BIOS 版本"
+
+msgid "BIOS Version"
+msgstr "BIOS 版本"
+
+msgid "BIOS Language"
+msgstr "BIOS 語言"
+
+msgid "IBM 5161 Expansion Unit"
+msgstr "IBM 5161 擴充裝置"
+
+msgid "IBM Cassette Basic"
+msgstr "IBM 磁帶式 BASIC"
+
+msgid "Translate 26 -> 17"
+msgstr "轉換 26 -> 17"
+
+msgid "Language"
+msgstr "語言"
+
+msgid "Enable backlight"
+msgstr "啟用背光"
+
+msgid "Invert colors"
+msgstr "反轉顏色"
+
+msgid "BIOS size"
+msgstr "BIOS 大小"
+
+msgid "BIOS size (ROM #1)"
+msgstr "BIOS 大小 (ROM )"
+
+msgid "BIOS size (ROM #2)"
+msgstr "BIOS 大小 (ROM 2)"
+
+msgid "BIOS size (ROM #3)"
+msgstr "BIOS 大小 (ROM 3)"
+
+msgid "BIOS size (ROM #4)"
+msgstr "BIOS 大小 (ROM 4)"
+
+msgid "Map C0000-C7FFF as UMB"
+msgstr "映射 C0000-C7FFF 為 UMB"
+
+msgid "Map C8000-CFFFF as UMB"
+msgstr "映射 C8000-CFFFF 為 UMB"
+
+msgid "Map D0000-D7FFF as UMB"
+msgstr "映射 D0000-D7FFF 為 UMB"
+
+msgid "Map D8000-DFFFF as UMB"
+msgstr "映射 D8000-DFFFF 為 UMB"
+
+msgid "Map E0000-E7FFF as UMB"
+msgstr "映射 E0000-E7FFF 為 UMB"
+
+msgid "Map E8000-EFFFF as UMB"
+msgstr "映射 E8000-EFFFF 為 UMB"
+
+msgid "JS9 Jumper (JIM)"
+msgstr "JS9 跳線 (JIM)"
+
+msgid "MIDI Output Device"
+msgstr "MIDI 輸出裝置"
+
+msgid "MIDI Real time"
+msgstr "實時 MIDI"
+
+msgid "MIDI Thru"
+msgstr "MIDI 輸入直通"
+
+msgid "MIDI Clockout"
+msgstr "MIDI 時鐘輸出"
+
+msgid "SoundFont"
+msgstr "SoundFont"
+
+msgid "Output Gain"
+msgstr "輸出增益"
+
+msgid "Chorus"
+msgstr "合唱"
+
+msgid "Chorus Voices"
+msgstr "合唱聲部"
+
+msgid "Chorus Level"
+msgstr "合唱音量"
+
+msgid "Chorus Speed"
+msgstr "合唱速度"
+
+msgid "Chorus Depth"
+msgstr "合唱深度"
+
+msgid "Chorus Waveform"
+msgstr "合唱波形"
+
+msgid "Reverb"
+msgstr "混響"
+
+msgid "Reverb Room Size"
+msgstr "混響室的大小"
+
+msgid "Reverb Damping"
+msgstr "混響阻尼"
+
+msgid "Reverb Width"
+msgstr "混響寬度"
+
+msgid "Reverb Level"
+msgstr "混響電平"
+
+msgid "Interpolation Method"
+msgstr "插值方法"
+
+msgid "Dynamic Sample Loading"
+msgstr "樣品的動態載入"
+
+msgid "Reverb Output Gain"
+msgstr "迴響輸出增益"
+
+msgid "Reversed stereo"
+msgstr "反向立體聲"
+
+msgid "Nice ramp"
+msgstr "漂亮的斜坡"
+
+msgid "Hz"
+msgstr "赫茲"
+
+msgid "Buttons"
+msgstr "按鈕"
+
+msgid "Serial Port"
+msgstr "串列埠"
+
+msgid "RTS toggle"
+msgstr "RTS 切換"
+
+msgid "Revision"
+msgstr "修訂"
+
+msgid "Controller"
+msgstr "控制器"
+
+msgid "Show Crosshair"
+msgstr "顯示十字線"
+
+msgid "DMA"
+msgstr "DMA"
+
+msgid "MAC Address"
+msgstr "MAC 位址"
+
+msgid "MAC Address OUI"
+msgstr "MAC 位址的 OUI"
+
+msgid "Enable BIOS"
+msgstr "啟用 BIOS"
+
+msgid "Baud Rate"
+msgstr "鮑率"
+
+msgid "TCP/IP listening port"
+msgstr "TCP/IP 監聽埠"
+
+msgid "Phonebook File"
+msgstr "電話簿檔案"
+
+msgid "Telnet emulation"
+msgstr "Telnet 模擬"
+
+msgid "RAM Address"
+msgstr "RAM 位址"
+
+msgid "RAM size"
+msgstr "RAM 大小"
+
+msgid "Initial RAM size"
+msgstr "初始 RAM 大小"
+
+msgid "Serial Number"
+msgstr "序列號"
+
+msgid "Host ID"
+msgstr "主機 ID"
+
+msgid "FDC Address"
+msgstr "FDC 位址"
+
+msgid "MPU-401 Address"
+msgstr "MPU-401 位址"
+
+msgid "MPU-401 IRQ"
+msgstr "MPU-401 IRQ"
+
+msgid "Receive MIDI input"
+msgstr "接收 MIDI 輸入"
+
+msgid "Low DMA"
+msgstr "低 DMA"
+
+msgid "Enable Game port"
+msgstr "啟用遊戲埠"
+
+msgid "SID Model"
+msgstr "SID 型號"
+
+msgid "SID Filter Strength"
+msgstr "SID 過濾強度"
+
+msgid "Surround module"
+msgstr "環繞聲模組"
+
+msgid "CODEC"
+msgstr "CODEC"
+
+msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
+msgstr "在 CODEC 設定時啟動 CODEC 中斷 (某些驅動程式需要)"
+
+msgid "SB Address"
+msgstr "SB 位址"
+
+msgid "Adlib Address"
+msgstr "Adlib 位址"
+
+msgid "Use EEPROM setting"
+msgstr "使用 EEPROM 中的設定"
+
+msgid "WSS IRQ"
+msgstr "WSS IRQ"
+
+msgid "WSS DMA"
+msgstr "WSS DMA"
+
+msgid "Enable OPL"
+msgstr "啟用 OPL"
+
+msgid "Receive MIDI input (MPU-401)"
+msgstr "接收 MIDI 輸入 (MPU-401)"
+
+msgid "SB low DMA"
+msgstr "SB 低 DMA"
+
+msgid "6CH variant (6-channel)"
+msgstr "6CH 變數 (6 通道)"
+
+msgid "Enable CMS"
+msgstr "啟用 CMS"
+
+msgid "Mixer"
+msgstr "混音器"
+
+msgid "High DMA"
+msgstr "高 DMA"
+
+msgid "Control PC speaker"
+msgstr "控制電腦喇叭"
+
+msgid "Memory size"
+msgstr "記憶體大小"
+
+msgid "EMU8000 Address"
+msgstr "EMU8000 位址"
+
+msgid "IDE Controller"
+msgstr "IDE 控制器"
+
+msgid "Codec"
+msgstr "編解碼器"
+
+msgid "GUS type"
+msgstr "GUS 類型"
+
+msgid "Enable 0x04 \"Exit 86Box\" command"
+msgstr "啟用 0x04 \"退出 86Box\" 指令"
+
+msgid "Display type"
+msgstr "顯示類型"
+
+msgid "Composite type"
+msgstr "複合視訊類型"
+
+msgid "RGB type"
+msgstr "RGB 類型"
+
+msgid "Line doubling type"
+msgstr "行倍增類型"
+
+msgid "Snow emulation"
+msgstr "雪花模擬"
+
+msgid "Monitor type"
+msgstr "顯示器類型"
+
+msgid "Character set"
+msgstr "字元集"
+
+msgid "XGA type"
+msgstr "XGA 類型"
+
+msgid "Instance"
+msgstr "實例"
+
+msgid "MMIO Address"
+msgstr "MMIO 位址"
+
+msgid "RAMDAC type"
+msgstr "RAMDAC 類型"
+
+msgid "Blend"
+msgstr "混合"
+
+msgid "Font"
+msgstr "字型"
+
+msgid "Bilinear filtering"
+msgstr "雙線性濾波"
+
+msgid "Video chroma-keying"
+msgstr "視訊色鍵"
+
+msgid "Dithering"
+msgstr "抖動"
+
+msgid "Enable NMI for CGA emulation"
+msgstr "啟用 CGA 模擬的 NMI"
+
+msgid "Voodoo type"
+msgstr "Voodoo 類型"
+
+msgid "Framebuffer memory size"
+msgstr "影格緩衝記憶體大小"
+
+msgid "Texture memory size"
+msgstr "材質記憶體大小"
+
+msgid "Dither subtraction"
+msgstr "抖動減法"
+
+msgid "Screen Filter"
+msgstr "濾鏡"
+
+msgid "Render threads"
+msgstr "渲染執行緒"
+
+msgid "SLI"
+msgstr "SLI"
+
+msgid "Start Address"
+msgstr "起始位址"
+
+msgid "Contiguous Size"
+msgstr "連續大小"
+
+msgid "I/O Width"
+msgstr "I/O 寬度"
+
+msgid "Transfer Speed"
+msgstr "傳輸速度"
+
+msgid "EMS mode"
+msgstr "EMS 模式"
+
+msgid "EMS Address"
+msgstr "EMS 位址"
+
+msgid "EMS 1 Address"
+msgstr "EMS 1 位址"
+
+msgid "EMS 2 Address"
+msgstr "EMS 2 位址"
+
+msgid "EMS Memory Size"
+msgstr "EMS 記憶體大小"
+
+msgid "EMS 1 Memory Size"
+msgstr "EMS 1 記憶體大小"
+
+msgid "EMS 2 Memory Size"
+msgstr "EMS 2 記憶體大小"
+
+msgid "Enable EMS"
+msgstr "啟用 EMS"
+
+msgid "Enable EMS 1"
+msgstr "啟用 EMS 1"
+
+msgid "Enable EMS 2"
+msgstr "啟用 EMS 2"
+
+msgid "Address for > 2 MB"
+msgstr "> 2 MB 的位址"
+
+msgid "Frame Address"
+msgstr "影格位址"
+
+msgid "USA"
+msgstr "美國"
+
+msgid "Danish"
+msgstr "丹麥語"
+
+msgid "Always at selected speed"
+msgstr "永遠以所選速度運作"
+
+msgid "BIOS setting + Hotkeys (off during POST)"
+msgstr "BIOS 設定 + 熱鍵 (POST 期間關閉)"
+
+msgid "64 KB starting from F0000"
+msgstr "64 KB 從 F0000 開始"
+
+msgid "128 KB starting from E0000 (address MSB inverted, last 64 KB first)"
+msgstr "128 KB 從 E0000 開始 (位址 MSB 反轉，後 64 KB 為先)"
+
+msgid "Sine"
+msgstr "正弦"
+
+msgid "Triangle"
+msgstr "三角"
+
+msgid "Linear"
+msgstr "線性"
+
+msgid "4th Order"
+msgstr "四階"
+
+msgid "7th Order"
+msgstr "七階"
+
+msgid "Non-timed (original)"
+msgstr "非定時 (原始)"
+
+msgid "45 Hz (JMP2 not populated)"
+msgstr "45 Hz (JMP2 未填充)"
+
+msgid "Two"
+msgstr "二鍵"
+
+msgid "Three"
+msgstr "三鍵"
+
+msgid "Wheel"
+msgstr "滾輪"
+
+msgid "Five + Wheel"
+msgstr "五鍵 + 滾輪"
+
+msgid "Five + 2 Wheels"
+msgstr "五鍵 + 2 滾輪"
+
+msgid "A3 - SMT2 Serial / SMT3(R)V"
+msgstr "A3 - SMT2 序列 / SMT3(R)V"
+
+msgid "Q1 - SMT3(R) Serial"
+msgstr "Q1 - SMT3(R) 序列"
+
+msgid "8 KB"
+msgstr "8 KB"
+
+msgid "32 KB"
+msgstr "32 KB"
+
+msgid "16 KB"
+msgstr "16 KB"
+
+msgid "64 KB"
+msgstr "64 KB"
+
+msgid "Disable BIOS"
+msgstr "停用 BIOS"
+
+msgid "512 KB"
+msgstr "512 KB"
+
+msgid "2 MB"
+msgstr "2 MB"
+
+msgid "8 MB"
+msgstr "8 MB"
+
+msgid "28 MB"
+msgstr "28 MB"
+
+msgid "1 MB"
+msgstr "1 MB"
+
+msgid "4 MB"
+msgstr "4 MB"
+
+msgid "12 MB"
+msgstr "12 MB"
+
+msgid "16 MB"
+msgstr "16 MB"
+
+msgid "20 MB"
+msgstr "20 MB"
+
+msgid "24 MB"
+msgstr "24 MB"
+
+msgid "SigmaTel STAC9721T (stereo)"
+msgstr "SigmaTel STAC9721T (立體聲)"
+
+msgid "Classic"
+msgstr "經典"
+
+msgid "256 KB"
+msgstr "256 KB"
+
+msgid "Composite"
+msgstr "複合視訊"
+
+msgid "True color"
+msgstr "真實色彩"
+
+msgid "Old"
+msgstr "舊"
+
+msgid "New"
+msgstr "新"
+
+msgid "Color (generic)"
+msgstr "彩色（通用）"
+
+msgid "Green Monochrome"
+msgstr "綠色單色"
+
+msgid "Amber Monochrome"
+msgstr "琥珀單色"
+
+msgid "Gray Monochrome"
+msgstr "灰色單色"
+
+msgid "Color (no brown)"
+msgstr "彩色（無棕色）"
+
+msgid "Color (IBM 5153)"
+msgstr "彩色（IBM 5153）"
+
+msgid "Simple doubling"
+msgstr "簡單加倍"
+
+msgid "sRGB interpolation"
+msgstr "sRGB 插值"
+
+msgid "Linear interpolation"
+msgstr "線性插補"
+
+msgid "Has secondary 8x8 character set"
+msgstr "具有輔助 8x8 字元集"
+
+msgid "Has Quadcolor II daughter board"
+msgstr "具有 Quadcolor II 子板"
+
+msgid "Alternate monochrome contrast"
+msgstr "交替單色對比"
+
+msgid "128 KB"
+msgstr "128 KB"
+
+msgid "Monochrome (5151/MDA) (white)"
+msgstr "單色 (5151/MDA)（白色）"
+
+msgid "Monochrome (5151/MDA) (green)"
+msgstr "單色 (5151/MDA)（綠色）"
+
+msgid "Monochrome (5151/MDA) (amber)"
+msgstr "單色 (5151/MDA)（琥珀色）"
+
+msgid "Color 40x25 (5153/CGA)"
+msgstr "彩色 40x25 (5153/CGA)"
+
+msgid "Color 80x25 (5153/CGA)"
+msgstr "彩色 80x25 (5153/CGA)"
+
+msgid "Enhanced Color - Normal Mode (5154/ECD)"
+msgstr "增強彩色 - 一般模式 (5154/ECD)"
+
+msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
+msgstr "增強彩色 - 增強模式 (5154/ECD)"
+
+msgid "Green"
+msgstr "綠色"
+
+msgid "Amber"
+msgstr "琥珀色"
+
+msgid "Gray"
+msgstr "灰色"
+
+msgid "Grayscale"
+msgstr "灰階"
+
+msgid "Color"
+msgstr "顏色"
+
+msgid "U.S. English"
+msgstr "美國英語"
+
+msgid "Scandinavian"
+msgstr "斯堪的納維亞語"
+
+msgid "Other languages"
+msgstr "其他語言"
+
+msgid "Bochs latest"
+msgstr "Bochs 最新"
+
+msgid "Apply overscan deltas"
+msgstr "套用過掃描三角區"
+
+msgid "Mono Interlaced"
+msgstr "單色隔行扫描"
+
+msgid "Mono Non-Interlaced"
+msgstr "單色非隔行掃描"
+
+msgid "Color Interlaced"
+msgstr "彩色隔行扫描"
+
+msgid "Color Non-Interlaced"
+msgstr "彩色非隔行掃描"
+
+msgid "3Dfx Voodoo Graphics"
+msgstr "3Dfx Voodoo 圖形"
+
+msgid "3Dfx Voodoo 2"
+msgstr "3Dfx Voodoo 2"
+
+msgid "Obsidian SB50 + Amethyst (2 TMUs)"
+msgstr "Obsidian SB50 + Amethyst (2 TMU)"
+
+msgid "8-bit"
+msgstr "8 位元"
+
+msgid "16-bit"
+msgstr "16 位元"
+
+msgid "Standard (150ns)"
+msgstr "標準 (150ns)"
+
+msgid "High-Speed (120ns)"
+msgstr "高速 (120ns)"
+
+msgid "Enabled"
+msgstr "啟用"
+
+msgid "Standard"
+msgstr "標準"
+
+msgid "High-Speed"
+msgstr "高速"
+
+msgid "Stereo LPT DAC"
+msgstr "立體聲 LPT DAC"
+
+msgid "Generic Text Printer"
+msgstr "通用文字印表機"
+
+msgid "Generic ESC/P 2 Dot-Matrix Printer"
+msgstr "通用 ESC/P 2 點矩陣印表機"
+
+msgid "Generic PostScript Printer"
+msgstr "通用 PostScript 印表機"
+
+msgid "Generic PCL5e Printer"
+msgstr "通用 PCL5e 印表機"
+
+msgid "Parallel Line Internet Protocol"
+msgstr "Parallel Line Internet Protocol"
+
+msgid "Protection Dongle for Savage Quest"
+msgstr "用於 Savage Quest 的保護加密狗"
+
+msgid "Serial Passthrough Device"
+msgstr "序列埠的直通裝置"
+
+msgid "Passthrough Mode"
+msgstr "直通模式"
+
+msgid "Host Serial Device"
+msgstr "主機串列裝置"
+
+msgid "Name of pipe"
+msgstr "管道名稱"
+
+msgid "Data bits"
+msgstr "資料位元"
+
+msgid "Stop bits"
+msgstr "停止位元"
+
+msgid "Baud Rate of Passthrough"
+msgstr "直通的鮑率"
+
+msgid "Named Pipe (Server)"
+msgstr "已命名管道 (伺服器)"
+
+msgid "Named Pipe (Client)"
+msgstr "已命名管道 (用戶端)"
+
+msgid "Host Serial Passthrough"
+msgstr "主機序列埠的直通"
+
+msgid "E&ject %1"
+msgstr "退出 %1(&J)"
+
+msgid "&Unmute"
+msgstr "解除靜音(&U)"
+
+msgid "Softfloat FPU"
+msgstr "Softfloat FPU"
+
+msgid "High performance impact"
+msgstr "對效能影響大"
+
+msgid "[Generic] RAM Disk (max. speed)"
+msgstr "[通用] RAM 磁碟 (最大速度)"
+
+msgid "[Generic] 1989 (3500 RPM)"
+msgstr "[通用] 1989 (3500 轉速)"
+
+msgid "[Generic] 1992 (3600 RPM)"
+msgstr "[通用] 1992 (3600 轉速)"
+
+msgid "[Generic] 1994 (4500 RPM)"
+msgstr "[通用] 1994 (4500 轉速)"
+
+msgid "[Generic] 1996 (5400 RPM)"
+msgstr "[通用] 1996 (5400 轉速)"
+
+msgid "[Generic] 1997 (5400 RPM)"
+msgstr "[通用] 1997 (5400 轉速)"
+
+msgid "[Generic] 1998 (5400 RPM)"
+msgstr "[通用] 1998 (5400 轉速)"
+
+msgid "[Generic] 2000 (7200 RPM)"
+msgstr "[通用] 2000 (7200 轉速)"
+
+msgid "IBM 8514/A clone (ISA)"
+msgstr "IBM 8514/A 克隆 (ISA)"
+
+msgid "Vendor"
+msgstr "製造商"
+
+msgid "30 Hz (JMP2 = 1)"
+msgstr "30 Hz (JMP2 = 1)"
+
+msgid "60 Hz (JMP2 = 2)"
+msgstr "60 Hz (JMP2 = 2)"
+
+msgid "Generic PC/XT Memory Expansion"
+msgstr "通用 PC/XT 記憶體擴充"
+
+msgid "Generic PC/AT Memory Expansion"
+msgstr "通用 PC/AT 記憶體擴充"
+
+msgid "Unable to find Dot-Matrix fonts"
+msgstr "無法找到點矩陣字型"
+
+msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer."
+msgstr "通用 ESC/P 2 點矩陣印表機的模擬需要 \"roms/printer/fonts\" 目錄中的 TrueType 字體。"
+
+msgid "Inhibit multimedia keys"
+msgstr "禁止多媒體按鍵"
+
+msgid "Ask for confirmation before saving settings"
+msgstr "儲存設定前要求確認"
+
+msgid "Ask for confirmation before hard resetting"
+msgstr "硬體重設前要求確認"
+
+msgid "Ask for confirmation before quitting"
+msgstr "退出前請先確認"
+
+msgid "Options"
+msgstr "選項"
+
+msgid "Model"
+msgstr "型號"
+
+msgid "Model:"
+msgstr "型號:"
+
+msgid "Failed to initialize Vulkan renderer."
+msgstr "初始化 Vulkan 渲染器失敗。"
+
+msgid "GLSL Error"
+msgstr "GLSL 錯誤"
+
+msgid "Could not load shader: %1"
+msgstr "無法載入著色器: %1"
+
+msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
+msgstr "需要 OpenGL 版本 3.0 或更高。目前的 GLSL 版本為 %1.%2"
+
+msgid "Could not load texture: %1"
+msgstr "無法載入材質: %1"
+
+msgid "Could not compile shader:\n\n%1"
+msgstr "無法編譯著色器:\n\n%1"
+
+msgid "Program not linked:\n\n%1"
+msgstr "程式未連結:\n\n%1"
+
+msgid "Shader Manager"
+msgstr "著色器管理員"
+
+msgid "Shader Configuration"
+msgstr "著色器組態"
+
+msgid "Add"
+msgstr "新增"
+
+msgid "Move up"
+msgstr "上移"
+
+msgid "Move down"
+msgstr "下移"
+
+msgid "Could not load file %1"
+msgstr "無法載入檔案 %1"
+
+msgid "Key Bindings:"
+msgstr "按鍵綁定:"
+
+msgid "Action"
+msgstr "行動"
+
+msgid "Keybind"
+msgstr "鍵盤綁定"
+
+msgid "Clear binding"
+msgstr "透明裝訂"
+
+msgid "Bind"
+msgstr "綁定"
+
+msgid "Bind Key"
+msgstr "綁定按鍵"
+
+msgid "Enter key combo:"
+msgstr "輸入組合鍵:"
+
+msgid "Bind conflict"
+msgstr "綁定衝突"
+
+msgid "This key combo is already in use."
+msgstr "此組合鍵已在使用中。"
+
+msgid "Send Control+Alt+Del"
+msgstr "傳送 Control+Alt+Del"
+
+msgid "Send Control+Alt+Escape"
+msgstr "傳送 Control+Alt+Escape"
+
+msgid "Toggle fullscreen"
+msgstr "切換全螢幕"
+
+msgid "Screenshot"
+msgstr "螢幕截圖"
+
+msgid "Release mouse pointer"
+msgstr "放開滑鼠游標"
+
+msgid "Toggle pause"
+msgstr "切換暫停"
+
+msgid "Toggle mute"
+msgstr "切換靜音"
+
+msgid "Text files"
+msgstr "文字檔案"
+
+msgid "ROM files"
+msgstr "ROM 檔案"
+
+msgid "SoundFont files"
+msgstr "SoundFont 檔案"
+
+msgid "Local Switch"
+msgstr "本地交換器"
+
+msgid "Remote Switch"
+msgstr "遙控交換器"
+
+msgid "Switch:"
+msgstr "交換器:"
+
+msgid "Hub Mode"
+msgstr "集線器模式"
+
+msgid "Hostname:"
+msgstr "主機名稱:"
+
+msgid "ISA RAM:"
+msgstr "ISA RAM:"
+
+msgid "ISA ROM:"
+msgstr "ISA ROM:"
+
+msgid "&Wipe NVRAM"
+msgstr "清除(&W) NVRAM"
+
+msgid "This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?"
+msgstr "這將刪除位於 (\"nvr\" 子目錄中的) 虛擬機器的所有 NVRAM (和相關) 檔案。如果適用的話，您必須重新設定 BIOS (可能還有虛擬機器內的其他裝置) 設定。\n\n您確定要清除虛擬機 \"%1\" 的所有 NVRAM 內容嗎？"
+
+msgid "Success"
+msgstr "成功"
+
+msgid "Successfully wiped the NVRAM contents of the virtual machine \"%1\""
+msgstr "成功清除虛擬機 \"%1\" 的 NVRAM 內容"
+
+msgid "An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\""
+msgstr "嘗試清除虛擬機 \"%1\" 的 NVRAM 內容時發生錯誤"
+
+msgid "%1 VM Manager"
+msgstr "%1 虛擬機器管理員"
+
+msgid "%n disk(s)"
+msgstr "%n 磁碟"
+
+msgid "Unknown Status"
+msgstr "狀態不明"
+
+msgid "No Machines Found!"
+msgstr "找不到機器!"
+
+msgid "Check for updates on startup"
+msgstr "啟動時檢查更新"
+
+msgid "Unable to determine release information"
+msgstr "無法確定釋放資訊"
+
+msgid "There was an error checking for updates:\n\n%1\n\nPlease try again later."
+msgstr "檢查更新時出錯:\n'\n%1\n\n請稍後再試。"
+
+msgid "Update check complete"
+msgstr "更新檢查完成"
+
+msgid "stable"
+msgstr "穩定"
+
+msgid "beta"
+msgstr "測試版"
+
+msgid "You are running the latest %1 version of 86Box: %2"
+msgstr "您正在執行 86Box 的最新 %1 版本: %2"
+
+msgid "version"
+msgstr "版本"
+
+msgid "build"
+msgstr "建置"
+
+msgid "You are currently running version <b>%1</b>."
+msgstr "您目前執行的是 <b>%1</b> 版本。"
+
+msgid "<b>Version %1</b> is now available."
+msgstr "<b>版本 %1</b> 現在可用。"
+
+msgid "You are currently running build <b>%1</b>."
+msgstr "您目前執行的是 <b>%1</b> 建置。"
+
+msgid "<b>Build %1</b> is now available."
+msgstr "<b>建置 %1</b> 現在可用。"
+
+msgid "Would you like to visit the download page?"
+msgstr "您要造訪下載頁面嗎？"
+
+msgid "Visit download page"
+msgstr "造訪下載頁面"
+
+msgid "Update check"
+msgstr "更新檢查"
+
+msgid "Checking for updates..."
+msgstr "檢查更新..."
+
+msgid "86Box Update"
+msgstr "86Box 更新"
+
+msgid "Release notes:"
+msgstr "發佈說明:"
+
+msgid "%1 Hz"
+msgstr "%1 Hz"
+
+msgid "Virtual machine crash"
+msgstr "虛擬機當機"
+
+msgid "The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2."
+msgstr "虛擬機 \"%1\" 的進程以退出代碼 %2 意外終止。"
+
+msgid "The system will not be added."
+msgstr "系統將不會新增。"
+
+msgid "&Update mouse every CPU frame"
+msgstr "每 CPU 幀更新滑鼠(&U)"
+
+msgid "Hue"
+msgstr "色調"
+
+msgid "Saturation"
+msgstr "飽和度"
+
+msgid "Contrast"
+msgstr "對比"
+
+msgid "Brightness"
+msgstr "亮度"
+
+msgid "Sharpness"
+msgstr "銳利度"
+
+msgid "&CGA composite settings..."
+msgstr "CGA 複合模式的設定...(&C)"
+
+msgid "CGA composite settings"
+msgstr "CGA 複合模式的設定"
+
+msgid "Monitor EDID"
+msgstr "監視器的 EDID"
+
+msgid "Export..."
+msgstr "出口..."
+
+msgid "Export EDID"
+msgstr "匯出 EDID"
+
+msgid "EDID file \"%ls\" is too large."
+msgstr "EDID 檔案 \"%ls\" 太大。"
+
+msgid "OpenGL input scale"
+msgstr "OpenGL 的輸入比例"
+
+msgid "OpenGL input stretch mode"
+msgstr "OpenGL 的輸入拉伸模式"
+
+msgid "Color scheme"
+msgstr "配色方案"
+
+msgid "Light"
+msgstr "光"
+
+msgid "Dark"
+msgstr "黑暗"
diff --git a/src/qt/macos_event_filter.mm b/src/qt/macos_event_filter.mm
index ff4e7c4d2..45c8ecbe3 100644
--- a/src/qt/macos_event_filter.mm
+++ b/src/qt/macos_event_filter.mm
@@ -37,6 +37,7 @@ CocoaEventFilter::nativeEventFilter(const QByteArray &eventType, void *message,
                 return true;
             }
             if ([event type] == NSEventTypeScrollWheel) {
+                mouse_set_w(-[event deltaX]);
                 mouse_set_z([event deltaY]);
                 return true;
             }
diff --git a/src/qt/qdarkstyle/dark/darkstyle.qrc b/src/qt/qdarkstyle/dark/darkstyle.qrc
new file mode 100644
index 000000000..ce0d85be6
--- /dev/null
+++ b/src/qt/qdarkstyle/dark/darkstyle.qrc
@@ -0,0 +1,216 @@
+
+<RCC warning="WARNING! File created programmatically. All changes made in this file will be lost!">
+  <qresource prefix="qss_icons/dark">
+    <file>rc/arrow_down.png</file>
+    <file>rc/arrow_down@2x.png</file>
+    <file>rc/arrow_down_disabled.png</file>
+    <file>rc/arrow_down_disabled@2x.png</file>
+    <file>rc/arrow_down_focus.png</file>
+    <file>rc/arrow_down_focus@2x.png</file>
+    <file>rc/arrow_down_pressed.png</file>
+    <file>rc/arrow_down_pressed@2x.png</file>
+    <file>rc/arrow_left.png</file>
+    <file>rc/arrow_left@2x.png</file>
+    <file>rc/arrow_left_disabled.png</file>
+    <file>rc/arrow_left_disabled@2x.png</file>
+    <file>rc/arrow_left_focus.png</file>
+    <file>rc/arrow_left_focus@2x.png</file>
+    <file>rc/arrow_left_pressed.png</file>
+    <file>rc/arrow_left_pressed@2x.png</file>
+    <file>rc/arrow_right.png</file>
+    <file>rc/arrow_right@2x.png</file>
+    <file>rc/arrow_right_disabled.png</file>
+    <file>rc/arrow_right_disabled@2x.png</file>
+    <file>rc/arrow_right_focus.png</file>
+    <file>rc/arrow_right_focus@2x.png</file>
+    <file>rc/arrow_right_pressed.png</file>
+    <file>rc/arrow_right_pressed@2x.png</file>
+    <file>rc/arrow_up.png</file>
+    <file>rc/arrow_up@2x.png</file>
+    <file>rc/arrow_up_disabled.png</file>
+    <file>rc/arrow_up_disabled@2x.png</file>
+    <file>rc/arrow_up_focus.png</file>
+    <file>rc/arrow_up_focus@2x.png</file>
+    <file>rc/arrow_up_pressed.png</file>
+    <file>rc/arrow_up_pressed@2x.png</file>
+    <file>rc/base_icon.png</file>
+    <file>rc/base_icon@2x.png</file>
+    <file>rc/base_icon_disabled.png</file>
+    <file>rc/base_icon_disabled@2x.png</file>
+    <file>rc/base_icon_focus.png</file>
+    <file>rc/base_icon_focus@2x.png</file>
+    <file>rc/base_icon_pressed.png</file>
+    <file>rc/base_icon_pressed@2x.png</file>
+    <file>rc/branch_closed.png</file>
+    <file>rc/branch_closed@2x.png</file>
+    <file>rc/branch_closed_disabled.png</file>
+    <file>rc/branch_closed_disabled@2x.png</file>
+    <file>rc/branch_closed_focus.png</file>
+    <file>rc/branch_closed_focus@2x.png</file>
+    <file>rc/branch_closed_pressed.png</file>
+    <file>rc/branch_closed_pressed@2x.png</file>
+    <file>rc/branch_end.png</file>
+    <file>rc/branch_end@2x.png</file>
+    <file>rc/branch_end_disabled.png</file>
+    <file>rc/branch_end_disabled@2x.png</file>
+    <file>rc/branch_end_focus.png</file>
+    <file>rc/branch_end_focus@2x.png</file>
+    <file>rc/branch_end_pressed.png</file>
+    <file>rc/branch_end_pressed@2x.png</file>
+    <file>rc/branch_line.png</file>
+    <file>rc/branch_line@2x.png</file>
+    <file>rc/branch_line_disabled.png</file>
+    <file>rc/branch_line_disabled@2x.png</file>
+    <file>rc/branch_line_focus.png</file>
+    <file>rc/branch_line_focus@2x.png</file>
+    <file>rc/branch_line_pressed.png</file>
+    <file>rc/branch_line_pressed@2x.png</file>
+    <file>rc/branch_more.png</file>
+    <file>rc/branch_more@2x.png</file>
+    <file>rc/branch_more_disabled.png</file>
+    <file>rc/branch_more_disabled@2x.png</file>
+    <file>rc/branch_more_focus.png</file>
+    <file>rc/branch_more_focus@2x.png</file>
+    <file>rc/branch_more_pressed.png</file>
+    <file>rc/branch_more_pressed@2x.png</file>
+    <file>rc/branch_open.png</file>
+    <file>rc/branch_open@2x.png</file>
+    <file>rc/branch_open_disabled.png</file>
+    <file>rc/branch_open_disabled@2x.png</file>
+    <file>rc/branch_open_focus.png</file>
+    <file>rc/branch_open_focus@2x.png</file>
+    <file>rc/branch_open_pressed.png</file>
+    <file>rc/branch_open_pressed@2x.png</file>
+    <file>rc/checkbox_checked.png</file>
+    <file>rc/checkbox_checked@2x.png</file>
+    <file>rc/checkbox_checked_disabled.png</file>
+    <file>rc/checkbox_checked_disabled@2x.png</file>
+    <file>rc/checkbox_checked_focus.png</file>
+    <file>rc/checkbox_checked_focus@2x.png</file>
+    <file>rc/checkbox_checked_pressed.png</file>
+    <file>rc/checkbox_checked_pressed@2x.png</file>
+    <file>rc/checkbox_indeterminate.png</file>
+    <file>rc/checkbox_indeterminate@2x.png</file>
+    <file>rc/checkbox_indeterminate_disabled.png</file>
+    <file>rc/checkbox_indeterminate_disabled@2x.png</file>
+    <file>rc/checkbox_indeterminate_focus.png</file>
+    <file>rc/checkbox_indeterminate_focus@2x.png</file>
+    <file>rc/checkbox_indeterminate_pressed.png</file>
+    <file>rc/checkbox_indeterminate_pressed@2x.png</file>
+    <file>rc/checkbox_unchecked.png</file>
+    <file>rc/checkbox_unchecked@2x.png</file>
+    <file>rc/checkbox_unchecked_disabled.png</file>
+    <file>rc/checkbox_unchecked_disabled@2x.png</file>
+    <file>rc/checkbox_unchecked_focus.png</file>
+    <file>rc/checkbox_unchecked_focus@2x.png</file>
+    <file>rc/checkbox_unchecked_pressed.png</file>
+    <file>rc/checkbox_unchecked_pressed@2x.png</file>
+    <file>rc/line_horizontal.png</file>
+    <file>rc/line_horizontal@2x.png</file>
+    <file>rc/line_horizontal_disabled.png</file>
+    <file>rc/line_horizontal_disabled@2x.png</file>
+    <file>rc/line_horizontal_focus.png</file>
+    <file>rc/line_horizontal_focus@2x.png</file>
+    <file>rc/line_horizontal_pressed.png</file>
+    <file>rc/line_horizontal_pressed@2x.png</file>
+    <file>rc/line_vertical.png</file>
+    <file>rc/line_vertical@2x.png</file>
+    <file>rc/line_vertical_disabled.png</file>
+    <file>rc/line_vertical_disabled@2x.png</file>
+    <file>rc/line_vertical_focus.png</file>
+    <file>rc/line_vertical_focus@2x.png</file>
+    <file>rc/line_vertical_pressed.png</file>
+    <file>rc/line_vertical_pressed@2x.png</file>
+    <file>rc/radio_checked.png</file>
+    <file>rc/radio_checked@2x.png</file>
+    <file>rc/radio_checked_disabled.png</file>
+    <file>rc/radio_checked_disabled@2x.png</file>
+    <file>rc/radio_checked_focus.png</file>
+    <file>rc/radio_checked_focus@2x.png</file>
+    <file>rc/radio_checked_pressed.png</file>
+    <file>rc/radio_checked_pressed@2x.png</file>
+    <file>rc/radio_unchecked.png</file>
+    <file>rc/radio_unchecked@2x.png</file>
+    <file>rc/radio_unchecked_disabled.png</file>
+    <file>rc/radio_unchecked_disabled@2x.png</file>
+    <file>rc/radio_unchecked_focus.png</file>
+    <file>rc/radio_unchecked_focus@2x.png</file>
+    <file>rc/radio_unchecked_pressed.png</file>
+    <file>rc/radio_unchecked_pressed@2x.png</file>
+    <file>rc/toolbar_move_horizontal.png</file>
+    <file>rc/toolbar_move_horizontal@2x.png</file>
+    <file>rc/toolbar_move_horizontal_disabled.png</file>
+    <file>rc/toolbar_move_horizontal_disabled@2x.png</file>
+    <file>rc/toolbar_move_horizontal_focus.png</file>
+    <file>rc/toolbar_move_horizontal_focus@2x.png</file>
+    <file>rc/toolbar_move_horizontal_pressed.png</file>
+    <file>rc/toolbar_move_horizontal_pressed@2x.png</file>
+    <file>rc/toolbar_move_vertical.png</file>
+    <file>rc/toolbar_move_vertical@2x.png</file>
+    <file>rc/toolbar_move_vertical_disabled.png</file>
+    <file>rc/toolbar_move_vertical_disabled@2x.png</file>
+    <file>rc/toolbar_move_vertical_focus.png</file>
+    <file>rc/toolbar_move_vertical_focus@2x.png</file>
+    <file>rc/toolbar_move_vertical_pressed.png</file>
+    <file>rc/toolbar_move_vertical_pressed@2x.png</file>
+    <file>rc/toolbar_separator_horizontal.png</file>
+    <file>rc/toolbar_separator_horizontal@2x.png</file>
+    <file>rc/toolbar_separator_horizontal_disabled.png</file>
+    <file>rc/toolbar_separator_horizontal_disabled@2x.png</file>
+    <file>rc/toolbar_separator_horizontal_focus.png</file>
+    <file>rc/toolbar_separator_horizontal_focus@2x.png</file>
+    <file>rc/toolbar_separator_horizontal_pressed.png</file>
+    <file>rc/toolbar_separator_horizontal_pressed@2x.png</file>
+    <file>rc/toolbar_separator_vertical.png</file>
+    <file>rc/toolbar_separator_vertical@2x.png</file>
+    <file>rc/toolbar_separator_vertical_disabled.png</file>
+    <file>rc/toolbar_separator_vertical_disabled@2x.png</file>
+    <file>rc/toolbar_separator_vertical_focus.png</file>
+    <file>rc/toolbar_separator_vertical_focus@2x.png</file>
+    <file>rc/toolbar_separator_vertical_pressed.png</file>
+    <file>rc/toolbar_separator_vertical_pressed@2x.png</file>
+    <file>rc/transparent.png</file>
+    <file>rc/transparent@2x.png</file>
+    <file>rc/transparent_disabled.png</file>
+    <file>rc/transparent_disabled@2x.png</file>
+    <file>rc/transparent_focus.png</file>
+    <file>rc/transparent_focus@2x.png</file>
+    <file>rc/transparent_pressed.png</file>
+    <file>rc/transparent_pressed@2x.png</file>
+    <file>rc/window_close.png</file>
+    <file>rc/window_close@2x.png</file>
+    <file>rc/window_close_disabled.png</file>
+    <file>rc/window_close_disabled@2x.png</file>
+    <file>rc/window_close_focus.png</file>
+    <file>rc/window_close_focus@2x.png</file>
+    <file>rc/window_close_pressed.png</file>
+    <file>rc/window_close_pressed@2x.png</file>
+    <file>rc/window_grip.png</file>
+    <file>rc/window_grip@2x.png</file>
+    <file>rc/window_grip_disabled.png</file>
+    <file>rc/window_grip_disabled@2x.png</file>
+    <file>rc/window_grip_focus.png</file>
+    <file>rc/window_grip_focus@2x.png</file>
+    <file>rc/window_grip_pressed.png</file>
+    <file>rc/window_grip_pressed@2x.png</file>
+    <file>rc/window_minimize.png</file>
+    <file>rc/window_minimize@2x.png</file>
+    <file>rc/window_minimize_disabled.png</file>
+    <file>rc/window_minimize_disabled@2x.png</file>
+    <file>rc/window_minimize_focus.png</file>
+    <file>rc/window_minimize_focus@2x.png</file>
+    <file>rc/window_minimize_pressed.png</file>
+    <file>rc/window_minimize_pressed@2x.png</file>
+    <file>rc/window_undock.png</file>
+    <file>rc/window_undock@2x.png</file>
+    <file>rc/window_undock_disabled.png</file>
+    <file>rc/window_undock_disabled@2x.png</file>
+    <file>rc/window_undock_focus.png</file>
+    <file>rc/window_undock_focus@2x.png</file>
+    <file>rc/window_undock_pressed.png</file>
+    <file>rc/window_undock_pressed@2x.png</file>
+  </qresource>
+  <qresource prefix="qdarkstyle/dark">
+      <file>darkstyle.qss</file>
+  </qresource>
+</RCC>
diff --git a/src/qt/qdarkstyle/dark/darkstyle.qss b/src/qt/qdarkstyle/dark/darkstyle.qss
new file mode 100644
index 000000000..134d6708e
--- /dev/null
+++ b/src/qt/qdarkstyle/dark/darkstyle.qss
@@ -0,0 +1,2204 @@
+/* ---------------------------------------------------------------------------
+
+    WARNING! File created programmatically. All changes made in this file will be lost!
+
+    Created by the qtsass compiler v0.4.0
+
+    The definitions are in the "qdarkstyle.qss._styles.scss" module
+
+--------------------------------------------------------------------------- */
+/* Light Style - QDarkStyleSheet ------------------------------------------ */
+/*
+
+See Qt documentation:
+
+  - https://doc.qt.io/qt-5/stylesheet.html
+  - https://doc.qt.io/qt-5/stylesheet-reference.html
+  - https://doc.qt.io/qt-5/stylesheet-examples.html
+
+--------------------------------------------------------------------------- */
+/* Reset elements ------------------------------------------------------------
+
+Resetting everything helps to unify styles across different operating systems
+
+--------------------------------------------------------------------------- */
+
+/* Changed to be fully grayscale. */
+
+* {
+  padding: 0px;
+  margin: 0px;
+  border: 0px;
+  border-style: none;
+  border-image: none;
+  outline: 0;
+}
+
+/* specific reset for elements inside QToolBar */
+QToolBar * {
+  margin: 0px;
+  padding: 0px;
+}
+
+/* QWidget ----------------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QWidget {
+  background-color: #272727;
+  border: 0px solid #525252;
+  padding: 0px;
+  color: #E3E3E3;
+  selection-background-color: #616161;
+  selection-color: #E3E3E3;
+}
+
+QWidget:disabled {
+  background-color: #272727;
+  color: #8B8B8B;
+  selection-background-color: #444444;
+  selection-color: #8B8B8B;
+}
+
+QWidget::item:selected {
+  background-color: #616161;
+}
+
+QWidget::item:hover:!selected {
+  background-color: #666666;
+}
+
+/* QMainWindow ------------------------------------------------------------
+
+This adjusts the splitter in the dock widget, not qsplitter
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmainwindow
+
+--------------------------------------------------------------------------- */
+QMainWindow::separator {
+  background-color: #525252;
+  border: 0px solid #272727;
+  spacing: 0px;
+  padding: 2px;
+}
+
+QMainWindow::separator:hover {
+  background-color: #767676;
+  border: 0px solid #666666;
+}
+
+QMainWindow::separator:horizontal {
+  width: 5px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  image: url(":/qss_icons/dark/rc/toolbar_separator_vertical.png");
+}
+
+QMainWindow::separator:vertical {
+  height: 5px;
+  margin-left: 2px;
+  margin-right: 2px;
+  image: url(":/qss_icons/dark/rc/toolbar_separator_horizontal.png");
+}
+
+/* QToolTip ---------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtooltip
+
+--------------------------------------------------------------------------- */
+QToolTip {
+  background-color: #616161;
+  color: #E3E3E3;
+  /* If you remove the border property, background stops working on Windows */
+  border: none;
+  /* Remove padding, for fix combo box tooltip */
+  padding: 0px;
+  /* Remove opacity, fix #174 - may need to use RGBA */
+}
+
+/* QStatusBar -------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qstatusbar
+
+--------------------------------------------------------------------------- */
+QStatusBar {
+  border: 1px solid #272727;
+  /* Fixes Spyder #9120, #9121 */
+  background: #272727;
+  /* Fixes #205, white vertical borders separating items */
+}
+
+QStatusBar::item {
+  border: none;
+}
+
+QStatusBar QLabel {
+  /* Fixes Spyder #9120, #9121 */
+  background: transparent;
+  padding: 0px;
+}
+
+/* QCheckBox --------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcheckbox
+
+--------------------------------------------------------------------------- */
+QCheckBox {
+  background-color: #272727;
+  color: #E3E3E3;
+  spacing: 4px;
+  outline: none;
+  padding-top: 4px;
+  padding-bottom: 4px;
+}
+
+QCheckBox:focus {
+  border: none;
+}
+
+QCheckBox QWidget:disabled {
+  background-color: #272727;
+  color: #8B8B8B;
+}
+
+QCheckBox::indicator {
+  margin-left: 2px;
+  height: 14px;
+  width: 14px;
+}
+
+QCheckBox::indicator:unchecked {
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked.png");
+}
+
+QCheckBox::indicator:unchecked:hover, QCheckBox::indicator:unchecked:focus, QCheckBox::indicator:unchecked:pressed {
+  border: none;
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked_focus.png");
+}
+
+QCheckBox::indicator:unchecked:disabled {
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked_disabled.png");
+}
+
+QCheckBox::indicator:checked {
+  image: url(":/qss_icons/dark/rc/checkbox_checked.png");
+}
+
+QCheckBox::indicator:checked:hover, QCheckBox::indicator:checked:focus, QCheckBox::indicator:checked:pressed {
+  border: none;
+  image: url(":/qss_icons/dark/rc/checkbox_checked_focus.png");
+}
+
+QCheckBox::indicator:checked:disabled {
+  image: url(":/qss_icons/dark/rc/checkbox_checked_disabled.png");
+}
+
+QCheckBox::indicator:indeterminate {
+  image: url(":/qss_icons/dark/rc/checkbox_indeterminate.png");
+}
+
+QCheckBox::indicator:indeterminate:disabled {
+  image: url(":/qss_icons/dark/rc/checkbox_indeterminate_disabled.png");
+}
+
+QCheckBox::indicator:indeterminate:focus, QCheckBox::indicator:indeterminate:hover, QCheckBox::indicator:indeterminate:pressed {
+  image: url(":/qss_icons/dark/rc/checkbox_indeterminate_focus.png");
+}
+
+/* QGroupBox --------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qgroupbox
+
+--------------------------------------------------------------------------- */
+QGroupBox {
+  font-weight: bold;
+  border: 1px solid #525252;
+  border-radius: 4px;
+  padding: 2px;
+  margin-top: 6px;
+  margin-bottom: 4px;
+}
+
+QGroupBox::title {
+  subcontrol-origin: margin;
+  subcontrol-position: top left;
+  left: 4px;
+  padding-left: 2px;
+  padding-right: 4px;
+  padding-top: -4px;
+}
+
+QGroupBox::indicator {
+  margin-left: 2px;
+  margin-top: 2px;
+  padding: 0;
+  height: 14px;
+  width: 14px;
+}
+
+QGroupBox::indicator:unchecked {
+  border: none;
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked.png");
+}
+
+QGroupBox::indicator:unchecked:hover, QGroupBox::indicator:unchecked:focus, QGroupBox::indicator:unchecked:pressed {
+  border: none;
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked_focus.png");
+}
+
+QGroupBox::indicator:unchecked:disabled {
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked_disabled.png");
+}
+
+QGroupBox::indicator:checked {
+  border: none;
+  image: url(":/qss_icons/dark/rc/checkbox_checked.png");
+}
+
+QGroupBox::indicator:checked:hover, QGroupBox::indicator:checked:focus, QGroupBox::indicator:checked:pressed {
+  border: none;
+  image: url(":/qss_icons/dark/rc/checkbox_checked_focus.png");
+}
+
+QGroupBox::indicator:checked:disabled {
+  image: url(":/qss_icons/dark/rc/checkbox_checked_disabled.png");
+}
+
+/* QRadioButton -----------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qradiobutton
+
+--------------------------------------------------------------------------- */
+QRadioButton {
+  background-color: #272727;
+  color: #E3E3E3;
+  spacing: 4px;
+  padding-top: 4px;
+  padding-bottom: 4px;
+  border: none;
+  outline: none;
+}
+
+QRadioButton:focus {
+  border: none;
+}
+
+QRadioButton:disabled {
+  background-color: #272727;
+  color: #8B8B8B;
+  border: none;
+  outline: none;
+}
+
+QRadioButton QWidget {
+  background-color: #272727;
+  color: #E3E3E3;
+  spacing: 0px;
+  padding: 0px;
+  outline: none;
+  border: none;
+}
+
+QRadioButton::indicator {
+  border: none;
+  outline: none;
+  margin-left: 2px;
+  height: 14px;
+  width: 14px;
+}
+
+QRadioButton::indicator:unchecked {
+  image: url(":/qss_icons/dark/rc/radio_unchecked.png");
+}
+
+QRadioButton::indicator:unchecked:hover, QRadioButton::indicator:unchecked:focus, QRadioButton::indicator:unchecked:pressed {
+  border: none;
+  outline: none;
+  image: url(":/qss_icons/dark/rc/radio_unchecked_focus.png");
+}
+
+QRadioButton::indicator:unchecked:disabled {
+  image: url(":/qss_icons/dark/rc/radio_unchecked_disabled.png");
+}
+
+QRadioButton::indicator:checked {
+  border: none;
+  outline: none;
+  image: url(":/qss_icons/dark/rc/radio_checked.png");
+}
+
+QRadioButton::indicator:checked:hover, QRadioButton::indicator:checked:focus, QRadioButton::indicator:checked:pressed {
+  border: none;
+  outline: none;
+  image: url(":/qss_icons/dark/rc/radio_checked_focus.png");
+}
+
+QRadioButton::indicator:checked:disabled {
+  outline: none;
+  image: url(":/qss_icons/dark/rc/radio_checked_disabled.png");
+}
+
+/* QMenuBar ---------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenubar
+
+--------------------------------------------------------------------------- */
+QMenuBar {
+  background-color: #272727;
+  padding: 2px;
+  border: 1px solid #525252;
+  color: #E3E3E3;
+  selection-background-color: #666666;
+}
+
+QMenuBar:focus {
+  border: 1px solid #616161;
+}
+
+QMenuBar::item {
+  background: transparent;
+  padding-left: 7px;
+  padding-right: 7px;
+}
+
+QMenuBar::item:selected {
+  padding: 4px;
+  background: transparent;
+  border: 0px solid #525252;
+  background-color: #383838;
+}
+
+QMenuBar::item:pressed {
+  padding: 4px;
+  border: 0px solid #525252;
+  background-color: #383838;
+  color: #E3E3E3;
+}
+
+/* QMenu ------------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenu
+
+--------------------------------------------------------------------------- */
+QMenu {
+  border: 0px solid #525252;
+  color: #E3E3E3;
+  margin: 0px;
+  background-color: #2C2C2C;
+  selection-background-color: #666666;
+}
+
+QMenu::separator {
+  height: 1px;
+  background-color: #767676;
+  color: #E3E3E3;
+}
+
+QMenu::item {
+  background-color: #2C2C2C;
+  padding: 4px 24px 4px 28px;
+  /* Reserve space for selection border */
+  border: 1px transparent #525252;
+}
+
+QMenu::item:selected {
+  color: #E3E3E3;
+  background-color: #353535;
+}
+
+QMenu::item:pressed {
+  background-color: #353535;
+}
+
+QMenu::icon {
+  padding-left: 10px;
+  width: 14px;
+  height: 14px;
+}
+
+QMenu::indicator {
+  padding-left: 8px;
+  width: 12px;
+  height: 12px;
+  /* non-exclusive indicator = check box style indicator (see QActionGroup::setExclusive) */
+  /* exclusive indicator = radio button style indicator (see QActionGroup::setExclusive) */
+}
+
+QMenu::indicator:non-exclusive:unchecked {
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked.png");
+}
+
+QMenu::indicator:non-exclusive:unchecked:hover, QMenu::indicator:non-exclusive:unchecked:focus, QMenu::indicator:non-exclusive:unchecked:pressed {
+  border: none;
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked_focus.png");
+}
+
+QMenu::indicator:non-exclusive:unchecked:disabled {
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked_disabled.png");
+}
+
+QMenu::indicator:non-exclusive:checked {
+  image: url(":/qss_icons/dark/rc/checkbox_checked.png");
+}
+
+QMenu::indicator:non-exclusive:checked:hover, QMenu::indicator:non-exclusive:checked:focus, QMenu::indicator:non-exclusive:checked:pressed {
+  border: none;
+  image: url(":/qss_icons/dark/rc/checkbox_checked_focus.png");
+}
+
+QMenu::indicator:non-exclusive:checked:disabled {
+  image: url(":/qss_icons/dark/rc/checkbox_checked_disabled.png");
+}
+
+QMenu::indicator:non-exclusive:indeterminate {
+  image: url(":/qss_icons/dark/rc/checkbox_indeterminate.png");
+}
+
+QMenu::indicator:non-exclusive:indeterminate:disabled {
+  image: url(":/qss_icons/dark/rc/checkbox_indeterminate_disabled.png");
+}
+
+QMenu::indicator:non-exclusive:indeterminate:focus, QMenu::indicator:non-exclusive:indeterminate:hover, QMenu::indicator:non-exclusive:indeterminate:pressed {
+  image: url(":/qss_icons/dark/rc/checkbox_indeterminate_focus.png");
+}
+
+QMenu::indicator:exclusive:unchecked {
+  image: url(":/qss_icons/dark/rc/radio_unchecked.png");
+}
+
+QMenu::indicator:exclusive:unchecked:hover, QMenu::indicator:exclusive:unchecked:focus, QMenu::indicator:exclusive:unchecked:pressed {
+  border: none;
+  outline: none;
+  image: url(":/qss_icons/dark/rc/radio_unchecked_focus.png");
+}
+
+QMenu::indicator:exclusive:unchecked:disabled {
+  image: url(":/qss_icons/dark/rc/radio_unchecked_disabled.png");
+}
+
+QMenu::indicator:exclusive:checked {
+  border: none;
+  outline: none;
+  image: url(":/qss_icons/dark/rc/radio_checked.png");
+}
+
+QMenu::indicator:exclusive:checked:hover, QMenu::indicator:exclusive:checked:focus, QMenu::indicator:exclusive:checked:pressed {
+  border: none;
+  outline: none;
+  image: url(":/qss_icons/dark/rc/radio_checked_focus.png");
+}
+
+QMenu::indicator:exclusive:checked:disabled {
+  outline: none;
+  image: url(":/qss_icons/dark/rc/radio_checked_disabled.png");
+}
+
+QMenu::right-arrow {
+  margin: 5px;
+  padding-left: 12px;
+  image: url(":/qss_icons/dark/rc/arrow_right.png");
+  height: 12px;
+  width: 12px;
+}
+
+/* QAbstractItemView ------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
+
+--------------------------------------------------------------------------- */
+QAbstractItemView {
+  alternate-background-color: #272727;
+  color: #E3E3E3;
+  border: 1px solid #525252;
+  border-radius: 4px;
+}
+
+QAbstractItemView QLineEdit {
+  padding: 2px;
+}
+
+/* QAbstractScrollArea ----------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qabstractscrollarea
+
+--------------------------------------------------------------------------- */
+QAbstractScrollArea {
+  background-color: #272727;
+  border: 1px solid #525252;
+  border-radius: 4px;
+  /* fix #159 */
+  padding: 2px;
+  /* remove min-height to fix #244 */
+  color: #E3E3E3;
+}
+
+QAbstractScrollArea:disabled {
+  color: #8B8B8B;
+}
+
+/* QScrollArea ------------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QScrollArea QWidget QWidget:disabled {
+  background-color: #272727;
+}
+
+/* QScrollBar -------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qscrollbar
+
+--------------------------------------------------------------------------- */
+QScrollBar:horizontal {
+  height: 16px;
+  margin: 2px 16px 2px 16px;
+  border: 1px solid #525252;
+  border-radius: 4px;
+  background-color: #272727;
+}
+
+QScrollBar:vertical {
+  background-color: #272727;
+  width: 16px;
+  margin: 16px 2px 16px 2px;
+  border: 1px solid #525252;
+  border-radius: 4px;
+}
+
+QScrollBar::handle:horizontal {
+  background-color: #767676;
+  border: 1px solid #525252;
+  border-radius: 4px;
+  min-width: 8px;
+}
+
+QScrollBar::handle:horizontal:hover {
+  background-color: #616161;
+  border: #616161;
+  border-radius: 4px;
+  min-width: 8px;
+}
+
+QScrollBar::handle:horizontal:focus {
+  border: 1px solid #666666;
+}
+
+QScrollBar::handle:vertical {
+  background-color: #767676;
+  border: 1px solid #525252;
+  min-height: 8px;
+  border-radius: 4px;
+}
+
+QScrollBar::handle:vertical:hover {
+  background-color: #616161;
+  border: #616161;
+  border-radius: 4px;
+  min-height: 8px;
+}
+
+QScrollBar::handle:vertical:focus {
+  border: 1px solid #666666;
+}
+
+QScrollBar::add-line:horizontal {
+  margin: 0px 0px 0px 0px;
+  border-image: url(":/qss_icons/dark/rc/arrow_right_disabled.png");
+  height: 12px;
+  width: 12px;
+  subcontrol-position: right;
+  subcontrol-origin: margin;
+}
+
+QScrollBar::add-line:horizontal:hover, QScrollBar::add-line:horizontal:on {
+  border-image: url(":/qss_icons/dark/rc/arrow_right.png");
+  height: 12px;
+  width: 12px;
+  subcontrol-position: right;
+  subcontrol-origin: margin;
+}
+
+QScrollBar::add-line:vertical {
+  margin: 3px 0px 3px 0px;
+  border-image: url(":/qss_icons/dark/rc/arrow_down_disabled.png");
+  height: 12px;
+  width: 12px;
+  subcontrol-position: bottom;
+  subcontrol-origin: margin;
+}
+
+QScrollBar::add-line:vertical:hover, QScrollBar::add-line:vertical:on {
+  border-image: url(":/qss_icons/dark/rc/arrow_down.png");
+  height: 12px;
+  width: 12px;
+  subcontrol-position: bottom;
+  subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:horizontal {
+  margin: 0px 3px 0px 3px;
+  border-image: url(":/qss_icons/dark/rc/arrow_left_disabled.png");
+  height: 12px;
+  width: 12px;
+  subcontrol-position: left;
+  subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:horizontal:hover, QScrollBar::sub-line:horizontal:on {
+  border-image: url(":/qss_icons/dark/rc/arrow_left.png");
+  height: 12px;
+  width: 12px;
+  subcontrol-position: left;
+  subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:vertical {
+  margin: 3px 0px 3px 0px;
+  border-image: url(":/qss_icons/dark/rc/arrow_up_disabled.png");
+  height: 12px;
+  width: 12px;
+  subcontrol-position: top;
+  subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:vertical:hover, QScrollBar::sub-line:vertical:on {
+  border-image: url(":/qss_icons/dark/rc/arrow_up.png");
+  height: 12px;
+  width: 12px;
+  subcontrol-position: top;
+  subcontrol-origin: margin;
+}
+
+QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal {
+  background: none;
+}
+
+QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
+  background: none;
+}
+
+QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
+  background: none;
+}
+
+QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
+  background: none;
+}
+
+/* QTextEdit --------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-specific-widgets
+
+--------------------------------------------------------------------------- */
+QTextEdit {
+  background-color: #272727;
+  color: #E3E3E3;
+  border-radius: 4px;
+  border: 1px solid #525252;
+}
+
+QTextEdit:focus {
+  border: 1px solid #666666;
+}
+
+QTextEdit:selected {
+  background: #616161;
+  color: #525252;
+}
+
+/* QPlainTextEdit ---------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QPlainTextEdit {
+  background-color: #272727;
+  color: #E3E3E3;
+  border-radius: 4px;
+  border: 1px solid #525252;
+}
+
+QPlainTextEdit:focus {
+  border: 1px solid #666666;
+}
+
+QPlainTextEdit:selected {
+  background: #616161;
+  color: #525252;
+}
+
+/* QSizeGrip --------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qsizegrip
+
+--------------------------------------------------------------------------- */
+QSizeGrip {
+  background: transparent;
+  width: 12px;
+  height: 12px;
+  image: url(":/qss_icons/dark/rc/window_grip.png");
+}
+
+/* QToolBar ---------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbar
+
+--------------------------------------------------------------------------- */
+QToolBar {
+  background-color: #272727;
+  border-bottom: 1px solid #272727;
+  padding: 1px;
+  font-weight: bold;
+}
+
+QToolBar:disabled {
+  /* Fixes #272 */
+  background-color: #272727;
+}
+
+QToolBar::handle:horizontal {
+  width: 16px;
+  image: url(":/qss_icons/dark/rc/toolbar_move_horizontal.png");
+}
+
+QToolBar::handle:vertical {
+  height: 16px;
+  image: url(":/qss_icons/dark/rc/toolbar_move_vertical.png");
+}
+
+QToolBar::separator:horizontal {
+  width: 16px;
+  image: url(":/qss_icons/dark/rc/toolbar_separator_horizontal.png");
+}
+
+QToolBar::separator:vertical {
+  height: 16px;
+  image: url(":/qss_icons/dark/rc/toolbar_separator_vertical.png");
+}
+
+QToolButton#qt_toolbar_ext_button {
+  background: #272727;
+  border: 0px;
+  color: #E3E3E3;
+  image: url(":/qss_icons/dark/rc/arrow_right.png");
+}
+
+/* QAbstractSpinBox -------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QAbstractSpinBox {
+  background-color: #272727;
+  border: 1px solid #525252;
+  color: #E3E3E3;
+  /* This fixes 103, 111 */
+  padding-top: 2px;
+  /* This fixes 103, 111 */
+  padding-bottom: 2px;
+  padding-left: 4px;
+  padding-right: 4px;
+  border-radius: 4px;
+  /* min-width: 5px; removed to fix 109 */
+}
+
+QAbstractSpinBox:up-button {
+  background-color: transparent #272727;
+  subcontrol-origin: border;
+  subcontrol-position: top right;
+  border-left: 1px solid #525252;
+  border-bottom: 1px solid #525252;
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  margin: 1px;
+  width: 12px;
+  margin-bottom: -1px;
+}
+
+QAbstractSpinBox::up-arrow, QAbstractSpinBox::up-arrow:disabled, QAbstractSpinBox::up-arrow:off {
+  image: url(":/qss_icons/dark/rc/arrow_up_disabled.png");
+  height: 8px;
+  width: 8px;
+}
+
+QAbstractSpinBox::up-arrow:hover {
+  image: url(":/qss_icons/dark/rc/arrow_up.png");
+}
+
+QAbstractSpinBox:down-button {
+  background-color: transparent #272727;
+  subcontrol-origin: border;
+  subcontrol-position: bottom right;
+  border-left: 1px solid #525252;
+  border-top: 1px solid #525252;
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  margin: 1px;
+  width: 12px;
+  margin-top: -1px;
+}
+
+QAbstractSpinBox::down-arrow, QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::down-arrow:off {
+  image: url(":/qss_icons/dark/rc/arrow_down_disabled.png");
+  height: 8px;
+  width: 8px;
+}
+
+QAbstractSpinBox::down-arrow:hover {
+  image: url(":/qss_icons/dark/rc/arrow_down.png");
+}
+
+QAbstractSpinBox:hover {
+  border: 1px solid #616161;
+  color: #E3E3E3;
+}
+
+QAbstractSpinBox:focus {
+  border: 1px solid #666666;
+}
+
+QAbstractSpinBox:selected {
+  background: #616161;
+  color: #525252;
+}
+
+/* ------------------------------------------------------------------------ */
+/* DISPLAYS --------------------------------------------------------------- */
+/* ------------------------------------------------------------------------ */
+/* QLabel -----------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qframe
+
+--------------------------------------------------------------------------- */
+QLabel {
+  background-color: #272727;
+  border: 0px solid #525252;
+  padding: 2px;
+  margin: 0px;
+  color: #E3E3E3;
+}
+
+QLabel:disabled {
+  background-color: #272727;
+  border: 0px solid #525252;
+  color: #8B8B8B;
+}
+
+/* QTextBrowser -----------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qabstractscrollarea
+
+--------------------------------------------------------------------------- */
+QTextBrowser {
+  background-color: #272727;
+  border: 1px solid #525252;
+  color: #E3E3E3;
+  border-radius: 4px;
+}
+
+QTextBrowser:disabled {
+  background-color: #272727;
+  border: 1px solid #525252;
+  color: #8B8B8B;
+  border-radius: 4px;
+}
+
+QTextBrowser:hover, QTextBrowser:!hover, QTextBrowser:selected, QTextBrowser:pressed {
+  border: 1px solid #525252;
+}
+
+/* QGraphicsView ----------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QGraphicsView {
+  background-color: #272727;
+  border: 1px solid #525252;
+  color: #E3E3E3;
+  border-radius: 4px;
+}
+
+QGraphicsView:disabled {
+  background-color: #272727;
+  border: 1px solid #525252;
+  color: #8B8B8B;
+  border-radius: 4px;
+}
+
+QGraphicsView:hover, QGraphicsView:!hover, QGraphicsView:selected, QGraphicsView:pressed {
+  border: 1px solid #525252;
+}
+
+/* QCalendarWidget --------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QCalendarWidget {
+  border: 1px solid #525252;
+  border-radius: 4px;
+}
+
+QCalendarWidget:disabled {
+  background-color: #272727;
+  color: #8B8B8B;
+}
+
+/* QLCDNumber -------------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QLCDNumber {
+  background-color: #272727;
+  color: #E3E3E3;
+}
+
+QLCDNumber:disabled {
+  background-color: #272727;
+  color: #8B8B8B;
+}
+
+/* QProgressBar -----------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qprogressbar
+
+--------------------------------------------------------------------------- */
+QProgressBar {
+  background-color: #272727;
+  border: 1px solid #525252;
+  color: #E3E3E3;
+  border-radius: 4px;
+  text-align: center;
+}
+
+QProgressBar:disabled {
+  background-color: #272727;
+  border: 1px solid #525252;
+  color: #8B8B8B;
+  border-radius: 4px;
+  text-align: center;
+}
+
+QProgressBar::chunk {
+  background-color: #616161;
+  color: #272727;
+  border-radius: 4px;
+}
+
+QProgressBar::chunk:disabled {
+  background-color: #444444;
+  color: #8B8B8B;
+  border-radius: 4px;
+}
+
+/* ------------------------------------------------------------------------ */
+/* BUTTONS ---------------------------------------------------------------- */
+/* ------------------------------------------------------------------------ */
+/* QPushButton ------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qpushbutton
+
+--------------------------------------------------------------------------- */
+QPushButton {
+  background-color: #333333;
+  color: #E3E3E3;
+  border-radius: 4px;
+  padding: 4px;
+  outline: none;
+  border: 1px solid white;
+}
+
+QPushButton:disabled {
+  background-color: #333333;
+  color: #8B8B8B;
+  border-radius: 4px;
+  padding: 4px;
+  border: 1px solid #9B9B9B;
+}
+
+QPushButton:checked {
+  background-color: #666666;
+  border-radius: 4px;
+  padding: 4px;
+  outline: none;
+}
+
+QPushButton:checked:disabled {
+  background-color: #525252;
+  color: #8B8B8B;
+  border-radius: 4px;
+  padding: 4px;
+  outline: none;
+}
+
+QPushButton:checked:selected {
+  background: #454545;
+}
+
+QPushButton:hover {
+  background-color: #454545;
+  color: #E3E3E3;
+  border: 1px solid #9B9B9B;
+}
+
+QPushButton:pressed {
+  background-color: #666666;
+  border: 1px solid #9B9B9B;
+}
+
+QPushButton:selected {
+  background: #333333;
+  color: #E3E3E3;
+}
+
+QPushButton::menu-indicator {
+  subcontrol-origin: padding;
+  subcontrol-position: bottom right;
+  bottom: 4px;
+}
+
+QDialogButtonBox QPushButton {
+  /* Issue #194 #248 - Special case of QPushButton inside dialogs, for better UI */
+  min-width: 80px;
+}
+
+/* QToolButton ------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbutton
+
+--------------------------------------------------------------------------- */
+QToolButton {
+  background-color: #272727;
+  color: #E3E3E3;
+  border-radius: 4px;
+  padding: 2px;
+  outline: none;
+  border: none;
+  /* The subcontrols below are used only in the DelayedPopup mode */
+  /* The subcontrols below are used only in the MenuButtonPopup mode */
+  /* The subcontrol below is used only in the InstantPopup or DelayedPopup mode */
+}
+
+QToolButton:disabled {
+  background-color: #272727;
+  color: #8B8B8B;
+  border-radius: 4px;
+  padding: 2px;
+}
+
+QToolButton:checked {
+  background-color: #767676;
+  border-radius: 4px;
+  padding: 2px;
+  outline: none;
+}
+
+QToolButton:checked:disabled {
+  background-color: #767676;
+  color: #8B8B8B;
+  border-radius: 4px;
+  padding: 2px;
+  outline: none;
+}
+
+QToolButton:checked:hover {
+  background-color: #666666;
+  color: #E3E3E3;
+}
+
+QToolButton:checked:pressed {
+  background-color: #767676;
+}
+
+QToolButton:checked:selected {
+  background: #767676;
+  color: #E3E3E3;
+}
+
+QToolButton:hover {
+  background-color: #666666;
+  color: #E3E3E3;
+}
+
+QToolButton:pressed {
+  background-color: #767676;
+}
+
+QToolButton:selected {
+  background: #767676;
+  color: #E3E3E3;
+}
+
+QToolButton[popupMode="0"] {
+  /* Only for DelayedPopup */
+  padding-right: 2px;
+}
+
+QToolButton[popupMode="1"] {
+  /* Only for MenuButtonPopup */
+  padding-right: 20px;
+}
+
+QToolButton[popupMode="1"]::menu-button {
+  border: none;
+}
+
+QToolButton[popupMode="1"]::menu-button:hover {
+  border: none;
+  border-left: 1px solid #525252;
+  border-radius: 0;
+}
+
+QToolButton[popupMode="2"] {
+  /* Only for InstantPopup */
+  padding-right: 2px;
+}
+
+QToolButton::menu-button {
+  padding: 2px;
+  border-radius: 4px;
+  width: 12px;
+  border: none;
+  outline: none;
+}
+
+QToolButton::menu-button:hover {
+  border: 1px solid #616161;
+}
+
+QToolButton::menu-button:checked:hover {
+  border: 1px solid #616161;
+}
+
+QToolButton::menu-indicator {
+  image: url(":/qss_icons/dark/rc/arrow_down.png");
+  height: 8px;
+  width: 8px;
+  top: 0;
+  /* Exclude a shift for better image */
+  left: -2px;
+  /* Shift it a bit */
+}
+
+QToolButton::menu-arrow {
+  image: url(":/qss_icons/dark/rc/arrow_down.png");
+  height: 8px;
+  width: 8px;
+}
+
+QToolButton::menu-arrow:hover {
+  image: url(":/qss_icons/dark/rc/arrow_down_focus.png");
+}
+
+/* QCommandLinkButton -----------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QCommandLinkButton {
+  background-color: transparent;
+  border: 1px solid #525252;
+  color: #E3E3E3;
+  border-radius: 4px;
+  padding: 0px;
+  margin: 0px;
+}
+
+QCommandLinkButton:disabled {
+  background-color: transparent;
+  color: #8B8B8B;
+}
+
+/* ------------------------------------------------------------------------ */
+/* INPUTS - NO FIELDS ----------------------------------------------------- */
+/* ------------------------------------------------------------------------ */
+/* QComboBox --------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
+
+--------------------------------------------------------------------------- */
+QComboBox {
+  border: 1px solid #525252;
+  border-radius: 4px;
+  selection-background-color: #616161;
+  padding-left: 4px;
+  padding-right: 4px;
+  /* padding-right = 36; 4 + 16*2 See scrollbar size */
+  /* changed to 4px to fix #239 */
+  /* Fixes #103, #111 */
+  min-height: 1.5em;
+  /* padding-top: 2px;     removed to fix #132 */
+  /* padding-bottom: 2px;  removed to fix #132 */
+  /* min-width: 75px;      removed to fix #109 */
+  /* Needed to remove indicator - fix #132 */
+}
+
+QComboBox QAbstractItemView {
+  border: 1px solid #525252;
+  border-radius: 0;
+  background-color: #272727;
+  selection-background-color: #616161;
+}
+
+QComboBox QAbstractItemView:hover {
+  background-color: #272727;
+  color: #E3E3E3;
+}
+
+QComboBox QAbstractItemView:selected {
+  background: #616161;
+  color: #525252;
+}
+
+QComboBox QAbstractItemView:alternate {
+  background: #272727;
+}
+
+QComboBox:disabled {
+  background-color: #272727;
+  color: #8B8B8B;
+}
+
+QComboBox:hover {
+  border: 1px solid #616161;
+  background-color: #454545;
+}
+
+QComboBox:focus {
+  border: 1px solid #666666;
+}
+
+QComboBox:on {
+  selection-background-color: #616161;
+  background-color: #666666;
+}
+
+QComboBox::indicator {
+  border: none;
+  border-radius: 0;
+  background-color: transparent;
+  selection-background-color: transparent;
+  color: transparent;
+  selection-color: transparent;
+  /* Needed to remove indicator - fix #132 */
+}
+
+QComboBox::indicator:alternate {
+  background: #272727;
+}
+
+QComboBox::item {
+  /* Remove to fix #282, #285 and MR #288*/
+  /*&:checked {
+            font-weight: bold;
+        }
+
+        &:selected {
+            border: 0px solid transparent;
+        }
+        */
+}
+
+QComboBox::item:alternate {
+  background: #272727;
+}
+
+QComboBox::drop-down {
+  subcontrol-origin: padding;
+  subcontrol-position: top right;
+  width: 12px;
+  border-left: 1px solid #525252;
+}
+
+QComboBox::down-arrow {
+  image: url(":/qss_icons/dark/rc/arrow_down_disabled.png");
+  height: 8px;
+  width: 8px;
+}
+
+QComboBox::down-arrow:on, QComboBox::down-arrow:hover, QComboBox::down-arrow:focus {
+  image: url(":/qss_icons/dark/rc/arrow_down.png");
+}
+
+/* QSlider ----------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qslider
+
+--------------------------------------------------------------------------- */
+QSlider:disabled {
+  background: #272727;
+}
+
+QSlider:focus {
+  border: none;
+}
+
+QSlider::groove:horizontal {
+  background: #525252;
+  border: 1px solid #525252;
+  height: 4px;
+  margin: 0px;
+  border-radius: 4px;
+}
+
+QSlider::groove:vertical {
+  background: #525252;
+  border: 1px solid #525252;
+  width: 4px;
+  margin: 0px;
+  border-radius: 4px;
+}
+
+QSlider::add-page:vertical {
+  background: #616161;
+  border: 1px solid #525252;
+  width: 4px;
+  margin: 0px;
+  border-radius: 4px;
+}
+
+QSlider::add-page:vertical :disabled {
+  background: #444444;
+}
+
+QSlider::sub-page:horizontal {
+  background: #616161;
+  border: 1px solid #525252;
+  height: 4px;
+  margin: 0px;
+  border-radius: 4px;
+}
+
+QSlider::sub-page:horizontal:disabled {
+  background: #444444;
+}
+
+QSlider::handle:horizontal {
+  background: #A9A9A9;
+  border: 1px solid #525252;
+  width: 8px;
+  height: 8px;
+  margin: -8px 0px;
+  border-radius: 4px;
+}
+
+QSlider::handle:horizontal:hover {
+  background: #616161;
+  border: 1px solid #616161;
+}
+
+QSlider::handle:horizontal:focus {
+  border: 1px solid #666666;
+}
+
+QSlider::handle:vertical {
+  background: #A9A9A9;
+  border: 1px solid #525252;
+  width: 8px;
+  height: 8px;
+  margin: 0 -8px;
+  border-radius: 4px;
+}
+
+QSlider::handle:vertical:hover {
+  background: #616161;
+  border: 1px solid #616161;
+}
+
+QSlider::handle:vertical:focus {
+  border: 1px solid #666666;
+}
+
+/* QLineEdit --------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qlineedit
+
+--------------------------------------------------------------------------- */
+QLineEdit {
+  background-color: #272727;
+  padding-top: 2px;
+  /* This QLineEdit fix  103, 111 */
+  padding-bottom: 2px;
+  /* This QLineEdit fix  103, 111 */
+  padding-left: 4px;
+  padding-right: 4px;
+  border-style: solid;
+  border: 1px solid #525252;
+  border-radius: 4px;
+  color: #E3E3E3;
+}
+
+QLineEdit:disabled {
+  background-color: #272727;
+  color: #8B8B8B;
+}
+
+QLineEdit:hover {
+  border: 1px solid #616161;
+  color: #E3E3E3;
+}
+
+QLineEdit:focus {
+  border: 1px solid #666666;
+}
+
+QLineEdit:selected {
+  background-color: #616161;
+  color: #525252;
+}
+
+/* QTabWiget --------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtabwidget-and-qtabbar
+
+--------------------------------------------------------------------------- */
+QTabWidget {
+  padding: 2px;
+  selection-background-color: #525252;
+}
+
+QTabWidget QWidget {
+  /* Fixes #189 */
+  border-radius: 4px;
+}
+
+QTabWidget::pane {
+  border: 1px solid #525252;
+  border-radius: 4px;
+  margin: 0px;
+  /* Fixes double border inside pane with pyqt5 */
+  padding: 0px;
+}
+
+QTabWidget::pane:selected {
+  background-color: #525252;
+  border: 1px solid #616161;
+}
+
+/* QTabBar ----------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtabwidget-and-qtabbar
+
+--------------------------------------------------------------------------- */
+QTabBar, QDockWidget QTabBar {
+  qproperty-drawBase: 0;
+  border-radius: 4px;
+  margin: 0px;
+  padding: 2px;
+  border: 0;
+  /* left: 5px; move to the right by 5px - removed for fix */
+}
+
+QTabBar::close-button, QDockWidget QTabBar::close-button {
+  border: 0;
+  margin: 0;
+  padding: 4px;
+  image: url(":/qss_icons/dark/rc/window_close.png");
+}
+
+QTabBar::close-button:hover, QDockWidget QTabBar::close-button:hover {
+  image: url(":/qss_icons/dark/rc/window_close_focus.png");
+}
+
+QTabBar::close-button:pressed, QDockWidget QTabBar::close-button:pressed {
+  image: url(":/qss_icons/dark/rc/window_close_pressed.png");
+}
+
+QTabBar::tab, QDockWidget QTabBar::tab {
+  /* !selected and disabled ----------------------------------------- */
+  /* selected ------------------------------------------------------- */
+}
+
+QTabBar::tab:top:selected:disabled, QDockWidget QTabBar::tab:top:selected:disabled {
+  border-bottom: 3px solid #444444;
+  color: #8B8B8B;
+  background-color: #525252;
+}
+
+QTabBar::tab:bottom:selected:disabled, QDockWidget QTabBar::tab:bottom:selected:disabled {
+  border-top: 3px solid #444444;
+  color: #8B8B8B;
+  background-color: #525252;
+}
+
+QTabBar::tab:left:selected:disabled, QDockWidget QTabBar::tab:left:selected:disabled {
+  border-right: 3px solid #444444;
+  color: #8B8B8B;
+  background-color: #525252;
+}
+
+QTabBar::tab:right:selected:disabled, QDockWidget QTabBar::tab:right:selected:disabled {
+  border-left: 3px solid #444444;
+  color: #8B8B8B;
+  background-color: #525252;
+}
+
+QTabBar::tab:top:!selected:disabled, QDockWidget QTabBar::tab:top:!selected:disabled {
+  border-bottom: 3px solid #272727;
+  color: #8B8B8B;
+  background-color: #272727;
+}
+
+QTabBar::tab:bottom:!selected:disabled, QDockWidget QTabBar::tab:bottom:!selected:disabled {
+  border-top: 3px solid #272727;
+  color: #8B8B8B;
+  background-color: #272727;
+}
+
+QTabBar::tab:left:!selected:disabled, QDockWidget QTabBar::tab:left:!selected:disabled {
+  border-right: 3px solid #272727;
+  color: #8B8B8B;
+  background-color: #272727;
+}
+
+QTabBar::tab:right:!selected:disabled, QDockWidget QTabBar::tab:right:!selected:disabled {
+  border-left: 3px solid #272727;
+  color: #8B8B8B;
+  background-color: #272727;
+}
+
+QTabBar::tab:top:!selected, QDockWidget QTabBar::tab:top:!selected {
+  border-bottom: 2px solid #272727;
+  margin-top: 2px;
+}
+
+QTabBar::tab:bottom:!selected, QDockWidget QTabBar::tab:bottom:!selected {
+  border-top: 2px solid #272727;
+  margin-bottom: 2px;
+}
+
+QTabBar::tab:left:!selected, QDockWidget QTabBar::tab:left:!selected {
+  border-left: 2px solid #272727;
+  margin-right: 2px;
+}
+
+QTabBar::tab:right:!selected, QDockWidget QTabBar::tab:right:!selected {
+  border-right: 2px solid #272727;
+  margin-left: 2px;
+}
+
+QTabBar::tab:top, QDockWidget QTabBar::tab:top {
+  background-color: #525252;
+  margin-left: 2px;
+  padding-left: 4px;
+  padding-right: 4px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  min-width: 5px;
+  border-bottom: 3px solid #525252;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+}
+
+QTabBar::tab:top:selected, QDockWidget QTabBar::tab:top:selected {
+  background-color: #666666;
+  border-bottom: 3px solid #898989;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+}
+
+QTabBar::tab:top:!selected:hover, QDockWidget QTabBar::tab:top:!selected:hover {
+  border: 1px solid #666666;
+  border-bottom: 3px solid #666666;
+  /* Fixes spyder-ide/spyder#9766 and #243 */
+  padding-left: 3px;
+  padding-right: 3px;
+}
+
+QTabBar::tab:bottom, QDockWidget QTabBar::tab:bottom {
+  border-top: 3px solid #525252;
+  background-color: #525252;
+  margin-left: 2px;
+  padding-left: 4px;
+  padding-right: 4px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+  min-width: 5px;
+}
+
+QTabBar::tab:bottom:selected, QDockWidget QTabBar::tab:bottom:selected {
+  background-color: #666666;
+  border-top: 3px solid #898989;
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+
+QTabBar::tab:bottom:!selected:hover, QDockWidget QTabBar::tab:bottom:!selected:hover {
+  border: 1px solid #666666;
+  border-top: 3px solid #666666;
+  /* Fixes spyder-ide/spyder#9766 and #243 */
+  padding-left: 3px;
+  padding-right: 3px;
+}
+
+QTabBar::tab:left, QDockWidget QTabBar::tab:left {
+  background-color: #525252;
+  margin-top: 2px;
+  padding-left: 2px;
+  padding-right: 2px;
+  padding-top: 4px;
+  padding-bottom: 4px;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  min-height: 5px;
+}
+
+QTabBar::tab:left:selected, QDockWidget QTabBar::tab:left:selected {
+  background-color: #666666;
+  border-right: 3px solid #898989;
+}
+
+QTabBar::tab:left:!selected:hover, QDockWidget QTabBar::tab:left:!selected:hover {
+  border: 1px solid #666666;
+  border-right: 3px solid #666666;
+  /* Fixes different behavior #271 */
+  margin-right: 0px;
+  padding-right: -1px;
+}
+
+QTabBar::tab:right, QDockWidget QTabBar::tab:right {
+  background-color: #525252;
+  margin-top: 2px;
+  padding-left: 2px;
+  padding-right: 2px;
+  padding-top: 4px;
+  padding-bottom: 4px;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  min-height: 5px;
+}
+
+QTabBar::tab:right:selected, QDockWidget QTabBar::tab:right:selected {
+  background-color: #666666;
+  border-left: 3px solid #898989;
+}
+
+QTabBar::tab:right:!selected:hover, QDockWidget QTabBar::tab:right:!selected:hover {
+  border: 1px solid #666666;
+  border-left: 3px solid #666666;
+  /* Fixes different behavior #271 */
+  margin-left: 0px;
+  padding-left: 0px;
+}
+
+QTabBar QToolButton, QDockWidget QTabBar QToolButton {
+  /* Fixes #136 */
+  background-color: #525252;
+  height: 12px;
+  width: 12px;
+}
+
+QTabBar QToolButton:pressed, QDockWidget QTabBar QToolButton:pressed {
+  background-color: #525252;
+}
+
+QTabBar QToolButton:pressed:hover, QDockWidget QTabBar QToolButton:pressed:hover {
+  border: 1px solid #616161;
+}
+
+QTabBar QToolButton::left-arrow:enabled, QDockWidget QTabBar QToolButton::left-arrow:enabled {
+  image: url(":/qss_icons/dark/rc/arrow_left.png");
+}
+
+QTabBar QToolButton::left-arrow:disabled, QDockWidget QTabBar QToolButton::left-arrow:disabled {
+  image: url(":/qss_icons/dark/rc/arrow_left_disabled.png");
+}
+
+QTabBar QToolButton::right-arrow:enabled, QDockWidget QTabBar QToolButton::right-arrow:enabled {
+  image: url(":/qss_icons/dark/rc/arrow_right.png");
+}
+
+QTabBar QToolButton::right-arrow:disabled, QDockWidget QTabBar QToolButton::right-arrow:disabled {
+  image: url(":/qss_icons/dark/rc/arrow_right_disabled.png");
+}
+
+/* QDockWiget -------------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QDockWidget {
+  outline: 1px solid #525252;
+  background-color: #272727;
+  border: 1px solid #525252;
+  border-radius: 4px;
+  titlebar-close-icon: url(":/qss_icons/dark/rc/transparent.png");
+  titlebar-normal-icon: url(":/qss_icons/dark/rc/transparent.png");
+}
+
+QDockWidget::title {
+  /* Better size for title bar */
+  padding: 3px;
+  spacing: 4px;
+  border: none;
+  background-color: #525252;
+}
+
+QDockWidget::close-button {
+  icon-size: 12px;
+  border: none;
+  background: transparent;
+  background-image: transparent;
+  border: 0;
+  margin: 0;
+  padding: 0;
+  image: url(":/qss_icons/dark/rc/window_close.png");
+}
+
+QDockWidget::close-button:hover {
+  image: url(":/qss_icons/dark/rc/window_close_focus.png");
+}
+
+QDockWidget::close-button:pressed {
+  image: url(":/qss_icons/dark/rc/window_close_pressed.png");
+}
+
+QDockWidget::float-button {
+  icon-size: 12px;
+  border: none;
+  background: transparent;
+  background-image: transparent;
+  border: 0;
+  margin: 0;
+  padding: 0;
+  image: url(":/qss_icons/dark/rc/window_undock.png");
+}
+
+QDockWidget::float-button:hover {
+  image: url(":/qss_icons/dark/rc/window_undock_focus.png");
+}
+
+QDockWidget::float-button:pressed {
+  image: url(":/qss_icons/dark/rc/window_undock_pressed.png");
+}
+
+/* QTreeView QListView QTableView -----------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtreeview
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qlistview
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtableview
+
+--------------------------------------------------------------------------- */
+QTreeView:branch:selected, QTreeView:branch:hover {
+  background: url(":/qss_icons/dark/rc/transparent.png");
+}
+
+QTreeView:branch:has-siblings:!adjoins-item {
+  border-image: url(":/qss_icons/dark/rc/branch_line.png") 0;
+}
+
+QTreeView:branch:has-siblings:adjoins-item {
+  border-image: url(":/qss_icons/dark/rc/branch_more.png") 0;
+}
+
+QTreeView:branch:!has-children:!has-siblings:adjoins-item {
+  border-image: url(":/qss_icons/dark/rc/branch_end.png") 0;
+}
+
+QTreeView:branch:has-children:!has-siblings:closed, QTreeView:branch:closed:has-children:has-siblings {
+  border-image: none;
+  image: url(":/qss_icons/dark/rc/branch_closed.png");
+}
+
+QTreeView:branch:open:has-children:!has-siblings, QTreeView:branch:open:has-children:has-siblings {
+  border-image: none;
+  image: url(":/qss_icons/dark/rc/branch_open.png");
+}
+
+QTreeView:branch:has-children:!has-siblings:closed:hover, QTreeView:branch:closed:has-children:has-siblings:hover {
+  image: url(":/qss_icons/dark/rc/branch_closed_focus.png");
+}
+
+QTreeView:branch:open:has-children:!has-siblings:hover, QTreeView:branch:open:has-children:has-siblings:hover {
+  image: url(":/qss_icons/dark/rc/branch_open_focus.png");
+}
+
+QTreeView::indicator:checked,
+QListView::indicator:checked,
+QTableView::indicator:checked,
+QColumnView::indicator:checked {
+  image: url(":/qss_icons/dark/rc/checkbox_checked.png");
+}
+
+QTreeView::indicator:checked:hover, QTreeView::indicator:checked:focus, QTreeView::indicator:checked:pressed,
+QListView::indicator:checked:hover,
+QListView::indicator:checked:focus,
+QListView::indicator:checked:pressed,
+QTableView::indicator:checked:hover,
+QTableView::indicator:checked:focus,
+QTableView::indicator:checked:pressed,
+QColumnView::indicator:checked:hover,
+QColumnView::indicator:checked:focus,
+QColumnView::indicator:checked:pressed {
+  image: url(":/qss_icons/dark/rc/checkbox_checked_focus.png");
+}
+
+QTreeView::indicator:unchecked,
+QListView::indicator:unchecked,
+QTableView::indicator:unchecked,
+QColumnView::indicator:unchecked {
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked.png");
+}
+
+QTreeView::indicator:unchecked:hover, QTreeView::indicator:unchecked:focus, QTreeView::indicator:unchecked:pressed,
+QListView::indicator:unchecked:hover,
+QListView::indicator:unchecked:focus,
+QListView::indicator:unchecked:pressed,
+QTableView::indicator:unchecked:hover,
+QTableView::indicator:unchecked:focus,
+QTableView::indicator:unchecked:pressed,
+QColumnView::indicator:unchecked:hover,
+QColumnView::indicator:unchecked:focus,
+QColumnView::indicator:unchecked:pressed {
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked_focus.png");
+}
+
+QTreeView::indicator:indeterminate,
+QListView::indicator:indeterminate,
+QTableView::indicator:indeterminate,
+QColumnView::indicator:indeterminate {
+  image: url(":/qss_icons/dark/rc/checkbox_indeterminate.png");
+}
+
+QTreeView::indicator:indeterminate:hover, QTreeView::indicator:indeterminate:focus, QTreeView::indicator:indeterminate:pressed,
+QListView::indicator:indeterminate:hover,
+QListView::indicator:indeterminate:focus,
+QListView::indicator:indeterminate:pressed,
+QTableView::indicator:indeterminate:hover,
+QTableView::indicator:indeterminate:focus,
+QTableView::indicator:indeterminate:pressed,
+QColumnView::indicator:indeterminate:hover,
+QColumnView::indicator:indeterminate:focus,
+QColumnView::indicator:indeterminate:pressed {
+  image: url(":/qss_icons/dark/rc/checkbox_indeterminate_focus.png");
+}
+
+QTreeView,
+QListView,
+QTableView,
+QColumnView {
+  background-color: #272727;
+  border: 1px solid #525252;
+  color: #E3E3E3;
+  gridline-color: #525252;
+  border-radius: 4px;
+}
+
+QTreeView:disabled,
+QListView:disabled,
+QTableView:disabled,
+QColumnView:disabled {
+  background-color: #272727;
+  color: #8B8B8B;
+}
+
+QTreeView:selected,
+QListView:selected,
+QTableView:selected,
+QColumnView:selected {
+  background-color: #616161;
+  color: #525252;
+}
+
+QTreeView:focus,
+QListView:focus,
+QTableView:focus,
+QColumnView:focus {
+  border: 1px solid #666666;
+}
+
+QTreeView::item:pressed,
+QListView::item:pressed,
+QTableView::item:pressed,
+QColumnView::item:pressed {
+  background-color: #616161;
+}
+
+QTreeView::item:selected:active,
+QListView::item:selected:active,
+QTableView::item:selected:active,
+QColumnView::item:selected:active {
+  background-color: #616161;
+}
+
+QTreeView::item:selected:!active,
+QListView::item:selected:!active,
+QTableView::item:selected:!active,
+QColumnView::item:selected:!active {
+  color: #E3E3E3;
+  background-color: #414141;
+}
+
+QTreeView::item:!selected:hover,
+QListView::item:!selected:hover,
+QTableView::item:!selected:hover,
+QColumnView::item:!selected:hover {
+  outline: 0;
+  color: #E3E3E3;
+  background-color: #414141;
+}
+
+QTableCornerButton::section {
+  background-color: #272727;
+  border: 1px transparent #525252;
+  border-radius: 0px;
+}
+
+/* QHeaderView ------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qheaderview
+
+--------------------------------------------------------------------------- */
+QHeaderView {
+  background-color: #525252;
+  border: 0px transparent #525252;
+  padding: 0;
+  margin: 0;
+  border-radius: 0;
+}
+
+QHeaderView:disabled {
+  background-color: #525252;
+  border: 1px transparent #525252;
+}
+
+QHeaderView::section {
+  background-color: #525252;
+  color: #E3E3E3;
+  border-radius: 0;
+  text-align: left;
+  font-size: 13px;
+}
+
+QHeaderView::section::horizontal {
+  padding-top: 0;
+  padding-bottom: 0;
+  padding-left: 4px;
+  padding-right: 4px;
+  border-left: 1px solid #272727;
+}
+
+QHeaderView::section::horizontal::first, QHeaderView::section::horizontal::only-one {
+  border-left: 1px solid #525252;
+}
+
+QHeaderView::section::horizontal:disabled {
+  color: #8B8B8B;
+}
+
+QHeaderView::section::vertical {
+  padding-top: 0;
+  padding-bottom: 0;
+  padding-left: 4px;
+  padding-right: 4px;
+  border-top: 1px solid #272727;
+}
+
+QHeaderView::section::vertical::first, QHeaderView::section::vertical::only-one {
+  border-top: 1px solid #525252;
+}
+
+QHeaderView::section::vertical:disabled {
+  color: #8B8B8B;
+}
+
+QHeaderView::down-arrow {
+  /* Those settings (border/width/height/background-color) solve bug */
+  /* transparent arrow background and size */
+  background-color: #525252;
+  border: none;
+  height: 12px;
+  width: 12px;
+  padding-left: 2px;
+  padding-right: 2px;
+  image: url(":/qss_icons/dark/rc/arrow_down.png");
+}
+
+QHeaderView::up-arrow {
+  background-color: #525252;
+  border: none;
+  height: 12px;
+  width: 12px;
+  padding-left: 2px;
+  padding-right: 2px;
+  image: url(":/qss_icons/dark/rc/arrow_up.png");
+}
+
+/* QToolBox --------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbox
+
+--------------------------------------------------------------------------- */
+QToolBox {
+  padding: 0px;
+  border: 0px;
+  border: 1px solid #525252;
+}
+
+QToolBox:selected {
+  padding: 0px;
+  border: 2px solid #616161;
+}
+
+QToolBox::tab {
+  background-color: #272727;
+  border: 1px solid #525252;
+  color: #E3E3E3;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+}
+
+QToolBox::tab:disabled {
+  color: #8B8B8B;
+}
+
+QToolBox::tab:selected {
+  background-color: #767676;
+  border-bottom: 2px solid #616161;
+}
+
+QToolBox::tab:selected:disabled {
+  background-color: #525252;
+  border-bottom: 2px solid #444444;
+}
+
+QToolBox::tab:!selected {
+  background-color: #525252;
+  border-bottom: 2px solid #525252;
+}
+
+QToolBox::tab:!selected:disabled {
+  background-color: #272727;
+}
+
+QToolBox::tab:hover {
+  border-color: #666666;
+  border-bottom: 2px solid #666666;
+}
+
+QToolBox QScrollArea {
+  padding: 0px;
+  border: 0px;
+  background-color: #272727;
+}
+
+/* QFrame -----------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qframe
+https://doc.qt.io/qt-5/qframe.html#-prop
+https://doc.qt.io/qt-5/qframe.html#details
+https://stackoverflow.com/questions/14581498/qt-stylesheet-for-hline-vline-color
+
+--------------------------------------------------------------------------- */
+/* (dot) .QFrame  fix #141, #126, #123 */
+.QFrame {
+  border-radius: 4px;
+  border: 1px solid #525252;
+  /* No frame */
+  /* HLine */
+  /* HLine */
+}
+
+.QFrame[frameShape="0"] {
+  border-radius: 4px;
+  border: 1px transparent #525252;
+}
+
+.QFrame[frameShape="4"] {
+  max-height: 2px;
+  border: none;
+  background-color: #525252;
+}
+
+.QFrame[frameShape="5"] {
+  max-width: 2px;
+  border: none;
+  background-color: #525252;
+}
+
+/* QSplitter --------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qsplitter
+
+--------------------------------------------------------------------------- */
+QSplitter {
+  background-color: #525252;
+  spacing: 0px;
+  padding: 0px;
+  margin: 0px;
+}
+
+QSplitter::handle {
+  background-color: #525252;
+  border: 0px solid #272727;
+  spacing: 0px;
+  padding: 1px;
+  margin: 0px;
+}
+
+QSplitter::handle:hover {
+  background-color: #A9A9A9;
+}
+
+QSplitter::handle:horizontal {
+  width: 5px;
+  image: url(":/qss_icons/dark/rc/line_vertical.png");
+}
+
+QSplitter::handle:vertical {
+  height: 5px;
+  image: url(":/qss_icons/dark/rc/line_horizontal.png");
+}
+
+/* QDateEdit, QDateTimeEdit -----------------------------------------------
+
+--------------------------------------------------------------------------- */
+QDateEdit, QDateTimeEdit {
+  selection-background-color: #616161;
+  border-style: solid;
+  border: 1px solid #525252;
+  border-radius: 4px;
+  /* This fixes 103, 111 */
+  padding-top: 2px;
+  /* This fixes 103, 111 */
+  padding-bottom: 2px;
+  padding-left: 4px;
+  padding-right: 4px;
+  min-width: 10px;
+}
+
+QDateEdit:on, QDateTimeEdit:on {
+  selection-background-color: #616161;
+}
+
+QDateEdit::drop-down, QDateTimeEdit::drop-down {
+  subcontrol-origin: padding;
+  subcontrol-position: top right;
+  width: 12px;
+  border-left: 1px solid #525252;
+}
+
+QDateEdit::down-arrow, QDateTimeEdit::down-arrow {
+  image: url(":/qss_icons/dark/rc/arrow_down_disabled.png");
+  height: 8px;
+  width: 8px;
+}
+
+QDateEdit::down-arrow:on, QDateEdit::down-arrow:hover, QDateEdit::down-arrow:focus, QDateTimeEdit::down-arrow:on, QDateTimeEdit::down-arrow:hover, QDateTimeEdit::down-arrow:focus {
+  image: url(":/qss_icons/dark/rc/arrow_down.png");
+}
+
+QDateEdit QAbstractItemView, QDateTimeEdit QAbstractItemView {
+  background-color: #272727;
+  border-radius: 4px;
+  border: 1px solid #525252;
+  selection-background-color: #616161;
+}
+
+/* QAbstractView ----------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QAbstractView:hover {
+  border: 1px solid #616161;
+  color: #E3E3E3;
+}
+
+QAbstractView:selected {
+  background: #616161;
+  color: #525252;
+}
+
+/* PlotWidget -------------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+PlotWidget {
+  /* Fix cut labels in plots #134 */
+  padding: 0px;
+}
diff --git a/src/qt/qdarkstyle/dark/rc/.keep b/src/qt/qdarkstyle/dark/rc/.keep
new file mode 100644
index 000000000..8d1c8b69c
--- /dev/null
+++ b/src/qt/qdarkstyle/dark/rc/.keep
@@ -0,0 +1 @@
+ 
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_down.png b/src/qt/qdarkstyle/dark/rc/arrow_down.png
new file mode 100644
index 000000000..412b76e6f
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_down.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_down@2x.png b/src/qt/qdarkstyle/dark/rc/arrow_down@2x.png
new file mode 100644
index 000000000..74d0099ec
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_down@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_down_disabled.png b/src/qt/qdarkstyle/dark/rc/arrow_down_disabled.png
new file mode 100644
index 000000000..972df9cd1
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_down_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_down_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/arrow_down_disabled@2x.png
new file mode 100644
index 000000000..b0fb4ad11
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_down_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_down_focus.png b/src/qt/qdarkstyle/dark/rc/arrow_down_focus.png
new file mode 100644
index 000000000..22df2c525
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_down_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_down_focus@2x.png b/src/qt/qdarkstyle/dark/rc/arrow_down_focus@2x.png
new file mode 100644
index 000000000..06b80be4b
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_down_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_down_pressed.png b/src/qt/qdarkstyle/dark/rc/arrow_down_pressed.png
new file mode 100644
index 000000000..50f41cc6f
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_down_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_down_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/arrow_down_pressed@2x.png
new file mode 100644
index 000000000..ef20f2cb0
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_down_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_left.png b/src/qt/qdarkstyle/dark/rc/arrow_left.png
new file mode 100644
index 000000000..b7aeac5f8
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_left.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_left@2x.png b/src/qt/qdarkstyle/dark/rc/arrow_left@2x.png
new file mode 100644
index 000000000..fef91a8c8
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_left@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_left_disabled.png b/src/qt/qdarkstyle/dark/rc/arrow_left_disabled.png
new file mode 100644
index 000000000..79b1f0565
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_left_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_left_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/arrow_left_disabled@2x.png
new file mode 100644
index 000000000..144fdb5f8
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_left_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_left_focus.png b/src/qt/qdarkstyle/dark/rc/arrow_left_focus.png
new file mode 100644
index 000000000..ef0284994
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_left_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_left_focus@2x.png b/src/qt/qdarkstyle/dark/rc/arrow_left_focus@2x.png
new file mode 100644
index 000000000..ca821dcac
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_left_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_left_pressed.png b/src/qt/qdarkstyle/dark/rc/arrow_left_pressed.png
new file mode 100644
index 000000000..c723d3bff
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_left_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_left_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/arrow_left_pressed@2x.png
new file mode 100644
index 000000000..f0bcb5229
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_left_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_right.png b/src/qt/qdarkstyle/dark/rc/arrow_right.png
new file mode 100644
index 000000000..78d67f2db
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_right.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_right@2x.png b/src/qt/qdarkstyle/dark/rc/arrow_right@2x.png
new file mode 100644
index 000000000..ce0a8faeb
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_right@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_right_disabled.png b/src/qt/qdarkstyle/dark/rc/arrow_right_disabled.png
new file mode 100644
index 000000000..88da1f980
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_right_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_right_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/arrow_right_disabled@2x.png
new file mode 100644
index 000000000..5351587e3
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_right_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_right_focus.png b/src/qt/qdarkstyle/dark/rc/arrow_right_focus.png
new file mode 100644
index 000000000..92271a8ed
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_right_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_right_focus@2x.png b/src/qt/qdarkstyle/dark/rc/arrow_right_focus@2x.png
new file mode 100644
index 000000000..d6c31bdda
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_right_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_right_pressed.png b/src/qt/qdarkstyle/dark/rc/arrow_right_pressed.png
new file mode 100644
index 000000000..22902cf4f
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_right_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_right_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/arrow_right_pressed@2x.png
new file mode 100644
index 000000000..f6181eb64
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_right_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_up.png b/src/qt/qdarkstyle/dark/rc/arrow_up.png
new file mode 100644
index 000000000..50321f29b
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_up.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_up@2x.png b/src/qt/qdarkstyle/dark/rc/arrow_up@2x.png
new file mode 100644
index 000000000..8c73c3be3
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_up@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_up_disabled.png b/src/qt/qdarkstyle/dark/rc/arrow_up_disabled.png
new file mode 100644
index 000000000..48054a8ae
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_up_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_up_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/arrow_up_disabled@2x.png
new file mode 100644
index 000000000..e99960594
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_up_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_up_focus.png b/src/qt/qdarkstyle/dark/rc/arrow_up_focus.png
new file mode 100644
index 000000000..567ec8bdf
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_up_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_up_focus@2x.png b/src/qt/qdarkstyle/dark/rc/arrow_up_focus@2x.png
new file mode 100644
index 000000000..f6998104b
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_up_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_up_pressed.png b/src/qt/qdarkstyle/dark/rc/arrow_up_pressed.png
new file mode 100644
index 000000000..223320106
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_up_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/arrow_up_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/arrow_up_pressed@2x.png
new file mode 100644
index 000000000..9954cf519
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/arrow_up_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/base_icon.png b/src/qt/qdarkstyle/dark/rc/base_icon.png
new file mode 100644
index 000000000..bb00857a4
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/base_icon.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/base_icon@2x.png b/src/qt/qdarkstyle/dark/rc/base_icon@2x.png
new file mode 100644
index 000000000..bc4ab78a2
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/base_icon@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/base_icon_disabled.png b/src/qt/qdarkstyle/dark/rc/base_icon_disabled.png
new file mode 100644
index 000000000..bb00857a4
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/base_icon_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/base_icon_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/base_icon_disabled@2x.png
new file mode 100644
index 000000000..bc4ab78a2
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/base_icon_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/base_icon_focus.png b/src/qt/qdarkstyle/dark/rc/base_icon_focus.png
new file mode 100644
index 000000000..bb00857a4
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/base_icon_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/base_icon_focus@2x.png b/src/qt/qdarkstyle/dark/rc/base_icon_focus@2x.png
new file mode 100644
index 000000000..bc4ab78a2
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/base_icon_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/base_icon_pressed.png b/src/qt/qdarkstyle/dark/rc/base_icon_pressed.png
new file mode 100644
index 000000000..bb00857a4
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/base_icon_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/base_icon_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/base_icon_pressed@2x.png
new file mode 100644
index 000000000..bc4ab78a2
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/base_icon_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_closed.png b/src/qt/qdarkstyle/dark/rc/branch_closed.png
new file mode 100644
index 000000000..4c152b795
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_closed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_closed@2x.png b/src/qt/qdarkstyle/dark/rc/branch_closed@2x.png
new file mode 100644
index 000000000..a641a550b
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_closed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_closed_disabled.png b/src/qt/qdarkstyle/dark/rc/branch_closed_disabled.png
new file mode 100644
index 000000000..165fae29b
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_closed_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_closed_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/branch_closed_disabled@2x.png
new file mode 100644
index 000000000..421e8e094
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_closed_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_closed_focus.png b/src/qt/qdarkstyle/dark/rc/branch_closed_focus.png
new file mode 100644
index 000000000..ccc249a59
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_closed_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_closed_focus@2x.png b/src/qt/qdarkstyle/dark/rc/branch_closed_focus@2x.png
new file mode 100644
index 000000000..88dd0a62b
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_closed_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_closed_pressed.png b/src/qt/qdarkstyle/dark/rc/branch_closed_pressed.png
new file mode 100644
index 000000000..2aae68a0a
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_closed_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_closed_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/branch_closed_pressed@2x.png
new file mode 100644
index 000000000..3849a7ff0
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_closed_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_end.png b/src/qt/qdarkstyle/dark/rc/branch_end.png
new file mode 100644
index 000000000..f92994650
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_end.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_end@2x.png b/src/qt/qdarkstyle/dark/rc/branch_end@2x.png
new file mode 100644
index 000000000..582832220
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_end@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_end_disabled.png b/src/qt/qdarkstyle/dark/rc/branch_end_disabled.png
new file mode 100644
index 000000000..bb4344c78
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_end_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_end_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/branch_end_disabled@2x.png
new file mode 100644
index 000000000..8feb46d46
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_end_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_end_focus.png b/src/qt/qdarkstyle/dark/rc/branch_end_focus.png
new file mode 100644
index 000000000..ff713cf5f
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_end_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_end_focus@2x.png b/src/qt/qdarkstyle/dark/rc/branch_end_focus@2x.png
new file mode 100644
index 000000000..0bd0e4ba3
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_end_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_end_pressed.png b/src/qt/qdarkstyle/dark/rc/branch_end_pressed.png
new file mode 100644
index 000000000..2020162f2
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_end_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_end_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/branch_end_pressed@2x.png
new file mode 100644
index 000000000..2a5c4fabf
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_end_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_line.png b/src/qt/qdarkstyle/dark/rc/branch_line.png
new file mode 100644
index 000000000..2e8c72ab6
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_line.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_line@2x.png b/src/qt/qdarkstyle/dark/rc/branch_line@2x.png
new file mode 100644
index 000000000..c8f07af31
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_line@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_line_disabled.png b/src/qt/qdarkstyle/dark/rc/branch_line_disabled.png
new file mode 100644
index 000000000..9c8c47b3d
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_line_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_line_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/branch_line_disabled@2x.png
new file mode 100644
index 000000000..9b868f2a5
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_line_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_line_focus.png b/src/qt/qdarkstyle/dark/rc/branch_line_focus.png
new file mode 100644
index 000000000..c2ab3e19e
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_line_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_line_focus@2x.png b/src/qt/qdarkstyle/dark/rc/branch_line_focus@2x.png
new file mode 100644
index 000000000..512ee13a2
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_line_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_line_pressed.png b/src/qt/qdarkstyle/dark/rc/branch_line_pressed.png
new file mode 100644
index 000000000..3ca15c5d0
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_line_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_line_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/branch_line_pressed@2x.png
new file mode 100644
index 000000000..368553102
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_line_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_more.png b/src/qt/qdarkstyle/dark/rc/branch_more.png
new file mode 100644
index 000000000..976354bc4
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_more.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_more@2x.png b/src/qt/qdarkstyle/dark/rc/branch_more@2x.png
new file mode 100644
index 000000000..9c1ab07d0
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_more@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_more_disabled.png b/src/qt/qdarkstyle/dark/rc/branch_more_disabled.png
new file mode 100644
index 000000000..29d99a63e
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_more_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_more_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/branch_more_disabled@2x.png
new file mode 100644
index 000000000..aba830362
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_more_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_more_focus.png b/src/qt/qdarkstyle/dark/rc/branch_more_focus.png
new file mode 100644
index 000000000..20a6f27b8
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_more_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_more_focus@2x.png b/src/qt/qdarkstyle/dark/rc/branch_more_focus@2x.png
new file mode 100644
index 000000000..6f42eea84
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_more_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_more_pressed.png b/src/qt/qdarkstyle/dark/rc/branch_more_pressed.png
new file mode 100644
index 000000000..4f4d9fb91
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_more_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_more_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/branch_more_pressed@2x.png
new file mode 100644
index 000000000..5f18f8341
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_more_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_open.png b/src/qt/qdarkstyle/dark/rc/branch_open.png
new file mode 100644
index 000000000..fdf0f8b43
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_open.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_open@2x.png b/src/qt/qdarkstyle/dark/rc/branch_open@2x.png
new file mode 100644
index 000000000..703cd6af3
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_open@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_open_disabled.png b/src/qt/qdarkstyle/dark/rc/branch_open_disabled.png
new file mode 100644
index 000000000..8328e84d7
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_open_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_open_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/branch_open_disabled@2x.png
new file mode 100644
index 000000000..d8d0faecb
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_open_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_open_focus.png b/src/qt/qdarkstyle/dark/rc/branch_open_focus.png
new file mode 100644
index 000000000..711ce0979
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_open_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_open_focus@2x.png b/src/qt/qdarkstyle/dark/rc/branch_open_focus@2x.png
new file mode 100644
index 000000000..b38e17a33
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_open_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_open_pressed.png b/src/qt/qdarkstyle/dark/rc/branch_open_pressed.png
new file mode 100644
index 000000000..441c27344
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_open_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/branch_open_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/branch_open_pressed@2x.png
new file mode 100644
index 000000000..0e43e8b73
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/branch_open_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_checked.png b/src/qt/qdarkstyle/dark/rc/checkbox_checked.png
new file mode 100644
index 000000000..3687e56c0
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_checked.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_checked@2x.png b/src/qt/qdarkstyle/dark/rc/checkbox_checked@2x.png
new file mode 100644
index 000000000..e7a6b1afe
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_checked@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_checked_disabled.png b/src/qt/qdarkstyle/dark/rc/checkbox_checked_disabled.png
new file mode 100644
index 000000000..e3cb2f127
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_checked_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_checked_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/checkbox_checked_disabled@2x.png
new file mode 100644
index 000000000..0c8c28a24
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_checked_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_checked_focus.png b/src/qt/qdarkstyle/dark/rc/checkbox_checked_focus.png
new file mode 100644
index 000000000..58982ce87
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_checked_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_checked_focus@2x.png b/src/qt/qdarkstyle/dark/rc/checkbox_checked_focus@2x.png
new file mode 100644
index 000000000..ba33ba4fb
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_checked_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_checked_pressed.png b/src/qt/qdarkstyle/dark/rc/checkbox_checked_pressed.png
new file mode 100644
index 000000000..f104bb240
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_checked_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_checked_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/checkbox_checked_pressed@2x.png
new file mode 100644
index 000000000..bb972d68f
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_checked_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate.png b/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate.png
new file mode 100644
index 000000000..8159551de
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate@2x.png b/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate@2x.png
new file mode 100644
index 000000000..75864b46d
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate_disabled.png b/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate_disabled.png
new file mode 100644
index 000000000..181625a00
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate_disabled@2x.png
new file mode 100644
index 000000000..0d32c78f3
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate_focus.png b/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate_focus.png
new file mode 100644
index 000000000..d7b19f61a
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate_focus@2x.png b/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate_focus@2x.png
new file mode 100644
index 000000000..d6403ca42
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate_pressed.png b/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate_pressed.png
new file mode 100644
index 000000000..37f46ca3d
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate_pressed@2x.png
new file mode 100644
index 000000000..aa7493edc
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_indeterminate_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_unchecked.png b/src/qt/qdarkstyle/dark/rc/checkbox_unchecked.png
new file mode 100644
index 000000000..e363ed620
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_unchecked.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_unchecked@2x.png b/src/qt/qdarkstyle/dark/rc/checkbox_unchecked@2x.png
new file mode 100644
index 000000000..520f5e2a2
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_unchecked@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_unchecked_disabled.png b/src/qt/qdarkstyle/dark/rc/checkbox_unchecked_disabled.png
new file mode 100644
index 000000000..066185ee7
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_unchecked_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_unchecked_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/checkbox_unchecked_disabled@2x.png
new file mode 100644
index 000000000..9c80ad75a
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_unchecked_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_unchecked_focus.png b/src/qt/qdarkstyle/dark/rc/checkbox_unchecked_focus.png
new file mode 100644
index 000000000..366b868de
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_unchecked_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_unchecked_focus@2x.png b/src/qt/qdarkstyle/dark/rc/checkbox_unchecked_focus@2x.png
new file mode 100644
index 000000000..4ab217356
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_unchecked_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_unchecked_pressed.png b/src/qt/qdarkstyle/dark/rc/checkbox_unchecked_pressed.png
new file mode 100644
index 000000000..d9a0bf71c
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_unchecked_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/checkbox_unchecked_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/checkbox_unchecked_pressed@2x.png
new file mode 100644
index 000000000..9e2b0515e
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/checkbox_unchecked_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/line_horizontal.png b/src/qt/qdarkstyle/dark/rc/line_horizontal.png
new file mode 100644
index 000000000..4f88ddf7b
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/line_horizontal.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/line_horizontal@2x.png b/src/qt/qdarkstyle/dark/rc/line_horizontal@2x.png
new file mode 100644
index 000000000..63be00c16
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/line_horizontal@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/line_horizontal_disabled.png b/src/qt/qdarkstyle/dark/rc/line_horizontal_disabled.png
new file mode 100644
index 000000000..941f14a38
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/line_horizontal_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/line_horizontal_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/line_horizontal_disabled@2x.png
new file mode 100644
index 000000000..972fa0800
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/line_horizontal_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/line_horizontal_focus.png b/src/qt/qdarkstyle/dark/rc/line_horizontal_focus.png
new file mode 100644
index 000000000..221fd4607
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/line_horizontal_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/line_horizontal_focus@2x.png b/src/qt/qdarkstyle/dark/rc/line_horizontal_focus@2x.png
new file mode 100644
index 000000000..7e6505cae
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/line_horizontal_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/line_horizontal_pressed.png b/src/qt/qdarkstyle/dark/rc/line_horizontal_pressed.png
new file mode 100644
index 000000000..9f9113323
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/line_horizontal_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/line_horizontal_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/line_horizontal_pressed@2x.png
new file mode 100644
index 000000000..465680c3b
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/line_horizontal_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/line_vertical.png b/src/qt/qdarkstyle/dark/rc/line_vertical.png
new file mode 100644
index 000000000..6ee62c156
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/line_vertical.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/line_vertical@2x.png b/src/qt/qdarkstyle/dark/rc/line_vertical@2x.png
new file mode 100644
index 000000000..d65e74c62
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/line_vertical@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/line_vertical_disabled.png b/src/qt/qdarkstyle/dark/rc/line_vertical_disabled.png
new file mode 100644
index 000000000..c7c4c8959
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/line_vertical_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/line_vertical_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/line_vertical_disabled@2x.png
new file mode 100644
index 000000000..b052de522
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/line_vertical_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/line_vertical_focus.png b/src/qt/qdarkstyle/dark/rc/line_vertical_focus.png
new file mode 100644
index 000000000..36baa0936
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/line_vertical_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/line_vertical_focus@2x.png b/src/qt/qdarkstyle/dark/rc/line_vertical_focus@2x.png
new file mode 100644
index 000000000..24a2b771c
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/line_vertical_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/line_vertical_pressed.png b/src/qt/qdarkstyle/dark/rc/line_vertical_pressed.png
new file mode 100644
index 000000000..60e357446
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/line_vertical_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/line_vertical_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/line_vertical_pressed@2x.png
new file mode 100644
index 000000000..c9494051c
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/line_vertical_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/radio_checked.png b/src/qt/qdarkstyle/dark/rc/radio_checked.png
new file mode 100644
index 000000000..acb890155
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/radio_checked.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/radio_checked@2x.png b/src/qt/qdarkstyle/dark/rc/radio_checked@2x.png
new file mode 100644
index 000000000..e19047621
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/radio_checked@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/radio_checked_disabled.png b/src/qt/qdarkstyle/dark/rc/radio_checked_disabled.png
new file mode 100644
index 000000000..49df43922
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/radio_checked_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/radio_checked_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/radio_checked_disabled@2x.png
new file mode 100644
index 000000000..a9ffd40ce
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/radio_checked_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/radio_checked_focus.png b/src/qt/qdarkstyle/dark/rc/radio_checked_focus.png
new file mode 100644
index 000000000..4bd472e16
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/radio_checked_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/radio_checked_focus@2x.png b/src/qt/qdarkstyle/dark/rc/radio_checked_focus@2x.png
new file mode 100644
index 000000000..aed5e0c94
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/radio_checked_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/radio_checked_pressed.png b/src/qt/qdarkstyle/dark/rc/radio_checked_pressed.png
new file mode 100644
index 000000000..ebb323b8c
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/radio_checked_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/radio_checked_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/radio_checked_pressed@2x.png
new file mode 100644
index 000000000..ffe0fd851
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/radio_checked_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/radio_unchecked.png b/src/qt/qdarkstyle/dark/rc/radio_unchecked.png
new file mode 100644
index 000000000..9ffddc4a0
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/radio_unchecked.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/radio_unchecked@2x.png b/src/qt/qdarkstyle/dark/rc/radio_unchecked@2x.png
new file mode 100644
index 000000000..2160a32ed
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/radio_unchecked@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/radio_unchecked_disabled.png b/src/qt/qdarkstyle/dark/rc/radio_unchecked_disabled.png
new file mode 100644
index 000000000..7ddff642d
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/radio_unchecked_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/radio_unchecked_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/radio_unchecked_disabled@2x.png
new file mode 100644
index 000000000..4de5d0d2d
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/radio_unchecked_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/radio_unchecked_focus.png b/src/qt/qdarkstyle/dark/rc/radio_unchecked_focus.png
new file mode 100644
index 000000000..e62b996b1
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/radio_unchecked_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/radio_unchecked_focus@2x.png b/src/qt/qdarkstyle/dark/rc/radio_unchecked_focus@2x.png
new file mode 100644
index 000000000..eaf7bc26b
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/radio_unchecked_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/radio_unchecked_pressed.png b/src/qt/qdarkstyle/dark/rc/radio_unchecked_pressed.png
new file mode 100644
index 000000000..8aaa343e8
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/radio_unchecked_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/radio_unchecked_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/radio_unchecked_pressed@2x.png
new file mode 100644
index 000000000..ba4f83b91
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/radio_unchecked_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal.png b/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal.png
new file mode 100644
index 000000000..fa449d6ee
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal@2x.png b/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal@2x.png
new file mode 100644
index 000000000..682575ee2
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal_disabled.png b/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal_disabled.png
new file mode 100644
index 000000000..568b0fbe1
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal_disabled@2x.png
new file mode 100644
index 000000000..4d15f1478
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal_focus.png b/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal_focus.png
new file mode 100644
index 000000000..cdb96bfb9
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal_focus@2x.png b/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal_focus@2x.png
new file mode 100644
index 000000000..23e06a015
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal_pressed.png b/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal_pressed.png
new file mode 100644
index 000000000..9ce6f8d89
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal_pressed@2x.png
new file mode 100644
index 000000000..4d8e53e8e
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_move_horizontal_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical.png b/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical.png
new file mode 100644
index 000000000..bbc8abb1f
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical@2x.png b/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical@2x.png
new file mode 100644
index 000000000..136ebae2c
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical_disabled.png b/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical_disabled.png
new file mode 100644
index 000000000..37453ac25
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical_disabled@2x.png
new file mode 100644
index 000000000..cca8f6d96
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical_focus.png b/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical_focus.png
new file mode 100644
index 000000000..b54877181
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical_focus@2x.png b/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical_focus@2x.png
new file mode 100644
index 000000000..d4dd49dec
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical_pressed.png b/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical_pressed.png
new file mode 100644
index 000000000..768ebaf4c
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical_pressed@2x.png
new file mode 100644
index 000000000..2f170ffd8
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_move_vertical_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal.png b/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal.png
new file mode 100644
index 000000000..01e350132
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal@2x.png b/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal@2x.png
new file mode 100644
index 000000000..68d768e5e
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal_disabled.png b/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal_disabled.png
new file mode 100644
index 000000000..f8796f9e6
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal_disabled@2x.png
new file mode 100644
index 000000000..1d9f20421
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal_focus.png b/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal_focus.png
new file mode 100644
index 000000000..b592e61c1
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal_focus@2x.png b/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal_focus@2x.png
new file mode 100644
index 000000000..a593a7e76
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal_pressed.png b/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal_pressed.png
new file mode 100644
index 000000000..a806257e0
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal_pressed@2x.png
new file mode 100644
index 000000000..e1e8e3c14
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_separator_horizontal_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical.png b/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical.png
new file mode 100644
index 000000000..2a14f5cbd
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical@2x.png b/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical@2x.png
new file mode 100644
index 000000000..35371feea
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical_disabled.png b/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical_disabled.png
new file mode 100644
index 000000000..48b2657f5
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical_disabled@2x.png
new file mode 100644
index 000000000..a2173c5ee
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical_focus.png b/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical_focus.png
new file mode 100644
index 000000000..e31c694b0
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical_focus@2x.png b/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical_focus@2x.png
new file mode 100644
index 000000000..ce743cc86
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical_pressed.png b/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical_pressed.png
new file mode 100644
index 000000000..4ee7aaaab
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical_pressed@2x.png
new file mode 100644
index 000000000..d8bf93bf6
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/toolbar_separator_vertical_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/transparent.png b/src/qt/qdarkstyle/dark/rc/transparent.png
new file mode 100644
index 000000000..67753617f
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/transparent.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/transparent@2x.png b/src/qt/qdarkstyle/dark/rc/transparent@2x.png
new file mode 100644
index 000000000..4012944b5
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/transparent@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/transparent_disabled.png b/src/qt/qdarkstyle/dark/rc/transparent_disabled.png
new file mode 100644
index 000000000..67753617f
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/transparent_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/transparent_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/transparent_disabled@2x.png
new file mode 100644
index 000000000..4012944b5
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/transparent_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/transparent_focus.png b/src/qt/qdarkstyle/dark/rc/transparent_focus.png
new file mode 100644
index 000000000..67753617f
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/transparent_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/transparent_focus@2x.png b/src/qt/qdarkstyle/dark/rc/transparent_focus@2x.png
new file mode 100644
index 000000000..4012944b5
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/transparent_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/transparent_pressed.png b/src/qt/qdarkstyle/dark/rc/transparent_pressed.png
new file mode 100644
index 000000000..67753617f
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/transparent_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/transparent_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/transparent_pressed@2x.png
new file mode 100644
index 000000000..4012944b5
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/transparent_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_close.png b/src/qt/qdarkstyle/dark/rc/window_close.png
new file mode 100644
index 000000000..0b67d3bcc
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_close.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_close@2x.png b/src/qt/qdarkstyle/dark/rc/window_close@2x.png
new file mode 100644
index 000000000..bb8ac7da5
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_close@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_close_disabled.png b/src/qt/qdarkstyle/dark/rc/window_close_disabled.png
new file mode 100644
index 000000000..46de804b8
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_close_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_close_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/window_close_disabled@2x.png
new file mode 100644
index 000000000..8e4cd15d8
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_close_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_close_focus.png b/src/qt/qdarkstyle/dark/rc/window_close_focus.png
new file mode 100644
index 000000000..bb7d8c511
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_close_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_close_focus@2x.png b/src/qt/qdarkstyle/dark/rc/window_close_focus@2x.png
new file mode 100644
index 000000000..692ce24f2
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_close_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_close_pressed.png b/src/qt/qdarkstyle/dark/rc/window_close_pressed.png
new file mode 100644
index 000000000..53ae7f38e
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_close_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_close_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/window_close_pressed@2x.png
new file mode 100644
index 000000000..e02b12292
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_close_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_grip.png b/src/qt/qdarkstyle/dark/rc/window_grip.png
new file mode 100644
index 000000000..db9ccb877
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_grip.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_grip@2x.png b/src/qt/qdarkstyle/dark/rc/window_grip@2x.png
new file mode 100644
index 000000000..30b0639f4
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_grip@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_grip_disabled.png b/src/qt/qdarkstyle/dark/rc/window_grip_disabled.png
new file mode 100644
index 000000000..97c0e0f90
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_grip_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_grip_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/window_grip_disabled@2x.png
new file mode 100644
index 000000000..7a3d8de6d
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_grip_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_grip_focus.png b/src/qt/qdarkstyle/dark/rc/window_grip_focus.png
new file mode 100644
index 000000000..99b27c9ce
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_grip_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_grip_focus@2x.png b/src/qt/qdarkstyle/dark/rc/window_grip_focus@2x.png
new file mode 100644
index 000000000..833cb90a9
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_grip_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_grip_pressed.png b/src/qt/qdarkstyle/dark/rc/window_grip_pressed.png
new file mode 100644
index 000000000..afea9749e
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_grip_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_grip_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/window_grip_pressed@2x.png
new file mode 100644
index 000000000..c1c1a0e4b
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_grip_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_minimize.png b/src/qt/qdarkstyle/dark/rc/window_minimize.png
new file mode 100644
index 000000000..d8c54ebf2
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_minimize.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_minimize@2x.png b/src/qt/qdarkstyle/dark/rc/window_minimize@2x.png
new file mode 100644
index 000000000..5421a3690
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_minimize@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_minimize_disabled.png b/src/qt/qdarkstyle/dark/rc/window_minimize_disabled.png
new file mode 100644
index 000000000..cc51ed0ee
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_minimize_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_minimize_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/window_minimize_disabled@2x.png
new file mode 100644
index 000000000..c1676469f
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_minimize_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_minimize_focus.png b/src/qt/qdarkstyle/dark/rc/window_minimize_focus.png
new file mode 100644
index 000000000..1dcd083c0
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_minimize_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_minimize_focus@2x.png b/src/qt/qdarkstyle/dark/rc/window_minimize_focus@2x.png
new file mode 100644
index 000000000..2a4c868e0
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_minimize_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_minimize_pressed.png b/src/qt/qdarkstyle/dark/rc/window_minimize_pressed.png
new file mode 100644
index 000000000..0bb532126
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_minimize_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_minimize_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/window_minimize_pressed@2x.png
new file mode 100644
index 000000000..5a515c806
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_minimize_pressed@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_undock.png b/src/qt/qdarkstyle/dark/rc/window_undock.png
new file mode 100644
index 000000000..d1f454259
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_undock.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_undock@2x.png b/src/qt/qdarkstyle/dark/rc/window_undock@2x.png
new file mode 100644
index 000000000..f0efa3429
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_undock@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_undock_disabled.png b/src/qt/qdarkstyle/dark/rc/window_undock_disabled.png
new file mode 100644
index 000000000..6a609492b
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_undock_disabled.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_undock_disabled@2x.png b/src/qt/qdarkstyle/dark/rc/window_undock_disabled@2x.png
new file mode 100644
index 000000000..c2e1b8fa7
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_undock_disabled@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_undock_focus.png b/src/qt/qdarkstyle/dark/rc/window_undock_focus.png
new file mode 100644
index 000000000..d6eebbdc2
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_undock_focus.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_undock_focus@2x.png b/src/qt/qdarkstyle/dark/rc/window_undock_focus@2x.png
new file mode 100644
index 000000000..1aef06053
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_undock_focus@2x.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_undock_pressed.png b/src/qt/qdarkstyle/dark/rc/window_undock_pressed.png
new file mode 100644
index 000000000..8b6beb19e
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_undock_pressed.png differ
diff --git a/src/qt/qdarkstyle/dark/rc/window_undock_pressed@2x.png b/src/qt/qdarkstyle/dark/rc/window_undock_pressed@2x.png
new file mode 100644
index 000000000..677ded425
Binary files /dev/null and b/src/qt/qdarkstyle/dark/rc/window_undock_pressed@2x.png differ
diff --git a/src/qt/qt.c b/src/qt/qt.c
index c2a5396da..e19cf1aac 100644
--- a/src/qt/qt.c
+++ b/src/qt/qt.c
@@ -28,6 +28,7 @@
 #include <86box/plat.h>
 #include <86box/timer.h>
 #include <86box/nvr.h>
+#include <86box/renderdefs.h>
 
 int
 qt_nvr_save(void)
@@ -35,28 +36,19 @@ qt_nvr_save(void)
     return nvr_save();
 }
 
-char icon_set[256] = ""; /* name of the iconset to be used */
-
 int
-plat_vidapi(char *api)
+plat_vidapi(const char *api)
 {
-    if (!strcasecmp(api, "default") || !strcasecmp(api, "system")) {
-        return 0;
-    } else if (!strcasecmp(api, "qt_software")) {
-        return 0;
-    } else if (!strcasecmp(api, "qt_opengl")) {
-        return 1;
-    } else if (!strcasecmp(api, "qt_opengles")) {
-        return 2;
-    } else if (!strcasecmp(api, "qt_opengl3")) {
-        return 3;
-    } else if (!strcasecmp(api, "qt_vulkan")) {
-        return 4;
-    } else if (!strcasecmp(api, "qt_d3d9")) {
-        return 5;
-    } else if (!strcasecmp(api, "vnc")) {
-        return 6;
-    }
+    if (!strcasecmp(api, RENDERER_NAME_DEFAULT) || !strcasecmp(api, RENDERER_NAME_SYSTEM))
+        return RENDERER_SOFTWARE;
+    else if (!strcasecmp(api, RENDERER_NAME_QT_SOFTWARE))
+        return RENDERER_SOFTWARE;
+    else if (!strcasecmp(api, RENDERER_NAME_QT_OPENGL) || !strcasecmp(api, RENDERER_NAME_QT_OPENGLES) || !strcasecmp(api, RENDERER_NAME_QT_OPENGL3))
+        return RENDERER_OPENGL3;
+    else if (!strcasecmp(api, RENDERER_NAME_QT_VULKAN))
+        return RENDERER_VULKAN;
+    else if (!strcasecmp(api, RENDERER_NAME_VNC))
+        return RENDERER_VNC;
 
     return 0;
 }
@@ -64,29 +56,20 @@ plat_vidapi(char *api)
 char *
 plat_vidapi_name(int api)
 {
-    char *name = "default";
+    char *name = RENDERER_NAME_DEFAULT;
 
     switch (api) {
-        case 0:
-            name = "qt_software";
+        case RENDERER_SOFTWARE:
+            name = RENDERER_NAME_QT_SOFTWARE;
             break;
-        case 1:
-            name = "qt_opengl";
+        case RENDERER_OPENGL3:
+            name = RENDERER_NAME_QT_OPENGL3;
             break;
-        case 2:
-            name = "qt_opengles";
+        case RENDERER_VULKAN:
+            name = RENDERER_NAME_QT_VULKAN;
             break;
-        case 3:
-            name = "qt_opengl3";
-            break;
-        case 4:
-            name = "qt_vulkan";
-            break;
-        case 5:
-            name = "qt_d3d9";
-            break;
-        case 6:
-            name = "vnc";
+        case RENDERER_VNC:
+            name = RENDERER_NAME_VNC;
             break;
         default:
             fatal("Unknown renderer: %i\n", api);
diff --git a/src/qt/qt_about.cpp b/src/qt/qt_about.cpp
new file mode 100644
index 000000000..6c34c2add
--- /dev/null
+++ b/src/qt/qt_about.cpp
@@ -0,0 +1,75 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          About dialog module.
+ *
+ *
+ *
+ * Authors: Joakim L. Gilje <jgilje@jgilje.net>
+ *          Cacodemon345
+ *          Teemu Korhonen
+ *          dob205
+ *
+ *          Copyright 2021 Joakim L. Gilje
+ *          Copyright 2021-2022 Cacodemon345
+ *          Copyright 2021-2022 Teemu Korhonen
+ *          Copyright 2022 dob205
+ */
+#include "qt_about.hpp"
+
+extern "C" {
+#include <86box/86box.h>
+#include <86box/version.h>
+}
+
+#include <QMessageBox>
+#include <QIcon>
+#include <QPushButton>
+#include <QUrl>
+#include <QDesktopServices>
+
+About::About(QWidget *parent)
+{
+    setTextFormat(Qt::RichText);
+    QString versioninfo;
+#ifdef EMU_GIT_HASH
+    versioninfo = QString(" [%1]").arg(EMU_GIT_HASH);
+#endif
+#ifdef USE_DYNAREC
+#    ifdef USE_NEW_DYNAREC
+#        define DYNAREC_STR "new dynarec"
+#    else
+#        define DYNAREC_STR "old dynarec"
+#    endif
+#else
+#    define DYNAREC_STR "no dynarec"
+#endif
+    versioninfo.append(QString(" [%1, %2]").arg(QSysInfo::buildCpuArchitecture(), tr(DYNAREC_STR)));
+    setText(QString("<b>%3%1%2</b>").arg(EMU_VERSION_FULL, versioninfo, tr("86Box v")));
+    setInformativeText(tr("An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information.").replace("\n", "<br>"));
+    setWindowTitle(tr("About 86Box"));
+    const auto closeButton = addButton("OK", QMessageBox::ButtonRole::AcceptRole);
+    setEscapeButton(closeButton);
+    const auto webSiteButton = addButton(EMU_SITE, QMessageBox::ButtonRole::HelpRole);
+    webSiteButton->connect(webSiteButton, &QPushButton::released, []() {
+        QDesktopServices::openUrl(QUrl("https://" EMU_SITE));
+    });
+#ifdef RELEASE_BUILD
+    setIconPixmap(QIcon(":/settings/qt/icons/86Box-green.ico").pixmap(32, 32));
+#elif defined ALPHA_BUILD
+    setIconPixmap(QIcon(":/settings/qt/icons/86Box-red.ico").pixmap(32, 32));
+#elif defined BETA_BUILD
+    setIconPixmap(QIcon(":/settings/qt/icons/86Box-yellow.ico").pixmap(32, 32));
+#else
+    setIconPixmap(QIcon(":/settings/qt/icons/86Box-gray.ico").pixmap(32, 32));
+#endif
+    setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint);
+}
+
+About::~About()
+    = default;
diff --git a/src/qt/qt_about.hpp b/src/qt/qt_about.hpp
new file mode 100644
index 000000000..206aab37b
--- /dev/null
+++ b/src/qt/qt_about.hpp
@@ -0,0 +1,13 @@
+#ifndef QT_ABOUT_HPP
+#define QT_ABOUT_HPP
+
+#include <QMessageBox>
+
+class About final : public QMessageBox {
+    Q_OBJECT
+
+public:
+    explicit About(QWidget *parent = nullptr);
+    ~About() override;
+};
+#endif // QT_ABOUT_HPP
\ No newline at end of file
diff --git a/src/qt/qt_cdrom.c b/src/qt/qt_cdrom.c
deleted file mode 100644
index 1facae486..000000000
--- a/src/qt/qt_cdrom.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Handle the platform-side of CDROM/ZIP/MO drives.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          Fred N. van Kempen, <decwiz@yahoo.com>
- *
- *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2017-2018 Fred N. van Kempen.
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/config.h>
-#include <86box/timer.h>
-#include <86box/device.h>
-#include <86box/cassette.h>
-#include <86box/cartridge.h>
-#include <86box/fdd.h>
-#include <86box/hdd.h>
-#include <86box/scsi_device.h>
-#include <86box/cdrom.h>
-#include <86box/mo.h>
-#include <86box/zip.h>
-#include <86box/scsi_disk.h>
-#include <86box/plat.h>
-#include <86box/ui.h>
-
-void
-plat_cdrom_ui_update(uint8_t id, uint8_t reload)
-{
-    cdrom_t *drv = &cdrom[id];
-
-    if (drv->host_drive == 0) {
-        ui_sb_update_icon_state(SB_CDROM | id, 1);
-    } else {
-        ui_sb_update_icon_state(SB_CDROM | id, 0);
-    }
-
-    // media_menu_update_cdrom(id);
-    ui_sb_update_tip(SB_CDROM | id);
-}
diff --git a/src/qt/qt_cgasettingsdialog.cpp b/src/qt/qt_cgasettingsdialog.cpp
new file mode 100644
index 000000000..ee9aa86b6
--- /dev/null
+++ b/src/qt/qt_cgasettingsdialog.cpp
@@ -0,0 +1,94 @@
+#include "qt_cgasettingsdialog.hpp"
+#include "ui_qt_cgasettingsdialog.h"
+
+#include <QPushButton>
+
+extern "C"
+{
+#include <86box/86box.h>
+#include <86box/plat.h>
+#include <86box/vid_cga_comp.h>
+}
+
+CGASettingsDialog::CGASettingsDialog(QWidget *parent)
+    : QDialog(parent)
+    , ui(new Ui::CGASettingsDialog)
+{
+    ui->setupUi(this);
+
+    cga_hue = vid_cga_comp_hue;
+    cga_saturation = vid_cga_comp_saturation;
+    cga_brightness = vid_cga_comp_brightness;
+    cga_contrast = vid_cga_comp_contrast;
+    cga_sharpness = vid_cga_comp_sharpness;
+
+    ui->horizontalSliderHue->setValue(vid_cga_comp_hue);
+    ui->horizontalSliderSaturation->setValue(vid_cga_comp_saturation);
+    ui->horizontalSliderBrightness->setValue(vid_cga_comp_brightness);
+    ui->horizontalSliderContrast->setValue(vid_cga_comp_contrast);
+    ui->horizontalSliderSharpness->setValue(vid_cga_comp_sharpness);
+
+    connect(ui->buttonBox->button(QDialogButtonBox::Apply), &QPushButton::clicked, this, &CGASettingsDialog::applySettings);
+    connect(ui->buttonBox->button(QDialogButtonBox::Reset), &QPushButton::clicked, this, [this]
+    {
+        ui->horizontalSliderHue->setValue(0);
+        ui->horizontalSliderSaturation->setValue(100);
+        ui->horizontalSliderBrightness->setValue(0);
+        ui->horizontalSliderContrast->setValue(100);
+        ui->horizontalSliderSharpness->setValue(0);
+    });
+
+    connect(ui->horizontalSliderHue, &QSlider::valueChanged, this, [this] { updateDisplay(); } );
+    connect(ui->horizontalSliderSaturation, &QSlider::valueChanged, this, [this] { updateDisplay(); } );
+    connect(ui->horizontalSliderBrightness, &QSlider::valueChanged, this, [this] { updateDisplay(); } );
+    connect(ui->horizontalSliderContrast, &QSlider::valueChanged, this, [this] { updateDisplay(); } );
+    connect(ui->horizontalSliderSharpness, &QSlider::valueChanged, this, [this] { updateDisplay(); } );
+}
+
+CGASettingsDialog::~CGASettingsDialog()
+{
+    delete ui;
+}
+
+void CGASettingsDialog::updateDisplay()
+{
+    auto temp_cga_comp_hue        = ui->horizontalSliderHue->value();
+    auto temp_cga_comp_saturation = ui->horizontalSliderSaturation->value();
+    auto temp_cga_comp_brightness = ui->horizontalSliderBrightness->value();
+    auto temp_cga_comp_contrast   = ui->horizontalSliderContrast->value();
+    auto temp_cga_comp_sharpness  = ui->horizontalSliderSharpness->value();
+    cga_comp_reload(temp_cga_comp_brightness, temp_cga_comp_saturation, temp_cga_comp_sharpness, temp_cga_comp_hue, temp_cga_comp_contrast);
+}
+
+void CGASettingsDialog::applySettings()
+{
+    vid_cga_comp_hue        = ui->horizontalSliderHue->value();
+    vid_cga_comp_saturation = ui->horizontalSliderSaturation->value();
+    vid_cga_comp_brightness = ui->horizontalSliderBrightness->value();
+    vid_cga_comp_contrast   = ui->horizontalSliderContrast->value();
+    vid_cga_comp_sharpness  = ui->horizontalSliderSharpness->value();
+    cga_comp_reload(vid_cga_comp_brightness, vid_cga_comp_saturation, vid_cga_comp_sharpness, vid_cga_comp_hue, vid_cga_comp_contrast);
+
+    cga_hue = vid_cga_comp_hue;
+    cga_saturation = vid_cga_comp_saturation;
+    cga_brightness = vid_cga_comp_brightness;
+    cga_contrast = vid_cga_comp_contrast;
+    cga_sharpness = vid_cga_comp_sharpness;
+}
+
+void CGASettingsDialog::on_buttonBox_accepted()
+{
+    applySettings();
+}
+
+void CGASettingsDialog::on_buttonBox_rejected()
+{
+    vid_cga_comp_hue = cga_hue;
+    vid_cga_comp_saturation = cga_saturation;
+    vid_cga_comp_brightness = cga_brightness;
+    vid_cga_comp_contrast = cga_contrast;
+    vid_cga_comp_sharpness = cga_sharpness;
+
+    cga_comp_reload(vid_cga_comp_brightness, vid_cga_comp_saturation, vid_cga_comp_sharpness, vid_cga_comp_hue, vid_cga_comp_contrast);
+}
+
diff --git a/src/qt/qt_cgasettingsdialog.hpp b/src/qt/qt_cgasettingsdialog.hpp
new file mode 100644
index 000000000..e0a4e76d1
--- /dev/null
+++ b/src/qt/qt_cgasettingsdialog.hpp
@@ -0,0 +1,31 @@
+#ifndef QT_CGASETTINGSDIALOG_HPP
+#define QT_CGASETTINGSDIALOG_HPP
+
+#include <QDialog>
+
+namespace Ui {
+class CGASettingsDialog;
+}
+
+class CGASettingsDialog : public QDialog {
+    Q_OBJECT
+
+public:
+    explicit CGASettingsDialog(QWidget *parent = nullptr);
+    ~CGASettingsDialog();
+
+private slots:
+    void on_buttonBox_accepted();
+
+    void on_buttonBox_rejected();
+
+private:
+    Ui::CGASettingsDialog *ui;
+
+    void applySettings();
+    void updateDisplay();
+
+    int cga_hue, cga_saturation, cga_sharpness, cga_brightness, cga_contrast;
+};
+
+#endif // QT_CGASETTINGSDIALOG_HPP
diff --git a/src/qt/qt_cgasettingsdialog.ui b/src/qt/qt_cgasettingsdialog.ui
new file mode 100644
index 000000000..7367b2099
--- /dev/null
+++ b/src/qt/qt_cgasettingsdialog.ui
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CGASettingsDialog</class>
+ <widget class="QDialog" name="CGASettingsDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>CGA composite settings</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <property name="sizeConstraint">
+    <enum>QLayout::SizeConstraint::SetFixedSize</enum>
+   </property>
+   <item row="2" column="2">
+    <widget class="QSlider" name="horizontalSliderBrightness">
+     <property name="minimum">
+      <number>-100</number>
+     </property>
+     <property name="maximum">
+      <number>100</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Orientation::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QSlider" name="horizontalSliderSaturation">
+     <property name="maximum">
+      <number>360</number>
+     </property>
+     <property name="value">
+      <number>100</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Orientation::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Hue</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="2">
+    <widget class="QSlider" name="horizontalSliderSharpness">
+     <property name="minimum">
+      <number>-50</number>
+     </property>
+     <property name="maximum">
+      <number>50</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Orientation::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Orientation::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::StandardButton::Apply|QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok|QDialogButtonBox::StandardButton::Reset</set>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="2">
+    <widget class="QSlider" name="horizontalSliderContrast">
+     <property name="maximum">
+      <number>360</number>
+     </property>
+     <property name="value">
+      <number>100</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Orientation::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>Contrast</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <widget class="QSlider" name="horizontalSliderHue">
+     <property name="minimum">
+      <number>-360</number>
+     </property>
+     <property name="maximum">
+      <number>360</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Orientation::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>Sharpness</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Saturation</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Brightness</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CGASettingsDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>CGASettingsDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/qt/qt_d3d9renderer.cpp b/src/qt/qt_d3d9renderer.cpp
deleted file mode 100644
index 868f58274..000000000
--- a/src/qt/qt_d3d9renderer.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-#include "qt_mainwindow.hpp"
-#include "qt_d3d9renderer.hpp"
-#include <QResizeEvent>
-#include <QTimer>
-
-extern "C" {
-#include <86box/86box.h>
-#include <86box/video.h>
-}
-
-D3D9Renderer::D3D9Renderer(QWidget *parent, int monitor_index)
-    : QWidget { parent }
-    , RendererCommon()
-{
-    QPalette pal = palette();
-    pal.setColor(QPalette::Window, Qt::black);
-    setAutoFillBackground(true);
-    setPalette(pal);
-
-    setAttribute(Qt::WA_NativeWindow);
-    setAttribute(Qt::WA_PaintOnScreen);
-    setAttribute(Qt::WA_NoSystemBackground);
-    setAttribute(Qt::WA_OpaquePaintEvent);
-
-    windowHandle = (HWND) winId();
-    surfaceInUse = true;
-    finalized = true;
-
-    RendererCommon::parentWidget = parent;
-
-    this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    this->m_monitor_index = monitor_index;
-
-    d3d9surface = nullptr;
-    d3d9dev = nullptr;
-    d3d9 = nullptr;
-}
-
-D3D9Renderer::~D3D9Renderer()
-{
-    finalize();
-}
-
-void
-D3D9Renderer::finalize()
-{
-    if (!finalized) {
-        while (surfaceInUse) { }
-        finalized = true;
-    }
-    surfaceInUse = true;
-    if (d3d9surface) {
-        d3d9surface->Release();
-        d3d9surface = nullptr;
-    }
-    if (d3d9dev) {
-        d3d9dev->Release();
-        d3d9dev = nullptr;
-    }
-    if (d3d9) {
-        d3d9->Release();
-        d3d9 = nullptr;
-    }
-}
-
-void
-D3D9Renderer::hideEvent(QHideEvent *event)
-{
-    finalize();
-}
-
-void
-D3D9Renderer::showEvent(QShowEvent *event)
-{
-    if (d3d9) finalize();
-    params = {};
-
-    if (FAILED(Direct3DCreate9Ex(D3D_SDK_VERSION, &d3d9))) {
-        return error("Failed to create Direct3D 9 context");
-    }
-
-    params.Windowed                   = true;
-    params.SwapEffect                 = D3DSWAPEFFECT_FLIPEX;
-    params.BackBufferWidth            = width() * devicePixelRatioF();
-    params.BackBufferHeight           = height() * devicePixelRatioF();
-    params.BackBufferCount            = 1;
-    params.FullScreen_RefreshRateInHz = D3DPRESENT_RATE_DEFAULT;
-    params.PresentationInterval       = D3DPRESENT_INTERVAL_IMMEDIATE;
-    params.hDeviceWindow              = (HWND) winId();
-
-    HRESULT result = d3d9->CreateDeviceEx(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, windowHandle, D3DCREATE_MULTITHREADED | D3DCREATE_HARDWARE_VERTEXPROCESSING, &params, nullptr, &d3d9dev);
-    if (FAILED(result))
-        result = d3d9->CreateDeviceEx(D3DADAPTER_DEFAULT, D3DDEVTYPE_REF, windowHandle, D3DCREATE_MULTITHREADED | D3DCREATE_SOFTWARE_VERTEXPROCESSING, &params, nullptr, &d3d9dev);
-    if (FAILED(result)) {
-        return error("Failed to create Direct3D 9 device");
-    }
-
-    result = d3d9dev->CreateOffscreenPlainSurface(2048, 2048, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &d3d9surface, nullptr);
-    if (FAILED(result))
-        result = d3d9dev->CreateOffscreenPlainSurface(1024, 1024, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &d3d9surface, nullptr);
-    if (FAILED(result)) {
-        return error("Failed to create Direct3D 9 surface");
-    }
-    if (!alreadyInitialized) {
-        emit initialized();
-        alreadyInitialized = true;
-    }
-    surfaceInUse = false;
-    finalized    = false;
-}
-
-void
-D3D9Renderer::paintEvent(QPaintEvent *event)
-{
-    IDirect3DSurface9 *backbuffer = nullptr;
-    RECT               srcRect;
-    RECT               dstRect;
-    HRESULT            result = d3d9dev->GetBackBuffer(0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer);
-
-    if (FAILED(result)) {
-        return;
-    }
-
-    srcRect.top    = source.top();
-    srcRect.bottom = source.bottom();
-    srcRect.left   = source.left();
-    srcRect.right  = source.right();
-    dstRect.top    = destination.top() * devicePixelRatioF();
-    dstRect.bottom = destination.bottom() * devicePixelRatioF();
-    dstRect.left   = destination.left() * devicePixelRatioF();
-    dstRect.right  = destination.right() * devicePixelRatioF();
-    d3d9dev->BeginScene();
-    d3d9dev->Clear(0, nullptr, D3DCLEAR_TARGET, 0xFF000000, 0, 0);
-    while (surfaceInUse) { }
-    surfaceInUse = true;
-    d3d9dev->StretchRect(d3d9surface, &srcRect, backbuffer, &dstRect, video_filter_method == 0 ? D3DTEXF_POINT : D3DTEXF_LINEAR);
-    result       = d3d9dev->EndScene();
-    surfaceInUse = false;
-    if (SUCCEEDED(result)) {
-        if (FAILED(d3d9dev->PresentEx(nullptr, nullptr, 0, nullptr, 0))) {
-            finalize();
-            showEvent(nullptr);
-        }
-    }
-}
-
-bool
-D3D9Renderer::event(QEvent *event)
-{
-    bool res = false;
-    if (!eventDelegate(event, res))
-        return QWidget::event(event);
-    return res;
-}
-
-void
-D3D9Renderer::resizeEvent(QResizeEvent *event)
-{
-    onResize(event->size().width() * devicePixelRatioF(), event->size().height() * devicePixelRatioF());
-
-    params.BackBufferWidth  = event->size().width() * devicePixelRatioF();
-    params.BackBufferHeight = event->size().height() * devicePixelRatioF();
-    if (d3d9dev)
-        d3d9dev->Reset(&params);
-    QWidget::resizeEvent(event);
-}
-
-void
-D3D9Renderer::blit(int x, int y, int w, int h)
-{
-    if (blitDummied || (x < 0) || (y < 0) || (w <= 0) || (h <= 0) || (w > 2048) || (h > 2048) || (monitors[m_monitor_index].target_buffer == NULL) || surfaceInUse) {
-        video_blit_complete_monitor(m_monitor_index);
-        return;
-    }
-    surfaceInUse    = true;
-    auto origSource = source;
-    source.setRect(x, y, w, h);
-    RECT           srcRect;
-    D3DLOCKED_RECT lockRect;
-    srcRect.top    = source.top();
-    srcRect.bottom = source.bottom();
-    srcRect.left   = source.left();
-    srcRect.right  = source.right();
-
-    if (monitors[m_monitor_index].mon_screenshots) {
-        video_screenshot_monitor((uint32_t *) &(monitors[m_monitor_index].target_buffer->line[y][x]), 0, 0, 2048, m_monitor_index);
-    }
-    if (SUCCEEDED(d3d9surface->LockRect(&lockRect, &srcRect, 0))) {
-        for (int y1 = 0; y1 < h; y1++) {
-            video_copy(((uint8_t *) lockRect.pBits) + (y1 * lockRect.Pitch), &(monitors[m_monitor_index].target_buffer->line[y + y1][x]), w * 4);
-        }
-        video_blit_complete_monitor(m_monitor_index);
-        d3d9surface->UnlockRect();
-    } else
-        video_blit_complete_monitor(m_monitor_index);
-    if (origSource != source)
-        onResize(this->width() * devicePixelRatioF(), this->height() * devicePixelRatioF());
-    surfaceInUse = false;
-    QTimer::singleShot(0, this, [this] { this->update(); });
-}
diff --git a/src/qt/qt_d3d9renderer.hpp b/src/qt/qt_d3d9renderer.hpp
deleted file mode 100644
index 37c27443b..000000000
--- a/src/qt/qt_d3d9renderer.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef D3D9RENDERER_HPP
-#define D3D9RENDERER_HPP
-
-#include <QWidget>
-#include "qt_renderercommon.hpp"
-
-#include <windows.h>
-#include <d3d9.h>
-#include <atomic>
-
-class D3D9Renderer : public QWidget, public RendererCommon {
-    Q_OBJECT
-public:
-    explicit D3D9Renderer(QWidget *parent = nullptr, int monitor_index = 0);
-    ~D3D9Renderer();
-    bool hasBlitFunc() override { return true; }
-    void blit(int x, int y, int w, int h) override;
-    void finalize() override;
-
-protected:
-    void          showEvent(QShowEvent *event) override;
-    void          hideEvent(QHideEvent *event) override;
-    void          resizeEvent(QResizeEvent *event) override;
-    void          paintEvent(QPaintEvent *event) override;
-    bool          event(QEvent *event) override;
-    QPaintEngine *paintEngine() const override { return nullptr; }
-
-signals:
-    void initialized();
-    void error(QString);
-
-private:
-    HWND                  windowHandle = 0;
-    D3DPRESENT_PARAMETERS params {};
-    IDirect3D9Ex         *d3d9        = nullptr;
-    IDirect3DDevice9Ex   *d3d9dev     = nullptr;
-    IDirect3DSurface9    *d3d9surface = nullptr;
-
-    std::atomic<bool> surfaceInUse { false };
-    std::atomic<bool> finalized { false };
-    bool              alreadyInitialized = false;
-    int               m_monitor_index    = 0;
-};
-
-#endif // D3D9RENDERER_HPP
diff --git a/src/qt/qt_deviceconfig.cpp b/src/qt/qt_deviceconfig.cpp
index 6c7db0f3d..33572c99c 100644
--- a/src/qt/qt_deviceconfig.cpp
+++ b/src/qt/qt_deviceconfig.cpp
@@ -22,6 +22,7 @@
 
 #include <QDebug>
 #include <QComboBox>
+#include <QPushButton>
 #include <QFormLayout>
 #include <QSpinBox>
 #include <QCheckBox>
@@ -30,6 +31,7 @@
 #include <QLabel>
 #include <QDir>
 #include <QSettings>
+#include <QStringBuilder>
 
 extern "C" {
 #include <86box/86box.h>
@@ -38,11 +40,13 @@ extern "C" {
 #include <86box/device.h>
 #include <86box/midi_rtmidi.h>
 #include <86box/mem.h>
+#include <86box/random.h>
 #include <86box/rom.h>
 }
 
 #include "qt_filefield.hpp"
 #include "qt_models_common.hpp"
+#include "qt_util.hpp"
 #ifdef Q_OS_LINUX
 #    include <sys/stat.h>
 #    include <sys/sysmacros.h>
@@ -84,10 +88,15 @@ EnumerateSerialDevices()
 #ifdef Q_OS_WINDOWS
     for (int i = 1; i < 256; i++) {
         devstr[0] = 0;
-        snprintf(devstr.data(), 1024, "\\\\.\\COM%d", i);
-        auto handle = CreateFileA(devstr.data(), GENERIC_READ | GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, 0, 0);
-        auto dwError = GetLastError();
-        if (handle != INVALID_HANDLE_VALUE || (handle == INVALID_HANDLE_VALUE && ((dwError == ERROR_ACCESS_DENIED) || (dwError == ERROR_GEN_FAILURE) || (dwError == ERROR_SHARING_VIOLATION) || (dwError == ERROR_SEM_TIMEOUT)))) {
+        snprintf(devstr.data(), 1024, R"(\\.\COM%d)", i);
+        const auto handle = CreateFileA(devstr.data(),
+                                               GENERIC_READ | GENERIC_WRITE, 0,
+                                               nullptr, OPEN_EXISTING,
+                                               0, nullptr);
+        const auto dwError = GetLastError();
+        if ((handle != INVALID_HANDLE_VALUE) || (dwError == ERROR_ACCESS_DENIED) ||
+            (dwError == ERROR_GEN_FAILURE) || (dwError == ERROR_SHARING_VIOLATION) ||
+            (dwError == ERROR_SEM_TIMEOUT)) {
             if (handle != INVALID_HANDLE_VALUE) CloseHandle(handle);
             serialDevices.push_back(QString(devstr));
         }
@@ -104,211 +113,308 @@ EnumerateSerialDevices()
     return serialDevices;
 }
 
+void
+DeviceConfig::ProcessConfig(void *dc, const void *c, const bool is_dep)
+{
+    auto *        device_context = static_cast<device_context_t *>(dc);
+    const auto *  config         = static_cast<const _device_config_ *>(c);
+    const QString blank          = "";
+    int           p;
+    int           q;
+
+    if (config == NULL)
+        return;
+
+    while (config->type != CONFIG_END) {
+        const int config_type = config->type & CONFIG_TYPE_MASK;
+
+        /* Ignore options of the wrong class. */
+        if (!!(config->type & CONFIG_DEP) != is_dep)
+            continue;
+
+        /* If this is a BIOS-dependent option and it's BIOS, ignore it. */
+        if (!!(config->type & CONFIG_DEP) && (config_type == CONFIG_BIOS))
+            continue;
+
+        const int config_major_type = (config_type >> CONFIG_SHIFT) << CONFIG_SHIFT;
+
+        int value = 0;
+        auto selected = blank;
+
+        switch (config_major_type) {
+            default:
+                break;
+            case CONFIG_TYPE_INT:
+                value = config_get_int(device_context->name, const_cast<char *>(config->name),
+                                       config->default_int);
+                break;
+            case CONFIG_TYPE_HEX16:
+                value = config_get_hex16(device_context->name, const_cast<char *>(config->name),
+                                         config->default_int);
+                break;
+            case CONFIG_TYPE_HEX20:
+                value = config_get_hex20(device_context->name, const_cast<char *>(config->name),
+                                         config->default_int);
+                break;
+            case CONFIG_TYPE_STRING:
+                selected = config_get_string(device_context->name, const_cast<char *>(config->name),
+                                             const_cast<char *>(config->default_string));
+                break;
+        }
+
+        switch (config->type) {
+            default:
+                break;
+            case CONFIG_BINARY:
+            {
+                auto *cbox  = new QCheckBox();
+                cbox->setObjectName(config->name);
+                cbox->setChecked(value > 0);
+                this->ui->formLayout->addRow(tr(config->description), cbox);
+                break;
+            }
+#ifdef USE_RTMIDI
+            case CONFIG_MIDI_OUT:
+            {
+                auto *cbox = new QComboBox();
+                cbox->setObjectName(config->name);
+                cbox->setMaxVisibleItems(30);
+                auto *model        = cbox->model();
+                int   currentIndex = -1;
+                for (int i = 0; i < rtmidi_out_get_num_devs(); i++) {
+                    char midiName[512] = { 0 };
+                    rtmidi_out_get_dev_name(i, midiName);
+
+                    Models::AddEntry(model, midiName, i);
+                    if (i == value)
+                        currentIndex = i;
+                }
+                this->ui->formLayout->addRow(tr(config->description), cbox);
+                cbox->setCurrentIndex(currentIndex);
+                break;
+            }
+            case CONFIG_MIDI_IN:
+            {
+                auto *cbox = new QComboBox();
+                cbox->setObjectName(config->name);
+                cbox->setMaxVisibleItems(30);
+                auto *model        = cbox->model();
+                int   currentIndex = -1;
+                for (int i = 0; i < rtmidi_in_get_num_devs(); i++) {
+                    char midiName[512] = { 0 };
+                    rtmidi_in_get_dev_name(i, midiName);
+
+                    Models::AddEntry(model, midiName, i);
+                    if (i == value)
+                        currentIndex = i;
+                }
+                this->ui->formLayout->addRow(tr(config->description), cbox);
+                cbox->setCurrentIndex(currentIndex);
+                break;
+            }
+#endif
+            case CONFIG_INT:
+            case CONFIG_SELECTION:
+            case CONFIG_HEX16:
+            case CONFIG_HEX20:
+            {
+                auto *cbox = new QComboBox();
+                cbox->setObjectName(config->name);
+                cbox->setMaxVisibleItems(30);
+                auto *model        = cbox->model();
+                int   currentIndex = -1;
+
+                for (auto *sel = config->selection; (sel != nullptr) && (sel->description != nullptr) &&
+                                                    (strlen(sel->description) > 0); ++sel) {
+                    int row = Models::AddEntry(model, tr(sel->description), sel->value);
+
+                    if (sel->value == value)
+                        currentIndex = row;
+                }
+                this->ui->formLayout->addRow(tr(config->description), cbox);
+                cbox->setCurrentIndex(currentIndex);
+                break;
+            }
+            case CONFIG_BIOS:
+            {
+                auto *cbox = new QComboBox();
+                cbox->setObjectName(config->name);
+                cbox->setMaxVisibleItems(30);
+                auto *model        = cbox->model();
+                int   currentIndex = -1;
+
+                q = 0;
+                for (auto *bios = config->bios; (bios != nullptr) &&
+                                                (bios->name != nullptr) &&
+                                                (bios->internal_name != nullptr) &&
+                                                (strlen(bios->name) > 0) &&
+                                                (strlen(bios->internal_name) > 0) &&
+                                                (bios->files_no > 0); ++bios) {
+                    p = 0;
+                    for (int d = 0; d < bios->files_no; d++)
+                        p += !!rom_present(const_cast<char *>(bios->files[d]));
+                    if (p == bios->files_no) {
+                        const int row = Models::AddEntry(model, tr(bios->name), q);
+                        if (!strcmp(selected.toUtf8().constData(), bios->internal_name))
+                            currentIndex = row;
+                    }
+                    q++;
+                }
+                this->ui->formLayout->addRow(tr(config->description), cbox);
+                cbox->setCurrentIndex(currentIndex);
+                break;
+            }
+            case CONFIG_SPINNER:
+            {
+                auto *spinBox = new QSpinBox();
+                spinBox->setObjectName(config->name);
+                spinBox->setMaximum(config->spinner.max);
+                spinBox->setMinimum(config->spinner.min);
+                if (config->spinner.step > 0)
+                    spinBox->setSingleStep(config->spinner.step);
+                spinBox->setValue(value);
+                this->ui->formLayout->addRow(tr(config->description), spinBox);
+                break;
+            }
+            case CONFIG_FNAME:
+            {
+                auto *fileField = new FileField(this);
+                fileField->setObjectName(config->name);
+                fileField->setFileName(selected);
+                /* Get the actually used part of the filter */
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+                QString filter = QString(config->file_filter).left(static_cast<int>(strcspn(config->file_filter, "|")));
+#else
+                QString filter = QString(config->file_filter).split("|").at(0);
+#endif
+                /* Extract the description and the extension list */
+                QRegularExpressionMatch match = QRegularExpression("(.+) \\((.+)\\)$").match(filter);
+                QString description = match.captured(1);
+                QString extensions = match.captured(2);
+                /* Split the extension list up and strip the filename globs */
+                QRegularExpression re("\\*\\.(.*)");
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+                QStringList extensionList;
+                int i = 0;
+                while (extensions.section(' ', i, i) != "") {
+                    QString extension = re.match(extensions.section(' ', i, i)).captured(1);
+                    extensionList.append(extension);
+                    i++;
+                }
+#else
+                QStringList extensionList = extensions.split(" ");
+                for (int i = 0; i < extensionList.count(); i++)
+                    extensionList[i] = re.match(extensionList[i]).captured(1);
+#endif
+                fileField->setFilter(tr(description.toUtf8().constData()) % util::DlgFilter(extensionList) % tr("All files") % util::DlgFilter({ "*" }, true));
+                this->ui->formLayout->addRow(tr(config->description), fileField);
+                break;
+            }
+            case CONFIG_STRING:
+            {
+                const auto lineEdit = new QLineEdit;
+                lineEdit->setObjectName(config->name);
+                lineEdit->setCursor(Qt::IBeamCursor);
+                lineEdit->setText(selected);
+                this->ui->formLayout->addRow(tr(config->description), lineEdit);
+                break;
+            }
+            case CONFIG_SERPORT:
+            {
+                auto *cbox = new QComboBox();
+                cbox->setObjectName(config->name);
+                cbox->setMaxVisibleItems(30);
+                auto *model         = cbox->model();
+                int   currentIndex  = 0;
+                auto  serialDevices = EnumerateSerialDevices();
+
+                Models::AddEntry(model, tr("None"), -1);
+                for (int i = 0; i < serialDevices.size(); i++) {
+                    const int row = Models::AddEntry(model, serialDevices[i], i);
+                    if (selected == serialDevices[i])
+                        currentIndex = row;
+                }
+
+                this->ui->formLayout->addRow(tr(config->description), cbox);
+                cbox->setCurrentIndex(currentIndex);
+                break;
+            }
+            case CONFIG_MAC:
+            {
+                // QHBoxLayout for the line edit widget and the generate button
+                const auto hboxLayout     = new QHBoxLayout();
+                const auto generateButton = new QPushButton(tr("Generate"));
+                const auto lineEdit       = new QLineEdit;
+                // Allow the line edit to expand and fill available space
+                lineEdit->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Preferred);
+                lineEdit->setInputMask("HH:HH:HH;0");
+                lineEdit->setObjectName(config->name);
+                // Display the current or generated MAC in uppercase
+                // When stored it will be converted to lowercase
+                if (config_get_mac(device_context->name, config->name,
+                                   config->default_int) & 0xFF000000) {
+                    lineEdit->setText(QString::asprintf("%02X:%02X:%02X", random_generate(),
+                                      random_generate(), random_generate()));
+                } else {
+                    auto current_mac = QString(config_get_string(device_context->name, config->name,
+                                               const_cast<char *>(config->default_string)));
+                    lineEdit->setText(current_mac.toUpper());
+                }
+                // Action for the generate button
+                connect(generateButton, &QPushButton::clicked, [lineEdit] {
+                    lineEdit->setText(QString::asprintf("%02X:%02X:%02X", random_generate(),
+                                      random_generate(), random_generate()));
+                });
+                hboxLayout->addWidget(lineEdit);
+                hboxLayout->addWidget(generateButton);
+                this->ui->formLayout->addRow(tr(config->description), hboxLayout);
+                break;
+            }
+        }
+        ++config;
+    }
+}
+
 void
 DeviceConfig::ConfigureDevice(const _device_ *device, int instance, Settings *settings)
 {
     DeviceConfig dc(settings);
-    dc.setWindowTitle(QString("%1 Device Configuration").arg(device->name));
-    int p;
-    int q;
+    dc.setWindowTitle(tr("%1 Device Configuration").arg(tr(device->name)));
 
     device_context_t device_context;
     device_set_context(&device_context, device, instance);
 
-    auto device_label = new QLabel(device->name);
+    const auto device_label = new QLabel(tr(device->name));
+    device_label->setAlignment(Qt::AlignCenter);
     dc.ui->formLayout->addRow(device_label);
-    auto line = new QFrame;
+    const auto line = new QFrame;
     line->setFrameShape(QFrame::HLine);
     line->setFrameShadow(QFrame::Sunken);
     dc.ui->formLayout->addRow(line);
-    const auto *config = device->config;
-    while (config->type != -1) {
-        switch (config->type) {
-            case CONFIG_BINARY:
-                {
-                    auto  value = config_get_int(device_context.name, const_cast<char *>(config->name), config->default_int);
-                    auto *cbox  = new QCheckBox();
-                    cbox->setObjectName(config->name);
-                    cbox->setChecked(value > 0);
-                    dc.ui->formLayout->addRow(config->description, cbox);
-                    break;
-                }
-#ifdef USE_RTMIDI
-            case CONFIG_MIDI_OUT:
-                {
-                    auto *cbox = new QComboBox();
-                    cbox->setObjectName(config->name);
-                    cbox->setMaxVisibleItems(30);
-                    auto *model        = cbox->model();
-                    int   currentIndex = -1;
-                    int   selected     = config_get_int(device_context.name, const_cast<char *>(config->name), config->default_int);
-                    for (int i = 0; i < rtmidi_out_get_num_devs(); i++) {
-                        char midiName[512] = { 0 };
-                        rtmidi_out_get_dev_name(i, midiName);
+    const _device_config_ *config = device->config;
 
-                        Models::AddEntry(model, midiName, i);
-                        if (selected == i) {
-                            currentIndex = i;
-                        }
-                    }
-                    dc.ui->formLayout->addRow(config->description, cbox);
-                    cbox->setCurrentIndex(currentIndex);
-                    break;
-                }
-            case CONFIG_MIDI_IN:
-                {
-                    auto *cbox = new QComboBox();
-                    cbox->setObjectName(config->name);
-                    cbox->setMaxVisibleItems(30);
-                    auto *model        = cbox->model();
-                    int   currentIndex = -1;
-                    int   selected     = config_get_int(device_context.name, const_cast<char *>(config->name), config->default_int);
-                    for (int i = 0; i < rtmidi_in_get_num_devs(); i++) {
-                        char midiName[512] = { 0 };
-                        rtmidi_in_get_dev_name(i, midiName);
-
-                        Models::AddEntry(model, midiName, i);
-                        if (selected == i) {
-                            currentIndex = i;
-                        }
-                    }
-                    dc.ui->formLayout->addRow(config->description, cbox);
-                    cbox->setCurrentIndex(currentIndex);
-                    break;
-                }
-#endif
-            case CONFIG_SELECTION:
-            case CONFIG_HEX16:
-            case CONFIG_HEX20:
-                {
-                    auto *cbox = new QComboBox();
-                    cbox->setObjectName(config->name);
-                    cbox->setMaxVisibleItems(30);
-                    auto *model        = cbox->model();
-                    int   currentIndex = -1;
-                    int   selected     = 0;
-                    switch (config->type) {
-                        case CONFIG_SELECTION:
-                            selected = config_get_int(device_context.name, const_cast<char *>(config->name), config->default_int);
-                            break;
-                        case CONFIG_HEX16:
-                            selected = config_get_hex16(device_context.name, const_cast<char *>(config->name), config->default_int);
-                            break;
-                        case CONFIG_HEX20:
-                            selected = config_get_hex20(device_context.name, const_cast<char *>(config->name), config->default_int);
-                            break;
-                    }
-
-                    for (auto *sel = config->selection; (sel != nullptr) && (sel->description != nullptr) && (strlen(sel->description) > 0); ++sel) {
-                        int row = Models::AddEntry(model, sel->description, sel->value);
-                        if (selected == sel->value) {
-                            currentIndex = row;
-                        }
-                    }
-                    dc.ui->formLayout->addRow(config->description, cbox);
-                    cbox->setCurrentIndex(currentIndex);
-                    break;
-                }
-            case CONFIG_BIOS:
-                {
-                    auto *cbox = new QComboBox();
-                    cbox->setObjectName(config->name);
-                    cbox->setMaxVisibleItems(30);
-                    auto *model        = cbox->model();
-                    int   currentIndex = -1;
-                    char *selected;
-                    selected = config_get_string(device_context.name, const_cast<char *>(config->name), const_cast<char *>(config->default_string));
-
-                    q = 0;
-                    for (auto *bios = config->bios; (bios != nullptr) && (bios->name != nullptr) && (strlen(bios->name) > 0); ++bios) {
-                        p = 0;
-                        for (int d = 0; d < bios->files_no; d++)
-                            p += !!rom_present(const_cast<char *>(bios->files[d]));
-                        if (p == bios->files_no) {
-                            int row = Models::AddEntry(model, bios->name, q);
-                            if (!strcmp(selected, bios->internal_name)) {
-                                currentIndex = row;
-                            }
-                        }
-                        q++;
-                    }
-                    dc.ui->formLayout->addRow(config->description, cbox);
-                    cbox->setCurrentIndex(currentIndex);
-                    break;
-                }
-            case CONFIG_SPINNER:
-                {
-                    int   value   = config_get_int(device_context.name, const_cast<char *>(config->name), config->default_int);
-                    auto *spinBox = new QSpinBox();
-                    spinBox->setObjectName(config->name);
-                    spinBox->setMaximum(config->spinner.max);
-                    spinBox->setMinimum(config->spinner.min);
-                    if (config->spinner.step > 0) {
-                        spinBox->setSingleStep(config->spinner.step);
-                    }
-                    spinBox->setValue(value);
-                    dc.ui->formLayout->addRow(config->description, spinBox);
-                    break;
-                }
-            case CONFIG_FNAME:
-                {
-                    auto *fileName  = config_get_string(device_context.name, const_cast<char *>(config->name), const_cast<char *>(config->default_string));
-                    auto *fileField = new FileField();
-                    fileField->setObjectName(config->name);
-                    fileField->setFileName(fileName);
-                    fileField->setFilter(QString(config->file_filter).left(strcspn(config->file_filter, "|")));
-                    dc.ui->formLayout->addRow(config->description, fileField);
-                    break;
-                }
-            case CONFIG_STRING:
-                {
-                    auto lineEdit = new QLineEdit;
-                    lineEdit->setObjectName(config->name);
-                    lineEdit->setCursor(Qt::IBeamCursor);
-                    lineEdit->setText(config_get_string(device_context.name, const_cast<char *>(config->name), const_cast<char *>(config->default_string)));
-                    dc.ui->formLayout->addRow(config->description, lineEdit);
-                    break;
-                }
-            case CONFIG_SERPORT:
-                {
-                    auto *cbox = new QComboBox();
-                    cbox->setObjectName(config->name);
-                    cbox->setMaxVisibleItems(30);
-                    auto *model         = cbox->model();
-                    int   currentIndex  = 0;
-                    auto  serialDevices = EnumerateSerialDevices();
-                    char *selected      = config_get_string(device_context.name, const_cast<char *>(config->name), const_cast<char *>(config->default_string));
-
-                    Models::AddEntry(model, "None", -1);
-                    for (int i = 0; i < serialDevices.size(); i++) {
-                        int row = Models::AddEntry(model, serialDevices[i], i);
-                        if (selected == serialDevices[i]) {
-                            currentIndex = row;
-                        }
-                    }
-
-                    dc.ui->formLayout->addRow(config->description, cbox);
-                    cbox->setCurrentIndex(currentIndex);
-                    break;
-                }
-        }
-        ++config;
-    }
+    dc.ProcessConfig(&device_context, config, false);
 
     dc.setFixedSize(dc.minimumSizeHint());
-    int res = dc.exec();
-    if (res == QDialog::Accepted) {
+
+    if (dc.exec() == QDialog::Accepted) {
+        if (config == NULL)
+            return;
+
         config = device->config;
-        while (config->type != -1) {
+        while (config->type != CONFIG_END) {
             switch (config->type) {
+                default:
+                    break;
                 case CONFIG_BINARY:
                     {
-                        auto *cbox = dc.findChild<QCheckBox *>(config->name);
+                        const auto *cbox = dc.findChild<QCheckBox *>(config->name);
                         config_set_int(device_context.name, const_cast<char *>(config->name), cbox->isChecked() ? 1 : 0);
                         break;
                     }
                 case CONFIG_MIDI_OUT:
                 case CONFIG_MIDI_IN:
+                case CONFIG_INT:
                 case CONFIG_SELECTION:
                     {
                         auto *cbox = dc.findChild<QComboBox *>(config->name);
@@ -326,7 +432,7 @@ DeviceConfig::ConfigureDevice(const _device_ *device, int instance, Settings *se
                     {
                         auto *cbox = dc.findChild<QComboBox *>(config->name);
                         auto  path = cbox->currentText().toUtf8();
-                        if (path == "None")
+                        if (cbox->currentData().toInt() == -1)
                             path = "";
                         config_set_string(device_context.name, const_cast<char *>(config->name), path);
                         break;
@@ -362,6 +468,14 @@ DeviceConfig::ConfigureDevice(const _device_ *device, int instance, Settings *se
                         config_set_int(device_context.name, const_cast<char *>(config->name), spinBox->value());
                         break;
                     }
+                case CONFIG_MAC:
+                    {
+                        const auto *lineEdit = dc.findChild<QLineEdit *>(config->name);
+                        // Store the mac address as lowercase
+                        auto macText = lineEdit->displayText().toLower();
+                        config_set_string(device_context.name, config->name, macText.toUtf8().constData());
+                        break;
+                    }
             }
             config++;
         }
@@ -369,17 +483,17 @@ DeviceConfig::ConfigureDevice(const _device_ *device, int instance, Settings *se
 }
 
 QString
-DeviceConfig::DeviceName(const _device_ *device, const char *internalName, int bus)
+DeviceConfig::DeviceName(const _device_ *device, const char *internalName, const int bus)
 {
-    if (QStringLiteral("none") == internalName) {
+    if (QStringLiteral("none") == internalName)
         return tr("None");
-    } else if (QStringLiteral("internal") == internalName) {
-        return tr("Internal controller");
-    } else if (device == nullptr) {
-        return QString();
-    } else {
+    else if (QStringLiteral("internal") == internalName)
+        return tr("Internal device");
+    else if (device == nullptr)
+        return "";
+    else {
         char temp[512];
         device_get_name(device, bus, temp);
-        return tr(temp, nullptr, 512);
+        return tr((const char *) temp);
     }
 }
diff --git a/src/qt/qt_deviceconfig.hpp b/src/qt/qt_deviceconfig.hpp
index 1ed24d618..a5214111f 100644
--- a/src/qt/qt_deviceconfig.hpp
+++ b/src/qt/qt_deviceconfig.hpp
@@ -20,13 +20,15 @@ class DeviceConfig : public QDialog {
 
 public:
     explicit DeviceConfig(QWidget *parent = nullptr);
-    ~DeviceConfig();
+    ~DeviceConfig() override;
 
-    static void    ConfigureDevice(const _device_ *device, int instance = 0, Settings *settings = nullptr);
+    static void    ConfigureDevice(const _device_ *device, int instance = 0,
+                                   Settings *settings = qobject_cast<Settings *>(Settings::settings));
     static QString DeviceName(const _device_ *device, const char *internalName, int bus);
 
 private:
     Ui::DeviceConfig *ui;
+    void   ProcessConfig(void *dc, const void *c, bool is_dep);
 };
 
 #endif // QT_DEVICECONFIG_HPP
diff --git a/src/qt/qt_downloader.cpp b/src/qt/qt_downloader.cpp
new file mode 100644
index 000000000..49f8a2e55
--- /dev/null
+++ b/src/qt/qt_downloader.cpp
@@ -0,0 +1,99 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Downloader module
+ *
+ *
+ *
+ * Authors: cold-brewed
+ *
+ *          Copyright 2024 cold-brewed
+ */
+
+#include <QDir>
+#include <QFile>
+#include <QNetworkReply>
+#include <QStandardPaths>
+
+#include "qt_downloader.hpp"
+
+extern "C" {
+#include <86box/plat.h>
+}
+
+Downloader::
+Downloader(const DownloadLocation downloadLocation, QObject *parent)
+    : QObject(parent)
+    , file(nullptr)
+    , reply(nullptr)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    , variantData(QMetaType(QMetaType::UnknownType))
+#else
+    , variantData(QVariant::Invalid)
+#endif
+{
+    char PATHBUF[256];
+    switch (downloadLocation) {
+        case DownloadLocation::Data:
+            plat_get_global_data_dir(PATHBUF, 255);
+            break;
+        case DownloadLocation::Config:
+            plat_get_global_config_dir(PATHBUF, 255);
+            break;
+        case DownloadLocation::Temp:
+            plat_get_temp_dir(PATHBUF, 255);
+            break;
+    }
+    downloadDirectory = QDir(PATHBUF);
+}
+
+Downloader::~Downloader() { delete file; }
+
+void Downloader::download(const QUrl &url, const QString &filepath, const QVariant &varData) {
+
+    variantData = varData;
+    // temporary until I get the plat stuff fixed
+    // const auto global_dir = temporaryGetGlobalDataDir();
+    // qDebug() << "I was passed filepath " << filepath;
+    // Join with filename to create final file
+    // const auto final_path = QDir(global_dir).filePath(filepath);
+    const auto final_path = downloadDirectory.filePath(filepath);
+
+    file = new QFile(final_path);
+    if(!file->open(QIODevice::WriteOnly)) {
+        qWarning() << "Unable to open file " << final_path;
+        return;
+    }
+
+    const auto nam = new QNetworkAccessManager(this);
+    // Create the network request and execute
+    const auto request = QNetworkRequest(url);
+    reply = nam->get(request);
+    // Connect to the finished signal
+    connect(reply, &QNetworkReply::finished, this, &Downloader::onResult);
+}
+
+void
+Downloader::onResult()
+{
+    if (reply->error()) {
+        qWarning() << "Error returned from QNetworkRequest: " << reply->errorString();
+        emit errorOccurred(reply->errorString());
+        reply->deleteLater();
+        return;
+    }
+
+    file->write(reply->readAll());
+    file->flush();
+    file->close();
+
+    reply->deleteLater();
+    qDebug() << Q_FUNC_INFO << "Downloaded complete: file written to " << file->fileName();
+    emit downloadCompleted(file->fileName(), variantData);
+}
+
diff --git a/src/qt/qt_downloader.hpp b/src/qt/qt_downloader.hpp
new file mode 100644
index 000000000..2164ba59c
--- /dev/null
+++ b/src/qt/qt_downloader.hpp
@@ -0,0 +1,57 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Header for the downloader module
+ *
+ *
+ *
+ * Authors: cold-brewed
+ *
+ *          Copyright 2024 cold-brewed
+ */
+
+#ifndef QT_DOWNLOADER_HPP
+#define QT_DOWNLOADER_HPP
+
+#include <QDir>
+#include <QNetworkAccessManager>
+#include <QString>
+#include <QFile>
+
+
+class Downloader final : public QObject {
+    Q_OBJECT
+public:
+    enum class DownloadLocation {
+        Data,   // AppDataLocation   via plat_get_global_data_dir()
+        Config, // AppConfigLocation via plat_get_global_config_dir()
+        Temp    // TempLocation      via plat_get_temp_dir()
+    };
+    explicit Downloader(DownloadLocation downloadLocation = DownloadLocation::Data, QObject *parent = nullptr);
+    ~Downloader() final;
+
+    void download(const QUrl &url, const QString &filepath, const QVariant &varData = QVariant::Invalid);
+
+signals:
+    // Signal emitted when the download is successful
+    void downloadCompleted(QString filename, QVariant varData);
+    // Signal emitted when an error occurs
+    void errorOccurred(const QString&);
+
+private slots:
+    void onResult();
+
+private:
+    QFile *file;
+    QNetworkAccessManager nam;
+    QNetworkReply *reply;
+    QVariant variantData;
+    QDir downloadDirectory;
+};
+
+#endif
diff --git a/src/qt/qt_glsl_parser.cpp b/src/qt/qt_glsl_parser.cpp
new file mode 100644
index 000000000..0bd35ca25
--- /dev/null
+++ b/src/qt/qt_glsl_parser.cpp
@@ -0,0 +1,435 @@
+#include "qt_mainwindow.hpp"
+#include <QMessageBox>
+#include <QWindow>
+#include <QCoreApplication>
+
+extern MainWindow* main_window;
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdint.h>
+extern "C"
+{
+#include <86box/86box.h>
+#include <86box/ini.h>
+#include <86box/config.h>
+#include <86box/qt-glslp-parser.h>
+#include <86box/path.h>
+#include <86box/plat.h>
+
+extern void startblit();
+extern void endblit();
+extern ssize_t local_getline(char **buf, size_t *bufsiz, FILE *fp);
+extern char* trim(char* str);
+}
+
+#define safe_strncpy(a, b, n)                                                                                                    \
+        do {                                                                                                                     \
+                strncpy((a), (b), (n)-1);                                                                                        \
+                (a)[(n)-1] = 0;                                                                                                  \
+        } while (0)
+
+
+
+static inline void *wx_config_load(const char *path) { ini_t ini = ini_read(path); if (ini) ini_strip_quotes(ini); return (void*)ini; }
+
+static inline int wx_config_get_string(void *config, const char *name, char *dst, int size, const char *defVal) {
+    int res = ini_has_entry(ini_find_or_create_section((ini_t)config, ""), name);
+    char* str = ini_get_string((ini_t)config, "", name, (char*)defVal);
+    if (size == 0)
+        return res;
+    if (str != NULL)
+        strncpy(dst, str, size - 1);
+    else
+        dst[0] = 0;
+    return res;
+}
+
+static inline int wx_config_get_int(void *config, const char *name, int *dst, int defVal) {
+    int res = ini_has_entry(ini_find_or_create_section((ini_t)config, ""), name);
+    *dst = ini_get_int((ini_t)config, "", name, defVal);
+    return res;
+}
+
+static inline int wx_config_get_float(void *config, const char *name, float *dst, float defVal) {
+    int res = ini_has_entry(ini_find_or_create_section((ini_t)config, ""), name);
+    *dst = (float)ini_get_double((ini_t)config, "", name, defVal);
+    return res;
+}
+
+static inline int wx_config_get_bool(void *config, const char *name, int *dst, int defVal) {
+    int res = ini_has_entry(ini_find_or_create_section((ini_t)config, ""), name);
+    *dst = !!ini_get_int((ini_t)config, "", name, defVal);
+    return res;
+}
+
+static inline int wx_config_has_entry(void *config, const char *name) { return ini_has_entry(ini_find_or_create_section((ini_t)config, ""), name); }
+static inline void wx_config_free(void *config) { ini_close(config); };
+
+static int endswith(const char *str, const char *ext) {
+        const char *p;
+        int elen = strlen(ext);
+        int slen = strlen(str);
+        if (slen >= elen) {
+                p = &str[slen - elen];
+                for (int i = 0; i < elen; ++i) {
+                        if (tolower(p[i]) != tolower(ext[i]))
+                                return 0;
+                }
+                return 1;
+        }
+        return 0;
+}
+
+static int
+glsl_detect_bom(const char *fn)
+{
+    FILE         *fp;
+    unsigned char bom[4] = { 0, 0, 0, 0 };
+
+    fp = plat_fopen(fn, "rb");
+    if (fp == NULL)
+        return 0;
+    (void) !fread(bom, 1, 3, fp);
+    if (bom[0] == 0xEF && bom[1] == 0xBB && bom[2] == 0xBF) {
+        fclose(fp);
+        return 1;
+    }
+    fclose(fp);
+    return 0;
+}
+
+static char *load_file(const char *fn) {
+        int bom = glsl_detect_bom(fn);
+        FILE *fp = plat_fopen(fn, "rb");
+        if (!fp)
+                return 0;
+        fseek(fp, 0, SEEK_END);
+        long fsize = ftell(fp);
+        fseek(fp, 0, SEEK_SET);
+
+        if (bom) {
+                fsize -= 3;
+                fseek(fp, 3, SEEK_SET);
+        }
+
+        char *data = (char*)malloc(fsize + 1);
+
+        size_t read_bytes = fread(data, fsize, 1, fp);
+        if (read_bytes != 1) {
+            fclose(fp);
+            free(data);
+            return nullptr;
+        } else {
+            fclose(fp);
+
+            data[fsize] = 0;
+
+            return data;
+        }
+}
+
+static void strip_lines(const char *program, const char *starts_with) {
+        /* strip parameters */
+        char *ptr = (char *) strstr(program, starts_with);
+        while (ptr != nullptr) {
+                while (*ptr != '\n' && *ptr != '\0')
+                        *ptr++ = ' ';
+                ptr = (char *) strstr(program, starts_with);
+        }
+}
+
+static void strip_parameters(const char *program) {
+        /* strip parameters */
+        strip_lines(program, "#pragma parameter");
+}
+
+static void strip_defines(const char *program) {
+        /* strip texture define */
+        strip_lines(program, "#define texture");
+}
+
+static int has_parameter(glslp_t *glsl, char *id) {
+        for (int i = 0; i < glsl->num_parameters; ++i)
+                if (!strcmp(glsl->parameters[i].id, id))
+                        return 1;
+        return 0;
+}
+
+static int get_parameters(glslp_t *glsl) {
+        struct parameter p;
+        for (int i = 0; i < glsl->num_shaders; ++i) {
+                size_t size = 0;
+                char* line = NULL;
+                struct shader *shader = &glsl->shaders[i];
+                int bom = glsl_detect_bom(shader->shader_fn);
+                FILE *f = plat_fopen(shader->shader_fn, "rb");
+                if (!f)
+                        return 0;
+                if (bom) {
+                        fseek(f, 3, SEEK_SET);
+                }
+                while (local_getline(&line, &size, f) != -1 && glsl->num_parameters < MAX_PARAMETERS) {
+                        line[strcspn(line, "\r\n")] = '\0';
+                        trim(line);
+                        int num = sscanf(line, "#pragma parameter %63s \"%63[^\"]\" %f %f %f %f", p.id, p.description,
+                                         &p.default_value, &p.min, &p.max, &p.step);
+                        if (num < 5)
+                                continue;
+                        p.id[63] = 0;
+                        p.description[63] = 0;
+
+                        if (num == 5)
+                                p.step = 0.1f * (p.max - p.min);
+
+                        p.value = p.default_value;
+
+                        if (!has_parameter(glsl, p.id)) {
+                                memcpy(&glsl->parameters[glsl->num_parameters++], &p, sizeof(struct parameter));
+                                pclog("Read parameter: %s (%s) %f, %f -> %f (%f)\n", p.id, p.description, p.default_value, p.min,
+                                      p.max, p.step);
+                        }
+                }
+
+                fclose(f);
+        }
+
+        return 1;
+}
+
+static struct parameter *get_parameter(glslp_t *glslp, const char *id) {
+        for (int i = 0; i < glslp->num_parameters; ++i) {
+                if (!strcmp(glslp->parameters[i].id, id)) {
+                        return &glslp->parameters[i];
+                }
+        }
+        return 0;
+}
+
+static glslp_t *glsl_parse(const char *f) {
+        glslp_t *glslp = (glslp_t*) calloc(1, sizeof(glslp_t));
+        glslp->num_shaders = 1;
+        struct shader *shader = &glslp->shaders[0];
+        strcpy(shader->shader_fn, f);
+        shader->shader_program = load_file(f);
+        if (!shader->shader_program) {
+                QMessageBox::critical((QWidget *) qApp->findChild<QWindow *>(), QObject::tr("GLSL error"), QObject::tr("Could not load shader: %1").arg(shader->shader_fn));
+                //wx_simple_messagebox("GLSL error", "Could not load shader %s\n", shader->shader_fn);
+                glslp_free(glslp);
+                return 0;
+        }
+        strip_parameters(shader->shader_program);
+        strip_defines(shader->shader_program);
+        shader->scale_x = shader->scale_y = 1.0f;
+        strcpy(shader->scale_type_x, "source");
+        strcpy(shader->scale_type_y, "source");
+        get_parameters(glslp);
+        return glslp;
+}
+
+extern "C" {
+
+void get_glslp_name(const char *f, char *s, int size) { safe_strncpy(s, path_get_filename((char *)f), size); }
+
+glslp_t *glslp_parse(const char *f) {
+        int j;
+        int len;
+        int sublen;
+        char s[2049], t[2049], z[2076];
+
+        memset(s, 0, sizeof(s));
+        if (endswith(f, ".glsl"))
+                return glsl_parse(f);
+
+        void *cfg = wx_config_load(f);
+
+        if (!cfg) {
+                fprintf(stderr, "GLSLP Error: Could not load GLSLP-file %s\n", f);
+                return 0;
+        }
+
+        glslp_t *glslp = (glslp_t*) calloc(1, sizeof(glslp_t));
+
+        get_glslp_name(f, glslp->name, sizeof(glslp->name));
+
+        wx_config_get_int(cfg, "shaders", &glslp->num_shaders, 0);
+
+        wx_config_get_bool(cfg, "filter_linear0", &glslp->input_filter_linear, -1);
+
+        for (int i = 0; i < glslp->num_shaders; ++i) {
+                struct shader *shader = &glslp->shaders[i];
+
+                snprintf(s, sizeof(s) - 1, "shader%d", i);
+                if (!wx_config_get_string(cfg, s, t, sizeof(t), 0)) {
+                        /* shader doesn't exist, lets break here */
+                        glslp->num_shaders = i;
+                        break;
+                }
+                strcpy(s, f);
+                *path_get_filename(s) = 0;
+
+                size_t max_len = sizeof(shader->shader_fn);
+                size_t s_len = strlen(s);
+
+                if (s_len >= max_len) {
+                    // s alone fills or overflows the buffer, truncate and null-terminate
+                    size_t copy_len = max_len - 1 < s_len ? max_len - 1 : s_len;
+                    memcpy(shader->shader_fn, s, copy_len);
+                    shader->shader_fn[copy_len] = '\0';
+                } else {
+                    // Copy s fully
+                    memcpy(shader->shader_fn, s, s_len);
+                    // Copy as much of t as fits after s
+                    size_t avail = max_len - 1 - s_len; // space left for t + null terminator
+                    // Copy as much of t as fits into the remaining space
+                    memcpy(shader->shader_fn + s_len, t, avail);
+                    // Null-terminate
+                    shader->shader_fn[s_len + avail] = '\0';
+                }
+
+                shader->shader_program = load_file(shader->shader_fn);
+                if (!shader->shader_program) {
+                    fprintf(stderr, "GLSLP Error: Could not load shader %s\n", shader->shader_fn);
+                    glslp_free(glslp);
+                    return 0;
+                }
+                strip_parameters(shader->shader_program);
+                strip_defines(shader->shader_program);
+
+                snprintf(s, sizeof(s) - 1, "alias%d", i);
+                wx_config_get_string(cfg, s, shader->alias, sizeof(shader->alias), 0);
+
+                snprintf(s, sizeof(s) - 1, "filter_linear%d", i + 1);
+                wx_config_get_bool(cfg, s, &shader->filter_linear, 0);
+
+                snprintf(s, sizeof(s) - 1, "wrap_mode%d", i);
+                wx_config_get_string(cfg, s, shader->wrap_mode, sizeof(shader->wrap_mode), 0);
+
+                snprintf(s, sizeof(s) - 1, "float_framebuffer%d", i);
+                wx_config_get_bool(cfg, s, &shader->float_framebuffer, 0);
+                snprintf(s, sizeof(s) - 1, "srgb_framebuffer%d", i);
+                wx_config_get_bool(cfg, s, &shader->srgb_framebuffer, 0);
+
+                snprintf(s, sizeof(s) - 1, "mipmap_input%d", i);
+                wx_config_get_bool(cfg, s, &shader->mipmap_input, 0);
+
+                strcpy(shader->scale_type_x, "source");
+                snprintf(s, sizeof(s) - 1, "scale_type_x%d", i);
+                wx_config_get_string(cfg, s, shader->scale_type_x, sizeof(shader->scale_type_x), 0);
+                strcpy(shader->scale_type_y, "source");
+                snprintf(s, sizeof(s) - 1, "scale_type_y%d", i);
+                wx_config_get_string(cfg, s, shader->scale_type_y, sizeof(shader->scale_type_y), 0);
+                snprintf(s, sizeof(s) - 1, "scale_type%d", i);
+                if (wx_config_has_entry(cfg, s)) {
+                        wx_config_get_string(cfg, s, shader->scale_type_x, sizeof(shader->scale_type_x), 0);
+                        wx_config_get_string(cfg, s, shader->scale_type_y, sizeof(shader->scale_type_y), 0);
+                }
+
+                snprintf(s, sizeof(s) - 1, "scale_x%d", i);
+                wx_config_get_float(cfg, s, &shader->scale_x, 1.0f);
+                snprintf(s, sizeof(s) - 1, "scale_y%d", i);
+                wx_config_get_float(cfg, s, &shader->scale_y, 1.0f);
+                snprintf(s, sizeof(s) - 1, "scale%d", i);
+                if (wx_config_has_entry(cfg, s)) {
+                        wx_config_get_float(cfg, s, &shader->scale_x, 1.0f);
+                        wx_config_get_float(cfg, s, &shader->scale_y, 1.0f);
+                }
+
+                snprintf(s, sizeof(s) - 1, "frame_count_mod%d", i);
+                wx_config_get_int(cfg, s, &shader->frame_count_mod, 0);
+        }
+
+        /* textures */
+        glslp->num_textures = 0;
+        wx_config_get_string(cfg, "textures", t, sizeof(t), 0);
+
+        len = strlen(t);
+        j = 0;
+        sublen = 0;
+        for (int i = 0; i < len; ++i) {
+                if (t[i] == ';' || i == len - 1) {
+                        sublen = (i - j) + ((i == len - 1) ? 1 : 0) + 1;
+                        safe_strncpy(s, t + j, sublen);
+                        s[511 < sublen ? 511 : sublen] = 0;
+
+                        if (s[strlen(s) - 1] == ';') s[strlen(s) - 1] = 0;
+
+                        struct texture *tex = &glslp->textures[glslp->num_textures++];
+
+                        strcpy(tex->name, s);
+                        wx_config_get_string(cfg, s, tex->path, sizeof(tex->path), 0);
+
+                        snprintf(z, sizeof(z) - 1, "%s_linear", s);
+                        wx_config_get_bool(cfg, z, &tex->linear, 0);
+
+                        snprintf(z, sizeof(z) - 1, "%s_mipmap", s);
+                        wx_config_get_bool(cfg, z, &tex->mipmap, 0);
+
+                        snprintf(z, sizeof(z) - 1, "%s_wrap_mode", s);
+                        wx_config_get_string(cfg, z, tex->wrap_mode, sizeof(tex->wrap_mode), 0);
+
+                        j = i + 1;
+                }
+        }
+
+        /* parameters */
+        get_parameters(glslp);
+
+        wx_config_get_string(cfg, "parameters", t, sizeof(t), 0);
+
+        len = strlen(t);
+        j = 0;
+        sublen = 0;
+        for (int i = 0; i < len; ++i) {
+                if (t[i] == ';' || i == len - 1) {
+                        sublen = (i - j) + ((i == len - 1) ? 1 : 0) + 1;
+                        safe_strncpy(s, t + j, sublen);
+                        s[511 < sublen ? 511 : sublen] = 0;
+
+                        struct parameter *p = get_parameter(glslp, s);
+
+                        if (p)
+                                wx_config_get_float(cfg, s, &p->default_value, 0);
+
+                        j = i + 1;
+                }
+        }
+
+        wx_config_free(cfg);
+
+        return glslp;
+}
+
+void glslp_free(glslp_t *p) {
+        for (int i = 0; i < p->num_shaders; ++i)
+                if (p->shaders[i].shader_program)
+                        free(p->shaders[i].shader_program);
+        free(p);
+}
+
+void glslp_read_shader_config(glslp_t *shader) {
+    char s[512];
+    char *name = shader->name;
+    snprintf(s, sizeof(s) -1, "GL3 Shaders - %s", name);
+    for (int i = 0; i < shader->num_parameters; ++i) {
+        struct parameter *param = &shader->parameters[i];
+        param->value = config_get_double(s, param->id, param->default_value);
+    }
+}
+
+void glslp_write_shader_config(glslp_t *shader) {
+    char s[512];
+    char *name = shader->name;
+
+    startblit();
+    snprintf(s, sizeof(s) - 1, "GL3 Shaders - %s", name);
+    for (int i = 0; i < shader->num_parameters; ++i) {
+        struct parameter *param = &shader->parameters[i];
+        config_set_double(s, param->id, param->value);
+    }
+    endblit();
+}
+
+}
diff --git a/src/qt/qt_harddiskdialog.cpp b/src/qt/qt_harddiskdialog.cpp
index 5dab101b8..ae1c60971 100644
--- a/src/qt/qt_harddiskdialog.cpp
+++ b/src/qt/qt_harddiskdialog.cpp
@@ -20,6 +20,9 @@
 #include "ui_qt_harddiskdialog.h"
 
 extern "C" {
+#ifdef __unix__
+#include <unistd.h>
+#endif
 #include <86box/86box.h>
 #include <86box/hdd.h>
 #include "../disk/minivhd/minivhd.h"
@@ -74,8 +77,7 @@ HarddiskDialog::HarddiskDialog(bool existing, QWidget *parent)
     for (int i = 0; i < 127; i++) {
         uint64_t size    = ((uint64_t) hdd_table[i][0]) * hdd_table[i][1] * hdd_table[i][2];
         uint32_t size_mb = size >> 11LL;
-        // QString text = QString("%1 MiB (CHS: %2, %3, %4)").arg(size_mb).arg(hdd_table[i][0]).arg(hdd_table[i][1]).arg(hdd_table[i][2]);
-        QString text = QString::asprintf(tr("%u MB (CHS: %i, %i, %i)").toUtf8().constData(), size_mb, (hdd_table[i][0]), (hdd_table[i][1]), (hdd_table[i][2]));
+        QString text = tr("%1 MB (CHS: %2, %3, %4)").arg(size_mb).arg(hdd_table[i][0]).arg(hdd_table[i][1]).arg(hdd_table[i][2]);
         Models::AddEntry(model, text, i);
     }
     Models::AddEntry(model, tr("Custom..."), 127);
@@ -197,7 +199,7 @@ HarddiskDialog::on_comboBoxFormat_currentIndexChanged(int index)
  * than a tenth of a percent change in size.
  */
 static void
-adjust_86box_geometry_for_vhd(MVHDGeom *_86box_geometry, MVHDGeom *vhd_geometry)
+adjust_86box_geometry_for_vhd(_86BoxGeom *_86box_geometry, MVHDGeom *vhd_geometry)
 {
     if (_86box_geometry->cyl <= 65535) {
         vhd_geometry->cyl   = _86box_geometry->cyl;
@@ -224,10 +226,14 @@ adjust_86box_geometry_for_vhd(MVHDGeom *_86box_geometry, MVHDGeom *vhd_geometry)
 }
 
 static HarddiskDialog *callbackPtr = nullptr;
-static MVHDGeom
-create_drive_vhd_fixed(const QString &fileName, HarddiskDialog *p, uint16_t cyl, uint8_t heads, uint8_t spt)
+static _86BoxGeom
+create_drive_vhd_fixed(const QString &fileName, HarddiskDialog *p, uint32_t cyl, uint32_t heads, uint32_t spt)
 {
-    MVHDGeom _86box_geometry = { .cyl = cyl, .heads = heads, .spt = spt };
+    _86BoxGeom _86box_geometry = {
+        .cyl   = cyl,
+        .heads = heads,
+        .spt   = spt
+    };
     MVHDGeom vhd_geometry;
     adjust_86box_geometry_for_vhd(&_86box_geometry, &vhd_geometry);
 
@@ -250,10 +256,14 @@ create_drive_vhd_fixed(const QString &fileName, HarddiskDialog *p, uint16_t cyl,
     return _86box_geometry;
 }
 
-static MVHDGeom
-create_drive_vhd_dynamic(const QString &fileName, uint16_t cyl, uint8_t heads, uint8_t spt, int blocksize)
+static _86BoxGeom
+create_drive_vhd_dynamic(const QString &fileName, uint32_t cyl, uint32_t heads, uint32_t spt, int blocksize)
 {
-    MVHDGeom _86box_geometry = { .cyl = cyl, .heads = heads, .spt = spt };
+    _86BoxGeom _86box_geometry = {
+        .cyl   = cyl,
+        .heads = heads,
+        .spt   = spt
+    };
     MVHDGeom vhd_geometry;
     adjust_86box_geometry_for_vhd(&_86box_geometry, &vhd_geometry);
     int                 vhd_error     = 0;
@@ -277,7 +287,7 @@ create_drive_vhd_dynamic(const QString &fileName, uint16_t cyl, uint8_t heads, u
     return _86box_geometry;
 }
 
-static MVHDGeom
+static _86BoxGeom
 create_drive_vhd_diff(const QString &fileName, const QString &parentFileName, int blocksize)
 {
     int                 vhd_error           = 0;
@@ -289,25 +299,31 @@ create_drive_vhd_diff(const QString &fileName, const QString &parentFileName, in
     options.parent_path           = parentFilenameBytes.data();
     options.type                  = MVHD_TYPE_DIFF;
 
-    MVHDMeta *vhd = mvhd_create_ex(options, &vhd_error);
-    MVHDGeom  vhd_geometry;
+    MVHDMeta  *vhd = mvhd_create_ex(options, &vhd_error);
+    MVHDGeom   vhd_geometry;
+    _86BoxGeom _86box_geometry;
     if (vhd == NULL) {
-        vhd_geometry.cyl   = 0;
-        vhd_geometry.heads = 0;
-        vhd_geometry.spt   = 0;
+        _86box_geometry.cyl   = 0;
+        _86box_geometry.heads = 0;
+        _86box_geometry.spt   = 0;
     } else {
         vhd_geometry = mvhd_get_geometry(vhd);
 
         if (vhd_geometry.spt > 63) {
-            vhd_geometry.cyl   = mvhd_calc_size_sectors(&vhd_geometry) / (16 * 63);
-            vhd_geometry.heads = 16;
-            vhd_geometry.spt   = 63;
+            _86box_geometry.cyl   = mvhd_calc_size_sectors(&vhd_geometry) / (16 * 63);
+            _86box_geometry.heads = 16;
+            _86box_geometry.spt   = 63;
+        } else {
+            _86box_geometry.cyl   = vhd_geometry.cyl;
+            _86box_geometry.heads = vhd_geometry.heads;
+            _86box_geometry.spt   = vhd_geometry.spt;
         }
 
+
         mvhd_close(vhd);
     }
 
-    return vhd_geometry;
+    return _86box_geometry;
 }
 
 void
@@ -399,7 +415,7 @@ HarddiskDialog::onCreateNewFile()
     } else if (img_format >= IMG_FMT_VHD_FIXED) { /* VHD file */
         file.close();
 
-        MVHDGeom _86box_geometry {};
+        _86BoxGeom _86box_geometry {};
         int      block_size = ui->comboBoxBlockSize->currentIndex() == 0 ? MVHD_BLOCK_LARGE : MVHD_BLOCK_SMALL;
         switch (img_format) {
             case IMG_FMT_VHD_FIXED:
@@ -447,6 +463,7 @@ HarddiskDialog::onCreateNewFile()
     }
 
     // formats 0, 1 and 2
+#ifndef __unix__
     connect(this, &HarddiskDialog::fileProgress, this, [this](int value) { ui->progressBar->setValue(value); QApplication::processEvents(); });
     ui->progressBar->setVisible(true);
     [size, &file, this] {
@@ -469,16 +486,27 @@ HarddiskDialog::onCreateNewFile()
         }
         emit fileProgress(100);
     }();
+#else
+    int ret = ftruncate(file.handle(), (size_t) size);
+
+    if (ret) {
+        QMessageBox::critical(this, tr("Unable to write file"), tr("Make sure the file is being saved to a writable directory."));
+    }
+#endif
 
     QMessageBox::information(this, tr("Disk image created"), tr("Remember to partition and format the newly-created drive."));
     setResult(QDialog::Accepted);
 }
 
 static void
-adjust_vhd_geometry_for_86box(MVHDGeom *vhd_geometry)
+adjust_vhd_geometry_for_86box(MVHDGeom *vhd_geometry, _86BoxGeom *_86box_geometry)
 {
-    if (vhd_geometry->spt <= 63)
+    if (vhd_geometry->spt <= 63) {
+        _86box_geometry->cyl   = vhd_geometry->cyl;
+        _86box_geometry->heads = vhd_geometry->heads;
+        _86box_geometry->spt   = vhd_geometry->spt;
         return;
+    }
 
     int desired_sectors = vhd_geometry->cyl * vhd_geometry->heads * vhd_geometry->spt;
     if (desired_sectors > 267321600)
@@ -488,9 +516,9 @@ adjust_vhd_geometry_for_86box(MVHDGeom *vhd_geometry)
     if (remainder > 0)
         desired_sectors -= remainder;
 
-    vhd_geometry->cyl   = desired_sectors / (16 * 63);
-    vhd_geometry->heads = 16;
-    vhd_geometry->spt   = 63;
+    _86box_geometry->cyl   = desired_sectors / (16 * 63);
+    _86box_geometry->heads = 16;
+    _86box_geometry->spt   = 63;
 }
 
 void
@@ -516,8 +544,8 @@ HarddiskDialog::onExistingFileSelected(const QString &fileName, bool precheck)
         fp = _wfopen(wopenfilestring, L"rb");
         if (fp != NULL) {
             fclose(fp);
-            if (settings_msgbox_ex(MBX_QUESTION_YN, (wchar_t *) IDS_4111, (wchar_t *) IDS_4118, (wchar_t *) IDS_4120, (wchar_t *) IDS_4121, NULL) != 0)	/ * yes * /
-                return FALSE;
+            if (settings_msgbox_ex(MBX_QUESTION_YN, L"Disk image file already exists", L"The selected file will be overwritten. Are you sure you want to use it?", L"Overwrite", L"Don't overwrite", NULL) != 0)	/ * yes * /
+                return false;
         }
     }
 
@@ -525,8 +553,8 @@ HarddiskDialog::onExistingFileSelected(const QString &fileName, bool precheck)
     if (fp == NULL) {
     hdd_add_file_open_error:
         fclose(fp);
-        settings_msgbox_header(MBX_ERROR, (existing & 1) ? (wchar_t *) IDS_4114 : (wchar_t *) IDS_4115, (existing & 1) ? (wchar_t *) IDS_4107 : (wchar_t *) IDS_4108);
-        return TRUE;
+        settings_msgbox_header(MBX_ERROR, (existing & 1) ? L"Make sure the file exists and is readable." : L"Make sure the file is being saved to a writable directory.", (existing & 1) ? L"Unable to read file" : L"Unable to write file");
+        return true;
     }
 #endif
 
@@ -567,7 +595,7 @@ HarddiskDialog::onExistingFileSelected(const QString &fileName, bool precheck)
     } else if (image_is_vhd(fileNameUtf8.data(), 1)) {
         MVHDMeta *vhd = mvhd_open(fileNameUtf8.data(), 0, &vhd_error);
         if (vhd == nullptr) {
-            QMessageBox::critical(this, tr("Unable to read file"), tr("Make sure the file exists and is readable"));
+            QMessageBox::critical(this, tr("Unable to read file"), tr("Make sure the file exists and is readable."));
             return;
         } else if (vhd_error == MVHD_ERR_TIMESTAMP) {
             QMessageBox::StandardButton btn = QMessageBox::warning(this, tr("Parent and child disk timestamps do not match"), tr("This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"), QMessageBox::Yes | QMessageBox::No);
@@ -584,11 +612,12 @@ HarddiskDialog::onExistingFileSelected(const QString &fileName, bool precheck)
             }
         }
 
-        MVHDGeom vhd_geom = mvhd_get_geometry(vhd);
-        adjust_vhd_geometry_for_86box(&vhd_geom);
-        cylinders = vhd_geom.cyl;
-        heads     = vhd_geom.heads;
-        sectors   = vhd_geom.spt;
+        MVHDGeom   vhd_geom = mvhd_get_geometry(vhd);
+        _86BoxGeom _86box_geom;
+        adjust_vhd_geometry_for_86box(&vhd_geom, &_86box_geom);
+        cylinders = _86box_geom.cyl;
+        heads     = _86box_geom.heads;
+        sectors   = _86box_geom.spt;
         size      = static_cast<uint64_t>(cylinders * heads * sectors * 512);
         mvhd_close(vhd);
     } else {
@@ -618,7 +647,7 @@ HarddiskDialog::onExistingFileSelected(const QString &fileName, bool precheck)
     }
 
     if ((sectors > max_sectors) || (heads > max_heads) || (cylinders > max_cylinders)) {
-        QMessageBox::critical(this, tr("Unable to read file"), tr("Make sure the file exists and is readable"));
+        QMessageBox::critical(this, tr("Unable to read file"), tr("Make sure the file exists and is readable."));
         return;
     }
 
@@ -746,7 +775,7 @@ HarddiskDialog::on_comboBoxBus_currentIndexChanged(int index)
     ui->lineEditHeads->setValidator(new QIntValidator(1, max_heads, this));
     ui->lineEditSectors->setValidator(new QIntValidator(1, max_sectors, this));
 
-    Harddrives::populateBusChannels(ui->comboBoxChannel->model(), ui->comboBoxBus->currentData().toInt());
+    Harddrives::populateBusChannels(ui->comboBoxChannel->model(), ui->comboBoxBus->currentData().toInt(), Harddrives::busTrackClass);
     Harddrives::populateSpeeds(ui->comboBoxSpeed->model(), ui->comboBoxBus->currentData().toInt());
 
     switch (ui->comboBoxBus->currentData().toInt()) {
diff --git a/src/qt/qt_harddiskdialog.hpp b/src/qt/qt_harddiskdialog.hpp
index 9de61c51b..62ec6e963 100644
--- a/src/qt/qt_harddiskdialog.hpp
+++ b/src/qt/qt_harddiskdialog.hpp
@@ -64,4 +64,10 @@ private:
     void recalcSelection();
 };
 
+typedef struct _86BoxGeom {
+    uint32_t cyl;
+    uint32_t heads;
+    uint32_t spt;
+} _86BoxGeom;
+
 #endif // QT_HARDDISKDIALOG_HPP
diff --git a/src/qt/qt_harddiskdialog.ui b/src/qt/qt_harddiskdialog.ui
index 91499d2cb..e2dea0220 100644
--- a/src/qt/qt_harddiskdialog.ui
+++ b/src/qt/qt_harddiskdialog.ui
@@ -32,45 +32,24 @@
    <string>Dialog</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>File name:</string>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="1" colspan="5">
     <widget class="FileField" name="fileField" native="true"/>
    </item>
-   <item row="5" column="4">
-    <widget class="QLabel" name="label_7">
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
      <property name="text">
-      <string>Channel:</string>
+      <string>Cylinders:</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="4">
-    <widget class="QLabel" name="label_9">
-     <property name="text">
-      <string>Speed:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="5">
-    <widget class="QComboBox" name="comboBoxSpeed">
-     <property name="maxVisibleItems">
-      <number>30</number>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="4">
-    <widget class="QLabel" name="label_5">
-     <property name="text">
-      <string>Sectors:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="2">
-    <widget class="QLabel" name="label_6">
-     <property name="text">
-      <string>Type:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
+   <item row="1" column="1">
     <widget class="QLineEdit" name="lineEditCylinders">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -86,128 +65,14 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
-    <widget class="QLineEdit" name="lineEditSize">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>64</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Size (MB):</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="5">
-    <widget class="QComboBox" name="comboBoxChannel">
-     <property name="maxVisibleItems">
-      <number>30</number>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="0" colspan="6">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="0" colspan="6">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Cylinders:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="5">
-    <widget class="QLineEdit" name="lineEditSectors">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>64</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="maxLength">
-      <number>32767</number>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="labelFormat">
-     <property name="text">
-      <string>Image Format:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="2">
+   <item row="1" column="2">
     <widget class="QLabel" name="label_4">
      <property name="text">
       <string>Heads:</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="3" colspan="3">
-    <widget class="QComboBox" name="comboBoxType">
-     <property name="maxVisibleItems">
-      <number>30</number>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="label_8">
-     <property name="text">
-      <string>Bus:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1" colspan="3">
-    <widget class="QComboBox" name="comboBoxFormat">
-     <property name="maxVisibleItems">
-      <number>30</number>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="1" colspan="3">
-    <widget class="QComboBox" name="comboBoxBlockSize">
-     <property name="maxVisibleItems">
-      <number>30</number>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="3">
+   <item row="1" column="3">
     <widget class="QLineEdit" name="lineEditHeads">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -226,28 +91,140 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="1" colspan="3">
+   <item row="1" column="4">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>Sectors:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="5">
+    <widget class="QLineEdit" name="lineEditSectors">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>64</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="maxLength">
+      <number>32767</number>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Size (MB):</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QLineEdit" name="lineEditSize">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>64</width>
+       <height>16777215</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <widget class="QLabel" name="label_6">
+     <property name="text">
+      <string>Type:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="3" colspan="3">
+    <widget class="QComboBox" name="comboBoxType">
+     <property name="maxVisibleItems">
+      <number>30</number>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_8">
+     <property name="text">
+      <string>Bus:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" colspan="3">
     <widget class="QComboBox" name="comboBoxBus">
      <property name="maxVisibleItems">
       <number>30</number>
      </property>
     </widget>
    </item>
-   <item row="7" column="0">
+   <item row="3" column="4">
+    <widget class="QLabel" name="label_7">
+     <property name="text">
+      <string>Channel:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="5">
+    <widget class="QComboBox" name="comboBoxChannel">
+     <property name="maxVisibleItems">
+      <number>30</number>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="label_9">
+     <property name="text">
+      <string>Model:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1" colspan="5">
+    <widget class="QComboBox" name="comboBoxSpeed">
+     <property name="maxVisibleItems">
+      <number>30</number>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="labelFormat">
+     <property name="text">
+      <string>Image Format:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1" colspan="5">
+    <widget class="QComboBox" name="comboBoxFormat">
+     <property name="maxVisibleItems">
+      <number>30</number>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0">
     <widget class="QLabel" name="labelBlockSize">
      <property name="text">
       <string>Block Size:</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>File name:</string>
+   <item row="6" column="1" colspan="5">
+    <widget class="QComboBox" name="comboBoxBlockSize">
+     <property name="maxVisibleItems">
+      <number>30</number>
      </property>
     </widget>
    </item>
-   <item row="8" column="0" colspan="6">
+   <item row="7" column="0" colspan="6">
     <widget class="QProgressBar" name="progressBar">
      <property name="visible">
       <bool>false</bool>
@@ -260,6 +237,29 @@
      </property>
     </widget>
    </item>
+   <item row="8" column="0" colspan="6">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="9" column="0" colspan="6">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -270,17 +270,6 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
- <tabstops>
-  <tabstop>lineEditCylinders</tabstop>
-  <tabstop>lineEditHeads</tabstop>
-  <tabstop>lineEditSectors</tabstop>
-  <tabstop>lineEditSize</tabstop>
-  <tabstop>comboBoxType</tabstop>
-  <tabstop>comboBoxBus</tabstop>
-  <tabstop>comboBoxChannel</tabstop>
-  <tabstop>comboBoxFormat</tabstop>
-  <tabstop>comboBoxBlockSize</tabstop>
- </tabstops>
  <resources/>
  <connections>
   <connection>
diff --git a/src/qt/qt_harddrive_common.cpp b/src/qt/qt_harddrive_common.cpp
index dda36917f..b0c8e0ea9 100644
--- a/src/qt/qt_harddrive_common.cpp
+++ b/src/qt/qt_harddrive_common.cpp
@@ -20,16 +20,19 @@
 
 extern "C" {
 #include <86box/hdd.h>
+#include <86box/scsi.h>
 #include <86box/cdrom.h>
 }
 
 #include <QAbstractItemModel>
+#include <QStandardItemModel>
 
 void
 Harddrives::populateBuses(QAbstractItemModel *model)
 {
     model->removeRows(0, model->rowCount());
     model->insertRows(0, 6);
+
     model->setData(model->index(0, 0), "MFM/RLL");
     model->setData(model->index(1, 0), "XTA");
     model->setData(model->index(2, 0), "ESDI");
@@ -46,29 +49,51 @@ Harddrives::populateBuses(QAbstractItemModel *model)
 }
 
 void
-Harddrives::populateRemovableBuses(QAbstractItemModel *model)
+Harddrives::populateCDROMBuses(QAbstractItemModel *model)
 {
     model->removeRows(0, model->rowCount());
-#if 0
-    model->insertRows(0, 4);
+#ifdef USE_CDROM_MITSUMI
+    model->insertRows(0, 5);
 #else
-    model->insertRows(0, 3);
+    model->insertRows(0, 4);
 #endif
+
     model->setData(model->index(0, 0), QObject::tr("Disabled"));
     model->setData(model->index(1, 0), QObject::tr("ATAPI"));
     model->setData(model->index(2, 0), QObject::tr("SCSI"));
-#if 0
+#ifdef USE_CDROM_MITSUMI
     model->setData(model->index(3, 0), QObject::tr("Mitsumi"));
+    model->setData(model->index(4, 0), QObject::tr("Panasonic/MKE"));
+#else
+    model->setData(model->index(3, 0), QObject::tr("Panasonic/MKE"));
 #endif
 
     model->setData(model->index(0, 0), HDD_BUS_DISABLED, Qt::UserRole);
     model->setData(model->index(1, 0), HDD_BUS_ATAPI, Qt::UserRole);
     model->setData(model->index(2, 0), HDD_BUS_SCSI, Qt::UserRole);
-#if 0
+#ifdef USE_CDROM_MITSUMI
     model->setData(model->index(3, 0), CDROM_BUS_MITSUMI, Qt::UserRole);
+    model->setData(model->index(4, 0), CDROM_BUS_MKE, Qt::UserRole);
+#else
+    model->setData(model->index(3, 0), CDROM_BUS_MKE, Qt::UserRole);
 #endif
 }
 
+void
+Harddrives::populateRemovableBuses(QAbstractItemModel *model)
+{
+    model->removeRows(0, model->rowCount());
+    model->insertRows(0, 3);
+
+    model->setData(model->index(0, 0), QObject::tr("Disabled"));
+    model->setData(model->index(1, 0), QObject::tr("ATAPI"));
+    model->setData(model->index(2, 0), QObject::tr("SCSI"));
+
+    model->setData(model->index(0, 0), HDD_BUS_DISABLED, Qt::UserRole);
+    model->setData(model->index(1, 0), HDD_BUS_ATAPI, Qt::UserRole);
+    model->setData(model->index(2, 0), HDD_BUS_SCSI, Qt::UserRole);
+}
+
 void
 Harddrives::populateSpeeds(QAbstractItemModel *model, int bus)
 {
@@ -96,7 +121,7 @@ Harddrives::populateSpeeds(QAbstractItemModel *model, int bus)
 }
 
 void
-Harddrives::populateBusChannels(QAbstractItemModel *model, int bus)
+Harddrives::populateBusChannels(QAbstractItemModel *model, int bus, SettingsBusTracking *sbt)
 {
     model->removeRows(0, model->rowCount());
 
@@ -104,22 +129,51 @@ Harddrives::populateBusChannels(QAbstractItemModel *model, int bus)
     int shifter         = 1;
     int orer            = 1;
     int subChannelWidth = 1;
+    QList<int> busesToCheck;
+    QList<int> channelsInUse;
     switch (bus) {
         case HDD_BUS_MFM:
+            busRows = 2;
+            busesToCheck.append(HDD_BUS_MFM);
+            break;
         case HDD_BUS_XTA:
+            busRows = 2;
+            busesToCheck.append(HDD_BUS_XTA);
+            break;
         case HDD_BUS_ESDI:
             busRows = 2;
+            busesToCheck.append(HDD_BUS_ESDI);
             break;
         case HDD_BUS_IDE:
+            busRows = 8;
+            busesToCheck.append(HDD_BUS_ATAPI);
+            busesToCheck.append(HDD_BUS_IDE);
+            break;
         case HDD_BUS_ATAPI:
             busRows = 8;
+            busesToCheck.append(HDD_BUS_IDE);
+            busesToCheck.append(HDD_BUS_ATAPI);
             break;
         case HDD_BUS_SCSI:
             shifter         = 4;
             orer            = 15;
-            busRows         = 64;
+            busRows         = /*64*/ SCSI_BUS_MAX * SCSI_ID_MAX;
             subChannelWidth = 2;
+            busesToCheck.append(HDD_BUS_SCSI);
             break;
+        case CDROM_BUS_MKE:
+            shifter         = 2;
+            orer            = 3;
+            busRows         = 4;
+            busesToCheck.append(CDROM_BUS_MKE);
+            break;
+        default:
+            break;
+    }
+    if(sbt != nullptr && !busesToCheck.empty()) {
+        for (auto const &checkBus : busesToCheck) {
+            channelsInUse.append(sbt->busChannelsInUse(checkBus));
+        }
     }
 
     model->insertRows(0, busRows);
@@ -127,6 +181,11 @@ Harddrives::populateBusChannels(QAbstractItemModel *model, int bus)
         auto idx = model->index(i, 0);
         model->setData(idx, QString("%1:%2").arg(i >> shifter).arg(i & orer, subChannelWidth, 10, QChar('0')));
         model->setData(idx, ((i >> shifter) << shifter) | (i & orer), Qt::UserRole);
+        const auto *channelModel = qobject_cast<QStandardItemModel*>(model);
+        auto *channelItem = channelModel->item(i);
+        if(channelItem) {
+            channelItem->setEnabled(!channelsInUse.contains(i));
+        }
     }
 }
 
@@ -156,9 +215,12 @@ Harddrives::BusChannelName(uint8_t bus, uint8_t channel)
         case HDD_BUS_SCSI:
             busName = QString("SCSI (%1:%2)").arg(channel >> 4).arg(channel & 15, 2, 10, QChar('0'));
             break;
-	    case CDROM_BUS_MITSUMI:
-	        busName = QString("Mitsumi");
-	        break;
+        case CDROM_BUS_MITSUMI:
+            busName = QString("Mitsumi");
+            break;
+        case CDROM_BUS_MKE:
+            busName = QString("Panasonic/MKE (%1:%2)").arg(channel >> 2).arg(channel & 3);
+            break;
     }
 
     return busName;
diff --git a/src/qt/qt_harddrive_common.hpp b/src/qt/qt_harddrive_common.hpp
index 2aca184b3..f989711f2 100644
--- a/src/qt/qt_harddrive_common.hpp
+++ b/src/qt/qt_harddrive_common.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdint>
+#include "qt_settings_bus_tracking.hpp"
 
 class QString;
 class QAbstractItemModel;
@@ -8,8 +9,9 @@ class SettingsBusTracking;
 
 namespace Harddrives {
 void                        populateBuses(QAbstractItemModel *model);
+void                        populateCDROMBuses(QAbstractItemModel *model);
 void                        populateRemovableBuses(QAbstractItemModel *model);
-void                        populateBusChannels(QAbstractItemModel *model, int bus);
+void                        populateBusChannels(QAbstractItemModel *model, int bus, SettingsBusTracking *sbt = nullptr);
 void                        populateSpeeds(QAbstractItemModel *model, int bus);
 QString                     BusChannelName(uint8_t bus, uint8_t channel);
 inline SettingsBusTracking *busTrackClass = nullptr;
diff --git a/src/qt/qt_hardwarerenderer.cpp b/src/qt/qt_hardwarerenderer.cpp
deleted file mode 100644
index 47f0de718..000000000
--- a/src/qt/qt_hardwarerenderer.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Hardware renderer module.
- *
- *
- *
- * Authors: Joakim L. Gilje <jgilje@jgilje.net>
- *          Cacodemon345
- *          Teemu Korhonen
- *
- *          Copyright 2021 Joakim L. Gilje
- *          Copyright 2021-2022 Cacodemon345
- *          Copyright 2021-2022 Teemu Korhonen
- */
-#include "qt_hardwarerenderer.hpp"
-#include <QApplication>
-#include <QVector2D>
-#include <QOpenGLPixelTransferOptions>
-
-#include <atomic>
-#include <cstdint>
-#include <vector>
-
-extern "C" {
-#include <86box/86box.h>
-#include <86box/plat.h>
-#include <86box/video.h>
-}
-
-void
-HardwareRenderer::resizeGL(int w, int h)
-{
-    m_context->makeCurrent(this);
-    glViewport(0, 0, qRound(w * devicePixelRatio()), qRound(h * devicePixelRatio()));
-}
-
-#define PROGRAM_VERTEX_ATTRIBUTE   0
-#define PROGRAM_TEXCOORD_ATTRIBUTE 1
-
-void
-HardwareRenderer::initializeGL()
-{
-    m_context->makeCurrent(this);
-    initializeOpenGLFunctions();
-    auto image = QImage(2048, 2048, QImage::Format_RGB32);
-    image.fill(0xff000000);
-    m_texture = new QOpenGLTexture(image);
-    m_blt     = new QOpenGLTextureBlitter;
-    m_blt->setRedBlueSwizzle(true);
-    m_blt->create();
-    QOpenGLShader *vshader  = new QOpenGLShader(QOpenGLShader::Vertex, this);
-    const char    *vsrc     = "attribute highp vec4 VertexCoord;\n"
-                              "attribute mediump vec4 TexCoord;\n"
-                              "varying mediump vec4 texc;\n"
-                              "uniform mediump mat4 MVPMatrix;\n"
-                              "void main(void)\n"
-                              "{\n"
-                              "    gl_Position = MVPMatrix * VertexCoord;\n"
-                              "    texc = TexCoord;\n"
-                              "}\n";
-    QString        vsrccore = "in highp vec4 VertexCoord;\n"
-                              "in mediump vec4 TexCoord;\n"
-                              "out mediump vec4 texc;\n"
-                              "uniform mediump mat4 MVPMatrix;\n"
-                              "void main(void)\n"
-                              "{\n"
-                              "    gl_Position = MVPMatrix * VertexCoord;\n"
-                              "    texc = TexCoord;\n"
-                              "}\n";
-    if (m_context->isOpenGLES() && m_context->format().version() >= qMakePair(3, 0)) {
-        vsrccore.prepend("#version 300 es\n");
-        vshader->compileSourceCode(vsrccore);
-    } else if (m_context->format().version() >= qMakePair(3, 0) && m_context->format().profile() == QSurfaceFormat::CoreProfile) {
-        vsrccore.prepend("#version 130\n");
-        vshader->compileSourceCode(vsrccore);
-    } else
-        vshader->compileSourceCode(vsrc);
-
-    QOpenGLShader *fshader  = new QOpenGLShader(QOpenGLShader::Fragment, this);
-    const char    *fsrc     = "uniform sampler2D texture;\n"
-                              "varying mediump vec4 texc;\n"
-                              "void main(void)\n"
-                              "{\n"
-                              "    gl_FragColor = texture2D(texture, texc.st).bgra;\n"
-                              "}\n";
-    QString        fsrccore = "uniform sampler2D texture;\n"
-                              "in mediump vec4 texc;\n"
-                              "out highp vec4 FragColor;\n"
-                              "void main(void)\n"
-                              "{\n"
-                              "    FragColor = texture2D(texture, texc.st).bgra;\n"
-                              "}\n";
-    if (m_context->isOpenGLES() && m_context->format().version() >= qMakePair(3, 0)) {
-        fsrccore.prepend("#version 300 es\n");
-        fshader->compileSourceCode(fsrccore);
-    } else if (m_context->format().version() >= qMakePair(3, 0) && m_context->format().profile() == QSurfaceFormat::CoreProfile) {
-        fsrccore.prepend("#version 130\n");
-        fshader->compileSourceCode(fsrccore);
-    } else
-        fshader->compileSourceCode(fsrc);
-
-    m_prog = new QOpenGLShaderProgram;
-    m_prog->addShader(vshader);
-    m_prog->addShader(fshader);
-    m_prog->bindAttributeLocation("VertexCoord", PROGRAM_VERTEX_ATTRIBUTE);
-    m_prog->bindAttributeLocation("TexCoord", PROGRAM_TEXCOORD_ATTRIBUTE);
-    m_prog->link();
-
-    m_prog->bind();
-    m_prog->setUniformValue("texture", 0);
-
-    if (m_context->format().version() >= qMakePair(3, 0) && m_vao.create()) {
-        m_vao.bind();
-    }
-
-    m_vbo[PROGRAM_VERTEX_ATTRIBUTE].create();
-    m_vbo[PROGRAM_VERTEX_ATTRIBUTE].bind();
-    m_vbo[PROGRAM_VERTEX_ATTRIBUTE].allocate(sizeof(QVector2D) * 4);
-    m_vbo[PROGRAM_TEXCOORD_ATTRIBUTE].create();
-    m_vbo[PROGRAM_TEXCOORD_ATTRIBUTE].bind();
-    m_vbo[PROGRAM_TEXCOORD_ATTRIBUTE].allocate(sizeof(QVector2D) * 4);
-
-    pclog("OpenGL vendor: %s\n", glGetString(GL_VENDOR));
-    pclog("OpenGL renderer: %s\n", glGetString(GL_RENDERER));
-    pclog("OpenGL version: %s\n", glGetString(GL_VERSION));
-    pclog("OpenGL shader language version: %s\n", glGetString(GL_SHADING_LANGUAGE_VERSION));
-    glClearColor(0, 0, 0, 1);
-    m_texture->setWrapMode(QOpenGLTexture::ClampToEdge);
-    glClear(GL_COLOR_BUFFER_BIT);
-    m_context->swapBuffers(this);
-}
-
-void
-HardwareRenderer::paintOverGL()
-{
-    /* Context switching is needed to make use of QPainter to draw status bar icons in fullscreen.
-       Especially since it seems to be impossible to use QPainter on externally-created OpenGL contexts. */
-    if (video_fullscreen && status_icons_fullscreen) {
-        m_context->makeCurrent(nullptr);
-        makeCurrent();
-        QPainter painter(this);
-        drawStatusBarIcons(&painter);
-        painter.end();
-        doneCurrent();
-        m_context->makeCurrent(this);
-    }
-}
-
-void
-HardwareRenderer::paintGL()
-{
-    m_context->makeCurrent(this);
-    glClear(GL_COLOR_BUFFER_BIT);
-    QVector<QVector2D> verts;
-    QVector<QVector2D> texcoords;
-    QMatrix4x4         mat;
-    mat.setToIdentity();
-    mat.ortho(QRectF(0, 0, (qreal) width(), (qreal) height()));
-    verts.push_back(QVector2D((float) destination.x(), (float) destination.y()));
-    verts.push_back(QVector2D((float) destination.x(), (float) destination.y() + (float) destination.height()));
-    verts.push_back(QVector2D((float) destination.x() + (float) destination.width(), (float) destination.y() + (float) destination.height()));
-    verts.push_back(QVector2D((float) destination.x() + (float) destination.width(), (float) destination.y()));
-    texcoords.push_back(QVector2D((float) source.x() / 2048.f, (float) (source.y()) / 2048.f));
-    texcoords.push_back(QVector2D((float) source.x() / 2048.f, (float) (source.y() + source.height()) / 2048.f));
-    texcoords.push_back(QVector2D((float) (source.x() + source.width()) / 2048.f, (float) (source.y() + source.height()) / 2048.f));
-    texcoords.push_back(QVector2D((float) (source.x() + source.width()) / 2048.f, (float) (source.y()) / 2048.f));
-
-    m_vbo[PROGRAM_VERTEX_ATTRIBUTE].bind();
-    m_vbo[PROGRAM_VERTEX_ATTRIBUTE].write(0, verts.data(), sizeof(QVector2D) * 4);
-    m_vbo[PROGRAM_VERTEX_ATTRIBUTE].release();
-    m_vbo[PROGRAM_TEXCOORD_ATTRIBUTE].bind();
-    m_vbo[PROGRAM_TEXCOORD_ATTRIBUTE].write(0, texcoords.data(), sizeof(QVector2D) * 4);
-    m_vbo[PROGRAM_TEXCOORD_ATTRIBUTE].release();
-
-    m_prog->setUniformValue("MVPMatrix", mat);
-    m_prog->enableAttributeArray(PROGRAM_VERTEX_ATTRIBUTE);
-    m_prog->enableAttributeArray(PROGRAM_TEXCOORD_ATTRIBUTE);
-
-    m_vbo[PROGRAM_VERTEX_ATTRIBUTE].bind();
-    m_prog->setAttributeBuffer(PROGRAM_VERTEX_ATTRIBUTE, GL_FLOAT, 0, 2, 0);
-    m_vbo[PROGRAM_VERTEX_ATTRIBUTE].release();
-    m_vbo[PROGRAM_TEXCOORD_ATTRIBUTE].bind();
-    m_prog->setAttributeBuffer(PROGRAM_TEXCOORD_ATTRIBUTE, GL_FLOAT, 0, 2, 0);
-    m_vbo[PROGRAM_TEXCOORD_ATTRIBUTE].release();
-    m_texture->bind();
-    m_texture->setMinMagFilters(video_filter_method ? QOpenGLTexture::Linear : QOpenGLTexture::Nearest, video_filter_method ? QOpenGLTexture::Linear : QOpenGLTexture::Nearest);
-    glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-}
-
-void
-HardwareRenderer::setRenderType(RenderType type)
-{
-    QSurfaceFormat format;
-    switch (type) {
-        case RenderType::OpenGL3:
-            format.setVersion(3, 0);
-            format.setProfile(QSurfaceFormat::CoreProfile);
-        case RenderType::OpenGL:
-            format.setRenderableType(QSurfaceFormat::OpenGL);
-            break;
-        case RenderType::OpenGLES:
-            format.setRenderableType(QSurfaceFormat::OpenGLES);
-            break;
-    }
-    format.setSwapInterval(0);
-    setFormat(format);
-}
-
-void
-HardwareRenderer::onBlit(int buf_idx, int x, int y, int w, int h)
-{
-    auto  tval    = this;
-    void *nuldata = 0;
-    if (memcmp(&tval, &nuldata, sizeof(void *)) == 0)
-        return;
-    auto origSource = source;
-    if (!m_texture || !m_texture->isCreated()) {
-        buf_usage[buf_idx].clear();
-        source.setRect(x, y, w, h);
-        return;
-    }
-    m_context->makeCurrent(this);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    m_texture->setData(x, y, 0, w, h, 0, QOpenGLTexture::PixelFormat::RGBA, QOpenGLTexture::PixelType::UInt8, (const void *) ((uintptr_t) imagebufs[buf_idx].get() + (uintptr_t) (2048 * 4 * y + x * 4)), &m_transferOptions);
-#else
-    m_texture->bind();
-    glPixelStorei(GL_UNPACK_ROW_LENGTH, 2048);
-    glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, QOpenGLTexture::PixelFormat::RGBA, QOpenGLTexture::PixelType::UInt8, (const void *) ((uintptr_t) imagebufs[buf_idx].get() + (uintptr_t) (2048 * 4 * y + x * 4)));
-    m_texture->release();
-#endif
-    buf_usage[buf_idx].clear();
-    source.setRect(x, y, w, h);
-    if (origSource != source)
-        onResize(this->width(), this->height());
-    update();
-}
-
-void
-HardwareRenderer::resizeEvent(QResizeEvent *event)
-{
-    onResize(width(), height());
-
-    QOpenGLWindow::resizeEvent(event);
-}
-
-bool
-HardwareRenderer::event(QEvent *event)
-{
-    bool res = false;
-    if (!eventDelegate(event, res))
-        return QOpenGLWindow::event(event);
-    return res;
-}
-
-std::vector<std::tuple<uint8_t *, std::atomic_flag *>>
-HardwareRenderer::getBuffers()
-{
-    std::vector<std::tuple<uint8_t *, std::atomic_flag *>> buffers;
-
-    buffers.push_back(std::make_tuple(imagebufs[0].get(), &buf_usage[0]));
-    buffers.push_back(std::make_tuple(imagebufs[1].get(), &buf_usage[1]));
-
-    return buffers;
-}
diff --git a/src/qt/qt_hardwarerenderer.hpp b/src/qt/qt_hardwarerenderer.hpp
deleted file mode 100644
index 1918cda18..000000000
--- a/src/qt/qt_hardwarerenderer.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-#pragma once
-
-#include <QOpenGLFunctions>
-#include <QOpenGLBuffer>
-#include <QOpenGLWindow>
-#include <QOpenGLVertexArrayObject>
-#include <QOpenGLTexture>
-#include <QOpenGLShader>
-#include <QOpenGLShaderProgram>
-#include <QOpenGLTextureBlitter>
-#include <QOpenGLPixelTransferOptions>
-#include <QPainter>
-#include <QEvent>
-#include <QKeyEvent>
-#include <QWidget>
-
-#include <atomic>
-#include <mutex>
-#include <array>
-#include <vector>
-#include <memory>
-#include <QApplication>
-
-#include "qt_renderercommon.hpp"
-
-#ifdef WAYLAND
-#    include "wl_mouse.hpp"
-#endif
-
-class HardwareRenderer : public QOpenGLWindow, protected QOpenGLFunctions, public RendererCommon {
-    Q_OBJECT
-
-private:
-    bool                        wayland = false;
-    QOpenGLContext             *m_context;
-    QOpenGLTexture             *m_texture { nullptr };
-    QOpenGLShaderProgram       *m_prog { nullptr };
-    QOpenGLTextureBlitter      *m_blt { nullptr };
-    QOpenGLBuffer               m_vbo[2];
-    QOpenGLVertexArrayObject    m_vao;
-    QOpenGLPixelTransferOptions m_transferOptions;
-
-public:
-    enum class RenderType {
-        OpenGL,
-        OpenGLES,
-        OpenGL3,
-    };
-    void resizeGL(int w, int h) override;
-    void initializeGL() override;
-    void paintGL() override;
-    void exposeEvent(QExposeEvent *event) override
-    {
-        onResize(size().width(), size().height());
-    }
-    void paintOverGL() override;
-    std::vector<std::tuple<uint8_t *, std::atomic_flag *>> getBuffers() override;
-    HardwareRenderer(QWidget *parent = nullptr, RenderType rtype = RenderType::OpenGL)
-        : QOpenGLWindow(QOpenGLWindow::NoPartialUpdate, parent->windowHandle())
-        , QOpenGLFunctions()
-    {
-        imagebufs[0] = std::unique_ptr<uint8_t>(new uint8_t[2048 * 2048 * 4]);
-        imagebufs[1] = std::unique_ptr<uint8_t>(new uint8_t[2048 * 2048 * 4]);
-
-        buf_usage = std::vector<std::atomic_flag>(2);
-        buf_usage[0].clear();
-        buf_usage[1].clear();
-
-        setMinimumSize(QSize(16, 16));
-        setFlags(Qt::FramelessWindowHint);
-        parentWidget = parent;
-        setRenderType(rtype);
-
-        m_transferOptions.setRowLength(2048);
-
-        m_context = new QOpenGLContext();
-        m_context->setFormat(format());
-        m_context->create();
-        update();
-    }
-    ~HardwareRenderer()
-    {
-        m_context->makeCurrent(this);
-        if (m_blt)
-            m_blt->destroy();
-        m_prog->release();
-        delete m_prog;
-        m_prog = nullptr;
-        m_context->doneCurrent();
-        delete m_context;
-    }
-
-    void setRenderType(RenderType type);
-
-public slots:
-    void onBlit(int buf_idx, int x, int y, int w, int h);
-
-protected:
-    std::array<std::unique_ptr<uint8_t>, 2> imagebufs;
-
-    void resizeEvent(QResizeEvent *event) override;
-    bool event(QEvent *event) override;
-};
diff --git a/src/qt/qt_iconindicators.cpp b/src/qt/qt_iconindicators.cpp
new file mode 100644
index 000000000..169910b21
--- /dev/null
+++ b/src/qt/qt_iconindicators.cpp
@@ -0,0 +1,55 @@
+#include <QSize>
+#include <QPainter>
+#include "qt_iconindicators.hpp"
+
+QIcon
+getIndicatorIcon(IconIndicator indicator)
+{
+    switch (indicator) {
+        case Active:
+            return QIcon(":/settings/qt/icons/active.ico");
+        case WriteActive:
+            return QIcon(":/settings/qt/icons/write_active.ico");
+        case Disabled:
+            return QIcon(":/settings/qt/icons/disabled.ico");
+        case WriteProtected:
+            return QIcon(":/settings/qt/icons/write_protected.ico");
+        case New:
+            return QIcon(":/settings/qt/icons/new.ico");
+        case Browse:
+            return QIcon(":/settings/qt/icons/browse.ico");
+        case Eject:
+            return QIcon(":/settings/qt/icons/eject.ico");
+        case Export:
+            return QIcon(":/settings/qt/icons/eject.ico");
+        default:
+            return QIcon();
+    }
+}
+
+QPixmap
+getIconWithIndicator(const QIcon &icon, const QSize &size, QIcon::Mode iconMode, IconIndicator indicator)
+{
+    auto iconPixmap = icon.pixmap(size, iconMode);
+
+    if (indicator == None)
+        return iconPixmap;
+
+    auto painter = QPainter(&iconPixmap);
+    auto indicatorPixmap = getIndicatorIcon((indicator == ReadWriteActive || indicator == WriteProtectedActive) ? Active : indicator).pixmap(size);
+
+    if (indicator == WriteProtectedBrowse)
+        indicatorPixmap = getIndicatorIcon(WriteProtected).pixmap(size);
+
+    painter.drawPixmap(0, 0, indicatorPixmap);
+    if ((indicator == ReadWriteActive) || (indicator == WriteProtectedActive)) {
+        auto writeIndicatorPixmap = getIndicatorIcon(indicator == WriteProtectedActive ? WriteProtected : WriteActive).pixmap(size);
+        painter.drawPixmap(0, 0, writeIndicatorPixmap);
+    } else if (indicator == WriteProtectedBrowse) {
+        auto browseIndicatorPixmap = getIndicatorIcon(Browse).pixmap(size);
+        painter.drawPixmap(0, 0, browseIndicatorPixmap);
+    }
+    painter.end();
+
+    return iconPixmap;
+}
diff --git a/src/qt/qt_iconindicators.hpp b/src/qt/qt_iconindicators.hpp
new file mode 100644
index 000000000..c3c8946ad
--- /dev/null
+++ b/src/qt/qt_iconindicators.hpp
@@ -0,0 +1,24 @@
+#ifndef QT_ICONINDICATORS_HPP
+#    define QT_ICONINDICATORS_HPP
+
+#include <QPixmap>
+#include <QIcon>
+
+enum IconIndicator {
+    None,
+    Active,
+    WriteActive,
+    ReadWriteActive,
+    Disabled,
+    WriteProtected,
+    WriteProtectedActive,
+    New,
+    Browse,
+    WriteProtectedBrowse,
+    Export,
+    Eject
+};
+
+QPixmap getIconWithIndicator(const QIcon &icon, const QSize &size, QIcon::Mode iconMode, IconIndicator indicator);
+
+#endif
diff --git a/src/qt/qt_joystickconfiguration.cpp b/src/qt/qt_joystickconfiguration.cpp
index c363cd544..2d8910f4a 100644
--- a/src/qt/qt_joystickconfiguration.cpp
+++ b/src/qt/qt_joystickconfiguration.cpp
@@ -27,21 +27,22 @@ extern "C" {
 #include <QDialogButtonBox>
 #include "qt_models_common.hpp"
 
-JoystickConfiguration::JoystickConfiguration(int type, int joystick_nr, QWidget *parent)
+JoystickConfiguration::JoystickConfiguration(int type, uint8_t gameport_nr, int joystick_nr, QWidget *parent)
     : QDialog(parent)
     , ui(new Ui::JoystickConfiguration)
     , type(type)
+    , gameport_nr(gameport_nr)
     , joystick_nr(joystick_nr)
 {
     ui->setupUi(this);
 
     auto model = ui->comboBoxDevice->model();
-    Models::AddEntry(model, "None", 0);
+    Models::AddEntry(model, tr("None"), 0);
     for (int c = 0; c < joysticks_present; c++) {
         Models::AddEntry(model, plat_joystick_state[c].name, c + 1);
     }
 
-    ui->comboBoxDevice->setCurrentIndex(joystick_state[joystick_nr].plat_joystick_nr);
+    ui->comboBoxDevice->setCurrentIndex(joystick_state[gameport_nr][joystick_nr].plat_joystick_nr);
     layout()->setSizeConstraint(QLayout::SetFixedSize);
 }
 
@@ -114,23 +115,16 @@ JoystickConfiguration::on_comboBoxDevice_currentIndexChanged(int index)
         }
 
         for (int d = 0; d < plat_joystick_state[joystick].nr_povs; d++) {
-            Models::AddEntry(model, QString("%1 (X axis)").arg(plat_joystick_state[joystick].pov[d].name), 0);
-            Models::AddEntry(model, QString("%1 (Y axis)").arg(plat_joystick_state[joystick].pov[d].name), 0);
-        }
-
-        for (int d = 0; d < plat_joystick_state[joystick].nr_sliders; d++) {
-            Models::AddEntry(model, plat_joystick_state[joystick].slider[d].name, 0);
+            Models::AddEntry(model, tr("%1 (X axis)").arg(plat_joystick_state[joystick].pov[d].name), 0);
+            Models::AddEntry(model, tr("%1 (Y axis)").arg(plat_joystick_state[joystick].pov[d].name), 0);
         }
 
         int nr_axes = plat_joystick_state[joystick].nr_axes;
-        int nr_povs = plat_joystick_state[joystick].nr_povs;
-        int mapping = joystick_state[joystick_nr].axis_mapping[c];
+        int mapping = joystick_state[gameport_nr][joystick_nr].axis_mapping[c];
         if (mapping & POV_X)
             cbox->setCurrentIndex(nr_axes + (mapping & 3) * 2);
         else if (mapping & POV_Y)
             cbox->setCurrentIndex(nr_axes + (mapping & 3) * 2 + 1);
-        else if (mapping & SLIDER)
-            cbox->setCurrentIndex(nr_axes + nr_povs * 2 + (mapping & 3));
         else
             cbox->setCurrentIndex(mapping);
 
@@ -154,7 +148,7 @@ JoystickConfiguration::on_comboBoxDevice_currentIndexChanged(int index)
             Models::AddEntry(model, plat_joystick_state[joystick].button[d].name, 0);
         }
 
-        cbox->setCurrentIndex(joystick_state[joystick_nr].button_mapping[c]);
+        cbox->setCurrentIndex(joystick_state[gameport_nr][joystick_nr].button_mapping[c]);
 
         ui->ct->addWidget(label, row, 0);
         ui->ct->addWidget(cbox, row, 1);
@@ -168,9 +162,9 @@ JoystickConfiguration::on_comboBoxDevice_currentIndexChanged(int index)
     for (int c = 0; c < joystick_get_pov_count(type) * 2; c++) {
         QLabel *label;
         if (c & 1) {
-            label = new QLabel(QString("%1 (Y axis)").arg(joystick_get_pov_name(type, c / 2)), this);
+            label = new QLabel(tr("%1 (Y axis)").arg(joystick_get_pov_name(type, c / 2)), this);
         } else {
-            label = new QLabel(QString("%1 (X axis)").arg(joystick_get_pov_name(type, c / 2)), this);
+            label = new QLabel(tr("%1 (X axis)").arg(joystick_get_pov_name(type, c / 2)), this);
         }
         auto cbox = new QComboBox(this);
         cbox->setObjectName(QString("cboxPov%1").arg(QString::number(c)));
@@ -178,15 +172,15 @@ JoystickConfiguration::on_comboBoxDevice_currentIndexChanged(int index)
         auto model = cbox->model();
 
         for (int d = 0; d < plat_joystick_state[joystick].nr_povs; d++) {
-            Models::AddEntry(model, QString("%1 (X axis)").arg(plat_joystick_state[joystick].pov[d].name), 0);
-            Models::AddEntry(model, QString("%1 (Y axis)").arg(plat_joystick_state[joystick].pov[d].name), 0);
+            Models::AddEntry(model, tr("%1 (X axis)").arg(plat_joystick_state[joystick].pov[d].name), 0);
+            Models::AddEntry(model, tr("%1 (Y axis)").arg(plat_joystick_state[joystick].pov[d].name), 0);
         }
 
         for (int d = 0; d < plat_joystick_state[joystick].nr_axes; d++) {
             Models::AddEntry(model, plat_joystick_state[joystick].axis[d].name, 0);
         }
 
-        int mapping = joystick_state[joystick_nr].pov_mapping[c / 2][c & 1];
+        int mapping = joystick_state[gameport_nr][joystick_nr].pov_mapping[c / 2][c & 1];
         int nr_povs = plat_joystick_state[joystick].nr_povs;
         if (mapping & POV_X)
             cbox->setCurrentIndex((mapping & 3) * 2);
diff --git a/src/qt/qt_joystickconfiguration.hpp b/src/qt/qt_joystickconfiguration.hpp
index 0b185ad73..bff38992a 100644
--- a/src/qt/qt_joystickconfiguration.hpp
+++ b/src/qt/qt_joystickconfiguration.hpp
@@ -11,7 +11,7 @@ class JoystickConfiguration : public QDialog {
     Q_OBJECT
 
 public:
-    explicit JoystickConfiguration(int type, int joystick_nr, QWidget *parent = nullptr);
+    explicit JoystickConfiguration(int type, uint8_t gameport_nr, int joystick_nr, QWidget *parent = nullptr);
     ~JoystickConfiguration();
 
     int selectedDevice();
@@ -25,6 +25,7 @@ private:
     Ui::JoystickConfiguration *ui;
     QList<QWidget *>           widgets;
     int                        type;
+    int                        gameport_nr;
     int                        joystick_nr;
 };
 
diff --git a/src/qt/qt_keybind.cpp b/src/qt/qt_keybind.cpp
new file mode 100644
index 000000000..e6e87a5e2
--- /dev/null
+++ b/src/qt/qt_keybind.cpp
@@ -0,0 +1,102 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Keybind dialog
+ *
+ *
+ *
+ * Authors: Cathode Ray Dude
+ *          Cacodemon345
+ *
+ *          Copyright 2025 Cathode Ray Dude
+ *          Copyright 2025 Cacodemon345
+ */
+#include "qt_keybind.hpp"
+#include "ui_qt_keybind.h"
+#include "qt_settings.hpp"
+#include "qt_singlekeyseqedit.hpp"
+
+#include <QDebug>
+#include <QComboBox>
+#include <QPushButton>
+#include <QFormLayout>
+#include <QSpinBox>
+#include <QCheckBox>
+#include <QFrame>
+#include <QLineEdit>
+#include <QLabel>
+#include <QDir>
+#include <QSettings>
+#include <QKeyEvent>
+#include <QKeySequence>
+#include <QKeySequenceEdit>
+
+extern "C" {
+#include <86box/86box.h>
+#include <86box/ini.h>
+#include <86box/config.h>
+#include <86box/device.h>
+#include <86box/midi_rtmidi.h>
+#include <86box/mem.h>
+#include <86box/random.h>
+#include <86box/rom.h>
+}
+
+#include "qt_filefield.hpp"
+#include "qt_models_common.hpp"
+#ifdef Q_OS_LINUX
+#    include <sys/stat.h>
+#    include <sys/sysmacros.h>
+#endif
+#ifdef Q_OS_WINDOWS
+#include <windows.h>
+#endif
+
+KeyBinder::KeyBinder(QWidget *parent)
+    : QDialog(parent)
+    , ui(new Ui::KeyBinder)
+{
+    ui->setupUi(this);
+	singleKeySequenceEdit *seq = new singleKeySequenceEdit();
+	ui->formLayout->addRow(seq);
+	seq->setObjectName("keySequence");
+	this->setTabOrder(seq, ui->buttonBox);
+}
+
+KeyBinder::~KeyBinder()
+{
+    delete ui;
+}
+
+void
+KeyBinder::showEvent( QShowEvent* event ) {
+    QWidget::showEvent( event );
+    this->findChild<QKeySequenceEdit*>()->setFocus();
+} 
+
+bool KeyBinder::eventFilter(QObject *obj, QEvent *event)
+{
+	 return QObject::eventFilter(obj, event);
+}
+
+QKeySequence
+KeyBinder::BindKey(QWidget* widget, QString CurValue)
+{
+	KeyBinder kb(widget);
+	kb.setWindowTitle(tr("Bind Key"));
+    kb.setFixedSize(kb.minimumSizeHint());
+	kb.findChild<QKeySequenceEdit*>()->setKeySequence(QKeySequence::fromString(CurValue, QKeySequence::NativeText));
+	kb.setEnabled(true);
+	
+    if (kb.exec() == QDialog::Accepted) {
+		QKeySequenceEdit *seq = kb.findChild<QKeySequenceEdit*>();
+		return (seq->keySequence());
+    } else {
+		return (false);
+	}
+}
\ No newline at end of file
diff --git a/src/qt/qt_keybind.hpp b/src/qt/qt_keybind.hpp
new file mode 100644
index 000000000..25f4a9168
--- /dev/null
+++ b/src/qt/qt_keybind.hpp
@@ -0,0 +1,33 @@
+#ifndef QT_KeyBinder_HPP
+#define QT_KeyBinder_HPP
+
+#include <QDialog>
+
+#include "qt_settings.hpp"
+
+extern "C" {
+struct _device_;
+}
+
+namespace Ui {
+class KeyBinder;
+}
+
+class Settings;
+
+class KeyBinder : public QDialog {
+    Q_OBJECT
+
+public:
+    explicit KeyBinder(QWidget *parent = nullptr);
+    ~KeyBinder() override;
+
+    static QKeySequence BindKey(QWidget* widget, QString CurValue);
+
+private:
+    Ui::KeyBinder *ui;
+	bool eventFilter(QObject *obj, QEvent *event) override;
+	void showEvent( QShowEvent* event ) override;
+};
+
+#endif // QT_KeyBinder_HPP
diff --git a/src/qt/qt_keybind.ui b/src/qt/qt_keybind.ui
new file mode 100644
index 000000000..7bd8a8a62
--- /dev/null
+++ b/src/qt/qt_keybind.ui
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>KeyBinder</class>
+ <widget class="QDialog" name="KeyBinder">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>103</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="1">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Enter key combo:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>KeyBinder</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>KeyBinder</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/qt/qt_machinestatus.cpp b/src/qt/qt_machinestatus.cpp
index d7b115a64..6ff25d60f 100644
--- a/src/qt/qt_machinestatus.cpp
+++ b/src/qt/qt_machinestatus.cpp
@@ -19,9 +19,6 @@
 #include "qt_machinestatus.hpp"
 
 extern "C" {
-#define EMU_CPU_H // superhack - don't want timer.h to include cpu.h here, and some combo is preventing a compile
-extern uint64_t tsc;
-
 #include <86box/hdd.h>
 #include <86box/timer.h>
 #include <86box/86box.h>
@@ -34,7 +31,7 @@ extern uint64_t tsc;
 #include <86box/hdc.h>
 #include <86box/scsi.h>
 #include <86box/scsi_device.h>
-#include <86box/zip.h>
+#include <86box/rdisk.h>
 #include <86box/mo.h>
 #include <86box/plat.h>
 #include <86box/machine.h>
@@ -42,6 +39,9 @@ extern uint64_t tsc;
 #include <86box/network.h>
 #include <86box/ui.h>
 #include <86box/machine_status.h>
+#include <86box/config.h>
+
+extern volatile int fdcinited;
 };
 
 #include <QIcon>
@@ -56,28 +56,44 @@ extern uint64_t tsc;
 #include "qt_mainwindow.hpp"
 #include "qt_soundgain.hpp"
 #include "qt_progsettings.hpp"
+#include "qt_iconindicators.hpp"
 
 #include <array>
 
 extern MainWindow *main_window;
 
+static bool sbar_initialized = false;
+
 namespace {
 struct PixmapSetActive {
     QPixmap normal;
     QPixmap active;
-    void    load(const QString &basePath);
+    QPixmap write_active;
+    QPixmap read_write_active;
+    void    load(const QIcon &icon);
+};
+struct PixmapSetDisabled {
+    QPixmap normal;
+    QPixmap disabled;
+    void    load(const QIcon &icon);
 };
 struct PixmapSetEmpty {
     QPixmap normal;
     QPixmap empty;
-    void    load(const QString &basePath);
+    void    load(const QIcon &icon);
 };
 struct PixmapSetEmptyActive {
     QPixmap normal;
     QPixmap active;
     QPixmap empty;
     QPixmap empty_active;
-    void    load(QString basePath);
+    QPixmap write_active;
+    QPixmap read_write_active;
+    QPixmap empty_write_active;
+    QPixmap empty_read_write_active;
+    QPixmap wp;
+    QPixmap wp_active;
+    void    load(const QIcon &icon);
 };
 struct Pixmaps {
     PixmapSetEmpty       cartridge;
@@ -86,17 +102,18 @@ struct Pixmaps {
     PixmapSetEmptyActive floppy_525;
     PixmapSetEmptyActive floppy_35;
     PixmapSetEmptyActive cdrom;
-    PixmapSetEmptyActive zip;
+    PixmapSetEmptyActive rdisk;
     PixmapSetEmptyActive mo;
     PixmapSetActive      hd;
     PixmapSetEmptyActive net;
-    QPixmap              sound;
+    PixmapSetDisabled    sound;
 };
 
 struct StateActive {
     std::unique_ptr<QLabel> label;
     PixmapSetActive        *pixmaps = nullptr;
     bool                    active  = false;
+    bool                    write_active  = false;
 
     void setActive(bool b)
     {
@@ -107,11 +124,23 @@ struct StateActive {
         refresh();
     }
 
+    void setWriteActive(bool b)
+    {
+        if (!label || b == write_active)
+            return;
+
+        write_active = b;
+        refresh();
+    }
+
     void refresh()
     {
         if (!label)
             return;
-        label->setPixmap(active ? pixmaps->active : pixmaps->normal);
+        if (active && write_active)
+            label->setPixmap(pixmaps->read_write_active);
+        else
+            label->setPixmap(write_active ? pixmaps->write_active : (active ? pixmaps->active : pixmaps->normal));
     }
 };
 struct StateEmpty {
@@ -137,9 +166,11 @@ struct StateEmpty {
 };
 struct StateEmptyActive {
     std::unique_ptr<QLabel> label;
-    PixmapSetEmptyActive   *pixmaps = nullptr;
-    bool                    empty   = false;
-    bool                    active  = false;
+    PixmapSetEmptyActive   *pixmaps       = nullptr;
+    bool                    empty         = false;
+    bool                    active        = false;
+    bool                    write_active  = false;
+    bool                    wp            = false;
 
     void setActive(bool b)
     {
@@ -149,6 +180,14 @@ struct StateEmptyActive {
         active = b;
         refresh();
     }
+    void setWriteActive(bool b)
+    {
+        if (!label || b == write_active)
+            return;
+
+        write_active = b;
+        refresh();
+    }
     void setEmpty(bool b)
     {
         if (!label || b == empty)
@@ -157,43 +196,73 @@ struct StateEmptyActive {
         empty = b;
         refresh();
     }
+    void setWriteProtected(bool b)
+    {
+        if (!label || b == wp)
+            return;
+
+        wp = b;
+        refresh();
+    }
     void refresh()
     {
         if (!label)
             return;
         if (empty) {
-            label->setPixmap(active ? pixmaps->empty_active : pixmaps->empty);
+            if (active && write_active)
+                label->setPixmap(pixmaps->empty_read_write_active);
+            else
+                label->setPixmap(write_active ? pixmaps->empty_write_active : (active ? pixmaps->empty_active : pixmaps->empty));
         } else {
-            label->setPixmap(active ? pixmaps->active : pixmaps->normal);
+            if (wp)
+                label->setPixmap(active ? pixmaps->wp_active : pixmaps->wp);
+            else if (active && write_active)
+                label->setPixmap(pixmaps->read_write_active);
+            else
+                label->setPixmap(write_active ? pixmaps->write_active : (active ? pixmaps->active : pixmaps->normal));
         }
     }
 };
 
 static QSize         pixmap_size(16, 16);
-static const QString pixmap_empty        = QStringLiteral("_empty");
-static const QString pixmap_active       = QStringLiteral("_active");
-static const QString pixmap_empty_active = QStringLiteral("_empty_active");
+
 void
-PixmapSetEmpty::load(const QString &basePath)
+PixmapSetEmpty::load(const QIcon &icon)
 {
-    normal = ProgSettings::loadIcon(basePath.arg(QStringLiteral(""))).pixmap(pixmap_size);
-    empty  = ProgSettings::loadIcon(basePath.arg(pixmap_empty)).pixmap(pixmap_size);
+    normal = getIconWithIndicator(icon, pixmap_size, QIcon::Normal, None);
+    empty  = getIconWithIndicator(icon, pixmap_size, QIcon::Disabled, None);
 }
 
 void
-PixmapSetActive::load(const QString &basePath)
+PixmapSetActive::load(const QIcon &icon)
 {
-    normal = ProgSettings::loadIcon(basePath.arg(QStringLiteral(""))).pixmap(pixmap_size);
-    active = ProgSettings::loadIcon(basePath.arg(pixmap_active)).pixmap(pixmap_size);
+    normal = getIconWithIndicator(icon, pixmap_size, QIcon::Normal, None);
+    active = getIconWithIndicator(icon, pixmap_size, QIcon::Normal, Active);
+    
+    write_active = getIconWithIndicator(icon, pixmap_size, QIcon::Normal, WriteActive);
+    read_write_active = getIconWithIndicator(icon, pixmap_size, QIcon::Normal, ReadWriteActive);
 }
 
 void
-PixmapSetEmptyActive::load(QString basePath)
+PixmapSetDisabled::load(const QIcon &icon)
 {
-    normal       = ProgSettings::loadIcon(basePath.arg(QStringLiteral(""))).pixmap(pixmap_size);
-    active       = ProgSettings::loadIcon(basePath.arg(pixmap_active)).pixmap(pixmap_size);
-    empty        = ProgSettings::loadIcon(basePath.arg(pixmap_empty)).pixmap(pixmap_size);
-    empty_active = ProgSettings::loadIcon(basePath.arg(pixmap_empty_active)).pixmap(pixmap_size);
+    normal   = getIconWithIndicator(icon, pixmap_size, QIcon::Normal, None);
+    disabled = getIconWithIndicator(icon, pixmap_size, QIcon::Disabled, Disabled);
+}
+
+void
+PixmapSetEmptyActive::load(const QIcon &icon)
+{
+    normal                  = getIconWithIndicator(icon, pixmap_size, QIcon::Normal, None);
+    wp                      = getIconWithIndicator(icon, pixmap_size, QIcon::Normal, WriteProtected);
+    wp_active               = getIconWithIndicator(icon, pixmap_size, QIcon::Normal, WriteProtectedActive);
+    active                  = getIconWithIndicator(icon, pixmap_size, QIcon::Normal, Active);
+    write_active            = getIconWithIndicator(icon, pixmap_size, QIcon::Normal, WriteActive);
+    read_write_active       = getIconWithIndicator(icon, pixmap_size, QIcon::Normal, ReadWriteActive);
+    empty                   = getIconWithIndicator(icon, pixmap_size, QIcon::Disabled, None);
+    empty_active            = getIconWithIndicator(icon, pixmap_size, QIcon::Disabled, Active);
+    empty_write_active      = getIconWithIndicator(icon, pixmap_size, QIcon::Disabled, WriteActive);
+    empty_read_write_active = getIconWithIndicator(icon, pixmap_size, QIcon::Disabled, ReadWriteActive);
 }
 }
 
@@ -202,20 +271,23 @@ struct MachineStatus::States {
 
     States(QObject *parent)
     {
-        pixmaps.cartridge.load("/cartridge%1.ico");
-        pixmaps.cassette.load("/cassette%1.ico");
-        pixmaps.floppy_disabled.normal       = ProgSettings::loadIcon(QStringLiteral("/floppy_disabled.ico")).pixmap(pixmap_size);
-        pixmaps.floppy_disabled.active       = pixmaps.floppy_disabled.normal;
-        pixmaps.floppy_disabled.empty        = pixmaps.floppy_disabled.normal;
-        pixmaps.floppy_disabled.empty_active = pixmaps.floppy_disabled.normal;
-        pixmaps.floppy_525.load("/floppy_525%1.ico");
-        pixmaps.floppy_35.load("/floppy_35%1.ico");
-        pixmaps.cdrom.load("/cdrom%1.ico");
-        pixmaps.zip.load("/zip%1.ico");
-        pixmaps.mo.load("/mo%1.ico");
-        pixmaps.hd.load("/hard_disk%1.ico");
-        pixmaps.net.load("/network%1.ico");
-        pixmaps.sound = ProgSettings::loadIcon("/sound.ico").pixmap(pixmap_size);
+        pixmaps.cartridge.load(QIcon(":/settings/qt/icons/cartridge.ico"));
+        pixmaps.cassette.load(QIcon(":/settings/qt/icons/cassette.ico"));
+        pixmaps.floppy_disabled.normal                  = QIcon(":/settings/qt/icons/floppy_disabled.ico").pixmap(pixmap_size);
+        pixmaps.floppy_disabled.active                  = pixmaps.floppy_disabled.normal;
+        pixmaps.floppy_disabled.read_write_active       = pixmaps.floppy_disabled.normal;
+        pixmaps.floppy_disabled.empty                   = pixmaps.floppy_disabled.normal;
+        pixmaps.floppy_disabled.empty_active            = pixmaps.floppy_disabled.normal;
+        pixmaps.floppy_disabled.empty_write_active      = pixmaps.floppy_disabled.normal;
+        pixmaps.floppy_disabled.empty_read_write_active = pixmaps.floppy_disabled.normal;
+        pixmaps.floppy_525.load(QIcon(":/settings/qt/icons/floppy_525.ico"));
+        pixmaps.floppy_35.load(QIcon(":/settings/qt/icons/floppy_35.ico"));
+        pixmaps.cdrom.load(QIcon(":/settings/qt/icons/cdrom.ico"));
+        pixmaps.rdisk.load(QIcon(":/settings/qt/icons/rdisk.ico"));
+        pixmaps.mo.load(QIcon(":/settings/qt/icons/mo.ico"));
+        pixmaps.hd.load(QIcon(":/settings/qt/icons/hard_disk.ico"));
+        pixmaps.net.load(QIcon(":/settings/qt/icons/network.ico"));
+        pixmaps.sound.load(QIcon(":/settings/qt/icons/sound.ico"));
 
         cartridge[0].pixmaps = &pixmaps.cartridge;
         cartridge[1].pixmaps = &pixmaps.cartridge;
@@ -226,8 +298,8 @@ struct MachineStatus::States {
         for (auto &c : cdrom) {
             c.pixmaps = &pixmaps.cdrom;
         }
-        for (auto &z : zip) {
-            z.pixmaps = &pixmaps.zip;
+        for (auto &z : rdisk) {
+            z.pixmaps = &pixmaps.rdisk;
         }
         for (auto &m : mo) {
             m.pixmaps = &pixmaps.mo;
@@ -244,7 +316,7 @@ struct MachineStatus::States {
     StateEmptyActive                           cassette;
     std::array<StateEmptyActive, FDD_NUM>      fdd;
     std::array<StateEmptyActive, CDROM_NUM>    cdrom;
-    std::array<StateEmptyActive, ZIP_NUM>      zip;
+    std::array<StateEmptyActive, RDISK_NUM>    rdisk;
     std::array<StateEmptyActive, MO_NUM>       mo;
     std::array<StateActive, HDD_BUS_USB>       hdds;
     std::array<StateEmptyActive, NET_CARD_MAX> net;
@@ -257,12 +329,19 @@ MachineStatus::MachineStatus(QObject *parent)
     , refreshTimer(new QTimer(this))
 {
     d = std::make_unique<MachineStatus::States>(this);
+    soundMenu = nullptr;
     connect(refreshTimer, &QTimer::timeout, this, &MachineStatus::refreshIcons);
     refreshTimer->start(75);
 }
 
 MachineStatus::~MachineStatus() = default;
 
+void
+MachineStatus::setSoundMenu(QMenu* menu)
+{
+    soundMenu = menu;
+}
+
 bool
 MachineStatus::hasCassette()
 {
@@ -272,18 +351,21 @@ MachineStatus::hasCassette()
 bool
 MachineStatus::hasIDE()
 {
-    return machine_has_flags(machine, MACHINE_IDE_QUAD) > 0;
+    return (machine_has_flags(machine, MACHINE_IDE_QUAD) > 0) || other_ide_present;
 }
 
 bool
 MachineStatus::hasSCSI()
 {
-    return machine_has_flags(machine, MACHINE_SCSI) > 0;
+    return (machine_has_flags(machine, MACHINE_SCSI) > 0) || other_scsi_present;
 }
 
 void
 MachineStatus::iterateFDD(const std::function<void(int)> &cb)
 {
+    if (!fdcinited)
+        return;
+
     for (int i = 0; i < FDD_NUM; ++i) {
         if (fdd_get_type(i) != 0) {
             cb(i);
@@ -294,14 +376,19 @@ MachineStatus::iterateFDD(const std::function<void(int)> &cb)
 void
 MachineStatus::iterateCDROM(const std::function<void(int)> &cb)
 {
-    auto hdc_name = QString(hdc_get_internal_name(hdc_current));
+    auto hdc_name = QString(hdc_get_internal_name(hdc_current[0]));
     for (size_t i = 0; i < CDROM_NUM; i++) {
         /* Could be Internal or External IDE.. */
-        if ((cdrom[i].bus_type == CDROM_BUS_ATAPI) && !hasIDE() && hdc_name.left(3) != QStringLiteral("ide") && hdc_name.left(5) != QStringLiteral("xtide"))
+        if ((cdrom[i].bus_type == CDROM_BUS_ATAPI) && !hasIDE() &&
+            (hdc_name.left(3) != QStringLiteral("ide")) &&
+            (hdc_name.left(5) != QStringLiteral("xtide")) &&
+            (hdc_name.left(5) != QStringLiteral("mcide")))
             continue;
-        if ((cdrom[i].bus_type == CDROM_BUS_SCSI) && !hasSCSI() && (scsi_card_current[0] == 0) && (scsi_card_current[1] == 0) && (scsi_card_current[2] == 0) && (scsi_card_current[3] == 0))
+        if ((cdrom[i].bus_type == CDROM_BUS_SCSI) && !hasSCSI() &&
+            (scsi_card_current[0] == 0) && (scsi_card_current[1] == 0) &&
+            (scsi_card_current[2] == 0) && (scsi_card_current[3] == 0))
             continue;
-        if ((cdrom[i].bus_type == CDROM_BUS_MITSUMI) && (cdrom_interface_current == 0))
+        if ((cdrom[i].bus_type == CDROM_BUS_MITSUMI || cdrom[i].bus_type == CDROM_BUS_MKE) && (cdrom_interface_current == 0))
             continue;
         if (cdrom[i].bus_type != 0) {
             cb(i);
@@ -310,16 +397,21 @@ MachineStatus::iterateCDROM(const std::function<void(int)> &cb)
 }
 
 void
-MachineStatus::iterateZIP(const std::function<void(int)> &cb)
+MachineStatus::iterateRDisk(const std::function<void(int)> &cb)
 {
-    auto hdc_name = QString(hdc_get_internal_name(hdc_current));
-    for (size_t i = 0; i < ZIP_NUM; i++) {
+    auto hdc_name = QString(hdc_get_internal_name(hdc_current[0]));
+    for (size_t i = 0; i < RDISK_NUM; i++) {
         /* Could be Internal or External IDE.. */
-        if ((zip_drives[i].bus_type == ZIP_BUS_ATAPI) && !hasIDE() && hdc_name.left(3) != QStringLiteral("ide") && hdc_name.left(5) != QStringLiteral("xtide"))
+        if ((rdisk_drives[i].bus_type == RDISK_BUS_ATAPI) && !hasIDE() &&
+            (hdc_name.left(3) != QStringLiteral("ide")) &&
+            (hdc_name.left(5) != QStringLiteral("xtide")) &&
+            (hdc_name.left(5) != QStringLiteral("mcide")))
             continue;
-        if ((zip_drives[i].bus_type == ZIP_BUS_SCSI) && !hasSCSI() && (scsi_card_current[0] == 0) && (scsi_card_current[1] == 0) && (scsi_card_current[2] == 0) && (scsi_card_current[3] == 0))
+        if ((rdisk_drives[i].bus_type == RDISK_BUS_SCSI) && !hasSCSI() &&
+            (scsi_card_current[0] == 0) && (scsi_card_current[1] == 0) &&
+            (scsi_card_current[2] == 0) && (scsi_card_current[3] == 0))
             continue;
-        if (zip_drives[i].bus_type != 0) {
+        if (rdisk_drives[i].bus_type != 0) {
             cb(i);
         }
     }
@@ -328,12 +420,17 @@ MachineStatus::iterateZIP(const std::function<void(int)> &cb)
 void
 MachineStatus::iterateMO(const std::function<void(int)> &cb)
 {
-    auto hdc_name = QString(hdc_get_internal_name(hdc_current));
+    auto hdc_name = QString(hdc_get_internal_name(hdc_current[0]));
     for (size_t i = 0; i < MO_NUM; i++) {
         /* Could be Internal or External IDE.. */
-        if ((mo_drives[i].bus_type == MO_BUS_ATAPI) && !hasIDE() && hdc_name.left(3) != QStringLiteral("ide") && hdc_name.left(5) != QStringLiteral("xtide"))
+        if ((mo_drives[i].bus_type == MO_BUS_ATAPI) && !hasIDE() &&
+            (hdc_name.left(3) != QStringLiteral("ide")) &&
+            (hdc_name.left(5) != QStringLiteral("xtide")) &&
+            (hdc_name.left(5) != QStringLiteral("mcide")))
             continue;
-        if ((mo_drives[i].bus_type == MO_BUS_SCSI) && !hasSCSI() && (scsi_card_current[0] == 0) && (scsi_card_current[1] == 0) && (scsi_card_current[2] == 0) && (scsi_card_current[3] == 0))
+        if ((mo_drives[i].bus_type == MO_BUS_SCSI) && !hasSCSI() &&
+            (scsi_card_current[0] == 0) && (scsi_card_current[1] == 0) &&
+            (scsi_card_current[2] == 0) && (scsi_card_current[3] == 0))
             continue;
         if (mo_drives[i].bus_type != 0) {
             cb(i);
@@ -352,12 +449,12 @@ MachineStatus::iterateNIC(const std::function<void(int)> &cb)
 }
 
 static int
-hdd_count(int bus)
+hdd_count(const int bus_type)
 {
     int c = 0;
 
     for (uint8_t i = 0; i < HDD_NUM; i++) {
-        if (hdd[i].bus == bus) {
+        if (hdd[i].bus_type == bus_type) {
             c++;
         }
     }
@@ -365,6 +462,38 @@ hdd_count(int bus)
     return c;
 }
 
+void
+MachineStatus::refreshEmptyIcons()
+{
+    /* Check if icons are initialized. */
+    if (!sbar_initialized)
+        return;
+
+    for (size_t i = 0; i < FDD_NUM; ++i) {
+        d->fdd[i].setEmpty(machine_status.fdd[i].empty);
+        d->fdd[i].setWriteProtected(machine_status.fdd[i].write_prot);
+    }
+    for (size_t i = 0; i < CDROM_NUM; ++i)
+        d->cdrom[i].setEmpty(machine_status.cdrom[i].empty);
+    for (size_t i = 0; i < RDISK_NUM; i++) {
+        d->rdisk[i].setEmpty(machine_status.rdisk[i].empty);
+        d->rdisk[i].setWriteProtected(machine_status.rdisk[i].write_prot);
+    }
+    for (size_t i = 0; i < MO_NUM; i++) {
+        d->mo[i].setEmpty(machine_status.mo[i].empty);
+        d->mo[i].setWriteProtected(machine_status.mo[i].write_prot);
+    }
+
+    d->cassette.setEmpty(machine_status.cassette.empty);
+    d->cassette.setWriteProtected(machine_status.cassette.write_prot);
+
+    for (size_t i = 0; i < NET_CARD_MAX; i++)
+        d->net[i].setEmpty(machine_status.net[i].empty);
+
+    for (int i = 0; i < 2; ++i)
+        d->cartridge[i].setEmpty(machine_status.cartridge[i].empty);
+}
+
 void
 MachineStatus::refreshIcons()
 {
@@ -374,52 +503,77 @@ MachineStatus::refreshIcons()
 
     for (size_t i = 0; i < FDD_NUM; ++i) {
         d->fdd[i].setActive(machine_status.fdd[i].active);
-        d->fdd[i].setEmpty(machine_status.fdd[i].empty);
+        d->fdd[i].setWriteActive(machine_status.fdd[i].write_active);
     }
     for (size_t i = 0; i < CDROM_NUM; ++i) {
         d->cdrom[i].setActive(machine_status.cdrom[i].active);
-        d->cdrom[i].setEmpty(machine_status.cdrom[i].empty);
+        d->cdrom[i].setWriteActive(machine_status.cdrom[i].write_active);
+        if (machine_status.cdrom[i].active) {
+            ui_sb_update_icon(SB_CDROM | i, 0);
+        }
+        if (machine_status.cdrom[i].write_active) {
+            ui_sb_update_icon_write(SB_CDROM | i, 0);
+        }
     }
-    for (size_t i = 0; i < ZIP_NUM; i++) {
-        d->zip[i].setActive(machine_status.zip[i].active);
-        d->zip[i].setEmpty(machine_status.zip[i].empty);
+    for (size_t i = 0; i < RDISK_NUM; i++) {
+        d->rdisk[i].setActive(machine_status.rdisk[i].active);
+        d->rdisk[i].setWriteActive(machine_status.rdisk[i].write_active);
+        if (machine_status.rdisk[i].active)
+            ui_sb_update_icon(SB_RDISK | i, 0);
+        if (machine_status.rdisk[i].write_active)
+            ui_sb_update_icon_write(SB_RDISK | i, 0);
     }
     for (size_t i = 0; i < MO_NUM; i++) {
         d->mo[i].setActive(machine_status.mo[i].active);
-        d->mo[i].setEmpty(machine_status.mo[i].empty);
+        d->mo[i].setWriteActive(machine_status.mo[i].write_active);
+        if (machine_status.mo[i].active)
+            ui_sb_update_icon(SB_MO | i, 0);
+        if (machine_status.mo[i].write_active)
+            ui_sb_update_icon_write(SB_MO | i, 0);
     }
 
-    d->cassette.setEmpty(machine_status.cassette.empty);
-
     for (size_t i = 0; i < HDD_BUS_USB; i++) {
         d->hdds[i].setActive(machine_status.hdd[i].active);
+        d->hdds[i].setWriteActive(machine_status.hdd[i].write_active);
+        if (machine_status.hdd[i].active)
+            ui_sb_update_icon(SB_HDD | i, 0);
+        if (machine_status.hdd[i].write_active)
+            ui_sb_update_icon_write(SB_HDD | i, 0);
     }
 
     for (size_t i = 0; i < NET_CARD_MAX; i++) {
         d->net[i].setActive(machine_status.net[i].active);
-        d->net[i].setEmpty(machine_status.net[i].empty);
-    }
-
-    for (int i = 0; i < 2; ++i) {
-        d->cartridge[i].setEmpty(machine_status.cartridge[i].empty);
+        d->net[i].setWriteActive(machine_status.net[i].write_active);
     }
 }
 
 void
 MachineStatus::clearActivity()
 {
-    for (auto &fdd : d->fdd)
+    for (auto &fdd : d->fdd) {
         fdd.setActive(false);
-    for (auto &cdrom : d->cdrom)
+        fdd.setWriteActive(false);
+    }
+    for (auto &cdrom : d->cdrom) {
         cdrom.setActive(false);
-    for (auto &zip : d->zip)
-        zip.setActive(false);
-    for (auto &mo : d->mo)
+        cdrom.setWriteActive(false);
+    }
+    for (auto &rdisk : d->rdisk) {
+        rdisk.setActive(false);
+        rdisk.setWriteActive(false);
+    }
+    for (auto &mo : d->mo) {
         mo.setActive(false);
-    for (auto &hdd : d->hdds)
+        mo.setWriteActive(false);
+    }
+    for (auto &hdd : d->hdds) {
         hdd.setActive(false);
-    for (auto &net : d->net)
+        hdd.setWriteActive(false);
+    }
+    for (auto &net : d->net) {
         net.setActive(false);
+        net.setWriteActive(false);
+    }
 }
 
 void
@@ -446,8 +600,8 @@ MachineStatus::refresh(QStatusBar *sbar)
     for (size_t i = 0; i < CDROM_NUM; i++) {
         sbar->removeWidget(d->cdrom[i].label.get());
     }
-    for (size_t i = 0; i < ZIP_NUM; i++) {
-        sbar->removeWidget(d->zip[i].label.get());
+    for (size_t i = 0; i < RDISK_NUM; i++) {
+        sbar->removeWidget(d->rdisk[i].label.get());
     }
     for (size_t i = 0; i < MO_NUM; i++) {
         sbar->removeWidget(d->mo[i].label.get());
@@ -463,6 +617,12 @@ MachineStatus::refresh(QStatusBar *sbar)
     if (cassette_enable) {
         d->cassette.label = std::make_unique<ClickableLabel>();
         d->cassette.setEmpty(QString(cassette_fname).isEmpty());
+        if (QString(cassette_fname).isEmpty())
+            d->cassette.setWriteProtected(false);
+        else if (QString(cassette_fname).left(5) == "wp://")
+            d->cassette.setWriteProtected(true);
+        else
+            d->cassette.setWriteProtected(cassette_ui_writeprot);
         d->cassette.refresh();
         connect((ClickableLabel *) d->cassette.label.get(), &ClickableLabel::clicked, [](QPoint pos) {
             MediaMenu::ptr->cassetteMenu->popup(pos - QPoint(0, MediaMenu::ptr->cassetteMenu->sizeHint().height()));
@@ -470,7 +630,7 @@ MachineStatus::refresh(QStatusBar *sbar)
         connect((ClickableLabel *) d->cassette.label.get(), &ClickableLabel::dropped, [](QString str) {
             MediaMenu::ptr->cassetteMount(str, false);
         });
-        d->cassette.label->setToolTip(MediaMenu::ptr->cassetteMenu->title());
+        d->cassette.label->setToolTip(MediaMenu::ptr->cassetteMenu->toolTip());
         d->cassette.label->setAcceptDrops(true);
         sbar->addWidget(d->cassette.label.get());
     }
@@ -486,7 +646,7 @@ MachineStatus::refresh(QStatusBar *sbar)
             connect((ClickableLabel *) d->cartridge[i].label.get(), &ClickableLabel::dropped, [i](QString str) {
                 MediaMenu::ptr->cartridgeMount(i, str);
             });
-            d->cartridge[i].label->setToolTip(MediaMenu::ptr->cartridgeMenus[i]->title());
+            d->cartridge[i].label->setToolTip(MediaMenu::ptr->cartridgeMenus[i]->toolTip());
             d->cartridge[i].label->setAcceptDrops(true);
             sbar->addWidget(d->cartridge[i].label.get());
         }
@@ -503,7 +663,14 @@ MachineStatus::refresh(QStatusBar *sbar)
         }
         d->fdd[i].label = std::make_unique<ClickableLabel>();
         d->fdd[i].setEmpty(QString(floppyfns[i]).isEmpty());
+        if (QString(floppyfns[i]).isEmpty())
+            d->fdd[i].setWriteProtected(false);
+        else if (QString(floppyfns[i]).left(5) == "wp://")
+            d->fdd[i].setWriteProtected(true);
+        else
+            d->fdd[i].setWriteProtected(ui_writeprot[i]);
         d->fdd[i].setActive(false);
+        d->fdd[i].setWriteActive(false);
         d->fdd[i].refresh();
         connect((ClickableLabel *) d->fdd[i].label.get(), &ClickableLabel::clicked, [i](QPoint pos) {
             MediaMenu::ptr->floppyMenus[i]->popup(pos - QPoint(0, MediaMenu::ptr->floppyMenus[i]->sizeHint().height()));
@@ -511,15 +678,16 @@ MachineStatus::refresh(QStatusBar *sbar)
         connect((ClickableLabel *) d->fdd[i].label.get(), &ClickableLabel::dropped, [i](QString str) {
             MediaMenu::ptr->floppyMount(i, str, false);
         });
-        d->fdd[i].label->setToolTip(MediaMenu::ptr->floppyMenus[i]->title());
+        d->fdd[i].label->setToolTip(MediaMenu::ptr->floppyMenus[i]->toolTip());
         d->fdd[i].label->setAcceptDrops(true);
         sbar->addWidget(d->fdd[i].label.get());
     });
 
     iterateCDROM([this, sbar](int i) {
         d->cdrom[i].label = std::make_unique<ClickableLabel>();
-        d->cdrom[i].setEmpty(cdrom[i].host_drive != 200 || QString(cdrom[i].image_path).isEmpty());
+        d->cdrom[i].setEmpty(QString(cdrom[i].image_path).isEmpty());
         d->cdrom[i].setActive(false);
+        d->cdrom[i].setWriteActive(false);
         d->cdrom[i].refresh();
         connect((ClickableLabel *) d->cdrom[i].label.get(), &ClickableLabel::clicked, [i](QPoint pos) {
             MediaMenu::ptr->cdromMenus[i]->popup(pos - QPoint(0, MediaMenu::ptr->cdromMenus[i]->sizeHint().height()));
@@ -527,31 +695,45 @@ MachineStatus::refresh(QStatusBar *sbar)
         connect((ClickableLabel *) d->cdrom[i].label.get(), &ClickableLabel::dropped, [i](QString str) {
             MediaMenu::ptr->cdromMount(i, str);
         });
-        d->cdrom[i].label->setToolTip(MediaMenu::ptr->cdromMenus[i]->title());
+        d->cdrom[i].label->setToolTip(MediaMenu::ptr->cdromMenus[i]->toolTip());
         d->cdrom[i].label->setAcceptDrops(true);
         sbar->addWidget(d->cdrom[i].label.get());
     });
 
-    iterateZIP([this, sbar](int i) {
-        d->zip[i].label = std::make_unique<ClickableLabel>();
-        d->zip[i].setEmpty(QString(zip_drives[i].image_path).isEmpty());
-        d->zip[i].setActive(false);
-        d->zip[i].refresh();
-        connect((ClickableLabel *) d->zip[i].label.get(), &ClickableLabel::clicked, [i](QPoint pos) {
-            MediaMenu::ptr->zipMenus[i]->popup(pos - QPoint(0, MediaMenu::ptr->zipMenus[i]->sizeHint().height()));
+    iterateRDisk([this, sbar](int i) {
+        d->rdisk[i].label = std::make_unique<ClickableLabel>();
+        d->rdisk[i].setEmpty(QString(rdisk_drives[i].image_path).isEmpty());
+        if (QString(rdisk_drives[i].image_path).isEmpty())
+            d->rdisk[i].setWriteProtected(false);
+        else if (QString(rdisk_drives[i].image_path).left(5) == "wp://")
+            d->rdisk[i].setWriteProtected(true);
+        else
+            d->rdisk[i].setWriteProtected(rdisk_drives[i].read_only);
+        d->rdisk[i].setActive(false);
+        d->rdisk[i].setWriteActive(false);
+        d->rdisk[i].refresh();
+        connect((ClickableLabel *) d->rdisk[i].label.get(), &ClickableLabel::clicked, [i](QPoint pos) {
+            MediaMenu::ptr->rdiskMenus[i]->popup(pos - QPoint(0, MediaMenu::ptr->rdiskMenus[i]->sizeHint().height()));
         });
-        connect((ClickableLabel *) d->zip[i].label.get(), &ClickableLabel::dropped, [i](QString str) {
-            MediaMenu::ptr->zipMount(i, str, false);
+        connect((ClickableLabel *) d->rdisk[i].label.get(), &ClickableLabel::dropped, [i](QString str) {
+            MediaMenu::ptr->rdiskMount(i, str, false);
         });
-        d->zip[i].label->setToolTip(MediaMenu::ptr->zipMenus[i]->title());
-        d->zip[i].label->setAcceptDrops(true);
-        sbar->addWidget(d->zip[i].label.get());
+        d->rdisk[i].label->setToolTip(MediaMenu::ptr->rdiskMenus[i]->toolTip());
+        d->rdisk[i].label->setAcceptDrops(true);
+        sbar->addWidget(d->rdisk[i].label.get());
     });
 
     iterateMO([this, sbar](int i) {
         d->mo[i].label = std::make_unique<ClickableLabel>();
         d->mo[i].setEmpty(QString(mo_drives[i].image_path).isEmpty());
+        if (QString(rdisk_drives[i].image_path).isEmpty())
+            d->mo[i].setWriteProtected(false);
+        else if (QString(rdisk_drives[i].image_path).left(5) == "wp://")
+            d->mo[i].setWriteProtected(true);
+        else
+            d->mo[i].setWriteProtected(rdisk_drives[i].read_only);
         d->mo[i].setActive(false);
+        d->mo[i].setWriteActive(false);
         d->mo[i].refresh();
         connect((ClickableLabel *) d->mo[i].label.get(), &ClickableLabel::clicked, [i](QPoint pos) {
             MediaMenu::ptr->moMenus[i]->popup(pos - QPoint(0, MediaMenu::ptr->moMenus[i]->sizeHint().height()));
@@ -559,7 +741,7 @@ MachineStatus::refresh(QStatusBar *sbar)
         connect((ClickableLabel *) d->mo[i].label.get(), &ClickableLabel::dropped, [i](QString str) {
             MediaMenu::ptr->moMount(i, str, false);
         });
-        d->mo[i].label->setToolTip(MediaMenu::ptr->moMenus[i]->title());
+        d->mo[i].label->setToolTip(MediaMenu::ptr->moMenus[i]->toolTip());
         d->mo[i].label->setAcceptDrops(true);
         sbar->addWidget(d->mo[i].label.get());
     });
@@ -568,71 +750,142 @@ MachineStatus::refresh(QStatusBar *sbar)
         d->net[i].label = std::make_unique<ClickableLabel>();
         d->net[i].setEmpty(!network_is_connected(i));
         d->net[i].setActive(false);
+        d->net[i].setWriteActive(false);
         d->net[i].refresh();
-        d->net[i].label->setToolTip(MediaMenu::ptr->netMenus[i]->title());
+        d->net[i].label->setToolTip(MediaMenu::ptr->netMenus[i]->toolTip());
         connect((ClickableLabel *) d->net[i].label.get(), &ClickableLabel::clicked, [i](QPoint pos) {
             MediaMenu::ptr->netMenus[i]->popup(pos - QPoint(0, MediaMenu::ptr->netMenus[i]->sizeHint().height()));
         });
         sbar->addWidget(d->net[i].label.get());
     });
 
-    auto hdc_name = QString(hdc_get_internal_name(hdc_current));
-    if ((has_mfm || hdc_name.left(5) == QStringLiteral("st506")) && c_mfm > 0) {
+    auto hdc_name = QString(hdc_get_internal_name(hdc_current[0]));
+    if ((has_mfm || (hdc_name.left(5) == QStringLiteral("st506"))) && (c_mfm > 0)) {
         d->hdds[HDD_BUS_MFM].label = std::make_unique<QLabel>();
         d->hdds[HDD_BUS_MFM].setActive(false);
+        d->hdds[HDD_BUS_MFM].setWriteActive(false);
         d->hdds[HDD_BUS_MFM].refresh();
-        d->hdds[HDD_BUS_MFM].label->setToolTip(tr("Hard disk (%s)").replace("%s", "MFM/RLL"));
+        d->hdds[HDD_BUS_MFM].label->setToolTip(tr("Hard disk (%1)").arg("MFM/RLL"));
+        auto tooltip = d->hdds[HDD_BUS_MFM].label->toolTip();
+        tooltip.append("\n");
+        for (int i = 0; i < HDD_NUM; i++) {
+            if (hdd[i].bus_type == HDD_BUS_MFM && hdd[i].fn[0] != 0) {
+                tooltip.append(QString("\n%5:%6: %1 (C:H:S = %2:%3:%4, %7 %8)").arg(QString::fromUtf8(hdd[i].fn), QString::number(hdd[i].tracks), QString::number(hdd[i].hpc), QString::number(hdd[i].spt), QString::number(hdd[i].channel >> 1), QString::number(hdd[i].channel & 1), QString::number((((qulonglong)hdd[i].hpc * (qulonglong)hdd[i].spt * (qulonglong)hdd[i].tracks) * 512ull) / 1048576ull), tr("MB")));
+            }
+        }
+        d->hdds[HDD_BUS_MFM].label->setToolTip(tooltip);
         sbar->addWidget(d->hdds[HDD_BUS_MFM].label.get());
     }
-    if ((has_esdi || hdc_name.left(4) == QStringLiteral("esdi")) && c_esdi > 0) {
+    if ((has_esdi || (hdc_name.left(4) == QStringLiteral("esdi"))) && (c_esdi > 0)) {
         d->hdds[HDD_BUS_ESDI].label = std::make_unique<QLabel>();
         d->hdds[HDD_BUS_ESDI].setActive(false);
+        d->hdds[HDD_BUS_ESDI].setWriteActive(false);
         d->hdds[HDD_BUS_ESDI].refresh();
-        d->hdds[HDD_BUS_ESDI].label->setToolTip(tr("Hard disk (%s)").replace("%s", "ESDI"));
+        d->hdds[HDD_BUS_ESDI].label->setToolTip(tr("Hard disk (%1)").arg("ESDI"));
+        auto tooltip = d->hdds[HDD_BUS_ESDI].label->toolTip();
+        tooltip.append("\n");
+        for (int i = 0; i < HDD_NUM; i++) {
+            if (hdd[i].bus_type == HDD_BUS_ESDI && hdd[i].fn[0] != 0) {
+                tooltip.append(QString("\n%5:%6: %1 (C:H:S = %2:%3:%4, %7 %8)").arg(QString::fromUtf8(hdd[i].fn), QString::number(hdd[i].tracks), QString::number(hdd[i].hpc), QString::number(hdd[i].spt), QString::number(hdd[i].channel >> 1), QString::number(hdd[i].channel & 1), QString::number((((qulonglong)hdd[i].hpc * (qulonglong)hdd[i].spt * (qulonglong)hdd[i].tracks) * 512ull) / 1048576ull), tr("MB")));
+            }
+        }
+        d->hdds[HDD_BUS_ESDI].label->setToolTip(tooltip);
         sbar->addWidget(d->hdds[HDD_BUS_ESDI].label.get());
     }
-    if ((has_xta || hdc_name.left(3) == QStringLiteral("xta")) && c_xta > 0) {
+    if ((has_xta || (hdc_name.left(3) == QStringLiteral("xta"))) && (c_xta > 0)) {
         d->hdds[HDD_BUS_XTA].label = std::make_unique<QLabel>();
         d->hdds[HDD_BUS_XTA].setActive(false);
+        d->hdds[HDD_BUS_XTA].setWriteActive(false);
         d->hdds[HDD_BUS_XTA].refresh();
-        d->hdds[HDD_BUS_XTA].label->setToolTip(tr("Hard disk (%s)").replace("%s", "XTA"));
+        d->hdds[HDD_BUS_XTA].label->setToolTip(tr("Hard disk (%1)").arg("XTA"));
+        auto tooltip = d->hdds[HDD_BUS_XTA].label->toolTip();
+        tooltip.append("\n");
+        for (int i = 0; i < HDD_NUM; i++) {
+            if (hdd[i].bus_type == HDD_BUS_XTA && hdd[i].fn[0] != 0) {
+                tooltip.append(QString("\n%5:%6: %1 (C:H:S = %2:%3:%4, %7 %8)").arg(QString::fromUtf8(hdd[i].fn), QString::number(hdd[i].tracks), QString::number(hdd[i].hpc), QString::number(hdd[i].spt), QString::number(hdd[i].channel >> 1), QString::number(hdd[i].channel & 1), QString::number((((qulonglong)hdd[i].hpc * (qulonglong)hdd[i].spt * (qulonglong)hdd[i].tracks) * 512ull) / 1048576ull), tr("MB")));
+            }
+        }
+        d->hdds[HDD_BUS_XTA].label->setToolTip(tooltip);
         sbar->addWidget(d->hdds[HDD_BUS_XTA].label.get());
     }
-    if (hasIDE() || hdc_name.left(5) == QStringLiteral("xtide") || hdc_name.left(3) == QStringLiteral("ide")) {
+    if (hasIDE() || (hdc_name.left(5) == QStringLiteral("xtide")) ||
+        (hdc_name.left(5) == QStringLiteral("mcide")) ||
+        (hdc_name.left(3) == QStringLiteral("ide"))) {
         if (c_ide > 0) {
             d->hdds[HDD_BUS_IDE].label = std::make_unique<QLabel>();
             d->hdds[HDD_BUS_IDE].setActive(false);
+            d->hdds[HDD_BUS_IDE].setWriteActive(false);
             d->hdds[HDD_BUS_IDE].refresh();
-            d->hdds[HDD_BUS_IDE].label->setToolTip(tr("Hard disk (%s)").replace("%s", "IDE"));
+            d->hdds[HDD_BUS_IDE].label->setToolTip(tr("Hard disk (%1)").arg("IDE"));
+            auto tooltip = d->hdds[HDD_BUS_IDE].label->toolTip();
+            tooltip.append("\n");
+            for (int i = 0; i < HDD_NUM; i++) {
+                if (hdd[i].bus_type == HDD_BUS_IDE && hdd[i].fn[0] != 0) {
+                    tooltip.append(QString("\n%5:%6: %1 (C:H:S = %2:%3:%4, %7 %8)").arg(QString::fromUtf8(hdd[i].fn), QString::number(hdd[i].tracks), QString::number(hdd[i].hpc), QString::number(hdd[i].spt), QString::number(hdd[i].channel >> 1), QString::number(hdd[i].channel & 1), QString::number((((qulonglong)hdd[i].hpc * (qulonglong)hdd[i].spt * (qulonglong)hdd[i].tracks) * 512ull) / 1048576ull), tr("MB")));
+                }
+            }
+            d->hdds[HDD_BUS_IDE].label->setToolTip(tooltip);
             sbar->addWidget(d->hdds[HDD_BUS_IDE].label.get());
         }
         if (c_atapi > 0) {
             d->hdds[HDD_BUS_ATAPI].label = std::make_unique<QLabel>();
             d->hdds[HDD_BUS_ATAPI].setActive(false);
+            d->hdds[HDD_BUS_ATAPI].setWriteActive(false);
             d->hdds[HDD_BUS_ATAPI].refresh();
-            d->hdds[HDD_BUS_ATAPI].label->setToolTip(tr("Hard disk (%s)").replace("%s", "ATAPI"));
+            d->hdds[HDD_BUS_ATAPI].label->setToolTip(tr("Hard disk (%1)").arg("ATAPI"));
+            auto tooltip = d->hdds[HDD_BUS_ATAPI].label->toolTip();
+            tooltip.append("\n");
+            for (int i = 0; i < HDD_NUM; i++) {
+                if (hdd[i].bus_type == HDD_BUS_ATAPI && hdd[i].fn[0] != 0) {
+                    tooltip.append(QString("\n%5:%6: %1 (C:H:S = %2:%3:%4, %7 %8)").arg(QString::fromUtf8(hdd[i].fn), QString::number(hdd[i].tracks), QString::number(hdd[i].hpc), QString::number(hdd[i].spt), QString::number(hdd[i].channel >> 1), QString::number(hdd[i].channel & 1), QString::number((((qulonglong)hdd[i].hpc * (qulonglong)hdd[i].spt * (qulonglong)hdd[i].tracks) * 512ull) / 1048576ull), tr("MB")));
+                }
+            }
+            d->hdds[HDD_BUS_ATAPI].label->setToolTip(tooltip);
             sbar->addWidget(d->hdds[HDD_BUS_ATAPI].label.get());
         }
     }
-    if ((hasSCSI() || (scsi_card_current[0] != 0) || (scsi_card_current[1] != 0) || (scsi_card_current[2] != 0) || (scsi_card_current[3] != 0)) && c_scsi > 0) {
+    if ((hasSCSI() ||
+        (scsi_card_current[0] != 0) || (scsi_card_current[1] != 0) ||
+        (scsi_card_current[2] != 0) || (scsi_card_current[3] != 0)) &&
+        (c_scsi > 0)) {
         d->hdds[HDD_BUS_SCSI].label = std::make_unique<QLabel>();
         d->hdds[HDD_BUS_SCSI].setActive(false);
+        d->hdds[HDD_BUS_SCSI].setWriteActive(false);
         d->hdds[HDD_BUS_SCSI].refresh();
-        d->hdds[HDD_BUS_SCSI].label->setToolTip(tr("Hard disk (%s)").replace("%s", "SCSI"));
+        d->hdds[HDD_BUS_SCSI].label->setToolTip(tr("Hard disk (%1)").arg("SCSI"));
+        auto tooltip = d->hdds[HDD_BUS_SCSI].label->toolTip();
+        tooltip.append("\n");
+        for (int i = 0; i < HDD_NUM; i++) {
+            if (hdd[i].bus_type == HDD_BUS_SCSI && hdd[i].fn[0] != 0) {
+                tooltip.append(QString("\n%5:%6: %1 (C:H:S = %2:%3:%4, %7 %8)").arg(QString::fromUtf8(hdd[i].fn), QString::number(hdd[i].tracks), QString::number(hdd[i].hpc), QString::number(hdd[i].spt), QString::number(hdd[i].channel >> 4), QString::asprintf("%02d", hdd[i].channel & 15), QString::number((((qulonglong)hdd[i].hpc * (qulonglong)hdd[i].spt * (qulonglong)hdd[i].tracks) * 512ull) / 1048576ull), tr("MB")));
+            }
+        }
+        d->hdds[HDD_BUS_SCSI].label->setToolTip(tooltip);
         sbar->addWidget(d->hdds[HDD_BUS_SCSI].label.get());
     }
 
     d->sound = std::make_unique<ClickableLabel>();
-    d->sound->setPixmap(d->pixmaps.sound);
+    d->sound->setPixmap(sound_muted ? d->pixmaps.sound.disabled : d->pixmaps.sound.normal);
 
-    connect(d->sound.get(), &ClickableLabel::doubleClicked, d->sound.get(), [](QPoint pos) {
-        SoundGain gain(main_window);
-        gain.exec();
+    connect(d->sound.get(), &ClickableLabel::clicked, this, [this](QPoint pos) {
+        this->soundMenu->popup(pos - QPoint(0, this->soundMenu->sizeHint().height()));
     });
+
     d->sound->setToolTip(tr("Sound"));
     sbar->addWidget(d->sound.get());
     d->text = std::make_unique<QLabel>();
     sbar->addWidget(d->text.get());
+
+    sbar_initialized = true;
+
+    refreshEmptyIcons();
+}
+
+void
+MachineStatus::updateSoundIcon()
+{
+    if (d->sound)
+        d->sound->setPixmap(sound_muted ? d->pixmaps.sound.disabled : d->pixmaps.sound.normal);
 }
 
 void
@@ -657,27 +910,27 @@ MachineStatus::updateTip(int tag)
     switch (category) {
         case SB_CASSETTE:
             if (d->cassette.label && MediaMenu::ptr->cassetteMenu)
-                d->cassette.label->setToolTip(MediaMenu::ptr->cassetteMenu->title());
+                d->cassette.label->setToolTip(MediaMenu::ptr->cassetteMenu->toolTip());
             break;
         case SB_CARTRIDGE:
             if (d->cartridge[item].label && MediaMenu::ptr->cartridgeMenus[item])
-                d->cartridge[item].label->setToolTip(MediaMenu::ptr->cartridgeMenus[item]->title());
+                d->cartridge[item].label->setToolTip(MediaMenu::ptr->cartridgeMenus[item]->toolTip());
             break;
         case SB_FLOPPY:
             if (d->fdd[item].label && MediaMenu::ptr->floppyMenus[item])
-                d->fdd[item].label->setToolTip(MediaMenu::ptr->floppyMenus[item]->title());
+                d->fdd[item].label->setToolTip(MediaMenu::ptr->floppyMenus[item]->toolTip());
             break;
         case SB_CDROM:
             if (d->cdrom[item].label && MediaMenu::ptr->cdromMenus[item])
-                d->cdrom[item].label->setToolTip(MediaMenu::ptr->cdromMenus[item]->title());
+                d->cdrom[item].label->setToolTip(MediaMenu::ptr->cdromMenus[item]->toolTip());
             break;
-        case SB_ZIP:
-            if (d->zip[item].label && MediaMenu::ptr->zipMenus[item])
-                d->zip[item].label->setToolTip(MediaMenu::ptr->zipMenus[item]->title());
+        case SB_RDISK:
+            if (d->rdisk[item].label && MediaMenu::ptr->rdiskMenus[item])
+                d->rdisk[item].label->setToolTip(MediaMenu::ptr->rdiskMenus[item]->toolTip());
             break;
         case SB_MO:
             if (d->mo[item].label && MediaMenu::ptr->moMenus[item])
-                d->mo[item].label->setToolTip(MediaMenu::ptr->moMenus[item]->title());
+                d->mo[item].label->setToolTip(MediaMenu::ptr->moMenus[item]->toolTip());
             break;
         case SB_HDD:
             break;
@@ -688,4 +941,6 @@ MachineStatus::updateTip(int tag)
         case SB_TEXT:
             break;
     }
+
+    refreshEmptyIcons();
 }
diff --git a/src/qt/qt_machinestatus.hpp b/src/qt/qt_machinestatus.hpp
index cf706180d..bb5058265 100644
--- a/src/qt/qt_machinestatus.hpp
+++ b/src/qt/qt_machinestatus.hpp
@@ -1,6 +1,8 @@
 #ifndef QT_MACHINESTATUS_HPP
 #define QT_MACHINESTATUS_HPP
 
+#include <QAction>
+#include <QMenu>
 #include <QWidget>
 #include <QLabel>
 #include <QMouseEvent>
@@ -26,8 +28,13 @@ signals:
     void dropped(QString);
 
 protected:
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    void mousePressEvent(QMouseEvent *event) override { emit clicked(event->globalPosition().toPoint()); }
+    void mouseDoubleClickEvent(QMouseEvent *event) override { emit doubleClicked(event->globalPosition().toPoint()); }
+#else
     void mousePressEvent(QMouseEvent *event) override { emit clicked(event->globalPos()); }
     void mouseDoubleClickEvent(QMouseEvent *event) override { emit doubleClicked(event->globalPos()); }
+#endif
     void dragEnterEvent(QDragEnterEvent *event) override
     {
         if (event->mimeData()->hasUrls() && event->mimeData()->urls().size() == 1) {
@@ -65,22 +72,26 @@ public:
     static bool hasSCSI();
     static void iterateFDD(const std::function<void(int i)> &cb);
     static void iterateCDROM(const std::function<void(int i)> &cb);
-    static void iterateZIP(const std::function<void(int i)> &cb);
+    static void iterateRDisk(const std::function<void(int i)> &cb);
     static void iterateMO(const std::function<void(int i)> &cb);
     static void iterateNIC(const std::function<void(int i)> &cb);
 
     QString getMessage();
     void    clearActivity();
+    void    setSoundMenu(QMenu* menu);
 public slots:
     void refresh(QStatusBar *sbar);
     void message(const QString &msg);
     void updateTip(int tag);
+    void refreshEmptyIcons();
     void refreshIcons();
+    void updateSoundIcon();
 
 private:
     struct States;
     std::unique_ptr<States> d;
     QTimer                 *refreshTimer;
+    QMenu                  *soundMenu;
 };
 
 #endif // QT_MACHINESTATUS_HPP
diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp
index 4d02e2601..664b495bd 100644
--- a/src/qt/qt_main.cpp
+++ b/src/qt/qt_main.cpp
@@ -30,6 +30,9 @@
 #include <QFont>
 #include <QDialog>
 #include <QMessageBox>
+#include <QPushButton>
+#include <QFile>
+#include <QTextStream>
 
 #ifdef QT_STATIC
 /* Static builds need plugin imports */
@@ -41,13 +44,6 @@ Q_IMPORT_PLUGIN(QWindowsVistaStylePlugin)
 #    endif
 #endif
 
-#ifdef Q_OS_WINDOWS
-#    include "qt_winrawinputfilter.hpp"
-#    include "qt_winmanagerfilter.hpp"
-#    include <86box/win.h>
-#    include <shobjidl.h>
-#endif
-
 extern "C" {
 #include <86box/86box.h>
 #include <86box/config.h>
@@ -58,8 +54,24 @@ extern "C" {
 #   include <86box/discord.h>
 #endif
 #include <86box/gdbstub.h>
+#include <86box/version.h>
+#include <86box/renderdefs.h>
+#ifdef Q_OS_LINUX
+#define GAMEMODE_AUTO
+#include "../unix/gamemode/gamemode_client.h"
+#endif
 }
 
+#ifdef Q_OS_WINDOWS
+#    include "qt_rendererstack.hpp"
+#    include "qt_winrawinputfilter.hpp"
+#    include "qt_winmanagerfilter.hpp"
+#    include "qt_vmmanager_windarkmodefilter.hpp"
+#    include <86box/win.h>
+#    include <shobjidl.h>
+#    include <windows.h>
+#endif
+
 #include <thread>
 #include <iostream>
 #include <memory>
@@ -70,6 +82,9 @@ extern "C" {
 #include "cocoa_mouse.hpp"
 #include "qt_styleoverride.hpp"
 #include "qt_unixmanagerfilter.hpp"
+#include "qt_util.hpp"
+#include "qt_vmmanager_clientsocket.hpp"
+#include "qt_vmmanager_mainwindow.hpp"
 
 // Void Cast
 #define VC(x) const_cast<wchar_t *>(x)
@@ -78,40 +93,374 @@ extern QElapsedTimer elapsed_timer;
 extern MainWindow   *main_window;
 
 extern "C" {
+#include <86box/keyboard.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/nvr.h>
 extern int qt_nvr_save(void);
+
+bool cpu_thread_running = false;
 }
 
+#include <locale.h>
+
 void qt_set_sequence_auto_mnemonic(bool b);
 
+#ifdef Q_OS_WINDOWS
+bool acp_utf8 = false;
+
+static void
+keyboard_getkeymap()
+{
+    const LPCSTR  keyName   = "SYSTEM\\CurrentControlSet\\Control\\Keyboard Layout";
+    const LPCSTR  valueName = "Scancode Map";
+    unsigned char buf[32768];
+    DWORD         bufSize;
+    HKEY          hKey;
+    int           j;
+    UINT32       *bufEx2;
+    int           scMapCount;
+    UINT16       *bufEx;
+    int           scancode_unmapped;
+    int           scancode_mapped;
+
+    /* First, prepare the default scan code map list which is 1:1.
+     * Remappings will be inserted directly into it.
+     * 512 bytes so this takes less memory, bit 9 set means E0
+     * prefix.
+     */
+    for (j = 0; j < 512; j++)
+        scancode_map[j] = j;
+
+    /* Get the scan code remappings from:
+    HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Keyboard Layout */
+    bufSize = 32768;
+    if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, keyName, 0, 1, &hKey) == ERROR_SUCCESS) {
+        if (RegQueryValueExA(hKey, valueName, NULL, NULL, buf, &bufSize) == ERROR_SUCCESS) {
+            bufEx2     = (UINT32 *) buf;
+            scMapCount = bufEx2[2];
+            if ((bufSize != 0) && (scMapCount != 0)) {
+                bufEx = (UINT16 *) (buf + 12);
+                for (j = 0; j < scMapCount * 2; j += 2) {
+                    /* Each scan code is 32-bit: 16 bits of remapped scan code,
+                    and 16 bits of original scan code. */
+                    scancode_unmapped = bufEx[j + 1];
+                    scancode_mapped   = bufEx[j];
+
+                    scancode_unmapped = convert_scan_code(scancode_unmapped);
+                    scancode_mapped   = convert_scan_code(scancode_mapped);
+
+                    /* Ignore source scan codes with prefixes other than E1
+                       that are not E1 1D. */
+                    if (scancode_unmapped != 0xFFFF)
+                        scancode_map[scancode_unmapped] = scancode_mapped;
+                }
+            }
+        }
+        RegCloseKey(hKey);
+    }
+}
+
+void
+win_keyboard_handle(uint32_t scancode, int up, int e0, int e1)
+{
+    /* If it's not a scan code that starts with 0xE1 */
+    if (e1) {
+        if (scancode == 0x1D) {
+            scancode = scancode_map[0x100]; /* Translate E1 1D to 0x100 (which would
+                                               otherwise be E0 00 but that is invalid
+                                               anyway).
+                                               Also, take a potential mapping into
+                                               account. */
+        } else
+            scancode = 0xFFFF;
+        if (scancode != 0xFFFF)
+            keyboard_input(!up, scancode);
+    } else {
+        if (e0)
+            scancode |= 0x100;
+
+        /* Translate the scan code to 9-bit */
+        scancode = convert_scan_code(scancode);
+
+        /* Remap it according to the list from the Registry */
+        if ((scancode < (sizeof(scancode_map) / sizeof(scancode_map[0]))) && (scancode != scancode_map[scancode])) {
+            // pclog("Scan code remap: %03X -> %03X\n", scancode, scancode_map[scancode]);
+            scancode = scancode_map[scancode];
+        }
+
+        /* If it's not 0xFFFF, send it to the emulated
+           keyboard.
+           We use scan code 0xFFFF to mean a mapping that
+           has a prefix other than E0 and that is not E1 1D,
+           which is, for our purposes, invalid. */
+
+        /* Translate right CTRL to left ALT if the user has so
+           chosen. */
+        if ((scancode == 0x11d) && rctrl_is_lalt)
+            scancode = 0x038;
+
+        /* Normal scan code pass through, pass it through as is if
+           it's not an invalid scan code. */
+        if (scancode != 0xFFFF)
+            keyboard_input(!up, scancode);
+    }
+}
+
+static LRESULT CALLBACK
+emu_LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
+{
+    LPKBDLLHOOKSTRUCT lpKdhs    = (LPKBDLLHOOKSTRUCT) lParam;
+    /* Checks if CTRL was pressed. */
+    BOOL              bCtrlDown = GetAsyncKeyState (VK_CONTROL) >> ((sizeof(SHORT) * 8) - 1);
+    BOOL              is_over_window = (GetForegroundWindow() == ((HWND) main_window->winId()));
+    BOOL              ret       = TRUE;
+
+    static int        last      = 0;
+
+    if (show_second_monitors)  for (int monitor_index = 1; monitor_index < MONITORS_NUM; monitor_index++) {
+        const auto &secondaryRenderer = main_window->renderers[monitor_index];
+        is_over_window = is_over_window || ((secondaryRenderer != nullptr) &&
+                         (GetForegroundWindow() == ((HWND) secondaryRenderer->winId())));
+    }
+
+    bool skip = ((nCode < 0) || (nCode != HC_ACTION) || !is_over_window || (kbd_req_capture && !mouse_capture));
+
+    if (skip)
+        return CallNextHookEx(NULL, nCode, wParam, lParam);
+
+    /* USB keyboards send a scancode of 0x00 for multimedia keys. */
+    if (lpKdhs->scanCode == 0x00) {
+        /* Handle USB keyboard multimedia keys where possible.
+           Only a handful of keys can be handled via Virtual Key
+           detection; rest can't be reliably detected. */
+        DWORD vkCode = lpKdhs->vkCode;
+        bool up = !!(lpKdhs->flags & LLKHF_UP);
+
+        if (inhibit_multimedia_keys
+            && (lpKdhs->vkCode == VK_MEDIA_PLAY_PAUSE
+            || lpKdhs->vkCode == VK_MEDIA_NEXT_TRACK
+            || lpKdhs->vkCode == VK_MEDIA_PREV_TRACK
+            || lpKdhs->vkCode == VK_VOLUME_DOWN
+            || lpKdhs->vkCode == VK_VOLUME_UP
+            || lpKdhs->vkCode == VK_VOLUME_MUTE
+            || lpKdhs->vkCode == VK_MEDIA_STOP
+            || lpKdhs->vkCode == VK_LAUNCH_MEDIA_SELECT
+            || lpKdhs->vkCode == VK_LAUNCH_MAIL
+            || lpKdhs->vkCode == VK_LAUNCH_APP1
+            || lpKdhs->vkCode == VK_LAUNCH_APP2
+            || lpKdhs->vkCode == VK_HELP
+            || lpKdhs->vkCode == VK_BROWSER_BACK
+            || lpKdhs->vkCode == VK_BROWSER_FORWARD
+            || lpKdhs->vkCode == VK_BROWSER_FAVORITES
+            || lpKdhs->vkCode == VK_BROWSER_HOME
+            || lpKdhs->vkCode == VK_BROWSER_REFRESH
+            || lpKdhs->vkCode == VK_BROWSER_SEARCH
+            || lpKdhs->vkCode == VK_BROWSER_STOP))
+            ret = TRUE;
+        else
+            ret = CallNextHookEx(NULL, nCode, wParam, lParam);
+
+        switch (vkCode)
+        {
+            case VK_MEDIA_PLAY_PAUSE:
+            {
+                win_keyboard_handle(0x22, up, 1, 0);
+                break;
+            }
+            case VK_MEDIA_STOP:
+            {
+                win_keyboard_handle(0x24, up, 1, 0);
+                break;
+            }
+            case VK_VOLUME_UP:
+            {
+                win_keyboard_handle(0x30, up, 1, 0);
+                break;
+            }
+            case VK_VOLUME_DOWN:
+            {
+                win_keyboard_handle(0x2E, up, 1, 0);
+                break;
+            }
+            case VK_VOLUME_MUTE:
+            {
+                win_keyboard_handle(0x20, up, 1, 0);
+                break;
+            }
+            case VK_MEDIA_NEXT_TRACK:
+            {
+                win_keyboard_handle(0x19, up, 1, 0);
+                break;
+            }
+            case VK_MEDIA_PREV_TRACK:
+            {
+                win_keyboard_handle(0x10, up, 1, 0);
+                break;
+            }
+            case VK_LAUNCH_MEDIA_SELECT:
+            {
+                win_keyboard_handle(0x6D, up, 1, 0);
+                break;
+            }
+            case VK_LAUNCH_MAIL:
+            {
+                win_keyboard_handle(0x6C, up, 1, 0);
+                break;
+            }
+            case VK_LAUNCH_APP1:
+            {
+                win_keyboard_handle(0x6B, up, 1, 0);
+                break;
+            }
+            case VK_LAUNCH_APP2:
+            {
+                win_keyboard_handle(0x21, up, 1, 0);
+                break;
+            }
+            case VK_BROWSER_BACK:
+            {
+                win_keyboard_handle(0x6A, up, 1, 0);
+                break;
+            }
+            case VK_BROWSER_FORWARD:
+            {
+                win_keyboard_handle(0x69, up, 1, 0);
+                break;
+            }
+            case VK_BROWSER_STOP:
+            {
+                win_keyboard_handle(0x68, up, 1, 0);
+                break;
+            }
+            case VK_BROWSER_HOME:
+            {
+                win_keyboard_handle(0x32, up, 1, 0);
+                break;
+            }
+            case VK_BROWSER_SEARCH:
+            {
+                win_keyboard_handle(0x65, up, 1, 0);
+                break;
+            }
+            case VK_BROWSER_REFRESH:
+            {
+                win_keyboard_handle(0x67, up, 1, 0);
+                break;
+            }
+            case VK_BROWSER_FAVORITES:
+            {
+                win_keyboard_handle(0x66, up, 1, 0);
+                break;
+            }
+            case VK_HELP:
+            {
+                win_keyboard_handle(0x3b, up, 1, 0);
+                break;
+            }
+        }
+
+        return ret;
+    }
+    else if ((lpKdhs->scanCode == 0x01) && (lpKdhs->flags & LLKHF_ALTDOWN) &&
+        !(lpKdhs->flags & (LLKHF_UP | LLKHF_EXTENDED)))
+        ret = TRUE;
+    else if ((lpKdhs->scanCode == 0x01) && bCtrlDown && !(lpKdhs->flags & (LLKHF_UP | LLKHF_EXTENDED)))
+        ret = TRUE;
+    else if ((lpKdhs->scanCode == 0x0f) && (lpKdhs->flags & LLKHF_ALTDOWN) &&
+             !(lpKdhs->flags & (LLKHF_UP | LLKHF_EXTENDED)))
+        ret = TRUE;
+    else if ((lpKdhs->scanCode == 0x0f) && bCtrlDown && !(lpKdhs->flags & (LLKHF_UP | LLKHF_EXTENDED)))
+        ret = TRUE;
+    else if ((lpKdhs->scanCode == 0x39) && (lpKdhs->flags & LLKHF_ALTDOWN) &&
+             !(lpKdhs->flags & (LLKHF_UP | LLKHF_EXTENDED)))
+        ret = TRUE;
+    else if ((lpKdhs->scanCode == 0x3e) && (lpKdhs->flags & LLKHF_ALTDOWN) &&
+             !(lpKdhs->flags & (LLKHF_UP | LLKHF_EXTENDED)))
+        ret = TRUE;
+    else if ((lpKdhs->scanCode >= 0x5b) && (lpKdhs->scanCode <= 0x5d) && (lpKdhs->flags & LLKHF_EXTENDED))
+        ret = TRUE;
+    else if (inhibit_multimedia_keys
+        && (lpKdhs->vkCode == VK_MEDIA_PLAY_PAUSE
+        || lpKdhs->vkCode == VK_MEDIA_NEXT_TRACK
+        || lpKdhs->vkCode == VK_MEDIA_PREV_TRACK
+        || lpKdhs->vkCode == VK_VOLUME_DOWN
+        || lpKdhs->vkCode == VK_VOLUME_UP
+        || lpKdhs->vkCode == VK_VOLUME_MUTE
+        || lpKdhs->vkCode == VK_MEDIA_STOP
+        || lpKdhs->vkCode == VK_LAUNCH_MEDIA_SELECT
+        || lpKdhs->vkCode == VK_LAUNCH_MAIL
+        || lpKdhs->vkCode == VK_LAUNCH_APP1
+        || lpKdhs->vkCode == VK_LAUNCH_APP2
+        || lpKdhs->vkCode == VK_HELP
+        || lpKdhs->vkCode == VK_BROWSER_BACK
+        || lpKdhs->vkCode == VK_BROWSER_FORWARD
+        || lpKdhs->vkCode == VK_BROWSER_FAVORITES
+        || lpKdhs->vkCode == VK_BROWSER_HOME
+        || lpKdhs->vkCode == VK_BROWSER_REFRESH
+        || lpKdhs->vkCode == VK_BROWSER_SEARCH
+        || lpKdhs->vkCode == VK_BROWSER_STOP))
+        ret = TRUE;
+    else
+        ret = CallNextHookEx(NULL, nCode, wParam, lParam);
+
+    if (lpKdhs->scanCode == 0x00000045) {
+        if ((lpKdhs->flags & LLKHF_EXTENDED) && (lpKdhs->vkCode == 0x00000090)) {
+             /* NumLock. */
+             lpKdhs->flags &= ~LLKHF_EXTENDED;
+        } else if (!(lpKdhs->flags & LLKHF_EXTENDED) && (lpKdhs->vkCode == 0x00000013)) {
+            /* Pause - send E1 1D. */
+            win_keyboard_handle(0xe1, 0, 0, 0);
+            win_keyboard_handle(0x1d, lpKdhs->flags & LLKHF_UP, 0, 0);
+        }
+    } else if (!last && (lpKdhs->scanCode == 0x00000036))
+        /* Non-fake right shift. */
+        lpKdhs->flags &= ~LLKHF_EXTENDED;
+
+    if (lpKdhs->scanCode == 0x00000236)
+        last = 1;
+    else if (last && (lpKdhs->scanCode == 0x00000036))
+        last = 0;
+
+    if ((lpKdhs->scanCode == 0xf1) || (lpKdhs->scanCode == 0xf2))
+        /* Hanja and Han/Eng keys, suppress the extended flag. */
+        win_keyboard_handle(lpKdhs->scanCode, lpKdhs->flags & LLKHF_UP, 0, 0);
+    else
+        win_keyboard_handle(lpKdhs->scanCode, lpKdhs->flags & LLKHF_UP, lpKdhs->flags & LLKHF_EXTENDED, 0);
+
+    return ret;
+}
+#endif
+
+#ifdef Q_OS_WINDOWS
+static HHOOK llhook  = NULL;
+#endif
+
 void
 main_thread_fn()
 {
-    uint64_t old_time;
-    uint64_t new_time;
-    int      drawits;
     int      frames;
 
     QThread::currentThread()->setPriority(QThread::HighestPriority);
-    plat_set_thread_name(NULL, "main_thread_fn");
+    plat_set_thread_name(nullptr, "main_thread_fn");
     framecountx = 0;
     // title_update = 1;
-    old_time = elapsed_timer.elapsed();
-    drawits = frames = 0;
+    uint64_t old_time = elapsed_timer.elapsed();
+    int drawits = frames = 0;
+    is_cpu_thread = 1;
     while (!is_quit && cpu_thread_run) {
         /* See if it is time to run a frame of code. */
-        new_time = elapsed_timer.elapsed();
+        const uint64_t new_time = elapsed_timer.elapsed();
 #ifdef USE_GDBSTUB
         if (gdbstub_next_asap && (drawits <= 0))
-            drawits = 10;
+            drawits = force_10ms ? 10 : 1;
         else
 #endif
-            drawits += (new_time - old_time);
+            drawits += static_cast<int>(new_time - old_time);
         old_time = new_time;
         if (drawits > 0 && !dopause) {
             /* Yes, so do one frame now. */
-            drawits -= 10;
+            drawits -= force_10ms ? 10 : 1;
             if (drawits > 50)
                 drawits = 0;
 
@@ -130,33 +479,57 @@ main_thread_fn()
                     break;
             }
 #endif
-            /* Every 200 frames we save the machine status. */
-            if (++frames >= 200 && nvr_dosave) {
+            /* Every 2 emulated seconds we save the machine status. */
+            if (++frames >= (force_10ms ? 200 : 2000) && nvr_dosave) {
                 qt_nvr_save();
                 nvr_dosave = 0;
                 frames     = 0;
             }
         } else {
             /* Just so we dont overload the host OS. */
+
+            /* Trigger a hard reset if one is pending. */
+            if (hard_reset_pending) {
+                hard_reset_pending = 0;
+                pc_reset_hard_close();
+                pc_reset_hard_init();
+            }
+
             if (dopause)
                 ack_pause();
-            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+
+            plat_delay_ms(1);
         }
     }
 
+    cpu_thread_running = false;
     is_quit = 1;
-    if (gfxcard[1]) {
-        ui_deinit_monitor(1);
-        std::this_thread::sleep_for(std::chrono::milliseconds(500));
+    for (uint8_t i = 1; i < GFXCARD_MAX; i ++) {
+        if (gfxcard[i]) {
+            ui_deinit_monitor(i);
+            plat_delay_ms(500);
+        }
     }
     QTimer::singleShot(0, QApplication::instance(), []() { QApplication::processEvents(); QApplication::instance()->quit(); });
 }
 
 static std::thread *main_thread;
 
+#ifdef Q_OS_WINDOWS
+WindowsDarkModeFilter* vmm_dark_mode_filter = nullptr;
+#endif
+
 int
 main(int argc, char *argv[])
 {
+#ifdef Q_OS_WINDOWS
+    bool wasDarkTheme = false;
+    /* Check if Windows supports UTF-8 */
+    if (GetACP() == CP_UTF8)
+	    acp_utf8 = 1;
+    else
+	    acp_utf8 = 0;
+#endif
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, false);
     QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
@@ -165,16 +538,41 @@ main(int argc, char *argv[])
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
 #endif
+
     QApplication app(argc, argv);
     QLocale::setDefault(QLocale::C);
+    setlocale(LC_NUMERIC, "C");
+
+#ifdef Q_OS_WINDOWS
+    Q_INIT_RESOURCE(darkstyle);
+    if (QFile(QApplication::applicationDirPath() + "/opengl32.dll").exists()) {
+        qputenv("QT_OPENGL_DLL", QFileInfo(QApplication::applicationDirPath() + "/opengl32.dll").absoluteFilePath().toUtf8());
+    }
+    QApplication::setAttribute(Qt::AA_NativeWindows);
+
+    if (!util::isWindowsLightTheme()) {
+        QFile f(":qdarkstyle/dark/darkstyle.qss");
+
+        if (!f.exists())   {
+            printf("Unable to set stylesheet, file not found\n");
+        } else   {
+            f.open(QFile::ReadOnly | QFile::Text);
+            QTextStream ts(&f);
+            qApp->setStyleSheet(ts.readAll());
+            wasDarkTheme = true;
+        }
+        QPalette palette(qApp->palette());
+        palette.setColor(QPalette::Link, Qt::white);
+        palette.setColor(QPalette::LinkVisited, Qt::lightGray);
+        qApp->setPalette(palette);
+    }
+#endif
 
-    qt_set_sequence_auto_mnemonic(false);
     Q_INIT_RESOURCE(qt_resources);
     Q_INIT_RESOURCE(qt_translations);
     QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
     fmt.setSwapInterval(0);
     QSurfaceFormat::setDefaultFormat(fmt);
-    app.setStyle(new StyleOverride());
 
 #ifdef __APPLE__
     CocoaEventFilter cocoafilter;
@@ -182,29 +580,52 @@ main(int argc, char *argv[])
 #endif
     elapsed_timer.start();
 
+    for (size_t i = 0; i < sizeof(scancode_map) / sizeof(scancode_map[0]); i++)
+        scancode_map[i] = i;
+
+#ifdef Q_OS_WINDOWS
+    keyboard_getkeymap();
+#endif
+
     if (!pc_init(argc, argv)) {
         return 0;
     }
 
+#ifdef Q_OS_WINDOWS
+    if (util::isWindowsLightTheme() && wasDarkTheme) {
+        qApp->setStyleSheet("");
+        QPalette palette(qApp->palette());
+        palette.setColor(QPalette::Link, Qt::blue);
+        palette.setColor(QPalette::LinkVisited, Qt::magenta);
+        qApp->setPalette(palette);
+    }
+#endif
+
+    if (!start_vmm)
+#ifdef Q_OS_MACOS
+        qt_set_sequence_auto_mnemonic(false);
+#else
+        qt_set_sequence_auto_mnemonic(!!kbd_req_capture);
+#endif
+    app.setStyle(new StyleOverride());
+
     bool startMaximized = window_remember && monitor_settings[0].mon_window_maximized;
     fprintf(stderr, "Qt: version %s, platform \"%s\"\n", qVersion(), QApplication::platformName().toUtf8().data());
     ProgSettings::loadTranslators(&app);
 #ifdef Q_OS_WINDOWS
-    auto font_name = QObject::tr("FONT_NAME");
-    auto font_size = QObject::tr("FONT_SIZE");
-    QApplication::setFont(QFont(font_name, font_size.toInt()));
+    QApplication::setFont(QFont(ProgSettings::getFontName(lang_id), 9));
     SetCurrentProcessExplicitAppUserModelID(L"86Box.86Box");
 #endif
 
 #ifndef Q_OS_MACOS
 #    ifdef RELEASE_BUILD
-    app.setWindowIcon(QIcon(":/settings/win/icons/86Box-green.ico"));
+    app.setWindowIcon(QIcon(":/settings/qt/icons/86Box-green.ico"));
 #    elif defined ALPHA_BUILD
-    app.setWindowIcon(QIcon(":/settings/win/icons/86Box-red.ico"));
+    app.setWindowIcon(QIcon(":/settings/qt/icons/86Box-red.ico"));
 #    elif defined BETA_BUILD
-    app.setWindowIcon(QIcon(":/settings/win/icons/86Box-yellow.ico"));
+    app.setWindowIcon(QIcon(":/settings/qt/icons/86Box-yellow.ico"));
 #    else
-    app.setWindowIcon(QIcon(":/settings/win/icons/86Box-gray.ico"));
+    app.setWindowIcon(QIcon(":/settings/qt/icons/86Box-gray.ico"));
 #    endif
 
 #    ifdef Q_OS_UNIX
@@ -212,12 +633,92 @@ main(int argc, char *argv[])
 #    endif
 #endif
 
-    if (!pc_init_modules()) {
-        ui_msgbox_header(MBX_FATAL, (void *) IDS_2121, (void *) IDS_2056);
+    if (!pc_init_roms()) {
+        QMessageBox fatalbox(QMessageBox::Icon::Critical, QObject::tr("No ROMs found"),
+                             QObject::tr("86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory."),
+                             QMessageBox::Ok);
+        fatalbox.setTextFormat(Qt::TextFormat::RichText);
+        fatalbox.exec();
         return 6;
     }
 
+    if (start_vmm) {
+        // VMManagerMain vmm;
+        // // Hackish until there is a proper solution
+        // QApplication::setApplicationName("86Box VM Manager");
+        // QApplication::setApplicationDisplayName("86Box VM Manager");
+        // vmm.show();
+        // vmm.exec();
+#ifdef Q_OS_WINDOWS
+        auto darkModeFilter = std::unique_ptr<WindowsDarkModeFilter>(new WindowsDarkModeFilter());
+        if (darkModeFilter) {
+            qApp->installNativeEventFilter(darkModeFilter.get());
+        }
+        QTimer::singleShot(0, [&darkModeFilter] {
+#else
+        QTimer::singleShot(0, [] {
+#endif
+            const auto vmm_main_window = new VMManagerMainWindow();
+#ifdef Q_OS_WINDOWS
+            darkModeFilter.get()->setWindow(vmm_main_window);
+            // HACK
+            vmm_dark_mode_filter = darkModeFilter.get();
+#endif
+            vmm_main_window->show();
+        });
+        QApplication::exec();
+        return 0;
+    }
+
+    pc_init_modules();
+
+    // UUID / copy / move detection
+    if(!util::compareUuid()) {
+        QMessageBox movewarnbox;
+        movewarnbox.setIcon(QMessageBox::Icon::Warning);
+        movewarnbox.setText(QObject::tr("This machine might have been moved or copied."));
+        movewarnbox.setInformativeText(QObject::tr("In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."));
+        const QPushButton *movedButton  = movewarnbox.addButton(QObject::tr("I Moved It"), QMessageBox::AcceptRole);
+        const QPushButton *copiedButton = movewarnbox.addButton(QObject::tr("I Copied It"), QMessageBox::DestructiveRole);
+        QPushButton       *cancelButton = movewarnbox.addButton(QObject::tr("Cancel"), QMessageBox::RejectRole);
+        movewarnbox.setDefaultButton(cancelButton);
+        movewarnbox.exec();
+        if (movewarnbox.clickedButton() == copiedButton) {
+            util::storeCurrentUuid();
+            util::generateNewMacAdresses();
+        } else if (movewarnbox.clickedButton() == movedButton) {
+            util::storeCurrentUuid();
+        }
+    }
+
+#ifdef Q_OS_WINDOWS
+#    if !defined(EMU_BUILD_NUM) || (EMU_BUILD_NUM != 5624)
+    HWND winbox = FindWindowW(L"TWinBoxMain", NULL);
+    if (winbox &&
+        FindWindowExW(winbox, NULL, L"TToolBar", NULL) &&
+        FindWindowExW(winbox, NULL, L"TListBox", NULL) &&
+        FindWindowExW(winbox, NULL, L"TStatusBar", NULL) &&
+        (winbox = FindWindowExW(winbox, NULL, L"TPageControl", NULL)) && /* holds a TTabSheet even on VM pages */
+        FindWindowExW(winbox, NULL, L"TTabSheet", NULL))
+#    endif
+    {
+        QMessageBox warningbox(QMessageBox::Icon::Warning, QObject::tr("WinBox is no longer supported"),
+                               QObject::tr("Development of the WinBox manager stopped in 2022 due to a lack of maintainers. As we direct our efforts towards making 86Box even better, we have made the decision to no longer support WinBox as a manager.\n\nNo further updates will be provided through WinBox, and you may encounter incorrect behavior should you continue using it with newer versions of 86Box. Any bug reports related to WinBox behavior will be closed as invalid.\n\nGo to 86box.net for a list of other managers you can use."),
+                               QMessageBox::NoButton);
+        warningbox.addButton(QObject::tr("Continue"), QMessageBox::AcceptRole);
+        warningbox.addButton(QObject::tr("Exit"), QMessageBox::RejectRole);
+        warningbox.exec();
+        if (warningbox.result() == QDialog::Accepted)
+              return 0;
+    }
+#endif
+
     if (settings_only) {
+        VMManagerClientSocket manager_socket;
+        if (qgetenv("VMM_86BOX_SOCKET").size()) {
+            manager_socket.IPCConnect(qgetenv("VMM_86BOX_SOCKET"));
+            manager_socket.clientRunningStateChanged(VMManagerProtocol::RunningState::PausedWaiting);
+        }
         Settings settings;
         if (settings.exec() == QDialog::Accepted) {
             settings.save();
@@ -248,6 +749,16 @@ main(int argc, char *argv[])
     } else {
         main_window->show();
     }
+#ifdef WAYLAND
+    if (QApplication::platformName().contains("wayland")) {
+        /* Force a sync. */
+        (void)main_window->winId();
+        QApplication::sync();
+        extern void wl_keyboard_grab(QWindow *window);
+        wl_keyboard_grab(main_window->windowHandle());
+    }
+#endif
+    
 
     app.installEventFilter(main_window);
 
@@ -286,6 +797,21 @@ main(int argc, char *argv[])
         });
     }
 
+    /* Force raw input if a debugger is present. */
+    if (IsDebuggerPresent()) {
+        pclog("WARNING: Debugger detected, forcing raw input\n");
+        hook_enabled = 0;
+    }
+
+    if (hook_enabled) {
+        /* Yes, low-level hooks *DO* work with raw input, at least global ones. */
+        llhook = SetWindowsHookEx(WH_KEYBOARD_LL, emu_LowLevelKeyboardProc, NULL, 0);
+        atexit([] () -> void {
+            if (llhook)
+                UnhookWindowsHookEx(llhook);
+        });
+    }
+
     /* Setup raw input */
     auto rawInputFilter = WindowsRawInputFilter::Register(main_window);
     if (rawInputFilter) {
@@ -309,6 +835,26 @@ main(int argc, char *argv[])
         socket.connectToServer(qgetenv("86BOX_MANAGER_SOCKET"));
     }
 
+    VMManagerClientSocket manager_socket;
+    if (qgetenv("VMM_86BOX_SOCKET").size()) {
+        manager_socket.IPCConnect(qgetenv("VMM_86BOX_SOCKET"));
+        QObject::connect(&manager_socket, &VMManagerClientSocket::pause, main_window, &MainWindow::togglePause);
+        QObject::connect(&manager_socket, &VMManagerClientSocket::resetVM, main_window, &MainWindow::hardReset);
+        QObject::connect(&manager_socket, &VMManagerClientSocket::showsettings, main_window, &MainWindow::showSettings);
+        QObject::connect(&manager_socket, &VMManagerClientSocket::ctrlaltdel, []() { pc_send_cad(); });
+        QObject::connect(&manager_socket, &VMManagerClientSocket::request_shutdown, main_window, &MainWindow::close);
+        QObject::connect(&manager_socket, &VMManagerClientSocket::force_shutdown, []() {
+            do_stop();
+            emit main_window->close();
+        });
+        QObject::connect(main_window, &MainWindow::vmmRunningStateChanged, &manager_socket, &VMManagerClientSocket::clientRunningStateChanged);
+        QObject::connect(main_window, &MainWindow::vmmConfigurationChanged, &manager_socket, &VMManagerClientSocket::configurationChanged);
+        QObject::connect(main_window, &MainWindow::vmmGlobalConfigurationChanged, &manager_socket, &VMManagerClientSocket::globalConfigurationChanged);
+        main_window->installEventFilter(&manager_socket);
+
+        manager_socket.sendWinIdMessage(main_window->winId());
+    }
+
     // pc_reset_hard_init();
 
     QTimer onesec;
@@ -337,19 +883,25 @@ main(int argc, char *argv[])
 
     /* Initialize the rendering window, or fullscreen. */
     QTimer::singleShot(0, &app, [] {
+#ifdef Q_OS_WINDOWS
+        extern bool NewDarkMode;
+        NewDarkMode = util::isWindowsLightTheme();
+#endif
         pc_reset_hard_init();
-        main_thread = new std::thread(main_thread_fn);
 
         /* Set the PAUSE mode depending on the renderer. */
 #ifdef USE_VNC
-        if (vnc_enabled && vid_api != 6)
+        if (vid_api == RENDERER_VNC)
             plat_pause(1);
         else
 #endif
             plat_pause(0);
+
+        cpu_thread_running = true;
+        main_thread = new std::thread(main_thread_fn);
     });
 
-    auto ret       = app.exec();
+    const auto ret       = app.exec();
     cpu_thread_run = 0;
     main_thread->join();
     pc_close(nullptr);
diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp
index eb4634dee..1c2e000ab 100644
--- a/src/qt/qt_mainwindow.cpp
+++ b/src/qt/qt_mainwindow.cpp
@@ -33,6 +33,8 @@
 #include "qt_rendererstack.hpp"
 #include "qt_renderercommon.hpp"
 
+#include "qt_cgasettingsdialog.hpp"
+
 extern "C" {
 #include <86box/86box.h>
 #include <86box/config.h>
@@ -48,11 +50,11 @@ extern "C" {
 #include <86box/machine.h>
 #include <86box/vid_ega.h>
 #include <86box/version.h>
-#if 0
-#include <86box/acpi.h> /* Requires timer.h include, which conflicts with Qt headers */
-#endif
-extern atomic_int acpi_pwrbut_pressed;
-extern int acpi_enabled;
+#include <86box/timer.h>
+#include <86box/apm.h>
+#include <86box/nvr.h>
+#include <86box/acpi.h>
+#include <86box/renderdefs.h>
 
 #ifdef USE_VNC
 #    include <86box/vnc.h>
@@ -63,6 +65,8 @@ extern int qt_nvr_save(void);
 #ifdef MTR_ENABLED
 #    include <minitrace/minitrace.h>
 #endif
+
+extern bool cpu_thread_running;
 };
 
 #include <QGuiApplication>
@@ -90,10 +94,14 @@ extern int qt_nvr_save(void);
 #    include <QVulkanFunctions>
 #endif
 
+void qt_set_sequence_auto_mnemonic(bool b);
+
 #include <array>
+#include <memory>
 #include <unordered_map>
 
 #include "qt_settings.hpp"
+#include "qt_about.hpp"
 #include "qt_machinestatus.hpp"
 #include "qt_mediamenu.hpp"
 #include "qt_util.hpp"
@@ -137,6 +145,7 @@ namespace IOKit {
 #    include "be_keyboard.hpp"
 
 extern MainWindow *main_window;
+QShortcut *windowedShortcut;
 
 filter_result
 keyb_filter(BMessage *message, BHandler **target, BMessageFilter *filter)
@@ -157,13 +166,13 @@ keyb_filter(BMessage *message, BHandler **target, BMessageFilter *filter)
 static BMessageFilter *filter;
 #endif
 
-std::atomic<bool> blitDummied { false };
-
 extern void     qt_mouse_capture(int);
 extern "C" void qt_blit(int x, int y, int w, int h, int monitor_index);
 
 extern MainWindow *main_window;
 
+bool MainWindow::s_adjustingForce43 = false;
+
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
     , ui(new Ui::MainWindow)
@@ -180,8 +189,75 @@ MainWindow::MainWindow(QWidget *parent)
     extern MainWindow *main_window;
     main_window = this;
     ui->setupUi(this);
+    status->setSoundMenu(ui->menuSound);
+    ui->actionMute_Unmute->setText(sound_muted ? tr("&Unmute") : tr("&Mute"));
+    ui->menuEGA_S_VGA_settings->menuAction()->setMenuRole(QAction::NoRole);
     ui->stackedWidget->setMouseTracking(true);
     statusBar()->setVisible(!hide_status_bar);
+
+    auto hertz_label = new QLabel;
+    QTimer* frameRateTimer = new QTimer(this);
+    frameRateTimer->setInterval(1000);
+    frameRateTimer->setSingleShot(false);
+    connect(frameRateTimer, &QTimer::timeout, [hertz_label] {
+        hertz_label->setText(tr("%1 Hz").arg(QString::number(monitors[0].mon_actualrenderedframes.load()) + (monitors[0].mon_interlace ? "i" : "")));
+    });
+    statusBar()->addPermanentWidget(hertz_label);
+    frameRateTimer->start(1000);
+
+    num_icon = QIcon(":/settings/qt/icons/num_lock_on.ico");
+    num_icon_off = QIcon(":/settings/qt/icons/num_lock_off.ico");
+    scroll_icon = QIcon(":/settings/qt/icons/scroll_lock_on.ico");
+    scroll_icon_off = QIcon(":/settings/qt/icons/scroll_lock_off.ico");
+    caps_icon = QIcon(":/settings/qt/icons/caps_lock_on.ico");
+    caps_icon_off = QIcon(":/settings/qt/icons/caps_lock_off.ico");
+    kana_icon = QIcon(":/settings/qt/icons/kana_lock_on.ico");
+    kana_icon_off = QIcon(":/settings/qt/icons/kana_lock_off.ico");
+
+    num_label = new QLabel;
+    num_label->setPixmap(num_icon_off.pixmap(QSize(16, 16)));
+    num_label->setToolTip(QShortcut::tr("Num Lock"));
+    statusBar()->addPermanentWidget(num_label);
+
+    caps_label = new QLabel;
+    caps_label->setPixmap(caps_icon_off.pixmap(QSize(16, 16)));
+    caps_label->setToolTip(QShortcut::tr("Caps Lock"));
+    statusBar()->addPermanentWidget(caps_label);
+
+    scroll_label = new QLabel;
+    scroll_label->setPixmap(scroll_icon_off.pixmap(QSize(16, 16)));
+    scroll_label->setToolTip(QShortcut::tr("Scroll Lock"));
+    statusBar()->addPermanentWidget(scroll_label);
+
+    kana_label = new QLabel;
+    kana_label->setPixmap(kana_icon_off.pixmap(QSize(16, 16)));
+    kana_label->setToolTip(QShortcut::tr("Kana Lock"));
+    statusBar()->addPermanentWidget(kana_label);
+
+    QTimer* ledKeyboardTimer = new QTimer(this);
+    ledKeyboardTimer->setTimerType(Qt::CoarseTimer);
+    ledKeyboardTimer->setInterval(1);
+    connect(ledKeyboardTimer, &QTimer::timeout, this, [this] () {
+        uint8_t caps, num, scroll, kana;
+        keyboard_get_states(&caps, &num, &scroll, &kana);
+
+        if (num_label->isVisible())
+            num_label->setPixmap(num ? this->num_icon.pixmap(QSize(16, 16)) : this->num_icon_off.pixmap(QSize(16, 16)));
+        if (caps_label->isVisible())
+            caps_label->setPixmap(caps ? this->caps_icon.pixmap(QSize(16, 16)) : this->caps_icon_off.pixmap(QSize(16, 16)));
+        if (scroll_label->isVisible())
+            scroll_label->setPixmap(scroll ? this->scroll_icon.pixmap(QSize(16, 16)) :
+                                                                      this->scroll_icon_off.pixmap(QSize(16, 16)));
+
+        if (kana_label->isVisible())
+            kana_label->setPixmap(kana ? this->kana_icon.pixmap(QSize(16, 16)) :
+                                                                this->kana_icon_off.pixmap(QSize(16, 16)));
+    });
+    ledKeyboardTimer->start();
+
+#ifdef Q_OS_WINDOWS
+    util::setWin11RoundedCorners(this->winId(), (hide_status_bar ? false : true));
+#endif
     statusBar()->setStyleSheet("QStatusBar::item {border: None; } QStatusBar QLabel { margin-right: 2px; margin-bottom: 1px; }");
     this->centralWidget()->setStyleSheet("background-color: black;");
     ui->toolBar->setVisible(!hide_tool_bar);
@@ -206,17 +282,33 @@ MainWindow::MainWindow(QWidget *parent)
 
     connect(this, &MainWindow::hardResetCompleted, this, [this]() {
         ui->actionMCA_devices->setVisible(machine_has_bus(machine, MACHINE_BUS_MCA));
-        QApplication::setOverrideCursor(Qt::ArrowCursor);
+        num_label->setVisible(machine_has_bus(machine, MACHINE_BUS_PS2_PORTS | MACHINE_BUS_AT_KBD));
+        scroll_label->setVisible(machine_has_bus(machine, MACHINE_BUS_PS2_PORTS | MACHINE_BUS_AT_KBD));
+        caps_label->setVisible(machine_has_bus(machine, MACHINE_BUS_PS2_PORTS | MACHINE_BUS_AT_KBD));
+        int ext_ax_kbd = machine_has_bus(machine, MACHINE_BUS_PS2_PORTS | MACHINE_BUS_AT_KBD) &&
+                         (keyboard_type == KEYBOARD_TYPE_AX);
+        int int_ax_kbd = machine_has_flags(machine, MACHINE_KEYBOARD_JIS) &&
+                         !machine_has_bus(machine, MACHINE_BUS_PS2_PORTS);
+        kana_label->setVisible(ext_ax_kbd || int_ax_kbd);
+        while (QApplication::overrideCursor())
+            QApplication::restoreOverrideCursor();
 #ifdef USE_WACOM
         ui->menuTablet_tool->menuAction()->setVisible(mouse_input_mode >= 1);
 #else
         ui->menuTablet_tool->menuAction()->setVisible(false);
 #endif
+
+        bool enable_comp_option = false;
+        for (int i = 0; i < MONITORS_NUM; i++) {
+            if (monitors[i].mon_composite) { enable_comp_option = true; break; }
+        }
+
+        ui->actionCGA_composite_settings->setEnabled(enable_comp_option);
     });
 
-    connect(this, &MainWindow::showMessageForNonQtThread, this, &MainWindow::showMessage_, Qt::BlockingQueuedConnection);
+    connect(this, &MainWindow::showMessageForNonQtThread, this, &MainWindow::showMessage_, Qt::QueuedConnection);
 
-    connect(this, &MainWindow::setTitle, this, [this, toolbar_label](const QString &title) {
+    connect(this, &MainWindow::setTitle, this, [toolbar_label](const QString &title) {
         if (dopause && !hide_tool_bar) {
             toolbar_label->setText(toolbar_label->text() + tr(" - PAUSED"));
             return;
@@ -236,8 +328,6 @@ MainWindow::MainWindow(QWidget *parent)
             }
         }
 #endif
-        ui->actionPause->setChecked(false);
-        ui->actionPause->setCheckable(false);
     });
     connect(this, &MainWindow::getTitleForNonQtThread, this, &MainWindow::getTitle_, Qt::BlockingQueuedConnection);
 
@@ -257,14 +347,27 @@ MainWindow::MainWindow(QWidget *parent)
         mouse_capture = state ? 1 : 0;
         qt_mouse_capture(mouse_capture);
         if (mouse_capture) {
-            this->grabKeyboard();
+            if (hook_enabled)
+                this->grabKeyboard();
             if (ui->stackedWidget->mouse_capture_func)
                 ui->stackedWidget->mouse_capture_func(this->windowHandle());
         } else {
             this->releaseKeyboard();
-            if (ui->stackedWidget->mouse_uncapture_func)
+            if (ui->stackedWidget->mouse_uncapture_func) {
                 ui->stackedWidget->mouse_uncapture_func();
+            }
+            ui->stackedWidget->unsetCursor();
         }
+#ifndef Q_OS_MACOS
+        if (kbd_req_capture) {
+            qt_set_sequence_auto_mnemonic(!mouse_capture);
+            /* Hack to get the menubar to update the internal Alt+shortcut table */
+            if (!video_fullscreen) {
+                ui->menubar->hide();
+                ui->menubar->show();
+            }
+        }
+#endif
     });
 
     connect(qApp, &QGuiApplication::applicationStateChanged, [this](Qt::ApplicationState state) {
@@ -277,6 +380,8 @@ MainWindow::MainWindow(QWidget *parent)
             if (mouse_capture)
                 emit setMouseCapture(false);
 
+            keyboard_all_up();
+
             if (do_auto_pause && !dopause) {
                 auto_paused = 1;
                 plat_pause(1);
@@ -291,14 +396,15 @@ MainWindow::MainWindow(QWidget *parent)
             resizableonce = true;
         }
         if (!QApplication::platformName().contains("eglfs") && vid_resize != 1) {
-            w = (w / (!dpi_scale ? util::screenOfWidget(this)->devicePixelRatio() : 1.));
+            w = static_cast<int>(w / (!dpi_scale ? util::screenOfWidget(this)->devicePixelRatio() : 1.));
 
-            int modifiedHeight = (h / (!dpi_scale ? util::screenOfWidget(this)->devicePixelRatio() : 1.))
+            const int modifiedHeight =
+                static_cast<int>(h / (!dpi_scale ? util::screenOfWidget(this)->devicePixelRatio() : 1.))
                 + menuBar()->height()
                 + (statusBar()->height() * !hide_status_bar)
                 + (ui->toolBar->height() * !hide_tool_bar);
 
-            ui->stackedWidget->resize(w, (h / (!dpi_scale ? util::screenOfWidget(this)->devicePixelRatio() : 1.)));
+            ui->stackedWidget->resize(w, static_cast<int>(h / (!dpi_scale ? util::screenOfWidget(this)->devicePixelRatio() : 1.)));
             setFixedSize(w, modifiedHeight);
         }
     });
@@ -308,9 +414,9 @@ MainWindow::MainWindow(QWidget *parent)
 #ifdef QT_RESIZE_DEBUG
             qDebug() << "Resize";
 #endif
-            w = (w / (!dpi_scale ? util::screenOfWidget(renderers[monitor_index].get())->devicePixelRatio() : 1.));
+            w = static_cast<int>(w / (!dpi_scale ? util::screenOfWidget(renderers[monitor_index].get())->devicePixelRatio() : 1.));
 
-            int modifiedHeight = (h / (!dpi_scale ? util::screenOfWidget(renderers[monitor_index].get())->devicePixelRatio() : 1.));
+            int modifiedHeight = static_cast<int>(h / (!dpi_scale ? util::screenOfWidget(renderers[monitor_index].get())->devicePixelRatio() : 1.));
 
             renderers[monitor_index]->setFixedSize(w, modifiedHeight);
         }
@@ -342,7 +448,6 @@ MainWindow::MainWindow(QWidget *parent)
     ui->actionUpdate_status_bar_icons->setChecked(update_icons);
     ui->actionEnable_Discord_integration->setChecked(enable_discord);
     ui->actionApply_fullscreen_stretch_mode_when_maximized->setChecked(video_fullscreen_scale_maximized);
-    ui->actionShow_status_icons_in_fullscreen->setChecked(status_icons_fullscreen);
 
 #ifndef DISCORD
     ui->actionEnable_Discord_integration->setVisible(false);
@@ -350,34 +455,17 @@ MainWindow::MainWindow(QWidget *parent)
     ui->actionEnable_Discord_integration->setEnabled(discord_loaded);
 #endif
 
-#if defined Q_OS_WINDOWS || defined Q_OS_MACOS
-    /* Make the option visible only if ANGLE is loaded. */
-    ui->actionHardware_Renderer_OpenGL_ES->setVisible(QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES);
-    if (QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGLES && vid_api == 2)
-        vid_api = 1;
-#endif
-    ui->actionHardware_Renderer_OpenGL->setVisible(QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGLES);
-    if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES && vid_api == 1)
-        vid_api = 0;
-
     if ((QApplication::platformName().contains("eglfs") || QApplication::platformName() == "haiku")) {
-        if (vid_api >= 1)
+        if ((vid_api == RENDERER_OPENGL3) || (vid_api == RENDERER_VULKAN))
             fprintf(stderr, "OpenGL renderers are unsupported on %s.\n", QApplication::platformName().toUtf8().data());
-        vid_api = 0;
-        ui->actionHardware_Renderer_OpenGL->setVisible(false);
-        ui->actionHardware_Renderer_OpenGL_ES->setVisible(false);
+        vid_api = RENDERER_SOFTWARE;
         ui->actionVulkan->setVisible(false);
         ui->actionOpenGL_3_0_Core->setVisible(false);
     }
-#if !defined Q_OS_WINDOWS
-    ui->actionDirect3D_9->setVisible(false);
-    if (vid_api == 5)
-        vid_api = 0;
-#endif
 
 #ifndef USE_VNC
-    if (vid_api == 6)
-        vid_api = 0;
+    if (vid_api == RENDERER_VNC)
+        vid_api = RENDERER_SOFTWARE;
     ui->actionVNC->setVisible(false);
 #endif
 
@@ -397,27 +485,22 @@ MainWindow::MainWindow(QWidget *parent)
     if (!vulkanAvailable)
 #endif
     {
-        if (vid_api == 4)
-            vid_api = 0;
+        if (vid_api == RENDERER_VULKAN)
+            vid_api = RENDERER_SOFTWARE;
         ui->actionVulkan->setVisible(false);
     }
 
-    QActionGroup *actGroup = nullptr;
-
-    actGroup = new QActionGroup(this);
+    auto actGroup = new QActionGroup(this);
     actGroup->addAction(ui->actionSoftware_Renderer);
-    actGroup->addAction(ui->actionHardware_Renderer_OpenGL);
-    actGroup->addAction(ui->actionHardware_Renderer_OpenGL_ES);
     actGroup->addAction(ui->actionOpenGL_3_0_Core);
     actGroup->addAction(ui->actionVulkan);
-    actGroup->addAction(ui->actionDirect3D_9);
     actGroup->addAction(ui->actionVNC);
     actGroup->setExclusive(true);
 
     connect(actGroup, &QActionGroup::triggered, [this](QAction *action) {
         vid_api = action->property("vid_api").toInt();
 #ifdef USE_VNC
-        if (vnc_enabled && vid_api != 6) {
+        if (vnc_enabled && vid_api != RENDERER_VNC) {
             startblit();
             vnc_enabled = 0;
             vnc_close();
@@ -427,26 +510,19 @@ MainWindow::MainWindow(QWidget *parent)
 #endif
         RendererStack::Renderer newVidApi = RendererStack::Renderer::Software;
         switch (vid_api) {
-            case 0:
+            default:
+                break;
+            case RENDERER_SOFTWARE:
                 newVidApi = RendererStack::Renderer::Software;
                 break;
-            case 1:
-                newVidApi = RendererStack::Renderer::OpenGL;
-                break;
-            case 2:
-                newVidApi = RendererStack::Renderer::OpenGLES;
-                break;
-            case 3:
+            case RENDERER_OPENGL3:
                 newVidApi = RendererStack::Renderer::OpenGL3;
                 break;
-            case 4:
+            case RENDERER_VULKAN:
                 newVidApi = RendererStack::Renderer::Vulkan;
                 break;
-            case 5:
-                newVidApi = RendererStack::Renderer::Direct3D9;
-                break;
 #ifdef USE_VNC
-            case 6:
+            case RENDERER_VNC:
                 {
                     newVidApi = RendererStack::Renderer::Software;
                     startblit();
@@ -456,6 +532,8 @@ MainWindow::MainWindow(QWidget *parent)
 #endif
         }
         ui->stackedWidget->switchRenderer(newVidApi);
+        ui->menuOpenGL_input_scale->setEnabled(newVidApi == RendererStack::Renderer::OpenGL3);
+        ui->menuOpenGL_input_stretch_mode->setEnabled(newVidApi == RendererStack::Renderer::OpenGL3);
         if (!show_second_monitors)
             return;
         for (int i = 1; i < MONITORS_NUM; i++) {
@@ -465,18 +543,55 @@ MainWindow::MainWindow(QWidget *parent)
     });
 
     connect(ui->stackedWidget, &RendererStack::rendererChanged, [this]() {
-        ui->actionRenderer_options->setVisible(ui->stackedWidget->hasOptions());
+        ui->actionRenderer_options->setEnabled(ui->stackedWidget->hasOptions());
     });
 
     /* Trigger initial renderer switch */
-    for (auto action : actGroup->actions())
+    for (const auto action : actGroup->actions())
         if (action->property("vid_api").toInt() == vid_api) {
             action->setChecked(true);
             emit actGroup->triggered(action);
             break;
         }
 
+    ui->action_0_5x_2->setChecked(video_gl_input_scale < 1.0);
+    ui->action_1x_2->setChecked(video_gl_input_scale >= 1.0 && video_gl_input_scale < 1.5);
+    ui->action1_5x_2->setChecked(video_gl_input_scale >= 1.5 && video_gl_input_scale < 2.0);
+    ui->action_2x_2->setChecked(video_gl_input_scale >= 2.0 && video_gl_input_scale < 3.0);
+    ui->action_3x_2->setChecked(video_gl_input_scale >= 3.0 && video_gl_input_scale < 4.0);
+    ui->action_4x_2->setChecked(video_gl_input_scale >= 4.0 && video_gl_input_scale < 5.0);
+    ui->action_5x_2->setChecked(video_gl_input_scale >= 5.0 && video_gl_input_scale < 6.0);
+    ui->action_6x_2->setChecked(video_gl_input_scale >= 6.0 && video_gl_input_scale < 7.0);
+    ui->action_7x_2->setChecked(video_gl_input_scale >= 7.0 && video_gl_input_scale < 8.0);
+    ui->action_8x_2->setChecked(video_gl_input_scale >= 8.0);
+
+    actGroup = new QActionGroup(this);
+    actGroup->addAction(ui->action_0_5x_2);
+    actGroup->addAction(ui->action_1x_2);
+    actGroup->addAction(ui->action1_5x_2);
+    actGroup->addAction(ui->action_2x_2);
+    actGroup->addAction(ui->action_3x_2);
+    actGroup->addAction(ui->action_4x_2);
+    actGroup->addAction(ui->action_5x_2);
+    actGroup->addAction(ui->action_6x_2);
+    actGroup->addAction(ui->action_7x_2);
+    actGroup->addAction(ui->action_8x_2);
+    connect(actGroup, &QActionGroup::triggered, this, [this](QAction* action) {
+        if (action == ui->action_0_5x_2) video_gl_input_scale = 0.5;
+        if (action == ui->action_1x_2) video_gl_input_scale = 1;
+        if (action == ui->action1_5x_2) video_gl_input_scale = 1.5;
+        if (action == ui->action_2x_2) video_gl_input_scale = 2;
+        if (action == ui->action_3x_2) video_gl_input_scale = 3;
+        if (action == ui->action_4x_2) video_gl_input_scale = 4;
+        if (action == ui->action_5x_2) video_gl_input_scale = 5;
+        if (action == ui->action_6x_2) video_gl_input_scale = 6;
+        if (action == ui->action_7x_2) video_gl_input_scale = 7;
+        if (action == ui->action_8x_2) video_gl_input_scale = 8;
+    });
+
     switch (scale) {
+        default:
+            break;
         case 0:
             ui->action0_5x->setChecked(true);
             break;
@@ -520,6 +635,8 @@ MainWindow::MainWindow(QWidget *parent)
     actGroup->addAction(ui->action7x);
     actGroup->addAction(ui->action8x);
     switch (video_filter_method) {
+        default:
+            break;
         case 0:
             ui->actionNearest->setChecked(true);
             break;
@@ -531,6 +648,8 @@ MainWindow::MainWindow(QWidget *parent)
     actGroup->addAction(ui->actionNearest);
     actGroup->addAction(ui->actionLinear);
     switch (video_fullscreen_scale) {
+        default:
+            break;
         case FULLSCR_SCALE_FULL:
             ui->actionFullScreen_stretch->setChecked(true);
             break;
@@ -553,7 +672,41 @@ MainWindow::MainWindow(QWidget *parent)
     actGroup->addAction(ui->actionFullScreen_keepRatio);
     actGroup->addAction(ui->actionFullScreen_int);
     actGroup->addAction(ui->actionFullScreen_int43);
+    switch (video_gl_input_scale_mode) {
+        default:
+            break;
+        case FULLSCR_SCALE_FULL:
+            ui->action_Full_screen_stretch_gl->setChecked(true);
+            break;
+        case FULLSCR_SCALE_43:
+            ui->action_4_3_gl->setChecked(true);
+            break;
+        case FULLSCR_SCALE_KEEPRATIO:
+            ui->action_Square_pixels_keep_ratio_gl->setChecked(true);
+            break;
+        case FULLSCR_SCALE_INT:
+            ui->action_Integer_scale_gl->setChecked(true);
+            break;
+        case FULLSCR_SCALE_INT43:
+            ui->action4_3_Integer_scale_gl->setChecked(true);
+            break;
+    }
+    actGroup = new QActionGroup(this);
+    actGroup->addAction(ui->action_Full_screen_stretch_gl);
+    actGroup->addAction(ui->action_4_3_gl);
+    actGroup->addAction(ui->action_Square_pixels_keep_ratio_gl);
+    actGroup->addAction(ui->action_Integer_scale_gl);
+    actGroup->addAction(ui->action4_3_Integer_scale_gl);
+    connect(actGroup, &QActionGroup::triggered, this, [this](QAction* action) {
+        if (action == ui->action_Full_screen_stretch_gl) video_gl_input_scale_mode = FULLSCR_SCALE_FULL;
+        if (action == ui->action_4_3_gl) video_gl_input_scale_mode = FULLSCR_SCALE_43;
+        if (action == ui->action_Square_pixels_keep_ratio_gl) video_gl_input_scale_mode = FULLSCR_SCALE_KEEPRATIO;
+        if (action == ui->action_Integer_scale_gl) video_gl_input_scale_mode = FULLSCR_SCALE_INT;
+        if (action == ui->action4_3_Integer_scale_gl) video_gl_input_scale_mode = FULLSCR_SCALE_INT43;
+    });
     switch (video_grayscale) {
+        default:
+            break;
         case 0:
             ui->actionRGB_Color->setChecked(true);
             break;
@@ -577,6 +730,8 @@ MainWindow::MainWindow(QWidget *parent)
     actGroup->addAction(ui->actionWhite_monitor);
     actGroup->addAction(ui->actionRGB_Color);
     switch (video_graytype) {
+        default:
+            break;
         case 0:
             ui->actionBT601_NTSC_PAL->setChecked(true);
             break;
@@ -603,6 +758,9 @@ MainWindow::MainWindow(QWidget *parent)
     if (do_auto_pause > 0) {
         ui->actionAuto_pause->setChecked(true);
     }
+    if (force_constant_mouse > 0) {
+        ui->actionUpdate_mouse_every_CPU_frame->setChecked(true);
+    }
 
 #ifdef Q_OS_MACOS
     ui->actionCtrl_Alt_Del->setShortcutVisibleInContextMenu(true);
@@ -612,7 +770,7 @@ MainWindow::MainWindow(QWidget *parent)
         video_setblit(qt_blit);
 
     if (start_in_fullscreen) {
-        connect(ui->stackedWidget, &RendererStack::blit, this, [this] () {
+        connect(ui->stackedWidget, &RendererStack::blitToRenderer, this, [this] () {
             if (start_in_fullscreen) {
                 QTimer::singleShot(100, ui->actionFullscreen, &QAction::trigger);
                 start_in_fullscreen = 0;
@@ -661,7 +819,11 @@ MainWindow::MainWindow(QWidget *parent)
 
     setContextMenuPolicy(Qt::PreventContextMenu);
     /* Remove default Shift+F10 handler, which unfocuses keyboard input even with no context menu. */
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    connect(new QShortcut(QKeySequence(Qt::SHIFT | Qt::Key_F10), this), &QShortcut::activated, this, [](){});
+#else
     connect(new QShortcut(QKeySequence(Qt::SHIFT + Qt::Key_F10), this), &QShortcut::activated, this, [](){});
+#endif
 
     connect(this, &MainWindow::initRendererMonitor, this, &MainWindow::initRendererMonitorSlot);
     connect(this, &MainWindow::initRendererMonitorForNonQtThread, this, &MainWindow::initRendererMonitorSlot, Qt::BlockingQueuedConnection);
@@ -685,6 +847,22 @@ MainWindow::MainWindow(QWidget *parent)
     });
 #endif
 
+    QTimer::singleShot(0, this, [this]() {
+        for (auto curObj : this->menuBar()->children()) {
+            if (qobject_cast<QMenu *>(curObj)) {
+                auto menu = qobject_cast<QMenu *>(curObj);
+                for (auto curObj2 : menu->children()) {
+                    if (qobject_cast<QAction *>(curObj2)) {
+                        auto action = qobject_cast<QAction *>(curObj2);
+                        if (!action->shortcut().isEmpty()) {
+                            this->insertAction(nullptr, action);
+                        }
+                    }
+                }
+            }
+        }
+    });
+
     actGroup = new QActionGroup(this);
     actGroup->addAction(ui->actionCursor_Puck);
     actGroup->addAction(ui->actionPen);
@@ -722,6 +900,8 @@ MainWindow::MainWindow(QWidget *parent)
         });
     }
 #endif
+
+	updateShortcuts();
 }
 
 void
@@ -734,7 +914,7 @@ MainWindow::closeEvent(QCloseEvent *event)
 
     if (confirm_exit && confirm_exit_cmdl && cpu_thread_run) {
         QMessageBox questionbox(QMessageBox::Icon::Question, "86Box", tr("Are you sure you want to exit 86Box?"), QMessageBox::Yes | QMessageBox::No, this);
-        QCheckBox  *chkbox = new QCheckBox(tr("Don't show this message again"));
+        auto chkbox = new QCheckBox(tr("Don't show this message again"));
         questionbox.setCheckBox(chkbox);
         chkbox->setChecked(!confirm_exit);
 
@@ -771,6 +951,14 @@ MainWindow::closeEvent(QCloseEvent *event)
         ui->stackedWidget->mouse_exit_func();
 
     ui->stackedWidget->switchRenderer(RendererStack::Renderer::Software);
+    for (int i = 1; i < MONITORS_NUM; i++) {
+        if (renderers[i] && renderers[i]->isHidden()) {
+            renderers[i]->show();
+            QApplication::processEvents();
+            renderers[i]->switchRenderer(RendererStack::Renderer::Software);
+            QApplication::processEvents();
+        }
+    }
 
     qt_nvr_save();
     config_save();
@@ -779,22 +967,168 @@ MainWindow::closeEvent(QCloseEvent *event)
     event->accept();
 }
 
+
+void MainWindow::updateShortcuts()
+{
+	/* 
+	 Update menu shortcuts from accelerator table
+	 
+	 Note that these only work in windowed mode. If you add any new shortcuts,
+	 you have to go duplicate them in MainWindow::eventFilter()
+	 */
+	
+	// First we need to wipe all existing accelerators, otherwise Qt will
+	// run into conflicts with old ones.
+	ui->actionTake_screenshot->setShortcut(QKeySequence());
+	ui->actionCtrl_Alt_Del->setShortcut(QKeySequence());
+	ui->actionCtrl_Alt_Esc->setShortcut(QKeySequence());
+	ui->actionHard_Reset->setShortcut(QKeySequence());
+	ui->actionPause->setShortcut(QKeySequence());
+	ui->actionMute_Unmute->setShortcut(QKeySequence());
+	
+	int accID;
+	QKeySequence seq;
+	
+	accID = FindAccelerator("screenshot");
+	seq = QKeySequence::fromString(acc_keys[accID].seq);
+	ui->actionTake_screenshot->setShortcut(seq);
+	
+	accID = FindAccelerator("send_ctrl_alt_del");
+	seq = QKeySequence::fromString(acc_keys[accID].seq);
+	ui->actionCtrl_Alt_Del->setShortcut(seq);
+	
+	accID = FindAccelerator("send_ctrl_alt_esc");
+	seq = QKeySequence::fromString(acc_keys[accID].seq);
+	ui->actionCtrl_Alt_Esc->setShortcut(seq);
+	
+	accID = FindAccelerator("hard_reset");
+	seq = QKeySequence::fromString(acc_keys[accID].seq);
+	ui->actionHard_Reset->setShortcut(seq);
+	
+	accID = FindAccelerator("fullscreen");
+	seq = QKeySequence::fromString(acc_keys[accID].seq);
+	ui->actionFullscreen->setShortcut(seq);
+	
+	accID = FindAccelerator("pause");
+	seq = QKeySequence::fromString(acc_keys[accID].seq);
+	ui->actionPause->setShortcut(seq);
+	
+	accID = FindAccelerator("mute");
+	seq = QKeySequence::fromString(acc_keys[accID].seq);
+	ui->actionMute_Unmute->setShortcut(seq);
+}
+		
+void 
+MainWindow::adjustForForce43(const QSize &newWinSize)
+{
+    // Only act in resizable mode with Force 4:3 enabled and not fullscreen
+    if (!(vid_resize == 1 && force_43 > 0) || video_fullscreen || s_adjustingForce43)
+        return;
+
+    s_adjustingForce43 = true;
+
+    // Height consumed by menu/status/toolbars
+    int chromeH = menuBar()->height()
+                + (hide_status_bar ? 0 : statusBar()->height())
+                + (hide_tool_bar   ? 0 : ui->toolBar->height());
+
+    // Compute client area size in device‑independent pixels
+    double dpr = (!dpi_scale ? util::screenOfWidget(this)->devicePixelRatio() : 1.0);
+    int winW = newWinSize.width();
+    int winH = newWinSize.height();
+    int clientW = static_cast<int>(winW / dpr);
+    int clientH = static_cast<int>((winH - chromeH) / dpr);
+
+    if (clientW <= 0 || clientH <= 0) {
+        s_adjustingForce43 = false;
+        return;
+    }
+
+    // Decide which dimension the user changed most – adjust the other
+    int curW = static_cast<int>(width() / dpr);
+    int curH = static_cast<int>((height() - chromeH) / dpr);
+    bool widthChanged = std::abs(clientW - curW) >= std::abs(clientH - curH);
+
+    int targetW, targetH;
+    if (widthChanged) {
+        // user dragged width – compute matching height for 4:3
+        targetW = clientW;
+        targetH = (clientW * 3) / 4;
+    } else {
+        // user dragged height – compute matching width for 4:3
+        targetH = clientH;
+        targetW = (clientH * 4) / 3;
+    }
+
+    // Convert back to window size including chrome and apply
+    int newW = static_cast<int>(targetW * dpr);
+    int newH = static_cast<int>(targetH * dpr) + chromeH;
+    if (newW != winW || newH != winH)
+        resize(newW, newH);
+
+    // Update emulator framebuffer size and notify platform
+    monitors[0].mon_scrnsz_x = targetW;
+    monitors[0].mon_scrnsz_y = targetH;
+    plat_resize_request(targetW, targetH, 0);
+
+    // Allow renderer widget to grow and recompute scaling
+    ui->stackedWidget->setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
+    ui->stackedWidget->onResize(width(), height());
+
+    s_adjustingForce43 = false;
+}
+
+void
+MainWindow::resizeEvent(QResizeEvent *event)
+{
+    //qDebug() << pos().x() + event->size().width();
+    //qDebug() << pos().y() + event->size().height();
+	
+    // Enforce 4:3 aspect ratio in resizable mode when the option is set
+    adjustForForce43(event->size());
+	
+    if (vid_resize == 1 || video_fullscreen)
+        return;
+
+    int newX = pos().x();
+    int newY = pos().y();
+
+    if (((frameGeometry().x() + event->size().width() + 1) > util::screenOfWidget(this)->availableGeometry().right())) {
+        //move(util::screenOfWidget(this)->availableGeometry().right() - size().width() - 1, pos().y());
+        newX = util::screenOfWidget(this)->availableGeometry().right() - frameGeometry().width() - 1;
+        if (newX < 1) newX = 1;
+    }
+
+    if (((frameGeometry().y() + event->size().height() + 1) > util::screenOfWidget(this)->availableGeometry().bottom())) {
+        newY = util::screenOfWidget(this)->availableGeometry().bottom() - frameGeometry().height() - 1;
+        if (newY < 1) newY = 1;
+    }
+    move(newX, newY);
+}
+
 void
 MainWindow::initRendererMonitorSlot(int monitor_index)
 {
     auto &secondaryRenderer = this->renderers[monitor_index];
-    secondaryRenderer.reset(new RendererStack(nullptr, monitor_index));
+    secondaryRenderer = std::make_unique<RendererStack>(nullptr, monitor_index);
     if (secondaryRenderer) {
         connect(secondaryRenderer.get(), &RendererStack::rendererChanged, this, [this, monitor_index] {
             this->renderers[monitor_index]->show();
         });
         secondaryRenderer->setWindowFlags(Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint);
         secondaryRenderer->setWindowTitle(QObject::tr("86Box Monitor #") + QString::number(monitor_index + 1));
+        secondaryRenderer->setContextMenuPolicy(Qt::PreventContextMenu);
 
-        if (vid_resize == 2) {
-            secondaryRenderer->setFixedSize(fixed_size_x, fixed_size_y);
+        for (int i = 0; i < this->actions().size(); i++) {
+            secondaryRenderer->addAction(this->actions()[i]);
         }
+
+        if (vid_resize == 2)
+            secondaryRenderer->setFixedSize(fixed_size_x, fixed_size_y);
         secondaryRenderer->setWindowIcon(this->windowIcon());
+#ifdef Q_OS_WINDOWS
+        util::setWin11RoundedCorners(secondaryRenderer->winId(), false);
+#endif
         if (show_second_monitors) {
             secondaryRenderer->show();
             if (window_remember) {
@@ -803,9 +1137,8 @@ MainWindow::initRendererMonitorSlot(int monitor_index)
                                                monitor_settings[monitor_index].mon_window_w > 2048 ? 2048 : monitor_settings[monitor_index].mon_window_w,
                                                monitor_settings[monitor_index].mon_window_h > 2048 ? 2048 : monitor_settings[monitor_index].mon_window_h);
             }
-            if (monitor_settings[monitor_index].mon_window_maximized) {
+            if (monitor_settings[monitor_index].mon_window_maximized)
                 secondaryRenderer->showMaximized();
-            }
             secondaryRenderer->switchRenderer((RendererStack::Renderer) vid_api);
             secondaryRenderer->setMouseTracking(true);
 
@@ -865,7 +1198,9 @@ MainWindow::showEvent(QShowEvent *event)
     }
     if (window_remember && vid_resize == 1) {
         ui->stackedWidget->setFixedSize(window_w, window_h);
+#ifndef Q_OS_MACOS
         QApplication::processEvents();
+#endif
         this->adjustSize();
     }
 }
@@ -874,6 +1209,14 @@ void
 MainWindow::on_actionKeyboard_requires_capture_triggered()
 {
     kbd_req_capture ^= 1;
+#ifndef Q_OS_MACOS
+    qt_set_sequence_auto_mnemonic(!!kbd_req_capture);
+    /* Hack to get the menubar to update the internal Alt+shortcut table */
+    if (!video_fullscreen) {
+        ui->menubar->hide();
+        ui->menubar->show();
+    }
+#endif
 }
 
 void
@@ -889,7 +1232,7 @@ MainWindow::on_actionHard_Reset_triggered()
         QMessageBox questionbox(QMessageBox::Icon::Question, "86Box", tr("Are you sure you want to hard reset the emulated machine?"), QMessageBox::NoButton, this);
         questionbox.addButton(tr("Reset"), QMessageBox::AcceptRole);
         questionbox.addButton(tr("Don't reset"), QMessageBox::RejectRole);
-        QCheckBox *chkbox = new QCheckBox(tr("Don't show this message again"));
+        const auto chkbox = new QCheckBox(tr("Don't show this message again"));
         questionbox.setCheckBox(chkbox);
         chkbox->setChecked(!confirm_reset);
 
@@ -933,7 +1276,7 @@ MainWindow::on_actionExit_triggered()
 void
 MainWindow::on_actionSettings_triggered()
 {
-    int currentPause = dopause;
+    const int currentPause = dopause;
     plat_pause(1);
     Settings settings(this);
     settings.setModal(true);
@@ -944,11 +1287,14 @@ MainWindow::on_actionSettings_triggered()
     settings.exec();
 
     switch (settings.result()) {
+        default:
+            break;
         case QDialog::Accepted:
-            pc_reset_hard_close();
             settings.save();
             config_changed = 2;
-            pc_reset_hard_init();
+            updateShortcuts();
+            emit vmmConfigurationChanged();
+            pc_reset_hard();
             break;
         case QDialog::Rejected:
             break;
@@ -980,6 +1326,9 @@ MainWindow::processKeyboardInput(bool down, uint32_t keycode)
 
     /* Apply special cases. */
     switch (keycode) {
+        default:
+            break;
+
         case 0x54: /* Alt + Print Screen (special case, i.e. evdev SELECTIVE_SCREENSHOT) */
             /* Send Alt as well. */
             if (down) {
@@ -994,7 +1343,7 @@ MainWindow::processKeyboardInput(bool down, uint32_t keycode)
         case 0x10b: /* Microsoft scroll up normal */
         case 0x180 ... 0x1ff: /* E0 break codes (including Microsoft scroll down normal) */
             /* This key uses a break code as make. Send it manually, only on press. */
-            if (down) {
+            if (down && (mouse_capture || !kbd_req_capture || video_fullscreen)) {
                 if (keycode & 0x100)
                     keyboard_send(0xe0);
                 keyboard_send(keycode & 0xff);
@@ -1007,7 +1356,7 @@ MainWindow::processKeyboardInput(bool down, uint32_t keycode)
             break;
 
         case 0x137: /* Print Screen */
-            if (keyboard_recv(0x38) || keyboard_recv(0x138)) { /* Alt+ */
+            if (keyboard_recv_ui(0x38) || keyboard_recv_ui(0x138)) { /* Alt+ */
                 keycode = 0x54;
             } else if (down) {
                 keyboard_input(down, 0x12a);
@@ -1018,7 +1367,7 @@ MainWindow::processKeyboardInput(bool down, uint32_t keycode)
             break;
 
         case 0x145: /* Pause */
-            if (keyboard_recv(0x1d) || keyboard_recv(0x11d)) { /* Ctrl+ */
+            if (keyboard_recv_ui(0x1d) || keyboard_recv_ui(0x11d)) { /* Ctrl+ */
                 keycode = 0x146;
             } else {
                 keyboard_input(down, 0xe11d);
@@ -1156,8 +1505,6 @@ MainWindow::on_actionFullscreen_triggered()
 {
     if (video_fullscreen > 0) {
         showNormal();
-        if (vid_api == 5)
-            QTimer::singleShot(0, this, [this]() { ui->stackedWidget->switchRenderer(RendererStack::Renderer::Direct3D9); });
         ui->menubar->show();
         if (!hide_status_bar)
             ui->statusbar->show();
@@ -1168,24 +1515,6 @@ MainWindow::on_actionFullscreen_triggered()
             emit resizeContents(vid_resize == 2 ? fixed_size_x : monitors[0].mon_scrnsz_x, vid_resize == 2 ? fixed_size_y : monitors[0].mon_scrnsz_y);
         }
     } else {
-        if (video_fullscreen_first) {
-            bool wasCaptured = mouse_capture == 1;
-
-            QMessageBox questionbox(QMessageBox::Icon::Information, tr("Entering fullscreen mode"), tr("Press Ctrl+Alt+PgDn to return to windowed mode."), QMessageBox::Ok, this);
-            QCheckBox  *chkbox = new QCheckBox(tr("Don't show this message again"));
-            questionbox.setCheckBox(chkbox);
-            chkbox->setChecked(!video_fullscreen_first);
-
-            QObject::connect(chkbox, &QCheckBox::stateChanged, [](int state) {
-                video_fullscreen_first = (state == Qt::CheckState::Unchecked);
-            });
-            questionbox.exec();
-            config_save();
-
-            /* (re-capture mouse after dialog). */
-            if (wasCaptured)
-                emit setMouseCapture(true);
-        }
         video_fullscreen = 1;
         setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
         ui->menubar->hide();
@@ -1193,9 +1522,9 @@ MainWindow::on_actionFullscreen_triggered()
         ui->toolBar->hide();
         ui->stackedWidget->setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
         showFullScreen();
-        if (vid_api == 5)
-            QTimer::singleShot(0, this, [this]() { ui->stackedWidget->switchRenderer(RendererStack::Renderer::Direct3D9); });
     }
+    fs_on_signal = false;
+    fs_off_signal = false;
     ui->stackedWidget->onResize(width(), height());
 }
 
@@ -1215,10 +1544,87 @@ MainWindow::getTitle(wchar_t *title)
     }
 }
 
+
+// Helper to find an accelerator key and return it's sequence
+// TODO: Is there a more central place to put this?
+QKeySequence
+MainWindow::FindAcceleratorSeq(const char *name)
+{
+	int accID = FindAccelerator(name);
+	if(accID == -1)
+		return false;
+	
+	return(QKeySequence::fromString(acc_keys[accID].seq));
+}
+
 bool
 MainWindow::eventFilter(QObject *receiver, QEvent *event)
 {
-    if (!dopause && (mouse_capture || !kbd_req_capture)) {
+	// Detect shortcuts when menubar is hidden
+	// TODO: Could this be simplified by proxying the event and manually
+	// shoving it into the menubar?
+	if (event->type() == QEvent::KeyPress)
+	{
+		this->keyPressEvent((QKeyEvent *) event);
+
+		// We check for mouse release even if we aren't fullscreen,
+		// because it's not a menu accelerator.
+		if (event->type() == QEvent::KeyPress)
+		{
+			QKeyEvent *ke = (QKeyEvent *) event;
+			if ((QKeySequence)(ke->key() | (ke->modifiers() & ~Qt::KeypadModifier)) == FindAcceleratorSeq("release_mouse") ||
+                (QKeySequence)(ke->key() | ke->modifiers()) == FindAcceleratorSeq("release_mouse"))
+			{
+				plat_mouse_capture(0);
+			}
+		}
+
+		if (event->type() == QEvent::KeyPress && video_fullscreen != 0)
+		{
+			QKeyEvent *ke = (QKeyEvent *) event;
+			
+			if ((QKeySequence)(ke->key() | (ke->modifiers() & ~Qt::KeypadModifier)) == FindAcceleratorSeq("screenshot")
+                || (QKeySequence)(ke->key() | ke->modifiers()) == FindAcceleratorSeq("screenshot"))
+			{
+				ui->actionTake_screenshot->trigger();
+			}
+			if ((QKeySequence)(ke->key() | (ke->modifiers() & ~Qt::KeypadModifier)) == FindAcceleratorSeq("fullscreen")
+                || (QKeySequence)(ke->key() | ke->modifiers()) == FindAcceleratorSeq("fullscreen"))
+			{
+				ui->actionFullscreen->trigger();
+			}
+			if ((QKeySequence)(ke->key() | (ke->modifiers() & ~Qt::KeypadModifier)) == FindAcceleratorSeq("hard_reset")
+                || (QKeySequence)(ke->key() | ke->modifiers()) == FindAcceleratorSeq("hard_reset"))
+			{
+				ui->actionHard_Reset->trigger();
+			}
+			if ((QKeySequence)(ke->key() | (ke->modifiers() & ~Qt::KeypadModifier)) == FindAcceleratorSeq("send_ctrl_alt_del")
+                || (QKeySequence)(ke->key() | ke->modifiers()) == FindAcceleratorSeq("send_ctrl_alt_del"))
+			{
+				ui->actionCtrl_Alt_Del->trigger();
+			}
+			if ((QKeySequence)(ke->key() | (ke->modifiers() & ~Qt::KeypadModifier)) == FindAcceleratorSeq("send_ctrl_alt_esc")
+                || (QKeySequence)(ke->key() | ke->modifiers()) == FindAcceleratorSeq("send_ctrl_alt_esc"))
+			{
+				ui->actionCtrl_Alt_Esc->trigger();
+			}
+			if ((QKeySequence)(ke->key() | (ke->modifiers() & ~Qt::KeypadModifier)) == FindAcceleratorSeq("pause")
+                || (QKeySequence)(ke->key() | ke->modifiers()) == FindAcceleratorSeq("pause"))
+			{
+				ui->actionPause->trigger();
+			}
+			if ((QKeySequence)(ke->key() | (ke->modifiers() & ~Qt::KeypadModifier)) == FindAcceleratorSeq("mute")
+                || (QKeySequence)(ke->key() | ke->modifiers()) == FindAcceleratorSeq("mute"))
+			{
+				ui->actionMute_Unmute->trigger();
+			}
+
+			return true;
+		}
+	}
+	
+
+    if (!dopause && (!kbd_req_capture || mouse_capture)) {
         if (event->type() == QEvent::Shortcut) {
             auto shortcutEvent = (QShortcutEvent *) event;
             if (shortcutEvent->key() == ui->actionExit->shortcut()) {
@@ -1227,8 +1633,8 @@ MainWindow::eventFilter(QObject *receiver, QEvent *event)
             }
         }
         if (event->type() == QEvent::KeyPress) {
-            event->accept();
-            this->keyPressEvent((QKeyEvent *) event);
+			event->accept();
+			
             return true;
         }
         if (event->type() == QEvent::KeyRelease) {
@@ -1241,14 +1647,17 @@ MainWindow::eventFilter(QObject *receiver, QEvent *event)
     if (receiver == this) {
         static auto curdopause = dopause;
         if (event->type() == QEvent::WindowBlocked) {
+            window_blocked = true;
             curdopause = dopause;
-            plat_pause(1);
+            plat_pause(isNonPause ? dopause : (isShowMessage ? 2 : 1));
             emit setMouseCapture(false);
+            releaseKeyboard();
         } else if (event->type() == QEvent::WindowUnblocked) {
+            window_blocked = false;
             plat_pause(curdopause);
         }
     }
-
+	
     return QMainWindow::eventFilter(receiver, event);
 }
 
@@ -1256,32 +1665,70 @@ void
 MainWindow::refreshMediaMenu()
 {
     mm->refresh(ui->menuMedia);
+    status->setSoundMenu(ui->menuSound);
     status->refresh(ui->statusbar);
     ui->actionMCA_devices->setVisible(machine_has_bus(machine, MACHINE_BUS_MCA));
     ui->actionACPI_Shutdown->setEnabled(!!acpi_enabled);
+
+    num_label->setToolTip(QShortcut::tr("Num Lock"));
+    num_label->setVisible(machine_has_bus(machine, MACHINE_BUS_PS2_PORTS | MACHINE_BUS_AT_KBD));
+    scroll_label->setToolTip(QShortcut::tr("Scroll Lock"));
+    scroll_label->setVisible(machine_has_bus(machine, MACHINE_BUS_PS2_PORTS | MACHINE_BUS_AT_KBD));
+    caps_label->setToolTip(QShortcut::tr("Caps Lock"));
+    caps_label->setVisible(machine_has_bus(machine, MACHINE_BUS_PS2_PORTS | MACHINE_BUS_AT_KBD));
+    kana_label->setToolTip(QShortcut::tr("Kana Lock"));
+    int ext_ax_kbd = machine_has_bus(machine, MACHINE_BUS_PS2_PORTS | MACHINE_BUS_AT_KBD) &&
+                     (keyboard_type == KEYBOARD_TYPE_AX);
+    int int_ax_kbd = machine_has_flags(machine, MACHINE_KEYBOARD_JIS) &&
+                     !machine_has_bus(machine, MACHINE_BUS_PS2_PORTS);
+    kana_label->setVisible(ext_ax_kbd || int_ax_kbd);
+
+    bool enable_comp_option = false;
+    for (int i = 0; i < MONITORS_NUM; i++) {
+        if (monitors[i].mon_composite) { enable_comp_option = true; break; }
+    }
+
+    ui->actionCGA_composite_settings->setEnabled(enable_comp_option);
 }
 
 void
-MainWindow::showMessage(int flags, const QString &header, const QString &message)
+MainWindow::showMessage(int flags, const QString &header, const QString &message, bool richText)
 {
     if (QThread::currentThread() == this->thread()) {
-        showMessage_(flags, header, message);
+        if (!cpu_thread_running) {
+            showMessageForNonQtThread(flags, header, message, richText, nullptr);
+        }
+        else
+            showMessage_(flags, header, message, richText);
     } else {
-        emit showMessageForNonQtThread(flags, header, message);
+        std::atomic_bool done = false;
+        emit showMessageForNonQtThread(flags, header, message, richText, &done);
+        while (!done) {
+            QThread::msleep(1);
+        }
     }
 }
 
 void
-MainWindow::showMessage_(int flags, const QString &header, const QString &message)
+MainWindow::showMessage_(int flags, const QString &header, const QString &message, bool richText, std::atomic_bool *done)
 {
+    if (done) {
+        *done = false;
+    }
+    isShowMessage = true;
     QMessageBox box(QMessageBox::Warning, header, message, QMessageBox::NoButton, this);
     if (flags & (MBX_FATAL)) {
         box.setIcon(QMessageBox::Critical);
     } else if (!(flags & (MBX_ERROR | MBX_WARNING))) {
         box.setIcon(QMessageBox::Warning);
     }
-    box.setTextFormat(Qt::TextFormat::RichText);
+    if (richText)
+        box.setTextFormat(Qt::TextFormat::RichText);
     box.exec();
+    if (done) {
+        *done = true;
+    }
+    isShowMessage = false;
     if (cpu_thread_run == 0)
         QApplication::exit(-1);
 }
@@ -1289,26 +1736,14 @@ MainWindow::showMessage_(int flags, const QString &header, const QString &messag
 void
 MainWindow::keyPressEvent(QKeyEvent *event)
 {
-    if (send_keyboard_input && !(kbd_req_capture && !mouse_capture)) {
+    if (send_keyboard_input) {
 #ifdef Q_OS_MACOS
         processMacKeyboardInput(true, event);
 #else
         processKeyboardInput(true, event->nativeScanCode());
 #endif
     }
-
-    checkFullscreenHotkey();
-
-    if (keyboard_ismsexit())
-        plat_mouse_capture(0);
-
-    if ((video_fullscreen > 0) && (keyboard_recv(0x1D) || keyboard_recv(0x11D))) {
-        if (keyboard_recv(0x57))
-            ui->actionTake_screenshot->trigger();
-        else if (keyboard_recv(0x58))
-            pc_send_cad();
-    }
-
+	
     event->accept();
 }
 
@@ -1316,7 +1751,7 @@ void
 MainWindow::blitToWidget(int x, int y, int w, int h, int monitor_index)
 {
     if (monitor_index >= 1) {
-        if (!blitDummied && renderers[monitor_index] && renderers[monitor_index]->isVisible())
+        if (renderers[monitor_index] && renderers[monitor_index]->isVisible())
             renderers[monitor_index]->blit(x, y, w, h);
         else
             video_blit_complete_monitor(monitor_index);
@@ -1328,7 +1763,7 @@ void
 MainWindow::keyReleaseEvent(QKeyEvent *event)
 {
     if (event->key() == Qt::Key_Pause) {
-        if (keyboard_recv(0x38) && keyboard_recv(0x138)) {
+        if (keyboard_recv_ui(0x38) && keyboard_recv_ui(0x138)) {
             plat_pause(dopause ^ 1);
         }
     }
@@ -1340,28 +1775,6 @@ MainWindow::keyReleaseEvent(QKeyEvent *event)
         processKeyboardInput(false, event->nativeScanCode());
 #endif
     }
-
-    checkFullscreenHotkey();
-}
-
-void
-MainWindow::checkFullscreenHotkey()
-{
-    if (!fs_off_signal && video_fullscreen && keyboard_isfsexit()) {
-        /* Signal "exit fullscreen mode". */
-        fs_off_signal = 1;
-    } else if (fs_off_signal && video_fullscreen && keyboard_isfsexit_up()) {
-        ui->actionFullscreen->trigger();
-        fs_off_signal = 0;
-    }
-
-    if (!fs_on_signal && !video_fullscreen && keyboard_isfsenter()) {
-        /* Signal "enter fullscreen mode". */
-        fs_on_signal = 1;
-    } else if (fs_on_signal && !video_fullscreen && keyboard_isfsenter_up()) {
-        ui->actionFullscreen->trigger();
-        fs_on_signal = 0;
-    }
 }
 
 QSize
@@ -1373,23 +1786,24 @@ MainWindow::getRenderWidgetSize()
 void
 MainWindow::focusInEvent(QFocusEvent *event)
 {
-    this->grabKeyboard();
+    //this->grabKeyboard();
 }
 
 void
 MainWindow::focusOutEvent(QFocusEvent *event)
 {
-    this->releaseKeyboard();
+    //this->releaseKeyboard();
 }
 
 void
 MainWindow::on_actionResizable_window_triggered(bool checked)
 {
+    hide();
     if (checked) {
         vid_resize = 1;
-        setWindowFlag(Qt::WindowMaximizeButtonHint, true);
-        setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, false);
         setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
+        setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, false);
+        setWindowFlag(Qt::WindowMaximizeButtonHint, true);
         for (int i = 1; i < MONITORS_NUM; i++) {
             if (monitors[i].target_buffer) {
                 renderers[i]->setWindowFlag(Qt::WindowMaximizeButtonHint, true);
@@ -1695,41 +2109,8 @@ MainWindow::on_actionAbout_Qt_triggered()
 void
 MainWindow::on_actionAbout_86Box_triggered()
 {
-    QMessageBox msgBox;
-    msgBox.setTextFormat(Qt::RichText);
-    QString versioninfo;
-#ifdef EMU_GIT_HASH
-    versioninfo = QString(" [%1]").arg(EMU_GIT_HASH);
-#endif
-#ifdef USE_DYNAREC
-#    ifdef USE_NEW_DYNAREC
-#        define DYNAREC_STR "new dynarec"
-#    else
-#        define DYNAREC_STR "old dynarec"
-#    endif
-#else
-#    define DYNAREC_STR "no dynarec"
-#endif
-    versioninfo.append(QString(" [%1, %2]").arg(QSysInfo::buildCpuArchitecture(), tr(DYNAREC_STR)));
-    msgBox.setText(QString("<b>%3%1%2</b>").arg(EMU_VERSION_FULL, versioninfo, tr("86Box v")));
-    msgBox.setInformativeText(tr("An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."));
-    msgBox.setWindowTitle("About 86Box");
-    msgBox.addButton("OK", QMessageBox::ButtonRole::AcceptRole);
-    auto webSiteButton = msgBox.addButton(EMU_SITE, QMessageBox::ButtonRole::HelpRole);
-    webSiteButton->connect(webSiteButton, &QPushButton::released, []() {
-        QDesktopServices::openUrl(QUrl("https://" EMU_SITE));
-    });
-#ifdef RELEASE_BUILD
-    msgBox.setIconPixmap(QIcon(":/settings/win/icons/86Box-green.ico").pixmap(32, 32));
-#elif defined ALPHA_BUILD
-    msgBox.setIconPixmap(QIcon(":/settings/win/icons/86Box-red.ico").pixmap(32, 32));
-#elif defined BETA_BUILD
-    msgBox.setIconPixmap(QIcon(":/settings/win/icons/86Box-yellow.ico").pixmap(32, 32));
-#else
-    msgBox.setIconPixmap(QIcon(":/settings/win/icons/86Box-gray.ico").pixmap(32, 32));
-#endif
-    msgBox.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint);
-    msgBox.exec();
+    const auto msgBox = new About(this);
+    msgBox->exec();
 }
 
 void
@@ -1748,15 +2129,29 @@ MainWindow::on_actionCGA_PCjr_Tandy_EGA_S_VGA_overscan_triggered()
 void
 MainWindow::on_actionChange_contrast_for_monochrome_display_triggered()
 {
+    startblit();
     vid_cga_contrast ^= 1;
-    cgapal_rebuild();
+    for (int i = 0; i < MONITORS_NUM; i++)
+        cgapal_rebuild_monitor(i);
     config_save();
+    endblit();
 }
 
 void
 MainWindow::on_actionForce_4_3_display_ratio_triggered()
 {
     video_toggle_option(ui->actionForce_4_3_display_ratio, &force_43);
+
+    // When turning on Force 4:3 in resizable mode, immediately snap to 4:3
+    if (vid_resize == 1 && !video_fullscreen) {
+        ui->stackedWidget->setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
+        if (force_43 > 0) {
+            adjustForForce43(size());
+        } else {
+            // Turning off: refresh renderer scaling
+            ui->stackedWidget->onResize(width(), height());
+        }
+    }
 }
 
 void
@@ -1764,6 +2159,16 @@ MainWindow::on_actionAuto_pause_triggered()
 {
     do_auto_pause ^= 1;
     ui->actionAuto_pause->setChecked(do_auto_pause > 0 ? true : false);
+    config_save();
+}
+
+void
+MainWindow::on_actionUpdate_mouse_every_CPU_frame_triggered()
+{
+    force_constant_mouse ^= 1;
+    ui->actionUpdate_mouse_every_CPU_frame->setChecked(force_constant_mouse > 0 ? true : false);
+    mouse_update_sample_rate();
+    config_save();
 }
 
 void
@@ -1812,17 +2217,21 @@ MainWindow::on_actionHiDPI_scaling_triggered()
 void
 MainWindow::on_actionHide_status_bar_triggered()
 {
-    auto w = ui->stackedWidget->width();
-    auto h = ui->stackedWidget->height();
+    auto w = ui->stackedWidget->width() * (!dpi_scale ? util::screenOfWidget(this)->devicePixelRatio() : 1.);
+    auto h = ui->stackedWidget->height() * (!dpi_scale ? util::screenOfWidget(this)->devicePixelRatio() : 1.);
+
     hide_status_bar ^= 1;
     ui->actionHide_status_bar->setChecked(hide_status_bar);
     statusBar()->setVisible(!hide_status_bar);
+#ifdef Q_OS_WINDOWS
+    util::setWin11RoundedCorners(main_window->winId(), (hide_status_bar ? false : true));
+#endif
     if (vid_resize >= 2) {
         setFixedSize(fixed_size_x, fixed_size_y + menuBar()->height() + (hide_status_bar ? 0 : statusBar()->height()) + (hide_tool_bar ? 0 : ui->toolBar->height()));
     } else {
         int vid_resize_orig = vid_resize;
         vid_resize          = 0;
-        emit resizeContents(w, h);
+        emit resizeContents(vid_resize_orig ? w : monitors[0].mon_scrnsz_x, vid_resize_orig ? h : monitors[0].mon_scrnsz_y);
         vid_resize = vid_resize_orig;
         if (vid_resize == 1)
             setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
@@ -1832,8 +2241,9 @@ MainWindow::on_actionHide_status_bar_triggered()
 void
 MainWindow::on_actionHide_tool_bar_triggered()
 {
-    auto w = ui->stackedWidget->width();
-    auto h = ui->stackedWidget->height();
+    auto w = ui->stackedWidget->width() * (!dpi_scale ? util::screenOfWidget(this)->devicePixelRatio() : 1.);
+    auto h = ui->stackedWidget->height() * (!dpi_scale ? util::screenOfWidget(this)->devicePixelRatio() : 1.);
+
     hide_tool_bar ^= 1;
     ui->actionHide_tool_bar->setChecked(hide_tool_bar);
     ui->toolBar->setVisible(!hide_tool_bar);
@@ -1842,7 +2252,7 @@ MainWindow::on_actionHide_tool_bar_triggered()
     } else {
         int vid_resize_orig = vid_resize;
         vid_resize          = 0;
-        emit resizeContents(w, h);
+        emit resizeContents(vid_resize_orig ? w : monitors[0].mon_scrnsz_x, vid_resize_orig ? h : monitors[0].mon_scrnsz_y);
         vid_resize = vid_resize_orig;
         if (vid_resize == 1)
             setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
@@ -1863,12 +2273,21 @@ void
 MainWindow::on_actionTake_screenshot_triggered()
 {
     startblit();
-    for (int i = 0; i < MONITORS_NUM; i++)
-        monitors[i].mon_screenshots++;
+    for (auto & monitor : monitors)
+        ++monitor.mon_screenshots;
     endblit();
     device_force_redraw();
 }
 
+void
+MainWindow::on_actionMute_Unmute_triggered()
+{
+    sound_muted ^= 1;
+    config_save();
+    status->updateSoundIcon();
+    ui->actionMute_Unmute->setText(sound_muted ? tr("&Unmute") : tr("&Mute"));
+}
+
 void
 MainWindow::on_actionSound_gain_triggered()
 {
@@ -1885,17 +2304,32 @@ MainWindow::setSendKeyboardInput(bool enabled)
 void
 MainWindow::updateUiPauseState()
 {
-    auto pause_icon   = dopause ? QIcon(":/menuicons/win/icons/run.ico") : QIcon(":/menuicons/win/icons/pause.ico");
-    auto tooltip_text = dopause ? QString(tr("Resume execution")) : QString(tr("Pause execution"));
+    const auto pause_icon         = dopause ? QIcon(":/menuicons/qt/icons/run.ico") :
+                                    QIcon(":/menuicons/qt/icons/pause.ico");
+    const auto tooltip_text = dopause ? QString(tr("Resume execution")) :
+                                    QString(tr("Pause execution"));
+    const auto menu_text = dopause ? QString(tr("Re&sume")) :
+                                    QString(tr("&Pause"));
     ui->actionPause->setIcon(pause_icon);
     ui->actionPause->setToolTip(tooltip_text);
+    ui->actionPause->setText(menu_text);
+    emit vmmRunningStateChanged(static_cast<VMManagerProtocol::RunningState>(window_blocked ? (dopause ? VMManagerProtocol::RunningState::PausedWaiting : VMManagerProtocol::RunningState::RunningWaiting) : (VMManagerProtocol::RunningState)dopause));
+}
+
+void
+MainWindow::updateStatusEmptyIcons()
+{
+    if (status != nullptr)
+        status->refreshEmptyIcons();
 }
 
 void
 MainWindow::on_actionPreferences_triggered()
 {
     ProgSettings progsettings(this);
-    progsettings.exec();
+    if (progsettings.exec() == QDialog::Accepted) {
+        emit vmmGlobalConfigurationChanged();
+    }
 }
 
 void
@@ -1935,9 +2369,7 @@ MainWindow::changeEvent(QEvent *event)
 {
 #ifdef Q_OS_WINDOWS
     if (event->type() == QEvent::LanguageChange) {
-        auto font_name = tr("FONT_NAME");
-        auto font_size = tr("FONT_SIZE");
-        QApplication::setFont(QFont(font_name, font_size.toInt()));
+        QApplication::setFont(QFont(ProgSettings::getFontName(lang_id), 9));
     }
 #endif
     QWidget::changeEvent(event);
@@ -1947,17 +2379,40 @@ MainWindow::changeEvent(QEvent *event)
     }
 }
 
+void
+MainWindow::reloadAllRenderers()
+{
+    reload_renderers = true;
+}
+
 void
 MainWindow::on_actionRenderer_options_triggered()
 {
-    auto dlg = ui->stackedWidget->getOptions(this);
-
-    if (dlg) {
+    if (const auto dlg = ui->stackedWidget->getOptions(this)) {
         if (dlg->exec() == QDialog::Accepted) {
-            for (int i = 1; i < MONITORS_NUM; i++) {
+            if (ui->stackedWidget->reloadRendererOption()) {
+                ui->stackedWidget->switchRenderer(static_cast<RendererStack::Renderer>(vid_api));
+                if (show_second_monitors) {
+                    for (int i = 1; i < MONITORS_NUM; i++) {
+                        if (renderers[i] && renderers[i]->reloadRendererOption() && renderers[i]->hasOptions()) {
+                            ui->stackedWidget->switchRenderer(static_cast<RendererStack::Renderer>(vid_api));
+                        }
+                    }
+                }
+            } else for (int i = 1; i < MONITORS_NUM; i++) {
                 if (renderers[i] && renderers[i]->hasOptions())
                     renderers[i]->reloadOptions();
             }
+        } else if (reload_renderers && ui->stackedWidget->reloadRendererOption()) {
+            reload_renderers = false;
+            ui->stackedWidget->switchRenderer(static_cast<RendererStack::Renderer>(vid_api));
+            if (show_second_monitors) {
+                for (int i = 1; i < MONITORS_NUM; i++) {
+                    if (renderers[i]) {
+                        renderers[i]->switchRenderer(static_cast<RendererStack::Renderer>(vid_api));
+                    }
+                }
+            }
         }
     }
 }
@@ -1965,22 +2420,18 @@ MainWindow::on_actionRenderer_options_triggered()
 void
 MainWindow::on_actionMCA_devices_triggered()
 {
-    auto dlg = new MCADeviceList(this);
-
-    if (dlg)
+    if (const auto dlg = new MCADeviceList(this))
         dlg->exec();
 }
 
 void
 MainWindow::on_actionShow_non_primary_monitors_triggered()
 {
-    show_second_monitors = (int) ui->actionShow_non_primary_monitors->isChecked();
-
-    blitDummied = true;
+    show_second_monitors = static_cast<int>(ui->actionShow_non_primary_monitors->isChecked());
 
     if (show_second_monitors) {
         for (int monitor_index = 1; monitor_index < MONITORS_NUM; monitor_index++) {
-            auto &secondaryRenderer = renderers[monitor_index];
+            const auto &secondaryRenderer = renderers[monitor_index];
             if (!renderers[monitor_index])
                 continue;
             secondaryRenderer->show();
@@ -1990,8 +2441,8 @@ MainWindow::on_actionShow_non_primary_monitors_triggered()
                                                monitor_settings[monitor_index].mon_window_w > 2048 ? 2048 : monitor_settings[monitor_index].mon_window_w,
                                                monitor_settings[monitor_index].mon_window_h > 2048 ? 2048 : monitor_settings[monitor_index].mon_window_h);
             }
-            secondaryRenderer->switchRenderer((RendererStack::Renderer) vid_api);
-            ui->stackedWidget->switchRenderer((RendererStack::Renderer) vid_api);
+            secondaryRenderer->switchRenderer(static_cast<RendererStack::Renderer>(vid_api));
+            ui->stackedWidget->switchRenderer(static_cast<RendererStack::Renderer>(vid_api));
         }
     } else {
         for (int monitor_index = 1; monitor_index < MONITORS_NUM; monitor_index++) {
@@ -2007,23 +2458,28 @@ MainWindow::on_actionShow_non_primary_monitors_triggered()
             }
         }
     }
-
-    blitDummied = false;
 }
 
 void
 MainWindow::on_actionOpen_screenshots_folder_triggered()
 {
-    QDir(QString(usr_path) + QString("/screenshots/")).mkpath(".");
+    static_cast<void>(QDir(QString(usr_path) + QString("/screenshots/")).mkpath("."));
     QDesktopServices::openUrl(QUrl(QString("file:///") + usr_path + QString("/screenshots/")));
 }
 
+void
+MainWindow::on_actionOpen_printer_tray_triggered()
+{
+    static_cast<void>(QDir(QString(usr_path) + QString("/printer/")).mkpath("."));
+    QDesktopServices::openUrl(QUrl(QString("file:///") + usr_path + QString("/printer/")));
+}
+
 void
 MainWindow::on_actionApply_fullscreen_stretch_mode_when_maximized_triggered(bool checked)
 {
     video_fullscreen_scale_maximized = checked;
 
-    auto widget = ui->stackedWidget->currentWidget();
+    const auto widget = ui->stackedWidget->currentWidget();
     ui->stackedWidget->onResize(widget->width(), widget->height());
 
     for (int i = 1; i < MONITORS_NUM; i++) {
@@ -2052,10 +2508,13 @@ void MainWindow::on_actionACPI_Shutdown_triggered()
     acpi_pwrbut_pressed = 1;
 }
 
-void MainWindow::on_actionShow_status_icons_in_fullscreen_triggered()
+void MainWindow::on_actionCGA_composite_settings_triggered()
 {
-    status_icons_fullscreen = !status_icons_fullscreen;
-    ui->actionShow_status_icons_in_fullscreen->setChecked(status_icons_fullscreen);
+    isNonPause = true;
+    CGASettingsDialog dialog;
+    dialog.setModal(true);
+    dialog.exec();
+    isNonPause = false;
     config_save();
 }
 
diff --git a/src/qt/qt_mainwindow.hpp b/src/qt/qt_mainwindow.hpp
index 553f9602c..792685f42 100644
--- a/src/qt/qt_mainwindow.hpp
+++ b/src/qt/qt_mainwindow.hpp
@@ -5,15 +5,19 @@
 #include <QLabel>
 #include <QEvent>
 #include <QFocusEvent>
+#include <QLabel>
+#include <QShortcut>
+#include <QIcon>
 
 #include <memory>
 #include <array>
+#include <atomic>
+
+#include "qt_vmmanager_protocol.hpp"
 
 class MediaMenu;
 class RendererStack;
 
-extern std::atomic<bool> blitDummied;
-
 namespace Ui {
 class MainWindow;
 }
@@ -27,13 +31,16 @@ public:
     explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
-    void  showMessage(int flags, const QString &header, const QString &message);
+    void  showMessage(int flags, const QString &header, const QString &message, bool richText);
     void  getTitle(wchar_t *title);
     void  blitToWidget(int x, int y, int w, int h, int monitor_index);
     QSize getRenderWidgetSize();
     void  setSendKeyboardInput(bool enabled);
-    void  checkFullscreenHotkey();
-
+    void  reloadAllRenderers();
+	QShortcut	*windowedShortcut;
+	QKeySequence FindAcceleratorSeq(const char *name);
+	
+	
     std::array<std::unique_ptr<RendererStack>, 8> renderers;
 signals:
     void paint(const QImage &image);
@@ -56,20 +63,26 @@ signals:
     void setFullscreen(bool state);
     void setMouseCapture(bool state);
 
-    void showMessageForNonQtThread(int flags, const QString &header, const QString &message);
+    void showMessageForNonQtThread(int flags, const QString &header, const QString &message, bool richText, std::atomic_bool* done);
     void getTitleForNonQtThread(wchar_t *title);
+
+    void vmmRunningStateChanged(VMManagerProtocol::RunningState state);
+    void vmmConfigurationChanged();
+    void vmmGlobalConfigurationChanged();
 public slots:
     void showSettings();
     void hardReset();
     void togglePause();
     void initRendererMonitorSlot(int monitor_index);
     void destroyRendererMonitorSlot(int monitor_index);
+    void updateStatusEmptyIcons();
     void updateUiPauseState();
 private slots:
     void on_actionFullscreen_triggered();
     void on_actionSettings_triggered();
     void on_actionExit_triggered();
     void on_actionAuto_pause_triggered();
+    void on_actionUpdate_mouse_every_CPU_frame_triggered();
     void on_actionPause_triggered();
     void on_actionCtrl_Alt_Del_triggered();
     void on_actionCtrl_Alt_Esc_triggered();
@@ -116,13 +129,14 @@ private slots:
     void on_actionHide_tool_bar_triggered();
     void on_actionUpdate_status_bar_icons_triggered();
     void on_actionTake_screenshot_triggered();
+    void on_actionMute_Unmute_triggered();
     void on_actionSound_gain_triggered();
     void on_actionPreferences_triggered();
     void on_actionEnable_Discord_integration_triggered(bool checked);
     void on_actionRenderer_options_triggered();
 
     void refreshMediaMenu();
-    void showMessage_(int flags, const QString &header, const QString &message);
+    void showMessage_(int flags, const QString &header, const QString &message, bool richText, std::atomic_bool* done = nullptr);
     void getTitle_(wchar_t *title);
 
     void on_actionMCA_devices_triggered();
@@ -136,6 +150,7 @@ protected:
     void showEvent(QShowEvent *event) override;
     void closeEvent(QCloseEvent *event) override;
     void changeEvent(QEvent *event) override;
+    void resizeEvent(QResizeEvent *event) override;
 
 private slots:
     void on_actionPen_triggered();
@@ -144,20 +159,27 @@ private slots:
     void on_actionCursor_Puck_triggered();
 
     void on_actionACPI_Shutdown_triggered();
-    void on_actionShow_status_icons_in_fullscreen_triggered();
 
 private slots:
     void on_actionShow_non_primary_monitors_triggered();
 
     void on_actionOpen_screenshots_folder_triggered();
 
+    void on_actionOpen_printer_tray_triggered();
+
     void on_actionApply_fullscreen_stretch_mode_when_maximized_triggered(bool checked);
 
+    void on_actionCGA_composite_settings_triggered();
+
 private:
     Ui::MainWindow                *ui;
     std::unique_ptr<MachineStatus> status;
     std::shared_ptr<MediaMenu>     mm;
 
+    static bool s_adjustingForce43; // guard against recursion
+	void adjustForForce43(const QSize &newWinSize);
+    
+	void updateShortcuts();
     void     processKeyboardInput(bool down, uint32_t keycode);
 #ifdef Q_OS_MACOS
     uint32_t last_modifiers = 0;
@@ -174,10 +196,22 @@ private:
     bool fs_on_signal        = false;
     bool fs_off_signal       = false;
 
+    /* Reload the renderers after closing renderer options dialog. */
+    bool reload_renderers    = false;
+
     friend class SpecifyDimensions;
     friend class ProgSettings;
     friend class RendererCommon;
     friend class RendererStack; // For UI variable access by non-primary renderer windows.
+    friend class WindowsRawInputFilter; // Needed to reload renderers on style sheet changes.
+
+    QLabel *caps_label, *scroll_label, *num_label, *kana_label;
+    QIcon caps_icon, scroll_icon, num_icon, kana_icon;
+    QIcon caps_icon_off, scroll_icon_off, num_icon_off, kana_icon_off;
+
+    bool isShowMessage = false;
+    bool isNonPause = false;
+    bool window_blocked = false;
 };
 
 #endif // QT_MAINWINDOW_HPP
diff --git a/src/qt/qt_mainwindow.ui b/src/qt/qt_mainwindow.ui
index c14c33207..78cb2df98 100644
--- a/src/qt/qt_mainwindow.ui
+++ b/src/qt/qt_mainwindow.ui
@@ -54,7 +54,7 @@
      <x>0</x>
      <y>0</y>
      <width>724</width>
-     <height>23</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuAction">
@@ -63,17 +63,19 @@
     </property>
     <widget class="QMenu" name="menuTablet_tool">
      <property name="title">
-      <string>Tablet tool</string>
+      <string>&amp;Tablet tool</string>
      </property>
      <addaction name="actionPen"/>
      <addaction name="actionCursor_Puck"/>
     </widget>
-    <addaction name="actionAuto_pause"/>
+    <addaction name="menuTablet_tool"/>
     <addaction name="separator"/>
     <addaction name="actionKeyboard_requires_capture"/>
     <addaction name="actionRight_CTRL_is_left_ALT"/>
-    <addaction name="menuTablet_tool"/>
     <addaction name="separator"/>
+    <addaction name="actionUpdate_mouse_every_CPU_frame"/>
+    <addaction name="separator"/>
+    <addaction name="actionAuto_pause"/>
     <addaction name="actionPause"/>
     <addaction name="separator"/>
     <addaction name="actionHard_Reset"/>
@@ -87,13 +89,21 @@
     <property name="title">
      <string>&amp;Tools</string>
     </property>
+    <widget class="QMenu" name="menuSound">
+     <property name="title">
+      <string>S&amp;ound</string>
+     </property>
+     <addaction name="actionMute_Unmute"/>
+     <addaction name="separator"/>
+     <addaction name="actionSound_gain"/>
+    </widget>
     <addaction name="actionSettings"/>
     <addaction name="actionUpdate_status_bar_icons"/>
     <addaction name="separator"/>
     <addaction name="actionEnable_Discord_integration"/>
     <addaction name="separator"/>
     <addaction name="actionTake_screenshot"/>
-    <addaction name="actionSound_gain"/>
+    <addaction name="menuSound"/>
     <addaction name="separator"/>
     <addaction name="actionPreferences"/>
     <addaction name="separator"/>
@@ -102,6 +112,7 @@
     <addaction name="separator"/>
     <addaction name="actionMCA_devices"/>
     <addaction name="separator"/>
+    <addaction name="actionOpen_printer_tray"/>
     <addaction name="actionOpen_screenshots_folder"/>
    </widget>
    <widget class="QMenu" name="menuView">
@@ -113,11 +124,8 @@
       <string>Re&amp;nderer</string>
      </property>
      <addaction name="actionSoftware_Renderer"/>
-     <addaction name="actionHardware_Renderer_OpenGL"/>
-     <addaction name="actionHardware_Renderer_OpenGL_ES"/>
      <addaction name="actionOpenGL_3_0_Core"/>
      <addaction name="actionVulkan"/>
-     <addaction name="actionDirect3D_9"/>
      <addaction name="actionVNC"/>
     </widget>
     <widget class="QMenu" name="menuWindow_scale_factor">
@@ -137,7 +145,7 @@
     </widget>
     <widget class="QMenu" name="menuFilter_method">
      <property name="title">
-      <string>Filter method</string>
+      <string>Fi&amp;lter method</string>
      </property>
      <addaction name="actionNearest"/>
      <addaction name="actionLinear"/>
@@ -154,7 +162,7 @@
     </widget>
     <widget class="QMenu" name="menuEGA_S_VGA_settings">
      <property name="title">
-      <string>E&amp;GA/(S)VGA settings</string>
+      <string>EGA/(S)&amp;VGA settings</string>
      </property>
      <widget class="QMenu" name="menuVGA_screen_type">
       <property name="title">
@@ -178,9 +186,33 @@
      <addaction name="menuVGA_screen_type"/>
      <addaction name="menuGrayscale_conversion_type"/>
     </widget>
+    <widget class="QMenu" name="menuOpenGL_input_stretch_mode">
+     <property name="title">
+      <string>OpenGL input stretch mode</string>
+     </property>
+     <addaction name="action_Full_screen_stretch_gl"/>
+     <addaction name="action_4_3_gl"/>
+     <addaction name="action_Square_pixels_keep_ratio_gl"/>
+     <addaction name="action_Integer_scale_gl"/>
+     <addaction name="action4_3_Integer_scale_gl"/>
+    </widget>
+    <widget class="QMenu" name="menuOpenGL_input_scale">
+     <property name="title">
+      <string>OpenGL input scale</string>
+     </property>
+     <addaction name="action_0_5x_2"/>
+     <addaction name="action_1x_2"/>
+     <addaction name="action1_5x_2"/>
+     <addaction name="action_2x_2"/>
+     <addaction name="action_3x_2"/>
+     <addaction name="action_4x_2"/>
+     <addaction name="action_5x_2"/>
+     <addaction name="action_6x_2"/>
+     <addaction name="action_7x_2"/>
+     <addaction name="action_8x_2"/>
+    </widget>
     <addaction name="actionHide_tool_bar"/>
     <addaction name="actionHide_status_bar"/>
-    <addaction name="actionShow_status_icons_in_fullscreen"/>
     <addaction name="separator"/>
     <addaction name="actionShow_non_primary_monitors"/>
     <addaction name="actionResizable_window"/>
@@ -188,6 +220,8 @@
     <addaction name="separator"/>
     <addaction name="menuRenderer"/>
     <addaction name="actionRenderer_options"/>
+    <addaction name="menuOpenGL_input_stretch_mode"/>
+    <addaction name="menuOpenGL_input_scale"/>
     <addaction name="separator"/>
     <addaction name="actionSpecify_dimensions"/>
     <addaction name="actionForce_4_3_display_ratio"/>
@@ -198,6 +232,7 @@
     <addaction name="actionFullscreen"/>
     <addaction name="menuFullscreen_stretch_mode"/>
     <addaction name="actionApply_fullscreen_stretch_mode_when_maximized"/>
+    <addaction name="actionCGA_composite_settings"/>
     <addaction name="menuEGA_S_VGA_settings"/>
     <addaction name="separator"/>
     <addaction name="actionCGA_PCjr_Tandy_EGA_S_VGA_overscan"/>
@@ -225,7 +260,7 @@
   <widget class="QStatusBar" name="statusbar"/>
   <widget class="QToolBar" name="toolBar">
    <property name="contextMenuPolicy">
-    <enum>Qt::PreventContextMenu</enum>
+    <enum>Qt::ContextMenuPolicy::PreventContextMenu</enum>
    </property>
    <property name="windowTitle">
     <string notr="true">toolBar</string>
@@ -237,7 +272,7 @@
     <bool>false</bool>
    </property>
    <property name="allowedAreas">
-    <set>Qt::TopToolBarArea</set>
+    <set>Qt::ToolBarArea::TopToolBarArea</set>
    </property>
    <property name="iconSize">
     <size>
@@ -246,7 +281,7 @@
     </size>
    </property>
    <property name="toolButtonStyle">
-    <enum>Qt::ToolButtonIconOnly</enum>
+    <enum>Qt::ToolButtonStyle::ToolButtonIconOnly</enum>
    </property>
    <property name="floatable">
     <bool>false</bool>
@@ -267,6 +302,14 @@
    <addaction name="separator"/>
    <addaction name="actionSettings"/>
   </widget>
+  <action name="actionUpdate_mouse_every_CPU_frame">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Update mouse every CPU frame</string>
+   </property>
+  </action>
   <action name="actionAuto_pause">
    <property name="checkable">
     <bool>true</bool>
@@ -294,7 +337,7 @@
   <action name="actionHard_Reset">
    <property name="icon">
     <iconset resource="../qt_resources.qrc">
-     <normaloff>:/menuicons/win/icons/hard_reset.ico</normaloff>:/menuicons/win/icons/hard_reset.ico</iconset>
+     <normaloff>:/menuicons/qt/icons/hard_reset.ico</normaloff>:/menuicons/qt/icons/hard_reset.ico</iconset>
    </property>
    <property name="text">
     <string>&amp;Hard Reset...</string>
@@ -306,7 +349,7 @@
   <action name="actionCtrl_Alt_Del">
    <property name="icon">
     <iconset resource="../qt_resources.qrc">
-     <normaloff>:/menuicons/win/icons/send_cad.ico</normaloff>:/menuicons/win/icons/send_cad.ico</iconset>
+     <normaloff>:/menuicons/qt/icons/send_cad.ico</normaloff>:/menuicons/qt/icons/send_cad.ico</iconset>
    </property>
    <property name="text">
     <string>&amp;Ctrl+Alt+Del</string>
@@ -327,7 +370,7 @@
   <action name="actionCtrl_Alt_Esc">
    <property name="icon">
     <iconset resource="../qt_resources.qrc">
-     <normaloff>:/menuicons/win/icons/send_cae.ico</normaloff>:/menuicons/win/icons/send_cae.ico</iconset>
+     <normaloff>:/menuicons/qt/icons/send_cae.ico</normaloff>:/menuicons/qt/icons/send_cae.ico</iconset>
    </property>
    <property name="text">
     <string>Ctrl+Alt+&amp;Esc</string>
@@ -337,12 +380,9 @@
    </property>
   </action>
   <action name="actionPause">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
    <property name="icon">
     <iconset resource="../qt_resources.qrc">
-     <normaloff>:/menuicons/win/icons/pause.ico</normaloff>:/menuicons/win/icons/pause.ico</iconset>
+     <normaloff>:/menuicons/qt/icons/pause.ico</normaloff>:/menuicons/qt/icons/pause.ico</iconset>
    </property>
    <property name="text">
     <string>&amp;Pause</string>
@@ -353,19 +393,22 @@
   </action>
   <action name="actionExit">
    <property name="text">
-    <string>Exit</string>
+    <string>E&amp;xit</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::MenuRole::QuitRole</enum>
    </property>
   </action>
   <action name="actionSettings">
    <property name="icon">
     <iconset resource="../qt_resources.qrc">
-     <normaloff>:/menuicons/win/icons/settings.ico</normaloff>:/menuicons/win/icons/settings.ico</iconset>
+     <normaloff>:/menuicons/qt/icons/settings.ico</normaloff>:/menuicons/qt/icons/settings.ico</iconset>
    </property>
    <property name="text">
     <string>&amp;Settings...</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::NoRole</enum>
+    <enum>QAction::MenuRole::NoRole</enum>
    </property>
    <property name="iconVisibleInMenu">
     <bool>false</bool>
@@ -375,6 +418,9 @@
    <property name="text">
     <string>&amp;Fullscreen</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Alt+PgUp</string>
+   </property>
   </action>
   <action name="actionSoftware_Renderer">
    <property name="checkable">
@@ -387,28 +433,6 @@
     <number>0</number>
    </property>
   </action>
-  <action name="actionHardware_Renderer_OpenGL">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Qt (&amp;OpenGL)</string>
-   </property>
-   <property name="vid_api" stdset="0">
-    <number>1</number>
-   </property>
-  </action>
-  <action name="actionHardware_Renderer_OpenGL_ES">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Qt (OpenGL &amp;ES)</string>
-   </property>
-   <property name="vid_api" stdset="0">
-    <number>2</number>
-   </property>
-  </action>
   <action name="actionHide_status_bar">
    <property name="checkable">
     <bool>true</bool>
@@ -435,7 +459,7 @@
   </action>
   <action name="actionSpecify_dimensions">
    <property name="text">
-    <string>Specify dimensions...</string>
+    <string>Specify &amp;dimensions...</string>
    </property>
   </action>
   <action name="actionForce_4_3_display_ratio">
@@ -443,7 +467,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>F&amp;orce 4:3 display ratio</string>
+    <string>Force &amp;4:3 display ratio</string>
    </property>
   </action>
   <action name="actionHiDPI_scaling">
@@ -680,13 +704,13 @@
   </action>
   <action name="actionAbout_Qt">
    <property name="text">
-    <string>About Qt</string>
+    <string>About &amp;Qt</string>
    </property>
    <property name="visible">
     <bool>false</bool>
    </property>
    <property name="menuRole">
-    <enum>QAction::AboutQtRole</enum>
+    <enum>QAction::MenuRole::AboutQtRole</enum>
    </property>
   </action>
   <action name="actionAbout_86Box">
@@ -694,7 +718,7 @@
     <string>&amp;About 86Box...</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::AboutRole</enum>
+    <enum>QAction::MenuRole::AboutRole</enum>
    </property>
   </action>
   <action name="actionDocumentation">
@@ -721,6 +745,11 @@
     <bool>false</bool>
    </property>
   </action>
+  <action name="actionMute_Unmute">
+   <property name="text">
+    <string>&amp;Mute</string>
+   </property>
+  </action>
   <action name="actionSound_gain">
    <property name="text">
     <string>Sound &amp;gain...</string>
@@ -734,7 +763,7 @@
     <string>Open&amp;GL (3.0 Core)</string>
    </property>
    <property name="vid_api" stdset="0">
-    <number>3</number>
+    <number>1</number>
    </property>
   </action>
   <action name="actionPreferences">
@@ -742,7 +771,7 @@
     <string>&amp;Preferences...</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::PreferencesRole</enum>
+    <enum>QAction::MenuRole::PreferencesRole</enum>
    </property>
   </action>
   <action name="actionEnable_Discord_integration">
@@ -770,10 +799,10 @@
    </property>
    <property name="icon">
     <iconset resource="../qt_resources.qrc">
-     <normaloff>:/menuicons/win/icons/acpi_shutdown.ico</normaloff>:/menuicons/win/icons/acpi_shutdown.ico</iconset>
+     <normaloff>:/menuicons/qt/icons/acpi_shutdown.ico</normaloff>:/menuicons/qt/icons/acpi_shutdown.ico</iconset>
    </property>
    <property name="text">
-    <string>ACPI shutdown</string>
+    <string>ACP&amp;I shutdown</string>
    </property>
    <property name="toolTip">
     <string>ACPI shutdown</string>
@@ -812,7 +841,10 @@
   </action>
   <action name="actionRenderer_options">
    <property name="text">
-    <string>Renderer options...</string>
+    <string>Renderer &amp;options...</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::MenuRole::NoRole</enum>
    </property>
   </action>
   <action name="actionVulkan">
@@ -823,23 +855,12 @@
     <string>&amp;Vulkan</string>
    </property>
    <property name="vid_api" stdset="0">
-    <number>4</number>
+    <number>2</number>
    </property>
   </action>
   <action name="actionMCA_devices">
    <property name="text">
-    <string>MCA devices...</string>
-   </property>
-  </action>
-  <action name="actionDirect3D_9">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Direct3D 9</string>
-   </property>
-   <property name="vid_api" stdset="0">
-    <number>5</number>
+    <string>&amp;MCA devices...</string>
    </property>
   </action>
   <action name="actionShow_non_primary_monitors">
@@ -847,7 +868,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Show non-primary monitors</string>
+    <string>Show non-&amp;primary monitors</string>
    </property>
   </action>
   <action name="actionVNC">
@@ -855,15 +876,20 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>VNC</string>
+    <string>&amp;VNC</string>
    </property>
    <property name="vid_api" stdset="0">
-    <number>6</number>
+    <number>3</number>
+   </property>
+  </action>
+  <action name="actionOpen_printer_tray">
+   <property name="text">
+    <string>Open p&amp;rinter tray...</string>
    </property>
   </action>
   <action name="actionOpen_screenshots_folder">
    <property name="text">
-    <string>Open screenshots folder...</string>
+    <string>Open screenshots &amp;folder...</string>
    </property>
   </action>
   <action name="actionApply_fullscreen_stretch_mode_when_maximized">
@@ -871,7 +897,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Apply fullscreen stretch mode when maximized</string>
+    <string>Appl&amp;y fullscreen stretch mode when maximized</string>
    </property>
   </action>
   <action name="actionCursor_Puck">
@@ -879,15 +905,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Cursor/Puck</string>
-   </property>
-  </action>
-  <action name="actionShow_status_icons_in_fullscreen">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Show status icons in fullscreen</string>
+    <string>&amp;Cursor/Puck</string>
    </property>
   </action>
   <action name="actionPen">
@@ -895,7 +913,140 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Pen</string>
+    <string>&amp;Pen</string>
+   </property>
+  </action>
+  <action name="actionCGA_composite_settings">
+   <property name="text">
+    <string>&amp;CGA composite settings...</string>
+   </property>
+  </action>
+  <action name="action_Full_screen_stretch_gl">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Full screen stretch</string>
+   </property>
+  </action>
+  <action name="action_4_3_gl">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;4:3</string>
+   </property>
+  </action>
+  <action name="action_Square_pixels_keep_ratio_gl">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Square pixels (Keep ratio)</string>
+   </property>
+  </action>
+  <action name="action_Integer_scale_gl">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Integer scale</string>
+   </property>
+  </action>
+  <action name="action4_3_Integer_scale_gl">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>4:&amp;3 Integer scale</string>
+   </property>
+  </action>
+  <action name="action_1x">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;1x</string>
+   </property>
+  </action>
+  <action name="action_0_5x_2">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;0.5x</string>
+   </property>
+  </action>
+  <action name="action_1x_2">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;1x</string>
+   </property>
+  </action>
+  <action name="action1_5x_2">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>1.&amp;5x</string>
+   </property>
+  </action>
+  <action name="action_2x_2">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;2x</string>
+   </property>
+  </action>
+  <action name="action_3x_2">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;3x</string>
+   </property>
+  </action>
+  <action name="action_4x_2">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;4x</string>
+   </property>
+  </action>
+  <action name="action_5x_2">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;5x</string>
+   </property>
+  </action>
+  <action name="action_6x_2">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;6x</string>
+   </property>
+  </action>
+  <action name="action_7x_2">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;7x</string>
+   </property>
+  </action>
+  <action name="action_8x_2">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;8x</string>
    </property>
   </action>
  </widget>
diff --git a/src/qt/qt_mediahistorymanager.cpp b/src/qt/qt_mediahistorymanager.cpp
index 9d003f464..ff9f1cf1c 100644
--- a/src/qt/qt_mediahistorymanager.cpp
+++ b/src/qt/qt_mediahistorymanager.cpp
@@ -21,11 +21,21 @@
 #include <QStringBuilder>
 #include <utility>
 #include "qt_mediahistorymanager.hpp"
+#ifdef Q_OS_WINDOWS
+#include <windows.h>
+#endif
 
 extern "C" {
 #include <86box/timer.h>
-#include <86box/cdrom.h>
+#include <86box/device.h>
+#include <86box/cassette.h>
+#include <86box/cartridge.h>
 #include <86box/fdd.h>
+#include <86box/cdrom.h>
+#include <86box/scsi_device.h>
+#include <86box/rdisk.h>
+#include <86box/mo.h>
+#include <86box/path.h>
 }
 
 namespace ui {
@@ -94,13 +104,25 @@ MediaHistoryManager::getImageForSlot(int index, int slot, ui::MediaType type)
     return image_name;
 }
 
-// These are hardcoded since we can't include the various
-// header files where they are defined (e.g., fdd.h, mo.h).
-// However, all in ui::MediaType support 4 except cassette.
 int
 MediaHistoryManager::maxDevicesSupported(ui::MediaType type)
 {
-    return type == ui::MediaType::Cassette ? 1 : 4;
+    switch (type) {
+        default:
+            return 4;
+        case ui::MediaType::Optical:
+            return CDROM_NUM;
+        case ui::MediaType::Floppy:
+            return FDD_NUM;
+        case ui::MediaType::RDisk:
+            return RDISK_NUM;
+        case ui::MediaType::Mo:
+            return MO_NUM;
+        case ui::MediaType::Cassette:
+            return 1;
+        case ui::MediaType::Cartridge:
+            return 2;
+    }
 }
 
 void
@@ -163,17 +185,31 @@ MediaHistoryManager::initialDeduplication()
         for (int device_index = 0; device_index < maxDevicesSupported(device_type); device_index++) {
             device_index_list_t device_history = getHistoryListForDeviceIndex(device_index, device_type);
             switch (device_type) {
-                case ui::MediaType::Optical:
-                    current_image = cdrom[device_index].image_path;
+                default:
+                    continue;
+                    break;
+                case ui::MediaType::Cassette:
+                    current_image = cassette_fname;
+                    break;
+                case ui::MediaType::Cartridge:
+                    current_image = cart_fns[device_index];
                     break;
                 case ui::MediaType::Floppy:
                     current_image = floppyfns[device_index];
                     break;
-                default:
-                    continue;
+                case ui::MediaType::Optical:
+                    current_image = cdrom[device_index].image_path;
+                    break;
+                case ui::MediaType::RDisk:
+                    current_image = rdisk_drives[device_index].image_path;
+                    break;
+                case ui::MediaType::Mo:
+                    current_image = mo_drives[device_index].image_path;
                     break;
             }
             deduplicateList(device_history, QVector<QString>(1, current_image));
+            device_history = removeMissingImages(device_history);
+            device_history = pathAdjustFull(device_history);
             // Fill in missing, if any
             int missing = MAX_PREV_IMAGES - device_history.size();
             if (missing) {
@@ -182,6 +218,7 @@ MediaHistoryManager::initialDeduplication()
                 }
             }
             setHistoryListForDeviceIndex(device_index, device_type, device_history);
+            serializeImageHistoryType(device_type);
         }
     }
 }
@@ -190,12 +227,20 @@ char **
 MediaHistoryManager::getEmuHistoryVarForType(ui::MediaType type, int index)
 {
     switch (type) {
-        case ui::MediaType::Optical:
-            return &cdrom[index].image_history[0];
-        case ui::MediaType::Floppy:
-            return &fdd_image_history[index][0];
         default:
             return nullptr;
+        case ui::MediaType::Cassette:
+            return &cassette_image_history[0];
+        case ui::MediaType::Cartridge:
+            return &cart_image_history[index][0];
+        case ui::MediaType::Floppy:
+            return &fdd_image_history[index][0];
+        case ui::MediaType::Optical:
+            return &cdrom[index].image_history[0];
+        case ui::MediaType::RDisk:
+            return &rdisk_drives[index].image_history[0];
+        case ui::MediaType::Mo:
+            return &mo_drives[index].image_history[0];
     }
 }
 
@@ -275,9 +320,6 @@ MediaHistoryManager::pathAdjustSingle(QString checked_path)
     if (file_info.filePath().isEmpty() || current_usr_path.isEmpty() || file_info.isRelative()) {
         return checked_path;
     }
-    if (file_info.filePath().startsWith(current_usr_path)) {
-        checked_path = file_info.filePath().remove(current_usr_path);
-    }
     return checked_path;
 }
 
@@ -304,10 +346,46 @@ MediaHistoryManager::removeMissingImages(device_index_list_t &device_history)
         if (file_info.filePath().isEmpty()) {
             continue;
         }
-        // For this check, explicitly prepend `usr_path` to relative paths to account for $CWD platform variances
-        QFileInfo absolute_path = file_info.isRelative() ? QFileInfo(getUsrPath().append(file_info.filePath())) : file_info;
-        if (!absolute_path.exists()) {
-            qWarning("Image file %s does not exist - removing from history", qPrintable(file_info.filePath()));
+
+        char temp[MAX_IMAGE_PATH_LEN * 2] = { 0 };
+
+        if (checked_path.left(8) == "ioctl://") {
+            strncpy(temp, checked_path.toUtf8().data(), sizeof(temp) - 10);
+            temp[sizeof(temp) - 1] = '\0';
+        } else {
+            QString path_only;
+            if (checked_path.left(5) == "wp://")
+                path_only = checked_path.right(checked_path.length() - 5);
+            else
+                path_only = checked_path;
+
+            if (path_abs(path_only.toUtf8().data())) {
+                if (path_only.length() > (MAX_IMAGE_PATH_LEN - 1))
+                    fatal("removeMissingImages(): path_only.length() > %i\n", MAX_IMAGE_PATH_LEN - 1);
+                else
+                    snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s", path_only.toUtf8().constData());
+            } else {
+                if ((strlen(usr_path) + strlen(path_get_slash(usr_path)) + path_only.length()) > (MAX_IMAGE_PATH_LEN - 1))
+                    fatal("removeMissingImages(): Combined absolute path length > %i\n", MAX_IMAGE_PATH_LEN - 1);
+                else
+                    snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s%s%s", usr_path,
+                             path_get_slash(usr_path), path_only.toUtf8().constData());
+            }
+            path_normalize(temp);
+        }
+
+        QString qstr = QString::fromUtf8(temp);
+        QFileInfo new_fi(qstr);
+
+        bool file_exists = new_fi.exists();
+
+#ifdef Q_OS_WINDOWS
+        if (new_fi.filePath().left(8) == "ioctl://")
+            file_exists = (GetDriveTypeA(new_fi.filePath().right(2).toUtf8().data()) == DRIVE_CDROM);
+#endif
+
+        if (!file_exists) {
+            qWarning("Image file %s does not exist - removing from history", qPrintable(new_fi.filePath()));
             checked_path = "";
         }
     }
diff --git a/src/qt/qt_mediahistorymanager.hpp b/src/qt/qt_mediahistorymanager.hpp
index 4eae46f9c..92b5939d3 100644
--- a/src/qt/qt_mediahistorymanager.hpp
+++ b/src/qt/qt_mediahistorymanager.hpp
@@ -45,9 +45,10 @@ Q_NAMESPACE
 enum class MediaType {
     Floppy,
     Optical,
-    Zip,
+    RDisk,
     Mo,
-    Cassette
+    Cassette,
+    Cartridge
 };
 // This macro allows us to do a reverse lookup of the enum with `QMetaEnum`
 Q_ENUM_NS(MediaType)
@@ -61,6 +62,10 @@ typedef QHash<ui::MediaType, device_media_history_t> master_list_t;
 static const MediaType AllSupportedMediaHistoryTypes[] = {
     MediaType::Optical,
     MediaType::Floppy,
+    MediaType::RDisk,
+    MediaType::Mo,
+    MediaType::Cassette,
+    MediaType::Cartridge
 };
 
 class MediaHistoryManager {
diff --git a/src/qt/qt_mediamenu.cpp b/src/qt/qt_mediamenu.cpp
index 541e31190..b42812ad6 100644
--- a/src/qt/qt_mediamenu.cpp
+++ b/src/qt/qt_mediamenu.cpp
@@ -29,6 +29,20 @@
 #include <QStyle>
 
 extern "C" {
+#ifdef Q_OS_WINDOWS
+#define BITMAP WINDOWS_BITMAP
+#include <windows.h>
+#include <windowsx.h>
+#undef BITMAP
+#endif
+#include <inttypes.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/config.h>
 #include <86box/device.h>
@@ -41,7 +55,7 @@ extern "C" {
 #include <86box/fdd_86f.h>
 #include <86box/cdrom.h>
 #include <86box/scsi_device.h>
-#include <86box/zip.h>
+#include <86box/rdisk.h>
 #include <86box/mo.h>
 #include <86box/sound.h>
 #include <86box/ui.h>
@@ -54,13 +68,17 @@ extern "C" {
 #include "qt_deviceconfig.hpp"
 #include "qt_mediahistorymanager.hpp"
 #include "qt_mediamenu.hpp"
+#include "qt_iconindicators.hpp"
 
 std::shared_ptr<MediaMenu> MediaMenu::ptr;
 
+static QSize         pixmap_size(16, 16);
+
 MediaMenu::MediaMenu(QWidget *parent)
     : QObject(parent)
 {
     parentWidget = parent;
+    connect(this, &MediaMenu::onCdromUpdateUi, this, &MediaMenu::cdromUpdateUi, Qt::QueuedConnection);
 }
 
 void
@@ -70,22 +88,28 @@ MediaMenu::refresh(QMenu *parentMenu)
 
     if (MachineStatus::hasCassette()) {
         cassetteMenu = parentMenu->addMenu("");
-        cassetteMenu->addAction(tr("&New image..."), [this]() { cassetteNewImage(); });
+        QIcon img_icon = QIcon(":/settings/qt/icons/cassette_image.ico");
+        cassetteMenu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, New), tr("&New image..."), [this]() { cassetteNewImage(); });
         cassetteMenu->addSeparator();
-        cassetteMenu->addAction(tr("&Existing image..."), [this]() { cassetteSelectImage(false); });
-        cassetteMenu->addAction(tr("Existing image (&Write-protected)..."), [this]() { cassetteSelectImage(true); });
+        cassetteMenu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, Browse), tr("&Existing image..."), [this]() { cassetteSelectImage(false); });
+        cassetteMenu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, WriteProtectedBrowse), tr("Existing image (&Write-protected)..."), [this]() { cassetteSelectImage(true); });
+        cassetteMenu->addSeparator();
+        for (int slot = 0; slot < MAX_PREV_IMAGES; slot++) {
+            cassetteImageHistoryPos[slot] = cassetteMenu->children().count();
+            cassetteMenu->addAction(img_icon, tr("Image %1").arg(slot), [this, slot]() { cassetteMenuSelect(slot); })->setCheckable(false);
+        }
         cassetteMenu->addSeparator();
         cassetteRecordPos = cassetteMenu->children().count();
-        cassetteMenu->addAction(tr("&Record"), [this] { pc_cas_set_mode(cassette, 1); cassetteUpdateMenu(); })->setCheckable(true);
+        cassetteMenu->addAction(QIcon(":/settings/qt/icons/record.ico"), tr("&Record"), [this] { pc_cas_set_mode(cassette, 1); cassetteUpdateMenu(); })->setCheckable(true);
         cassettePlayPos = cassetteMenu->children().count();
-        cassetteMenu->addAction(tr("&Play"), [this] { pc_cas_set_mode(cassette, 0); cassetteUpdateMenu(); })->setCheckable(true);
+        cassetteMenu->addAction(QIcon(":/menuicons/qt/icons/run.ico"), tr("&Play"), [this] { pc_cas_set_mode(cassette, 0); cassetteUpdateMenu(); })->setCheckable(true);
         cassetteRewindPos = cassetteMenu->children().count();
-        cassetteMenu->addAction(tr("&Rewind to the beginning"), [] { pc_cas_rewind(cassette); });
+        cassetteMenu->addAction(QIcon(":/settings/qt/icons/rewind.ico"), tr("&Rewind to the beginning"), [] { pc_cas_rewind(cassette); });
         cassetteFastFwdPos = cassetteMenu->children().count();
-        cassetteMenu->addAction(tr("&Fast forward to the end"), [] { pc_cas_append(cassette); });
+        cassetteMenu->addAction(QIcon(":/settings/qt/icons/fast_forward.ico"), tr("&Fast forward to the end"), [] { pc_cas_append(cassette); });
         cassetteMenu->addSeparator();
         cassetteEjectPos = cassetteMenu->children().count();
-        cassetteMenu->addAction(tr("E&ject"), [this]() { cassetteEject(); });
+        cassetteMenu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, Eject), tr("E&ject"), [this]() { cassetteEject(); });
         cassetteUpdateMenu();
     }
 
@@ -93,10 +117,16 @@ MediaMenu::refresh(QMenu *parentMenu)
     if (machine_has_cartridge(machine)) {
         for (int i = 0; i < 2; i++) {
             auto *menu = parentMenu->addMenu("");
-            menu->addAction(tr("&Image..."), [this, i]() { cartridgeSelectImage(i); });
+            QIcon img_icon = QIcon(":/settings/qt/icons/cartridge_image.ico");
+            menu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, Browse), tr("&Image..."), [this, i]() { cartridgeSelectImage(i); });
+            menu->addSeparator();
+            for (int slot = 0; slot < MAX_PREV_IMAGES; slot++) {
+                cartridgeImageHistoryPos[slot] = menu->children().count();
+                menu->addAction(img_icon, tr("Image %1").arg(slot), [this, i, slot]() { cartridgeMenuSelect(i, slot); })->setCheckable(false);
+            }
             menu->addSeparator();
             cartridgeEjectPos = menu->children().count();
-            menu->addAction(tr("E&ject"), [this, i]() { cartridgeEject(i); });
+            menu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, Eject), tr("E&ject"), [this, i]() { cartridgeEject(i); });
             cartridgeMenus[i] = menu;
             cartridgeUpdateMenu(i);
         }
@@ -105,21 +135,23 @@ MediaMenu::refresh(QMenu *parentMenu)
     floppyMenus.clear();
     MachineStatus::iterateFDD([this, parentMenu](int i) {
         auto *menu = parentMenu->addMenu("");
-        menu->addAction(tr("&New image..."), [this, i]() { floppyNewImage(i); });
+        QIcon img_icon = fdd_is_525(i) ? QIcon(":/settings/qt/icons/floppy_525_image.ico") :
+                                         QIcon(":/settings/qt/icons/floppy_35_image.ico");
+        menu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, New), tr("&New image..."), [this, i]() { floppyNewImage(i); });
         menu->addSeparator();
-        menu->addAction(tr("&Existing image..."), [this, i]() { floppySelectImage(i, false); });
-        menu->addAction(tr("Existing image (&Write-protected)..."), [this, i]() { floppySelectImage(i, true); });
+        menu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, Browse), tr("&Existing image..."), [this, i]() { floppySelectImage(i, false); });
+        menu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, WriteProtectedBrowse), tr("Existing image (&Write-protected)..."), [this, i]() { floppySelectImage(i, true); });
         menu->addSeparator();
         for (int slot = 0; slot < MAX_PREV_IMAGES; slot++) {
             floppyImageHistoryPos[slot] = menu->children().count();
-            menu->addAction(QString::asprintf(tr("Image %i").toUtf8().constData(), slot), [this, i, slot]() { floppyMenuSelect(i, slot); })->setCheckable(false);
+            menu->addAction(img_icon, tr("Image %1").arg(slot), [this, i, slot]() { floppyMenuSelect(i, slot); })->setCheckable(false);
         }
         menu->addSeparator();
         floppyExportPos = menu->children().count();
-        menu->addAction(tr("E&xport to 86F..."), [this, i]() { floppyExportTo86f(i); });
+        menu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, Export), tr("E&xport to 86F..."), [this, i]() { floppyExportTo86f(i); });
         menu->addSeparator();
         floppyEjectPos = menu->children().count();
-        menu->addAction(tr("E&ject"), [this, i]() { floppyEject(i); });
+        menu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, Eject), tr("E&ject"), [this, i]() { floppyEject(i); });
         floppyMenus[i] = menu;
         floppyUpdateMenu(i);
     });
@@ -128,51 +160,68 @@ MediaMenu::refresh(QMenu *parentMenu)
     MachineStatus::iterateCDROM([this, parentMenu](int i) {
         auto *menu   = parentMenu->addMenu("");
         cdromMutePos = menu->children().count();
-        menu->addAction(QApplication::style()->standardIcon(QStyle::SP_MediaVolumeMuted), tr("&Mute"), [this, i]() { cdromMute(i); })->setCheckable(true);
+        menu->addAction(QIcon(":/settings/qt/icons/cdrom_mute.ico"), tr("&Mute"), [this, i]() { cdromMute(i); })->setCheckable(true);
         menu->addSeparator();
-        menu->addAction(ProgSettings::loadIcon("/cdrom.ico"), tr("&Image..."), [this, i]() { cdromMount(i, 0); })->setCheckable(false);
-        menu->addAction(QApplication::style()->standardIcon(QStyle::SP_DirIcon), tr("&Folder..."), [this, i]() { cdromMount(i, 1); })->setCheckable(false);
+        menu->addAction(getIconWithIndicator(QIcon(":/settings/qt/icons/cdrom_image.ico"), pixmap_size, QIcon::Normal, Browse), tr("&Image..."), [this, i]() { cdromMount(i, 0, nullptr); })->setCheckable(false);
+        menu->addAction(getIconWithIndicator(QIcon(":/settings/qt/icons/cdrom_folder.ico"), pixmap_size, QIcon::Normal, Browse), tr("&Folder..."), [this, i]() { cdromMount(i, 1, nullptr); })->setCheckable(false);
         menu->addSeparator();
         for (int slot = 0; slot < MAX_PREV_IMAGES; slot++) {
             cdromImageHistoryPos[slot] = menu->children().count();
-            menu->addAction(QString::asprintf(tr("Image %i").toUtf8().constData(), slot), [this, i, slot]() { cdromReload(i, slot); })->setCheckable(false);
+            menu->addAction(tr("Image %1").arg(slot), [this, i, slot]() { cdromReload(i, slot); })->setCheckable(false);
         }
         menu->addSeparator();
-        cdromImagePos = menu->children().count();
-        cdromDirPos   = menu->children().count();
+#ifdef Q_OS_WINDOWS
+        /* Loop through each Windows drive letter and test to see if
+           it's a CDROM */
+        for (const auto &letter : driveLetters) {
+            auto drive = QString("%1:\\").arg(letter);
+            if (GetDriveTypeA(drive.toUtf8().constData()) == DRIVE_CDROM)
+                menu->addAction(QIcon(":/settings/qt/icons/cdrom_host.ico"), tr("&Host CD/DVD Drive (%1:)").arg(letter), [this, i, letter] { cdromMount(i, 2, QString(R"(\\.\%1:)").arg(letter)); })->setCheckable(false);
+        }
+        menu->addSeparator();
+#endif // Q_OS_WINDOWS
+        cdromEjectPos = menu->children().count();
         menu->addAction(tr("E&ject"), [this, i]() { cdromEject(i); })->setCheckable(false);
         cdromMenus[i] = menu;
         cdromUpdateMenu(i);
     });
 
-    zipMenus.clear();
-    MachineStatus::iterateZIP([this, parentMenu](int i) {
+    rdiskMenus.clear();
+    MachineStatus::iterateRDisk([this, parentMenu](int i) {
         auto *menu = parentMenu->addMenu("");
-        menu->addAction(tr("&New image..."), [this, i]() { zipNewImage(i); });
+        QIcon img_icon = QIcon(":/settings/qt/icons/rdisk_image.ico");
+        menu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, New), tr("&New image..."), [this, i]() { rdiskNewImage(i); });
         menu->addSeparator();
-        menu->addAction(tr("&Existing image..."), [this, i]() { zipSelectImage(i, false); });
-        menu->addAction(tr("Existing image (&Write-protected)..."), [this, i]() { zipSelectImage(i, true); });
+        menu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, Browse), tr("&Existing image..."), [this, i]() { rdiskSelectImage(i, false); });
+        menu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, WriteProtectedBrowse), tr("Existing image (&Write-protected)..."), [this, i]() { rdiskSelectImage(i, true); });
         menu->addSeparator();
-        zipEjectPos = menu->children().count();
-        menu->addAction(tr("E&ject"), [this, i]() { zipEject(i); });
-        zipReloadPos = menu->children().count();
-        menu->addAction(tr("&Reload previous image"), [this, i]() { zipReload(i); });
-        zipMenus[i] = menu;
-        zipUpdateMenu(i);
+        for (int slot = 0; slot < MAX_PREV_IMAGES; slot++) {
+            rdiskImageHistoryPos[slot] = menu->children().count();
+            menu->addAction(img_icon, tr("Image %1").arg(slot), [this, i, slot]() { rdiskReload(i, slot); })->setCheckable(false);
+        }
+        menu->addSeparator();
+        rdiskEjectPos = menu->children().count();
+        menu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, Eject), tr("E&ject"), [this, i]() { rdiskEject(i); });
+        rdiskMenus[i] = menu;
+        rdiskUpdateMenu(i);
     });
 
     moMenus.clear();
     MachineStatus::iterateMO([this, parentMenu](int i) {
         auto *menu = parentMenu->addMenu("");
-        menu->addAction(tr("&New image..."), [this, i]() { moNewImage(i); });
+        QIcon img_icon = QIcon(":/settings/qt/icons/mo_image.ico");
+        menu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, New), tr("&New image..."), [this, i]() { moNewImage(i); });
         menu->addSeparator();
-        menu->addAction(tr("&Existing image..."), [this, i]() { moSelectImage(i, false); });
-        menu->addAction(tr("Existing image (&Write-protected)..."), [this, i]() { moSelectImage(i, true); });
+        menu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, Browse), tr("&Existing image..."), [this, i]() { moSelectImage(i, false); });
+        menu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, WriteProtectedBrowse), tr("Existing image (&Write-protected)..."), [this, i]() { moSelectImage(i, true); });
+        menu->addSeparator();
+        for (int slot = 0; slot < MAX_PREV_IMAGES; slot++) {
+            moImageHistoryPos[slot] = menu->children().count();
+            menu->addAction(img_icon, tr("Image %1").arg(slot), [this, i, slot]() { moReload(i, slot); })->setCheckable(false);
+        }
         menu->addSeparator();
         moEjectPos = menu->children().count();
-        menu->addAction(tr("E&ject"), [this, i]() { moEject(i); });
-        moReloadPos = menu->children().count();
-        menu->addAction(tr("&Reload previous image"), [this, i]() { moReload(i); });
+        menu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, Eject), tr("E&ject"), [this, i]() { moEject(i); });
         moMenus[i] = menu;
         moUpdateMenu(i);
     });
@@ -186,7 +235,7 @@ MediaMenu::refresh(QMenu *parentMenu)
         netMenus[i] = menu;
         nicUpdateMenu(i);
     });
-    parentMenu->addAction(tr("Clear image history"), [this]() { clearImageHistory(); });
+    parentMenu->addAction(tr("Clear image &history"), [this]() { clearImageHistory(); });
 }
 
 void
@@ -217,20 +266,38 @@ MediaMenu::cassetteSelectImage(bool wp)
         cassetteMount(filename, wp);
 }
 
+void
+MediaMenu::cassetteMenuSelect(int slot)
+{
+    QString filename = mhm.getImageForSlot(0, slot, ui::MediaType::Cassette);
+    cassetteMount(filename, 0);
+    cassetteUpdateMenu();
+    ui_sb_update_tip(SB_CASSETTE);
+}
+
 void
 MediaMenu::cassetteMount(const QString &filename, bool wp)
 {
+    auto previous_image = QFileInfo(cassette_fname);
     pc_cas_set_fname(cassette, nullptr);
     memset(cassette_fname, 0, sizeof(cassette_fname));
     cassette_ui_writeprot = wp ? 1 : 0;
 
     if (!filename.isEmpty()) {
         QByteArray filenameBytes = filename.toUtf8();
+
+        if (filename.left(5) == "wp://")
+            cassette_ui_writeprot = 1;
+        else if (cassette_ui_writeprot)
+            filenameBytes = QString::asprintf(R"(wp://%s)", filename.toUtf8().data()).toUtf8();
+
         strncpy(cassette_fname, filenameBytes.data(), sizeof(cassette_fname) - 1);
         pc_cas_set_fname(cassette, cassette_fname);
     }
 
     ui_sb_update_icon_state(SB_CASSETTE, filename.isEmpty() ? 1 : 0);
+    ui_sb_update_icon_wp(SB_CASSETTE, cassette_ui_writeprot);
+    mhm.addImageToHistory(0, ui::MediaType::Cassette, previous_image.filePath(), filename);
     cassetteUpdateMenu();
     ui_sb_update_tip(SB_CASSETTE);
     config_save();
@@ -239,6 +306,7 @@ MediaMenu::cassetteMount(const QString &filename, bool wp)
 void
 MediaMenu::cassetteEject()
 {
+    mhm.addImageToHistory(0, ui::MediaType::Cassette, cassette_fname, QString());
     pc_cas_set_fname(cassette, nullptr);
     memset(cassette_fname, 0, sizeof(cassette_fname));
     ui_sb_update_icon_state(SB_CASSETTE, 1);
@@ -250,8 +318,9 @@ MediaMenu::cassetteEject()
 void
 MediaMenu::cassetteUpdateMenu()
 {
-    QString name        = cassette_fname;
-    QString mode        = cassette_mode;
+    QString   name = cassette_fname;
+    QFileInfo fi(cassette_fname);
+    const QString mode  = cassette_mode;
     auto    childs      = cassetteMenu->children();
     auto   *recordMenu  = dynamic_cast<QAction *>(childs[cassetteRecordPos]);
     auto   *playMenu    = dynamic_cast<QAction *>(childs[cassettePlayPos]);
@@ -264,22 +333,30 @@ MediaMenu::cassetteUpdateMenu()
     rewindMenu->setEnabled(!name.isEmpty());
     fastFwdMenu->setEnabled(!name.isEmpty());
     ejectMenu->setEnabled(!name.isEmpty());
+    ejectMenu->setText(name.isEmpty() ? tr("E&ject") : tr("E&ject %1").arg(fi.fileName()));
 
-    bool isSaving = mode == QStringLiteral("save");
+    const bool isSaving = (mode == QStringLiteral("save"));
     recordMenu->setChecked(isSaving);
     playMenu->setChecked(!isSaving);
 
-    cassetteMenu->setTitle(QString::asprintf(tr("Cassette: %s").toUtf8().constData(), (name.isEmpty() ? tr("(empty)") : name).toUtf8().constData()));
+    cassetteMenu->setTitle(tr("C&assette: %1").arg(name.isEmpty() ? tr("(empty)") : name));
+    cassetteMenu->setToolTip(tr("Cassette: %1").arg(name.isEmpty() ? tr("(empty)") : name));
+
+    for (int slot = 0; slot < MAX_PREV_IMAGES; slot++) {
+        updateImageHistory(0, slot, ui::MediaType::Cassette);
+    }
 }
 
 void
 MediaMenu::cartridgeMount(int i, const QString &filename)
 {
+    auto previous_image = QFileInfo(cart_fns[i]);
     cart_close(i);
     QByteArray filenameBytes = filename.toUtf8();
     cart_load(i, filenameBytes.data());
 
     ui_sb_update_icon_state(SB_CARTRIDGE | i, filename.isEmpty() ? 1 : 0);
+    mhm.addImageToHistory(i, ui::MediaType::Cartridge, previous_image.filePath(), filename);
     cartridgeUpdateMenu(i);
     ui_sb_update_tip(SB_CARTRIDGE | i);
     config_save();
@@ -288,7 +365,7 @@ MediaMenu::cartridgeMount(int i, const QString &filename)
 void
 MediaMenu::cartridgeSelectImage(int i)
 {
-    auto filename = QFileDialog::getOpenFileName(
+    const auto filename = QFileDialog::getOpenFileName(
         parentWidget,
         QString(),
         getMediaOpenDirectory(),
@@ -300,9 +377,19 @@ MediaMenu::cartridgeSelectImage(int i)
     cartridgeMount(i, filename);
 }
 
+void
+MediaMenu::cartridgeMenuSelect(int index, int slot)
+{
+    QString filename = mhm.getImageForSlot(index, slot, ui::MediaType::Cartridge);
+    cartridgeMount(index, filename);
+    cartridgeUpdateMenu(index);
+    ui_sb_update_tip(SB_CARTRIDGE | index);
+}
+
 void
 MediaMenu::cartridgeEject(int i)
 {
+    mhm.addImageToHistory(i, ui::MediaType::Cartridge, cart_fns[i], QString());
     cart_close(i);
     ui_sb_update_icon_state(SB_CARTRIDGE | i, 1);
     cartridgeUpdateMenu(i);
@@ -313,13 +400,19 @@ MediaMenu::cartridgeEject(int i)
 void
 MediaMenu::cartridgeUpdateMenu(int i)
 {
-    QString name      = cart_fns[i];
+    const QString name = cart_fns[i];
+    QFileInfo     fi(cart_fns[i]);
     auto   *menu      = cartridgeMenus[i];
     auto    childs    = menu->children();
     auto   *ejectMenu = dynamic_cast<QAction *>(childs[cartridgeEjectPos]);
     ejectMenu->setEnabled(!name.isEmpty());
-    // menu->setTitle(tr("Cartridge %1: %2").arg(QString::number(i+1), name.isEmpty() ? tr("(empty)") : name));
-    menu->setTitle(QString::asprintf(tr("Cartridge %i: %ls").toUtf8().constData(), i + 1, name.isEmpty() ? tr("(empty)").toStdU16String().data() : name.toStdU16String().data()));
+    ejectMenu->setText(name.isEmpty() ? tr("E&ject") : tr("E&ject %1").arg(fi.fileName()));
+    menu->setTitle(tr("Car&tridge %1: %2").arg(QString::number(i + 1), name.isEmpty() ? tr("(empty)") : name));
+    menu->setToolTip(tr("Cartridge %1: %2").arg(QString::number(i + 1), name.isEmpty() ? tr("(empty)") : name));
+
+    for (int slot = 0; slot < MAX_PREV_IMAGES; slot++) {
+        updateImageHistory(i, slot, ui::MediaType::Cartridge);
+    }
 }
 
 void
@@ -327,8 +420,10 @@ MediaMenu::floppyNewImage(int i)
 {
     NewFloppyDialog dialog(NewFloppyDialog::MediaType::Floppy, parentWidget);
     switch (dialog.exec()) {
+        default:
+            break;
         case QDialog::Accepted:
-            QByteArray filename = dialog.fileName().toUtf8();
+            const QByteArray filename = dialog.fileName().toUtf8();
             floppyMount(i, filename, false);
             break;
     }
@@ -365,10 +460,18 @@ MediaMenu::floppyMount(int i, const QString &filename, bool wp)
     ui_writeprot[i] = wp ? 1 : 0;
     if (!filename.isEmpty()) {
         QByteArray filenameBytes = filename.toUtf8();
+
+        if (filename.left(5) == "wp://")
+            ui_writeprot[i] = 1;
+        else if (ui_writeprot[i])
+            filenameBytes = QString::asprintf(R"(wp://%s)", filename.toUtf8().data()).toUtf8();
+
         fdd_load(i, filenameBytes.data());
-    }
+        mhm.addImageToHistory(i, ui::MediaType::Floppy, previous_image.filePath(), QString(filenameBytes));
+    } else
+        mhm.addImageToHistory(i, ui::MediaType::Floppy, previous_image.filePath(), filename);
     ui_sb_update_icon_state(SB_FLOPPY | i, filename.isEmpty() ? 1 : 0);
-    mhm.addImageToHistory(i, ui::MediaType::Floppy, previous_image.filePath(), filename);
+    ui_sb_update_icon_wp(SB_FLOPPY | i, ui_writeprot[i]);
     floppyUpdateMenu(i);
     ui_sb_update_tip(SB_FLOPPY | i);
     config_save();
@@ -414,7 +517,7 @@ MediaMenu::floppyUpdateMenu(int i)
     auto *ejectMenu  = dynamic_cast<QAction *>(childs[floppyEjectPos]);
     auto *exportMenu = dynamic_cast<QAction *>(childs[floppyExportPos]);
     ejectMenu->setEnabled(!name.isEmpty());
-    ejectMenu->setText(QString::asprintf(tr("Eject %s").toUtf8().constData(), name.isEmpty() ? QString().toUtf8().constData() : fi.fileName().toUtf8().constData()));
+    ejectMenu->setText(name.isEmpty() ? tr("E&ject") : tr("E&ject %1").arg(fi.fileName()));
     exportMenu->setEnabled(!name.isEmpty());
 
     for (int slot = 0; slot < MAX_PREV_IMAGES; slot++) {
@@ -422,15 +525,16 @@ MediaMenu::floppyUpdateMenu(int i)
     }
 
     int type = fdd_get_type(i);
-    // floppyMenus[i]->setTitle(tr("Floppy %1 (%2): %3").arg(QString::number(i+1), fdd_getname(type), name.isEmpty() ? tr("(empty)") : name));
-    floppyMenus[i]->setTitle(QString::asprintf(tr("Floppy %i (%s): %ls").toUtf8().constData(), i + 1, fdd_getname(type), name.isEmpty() ? tr("(empty)").toStdU16String().data() : name.toStdU16String().data()));
+    floppyMenus[i]->setTitle(tr("&Floppy %1 (%2): %3").arg(QString::number(i + 1), fdd_getname(type), name.isEmpty() ? tr("(empty)") : name));
+    floppyMenus[i]->setToolTip(tr("Floppy %1 (%2): %3").arg(QString::number(i + 1), fdd_getname(type), name.isEmpty() ? tr("(empty)") : name));
+
 }
 
 void
 MediaMenu::floppyMenuSelect(int index, int slot)
 {
     QString filename = mhm.getImageForSlot(index, slot, ui::MediaType::Floppy);
-    floppyMount(index, filename.toUtf8().constData(), false);
+    floppyMount(index, filename, false);
     floppyUpdateMenu(index);
     ui_sb_update_tip(SB_FLOPPY | index);
 }
@@ -447,58 +551,59 @@ MediaMenu::cdromMute(int i)
 void
 MediaMenu::cdromMount(int i, const QString &filename)
 {
-    QByteArray fn = filename.toUtf8().data();
+    QByteArray fn        = filename.toUtf8().data();
+    int        was_empty = cdrom_is_empty(i);
 
-    cdrom[i].prev_host_drive = cdrom[i].host_drive;
-    strcpy(cdrom[i].prev_image_path, cdrom[i].image_path);
-    if (cdrom[i].ops && cdrom[i].ops->exit)
-        cdrom[i].ops->exit(&(cdrom[i]));
+    cdrom_exit(i);
 
-    cdrom[i].ops = nullptr;
     memset(cdrom[i].image_path, 0, sizeof(cdrom[i].image_path));
-#ifdef _WIN32
-    if ((fn.data() != NULL) && (strlen(fn.data()) >= 1) && (fn.data()[strlen(fn.data()) - 1] == '/'))
+#ifdef Q_OS_WINDOWS
+    if ((fn.data() != nullptr) && (strlen(fn.data()) >= 1) && (fn.data()[strlen(fn.data()) - 1] == '/'))
         fn.data()[strlen(fn.data()) - 1] = '\\';
 #else
     if ((fn.data() != NULL) && (strlen(fn.data()) >= 1) && (fn.data()[strlen(fn.data()) - 1] == '\\'))
         fn.data()[strlen(fn.data()) - 1] = '/';
 #endif
-    cdrom_image_open(&(cdrom[i]), fn.data());
+    cdrom_load(&(cdrom[i]), fn.data(), 1);
+
     /* Signal media change to the emulated machine. */
-    if (cdrom[i].insert)
+    if (cdrom[i].insert) {
         cdrom[i].insert(cdrom[i].priv);
-    cdrom[i].host_drive = (strlen(cdrom[i].image_path) == 0) ? 0 : 200;
-    if (cdrom[i].host_drive == 200) {
-        ui_sb_update_icon_state(SB_CDROM | i, 0);
-    } else {
-        ui_sb_update_icon_state(SB_CDROM | i, 1);
+
+        /* The drive was previously empty, transition directly to UNIT ATTENTION. */
+        if (was_empty)
+            cdrom[i].insert(cdrom[i].priv);
     }
+
+    if (strlen(cdrom[i].image_path) > 0)
+        ui_sb_update_icon_state(SB_CDROM | i, 0);
+    else
+        ui_sb_update_icon_state(SB_CDROM | i, 1);
     mhm.addImageToHistory(i, ui::MediaType::Optical, cdrom[i].prev_image_path, cdrom[i].image_path);
+
     cdromUpdateMenu(i);
     ui_sb_update_tip(SB_CDROM | i);
     config_save();
 }
 
 void
-MediaMenu::cdromMount(int i, int dir)
+MediaMenu::cdromMount(int i, int dir, const QString &arg)
 {
     QString   filename;
     QFileInfo fi(cdrom[i].image_path);
 
-    if (dir) {
-        filename = QFileDialog::getExistingDirectory(
-            parentWidget);
-    } else {
-        filename = QFileDialog::getOpenFileName(
-            parentWidget,
-            QString(),
-            QString(),
-            tr("CD-ROM images") % util::DlgFilter({ "iso", "cue" }) % tr("All files") % util::DlgFilter({ "*" }, true));
+    if (dir > 1)
+        filename = QString::asprintf(R"(ioctl://%s)", arg.toUtf8().data());
+    else if (dir == 1)
+        filename = QFileDialog::getExistingDirectory(parentWidget);
+    else {
+        filename = QFileDialog::getOpenFileName(parentWidget, QString(),
+                                                QString(),
+            tr("CD-ROM images") % util::DlgFilter({ "iso", "cue", "mds" }) % tr("All files") % util::DlgFilter({ "*" }, true));
     }
 
-    if (filename.isEmpty()) {
+    if (filename.isEmpty())
         return;
-    }
 
     cdromMount(i, filename);
 }
@@ -515,12 +620,29 @@ MediaMenu::cdromEject(int i)
 void
 MediaMenu::cdromReload(int index, int slot)
 {
-    QString filename = mhm.getImageForSlot(index, slot, ui::MediaType::Optical);
-    cdromMount(index, filename.toUtf8().constData());
+    const QString filename = mhm.getImageForSlot(index, slot, ui::MediaType::Optical);
+    cdromMount(index, filename);
     cdromUpdateMenu(index);
     ui_sb_update_tip(SB_CDROM | index);
 }
 
+void
+MediaMenu::cdromUpdateUi(int i)
+{
+    cdrom_t *drv = &cdrom[i];
+
+    if (strlen(cdrom[i].image_path) == 0) {
+        mhm.addImageToHistory(i, ui::MediaType::Optical, drv->prev_image_path, QString());
+        ui_sb_update_icon_state(SB_CDROM | i, 1);
+    } else {
+        mhm.addImageToHistory(i, ui::MediaType::Optical, drv->prev_image_path, drv->image_path);
+        ui_sb_update_icon_state(SB_CDROM | i, 0);
+    }
+
+    cdromUpdateMenu(i);
+    ui_sb_update_tip(SB_CDROM | i);
+}
+
 void
 MediaMenu::updateImageHistory(int index, int slot, ui::MediaType type)
 {
@@ -529,17 +651,41 @@ MediaMenu::updateImageHistory(int index, int slot, ui::MediaType type)
     QObjectList children;
     QFileInfo   fi;
     QIcon       menu_icon;
+    const auto fn         = mhm.getImageForSlot(index, slot, type);
+
+    QString menu_item_name;
 
     switch (type) {
-        case ui::MediaType::Optical:
-            if (!cdromMenus.contains(index))
+        default:
+            menu_item_name = fi.fileName().isEmpty() ? tr("Reload previous image") : fn;
+            return;
+        case ui::MediaType::Cassette:
+            if (!MachineStatus::hasCassette())
                 return;
-            menu                  = cdromMenus[index];
+            menu                  = cassetteMenu;
             children              = menu->children();
-            imageHistoryUpdatePos = dynamic_cast<QAction *>(children[cdromImageHistoryPos[slot]]);
-            fi.setFile(mhm.getImageForSlot(index, slot, type));
-            menu_icon = fi.isDir() ? QApplication::style()->standardIcon(QStyle::SP_DirIcon) : ProgSettings::loadIcon("/cdrom.ico");
-            imageHistoryUpdatePos->setIcon(menu_icon);
+            imageHistoryUpdatePos = dynamic_cast<QAction *>(children[cassetteImageHistoryPos[slot]]);
+            menu_icon             = QIcon(":/settings/qt/icons/cassette_image.ico");
+            if (fn.left(5) == "wp://")
+                fi.setFile(fn.right(fn.length() - 5));
+            else
+                fi.setFile(fn);
+            if (!fi.fileName().isEmpty() && (fn.left(5) == "wp://")) {
+                menu_item_name = fi.fileName().isEmpty() ? tr("Reload previous image") : fn.right(fn.length() - 5);
+                imageHistoryUpdatePos->setIcon(getIconWithIndicator(menu_icon, pixmap_size, QIcon::Normal, WriteProtected));
+            } else {
+                menu_item_name = fi.fileName().isEmpty() ? tr("Reload previous image") : fn;
+                imageHistoryUpdatePos->setIcon(menu_icon);
+            }
+            break;
+        case ui::MediaType::Cartridge:
+            if (!machine_has_cartridge(machine))
+                return;
+            menu                  = cartridgeMenus[index];
+            children              = menu->children();
+            imageHistoryUpdatePos = dynamic_cast<QAction *>(children[cartridgeImageHistoryPos[slot]]);
+            fi.setFile(fn);
+            menu_item_name = fi.fileName().isEmpty() ? tr("Reload previous image") : fn;
             break;
         case ui::MediaType::Floppy:
             if (!floppyMenus.contains(index))
@@ -547,17 +693,91 @@ MediaMenu::updateImageHistory(int index, int slot, ui::MediaType type)
             menu                  = floppyMenus[index];
             children              = menu->children();
             imageHistoryUpdatePos = dynamic_cast<QAction *>(children[floppyImageHistoryPos[slot]]);
-            fi.setFile(mhm.getImageForSlot(index, slot, type));
+            menu_icon             = fdd_is_525(index) ? QIcon(":/settings/qt/icons/floppy_525_image.ico") :
+                                                        QIcon(":/settings/qt/icons/floppy_35_image.ico");
+            if (fn.left(5) == "wp://")
+                fi.setFile(fn.right(fn.length() - 5));
+            else
+                fi.setFile(fn);
+            if (!fi.fileName().isEmpty() && (fn.left(5) == "wp://")) {
+                menu_item_name = fi.fileName().isEmpty() ? tr("Reload previous image") : fn.right(fn.length() - 5);
+                imageHistoryUpdatePos->setIcon(getIconWithIndicator(menu_icon, pixmap_size, QIcon::Normal, WriteProtected));
+            } else {
+                menu_item_name = fi.fileName().isEmpty() ? tr("Reload previous image") : fn;
+                imageHistoryUpdatePos->setIcon(menu_icon);
+            }
+            break;
+        case ui::MediaType::Optical:
+            if (!cdromMenus.contains(index))
+                return;
+            menu                  = cdromMenus[index];
+            children              = menu->children();
+            imageHistoryUpdatePos = dynamic_cast<QAction *>(children[cdromImageHistoryPos[slot]]);
+            if (fn.left(8) == "ioctl://") {
+                menu_icon = QIcon(":/settings/qt/icons/cdrom_host.ico");
+#ifdef Q_OS_WINDOWS
+                menu_item_name = tr("Host CD/DVD Drive (%1)").arg(fn.right(2));
+#else
+                menu_item_name = tr("Host CD/DVD Drive (%1)").arg(fn.right(fn.length() - 8));
+#endif
+            } else {
+                fi.setFile(fn);
+                menu_icon = fi.isDir() ? QIcon(":/settings/qt/icons/cdrom_folder.ico") : QIcon(":/settings/qt/icons/cdrom_image.ico");
+                menu_item_name = fn.isEmpty() ? tr("Reload previous image") : fn;
+            }
+            imageHistoryUpdatePos->setIcon(menu_icon);
+            break;
+        case ui::MediaType::RDisk:
+            if (!rdiskMenus.contains(index))
+                return;
+            menu                  = rdiskMenus[index];
+            children              = menu->children();
+            imageHistoryUpdatePos = dynamic_cast<QAction *>(children[rdiskImageHistoryPos[slot]]);
+            menu_icon             = QIcon(":/settings/qt/icons/mo_image.ico");
+            if (fn.left(5) == "wp://")
+                fi.setFile(fn.right(fn.length() - 5));
+            else
+                fi.setFile(fn);
+            if (!fi.fileName().isEmpty() && (fn.left(5) == "wp://")) {
+                menu_item_name = fi.fileName().isEmpty() ? tr("Reload previous image") : fn.right(fn.length() - 5);
+                imageHistoryUpdatePos->setIcon(getIconWithIndicator(menu_icon, pixmap_size, QIcon::Normal, WriteProtected));
+            } else {
+                menu_item_name = fi.fileName().isEmpty() ? tr("Reload previous image") : fn;
+                imageHistoryUpdatePos->setIcon(menu_icon);
+            }
+            break;
+        case ui::MediaType::Mo:
+            if (!moMenus.contains(index))
+                return;
+            menu                  = moMenus[index];
+            children              = menu->children();
+            imageHistoryUpdatePos = dynamic_cast<QAction *>(children[moImageHistoryPos[slot]]);
+            menu_icon             = QIcon(":/settings/qt/icons/mo_image.ico");
+            if (fn.left(5) == "wp://")
+                fi.setFile(fn.right(fn.length() - 5));
+            else
+                fi.setFile(fn);
+            if (!fi.fileName().isEmpty() && (fn.left(5) == "wp://")) {
+                menu_item_name = fi.fileName().isEmpty() ? tr("Reload previous image") : fn.right(fn.length() - 5);
+                imageHistoryUpdatePos->setIcon(getIconWithIndicator(menu_icon, pixmap_size, QIcon::Normal, WriteProtected));
+            } else {
+                menu_item_name = fi.fileName().isEmpty() ? tr("Reload previous image") : fn;
+                imageHistoryUpdatePos->setIcon(menu_icon);
+            }
             break;
-        default:
-            pclog("History not yet implemented for media type %s\n", qPrintable(mhm.mediaTypeToString(type)));
-            return;
     }
 
-    QString menu_item_name = fi.fileName().isEmpty() ? tr("previous image").toUtf8().constData() : fi.fileName().toUtf8().constData();
-    imageHistoryUpdatePos->setText(QString::asprintf(tr("%s").toUtf8().constData(), menu_item_name.toUtf8().constData()));
-    imageHistoryUpdatePos->setVisible(!fi.fileName().isEmpty());
-    imageHistoryUpdatePos->setVisible(fi.exists());
+#ifndef Q_OS_MACOS
+    if ((slot >= 0) && (slot <= 9))
+        imageHistoryUpdatePos->setText(menu_item_name.prepend("&%1 ").arg((slot == 9) ? 0 : (slot + 1)));
+    else
+#endif
+    imageHistoryUpdatePos->setText(menu_item_name);
+
+    if (fn.left(8) == "ioctl://")
+        imageHistoryUpdatePos->setVisible(true);
+    else
+        imageHistoryUpdatePos->setVisible(!fn.isEmpty() && fi.exists());
 }
 
 void
@@ -570,8 +790,9 @@ MediaMenu::clearImageHistory()
 void
 MediaMenu::cdromUpdateMenu(int i)
 {
-    QString   name = cdrom[i].image_path;
-    QFileInfo fi(cdrom[i].image_path);
+    QString   name   = cdrom[i].image_path;
+    QString   name2;
+    QIcon     menu_icon;
 
     if (!cdromMenus.contains(i))
         return;
@@ -579,145 +800,233 @@ MediaMenu::cdromUpdateMenu(int i)
     auto  childs = menu->children();
 
     auto *muteMenu = dynamic_cast<QAction *>(childs[cdromMutePos]);
-    muteMenu->setIcon(QApplication::style()->standardIcon((cdrom[i].sound_on == 0) ? QStyle::SP_MediaVolume : QStyle::SP_MediaVolumeMuted));
+    muteMenu->setIcon(QIcon((cdrom[i].sound_on == 0) ? ":/settings/qt/icons/cdrom_unmute.ico" : ":/settings/qt/icons/cdrom_mute.ico"));
     muteMenu->setText((cdrom[i].sound_on == 0) ? tr("&Unmute") : tr("&Mute"));
 
-    auto *imageMenu = dynamic_cast<QAction *>(childs[cdromImagePos]);
-    imageMenu->setEnabled(!name.isEmpty());
-    QString menu_item_name = name.isEmpty() ? QString().toUtf8().constData() : fi.fileName().toUtf8().constData();
-    auto    menu_icon      = fi.isDir() ? QApplication::style()->standardIcon(QStyle::SP_DirIcon) : ProgSettings::loadIcon("/cdrom.ico");
-    imageMenu->setIcon(menu_icon);
-    imageMenu->setText(QString::asprintf(tr("Eject %s").toUtf8().constData(), menu_item_name.toUtf8().constData()));
+    auto *ejectMenu = dynamic_cast<QAction *>(childs[cdromEjectPos]);
+    ejectMenu->setEnabled(!name.isEmpty());
+    QString menu_item_name;
+    if (name.left(8) == "ioctl://") {
+#ifdef Q_OS_WINDOWS
+        menu_item_name = tr("Host CD/DVD Drive (%1)").arg(name.right(2));
+#else
+        menu_item_name = tr("Host CD/DVD Drive (%1)").arg(name.right(name.length() - 8));
+#endif
+        name2          = menu_item_name;
+        menu_icon      = QIcon(":/settings/qt/icons/cdrom_host.ico");
+    } else {
+        QFileInfo fi(cdrom[i].image_path);
 
-    for (int slot = 0; slot < MAX_PREV_IMAGES; slot++) {
-        updateImageHistory(i, slot, ui::MediaType::Optical);
+        menu_item_name = name.isEmpty() ? QString() : fi.fileName();
+        name2          = name;
+        if (name.isEmpty())
+            menu_icon      = QIcon(":/settings/qt/icons/cdrom.ico");
+        else
+            menu_icon      = fi.isDir() ? QIcon(":/settings/qt/icons/cdrom_folder.ico") : QIcon(":/settings/qt/icons/cdrom_image.ico");
     }
+    ejectMenu->setIcon(getIconWithIndicator(menu_icon, pixmap_size, QIcon::Normal, Eject));
+    ejectMenu->setText(name.isEmpty() ? tr("E&ject") : tr("E&ject %1").arg(menu_item_name));
+
+    for (int slot = 0; slot < MAX_PREV_IMAGES; slot++)
+        updateImageHistory(i, slot, ui::MediaType::Optical);
 
     QString busName = tr("Unknown Bus");
     switch (cdrom[i].bus_type) {
+        default:
+            break;
         case CDROM_BUS_ATAPI:
             busName = "ATAPI";
             break;
         case CDROM_BUS_SCSI:
             busName = "SCSI";
             break;
-	    case CDROM_BUS_MITSUMI:
-	        busName = "Mitsumi";
-	        break;
+        case CDROM_BUS_MITSUMI:
+            busName = "Mitsumi";
+            break;
+        case CDROM_BUS_MKE:
+            busName = "Panasonic/MKE";
+            break;
     }
 
-    // menu->setTitle(tr("CD-ROM %1 (%2): %3").arg(QString::number(i+1), busName, name.isEmpty() ? tr("(empty)") : name));
-    menu->setTitle(QString::asprintf(tr("CD-ROM %i (%s): %s").toUtf8().constData(), i + 1, busName.toUtf8().data(), name.isEmpty() ? tr("(empty)").toUtf8().data() : name.toUtf8().data()));
+    menu->setTitle(tr("&CD-ROM %1 (%2): %3").arg(QString::number(i+1), busName, name.isEmpty() ? tr("(empty)") : name2));
+    menu->setToolTip(tr("CD-ROM %1 (%2): %3").arg(QString::number(i+1), busName, name.isEmpty() ? tr("(empty)") : name2));
 }
 
 void
-MediaMenu::zipNewImage(int i)
+MediaMenu::rdiskNewImage(int i)
 {
-    NewFloppyDialog dialog(NewFloppyDialog::MediaType::Zip, parentWidget);
+    NewFloppyDialog dialog(NewFloppyDialog::MediaType::RDisk, parentWidget);
     switch (dialog.exec()) {
+        default:
+            break;
         case QDialog::Accepted:
             QByteArray filename = dialog.fileName().toUtf8();
-            zipMount(i, filename, false);
+            rdiskMount(i, filename, false);
             break;
     }
 }
 
 void
-MediaMenu::zipSelectImage(int i, bool wp)
+MediaMenu::rdiskSelectImage(int i, bool wp)
 {
-    auto filename = QFileDialog::getOpenFileName(
+    const auto filename = QFileDialog::getOpenFileName(
         parentWidget,
         QString(),
         QString(),
-        tr("ZIP images") % util::DlgFilter({ "im?", "zdi" }) % tr("All files") % util::DlgFilter({ "*" }, true));
+        tr("Removable disk images") % util::DlgFilter({ "im?", "rdi", "zdi" }) % tr("All files") % util::DlgFilter({ "*" }, true));
 
     if (!filename.isEmpty())
-        zipMount(i, filename, wp);
+        rdiskMount(i, filename, wp);
 }
 
 void
-MediaMenu::zipMount(int i, const QString &filename, bool wp)
+MediaMenu::rdiskMount(int i, const QString &filename, bool wp)
 {
-    zip_t *dev = (zip_t *) zip_drives[i].priv;
+    const auto dev       = static_cast<rdisk_t *>(rdisk_drives[i].priv);
+    int        was_empty = rdisk_is_empty(i);
 
-    zip_disk_close(dev);
-    zip_drives[i].read_only = wp;
+    rdisk_disk_close(dev);
+    rdisk_drives[i].read_only = wp;
     if (!filename.isEmpty()) {
         QByteArray filenameBytes = filename.toUtf8();
-        zip_load(dev, filenameBytes.data());
-        zip_insert(dev);
-    }
 
-    ui_sb_update_icon_state(SB_ZIP | i, filename.isEmpty() ? 1 : 0);
-    zipUpdateMenu(i);
-    ui_sb_update_tip(SB_ZIP | i);
+        if (filename.left(5) == "wp://")
+            rdisk_drives[i].read_only = 1;
+        else if (rdisk_drives[i].read_only)
+            filenameBytes = QString::asprintf(R"(wp://%s)", filename.toUtf8().data()).toUtf8();
+
+        rdisk_load(dev, filenameBytes.data(), 1);
+
+        /* Signal media change to the emulated machine. */
+        rdisk_insert(dev);
+
+        /* The drive was previously empty, transition directly to UNIT ATTENTION. */
+        if (was_empty)
+            rdisk_insert(dev);
+    }
+    mhm.addImageToHistory(i, ui::MediaType::RDisk, rdisk_drives[i].prev_image_path, rdisk_drives[i].image_path);
+
+    ui_sb_update_icon_state(SB_RDISK | i, filename.isEmpty() ? 1 : 0);
+    ui_sb_update_icon_wp(SB_RDISK | i, wp);
+    rdiskUpdateMenu(i);
+    ui_sb_update_tip(SB_RDISK | i);
 
     config_save();
 }
 
 void
-MediaMenu::zipEject(int i)
+MediaMenu::rdiskEject(int i)
 {
-    zip_t *dev = (zip_t *) zip_drives[i].priv;
+    const auto dev = static_cast<rdisk_t *>(rdisk_drives[i].priv);
 
-    zip_disk_close(dev);
-    zip_drives[i].image_path[0] = 0;
-    if (zip_drives[i].bus_type) {
+    mhm.addImageToHistory(i, ui::MediaType::RDisk, rdisk_drives[i].image_path, QString());
+    rdisk_disk_close(dev);
+    rdisk_drives[i].image_path[0] = 0;
+    if (rdisk_drives[i].bus_type) {
         /* Signal disk change to the emulated machine. */
-        zip_insert(dev);
+        rdisk_insert(dev);
     }
 
-    ui_sb_update_icon_state(SB_ZIP | i, 1);
-    zipUpdateMenu(i);
-    ui_sb_update_tip(SB_ZIP | i);
+    ui_sb_update_icon_state(SB_RDISK | i, 1);
+    rdiskUpdateMenu(i);
+    ui_sb_update_tip(SB_RDISK | i);
     config_save();
 }
 
 void
-MediaMenu::zipReload(int i)
+MediaMenu::rdiskReloadPrev(int i)
 {
-    zip_t *dev = (zip_t *) zip_drives[i].priv;
+    const auto dev = static_cast<rdisk_t *>(rdisk_drives[i].priv);
 
-    zip_disk_reload(dev);
-    if (strlen(zip_drives[i].image_path) == 0) {
-        ui_sb_update_icon_state(SB_ZIP | i, 1);
+    rdisk_disk_reload(dev);
+    if (strlen(rdisk_drives[i].image_path) == 0) {
+        ui_sb_update_icon_state(SB_RDISK | i, 1);
     } else {
-        ui_sb_update_icon_state(SB_ZIP | i, 0);
+        ui_sb_update_icon_state(SB_RDISK | i, 0);
     }
+    ui_sb_update_icon_wp(SB_RDISK | i, rdisk_drives[i].read_only);
 
-    zipUpdateMenu(i);
-    ui_sb_update_tip(SB_ZIP | i);
+    rdiskUpdateMenu(i);
+    ui_sb_update_tip(SB_RDISK | i);
 
     config_save();
 }
 
 void
-MediaMenu::zipUpdateMenu(int i)
+MediaMenu::rdiskReload(int index, int slot)
 {
-    QString name      = zip_drives[i].image_path;
-    QString prev_name = zip_drives[i].prev_image_path;
-    if (!zipMenus.contains(i))
+    const QString filename = mhm.getImageForSlot(index, slot, ui::MediaType::RDisk);
+    rdiskMount(index, filename, rdisk_drives[index].read_only);
+    rdiskUpdateMenu(index);
+    ui_sb_update_tip(SB_RDISK | index);
+}
+
+void
+MediaMenu::moUpdateMenu(int i)
+{
+    QString   name      = mo_drives[i].image_path;
+    QString   prev_name = mo_drives[i].prev_image_path;
+    QFileInfo fi(mo_drives[i].image_path);
+    if (!moMenus.contains(i))
         return;
-    auto *menu   = zipMenus[i];
+    auto *menu   = moMenus[i];
     auto  childs = menu->children();
 
-    auto *ejectMenu  = dynamic_cast<QAction *>(childs[zipEjectPos]);
-    auto *reloadMenu = dynamic_cast<QAction *>(childs[zipReloadPos]);
+    auto *ejectMenu  = dynamic_cast<QAction *>(childs[moEjectPos]);
     ejectMenu->setEnabled(!name.isEmpty());
-    reloadMenu->setEnabled(!prev_name.isEmpty());
+    ejectMenu->setText(name.isEmpty() ? tr("E&ject") : tr("E&ject %1").arg(fi.fileName()));
 
     QString busName = tr("Unknown Bus");
-    switch (zip_drives[i].bus_type) {
-        case ZIP_BUS_ATAPI:
+    switch (mo_drives[i].bus_type) {
+        default:
+            break;
+        case MO_BUS_ATAPI:
             busName = "ATAPI";
             break;
-        case ZIP_BUS_SCSI:
+        case MO_BUS_SCSI:
             busName = "SCSI";
             break;
     }
 
-    // menu->setTitle(tr("ZIP %1 %2 (%3): %4").arg((zip_drives[i].is_250 > 0) ? "250" : "100", QString::number(i+1), busName, name.isEmpty() ? tr("(empty)") : name));
-    menu->setTitle(QString::asprintf(tr("ZIP %03i %i (%s): %ls").toUtf8().constData(), (zip_drives[i].is_250 > 0) ? 250 : 100, i + 1, busName.toUtf8().data(), name.isEmpty() ? tr("(empty)").toStdU16String().data() : name.toStdU16String().data()));
+    menu->setTitle(tr("&MO %1 (%2): %3").arg(QString::number(i + 1), busName, name.isEmpty() ? tr("(empty)") : name));
+    menu->setToolTip(tr("MO %1 (%2): %3").arg(QString::number(i + 1), busName, name.isEmpty() ? tr("(empty)") : name));
+
+    for (int slot = 0; slot < MAX_PREV_IMAGES; slot++)
+        updateImageHistory(i, slot, ui::MediaType::Mo);
+}
+
+void
+MediaMenu::rdiskUpdateMenu(int i)
+{
+    const QString name      = rdisk_drives[i].image_path;
+    const QString prev_name = rdisk_drives[i].prev_image_path;
+    QFileInfo     fi(rdisk_drives[i].image_path);
+    if (!rdiskMenus.contains(i))
+        return;
+    auto *menu   = rdiskMenus[i];
+    auto  childs = menu->children();
+
+    auto *ejectMenu  = dynamic_cast<QAction *>(childs[rdiskEjectPos]);
+    ejectMenu->setEnabled(!name.isEmpty());
+    ejectMenu->setText(name.isEmpty() ? tr("E&ject") : tr("E&ject %1").arg(fi.fileName()));
+
+    QString busName = tr("Unknown Bus");
+    switch (rdisk_drives[i].bus_type) {
+        default:
+            break;
+        case RDISK_BUS_ATAPI:
+            busName = "ATAPI";
+            break;
+        case RDISK_BUS_SCSI:
+            busName = "SCSI";
+            break;
+    }
+
+    menu->setTitle(tr("&Removable disk %1 (%2): %3").arg(QString::number(i + 1), busName, name.isEmpty() ? tr("(empty)") : name));
+    menu->setToolTip(tr("Removable disk %1 (%2): %3").arg(QString::number(i + 1), busName, name.isEmpty() ? tr("(empty)") : name));
+
+    for (int slot = 0; slot < MAX_PREV_IMAGES; slot++)
+        updateImageHistory(i, slot, ui::MediaType::RDisk);
 }
 
 void
@@ -725,6 +1034,8 @@ MediaMenu::moNewImage(int i)
 {
     NewFloppyDialog dialog(NewFloppyDialog::MediaType::Mo, parentWidget);
     switch (dialog.exec()) {
+        default:
+            break;
         case QDialog::Accepted:
             QByteArray filename = dialog.fileName().toUtf8();
             moMount(i, filename, false);
@@ -735,7 +1046,7 @@ MediaMenu::moNewImage(int i)
 void
 MediaMenu::moSelectImage(int i, bool wp)
 {
-    auto filename = QFileDialog::getOpenFileName(
+    const auto filename = QFileDialog::getOpenFileName(
         parentWidget,
         QString(),
         getMediaOpenDirectory(),
@@ -751,15 +1062,29 @@ MediaMenu::moSelectImage(int i, bool wp)
 void
 MediaMenu::moMount(int i, const QString &filename, bool wp)
 {
-    mo_t *dev = (mo_t *) mo_drives[i].priv;
+    const auto dev       = static_cast<mo_t *>(mo_drives[i].priv);
+    int        was_empty = mo_is_empty(i);
 
     mo_disk_close(dev);
     mo_drives[i].read_only = wp;
     if (!filename.isEmpty()) {
         QByteArray filenameBytes = filename.toUtf8();
-        mo_load(dev, filenameBytes.data());
+
+        if (filename.left(5) == "wp://")
+            mo_drives[i].read_only = 1;
+        else if (mo_drives[i].read_only)
+            filenameBytes = QString::asprintf(R"(wp://%s)", filename.toUtf8().data()).toUtf8();
+
+        mo_load(dev, filenameBytes.data(), 1);
+
+        /* Signal media change to the emulated machine. */
         mo_insert(dev);
+
+        /* The drive was previously empty, transition directly to UNIT ATTENTION. */
+        if (was_empty)
+            mo_insert(dev);
     }
+    mhm.addImageToHistory(i, ui::MediaType::Mo, mo_drives[i].prev_image_path, mo_drives[i].image_path);
 
     ui_sb_update_icon_state(SB_MO | i, filename.isEmpty() ? 1 : 0);
     moUpdateMenu(i);
@@ -771,8 +1096,9 @@ MediaMenu::moMount(int i, const QString &filename, bool wp)
 void
 MediaMenu::moEject(int i)
 {
-    mo_t *dev = (mo_t *) mo_drives[i].priv;
+    const auto dev = static_cast<mo_t *>(mo_drives[i].priv);
 
+    mhm.addImageToHistory(i, ui::MediaType::Mo, mo_drives[i].image_path, QString());
     mo_disk_close(dev);
     mo_drives[i].image_path[0] = 0;
     if (mo_drives[i].bus_type) {
@@ -787,7 +1113,7 @@ MediaMenu::moEject(int i)
 }
 
 void
-MediaMenu::moReload(int i)
+MediaMenu::moReloadPrev(int i)
 {
     mo_t *dev = (mo_t *) mo_drives[i].priv;
 
@@ -797,6 +1123,7 @@ MediaMenu::moReload(int i)
     } else {
         ui_sb_update_icon_state(SB_MO | i, 0);
     }
+    ui_sb_update_icon_state(SB_MO | i, mo_drives[i].read_only);
 
     moUpdateMenu(i);
     ui_sb_update_tip(SB_MO | i);
@@ -805,31 +1132,12 @@ MediaMenu::moReload(int i)
 }
 
 void
-MediaMenu::moUpdateMenu(int i)
+MediaMenu::moReload(int index, int slot)
 {
-    QString name      = mo_drives[i].image_path;
-    QString prev_name = mo_drives[i].prev_image_path;
-    if (!moMenus.contains(i))
-        return;
-    auto *menu   = moMenus[i];
-    auto  childs = menu->children();
-
-    auto *ejectMenu  = dynamic_cast<QAction *>(childs[moEjectPos]);
-    auto *reloadMenu = dynamic_cast<QAction *>(childs[moReloadPos]);
-    ejectMenu->setEnabled(!name.isEmpty());
-    reloadMenu->setEnabled(!prev_name.isEmpty());
-
-    QString busName = tr("Unknown Bus");
-    switch (mo_drives[i].bus_type) {
-        case MO_BUS_ATAPI:
-            busName = "ATAPI";
-            break;
-        case MO_BUS_SCSI:
-            busName = "SCSI";
-            break;
-    }
-
-    menu->setTitle(QString::asprintf(tr("MO %i (%ls): %ls").toUtf8().constData(), i + 1, busName.toStdU16String().data(), name.isEmpty() ? tr("(empty)").toStdU16String().data() : name.toStdU16String().data()));
+    const QString filename = mhm.getImageForSlot(index, slot, ui::MediaType::Mo);
+    moMount(index, filename, false);
+    moUpdateMenu(index);
+    ui_sb_update_tip(SB_MO | index);
 }
 
 void
@@ -858,6 +1166,8 @@ MediaMenu::nicUpdateMenu(int i)
 
     QString netType = tr("Null Driver");
     switch (net_cards_conf[i].net_type) {
+        default:
+            break;
         case NET_TYPE_SLIRP:
             netType = "SLiRP";
             break;
@@ -867,6 +1177,15 @@ MediaMenu::nicUpdateMenu(int i)
         case NET_TYPE_VDE:
             netType = "VDE";
             break;
+        case NET_TYPE_TAP:
+            netType = "TAP";
+            break;
+        case NET_TYPE_NMSWITCH:
+            netType = "Local Switch";
+            break;
+        case NET_TYPE_NRSWITCH:
+            netType = "Remote Switch";
+            break;
     }
 
     QString devName = DeviceConfig::DeviceName(network_card_getdevice(net_cards_conf[i].device_num), network_card_get_internal_name(net_cards_conf[i].device_num), 1);
@@ -876,32 +1195,87 @@ MediaMenu::nicUpdateMenu(int i)
     auto *connectedAction = dynamic_cast<QAction *>(childs[netDisconnPos]);
     connectedAction->setChecked(network_is_connected(i));
 
-    menu->setTitle(QString::asprintf(tr("NIC %02i (%ls) %ls").toUtf8().constData(), i + 1, netType.toStdU16String().data(), devName.toStdU16String().data()));
+    menu->setTitle(tr("&NIC %1 (%2) %3").arg(QString::number(i + 1), netType, devName));
+    menu->setToolTip(tr("NIC %1 (%2) %3").arg(QString::number(i + 1), netType, devName));
 }
 
 QString
 MediaMenu::getMediaOpenDirectory()
 {
     QString openDirectory;
-    if (open_dir_usr_path > 0) {
+
+    if (open_dir_usr_path > 0)
         openDirectory = QString::fromUtf8(usr_path);
-    }
+
     return openDirectory;
 }
 
 // callbacks from 86box C code
 extern "C" {
-
 void
-zip_eject(uint8_t id)
+cassette_mount(char *fn, uint8_t wp)
 {
-    MediaMenu::ptr->zipEject(id);
+    MediaMenu::ptr->cassetteMount(QString(fn), wp);
 }
 
 void
-zip_reload(uint8_t id)
+cassette_eject(void)
 {
-    MediaMenu::ptr->zipReload(id);
+    MediaMenu::ptr->cassetteEject();
+}
+
+void
+cartridge_mount(uint8_t id, char *fn, uint8_t wp)
+{
+    MediaMenu::ptr->cartridgeMount(id, QString(fn));
+}
+
+void
+cartridge_eject(uint8_t id)
+{
+    MediaMenu::ptr->cartridgeEject(id);
+}
+
+void
+floppy_mount(uint8_t id, char *fn, uint8_t wp)
+{
+    MediaMenu::ptr->floppyMount(id, QString(fn), wp);
+}
+
+void
+floppy_eject(uint8_t id)
+{
+    MediaMenu::ptr->floppyEject(id);
+}
+
+void
+cdrom_mount(uint8_t id, char *fn)
+{
+    MediaMenu::ptr->cdromMount(id, QString(fn));
+}
+
+void
+plat_cdrom_ui_update(uint8_t id, uint8_t reload)
+{
+    emit MediaMenu::ptr->onCdromUpdateUi(id);
+}
+
+void
+rdisk_eject(uint8_t id)
+{
+    MediaMenu::ptr->rdiskEject(id);
+}
+
+void
+rdisk_mount(uint8_t id, char *fn, uint8_t wp)
+{
+    MediaMenu::ptr->rdiskMount(id, QString(fn), wp);
+}
+
+void
+rdisk_reload(uint8_t id)
+{
+    MediaMenu::ptr->rdiskReloadPrev(id);
 }
 
 void
@@ -910,9 +1284,15 @@ mo_eject(uint8_t id)
     MediaMenu::ptr->moEject(id);
 }
 
+void
+mo_mount(uint8_t id, char *fn, uint8_t wp)
+{
+    MediaMenu::ptr->moMount(id, QString(fn), wp);
+}
+
 void
 mo_reload(uint8_t id)
 {
-    MediaMenu::ptr->moReload(id);
+    MediaMenu::ptr->moReloadPrev(id);
 }
 }
diff --git a/src/qt/qt_mediamenu.hpp b/src/qt/qt_mediamenu.hpp
index 57fd8dfc2..fb24d24e0 100644
--- a/src/qt/qt_mediamenu.hpp
+++ b/src/qt/qt_mediamenu.hpp
@@ -10,26 +10,28 @@ extern "C" {
 }
 class QMenu;
 
-class MediaMenu : QObject {
+class MediaMenu : public QObject {
     Q_OBJECT
 public:
     MediaMenu(QWidget *parent);
 
     void refresh(QMenu *parentMenu);
 
-    // because some 86box C-only code needs to call zip and
+    // because some 86box C-only code needs to call rdisk and
     // mo eject directly
     static std::shared_ptr<MediaMenu> ptr;
 
     void cassetteNewImage();
     void cassetteSelectImage(bool wp);
     void cassetteMount(const QString &filename, bool wp);
+    void cassetteMenuSelect(int slot);
     void cassetteEject();
     void cassetteUpdateMenu();
 
     void cartridgeSelectImage(int i);
     void cartridgeMount(int i, const QString &filename);
     void cartridgeEject(int i);
+    void cartridgeMenuSelect(int index, int slot);
     void cartridgeUpdateMenu(int i);
 
     void floppyNewImage(int i);
@@ -41,7 +43,7 @@ public:
     void floppyUpdateMenu(int i);
 
     void cdromMute(int i);
-    void cdromMount(int i, int dir);
+    void cdromMount(int i, int dir, const QString &arg);
     void cdromMount(int i, const QString &filename);
     void cdromEject(int i);
     void cdromReload(int index, int slot);
@@ -49,24 +51,32 @@ public:
     void clearImageHistory();
     void cdromUpdateMenu(int i);
 
-    void zipNewImage(int i);
-    void zipSelectImage(int i, bool wp);
-    void zipMount(int i, const QString &filename, bool wp);
-    void zipEject(int i);
-    void zipReload(int i);
-    void zipUpdateMenu(int i);
+    void rdiskNewImage(int i);
+    void rdiskSelectImage(int i, bool wp);
+    void rdiskMount(int i, const QString &filename, bool wp);
+    void rdiskEject(int i);
+    void rdiskReloadPrev(int i);
+    void rdiskReload(int index, int slot);
+    void rdiskUpdateMenu(int i);
 
     void moNewImage(int i);
     void moSelectImage(int i, bool wp);
     void moMount(int i, const QString &filename, bool wp);
     void moEject(int i);
-    void moReload(int i);
+    void moReloadPrev(int i);
+    void moReload(int index, int slot);
     void moUpdateMenu(int i);
 
     void nicConnect(int i);
     void nicDisconnect(int i);
     void nicUpdateMenu(int i);
 
+public slots:
+    void cdromUpdateUi(int i);
+
+signals:
+    void onCdromUpdateUi(int i);
+
 private:
     QWidget *parentWidget = nullptr;
 
@@ -74,36 +84,38 @@ private:
     QMap<int, QMenu *> cartridgeMenus;
     QMap<int, QMenu *> floppyMenus;
     QMap<int, QMenu *> cdromMenus;
-    QMap<int, QMenu *> zipMenus;
+    QMap<int, QMenu *> rdiskMenus;
     QMap<int, QMenu *> moMenus;
     QMap<int, QMenu *> netMenus;
 
     QString                 getMediaOpenDirectory();
     ui::MediaHistoryManager mhm;
 
+    const QByteArray driveLetters = QByteArrayLiteral("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
+
     int cassetteRecordPos;
     int cassettePlayPos;
     int cassetteRewindPos;
     int cassetteFastFwdPos;
     int cassetteEjectPos;
+    int cassetteImageHistoryPos[MAX_PREV_IMAGES];
 
     int cartridgeEjectPos;
+    int cartridgeImageHistoryPos[MAX_PREV_IMAGES];
 
     int floppyExportPos;
     int floppyEjectPos;
-
-    int cdromMutePos;
-    int cdromReloadPos;
-    int cdromImagePos;
-    int cdromDirPos;
-    int cdromImageHistoryPos[MAX_PREV_IMAGES];
     int floppyImageHistoryPos[MAX_PREV_IMAGES];
 
-    int zipEjectPos;
-    int zipReloadPos;
+    int cdromMutePos;
+    int cdromEjectPos;
+    int cdromImageHistoryPos[MAX_PREV_IMAGES];
+
+    int rdiskEjectPos;
+    int rdiskImageHistoryPos[MAX_PREV_IMAGES];
 
     int moEjectPos;
-    int moReloadPos;
+    int moImageHistoryPos[MAX_PREV_IMAGES];
 
     int netDisconnPos;
 
diff --git a/src/qt/qt_newfloppydialog.cpp b/src/qt/qt_newfloppydialog.cpp
index e24ad9aa1..d9ae09d0c 100644
--- a/src/qt/qt_newfloppydialog.cpp
+++ b/src/qt/qt_newfloppydialog.cpp
@@ -29,7 +29,7 @@ extern "C" {
 #include <86box/plat.h>
 #include <86box/random.h>
 #include <86box/scsi_device.h>
-#include <86box/zip.h>
+#include <86box/rdisk.h>
 #include <86box/mo.h>
 }
 
@@ -96,12 +96,12 @@ static const QStringList rpmModes = {
 };
 
 static const QStringList floppyTypes = {
-    "160 kB",
-    "180 kB",
-    "320 kB",
-    "360 kB",
-    "640 kB",
-    "720 kB",
+    "160 KB",
+    "180 KB",
+    "320 KB",
+    "360 KB",
+    "640 KB",
+    "720 KB",
     "1.2 MB",
     "1.25 MB",
     "1.44 MB",
@@ -110,7 +110,7 @@ static const QStringList floppyTypes = {
     "2.88 MB",
 };
 
-static const QStringList zipTypes = {
+static const QStringList rdiskTypes = {
     "ZIP 100",
     "ZIP 250",
 };
@@ -146,11 +146,11 @@ NewFloppyDialog::NewFloppyDialog(MediaType type, QWidget *parent)
                 tr("All images") % util::DlgFilter({ "86f", "dsk", "flp", "im?", "img", "*fd?" }) % tr("Basic sector images") % util::DlgFilter({ "dsk", "flp", "im?", "img", "*fd?" }) % tr("Surface images") % util::DlgFilter({ "86f" }, true));
 
             break;
-        case MediaType::Zip:
-            for (int i = 0; i < zipTypes.size(); ++i) {
-                Models::AddEntry(model, tr(zipTypes[i].toUtf8().data()), i);
+        case MediaType::RDisk:
+            for (int i = 0; i < rdiskTypes.size(); ++i) {
+                Models::AddEntry(model, tr(rdiskTypes[i].toUtf8().data()), i);
             }
-            ui->fileField->setFilter(tr("ZIP images") % util::DlgFilter({ "im?", "img", "zdi" }, true));
+            ui->fileField->setFilter(tr("Removable disk images") % util::DlgFilter({ "im?", "img", "rdi", "zdi" }, true));
             break;
         case MediaType::Mo:
             for (int i = 0; i < moTypes.size(); ++i) {
@@ -218,13 +218,13 @@ NewFloppyDialog::onCreate()
                 }
             }
             break;
-        case MediaType::Zip:
+        case MediaType::RDisk:
             {
                 fileType = fi.suffix().toLower() == QStringLiteral("zdi") ? FileType::Zdi : FileType::Img;
 
                 std::atomic_bool res;
                 std::thread      t([this, &res, filename, fileType, &progress] {
-                    res = createZipSectorImage(filename, disk_sizes[ui->comboBoxSize->currentIndex() + 12], fileType, progress);
+                    res = createRDiskSectorImage(filename, disk_sizes[ui->comboBoxSize->currentIndex() + 12], fileType, progress);
                 });
                 progress.exec();
                 t.join();
@@ -367,7 +367,7 @@ NewFloppyDialog::create86f(const QString &filename, const disk_size_t &disk_size
 bool
 NewFloppyDialog::createSectorImage(const QString &filename, const disk_size_t &disk_size, FileType type)
 {
-    uint32_t total_size     = 0;
+    uint64_t total_size     = 0;
     uint32_t total_sectors  = 0;
     uint32_t sector_bytes   = 0;
     uint32_t root_dir_bytes = 0;
@@ -388,7 +388,7 @@ NewFloppyDialog::createSectorImage(const QString &filename, const disk_size_t &d
     total_sectors = disk_size.sides * disk_size.tracks * disk_size.sectors;
     if (total_sectors > ZIP_SECTORS)
         total_sectors = ZIP_250_SECTORS;
-    total_size     = total_sectors * sector_bytes;
+    total_size     = (uint64_t) total_sectors * sector_bytes;
     root_dir_bytes = (disk_size.root_dir_entries << 5);
     fat_size       = (disk_size.spfat * sector_bytes);
     fat1_offs      = sector_bytes;
@@ -463,13 +463,13 @@ NewFloppyDialog::createSectorImage(const QString &filename, const disk_size_t &d
 }
 
 bool
-NewFloppyDialog::createZipSectorImage(const QString &filename, const disk_size_t &disk_size, FileType type, QProgressDialog &pbar)
+NewFloppyDialog::createRDiskSectorImage(const QString &filename, const disk_size_t &disk_size, FileType type, QProgressDialog &pbar)
 {
-    uint32_t total_size    = 0;
+    uint64_t total_size    = 0;
     uint32_t total_sectors = 0;
     uint32_t sector_bytes  = 0;
     uint16_t base          = 0x1000;
-    uint32_t pbar_max      = 0;
+    uint64_t pbar_max      = 0;
 
     QFile file(filename);
     if (!file.open(QIODevice::WriteOnly)) {
@@ -482,7 +482,7 @@ NewFloppyDialog::createZipSectorImage(const QString &filename, const disk_size_t
     total_sectors = disk_size.sides * disk_size.tracks * disk_size.sectors;
     if (total_sectors > ZIP_SECTORS)
         total_sectors = ZIP_250_SECTORS;
-    total_size = total_sectors * sector_bytes;
+    total_size = (uint64_t) total_sectors * sector_bytes;
 
     pbar_max = total_size;
     if (type == FileType::Zdi) {
@@ -649,12 +649,12 @@ bool
 NewFloppyDialog::createMoSectorImage(const QString &filename, int8_t disk_size, FileType type, QProgressDialog &pbar)
 {
     const mo_type_t *dp            = &mo_types[disk_size];
-    uint32_t         total_size    = 0;
-    uint32_t         total_size2;
+    uint64_t         total_size    = 0;
+    uint64_t         total_size2;
     uint32_t         total_sectors = 0;
     uint32_t         sector_bytes  = 0;
     uint16_t         base          = 0x1000;
-    uint32_t         pbar_max      = 0;
+    uint64_t         pbar_max      = 0;
     uint32_t         blocks_num;
 
     QFile file(filename);
@@ -666,7 +666,7 @@ NewFloppyDialog::createMoSectorImage(const QString &filename, int8_t disk_size,
 
     sector_bytes  = dp->bytes_per_sector;
     total_sectors = dp->sectors;
-    total_size    = total_sectors * sector_bytes;
+    total_size    = (uint64_t) total_sectors * sector_bytes;
 
     total_size2 = (total_size >> 20) << 20;
     total_size2 = total_size - total_size2;
diff --git a/src/qt/qt_newfloppydialog.hpp b/src/qt/qt_newfloppydialog.hpp
index a342df567..7429fc186 100644
--- a/src/qt/qt_newfloppydialog.hpp
+++ b/src/qt/qt_newfloppydialog.hpp
@@ -16,7 +16,7 @@ class NewFloppyDialog : public QDialog {
 public:
     enum class MediaType {
         Floppy,
-        Zip,
+        RDisk,
         Mo,
     };
     enum class FileType {
@@ -42,7 +42,7 @@ private:
 
     bool create86f(const QString &filename, const disk_size_t &disk_size, uint8_t rpm_mode);
     bool createSectorImage(const QString &filename, const disk_size_t &disk_size, FileType type);
-    bool createZipSectorImage(const QString &filename, const disk_size_t &disk_size, FileType type, QProgressDialog &pbar);
+    bool createRDiskSectorImage(const QString &filename, const disk_size_t &disk_size, FileType type, QProgressDialog &pbar);
     bool createMoSectorImage(const QString &filename, int8_t disk_size, FileType type, QProgressDialog &pbar);
 };
 
diff --git a/src/qt/qt_opengloptions.cpp b/src/qt/qt_opengloptions.cpp
deleted file mode 100644
index 58030b467..000000000
--- a/src/qt/qt_opengloptions.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          OpenGL renderer options for Qt
- *
- *
- *
- * Authors: Teemu Korhonen
- *
- *          Copyright 2022 Teemu Korhonen
- */
-
-#include <QByteArray>
-#include <QFile>
-#include <QRegularExpression>
-#include <QStringBuilder>
-
-#include <stdexcept>
-
-#include "qt_opengloptions.hpp"
-
-extern "C" {
-#include <86box/86box.h>
-}
-
-/* Default vertex shader. */
-static const GLchar *vertex_shader = "\
-in vec2 VertexCoord;\n\
-in vec2 TexCoord;\n\
-out vec2 tex;\n\
-void main(){\n\
-    gl_Position = vec4(VertexCoord, 0.0, 1.0);\n\
-    tex = TexCoord;\n\
-}\n";
-
-/* Default fragment shader. */
-static const GLchar *fragment_shader = "\
-in vec2 tex;\n\
-uniform sampler2D texsampler;\n\
-out vec4 color;\n\
-void main() {\n\
-    color = texture(texsampler, tex);\n\
-}\n";
-
-OpenGLOptions::OpenGLOptions(QObject *parent, bool loadConfig, const QString &glslVersion)
-    : QObject(parent)
-    , m_glslVersion(glslVersion)
-{
-    m_filter = video_filter_method == 0
-        ? FilterType::Nearest
-        : FilterType::Linear;
-
-    if (!loadConfig)
-        return;
-
-    /* Initialize with config. */
-    m_vsync     = video_vsync != 0;
-    m_framerate = video_framerate;
-
-    m_renderBehavior = video_framerate == -1
-        ? RenderBehaviorType::SyncWithVideo
-        : RenderBehaviorType::TargetFramerate;
-
-    QString shaderPath(video_shader);
-
-    if (shaderPath.isEmpty()) {
-        addDefaultShader();
-    } else {
-        try {
-            addShader(shaderPath);
-        } catch (const std::runtime_error &) {
-            /* Fallback to default shader */
-            addDefaultShader();
-        }
-    }
-}
-
-void
-OpenGLOptions::save() const
-{
-    video_vsync         = m_vsync ? 1 : 0;
-    video_framerate     = m_renderBehavior == RenderBehaviorType::SyncWithVideo ? -1 : m_framerate;
-    video_filter_method = m_filter == FilterType::Nearest ? 0 : 1;
-
-    /* TODO: multiple shaders */
-    auto path = m_shaders.first().path().toLocal8Bit();
-
-    if (!path.isEmpty())
-        qstrncpy(video_shader, path.constData(), sizeof(video_shader));
-    else
-        video_shader[0] = '\0';
-}
-
-OpenGLOptions::FilterType
-OpenGLOptions::filter() const
-{
-    /* Filter method is controlled externally */
-    return video_filter_method == 0
-        ? FilterType::Nearest
-        : FilterType::Linear;
-}
-
-void
-OpenGLOptions::setRenderBehavior(RenderBehaviorType value)
-{
-    m_renderBehavior = value;
-}
-
-void
-OpenGLOptions::setFrameRate(int value)
-{
-    m_framerate = value;
-}
-
-void
-OpenGLOptions::setVSync(bool value)
-{
-    m_vsync = value;
-}
-
-void
-OpenGLOptions::setFilter(FilterType value)
-{
-    m_filter = value;
-}
-
-void
-OpenGLOptions::addShader(const QString &path)
-{
-    QFile shader_file(path);
-
-    if (!shader_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        throw std::runtime_error(
-            QString(tr("Error opening \"%1\": %2"))
-                .arg(path)
-                .arg(shader_file.errorString())
-                .toStdString());
-    }
-
-    auto shader_text = QString(shader_file.readAll());
-
-    shader_file.close();
-
-    /* Remove parameter lines */
-    shader_text.remove(QRegularExpression("^\\s*#pragma parameter.*?\\n", QRegularExpression::MultilineOption));
-
-    QRegularExpression version("^\\s*(#version\\s+\\w+)", QRegularExpression::MultilineOption);
-
-    auto match = version.match(shader_text);
-
-    QString version_line(m_glslVersion);
-
-    if (match.hasMatch()) {
-        /* Extract existing version and remove it. */
-        version_line = match.captured(1);
-        shader_text.remove(version);
-    }
-
-    auto shader = new QOpenGLShaderProgram(this);
-
-    auto throw_shader_error = [path, shader](const QString &what) {
-        throw std::runtime_error(
-            QString(what % ":\n\n %2")
-                .arg(path)
-                .arg(shader->log())
-                .toStdString());
-    };
-
-    static const char *extension = "\n#extension GL_ARB_shading_language_420pack : enable\n";
-
-    if (!shader->addShaderFromSourceCode(QOpenGLShader::Vertex, version_line % extension % "\n#define VERTEX\n#line 1\n" % shader_text))
-        throw_shader_error(tr("Error compiling vertex shader in file \"%1\""));
-
-    if (!shader->addShaderFromSourceCode(QOpenGLShader::Fragment, version_line % extension % "\n#define FRAGMENT\n#line 1\n" % shader_text))
-        throw_shader_error(tr("Error compiling fragment shader in file \"%1\""));
-
-    if (!shader->link())
-        throw_shader_error(tr("Error linking shader program in file \"%1\""));
-
-    m_shaders << OpenGLShaderPass(shader, path);
-}
-
-void
-OpenGLOptions::addDefaultShader()
-{
-    auto shader = new QOpenGLShaderProgram(this);
-    shader->addShaderFromSourceCode(QOpenGLShader::Vertex, m_glslVersion % "\n" % vertex_shader);
-    shader->addShaderFromSourceCode(QOpenGLShader::Fragment, m_glslVersion % "\n" % fragment_shader);
-    shader->link();
-    m_shaders << OpenGLShaderPass(shader, QString());
-}
diff --git a/src/qt/qt_opengloptions.hpp b/src/qt/qt_opengloptions.hpp
deleted file mode 100644
index 64f761670..000000000
--- a/src/qt/qt_opengloptions.hpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Header for OpenGL renderer options
- *
- *
- *
- * Authors: Teemu Korhonen
- *
- *          Copyright 2022 Teemu Korhonen
- */
-
-#ifndef QT_OPENGLOPTIONS_HPP
-#define QT_OPENGLOPTIONS_HPP
-
-#include <QList>
-#include <QObject>
-#include <QOpenGLContext>
-#include <QOpenGLShaderProgram>
-
-class OpenGLShaderPass {
-public:
-    OpenGLShaderPass(QOpenGLShaderProgram *shader, const QString &path)
-        : m_shader(shader)
-        , m_path(path)
-        , m_vertex_coord(shader->attributeLocation("VertexCoord"))
-        , m_tex_coord(shader->attributeLocation("TexCoord"))
-        , m_color(shader->attributeLocation("Color"))
-        , m_mvp_matrix(shader->uniformLocation("MVPMatrix"))
-        , m_input_size(shader->uniformLocation("InputSize"))
-        , m_output_size(shader->uniformLocation("OutputSize"))
-        , m_texture_size(shader->uniformLocation("TextureSize"))
-        , m_frame_count(shader->uniformLocation("FrameCount"))
-    {
-    }
-
-    bool           bind() const { return m_shader->bind(); }
-    const QString &path() const { return m_path; }
-    const GLint   &vertex_coord() const { return m_vertex_coord; }
-    const GLint   &tex_coord() const { return m_tex_coord; }
-    const GLint   &color() const { return m_color; }
-    const GLint   &mvp_matrix() const { return m_mvp_matrix; }
-    const GLint   &input_size() const { return m_input_size; }
-    const GLint   &output_size() const { return m_output_size; }
-    const GLint   &texture_size() const { return m_texture_size; }
-    const GLint   &frame_count() const { return m_frame_count; }
-
-private:
-    QOpenGLShaderProgram *m_shader;
-    QString               m_path;
-    GLint                 m_vertex_coord;
-    GLint                 m_tex_coord;
-    GLint                 m_color;
-    GLint                 m_mvp_matrix;
-    GLint                 m_input_size;
-    GLint                 m_output_size;
-    GLint                 m_texture_size;
-    GLint                 m_frame_count;
-};
-
-class OpenGLOptions : public QObject {
-    Q_OBJECT
-
-public:
-    enum RenderBehaviorType { SyncWithVideo,
-                              TargetFramerate };
-
-    enum FilterType { Nearest,
-                      Linear };
-
-    OpenGLOptions(QObject *parent, bool loadConfig, const QString &glslVersion);
-
-    RenderBehaviorType renderBehavior() const { return m_renderBehavior; }
-    int                framerate() const { return m_framerate; }
-    bool               vSync() const { return m_vsync; }
-    FilterType         filter() const;
-
-    const QList<OpenGLShaderPass> &shaders() const { return m_shaders; }
-
-    void setRenderBehavior(RenderBehaviorType value);
-    void setFrameRate(int value);
-    void setVSync(bool value);
-    void setFilter(FilterType value);
-    void addShader(const QString &path);
-    void addDefaultShader();
-    void save() const;
-
-private:
-    RenderBehaviorType      m_renderBehavior = SyncWithVideo;
-    int                     m_framerate      = -1;
-    bool                    m_vsync          = false;
-    FilterType              m_filter         = Nearest;
-    QList<OpenGLShaderPass> m_shaders;
-    QString                 m_glslVersion;
-};
-
-#endif
diff --git a/src/qt/qt_opengloptionsdialog.cpp b/src/qt/qt_opengloptionsdialog.cpp
deleted file mode 100644
index acb2ce9f2..000000000
--- a/src/qt/qt_opengloptionsdialog.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          OpenGL renderer options dialog for Qt
- *
- *
- *
- * Authors: Teemu Korhonen
- *
- *          Copyright 2022 Teemu Korhonen
- */
-
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QStringBuilder>
-
-#include <stdexcept>
-
-#include "qt_opengloptionsdialog.hpp"
-#include "qt_util.hpp"
-#include "ui_qt_opengloptionsdialog.h"
-
-OpenGLOptionsDialog::OpenGLOptionsDialog(QWidget *parent, const OpenGLOptions &options, std::function<OpenGLOptions *()> optionsFactory)
-    : QDialog(parent)
-    , ui(new Ui::OpenGLOptionsDialog)
-    , createOptions(optionsFactory)
-{
-    ui->setupUi(this);
-
-    if (options.renderBehavior() == OpenGLOptions::SyncWithVideo)
-        ui->syncWithVideo->setChecked(true);
-    else {
-        ui->syncToFramerate->setChecked(true);
-        ui->targetFps->setValue(options.framerate());
-    }
-
-    ui->vsync->setChecked(options.vSync());
-
-    if (!options.shaders().isEmpty()) {
-        auto path = options.shaders().first().path();
-        if (!path.isEmpty())
-            ui->shader->setPlainText(path);
-    }
-}
-
-OpenGLOptionsDialog::~OpenGLOptionsDialog()
-{
-    delete ui;
-}
-
-void
-OpenGLOptionsDialog::accept()
-{
-    auto options = createOptions();
-
-    options->setRenderBehavior(
-        ui->syncWithVideo->isChecked()
-            ? OpenGLOptions::SyncWithVideo
-            : OpenGLOptions::TargetFramerate);
-
-    options->setFrameRate(ui->targetFps->value());
-
-    options->setVSync(ui->vsync->isChecked());
-
-    auto shader = ui->shader->toPlainText();
-
-    try {
-
-        if (!shader.isEmpty())
-            options->addShader(shader);
-        else
-            options->addDefaultShader();
-
-    } catch (const std::runtime_error &e) {
-        delete options;
-
-        QMessageBox msgBox(this);
-        msgBox.setWindowTitle(tr("Shader error"));
-        msgBox.setText(tr("Could not load shaders."));
-        msgBox.setInformativeText(tr("More information in details."));
-        msgBox.setDetailedText(e.what());
-        msgBox.setIcon(QMessageBox::Critical);
-        msgBox.setStandardButtons(QMessageBox::Close);
-        msgBox.setDefaultButton(QMessageBox::Close);
-        msgBox.setStyleSheet("QTextEdit { min-width: 45em; }");
-        msgBox.exec();
-
-        return;
-    }
-
-    options->save();
-
-    emit optionsChanged(options);
-
-    QDialog::accept();
-}
-
-void
-OpenGLOptionsDialog::on_addShader_clicked()
-{
-    auto shader = QFileDialog::getOpenFileName(
-        this,
-        QString(),
-        QString(),
-        tr("OpenGL Shaders") % util::DlgFilter({ "glsl" }, true));
-
-    if (shader.isNull())
-        return;
-
-    ui->shader->setPlainText(shader);
-}
diff --git a/src/qt/qt_opengloptionsdialog.hpp b/src/qt/qt_opengloptionsdialog.hpp
deleted file mode 100644
index f34d74d75..000000000
--- a/src/qt/qt_opengloptionsdialog.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Header for OpenGL renderer options dialog
- *
- * Authors: Teemu Korhonen
- *
- *          Copyright 2022 Teemu Korhonen
- */
-
-#ifndef QT_OPENGLOPTIONSDIALOG_H
-#define QT_OPENGLOPTIONSDIALOG_H
-
-#include <QDialog>
-
-#include <functional>
-
-#include "qt_opengloptions.hpp"
-
-namespace Ui {
-class OpenGLOptionsDialog;
-}
-
-class OpenGLOptionsDialog : public QDialog {
-    Q_OBJECT
-
-public:
-    explicit OpenGLOptionsDialog(QWidget *parent, const OpenGLOptions &options, std::function<OpenGLOptions *()> optionsFactory);
-    ~OpenGLOptionsDialog();
-
-signals:
-    void optionsChanged(OpenGLOptions *options);
-
-public slots:
-    void accept() override;
-
-private:
-    Ui::OpenGLOptionsDialog *ui;
-
-    std::function<OpenGLOptions *()> createOptions;
-
-private slots:
-    void on_addShader_clicked();
-};
-
-#endif // QT_OPENGLOPTIONSDIALOG_H
diff --git a/src/qt/qt_opengloptionsdialog.ui b/src/qt/qt_opengloptionsdialog.ui
deleted file mode 100644
index a6f86b6c2..000000000
--- a/src/qt/qt_opengloptionsdialog.ui
+++ /dev/null
@@ -1,280 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>OpenGLOptionsDialog</class>
- <widget class="QDialog" name="OpenGLOptionsDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>320</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>OpenGL 3.0 renderer options</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Render behavior</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2" columnstretch="3,1">
-      <item row="1" column="0">
-       <widget class="QRadioButton" name="syncToFramerate">
-        <property name="text">
-         <string>Use target framerate:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QSpinBox" name="targetFps">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="suffix">
-         <string> fps</string>
-        </property>
-        <property name="minimum">
-         <number>15</number>
-        </property>
-        <property name="maximum">
-         <number>240</number>
-        </property>
-        <property name="value">
-         <number>60</number>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QCheckBox" name="vsync">
-        <property name="text">
-         <string>VSync</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QRadioButton" name="syncWithVideo">
-        <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render each frame immediately, in sync with the emulated display.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;This is the recommended option if the shaders in use don't utilize frametime for animated effects.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="text">
-         <string>Synchronize with video</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QSlider" name="fpsSlider">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="minimum">
-         <number>15</number>
-        </property>
-        <property name="maximum">
-         <number>240</number>
-        </property>
-        <property name="value">
-         <number>60</number>
-        </property>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="invertedAppearance">
-         <bool>false</bool>
-        </property>
-        <property name="tickPosition">
-         <enum>QSlider::NoTicks</enum>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>Shaders</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout" columnstretch="3,1">
-      <item row="2" column="1">
-       <widget class="QPushButton" name="removeShader">
-        <property name="text">
-         <string>Remove</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="1" column="0" rowspan="3">
-       <widget class="QTextEdit" name="shader">
-        <property name="readOnly">
-         <bool>true</bool>
-        </property>
-        <property name="placeholderText">
-         <string>No shader selected</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" alignment="Qt::AlignTop">
-       <widget class="QPushButton" name="addShader">
-        <property name="text">
-         <string>Browse...</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>syncWithVideo</tabstop>
-  <tabstop>syncToFramerate</tabstop>
-  <tabstop>fpsSlider</tabstop>
-  <tabstop>targetFps</tabstop>
-  <tabstop>vsync</tabstop>
-  <tabstop>shader</tabstop>
-  <tabstop>addShader</tabstop>
-  <tabstop>removeShader</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>OpenGLOptionsDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>257</x>
-     <y>310</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>OpenGLOptionsDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>325</x>
-     <y>310</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>syncToFramerate</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>targetFps</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>140</x>
-     <y>71</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>380</x>
-     <y>98</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>syncToFramerate</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>fpsSlider</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>158</x>
-     <y>66</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>168</x>
-     <y>87</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>fpsSlider</sender>
-   <signal>valueChanged(int)</signal>
-   <receiver>targetFps</receiver>
-   <slot>setValue(int)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>252</x>
-     <y>90</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>308</x>
-     <y>89</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>targetFps</sender>
-   <signal>valueChanged(int)</signal>
-   <receiver>fpsSlider</receiver>
-   <slot>setValue(int)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>364</x>
-     <y>93</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>134</x>
-     <y>93</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>removeShader</sender>
-   <signal>clicked()</signal>
-   <receiver>shader</receiver>
-   <slot>clear()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>333</x>
-     <y>201</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>235</x>
-     <y>208</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/src/qt/qt_openglrenderer.cpp b/src/qt/qt_openglrenderer.cpp
index 60aa998a9..cecc8ea9c 100644
--- a/src/qt/qt_openglrenderer.cpp
+++ b/src/qt/qt_openglrenderer.cpp
@@ -6,52 +6,824 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          OpenGL renderer for Qt
+ *          OpenGL renderer for Qt, mostly ported over from PCem.
  *
  *
  *
  * Authors: Teemu Korhonen
+ *          Cacodemon345
+ *          bit
+ *          Sarah Walker
  *
  *          Copyright 2022 Teemu Korhonen
+ *          Copyright 2025 Cacodemon345
+ *          Copyright 2017 Bit
+ *          Copyright 2017-2020 Sarah Walker
  */
 
+#include "qt_renderercommon.hpp"
+#include "qt_mainwindow.hpp"
+
+extern MainWindow* main_window;
+
 #include <QCoreApplication>
 #include <QMessageBox>
-#include <QOpenGLShaderProgram>
+#include <QWindow>
+#include <QPainter>
+#include <QWidget>
+#include <QEvent>
+#include <QApplication>
+#include <QString>
+#include <QByteArray>
+
+#include <QOpenGLContext>
+#include <QOpenGLFunctions>
+#include <QOpenGLExtraFunctions>
 #include <QOpenGLTexture>
-#include <QStringBuilder>
-#include <QSurfaceFormat>
+#include <QOpenGLDebugLogger>
+
+#include <QImage>
 
 #include <cmath>
 
-#include "qt_opengloptionsdialog.hpp"
 #include "qt_openglrenderer.hpp"
+#include "qt_openglshadermanagerdialog.hpp"
 
-#ifndef GL_MAP_PERSISTENT_BIT
-#    define GL_MAP_PERSISTENT_BIT 0x0040
+extern "C" {
+#include <86box/86box.h>
+#include <86box/plat.h>
+#include <86box/ui.h>
+#include <86box/video.h>
+#include <86box/path.h>
+#include <86box/ini.h>
+#include <86box/config.h>
+#include <86box/qt-glslp-parser.h>
+
+char gl3_shader_file[MAX_USER_SHADERS][512];
+extern bool cpu_thread_running;
+}
+
+#define SCALE_SOURCE   0
+#define SCALE_VIEWPORT 1
+#define SCALE_ABSOLUTE 2
+
+static GLfloat matrix[] = { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 };
+
+extern int video_filter_method;
+extern int video_vsync;
+extern int video_focus_dim;
+extern int video_refresh_rate;
+
+const char* vertex_shader_default_tex_src =
+#ifdef __APPLE__
+        "#version 150\n"
+#else
+        "#version 130\n"
+#endif
+        "\n"
+        "in vec4 VertexCoord;\n"
+        "in vec2 TexCoord;\n"
+        "\n"
+        "out vec2 texCoord;\n"
+        "\n"
+        "void main()\n"
+        "{\n"
+        "       gl_Position = VertexCoord;\n"
+        "       texCoord = TexCoord;\n"
+        "}\n";
+
+const char* fragment_shader_default_tex_src =
+#ifdef __APPLE__
+        "#version 150\n"
+#else
+        "#version 130\n"
+#endif
+        "\n"
+        "in vec2 texCoord;\n"
+        "uniform sampler2D Texture;\n"
+        "\n"
+        "out vec4 color;"
+        "\n"
+        "void main()\n"
+        "{\n"
+        "       color = texture(Texture, texCoord);\n"
+        "       color.a = 1.0;\n"
+        "}\n";
+
+const char* vertex_shader_default_color_src =
+#ifdef __APPLE__
+        "#version 150\n"
+#else
+        "#version 130\n"
+#endif
+        "\n"
+        "in vec4 VertexCoord;\n"
+        "in vec4 Color;\n"
+        "\n"
+        "out vec4 color;\n"
+        "\n"
+        "void main()\n"
+        "{\n"
+        "       gl_Position = VertexCoord;\n"
+        "       color = Color;\n"
+        "}\n";
+
+const char* fragment_shader_default_color_src =
+#ifdef __APPLE__
+        "#version 150\n"
+#else
+        "#version 130\n"
+#endif
+        "\n"
+        "in vec4 color;\n"
+        "\n"
+        "out vec4 outColor;"
+        "\n"
+        "void main()\n"
+        "{\n"
+        "       outColor = color;\n"
+        "       outColor.a = 1.0;\n"
+        "}\n";
+
+#ifdef ENABLE_OGL3_LOG
+int ogl3_do_log = ENABLE_OGL3_LOG;
+
+static void
+ogl3_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (ogl3_do_log) {
+        va_start(ap, fmt);
+        ogl3_log_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define ogl3_log(fmt, ...)
 #endif
 
-#ifndef GL_MAP_COHERENT_BIT
-#    define GL_MAP_COHERENT_BIT 0x0080
+static inline int
+next_pow2(unsigned int n)
+{
+    n--;
+    n |= n >> 1; // Divide by 2^k for consecutive doublings of k up to 32,
+    n |= n >> 2; // and then or the results.
+    n |= n >> 4;
+    n |= n >> 8;
+    n |= n >> 16;
+    n++;
+
+    return n;
+}
+
+int
+OpenGLRenderer::create_program(struct shader_program *program)
+{
+    GLint status;
+    program->id = glw.glCreateProgram();
+    glw.glAttachShader(program->id, program->vertex_shader);
+    glw.glAttachShader(program->id, program->fragment_shader);
+
+    glw.glLinkProgram(program->id);
+
+    glw.glDeleteShader(program->vertex_shader);
+    glw.glDeleteShader(program->fragment_shader);
+
+    program->vertex_shader = program->fragment_shader = 0;
+
+    glw.glGetProgramiv(program->id, GL_LINK_STATUS, &status);
+
+    if (!status) {
+        int maxLength;
+        int length;
+        glw.glGetProgramiv(program->id, GL_INFO_LOG_LENGTH, &maxLength);
+        char *log = (char *) malloc(maxLength);
+        glw.glGetProgramInfoLog(program->id, maxLength, &length, log);
+        main_window->showMessage(MBX_ERROR | MBX_FATAL, tr("GLSL Error"), tr("Program not linked:\n\n%1").arg(log), false);
+        // wx_simple_messagebox("GLSL Error", "Program not linked:\n%s", log);
+        free(log);
+        return 0;
+    }
+
+    return 1;
+}
+
+int
+OpenGLRenderer::compile_shader(GLenum shader_type, const char *prepend, const char *program, int *dst)
+{
+    QRegularExpression versionRegex("^\\s*(#version\\s+\\w+)", QRegularExpression::MultilineOption);
+    QString progSource = QString(program);
+    QByteArray  finalSource = nullptr;
+    const char *source[5];
+    char        version[50];
+    char       *version_loc = (char *) strstr(program, "#version");
+    if (version_loc) {
+        snprintf(version, 49, "%s\n", versionRegex.match(progSource).captured(1).toLatin1().data());
+        progSource.remove(versionRegex);
+    } else {
+        snprintf(version, 49, "%s\n", this->glslVersion.toLatin1().data());
+    }
+    
+    /* Remove parameter lines. */
+    progSource.remove(QRegularExpression("^\\s*#pragma parameter.*?\\n", QRegularExpression::MultilineOption));
+
+    finalSource = progSource.toLatin1();
+
+    source[0] = version;
+    source[1] = "\n#extension GL_ARB_shading_language_420pack : enable\n";
+    source[2] = prepend ? prepend : "";
+    source[3] = "\n#line 1\n";
+    source[4] = finalSource.data();
+
+    GLuint shader = glw.glCreateShader(shader_type);
+    glw.glShaderSource(shader, 5, source, NULL);
+    glw.glCompileShader(shader);
+
+    GLint status = 0;
+    glw.glGetShaderiv(shader, GL_COMPILE_STATUS, &status);
+    if (!status) {
+        GLint length;
+        glw.glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &length);
+        char *log = (char *) malloc(length);
+        glw.glGetShaderInfoLog(shader, length, &length, log);
+        main_window->showMessage(MBX_ERROR | MBX_FATAL, tr("GLSL Error"), tr("Could not compile shader:\n\n%1").arg(log), false);
+        // wx_simple_messagebox("GLSL Error", "Could not compile shader:\n%s", log);
+
+        ogl3_log("Could not compile shader: %s\n", log);
+        //                ogl3_log("Shader: %s\n", program);
+
+        free(log);
+        return 0;
+    }
+
+    *dst = shader;
+
+    return 1;
+}
+
+GLuint
+OpenGLRenderer::get_uniform(GLuint program, const char *name)
+{
+    return glw.glGetUniformLocation(program, name);
+}
+
+GLuint
+OpenGLRenderer::get_attrib(GLuint program, const char *name)
+{
+    return glw.glGetAttribLocation(program, name);
+}
+
+void
+OpenGLRenderer::find_uniforms(struct glsl_shader *glsl, int num_pass)
+{
+    int                 i;
+    char                s[50];
+    struct shader_pass *pass = &glsl->passes[num_pass];
+    int                 p    = pass->program.id;
+    glw.glUseProgram(p);
+
+    struct shader_uniforms *u = &pass->uniforms;
+
+    u->mvp_matrix   = get_uniform(p, "MVPMatrix");
+    u->vertex_coord = get_attrib(p, "VertexCoord");
+    u->tex_coord    = get_attrib(p, "TexCoord");
+    u->color        = get_attrib(p, "Color");
+
+    u->frame_count     = get_uniform(p, "FrameCount");
+    u->frame_direction = get_uniform(p, "FrameDirection");
+
+    u->texture      = get_uniform(p, "Texture");
+    u->input_size   = get_uniform(p, "InputSize");
+    u->texture_size = get_uniform(p, "TextureSize");
+    u->output_size  = get_uniform(p, "OutputSize");
+
+    u->orig.texture      = get_uniform(p, "OrigTexture");
+    u->orig.input_size   = get_uniform(p, "OrigInputSize");
+    u->orig.texture_size = get_uniform(p, "OrigTextureSize");
+
+    for (i = 0; i < glsl->num_passes; ++i) {
+        snprintf(s, sizeof(s) -1, "Pass%dTexture", (i + 1));
+        u->pass[i].texture = get_uniform(p, s);
+        snprintf(s, sizeof(s) -1, "Pass%dInputSize", (i + 1));
+        u->pass[i].input_size = get_uniform(p, s);
+        snprintf(s, sizeof(s) -1, "Pass%dTextureSize", (i + 1));
+        u->pass[i].texture_size = get_uniform(p, s);
+
+        snprintf(s, sizeof(s) -1, "PassPrev%dTexture", num_pass - i);
+        u->prev_pass[i].texture = get_uniform(p, s);
+        snprintf(s, sizeof(s) -1, "PassPrev%dInputSize", num_pass - i);
+        u->prev_pass[i].input_size = get_uniform(p, s);
+        snprintf(s, sizeof(s) -1, "PassPrev%dTextureSize", num_pass - i);
+        u->prev_pass[i].texture_size = get_uniform(p, s);
+    }
+
+    u->prev[0].texture   = get_uniform(p, "PrevTexture");
+    u->prev[0].tex_coord = get_attrib(p, "PrevTexCoord");
+    for (i = 1; i < MAX_PREV; ++i) {
+        snprintf(s, sizeof(s) -1, "Prev%dTexture", i);
+        u->prev[i].texture = get_uniform(p, s);
+        snprintf(s, sizeof(s) -1, "Prev%dTexCoord", i);
+        u->prev[i].tex_coord = get_attrib(p, s);
+    }
+    for (i = 0; i < MAX_PREV; ++i)
+        if (u->prev[i].texture >= 0)
+            glsl->has_prev = 1;
+
+    for (i = 0; i < glsl->num_lut_textures; ++i)
+        u->lut_textures[i] = get_uniform(p, glsl->lut_textures[i].name);
+
+    for (i = 0; i < glsl->num_parameters; ++i)
+        u->parameters[i] = get_uniform(p, glsl->parameters[i].id);
+
+    glw.glUseProgram(0);
+}
+
+static void
+set_scale_mode(char *scale, int *dst)
+{
+    if (!strcmp(scale, "viewport"))
+        *dst = SCALE_VIEWPORT;
+    else if (!strcmp(scale, "absolute"))
+        *dst = SCALE_ABSOLUTE;
+    else
+        *dst = SCALE_SOURCE;
+}
+
+static void
+setup_scale(struct shader *shader, struct shader_pass *pass)
+{
+    set_scale_mode(shader->scale_type_x, &pass->scale.mode[0]);
+    set_scale_mode(shader->scale_type_y, &pass->scale.mode[1]);
+    pass->scale.value[0] = shader->scale_x;
+    pass->scale.value[1] = shader->scale_y;
+}
+
+void
+OpenGLRenderer::create_texture(struct shader_texture *tex)
+{
+    if (tex->width > max_texture_size)
+        tex->width = max_texture_size;
+    if (tex->height > max_texture_size)
+        tex->height = max_texture_size;
+    ogl3_log("Create texture with size %dx%d\n", tex->width, tex->height);
+    glw.glGenTextures(1, (GLuint *) &tex->id);
+    glw.glBindTexture(GL_TEXTURE_2D, tex->id);
+    glw.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, tex->wrap_mode);
+    glw.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, tex->wrap_mode);
+    glw.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, tex->min_filter);
+    glw.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, tex->mag_filter);
+    glw.glTexImage2D(GL_TEXTURE_2D, 0, tex->internal_format, tex->width, tex->height, 0, tex->format, tex->type, tex->data);
+    if (tex->mipmap)
+        glw.glGenerateMipmap(GL_TEXTURE_2D);
+    glw.glBindTexture(GL_TEXTURE_2D, 0);
+}
+
+void
+OpenGLRenderer::delete_texture(struct shader_texture *tex)
+{
+    if (tex->id > 0)
+        glw.glDeleteTextures(1, (GLuint *) &tex->id);
+    tex->id = 0;
+}
+
+void
+OpenGLRenderer::delete_fbo(struct shader_fbo *fbo)
+{
+    if (fbo->id >= 0) {
+        glw.glDeleteFramebuffers(1, (GLuint *) &fbo->id);
+        delete_texture(&fbo->texture);
+    }
+}
+
+void
+OpenGLRenderer::delete_program(struct shader_program *program)
+{
+    if (program->vertex_shader)
+        glw.glDeleteShader(program->vertex_shader);
+    if (program->fragment_shader)
+        glw.glDeleteShader(program->fragment_shader);
+    glw.glDeleteProgram(program->id);
+}
+
+void
+OpenGLRenderer::delete_vbo(struct shader_vbo *vbo)
+{
+    if (vbo->color >= 0)
+        glw.glDeleteBuffers(1, (GLuint *) &vbo->color);
+    glw.glDeleteBuffers(1, (GLuint *) &vbo->vertex_coord);
+    glw.glDeleteBuffers(1, (GLuint *) &vbo->tex_coord);
+}
+
+void
+OpenGLRenderer::delete_pass(struct shader_pass *pass)
+{
+    delete_fbo(&pass->fbo);
+    delete_vbo(&pass->vbo);
+    delete_program(&pass->program);
+    glw.glDeleteVertexArrays(1, (GLuint *) &pass->vertex_array);
+}
+
+void
+OpenGLRenderer::delete_prev(struct shader_prev *prev)
+{
+    delete_fbo(&prev->fbo);
+    delete_vbo(&prev->vbo);
+}
+
+void
+OpenGLRenderer::delete_shader(struct glsl_shader *glsl)
+{
+    for (int i = 0; i < glsl->num_passes; ++i)
+        delete_pass(&glsl->passes[i]);
+    if (glsl->has_prev) {
+        delete_pass(&glsl->prev_scene);
+        for (int i = 0; i < MAX_PREV; ++i)
+            delete_prev(&glsl->prev[i]);
+    }
+    for (int i = 0; i < glsl->num_lut_textures; ++i)
+        delete_texture(&glsl->lut_textures[i].texture);
+}
+
+void
+OpenGLRenderer::delete_glsl(glsl_t *glsl)
+{
+    for (int i = 0; i < glsl->num_shaders; ++i)
+        delete_shader(&glsl->shaders[i]);
+    delete_pass(&glsl->scene);
+    delete_pass(&glsl->fs_color);
+    delete_pass(&glsl->final_pass);
+#ifdef SDL2_SHADER_DEBUG
+    delete_pass(&glsl->debug);
 #endif
+}
+
+void
+OpenGLRenderer::create_fbo(struct shader_fbo *fbo)
+{
+    create_texture(&fbo->texture);
+
+    glw.glGenFramebuffers(1, (GLuint *) &fbo->id);
+    glw.glBindFramebuffer(GL_FRAMEBUFFER, fbo->id);
+    glw.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fbo->texture.id, 0);
+
+    if (glw.glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
+        ogl3_log("Could not create framebuffer!\n");
+
+    glw.glBindFramebuffer(GL_FRAMEBUFFER, 0);
+}
+
+void
+OpenGLRenderer::setup_fbo(struct shader *shader, struct shader_fbo *fbo)
+{
+    fbo->texture.internal_format = GL_RGBA8;
+    fbo->texture.format          = GL_RGBA;
+    fbo->texture.min_filter = fbo->texture.mag_filter = shader->filter_linear ? GL_LINEAR : GL_NEAREST;
+    fbo->texture.width                                = 2048;
+    fbo->texture.height                               = 2048;
+    fbo->texture.type                                 = GL_UNSIGNED_BYTE;
+    if (!strcmp(shader->wrap_mode, "repeat"))
+        fbo->texture.wrap_mode = GL_REPEAT;
+    else if (!strcmp(shader->wrap_mode, "mirrored_repeat"))
+        fbo->texture.wrap_mode = GL_MIRRORED_REPEAT;
+    else if (!strcmp(shader->wrap_mode, "clamp_to_edge"))
+        fbo->texture.wrap_mode = GL_CLAMP_TO_EDGE;
+    else
+        fbo->texture.wrap_mode = GL_CLAMP_TO_BORDER;
+    fbo->srgb = 0;
+    if (shader->srgb_framebuffer) {
+        fbo->texture.internal_format = GL_SRGB8_ALPHA8;
+        fbo->srgb                    = 1;
+    } else if (shader->float_framebuffer) {
+        fbo->texture.internal_format = GL_RGBA32F;
+        fbo->texture.type            = GL_FLOAT;
+    }
+
+    if (fbo->texture.mipmap)
+        fbo->texture.min_filter = shader->filter_linear ? GL_LINEAR_MIPMAP_LINEAR : GL_NEAREST_MIPMAP_NEAREST;
+
+    create_fbo(fbo);
+}
+
+void
+OpenGLRenderer::recreate_fbo(struct shader_fbo *fbo, int width, int height)
+{
+    if (width != fbo->texture.width || height != fbo->texture.height) {
+        glw.glDeleteFramebuffers(1, (GLuint *) &fbo->id);
+        glw.glDeleteTextures(1, (GLuint *) &fbo->texture.id);
+        fbo->texture.width  = width;
+        fbo->texture.height = height;
+        create_fbo(fbo);
+    }
+}
+
+int
+OpenGLRenderer::create_default_shader_tex(struct shader_pass *pass)
+{
+    if (!compile_shader(GL_VERTEX_SHADER, 0, vertex_shader_default_tex_src, &pass->program.vertex_shader) || !compile_shader(GL_FRAGMENT_SHADER, 0, fragment_shader_default_tex_src, &pass->program.fragment_shader) || !create_program(&pass->program))
+        return 0;
+    glw.glGenVertexArrays(1, (GLuint *) &pass->vertex_array);
+
+    struct shader_uniforms *u = &pass->uniforms;
+    int                     p = pass->program.id;
+    memset(u, -1, sizeof(struct shader_uniforms));
+    u->vertex_coord     = get_attrib(p, "VertexCoord");
+    u->tex_coord        = get_attrib(p, "TexCoord");
+    u->texture          = get_uniform(p, "Texture");
+    pass->scale.mode[0] = pass->scale.mode[1] = SCALE_SOURCE;
+    pass->scale.value[0] = pass->scale.value[1] = 1.0f;
+    pass->fbo.id                                = -1;
+    pass->active                                = 1;
+    return 1;
+}
+
+int
+OpenGLRenderer::create_default_shader_color(struct shader_pass *pass)
+{
+    if (!compile_shader(GL_VERTEX_SHADER, 0, vertex_shader_default_color_src, &pass->program.vertex_shader) || !compile_shader(GL_FRAGMENT_SHADER, 0, fragment_shader_default_color_src, &pass->program.fragment_shader) || !create_program(&pass->program))
+        return 0;
+    glw.glGenVertexArrays(1, (GLuint *) &pass->vertex_array);
+
+    struct shader_uniforms *u = &pass->uniforms;
+    int                     p = pass->program.id;
+    memset(u, -1, sizeof(struct shader_uniforms));
+    u->vertex_coord     = get_attrib(p, "VertexCoord");
+    u->color            = get_attrib(p, "Color");
+    pass->scale.mode[0] = pass->scale.mode[1] = SCALE_SOURCE;
+    pass->scale.value[0] = pass->scale.value[1] = 1.0f;
+    pass->fbo.id                                = -1;
+    pass->active                                = 1;
+    return 1;
+}
+
+/* create the default scene shader */
+void
+OpenGLRenderer::create_scene_shader()
+{
+    struct shader scene_shader_conf;
+    memset(&scene_shader_conf, 0, sizeof(struct shader));
+    create_default_shader_tex(&active_shader->scene);
+    scene_shader_conf.filter_linear = video_filter_method;
+    if (active_shader->num_shaders > 0 && active_shader->shaders[0].input_filter_linear >= 0)
+        scene_shader_conf.filter_linear = active_shader->shaders[0].input_filter_linear;
+    setup_fbo(&scene_shader_conf, &active_shader->scene.fbo);
+
+    memset(&scene_shader_conf, 0, sizeof(struct shader));
+    create_default_shader_color(&active_shader->fs_color);
+    setup_fbo(&scene_shader_conf, &active_shader->fs_color.fbo);
+}
+
+static int
+load_texture(const char *f, struct shader_texture *tex)
+{
+    QImage img;
+    if (!img.load(f))
+        return 0;
+    int width, height;
+    width  = img.size().width();
+    height = img.size().height();
+
+    if (width != next_pow2(width) || height != next_pow2(height))
+        img = img.scaled(next_pow2(width), next_pow2(height));
+
+    width  = img.size().width();
+    height = img.size().height();
+
+    img.convertTo(QImage::Format_RGBA8888);
+
+    const GLubyte *rgb = img.constBits();
+
+    int bpp = 4;
+
+    GLubyte *data = (GLubyte *) malloc((size_t) width * height * bpp);
+
+    int x, y, Y;
+    for (y = 0; y < height; ++y) {
+        Y = height - y - 1;
+        for (x = 0; x < width; x++) {
+            data[(y * width + x) * bpp + 0] = rgb[(Y * width + x) * 3 + 0];
+            data[(y * width + x) * bpp + 1] = rgb[(Y * width + x) * 3 + 1];
+            data[(y * width + x) * bpp + 2] = rgb[(Y * width + x) * 3 + 2];
+            data[(y * width + x) * bpp + 3] = rgb[(Y * width + x) * 3 + 3];
+        }
+    }
+
+    tex->width           = width;
+    tex->height          = height;
+    tex->internal_format = GL_RGBA8;
+    tex->format          = GL_RGBA;
+    tex->type            = GL_UNSIGNED_BYTE;
+    tex->data            = data;
+    return 1;
+}
+
+glsl_t *
+OpenGLRenderer::load_glslp(glsl_t *glsl, int num_shader, const char *f)
+{
+    glslp_t *p = glslp_parse(f);
+
+    if (p) {
+        char path[512];
+        char file[1024];
+        int  failed = 0;
+        strcpy(path, f);
+        char *filename = path_get_filename(path);
+
+        struct glsl_shader *gshader = &glsl->shaders[num_shader];
+
+        strcpy(gshader->name, p->name);
+        *filename = 0;
+
+        gshader->num_lut_textures = p->num_textures;
+
+        for (int i = 0; i < p->num_textures; ++i) {
+            struct texture *texture = &p->textures[i];
+
+            snprintf(file, sizeof(file) - 1, "%s%s", path, texture->path);
+
+            struct shader_lut_texture *tex = &gshader->lut_textures[i];
+            strcpy(tex->name, texture->name);
+
+            ogl3_log("Load texture %s...\n", file);
+
+            if (!load_texture(file, &tex->texture)) {
+                //QMessageBox::critical(main_window, tr("GLSL Error"), tr("Could not load texture: %s").arg(file));
+                main_window->showMessage(MBX_ERROR | MBX_FATAL, tr("GLSL Error"), tr("Could not load texture: %1").arg(file), false);
+                ogl3_log("Could not load texture %s!\n", file);
+                failed = 1;
+                break;
+            }
+
+            if (!strcmp(texture->wrap_mode, "repeat"))
+                tex->texture.wrap_mode = GL_REPEAT;
+            else if (!strcmp(texture->wrap_mode, "mirrored_repeat"))
+                tex->texture.wrap_mode = GL_MIRRORED_REPEAT;
+            else if (!strcmp(texture->wrap_mode, "clamp_to_edge"))
+                tex->texture.wrap_mode = GL_CLAMP_TO_EDGE;
+            else
+                tex->texture.wrap_mode = GL_CLAMP_TO_BORDER;
+
+            tex->texture.mipmap = texture->mipmap;
+
+            tex->texture.min_filter = tex->texture.mag_filter = texture->linear ? GL_LINEAR : GL_NEAREST;
+            if (tex->texture.mipmap)
+                tex->texture.min_filter = texture->linear ? GL_LINEAR_MIPMAP_LINEAR : GL_NEAREST_MIPMAP_NEAREST;
+
+            create_texture(&tex->texture);
+            free(tex->texture.data);
+            tex->texture.data = 0;
+        }
+
+        if (!failed) {
+            gshader->input_filter_linear = p->input_filter_linear;
+
+            gshader->num_parameters = p->num_parameters;
+            for (int j = 0; j < gshader->num_parameters; ++j)
+                memcpy(&gshader->parameters[j], &p->parameters[j], sizeof(struct shader_parameter));
+
+            gshader->num_passes = p->num_shaders;
+
+            for (int i = 0; i < p->num_shaders; ++i) {
+                struct shader      *shader = &p->shaders[i];
+                struct shader_pass *pass   = &gshader->passes[i];
+
+                strcpy(pass->alias, shader->alias);
+                if (!strlen(pass->alias))
+                    snprintf(pass->alias, sizeof(pass->alias) - 1, "Pass %u", (i + 1));
+
+                ogl3_log("Creating pass %u (%s)\n", (i + 1), pass->alias);
+                ogl3_log("Loading shader %s...\n", shader->shader_fn);
+                if (!shader->shader_program) {
+                    main_window->showMessage(MBX_ERROR | MBX_FATAL, tr("GLSL Error"), tr("Could not load shader: %1").arg(shader->shader_fn), false);
+                    // wx_simple_messagebox("GLSL Error", "Could not load shader: %s", shader->shader_fn);
+                    ogl3_log("Could not load shader %s\n", shader->shader_fn);
+                    failed = 1;
+                    break;
+                } else
+                    ogl3_log("Shader %s loaded\n", shader->shader_fn);
+                failed = !compile_shader(GL_VERTEX_SHADER, "#define VERTEX\n#define PARAMETER_UNIFORM\n",
+                                         shader->shader_program, &pass->program.vertex_shader)
+                    || !compile_shader(GL_FRAGMENT_SHADER, "#define FRAGMENT\n#define PARAMETER_UNIFORM\n",
+                                       shader->shader_program, &pass->program.fragment_shader);
+                if (failed)
+                    break;
+
+                if (!create_program(&pass->program)) {
+                    failed = 1;
+                    break;
+                }
+                pass->frame_count_mod  = shader->frame_count_mod;
+                pass->fbo.mipmap_input = shader->mipmap_input;
+
+                glw.glGenVertexArrays(1, (GLuint *) &pass->vertex_array);
+                find_uniforms(gshader, i);
+                setup_scale(shader, pass);
+                if (i == p->num_shaders - 1) /* last pass may or may not be an fbo depending on scale */
+                {
+                    if (num_shader == glsl->num_shaders - 1) {
+                        pass->fbo.id = -1;
+
+                        for (uint8_t j = 0; j < 2; ++j) {
+                            if (pass->scale.mode[j] != SCALE_SOURCE || pass->scale.value[j] != 1) {
+                                setup_fbo(shader, &pass->fbo);
+                                break;
+                            }
+                        }
+                    } else {
+                        /* check if next shaders' first pass wants the input mipmapped (will this ever
+                         * happen?) */
+                        pass->fbo.texture.mipmap = glsl->shaders[num_shader + 1].num_passes > 0 && glsl->shaders[num_shader + 1].passes[0].fbo.mipmap_input;
+                        /* check if next shader wants the output of this pass to be filtered */
+                        if (glsl->shaders[num_shader + 1].num_passes > 0 && glsl->shaders[num_shader + 1].input_filter_linear >= 0)
+                            shader->filter_linear = glsl->shaders[num_shader + 1].input_filter_linear;
+                        setup_fbo(shader, &pass->fbo);
+                    }
+                } else {
+                    /* check if next pass wants the input mipmapped, if so we need to generate mipmaps of this
+                     * pass */
+                    pass->fbo.texture.mipmap = (i + 1) < p->num_shaders && p->shaders[i + 1].mipmap_input;
+                    setup_fbo(shader, &pass->fbo);
+                }
+                if (pass->fbo.srgb)
+                    glsl->srgb = 1;
+                pass->active = 1;
+            }
+            if (!failed) {
+                if (gshader->has_prev) {
+                    struct shader scene_shader_conf;
+                    memset(&scene_shader_conf, 0, sizeof(struct shader));
+                    for (int i = 0; i < MAX_PREV; ++i) {
+                        setup_fbo(&scene_shader_conf, &gshader->prev[i].fbo);
+                    }
+                }
+            }
+        }
+
+        glslp_free(p);
+
+        return glsl;
+    }
+    return 0;
+}
+
+glsl_t *
+OpenGLRenderer::load_shaders(int num, char shaders[MAX_USER_SHADERS][512])
+{
+    glsl_t *glsl;
+
+    glsl = (glsl_t *) malloc(sizeof(glsl_t));
+    memset(glsl, 0, sizeof(glsl_t));
+
+    glsl->num_shaders = num;
+    int failed        = 0;
+    for (int i = num - 1; i >= 0; --i) {
+        const char *f = shaders[i];
+        if (f && strlen(f)) {
+            if (!load_glslp(glsl, i, f)) {
+                failed = 1;
+                break;
+            }
+        }
+    }
+    if (failed) {
+        delete_glsl(glsl);
+        memset(glsl, 0, sizeof(glsl_t));
+    }
+    return glsl;
+}
+
+void
+OpenGLRenderer::read_shader_config()
+{
+    char s[512];
+    for (int i = 0; i < active_shader->num_shaders; ++i) {
+        struct glsl_shader *shader = &active_shader->shaders[i];
+        char               *name   = shader->name;
+        snprintf(s, sizeof(s) -1, "GL3 Shaders - %s", name);
+        //                shader->shader_refresh_rate = config_get_float(CFG_MACHINE, s, "shader_refresh_rate", -1);
+        for (int j = 0; j < shader->num_parameters; ++j) {
+            struct shader_parameter *param = &shader->parameters[j];
+            param->value                   = config_get_double(s, param->id, param->default_value);
+        }
+    }
+}
 
 OpenGLRenderer::OpenGLRenderer(QWidget *parent)
     : QWindow(parent->windowHandle())
     , renderTimer(new QTimer(this))
-    , options(nullptr)
 {
-    renderTimer->setTimerType(Qt::PreciseTimer);
-    /* TODO: need's more accuracy, maybe target 1ms earlier and spin yield */
-    connect(renderTimer, &QTimer::timeout, this, &OpenGLRenderer::render);
+    connect(renderTimer, &QTimer::timeout, this, [this]() { this->render(); } );
+    imagebufs[0] = std::unique_ptr<uint8_t>(new uint8_t[2048 * 2048 * 4]);
+    imagebufs[1] = std::unique_ptr<uint8_t>(new uint8_t[2048 * 2048 * 4]);
 
-    buf_usage = std::vector<std::atomic_flag>(BUFFERCOUNT);
-    for (auto &flag : buf_usage)
-        flag.clear();
-
-    setSurfaceType(QWindow::OpenGLSurface);
+    buf_usage = std::vector<std::atomic_flag>(2);
+    buf_usage[0].clear();
+    buf_usage[1].clear();
 
     QSurfaceFormat format;
 
+    setSurfaceType(QWindow::OpenGLSurface);
+
 #ifdef Q_OS_MACOS
     format.setVersion(4, 1);
 #else
@@ -62,58 +834,19 @@ OpenGLRenderer::OpenGLRenderer(QWidget *parent)
     if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES)
         format.setRenderableType(QSurfaceFormat::OpenGLES);
 
+    format.setSwapInterval(video_vsync ? 1 : 0);
+
     setFormat(format);
 
     parentWidget = parent;
 
-    source.setRect(0, 0, INIT_WIDTH, INIT_HEIGHT);
+    source.setRect(0, 0, 100, 100);
+    isInitialized = false;
+    isFinalized = false;
+    context = nullptr;
 }
 
-OpenGLRenderer::~OpenGLRenderer()
-{
-    finalize();
-}
-
-void
-OpenGLRenderer::exposeEvent(QExposeEvent *event)
-{
-    Q_UNUSED(event);
-
-    if (!isInitialized)
-        initialize();
-
-    onResize(size().width(), size().height());
-}
-
-void
-OpenGLRenderer::resizeEvent(QResizeEvent *event)
-{
-    Q_UNUSED(event);
-
-    onResize(event->size().width(), event->size().height());
-
-    if (notReady())
-        return;
-
-    context->makeCurrent(this);
-
-    glViewport(
-        destination.x() * devicePixelRatio(),
-        destination.y() * devicePixelRatio(),
-        destination.width() * devicePixelRatio(),
-        destination.height() * devicePixelRatio());
-}
-
-bool
-OpenGLRenderer::event(QEvent *event)
-{
-    Q_UNUSED(event);
-
-    bool res = false;
-    if (!eventDelegate(event, res))
-        return QWindow::event(event);
-    return res;
-}
+OpenGLRenderer::~OpenGLRenderer() { finalize(); }
 
 void
 OpenGLRenderer::initialize()
@@ -134,10 +867,19 @@ OpenGLRenderer::initialize()
         if (version.first < 3)
             throw opengl_init_error(tr("OpenGL version 3.0 or greater is required. Current version is %1.%2").arg(version.first).arg(version.second));
 
-        initializeOpenGLFunctions();
+        glw.initializeOpenGLFunctions();
 
-        /* Prepare the shader version string */
-        glslVersion = reinterpret_cast<const char *>(glGetString(GL_SHADING_LANGUAGE_VERSION));
+        ogl3_log("OpenGL information: [%s] %s (%s)\n", glw.glGetString(GL_VENDOR), glw.glGetString(GL_RENDERER), glw.glGetString(GL_VERSION));
+        glsl_version[0] = glsl_version[1] = -1;
+        glw.glGetIntegerv(GL_MAJOR_VERSION, &glsl_version[0]);
+        glw.glGetIntegerv(GL_MINOR_VERSION, &glsl_version[1]);
+        if (glsl_version[0] < 3) {
+            throw opengl_init_error(tr("OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2").arg(glsl_version[0]).arg(glsl_version[1]));
+        }
+        ogl3_log("Using OpenGL %s\n", glw.glGetString(GL_VERSION));
+        ogl3_log("Using Shading Language %s\n", glw.glGetString(GL_SHADING_LANGUAGE_VERSION));
+
+        glslVersion = reinterpret_cast<const char *>(glw.glGetString(GL_SHADING_LANGUAGE_VERSION));
         glslVersion.truncate(4);
         glslVersion.remove('.');
         glslVersion.prepend("#version ");
@@ -146,56 +888,221 @@ OpenGLRenderer::initialize()
         else if (context->format().profile() == QSurfaceFormat::CoreProfile)
             glslVersion.append(" core");
 
-        initializeExtensions();
+        glw.glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size);
+        ogl3_log("Max texture size: %dx%d\n", max_texture_size, max_texture_size);
 
-        initializeBuffers();
+        glw.glEnable(GL_TEXTURE_2D);
 
-        /* Vertex, texture 2d coordinates and color (white) making a quad as triangle strip */
-        const GLfloat surface[] = {
-            -1.f, 1.f, 0.f, 0.f, 1.f, 1.f, 1.f, 1.f,
-            1.f, 1.f, 1.f, 0.f, 1.f, 1.f, 1.f, 1.f,
-            -1.f, -1.f, 0.f, 1.f, 1.f, 1.f, 1.f, 1.f,
-            1.f, -1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f
-        };
+        //renderTimer->start(75);
+        if (video_framerate != -1) {
+            renderTimer->start(ceilf(1000.f / (float)video_framerate));
+        }
 
-        glGenVertexArrays(1, &vertexArrayID);
+        scene_texture.data            = NULL;
+        scene_texture.width           = 2048;
+        scene_texture.height          = 2048;
+        scene_texture.internal_format = GL_RGBA8;
+        scene_texture.format          = GL_BGRA;
+        scene_texture.type            = GL_UNSIGNED_INT_8_8_8_8_REV;
+        scene_texture.wrap_mode       = GL_CLAMP_TO_BORDER;
+        scene_texture.min_filter = scene_texture.mag_filter = video_filter_method ? GL_LINEAR : GL_NEAREST;
+        scene_texture.mipmap                                = 0;
 
-        glBindVertexArray(vertexArrayID);
+        create_texture(&scene_texture);
 
-        glGenBuffers(1, &vertexBufferID);
-        glBindBuffer(GL_ARRAY_BUFFER, vertexBufferID);
-        glBufferData(GL_ARRAY_BUFFER, sizeof(surface), surface, GL_STATIC_DRAW);
+        /* load shader */
+        //        const char* shaders[1];
+        //        shaders[0] = gl3_shader_file;
+        //
+        //        active_shader = load_shaders(1, shaders);
 
-        glGenTextures(1, &textureID);
-        glBindTexture(GL_TEXTURE_2D, textureID);
+        //        const char* shaders[3];
+        //        shaders[0] = "/home/phantasy/git/glsl-shaders/ntsc/ntsc-320px.glslp";
+        //        shaders[1] = "/home/phantasy/git/glsl-shaders/motionblur/motionblur-simple.glslp";
+        //        shaders[2] = "/home/phantasy/git/glsl-shaders/crt/crt-lottes-multipass.glslp";
+        //
+        //        active_shader = load_shaders(3, shaders);
+        int num_shaders = 0;
+        for (int i = 0; i < MAX_USER_SHADERS; ++i) {
+            if (strlen(gl3_shader_file[i]))
+                ++num_shaders;
+            else
+                break;
+        }
+        active_shader = load_shaders(num_shaders, gl3_shader_file);
 
-        const GLfloat border_color[] = { 0.f, 0.f, 0.f, 1.f };
+        create_scene_shader();
 
-        glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_color);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+        /* read config */
+        read_shader_config();
 
-        glTexImage2D(GL_TEXTURE_2D, 0, QOpenGLTexture::RGBA8_UNorm, INIT_WIDTH, INIT_HEIGHT, 0, QOpenGLTexture::BGRA, QOpenGLTexture::UInt32_RGBA8_Rev, NULL);
+        /* buffers */
 
-        reloadOptions();
+        GLfloat vertex[] = { -1.0f, -1.0f, -1.0f, 1.0f, 1.0f, -1.0f, 1.0f, 1.0f };
 
-        glClearColor(0.f, 0.f, 0.f, 1.f);
+        GLfloat inv_vertex[] = { -1.0f, 1.0f, -1.0f, -1.0f, 1.0f, 1.0f, 1.0f, -1.0f };
 
-        glViewport(
-            destination.x() * devicePixelRatio(),
-            destination.y() * devicePixelRatio(),
-            destination.width() * devicePixelRatio(),
-            destination.height() * devicePixelRatio());
+        GLfloat tex_coords[] = { 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f };
 
-        GLenum error = glGetError();
-        if (error != GL_NO_ERROR)
-            throw opengl_init_error(tr("OpenGL initialization failed. Error %1.").arg(error));
+        GLfloat colors[] = { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f };
+
+        /* set the scene shader buffers */
+        {
+            glw.glBindVertexArray(active_shader->scene.vertex_array);
+
+            struct shader_vbo *vbo = &active_shader->scene.vbo;
+
+            glw.glGenBuffers(1, (GLuint *) &vbo->vertex_coord);
+            glw.glBindBuffer(GL_ARRAY_BUFFER, vbo->vertex_coord);
+            glw.glBufferData(GL_ARRAY_BUFFER, sizeof(inv_vertex), inv_vertex, GL_STATIC_DRAW);
+            glw.glVertexAttribPointer(active_shader->scene.uniforms.vertex_coord, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat),
+                                      (GLvoid *) 0);
+
+            glw.glGenBuffers(1, (GLuint *) &vbo->tex_coord);
+            glw.glBindBuffer(GL_ARRAY_BUFFER, vbo->tex_coord);
+            glw.glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coords), tex_coords, GL_DYNAMIC_DRAW);
+            glw.glVertexAttribPointer(active_shader->scene.uniforms.tex_coord, 2, GL_FLOAT, GL_TRUE, 2 * sizeof(GLfloat),
+                                      (GLvoid *) 0);
+        }
+
+        /* set buffers for all passes */
+        for (int j = 0; j < active_shader->num_shaders; ++j) {
+            struct glsl_shader *shader = &active_shader->shaders[j];
+            for (int i = 0; i < shader->num_passes; ++i) {
+                struct shader_uniforms *u = &shader->passes[i].uniforms;
+
+                glw.glBindVertexArray(shader->passes[i].vertex_array);
+
+                struct shader_vbo *vbo = &shader->passes[i].vbo;
+
+                glw.glGenBuffers(1, (GLuint *) &vbo->vertex_coord);
+                glw.glBindBuffer(GL_ARRAY_BUFFER, vbo->vertex_coord);
+                glw.glBufferData(GL_ARRAY_BUFFER, sizeof(vertex), vertex, GL_STATIC_DRAW);
+
+                glw.glVertexAttribPointer(u->vertex_coord, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), (GLvoid *) 0);
+
+                glw.glGenBuffers(1, (GLuint *) &vbo->tex_coord);
+                glw.glBindBuffer(GL_ARRAY_BUFFER, vbo->tex_coord);
+                glw.glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coords), tex_coords, GL_DYNAMIC_DRAW);
+                glw.glVertexAttribPointer(u->tex_coord, 2, GL_FLOAT, GL_TRUE, 2 * sizeof(GLfloat), (GLvoid *) 0);
+
+                if (u->color) {
+                    glw.glGenBuffers(1, (GLuint *) &vbo->color);
+                    glw.glBindBuffer(GL_ARRAY_BUFFER, vbo->color);
+                    glw.glBufferData(GL_ARRAY_BUFFER, sizeof(colors), colors, GL_STATIC_DRAW);
+                    glw.glVertexAttribPointer(u->color, 4, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), (GLvoid *) 0);
+                }
+            }
+        }
+
+        for (int i = 0; i < active_shader->num_shaders; ++i) {
+            struct glsl_shader *shader = &active_shader->shaders[i];
+            if (shader->has_prev) {
+                struct shader_pass *prev_pass = &shader->prev_scene;
+                create_default_shader_tex(prev_pass);
+
+                struct shader_vbo *vbo = &prev_pass->vbo;
+
+                glw.glBindVertexArray(prev_pass->vertex_array);
+
+                glw.glGenBuffers(1, (GLuint *) &vbo->vertex_coord);
+                glw.glBindBuffer(GL_ARRAY_BUFFER, vbo->vertex_coord);
+                glw.glBufferData(GL_ARRAY_BUFFER, sizeof(vertex), vertex, GL_STATIC_DRAW);
+                glw.glVertexAttribPointer(prev_pass->uniforms.vertex_coord, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat),
+                                          (GLvoid *) 0);
+
+                glw.glGenBuffers(1, (GLuint *) &vbo->tex_coord);
+                glw.glBindBuffer(GL_ARRAY_BUFFER, vbo->tex_coord);
+                glw.glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coords), tex_coords, GL_DYNAMIC_DRAW);
+                glw.glVertexAttribPointer(prev_pass->uniforms.tex_coord, 2, GL_FLOAT, GL_TRUE, 2 * sizeof(GLfloat),
+                                          (GLvoid *) 0);
+
+                for (int j = 0; j < MAX_PREV; ++j) {
+                    struct shader_prev *prev     = &shader->prev[j];
+                    struct shader_vbo  *prev_vbo = &prev->vbo;
+
+                    glw.glGenBuffers(1, (GLuint *) &prev_vbo->vertex_coord);
+                    glw.glBindBuffer(GL_ARRAY_BUFFER, prev_vbo->vertex_coord);
+                    glw.glBufferData(GL_ARRAY_BUFFER, sizeof(vertex), vertex, GL_STATIC_DRAW);
+
+                    glw.glGenBuffers(1, (GLuint *) &prev_vbo->tex_coord);
+                    glw.glBindBuffer(GL_ARRAY_BUFFER, prev_vbo->tex_coord);
+                    glw.glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coords), tex_coords, GL_DYNAMIC_DRAW);
+                }
+            }
+        }
+
+        /* create final pass */
+        if (active_shader->num_shaders == 0 || active_shader->shaders[active_shader->num_shaders - 1].passes[active_shader->shaders[active_shader->num_shaders - 1].num_passes - 1].fbo.id >= 0) {
+            struct shader_pass *final_pass = &active_shader->final_pass;
+            create_default_shader_tex(final_pass);
+
+            glw.glBindVertexArray(final_pass->vertex_array);
+
+            struct shader_vbo *vbo = &final_pass->vbo;
+
+            glw.glGenBuffers(1, (GLuint *) &vbo->vertex_coord);
+            glw.glBindBuffer(GL_ARRAY_BUFFER, vbo->vertex_coord);
+            glw.glBufferData(GL_ARRAY_BUFFER, sizeof(vertex), vertex, GL_STATIC_DRAW);
+            glw.glVertexAttribPointer(final_pass->uniforms.vertex_coord, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat),
+                                      (GLvoid *) 0);
+
+            glw.glGenBuffers(1, (GLuint *) &vbo->tex_coord);
+            glw.glBindBuffer(GL_ARRAY_BUFFER, vbo->tex_coord);
+            glw.glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coords), tex_coords, GL_DYNAMIC_DRAW);
+            glw.glVertexAttribPointer(final_pass->uniforms.tex_coord, 2, GL_FLOAT, GL_TRUE, 2 * sizeof(GLfloat),
+                                      (GLvoid *) 0);
+        }
+
+        {
+            struct shader_pass *color_pass = &active_shader->fs_color;
+            create_default_shader_color(color_pass);
+
+            glw.glBindVertexArray(color_pass->vertex_array);
+
+            struct shader_vbo *vbo = &color_pass->vbo;
+
+            glw.glGenBuffers(1, (GLuint *) &vbo->vertex_coord);
+            glw.glBindBuffer(GL_ARRAY_BUFFER, vbo->vertex_coord);
+            glw.glBufferData(GL_ARRAY_BUFFER, sizeof(vertex), vertex, GL_STATIC_DRAW);
+            glw.glVertexAttribPointer(color_pass->uniforms.vertex_coord, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat),
+                                      (GLvoid *) 0);
+
+            glw.glGenBuffers(1, (GLuint *) &vbo->color);
+            glw.glBindBuffer(GL_ARRAY_BUFFER, vbo->color);
+            glw.glBufferData(GL_ARRAY_BUFFER, sizeof(colors), colors, GL_DYNAMIC_DRAW);
+            glw.glVertexAttribPointer(color_pass->uniforms.color, 4, GL_FLOAT, GL_TRUE, 4 * sizeof(GLfloat), (GLvoid *) 0);
+        }
+#ifdef SDL2_SHADER_DEBUG
+        struct shader_pass *debug_pass = &active_shader->debug;
+        create_default_shader(debug_pass);
+
+        glw.glBindVertexArray(debug_pass->vertex_array);
+
+        struct shader_vbo *vbo = &debug_pass->vbo;
+
+        glw.glGenBuffers(1, &vbo->vertex_coord);
+        glw.glBindBuffer(GL_ARRAY_BUFFER, vbo->vertex_coord);
+        glw.glBufferData(GL_ARRAY_BUFFER, sizeof(vertex), vertex, GL_STATIC_DRAW);
+        glw.glVertexAttribPointer(debug_pass->uniforms.vertex_coord, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), (GLvoid *) 0);
+
+        glw.glGenBuffers(1, &vbo->tex_coord);
+        glw.glBindBuffer(GL_ARRAY_BUFFER, vbo->tex_coord);
+        glw.glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coords), tex_coords, GL_DYNAMIC_DRAW);
+        glw.glVertexAttribPointer(debug_pass->uniforms.tex_coord, 2, GL_FLOAT, GL_TRUE, 2 * sizeof(GLfloat), (GLvoid *) 0);
+#endif
+
+        glw.glBindBuffer(GL_ARRAY_BUFFER, 0);
+        glw.glBindVertexArray(0);
 
         isInitialized = true;
+        isFinalized   = false;
 
         emit initialized();
 
-        glClear(GL_COLOR_BUFFER_BIT);
+        glw.glClearColor(0, 0, 0, 1);
+        
+        glw.glClear(GL_COLOR_BUFFER_BIT);
 
         context->swapBuffers(this);
     } catch (const opengl_init_error &e) {
@@ -203,7 +1110,7 @@ OpenGLRenderer::initialize()
         for (auto &flag : buf_usage)
             flag.test_and_set();
 
-        QMessageBox::critical((QWidget *) qApp->findChild<QWindow *>(), tr("Error initializing OpenGL"), e.what() % tr("\nFalling back to software rendering."));
+        main_window->showMessage(MBX_ERROR | MBX_FATAL, tr("Error initializing OpenGL"), e.what() + tr("\nFalling back to software rendering."), false);
 
         context->doneCurrent();
         isFinalized   = true;
@@ -216,216 +1123,26 @@ OpenGLRenderer::initialize()
 void
 OpenGLRenderer::finalize()
 {
-    if (isFinalized)
+    if (isFinalized || !context)
         return;
 
-    renderTimer->stop();
-
     context->makeCurrent(this);
 
-    if (hasBufferStorage)
-        glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
+    delete_texture(&scene_texture);
 
-    glDeleteBuffers(1, &unpackBufferID);
-    glDeleteTextures(1, &textureID);
-    glDeleteBuffers(1, &vertexBufferID);
-    glDeleteVertexArrays(1, &vertexArrayID);
-
-    if (!hasBufferStorage && unpackBuffer)
-        free(unpackBuffer);
+    if (active_shader) {
+        delete_glsl(active_shader);
+        free(active_shader);
+    }
+    active_shader = NULL;
 
     context->doneCurrent();
 
+    context = nullptr;
+
     isFinalized = true;
 }
 
-QDialog *
-OpenGLRenderer::getOptions(QWidget *parent)
-{
-    auto dialog = new OpenGLOptionsDialog(parent, *options, [this]() { return new OpenGLOptions(this, false, glslVersion); });
-
-    connect(dialog, &OpenGLOptionsDialog::optionsChanged, this, &OpenGLRenderer::updateOptions);
-
-    return dialog;
-}
-
-void
-OpenGLRenderer::initializeExtensions()
-{
-#ifndef NO_BUFFER_STORAGE
-    if (context->hasExtension("GL_ARB_buffer_storage") || context->hasExtension("GL_EXT_buffer_storage")) {
-        hasBufferStorage = true;
-
-        glBufferStorage = (PFNGLBUFFERSTORAGEEXTPROC_LOCAL) context->getProcAddress(context->hasExtension("GL_EXT_buffer_storage") ? "glBufferStorageEXT" : "glBufferStorage");
-        if (!glBufferStorage)
-            glBufferStorage = (PFNGLBUFFERSTORAGEEXTPROC_LOCAL) context->getProcAddress("glBufferStorage");
-    }
-#endif
-}
-
-void
-OpenGLRenderer::initializeBuffers()
-{
-    glGenBuffers(1, &unpackBufferID);
-
-    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, unpackBufferID);
-
-    if (hasBufferStorage) {
-#ifndef NO_BUFFER_STORAGE
-        /* Create persistent buffer for pixel transfer. */
-        glBufferStorage(GL_PIXEL_UNPACK_BUFFER, BUFFERBYTES * BUFFERCOUNT, NULL, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT);
-
-        unpackBuffer = glMapBufferRange(GL_PIXEL_UNPACK_BUFFER, 0, BUFFERBYTES * BUFFERCOUNT, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT);
-#endif
-    } else {
-        /* Fallback; create our own buffer. */
-        unpackBuffer = malloc(BUFFERBYTES * BUFFERCOUNT);
-
-        if (unpackBuffer == nullptr)
-            throw opengl_init_error(tr("Allocating memory for unpack buffer failed."));
-
-        glBufferData(GL_PIXEL_UNPACK_BUFFER, BUFFERBYTES * BUFFERCOUNT, NULL, GL_STREAM_DRAW);
-    }
-}
-
-void
-OpenGLRenderer::applyOptions()
-{
-    /* TODO: change detection in options */
-
-    if (options->framerate() > 0) {
-        int interval = (int) ceilf(1000.f / (float) options->framerate());
-        renderTimer->setInterval(std::chrono::milliseconds(interval));
-    }
-
-    if (options->renderBehavior() == OpenGLOptions::TargetFramerate)
-        renderTimer->start();
-    else
-        renderTimer->stop();
-
-    auto format   = this->format();
-    int  interval = options->vSync() ? 1 : 0;
-
-    if (format.swapInterval() != interval) {
-        format.setSwapInterval(interval);
-        setFormat(format);
-        context->setFormat(format);
-    }
-
-    GLint filter = options->filter() == OpenGLOptions::Linear ? GL_LINEAR : GL_NEAREST;
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter);
-
-    currentFilter = options->filter();
-}
-
-void
-OpenGLRenderer::reloadOptions()
-{
-    if (options) {
-        delete options;
-        options = nullptr;
-    }
-    options = new OpenGLOptions(this, true, glslVersion);
-
-    applyOptions();
-}
-
-void
-OpenGLRenderer::applyShader(const OpenGLShaderPass &shader)
-{
-    if (!shader.bind())
-        return;
-
-    if (shader.vertex_coord() != -1) {
-        glEnableVertexAttribArray(shader.vertex_coord());
-        glVertexAttribPointer(shader.vertex_coord(), 2, GL_FLOAT, GL_FALSE, 8 * sizeof(GLfloat), 0);
-    }
-
-    if (shader.tex_coord() != -1) {
-        glEnableVertexAttribArray(shader.tex_coord());
-        glVertexAttribPointer(shader.tex_coord(), 2, GL_FLOAT, GL_FALSE, 8 * sizeof(GLfloat), (void *) (2 * sizeof(GLfloat)));
-    }
-
-    if (shader.color() != -1) {
-        glEnableVertexAttribArray(shader.color());
-        glVertexAttribPointer(shader.color(), 4, GL_FLOAT, GL_FALSE, 8 * sizeof(GLfloat), (void *) (4 * sizeof(GLfloat)));
-    }
-
-    if (shader.mvp_matrix() != -1) {
-        static const GLfloat mvp[] = {
-            1.f, 0.f, 0.f, 0.f,
-            0.f, 1.f, 0.f, 0.f,
-            0.f, 0.f, 1.f, 0.f,
-            0.f, 0.f, 0.f, 1.f
-        };
-        glUniformMatrix4fv(shader.mvp_matrix(), 1, GL_FALSE, mvp);
-    }
-
-    if (shader.output_size() != -1)
-        glUniform2f(shader.output_size(), destination.width(), destination.height());
-
-    if (shader.input_size() != -1)
-        glUniform2f(shader.input_size(), source.width(), source.height());
-
-    if (shader.texture_size() != -1)
-        glUniform2f(shader.texture_size(), source.width(), source.height());
-
-    if (shader.frame_count() != -1)
-        glUniform1i(shader.frame_count(), frameCounter);
-}
-
-void
-OpenGLRenderer::render()
-{
-    context->makeCurrent(this);
-
-    if (options->filter() != currentFilter)
-        applyOptions();
-
-    /* TODO: multiple shader passes */
-    applyShader(options->shaders().first());
-
-    glClear(GL_COLOR_BUFFER_BIT);
-    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-
-    context->swapBuffers(this);
-
-    frameCounter = (frameCounter + 1) & 1023;
-}
-
-void
-OpenGLRenderer::updateOptions(OpenGLOptions *newOptions)
-{
-    context->makeCurrent(this);
-
-    glUseProgram(0);
-
-    delete options;
-
-    options = newOptions;
-
-    options->setParent(this);
-
-    applyOptions();
-}
-
-std::vector<std::tuple<uint8_t *, std::atomic_flag *>>
-OpenGLRenderer::getBuffers()
-{
-    std::vector<std::tuple<uint8_t *, std::atomic_flag *>> buffers;
-
-    if (notReady() || !unpackBuffer)
-        return buffers;
-
-    /* Split the buffer area */
-    for (int i = 0; i < BUFFERCOUNT; i++) {
-        buffers.push_back(std::make_tuple((uint8_t *) unpackBuffer + BUFFERBYTES * i, &buf_usage[i]));
-    }
-
-    return buffers;
-}
-
 void
 OpenGLRenderer::onBlit(int buf_idx, int x, int y, int w, int h)
 {
@@ -434,35 +1151,576 @@ OpenGLRenderer::onBlit(int buf_idx, int x, int y, int w, int h)
 
     context->makeCurrent(this);
 
-#ifdef Q_OS_MACOS
-    glViewport(
-        destination.x() * devicePixelRatio(),
-        destination.y() * devicePixelRatio(),
-        destination.width() * devicePixelRatio(),
-        destination.height() * devicePixelRatio());
-#endif
-
     if (source.width() != w || source.height() != h) {
-        source.setRect(0, 0, w, h);
-
-        /* Resize the texture */
-        glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-        glTexImage2D(GL_TEXTURE_2D, 0, (GLenum) QOpenGLTexture::RGBA8_UNorm, source.width(), source.height(), 0, (GLenum) QOpenGLTexture::BGRA, (GLenum) QOpenGLTexture::UInt32_RGBA8_Rev, NULL);
-        glBindBuffer(GL_PIXEL_UNPACK_BUFFER, unpackBufferID);
+        glw.glBindTexture(GL_TEXTURE_2D, scene_texture.id);
+        glw.glTexImage2D(GL_TEXTURE_2D, 0, (GLenum) QOpenGLTexture::RGBA8_UNorm, w, h, 0, (GLenum) QOpenGLTexture::BGRA, (GLenum) QOpenGLTexture::UInt32_RGBA8_Rev, NULL);
+        glw.glBindTexture(GL_TEXTURE_2D, 0);
     }
 
-    if (!hasBufferStorage)
-        glBufferSubData(GL_PIXEL_UNPACK_BUFFER, BUFFERBYTES * buf_idx, h * ROW_LENGTH * sizeof(uint32_t) + (y * ROW_LENGTH * sizeof(uint32_t)), (uint8_t *) unpackBuffer + BUFFERBYTES * buf_idx);
+    source.setRect(x, y, w, h);
 
-    glPixelStorei(GL_UNPACK_SKIP_PIXELS, BUFFERPIXELS * buf_idx + y * ROW_LENGTH + x);
-    glPixelStorei(GL_UNPACK_ROW_LENGTH, ROW_LENGTH);
-    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, (GLenum) QOpenGLTexture::BGRA, (GLenum) QOpenGLTexture::UInt32_RGBA8_Rev, NULL);
-
-    /* TODO: check if fence sync is implementable here and still has any benefit. */
-    glFinish();
+    glw.glBindTexture(GL_TEXTURE_2D, scene_texture.id);
+    glw.glPixelStorei(GL_UNPACK_ROW_LENGTH, 2048);
+    glw.glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, (GLenum) QOpenGLTexture::BGRA, (GLenum) QOpenGLTexture::UInt32_RGBA8_Rev, (const void *) ((uintptr_t) imagebufs[buf_idx].get() + (uintptr_t) (2048 * 4 * y + x * 4)));
+    glw.glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+    glw.glBindTexture(GL_TEXTURE_2D, 0);
 
     buf_usage[buf_idx].clear();
+    source.setRect(x, y, w, h);
+    this->pixelRatio = devicePixelRatio();
+    onResize(this->width(), this->height());
 
-    if (options->renderBehavior() == OpenGLOptions::SyncWithVideo)
+#ifdef Q_OS_MACOS
+    glw.glViewport(
+        destination.x(),
+        destination.y(),
+        destination.width(),
+        destination.height());
+#endif
+
+    if (video_framerate == -1)
         render();
 }
+
+std::vector<std::tuple<uint8_t *, std::atomic_flag *>>
+OpenGLRenderer::getBuffers()
+{
+    std::vector<std::tuple<uint8_t *, std::atomic_flag *>> buffers;
+
+    buffers.push_back(std::make_tuple(imagebufs[0].get(), &buf_usage[0]));
+    buffers.push_back(std::make_tuple(imagebufs[1].get(), &buf_usage[1]));
+
+    return buffers;
+}
+
+void
+OpenGLRenderer::exposeEvent(QExposeEvent *event)
+{
+    Q_UNUSED(event);
+
+    if (!isInitialized)
+        initialize();
+
+    this->pixelRatio = devicePixelRatio();
+    onResize(size().width(), size().height());
+}
+
+void
+OpenGLRenderer::resizeEvent(QResizeEvent *event)
+{
+    Q_UNUSED(event);
+
+    this->pixelRatio = devicePixelRatio();
+    onResize(event->size().width(), event->size().height());
+
+    if (notReady())
+        return;
+
+    context->makeCurrent(this);
+
+    glw.glViewport(
+        destination.x(),
+        destination.y(),
+        destination.width(),
+        destination.height());
+}
+
+void
+OpenGLRenderer::render_pass(struct render_data *data)
+{
+    GLuint texture_unit = 0;
+
+    //        ogl3_log("pass %d: %gx%g, %gx%g -> %gx%g, %gx%g, %gx%g\n", num_pass, pass->state.input_size[0],
+    //        pass->state.input_size[1], pass->state.input_texture_size[0], pass->state.input_texture_size[1],
+    //        pass->state.output_size[0], pass->state.output_size[1], pass->state.output_texture_size[0],
+    //        pass->state.output_texture_size[1], output_size[0], output_size[1]);
+
+    glw.glBindVertexArray(data->shader_pass->vertex_array);
+
+    GLint                   p = data->shader_pass->program.id;
+    struct shader_uniforms *u = &data->shader_pass->uniforms;
+
+    glw.glUseProgram(p);
+
+    if (data->texture) {
+        glw.glActiveTexture(GL_TEXTURE0 + texture_unit);
+        glw.glBindTexture(GL_TEXTURE_2D, data->texture);
+        glw.glUniform1i(u->texture, texture_unit);
+        texture_unit++;
+    }
+
+    if (u->color >= 0)
+        glw.glEnableVertexAttribArray(u->color);
+
+    if (u->mvp_matrix >= 0)
+        glw.glUniformMatrix4fv(u->mvp_matrix, 1, 0, matrix);
+    if (u->frame_direction >= 0)
+        glw.glUniform1i(u->frame_direction, 1);
+
+    int framecnt = data->frame_count;
+    if (data->shader_pass->frame_count_mod > 0)
+        framecnt = framecnt % data->shader_pass->frame_count_mod;
+    if (u->frame_count >= 0)
+        glw.glUniform1i(u->frame_count, framecnt);
+
+    if (u->input_size >= 0)
+        glw.glUniform2fv(u->input_size, 1, data->shader_pass->state.input_size);
+    if (u->texture_size >= 0)
+        glw.glUniform2fv(u->texture_size, 1, data->shader_pass->state.input_texture_size);
+    if (u->output_size >= 0)
+        glw.glUniform2fv(u->output_size, 1, data->output_size);
+
+    if (data->shader) {
+        /* parameters */
+        for (int i = 0; i < data->shader->num_parameters; ++i)
+            if (u->parameters[i] >= 0)
+                glw.glUniform1f(u->parameters[i], data->shader->parameters[i].value);
+
+        if (data->pass > 0) {
+            struct shader_pass *passes = data->shader->passes;
+            struct shader_pass *orig   = data->orig_pass;
+            if (u->orig.texture >= 0) {
+                glw.glActiveTexture(GL_TEXTURE0 + texture_unit);
+                glw.glBindTexture(GL_TEXTURE_2D, orig->fbo.texture.id);
+                glw.glUniform1i(u->orig.texture, texture_unit);
+                texture_unit++;
+            }
+            if (u->orig.input_size >= 0)
+                glw.glUniform2fv(u->orig.input_size, 1, orig->state.input_size);
+            if (u->orig.texture_size >= 0)
+                glw.glUniform2fv(u->orig.texture_size, 1, orig->state.input_texture_size);
+
+            for (int i = 0; i < data->pass; ++i) {
+                if (u->pass[i].texture >= 0) {
+                    glw.glActiveTexture(GL_TEXTURE0 + texture_unit);
+                    glw.glBindTexture(GL_TEXTURE_2D, passes[i].fbo.texture.id);
+                    glw.glUniform1i(u->pass[i].texture, texture_unit);
+                    texture_unit++;
+                }
+                if (u->pass[i].texture_size >= 0)
+                    glw.glUniform2fv(u->pass[i].texture_size, 1, passes[i].state.input_texture_size);
+                if (u->pass[i].input_size >= 0)
+                    glw.glUniform2fv(u->pass[i].input_size, 1, passes[i].state.input_size);
+
+                if (u->prev_pass[i].texture >= 0) {
+                    glw.glActiveTexture(GL_TEXTURE0 + texture_unit);
+                    glw.glBindTexture(GL_TEXTURE_2D, passes[i].fbo.texture.id);
+                    glw.glUniform1i(u->prev_pass[i].texture, texture_unit);
+                    texture_unit++;
+                }
+                if (u->prev_pass[i].texture_size >= 0)
+                    glw.glUniform2fv(u->prev_pass[i].texture_size, 1, passes[i].state.input_texture_size);
+                if (u->prev_pass[i].input_size >= 0)
+                    glw.glUniform2fv(u->prev_pass[i].input_size, 1, passes[i].state.input_size);
+            }
+        }
+
+        if (data->shader->has_prev) {
+            /* loop through each previous frame */
+            for (int i = 0; i < MAX_PREV; ++i) {
+                if (u->prev[i].texture >= 0) {
+                    glw.glActiveTexture(GL_TEXTURE0 + texture_unit);
+                    glw.glBindTexture(GL_TEXTURE_2D, data->shader->prev[i].fbo.texture.id);
+                    glw.glUniform1i(u->prev[i].texture, texture_unit);
+                    texture_unit++;
+                }
+                if (u->prev[i].tex_coord >= 0) {
+                    glw.glBindBuffer(GL_ARRAY_BUFFER, data->shader->prev[i].vbo.tex_coord);
+                    glw.glVertexAttribPointer(u->prev[i].tex_coord, 2, GL_FLOAT, GL_TRUE,
+                                              2 * sizeof(GLfloat), (GLvoid *) 0);
+                    glw.glEnableVertexAttribArray(u->prev[i].tex_coord);
+                    glw.glBindBuffer(GL_ARRAY_BUFFER, 0);
+                }
+            }
+        }
+
+        for (int i = 0; i < data->shader->num_lut_textures; ++i) {
+            if (u->lut_textures[i] >= 0) {
+                glw.glActiveTexture(GL_TEXTURE0 + texture_unit);
+                glw.glBindTexture(GL_TEXTURE_2D, data->shader->lut_textures[i].texture.id);
+                glw.glUniform1i(u->lut_textures[i], texture_unit);
+                texture_unit++;
+            }
+        }
+    }
+
+    glw.glEnableVertexAttribArray(u->vertex_coord);
+    glw.glEnableVertexAttribArray(u->tex_coord);
+
+    glw.glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+    glw.glActiveTexture(GL_TEXTURE0);
+    glw.glBindTexture(GL_TEXTURE_2D, 0);
+
+    glw.glDisableVertexAttribArray(data->shader_pass->uniforms.vertex_coord);
+    glw.glDisableVertexAttribArray(data->shader_pass->uniforms.tex_coord);
+    if (data->shader_pass->uniforms.color >= 0)
+        glw.glDisableVertexAttribArray(data->shader_pass->uniforms.color);
+
+    if (data->shader && data->shader->has_prev) {
+        for (int i = 0; i < MAX_PREV; ++i) {
+            if (u->prev[i].tex_coord >= 0)
+                glw.glDisableVertexAttribArray(u->prev[i].tex_coord);
+        }
+    }
+
+    glw.glBindVertexArray(0);
+
+    glw.glUseProgram(0);
+}
+
+bool
+OpenGLRenderer::event(QEvent *event)
+{
+    Q_UNUSED(event);
+
+    bool res = false;
+    if (!eventDelegate(event, res))
+        return QWindow::event(event);
+    return res;
+}
+
+QDialog*
+OpenGLRenderer::getOptions(QWidget *parent)
+{
+    return new OpenGLShaderManagerDialog(parent);
+}
+
+extern void standalone_scale(QRect &destination, int width, int height, QRect source, int scalemode);
+
+void
+OpenGLRenderer::render()
+{
+    if (!context)
+        return;
+
+    if (notReady())
+        return;
+
+    struct {
+        uint32_t x;
+        uint32_t y;
+        uint32_t w;
+        uint32_t h;
+    } window_rect;
+
+    window_rect.x = destination.x();
+    window_rect.y = destination.y();
+    window_rect.w = destination.width();
+    window_rect.h = destination.height();
+
+    glw.glBindTexture(GL_TEXTURE_2D, scene_texture.id);
+    scene_texture.min_filter = scene_texture.mag_filter = video_filter_method ? GL_LINEAR : GL_NEAREST;
+    active_shader->scene.fbo.texture.min_filter = active_shader->scene.fbo.texture.mag_filter = video_filter_method ? GL_LINEAR : GL_NEAREST;
+    glw.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, video_filter_method ? GL_LINEAR : GL_NEAREST);
+    glw.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, video_filter_method ? GL_LINEAR : GL_NEAREST);
+    glw.glBindTexture(GL_TEXTURE_2D, active_shader->scene.fbo.texture.id);
+    glw.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, video_filter_method ? GL_LINEAR : GL_NEAREST);
+    glw.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, video_filter_method ? GL_LINEAR : GL_NEAREST);
+    glw.glBindTexture(GL_TEXTURE_2D, 0);
+
+    GLfloat orig_output_size[] = { (GLfloat)window_rect.w, (GLfloat)window_rect.h };
+
+    if (active_shader->srgb)
+        glw.glEnable(GL_FRAMEBUFFER_SRGB);
+
+    struct render_data data;
+
+    /* render scene to texture */
+    {
+        struct shader_pass *pass = &active_shader->scene;
+
+        QRect rect;
+        rect.setX(0);
+        rect.setY(0);
+        rect.setWidth(source.width() * video_gl_input_scale);
+        rect.setHeight(source.height() * video_gl_input_scale);
+
+        standalone_scale(rect, source.width(), source.height(), rect, video_gl_input_scale_mode);
+
+        pass->state.input_size[0] = pass->state.output_size[0] = rect.width();
+        pass->state.input_size[1] = pass->state.output_size[1] = rect.height();
+
+        pass->state.input_texture_size[0] = pass->state.output_texture_size[0] = next_pow2(pass->state.output_size[0]);
+        pass->state.input_texture_size[1] = pass->state.output_texture_size[1] = next_pow2(pass->state.output_size[1]);
+
+        recreate_fbo(&active_shader->scene.fbo, pass->state.output_texture_size[0], pass->state.output_texture_size[1]);
+
+        glw.glBindFramebuffer(GL_FRAMEBUFFER, active_shader->scene.fbo.id);
+        glw.glClearColor(0, 0, 0, 1);
+        glw.glClear(GL_COLOR_BUFFER_BIT);
+
+        glw.glViewport(0, 0, pass->state.output_size[0], pass->state.output_size[1]);
+
+        GLfloat minx = 0;
+        GLfloat miny = 0;
+        GLfloat maxx = pass->state.output_size[0] / (GLfloat) pass->state.output_texture_size[0];
+        GLfloat maxy = pass->state.output_size[1] / (GLfloat) pass->state.output_texture_size[1];
+
+        pass->state.tex_coords[0] = minx;
+        pass->state.tex_coords[1] = miny;
+        pass->state.tex_coords[2] = minx;
+        pass->state.tex_coords[3] = maxy;
+        pass->state.tex_coords[4] = maxx;
+        pass->state.tex_coords[5] = miny;
+        pass->state.tex_coords[6] = maxx;
+        pass->state.tex_coords[7] = maxy;
+
+        // create input tex coords
+        minx = 0;
+        miny = 0;
+        maxx = 1;
+        maxy = 1;
+
+        GLfloat tex_coords[] = { minx, miny, minx, maxy, maxx, miny, maxx, maxy };
+
+        glw.glBindVertexArray(pass->vertex_array);
+
+        glw.glBindBuffer(GL_ARRAY_BUFFER, pass->vbo.tex_coord);
+        glw.glBufferSubData(GL_ARRAY_BUFFER, 0, 8 * sizeof(GLfloat), tex_coords);
+        glw.glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+        memset(&data, 0, sizeof(struct render_data));
+        data.pass        = -1;
+        data.shader_pass = &active_shader->scene;
+        data.texture     = scene_texture.id;
+        data.output_size = orig_output_size;
+        render_pass(&data);
+
+        glw.glBindFramebuffer(GL_FRAMEBUFFER, 0);
+    }
+
+    struct shader_pass *orig  = &active_shader->scene;
+    struct shader_pass *input = &active_shader->scene;
+
+    for (int s = 0; s < active_shader->num_shaders; ++s) {
+        struct glsl_shader *shader = &active_shader->shaders[s];
+
+        int frame_count = frameCounter;
+
+        /* loop through each pass */
+        for (int i = 0; i < shader->num_passes; ++i) {
+            bool resetFiltering = false;
+            struct shader_pass *pass = &shader->passes[i];
+
+            memcpy(pass->state.input_size, input->state.output_size, 2 * sizeof(GLfloat));
+            memcpy(pass->state.input_texture_size, input->state.output_texture_size, 2 * sizeof(GLfloat));
+
+            for (uint8_t j = 0; j < 2; ++j) {
+                if (pass->scale.mode[j] == SCALE_VIEWPORT)
+                    pass->state.output_size[j] = orig_output_size[j] * pass->scale.value[j];
+                else if (pass->scale.mode[j] == SCALE_ABSOLUTE)
+                    pass->state.output_size[j] = pass->scale.value[j];
+                else
+                    pass->state.output_size[j] = pass->state.input_size[j] * pass->scale.value[j];
+
+                pass->state.output_texture_size[j] = next_pow2(pass->state.output_size[j]);
+            }
+
+            if (pass->fbo.id >= 0) {
+                recreate_fbo(&pass->fbo, pass->state.output_texture_size[0], pass->state.output_texture_size[1]);
+
+                glw.glBindFramebuffer(GL_FRAMEBUFFER, pass->fbo.id);
+                glw.glViewport(0, 0, pass->state.output_size[0], pass->state.output_size[1]);
+            } else {
+                resetFiltering = true;
+                glw.glBindTexture(GL_TEXTURE_2D, input->fbo.texture.id);
+                glw.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, video_filter_method ? GL_LINEAR : GL_NEAREST);
+                glw.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, video_filter_method ? GL_LINEAR : GL_NEAREST);
+                glw.glBindTexture(GL_TEXTURE_2D, 0);
+                glw.glViewport(window_rect.x, window_rect.y, window_rect.w, window_rect.h);
+            }
+
+            glw.glClearColor(0, 0, 0, 1);
+            glw.glClear(GL_COLOR_BUFFER_BIT);
+
+            GLfloat minx = 0;
+            GLfloat miny = 0;
+            GLfloat maxx = pass->state.output_size[0] / (GLfloat) pass->state.output_texture_size[0];
+            GLfloat maxy = pass->state.output_size[1] / (GLfloat) pass->state.output_texture_size[1];
+
+            pass->state.tex_coords[0] = minx;
+            pass->state.tex_coords[1] = miny;
+            pass->state.tex_coords[2] = minx;
+            pass->state.tex_coords[3] = maxy;
+            pass->state.tex_coords[4] = maxx;
+            pass->state.tex_coords[5] = miny;
+            pass->state.tex_coords[6] = maxx;
+            pass->state.tex_coords[7] = maxy;
+
+            glw.glBindVertexArray(pass->vertex_array);
+
+            glw.glBindBuffer(GL_ARRAY_BUFFER, pass->vbo.tex_coord);
+            glw.glBufferSubData(GL_ARRAY_BUFFER, 0, 8 * sizeof(GLfloat), input->state.tex_coords);
+            glw.glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+            memset(&data, 0, sizeof(struct render_data));
+            data.shader      = shader;
+            data.pass        = i;
+            data.shader_pass = pass;
+            data.texture     = input->fbo.texture.id;
+            data.output_size = orig_output_size;
+            data.orig_pass   = orig;
+            data.frame_count = frame_count;
+
+            render_pass(&data);
+
+            glw.glBindFramebuffer(GL_FRAMEBUFFER, 0);
+
+            if (pass->fbo.texture.mipmap) {
+                glw.glActiveTexture(GL_TEXTURE0);
+                glw.glBindTexture(GL_TEXTURE_2D, pass->fbo.texture.id);
+                glw.glGenerateMipmap(GL_TEXTURE_2D);
+                glw.glBindTexture(GL_TEXTURE_2D, 0);
+            }
+
+            if (resetFiltering) {
+                glw.glBindTexture(GL_TEXTURE_2D, input->fbo.texture.id);
+                glw.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, input->fbo.texture.min_filter);
+                glw.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, input->fbo.texture.mag_filter);
+                glw.glBindTexture(GL_TEXTURE_2D, 0);
+            }
+
+            input = pass;
+        }
+
+        if (shader->has_prev) {
+            /* shift array */
+            memmove(&shader->prev[1], &shader->prev[0], MAX_PREV * sizeof(struct shader_prev));
+            memcpy(&shader->prev[0], &shader->prev[MAX_PREV], sizeof(struct shader_prev));
+
+            struct shader_pass *pass      = orig;
+            struct shader_pass *prev_pass = &shader->prev_scene;
+            struct shader_prev *prev      = &shader->prev[0];
+
+            memcpy(&prev_pass->state, &pass->state, sizeof(struct shader_state));
+
+            recreate_fbo(&prev->fbo, prev_pass->state.output_texture_size[0],
+                         prev_pass->state.output_texture_size[1]);
+
+            memcpy(&prev_pass->fbo, &prev->fbo, sizeof(struct shader_fbo));
+
+            glw.glBindFramebuffer(GL_FRAMEBUFFER, prev->fbo.id);
+            glw.glClearColor(0, 0, 0, 1);
+            glw.glClear(GL_COLOR_BUFFER_BIT);
+
+            glw.glViewport(0, 0, pass->state.output_size[0], pass->state.output_size[1]);
+
+            glw.glBindVertexArray(prev_pass->vertex_array);
+
+            glw.glBindBuffer(GL_ARRAY_BUFFER, prev->vbo.tex_coord);
+            glw.glBufferSubData(GL_ARRAY_BUFFER, 0, 8 * sizeof(GLfloat), pass->state.tex_coords);
+            glw.glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+            glw.glBindBuffer(GL_ARRAY_BUFFER, prev_pass->vbo.tex_coord);
+            glw.glBufferSubData(GL_ARRAY_BUFFER, 0, 8 * sizeof(GLfloat), pass->state.tex_coords);
+            glw.glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+            memset(&data, 0, sizeof(struct render_data));
+            data.shader      = shader;
+            data.pass        = -10;
+            data.shader_pass = prev_pass;
+            data.texture     = pass->fbo.texture.id;
+            data.output_size = orig_output_size;
+
+            render_pass(&data);
+
+            glw.glBindFramebuffer(GL_FRAMEBUFFER, 0);
+        }
+
+        orig = input;
+    }
+
+    if (active_shader->final_pass.active) {
+        struct shader_pass *pass = &active_shader->final_pass;
+
+        memcpy(pass->state.input_size, input->state.output_size, 2 * sizeof(GLfloat));
+        memcpy(pass->state.input_texture_size, input->state.output_texture_size, 2 * sizeof(GLfloat));
+
+        for (uint8_t j = 0; j < 2; ++j) {
+            if (pass->scale.mode[j] == SCALE_VIEWPORT)
+                pass->state.output_size[j] = orig_output_size[j] * pass->scale.value[j];
+            else if (pass->scale.mode[j] == SCALE_ABSOLUTE)
+                pass->state.output_size[j] = pass->scale.value[j];
+            else
+                pass->state.output_size[j] = pass->state.input_size[j] * pass->scale.value[j];
+
+            pass->state.output_texture_size[j] = next_pow2(pass->state.output_size[j]);
+        }
+
+        glw.glBindTexture(GL_TEXTURE_2D, input->fbo.texture.id);
+        glw.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, video_filter_method ? GL_LINEAR : GL_NEAREST);
+        glw.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, video_filter_method ? GL_LINEAR : GL_NEAREST);
+        glw.glBindTexture(GL_TEXTURE_2D, 0);
+
+        glw.glViewport(window_rect.x, window_rect.y, window_rect.w, window_rect.h);
+
+        glw.glClearColor(0, 0, 0, 1);
+        glw.glClear(GL_COLOR_BUFFER_BIT);
+
+        GLfloat minx = 0;
+        GLfloat miny = 0;
+        GLfloat maxx = pass->state.output_size[0] / (GLfloat) pass->state.output_texture_size[0];
+        GLfloat maxy = pass->state.output_size[1] / (GLfloat) pass->state.output_texture_size[1];
+
+        pass->state.tex_coords[0] = minx;
+        pass->state.tex_coords[1] = miny;
+        pass->state.tex_coords[2] = minx;
+        pass->state.tex_coords[3] = maxy;
+        pass->state.tex_coords[4] = maxx;
+        pass->state.tex_coords[5] = miny;
+        pass->state.tex_coords[6] = maxx;
+        pass->state.tex_coords[7] = maxy;
+
+        glw.glBindVertexArray(pass->vertex_array);
+
+        glw.glBindBuffer(GL_ARRAY_BUFFER, pass->vbo.tex_coord);
+        glw.glBufferSubData(GL_ARRAY_BUFFER, 0, 8 * sizeof(GLfloat), input->state.tex_coords);
+        glw.glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+        memset(&data, 0, sizeof(struct render_data));
+        data.pass        = -2;
+        data.shader_pass = pass;
+        data.texture     = input->fbo.texture.id;
+        data.output_size = orig_output_size;
+        data.orig_pass   = orig;
+
+        render_pass(&data);
+    }
+
+    if (monitors[r_monitor_index].mon_screenshots) {
+        int width = destination.width(), height = destination.height();
+        char path[1024];
+        char fn[256];
+    
+        memset(fn, 0, sizeof(fn));
+        memset(path, 0, sizeof(path));
+    
+        path_append_filename(path, usr_path, SCREENSHOT_PATH);
+    
+        if (!plat_dir_check(path))
+            plat_dir_create(path);
+    
+        path_slash(path);
+        strcat(path, "Monitor_");
+        snprintf(&path[strlen(path)], 42, "%d_", r_monitor_index + 1);
+    
+        plat_tempfile(fn, NULL, (char*)".png");
+        strcat(path, fn);
+
+        unsigned char *rgba = (unsigned char *) calloc(1, (size_t) width * height * 4);
+        
+        glw.glFinish();
+        glw.glReadPixels(window_rect.x, window_rect.y, width, height, GL_RGBA, GL_UNSIGNED_BYTE, rgba);
+
+        QImage image(rgba, width, height, QImage::Format_RGBA8888);
+        image.mirrored(false, true).save(path, "png");
+        monitors[r_monitor_index].mon_screenshots--;
+        free(rgba);
+    }
+
+    glw.glDisable(GL_FRAMEBUFFER_SRGB);
+
+    frameCounter++;
+    context->swapBuffers(this);
+}
diff --git a/src/qt/qt_openglrenderer.hpp b/src/qt/qt_openglrenderer.hpp
index 27822600c..776a2f53e 100644
--- a/src/qt/qt_openglrenderer.hpp
+++ b/src/qt/qt_openglrenderer.hpp
@@ -11,12 +11,14 @@
  *
  *
  * Authors: Teemu Korhonen
+ *          Cacodemon345
  *
  *          Copyright 2022 Teemu Korhonen
+ *          Copyright 2025 Cacodemon345
  */
 
-#ifndef QT_OPENGLRENDERER_HPP
-#define QT_OPENGLRENDERER_HPP
+#ifndef QT_OpenGLRenderer_HPP
+#define QT_OpenGLRenderer_HPP
 
 #if defined Q_OS_MACOS || __arm__
 #    define NO_BUFFER_STORAGE
@@ -32,17 +34,30 @@
 #    include <QtOpenGLExtensions/QOpenGLExtensions>
 #endif
 
+#include <array>
 #include <atomic>
 #include <stdexcept>
 #include <tuple>
 #include <vector>
 
-#include "qt_opengloptions.hpp"
 #include "qt_renderercommon.hpp"
 
-typedef void(QOPENGLF_APIENTRYP PFNGLBUFFERSTORAGEEXTPROC_LOCAL)(GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
+extern "C"
+{
+#include <86box/qt-glslp-parser.h>
+}
 
-class OpenGLRenderer : public QWindow, protected QOpenGLExtraFunctions, public RendererCommon {
+struct render_data {
+    int                 pass;
+    struct glsl_shader *shader;
+    struct shader_pass *shader_pass;
+    GLfloat            *output_size;
+    struct shader_pass *orig_pass;
+    GLint               texture;
+    int                 frame_count;
+};
+
+class OpenGLRenderer : public QWindow, public RendererCommon {
     Q_OBJECT
 
 public:
@@ -56,7 +71,7 @@ public:
     void     finalize() override final;
     bool     hasOptions() const override { return true; }
     QDialog *getOptions(QWidget *parent) override;
-    void     reloadOptions() override;
+    bool     reloadRendererOption() override { return true; }
 
 signals:
     void initialized();
@@ -71,47 +86,64 @@ protected:
     bool event(QEvent *event) override;
 
 private:
-    static constexpr int INIT_WIDTH   = 640;
-    static constexpr int INIT_HEIGHT  = 400;
-    static constexpr int ROW_LENGTH   = 2048;
-    static constexpr int BUFFERPIXELS = 4194304;
-    static constexpr int BUFFERBYTES  = 16777216; /* Pixel is 4 bytes. */
-    static constexpr int BUFFERCOUNT  = 3;        /* How many buffers to use for pixel transfer (2-3 is commonly recommended). */
+
+    std::array<std::unique_ptr<uint8_t>, 2> imagebufs;
 
     QTimer        *renderTimer;
-    OpenGLOptions *options;
 
-    QString glslVersion;
+    QString glslVersion = "";
 
     bool isInitialized = false;
     bool isFinalized   = false;
 
-    GLuint unpackBufferID = 0;
-    GLuint vertexArrayID  = 0;
-    GLuint vertexBufferID = 0;
-    GLuint textureID      = 0;
-    int    frameCounter   = 0;
+    int max_texture_size = 65536;
+    int frameCounter     = 0;
 
-    OpenGLOptions::FilterType currentFilter;
+    QOpenGLExtraFunctions glw;
+    struct shader_texture scene_texture;
+    glsl_t *active_shader;
 
     void *unpackBuffer = nullptr;
 
+    int glsl_version[2] = { 0, 0 };
+
     void initialize();
     void initializeExtensions();
     void initializeBuffers();
     void applyOptions();
-    void applyShader(const OpenGLShaderPass &shader);
-    bool notReady() const { return !isInitialized || isFinalized; }
+    
+    void create_scene_shader();
+    void create_texture(struct shader_texture *tex);
+    void create_fbo(struct shader_fbo *fbo);
+    void recreate_fbo(struct shader_fbo *fbo, int width, int height);
+    void setup_fbo(struct shader *shader, struct shader_fbo *fbo);
 
-    /* GL_ARB_buffer_storage */
-    bool hasBufferStorage = false;
-#ifndef NO_BUFFER_STORAGE
-    PFNGLBUFFERSTORAGEEXTPROC_LOCAL glBufferStorage = nullptr;
-#endif
+    bool notReady() const { return !isInitialized || isFinalized; }
+    glsl_t* load_glslp(glsl_t *glsl, int num_shader, const char *f);
+    glsl_t* load_shaders(int num, char shaders[MAX_USER_SHADERS][512]);
+    int compile_shader(GLenum shader_type, const char *prepend, const char *program, int *dst);
+    int create_default_shader_tex(struct shader_pass *pass);
+    int create_default_shader_color(struct shader_pass *pass);
+    int create_program(struct shader_program *program);
+
+    GLuint get_uniform(GLuint program, const char *name);
+    GLuint get_attrib(GLuint program, const char *name);
+
+    void find_uniforms(struct glsl_shader *glsl, int num_pass);
+    void delete_texture(struct shader_texture *tex);
+    void delete_fbo(struct shader_fbo *fbo);
+    void delete_program(struct shader_program *program);
+    void delete_vbo(struct shader_vbo *vbo);
+    void delete_pass(struct shader_pass *pass);
+    void delete_prev(struct shader_prev *prev);
+    void delete_shader(struct glsl_shader *glsl);
+    void delete_glsl(glsl_t *glsl);
+    void read_shader_config();
+
+    void render_pass(struct render_data *data);
 
 private slots:
     void render();
-    void updateOptions(OpenGLOptions *newOptions);
 };
 
 class opengl_init_error : public std::runtime_error {
diff --git a/src/qt/qt_openglshaderconfig.cpp b/src/qt/qt_openglshaderconfig.cpp
new file mode 100644
index 000000000..25f9d38a8
--- /dev/null
+++ b/src/qt/qt_openglshaderconfig.cpp
@@ -0,0 +1,85 @@
+#include "qt_openglshaderconfig.hpp"
+#include "ui_qt_openglshaderconfig.h"
+
+#include "qt_mainwindow.hpp"
+
+extern MainWindow* main_window;
+
+extern "C"
+{
+#include <86box/86box.h>
+#include <86box/plat.h>
+#include <86box/config.h>
+}
+
+OpenGLShaderConfig::OpenGLShaderConfig(QWidget *parent, glslp_t* shader)
+    : QDialog(parent)
+    , ui(new Ui::OpenGLShaderConfig)
+{
+    ui->setupUi(this);
+
+    currentShader = shader;
+
+    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
+    glslp_read_shader_config(currentShader);
+
+    for (int i = 0; i < currentShader->num_parameters; i++) {
+        auto spinBox = new QDoubleSpinBox;
+        spinBox->setObjectName(currentShader->parameters[i].id);
+        spinBox->setRange(currentShader->parameters[i].min, currentShader->parameters[i].max);
+        spinBox->setValue(currentShader->parameters[i].value);
+        spinBox->setSingleStep(currentShader->parameters[i].step);
+        QFormLayout* layout = (QFormLayout*)ui->scrollAreaWidgetContents->layout();
+        layout->addRow(currentShader->parameters[i].description, spinBox);
+    }
+}
+
+OpenGLShaderConfig::~OpenGLShaderConfig()
+{
+    delete ui;
+}
+
+void OpenGLShaderConfig::on_buttonBox_clicked(QAbstractButton *button)
+{
+    if (ui->buttonBox->buttonRole(button) == QDialogButtonBox::ResetRole) {
+        for (int i = 0; i < currentShader->num_parameters; i++) {
+            QDoubleSpinBox* box = this->findChild<QDoubleSpinBox*>(QString(currentShader->parameters[i].id));
+            if (box) {
+                box->setValue(currentShader->parameters[i].default_value);
+            }
+        }
+    } else if (ui->buttonBox->buttonRole(button) == QDialogButtonBox::ApplyRole) {
+        startblit();
+        for (int i = 0; i < currentShader->num_parameters; i++) {
+            QDoubleSpinBox* box = this->findChild<QDoubleSpinBox*>(QString(currentShader->parameters[i].id));
+            if (box) {
+                float val = (float)box->value();
+                currentShader->parameters[i].value = val;
+            }
+        }
+        glslp_write_shader_config(currentShader);
+        config_save();
+        endblit();
+        main_window->reloadAllRenderers();
+    }
+}
+
+
+void OpenGLShaderConfig::on_OpenGLShaderConfig_accepted()
+{
+    startblit();
+    for (int i = 0; i < currentShader->num_parameters; i++) {
+        QDoubleSpinBox* box = (QDoubleSpinBox*)this->findChild<QDoubleSpinBox*>(QString(currentShader->parameters[i].id));
+        if (box) {
+            float val = (float)box->value();
+            currentShader->parameters[i].value = val;
+        }
+    }
+    glslp_write_shader_config(currentShader);
+    config_save();
+    endblit();
+    main_window->reloadAllRenderers();
+}
+
diff --git a/src/qt/qt_openglshaderconfig.hpp b/src/qt/qt_openglshaderconfig.hpp
new file mode 100644
index 000000000..f71299d38
--- /dev/null
+++ b/src/qt/qt_openglshaderconfig.hpp
@@ -0,0 +1,40 @@
+#ifndef QT_OPENGLSHADERCONFIG_HPP
+#define QT_OPENGLSHADERCONFIG_HPP
+
+#include <QDialog>
+#include <QLabel>
+#include <QDoubleSpinBox>
+#include <QAbstractButton>
+
+#include <map>
+#include <string>
+
+extern "C"
+{
+#include <86box/qt-glslp-parser.h>
+}
+
+namespace Ui {
+class OpenGLShaderConfig;
+}
+
+class OpenGLShaderConfig : public QDialog {
+    Q_OBJECT
+
+public:
+    explicit OpenGLShaderConfig(QWidget *parent = nullptr, glslp_t* shader = nullptr);
+    ~OpenGLShaderConfig();
+
+private slots:
+    void on_buttonBox_clicked(QAbstractButton *button);
+
+    void on_OpenGLShaderConfig_accepted();
+
+private:
+    Ui::OpenGLShaderConfig *ui;
+    glslp_t* currentShader;
+
+    std::map<std::string, double> defaultValues;
+};
+
+#endif // QT_OPENGLSHADERCONFIG_HPP
diff --git a/src/qt/qt_openglshaderconfig.ui b/src/qt/qt_openglshaderconfig.ui
new file mode 100644
index 000000000..dc743f57e
--- /dev/null
+++ b/src/qt/qt_openglshaderconfig.ui
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>OpenGLShaderConfig</class>
+ <widget class="QDialog" name="OpenGLShaderConfig">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Shader Configuration</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetMinAndMaxSize</enum>
+   </property>
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>380</width>
+        <height>250</height>
+       </rect>
+      </property>
+      <layout class="QFormLayout" name="formLayout_2">
+       <property name="sizeConstraint">
+        <enum>QLayout::SetMaximumSize</enum>
+       </property>
+       <property name="fieldGrowthPolicy">
+        <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+       </property>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>OpenGLShaderConfig</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>OpenGLShaderConfig</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/qt/qt_openglshadermanagerdialog.cpp b/src/qt/qt_openglshadermanagerdialog.cpp
new file mode 100644
index 000000000..90f38f40f
--- /dev/null
+++ b/src/qt/qt_openglshadermanagerdialog.cpp
@@ -0,0 +1,266 @@
+#include "qt_openglshadermanagerdialog.hpp"
+#include "ui_qt_openglshadermanagerdialog.h"
+
+#include "qt_mainwindow.hpp"
+#include "qt_util.hpp"
+extern MainWindow* main_window;
+
+#include "qt_openglshaderconfig.hpp"
+
+#include <QListWidgetItem>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QStringBuilder>
+
+extern "C" {
+#include <86box/86box.h>
+#include <86box/plat.h>
+#include <86box/video.h>
+#include <86box/path.h>
+#include <86box/ini.h>
+#include <86box/config.h>
+#include <86box/qt-glslp-parser.h>
+
+extern char gl3_shader_file[MAX_USER_SHADERS][512];
+}
+
+OpenGLShaderManagerDialog::OpenGLShaderManagerDialog(QWidget *parent)
+    : QDialog(parent)
+    , ui(new Ui::OpenGLShaderManagerDialog)
+{
+    ui->setupUi(this);
+
+    ui->checkBoxVSync->setChecked(!!video_vsync);
+    ui->radioButtonVideoSync->setChecked(video_framerate == -1);
+    ui->radioButtonTargetFramerate->setChecked(video_framerate != -1);
+    if (video_framerate != -1) {
+        ui->targetFrameRate->setValue(video_framerate);
+    } else {
+        ui->targetFrameRate->setDisabled(true);
+    }
+
+    for (int i = 0; i < MAX_USER_SHADERS; i++) {
+        if (gl3_shader_file[i][0] != 0) {
+            char* filename = path_get_filename(gl3_shader_file[i]);
+            if (filename[0] != 0) {
+                glslp_t* shaderfile = glslp_parse(gl3_shader_file[i]);
+                if (shaderfile) {
+                    QListWidgetItem* item = new QListWidgetItem(ui->shaderListWidget);
+                    item->setText(filename);
+                    item->setData(Qt::UserRole + 1, QString(gl3_shader_file[i]));
+                    item->setData(Qt::UserRole + 2, (qulonglong)(uintptr_t)shaderfile);
+                }
+            }
+        }
+    }
+    if (ui->shaderListWidget->count()) {
+        ui->shaderListWidget->setCurrentRow(ui->shaderListWidget->count() - 1);
+        auto current = ui->shaderListWidget->currentItem();
+        if (current) {
+            glslp_t* shader = (glslp_t*)current->data(Qt::UserRole + 2).toULongLong();
+            if (shader->num_parameters > 0)
+                ui->buttonConfigure->setEnabled(true);
+            else
+                ui->buttonConfigure->setEnabled(false);
+        } else {
+            ui->buttonConfigure->setEnabled(false);
+        }
+        ui->buttonAdd->setDisabled(ui->shaderListWidget->count() >= MAX_USER_SHADERS);
+    } else {
+        ui->buttonRemove->setDisabled(true);
+        ui->buttonMoveUp->setDisabled(true);
+        ui->buttonMoveDown->setDisabled(true);
+        ui->buttonConfigure->setDisabled(true);
+    }
+}
+
+OpenGLShaderManagerDialog::~OpenGLShaderManagerDialog()
+{
+    for (int i = 0; i < ui->shaderListWidget->count(); i++) {
+        if (ui->shaderListWidget->item(i) && ui->shaderListWidget->item(i)->data(Qt::UserRole + 2).toULongLong()) {
+            glslp_free((glslp_t*)ui->shaderListWidget->item(i)->data(Qt::UserRole + 2).toULongLong());
+        }
+    }
+    delete ui;
+}
+
+void OpenGLShaderManagerDialog::on_buttonBox_clicked(QAbstractButton *button)
+{
+    if (ui->buttonBox->buttonRole(button) == QDialogButtonBox::AcceptRole) {
+        accept();
+    } else if (ui->buttonBox->buttonRole(button) == QDialogButtonBox::RejectRole) {
+        reject();
+    } else if (ui->buttonBox->buttonRole(button) == QDialogButtonBox::ApplyRole) {
+        on_OpenGLShaderManagerDialog_accepted();
+        main_window->reloadAllRenderers();
+    }
+}
+
+
+void OpenGLShaderManagerDialog::on_buttonMoveUp_clicked()
+{
+    if (ui->shaderListWidget->currentRow() == 0)
+        return;
+
+    int row = ui->shaderListWidget->currentRow();
+    auto item = ui->shaderListWidget->takeItem(row);
+    ui->shaderListWidget->insertItem(row - 1, item);
+    ui->shaderListWidget->setCurrentItem(item);
+}
+
+
+void OpenGLShaderManagerDialog::on_shaderListWidget_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous)
+{
+    if (current == nullptr) {
+        ui->buttonRemove->setDisabled(true);
+        ui->buttonMoveUp->setDisabled(true);
+        ui->buttonMoveDown->setDisabled(true);
+        ui->buttonConfigure->setDisabled(true);
+        return;
+    } else {
+        ui->buttonRemove->setDisabled(false);
+        ui->buttonConfigure->setDisabled(true);
+        if (current) {
+            glslp_t* shader = (glslp_t*)current->data(Qt::UserRole + 2).toULongLong();
+            if (shader->num_parameters > 0)
+                ui->buttonConfigure->setEnabled(true);
+        }
+    }
+    ui->buttonMoveUp->setDisabled(ui->shaderListWidget->currentRow() == 0);
+    ui->buttonMoveDown->setDisabled(ui->shaderListWidget->currentRow() == (ui->shaderListWidget->count() - 1));
+}
+
+
+void OpenGLShaderManagerDialog::on_shaderListWidget_currentRowChanged(int currentRow)
+{
+    auto current = ui->shaderListWidget->currentItem();
+    if (current == nullptr) {
+        ui->buttonRemove->setDisabled(true);
+        ui->buttonMoveUp->setDisabled(true);
+        ui->buttonMoveDown->setDisabled(true);
+        ui->buttonConfigure->setDisabled(true);
+        return;
+    } else {
+        ui->buttonRemove->setDisabled(false);
+        ui->buttonConfigure->setDisabled(true);
+        if (current) {
+            glslp_t* shader = (glslp_t*)current->data(Qt::UserRole + 2).toULongLong();
+            if (shader->num_parameters > 0)
+                ui->buttonConfigure->setEnabled(true);
+        }
+    }
+    ui->buttonMoveUp->setDisabled(ui->shaderListWidget->currentRow() == 0);
+    ui->buttonMoveDown->setDisabled(ui->shaderListWidget->currentRow() == (ui->shaderListWidget->count() - 1));
+}
+
+
+void OpenGLShaderManagerDialog::on_buttonMoveDown_clicked()
+{
+    if (ui->shaderListWidget->currentRow() == (ui->shaderListWidget->count() - 1))
+        return;
+
+    int row = ui->shaderListWidget->currentRow();
+    auto item = ui->shaderListWidget->takeItem(row);
+    ui->shaderListWidget->insertItem(row + 1, item);
+    ui->shaderListWidget->setCurrentItem(item);
+}
+
+
+void OpenGLShaderManagerDialog::on_buttonAdd_clicked()
+{
+    auto res = QFileDialog::getOpenFileName(this, QString(), QString(),
+                                            tr("GLSL shaders") % util::DlgFilter({ "glslp", "glsl" }) % tr("All files") % util::DlgFilter({ "*" }, true));
+    if (!res.isEmpty()) {
+        auto glslp_file = res.toUtf8();
+        glslp_t* shaderfile = glslp_parse(glslp_file.data());
+        if (shaderfile) {
+            auto filename = path_get_filename(glslp_file.data());
+            QListWidgetItem* item = new QListWidgetItem(ui->shaderListWidget);
+            item->setText(filename);
+            item->setData(Qt::UserRole + 1, res);
+            item->setData(Qt::UserRole + 2, (qulonglong)(uintptr_t)shaderfile);
+            if (ui->shaderListWidget->count()) {
+                ui->shaderListWidget->setCurrentRow(ui->shaderListWidget->count() - 1);
+                ui->buttonAdd->setDisabled(ui->shaderListWidget->count() >= MAX_USER_SHADERS);
+            }
+        } else {
+            QMessageBox::critical(this, tr("GLSL error"), tr("Could not load file %1").arg(res));
+        }
+    }
+}
+
+
+void OpenGLShaderManagerDialog::on_buttonRemove_clicked()
+{
+    if (ui->shaderListWidget->currentItem()) {
+        auto item = ui->shaderListWidget->takeItem(ui->shaderListWidget->currentRow());
+
+        if (item->data(Qt::UserRole + 2).toULongLong()) {
+            glslp_free((glslp_t*)item->data(Qt::UserRole + 2).toULongLong());
+        }
+        delete item;
+
+        on_shaderListWidget_currentRowChanged(ui->shaderListWidget->currentRow());
+    }
+    ui->buttonAdd->setDisabled(ui->shaderListWidget->count() >= MAX_USER_SHADERS);
+}
+
+void OpenGLShaderManagerDialog::on_OpenGLShaderManagerDialog_accepted()
+{
+    memset(gl3_shader_file, 0, sizeof(gl3_shader_file));
+    for (int i = 0; i < ui->shaderListWidget->count(); i++) {
+        strncpy(gl3_shader_file[i], ui->shaderListWidget->item(i)->data(Qt::UserRole + 1).toString().toUtf8(), 512);
+    }
+    startblit();
+    video_vsync = ui->checkBoxVSync->isChecked();
+    if (ui->radioButtonTargetFramerate->isChecked()) {
+        video_framerate = ui->horizontalSliderFramerate->value();
+    } else {
+        video_framerate = -1;
+    }
+    config_save();
+    endblit();
+}
+
+
+void OpenGLShaderManagerDialog::on_buttonConfigure_clicked()
+{
+    auto item = ui->shaderListWidget->currentItem();
+    if (item) {
+        glslp_t* shader = (glslp_t*)item->data(Qt::UserRole + 2).toULongLong();
+
+        auto configDialog = new OpenGLShaderConfig(this, shader);
+        configDialog->exec();
+    }
+}
+
+
+void OpenGLShaderManagerDialog::on_radioButtonVideoSync_clicked()
+{
+    ui->targetFrameRate->setDisabled(true);
+}
+
+
+void OpenGLShaderManagerDialog::on_radioButtonTargetFramerate_clicked()
+{
+    ui->targetFrameRate->setDisabled(false);
+}
+
+
+void OpenGLShaderManagerDialog::on_horizontalSliderFramerate_sliderMoved(int position)
+{
+    (void)position;
+
+    if (ui->horizontalSliderFramerate->value() != ui->targetFrameRate->value())
+        ui->targetFrameRate->setValue(ui->horizontalSliderFramerate->value());
+}
+
+
+void OpenGLShaderManagerDialog::on_targetFrameRate_valueChanged(int arg1)
+{
+    (void)arg1;
+
+    if (ui->horizontalSliderFramerate->value() != ui->targetFrameRate->value())
+        ui->horizontalSliderFramerate->setValue(ui->targetFrameRate->value());
+}
+
diff --git a/src/qt/qt_openglshadermanagerdialog.hpp b/src/qt/qt_openglshadermanagerdialog.hpp
new file mode 100644
index 000000000..a9f7ad3a9
--- /dev/null
+++ b/src/qt/qt_openglshadermanagerdialog.hpp
@@ -0,0 +1,50 @@
+#ifndef QT_OPENGLSHADERMANAGERDIALOG_H
+#define QT_OPENGLSHADERMANAGERDIALOG_H
+
+#include <QDialog>
+#include <QAbstractButton>
+#include <QListWidgetItem>
+
+namespace Ui {
+class OpenGLShaderManagerDialog;
+}
+
+class OpenGLShaderManagerDialog : public QDialog {
+    Q_OBJECT
+
+public:
+    explicit OpenGLShaderManagerDialog(QWidget *parent = nullptr);
+    ~OpenGLShaderManagerDialog();
+
+private slots:
+    void on_buttonBox_clicked(QAbstractButton *button);
+
+    void on_buttonMoveUp_clicked();
+
+    void on_shaderListWidget_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);
+
+    void on_shaderListWidget_currentRowChanged(int currentRow);
+
+    void on_buttonMoveDown_clicked();
+
+    void on_buttonAdd_clicked();
+
+    void on_buttonRemove_clicked();
+
+    void on_OpenGLShaderManagerDialog_accepted();
+
+    void on_buttonConfigure_clicked();
+
+    void on_radioButtonVideoSync_clicked();
+
+    void on_radioButtonTargetFramerate_clicked();
+
+    void on_horizontalSliderFramerate_sliderMoved(int position);
+
+    void on_targetFrameRate_valueChanged(int arg1);
+
+private:
+    Ui::OpenGLShaderManagerDialog *ui;
+};
+
+#endif // QT_OPENGLSHADERMANAGERDIALOG_H
diff --git a/src/qt/qt_openglshadermanagerdialog.ui b/src/qt/qt_openglshadermanagerdialog.ui
new file mode 100644
index 000000000..82006c713
--- /dev/null
+++ b/src/qt/qt_openglshadermanagerdialog.ui
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>OpenGLShaderManagerDialog</class>
+ <widget class="QDialog" name="OpenGLShaderManagerDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>465</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Shader Manager</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetFixedSize</enum>
+   </property>
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Render behavior</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <property name="sizeConstraint">
+       <enum>QLayout::SetDefaultConstraint</enum>
+      </property>
+      <item row="0" column="0">
+       <widget class="QRadioButton" name="radioButtonVideoSync">
+        <property name="text">
+         <string>Synchronize with video</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QRadioButton" name="radioButtonTargetFramerate">
+        <property name="text">
+         <string>Use target framerate:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QSlider" name="horizontalSliderFramerate">
+        <property name="minimum">
+         <number>15</number>
+        </property>
+        <property name="maximum">
+         <number>240</number>
+        </property>
+        <property name="value">
+         <number>60</number>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="invertedAppearance">
+         <bool>false</bool>
+        </property>
+        <property name="invertedControls">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QSpinBox" name="targetFrameRate">
+        <property name="suffix">
+         <string> fps</string>
+        </property>
+        <property name="minimum">
+         <number>15</number>
+        </property>
+        <property name="maximum">
+         <number>240</number>
+        </property>
+        <property name="value">
+         <number>60</number>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QCheckBox" name="checkBoxVSync">
+        <property name="text">
+         <string>VSync</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="groupBoxShaders">
+     <property name="title">
+      <string>Shaders</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="sizeConstraint">
+       <enum>QLayout::SetFixedSize</enum>
+      </property>
+      <item>
+       <widget class="QListWidget" name="shaderListWidget">
+        <property name="dragDropMode">
+         <enum>QAbstractItemView::InternalMove</enum>
+        </property>
+        <property name="selectionBehavior">
+         <enum>QAbstractItemView::SelectItems</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <property name="sizeConstraint">
+         <enum>QLayout::SetFixedSize</enum>
+        </property>
+        <item>
+         <widget class="QPushButton" name="buttonAdd">
+          <property name="text">
+           <string>Add</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="buttonRemove">
+          <property name="text">
+           <string>Remove</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="buttonConfigure">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="text">
+           <string>Configure</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="buttonMoveUp">
+          <property name="text">
+           <string>Move up</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="buttonMoveDown">
+          <property name="text">
+           <string>Move down</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="verticalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QDialogButtonBox" name="buttonBox">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="standardButtons">
+           <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+          </property>
+          <property name="centerButtons">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/qt/qt_platform.cpp b/src/qt/qt_platform.cpp
index 6890bd407..03bc68390 100644
--- a/src/qt/qt_platform.cpp
+++ b/src/qt/qt_platform.cpp
@@ -18,6 +18,11 @@
  *          Copyright 2021-2022 Cacodemon345
  *          Copyright 2021-2022 Teemu Korhonen
  */
+
+#ifdef __HAIKU__
+#include <OS.h>
+#endif
+
 #include <cstdio>
 
 #include <mutex>
@@ -38,6 +43,7 @@
 #include <QTimer>
 #include <QProcess>
 #include <QRegularExpression>
+#include <QKeySequence>
 
 #include <QLibrary>
 #include <QElapsedTimer>
@@ -49,11 +55,19 @@
 #include "qt_progsettings.hpp"
 #include "qt_util.hpp"
 
+#ifndef Q_OS_WINDOWS
+#    include <signal.h>
+#endif
+
 #ifdef Q_OS_UNIX
 #    include <pthread.h>
 #    include <sys/mman.h>
 #endif
 
+#ifdef Q_OS_OPENBSD
+#    include <pthread_np.h>
+#endif
+
 #if 0
 static QByteArray buf;
 #endif
@@ -74,13 +88,13 @@ public:
     CharPointer &operator=(const QByteArray &ba)
     {
         if (s > 0) {
+            // If the size is known, copy up to s - 1 bytes
+            // and null-terminate the string.
             strncpy(b, ba.data(), s - 1);
-            b[s] = 0;
-        } else {
-            // if we haven't been told the length of b, just assume enough
-            // because we didn't get it from emulator code
+            b[s - 1] = 0;
+        } else if (ba.size() > 0) {
+            // If the size is unknown, copy the whole QByteArray
             strcpy(b, ba.data());
-            b[ba.size()] = 0;
         }
         return *this;
     }
@@ -127,7 +141,6 @@ int          update_icons    = 1;
 int          kbd_req_capture = 0;
 int          hide_status_bar = 0;
 int          hide_tool_bar   = 0;
-uint32_t     lang_id = 0x0409, lang_sys = 0x0409; // Multilangual UI variables, for now all set to LCID of en-US
 
 int
 stricmp(const char *s1, const char *s2)
@@ -149,6 +162,12 @@ strnicmp(const char *s1, const char *s2, size_t n)
 #endif
 }
 
+void
+do_start(void)
+{
+    //
+}
+
 void
 do_stop(void)
 {
@@ -158,14 +177,28 @@ do_stop(void)
 #endif
 }
 
+extern bool acp_utf8;
 void
 plat_get_exe_name(char *s, int size)
 {
+#ifdef Q_OS_WINDOWS
+    wchar_t *temp;
+
+    if (acp_utf8)
+        GetModuleFileNameA(NULL, s, size);
+    else {
+        temp = (wchar_t*)calloc(size, sizeof(wchar_t));
+        GetModuleFileNameW(NULL, temp, size);
+        c16stombs(s, (uint16_t*)temp, size);
+        free(temp);
+    }
+#else
     QByteArray exepath_temp = QCoreApplication::applicationDirPath().toLocal8Bit();
 
     memcpy(s, exepath_temp.data(), std::min((qsizetype) exepath_temp.size(), (qsizetype) size));
 
     path_slash(s);
+#endif
 }
 
 uint32_t
@@ -222,7 +255,12 @@ plat_getcwd(char *bufp, int max)
 {
 #ifdef __APPLE__
     /* Working directory for .app bundles is undefined. */
+#ifdef USE_EXE_PATH
     strncpy(bufp, exe_path, max);
+#else
+    CharPointer(bufp, max) = QDir::homePath().toUtf8();
+    path_append_filename(bufp, bufp, "Library/86Box");
+#endif
 #else
     CharPointer(bufp, max) = QDir::currentPath().toUtf8();
 #endif
@@ -273,7 +311,7 @@ int
 path_abs(char *path)
 {
 #ifdef Q_OS_WINDOWS
-    if ((path[1] == ':') || (path[0] == '\\') || (path[0] == '/'))
+    if ((path[1] == ':') || (path[0] == '\\') || (path[0] == '/') || (strstr(path, "ioctl://") == path))
         return 1;
 
     return 0;
@@ -286,10 +324,13 @@ void
 path_normalize(char *path)
 {
 #ifdef Q_OS_WINDOWS
-    while (*path++ != 0) {
-        if (*path == '\\')
-            *path = '/';
-    }
+    if (strstr(path, "ioctl://") != path) {
+        while (*path++ != 0) {
+            if (*path == '\\')
+                *path = '/';
+        }
+    } else
+        path[8] = path[9] = path[11] = '\\';
 #endif
 }
 
@@ -314,9 +355,27 @@ path_get_slash(char *path)
 void
 path_append_filename(char *dest, const char *s1, const char *s2)
 {
-    strcpy(dest, s1);
-    path_slash(dest);
-    strcat(dest, s2);
+    size_t dest_size = 260;
+    size_t len;
+
+    if (!dest || !s1 || !s2)
+        return;
+
+    if (dest != s1)
+        snprintf(dest, dest_size, "%s", s1);
+
+    len = strlen(dest);
+
+    if (len > 0 && dest[len - 1] != '/' && dest[len - 1] != '\\') {
+        if (len + 1 < dest_size) {
+            dest[len++] = '/';
+            dest[len] = '\0';
+        }
+    }
+
+    if (len < dest_size - 1) {
+        strncat(dest, s2, dest_size - len - 1);
+    }
 }
 
 void
@@ -348,6 +407,10 @@ plat_mmap(size_t size, uint8_t executable)
 #elif defined Q_OS_UNIX
 #    if defined Q_OS_DARWIN && defined MAP_JIT
     void *ret = mmap(0, size, PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0), MAP_ANON | MAP_PRIVATE | (executable ? MAP_JIT : 0), -1, 0);
+#    elif defined(PROT_MPROTECT)
+    void *ret = mmap(0, size, PROT_MPROTECT(PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0)), MAP_ANON | MAP_PRIVATE, -1, 0);
+    if (ret)
+        mprotect(ret, size, PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0));
 #    else
     void *ret = mmap(0, size, PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0), MAP_ANON | MAP_PRIVATE, -1, 0);
 #    endif
@@ -365,6 +428,7 @@ plat_munmap(void *ptr, size_t size)
 #endif
 }
 
+extern bool cpu_thread_running;
 void
 plat_pause(int p)
 {
@@ -372,7 +436,13 @@ plat_pause(int p)
     wchar_t        title[1024];
     wchar_t        paused_msg[512];
 
+    if (!cpu_thread_running && p == 1) {
+        p = 2;
+    }
+
     if ((!!p) == dopause) {
+        QTimer::singleShot(0, main_window, &MainWindow::updateUiPauseState);
+
 #ifdef Q_OS_WINDOWS
         if (source_hwnd)
             PostMessage((HWND) (uintptr_t) source_hwnd, WM_SENDSTATUS, (WPARAM) !!p, (LPARAM) (HWND) main_window->winId());
@@ -413,7 +483,7 @@ void
 plat_power_off(void)
 {
     plat_mouse_capture(0);
-    confirm_exit = 0;
+    confirm_exit_cmdl = 0;
     nvr_save();
     config_save();
 
@@ -425,62 +495,18 @@ plat_power_off(void)
     QTimer::singleShot(0, (const QWidget *) main_window, &QMainWindow::close);
 }
 
-void
-set_language(uint32_t id)
-{
-    lang_id = id;
-}
-
-extern "C++" {
-QMap<uint32_t, QPair<QString, QString>> ProgSettings::lcid_langcode = {
-    { 0x0403, { "ca-ES", "Catalan (Spain)" }         },
-    { 0x0804, { "zh-CN", "Chinese (Simplified)" }    },
-    { 0x0404, { "zh-TW", "Chinese (Traditional)" }   },
-    { 0x041A, { "hr-HR", "Croatian (Croatia)" }      },
-    { 0x0405, { "cs-CZ", "Czech (Czech Republic)" }  },
-    { 0x0407, { "de-DE", "German (Germany)" }        },
-    { 0x0809, { "en-GB", "English (United Kingdom)" }},
-    { 0x0409, { "en-US", "English (United States)" } },
-    { 0x040B, { "fi-FI", "Finnish (Finland)" }       },
-    { 0x040C, { "fr-FR", "French (France)" }         },
-    { 0x040E, { "hu-HU", "Hungarian (Hungary)" }     },
-    { 0x0410, { "it-IT", "Italian (Italy)" }         },
-    { 0x0411, { "ja-JP", "Japanese (Japan)" }        },
-    { 0x0412, { "ko-KR", "Korean (Korea)" }          },
-    { 0x0415, { "pl-PL", "Polish (Poland)" }         },
-    { 0x0416, { "pt-BR", "Portuguese (Brazil)" }     },
-    { 0x0816, { "pt-PT", "Portuguese (Portugal)" }   },
-    { 0x0419, { "ru-RU", "Russian (Russia)" }        },
-    { 0x041B, { "sk-SK", "Slovak (Slovakia)" }       },
-    { 0x0424, { "sl-SI", "Slovenian (Slovenia)" }    },
-    { 0x0C0A, { "es-ES", "Spanish (Spain, Modern Sort)" } },
-    { 0x041F, { "tr-TR", "Turkish (Turkey)" }        },
-    { 0x0422, { "uk-UA", "Ukrainian (Ukraine)" }     },
-    { 0xFFFF, { "system", "(System Default)" }       },
-};
-}
-
-/* Sets up the program language before initialization. */
-uint32_t
+/* Converts the language code string to a numeric language ID */
+int
 plat_language_code(char *langcode)
 {
-    for (auto &curKey : ProgSettings::lcid_langcode.keys()) {
-        if (ProgSettings::lcid_langcode[curKey].first == langcode) {
-            return curKey;
-        }
-    }
-    return 0xFFFF;
+    return ProgSettings::languageCodeToId(QString(langcode));
 }
 
-/* Converts back the language code to LCID */
+/* Converts the numeric language ID to a language code string */
 void
-plat_language_code_r(uint32_t lcid, char *outbuf, int len)
+plat_language_code_r(int id, char *outbuf, int len)
 {
-    if (!ProgSettings::lcid_langcode.contains(lcid)) {
-        qstrncpy(outbuf, "system", len);
-        return;
-    }
-    qstrncpy(outbuf, ProgSettings::lcid_langcode[lcid].first.toUtf8().constData(), len);
+    qstrncpy(outbuf, ProgSettings::languageIdToCode(id).toUtf8().constData(), len);
     return;
 }
 
@@ -542,7 +568,7 @@ endblit()
         std::this_thread::sleep_for(std::chrono::milliseconds(1));
     }
 }
-}
+} /*extern "C" */
 
 #ifdef Q_OS_WINDOWS
 size_t
@@ -581,11 +607,18 @@ c16stombs(char dst[], const uint16_t src[], int len)
 #endif
 
 #ifdef _WIN32
-#    define LIB_NAME_GS          "gsdll32.dll"
-#    define MOUSE_CAPTURE_KEYSEQ "F8+F12"
+#    if defined(__amd64__) || defined(_M_X64) || defined(__aarch64__) || defined(_M_ARM64)
+#        define LIB_NAME_GS   "gsdll64.dll"
+#        define LIB_NAME_GPCL "gpcl6dll64.dll"
+#    else
+#        define LIB_NAME_GS   "gsdll32.dll"
+#        define LIB_NAME_GPCL "gpcl6dll32.dll"
+#    endif
+#    define LIB_NAME_PCAP        "Npcap"
 #else
 #    define LIB_NAME_GS          "libgs"
-#    define MOUSE_CAPTURE_KEYSEQ "CTRL-END"
+#    define LIB_NAME_GPCL        "libgpcl6"
+#    define LIB_NAME_PCAP        "libpcap"
 #endif
 
 QMap<int, std::wstring> ProgSettings::translatedstrings;
@@ -594,33 +627,29 @@ void
 ProgSettings::reloadStrings()
 {
     translatedstrings.clear();
-    translatedstrings[IDS_2077] = QCoreApplication::translate("", "Click to capture mouse").toStdWString();
-    translatedstrings[IDS_2078] = QCoreApplication::translate("", "Press F8+F12 to release mouse").replace("F8+F12", MOUSE_CAPTURE_KEYSEQ).replace("CTRL-END", QLocale::system().name() == "de_DE" ? "Strg+Ende" : "CTRL-END").toStdWString();
-    translatedstrings[IDS_2079] = QCoreApplication::translate("", "Press F8+F12 or middle button to release mouse").replace("F8+F12", MOUSE_CAPTURE_KEYSEQ).replace("CTRL-END", QLocale::system().name() == "de_DE" ? "Strg+Ende" : "CTRL-END").toStdWString();
-    translatedstrings[IDS_2131] = QCoreApplication::translate("", "Invalid configuration").toStdWString();
-    translatedstrings[IDS_4099] = QCoreApplication::translate("", "MFM/RLL or ESDI CD-ROM drives never existed").toStdWString();
-    translatedstrings[IDS_2094] = QCoreApplication::translate("", "Failed to set up PCap").toStdWString();
-    translatedstrings[IDS_2095] = QCoreApplication::translate("", "No PCap devices found").toStdWString();
-    translatedstrings[IDS_2096] = QCoreApplication::translate("", "Invalid PCap device").toStdWString();
-    translatedstrings[IDS_2112] = QCoreApplication::translate("", "Unable to initialize SDL, libsdl2 is required").toStdWString();
-    translatedstrings[IDS_2130] = QCoreApplication::translate("", "Make sure libpcap is installed and that you are on a libpcap-compatible network connection.").toStdWString();
-    translatedstrings[IDS_2115] = QCoreApplication::translate("", "Unable to initialize Ghostscript").toStdWString();
-    translatedstrings[IDS_2063] = QCoreApplication::translate("", "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine.").toStdWString();
-    translatedstrings[IDS_2064] = QCoreApplication::translate("", "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card.").toStdWString();
-    translatedstrings[IDS_2163] = QCoreApplication::translate("", "Video card #2 \"%hs\"  is not available due to missing ROMs in the roms/video directory. Disabling the second video card.").toStdWString();
-    translatedstrings[IDS_2129] = QCoreApplication::translate("", "Hardware not available").toStdWString();
-    translatedstrings[IDS_2143] = QCoreApplication::translate("", "Monitor in sleep mode").toStdWString();
-    translatedstrings[IDS_2121] = QCoreApplication::translate("", "No ROMs found").toStdWString();
-    translatedstrings[IDS_2056] = QCoreApplication::translate("", "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory.").toStdWString();
-    translatedstrings[IDS_2167] = QCoreApplication::translate("", "Failed to initialize network driver").toStdWString();
-    translatedstrings[IDS_2168] = QCoreApplication::translate("", "The network configuration will be switched to the null driver").toStdWString();
-
-    auto gsstr             = QCoreApplication::translate("", " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files.");
-    if (gsstr.contains("libgs")) {
-        gsstr.replace("libgs", LIB_NAME_GS);
-    } else
-        gsstr.prepend(LIB_NAME_GS);
-    translatedstrings[IDS_2133] = gsstr.toStdWString();
+    translatedstrings[STRING_MOUSE_CAPTURE]             = QCoreApplication::translate("", "Click to capture mouse").toStdWString();
+    translatedstrings[STRING_MOUSE_RELEASE]             = QCoreApplication::translate("", "Press %1 to release mouse").arg(QKeySequence(acc_keys[FindAccelerator("release_mouse")].seq, QKeySequence::PortableText).toString(QKeySequence::NativeText)).toStdWString();
+    translatedstrings[STRING_MOUSE_RELEASE_MMB]         = QCoreApplication::translate("", "Press %1 or middle button to release mouse").arg(QKeySequence(acc_keys[FindAccelerator("release_mouse")].seq, QKeySequence::PortableText).toString(QKeySequence::NativeText)).toStdWString();
+    translatedstrings[STRING_INVALID_CONFIG]            = QCoreApplication::translate("", "Invalid configuration").toStdWString();
+    translatedstrings[STRING_NO_ST506_ESDI_CDROM]       = QCoreApplication::translate("", "MFM/RLL or ESDI CD-ROM drives never existed").toStdWString();
+    translatedstrings[STRING_PCAP_ERROR_NO_DEVICES]     = QCoreApplication::translate("", "No PCap devices found").toStdWString();
+    translatedstrings[STRING_PCAP_ERROR_INVALID_DEVICE] = QCoreApplication::translate("", "Invalid PCap device").toStdWString();
+    translatedstrings[STRING_PCAP_ERROR_DESC]           = QCoreApplication::translate("", "Make sure %1 is installed and that you are on a %1-compatible network connection.").arg(LIB_NAME_PCAP).toStdWString();
+    translatedstrings[STRING_GHOSTSCRIPT_ERROR_TITLE]   = QCoreApplication::translate("", "Unable to initialize Ghostscript").toStdWString();
+    translatedstrings[STRING_GHOSTSCRIPT_ERROR_DESC]    = QCoreApplication::translate("", "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files.").arg(LIB_NAME_GS).toStdWString();
+    translatedstrings[STRING_GHOSTPCL_ERROR_TITLE]      = QCoreApplication::translate("", "Unable to initialize GhostPCL").toStdWString();
+    translatedstrings[STRING_GHOSTPCL_ERROR_DESC]       = QCoreApplication::translate("", "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files.").arg(LIB_NAME_GPCL).toStdWString();
+    translatedstrings[STRING_HW_NOT_AVAILABLE_MACHINE]  = QCoreApplication::translate("", "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine.").toStdWString();
+    translatedstrings[STRING_HW_NOT_AVAILABLE_VIDEO]    = QCoreApplication::translate("", "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card.").toStdWString();
+    translatedstrings[STRING_HW_NOT_AVAILABLE_VIDEO2]   = QCoreApplication::translate("", "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card.").toStdWString();
+    translatedstrings[STRING_HW_NOT_AVAILABLE_DEVICE]   = QCoreApplication::translate("", "Device \"%hs\" is not available due to missing ROMs. Ignoring the device.").toStdWString();
+    translatedstrings[STRING_HW_NOT_AVAILABLE_TITLE]    = QCoreApplication::translate("", "Hardware not available").toStdWString();
+    translatedstrings[STRING_MONITOR_SLEEP]             = QCoreApplication::translate("", "Monitor in sleep mode").toStdWString();
+    translatedstrings[STRING_NET_ERROR]                 = QCoreApplication::translate("", "Failed to initialize network driver").toStdWString();
+    translatedstrings[STRING_NET_ERROR_DESC]            = QCoreApplication::translate("", "The network configuration will be switched to the null driver").toStdWString();
+    translatedstrings[STRING_ESCP_ERROR_TITLE]          = QCoreApplication::translate("", "Unable to find Dot-Matrix fonts").toStdWString();
+    translatedstrings[STRING_ESCP_ERROR_DESC]           = QCoreApplication::translate("", "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P 2 Dot-Matrix Printer.").toStdWString();
+    translatedstrings[STRING_EDID_TOO_LARGE]            = QCoreApplication::translate("", "EDID file \"%ls\" is too large.").toStdWString();
 }
 
 wchar_t *
@@ -638,15 +667,66 @@ plat_chdir(char *path)
 }
 
 void
-plat_get_global_config_dir(char* strptr)
+plat_get_global_config_dir(char *outbuf, const size_t len)
 {
-#ifdef __APPLE__
-    auto dir = QDir(QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)[0] + "/net.86Box.86Box/");
+    if (portable_mode) {
+        strncpy(outbuf, exe_path, len);
+    } else {
+        const auto dir = QDir(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation));
+        if (!dir.exists()) {
+            if (!dir.mkpath(".")) {
+                qWarning("Failed to create global configuration directory %s", dir.absolutePath().toUtf8().constData());
+            }
+        }
+        strncpy(outbuf, dir.canonicalPath().toUtf8().constData(), len);
+    }
+
+    path_slash(outbuf);
+}
+
+void
+plat_get_global_data_dir(char *outbuf, const size_t len)
+{
+    if (portable_mode) {
+        strncpy(outbuf, exe_path, len);
+    } else {
+        const auto dir = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation));
+        if (!dir.exists()) {
+            if (!dir.mkpath(".")) {
+                qWarning("Failed to create global data directory %s", dir.absolutePath().toUtf8().constData());
+            }
+        }
+        strncpy(outbuf, dir.canonicalPath().toUtf8().constData(), len);
+    }
+
+    path_slash(outbuf);
+}
+
+void
+plat_get_temp_dir(char *outbuf, const uint8_t len)
+{
+    const auto dir = QDir(QStandardPaths::writableLocation(QStandardPaths::TempLocation));
+    strncpy(outbuf, dir.canonicalPath().toUtf8().constData(), len);
+    path_slash(outbuf);
+}
+
+void
+plat_get_vmm_dir(char *outbuf, const size_t len)
+{
+    QString path;
+
+    if (portable_mode) {
+        path = QDir(exe_path).filePath(VMM_PATH);
+    } else {
+#ifdef Q_OS_WINDOWS
+        path = QDir::home().filePath(VMM_PATH_WINDOWS);
 #else
-    auto dir = QDir(QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)[0] + "/86Box/");
+        path = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath(VMM_PATH);
 #endif
-    if (!dir.exists()) dir.mkpath(".");
-    strncpy(strptr, dir.canonicalPath().toUtf8().constData(), 1024);
+    }
+
+    strncpy(outbuf, path.toUtf8().constData(), len);
+    path_slash(outbuf);
 }
 
 void
@@ -666,6 +746,7 @@ plat_init_rom_paths(void)
     for (auto &path : paths) {
 #ifdef __APPLE__
         rom_add_path(QDir(path).filePath("net.86Box.86Box/roms").toUtf8().constData());
+        rom_add_path(QDir(path).filePath("86Box/roms").toUtf8().constData());
 #else
         rom_add_path(QDir(path).filePath("86Box/roms").toUtf8().constData());
 #endif
@@ -691,7 +772,7 @@ plat_get_cpu_string(char *outbuf, uint8_t len) {
         return;
     }
     QByteArray result = process->readAll();
-    auto command_result = QString(result).split(": ").last();
+    auto command_result = QString(result).split(": ").last().trimmed();
     if(!command_result.isEmpty()) {
         cpu_string = command_result;
     }
@@ -738,12 +819,6 @@ plat_get_cpu_string(char *outbuf, uint8_t len) {
 
 }
 
-double
-plat_get_dpi(void)
-{
-    return util::screenOfWidget(main_window)->devicePixelRatio();
-}
-
 void
 plat_set_thread_name(void *thread, const char *name)
 {
@@ -768,8 +843,8 @@ plat_set_thread_name(void *thread, const char *name)
 
     if (pSetThreadDescription) {
         size_t len = strlen(name) + 1;
-        wchar_t wname[len + 1];
-        mbstowcs(wname, name, len);
+        wchar_t wname[2048];
+        mbstowcs(wname, name, (len >= 1024) ? 1024 : len);
         pSetThreadDescription(thread ? (HANDLE) thread : GetCurrentThread(), wname);
     }
 #else
@@ -777,14 +852,32 @@ plat_set_thread_name(void *thread, const char *name)
     if (thread) /* Apple pthread can only set self's name */
         return;
     char truncated[64];
+#    elif defined(Q_OS_NETBSD)
+    char truncated[64];
 #    else
     char truncated[16];
 #    endif
     strncpy(truncated, name, sizeof(truncated) - 1);
-#    ifdef Q_OS_DARWIN
+#    if defined(Q_OS_DARWIN)
     pthread_setname_np(truncated);
+#    elif defined(Q_OS_NETBSD)
+    pthread_setname_np(thread ? *((pthread_t *) thread) : pthread_self(), truncated, (void*)"%s");
+#    elif defined(__HAIKU__)
+    rename_thread(find_thread(NULL), truncated);
+#    elif defined(Q_OS_OPENBSD)
+    pthread_set_name_np(thread ? *((pthread_t *) thread) : pthread_self(), truncated);
 #    else
     pthread_setname_np(thread ? *((pthread_t *) thread) : pthread_self(), truncated);
 #    endif
 #endif
 }
+
+void
+plat_break(void)
+{
+#ifdef Q_OS_WINDOWS
+    DebugBreak();
+#else
+    raise(SIGTRAP);
+#endif
+}
diff --git a/src/qt/qt_progsettings.cpp b/src/qt/qt_progsettings.cpp
index 4dda901d7..7efeba377 100644
--- a/src/qt/qt_progsettings.cpp
+++ b/src/qt/qt_progsettings.cpp
@@ -26,6 +26,10 @@
 #include <QDir>
 #include <QFile>
 #include <QLibraryInfo>
+#ifdef Q_OS_WINDOWS
+#    include <QSysInfo>
+#    include <QVersionNumber>
+#endif
 
 extern "C" {
 #include <86box/86box.h>
@@ -36,92 +40,88 @@ extern "C" {
 #include <86box/rom.h>
 }
 
-static QMap<QString, QString> iconset_to_qt;
 extern MainWindow            *main_window;
 
 ProgSettings::CustomTranslator *ProgSettings::translator   = nullptr;
 QTranslator                    *ProgSettings::qtTranslator = nullptr;
-QString
-ProgSettings::getIconSetPath()
-{
-    if (iconset_to_qt.isEmpty()) {
-        // Always include default bundled icons
-        iconset_to_qt.insert("", ":/settings/win/icons");
-        // Walk rom_paths to get the candidates
-        for (rom_path_t *emu_rom_path = &rom_paths; emu_rom_path != nullptr; emu_rom_path = emu_rom_path->next) {
-            // Check for icons subdir in each candidate
-            QDir roms_icons_dir(QString(emu_rom_path->path) + "/icons");
-            if (roms_icons_dir.isReadable()) {
-                auto dirList = roms_icons_dir.entryList(QDir::AllDirs | QDir::Executable | QDir::Readable);
-                for (auto &curIconSet : dirList) {
-                    if (curIconSet == "." || curIconSet == "..") {
-                        continue;
-                    }
-                    iconset_to_qt.insert(curIconSet, (roms_icons_dir.canonicalPath() + '/') + curIconSet);
-                }
-            }
-        }
-    }
-    return iconset_to_qt[icon_set];
-}
 
-QIcon
-ProgSettings::loadIcon(QString file)
-{
-    (void) getIconSetPath();
-    if (!QFile::exists(iconset_to_qt[icon_set] + file))
-        return QIcon(iconset_to_qt[""] + file);
-    return QIcon(iconset_to_qt[icon_set] + file);
-}
+QVector<QPair<QString, QString>> ProgSettings::languages = {
+    { "system", "(System Default)"         },
+    { "zh-CN",  "Chinese (Simplified)"     },
+    { "zh-TW",  "Chinese (Traditional)"    },
+    { "hr-HR",  "Croatian (Croatia)"       },
+    { "cs-CZ",  "Czech (Czech Republic)"   },
+    { "de-DE",  "German (Germany)"         },
+    { "en-GB",  "English (United Kingdom)" },
+    { "en-US",  "English (United States)"  },
+    { "fi-FI",  "Finnish (Finland)"        },
+    { "fr-FR",  "French (France)"          },
+    { "it-IT",  "Italian (Italy)"          },
+    { "ja-JP",  "Japanese (Japan)"         },
+    { "ko-KR",  "Korean (Korea)"           },
+    { "nl-NL",  "Dutch (Netherlands)"      },
+    { "nb-NO",  "Norwegian (Bokmål)"       },
+    { "pl-PL",  "Polish (Poland)"          },
+    { "pt-BR",  "Portuguese (Brazil)"      },
+    { "pt-PT",  "Portuguese (Portugal)"    },
+    { "ru-RU",  "Russian (Russia)"         },
+    { "sk-SK",  "Slovak (Slovakia)"        },
+    { "sl-SI",  "Slovenian (Slovenia)"     },
+    { "sv-SE",  "Swedish (Sweden)"         },
+    { "es-ES",  "Spanish (Spain)"          },
+    { "tr-TR",  "Turkish (Turkey)"         },
+    { "uk-UA",  "Ukrainian (Ukraine)"      },
+    { "vi-VN",  "Vietnamese (Vietnam)"     },
+};
 
 ProgSettings::ProgSettings(QWidget *parent)
     : QDialog(parent)
     , ui(new Ui::ProgSettings)
 {
     ui->setupUi(this);
-    (void) getIconSetPath();
-    ui->comboBox->setItemData(0, "");
-    ui->comboBox->setCurrentIndex(0);
-    for (auto i = iconset_to_qt.begin(); i != iconset_to_qt.end(); i++) {
-        if (i.key() == "")
-            continue;
-        QFile iconfile(i.value() + "/iconinfo.txt");
-        iconfile.open(QFile::ReadOnly);
-        QString friendlyName;
-        QString iconsetinfo(iconfile.readAll());
-        iconfile.close();
-        if (iconsetinfo.isEmpty())
-            friendlyName = i.key();
-        else
-            friendlyName = iconsetinfo.split('\n')[0];
-        ui->comboBox->addItem(friendlyName, i.key());
-        if (strcmp(icon_set, i.key().toUtf8().data()) == 0) {
-            ui->comboBox->setCurrentIndex(ui->comboBox->findData(i.key()));
-        }
-    }
-    ui->comboBox->setItemData(0, '(' + tr("Default") + ')', Qt::DisplayRole);
-
-    ui->comboBoxLanguage->setItemData(0, 0xFFFF);
-    for (auto i = lcid_langcode.begin(); i != lcid_langcode.end(); i++) {
-        if (i.key() == 0xFFFF)
-            continue;
-        ui->comboBoxLanguage->addItem(lcid_langcode[i.key()].second, i.key());
-        if (i.key() == lang_id) {
-            ui->comboBoxLanguage->setCurrentIndex(ui->comboBoxLanguage->findData(i.key()));
+    ui->comboBoxLanguage->setItemData(0, 0);
+    for (int i = 1; i < languages.length(); i++) {
+        ui->comboBoxLanguage->addItem(languages[i].second, i);
+        if (i == lang_id) {
+            ui->comboBoxLanguage->setCurrentIndex(ui->comboBoxLanguage->findData(i));
         }
     }
+    ui->comboBoxLanguage->model()->sort(Qt::AscendingOrder);
 
     mouseSensitivity = mouse_sensitivity;
     ui->horizontalSlider->setValue(mouseSensitivity * 100.);
     ui->openDirUsrPath->setChecked(open_dir_usr_path > 0);
+    ui->checkBoxMultimediaKeys->setChecked(inhibit_multimedia_keys);
+    ui->checkBoxConfirmExit->setChecked(confirm_exit);
+    ui->checkBoxConfirmSave->setChecked(confirm_save);
+    ui->checkBoxConfirmHardReset->setChecked(confirm_reset);
+
+    ui->radioButtonSystem->setChecked(color_scheme == 0);
+    ui->radioButtonLight->setChecked(color_scheme == 1);
+    ui->radioButtonDark->setChecked(color_scheme == 2);
+
+#ifndef Q_OS_WINDOWS
+    ui->checkBoxMultimediaKeys->setHidden(true);
+    ui->groupBox->setHidden(true);
+#endif
 }
 
 void
 ProgSettings::accept()
 {
-    strcpy(icon_set, ui->comboBox->currentData().toString().toUtf8().data());
-    lang_id           = ui->comboBoxLanguage->currentData().toUInt();
-    open_dir_usr_path = ui->openDirUsrPath->isChecked() ? 1 : 0;
+    lang_id                 = ui->comboBoxLanguage->currentData().toInt();
+    open_dir_usr_path       = ui->openDirUsrPath->isChecked() ? 1 : 0;
+    confirm_exit            = ui->checkBoxConfirmExit->isChecked() ? 1 : 0;
+    confirm_save            = ui->checkBoxConfirmSave->isChecked() ? 1 : 0;
+    confirm_reset           = ui->checkBoxConfirmHardReset->isChecked() ? 1 : 0;
+    inhibit_multimedia_keys = ui->checkBoxMultimediaKeys->isChecked() ? 1 : 0;
+
+    color_scheme = (ui->radioButtonSystem->isChecked()) ? 0 : (ui->radioButtonLight->isChecked() ? 1 : 2);
+
+#ifdef Q_OS_WINDOWS
+    extern void selectDarkMode();
+    selectDarkMode();
+#endif
 
     loadTranslators(QCoreApplication::instance());
     reloadStrings();
@@ -138,6 +138,7 @@ ProgSettings::accept()
     connect(main_window, &MainWindow::updateStatusBarTip, main_window->status.get(), &MachineStatus::updateTip);
     connect(main_window, &MainWindow::statusBarMessage, main_window->status.get(), &MachineStatus::message, Qt::QueuedConnection);
     mouse_sensitivity = mouseSensitivity;
+    config_save_global();
     QDialog::accept();
 }
 
@@ -146,10 +147,48 @@ ProgSettings::~ProgSettings()
     delete ui;
 }
 
-void
-ProgSettings::on_pushButton_released()
+#ifdef Q_OS_WINDOWS
+/* Return the standard font name on Windows, which is overridden per-language
+   to prevent CJK fonts with embedded bitmaps being chosen as a fallback. */
+QString
+ProgSettings::getFontName(int langId)
 {
-    ui->comboBox->setCurrentIndex(0);
+    QString langCode = languageIdToCode(lang_id);
+    if (langCode == "ja-JP") {
+        /* Check for Windows 10 or later to choose the appropriate system font */
+        if (QVersionNumber::fromString(QSysInfo::kernelVersion()).majorVersion() >= 10)
+            return "Yu Gothic UI";
+        else
+            return "Meiryo UI";
+    } else if (langCode == "ko-KR")
+        return "Malgun Gothic";
+    else if (langCode == "zh-CN")
+        return "Microsoft YaHei";
+    else if (langCode == "zh-TW")
+        return "Microsoft JhengHei";
+    else
+        return "Segoe UI";
+}
+#endif
+
+int
+ProgSettings::languageCodeToId(QString langCode)
+{
+    for (int i = 0; i < languages.length(); i++) {
+        if (languages[i].first == langCode) {
+            return i;
+        }
+    }
+    return 0;
+}
+
+QString
+ProgSettings::languageIdToCode(int id)
+{
+    if ((id <= 0) || (id >= languages.length())) {
+        return "system";
+    }
+    return languages[id].first;
 }
 
 void
@@ -166,30 +205,68 @@ ProgSettings::loadTranslators(QObject *parent)
     qtTranslator             = new QTranslator(parent);
     translator               = new CustomTranslator(parent);
     QString localetofilename = "";
-    if (lang_id == 0xFFFF || lcid_langcode.contains(lang_id) == false) {
+    if (lang_id == 0 || lang_id >= languages.length()) {
         for (int i = 0; i < QLocale::system().uiLanguages().size(); i++) {
             localetofilename = QLocale::system().uiLanguages()[i];
             if (translator->load(QLatin1String("86box_") + localetofilename, QLatin1String(":/"))) {
-                qDebug() << "Translations loaded.\n";
+                qDebug() << "Translations loaded.";
                 QCoreApplication::installTranslator(translator);
-                if (!qtTranslator->load(QLatin1String("qtbase_") + localetofilename.replace('-', '_'), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
-                    qtTranslator->load(QLatin1String("qt_") + localetofilename.replace('-', '_'), QApplication::applicationDirPath() + "/./translations/");
-                if (QApplication::installTranslator(qtTranslator)) {
-                    qDebug() << "Qt translations loaded."
-                             << "\n";
-                }
+                /* First try qtbase */
+                if (!loadQtTranslations(QLatin1String("qtbase_") + localetofilename.replace('-', '_')))
+                    /* If that fails, try legacy qt_* translations */
+                    if (!loadQtTranslations(QLatin1String("qt_") + localetofilename.replace('-', '_')))
+                        qDebug() << "Failed to find Qt translations!";
+                if (QCoreApplication::installTranslator(qtTranslator))
+                    qDebug() << "Qt translations loaded.";
                 break;
             }
         }
     } else {
-        translator->load(QLatin1String("86box_") + lcid_langcode[lang_id].first, QLatin1String(":/"));
+        if (translator->load(QLatin1String("86box_") + languages[lang_id].first, QLatin1String(":/")))
+            qDebug() << "Translations loaded.";
         QCoreApplication::installTranslator(translator);
-        if (!qtTranslator->load(QLatin1String("qtbase_") + QString(lcid_langcode[lang_id].first).replace('-', '_'), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
-            qtTranslator->load(QLatin1String("qt_") + QString(lcid_langcode[lang_id].first).replace('-', '_'), QApplication::applicationDirPath() + "/./translations/");
-        QCoreApplication::installTranslator(qtTranslator);
+        /* First try qtbase */
+        if (!loadQtTranslations(QLatin1String("qtbase_") + QString(languages[lang_id].first).replace('-', '_')))
+            /* If that fails, try legacy qt_* translations */
+            if (!loadQtTranslations(QLatin1String("qt_") + QString(languages[lang_id].first).replace('-', '_')))
+                qDebug() << "Failed to find Qt translations!";
+
+        if (QCoreApplication::installTranslator(qtTranslator))
+            qDebug() << "Qt translations loaded.";
     }
 }
 
+bool
+ProgSettings::loadQtTranslations(const QString name)
+{
+    QString name_lang_only = name.left(name.indexOf('_'));
+    /* System-wide translations */
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    if (qtTranslator->load(name, QLibraryInfo::path(QLibraryInfo::TranslationsPath)))
+#else
+    if (qtTranslator->load(name, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
+#endif
+        return true;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    else if (qtTranslator->load(name_lang_only, QLibraryInfo::path(QLibraryInfo::TranslationsPath)))
+#else
+    else if (qtTranslator->load(name_lang_only, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
+#endif
+        return true;
+    /* Bundled translations (embedded) */
+    else if (qtTranslator->load(name, QLatin1String(":/")))
+        return true;
+    else if (qtTranslator->load(name_lang_only, QLatin1String(":/")))
+        return true;
+    /* Bundled translations (external) */
+    else if (qtTranslator->load(name, QApplication::applicationDirPath() + "/./translations/"))
+        return true;
+    else if (qtTranslator->load(name_lang_only, QApplication::applicationDirPath() + "/./translations/"))
+        return true;
+    else
+        return false;
+}
+
 void
 ProgSettings::on_pushButtonLanguage_released()
 {
diff --git a/src/qt/qt_progsettings.hpp b/src/qt/qt_progsettings.hpp
index 7565869b0..9445d2f86 100644
--- a/src/qt/qt_progsettings.hpp
+++ b/src/qt/qt_progsettings.hpp
@@ -14,10 +14,13 @@ class ProgSettings : public QDialog {
 public:
     explicit ProgSettings(QWidget *parent = nullptr);
     ~ProgSettings();
-    static QString getIconSetPath();
-    static QIcon   loadIcon(QString file);
-    static void    loadTranslators(QObject *parent = nullptr);
-    static void    reloadStrings();
+#ifdef Q_OS_WINDOWS
+    static QString getFontName(int langId);
+#endif
+    static int      languageCodeToId(QString langCode);
+    static QString  languageIdToCode(int id);
+    static void     loadTranslators(QObject *parent = nullptr);
+    static void     reloadStrings();
     class CustomTranslator : public QTranslator {
     public:
         CustomTranslator(QObject *parent = nullptr)
@@ -27,39 +30,17 @@ public:
         QString translate(const char *context, const char *sourceText,
                           const char *disambiguation = nullptr, int n = -1) const override
         {
-            if (strcmp(sourceText, "&Fullscreen") == 0)
-                sourceText = "&Fullscreen\tCtrl+Alt+PgUp";
-            if (strcmp(sourceText, "&Ctrl+Alt+Del") == 0)
-                sourceText = "&Ctrl+Alt+Del\tCtrl+F12";
-            if (strcmp(sourceText, "Take s&creenshot") == 0)
-                sourceText = "Take s&creenshot\tCtrl+F11";
-            if (strcmp(sourceText, "Begin trace") == 0)
-                sourceText = "Begin trace\tCtrl+T";
-            if (strcmp(sourceText, "End trace") == 0)
-                sourceText = "End trace\tCtrl+T";
-            if (strcmp(sourceText, "&Qt (Software)") == 0) {
-                QString finalstr = QTranslator::translate("", "&SDL (Software)", disambiguation, n);
-                finalstr.replace("SDL", "Qt");
-                finalstr.replace("(&S)", "(&Q)");
-                return finalstr;
-            }
-            QString finalstr = QTranslator::translate("", sourceText, disambiguation, n);
-#ifdef Q_OS_MACOS
-            if (finalstr.contains('\t'))
-                finalstr.truncate(finalstr.indexOf('\t'));
-#endif
-            return finalstr;
+            return QTranslator::translate("", sourceText, disambiguation, n);
         }
     };
-    static CustomTranslator                       *translator;
-    static QTranslator                            *qtTranslator;
-    static QMap<uint32_t, QPair<QString, QString>> lcid_langcode;
-    static QMap<int, std::wstring>                 translatedstrings;
+    static CustomTranslator                 *translator;
+    static QTranslator                      *qtTranslator;
+    static QVector<QPair<QString, QString>>  languages;
+    static QMap<int, std::wstring>           translatedstrings;
 
 protected slots:
     void accept() override;
 private slots:
-    void on_pushButton_released();
     void on_pushButtonLanguage_released();
 
     void on_horizontalSlider_valueChanged(int value);
@@ -68,6 +49,7 @@ private slots:
 
 private:
     Ui::ProgSettings *ui;
+    static bool loadQtTranslations(const QString name);
 
     friend class MainWindow;
     double mouseSensitivity;
diff --git a/src/qt/qt_progsettings.ui b/src/qt/qt_progsettings.ui
index 16fb439be..ca33726b1 100644
--- a/src/qt/qt_progsettings.ui
+++ b/src/qt/qt_progsettings.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>458</width>
-    <height>374</height>
+    <height>508</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -27,48 +27,19 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="sizeConstraint">
-    <enum>QLayout::SetFixedSize</enum>
+    <enum>QLayout::SizeConstraint::SetFixedSize</enum>
    </property>
-   <item row="1" column="0" colspan="2">
-    <widget class="QComboBox" name="comboBox">
-     <property name="editable">
-      <bool>false</bool>
-     </property>
-     <property name="maxVisibleItems">
-      <number>30</number>
-     </property>
-     <item>
-      <property name="text">
-       <string>(Default)</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Mouse sensitivity:</string>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="0" colspan="2">
-    <widget class="QLabel" name="label">
+    <widget class="QLabel" name="label_2">
      <property name="text">
-      <string>Icon set:</string>
+      <string>Language:</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
-    <widget class="QPushButton" name="pushButton">
-     <property name="text">
-      <string>Default</string>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="0">
-    <spacer name="horizontalSpacer_3">
+   <item row="2" column="0">
+    <spacer name="horizontalSpacer_2">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Orientation::Horizontal</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
@@ -78,17 +49,47 @@
      </property>
     </spacer>
    </item>
-   <item row="12" column="0" colspan="2">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+   <item row="7" column="0">
+    <widget class="QCheckBox" name="checkBoxMultimediaKeys">
+     <property name="text">
+      <string>Inhibit multimedia keys</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="0" colspan="2">
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Mouse sensitivity:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <widget class="QPushButton" name="pushButton_2">
+     <property name="text">
+      <string>Default</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QComboBox" name="comboBoxLanguage">
+     <property name="maxVisibleItems">
+      <number>30</number>
+     </property>
+     <item>
+      <property name="text">
+       <string>(System Default)</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="8" column="0">
+    <widget class="QCheckBox" name="checkBoxConfirmSave">
+     <property name="text">
+      <string>Ask for confirmation before saving settings</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="3">
     <widget class="QSlider" name="horizontalSlider">
      <property name="minimum">
       <number>10</number>
@@ -106,60 +107,31 @@
       <number>100</number>
      </property>
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Orientation::Horizontal</enum>
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2">
-    <widget class="QComboBox" name="comboBoxLanguage">
-     <property name="maxVisibleItems">
-      <number>30</number>
+   <item row="6" column="0">
+    <widget class="QCheckBox" name="openDirUsrPath">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
-     <item>
-      <property name="text">
-       <string>(System Default)</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="2">
-    <widget class="QLabel" name="label_2">
      <property name="text">
-      <string>Language:</string>
+      <string>Select media images from program working directory</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="1">
+   <item row="2" column="1">
     <widget class="QPushButton" name="pushButtonLanguage">
      <property name="text">
       <string>Default</string>
      </property>
     </widget>
    </item>
-   <item row="8" column="1">
-    <widget class="QPushButton" name="pushButton_2">
-     <property name="text">
-      <string>Default</string>
-     </property>
-    </widget>
-   </item>
    <item row="5" column="0">
-    <spacer name="horizontalSpacer_2">
+    <spacer name="horizontalSpacer_3">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="0">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Orientation::Horizontal</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
@@ -170,15 +142,59 @@
     </spacer>
    </item>
    <item row="9" column="0">
-    <widget class="QCheckBox" name="openDirUsrPath">
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
+    <widget class="QCheckBox" name="checkBoxConfirmExit">
      <property name="text">
-      <string>Select media images from program working directory</string>
+      <string>Ask for confirmation before quitting</string>
      </property>
     </widget>
    </item>
+   <item row="14" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Orientation::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="0">
+    <widget class="QCheckBox" name="checkBoxConfirmHardReset">
+     <property name="text">
+      <string>Ask for confirmation before hard resetting</string>
+     </property>
+    </widget>
+   </item>
+   <item row="13" column="0">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Color scheme</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QRadioButton" name="radioButtonSystem">
+        <property name="text">
+         <string>System</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="radioButtonLight">
+        <property name="text">
+         <string>Light</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="radioButtonDark">
+        <property name="text">
+         <string>Dark</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/qt/qt_renderercommon.cpp b/src/qt/qt_renderercommon.cpp
index 05c35e09b..b71e19e75 100644
--- a/src/qt/qt_renderercommon.cpp
+++ b/src/qt/qt_renderercommon.cpp
@@ -17,15 +17,11 @@
 
 #include "qt_renderercommon.hpp"
 #include "qt_mainwindow.hpp"
-#include "qt_machinestatus.hpp"
 
 #include <QPainter>
 #include <QWidget>
 #include <QEvent>
 #include <QApplication>
-#include <QFontMetrics>
-#include <QStatusBar>
-#include <QLayout>
 
 #include <cmath>
 
@@ -33,8 +29,6 @@ extern "C" {
 #include <86box/86box.h>
 #include <86box/plat.h>
 #include <86box/video.h>
-
-int status_icons_fullscreen = 0;
 }
 
 RendererCommon::RendererCommon() = default;
@@ -55,6 +49,73 @@ integer_scale(double *d, double *g)
     }
 }
 
+void
+standalone_scale(QRect &destination, int width, int height, QRect source, int scalemode)
+{
+    double dx;
+    double dy;
+    double dw;
+    double dh;
+    double gsr;
+
+    double hw  = width;
+    double hh  = height;
+    double gw  = source.width();
+    double gh  = source.height();
+    double hsr = hw / hh;
+    double r43 = 4.0 / 3.0;
+
+    switch (scalemode) {
+        case FULLSCR_SCALE_INT:
+        case FULLSCR_SCALE_INT43:
+            gsr = gw / gh;
+
+            if (scalemode == FULLSCR_SCALE_INT43) {
+                gh = gw / r43;
+
+                gsr = r43;
+            }
+
+            if (gsr <= hsr) {
+                dw = hh * gsr;
+                dh = hh;
+            } else {
+                dw = hw;
+                dh = hw / gsr;
+            }
+
+            integer_scale(&dw, &gw);
+            integer_scale(&dh, &gh);
+
+            dx = (hw - dw) / 2.0;
+            dy = (hh - dh) / 2.0;
+            destination.setRect((int) dx, (int) dy, (int) dw, (int) dh);
+            break;
+        case FULLSCR_SCALE_43:
+        case FULLSCR_SCALE_KEEPRATIO:
+            if (scalemode == FULLSCR_SCALE_43)
+                gsr = r43;
+            else
+                gsr = gw / gh;
+
+            if (gsr <= hsr) {
+                dw = hh * gsr;
+                dh = hh;
+            } else {
+                dw = hw;
+                dh = hw / gsr;
+            }
+            dx = (hw - dw) / 2.0;
+            dy = (hh - dh) / 2.0;
+            destination.setRect((int) dx, (int) dy, (int) dw, (int) dh);
+            break;
+        case FULLSCR_SCALE_FULL:
+        default:
+            destination.setRect(0, 0, (int) hw, (int) hh);
+            break;
+    }
+}
+
 void
 RendererCommon::onResize(int width, int height)
 {
@@ -65,6 +126,9 @@ RendererCommon::onResize(int width, int height)
     bool main_max = main_window->isMaximized();
     bool main_is_max = (main_is_ancestor && main_max == false);
 
+    width = round(pixelRatio * width);
+    height = round(pixelRatio * height);
+
     if (is_fs && (video_fullscreen_scale_maximized ? (parent_max && main_is_max) : 1))
         destination.setRect(0, 0, width, height);
     else {
@@ -135,52 +199,9 @@ RendererCommon::onResize(int width, int height)
 
     monitors[r_monitor_index].mon_res_x = (double) destination.width();
     monitors[r_monitor_index].mon_res_y = (double) destination.height();
-}
 
-void RendererCommon::drawStatusBarIcons(QPainter* painter)
-{
-    uint32_t x = 0;
-    auto prevcompositionMode = painter->compositionMode();
-    painter->setCompositionMode(QPainter::CompositionMode::CompositionMode_SourceOver);
-    for (int i = 0; i < main_window->statusBar()->children().count(); i++) {
-        QLabel* label = qobject_cast<QLabel*>(main_window->statusBar()->children()[i]);
-        if (label) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-            const QPixmap pixmap = label->pixmap();
-#elif QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
-            const QPixmap pixmap = label->pixmap(Qt::ReturnByValue);
-#else
-            const QPixmap pixmap = (label->pixmap() ? *label->pixmap() : QPixmap());
-#endif
-            if (!pixmap.isNull()) {
-                painter->setBrush(QColor::fromRgbF(0, 0, 0, 1.));
-                painter->fillRect(x, painter->device()->height() - pixmap.height() - 5,
-                                  pixmap.width(), pixmap.height() + 5, QColor::fromRgbF(0, 0, 0, .5));
-                painter->drawPixmap(x + main_window->statusBar()->layout()->spacing() / 2,
-                                    painter->device()->height() - pixmap.height() - 3, pixmap);
-                x += pixmap.width();
-                if (i <= main_window->statusBar()->children().count() - 3) {
-                    painter->fillRect(x, painter->device()->height() - pixmap.height() - 5,
-                                      main_window->statusBar()->layout()->spacing(), pixmap.height() + 5,
-                                      QColor::fromRgbF(0, 0, 0, .5));
-                    x += main_window->statusBar()->layout()->spacing();
-                } else
-                    painter->fillRect(x, painter->device()->height() - pixmap.height() - 4, 4,
-                                      pixmap.height() + 4, QColor::fromRgbF(0, 0, 0, .5));
-            }
-        }
-    }
-    if (main_window->status->getMessage().isEmpty() == false) {
-        auto curStatusMsg = main_window->status->getMessage();
-        auto textSize = painter->fontMetrics().size(Qt::TextSingleLine, QChar(' ') + curStatusMsg + QChar(' '));
-        painter->setPen(QColor(0, 0, 0, 127));
-        painter->fillRect(painter->device()->width() - textSize.width(), painter->device()->height() - textSize.height(),
-                          textSize.width(), textSize.height(), QColor(0, 0, 0, 127));
-        painter->setPen(QColor(255, 255, 255, 255));
-        painter->drawText(QRectF(painter->device()->width() - textSize.width(), painter->device()->height() - textSize.height(),
-                                 textSize.width(), textSize.height()), Qt::TextSingleLine, QChar(' ') + curStatusMsg + QChar(' '));
-    }
-    painter->setCompositionMode(prevcompositionMode);
+    destinationF.setRect((double)destination.x() / (double)width, (double)destination.y() / (double)height,
+                        (double)destination.width() / (double)width, (double)destination.height() / (double)height);
 }
 
 bool
@@ -196,6 +217,10 @@ RendererCommon::eventDelegate(QEvent *event, bool &result)
         case QEvent::MouseButtonPress:
         case QEvent::MouseMove:
         case QEvent::MouseButtonRelease:
+        case QEvent::TouchBegin:
+        case QEvent::TouchEnd:
+        case QEvent::TouchCancel:
+        case QEvent::TouchUpdate:
         case QEvent::Wheel:
         case QEvent::Enter:
         case QEvent::Leave:
diff --git a/src/qt/qt_renderercommon.hpp b/src/qt/qt_renderercommon.hpp
index 897240d27..6bfa51a8d 100644
--- a/src/qt/qt_renderercommon.hpp
+++ b/src/qt/qt_renderercommon.hpp
@@ -4,6 +4,7 @@
 #include <QEvent>
 #include <QImage>
 #include <QRect>
+#include <QRectF>
 #include <QWidget>
 
 #include <atomic>
@@ -34,11 +35,13 @@ public:
     virtual QDialog *getOptions(QWidget *parent) { return nullptr; }
     /* Reloads options of renderer */
     virtual void reloadOptions() { }
-
-    virtual bool hasBlitFunc() { return false; }
-    virtual void blit(int x, int y, int w, int h) { }
+    /* Make the renderer reload itself */
+    virtual bool reloadRendererOption() { return false; }
+    /* Should the renderer take screenshots itself? */
+    virtual bool rendererTakeScreenshot() { return false; }
 
     int      r_monitor_index = 0;
+    QRectF   destinationF = QRectF(0, 0, 1, 1); /* normalized to 0.0-1.0 range. */
 
 protected:
     bool     eventDelegate(QEvent *event, bool &result);
@@ -48,5 +51,7 @@ protected:
     QRect    destination;
     QWidget *parentWidget { nullptr };
 
+    double pixelRatio = 1.0;
+
     std::vector<std::atomic_flag> buf_usage;
 };
diff --git a/src/qt/qt_rendererstack.cpp b/src/qt/qt_rendererstack.cpp
index e5ed77ba7..32b017b92 100644
--- a/src/qt/qt_rendererstack.cpp
+++ b/src/qt/qt_rendererstack.cpp
@@ -21,13 +21,9 @@
 #include "qt_rendererstack.hpp"
 #include "ui_qt_rendererstack.h"
 
-#include "qt_hardwarerenderer.hpp"
 #include "qt_openglrenderer.hpp"
 #include "qt_softwarerenderer.hpp"
 #include "qt_vulkanwindowrenderer.hpp"
-#ifdef Q_OS_WIN
-#    include "qt_d3d9renderer.hpp"
-#endif
 
 #include "qt_mainwindow.hpp"
 #include "qt_util.hpp"
@@ -41,11 +37,35 @@
 
 #include <QScreen>
 #include <QMessageBox>
+#include <QTouchEvent>
+#include <QStringBuilder>
+
+#include <QPainter>
+#include <QEvent>
+#include <QKeyEvent>
+#include <QWidget>
+
+#include <QTimer>
+
+#include <atomic>
+#include <mutex>
+#include <array>
+#include <vector>
+#include <memory>
+#include <QApplication>
+
+#ifdef WAYLAND
+#    include "wl_mouse.hpp"
+#endif
 
 #ifdef __APPLE__
 #    include <CoreGraphics/CoreGraphics.h>
 #endif
 
+#ifdef Q_OS_WINDOWS
+#    include <windows.h>
+#endif
+
 extern "C" {
 #include <86box/86box.h>
 #include <86box/config.h>
@@ -62,10 +82,17 @@ struct mouseinputdata {
 static mouseinputdata mousedata;
 
 extern MainWindow *main_window;
+
+#ifdef Q_OS_WINDOWS
+HWND   rw_hwnd;
+#endif
+
 RendererStack::RendererStack(QWidget *parent, int monitor_index)
     : QStackedWidget(parent)
     , ui(new Ui::RendererStack)
 {
+    setAttribute(Qt::WA_AcceptTouchEvents, true);
+    rendererTakesScreenshots = false;
 #ifdef Q_OS_WINDOWS
     int raw = 1;
 #else
@@ -75,8 +102,19 @@ RendererStack::RendererStack(QWidget *parent, int monitor_index)
     ui->setupUi(this);
 
     m_monitor_index = monitor_index;
+
+
+    if (monitor_index >= 1) {
+        QTimer* frameRateTimer = new QTimer(this);
+        frameRateTimer->setSingleShot(false);
+        frameRateTimer->setInterval(1000);
+        connect(frameRateTimer, &QTimer::timeout, [this] {
+            this->setWindowTitle(QObject::tr("86Box Monitor #") + QString::number(m_monitor_index + 1) + QString(" - ") + tr("%1 Hz").arg(QString::number(monitors[m_monitor_index].mon_actualrenderedframes.load()) + (monitors[m_monitor_index].mon_interlace ? "i" : "")));
+        });
+        frameRateTimer->start(1000);
+    }
 #if defined __unix__ && !defined __HAIKU__
-    char auto_mouse_type[16];
+    memset(auto_mouse_type, 0, sizeof (auto_mouse_type));
     mousedata.mouse_type = getenv("EMU86BOX_MOUSE");
     if (!mousedata.mouse_type || (mousedata.mouse_type[0] == '\0') || !stricmp(mousedata.mouse_type, "auto")) {
         if (QApplication::platformName().contains("wayland"))
@@ -117,7 +155,8 @@ RendererStack::RendererStack(QWidget *parent, int monitor_index)
 
 RendererStack::~RendererStack()
 {
-    QApplication::restoreOverrideCursor();
+    while (QApplication::overrideCursor()) 
+        QApplication::restoreOverrideCursor();
     delete ui;
 }
 
@@ -126,7 +165,7 @@ qt_mouse_capture(int on)
 {
     if (!on) {
         mouse_capture = 0;
-        if (QApplication::overrideCursor()) QApplication::restoreOverrideCursor();
+        while (QApplication::overrideCursor()) QApplication::restoreOverrideCursor();
 #ifdef __APPLE__
         CGAssociateMouseAndMouseCursorPosition(true);
 #endif
@@ -144,7 +183,15 @@ int ignoreNextMouseEvent = 1;
 void
 RendererStack::mouseReleaseEvent(QMouseEvent *event)
 {
+#ifdef Q_OS_WINDOWS
+    rw_hwnd        = (HWND) this->winId();                
+#endif
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    if (!dopause && this->geometry().contains(m_monitor_index >= 1 ? event->globalPosition().toPoint() : event->position().toPoint()) &&
+#else
     if (!dopause && this->geometry().contains(m_monitor_index >= 1 ? event->globalPos() : event->pos()) &&
+#endif
         (event->button() == Qt::LeftButton) && !mouse_capture &&
         (isMouseDown & 1) && (kbd_req_capture || (mouse_get_buttons() != 0)) &&
         (mouse_input_mode == 0)) {
@@ -157,7 +204,7 @@ RendererStack::mouseReleaseEvent(QMouseEvent *event)
     }
     if (mouse_capture && (event->button() == Qt::MiddleButton) && (mouse_get_buttons() < 3)) {
         plat_mouse_capture(0);
-        this->setCursor(Qt::ArrowCursor);
+        this->unsetCursor();
         isMouseDown &= ~1;
         return;
     }
@@ -202,7 +249,19 @@ RendererStack::mousePressEvent(QMouseEvent *event)
 void
 RendererStack::wheelEvent(QWheelEvent *event)
 {
-    mouse_set_z(event->pixelDelta().y());
+    if (!mouse_capture) {
+        event->ignore();
+        return;
+    }
+
+#if !defined(Q_OS_WINDOWS) && !defined(__APPLE__)
+    double numSteps = (double) event->angleDelta().y() / 120.0;
+    double numStepsW = (double) event->angleDelta().x() / 120.0;
+
+    mouse_set_z((int) numSteps);
+    mouse_set_w((int) numStepsW);
+#endif
+    event->accept();
 }
 
 void
@@ -237,7 +296,9 @@ RendererStack::mouseMoveEvent(QMouseEvent *event)
         leaveEvent((QEvent *) event);
         ignoreNextMouseEvent--;
     }
+#if !defined _WIN32
     QCursor::setPos(mapToGlobal(QPoint(width() / 2, height() / 2)));
+#endif
     ignoreNextMouseEvent = 2;
     oldPos               = event->pos();
 #endif
@@ -250,10 +311,12 @@ RendererStack::enterEvent(QEnterEvent *event)
 RendererStack::enterEvent(QEvent *event)
 #endif
 {
-    mousedata.mouse_tablet_in_proximity = 1;
+    mousedata.mouse_tablet_in_proximity = m_monitor_index + 1;
 
     if (mouse_input_mode == 1)
         QApplication::setOverrideCursor(Qt::BlankCursor);
+    else if (mouse_input_mode == 2)
+        QApplication::setOverrideCursor(Qt::CrossCursor);
 }
 
 void
@@ -261,8 +324,10 @@ RendererStack::leaveEvent(QEvent *event)
 {
     mousedata.mouse_tablet_in_proximity = 0;
 
-    if (mouse_input_mode == 1 && QApplication::overrideCursor())
-        QApplication::restoreOverrideCursor();
+    if (mouse_input_mode >= 1 && QApplication::overrideCursor()) {
+        while (QApplication::overrideCursor())
+            QApplication::restoreOverrideCursor();
+    }
     if (QApplication::platformName().contains("wayland")) {
         event->accept();
         return;
@@ -277,42 +342,17 @@ RendererStack::leaveEvent(QEvent *event)
 void
 RendererStack::switchRenderer(Renderer renderer)
 {
-    startblit();
+    //startblit();
+    switchInProgress = true;
     if (current) {
-        if ((current_vid_api == Renderer::Direct3D9 && renderer != Renderer::Direct3D9)
-            || (current_vid_api != Renderer::Direct3D9 && renderer == Renderer::Direct3D9)) {
-            rendererWindow->finalize();
-            if (rendererWindow->hasBlitFunc()) {
-                while (directBlitting) { }
-                connect(this, &RendererStack::blit, this, &RendererStack::blitDummy, Qt::DirectConnection);
-                disconnect(this, &RendererStack::blit, this, &RendererStack::blitRenderer);
-            } else {
-                connect(this, &RendererStack::blit, this, &RendererStack::blitDummy, Qt::DirectConnection);
-                disconnect(this, &RendererStack::blit, this, &RendererStack::blitCommon);
-            }
+        rendererWindow->finalize();
+        removeWidget(current.get());
+        disconnect(this, &RendererStack::blitToRenderer, nullptr, nullptr);
 
-            removeWidget(current.get());
-            disconnect(this, &RendererStack::blitToRenderer, nullptr, nullptr);
+        /* Create new renderer only after previous is destroyed! */
+        connect(current.get(), &QObject::destroyed, [this, renderer](QObject *) { createRenderer(renderer); });
 
-            /* Create new renderer only after previous is destroyed! */
-            connect(current.get(), &QObject::destroyed, [this, renderer](QObject *) {
-                createRenderer(renderer);
-                disconnect(this, &RendererStack::blit, this, &RendererStack::blitDummy);
-                blitDummied = false;
-                QTimer::singleShot(1000, this, []() { blitDummied = false; });
-            });
-
-            rendererWindow->hasBlitFunc() ? current.reset() : current.release()->deleteLater();
-        } else {
-            rendererWindow->finalize();
-            removeWidget(current.get());
-            disconnect(this, &RendererStack::blitToRenderer, nullptr, nullptr);
-
-            /* Create new renderer only after previous is destroyed! */
-            connect(current.get(), &QObject::destroyed, [this, renderer](QObject *) { createRenderer(renderer); });
-
-            current.release()->deleteLater();
-        }
+        current.release()->deleteLater();
     } else {
         createRenderer(renderer);
     }
@@ -321,7 +361,7 @@ RendererStack::switchRenderer(Renderer renderer)
 void
 RendererStack::createRenderer(Renderer renderer)
 {
-    current_vid_api = renderer;
+    rendererTakesScreenshots = false;
     switch (renderer) {
         default:
         case Renderer::Software:
@@ -336,34 +376,17 @@ RendererStack::createRenderer(Renderer renderer)
 #endif
             }
             break;
-        case Renderer::OpenGL:
-            {
-                this->createWinId();
-                auto hw        = new HardwareRenderer(this);
-                rendererWindow = hw;
-                connect(this, &RendererStack::blitToRenderer, hw, &HardwareRenderer::onBlit, Qt::QueuedConnection);
-                current.reset(this->createWindowContainer(hw, this));
-                break;
-            }
-        case Renderer::OpenGLES:
-            {
-                this->createWinId();
-                auto hw        = new HardwareRenderer(this, HardwareRenderer::RenderType::OpenGLES);
-                rendererWindow = hw;
-                connect(this, &RendererStack::blitToRenderer, hw, &HardwareRenderer::onBlit, Qt::QueuedConnection);
-                current.reset(this->createWindowContainer(hw, this));
-                break;
-            }
         case Renderer::OpenGL3:
             {
                 this->createWinId();
+                this->rendererTakesScreenshots = true;
                 auto hw        = new OpenGLRenderer(this);
                 rendererWindow = hw;
                 connect(this, &RendererStack::blitToRenderer, hw, &OpenGLRenderer::onBlit, Qt::QueuedConnection);
                 connect(hw, &OpenGLRenderer::initialized, [=]() {
                     /* Buffers are available only after initialization. */
                     imagebufs = rendererWindow->getBuffers();
-                    endblit();
+                    switchInProgress = false;
                     emit rendererChanged();
                 });
                 connect(hw, &OpenGLRenderer::errorInitializing, [=]() {
@@ -374,27 +397,6 @@ RendererStack::createRenderer(Renderer renderer)
                 current.reset(this->createWindowContainer(hw, this));
                 break;
             }
-#ifdef Q_OS_WIN
-        case Renderer::Direct3D9:
-            {
-                this->createWinId();
-                auto hw        = new D3D9Renderer(this, m_monitor_index);
-                rendererWindow = hw;
-                connect(hw, &D3D9Renderer::error, this, [this](QString str) {
-                    auto msgBox = new QMessageBox(QMessageBox::Critical, "86Box", QString("Failed to initialize D3D9 renderer. Falling back to software rendering.\n\n") + str, QMessageBox::Ok);
-                    msgBox->setAttribute(Qt::WA_DeleteOnClose);
-                    msgBox->show();
-                    imagebufs = {};
-                    QTimer::singleShot(0, this, [this]() { switchRenderer(Renderer::Software); });
-                });
-                connect(hw, &D3D9Renderer::initialized, this, [this]() {
-                    endblit();
-                    emit rendererChanged();
-                });
-                current.reset(hw);
-                break;
-            }
-#endif
 #if QT_CONFIG(vulkan)
         case Renderer::Vulkan:
             {
@@ -403,7 +405,7 @@ RendererStack::createRenderer(Renderer renderer)
                 try {
                     hw = new VulkanWindowRenderer(this);
                 } catch (std::runtime_error &e) {
-                    auto msgBox = new QMessageBox(QMessageBox::Critical, "86Box", e.what() + QString("\nFalling back to software rendering."), QMessageBox::Ok);
+                    auto msgBox = new QMessageBox(QMessageBox::Critical, "86Box", e.what() + tr("\nFalling back to software rendering."), QMessageBox::Ok);
                     msgBox->setAttribute(Qt::WA_DeleteOnClose);
                     msgBox->show();
                     imagebufs = {};
@@ -416,12 +418,12 @@ RendererStack::createRenderer(Renderer renderer)
                 connect(hw, &VulkanWindowRenderer::rendererInitialized, [=]() {
                     /* Buffers are available only after initialization. */
                     imagebufs = rendererWindow->getBuffers();
-                    endblit();
+                    switchInProgress = false;
                     emit rendererChanged();
                 });
                 connect(hw, &VulkanWindowRenderer::errorInitializing, [=]() {
                     /* Renderer could not initialize, fallback to software. */
-                    auto msgBox = new QMessageBox(QMessageBox::Critical, "86Box", QString("Failed to initialize Vulkan renderer.\nFalling back to software rendering."), QMessageBox::Ok);
+                    auto msgBox = new QMessageBox(QMessageBox::Critical, "86Box", tr("Failed to initialize Vulkan renderer.") % tr("\nFalling back to software rendering."), QMessageBox::Ok);
                     msgBox->setAttribute(Qt::WA_DeleteOnClose);
                     msgBox->show();
                     imagebufs = {};
@@ -432,8 +434,9 @@ RendererStack::createRenderer(Renderer renderer)
             }
 #endif
     }
-    if (current.get() == nullptr)
+    if (current.get() == nullptr) {
         return;
+    }
     current->setFocusPolicy(Qt::NoFocus);
     current->setFocusProxy(this);
     current->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
@@ -442,46 +445,25 @@ RendererStack::createRenderer(Renderer renderer)
 
     this->setStyleSheet("background-color: black");
 
+    rendererWindow->r_monitor_index = m_monitor_index;
+
     currentBuf = 0;
 
-    if (rendererWindow->hasBlitFunc()) {
-        connect(this, &RendererStack::blit, this, &RendererStack::blitRenderer, Qt::DirectConnection);
-    } else {
-        connect(this, &RendererStack::blit, this, &RendererStack::blitCommon, Qt::DirectConnection);
-    }
-
-    if (renderer != Renderer::OpenGL3 && renderer != Renderer::Vulkan && renderer != Renderer::Direct3D9) {
+    if (renderer != Renderer::OpenGL3 && renderer != Renderer::Vulkan) {
         imagebufs = rendererWindow->getBuffers();
-        endblit();
+        switchInProgress = false;
         emit rendererChanged();
     }
 }
 
-void
-RendererStack::blitDummy(int x, int y, int w, int h)
-{
-    video_blit_complete_monitor(m_monitor_index);
-    blitDummied = true;
-}
-
-void
-RendererStack::blitRenderer(int x, int y, int w, int h)
-{
-    if (blitDummied) {
-        blitDummied = false;
-        video_blit_complete_monitor(m_monitor_index);
-        return;
-    }
-    directBlitting = true;
-    rendererWindow->blit(x, y, w, h);
-    directBlitting = false;
-}
-
 // called from blitter thread
 void
-RendererStack::blitCommon(int x, int y, int w, int h)
+RendererStack::blit(int x, int y, int w, int h)
 {
-    if (blitDummied || (x < 0) || (y < 0) || (w <= 0) || (h <= 0) || (w > 2048) || (h > 2048) || (monitors[m_monitor_index].target_buffer == NULL) || imagebufs.empty() || std::get<std::atomic_flag *>(imagebufs[currentBuf])->test_and_set()) {
+    if ((x < 0) || (y < 0) || (w <= 0) || (h <= 0) ||
+        (w > 2048) || (h > 2048) || (switchInProgress) ||
+        (monitors[m_monitor_index].target_buffer == NULL) || imagebufs.empty() ||
+        std::get<std::atomic_flag *>(imagebufs[currentBuf])->test_and_set()) {
         video_blit_complete_monitor(m_monitor_index);
         return;
     }
@@ -495,7 +477,7 @@ RendererStack::blitCommon(int x, int y, int w, int h)
         video_copy(scanline, &(monitors[m_monitor_index].target_buffer->line[y1][x]), w * 4);
     }
 
-    if (monitors[m_monitor_index].mon_screenshots) {
+    if (monitors[m_monitor_index].mon_screenshots && !rendererTakesScreenshots) {
         video_screenshot_monitor((uint32_t *) imagebits, x, y, 2048, m_monitor_index);
     }
     video_blit_complete_monitor(m_monitor_index);
@@ -532,25 +514,171 @@ RendererStack::event(QEvent* event)
 
         if (m_monitor_index >= 1) {
             if (mouse_input_mode >= 1) {
-                mouse_x_abs       = (mouse_event->localPos().x()) / (long double)width();
-                mouse_y_abs       = (mouse_event->localPos().y()) / (long double)height();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+                mouse_x_abs       = (mouse_event->position().x()) / (double)width();
+                mouse_y_abs       = (mouse_event->position().y()) / (double)height();
+#else
+                mouse_x_abs       = (mouse_event->localPos().x()) / (double)width();
+                mouse_y_abs       = (mouse_event->localPos().y()) / (double)height();
+#endif
                 if (!mouse_tablet_in_proximity)
                     mouse_tablet_in_proximity = mousedata.mouse_tablet_in_proximity;
+                mouse_x_abs -= rendererWindow->destinationF.left();
+                mouse_y_abs -= rendererWindow->destinationF.top();
+
+                if (mouse_x_abs < 0) mouse_x_abs = 0;
+                if (mouse_y_abs < 0) mouse_y_abs = 0;
+
+                mouse_x_abs /= rendererWindow->destinationF.width();
+                mouse_y_abs /= rendererWindow->destinationF.height();
+
+                if (mouse_x_abs > 1) mouse_x_abs = 1;
+                if (mouse_y_abs > 1) mouse_y_abs = 1;
             }
             return QStackedWidget::event(event);
         }
 
 #ifdef Q_OS_WINDOWS
         if (mouse_input_mode == 0) {
-            mouse_x_abs           = (mouse_event->localPos().x()) / (long double)width();
-            mouse_y_abs           = (mouse_event->localPos().y()) / (long double)height();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            mouse_x_abs           = (mouse_event->position().x()) / (double)width();
+            mouse_y_abs           = (mouse_event->position().y()) / (double)height();
+#else
+            mouse_x_abs           = (mouse_event->localPos().x()) / (double)width();
+            mouse_y_abs           = (mouse_event->localPos().y()) / (double)height();
+#endif
+            mouse_x_abs          -= rendererWindow->destinationF.left();
+            mouse_y_abs          -= rendererWindow->destinationF.top();
+
+            if (mouse_x_abs < 0) mouse_x_abs = 0;
+            if (mouse_y_abs < 0) mouse_y_abs = 0;
+
+            mouse_x_abs /= rendererWindow->destinationF.width();
+            mouse_y_abs /= rendererWindow->destinationF.height();
+
+            if (mouse_x_abs > 1) mouse_x_abs = 1;
+            if (mouse_y_abs > 1) mouse_y_abs = 1;
             return QStackedWidget::event(event);
         }
 #endif
 
-        mouse_x_abs               = (mouse_event->localPos().x()) / (long double)width();
-        mouse_y_abs               = (mouse_event->localPos().y()) / (long double)height();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        mouse_x_abs               = (mouse_event->position().x()) / (double)width();
+        mouse_y_abs               = (mouse_event->position().y()) / (double)height();
+#else
+        mouse_x_abs               = (mouse_event->localPos().x()) / (double)width();
+        mouse_y_abs               = (mouse_event->localPos().y()) / (double)height();
+#endif
+        mouse_x_abs              -= rendererWindow->destinationF.left();
+        mouse_y_abs              -= rendererWindow->destinationF.top();
+
+        if (mouse_x_abs < 0) mouse_x_abs = 0;
+        if (mouse_y_abs < 0) mouse_y_abs = 0;
+
+        mouse_x_abs /= rendererWindow->destinationF.width();
+        mouse_y_abs /= rendererWindow->destinationF.height();
+
+        if (mouse_x_abs > 1) mouse_x_abs = 1;
+        if (mouse_y_abs > 1) mouse_y_abs = 1;
         mouse_tablet_in_proximity = mousedata.mouse_tablet_in_proximity;
+    } else switch (event->type()) {
+        case QEvent::TouchBegin:
+        case QEvent::TouchUpdate:
+        {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+            QTouchEvent* touchevent = (QTouchEvent*)event;
+            if (mouse_input_mode == 0) break;
+            if (touchevent->touchPoints().count()) {
+                mouse_x_abs  = (touchevent->touchPoints()[0].pos().x()) / (double)width();
+                mouse_y_abs  = (touchevent->touchPoints()[0].pos().y()) / (double)height();
+                mouse_x_abs -= rendererWindow->destinationF.left();
+                mouse_y_abs -= rendererWindow->destinationF.top();
+        
+                if (mouse_x_abs < 0) mouse_x_abs = 0;
+                if (mouse_y_abs < 0) mouse_y_abs = 0;
+        
+                mouse_x_abs /= rendererWindow->destinationF.width();
+                mouse_y_abs /= rendererWindow->destinationF.height();
+
+                if (mouse_x_abs > 1) mouse_x_abs = 1;
+                if (mouse_y_abs > 1) mouse_y_abs = 1;
+            }
+            mouse_set_buttons_ex(mouse_get_buttons_ex() | 1);
+            touchevent->accept();
+            return true;
+#else
+            QTouchEvent* touchevent = (QTouchEvent*)event;
+            if (mouse_input_mode == 0) break;
+            if (touchevent->pointCount()) {
+                mouse_x_abs  = (touchevent->point(0).position().x()) / (double)width();
+                mouse_y_abs  = (touchevent->point(0).position().y()) / (double)height();
+                mouse_x_abs -= rendererWindow->destinationF.left();
+                mouse_y_abs -= rendererWindow->destinationF.top();
+        
+                if (mouse_x_abs < 0) mouse_x_abs = 0;
+                if (mouse_y_abs < 0) mouse_y_abs = 0;
+        
+                mouse_x_abs /= rendererWindow->destinationF.width();
+                mouse_y_abs /= rendererWindow->destinationF.height();
+
+                if (mouse_x_abs > 1) mouse_x_abs = 1;
+                if (mouse_y_abs > 1) mouse_y_abs = 1;
+            }
+            mouse_set_buttons_ex(mouse_get_buttons_ex() | 1);
+            touchevent->accept();
+            return true;
+#endif
+        }
+        case QEvent::TouchEnd:
+        case QEvent::TouchCancel:
+        {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+            QTouchEvent* touchevent = (QTouchEvent*)event;
+            if (mouse_input_mode == 0) break;
+            if (touchevent->touchPoints().count()) {
+                mouse_x_abs = (touchevent->touchPoints()[0].pos().x()) / (double)width();
+                mouse_y_abs = (touchevent->touchPoints()[0].pos().y()) / (double)height();
+                mouse_x_abs              -= rendererWindow->destinationF.left();
+                mouse_y_abs              -= rendererWindow->destinationF.top();
+        
+                if (mouse_x_abs < 0) mouse_x_abs = 0;
+                if (mouse_y_abs < 0) mouse_y_abs = 0;
+        
+                mouse_x_abs /= rendererWindow->destinationF.width();
+                mouse_y_abs /= rendererWindow->destinationF.height();
+
+                if (mouse_x_abs > 1) mouse_x_abs = 1;
+                if (mouse_y_abs > 1) mouse_y_abs = 1;
+            }
+            mouse_set_buttons_ex(mouse_get_buttons_ex() & ~1);
+            touchevent->accept();
+            return true;
+#else
+            QTouchEvent* touchevent = (QTouchEvent*)event;
+            if (mouse_input_mode == 0) break;
+            if (touchevent->pointCount()) {
+                mouse_x_abs = (touchevent->point(0).position().x()) / (double)width();
+                mouse_y_abs = (touchevent->point(0).position().y()) / (double)height();
+                mouse_x_abs              -= rendererWindow->destinationF.left();
+                mouse_y_abs              -= rendererWindow->destinationF.top();
+        
+                if (mouse_x_abs < 0) mouse_x_abs = 0;
+                if (mouse_y_abs < 0) mouse_y_abs = 0;
+        
+                mouse_x_abs /= rendererWindow->destinationF.width();
+                mouse_y_abs /= rendererWindow->destinationF.height();
+
+                if (mouse_x_abs > 1) mouse_x_abs = 1;
+                if (mouse_y_abs > 1) mouse_y_abs = 1;
+            }
+            mouse_set_buttons_ex(mouse_get_buttons_ex() & ~1);
+            touchevent->accept();
+            return true;
+#endif
+        }
+
+        default:
+            return QStackedWidget::event(event);
     }
 
     return QStackedWidget::event(event);
@@ -566,6 +694,14 @@ RendererStack::setFocusRenderer()
 void
 RendererStack::onResize(int width, int height)
 {
+#ifdef Q_OS_WINDOWS
+    if (mouse_capture) {
+        RECT rect;
+        if (GetWindowRect((HWND)this->winId(), &rect)) {
+            ClipCursor(&rect);
+        }
+    }
+#endif
     if (rendererWindow) {
         rendererWindow->r_monitor_index = m_monitor_index;
         rendererWindow->onResize(width, height);
diff --git a/src/qt/qt_rendererstack.hpp b/src/qt/qt_rendererstack.hpp
index c9d90869b..99de85c99 100644
--- a/src/qt/qt_rendererstack.hpp
+++ b/src/qt/qt_rendererstack.hpp
@@ -7,6 +7,7 @@
 #include <QStackedWidget>
 #include <QWidget>
 #include <QCursor>
+#include <QScreen>
 
 #include <atomic>
 #include <memory>
@@ -14,11 +15,19 @@
 #include <vector>
 
 #include "qt_renderercommon.hpp"
+#include "qt_util.hpp"
+
+#include <atomic>
 
 namespace Ui {
 class RendererStack;
 }
 
+extern "C"
+{
+    extern int vid_resize;
+}
+
 class RendererCommon;
 class RendererStack : public QStackedWidget {
     Q_OBJECT
@@ -41,6 +50,22 @@ public:
     void changeEvent(QEvent *event) override;
     void resizeEvent(QResizeEvent *event) override
     {
+        if (this->m_monitor_index != 0 && vid_resize != 1) {
+            int newX = pos().x();
+            int newY = pos().y();
+        
+            if (((frameGeometry().x() + event->size().width() + 1) > util::screenOfWidget(this)->availableGeometry().right())) {
+                //move(util::screenOfWidget(this)->availableGeometry().right() - size().width() - 1, pos().y());
+                newX = util::screenOfWidget(this)->availableGeometry().right() - frameGeometry().width() - 1;
+                if (newX < 1) newX = 1;
+            }
+        
+            if (((frameGeometry().y() + event->size().height() + 1) > util::screenOfWidget(this)->availableGeometry().bottom())) {
+                newY = util::screenOfWidget(this)->availableGeometry().bottom() - frameGeometry().height() - 1;
+                if (newY < 1) newY = 1;
+            }
+            move(newX, newY);
+        }
         onResize(event->size().width(), event->size().height());
     }
     void keyPressEvent(QKeyEvent *event) override
@@ -55,11 +80,8 @@ public:
 
     enum class Renderer {
         Software,
-        OpenGL,
-        OpenGLES,
         OpenGL3,
         Vulkan,
-        Direct3D9,
         None = -1
     };
     void switchRenderer(Renderer renderer);
@@ -70,6 +92,8 @@ public:
     void reloadOptions() const { return rendererWindow->reloadOptions(); }
     /* Returns options dialog for current renderer */
     QDialog *getOptions(QWidget *parent) { return rendererWindow ? rendererWindow->getOptions(parent) : nullptr; }
+    /* Reload the renderer itself */
+    bool reloadRendererOption() { return rendererWindow ? rendererWindow->reloadRendererOption() : false; }
 
     void setFocusRenderer();
     void onResize(int width, int height);
@@ -81,13 +105,10 @@ public:
 
 signals:
     void blitToRenderer(int buf_idx, int x, int y, int w, int h);
-    void blit(int x, int y, int w, int h);
     void rendererChanged();
 
 public slots:
-    void blitCommon(int x, int y, int w, int h);
-    void blitRenderer(int x, int y, int w, int h);
-    void blitDummy(int x, int y, int w, int h);
+    void blit(int x, int y, int w, int h);
 
 private:
     void createRenderer(Renderer renderer);
@@ -107,13 +128,15 @@ private:
     int isMouseDown     = 0;
     int m_monitor_index = 0;
 
-    Renderer current_vid_api = Renderer::None;
-
     std::vector<std::tuple<uint8_t *, std::atomic_flag *>> imagebufs;
 
     RendererCommon          *rendererWindow { nullptr };
     std::unique_ptr<QWidget> current;
-    std::atomic<bool>        directBlitting { false };
+
+    std::atomic_bool rendererTakesScreenshots;
+    std::atomic_bool switchInProgress{false};
+
+    char auto_mouse_type[16];
 };
 
 #endif // QT_RENDERERCONTAINER_HPP
diff --git a/src/qt/qt_sdl.c b/src/qt/qt_sdl.c
deleted file mode 100644
index 15af4d7b6..000000000
--- a/src/qt/qt_sdl.c
+++ /dev/null
@@ -1,708 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Rendering module for libSDL2
- *
- * NOTE:    Given all the problems reported with FULLSCREEN use of SDL,
- *          we will not use that, but, instead, use a new window which
- *          covers the entire desktop.
- *
- *
- *
- * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
- *          Michael Drüing, <michael@drueing.de>
- *
- *          Copyright 2018-2020 Fred N. van Kempen.
- *          Copyright 2018-2020 Michael Drüing.
- *
- *          Redistribution and  use  in source  and binary forms, with
- *          or  without modification, are permitted  provided that the
- *          following conditions are met:
- *
- *         1. Redistributions of  source  code must retain the entire
- *            above notice, this list of conditions and the following
- *            disclaimer.
- *
- *         2. Redistributions in binary form must reproduce the above
- *            copyright  notice,  this list  of  conditions  and  the
- *            following disclaimer in  the documentation and/or other
- *            materials provided with the distribution.
- *
- *         3. Neither the  name of the copyright holder nor the names
- *            of  its  contributors may be used to endorse or promote
- *            products  derived from  this  software without specific
- *            prior written permission.
- *
- * THIS SOFTWARE  IS  PROVIDED BY THE  COPYRIGHT  HOLDERS AND CONTRIBUTORS
- * "AS IS" AND  ANY EXPRESS  OR  IMPLIED  WARRANTIES,  INCLUDING, BUT  NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE  ARE  DISCLAIMED. IN  NO  EVENT  SHALL THE COPYRIGHT
- * HOLDER OR  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL  DAMAGES  (INCLUDING,  BUT  NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE  GOODS OR SERVICES;  LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  AND ON  ANY
- * THEORY OF  LIABILITY, WHETHER IN  CONTRACT, STRICT  LIABILITY, OR  TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include <SDL2/SDL.h>
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-/* This #undef is needed because a SDL include header redefines HAVE_STDARG_H. */
-#undef HAVE_STDARG_H
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include <86box/mouse.h>
-#include <86box/keyboard.h>
-#include <86box/device.h>
-#include <86box/plat.h>
-#include <86box/plat_dynld.h>
-#include <86box/video.h>
-#include <86box/ui.h>
-#include <86box/version.h>
-
-#include "qt_sdl.h"
-
-#define RENDERER_FULL_SCREEN 1
-#define RENDERER_HARDWARE    2
-#define RENDERER_OPENGL      4
-
-static SDL_Window   *sdl_win    = NULL;
-static SDL_Renderer *sdl_render = NULL;
-static SDL_Texture  *sdl_tex    = NULL;
-static int           sdl_w;
-static int           sdl_h;
-static int           sdl_fs;
-static int           sdl_flags = -1;
-static int           cur_w;
-static int           cur_h;
-static int           cur_ww = 0;
-static int           cur_wh = 0;
-static volatile int  sdl_enabled = 0;
-static SDL_mutex    *sdl_mutex   = NULL;
-
-static const uint16_t sdl_to_xt[0x200] = {
-    [SDL_SCANCODE_ESCAPE]       = 0x01,
-    [SDL_SCANCODE_1]            = 0x02,
-    [SDL_SCANCODE_2]            = 0x03,
-    [SDL_SCANCODE_3]            = 0x04,
-    [SDL_SCANCODE_4]            = 0x05,
-    [SDL_SCANCODE_5]            = 0x06,
-    [SDL_SCANCODE_6]            = 0x07,
-    [SDL_SCANCODE_7]            = 0x08,
-    [SDL_SCANCODE_8]            = 0x09,
-    [SDL_SCANCODE_9]            = 0x0A,
-    [SDL_SCANCODE_0]            = 0x0B,
-    [SDL_SCANCODE_MINUS]        = 0x0C,
-    [SDL_SCANCODE_EQUALS]       = 0x0D,
-    [SDL_SCANCODE_BACKSPACE]    = 0x0E,
-    [SDL_SCANCODE_TAB]          = 0x0F,
-    [SDL_SCANCODE_Q]            = 0x10,
-    [SDL_SCANCODE_W]            = 0x11,
-    [SDL_SCANCODE_E]            = 0x12,
-    [SDL_SCANCODE_R]            = 0x13,
-    [SDL_SCANCODE_T]            = 0x14,
-    [SDL_SCANCODE_Y]            = 0x15,
-    [SDL_SCANCODE_U]            = 0x16,
-    [SDL_SCANCODE_I]            = 0x17,
-    [SDL_SCANCODE_O]            = 0x18,
-    [SDL_SCANCODE_P]            = 0x19,
-    [SDL_SCANCODE_LEFTBRACKET]  = 0x1A,
-    [SDL_SCANCODE_RIGHTBRACKET] = 0x1B,
-    [SDL_SCANCODE_RETURN]       = 0x1C,
-    [SDL_SCANCODE_LCTRL]        = 0x1D,
-    [SDL_SCANCODE_A]            = 0x1E,
-    [SDL_SCANCODE_S]            = 0x1F,
-    [SDL_SCANCODE_D]            = 0x20,
-    [SDL_SCANCODE_F]            = 0x21,
-    [SDL_SCANCODE_G]            = 0x22,
-    [SDL_SCANCODE_H]            = 0x23,
-    [SDL_SCANCODE_J]            = 0x24,
-    [SDL_SCANCODE_K]            = 0x25,
-    [SDL_SCANCODE_L]            = 0x26,
-    [SDL_SCANCODE_SEMICOLON]    = 0x27,
-    [SDL_SCANCODE_APOSTROPHE]   = 0x28,
-    [SDL_SCANCODE_GRAVE]        = 0x29,
-    [SDL_SCANCODE_LSHIFT]       = 0x2A,
-    [SDL_SCANCODE_BACKSLASH]    = 0x2B,
-    [SDL_SCANCODE_Z]            = 0x2C,
-    [SDL_SCANCODE_X]            = 0x2D,
-    [SDL_SCANCODE_C]            = 0x2E,
-    [SDL_SCANCODE_V]            = 0x2F,
-    [SDL_SCANCODE_B]            = 0x30,
-    [SDL_SCANCODE_N]            = 0x31,
-    [SDL_SCANCODE_M]            = 0x32,
-    [SDL_SCANCODE_COMMA]        = 0x33,
-    [SDL_SCANCODE_PERIOD]       = 0x34,
-    [SDL_SCANCODE_SLASH]        = 0x35,
-    [SDL_SCANCODE_RSHIFT]       = 0x36,
-    [SDL_SCANCODE_KP_MULTIPLY]  = 0x37,
-    [SDL_SCANCODE_LALT]         = 0x38,
-    [SDL_SCANCODE_SPACE]        = 0x39,
-    [SDL_SCANCODE_CAPSLOCK]     = 0x3A,
-    [SDL_SCANCODE_F1]           = 0x3B,
-    [SDL_SCANCODE_F2]           = 0x3C,
-    [SDL_SCANCODE_F3]           = 0x3D,
-    [SDL_SCANCODE_F4]           = 0x3E,
-    [SDL_SCANCODE_F5]           = 0x3F,
-    [SDL_SCANCODE_F6]           = 0x40,
-    [SDL_SCANCODE_F7]           = 0x41,
-    [SDL_SCANCODE_F8]           = 0x42,
-    [SDL_SCANCODE_F9]           = 0x43,
-    [SDL_SCANCODE_F10]          = 0x44,
-    [SDL_SCANCODE_NUMLOCKCLEAR] = 0x45,
-    [SDL_SCANCODE_SCROLLLOCK]   = 0x46,
-    [SDL_SCANCODE_HOME]         = 0x147,
-    [SDL_SCANCODE_UP]           = 0x148,
-    [SDL_SCANCODE_PAGEUP]       = 0x149,
-    [SDL_SCANCODE_KP_MINUS]     = 0x4A,
-    [SDL_SCANCODE_LEFT]         = 0x14B,
-    [SDL_SCANCODE_KP_5]         = 0x4C,
-    [SDL_SCANCODE_RIGHT]        = 0x14D,
-    [SDL_SCANCODE_KP_PLUS]      = 0x4E,
-    [SDL_SCANCODE_END]          = 0x14F,
-    [SDL_SCANCODE_DOWN]         = 0x150,
-    [SDL_SCANCODE_PAGEDOWN]     = 0x151,
-    [SDL_SCANCODE_INSERT]       = 0x152,
-    [SDL_SCANCODE_DELETE]       = 0x153,
-    [SDL_SCANCODE_F11]          = 0x57,
-    [SDL_SCANCODE_F12]          = 0x58,
-
-    [SDL_SCANCODE_KP_ENTER]  = 0x11c,
-    [SDL_SCANCODE_RCTRL]     = 0x11d,
-    [SDL_SCANCODE_KP_DIVIDE] = 0x135,
-    [SDL_SCANCODE_RALT]      = 0x138,
-    [SDL_SCANCODE_KP_9]      = 0x49,
-    [SDL_SCANCODE_KP_8]      = 0x48,
-    [SDL_SCANCODE_KP_7]      = 0x47,
-    [SDL_SCANCODE_KP_6]      = 0x4D,
-    [SDL_SCANCODE_KP_4]      = 0x4B,
-    [SDL_SCANCODE_KP_3]      = 0x51,
-    [SDL_SCANCODE_KP_2]      = 0x50,
-    [SDL_SCANCODE_KP_1]      = 0x4F,
-    [SDL_SCANCODE_KP_0]      = 0x52,
-    [SDL_SCANCODE_KP_PERIOD] = 0x53,
-
-    [SDL_SCANCODE_LGUI]           = 0x15B,
-    [SDL_SCANCODE_RGUI]           = 0x15C,
-    [SDL_SCANCODE_APPLICATION]    = 0x15D,
-    [SDL_SCANCODE_PRINTSCREEN]    = 0x137,
-    [SDL_SCANCODE_NONUSBACKSLASH] = 0x56,
-};
-
-// #define ENABLE_SDL_LOG 3
-#ifdef ENABLE_SDL_LOG
-int sdl_do_log = ENABLE_SDL_LOG;
-
-static void
-sdl_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (sdl_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define sdl_log(fmt, ...)
-#endif
-
-static void
-sdl_integer_scale(double *d, double *g)
-{
-    double ratio;
-
-    if (*d > *g) {
-        ratio = floor(*d / *g);
-        *d    = *g * ratio;
-    } else {
-        ratio = ceil(*d / *g);
-        *d    = *g / ratio;
-    }
-}
-
-static void
-sdl_stretch(int *w, int *h, int *x, int *y)
-{
-    double hw;
-    double gw;
-    double hh;
-    double gh;
-    double dx;
-    double dy;
-    double dw;
-    double dh;
-    double gsr;
-    double hsr;
-
-    hw  = (double) sdl_w;
-    hh  = (double) sdl_h;
-    gw  = (double) *w;
-    gh  = (double) *h;
-    hsr = hw / hh;
-
-    switch (video_fullscreen_scale) {
-        case FULLSCR_SCALE_FULL:
-        default:
-            *w = sdl_w;
-            *h = sdl_h;
-            *x = 0;
-            *y = 0;
-            break;
-        case FULLSCR_SCALE_43:
-        case FULLSCR_SCALE_KEEPRATIO:
-            if (video_fullscreen_scale == FULLSCR_SCALE_43)
-                gsr = 4.0 / 3.0;
-            else
-                gsr = gw / gh;
-            if (gsr <= hsr) {
-                dw = hh * gsr;
-                dh = hh;
-            } else {
-                dw = hw;
-                dh = hw / gsr;
-            }
-            dx = (hw - dw) / 2.0;
-            dy = (hh - dh) / 2.0;
-            *w = (int) dw;
-            *h = (int) dh;
-            *x = (int) dx;
-            *y = (int) dy;
-            break;
-        case FULLSCR_SCALE_INT:
-            gsr = gw / gh;
-            if (gsr <= hsr) {
-                dw = hh * gsr;
-                dh = hh;
-            } else {
-                dw = hw;
-                dh = hw / gsr;
-            }
-            sdl_integer_scale(&dw, &gw);
-            sdl_integer_scale(&dh, &gh);
-            dx = (hw - dw) / 2.0;
-            dy = (hh - dh) / 2.0;
-            *w = (int) dw;
-            *h = (int) dh;
-            *x = (int) dx;
-            *y = (int) dy;
-            break;
-    }
-}
-
-static void
-sdl_blit(int x, int y, int w, int h)
-{
-    SDL_Rect r_src;
-    void    *pixeldata;
-    int      ret;
-    int      pitch;
-
-    if (!sdl_enabled || (x < 0) || (y < 0) || (w <= 0) || (h <= 0) || (w > 2048) || (h > 2048) || (buffer32 == NULL) || (sdl_render == NULL) || (sdl_tex == NULL)) {
-        video_blit_complete();
-        return;
-    }
-
-    SDL_LockMutex(sdl_mutex);
-    SDL_LockTexture(sdl_tex, 0, &pixeldata, &pitch);
-
-    video_copy(pixeldata, &(buffer32->line[y][x]), h * (2048) * sizeof(uint32_t));
-
-    if (monitors[m_monitor_index].mon_screenshots)
-        video_screenshot((uint32_t *) pixeldata, 0, 0, (2048));
-
-    SDL_UnlockTexture(sdl_tex);
-
-    video_blit_complete();
-
-    SDL_RenderClear(sdl_render);
-
-    r_src.x = 0;
-    r_src.y = 0;
-    r_src.w = w;
-    r_src.h = h;
-
-    ret = SDL_RenderCopy(sdl_render, sdl_tex, &r_src, 0);
-    if (ret)
-        sdl_log("SDL: unable to copy texture to renderer (%s)\n", sdl_GetError());
-
-    SDL_RenderPresent(sdl_render);
-
-    SDL_UnlockMutex(sdl_mutex);
-}
-
-static void
-sdl_destroy_window(void)
-{
-    if (sdl_win != NULL) {
-        SDL_DestroyWindow(sdl_win);
-        sdl_win = NULL;
-    }
-}
-
-static void
-sdl_destroy_texture(void)
-{
-    if (sdl_tex != NULL) {
-        SDL_DestroyTexture(sdl_tex);
-        sdl_tex = NULL;
-    }
-
-    /* SDL_DestroyRenderer also automatically destroys all associated textures. */
-    if (sdl_render != NULL) {
-        SDL_DestroyRenderer(sdl_render);
-        sdl_render = NULL;
-    }
-}
-
-void
-sdl_close(void)
-{
-    if (sdl_mutex != NULL)
-        SDL_LockMutex(sdl_mutex);
-
-    /* Unregister our renderer! */
-    video_setblit(NULL);
-
-    if (sdl_enabled)
-        sdl_enabled = 0;
-
-    if (sdl_mutex != NULL) {
-        SDL_DestroyMutex(sdl_mutex);
-        sdl_mutex = NULL;
-    }
-
-    sdl_destroy_texture();
-    sdl_destroy_window();
-
-    /* Quit. */
-    SDL_Quit();
-    sdl_flags = -1;
-}
-
-static void
-sdl_select_best_hw_driver(void)
-{
-    SDL_RendererInfo renderInfo;
-
-    for (int i = 0; i < SDL_GetNumRenderDrivers(); ++i) {
-        SDL_GetRenderDriverInfo(i, &renderInfo);
-        if (renderInfo.flags & SDL_RENDERER_ACCELERATED) {
-            SDL_SetHint(SDL_HINT_RENDER_DRIVER, renderInfo.name);
-            return;
-        }
-    }
-}
-
-static void
-sdl_init_texture(void)
-{
-    if (sdl_flags & RENDERER_HARDWARE) {
-        sdl_render = SDL_CreateRenderer(sdl_win, -1, SDL_RENDERER_ACCELERATED);
-        SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, video_filter_method ? "1" : "0");
-    } else {
-        sdl_render = SDL_CreateRenderer(sdl_win, -1, SDL_RENDERER_SOFTWARE);
-    }
-
-    sdl_tex = SDL_CreateTexture(sdl_render, SDL_PIXELFORMAT_ARGB8888,
-                                SDL_TEXTUREACCESS_STREAMING, 2048, 2048);
-
-    if (sdl_render == NULL) {
-        sdl_log("SDL: unable to SDL_CreateRenderer (%s)\n", SDL_GetError());
-    }
-    if (sdl_tex == NULL) {
-        sdl_log("SDL: unable to SDL_CreateTexture (%s)\n", SDL_GetError());
-    }
-}
-
-static void
-sdl_reinit_texture(void)
-{
-    if (sdl_flags == -1)
-        return;
-
-    sdl_destroy_texture();
-    sdl_init_texture();
-}
-
-void
-sdl_set_fs(int fs)
-{
-    SDL_SetWindowFullscreen(sdl_win, fs ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
-    SDL_SetRelativeMouseMode((SDL_bool) mouse_capture);
-
-    sdl_fs = fs;
-
-    if (fs) {
-        sdl_flags |= RENDERER_FULL_SCREEN;
-    } else {
-        sdl_flags &= ~RENDERER_FULL_SCREEN;
-    }
-
-    sdl_reinit_texture();
-}
-
-static int
-sdl_init_common(void *win, int flags)
-{
-    wchar_t     temp[128];
-    SDL_version ver;
-
-    sdl_log("SDL: init (fs=%d)\n", 0);
-
-    /* Get and log the version of the DLL we are using. */
-    SDL_GetVersion(&ver);
-    sdl_log("SDL: version %d.%d.%d\n", ver.major, ver.minor, ver.patch);
-
-    /* Initialize the SDL system. */
-    if (SDL_Init(SDL_INIT_VIDEO) < 0) {
-        sdl_log("SDL: initialization failed (%s)\n", SDL_GetError());
-        return (0);
-    }
-
-    if (flags & RENDERER_HARDWARE) {
-        if (flags & RENDERER_OPENGL)
-            SDL_SetHint(SDL_HINT_RENDER_DRIVER, "OpenGL");
-        else
-            sdl_select_best_hw_driver();
-    }
-
-    /* Get the size of the (current) desktop. */
-    SDL_DisplayMode dm;
-    if (SDL_GetDesktopDisplayMode(0, &dm) != 0) {
-        sdl_log("SDL: SDL_GetDesktopDisplayMode failed (%s)\n", SDL_GetError());
-        return (0);
-    }
-    sdl_w     = dm.w;
-    sdl_h     = dm.h;
-    sdl_flags = flags;
-
-    sdl_win = SDL_CreateWindow("86Box renderer", 640, 480, 100, 100, sdl_flags);
-    if (sdl_win == NULL) {
-        sdl_log("SDL: unable to CreateWindowFrom (%s)\n", SDL_GetError());
-    }
-    sdl_init_texture();
-    sdl_set_fs(video_fullscreen & 1);
-
-    /* Make sure we get a clean exit. */
-    atexit(sdl_close);
-
-    /* Register our renderer! */
-    video_setblit(sdl_blit);
-
-    sdl_enabled = 1;
-    sdl_mutex   = SDL_CreateMutex();
-
-    return (1);
-}
-
-int
-sdl_inits(void *win)
-{
-    return sdl_init_common(win, 0);
-}
-
-int
-sdl_inith(void *win)
-{
-    return sdl_init_common(win, RENDERER_HARDWARE);
-}
-
-int
-sdl_initho(void *win)
-{
-    return sdl_init_common(win, RENDERER_HARDWARE | RENDERER_OPENGL);
-}
-
-int
-sdl_pause(void)
-{
-    return 0;
-}
-
-void
-sdl_resize(int w, int h)
-{
-    int ww = 0;
-    int wh = 0;
-
-    if (video_fullscreen & 2)
-        return;
-
-    if ((w == cur_w) && (h == cur_h))
-        return;
-
-    SDL_LockMutex(sdl_mutex);
-
-    ww = w;
-    wh = h;
-
-    if (sdl_fs) {
-        //        sdl_stretch(&ww, &wh, &wx, &wy);
-        //        MoveWindow(hwndRender, wx, wy, ww, wh, TRUE);
-    }
-
-    cur_w = w;
-    cur_h = h;
-
-    cur_ww = ww;
-    cur_wh = wh;
-
-    SDL_SetWindowSize(sdl_win, cur_ww, cur_wh);
-    sdl_reinit_texture();
-
-    SDL_UnlockMutex(sdl_mutex);
-}
-
-void
-sdl_enable(int enable)
-{
-    if (sdl_flags == -1)
-        return;
-
-    SDL_LockMutex(sdl_mutex);
-    sdl_enabled = !!enable;
-
-    if (enable == 1) {
-        SDL_SetWindowSize(sdl_win, cur_ww, cur_wh);
-        sdl_reinit_texture();
-    }
-
-    SDL_UnlockMutex(sdl_mutex);
-}
-
-void
-sdl_reload(void)
-{
-    if (sdl_flags & RENDERER_HARDWARE) {
-        SDL_LockMutex(sdl_mutex);
-
-        SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, video_filter_method ? "1" : "0");
-        sdl_reinit_texture();
-
-        SDL_UnlockMutex(sdl_mutex);
-    }
-}
-
-static int mouse_inside = 0;
-enum sdl_main_status
-sdl_main()
-{
-    int       ret = SdlMainOk;
-    SDL_Rect  r_src;
-    SDL_Event event;
-
-    while (SDL_PollEvent(&event)) {
-        switch (event.type) {
-            case SDL_QUIT:
-                ret = SdlMainQuit;
-                break;
-            case SDL_MOUSEWHEEL:
-                {
-                    if (mouse_capture || video_fullscreen) {
-                        if (event.wheel.direction == SDL_MOUSEWHEEL_FLIPPED) {
-                            event.wheel.x *= -1;
-                            event.wheel.y *= -1;
-                        }
-                        mouse_set_z(event.wheel.y);
-                    }
-                    break;
-                }
-            case SDL_MOUSEMOTION:
-                {
-                    if (mouse_capture || video_fullscreen)
-                        mouse_scale(event.motion.xrel, event.motion.yrel);
-                    break;
-                }
-            case SDL_MOUSEBUTTONDOWN:
-            case SDL_MOUSEBUTTONUP:
-                {
-                    if (!dopause && (event.button.button == SDL_BUTTON_LEFT)
-                        && !(mouse_capture || video_fullscreen)
-                        && event.button.state == SDL_RELEASED
-                        && mouse_inside) {
-                        plat_mouse_capture(1);
-                        break;
-                    }
-                    if (mouse_get_buttons() < 3 && event.button.button == SDL_BUTTON_MIDDLE && !video_fullscreen) {
-                        plat_mouse_capture(0);
-                        break;
-                    }
-                    if (mouse_capture || video_fullscreen) {
-                        int buttonmask = 0;
-
-                        switch (event.button.button) {
-                            case SDL_BUTTON_LEFT:
-                                buttonmask = 1;
-                                break;
-                            case SDL_BUTTON_RIGHT:
-                                buttonmask = 2;
-                                break;
-                            case SDL_BUTTON_MIDDLE:
-                                buttonmask = 4;
-                                break;
-                        }
-                        if (event.button.state == SDL_PRESSED)
-                            mouse_set_buttons_ex(mouse_get_buttons_ex() | buttonmask);
-                        else
-                            mouse_set_buttons_ex(mouse_get_buttons_ex() & ~buttonmask);
-                    }
-                    break;
-                }
-            case SDL_RENDER_DEVICE_RESET:
-            case SDL_RENDER_TARGETS_RESET:
-                {
-                    sdl_reinit_texture();
-                    break;
-                }
-            case SDL_KEYDOWN:
-            case SDL_KEYUP:
-                {
-                    uint16_t xtkey = 0;
-                    switch (event.key.keysym.scancode) {
-                        default:
-                            xtkey = sdl_to_xt[event.key.keysym.scancode];
-                            break;
-                    }
-                    keyboard_input(event.key.state == SDL_PRESSED, xtkey);
-                }
-                break;
-            case SDL_WINDOWEVENT:
-                {
-                    switch (event.window.event) {
-                        case SDL_WINDOWEVENT_ENTER:
-                            mouse_inside = 1;
-                            break;
-                        case SDL_WINDOWEVENT_LEAVE:
-                            mouse_inside = 0;
-                            break;
-                    }
-                }
-        }
-    }
-
-    if (mouse_capture && keyboard_ismsexit()) {
-        plat_mouse_capture(0);
-    }
-    if (video_fullscreen && keyboard_isfsexit()) {
-        plat_setfullscreen(0);
-    }
-
-    return ret;
-}
-
-void
-sdl_mouse_capture(int on)
-{
-    SDL_SetRelativeMouseMode((SDL_bool) on);
-}
diff --git a/src/qt/qt_sdl.h b/src/qt/qt_sdl.h
deleted file mode 100644
index f9709c857..000000000
--- a/src/qt/qt_sdl.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Definitions for the libSDL2 rendering module.
- *
- *
- *
- * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
- *          Michael Drüing, <michael@drueing.de>
- *
- *          Copyright 2018-2019 Fred N. van Kempen.
- *          Copyright 2018-2019 Michael Drüing.
- *
- *          Redistribution and  use  in source  and binary forms, with
- *          or  without modification, are permitted  provided that the
- *          following conditions are met:
- *
- *         1. Redistributions of  source  code must retain the entire
- *            above notice, this list of conditions and the following
- *            disclaimer.
- *
- *         2. Redistributions in binary form must reproduce the above
- *            copyright  notice,  this list  of  conditions  and  the
- *            following disclaimer in  the documentation and/or other
- *            materials provided with the distribution.
- *
- *         3. Neither the  name of the copyright holder nor the names
- *            of  its  contributors may be used to endorse or promote
- *            products  derived from  this  software without specific
- *            prior written permission.
- *
- * THIS SOFTWARE  IS  PROVIDED BY THE  COPYRIGHT  HOLDERS AND CONTRIBUTORS
- * "AS IS" AND  ANY EXPRESS  OR  IMPLIED  WARRANTIES,  INCLUDING, BUT  NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE  ARE  DISCLAIMED. IN  NO  EVENT  SHALL THE COPYRIGHT
- * HOLDER OR  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL  DAMAGES  (INCLUDING,  BUT  NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE  GOODS OR SERVICES;  LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  AND ON  ANY
- * THEORY OF  LIABILITY, WHETHER IN  CONTRACT, STRICT  LIABILITY, OR  TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef WIN_SDL_H
-#define WIN_SDL_H
-
-extern void *sdl_win_handle;
-extern void  sdl_close(void);
-extern int   sdl_inits();
-extern int   sdl_inith();
-extern int   sdl_initho();
-extern int   sdl_pause(void);
-extern void  sdl_resize(int w, int h);
-extern void  sdl_enable(int enable);
-extern void  sdl_set_fs(int fs);
-extern void  sdl_reload(void);
-
-enum sdl_main_status {
-    SdlMainOk,
-    SdlMainQuit,
-};
-
-extern enum sdl_main_status sdl_main();
-
-extern void sdl_mouse_capture(int on);
-
-#endif /*WIN_SDL_H*/
diff --git a/src/qt/qt_settings.cpp b/src/qt/qt_settings.cpp
index c7cb99086..e15015403 100644
--- a/src/qt/qt_settings.cpp
+++ b/src/qt/qt_settings.cpp
@@ -50,6 +50,11 @@ public:
     SettingsModel(QObject *parent)
         : QAbstractListModel(parent)
     {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        fontHeight = QFontMetrics(qApp->font()).height();
+#else
+        fontHeight = QApplication::fontMetrics().height();
+#endif
     }
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
@@ -82,6 +87,7 @@ private:
         "other_removable_devices",
         "other_peripherals",
     };
+    int fontHeight;
 };
 
 QVariant
@@ -93,7 +99,9 @@ SettingsModel::data(const QModelIndex &index, int role) const
         case Qt::DisplayRole:
             return tr(pages.at(index.row()).toUtf8().data());
         case Qt::DecorationRole:
-            return QIcon(QString("%1/%2.ico").arg(ProgSettings::getIconSetPath(), page_icons[index.row()]));
+            return QIcon(QString(":/settings/qt/icons/%1.ico").arg(page_icons[index.row()]));
+        case Qt::SizeHintRole:
+            return QSize(-1, fontHeight * 2);
         default:
             return {};
     }
@@ -149,18 +157,41 @@ Settings::Settings(QWidget *parent)
             &SettingsSound::onCurrentMachineChanged);
     connect(machine, &SettingsMachine::currentMachineChanged, network,
             &SettingsNetwork::onCurrentMachineChanged);
+    connect(machine, &SettingsMachine::currentMachineChanged, ports,
+            &SettingsPorts::onCurrentMachineChanged);
     connect(machine, &SettingsMachine::currentMachineChanged, storageControllers,
             &SettingsStorageControllers::onCurrentMachineChanged);
     connect(machine, &SettingsMachine::currentMachineChanged, otherPeripherals,
             &SettingsOtherPeripherals::onCurrentMachineChanged);
+    connect(floppyCdrom, &SettingsFloppyCDROM::cdromChannelChanged, harddisks,
+            &SettingsHarddisks::reloadBusChannels);
+    connect(floppyCdrom, &SettingsFloppyCDROM::cdromChannelChanged, otherRemovable,
+            &SettingsOtherRemovable::reloadBusChannels_MO);
+    connect(floppyCdrom, &SettingsFloppyCDROM::cdromChannelChanged, otherRemovable,
+            &SettingsOtherRemovable::reloadBusChannels_RDisk);
+    connect(harddisks, &SettingsHarddisks::driveChannelChanged, floppyCdrom,
+            &SettingsFloppyCDROM::reloadBusChannels);
+    connect(harddisks, &SettingsHarddisks::driveChannelChanged, otherRemovable,
+            &SettingsOtherRemovable::reloadBusChannels_MO);
+    connect(harddisks, &SettingsHarddisks::driveChannelChanged, otherRemovable,
+            &SettingsOtherRemovable::reloadBusChannels_RDisk);
+    connect(otherRemovable, &SettingsOtherRemovable::moChannelChanged, harddisks,
+            &SettingsHarddisks::reloadBusChannels);
+    connect(otherRemovable, &SettingsOtherRemovable::moChannelChanged, floppyCdrom,
+            &SettingsFloppyCDROM::reloadBusChannels);
+    connect(otherRemovable, &SettingsOtherRemovable::moChannelChanged, otherRemovable,
+            &SettingsOtherRemovable::reloadBusChannels_RDisk);
+    connect(otherRemovable, &SettingsOtherRemovable::rdiskChannelChanged, harddisks,
+            &SettingsHarddisks::reloadBusChannels);
+    connect(otherRemovable, &SettingsOtherRemovable::rdiskChannelChanged, floppyCdrom,
+            &SettingsFloppyCDROM::reloadBusChannels);
+    connect(otherRemovable, &SettingsOtherRemovable::rdiskChannelChanged, otherRemovable,
+            &SettingsOtherRemovable::reloadBusChannels_MO);
 
     connect(ui->listView->selectionModel(), &QItemSelectionModel::currentChanged, this,
            [this](const QModelIndex &current, const QModelIndex &previous) {
                   ui->stackedWidget->setCurrentIndex(current.row()); });
 
-    ui->listView->setMinimumWidth(ui->listView->sizeHintForColumn(0) +
-                                  qApp->style()->pixelMetric(QStyle::PM_ScrollBarExtent));
-
     ui->listView->setCurrentIndex(model->index(0, 0));
 
     Settings::settings = this;
diff --git a/src/qt/qt_settings.ui b/src/qt/qt_settings.ui
index 7b4d28bec..da31b98c4 100644
--- a/src/qt/qt_settings.ui
+++ b/src/qt/qt_settings.ui
@@ -37,9 +37,30 @@
       </property>
       <item>
        <widget class="QListView" name="listView">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>200</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>200</width>
+          <height>16777215</height>
+         </size>
+        </property>
         <property name="viewMode">
          <enum>QListView::ListMode</enum>
         </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item>
diff --git a/src/qt/qt_settings_bus_tracking.cpp b/src/qt/qt_settings_bus_tracking.cpp
index 4fe112627..c811cc7c0 100644
--- a/src/qt/qt_settings_bus_tracking.cpp
+++ b/src/qt/qt_settings_bus_tracking.cpp
@@ -22,56 +22,96 @@
 #include <cstring>
 
 #include "86box/hdd.h"
+#include "86box/scsi.h"
+#include "86box/cdrom.h"
 #include "qt_settings_bus_tracking.hpp"
 
 SettingsBusTracking::SettingsBusTracking()
 {
+    mitsumi_tracking = false;
+
+    mke_tracking  = 0x0000000000000000ULL;
     mfm_tracking  = 0x0000000000000000ULL;
     esdi_tracking = 0x0000000000000000ULL;
     xta_tracking  = 0x0000000000000000ULL;
 
-    for (uint8_t i = 0; i < 8; i++) {
-        if (i < 4)
-            ide_tracking[i] = 0x0000000000000000ULL;
+    for (uint8_t i = 0; i < 4; i++)
+        ide_tracking[i] = 0x0000000000000000ULL;
 
+    for (uint8_t i = 0; i < 32; i++)
         scsi_tracking[i] = 0x0000000000000000ULL;
+}
+
+uint8_t
+SettingsBusTracking::next_free_mke_channel()
+{
+    uint64_t mask;
+    uint8_t  ret = CHANNEL_NONE;
+
+    for (uint8_t i = 0; i < 4; i++) {
+        mask    = 0xffULL << ((uint64_t) ((i << 3) & 0x3f));
+
+        if (!(mke_tracking & mask)) {
+            ret = (uint8_t) i;
+            break;
+        }
     }
+
+    return ret;
 }
 
 uint8_t
 SettingsBusTracking::next_free_mfm_channel()
 {
-    if ((mfm_tracking & 0xff00ULL) && !(mfm_tracking & 0x00ffULL))
-        return 1;
+    uint64_t mask;
+    uint8_t  ret = CHANNEL_NONE;
 
-    if (!(mfm_tracking & 0xff00ULL) && (mfm_tracking & 0x00ffULL))
-        return 0;
+    for (uint8_t i = 0; i < 2; i++) {
+        mask    = 0xffULL << ((uint64_t) ((i << 3) & 0x3f));
 
-    return CHANNEL_NONE;
+        if (!(mfm_tracking & mask)) {
+            ret = (uint8_t) i;
+            break;
+        }
+    }
+
+    return ret;
 }
 
 uint8_t
 SettingsBusTracking::next_free_esdi_channel()
 {
-    if ((esdi_tracking & 0xff00ULL) && !(esdi_tracking & 0x00ffULL))
-        return 1;
+    uint64_t mask;
+    uint8_t  ret = CHANNEL_NONE;
 
-    if (!(esdi_tracking & 0xff00ULL) && (esdi_tracking & 0x00ffULL))
-        return 0;
+    for (uint8_t i = 0; i < 2; i++) {
+        mask    = 0xffULL << ((uint64_t) ((i << 3) & 0x3f));
 
-    return CHANNEL_NONE;
+        if (!(esdi_tracking & mask)) {
+            ret = (uint8_t) i;
+            break;
+        }
+    }
+
+    return ret;
 }
 
 uint8_t
 SettingsBusTracking::next_free_xta_channel()
 {
-    if ((xta_tracking & 0xff00ULL) && !(xta_tracking & 0x00ffULL))
-        return 1;
+    uint64_t mask;
+    uint8_t  ret = CHANNEL_NONE;
 
-    if (!(xta_tracking & 0xff00ULL) && (xta_tracking & 0x00ffULL))
-        return 0;
+    for (uint8_t i = 0; i < 2; i++) {
+        mask    = 0xffULL << ((uint64_t) ((i << 3) & 0x3f));
 
-    return CHANNEL_NONE;
+        if (!(xta_tracking & mask)) {
+            ret = (uint8_t) i;
+            break;
+        }
+    }
+
+    return ret;
 }
 
 uint8_t
@@ -101,7 +141,7 @@ SettingsBusTracking::next_free_scsi_id()
     uint64_t mask;
     uint8_t  ret = CHANNEL_NONE;
 
-    for (uint8_t i = 0; i < 64; i++) {
+    for (uint8_t i = 0; i < (SCSI_BUS_MAX * SCSI_ID_MAX); i++) {
         element = ((i << 3) >> 6);
         mask    = 0xffULL << ((uint64_t) ((i << 3) & 0x3f));
 
@@ -187,7 +227,7 @@ SettingsBusTracking::scsi_bus_full()
     uint64_t mask;
     uint8_t  count = 0;
 
-    for (uint8_t i = 0; i < 64; i++) {
+    for (uint8_t i = 0; i < (SCSI_BUS_MAX * SCSI_ID_MAX); i++) {
         element = ((i << 3) >> 6);
         mask    = 0xffULL << ((uint64_t) ((i << 3) & 0x3f));
 
@@ -198,6 +238,75 @@ SettingsBusTracking::scsi_bus_full()
     return (count == 64);
 }
 
+QList<int> SettingsBusTracking::busChannelsInUse(const int bus) {
+
+    QList<int> channelsInUse;
+    int        element;
+    uint64_t   mask;
+    switch (bus) {
+        case CDROM_BUS_MKE:
+            for (uint8_t i = 0; i < 4; i++) {
+                mask = 0xffULL << ((uint64_t) ((i << 3) & 0x3f));
+                if (mke_tracking & mask)
+                    channelsInUse.append(i);
+            }
+            break;
+        case CDROM_BUS_MITSUMI:
+            if (mitsumi_tracking)
+                channelsInUse.append(0);
+            break;
+        case HDD_BUS_MFM:
+            for (uint8_t i = 0; i < 2; i++) {
+                mask = 0xffULL << ((uint64_t) ((i << 3) & 0x3f));
+                if (mfm_tracking & mask)
+                    channelsInUse.append(i);
+            }
+            break;
+        case HDD_BUS_ESDI:
+            for (uint8_t i = 0; i < 2; i++) {
+                mask = 0xffULL << ((uint64_t) ((i << 3) & 0x3f));
+                if (esdi_tracking & mask)
+                    channelsInUse.append(i);
+            }
+            break;
+        case HDD_BUS_XTA:
+            for (uint8_t i = 0; i < 2; i++) {
+                mask = 0xffULL << ((uint64_t) ((i << 3) & 0x3f));
+                if (xta_tracking & mask)
+                    channelsInUse.append(i);
+            }
+            break;
+        case HDD_BUS_IDE:
+            for (uint8_t i = 0; i < 32; i++) {
+                element = ((i << 3) >> 6);
+                mask = ((uint64_t) 0xffULL) << ((uint64_t) ((i << 3) & 0x3f));
+                if (ide_tracking[element] & mask)
+                    channelsInUse.append(i);
+            }
+            break;
+        case HDD_BUS_ATAPI:
+            for (uint8_t i = 0; i < 32; i++) {
+                element = ((i << 3) >> 6);
+                mask = ((uint64_t) 0xffULL) << ((uint64_t) ((i << 3) & 0x3f));
+                if (ide_tracking[element] & mask)
+                    channelsInUse.append(i);
+            }
+            break;
+        case HDD_BUS_SCSI:
+            for (uint8_t i = 0; i < (SCSI_BUS_MAX * SCSI_ID_MAX); i++) {
+                element = ((i << 3) >> 6);
+                mask    = 0xffULL << ((uint64_t) ((i << 3) & 0x3f));
+                if (scsi_tracking[element] & mask)
+                    channelsInUse.append(i);
+            }
+            break;
+        default:
+            break;
+    }
+
+    return channelsInUse;
+}
+
 void
 SettingsBusTracking::device_track(int set, uint8_t dev_type, int bus, int channel)
 {
@@ -205,6 +314,17 @@ SettingsBusTracking::device_track(int set, uint8_t dev_type, int bus, int channe
     uint64_t mask;
 
     switch (bus) {
+        case CDROM_BUS_MKE:
+            mask = ((uint64_t) dev_type) << ((uint64_t) ((channel << 3) & 0x3f));
+
+            if (set)
+                mke_tracking |= mask;
+            else
+                mke_tracking &= ~mask;
+            break;
+        case CDROM_BUS_MITSUMI:
+            mitsumi_tracking = set;
+            break;
         case HDD_BUS_MFM:
             mask = ((uint64_t) dev_type) << ((uint64_t) ((channel << 3) & 0x3f));
 
diff --git a/src/qt/qt_settings_bus_tracking.hpp b/src/qt/qt_settings_bus_tracking.hpp
index 3ec61dfb7..d17ed090a 100644
--- a/src/qt/qt_settings_bus_tracking.hpp
+++ b/src/qt/qt_settings_bus_tracking.hpp
@@ -8,7 +8,7 @@
 
 #define DEV_HDD      0x01
 #define DEV_CDROM    0x02
-#define DEV_ZIP      0x04
+#define DEV_RDISK    0x04
 #define DEV_MO       0x08
 
 #define BUS_MFM      0
@@ -28,13 +28,17 @@ public:
     explicit SettingsBusTracking();
     ~SettingsBusTracking() = default;
 
+    QList<int> busChannelsInUse(int bus);
+
     /* These return 0xff is none is free. */
+    uint8_t next_free_mke_channel();
     uint8_t next_free_mfm_channel();
     uint8_t next_free_esdi_channel();
     uint8_t next_free_xta_channel();
     uint8_t next_free_ide_channel();
     uint8_t next_free_scsi_id();
 
+    int mke_bus_full();
     int mfm_bus_full();
     int esdi_bus_full();
     int xta_bus_full();
@@ -42,11 +46,13 @@ public:
     int scsi_bus_full();
 
     /* Set: 0 = Clear the device from the tracking, 1 = Set the device on the tracking.
-       Device type: 1 = Hard Disk, 2 = CD-ROM, 4 = ZIP, 8 = Magneto-Optical.
+       Device type: 1 = Hard Disk, 2 = CD-ROM, 4 = Removable disk, 8 = Magneto-Optical.
        Bus: 0 = MFM, 1 = ESDI, 2 = XTA, 3 = IDE, 4 = SCSI. */
     void device_track(int set, uint8_t dev_type, int bus, int channel);
 
 private:
+    /* 1 channel, 2 devices per channel, 8 bits per device = 16 bits. */
+    uint64_t mke_tracking { 0 };
     /* 1 channel, 2 devices per channel, 8 bits per device = 16 bits. */
     uint64_t mfm_tracking { 0 };
     /* 1 channel, 2 devices per channel, 8 bits per device = 16 bits. */
@@ -55,8 +61,12 @@ private:
     uint64_t xta_tracking { 0 };
     /* 16 channels (prepatation for that weird IDE card), 2 devices per channel, 8 bits per device = 256 bits. */
     uint64_t ide_tracking[4] { 0, 0, 0, 0 };
-    /* 4 buses, 16 devices per bus, 8 bits per device (future-proofing) = 512 bits. */
-    uint64_t scsi_tracking[8] { 0, 0, 0, 0, 0, 0, 0, 0 };
+    /* 9 buses (rounded upwards to 16for future-proofing), 16 devices per bus,
+       8 bits per device (future-proofing) = 2048 bits. */
+    uint64_t scsi_tracking[32] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                                 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+
+    bool mitsumi_tracking;
 };
 
 #endif // QT_SETTINGS_BUS_TRACKING_HPP
diff --git a/src/qt/qt_settingsdisplay.cpp b/src/qt/qt_settingsdisplay.cpp
index fcb70f8c5..ed9ba220c 100644
--- a/src/qt/qt_settingsdisplay.cpp
+++ b/src/qt/qt_settingsdisplay.cpp
@@ -17,14 +17,23 @@
 #include "qt_settingsdisplay.hpp"
 #include "ui_qt_settingsdisplay.h"
 
+#include "qt_util.hpp"
+
 #include <QDebug>
+#include <QFileDialog>
+#include <QStringBuilder>
+
+#include <cstdint>
 
 extern "C" {
 #include <86box/86box.h>
 #include <86box/device.h>
 #include <86box/machine.h>
 #include <86box/video.h>
+#include <86box/vid_8514a_device.h>
 #include <86box/vid_xga_device.h>
+#include <86box/vid_ps55da2.h>
+#include <86box/vid_ddc.h>
 }
 
 #include "qt_deviceconfig.hpp"
@@ -36,8 +45,11 @@ SettingsDisplay::SettingsDisplay(QWidget *parent)
 {
     ui->setupUi(this);
 
-    videoCard[0] = gfxcard[0];
-    videoCard[1] = gfxcard[1];
+    for (uint8_t i = 0; i < GFXCARD_MAX; i ++)
+        videoCard[i] = gfxcard[i];
+
+    ui->lineEdit->setFilter(tr("EDID") % util::DlgFilter({ "bin", "dat", "edid", "txt" }) % tr("All files") % util::DlgFilter({ "*" }, true));
+
     onCurrentMachineChanged(machine);
 }
 
@@ -49,18 +61,32 @@ SettingsDisplay::~SettingsDisplay()
 void
 SettingsDisplay::save()
 {
-    gfxcard[0]                 = ui->comboBoxVideo->currentData().toInt();
-    gfxcard[1]                 = ui->comboBoxVideoSecondary->currentData().toInt();
+    // TODO
+#if 0
+    for (uint8_t i = 0; i < GFXCARD_MAX; ++i) {
+        QComboBox *cbox = findChild<QComboBox *>(QString("comboBoxVideo%1").arg(i + 1));
+        gfxcard[i]      = cbox->currentData().toInt();
+    }
+#else
+    gfxcard[0] = ui->comboBoxVideo->currentData().toInt();
+    for (uint8_t i = 1; i < GFXCARD_MAX; i ++)
+        gfxcard[i] = ui->comboBoxVideoSecondary->currentData().toInt();
+#endif
+
     voodoo_enabled             = ui->checkBoxVoodoo->isChecked() ? 1 : 0;
     ibm8514_standalone_enabled = ui->checkBox8514->isChecked() ? 1 : 0;
     xga_standalone_enabled     = ui->checkBoxXga->isChecked() ? 1 : 0;
+    da2_standalone_enabled     = ui->checkBoxDa2->isChecked() ? 1 : 0;
+    monitor_edid               = ui->radioButtonCustom->isChecked() ? 1 : 0;
+
+    strncpy(monitor_edid_path, ui->lineEdit->fileName().toUtf8().data(), sizeof(monitor_edid_path) - 1);
 }
 
 void
 SettingsDisplay::onCurrentMachineChanged(int machineId)
 {
     // win_settings_video_proc, WM_INITDIALOG
-    this->machineId = machineId;
+    this->machineId   = machineId;
     auto curVideoCard = videoCard[0];
 
     auto *model      = ui->comboBoxVideo->model();
@@ -92,82 +118,108 @@ SettingsDisplay::onCurrentMachineChanged(int machineId)
     }
     model->removeRows(0, removeRows);
 
+    // TODO
     if (machine_has_flags(machineId, MACHINE_VIDEO_ONLY) > 0) {
         ui->comboBoxVideo->setEnabled(false);
         ui->comboBoxVideoSecondary->setEnabled(false);
-        ui->pushButtonConfigureSecondary->setEnabled(false);
+        ui->pushButtonConfigureVideoSecondary->setEnabled(false);
         selectedRow = 1;
     } else {
         ui->comboBoxVideo->setEnabled(true);
         ui->comboBoxVideoSecondary->setEnabled(true);
-        ui->pushButtonConfigureSecondary->setEnabled(true);
+        ui->pushButtonConfigureVideoSecondary->setEnabled(true);
     }
     ui->comboBoxVideo->setCurrentIndex(selectedRow);
-    if (gfxcard[1] == 0)
-        ui->pushButtonConfigureSecondary->setEnabled(false);
+    // TODO
+    for (uint8_t i = 1; i < GFXCARD_MAX; i ++)
+        if (gfxcard[i] == 0)
+            ui->pushButtonConfigureVideoSecondary->setEnabled(false);
+
+    ui->radioButtonDefault->setChecked(monitor_edid == 0);
+    ui->radioButtonCustom->setChecked(monitor_edid == 1);
+    ui->lineEdit->setFileName(monitor_edid_path);
+    ui->lineEdit->setEnabled(monitor_edid == 1);
 }
 
 void
-SettingsDisplay::on_pushButtonConfigure_clicked()
+SettingsDisplay::on_pushButtonConfigureVideo_clicked()
 {
     int videoCard = ui->comboBoxVideo->currentData().toInt();
     auto *device = video_card_getdevice(videoCard);
     if (videoCard == VID_INTERNAL)
         device = machine_get_vid_device(machineId);
-    DeviceConfig::ConfigureDevice(device, 0, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(device);
 }
 
 void
 SettingsDisplay::on_pushButtonConfigureVoodoo_clicked()
 {
-    DeviceConfig::ConfigureDevice(&voodoo_device, 0, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(&voodoo_device);
+}
+
+void
+SettingsDisplay::on_pushButtonConfigure8514_clicked()
+{
+    if (machine_has_bus(machineId, MACHINE_BUS_MCA) > 0) {
+        DeviceConfig::ConfigureDevice(&ibm8514_mca_device);
+    } else {
+        DeviceConfig::ConfigureDevice(&gen8514_isa_device);
+    }
 }
 
 void
 SettingsDisplay::on_pushButtonConfigureXga_clicked()
 {
-    if (machine_has_bus(machineId, MACHINE_BUS_MCA) > 0) {
-        DeviceConfig::ConfigureDevice(&xga_device, 0, qobject_cast<Settings *>(Settings::settings));
-    } else {
-        DeviceConfig::ConfigureDevice(&xga_isa_device, 0, qobject_cast<Settings *>(Settings::settings));
-    }
+    if (machine_has_bus(machineId, MACHINE_BUS_MCA) > 0)
+        DeviceConfig::ConfigureDevice(&xga_device);
+}
+
+void
+SettingsDisplay::on_pushButtonConfigureDa2_clicked()
+{
+    DeviceConfig::ConfigureDevice(&ps55da2_device);
 }
 
 void
 SettingsDisplay::on_comboBoxVideo_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
+
+    static QRegularExpression voodooRegex("3dfx|voodoo|banshee|raven", QRegularExpression::CaseInsensitiveOption);
     auto curVideoCard_2 = videoCard[1];
     videoCard[0] = ui->comboBoxVideo->currentData().toInt();
     if (videoCard[0] == VID_INTERNAL)
-        ui->pushButtonConfigure->setEnabled(machine_has_flags(machineId, MACHINE_VIDEO) &&
-                                            device_has_config(machine_get_vid_device(machineId)));
+        ui->pushButtonConfigureVideo->setEnabled(machine_has_flags(machineId, MACHINE_VIDEO) &&
+                                                 device_has_config(machine_get_vid_device(machineId)));
     else
-        ui->pushButtonConfigure->setEnabled(video_card_has_config(videoCard[0]) > 0);
+        ui->pushButtonConfigureVideo->setEnabled(video_card_has_config(videoCard[0]) > 0);
     bool machineHasPci = machine_has_bus(machineId, MACHINE_BUS_PCI) > 0;
-    ui->checkBoxVoodoo->setEnabled(machineHasPci);
-    if (machineHasPci) {
-        ui->checkBoxVoodoo->setChecked(voodoo_enabled);
-    }
     ui->pushButtonConfigureVoodoo->setEnabled(machineHasPci && ui->checkBoxVoodoo->isChecked());
 
     bool machineHasIsa16 = machine_has_bus(machineId, MACHINE_BUS_ISA16) > 0;
     bool machineHasMca   = machine_has_bus(machineId, MACHINE_BUS_MCA) > 0;
 
     bool videoCardHas8514 = ((videoCard[0] == VID_INTERNAL) ? machine_has_flags(machineId, MACHINE_VIDEO_8514A) : (video_card_get_flags(videoCard[0]) == VIDEO_FLAG_TYPE_8514));
-    bool videoCardHasXga  = ((videoCard[0] == VID_INTERNAL) ? machine_has_flags(machineId, MACHINE_VIDEO_XGA) : (video_card_get_flags(videoCard[0]) == VIDEO_FLAG_TYPE_XGA));
+    bool videoCardHasXga  = ((videoCard[0] == VID_INTERNAL) ? 0 : (video_card_get_flags(videoCard[0]) == VIDEO_FLAG_TYPE_XGA));
 
-    ui->checkBox8514->setEnabled((machineHasIsa16 || machineHasMca) && !videoCardHas8514);
-    if (machineHasIsa16 || machineHasMca)
-        ui->checkBox8514->setChecked(ibm8514_standalone_enabled && !videoCardHas8514);
+    bool machineSupports8514 = ((machineHasIsa16 || machineHasMca) && !videoCardHas8514);
+    bool machineSupportsXga  = ((machineHasMca && device_available(&xga_device)) && !videoCardHasXga);
+    bool machineSupportsDa2 = machineHasMca && device_available(&ps55da2_device);
 
-    ui->checkBoxXga->setEnabled((machineHasIsa16 || machineHasMca) && !videoCardHasXga);
-    if (machineHasIsa16 || machineHasMca)
-        ui->checkBoxXga->setChecked(xga_standalone_enabled && !videoCardHasXga);
+    ui->checkBox8514->setEnabled(machineSupports8514);
+    ui->checkBox8514->setChecked(ibm8514_standalone_enabled && machineSupports8514);
 
-    ui->pushButtonConfigureXga->setEnabled((machineHasIsa16 || machineHasMca) && ui->checkBoxXga->isChecked() && !videoCardHasXga);
+    ui->pushButtonConfigure8514->setEnabled(ui->checkBox8514->isEnabled() && ui->checkBox8514->isChecked());
+
+    ui->checkBoxXga->setEnabled(machineSupportsXga);
+    ui->checkBoxXga->setChecked(xga_standalone_enabled && machineSupportsXga);
+
+    ui->checkBoxDa2->setEnabled(machineSupportsDa2);
+    ui->checkBoxDa2->setChecked(da2_standalone_enabled && machineSupportsDa2);
+
+    ui->pushButtonConfigureXga->setEnabled(ui->checkBoxXga->isEnabled() && ui->checkBoxXga->isChecked());
+    ui->pushButtonConfigureDa2->setEnabled(ui->checkBoxDa2->isEnabled() && ui->checkBoxDa2->isChecked());
 
     int c = 2;
 
@@ -191,9 +243,9 @@ SettingsDisplay::on_comboBoxVideo_currentIndexChanged(int index)
         int secondaryFlags = video_card_get_flags(c);
         if (video_card_available(c)
             && device_is_valid(video_dev, machineId)
-            && !((secondaryFlags == primaryFlags) && (secondaryFlags != VIDEO_FLAG_TYPE_SPECIAL))
-            && !(((primaryFlags == VIDEO_FLAG_TYPE_8514) || (primaryFlags == VIDEO_FLAG_TYPE_XGA)) && (secondaryFlags != VIDEO_FLAG_TYPE_MDA) && (secondaryFlags != VIDEO_FLAG_TYPE_SPECIAL))
-            && !((primaryFlags != VIDEO_FLAG_TYPE_MDA) && (primaryFlags != VIDEO_FLAG_TYPE_SPECIAL) && ((secondaryFlags == VIDEO_FLAG_TYPE_8514) || (secondaryFlags == VIDEO_FLAG_TYPE_XGA)))) {
+            && !((secondaryFlags == primaryFlags) && (secondaryFlags != VIDEO_FLAG_TYPE_SECONDARY))
+            && !(((primaryFlags == VIDEO_FLAG_TYPE_8514) || (primaryFlags == VIDEO_FLAG_TYPE_XGA)) && (secondaryFlags != VIDEO_FLAG_TYPE_MDA) && (secondaryFlags != VIDEO_FLAG_TYPE_SECONDARY))
+            && !((primaryFlags != VIDEO_FLAG_TYPE_MDA) && (primaryFlags != VIDEO_FLAG_TYPE_SECONDARY) && ((secondaryFlags == VIDEO_FLAG_TYPE_8514) || (secondaryFlags == VIDEO_FLAG_TYPE_XGA)))) {
             ui->comboBoxVideoSecondary->addItem(name, c);
             if (c == curVideoCard_2)
                 ui->comboBoxVideoSecondary->setCurrentIndex(ui->comboBoxVideoSecondary->count() - 1);
@@ -204,7 +256,29 @@ SettingsDisplay::on_comboBoxVideo_currentIndexChanged(int index)
 
     if ((videoCard[1] == 0) || (machine_has_flags(machineId, MACHINE_VIDEO_ONLY) > 0)) {
         ui->comboBoxVideoSecondary->setCurrentIndex(0);
-        ui->pushButtonConfigureSecondary->setEnabled(false);
+        ui->pushButtonConfigureVideoSecondary->setEnabled(false);
+    }
+
+    // Is the currently selected video card a voodoo?
+    if (ui->comboBoxVideo->currentText().contains(voodooRegex)) {
+        // Get the name of the video card currently in use
+        const device_t *video_dev        = video_card_getdevice(gfxcard[0]);
+        const QString   currentVideoName = DeviceConfig::DeviceName(video_dev, video_get_internal_name(gfxcard[0]), 1);
+        // Is it a voodoo?
+        const bool currentCardIsVoodoo = currentVideoName.contains(voodooRegex);
+        // Don't uncheck if
+        // * Current card is voodoo
+        // * Add-on voodoo was manually overridden in config
+        if (ui->checkBoxVoodoo->isChecked() && !currentCardIsVoodoo) {
+            // Otherwise, uncheck the add-on voodoo when a main voodoo is selected
+            ui->checkBoxVoodoo->setCheckState(Qt::Unchecked);
+        }
+        ui->checkBoxVoodoo->setDisabled(true);
+    } else {
+        ui->checkBoxVoodoo->setEnabled(machineHasPci);
+        if (machineHasPci) {
+            ui->checkBoxVoodoo->setChecked(voodoo_enabled);
+        }
     }
 }
 
@@ -214,6 +288,12 @@ SettingsDisplay::on_checkBoxVoodoo_stateChanged(int state)
     ui->pushButtonConfigureVoodoo->setEnabled(state == Qt::Checked);
 }
 
+void
+SettingsDisplay::on_checkBox8514_stateChanged(int state)
+{
+    ui->pushButtonConfigure8514->setEnabled(state == Qt::Checked);
+}
+
 void
 SettingsDisplay::on_checkBoxXga_stateChanged(int state)
 {
@@ -221,19 +301,54 @@ SettingsDisplay::on_checkBoxXga_stateChanged(int state)
 }
 
 void
-SettingsDisplay::on_comboBoxVideoSecondary_currentIndexChanged(int index)
+SettingsDisplay::on_checkBoxDa2_stateChanged(int state)
 {
-    if (index < 0) {
-        ui->pushButtonConfigureSecondary->setEnabled(false);
-        return;
-    }
-    videoCard[1] = ui->comboBoxVideoSecondary->currentData().toInt();
-    ui->pushButtonConfigureSecondary->setEnabled(index != 0 && video_card_has_config(videoCard[1]) > 0);
+    ui->pushButtonConfigureDa2->setEnabled(state == Qt::Checked);
 }
 
 void
-SettingsDisplay::on_pushButtonConfigureSecondary_clicked()
+SettingsDisplay::on_comboBoxVideoSecondary_currentIndexChanged(int index)
+{
+    if (index < 0) {
+        ui->pushButtonConfigureVideoSecondary->setEnabled(false);
+        return;
+    }
+    videoCard[1] = ui->comboBoxVideoSecondary->currentData().toInt();
+    ui->pushButtonConfigureVideoSecondary->setEnabled(index != 0 && video_card_has_config(videoCard[1]) > 0);
+}
+
+void
+SettingsDisplay::on_pushButtonConfigureVideoSecondary_clicked()
 {
     auto *device = video_card_getdevice(ui->comboBoxVideoSecondary->currentData().toInt());
-    DeviceConfig::ConfigureDevice(device, 0, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(device);
+}
+
+void SettingsDisplay::on_radioButtonDefault_clicked()
+{
+    ui->radioButtonDefault->setChecked(true);
+    ui->radioButtonCustom->setChecked(false);
+    ui->lineEdit->setEnabled(false);
+}
+
+
+void SettingsDisplay::on_radioButtonCustom_clicked()
+{
+    ui->radioButtonDefault->setChecked(false);
+    ui->radioButtonCustom->setChecked(true);
+    ui->lineEdit->setEnabled(true);
+}
+
+void SettingsDisplay::on_pushButtonExportDefault_clicked()
+{
+    auto str = QFileDialog::getSaveFileName(this, tr("Export EDID"));
+    if (!str.isEmpty()) {
+        QFile file(str);
+        if (file.open(QFile::WriteOnly)) {
+            uint8_t *bytes = nullptr;
+            auto size = ddc_create_default_edid(&bytes);
+            file.write((char*)bytes, size);
+            file.close();
+        }
+    }
 }
diff --git a/src/qt/qt_settingsdisplay.hpp b/src/qt/qt_settingsdisplay.hpp
index 8331bbb5b..8854b0373 100644
--- a/src/qt/qt_settingsdisplay.hpp
+++ b/src/qt/qt_settingsdisplay.hpp
@@ -3,6 +3,8 @@
 
 #include <QWidget>
 
+#define VIDEOCARD_MAX 2
+
 namespace Ui {
 class SettingsDisplay;
 }
@@ -20,23 +22,34 @@ public slots:
     void onCurrentMachineChanged(int machineId);
 
 private slots:
-    void on_pushButtonConfigureSecondary_clicked();
-
-private slots:
-    void on_comboBoxVideoSecondary_currentIndexChanged(int index);
-
-private slots:
-    void on_checkBoxVoodoo_stateChanged(int state);
-    void on_checkBoxXga_stateChanged(int state);
     void on_comboBoxVideo_currentIndexChanged(int index);
+    void on_pushButtonConfigureVideo_clicked();
+
+    void on_comboBoxVideoSecondary_currentIndexChanged(int index);
+    void on_pushButtonConfigureVideoSecondary_clicked();
+
+    void on_checkBoxVoodoo_stateChanged(int state);
     void on_pushButtonConfigureVoodoo_clicked();
+
+    void on_checkBox8514_stateChanged(int state);
+    void on_pushButtonConfigure8514_clicked();
+
+    void on_checkBoxXga_stateChanged(int state);
     void on_pushButtonConfigureXga_clicked();
-    void on_pushButtonConfigure_clicked();
+
+    void on_checkBoxDa2_stateChanged(int state);
+    void on_pushButtonConfigureDa2_clicked();
+
+    void on_radioButtonDefault_clicked();
+
+    void on_radioButtonCustom_clicked();
+
+    void on_pushButtonExportDefault_clicked();
 
 private:
     Ui::SettingsDisplay *ui;
     int                  machineId    = 0;
-    int                  videoCard[2] = { 0, 0 };
+    int                  videoCard[VIDEOCARD_MAX] = { 0, 0 };
 };
 
 #endif // QT_SETTINGSDISPLAY_HPP
diff --git a/src/qt/qt_settingsdisplay.ui b/src/qt/qt_settingsdisplay.ui
index 5dd76287f..6e4c14152 100644
--- a/src/qt/qt_settingsdisplay.ui
+++ b/src/qt/qt_settingsdisplay.ui
@@ -7,13 +7,13 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>300</height>
+    <height>466</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" columnstretch="2,1,1">
+  <layout class="QGridLayout" name="gridLayout" columnstretch="2,0,0">
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -26,61 +26,29 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item row="1" column="2">
-    <widget class="QPushButton" name="pushButtonConfigure">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+   <item row="4" column="0" colspan="2">
+    <widget class="QCheckBox" name="checkBoxVoodoo">
+     <property name="text">
+      <string>Voodoo 1 or 2 Graphics</string>
      </property>
+    </widget>
+   </item>
+   <item row="7" column="2">
+    <widget class="QPushButton" name="pushButtonConfigureDa2">
      <property name="text">
       <string>Configure</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="0" colspan="2">
-    <widget class="QCheckBox" name="checkBoxXga">
+   <item row="5" column="0" colspan="2">
+    <widget class="QCheckBox" name="checkBox8514">
      <property name="text">
-      <string>XGA Graphics</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Video:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="2">
-    <widget class="QComboBox" name="comboBoxVideo">
-     <property name="maxVisibleItems">
-      <number>30</number>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="2">
-    <widget class="QPushButton" name="pushButtonConfigureVoodoo">
-     <property name="text">
-      <string>Configure</string>
+      <string>IBM 8514/A Graphics</string>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
-    <widget class="QLabel" name="label_2">
+    <widget class="QLabel" name="labelVideoSecondary">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
        <horstretch>0</horstretch>
@@ -92,17 +60,10 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="2">
-    <widget class="QCheckBox" name="checkBox8514">
+   <item row="5" column="2">
+    <widget class="QPushButton" name="pushButtonConfigure8514">
      <property name="text">
-      <string>IBM 8514/A Graphics</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0" colspan="2">
-    <widget class="QCheckBox" name="checkBoxVoodoo">
-     <property name="text">
-      <string>Voodoo Graphics</string>
+      <string>Configure</string>
      </property>
     </widget>
    </item>
@@ -113,30 +74,86 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="2">
-    <widget class="QPushButton" name="pushButtonConfigureSecondary">
-     <property name="text">
-      <string>Configure</string>
+   <item row="8" column="0" colspan="3">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
      </property>
+     <property name="title">
+      <string>Monitor EDID</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QRadioButton" name="radioButtonDefault">
+          <property name="text">
+           <string>Default</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="pushButtonExportDefault">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Export...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <property name="sizeConstraint">
+         <enum>QLayout::SizeConstraint::SetNoConstraint</enum>
+        </property>
+        <item>
+         <widget class="QRadioButton" name="radioButtonCustom">
+          <property name="text">
+           <string>Custom...</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="FileField" name="lineEdit" native="true">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
     </widget>
    </item>
    <item row="3" column="0" colspan="2">
     <widget class="QComboBox" name="comboBoxVideoSecondary">
-     <property name="maxVisibleItems">
-      <number>30</number>
-     </property>
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="maxVisibleItems">
+      <number>30</number>
+     </property>
     </widget>
    </item>
-   <item row="7" column="0" colspan="3">
+   <item row="10" column="0" colspan="3">
     <spacer name="verticalSpacer">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Orientation::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
@@ -146,8 +163,93 @@
      </property>
     </spacer>
    </item>
+   <item row="4" column="2">
+    <widget class="QPushButton" name="pushButtonConfigureVoodoo">
+     <property name="text">
+      <string>Configure</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QPushButton" name="pushButtonConfigureVideo">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Configure</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="labelVideo">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Video:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="2">
+    <widget class="QPushButton" name="pushButtonConfigureVideoSecondary">
+     <property name="text">
+      <string>Configure</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QComboBox" name="comboBoxVideo">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maxVisibleItems">
+      <number>30</number>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0" colspan="2">
+    <widget class="QCheckBox" name="checkBoxXga">
+     <property name="text">
+      <string>XGA Graphics</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="0">
+    <widget class="QCheckBox" name="checkBoxDa2">
+     <property name="text">
+      <string>IBM PS/55 Display Adapter Graphics</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="0" colspan="3">
+    <widget class="QWidget" name="widget" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>FileField</class>
+   <extends>QWidget</extends>
+   <header>qt_filefield.hpp</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/qt/qt_settingsfloppycdrom.cpp b/src/qt/qt_settingsfloppycdrom.cpp
index 988f9e856..f597aebe6 100644
--- a/src/qt/qt_settingsfloppycdrom.cpp
+++ b/src/qt/qt_settingsfloppycdrom.cpp
@@ -46,11 +46,11 @@ setFloppyType(QAbstractItemModel *model, const QModelIndex &idx, int type)
 {
     QIcon icon;
     if (type == 0)
-        icon = ProgSettings::loadIcon("/floppy_disabled.ico");
+        icon = QIcon(":/settings/qt/icons/floppy_disabled.ico");
     else if (type >= 1 && type <= 6)
-        icon = ProgSettings::loadIcon("/floppy_525.ico");
+        icon = QIcon(":/settings/qt/icons/floppy_525.ico");
     else
-        icon = ProgSettings::loadIcon("/floppy_35.ico");
+        icon = QIcon(":/settings/qt/icons/floppy_35.ico");
 
     model->setData(idx, QObject::tr(fdd_getname(type)));
     model->setData(idx, type, Qt::UserRole);
@@ -64,12 +64,13 @@ setCDROMBus(QAbstractItemModel *model, const QModelIndex &idx, uint8_t bus, uint
 
     switch (bus) {
         case CDROM_BUS_DISABLED:
-            icon = ProgSettings::loadIcon("/cdrom_disabled.ico");
+            icon = QIcon(":/settings/qt/icons/cdrom_disabled.ico");
             break;
         case CDROM_BUS_ATAPI:
         case CDROM_BUS_SCSI:
         case CDROM_BUS_MITSUMI:
-            icon = ProgSettings::loadIcon("/cdrom.ico");
+        case CDROM_BUS_MKE:
+            icon = QIcon(":/settings/qt/icons/cdrom.ico");
             break;
     }
 
@@ -90,6 +91,14 @@ setCDROMSpeed(QAbstractItemModel *model, const QModelIndex &idx, uint8_t speed)
     model->setData(i, speed, Qt::UserRole);
 }
 
+static QString
+CDROMName(int type)
+{
+    char temp[512];
+    cdrom_get_name(type, temp);
+    return QObject::tr((const char *) temp);
+}
+
 static void
 setCDROMType(QAbstractItemModel *model, const QModelIndex &idx, int type)
 {
@@ -97,7 +106,7 @@ setCDROMType(QAbstractItemModel *model, const QModelIndex &idx, int type)
     if (idx.siblingAtColumn(0).data(Qt::UserRole).toUInt() == CDROM_BUS_DISABLED)
         model->setData(i, QCoreApplication::translate("", "None"));
     else if (idx.siblingAtColumn(0).data(Qt::UserRole).toUInt() != CDROM_BUS_MITSUMI)
-        model->setData(i, QObject::tr(cdrom_getname(type)));
+        model->setData(i, CDROMName(type));
     model->setData(i, type, Qt::UserRole);
 }
 
@@ -141,7 +150,7 @@ SettingsFloppyCDROM::SettingsFloppyCDROM(QWidget *parent)
             this, &SettingsFloppyCDROM::onFloppyRowChanged);
     ui->tableViewFloppy->setCurrentIndex(model->index(0, 0));
 
-    Harddrives::populateRemovableBuses(ui->comboBoxBus->model());
+    Harddrives::populateCDROMBuses(ui->comboBoxBus->model());
     model = ui->comboBoxSpeed->model();
     for (int i = 0; i < 72; i++)
         Models::AddEntry(model, QString("%1x").arg(i + 1), i + 1);
@@ -156,13 +165,18 @@ SettingsFloppyCDROM::SettingsFloppyCDROM(QWidget *parent)
         auto idx = model->index(i, 0);
         int type = cdrom_get_type(i);
         setCDROMBus(model, idx, cdrom[i].bus_type, cdrom[i].res);
-        setCDROMSpeed(model, idx.siblingAtColumn(1), cdrom[i].speed);
         setCDROMType(model, idx.siblingAtColumn(2), type);
-        if (cdrom[i].bus_type == CDROM_BUS_ATAPI)
+        int speed = cdrom_get_speed(type);
+        if (speed == -1)
+            setCDROMSpeed(model, idx.siblingAtColumn(1), cdrom[i].speed);
+        else
+            setCDROMSpeed(model, idx.siblingAtColumn(1), speed);
+        if (cdrom[i].bus_type == CDROM_BUS_MKE)
+            Harddrives::busTrackClass->device_track(1, DEV_CDROM, cdrom[i].bus_type, cdrom[i].mke_channel);
+        else if (cdrom[i].bus_type == CDROM_BUS_ATAPI)
             Harddrives::busTrackClass->device_track(1, DEV_CDROM, cdrom[i].bus_type, cdrom[i].ide_channel);
         else if (cdrom[i].bus_type == CDROM_BUS_SCSI)
-            Harddrives::busTrackClass->device_track(1, DEV_CDROM, cdrom[i].bus_type,
-                                                    cdrom[i].scsi_device_id);
+            Harddrives::busTrackClass->device_track(1, DEV_CDROM, cdrom[i].bus_type, cdrom[i].scsi_device_id);
         else if (cdrom[i].bus_type == CDROM_BUS_MITSUMI)
             Harddrives::busTrackClass->device_track(1, DEV_CDROM, cdrom[i].bus_type, 0);
     }
@@ -183,12 +197,13 @@ SettingsFloppyCDROM::SettingsFloppyCDROM(QWidget *parent)
     int selectedTypeRow      = 0;
     int eligibleRows         = 0;
     while (cdrom_drive_types[j].bus_type != BUS_TYPE_NONE) {
-        if (((bus_type == CDROM_BUS_ATAPI) || (bus_type == CDROM_BUS_SCSI)) &&
+        if (((bus_type == CDROM_BUS_MKE) || (bus_type == CDROM_BUS_ATAPI) ||
+             (bus_type == CDROM_BUS_SCSI)) &&
             ((cdrom_drive_types[j].bus_type == bus_type) ||
-             (cdrom_drive_types[j].bus_type == BUS_TYPE_BOTH))) {
-            QString name = tr(cdrom_getname(j));
+             ((cdrom_drive_types[j].bus_type == BUS_TYPE_BOTH) && (bus_type != BUS_TYPE_MKE)))) {
+            QString name = CDROMName(j);
             Models::AddEntry(modelType, name, j);
-            if ((cdrom[cdromIdx].bus_type == bus_type) && (cdrom[cdromIdx].type == j))
+            if (cdrom[cdromIdx].type == j)
                 selectedTypeRow = eligibleRows;
             ++eligibleRows;
         }
@@ -218,10 +233,9 @@ SettingsFloppyCDROM::save()
     /* Removable devices category */
     model = ui->tableViewCDROM->model();
     for (int i = 0; i < CDROM_NUM; i++) {
-        cdrom[i].is_dir = 0;
         cdrom[i].priv = NULL;
         cdrom[i].ops = NULL;
-        cdrom[i].image = NULL;
+        cdrom[i].local = NULL;
         cdrom[i].insert = NULL;
         cdrom[i].close = NULL;
         cdrom[i].get_volume = NULL;
@@ -245,10 +259,9 @@ SettingsFloppyCDROM::onFloppyRowChanged(const QModelIndex &current)
 void
 SettingsFloppyCDROM::onCDROMRowChanged(const QModelIndex &current)
 {
-    uint8_t bus     = current.siblingAtColumn(0).data(Qt::UserRole).toUInt();
-    uint8_t channel = current.siblingAtColumn(0).data(Qt::UserRole + 1).toUInt();
-    uint8_t speed   = current.siblingAtColumn(1).data(Qt::UserRole).toUInt();
-    int type        = current.siblingAtColumn(2).data(Qt::UserRole).toInt();
+    uint8_t  bus     = current.siblingAtColumn(0).data(Qt::UserRole).toUInt();
+    uint8_t  channel = current.siblingAtColumn(0).data(Qt::UserRole + 1).toUInt();
+    uint32_t type    = current.siblingAtColumn(2).data(Qt::UserRole).toUInt();
 
     ui->comboBoxBus->setCurrentIndex(-1);
     auto* model = ui->comboBoxBus->model();
@@ -261,8 +274,39 @@ SettingsFloppyCDROM::onCDROMRowChanged(const QModelIndex &current)
     if (!match.isEmpty())
         ui->comboBoxChannel->setCurrentIndex(match.first().row());
 
+    int     speed   = cdrom_get_speed(type);
+    if (speed == -1) {
+        speed   = current.siblingAtColumn(1).data(Qt::UserRole).toUInt();
+        ui->comboBoxSpeed->setEnabled((bus == CDROM_BUS_DISABLED) ? false : true);
+    } else
+        ui->comboBoxSpeed->setEnabled(false);
     ui->comboBoxSpeed->setCurrentIndex(speed == 0 ? 7 : speed - 1);
-    ui->comboBoxCDROMType->setCurrentIndex(type);
+
+    auto *modelType  = ui->comboBoxCDROMType->model();
+    int   removeRows = modelType->rowCount();
+
+    uint32_t j               = 0;
+    int selectedTypeRow      = 0;
+    int eligibleRows         = 0;
+    while (cdrom_drive_types[j].bus_type != BUS_TYPE_NONE) {
+        if (((bus == CDROM_BUS_MKE) || (bus == CDROM_BUS_ATAPI) ||
+             (bus == CDROM_BUS_SCSI)) &&
+            ((cdrom_drive_types[j].bus_type == bus) ||
+             ((cdrom_drive_types[j].bus_type == BUS_TYPE_BOTH) && (bus != BUS_TYPE_MKE)))) {
+            QString name = CDROMName(j);
+            Models::AddEntry(modelType, name, j);
+            if (type == j)
+                selectedTypeRow = eligibleRows;
+            ++eligibleRows;
+        }
+        ++j;
+    }
+    modelType->removeRows(0, removeRows);
+    ui->comboBoxCDROMType->setEnabled(eligibleRows > 1);
+    ui->comboBoxCDROMType->setCurrentIndex(-1);
+    ui->comboBoxCDROMType->setCurrentIndex(selectedTypeRow);
+
+    enableCurrentlySelectedChannel();
 }
 
 void
@@ -288,6 +332,13 @@ SettingsFloppyCDROM::on_comboBoxFloppyType_activated(int index)
                   ui->tableViewFloppy->selectionModel()->currentIndex(), index);
 }
 
+void SettingsFloppyCDROM::reloadBusChannels() {
+    auto selected = ui->comboBoxChannel->currentIndex();
+    Harddrives::populateBusChannels(ui->comboBoxChannel->model(), ui->comboBoxBus->currentData().toInt(), Harddrives::busTrackClass);
+    ui->comboBoxChannel->setCurrentIndex(selected);
+    enableCurrentlySelectedChannel();
+}
+
 void
 SettingsFloppyCDROM::on_comboBoxBus_currentIndexChanged(int index)
 {
@@ -298,7 +349,7 @@ SettingsFloppyCDROM::on_comboBoxBus_currentIndexChanged(int index)
         ui->comboBoxSpeed->setEnabled((bus == CDROM_BUS_MITSUMI) ? 0 : enabled);
         ui->comboBoxCDROMType->setEnabled((bus == CDROM_BUS_MITSUMI) ? 0 : enabled);
 
-        Harddrives::populateBusChannels(ui->comboBoxChannel->model(), bus);
+        Harddrives::populateBusChannels(ui->comboBoxChannel->model(), bus, Harddrives::busTrackClass);
     }
 }
 
@@ -312,14 +363,16 @@ SettingsFloppyCDROM::on_comboBoxSpeed_activated(int index)
 void
 SettingsFloppyCDROM::on_comboBoxBus_activated(int)
 {
-    auto i = ui->tableViewCDROM->selectionModel()->currentIndex().siblingAtColumn(0);
+    auto    i        = ui->tableViewCDROM->selectionModel()->currentIndex().siblingAtColumn(0);
     uint8_t bus_type = ui->comboBoxBus->currentData().toUInt();
-    int cdromIdx     = ui->tableViewCDROM->selectionModel()->currentIndex().data().toInt();
+    int     cdromIdx = ui->tableViewCDROM->selectionModel()->currentIndex().data().toInt();
 
     Harddrives::busTrackClass->device_track(0, DEV_CDROM, ui->tableViewCDROM->model()->data(i,
                                             Qt::UserRole).toInt(), ui->tableViewCDROM->model()->data(i,
                                             Qt::UserRole + 1).toInt());
-    if (bus_type == CDROM_BUS_ATAPI)
+    if (bus_type == CDROM_BUS_MKE)
+        ui->comboBoxChannel->setCurrentIndex(Harddrives::busTrackClass->next_free_mke_channel());
+    else if (bus_type == CDROM_BUS_ATAPI)
         ui->comboBoxChannel->setCurrentIndex(Harddrives::busTrackClass->next_free_ide_channel());
     else if (bus_type == CDROM_BUS_SCSI)
         ui->comboBoxChannel->setCurrentIndex(Harddrives::busTrackClass->next_free_scsi_id());
@@ -337,16 +390,17 @@ SettingsFloppyCDROM::on_comboBoxBus_activated(int)
     auto *modelType  = ui->comboBoxCDROMType->model();
     int   removeRows = modelType->rowCount();
 
-    uint32_t j               = 0;
-    int selectedTypeRow      = 0;
-    int eligibleRows         = 0;
+    uint32_t j          = 0;
+    int selectedTypeRow = 0;
+    int eligibleRows    = 0;
     while (cdrom_drive_types[j].bus_type != BUS_TYPE_NONE) {
-        if (((bus_type == CDROM_BUS_ATAPI) || (bus_type == CDROM_BUS_SCSI)) &&
+        if (((bus_type == CDROM_BUS_MKE) || (bus_type == CDROM_BUS_ATAPI) ||
+             (bus_type == CDROM_BUS_SCSI)) &&
             ((cdrom_drive_types[j].bus_type == bus_type) ||
-             (cdrom_drive_types[j].bus_type == BUS_TYPE_BOTH))) {
-            QString name = tr(cdrom_getname(j));
+             ((cdrom_drive_types[j].bus_type == BUS_TYPE_BOTH) && (bus_type != BUS_TYPE_MKE)))) {
+            QString name = CDROMName(j);
             Models::AddEntry(modelType, name, j);
-            if ((cdrom[cdromIdx].bus_type == bus_type) && (cdrom[cdromIdx].type == j))
+            if (cdrom[cdromIdx].type == j)
                 selectedTypeRow = eligibleRows;
             ++eligibleRows;
         }
@@ -360,6 +414,31 @@ SettingsFloppyCDROM::on_comboBoxBus_activated(int)
     setCDROMType(ui->tableViewCDROM->model(),
                  ui->tableViewCDROM->selectionModel()->currentIndex(),
                  ui->comboBoxCDROMType->currentData().toUInt());
+
+    int speed = cdrom_get_speed(ui->comboBoxCDROMType->currentData().toUInt());
+    if ((speed == -1) && (bus_type != CDROM_BUS_MITSUMI)) {
+        speed = ui->comboBoxSpeed->currentData().toUInt();
+        ui->comboBoxSpeed->setEnabled(bus_type != CDROM_BUS_DISABLED);
+    } else {
+        ui->comboBoxSpeed->setEnabled(false);
+        if (bus_type == CDROM_BUS_MITSUMI) // temp hack
+            speed = 0; 
+    }
+    ui->comboBoxSpeed->setCurrentIndex(speed == 0 ? 7 : speed - 1);
+    setCDROMSpeed(ui->tableViewCDROM->model(),
+                  ui->tableViewCDROM->selectionModel()->currentIndex(),
+                  speed);
+    emit cdromChannelChanged();
+}
+
+void
+SettingsFloppyCDROM::enableCurrentlySelectedChannel()
+{
+    const auto *item_model = qobject_cast<QStandardItemModel*>(ui->comboBoxChannel->model());
+    const auto  index      = ui->comboBoxChannel->currentIndex();
+    auto       *item       = item_model->item(index);
+    if(item)
+        item->setEnabled(true);
 }
 
 void
@@ -376,14 +455,28 @@ SettingsFloppyCDROM::on_comboBoxChannel_activated(int)
     Harddrives::busTrackClass->device_track(1, DEV_CDROM, ui->tableViewCDROM->model()->data(i,
                                             Qt::UserRole).toInt(), ui->tableViewCDROM->model()->data(i,
                                             Qt::UserRole + 1).toInt());
+    emit cdromChannelChanged();
 }
 
 void
 SettingsFloppyCDROM::on_comboBoxCDROMType_activated(int)
 {
+    int type = ui->comboBoxCDROMType->currentData().toUInt();
+
     setCDROMType(ui->tableViewCDROM->model(),
                  ui->tableViewCDROM->selectionModel()->currentIndex(),
-                 ui->comboBoxCDROMType->currentData().toUInt());
+                 type);
     ui->tableViewCDROM->resizeColumnsToContents();
     ui->tableViewCDROM->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
+
+    int speed = cdrom_get_speed(type);
+    if (speed == -1) {
+        speed = ui->comboBoxSpeed->currentData().toUInt();
+        ui->comboBoxSpeed->setEnabled(true);
+    } else
+        ui->comboBoxSpeed->setEnabled(false);
+    ui->comboBoxSpeed->setCurrentIndex(speed == 0 ? 7 : speed - 1);
+
+    auto idx = ui->tableViewCDROM->selectionModel()->currentIndex();
+    setCDROMSpeed(ui->tableViewCDROM->model(), idx.siblingAtColumn(1), speed);
 }
diff --git a/src/qt/qt_settingsfloppycdrom.hpp b/src/qt/qt_settingsfloppycdrom.hpp
index 3d6dd0e45..063942201 100644
--- a/src/qt/qt_settingsfloppycdrom.hpp
+++ b/src/qt/qt_settingsfloppycdrom.hpp
@@ -13,23 +13,30 @@ class SettingsFloppyCDROM : public QWidget {
 public:
     explicit SettingsFloppyCDROM(QWidget *parent = nullptr);
     ~SettingsFloppyCDROM();
+    void reloadBusChannels();
 
     void save();
 
+signals:
+    void cdromChannelChanged();
+
 private slots:
-    void on_comboBoxCDROMType_activated(int index);
-    void on_comboBoxChannel_activated(int index);
-    void on_comboBoxBus_activated(int index);
-    void on_comboBoxSpeed_activated(int index);
-    void on_comboBoxBus_currentIndexChanged(int index);
-    void on_comboBoxFloppyType_activated(int index);
-    void on_checkBoxCheckBPB_stateChanged(int arg1);
-    void on_checkBoxTurboTimings_stateChanged(int arg1);
     void onFloppyRowChanged(const QModelIndex &current);
+    void on_comboBoxFloppyType_activated(int index);
+    void on_checkBoxTurboTimings_stateChanged(int arg1);
+    void on_checkBoxCheckBPB_stateChanged(int arg1);
+
     void onCDROMRowChanged(const QModelIndex &current);
+    void on_comboBoxBus_activated(int index);
+    void on_comboBoxBus_currentIndexChanged(int index);
+    void on_comboBoxChannel_activated(int index);
+    void on_comboBoxSpeed_activated(int index);
+    void on_comboBoxCDROMType_activated(int index);
+
 
 private:
     Ui::SettingsFloppyCDROM *ui;
+    void enableCurrentlySelectedChannel();
 };
 
 #endif // QT_SETTINGSFLOPPYCDROM_HPP
diff --git a/src/qt/qt_settingsfloppycdrom.ui b/src/qt/qt_settingsfloppycdrom.ui
index d7ad853b3..6b1036b5c 100644
--- a/src/qt/qt_settingsfloppycdrom.ui
+++ b/src/qt/qt_settingsfloppycdrom.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>544</width>
-    <height>617</height>
+    <height>363</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -27,7 +27,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QLabel" name="label">
+    <widget class="QLabel" name="labelFloppy">
      <property name="text">
       <string>Floppy drives:</string>
      </property>
@@ -35,6 +35,18 @@
    </item>
    <item>
     <widget class="QTableView" name="tableViewFloppy">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>150</height>
+      </size>
+     </property>
      <property name="editTriggers">
       <set>QAbstractItemView::NoEditTriggers</set>
      </property>
@@ -53,52 +65,41 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Type:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="comboBoxFloppyType">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="checkBoxTurboTimings">
-       <property name="text">
-        <string>Turbo timings</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="checkBoxCheckBPB">
-       <property name="text">
-        <string>Check BPB</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QWidget" name="floppyControls" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QLabel" name="labelFloppyType">
+        <property name="text">
+         <string>Type:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="comboBoxFloppyType">
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="checkBoxTurboTimings">
+        <property name="text">
+         <string>Turbo timings</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="checkBoxCheckBPB">
+        <property name="text">
+         <string>Check BPB</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
    <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QLabel" name="label_6">
+    <widget class="QLabel" name="labelCDROM">
      <property name="text">
       <string>CD-ROM drives:</string>
      </property>
@@ -106,6 +107,18 @@
    </item>
    <item>
     <widget class="QTableView" name="tableViewCDROM">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>150</height>
+      </size>
+     </property>
      <property name="editTriggers">
       <set>QAbstractItemView::NoEditTriggers</set>
      </property>
@@ -124,67 +137,80 @@
     </widget>
    </item>
    <item>
-    <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Bus:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="2">
-      <widget class="QLabel" name="label_7">
-       <property name="text">
-        <string>Channel:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string>Speed:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_5">
-       <property name="text">
-        <string>Type:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QComboBox" name="comboBoxBus">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="3">
-      <widget class="QComboBox" name="comboBoxChannel">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QComboBox" name="comboBoxSpeed">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1" colspan="3">
-      <widget class="QComboBox" name="comboBoxCDROMType">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QWidget" name="cdControls" native="true">
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelBus">
+        <property name="text">
+         <string>Bus:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="comboBoxBus">
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QLabel" name="labelChannel">
+        <property name="text">
+         <string>Channel:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QComboBox" name="comboBoxChannel">
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="labelSpeed">
+        <property name="text">
+         <string>Speed:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="comboBoxSpeed">
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="labelCDROMType">
+        <property name="text">
+         <string>Type:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="3">
+       <widget class="QComboBox" name="comboBoxCDROMType">
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>tableViewFloppy</tabstop>
+  <tabstop>comboBoxFloppyType</tabstop>
+  <tabstop>checkBoxTurboTimings</tabstop>
+  <tabstop>checkBoxCheckBPB</tabstop>
+  <tabstop>tableViewCDROM</tabstop>
+  <tabstop>comboBoxBus</tabstop>
+  <tabstop>comboBoxChannel</tabstop>
+  <tabstop>comboBoxSpeed</tabstop>
+  <tabstop>comboBoxCDROMType</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/qt/qt_settingsharddisks.cpp b/src/qt/qt_settingsharddisks.cpp
index a66203406..6d82f2b77 100644
--- a/src/qt/qt_settingsharddisks.cpp
+++ b/src/qt/qt_settingsharddisks.cpp
@@ -49,13 +49,12 @@ static void
 normalize_hd_list()
 {
     hard_disk_t ihdd[HDD_NUM];
-    int j;
+    int j = 0;
 
-    j = 0;
     memset(ihdd, 0x00, HDD_NUM * sizeof(hard_disk_t));
 
     for (uint8_t i = 0; i < HDD_NUM; i++) {
-        if (temp_hdd[i].bus != HDD_BUS_DISABLED) {
+        if (temp_hdd[i].bus_type != HDD_BUS_DISABLED) {
             memcpy(&(ihdd[j]), &(temp_hdd[i]), sizeof(hard_disk_t));
             j++;
         }
@@ -75,31 +74,31 @@ static void
 addRow(QAbstractItemModel *model, hard_disk_t *hd)
 {
     const QString userPath = usr_path;
-
     int row = model->rowCount();
+
     model->insertRow(row);
 
-    QString busName = Harddrives::BusChannelName(hd->bus, hd->channel);
+    QString busName = Harddrives::BusChannelName(hd->bus_type, hd->channel);
     model->setData(model->index(row, ColumnBus), busName);
-    model->setData(model->index(row, ColumnBus), ProgSettings::loadIcon("/hard_disk.ico"), Qt::DecorationRole);
-    model->setData(model->index(row, ColumnBus), hd->bus, DataBus);
-    model->setData(model->index(row, ColumnBus), hd->bus, DataBusPrevious);
+    model->setData(model->index(row, ColumnBus), QIcon(":/settings/qt/icons/hard_disk.ico"), Qt::DecorationRole);
+    model->setData(model->index(row, ColumnBus), hd->bus_type, DataBus);
+    model->setData(model->index(row, ColumnBus), hd->bus_type, DataBusPrevious);
     model->setData(model->index(row, ColumnBus), hd->channel, DataBusChannel);
     model->setData(model->index(row, ColumnBus), hd->channel, DataBusChannelPrevious);
-    Harddrives::busTrackClass->device_track(1, DEV_HDD, hd->bus, hd->channel);
+    Harddrives::busTrackClass->device_track(1, DEV_HDD, hd->bus_type, hd->channel);
     QString fileName = hd->fn;
-    if (fileName.startsWith(userPath, Qt::CaseInsensitive)) {
+    if (fileName.startsWith(userPath, Qt::CaseInsensitive))
         model->setData(model->index(row, ColumnFilename), fileName.mid(userPath.size()));
-    } else {
+    else
         model->setData(model->index(row, ColumnFilename), fileName);
-    }
+
     model->setData(model->index(row, ColumnFilename), fileName, Qt::UserRole);
 
     model->setData(model->index(row, ColumnCylinders), hd->tracks);
     model->setData(model->index(row, ColumnHeads), hd->hpc);
     model->setData(model->index(row, ColumnSectors), hd->spt);
     model->setData(model->index(row, ColumnSize), (hd->tracks * hd->hpc * hd->spt) >> 11);
-    model->setData(model->index(row, ColumnSpeed), hdd_preset_getname(hd->speed_preset));
+    model->setData(model->index(row, ColumnSpeed), QObject::tr(hdd_preset_getname(hd->speed_preset)));
     model->setData(model->index(row, ColumnSpeed), hd->speed_preset, Qt::UserRole);
 }
 
@@ -116,13 +115,12 @@ SettingsHarddisks::SettingsHarddisks(QWidget *parent)
     model->setHeaderData(ColumnHeads, Qt::Horizontal, tr("H"));
     model->setHeaderData(ColumnSectors, Qt::Horizontal, tr("S"));
     model->setHeaderData(ColumnSize, Qt::Horizontal, tr("MiB"));
-    model->setHeaderData(ColumnSpeed, Qt::Horizontal, tr("Speed"));
+    model->setHeaderData(ColumnSpeed, Qt::Horizontal, tr("Model"));
     ui->tableView->setModel(model);
 
     for (int i = 0; i < HDD_NUM; i++) {
-        if (hdd[i].bus > 0) {
+        if (hdd[i].bus_type > 0)
             addRow(model, &hdd[i]);
-        }
     }
     if (model->rowCount() == HDD_NUM) {
         ui->pushButtonNew->setEnabled(false);
@@ -153,7 +151,7 @@ SettingsHarddisks::save()
     int   rows  = model->rowCount();
     for (int i = 0; i < rows; ++i) {
         auto idx            = model->index(i, ColumnBus);
-        hdd[i].bus          = idx.data(DataBus).toUInt();
+        hdd[i].bus_type     = idx.data(DataBus).toUInt();
         hdd[i].channel      = idx.data(DataBusChannel).toUInt();
         hdd[i].tracks       = idx.siblingAtColumn(ColumnCylinders).data().toUInt();
         hdd[i].hpc          = idx.siblingAtColumn(ColumnHeads).data().toUInt();
@@ -166,12 +164,18 @@ SettingsHarddisks::save()
     }
 }
 
+void SettingsHarddisks::reloadBusChannels() {
+    const auto selected = ui->comboBoxChannel->currentIndex();
+    Harddrives::populateBusChannels(ui->comboBoxChannel->model(), ui->comboBoxBus->currentData().toInt(), Harddrives::busTrackClass);
+    ui->comboBoxChannel->setCurrentIndex(selected);
+    enableCurrentlySelectedChannel();
+}
+
 void
 SettingsHarddisks::on_comboBoxBus_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
 
     buschangeinprogress = true;
     auto idx            = ui->tableView->selectionModel()->currentIndex();
@@ -184,7 +188,7 @@ SettingsHarddisks::on_comboBoxBus_currentIndexChanged(int index)
         model->setData(col, ui->comboBoxBus->currentData(Qt::UserRole), DataBusPrevious);
     }
 
-    Harddrives::populateBusChannels(ui->comboBoxChannel->model(), ui->comboBoxBus->currentData().toInt());
+    Harddrives::populateBusChannels(ui->comboBoxChannel->model(), ui->comboBoxBus->currentData().toInt(), Harddrives::busTrackClass);
     Harddrives::populateSpeeds(ui->comboBoxSpeed->model(), ui->comboBoxBus->currentData().toInt());
     int chanIdx = 0;
 
@@ -219,9 +223,8 @@ SettingsHarddisks::on_comboBoxBus_currentIndexChanged(int index)
 void
 SettingsHarddisks::on_comboBoxChannel_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
 
     auto idx = ui->tableView->selectionModel()->currentIndex();
     if (idx.isValid()) {
@@ -233,22 +236,32 @@ SettingsHarddisks::on_comboBoxChannel_currentIndexChanged(int index)
             Harddrives::busTrackClass->device_track(0, DEV_HDD, model->data(col, DataBus).toInt(), model->data(col, DataBusChannelPrevious).toUInt());
         Harddrives::busTrackClass->device_track(1, DEV_HDD, model->data(col, DataBus).toInt(), model->data(col, DataBusChannel).toUInt());
         model->setData(col, ui->comboBoxChannel->currentData(Qt::UserRole), DataBusChannelPrevious);
+        emit driveChannelChanged();
     }
 }
 
+void
+SettingsHarddisks::enableCurrentlySelectedChannel()
+{
+    const auto *item_model = qobject_cast<QStandardItemModel*>(ui->comboBoxChannel->model());
+    const auto index = ui->comboBoxChannel->currentIndex();
+    auto *item = item_model->item(index);
+    if(item)
+        item->setEnabled(true);
+}
+
 void
 SettingsHarddisks::on_comboBoxSpeed_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
 
     auto idx = ui->tableView->selectionModel()->currentIndex();
     if (idx.isValid()) {
         auto *model = ui->tableView->model();
         auto  col   = idx.siblingAtColumn(ColumnSpeed);
         model->setData(col, ui->comboBoxSpeed->currentData(Qt::UserRole), Qt::UserRole);
-        model->setData(col, hdd_preset_getname(ui->comboBoxSpeed->currentData(Qt::UserRole).toUInt()));
+        model->setData(col, QObject::tr(hdd_preset_getname(ui->comboBoxSpeed->currentData(Qt::UserRole).toUInt())));
     }
 }
 
@@ -269,20 +282,20 @@ SettingsHarddisks::onTableRowChanged(const QModelIndex &current)
 
     auto *model = ui->comboBoxBus->model();
     auto  match = model->match(model->index(0, 0), Qt::UserRole, bus);
-    if (!match.isEmpty()) {
+    if (!match.isEmpty())
         ui->comboBoxBus->setCurrentIndex(match.first().row());
-    }
+
     model = ui->comboBoxChannel->model();
     match = model->match(model->index(0, 0), Qt::UserRole, busChannel);
-    if (!match.isEmpty()) {
+    if (!match.isEmpty())
         ui->comboBoxChannel->setCurrentIndex(match.first().row());
-    }
 
     model = ui->comboBoxSpeed->model();
     match = model->match(model->index(0, 0), Qt::UserRole, speed);
-    if (!match.isEmpty()) {
+    if (!match.isEmpty())
         ui->comboBoxSpeed->setCurrentIndex(match.first().row());
-    }
+
+    reloadBusChannels();
 }
 
 static void
@@ -293,11 +306,11 @@ addDriveFromDialog(Ui::SettingsHarddisks *ui, const HarddiskDialog &dlg)
     hard_disk_t hd;
     memset(&hd, 0, sizeof(hd));
 
-    hd.bus     = dlg.bus();
-    hd.channel = dlg.channel();
-    hd.tracks  = dlg.cylinders();
-    hd.hpc     = dlg.heads();
-    hd.spt     = dlg.sectors();
+    hd.bus_type = dlg.bus();
+    hd.channel  = dlg.channel();
+    hd.tracks   = dlg.cylinders();
+    hd.hpc      = dlg.heads();
+    hd.spt      = dlg.sectors();
     strncpy(hd.fn, fn.data(), sizeof(hd.fn) - 1);
     hd.speed_preset = dlg.speed();
 
@@ -317,6 +330,7 @@ SettingsHarddisks::on_pushButtonNew_clicked()
     switch (dialog.exec()) {
         case QDialog::Accepted:
             addDriveFromDialog(ui, dialog);
+            reloadBusChannels();
             break;
     }
 }
@@ -328,6 +342,7 @@ SettingsHarddisks::on_pushButtonExisting_clicked()
     switch (dialog.exec()) {
         case QDialog::Accepted:
             addDriveFromDialog(ui, dialog);
+            reloadBusChannels();
             break;
     }
 }
@@ -336,11 +351,12 @@ void
 SettingsHarddisks::on_pushButtonRemove_clicked()
 {
     auto idx = ui->tableView->selectionModel()->currentIndex();
-    if (!idx.isValid()) {
+    if (!idx.isValid())
         return;
-    }
 
-    auto *model = ui->tableView->model();
+    auto       *model = ui->tableView->model();
+    const auto  col   = idx.siblingAtColumn(ColumnBus);
+    Harddrives::busTrackClass->device_track(0, DEV_HDD, model->data(col, DataBus).toInt(), model->data(col, DataBusChannel).toInt());
     model->removeRow(idx.row());
     ui->pushButtonNew->setEnabled(true);
     ui->pushButtonExisting->setEnabled(true);
diff --git a/src/qt/qt_settingsharddisks.hpp b/src/qt/qt_settingsharddisks.hpp
index 68d7ca3d6..f892a79cd 100644
--- a/src/qt/qt_settingsharddisks.hpp
+++ b/src/qt/qt_settingsharddisks.hpp
@@ -13,23 +13,27 @@ class SettingsHarddisks : public QWidget {
 public:
     explicit SettingsHarddisks(QWidget *parent = nullptr);
     ~SettingsHarddisks();
+    void reloadBusChannels();
 
     void save();
 
+signals:
+    void driveChannelChanged();
+
 private slots:
+    void on_comboBoxBus_currentIndexChanged(int index);
     void on_comboBoxChannel_currentIndexChanged(int index);
     void on_comboBoxSpeed_currentIndexChanged(int index);
 
-private slots:
-    void on_pushButtonRemove_clicked();
-    void on_pushButtonExisting_clicked();
     void on_pushButtonNew_clicked();
-    void on_comboBoxBus_currentIndexChanged(int index);
+    void on_pushButtonExisting_clicked();
+    void on_pushButtonRemove_clicked();
 
     void onTableRowChanged(const QModelIndex &current);
 
 private:
     Ui::SettingsHarddisks *ui;
+    void                   enableCurrentlySelectedChannel();
     bool                   buschangeinprogress = false;
 };
 
diff --git a/src/qt/qt_settingsharddisks.ui b/src/qt/qt_settingsharddisks.ui
index 3ae20fee1..e68de43d1 100644
--- a/src/qt/qt_settingsharddisks.ui
+++ b/src/qt/qt_settingsharddisks.ui
@@ -46,50 +46,52 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QLabel" name="labelBus">
-       <property name="text">
-        <string>Bus:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="comboBoxBus">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelChannel">
-       <property name="text">
-        <string>ID:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="comboBoxChannel">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelSpeed">
-       <property name="text">
-        <string>Speed:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="comboBoxSpeed">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QWidget" name="hdControls" native="true">
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelBus">
+        <property name="text">
+         <string>Bus:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="comboBoxBus">
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QLabel" name="labelChannel">
+        <property name="text">
+         <string>Channel:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QComboBox" name="comboBoxChannel">
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="labelSpeed">
+        <property name="text">
+         <string>Model:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="comboBoxSpeed">
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
diff --git a/src/qt/qt_settingsinput.cpp b/src/qt/qt_settingsinput.cpp
index 34d111e10..50e3662e9 100644
--- a/src/qt/qt_settingsinput.cpp
+++ b/src/qt/qt_settingsinput.cpp
@@ -8,28 +8,39 @@
  *
  *          Mouse/Joystick configuration UI module.
  *
- *
- *
  * Authors: Joakim L. Gilje <jgilje@jgilje.net>
  *
  *          Copyright 2021 Joakim L. Gilje
  */
 #include "qt_settingsinput.hpp"
 #include "ui_qt_settingsinput.h"
+#include "qt_mainwindow.hpp"
+#include "qt_progsettings.hpp"
 
 #include <QDebug>
+#include <QKeySequence>
+#include <QMessageBox>
+#include <string>
 
 extern "C" {
 #include <86box/86box.h>
 #include <86box/device.h>
 #include <86box/machine.h>
+#include <86box/keyboard.h>
 #include <86box/mouse.h>
 #include <86box/gameport.h>
+#include <86box/ui.h>
 }
 
 #include "qt_models_common.hpp"
 #include "qt_deviceconfig.hpp"
 #include "qt_joystickconfiguration.hpp"
+#include "qt_keybind.hpp"
+
+extern MainWindow *main_window;
+
+// Temporary working copy of key list
+accelKey acc_keys_t[NUM_ACCELS];
 
 SettingsInput::SettingsInput(QWidget *parent)
     : QWidget(parent)
@@ -37,6 +48,37 @@ SettingsInput::SettingsInput(QWidget *parent)
 {
     ui->setupUi(this);
 
+    QStringList horizontalHeader;
+    QStringList verticalHeader;
+
+    horizontalHeader.append(tr("Action"));
+    horizontalHeader.append(tr("Keybind"));
+
+    QTableWidget *keyTable = ui->tableKeys;
+    keyTable->setRowCount(NUM_ACCELS);
+    keyTable->setColumnCount(3);
+    keyTable->setColumnHidden(2, true);
+    keyTable->setColumnWidth(0, 200);
+    keyTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+    QStringList headers;
+    //headers << "Action" << "Bound key";
+    keyTable->setHorizontalHeaderLabels(horizontalHeader);
+    keyTable->verticalHeader()->setVisible(false);
+    keyTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
+    keyTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+    keyTable->setSelectionMode(QAbstractItemView::SingleSelection);
+    keyTable->setShowGrid(true);
+
+    // Make a working copy of acc_keys so we can check for dupes later without getting
+    // confused
+    for(int x = 0; x < NUM_ACCELS; x++) {
+        strcpy(acc_keys_t[x].name, acc_keys[x].name);
+        strcpy(acc_keys_t[x].desc, acc_keys[x].desc);
+        strcpy(acc_keys_t[x].seq, acc_keys[x].seq);
+    }
+
+    refreshInputList();
+
     onCurrentMachineChanged(machine);
 }
 
@@ -48,8 +90,18 @@ SettingsInput::~SettingsInput()
 void
 SettingsInput::save()
 {
+    keyboard_type = ui->comboBoxKeyboard->currentData().toInt();
     mouse_type    = ui->comboBoxMouse->currentData().toInt();
-    joystick_type = ui->comboBoxJoystick->currentData().toInt();
+
+    joystick_type[0] = ui->comboBoxJoystick0->currentData().toInt();
+
+    // Copy accelerators from working set to global set
+    for(int x = 0; x < NUM_ACCELS; x++) {
+        strcpy(acc_keys[x].name, acc_keys_t[x].name);
+        strcpy(acc_keys[x].desc, acc_keys_t[x].desc);
+        strcpy(acc_keys[x].seq, acc_keys_t[x].seq);
+    }
+    ProgSettings::reloadStrings();
 }
 
 void
@@ -58,19 +110,57 @@ SettingsInput::onCurrentMachineChanged(int machineId)
     // win_settings_video_proc, WM_INITDIALOG
     this->machineId = machineId;
 
-    auto *mouseModel = ui->comboBoxMouse->model();
-    auto  removeRows = mouseModel->rowCount();
+    auto *keyboardModel = ui->comboBoxKeyboard->model();
+    auto  removeRows = keyboardModel->rowCount();
 
     int selectedRow = 0;
+
+    int c           = 0;
+    int has_int_kbd = !!machine_has_flags(machineId, MACHINE_KEYBOARD);
+
+    for (int i = 0; i < keyboard_get_ndev(); ++i) {
+        const auto *dev           = keyboard_get_device(i);
+        int         ikbd          = (i == KEYBOARD_TYPE_INTERNAL);
+
+        int         pc5086_filter = (strstr(keyboard_get_internal_name(i), "ps") &&
+                                    strstr(machine_get_internal_name_ex(machineId), "pc5086"));
+
+        if ((ikbd != has_int_kbd) || !device_is_valid(dev, machineId) || pc5086_filter)
+            continue;
+
+        QString name = DeviceConfig::DeviceName(dev, keyboard_get_internal_name(i), 0);
+        int     row  = keyboardModel->rowCount();
+        keyboardModel->insertRow(row);
+        auto idx = keyboardModel->index(row, 0);
+
+        keyboardModel->setData(idx, name, Qt::DisplayRole);
+        keyboardModel->setData(idx, i, Qt::UserRole);
+
+        if (i == keyboard_type)
+            selectedRow = row - removeRows;
+
+        c++;
+    }
+    keyboardModel->removeRows(0, removeRows);
+    ui->comboBoxKeyboard->setCurrentIndex(-1);
+    ui->comboBoxKeyboard->setCurrentIndex(selectedRow);
+
+    if ((c == 1) || has_int_kbd)
+        ui->comboBoxKeyboard->setEnabled(false);
+    else
+        ui->comboBoxKeyboard->setEnabled(true);
+
+    auto *mouseModel = ui->comboBoxMouse->model();
+    removeRows       = mouseModel->rowCount();
+
+    selectedRow = 0;
     for (int i = 0; i < mouse_get_ndev(); ++i) {
         const auto *dev = mouse_get_device(i);
-        if ((i == MOUSE_TYPE_INTERNAL) && (machine_has_flags(machineId, MACHINE_MOUSE) == 0)) {
+        if ((i == MOUSE_TYPE_INTERNAL) && (machine_has_flags(machineId, MACHINE_MOUSE) == 0))
             continue;
-        }
 
-        if (device_is_valid(dev, machineId) == 0) {
+        if (device_is_valid(dev, machineId) == 0)
             continue;
-        }
 
         QString name = DeviceConfig::DeviceName(dev, mouse_get_internal_name(i), 0);
         int     row  = mouseModel->rowCount();
@@ -80,86 +170,191 @@ SettingsInput::onCurrentMachineChanged(int machineId)
         mouseModel->setData(idx, name, Qt::DisplayRole);
         mouseModel->setData(idx, i, Qt::UserRole);
 
-        if (i == mouse_type) {
+        if (i == mouse_type)
             selectedRow = row - removeRows;
-        }
     }
     mouseModel->removeRows(0, removeRows);
+    ui->comboBoxMouse->setCurrentIndex(-1);
     ui->comboBoxMouse->setCurrentIndex(selectedRow);
 
+    // Joysticks
     int         i             = 0;
     const char *joyName       = joystick_get_name(i);
-    auto       *joystickModel = ui->comboBoxJoystick->model();
-    removeRows          = joystickModel->rowCount();
-    selectedRow         = 0;
+    auto       *joystickModel = ui->comboBoxJoystick0->model();
+    removeRows                = joystickModel->rowCount();
+    selectedRow               = 0;
     while (joyName) {
         int row = Models::AddEntry(joystickModel, tr(joyName).toUtf8().data(), i);
-        if (i == joystick_type) {
+        if (i == joystick_type[0])
             selectedRow = row - removeRows;
-        }
 
         ++i;
         joyName = joystick_get_name(i);
     }
     joystickModel->removeRows(0, removeRows);
-    ui->comboBoxJoystick->setCurrentIndex(selectedRow);
+    ui->comboBoxJoystick0->setCurrentIndex(selectedRow);
+}
+
+void
+SettingsInput::refreshInputList()
+{
+    for (int x = 0; x < NUM_ACCELS; x++) {
+        ui->tableKeys->setItem(x, 0, new QTableWidgetItem(tr(acc_keys_t[x].desc)));
+        ui->tableKeys->setItem(x, 1, new QTableWidgetItem(QKeySequence(acc_keys_t[x].seq, QKeySequence::PortableText).toString(QKeySequence::NativeText)));
+        ui->tableKeys->setItem(x, 2, new QTableWidgetItem(acc_keys_t[x].name));
+    }
+}
+
+void
+SettingsInput::on_tableKeys_currentCellChanged(int currentRow, int currentColumn, int previousRow, int previousColumn)
+{
+    // Enable/disable bind/clear buttons if user clicked valid row
+    QTableWidgetItem *cell = ui->tableKeys->item(currentRow,1);
+    if (!cell) {
+        ui->pushButtonBind->setEnabled(false);
+        ui->pushButtonClearBind->setEnabled(false);
+    } else {
+        ui->pushButtonBind->setEnabled(true);
+        ui->pushButtonClearBind->setEnabled(true);
+    }
+}
+
+void
+SettingsInput::on_tableKeys_cellDoubleClicked(int row, int col)
+{
+    // Edit bind
+    QTableWidgetItem *cell = ui->tableKeys->item(row,1);
+    if (!cell)
+        return;
+
+    QKeySequence keyseq = KeyBinder::BindKey(this, cell->text());
+    if (keyseq != false) {
+        // If no change was made, don't change anything.
+        if (keyseq.toString(QKeySequence::NativeText) == cell->text())
+            return;
+
+        // Otherwise, check for conflicts.
+        // Check against the *working* copy - NOT the one in use by the app,
+        // so we don't test against shortcuts the user already changed.
+        for(int x = 0; x < NUM_ACCELS; x++) {
+            if(QString::fromStdString(acc_keys_t[x].seq) == keyseq.toString(QKeySequence::PortableText)) {
+                // That key is already in use
+                QMessageBox::warning(this, tr("Bind conflict"), tr("This key combo is already in use."), QMessageBox::StandardButton::Ok);
+                return;
+            }
+        }
+        // If we made it here, there were no conflicts.
+        // Go ahead and apply the bind.
+
+        // Find the correct accelerator key entry
+        int accKeyID = FindAccelerator(ui->tableKeys->item(row,2)->text().toUtf8().constData());
+        if (accKeyID < 0)
+            return; // this should never happen
+
+        // Make the change
+        cell->setText(keyseq.toString(QKeySequence::NativeText));
+        strcpy(acc_keys_t[accKeyID].seq, keyseq.toString(QKeySequence::PortableText).toUtf8().constData());
+
+        refreshInputList();
+    }
+}
+
+void
+SettingsInput::on_pushButtonBind_clicked()
+{
+    // Edit bind
+    QTableWidgetItem *cell = ui->tableKeys->currentItem();
+    if (!cell)
+        return;
+
+    on_tableKeys_cellDoubleClicked(cell->row(), cell->column());
+}
+
+void
+SettingsInput::on_pushButtonClearBind_clicked()
+{
+    // Wipe bind
+    QTableWidgetItem *cell = ui->tableKeys->item(ui->tableKeys->currentRow(), 1);
+    if (!cell)
+        return;
+
+    cell->setText("");
+    // Find the correct accelerator key entry
+    int accKeyID = FindAccelerator(ui->tableKeys->item(cell->row(),2)->text().toUtf8().constData());
+    if (accKeyID < 0)
+        return; // this should never happen
+
+    // Make the change
+    cell->setText("");
+    strcpy(acc_keys_t[accKeyID].seq, "");
+}
+
+void
+SettingsInput::on_comboBoxKeyboard_currentIndexChanged(int index)
+{
+    if (index < 0)
+        return;
+    int keyboardId = ui->comboBoxKeyboard->currentData().toInt();
+    ui->pushButtonConfigureKeyboard->setEnabled(keyboard_has_config(keyboardId) > 0);
 }
 
 void
 SettingsInput::on_comboBoxMouse_currentIndexChanged(int index)
 {
+    if (index < 0)
+        return;
     int mouseId = ui->comboBoxMouse->currentData().toInt();
     ui->pushButtonConfigureMouse->setEnabled(mouse_has_config(mouseId) > 0);
 }
 
 void
-SettingsInput::on_comboBoxJoystick_currentIndexChanged(int index)
+SettingsInput::on_comboBoxJoystick0_currentIndexChanged(int index)
 {
-    int joystickId = ui->comboBoxJoystick->currentData().toInt();
+    int joystickId = ui->comboBoxJoystick0->currentData().toInt();
     for (int i = 0; i < MAX_JOYSTICKS; ++i) {
-        auto *btn = findChild<QPushButton *>(QString("pushButtonJoystick%1").arg(i + 1));
-        if (btn == nullptr) {
+        auto *btn = findChild<QPushButton *>(QString("pushButtonJoystick0%1").arg(i + 1));
+        if (btn == nullptr)
             continue;
-        }
+
         btn->setEnabled(joystick_get_max_joysticks(joystickId) > i);
     }
 }
 
+void
+SettingsInput::on_pushButtonConfigureKeyboard_clicked()
+{
+    int keyboardId = ui->comboBoxKeyboard->currentData().toInt();
+    DeviceConfig::ConfigureDevice(keyboard_get_device(keyboardId));
+}
+
 void
 SettingsInput::on_pushButtonConfigureMouse_clicked()
 {
     int mouseId = ui->comboBoxMouse->currentData().toInt();
-    DeviceConfig::ConfigureDevice(mouse_get_device(mouseId), 0, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(mouse_get_device(mouseId));
 }
 
 static int
-get_axis(JoystickConfiguration &jc, int axis, int joystick_nr)
+get_axis(JoystickConfiguration &jc, int axis, uint8_t gameport_nr, int joystick_nr)
 {
     int axis_sel = jc.selectedAxis(axis);
-    int nr_axes  = plat_joystick_state[joystick_state[joystick_nr].plat_joystick_nr - 1].nr_axes;
-    int nr_povs  = plat_joystick_state[joystick_state[joystick_nr].plat_joystick_nr - 1].nr_povs;
+    int nr_axes  = plat_joystick_state[joystick_state[gameport_nr][joystick_nr].plat_joystick_nr - 1].nr_axes;
 
-    if (axis_sel < nr_axes) {
+    if (axis_sel < nr_axes)
         return axis_sel;
-    }
 
     axis_sel -= nr_axes;
-    if (axis_sel < nr_povs * 2) {
-        if (axis_sel & 1)
-            return POV_Y | (axis_sel >> 1);
-        else
-            return POV_X | (axis_sel >> 1);
-    }
-    axis_sel -= nr_povs;
-
-    return SLIDER | (axis_sel >> 1);
+    if (axis_sel & 1)
+        return POV_Y | (axis_sel >> 1);
+    else
+        return POV_X | (axis_sel >> 1);
 }
 
 static int
-get_pov(JoystickConfiguration &jc, int pov, int joystick_nr)
+get_pov(JoystickConfiguration &jc, int pov, uint8_t gameport_nr, int joystick_nr)
 {
     int pov_sel = jc.selectedPov(pov);
-    int nr_povs = plat_joystick_state[joystick_state[joystick_nr].plat_joystick_nr - 1].nr_povs * 2;
+    int nr_povs = plat_joystick_state[joystick_state[gameport_nr][joystick_nr].plat_joystick_nr - 1].nr_povs * 2;
 
     if (pov_sel < nr_povs) {
         if (pov_sel & 1)
@@ -172,9 +367,9 @@ get_pov(JoystickConfiguration &jc, int pov, int joystick_nr)
 }
 
 static void
-updateJoystickConfig(int type, int joystick_nr, QWidget *parent)
+updateJoystickConfig(int type, uint8_t gameport_nr, int joystick_nr, QWidget *parent)
 {
-    JoystickConfiguration jc(type, joystick_nr, parent);
+    JoystickConfiguration jc(type, gameport_nr, joystick_nr, parent);
     switch (jc.exec()) {
         case QDialog::Rejected:
             return;
@@ -182,41 +377,43 @@ updateJoystickConfig(int type, int joystick_nr, QWidget *parent)
             break;
     }
 
-    joystick_state[joystick_nr].plat_joystick_nr = jc.selectedDevice();
-    if (joystick_state[joystick_nr].plat_joystick_nr) {
-        for (int c = 0; c < joystick_get_axis_count(type); c++) {
-            joystick_state[joystick_nr].axis_mapping[c] = get_axis(jc, c, joystick_nr);
+    joystick_state[gameport_nr][joystick_nr].plat_joystick_nr = jc.selectedDevice();
+    if (joystick_state[gameport_nr][joystick_nr].plat_joystick_nr) {
+        for (int axis_nr = 0; axis_nr < joystick_get_axis_count(type); axis_nr++) {
+            joystick_state[gameport_nr][joystick_nr].axis_mapping[axis_nr] = get_axis(jc, axis_nr, gameport_nr, joystick_nr);
         }
-        for (int c = 0; c < joystick_get_button_count(type); c++) {
-            joystick_state[joystick_nr].button_mapping[c] = jc.selectedButton(c);
+
+        for (int button_nr = 0; button_nr < joystick_get_button_count(type); button_nr++) {
+            joystick_state[gameport_nr][joystick_nr].button_mapping[button_nr] = jc.selectedButton(button_nr);
         }
-        for (int c = 0; c < joystick_get_pov_count(type) * 2; c += 2) {
-            joystick_state[joystick_nr].pov_mapping[c][0] = get_pov(jc, c, joystick_nr);
-            joystick_state[joystick_nr].pov_mapping[c][1] = get_pov(jc, c + 1, joystick_nr);
+
+        for (int pov_nr = 0; pov_nr < joystick_get_pov_count(type) * 2; pov_nr += 2) {
+            joystick_state[gameport_nr][joystick_nr].pov_mapping[pov_nr][0] = get_pov(jc, pov_nr, gameport_nr, joystick_nr);
+            joystick_state[gameport_nr][joystick_nr].pov_mapping[pov_nr][1] = get_pov(jc, pov_nr + 1, gameport_nr, joystick_nr);
         }
     }
 }
 
 void
-SettingsInput::on_pushButtonJoystick1_clicked()
+SettingsInput::on_pushButtonJoystick01_clicked()
 {
-    updateJoystickConfig(ui->comboBoxJoystick->currentData().toInt(), 0, this);
+    updateJoystickConfig(ui->comboBoxJoystick0->currentData().toInt(), 0, 0, this);
 }
 
 void
-SettingsInput::on_pushButtonJoystick2_clicked()
+SettingsInput::on_pushButtonJoystick02_clicked()
 {
-    updateJoystickConfig(ui->comboBoxJoystick->currentData().toInt(), 1, this);
+    updateJoystickConfig(ui->comboBoxJoystick0->currentData().toInt(), 0, 1, this);
 }
 
 void
-SettingsInput::on_pushButtonJoystick3_clicked()
+SettingsInput::on_pushButtonJoystick03_clicked()
 {
-    updateJoystickConfig(ui->comboBoxJoystick->currentData().toInt(), 2, this);
+    updateJoystickConfig(ui->comboBoxJoystick0->currentData().toInt(), 0, 2, this);
 }
 
 void
-SettingsInput::on_pushButtonJoystick4_clicked()
+SettingsInput::on_pushButtonJoystick04_clicked()
 {
-    updateJoystickConfig(ui->comboBoxJoystick->currentData().toInt(), 3, this);
+    updateJoystickConfig(ui->comboBoxJoystick0->currentData().toInt(), 0, 3, this);
 }
diff --git a/src/qt/qt_settingsinput.hpp b/src/qt/qt_settingsinput.hpp
index 0b8b665aa..68748fa36 100644
--- a/src/qt/qt_settingsinput.hpp
+++ b/src/qt/qt_settingsinput.hpp
@@ -2,6 +2,12 @@
 #define QT_SETTINGSINPUT_HPP
 
 #include <QWidget>
+#include <QtGui/QStandardItemModel>
+#include <QtGui/QStandardItem>
+#include <QItemDelegate>
+#include <QPainter>
+#include <QVariant>
+#include <QTableWidget>
 
 namespace Ui {
 class SettingsInput;
@@ -20,17 +26,28 @@ public slots:
     void onCurrentMachineChanged(int machineId);
 
 private slots:
-    void on_pushButtonConfigureMouse_clicked();
-    void on_comboBoxJoystick_currentIndexChanged(int index);
+    void on_comboBoxKeyboard_currentIndexChanged(int index);
+    void on_pushButtonConfigureKeyboard_clicked();
+
     void on_comboBoxMouse_currentIndexChanged(int index);
-    void on_pushButtonJoystick1_clicked();
-    void on_pushButtonJoystick2_clicked();
-    void on_pushButtonJoystick3_clicked();
-    void on_pushButtonJoystick4_clicked();
+    void on_pushButtonConfigureMouse_clicked();
+
+    void on_comboBoxJoystick0_currentIndexChanged(int index);
+    void on_pushButtonJoystick01_clicked();
+    void on_pushButtonJoystick02_clicked();
+    void on_pushButtonJoystick03_clicked();
+    void on_pushButtonJoystick04_clicked();
+
+    void on_tableKeys_cellDoubleClicked(int row, int col);
+    void on_tableKeys_currentCellChanged(int currentRow, int currentColumn, int previousRow, int previousColumn);
+
+    void on_pushButtonClearBind_clicked();
+    void on_pushButtonBind_clicked();
 
 private:
     Ui::SettingsInput *ui;
     int                machineId = 0;
+    void refreshInputList();
 };
 
 #endif // QT_SETTINGSINPUT_HPP
diff --git a/src/qt/qt_settingsinput.ui b/src/qt/qt_settingsinput.ui
index 839461119..02b3e388c 100644
--- a/src/qt/qt_settingsinput.ui
+++ b/src/qt/qt_settingsinput.ui
@@ -23,65 +23,60 @@
    <property name="rightMargin">
     <number>0</number>
    </property>
-   <item row="2" column="1">
-    <widget class="QPushButton" name="pushButtonJoystick2">
+   <item row="0" column="0">
+    <widget class="QLabel" name="labelKeyboard">
      <property name="text">
-      <string>Joystick 2...</string>
+      <string>Keyboard:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2">
+    <widget class="QComboBox" name="comboBoxKeyboard">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maxVisibleItems">
+      <number>30</number>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="3">
+    <widget class="QPushButton" name="pushButtonConfigureKeyboard">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Configure</string>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Joystick:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="3">
-    <widget class="QPushButton" name="pushButtonJoystick4">
-     <property name="text">
-      <string>Joystick 4...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
+    <widget class="QLabel" name="labelMouse">
      <property name="text">
       <string>Mouse:</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="2">
-    <widget class="QPushButton" name="pushButtonJoystick3">
-     <property name="text">
-      <string>Joystick 3...</string>
+   <item row="1" column="1" colspan="2">
+    <widget class="QComboBox" name="comboBoxMouse">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maxVisibleItems">
+      <number>30</number>
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="0">
-    <widget class="QPushButton" name="pushButtonJoystick1">
-     <property name="text">
-      <string>Joystick 1...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="3">
+   <item row="1" column="3">
     <widget class="QPushButton" name="pushButtonConfigureMouse">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -94,26 +89,94 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1" colspan="2">
-    <widget class="QComboBox" name="comboBoxMouse">
-     <property name="maxVisibleItems">
-      <number>30</number>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+   <item row="2" column="0">
+    <widget class="QLabel" name="labelJoystick0">
+     <property name="text">
+      <string>Joystick:</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" colspan="2">
-    <widget class="QComboBox" name="comboBoxJoystick">
+   <item row="2" column="1" colspan="2">
+    <widget class="QComboBox" name="comboBoxJoystick0">
      <property name="maxVisibleItems">
       <number>30</number>
      </property>
     </widget>
    </item>
+   <item row="3" column="0">
+    <widget class="QPushButton" name="pushButtonJoystick01">
+     <property name="text">
+      <string>Joystick 1...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QPushButton" name="pushButtonJoystick02">
+     <property name="text">
+      <string>Joystick 2...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="2">
+    <widget class="QPushButton" name="pushButtonJoystick03">
+     <property name="text">
+      <string>Joystick 3...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="3">
+    <widget class="QPushButton" name="pushButtonJoystick04">
+     <property name="text">
+      <string>Joystick 4...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="labelKeys">
+     <property name="text">
+      <string>Key Bindings:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="4">
+    <widget class="QTableWidget" name="tableKeys">
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="tabKeyNavigation">
+      <bool>false</bool>
+     </property>
+     <property name="showDropIndicator" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectRows</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="2">
+    <widget class="QPushButton" name="pushButtonClearBind">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string>Clear binding</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="3">
+    <widget class="QPushButton" name="pushButtonBind">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string>Bind</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/qt/qt_settingsmachine.cpp b/src/qt/qt_settingsmachine.cpp
index 475730db9..e52553196 100644
--- a/src/qt/qt_settingsmachine.cpp
+++ b/src/qt/qt_settingsmachine.cpp
@@ -32,13 +32,9 @@ extern "C" {
 #include <86box/config.h>
 #include <86box/device.h>
 #include <86box/machine.h>
+#include <86box/nvr.h>
 }
 
-// from nvr.h, which we can't import into CPP code
-#define TIME_SYNC_DISABLED 0
-#define TIME_SYNC_ENABLED  1
-#define TIME_SYNC_UTC      2
-
 #include "qt_deviceconfig.hpp"
 #include "qt_models_common.hpp"
 
@@ -61,6 +57,11 @@ SettingsMachine::SettingsMachine(QWidget *parent)
             break;
     }
 
+    auto warning_icon = QIcon(":/misc/qt/icons/warning.ico");
+    ui->softFloatWarningIcon->setPixmap(warning_icon.pixmap(warning_icon.actualSize(QSize(16, 16))));
+    ui->softFloatWarningIcon->setVisible(false);
+    ui->softFloatWarningText->setVisible(false);
+
     auto *waitStatesModel = ui->comboBoxWaitStates->model();
     waitStatesModel->insertRows(0, 9);
     auto idx = waitStatesModel->index(0, 0);
@@ -68,7 +69,7 @@ SettingsMachine::SettingsMachine(QWidget *parent)
     waitStatesModel->setData(idx, 0, Qt::UserRole);
     for (int i = 0; i < 8; ++i) {
         idx = waitStatesModel->index(i + 1, 0);
-        waitStatesModel->setData(idx, QString::asprintf(tr("%i Wait state(s)").toUtf8().constData(), i), Qt::DisplayRole);
+        waitStatesModel->setData(idx, tr("%1 Wait state(s)").arg(i), Qt::DisplayRole);
         waitStatesModel->setData(idx, i + 1, Qt::UserRole);
     }
 
@@ -87,24 +88,38 @@ SettingsMachine::SettingsMachine(QWidget *parent)
     ui->comboBoxPitMode->setCurrentIndex(-1);
     ui->comboBoxPitMode->setCurrentIndex(pit_mode + 1);
 
-    int   selectedMachineType = 0;
-    auto *machineTypesModel   = ui->comboBoxMachineType->model();
-    for (int i = 1; i < MACHINE_TYPE_MAX; ++i) {
-        int j = 0;
-        while (machine_get_internal_name_ex(j) != nullptr) {
-            if (machine_available(j) && (machine_get_type(j) == i)) {
+    int         selectedMachineType = 0;
+    auto *      machineTypesModel   = ui->comboBoxMachineType->model();
+    int         i                   = -1;
+    int         j                   = 0;
+    int         cur_j               = 0;
+    const void *miname;
+    do {
+        miname = machine_get_internal_name_ex(j);
+
+        if ((miname == nullptr) || (machine_get_type(j) != i)) {
+            if ((i != -1) && (cur_j != 0)) {
                 int row = Models::AddEntry(machineTypesModel, machine_types[i].name, machine_types[i].id);
                 if (machine_types[i].id == machine_get_type(machine))
                     selectedMachineType = row;
-                break;
             }
-            j++;
+
+            i = machine_get_type(j);
+            cur_j = 0;
         }
-    }
+
+        if (machine_available(j))
+            cur_j++;
+
+        j++;
+    } while (miname != nullptr);
 
     ui->comboBoxMachineType->setCurrentIndex(-1);
     ui->comboBoxMachineType->setCurrentIndex(selectedMachineType);
 
+    ui->radioButtonLargerFrames->setChecked(force_10ms);
+    ui->radioButtonSmallerFrames->setChecked(!force_10ms);
+
 #ifndef USE_DYNAREC
     ui->checkBoxDynamicRecompiler->setEnabled(false);
     ui->checkBoxDynamicRecompiler->setVisible(false);
@@ -125,6 +140,7 @@ SettingsMachine::save()
     fpu_type        = ui->comboBoxFPU->currentData().toInt();
     cpu_use_dynarec = ui->checkBoxDynamicRecompiler->isChecked() ? 1 : 0;
     fpu_softfloat   = ui->checkBoxFPUSoftfloat->isChecked() ? 1 : 0;
+    force_10ms      = ui->radioButtonLargerFrames->isChecked() ? 1 : 0;
 
     int64_t temp_mem_size;
     if (machine_get_ram_granularity(machine) < 1024)
@@ -265,7 +281,7 @@ SettingsMachine::on_comboBoxSpeed_currentIndexChanged(int index)
         int         cpuId       = ui->comboBoxSpeed->currentData().toInt();
         uint        cpuType     = cpuFamily->cpus[cpuId].cpu_type;
 
-        if ((cpuType >= CPU_286) && (cpuType <= CPU_386DX)) {
+        if ((cpuType >= CPU_286) && (cpuType < CPU_386DX)) {
             ui->comboBoxWaitStates->setEnabled(true);
             ui->comboBoxWaitStates->setCurrentIndex(cpu_waitstates);
         } else {
@@ -296,7 +312,7 @@ SettingsMachine::on_comboBoxSpeed_currentIndexChanged(int index)
         for (const char *fpuName = fpu_get_name_from_index(cpuFamily, cpuId, i);
              fpuName != nullptr; fpuName = fpu_get_name_from_index(cpuFamily, cpuId, ++i)) {
             auto fpuType = fpu_get_type_from_index(cpuFamily, cpuId, i);
-            Models::AddEntry(modelFpu, QString("%1").arg(fpuName), fpuType);
+            Models::AddEntry(modelFpu, tr(QString("%1").arg(fpuName).toUtf8().data()), fpuType);
             if (fpu_type == fpuType)
                 selectedFpuRow = i;
         }
@@ -335,5 +351,27 @@ SettingsMachine::on_pushButtonConfigure_clicked()
     // deviceconfig_inst_open
     int         machineId = ui->comboBoxMachine->currentData().toInt();
     const auto *device    = machine_get_device(machineId);
-    DeviceConfig::ConfigureDevice(device, 0, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(device);
 }
+
+void SettingsMachine::on_checkBoxFPUSoftfloat_stateChanged(int state) {
+    if(state == Qt::Checked) {
+        ui->softFloatWarningIcon->setVisible(true);
+        ui->softFloatWarningText->setVisible(true);
+    } else {
+        ui->softFloatWarningIcon->setVisible(false);
+        ui->softFloatWarningText->setVisible(false);
+    }
+}
+
+void SettingsMachine::on_radioButtonSmallerFrames_clicked()
+{
+    ui->radioButtonLargerFrames->setChecked(false);
+}
+
+
+void SettingsMachine::on_radioButtonLargerFrames_clicked()
+{
+    ui->radioButtonSmallerFrames->setChecked(false);
+}
+
diff --git a/src/qt/qt_settingsmachine.hpp b/src/qt/qt_settingsmachine.hpp
index 9d0ec62ff..36ece7f18 100644
--- a/src/qt/qt_settingsmachine.hpp
+++ b/src/qt/qt_settingsmachine.hpp
@@ -18,23 +18,19 @@ public:
 
 signals:
     void currentMachineChanged(int machineId);
+
 private slots:
     void on_pushButtonConfigure_clicked();
-
-private slots:
     void on_comboBoxFPU_currentIndexChanged(int index);
-
-private slots:
     void on_comboBoxSpeed_currentIndexChanged(int index);
-
-private slots:
     void on_comboBoxCPU_currentIndexChanged(int index);
-
-private slots:
     void on_comboBoxMachine_currentIndexChanged(int index);
-
-private slots:
     void on_comboBoxMachineType_currentIndexChanged(int index);
+    void on_checkBoxFPUSoftfloat_stateChanged(int state);
+
+    void on_radioButtonSmallerFrames_clicked();
+
+    void on_radioButtonLargerFrames_clicked();
 
 private:
     Ui::SettingsMachine *ui;
diff --git a/src/qt/qt_settingsmachine.ui b/src/qt/qt_settingsmachine.ui
index 54bc06f5c..7ed70a5cf 100644
--- a/src/qt/qt_settingsmachine.ui
+++ b/src/qt/qt_settingsmachine.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>458</width>
-    <height>434</height>
+    <height>459</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -41,10 +41,10 @@
       <property name="bottomMargin">
        <number>0</number>
       </property>
-      <item row="4" column="0">
-       <widget class="QLabel" name="label_5">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label">
         <property name="text">
-         <string>Wait states:</string>
+         <string>Machine type:</string>
         </property>
        </widget>
       </item>
@@ -55,139 +55,10 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="label_6">
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_2">
         <property name="text">
-         <string>Memory:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QComboBox" name="comboBoxFPU">
-        <property name="maxVisibleItems">
-         <number>30</number>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="QWidget" name="widget_4" native="true">
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QComboBox" name="comboBoxWaitStates">
-           <property name="maxVisibleItems">
-            <number>30</number>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="label_8">
-           <property name="text">
-            <string>PIT mode:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBoxPitMode">
-           <property name="maxVisibleItems">
-            <number>30</number>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>CPU type:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QWidget" name="widget_2" native="true">
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QComboBox" name="comboBoxCPU">
-           <property name="maxVisibleItems">
-            <number>30</number>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="label_7">
-           <property name="text">
-            <string>Frequency:</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBoxSpeed">
-           <property name="maxVisibleItems">
-            <number>30</number>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="5" column="1">
-       <widget class="QSpinBox" name="spinBoxRAM">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+         <string>Machine:</string>
         </property>
        </widget>
       </item>
@@ -229,18 +100,65 @@
         </layout>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label">
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_3">
         <property name="text">
-         <string>Machine type:</string>
+         <string>CPU type:</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Machine:</string>
-        </property>
+      <item row="2" column="1">
+       <widget class="QWidget" name="widget_2" native="true">
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QComboBox" name="comboBoxCPU">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="maxVisibleItems">
+            <number>30</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_7">
+           <property name="text">
+            <string>Frequency:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBoxSpeed">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="maxVisibleItems">
+            <number>30</number>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
       <item row="3" column="0">
@@ -250,71 +168,250 @@
         </property>
        </widget>
       </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="checkBoxDynamicRecompiler">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-       <horstretch>2</horstretch>
-       <verstretch>2</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Dynamic Recompiler</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="checkBoxFPUSoftfloat">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-       <horstretch>3</horstretch>
-       <verstretch>3</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Softfloat FPU</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Time synchronization</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="QRadioButton" name="radioButtonDisabled">
-        <property name="text">
-         <string>Disabled</string>
+      <item row="3" column="1">
+       <widget class="QComboBox" name="comboBoxFPU">
+        <property name="maxVisibleItems">
+         <number>30</number>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QRadioButton" name="radioButtonLocalTime">
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_5">
         <property name="text">
-         <string>Enabled (local time)</string>
+         <string>Wait states:</string>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QRadioButton" name="radioButtonUTC">
+      <item row="4" column="1">
+       <widget class="QWidget" name="widget_4" native="true">
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QComboBox" name="comboBoxWaitStates">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="maxVisibleItems">
+            <number>30</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_8">
+           <property name="text">
+            <string>PIT mode:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBoxPitMode">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="maxVisibleItems">
+            <number>30</number>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QLabel" name="label_6">
         <property name="text">
-         <string>Enabled (UTC)</string>
+         <string>Memory:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <widget class="QSpinBox" name="spinBoxRAM">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="dynamicRecompilerLayout">
+     <item>
+      <widget class="QCheckBox" name="checkBoxDynamicRecompiler">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <horstretch>2</horstretch>
+         <verstretch>2</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Dynamic Recompiler</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="softFloatLayout">
+     <item>
+      <widget class="QCheckBox" name="checkBoxFPUSoftfloat">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>3</horstretch>
+         <verstretch>3</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Softfloat FPU</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="softFloatWarningIcon">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="softFloatWarningText">
+       <property name="text">
+        <string>High performance impact</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="softFloatHorizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QGridLayout" name="gridLayout_2">
+     <item row="0" column="0">
+      <widget class="QGroupBox" name="groupBox_2">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="title">
+        <string>CPU frame size</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="QRadioButton" name="radioButtonLargerFrames">
+          <property name="text">
+           <string>Larger frames (less smooth)</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="radioButtonSmallerFrames">
+          <property name="text">
+           <string>Smaller frames (smoother)</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="0">
+      <widget class="QGroupBox" name="groupBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="title">
+        <string>Time synchronization</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QRadioButton" name="radioButtonDisabled">
+          <property name="text">
+           <string>Disabled</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="radioButtonLocalTime">
+          <property name="text">
+           <string>Enabled (local time)</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="radioButtonUTC">
+          <property name="text">
+           <string>Enabled (UTC)</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
@@ -330,6 +427,24 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>comboBoxMachineType</tabstop>
+  <tabstop>comboBoxMachine</tabstop>
+  <tabstop>pushButtonConfigure</tabstop>
+  <tabstop>comboBoxCPU</tabstop>
+  <tabstop>comboBoxSpeed</tabstop>
+  <tabstop>comboBoxFPU</tabstop>
+  <tabstop>comboBoxWaitStates</tabstop>
+  <tabstop>comboBoxPitMode</tabstop>
+  <tabstop>spinBoxRAM</tabstop>
+  <tabstop>checkBoxDynamicRecompiler</tabstop>
+  <tabstop>checkBoxFPUSoftfloat</tabstop>
+  <tabstop>radioButtonDisabled</tabstop>
+  <tabstop>radioButtonLocalTime</tabstop>
+  <tabstop>radioButtonUTC</tabstop>
+  <tabstop>radioButtonLargerFrames</tabstop>
+  <tabstop>radioButtonSmallerFrames</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/qt/qt_settingsnetwork.cpp b/src/qt/qt_settingsnetwork.cpp
index 2aa3705fd..cf07234e5 100644
--- a/src/qt/qt_settingsnetwork.cpp
+++ b/src/qt/qt_settingsnetwork.cpp
@@ -35,25 +35,147 @@ SettingsNetwork::enableElements(Ui::SettingsNetwork *ui)
     for (int i = 0; i < NET_CARD_MAX; ++i) {
         auto *nic_cbox      = findChild<QComboBox *>(QString("comboBoxNIC%1").arg(i + 1));
         auto *net_type_cbox = findChild<QComboBox *>(QString("comboBoxNet%1").arg(i + 1));
-        auto *intf_cbox     = findChild<QComboBox *>(QString("comboBoxIntf%1").arg(i + 1));
+
+        auto *intf_label = findChild<QLabel *>(QString("labelIntf%1").arg(i + 1));
+        auto *intf_cbox  = findChild<QComboBox *>(QString("comboBoxIntf%1").arg(i + 1));
+
         auto *conf_btn      = findChild<QPushButton *>(QString("pushButtonConf%1").arg(i + 1));
-        auto *socket_line   = findChild<QLineEdit *>(QString("socketVDENIC%1").arg(i + 1));
+//        auto *net_type_conf_btn      = findChild<QPushButton *>(QString("pushButtonNetTypeConf%1").arg(i + 1));
 
-        int  netType         = net_type_cbox->currentData().toInt();
-        bool adaptersEnabled =  netType == NET_TYPE_NONE
-                            ||  netType == NET_TYPE_SLIRP
-                            ||  netType == NET_TYPE_VDE
-                            || (netType == NET_TYPE_PCAP && intf_cbox->currentData().toInt() > 0);
+        auto *vde_socket_label = findChild<QLabel *>(QString("labelSocketVDENIC%1").arg(i + 1));
+        auto *socket_line      = findChild<QLineEdit *>(QString("socketVDENIC%1").arg(i + 1));
 
+        auto *bridge_label = findChild<QLabel *>(QString("labelBridgeTAPNIC%1").arg(i + 1));
+        auto *bridge_line  = findChild<QLineEdit *>(QString("bridgeTAPNIC%1").arg(i + 1));
+
+        auto *option_list_label = findChild<QLabel *>(QString("labelOptionList%1").arg(i + 1));
+        auto *option_list_line  = findChild<QWidget *>(QString("lineOptionList%1").arg(i + 1));
+
+        // Switch group
+        auto *switch_group_label = findChild<QLabel *>(QString("labelSwitch%1").arg(i + 1));
+//        auto *switch_group_hlayout = findChild<QHBoxLayout *>(QString("HLayoutSwitch%1").arg(i + 1));
+//        auto *switch_group_hspacer = findChild<QWidget *>(QString("horizontalSpacerSwitch%1").arg(i + 1));
+        auto *switch_group_value = findChild<QSpinBox *>(QString("spinnerSwitch%1").arg(i + 1));
+        switch_group_value->setMinimum(1);
+        switch_group_value->setMaximum(10);
+
+        // Promiscuous option
+        auto *promisc_label  = findChild<QLabel *>(QString("labelPromisc%1").arg(i + 1));
+        auto *promisc_value = findChild<QCheckBox *>(QString("boxPromisc%1").arg(i + 1));
+
+        // Remote switch hostname
+        auto *hostname_label = findChild<QLabel *>(QString("labelHostname%1").arg(i + 1));
+        auto *hostname_value = findChild<QLineEdit *>(QString("hostnameSwitch%1").arg(i + 1));
+
+        bridge_line->setEnabled(net_type_cbox->currentData().toInt() == NET_TYPE_TAP);
         intf_cbox->setEnabled(net_type_cbox->currentData().toInt() == NET_TYPE_PCAP);
-        nic_cbox->setEnabled(adaptersEnabled);
-        int netCard = nic_cbox->currentData().toInt();
-        if ((i == 0) && (netCard == NET_INTERNAL))
-            conf_btn->setEnabled(adaptersEnabled && machine_has_flags(machineId, MACHINE_NIC) &&
-                                 device_has_config(machine_get_net_device(machineId)));
-        else
-            conf_btn->setEnabled(adaptersEnabled && network_card_has_config(nic_cbox->currentData().toInt()));
-        socket_line->setEnabled(net_type_cbox->currentData().toInt() == NET_TYPE_VDE);
+        conf_btn->setEnabled(network_card_has_config(nic_cbox->currentData().toInt()));
+//        net_type_conf_btn->setEnabled(network_type_has_config(netType));
+
+        // NEW STUFF
+        // Make all options invisible by default
+
+        // Switch group
+        switch_group_label->setVisible(false);
+        switch_group_value->setVisible(false);
+//        switch_group_hspacer->setVisible(false);
+
+        // Promiscuous options
+        promisc_label->setVisible(false);
+        promisc_value->setVisible(false);
+
+        // Hostname
+        hostname_label->setVisible(false);
+        hostname_value->setVisible(false);
+
+        // Option list label and line
+        option_list_label->setVisible(false);
+        option_list_line->setVisible(false);
+
+        // VDE
+        vde_socket_label->setVisible(false);
+        socket_line->setVisible(false);
+
+        // TAP
+        bridge_label->setVisible(false);
+        bridge_line->setVisible(false);
+
+        // PCAP
+        intf_cbox->setVisible(false);
+        intf_label->setVisible(false);
+
+        // Don't enable anything unless there's a nic selected
+        if(nic_cbox->currentData().toInt() != 0) {
+            // Then only enable as needed based on network type
+            switch (net_type_cbox->currentData().toInt()) {
+#ifdef HAS_VDE
+                case NET_TYPE_VDE:
+                    // option_list_label->setText("VDE Options");
+                    option_list_label->setVisible(true);
+                    option_list_line->setVisible(true);
+
+                    vde_socket_label->setVisible(true);
+                    socket_line->setVisible(true);
+                    break;
+#endif
+
+                case NET_TYPE_PCAP:
+                    // option_list_label->setText("PCAP Options");
+                    option_list_label->setVisible(true);
+                    option_list_line->setVisible(true);
+
+                    intf_cbox->setVisible(true);
+                    intf_label->setVisible(true);
+                    break;
+
+#if defined(__unix__) || defined(__APPLE__)
+                case NET_TYPE_TAP:
+                    // option_list_label->setText("TAP Options");
+                    option_list_label->setVisible(true);
+                    option_list_line->setVisible(true);
+
+                    bridge_label->setVisible(true);
+                    bridge_line->setVisible(true);
+                    break;
+#endif
+
+#ifdef USE_NETSWITCH
+                    case NET_TYPE_NMSWITCH:
+//                    option_list_label->setText("Local Switch Options");
+                    option_list_label->setVisible(true);
+                    option_list_line->setVisible(true);
+
+                    // Switch group
+                    switch_group_label->setVisible(true);
+                    switch_group_value->setVisible(true);
+//                    switch_group_hspacer->setVisible(false);
+
+                    // Promiscuous options
+                    promisc_label->setVisible(true);
+                    promisc_value->setVisible(true);
+                    break;
+
+                case NET_TYPE_NRSWITCH:
+//                    option_list_label->setText("Remote Switch Options");
+                    option_list_label->setVisible(true);
+                    option_list_line->setVisible(true);
+
+                    // Switch group
+                    switch_group_label->setVisible(true);
+                    switch_group_value->setVisible(true);
+//                    switch_group_hspacer->setVisible(false);
+
+                    // Hostname
+                    hostname_label->setVisible(true);
+                    hostname_value->setVisible(true);
+                    break;
+#endif /* USE_NETSWITCH */
+
+                case NET_TYPE_SLIRP:
+                default:
+                    break;
+            }
+        }
     }
 }
 
@@ -85,17 +207,42 @@ SettingsNetwork::save()
 {
     for (int i = 0; i < NET_CARD_MAX; ++i) {
         auto *cbox                   = findChild<QComboBox *>(QString("comboBoxNIC%1").arg(i + 1));
+#ifdef HAS_VDE
         auto *socket_line            = findChild<QLineEdit *>(QString("socketVDENIC%1").arg(i + 1));
+#endif
+#if defined(__unix__) || defined(__APPLE__)
+        auto *bridge_line            = findChild<QLineEdit *>(QString("bridgeTAPNIC%1").arg(i + 1));
+#endif
         net_cards_conf[i].device_num = cbox->currentData().toInt();
         cbox                         = findChild<QComboBox *>(QString("comboBoxNet%1").arg(i + 1));
         net_cards_conf[i].net_type   = cbox->currentData().toInt();
         cbox                         = findChild<QComboBox *>(QString("comboBoxIntf%1").arg(i + 1));
+#ifdef USE_NETSWITCH
+        auto *hostname_value         = findChild<QLineEdit *>(QString("hostnameSwitch%1").arg(i + 1));
+        auto *promisc_value          = findChild<QCheckBox *>(QString("boxPromisc%1").arg(i + 1));
+        auto *switch_group_value     = findChild<QSpinBox *>(QString("spinnerSwitch%1").arg(i + 1));
+#endif /* USE_NETSWITCH */
         memset(net_cards_conf[i].host_dev_name, '\0', sizeof(net_cards_conf[i].host_dev_name));
-        if (net_cards_conf[i].net_type == NET_TYPE_PCAP) {
+        if (net_cards_conf[i].net_type == NET_TYPE_PCAP)
             strncpy(net_cards_conf[i].host_dev_name, network_devs[cbox->currentData().toInt()].device, sizeof(net_cards_conf[i].host_dev_name) - 1);
-        } else if (net_cards_conf[i].net_type == NET_TYPE_VDE) {
+#ifdef HAS_VDE
+        else if (net_cards_conf[i].net_type == NET_TYPE_VDE)
             strncpy(net_cards_conf[i].host_dev_name, socket_line->text().toUtf8().constData(), sizeof(net_cards_conf[i].host_dev_name));
+#endif
+#if defined(__unix__) || defined(__APPLE__)
+        else if (net_cards_conf[i].net_type == NET_TYPE_TAP)
+            strncpy(net_cards_conf[i].host_dev_name, bridge_line->text().toUtf8().constData(), sizeof(net_cards_conf[i].host_dev_name));
+#endif
+#ifdef USE_NETSWITCH
+        else if (net_cards_conf[i].net_type == NET_TYPE_NRSWITCH) {
+            memset(net_cards_conf[i].nrs_hostname, '\0', sizeof(net_cards_conf[i].nrs_hostname));
+            strncpy(net_cards_conf[i].nrs_hostname, hostname_value->text().toUtf8().constData(), sizeof(net_cards_conf[i].nrs_hostname) - 1);
+            net_cards_conf[i].switch_group = switch_group_value->value() - 1;
+        } else if (net_cards_conf[i].net_type == NET_TYPE_NMSWITCH) {
+            net_cards_conf[i].promisc_mode = promisc_value->isChecked();
+            net_cards_conf[i].switch_group = switch_group_value->value() - 1;
         }
+#endif /* USE_NETSWITCH */
     }
 }
 
@@ -104,57 +251,79 @@ SettingsNetwork::onCurrentMachineChanged(int machineId)
 {
     this->machineId = machineId;
 
-    int c           = 0;
-    int selectedRow = 0;
+    int                 c                           = 0;
+    int                 selectedRow                 = 0;
 
-    for (int i = 0; i < NET_CARD_MAX; ++i) {
-        auto *cbox       = findChild<QComboBox *>(QString("comboBoxNIC%1").arg(i + 1));
-        auto *model      = cbox->model();
-        auto  removeRows = model->rowCount();
-        c                = 0;
-        selectedRow      = 0;
+    // Network Card
+    QComboBox          *cbox_[NET_CARD_MAX]         = { 0 };
+    QAbstractItemModel *models[NET_CARD_MAX]        = { 0 };
+    int                 removeRows_[NET_CARD_MAX]   = { 0 };
+    int                 selectedRows[NET_CARD_MAX]  = { 0 };
+    int                 m_has_net                   = machine_has_flags(machineId, MACHINE_NIC);
 
-        while (true) {
-            /* Skip "internal" if machine doesn't have it or this is not the primary card. */
-            if ((c == 1) && ((i > 0) || (machine_has_flags(machineId, MACHINE_NIC) == 0))) {
-                c++;
-                continue;
-            }
+    for (uint8_t i = 0; i < NET_CARD_MAX; ++i) {
+        cbox_[i]       = findChild<QComboBox *>(QString("comboBoxNIC%1").arg(i + 1));
+        models[i]      = cbox_[i]->model();
+        removeRows_[i] = models[i]->rowCount();
+    }
 
-            auto name = DeviceConfig::DeviceName(network_card_getdevice(c), network_card_get_internal_name(c), 1);
-            if (name.isEmpty()) {
-                break;
-            }
+    c = 0;
+    while (true) {
+        const QString name = DeviceConfig::DeviceName(network_card_getdevice(c),
+                                                      network_card_get_internal_name(c), 1);
 
-            if (network_card_available(c) && device_is_valid(network_card_getdevice(c), machineId)) {
-                int row = Models::AddEntry(model, name, c);
-                if (c == net_cards_conf[i].device_num) {
-                    selectedRow = row - removeRows;
+        if (name.isEmpty())
+            break;
+
+        if (network_card_available(c)) {
+            if (device_is_valid(network_card_getdevice(c), machineId)) {
+                for (uint8_t i = 0; i < NET_CARD_MAX; ++i) {
+                    if ((c != 1) || ((i == 0) && m_has_net)) {
+                        int row = Models::AddEntry(models[i], name, c);
+
+                        if (c == net_cards_conf[i].device_num)
+                            selectedRows[i] = row - removeRows_[i];
+                    }
                 }
             }
-            c++;
         }
 
-        model->removeRows(0, removeRows);
-        cbox->setEnabled(model->rowCount() > 0);
-        cbox->setCurrentIndex(-1);
-        cbox->setCurrentIndex(selectedRow);
+       c++;
+    }
 
-        cbox       = findChild<QComboBox *>(QString("comboBoxNet%1").arg(i + 1));
-        model      = cbox->model();
-        removeRows = model->rowCount();
+    for (uint8_t i = 0; i < NET_CARD_MAX; ++i) {
+        models[i]->removeRows(0, removeRows_[i]);
+        cbox_[i]->setEnabled(models[i]->rowCount() > 1);
+        cbox_[i]->setCurrentIndex(-1);
+        cbox_[i]->setCurrentIndex(selectedRows[i]);
+
+        auto cbox       = findChild<QComboBox *>(QString("comboBoxNet%1").arg(i + 1));
+        auto model      = cbox->model();
+        auto removeRows = model->rowCount();
         Models::AddEntry(model, tr("Null Driver"), NET_TYPE_NONE);
         Models::AddEntry(model, "SLiRP", NET_TYPE_SLIRP);
 
-        if (network_ndev > 1) {
+        if (network_ndev > 1)
             Models::AddEntry(model, "PCap", NET_TYPE_PCAP);
-        }
-        if (network_devmap.has_vde) {
+
+#ifdef HAS_VDE
+        if (network_devmap.has_vde)
             Models::AddEntry(model, "VDE", NET_TYPE_VDE);
-        }
+#endif
         
+#if defined(__unix__) || defined(__APPLE__)
+        Models::AddEntry(model, "TAP", NET_TYPE_TAP);
+#endif
+
+#ifdef USE_NETSWITCH
+        Models::AddEntry(model, "Local Switch", NET_TYPE_NMSWITCH);
+#ifdef ENABLE_NET_NRSWITCH
+        Models::AddEntry(model, "Remote Switch", NET_TYPE_NRSWITCH);
+#endif /* ENABLE_NET_NRSWITCH */
+#endif /* USE_NETSWITCH */
+
         model->removeRows(0, removeRows);
-        cbox->setCurrentIndex(net_cards_conf[i].net_type);
+        cbox->setCurrentIndex(cbox->findData(net_cards_conf[i].net_type));
 
         selectedRow = 0;
 
@@ -171,11 +340,34 @@ SettingsNetwork::onCurrentMachineChanged(int machineId)
             }
             model->removeRows(0, removeRows);
             cbox->setCurrentIndex(selectedRow);
-        }  
+        }
+
         if (net_cards_conf[i].net_type == NET_TYPE_VDE) {
+#ifdef HAS_VDE
             QString currentVdeSocket = net_cards_conf[i].host_dev_name;
             auto editline = findChild<QLineEdit *>(QString("socketVDENIC%1").arg(i+1));
             editline->setText(currentVdeSocket);
+#else
+            ;
+#endif
+#if defined(__unix__) || defined(__APPLE__)
+        } else if (net_cards_conf[i].net_type == NET_TYPE_TAP) {
+            QString currentTapDevice = net_cards_conf[i].host_dev_name;
+            auto editline = findChild<QLineEdit *>(QString("bridgeTAPNIC%1").arg(i+1));
+            editline->setText(currentTapDevice);
+#endif
+#ifdef USE_NETSWITCH
+        } else if (net_cards_conf[i].net_type == NET_TYPE_NMSWITCH) {
+            auto *promisc_value = findChild<QCheckBox *>(QString("boxPromisc%1").arg(i + 1));
+            promisc_value->setCheckState(net_cards_conf[i].promisc_mode == 1 ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
+            auto *switch_group_value = findChild<QSpinBox *>(QString("spinnerSwitch%1").arg(i + 1));
+            switch_group_value->setValue(net_cards_conf[i].switch_group + 1);
+        } else if (net_cards_conf[i].net_type == NET_TYPE_NRSWITCH) {
+            auto *hostname_value = findChild<QLineEdit *>(QString("hostnameSwitch%1").arg(i + 1));
+            hostname_value->setText(net_cards_conf[i].nrs_hostname);
+            auto *switch_group_value = findChild<QSpinBox *>(QString("spinnerSwitch%1").arg(i + 1));
+            switch_group_value->setValue(net_cards_conf[i].switch_group + 1);
+#endif /* USE_NETSWITCH */
         }
     }
 }
@@ -183,9 +375,8 @@ SettingsNetwork::onCurrentMachineChanged(int machineId)
 void
 SettingsNetwork::on_comboIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
 
     enableElements(ui);
 }
@@ -193,33 +384,33 @@ SettingsNetwork::on_comboIndexChanged(int index)
 void
 SettingsNetwork::on_pushButtonConf1_clicked()
 {
-    int netCard = ui->comboBoxNIC1->currentData().toInt();
-    auto *device = network_card_getdevice(netCard);
+    int   netCard = ui->comboBoxNIC1->currentData().toInt();
+    auto *device  = network_card_getdevice(netCard);
     if (netCard == NET_INTERNAL)
         device = machine_get_net_device(machineId);
-    DeviceConfig::ConfigureDevice(device, 1, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(device, 1);
 }
 
 void
 SettingsNetwork::on_pushButtonConf2_clicked()
 {
-    int netCard = ui->comboBoxNIC2->currentData().toInt();
-    auto *device = network_card_getdevice(netCard);
-    DeviceConfig::ConfigureDevice(device, 2, qobject_cast<Settings *>(Settings::settings));
+    int   netCard = ui->comboBoxNIC2->currentData().toInt();
+    auto *device  = network_card_getdevice(netCard);
+    DeviceConfig::ConfigureDevice(device, 2);
 }
 
 void
 SettingsNetwork::on_pushButtonConf3_clicked()
 {
-    int netCard = ui->comboBoxNIC3->currentData().toInt();
-    auto *device = network_card_getdevice(netCard);
-    DeviceConfig::ConfigureDevice(device, 3, qobject_cast<Settings *>(Settings::settings));
+    int   netCard = ui->comboBoxNIC3->currentData().toInt();
+    auto *device  = network_card_getdevice(netCard);
+    DeviceConfig::ConfigureDevice(device, 3);
 }
 
 void
 SettingsNetwork::on_pushButtonConf4_clicked()
 {
-    int netCard = ui->comboBoxNIC4->currentData().toInt();
-    auto *device = network_card_getdevice(netCard);
-    DeviceConfig::ConfigureDevice(device, 4, qobject_cast<Settings *>(Settings::settings));
+    int   netCard = ui->comboBoxNIC4->currentData().toInt();
+    auto *device  = network_card_getdevice(netCard);
+    DeviceConfig::ConfigureDevice(device, 4);
 }
diff --git a/src/qt/qt_settingsnetwork.ui b/src/qt/qt_settingsnetwork.ui
index 8f1eb5a79..767b4244d 100644
--- a/src/qt/qt_settingsnetwork.ui
+++ b/src/qt/qt_settingsnetwork.ui
@@ -27,17 +27,17 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QTabWidget" name="tabWidget">
+    <widget class="QTabWidget" name="tabWidgetNet">
      <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="tab_1">
+     <widget class="QWidget" name="tabNet1">
       <attribute name="title">
        <string>Network Card #1</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_3">
+      <layout class="QGridLayout" name="gridLayoutNet1">
        <item row="0" column="0">
-        <widget class="QLabel" name="label">
+        <widget class="QLabel" name="labelMode1">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -45,11 +45,11 @@
           </sizepolicy>
          </property>
          <property name="text">
-          <string>Mode</string>
+          <string>Mode:</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="1" colspan="2">
+       <item row="0" column="1">
         <widget class="QComboBox" name="comboBoxNet1">
          <property name="maxVisibleItems">
           <number>30</number>
@@ -63,7 +63,7 @@
         </widget>
        </item>
        <item row="1" column="0">
-        <widget class="QLabel" name="label_2">
+        <widget class="QLabel" name="labelAdapter1">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -71,41 +71,12 @@
           </sizepolicy>
          </property>
          <property name="text">
-          <string>Interface</string>
+          <string>Adapter:</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="1" colspan="2">
-        <widget class="QComboBox" name="comboBoxIntf1">
-         <property name="maxVisibleItems">
-          <number>30</number>
-         </property>
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_7">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Adapter</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
+       <item row="1" column="1">
         <widget class="QComboBox" name="comboBoxNIC1">
-         <property name="maxVisibleItems">
-          <number>30</number>
-         </property>
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
@@ -115,9 +86,12 @@
          <property name="sizeAdjustPolicy">
           <enum>QComboBox::AdjustToContents</enum>
          </property>
+         <property name="maxVisibleItems">
+          <number>30</number>
+         </property>
         </widget>
        </item>
-       <item row="2" column="2">
+       <item row="1" column="2">
         <widget class="QPushButton" name="pushButtonConf1">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -130,22 +104,135 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label_3">
+       <item row="2" column="0">
+        <widget class="QLabel" name="labelOptionList1">
          <property name="text">
-          <string>VDE Socket</string>
+          <string>Options</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="1" colspan="2">
+       <item row="2" column="1" colspan="2">
+        <widget class="Line" name="lineOptionList1">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="labelIntf1">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Interface:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QComboBox" name="comboBoxIntf1">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0">
+        <widget class="QLabel" name="labelSocketVDENIC1">
+         <property name="text">
+          <string>VDE Socket:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
         <widget class="QLineEdit" name="socketVDENIC1">
          <property name="maxLength">
           <number>127</number>
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
-        <spacer name="verticalSpacer">
+       <item row="6" column="0">
+        <widget class="QLabel" name="labelBridgeTAPNIC1">
+         <property name="text">
+          <string>TAP Bridge Device</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="1" colspan="2">
+        <widget class="QLineEdit" name="bridgeTAPNIC1">
+         <property name="maxLength">
+          <number>127</number>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="0">
+        <widget class="QLabel" name="labelSwitch1">
+         <property name="text">
+          <string>Switch:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="1">
+        <layout class="QHBoxLayout" name="HLayoutSwitch1">
+         <item>
+          <widget class="QSpinBox" name="spinnerSwitch1">
+           <property name="minimum">
+            <number>1</number>
+           </property>
+           <property name="maximum">
+            <number>10</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacerSwitch1">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item row="8" column="0">
+        <widget class="QLabel" name="labelPromisc1">
+         <property name="text">
+          <string>Hub Mode</string>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="1">
+        <widget class="QCheckBox" name="boxPromisc1">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="0">
+        <widget class="QLabel" name="labelHostname1">
+         <property name="text">
+          <string>Hostname:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="1">
+        <widget class="QLineEdit" name="hostnameSwitch1">
+         <property name="maxLength">
+          <number>128</number>
+         </property>
+        </widget>
+       </item>
+       <item row="10" column="1">
+        <spacer name="verticalSpacerNIC1">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
@@ -159,13 +246,13 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_2">
+     <widget class="QWidget" name="tabNet2">
       <attribute name="title">
        <string>Network Card #2</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout">
+      <layout class="QGridLayout" name="gridLayoutNet2">
        <item row="0" column="0">
-        <widget class="QLabel" name="label_8">
+        <widget class="QLabel" name="labelMode2">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -173,11 +260,11 @@
           </sizepolicy>
          </property>
          <property name="text">
-          <string>Mode</string>
+          <string>Mode:</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="1" colspan="2">
+       <item row="0" column="1">
         <widget class="QComboBox" name="comboBoxNet2">
          <property name="maxVisibleItems">
           <number>30</number>
@@ -191,7 +278,7 @@
         </widget>
        </item>
        <item row="1" column="0">
-        <widget class="QLabel" name="label_9">
+        <widget class="QLabel" name="labelAdapter2">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -199,41 +286,12 @@
           </sizepolicy>
          </property>
          <property name="text">
-          <string>Interface</string>
+          <string>Adapter:</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="1" colspan="2">
-        <widget class="QComboBox" name="comboBoxIntf2">
-         <property name="maxVisibleItems">
-          <number>30</number>
-         </property>
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_10">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Adapter</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
+       <item row="1" column="1">
         <widget class="QComboBox" name="comboBoxNIC2">
-         <property name="maxVisibleItems">
-          <number>30</number>
-         </property>
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
@@ -243,31 +301,153 @@
          <property name="sizeAdjustPolicy">
           <enum>QComboBox::AdjustToContents</enum>
          </property>
+         <property name="maxVisibleItems">
+          <number>30</number>
+         </property>
         </widget>
        </item>
-       <item row="2" column="2">
+       <item row="1" column="2">
         <widget class="QPushButton" name="pushButtonConf2">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>Configure</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label_4">
+       <item row="2" column="0">
+        <widget class="QLabel" name="labelOptionList2">
          <property name="text">
-          <string>VDE Socket</string>
+          <string>Options</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="1" colspan="2">
+       <item row="2" column="1" colspan="2">
+        <widget class="Line" name="lineOptionList2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="labelIntf2">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Interface:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QComboBox" name="comboBoxIntf2">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0">
+        <widget class="QLabel" name="labelSocketVDENIC2">
+         <property name="text">
+          <string>VDE Socket:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
         <widget class="QLineEdit" name="socketVDENIC2">
          <property name="maxLength">
           <number>127</number>
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
-        <spacer name="verticalSpacer_2">
+       <item row="6" column="0">
+        <widget class="QLabel" name="labelBridgeTAPNIC2">
+         <property name="text">
+          <string>TAP Bridge Device</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="1" colspan="2">
+        <widget class="QLineEdit" name="bridgeTAPNIC2">
+         <property name="maxLength">
+          <number>127</number>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="0">
+        <widget class="QLabel" name="labelSwitch2">
+         <property name="text">
+          <string>Switch:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="1">
+        <layout class="QHBoxLayout" name="HLayoutSwitch2">
+         <item>
+          <widget class="QSpinBox" name="spinnerSwitch2">
+           <property name="minimum">
+            <number>1</number>
+           </property>
+           <property name="maximum">
+            <number>10</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacerSwitch2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item row="8" column="0">
+        <widget class="QLabel" name="labelPromisc2">
+         <property name="text">
+          <string>Hub Mode</string>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="1">
+        <widget class="QCheckBox" name="boxPromisc2">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="0">
+        <widget class="QLabel" name="labelHostname2">
+         <property name="text">
+          <string>Hostname:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="1">
+        <widget class="QLineEdit" name="hostnameSwitch2">
+         <property name="maxLength">
+          <number>128</number>
+         </property>
+        </widget>
+       </item>
+       <item row="10" column="1">
+        <spacer name="verticalSpacerNIC2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
@@ -281,13 +461,13 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_3">
+     <widget class="QWidget" name="tabNet3">
       <attribute name="title">
        <string>Network Card #3</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_2">
+      <layout class="QGridLayout" name="gridLayoutNet3">
        <item row="0" column="0">
-        <widget class="QLabel" name="label_11">
+        <widget class="QLabel" name="labelMode3">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -295,11 +475,11 @@
           </sizepolicy>
          </property>
          <property name="text">
-          <string>Mode</string>
+          <string>Mode:</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="1" colspan="2">
+       <item row="0" column="1">
         <widget class="QComboBox" name="comboBoxNet3">
          <property name="maxVisibleItems">
           <number>30</number>
@@ -313,7 +493,7 @@
         </widget>
        </item>
        <item row="1" column="0">
-        <widget class="QLabel" name="label_12">
+        <widget class="QLabel" name="labelAdapter3">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -321,41 +501,12 @@
           </sizepolicy>
          </property>
          <property name="text">
-          <string>Interface</string>
+          <string>Adapter:</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="1" colspan="2">
-        <widget class="QComboBox" name="comboBoxIntf3">
-         <property name="maxVisibleItems">
-          <number>30</number>
-         </property>
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_13">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Adapter</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
+       <item row="1" column="1">
         <widget class="QComboBox" name="comboBoxNIC3">
-         <property name="maxVisibleItems">
-          <number>30</number>
-         </property>
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
@@ -365,9 +516,12 @@
          <property name="sizeAdjustPolicy">
           <enum>QComboBox::AdjustToContents</enum>
          </property>
+         <property name="maxVisibleItems">
+          <number>30</number>
+         </property>
         </widget>
        </item>
-       <item row="2" column="2">
+       <item row="1" column="2">
         <widget class="QPushButton" name="pushButtonConf3">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -380,22 +534,135 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label_5">
+       <item row="2" column="0">
+        <widget class="QLabel" name="labelOptionList3">
          <property name="text">
-          <string>VDE Socket</string>
+          <string>Options</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="1" colspan="2">
+       <item row="2" column="1" colspan="2">
+        <widget class="Line" name="lineOptionList3">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="labelIntf3">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Interface:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QComboBox" name="comboBoxIntf3">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0">
+        <widget class="QLabel" name="labelSocketVDENIC3">
+         <property name="text">
+          <string>VDE Socket:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
         <widget class="QLineEdit" name="socketVDENIC3">
          <property name="maxLength">
           <number>127</number>
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
-        <spacer name="verticalSpacer_3">
+       <item row="6" column="0">
+        <widget class="QLabel" name="labelBridgeTAPNIC3">
+         <property name="text">
+          <string>TAP Bridge Device</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="1" colspan="2">
+        <widget class="QLineEdit" name="bridgeTAPNIC3">
+         <property name="maxLength">
+          <number>127</number>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="0">
+        <widget class="QLabel" name="labelSwitch3">
+         <property name="text">
+          <string>Switch:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="1">
+        <layout class="QHBoxLayout" name="HLayoutSwitch3">
+         <item>
+          <widget class="QSpinBox" name="spinnerSwitch3">
+           <property name="minimum">
+            <number>1</number>
+           </property>
+           <property name="maximum">
+            <number>10</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacerSwitch3">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item row="8" column="0">
+        <widget class="QLabel" name="labelPromisc3">
+         <property name="text">
+          <string>Hub Mode</string>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="1">
+        <widget class="QCheckBox" name="boxPromisc3">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="0">
+        <widget class="QLabel" name="labelHostname3">
+         <property name="text">
+          <string>Hostname:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="1">
+        <widget class="QLineEdit" name="hostnameSwitch3">
+         <property name="maxLength">
+          <number>128</number>
+         </property>
+        </widget>
+       </item>
+       <item row="10" column="1">
+        <spacer name="verticalSpacerNIC3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
@@ -409,13 +676,13 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_4">
+     <widget class="QWidget" name="tabNet4">
       <attribute name="title">
        <string>Network Card #4</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_4">
+      <layout class="QGridLayout" name="gridLayoutNet4">
        <item row="0" column="0">
-        <widget class="QLabel" name="label_14">
+        <widget class="QLabel" name="labelMode4">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -423,11 +690,11 @@
           </sizepolicy>
          </property>
          <property name="text">
-          <string>Mode</string>
+          <string>Mode:</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="1" colspan="2">
+       <item row="0" column="1">
         <widget class="QComboBox" name="comboBoxNet4">
          <property name="maxVisibleItems">
           <number>30</number>
@@ -441,7 +708,7 @@
         </widget>
        </item>
        <item row="1" column="0">
-        <widget class="QLabel" name="label_15">
+        <widget class="QLabel" name="labelAdapter4">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -449,41 +716,12 @@
           </sizepolicy>
          </property>
          <property name="text">
-          <string>Interface</string>
+          <string>Adapter:</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="1" colspan="2">
-        <widget class="QComboBox" name="comboBoxIntf4">
-         <property name="maxVisibleItems">
-          <number>30</number>
-         </property>
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_16">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Adapter</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
+       <item row="1" column="1">
         <widget class="QComboBox" name="comboBoxNIC4">
-         <property name="maxVisibleItems">
-          <number>30</number>
-         </property>
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
@@ -493,9 +731,12 @@
          <property name="sizeAdjustPolicy">
           <enum>QComboBox::AdjustToContents</enum>
          </property>
+         <property name="maxVisibleItems">
+          <number>30</number>
+         </property>
         </widget>
        </item>
-       <item row="2" column="2">
+       <item row="1" column="2">
         <widget class="QPushButton" name="pushButtonConf4">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -508,22 +749,135 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="1" colspan="2">
+       <item row="2" column="0">
+        <widget class="QLabel" name="labelOptionList4">
+         <property name="text">
+          <string>Options</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1" colspan="2">
+        <widget class="Line" name="lineOptionList4">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="labelIntf4">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Interface:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QComboBox" name="comboBoxIntf4">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0">
+        <widget class="QLabel" name="labelSocketVDENIC4">
+         <property name="text">
+          <string>VDE Socket:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
         <widget class="QLineEdit" name="socketVDENIC4">
          <property name="maxLength">
           <number>127</number>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label_6">
+       <item row="6" column="0">
+        <widget class="QLabel" name="labelBridgeTAPNIC4">
          <property name="text">
-          <string>VDE Socket</string>
+          <string>TAP Bridge Device</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
-        <spacer name="verticalSpacer_4">
+       <item row="6" column="1" colspan="2">
+        <widget class="QLineEdit" name="bridgeTAPNIC4">
+         <property name="maxLength">
+          <number>127</number>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="0">
+        <widget class="QLabel" name="labelSwitch4">
+         <property name="text">
+          <string>Switch:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="1">
+        <layout class="QHBoxLayout" name="HLayoutSwitch4">
+         <item>
+          <widget class="QSpinBox" name="spinnerSwitch4">
+           <property name="minimum">
+            <number>1</number>
+           </property>
+           <property name="maximum">
+            <number>10</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacerSwitch4">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item row="8" column="0">
+        <widget class="QLabel" name="labelPromisc4">
+         <property name="text">
+          <string>Hub Mode</string>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="1">
+        <widget class="QCheckBox" name="boxPromisc4">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="0">
+        <widget class="QLabel" name="labelHostname4">
+         <property name="text">
+          <string>Hostname:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="1">
+        <widget class="QLineEdit" name="hostnameSwitch4">
+         <property name="maxLength">
+          <number>128</number>
+         </property>
+        </widget>
+       </item>
+       <item row="10" column="1">
+        <spacer name="verticalSpacerNIC4">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
diff --git a/src/qt/qt_settingsotherperipherals.cpp b/src/qt/qt_settingsotherperipherals.cpp
index f662b644c..0ecdc30d3 100644
--- a/src/qt/qt_settingsotherperipherals.cpp
+++ b/src/qt/qt_settingsotherperipherals.cpp
@@ -11,8 +11,10 @@
  *
  *
  * Authors: Joakim L. Gilje <jgilje@jgilje.net>
+ *          Jasmine Iwanek <jriwanek@gmail.com>
  *
  *          Copyright 2021 Joakim L. Gilje
+ *          Copyright 2025 Jasmine Iwanek
  */
 #include "qt_settingsotherperipherals.hpp"
 #include "ui_qt_settingsotherperipherals.h"
@@ -22,8 +24,10 @@ extern "C" {
 #include <86box/device.h>
 #include <86box/machine.h>
 #include <86box/isamem.h>
+#include <86box/isarom.h>
 #include <86box/isartc.h>
 #include <86box/unittester.h>
+#include <86box/novell_cardkey.h>
 }
 
 #include "qt_deviceconfig.hpp"
@@ -43,66 +47,131 @@ SettingsOtherPeripherals::onCurrentMachineChanged(int machineId)
     this->machineId = machineId;
 
     bool machineHasIsa = (machine_has_bus(machineId, MACHINE_BUS_ISA) > 0);
+
+    ui->pushButtonConfigureRTC->setEnabled(machineHasIsa);
+    ui->comboBoxRTC->setEnabled(machineHasIsa);
+    ui->checkBoxISABugger->setEnabled(machineHasIsa);
+    ui->pushButtonConfigureUT->setEnabled(unittester_enabled > 0);
+    ui->checkBoxKeyCard->setEnabled(machineHasIsa);
+    ui->pushButtonConfigureKeyCard->setEnabled(novell_keycard_enabled > 0);
+
     ui->checkBoxISABugger->setChecked((machineHasIsa && (bugger_enabled > 0)) ? true : false);
     ui->checkBoxPOSTCard->setChecked(postcard_enabled > 0 ? true : false);
     ui->checkBoxUnitTester->setChecked(unittester_enabled > 0 ? true : false);
-    ui->checkBoxISABugger->setEnabled(machineHasIsa);
-    ui->pushButtonConfigureUT->setEnabled(unittester_enabled > 0);
-    ui->comboBoxRTC->setEnabled(machineHasIsa);
-    ui->pushButtonConfigureRTC->setEnabled(machineHasIsa);
+    ui->checkBoxKeyCard->setChecked((machineHasIsa && (novell_keycard_enabled > 0)) ? true : false);
 
-    ui->comboBoxCard1->clear();
-    ui->comboBoxCard2->clear();
-    ui->comboBoxCard3->clear();
-    ui->comboBoxCard4->clear();
     ui->comboBoxRTC->clear();
 
-    auto *model       = ui->comboBoxRTC->model();
-    int   d           = 0;
+    for (uint8_t i = 0; i < ISAMEM_MAX; ++i)
+        if (auto *cb = findChild<QComboBox *>(QString("comboBoxIsaMemCard%1").arg(i + 1)))
+            cb->clear();
+
+    for (uint8_t i = 0; i < ISAROM_MAX; ++i)
+        if (auto *cb = findChild<QComboBox *>(QString("comboBoxIsaRomCard%1").arg(i + 1)))
+            cb->clear();
+
+    int   c           = 0;
     int   selectedRow = 0;
+
+    // ISA RTC Cards
+    auto *model = ui->comboBoxRTC->model();
     while (true) {
-        QString name = DeviceConfig::DeviceName(isartc_get_device(d), isartc_get_internal_name(d), 0);
-        if (name.isEmpty()) {
+        const QString name = DeviceConfig::DeviceName(isartc_get_device(c), isartc_get_internal_name(c), 0);
+        if (name.isEmpty())
             break;
-        }
 
-        if (!device_is_valid(isartc_get_device(d), machineId)) {
+        if (!device_is_valid(isartc_get_device(c), machineId))
             break;
-        }
 
-        int row = Models::AddEntry(model, name, d);
-        if (d == isartc_type) {
+        int row = Models::AddEntry(model, name, c);
+        if (c == isartc_type)
             selectedRow = row;
-        }
-        ++d;
+
+        ++c;
     }
     ui->comboBoxRTC->setCurrentIndex(selectedRow);
+    ui->pushButtonConfigureRTC->setEnabled((isartc_type != 0) && isartc_has_config(isartc_type) && machineHasIsa);
 
-    for (int c = 0; c < ISAMEM_MAX; c++) {
-        auto *cbox  = findChild<QComboBox *>(QString("comboBoxCard%1").arg(c + 1));
-        model       = cbox->model();
-        d           = 0;
-        selectedRow = 0;
-        while (true) {
-            QString name = DeviceConfig::DeviceName(isamem_get_device(d), isamem_get_internal_name(d), 0);
-            if (name.isEmpty()) {
-                break;
-            }
+    // ISA Memory Expansion Cards
+    QComboBox          *isamem_cbox[ISAMEM_MAX]         = { 0 };
+    QAbstractItemModel *isamem_models[ISAMEM_MAX]       = { 0 };
+    int                 isamem_removeRows_[ISAMEM_MAX]  = { 0 };
+    int                 isamem_selectedRows[ISAMEM_MAX] = { 0 };
 
-            if (!device_is_valid(isamem_get_device(d), machineId)) {
-                break;
-            }
+    for (uint8_t i = 0; i < ISAMEM_MAX; ++i) {
+        isamem_cbox[i]        = findChild<QComboBox *>(QString("comboBoxIsaMemCard%1").arg(i + 1));
+        isamem_models[i]      = isamem_cbox[i]->model();
+        isamem_removeRows_[i] = isamem_models[i]->rowCount();
+    }
 
-            int row = Models::AddEntry(model, name, d);
-            if (d == isamem_type[c]) {
-                selectedRow = row;
+    c = 0;
+    while (true) {
+        const QString name = DeviceConfig::DeviceName(isamem_get_device(c),
+                                                      isamem_get_internal_name(c), 0);
+
+        if (name.isEmpty())
+            break;
+
+        if (device_is_valid(isamem_get_device(c), machineId)) {
+            for (uint8_t i = 0; i < ISAMEM_MAX; ++i) {
+                int row = Models::AddEntry(isamem_models[i], name, c);
+
+                if (c == isamem_type[i])
+                    isamem_selectedRows[i] = row - isamem_removeRows_[i];
             }
-            ++d;
         }
-        cbox->setCurrentIndex(-1);
-        cbox->setCurrentIndex(selectedRow);
-        cbox->setEnabled(machineHasIsa);
-        findChild<QPushButton *>(QString("pushButtonConfigureCard%1").arg(c + 1))->setEnabled(isamem_type[c] != 0 && machineHasIsa);
+
+        c++;
+    }
+
+    for (uint8_t i = 0; i < ISAMEM_MAX; ++i) {
+        isamem_models[i]->removeRows(0, isamem_removeRows_[i]);
+        isamem_cbox[i]->setEnabled(isamem_models[i]->rowCount() > 1);
+        isamem_cbox[i]->setCurrentIndex(-1);
+        isamem_cbox[i]->setCurrentIndex(isamem_selectedRows[i]);
+        findChild<QPushButton *>(QString("pushButtonConfigureIsaMemCard%1").arg(i + 1))->setEnabled((isamem_type[i] != 0) &&
+                                isamem_has_config(isamem_type[i]) && machineHasIsa);
+    }
+
+    // ISA ROM Expansion Cards
+    QComboBox          *isarom_cbox[ISAROM_MAX]         = { 0 };
+    QAbstractItemModel *isarom_models[ISAROM_MAX]       = { 0 };
+    int                 isarom_removeRows_[ISAROM_MAX]  = { 0 };
+    int                 isarom_selectedRows[ISAROM_MAX] = { 0 };
+
+    for (uint8_t i = 0; i < ISAROM_MAX; ++i) {
+        isarom_cbox[i]        = findChild<QComboBox *>(QString("comboBoxIsaRomCard%1").arg(i + 1));
+        isarom_models[i]      = isarom_cbox[i]->model();
+        isarom_removeRows_[i] = isarom_models[i]->rowCount();
+    }
+
+    c = 0;
+    while (true) {
+        const QString name = DeviceConfig::DeviceName(isarom_get_device(c),
+                                                      isarom_get_internal_name(c), 0);
+
+        if (name.isEmpty())
+            break;
+
+        if (device_is_valid(isarom_get_device(c), machineId)) {
+            for (uint8_t i = 0; i < ISAROM_MAX; ++i) {
+                int row = Models::AddEntry(isarom_models[i], name, c);
+
+                if (c == isarom_type[i])
+                    isarom_selectedRows[i] = row - isarom_removeRows_[i];
+            }
+        }
+
+        c++;
+    }
+
+    for (uint8_t i = 0; i < ISAROM_MAX; ++i) {
+        isarom_models[i]->removeRows(0, isarom_removeRows_[i]);
+        isarom_cbox[i]->setEnabled(isarom_models[i]->rowCount() > 1);
+        isarom_cbox[i]->setCurrentIndex(-1);
+        isarom_cbox[i]->setCurrentIndex(isarom_selectedRows[i]);
+        findChild<QPushButton *>(QString("pushButtonConfigureIsaRomCard%1").arg(i + 1))->setEnabled((isarom_type[i] != 0) &&
+                                isarom_has_config(isarom_type[i]) && machineHasIsa);
     }
 }
 
@@ -115,91 +184,158 @@ void
 SettingsOtherPeripherals::save()
 {
     /* Other peripherals category */
-    bugger_enabled     = ui->checkBoxISABugger->isChecked() ? 1 : 0;
-    postcard_enabled   = ui->checkBoxPOSTCard->isChecked() ? 1 : 0;
-    unittester_enabled = ui->checkBoxUnitTester->isChecked() ? 1 : 0;
-    isartc_type        = ui->comboBoxRTC->currentData().toInt();
+    isartc_type            = ui->comboBoxRTC->currentData().toInt();
+    bugger_enabled         = ui->checkBoxISABugger->isChecked() ? 1 : 0;
+    postcard_enabled       = ui->checkBoxPOSTCard->isChecked() ? 1 : 0;
+    unittester_enabled     = ui->checkBoxUnitTester->isChecked() ? 1 : 0;
+    novell_keycard_enabled = ui->checkBoxKeyCard->isChecked() ? 1 : 0;
 
     /* ISA memory boards. */
     for (int i = 0; i < ISAMEM_MAX; i++) {
-        auto *cbox     = findChild<QComboBox *>(QString("comboBoxCard%1").arg(i + 1));
+        auto *cbox     = findChild<QComboBox *>(QString("comboBoxIsaMemCard%1").arg(i + 1));
         isamem_type[i] = cbox->currentData().toInt();
     }
+
+    /* ISA ROM boards. */
+    for (int i = 0; i < ISAROM_MAX; i++) {
+        auto *cbox     = findChild<QComboBox *>(QString("comboBoxIsaRomCard%1").arg(i + 1));
+        isarom_type[i] = cbox->currentData().toInt();
+    }
 }
 
 void
 SettingsOtherPeripherals::on_comboBoxRTC_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
-    ui->pushButtonConfigureRTC->setEnabled(index != 0 && machine_has_bus(machineId, MACHINE_BUS_ISA));
+
+    ui->pushButtonConfigureRTC->setEnabled((index != 0) && isartc_has_config(index) && machine_has_bus(machineId, MACHINE_BUS_ISA));
 }
 
 void
 SettingsOtherPeripherals::on_pushButtonConfigureRTC_clicked()
 {
-    DeviceConfig::ConfigureDevice(isartc_get_device(ui->comboBoxRTC->currentData().toInt()), 0, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(isartc_get_device(ui->comboBoxRTC->currentData().toInt()));
 }
 
 void
-SettingsOtherPeripherals::on_comboBoxCard1_currentIndexChanged(int index)
+SettingsOtherPeripherals::on_comboBoxIsaMemCard1_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
-    ui->pushButtonConfigureCard1->setEnabled(index != 0 && machine_has_bus(machineId, MACHINE_BUS_ISA));
+
+    ui->pushButtonConfigureIsaMemCard1->setEnabled((index != 0) && isamem_has_config(index) && machine_has_bus(machineId, MACHINE_BUS_ISA));
 }
 
 void
-SettingsOtherPeripherals::on_pushButtonConfigureCard1_clicked()
+SettingsOtherPeripherals::on_pushButtonConfigureIsaMemCard1_clicked()
 {
-    DeviceConfig::ConfigureDevice(isamem_get_device(ui->comboBoxCard1->currentData().toInt()), 1, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(isamem_get_device(ui->comboBoxIsaMemCard1->currentData().toInt()), 1);
 }
 
 void
-SettingsOtherPeripherals::on_comboBoxCard2_currentIndexChanged(int index)
+SettingsOtherPeripherals::on_comboBoxIsaMemCard2_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
-    ui->pushButtonConfigureCard2->setEnabled(index != 0 && machine_has_bus(machineId, MACHINE_BUS_ISA));
+
+    ui->pushButtonConfigureIsaMemCard2->setEnabled((index != 0) && isamem_has_config(index) && machine_has_bus(machineId, MACHINE_BUS_ISA));
 }
 
 void
-SettingsOtherPeripherals::on_pushButtonConfigureCard2_clicked()
+SettingsOtherPeripherals::on_pushButtonConfigureIsaMemCard2_clicked()
 {
-    DeviceConfig::ConfigureDevice(isamem_get_device(ui->comboBoxCard2->currentData().toInt()), 2, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(isamem_get_device(ui->comboBoxIsaMemCard2->currentData().toInt()), 2);
 }
 
 void
-SettingsOtherPeripherals::on_comboBoxCard3_currentIndexChanged(int index)
+SettingsOtherPeripherals::on_comboBoxIsaMemCard3_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
-    ui->pushButtonConfigureCard3->setEnabled(index != 0 && machine_has_bus(machineId, MACHINE_BUS_ISA));
+
+    ui->pushButtonConfigureIsaMemCard3->setEnabled((index != 0) && isamem_has_config(index) && machine_has_bus(machineId, MACHINE_BUS_ISA));
 }
 
 void
-SettingsOtherPeripherals::on_pushButtonConfigureCard3_clicked()
+SettingsOtherPeripherals::on_pushButtonConfigureIsaMemCard3_clicked()
 {
-    DeviceConfig::ConfigureDevice(isamem_get_device(ui->comboBoxCard3->currentData().toInt()), 3, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(isamem_get_device(ui->comboBoxIsaMemCard3->currentData().toInt()), 3);
 }
 
 void
-SettingsOtherPeripherals::on_comboBoxCard4_currentIndexChanged(int index)
+SettingsOtherPeripherals::on_comboBoxIsaMemCard4_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
-    ui->pushButtonConfigureCard4->setEnabled(index != 0 && machine_has_bus(machineId, MACHINE_BUS_ISA));
+
+    ui->pushButtonConfigureIsaMemCard4->setEnabled((index != 0) && isamem_has_config(index) && machine_has_bus(machineId, MACHINE_BUS_ISA));
 }
 
 void
-SettingsOtherPeripherals::on_pushButtonConfigureCard4_clicked()
+SettingsOtherPeripherals::on_pushButtonConfigureIsaMemCard4_clicked()
 {
-    DeviceConfig::ConfigureDevice(isamem_get_device(ui->comboBoxCard4->currentData().toInt()), 4, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(isamem_get_device(ui->comboBoxIsaMemCard4->currentData().toInt()), 4);
+}
+
+void
+SettingsOtherPeripherals::on_comboBoxIsaRomCard1_currentIndexChanged(int index)
+{
+    if (index < 0)
+        return;
+
+    ui->pushButtonConfigureIsaRomCard1->setEnabled((index != 0) && isarom_has_config(index) && machine_has_bus(machineId, MACHINE_BUS_ISA));
+}
+
+void
+SettingsOtherPeripherals::on_pushButtonConfigureIsaRomCard1_clicked()
+{
+    DeviceConfig::ConfigureDevice(isarom_get_device(ui->comboBoxIsaRomCard1->currentData().toInt()), 1);
+}
+
+void
+SettingsOtherPeripherals::on_comboBoxIsaRomCard2_currentIndexChanged(int index)
+{
+    if (index < 0)
+        return;
+
+    ui->pushButtonConfigureIsaRomCard2->setEnabled((index != 0) && isarom_has_config(index) && machine_has_bus(machineId, MACHINE_BUS_ISA));
+}
+
+void
+SettingsOtherPeripherals::on_pushButtonConfigureIsaRomCard2_clicked()
+{
+    DeviceConfig::ConfigureDevice(isarom_get_device(ui->comboBoxIsaRomCard2->currentData().toInt()), 2);
+}
+
+void
+SettingsOtherPeripherals::on_comboBoxIsaRomCard3_currentIndexChanged(int index)
+{
+    if (index < 0)
+        return;
+
+    ui->pushButtonConfigureIsaRomCard3->setEnabled((index != 0) && isarom_has_config(index) && machine_has_bus(machineId, MACHINE_BUS_ISA));
+}
+
+void
+SettingsOtherPeripherals::on_pushButtonConfigureIsaRomCard3_clicked()
+{
+    DeviceConfig::ConfigureDevice(isarom_get_device(ui->comboBoxIsaRomCard3->currentData().toInt()), 3);
+}
+
+void
+SettingsOtherPeripherals::on_comboBoxIsaRomCard4_currentIndexChanged(int index)
+{
+    if (index < 0)
+        return;
+
+    ui->pushButtonConfigureIsaRomCard4->setEnabled((index != 0) && isarom_has_config(index) && machine_has_bus(machineId, MACHINE_BUS_ISA));
+}
+
+void
+SettingsOtherPeripherals::on_pushButtonConfigureIsaRomCard4_clicked()
+{
+    DeviceConfig::ConfigureDevice(isarom_get_device(ui->comboBoxIsaRomCard4->currentData().toInt()), 4);
 }
 
 void
@@ -213,3 +349,13 @@ SettingsOtherPeripherals::on_pushButtonConfigureUT_clicked()
 {
     DeviceConfig::ConfigureDevice(&unittester_device);
 }
+
+void SettingsOtherPeripherals::on_checkBoxKeyCard_stateChanged(int arg1)
+{
+    ui->pushButtonConfigureKeyCard->setEnabled(arg1 != 0);
+}
+
+void SettingsOtherPeripherals::on_pushButtonConfigureKeyCard_clicked()
+{
+    DeviceConfig::ConfigureDevice(&novell_keycard_device);
+}
diff --git a/src/qt/qt_settingsotherperipherals.hpp b/src/qt/qt_settingsotherperipherals.hpp
index feaa7a001..991759259 100644
--- a/src/qt/qt_settingsotherperipherals.hpp
+++ b/src/qt/qt_settingsotherperipherals.hpp
@@ -20,19 +20,33 @@ public slots:
     void onCurrentMachineChanged(int machineId);
 
 private slots:
-    void on_pushButtonConfigureCard4_clicked();
-    void on_comboBoxCard4_currentIndexChanged(int index);
-    void on_pushButtonConfigureCard3_clicked();
-    void on_comboBoxCard3_currentIndexChanged(int index);
-    void on_pushButtonConfigureCard2_clicked();
-    void on_comboBoxCard2_currentIndexChanged(int index);
-    void on_pushButtonConfigureCard1_clicked();
-    void on_comboBoxCard1_currentIndexChanged(int index);
-    void on_pushButtonConfigureRTC_clicked();
     void on_comboBoxRTC_currentIndexChanged(int index);
+    void on_pushButtonConfigureRTC_clicked();
+
+    void on_comboBoxIsaMemCard1_currentIndexChanged(int index);
+    void on_pushButtonConfigureIsaMemCard1_clicked();
+    void on_comboBoxIsaMemCard2_currentIndexChanged(int index);
+    void on_pushButtonConfigureIsaMemCard2_clicked();
+    void on_comboBoxIsaMemCard3_currentIndexChanged(int index);
+    void on_pushButtonConfigureIsaMemCard3_clicked();
+    void on_comboBoxIsaMemCard4_currentIndexChanged(int index);
+    void on_pushButtonConfigureIsaMemCard4_clicked();
+
+    void on_comboBoxIsaRomCard1_currentIndexChanged(int index);
+    void on_pushButtonConfigureIsaRomCard1_clicked();
+    void on_comboBoxIsaRomCard2_currentIndexChanged(int index);
+    void on_pushButtonConfigureIsaRomCard2_clicked();
+    void on_comboBoxIsaRomCard3_currentIndexChanged(int index);
+    void on_pushButtonConfigureIsaRomCard3_clicked();
+    void on_comboBoxIsaRomCard4_currentIndexChanged(int index);
+    void on_pushButtonConfigureIsaRomCard4_clicked();
+
     void on_checkBoxUnitTester_stateChanged(int arg1);
     void on_pushButtonConfigureUT_clicked();
 
+    void on_checkBoxKeyCard_stateChanged(int arg1);
+    void on_pushButtonConfigureKeyCard_clicked();
+
 private:
     Ui::SettingsOtherPeripherals *ui;
     int                           machineId { 0 };
diff --git a/src/qt/qt_settingsotherperipherals.ui b/src/qt/qt_settingsotherperipherals.ui
index af953a984..0a366b833 100644
--- a/src/qt/qt_settingsotherperipherals.ui
+++ b/src/qt/qt_settingsotherperipherals.ui
@@ -27,9 +27,9 @@
     <number>0</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <layout class="QHBoxLayout" name="horizontalLayoutRtc">
      <item>
-      <widget class="QLabel" name="label">
+      <widget class="QLabel" name="labelRtc">
        <property name="text">
         <string>ISA RTC:</string>
        </property>
@@ -37,15 +37,15 @@
      </item>
      <item>
       <widget class="QComboBox" name="comboBoxRTC">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
        <property name="sizePolicy">
         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="maxVisibleItems">
+        <number>30</number>
+       </property>
       </widget>
      </item>
      <item>
@@ -58,124 +58,241 @@
     </layout>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox">
+    <widget class="QGroupBox" name="groupBoxMem">
      <property name="title">
       <string>ISA Memory Expansion</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="1" column="2">
-       <widget class="QPushButton" name="pushButtonConfigureCard2">
+     <layout class="QGridLayout" name="gridLayoutMem">
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelIsaMemCard1">
         <property name="text">
-         <string>Configure</string>
+         <string>Card 1:</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QComboBox" name="comboBoxCard2">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="comboBoxIsaMemCard1">
         <property name="sizePolicy">
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
        </widget>
       </item>
-      <item row="2" column="2">
-       <widget class="QPushButton" name="pushButtonConfigureCard3">
+      <item row="0" column="2">
+       <widget class="QPushButton" name="pushButtonConfigureIsaMemCard1">
         <property name="text">
          <string>Configure</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
-       <widget class="QLabel" name="label_3">
+       <widget class="QLabel" name="labelIsaMemCard2">
         <property name="text">
          <string>Card 2:</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>Card 3:</string>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="comboBoxIsaMemCard2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maxVisibleItems">
+         <number>30</number>
         </property>
        </widget>
       </item>
-      <item row="0" column="2">
-       <widget class="QPushButton" name="pushButtonConfigureCard1">
+      <item row="1" column="2">
+       <widget class="QPushButton" name="pushButtonConfigureIsaMemCard2">
         <property name="text">
          <string>Configure</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="comboBoxCard1">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_2">
+      <item row="2" column="0">
+       <widget class="QLabel" name="labelIsaMemCard3">
         <property name="text">
-         <string>Card 1:</string>
+         <string>Card 3:</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="QComboBox" name="comboBoxCard3">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
+       <widget class="QComboBox" name="comboBoxIsaMemCard3">
         <property name="sizePolicy">
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QComboBox" name="comboBoxCard4">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+        <property name="maxVisibleItems">
+         <number>30</number>
         </property>
        </widget>
       </item>
-      <item row="3" column="2">
-       <widget class="QPushButton" name="pushButtonConfigureCard4">
+      <item row="2" column="2">
+       <widget class="QPushButton" name="pushButtonConfigureIsaMemCard3">
         <property name="text">
          <string>Configure</string>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
-       <widget class="QLabel" name="label_5">
+       <widget class="QLabel" name="labelIsaMemCard4">
         <property name="text">
          <string>Card 4:</string>
         </property>
        </widget>
       </item>
+      <item row="3" column="1">
+       <widget class="QComboBox" name="comboBoxIsaMemCard4">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2">
+       <widget class="QPushButton" name="pushButtonConfigureIsaMemCard4">
+        <property name="text">
+         <string>Configure</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
+    <widget class="QGroupBox" name="groupBoxRom">
+     <property name="title">
+      <string>ISA ROM Cards</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayoutRom">
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelIsaRomCard1">
+        <property name="text">
+         <string>Card 1:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="comboBoxIsaRomCard1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QPushButton" name="pushButtonConfigureIsaRomCard1">
+        <property name="text">
+         <string>Configure</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="labelIsaRomCard2">
+        <property name="text">
+         <string>Card 2:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="comboBoxIsaRomCard2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QPushButton" name="pushButtonConfigureIsaRomCard2">
+        <property name="text">
+         <string>Configure</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="labelIsaRomCard3">
+        <property name="text">
+         <string>Card 3:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QComboBox" name="comboBoxIsaRomCard3">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QPushButton" name="pushButtonConfigureIsaRomCard3">
+        <property name="text">
+         <string>Configure</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="labelIsaRomCard4">
+        <property name="text">
+         <string>Card 4:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QComboBox" name="comboBoxIsaRomCard4">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2">
+       <widget class="QPushButton" name="pushButtonConfigureIsaRomCard4">
+        <property name="text">
+         <string>Configure</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayoutIBPC">
      <item>
       <widget class="QCheckBox" name="checkBoxISABugger">
        <property name="text">
@@ -193,18 +310,18 @@
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
+    <layout class="QHBoxLayout" name="horizontalLayoutUT">
      <item>
       <widget class="QCheckBox" name="checkBoxUnitTester">
-       <property name="text">
-        <string>86Box Unit Tester</string>
-       </property>
        <property name="sizePolicy">
         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="text">
+        <string>86Box Unit Tester</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -216,6 +333,40 @@
      </item>
     </layout>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayoutKeyCard">
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QCheckBox" name="checkBoxKeyCard">
+       <property name="text">
+        <string>Novell NetWare 2.x Key Card</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonConfigureKeyCard">
+       <property name="text">
+        <string>Configure</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
@@ -231,6 +382,32 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>comboBoxRTC</tabstop>
+  <tabstop>pushButtonConfigureRTC</tabstop>
+  <tabstop>comboBoxIsaMemCard1</tabstop>
+  <tabstop>pushButtonConfigureIsaMemCard1</tabstop>
+  <tabstop>comboBoxIsaMemCard2</tabstop>
+  <tabstop>pushButtonConfigureIsaMemCard2</tabstop>
+  <tabstop>comboBoxIsaMemCard3</tabstop>
+  <tabstop>pushButtonConfigureIsaMemCard3</tabstop>
+  <tabstop>comboBoxIsaMemCard4</tabstop>
+  <tabstop>pushButtonConfigureIsaMemCard4</tabstop>
+  <tabstop>comboBoxIsaRomCard1</tabstop>
+  <tabstop>pushButtonConfigureIsaRomCard1</tabstop>
+  <tabstop>comboBoxIsaRomCard2</tabstop>
+  <tabstop>pushButtonConfigureIsaRomCard2</tabstop>
+  <tabstop>comboBoxIsaRomCard3</tabstop>
+  <tabstop>pushButtonConfigureIsaRomCard3</tabstop>
+  <tabstop>comboBoxIsaRomCard4</tabstop>
+  <tabstop>pushButtonConfigureIsaRomCard4</tabstop>
+  <tabstop>checkBoxISABugger</tabstop>
+  <tabstop>checkBoxPOSTCard</tabstop>
+  <tabstop>checkBoxUnitTester</tabstop>
+  <tabstop>pushButtonConfigureUT</tabstop>
+  <tabstop>checkBoxKeyCard</tabstop>
+  <tabstop>pushButtonConfigureKeyCard</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/qt/qt_settingsotherremovable.cpp b/src/qt/qt_settingsotherremovable.cpp
index f8b29dac5..4ba07161c 100644
--- a/src/qt/qt_settingsotherremovable.cpp
+++ b/src/qt/qt_settingsotherremovable.cpp
@@ -23,7 +23,7 @@ extern "C" {
 #include <86box/timer.h>
 #include <86box/scsi_device.h>
 #include <86box/mo.h>
-#include <86box/zip.h>
+#include <86box/rdisk.h>
 }
 
 #include <QStandardItemModel>
@@ -40,17 +40,48 @@ moDriveTypeName(int i)
                                    mo_drive_types[i].revision);
 }
 
+static QString
+rdiskDriveTypeName(int i)
+{
+    return QString("%1 %2 %3").arg(rdisk_drive_types[i].vendor, rdisk_drive_types[i].model,
+                                   rdisk_drive_types[i].revision);
+}
+
 static void
 setMOBus(QAbstractItemModel *model, const QModelIndex &idx, uint8_t bus, uint8_t channel)
 {
     QIcon icon;
     switch (bus) {
         case MO_BUS_DISABLED:
-            icon = ProgSettings::loadIcon("/mo_disabled.ico");
+            icon = QIcon(":/settings/qt/icons/mo_disabled.ico");
             break;
         case MO_BUS_ATAPI:
         case MO_BUS_SCSI:
-            icon = ProgSettings::loadIcon("/mo.ico");
+            icon = QIcon(":/settings/qt/icons/mo.ico");
+            break;
+
+        default:
+            break;
+    }
+
+    auto i = idx.siblingAtColumn(0);
+    model->setData(i, Harddrives::BusChannelName(bus, channel));
+    model->setData(i, bus, Qt::UserRole);
+    model->setData(i, channel, Qt::UserRole + 1);
+    model->setData(i, icon, Qt::DecorationRole);
+}
+
+static void
+setRDiskBus(QAbstractItemModel *model, const QModelIndex &idx, uint8_t bus, uint8_t channel)
+{
+    QIcon icon;
+    switch (bus) {
+        case RDISK_BUS_DISABLED:
+            icon = QIcon(":/settings/qt/icons/rdisk_disabled.ico");
+            break;
+        case RDISK_BUS_ATAPI:
+        case RDISK_BUS_SCSI:
+            icon = QIcon(":/settings/qt/icons/rdisk.ico");
             break;
 
         default:
@@ -76,35 +107,14 @@ setMOType(QAbstractItemModel *model, const QModelIndex &idx, uint32_t type)
 }
 
 static void
-setZIPBus(QAbstractItemModel *model, const QModelIndex &idx, uint8_t bus, uint8_t channel)
-{
-    QIcon icon;
-    switch (bus) {
-        case ZIP_BUS_DISABLED:
-            icon = ProgSettings::loadIcon("/zip_disabled.ico");
-            break;
-        case ZIP_BUS_ATAPI:
-        case ZIP_BUS_SCSI:
-            icon = ProgSettings::loadIcon("/zip.ico");
-            break;
-
-        default:
-            break;
-    }
-
-    auto i = idx.siblingAtColumn(0);
-    model->setData(i, Harddrives::BusChannelName(bus, channel));
-    model->setData(i, bus, Qt::UserRole);
-    model->setData(i, channel, Qt::UserRole + 1);
-    model->setData(i, icon, Qt::DecorationRole);
-}
-
-static void
-setZIPType(QAbstractItemModel *model, const QModelIndex &idx, bool is250)
+setRDiskType(QAbstractItemModel *model, const QModelIndex &idx, uint32_t type)
 {
     auto i = idx.siblingAtColumn(1);
-    model->setData(i, is250 ? "ZIP 250" : "ZIP 100");
-    model->setData(i, is250, Qt::UserRole);
+    if (idx.siblingAtColumn(0).data(Qt::UserRole).toUInt() == RDISK_BUS_DISABLED)
+        model->setData(i, QCoreApplication::translate("", "None"));
+    else
+        model->setData(i, rdiskDriveTypeName(type));
+    model->setData(i, type, Qt::UserRole);
 }
 
 SettingsOtherRemovable::SettingsOtherRemovable(QWidget *parent)
@@ -114,6 +124,7 @@ SettingsOtherRemovable::SettingsOtherRemovable(QWidget *parent)
     ui->setupUi(this);
 
     Harddrives::populateRemovableBuses(ui->comboBoxMOBus->model());
+    ui->comboBoxMOBus->model()->removeRows(3, ui->comboBoxMOBus->model()->rowCount() - 3);
     auto *model = ui->comboBoxMOType->model();
     for (uint32_t i = 0; i < KNOWN_MO_DRIVE_TYPES; i++) {
         Models::AddEntry(model, moDriveTypeName(i), i);
@@ -136,24 +147,30 @@ SettingsOtherRemovable::SettingsOtherRemovable(QWidget *parent)
     connect(ui->tableViewMO->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &SettingsOtherRemovable::onMORowChanged);
     ui->tableViewMO->setCurrentIndex(model->index(0, 0));
 
-    Harddrives::populateRemovableBuses(ui->comboBoxZIPBus->model());
+    Harddrives::populateRemovableBuses(ui->comboBoxRDiskBus->model());
+    if ((ui->comboBoxRDiskBus->model()->rowCount() - 3) > 0)
+      ui->comboBoxRDiskBus->model()->removeRows(3, ui->comboBoxRDiskBus->model()->rowCount() - 3);
+    model = ui->comboBoxRDiskType->model();
+    for (uint32_t i = 0; i < KNOWN_RDISK_DRIVE_TYPES; i++) {
+        Models::AddEntry(model, rdiskDriveTypeName(i), i);
+    }
 
     model = new QStandardItemModel(0, 2, this);
-    ui->tableViewZIP->setModel(model);
-    model->setHeaderData(0, Qt::Horizontal, "Bus");
-    model->setHeaderData(1, Qt::Horizontal, "Type");
-    model->insertRows(0, ZIP_NUM);
-    for (int i = 0; i < ZIP_NUM; i++) {
+    ui->tableViewRDisk->setModel(model);
+    model->setHeaderData(0, Qt::Horizontal, tr("Bus"));
+    model->setHeaderData(1, Qt::Horizontal, tr("Type"));
+    model->insertRows(0, RDISK_NUM);
+    for (int i = 0; i < RDISK_NUM; i++) {
         auto idx = model->index(i, 0);
-        setZIPBus(model, idx, zip_drives[i].bus_type, zip_drives[i].res);
-        setZIPType(model, idx, zip_drives[i].is_250 > 0);
-        Harddrives::busTrackClass->device_track(1, DEV_ZIP, zip_drives[i].bus_type, zip_drives[i].bus_type == ZIP_BUS_ATAPI ? zip_drives[i].ide_channel : zip_drives[i].scsi_device_id);
+        setRDiskBus(model, idx, rdisk_drives[i].bus_type, rdisk_drives[i].res);
+        setRDiskType(model, idx.siblingAtColumn(1), rdisk_drives[i].type);
+        Harddrives::busTrackClass->device_track(1, DEV_MO, rdisk_drives[i].bus_type, rdisk_drives[i].bus_type == RDISK_BUS_ATAPI ? rdisk_drives[i].ide_channel : rdisk_drives[i].scsi_device_id);
     }
-    ui->tableViewZIP->resizeColumnsToContents();
-    ui->tableViewZIP->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
+    ui->tableViewRDisk->resizeColumnsToContents();
+    ui->tableViewRDisk->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
 
-    connect(ui->tableViewZIP->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &SettingsOtherRemovable::onZIPRowChanged);
-    ui->tableViewZIP->setCurrentIndex(model->index(0, 0));
+    connect(ui->tableViewRDisk->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &SettingsOtherRemovable::onRDiskRowChanged);
+    ui->tableViewRDisk->setCurrentIndex(model->index(0, 0));
 }
 
 SettingsOtherRemovable::~SettingsOtherRemovable()
@@ -173,13 +190,13 @@ SettingsOtherRemovable::save()
         mo_drives[i].type     = model->index(i, 1).data(Qt::UserRole).toUInt();
     }
 
-    model = ui->tableViewZIP->model();
-    for (uint8_t i = 0; i < ZIP_NUM; i++) {
-        zip_drives[i].fp       = NULL;
-        zip_drives[i].priv     = NULL;
-        zip_drives[i].bus_type = model->index(i, 0).data(Qt::UserRole).toUInt();
-        zip_drives[i].res      = model->index(i, 0).data(Qt::UserRole + 1).toUInt();
-        zip_drives[i].is_250   = model->index(i, 1).data(Qt::UserRole).toBool() ? 1 : 0;
+    model = ui->tableViewRDisk->model();
+    for (uint8_t i = 0; i < RDISK_NUM; i++) {
+        rdisk_drives[i].fp       = NULL;
+        rdisk_drives[i].priv     = NULL;
+        rdisk_drives[i].bus_type = model->index(i, 0).data(Qt::UserRole).toUInt();
+        rdisk_drives[i].res      = model->index(i, 0).data(Qt::UserRole + 1).toUInt();
+        rdisk_drives[i].type     = model->index(i, 1).data(Qt::UserRole).toUInt();
     }
 }
 
@@ -201,26 +218,46 @@ SettingsOtherRemovable::onMORowChanged(const QModelIndex &current)
     if (!match.isEmpty())
         ui->comboBoxMOChannel->setCurrentIndex(match.first().row());
     ui->comboBoxMOType->setCurrentIndex(type);
+    enableCurrentlySelectedChannel_MO();
 }
 
 void
-SettingsOtherRemovable::onZIPRowChanged(const QModelIndex &current)
+SettingsOtherRemovable::onRDiskRowChanged(const QModelIndex &current)
 {
     uint8_t bus     = current.siblingAtColumn(0).data(Qt::UserRole).toUInt();
     uint8_t channel = current.siblingAtColumn(0).data(Qt::UserRole + 1).toUInt();
-    bool    is250   = current.siblingAtColumn(1).data(Qt::UserRole).toBool();
+    uint8_t type    = current.siblingAtColumn(1).data(Qt::UserRole).toUInt();
 
-    ui->comboBoxZIPBus->setCurrentIndex(-1);
-    const auto *model = ui->comboBoxZIPBus->model();
+    ui->comboBoxRDiskBus->setCurrentIndex(-1);
+    const auto *model = ui->comboBoxRDiskBus->model();
     auto        match = model->match(model->index(0, 0), Qt::UserRole, bus);
     if (!match.isEmpty())
-        ui->comboBoxZIPBus->setCurrentIndex(match.first().row());
+        ui->comboBoxRDiskBus->setCurrentIndex(match.first().row());
 
-    model = ui->comboBoxZIPChannel->model();
+    model = ui->comboBoxRDiskChannel->model();
     match = model->match(model->index(0, 0), Qt::UserRole, channel);
     if (!match.isEmpty())
-        ui->comboBoxZIPChannel->setCurrentIndex(match.first().row());
-    ui->checkBoxZIP250->setChecked(is250);
+        ui->comboBoxRDiskChannel->setCurrentIndex(match.first().row());
+    ui->comboBoxRDiskType->setCurrentIndex(type);
+    enableCurrentlySelectedChannel_RDisk();
+}
+
+void
+SettingsOtherRemovable::reloadBusChannels_MO() {
+    auto selected = ui->comboBoxMOChannel->currentIndex();
+    Harddrives::populateBusChannels(ui->comboBoxMOChannel->model(),
+                                    ui->comboBoxMOBus->currentData().toInt(), Harddrives::busTrackClass);
+    ui->comboBoxMOChannel->setCurrentIndex(selected);
+    enableCurrentlySelectedChannel_MO();
+}
+
+void
+SettingsOtherRemovable::reloadBusChannels_RDisk() {
+    auto selected = ui->comboBoxRDiskChannel->currentIndex();
+    Harddrives::populateBusChannels(ui->comboBoxRDiskChannel->model(),
+                                    ui->comboBoxRDiskBus->currentData().toInt(), Harddrives::busTrackClass);
+    ui->comboBoxRDiskChannel->setCurrentIndex(selected);
+    enableCurrentlySelectedChannel_RDisk();
 }
 
 void
@@ -231,7 +268,19 @@ SettingsOtherRemovable::on_comboBoxMOBus_currentIndexChanged(int index)
         bool enabled = (bus != MO_BUS_DISABLED);
         ui->comboBoxMOChannel->setEnabled(enabled);
         ui->comboBoxMOType->setEnabled(enabled);
-        Harddrives::populateBusChannels(ui->comboBoxMOChannel->model(), bus);
+        Harddrives::populateBusChannels(ui->comboBoxMOChannel->model(), bus, Harddrives::busTrackClass);
+    }
+}
+
+void
+SettingsOtherRemovable::on_comboBoxRDiskBus_currentIndexChanged(int index)
+{
+    if (index >= 0) {
+        int  bus     = ui->comboBoxRDiskBus->currentData().toInt();
+        bool enabled = (bus != RDISK_BUS_DISABLED);
+        ui->comboBoxRDiskChannel->setEnabled(enabled);
+        ui->comboBoxRDiskType->setEnabled(enabled);
+        Harddrives::populateBusChannels(ui->comboBoxRDiskChannel->model(), bus, Harddrives::busTrackClass);
     }
 }
 
@@ -242,9 +291,9 @@ SettingsOtherRemovable::on_comboBoxMOBus_activated(int)
     Harddrives::busTrackClass->device_track(0, DEV_MO, ui->tableViewMO->model()->data(i,
                                             Qt::UserRole).toInt(), ui->tableViewMO->model()->data(i,
                                             Qt::UserRole + 1).toInt());
-    ui->comboBoxMOChannel->setCurrentIndex(ui->comboBoxMOBus->currentData().toUInt() ==
-        MO_BUS_ATAPI ? Harddrives::busTrackClass->next_free_ide_channel() :
-        Harddrives::busTrackClass->next_free_scsi_id());
+    ui->comboBoxMOChannel->setCurrentIndex(ui->comboBoxMOBus->currentData().toUInt() == MO_BUS_ATAPI ?
+                                           Harddrives::busTrackClass->next_free_ide_channel() :
+                                           Harddrives::busTrackClass->next_free_scsi_id());
     ui->tableViewMO->model()->data(i, Qt::UserRole + 1);
     setMOBus(ui->tableViewMO->model(),
              ui->tableViewMO->selectionModel()->currentIndex(),
@@ -258,8 +307,54 @@ SettingsOtherRemovable::on_comboBoxMOBus_activated(int)
     Harddrives::busTrackClass->device_track(1, DEV_MO, ui->tableViewMO->model()->data(i,
                                             Qt::UserRole).toInt(), ui->tableViewMO->model()->data(i,
                                             Qt::UserRole + 1).toInt());
+    emit moChannelChanged();
 }
 
+void
+SettingsOtherRemovable::on_comboBoxRDiskBus_activated(int)
+{
+    auto i = ui->tableViewRDisk->selectionModel()->currentIndex().siblingAtColumn(0);
+    Harddrives::busTrackClass->device_track(0, DEV_RDISK, ui->tableViewRDisk->model()->data(i,
+                                            Qt::UserRole).toInt(), ui->tableViewRDisk->model()->data(i,
+                                            Qt::UserRole + 1).toInt());
+    ui->comboBoxRDiskChannel->setCurrentIndex(ui->comboBoxRDiskBus->currentData().toUInt() == RDISK_BUS_ATAPI ?
+                                            Harddrives::busTrackClass->next_free_ide_channel() :
+                                            Harddrives::busTrackClass->next_free_scsi_id());
+    ui->tableViewRDisk->model()->data(i, Qt::UserRole + 1);
+    setRDiskBus(ui->tableViewRDisk->model(),
+                ui->tableViewRDisk->selectionModel()->currentIndex(),
+                ui->comboBoxRDiskBus->currentData().toUInt(),
+                ui->comboBoxRDiskChannel->currentData().toUInt());
+    setRDiskType(ui->tableViewRDisk->model(),
+                 ui->tableViewRDisk->selectionModel()->currentIndex(),
+                 ui->comboBoxRDiskType->currentData().toUInt());
+    ui->tableViewRDisk->resizeColumnsToContents();
+    ui->tableViewRDisk->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
+    Harddrives::busTrackClass->device_track(1, DEV_RDISK, ui->tableViewRDisk->model()->data(i,
+                                            Qt::UserRole).toInt(), ui->tableViewRDisk->model()->data(i,
+                                            Qt::UserRole + 1).toInt());
+    emit rdiskChannelChanged();
+}
+
+void
+SettingsOtherRemovable::enableCurrentlySelectedChannel_MO()
+{
+    const auto *item_model = qobject_cast<QStandardItemModel*>(ui->comboBoxMOChannel->model());
+    const auto index = ui->comboBoxMOChannel->currentIndex();
+    auto *item = item_model->item(index);
+    if (item)
+        item->setEnabled(true);
+}
+
+void
+SettingsOtherRemovable::enableCurrentlySelectedChannel_RDisk()
+{
+    const auto *item_model = qobject_cast<QStandardItemModel*>(ui->comboBoxRDiskChannel->model());
+    const auto index = ui->comboBoxRDiskChannel->currentIndex();
+    auto *item = item_model->item(index);
+    if (item)
+        item->setEnabled(true);
+}
 void
 SettingsOtherRemovable::on_comboBoxMOChannel_activated(int)
 {
@@ -274,6 +369,24 @@ SettingsOtherRemovable::on_comboBoxMOChannel_activated(int)
     Harddrives::busTrackClass->device_track(1, DEV_MO, ui->tableViewMO->model()->data(i,
                                             Qt::UserRole).toInt(), ui->tableViewMO->model()->data(i,
                                             Qt::UserRole + 1).toInt());
+    emit moChannelChanged();
+}
+
+void
+SettingsOtherRemovable::on_comboBoxRDiskChannel_activated(int)
+{
+    auto i = ui->tableViewRDisk->selectionModel()->currentIndex().siblingAtColumn(0);
+    Harddrives::busTrackClass->device_track(0, DEV_RDISK, ui->tableViewRDisk->model()->data(i,
+                                            Qt::UserRole).toInt(), ui->tableViewRDisk->model()->data(i,
+                                            Qt::UserRole + 1).toInt());
+    setRDiskBus(ui->tableViewRDisk->model(),
+              ui->tableViewRDisk->selectionModel()->currentIndex(),
+              ui->comboBoxRDiskBus->currentData().toUInt(),
+              ui->comboBoxRDiskChannel->currentData().toUInt());
+    Harddrives::busTrackClass->device_track(1, DEV_RDISK, ui->tableViewRDisk->model()->data(i,
+                                            Qt::UserRole).toInt(),
+                                            ui->tableViewRDisk->model()->data(i, Qt::UserRole + 1).toInt());
+    emit rdiskChannelChanged();
 }
 
 void
@@ -287,56 +400,11 @@ SettingsOtherRemovable::on_comboBoxMOType_activated(int)
 }
 
 void
-SettingsOtherRemovable::on_comboBoxZIPBus_currentIndexChanged(int index)
+SettingsOtherRemovable::on_comboBoxRDiskType_activated(int)
 {
-    if (index >= 0) {
-        int  bus     = ui->comboBoxZIPBus->currentData().toInt();
-        bool enabled = (bus != ZIP_BUS_DISABLED);
-        ui->comboBoxZIPChannel->setEnabled(enabled);
-        ui->checkBoxZIP250->setEnabled(enabled);
-        Harddrives::populateBusChannels(ui->comboBoxZIPChannel->model(), bus);
-    }
-}
-
-void
-SettingsOtherRemovable::on_comboBoxZIPBus_activated(int)
-{
-    auto i = ui->tableViewZIP->selectionModel()->currentIndex().siblingAtColumn(0);
-    Harddrives::busTrackClass->device_track(0, DEV_ZIP, ui->tableViewZIP->model()->data(i,
-                                            Qt::UserRole).toInt(), ui->tableViewZIP->model()->data(i,
-                                            Qt::UserRole + 1).toInt());
-    ui->comboBoxZIPChannel->setCurrentIndex(ui->comboBoxZIPBus->currentData().toUInt() == ZIP_BUS_ATAPI ?
-                                            Harddrives::busTrackClass->next_free_ide_channel() :
-                                            Harddrives::busTrackClass->next_free_scsi_id());
-    setZIPBus(ui->tableViewZIP->model(),
-              ui->tableViewZIP->selectionModel()->currentIndex(),
-              ui->comboBoxZIPBus->currentData().toUInt(),
-              ui->comboBoxZIPChannel->currentData().toUInt());
-    Harddrives::busTrackClass->device_track(1, DEV_ZIP, ui->tableViewZIP->model()->data(i,
-                                            Qt::UserRole).toInt(), ui->tableViewZIP->model()->data(i,
-                                            Qt::UserRole + 1).toInt());
-}
-
-void
-SettingsOtherRemovable::on_comboBoxZIPChannel_activated(int)
-{
-    auto i = ui->tableViewZIP->selectionModel()->currentIndex().siblingAtColumn(0);
-    Harddrives::busTrackClass->device_track(0, DEV_ZIP, ui->tableViewZIP->model()->data(i,
-                                            Qt::UserRole).toInt(), ui->tableViewZIP->model()->data(i,
-                                            Qt::UserRole + 1).toInt());
-    setZIPBus(ui->tableViewZIP->model(),
-              ui->tableViewZIP->selectionModel()->currentIndex(),
-              ui->comboBoxZIPBus->currentData().toUInt(),
-              ui->comboBoxZIPChannel->currentData().toUInt());
-    Harddrives::busTrackClass->device_track(1, DEV_ZIP, ui->tableViewZIP->model()->data(i,
-                                            Qt::UserRole).toInt(),
-                                            ui->tableViewZIP->model()->data(i, Qt::UserRole + 1).toInt());
-}
-
-void
-SettingsOtherRemovable::on_checkBoxZIP250_stateChanged(int state)
-{
-    setZIPType(ui->tableViewZIP->model(),
-               ui->tableViewZIP->selectionModel()->currentIndex(),
-               state == Qt::Checked);
+    setRDiskType(ui->tableViewRDisk->model(),
+                 ui->tableViewRDisk->selectionModel()->currentIndex(),
+                 ui->comboBoxRDiskType->currentData().toUInt());
+    ui->tableViewRDisk->resizeColumnsToContents();
+    ui->tableViewRDisk->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
 }
diff --git a/src/qt/qt_settingsotherremovable.hpp b/src/qt/qt_settingsotherremovable.hpp
index 8b81fb0f0..79fcfbf3f 100644
--- a/src/qt/qt_settingsotherremovable.hpp
+++ b/src/qt/qt_settingsotherremovable.hpp
@@ -13,39 +13,32 @@ class SettingsOtherRemovable : public QWidget {
 public:
     explicit SettingsOtherRemovable(QWidget *parent = nullptr);
     ~SettingsOtherRemovable();
+    void reloadBusChannels_MO();
+    void reloadBusChannels_RDisk();
 
     void save();
 
-private slots:
-    void on_checkBoxZIP250_stateChanged(int arg1);
-
-private slots:
-    void on_comboBoxZIPChannel_activated(int index);
-
-private slots:
-    void on_comboBoxZIPBus_activated(int index);
-
-private slots:
-    void on_comboBoxZIPBus_currentIndexChanged(int index);
-
-private slots:
-    void on_comboBoxMOType_activated(int index);
-
-private slots:
-    void on_comboBoxMOChannel_activated(int index);
-
-private slots:
-    void on_comboBoxMOBus_activated(int index);
-
-private slots:
-    void on_comboBoxMOBus_currentIndexChanged(int index);
+signals:
+    void moChannelChanged();
+    void rdiskChannelChanged();
 
 private slots:
     void onMORowChanged(const QModelIndex &current);
-    void onZIPRowChanged(const QModelIndex &current);
+    void on_comboBoxMOBus_currentIndexChanged(int index);
+    void on_comboBoxMOBus_activated(int index);
+    void on_comboBoxMOChannel_activated(int index);
+    void on_comboBoxMOType_activated(int index);
+
+    void onRDiskRowChanged(const QModelIndex &current);
+    void on_comboBoxRDiskBus_currentIndexChanged(int index);
+    void on_comboBoxRDiskBus_activated(int index);
+    void on_comboBoxRDiskChannel_activated(int index);
+    void on_comboBoxRDiskType_activated(int index);
 
 private:
     Ui::SettingsOtherRemovable *ui;
+    void enableCurrentlySelectedChannel_MO();
+    void enableCurrentlySelectedChannel_RDisk();
 };
 
 #endif // QT_SETTINGSOTHERREMOVABLE_HPP
diff --git a/src/qt/qt_settingsotherremovable.ui b/src/qt/qt_settingsotherremovable.ui
index 219333376..8224d67f6 100644
--- a/src/qt/qt_settingsotherremovable.ui
+++ b/src/qt/qt_settingsotherremovable.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>418</width>
-    <height>433</height>
+    <height>368</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -27,7 +27,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QLabel" name="label">
+    <widget class="QLabel" name="labelMO">
      <property name="text">
       <string>MO drives:</string>
      </property>
@@ -35,91 +35,18 @@
    </item>
    <item>
     <widget class="QTableView" name="tableViewMO">
-     <property name="editTriggers">
-      <set>QAbstractItemView::NoEditTriggers</set>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
      </property>
-     <property name="selectionMode">
-      <enum>QAbstractItemView::SingleSelection</enum>
-     </property>
-     <property name="selectionBehavior">
-      <enum>QAbstractItemView::SelectRows</enum>
-     </property>
-     <property name="showGrid">
-      <bool>false</bool>
-     </property>
-     <attribute name="verticalHeaderVisible">
-      <bool>false</bool>
-     </attribute>
-    </widget>
-   </item>
-   <item>
-    <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Bus:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="2">
-      <widget class="QLabel" name="label_7">
-       <property name="text">
-        <string>Channel:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QComboBox" name="comboBoxMOBus">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="3">
-      <widget class="QComboBox" name="comboBoxMOChannel">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string>Type:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1" colspan="3">
-      <widget class="QComboBox" name="comboBoxMOType">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
+     <property name="maximumSize">
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>16777215</width>
+       <height>150</height>
       </size>
      </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QLabel" name="label_6">
-     <property name="text">
-      <string>ZIP drives:</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QTableView" name="tableViewZIP">
      <property name="editTriggers">
       <set>QAbstractItemView::NoEditTriggers</set>
      </property>
@@ -138,46 +65,151 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Bus:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="comboBoxZIPBus">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_5">
-       <property name="text">
-        <string>Channel:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="comboBoxZIPChannel">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="checkBoxZIP250">
-       <property name="text">
-        <string>ZIP 250</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QWidget" name="moControls" native="true">
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelMOBus">
+        <property name="text">
+         <string>Bus:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="comboBoxMOBus">
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QLabel" name="labelMOChannel">
+        <property name="text">
+         <string>Channel:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QComboBox" name="comboBoxMOChannel">
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="labelMOType">
+        <property name="text">
+         <string>Type:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="3">
+       <widget class="QComboBox" name="comboBoxMOType">
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="labelRDisk">
+     <property name="text">
+      <string>Removable disk drives:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QTableView" name="tableViewRDisk">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>150</height>
+      </size>
+     </property>
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::SingleSelection</enum>
+     </property>
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectRows</enum>
+     </property>
+     <property name="showGrid">
+      <bool>false</bool>
+     </property>
+     <attribute name="verticalHeaderVisible">
+      <bool>false</bool>
+     </attribute>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="rdiskControls" native="true">
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelRDiskBus">
+        <property name="text">
+         <string>Bus:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="comboBoxRDiskBus">
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QLabel" name="labelRDiskChannel">
+        <property name="text">
+         <string>Channel:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QComboBox" name="comboBoxRDiskChannel">
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="labelRDiskType">
+        <property name="text">
+         <string>Type:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="3">
+       <widget class="QComboBox" name="comboBoxRDiskType">
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>tableViewMO</tabstop>
+  <tabstop>comboBoxMOBus</tabstop>
+  <tabstop>comboBoxMOChannel</tabstop>
+  <tabstop>comboBoxMOType</tabstop>
+  <tabstop>tableViewRDisk</tabstop>
+  <tabstop>comboBoxRDiskBus</tabstop>
+  <tabstop>comboBoxRDiskChannel</tabstop>
+  <tabstop>comboBoxRDiskType</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/qt/qt_settingsports.cpp b/src/qt/qt_settingsports.cpp
index 9b19df68d..001193357 100644
--- a/src/qt/qt_settingsports.cpp
+++ b/src/qt/qt_settingsports.cpp
@@ -38,44 +38,7 @@ SettingsPorts::SettingsPorts(QWidget *parent)
     , ui(new Ui::SettingsPorts)
 {
     ui->setupUi(this);
-
-    for (int i = 0; i < PARALLEL_MAX; i++) {
-        auto *cbox        = findChild<QComboBox *>(QString("comboBoxLpt%1").arg(i + 1));
-        auto *model       = cbox->model();
-        int   c           = 0;
-        int   selectedRow = 0;
-        while (true) {
-            const char *lptName = lpt_device_get_name(c);
-            if (lptName == nullptr) {
-                break;
-            }
-
-            Models::AddEntry(model, tr(lptName), c);
-            if (c == lpt_ports[i].device) {
-                selectedRow = c;
-            }
-            c++;
-        }
-        cbox->setCurrentIndex(selectedRow);
-
-        auto *checkBox = findChild<QCheckBox *>(QString("checkBoxParallel%1").arg(i + 1));
-        checkBox->setChecked(lpt_ports[i].enabled > 0);
-        cbox->setEnabled(lpt_ports[i].enabled > 0);
-    }
-
-    for (int i = 0; i < SERIAL_MAX; i++) {
-        auto *checkBox = findChild<QCheckBox *>(QString("checkBoxSerial%1").arg(i + 1));
-        checkBox->setChecked(com_ports[i].enabled > 0);
-    }
-
-    ui->checkBoxSerialPassThru1->setChecked(serial_passthrough_enabled[0]);
-    ui->pushButtonSerialPassThru1->setEnabled(serial_passthrough_enabled[0]);
-    ui->checkBoxSerialPassThru2->setChecked(serial_passthrough_enabled[1]);
-    ui->pushButtonSerialPassThru2->setEnabled(serial_passthrough_enabled[1]);
-    ui->checkBoxSerialPassThru3->setChecked(serial_passthrough_enabled[2]);
-    ui->pushButtonSerialPassThru3->setEnabled(serial_passthrough_enabled[2]);
-    ui->checkBoxSerialPassThru4->setChecked(serial_passthrough_enabled[3]);
-    ui->pushButtonSerialPassThru4->setEnabled(serial_passthrough_enabled[3]);
+    onCurrentMachineChanged(machine);
 }
 
 SettingsPorts::~SettingsPorts()
@@ -86,22 +49,221 @@ SettingsPorts::~SettingsPorts()
 void
 SettingsPorts::save()
 {
+    jumpered_internal_ecp_dma = ui->comboBoxLptECPDMA->currentData().toInt();
+
     for (int i = 0; i < PARALLEL_MAX; i++) {
-        auto *cbox           = findChild<QComboBox *>(QString("comboBoxLpt%1").arg(i + 1));
-        auto *checkBox       = findChild<QCheckBox *>(QString("checkBoxParallel%1").arg(i + 1));
-        lpt_ports[i].device  = cbox->currentData().toInt();
-        lpt_ports[i].enabled = checkBox->isChecked() ? 1 : 0;
+        auto *cbox     = findChild<QComboBox *>(QString("comboBoxLpt%1").arg(i + 1));
+        auto *checkBox = findChild<QCheckBox *>(QString("checkBoxParallel%1").arg(i + 1));
+        if (cbox != NULL)
+            lpt_ports[i].device  = cbox->currentData().toInt();
+        if (checkBox != NULL)
+            lpt_ports[i].enabled = checkBox->isChecked() ? 1 : 0;
     }
 
-    for (int i = 0; i < SERIAL_MAX; i++) {
-        auto *checkBox       = findChild<QCheckBox *>(QString("checkBoxSerial%1").arg(i + 1));
-        com_ports[i].enabled = checkBox->isChecked() ? 1 : 0;
+    for (int i = 0; i < (SERIAL_MAX - 1); i++) {
+        auto *checkBox     = findChild<QCheckBox *>(QString("checkBoxSerial%1").arg(i + 1));
+        auto *checkBoxPass = findChild<QCheckBox *>(QString("checkBoxSerialPassThru%1").arg(i + 1));
+        if (checkBox != NULL)
+            com_ports[i].enabled = checkBox->isChecked() ? 1 : 0;
+        if (checkBoxPass != NULL)
+            serial_passthrough_enabled[i] = checkBoxPass->isChecked();
+    }
+}
+
+void
+SettingsPorts::onCurrentMachineChanged(int machineId)
+{
+    this->machineId = machineId;
+
+    int c                  = 0;
+
+    auto *lptEcpDmaModel   = ui->comboBoxLptECPDMA->model();
+    auto  removeRowsEcpDma = lptEcpDmaModel->rowCount();
+
+    int has_jumpers        = !!machine_has_jumpered_ecp_dma(machineId, DMA_ANY);
+
+    int selectedRow        = -2;
+    int first              = -2;
+
+    for (int i = 0; i < 9; ++i) {
+        int         j             = machine_map_jumpered_ecp_dma(i);
+
+        if ((has_jumpers && ((j == DMA_NONE) || !machine_has_jumpered_ecp_dma(machineId, j))) ||
+            (!has_jumpers && (j != DMA_NONE)))
+            continue;
+
+        if (first == -2)
+            first = j;
+
+        QString name = tr(machine_get_jumpered_ecp_dma_name(i));
+        int     row  = lptEcpDmaModel->rowCount();
+        lptEcpDmaModel->insertRow(row);
+        auto idx = lptEcpDmaModel->index(row, 0);
+
+        lptEcpDmaModel->setData(idx, name, Qt::DisplayRole);
+        lptEcpDmaModel->setData(idx, j, Qt::UserRole);
+
+        if (j == jumpered_internal_ecp_dma)
+            selectedRow = row - removeRowsEcpDma;
+
+        c++;
     }
 
-    serial_passthrough_enabled[0] = ui->checkBoxSerialPassThru1->isChecked();
-    serial_passthrough_enabled[1] = ui->checkBoxSerialPassThru2->isChecked();
-    serial_passthrough_enabled[2] = ui->checkBoxSerialPassThru3->isChecked();
-    serial_passthrough_enabled[3] = ui->checkBoxSerialPassThru4->isChecked();
+    if (selectedRow == -2)
+        selectedRow = first;
+
+    lptEcpDmaModel->removeRows(0, removeRowsEcpDma);
+    ui->comboBoxLptECPDMA->setCurrentIndex(-1);
+    ui->comboBoxLptECPDMA->setCurrentIndex(selectedRow);
+
+    if ((c == 1) || !has_jumpers)
+        ui->comboBoxLptECPDMA->setEnabled(false);
+    else
+        ui->comboBoxLptECPDMA->setEnabled(true);
+
+    c = 0;
+
+    // LPT Device
+    QComboBox *         cbox[PARALLEL_MAX]         = { 0 };
+    QAbstractItemModel *models[PARALLEL_MAX]       = { 0 };
+    int                 removeRows_[PARALLEL_MAX]  = { 0 };
+    int                 selectedRows[PARALLEL_MAX] = { 0 };
+
+    for (uint8_t i = 0; i < PARALLEL_MAX; ++i) {
+        cbox[i]        = findChild<QComboBox *>(QString("comboBoxLpt%1").arg(i + 1));
+        models[i]      = cbox[i]->model();
+        removeRows_[i] = models[i]->rowCount();
+    }
+
+    while (true) {
+        const char    *lptName = lpt_device_get_name(c);
+
+        if (lptName == nullptr)
+            break;
+
+        const QString  name = tr(lptName);
+
+        for (uint8_t i = 0; i < PARALLEL_MAX; ++i) {
+            int row = Models::AddEntry(models[i], name, c);
+
+            if (c == lpt_ports[i].device)
+                selectedRows[i] = row - removeRows_[i];
+        }
+
+       c++;
+    }
+
+    for (uint8_t i = 0; i < PARALLEL_MAX; ++i) {
+        models[i]->removeRows(0, removeRows_[i]);
+        cbox[i]->setEnabled(models[i]->rowCount() > 1);
+        cbox[i]->setCurrentIndex(-1);
+        cbox[i]->setCurrentIndex(selectedRows[i]);
+
+        auto *checkBox  = findChild<QCheckBox *>(QString("checkBoxParallel%1").arg(i + 1));
+        auto *buttonCfg = findChild<QPushButton *>(QString("pushButtonConfigureLpt%1").arg(i + 1));
+        if (checkBox != NULL)
+            checkBox->setChecked(lpt_ports[i].enabled > 0);
+        if (cbox[i] != NULL) {
+            cbox[i]->setEnabled(lpt_ports[i].enabled > 0);
+            if (buttonCfg != NULL) {
+                int lptDevice = cbox[i]->currentData().toInt();
+                buttonCfg->setEnabled(lpt_device_has_config(lptDevice) && (lpt_ports[i].enabled > 0));
+            }
+        }
+    }
+
+    for (int i = 0; i < (SERIAL_MAX - 1); i++) {
+        auto *checkBox     = findChild<QCheckBox *>(QString("checkBoxSerial%1").arg(i + 1));
+        auto *checkBoxPass = findChild<QCheckBox *>(QString("checkBoxSerialPassThru%1").arg(i + 1));
+        auto *buttonPass   = findChild<QPushButton *>(QString("pushButtonSerialPassThru%1").arg(i + 1));
+        if (checkBox != NULL)
+            checkBox->setChecked(com_ports[i].enabled > 0);
+        if (checkBoxPass != NULL) {
+            checkBoxPass->setEnabled(com_ports[i].enabled > 0);
+            checkBoxPass->setChecked(serial_passthrough_enabled[i]);
+            buttonPass->setEnabled((com_ports[i].enabled > 0) && serial_passthrough_enabled[i]);
+        }
+    }
+}
+
+void
+SettingsPorts::on_comboBoxLpt1_currentIndexChanged(int index)
+{
+    if (index < 0)
+        return;
+
+    int lptDevice = ui->comboBoxLpt1->currentData().toInt();
+
+    ui->pushButtonConfigureLpt1->setEnabled(lpt_device_has_config(lptDevice));
+}
+
+void
+SettingsPorts::on_pushButtonConfigureLpt1_clicked()
+{
+    int   lptDevice = ui->comboBoxLpt1->currentData().toInt();
+    auto *device    = lpt_device_getdevice(lptDevice);
+
+    DeviceConfig::ConfigureDevice(device, 1);
+}
+
+void
+SettingsPorts::on_comboBoxLpt2_currentIndexChanged(int index)
+{
+    if (index < 0)
+        return;
+
+    int lptDevice = ui->comboBoxLpt2->currentData().toInt();
+
+    ui->pushButtonConfigureLpt2->setEnabled(lpt_device_has_config(lptDevice));
+}
+
+void
+SettingsPorts::on_pushButtonConfigureLpt2_clicked()
+{
+    int   lptDevice = ui->comboBoxLpt2->currentData().toInt();
+    auto *device    = lpt_device_getdevice(lptDevice);
+
+    DeviceConfig::ConfigureDevice(device, 1);
+}
+
+void
+SettingsPorts::on_comboBoxLpt3_currentIndexChanged(int index)
+{
+    if (index < 0)
+        return;
+
+    int lptDevice = ui->comboBoxLpt3->currentData().toInt();
+
+    ui->pushButtonConfigureLpt3->setEnabled(lpt_device_has_config(lptDevice));
+}
+
+void
+SettingsPorts::on_pushButtonConfigureLpt3_clicked()
+{
+    int   lptDevice = ui->comboBoxLpt3->currentData().toInt();
+    auto *device    = lpt_device_getdevice(lptDevice);
+
+    DeviceConfig::ConfigureDevice(device, 1);
+}
+
+void
+SettingsPorts::on_comboBoxLpt4_currentIndexChanged(int index)
+{
+    if (index < 0)
+        return;
+
+    int lptDevice = ui->comboBoxLpt4->currentData().toInt();
+
+    ui->pushButtonConfigureLpt4->setEnabled(lpt_device_has_config(lptDevice));
+}
+
+void
+SettingsPorts::on_pushButtonConfigureLpt4_clicked()
+{
+    int   lptDevice = ui->comboBoxLpt4->currentData().toInt();
+    auto *device    = lpt_device_getdevice(lptDevice);
+
+    DeviceConfig::ConfigureDevice(device, 1);
 }
 
 void
@@ -128,50 +290,141 @@ SettingsPorts::on_checkBoxParallel4_stateChanged(int state)
     ui->comboBoxLpt4->setEnabled(state == Qt::Checked);
 }
 
+void
+SettingsPorts::on_checkBoxSerial1_stateChanged(int state)
+{
+    ui->checkBoxSerialPassThru1->setEnabled(state == Qt::Checked);
+    ui->pushButtonSerialPassThru1->setEnabled((state == Qt::Checked) && ui->checkBoxSerialPassThru1->isChecked());
+}
+
+void
+SettingsPorts::on_checkBoxSerial2_stateChanged(int state)
+{
+    ui->checkBoxSerialPassThru2->setEnabled(state == Qt::Checked);
+    ui->pushButtonSerialPassThru2->setEnabled((state == Qt::Checked) && ui->checkBoxSerialPassThru2->isChecked());
+}
+
+void
+SettingsPorts::on_checkBoxSerial3_stateChanged(int state)
+{
+    ui->checkBoxSerialPassThru3->setEnabled(state == Qt::Checked);
+    ui->pushButtonSerialPassThru3->setEnabled((state == Qt::Checked) && ui->checkBoxSerialPassThru3->isChecked());
+}
+
+void
+SettingsPorts::on_checkBoxSerial4_stateChanged(int state)
+{
+    ui->checkBoxSerialPassThru4->setEnabled(state == Qt::Checked);
+    ui->pushButtonSerialPassThru4->setEnabled((state == Qt::Checked) && ui->checkBoxSerialPassThru4->isChecked());
+}
+
+#if 0
+void
+SettingsPorts::on_checkBoxSerial5_stateChanged(int state)
+{
+    ui->checkBoxSerialPassThru5->setEnabled(state == Qt::Checked);
+    ui->pushButtonSerialPassThru5->setEnabled((state == Qt::Checked) && ui->checkBoxSerialPassThru5->isChecked());
+}
+
+void
+SettingsPorts::on_checkBoxSerial6_stateChanged(int state)
+{
+    ui->checkBoxSerialPassThru6->setEnabled(state == Qt::Checked);
+    ui->pushButtonSerialPassThru6->setEnabled((state == Qt::Checked) && ui->checkBoxSerialPassThru6->isChecked());
+}
+
+void
+SettingsPorts::on_checkBoxSerial7_stateChanged(int state)
+{
+    ui->checkBoxSerialPassThru7->setEnabled(state == Qt::Checked);
+    ui->pushButtonSerialPassThru7->setEnabled((state == Qt::Checked) && ui->checkBoxSerialPassThru7->isChecked());
+}
+#endif
+
+void
+SettingsPorts::on_checkBoxSerialPassThru1_stateChanged(int state)
+{
+    ui->pushButtonSerialPassThru1->setEnabled(state == Qt::Checked);
+}
+
+void
+SettingsPorts::on_checkBoxSerialPassThru2_stateChanged(int state)
+{
+    ui->pushButtonSerialPassThru2->setEnabled(state == Qt::Checked);
+}
+
+void
+SettingsPorts::on_checkBoxSerialPassThru3_stateChanged(int state)
+{
+    ui->pushButtonSerialPassThru3->setEnabled(state == Qt::Checked);
+}
+
+void
+SettingsPorts::on_checkBoxSerialPassThru4_stateChanged(int state)
+{
+    ui->pushButtonSerialPassThru4->setEnabled(state == Qt::Checked);
+}
+
+#if 0
+void
+SettingsPorts::on_checkBoxSerialPassThru5_stateChanged(int state)
+{
+    ui->pushButtonSerialPassThru5->setEnabled(state == Qt::Checked);
+}
+
+void
+SettingsPorts::on_checkBoxSerialPassThru6_stateChanged(int state)
+{
+    ui->pushButtonSerialPassThru6->setEnabled(state == Qt::Checked);
+}
+
+void
+SettingsPorts::on_checkBoxSerialPassThru7_stateChanged(int state)
+{
+    ui->pushButtonSerialPassThru7->setEnabled(state == Qt::Checked);
+}
+#endif
+
 void
 SettingsPorts::on_pushButtonSerialPassThru1_clicked()
 {
-    DeviceConfig::ConfigureDevice(&serial_passthrough_device, 1, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(&serial_passthrough_device, 1);
 }
 
 void
 SettingsPorts::on_pushButtonSerialPassThru2_clicked()
 {
-    DeviceConfig::ConfigureDevice(&serial_passthrough_device, 2, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(&serial_passthrough_device, 2);
 }
 
 void
 SettingsPorts::on_pushButtonSerialPassThru3_clicked()
 {
-    DeviceConfig::ConfigureDevice(&serial_passthrough_device, 3, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(&serial_passthrough_device, 3);
 }
 
 void
 SettingsPorts::on_pushButtonSerialPassThru4_clicked()
 {
-    DeviceConfig::ConfigureDevice(&serial_passthrough_device, 4, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(&serial_passthrough_device, 4);
+}
+
+#if 0
+void
+SettingsPorts::on_pushButtonSerialPassThru5_clicked()
+{
+    DeviceConfig::ConfigureDevice(&serial_passthrough_device, 5);
 }
 
 void
-SettingsPorts::on_checkBoxSerialPassThru1_clicked(bool checked)
+SettingsPorts::on_pushButtonSerialPassThru6_clicked()
 {
-    ui->pushButtonSerialPassThru1->setEnabled(checked);
+    DeviceConfig::ConfigureDevice(&serial_passthrough_device, 6);
 }
 
 void
-SettingsPorts::on_checkBoxSerialPassThru2_clicked(bool checked)
+SettingsPorts::on_pushButtonSerialPassThru7_clicked()
 {
-    ui->pushButtonSerialPassThru2->setEnabled(checked);
-}
-
-void
-SettingsPorts::on_checkBoxSerialPassThru3_clicked(bool checked)
-{
-    ui->pushButtonSerialPassThru3->setEnabled(checked);
-}
-
-void
-SettingsPorts::on_checkBoxSerialPassThru4_clicked(bool checked)
-{
-    ui->pushButtonSerialPassThru4->setEnabled(checked);
+    DeviceConfig::ConfigureDevice(&serial_passthrough_device, 7);
 }
+#endif
diff --git a/src/qt/qt_settingsports.hpp b/src/qt/qt_settingsports.hpp
index a5129d35f..f6024b094 100644
--- a/src/qt/qt_settingsports.hpp
+++ b/src/qt/qt_settingsports.hpp
@@ -15,39 +15,60 @@ public:
     ~SettingsPorts();
 
     void save();
-private slots:
-    void on_checkBoxSerialPassThru4_clicked(bool checked);
+
+public slots:
+    void onCurrentMachineChanged(int machineId);
 
 private slots:
-    void on_checkBoxSerialPassThru3_clicked(bool checked);
+    void on_comboBoxLpt1_currentIndexChanged(int index);
+    void on_pushButtonConfigureLpt1_clicked();
+    void on_comboBoxLpt2_currentIndexChanged(int index);
+    void on_pushButtonConfigureLpt2_clicked();
+    void on_comboBoxLpt3_currentIndexChanged(int index);
+    void on_pushButtonConfigureLpt3_clicked();
+    void on_comboBoxLpt4_currentIndexChanged(int index);
+    void on_pushButtonConfigureLpt4_clicked();
 
-private slots:
-    void on_checkBoxSerialPassThru2_clicked(bool checked);
+    void on_checkBoxParallel1_stateChanged(int state);
+    void on_checkBoxParallel2_stateChanged(int state);
+    void on_checkBoxParallel3_stateChanged(int state);
+    void on_checkBoxParallel4_stateChanged(int state);
 
-private slots:
-    void on_pushButtonSerialPassThru4_clicked();
-
-private slots:
-    void on_pushButtonSerialPassThru3_clicked();
-
-private slots:
-    void on_pushButtonSerialPassThru2_clicked();
-
-private slots:
+    void on_checkBoxSerial1_stateChanged(int state);
+    void on_checkBoxSerial2_stateChanged(int state);
+    void on_checkBoxSerial3_stateChanged(int state);
+    void on_checkBoxSerial4_stateChanged(int state);
+#if 0
+    void on_checkBoxSerial5_stateChanged(int state);
+    void on_checkBoxSerial6_stateChanged(int state);
+    void on_checkBoxSerial7_stateChanged(int state);
+#endif
+    void on_checkBoxSerialPassThru1_stateChanged(int state);
     void on_pushButtonSerialPassThru1_clicked();
 
-private slots:
-    void on_checkBoxSerialPassThru1_clicked(bool checked);
+    void on_checkBoxSerialPassThru2_stateChanged(int state);
+    void on_pushButtonSerialPassThru2_clicked();
 
-private slots:
-    void on_checkBoxParallel3_stateChanged(int arg1);
-    void on_checkBoxParallel2_stateChanged(int arg1);
-    void on_checkBoxParallel1_stateChanged(int arg1);
+    void on_checkBoxSerialPassThru3_stateChanged(int state);
+    void on_pushButtonSerialPassThru3_clicked();
 
-    void on_checkBoxParallel4_stateChanged(int arg1);
+    void on_checkBoxSerialPassThru4_stateChanged(int state);
+    void on_pushButtonSerialPassThru4_clicked();
+
+#if 0
+    void on_checkBoxSerialPassThru5_stateChanged(int state);
+    void on_pushButtonSerialPassThru5_clicked();
+
+    void on_checkBoxSerialPassThru6_stateChanged(int state);
+    void on_pushButtonSerialPassThru6_clicked();
+
+    void on_checkBoxSerialPassThru7_stateChanged(int state);
+    void on_pushButtonSerialPassThru7_clicked();
+#endif
 
 private:
     Ui::SettingsPorts *ui;
+    int                machineId = 0;
 };
 
 #endif // QT_SETTINGSPORTS_HPP
diff --git a/src/qt/qt_settingsports.ui b/src/qt/qt_settingsports.ui
index bca870e5d..9a8533995 100644
--- a/src/qt/qt_settingsports.ui
+++ b/src/qt/qt_settingsports.ui
@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_4">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -27,88 +27,139 @@
     <number>0</number>
    </property>
    <item row="0" column="0">
-    <layout class="QFormLayout" name="formLayout">
+    <layout class="QGridLayout" name="gridLayoutLptECPDMA">
      <item row="0" column="0">
-      <widget class="QLabel" name="label">
+      <widget class="QLabel" name="labelLptECPDMA">
        <property name="text">
-        <string>LPT1 Device:</string>
+        <string>Internal LPT ECP DMA:</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
-      <widget class="QComboBox" name="comboBoxLpt1">
+     <item row="0" column="2">
+      <widget class="QComboBox" name="comboBoxLptECPDMA">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="maxVisibleItems">
         <number>30</number>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
-      <widget class="QLabel" name="label_2">
+      <widget class="QLabel" name="labelLpt1">
+       <property name="text">
+        <string>LPT1 Device:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <widget class="QComboBox" name="comboBoxLpt1">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maxVisibleItems">
+        <number>30</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <widget class="QPushButton" name="pushButtonConfigureLpt1">
+       <property name="text">
+        <string>Configure</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="labelLpt2">
        <property name="text">
         <string>LPT2 Device:</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
+     <item row="2" column="2">
       <widget class="QComboBox" name="comboBoxLpt2">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="maxVisibleItems">
         <number>30</number>
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_3">
+     <item row="2" column="3">
+      <widget class="QPushButton" name="pushButtonConfigureLpt2">
+       <property name="text">
+        <string>Configure</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="labelLpt3">
        <property name="text">
         <string>LPT3 Device:</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
+     <item row="3" column="2">
       <widget class="QComboBox" name="comboBoxLpt3">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="maxVisibleItems">
         <number>30</number>
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="label_4">
+     <item row="3" column="3">
+      <widget class="QPushButton" name="pushButtonConfigureLpt3">
+       <property name="text">
+        <string>Configure</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="labelLpt4">
        <property name="text">
         <string>LPT4 Device:</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
+     <item row="4" column="2">
       <widget class="QComboBox" name="comboBoxLpt4">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="maxVisibleItems">
         <number>30</number>
        </property>
       </widget>
      </item>
+     <item row="4" column="3">
+      <widget class="QPushButton" name="pushButtonConfigureLpt4">
+       <property name="text">
+        <string>Configure</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item row="1" column="0">
     <layout class="QGridLayout" name="gridLayout">
-     <item row="1" column="1">
-      <widget class="QCheckBox" name="checkBoxParallel2">
-       <property name="text">
-        <string>Parallel port 2</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QCheckBox" name="checkBoxParallel3">
-       <property name="text">
-        <string>Parallel port 3</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QCheckBox" name="checkBoxSerial3">
-       <property name="text">
-        <string>Serial port 3</string>
-       </property>
-      </widget>
-     </item>
      <item row="0" column="0">
       <widget class="QCheckBox" name="checkBoxSerial1">
        <property name="text">
@@ -116,20 +167,6 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
-      <widget class="QCheckBox" name="checkBoxParallel4">
-       <property name="text">
-        <string>Parallel port 4</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QCheckBox" name="checkBoxSerial2">
-       <property name="text">
-        <string>Serial port 2</string>
-       </property>
-      </widget>
-     </item>
      <item row="0" column="1">
       <widget class="QCheckBox" name="checkBoxParallel1">
        <property name="text">
@@ -137,6 +174,34 @@
        </property>
       </widget>
      </item>
+     <item row="1" column="0">
+      <widget class="QCheckBox" name="checkBoxSerial2">
+       <property name="text">
+        <string>Serial port 2</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QCheckBox" name="checkBoxParallel2">
+       <property name="text">
+        <string>Parallel port 2</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QCheckBox" name="checkBoxSerial3">
+       <property name="text">
+        <string>Serial port 3</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QCheckBox" name="checkBoxParallel3">
+       <property name="text">
+        <string>Parallel port 3</string>
+       </property>
+      </widget>
+     </item>
      <item row="3" column="0">
       <widget class="QCheckBox" name="checkBoxSerial4">
        <property name="text">
@@ -144,13 +209,76 @@
        </property>
       </widget>
      </item>
+     <item row="3" column="1">
+      <widget class="QCheckBox" name="checkBoxParallel4">
+       <property name="text">
+        <string>Parallel port 4</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item row="3" column="0">
-    <layout class="QGridLayout" name="gridLayout_5">
+    <layout class="QGridLayout" name="gridLayoutPassThru">
      <property name="sizeConstraint">
       <enum>QLayout::SetDefaultConstraint</enum>
      </property>
+     <item row="0" column="0">
+      <widget class="QCheckBox" name="checkBoxSerialPassThru1">
+       <property name="text">
+        <string>Serial port passthrough 1</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QPushButton" name="pushButtonSerialPassThru1">
+       <property name="text">
+        <string>Configure</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QCheckBox" name="checkBoxSerialPassThru2">
+       <property name="text">
+        <string>Serial port passthrough 2</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QPushButton" name="pushButtonSerialPassThru2">
+       <property name="text">
+        <string>Configure</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QCheckBox" name="checkBoxSerialPassThru3">
+       <property name="text">
+        <string>Serial port passthrough 3</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QPushButton" name="pushButtonSerialPassThru3">
+       <property name="text">
+        <string>Configure</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QCheckBox" name="checkBoxSerialPassThru4">
+       <property name="text">
+        <string>Serial port passthrough 4</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QPushButton" name="pushButtonSerialPassThru4">
+       <property name="text">
+        <string>Configure</string>
+       </property>
+      </widget>
+     </item>
      <item row="4" column="0">
       <spacer name="horizontalSpacer">
        <property name="orientation">
@@ -164,13 +292,6 @@
        </property>
       </spacer>
      </item>
-     <item row="2" column="0">
-      <widget class="QCheckBox" name="checkBoxSerialPassThru3">
-       <property name="text">
-        <string>Serial port passthrough 3</string>
-       </property>
-      </widget>
-     </item>
      <item row="5" column="0" colspan="2">
       <spacer name="verticalSpacer">
        <property name="orientation">
@@ -184,55 +305,6 @@
        </property>
       </spacer>
      </item>
-     <item row="0" column="1">
-      <widget class="QPushButton" name="pushButtonSerialPassThru1">
-       <property name="text">
-        <string>Configure</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0">
-      <widget class="QCheckBox" name="checkBoxSerialPassThru1">
-       <property name="text">
-        <string>Serial port passthrough 1</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QCheckBox" name="checkBoxSerialPassThru2">
-       <property name="text">
-        <string>Serial port passthrough 2</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0">
-      <widget class="QCheckBox" name="checkBoxSerialPassThru4">
-       <property name="text">
-        <string>Serial port passthrough 4</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QPushButton" name="pushButtonSerialPassThru2">
-       <property name="text">
-        <string>Configure</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QPushButton" name="pushButtonSerialPassThru3">
-       <property name="text">
-        <string>Configure</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1">
-      <widget class="QPushButton" name="pushButtonSerialPassThru4">
-       <property name="text">
-        <string>Configure</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>
diff --git a/src/qt/qt_settingssound.cpp b/src/qt/qt_settingssound.cpp
index b4df4ff69..57e278515 100644
--- a/src/qt/qt_settingssound.cpp
+++ b/src/qt/qt_settingssound.cpp
@@ -14,7 +14,7 @@
  *          Jasmine Iwanek <jriwanek@gmail.com>
  *
  *          Copyright 2021      Joakim L. Gilje
- *          Copyright 2022-2023 Jasmine Iwanek
+ *          Copyright 2022-2025 Jasmine Iwanek
  */
 #include "qt_settingssound.hpp"
 #include "ui_qt_settingssound.h"
@@ -50,13 +50,15 @@ void
 SettingsSound::save()
 {
     for (uint8_t i = 0; i < SOUND_CARD_MAX; ++i) {
-        auto *cbox = findChild<QComboBox *>(QString("comboBoxSoundCard%1").arg(i + 1));
-        sound_card_current[i]         = cbox->currentData().toInt();
+        QComboBox *cbox       = findChild<QComboBox *>(QString("comboBoxSoundCard%1").arg(i + 1));
+        sound_card_current[i] = cbox->currentData().toInt();
     }
 
     midi_output_device_current = ui->comboBoxMidiOut->currentData().toInt();
-    midi_input_device_current  = ui->comboBoxMidiIn->currentData().toInt();
-    mpu401_standalone_enable   = ui->checkBoxMPU401->isChecked() ? 1 : 0;
+
+    midi_input_device_current = ui->comboBoxMidiIn->currentData().toInt();
+
+    mpu401_standalone_enable = ui->checkBoxMPU401->isChecked() ? 1 : 0;
 
     sound_is_float = ui->checkBoxFloat32->isChecked() ? 1 : 0;
 
@@ -67,97 +69,114 @@ SettingsSound::save()
 }
 
 void
-SettingsSound::onCurrentMachineChanged(int machineId)
+SettingsSound::onCurrentMachineChanged(const int machineId)
 {
     this->machineId = machineId;
 
-    int c           = 0;
-    int selectedRow = 0;
+    int                 c;
+    int                 selectedRow;
+
+    // Sound Cards
+    QComboBox          *cbox[SOUND_CARD_MAX]         = { 0 };
+    QAbstractItemModel *models[SOUND_CARD_MAX]       = { 0 };
+    int                 removeRows_[SOUND_CARD_MAX]  = { 0 };
+    int                 selectedRows[SOUND_CARD_MAX] = { 0 };
+    int                 m_has_snd                    = machine_has_flags(machineId, MACHINE_SOUND);
 
     for (uint8_t i = 0; i < SOUND_CARD_MAX; ++i) {
-        auto *cbox       = findChild<QComboBox *>(QString("comboBoxSoundCard%1").arg(i + 1));
-        auto *model      = cbox->model();
-        auto  removeRows = model->rowCount();
-        c                = 0;
-        selectedRow      = 0;
-
-        while (true) {
-            /* Skip "internal" if machine doesn't have it or this is not the primary card. */
-            if ((c == 1) && ((i > 0) || (machine_has_flags(machineId, MACHINE_SOUND) == 0))) {
-                c++;
-                continue;
-            }
-
-            auto name = DeviceConfig::DeviceName(sound_card_getdevice(c), sound_card_get_internal_name(c), 1);
-            if (name.isEmpty()) {
-                break;
-            }
-
-            if (sound_card_available(c) && device_is_valid(sound_card_getdevice(c), machineId)) {
-                int row = Models::AddEntry(model, name, c);
-                if (c == sound_card_current[i]) {
-                    selectedRow = row - removeRows;
-                }
-            }
-            c++;
-        }
-
-        model->removeRows(0, removeRows);
-        cbox->setEnabled(model->rowCount() > 0);
-        cbox->setCurrentIndex(-1);
-        cbox->setCurrentIndex(selectedRow);
+        cbox[i]        = findChild<QComboBox *>(QString("comboBoxSoundCard%1").arg(i + 1));
+        models[i]      = cbox[i]->model();
+        removeRows_[i] = models[i]->rowCount();
     }
 
-    auto model       = ui->comboBoxMidiOut->model();
-    auto removeRows  = model->rowCount();
-    c           = 0;
-    selectedRow = 0;
+    c = 0;
     while (true) {
-        QString name = DeviceConfig::DeviceName(midi_out_device_getdevice(c), midi_out_device_get_internal_name(c), 0);
-        if (name.isEmpty()) {
+        const QString name = DeviceConfig::DeviceName(sound_card_getdevice(c),
+                                                      sound_card_get_internal_name(c), 1);
+
+        if (name.isEmpty())
             break;
+
+        if (sound_card_available(c)) {
+            if (device_is_valid(sound_card_getdevice(c), machineId)) {
+                for (uint8_t i = 0; i < SOUND_CARD_MAX; ++i) {
+                    if ((c != 1) || ((i == 0) && m_has_snd)) {
+                        int row = Models::AddEntry(models[i], name, c);
+
+                        if (c == sound_card_current[i])
+                            selectedRows[i] = row - removeRows_[i];
+                    }
+                }
+            }
         }
 
+        c++;
+    }
+
+    for (uint8_t i = 0; i < SOUND_CARD_MAX; ++i) {
+        models[i]->removeRows(0, removeRows_[i]);
+        cbox[i]->setEnabled(models[i]->rowCount() > 1);
+        cbox[i]->setCurrentIndex(-1);
+        cbox[i]->setCurrentIndex(selectedRows[i]);
+    }
+
+    // Midi Out
+    c               = 0;
+    auto *model     = ui->comboBoxMidiOut->model();
+    auto removeRows = model->rowCount();
+    selectedRow     = 0;
+
+    while (true) {
+        const QString name = DeviceConfig::DeviceName(midi_out_device_getdevice(c), midi_out_device_get_internal_name(c), 0);
+        if (name.isEmpty())
+            break;
+
         if (midi_out_device_available(c)) {
             int row = Models::AddEntry(model, name, c);
-            if (c == midi_output_device_current) {
+            if (c == midi_output_device_current)
                 selectedRow = row - removeRows;
-            }
         }
+
         c++;
     }
+
     model->removeRows(0, removeRows);
     ui->comboBoxMidiOut->setEnabled(model->rowCount() > 0);
     ui->comboBoxMidiOut->setCurrentIndex(-1);
     ui->comboBoxMidiOut->setCurrentIndex(selectedRow);
 
+    // Midi In
+    c           = 0;
     model       = ui->comboBoxMidiIn->model();
     removeRows  = model->rowCount();
-    c           = 0;
     selectedRow = 0;
+
     while (true) {
-        QString name = DeviceConfig::DeviceName(midi_in_device_getdevice(c), midi_in_device_get_internal_name(c), 0);
-        if (name.isEmpty()) {
+        const QString name = DeviceConfig::DeviceName(midi_in_device_getdevice(c), midi_in_device_get_internal_name(c), 0);
+        if (name.isEmpty())
             break;
-        }
 
         if (midi_in_device_available(c)) {
             int row = Models::AddEntry(model, name, c);
-            if (c == midi_input_device_current) {
+            if (c == midi_input_device_current)
                 selectedRow = row - removeRows;
-            }
         }
 
         c++;
     }
+
     model->removeRows(0, removeRows);
     ui->comboBoxMidiIn->setEnabled(model->rowCount() > 0);
     ui->comboBoxMidiIn->setCurrentIndex(-1);
     ui->comboBoxMidiIn->setCurrentIndex(selectedRow);
 
+    // Standalone MPU401
     ui->checkBoxMPU401->setChecked(mpu401_standalone_enable > 0);
+
+    // Float32 Sound
     ui->checkBoxFloat32->setChecked(sound_is_float > 0);
 
+    // FM Driver
     switch (fm_driver) {
         case FM_DRV_YMFM:
             ui->radioButtonYMFM->setChecked(true);
@@ -175,13 +194,11 @@ allowMpu401(Ui::SettingsSound *ui)
     QString midiOut = midi_out_device_get_internal_name(ui->comboBoxMidiOut->currentData().toInt());
     QString midiIn  = midi_in_device_get_internal_name(ui->comboBoxMidiIn->currentData().toInt());
 
-    if (midiOut.isEmpty()) {
+    if (midiOut.isEmpty())
         return false;
-    }
 
-    if (midiOut == QStringLiteral("none") && midiIn == QStringLiteral("none")) {
+    if (midiOut == QStringLiteral("none") && midiIn == QStringLiteral("none"))
         return false;
-    }
 
     return true;
 }
@@ -189,10 +206,11 @@ allowMpu401(Ui::SettingsSound *ui)
 void
 SettingsSound::on_comboBoxSoundCard1_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
+
     int sndCard = ui->comboBoxSoundCard1->currentData().toInt();
+
     if (sndCard == SOUND_INTERNAL)
         ui->pushButtonConfigureSoundCard1->setEnabled(machine_has_flags(machineId, MACHINE_SOUND) &&
                                             device_has_config(machine_get_snd_device(machineId)));
@@ -203,73 +221,79 @@ SettingsSound::on_comboBoxSoundCard1_currentIndexChanged(int index)
 void
 SettingsSound::on_pushButtonConfigureSoundCard1_clicked()
 {
-    int sndCard = ui->comboBoxSoundCard1->currentData().toInt();
-    auto *device = sound_card_getdevice(sndCard);
+    int   sndCard = ui->comboBoxSoundCard1->currentData().toInt();
+    auto *device  = sound_card_getdevice(sndCard);
+
     if (sndCard == SOUND_INTERNAL)
         device = machine_get_snd_device(machineId);
-    DeviceConfig::ConfigureDevice(device, 0, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(device, 1);
 }
 
 void
 SettingsSound::on_comboBoxSoundCard2_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
+
     int sndCard = ui->comboBoxSoundCard2->currentData().toInt();
+
     ui->pushButtonConfigureSoundCard2->setEnabled(sound_card_has_config(sndCard));
 }
 
 void
 SettingsSound::on_pushButtonConfigureSoundCard2_clicked()
 {
-    int sndCard = ui->comboBoxSoundCard2->currentData().toInt();
-    auto *device = sound_card_getdevice(sndCard);
-    DeviceConfig::ConfigureDevice(device, 0, qobject_cast<Settings *>(Settings::settings));
+    int             sndCard = ui->comboBoxSoundCard2->currentData().toInt();
+    const device_t *device  = sound_card_getdevice(sndCard);
+    DeviceConfig::ConfigureDevice(device, 2);
 }
 
 void
 SettingsSound::on_comboBoxSoundCard3_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
+
     int sndCard = ui->comboBoxSoundCard3->currentData().toInt();
+
     ui->pushButtonConfigureSoundCard3->setEnabled(sound_card_has_config(sndCard));
 }
 
 void
 SettingsSound::on_pushButtonConfigureSoundCard3_clicked()
 {
-    int sndCard = ui->comboBoxSoundCard3->currentData().toInt();
-    auto *device = sound_card_getdevice(sndCard);
-    DeviceConfig::ConfigureDevice(device, 0, qobject_cast<Settings *>(Settings::settings));
+    int             sndCard = ui->comboBoxSoundCard3->currentData().toInt();
+    const device_t *device  = sound_card_getdevice(sndCard);
+
+    DeviceConfig::ConfigureDevice(device, 3);
 }
 
 void
 SettingsSound::on_comboBoxSoundCard4_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
+
     int sndCard = ui->comboBoxSoundCard4->currentData().toInt();
+
     ui->pushButtonConfigureSoundCard4->setEnabled(sound_card_has_config(sndCard));
 }
 
 void
 SettingsSound::on_pushButtonConfigureSoundCard4_clicked()
 {
-    int sndCard = ui->comboBoxSoundCard4->currentData().toInt();
-    auto *device = sound_card_getdevice(sndCard);
-    DeviceConfig::ConfigureDevice(device, 0, qobject_cast<Settings *>(Settings::settings));
+    int             sndCard = ui->comboBoxSoundCard4->currentData().toInt();
+    const device_t *device  = sound_card_getdevice(sndCard);
+
+    DeviceConfig::ConfigureDevice(device, 4);
 }
 
 void
 SettingsSound::on_comboBoxMidiOut_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
+
     ui->pushButtonConfigureMidiOut->setEnabled(midi_out_device_has_config(ui->comboBoxMidiOut->currentData().toInt()));
     ui->checkBoxMPU401->setEnabled(allowMpu401(ui) && (machine_has_bus(machineId, MACHINE_BUS_ISA) || machine_has_bus(machineId, MACHINE_BUS_MCA)));
     ui->pushButtonConfigureMPU401->setEnabled(allowMpu401(ui) && ui->checkBoxMPU401->isChecked());
@@ -278,15 +302,15 @@ SettingsSound::on_comboBoxMidiOut_currentIndexChanged(int index)
 void
 SettingsSound::on_pushButtonConfigureMidiOut_clicked()
 {
-    DeviceConfig::ConfigureDevice(midi_out_device_getdevice(ui->comboBoxMidiOut->currentData().toInt()), 0, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(midi_out_device_getdevice(ui->comboBoxMidiOut->currentData().toInt()));
 }
 
 void
 SettingsSound::on_comboBoxMidiIn_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
+
     ui->pushButtonConfigureMidiIn->setEnabled(midi_in_device_has_config(ui->comboBoxMidiIn->currentData().toInt()));
     ui->checkBoxMPU401->setEnabled(allowMpu401(ui) && (machine_has_bus(machineId, MACHINE_BUS_ISA) || machine_has_bus(machineId, MACHINE_BUS_MCA)));
     ui->pushButtonConfigureMPU401->setEnabled(allowMpu401(ui) && ui->checkBoxMPU401->isChecked());
@@ -295,7 +319,7 @@ SettingsSound::on_comboBoxMidiIn_currentIndexChanged(int index)
 void
 SettingsSound::on_pushButtonConfigureMidiIn_clicked()
 {
-    DeviceConfig::ConfigureDevice(midi_in_device_getdevice(ui->comboBoxMidiIn->currentData().toInt()), 0, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(midi_in_device_getdevice(ui->comboBoxMidiIn->currentData().toInt()));
 }
 
 void
@@ -307,9 +331,8 @@ SettingsSound::on_checkBoxMPU401_stateChanged(int state)
 void
 SettingsSound::on_pushButtonConfigureMPU401_clicked()
 {
-    if (machine_has_bus(machineId, MACHINE_BUS_MCA) > 0) {
-        DeviceConfig::ConfigureDevice(&mpu401_mca_device, 0, qobject_cast<Settings *>(Settings::settings));
-    } else {
-        DeviceConfig::ConfigureDevice(&mpu401_device, 0, qobject_cast<Settings *>(Settings::settings));
-    }
+    if (machine_has_bus(machineId, MACHINE_BUS_MCA) > 0)
+        DeviceConfig::ConfigureDevice(&mpu401_mca_device);
+    else
+        DeviceConfig::ConfigureDevice(&mpu401_device);
 }
diff --git a/src/qt/qt_settingssound.hpp b/src/qt/qt_settingssound.hpp
index 92b700c92..cc2926d5d 100644
--- a/src/qt/qt_settingssound.hpp
+++ b/src/qt/qt_settingssound.hpp
@@ -20,20 +20,26 @@ public slots:
     void onCurrentMachineChanged(int machineId);
 
 private slots:
-    void on_pushButtonConfigureMPU401_clicked();
-    void on_checkBoxMPU401_stateChanged(int arg1);
-    void on_pushButtonConfigureMidiIn_clicked();
-    void on_pushButtonConfigureMidiOut_clicked();
-    void on_comboBoxMidiIn_currentIndexChanged(int index);
-    void on_comboBoxMidiOut_currentIndexChanged(int index);
-    void on_pushButtonConfigureSoundCard1_clicked();
     void on_comboBoxSoundCard1_currentIndexChanged(int index);
-    void on_pushButtonConfigureSoundCard2_clicked();
+    void on_pushButtonConfigureSoundCard1_clicked();
+
     void on_comboBoxSoundCard2_currentIndexChanged(int index);
-    void on_pushButtonConfigureSoundCard3_clicked();
+    void on_pushButtonConfigureSoundCard2_clicked();
+
     void on_comboBoxSoundCard3_currentIndexChanged(int index);
-    void on_pushButtonConfigureSoundCard4_clicked();
+    void on_pushButtonConfigureSoundCard3_clicked();
+
     void on_comboBoxSoundCard4_currentIndexChanged(int index);
+    void on_pushButtonConfigureSoundCard4_clicked();
+
+    void on_comboBoxMidiOut_currentIndexChanged(int index);
+    void on_pushButtonConfigureMidiOut_clicked();
+
+    void on_comboBoxMidiIn_currentIndexChanged(int index);
+    void on_pushButtonConfigureMidiIn_clicked();
+
+    void on_checkBoxMPU401_stateChanged(int arg1);
+    void on_pushButtonConfigureMPU401_clicked();
 
 private:
     Ui::SettingsSound *ui;
diff --git a/src/qt/qt_settingssound.ui b/src/qt/qt_settingssound.ui
index 1d5ab0050..97ef7c3ff 100644
--- a/src/qt/qt_settingssound.ui
+++ b/src/qt/qt_settingssound.ui
@@ -26,17 +26,23 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item row="5" column="0">
-    <widget class="QLabel" name="label_3">
+   <item row="0" column="0">
+    <widget class="QLabel" name="labelSoundCard1">
      <property name="text">
-      <string>MIDI In Device:</string>
+      <string>Sound card #1:</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Sound card #1:</string>
+   <item row="0" column="1">
+    <widget class="QComboBox" name="comboBoxSoundCard1">
+     <property name="maxVisibleItems">
+      <number>30</number>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
      </property>
     </widget>
    </item>
@@ -48,12 +54,25 @@
     </widget>
    </item>
    <item row="1" column="0">
-    <widget class="QLabel" name="label_4">
+    <widget class="QLabel" name="labelSoundCard2">
      <property name="text">
       <string>Sound card #2:</string>
      </property>
     </widget>
    </item>
+   <item row="1" column="1">
+    <widget class="QComboBox" name="comboBoxSoundCard2">
+     <property name="maxVisibleItems">
+      <number>30</number>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
    <item row="1" column="3">
     <widget class="QPushButton" name="pushButtonConfigureSoundCard2">
      <property name="text">
@@ -62,12 +81,25 @@
     </widget>
    </item>
    <item row="2" column="0">
-    <widget class="QLabel" name="label_5">
+    <widget class="QLabel" name="labelSoundCard3">
      <property name="text">
       <string>Sound card #3:</string>
      </property>
     </widget>
    </item>
+   <item row="2" column="1">
+    <widget class="QComboBox" name="comboBoxSoundCard3">
+     <property name="maxVisibleItems">
+      <number>30</number>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
    <item row="2" column="3">
     <widget class="QPushButton" name="pushButtonConfigureSoundCard3">
      <property name="text">
@@ -75,14 +107,26 @@
      </property>
     </widget>
    </item>
-
    <item row="3" column="0">
-    <widget class="QLabel" name="label_6">
+    <widget class="QLabel" name="labelSoundCard4">
      <property name="text">
       <string>Sound card #4:</string>
      </property>
     </widget>
    </item>
+   <item row="3" column="1">
+    <widget class="QComboBox" name="comboBoxSoundCard4">
+     <property name="maxVisibleItems">
+      <number>30</number>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
    <item row="3" column="3">
     <widget class="QPushButton" name="pushButtonConfigureSoundCard4">
      <property name="text">
@@ -90,49 +134,13 @@
      </property>
     </widget>
    </item>
-
-
-   <item row="5" column="1">
-    <widget class="QComboBox" name="comboBoxMidiIn">
-     <property name="maxVisibleItems">
-      <number>30</number>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
    <item row="4" column="0">
-    <widget class="QLabel" name="label_2">
+    <widget class="QLabel" name="labelMidiOut">
      <property name="text">
       <string>MIDI Out Device:</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="0">
-    <widget class="QCheckBox" name="checkBoxMPU401">
-     <property name="text">
-      <string>Standalone MPU-401</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="3">
-    <widget class="QPushButton" name="pushButtonConfigureMPU401">
-     <property name="text">
-      <string>Configure</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="3">
-    <widget class="QPushButton" name="pushButtonConfigureMidiIn">
-     <property name="text">
-      <string>Configure</string>
-     </property>
-    </widget>
-   </item>
    <item row="4" column="1">
     <widget class="QComboBox" name="comboBoxMidiOut">
      <property name="maxVisibleItems">
@@ -153,6 +161,47 @@
      </property>
     </widget>
    </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="labelMidiIn">
+     <property name="text">
+      <string>MIDI In Device:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <widget class="QComboBox" name="comboBoxMidiIn">
+     <property name="maxVisibleItems">
+      <number>30</number>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="3">
+    <widget class="QPushButton" name="pushButtonConfigureMidiIn">
+     <property name="text">
+      <string>Configure</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0">
+    <widget class="QCheckBox" name="checkBoxMPU401">
+     <property name="text">
+      <string>Standalone MPU-401</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="3">
+    <widget class="QPushButton" name="pushButtonConfigureMPU401">
+     <property name="text">
+      <string>Configure</string>
+     </property>
+    </widget>
+   </item>
    <item row="10" column="0">
     <widget class="QCheckBox" name="checkBoxFloat32">
      <property name="text">
@@ -171,7 +220,7 @@
      <property name="title">
       <string>FM synth driver</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_1">
+     <layout class="QVBoxLayout" name="verticalLayoutFM">
       <item>
        <widget class="QRadioButton" name="radioButtonNuked">
         <property name="text">
@@ -202,58 +251,6 @@
      </property>
     </spacer>
    </item>
-   <item row="0" column="1">
-    <widget class="QComboBox" name="comboBoxSoundCard1">
-     <property name="maxVisibleItems">
-      <number>30</number>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QComboBox" name="comboBoxSoundCard2">
-     <property name="maxVisibleItems">
-      <number>30</number>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QComboBox" name="comboBoxSoundCard3">
-     <property name="maxVisibleItems">
-      <number>30</number>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QComboBox" name="comboBoxSoundCard4">
-     <property name="maxVisibleItems">
-      <number>30</number>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/qt/qt_settingsstoragecontrollers.cpp b/src/qt/qt_settingsstoragecontrollers.cpp
index 30949de3a..8614852eb 100644
--- a/src/qt/qt_settingsstoragecontrollers.cpp
+++ b/src/qt/qt_settingsstoragecontrollers.cpp
@@ -52,15 +52,16 @@ void
 SettingsStorageControllers::save()
 {
     /* Storage devices category */
-    for (int i = 0; i < SCSI_BUS_MAX; ++i) {
-        auto *cbox           = findChild<QComboBox *>(QString("comboBoxSCSI%1").arg(i + 1));
+    for (uint8_t i = 0; i < HDC_MAX; ++i) {
+        QComboBox *cbox      = findChild<QComboBox *>(QString("comboBoxHD%1").arg(i + 1));
+        hdc_current[i]       = cbox->currentData().toInt();
+    }
+    for (uint8_t i = 0; i < SCSI_CARD_MAX; ++i) {
+        QComboBox *cbox      = findChild<QComboBox *>(QString("comboBoxSCSI%1").arg(i + 1));
         scsi_card_current[i] = cbox->currentData().toInt();
     }
-    hdc_current             = ui->comboBoxHD->currentData().toInt();
-    fdc_type                = ui->comboBoxFD->currentData().toInt();
+    fdc_current[0]          = ui->comboBoxFD->currentData().toInt();
     cdrom_interface_current = ui->comboBoxCDInterface->currentData().toInt();
-    ide_ter_enabled         = ui->checkBoxTertiaryIDE->isChecked() ? 1 : 0;
-    ide_qua_enabled         = ui->checkBoxQuaternaryIDE->isChecked() ? 1 : 0;
     cassette_enable         = ui->checkBoxCassette->isChecked() ? 1 : 0;
 }
 
@@ -69,57 +70,32 @@ SettingsStorageControllers::onCurrentMachineChanged(int machineId)
 {
     this->machineId = machineId;
 
-    /*HD controller config*/
-    auto *model       = ui->comboBoxHD->model();
-    auto  removeRows  = model->rowCount();
+    /* FD controller config */
     int   c           = 0;
+    auto *model       = ui->comboBoxFD->model();
+    auto  removeRows  = model->rowCount();
     int   selectedRow = 0;
+
     while (true) {
+#if 0
         /* Skip "internal" if machine doesn't have it. */
-        if ((c == 1) && (machine_has_flags(machineId, MACHINE_HDC) == 0)) {
+        if ((c == 1) && (machine_has_flags(machineId, MACHINE_FDC) == 0)) {
             c++;
             continue;
         }
+#endif
 
-        QString name = DeviceConfig::DeviceName(hdc_get_device(c), hdc_get_internal_name(c), 1);
-        if (name.isEmpty()) {
-            break;
-        }
-
-        if (hdc_available(c)) {
-            auto *hdc_dev = hdc_get_device(c);
-
-            if (device_is_valid(hdc_dev, machineId)) {
-                int row = Models::AddEntry(model, name, c);
-                if (c == hdc_current) {
-                    selectedRow = row - removeRows;
-                }
-            }
-        }
-        c++;
-    }
-    model->removeRows(0, removeRows);
-    ui->comboBoxHD->setEnabled(model->rowCount() > 0);
-    ui->comboBoxHD->setCurrentIndex(-1);
-    ui->comboBoxHD->setCurrentIndex(selectedRow);
-
-    /*FD controller config*/
-    model       = ui->comboBoxFD->model();
-    removeRows  = model->rowCount();
-    c           = 0;
-    selectedRow = 0;
-    while (true) {
         QString name = DeviceConfig::DeviceName(fdc_card_getdevice(c), fdc_card_get_internal_name(c), 1);
         if (name.isEmpty()) {
             break;
         }
 
         if (fdc_card_available(c)) {
-            auto *fdc_dev = fdc_card_getdevice(c);
+            const device_t *fdc_dev = fdc_card_getdevice(c);
 
             if (device_is_valid(fdc_dev, machineId)) {
                 int row = Models::AddEntry(model, name, c);
-                if (c == fdc_type) {
+                if (c == fdc_current[0]) {
                     selectedRow = row - removeRows;
                 }
             }
@@ -132,10 +108,15 @@ SettingsStorageControllers::onCurrentMachineChanged(int machineId)
     ui->comboBoxFD->setCurrentIndex(selectedRow);
 
     /*CD interface controller config*/
-    model      = ui->comboBoxCDInterface->model();
-    removeRows = model->rowCount();
-    c          = 0;
+    ui->labelCDInterface->setVisible(true);
+    ui->comboBoxCDInterface->setVisible(true);
+    ui->pushButtonCDInterface->setVisible(true);
+
+    c           = 0;
+    model       = ui->comboBoxCDInterface->model();
+    removeRows  = model->rowCount();
     selectedRow = 0;
+
     while (true) {
         /* Skip "internal" if machine doesn't have it. */
         QString name = DeviceConfig::DeviceName(cdrom_interface_get_device(c), cdrom_interface_get_internal_name(c), 1);
@@ -144,7 +125,7 @@ SettingsStorageControllers::onCurrentMachineChanged(int machineId)
         }
 
         if (cdrom_interface_available(c)) {
-            auto *cdrom_interface_dev = cdrom_interface_get_device(c);
+            const device_t *cdrom_interface_dev = cdrom_interface_get_device(c);
 
             if (device_is_valid(cdrom_interface_dev, machineId)) {
                 int row = Models::AddEntry(model, name, c);
@@ -160,42 +141,91 @@ SettingsStorageControllers::onCurrentMachineChanged(int machineId)
     ui->comboBoxCDInterface->setCurrentIndex(-1);
     ui->comboBoxCDInterface->setCurrentIndex(selectedRow);
 
-    for (int i = 0; i < SCSI_BUS_MAX; ++i) {
-        auto *cbox  = findChild<QComboBox *>(QString("comboBoxSCSI%1").arg(i + 1));
-        model       = cbox->model();
-        removeRows  = model->rowCount();
-        c           = 0;
-        selectedRow = 0;
+    // HD Controller
+    QComboBox *         hd_cbox[HDC_MAX]            = { 0 };
+    QAbstractItemModel *hd_models[HDC_MAX]          = { 0 };
+    int                 hd_removeRows_[HDC_MAX]     = { 0 };
+    int                 hd_selectedRows[HDC_MAX]    = { 0 };
 
-        while (true) {
-            auto name = DeviceConfig::DeviceName(scsi_card_getdevice(c), scsi_card_get_internal_name(c), 1);
-            if (name.isEmpty()) {
-                break;
-            }
-
-            if (scsi_card_available(c)) {
-                auto *scsi_dev = scsi_card_getdevice(c);
-                if (device_is_valid(scsi_dev, machineId)) {
-                    int row = Models::AddEntry(model, name, c);
-                    if (c == scsi_card_current[i]) {
-                        selectedRow = row - removeRows;
-                    }
-                }
-            }
-            c++;
-        }
-
-        model->removeRows(0, removeRows);
-        cbox->setEnabled(model->rowCount() > 0);
-        cbox->setCurrentIndex(-1);
-        cbox->setCurrentIndex(selectedRow);
+    for (uint8_t i = 0; i < HDC_MAX; ++i) {
+        hd_cbox[i]        = findChild<QComboBox *>(QString("comboBoxHD%1").arg(i + 1));
+        hd_models[i]      = hd_cbox[i]->model();
+        hd_removeRows_[i] = hd_models[i]->rowCount();
     }
 
-    int is_at = IS_AT(machineId);
-    ui->checkBoxTertiaryIDE->setEnabled(is_at > 0);
-    ui->checkBoxQuaternaryIDE->setEnabled(is_at > 0);
-    ui->checkBoxTertiaryIDE->setChecked(ui->checkBoxTertiaryIDE->isEnabled() && ide_ter_enabled);
-    ui->checkBoxQuaternaryIDE->setChecked(ui->checkBoxQuaternaryIDE->isEnabled() && ide_qua_enabled);
+    c = 0;
+    while (true) {
+        const QString name = DeviceConfig::DeviceName(hdc_get_device(c),
+                                                      hdc_get_internal_name(c), 1);
+
+        if (name.isEmpty())
+            break;
+
+        if (hdc_available(c)) {
+            if (device_is_valid(hdc_get_device(c), machineId)) {
+                for (uint8_t i = 0; i < HDC_MAX; ++i) {
+                    /* Skip "internal" if machine doesn't have it. */
+                    if ((c == 1) && ((i > 0) || (machine_has_flags(machineId, MACHINE_HDC) == 0)))
+                        continue;
+
+                    int row = Models::AddEntry(hd_models[i], name, c);
+
+                    if (c == hdc_current[i])
+                        hd_selectedRows[i] = row - hd_removeRows_[i];
+                }
+            }
+        }
+
+        c++;
+    }
+
+    for (uint8_t i = 0; i < HDC_MAX; ++i) {
+        hd_models[i]->removeRows(0, hd_removeRows_[i]);
+        hd_cbox[i]->setEnabled(hd_models[i]->rowCount() > 1);
+        hd_cbox[i]->setCurrentIndex(-1);
+        hd_cbox[i]->setCurrentIndex(hd_selectedRows[i]);
+    }
+
+    // SCSI Card
+    QComboBox *         cbox[SCSI_CARD_MAX]         = { 0 };
+    QAbstractItemModel *models[SCSI_CARD_MAX]       = { 0 };
+    int                 removeRows_[SCSI_CARD_MAX]  = { 0 };
+    int                 selectedRows[SCSI_CARD_MAX] = { 0 };
+
+    for (uint8_t i = 0; i < SCSI_CARD_MAX; ++i) {
+        cbox[i]        = findChild<QComboBox *>(QString("comboBoxSCSI%1").arg(i + 1));
+        models[i]      = cbox[i]->model();
+        removeRows_[i] = models[i]->rowCount();
+    }
+
+    c = 0;
+    while (true) {
+        const QString name = DeviceConfig::DeviceName(scsi_card_getdevice(c),
+                                                      scsi_card_get_internal_name(c), 1);
+
+        if (name.isEmpty())
+            break;
+
+        if (scsi_card_available(c)) {
+            if (device_is_valid(scsi_card_getdevice(c), machineId)) {
+                for (uint8_t i = 0; i < SCSI_CARD_MAX; ++i) {
+                    int row = Models::AddEntry(models[i], name, c);
+
+                    if (c == scsi_card_current[i])
+                        selectedRows[i] = row - removeRows_[i];
+                }
+            }
+        }
+
+        c++;
+    }
+
+    for (uint8_t i = 0; i < SCSI_CARD_MAX; ++i) {
+        models[i]->removeRows(0, removeRows_[i]);
+        cbox[i]->setEnabled(models[i]->rowCount() > 1);
+        cbox[i]->setCurrentIndex(-1);
+        cbox[i]->setCurrentIndex(selectedRows[i]);
+    }
 
     if (machine_has_bus(machineId, MACHINE_BUS_CASSETTE)) {
         ui->checkBoxCassette->setChecked(cassette_enable > 0);
@@ -206,130 +236,152 @@ SettingsStorageControllers::onCurrentMachineChanged(int machineId)
     }
 }
 
-void
-SettingsStorageControllers::on_comboBoxHD_currentIndexChanged(int index)
-{
-    if (index < 0) {
-        return;
-    }
-    ui->pushButtonHD->setEnabled(hdc_has_config(ui->comboBoxHD->currentData().toInt()) > 0);
-}
-
 void
 SettingsStorageControllers::on_comboBoxFD_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
-    ui->pushButtonFD->setEnabled(hdc_has_config(ui->comboBoxFD->currentData().toInt()) > 0);
+
+    ui->pushButtonFD->setEnabled(fdc_card_has_config(ui->comboBoxFD->currentData().toInt()) > 0);
 }
 
-void SettingsStorageControllers::on_comboBoxCDInterface_currentIndexChanged(int index)
+void
+SettingsStorageControllers::on_comboBoxHD1_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
+
+    ui->pushButtonHD1->setEnabled(hdc_has_config(ui->comboBoxHD1->currentData().toInt()) > 0);
+}
+
+void
+SettingsStorageControllers::on_comboBoxHD2_currentIndexChanged(int index)
+{
+    if (index < 0)
+        return;
+
+    ui->pushButtonHD2->setEnabled(hdc_has_config(ui->comboBoxHD2->currentData().toInt()) > 0);
+}
+
+void
+SettingsStorageControllers::on_comboBoxHD3_currentIndexChanged(int index)
+{
+    if (index < 0)
+        return;
+
+    ui->pushButtonHD3->setEnabled(hdc_has_config(ui->comboBoxHD3->currentData().toInt()) > 0);
+}
+
+void
+SettingsStorageControllers::on_comboBoxHD4_currentIndexChanged(int index)
+{
+    if (index < 0)
+        return;
+
+    ui->pushButtonHD4->setEnabled(hdc_has_config(ui->comboBoxHD4->currentData().toInt()) > 0);
+}
+
+void
+SettingsStorageControllers::on_comboBoxCDInterface_currentIndexChanged(int index)
+{
+    if (index < 0)
+        return;
+
     ui->pushButtonCDInterface->setEnabled(cdrom_interface_has_config(ui->comboBoxCDInterface->currentData().toInt()) > 0);
 }
 
-void
-SettingsStorageControllers::on_checkBoxTertiaryIDE_stateChanged(int arg1)
-{
-    ui->pushButtonTertiaryIDE->setEnabled(arg1 == Qt::Checked);
-}
-
-void
-SettingsStorageControllers::on_checkBoxQuaternaryIDE_stateChanged(int arg1)
-{
-    ui->pushButtonQuaternaryIDE->setEnabled(arg1 == Qt::Checked);
-}
-
-void
-SettingsStorageControllers::on_pushButtonHD_clicked()
-{
-    DeviceConfig::ConfigureDevice(hdc_get_device(ui->comboBoxHD->currentData().toInt()), 0, qobject_cast<Settings *>(Settings::settings));
-}
-
 void
 SettingsStorageControllers::on_pushButtonFD_clicked()
 {
-    DeviceConfig::ConfigureDevice(fdc_card_getdevice(ui->comboBoxFD->currentData().toInt()), 0, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(fdc_card_getdevice(ui->comboBoxFD->currentData().toInt()));
+}
+
+void
+SettingsStorageControllers::on_pushButtonHD1_clicked()
+{
+    DeviceConfig::ConfigureDevice(hdc_get_device(ui->comboBoxHD1->currentData().toInt()), 1);
+}
+
+void
+SettingsStorageControllers::on_pushButtonHD2_clicked()
+{
+    DeviceConfig::ConfigureDevice(hdc_get_device(ui->comboBoxHD2->currentData().toInt()), 2);
+}
+
+void
+SettingsStorageControllers::on_pushButtonHD3_clicked()
+{
+    DeviceConfig::ConfigureDevice(hdc_get_device(ui->comboBoxHD3->currentData().toInt()), 3);
+}
+
+void
+SettingsStorageControllers::on_pushButtonHD4_clicked()
+{
+    DeviceConfig::ConfigureDevice(hdc_get_device(ui->comboBoxHD4->currentData().toInt()), 4);
 }
 
 void
 SettingsStorageControllers::on_pushButtonCDInterface_clicked()
 {
-    DeviceConfig::ConfigureDevice(cdrom_interface_get_device(ui->comboBoxCDInterface->currentData().toInt()), 0, qobject_cast<Settings *>(Settings::settings));
-}
-
-void
-SettingsStorageControllers::on_pushButtonTertiaryIDE_clicked()
-{
-    DeviceConfig::ConfigureDevice(&ide_ter_device, 0, qobject_cast<Settings *>(Settings::settings));
-}
-
-void
-SettingsStorageControllers::on_pushButtonQuaternaryIDE_clicked()
-{
-    DeviceConfig::ConfigureDevice(&ide_qua_device, 0, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(cdrom_interface_get_device(ui->comboBoxCDInterface->currentData().toInt()));
 }
 
 void
 SettingsStorageControllers::on_comboBoxSCSI1_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
+
     ui->pushButtonSCSI1->setEnabled(scsi_card_has_config(ui->comboBoxSCSI1->currentData().toInt()) > 0);
 }
 
 void
 SettingsStorageControllers::on_comboBoxSCSI2_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
+
     ui->pushButtonSCSI2->setEnabled(scsi_card_has_config(ui->comboBoxSCSI2->currentData().toInt()) > 0);
 }
 
 void
 SettingsStorageControllers::on_comboBoxSCSI3_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
+
     ui->pushButtonSCSI3->setEnabled(scsi_card_has_config(ui->comboBoxSCSI3->currentData().toInt()) > 0);
 }
 
 void
 SettingsStorageControllers::on_comboBoxSCSI4_currentIndexChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0)
         return;
-    }
+
     ui->pushButtonSCSI4->setEnabled(scsi_card_has_config(ui->comboBoxSCSI4->currentData().toInt()) > 0);
 }
 
 void
 SettingsStorageControllers::on_pushButtonSCSI1_clicked()
 {
-    DeviceConfig::ConfigureDevice(scsi_card_getdevice(ui->comboBoxSCSI1->currentData().toInt()), 1, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(scsi_card_getdevice(ui->comboBoxSCSI1->currentData().toInt()), 1);
 }
 
 void
 SettingsStorageControllers::on_pushButtonSCSI2_clicked()
 {
-    DeviceConfig::ConfigureDevice(scsi_card_getdevice(ui->comboBoxSCSI2->currentData().toInt()), 2, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(scsi_card_getdevice(ui->comboBoxSCSI2->currentData().toInt()), 2);
 }
 
 void
 SettingsStorageControllers::on_pushButtonSCSI3_clicked()
 {
-    DeviceConfig::ConfigureDevice(scsi_card_getdevice(ui->comboBoxSCSI3->currentData().toInt()), 3, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(scsi_card_getdevice(ui->comboBoxSCSI3->currentData().toInt()), 3);
 }
 
 void
 SettingsStorageControllers::on_pushButtonSCSI4_clicked()
 {
-    DeviceConfig::ConfigureDevice(scsi_card_getdevice(ui->comboBoxSCSI4->currentData().toInt()), 4, qobject_cast<Settings *>(Settings::settings));
+    DeviceConfig::ConfigureDevice(scsi_card_getdevice(ui->comboBoxSCSI4->currentData().toInt()), 4);
 }
diff --git a/src/qt/qt_settingsstoragecontrollers.hpp b/src/qt/qt_settingsstoragecontrollers.hpp
index 5641889e4..7ba862e0c 100644
--- a/src/qt/qt_settingsstoragecontrollers.hpp
+++ b/src/qt/qt_settingsstoragecontrollers.hpp
@@ -20,24 +20,29 @@ public slots:
     void onCurrentMachineChanged(int machineId);
 
 private slots:
-    void on_pushButtonSCSI4_clicked();
-    void on_pushButtonSCSI3_clicked();
-    void on_pushButtonSCSI2_clicked();
-    void on_pushButtonSCSI1_clicked();
-    void on_comboBoxSCSI4_currentIndexChanged(int index);
-    void on_comboBoxSCSI3_currentIndexChanged(int index);
-    void on_comboBoxSCSI2_currentIndexChanged(int index);
-    void on_comboBoxSCSI1_currentIndexChanged(int index);
-    void on_pushButtonQuaternaryIDE_clicked();
-    void on_pushButtonTertiaryIDE_clicked();
-    void on_pushButtonFD_clicked();
-    void on_pushButtonHD_clicked();
-    void on_pushButtonCDInterface_clicked();
-    void on_checkBoxQuaternaryIDE_stateChanged(int arg1);
-    void on_checkBoxTertiaryIDE_stateChanged(int arg1);
     void on_comboBoxFD_currentIndexChanged(int index);
-    void on_comboBoxHD_currentIndexChanged(int index);
+    void on_pushButtonFD_clicked();
+
+    void on_comboBoxHD1_currentIndexChanged(int index);
+    void on_pushButtonHD1_clicked();
+    void on_comboBoxHD2_currentIndexChanged(int index);
+    void on_pushButtonHD2_clicked();
+    void on_comboBoxHD3_currentIndexChanged(int index);
+    void on_pushButtonHD3_clicked();
+    void on_comboBoxHD4_currentIndexChanged(int index);
+    void on_pushButtonHD4_clicked();
+
     void on_comboBoxCDInterface_currentIndexChanged(int index);
+    void on_pushButtonCDInterface_clicked();
+
+    void on_comboBoxSCSI1_currentIndexChanged(int index);
+    void on_pushButtonSCSI1_clicked();
+    void on_comboBoxSCSI2_currentIndexChanged(int index);
+    void on_pushButtonSCSI2_clicked();
+    void on_comboBoxSCSI3_currentIndexChanged(int index);
+    void on_pushButtonSCSI3_clicked();
+    void on_comboBoxSCSI4_currentIndexChanged(int index);
+    void on_pushButtonSCSI4_clicked();
 
 private:
     Ui::SettingsStorageControllers *ui;
diff --git a/src/qt/qt_settingsstoragecontrollers.ui b/src/qt/qt_settingsstoragecontrollers.ui
index d67127e2d..2d6fa9d32 100644
--- a/src/qt/qt_settingsstoragecontrollers.ui
+++ b/src/qt/qt_settingsstoragecontrollers.ui
@@ -29,13 +29,20 @@
    <item>
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
-      <widget class="QLabel" name="label">
+      <widget class="QLabel" name="labelFD">
        <property name="text">
-        <string>HD Controller:</string>
+        <string>FD Controller:</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="2">
+     <item row="0" column="1">
+      <widget class="QComboBox" name="comboBoxFD">
+       <property name="maxVisibleItems">
+        <number>30</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
       <widget class="QPushButton" name="pushButtonFD">
        <property name="text">
         <string>Configure</string>
@@ -43,98 +50,21 @@
       </widget>
      </item>
      <item row="1" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>FD Controller:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_7">
+      <widget class="QLabel" name="labelCDInterface">
        <property name="text">
         <string>CD-ROM Controller:</string>
        </property>
-       <property name="visible">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QComboBox" name="comboBoxCDInterface">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
-       <property name="visible">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="2">
-      <widget class="QPushButton" name="pushButtonCDInterface">
-       <property name="text">
-        <string>Configure</string>
-       </property>
-       <property name="visible">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QComboBox" name="comboBoxHD">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="2">
-      <widget class="QPushButton" name="pushButtonHD">
-       <property name="text">
-        <string>Configure</string>
-       </property>
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="QComboBox" name="comboBoxFD">
+      <widget class="QComboBox" name="comboBoxCDInterface">
        <property name="maxVisibleItems">
         <number>30</number>
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
-      <widget class="QCheckBox" name="checkBoxTertiaryIDE">
-       <property name="text">
-        <string>Tertiary IDE Controller</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="0">
-      <widget class="QCheckBox" name="checkBoxQuaternaryIDE">
-       <property name="text">
-        <string>Quaternary IDE Controller</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="2">
-      <widget class="QPushButton" name="pushButtonTertiaryIDE">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Configure</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="2">
-      <widget class="QPushButton" name="pushButtonQuaternaryIDE">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
+     <item row="1" column="2">
+      <widget class="QPushButton" name="pushButtonCDInterface">
        <property name="text">
         <string>Configure</string>
        </property>
@@ -143,43 +73,146 @@
     </layout>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox">
+    <widget class="QGroupBox" name="groupBoxHD">
      <property name="title">
-      <string>SCSI</string>
+      <string>Hard disk</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_3">
-      <item row="1" column="3">
-       <widget class="QPushButton" name="pushButtonSCSI2">
+     <layout class="QGridLayout" name="gridLayoutHD">
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelHD1">
+        <property name="text">
+         <string>Controller 1:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QComboBox" name="comboBoxHD1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QPushButton" name="pushButtonHD1">
         <property name="text">
          <string>Configure</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="3">
-       <widget class="QPushButton" name="pushButtonSCSI4">
+      <item row="1" column="0">
+       <widget class="QLabel" name="labelHD2">
+        <property name="text">
+         <string>Controller 2:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QComboBox" name="comboBoxHD2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QPushButton" name="pushButtonHD2">
         <property name="text">
          <string>Configure</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
-       <widget class="QLabel" name="label_6">
+       <widget class="QLabel" name="labelHD3">
         <property name="text">
          <string>Controller 3:</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="2">
-       <widget class="QComboBox" name="comboBoxSCSI1">
-        <property name="maxVisibleItems">
-         <number>30</number>
-        </property>
+      <item row="2" column="2">
+       <widget class="QComboBox" name="comboBoxHD3">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="3">
+       <widget class="QPushButton" name="pushButtonHD3">
+        <property name="text">
+         <string>Configure</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="labelHD4">
+        <property name="text">
+         <string>Controller 4:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2">
+       <widget class="QComboBox" name="comboBoxHD4">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="3">
+       <widget class="QPushButton" name="pushButtonHD4">
+        <property name="text">
+         <string>Configure</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBoxSCSI">
+     <property name="title">
+      <string>SCSI</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayoutSCSI">
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelSCSI1">
+        <property name="text">
+         <string>Controller 1:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QComboBox" name="comboBoxSCSI1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
        </widget>
       </item>
       <item row="0" column="3">
@@ -189,63 +222,50 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="2">
-       <widget class="QComboBox" name="comboBoxSCSI2">
-        <property name="maxVisibleItems">
-         <number>30</number>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2">
-       <widget class="QComboBox" name="comboBoxSCSI3">
-        <property name="maxVisibleItems">
-         <number>30</number>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="2">
-       <widget class="QComboBox" name="comboBoxSCSI4">
-        <property name="maxVisibleItems">
-         <number>30</number>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>Controller 1:</string>
-        </property>
-       </widget>
-      </item>
       <item row="1" column="0">
-       <widget class="QLabel" name="label_4">
+       <widget class="QLabel" name="labelSCSI2">
         <property name="text">
          <string>Controller 2:</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_5">
+      <item row="1" column="2">
+       <widget class="QComboBox" name="comboBoxSCSI2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QPushButton" name="pushButtonSCSI2">
         <property name="text">
-         <string>Controller 4:</string>
+         <string>Configure</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="labelSCSI3">
+        <property name="text">
+         <string>Controller 3:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QComboBox" name="comboBoxSCSI3">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maxVisibleItems">
+         <number>30</number>
         </property>
        </widget>
       </item>
@@ -256,6 +276,33 @@
         </property>
        </widget>
       </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="labelSCSI4">
+        <property name="text">
+         <string>Controller 4:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2">
+       <widget class="QComboBox" name="comboBoxSCSI4">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maxVisibleItems">
+         <number>30</number>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="3">
+       <widget class="QPushButton" name="pushButtonSCSI4">
+        <property name="text">
+         <string>Configure</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -281,6 +328,29 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>comboBoxFD</tabstop>
+  <tabstop>pushButtonFD</tabstop>
+  <tabstop>comboBoxCDInterface</tabstop>
+  <tabstop>pushButtonCDInterface</tabstop>
+  <tabstop>comboBoxHD1</tabstop>
+  <tabstop>pushButtonHD1</tabstop>
+  <tabstop>comboBoxHD2</tabstop>
+  <tabstop>pushButtonHD2</tabstop>
+  <tabstop>comboBoxHD3</tabstop>
+  <tabstop>pushButtonHD3</tabstop>
+  <tabstop>comboBoxHD4</tabstop>
+  <tabstop>pushButtonHD4</tabstop>
+  <tabstop>comboBoxSCSI1</tabstop>
+  <tabstop>pushButtonSCSI1</tabstop>
+  <tabstop>comboBoxSCSI2</tabstop>
+  <tabstop>pushButtonSCSI2</tabstop>
+  <tabstop>comboBoxSCSI3</tabstop>
+  <tabstop>pushButtonSCSI3</tabstop>
+  <tabstop>comboBoxSCSI4</tabstop>
+  <tabstop>pushButtonSCSI4</tabstop>
+  <tabstop>checkBoxCassette</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/qt/qt_singlekeyseqedit.cpp b/src/qt/qt_singlekeyseqedit.cpp
new file mode 100644
index 000000000..f17d2164f
--- /dev/null
+++ b/src/qt/qt_singlekeyseqedit.cpp
@@ -0,0 +1,20 @@
+#include "qt_singlekeyseqedit.hpp"
+
+/*
+	This subclass of QKeySequenceEdit restricts the input to only a single 
+	shortcut instead of an unlimited number with a fixed timeout.
+*/
+
+singleKeySequenceEdit::singleKeySequenceEdit(QWidget *parent) : QKeySequenceEdit(parent) {}
+
+void singleKeySequenceEdit::keyPressEvent(QKeyEvent *event)
+{
+    QKeySequenceEdit::keyPressEvent(event);
+    if (this->keySequence().count() > 0) {
+        QKeySequenceEdit::setKeySequence(this->keySequence());
+        
+		// This could have unintended consequences since it will happen 
+		// every single time the user presses a key.
+        emit editingFinished();
+    }
+}
\ No newline at end of file
diff --git a/src/qt/qt_singlekeyseqedit.hpp b/src/qt/qt_singlekeyseqedit.hpp
new file mode 100644
index 000000000..43ebe70b2
--- /dev/null
+++ b/src/qt/qt_singlekeyseqedit.hpp
@@ -0,0 +1,16 @@
+#ifndef SINGLEKEYSEQUENCEEDIT_H
+#define SINGLEKEYSEQUENCEEDIT_H
+
+#include <QKeySequenceEdit>
+#include <QWidget>
+
+class singleKeySequenceEdit : public QKeySequenceEdit
+{
+    Q_OBJECT
+public:
+    singleKeySequenceEdit(QWidget *parent = nullptr);
+
+    void keyPressEvent(QKeyEvent *) override;
+};
+
+#endif // SINGLEKEYSEQUENCEEDIT_H
diff --git a/src/qt/qt_softwarerenderer.cpp b/src/qt/qt_softwarerenderer.cpp
index ab9ed932d..a8c0229d3 100644
--- a/src/qt/qt_softwarerenderer.cpp
+++ b/src/qt/qt_softwarerenderer.cpp
@@ -24,7 +24,6 @@
 
 extern "C" {
 #include <86box/86box.h>
-#include <86box/plat.h>
 #include <86box/video.h>
 }
 
@@ -114,7 +113,6 @@ SoftwareRenderer::onPaint(QPaintDevice *device)
 #endif
     painter.setCompositionMode(QPainter::CompositionMode_Plus);
     painter.drawImage(destination, *images[cur_image], source);
-    if (video_fullscreen && status_icons_fullscreen) drawStatusBarIcons(&painter);
 }
 
 std::vector<std::tuple<uint8_t *, std::atomic_flag *>>
diff --git a/src/qt/qt_specifydimensions.cpp b/src/qt/qt_specifydimensions.cpp
index c01ef2ae4..0b88e9b57 100644
--- a/src/qt/qt_specifydimensions.cpp
+++ b/src/qt/qt_specifydimensions.cpp
@@ -112,4 +112,13 @@ SpecifyDimensions::on_SpecifyDimensions_accepted()
     }
     main_window->show();
     emit main_window->updateWindowRememberOption();
+
+    if (vid_resize == 1) {
+        main_window->resize(ui->spinBoxWidth->value() / (!dpi_scale ? util::screenOfWidget(this)->devicePixelRatio() : 1.), (ui->spinBoxHeight->value() / (!dpi_scale ? util::screenOfWidget(this)->devicePixelRatio() : 1.))
+                + main_window->menuBar()->height()
+                + (main_window->statusBar()->height() * !hide_status_bar)
+                + (main_window->ui->toolBar->height() * !hide_tool_bar));
+        window_w = ui->spinBoxWidth->value();
+        window_h = ui->spinBoxHeight->value();
+    }
 }
diff --git a/src/qt/qt_styleoverride.cpp b/src/qt/qt_styleoverride.cpp
index 7ec5a341c..681114c4b 100644
--- a/src/qt/qt_styleoverride.cpp
+++ b/src/qt/qt_styleoverride.cpp
@@ -15,9 +15,26 @@
  *          Copyright 2022 Teemu Korhonen
  */
 #include "qt_styleoverride.hpp"
+#include "qt_util.hpp"
 
 #include <QComboBox>
 #include <QAbstractItemView>
+#include <QPixmap>
+#include <QIcon>
+#include <QStyleOption>
+#include <QMainWindow>
+
+extern "C" {
+#include <86box/86box.h>
+#include <86box/plat.h>
+}
+
+#ifdef Q_OS_WINDOWS
+#include <dwmapi.h>
+#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE
+#define DWMWA_USE_IMMERSIVE_DARK_MODE 20
+#endif
+#endif
 
 int
 StyleOverride::styleHint(
@@ -27,7 +44,7 @@ StyleOverride::styleHint(
     QStyleHintReturn   *returnData) const
 {
     /* Disable using menu with alt key */
-    if (hint == QStyle::SH_MenuBar_AltKeyNavigation)
+    if (!start_vmm && (!kbd_req_capture || mouse_capture) && (hint == QStyle::SH_MenuBar_AltKeyNavigation))
         return 0;
 
     return QProxyStyle::styleHint(hint, option, widget, returnData);
@@ -45,12 +62,60 @@ StyleOverride::polish(QWidget *widget)
                 widget->setFixedSize(QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
                 widget->layout()->setSizeConstraint(QLayout::SetFixedSize);
             }
-            widget->setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, true);
+            if (!qobject_cast<QMainWindow *>(widget)) {
+                widget->setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, true);
+            }
+
+            if (qobject_cast<QMainWindow *>(widget)) {
+                widget->setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, vid_resize != 1);
+                widget->setWindowFlag(Qt::WindowMaximizeButtonHint, vid_resize == 1);
+            }
         }
         widget->setWindowFlag(Qt::WindowContextHelpButtonHint, false);
+#ifdef Q_OS_WINDOWS
+        BOOL DarkMode = !util::isWindowsLightTheme();
+        DwmSetWindowAttribute((HWND)widget->winId(), DWMWA_USE_IMMERSIVE_DARK_MODE, (LPCVOID)&DarkMode, sizeof(DarkMode));
+#endif
     }
 
     if (qobject_cast<QComboBox *>(widget)) {
         qobject_cast<QComboBox *>(widget)->view()->setMinimumWidth(widget->minimumSizeHint().width());
     }
 }
+
+QPixmap
+StyleOverride::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *option) const
+{
+    if (iconMode != QIcon::Disabled) {
+        return QProxyStyle::generatedIconPixmap(iconMode, pixmap, option);
+    }
+
+    auto image = pixmap.toImage();
+
+    for (int y = 0; y < image.height(); y++) {
+        for (int x = 0; x < image.width(); x++) {
+            // checkerboard transparency
+            if (((x ^ y) & 1) == 0) {
+                image.setPixelColor(x, y, Qt::transparent);
+                continue;
+            }
+
+            auto color = image.pixelColor(x, y);
+
+            // convert to grayscale using the NTSC formula
+            auto avg = 0.0;
+            avg += color.blueF() * 0.114;
+            avg += color.greenF() * 0.587;
+            avg += color.redF() * 0.299;
+
+            color.setRedF(avg);
+            color.setGreenF(avg);
+            color.setBlueF(avg);
+
+            image.setPixelColor(x, y, color);
+
+        }
+    }
+
+    return QPixmap::fromImage(image);
+}
diff --git a/src/qt/qt_styleoverride.hpp b/src/qt/qt_styleoverride.hpp
index c04d01a12..994271f15 100644
--- a/src/qt/qt_styleoverride.hpp
+++ b/src/qt/qt_styleoverride.hpp
@@ -4,9 +4,14 @@
 #include <QProxyStyle>
 #include <QWidget>
 #include <QLayout>
+#include <QPixmap>
+#include <QIcon>
+#include <QStyleOption>
 
 class StyleOverride : public QProxyStyle {
 public:
+    using QProxyStyle::QProxyStyle;
+
     int styleHint(
         StyleHint           hint,
         const QStyleOption *option     = nullptr,
@@ -14,6 +19,7 @@ public:
         QStyleHintReturn   *returnData = nullptr) const override;
 
     void polish(QWidget *widget) override;
+    QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *option) const override;
 };
 
 #endif
diff --git a/src/qt/qt_translations.qrc b/src/qt/qt_translations.qrc.in
similarity index 82%
rename from src/qt/qt_translations.qrc
rename to src/qt/qt_translations.qrc.in
index 017354f82..ef7993372 100644
--- a/src/qt/qt_translations.qrc
+++ b/src/qt/qt_translations.qrc.in
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>86box_ca-ES.qm</file>
         <file>86box_cs-CZ.qm</file>
         <file>86box_de-DE.qm</file>
         <file>86box_en-US.qm</file>
@@ -9,19 +8,23 @@
         <file>86box_fi-FI.qm</file>
         <file>86box_fr-FR.qm</file>
         <file>86box_hr-HR.qm</file>
-        <file>86box_hu-HU.qm</file>
         <file>86box_it-IT.qm</file>
         <file>86box_ja-JP.qm</file>
         <file>86box_ko-KR.qm</file>
+        <file>86box_nb-NO.qm</file>
+        <file>86box_nl-NL.qm</file>
         <file>86box_pl-PL.qm</file>
         <file>86box_pt-BR.qm</file>
         <file>86box_pt-PT.qm</file>
         <file>86box_ru-RU.qm</file>
         <file>86box_sk-SK.qm</file>
         <file>86box_sl-SI.qm</file>
+        <file>86box_sv-SE.qm</file>
         <file>86box_tr-TR.qm</file>
         <file>86box_uk-UA.qm</file>
+        <file>86box_vi-VN.qm</file>
         <file>86box_zh-CN.qm</file>
         <file>86box_zh-TW.qm</file>
+@QT_TRANSLATIONS_LIST@
     </qresource>
 </RCC>
diff --git a/src/qt/qt_ui.cpp b/src/qt/qt_ui.cpp
index 47e6b48a2..d4a257887 100644
--- a/src/qt/qt_ui.cpp
+++ b/src/qt/qt_ui.cpp
@@ -23,6 +23,7 @@
 #include <QMessageBox>
 
 #include <QStatusBar>
+#include <QApplication>
 
 #include "qt_mainwindow.hpp"
 #include "qt_machinestatus.hpp"
@@ -49,30 +50,42 @@ extern "C" {
 #include <86box/cartridge.h>
 #include <86box/cassette.h>
 #include <86box/cdrom.h>
-#include <86box/zip.h>
+#include <86box/rdisk.h>
 #include <86box/mo.h>
 #include <86box/hdd.h>
 #include <86box/thread.h>
 #include <86box/network.h>
 #include <86box/machine_status.h>
 
+#ifdef Q_OS_WINDOWS
+#    include <86box/win.h>
+#endif
+
 void
 plat_delay_ms(uint32_t count)
 {
+#ifdef Q_OS_WINDOWS
+    // On Win32 the accuracy of Sleep() depends on the timer resolution, which can be set by calling timeBeginPeriod
+    // https://learn.microsoft.com/en-us/windows/win32/api/timeapi/nf-timeapi-timebeginperiod
+    timeBeginPeriod(1);
+    Sleep(count);
+    timeEndPeriod(1);
+#else
     QThread::msleep(count);
+#endif
 }
 
 wchar_t *
 ui_window_title(wchar_t *str)
 {
     if (str == nullptr) {
-        static wchar_t title[512];
-        memset(title, 0, sizeof(title));
+        static wchar_t title[512] = { 0 };
+
         main_window->getTitle(title);
         str = title;
-    } else {
+    } else
         emit main_window->setTitle(QString::fromWCharArray(str));
-    }
+
     return str;
 }
 
@@ -95,14 +108,14 @@ plat_resize_request(int w, int h, int monitor_index)
     if (video_fullscreen || is_quit)
         return;
     if (vid_resize & 2) {
-        plat_resize_monitor(fixed_size_x, fixed_size_y, monitor_index);
+        plat_resize(fixed_size_x, fixed_size_y, monitor_index);
     } else {
-        plat_resize_monitor(w, h, monitor_index);
+        plat_resize(w, h, monitor_index);
     }
 }
 
 void
-plat_resize_monitor(int w, int h, int monitor_index)
+plat_resize(int w, int h, int monitor_index)
 {
     if (monitor_index >= 1)
         main_window->resizeContentsMonitor(w, h, monitor_index);
@@ -110,11 +123,9 @@ plat_resize_monitor(int w, int h, int monitor_index)
         main_window->resizeContents(w, h);
 }
 
-void
-plat_setfullscreen(int on)
-{
-    main_window->setFullscreen(on > 0 ? true : false);
-}
+#if defined _WIN32
+extern HWND rw_hwnd;
+#endif
 
 void
 plat_mouse_capture(int on)
@@ -123,27 +134,50 @@ plat_mouse_capture(int on)
         return;
 
     main_window->setMouseCapture(on > 0 ? true : false);
+
+#if defined _WIN32
+    if (on) {
+        QCursor cursor(Qt::BlankCursor);
+
+        QApplication::setOverrideCursor(cursor);
+        QApplication::changeOverrideCursor(cursor);
+
+        RECT rect;
+
+        GetWindowRect(rw_hwnd, &rect);
+
+        ClipCursor(&rect);
+
+    } else {
+        ClipCursor(NULL);
+
+        QApplication::restoreOverrideCursor();
+    }
+#endif
 }
 
 int
 ui_msgbox_header(int flags, void *header, void *message)
 {
-    if (header <= (void *) 7168)
-        header = plat_get_string((uintptr_t) header);
-    if (message <= (void *) 7168)
-        message = plat_get_string((uintptr_t) message);
-
-    auto hdr = (flags & MBX_ANSI) ? QString((char *) header) : QString::fromWCharArray(reinterpret_cast<const wchar_t *>(header));
-    auto msg = (flags & MBX_ANSI) ? QString((char *) message) : QString::fromWCharArray(reinterpret_cast<const wchar_t *>(message));
+    const auto hdr = (flags & MBX_ANSI) ? QString(static_cast<char *>(header)) :
+                            QString::fromWCharArray(static_cast<const wchar_t *>(header));
+    const auto msg = (flags & MBX_ANSI) ? QString(static_cast<char *>(message)) :
+                            QString::fromWCharArray(static_cast<const wchar_t *>(message));
 
     // any error in early init
     if (main_window == nullptr) {
-        QMessageBox msgBox(QMessageBox::Icon::Critical, hdr, msg);
-        msgBox.setTextFormat(Qt::TextFormat::RichText);
+        auto msgicon = QMessageBox::Icon::Critical;
+        if (flags & MBX_INFO)
+            msgicon = QMessageBox::Icon::Information;
+        else if (flags & MBX_QUESTION)
+            msgicon = QMessageBox::Icon::Question;
+        else if (flags & MBX_WARNING)
+            msgicon = QMessageBox::Icon::Warning;
+        QMessageBox msgBox(msgicon, hdr, msg);
         msgBox.exec();
     } else {
         // else scope it to main_window
-        main_window->showMessage(flags, hdr, msg);
+        main_window->showMessage(flags, hdr, msg, false);
     }
     return 0;
 }
@@ -228,12 +262,44 @@ ui_sb_set_ready(int ready)
     }
 }
 
+void
+ui_sb_update_icon_wp(int tag, int state)
+{
+    const auto temp    = static_cast<unsigned int>(tag);
+    const int category = static_cast<int>(temp & 0xfffffff0);
+    const int item     = tag & 0xf;
+
+    switch (category) {
+        default:
+            break;
+        case SB_CASSETTE:
+            machine_status.cassette.write_prot = state > 0 ? true : false;
+            break;
+        case SB_FLOPPY:
+            machine_status.fdd[item].write_prot = state > 0 ? true : false;
+            break;
+        case SB_RDISK:
+            machine_status.rdisk[item].write_prot = state > 0 ? true : false;
+            break;
+        case SB_MO:
+            machine_status.mo[item].write_prot = state > 0 ? true : false;
+            break;
+    }
+
+    if (main_window != nullptr)
+        main_window->updateStatusEmptyIcons();
+}
+
 void
 ui_sb_update_icon_state(int tag, int state)
 {
-    int category = tag & 0xfffffff0;
-    int item     = tag & 0xf;
+    const auto temp    = static_cast<unsigned int>(tag);
+    const int category = static_cast<int>(temp & 0xfffffff0);
+    const int item     = tag & 0xf;
+
     switch (category) {
+        default:
+            break;
         case SB_CASSETTE:
             machine_status.cassette.empty = state > 0 ? true : false;
             break;
@@ -246,8 +312,8 @@ ui_sb_update_icon_state(int tag, int state)
         case SB_CDROM:
             machine_status.cdrom[item].empty = state > 0 ? true : false;
             break;
-        case SB_ZIP:
-            machine_status.zip[item].empty = state > 0 ? true : false;
+        case SB_RDISK:
+            machine_status.rdisk[item].empty = state > 0 ? true : false;
             break;
         case SB_MO:
             machine_status.mo[item].empty = state > 0 ? true : false;
@@ -258,20 +324,24 @@ ui_sb_update_icon_state(int tag, int state)
             machine_status.net[item].empty = state > 0 ? true : false;
             break;
         case SB_SOUND:
-            break;
         case SB_TEXT:
             break;
     }
+
+    if (main_window != nullptr)
+        main_window->updateStatusEmptyIcons();
 }
 
 void
 ui_sb_update_icon(int tag, int active)
 {
-    int category = tag & 0xfffffff0;
-    int item     = tag & 0xf;
+    const auto temp    = static_cast<unsigned int>(tag);
+    const int category = static_cast<int>(temp & 0xfffffff0);
+    const int item     = tag & 0xf;
+
     switch (category) {
+        default:
         case SB_CASSETTE:
-            break;
         case SB_CARTRIDGE:
             break;
         case SB_FLOPPY:
@@ -280,8 +350,8 @@ ui_sb_update_icon(int tag, int active)
         case SB_CDROM:
             machine_status.cdrom[item].active = active > 0 ? true : false;
             break;
-        case SB_ZIP:
-            machine_status.zip[item].active = active > 0 ? true : false;
+        case SB_RDISK:
+            machine_status.rdisk[item].active = active > 0 ? true : false;
             break;
         case SB_MO:
             machine_status.mo[item].active = active > 0 ? true : false;
@@ -293,9 +363,45 @@ ui_sb_update_icon(int tag, int active)
             machine_status.net[item].active = active > 0 ? true : false;
             break;
         case SB_SOUND:
-            break;
         case SB_TEXT:
             break;
     }
 }
+
+void
+ui_sb_update_icon_write(int tag, int write)
+{
+    const auto temp    = static_cast<unsigned int>(tag);
+    const int category = static_cast<int>(temp & 0xfffffff0);
+    const int item     = tag & 0xf;
+
+    switch (category) {
+        default:
+        case SB_CASSETTE:
+        case SB_CARTRIDGE:
+            break;
+        case SB_FLOPPY:
+            machine_status.fdd[item].write_active = write > 0 ? true : false;
+            break;
+        case SB_CDROM:
+            machine_status.cdrom[item].write_active = write > 0 ? true : false;
+            break;
+        case SB_RDISK:
+            machine_status.rdisk[item].write_active = write > 0 ? true : false;
+            break;
+        case SB_MO:
+            machine_status.mo[item].write_active = write > 0 ? true : false;
+            break;
+        case SB_HDD:
+            machine_status.hdd[item].write_active = write > 0 ? true : false;
+            break;
+        case SB_NETWORK:
+            machine_status.net[item].write_active = write > 0 ? true : false;
+            break;
+        case SB_SOUND:
+        case SB_TEXT:
+            break;
+    }
+}
+
 }
diff --git a/src/qt/qt_updatecheck.cpp b/src/qt/qt_updatecheck.cpp
new file mode 100644
index 000000000..83e2b34d9
--- /dev/null
+++ b/src/qt/qt_updatecheck.cpp
@@ -0,0 +1,360 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Update check module
+ *
+ *
+ *
+ * Authors: cold-brewed
+ *
+ *          Copyright 2024 cold-brewed
+ */
+
+#include <QDebug>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QStandardPaths>
+#include <QTimer>
+
+#include "qt_updatecheck.hpp"
+#include "qt_downloader.hpp"
+#include "qt_updatedetails.hpp"
+
+extern "C" {
+#include <86box/version.h>
+}
+
+UpdateCheck::
+UpdateCheck(const UpdateChannel channel, QObject *parent) : QObject(parent)
+{
+    updateChannel = channel;
+    currentVersion = getCurrentVersion(channel);
+}
+
+UpdateCheck::~
+UpdateCheck()
+    = default;
+
+void
+UpdateCheck::checkForUpdates()
+{
+    if (updateChannel == UpdateChannel::Stable) {
+        const auto githubDownloader = new Downloader(Downloader::DownloadLocation::Temp);
+        connect(githubDownloader, &Downloader::downloadCompleted, this, &UpdateCheck::githubDownloadComplete);
+        connect(githubDownloader, &Downloader::errorOccurred, this, &UpdateCheck::generalDownloadError);
+        githubDownloader->download(QUrl(githubReleaseApi), "github_releases.json");
+    } else {
+        const auto jenkinsDownloader = new Downloader(Downloader::DownloadLocation::Temp);
+        connect(jenkinsDownloader, &Downloader::downloadCompleted, this, &UpdateCheck::jenkinsDownloadComplete);
+        connect(jenkinsDownloader, &Downloader::errorOccurred, this, &UpdateCheck::generalDownloadError);
+        jenkinsDownloader->download(jenkinsLatestNReleasesUrl(10), "jenkins_list.json");
+    }
+}
+
+void
+UpdateCheck::jenkinsDownloadComplete(const QString &filename, const QVariant &varData)
+{
+    auto generalError = tr("Unable to determine release information");
+    auto jenkinsReleaseListResult = parseJenkinsJson(filename);
+    auto latestVersion = 0; // NOLINT (Default value as a fallback)
+
+    if(!jenkinsReleaseListResult.has_value() || jenkinsReleaseListResult.value().isEmpty()) {
+        generalDownloadError(generalError);
+        return;
+    }
+    const auto jenkinsReleaseList = jenkinsReleaseListResult.value();
+    latestVersion = jenkinsReleaseListResult->first().buildNumber;
+
+    // If we can't determine the local build (blank current version), always show an update as available.
+    // Callers can adjust accordingly.
+    // Otherwise, do a comparison with EMU_BUILD_NUM
+    bool updateAvailable = false;
+    bool upToDate = true;
+    if(currentVersion.isEmpty() || EMU_BUILD_NUM < latestVersion) {
+        updateAvailable = true;
+        upToDate = false;
+    }
+
+    const auto updateResult = UpdateResult {
+        .channel = updateChannel,
+        .updateAvailable = updateAvailable,
+        .upToDate = upToDate,
+        .currentVersion = currentVersion,
+        .latestVersion = QString::number(latestVersion),
+        .githubInfo = {},
+        .jenkinsInfo = jenkinsReleaseList,
+    };
+
+    emit updateCheckComplete(updateResult);
+}
+
+void
+UpdateCheck::generalDownloadError(const QString &error)
+{
+    emit updateCheckError(error);
+}
+
+void
+UpdateCheck::githubDownloadComplete(const QString &filename, const QVariant &varData)
+{
+    const auto generalError            = tr("Unable to determine release information");
+    const auto githubReleaseListResult = parseGithubJson(filename);
+    QString latestVersion = "0.0";
+    if(!githubReleaseListResult.has_value() || githubReleaseListResult.value().isEmpty()) {
+        generalDownloadError(generalError);
+    }
+    auto githubReleaseList = githubReleaseListResult.value();
+    // Warning: this check (using the tag name) relies on a consistent naming scheme: "v<number>"
+    // where <number> is the release number. For example, 4.2 from v4.2 as the tag name.
+    // Another option would be parsing the name field which is generally "86Box <number>" but
+    // either option requires a consistent naming scheme.
+    latestVersion = githubReleaseList.first().tag_name.replace("v", "");
+    for (const auto &release: githubReleaseList) {
+        qDebug().noquote().nospace() << release.name << ": " << release.html_url << " (" << release.created_at << ")";
+    }
+
+    // const auto updateDetails = new UpdateDetails(githubReleaseList, currentVersion);
+    bool updateAvailable = false;
+    bool upToDate = true;
+    if(currentVersion.isEmpty() || (versionCompare(currentVersion, latestVersion) < 0)) {
+        updateAvailable = true;
+        upToDate = false;
+    }
+
+    const auto updateResult = UpdateResult {
+        .channel = updateChannel,
+        .updateAvailable = updateAvailable,
+        .upToDate = upToDate,
+        .currentVersion = currentVersion,
+        .latestVersion = latestVersion,
+        .githubInfo = githubReleaseList,
+        .jenkinsInfo = {},
+    };
+
+    emit updateCheckComplete(updateResult);
+
+}
+
+QUrl
+UpdateCheck::jenkinsLatestNReleasesUrl(const int &count)
+{
+    const auto urlPath = QString("https://ci.86box.net/job/86box/api/json?tree=builds[number,result,timestamp,changeSets[items[commitId,affectedPaths,author[fullName],msg,id]]]{0,%1}").arg(count);
+    return { urlPath };
+}
+
+QString
+UpdateCheck::getCurrentVersion(const UpdateChannel &updateChannel)
+{
+    if (updateChannel == UpdateChannel::Stable) {
+        return {EMU_VERSION};
+    }
+    // If EMU_BUILD_NUM is anything other than the default of zero it was set by the build process
+    if constexpr (EMU_BUILD_NUM != 0) {
+        return QString::number(EMU_BUILD_NUM); // NOLINT because EMU_BUILD_NUM is defined as 0 by default and is set at build time
+    }
+    // EMU_BUILD_NUM is not set, most likely a local build
+    return {}; // NOLINT (Having EMU_BUILD_NUM assigned to a default number throws off the linter)
+}
+
+std::optional<QList<UpdateCheck::JenkinsReleaseInfo>>
+UpdateCheck::parseJenkinsJson(const QString &filename)
+{
+    QList<JenkinsReleaseInfo> releaseInfoList;
+    QFile json_file(filename);
+    if (!json_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        qWarning() << "Couldn't open the json file: error" << json_file.error();
+        return std::nullopt;
+    }
+
+    const QString read_file = json_file.readAll();
+    json_file.close();
+
+    const auto json_doc = QJsonDocument::fromJson(read_file.toUtf8());
+
+    if (json_doc.isNull()) {
+        qWarning("Failed to create QJsonDocument, possibly invalid JSON");
+        return std::nullopt;
+    }
+
+    if (!json_doc.isObject()) {
+        qWarning("JSON does not have the expected format (object in root), cannot continue");
+        return std::nullopt;
+    }
+
+    auto json_object = json_doc.object();
+
+    // The json contains multiple release
+    if(json_object.contains("builds") && json_object["builds"].isArray()) {
+
+        QJsonArray builds = json_object["builds"].toArray();
+        for (const auto &each_build: builds) {
+            if (auto build = parseJenkinsRelease(each_build.toObject()); build.has_value() && build.value().result == "SUCCESS") {
+                releaseInfoList.append(build.value());
+            }
+        }
+    } else if(json_object.contains("changeSets") && json_object["changeSets"].isArray()) {
+        // The json contains only one release, as obtained by the lastSuccessfulBuild api
+        if (const auto build = parseJenkinsRelease(json_object); build.has_value()) {
+            releaseInfoList.append(build.value());
+        }
+    } else {
+        qWarning("JSON is missing data or has invalid data, cannot continue");
+        qDebug() << json_object;
+        return std::nullopt;
+    }
+
+    return releaseInfoList;
+}
+
+std::optional<UpdateCheck::JenkinsReleaseInfo>
+UpdateCheck::parseJenkinsRelease(const QJsonObject &json)
+{
+    // The root should contain number, result, and timestamp.
+    if (!json.contains("number") || !json.contains("result") || !json.contains("timestamp")) {
+        return std::nullopt;
+    }
+
+    auto releaseInfo = JenkinsReleaseInfo {
+        .buildNumber = json["number"].toInt(),
+        .result      = json["result"].toString(),
+        .timestamp   = static_cast<qint64>(json["timestamp"].toDouble())
+    };
+
+    // Overview
+    // Each build should contain a changeSets object with an array. Only the first element is needed.
+    // The first element should be an object containing an items object with an array.
+    // Each array element in the items object has information releated to the build. More or less: commit data
+    // In jq parlance it would be similar to `builds[].changeSets[0].items[]`
+
+    // To break down the somewhat complicated if-init statement below:
+    // * Get the object for `changeSets`
+    // * Convert the value to array
+    // * Grab the first element in the array
+    // Proceed if
+    // * the element (first in changeSets) is an object that contains the key `items`
+    if (const auto changeSet = json["changeSets"].toArray().first(); changeSet.isObject() && changeSet.toObject().contains("items")) {
+        // Then proceed to process each `items` array element
+        for (const auto &item : changeSet.toObject()["items"].toArray()) {
+            auto itemObject = item.toObject();
+            // Basic validation
+            if (!itemObject.contains("commitId") || !itemObject.contains("msg") || !itemObject.contains("affectedPaths")) {
+                return std::nullopt;
+            }
+            // Convert the paths for each commit to a string list
+            QStringList paths;
+            for (const auto &each_path : itemObject["affectedPaths"].toArray().toVariantList()) {
+                if (each_path.type() == QVariant::String) {
+                    paths.append(each_path.toString());
+                }
+            }
+            // Build the structure
+            const auto releaseItem = JenkinsChangeSetItem {
+                .buildId       = itemObject["commitId"].toString(),
+                .author        = itemObject["author"].toObject()["fullName"].toString(),
+                .message       = itemObject["msg"].toString(),
+                .affectedPaths = paths,
+            };
+            releaseInfo.changeSetItems.append(releaseItem);
+        }
+    } else {
+        qWarning("Could not parse release information, possibly invalid JSON");
+    }
+    return releaseInfo;
+}
+
+std::optional<QList<UpdateCheck::GithubReleaseInfo>>
+UpdateCheck::parseGithubJson(const QString &filename)
+{
+    QList<GithubReleaseInfo> releaseInfoList;
+    QFile json_file(filename);
+    if (!json_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        qWarning("Couldn't open the json file: error %d", json_file.error());
+        return std::nullopt;
+    }
+
+    const QString read_file = json_file.readAll();
+    json_file.close();
+
+    const auto json_doc = QJsonDocument::fromJson(read_file.toUtf8());
+
+    if (json_doc.isNull()) {
+        qWarning("Failed to create QJsonDocument, possibly invalid JSON");
+        return std::nullopt;
+    }
+
+    if (!json_doc.isArray()) {
+        qWarning("JSON does not have the expected format (array in root), cannot continue");
+        return std::nullopt;
+    }
+
+    auto release_array = json_doc.array();
+
+    for (const auto &each_release: release_array) {
+        if (auto release = parseGithubRelease(each_release.toObject()); release.has_value()) {
+            releaseInfoList.append(release.value());
+        }
+    }
+    return releaseInfoList;
+}
+std::optional<UpdateCheck::GithubReleaseInfo>
+UpdateCheck::parseGithubRelease(const QJsonObject &json)
+{
+    // Perform some basic validation
+    if (!json.contains("name") || !json.contains("tag_name") || !json.contains("html_url")) {
+        return std::nullopt;
+    }
+
+    auto githubRelease = GithubReleaseInfo {
+        .name             = json["name"].toString(),
+        .tag_name         = json["tag_name"].toString(),
+        .html_url         = json["html_url"].toString(),
+        .target_commitish = json["target_commitish"].toString(),
+        .created_at       = json["created_at"].toString(),
+        .published_at     = json["published_at"].toString(),
+        .body             = json["body"].toString(),
+    };
+
+    return githubRelease;
+}
+
+// A simple method to compare version numbers
+// Should work for comparing x.y.z and x.y. Missing
+// values (parts) will be treated as zeroes
+int
+UpdateCheck::versionCompare(const QString &version1, const QString &version2)
+{
+    // Split both
+    QStringList v1List = version1.split('.');
+    QStringList v2List = version2.split('.');
+
+    // Out of the two versions get the maximum amount of "parts"
+    const int maxParts = std::max(v1List.size(), v2List.size());
+
+    // Initialize both with zeros
+    QVector<int> v1Parts(maxParts, 0);
+    QVector<int> v2Parts(maxParts, 0);
+
+    for (int i = 0; i < v1List.size(); ++i) {
+        v1Parts[i] = v1List[i].toInt();
+    }
+
+    for (int i = 0; i < v2List.size(); ++i) {
+        v2Parts[i] = v2List[i].toInt();
+    }
+
+    for (int i = 0; i < maxParts; ++i) {
+        // First version is greater
+        if (v1Parts[i] > v2Parts[i])
+            return 1;
+        // First version is less
+        if (v1Parts[i] < v2Parts[i])
+            return -1;
+    }
+    // They are equal
+    return 0;
+}
diff --git a/src/qt/qt_updatecheck.hpp b/src/qt/qt_updatecheck.hpp
new file mode 100644
index 000000000..2c04993fc
--- /dev/null
+++ b/src/qt/qt_updatecheck.hpp
@@ -0,0 +1,104 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Header for the update check module
+ *
+ *
+ *
+ * Authors: cold-brewed
+ *
+ *          Copyright 2024 cold-brewed
+ */
+
+#ifndef QT_UPDATECHECK_HPP
+#define QT_UPDATECHECK_HPP
+
+#include <QJsonObject>
+#include <QObject>
+#include <QUrl>
+#include <QWidget>
+
+#include <optional>
+
+class UpdateCheck final : public QObject {
+    Q_OBJECT
+public:
+    enum class UpdateChannel {
+        Stable,
+        CI,
+    };
+
+    struct JenkinsChangeSetItem {
+        QString buildId;           // sha hash
+        QString author;            // github username
+        QString message;           // commit message
+        QStringList affectedPaths; // list of files in the change
+    };
+
+    struct JenkinsReleaseInfo {
+        int buildNumber = 0;
+        QString result;
+        qint64 timestamp = 0;
+        QList<JenkinsChangeSetItem> changeSetItems;
+    };
+
+    struct GithubReleaseInfo {
+        QString name;
+        QString tag_name;
+        QString html_url;
+        QString target_commitish;
+        QString created_at;
+        QString published_at;
+        QString body;
+    };
+
+    struct UpdateResult {
+        UpdateChannel channel;
+        bool updateAvailable = false;
+        bool upToDate = false;
+        QString currentVersion;
+        QString latestVersion;
+        QList<GithubReleaseInfo> githubInfo;
+        QList<JenkinsReleaseInfo> jenkinsInfo;
+    };
+
+    explicit UpdateCheck(UpdateChannel channel, QObject *parent = nullptr);
+    ~UpdateCheck() override;
+    void checkForUpdates();
+    static int versionCompare(const QString &version1, const QString &version2);
+    [[nodiscard]] static QString getCurrentVersion(const UpdateChannel &updateChannel = UpdateChannel::Stable);
+
+signals:
+    // void updateCheckComplete(const UpdateCheck::UpdateChannel &channel, const QVariant &updateData);
+    void updateCheckComplete(const UpdateCheck::UpdateResult &result);
+    void updateCheckError(const QString &errorMsg);
+
+private:
+    UpdateChannel updateChannel = UpdateChannel::Stable;
+
+    const QUrl githubReleaseApi = QUrl("https://api.github.com/repos/86box/86Box/releases");
+    const QUrl jenkinsLatestApi = QUrl("https://ci.86box.net/job/86box/lastSuccessfulBuild/api/json");
+    QString    jenkinsLatestVersion;
+    QString    currentVersion;
+
+    static QUrl jenkinsLatestNReleasesUrl(const int &count);
+
+    static std::optional<QList<JenkinsReleaseInfo>> parseJenkinsJson(const QString &filename);
+    static std::optional<JenkinsReleaseInfo> parseJenkinsRelease(const QJsonObject &json);
+
+    static std::optional<QList<GithubReleaseInfo>> parseGithubJson(const QString &filename);
+    static std::optional<GithubReleaseInfo> parseGithubRelease(const QJsonObject &json);
+
+
+private slots:
+    void jenkinsDownloadComplete(const QString &filename, const QVariant& varData);
+    void githubDownloadComplete(const QString &filename, const QVariant& varData);
+    void generalDownloadError(const QString &error);
+};
+
+#endif // QT_UPDATECHECK_HPP
diff --git a/src/qt/qt_updatecheckdialog.cpp b/src/qt/qt_updatecheckdialog.cpp
new file mode 100644
index 000000000..017d93822
--- /dev/null
+++ b/src/qt/qt_updatecheckdialog.cpp
@@ -0,0 +1,94 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Update check dialog module
+ *
+ *
+ *
+ * Authors: cold-brewed
+ *
+ *          Copyright 2024 cold-brewed
+ */
+
+#include <QDir>
+#include <QTimer>
+
+#include "qt_updatecheckdialog.hpp"
+#include "ui_qt_updatecheckdialog.h"
+#include "qt_updatedetails.hpp"
+
+extern "C" {
+#include <86box/version.h>
+}
+
+UpdateCheckDialog::
+UpdateCheckDialog(const UpdateCheck::UpdateChannel channel, QWidget *parent) : QDialog(parent), ui(new Ui::UpdateCheckDialog), updateCheck(new UpdateCheck(channel))
+{
+    ui->setupUi(this);
+    ui->statusLabel->setHidden(true);
+    updateChannel = channel;
+    currentVersion = UpdateCheck::getCurrentVersion(updateChannel);
+    connect(updateCheck, &UpdateCheck::updateCheckError, [=](const QString &errorMsg) {
+        generalDownloadError(errorMsg);
+    });
+    connect(updateCheck, &UpdateCheck::updateCheckComplete, this, &UpdateCheckDialog::downloadComplete);
+
+    QTimer::singleShot(0, [this] {
+        updateCheck->checkForUpdates();
+    });
+}
+
+UpdateCheckDialog::~
+UpdateCheckDialog()
+    = default;
+
+void
+UpdateCheckDialog::generalDownloadError(const QString &error) const
+{
+    ui->progressBar->setMaximum(100);
+    ui->progressBar->setValue(100);
+    ui->statusLabel->setVisible(true);
+    const auto statusText = tr("There was an error checking for updates:\n\n%1\n\nPlease try again later.").arg(error);
+    ui->statusLabel->setText(statusText);
+    ui->buttonBox->setStandardButtons(QDialogButtonBox::Ok);
+}
+
+void
+UpdateCheckDialog::downloadComplete(const UpdateCheck::UpdateResult &result)
+{
+    if (result.upToDate) {
+        upToDate();
+        return;
+    }
+
+    const auto updateDetails = new UpdateDetails(result, this);
+    connect(updateDetails, &QDialog::accepted, [this] {
+        accept();
+    });
+    connect(updateDetails, &QDialog::rejected, [this] {
+        reject();
+    });
+    updateDetails->exec();
+}
+
+void
+UpdateCheckDialog::upToDate()
+{
+    ui->titleLabel->setText(tr("Update check complete"));
+    ui->progressBar->setMaximum(100);
+    ui->progressBar->setValue(100);
+    ui->statusLabel->setVisible(true);
+    QString currentVersionString;
+    if (updateChannel == UpdateCheck::UpdateChannel::Stable)
+        currentVersionString = QString("v%1").arg(currentVersion);
+    else
+        currentVersionString = QString("%1 %2").arg(tr("build"), currentVersion);
+    const auto statusText = tr("You are running the latest %1 version of 86Box: %2").arg(updateChannel == UpdateCheck::UpdateChannel::Stable ? tr("stable") : tr("beta"), currentVersionString);
+    ui->statusLabel->setText(statusText);
+    ui->buttonBox->setStandardButtons(QDialogButtonBox::Ok);
+}
diff --git a/src/qt/qt_updatecheckdialog.hpp b/src/qt/qt_updatecheckdialog.hpp
new file mode 100644
index 000000000..0f1c0dfa8
--- /dev/null
+++ b/src/qt/qt_updatecheckdialog.hpp
@@ -0,0 +1,47 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Header for the update check dialog module
+ *
+ *
+ *
+ * Authors: cold-brewed
+ *
+ *          Copyright 2024 cold-brewed
+ */
+
+#ifndef QT_UPDATECHECKDIALOG_HPP
+#define QT_UPDATECHECKDIALOG_HPP
+
+#include <QDialog>
+
+#include <qt_updatecheck.hpp>
+
+namespace Ui {
+class UpdateCheckDialog;
+}
+
+class UpdateCheckDialog final : public QDialog {
+    Q_OBJECT
+public:
+    explicit UpdateCheckDialog(UpdateCheck::UpdateChannel channel, QWidget *parent = nullptr);
+    ~UpdateCheckDialog() override;
+
+private:
+    Ui::UpdateCheckDialog     *ui;
+    UpdateCheck::UpdateChannel updateChannel = UpdateCheck::UpdateChannel::Stable;
+    UpdateCheck               *updateCheck;
+    QString                    currentVersion;
+    void                       upToDate();
+
+private slots:
+    void downloadComplete(const UpdateCheck::UpdateResult &result);
+    void generalDownloadError(const QString &error) const;
+};
+
+#endif // QT_UPDATECHECKDIALOG_HPP
diff --git a/src/qt/qt_updatecheckdialog.ui b/src/qt/qt_updatecheckdialog.ui
new file mode 100644
index 000000000..3fd2942fd
--- /dev/null
+++ b/src/qt/qt_updatecheckdialog.ui
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>UpdateCheckDialog</class>
+ <widget class="QDialog" name="UpdateCheckDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>130</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>400</width>
+    <height>130</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>400</width>
+    <height>130</height>
+   </size>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Update check</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="titleLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Checking for updates...</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QProgressBar" name="progressBar">
+     <property name="maximum">
+      <number>0</number>
+     </property>
+     <property name="value">
+      <number>-1</number>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="statusLabel">
+     <property name="text">
+      <string>Status text here</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>UpdateCheckDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>UpdateCheckDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/qt/qt_updatedetails.cpp b/src/qt/qt_updatedetails.cpp
new file mode 100644
index 000000000..aea55a30a
--- /dev/null
+++ b/src/qt/qt_updatedetails.cpp
@@ -0,0 +1,136 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Update details module
+ *
+ *
+ *
+ * Authors: cold-brewed
+ *
+ *          Copyright 2024 cold-brewed
+ */
+
+#include "qt_updatedetails.hpp"
+#include "ui_qt_updatedetails.h"
+
+#include <QDesktopServices>
+#include <QPushButton>
+
+
+UpdateDetails::
+UpdateDetails(const UpdateCheck::UpdateResult &updateResult, QWidget *parent) : QDialog(parent), ui(new Ui::UpdateDetails)
+{
+    ui->setupUi(this);
+    ui->updateTitle->setText(tr("<b>An update to 86Box is available!</b>"));
+    QString currentVersionText;
+    QString latestVersionText;
+    if (updateResult.channel == UpdateCheck::UpdateChannel::Stable) {
+        currentVersionText = tr("You are currently running version <b>%1</b>.").arg(updateResult.currentVersion);
+        latestVersionText  = tr("<b>Version %1</b> is now available.").arg(updateResult.latestVersion);
+    } else {
+        currentVersionText = tr("You are currently running build <b>%1</b>.").arg(updateResult.currentVersion);
+        latestVersionText  = tr("<b>Build %1</b> is now available.").arg(updateResult.latestVersion);
+    }
+    if (updateResult.currentVersion.isEmpty())
+        currentVersionText = "";
+
+    const auto updateDetailsText = QString("%1 %2%3").arg(latestVersionText, currentVersionText.append(' '), tr("Would you like to visit the download page?"));
+    ui->updateDetails->setText(updateDetailsText);
+
+    if(updateResult.channel == UpdateCheck::UpdateChannel::Stable) {
+        ui->updateText->setMarkdown(githubUpdateToMarkdown(updateResult.githubInfo));
+    } else {
+        ui->updateText->setMarkdown(jenkinsUpdateToMarkdown(updateResult.jenkinsInfo));
+    }
+
+    const auto downloadButton = new QPushButton(tr("Visit download page"));
+    ui->buttonBox->addButton(downloadButton, QDialogButtonBox::AcceptRole);
+    // Override accepted to mean "I want to visit the download page"
+    connect(ui->buttonBox, &QDialogButtonBox::accepted, [updateResult] {
+        visitDownloadPage(updateResult.channel);
+    });
+    const auto logo = QPixmap(":/assets/86box.png").scaled(QSize(64, 64), Qt::KeepAspectRatio, Qt::SmoothTransformation);
+
+    ui->icon->setPixmap(logo);
+}
+
+UpdateDetails::~
+UpdateDetails()
+    = default;
+
+QString
+UpdateDetails::jenkinsUpdateToMarkdown(const QList<UpdateCheck::JenkinsReleaseInfo> &releaseInfoList)
+{
+    QStringList fullText;
+    for (const auto &update : releaseInfoList) {
+        fullText.append(QString("### Build %1").arg(update.buildNumber));
+        fullText.append("Changes:");
+        for (const auto &item : update.changeSetItems) {
+            fullText.append(QString("* %1").arg(item.message));
+        }
+        fullText.append("\n\n\n---\n\n\n");
+    }
+    // pop off the last hr
+    fullText.removeLast();
+    // return fullText.join("\n\n---\n\n");
+    return fullText.join("\n");
+}
+
+QString
+UpdateDetails::githubUpdateToMarkdown(const QList<UpdateCheck::GithubReleaseInfo> &releaseInfoList)
+{
+    // The github release info can be rather large so we'll only
+    // display the most recent one
+    QList<UpdateCheck::GithubReleaseInfo> singleRelease;
+    if (!releaseInfoList.isEmpty()) {
+        singleRelease.append(releaseInfoList.first());
+    }
+    QStringList fullText;
+    for (const auto &release : singleRelease) {
+        fullText.append(QString("#### %1").arg(release.name));
+        // Github body text should already be in markdown and can just
+        // be placed here as-is
+        fullText.append(release.body);
+        fullText.append("\n\n\n---\n\n\n");
+    }
+    // pop off the last hr
+    fullText.removeLast();
+    return fullText.join("\n");
+}
+void
+UpdateDetails::visitDownloadPage(const UpdateCheck::UpdateChannel &channel)
+{
+    switch (channel) {
+        case UpdateCheck::UpdateChannel::Stable:
+            QDesktopServices::openUrl(QUrl("https://github.com/86Box/86Box/releases/latest"));
+            break;
+        case UpdateCheck::UpdateChannel::CI:
+            QDesktopServices::openUrl(QUrl("https://86box.net/builds#"
+#ifdef Q_OS_WINDOWS
+                "win"
+#elif defined(Q_OS_MACOS)
+                "mac"
+#elif defined(Q_OS_LINUX)
+                "lin"
+#endif
+
+#if defined(__aarch64__) || defined(_M_ARM64)
+                "arm64"
+#elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
+                "64"
+#endif
+
+#ifdef USE_NEW_DYNAREC
+                "ndr"
+#else
+                "odr"
+#endif
+            ));
+            break;
+    }
+}
diff --git a/src/qt/qt_updatedetails.hpp b/src/qt/qt_updatedetails.hpp
new file mode 100644
index 000000000..8c3528e11
--- /dev/null
+++ b/src/qt/qt_updatedetails.hpp
@@ -0,0 +1,43 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Header for the update details module
+ *
+ *
+ *
+ * Authors: cold-brewed
+ *
+ *          Copyright 2024 cold-brewed
+ */
+
+#ifndef QT_UPDATEDETAILS_HPP
+#define QT_UPDATEDETAILS_HPP
+
+#include <QDialog>
+#include <QWidget>
+#include "qt_updatecheck.hpp"
+
+namespace Ui {
+class UpdateDetails;
+}
+
+class UpdateDetails final : public QDialog {
+    Q_OBJECT
+public:
+    explicit UpdateDetails(const UpdateCheck::UpdateResult &updateResult, QWidget *parent = nullptr);
+    ~UpdateDetails() override;
+private:
+    Ui::UpdateDetails *ui;
+    static QString jenkinsUpdateToMarkdown(const QList<UpdateCheck::JenkinsReleaseInfo> &releaseInfoList);
+    static QString githubUpdateToMarkdown(const QList<UpdateCheck::GithubReleaseInfo> &releaseInfoList);
+private slots:
+    static void visitDownloadPage(const UpdateCheck::UpdateChannel &channel);
+};
+
+
+#endif // QT_UPDATEDETAILS_HPP
diff --git a/src/qt/qt_updatedetails.ui b/src/qt/qt_updatedetails.ui
new file mode 100644
index 000000000..7798896a9
--- /dev/null
+++ b/src/qt/qt_updatedetails.ui
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>UpdateDetails</class>
+ <widget class="QDialog" name="UpdateDetails">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>700</width>
+    <height>500</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>600</width>
+    <height>400</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>86Box Update</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QWidget" name="widget" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QWidget" name="widgetLeft" native="true">
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <property name="leftMargin">
+          <number>12</number>
+         </property>
+         <property name="topMargin">
+          <number>12</number>
+         </property>
+         <property name="rightMargin">
+          <number>12</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="icon">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>32</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>64</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="scaledContents">
+            <bool>false</bool>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QWidget" name="widgetRight" native="true">
+        <layout class="QVBoxLayout" name="verticalLayout_3">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="updateTitle">
+           <property name="text">
+            <string>Title</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="updateDetails">
+           <property name="text">
+            <string>Details</string>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>Release notes:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QTextBrowser" name="updateText">
+           <property name="readOnly">
+            <bool>true</bool>
+           </property>
+           <property name="openExternalLinks">
+            <bool>true</bool>
+           </property>
+           <property name="openLinks">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>UpdateDetails</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>UpdateDetails</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/qt/qt_util.cpp b/src/qt/qt_util.cpp
index b05b656bb..a95226247 100644
--- a/src/qt/qt_util.cpp
+++ b/src/qt/qt_util.cpp
@@ -14,6 +14,8 @@
  *
  *          Copyright 2022 Teemu Korhonen
  */
+#include <QDir>
+#include <QFileInfo>
 #include <QStringBuilder>
 #include <QStringList>
 #include <QWidget>
@@ -21,8 +23,34 @@
 #if QT_VERSION <= QT_VERSION_CHECK(5, 14, 0)
 #    include <QDesktopWidget>
 #endif
+#include <QUuid>
 #include "qt_util.hpp"
 
+#ifdef Q_OS_WINDOWS
+#    include <windows.h>
+#    include <dwmapi.h>
+#    ifndef DWMWA_WINDOW_CORNER_PREFERENCE
+#        define DWMWA_WINDOW_CORNER_PREFERENCE 33
+#    endif
+#    ifndef DWMWCP_DEFAULT
+#        define DWMWCP_DEFAULT 0
+#    endif
+#    ifndef DWMWCP_DONOTROUND
+#        define DWMWCP_DONOTROUND 1
+#    endif
+#endif
+
+extern "C" {
+#include <86box/86box.h>
+#include <86box/config.h>
+#include <86box/device.h>
+#include <86box/ini.h>
+#include <86box/random.h>
+#include <86box/thread.h>
+#include <86box/timer.h>
+#include <86box/network.h>
+}
+
 namespace util {
 QScreen *
 screenOfWidget(QWidget *widget)
@@ -34,6 +62,49 @@ screenOfWidget(QWidget *widget)
 #endif
 }
 
+#ifdef Q_OS_WINDOWS
+
+bool
+isWindowsLightTheme(void) {
+    if (color_scheme != 0) {
+        return (color_scheme == 1);
+    }
+
+    // based on https://stackoverflow.com/questions/51334674/how-to-detect-windows-10-light-dark-mode-in-win32-application
+
+    // The value is expected to be a REG_DWORD, which is a signed 32-bit little-endian
+    auto buffer = std::vector<char>(4);
+    auto cbData = static_cast<DWORD>(buffer.size() * sizeof(char));
+    auto res = RegGetValueW(
+        HKEY_CURRENT_USER,
+        L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+        L"AppsUseLightTheme",
+        RRF_RT_REG_DWORD, // expected value type
+        nullptr,
+        buffer.data(),
+        &cbData);
+
+    if (res != ERROR_SUCCESS) {
+        return 1;
+    }
+
+    // convert bytes written to our buffer to an int, assuming little-endian
+    auto i = int(buffer[3] << 24 |
+        buffer[2] << 16 |
+        buffer[1] << 8 |
+        buffer[0]);
+
+    return i == 1;
+}
+
+void
+setWin11RoundedCorners(WId hwnd, bool enable)
+{
+    auto cornerPreference = (enable ? DWMWCP_DEFAULT : DWMWCP_DONOTROUND);
+    DwmSetWindowAttribute((HWND) hwnd, DWMWA_WINDOW_CORNER_PREFERENCE, (LPCVOID) &cornerPreference, sizeof(cornerPreference));
+}
+#endif
+
 QString
 DlgFilter(std::initializer_list<QString> extensions, bool last)
 {
@@ -56,4 +127,92 @@ DlgFilter(std::initializer_list<QString> extensions, bool last)
     return " (" % temp.join(' ') % ")" % (!last ? ";;" : "");
 }
 
+QString
+DlgFilter(QStringList extensions, bool last)
+{
+    QStringList temp;
+
+    for (auto ext : extensions) {
+#ifdef Q_OS_UNIX
+        if (ext == "*") {
+            temp.append("*");
+            continue;
+        }
+        temp.append("*." % ext.toUpper());
+#endif
+        temp.append("*." % ext);
+    }
+
+#ifdef Q_OS_UNIX
+    temp.removeDuplicates();
+#endif
+    return " (" % temp.join(' ') % ")" % (!last ? ";;" : "");
+}
+
+
+QString currentUuid()
+{
+    return generateUuid(QString(cfg_path));
+}
+
+QString generateUuid(const QString &path)
+{
+    auto dirPath = QFileInfo(path).dir().canonicalPath();
+    if(!dirPath.endsWith("/")) {
+        dirPath.append("/");
+    }
+    return QUuid::createUuidV5(QUuid{}, dirPath).toString(QUuid::WithoutBraces);
+}
+
+bool compareUuid()
+{
+    // A uuid not set in the config file will have a zero length.
+    // Any uuid that is lower than the minimum length will be considered invalid
+    // and a new one will be generated
+    if (const auto currentUuidLength = QString(uuid).length(); currentUuidLength < UUID_MIN_LENGTH) {
+        storeCurrentUuid();
+        return true;
+    }
+    // Do not prompt on mismatch if the system does not have any configured NICs. Just update the uuid
+    if(!hasConfiguredNICs() && uuid != currentUuid()) {
+        storeCurrentUuid();
+        return true;
+    }
+    // The uuid appears to be a valid, at least by length.
+    // Compare with a simple string match
+    return uuid == currentUuid();
+}
+
+void
+storeCurrentUuid()
+{
+    strncpy(uuid, currentUuid().toUtf8().constData(), sizeof(uuid) - 1);
+}
+
+void
+generateNewMacAdresses()
+{
+    for (int i = 0; i < NET_CARD_MAX; ++i) {
+        auto net_card = net_cards_conf[i];
+        if (net_card.device_num != 0) {
+            const auto       network_device = network_card_getdevice(net_card.device_num);
+            device_context_t device_context;
+            device_set_context(&device_context, network_device, i + 1);
+            auto generatedMac = QString::asprintf("%02X:%02X:%02X", random_generate(), random_generate(), random_generate()).toLower();
+            config_set_string(device_context.name, "mac", generatedMac.toUtf8().constData());
+        }
+    }
+}
+
+bool
+hasConfiguredNICs()
+{
+    for (int i = 0; i < NET_CARD_MAX; ++i) {
+        if (const auto net_card = net_cards_conf[i]; net_card.device_num != 0) {
+            return true;
+        }
+    }
+    return false;
+}
+
 }
diff --git a/src/qt/qt_util.hpp b/src/qt/qt_util.hpp
index 6ecd904b3..a2ca44425 100644
--- a/src/qt/qt_util.hpp
+++ b/src/qt/qt_util.hpp
@@ -8,10 +8,22 @@
 
 class QScreen;
 namespace util {
+static constexpr auto UUID_MIN_LENGTH = 36;
 /* Creates extension list for qt filedialog */
 QString DlgFilter(std::initializer_list<QString> extensions, bool last = false);
+QString DlgFilter(QStringList extensions, bool last = false);
 /* Returns screen the widget is on */
 QScreen *screenOfWidget(QWidget *widget);
+#ifdef Q_OS_WINDOWS
+bool isWindowsLightTheme(void);
+void setWin11RoundedCorners(WId hwnd, bool enable);
+#endif
+QString currentUuid();
+QString generateUuid(const QString &path);
+void storeCurrentUuid();
+bool compareUuid();
+void generateNewMacAdresses();
+bool hasConfiguredNICs();
 };
 
 #endif
diff --git a/src/qt/qt_vmmanager_addmachine.cpp b/src/qt/qt_vmmanager_addmachine.cpp
new file mode 100644
index 000000000..b621d4733
--- /dev/null
+++ b/src/qt/qt_vmmanager_addmachine.cpp
@@ -0,0 +1,404 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		86Box VM manager add machine wizard
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+#include <QApplication>
+#include <QDebug>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QStyle>
+#include <QVBoxLayout>
+
+#include "qt_vmmanager_addmachine.hpp"
+
+extern "C" {
+#include <86box/86box.h>
+}
+
+// Implementation note: There are several classes in this file:
+// One for the main Wizard class and one for each page of the wizard
+
+VMManagerAddMachine::
+VMManagerAddMachine(QWidget *parent) : QWizard(parent)
+{
+    setPage(Page_Intro, new IntroPage);
+    setPage(Page_WithExistingConfig, new WithExistingConfigPage);
+    setPage(Page_NameAndLocation, new NameAndLocationPage);
+    setPage(Page_Conclusion, new ConclusionPage);
+
+    // Need to create a better image
+    // QPixmap originalPixmap(":/assets/86box.png");
+    // QPixmap scaledPixmap = originalPixmap.scaled(150, 150, Qt::KeepAspectRatio);
+    QPixmap wizardPixmap(":/assets/86box-wizard.png");
+
+#ifndef Q_OS_MACOS
+    setWizardStyle(ModernStyle);
+    setPixmap(LogoPixmap, QPixmap(":assets/addvm-logo.png"));
+#else
+    setWizardStyle(MacStyle);
+    setPixmap(BackgroundPixmap, QPixmap(":/assets/86box-wizard.png"));
+#endif
+
+    // Wizard wants to resize based on image. This keeps the size
+#ifdef Q_OS_WINDOWS
+    setMinimumSize(QSize(550, size().height()));
+    setMaximumSize(QSize(550, size().height()));
+    setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, true);
+#else
+    setMinimumSize(size());
+#endif
+    setOption(HaveHelpButton, false);
+
+    setWindowTitle(tr("Add new system wizard"));
+}
+
+IntroPage::
+IntroPage(QWidget *parent)
+{
+    setTitle(tr("Introduction"));
+
+    setPixmap(QWizard::WatermarkPixmap, QPixmap(":assets/addvm-watermark.png"));
+
+    topLabel = new QLabel(tr("This will help you add a new system to 86Box."));
+    // topLabel = new QLabel(tr("This will help you add a new system to 86Box.\n\n Choose \"New configuration\" if you'd like to create a new machine.\n\nChoose \"Use existing configuration\" if you'd like to paste in an existing configuration from elsewhere."));
+    topLabel->setWordWrap(true);
+
+    newConfigRadioButton      = new QRadioButton(tr("New configuration"));
+    // auto newDescription = new QLabel(tr("Choose this option to start with a fresh configuration."));
+    existingConfigRadioButton = new QRadioButton(tr("Use existing configuration"));
+    // auto existingDescription = new QLabel(tr("Use this option if you'd like to paste in the configuration file from an existing system."));
+    newConfigRadioButton->setChecked(true);
+
+    const auto layout = new QVBoxLayout();
+    layout->addWidget(topLabel);
+    layout->addWidget(newConfigRadioButton);
+    // layout->addWidget(newDescription);
+    layout->addWidget(existingConfigRadioButton);
+    // layout->addWidget(existingDescription);
+
+    setLayout(layout);
+}
+
+int
+IntroPage::nextId() const
+{
+    if (newConfigRadioButton->isChecked()) {
+        return VMManagerAddMachine::Page_NameAndLocation;
+    } else {
+        return VMManagerAddMachine::Page_WithExistingConfig;
+    }
+}
+
+WithExistingConfigPage::
+WithExistingConfigPage(QWidget *parent)
+{
+    setTitle(tr("Use existing configuration"));
+    setSubTitle(tr("Paste the contents of the existing configuration file into the box below."));
+
+    existingConfiguration = new QPlainTextEdit();
+    const auto monospaceFont = new QFont();
+#ifdef Q_OS_WINDOWS
+    monospaceFont->setFamily("Consolas");
+#elif defined(Q_OS_MACOS)
+    monospaceFont->setFamily("Menlo");
+#else
+    monospaceFont->setFamily("Monospace");
+#endif
+    monospaceFont->setStyleHint(QFont::Monospace);
+    monospaceFont->setFixedPitch(true);
+    existingConfiguration->setFont(*monospaceFont);
+    connect(existingConfiguration, &QPlainTextEdit::textChanged, this, &WithExistingConfigPage::completeChanged);
+    registerField("existingConfiguration*", this, "configuration");
+
+    const auto layout = new QVBoxLayout();
+    layout->addWidget(existingConfiguration);
+    const auto loadFileButton = new QPushButton();
+    const auto loadFileLabel = new QLabel(tr("Load configuration from file"));
+    const auto hLayout = new QHBoxLayout();
+    loadFileButton->setIcon(QApplication::style()->standardIcon(QStyle::SP_FileIcon));
+    loadFileButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
+    connect(loadFileButton, &QPushButton::clicked, this, &WithExistingConfigPage::chooseExistingConfigFile);
+    hLayout->addWidget(loadFileButton);
+    hLayout->addWidget(loadFileLabel);
+    layout->addLayout(hLayout);
+    setLayout(layout);
+}
+
+void
+WithExistingConfigPage::chooseExistingConfigFile()
+{
+    const auto startDirectory = QString(vmm_path);
+    const auto selectedConfigFile = QFileDialog::getOpenFileName(this, tr("Choose configuration file"),
+                                                startDirectory,
+                                                tr("86Box configuration files (86box.cfg)"));
+    // Empty value means the dialog was canceled
+    if (!selectedConfigFile.isEmpty()) {
+        QFile configFile(selectedConfigFile);
+        if (!configFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            QMessageBox::critical(this, tr("Configuration read failed"), tr("Unable to open the selected configuration file for reading: %1").arg(configFile.errorString()));
+            return;
+        }
+        const QString configFileContents = configFile.readAll();
+        existingConfiguration->setPlainText(configFileContents);
+        configFile.close();
+        emit completeChanged();
+    }
+}
+
+QString
+WithExistingConfigPage::configuration() const
+{
+    return existingConfiguration->toPlainText();
+}
+void
+WithExistingConfigPage::setConfiguration(const QString &configuration)
+{
+    if (configuration != existingConfiguration->toPlainText()) {
+        existingConfiguration->setPlainText(configuration);
+        emit configurationChanged(configuration);
+    }
+}
+
+int
+WithExistingConfigPage::nextId() const
+{
+    return VMManagerAddMachine::Page_NameAndLocation;
+}
+
+bool
+WithExistingConfigPage::isComplete() const
+{
+    return !existingConfiguration->toPlainText().isEmpty();
+}
+
+NameAndLocationPage::
+NameAndLocationPage(QWidget *parent)
+{
+#ifdef CUSTOM_SYSTEM_LOCATION
+    setTitle(tr("System name and location"));
+
+#if defined(_WIN32)
+    dirValidate = QRegularExpression(R"(^[^\\/:*?"<>|]+$)");
+#elif defined(__APPLE__)
+    dirValidate = QRegularExpression(R"(^[^/:]+$)");
+#else
+    dirValidate = QRegularExpression(R"(^[^/]+$)");
+#endif
+
+    setSubTitle(tr("Enter the name of the system and choose the location"));
+#else
+    setTitle(tr("System name"));
+    setSubTitle(tr("Enter the name of the system"));
+#endif
+
+    const auto chooseDirectoryButton = new QPushButton();
+    chooseDirectoryButton->setIcon(QApplication::style()->standardIcon(QStyle::SP_DirIcon));
+
+    const auto systemNameLabel = new QLabel(tr("System name:"));
+    systemName           = new QLineEdit();
+    // Special event filter to override enter key
+    systemName->installEventFilter(this);
+    registerField("systemName*", systemName);
+    systemNameValidation = new QLabel();
+
+#ifdef CUSTOM_SYSTEM_LOCATION
+    const auto systemLocationLabel = new QLabel(tr("System location:"));
+    systemLocation           = new QLineEdit();
+    systemLocation->setText(QDir::toNativeSeparators(vmm_path));
+    registerField("systemLocation*", systemLocation);
+    systemLocationValidation = new QLabel();
+    systemLocationValidation->setWordWrap(true);
+#endif
+
+    const auto displayNameLabel = new QLabel(tr("Display name (optional):"));
+    displayName           = new QLineEdit();
+    // Special event filter to override enter key
+    displayName->installEventFilter(this);
+    registerField("displayName*", displayName);
+
+    const auto layout = new QGridLayout();
+    // Spacer row
+    layout->setRowMinimumHeight(1, 20);
+    layout->addWidget(systemNameLabel, 2, 0);
+    layout->addWidget(systemName, 2, 1);
+    // Validation text, appears only as necessary
+    layout->addWidget(systemNameValidation, 3, 0, 1, -1);
+    // Set height on validation because it may not always be present
+    layout->setRowMinimumHeight(3, 20);
+
+#ifdef CUSTOM_SYSTEM_LOCATION
+    // Another spacer
+    layout->setRowMinimumHeight(4, 20);
+    layout->addWidget(systemLocationLabel, 5, 0);
+    layout->addWidget(systemLocation, 5, 1);
+    layout->addWidget(chooseDirectoryButton, 5, 2);
+    // Validation text
+    layout->addWidget(systemLocationValidation, 6, 0, 1, -1);
+    layout->setRowMinimumHeight(6, 20);
+#endif
+
+    // Another spacer
+    layout->setRowMinimumHeight(7, 20);
+    layout->addWidget(displayNameLabel, 8, 0);
+    layout->addWidget(displayName, 8, 1);
+
+    setLayout(layout);
+
+#ifdef CUSTOM_SYSTEM_LOCATION
+    connect(chooseDirectoryButton, &QPushButton::clicked, this, &NameAndLocationPage::chooseDirectoryLocation);
+#endif
+}
+
+int
+NameAndLocationPage::nextId() const
+{
+    return VMManagerAddMachine::Page_Conclusion;
+}
+
+#ifdef CUSTOM_SYSTEM_LOCATION
+void
+NameAndLocationPage::chooseDirectoryLocation()
+{
+    const auto directory = QFileDialog::getExistingDirectory(this, "Choose directory", QDir(vmm_path).path());
+    systemLocation->setText(QDir::toNativeSeparators(directory));
+    emit completeChanged();
+}
+#endif
+bool
+NameAndLocationPage::isComplete() const
+{
+    bool nameValid     = false;
+#ifdef CUSTOM_SYSTEM_LOCATION
+    bool locationValid = false;
+#endif
+    // return true if complete
+    if (systemName->text().isEmpty()) {
+        systemNameValidation->setText(tr("Please enter a system name"));
+#ifdef CUSTOM_SYSTEM_LOCATION
+    } else if (!systemName->text().contains(dirValidate)) {
+        systemNameValidation->setText(tr("System name cannot contain certain characters"));
+    } else if (const QDir newDir = QDir::cleanPath(systemLocation->text() + "/" + systemName->text()); newDir.exists()) {
+#else
+    } else if (const QDir newDir = QDir::cleanPath(QString(vmm_path) + "/" + systemName->text()); newDir.exists()) {
+#endif
+        systemNameValidation->setText(tr("System name already exists"));
+    } else {
+        systemNameValidation->clear();
+        nameValid = true;
+    }
+
+#ifdef CUSTOM_SYSTEM_LOCATION
+    if (systemLocation->text().isEmpty()) {
+        systemLocationValidation->setText(tr("Please enter a directory for the system"));
+    } else if (const auto dir = QDir(systemLocation->text()); !dir.exists()) {
+        systemLocationValidation->setText(tr("Directory does not exist"));
+    } else {
+        systemLocationValidation->setText(tr("A new directory for the system will be created in the selected directory above"));
+        locationValid = true;
+    }
+
+    return nameValid && locationValid;
+#else
+    return nameValid;
+#endif
+}
+bool
+NameAndLocationPage::eventFilter(QObject *watched, QEvent *event)
+{
+    // Override the enter key to hit the next wizard button
+    // if the validator (isComplete) is satisfied
+    if (event->type() == QEvent::KeyPress) {
+        const auto keyEvent = dynamic_cast<QKeyEvent*>(event);
+        if (keyEvent->key() == Qt::Key_Enter || keyEvent->key() == Qt::Key_Return) {
+            // Only advance if the validator is satisfied (isComplete)
+            if(const auto wizard = qobject_cast<QWizard*>(this->wizard())) {
+                if (wizard->currentPage()->isComplete()) {
+                    wizard->next();
+                }
+            }
+            // Discard the key event
+            return true;
+        }
+    }
+    return QWizardPage::eventFilter(watched, event);
+}
+
+ConclusionPage::
+ConclusionPage(QWidget *parent)
+{
+    setTitle(tr("Complete"));
+
+    setPixmap(QWizard::WatermarkPixmap, QPixmap(":assets/addvm-watermark.png"));
+
+    topLabel = new QLabel(tr("The wizard will now launch the configuration for the new system."));
+    topLabel->setWordWrap(true);
+
+    const auto systemNameLabel     = new QLabel(tr("System name:"));
+    systemNameLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
+    systemName                     = new QLabel();
+    systemName->setWordWrap(true);
+#ifdef CUSTOM_SYSTEM_LOCATION
+    const auto systemLocationLabel = new QLabel(tr("System location:"));
+    systemLocationLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
+    systemLocation      = new QLabel();
+    systemLocation->setWordWrap(true);
+#endif
+
+    displayNameLabel                = new QLabel(tr("Display name:"));
+    displayNameLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
+    displayName                     = new QLabel();
+    displayName->setWordWrap(true);
+
+    const auto layout = new QGridLayout();
+    layout->addWidget(topLabel, 0, 0, 1, -1);
+    layout->setRowMinimumHeight(1, 20);
+    layout->addWidget(systemNameLabel, 2, 0);
+    layout->addWidget(systemName, 2, 1);
+#ifdef CUSTOM_SYSTEM_LOCATION
+    layout->addWidget(systemLocationLabel, 3, 0);
+    layout->addWidget(systemLocation, 3, 1);
+#endif
+    layout->addWidget(displayNameLabel, 4, 0);
+    layout->addWidget(displayName, 4, 1);
+
+    setLayout(layout);
+}
+
+// initializePage() runs after the page has been created with the constructor
+void
+ConclusionPage::initializePage()
+{
+#ifdef CUSTOM_SYSTEM_LOCATION
+    const auto finalPath = QDir::cleanPath(field("systemLocation").toString() + "/" + field("systemName").toString());
+    const auto nativePath = QDir::toNativeSeparators(finalPath);
+#endif
+    const auto systemNameDisplay = field("systemName").toString();
+    const auto displayNameDisplay = field("displayName").toString();
+
+    systemName->setText(systemNameDisplay);
+#ifdef CUSTOM_SYSTEM_LOCATION
+    systemLocation->setText(nativePath);
+#endif
+    if (!displayNameDisplay.isEmpty()) {
+        displayNameLabel->setVisible(true);
+        displayName->setVisible(true);
+        displayName->setText(displayNameDisplay);
+    } else {
+        displayNameLabel->setVisible(false);
+        displayName->setVisible(false);
+    }
+}
diff --git a/src/qt/qt_vmmanager_addmachine.hpp b/src/qt/qt_vmmanager_addmachine.hpp
new file mode 100644
index 000000000..b73b5a609
--- /dev/null
+++ b/src/qt/qt_vmmanager_addmachine.hpp
@@ -0,0 +1,121 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		Header for 86Box VM manager add machine wizard
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+#ifndef QT_VMMANAGER_ADDMACHINE_H
+#define QT_VMMANAGER_ADDMACHINE_H
+
+#include <QLabel>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QRadioButton>
+#include <QRegularExpression>
+#include <QWizard>
+
+// Implementation note: There are several classes in this header:
+// One for the main Wizard class and one for each page of the wizard
+
+class VMManagerAddMachine final : public QWizard {
+    Q_OBJECT
+
+public:
+    enum {
+        Page_Intro,
+        Page_Fresh,
+        Page_WithExistingConfig,
+        Page_NameAndLocation,
+        Page_Conclusion
+    };
+
+    explicit VMManagerAddMachine(QWidget *parent = nullptr);
+};
+
+class IntroPage : public QWizardPage {
+    Q_OBJECT
+
+public:
+    explicit IntroPage(QWidget *parent = nullptr);
+    [[nodiscard]] int nextId() const override;
+
+private:
+    QLabel *topLabel;
+    QRadioButton *newConfigRadioButton;
+    QRadioButton *existingConfigRadioButton;
+};
+
+class WithExistingConfigPage final : public QWizardPage {
+    Q_OBJECT
+    Q_PROPERTY(QString configuration READ configuration WRITE setConfiguration NOTIFY configurationChanged)
+
+public:
+    explicit WithExistingConfigPage(QWidget *parent = nullptr);
+    // These extra functions are required to register QPlainTextEdit fields
+    [[nodiscard]] QString configuration() const;
+    void setConfiguration(const QString &configuration);
+signals:
+    void configurationChanged(const QString &configuration);
+private:
+    QPlainTextEdit *existingConfiguration;
+private slots:
+        void chooseExistingConfigFile();
+protected:
+    [[nodiscard]] int nextId() const override;
+    [[nodiscard]] bool isComplete() const override;
+
+};
+
+class NameAndLocationPage final : public QWizardPage {
+    Q_OBJECT
+
+public:
+    explicit NameAndLocationPage(QWidget *parent = nullptr);
+    [[nodiscard]] int nextId() const override;
+private:
+    QLineEdit *systemName;
+#ifdef CUSTOM_SYSTEM_LOCATION
+    QLineEdit *systemLocation;
+#endif
+    QLineEdit *displayName;
+    QLabel    *systemNameValidation;
+#ifdef CUSTOM_SYSTEM_LOCATION
+    QLabel    *systemLocationValidation;
+    QRegularExpression dirValidate;
+private slots:
+    void chooseDirectoryLocation();
+#endif
+protected:
+    [[nodiscard]] bool isComplete() const override;
+    bool eventFilter(QObject *watched, QEvent *event) override;
+
+};
+
+class ConclusionPage final : public QWizardPage {
+    Q_OBJECT
+public:
+    explicit ConclusionPage(QWidget *parent = nullptr);
+private:
+    QLabel *topLabel;
+    QLabel *systemName;
+#ifdef CUSTOM_SYSTEM_LOCATION
+    QLabel *systemLocation;
+#endif
+    QLabel *displayNameLabel;
+    QLabel *displayName;
+protected:
+    void initializePage() override;
+};
+
+#endif // QT_VMMANAGER_ADDMACHINE_H
\ No newline at end of file
diff --git a/src/qt/qt_vmmanager_clientsocket.cpp b/src/qt/qt_vmmanager_clientsocket.cpp
new file mode 100644
index 000000000..7f1587cb4
--- /dev/null
+++ b/src/qt/qt_vmmanager_clientsocket.cpp
@@ -0,0 +1,271 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		86Box VM manager client socket module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+#include "qt_vmmanager_clientsocket.hpp"
+#include "qt_vmmanager_protocol.hpp"
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+
+extern "C" {
+#include "86box/plat.h"
+#include "86box/config.h"
+}
+
+VMManagerClientSocket::VMManagerClientSocket(QObject* obj) : server_connected(false)
+{
+    socket = new QLocalSocket;
+
+}
+
+void
+VMManagerClientSocket::dataReady()
+{
+    // emit signal?
+    QDataStream stream(socket);
+    stream.setVersion(QDataStream::Qt_5_7);
+    QByteArray jsonData;
+    for (;;) {
+        // start a transaction
+        stream.startTransaction();
+        // try to read the data
+        stream >> jsonData;
+        if (stream.commitTransaction()) {
+            // first try to successfully read some data
+            // need to also make sure it's valid json
+            QJsonParseError parse_error{};
+            // try to create a document with the data received
+            const QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonData, &parse_error);
+            if (parse_error.error == QJsonParseError::NoError) {
+                // the data received was valid json
+                if (jsonDoc.isObject()) {
+                    // and is a valid json object
+                    // parse the json
+                    jsonReceived(jsonDoc.object());
+                }
+            }
+            // If the received data isn't valid json,
+            // loop and try to read more if available
+        } else {
+            // read failed, socket is reverted to its previous state (before the transaction)
+            // Exit the loop and wait for more data to become available
+            break;
+        }
+    }
+
+}
+
+bool
+VMManagerClientSocket::IPCConnect(const QString &server)
+{
+    server_name = server;
+    connect(socket, &QLocalSocket::connected, this, &VMManagerClientSocket::connected);
+    connect(socket, &QLocalSocket::disconnected, this, &VMManagerClientSocket::disconnected);
+    connect(socket, &QLocalSocket::errorOccurred, this, &VMManagerClientSocket::connectionError);
+    connect(socket, &QLocalSocket::readyRead, this, &VMManagerClientSocket::dataReady);
+
+    socket->connectToServer(server_name);
+
+    if(!socket->isValid()) {
+        qInfo("Could not connect to server: %s", qPrintable(socket->errorString()));
+        return false;
+    }
+
+    qInfo("Connection Successful");
+    return true;
+}
+
+void
+VMManagerClientSocket::connected() const
+{
+    // TODO: signal
+    qDebug("Connected to %s", qPrintable(server_name));
+}
+
+void
+VMManagerClientSocket::disconnected() const
+{
+    // TODO: signal
+    qDebug("Disconnected from %s", qPrintable(server_name));
+}
+
+void
+VMManagerClientSocket::sendMessage(const VMManagerProtocol::ClientMessage protocol_message) const
+{
+    sendMessageFull(protocol_message, QStringList(), QJsonObject());
+}
+
+void
+VMManagerClientSocket::sendMessageWithList(const VMManagerProtocol::ClientMessage protocol_message, const QStringList &list) const
+{
+    sendMessageFull(protocol_message, list, QJsonObject());
+}
+
+void
+VMManagerClientSocket::sendMessageWithObject(const VMManagerProtocol::ClientMessage protocol_message, const QJsonObject &json) const
+{
+    sendMessageFull(protocol_message, QStringList(), json);
+}
+
+void
+VMManagerClientSocket::sendMessageFull(const VMManagerProtocol::ClientMessage protocol_message, const QStringList &list, const QJsonObject &json) const
+{
+    QDataStream clientStream(socket);
+    clientStream.setVersion(QDataStream::Qt_5_7);
+    auto packet = new VMManagerProtocol(VMManagerProtocol::Sender::Client);
+    auto jsonMessage = packet->protocolClientMessage(protocol_message);
+    if (!list.isEmpty()) {
+        jsonMessage["list"] = QJsonArray::fromStringList(list);
+    }
+    // TODO: Add the logic for including objects
+    if(!json.isEmpty()) {
+        jsonMessage["params"] = json;
+    }
+    clientStream << QJsonDocument(jsonMessage).toJson(QJsonDocument::Compact);
+}
+
+void
+VMManagerClientSocket::jsonReceived(const QJsonObject &json)
+{
+    // The serialization portion has already validated the message as json.
+    // Ensure it has the required fields
+    if (!VMManagerProtocol::hasRequiredFields(json)) {
+        // TODO: Error handling of some sort, emit signals
+        qDebug("Invalid message received from client: required fields missing. Object:");
+        qDebug() << json;
+        return;
+    }
+    //    qDebug() << Q_FUNC_INFO << json;
+
+    // Parsing happens here. When adding new types, make sure to first add them
+    // to VMManagerProtocol::ManagerMessage and then add it to the list here.
+    // If a signal needs to be emitted, add that as well and connect to slots
+    // as appropriate.
+
+    switch (VMManagerProtocol::getManagerMessageType(json)) {
+        case VMManagerProtocol::ManagerMessage::Pause:
+            qDebug("Pause command received from manager");
+            emit pause();
+            break;
+        case VMManagerProtocol::ManagerMessage::ResetVM:
+            qDebug("Reset VM command received from manager");
+            emit resetVM();
+            break;
+        case VMManagerProtocol::ManagerMessage::ShowSettings:
+            qDebug("Show settings command received from manager");
+            emit showsettings();
+            break;
+        case VMManagerProtocol::ManagerMessage::CtrlAltDel:
+            qDebug("CtrlAltDel command received from manager");
+            emit ctrlaltdel();
+            break;
+        case VMManagerProtocol::ManagerMessage::RequestShutdown:
+            qDebug("RequestShutdown command received from manager");
+            emit request_shutdown();
+            break;
+        case VMManagerProtocol::ManagerMessage::ForceShutdown:
+            qDebug("ForceShutdown command received from manager");
+            emit force_shutdown();
+            break;
+        case VMManagerProtocol::ManagerMessage::RequestStatus:
+            qDebug("Status request command received from manager");
+            break;
+        case VMManagerProtocol::ManagerMessage::GlobalConfigurationChanged:
+            {
+                config_load_global();
+#ifdef Q_OS_WINDOWS
+                void selectDarkMode();
+                selectDarkMode();
+#endif
+                break;
+            }
+        default:
+            qDebug("Unknown client message type received:");
+            qDebug() << json;
+            break;
+    }
+}
+
+void
+VMManagerClientSocket::connectionError(const QLocalSocket::LocalSocketError socketError)
+{
+    qInfo("A connection error has occurred: ");
+    switch (socketError) {
+        case QLocalSocket::ServerNotFoundError:
+            qInfo("Server not found");
+            break;
+        case QLocalSocket::ConnectionRefusedError:
+            qInfo("Connection refused");
+            break;
+        case QLocalSocket::PeerClosedError:
+            qInfo("Peer closed");
+            break;
+        default:
+            qInfo() << "QLocalSocket::LocalSocketError " << socketError;
+            break;
+    }
+}
+
+bool
+VMManagerClientSocket::eventFilter(QObject *obj, QEvent *event)
+{
+    if (socket->state() == QLocalSocket::ConnectedState) {
+        VMManagerProtocol::RunningState running_state;
+        if (event->type() == QEvent::WindowBlocked) {
+            running_state = dopause ? VMManagerProtocol::RunningState::PausedWaiting : VMManagerProtocol::RunningState::RunningWaiting;
+            clientRunningStateChanged(running_state);
+            window_blocked = true;
+        } else if (event->type() == QEvent::WindowUnblocked) {
+            window_blocked = false;
+            running_state = dopause ? VMManagerProtocol::RunningState::Paused : VMManagerProtocol::RunningState::Running;
+            clientRunningStateChanged(running_state);
+        }
+    }
+    return QObject::eventFilter(obj, event);
+}
+
+void
+VMManagerClientSocket::sendWinIdMessage(WId id)
+{
+    QJsonObject extra_object;
+    extra_object["params"] = static_cast<int>(id);
+    sendMessageWithObject(VMManagerProtocol::ClientMessage::WinIdMessage, extra_object);
+}
+
+void
+VMManagerClientSocket::clientRunningStateChanged(VMManagerProtocol::RunningState state) const
+{
+    QJsonObject extra_object;
+    if ((state == VMManagerProtocol::RunningState::Paused
+    || state == VMManagerProtocol::RunningState::Running) && window_blocked) {
+        state = (state == VMManagerProtocol::RunningState::Paused) ? VMManagerProtocol::RunningState::PausedWaiting : VMManagerProtocol::RunningState::RunningWaiting;
+    }
+    extra_object["status"] = static_cast<int>(state);
+    sendMessageWithObject(VMManagerProtocol::ClientMessage::RunningStateChanged, extra_object);
+}
+
+void
+VMManagerClientSocket::globalConfigurationChanged() const
+{
+    sendMessage(VMManagerProtocol::ClientMessage::GlobalConfigurationChanged);
+}
+
+void
+VMManagerClientSocket::configurationChanged() const
+{
+    sendMessage(VMManagerProtocol::ClientMessage::ConfigurationChanged);
+}
diff --git a/src/qt/qt_vmmanager_clientsocket.hpp b/src/qt/qt_vmmanager_clientsocket.hpp
new file mode 100644
index 000000000..1848749a3
--- /dev/null
+++ b/src/qt/qt_vmmanager_clientsocket.hpp
@@ -0,0 +1,76 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		Header file for 86Box VM manager client socket module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+#ifndef QT_VMMANAGER_CLIENTSOCKET_HPP
+#define QT_VMMANAGER_CLIENTSOCKET_HPP
+
+#include "qt_vmmanager_protocol.hpp"
+#include <QEvent>
+#include <QLocalSocket>
+#include <QObject>
+#include <QWidget>
+
+class VMManagerClientSocket final : public QObject {
+    Q_OBJECT
+
+public:
+    explicit VMManagerClientSocket(QObject* object = nullptr);
+    bool IPCConnect(const QString &server);
+
+    void sendWinIdMessage(WId id);
+
+signals:
+    void pause();
+    void ctrlaltdel();
+    void showsettings();
+    void resetVM();
+    void request_shutdown();
+    void force_shutdown();
+    void dialogstatus(bool open);
+
+public slots:
+    void clientRunningStateChanged(VMManagerProtocol::RunningState state) const;
+    void configurationChanged() const;
+    void globalConfigurationChanged() const;
+
+private:
+    QString server_name;
+    QLocalSocket *socket;
+    bool server_connected;
+    bool window_blocked = false;
+    void connected() const;
+    void disconnected() const;
+    static void connectionError(QLocalSocket::LocalSocketError socketError);
+
+    // Main convenience send function
+    void sendMessage(VMManagerProtocol::ClientMessage protocol_message) const;
+    // Send message with optional params array convenience function
+    void sendMessageWithList(VMManagerProtocol::ClientMessage protocol_message, const QStringList &list) const;
+    // Send message with optional json object convenience function
+    void sendMessageWithObject(VMManagerProtocol::ClientMessage protocol_message, const QJsonObject &json) const;
+    // Full send message function called by all convenience functions
+    void sendMessageFull(VMManagerProtocol::ClientMessage protocol_message, const QStringList &list, const QJsonObject &json) const;
+    void jsonReceived(const QJsonObject &json);
+
+    void dataReady();
+
+protected:
+    bool eventFilter(QObject *obj, QEvent *event) override;
+
+};
+
+#endif // QT_VMMANAGER_CLIENTSOCKET_HPP
diff --git a/src/qt/qt_vmmanager_config.cpp b/src/qt/qt_vmmanager_config.cpp
new file mode 100644
index 000000000..41075799b
--- /dev/null
+++ b/src/qt/qt_vmmanager_config.cpp
@@ -0,0 +1,79 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		86Box VM manager configuration module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+#include <QDebug>
+#include <QDir>
+#include "qt_vmmanager_config.hpp"
+
+extern "C" {
+#include <86box/plat.h>
+}
+
+VMManagerConfig::VMManagerConfig(const ConfigType type, const QString& section)
+{
+    char BUF[256];
+    plat_get_global_config_dir(BUF, 255);
+    const auto configDir = QString(BUF);
+    const auto configFile = QDir::cleanPath(configDir + "/" + "vmm.ini");
+
+    config_type = type;
+
+    settings = new QSettings(configFile, QSettings::IniFormat, this);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    settings->setIniCodec("UTF-8");
+#endif
+    settings->setFallbacksEnabled(false);
+    if(type == ConfigType::System && !section.isEmpty()) {
+        settings->beginGroup(section);
+    }
+}
+
+VMManagerConfig::~VMManagerConfig() {
+    settings->endGroup();
+}
+
+QString
+VMManagerConfig::getStringValue(const QString& key) const
+{
+    const auto value = settings->value(key);
+    // An invalid QVariant with toString will give a default QString value which is blank.
+    // Therefore any variables that do not exist will return blank strings
+    return value.toString();
+}
+
+void
+VMManagerConfig::setStringValue(const QString &key, const QString &value) const
+{
+    if (value.isEmpty()) {
+        remove(key);
+        return;
+    }
+    settings->setValue(key, value);
+}
+
+void
+VMManagerConfig::remove(const QString &key) const
+{
+    settings->remove(key);
+}
+
+void
+VMManagerConfig::sync() const
+{
+    settings->sync();
+}
+
diff --git a/src/qt/qt_vmmanager_config.hpp b/src/qt/qt_vmmanager_config.hpp
new file mode 100644
index 000000000..bc63aaa03
--- /dev/null
+++ b/src/qt/qt_vmmanager_config.hpp
@@ -0,0 +1,46 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		Header for the 86Box VM manager configuration module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+#ifndef QT_VMMANAGER_CONFIG_H
+#define QT_VMMANAGER_CONFIG_H
+
+#include <QSettings>
+
+class VMManagerConfig : QObject {
+    Q_OBJECT
+
+public:
+    enum class ConfigType {
+        General,
+        System,
+    };
+    Q_ENUM(ConfigType);
+
+    explicit VMManagerConfig(ConfigType type, const QString& section = {});
+    ~VMManagerConfig() override;
+    [[nodiscard]] QString getStringValue(const QString& key) const;
+    void setStringValue(const QString& key, const QString& value) const;
+    void remove(const QString &key) const;
+
+    void sync() const;
+
+    QSettings *settings;
+    ConfigType config_type;
+    QString system_name;
+};
+
+#endif // QT_VMMANAGER_CONFIG_H
\ No newline at end of file
diff --git a/src/qt/qt_vmmanager_details.cpp b/src/qt/qt_vmmanager_details.cpp
new file mode 100644
index 000000000..873da9083
--- /dev/null
+++ b/src/qt/qt_vmmanager_details.cpp
@@ -0,0 +1,484 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		86Box VM manager system details module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+#include <QApplication>
+#include <QDebug>
+#include <QStyle>
+
+#include "qt_util.hpp"
+#include "qt_vmmanager_details.hpp"
+#include "ui_qt_vmmanager_details.h"
+
+#define TOOLBUTTON_STYLESHEET_LIGHT "QToolButton {background: transparent; border: none; padding: 5px} QToolButton:hover {background: palette(midlight)} QToolButton:pressed {background: palette(mid)}"
+#ifdef Q_OS_WINDOWS
+#    define TOOLBUTTON_STYLESHEET_DARK "QToolButton {padding: 5px}"
+#    define SCREENSHOTBORDER_STYLESHEET_DARK "QLabel { border: 1px solid gray }"
+#else
+#    define TOOLBUTTON_STYLESHEET_DARK "QToolButton {background: transparent; border: none; padding: 5px} QToolButton:hover {background: palette(dark)} QToolButton:pressed {background: palette(mid)}"
+#endif
+#define SCROLLAREA_STYLESHEET_LIGHT "QWidget {background-color: palette(light)} QScrollBar{ background-color: none }"
+#define SYSTEMLABEL_STYLESHEET_LIGHT "background-color: palette(midlight);"
+
+using namespace VMManager;
+
+VMManagerDetails::VMManagerDetails(QWidget *parent) :
+    QWidget(parent), ui(new Ui::VMManagerDetails) {
+    ui->setupUi(this);
+
+    const auto leftColumnLayout = qobject_cast<QVBoxLayout*>(ui->leftColumn->layout());
+
+    // Each section here gets its own VMManagerDetailSection, named in the constructor.
+    // When a system is selected in the list view it is updated through this object
+    // See updateData() for the implementation
+
+    systemSection = new VMManagerDetailSection(tr("System", "Header for System section in VM Manager Details"));
+    ui->leftColumn->layout()->addWidget(systemSection);
+    // These horizontal lines are used for the alternate layout which may possibly
+    // be a preference one day.
+    // ui->leftColumn->layout()->addWidget(createHorizontalLine());
+
+    videoSection = new VMManagerDetailSection(tr("Display", "Header for Display section in VM Manager Details"));
+    ui->leftColumn->layout()->addWidget(videoSection);
+    // ui->leftColumn->layout()->addWidget(createHorizontalLine());
+
+    storageSection = new VMManagerDetailSection(tr("Storage", "Header for Storage section in VM Manager Details"));
+    ui->leftColumn->layout()->addWidget(storageSection);
+    // ui->leftColumn->layout()->addWidget(createHorizontalLine());
+
+    audioSection = new VMManagerDetailSection(tr("Audio", "Header for Audio section in VM Manager Details"));
+    ui->leftColumn->layout()->addWidget(audioSection);
+    // ui->leftColumn->layout()->addWidget(createHorizontalLine());
+
+    networkSection = new VMManagerDetailSection(tr("Network", "Header for Network section in VM Manager Details"));
+    ui->leftColumn->layout()->addWidget(networkSection);
+    // ui->leftColumn->layout()->addWidget(createHorizontalLine());
+
+    inputSection = new VMManagerDetailSection(tr("Input devices", "Header for Input section in VM Manager Details"));
+    ui->leftColumn->layout()->addWidget(inputSection);
+    // ui->leftColumn->layout()->addWidget(createHorizontalLine());
+
+    portsSection = new VMManagerDetailSection(tr("Ports", "Header for Input section in VM Manager Details"));
+    ui->leftColumn->layout()->addWidget(portsSection);
+
+    otherSection = new VMManagerDetailSection(tr("Other devices", "Header for Other devices section in VM Manager Details"));
+    ui->leftColumn->layout()->addWidget(otherSection);
+
+    // This is like adding a spacer
+    leftColumnLayout->addStretch();
+
+    // Event filter for the notes to save when it loses focus
+    ui->notesTextEdit->installEventFilter(this);
+
+    // Default screenshot label and thumbnail (image inside the label) sizes
+    screenshotThumbnailSize = QSize(240, 160);
+
+    // Set the icons for the screenshot navigation buttons
+    ui->screenshotNext->setIcon(QApplication::style()->standardIcon(QStyle::SP_ArrowRight));
+    ui->screenshotPrevious->setIcon(QApplication::style()->standardIcon(QStyle::SP_ArrowLeft));
+    ui->screenshotNextTB->setIcon(QApplication::style()->standardIcon(QStyle::SP_ArrowRight));
+    ui->screenshotPreviousTB->setIcon(QApplication::style()->standardIcon(QStyle::SP_ArrowLeft));
+    // Disabled by default
+    ui->screenshotNext->setEnabled(false);
+    ui->screenshotPrevious->setEnabled(false);
+    ui->screenshotNextTB->setEnabled(false);
+    ui->screenshotPreviousTB->setEnabled(false);
+    // Connect their signals
+    connect(ui->screenshotNext, &QPushButton::clicked, this, &VMManagerDetails::nextScreenshot);
+    connect(ui->screenshotNextTB, &QToolButton::clicked, this, &VMManagerDetails::nextScreenshot);
+    connect(ui->screenshotPreviousTB, &QToolButton::clicked, this, &VMManagerDetails::previousScreenshot);
+    connect(ui->screenshotPrevious, &QPushButton::clicked, this, &VMManagerDetails::previousScreenshot);
+    // These push buttons can be taken out if the tool buttons stay
+    ui->screenshotNext->setVisible(false);
+    ui->screenshotPrevious->setVisible(false);
+    QString toolButtonStyleSheet;
+    // Simple method to try and determine if light mode is enabled
+#ifdef Q_OS_WINDOWS
+    const bool lightMode = util::isWindowsLightTheme();
+#else
+    const bool lightMode = QApplication::palette().window().color().value() > QApplication::palette().windowText().color().value();
+#endif
+    if (lightMode) {
+        toolButtonStyleSheet = TOOLBUTTON_STYLESHEET_LIGHT;
+    } else {
+        toolButtonStyleSheet = TOOLBUTTON_STYLESHEET_DARK;
+    }
+    ui->ssNavTBHolder->setStyleSheet(toolButtonStyleSheet);
+
+    pauseIcon = QIcon(":/menuicons/qt/icons/pause.ico");
+    runIcon = QIcon(":/menuicons/qt/icons/run.ico");
+
+    // Experimenting
+    startPauseButton = new QToolButton();
+    startPauseButton->setIcon(runIcon);
+    startPauseButton->setAutoRaise(true);
+    startPauseButton->setEnabled(false);
+    startPauseButton->setToolTip(tr("Start"));
+    ui->toolButtonHolder->setStyleSheet(toolButtonStyleSheet);
+    resetButton = new QToolButton();
+    resetButton->setIcon(QIcon(":/menuicons/qt/icons/hard_reset.ico"));
+    resetButton->setEnabled(false);
+    resetButton->setToolTip(tr("Hard reset"));
+    stopButton = new QToolButton();
+    stopButton->setIcon(QIcon(":/menuicons/qt/icons/acpi_shutdown.ico"));
+    stopButton->setEnabled(false);
+    stopButton->setToolTip(tr("Force shutdown"));
+    configureButton = new QToolButton();
+    configureButton->setIcon(QIcon(":/menuicons/qt/icons/settings.ico"));
+    configureButton->setEnabled(false);
+    configureButton->setToolTip(tr("Settings..."));
+    cadButton = new QToolButton();
+    cadButton->setIcon(QIcon(":menuicons/qt/icons/send_cad.ico"));
+    cadButton->setEnabled(false);
+    cadButton->setToolTip(tr("Ctrl+Alt+Del"));
+
+    ui->toolButtonHolder->layout()->addWidget(configureButton);
+    ui->toolButtonHolder->layout()->addWidget(resetButton);
+    ui->toolButtonHolder->layout()->addWidget(stopButton);
+    ui->toolButtonHolder->layout()->addWidget(startPauseButton);
+    ui->toolButtonHolder->layout()->addWidget(cadButton);
+
+    ui->notesTextEdit->setEnabled(false);
+
+#ifdef Q_OS_WINDOWS
+    connect(this, &VMManagerDetails::styleUpdated, systemSection, &VMManagerDetailSection::updateStyle);
+    connect(this, &VMManagerDetails::styleUpdated, videoSection, &VMManagerDetailSection::updateStyle);
+    connect(this, &VMManagerDetails::styleUpdated, storageSection, &VMManagerDetailSection::updateStyle);
+    connect(this, &VMManagerDetails::styleUpdated, audioSection, &VMManagerDetailSection::updateStyle);
+    connect(this, &VMManagerDetails::styleUpdated, networkSection, &VMManagerDetailSection::updateStyle);
+    connect(this, &VMManagerDetails::styleUpdated, inputSection, &VMManagerDetailSection::updateStyle);
+    connect(this, &VMManagerDetails::styleUpdated, portsSection, &VMManagerDetailSection::updateStyle);
+    connect(this, &VMManagerDetails::styleUpdated, otherSection, &VMManagerDetailSection::updateStyle);
+#endif
+
+    sysconfig = new VMManagerSystem();
+}
+
+VMManagerDetails::~VMManagerDetails() {
+    delete ui;
+}
+
+void
+VMManagerDetails::updateData(VMManagerSystem *passed_sysconfig) {
+
+    // Set the scrollarea background but also set the scroll bar to none. Otherwise it will also
+    // set the scrollbar background to the same.
+#ifdef Q_OS_WINDOWS
+    if (util::isWindowsLightTheme())
+#endif
+    {
+        ui->scrollArea->setStyleSheet(SCROLLAREA_STYLESHEET_LIGHT);
+        ui->systemLabel->setStyleSheet(SYSTEMLABEL_STYLESHEET_LIGHT);
+    }
+    // Margins are a little different on macos
+#ifdef Q_OS_MACOS
+    ui->systemLabel->setMargin(15);
+#else
+    ui->systemLabel->setMargin(10);
+#endif
+
+    // disconnect old signals before assigning the passed systemconfig object
+    disconnect(startPauseButton, &QToolButton::clicked, sysconfig, &VMManagerSystem::startButtonPressed);
+    disconnect(startPauseButton, &QToolButton::clicked, sysconfig, &VMManagerSystem::pauseButtonPressed);
+    disconnect(resetButton, &QToolButton::clicked, sysconfig, &VMManagerSystem::restartButtonPressed);
+    disconnect(stopButton, &QToolButton::clicked, sysconfig, &VMManagerSystem::shutdownForceButtonPressed);
+    disconnect(configureButton, &QToolButton::clicked, sysconfig, &VMManagerSystem::launchSettings);
+    disconnect(cadButton, &QToolButton::clicked, sysconfig, &VMManagerSystem::cadButtonPressed);
+
+    sysconfig = passed_sysconfig;
+    connect(resetButton, &QToolButton::clicked, sysconfig, &VMManagerSystem::restartButtonPressed);
+    connect(stopButton, &QToolButton::clicked, sysconfig, &VMManagerSystem::shutdownForceButtonPressed);
+    connect(configureButton, &QToolButton::clicked, sysconfig, &VMManagerSystem::launchSettings);
+    connect(cadButton, &QToolButton::clicked, sysconfig, &VMManagerSystem::cadButtonPressed);
+    cadButton->setEnabled(true);
+
+    bool running = sysconfig->getProcessStatus() == VMManagerSystem::ProcessStatus::Running ||
+        sysconfig->getProcessStatus() == VMManagerSystem::ProcessStatus::RunningWaiting;
+    if(running) {
+        startPauseButton->setIcon(pauseIcon);
+        connect(startPauseButton, &QToolButton::clicked, sysconfig, &VMManagerSystem::pauseButtonPressed);
+    } else {
+        startPauseButton->setIcon(runIcon);
+        connect(startPauseButton, &QToolButton::clicked, sysconfig, &VMManagerSystem::startButtonPressed);
+    }
+    startPauseButton->setEnabled(true);
+    configureButton->setEnabled(true);
+
+    updateConfig(passed_sysconfig);
+    updateScreenshots(passed_sysconfig);
+
+    ui->systemLabel->setText(passed_sysconfig->displayName);
+    ui->statusLabel->setText(sysconfig->process->processId() == 0 ?
+        tr("Not running") :
+        QString("%1: PID %2").arg(tr("Running"), QString::number(sysconfig->process->processId())));
+    ui->notesTextEdit->setPlainText(passed_sysconfig->notes);
+    ui->notesTextEdit->setEnabled(true);
+
+    disconnect(sysconfig->process, &QProcess::stateChanged, this, &VMManagerDetails::updateProcessStatus);
+    connect(sysconfig->process, &QProcess::stateChanged, this, &VMManagerDetails::updateProcessStatus);
+
+    disconnect(sysconfig, &VMManagerSystem::windowStatusChanged, this, &VMManagerDetails::updateWindowStatus);
+    connect(sysconfig, &VMManagerSystem::windowStatusChanged, this, &VMManagerDetails::updateWindowStatus);
+
+    disconnect(sysconfig, &VMManagerSystem::clientProcessStatusChanged, this, &VMManagerDetails::updateProcessStatus);
+    connect(sysconfig, &VMManagerSystem::clientProcessStatusChanged, this, &VMManagerDetails::updateProcessStatus);
+
+    updateProcessStatus();
+}
+
+void
+VMManagerDetails::updateConfig(VMManagerSystem *passed_sysconfig) {
+    // Each detail section here has its own VMManagerDetailSection.
+    // When a system is selected in the list view it is updated here, through this object:
+    // * First you clear it with VMManagerDetailSection::clear()
+    // * Then you add each line with VMManagerDetailSection::addSection()
+
+    // System
+    systemSection->clear();
+    systemSection->addSection("Machine", passed_sysconfig->getDisplayValue(VMManager::Display::Name::Machine));
+    systemSection->addSection("CPU", passed_sysconfig->getDisplayValue(VMManager::Display::Name::CPU));
+    systemSection->addSection("Memory", passed_sysconfig->getDisplayValue(VMManager::Display::Name::Memory));
+
+    // Video
+    videoSection->clear();
+    videoSection->addSection("Video", passed_sysconfig->getDisplayValue(VMManager::Display::Name::Video));
+    if(!passed_sysconfig->getDisplayValue(VMManager::Display::Name::Voodoo).isEmpty()) {
+        videoSection->addSection("Voodoo", passed_sysconfig->getDisplayValue(VMManager::Display::Name::Voodoo));
+    }
+
+    // Disks
+    storageSection->clear();
+    storageSection->addSection("Disks", passed_sysconfig->getDisplayValue(VMManager::Display::Name::Disks));
+    storageSection->addSection("Floppy", passed_sysconfig->getDisplayValue(VMManager::Display::Name::Floppy));
+    storageSection->addSection("CD-ROM", passed_sysconfig->getDisplayValue(VMManager::Display::Name::CD));
+    storageSection->addSection("Removable disks", passed_sysconfig->getDisplayValue(VMManager::Display::Name::RDisk));
+    storageSection->addSection("MO", passed_sysconfig->getDisplayValue(VMManager::Display::Name::MO));
+    storageSection->addSection("SCSI", passed_sysconfig->getDisplayValue(VMManager::Display::Name::SCSIController));
+    storageSection->addSection("Controllers", passed_sysconfig->getDisplayValue(VMManager::Display::Name::StorageController));
+
+    // Audio
+    audioSection->clear();
+    audioSection->addSection("Audio", passed_sysconfig->getDisplayValue(VMManager::Display::Name::Audio));
+    audioSection->addSection("MIDI Out", passed_sysconfig->getDisplayValue(VMManager::Display::Name::MidiOut));
+
+    // Network
+    networkSection->clear();
+    networkSection->addSection("NIC", passed_sysconfig->getDisplayValue(VMManager::Display::Name::NIC));
+
+    // Input
+    inputSection->clear();
+    inputSection->addSection("Keyboard", passed_sysconfig->getDisplayValue(VMManager::Display::Name::Keyboard));
+    inputSection->addSection("Mouse", passed_sysconfig->getDisplayValue(VMManager::Display::Name::Mouse));
+    inputSection->addSection("Joystick", passed_sysconfig->getDisplayValue(VMManager::Display::Name::Joystick));
+
+    // Ports
+    portsSection->clear();
+    portsSection->addSection("Serial ports", passed_sysconfig->getDisplayValue(VMManager::Display::Name::Serial));
+    portsSection->addSection("Parallel ports", passed_sysconfig->getDisplayValue(VMManager::Display::Name::Parallel));
+
+    // Other devices
+    otherSection->clear();
+    otherSection->addSection("ISA RTC", passed_sysconfig->getDisplayValue(VMManager::Display::Name::IsaRtc));
+    otherSection->addSection("ISA RAM", passed_sysconfig->getDisplayValue(VMManager::Display::Name::IsaMem));
+    otherSection->addSection("ISA ROM", passed_sysconfig->getDisplayValue(VMManager::Display::Name::IsaRom));
+
+    systemSection->setSections();
+    videoSection->setSections();
+    storageSection->setSections();
+    audioSection->setSections();
+    networkSection->setSections();
+    inputSection->setSections();
+    portsSection->setSections();
+    otherSection->setSections();
+}
+
+void
+VMManagerDetails::updateScreenshots(VMManagerSystem *passed_sysconfig) {
+    // Disable screenshot navigation buttons by default
+    ui->screenshotNext->setEnabled(false);
+    ui->screenshotPrevious->setEnabled(false);
+    ui->screenshotNextTB->setEnabled(false);
+    ui->screenshotPreviousTB->setEnabled(false);
+
+    // Different actions are taken depending on the existence and number of screenshots
+    screenshots = passed_sysconfig->getScreenshots();
+    if (!screenshots.empty()) {
+        ui->screenshot->setFrameStyle(QFrame::NoFrame);
+        ui->screenshot->setEnabled(true);
+        if(screenshots.size() > 1) {
+            ui->screenshotNext->setEnabled(true);
+            ui->screenshotPrevious->setEnabled(true);
+            ui->screenshotNextTB->setEnabled(true);
+            ui->screenshotPreviousTB->setEnabled(true);
+        }
+#ifdef Q_OS_WINDOWS
+        ui->screenshot->setStyleSheet("");
+#endif
+        if(QFileInfo::exists(screenshots.last().filePath())) {
+            screenshotIndex = screenshots.size() - 1;
+            const QPixmap pic(screenshots.at(screenshotIndex).filePath());
+            ui->screenshot->setPixmap(pic.scaled(240, 160, Qt::KeepAspectRatio, Qt::SmoothTransformation));
+        }
+    } else {
+        ui->screenshotNext->setEnabled(false);
+        ui->screenshotPrevious->setEnabled(false);
+        ui->screenshotNextTB->setEnabled(false);
+        ui->screenshotPreviousTB->setEnabled(false);
+        ui->screenshot->setPixmap(QString());
+        ui->screenshot->setFixedSize(240, 160);
+        ui->screenshot->setFrameStyle(QFrame::Box | QFrame::Sunken);
+        ui->screenshot->setText(tr("No screenshot"));
+        ui->screenshot->setEnabled(false);
+        ui->screenshot->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+#ifdef Q_OS_WINDOWS
+        if (!util::isWindowsLightTheme()) {
+            ui->screenshot->setStyleSheet(SCREENSHOTBORDER_STYLESHEET_DARK);
+        } else {
+            ui->screenshot->setStyleSheet("");
+        }
+#endif
+    }
+}
+
+void
+VMManagerDetails::updateProcessStatus() {
+    const bool running = sysconfig->process->state() == QProcess::ProcessState::Running;
+    QString status_text = running ?
+        QString("%1: PID %2").arg(tr("Running"), QString::number(sysconfig->process->processId())) :
+        tr("Not running");
+    status_text.append(sysconfig->window_obscured ? QString(" (%1)").arg(tr("Waiting")) : "");
+    ui->statusLabel->setText(status_text);
+    resetButton->setEnabled(running);
+    stopButton->setEnabled(running);
+    cadButton->setEnabled(running);
+    if(running) {
+        if(sysconfig->getProcessStatus() == VMManagerSystem::ProcessStatus::Running) {
+            startPauseButton->setIcon(pauseIcon);
+            startPauseButton->setToolTip(tr("Pause"));
+        } else {
+            startPauseButton->setIcon(runIcon);
+            startPauseButton->setToolTip(tr("Continue"));
+        }
+
+        disconnect(startPauseButton, &QToolButton::clicked, sysconfig, &VMManagerSystem::pauseButtonPressed);
+        disconnect(startPauseButton, &QToolButton::clicked, sysconfig, &VMManagerSystem::startButtonPressed);
+        connect(startPauseButton, &QToolButton::clicked, sysconfig, &VMManagerSystem::pauseButtonPressed);
+    } else {
+        startPauseButton->setIcon(runIcon);
+        disconnect(startPauseButton, &QToolButton::clicked, sysconfig, &VMManagerSystem::pauseButtonPressed);
+        disconnect(startPauseButton, &QToolButton::clicked, sysconfig, &VMManagerSystem::startButtonPressed);
+        connect(startPauseButton, &QToolButton::clicked, sysconfig, &VMManagerSystem::startButtonPressed);
+        startPauseButton->setToolTip(tr("Start"));
+    }
+
+    if (sysconfig->window_obscured) {
+        resetButton->setDisabled(true);
+        stopButton->setDisabled(true);
+        cadButton->setDisabled(true);
+        startPauseButton->setDisabled(true);
+        configureButton->setDisabled(true);
+    } else {
+        configureButton->setDisabled(false);
+        startPauseButton->setDisabled(false);
+    }
+}
+
+void
+VMManagerDetails::updateWindowStatus()
+{
+    qInfo("Window status changed: %i", sysconfig->window_obscured);
+    updateProcessStatus();
+}
+
+#ifdef Q_OS_WINDOWS
+void
+VMManagerDetails::updateStyle()
+{
+    QString toolButtonStyleSheet;
+    const bool lightMode = util::isWindowsLightTheme();
+    if (lightMode) {
+        toolButtonStyleSheet = TOOLBUTTON_STYLESHEET_LIGHT;
+        ui->scrollArea->setStyleSheet(SCROLLAREA_STYLESHEET_LIGHT);
+        ui->systemLabel->setStyleSheet(SYSTEMLABEL_STYLESHEET_LIGHT);
+        if (!ui->screenshot->isEnabled())
+            ui->screenshot->setStyleSheet("");
+    } else {
+        toolButtonStyleSheet = TOOLBUTTON_STYLESHEET_DARK;
+        ui->scrollArea->setStyleSheet("");
+        ui->systemLabel->setStyleSheet("");
+        if (!ui->screenshot->isEnabled())
+            ui->screenshot->setStyleSheet(SCREENSHOTBORDER_STYLESHEET_DARK);
+    }
+    ui->ssNavTBHolder->setStyleSheet(toolButtonStyleSheet);
+    ui->toolButtonHolder->setStyleSheet(toolButtonStyleSheet);
+
+    emit styleUpdated();
+}
+#endif
+
+QWidget *
+VMManagerDetails::createHorizontalLine(const int leftSpacing, const int rightSpacing)
+{
+    const auto container = new QWidget;
+    const auto hLayout   = new QHBoxLayout(container);
+
+    hLayout->addSpacing(leftSpacing);
+
+    const auto line = new QFrame();
+    line->setFrameShape(QFrame::HLine);
+    line->setFrameShadow(QFrame::Sunken);
+
+    hLayout->addWidget(line);
+    hLayout->addSpacing(rightSpacing);
+    hLayout->setContentsMargins(0, 5, 0, 5);
+
+    return container;
+}
+
+void
+VMManagerDetails::saveNotes() const
+{
+    sysconfig->setNotes(ui->notesTextEdit->toPlainText());
+}
+
+void
+VMManagerDetails::nextScreenshot()
+{
+    screenshotIndex = (screenshotIndex + 1) % screenshots.size();
+    const QPixmap pic(screenshots.at(screenshotIndex).filePath());
+    ui->screenshot->setPixmap(pic.scaled(240, 160, Qt::KeepAspectRatio, Qt::SmoothTransformation));
+}
+
+void
+VMManagerDetails::previousScreenshot()
+{
+    screenshotIndex = screenshotIndex == 0 ? screenshots.size() - 1 : screenshotIndex - 1;
+    const QPixmap pic(screenshots.at(screenshotIndex).filePath());
+    ui->screenshot->setPixmap(pic.scaled(240, 160, Qt::KeepAspectRatio, Qt::SmoothTransformation));
+}
+
+bool
+VMManagerDetails::eventFilter(QObject *watched, QEvent *event)
+{
+    if (watched->isWidgetType() && event->type() == QEvent::FocusOut) {
+        // Make sure it's the textedit
+        if (const auto *textEdit = qobject_cast<QPlainTextEdit*>(watched); textEdit) {
+            saveNotes();
+        }
+    }
+    return QWidget::eventFilter(watched, event);
+}
+
diff --git a/src/qt/qt_vmmanager_details.hpp b/src/qt/qt_vmmanager_details.hpp
new file mode 100644
index 000000000..ac7cda35b
--- /dev/null
+++ b/src/qt/qt_vmmanager_details.hpp
@@ -0,0 +1,106 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		Header for 86Box VM manager system details module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+#ifndef QT_VMMANAGER_DETAILS_H
+#define QT_VMMANAGER_DETAILS_H
+
+#include <QWidget>
+#include "qt_vmmanager_system.hpp"
+// #include "qt_vmmanager_details_section.hpp"
+#include "qt_vmmanager_detailsection.hpp"
+
+
+QT_BEGIN_NAMESPACE
+//namespace Ui { class VMManagerDetails; class CollapseButton;}
+namespace Ui { class VMManagerDetails;}
+QT_END_NAMESPACE
+
+class VMManagerDetails : public QWidget {
+    Q_OBJECT
+
+public:
+    explicit VMManagerDetails(QWidget *parent = nullptr);
+
+    ~VMManagerDetails() override;
+
+    void updateData(VMManagerSystem *passed_sysconfig);
+
+    void updateProcessStatus();
+
+    void updateWindowStatus();
+
+#ifdef Q_OS_WINDOWS
+    void updateStyle();
+#endif
+
+//    CollapseButton *systemCollapseButton;
+
+#ifdef Q_OS_WINDOWS
+signals:
+    void styleUpdated();
+#endif
+
+private:
+    Ui::VMManagerDetails *ui;
+    VMManagerSystem *sysconfig;
+
+    VMManagerDetailSection *systemSection;
+    VMManagerDetailSection *videoSection;
+    VMManagerDetailSection *storageSection;
+    VMManagerDetailSection *audioSection;
+    VMManagerDetailSection *networkSection;
+    VMManagerDetailSection *inputSection;
+    VMManagerDetailSection *portsSection;
+    VMManagerDetailSection *otherSection;
+
+    QFileInfoList screenshots;
+    int           screenshotIndex = 0;
+    QSize         screenshotLabelSize;
+    QSize         screenshotThumbnailSize;
+
+    QToolButton *startPauseButton;
+    QToolButton *resetButton;
+    QToolButton *stopButton;
+    QToolButton *configureButton;
+    QToolButton *cadButton;
+
+    QIcon pauseIcon;
+    QIcon runIcon;
+
+    void updateConfig(VMManagerSystem *passed_sysconfig);
+    void updateScreenshots(VMManagerSystem *passed_sysconfig);
+    static QWidget* createHorizontalLine(int leftSpacing = 25, int rightSpacing = 25);
+    // QVBoxLayout *detailsLayout;
+private slots:
+    void saveNotes() const;
+    void nextScreenshot();
+    void previousScreenshot();
+
+protected:
+    bool eventFilter(QObject *watched, QEvent *event) override;
+
+//    CollapseButton *systemCollapseButton;
+//    QFrame *systemFrame;
+//    CollapseButton *displayCollapseButton;
+//    QFrame *displayFrame;
+//    CollapseButton *storageCollapseButton;
+//    QFrame *storageFrame;
+};
+
+
+
+#endif //QT_VMMANAGER_DETAILS_H
diff --git a/src/qt/qt_vmmanager_details.ui b/src/qt/qt_vmmanager_details.ui
new file mode 100644
index 000000000..9b4fbbe8b
--- /dev/null
+++ b/src/qt/qt_vmmanager_details.ui
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>VMManagerDetails</class>
+ <widget class="QWidget" name="VMManagerDetails">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>497</width>
+    <height>444</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>VMManagerDetails</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="systemLabel">
+     <property name="font">
+      <font>
+       <pointsize>18</pointsize>
+      </font>
+     </property>
+     <property name="text">
+      <string>No Machines Found!</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="LeftRight" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QScrollArea" name="scrollArea">
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
+        </property>
+        <property name="widgetResizable">
+         <bool>true</bool>
+        </property>
+        <widget class="QWidget" name="leftColumn">
+         <property name="geometry">
+          <rect>
+           <x>0</x>
+           <y>0</y>
+           <width>139</width>
+           <height>388</height>
+          </rect>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_4">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <property name="leftMargin">
+           <number>12</number>
+          </property>
+          <property name="topMargin">
+           <number>12</number>
+          </property>
+          <property name="rightMargin">
+           <number>12</number>
+          </property>
+          <property name="bottomMargin">
+           <number>12</number>
+          </property>
+         </layout>
+        </widget>
+       </widget>
+      </item>
+      <item alignment="Qt::AlignHCenter">
+       <widget class="QWidget" name="rightColumn" native="true">
+        <layout class="QVBoxLayout" name="verticalLayout_3">
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <item alignment="Qt::AlignHCenter">
+          <widget class="QLabel" name="screenshot">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>240</width>
+             <height>160</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>240</width>
+             <height>160</height>
+            </size>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QWidget" name="screenshotNavButtons" native="true">
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <item>
+             <spacer name="horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QPushButton" name="screenshotPrevious">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+              <property name="flat">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QWidget" name="ssNavTBHolder" native="true">
+              <layout class="QHBoxLayout" name="horizontalLayout_4">
+               <property name="leftMargin">
+                <number>0</number>
+               </property>
+               <property name="topMargin">
+                <number>0</number>
+               </property>
+               <property name="rightMargin">
+                <number>0</number>
+               </property>
+               <property name="bottomMargin">
+                <number>0</number>
+               </property>
+               <item>
+                <widget class="QToolButton" name="screenshotPreviousTB">
+                 <property name="text">
+                  <string>...</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QToolButton" name="screenshotNextTB">
+                 <property name="text">
+                  <string>...</string>
+                 </property>
+                 <property name="autoRaise">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="screenshotNext">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_2">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPlainTextEdit" name="notesTextEdit">
+           <property name="placeholderText">
+            <string>Type some notes here</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer_3">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>0</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QWidget" name="toolButtonHolder" native="true">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <layout class="QHBoxLayout" name="horizontalLayout_3">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="statusLabel">
+           <property name="text">
+            <string/>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/qt/qt_vmmanager_detailsection.cpp b/src/qt/qt_vmmanager_detailsection.cpp
new file mode 100644
index 000000000..afb71a5f0
--- /dev/null
+++ b/src/qt/qt_vmmanager_detailsection.cpp
@@ -0,0 +1,305 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		86Box VM manager system details section module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+#include "qt_vmmanager_detailsection.hpp"
+#include "ui_qt_vmmanager_detailsection.h"
+
+#include <QPushButton>
+#include "qt_util.hpp"
+
+#define HEADER_STYLESHEET_LIGHT "background-color: palette(midlight);"
+#ifdef Q_OS_WINDOWS
+#    define HEADER_STYLESHEET_DARK "background-color: #616161;"
+#    define BACKGROUND_STYLESHEET_DARK "background-color: #272727;"
+#else
+#    define HEADER_STYLESHEET_DARK "background-color: palette(mid);"
+#endif
+
+const QString VMManagerDetailSection::sectionSeparator = ";";
+using namespace VMManager;
+
+VMManagerDetailSection::
+VMManagerDetailSection(const QString &sectionName)
+    : mainLayout(new QVBoxLayout())
+    , buttonLayout(new QHBoxLayout())
+    , frame(new QFrame())
+    , ui(new Ui::DetailSection)
+{
+    ui->setupUi(this);
+
+    frameGridLayout = new QGridLayout();
+    // Create the collapse button, set the name and add it to the layout
+    collapseButton = new CollapseButton();
+    setSectionName(sectionName);
+    ui->collapseButtonHolder->setContentsMargins(getMargins(MarginSection::ToolButton));
+
+    // Simple method to try and determine if light mode is enabled on the host
+#ifdef Q_OS_WINDOWS
+    const bool lightMode = util::isWindowsLightTheme();
+#else
+    const bool lightMode = QApplication::palette().window().color().value() > QApplication::palette().windowText().color().value();
+#endif
+    // Alternate layout
+    if (lightMode) {
+        ui->collapseButtonHolder->setStyleSheet(HEADER_STYLESHEET_LIGHT);
+    } else {
+#ifdef Q_OS_WINDOWS
+        ui->outerFrame->setStyleSheet(BACKGROUND_STYLESHEET_DARK);
+#endif
+        ui->collapseButtonHolder->setStyleSheet(HEADER_STYLESHEET_DARK);
+    }
+    const auto sectionLabel = new QLabel(sectionName);
+    sectionLabel->setStyleSheet(sectionLabel->styleSheet().append("font-weight: bold;"));
+    ui->collapseButtonHolder->setContentsMargins(QMargins(3, 2, 0, 2));
+    ui->collapseButtonHolder->layout()->addWidget(sectionLabel);
+
+    // ui->collapseButtonHolder->layout()->addWidget(collapseButton);
+    collapseButton->setContent(ui->detailFrame);
+    // Horizontal line added after the section name / button
+    // const auto hLine = new QFrame();
+    // hLine->setFrameShape(QFrame::HLine);
+    // hLine->setFrameShadow(QFrame::Sunken);
+    // hLine->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+    // ui->collapseButtonHolder->layout()->addWidget(hLine);
+    const auto hSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
+    ui->collapseButtonHolder->layout()->addItem(hSpacer);
+    // collapseButton->setContent(frame);
+    // ui->sectionName->setVisible(false);
+    setVisible(false);
+}
+
+VMManagerDetailSection::
+VMManagerDetailSection(const QVariant &varSectionName) : ui(new Ui::DetailSection)
+{
+    const auto sectionName = varSectionName.toString();
+
+    // Initialize even though they will get wiped out
+    // (to keep clang-tidy happy)
+    frameGridLayout       = new QGridLayout();
+    const auto outerFrame = new QFrame();
+    // for the CSS
+    outerFrame->setObjectName("outer_frame");
+    outerFrame->setContentsMargins(QMargins(0, 0, 0, 0));
+    const auto innerFrameLayout = new QVBoxLayout();
+
+    outerFrame->setLayout(innerFrameLayout);
+    auto *outerFrameLayout = new QVBoxLayout();
+    outerFrameLayout->addWidget(outerFrame);
+    outerFrameLayout->setContentsMargins(QMargins(0, 0, 0, 0));
+
+    const auto buttonWidget = new QWidget(this);
+
+    mainLayout      = new QVBoxLayout();
+    buttonLayout = new QHBoxLayout();
+    buttonWidget->setLayout(buttonLayout);
+
+    collapseButton = new CollapseButton();
+    setSectionName(sectionName);
+    buttonLayout->setContentsMargins(getMargins(MarginSection::ToolButton));
+    buttonLayout->addWidget(collapseButton);
+
+    //    buttonLayout->addStretch();
+    auto *hLine = new QFrame();
+    hLine->setFrameShape(QFrame::HLine);
+    hLine->setFrameShadow(QFrame::Sunken);
+    hLine->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+    buttonLayout->addWidget(hLine);
+
+    mainLayout->addLayout(buttonLayout);
+
+    frame = new QFrame();
+    frame->setFrameShape(QFrame::Box);
+    frame->setFrameStyle(QFrame::NoFrame);
+    collapseButton->setContent(frame);
+
+    mainLayout->addWidget(frame);
+    innerFrameLayout->addWidget(buttonWidget);
+    innerFrameLayout->addWidget(frame);
+    setLayout(outerFrameLayout);
+}
+
+VMManagerDetailSection::~VMManagerDetailSection()
+= default;
+
+void
+VMManagerDetailSection::setSectionName(const QString &name)
+{
+    sectionName = name;
+    collapseButton->setButtonText(" " + sectionName);
+    // Bold the section headers
+    collapseButton->setStyleSheet(collapseButton->styleSheet().append("font-weight: bold;"));
+}
+
+void
+VMManagerDetailSection::addSection(const QString &name, const QString &value, VMManager::Display::Name displayField)
+{
+    const auto new_section = DetailSection { name, value};
+    sections.push_back(new_section);
+}
+
+void
+VMManagerDetailSection::setupMainLayout()
+{
+    // clang-tidy says I don't need to check before deleting
+    delete mainLayout;
+    mainLayout = new QVBoxLayout;
+}
+void
+VMManagerDetailSection::setSections()
+{
+    int row = 0;
+
+    for (const auto& section : sections) {
+        QStringList sectionsToAdd = section.value.split(sectionSeparator);
+        QLabel *labelKey = nullptr;
+
+        for (const auto& line : sectionsToAdd) {
+            if (line.isEmpty()) {
+                // Don't bother adding entries if the values are blank
+                continue;
+            }
+
+            const auto labelValue = new QLabel();
+            labelValue->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+            labelValue->setTextInteractionFlags(labelValue->textInteractionFlags() | Qt::TextSelectableByMouse);
+            labelValue->setText(line);
+            frameGridLayout->addWidget(labelValue, row, 1, Qt::AlignLeft);
+
+            if (!labelKey) {
+                labelKey = new QLabel();
+                labelKey->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
+                labelKey->setTextInteractionFlags(labelValue->textInteractionFlags());
+                labelKey->setText(QCoreApplication::translate("", QString(section.name + ":").toUtf8().data()));
+                frameGridLayout->addWidget(labelKey, row, 0, Qt::AlignLeft);
+            }
+
+            const auto hSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
+            frameGridLayout->addItem(hSpacer, row, 2);
+            row++;
+        }
+    }
+
+    collapseButton->setContent(ui->detailFrame);
+    if (sections.size())
+        setVisible(true);
+}
+void
+VMManagerDetailSection::clear()
+{
+    sections.clear();
+    setVisible(false);
+
+    // Clear everything out
+    if(frameGridLayout) {
+        while(frameGridLayout->count()) {
+            QLayoutItem * cur_item = frameGridLayout->takeAt(0);
+            if(cur_item->widget())
+                delete cur_item->widget();
+            delete cur_item;
+        }
+    }
+
+    delete frameGridLayout;
+    frameGridLayout = new QGridLayout();
+    frameGridLayout->setContentsMargins(getMargins(MarginSection::DisplayGrid));
+    ui->detailFrame->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+    ui->detailFrame->setLayout(frameGridLayout);
+}
+
+#ifdef Q_OS_WINDOWS
+void
+VMManagerDetailSection::updateStyle()
+{
+    const bool lightMode = util::isWindowsLightTheme();
+    if (lightMode) {
+        ui->outerFrame->setStyleSheet("");
+        ui->collapseButtonHolder->setStyleSheet(HEADER_STYLESHEET_LIGHT);
+    } else {
+        ui->outerFrame->setStyleSheet(BACKGROUND_STYLESHEET_DARK);
+        ui->collapseButtonHolder->setStyleSheet(HEADER_STYLESHEET_DARK);
+    }
+}
+#endif
+
+// QT for Linux and Windows doesn't have the same default margins as QT on MacOS.
+// For consistency in appearance we'll have to return the margins on a per-OS basis
+QMargins
+VMManagerDetailSection::getMargins(const MarginSection section)
+{
+    switch (section) {
+        case MarginSection::ToolButton:
+#if defined(Q_OS_WINDOWS) or defined(Q_OS_LINUX)
+            return {10, 0, 5, 0};
+#else
+            return {0, 0, 5, 0};
+#endif
+        case MarginSection::DisplayGrid:
+#if defined(Q_OS_WINDOWS) or defined(Q_OS_LINUX)
+            return {10, 0, 0, 10};
+#else
+            return {0, 0, 0, 10};
+#endif
+        default:
+            return {};
+    }
+}
+
+// CollapseButton Class
+
+CollapseButton::CollapseButton(QWidget *parent) : QToolButton(parent), content_(nullptr) {
+    setCheckable(true);
+    setStyleSheet("background:none; border:none;");
+    setIconSize(QSize(8, 8));
+    setFont(QApplication::font());
+    setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+    connect(this, &QToolButton::toggled, [=](const bool checked) {
+        setArrowType(checked ? Qt::ArrowType::DownArrow : Qt::ArrowType::RightArrow);
+        content_ != nullptr && checked ? showContent() : hideContent();
+    });
+    setChecked(true);
+}
+
+void CollapseButton::setButtonText(const QString &text) {
+    setText(" " + text);
+}
+
+void CollapseButton::setContent(QWidget *content) {
+    assert(content != nullptr);
+    content_              = content;
+    const auto animation_ = new QPropertyAnimation(content_, "maximumHeight"); // QObject with auto delete
+    animation_->setStartValue(0);
+    animation_->setEasingCurve(QEasingCurve::InOutQuad);
+    animation_->setDuration(300);
+    animation_->setEndValue(content->geometry().height() + 50);
+    // qDebug() << "section" << text() << "has a height of" << content->geometry().height();
+    animator_.clear();
+    animator_.addAnimation(animation_);
+    if (!isChecked()) {
+        content->setMaximumHeight(0);
+    }
+}
+
+void CollapseButton::hideContent() {
+    animator_.setDirection(QAbstractAnimation::Backward);
+    animator_.start();
+}
+
+void CollapseButton::showContent() {
+    animator_.setDirection(QAbstractAnimation::Forward);
+    animator_.start();
+}
+
diff --git a/src/qt/qt_vmmanager_detailsection.hpp b/src/qt/qt_vmmanager_detailsection.hpp
new file mode 100644
index 000000000..3df7ce64c
--- /dev/null
+++ b/src/qt/qt_vmmanager_detailsection.hpp
@@ -0,0 +1,106 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		86Box VM manager system details section module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+ */
+
+#ifndef QT_VMMANAGER_DETAILSECTION_H
+#define QT_VMMANAGER_DETAILSECTION_H
+
+#include <QLabel>
+#include <QToolButton>
+#include <QGridLayout>
+#include <QPropertyAnimation>
+#include <QParallelAnimationGroup>
+#include <QApplication>
+#include "qt_vmmanager_system.hpp"
+
+QT_BEGIN_NAMESPACE
+namespace Ui { class DetailSection; }
+QT_END_NAMESPACE
+
+class CollapseButton final : public QToolButton {
+    Q_OBJECT
+
+public:
+    explicit CollapseButton(QWidget *parent = nullptr);
+
+    void setButtonText(const QString &text);
+
+    void setContent(QWidget *content);
+
+    void hideContent();
+
+    void showContent();
+
+private:
+    QWidget *content_;
+    QString text_;
+    QParallelAnimationGroup animator_;
+};
+
+class VMManagerDetailSection final : public QWidget {
+    Q_OBJECT
+
+public:
+    explicit VMManagerDetailSection(const QString &sectionName);
+    explicit VMManagerDetailSection(const QVariant &varSectionName);
+    // explicit VMManagerDetailSection();
+
+    ~VMManagerDetailSection() override;
+
+    void addSection(const QString &name, const QString &value, VMManager::Display::Name displayField = VMManager::Display::Name::Unknown);
+    void setSections();
+    void clear();
+
+    QLabel *tableLabel;
+    CollapseButton *collapseButton;
+//    QGridLayout *buttonGridLayout;
+    QGridLayout *frameGridLayout;
+    QVBoxLayout *mainLayout;
+    QHBoxLayout *buttonLayout;
+    QFrame *frame;
+
+    static const QString sectionSeparator;
+
+#ifdef Q_OS_WINDOWS
+public slots:
+    void updateStyle();
+#endif
+
+private:
+    enum class MarginSection {
+        ToolButton,
+        DisplayGrid,
+    };
+
+    void setSectionName(const QString &name);
+    void setupMainLayout();
+    void clearContentsSetupGrid();
+
+    static QMargins getMargins(MarginSection section);
+
+    QString sectionName;
+
+    struct DetailSection {
+        QString name;
+        QString value;
+    };
+
+    QVector<DetailSection> sections;
+    Ui::DetailSection *ui;
+
+};
+
+#endif // QT_VMMANAGER_DETAILSECTION_H
diff --git a/src/qt/qt_vmmanager_detailsection.ui b/src/qt/qt_vmmanager_detailsection.ui
new file mode 100644
index 000000000..18e89ee65
--- /dev/null
+++ b/src/qt/qt_vmmanager_detailsection.ui
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DetailSection</class>
+ <widget class="QWidget" name="DetailSection">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>348</width>
+    <height>151</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QFrame" name="outerFrame">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QWidget" name="collapseButtonHolder" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QFrame" name="detailFrame">
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/qt/qt_vmmanager_listviewdelegate.cpp b/src/qt/qt_vmmanager_listviewdelegate.cpp
new file mode 100644
index 000000000..c5d2e1dc9
--- /dev/null
+++ b/src/qt/qt_vmmanager_listviewdelegate.cpp
@@ -0,0 +1,254 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		86Box VM manager list view delegate module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+
+#include <QApplication>
+
+#include "qt_util.hpp"
+#include "qt_vmmanager_listviewdelegate.hpp"
+#include "qt_vmmanager_model.hpp"
+
+
+// Thanks to scopchanov https://github.com/scopchanov/SO-MessageLog
+// from https://stackoverflow.com/questions/53105343/is-it-possible-to-add-a-custom-widget-into-a-qlistview
+
+
+VMManagerListViewDelegate::VMManagerListViewDelegate(QObject *parent)
+    : QStyledItemDelegate(parent),
+    m_ptr(new VMManagerListViewDelegateStyle)
+{
+    default_icon = QIcon(":/settings/qt/icons/86Box-gray.ico");
+    stop_icon = QApplication::style()->standardIcon(QStyle::SP_MediaStop);
+    running_icon = QIcon(":/menuicons/qt/icons/run.ico");
+    stopped_icon = QIcon(":/menuicons/qt/icons/acpi_shutdown.ico");
+    paused_icon = QIcon(":/menuicons/qt/icons/pause.ico");
+    unknown_icon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxQuestion);
+
+    highlight_color = QColor("#616161");
+    bg_color = QColor("#272727");
+}
+
+VMManagerListViewDelegate::~VMManagerListViewDelegate()
+= default;
+
+void VMManagerListViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
+                                      const QModelIndex &index) const {
+    bool windows_light_mode = true;
+#ifdef Q_OS_WINDOWS
+    windows_light_mode = util::isWindowsLightTheme();
+#endif
+    QStyleOptionViewItem opt(option);
+    initStyleOption(&opt, index);
+    const QPalette &palette(opt.palette);
+    // opt.rect = opt.rect.adjusted(0, 0, 0, 20);
+    const QRect &rect(opt.rect);
+    const QRect &contentRect(rect.adjusted(m_ptr->margins.left(),
+                                              m_ptr->margins.top(),
+                                              -m_ptr->margins.right(),
+                                              -m_ptr->margins.bottom()));
+
+    // The status icon represents the current state of the vm. Initially set to a default state.
+    auto process_variant = index.data(VMManagerModel::Roles::ProcessStatus);
+    auto process_status = process_variant.value<VMManagerSystem::ProcessStatus>();
+    // The main icon, configurable. Falls back to default if it cannot be loaded.
+    auto customIcon = index.data(VMManagerModel::Roles::Icon).toString();
+    opt.icon = default_icon;
+    if (!customIcon.isEmpty()) {
+        const auto customPixmap = QPixmap(customIcon);
+        if (!customPixmap.isNull())
+            opt.icon = customPixmap;
+    }
+
+    // Set the status icon based on the process status
+    QIcon status_icon;
+    switch(process_status) {
+        case VMManagerSystem::ProcessStatus::Running:
+            status_icon = running_icon;
+            break;
+        case VMManagerSystem::ProcessStatus::Stopped:
+            status_icon = stopped_icon;
+            break;
+        case VMManagerSystem::ProcessStatus::PausedWaiting:
+        case VMManagerSystem::ProcessStatus::RunningWaiting:
+        case VMManagerSystem::ProcessStatus::Paused:
+            status_icon = paused_icon;
+            break;
+        default:
+            status_icon = unknown_icon;
+    }
+
+
+    // Used to determine if the horizontal separator should be drawn
+    const bool lastIndex = (index.model()->rowCount() - 1) == index.row();
+    const bool hasIcon = !opt.icon.isNull();
+    const int bottomEdge = rect.bottom();
+    QFont f(opt.font);
+
+    f.setPointSizeF(m_ptr->statusFontPointSize(opt.font));
+
+    painter->save();
+    painter->setClipping(true);
+    painter->setClipRect(rect);
+    painter->setFont(opt.font);
+
+    // Draw the background
+    if (opt.state & QStyle::State_Selected) {
+        // When selected, only draw the highlighted part until the horizontal separator
+        int offset = 2;
+        auto highlightRect = rect.adjusted(0, 0, 0, -offset);
+        painter->fillRect(highlightRect, windows_light_mode ? palette.highlight().color() : highlight_color);
+        // Then fill the remainder with the normal color
+        auto regularRect = rect.adjusted(0, rect.height()-offset, 0, 0);
+        painter->fillRect(regularRect, windows_light_mode ? palette.light().color() : bg_color);
+    } else {
+        // Otherwise just draw the background color as usual
+        painter->fillRect(rect, windows_light_mode ? palette.light().color() : bg_color);
+    }
+
+    // Draw bottom line. Last line gets a different color
+    painter->setPen(lastIndex ? palette.dark().color()
+                              : palette.mid().color());
+    painter->drawLine(lastIndex ? rect.left() : m_ptr->margins.left(),
+                      bottomEdge, rect.right(), bottomEdge);
+
+    // Draw system icon
+    if (hasIcon) {
+        painter->drawPixmap(contentRect.left(), contentRect.top(),
+                            opt.icon.pixmap(m_ptr->iconSize));
+    }
+
+    // System name
+    QRect systemNameRect(m_ptr->systemNameBox(opt, index));
+
+    systemNameRect.moveTo(m_ptr->margins.left() + m_ptr->iconSize.width()
+                             + m_ptr->spacingHorizontal, contentRect.top());
+    // If desired, font can be changed here
+//    painter->setFont(f);
+    painter->setFont(opt.font);
+    painter->setPen(palette.text().color());
+    painter->drawText(systemNameRect, Qt::TextSingleLine, opt.text);
+
+    // Draw status icon
+    painter->drawPixmap(systemNameRect.left(), systemNameRect.bottom()
+                            + m_ptr->spacingVertical,
+                        status_icon.pixmap(m_ptr->smallIconSize));
+
+    // This rectangle is around the status icon
+    // auto point = QPoint(systemNameRect.left(), systemNameRect.bottom()
+    //                         + m_ptr->spacingVertical);
+    // auto point2 = QPoint(point.x() + m_ptr->smallIconSize.width(), point.y() + m_ptr->smallIconSize.height());
+    // auto arect = QRect(point, point2);
+    // painter->drawRect(arect);
+
+    // Draw status text
+    QRect statusRect(m_ptr->statusBox(opt, index));
+    int extraaa = 2;
+    statusRect.moveTo(systemNameRect.left() + m_ptr->margins.left() + m_ptr->smallIconSize.width(),
+                      systemNameRect.bottom() + m_ptr->spacingVertical + extraaa + (m_ptr->smallIconSize.height() - systemNameRect.height() ));
+
+//    painter->setFont(opt.font);
+    painter->setFont(f);
+    painter->setPen(palette.windowText().color());
+    painter->drawText(statusRect, Qt::TextSingleLine,
+                      index.data(VMManagerModel::Roles::ProcessStatusString).toString());
+
+    painter->restore();
+
+}
+
+QMargins VMManagerListViewDelegate::contentsMargins() const
+{
+    return m_ptr->margins;
+}
+
+void VMManagerListViewDelegate::setContentsMargins(const int left, const int top, const int right, const int bottom) const
+{
+    m_ptr->margins = QMargins(left, top, right, bottom);
+}
+
+int VMManagerListViewDelegate::horizontalSpacing() const
+{
+    return m_ptr->spacingHorizontal;
+}
+
+void VMManagerListViewDelegate::setHorizontalSpacing(const int spacing) const
+{
+    m_ptr->spacingHorizontal = spacing;
+}
+
+int VMManagerListViewDelegate::verticalSpacing() const
+{
+    return m_ptr->spacingVertical;
+}
+
+void VMManagerListViewDelegate::setVerticalSpacing(const int spacing) const
+{
+    m_ptr->spacingVertical = spacing;
+}
+
+
+QSize VMManagerListViewDelegate::sizeHint(const QStyleOptionViewItem &option,
+                   const QModelIndex &index) const
+{
+    QStyleOptionViewItem opt(option);
+    initStyleOption(&opt, index);
+
+    const int textHeight = m_ptr->systemNameBox(opt, index).height()
+        + m_ptr->spacingVertical + m_ptr->statusBox(opt, index).height();
+    const int iconHeight = m_ptr->iconSize.height();
+    const int h = textHeight > iconHeight ? textHeight : iconHeight;
+
+    // return the same width
+    // for height, add margins on top and bottom *plus* either the text or icon height, whichever is greater
+    // Note: text height is the combined value of the system name and the status just below the name
+    return {opt.rect.width(), m_ptr->margins.top() + h
+                     + m_ptr->margins.bottom()};
+}
+
+VMManagerListViewDelegateStyle::VMManagerListViewDelegateStyle() :
+    iconSize(32, 32),
+    smallIconSize(16, 16),
+    // bottom gets a little more than the top because of the custom separator
+    margins(4, 10, 8, 12),
+    // Spacing between icon and text
+    spacingHorizontal(8),
+    spacingVertical(4)
+{
+
+}
+
+QRect VMManagerListViewDelegateStyle::statusBox(const QStyleOptionViewItem &option,
+                              const QModelIndex &index) const
+{
+    QFont f(option.font);
+
+    f.setPointSizeF(statusFontPointSize(option.font));
+
+    return QFontMetrics(f).boundingRect(index.data(VMManagerModel::Roles::ProcessStatusString).toString())
+        .adjusted(0, 0, 1, 1);
+}
+
+qreal VMManagerListViewDelegateStyle::statusFontPointSize(const QFont &f) const
+{
+    return 0.75*f.pointSize();
+//    return 1*f.pointSize();
+}
+
+QRect VMManagerListViewDelegateStyle::systemNameBox(const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+    return option.fontMetrics.boundingRect(option.text).adjusted(0, 0, 1, 1);
+}
diff --git a/src/qt/qt_vmmanager_listviewdelegate.hpp b/src/qt/qt_vmmanager_listviewdelegate.hpp
new file mode 100644
index 000000000..9e320653b
--- /dev/null
+++ b/src/qt/qt_vmmanager_listviewdelegate.hpp
@@ -0,0 +1,77 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		Header for 86Box VM manager list view delegate module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+#ifndef QT_VMMANAGER_LISTVIEWDELEGATE_H
+#define QT_VMMANAGER_LISTVIEWDELEGATE_H
+
+#include <QPainter>
+#include <QStyledItemDelegate>
+#include "qt_vmmanager_system.hpp"
+
+class VMManagerListViewDelegateStyle
+{
+    VMManagerListViewDelegateStyle();
+
+    [[nodiscard]] inline QRect systemNameBox(const QStyleOptionViewItem &option,
+                              const QModelIndex &index) const;
+    [[nodiscard]] inline qreal statusFontPointSize(const QFont &f) const;
+    [[nodiscard]] inline QRect statusBox(const QStyleOptionViewItem &option, const QModelIndex &index) const;
+
+    QSize iconSize;
+    QSize smallIconSize;
+    QMargins margins;
+    int spacingHorizontal;
+    int spacingVertical;
+
+    friend class VMManagerListViewDelegate;
+};
+
+class VMManagerListViewDelegate final : public QStyledItemDelegate {
+    Q_OBJECT
+
+public:
+    explicit VMManagerListViewDelegate(QObject *parent = nullptr);
+    ~VMManagerListViewDelegate() override;
+    using QStyledItemDelegate::QStyledItemDelegate;
+
+    [[nodiscard]] QMargins contentsMargins() const;
+    void setContentsMargins(int left, int top, int right, int bottom) const;
+
+    [[nodiscard]] int horizontalSpacing() const;
+    void setHorizontalSpacing(int spacing) const;
+
+    [[nodiscard]] int verticalSpacing() const;
+    void setVerticalSpacing(int spacing) const;
+
+    void paint(QPainter *painter, const QStyleOptionViewItem &option,
+                const QModelIndex &index) const override;
+    [[nodiscard]] QSize sizeHint(const QStyleOptionViewItem &option,
+                   const QModelIndex &index) const override;
+private:
+    VMManagerListViewDelegateStyle *m_ptr;
+
+    QIcon default_icon;
+    QIcon stop_icon;
+    QIcon running_icon;
+    QIcon stopped_icon;
+    QIcon paused_icon;
+    QIcon unknown_icon;
+
+    QColor bg_color;
+    QColor highlight_color;
+};
+#endif // QT_VMMANAGER_LISTVIEWDELEGATE_H
\ No newline at end of file
diff --git a/src/qt/qt_vmmanager_main.cpp b/src/qt/qt_vmmanager_main.cpp
new file mode 100644
index 000000000..cc3904e97
--- /dev/null
+++ b/src/qt/qt_vmmanager_main.cpp
@@ -0,0 +1,895 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		86Box VM manager main module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+#include <QDirIterator>
+#include <QLabel>
+#include <QAbstractListModel>
+#include <QCompleter>
+#include <QDebug>
+#include <QDesktopServices>
+#include <QMenu>
+#include <QMessageBox>
+#include <QStringListModel>
+#include <QTimer>
+#include <QProgressDialog>
+
+#include <thread>
+#include <atomic>
+
+#include "qt_vmmanager_main.hpp"
+#include "qt_vmmanager_mainwindow.hpp"
+#include "ui_qt_vmmanager_main.h"
+#include "qt_vmmanager_model.hpp"
+#include "qt_vmmanager_addmachine.hpp"
+
+extern VMManagerMainWindow* vmm_main_window;
+
+// https://stackoverflow.com/a/36460740
+bool copyPath(QString sourceDir, QString destinationDir, bool overWriteDirectory)
+{
+    QDir originDirectory(sourceDir);
+
+    if (! originDirectory.exists())
+    {
+        return false;
+    }
+
+    QDir destinationDirectory(destinationDir);
+
+    if(destinationDirectory.exists() && !overWriteDirectory)
+    {
+        return false;
+    }
+    else if(destinationDirectory.exists() && overWriteDirectory)
+    {
+        destinationDirectory.removeRecursively();
+    }
+
+    originDirectory.mkpath(destinationDir);
+
+    foreach (QString directoryName, originDirectory.entryList(QDir::Dirs | \
+                                                              QDir::NoDotAndDotDot))
+    {
+        QString destinationPath = destinationDir + "/" + directoryName;
+        originDirectory.mkpath(destinationPath);
+        copyPath(sourceDir + "/" + directoryName, destinationPath, overWriteDirectory);
+    }
+
+    foreach (QString fileName, originDirectory.entryList(QDir::Files))
+    {
+        QFile::copy(sourceDir + "/" + fileName, destinationDir + "/" + fileName);
+    }
+
+    /*! Possible race-condition mitigation? */
+    QDir finalDestination(destinationDir);
+    finalDestination.refresh();
+
+    if(finalDestination.exists())
+    {
+        return true;
+    }
+
+    return false;
+}
+
+VMManagerMain::VMManagerMain(QWidget *parent) :
+    QWidget(parent), ui(new Ui::VMManagerMain), selected_sysconfig(new VMManagerSystem) {
+    ui->setupUi(this);
+
+    // Set up the main listView
+    ui->listView->setItemDelegate(new VMManagerListViewDelegate);
+    vm_model = new VMManagerModel;
+    proxy_model = new StringListProxyModel(this);
+    proxy_model->setSourceModel(vm_model);
+    ui->listView->setModel(proxy_model);
+    proxy_model->setSortCaseSensitivity(Qt::CaseInsensitive);
+    ui->listView->model()->sort(0, Qt::AscendingOrder);
+
+    // Connect the model signal
+    connect(vm_model, &VMManagerModel::systemDataChanged, this, &VMManagerMain::modelDataChange);
+
+    // Set up the context menu for the list view
+    ui->listView->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(ui->listView, &QListView::customContextMenuRequested, [this, parent](const QPoint &pos) {
+        const auto indexAt = ui->listView->indexAt(pos);
+        if (indexAt.isValid()) {
+            QMenu contextMenu(tr("Context Menu"), ui->listView);
+
+            QAction nameChangeAction(tr("Change &display name..."));
+            contextMenu.addAction(&nameChangeAction);
+            // Use a lambda to call a function so indexAt can be passed
+            connect(&nameChangeAction, &QAction::triggered, ui->listView, [this, indexAt] {
+                   updateDisplayName(indexAt);
+            });
+            nameChangeAction.setEnabled(!selected_sysconfig->window_obscured);
+
+
+            QAction setSystemIcon(tr("Set &icon..."));
+            contextMenu.addAction(&setSystemIcon);
+            connect(&setSystemIcon, &QAction::triggered, [this] {
+                IconSelectionDialog dialog(":/systemicons/");
+                if(dialog.exec() == QDialog::Accepted) {
+                    const QString iconName = dialog.getSelectedIconName();
+                    // A Blank iconName will cause setIcon to reset to the default
+                    selected_sysconfig->setIcon(iconName);
+                }
+            });
+            setSystemIcon.setEnabled(!selected_sysconfig->window_obscured);
+
+            contextMenu.addSeparator();
+
+            QAction cloneMachine(tr("C&lone..."));
+            contextMenu.addAction(&cloneMachine);
+            connect(&cloneMachine, &QAction::triggered, [this] {
+                QDialog dialog = QDialog(this);
+                auto layout = new QVBoxLayout(&dialog);
+                layout->setSizeConstraint(QLayout::SetFixedSize);
+                layout->addWidget(new QLabel(tr("Virtual machine \"%1\" (%2) will be cloned into:").arg(selected_sysconfig->displayName, selected_sysconfig->config_dir)));
+                QLineEdit* edit = new QLineEdit(&dialog);
+                layout->addWidget(edit);
+                QLabel* errLabel = new QLabel(&dialog);
+                layout->addWidget(errLabel);
+                errLabel->setVisible(false);
+                QDialogButtonBox* buttonBox = new QDialogButtonBox(&dialog);
+                buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+                buttonBox->button(QDialogButtonBox::Ok)->setDisabled(true);
+                connect(buttonBox, &QDialogButtonBox::accepted, &dialog, &QDialog::accept);
+                connect(buttonBox, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
+                layout->addWidget(buttonBox);
+                connect(edit, &QLineEdit::textChanged, this, [errLabel, buttonBox] (const QString& text) {
+                    bool isSpaceOnly = true;
+#ifdef Q_OS_WINDOWS
+                    const char illegalChars[] = "<>:\"|?*\\/";
+#else
+                    const char illegalChars[] = "\\/";
+#endif
+                    for (const auto& curChar : text) {
+                        for (size_t i = 0; i < sizeof(illegalChars) - 1; i++) {
+                            if (illegalChars[i] == curChar) {
+                                goto illegal_chars;
+                            }
+                            if (!curChar.isSpace()) {
+                                isSpaceOnly = false;
+                            }
+                        }
+                    }
+                    errLabel->setVisible(false);
+                    buttonBox->button(QDialogButtonBox::Ok)->setDisabled(isSpaceOnly || text.isEmpty());
+                    if (QDir((QString(vmm_path) + "/") + text).exists() && buttonBox->button(QDialogButtonBox::Ok)->isEnabled()) {
+                        goto dir_already_exists;
+                    }
+                    return;
+dir_already_exists:
+                    errLabel->setText(tr("Directory %1 already exists").arg(QDir((QString(vmm_path) + "/") + text).canonicalPath()));
+                    errLabel->setVisible(true);
+                    buttonBox->button(QDialogButtonBox::Ok)->setDisabled(true);
+                    return;
+illegal_chars:
+                    QString illegalCharsDisplay;
+                    for (size_t i = 0; i < sizeof(illegalChars) - 1; i++) {
+                        illegalCharsDisplay.push_back(illegalChars[i]);
+                        illegalCharsDisplay.push_back(' ');
+                    }
+                    illegalCharsDisplay.chop(1);
+                    errLabel->setText(tr("You cannot use the following characters in the name: %1").arg(illegalCharsDisplay));
+                    errLabel->setVisible(true);
+                    buttonBox->button(QDialogButtonBox::Ok)->setDisabled(true);
+                    return;
+                });
+
+                if (dialog.exec() > 0) {
+                    std::atomic_bool finished{false};
+                    std::atomic_bool errCode;
+                    auto vmDir = QDir(vmm_path).canonicalPath();
+                    vmDir.append("/");
+                    vmDir.append(edit->text());
+                    vmDir.append("/");
+
+                    if (!QDir(vmDir).mkpath(".")) {
+                        QMessageBox::critical(this, tr("Clone"), tr("Failed to create directory for cloned VM"), QMessageBox::Ok);
+                        return;
+                    }
+
+                    QProgressDialog* progDialog = new QProgressDialog(this);
+                    progDialog->setMaximum(0);
+                    progDialog->setMinimum(0);
+                    progDialog->setWindowFlags(progDialog->windowFlags() & ~Qt::WindowCloseButtonHint);
+                    progDialog->setMinimumSize(progDialog->sizeHint());
+                    progDialog->setMaximumSize(progDialog->sizeHint());
+                    progDialog->setMinimumDuration(0);
+                    progDialog->setCancelButton(nullptr);
+                    progDialog->setAutoClose(false);
+                    progDialog->setAutoReset(false);
+                    progDialog->setAttribute(Qt::WA_DeleteOnClose, true);
+                    progDialog->setValue(0);
+                    progDialog->setWindowTitle(tr("Clone"));
+                    progDialog->show();
+                    QString srcPath = selected_sysconfig->config_dir;
+                    QString dstPath = vmDir;
+
+                    std::thread copyThread([&finished, srcPath, dstPath, &errCode] {
+                        errCode = copyPath(srcPath, dstPath, true);
+                        finished = true;
+                    });
+                    while (!finished) {
+                        QApplication::processEvents();
+                    }
+                    copyThread.join();
+                    progDialog->close();
+                    if (!errCode) {
+                        QDir(dstPath).removeRecursively();
+                        QMessageBox::critical(this, tr("Clone"), tr("Failed to clone VM."), QMessageBox::Ok);
+                        return;
+                    }
+
+                    QFileInfo configFileInfo(vmDir + CONFIG_FILE);
+                    if (configFileInfo.exists()) {
+                        const auto current_index = ui->listView->currentIndex();
+                        vm_model->reload(this);
+                        const auto created_object = vm_model->getIndexForConfigFile(configFileInfo);
+                        if (created_object.row() < 0) {
+                            // For some reason the index of the new object couldn't be determined. Fall back to the old index.
+                            ui->listView->setCurrentIndex(current_index);
+                            return;
+                        }
+                        auto added_system = vm_model->getConfigObjectForIndex(created_object);
+                        added_system->setDisplayName(edit->text());
+                        // Get the index of the newly-created system and select it
+                        const QModelIndex mapped_index = proxy_model->mapFromSource(created_object);
+                        ui->listView->setCurrentIndex(mapped_index);
+                    } else {
+                        QDir(dstPath).removeRecursively();
+                        QMessageBox::critical(this, tr("Clone"), tr("Failed to clone VM."), QMessageBox::Ok);
+                        return;
+                    }
+                }
+            });
+
+            QAction killIcon(tr("&Kill"));
+            contextMenu.addAction(&killIcon);
+            connect(&killIcon, &QAction::triggered, [this, parent] {
+                QMessageBox msgbox(QMessageBox::Warning, tr("Warning"), tr("Killing a virtual machine can cause data loss. Only do this if the 86Box process gets stuck.\n\nDo you really wish to kill the virtual machine \"%1\"?").arg(selected_sysconfig->displayName), QMessageBox::StandardButton::Yes | QMessageBox::StandardButton::No, parent);
+                msgbox.exec();
+                if (msgbox.result() == QMessageBox::Yes) {
+                    disconnect(selected_sysconfig->process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), nullptr, nullptr);
+                    selected_sysconfig->process->kill();
+                }
+            });
+            killIcon.setEnabled(selected_sysconfig->process->state() == QProcess::Running);
+
+            QAction clrNvram(tr("&Wipe NVRAM"));
+            contextMenu.addAction(&clrNvram);
+            connect(&clrNvram, &QAction::triggered, [this, parent] {
+                QMessageBox msgbox(QMessageBox::Warning, tr("Warning"), tr("This will delete all NVRAM (and related) files of the virtual machine located in the \"nvr\" subdirectory. You'll have to reconfigure the BIOS (and possibly other devices inside the VM) settings again if applicable.\n\nAre you sure you want to wipe all NVRAM contents of the virtual machine \"%1\"?").arg(selected_sysconfig->displayName), QMessageBox::StandardButton::Yes | QMessageBox::StandardButton::No, parent);
+                msgbox.exec();
+                if (msgbox.result() == QMessageBox::Yes) {
+                    if (QDir(selected_sysconfig->config_dir + "/nvr/").removeRecursively())
+                        QMessageBox::information(this, tr("Success"), tr("Successfully wiped the NVRAM contents of the virtual machine \"%1\"").arg(selected_sysconfig->displayName));
+                    else {
+                        QMessageBox::critical(this, tr("Error"), tr("An error occurred trying to wipe the NVRAM contents of the virtual machine \"%1\"").arg(selected_sysconfig->displayName));
+                    }
+                }
+            });
+            clrNvram.setEnabled(selected_sysconfig->process->state() == QProcess::NotRunning);
+
+            QAction deleteAction(tr("&Delete"));
+            contextMenu.addAction(&deleteAction);
+            connect(&deleteAction, &QAction::triggered, [this] {
+                deleteSystem(selected_sysconfig);
+            });
+            deleteAction.setEnabled(selected_sysconfig->process->state() == QProcess::NotRunning);
+
+            contextMenu.addSeparator();
+
+            QAction openSystemFolderAction(tr("&Open folder..."));
+            contextMenu.addAction(&openSystemFolderAction);
+            connect(&openSystemFolderAction, &QAction::triggered, [indexAt] {
+                if (const auto configDir = indexAt.data(VMManagerModel::Roles::ConfigDir).toString(); !configDir.isEmpty()) {
+                    QDir dir(configDir);
+                    if (!dir.exists())
+                        dir.mkpath(".");
+                    
+                    QDesktopServices::openUrl(QUrl(QString("file:///") + dir.canonicalPath()));
+                }
+            });
+
+            QAction openPrinterFolderAction(tr("Open p&rinter tray..."));
+            contextMenu.addAction(&openPrinterFolderAction);
+            connect(&openPrinterFolderAction, &QAction::triggered, [indexAt] {
+                if (const auto printerDir = indexAt.data(VMManagerModel::Roles::ConfigDir).toString() + QString("/printer/"); !printerDir.isEmpty()) {
+                    QDir dir(printerDir);
+                    if (!dir.exists())
+                        dir.mkpath(".");
+                    
+                    QDesktopServices::openUrl(QUrl(QString("file:///") + dir.canonicalPath()));
+                }
+            });
+
+            QAction openScreenshotsFolderAction(tr("Open screenshots &folder..."));
+            contextMenu.addAction(&openScreenshotsFolderAction);
+            connect(&openScreenshotsFolderAction, &QAction::triggered, [indexAt] {
+                if (const auto screenshotsDir = indexAt.data(VMManagerModel::Roles::ConfigDir).toString() + QString("/screenshots/"); !screenshotsDir.isEmpty()) {
+                    QDir dir(screenshotsDir);
+                    if (!dir.exists())
+                        dir.mkpath(".");
+                    
+                    QDesktopServices::openUrl(QUrl(QString("file:///") + dir.canonicalPath()));
+                }
+            });
+
+            QAction showRawConfigFile(tr("Show &config file"));
+            contextMenu.addAction(&showRawConfigFile);
+            connect(&showRawConfigFile, &QAction::triggered, [this, indexAt] {
+                if (const auto configFile = indexAt.data(VMManagerModel::Roles::ConfigFile).toString(); !configFile.isEmpty()) {
+                    showTextFileContents(indexAt.data(Qt::DisplayRole).toString(), configFile);
+                }
+            });
+
+            contextMenu.exec(ui->listView->viewport()->mapToGlobal(pos));
+        } else {
+            QMenu contextMenu(tr("Context Menu"), ui->listView);
+
+            QAction newMachineAction(tr("New machine..."));
+            contextMenu.addAction(&newMachineAction);
+            connect(&newMachineAction, &QAction::triggered, this, &VMManagerMain::newMachineWizard);
+
+            contextMenu.exec(ui->listView->viewport()->mapToGlobal(pos));
+        }
+    });
+
+    connect(vm_model, &VMManagerModel::globalConfigurationChanged, this, [] () {
+        vmm_main_window->updateSettings();
+    });
+
+    // Initial default details view
+    vm_details = new VMManagerDetails(ui->detailsArea);
+    ui->detailsArea->layout()->addWidget(vm_details);
+    const QItemSelectionModel *selection_model = ui->listView->selectionModel();
+
+    connect(selection_model, &QItemSelectionModel::currentChanged, this, &VMManagerMain::currentSelectionChanged);
+    // If there are items in the model, make sure to select the first item by default.
+    // When settings are loaded, the last selected item will be selected (if available)
+    if (proxy_model->rowCount(QModelIndex()) > 0) {
+        const QModelIndex first_index = proxy_model->index(0, 0);
+        ui->listView->setCurrentIndex(first_index);
+    }
+
+    connect(ui->listView, &QListView::doubleClicked, this, &VMManagerMain::startButtonPressed);
+
+    // Load and apply settings
+    loadSettings();
+    ui->splitter->setSizes({ui->detailsArea->width(), (ui->listView->minimumWidth() * 2)});
+
+    // Set up search bar
+    connect(ui->searchBar, &QLineEdit::textChanged, this, &VMManagerMain::searchSystems);
+    // Create the completer
+    auto *completer = new QCompleter(this);
+    completer->setCaseSensitivity(Qt::CaseInsensitive);
+    completer->setFilterMode(Qt::MatchContains);
+    // Get the completer list
+    const auto allStrings = getSearchCompletionList();
+    // Set up the completer
+    auto *completerModel = new QStringListModel(allStrings, completer);
+    completer->setModel(completerModel);
+    ui->searchBar->setCompleter(completer);
+
+    // Set initial status bar after the event loop starts
+    QTimer::singleShot(0, this, [this] {
+        emit updateStatusRight(machineCountString());
+    });
+
+#if EMU_BUILD_NUM != 0
+    // Start update check after a slight delay
+    QTimer::singleShot(1000, this, [this] {
+            if(updateCheck) {
+                backgroundUpdateCheckStart();
+            }
+    });
+#endif
+}
+
+VMManagerMain::~VMManagerMain() {
+    delete ui;
+    delete vm_model;
+}
+
+void
+VMManagerMain::updateGlobalSettings()
+{
+    vmm_main_window->updateSettings();
+}
+
+void
+VMManagerMain::currentSelectionChanged(const QModelIndex &current,
+                             const QModelIndex &previous)
+{
+    if(!current.isValid()) {
+        return;
+    }
+
+    /* hack to prevent strange segfaults when adding a machine after
+       removing all machines previously */
+    if (selected_sysconfig->config_signal_connected == true) {
+        disconnect(selected_sysconfig, &VMManagerSystem::configurationChanged, this, &VMManagerMain::onConfigUpdated);
+        selected_sysconfig->config_signal_connected = false;
+    }
+    const auto mapped_index = proxy_model->mapToSource(current);
+    selected_sysconfig = vm_model->getConfigObjectForIndex(mapped_index);
+    vm_details->updateData(selected_sysconfig);
+    if (selected_sysconfig->config_signal_connected == false) {
+        connect(selected_sysconfig, &VMManagerSystem::configurationChanged, this, &VMManagerMain::onConfigUpdated);
+        selected_sysconfig->config_signal_connected = true;
+    }
+
+    // Emit that the selection changed, include with the process state
+    emit selectionChanged(current, selected_sysconfig->process->state());
+
+}
+
+void
+VMManagerMain::settingsButtonPressed() {
+    if(!currentSelectionIsValid()) {
+        return;
+    }
+    selected_sysconfig->launchSettings();
+}
+
+void
+VMManagerMain::startButtonPressed() const
+{
+    if(!currentSelectionIsValid()) {
+        return;
+    }
+    selected_sysconfig->startButtonPressed();
+}
+
+void
+VMManagerMain::restartButtonPressed() const
+{
+    if(!currentSelectionIsValid()) {
+        return;
+    }
+    selected_sysconfig->restartButtonPressed();
+
+}
+
+void
+VMManagerMain::pauseButtonPressed() const
+{
+    if(!currentSelectionIsValid()) {
+        return;
+    }
+    selected_sysconfig->pauseButtonPressed();
+}
+
+void
+VMManagerMain::shutdownRequestButtonPressed() const
+{
+    if (!currentSelectionIsValid()) {
+        return;
+    }
+    selected_sysconfig->shutdownRequestButtonPressed();
+}
+
+void
+VMManagerMain::shutdownForceButtonPressed() const
+{
+    if (!currentSelectionIsValid()) {
+        return;
+    }
+    selected_sysconfig->shutdownForceButtonPressed();
+}
+
+// This function doesn't appear to be needed any longer
+void
+VMManagerMain::refresh()
+{
+    const auto current_index = ui->listView->currentIndex();
+    emit selectionChanged(current_index, selected_sysconfig->process->state());
+
+    // if(!selected_sysconfig->config_file.path().isEmpty()) {
+    if(!selected_sysconfig->isValid()) {
+        // what was happening here?
+    }
+}
+
+void
+VMManagerMain::updateDisplayName(const QModelIndex &index)
+{
+    QDialog dialog;
+    dialog.setMinimumWidth(400);
+    dialog.setWindowTitle(tr("Set display name"));
+    const auto layout = new QVBoxLayout(&dialog);
+    const auto label  = new QLabel(tr("Enter the new display name (blank to reset)"));
+    label->setAlignment(Qt::AlignHCenter);
+    label->setContentsMargins(QMargins(0, 0, 0, 5));
+    layout->addWidget(label);
+    const auto lineEdit = new QLineEdit(index.data().toString(), &dialog);
+    layout->addWidget(lineEdit);
+    lineEdit->selectAll();
+
+    const auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, &dialog);
+    layout->addWidget(buttonBox);
+
+    connect(buttonBox, &QDialogButtonBox::accepted, &dialog, &QDialog::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
+
+    if (const bool accepted = dialog.exec() == QDialog::Accepted; accepted) {
+        const auto mapped_index = proxy_model->mapToSource(index);
+        vm_model->updateDisplayName(mapped_index, lineEdit->text());
+        selected_sysconfig = vm_model->getConfigObjectForIndex(mapped_index);
+        vm_details->updateData(selected_sysconfig);
+        ui->listView->scrollTo(ui->listView->currentIndex(), QAbstractItemView::PositionAtCenter);
+    }
+}
+
+void
+VMManagerMain::loadSettings()
+{
+    const auto config        = new VMManagerConfig(VMManagerConfig::ConfigType::General);
+    const auto lastSelection = config->getStringValue("last_selection");
+#if EMU_BUILD_NUM != 0
+    updateCheck = config->getStringValue("update_check").toInt();
+#endif
+    regexSearch = config->getStringValue("regex_search").toInt();
+
+    const auto matches = ui->listView->model()->match(vm_model->index(0, 0), VMManagerModel::Roles::ConfigName, QVariant::fromValue(lastSelection));
+    if (!matches.empty()) {
+        ui->listView->setCurrentIndex(matches.first());
+        ui->listView->scrollTo(ui->listView->currentIndex(), QAbstractItemView::PositionAtCenter);
+    }
+}
+bool
+VMManagerMain::currentSelectionIsValid() const
+{
+    return ui->listView->currentIndex().isValid() && selected_sysconfig->isValid();
+}
+
+void
+VMManagerMain::onConfigUpdated(const QString &uuid)
+{
+    if (selected_sysconfig->uuid == uuid)
+        vm_details->updateData(selected_sysconfig);
+}
+// Used from MainWindow during app exit to obtain and persist the current selection
+QString
+VMManagerMain::getCurrentSelection() const
+{
+    return ui->listView->currentIndex().data(VMManagerModel::Roles::ConfigName).toString();
+}
+
+void
+VMManagerMain::searchSystems(const QString &text) const
+{
+    // Escape the search text string unless regular expression searching is enabled.
+    // When escaped, the search string functions as a plain text match.
+    const auto searchText = regexSearch ? text : QRegularExpression::escape(text);
+    const QRegularExpression regex(searchText, QRegularExpression::CaseInsensitiveOption);
+    if (!regex.isValid()) {
+        qDebug() << "Skipping, invalid regex";
+        return;
+    }
+    proxy_model->setFilterRegularExpression(regex);
+    // Searching (filtering) can cause the list view to change. If there is still a valid selection,
+    // make sure to scroll to it
+    if (ui->listView->currentIndex().isValid()) {
+        ui->listView->scrollTo(ui->listView->currentIndex(), QAbstractItemView::PositionAtCenter);
+    }
+}
+
+void
+VMManagerMain::newMachineWizard()
+{
+    const auto wizard = new VMManagerAddMachine(this);
+    if (wizard->exec() == QDialog::Accepted) {
+        const auto newName        = wizard->field("systemName").toString();
+#ifdef CUSTOM_SYSTEM_LOCATION
+        const auto systemDir      = wizard->field("systemLocation").toString();
+#else
+        const auto systemDir      = QDir(vmm_path).path();
+#endif
+        const auto existingConfiguration = wizard->field("existingConfiguration").toString();
+        const auto displayName           = wizard->field("displayName").toString();
+        addNewSystem(newName, systemDir, displayName, existingConfiguration);
+    }
+}
+
+void
+VMManagerMain::addNewSystem(const QString &name, const QString &dir, const QString &displayName, const QString &configFile)
+{
+    const auto newSystemDirectory = QDir(QDir::cleanPath(dir + "/" + name));
+
+    // qt replaces `/` with native separators
+    const auto newSystemConfigFile = QFileInfo(newSystemDirectory.path() + "/" + CONFIG_FILE);
+    if (newSystemConfigFile.exists() || newSystemDirectory.exists()) {
+        QMessageBox::critical(this, tr("Directory in use"), tr("The selected directory is already in use. Please select a different directory."));
+        return;
+    }
+    // Create the directory
+    const QDir qmkdir;
+    if (const bool mkdirResult = qmkdir.mkdir(newSystemDirectory.path()); !mkdirResult) {
+        QMessageBox::critical(this, tr("Create directory failed"), tr("Unable to create the directory for the new system"));
+        return;
+    }
+    // If specified, write the contents of the configuration file before starting
+    if (!configFile.isEmpty()) {
+        const auto configPath = newSystemConfigFile.absoluteFilePath();
+        const auto file       = new QFile(configPath);
+        if (!file->open(QIODevice::WriteOnly)) {
+            qWarning() << "Unable to open file " << configPath;
+            QMessageBox::critical(this, tr("Configuration write failed"), tr("Unable to open the configuration file at %1 for writing").arg(configPath));
+            return;
+        }
+        file->write(configFile.toUtf8());
+        file->flush();
+        file->close();
+    }
+
+    const auto new_system = new VMManagerSystem(newSystemConfigFile.absoluteFilePath());
+    new_system->launchSettings();
+    // Handle this in a closure so we can capture the temporary new_system object
+    disconnect(new_system->process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), nullptr, nullptr);
+    connect(new_system->process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
+            [=](const int exitCode, const QProcess::ExitStatus exitStatus) {
+                bool fail = false;
+                if (exitCode != 0 || exitStatus != QProcess::NormalExit) {
+                    qInfo().nospace().noquote() << "Abnormal program termination while creating new system: exit code " << exitCode << ", exit status " << exitStatus;
+                    qInfo() << "Not adding system due to errors";
+                    QString errMsg = tr("The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2.").arg(
+                                        (!displayName.isEmpty() ? displayName : name), QString::number(exitCode));
+                    QMessageBox::critical(this, tr("Error adding system"),
+                                          QString("%1\n\n%2").arg(errMsg, tr("The system will not be added.")));
+                    fail = true;
+                }
+                // Create a new QFileInfo because the info from the old one may be cached
+                if (const auto fi = QFileInfo(new_system->config_file.absoluteFilePath()); !fi.exists()) {
+                    // No config file which means the cancel button was pressed in the settings dialog
+                    // Attempt to clean up the directory that was created
+                    const QDir qrmdir;
+                    if (const bool result = qrmdir.rmdir(newSystemDirectory.path()); !result) {
+                        qWarning() << "Error cleaning up the old directory for canceled operation. Continuing anyway.";
+                    }
+                    fail = true;
+                }
+                if (fail) {
+                    delete new_system;
+                    return;
+                }
+                const auto current_index = ui->listView->currentIndex();
+                vm_model->reload(this);
+                const auto created_object = vm_model->getIndexForConfigFile(new_system->config_file);
+                if (created_object.row() < 0) {
+                    // For some reason the index of the new object couldn't be determined. Fall back to the old index.
+                    ui->listView->setCurrentIndex(current_index);
+                    delete new_system;
+                    return;
+                }
+                auto added_system = vm_model->getConfigObjectForIndex(created_object);
+                added_system->setDisplayName(displayName);
+                // Get the index of the newly-created system and select it
+                const QModelIndex mapped_index = proxy_model->mapFromSource(created_object);
+                ui->listView->setCurrentIndex(mapped_index);
+                delete new_system;
+            });
+}
+
+
+void
+VMManagerMain::deleteSystem(VMManagerSystem *sysconfig)
+{
+    QMessageBox msgbox(QMessageBox::Icon::Warning, tr("Warning"), tr("Do you really want to delete the virtual machine \"%1\" and all its files? This action cannot be undone!").arg(sysconfig->displayName), QMessageBox::StandardButton::Yes | QMessageBox::StandardButton::No, qobject_cast<QWidget *>(this->parent()));
+    msgbox.exec();
+    if (msgbox.result() == QMessageBox::Yes) {
+        auto qrmdir = new QDir(sysconfig->config_dir);
+        if (const bool rmdirResult = qrmdir->removeRecursively(); !rmdirResult) {
+            QMessageBox::critical(this, tr("Remove directory failed"), tr("Some files in the machine's directory were unable to be deleted. Please delete them manually."));
+            return;
+        }
+        auto config = new VMManagerConfig(VMManagerConfig::ConfigType::General);
+        config->remove(sysconfig->uuid);
+        vm_model->removeConfigFromModel(sysconfig);
+        delete sysconfig;
+
+        if (vm_model->rowCount(QModelIndex()) <= 0) {
+            /* no machines left - get rid of the last machine's leftovers */
+            ui->detailsArea->layout()->removeWidget(vm_details);
+            delete vm_details;
+            vm_details = new VMManagerDetails();
+            ui->detailsArea->layout()->addWidget(vm_details);
+        }
+    }
+}
+
+QStringList
+VMManagerMain::getSearchCompletionList() const
+{
+    QSet<QString> uniqueStrings;
+    for (int row = 0; row < vm_model->rowCount(QModelIndex()); ++row) {
+        QModelIndex index    = vm_model->index(row, 0);
+        auto        fullList = vm_model->data(index, VMManagerModel::Roles::SearchList).toStringList();
+        QSet        uniqueSet(fullList.begin(), fullList.end());
+        uniqueStrings.unite(uniqueSet);
+    }
+    // Convert the set back to a QStringList
+    QStringList allStrings = uniqueStrings.values();
+    return allStrings;
+}
+
+QString
+VMManagerMain::machineCountString(QString states) const
+{
+    const auto count = vm_model->rowCount(QModelIndex());
+    if (!states.isEmpty())
+        states.append(", ");
+    states.append(tr("%1 total").arg(count));
+
+    return tr("VMs: %1").arg(states);
+}
+
+void
+VMManagerMain::modelDataChange()
+{
+    // Model data has changed. This includes process status.
+    // Update the counts / totals accordingly
+    auto        modelStats = vm_model->getProcessStats();
+    QStringList stats;
+    for (auto it = modelStats.constBegin(); it != modelStats.constEnd(); ++it) {
+        const auto &key = it.key();
+        QString text = "";
+        switch (key) {
+            case VMManagerSystem::ProcessStatus::Running:
+                text = tr("%n running", "", modelStats[key]);
+                break;
+            case VMManagerSystem::ProcessStatus::Paused:
+                text = tr("%n paused", "", modelStats[key]);
+                break;
+            case VMManagerSystem::ProcessStatus::PausedWaiting:
+            case VMManagerSystem::ProcessStatus::RunningWaiting:
+                text = tr("%n waiting", "", modelStats[key]);
+                break;
+            default:
+                break;
+        }
+        if(!text.isEmpty())
+            stats.append(text);
+    }
+    auto states = stats.join(", ");
+    emit updateStatusRight(machineCountString(states));
+}
+
+void
+VMManagerMain::onPreferencesUpdated()
+{
+    // Only reload values that we care about
+    const auto config        = new VMManagerConfig(VMManagerConfig::ConfigType::General);
+    const auto oldRegexSearch = regexSearch;
+    regexSearch = config->getStringValue("regex_search").toInt();
+    if (oldRegexSearch != regexSearch) {
+        ui->searchBar->clear();
+    }
+
+    if (vm_model) {
+        vm_model->sendGlobalConfigurationChanged();
+    }
+}
+
+void
+VMManagerMain::onLanguageUpdated()
+{
+    vm_model->refreshConfigs();
+    modelDataChange();
+    /* Hack to work around details widgets not being re-translatable
+       without going through layers of abstraction */
+    ui->detailsArea->layout()->removeWidget(vm_details);
+    delete vm_details;
+    vm_details = new VMManagerDetails();
+    ui->detailsArea->layout()->addWidget(vm_details);
+    if (vm_model->rowCount(QModelIndex()) > 0)
+        vm_details->updateData(selected_sysconfig);
+}
+
+#ifdef Q_OS_WINDOWS
+void
+VMManagerMain::onDarkModeUpdated()
+{
+    vm_details->updateStyle();
+}
+#endif
+
+int
+VMManagerMain::getActiveMachineCount()
+{
+    return vm_model->getActiveMachineCount();
+}
+
+#if EMU_BUILD_NUM != 0
+void
+VMManagerMain::backgroundUpdateCheckStart() const
+{
+    auto updateChannel = UpdateCheck::UpdateChannel::CI;
+#ifdef RELEASE_BUILD
+    updateChannel = UpdateCheck::UpdateChannel::Stable;
+#endif
+    const auto updateCheck = new UpdateCheck(updateChannel);
+    connect(updateCheck, &UpdateCheck::updateCheckComplete, this, &VMManagerMain::backgroundUpdateCheckComplete);
+    connect(updateCheck, &UpdateCheck::updateCheckError, this, &VMManagerMain::backgroundUpdateCheckError);
+    updateCheck->checkForUpdates();
+}
+
+void
+VMManagerMain::backgroundUpdateCheckComplete(const UpdateCheck::UpdateResult &result)
+{
+    qDebug() << "Check complete: update available?" << result.updateAvailable;
+    if (result.updateAvailable) {
+        auto type = result.channel == UpdateCheck::UpdateChannel::CI ? tr("build") : tr("version");
+        const auto updateMessage = tr("An update to 86Box is available: %1 %2").arg(type, result.latestVersion);
+        emit updateStatusLeft(updateMessage);
+    }
+}
+
+void
+VMManagerMain::backgroundUpdateCheckError(const QString &errorMsg)
+{
+    qDebug() << "Update check failed with the following error:" << errorMsg;
+    emit updateStatusLeft(tr("An error has occurred while checking for updates: %1").arg(errorMsg));
+}
+#endif
+
+void
+VMManagerMain::showTextFileContents(const QString &title, const QString &path)
+{
+    // Make sure we can open the file
+    const auto fi = QFileInfo(path);
+    if(!fi.exists()) {
+        qWarning("Requested file does not exist: %s", path.toUtf8().constData());
+        return;
+    }
+    // Read the file
+    QFile displayFile(path);
+    if (!displayFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        qWarning("Couldn't open the file: error %d", displayFile.error());
+        return;
+    }
+    const QString configFileContents = displayFile.readAll();
+    displayFile.close();
+
+    const auto textDisplayDialog = new QDialog(this);
+    textDisplayDialog->setMinimumSize(QSize(540, 360));
+    textDisplayDialog->setWindowTitle(QString("%1 - %2").arg(title, fi.fileName()));
+
+    const auto textEdit = new QPlainTextEdit();
+    const auto monospaceFont = new QFont();
+#ifdef Q_OS_WINDOWS
+    monospaceFont->setFamily("Consolas");
+#elif defined(Q_OS_MACOS)
+    monospaceFont->setFamily("Menlo");
+#else
+    monospaceFont->setFamily("Monospace");
+#endif
+    monospaceFont->setStyleHint(QFont::Monospace);
+    monospaceFont->setFixedPitch(true);
+    textEdit->setFont(*monospaceFont);
+    textEdit->setReadOnly(true);
+    textEdit->setPlainText(configFileContents);
+    const auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok);
+    connect(buttonBox, &QDialogButtonBox::accepted, textDisplayDialog, &QDialog::accept);
+    const auto layout = new QVBoxLayout();
+    textDisplayDialog->setLayout(layout);
+    textDisplayDialog->layout()->addWidget(textEdit);
+    textDisplayDialog->layout()->addWidget(buttonBox);
+    textDisplayDialog->exec();
+}
diff --git a/src/qt/qt_vmmanager_main.hpp b/src/qt/qt_vmmanager_main.hpp
new file mode 100644
index 000000000..070f30398
--- /dev/null
+++ b/src/qt/qt_vmmanager_main.hpp
@@ -0,0 +1,187 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		Header for 86Box VM manager main module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+#ifndef QT_VMMANAGER_MAIN_H
+#define QT_VMMANAGER_MAIN_H
+
+#include <QWidget>
+#include "qt_vmmanager_model.hpp"
+#include "qt_vmmanager_details.hpp"
+#include "qt_vmmanager_listviewdelegate.hpp"
+
+#include <QPushButton>
+
+extern "C" {
+#include <86box/86box.h> // for vmm_path
+#include <86box/version.h>
+}
+
+#if EMU_BUILD_NUM != 0
+#    include "qt_updatecheck.hpp"
+#endif
+
+QT_BEGIN_NAMESPACE
+namespace Ui { class VMManagerMain; }
+QT_END_NAMESPACE
+
+class VMManagerMain final : public QWidget {
+    Q_OBJECT
+
+public:
+    explicit VMManagerMain(QWidget *parent = nullptr);
+    ~VMManagerMain() override;
+    // Used to save the current selection
+    [[nodiscard]] QString getCurrentSelection() const;
+
+    enum class ToolbarButton {
+        Start,
+        Pause,
+        StartPause,
+        Shutdown,
+        Reset,
+        CtrlAltDel,
+        Settings,
+    };
+signals:
+    void selectionChanged(const QModelIndex &currentSelection, QProcess::ProcessState processState);
+    void updateStatusLeft(const QString &text);
+    void updateStatusRight(const QString &text);
+
+public slots:
+    void startButtonPressed() const;
+    void settingsButtonPressed();
+    void restartButtonPressed() const;
+    void pauseButtonPressed() const;
+    void shutdownRequestButtonPressed() const;
+    void shutdownForceButtonPressed() const;
+    void searchSystems(const QString &text) const;
+    void newMachineWizard();
+    void updateGlobalSettings();
+    void deleteSystem(VMManagerSystem *sysconfig);
+    void addNewSystem(const QString &name, const QString &dir, const QString &displayName = QString(), const QString &configFile = {});
+#if __GNUC__ >= 11
+    [[nodiscard]] QStringList getSearchCompletionList() const;
+#else
+    QStringList getSearchCompletionList() const;
+#endif
+    void modelDataChange();
+    void onPreferencesUpdated();
+    void onLanguageUpdated();
+#ifdef Q_OS_WINDOWS
+    void onDarkModeUpdated();
+#endif
+    void onConfigUpdated(const QString &uuid);
+    int  getActiveMachineCount();
+
+private:
+    Ui::VMManagerMain *ui;
+
+    VMManagerModel        *vm_model;
+    VMManagerDetails      *vm_details;
+    VMManagerSystem       *selected_sysconfig;
+    // VMManagerConfig       *config;
+    QSortFilterProxyModel *proxy_model;
+#if EMU_BUILD_NUM != 0
+    bool                   updateCheck = false;
+#endif
+    bool                   regexSearch = false;
+
+    // void updateSelection(const QItemSelection &selected,
+    //                      const QItemSelection &deselected);
+    void currentSelectionChanged(const QModelIndex &current,
+                       const QModelIndex &previous);
+    void refresh();
+    void updateDisplayName(const QModelIndex &index);
+    void loadSettings();
+    [[nodiscard]] bool currentSelectionIsValid() const;
+    [[nodiscard]] QString machineCountString(QString states = "") const;
+#if EMU_BUILD_NUM != 0
+    void backgroundUpdateCheckStart() const;
+#endif
+    void showTextFileContents(const QString &title, const QString &path);
+private slots:
+#if EMU_BUILD_NUM != 0
+    void backgroundUpdateCheckComplete(const UpdateCheck::UpdateResult &result);
+    void backgroundUpdateCheckError(const QString &errorMsg);
+#endif
+};
+
+#include <QDialog>
+#include <QListWidget>
+#include <QDialogButtonBox>
+#include <QDir>
+
+class IconSelectionDialog final : public QDialog {
+    Q_OBJECT
+
+public:
+    explicit IconSelectionDialog(QString assetPath, QWidget *parent = nullptr) : QDialog(parent), listWidget(new QListWidget) {
+        // Set the list widget to icon mode
+        listWidget->setViewMode(QListWidget::IconMode);
+        setFixedSize(QSize(540, 360));
+        listWidget->setGridSize(QSize(96, 96));
+        listWidget->setIconSize(QSize(64, 64));
+        // Read in all the assets from the given path
+        const QDir iconsDir(assetPath);
+        if (!assetPath.endsWith("/")) {
+            assetPath.append("/");
+        }
+        setWindowTitle(tr("Select an icon"));
+
+        // Loop on all files and add them as items (icons) in QListWidget
+        for(const QString& iconName : iconsDir.entryList()) {
+            const auto item = new QListWidgetItem(QIcon(assetPath + iconName), iconName);
+            // Set the UserRole to the resource bundle path
+            item->setData(Qt::UserRole, assetPath + iconName);
+            listWidget->addItem(item);
+        }
+
+        // Dialog buttons
+        const auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Reset);
+        // Use the reset button for resetting the icon to the default
+        const QPushButton* resetButton = buttonBox->button(QDialogButtonBox::Reset);
+
+        // Connect the buttons signals
+        connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+        connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+        connect(listWidget, &QListWidget::doubleClicked, this, &QDialog::accept);
+        connect(resetButton, &QPushButton::clicked, [this] {
+            // For reset, set the index to invalid so the caller will receive a blank string
+            listWidget->setCurrentIndex(QModelIndex());
+            // Then accept
+            QDialog::accept();
+        });
+
+        const auto layout = new QVBoxLayout(this);
+        layout->addWidget(listWidget);
+        layout->addWidget(buttonBox);
+    }
+
+    public slots:
+    [[nodiscard]] QString getSelectedIconName() const {
+        if (listWidget->currentIndex().isValid()) {
+            return listWidget->currentItem()->data(Qt::UserRole).toString();
+        }
+        // Index is invalid because the reset button was pressed
+        return {};
+    }
+
+private:
+    QListWidget* listWidget;
+};
+
+#endif //QT_VMMANAGER_MAIN_H
diff --git a/src/qt/qt_vmmanager_main.ui b/src/qt/qt_vmmanager_main.ui
new file mode 100644
index 000000000..566cea862
--- /dev/null
+++ b/src/qt/qt_vmmanager_main.ui
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>VMManagerMain</class>
+ <widget class="QWidget" name="VMManagerMain">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>820</width>
+    <height>472</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QSplitter" name="splitter">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="childrenCollapsible">
+      <bool>false</bool>
+     </property>
+     <widget class="QWidget" name="widget" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QListView" name="listView">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>125</width>
+           <height>0</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="searchBar">
+         <property name="focusPolicy">
+          <enum>Qt::ClickFocus</enum>
+         </property>
+         <property name="placeholderText">
+          <string>Search</string>
+         </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="detailsArea" native="true">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/qt/qt_vmmanager_mainwindow.cpp b/src/qt/qt_vmmanager_mainwindow.cpp
new file mode 100644
index 000000000..f698f1ccd
--- /dev/null
+++ b/src/qt/qt_vmmanager_mainwindow.cpp
@@ -0,0 +1,324 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		86Box VM manager main window
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+#include "qt_vmmanager_mainwindow.hpp"
+#include "qt_vmmanager_main.hpp"
+#include "qt_vmmanager_preferences.hpp"
+#include "qt_vmmanager_windarkmodefilter.hpp"
+#include "ui_qt_vmmanager_mainwindow.h"
+#if EMU_BUILD_NUM != 0
+#    include "qt_updatecheckdialog.hpp"
+#endif
+#include "qt_about.hpp"
+#include "qt_progsettings.hpp"
+#include "qt_util.hpp"
+
+#include <QLineEdit>
+#include <QStringListModel>
+#include <QCompleter>
+#include <QCloseEvent>
+#include <QDesktopServices>
+
+extern "C"
+{
+extern void config_load_global();
+extern void config_save_global();
+}
+
+VMManagerMainWindow* vmm_main_window = nullptr;
+extern WindowsDarkModeFilter* vmm_dark_mode_filter;
+
+VMManagerMainWindow::
+VMManagerMainWindow(QWidget *parent)
+    : ui(new Ui::VMManagerMainWindow)
+    , vmm(new VMManagerMain(this))
+    , statusLeft(new QLabel)
+    , statusRight(new QLabel)
+{
+    ui->setupUi(this);
+
+    vmm_main_window = this;
+
+    // Connect signals from the VMManagerMain widget
+    connect(vmm, &VMManagerMain::selectionChanged, this, &VMManagerMainWindow::vmmSelectionChanged);
+
+    setWindowTitle(tr("%1 VM Manager").arg(EMU_NAME));
+    setCentralWidget(vmm);
+
+    // Set up the buttons
+    connect(ui->actionNew_Machine, &QAction::triggered, vmm, &VMManagerMain::newMachineWizard);
+    connect(ui->actionStartPause, &QAction::triggered, vmm, &VMManagerMain::startButtonPressed);
+    connect(ui->actionSettings, &QAction::triggered, vmm, &VMManagerMain::settingsButtonPressed);
+    connect(ui->actionHard_Reset, &QAction::triggered, vmm, &VMManagerMain::restartButtonPressed);
+    connect(ui->actionForce_Shutdown, &QAction::triggered, vmm, &VMManagerMain::shutdownForceButtonPressed);
+
+    // Set up menu actions
+    // (Disable this if the EMU_BUILD_NUM == 0)
+    #if EMU_BUILD_NUM == 0
+        ui->actionCheck_for_updates->setVisible(false);
+    #else
+        connect(ui->actionCheck_for_updates, &QAction::triggered, this, &VMManagerMainWindow::checkForUpdatesTriggered);
+    #endif
+    
+    // TODO: Remove all of this (all the way to END REMOVE) once certain the search will no longer be in the toolbar.
+    // BEGIN REMOVE
+    // Everything is still setup here for it but it is all hidden. None of it will be
+    // needed if the search stays in VMManagerMain
+    ui->actionStartPause->setEnabled(true);
+    ui->actionStartPause->setIcon(QIcon(":/menuicons/qt/icons/run.ico"));
+    ui->actionStartPause->setText(tr("Start"));
+    ui->actionStartPause->setToolTip(tr("Start"));
+    ui->actionHard_Reset->setEnabled(false);
+    ui->actionForce_Shutdown->setEnabled(false);
+    ui->actionCtrl_Alt_Del->setEnabled(false);
+
+    const auto searchBar = new QLineEdit();
+    searchBar->setMinimumWidth(150);
+    searchBar->setPlaceholderText(tr("Search"));
+    searchBar->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
+    searchBar->setClearButtonEnabled(true);
+    // Spacer to make the search go all the way to the right
+    const auto spacer = new QWidget();
+    spacer->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred);
+    ui->toolBar->addWidget(spacer);
+    ui->toolBar->addWidget(searchBar);
+    // Connect signal for search
+    connect(searchBar, &QLineEdit::textChanged, vmm, &VMManagerMain::searchSystems);
+    // Preferences
+    connect(ui->actionPreferences, &QAction::triggered, this, &VMManagerMainWindow::preferencesTriggered);
+
+    // Create a completer for the search bar
+    auto *completer = new QCompleter(this);
+    completer->setCaseSensitivity(Qt::CaseInsensitive);
+    completer->setFilterMode(Qt::MatchContains);
+    // Get the completer list
+    const auto allStrings = vmm->getSearchCompletionList();
+    // Set up the completer
+    auto *completerModel = new QStringListModel(allStrings, completer);
+    completer->setModel(completerModel);
+    searchBar->setCompleter(completer);
+#ifdef Q_OS_WINDOWS
+    ui->toolBar->setBackgroundRole(QPalette::Light);
+#endif
+    ui->toolBar->setVisible(false);
+    // END REMOVE
+
+    // Status bar widgets
+    statusLeft->setAlignment(Qt::AlignLeft);
+    statusRight->setAlignment(Qt::AlignRight);
+    ui->statusbar->addPermanentWidget(statusLeft, 1);
+    ui->statusbar->addPermanentWidget(statusRight, 1);
+    connect(vmm, &VMManagerMain::updateStatusLeft, this, &VMManagerMainWindow::setStatusLeft);
+    connect(vmm, &VMManagerMain::updateStatusRight, this, &VMManagerMainWindow::setStatusRight);
+
+    // Inform the main view when preferences are updated
+    connect(this, &VMManagerMainWindow::preferencesUpdated, vmm, &VMManagerMain::onPreferencesUpdated);
+    connect(this, &VMManagerMainWindow::languageUpdated, vmm, &VMManagerMain::onLanguageUpdated);
+#ifdef Q_OS_WINDOWS
+    connect(this, &VMManagerMainWindow::darkModeUpdated, vmm, &VMManagerMain::onDarkModeUpdated);
+    connect(this, &VMManagerMainWindow::preferencesUpdated, [] () { vmm_dark_mode_filter->reselectDarkMode(); });
+#endif
+
+    {
+        auto config = new VMManagerConfig(VMManagerConfig::ConfigType::General);
+        this->ui->actionRemember_size_and_position->setChecked(!!config->getStringValue("window_remember").toInt());
+        if (ui->actionRemember_size_and_position->isChecked()) {
+            QStringList list = config->getStringValue("window_coordinates").split(',');
+            for (auto& cur : list) {
+                cur = cur.trimmed();
+            }
+            QRect geom;
+            geom.setX(list[0].toInt());
+            geom.setY(list[1].toInt());
+            geom.setWidth(list[2].toInt());
+            geom.setHeight(list[3].toInt());
+
+            setGeometry(geom);
+            if (!!config->getStringValue("window_maximized").toInt()) {
+                setWindowState(windowState() | Qt::WindowMaximized);
+            }
+        } else {
+            config->setStringValue("window_remember", "");
+            config->setStringValue("window_coordinates", "");
+            config->setStringValue("window_maximized", "");
+        }
+        delete config;
+    }
+
+}
+
+VMManagerMainWindow::~
+VMManagerMainWindow()
+    = default;
+
+void
+VMManagerMainWindow::vmmSelectionChanged(const QModelIndex &currentSelection, const QProcess::ProcessState processState) const
+{
+    if (processState == QProcess::Running) {
+        ui->actionStartPause->setEnabled(true);
+        ui->actionStartPause->setIcon(QIcon(":/menuicons/qt/icons/pause.ico"));
+        ui->actionStartPause->setText(tr("Pause"));
+        ui->actionStartPause->setToolTip(tr("Pause"));
+        disconnect(ui->actionStartPause, &QAction::triggered, vmm, &VMManagerMain::startButtonPressed);
+        connect(ui->actionStartPause, &QAction::triggered, vmm, &VMManagerMain::pauseButtonPressed);
+        ui->actionHard_Reset->setEnabled(true);
+        ui->actionForce_Shutdown->setEnabled(true);
+        ui->actionCtrl_Alt_Del->setEnabled(true);
+    } else {
+        ui->actionStartPause->setEnabled(true);
+        ui->actionStartPause->setIcon(QIcon(":/menuicons/qt/icons/run.ico"));
+        ui->actionStartPause->setText(tr("Start"));
+        ui->actionStartPause->setToolTip(tr("Start"));
+        disconnect(ui->actionStartPause, &QAction::triggered, vmm, &VMManagerMain::pauseButtonPressed);
+        connect(ui->actionStartPause, &QAction::triggered, vmm, &VMManagerMain::startButtonPressed);
+        ui->actionHard_Reset->setEnabled(false);
+        ui->actionForce_Shutdown->setEnabled(false);
+        ui->actionCtrl_Alt_Del->setEnabled(false);
+    }
+}
+void
+VMManagerMainWindow::preferencesTriggered()
+{
+    const auto prefs = new VMManagerPreferences();
+    if (prefs->exec() == QDialog::Accepted) {
+        emit preferencesUpdated();
+        updateLanguage();
+    }
+}
+
+void
+VMManagerMainWindow::updateSettings()
+{
+    config_load_global();
+    emit preferencesUpdated();
+    updateLanguage();
+}
+
+void
+VMManagerMainWindow::saveSettings() const
+{
+    const auto currentSelection = vmm->getCurrentSelection();
+    const auto config = new VMManagerConfig(VMManagerConfig::ConfigType::General);
+    config->setStringValue("last_selection", currentSelection);
+    config->setStringValue("window_remember", QString::number(ui->actionRemember_size_and_position->isChecked()));
+    if (ui->actionRemember_size_and_position->isChecked()) {
+        config->setStringValue("window_coordinates", QString::asprintf("%i, %i, %i, %i", this->geometry().x(), this->geometry().y(), this->geometry().width(), this->geometry().height()));
+        config->setStringValue("window_maximized", this->isMaximized() ? "1" : "");
+    } else {
+        config->setStringValue("window_remember", "");
+        config->setStringValue("window_coordinates", "");
+        config->setStringValue("window_maximized", "");
+    }
+    // Sometimes required to ensure the settings save before the app exits
+    config->sync();
+}
+
+void
+VMManagerMainWindow::updateLanguage()
+{
+    ProgSettings::loadTranslators(QCoreApplication::instance());
+    ProgSettings::reloadStrings();
+    ui->retranslateUi(this);
+    setWindowTitle(tr("%1 VM Manager").arg(EMU_NAME));
+    emit languageUpdated();
+}
+
+
+#ifdef Q_OS_WINDOWS
+void
+VMManagerMainWindow::updateDarkMode()
+{
+    emit darkModeUpdated();
+}
+#endif
+
+void
+VMManagerMainWindow::changeEvent(QEvent *event)
+{
+#ifdef Q_OS_WINDOWS
+    if (event->type() == QEvent::LanguageChange) {
+        QApplication::setFont(QFont(ProgSettings::getFontName(lang_id), 9));
+    }
+#endif
+    QWidget::changeEvent(event);
+}
+
+void
+VMManagerMainWindow::closeEvent(QCloseEvent *event)
+{
+    int running = vmm->getActiveMachineCount();
+    if (running > 0) {
+        QMessageBox warningbox(QMessageBox::Icon::Warning, tr("%1 VM Manager").arg(EMU_NAME), tr("%1 machine(s) are currently active. Are you sure you want to exit the VM manager anyway?").arg(running), QMessageBox::Yes | QMessageBox::No, this);
+        warningbox.exec();
+        if (warningbox.result() == QMessageBox::No) {
+            event->ignore();
+            return;
+        }
+    }
+    saveSettings();
+    QMainWindow::closeEvent(event);
+}
+
+void
+VMManagerMainWindow::setStatusLeft(const QString &text) const
+{
+    statusLeft->setText(text);
+}
+
+void
+VMManagerMainWindow::setStatusRight(const QString &text) const
+{
+    statusRight->setText(text);
+}
+
+#if EMU_BUILD_NUM != 0
+void
+VMManagerMainWindow::checkForUpdatesTriggered()
+{
+    auto updateChannel = UpdateCheck::UpdateChannel::CI;
+#    ifdef RELEASE_BUILD
+    updateChannel = UpdateCheck::UpdateChannel::Stable;
+#    endif
+    const auto updateCheck = new UpdateCheckDialog(updateChannel, this);
+    updateCheck->exec();
+}
+#endif
+
+void
+VMManagerMainWindow::on_actionExit_triggered()
+{
+    this->close();
+}
+
+void
+VMManagerMainWindow::on_actionAbout_Qt_triggered()
+{
+    QApplication::aboutQt();
+}
+
+void
+VMManagerMainWindow::on_actionAbout_86Box_triggered()
+{
+    const auto msgBox = new About(this);
+    msgBox->exec();
+}
+
+void
+VMManagerMainWindow::on_actionDocumentation_triggered()
+{
+    QDesktopServices::openUrl(QUrl(EMU_DOCS_URL));
+}
diff --git a/src/qt/qt_vmmanager_mainwindow.hpp b/src/qt/qt_vmmanager_mainwindow.hpp
new file mode 100644
index 000000000..be02c3095
--- /dev/null
+++ b/src/qt/qt_vmmanager_mainwindow.hpp
@@ -0,0 +1,76 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		Header for 86Box VM manager main window
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+#ifndef VMM_MAINWINDOW_H
+#define VMM_MAINWINDOW_H
+
+#include "qt_vmmanager_main.hpp"
+
+#include <QObject>
+#include <QMainWindow>
+#include <QProcess>
+
+namespace Ui {
+class VMManagerMainWindow;
+}
+
+class VMManagerMainWindow final : public QMainWindow
+{
+    Q_OBJECT
+public:
+    explicit VMManagerMainWindow(QWidget *parent = nullptr);
+    ~VMManagerMainWindow() override;
+    void updateSettings();
+signals:
+    void preferencesUpdated();
+    void languageUpdated();
+#ifdef Q_OS_WINDOWS
+    void darkModeUpdated();
+#endif
+
+private:
+    Ui::VMManagerMainWindow *ui;
+    VMManagerMain *vmm;
+    void saveSettings() const;
+    QLabel *statusLeft;
+    QLabel *statusRight;
+public slots:
+    void setStatusLeft(const QString &text) const;
+    void setStatusRight(const QString &text) const;
+    void updateLanguage();
+#ifdef Q_OS_WINDOWS
+    void updateDarkMode();
+#endif
+
+private slots:
+    void vmmSelectionChanged(const QModelIndex &currentSelection, QProcess::ProcessState processState) const;
+    void preferencesTriggered();
+#if EMU_BUILD_NUM != 0
+    void checkForUpdatesTriggered();
+#endif
+
+    void on_actionExit_triggered();
+    void on_actionDocumentation_triggered();
+    void on_actionAbout_86Box_triggered();
+    void on_actionAbout_Qt_triggered();
+
+protected:
+    void changeEvent(QEvent *event) override;
+    void closeEvent(QCloseEvent *event) override;
+};
+
+#endif // VMM_MAINWINDOW_H
diff --git a/src/qt/qt_vmmanager_mainwindow.ui b/src/qt/qt_vmmanager_mainwindow.ui
new file mode 100644
index 000000000..15739628d
--- /dev/null
+++ b/src/qt/qt_vmmanager_mainwindow.ui
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>VMManagerMainWindow</class>
+ <widget class="QMainWindow" name="VMManagerMainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>900</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>86Box VM Manager</string>
+  </property>
+  <widget class="QWidget" name="centralwidget"/>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>900</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuTools">
+    <property name="title">
+     <string>&amp;Tools</string>
+    </property>
+    <addaction name="actionPreferences"/>
+    <addaction name="actionRemember_size_and_position"/>
+    <addaction name="actionCheck_for_updates"/>
+   </widget>
+   <widget class="QMenu" name="menuFile">
+    <property name="title">
+     <string>&amp;File</string>
+    </property>
+    <addaction name="actionNew_Machine"/>
+    <addaction name="separator"/>
+    <addaction name="actionExit"/>
+   </widget>
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
+     <string>&amp;Help</string>
+    </property>
+    <addaction name="actionDocumentation"/>
+    <addaction name="actionAbout_86Box"/>
+    <addaction name="actionAbout_Qt"/>
+   </widget>
+   <addaction name="menuFile"/>
+   <addaction name="menuTools"/>
+   <addaction name="menuHelp"/>
+  </widget>
+  <widget class="QStatusBar" name="statusbar"/>
+  <widget class="QToolBar" name="toolBar">
+   <property name="autoFillBackground">
+    <bool>true</bool>
+   </property>
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <property name="movable">
+    <bool>false</bool>
+   </property>
+   <property name="allowedAreas">
+    <set>Qt::TopToolBarArea</set>
+   </property>
+   <property name="iconSize">
+    <size>
+     <width>16</width>
+     <height>16</height>
+    </size>
+   </property>
+   <property name="toolButtonStyle">
+    <enum>Qt::ToolButtonIconOnly</enum>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionNew_Machine"/>
+   <addaction name="separator"/>
+   <addaction name="actionStartPause"/>
+   <addaction name="actionHard_Reset"/>
+   <addaction name="actionForce_Shutdown"/>
+   <addaction name="actionCtrl_Alt_Del"/>
+   <addaction name="actionSettings"/>
+  </widget>
+  <action name="actionStartPause">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../qt_resources.qrc">
+     <normaloff>:/menuicons/qt/icons/run.ico</normaloff>:/menuicons/qt/icons/run.ico</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Start</string>
+   </property>
+   <property name="iconVisibleInMenu">
+    <bool>false</bool>
+   </property>
+  </action>
+  <action name="actionHard_Reset">
+   <property name="icon">
+    <iconset resource="../qt_resources.qrc">
+     <normaloff>:/menuicons/qt/icons/hard_reset.ico</normaloff>:/menuicons/qt/icons/hard_reset.ico</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Hard Reset...</string>
+   </property>
+   <property name="iconVisibleInMenu">
+    <bool>false</bool>
+   </property>
+  </action>
+  <action name="actionForce_Shutdown">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../qt_resources.qrc">
+     <normaloff>:/menuicons/qt/icons/acpi_shutdown.ico</normaloff>:/menuicons/qt/icons/acpi_shutdown.ico</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Force shutdown</string>
+   </property>
+   <property name="toolTip">
+    <string>Force shutdown</string>
+   </property>
+   <property name="visible">
+    <bool>true</bool>
+   </property>
+   <property name="iconVisibleInMenu">
+    <bool>false</bool>
+   </property>
+  </action>
+  <action name="actionCtrl_Alt_Del">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../qt_resources.qrc">
+     <normaloff>:/menuicons/qt/icons/send_cad.ico</normaloff>:/menuicons/qt/icons/send_cad.ico</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Ctrl+Alt+Del</string>
+   </property>
+   <property name="toolTip">
+    <string>Ctrl+Alt+Del</string>
+   </property>
+   <property name="visible">
+    <bool>false</bool>
+   </property>
+   <property name="iconVisibleInMenu">
+    <bool>false</bool>
+   </property>
+   <property name="shortcutVisibleInContextMenu">
+    <bool>false</bool>
+   </property>
+  </action>
+  <action name="actionSettings">
+   <property name="icon">
+    <iconset resource="../qt_resources.qrc">
+     <normaloff>:/menuicons/qt/icons/settings.ico</normaloff>:/menuicons/qt/icons/settings.ico</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Settings...</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
+   <property name="iconVisibleInMenu">
+    <bool>false</bool>
+   </property>
+  </action>
+  <action name="actionNew_Machine">
+   <property name="icon">
+    <iconset resource="../qt_resources.qrc">
+     <normaloff>:/settings/qt/icons/86Box-yellow.ico</normaloff>:/settings/qt/icons/86Box-yellow.ico</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;New machine...</string>
+   </property>
+   <property name="toolTip">
+    <string>New machine...</string>
+   </property>
+  </action>
+  <action name="actionRemember_size_and_position">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>R&amp;emember size &amp;&amp; position</string>
+   </property>
+  </action>
+  <action name="actionPreferences">
+   <property name="text">
+    <string>&amp;Preferences...</string>
+   </property>
+   <property name="toolTip">
+    <string>Preferences...</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::PreferencesRole</enum>
+   </property>
+  </action>
+  <action name="actionStart">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../qt_resources.qrc">
+     <normaloff>:/menuicons/qt/icons/run.ico</normaloff>:/menuicons/qt/icons/run.ico</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Start</string>
+   </property>
+   <property name="iconVisibleInMenu">
+    <bool>false</bool>
+   </property>
+  </action>
+  <action name="actionCheck_for_updates">
+   <property name="text">
+    <string>&amp;Check for updates...</string>
+   </property>
+  </action>
+  <action name="actionExit">
+   <property name="text">
+    <string>E&amp;xit</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::QuitRole</enum>
+   </property>
+  </action>
+  <action name="actionDocumentation">
+   <property name="text">
+    <string>&amp;Documentation...</string>
+   </property>
+  </action>
+  <action name="actionAbout_86Box">
+   <property name="text">
+    <string>&amp;About 86Box...</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::AboutRole</enum>
+   </property>
+  </action>
+  <action name="actionAbout_Qt">
+   <property name="text">
+    <string>About &amp;Qt</string>
+   </property>
+   <property name="visible">
+    <bool>false</bool>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::AboutQtRole</enum>
+   </property>
+  </action>
+ </widget>
+ <resources>
+  <include location="../qt_resources.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/src/qt/qt_vmmanager_model.cpp b/src/qt/qt_vmmanager_model.cpp
new file mode 100644
index 000000000..6e74da82c
--- /dev/null
+++ b/src/qt/qt_vmmanager_model.cpp
@@ -0,0 +1,201 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		86Box VM manager model module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+ */
+
+#include <QDebug>
+#include "qt_vmmanager_model.hpp"
+
+VMManagerModel::VMManagerModel() {
+    auto machines_vec = VMManagerSystem::scanForConfigs();
+    for ( const auto& each_config : machines_vec) {
+        machines.append(each_config);
+        connect(each_config, &VMManagerSystem::itemDataChanged, this, &VMManagerModel::modelDataChanged);
+        connect(each_config, &VMManagerSystem::globalConfigurationChanged, this, &VMManagerModel::globalConfigurationChanged);
+    }
+}
+
+VMManagerModel::~VMManagerModel() {
+    for ( auto machine : machines) {
+        delete machine;
+    }
+}
+
+int
+VMManagerModel::rowCount(const QModelIndex &parent) const {
+    return machines.size();
+}
+
+QVariant
+VMManagerModel::data(const QModelIndex &index, int role) const {
+    if (!index.isValid())
+        return {};
+
+    if (index.row() >= machines.size())
+        return {};
+
+    switch (role) {
+        case Qt::DisplayRole:
+            return machines.at(index.row())->displayName;
+        case ConfigName:
+            return machines.at(index.row())->config_name;
+        case ConfigDir:
+            return machines.at(index.row())->config_dir;
+        case ConfigFile:
+            return machines.at(index.row())->config_file.canonicalFilePath();
+        case UUID:
+            return machines.at(index.row())->uuid;
+        case Notes:
+            return machines.at(index.row())->notes;
+        case SearchList:
+            return machines.at(index.row())->searchTerms;
+        case LastUsed:
+            return machines.at(index.row())->timestamp();
+        case Icon:
+            return machines.at(index.row())->icon;
+        case Qt::ToolTipRole:
+            return machines.at(index.row())->shortened_dir;
+        case Qt::UserRole:
+            return machines.at(index.row())->getAll("General");
+        case ProcessStatusString:
+            return machines.at(index.row())->getProcessStatusString();
+        case ProcessStatus:
+            return QVariant::fromValue(machines.at(index.row())->getProcessStatus());
+        default:
+            return {};
+    }
+}
+
+QVariant
+VMManagerModel::headerData(int section, Qt::Orientation orientation, int role) const {
+
+    if (role != Qt::DisplayRole)
+        return {};
+
+    if (orientation == Qt::Horizontal)
+        return QStringLiteral("Column %1").arg(section);
+    else
+        return QStringLiteral("Row %1").arg(section);
+}
+
+VMManagerSystem *
+VMManagerModel::getConfigObjectForIndex(const QModelIndex &index) const
+{
+    return machines.at(index.row());
+}
+void
+VMManagerModel::reload(QWidget* parent)
+{
+    // Scan for configs
+    auto machines_vec = VMManagerSystem::scanForConfigs(parent);
+    for (const auto &scanned_config : machines_vec) {
+        int found = 0;
+        for (const auto &existing_config : machines) {
+            if (*scanned_config == *existing_config) {
+                found = 1;
+            }
+        }
+        if (!found) {
+            addConfigToModel(scanned_config);
+        }
+    }
+    // TODO: Remove missing configs
+}
+
+void
+VMManagerModel::refreshConfigs() {
+    for ( const auto& each_config : machines)
+        each_config->reloadConfig();
+}
+
+QModelIndex
+VMManagerModel::getIndexForConfigFile(const QFileInfo& config_file)
+{
+    int object_index = 0;
+    for (const auto& config_object: machines) {
+        if (config_object->config_file == config_file) {
+            return this->index(object_index);
+        }
+        object_index++;
+    }
+    return {};
+}
+
+void
+VMManagerModel::addConfigToModel(VMManagerSystem *system_config)
+{
+    beginInsertRows(QModelIndex(), this->rowCount(QModelIndex()), this->rowCount(QModelIndex()));
+    machines.append(system_config);
+    connect(system_config, &VMManagerSystem::itemDataChanged, this, &VMManagerModel::modelDataChanged);
+    connect(system_config, &VMManagerSystem::globalConfigurationChanged, this, &VMManagerModel::globalConfigurationChanged);
+    endInsertRows();
+}
+
+void
+VMManagerModel::removeConfigFromModel(VMManagerSystem *system_config)
+{
+    const QModelIndex index = getIndexForConfigFile(system_config->config_file);
+    disconnect(system_config, &VMManagerSystem::itemDataChanged, this, &VMManagerModel::modelDataChanged);
+    beginRemoveRows(QModelIndex(), index.row(), index.row());
+    machines.remove(index.row());
+    endRemoveRows();
+    emit systemDataChanged();
+}
+
+void
+VMManagerModel::modelDataChanged()
+{
+    // Inform the model
+    emit dataChanged(this->index(0), this->index(machines.size()-1));
+    // Inform any interested observers
+    emit systemDataChanged();
+}
+
+void
+VMManagerModel::updateDisplayName(const QModelIndex &index, const QString &newDisplayName)
+{
+    machines.at(index.row())->setDisplayName(newDisplayName);
+    modelDataChanged();
+}
+QMap<VMManagerSystem::ProcessStatus, int>
+VMManagerModel::getProcessStats()
+{
+    QMap<VMManagerSystem::ProcessStatus, int> stats;
+    for (const auto& system: machines) {
+        stats[system->getProcessStatus()] += 1;
+    }
+    return stats;
+}
+
+void
+VMManagerModel::sendGlobalConfigurationChanged()
+{
+    for (auto& system: machines) {
+        if (system->getProcessStatus() != VMManagerSystem::ProcessStatus::Stopped) {
+            system->sendGlobalConfigurationChanged();
+        }
+    }
+}
+
+int
+VMManagerModel::getActiveMachineCount()
+{
+    int running = 0;
+    for (const auto& system: machines) {
+        if (system->getProcessStatus() != VMManagerSystem::ProcessStatus::Stopped)
+            running++;
+    }
+    return running;
+}
diff --git a/src/qt/qt_vmmanager_model.hpp b/src/qt/qt_vmmanager_model.hpp
new file mode 100644
index 000000000..af72f3bc9
--- /dev/null
+++ b/src/qt/qt_vmmanager_model.hpp
@@ -0,0 +1,96 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		Header for 86Box VM manager model module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+ */
+
+#ifndef QT_VMMANAGER_MODEL_H
+#define QT_VMMANAGER_MODEL_H
+
+
+#include "qt_vmmanager_system.hpp"
+
+#include <QSortFilterProxyModel>
+
+class VMManagerModel final : public QAbstractListModel {
+
+    Q_OBJECT
+
+public:
+    //    VMManagerModel(const QStringList &strings, QObject *parent = nullptr)
+    //            : QAbstractListModel(parent), machines(strings) {}
+    VMManagerModel();
+    ~VMManagerModel() override;
+    enum Roles {
+        ProcessStatusString = Qt::UserRole + 1,
+        ProcessStatus,
+        DisplayName,
+        ConfigName,
+        ConfigDir,
+        ConfigFile,
+        LastUsed,
+        UUID,
+        Notes,
+        SearchList,
+        Icon
+    };
+
+    [[nodiscard]] int rowCount(const QModelIndex &parent) const override;
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
+    [[nodiscard]] QVariant headerData(int section, Qt::Orientation orientation,
+                        int role) const override;
+    void addConfigToModel(VMManagerSystem *system_config);
+    void removeConfigFromModel(VMManagerSystem *system_config);
+
+    [[nodiscard]] VMManagerSystem * getConfigObjectForIndex(const QModelIndex &index) const;
+    QModelIndex getIndexForConfigFile(const QFileInfo& config_file);
+    void reload(QWidget* parent = nullptr);
+    void updateDisplayName(const QModelIndex &index, const QString &newDisplayName);
+    QMap<VMManagerSystem::ProcessStatus, int> getProcessStats();
+    int getActiveMachineCount();
+    void refreshConfigs();
+    void sendGlobalConfigurationChanged();
+signals:
+    void systemDataChanged();
+    void globalConfigurationChanged();
+
+private:
+    QVector<VMManagerSystem *> machines;
+    void modelDataChanged();
+
+};
+
+// Note: Custom QSortFilterProxyModel is included here instead of its own file as
+// its only use is in this model
+
+class StringListProxyModel final : public QSortFilterProxyModel {
+public:
+    explicit StringListProxyModel(QObject *parent = nullptr) : QSortFilterProxyModel(parent) {}
+
+protected:
+    [[nodiscard]] bool filterAcceptsRow(const int sourceRow, const QModelIndex &sourceParent) const override {
+        const QModelIndex index = sourceModel()->index(sourceRow, filterKeyColumn(), sourceParent);
+
+        QStringList stringList = sourceModel()->data(index, VMManagerModel::Roles::SearchList).toStringList();
+
+        const QRegularExpression regex = filterRegularExpression();
+
+        const auto result = std::any_of(stringList.begin(), stringList.end(), [&regex](const QString &string) {
+            return regex.match(string).hasMatch();
+        });
+        return result;
+    }
+};
+
+#endif //QT_VMMANAGER_MODEL_H
diff --git a/src/qt/qt_vmmanager_preferences.cpp b/src/qt/qt_vmmanager_preferences.cpp
new file mode 100644
index 000000000..b709b0b13
--- /dev/null
+++ b/src/qt/qt_vmmanager_preferences.cpp
@@ -0,0 +1,123 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		86Box VM manager preferences module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+#include <QFileDialog>
+#include <QStyle>
+#include <cstring>
+
+#include "qt_progsettings.hpp"
+#include "qt_vmmanager_preferences.hpp"
+#include "qt_vmmanager_config.hpp"
+#include "ui_qt_vmmanager_preferences.h"
+
+#ifdef Q_OS_WINDOWS
+#include "qt_vmmanager_windarkmodefilter.hpp"
+extern WindowsDarkModeFilter* vmm_dark_mode_filter;
+#endif
+
+extern "C" {
+#include <86box/86box.h>
+#include <86box/config.h>
+#include <86box/version.h>
+}
+
+VMManagerPreferences::
+VMManagerPreferences(QWidget *parent) : ui(new Ui::VMManagerPreferences)
+{
+    ui->setupUi(this);
+    ui->dirSelectButton->setIcon(QApplication::style()->standardIcon(QStyle::SP_DirIcon));
+    connect(ui->dirSelectButton, &QPushButton::clicked, this, &VMManagerPreferences::chooseDirectoryLocation);
+
+    const auto config = new VMManagerConfig(VMManagerConfig::ConfigType::General);
+    const auto configSystemDir = QString(vmm_path_cfg);
+    if(!configSystemDir.isEmpty()) {
+        // Prefer this one
+        ui->systemDirectory->setText(QDir::toNativeSeparators(configSystemDir));
+    } else if(!QString(vmm_path).isEmpty()) {
+        // If specified on command line
+        ui->systemDirectory->setText(QDir::toNativeSeparators(QDir(vmm_path).path()));
+    }
+
+    ui->comboBoxLanguage->setItemData(0, 0);
+    for (int i = 1; i < ProgSettings::languages.length(); i++) {
+        ui->comboBoxLanguage->addItem(ProgSettings::languages[i].second, i);
+        if (i == lang_id) {
+            ui->comboBoxLanguage->setCurrentIndex(ui->comboBoxLanguage->findData(i));
+        }
+    }
+    ui->comboBoxLanguage->model()->sort(Qt::AscendingOrder);
+
+    // TODO: Defaults
+#if EMU_BUILD_NUM != 0
+    const auto configUpdateCheck = config->getStringValue("update_check").toInt();
+    ui->updateCheckBox->setChecked(configUpdateCheck);
+#else
+    ui->updateCheckBox->setVisible(false);
+#endif
+    const auto useRegexSearch = config->getStringValue("regex_search").toInt();
+    ui->regexSearchCheckBox->setChecked(useRegexSearch);
+
+    ui->radioButtonSystem->setChecked(color_scheme == 0);
+    ui->radioButtonLight->setChecked(color_scheme == 1);
+    ui->radioButtonDark->setChecked(color_scheme == 2);
+
+#ifndef Q_OS_WINDOWS
+    ui->groupBoxColorScheme->setHidden(true);
+#endif
+}
+
+VMManagerPreferences::~
+VMManagerPreferences()
+    = default;
+
+// Bad copy pasta from machine add
+void
+VMManagerPreferences::chooseDirectoryLocation()
+{
+    const auto directory = QFileDialog::getExistingDirectory(this, tr("Choose directory"), ui->systemDirectory->text());
+    if (!directory.isEmpty())
+        ui->systemDirectory->setText(QDir::toNativeSeparators(directory));
+}
+
+void
+VMManagerPreferences::on_pushButtonLanguage_released()
+{
+    ui->comboBoxLanguage->setCurrentIndex(0);
+}
+
+void
+VMManagerPreferences::accept()
+{
+    const auto config = new VMManagerConfig(VMManagerConfig::ConfigType::General);
+
+    strncpy(vmm_path_cfg, QDir::cleanPath(ui->systemDirectory->text()).toUtf8().constData(), sizeof(vmm_path_cfg) - 1);
+    lang_id = ui->comboBoxLanguage->currentData().toInt();
+    color_scheme = (ui->radioButtonSystem->isChecked()) ? 0 : (ui->radioButtonLight->isChecked() ? 1 : 2);
+    config_save_global();
+
+#if EMU_BUILD_NUM != 0
+    config->setStringValue("update_check", ui->updateCheckBox->isChecked() ? "1" : "0");
+#endif
+    config->setStringValue("regex_search", ui->regexSearchCheckBox->isChecked() ? "1" : "0");
+    QDialog::accept();
+}
+
+void
+VMManagerPreferences::reject()
+{
+    QDialog::reject();
+}
diff --git a/src/qt/qt_vmmanager_preferences.hpp b/src/qt/qt_vmmanager_preferences.hpp
new file mode 100644
index 000000000..d28ff79ac
--- /dev/null
+++ b/src/qt/qt_vmmanager_preferences.hpp
@@ -0,0 +1,47 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		Header for 86Box VM manager preferences module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+#ifndef VMMANAGER_PREFERENCES_H
+#define VMMANAGER_PREFERENCES_H
+
+#include <QDialog>
+
+QT_BEGIN_NAMESPACE
+namespace Ui { class VMManagerPreferences; }
+QT_END_NAMESPACE
+
+
+class VMManagerPreferences final : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit VMManagerPreferences(QWidget *parent = nullptr);
+    ~VMManagerPreferences() override;
+
+private:
+    Ui::VMManagerPreferences *ui;
+    QString settingsFile;
+private slots:
+    void chooseDirectoryLocation();
+    void on_pushButtonLanguage_released();
+protected:
+    void accept() override;
+    void reject() override;
+
+};
+
+#endif // VMMANAGER_PREFERENCES_H
diff --git a/src/qt/qt_vmmanager_preferences.ui b/src/qt/qt_vmmanager_preferences.ui
new file mode 100644
index 000000000..ab96109e6
--- /dev/null
+++ b/src/qt/qt_vmmanager_preferences.ui
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>VMManagerPreferences</class>
+ <widget class="QDialog" name="VMManagerPreferences">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>475</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Preferences</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="sizeConstraint">
+     <enum>QLayout::SizeConstraint::SetFixedSize</enum>
+   </property>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>System Directory:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="widget" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="systemDirectory">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="dirSelectButton">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="labelLanguage">
+     <property name="text">
+      <string>Language:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QComboBox" name="comboBoxLanguage">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maxVisibleItems">
+        <number>30</number>
+       </property>
+       <item>
+        <property name="text">
+         <string>(System Default)</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonLanguage">
+       <property name="text">
+        <string>Default</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="updateCheckBox">
+     <property name="text">
+      <string>Check for updates on startup</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="regexSearchCheckBox">
+     <property name="text">
+      <string>Use regular expressions in search box</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBoxColorScheme">
+     <property name="title">
+      <string>Color scheme</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QRadioButton" name="radioButtonSystem">
+        <property name="text">
+         <string>System</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="radioButtonLight">
+        <property name="text">
+         <string>Light</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="radioButtonDark">
+        <property name="text">
+         <string>Dark</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Orientation::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Orientation::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>dirSelectButton</tabstop>
+  <tabstop>comboBoxLanguage</tabstop>
+  <tabstop>pushButtonLanguage</tabstop>
+  <tabstop>updateCheckBox</tabstop>
+  <tabstop>regexSearchCheckBox</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>VMManagerPreferences</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>VMManagerPreferences</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/qt/qt_vmmanager_protocol.cpp b/src/qt/qt_vmmanager_protocol.cpp
new file mode 100644
index 000000000..d113ba203
--- /dev/null
+++ b/src/qt/qt_vmmanager_protocol.cpp
@@ -0,0 +1,139 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		86Box VM manager protocol module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+ */
+
+#include "qt_vmmanager_protocol.hpp"
+#include <QJsonDocument>
+#include <QMetaEnum>
+VMManagerProtocol::VMManagerProtocol(VMManagerProtocol::Sender sender)
+{
+    message_class = sender;
+}
+
+VMManagerProtocol::~VMManagerProtocol()
+= default;
+
+QJsonObject
+VMManagerProtocol::protocolManagerMessage(VMManagerProtocol::ManagerMessage message_type)
+{
+    auto json_message = constructDefaultObject(VMManagerProtocol::Sender::Manager);
+    json_message["message"] = managerMessageTypeToString(message_type);
+    return json_message;
+}
+
+QJsonObject
+VMManagerProtocol::protocolClientMessage(VMManagerProtocol::ClientMessage message_type)
+{
+    auto json_message = constructDefaultObject(VMManagerProtocol::Sender::Client);
+    json_message["message"] = clientMessageTypeToString(message_type);
+    return json_message;
+}
+
+QString
+VMManagerProtocol::managerMessageTypeToString(VMManagerProtocol::ManagerMessage message)
+{
+    QMetaEnum qme = QMetaEnum::fromType<VMManagerProtocol::ManagerMessage>();
+    return qme.valueToKey(static_cast<int>(message));
+}
+
+QString
+VMManagerProtocol::clientMessageTypeToString(VMManagerProtocol::ClientMessage message)
+{
+    QMetaEnum qme = QMetaEnum::fromType<VMManagerProtocol::ClientMessage>();
+    return qme.valueToKey(static_cast<int>(message));
+}
+
+QJsonObject
+VMManagerProtocol::constructDefaultObject(VMManagerProtocol::Sender type)
+{
+    QJsonObject json_message;
+    QString sender_type = ( type == VMManagerProtocol::Sender::Client ) ? "Client" : "VMManager";
+    json_message["type"] = QString(sender_type);
+    json_message["version"] = QStringLiteral(EMU_VERSION);
+    return json_message;
+}
+bool
+VMManagerProtocol::hasRequiredFields(const QJsonObject& json_document)
+{
+    for (const auto& field : ProtocolRequiredFields) {
+        if (!json_document.contains(field)) {
+            qDebug("Received json missing field \"%s\"", qPrintable(field));
+            return false;
+        }
+    }
+    return true;
+}
+VMManagerProtocol::ClientMessage
+VMManagerProtocol::getClientMessageType(const QJsonObject &json_document)
+{
+    // FIXME: This key ("message") is hardcoded here. Make a hash which maps these
+    // required values.
+    QString message_type = json_document.value("message").toString();
+    // Can't use switch with strings, manual compare
+    if (message_type == "Status") {
+        return VMManagerProtocol::ClientMessage::Status;
+    } else if (message_type == "WindowBlocked") {
+        return VMManagerProtocol::ClientMessage::WindowBlocked;
+    } else if (message_type == "WindowUnblocked") {
+        return VMManagerProtocol::ClientMessage::WindowUnblocked;
+    } else if (message_type == "RunningStateChanged") {
+        return VMManagerProtocol::ClientMessage::RunningStateChanged;
+    } else if (message_type == "ConfigurationChanged") {
+        return VMManagerProtocol::ClientMessage::ConfigurationChanged;
+    } else if (message_type == "WinIdMessage") {
+        return VMManagerProtocol::ClientMessage::WinIdMessage;
+    } else if (message_type == "GlobalConfigurationChanged") {
+        return VMManagerProtocol::ClientMessage::GlobalConfigurationChanged;
+    }
+    return VMManagerProtocol::ClientMessage::UnknownMessage;
+}
+VMManagerProtocol::ManagerMessage
+VMManagerProtocol::getManagerMessageType(const QJsonObject &json_document)
+{
+    // FIXME: This key ("message") is hardcoded here. Make a hash which maps these
+    // required values.
+    QString message_type = json_document.value("message").toString();
+    // Can't use switch with strings, manual compare
+    if (message_type == "RequestStatus") {
+        return VMManagerProtocol::ManagerMessage::RequestStatus;
+    } else if (message_type == "Pause") {
+        return VMManagerProtocol::ManagerMessage::Pause;
+    } if (message_type == "CtrlAltDel") {
+        return VMManagerProtocol::ManagerMessage::CtrlAltDel;
+    } if (message_type == "ShowSettings") {
+        return VMManagerProtocol::ManagerMessage::ShowSettings;
+    } if (message_type == "ResetVM") {
+        return VMManagerProtocol::ManagerMessage::ResetVM;
+    } if (message_type == "RequestShutdown") {
+        return VMManagerProtocol::ManagerMessage::RequestShutdown;
+    } if (message_type == "ForceShutdown") {
+        return VMManagerProtocol::ManagerMessage::ForceShutdown;
+    } if (message_type == "GlobalConfigurationChanged") {
+        return VMManagerProtocol::ManagerMessage::GlobalConfigurationChanged;
+    }
+    return VMManagerProtocol::ManagerMessage::UnknownMessage;
+}
+QJsonObject
+VMManagerProtocol::getParams(const QJsonObject &json_document)
+{
+    // FIXME: This key ("params") is hardcoded here. Make a hash which maps these
+    // required values.
+    auto params_object = json_document.value("params");
+    if (params_object.type() != QJsonValue::Object) {
+        return {};
+    }
+    return params_object.toObject();
+}
diff --git a/src/qt/qt_vmmanager_protocol.hpp b/src/qt/qt_vmmanager_protocol.hpp
new file mode 100644
index 000000000..99c88d808
--- /dev/null
+++ b/src/qt/qt_vmmanager_protocol.hpp
@@ -0,0 +1,98 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		Header for 86Box VM manager protocol module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+ */
+
+#ifndef QT_VMMANAGER_PROTOCOL_H
+#define QT_VMMANAGER_PROTOCOL_H
+
+#include <QJsonObject>
+extern "C" {
+#include <86box/version.h>
+}
+
+static QVector<QString> ProtocolRequiredFields = { "type", "message" };
+
+class VMManagerProtocol : QObject {
+    Q_OBJECT
+
+public:
+    enum class Sender {
+        Manager,
+        Client,
+    };
+    Q_ENUM(Sender);
+
+    enum class ManagerMessage {
+        RequestStatus,
+        Pause,
+        CtrlAltDel,
+        ShowSettings,
+        ResetVM,
+        RequestShutdown,
+        ForceShutdown,
+        GlobalConfigurationChanged,
+        UnknownMessage,
+    };
+
+    // This macro allows us to do a reverse lookup of the enum with `QMetaEnum`
+    Q_ENUM(ManagerMessage);
+
+    enum class ClientMessage {
+        Status,
+        WindowBlocked,
+        WindowUnblocked,
+        RunningStateChanged,
+        ConfigurationChanged,
+        WinIdMessage,
+        GlobalConfigurationChanged,
+        UnknownMessage,
+    };
+    Q_ENUM(ClientMessage);
+
+    enum class WindowStatus {
+        WindowUnblocked = 0,
+        WindowBlocked,
+    };
+
+    enum class RunningState {
+        Running = 0,
+        Paused,
+        RunningWaiting,
+        PausedWaiting,
+        Unknown,
+    };
+    Q_ENUM(RunningState);
+
+    explicit VMManagerProtocol(Sender sender);
+    ~VMManagerProtocol();
+
+    QJsonObject    protocolManagerMessage(ManagerMessage message_type);
+    QJsonObject    protocolClientMessage(ClientMessage message_type);
+    static QString managerMessageTypeToString(ManagerMessage message);
+    static QString clientMessageTypeToString(ClientMessage message);
+
+    static bool           hasRequiredFields(const QJsonObject &json_document);
+    static QJsonObject    getParams(const QJsonObject &json_document);
+    static QJsonObject    getStatus(const QJsonObject &json_document);
+    static ClientMessage  getClientMessageType(const QJsonObject &json_document);
+    static ManagerMessage getManagerMessageType(const QJsonObject &json_document);
+
+private:
+    Sender             message_class;
+    static QJsonObject constructDefaultObject(VMManagerProtocol::Sender type);
+};
+
+#endif // QT_VMMANAGER_PROTOCOL_H
diff --git a/src/qt/qt_vmmanager_serversocket.cpp b/src/qt/qt_vmmanager_serversocket.cpp
new file mode 100644
index 000000000..edd1e6c02
--- /dev/null
+++ b/src/qt/qt_vmmanager_serversocket.cpp
@@ -0,0 +1,225 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		86Box VM manager server socket module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+ */
+
+#include "qt_vmmanager_serversocket.hpp"
+#include <QApplication>
+#include <QCryptographicHash>
+#include <QJsonParseError>
+#include <QMetaEnum>
+#include <QStandardPaths>
+#include <utility>
+
+VMManagerServerSocket::VMManagerServerSocket(const QFileInfo &config_path, const ServerType type)
+{
+    server_type = type;
+    config_file = config_path;
+    serverIsRunning = false;
+    socket = nullptr;
+    server = new QLocalServer;
+    setupVars();
+}
+
+VMManagerServerSocket::~VMManagerServerSocket()
+{
+    delete server;
+}
+
+bool
+VMManagerServerSocket::startServer() {
+
+    // Remove socket file (if it exists) in order to start a new one
+    qInfo("Socket path is %s", qPrintable(socket_path.filePath()));
+    if (socket_path.exists() and !socket_path.isDir()) {
+        auto socket_file = new QFile(socket_path.filePath());
+        if (!socket_file->remove()) {
+            qInfo("Failed to remove the old socket file (Error %i): %s", socket_file->error(), qPrintable(socket_file->errorString()));
+            return false;
+        }
+    }
+
+    if (server->listen(socket_path.fileName())) {
+        serverIsRunning = true;
+        connect(server, &QLocalServer::newConnection, this, &VMManagerServerSocket::serverConnectionReceived);
+        return true;
+    } else {
+        qInfo("Failed to start server: %s", qPrintable(server->errorString()));
+        serverIsRunning = false;
+        return false;
+    }
+}
+
+void
+VMManagerServerSocket::serverConnectionReceived() {
+    qDebug("Connection received on %s", qPrintable(socket_path.fileName()));
+    socket = server->nextPendingConnection();
+    if(!socket) {
+        qInfo("Invalid socket when trying to receive the connection");
+        return;
+    }
+    connect(socket, &QLocalSocket::readyRead, this, &VMManagerServerSocket::serverReceivedMessage);
+    connect(socket, &QLocalSocket::disconnected, this, &VMManagerServerSocket::serverDisconnected);
+}
+
+void
+VMManagerServerSocket::serverReceivedMessage() {
+
+    // Handle legacy socket connections first. These connections only receive
+    // information on window status
+    if(server_type == VMManagerServerSocket::ServerType::Legacy) {
+        QByteArray tempString = socket->read(1);
+        int window_obscured = tempString.toInt();
+        emit windowStatusChanged(window_obscured);
+        return;
+    }
+
+    // Normal connections here
+    QDataStream stream(socket);
+    stream.setVersion(QDataStream::Qt_5_7);
+    QByteArray jsonData;
+    for (;;) {
+        // Start a transaction
+        stream.startTransaction();
+        // Try to read the data
+        stream >> jsonData;
+        if (stream.commitTransaction()) {
+            QJsonParseError parse_error{};
+            // Validate the received data to make sure it's valid json
+            const QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonData, &parse_error);
+            if (parse_error.error == QJsonParseError::NoError) {
+                // The data received was valid json
+                if (jsonDoc.isObject()) {
+                    // The data is a valid json object
+                    emit dataReceived();
+                    jsonReceived(jsonDoc.object());
+                }
+            }
+            // The data was not valid json.
+            // Loop and try to read more data
+        } else {
+            // read failed, socket is reverted to its previous state (before the transaction)
+            // exit the loop and wait for more data to become available
+            break;
+        }
+    }
+}
+
+void
+VMManagerServerSocket::serverSendMessage(VMManagerProtocol::ManagerMessage protocol_message, const QStringList& arguments) const {
+    if(!socket) {
+        qInfo("Cannot send message: Invalid socket");
+        return;
+    }
+
+    // Regular connection
+    QDataStream stream(socket);
+    stream.setVersion(QDataStream::Qt_5_7);
+    auto packet = new VMManagerProtocol(VMManagerProtocol::Sender::Manager);
+    auto jsonMessage = packet->protocolManagerMessage(protocol_message);
+    stream << QJsonDocument(jsonMessage).toJson(QJsonDocument::Compact);
+}
+
+void
+VMManagerServerSocket::serverDisconnected()
+{
+    qInfo("Connection disconnected");
+}
+void
+VMManagerServerSocket::jsonReceived(const QJsonObject &json)
+{
+    // The serialization portion has already validated the message as json.
+    // Now ensure it has the required fields.
+    if (!VMManagerProtocol::hasRequiredFields(json)) {
+        // TODO: Error handling of some sort, emit signals
+        qDebug("Invalid message received from client: required fields missing. Object:");
+        qDebug() << json;
+        return;
+    }
+//    qDebug().noquote() << Q_FUNC_INFO << json;
+    QJsonObject params_object;
+
+    auto message_type = VMManagerProtocol::getClientMessageType(json);
+    switch (message_type) {
+        case VMManagerProtocol::ClientMessage::WinIdMessage:
+            qDebug("WinId message received from client");
+            params_object = VMManagerProtocol::getParams(json);
+            if (!params_object.isEmpty()) {
+                // valid object
+                if(params_object.value("params").type() == QJsonValue::Double) {
+                    emit winIdReceived(params_object.value("params").toVariant().toULongLong());
+                }
+            }
+            break;
+        case VMManagerProtocol::ClientMessage::Status:
+            qDebug("Status message received from client");
+            break;
+        case VMManagerProtocol::ClientMessage::WindowBlocked:
+            qDebug("Window blocked message received from client");
+            emit windowStatusChanged(static_cast<int>(VMManagerProtocol::WindowStatus::WindowBlocked));
+            break;
+        case VMManagerProtocol::ClientMessage::WindowUnblocked:
+            qDebug("Window unblocked received from client");
+            emit windowStatusChanged(static_cast<int>(VMManagerProtocol::WindowStatus::WindowUnblocked));
+            break;
+        case VMManagerProtocol::ClientMessage::RunningStateChanged:
+            qDebug("Running state change received from client");
+            params_object = VMManagerProtocol::getParams(json);
+            if (!params_object.isEmpty()) {
+                // valid object
+                if(params_object.value("status").type() == QJsonValue::Double) {
+                    // has status key, value is an int (qt assigns it as Double)
+                    emit runningStatusChanged(static_cast<VMManagerProtocol::RunningState>(params_object.value("status").toInt()));
+                }
+            }
+            break;
+        case VMManagerProtocol::ClientMessage::ConfigurationChanged:
+            qDebug("Configuration change received from client");
+            emit configurationChanged();
+            break;
+        case VMManagerProtocol::ClientMessage::GlobalConfigurationChanged:
+            qDebug("Global configuration change received from client");
+            emit globalConfigurationChanged();
+            break;
+        default:
+            qDebug("Unknown client message type received:");
+            qDebug() << json;
+            return;
+    }
+}
+
+void
+VMManagerServerSocket::setupVars()
+{
+    QString unique_name = QCryptographicHash::hash(config_file.path().toUtf8().constData(), QCryptographicHash::Algorithm::Sha256).toHex().right(6);
+    socket_path.setFile(QStandardPaths::writableLocation(QStandardPaths::TempLocation) + "/" + QApplication::applicationName() + ".socket." + unique_name);
+}
+
+QString
+VMManagerServerSocket::getSocketPath() const
+{
+    if (server) {
+        return server->fullServerName();
+    }
+    return {};
+}
+
+QString
+VMManagerServerSocket::serverTypeToString(VMManagerServerSocket::ServerType server_type_lookup)
+{
+    QMetaEnum qme = QMetaEnum::fromType<VMManagerServerSocket::ServerType>();
+    return qme.valueToKey(static_cast<int>(server_type_lookup));
+
+}
diff --git a/src/qt/qt_vmmanager_serversocket.hpp b/src/qt/qt_vmmanager_serversocket.hpp
new file mode 100644
index 000000000..ff1950771
--- /dev/null
+++ b/src/qt/qt_vmmanager_serversocket.hpp
@@ -0,0 +1,85 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		Header for 86Box VM manager server socket module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+ */
+
+#ifndef QT_VMMANAGER_SERVERSOCKET_H
+#define QT_VMMANAGER_SERVERSOCKET_H
+
+#include <QFileInfo>
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QWidget>
+#include <QJsonObject>
+#include "qt_vmmanager_protocol.hpp"
+
+// This macro helps give us the required `qHash()` function in order to use the
+// enum as a hash key
+#define QHASH_FOR_CLASS_ENUM(T) \
+inline uint qHash(const T &t, uint seed) { \
+    return ::qHash(static_cast<typename std::underlying_type<T>::type>(t), seed); \
+}
+
+class VMManagerServerSocket : public QWidget {
+
+    Q_OBJECT
+
+public:
+
+    enum class ServerType {
+        Standard,
+        Legacy,
+    };
+    // This macro allows us to do a reverse lookup of the enum with `QMetaEnum`
+    Q_ENUM(ServerType)
+
+    QHASH_FOR_CLASS_ENUM(ServerType)
+
+    explicit VMManagerServerSocket(const QFileInfo &config_path, ServerType type = ServerType::Standard);
+    ~VMManagerServerSocket() override;
+
+    QFileInfo socket_path;
+    QFileInfo config_file;
+
+    QLocalServer *server;
+    QLocalSocket *socket;
+    ServerType    server_type;
+    bool serverIsRunning;
+
+    // Server functions
+    bool startServer();
+    void serverConnectionReceived();
+    void serverReceivedMessage();
+    void serverSendMessage(VMManagerProtocol::ManagerMessage protocol_message, const QStringList& arguments = QStringList()) const;
+    static void serverDisconnected();
+    void jsonReceived(const QJsonObject &json);
+    QString getSocketPath() const;
+
+    static QString serverTypeToString(ServerType server_type_lookup);
+
+    void setupVars();
+
+signals:
+    void dataReceived();
+    void windowStatusChanged(int status);
+    void runningStatusChanged(VMManagerProtocol::RunningState state);
+    void configurationChanged();
+    void globalConfigurationChanged();
+    void winIdReceived(WId id);
+
+
+};
+
+#endif // QT_VMMANAGER_SERVERSOCKET_H
diff --git a/src/qt/qt_vmmanager_system.cpp b/src/qt/qt_vmmanager_system.cpp
new file mode 100644
index 000000000..8079f1ba0
--- /dev/null
+++ b/src/qt/qt_vmmanager_system.cpp
@@ -0,0 +1,1252 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		86Box VM manager system module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+
+#include <QString>
+#include <QDirIterator>
+#include <QDebug>
+#include <QTimer>
+#include <QSettings>
+#include <QApplication>
+#include <QStandardPaths>
+#include <QCryptographicHash>
+#include <QtNetwork>
+#include <QElapsedTimer>
+#include <QMessageBox>
+#include <QProgressDialog>
+#include <QWindow>
+#include "qt_util.hpp"
+#include "qt_vmmanager_system.hpp"
+// #include "qt_vmmanager_details_section.hpp"
+#include "qt_vmmanager_detailsection.hpp"
+
+#ifdef Q_OS_WINDOWS
+#include <windows.h>
+#endif
+
+
+extern "C" {
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/video.h>
+// #include <86box/vid_xga_device.h>
+#include <86box/machine.h>
+#include <86box/plat.h>
+#include <86box/sound.h>
+#include <cpu.h>
+#include <86box/thread.h>    // required for network.h
+#include <86box/timer.h>     // required for network.h and fdd.h
+#include <86box/cdrom.h>
+#include <86box/cdrom_interface.h>
+#include <86box/scsi.h>
+#include <86box/scsi_device.h> // required for rdisk.h and mo.h
+#include <86box/rdisk.h>
+#include <86box/mo.h>
+#include <86box/fdd.h>
+#include <86box/fdc_ext.h>
+#include <86box/hdc.h>
+#include <86box/gameport.h>
+#include <86box/isartc.h>
+#include <86box/isamem.h>
+#include <86box/isarom.h>
+#include <86box/lpt.h>
+#include <86box/midi.h>
+#include <86box/network.h>
+#include <86box/keyboard.h>
+#include <86box/mouse.h>
+}
+
+using namespace VMManager;
+
+VMManagerSystem::VMManagerSystem(const QString &sysconfig_file)  {
+
+    // The 86Box configuration file
+    config_file = QFileInfo(sysconfig_file);
+    // The default name of the system. This is the name of the directory
+    // that contains the 86box configuration file
+    config_name = config_file.dir().dirName();
+    // The full path of the directory that contains the 86box configuration file
+    config_dir = shortened_dir = config_file.dir().absolutePath();
+    process_status = ProcessStatus::Stopped;
+    // In the configuration file the UUID is used as a unique value
+    uuid = util::generateUuid(sysconfig_file);
+    // That unique value is used to map the information to each individual system.
+    config_settings = new VMManagerConfig(VMManagerConfig::ConfigType::System, uuid);
+
+    // On non-windows platforms, shortened_dir will replace the home directory path with ~
+    // and be used as the tool tip in the list view
+#if not defined(Q_OS_WINDOWS)
+    if (config_dir.startsWith(QDir::homePath())) {
+        shortened_dir.replace(QDir::homePath(), "~");
+    }
+#endif
+    loadSettings();
+    setupPaths();
+    // Paths must be setup before vars!
+    setupVars();
+
+    serverIsRunning = false;
+    window_obscured = false;
+
+    find86BoxBinary();
+    platform = QApplication::platformName();
+    process = new QProcess();
+    connect(process, &QProcess::stateChanged, this, &VMManagerSystem::processStatusChanged);
+
+    // Server type for this instance (Standard should always be used instead of Legacy)
+    socket_server_type = VMManagerServerSocket::ServerType::Standard;
+    socket_server = new VMManagerServerSocket(config_file, socket_server_type);
+
+    // NOTE: When unique names or UUIDs are written to the individual VM config file, use that
+    // here instead of the auto-generated unique_name
+    // Save settings once everything is initialized
+    saveSettings();
+}
+
+VMManagerSystem::~VMManagerSystem() {
+    delete socket_server;
+}
+
+QVector<VMManagerSystem *>
+VMManagerSystem::scanForConfigs(QWidget* parent, const QString &searchPath)
+{
+    QProgressDialog progDialog(parent);
+    unsigned int found = 0;
+    progDialog.setCancelButton(nullptr);
+    progDialog.setWindowTitle(tr("Searching for VMs..."));
+    progDialog.setMinimumDuration(0);
+    progDialog.setValue(0);
+    progDialog.setMinimum(0);
+    progDialog.setMaximum(0);
+    progDialog.setWindowFlags(progDialog.windowFlags() & ~Qt::WindowCloseButtonHint);
+    progDialog.setMinimumSize(progDialog.sizeHint());
+    progDialog.setMaximumSize(progDialog.sizeHint());
+    QElapsedTimer scanTimer;
+    scanTimer.start();
+    QVector<VMManagerSystem *> system_configs;
+
+    const auto config_file_name = QString(CONFIG_FILE);
+    const QStringList filters = {config_file_name};
+    QStringList matches;
+    QString search_directory;
+
+    search_directory = searchPath.isEmpty()? vmm_path : searchPath;
+
+    if(!QDir(search_directory).exists()) {
+        //qWarning() << "Path" << search_directory << "does not exist. Cannot continue";
+        QDir(search_directory).mkpath(".");
+        //return {};
+    }
+
+    QDirIterator dir_iterator(search_directory, filters, QDir::Files, QDirIterator::Subdirectories);
+
+    qInfo("Searching %s for %s", qPrintable(search_directory), qPrintable(config_file_name));
+
+    QElapsedTimer timer;
+    timer.start();
+    while (dir_iterator.hasNext()) {
+        found++;
+        progDialog.setLabelText(tr("Found %1").arg(QString::number(found)));
+        QApplication::processEvents();
+        QString   filename = dir_iterator.next();
+        matches.append(filename);
+    }
+
+    const auto scanElapsed = timer.elapsed();
+    qDebug().noquote().nospace() << "Found " << matches.size() << " configs in " << search_directory <<". Scan took " << scanElapsed << " ms";
+
+    timer.restart();
+    // foreach (QFileInfo hit, matches) {
+    //     system_configs.append(new VMManagerSystem(hit));
+    // }
+    progDialog.setMaximum(found);
+    progDialog.setValue(0);
+    unsigned int appended = 0;
+    for (const auto &filename : matches) {
+        system_configs.append(new VMManagerSystem(filename));
+        appended++;
+        progDialog.setLabelText(system_configs.last()->displayName);
+        progDialog.setValue(appended);
+        QApplication::processEvents();
+    }
+    if (matches.size()) {
+        auto elapsed = timer.elapsed();
+        qDebug() << "Load loop took" << elapsed << "ms for" << matches.size() << "loads";
+        qDebug() << "Overall scan time was" << scanTimer.elapsed() << "ms, average" << elapsed / matches.size() << "ms / load";
+    }
+    return system_configs;
+}
+
+QString
+VMManagerSystem::generateTemporaryFilename()
+{
+    QTemporaryFile tempFile;
+    // File will be closed once the QTemporaryFile object goes out of scope
+    tempFile.setAutoRemove(true);
+    tempFile.open();
+    return tempFile.fileName();
+}
+
+QFileInfoList
+VMManagerSystem::getScreenshots() {
+
+    // Don't bother unless the directory exists
+    if(!screenshot_directory.exists()) {
+        return {};
+    }
+
+    auto screen_scan_dir = QDir(screenshot_directory.path(), "Monitor_1*", QDir::SortFlag::LocaleAware | QDir::SortFlag::IgnoreCase, QDir::Files);
+    auto screenshot_files = screen_scan_dir.entryInfoList();
+    return screenshot_files;
+}
+
+void
+VMManagerSystem::loadSettings()
+{
+    // First, load the information from the 86box.cfg
+    QSettings settings(config_file.filePath(), QSettings::IniFormat);
+    if (settings.status() != QSettings::NoError) {
+        qWarning() << "Error loading" << config_file.path() << " status:" << settings.status();
+    }
+    // qInfo() << "Loaded "<< config_file.filePath() << "status:" << settings.status();
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    settings.setIniCodec("UTF-8");
+#endif
+    // Clear out the config hash in case the config is reloaded
+    for (const auto &outer_key : config_hash.keys()) {
+        config_hash[outer_key].clear();
+    }
+
+    // General
+    for (const auto &key_name : settings.childKeys()) {
+        config_hash["General"][key_name] = settings.value(key_name).toString();
+    }
+
+    for (auto &group_name : settings.childGroups()) {
+        settings.beginGroup(group_name);
+        for (const auto &key_name : settings.allKeys()) {
+            QString setting_value;
+            // QSettings will interpret lines with commas as QStringList.
+            // Check for it and join them back to a string.
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            if (settings.value(key_name).typeId() == QMetaType::QStringList) {
+#else
+            if (settings.value(key_name).type() == QVariant::StringList) {
+#endif
+                setting_value = settings.value(key_name).toStringList().join(", ");
+            } else {
+                setting_value = settings.value(key_name).toString();
+            }
+            config_hash[group_name][key_name] = setting_value;
+        }
+        settings.endGroup();
+    }
+
+    // Next, load the information from the vmm config for this system
+    // Display name
+    auto loadedDisplayName = config_settings->getStringValue("display_name");
+    if (!loadedDisplayName.isEmpty()) {
+        displayName = loadedDisplayName;
+    } else {
+        displayName = config_name;
+    }
+    // Notes
+    auto loadedNotes = config_settings->getStringValue("notes");
+    if (!loadedNotes.isEmpty()) {
+        notes = loadedNotes;
+    }
+    // Timestamp
+    auto loadedTimestamp = config_settings->getStringValue("timestamp");
+    if (!loadedTimestamp.isEmpty()) {
+        // Make sure it is valid
+        if (auto newTimestamp = QDateTime::fromString(loadedTimestamp, Qt::ISODate); newTimestamp.isValid()) {
+            lastUsedTimestamp = newTimestamp;
+        }
+    }
+    // Icon
+    auto loadedIcon = config_settings->getStringValue("icon");
+    if (!loadedIcon.isEmpty()) {
+        icon = loadedIcon;
+    }
+}
+void
+VMManagerSystem::saveSettings()
+{
+    if(!isValid()) {
+        return;
+    }
+    config_settings->setStringValue("system_name", config_name);
+    config_settings->setStringValue("config_file", config_file.canonicalFilePath());
+    config_settings->setStringValue("config_dir", config_file.canonicalPath());
+    if (displayName != config_name) {
+        config_settings->setStringValue("display_name", displayName);
+    } else {
+        config_settings->remove("display_name");
+    }
+
+    config_settings->setStringValue("notes", notes);
+    if(lastUsedTimestamp.isValid()) {
+        config_settings->setStringValue("timestamp", lastUsedTimestamp.toString(Qt::ISODate));
+    }
+    config_settings->setStringValue("icon", icon);
+    generateSearchTerms();
+}
+void
+VMManagerSystem::generateSearchTerms()
+{
+    searchTerms.clear();
+    for (const auto &config_key : config_hash.keys()) {
+        // searchTerms.append(config_hash[config_key].values());
+        // brute force temporarily don't add paths
+        for(const auto &value: config_hash[config_key].values()) {
+            if(!value.startsWith("/")) {
+                searchTerms.append(value);
+            }
+        }
+    }
+    searchTerms.append(display_table.values());
+    searchTerms.append(displayName);
+    searchTerms.append(config_name);
+    QRegularExpression whitespaceRegex("\\s+");
+    searchTerms.append(notes.split(whitespaceRegex));
+}
+void
+VMManagerSystem::updateTimestamp()
+{
+    lastUsedTimestamp = QDateTime::currentDateTimeUtc();
+    saveSettings();
+}
+
+QString
+VMManagerSystem::getAll(const QString& category) const {
+    auto value = config_hash[category].keys().join(", ");
+    return value;
+}
+
+QHash<QString, QHash<QString, QString>>
+VMManagerSystem::getConfigHash() const
+{
+    return config_hash;
+}
+
+void
+VMManagerSystem::setDisplayName(const QString &newDisplayName)
+{
+    // If blank, reset to the default
+    if (newDisplayName.isEmpty()) {
+        displayName = config_name;
+    } else {
+        displayName = newDisplayName;
+    }
+    saveSettings();
+}
+void
+VMManagerSystem::setNotes(const QString &newNotes)
+{
+    notes = newNotes;
+    saveSettings();
+}
+bool
+VMManagerSystem::isValid() const
+{
+    return config_file.exists() && config_file.isFile() && config_file.size() != 0;
+}
+
+bool
+VMManagerSystem::isProcessRunning() const
+{
+    return process->processId() != 0;
+}
+
+qint64
+VMManagerSystem::processId() const
+{
+    return process->processId();
+}
+
+QHash<QString, QString>
+VMManagerSystem::getCategory(const QString &category) const {
+    return config_hash[category];
+}
+
+void
+VMManagerSystem::find86BoxBinary() {
+    // We'll use our own self to launch the VMs
+    main_binary = QFileInfo(QCoreApplication::applicationFilePath());
+}
+
+bool
+VMManagerSystem::has86BoxBinary() {
+    return main_binary.exists();
+}
+
+void
+VMManagerSystem::launchMainProcess() {
+
+    if(!has86BoxBinary()) {
+        qWarning("No binary found! returning");
+        return;
+    }
+
+    // start the server first to get the socket name
+    if (!serverIsRunning) {
+        if(!startServer()) {
+            // FIXME: Better error handling
+            qInfo("Failed to start VM Manager server");
+            return;
+        }
+    }
+    // If the system is already running, bring it to front
+    if (process->processId() != 0) {
+#ifdef Q_OS_WINDOWS
+        if (this->id) {
+            SetForegroundWindow((HWND)this->id);
+        }
+#endif
+        return;
+    }
+    setProcessEnvVars();
+    QString program = main_binary.filePath();
+    QStringList args;
+    args << "--vmpath" << config_dir;
+    args << "--vmname" << displayName;
+    process->setProgram(program);
+    process->setArguments(args);
+    qDebug() << Q_FUNC_INFO << " Full Command:" << process->program() << " " << process->arguments();
+    process->start();
+    updateTimestamp();
+
+    connect(process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
+    [=](const int exitCode, const QProcess::ExitStatus exitStatus){
+        if (exitCode != 0 || exitStatus != QProcess::NormalExit) {
+            qInfo().nospace().noquote() << "Abnormal program termination while launching main process: exit code " <<  exitCode << ", exit status " << exitStatus;
+            QMessageBox::critical(this, tr("Virtual machine crash"),
+                                        tr("The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2.").arg(displayName, QString::number(exitCode)));
+            return;
+        }
+    });
+}
+
+void
+VMManagerSystem::startButtonPressed() {
+    launchMainProcess();
+}
+
+void
+VMManagerSystem::launchSettings() {
+    if(!has86BoxBinary()) {
+        qWarning("No binary found! returning");
+        return;
+    }
+
+    // start the server first to get the socket name
+    if (!serverIsRunning) {
+        if(!startServer()) {
+            // FIXME: Better error handling
+            qInfo("Failed to start VM Manager server");
+            return;
+        }
+    }
+
+    // If the system is already running, instruct it to show settings
+    if (process->processId() != 0) {
+#ifdef Q_OS_WINDOWS
+        if (this->id) {
+            SetForegroundWindow((HWND)this->id);
+        }
+#endif
+        socket_server->serverSendMessage(VMManagerProtocol::ManagerMessage::ShowSettings);
+        return;
+    }
+
+    // Otherwise, launch the system with the settings parameter
+    setProcessEnvVars();
+    window_obscured = true;
+    QString program = main_binary.filePath();
+    QStringList open_command_args;
+    QStringList args;
+    args << "--vmpath" << config_dir << "--settings";
+    process->setProgram(program);
+    process->setArguments(args);
+    qDebug() << Q_FUNC_INFO << " Full Command:" << process->program() << " " << process->arguments();
+    process->start();
+
+    connect(process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
+    [=](const int exitCode, const QProcess::ExitStatus exitStatus){
+        if (exitCode != 0 || exitStatus != QProcess::NormalExit) {
+            qInfo().nospace().noquote() << "Abnormal program termination while launching settings: exit code " <<  exitCode << ", exit status " << exitStatus;
+            QMessageBox::critical(this, tr("Virtual machine crash"),
+                                        tr("The virtual machine \"%1\"'s process has unexpectedly terminated with exit code %2.").arg(displayName, QString("%1 (0x%2)").arg(QString::number(exitCode), QString::number(exitCode, 16))));
+            return;
+        }
+
+        configurationChangeReceived();
+    });
+}
+
+void
+VMManagerSystem::setupPaths() {
+    // application_temp_directory.setPath(QStandardPaths::writableLocation(QStandardPaths::TempLocation));
+    // standard_temp_directory.setPath(QStandardPaths::writableLocation(QStandardPaths::TempLocation));
+    // QString temp_subdir = QApplication::applicationName();
+    // if (!application_temp_directory.exists(temp_subdir)) {
+    //     // FIXME: error checking
+    //     application_temp_directory.mkdir(temp_subdir);
+    // }
+    // // QT always replaces `/` with native separators, so it is safe to use here for all platforms
+    // application_temp_directory.setPath(application_temp_directory.path() + "/" + temp_subdir);
+    // app_data_directory.setPath(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation));
+    // // TODO: come back here and update with the new plat_get_global_*
+    // if (!app_data_directory.exists()) {
+    //     // FIXME: Error checking
+    //     app_data_directory.mkpath(app_data_directory.path());
+    // }
+    screenshot_directory.setPath(config_dir + "/" + "screenshots");
+}
+
+void
+VMManagerSystem::setupVars() {
+    unique_name = QCryptographicHash::hash(config_file.path().toUtf8().constData(), QCryptographicHash::Algorithm::Sha256).toHex().right(9);
+    // unique_name = "aaaaaa";
+    // Set up the display vars
+    // This will likely get moved out to its own class
+    // This will likely get moved out to its own class
+    auto machine_config      = getCategory("Machine");
+    auto video_config        = getCategory("Video");
+    auto disk_config         = getCategory("Hard disks");
+    auto audio_config        = getCategory("Sound");
+    auto network_config      = getCategory("Network");
+    auto input_config        = getCategory("Input devices");
+    auto floppy_cdrom_config = getCategory("Floppy and CD-ROM drives");
+    auto rdisk_mo_config     = getCategory("Other removable devices");
+    auto storage_config      = getCategory("Storage controllers");
+    auto ports_config        = getCategory("Ports (COM & LPT)");
+    auto other_config        = getCategory("Other peripherals");
+    // auto general_config = getCategory("General");
+    // auto config_uuid = QString("Not set");
+    // if(!general_config["uuid"].isEmpty()) {
+    //     config_uuid = general_config["uuid"];
+    //     qDebug() << "btw config dir:" << config_dir;
+    // }
+    // qDebug() << "Generated UUID:" << uuid;
+    // qDebug() << "Config file UUID:" << config_uuid;
+    auto machine_name = QString();
+    int i = 0;
+    int ram_granularity = 0;
+    // Machine
+    for (int ci = 0; ci < machine_count(); ++ci) {
+        if (machine_available(ci)) {
+                if (machines[ci].internal_name == machine_config["machine"]) {
+                    machine_name = machines[ci].name;
+                    ram_granularity = machines[ci].ram.step;
+                }
+        }
+    }
+    display_table[VMManager::Display::Name::Machine] = machine_name;
+
+    // CPU: Combine name with speed and FPU
+    QString cpu_name = "Unknown";
+    while (cpu_families[i].package != 0) {
+        if (cpu_families[i].internal_name == machine_config["cpu_family"]) {
+            int j = 0;
+            cpu_name = QString("%1 %2").arg(cpu_families[i].manufacturer, cpu_families[i].name);
+            while (cpu_families[i].cpus[j].cpu_type != 0) {
+                if (cpu_families[i].cpus[j].rspeed == machine_config["cpu_speed"].toUInt()) {
+                    auto cpu_speed = QString(cpu_families[i].cpus[j].name).split("/").at(0).split(" (").at(0);
+                    cpu_name.append(cpu_speed.prepend(" / "));
+                    cpu_name.append(QCoreApplication::translate("", "MHz").prepend(' '));
+                    if (machine_config.contains("fpu_type") && (machine_config["fpu_type"] != QString("none")) && (machine_config["fpu_type"] != QString("internal"))) {
+                        int k = 0;
+                        while (cpu_families[i].cpus[j].fpus[k].internal_name != nullptr) {
+                            if (QString(cpu_families[i].cpus[j].fpus[k].internal_name) == machine_config["fpu_type"]) {
+                                cpu_name.append(QString(cpu_families[i].cpus[j].fpus[k].name).prepend(", "));
+                                cpu_name.append(QCoreApplication::translate("", "FPU").prepend(' '));
+                                break;
+                            }
+                            k++;
+                        }
+                    }
+                    break;
+                }
+                j++;
+            }
+            break;
+        }
+        i++;
+    }
+//    int speed_display = machine_config["cpu_speed"].toInt() / 1000000;
+//    cpu_name.append(QString::number(speed_display).prepend(" / "));
+//    cpu_name.append(QCoreApplication::translate("", "MHz").prepend(' '));
+    display_table[VMManager::Display::Name::CPU] = cpu_name;
+
+    // Memory
+    int divisor = (ram_granularity < 1024) ? 1 : 1024;
+    QString display_unit = (divisor == 1) ? "KB" : "MB";
+    auto mem_display = QString::number(machine_config["mem_size"].toInt() / divisor);
+    mem_display.append(QCoreApplication::translate("", display_unit.toUtf8().constData()).prepend(' '));
+    display_table[VMManager::Display::Name::Memory] = mem_display;
+
+    // Video card
+    int video_int = video_get_video_from_internal_name(video_config["gfxcard"].toUtf8().data());
+    const device_t* video_dev = video_card_getdevice(video_int);
+    display_table[VMManager::Display::Name::Video] = DeviceConfig::DeviceName(video_dev, video_get_internal_name(video_int), 1);
+
+    // Secondary video
+    if (video_config.contains("gfxcard_2")) {
+        int video2_int = video_get_video_from_internal_name(video_config["gfxcard_2"].toUtf8().data());
+        const device_t* video2_dev = video_card_getdevice(video2_int);
+        display_table[VMManager::Display::Name::Video].append(DeviceConfig::DeviceName(video2_dev, video_get_internal_name(video2_int), 1).prepend(VMManagerDetailSection::sectionSeparator));
+    }
+
+    // Add-on video that's not Voodoo
+    if (video_config.contains("8514a") && (video_config["8514a"].toInt() != 0))
+        display_table[VMManager::Display::Name::Video].append(tr("IBM 8514/A Graphics").prepend(VMManagerDetailSection::sectionSeparator));
+    if (video_config.contains("xga") && (video_config["xga"].toInt() != 0))
+        display_table[VMManager::Display::Name::Video].append(tr("XGA Graphics").prepend(VMManagerDetailSection::sectionSeparator));
+    if (video_config.contains("da2") && (video_config["da2"].toInt() != 0))
+        display_table[VMManager::Display::Name::Video].append(tr("IBM PS/55 Display Adapter Graphics").prepend(VMManagerDetailSection::sectionSeparator));
+
+    // Voodoo
+    QString voodoo_name = "";
+    if (video_config.contains("voodoo") && (video_config["voodoo"].toInt() != 0)) {
+        char temp[512];
+        device_get_name(&voodoo_device, 0, temp);
+        auto voodoo_config = getCategory(QString(temp));
+        int voodoo_type = voodoo_config["type"].toInt();
+        switch (voodoo_type) {
+            case 0:
+            default:
+                voodoo_name = tr("3Dfx Voodoo Graphics");
+                break;
+            case 1:
+                voodoo_name = tr("Obsidian SB50 + Amethyst (2 TMUs)");
+                break;
+            case 2:
+                voodoo_name = tr("3Dfx Voodoo 2");
+                break;
+        }
+    }
+    display_table[VMManager::Display::Name::Voodoo] = voodoo_name;
+
+    // Drives
+    // First the number of disks
+    QMap<QString, int> disks;
+    for(const auto& key: disk_config.keys()) {
+        // Assuming the format hdd_NN_*
+        QStringList pieces = key.split('_');
+        QString disk = QString("%1_%2").arg(pieces.at(0), pieces.at(1));
+        if(!disk.isEmpty()) {
+            disks[disk] = 1;
+        }
+    }
+    // Next, the types
+    QHash<QString, int> bus_types;
+    for (const auto& key: disks.keys()) {
+        auto        disk_parameter_key = QString("%1_parameters").arg(key);
+        QStringList pieces = disk_config[disk_parameter_key].split(",");
+        QString bus_type = pieces.value(pieces.length() - 1).trimmed();
+        bus_types[bus_type] = 1;
+    }
+    QString disks_display = tr("%n disk(s)", "", disks.count());
+    if (disks.count()) {
+        disks_display.append(" / ").append(bus_types.keys().join(", ").toUpper());
+    }
+//    display_table[VMManager::Display::Name::Disks] = disks_display;
+
+    // Drives
+    QString new_disk_display;
+    for (const auto& key: disks.keys()) {
+        auto        disk_parameter_key = QString("%1_parameters").arg(key);
+        // Converting a string to an int back to a string to remove the zero (e.g. 01 to 1)
+        auto disk_number = QString::number(key.split("_").last().toInt());
+        QStringList pieces = disk_config[disk_parameter_key].split(",");
+        QString sectors = pieces.value(0).trimmed();
+        QString heads = pieces.value(1).trimmed();
+        QString cylinders = pieces.value(2).trimmed();
+        QString bus_type = pieces.value(pieces.length() - 1).trimmed();
+        // Add separator for each subsequent value, skipping the first
+        if(!new_disk_display.isEmpty()) {
+            new_disk_display.append(QString("%1").arg(VMManagerDetailSection::sectionSeparator));
+        }
+        int diskSizeRaw = (cylinders.toInt() * heads.toInt() * sectors.toInt()) >> 11;
+        QString diskSizeFinal;
+        QString unit = tr("MiB");
+        if(diskSizeRaw > 1000) {
+            unit = tr("GiB");
+            diskSizeFinal = QString::number(diskSizeRaw * 1.0 / 1000, 'f', 1);
+        } else {
+            diskSizeFinal = QString::number(diskSizeRaw);
+        }
+        // Only prefix each disk when there are multiple disks
+        QString diskNumberDisplay = disks.count() > 1 ? tr("Disk %1: ").arg(disk_number) : "";
+        new_disk_display.append(QString("%1%2 %3 (%4)").arg(diskNumberDisplay, diskSizeFinal, unit, bus_type.toUpper()));
+    }
+    if(new_disk_display.isEmpty()) {
+        new_disk_display = tr("No disks");
+    }
+    display_table[VMManager::Display::Name::Disks] = new_disk_display;
+
+    // Floppy & CD-ROM
+    QStringList floppyDevices;
+    QStringList cdromDevices;
+    // Special case: first two 5.25" 360k FDDs which don't get saved to the .cfg
+    for (int i = 0; i < 2; i++) {
+        if (!floppy_cdrom_config.contains(QString("fdd_0%1_type").arg(i + 1)))
+            floppyDevices.append(QString(fdd_getname(fdd_get_from_internal_name((char *) "525_2dd"))));
+    }
+
+    static auto floppy_match = QRegularExpression("fdd_\\d\\d_type", QRegularExpression::CaseInsensitiveOption);
+    static auto cdrom_match  = QRegularExpression("cdrom_\\d\\d_type", QRegularExpression::CaseInsensitiveOption);
+    for(const auto& key: floppy_cdrom_config.keys()) {
+        if(key.contains(floppy_match)) {
+            // auto device_number = key.split("_").at(1);
+            auto floppy_internal_name = QString(floppy_cdrom_config[key]);
+            // Not interested in the nones
+            if(floppy_internal_name == "none") {
+                continue;
+            }
+            auto floppy_type = fdd_get_from_internal_name(floppy_internal_name.toUtf8().data());
+            if(auto fddName = QString(fdd_getname(floppy_type)); !fddName.isEmpty()) {
+                floppyDevices.append(fddName);
+            }
+        }
+        if(key.contains(cdrom_match)) {
+            auto device_number = key.split("_").at(1);
+            auto cdrom_internal_name = QString(floppy_cdrom_config[key]);
+            auto cdrom_type = cdrom_get_from_internal_name(cdrom_internal_name.toUtf8().data());
+
+            auto cdrom_speed_key = QString("cdrom_%1_speed").arg(device_number);
+            auto cdrom_parameters_key = QString("cdrom_%1_parameters").arg(device_number);
+            auto cdrom_speed = QString(floppy_cdrom_config[cdrom_speed_key]);
+            auto cdrom_parameters = QString(floppy_cdrom_config[cdrom_parameters_key]);
+            auto cdrom_bus = cdrom_parameters.split(",").at(1).trimmed().toUpper();
+
+            if(cdrom_type != -1) {
+                if(!cdrom_speed.isEmpty()) {
+                    cdrom_speed = QString("%1x ").arg(cdrom_speed);
+                }
+                if(!cdrom_bus.isEmpty()) {
+                    cdrom_bus = QString(" (%1)").arg(cdrom_bus);
+                }
+                cdromDevices.append(QString("%1%2 %3 %4%5").arg(cdrom_speed, cdrom_drive_types[cdrom_type].vendor, cdrom_drive_types[cdrom_type].model, cdrom_drive_types[cdrom_type].revision, cdrom_bus));
+            }
+        }
+    }
+
+    display_table[VMManager::Display::Name::Floppy] = floppyDevices.join(VMManagerDetailSection::sectionSeparator);
+    display_table[VMManager::Display::Name::CD]     = cdromDevices.join(VMManagerDetailSection::sectionSeparator);
+
+    // Removable disks & MO
+    QStringList rdiskDevices;
+    QStringList moDevices;
+    static auto rdisk_match = QRegularExpression("rdisk_\\d\\d_parameters", QRegularExpression::CaseInsensitiveOption);
+    static auto zip_match   = QRegularExpression("zip_\\d\\d_parameters", QRegularExpression::CaseInsensitiveOption); // Legacy ZIP drive entries
+    static auto mo_match    = QRegularExpression("mo_\\d\\d_parameters", QRegularExpression::CaseInsensitiveOption);
+    for(const auto& key: rdisk_mo_config.keys()) {
+        if(key.contains(rdisk_match) || key.contains(zip_match)) {
+            auto device_number = key.split("_").at(1);
+            auto rdisk_parameters = QString(rdisk_mo_config[key]);
+            auto rdisk_type = rdisk_parameters.split(",").at(0).toInt();
+            if (key.contains(zip_match))
+                rdisk_type++;
+            auto rdisk_bus =  rdisk_parameters.split(",").at(1).trimmed().toUpper();
+
+            if((rdisk_type >= 0) && (rdisk_type < KNOWN_RDISK_DRIVE_TYPES)) {
+                if(!rdisk_bus.isEmpty())
+                    rdisk_bus = QString(" (%1)").arg(rdisk_bus);
+                rdiskDevices.append(QString("%1 %2%3").arg(rdisk_drive_types[rdisk_type].vendor, rdisk_drive_types[rdisk_type].model, rdisk_bus));
+            }
+        }
+        if(key.contains(mo_match)) {
+            auto device_number = key.split("_").at(1);
+            auto mo_parameters = QString(rdisk_mo_config[key]);
+            auto mo_type = mo_parameters.split(",").at(0).toInt();
+            auto mo_bus  = mo_parameters.split(",").at(1).trimmed().toUpper();
+
+            if((mo_type >= 0) && (mo_type < KNOWN_MO_DRIVE_TYPES)) {
+                if(!mo_bus.isEmpty())
+                    mo_bus = QString(" (%1)").arg(mo_bus);
+                moDevices.append(QString("%1 %2%3").arg(mo_drive_types[mo_type].vendor, mo_drive_types[mo_type].model, mo_bus));
+            }
+        }
+    }
+
+    display_table[VMManager::Display::Name::RDisk] = rdiskDevices.join(VMManagerDetailSection::sectionSeparator);
+    display_table[VMManager::Display::Name::MO]    = moDevices.join(VMManagerDetailSection::sectionSeparator);
+
+
+    // SCSI controllers
+    QStringList scsiControllers;
+    static auto scsi_match = QRegularExpression("scsicard_\\d", QRegularExpression::CaseInsensitiveOption);
+    for(const auto& key: storage_config.keys()) {
+        if(key.contains(scsi_match)) {
+            auto device_number = key.split("_").at(1);
+            auto scsi_internal_name = QString(storage_config[key]);
+            auto scsi_id = scsi_card_get_from_internal_name(scsi_internal_name.toUtf8().data());
+            auto scsi_device = scsi_card_getdevice(scsi_id);
+            auto scsi_name = DeviceConfig::DeviceName(scsi_device, scsi_card_get_internal_name(scsi_id), 1);
+            if(!scsi_name.isEmpty()) {
+                scsiControllers.append(scsi_name);
+            }
+        }
+    }
+    display_table[VMManager::Display::Name::SCSIController] = scsiControllers.join(VMManagerDetailSection::sectionSeparator);
+
+    // Hard and floppy disk controllers
+    QStringList storageControllers;
+    static auto fdc_match = QRegularExpression("fdc(_\\d)?", QRegularExpression::CaseInsensitiveOption); // futureproofing
+    static auto hdc_match = QRegularExpression("hdc(_\\d)?", QRegularExpression::CaseInsensitiveOption);
+    for(const auto& key: storage_config.keys()) {
+        if(key.contains(fdc_match)) {
+            QString device_number;
+            if (!key.contains('_'))
+                device_number = "1";
+            else // futureproofing
+             device_number = key.split("_").at(1);
+            auto fdc_internal_name = QString(storage_config[key]);
+            if (!fdc_internal_name.isEmpty() && (fdc_internal_name != "none") && (fdc_internal_name != "internal")) {
+                auto fdc_id = fdc_card_get_from_internal_name(fdc_internal_name.toUtf8().data());
+                auto fdc_device = fdc_card_getdevice(fdc_id);
+                auto fdc_name = DeviceConfig::DeviceName(fdc_device, fdc_card_get_internal_name(fdc_id), 1);
+                if(!fdc_name.isEmpty()) {
+                    storageControllers.append(fdc_name);
+                }
+            }
+        }
+        if(key.contains(hdc_match)) {
+            QString device_number;
+            if (!key.contains('_')) // legacy hdc entry
+                device_number = "1";
+            else
+             device_number = key.split("_").at(1);
+            auto hdc_internal_name = QString(storage_config[key]);
+            if (!hdc_internal_name.isEmpty() && (hdc_internal_name != "none") && (hdc_internal_name != "internal")) {
+                auto hdc_id = hdc_get_from_internal_name(hdc_internal_name.toUtf8().data());
+                auto hdc_device = hdc_get_device(hdc_id);
+                auto hdc_name = DeviceConfig::DeviceName(hdc_device, hdc_get_internal_name(hdc_id), 1);
+                if(!hdc_name.isEmpty()) {
+                    storageControllers.append(hdc_name);
+                }
+            }
+        }
+    }
+
+    // CD-ROM controller
+    if (storage_config.contains("cdrom_interface")) {
+        auto cdrom_intf_internal_name = storage_config["cdrom_interface"];
+        if (!cdrom_intf_internal_name.isEmpty() && (cdrom_intf_internal_name != "none") && (cdrom_intf_internal_name != "internal")) {
+            auto cdrom_intf_dev = cdrom_interface_get_from_internal_name(cdrom_intf_internal_name.toUtf8().data());
+            auto cdrom_intf_dev_name = DeviceConfig::DeviceName(cdrom_interface_get_device(cdrom_intf_dev), cdrom_interface_get_internal_name(cdrom_intf_dev), 1);
+            storageControllers.append(cdrom_intf_dev_name);
+        }
+    }
+
+    // Legacy tertiary/quaternary IDE
+    QString ide_ter_internal_name = "ide_ter";
+    QString ide_qua_internal_name = "ide_qua";
+    if (storage_config.contains(ide_ter_internal_name) && (storage_config[ide_ter_internal_name].toInt() != 0))
+        storageControllers.append(DeviceConfig::DeviceName(hdc_get_device(hdc_get_from_internal_name(ide_ter_internal_name.toUtf8().data())), ide_ter_internal_name.toUtf8().constData(), 1));
+    if (storage_config.contains(ide_qua_internal_name) && (storage_config[ide_qua_internal_name].toInt() != 0))
+        storageControllers.append(DeviceConfig::DeviceName(hdc_get_device(hdc_get_from_internal_name(ide_qua_internal_name.toUtf8().data())), ide_qua_internal_name.toUtf8().constData(), 1));
+
+    display_table[VMManager::Display::Name::StorageController] = storageControllers.join(VMManagerDetailSection::sectionSeparator);
+
+    // Audio
+    QStringList sndCards;
+    static auto sndcard_match = QRegularExpression("sndcard\\d?", QRegularExpression::CaseInsensitiveOption);
+    for(const auto& key: audio_config.keys()) {
+        if(key.contains(sndcard_match)) {
+            auto device_number = key.right(1);
+            if(device_number == "d") // card #1 has no number
+                device_number = "1";
+            auto audio_internal_name = QString(audio_config[key]);
+            auto audio_id = sound_card_get_from_internal_name(audio_internal_name.toUtf8().data());
+            auto audio_device = sound_card_getdevice(audio_id);
+            auto audio_name = DeviceConfig::DeviceName(audio_device, sound_card_get_internal_name(audio_id), 1);
+            if(!audio_name.isEmpty()) {
+                sndCards.append(audio_name);
+            }
+        }
+    }
+    if(audio_config.contains("mpu401_standalone")) {
+        sndCards.append(tr("Standalone MPU-401"));
+    }
+    if(sndCards.isEmpty()) {
+        sndCards.append(tr("None"));
+    }
+    display_table[VMManager::Display::Name::Audio] = sndCards.join(VMManagerDetailSection::sectionSeparator);
+
+    // MIDI
+    QString midiOutDev;
+    if (audio_config.contains("midi_device")) {
+        auto midi_out_device = QString(audio_config["midi_device"]);
+        auto midi_device_int = midi_out_device_get_from_internal_name(midi_out_device.toUtf8().data());
+        auto midi_out = midi_out_device_getdevice(midi_device_int);
+        if(auto midiDevName = QString(midi_out->name);  !midiDevName.isEmpty()) {
+            midiOutDev = midiDevName;
+        }
+    }
+    display_table[VMManager::Display::Name::MidiOut] = midiOutDev;
+
+    // midi_device = mt32 (output)
+    // mpu401_standalone = 1
+    // midi_in_device (input)
+
+    // Network
+    QStringList nicList;
+    static auto nic_match = QRegularExpression("net_\\d\\d_card", QRegularExpression::CaseInsensitiveOption);
+    for(const auto& key: network_config.keys()) {
+        if(key.contains(nic_match)) {
+            auto device_number = key.split("_").at(1);
+            auto nic_internal_name = QString(network_config[key]);
+            auto nic_id = network_card_get_from_internal_name(nic_internal_name.toUtf8().data());
+            auto nic = network_card_getdevice(nic_id);
+            auto nic_name = DeviceConfig::DeviceName(nic, network_card_get_internal_name(nic_id), 1);
+            auto net_type_key = QString("net_%1_net_type").arg(device_number);
+            auto net_type = network_config[net_type_key];
+            if (!net_type.isEmpty()) {
+                if (net_type == "slirp")
+                    net_type = "SLiRP";
+                else if (net_type == "pcap")
+                    net_type = "PCap";
+                else if (net_type == "nmswitch")
+                    net_type = tr("Local Switch");
+                else if (net_type == "nrswitch")
+                    net_type = tr("Remote Switch");
+                else
+                    net_type = net_type.toUpper();
+                nicList.append(nic_name + " (" + net_type + ")");
+            } else {
+                nicList.append(nic_name);
+            }
+
+        }
+    }
+    if(nicList.isEmpty()) {
+        nicList.append(tr("None"));
+    }
+    display_table[VMManager::Display::Name::NIC] = nicList.join(VMManagerDetailSection::sectionSeparator);
+
+    // Input (Keyboard)
+    if (input_config.contains("keyboard_type")) {
+        auto keyboard_internal_name = input_config["keyboard_type"];
+        auto keyboard_dev = keyboard_get_from_internal_name(keyboard_internal_name.toUtf8().data());
+        auto keyboard_dev_name = DeviceConfig::DeviceName(keyboard_get_device(keyboard_dev), keyboard_get_internal_name(keyboard_dev), 0);
+        display_table[VMManager::Display::Name::Keyboard] = keyboard_dev_name;
+    }
+
+    // Input (Mouse)
+    auto mouse_internal_name = input_config["mouse_type"];
+    auto mouse_dev = mouse_get_from_internal_name(mouse_internal_name.toUtf8().data());
+    auto mouse_dev_name = DeviceConfig::DeviceName(mouse_get_device(mouse_dev), mouse_get_internal_name(mouse_dev), 0);
+    display_table[VMManager::Display::Name::Mouse] = mouse_dev_name;
+
+    // Input (joystick)
+    QString joystickDevice;
+    if(input_config.contains("joystick_type")) {
+        auto joystick_internal = QString(input_config["joystick_type"]);
+        auto joystick_dev = joystick_get_from_internal_name(joystick_internal.toUtf8().data());
+        if (auto joystickName = tr(joystick_get_name(joystick_dev)); !joystickName.isEmpty()) {
+            joystickDevice = joystickName;
+        }
+    }
+    display_table[VMManager::Display::Name::Joystick] = joystickDevice;
+
+    // # Ports
+    // Serial
+    // By default serial 1 and 2 are enabled unless otherwise specified
+    static auto serial_match = QRegularExpression("serial\\d_enabled", QRegularExpression::CaseInsensitiveOption);
+    QList<bool> serial_enabled = {true, true, false, false, false, false, false, false};
+    // Parallel
+    // By default lpt 1 is enabled unless otherwise specified
+    static auto lpt_match = QRegularExpression("lpt\\d_enabled", QRegularExpression::CaseInsensitiveOption);
+    QList<bool> lpt_enabled = {true, false, false, false};
+    for (const auto &key: ports_config.keys()) {
+        if (key.contains(serial_match)) {
+            if (auto serial_dev = key.split("_").at(0); !serial_dev.isEmpty()) {
+                auto serial_num = serial_dev.at(serial_dev.size() - 1);
+                // qDebug() << "serial is set" << key << ":" << ports_config[key];
+                if(serial_num.isDigit() && serial_num.digitValue() >= 1 && serial_num.digitValue() <= 4) {
+                    // Already verified that it is a digit with isDigit()
+                    serial_enabled[serial_num.digitValue() - 1] = ports_config[key].toInt() == 1;
+                }
+            }
+        }
+        if (key.contains(lpt_match)) {
+            if (auto lpt_dev = key.split("_").at(0); !lpt_dev.isEmpty()) {
+                auto lpt_num = lpt_dev.at(lpt_dev.size() - 1);
+                // qDebug() << "lpt is set" << key << ":" << ports_config[key];
+                if (lpt_num.isDigit() && lpt_num.digitValue() >= 1 && lpt_num.digitValue() <= 4) {
+                    lpt_enabled[lpt_num.digitValue() - 1] = ports_config[key].toInt() == 1;
+                }
+            }
+        }
+    }
+    // qDebug() << "ports final" << serial_enabled << lpt_enabled;
+    QStringList serialFinal;
+    QStringList lptFinal;
+    int portIndex = 0;
+    while (true) {
+        if (serial_enabled[portIndex])
+            serialFinal.append(QString("COM%1").arg(portIndex + 1));
+        ++portIndex;
+        if (portIndex == SERIAL_MAX)
+            break;
+    }
+    portIndex = 0;
+    bool hasLptDevices = false;
+    while (true) {
+        if (lpt_enabled[portIndex]) {
+            auto lpt_device_key = QString("lpt%1_device").arg(portIndex + 1);
+            QString lpt_device_name = "";
+            if (ports_config.contains(lpt_device_key)) {
+                auto lpt_internal_name = QString(ports_config[lpt_device_key]);
+                auto lpt_id = lpt_device_get_from_internal_name(lpt_internal_name.toUtf8().data());
+                lpt_device_name = " (" + tr(lpt_device_get_name(lpt_id)) + ")";
+                hasLptDevices = true;
+            }
+            lptFinal.append(QString("LPT%1%2").arg(portIndex + 1).arg(lpt_device_name));
+        }
+        ++portIndex;
+        if (portIndex == PARALLEL_MAX)
+            break;
+    }
+    display_table[VMManager::Display::Name::Serial]   = (serialFinal.empty() ?  tr("None") : serialFinal.join(", "));
+    display_table[VMManager::Display::Name::Parallel] = (lptFinal.empty()    ?  tr("None") : lptFinal.join((hasLptDevices ? VMManagerDetailSection::sectionSeparator : ", ")));
+
+    // ISA RTC
+    QString isartc_dev_name = "";
+    if (other_config.contains("isartc_type")) {
+        auto isartc_internal_name = other_config["isartc_type"];
+        auto isartc_dev = isartc_get_from_internal_name(isartc_internal_name.toUtf8().data());
+        isartc_dev_name = DeviceConfig::DeviceName(isartc_get_device(isartc_dev), isartc_get_internal_name(isartc_dev), 0);
+    }
+    display_table[VMManager::Display::Name::IsaRtc] = isartc_dev_name;
+
+    // ISA RAM
+    QStringList IsaMemCards;
+    static auto isamem_match = QRegularExpression("isamem\\d_type", QRegularExpression::CaseInsensitiveOption);
+    for(const auto& key: other_config.keys()) {
+        if(key.contains(isamem_match)) {
+            auto device_number = QString("%1").arg(key.split("_").at(0).right(1).toInt() + 1);
+            auto isamem_internal_name = QString(other_config[key]);
+            auto isamem_id = isamem_get_from_internal_name(isamem_internal_name.toUtf8().data());
+            auto isamem_device = isamem_get_device(isamem_id);
+            auto isamem_name = DeviceConfig::DeviceName(isamem_device, isamem_get_internal_name(isamem_id), 0);
+            if(!isamem_name.isEmpty()) {
+                IsaMemCards.append(isamem_name);
+            }
+        }
+    }
+    display_table[VMManager::Display::Name::IsaMem] = IsaMemCards.join(VMManagerDetailSection::sectionSeparator);
+
+    // ISA ROM
+    QStringList IsaRomCards;
+    static auto isarom_match = QRegularExpression("isarom\\d_type", QRegularExpression::CaseInsensitiveOption);
+    for(const auto& key: other_config.keys()) {
+        if(key.contains(isarom_match)) {
+            auto device_number = QString("%1").arg(key.split("_").at(0).right(1).toInt() + 1);
+            auto isarom_internal_name = QString(other_config[key]);
+            auto isarom_id = isarom_get_from_internal_name(isarom_internal_name.toUtf8().data());
+            auto isarom_device = isarom_get_device(isarom_id);
+            auto isarom_name = DeviceConfig::DeviceName(isarom_device, isarom_get_internal_name(isarom_id), 0);
+            if(!isarom_name.isEmpty()) {
+                IsaRomCards.append(isarom_name);
+            }
+        }
+    }
+    display_table[VMManager::Display::Name::IsaRom] = IsaRomCards.join(VMManagerDetailSection::sectionSeparator);
+}
+
+bool
+VMManagerSystem::startServer() {
+    if (socket_server->startServer()) {
+        serverIsRunning = true;
+        connect(socket_server, &VMManagerServerSocket::dataReceived, this, &VMManagerSystem::dataReceived);
+        connect(socket_server, &VMManagerServerSocket::windowStatusChanged, this, &VMManagerSystem::windowStatusChangeReceived);
+        connect(socket_server, &VMManagerServerSocket::runningStatusChanged, this, &VMManagerSystem::runningStatusChangeReceived);
+        connect(socket_server, &VMManagerServerSocket::configurationChanged, this, &VMManagerSystem::configurationChangeReceived);
+        connect(socket_server, &VMManagerServerSocket::globalConfigurationChanged, this, &VMManagerSystem::globalConfigurationChanged);
+        connect(socket_server, &VMManagerServerSocket::winIdReceived, this, [this] (WId id) { this->id = id; });
+        return true;
+    } else {
+        return false;
+    }
+}
+
+void
+VMManagerSystem::setProcessEnvVars() {
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+    QString env_var_name = (socket_server_type == VMManagerServerSocket::ServerType::Standard) ? "VMM_86BOX_SOCKET" : "86BOX_MANAGER_SOCKET";
+    env.insert(env_var_name, socket_server->getSocketPath());
+    process->setProcessEnvironment(env);
+}
+
+void
+VMManagerSystem::restartButtonPressed() {
+    socket_server->serverSendMessage(VMManagerProtocol::ManagerMessage::ResetVM);
+
+}
+
+void
+VMManagerSystem::pauseButtonPressed() {
+    socket_server->serverSendMessage(VMManagerProtocol::ManagerMessage::Pause);
+}
+void
+VMManagerSystem::dataReceived()
+{
+    qInfo() << Q_FUNC_INFO << "Note: Respond to data received events here.";
+}
+void
+VMManagerSystem::windowStatusChangeReceived(int status)
+{
+    window_obscured = status;
+    emit windowStatusChanged();
+    processStatusChanged();
+}
+QString
+VMManagerSystem::getDisplayValue(VMManager::Display::Name key)
+{
+    return (display_table.contains(key)) ? display_table[key] : "";
+}
+
+void
+VMManagerSystem::sendGlobalConfigurationChanged()
+{
+    socket_server->serverSendMessage(VMManagerProtocol::ManagerMessage::GlobalConfigurationChanged);
+}
+
+void
+VMManagerSystem::shutdownRequestButtonPressed()
+{
+    socket_server->serverSendMessage(VMManagerProtocol::ManagerMessage::RequestShutdown);
+}
+
+void
+VMManagerSystem::shutdownForceButtonPressed()
+{
+    socket_server->serverSendMessage(VMManagerProtocol::ManagerMessage::ForceShutdown);
+}
+
+void
+VMManagerSystem::cadButtonPressed()
+{
+    socket_server->serverSendMessage(VMManagerProtocol::ManagerMessage::CtrlAltDel);
+}
+
+void
+VMManagerSystem::processStatusChanged()
+{
+    // set to running if the process is running and the state is stopped
+    if (process->state() == QProcess::ProcessState::Running) {
+        if (process_status == VMManagerSystem::ProcessStatus::Stopped) {
+            process_status = VMManagerSystem::ProcessStatus::Running;
+        }
+    } else if (process->state() == QProcess::ProcessState::NotRunning) {
+        process_status = VMManagerSystem::ProcessStatus::Stopped;
+        window_obscured = false;
+    }
+    emit itemDataChanged();
+    emit clientProcessStatusChanged();
+}
+void
+VMManagerSystem::statusRefresh()
+{
+    processStatusChanged();
+}
+QString
+VMManagerSystem::processStatusToString(VMManagerSystem::ProcessStatus status)
+{
+//    QMetaEnum qme = QMetaEnum::fromType<VMManagerSystem::ProcessStatus>();
+//    return qme.valueToKey(static_cast<int>(status));
+        switch (status) {
+            case VMManagerSystem::ProcessStatus::Stopped:
+                return tr("Powered Off");
+            case VMManagerSystem::ProcessStatus::Running:
+                return tr("Running");
+            case VMManagerSystem::ProcessStatus::Paused:
+                return tr("Paused");
+            case VMManagerSystem::ProcessStatus::PausedWaiting:
+            case VMManagerSystem::ProcessStatus::RunningWaiting:
+                return QString("%1 (%2)").arg(tr("Paused"), tr("Waiting"));
+            default:
+                return tr("Unknown Status");
+        }
+}
+
+QString
+VMManagerSystem::getProcessStatusString() const
+{
+    return processStatusToString(process_status);
+}
+
+VMManagerSystem::ProcessStatus
+VMManagerSystem::getProcessStatus() const
+{
+    return process_status;
+}
+// Maps VMManagerProtocol::RunningState to VMManagerSystem::ProcessStatus
+void
+VMManagerSystem::runningStatusChangeReceived(VMManagerProtocol::RunningState state)
+{
+    if(state == VMManagerProtocol::RunningState::Running) {
+        process_status = VMManagerSystem::ProcessStatus::Running;
+        window_obscured = false;
+        windowStatusChanged();
+    } else if(state == VMManagerProtocol::RunningState::Paused) {
+        process_status = VMManagerSystem::ProcessStatus::Paused;
+        window_obscured = false;
+        windowStatusChanged();
+    } else if(state == VMManagerProtocol::RunningState::RunningWaiting) {
+        process_status = VMManagerSystem::ProcessStatus::RunningWaiting;
+        window_obscured = true;
+        windowStatusChanged();
+    } else if(state == VMManagerProtocol::RunningState::PausedWaiting) {
+        process_status = VMManagerSystem::ProcessStatus::PausedWaiting;
+        window_obscured = true;
+        windowStatusChanged();
+    } else {
+        process_status = VMManagerSystem::ProcessStatus::Unknown;
+    }
+    processStatusChanged();
+}
+void
+VMManagerSystem::configurationChangeReceived()
+{
+    reloadConfig();
+    emit configurationChanged(this->uuid);
+}
+void
+VMManagerSystem::reloadConfig()
+{
+    loadSettings();
+    setupVars();
+}
+
+QDateTime
+VMManagerSystem::timestamp()
+{
+    return lastUsedTimestamp;
+}
+void
+VMManagerSystem::setIcon(const QString &newIcon)
+{
+    icon = newIcon;
+    saveSettings();
+    emit itemDataChanged();
+}
diff --git a/src/qt/qt_vmmanager_system.hpp b/src/qt/qt_vmmanager_system.hpp
new file mode 100644
index 000000000..e40e2d4e1
--- /dev/null
+++ b/src/qt/qt_vmmanager_system.hpp
@@ -0,0 +1,208 @@
+/*
+* 86Box	A hypervisor and IBM PC system emulator that specializes in
+*		running old operating systems and software designed for IBM
+*		PC systems and compatibles from 1981 through fairly recent
+*		system designs based on the PCI bus.
+*
+*		This file is part of the 86Box distribution.
+*
+*		Header for 86Box VM manager system module
+*
+*
+*
+* Authors:	cold-brewed
+*
+*		Copyright 2024 cold-brewed
+*/
+
+#ifndef QT_VMMANAGER_SYSTEM_H
+#define QT_VMMANAGER_SYSTEM_H
+
+#include <QFileInfo>
+#include <QDir>
+#include <QProcess>
+#include <QLocalServer>
+#include <QWidget>
+#include "qt_vmmanager_serversocket.hpp"
+#include "qt_vmmanager_config.hpp"
+#include "qt_deviceconfig.hpp"
+
+// This macro helps give us the required `qHash()` function in order to use the
+// enum as a hash key
+#define QHASH_FOR_CLASS_ENUM(T) \
+inline uint qHash(const T &t, uint seed) { \
+    return ::qHash(static_cast<typename std::underlying_type<T>::type>(t), seed); \
+}
+
+namespace VMManager {
+Q_NAMESPACE
+namespace Display {
+Q_NAMESPACE
+enum class Name {
+    Machine,
+    CPU,
+    Memory,
+    Video,
+    Disks,
+    Floppy,
+    CD,
+    RDisk,
+    MO,
+    SCSIController,
+    StorageController,
+    MidiOut,
+    Joystick,
+    Serial,
+    Parallel,
+    Audio,
+    Voodoo,
+    NIC,
+    Keyboard,
+    Mouse,
+    IsaRtc,
+    IsaMem,
+    IsaRom,
+    Unknown
+};
+Q_ENUM_NS(Name)
+QHASH_FOR_CLASS_ENUM(Name)
+}
+}
+
+class VMManagerSystem : public QWidget {
+    Q_OBJECT
+
+    typedef QHash<VMManager::Display::Name, QString> display_table_t;
+    typedef QHash <QString, QHash <QString, QString>> config_hash_t;
+
+public:
+
+    enum class ProcessStatus {
+        Stopped,
+        Running,
+        Paused,
+        PausedWaiting,
+        RunningWaiting,
+        Unknown,
+    };
+    Q_ENUM(ProcessStatus);
+
+    explicit VMManagerSystem(const QString &sysconfig_file);
+    // Default constructor will generate a temporary filename as the config file
+    // but it will not be valid (isValid() will return false)
+    VMManagerSystem() : VMManagerSystem(generateTemporaryFilename()) {}
+
+    ~VMManagerSystem() override;
+
+    static QVector<VMManagerSystem *> scanForConfigs(QWidget* parent = nullptr, const QString &searchPath = {});
+    static QString generateTemporaryFilename();
+
+    QFileInfo   config_file;
+    QString     config_name;
+    QString     config_dir;
+    QString     shortened_dir;
+    QString     uuid;
+    QString     displayName;
+    QString     notes;
+    QString     icon;
+    QStringList searchTerms;
+
+    config_hash_t config_hash;
+
+    [[nodiscard]] QString getAll(const QString& category) const;
+    [[nodiscard]] QHash <QString, QString> getCategory(const QString& category) const;
+    [[nodiscard]] QHash <QString, QHash <QString, QString>> getConfigHash() const;
+
+    void setDisplayName(const QString& newDisplayName);
+    void setNotes(const QString& newNotes);
+
+    [[nodiscard]] bool isValid() const;
+    [[nodiscard]] bool isProcessRunning() const;
+    [[nodiscard]] qint64 processId() const;
+public slots:
+    void launchMainProcess();
+    void launchSettings();
+    void startButtonPressed();
+    void restartButtonPressed();
+    void pauseButtonPressed();
+    void shutdownRequestButtonPressed();
+    void shutdownForceButtonPressed();
+    void cadButtonPressed();
+    void reloadConfig();
+    void sendGlobalConfigurationChanged();
+public:
+    QDateTime timestamp();
+    void setIcon(const QString &newIcon);
+
+    QProcess *process = new QProcess();
+
+    bool window_obscured;
+    bool config_signal_connected = false;
+
+    QString getDisplayValue(VMManager::Display::Name key);
+    QFileInfoList getScreenshots();
+
+    inline bool operator==(const VMManagerSystem &rhs) const
+    {
+        return config_file.filePath() == rhs.config_file.filePath();
+    }
+
+    static QString
+    processStatusToString(VMManagerSystem::ProcessStatus status) ;
+    ProcessStatus process_status;
+    [[nodiscard]] QString getProcessStatusString() const;
+    [[nodiscard]] ProcessStatus getProcessStatus() const;
+
+signals:
+    void windowStatusChanged();
+    void itemDataChanged();
+    void clientProcessStatusChanged();
+    void configurationChanged(const QString &uuid);
+    void globalConfigurationChanged();
+
+private:
+    void loadSettings();
+    void saveSettings();
+    void generateSearchTerms();
+    void updateTimestamp();
+
+    display_table_t display_table;
+
+    QFileInfo main_binary;
+    QString platform;
+
+    // QDir application_temp_directory;
+    // QDir standard_temp_directory;
+    // QDir app_data_directory;
+    QDir screenshot_directory;
+
+    QString unique_name;
+    QDateTime   lastUsedTimestamp;
+
+    VMManagerServerSocket            *socket_server;
+    VMManagerServerSocket::ServerType socket_server_type;
+
+    // Configuration file settings
+    VMManagerConfig *config_settings;
+
+    WId id;
+
+    bool serverIsRunning;
+    bool startServer();
+
+    bool has86BoxBinary();
+    void find86BoxBinary();
+    void setupPaths();
+    void setupVars();
+    void setProcessEnvVars();
+
+    void dataReceived();
+    void windowStatusChangeReceived(int status);
+    void runningStatusChangeReceived(VMManagerProtocol::RunningState state);
+    void configurationChangeReceived();
+    void processStatusChanged();
+    void statusRefresh();
+};
+
+
+#endif //QT_VMMANAGER_SYSTEM_H
diff --git a/src/qt/qt_vmmanager_windarkmodefilter.cpp b/src/qt/qt_vmmanager_windarkmodefilter.cpp
new file mode 100644
index 000000000..c95bc0c0f
--- /dev/null
+++ b/src/qt/qt_vmmanager_windarkmodefilter.cpp
@@ -0,0 +1,105 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Generic Windows native event filter for dark mode handling
+ *
+ *
+ *
+ * Authors: Teemu Korhonen
+ *          Cacodemon345
+ *
+ *          Copyright 2021 Teemu Korhonen
+ *          Copyright 2024-2025 Cacodemon345.
+ */
+
+#include "qt_vmmanager_windarkmodefilter.hpp"
+
+#include <QDebug>
+#include <QTextStream>
+#include <QFile>
+#include <QApplication>
+#include <QTimer>
+
+#include <windows.h>
+#include <dwmapi.h>
+#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE
+#define DWMWA_USE_IMMERSIVE_DARK_MODE 20
+#endif
+
+#include <86box/86box.h>
+#include <86box/plat.h>
+
+#include "qt_util.hpp"
+
+static bool NewDarkMode = FALSE;
+
+void
+WindowsDarkModeFilter::reselectDarkMode()
+{
+    bool OldDarkMode = NewDarkMode;
+
+    if (!util::isWindowsLightTheme()) {
+        QFile f(":qdarkstyle/dark/darkstyle.qss");
+
+        if (!f.exists())
+            printf("Unable to set stylesheet, file not found\n");
+        else {
+            f.open(QFile::ReadOnly | QFile::Text);
+            QTextStream ts(&f);
+            qApp->setStyleSheet(ts.readAll());
+        }
+        QPalette palette(qApp->palette());
+        palette.setColor(QPalette::Link, Qt::white);
+        palette.setColor(QPalette::LinkVisited, Qt::lightGray);
+        qApp->setPalette(palette);
+        window->resize(window->size());
+
+        NewDarkMode = TRUE;
+    } else {
+        qApp->setStyleSheet("");
+        QPalette palette(qApp->palette());
+        palette.setColor(QPalette::Link, Qt::blue);
+        palette.setColor(QPalette::LinkVisited, Qt::magenta);
+        qApp->setPalette(palette);
+        window->resize(window->size());
+        NewDarkMode = FALSE;
+    }
+    window->updateDarkMode();
+
+    if (NewDarkMode != OldDarkMode)  QTimer::singleShot(1000, [this] () {
+            BOOL DarkMode = NewDarkMode;
+            DwmSetWindowAttribute((HWND) window->winId(),
+                                  DWMWA_USE_IMMERSIVE_DARK_MODE,
+                                  (LPCVOID) &DarkMode,
+                                  sizeof(DarkMode));
+        });
+}
+
+void
+WindowsDarkModeFilter::setWindow(VMManagerMainWindow *window)
+{
+    this->window = window;
+}
+
+bool
+WindowsDarkModeFilter::nativeEventFilter(const QByteArray &eventType, void *message, result_t *result)
+{
+    if ((window != nullptr) && (eventType == "windows_generic_MSG")) {
+        MSG *msg = static_cast<MSG *>(message);
+
+        if ((msg != nullptr) && (msg->message == WM_SETTINGCHANGE)) {
+            if ((((void *) msg->lParam) != nullptr) &&
+                (wcscmp(L"ImmersiveColorSet", (wchar_t*)msg->lParam) == 0) &&
+                color_scheme == 0) {
+                reselectDarkMode();
+            }
+        }
+    }
+
+    return false;
+}
diff --git a/src/qt/qt_vmmanager_windarkmodefilter.hpp b/src/qt/qt_vmmanager_windarkmodefilter.hpp
new file mode 100644
index 000000000..e89b22acd
--- /dev/null
+++ b/src/qt/qt_vmmanager_windarkmodefilter.hpp
@@ -0,0 +1,48 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Header file for Windows dark mode native messages filter
+ *
+ *
+ *
+ * Authors: Teemu Korhonen
+ *
+ *          Copyright 2022 Teemu Korhonen
+ */
+
+#ifndef QT_WINDOWSDARKMODEEVENTFILTER_HPP
+#define QT_WINDOWSDARKMODEEVENTFILTER_HPP
+
+#include <QObject>
+#include <QAbstractNativeEventFilter>
+#include <QByteArray>
+#include <QEvent>
+#include <QWindow>
+
+#include "qt_vmmanager_mainwindow.hpp"
+
+#if QT_VERSION_MAJOR >= 6
+#    define result_t qintptr
+#else
+#    define result_t long
+#endif
+
+class WindowsDarkModeFilter : public QObject, public QAbstractNativeEventFilter {
+    Q_OBJECT
+
+public:
+    WindowsDarkModeFilter() = default;
+    void setWindow(VMManagerMainWindow *window);
+    bool nativeEventFilter(const QByteArray &eventType, void *message, result_t *result) override;
+    void reselectDarkMode();
+
+private:
+    VMManagerMainWindow *window;
+};
+
+#endif // QT_WINDOWSDARKMODEEVENTFILTER_HPP
diff --git a/src/qt/qt_vulkanrenderer.cpp b/src/qt/qt_vulkanrenderer.cpp
index 9227cdcb3..2306661ec 100644
--- a/src/qt/qt_vulkanrenderer.cpp
+++ b/src/qt/qt_vulkanrenderer.cpp
@@ -30,10 +30,11 @@
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 **
 ****************************************************************************/
+#include "qt_vulkanrenderer.hpp"
 
 #include <QCoreApplication>
 #include <QFile>
-#include "qt_vulkanrenderer.hpp"
+
 #if QT_CONFIG(vulkan)
 #    include <QVulkanFunctions>
 
@@ -676,7 +677,7 @@ VulkanRenderer2::initResources()
         v_texcoord = texcoord;
         gl_Position = ubuf.mvp * position;
     }
-#endif
+#endif /* 0 */
     VkShaderModule vertShaderModule = createShader(QStringLiteral(":/texture_vert.spv"));
 #if 0
     #version 440
@@ -691,7 +692,7 @@ VulkanRenderer2::initResources()
     {
         fragColor = texture(tex, v_texcoord);
     }
-#endif
+#endif /* 0 */
     VkShaderModule fragShaderModule = createShader(QStringLiteral(":/texture_frag.spv"));
 
     // Graphics pipeline
@@ -969,10 +970,11 @@ VulkanRenderer2::startNextFrame()
     m_devFuncs->vkCmdBindVertexBuffers(cb, 0, 1, &m_buf, &vbOffset);
 
     VkViewport viewport;
-    viewport.x        = destination.x() * m_window->devicePixelRatio();
-    viewport.y        = destination.y() * m_window->devicePixelRatio();
-    viewport.width    = destination.width() * m_window->devicePixelRatio();
-    viewport.height   = destination.height() * m_window->devicePixelRatio();
+    viewport.x        = destination.x();
+    viewport.y        = destination.y();
+    viewport.width    = destination.width();
+    viewport.height   = destination.height();
+    
     viewport.minDepth = 0;
     viewport.maxDepth = 1;
     m_devFuncs->vkCmdSetViewport(cb, 0, 1, &viewport);
@@ -1009,4 +1011,4 @@ VulkanRenderer2::startNextFrame()
     m_window->frameReady();
     m_window->requestUpdate(); // render continuously, throttled by the presentation rate
 }
-#endif
+#endif /* QT_CONFIG(vulkan) */
diff --git a/src/qt/qt_vulkanrenderer.hpp b/src/qt/qt_vulkanrenderer.hpp
index d4580d848..2c131e5d7 100644
--- a/src/qt/qt_vulkanrenderer.hpp
+++ b/src/qt/qt_vulkanrenderer.hpp
@@ -31,6 +31,8 @@
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 **
 ****************************************************************************/
+#ifndef VULKANRENDERER_HPP
+#define VULKANRENDERER_HPP
 
 #include <QVulkanWindow>
 #include <QImage>
@@ -90,4 +92,6 @@ private:
 
     QMatrix4x4 m_proj;
 };
-#endif
+#endif // QT_CONFIG(vulkan)
+
+#endif // VULKANRENDERER_HPP
diff --git a/src/qt/qt_vulkanwindowrenderer.cpp b/src/qt/qt_vulkanwindowrenderer.cpp
index 60ad5be96..d0fbb39a3 100644
--- a/src/qt/qt_vulkanwindowrenderer.cpp
+++ b/src/qt/qt_vulkanwindowrenderer.cpp
@@ -1,3 +1,35 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 Cacodemon345
+** Copyright (C) 2017 The Qt Company Ltd.
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
 #include "qt_vulkanwindowrenderer.hpp"
 
 #include <QMessageBox>
@@ -697,7 +729,7 @@ public:
 #        if VK_HEADER_VERSION >= 135 && VK_HEADER_VERSION < 162
             case VK_ERROR_INCOMPATIBLE_VERSION_KHR:
                 return "VK_ERROR_INCOMPATIBLE_VERSION_KHR";
-#        endif
+#        endif /* VK_HEADER_VERSION >= 135 && VK_HEADER_VERSION < 162 */
             case VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT:
                 return "VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT";
             case VK_ERROR_NOT_PERMITTED_EXT:
@@ -788,7 +820,7 @@ public:
         m_devFuncs->vkDeviceWaitIdle(m_window->device());
     }
 };
-#    endif
+#    endif /* 0*/
 
 VulkanWindowRenderer::VulkanWindowRenderer(QWidget *parent)
     : QVulkanWindow(parent->windowHandle())
@@ -814,6 +846,7 @@ VulkanWindowRenderer::createRenderer()
 void
 VulkanWindowRenderer::resizeEvent(QResizeEvent *event)
 {
+    this->pixelRatio = devicePixelRatio();
     onResize(width(), height());
 
     QVulkanWindow::resizeEvent(event);
@@ -836,8 +869,10 @@ VulkanWindowRenderer::onBlit(int buf_idx, int x, int y, int w, int h)
     if (isExposed())
         requestUpdate();
     buf_usage[0].clear();
-    if (origSource != source)
+    if (origSource != source) {
+        this->pixelRatio = devicePixelRatio();
         onResize(this->width(), this->height());
+    }
 }
 
 uint32_t
@@ -851,4 +886,4 @@ VulkanWindowRenderer::getBuffers()
 {
     return std::vector { std::make_tuple((uint8_t *) renderer->mappedPtr, &this->buf_usage[0]) };
 }
-#endif
+#endif /* QT_CONFIG(vulkan) */
diff --git a/src/qt/qt_vulkanwindowrenderer.hpp b/src/qt/qt_vulkanwindowrenderer.hpp
index 828d091e6..de9f46b6f 100644
--- a/src/qt/qt_vulkanwindowrenderer.hpp
+++ b/src/qt/qt_vulkanwindowrenderer.hpp
@@ -35,6 +35,6 @@ private:
 
     VulkanRenderer2 *renderer;
 };
-#endif
+#endif // QT_CONFIG(vulkan)
 
 #endif // VULKANWINDOWRENDERER_HPP
diff --git a/src/qt/qt_winrawinputfilter.cpp b/src/qt/qt_winrawinputfilter.cpp
index 3ca091ae6..9029f4fcd 100644
--- a/src/qt/qt_winrawinputfilter.cpp
+++ b/src/qt/qt_winrawinputfilter.cpp
@@ -6,15 +6,22 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          Windows raw input native filter for QT
+ *          Windows raw input native filter for Qt
  *
  *
  *
  * Authors: Teemu Korhonen
  *          Miran Grca, <mgrca8@gmail.com>
+ *          Sam Latinga
+ *          Cacodemon345
  *
  *          Copyright 2021 Teemu Korhonen
  *          Copyright 2016-2018 Miran Grca.
+ *          Copyright 1997-2025 Sam Latinga
+ *          Copyright 2024-2025 Cacodemon345.
+ * 
+ * See this header for SDL3 code license:
+ * https://github.com/libsdl-org/SDL/blob/8e5fe0ea61dc87b29ca9a6119324221df0113bcf/src/video/windows/SDL_windowsrawinput.c#L1
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -31,42 +38,198 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+/* Mouse RawInput code taken from SDL3. */
+
 #include "qt_winrawinputfilter.hpp"
 
 #include <QMenuBar>
+#include <QFile>
+#include <QTextStream>
+#include <QApplication>
+#include <QTimer>
 
 #include <atomic>
 
 #include <windows.h>
+#include <dwmapi.h>
+#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE
+#define DWMWA_USE_IMMERSIVE_DARK_MODE 20
+#endif
 
 #include <86box/keyboard.h>
 #include <86box/mouse.h>
 #include <86box/plat.h>
 #include <86box/86box.h>
+#include <86box/cdrom.h>
+#include <86box/video.h>
+#include <dbt.h>
+#include <strsafe.h>
+
+extern void    win_keyboard_handle(uint32_t scancode, int up, int e0, int e1);
 
 #include <array>
 #include <memory>
 
 #include "qt_rendererstack.hpp"
+#include "qt_util.hpp"
+#include "ui_qt_mainwindow.h"
+
+bool NewDarkMode = FALSE;
+
+extern MainWindow* main_window;
+
+struct
+{
+    HANDLE done_event = 0, ready_event = 0;
+    std::atomic_bool done{false};
+
+    size_t rawinput_offset = 0, rawinput_size = 0;
+    uint8_t* rawinput = nullptr;
+
+    HANDLE thread = 0;
+} win_rawinput_data;
+
+static void
+win_poll_mouse(void)
+{
+    // Yes, this is a thing in C++.
+    auto* data = &win_rawinput_data;
+    uint32_t size, i, count, total = 0;
+    RAWINPUT *input;
+    //static int64_t ms_time = plat_get_ticks();
+    
+    if (data->rawinput_offset == 0) {
+        BOOL isWow64;
+
+        data->rawinput_offset = sizeof(RAWINPUTHEADER);
+        if (IsWow64Process(GetCurrentProcess(), &isWow64) && isWow64) {
+            // We're going to get 64-bit data, so use the 64-bit RAWINPUTHEADER size
+            data->rawinput_offset += 8;
+        }
+    }
+
+    input = (RAWINPUT *)data->rawinput;
+    for (;;) {
+        size = data->rawinput_size - (UINT)((BYTE *)input - data->rawinput);
+        count = GetRawInputBuffer(input, &size, sizeof(RAWINPUTHEADER));
+        if (count == 0 || count == (UINT)-1) {
+            if (!data->rawinput || (count == (UINT)-1 && GetLastError() == ERROR_INSUFFICIENT_BUFFER)) {
+                const UINT RAWINPUT_BUFFER_SIZE_INCREMENT = 96;   // 2 64-bit raw mouse packets
+                BYTE *rawinput = (BYTE *)realloc(data->rawinput, data->rawinput_size + RAWINPUT_BUFFER_SIZE_INCREMENT);
+                if (!rawinput) {
+                    break;
+                }
+                input = (RAWINPUT *)(rawinput + ((BYTE *)input - data->rawinput));
+                data->rawinput = rawinput;
+                data->rawinput_size += RAWINPUT_BUFFER_SIZE_INCREMENT;
+            } else {
+                break;
+            }
+        } else {
+            total += count;
+
+            // Advance input to the end of the buffer
+            while (count--) {
+                input = NEXTRAWINPUTBLOCK(input);
+            }
+        }
+    }
+
+    if (total > 0) {
+        for (i = 0, input = (RAWINPUT *)data->rawinput; i < total; ++i, input = NEXTRAWINPUTBLOCK(input)) {
+            if (input->header.dwType == RIM_TYPEMOUSE) {
+                RAWMOUSE *rawmouse = (RAWMOUSE *)((BYTE *)input + data->rawinput_offset);
+                if (mouse_capture)
+                    WindowsRawInputFilter::mouse_handle(rawmouse);
+            }
+        }
+    }
+
+    //qDebug() << "Mouse delay: " << (plat_get_ticks() - ms_time);
+    //ms_time = plat_get_ticks();
+}
+
+static DWORD
+win_rawinput_thread(void* param)
+{
+    RAWINPUTDEVICE rid = {
+        .usUsagePage = 0x01,
+        .usUsage     = 0x02,
+        .dwFlags     = 0,
+        .hwndTarget  = nullptr
+    };
+    auto window = CreateWindowEx(0, TEXT("Message"), NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL);
+    if (!window) {
+        return 0;
+    }
+
+    rid.hwndTarget = window;
+    if (!RegisterRawInputDevices(&rid, 1, sizeof(rid))) {
+        DestroyWindow(window);
+        return 0;
+    }
+
+    SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL);
+
+    SetEvent(win_rawinput_data.ready_event);
+
+    while (!win_rawinput_data.done) {
+        DWORD result = MsgWaitForMultipleObjects(1, &win_rawinput_data.done_event, FALSE, INFINITE, QS_RAWINPUT);
+
+        if (result != (WAIT_OBJECT_0 + 1)) {
+            break;
+        }
+
+        // Clear the queue status so MsgWaitForMultipleObjects() will wait again
+        (void)GetQueueStatus(QS_RAWINPUT);
+
+        win_poll_mouse();
+    }
+
+    rid.dwFlags |= RIDEV_REMOVE;
+    rid.hwndTarget = NULL;
+    
+    RegisterRawInputDevices(&rid, 1, sizeof(rid));
+    DestroyWindow(window);
+    return 0;
+}
 
 extern "C" void win_joystick_handle(PRAWINPUT);
 std::unique_ptr<WindowsRawInputFilter>
 WindowsRawInputFilter::Register(MainWindow *window)
 {
-    RAWINPUTDEVICE rid[2] = {
-        {.usUsagePage = 0x01,
-         .usUsage     = 0x06,
-         .dwFlags     = RIDEV_NOHOTKEYS,
-         .hwndTarget  = nullptr},
-        { .usUsagePage = 0x01,
-         .usUsage     = 0x02,
-         .dwFlags     = 0,
-         .hwndTarget  = nullptr}
+    RAWINPUTDEVICE rid[1] = {
+        {
+            .usUsagePage = 0x01,
+            .usUsage     = 0x06,
+            .dwFlags     = RIDEV_NOHOTKEYS,
+            .hwndTarget  = nullptr
+        }
     };
 
-    if (RegisterRawInputDevices(rid, 2, sizeof(rid[0])) == FALSE)
-        return std::unique_ptr<WindowsRawInputFilter>(nullptr);
+    if (!hook_enabled) {
+        RegisterRawInputDevices(rid, 1, sizeof(rid[0]));
+    }
 
+    win_rawinput_data.done_event = CreateEvent(nullptr, FALSE, FALSE, nullptr);
+    win_rawinput_data.ready_event = CreateEvent(nullptr, FALSE, FALSE, nullptr);
+
+    if (!win_rawinput_data.done_event || !win_rawinput_data.ready_event) {
+        warning("Failed to create RawInput events.");
+
+        goto conclude;
+    }
+
+    win_rawinput_data.thread = CreateThread(nullptr, 0, win_rawinput_thread, nullptr, 0, nullptr);
+    if (win_rawinput_data.thread) {
+        HANDLE handles[2] = { win_rawinput_data.ready_event, win_rawinput_data.thread };
+
+        WaitForMultipleObjects(2, handles, FALSE, INFINITE);
+    } else {
+        warning("Failed to create RawInput thread.");
+    }
+
+conclude:
     std::unique_ptr<WindowsRawInputFilter> inputfilter(new WindowsRawInputFilter(window));
 
     return inputfilter;
@@ -80,27 +243,120 @@ WindowsRawInputFilter::WindowsRawInputFilter(MainWindow *window)
         connect(menu, &QMenu::aboutToShow, this, [=]() { menus_open++; });
         connect(menu, &QMenu::aboutToHide, this, [=]() { menus_open--; });
     }
-
-    for (size_t i = 0; i < sizeof(scancode_map) / sizeof(scancode_map[0]); i++)
-        scancode_map[i] = i;
-
-    keyboard_getkeymap();
 }
 
 WindowsRawInputFilter::~WindowsRawInputFilter()
 {
-    RAWINPUTDEVICE rid[2] = {
-        {.usUsagePage = 0x01,
-         .usUsage     = 0x06,
-         .dwFlags     = RIDEV_REMOVE,
-         .hwndTarget  = NULL},
-        { .usUsagePage = 0x01,
-         .usUsage     = 0x02,
-         .dwFlags     = RIDEV_REMOVE,
-         .hwndTarget  = NULL}
-    };
+    win_rawinput_data.done = true;
+    if (win_rawinput_data.done_event)
+        SetEvent(win_rawinput_data.done_event);
+    if (win_rawinput_data.thread)
+        WaitForSingleObject(win_rawinput_data.thread, INFINITE);
+    RAWINPUTDEVICE rid =
+        {
+            .usUsagePage = 0x01,
+            .usUsage     = 0x06,
+            .dwFlags     = RIDEV_REMOVE,
+            .hwndTarget  = NULL
+        };
 
-    RegisterRawInputDevices(rid, 2, sizeof(rid[0]));
+    if (!hook_enabled)
+        RegisterRawInputDevices(&rid, 1, sizeof(rid));
+
+    free(win_rawinput_data.rawinput);
+}
+
+static void
+notify_drives(ULONG unitmask, int empty)
+{
+    if (unitmask & cdrom_assigned_letters)  for (int i = 0; i < CDROM_NUM; i++) {
+        cdrom_t *dev = &(cdrom[i]);
+
+        if ((dev->host_letter != 0xff) &&
+            (unitmask & (1 << dev->host_letter))) {
+            if (empty)
+                cdrom_set_empty(dev);
+            else
+                cdrom_update_status(dev);
+        }
+    }
+}
+
+static void
+device_change(WPARAM wParam, LPARAM lParam)
+{
+    PDEV_BROADCAST_HDR lpdb      = (PDEV_BROADCAST_HDR) lParam;
+
+    switch(wParam) {
+        case DBT_DEVICEARRIVAL:
+        case DBT_DEVICEREMOVECOMPLETE:
+            /* Check whether a CD or DVD was inserted into a drive. */
+            if (lpdb->dbch_devicetype == DBT_DEVTYP_VOLUME) {
+                PDEV_BROADCAST_VOLUME lpdbv = (PDEV_BROADCAST_VOLUME) lpdb;
+
+                if (lpdbv->dbcv_flags & DBTF_MEDIA)
+                    notify_drives(lpdbv->dbcv_unitmask,
+                                  (wParam == DBT_DEVICEREMOVECOMPLETE));
+            }
+            break;
+
+        default:
+            /*
+               Process other WM_DEVICECHANGE notifications for other 
+               devices or reasons.
+             */ 
+            break;
+    }
+}
+
+void
+selectDarkMode()
+{
+    bool OldDarkMode = NewDarkMode;
+
+    if (!util::isWindowsLightTheme()) {
+        QFile f(":qdarkstyle/dark/darkstyle.qss");
+
+        if (!f.exists())
+            printf("Unable to set stylesheet, file not found\n");
+        else {
+            f.open(QFile::ReadOnly | QFile::Text);
+            QTextStream ts(&f);
+            qApp->setStyleSheet(ts.readAll());
+        }
+        QPalette palette(qApp->palette());
+        palette.setColor(QPalette::Link, Qt::white);
+        palette.setColor(QPalette::LinkVisited, Qt::lightGray);
+        qApp->setPalette(palette);
+        NewDarkMode = TRUE;
+    } else {
+        qApp->setStyleSheet("");
+        QPalette palette(qApp->palette());
+        palette.setColor(QPalette::Link, Qt::blue);
+        palette.setColor(QPalette::LinkVisited, Qt::magenta);
+        qApp->setPalette(palette);
+        NewDarkMode = FALSE;
+    }
+
+    if (NewDarkMode != OldDarkMode)
+        QTimer::singleShot(1000, []() {
+            BOOL DarkMode = NewDarkMode;
+            DwmSetWindowAttribute((HWND) main_window->winId(),
+                                  DWMWA_USE_IMMERSIVE_DARK_MODE,
+                                  (LPCVOID) &DarkMode,
+                                  sizeof(DarkMode));
+
+            main_window->resizeContents(monitors[0].mon_scrnsz_x,
+                                        monitors[0].mon_scrnsz_y);
+
+            for (int i = 1; i < MONITORS_NUM; i++) {
+                auto mon = &(monitors[i]);
+
+                if ((main_window->renderers[i] != nullptr) && !main_window->renderers[i]->isHidden())
+                    main_window->resizeContentsMonitor(mon->mon_scrnsz_x,
+                                                       mon->mon_scrnsz_y, i);
+            }
+        });
 }
 
 bool
@@ -109,28 +365,93 @@ WindowsRawInputFilter::nativeEventFilter(const QByteArray &eventType, void *mess
     if (eventType == "windows_generic_MSG") {
         MSG *msg = static_cast<MSG *>(message);
 
-        if (msg->message == WM_INPUT) {
-
-            if (window->isActiveWindow() && menus_open == 0)
-                handle_input((HRAWINPUT) msg->lParam);
-            else
-            {
-                for (auto &w : window->renderers) {
-                    if (w && w->isActiveWindow()) {
-                        handle_input((HRAWINPUT) msg->lParam);
-                        break;
+        if (msg != nullptr)  switch(msg->message) {
+            case WM_INPUT:
+                if (window->isActiveWindow() && (menus_open == 0))
+                    handle_input((HRAWINPUT) msg->lParam);
+                else {
+                    for (auto &w : window->renderers) {
+                        if (w && w->isActiveWindow()) {
+                            handle_input((HRAWINPUT) msg->lParam);
+                            break;
+                        }
                     }
                 }
-            }
-
-            return true;
-        }
-
-        /* Stop processing of Alt-F4 */
-        if (msg->message == WM_SYSKEYDOWN) {
-            if (msg->wParam == 0x73) {
                 return true;
-            }
+            case WM_SETTINGCHANGE:
+                if ((((void *) msg->lParam) != nullptr) &&
+                    (wcscmp(L"ImmersiveColorSet", (wchar_t*)msg->lParam) == 0) &&
+                    color_scheme == 0) {
+
+                    bool OldDarkMode = NewDarkMode;
+#if 0
+                    if (do_auto_pause && !dopause) {
+                        auto_paused = 1;
+                        plat_pause(1);
+                    }
+#endif
+
+                    if (!util::isWindowsLightTheme()) {
+                        QFile f(":qdarkstyle/dark/darkstyle.qss");
+
+                        if (!f.exists())
+                            printf("Unable to set stylesheet, file not found\n");
+                        else {
+                            f.open(QFile::ReadOnly | QFile::Text);
+                            QTextStream ts(&f);
+                            qApp->setStyleSheet(ts.readAll());
+                        }
+                        QPalette palette(qApp->palette());
+                        palette.setColor(QPalette::Link, Qt::white);
+                        palette.setColor(QPalette::LinkVisited, Qt::lightGray);
+                        qApp->setPalette(palette);
+                        NewDarkMode = TRUE;
+                    } else {
+                        qApp->setStyleSheet("");
+                        QPalette palette(qApp->palette());
+                        palette.setColor(QPalette::Link, Qt::blue);
+                        palette.setColor(QPalette::LinkVisited, Qt::magenta);
+                        qApp->setPalette(palette);
+                        NewDarkMode = FALSE;
+                    }
+
+                    if (NewDarkMode != OldDarkMode)  QTimer::singleShot(1000, [this] () {
+                        BOOL DarkMode = NewDarkMode;
+                        DwmSetWindowAttribute((HWND) window->winId(),
+                                              DWMWA_USE_IMMERSIVE_DARK_MODE,
+                                              (LPCVOID) &DarkMode,
+                                              sizeof(DarkMode));
+
+                        window->resizeContents(monitors[0].mon_scrnsz_x,
+                                               monitors[0].mon_scrnsz_y);
+
+                        for (int i = 1; i < MONITORS_NUM; i++) {
+                            auto           mon = &(monitors[i]);
+
+                            if ((window->renderers[i] != nullptr) &&
+                                !window->renderers[i]->isHidden())
+                                window->resizeContentsMonitor(mon->mon_scrnsz_x,
+                                mon->mon_scrnsz_y, i);
+                        }
+
+#if 0
+                        if (auto_paused) {
+                            plat_pause(0);
+                            auto_paused = 0;
+                        }
+#endif
+                    });
+                }
+                break;
+            case WM_SYSKEYDOWN:
+                /* Stop processing of Alt-F4 */
+                if (msg->wParam == 0x73)
+                    return true;
+                break;
+            case WM_DEVICECHANGE:
+                if (msg->hwnd == (HWND) window->winId())
+                    device_change(msg->wParam, msg->lParam);
+                break;
         }
     }
 
@@ -153,15 +474,9 @@ WindowsRawInputFilter::handle_input(HRAWINPUT input)
             case RIM_TYPEKEYBOARD:
                 keyboard_handle(raw);
                 break;
-            case RIM_TYPEMOUSE:
-                if (mouse_capture)
-                    mouse_handle(raw);
-                break;
             case RIM_TYPEHID:
-                {
-                    win_joystick_handle(raw);
-                    break;
-                }
+                win_joystick_handle(raw);
+                break;
         }
     }
 }
@@ -171,136 +486,20 @@ WindowsRawInputFilter::handle_input(HRAWINPUT input)
 void
 WindowsRawInputFilter::keyboard_handle(PRAWINPUT raw)
 {
-    USHORT     scancode;
-
     RAWKEYBOARD rawKB = raw->data.keyboard;
-    scancode          = rawKB.MakeCode;
 
-    if (kbd_req_capture && !mouse_capture)
-        return;
-
-    /* If it's not a scan code that starts with 0xE1 */
-    if ((rawKB.Flags & RI_KEY_E1)) {
-        if (rawKB.MakeCode == 0x1D) {
-            scancode = scancode_map[0x100]; /* Translate E1 1D to 0x100 (which would
-                                               otherwise be E0 00 but that is invalid
-                                               anyway).
-                                               Also, take a potential mapping into
-                                               account. */
-        } else
-            scancode = 0xFFFF;
-        if (scancode != 0xFFFF)
-            keyboard_input(!(rawKB.Flags & RI_KEY_BREAK), scancode);
-    } else {
-        if (rawKB.Flags & RI_KEY_E0)
-            scancode |= 0x100;
-
-        /* Translate the scan code to 9-bit */
-        scancode = convert_scan_code(scancode);
-
-        /* Remap it according to the list from the Registry */
-        if (scancode != scancode_map[scancode])
-            pclog("Scan code remap: %03X -> %03X\n", scancode, scancode);
-        scancode = scancode_map[scancode];
-
-        /* If it's not 0xFFFF, send it to the emulated
-           keyboard.
-           We use scan code 0xFFFF to mean a mapping that
-           has a prefix other than E0 and that is not E1 1D,
-           which is, for our purposes, invalid. */
-
-        /* Translate right CTRL to left ALT if the user has so
-           chosen. */
-        if ((scancode == 0x11d) && rctrl_is_lalt)
-            scancode = 0x038;
-
-        /* Normal scan code pass through, pass it through as is if
-           it's not an invalid scan code. */
-        if (scancode != 0xFFFF)
-            keyboard_input(!(rawKB.Flags & RI_KEY_BREAK), scancode);
-
-        window->checkFullscreenHotkey();
-    }
-}
-
-/* This is so we can disambiguate scan codes that would otherwise conflict and get
-   passed on incorrectly. */
-UINT16
-WindowsRawInputFilter::convert_scan_code(UINT16 scan_code)
-{
-    if ((scan_code & 0xff00) == 0xe000)
-        scan_code = (scan_code & 0xff) | 0x0100;
-
-    if (scan_code == 0xE11D)
-        scan_code = 0x0100;
-    /* E0 00 is sent by some USB keyboards for their special keys, as it is an
-       invalid scan code (it has no untranslated set 2 equivalent), we mark it
-       appropriately so it does not get passed through. */
-    else if ((scan_code > 0x01FF) || (scan_code == 0x0100))
-        scan_code = 0xFFFF;
-
-    return scan_code;
+    win_keyboard_handle(rawKB.MakeCode, (rawKB.Flags & RI_KEY_BREAK),
+                        (rawKB.Flags & RI_KEY_E0), (rawKB.Flags & RI_KEY_E1));
 }
 
 void
-WindowsRawInputFilter::keyboard_getkeymap()
+WindowsRawInputFilter::mouse_handle(RAWMOUSE* raw)
 {
-    const LPCSTR  keyName   = "SYSTEM\\CurrentControlSet\\Control\\Keyboard Layout";
-    const LPCSTR  valueName = "Scancode Map";
-    unsigned char buf[32768];
-    DWORD         bufSize;
-    HKEY          hKey;
-    int           j;
-    UINT32       *bufEx2;
-    int           scMapCount;
-    UINT16       *bufEx;
-    int           scancode_unmapped;
-    int           scancode_mapped;
-
-    /* First, prepare the default scan code map list which is 1:1.
-     * Remappings will be inserted directly into it.
-     * 512 bytes so this takes less memory, bit 9 set means E0
-     * prefix.
-     */
-    for (j = 0; j < 512; j++)
-        scancode_map[j] = j;
-
-    /* Get the scan code remappings from:
-    HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Keyboard Layout */
-    bufSize = 32768;
-    if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, keyName, 0, 1, &hKey) == ERROR_SUCCESS) {
-        if (RegQueryValueExA(hKey, valueName, NULL, NULL, buf, &bufSize) == ERROR_SUCCESS) {
-            bufEx2     = (UINT32 *) buf;
-            scMapCount = bufEx2[2];
-            if ((bufSize != 0) && (scMapCount != 0)) {
-                bufEx = (UINT16 *) (buf + 12);
-                for (j = 0; j < scMapCount * 2; j += 2) {
-                    /* Each scan code is 32-bit: 16 bits of remapped scan code,
-                    and 16 bits of original scan code. */
-                    scancode_unmapped = bufEx[j + 1];
-                    scancode_mapped   = bufEx[j];
-
-                    scancode_unmapped = convert_scan_code(scancode_unmapped);
-                    scancode_mapped   = convert_scan_code(scancode_mapped);
-
-                    /* Ignore source scan codes with prefixes other than E1
-                   that are not E1 1D. */
-                    if (scancode_unmapped != 0xFFFF)
-                        scancode_map[scancode_unmapped] = scancode_mapped;
-                }
-            }
-        }
-        RegCloseKey(hKey);
-    }
-}
-
-void
-WindowsRawInputFilter::mouse_handle(PRAWINPUT raw)
-{
-    RAWMOUSE   state = raw->data.mouse;
+    RAWMOUSE   state = *raw;
     static int x, delta_x;
     static int y, delta_y;
     static int b, delta_z;
+    static int delta_w;
 
     b = mouse_get_buttons_ex();
 
@@ -338,6 +537,12 @@ WindowsRawInputFilter::mouse_handle(PRAWINPUT raw)
     } else
         delta_z = 0;
 
+    if (state.usButtonFlags & RI_MOUSE_HWHEEL) {
+        delta_w = (SHORT) state.usButtonData / 120;
+        mouse_set_w(delta_w);
+    } else
+        delta_w = 0;
+
     if (state.usFlags & MOUSE_MOVE_ABSOLUTE) {
         /* absolute mouse, i.e. RDP or VNC
          * seems to work fine for RDP on Windows 10
@@ -355,7 +560,7 @@ WindowsRawInputFilter::mouse_handle(PRAWINPUT raw)
 
     mouse_scale(delta_x, delta_y);
 
-    HWND wnd = (HWND)window->winId();
+    /* HWND wnd = (HWND)window->winId();
 
     RECT rect;
 
@@ -364,5 +569,5 @@ WindowsRawInputFilter::mouse_handle(PRAWINPUT raw)
     int left = rect.left + (rect.right - rect.left) / 2;
     int top = rect.top + (rect.bottom - rect.top) / 2;
 
-    SetCursorPos(left, top);
+    SetCursorPos(left, top); */
 }
diff --git a/src/qt/qt_winrawinputfilter.hpp b/src/qt/qt_winrawinputfilter.hpp
index f687164ca..9d8d6ba0e 100644
--- a/src/qt/qt_winrawinputfilter.hpp
+++ b/src/qt/qt_winrawinputfilter.hpp
@@ -38,6 +38,7 @@
 #include <QByteArray>
 
 #include <windows.h>
+#include <windns.h>
 
 #include <memory>
 
@@ -59,9 +60,10 @@ public:
 
     ~WindowsRawInputFilter();
 
+    static void   mouse_handle(RAWMOUSE* raw);
+
 private:
     MainWindow *window;
-    uint16_t     scancode_map[768];
     int          buttons    = 0;
     int          dx         = 0;
     int          dy         = 0;
@@ -72,9 +74,6 @@ private:
 
     void          handle_input(HRAWINPUT input);
     void          keyboard_handle(PRAWINPUT raw);
-    void          mouse_handle(PRAWINPUT raw);
-    static UINT16 convert_scan_code(UINT16 scan_code);
-    void          keyboard_getkeymap();
 };
 
 #endif
diff --git a/src/qt/sdl_joystick.c b/src/qt/sdl_joystick.c
new file mode 100644
index 000000000..f1ba0380f
--- /dev/null
+++ b/src/qt/sdl_joystick.c
@@ -0,0 +1,197 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          SDL2 joystick interface.
+ *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          Joakim L. Gilje, <jgilje@jgilje.net>
+ *          Jasmine Iwanek, jriwanek@gmail.com>
+ *
+ *          Copyright 2017-2021 Sarah Walker.
+ *          Copyright 2021 Joakim L. Gilje.
+ *          Copyright 2021-2025 Jasmine Iwanek.
+ */
+#include <SDL2/SDL.h>
+
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#define _USE_MATH_DEFINES
+#include <math.h>
+/* This #undef is needed because a SDL include header redefines HAVE_STDARG_H. */
+#undef HAVE_STDARG_H
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/gameport.h>
+#include <86box/plat_unused.h>
+
+int                   joysticks_present = 0;
+joystick_state_t      joystick_state[GAMEPORT_MAX][MAX_JOYSTICKS];
+plat_joystick_state_t plat_joystick_state[MAX_PLAT_JOYSTICKS];
+static SDL_Joystick  *sdl_joy[MAX_PLAT_JOYSTICKS];
+
+#ifndef M_PI
+#    define M_PI 3.14159265358979323846
+#endif
+
+void
+joystick_init(void)
+{
+#ifdef _WIN32
+    /* This is needed for SDL's Windows raw input backend to work properly without SDL video. */
+    SDL_SetHint(SDL_HINT_JOYSTICK_THREAD, "1");
+#endif
+
+    if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) != 0) {
+        return;
+    }
+    joysticks_present = SDL_NumJoysticks();
+
+    memset(sdl_joy, 0, sizeof(sdl_joy));
+    for (int js = 0; js < joysticks_present; js++) {
+        sdl_joy[js] = SDL_JoystickOpen(js);
+
+        if (sdl_joy[js]) {
+            strncpy(plat_joystick_state[js].name, SDL_JoystickNameForIndex(js), 64);
+            plat_joystick_state[js].nr_axes    = MIN(SDL_JoystickNumAxes(sdl_joy[js]), MAX_JOY_AXES);
+            plat_joystick_state[js].nr_buttons = MIN(SDL_JoystickNumButtons(sdl_joy[js]), MAX_JOY_BUTTONS);
+            plat_joystick_state[js].nr_povs    = MIN(SDL_JoystickNumHats(sdl_joy[js]), MAX_JOY_POVS);
+
+            for (int axis_nr = 0; axis_nr < plat_joystick_state[js].nr_axes; axis_nr++) {
+                snprintf(plat_joystick_state[js].axis[axis_nr].name, sizeof(plat_joystick_state[js].axis[axis_nr].name), "Axis %i", axis_nr);
+                plat_joystick_state[js].axis[axis_nr].id = axis_nr;
+            }
+            for (int button_nr = 0; button_nr < plat_joystick_state[js].nr_buttons; button_nr++) {
+                snprintf(plat_joystick_state[js].button[button_nr].name, sizeof(plat_joystick_state[js].button[button_nr].name), "Button %i", button_nr);
+                plat_joystick_state[js].button[button_nr].id = button_nr;
+            }
+            for (int pov_nr = 0; pov_nr < plat_joystick_state[js].nr_povs; pov_nr++) {
+                snprintf(plat_joystick_state[js].pov[pov_nr].name, sizeof(plat_joystick_state[js].pov[pov_nr].name), "POV %i", pov_nr);
+                plat_joystick_state[js].pov[pov_nr].id = pov_nr;
+            }
+        }
+    }
+}
+
+void
+joystick_close(void)
+{
+    for (int js = 0; js < joysticks_present; js++) {
+        if (sdl_joy[js])
+            SDL_JoystickClose(sdl_joy[js]);
+    }
+}
+
+static int
+joystick_get_axis(int joystick_nr, int mapping)
+{
+    if (mapping & POV_X) {
+        switch (plat_joystick_state[joystick_nr].p[mapping & 3]) {
+            case SDL_HAT_LEFTUP:
+            case SDL_HAT_LEFT:
+            case SDL_HAT_LEFTDOWN:
+                return -32767;
+
+            case SDL_HAT_RIGHTUP:
+            case SDL_HAT_RIGHT:
+            case SDL_HAT_RIGHTDOWN:
+                return 32767;
+
+            default:
+                return 0;
+        }
+    } else if (mapping & POV_Y) {
+        switch (plat_joystick_state[joystick_nr].p[mapping & 3]) {
+            case SDL_HAT_LEFTUP:
+            case SDL_HAT_UP:
+            case SDL_HAT_RIGHTUP:
+                return -32767;
+
+            case SDL_HAT_LEFTDOWN:
+            case SDL_HAT_DOWN:
+            case SDL_HAT_RIGHTDOWN:
+                return 32767;
+
+            default:
+                return 0;
+        }
+    } else
+        return plat_joystick_state[joystick_nr].a[plat_joystick_state[joystick_nr].axis[mapping].id];
+}
+
+void
+joystick_process(uint8_t gp)
+{
+    if (!joystick_type[gp])
+        return;
+
+    SDL_JoystickUpdate();
+    for (int js = 0; js < joysticks_present; js++) {
+        for (int axis_nr = 0; axis_nr < plat_joystick_state[js].nr_axes; axis_nr++)
+            plat_joystick_state[js].a[axis_nr] = SDL_JoystickGetAxis(sdl_joy[js], axis_nr);
+
+        for (int button_nr = 0; button_nr < plat_joystick_state[js].nr_buttons; button_nr++)
+            plat_joystick_state[js].b[button_nr] = SDL_JoystickGetButton(sdl_joy[js], button_nr);
+
+        for (int pov_nr = 0; pov_nr < plat_joystick_state[js].nr_povs; pov_nr++)
+            plat_joystick_state[js].p[pov_nr] = SDL_JoystickGetHat(sdl_joy[js], pov_nr);
+
+#if 0
+        pclog("joystick %i - x=%i y=%i b[0]=%i b[1]=%i  %i\n", js,
+              joystick_state[gp][js].x,
+              joystick_state[gp][js].y,
+              joystick_state[gp][js].b[0],
+              joystick_state[gp][js].b[1],
+              joysticks_present[gp]);
+#endif
+    }
+
+    for (int js = 0; js < joystick_get_max_joysticks(joystick_type[gp]); js++) {
+        if (joystick_state[gp][js].plat_joystick_nr) {
+            int joystick_nr = joystick_state[gp][js].plat_joystick_nr - 1;
+
+            for (int axis_nr = 0; axis_nr < joystick_get_axis_count(joystick_type[gp]); axis_nr++)
+                joystick_state[gp][js].axis[axis_nr] = joystick_get_axis(joystick_nr, joystick_state[gp][js].axis_mapping[axis_nr]);
+
+            for (int button_nr = 0; button_nr < joystick_get_button_count(joystick_type[gp]); button_nr++)
+                joystick_state[gp][js].button[button_nr] = plat_joystick_state[joystick_nr].b[joystick_state[gp][js].button_mapping[button_nr]];
+
+            for (int pov_nr = 0; pov_nr < joystick_get_pov_count(joystick_type[gp]); pov_nr++) {
+                int    x         = joystick_get_axis(joystick_nr, joystick_state[gp][js].pov_mapping[pov_nr][0]);
+                int    y         = joystick_get_axis(joystick_nr, joystick_state[gp][js].pov_mapping[pov_nr][1]);
+                double angle     = (atan2((double) y, (double) x) * 360.0) / (2 * M_PI);
+                double magnitude = sqrt((double) x * (double) x + (double) y * (double) y);
+
+                if (magnitude < 16384)
+                    joystick_state[gp][js].pov[pov_nr] = -1;
+                else
+                    joystick_state[gp][js].pov[pov_nr] = ((int) angle + 90 + 360) % 360;
+            }
+        } else {
+            for (int axis_nr = 0; axis_nr < joystick_get_axis_count(joystick_type[gp]); axis_nr++)
+                joystick_state[gp][js].axis[axis_nr] = 0;
+
+            for (int button_nr = 0; button_nr < joystick_get_button_count(joystick_type[gp]); button_nr++)
+                joystick_state[gp][js].button[button_nr] = 0;
+
+            for (int pov_nr = 0; pov_nr < joystick_get_pov_count(joystick_type[gp]); pov_nr++)
+                joystick_state[gp][js].pov[pov_nr] = -1;
+        }
+    }
+}
+
+#ifdef _WIN32
+void
+win_joystick_handle(UNUSED(void *raw))
+{
+    /* Nothing to be done here, atleast currently */
+}
+#endif
diff --git a/src/qt/sdl_joystick.cpp b/src/qt/sdl_joystick.cpp
deleted file mode 100644
index cdbf102b8..000000000
--- a/src/qt/sdl_joystick.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-// Lifted from wx-sdl2-joystick.c in PCem
-
-#include <SDL2/SDL.h>
-
-#include <algorithm>
-
-extern "C" {
-#include <86box/device.h>
-#include <86box/gameport.h>
-
-int                  joysticks_present;
-joystick_t           joystick_state[MAX_JOYSTICKS];
-plat_joystick_t      plat_joystick_state[MAX_PLAT_JOYSTICKS];
-static SDL_Joystick *sdl_joy[MAX_PLAT_JOYSTICKS];
-}
-
-#include <algorithm>
-
-#ifndef M_PI
-#    define M_PI 3.14159265358979323846
-#endif
-
-void
-joystick_init()
-{
-    if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) != 0) {
-        return;
-    }
-    joysticks_present = SDL_NumJoysticks();
-
-    memset(sdl_joy, 0, sizeof(sdl_joy));
-    for (int c = 0; c < joysticks_present; c++) {
-        sdl_joy[c] = SDL_JoystickOpen(c);
-
-        if (sdl_joy[c]) {
-            int d;
-
-            strncpy(plat_joystick_state[c].name, SDL_JoystickNameForIndex(c), 64);
-            plat_joystick_state[c].nr_axes    = SDL_JoystickNumAxes(sdl_joy[c]);
-            plat_joystick_state[c].nr_buttons = SDL_JoystickNumButtons(sdl_joy[c]);
-            plat_joystick_state[c].nr_povs    = SDL_JoystickNumHats(sdl_joy[c]);
-
-            for (d = 0; d < std::min(plat_joystick_state[c].nr_axes, 8); d++) {
-                snprintf(plat_joystick_state[c].axis[d].name, sizeof(plat_joystick_state[c].axis[d].name), "Axis %i", d);
-                plat_joystick_state[c].axis[d].id = d;
-            }
-            for (d = 0; d < std::min(plat_joystick_state[c].nr_buttons, 8); d++) {
-                snprintf(plat_joystick_state[c].button[d].name, sizeof(plat_joystick_state[c].button[d].name), "Button %i", d);
-                plat_joystick_state[c].button[d].id = d;
-            }
-            for (d = 0; d < std::min(plat_joystick_state[c].nr_povs, 4); d++) {
-                snprintf(plat_joystick_state[c].pov[d].name, sizeof(plat_joystick_state[c].pov[d].name), "POV %i", d);
-                plat_joystick_state[c].pov[d].id = d;
-            }
-        }
-    }
-}
-
-void
-joystick_close()
-{
-    int c;
-
-    for (c = 0; c < joysticks_present; c++) {
-        if (sdl_joy[c])
-            SDL_JoystickClose(sdl_joy[c]);
-    }
-}
-
-static int
-joystick_get_axis(int joystick_nr, int mapping)
-{
-    if (mapping & POV_X) {
-        switch (plat_joystick_state[joystick_nr].p[mapping & 3]) {
-            case SDL_HAT_LEFTUP:
-            case SDL_HAT_LEFT:
-            case SDL_HAT_LEFTDOWN:
-                return -32767;
-
-            case SDL_HAT_RIGHTUP:
-            case SDL_HAT_RIGHT:
-            case SDL_HAT_RIGHTDOWN:
-                return 32767;
-
-            default:
-                return 0;
-        }
-    } else if (mapping & POV_Y) {
-        switch (plat_joystick_state[joystick_nr].p[mapping & 3]) {
-            case SDL_HAT_LEFTUP:
-            case SDL_HAT_UP:
-            case SDL_HAT_RIGHTUP:
-                return -32767;
-
-            case SDL_HAT_LEFTDOWN:
-            case SDL_HAT_DOWN:
-            case SDL_HAT_RIGHTDOWN:
-                return 32767;
-
-            default:
-                return 0;
-        }
-    } else
-        return plat_joystick_state[joystick_nr].a[plat_joystick_state[joystick_nr].axis[mapping].id];
-}
-void
-joystick_process()
-{
-    int c;
-    int d;
-
-    if (!joystick_type)
-        return;
-
-    SDL_JoystickUpdate();
-    for (c = 0; c < joysticks_present; c++) {
-        int b;
-
-        plat_joystick_state[c].a[0] = SDL_JoystickGetAxis(sdl_joy[c], 0);
-        plat_joystick_state[c].a[1] = SDL_JoystickGetAxis(sdl_joy[c], 1);
-        plat_joystick_state[c].a[2] = SDL_JoystickGetAxis(sdl_joy[c], 2);
-        plat_joystick_state[c].a[3] = SDL_JoystickGetAxis(sdl_joy[c], 3);
-        plat_joystick_state[c].a[4] = SDL_JoystickGetAxis(sdl_joy[c], 4);
-        plat_joystick_state[c].a[5] = SDL_JoystickGetAxis(sdl_joy[c], 5);
-
-        for (b = 0; b < 16; b++)
-            plat_joystick_state[c].b[b] = SDL_JoystickGetButton(sdl_joy[c], b);
-
-        for (b = 0; b < 4; b++)
-            plat_joystick_state[c].p[b] = SDL_JoystickGetHat(sdl_joy[c], b);
-        //                pclog("joystick %i - x=%i y=%i b[0]=%i b[1]=%i  %i\n", c, joystick_state[c].x, joystick_state[c].y, joystick_state[c].b[0], joystick_state[c].b[1], joysticks_present);
-    }
-
-    for (c = 0; c < joystick_get_max_joysticks(joystick_type); c++) {
-        if (joystick_state[c].plat_joystick_nr) {
-            int joystick_nr = joystick_state[c].plat_joystick_nr - 1;
-
-            for (d = 0; d < joystick_get_axis_count(joystick_type); d++)
-                joystick_state[c].axis[d] = joystick_get_axis(joystick_nr, joystick_state[c].axis_mapping[d]);
-            for (d = 0; d < joystick_get_button_count(joystick_type); d++)
-                joystick_state[c].button[d] = plat_joystick_state[joystick_nr].b[joystick_state[c].button_mapping[d]];
-            for (d = 0; d < joystick_get_pov_count(joystick_type); d++) {
-                int    x, y;
-                double angle, magnitude;
-
-                x = joystick_get_axis(joystick_nr, joystick_state[c].pov_mapping[d][0]);
-                y = joystick_get_axis(joystick_nr, joystick_state[c].pov_mapping[d][1]);
-
-                angle     = (atan2((double) y, (double) x) * 360.0) / (2 * M_PI);
-                magnitude = sqrt((double) x * (double) x + (double) y * (double) y);
-
-                if (magnitude < 16384)
-                    joystick_state[c].pov[d] = -1;
-                else
-                    joystick_state[c].pov[d] = ((int) angle + 90 + 360) % 360;
-            }
-        } else {
-            for (d = 0; d < joystick_get_axis_count(joystick_type); d++)
-                joystick_state[c].axis[d] = 0;
-            for (d = 0; d < joystick_get_button_count(joystick_type); d++)
-                joystick_state[c].button[d] = 0;
-            for (d = 0; d < joystick_get_pov_count(joystick_type); d++)
-                joystick_state[c].pov[d] = -1;
-        }
-    }
-}
diff --git a/src/qt/win_cdrom_ioctl.c b/src/qt/win_cdrom_ioctl.c
new file mode 100644
index 000000000..6bc2df27c
--- /dev/null
+++ b/src/qt/win_cdrom_ioctl.c
@@ -0,0 +1,851 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Win32 CD-ROM support via IOCTL.
+ *
+ *
+ *
+ * Authors: TheCollector1995, <mariogplayer@gmail.com>,
+ *          Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2023 TheCollector1995.
+ *          Copyright 2023 Miran Grca.
+ */
+#define UNICODE
+#define BITMAP WINDOWS_BITMAP
+#include <windows.h>
+#undef BITMAP
+#include <inttypes.h>
+#include "ntddcdrm.h"
+#include "ntddscsi.h"
+#ifdef ENABLE_IOCTL_LOG
+#include <stdarg.h>
+#endif
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/cdrom.h>
+#include <86box/log.h>
+#include <86box/plat_cdrom_ioctl.h>
+#include <86box/scsi_device.h>
+
+typedef struct ioctl_t {
+    cdrom_t                *dev;
+    void                   *log;
+    int                     is_dvd;
+    int                     has_audio;
+    int                     blocks_num;
+    uint8_t                 cur_rti[65536];
+    HANDLE                  handle;
+    WCHAR                   path[256];
+} ioctl_t;
+
+typedef struct _CDROM_FULL_TOC {
+  UCHAR                         Length[2];
+  UCHAR                         FirstCompleteSession;
+  UCHAR                         LastCompleteSession;
+  CDROM_TOC_FULL_TOC_DATA_BLOCK Descriptors[MAXIMUM_NUMBER_TRACKS + 2];
+} CDROM_FULL_TOC;
+
+static int ioctl_read_dvd_structure(const void *local, uint8_t layer, uint8_t format,
+                                    uint8_t *buffer, uint32_t *info);
+
+#ifdef ENABLE_IOCTL_LOG
+int ioctl_do_log = ENABLE_IOCTL_LOG;
+
+void
+ioctl_log(void *priv, const char *fmt, ...)
+{
+    if (ioctl_do_log) {
+        va_list ap;
+        va_start(ap, fmt);
+        log_out(priv, fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define ioctl_log(priv, fmt, ...)
+#endif
+
+/* Internal functions. */
+static void
+ioctl_close_handle(const ioctl_t *ioctl)
+{
+    if (ioctl->handle != NULL)
+        CloseHandle(ioctl->handle);
+}
+
+static int
+ioctl_open_handle(ioctl_t *ioctl)
+{
+    ioctl_log(ioctl->log, "ioctl->path = \"%ls\"\n", ioctl->path);
+    ioctl->handle = CreateFileW((LPCWSTR) ioctl->path, GENERIC_READ | GENERIC_WRITE,
+                                FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
+                                OPEN_EXISTING, 0, NULL);
+
+    ioctl_log(ioctl->log, "handle=%p, error=%x\n",
+              ioctl->handle, (unsigned int) GetLastError());
+
+    if (ioctl->handle != INVALID_HANDLE_VALUE) {
+        CDROM_SET_SPEED set_speed = { 0 };
+
+        set_speed.RequestType     = CdromSetSpeed;
+        set_speed.ReadSpeed       = 0xffff;
+        set_speed.WriteSpeed      = 0xffff;
+        set_speed.RotationControl = CdromDefaultRotation;
+
+        (void) DeviceIoControl(ioctl->handle, IOCTL_CDROM_SET_SPEED,
+                               &set_speed, sizeof(set_speed),
+                               NULL, 0,
+                               0, NULL);
+    }
+
+    return (ioctl->handle != INVALID_HANDLE_VALUE);
+}
+
+static int
+ioctl_read_normal_toc(ioctl_t *ioctl, uint8_t *toc_buf, int32_t *tracks_num)
+{
+    long                     size            = 0;
+    PCDROM_TOC_FULL_TOC_DATA cur_full_toc    = NULL;
+    CDROM_READ_TOC_EX        cur_read_toc_ex = { 0 };
+
+    *tracks_num = 0;
+    memset(toc_buf, 0x00, 65536);
+
+    cur_full_toc = (PCDROM_TOC_FULL_TOC_DATA) calloc(1, 65536);
+
+    cur_read_toc_ex.Format       = CDROM_READ_TOC_EX_FORMAT_TOC;
+    ioctl_log(ioctl->log, "cur_read_toc_ex.Format = %i\n", cur_read_toc_ex.Format);
+    cur_read_toc_ex.Msf          = 1;
+    cur_read_toc_ex.SessionTrack = 1;
+
+    const int temp = DeviceIoControl(ioctl->handle, IOCTL_CDROM_READ_TOC_EX,
+                                     &cur_read_toc_ex, sizeof(CDROM_READ_TOC_EX),
+                                     cur_full_toc, sizeof(CDROM_TOC),
+                                     (LPDWORD) &size, NULL);
+    ioctl_log(ioctl->log, "temp = %i\n", temp);
+
+    if (temp != 0) {
+        const int length = ((cur_full_toc->Length[0] << 8) | cur_full_toc->Length[1]) + 2;
+        memcpy(toc_buf, cur_full_toc, length);
+        *tracks_num = (length - 4) / 8;
+    }
+
+    free(cur_full_toc);
+
+#ifdef ENABLE_IOCTL_LOG
+    PCDROM_TOC toc = (PCDROM_TOC) toc_buf;
+
+    ioctl_log(ioctl->log, "%i tracks: %02X %02X %02X %02X\n",
+              *tracks_num, toc_buf[0], toc_buf[1], toc_buf[2], toc_buf[3]);
+
+    for (int i = 0; i < *tracks_num; i++) {
+        const uint8_t *t  = (const uint8_t *) &toc->TrackData[i];
+        ioctl_log(ioctl->log, "Track %03i: %02X %02X %02X %02X %02X %02X %02X %02X\n",
+                  i, t[0], t[1], t[2], t[3], t[4], t[5], t[6], t[7]);
+    }
+#endif
+
+    return temp;
+}
+
+static void
+ioctl_read_raw_toc(ioctl_t *ioctl)
+{
+    PCDROM_TOC_FULL_TOC_DATA  cur_full_toc    = NULL;
+    long                      size            = 0;
+    raw_track_info_t         *rti             = (raw_track_info_t *) ioctl->cur_rti;
+    uint8_t                  *buffer          = (uint8_t *) calloc (1, 2052);
+    int                       status          = 0;
+    CDROM_READ_TOC_EX         cur_read_toc_ex = { 0 };
+
+    ioctl->is_dvd = (ioctl_read_dvd_structure(ioctl, 0, 0, buffer, NULL) > 0);
+    free(buffer);
+
+    ioctl->has_audio  = 0;
+    ioctl->blocks_num = 0;
+    memset(ioctl->cur_rti, 0x00, 65536);
+
+    cur_full_toc = (PCDROM_TOC_FULL_TOC_DATA) calloc(1, 65536);
+
+    cur_read_toc_ex.Format       = CDROM_READ_TOC_EX_FORMAT_FULL_TOC;
+    ioctl_log(ioctl->log, "cur_read_toc_ex.Format = %i\n", cur_read_toc_ex.Format);
+    cur_read_toc_ex.Msf          = 1;
+    cur_read_toc_ex.SessionTrack = 1;
+
+    if (!ioctl->is_dvd) {
+        status = DeviceIoControl(ioctl->handle, IOCTL_CDROM_READ_TOC_EX,
+                                 &cur_read_toc_ex, sizeof(CDROM_READ_TOC_EX),
+                                 cur_full_toc, sizeof(CDROM_FULL_TOC),
+                                 (LPDWORD) &size, NULL);
+        ioctl_log(ioctl->log, "status = %i\n", status);
+    }
+
+    if (status == 0) {
+        /*
+           This is needed because in some circumstances (eg. a DVD .MDS
+           mounted in Daemon Tools), reading the raw TOC fails but
+           reading the cooked TOC does not, so we have to construct the
+           raw TOC from the cooked TOC.
+         */
+        uint8_t           cur_toc[65536] = { 0 };
+        int32_t           tracks_num     = 0;
+
+        const CDROM_TOC * toc            = (const CDROM_TOC *) cur_toc;
+
+        status                           = ioctl_read_normal_toc(ioctl, cur_toc, &tracks_num);
+
+        const TRACK_DATA *ct             = &(toc->TrackData[tracks_num - 1]);
+
+        if ((status > 0) && (tracks_num >= 1)) {
+            rti[0].adr_ctl = ((ct->Adr & 0xf) << 4) | (ct->Control & 0xf);
+            rti[0].point   = 0xa0;
+            rti[0].pm      = toc->FirstTrack;
+
+            rti[1].adr_ctl = rti[0].adr_ctl;
+            rti[1].point   = 0xa1;
+            rti[1].pm      = toc->LastTrack;
+
+            rti[2].adr_ctl = rti[0].adr_ctl;
+            rti[2].point   = 0xa2;
+            rti[2].pm      = ct->Address[1];
+            rti[2].ps      = ct->Address[2];
+            rti[2].pf      = ct->Address[3];
+
+            ioctl->blocks_num = 3;
+
+            for (int i = 0; i < (tracks_num - 1); i++) {
+                raw_track_info_t *crt = &(rti[ioctl->blocks_num]);
+
+                ct           = &(toc->TrackData[i]);
+
+                crt->adr_ctl = ((ct->Adr & 0xf) << 4) | (ct->Control & 0xf);
+                crt->point   = ct->TrackNumber;
+                crt->pm      = ct->Address[1];
+                crt->ps      = ct->Address[2];
+                crt->pf      = ct->Address[3];
+
+                ioctl->blocks_num++;
+            }
+        } else if (status > 0)
+           /* Announce that we've had a failure. */
+           status = 0;
+    } else if (status != 0) {
+        ioctl->blocks_num = (((cur_full_toc->Length[0] << 8) |
+                              cur_full_toc->Length[1]) - 2) / 11;
+        memcpy(ioctl->cur_rti, cur_full_toc->Descriptors, ioctl->blocks_num * 11);
+    }
+
+    if (ioctl->blocks_num)  for (int i = 0; i < ioctl->blocks_num; i++) {
+        const raw_track_info_t *crt = &(rti[i]);
+
+        if ((crt->point >= 1) && (crt->point <= 99) && !(crt->adr_ctl & 0x04)) {
+            ioctl->has_audio = 1;
+            break;
+        }
+    }
+
+#ifdef ENABLE_IOCTL_LOG
+    uint8_t                  *u            = (uint8_t *) cur_full_toc;
+
+    ioctl_log(ioctl->log, "%i blocks: %02X %02X %02X %02X\n",
+              ioctl->blocks_num, u[0], u[1], u[2], u[3]);
+
+    for (int i = 0; i < ioctl->blocks_num; i++) {
+        uint8_t *t  = (uint8_t *) &rti[i];
+        ioctl_log(ioctl->log, "Block %03i: %02X %02X %02X %02X %02X %02X %02X %02X "
+                  "%02X %02X %02X\n",
+                  i, t[0], t[1], t[2], t[3], t[4], t[5], t[6], t[7], t[8],
+                  t[9], t[10]);
+    }
+#endif
+
+    free(cur_full_toc);
+}
+
+static int
+ioctl_get_track(const ioctl_t *ioctl, const uint32_t sector) {
+    raw_track_info_t *rti   = (raw_track_info_t *) ioctl->cur_rti;
+    int               track = -1;
+
+    for (int i = (ioctl->blocks_num - 1); i >= 0; i--) {
+         const raw_track_info_t *ct    = &(rti[i]);
+         const uint32_t          start = (ct->pm * 60 * 75) + (ct->ps * 75) + ct->pf - 150;
+
+         ioctl_log(ioctl->log, "ioctl_get_track(): ct: %02X, %08X\n",
+                   ct->point, start);
+
+         if ((ct->point >= 1) && (ct->point <= 99) && (sector >= start)) {
+             track = i;
+             ioctl_log(ioctl->log, "ioctl_get_track(): found track: %i\n", i);
+             break;
+         }
+    }
+
+    return track;
+}
+
+static int
+ioctl_is_track_audio(const ioctl_t *ioctl, const uint32_t pos)
+{
+    const raw_track_info_t *rti     = (const raw_track_info_t *) ioctl->cur_rti;
+    int                     ret     = 0;
+
+    if (ioctl->has_audio && !ioctl->is_dvd) {
+        const int track   = ioctl_get_track(ioctl, pos);
+        const int control = rti[track].adr_ctl;
+
+        ret     = !(control & 0x04);
+
+        ioctl_log(ioctl->log, "ioctl_is_track_audio(%08X, %02X): %i\n", pos, track, ret);
+    }
+
+    return ret;
+}
+
+/* Shared functions. */
+static int
+ioctl_get_track_info(const void *local, const uint32_t track,
+                     int end, track_info_t *ti)
+{
+    const ioctl_t *         ioctl = (const ioctl_t *) local;
+    const raw_track_info_t *rti   = (const raw_track_info_t *) ioctl->cur_rti;
+    int                     ret   = 1;
+    int                     trk   = -1;
+    int                     next  = -1;
+
+    if ((track >= 1) && (track < 99))
+        for (int i = 0; i < ioctl->blocks_num; i++)
+             if (rti[i].point == track) {
+                 trk = i;
+                 break;
+             }
+
+    if ((track >= 1) && (track < 98))
+        for (int i = 0; i < ioctl->blocks_num; i++)
+             if ((rti[i].point == (track + 1)) && (rti[i].session == rti[trk].session)) {
+                 next = i;
+                 break;
+             }
+
+    if ((track >= 1) && (track < 99) && (trk != -1) && (next == -1))
+        for (int i = 0; i < ioctl->blocks_num; i++)
+            if ((rti[i].point == 0xa2) && (rti[i].session == rti[trk].session)) {
+                next = i;
+                break;
+            }
+
+    if ((track == 0xaa) || (trk == -1)) {
+        ioctl_log(ioctl->log, "ioctl_get_track_info(%02i)\n", track);
+        ret = 0;
+    } else {
+        if (end) {
+            if (next != -1) {
+                ti->m      = rti[next].pm;
+                ti->s      = rti[next].ps;
+                ti->f      = rti[next].pf;
+            }
+        } else {
+            ti->m      = rti[trk].pm;
+            ti->s      = rti[trk].ps;
+            ti->f      = rti[trk].pf;
+        }
+
+        ti->number = rti[trk].point;
+        ti->attr   = rti[trk].adr_ctl;
+
+        ioctl_log(ioctl->log, "ioctl_get_track_info(%02i): %02i:%02i:%02i, %02i, %02X\n",
+                  track, ti->m, ti->s, ti->f, ti->number, ti->attr);
+    }
+
+    return ret;
+}
+
+static void
+ioctl_get_raw_track_info(const void *local, int *num, uint8_t *rti)
+{
+    const ioctl_t *ioctl = (const ioctl_t *) local;
+
+    *num = ioctl->blocks_num;
+    memcpy(rti, ioctl->cur_rti, ioctl->blocks_num * 11);
+}
+
+static int
+ioctl_is_track_pre(const void *local, const uint32_t sector)
+{
+    const ioctl_t          *ioctl   = (const ioctl_t *) local;
+    const raw_track_info_t *rti     = (const raw_track_info_t *) ioctl->cur_rti;
+    int                     ret     = 0;
+
+    if (ioctl->has_audio && !ioctl->is_dvd) {
+        const int track   = ioctl_get_track(ioctl, sector);
+        const int control = rti[track].adr_ctl;
+
+        ret     = control & 0x01;
+
+        ioctl_log(ioctl->log, "ioctl_is_track_pre(%08X, %02X): %i\n", sector, track, ret);
+    }
+
+    return ret;
+}
+
+static int
+ioctl_read_sector(const void *local, uint8_t *buffer, uint32_t const sector)
+{
+    typedef struct SCSI_PASS_THROUGH_DIRECT_BUF {
+        SCSI_PASS_THROUGH_DIRECT spt;
+        ULONG                    Filler;
+        UCHAR                    SenseBuf[64];
+    } SCSI_PASS_THROUGH_DIRECT_BUF;
+
+    const ioctl_t *              ioctl     = (const ioctl_t *) local;
+    const raw_track_info_t *     rti       = (raw_track_info_t *) ioctl->cur_rti;
+    unsigned long int            unused    = 0;
+    const int                    sc_offs   = (sector == 0xffffffff) ? 0 : 2352;
+    int                          len       = (sector == 0xffffffff) ? 16 : 2368;
+    int                          m         = 0;
+    int                          s         = 0;
+    int                          f         = 0;
+    uint32_t                     lba       = sector;
+    int                          ret;
+    SCSI_PASS_THROUGH_DIRECT_BUF req;
+
+    if (ioctl->is_dvd) {
+        int                          track;
+
+        req.spt.DataTransferLength    = 0;
+        ret                           = 0;
+
+        if (lba == 0xffffffff) {
+            lba                           = ioctl->dev->seek_pos;
+            track                         = ioctl_get_track(ioctl, lba);
+
+            if (track != -1) {
+                req.spt.DataTransferLength    = len;
+                ret                           = 1;
+            }
+        } else {
+            len                           = COOKED_SECTOR_SIZE;
+            track                         = ioctl_get_track(ioctl, lba);
+
+            if (track != -1) {
+                DWORD newPos = SetFilePointer(ioctl->handle, (long) lba * COOKED_SECTOR_SIZE,
+                                              0, FILE_BEGIN);
+
+                if (newPos != 0xffffffff)
+                    ret = ReadFile(ioctl->handle, &(buffer[16]),
+                                   COOKED_SECTOR_SIZE, (LPDWORD) &req.spt.DataTransferLength,
+                                   NULL);
+            }
+        }
+
+        if (ret && (req.spt.DataTransferLength >= len) && (track != -1)) {
+            const raw_track_info_t *ct    = &(rti[track]);
+            const uint32_t          start = (ct->pm * 60 * 75) + (ct->ps * 75) + ct->pf;
+
+            m     = s = f = 0;
+
+            /* Construct sector header and sub-header. */
+            if (sector != 0xffffffff) {
+                /* Sync bytes. */
+                buffer[0] = 0x00;
+                memset(&(buffer[1]), 0xff, 10);
+                buffer[11] = 0x00;
+
+                /* Sector header. */
+                FRAMES_TO_MSF(lba + 150, &m, &s, &f);
+                buffer[12] = bin2bcd(m);
+                buffer[13] = bin2bcd(s);
+                buffer[14] = bin2bcd(f);
+
+                /* Mode 1 data. */
+                buffer[15] = 0x01;
+            }
+
+            /* Construct Q. */
+            buffer[sc_offs + 0] = (ct->adr_ctl >> 4) | ((ct->adr_ctl & 0xf) << 4);
+            buffer[sc_offs + 1] = bin2bcd(ct->point);
+            buffer[sc_offs + 2] = 1;
+            FRAMES_TO_MSF((int32_t) (lba + 150 - start), &m, &s, &f);
+            buffer[sc_offs + 3] = bin2bcd(m);
+            buffer[sc_offs + 4] = bin2bcd(s);
+            buffer[sc_offs + 5] = bin2bcd(f);
+            FRAMES_TO_MSF(lba + 150, &m, &s, &f);
+            buffer[sc_offs + 7] = bin2bcd(m);
+            buffer[sc_offs + 8] = bin2bcd(s);
+            buffer[sc_offs + 9] = bin2bcd(f);
+        }
+    } else {
+        memset(&req, 0x00, sizeof(SCSI_PASS_THROUGH_DIRECT_BUF));
+        req.spt.Length                = sizeof(SCSI_PASS_THROUGH_DIRECT);
+        req.spt.PathId                = 0;
+        req.spt.TargetId              = 1;
+        req.spt.Lun                   = 0;
+        req.spt.CdbLength             = 12;
+        req.spt.DataIn                = SCSI_IOCTL_DATA_IN;
+        req.spt.SenseInfoLength       = sizeof(req.SenseBuf);
+        req.spt.DataTransferLength    = len;
+        req.spt.TimeOutValue          = 6;
+        req.spt.DataBuffer            = buffer;
+        req.spt.SenseInfoOffset       = offsetof(SCSI_PASS_THROUGH_DIRECT_BUF, SenseBuf);
+
+        /* Fill in the CDB. */
+        req.spt.Cdb[0]                 = 0xbe;             /* READ CD */
+        req.spt.Cdb[1]                 = 0x00;
+        req.spt.Cdb[2]                 = (sector >> 24) & 0xff;
+        req.spt.Cdb[3]                 = (sector >> 16) & 0xff;
+        req.spt.Cdb[4]                 = (sector >> 8) & 0xff;
+        req.spt.Cdb[5]                 = sector & 0xff;    /* Starting Logical Block Address. */
+        req.spt.Cdb[6]                 = 0x00;
+        req.spt.Cdb[7]                 = 0x00;
+        req.spt.Cdb[8]                 = 0x01;             /* Transfer Length. */
+        /* If sector is FFFFFFFF, only return the subchannel. */
+        req.spt.Cdb[9]                 = (sector == 0xffffffff) ? 0x00 : 0xf8;
+        req.spt.Cdb[10]                = 0x02;
+        req.spt.Cdb[11]                = 0x00;
+        DWORD length                   = sizeof(SCSI_PASS_THROUGH_DIRECT_BUF);
+
+#ifdef ENABLE_IOCTL_LOG
+        uint8_t *cdb = (uint8_t *) req.spt.Cdb;
+        ioctl_log(ioctl->log, "Host CDB: %02X %02X %02X %02X %02X %02X "
+                  "%02X %02X %02X %02X %02X %02X\n",
+                  ioctl->dev->id, cdb[0], cdb[1], cdb[2], cdb[3], cdb[4], cdb[5],
+                  cdb[6], cdb[7], cdb[8], cdb[9], cdb[10], cdb[11]);
+#endif
+
+        ret = DeviceIoControl(ioctl->handle, IOCTL_SCSI_PASS_THROUGH_DIRECT,
+                              &req, length,
+                              &req, length, &unused, NULL);
+    }
+
+    ioctl_log(ioctl->log, "ioctl_read_sector: ret = %d, req.spt.DataTransferLength = %lu\n",
+              ret, req.spt.DataTransferLength);
+    ioctl_log(ioctl->log, "Sense: %08X, %08X\n", req.spt.SenseInfoLength, req.spt.SenseInfoOffset);
+    if (req.spt.SenseInfoLength >= 16) {
+        uint8_t *cdb = (uint8_t *) req.SenseBuf;
+        if ((cdb[2] == 0x03) && (cdb[12] == 0x11))
+            /* Treat this as an error to corectly indicate CIRC error to the guest. */
+            ret = 0;
+        ioctl_log(ioctl->log, "Host sense: %02X %02X %02X %02X %02X %02X %02X %02X\n",
+                  cdb[0], cdb[1], cdb[ 2], cdb[ 3], cdb[ 4], cdb[ 5], cdb[ 6], cdb[ 7]);
+        ioctl_log(ioctl->log, "            %02X %02X %02X %02X %02X %02X %02X %02X\n",
+                  cdb[8], cdb[9], cdb[10], cdb[11], cdb[12], cdb[13], cdb[14], cdb[15]);
+    }
+
+    ret = (!!ret > 0) ? (req.spt.DataTransferLength >= len) : -1;
+    ioctl_log(ioctl->log, "iocl_read_sector: final ret = %i\n", ret);
+
+    /* Construct raw subchannel data from Q only. */
+    if ((ret > 0) && (req.spt.DataTransferLength >= len))
+        for (int i = 11; i >= 0; i--)
+             for (int j = 7; j >= 0; j--)
+                  buffer[2352 + (i * 8) + j] = ((buffer[sc_offs + i] >> (7 - j)) & 0x01) << 6;
+
+    return ret;
+}
+
+static uint8_t
+ioctl_get_track_type(const void *local, const uint32_t sector)
+{
+    ioctl_t *               ioctl = (ioctl_t *) local;
+    int                     track = ioctl_get_track(ioctl, sector);
+    raw_track_info_t *      rti   = (raw_track_info_t *) ioctl->cur_rti;
+    const raw_track_info_t *trk   = &(rti[track]);
+    uint8_t                 ret   = 0x00;
+
+    if (ioctl_is_track_audio(ioctl, sector))
+        ret = CD_TRACK_AUDIO;
+    else  if (track != -1)  for (int i = 0; i < ioctl->blocks_num; i++) {
+        const raw_track_info_t *ct = &(rti[i]);
+        const raw_track_info_t *nt = &(rti[i + 1]);
+
+        if (ct->point == 0xa0) {
+            uint8_t first = ct->pm;
+            uint8_t last  = nt->pm;
+
+            if ((trk->point >= first) && (trk->point <= last)) {
+                ret = ct->ps;
+                break;
+            }
+        }
+    }
+
+    return ret;
+}
+
+static uint32_t
+ioctl_get_last_block(const void *local)
+{
+    const ioctl_t *  ioctl = (const ioctl_t *) local;
+    raw_track_info_t *rti  = (raw_track_info_t *) ioctl->cur_rti;
+    uint32_t         lb      = 0;
+
+    for (int i = (ioctl->blocks_num - 1); i >= 0; i--)
+        if (rti[i].point == 0xa2) {
+            lb = MSFtoLBA(rti[i].pm, rti[i].ps, rti[i].pf) - 151;
+            break;
+        }
+
+    ioctl_log(ioctl->log, "LBCapacity=%d\n", lb);
+
+    return lb;
+}
+
+static int
+ioctl_read_dvd_structure(const void *local, const uint8_t layer, const uint8_t format,
+                         uint8_t *buffer, uint32_t *info)
+{
+    typedef struct SCSI_PASS_THROUGH_DIRECT_BUF {
+        SCSI_PASS_THROUGH_DIRECT spt;
+        ULONG                    Filler;
+        UCHAR                    SenseBuf[64];
+    } SCSI_PASS_THROUGH_DIRECT_BUF;
+
+    const ioctl_t *              ioctl   = (const ioctl_t *) local;
+    unsigned long int            unused  = 0;
+    const int                    len     = 2052;
+    SCSI_PASS_THROUGH_DIRECT_BUF req;
+
+    memset(&req, 0x00, sizeof(SCSI_PASS_THROUGH_DIRECT_BUF));
+    req.spt.Length                = sizeof(SCSI_PASS_THROUGH_DIRECT);
+    req.spt.PathId                = 0;
+    req.spt.TargetId              = 1;
+    req.spt.Lun                   = 0;
+    req.spt.CdbLength             = 12;
+    req.spt.DataIn                = SCSI_IOCTL_DATA_IN;
+    req.spt.SenseInfoLength       = sizeof(req.SenseBuf);
+    req.spt.DataTransferLength    = len;
+    req.spt.TimeOutValue          = 6;
+    req.spt.DataBuffer            = buffer;
+    req.spt.SenseInfoOffset       = offsetof(SCSI_PASS_THROUGH_DIRECT_BUF, SenseBuf);
+
+    /* Fill in the CDB. */
+    req.spt.Cdb[0]                 = 0xad;
+    req.spt.Cdb[1]                 = 0x00;
+    req.spt.Cdb[2]                 = 0x00;
+    req.spt.Cdb[3]                 = 0x00;
+    req.spt.Cdb[4]                 = 0x00;
+    req.spt.Cdb[5]                 = 0x00;
+    req.spt.Cdb[6]                 = layer;   /* Layer Number */
+    req.spt.Cdb[7]                 = format;  /* Format */
+    req.spt.Cdb[8]                 = 0x08;    /* Allocation Length */
+    req.spt.Cdb[9]                 = 0x04;
+    req.spt.Cdb[10]                = 0x00;    /* AGID */
+    req.spt.Cdb[11]                = 0x00;
+
+    DWORD length                   = sizeof(SCSI_PASS_THROUGH_DIRECT_BUF);
+
+#ifdef ENABLE_IOCTL_LOG
+    uint8_t *cdb = (uint8_t *) req.spt.Cdb;
+    ioctl_log(ioctl->log, "Host CDB: %02X %02X %02X %02X %02X %02X "
+              "%02X %02X %02X %02X %02X %02X\n",
+              cdb[0], cdb[1], cdb[2], cdb[3], cdb[4], cdb[5],
+              cdb[6], cdb[7], cdb[8], cdb[9], cdb[10], cdb[11]);
+#endif
+
+    int ret = DeviceIoControl(ioctl->handle, IOCTL_SCSI_PASS_THROUGH_DIRECT,
+                              &req, length,
+                              &req, length,
+                              &unused, NULL);
+
+    ioctl_log(ioctl->log, "ioctl_read_dvd_structure(): ret = %d, "
+              "req.spt.DataTransferLength = %lu\n",
+              ret, req.spt.DataTransferLength);
+    ioctl_log(ioctl->log, "Sense: %08X, %08X\n", req.spt.SenseInfoLength,
+              req.spt.SenseInfoOffset);
+
+    if (req.spt.SenseInfoLength >= 16) {
+        uint8_t *sb = (uint8_t *) req.SenseBuf;
+        /* Return sense to the host as is. */
+        ret = -((sb[2] << 16) | (sb[12] << 8) | sb[13]);
+        if (info != NULL)
+            *info = *(uint32_t *) &(sb[3]);
+        ioctl_log(ioctl->log, "Host sense: %02X %02X %02X %02X %02X %02X %02X %02X\n",
+                  sb[0], sb[1], sb[ 2], sb[ 3], sb[ 4], sb[ 5], sb[ 6], sb[ 7]);
+        ioctl_log(ioctl->log, "            %02X %02X %02X %02X %02X %02X %02X %02X\n",
+                  sb[8], sb[9], sb[10], sb[11], sb[12], sb[13], sb[14], sb[15]);
+    } else
+        ret = ret ? (req.spt.DataTransferLength >= len) : 0;
+
+    return ret;
+}
+
+static int
+ioctl_is_dvd(const void *local)
+{
+    const ioctl_t *ioctl = (const ioctl_t *) local;
+
+    return ioctl->is_dvd;
+}
+
+static int
+ioctl_has_audio(const void *local)
+{
+    const ioctl_t *ioctl = (const ioctl_t *) local;
+
+    return ioctl->has_audio;
+}
+
+static int
+ioctl_is_empty(const void *local)
+{
+    typedef struct SCSI_PASS_THROUGH_DIRECT_BUF {
+        SCSI_PASS_THROUGH_DIRECT spt;
+        ULONG                    Filler;
+        UCHAR                    SenseBuf[64];
+    } SCSI_PASS_THROUGH_DIRECT_BUF;
+
+    const ioctl_t *              ioctl   = (const ioctl_t *) local;
+    unsigned long int            unused  = 0;
+    SCSI_PASS_THROUGH_DIRECT_BUF req;
+
+    memset(&req, 0x00, sizeof(SCSI_PASS_THROUGH_DIRECT_BUF));
+    req.spt.Length                = sizeof(SCSI_PASS_THROUGH_DIRECT);
+    req.spt.PathId                = 0;
+    req.spt.TargetId              = 1;
+    req.spt.Lun                   = 0;
+    req.spt.CdbLength             = 12;
+    req.spt.DataIn                = SCSI_IOCTL_DATA_IN;
+    req.spt.SenseInfoLength       = sizeof(req.SenseBuf);
+    req.spt.DataTransferLength    = 0;
+    req.spt.TimeOutValue          = 6;
+    req.spt.DataBuffer            = NULL;
+    req.spt.SenseInfoOffset       = offsetof(SCSI_PASS_THROUGH_DIRECT_BUF, SenseBuf);
+
+    /* Fill in the CDB. */
+    req.spt.Cdb[0]                 = 0x00;
+    req.spt.Cdb[1]                 = 0x00;
+    req.spt.Cdb[2]                 = 0x00;
+    req.spt.Cdb[3]                 = 0x00;
+    req.spt.Cdb[4]                 = 0x00;
+    req.spt.Cdb[5]                 = 0x00;
+    req.spt.Cdb[6]                 = 0x00;
+    req.spt.Cdb[7]                 = 0x00;
+    req.spt.Cdb[8]                 = 0x00;
+    req.spt.Cdb[9]                 = 0x00;
+    req.spt.Cdb[10]                = 0x00;
+    req.spt.Cdb[11]                = 0x00;
+
+    DWORD length                   = sizeof(SCSI_PASS_THROUGH_DIRECT_BUF);
+
+#ifdef ENABLE_IOCTL_LOG
+    uint8_t *cdb = (uint8_t *) req.spt.Cdb;
+    ioctl_log(ioctl->log, "Host CDB: %02X %02X %02X %02X %02X %02X "
+              "%02X %02X %02X %02X %02X %02X\n",
+              cdb[0], cdb[1], cdb[2], cdb[3], cdb[4], cdb[5],
+              cdb[6], cdb[7], cdb[8], cdb[9], cdb[10], cdb[11]);
+#endif
+
+    int ret = DeviceIoControl(ioctl->handle, IOCTL_SCSI_PASS_THROUGH_DIRECT,
+                              &req, length,
+                              &req, length,
+                              &unused, NULL);
+
+    ioctl_log(ioctl->log, "ioctl_read_dvd_structure(): ret = %d, "
+              "req.spt.DataTransferLength = %lu\n",
+              ret, req.spt.DataTransferLength);
+    ioctl_log(ioctl->log, "Sense: %08X, %08X\n", req.spt.SenseInfoLength,
+              req.spt.SenseInfoOffset);
+
+    if (req.spt.SenseInfoLength >= 16) {
+        uint8_t *sb = (uint8_t *) req.SenseBuf;
+        /* Return sense to the host as is. */
+        ret = ((sb[2] == SENSE_NOT_READY) && (sb[12] == ASC_MEDIUM_NOT_PRESENT));
+        ioctl_log(ioctl->log, "Host sense: %02X %02X %02X %02X %02X %02X %02X %02X\n",
+                  sb[0], sb[1], sb[ 2], sb[ 3], sb[ 4], sb[ 5], sb[ 6], sb[ 7]);
+        ioctl_log(ioctl->log, "            %02X %02X %02X %02X %02X %02X %02X %02X\n",
+                  sb[8], sb[9], sb[10], sb[11], sb[12], sb[13], sb[14], sb[15]);
+    } else
+        ret = 0;
+
+    return ret;
+}
+
+static void
+ioctl_close(void *local)
+{
+    ioctl_t *ioctl = (ioctl_t *) local;
+
+    ioctl_close_handle(ioctl);
+    ioctl->handle = NULL;
+
+    ioctl_log(ioctl->log, "Log closed\n");
+
+    log_close(ioctl->log);
+    ioctl->log = NULL;
+
+    cdrom_assigned_letters &= ~(1 << ioctl->dev->host_letter);
+    ioctl->dev->host_letter = 0xff;
+
+    free(ioctl);
+}
+
+static void
+ioctl_load(const void *local)
+{
+    const ioctl_t *ioctl = (const ioctl_t *) local;
+
+    if ((ioctl->handle != NULL) || ioctl_open_handle((ioctl_t *) ioctl)) {
+        long size = 0;
+        (void) DeviceIoControl(ioctl->handle, IOCTL_STORAGE_LOAD_MEDIA,
+                               NULL, 0, NULL, 0,
+                               (LPDWORD) &size, NULL);
+
+        ioctl_read_raw_toc((ioctl_t *) ioctl);
+    }
+}
+
+static const cdrom_ops_t ioctl_ops = {
+    ioctl_get_track_info,
+    ioctl_get_raw_track_info,
+    ioctl_is_track_pre,
+    ioctl_read_sector,
+    ioctl_get_track_type,
+    ioctl_get_last_block,
+    ioctl_read_dvd_structure,
+    ioctl_is_dvd,
+    ioctl_has_audio,
+    ioctl_is_empty,
+    ioctl_close,
+    ioctl_load
+};
+
+/* Public functions. */
+void *
+ioctl_open(cdrom_t *dev, const char *drv)
+{
+    ioctl_t *ioctl = (ioctl_t *) calloc(1, sizeof(ioctl_t));
+
+    if (ioctl != NULL) {
+        char n[1024]            = { 0 };
+
+        sprintf(n, "CD-ROM %i IOCtl", dev->id + 1);
+        ioctl->log              = log_open(n);
+
+        memset(ioctl->path, 0x00, sizeof(ioctl->path));
+
+        wsprintf(ioctl->path, L"%S", &(drv[8]));
+        ioctl_log(ioctl->log, "Path is %S\n", ioctl->path);
+
+        ioctl->dev              = dev;
+
+        dev->ops                = &ioctl_ops;
+
+        dev->host_letter        = (drv[12] & 0xdf) - 0x41;
+        cdrom_assigned_letters |= (1 << dev->host_letter);
+
+        ioctl_load(ioctl);
+    }
+
+    return ioctl;
+}
diff --git a/src/qt/win_dynld.c b/src/qt/win_dynld.c
index 88fb632bc..e4d9d5a13 100644
--- a/src/qt/win_dynld.c
+++ b/src/qt/win_dynld.c
@@ -51,7 +51,7 @@ dynld_module(const char *name, dllimp_t *table)
     void     *func;
 
     /* See if we can load the desired module. */
-    if ((h = LoadLibrary(name)) == NULL) {
+    if ((h = LoadLibraryA(name)) == NULL) {
         dynld_log("DynLd(\"%s\"): library not found! (%08X)\n", name, GetLastError());
         return (NULL);
     }
diff --git a/src/qt/win_joystick_rawinput.c b/src/qt/win_joystick_rawinput.c
index 7ee0e8227..24ad87f63 100644
--- a/src/qt/win_joystick_rawinput.c
+++ b/src/qt/win_joystick_rawinput.c
@@ -8,15 +8,13 @@
  *
  *          RawInput joystick interface.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *          GH Cao, <driver1998.ms@outlook.com>
- *          Jasmine Iwanek,
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
  *          Copyright 2016-2018 Miran Grca.
  *          Copyright 2020 GH Cao.
- *          Copyright 2021-2023 Jasmine Iwanek.
+ *          Copyright 2021-2025 Jasmine Iwanek.
  */
 #include <windows.h>
 #include <windowsx.h>
@@ -35,6 +33,29 @@
 #include <86box/gameport.h>
 #include <86box/win.h>
 
+/* These are defined in hidusage.h in the Windows SDK, but not in mingw-w64. */
+#ifndef HID_USAGE_SIMULATION_AILERON
+#    define HID_USAGE_SIMULATION_AILERON ((USAGE) 0xb0)
+#endif
+#ifndef HID_USAGE_SIMULATION_ELEVATOR
+#    define HID_USAGE_SIMULATION_ELEVATOR ((USAGE) 0xb8)
+#endif
+#ifndef HID_USAGE_SIMULATION_ACCELLERATOR
+#    define HID_USAGE_SIMULATION_ACCELLERATOR ((USAGE) 0xc4)
+#endif
+#ifndef HID_USAGE_SIMULATION_BRAKE
+#    define HID_USAGE_SIMULATION_BRAKE ((USAGE) 0xc5)
+#endif
+#ifndef HID_USAGE_SIMULATION_CLUTCH
+#    define HID_USAGE_SIMULATION_CLUTCH ((USAGE) 0xc6)
+#endif
+#ifndef HID_USAGE_SIMULATION_SHIFTER
+#    define HID_USAGE_SIMULATION_SHIFTER ((USAGE) 0xc7)
+#endif
+#ifndef HID_USAGE_SIMULATION_STEERING
+#    define HID_USAGE_SIMULATION_STEERING ((USAGE) 0xc8)
+#endif
+
 #ifdef ENABLE_JOYSTICK_LOG
 int joystick_do_log = ENABLE_JOYSTICK_LOG;
 
@@ -65,27 +86,27 @@ typedef struct {
         USHORT bitsize;
         LONG   max;
         LONG   min;
-    } axis[8];
+    } axis[MAX_JOY_AXES];
 
     struct raw_pov_t {
         USAGE  usage;
         USHORT link;
         LONG   max;
         LONG   min;
-    } pov[4];
+    } pov[MAX_JOY_POVS];
 } raw_joystick_t;
 
-plat_joystick_t plat_joystick_state[MAX_PLAT_JOYSTICKS];
-joystick_t      joystick_state[MAX_JOYSTICKS];
-int             joysticks_present = 0;
+int                   joysticks_present = 0;
+joystick_state_t      joystick_state[GAMEPORT_MAX][MAX_JOYSTICKS];
+plat_joystick_state_t plat_joystick_state[MAX_PLAT_JOYSTICKS];
 
 raw_joystick_t raw_joystick_state[MAX_PLAT_JOYSTICKS];
 
 /* We only use the first 32 buttons reported, from Usage ID 1-128 */
 void
-joystick_add_button(raw_joystick_t *rawjoy, plat_joystick_t *joy, USAGE usage)
+joystick_add_button(raw_joystick_t *rawjoy, plat_joystick_state_t *joy, USAGE usage)
 {
-    if (joy->nr_buttons >= 32)
+    if (joy->nr_buttons >= MAX_JOY_BUTTONS)
         return;
     if (usage < 1 || usage > 128)
         return;
@@ -96,9 +117,9 @@ joystick_add_button(raw_joystick_t *rawjoy, plat_joystick_t *joy, USAGE usage)
 }
 
 void
-joystick_add_axis(raw_joystick_t *rawjoy, plat_joystick_t *joy, PHIDP_VALUE_CAPS prop)
+joystick_add_axis(raw_joystick_t *rawjoy, plat_joystick_state_t *joy, PHIDP_VALUE_CAPS prop)
 {
-    if (joy->nr_axes >= 8)
+    if (joy->nr_axes >= MAX_JOY_AXES)
         return;
 
     switch (prop->Range.UsageMin) {
@@ -120,6 +141,42 @@ joystick_add_axis(raw_joystick_t *rawjoy, plat_joystick_t *joy, PHIDP_VALUE_CAPS
         case HID_USAGE_GENERIC_RZ:
             sprintf(joy->axis[joy->nr_axes].name, "RZ");
             break;
+        case HID_USAGE_GENERIC_SLIDER:
+            sprintf(joy->axis[joy->nr_axes].name, "Slider");
+            break;
+        case HID_USAGE_GENERIC_DIAL:
+            sprintf(joy->axis[joy->nr_axes].name, "Dial");
+            break;
+        case HID_USAGE_GENERIC_WHEEL:
+            sprintf(joy->axis[joy->nr_axes].name, "Wheel");
+            break;
+        case HID_USAGE_SIMULATION_AILERON:
+            sprintf(joy->axis[joy->nr_axes].name, "Aileron");
+            break;
+        case HID_USAGE_SIMULATION_ELEVATOR:
+            sprintf(joy->axis[joy->nr_axes].name, "Elevator");
+            break;
+        case HID_USAGE_SIMULATION_RUDDER:
+            sprintf(joy->axis[joy->nr_axes].name, "Rudder");
+            break;
+        case HID_USAGE_SIMULATION_THROTTLE:
+            sprintf(joy->axis[joy->nr_axes].name, "Throttle");
+            break;
+        case HID_USAGE_SIMULATION_ACCELLERATOR:
+            sprintf(joy->axis[joy->nr_axes].name, "Accelerator");
+            break;
+        case HID_USAGE_SIMULATION_BRAKE:
+            sprintf(joy->axis[joy->nr_axes].name, "Brake");
+            break;
+        case HID_USAGE_SIMULATION_CLUTCH:
+            sprintf(joy->axis[joy->nr_axes].name, "Clutch");
+            break;
+        case HID_USAGE_SIMULATION_SHIFTER:
+            sprintf(joy->axis[joy->nr_axes].name, "Shifter");
+            break;
+        case HID_USAGE_SIMULATION_STEERING:
+            sprintf(joy->axis[joy->nr_axes].name, "Steering");
+            break;
         default:
             return;
     }
@@ -145,9 +202,9 @@ joystick_add_axis(raw_joystick_t *rawjoy, plat_joystick_t *joy, PHIDP_VALUE_CAPS
 }
 
 void
-joystick_add_pov(raw_joystick_t *rawjoy, plat_joystick_t *joy, PHIDP_VALUE_CAPS prop)
+joystick_add_pov(raw_joystick_t *rawjoy, plat_joystick_state_t *joy, PHIDP_VALUE_CAPS prop)
 {
-    if (joy->nr_povs >= 4)
+    if (joy->nr_povs >= MAX_JOY_POVS)
         return;
 
     sprintf(joy->pov[joy->nr_povs].name, "POV %d", joy->nr_povs + 1);
@@ -160,11 +217,12 @@ joystick_add_pov(raw_joystick_t *rawjoy, plat_joystick_t *joy, PHIDP_VALUE_CAPS
 }
 
 void
-joystick_get_capabilities(raw_joystick_t *rawjoy, plat_joystick_t *joy)
+joystick_get_capabilities(raw_joystick_t *rawjoy, plat_joystick_state_t *joy)
 {
     UINT              size     = 0;
     PHIDP_BUTTON_CAPS btn_caps = NULL;
     PHIDP_VALUE_CAPS  val_caps = NULL;
+    HIDP_CAPS         caps;
 
     /* Get preparsed data (HID data format) */
     GetRawInputDeviceInfoW(rawjoy->hdevice, RIDI_PREPARSEDDATA, NULL, &size);
@@ -172,7 +230,6 @@ joystick_get_capabilities(raw_joystick_t *rawjoy, plat_joystick_t *joy)
     if (GetRawInputDeviceInfoW(rawjoy->hdevice, RIDI_PREPARSEDDATA, rawjoy->data, &size) <= 0)
         fatal("joystick_get_capabilities: Failed to get preparsed data.\n");
 
-    HIDP_CAPS caps;
     HidP_GetCaps(rawjoy->data, &caps);
 
     /* Buttons */
@@ -219,7 +276,7 @@ end:
 }
 
 void
-joystick_get_device_name(raw_joystick_t *rawjoy, plat_joystick_t *joy, PRID_DEVICE_INFO info)
+joystick_get_device_name(raw_joystick_t *rawjoy, plat_joystick_state_t *joy, PRID_DEVICE_INFO info)
 {
     UINT   size                  = 0;
     WCHAR *device_name           = NULL;
@@ -283,9 +340,9 @@ joystick_init(void)
         if (info->hid.usUsage != HID_USAGE_GENERIC_JOYSTICK && info->hid.usUsage != HID_USAGE_GENERIC_GAMEPAD)
             goto end_loop;
 
-        plat_joystick_t *joy    = &plat_joystick_state[joysticks_present];
-        raw_joystick_t  *rawjoy = &raw_joystick_state[joysticks_present];
-        rawjoy->hdevice         = deviceList[i].hDevice;
+        plat_joystick_state_t *joy    = &plat_joystick_state[joysticks_present];
+        raw_joystick_t        *rawjoy = &raw_joystick_state[joysticks_present];
+        rawjoy->hdevice               = deviceList[i].hDevice;
 
         joystick_get_capabilities(rawjoy, joy);
         joystick_get_device_name(rawjoy, joy, info);
@@ -299,6 +356,7 @@ end_loop:
         free(info);
     }
 
+    free(deviceList);
     joystick_log("joystick_init: joysticks_present=%i\n", joysticks_present);
 
     /* Initialize the RawInput (joystick and gamepad) module. */
@@ -353,24 +411,24 @@ win_joystick_handle(PRAWINPUT raw)
     /* Read buttons */
     USAGE usage_list[128] = { 0 };
     ULONG usage_length    = plat_joystick_state[j].nr_buttons;
-    memset(plat_joystick_state[j].b, 0, 32 * sizeof(int));
+    memset(plat_joystick_state[j].b, 0, MAX_JOY_BUTTONS * sizeof(int));
 
     r = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usage_list, &usage_length,
                        raw_joystick_state[j].data, (PCHAR) raw->data.hid.bRawData, raw->data.hid.dwSizeHid);
 
     if (r == HIDP_STATUS_SUCCESS) {
         for (int i = 0; i < usage_length; i++) {
-            int button                       = raw_joystick_state[j].usage_button[usage_list[i]];
+            int button                          = raw_joystick_state[j].usage_button[usage_list[i]];
             plat_joystick_state[j].b[button] = 128;
         }
     }
 
     /* Read axes */
-    for (int a = 0; a < plat_joystick_state[j].nr_axes; a++) {
-        struct raw_axis_t *axis   = &raw_joystick_state[j].axis[a];
-        ULONG              uvalue = 0;
-        LONG               value  = 0;
-        LONG               center = (axis->max - axis->min + 1) / 2;
+    for (int axis_nr = 0; axis_nr < plat_joystick_state[j].nr_axes; axis_nr++) {
+        const struct raw_axis_t *axis   = &raw_joystick_state[j].axis[axis_nr];
+        ULONG                    uvalue = 0;
+        LONG                     value  = 0;
+        LONG                     center = (axis->max - axis->min + 1) / 2;
 
         r = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, axis->link, axis->usage, &uvalue,
                                raw_joystick_state[j].data, (PCHAR) raw->data.hid.bRawData, raw->data.hid.dwSizeHid);
@@ -394,15 +452,17 @@ win_joystick_handle(PRAWINPUT raw)
             value = value * 32768 / center;
         }
 
-        plat_joystick_state[j].a[a] = value;
-        // joystick_log("%s %-06d ", plat_joystick_state[j].axis[a].name, plat_joystick_state[j].a[a]);
+        plat_joystick_state[j].a[axis_nr] = value;
+#if 0
+        joystick_log("%s %-06d ", plat_joystick_state[j].axis[axis_nr].name, plat_joystick_state[j].a[axis_nr]);
+#endif
     }
 
     /* read povs */
-    for (int p = 0; p < plat_joystick_state[j].nr_povs; p++) {
-        struct raw_pov_t *pov    = &raw_joystick_state[j].pov[p];
-        ULONG             uvalue = 0;
-        LONG              value  = -1;
+    for (int pov_nr = 0; pov_nr < plat_joystick_state[j].nr_povs; pov_nr++) {
+        const struct raw_pov_t *pov    = &raw_joystick_state[j].pov[pov_nr];
+        ULONG                   uvalue = 0;
+        LONG                    value  = -1;
 
         r = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, pov->link, pov->usage, &uvalue,
                                raw_joystick_state[j].data, (PCHAR) raw->data.hid.bRawData, raw->data.hid.dwSizeHid);
@@ -413,11 +473,15 @@ win_joystick_handle(PRAWINPUT raw)
             value %= 36000;
         }
 
-        plat_joystick_state[j].p[p] = value;
+        plat_joystick_state[j].p[pov_nr] = value;
 
-        // joystick_log("%s %-3d ", plat_joystick_state[j].pov[p].name, plat_joystick_state[j].p[p]);
+#if 0
+        joystick_log("%s %-3d ", plat_joystick_state[j].pov[pov_nr].name, plat_joystick_state[j].p[pov_nr]);
+#endif
     }
-    // joystick_log("\n");
+#if 0
+    joystick_log("\n");
+#endif
 }
 
 static int
@@ -441,46 +505,41 @@ joystick_get_axis(int joystick_nr, int mapping)
 }
 
 void
-joystick_process(void)
+joystick_process(uint8_t gp)
 {
-    int d;
-
-    if (joystick_type == JS_TYPE_NONE)
+    if (joystick_type[gp] == JS_TYPE_NONE)
         return;
 
-    for (int c = 0; c < joystick_get_max_joysticks(joystick_type); c++) {
-        if (joystick_state[c].plat_joystick_nr) {
-            int joystick_nr = joystick_state[c].plat_joystick_nr - 1;
+    for (int js = 0; js < joystick_get_max_joysticks(joystick_type[gp]); js++) {
+        if (joystick_state[gp][js].plat_joystick_nr) {
+            int joystick_nr = joystick_state[gp][js].plat_joystick_nr - 1;
 
-            for (d = 0; d < joystick_get_axis_count(joystick_type); d++)
-                joystick_state[c].axis[d] = joystick_get_axis(joystick_nr, joystick_state[c].axis_mapping[d]);
-            for (d = 0; d < joystick_get_button_count(joystick_type); d++)
-                joystick_state[c].button[d] = plat_joystick_state[joystick_nr].b[joystick_state[c].button_mapping[d]];
+            for (int axis_nr = 0; axis_nr < joystick_get_axis_count(joystick_type[gp]); axis_nr++)
+                joystick_state[gp][js].axis[axis_nr] = joystick_get_axis(joystick_nr, joystick_state[gp][js].axis_mapping[axis_nr]);
 
-            for (d = 0; d < joystick_get_pov_count(joystick_type); d++) {
-                int    x;
-                int    y;
-                double angle;
-                double magnitude;
+            for (int button_nr = 0; button_nr < joystick_get_button_count(joystick_type[gp]); button_nr++)
+                joystick_state[gp][js].button[button_nr] = plat_joystick_state[joystick_nr].b[joystick_state[gp][js].button_mapping[button_nr]];
 
-                x = joystick_get_axis(joystick_nr, joystick_state[c].pov_mapping[d][0]);
-                y = joystick_get_axis(joystick_nr, joystick_state[c].pov_mapping[d][1]);
-
-                angle     = (atan2((double) y, (double) x) * 360.0) / (2 * M_PI);
-                magnitude = sqrt((double) x * (double) x + (double) y * (double) y);
+            for (int pov_nr = 0; pov_nr < joystick_get_pov_count(joystick_type[gp]); pov_nr++) {
+                int    x         = joystick_get_axis(joystick_nr, joystick_state[gp][js].pov_mapping[pov_nr][0]);
+                int    y         = joystick_get_axis(joystick_nr, joystick_state[gp][js].pov_mapping[pov_nr][1]);
+                double angle     = (atan2((double) y, (double) x) * 360.0) / (2 * M_PI);
+                double magnitude = sqrt((double) x * (double) x + (double) y * (double) y);
 
                 if (magnitude < 16384)
-                    joystick_state[c].pov[d] = -1;
+                    joystick_state[gp][js].pov[pov_nr] = -1;
                 else
-                    joystick_state[c].pov[d] = ((int) angle + 90 + 360) % 360;
+                    joystick_state[gp][js].pov[pov_nr] = ((int) angle + 90 + 360) % 360;
             }
         } else {
-            for (d = 0; d < joystick_get_axis_count(joystick_type); d++)
-                joystick_state[c].axis[d] = 0;
-            for (d = 0; d < joystick_get_button_count(joystick_type); d++)
-                joystick_state[c].button[d] = 0;
-            for (d = 0; d < joystick_get_pov_count(joystick_type); d++)
-                joystick_state[c].pov[d] = -1;
+            for (int axis_nr = 0; axis_nr < joystick_get_axis_count(joystick_type[gp]); axis_nr++)
+                joystick_state[gp][js].axis[axis_nr] = 0;
+
+            for (int button_nr = 0; button_nr < joystick_get_button_count(joystick_type[gp]); button_nr++)
+                joystick_state[gp][js].button[button_nr] = 0;
+
+            for (int pov_nr = 0; pov_nr < joystick_get_pov_count(joystick_type[gp]); pov_nr++)
+                joystick_state[gp][js].pov[pov_nr] = -1;
         }
     }
 }
diff --git a/src/qt/win_netsocket.c b/src/qt/win_netsocket.c
new file mode 100644
index 000000000..d7d467c07
--- /dev/null
+++ b/src/qt/win_netsocket.c
@@ -0,0 +1,205 @@
+#define _XOPEN_SOURCE 500
+#include <stdio.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <wchar.h>
+
+#include <86box/86box.h>
+#include <86box/log.h>
+#include <86box/timer.h>
+#include <86box/plat.h>
+#include <86box/device.h>
+#include <86box/plat_netsocket.h>
+#include <86box/ui.h>
+
+#include <winsock2.h>
+#include <windows.h>
+#include <ws2tcpip.h>
+#include <winerror.h>
+
+SOCKET
+plat_netsocket_create(int type)
+{
+    SOCKET socket = -1;
+    u_long yes    = 1;
+
+    if (type != NET_SOCKET_TCP)
+        return -1;
+
+    socket = WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED);
+    if (socket == INVALID_SOCKET)
+        return -1;
+
+    ioctlsocket(socket, FIONBIO, &yes);
+
+    return socket;
+}
+
+SOCKET
+plat_netsocket_create_server(int type, unsigned short port)
+{
+    struct sockaddr_in sock_addr;
+    SOCKET             socket = -1;
+    u_long             yes    = 1;
+
+    if (type != NET_SOCKET_TCP)
+        return -1;
+
+    socket = WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED);
+    if (socket == INVALID_SOCKET)
+        return -1;
+
+    memset(&sock_addr, 0, sizeof(struct sockaddr_in));
+
+    sock_addr.sin_family      = AF_INET;
+    sock_addr.sin_addr.s_addr = INADDR_ANY;
+    sock_addr.sin_port        = htons(port);
+
+    if (bind(socket, (struct sockaddr *) &sock_addr, sizeof(struct sockaddr_in)) == SOCKET_ERROR) {
+        plat_netsocket_close(socket);
+        return (SOCKET) -1;
+    }
+
+    if (listen(socket, 5) == SOCKET_ERROR) {
+        plat_netsocket_close(socket);
+        return (SOCKET) -1;
+    }
+
+    ioctlsocket(socket, FIONBIO, &yes);
+
+    return socket;
+}
+
+void
+plat_netsocket_close(SOCKET socket)
+{
+    closesocket((SOCKET) socket);
+}
+
+SOCKET
+plat_netsocket_accept(SOCKET socket)
+{
+    SOCKET clientsocket = accept(socket, NULL, NULL);
+    u_long yes          = 1;
+
+    if (clientsocket == INVALID_SOCKET)
+        return -1;
+
+    ioctlsocket(clientsocket, FIONBIO, &yes);
+    return clientsocket;
+}
+
+int
+plat_netsocket_connected(SOCKET socket)
+{
+    struct sockaddr addr;
+    socklen_t       len = sizeof(struct sockaddr);
+    fd_set          wrfds, exfds;
+    struct timeval  tv;
+    int             res    = SOCKET_ERROR;
+    int             status = 0;
+    int             optlen = 4;
+
+    FD_ZERO(&wrfds);
+    FD_ZERO(&exfds);
+    FD_SET(socket, &wrfds);
+    FD_SET(socket, &exfds);
+
+    tv.tv_sec  = 0;
+    tv.tv_usec = 0;
+
+    res = select(socket + 1, NULL, &wrfds, &exfds, &tv);
+
+    if (res == SOCKET_ERROR)
+        return -1;
+
+    if (res >= 1 && FD_ISSET(socket, &exfds)) {
+        res = getsockopt(socket, SOL_SOCKET, SO_ERROR, (char *) &status, &optlen);
+        pclog("Socket error %d\n", status);
+        return -1;
+    }
+
+    if (res == 0 || !(res >= 1 && FD_ISSET(socket, &wrfds)))
+        return 0;
+
+    res = getsockopt(socket, SOL_SOCKET, SO_ERROR, (char *) &status, &optlen);
+
+    if (res == SOCKET_ERROR)
+        return -1;
+
+    if (status != 0)
+        return -1;
+
+    if (getpeername(socket, &addr, &len) == SOCKET_ERROR)
+        return -1;
+
+    return 1;
+}
+
+int
+plat_netsocket_connect(SOCKET socket, const char *hostname, unsigned short port)
+{
+    struct sockaddr_in sock_addr;
+    int                res = -1;
+
+    sock_addr.sin_family      = AF_INET;
+    sock_addr.sin_addr.s_addr = inet_addr(hostname);
+    sock_addr.sin_port        = htons(port);
+
+    if (sock_addr.sin_addr.s_addr == INADDR_ANY || sock_addr.sin_addr.s_addr == INADDR_NONE) {
+        struct hostent *hp;
+
+        hp = gethostbyname(hostname);
+
+        if (hp)
+            memcpy(&sock_addr.sin_addr.s_addr, hp->h_addr_list[0], hp->h_length);
+        else
+            return -1;
+    }
+
+    res = connect(socket, (struct sockaddr *) &sock_addr, sizeof(struct sockaddr_in));
+
+    if (res == SOCKET_ERROR) {
+        int error = WSAGetLastError();
+
+        if (error == WSAEISCONN || error == WSAEWOULDBLOCK)
+            return 0;
+
+        res = -1;
+    }
+    return res;
+}
+
+int
+plat_netsocket_send(SOCKET socket, const unsigned char *data, unsigned int size, int *wouldblock)
+{
+    int res = send(socket, (const char *) data, size, 0);
+
+    if (res == SOCKET_ERROR) {
+        int error = WSAGetLastError();
+
+        if (wouldblock)
+            *wouldblock = !!(error == WSAEWOULDBLOCK);
+
+        return -1;
+    }
+    return res;
+}
+
+int
+plat_netsocket_receive(SOCKET socket, unsigned char *data, unsigned int size, int *wouldblock)
+{
+    int res = recv(socket, (char *) data, size, 0);
+
+    if (res == SOCKET_ERROR) {
+        int error = WSAGetLastError();
+
+        if (wouldblock)
+            *wouldblock = !!(error == WSAEWOULDBLOCK);
+
+        return -1;
+    }
+    return res;
+}
diff --git a/src/win/win_opendir.c b/src/qt/win_opendir.c
similarity index 95%
rename from src/win/win_opendir.c
rename to src/qt/win_opendir.c
index 051ed20bb..46c7eb21e 100644
--- a/src/win/win_opendir.c
+++ b/src/qt/win_opendir.c
@@ -40,21 +40,19 @@ opendir(const char *name)
     DIR *p;
 
     /* Create a new control structure. */
-    p = (DIR *) malloc(sizeof(DIR));
+    p = (DIR *) calloc(1, sizeof(DIR));
     if (p == NULL)
         return (NULL);
-    memset(p, 0x00, sizeof(DIR));
     p->flags  = (DIR_F_LOWER | DIR_F_SANE);
     p->offset = 0;
     p->sts    = 0;
 
     /* Create a work area. */
-    p->dta = (char *) malloc(sizeof(FINDATA));
+    p->dta = (char *) calloc(1, sizeof(FINDATA));
     if (p->dta == NULL) {
         free(p);
         return (NULL);
     }
-    memset(p->dta, 0x00, sizeof(struct _finddata_t));
 
     /* Add search filespec. */
     strcpy(p->dir, name);
diff --git a/src/win/win_serial_passthrough.c b/src/qt/win_serial_passthrough.c
similarity index 61%
rename from src/win/win_serial_passthrough.c
rename to src/qt/win_serial_passthrough.c
index b2d09b1d0..87252e88d 100644
--- a/src/win/win_serial_passthrough.c
+++ b/src/qt/win_serial_passthrough.c
@@ -13,7 +13,7 @@
  *              Jasmine Iwanek <jasmine@iwanek.co.uk>
  *
  *              Copyright 2021      Andreas J. Reichel
- *              Copyright 2021-2023 Jasmine Iwanek
+ *              Copyright 2021-2025 Jasmine Iwanek
  */
 
 #define _XOPEN_SOURCE 500
@@ -46,9 +46,9 @@ plat_serpt_close(void *priv)
     fclose(dev->master_fd);
 #endif
     FlushFileBuffers((HANDLE) dev->master_fd);
-    if (dev->mode == SERPT_MODE_VCON)
+    if (dev->mode == SERPT_MODE_NPIPE_SRV)
         DisconnectNamedPipe((HANDLE) dev->master_fd);
-    if (dev->mode == SERPT_MODE_HOSTSER) {
+    else if (dev->mode == SERPT_MODE_HOSTSER) {
         SetCommState((HANDLE) dev->master_fd, (DCB *) dev->backend_priv);
         free(dev->backend_priv);
     }
@@ -82,13 +82,33 @@ plat_serpt_write_vcon(serial_passthrough_t *dev, uint8_t data)
     WriteFile((HANDLE) dev->master_fd, &data, 1, &bytesWritten, NULL);
 }
 
+void
+plat_serpt_set_line_state(void *priv)
+{
+    const serial_passthrough_t *dev = (serial_passthrough_t *) priv;
+
+    if (dev->mode == SERPT_MODE_HOSTSER) {
+        DWORD msrstate;
+        EscapeCommFunction((HANDLE) dev->master_fd, (dev->serial->mctrl & 1) ? SETDTR : CLRDTR);
+        EscapeCommFunction((HANDLE) dev->master_fd, (dev->serial->mctrl & 2) ? SETRTS : CLRRTS);
+        EscapeCommFunction((HANDLE) dev->master_fd, (dev->serial->lcr & (1 << 6) ? SETBREAK : CLRBREAK));
+
+        if (GetCommModemStatus((HANDLE) dev->master_fd, &msrstate)) {
+            serial_set_dcd(dev->serial, !!(msrstate & MS_RLSD_ON));
+            serial_set_dsr(dev->serial, !!(msrstate & MS_DSR_ON));
+            serial_set_cts(dev->serial, !!(msrstate & MS_CTS_ON));
+            serial_set_ri(dev->serial, !!(msrstate & MS_RING_ON));
+        }
+    }
+}
+
 void
 plat_serpt_set_params(void *priv)
 {
     const serial_passthrough_t *dev = (serial_passthrough_t *) priv;
 
     if (dev->mode == SERPT_MODE_HOSTSER) {
-        DCB serialattr = {};
+        DCB serialattr = { 0 };
         GetCommState((HANDLE) dev->master_fd, &serialattr);
 #define BAUDRATE_RANGE(baud_rate, min, max)    \
     if (baud_rate >= min && baud_rate < max) { \
@@ -108,6 +128,13 @@ plat_serpt_set_params(void *priv)
         BAUDRATE_RANGE(dev->baudrate, 57600, 115200);
         BAUDRATE_RANGE(dev->baudrate, 115200, 0xFFFFFFFF);
 
+        serialattr.fRtsControl     = RTS_CONTROL_ENABLE;
+        serialattr.fDtrControl     = DTR_CONTROL_ENABLE;
+        serialattr.fDsrSensitivity = FALSE;
+        serialattr.fAbortOnError   = FALSE;
+
+        serialattr.fInX     = FALSE;
+        serialattr.fOutX    = FALSE;
         serialattr.ByteSize = dev->data_bits;
         serialattr.StopBits = (dev->serial->lcr & 0x04) ? TWOSTOPBITS : ONESTOPBIT;
         if (!(dev->serial->lcr & 0x08)) {
@@ -122,7 +149,21 @@ plat_serpt_set_params(void *priv)
             }
         }
 
-        SetCommState((HANDLE) dev->master_fd, &serialattr);
+        (void) SetCommState((HANDLE) dev->master_fd, &serialattr);
+
+        {
+            DWORD msrstate;
+            EscapeCommFunction((HANDLE) dev->master_fd, (dev->serial->mctrl & 1) ? SETDTR : CLRDTR);
+            EscapeCommFunction((HANDLE) dev->master_fd, (dev->serial->mctrl & 2) ? SETRTS : CLRRTS);
+            EscapeCommFunction((HANDLE) dev->master_fd, (dev->serial->lcr & (1 << 6) ? SETBREAK : CLRBREAK));
+
+            if (GetCommModemStatus((HANDLE) dev->master_fd, &msrstate)) {
+                serial_set_dcd(dev->serial, !!(msrstate & MS_RLSD_ON));
+                serial_set_dsr(dev->serial, !!(msrstate & MS_DSR_ON));
+                serial_set_cts(dev->serial, !!(msrstate & MS_CTS_ON));
+                serial_set_ri(dev->serial, !!(msrstate & MS_RING_ON));
+            }
+        }
 #undef BAUDRATE_RANGE
     }
 }
@@ -133,7 +174,8 @@ plat_serpt_write(void *priv, uint8_t data)
     serial_passthrough_t *dev = (serial_passthrough_t *) priv;
 
     switch (dev->mode) {
-        case SERPT_MODE_VCON:
+        case SERPT_MODE_NPIPE_SRV:
+        case SERPT_MODE_NPIPE_CLNT:
         case SERPT_MODE_HOSTSER:
             plat_serpt_write_vcon(dev, data);
             break;
@@ -157,7 +199,8 @@ plat_serpt_read(void *priv, uint8_t *data)
     int                   res = 0;
 
     switch (dev->mode) {
-        case SERPT_MODE_VCON:
+        case SERPT_MODE_NPIPE_SRV:
+        case SERPT_MODE_NPIPE_CLNT:
         case SERPT_MODE_HOSTSER:
             res = plat_serpt_read_vcon(dev, data);
             break;
@@ -173,7 +216,7 @@ open_pseudo_terminal(serial_passthrough_t *dev)
     char ascii_pipe_name[1024] = { 0 };
     strncpy(ascii_pipe_name, dev->named_pipe, sizeof(ascii_pipe_name));
     ascii_pipe_name[1023] = '\0';
-    dev->master_fd = (intptr_t) CreateNamedPipeA(ascii_pipe_name, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_NOWAIT, 1, 65536, 65536, NMPWAIT_USE_DEFAULT_WAIT, NULL);
+    dev->master_fd        = (intptr_t) CreateNamedPipeA(ascii_pipe_name, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_NOWAIT, 1, 65536, 65536, NMPWAIT_USE_DEFAULT_WAIT, NULL);
     if (dev->master_fd == (intptr_t) INVALID_HANDLE_VALUE) {
         wchar_t errorMsg[1024] = { 0 };
         wchar_t finalMsg[1024] = { 0 };
@@ -187,6 +230,42 @@ open_pseudo_terminal(serial_passthrough_t *dev)
     return 1;
 }
 
+static int
+connect_named_pipe_client(serial_passthrough_t *dev)
+{
+    char ascii_pipe_name[1024] = { 0 };
+    size_t len = strlen(dev->named_pipe);
+    if ((len + 1) >= sizeof(ascii_pipe_name))
+        memcpy(ascii_pipe_name, dev->named_pipe, sizeof(ascii_pipe_name));
+    else
+        memcpy(ascii_pipe_name, dev->named_pipe, len + 1);
+
+    HANDLE hPipe = CreateFileA(
+        ascii_pipe_name,            // pipe name
+        GENERIC_READ | GENERIC_WRITE,
+        0,                          // no sharing
+        NULL,                       // default security attributes
+        OPEN_EXISTING,              // open existing pipe
+        0,                          // default attributes
+        NULL);                      // no template file
+
+    if (hPipe == INVALID_HANDLE_VALUE) {
+        DWORD error = GetLastError();
+        wchar_t errorMsg[1024] = { 0 };
+        wchar_t finalMsg[1024] = { 0 };
+        FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), errorMsg, 1024, NULL);
+        swprintf(finalMsg, 1024, L"Named Pipe (client, named_pipe=\"%hs\", port=COM%d): %ls\n", ascii_pipe_name, dev->port + 1, errorMsg);
+        ui_msgbox(MBX_ERROR | MBX_FATAL, finalMsg);
+        return 0;
+    }
+
+    DWORD mode = PIPE_READMODE_BYTE | PIPE_NOWAIT;
+    SetNamedPipeHandleState(hPipe, &mode, NULL, NULL);
+    dev->master_fd = (intptr_t) hPipe;
+    pclog("Named Pipe client connected to %s\n", ascii_pipe_name);
+    return 1;
+}
+
 static int
 open_host_serial_port(serial_passthrough_t *dev)
 {
@@ -222,15 +301,18 @@ plat_serpt_open_device(void *priv)
     serial_passthrough_t *dev = (serial_passthrough_t *) priv;
 
     switch (dev->mode) {
-        case SERPT_MODE_VCON:
-            if (open_pseudo_terminal(dev)) {
+        case SERPT_MODE_NPIPE_SRV:
+            if (open_pseudo_terminal(dev))
+                return 0;
+            break;
+        case SERPT_MODE_NPIPE_CLNT:
+            if (connect_named_pipe_client(dev))
                 return 0;
-            }
             break;
         case SERPT_MODE_HOSTSER:
-            if (open_host_serial_port(dev)) {
+            if (open_host_serial_port(dev))
                 return 0;
-            }
+            break;
         default:
             break;
     }
diff --git a/src/win/win_thread.c b/src/qt/win_thread.c
similarity index 87%
rename from src/win/win_thread.c
rename to src/qt/win_thread.c
index e874c4941..9a4f046b3 100644
--- a/src/win/win_thread.c
+++ b/src/qt/win_thread.c
@@ -10,12 +10,11 @@
  *
  *
  *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
  *          Fred N. van Kempen, <decwiz@yahoo.com>
  *
  *          Copyright 2008-2018 Sarah Walker.
  *          Copyright 2017-2018 Fred N. van Kempen.
- *          Copyright 2021-2023 Jasmine Iwanek.
  */
 #define UNICODE
 #define BITMAP WINDOWS_BITMAP
@@ -36,11 +35,11 @@ typedef struct {
     HANDLE handle;
 } win_event_t;
 
+/* For compatibility with thread.h, but Win32 does not allow named threads. */
 thread_t *
-thread_create_named(void (*func)(void *param), void *param, const char *name)
+thread_create_named(void (*func)(void *param), void *param, UNUSED(const char *name))
 {
     uintptr_t bt = _beginthread(func, 0, param);
-    plat_set_thread_name((void *) bt, name);
     return ((thread_t *) bt);
 }
 
@@ -48,7 +47,7 @@ int
 thread_test_mutex(thread_t *arg)
 {
     if (arg == NULL)
-        return 0;
+        return (0);
 
     return (WaitForSingleObject(arg, 0) == WAIT_OBJECT_0) ? 1 : 0;
 }
@@ -57,12 +56,12 @@ int
 thread_wait(thread_t *arg)
 {
     if (arg == NULL)
-        return 0;
+        return (0);
 
     if (WaitForSingleObject(arg, INFINITE))
-        return 1;
+        return (1);
 
-    return 0;
+    return (0);
 }
 
 event_t *
@@ -103,18 +102,18 @@ thread_wait_event(event_t *arg, int timeout)
     win_event_t *ev = (win_event_t *) arg;
 
     if (arg == NULL)
-        return 0;
+        return (0);
 
     if (ev->handle == NULL)
-        return 0;
+        return (0);
 
     if (timeout == -1)
         timeout = INFINITE;
 
     if (WaitForSingleObject(ev->handle, timeout))
-        return 1;
+        return (1);
 
-    return 0;
+    return (0);
 }
 
 void
@@ -144,7 +143,7 @@ int
 thread_wait_mutex(mutex_t *mutex)
 {
     if (mutex == NULL)
-        return 0;
+        return (0);
 
     LPCRITICAL_SECTION critsec = (LPCRITICAL_SECTION) mutex;
 
@@ -157,7 +156,7 @@ int
 thread_release_mutex(mutex_t *mutex)
 {
     if (mutex == NULL)
-        return 0;
+        return (0);
 
     LPCRITICAL_SECTION critsec = (LPCRITICAL_SECTION) mutex;
 
diff --git a/src/qt/wl_mouse.cpp b/src/qt/wl_mouse.cpp
index 5d6d95a0a..6f90bac18 100644
--- a/src/qt/wl_mouse.cpp
+++ b/src/qt/wl_mouse.cpp
@@ -20,6 +20,7 @@
 #include <wayland-client-protocol.h>
 #include <wayland-relative-pointer-unstable-v1-client-protocol.h>
 #include <wayland-pointer-constraints-unstable-v1-client-protocol.h>
+#include <wayland-keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h>
 
 #include <qpa/qplatformnativeinterface.h>
 #include <QWindow>
@@ -30,10 +31,12 @@ extern "C" {
 #include <86box/plat.h>
 }
 
-static zwp_relative_pointer_manager_v1 *rel_manager            = nullptr;
-static zwp_relative_pointer_v1         *rel_pointer            = nullptr;
-static zwp_pointer_constraints_v1      *conf_pointer_interface = nullptr;
-static zwp_locked_pointer_v1           *conf_pointer           = nullptr;
+static zwp_relative_pointer_manager_v1           *rel_manager            = nullptr;
+static zwp_relative_pointer_v1                   *rel_pointer            = nullptr;
+static zwp_pointer_constraints_v1                *conf_pointer_interface = nullptr;
+static zwp_locked_pointer_v1                     *conf_pointer           = nullptr;
+static zwp_keyboard_shortcuts_inhibit_manager_v1 *kbd_manager            = nullptr;
+static zwp_keyboard_shortcuts_inhibitor_v1       *kbd_inhibitor          = nullptr;
 
 static bool wl_init_ok = false;
 
@@ -57,16 +60,25 @@ display_handle_global(void *data, struct wl_registry *registry, uint32_t id,
     if (!strcmp(interface, "zwp_pointer_constraints_v1")) {
         conf_pointer_interface = (zwp_pointer_constraints_v1 *) wl_registry_bind(registry, id, &zwp_pointer_constraints_v1_interface, version);
     }
+    if (!strcmp(interface, "zwp_keyboard_shortcuts_inhibit_manager_v1")) {
+        kbd_manager = (zwp_keyboard_shortcuts_inhibit_manager_v1 *) wl_registry_bind(registry, id, &zwp_keyboard_shortcuts_inhibit_manager_v1_interface, version);
+    }
 }
 
 static void
 display_global_remove(void *data, struct wl_registry *wl_registry, uint32_t name)
 {
     plat_mouse_capture(0);
+    if (kbd_inhibitor) {
+        zwp_keyboard_shortcuts_inhibitor_v1_destroy(kbd_inhibitor);
+        kbd_inhibitor = nullptr;
+    }
+    zwp_keyboard_shortcuts_inhibit_manager_v1_destroy(kbd_manager);
     zwp_relative_pointer_manager_v1_destroy(rel_manager);
     zwp_pointer_constraints_v1_destroy(conf_pointer_interface);
     rel_manager            = nullptr;
     conf_pointer_interface = nullptr;
+    kbd_manager            = nullptr;
 }
 
 static const struct wl_registry_listener registry_listener = {
@@ -90,9 +102,20 @@ wl_init()
     }
 }
 
+void
+wl_keyboard_grab(QWindow *window)
+{
+    if (!kbd_inhibitor && kbd_manager) {
+        kbd_inhibitor = zwp_keyboard_shortcuts_inhibit_manager_v1_inhibit_shortcuts(kbd_manager, (wl_surface *) QGuiApplication::platformNativeInterface()->nativeResourceForWindow("surface", window), (wl_seat *) QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("wl_seat"));
+    }
+}
+
 void
 wl_mouse_capture(QWindow *window)
 {
+    if (!kbd_inhibitor) {
+        kbd_inhibitor = zwp_keyboard_shortcuts_inhibit_manager_v1_inhibit_shortcuts(kbd_manager, (wl_surface *) QGuiApplication::platformNativeInterface()->nativeResourceForWindow("surface", window), (wl_seat *) QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("wl_seat"));
+    }
     if (rel_manager) {
         rel_pointer = zwp_relative_pointer_manager_v1_get_relative_pointer(rel_manager, (wl_pointer *) QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("wl_pointer"));
         zwp_relative_pointer_v1_add_listener(rel_pointer, &rel_listener, nullptr);
diff --git a/src/qt/xinput2_mouse.cpp b/src/qt/xinput2_mouse.cpp
index 1be6ec826..4d79ce66d 100644
--- a/src/qt/xinput2_mouse.cpp
+++ b/src/qt/xinput2_mouse.cpp
@@ -132,7 +132,7 @@ xinput2_proc()
         XGenericEventCookie *cookie = (XGenericEventCookie *) &ev.xcookie;
         XNextEvent(disp, (XEvent *) &ev);
 
-        if (XGetEventData(disp, cookie) && (cookie->type == GenericEvent) && (cookie->extension == xi2opcode)) {
+        if (XGetEventData(disp, cookie) && (cookie->type == GenericEvent) && (cookie->extension == xi2opcode) && mouse_capture) {
             const XIRawEvent *rawev     = (const XIRawEvent *) cookie->data;
             double            coords[2] = { 0.0 };
 
@@ -214,8 +214,6 @@ common_motion:
                         }
 
                         prev_time = rawev->time;
-                        if (!mouse_capture)
-                            break;
                         XWindowAttributes winattrib {};
                         if (XGetWindowAttributes(disp, main_window->winId(), &winattrib)) {
                             auto globalPoint = main_window->mapToGlobal(QPoint(main_window->width() / 2, main_window->height() / 2));
diff --git a/src/qt_resources.qrc b/src/qt_resources.qrc
index 67f9cadac..78153d3ff 100644
--- a/src/qt_resources.qrc
+++ b/src/qt_resources.qrc
@@ -1,65 +1,172 @@
 <RCC>
     <qresource prefix="/settings">
-        <file>win/icons/cartridge.ico</file>
-        <file>win/icons/cartridge_empty.ico</file>
-        <file>win/icons/cassette.ico</file>
-        <file>win/icons/cassette_active.ico</file>
-        <file>win/icons/cassette_empty.ico</file>
-        <file>win/icons/cassette_empty_active.ico</file>
-        <file>win/icons/cdrom.ico</file>
-        <file>win/icons/cdrom_active.ico</file>
-        <file>win/icons/cdrom_disabled.ico</file>
-        <file>win/icons/cdrom_empty.ico</file>
-        <file>win/icons/cdrom_empty_active.ico</file>
-        <file>win/icons/display.ico</file>
-        <file>win/icons/floppy_35.ico</file>
-        <file>win/icons/floppy_35_active.ico</file>
-        <file>win/icons/floppy_35_empty.ico</file>
-        <file>win/icons/floppy_35_empty_active.ico</file>
-        <file>win/icons/floppy_525.ico</file>
-        <file>win/icons/floppy_525_active.ico</file>
-        <file>win/icons/floppy_525_empty.ico</file>
-        <file>win/icons/floppy_525_empty_active.ico</file>
-        <file>win/icons/floppy_and_cdrom_drives.ico</file>
-        <file>win/icons/floppy_disabled.ico</file>
-        <file>win/icons/hard_disk.ico</file>
-        <file>win/icons/hard_disk_active.ico</file>
-        <file>win/icons/input_devices.ico</file>
-        <file>win/icons/machine.ico</file>
-        <file>win/icons/mo.ico</file>
-        <file>win/icons/mo_active.ico</file>
-        <file>win/icons/mo_disabled.ico</file>
-        <file>win/icons/mo_empty.ico</file>
-        <file>win/icons/mo_empty_active.ico</file>
-        <file>win/icons/network.ico</file>
-        <file>win/icons/network_active.ico</file>
-        <file>win/icons/network_empty.ico</file>
-        <file>win/icons/other_peripherals.ico</file>
-        <file>win/icons/other_removable_devices.ico</file>
-        <file>win/icons/ports.ico</file>
-        <file>win/icons/sound.ico</file>
-        <file>win/icons/storage_controllers.ico</file>
-        <file>win/icons/zip.ico</file>
-        <file>win/icons/zip_active.ico</file>
-        <file>win/icons/zip_disabled.ico</file>
-        <file>win/icons/zip_empty.ico</file>
-        <file>win/icons/zip_empty_active.ico</file>
-        <file>win/icons/86Box-gray.ico</file>
-        <file>win/icons/86Box-green.ico</file>
-        <file>win/icons/86Box-red.ico</file>
-        <file>win/icons/86Box-yellow.ico</file>
+        <file>qt/icons/cartridge.ico</file>
+        <file>qt/icons/cartridge_image.ico</file>
+        <file>qt/icons/cassette_image.ico</file>
+        <file>qt/icons/cassette.ico</file>
+        <file>qt/icons/cdrom.ico</file>
+        <file>qt/icons/cdrom_disabled.ico</file>
+        <file>qt/icons/cdrom_mute.ico</file>
+        <file>qt/icons/cdrom_unmute.ico</file>
+        <file>qt/icons/cdrom_image.ico</file>
+        <file>qt/icons/cdrom_folder.ico</file>
+        <file>qt/icons/cdrom_host.ico</file>
+        <file>qt/icons/display.ico</file>
+        <file>qt/icons/fast_forward.ico</file>
+        <file>qt/icons/floppy_35.ico</file>
+        <file>qt/icons/floppy_35_image.ico</file>
+        <file>qt/icons/floppy_525.ico</file>
+        <file>qt/icons/floppy_525_image.ico</file>
+        <file>qt/icons/floppy_and_cdrom_drives.ico</file>
+        <file>qt/icons/floppy_disabled.ico</file>
+        <file>qt/icons/hard_disk.ico</file>
+        <file>qt/icons/input_devices.ico</file>
+        <file>qt/icons/machine.ico</file>
+        <file>qt/icons/mo.ico</file>
+        <file>qt/icons/mo_image.ico</file>
+        <file>qt/icons/mo_disabled.ico</file>
+        <file>qt/icons/network.ico</file>
+        <file>qt/icons/other_peripherals.ico</file>
+        <file>qt/icons/other_removable_devices.ico</file>
+        <file>qt/icons/ports.ico</file>
+        <file>qt/icons/rdisk.ico</file>
+        <file>qt/icons/rdisk_image.ico</file>
+        <file>qt/icons/rdisk_disabled.ico</file>
+        <file>qt/icons/record.ico</file>
+        <file>qt/icons/rewind.ico</file>
+        <file>qt/icons/sound.ico</file>
+        <file>qt/icons/storage_controllers.ico</file>
+        <file>qt/icons/superdisk.ico</file>
+        <file>qt/icons/superdisk_image.ico</file>
+        <file>qt/icons/superdisk_disabled.ico</file>
+        <file>qt/icons/active.ico</file>
+        <file>qt/icons/browse.ico</file>
+        <file>qt/icons/eject.ico</file>
+        <file>qt/icons/export.ico</file>
+        <file>qt/icons/new.ico</file>
+        <file>qt/icons/write_protected.ico</file>
+        <file>qt/icons/write_active.ico</file>
+        <file>qt/icons/disabled.ico</file>
+        <file>qt/icons/86Box-gray.ico</file>
+        <file>qt/icons/86Box-green.ico</file>
+        <file>qt/icons/86Box-red.ico</file>
+        <file>qt/icons/86Box-yellow.ico</file>
+        <file>qt/icons/caps_lock_off.ico</file>
+        <file>qt/icons/caps_lock_on.ico</file>
+        <file>qt/icons/kana_lock_off.ico</file>
+        <file>qt/icons/kana_lock_on.ico</file>
+        <file>qt/icons/num_lock_off.ico</file>
+        <file>qt/icons/num_lock_on.ico</file>
+        <file>qt/icons/scroll_lock_off.ico</file>
+        <file>qt/icons/scroll_lock_on.ico</file>
     </qresource>
     <qresource prefix="/menuicons">
-        <file>win/icons/acpi_shutdown.ico</file>
-        <file>win/icons/hard_reset.ico</file>
-        <file>win/icons/pause.ico</file>
-        <file>win/icons/run.ico</file>
-        <file>win/icons/send_cad.ico</file>
-        <file>win/icons/send_cae.ico</file>
-        <file>win/icons/settings.ico</file>
+        <file>qt/icons/acpi_shutdown.ico</file>
+        <file>qt/icons/hard_reset.ico</file>
+        <file>qt/icons/pause.ico</file>
+        <file>qt/icons/run.ico</file>
+        <file>qt/icons/send_cad.ico</file>
+        <file>qt/icons/send_cae.ico</file>
+        <file>qt/icons/settings.ico</file>
+    </qresource>
+    <qresource prefix="/misc">
+        <file>qt/icons/warning.ico</file>
     </qresource>
     <qresource prefix="/">
         <file alias="/texture_vert.spv">qt/texture_vert.spv</file>
         <file alias="/texture_frag.spv">qt/texture_frag.spv</file>
     </qresource>
+    <qresource prefix="/assets">
+        <file alias="86Box-green.png">qt/assets/86Box-green.png</file>
+        <file alias="86box-rb.png">qt/assets/86box-rb.png</file>
+        <file alias="86box-red.png">qt/assets/86box-red.png</file>
+        <file alias="86box-yellow.png">qt/assets/86box-yellow.png</file>
+        <file alias="86box.png">qt/assets/86box.png</file>
+        <file alias="86box-wizard.png">qt/assets/86box-wizard.png</file>
+        <file alias="addvm-logo.png">qt/assets/addvm-logo.png</file>
+        <file alias="addvm-watermark.png">qt/assets/addvm-watermark.png</file>
+    </qresource>
+    <qresource prefix="/systemicons">
+        <file alias="cpq_deskpro.png">qt/assets/systemicons/cpq_deskpro.png</file>
+        <file alias="cpq_port_386.png">qt/assets/systemicons/cpq_port_386.png</file>
+        <file alias="cpq_port_II.png">qt/assets/systemicons/cpq_port_II.png</file>
+        <file alias="cpq_port_III.png">qt/assets/systemicons/cpq_port_III.png</file>
+        <file alias="cpq_portable.png">qt/assets/systemicons/cpq_portable.png</file>
+        <file alias="cpq_pres_2240.png">qt/assets/systemicons/cpq_pres_2240.png</file>
+        <file alias="cpq_pres_4500.png">qt/assets/systemicons/cpq_pres_4500.png</file>
+        <file alias="ibm330.png">qt/assets/systemicons/ibm330.png</file>
+        <file alias="ibm_at.png">qt/assets/systemicons/ibm_at.png</file>
+        <file alias="ibm_pc_81.png">qt/assets/systemicons/ibm_pc_81.png</file>
+        <file alias="ibm_pc_82.png">qt/assets/systemicons/ibm_pc_82.png</file>
+        <file alias="ibm_pcjr.png">qt/assets/systemicons/ibm_pcjr.png</file>
+        <file alias="ibm_ps2_m70.png">qt/assets/systemicons/ibm_ps2_m70.png</file>
+        <file alias="ibm_ps2_m80.png">qt/assets/systemicons/ibm_ps2_m80.png</file>
+        <file alias="ibm_psvp_486.png">qt/assets/systemicons/ibm_psvp_486.png</file>
+        <file alias="ibm_psvp_p60.png">qt/assets/systemicons/ibm_psvp_p60.png</file>
+        <file alias="ibm_xt_82.png">qt/assets/systemicons/ibm_xt_82.png</file>
+        <file alias="ibm_xt_86.png">qt/assets/systemicons/ibm_xt_86.png</file>
+        <file alias="olivetti_m19.png">qt/assets/systemicons/olivetti_m19.png</file>
+        <file alias="olivetti_m21.png">qt/assets/systemicons/olivetti_m21.png</file>
+        <file alias="olivetti_m24.png">qt/assets/systemicons/olivetti_m24.png</file>
+        <file alias="olivetti_m24sp.png">qt/assets/systemicons/olivetti_m24sp.png</file>
+        <file alias="os_archlinux_x2.png">qt/assets/systemicons/os_archlinux_x2.png</file>
+        <file alias="os_cloud_x2.png">qt/assets/systemicons/os_cloud_x2.png</file>
+        <file alias="os_debian_x2.png">qt/assets/systemicons/os_debian_x2.png</file>
+        <file alias="os_dos_x2.png">qt/assets/systemicons/os_dos_x2.png</file>
+        <file alias="os_fedora_x2.png">qt/assets/systemicons/os_fedora_x2.png</file>
+        <file alias="os_freebsd_x2.png">qt/assets/systemicons/os_freebsd_x2.png</file>
+        <file alias="os_gentoo_x2.png">qt/assets/systemicons/os_gentoo_x2.png</file>
+        <file alias="os_jrockitve_x2.png">qt/assets/systemicons/os_jrockitve_x2.png</file>
+        <file alias="os_l4_x2.png">qt/assets/systemicons/os_l4_x2.png</file>
+        <file alias="os_linux22_x2.png">qt/assets/systemicons/os_linux22_x2.png</file>
+        <file alias="os_linux24_x2.png">qt/assets/systemicons/os_linux24_x2.png</file>
+        <file alias="os_linux26_x2.png">qt/assets/systemicons/os_linux26_x2.png</file>
+        <file alias="os_linux_x2.png">qt/assets/systemicons/os_linux_x2.png</file>
+        <file alias="os_macosx_x2.png">qt/assets/systemicons/os_macosx_x2.png</file>
+        <file alias="os_mandriva_x2.png">qt/assets/systemicons/os_mandriva_x2.png</file>
+        <file alias="os_netbsd_x2.png">qt/assets/systemicons/os_netbsd_x2.png</file>
+        <file alias="os_netware_x2.png">qt/assets/systemicons/os_netware_x2.png</file>
+        <file alias="os_openbsd_x2.png">qt/assets/systemicons/os_openbsd_x2.png</file>
+        <file alias="os_opensuse_x2.png">qt/assets/systemicons/os_opensuse_x2.png</file>
+        <file alias="os_oracle_x2.png">qt/assets/systemicons/os_oracle_x2.png</file>
+        <file alias="os_oraclesolaris_x2.png">qt/assets/systemicons/os_oraclesolaris_x2.png</file>
+        <file alias="os_os2_other_x2.png">qt/assets/systemicons/os_os2_other_x2.png</file>
+        <file alias="os_os2ecs_x2.png">qt/assets/systemicons/os_os2ecs_x2.png</file>
+        <file alias="os_os2warp3_x2.png">qt/assets/systemicons/os_os2warp3_x2.png</file>
+        <file alias="os_os2warp45_x2.png">qt/assets/systemicons/os_os2warp45_x2.png</file>
+        <file alias="os_os2warp4_x2.png">qt/assets/systemicons/os_os2warp4_x2.png</file>
+        <file alias="os_other_x2.png">qt/assets/systemicons/os_other_x2.png</file>
+        <file alias="os_qnx_x2.png">qt/assets/systemicons/os_qnx_x2.png</file>
+        <file alias="os_redhat_x2.png">qt/assets/systemicons/os_redhat_x2.png</file>
+        <file alias="os_solaris_x2.png">qt/assets/systemicons/os_solaris_x2.png</file>
+        <file alias="os_turbolinux_x2.png">qt/assets/systemicons/os_turbolinux_x2.png</file>
+        <file alias="os_ubuntu_x2.png">qt/assets/systemicons/os_ubuntu_x2.png</file>
+        <file alias="os_win10_x2.png">qt/assets/systemicons/os_win10_x2.png</file>
+        <file alias="os_win2k3_x2.png">qt/assets/systemicons/os_win2k3_x2.png</file>
+        <file alias="os_win2k8_x2.png">qt/assets/systemicons/os_win2k8_x2.png</file>
+        <file alias="os_win2k_x2.png">qt/assets/systemicons/os_win2k_x2.png</file>
+        <file alias="os_win31_x2.png">qt/assets/systemicons/os_win31_x2.png</file>
+        <file alias="os_win7_x2.png">qt/assets/systemicons/os_win7_x2.png</file>
+        <file alias="os_win81_x2.png">qt/assets/systemicons/os_win81_x2.png</file>
+        <file alias="os_win8_x2.png">qt/assets/systemicons/os_win8_x2.png</file>
+        <file alias="os_win95_x2.png">qt/assets/systemicons/os_win95_x2.png</file>
+        <file alias="os_win98_x2.png">qt/assets/systemicons/os_win98_x2.png</file>
+        <file alias="os_win_other_x2.png">qt/assets/systemicons/os_win_other_x2.png</file>
+        <file alias="os_winme_x2.png">qt/assets/systemicons/os_winme_x2.png</file>
+        <file alias="os_winnt4_x2.png">qt/assets/systemicons/os_winnt4_x2.png</file>
+        <file alias="os_winvista_x2.png">qt/assets/systemicons/os_winvista_x2.png</file>
+        <file alias="os_winxp_x2.png">qt/assets/systemicons/os_winxp_x2.png</file>
+        <file alias="os_xandros_x2.png">qt/assets/systemicons/os_xandros_x2.png</file>
+        <file alias="pb_bora_pro.png">qt/assets/systemicons/pb_bora_pro.png</file>
+        <file alias="pb_pb410.png">qt/assets/systemicons/pb_pb410.png</file>
+        <file alias="pb_pb640.png">qt/assets/systemicons/pb_pb640.png</file>
+        <file alias="pb_pb680.png">qt/assets/systemicons/pb_pb680.png</file>
+        <file alias="tandy_1000.png">qt/assets/systemicons/tandy_1000.png</file>
+        <file alias="tandy_1000_hx.png">qt/assets/systemicons/tandy_1000_hx.png</file>
+        <file alias="tandy_1000_sl2.png">qt/assets/systemicons/tandy_1000_sl2.png</file>
+        <file alias="toshiba_t1000.png">qt/assets/systemicons/toshiba_t1000.png</file>
+        <file alias="toshiba_t1200.png">qt/assets/systemicons/toshiba_t1200.png</file>
+        <file alias="toshiba_t1200_hdd.png">qt/assets/systemicons/toshiba_t1200_hdd.png</file>
+
+    </qresource>
 </RCC>
diff --git a/src/scsi/CMakeLists.txt b/src/scsi/CMakeLists.txt
index addde844e..c710f758d 100644
--- a/src/scsi/CMakeLists.txt
+++ b/src/scsi/CMakeLists.txt
@@ -9,10 +9,24 @@
 #          CMake build script.
 #
 # Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
 #
 #          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2024      Jasmine Iwanek.
 #
 
-add_library(scsi OBJECT scsi.c scsi_device.c scsi_cdrom.c scsi_disk.c
-    scsi_x54x.c scsi_aha154x.c scsi_buslogic.c scsi_ncr5380.c
-    scsi_ncr53c8xx.c scsi_pcscsi.c scsi_spock.c)
+add_library(scsi OBJECT
+    scsi.c
+    scsi_device.c
+    scsi_cdrom.c
+    scsi_disk.c
+    scsi_x54x.c
+    scsi_aha154x.c
+    scsi_buslogic.c
+    scsi_ncr5380.c
+    scsi_ncr53c400.c
+    scsi_t128.c
+    scsi_ncr53c8xx.c
+    scsi_pcscsi.c
+    scsi_spock.c
+)
diff --git a/src/scsi/scsi.c b/src/scsi/scsi.c
index 94c9048ef..a02f4e7a5 100644
--- a/src/scsi/scsi.c
+++ b/src/scsi/scsi.c
@@ -33,7 +33,7 @@
 #include <86box/scsi.h>
 #include <86box/scsi_device.h>
 #include <86box/cdrom.h>
-#include <86box/zip.h>
+#include <86box/rdisk.h>
 #include <86box/scsi_disk.h>
 #include <86box/scsi_aha154x.h>
 #include <86box/scsi_buslogic.h>
@@ -42,32 +42,26 @@
 #include <86box/scsi_pcscsi.h>
 #include <86box/scsi_spock.h>
 
-int scsi_card_current[SCSI_BUS_MAX] = { 0, 0, 0, 0 };
+int scsi_card_current[SCSI_CARD_MAX] = { 0, 0, 0, 0 };
 double scsi_bus_speed[SCSI_BUS_MAX] = { 0.0, 0.0, 0.0, 0.0 };
 
 static uint8_t next_scsi_bus = 0;
 
-static const device_t scsi_none_device = {
-    .name          = "None",
-    .internal_name = "none",
-    .flags         = 0,
-    .local         = 0,
-    .init          = NULL,
-    .close         = NULL,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
 typedef const struct {
     const device_t *device;
 } SCSI_CARD;
 
 static SCSI_CARD scsi_cards[] = {
   // clang-format off
-    { &scsi_none_device,         },
+    { &device_none,              },
+    /* ISA/Sidecar */
+    { &scsi_ls2000_device,       },
+    /* ISA */
+    { &scsi_lcs6821n_device,     },
+    { &scsi_rt1000b_device,      },
+    { &scsi_t128_device,         },
+    { &scsi_t130b_device,        },
+    /* ISA16 */
     { &aha154xa_device,          },
     { &aha154xb_device,          },
     { &aha154xc_device,          },
@@ -77,17 +71,20 @@ static SCSI_CARD scsi_cards[] = {
     { &buslogic_542bh_device,    },
     { &buslogic_545s_device,     },
     { &buslogic_545c_device,     },
-    { &scsi_ls2000_device,       },
-    { &scsi_lcs6821n_device,     },
-    { &scsi_rt1000b_device,      },
-    { &scsi_rt1000mc_device,     },
-    { &scsi_t128_device,         },
-    { &scsi_t130b_device,        },
+    /* MCA */
     { &aha1640_device,           },
     { &buslogic_640a_device,     },
-    { &ncr53c90a_mca_device,     },
     { &spock_device,             },
     { &tribble_device,           },
+    { &ncr53c90a_mca_device,     },
+    { &scsi_rt1000mc_device,     },
+    { &scsi_t228_device,         },
+    /* VLB */
+    { &buslogic_445s_device,     },
+    { &buslogic_445c_device,     },
+    /* PCI */
+    { &am53c974_pci_device,      },
+    { &am53c974a_pci_device,     },
     { &buslogic_958d_pci_device, },
     { &ncr53c810_pci_device,     },
     { &ncr53c815_pci_device,     },
@@ -96,8 +93,6 @@ static SCSI_CARD scsi_cards[] = {
     { &ncr53c860_pci_device,     },
     { &ncr53c875_pci_device,     },
     { &dc390_pci_device,         },
-    { &buslogic_445s_device,     },
-    { &buslogic_445c_device,     },
     { NULL,                      },
   // clang-format on
 };
@@ -168,12 +163,7 @@ scsi_card_get_from_internal_name(char *s)
 void
 scsi_card_init(void)
 {
-    int max = SCSI_BUS_MAX;
-
-    /* On-board SCSI controllers get the first bus, so if one is present,
-       increase our instance number here. */
-    if (machine_has_flags(machine, MACHINE_SCSI))
-        max--;
+    int max = SCSI_CARD_MAX;
 
     /* Do not initialize any controllers if we have do not have any SCSI
            bus left. */
diff --git a/src/scsi/scsi_aha154x.c b/src/scsi/scsi_aha154x.c
index 05b8b2726..7161a53bb 100644
--- a/src/scsi/scsi_aha154x.c
+++ b/src/scsi/scsi_aha154x.c
@@ -70,6 +70,11 @@ uint16_t aha_ports[] = {
 
 static uint8_t *aha1542cp_pnp_rom = NULL;
 
+// static char    *aha1542cp_rev     = "F001";
+static char     aha1542cp_rev[16] = { 0 };
+
+static uint16_t fw_chksum         = 0x0000;
+
 #pragma pack(push, 1)
 typedef struct aha_setup_t {
     uint8_t  CustomerSignature[20];
@@ -466,8 +471,10 @@ aha_setup_data(void *priv)
     ReplyISI->fParityCheckingEnabled        = dev->parity & 1;
 
     U32_TO_ADDR(aha_setup->BIOSMailboxAddress, dev->BIOSMailboxOutAddr);
-    aha_setup->uChecksum = 0xA3;
-    aha_setup->uUnknown  = 0xC2;
+    // aha_setup->uChecksum = 0xA3;
+    // aha_setup->uUnknown  = 0xC2;
+    aha_setup->uChecksum = fw_chksum >> 8;
+    aha_setup->uUnknown  = fw_chksum & 0xff;
 }
 
 static void
@@ -671,6 +678,7 @@ aha_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *priv)
                 aha_eeprom_save(dev);
 
                 dev->rom_addr = config->mem[0].base;
+                aha_log("Base = %08X, Size = %08X\n", config->mem[0].base, config->mem[0].size);
                 if (dev->rom_addr) {
                     mem_mapping_enable(&dev->bios.mapping);
                     aha_log("SCSI BIOS set to: %08X-%08X\n", dev->rom_addr, dev->rom_addr + config->mem[0].size - 1);
@@ -822,6 +830,7 @@ aha_setmcode(x54x_t *dev)
 {
     uint32_t temp;
     FILE    *fp;
+    uint16_t tempb = 0x00;
 
     /* Only if this device has a BIOS ROM. */
     if (dev->mcode_path == NULL)
@@ -851,6 +860,9 @@ aha_setmcode(x54x_t *dev)
         return;
     }
 
+    fseek(fp, 0x3136, SEEK_SET);
+    (void) !fread(dev->fw_rev, 4, 1, fp);
+
     /* Allocate the buffer and then read the real PnP ROM into it. */
     if (aha1542cp_pnp_rom != NULL) {
         free(aha1542cp_pnp_rom);
@@ -858,13 +870,12 @@ aha_setmcode(x54x_t *dev)
     }
     aha1542cp_pnp_rom = (uint8_t *) malloc(dev->pnp_len + 7);
     fseek(fp, dev->pnp_offset, SEEK_SET);
-    (void) !fread(aha1542cp_pnp_rom, dev->pnp_len, 1, fp);
+    (void) !fread(aha1542cp_pnp_rom, 4, 1, fp);
     memset(&(aha1542cp_pnp_rom[4]), 0x00, 5);
     fseek(fp, dev->pnp_offset + 4, SEEK_SET);
     (void) !fread(&(aha1542cp_pnp_rom[9]), dev->pnp_len - 4, 1, fp);
-    /* Even the real AHA-1542CP microcode seem to be flipping bit
-       4 to not erroneously indicate there is a range length. */
-    aha1542cp_pnp_rom[0x87] |= 0x04;
+    /* Patch determined from Dizzy's AHA-1542CP PNP ROM dump. */
+    aha1542cp_pnp_rom[0x26] = 0x03;
     /* Insert the terminator and the checksum byte that will later
        be filled in by the isapnp code. */
     aha1542cp_pnp_rom[dev->pnp_len + 5] = 0x79;
@@ -874,6 +885,14 @@ aha_setmcode(x54x_t *dev)
     fseek(fp, dev->cmd_33_offset, SEEK_SET);
     (void) !fread(dev->cmd_33_buf, dev->cmd_33_len, 1, fp);
 
+    fw_chksum = 0x0000;
+
+    for (uint16_t i = 0; i < 32768; i++) {
+        (void) fseek(fp, i, SEEK_SET);
+        (void) !fread(&tempb, 1, 1, fp);
+        fw_chksum += tempb;
+    }
+
     (void) fclose(fp);
 }
 
@@ -892,7 +911,7 @@ aha_initnvr(x54x_t *dev)
                    EE2_EXT1G | EE2_RMVOK); /* Imm return on seek */
     dev->nvr[3] = SPEED_50;                /* speed 5.0 MB/s */
     dev->nvr[6] = (EE6_TERM |              /* host term enable */
-                   EE6_RSTBUS);            /* reset SCSI bus on boot*/
+                   EE6_RSTBUS);            /* reset SCSI bus on boot */
 }
 
 /* Initialize the board's EEPROM (NVR.) */
@@ -902,12 +921,11 @@ aha_setnvr(x54x_t *dev)
     FILE *fp;
 
     /* Only if this device has an EEPROM. */
-    if (dev->nvr_path == NULL)
+    if (dev->nvr_path[0] == 0x00)
         return;
 
     /* Allocate and initialize the EEPROM. */
-    dev->nvr = (uint8_t *) malloc(NVR_SIZE);
-    memset(dev->nvr, 0x00, NVR_SIZE);
+    dev->nvr = (uint8_t *) calloc(1, NVR_SIZE);
 
     fp = nvr_fopen(dev->nvr_path, "rb");
     if (fp) {
@@ -942,6 +960,7 @@ static void *
 aha_init(const device_t *info)
 {
     x54x_t *dev;
+    const char *bios_rev = NULL;
 
     /* Call common initializer. */
     dev      = x54x_init(info);
@@ -981,13 +1000,18 @@ aha_init(const device_t *info)
 
     strcpy(dev->vendor, "Adaptec");
 
+    fw_chksum          = 0xa3c2;
+
     /* Perform per-board initialization. */
     switch (dev->type) {
         case AHA_154xA:
             strcpy(dev->name, "AHA-154xA");
-            dev->fw_rev    = "A003";                              /* The 3.07 microcode says A006. */
-            dev->bios_path = "roms/scsi/adaptec/aha1540a307.bin"; /*Only for port 0x330*/
-            /* This is configurable from the configuration for the 154xB, the rest of the controllers read it from the EEPROM. */
+            bios_rev         = (char *) device_get_config_bios("bios_rev");
+            dev->bios_path   = (char *) device_get_bios_file(info, bios_rev, 0);
+            dev->fw_rev    = "A006"; /*3.07 (Port 0x330) normal microcode (M_E7BC.BIN)*/
+
+            /* This is configurable from the configuration for the 154xB, the rest of the controllers read
+               it from the EEPROM. */
             dev->HostID      = device_get_config_int("hostid");
             dev->rom_shram   = 0x3F80;    /* shadow RAM address base */
             dev->rom_shramsz = 128;       /* size of shadow RAM */
@@ -996,20 +1020,21 @@ aha_init(const device_t *info)
 
         case AHA_154xB:
             strcpy(dev->name, "AHA-154xB");
-            switch (dev->Base) {
-                case 0x0330:
-                    dev->bios_path = "roms/scsi/adaptec/aha1540b320_330.bin";
-                    break;
+            bios_rev         = (char *) device_get_config_bios("bios_rev");
+            dev->bios_path   = (char *) device_get_bios_file(info, bios_rev, 0);
+            if (!strcmp(bios_rev, "v3_08"))
+                dev->fw_rev = "A003"; /*3.08 (Port 0x330) normal microcode (U12 27C128 Microcode v3.08.bin)*/
+            else if (!strcmp(bios_rev, "v3_10") || !strcmp(bios_rev, "v3_10_p334") || !strcmp(bios_rev, "v3_1b_p334"))
+                dev->fw_rev = "A005"; /*3.10 (and revisions) normal microcode (M_FC8A.BIN)*/
+            else if (!strcmp(bios_rev, "v3_11"))
+                dev->fw_rev = "A008"; /*3.11 (Port 0x330) normal microcode (1542BU12V311.BIN)*/
+            else if (!strcmp(bios_rev, "v3_20") || !strcmp(bios_rev, "v3_20_p334"))
+                dev->fw_rev = "A014"; /*3.20 normal microcode (M_3054.BIN)*/
+            else
+                dev->fw_rev = "A012"; /*3.20 (port 0x330) extended timeout microcode (M_5D98.BIN)*/
 
-                case 0x0334:
-                    dev->bios_path = "roms/scsi/adaptec/aha1540b320_334.bin";
-                    break;
-
-                default:
-                    break;
-            }
-            dev->fw_rev = "A005"; /* The 3.2 microcode says A012. */
-            /* This is configurable from the configuration for the 154xB, the rest of the controllers read it from the EEPROM. */
+            /* This is configurable from the configuration for the 154xB, the rest of the controllers read
+               it from the EEPROM. */
             dev->HostID      = device_get_config_int("hostid");
             dev->rom_shram   = 0x3F80;    /* shadow RAM address base */
             dev->rom_shramsz = 128;       /* size of shadow RAM */
@@ -1019,7 +1044,7 @@ aha_init(const device_t *info)
         case AHA_154xC:
             strcpy(dev->name, "AHA-154xC");
             dev->bios_path       = "roms/scsi/adaptec/aha1542c102.bin";
-            dev->nvr_path        = "aha1542c.nvr";
+            sprintf(dev->nvr_path, "aha1542c_%i.nvr", device_get_instance());
             dev->fw_rev          = "D001";
             dev->rom_shram       = 0x3F80;          /* shadow RAM address base */
             dev->rom_shramsz     = 128;             /* size of shadow RAM */
@@ -1035,7 +1060,7 @@ aha_init(const device_t *info)
         case AHA_154xCF:
             strcpy(dev->name, "AHA-154xCF");
             dev->bios_path   = "roms/scsi/adaptec/aha1542cf211.bin";
-            dev->nvr_path    = "aha1542cf.nvr";
+            sprintf(dev->nvr_path, "aha1542cf_%i.nvr", device_get_instance());
             dev->fw_rev      = "E001";
             dev->rom_shram   = 0x3F80; /* shadow RAM address base */
             dev->rom_shramsz = 128;    /* size of shadow RAM */
@@ -1053,10 +1078,11 @@ aha_init(const device_t *info)
 
         case AHA_154xCP:
             strcpy(dev->name, "AHA-154xCP");
-            dev->bios_path   = "roms/scsi/adaptec/aha1542cp102.bin";
-            dev->mcode_path  = "roms/scsi/adaptec/908301-00_f_mcode_17c9.u12";
-            dev->nvr_path    = "aha1542cp.nvr";
-            dev->fw_rev      = "F001";
+            bios_rev         = (char *) device_get_config_bios("bios_rev");
+            dev->bios_path   = (char *) device_get_bios_file(info, bios_rev, 0);
+            dev->mcode_path  = (char *) device_get_bios_file(info, bios_rev, 1);
+            sprintf(dev->nvr_path, "aha1542cp_%i.nvr", device_get_instance());
+            dev->fw_rev      = aha1542cp_rev;
             dev->rom_shram   = 0x3F80; /* shadow RAM address base */
             dev->rom_shramsz = 128;    /* size of shadow RAM */
             dev->rom_ioaddr  = 0x3F7E; /* [2:0] idx into addr table */
@@ -1069,11 +1095,14 @@ aha_init(const device_t *info)
             dev->ven_get_dma     = aha_get_dma;     /* function to return DMA channel from EEPROM */
             dev->ha_bps          = 10000000.0;      /* fast SCSI */
             dev->pnp_len         = 0x00be;          /* length of the PnP ROM */
-            dev->pnp_offset      = 0x533d;          /* offset of the PnP ROM in the microcode ROM */
-            dev->cmd_33_len      = 0x06dc;          /* length of the SCSISelect code expansion routine returned by
-                                                       SCSI controller command 0x33 */
-            dev->cmd_33_offset = 0x7000;            /* offset of the SCSISelect code expansion routine in the
-                                                       microcode ROM */
+            if (!strcmp(bios_rev, "v1_02_en"))
+                dev->pnp_offset      = 0x533d;          /* offset of the PnP ROM in the microcode ROM */
+            else
+                dev->pnp_offset      = 0x5345;          /* offset of the PnP ROM in the microcode ROM */
+            dev->cmd_33_len      = 0x06dc;          /* length of the SCSISelect code expansion routine
+                                                       returned by SCSI controller command 0x33 */
+            dev->cmd_33_offset   = 0x7000;          /* offset of the SCSISelect code expansion routine
+                                                       in the microcode ROM */
             aha_setmcode(dev);
             if (aha1542cp_pnp_rom)
                 isapnp_add_card(aha1542cp_pnp_rom, dev->pnp_len + 7, aha_pnp_config_changed, NULL, NULL, NULL, dev);
@@ -1129,16 +1158,16 @@ aha_init(const device_t *info)
 }
 
 // clang-format off
-static const device_config_t aha_154xb_config[] = {
+static const device_config_t aha_154xa_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x334,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x334,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "None",  .value =     0 },
             { .description = "0x330", .value = 0x330 },
             { .description = "0x334", .value = 0x334 },
@@ -1148,16 +1177,17 @@ static const device_config_t aha_154xb_config[] = {
             { .description = "0x134", .value = 0x134 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 11,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 11,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "IRQ 9",  .value =  9 },
             { .description = "IRQ 10", .value = 10 },
             { .description = "IRQ 11", .value = 11 },
@@ -1166,31 +1196,33 @@ static const device_config_t aha_154xb_config[] = {
             { .description = "IRQ 15", .value = 15 },
             { .description = ""                    }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dma",
-        .description = "DMA channel",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 6,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "dma",
+        .description    = "DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 6,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "DMA 5", .value = 5 },
             { .description = "DMA 6", .value = 6 },
             { .description = "DMA 7", .value = 7 },
             { .description = ""                  }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "hostid",
-        .description = "Host ID",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 7,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "hostid",
+        .description    = "Host ID",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 7,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "0", .value = 0 },
             { .description = "1", .value = 1 },
             { .description = "2", .value = 2 },
@@ -1201,16 +1233,38 @@ static const device_config_t aha_154xb_config[] = {
             { .description = "7", .value = 7 },
             { .description = ""              }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "bios_addr",
-        .description = "BIOS Address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "bios_rev",
+        .description    = "BIOS Revision",
+        .type           = CONFIG_BIOS,
+        .default_string = "v3_07",
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .bios           = {
+            {
+                .name          = "Version 3.07 (Port 0x330)",
+                .internal_name = "v3_07",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 16384,
+                .files         = { "roms/scsi/adaptec/aha1540a307.bin", "" }
+            },
+            { .files_no = 0 }
+        },
+    },
+    {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Disabled", .value =       0 },
             { .description = "C800H",    .value = 0xc8000 },
             { .description = "D000H",    .value = 0xd0000 },
@@ -1218,20 +1272,21 @@ static const device_config_t aha_154xb_config[] = {
             { .description = "DC00H",    .value = 0xdc000 },
             { .description = ""                           }
         },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
-static const device_config_t aha_154x_config[] = {
+static const device_config_t aha_154xb_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x334,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x334,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "None",  .value =     0 },
             { .description = "0x330", .value = 0x330 },
             { .description = "0x334", .value = 0x334 },
@@ -1241,16 +1296,17 @@ static const device_config_t aha_154x_config[] = {
             { .description = "0x134", .value = 0x134 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 11,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 11,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "IRQ 9",  .value =  9 },
             { .description = "IRQ 10", .value = 10 },
             { .description = "IRQ 11", .value = 11 },
@@ -1259,52 +1315,237 @@ static const device_config_t aha_154x_config[] = {
             { .description = "IRQ 15", .value = 15 },
             { .description = ""                    }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dma",
-        .description = "DMA channel",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 6,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "dma",
+        .description    = "DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 6,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "DMA 5", .value = 5 },
             { .description = "DMA 6", .value = 6 },
             { .description = "DMA 7", .value = 7 },
             { .description = ""                  }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "bios_addr",
-        .description = "BIOS Address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "hostid",
+        .description    = "Host ID",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 7,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0", .value = 0 },
+            { .description = "1", .value = 1 },
+            { .description = "2", .value = 2 },
+            { .description = "3", .value = 3 },
+            { .description = "4", .value = 4 },
+            { .description = "5", .value = 5 },
+            { .description = "6", .value = 6 },
+            { .description = "7", .value = 7 },
+            { .description = ""              }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_rev",
+        .description    = "BIOS Revision",
+        .type           = CONFIG_BIOS,
+        .default_string = "v3_20_p334",
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .bios           = {
+            {
+                .name          = "Version 3.08 (Port 0x330)",
+                .internal_name = "v3_08",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 16384,
+                .files         = { "roms/scsi/adaptec/U13 27C128 BIOS v3.08.bin", "" }
+            },
+            {
+                .name          = "Version 3.10 (Port 0x330)",
+                .internal_name = "v3_10",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 16384,
+                .files         = { "roms/scsi/adaptec/aha1540b310.bin", "" }
+            },
+            {
+                .name          = "Version 3.10 (Port 0x334)",
+                .internal_name = "v3_10_p334",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 16384,
+                .files         = { "roms/scsi/adaptec/154xp334.bin", "" }
+            },
+            {
+                .name          = "Version 3.1b (Port 0x334)",
+                .internal_name = "v3_1b_p334",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 16384,
+                .files         = { "roms/scsi/adaptec/154xp334_v31b.bin", "" }
+            },
+            {
+                .name          = "Version 3.11 (Port 0x330)",
+                .internal_name = "v3_11",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 16384,
+                .files         = { "roms/scsi/adaptec/1542BU13V311.BIN", "" }
+            },
+            {
+                .name          = "Version 3.20 (Port 0x330)",
+                .internal_name = "v3_20",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 16384,
+                .files         = { "roms/scsi/adaptec/aha1540b320_330.bin", "" }
+            },
+            {
+                .name          = "Version 3.20 (Port 0x330) (Ext. Timeout)",
+                .internal_name = "v3_20_exttimeout",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 16384,
+                .files         = { "roms/scsi/adaptec/B_B300.BIN", "" }
+            },
+            {
+                .name          = "Version 3.20 (Port 0x334)",
+                .internal_name = "v3_20_p334",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 16384,
+                .files         = { "roms/scsi/adaptec/aha1540b320_334.bin", "" }
+            },
+            { .files_no = 0 }
+        },
+    },
+    {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Disabled", .value =       0 },
             { .description = "C800H",    .value = 0xc8000 },
             { .description = "D000H",    .value = 0xd0000 },
             { .description = "D800H",    .value = 0xd8000 },
             { .description = "DC00H",    .value = 0xdc000 },
             { .description = ""                           }
-            },
         },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t aha_154xc_config[] = {
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x334,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",  .value =     0 },
+            { .description = "0x330", .value = 0x330 },
+            { .description = "0x334", .value = 0x334 },
+            { .description = "0x230", .value = 0x230 },
+            { .description = "0x234", .value = 0x234 },
+            { .description = "0x130", .value = 0x130 },
+            { .description = "0x134", .value = 0x134 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 11,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 9",  .value =  9 },
+            { .description = "IRQ 10", .value = 10 },
+            { .description = "IRQ 11", .value = 11 },
+            { .description = "IRQ 12", .value = 12 },
+            { .description = "IRQ 14", .value = 14 },
+            { .description = "IRQ 15", .value = 15 },
+            { .description = ""                    }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "dma",
+        .description    = "DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 6,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "DMA 5", .value = 5 },
+            { .description = "DMA 6", .value = 6 },
+            { .description = "DMA 7", .value = 7 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled", .value =       0 },
+            { .description = "C800H",    .value = 0xc8000 },
+            { .description = "D000H",    .value = 0xd0000 },
+            { .description = "D800H",    .value = 0xd8000 },
+            { .description = "DC00H",    .value = 0xdc000 },
+            { .description = ""                           }
+        },
+        .bios           = { { 0 } }
+    },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t aha_154xcf_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x334,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x334,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "None",  .value =     0 },
             { .description = "0x330", .value = 0x330 },
             { .description = "0x334", .value = 0x334 },
@@ -1314,16 +1555,17 @@ static const device_config_t aha_154xcf_config[] = {
             { .description = "0x134", .value = 0x134 },
             { .description = ""                      }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 11,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 11,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "IRQ 9",  .value =  9 },
             { .description = "IRQ 10", .value = 10 },
             { .description = "IRQ 11", .value = 11 },
@@ -1332,31 +1574,33 @@ static const device_config_t aha_154xcf_config[] = {
             { .description = "IRQ 15", .value = 15 },
             { .description = ""                    }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dma",
-        .description = "DMA channel",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 6,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "dma",
+        .description    = "DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 6,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "DMA 5", .value = 5 },
             { .description = "DMA 6", .value = 6 },
             { .description = "DMA 7", .value = 7 },
             { .description = ""                  }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "bios_addr",
-        .description = "BIOS Address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Disabled", .value =       0 },
             { .description = "C800H",    .value = 0xc8000 },
             { .description = "CC00H",    .value = 0xcc000 },
@@ -1366,21 +1610,66 @@ static const device_config_t aha_154xcf_config[] = {
             { .description = "DC00H",    .value = 0xdc000 },
             { .description = ""                           }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "fdc_addr",
-        .description = "FDC address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "fdc_addr",
+        .description    = "FDC Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "None",  .value = 0                  },
             { .description = "0x3f0", .value = FDC_PRIMARY_ADDR   },
             { .description = "0x370", .value = FDC_SECONDARY_ADDR },
             { .description = ""                                   }
         },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t aha_154xcp_config[] = {
+    {
+        .name           = "bios_rev",
+        .description    = "BIOS Revision",
+        .type           = CONFIG_BIOS,
+        .default_string = "v1_02_en",
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .bios           = {
+            {
+                .name          = "Version 1.02 (English)",
+                .internal_name = "v1_02_en",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 0,
+                .size          = 32768,
+                .files         = { "roms/scsi/adaptec/aha1542cp102.bin", "roms/scsi/adaptec/908301-00_f_mcode_17c9.u12", "" }
+            },
+            {
+                .name          = "Version 1.02 (German)",
+                .internal_name = "v1_02_de",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 0,
+                .size          = 32768,
+                .files         = { "roms/scsi/adaptec/buff_1-0_bios.bin", "roms/scsi/adaptec/buff_1-0_mcode.bin", "" }
+            },
+            {
+                .name          = "Version 1.03 (English)",
+                .internal_name = "v1_03_en",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 2,
+                .local         = 0,
+                .size          = 32768,
+                .files         = { "roms/scsi/adaptec/aha1542cp103.bin", "roms/scsi/adaptec/908301-00_g_mcode_144c.u12.bin", "" }
+            },
+            { .files_no = 0 }
+        },
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
@@ -1389,26 +1678,26 @@ static const device_config_t aha_154xcf_config[] = {
 const device_t aha154xa_device = {
     .name          = "Adaptec AHA-154xA",
     .internal_name = "aha154xa",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = AHA_154xA,
     .init          = aha_init,
     .close         = x54x_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
-    .config        = aha_154xb_config
+    .config        = aha_154xa_config
 };
 
 const device_t aha154xb_device = {
     .name          = "Adaptec AHA-154xB",
     .internal_name = "aha154xb",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = AHA_154xB,
     .init          = aha_init,
     .close         = x54x_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = aha_154xb_config
@@ -1417,26 +1706,26 @@ const device_t aha154xb_device = {
 const device_t aha154xc_device = {
     .name          = "Adaptec AHA-154xC",
     .internal_name = "aha154xc",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = AHA_154xC,
     .init          = aha_init,
     .close         = x54x_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
-    .config        = aha_154x_config
+    .config        = aha_154xc_config
 };
 
 const device_t aha154xcf_device = {
     .name          = "Adaptec AHA-154xCF",
     .internal_name = "aha154xcf",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = AHA_154xCF,
     .init          = aha_init,
     .close         = x54x_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = aha_154xcf_config
@@ -1445,15 +1734,15 @@ const device_t aha154xcf_device = {
 const device_t aha154xcp_device = {
     .name          = "Adaptec AHA-154xCP",
     .internal_name = "aha154xcp",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = AHA_154xCP,
     .init          = aha_init,
     .close         = aha1542cp_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
-    .config        = NULL
+    .config        = aha_154xcp_config
 };
 
 const device_t aha1640_device = {
@@ -1464,7 +1753,7 @@ const device_t aha1640_device = {
     .init          = aha_init,
     .close         = x54x_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/scsi/scsi_buslogic.c b/src/scsi/scsi_buslogic.c
index ac3b464a8..c2ecc7b62 100644
--- a/src/scsi/scsi_buslogic.c
+++ b/src/scsi/scsi_buslogic.c
@@ -256,6 +256,8 @@ buslogic_log(const char *fmt, ...)
 #    define buslogic_log(fmt, ...)
 #endif
 
+static x54x_t reset_state = { 0 };
+
 static char *
 BuslogicGetNVRFileName(buslogic_data_t *bl)
 {
@@ -1084,7 +1086,7 @@ buslogic_interrupt_type(void *priv)
 }
 
 static void
-buslogic_reset(void *priv)
+buslogic_ven_reset(void *priv)
 {
     x54x_t          *dev = (x54x_t *) priv;
     buslogic_data_t *bl  = (buslogic_data_t *) dev->ven_data;
@@ -1525,6 +1527,41 @@ BuslogicDeviceReset(void *priv)
     BuslogicInitializeAutoSCSIRam(dev);
 }
 
+static void
+buslogic_reset(void *priv)
+{
+    x54x_t          *dev = (x54x_t *) priv;
+    buslogic_data_t *bl  = (buslogic_data_t *) dev->ven_data;
+
+    x54x_io_remove(dev, dev->Base, 4);
+
+    if (bl->chip == CHIP_BUSLOGIC_PCI_958D_1995_12_30) {
+        x54x_mem_init(dev, 0xfffd0000);
+        x54x_mem_disable(dev);
+    }
+
+    timer_disable(&dev->timer);
+    timer_disable(&dev->ResetCB);
+
+    reset_state.mmio_mapping     = dev->mmio_mapping;
+
+    reset_state.bios.mapping     = dev->bios.mapping;
+    reset_state.uppersck.mapping = dev->uppersck.mapping;
+
+    reset_state.timer            = dev->timer;
+    reset_state.ResetCB          = dev->ResetCB;
+
+    reset_state.pci_slot         = dev->pci_slot;
+
+    memcpy(dev, &reset_state, sizeof(x54x_t));
+
+    dev->timer.period            = 10.0;
+    timer_set_delay_u64(&dev->timer, (uint64_t) (dev->timer.period * ((double) TIMER_USEC)));
+
+    if ((dev->Base != 0) && !(dev->card_bus & DEVICE_MCA) && !(dev->card_bus & DEVICE_PCI))
+        x54x_io_set(dev, dev->Base, 4);
+}
+
 static void *
 buslogic_init(const device_t *info)
 {
@@ -1546,8 +1583,7 @@ buslogic_init(const device_t *info)
     dev      = x54x_init(info);
     dev->bus = scsi_get_bus();
 
-    dev->ven_data = malloc(sizeof(buslogic_data_t));
-    memset(dev->ven_data, 0x00, sizeof(buslogic_data_t));
+    dev->ven_data = calloc(1, sizeof(buslogic_data_t));
 
     bl = (buslogic_data_t *) dev->ven_data;
 
@@ -1587,7 +1623,7 @@ buslogic_init(const device_t *info)
     dev->interrupt_type     = buslogic_interrupt_type;
     dev->is_aggressive_mode = buslogic_is_aggressive_mode;
     dev->get_ven_data       = buslogic_setup_data;
-    dev->ven_reset          = buslogic_reset;
+    dev->ven_reset          = buslogic_ven_reset;
 
     strcpy(dev->vendor, "BusLogic");
 
@@ -1775,20 +1811,22 @@ buslogic_init(const device_t *info)
         BuslogicInitializeAutoSCSIRam(dev);
     }
 
+    memcpy(&reset_state, dev, sizeof(x54x_t));
+
     return dev;
 }
 
 // clang-format off
 static const device_config_t BT_ISA_Config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x334,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x334,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "0x330", .value = 0x330 },
             { .description = "0x334", .value = 0x334 },
             { .description = "0x230", .value = 0x230 },
@@ -1797,16 +1835,17 @@ static const device_config_t BT_ISA_Config[] = {
             { .description = "0x134", .value = 0x134 },
             { .description = "",      .value =     0 }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 11,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 11,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "IRQ 9",  .value =  9 },
             { .description = "IRQ 10", .value = 10 },
             { .description = "IRQ 11", .value = 11 },
@@ -1815,48 +1854,55 @@ static const device_config_t BT_ISA_Config[] = {
             { .description = "IRQ 15", .value = 15 },
             { .description = "", 0                 }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dma",
-        .description = "DMA channel",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 6,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "dma",
+        .description    = "DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 6,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "DMA 5", .value = 5 },
             { .description = "DMA 6", .value = 6 },
             { .description = "DMA 7", .value = 7 },
             { .description = "",      .value = 0 }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "bios_addr",
-        .description = "BIOS Address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "Disabled", .value =       0 },
             { .description = "C800H",    .value = 0xc8000 },
             { .description = "D000H",    .value = 0xd0000 },
             { .description = "D800H",    .value = 0xd8000 },
             { .description = "",         .value =       0 }
         },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t BT958D_Config[] = {
     {
-        .name = "bios",
-        .description = "Enable BIOS",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "bios",
+        .description    = "Enable BIOS",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
@@ -1865,12 +1911,12 @@ static const device_config_t BT958D_Config[] = {
 const device_t buslogic_542b_device = {
     .name          = "BusLogic BT-542B ISA",
     .internal_name = "bt542b",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = CHIP_BUSLOGIC_ISA_542B_1991_12_14,
     .init          = buslogic_init,
     .close         = x54x_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .reset         = buslogic_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = BT_ISA_Config
@@ -1879,12 +1925,12 @@ const device_t buslogic_542b_device = {
 const device_t buslogic_545s_device = {
     .name          = "BusLogic BT-545S ISA",
     .internal_name = "bt545s",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = CHIP_BUSLOGIC_ISA_545S_1992_10_05,
     .init          = buslogic_init,
     .close         = x54x_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .reset         = buslogic_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = BT_ISA_Config
@@ -1893,12 +1939,12 @@ const device_t buslogic_545s_device = {
 const device_t buslogic_542bh_device = {
     .name          = "BusLogic BT-542BH ISA",
     .internal_name = "bt542bh",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = CHIP_BUSLOGIC_ISA_542BH_1993_05_23,
     .init          = buslogic_init,
     .close         = x54x_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .reset         = buslogic_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = BT_ISA_Config
@@ -1907,12 +1953,12 @@ const device_t buslogic_542bh_device = {
 const device_t buslogic_545c_device = {
     .name          = "BusLogic BT-545C ISA",
     .internal_name = "bt545c",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = CHIP_BUSLOGIC_ISA_545C_1994_12_01,
     .init          = buslogic_init,
     .close         = x54x_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .reset         = buslogic_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = BT_ISA_Config
@@ -1925,8 +1971,8 @@ const device_t buslogic_640a_device = {
     .local         = CHIP_BUSLOGIC_MCA_640A_1993_05_23,
     .init          = buslogic_init,
     .close         = x54x_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .reset         = buslogic_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1939,8 +1985,8 @@ const device_t buslogic_445s_device = {
     .local         = CHIP_BUSLOGIC_VLB_445S_1993_11_16,
     .init          = buslogic_init,
     .close         = x54x_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .reset         = buslogic_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = BT_ISA_Config
@@ -1953,8 +1999,8 @@ const device_t buslogic_445c_device = {
     .local         = CHIP_BUSLOGIC_VLB_445C_1994_12_01,
     .init          = buslogic_init,
     .close         = x54x_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .reset         = buslogic_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = BT_ISA_Config
@@ -1967,8 +2013,8 @@ const device_t buslogic_958d_pci_device = {
     .local         = CHIP_BUSLOGIC_PCI_958D_1995_12_30,
     .init          = buslogic_init,
     .close         = x54x_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .reset         = buslogic_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = BT958D_Config
diff --git a/src/scsi/scsi_cdrom.c b/src/scsi/scsi_cdrom.c
index f52401785..309886357 100644
--- a/src/scsi/scsi_cdrom.c
+++ b/src/scsi/scsi_cdrom.c
@@ -9,46 +9,41 @@
  *          Implementation of the CD-ROM drive with SCSI(-like)
  *          commands, for both ATAPI and SCSI usage.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2016-2020 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  */
-#include <stdarg.h>
 #include <inttypes.h>
 #include <math.h>
+#ifdef ENABLE_SCSI_CDROM_LOG
+#include <stdarg.h>
+#endif
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <wchar.h>
-#define HAVE_STDARG_H
 #include <86box/86box.h>
-#include <86box/config.h>
 #include <86box/timer.h>
+#include <86box/cdrom.h>
 #include <86box/device.h>
-#include <86box/scsi.h>
-#include <86box/scsi_device.h>
+#include <86box/log.h>
 #include <86box/machine.h>
 #include <86box/nvr.h>
-#include <86box/hdc.h>
-#include <86box/hdc_ide.h>
-#include <86box/sound.h>
 #include <86box/plat.h>
-#include <86box/ui.h>
-#include <86box/cdrom.h>
+#include <86box/scsi.h>
+#include <86box/scsi_device.h>
+#include <86box/hdc_ide.h>
 #include <86box/scsi_cdrom.h>
-#include <86box/version.h>
+#include <86box/ui.h>
 
 #define IDE_ATAPI_IS_EARLY             id->sc->pad0
 
 #pragma pack(push, 1)
 typedef struct gesn_cdb_t {
-    uint8_t opcode;
-    uint8_t polled;
-    uint8_t reserved2[2];
-    uint8_t class;
+    uint8_t  opcode;
+    uint8_t  polled;
+    uint8_t  reserved2[2];
+    uint8_t  class;
     uint8_t  reserved3[2];
     uint16_t len;
     uint8_t  control;
@@ -61,411 +56,193 @@ typedef struct gesn_event_header_t {
 } gesn_event_header_t;
 #pragma pack(pop)
 
-/* Table of all SCSI commands and their flags, needed for the new disc change / not ready handler. */
+// clang-format off
+/*
+   Table of all SCSI commands and their flags, needed for the new disc change /
+   not ready handler.
+ */
 uint8_t scsi_cdrom_command_flags[0x100] = {
-    IMPLEMENTED | CHECK_READY | NONDATA,             /* 0x00 */
-    IMPLEMENTED | ALLOW_UA | NONDATA | SCSI_ONLY,    /* 0x01 */
-    0,                                               /* 0x02 */
-    IMPLEMENTED | ALLOW_UA,                          /* 0x03 */
-    0, 0, 0, 0,                                      /* 0x04-0x07 */
-    IMPLEMENTED | CHECK_READY,                       /* 0x08 */
-    0, 0,                                            /* 0x09-0x0A */
-    IMPLEMENTED | CHECK_READY | NONDATA,             /* 0x0B */
-    0,                                               /* 0x0C */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0x0D */
-    0, 0, 0, 0,                                      /* 0x0E-0x11 */
-    IMPLEMENTED | ALLOW_UA,                          /* 0x12 */
-    IMPLEMENTED | CHECK_READY | NONDATA | SCSI_ONLY, /* 0x13 */
-    0,                                               /* 0x14 */
-    IMPLEMENTED,                                     /* 0x15 */
-    0, 0, 0, 0,                                      /* 0x16-0x19 */
-    IMPLEMENTED,                                     /* 0x1A */
-    IMPLEMENTED | CHECK_READY,                       /* 0x1B */
-    0, 0,                                            /* 0x1C-0x1D */
-    IMPLEMENTED | CHECK_READY,                       /* 0x1E */
-    0, 0, 0,                                         /* 0x1F-0x21*/
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0x22*/
-    0, 0,                                            /* 0x23-0x24 */
-    IMPLEMENTED | CHECK_READY,                       /* 0x25 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0x26 */
-    0,                                               /* 0x27 */
-    IMPLEMENTED | CHECK_READY,                       /* 0x28 */
-    0, 0,                                            /* 0x29-0x2A */
-    IMPLEMENTED | CHECK_READY | NONDATA,             /* 0x2B */
-    0, 0, 0,                                         /* 0x2C-0x2E */
-    IMPLEMENTED | CHECK_READY | NONDATA | SCSI_ONLY, /* 0x2F */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /* 0x30-0x3F */
-    0, 0,                                            /* 0x40-0x41 */
-    IMPLEMENTED | CHECK_READY,                       /* 0x42 */
-    IMPLEMENTED | CHECK_READY,                       /* 0x43 - Read TOC - can get through UNIT_ATTENTION, per VIDE-CDD.SYS
-                                                        NOTE: The ATAPI reference says otherwise, but I think this is a question of
-                                                        interpreting things right - the UNIT ATTENTION condition we have here
-                                                        is a tradition from not ready to ready, by definition the drive
-                                                        eventually becomes ready, make the condition go away. */
-    IMPLEMENTED | CHECK_READY,                       /* 0x44 */
-    IMPLEMENTED | CHECK_READY,                       /* 0x45 */
-    IMPLEMENTED | ALLOW_UA,                          /* 0x46 */
-    IMPLEMENTED | CHECK_READY,                       /* 0x47 */
-    IMPLEMENTED | CHECK_READY,                       /* 0x48 */
-    IMPLEMENTED | CHECK_READY,                       /* 0x49 */
-    IMPLEMENTED | ALLOW_UA,                          /* 0x4A */
-    IMPLEMENTED | CHECK_READY,                       /* 0x4B */
-    0, 0,                                            /* 0x4C-0x4D */
-    IMPLEMENTED | CHECK_READY,                       /* 0x4E */
-    0, 0,                                            /* 0x4F-0x50 */
-    IMPLEMENTED | CHECK_READY,                       /* 0x51 */
-    IMPLEMENTED | CHECK_READY,                       /* 0x52 */
-    0, 0,                                            /* 0x53-0x54 */
-    IMPLEMENTED,                                     /* 0x55 */
-    0, 0, 0, 0,                                      /* 0x56-0x59 */
-    IMPLEMENTED,                                     /* 0x5A */
-    0, 0, 0, 0, 0,                                   /* 0x5B-0x5F */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /* 0x60-0x6F */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /* 0x70-0x7F */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /* 0x80-0x8F */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /* 0x90-0x9F */
-    0, 0, 0, 0, 0,                                   /* 0xA0-0xA4 */
-    IMPLEMENTED | CHECK_READY,                       /* 0xA5 */
-    0, 0,                                            /* 0xA6-0xA7 */
-    IMPLEMENTED | CHECK_READY,                       /* 0xA8 */
-    IMPLEMENTED | CHECK_READY,                       /* 0xA9 */
-    0, 0, 0,                                         /* 0xAA-0xAC */
-    IMPLEMENTED | CHECK_READY,                       /* 0xAD */
-    0,                                               /* 0xAE */
-    IMPLEMENTED | CHECK_READY | NONDATA | SCSI_ONLY, /* 0xAF */
-    0, 0, 0, 0,                                      /* 0xB0-0xB3 */
-    IMPLEMENTED | CHECK_READY | ATAPI_ONLY,          /* 0xB4 */
-    0, 0, 0,                                         /* 0xB5-0xB7 */
-    IMPLEMENTED | CHECK_READY | ATAPI_ONLY,          /* 0xB8 */
-    IMPLEMENTED | CHECK_READY,                       /* 0xB9 */
-    IMPLEMENTED | CHECK_READY,                       /* 0xBA */
-    IMPLEMENTED,                                     /* 0xBB */
-    IMPLEMENTED | CHECK_READY,                       /* 0xBC */
-    IMPLEMENTED,                                     /* 0xBD */
-    IMPLEMENTED | CHECK_READY,                       /* 0xBE */
-    IMPLEMENTED | CHECK_READY,                       /* 0xBF */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xC0 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xC1 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xC2 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xC3 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xC4 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xC5 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xC6 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xC7 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xC8 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xC9 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xCA */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xCB */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xCC */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xCD */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                    /* 0xCE-0xD7 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xD8 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xD9 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xDA */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xDB */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xDC */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xDD */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xDE */
-    0,                                               /* 0xDF */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xE0 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xE1 */
-    0,                                               /* 0xE2 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xE3 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xE4 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xE5 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xE6 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xE7 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xE8 */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xE9 */
-    0,                                               /* 0xEA */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xEB */
-    0,                                               /* 0xEC */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xED */
-    IMPLEMENTED | CHECK_READY | SCSI_ONLY,           /* 0xEE */
-    0,                                               /* 0xEF */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0   /* 0xF0-0xFF */
+    [0x00]          = IMPLEMENTED | CHECK_READY,
+    [0x01]          = IMPLEMENTED | ALLOW_UA | SCSI_ONLY,
+    [0x03]          = IMPLEMENTED | ALLOW_UA,
+    [0x08]          = IMPLEMENTED | CHECK_READY,
+    [0x0b]          = IMPLEMENTED | CHECK_READY,
+    [0x0d]          = IMPLEMENTED | CHECK_READY | SCSI_ONLY,
+    [0x12]          = IMPLEMENTED | ALLOW_UA,
+    [0x13]          = IMPLEMENTED | CHECK_READY | SCSI_ONLY,
+    [0x15]          = IMPLEMENTED,
+    [0x1a]          = IMPLEMENTED,
+    [0x1b]          = IMPLEMENTED | CHECK_READY,
+    [0x1e]          = IMPLEMENTED | CHECK_READY,
+    [0x22]          = IMPLEMENTED | CHECK_READY | SCSI_ONLY,
+    [0x25]          = IMPLEMENTED | CHECK_READY,
+    [0x26]          = IMPLEMENTED | CHECK_READY | SCSI_ONLY,
+    [0x28]          = IMPLEMENTED | CHECK_READY,
+    [0x2b]          = IMPLEMENTED | CHECK_READY,
+    [0x2f]          = IMPLEMENTED | CHECK_READY | SCSI_ONLY,
+    [0x42]          = IMPLEMENTED | CHECK_READY,
+    /*
+       Read TOC/PMA/ATIP - can get through UNIT_ATTENTION, per VIDE-CDD.SYS.
+
+       NOTE: The ATAPI reference says otherwise, but I think this is a question of
+             interpreting things right - the UNIT ATTENTION condition we have here
+             is a tradition from not ready to ready, by definition the drive
+             eventually becomes ready, make the condition go away.
+     */
+    [0x43 ... 0x45] = IMPLEMENTED | CHECK_READY,
+    [0x46]          = IMPLEMENTED | ALLOW_UA,
+    [0x47 ... 0x49] = IMPLEMENTED | CHECK_READY,
+    [0x4a]          = IMPLEMENTED | ALLOW_UA,
+    [0x4b]          = IMPLEMENTED | CHECK_READY,
+    [0x4e]          = IMPLEMENTED | CHECK_READY,
+    [0x51 ... 0x52] = IMPLEMENTED | CHECK_READY,
+    [0x55]          = IMPLEMENTED,
+    [0x5a]          = IMPLEMENTED,
+    [0xa5]          = IMPLEMENTED | CHECK_READY,
+    [0xa8 ... 0xa9] = IMPLEMENTED | CHECK_READY,
+    [0xad]          = IMPLEMENTED,
+    [0xaf]          = IMPLEMENTED | CHECK_READY | SCSI_ONLY,
+    [0xb4]          = IMPLEMENTED | CHECK_READY | ATAPI_ONLY,
+    [0xb8]          = IMPLEMENTED | CHECK_READY | ATAPI_ONLY,
+    [0xb9 ... 0xba] = IMPLEMENTED | CHECK_READY,
+    [0xbb]          = IMPLEMENTED,
+    [0xbc]          = IMPLEMENTED | CHECK_READY,
+    [0xbd]          = IMPLEMENTED,
+    [0xbe ... 0xbf] = IMPLEMENTED | CHECK_READY,
+    [0xc0 ... 0xcd] = IMPLEMENTED | CHECK_READY | SCSI_ONLY,
+    [0xd5]          = IMPLEMENTED | CHECK_READY,
+    [0xd8 ... 0xde] = IMPLEMENTED | CHECK_READY | SCSI_ONLY,
+    [0xe0 ... 0xe1] = IMPLEMENTED | CHECK_READY | SCSI_ONLY,
+    [0xe3 ... 0xe9] = IMPLEMENTED | CHECK_READY | SCSI_ONLY,
+    [0xeb]          = IMPLEMENTED | CHECK_READY | SCSI_ONLY,
+    [0xed ... 0xee] = IMPLEMENTED | CHECK_READY | SCSI_ONLY
 };
 
-static uint64_t scsi_cdrom_mode_sense_page_flags      = (GPMODEP_UNIT_ATN_PAGE | GPMODEP_R_W_ERROR_PAGE | GPMODEP_DISCONNECT_PAGE | GPMODEP_FORMAT_DEVICE_PAGE | GPMODEP_CDROM_PAGE | GPMODEP_CDROM_AUDIO_PAGE | (1ULL << 0x0fULL) | GPMODEP_CAPABILITIES_PAGE | GPMODEP_ALL_PAGES);
-static uint64_t scsi_cdrom_mode_sense_page_flags_sony = (GPMODEP_R_W_ERROR_PAGE | GPMODEP_DISCONNECT_PAGE | GPMODEP_CDROM_PAGE_SONY | GPMODEP_CDROM_AUDIO_PAGE_SONY | (1ULL << 0x0fULL) | GPMODEP_CAPABILITIES_PAGE | GPMODEP_ALL_PAGES);
-static uint64_t scsi_cdrom_drive_status_page_flags    = ((1ULL << 0x01ULL) | (1ULL << 0x02ULL) | (1ULL << 0x0fULL) | GPMODEP_ALL_PAGES);
+static uint64_t scsi_cdrom_ms_page_flags           = (GPMODEP_R_W_ERROR_PAGE | GPMODEP_CDROM_PAGE |
+                                                      GPMODEP_CDROM_AUDIO_PAGE | (1ULL << 0x0fULL) |
+                                                      GPMODEP_CAPABILITIES_PAGE | GPMODEP_ALL_PAGES);
+static uint64_t scsi_cdrom_ms_page_flags_scsi      = (GPMODEP_UNIT_ATN_PAGE | GPMODEP_R_W_ERROR_PAGE |
+                                                      GPMODEP_DISCONNECT_PAGE | GPMODEP_FORMAT_DEVICE_PAGE |
+                                                      GPMODEP_CDROM_PAGE | GPMODEP_CDROM_AUDIO_PAGE |
+                                                      (1ULL << 0x0fULL) | GPMODEP_CAPABILITIES_PAGE |
+                                                      GPMODEP_ALL_PAGES);
+static uint64_t scsi_cdrom_ms_page_flags_sony_scsi = (GPMODEP_R_W_ERROR_PAGE | GPMODEP_DISCONNECT_PAGE |
+                                                      GPMODEP_CDROM_PAGE_SONY | GPMODEP_CDROM_AUDIO_PAGE_SONY |
+                                                      (1ULL << 0x0fULL) | GPMODEP_CAPABILITIES_PAGE |
+                                                      GPMODEP_ALL_PAGES);
+
+static uint64_t scsi_cdrom_drive_status_page_flags    = ((1ULL << 0x01ULL) | (1ULL << 0x02ULL) |
+                                                         (1ULL << 0x0fULL) | GPMODEP_ALL_PAGES);
 
 static const mode_sense_pages_t scsi_cdrom_drive_status_pages = {
-    {{ 0, 0 },
-     { 0x01, 0, 2, 0x0f, 0xbf }, /*Drive Status Data Format*/
-      { 0x02, 0, 1, 0 }, /*Audio Play Status Format*/
-      { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 }}
+    { [0x01] = { 0x01, 0x00, 0x02, 0x0f, 0xbf },    /* Drive Status Data Format */
+      [0x02] = { 0x02, 0x00, 0x01, 0x00       } }   /* Audio Play Status Format */
 };
 
-static const mode_sense_pages_t scsi_cdrom_mode_sense_pages_default = {
-    {{ 0, 0 },
-     { GPMODE_R_W_ERROR_PAGE, 6, 0, 5, 0, 0, 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { GPMODE_CDROM_PAGE, 6, 0, 1, 0, 60, 0, 75 },
-     { GPMODE_CDROM_AUDIO_PAGE | 0x80, 0xE, 4, 0, 0, 0, 0, 75, 1, 255, 2, 255, 0, 0, 0, 0 },
-     { 0x0F, 0x14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { GPMODE_CAPABILITIES_PAGE, 0x12, 0, 0, 1, 0, 0, 0, 2, 0xC2, 1, 0, 0, 0, 2, 0xC2, 0, 0, 0, 0 }}
+static const mode_sense_pages_t scsi_cdrom_ms_pages_default = {
+    { [0x01] = { GPMODE_R_W_ERROR_PAGE,               0x06, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00 },
+      [0x0d] = { GPMODE_CDROM_PAGE,                   0x06, 0x00, 0x01, 0x00, 0x3c, 0x00, 0x4b },
+      [0x0e] = { GPMODE_CDROM_AUDIO_PAGE | 0x80,      0x0e, 0x04, 0x00, 0x00, 0x00, 0x00, 0x4b,
+                 0x01,                                0xff, 0x02, 0xff, 0x00, 0x00, 0x00, 0x00 },
+      [0x0f] = { 0x0f,                                0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00             },
+      [0x2a] = { GPMODE_CAPABILITIES_PAGE,            0x12, 0x07, 0x00, 0x7f, 0x01, 0x0d, 0x03,
+                 0x02,                                0xc2, 0x01, 0x00, 0x00, 0x00, 0x02, 0xc2,
+                 0x00,                                0x00, 0x00, 0x00                         } }
 };
 
-static const mode_sense_pages_t scsi_cdrom_mode_sense_pages_default_scsi = {
-    {{ GPMODE_UNIT_ATN_PAGE, 6, 0, 0, 0, 0, 0, 0 }, /*Guess-work*/
-     { GPMODE_R_W_ERROR_PAGE, 6, 0, 5, 0, 0, 0, 0 },
-     { GPMODE_DISCONNECT_PAGE, 0x0e, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-     { GPMODE_FORMAT_DEVICE_PAGE, 0x16, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { GPMODE_CDROM_PAGE, 6, 0, 1, 0, 60, 0, 75 },
-     { GPMODE_CDROM_AUDIO_PAGE | 0x80, 0xE, 5, 4, 0, 128, 0, 75, 1, 255, 2, 255, 0, 0, 0, 0 },
-     { 0x0F, 0x14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { GPMODE_CAPABILITIES_PAGE, 0x12, 0, 0, 1, 0, 0, 0, 2, 0xC2, 1, 0, 0, 0, 2, 0xC2, 0, 0, 0, 0 }}
+static const mode_sense_pages_t scsi_cdrom_ms_pages_default_scsi = {
+    { [0x00] = { GPMODE_UNIT_ATN_PAGE,                0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },     /* Guesswork */
+      [0x01] = { GPMODE_R_W_ERROR_PAGE,               0x06, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00 },
+      [0x02] = { GPMODE_DISCONNECT_PAGE,              0x0e, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+      [0x03] = { GPMODE_FORMAT_DEVICE_PAGE,           0x16, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
+                 0x00,                                0x01, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+      [0x0d] = { GPMODE_CDROM_PAGE,                   0x06, 0x00, 0x01, 0x00, 0x3c, 0x00, 0x4b },
+      [0x0e] = { GPMODE_CDROM_AUDIO_PAGE | 0x80,      0x0e, 0x05, 0x04, 0x00, 0x80, 0x00, 0x4b,
+                 0x01,                                0xff, 0x02, 0xff, 0x00, 0x00, 0x00, 0x00 },
+      [0x0f] = { 0x0f,                                0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00             },
+      [0x2a] = { GPMODE_CAPABILITIES_PAGE,            0x12, 0x07, 0x00, 0x7f, 0x01, 0x0d, 0x03,
+                 0x02,                                0xc2, 0x01, 0x00, 0x00, 0x00, 0x02, 0xc2,
+                 0x00,                                0x00, 0x00, 0x00                         } }
 };
 
-static const mode_sense_pages_t scsi_cdrom_mode_sense_pages_default_sony_scsi = {
-    {{ 0, 0 },
-     { GPMODE_R_W_ERROR_PAGE, 6, 0, 5, 0, 0, 0, 0 },
-     { GPMODE_DISCONNECT_PAGE, 0x0e, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { GPMODE_CDROM_PAGE_SONY, 2, 0, 5 },
-     { GPMODE_CDROM_AUDIO_PAGE_SONY | 0x80, 0xE, 5, 0, 0, 0, 0, 0, 1, 255, 2, 255, 0, 0, 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { GPMODE_CDROM_PAGE, 6, 0, 1, 0, 60, 0, 75 },
-     { GPMODE_CDROM_AUDIO_PAGE | 0x80, 0xE, 5, 4, 0, 128, 0, 75, 1, 255, 2, 255, 0, 0, 0, 0 },
-     { 0x0F, 0x14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { GPMODE_CAPABILITIES_PAGE, 0x12, 0, 0, 1, 0, 0, 0, 2, 0xC2, 1, 0, 0, 0, 2, 0xC2, 0, 0, 0, 0 }}
+static const mode_sense_pages_t scsi_cdrom_ms_pages_default_sony_scsi = {
+    { { 0, 0 },
+      [0x01] = { GPMODE_R_W_ERROR_PAGE,               0x06, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00 },
+      [0x02] = { GPMODE_DISCONNECT_PAGE,              0x0e, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+      [0x08] = { GPMODE_CDROM_PAGE_SONY,              0x02, 0x00, 0x05                         },
+      [0x09] = { GPMODE_CDROM_AUDIO_PAGE_SONY | 0x80, 0x0e, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x01,                                0xff, 0x02, 0xff, 0x00, 0x00, 0x00, 0x00 },
+      [0x0d] = { GPMODE_CDROM_PAGE,                   0x06, 0x00, 0x01, 0x00, 0x3c, 0x00, 0x4b },
+      [0x0e] = { GPMODE_CDROM_AUDIO_PAGE | 0x80,      0x0e, 0x05, 0x04, 0x00, 0x80, 0x00, 0x4b,
+                 0x01,                                0xff, 0x02, 0xff, 0x00, 0x00, 0x00, 0x00 },
+      [0x0f] = { 0x0f,                                0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00             },
+      [0x2a] = { GPMODE_CAPABILITIES_PAGE,            0x12, 0x07, 0x00, 0x7f, 0x01, 0x0d, 0x03,
+                 0x02,                                0xc2, 0x01, 0x00, 0x00, 0x00, 0x02, 0xc2,
+                 0x00,                                0x00, 0x00, 0x00                         } }
 };
 
-static const mode_sense_pages_t scsi_cdrom_mode_sense_pages_changeable = {
-    {{ GPMODE_UNIT_ATN_PAGE, 6, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, /*Guess-work*/
-     { GPMODE_R_W_ERROR_PAGE, 6, 0xFF, 0xFF, 0, 0, 0, 0 },
-     { GPMODE_DISCONNECT_PAGE, 0x0E, 0xFF, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0, 0, 0, 0 },
-     { GPMODE_FORMAT_DEVICE_PAGE, 0x16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { GPMODE_CDROM_PAGE, 6, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
-     { GPMODE_CDROM_AUDIO_PAGE | 0x80, 0xE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
-     { 0x0F, 0x14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { GPMODE_CAPABILITIES_PAGE, 0x12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }}
+static const mode_sense_pages_t scsi_cdrom_ms_pages_changeable = {
+    { [0x01] = { GPMODE_R_W_ERROR_PAGE,               0x06, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 },
+      [0x02] = { GPMODE_DISCONNECT_PAGE,              0x0e, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 },
+      [0x0d] = { GPMODE_CDROM_PAGE,                   0x06, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+      [0x0e] = { GPMODE_CDROM_AUDIO_PAGE | 0x80,      0x0e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                 0xff,                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+      [0x0f] = { 0x0f,                                0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00             },
+      [0x2a] = { GPMODE_CAPABILITIES_PAGE,            0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                      0x00, 0x00, 0x00, 0x00, 0x00             } }
 };
 
-static const mode_sense_pages_t scsi_cdrom_mode_sense_pages_changeable_sony = {
-    {{ 0, 0 },
-     { GPMODE_R_W_ERROR_PAGE, 6, 0xFF, 0xFF, 0, 0, 0, 0 },
-     { GPMODE_DISCONNECT_PAGE, 0x0E, 0xFF, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0, 0, 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { GPMODE_CDROM_PAGE_SONY, 2, 0xFF, 0xFF },
-     { GPMODE_CDROM_AUDIO_PAGE_SONY | 0x80, 0xE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { GPMODE_CDROM_PAGE, 6, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
-     { GPMODE_CDROM_AUDIO_PAGE | 0x80, 0xE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
-     { 0x0F, 0x14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { 0, 0 },
-     { GPMODE_CAPABILITIES_PAGE, 0x12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }}
+static const mode_sense_pages_t scsi_cdrom_ms_pages_changeable_scsi = {
+    { [0x00] = { GPMODE_UNIT_ATN_PAGE,                0x06, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },    /* Guesswork */
+      [0x01] = { GPMODE_R_W_ERROR_PAGE,               0x06, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 },
+      [0x02] = { GPMODE_DISCONNECT_PAGE,              0x0e, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 },
+      [0x03] = { GPMODE_FORMAT_DEVICE_PAGE,           0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+      [0x0d] = { GPMODE_CDROM_PAGE,                   0x06, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+      [0x0e] = { GPMODE_CDROM_AUDIO_PAGE | 0x80,      0x0e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                 0xff,                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+      [0x0f] = { 0x0f,                                0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00             },
+      [0x2a] = { GPMODE_CAPABILITIES_PAGE,            0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                      0x00, 0x00, 0x00, 0x00, 0x00             } }
 };
 
+static const mode_sense_pages_t scsi_cdrom_ms_pages_changeable_sony_scsi = {
+    { [0x01] = { GPMODE_R_W_ERROR_PAGE,               0x06, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 },
+      [0x02] = { GPMODE_DISCONNECT_PAGE,              0x0e, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 },
+      [0x08] = { GPMODE_CDROM_PAGE_SONY,              0x02, 0xff, 0xff },
+      [0x09] = { GPMODE_CDROM_AUDIO_PAGE_SONY | 0x80, 0x0e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                 0xff,                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+      [0x0d] = { GPMODE_CDROM_PAGE,                   0x06, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+      [0x0e] = { GPMODE_CDROM_AUDIO_PAGE | 0x80,      0x0e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                 0xff,                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+      [0x0f] = { 0x0f,                                0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00             },
+      [0x2a] = { GPMODE_CAPABILITIES_PAGE,            0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00                         } }
+};
+// clang-format on
+
 static gesn_cdb_t          *gesn_cdb;
 static gesn_event_header_t *gesn_event_header;
 
@@ -480,22 +257,21 @@ static void scsi_cdrom_init(scsi_cdrom_t *dev);
 int scsi_cdrom_do_log = ENABLE_SCSI_CDROM_LOG;
 
 static void
-scsi_cdrom_log(const char *format, ...)
+scsi_cdrom_log(void *priv, const char *format, ...)
 {
-    va_list ap;
-
     if (scsi_cdrom_do_log) {
+        va_list ap;
         va_start(ap, format);
-        pclog_ex(format, ap);
+        log_out(priv, format, ap);
         va_end(ap);
     }
 }
 #else
-#    define scsi_cdrom_log(format, ...)
+#    define scsi_cdrom_log(priv, format, ...)
 #endif
 
 static void
-scsi_cdrom_set_callback(scsi_cdrom_t *dev)
+scsi_cdrom_set_callback(const scsi_cdrom_t *dev)
 {
     if (dev && dev->drv && (dev->drv->bus_type != CDROM_BUS_SCSI))
         ide_set_callback(ide_drives[dev->drv->ide_channel], dev->callback);
@@ -504,47 +280,50 @@ scsi_cdrom_set_callback(scsi_cdrom_t *dev)
 static void
 scsi_cdrom_init(scsi_cdrom_t *dev)
 {
-    if (!dev)
-        return;
+    if (dev != NULL) {
+        /* Do a reset (which will also rezero it). */
+        scsi_cdrom_reset((scsi_common_t *) dev);
 
-    /* Do a reset (which will also rezero it). */
-    scsi_cdrom_reset((scsi_common_t *) dev);
+        /* Configure the drive. */
+        dev->requested_blocks = 1;
 
-    /* Configure the drive. */
-    dev->requested_blocks = 1;
+        dev->drv->bus_mode = 0;
+        if (dev->drv->bus_type >= CDROM_BUS_ATAPI)
+            dev->drv->bus_mode |= 2;
+        if (dev->drv->bus_type < CDROM_BUS_SCSI)
+            dev->drv->bus_mode |= 1;
+        scsi_cdrom_log(dev->log, "Bus type %i, bus mode %i\n",
+                       dev->drv->bus_type, dev->drv->bus_mode);
 
-    dev->drv->bus_mode = 0;
-    if (dev->drv->bus_type >= CDROM_BUS_ATAPI)
-        dev->drv->bus_mode |= 2;
-    if (dev->drv->bus_type < CDROM_BUS_SCSI)
-        dev->drv->bus_mode |= 1;
-    scsi_cdrom_log("CD-ROM %i: Bus type %i, bus mode %i\n",
-                   dev->id, dev->drv->bus_type, dev->drv->bus_mode);
+        dev->sense[0] = 0xf0;
+        dev->sense[7] = 10;
+        /* NEC only */
+        if (dev->drv->is_early)
+            dev->tf->status = READY_STAT | DSC_STAT;
+        else
+            dev->tf->status = 0;
+        dev->tf->pos         = 0;
+        dev->packet_status   = PHASE_NONE;
+        scsi_cdrom_sense_key = scsi_cdrom_asc =
+        scsi_cdrom_ascq = dev->unit_attention = 0;
+        scsi_cdrom_info      = 0x00000000;
+        dev->drv->cd_status &= ~CD_STATUS_TRANSITION;
+        dev->drv->cur_speed  = dev->drv->real_speed;
+        scsi_cdrom_mode_sense_load(dev);
 
-    dev->sense[0] = 0xf0;
-    dev->sense[7] = 10;
-    /* NEC only */
-    if ((dev->drv->type == CDROM_TYPE_NEC_260_100) || (dev->drv->type == CDROM_TYPE_NEC_260_101))
-        dev->tf->status = READY_STAT | DSC_STAT;
-    else
-        dev->tf->status = 0;
-    dev->tf->pos         = 0;
-    dev->packet_status   = PHASE_NONE;
-    scsi_cdrom_sense_key = scsi_cdrom_asc = scsi_cdrom_ascq = dev->unit_attention = 0;
-    dev->drv->cur_speed                                                           = dev->drv->speed;
-    scsi_cdrom_mode_sense_load(dev);
-    if (dev->drv->type == CDROM_TYPE_PIONEER_DRM604X_2403)
-        scsi_cdrom_drive_status_load(dev);
+        if ((dev->drv->bus_type == CDROM_BUS_SCSI) && dev->drv->is_pioneer)
+            scsi_cdrom_drive_status_load(dev);
+    }
 }
 
 /* Returns: 0 for none, 1 for PIO, 2 for DMA. */
 static int
-scsi_cdrom_current_mode(scsi_cdrom_t *dev)
+scsi_cdrom_current_mode(const scsi_cdrom_t *dev)
 {
     if (dev->drv->bus_type == CDROM_BUS_SCSI)
         return 2;
     else if (dev->drv->bus_type == CDROM_BUS_ATAPI) {
-        scsi_cdrom_log("CD-ROM %i: ATAPI drive, setting to %s\n", dev->id,
+        scsi_cdrom_log(dev->log, "ATAPI drive, setting to %s\n",
                        (dev->tf->features & 1) ? "DMA" : "PIO",
                        dev->id);
         return (dev->tf->features & 1) ? 2 : 1;
@@ -554,52 +333,25 @@ scsi_cdrom_current_mode(scsi_cdrom_t *dev)
 }
 
 static uint32_t
-scsi_cdrom_get_channel(void *priv, int channel)
+scsi_cdrom_get_channel(void *priv, const int channel)
 {
     const scsi_cdrom_t *dev = (scsi_cdrom_t *) priv;
-    uint32_t ret;
+    uint32_t ret = channel + 1;
 
-    if (!dev)
-        return channel + 1;
-
-    switch (dev->drv->type) {
-        case CDROM_TYPE_DEC_RRD45_0436:
-        case CDROM_TYPE_SONY_CDU541_10i:
-        case CDROM_TYPE_SONY_CDU561_18k:
-        case CDROM_TYPE_SONY_CDU76S_100:
-        case CDROM_TYPE_TEXEL_DMXX24_100:
-            ret = dev->ms_pages_saved_sony.pages[dev->sony_vendor ? GPMODE_CDROM_AUDIO_PAGE_SONY : GPMODE_CDROM_AUDIO_PAGE][channel ? 10 : 8];
-            break;
-        default:
-            ret = dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE][channel ? 10 : 8];
-            break;
-    }
+    if (dev != NULL)
+        ret = dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE][channel ? 10 : 8] & 0x0f;
 
     return ret;
 }
 
 static uint32_t
-scsi_cdrom_get_volume(void *priv, int channel)
+scsi_cdrom_get_volume(void *priv, const int channel)
 {
     const scsi_cdrom_t *dev = (scsi_cdrom_t *) priv;
-    uint32_t ret;
+    uint32_t ret = 255;
 
-    if (!dev)
-        return 255;
-
-    switch (dev->drv->type) {
-        case CDROM_TYPE_DEC_RRD45_0436:
-        case CDROM_TYPE_SONY_CDU541_10i:
-        case CDROM_TYPE_SONY_CDU561_18k:
-        case CDROM_TYPE_SONY_CDU76S_100:
-        case CDROM_TYPE_TEXEL_DMXX24_100:
-            ret = dev->ms_pages_saved_sony.pages[dev->sony_vendor ? GPMODE_CDROM_AUDIO_PAGE_SONY :
-                                                 GPMODE_CDROM_AUDIO_PAGE][channel ? 11 : 9];
-            break;
-        default:
-            ret = dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE][channel ? 11 : 9];
-            break;
-    }
+    if (dev != NULL)
+        ret = dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE][channel ? 11 : 9];
 
     return ret;
 }
@@ -607,133 +359,90 @@ scsi_cdrom_get_volume(void *priv, int channel)
 static void
 scsi_cdrom_mode_sense_load(scsi_cdrom_t *dev)
 {
-    FILE *fp;
-    char  file_name[512];
+    char  file_name[512] = { 0 };
 
-    switch (dev->drv->type) {
-        case CDROM_TYPE_DEC_RRD45_0436:
-        case CDROM_TYPE_SONY_CDU541_10i:
-        case CDROM_TYPE_SONY_CDU561_18k:
-        case CDROM_TYPE_SONY_CDU76S_100:
-        case CDROM_TYPE_TEXEL_DMXX24_100:
-            memset(&dev->ms_pages_saved_sony, 0, sizeof(mode_sense_pages_t));
-            memcpy(&dev->ms_pages_saved_sony, &scsi_cdrom_mode_sense_pages_default_sony_scsi,
-                   sizeof(mode_sense_pages_t));
+    memset(&dev->ms_pages_saved, 0x00, sizeof(mode_sense_pages_t));
+    memcpy(&dev->ms_pages_saved, &dev->ms_pages_default,
+           sizeof(mode_sense_pages_t));
 
-            memset(file_name, 0, 512);
-            sprintf(file_name, "scsi_cdrom_%02i_mode_sense_sony_bin", dev->id);
-            fp = plat_fopen(nvr_path(file_name), "rb");
-            if (fp) {
-                if (fread(dev->ms_pages_saved_sony.pages[GPMODE_CDROM_AUDIO_PAGE_SONY], 1,
-                          0x10, fp) != 0x10)
-                    fatal("scsi_cdrom_mode_sense_load(): Error reading data\n");
-                fclose(fp);
-            }
-            break;
-        default:
-            memset(&dev->ms_pages_saved, 0, sizeof(mode_sense_pages_t));
-            if (dev->drv->bus_type == CDROM_BUS_SCSI)
-                memcpy(&dev->ms_pages_saved, &scsi_cdrom_mode_sense_pages_default_scsi,
-                       sizeof(mode_sense_pages_t));
-            else
-                memcpy(&dev->ms_pages_saved, &scsi_cdrom_mode_sense_pages_default,
-                       sizeof(mode_sense_pages_t));
-
-            memset(file_name, 0, 512);
-            if (dev->drv->bus_type == CDROM_BUS_SCSI)
-                sprintf(file_name, "scsi_cdrom_%02i_mode_sense_bin", dev->id);
-            else
-                sprintf(file_name, "cdrom_%02i_mode_sense_bin", dev->id);
-            fp = plat_fopen(nvr_path(file_name), "rb");
-            if (fp) {
-                if (fread(dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE], 1, 0x10, fp) != 0x10)
-                    fatal("scsi_cdrom_mode_sense_load(): Error reading data\n");
-                fclose(fp);
-            }
-            break;
+    if (dev->drv->bus_type == CDROM_BUS_SCSI)
+        sprintf(file_name, "scsi_cdrom_%02i_mode_sense_bin", dev->id);
+    else
+        sprintf(file_name, "cdrom_%02i_mode_sense_bin", dev->id);
+    FILE *fp = plat_fopen(nvr_path(file_name), "rb");
+    if (fp) {
+        if (fread(dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE], 1, 0x10, fp) != 0x10)
+            log_fatal(dev->log, "scsi_cdrom_mode_sense_load(): Error reading data\n");
+        (void) !fread(dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE_SONY], 1,
+                     0x10, fp);
+        fclose(fp);
     }
 }
 
 static void
-scsi_cdrom_mode_sense_save(scsi_cdrom_t *dev)
+scsi_cdrom_mode_sense_save(const scsi_cdrom_t *dev)
 {
-    FILE *fp;
-    char  file_name[512];
+    char  file_name[512] = { 0 };
 
-    memset(file_name, 0, 512);
-
-    switch (dev->drv->type) {
-        case CDROM_TYPE_DEC_RRD45_0436:
-        case CDROM_TYPE_SONY_CDU541_10i:
-        case CDROM_TYPE_SONY_CDU561_18k:
-        case CDROM_TYPE_SONY_CDU76S_100:
-        case CDROM_TYPE_TEXEL_DMXX24_100:
-            sprintf(file_name, "scsi_cdrom_%02i_mode_sense_sony_bin", dev->id);
-            fp = plat_fopen(nvr_path(file_name), "wb");
-            if (fp) {
-                fwrite(dev->ms_pages_saved_sony.pages[GPMODE_CDROM_AUDIO_PAGE_SONY], 1, 0x10, fp);
-                fclose(fp);
-            }
-            break;
-        default:
-            if (dev->drv->bus_type == CDROM_BUS_SCSI)
-                sprintf(file_name, "scsi_cdrom_%02i_mode_sense_bin", dev->id);
-            else
-                sprintf(file_name, "cdrom_%02i_mode_sense_bin", dev->id);
-            fp = plat_fopen(nvr_path(file_name), "wb");
-            if (fp) {
-                fwrite(dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE], 1, 0x10, fp);
-                fclose(fp);
-            }
-            break;
+    if (dev->drv->bus_type == CDROM_BUS_SCSI)
+        sprintf(file_name, "scsi_cdrom_%02i_mode_sense_bin", dev->id);
+    else
+        sprintf(file_name, "cdrom_%02i_mode_sense_bin", dev->id);
+    FILE *fp = plat_fopen(nvr_path(file_name), "wb");
+    if (fp) {
+        fwrite(dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE], 1, 0x10, fp);
+        fwrite(dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE_SONY], 1, 0x10, fp);
+        fclose(fp);
     }
 }
 
-/*SCSI Drive Status (Pioneer only)*/
+/* SCSI Drive Status (Pioneer only). */
 static void
 scsi_cdrom_drive_status_load(scsi_cdrom_t *dev)
 {
-    memset(&dev->ms_drive_status_pages_saved, 0, sizeof(mode_sense_pages_t));
-    memcpy(&dev->ms_drive_status_pages_saved, &scsi_cdrom_drive_status_pages, sizeof(mode_sense_pages_t));
+    memset(&dev->ms_drive_status_pages_saved, 0x00, sizeof(mode_sense_pages_t));
+    memcpy(&dev->ms_drive_status_pages_saved, &scsi_cdrom_drive_status_pages,
+           sizeof(mode_sense_pages_t));
 }
 
 static uint8_t
-scsi_cdrom_drive_status_read(scsi_cdrom_t *dev, UNUSED(uint8_t page_control), uint8_t page, uint8_t pos)
+scsi_cdrom_drive_status_read(const scsi_cdrom_t *dev, const uint8_t page,
+                             const uint8_t pos)
 {
     return dev->ms_drive_status_pages_saved.pages[page][pos];
 }
 
 static uint32_t
-scsi_cdrom_drive_status(scsi_cdrom_t *dev, uint8_t *buf, uint32_t pos, uint8_t page)
+scsi_cdrom_drive_status(const scsi_cdrom_t *dev, uint8_t *buf, uint8_t page)
 {
-    uint8_t page_control = (page >> 6) & 3;
-    uint16_t msplen;
+    uint32_t      pos   = 0;
 
     page &= 0x3f;
 
     for (uint8_t i = 0; i < 0x40; i++) {
-        if (page == i) {
-            if (scsi_cdrom_drive_status_page_flags & (1LL << ((uint64_t) (page & 0x3f)))) {
-                buf[pos++] = scsi_cdrom_drive_status_read(dev, page_control, i, 0);
-                msplen     = (scsi_cdrom_drive_status_read(dev, page_control, i, 1) << 8);
-                msplen    |= scsi_cdrom_drive_status_read(dev, page_control, i, 2);
-                buf[pos++] = (msplen >> 8) & 0xff;
-                buf[pos++] = msplen & 0xff;
-                scsi_cdrom_log("CD-ROM %i: DRIVE STATUS: Page [%02X] length %i\n", dev->id, i, msplen);
-                for (uint16_t j = 0; j < msplen; j++) {
-                    if (i == 0x01) {
-                        buf[pos++] = scsi_cdrom_drive_status_read(dev, page_control, i, 3 + j);
-                        if (!(j & 1)) {            /*MSB of Drive Status*/
-                            if (dev->drv->ops)     /*Bit 11 of Drive Status, */
-                                buf[pos] &= ~0x08; /*Disc is present*/
-                            else
-                                buf[pos] |= 0x08; /*Disc not present*/
-                        }
-                    } else if ((i == 0x02) && (j == 0)) {
-                        buf[pos++] = ((dev->drv->cd_status == CD_STATUS_PLAYING) ? 0x01 : 0x00);
-                    } else
-                        buf[pos++] = scsi_cdrom_drive_status_read(dev, page_control, i, 3 + j);
-                }
+        if ((page == i) && (scsi_cdrom_drive_status_page_flags &
+                            (1LL << ((uint64_t) (page & 0x3f))))) {
+            buf[pos++]    = scsi_cdrom_drive_status_read(dev, i, 0);
+            uint16_t len  = (scsi_cdrom_drive_status_read(dev, i, 1) << 8);
+            len          |= scsi_cdrom_drive_status_read(dev, i, 2);
+            buf[pos++]    = (len >> 8) & 0xff;
+            buf[pos++]    = len & 0xff;
+            scsi_cdrom_log(dev->log, "CD-ROM %i: DRIVE STATUS: Page [%02X] length %i\n",
+                           i, len);
+            for (uint16_t j = 0; j < len; j++) {
+                if (i == 0x01) {
+                    buf[pos++] = scsi_cdrom_drive_status_read(dev, i, 3 + j);
+                    if (!(j & 1)) {               /* MSB of Drive Status. */
+                        if (dev->drv->ops)        /* Bit 11 of Drive Status, */
+                            buf[pos] &= ~0x08;    /* Disc is present. */
+                        else
+                            buf[pos] |= 0x08;     /* Disc not present. */
+                    }
+                } else if ((i == 0x02) && (j == 0))
+                    buf[pos++] = ((dev->drv->cd_status == CD_STATUS_PLAYING) ?
+                                 0x01 : 0x00);
+                else
+                    buf[pos++] = scsi_cdrom_drive_status_read(dev, i, 3 + j);
             }
         }
     }
@@ -743,109 +452,92 @@ scsi_cdrom_drive_status(scsi_cdrom_t *dev, uint8_t *buf, uint32_t pos, uint8_t p
 
 /*SCSI Mode Sense 6/10*/
 static uint8_t
-scsi_cdrom_mode_sense_read(scsi_cdrom_t *dev, uint8_t page_control, uint8_t page, uint8_t pos)
+scsi_cdrom_mode_sense_read(const scsi_cdrom_t *dev, const uint8_t pgctl,
+                           const uint8_t page, const uint8_t pos)
 {
-    switch (dev->drv->type) {
-        case CDROM_TYPE_DEC_RRD45_0436:
-        case CDROM_TYPE_SONY_CDU541_10i:
-        case CDROM_TYPE_SONY_CDU561_18k:
-        case CDROM_TYPE_SONY_CDU76S_100:
-        case CDROM_TYPE_TEXEL_DMXX24_100:
-            switch (page_control) {
-                case 0:
-                case 3:
-                    return dev->ms_pages_saved_sony.pages[page][pos];
-                case 1:
-                    return scsi_cdrom_mode_sense_pages_changeable_sony.pages[page][pos];
-                case 2:
-                    return scsi_cdrom_mode_sense_pages_default_sony_scsi.pages[page][pos];
+    uint8_t ret = 0;
 
-                default:
-                    break;
-            }
+    switch (pgctl) {
+        case 0: case 3:
+            ret = dev->ms_pages_saved.pages[page][pos];
             break;
+
+        case 1:
+            ret = dev->ms_pages_changeable.pages[page][pos];
+            break;
+
+        case 2:
+             ret = dev->ms_pages_default.pages[page][pos];
+             break;
+
         default:
-            switch (page_control) {
-                case 0:
-                case 3:
-                    return dev->ms_pages_saved.pages[page][pos];
-                case 1:
-                    return scsi_cdrom_mode_sense_pages_changeable.pages[page][pos];
-                case 2:
-                    if (dev->drv->bus_type == CDROM_BUS_SCSI)
-                        return scsi_cdrom_mode_sense_pages_default_scsi.pages[page][pos];
-                    else
-                        return scsi_cdrom_mode_sense_pages_default.pages[page][pos];
+             break;
+    }      
 
-                default:
-                    break;
-            }
-            break;
-    }
-
-    return 0;
+    return ret;
 }
 
 static uint32_t
-scsi_cdrom_mode_sense(scsi_cdrom_t *dev, uint8_t *buf, uint32_t pos, uint8_t page, uint8_t block_descriptor_len)
+scsi_cdrom_mode_sense(const scsi_cdrom_t *dev, uint8_t *buf, uint32_t pos,
+                      uint8_t page, const uint8_t block_descriptor_len)
 {
-    uint8_t page_control = (page >> 6) & 3;
-    uint8_t msplen;
+    const uint8_t pgctl = (page >> 6) & 3;
 
     page &= 0x3f;
 
     if (block_descriptor_len) {
-        buf[pos++] = 1; /* Density code. */
-        buf[pos++] = 0; /* Number of blocks (0 = all). */
-        buf[pos++] = 0;
-        buf[pos++] = 0;
-        buf[pos++] = 0; /* Reserved. */
-        buf[pos++] = 0; /* Block length (0x800 = 2048 bytes). */
-        buf[pos++] = 8;
-        buf[pos++] = 0;
+        buf[pos++] = 0x01;                        /* Density code. */
+        buf[pos++] = 0x00;                        /* Number of blocks (0 = all). */
+        buf[pos++] = 0x00;
+        buf[pos++] = 0x00;
+        buf[pos++] = 0x00;                        /* Reserved. */
+        buf[pos++] = dev->drv->sector_size >> 16; /* Block length (default: 0x800 = 2048 bytes). */
+        buf[pos++] = dev->drv->sector_size >> 8;
+        buf[pos++] = dev->drv->sector_size;
     }
 
     for (uint8_t i = 0; i < 0x40; i++) {
         if ((page == GPMODE_ALL_PAGES) || (page == i)) {
-            if (scsi_cdrom_mode_sense_page_flags & (1LL << ((uint64_t) (page & 0x3f)))) {
-                buf[pos++] = scsi_cdrom_mode_sense_read(dev, page_control, i, 0);
-                msplen     = scsi_cdrom_mode_sense_read(dev, page_control, i, 1);
-                buf[pos++] = msplen;
-                scsi_cdrom_log("CD-ROM %i: MODE SENSE: Page [%02X] length %i\n", dev->id, i, msplen);
+            if (dev->ms_page_flags & (1LL << ((uint64_t) (page & 0x3f)))) {
+                const uint8_t msplen = scsi_cdrom_mode_sense_read(dev, pgctl, i, 1);
+
+                buf[pos++]           = scsi_cdrom_mode_sense_read(dev, pgctl, i, 0);
+                buf[pos++]           = msplen;
+
+                scsi_cdrom_log(dev->log, "MODE SENSE: Page [%02X] length %i\n",
+                               i, msplen);
+
                 for (uint8_t j = 0; j < msplen; j++) {
-                    /* If we are returning changeable values, always return them from the page,
-                       so they are all correctly. */
-                    if (page_control == 1)
-                        buf[pos++] = scsi_cdrom_mode_sense_read(dev, page_control, i, 2 + j);
+                    /*
+                       If we are returning changeable values, always return
+                       them from the page, so they are all correct.
+                     */
+                    if (pgctl == 1)
+                        buf[pos++] = scsi_cdrom_mode_sense_read(dev, pgctl, i, 2 + j);
                     else {
                         if ((i == GPMODE_CAPABILITIES_PAGE) && (j == 4)) {
-                            buf[pos] = scsi_cdrom_mode_sense_read(dev, page_control, i, 2 + j) & 0x1f;
-                            /* The early CD-ROM drives we emulate (NEC CDR-260 for ATAPI and
-                               early vendor SCSI CD-ROM models) are caddy drives, the later
-                               ones are tray drives. */
-                            if (dev->drv->bus_type == CDROM_BUS_SCSI)
-                                buf[pos++] |= ((dev->drv->type == CDROM_TYPE_86BOX_100) ? 0x20 : 0x00);
-                            else
-                                buf[pos++] |= ((dev->drv->type == CDROM_TYPE_NEC_260_100) ||
-                                                ((dev->drv->type == CDROM_TYPE_NEC_260_101)) ? 0x00 : 0x20);
-                        } else if ((i == GPMODE_CAPABILITIES_PAGE) && (j >= 6) && (j <= 7)) {
+                            buf[pos] = scsi_cdrom_mode_sense_read(dev, pgctl, i, 2 + j) & 0x1f;
+                            buf[pos++] |= (cdrom_is_caddy(dev->drv->type) ? 0x00 : 0x20);
+                        } else if ((i == GPMODE_CAPABILITIES_PAGE) && (j >= 6) &&
+                                   (j <= 7)) {
                             if (j & 1)
-                                buf[pos++] = ((dev->drv->speed * 176) & 0xff);
+                                buf[pos++] = ((dev->drv->real_speed * 176) & 0xff);
                             else
-                                buf[pos++] = ((dev->drv->speed * 176) >> 8);
-                        } else if ((i == GPMODE_CAPABILITIES_PAGE) && (j >= 8) && (j <= 9) &&
-                                    (dev->drv->type == CDROM_TYPE_PIONEER_DRM604X_2403)) {
-                            if (j & 1)
-                                buf[pos++] = ((dev->drv->speed * 176) & 0xff);
-                            else
-                                buf[pos++] = ((dev->drv->speed * 176) >> 8);
-                        } else if ((i == GPMODE_CAPABILITIES_PAGE) && (j >= 12) && (j <= 13)) {
+                                buf[pos++] = ((dev->drv->real_speed * 176) >> 8);
+                        } else if ((i == GPMODE_CAPABILITIES_PAGE) && (j >= 12) &&
+                                   (j <= 13)) {
                             if (j & 1)
                                 buf[pos++] = ((dev->drv->cur_speed * 176) & 0xff);
                             else
                                 buf[pos++] = ((dev->drv->cur_speed * 176) >> 8);
-                        } else
-                            buf[pos++] = scsi_cdrom_mode_sense_read(dev, page_control, i, 2 + j);
+                        } else if (dev->drv->is_sony &&
+                                   (i == GPMODE_CDROM_AUDIO_PAGE_SONY) &&
+                                   (j >= 6) && (j <= 13))
+                            buf[pos++] = scsi_cdrom_mode_sense_read(dev, pgctl,
+                                                                    GPMODE_CDROM_AUDIO_PAGE, 2 + j);
+                        else
+                            buf[pos++] = scsi_cdrom_mode_sense_read(dev, pgctl,
+                                                                    i, 2 + j);
                     }
                 }
             }
@@ -856,38 +548,53 @@ scsi_cdrom_mode_sense(scsi_cdrom_t *dev, uint8_t *buf, uint32_t pos, uint8_t pag
 }
 
 static void
-scsi_cdrom_update_request_length(scsi_cdrom_t *dev, int len, int block_len)
+scsi_cdrom_update_request_length(scsi_cdrom_t *dev, int len, const int block_len)
 {
-    int32_t bt;
     int32_t min_len = 0;
-    double  dlen;
+    int32_t bt;
 
     dev->max_transfer_len = dev->tf->request_length;
 
-    /* For media access commands, make sure the requested DRQ length matches the block length. */
+    /*
+       For media access commands, make sure the requested DRQ length
+       matches the block length.
+     */
     switch (dev->current_cdb[0]) {
+        case 0xbc:
+            if (!dev->drv->is_early) {
+                dev->packet_len   = len;
+                break;
+            }
+            fallthrough;
         case 0x08:
         case 0x28:
         case 0xa8:
+        case 0xb8:
         case 0xb9:
         case 0xbe:
+        case 0xd5:
             /* Round it to the nearest (block length) bytes. */
-            if ((dev->current_cdb[0] == 0xb9) || (dev->current_cdb[0] == 0xbe)) {
-                /* READ CD MSF and READ CD: Round the request length to the sector size - the device must ensure
-                   that a media access comand does not DRQ in the middle of a sector. One of the drivers that
-                   relies on the correctness of this behavior is MTMCDAI.SYS (the Mitsumi CD-ROM driver) for DOS
-                   which uses the READ CD command to read data on some CD types. */
+            if (dev->current_cdb[0] >= 0xb8) {
+                /*
+                   READ CD MSF and READ CD: Round the request length to the sector size - the
+                   device must ensure that a media access comand does not DRQ in the middle
+                   of a sector. One of the drivers that relies on the correctness of this
+                   behavior is MTMCDAI.SYS (the Mitsumi CD-ROM driver) for DOS which uses
+                   the READ CD command to read data on some CD types.
+                 */
 
                 /* Round to sector length. */
-                dlen                  = ((double) dev->max_transfer_len) / ((double) block_len);
+                const double dlen     = ((double) dev->max_transfer_len) / ((double) block_len);
                 dev->max_transfer_len = ((uint16_t) floor(dlen)) * block_len;
             } else {
                 /* Round it to the nearest 2048 bytes. */
-                dev->max_transfer_len = (dev->max_transfer_len >> 11) << 11;
+                dev->max_transfer_len = (dev->max_transfer_len / dev->drv->sector_size) * dev->drv->sector_size;
             }
 
-            /* Make sure total length is not bigger than sum of the lengths of
-               all the requested blocks. */
+            /*
+               Make sure total length is not bigger than sum of the lengths of
+               all the requested blocks.
+             */
             bt = (dev->requested_blocks * block_len);
             if (len > bt)
                 len = bt;
@@ -903,16 +610,25 @@ scsi_cdrom_update_request_length(scsi_cdrom_t *dev, int len, int block_len)
                     break;
                 }
             }
+
+            if ((dev->drv->bus_type != CDROM_BUS_SCSI) && (dev->block_len != 0))
+                dev->requested_blocks = (dev->packet_len  / dev->block_len);
             fallthrough;
 
         default:
-            dev->packet_len = len;
+            dev->packet_len   = len;
             break;
     }
-    /* If the DRQ length is odd, and the total remaining length is bigger, make sure it's even. */
+    /*
+       If the DRQ length is odd, and the total remaining length is bigger,
+       make sure it's even.
+     */
     if ((dev->max_transfer_len & 1) && (dev->max_transfer_len < len))
         dev->max_transfer_len &= 0xfffe;
-    /* If the DRQ length is smaller or equal in size to the total remaining length, set it to that. */
+    /*
+       If the DRQ length is smaller or equal in size to the total remaining length,
+       set it to that.
+     */
     if (!dev->max_transfer_len)
         dev->max_transfer_len = 65534;
 
@@ -929,158 +645,83 @@ scsi_cdrom_bus_speed(scsi_cdrom_t *dev)
 {
     double ret = -1.0;
 
-    if (dev && dev->drv && (dev->drv->bus_type == CDROM_BUS_SCSI)) {
-        dev->callback = -1.0; /* Speed depends on SCSI controller */
-        return 0.0;
-    } else {
-        if (dev && dev->drv)
-            ret = ide_atapi_get_period(dev->drv->ide_channel);
-        if (ret == -1.0) {
-            if (dev)
-                dev->callback = -1.0;
-            return 0.0;
-        } else
-            return ret * 1000000.0;
+    if (dev && dev->drv)
+        ret = ide_atapi_get_period(dev->drv->ide_channel);
+
+    if (ret == -1.0) {
+        if (dev)
+            dev->callback = -1.0;
+        ret = 0.0;
     }
+
+    return ret;
+}
+
+static void
+scsi_cdrom_set_period(scsi_cdrom_t *dev)
+{
+    scsi_cdrom_log(dev->log, "Current speed: %ix\n", dev->drv->cur_speed);
+
+    dev->callback = 0;
+
+    if (dev->packet_status != PHASE_COMPLETE) {
+        double  bytes_per_second;
+        double  period;
+
+        if (dev->was_cached == -1) {
+            if (dev->drv->bus_type == CDROM_BUS_SCSI)
+                dev->callback = -1.0; /* Speed depends on SCSI controller */
+            else
+                dev->callback = 512.0 + (scsi_cdrom_bus_speed(dev) * (double) (dev->packet_len));
+        } else {
+            if (dev->was_cached) {
+                dev->callback += 512.0;
+                scsi_cdrom_set_callback(dev);
+                return;
+            }
+
+            /* Seek time is in us. */
+            period = cdrom_seek_time(dev->drv);
+            scsi_cdrom_log(dev->log, "Seek period: %lf us\n", period);
+            dev->callback += period;
+
+            /* 44100 * 16 bits * 2 channels = 176400 bytes per second */
+            bytes_per_second = 176400.0;
+            bytes_per_second *= (double) dev->drv->cur_speed;
+
+            period = 1000000.0 / bytes_per_second;
+            scsi_cdrom_log(dev->log, "Byte transfer period: %lf us\n", period);
+            if (dev->was_cached == -1)
+                period *= (double) dev->packet_len;
+            else {
+                const int num = ((dev->drv->bus_type == CDROM_BUS_SCSI) ||
+                                 (dev->block_len == 0)) ? dev->sectors_num :
+                                ((scsi_cdrom_current_mode(dev) == 2) ? 1 : dev->sectors_num);
+
+                period *= ((double) num) * 2352.0;
+            }
+            scsi_cdrom_log(dev->log, "Sector transfer period: %lf us\n", period);
+            dev->callback += period;
+        }
+    }
+    scsi_cdrom_set_callback(dev);
 }
 
 static void
 scsi_cdrom_command_common(scsi_cdrom_t *dev)
 {
-    double bytes_per_second = 0.0;
-    double period;
-
     /* MAP: BUSY_STAT, no DRQ, phase 1. */
     dev->tf->status    = BUSY_STAT;
     dev->tf->phase     = 1;
     dev->tf->pos       = 0;
     dev->callback      = 0;
 
-    scsi_cdrom_log("CD-ROM %i: Current speed: %ix\n", dev->id, dev->drv->cur_speed);
-
-    if (dev->packet_status == PHASE_COMPLETE)
-        dev->callback = 0;
-    else {
-        switch (dev->current_cdb[0]) {
-            case GPCMD_REZERO_UNIT:
-            case 0x0b:
-            case 0x2b:
-                /* Seek time is in us. */
-                period = cdrom_seek_time(dev->drv);
-                scsi_cdrom_log("CD-ROM %i: Seek period: %" PRIu64 " us\n",
-                               dev->id, (uint64_t) period);
-                dev->callback += period;
-                scsi_cdrom_set_callback(dev);
-                return;
-            case 0x08:
-            case 0x28:
-            case 0xa8:
-                /* Seek time is in us. */
-                period = cdrom_seek_time(dev->drv);
-                scsi_cdrom_log("CD-ROM %i: Seek period: %" PRIu64 " us\n",
-                               dev->id, (uint64_t) period);
-                dev->callback += period;
-                fallthrough;
-            case 0x25:
-            case 0x42 ... 0x44:
-            case 0x51 ... 0x52:
-            case 0xad:
-            case 0xb8 ... 0xb9:
-            case 0xbe:
-                if (dev->current_cdb[0] == 0x42)
-                    dev->callback += 40.0;
-                /* Account for seek time. */
-                /* 44100 * 16 bits * 2 channels = 176400 bytes per second */
-                bytes_per_second = 176400.0;
-                bytes_per_second *= (double) dev->drv->cur_speed;
-                break;
-            case 0xc6 ... 0xc7:
-                switch (dev->drv->type) {
-                    case CDROM_TYPE_TOSHIBA_XM_3433:
-                    case CDROM_TYPE_TOSHIBA_XM3201B_3232:
-                    case CDROM_TYPE_TOSHIBA_XM3301TA_0272:
-                    case CDROM_TYPE_TOSHIBA_XM5701TA_3136:
-                    case CDROM_TYPE_TOSHIBA_SDM1401_1008:
-                        bytes_per_second = 176.0 * 1024.0;
-                        bytes_per_second *= (double) dev->drv->cur_speed;
-                        break;
-                }
-            case 0xc0:
-                switch (dev->drv->type) {
-                    case CDROM_TYPE_DEC_RRD45_0436:
-                    case CDROM_TYPE_SONY_CDU541_10i:
-                    case CDROM_TYPE_SONY_CDU561_18k:
-                    case CDROM_TYPE_SONY_CDU76S_100:
-                    case CDROM_TYPE_TEXEL_DMXX24_100:
-                        /* 44100 * 16 bits * 2 channels = 176400 bytes per second */
-                        bytes_per_second = 176400.0;
-                        bytes_per_second *= (double) dev->drv->cur_speed;
-                        break;
-                }
-            case 0xc1:
-                switch (dev->drv->type) {
-                    case CDROM_TYPE_DEC_RRD45_0436:
-                    case CDROM_TYPE_SONY_CDU541_10i:
-                    case CDROM_TYPE_SONY_CDU561_18k:
-                    case CDROM_TYPE_SONY_CDU76S_100:
-                    case CDROM_TYPE_PIONEER_DRM604X_2403:
-                    case CDROM_TYPE_TEXEL_DMXX24_100:
-                        /* 44100 * 16 bits * 2 channels = 176400 bytes per second */
-                        bytes_per_second = 176400.0;
-                        bytes_per_second *= (double) dev->drv->cur_speed;
-                        break;
-                }
-            case 0xc2 ... 0xc3:
-                switch (dev->drv->type) {
-                    case CDROM_TYPE_DEC_RRD45_0436:
-                    case CDROM_TYPE_SONY_CDU541_10i:
-                    case CDROM_TYPE_SONY_CDU561_18k:
-                    case CDROM_TYPE_SONY_CDU76S_100:
-                    case CDROM_TYPE_PIONEER_DRM604X_2403:
-                    case CDROM_TYPE_TEXEL_DMXX24_100:
-                        if (dev->current_cdb[0] == 0xc2)
-                            dev->callback += 40.0;
-                        /* 44100 * 16 bits * 2 channels = 176400 bytes per second */
-                        bytes_per_second = 176400.0;
-                        bytes_per_second *= (double) dev->drv->cur_speed;
-                        break;
-                }
-            case 0xdd ... 0xde:
-                switch (dev->drv->type) {
-                    case CDROM_TYPE_NEC_25_10a:
-                    case CDROM_TYPE_NEC_38_103:
-                    case CDROM_TYPE_NEC_75_103:
-                    case CDROM_TYPE_NEC_77_106:
-                    case CDROM_TYPE_NEC_211_100:
-                    case CDROM_TYPE_NEC_464_105:
-                        /* 44100 * 16 bits * 2 channels = 176400 bytes per second */
-                        bytes_per_second = 176400.0;
-                        bytes_per_second *= (double) dev->drv->cur_speed;
-                        break;
-                }
-                fallthrough;
-            default:
-                bytes_per_second = scsi_cdrom_bus_speed(dev);
-                if (bytes_per_second == 0.0) {
-                    dev->callback = -1; /* Speed depends on SCSI controller */
-                    return;
-                }
-                break;
-        }
-
-        period = 1000000.0 / bytes_per_second;
-        scsi_cdrom_log("CD-ROM %i: Byte transfer period: %" PRIu64 " us\n", dev->id, (uint64_t) period);
-        period = period * (double) (dev->packet_len);
-        scsi_cdrom_log("CD-ROM %i: Sector transfer period: %" PRIu64 " us\n", dev->id, (uint64_t) period);
-        dev->callback += period;
-    }
-    scsi_cdrom_set_callback(dev);
+    scsi_cdrom_set_period(dev);
 }
 
 static void
 scsi_cdrom_command_complete(scsi_cdrom_t *dev)
 {
-    ui_sb_update_icon(SB_CDROM | dev->id, 0);
     dev->packet_status = PHASE_COMPLETE;
     scsi_cdrom_command_common(dev);
     dev->tf->phase = 3;
@@ -1116,16 +757,18 @@ scsi_cdrom_command_write_dma(scsi_cdrom_t *dev)
     scsi_cdrom_command_common(dev);
 }
 
-/* id = Current CD-ROM device ID;
+/*
+   dev = Pointer to current CD-ROM device;
    len = Total transfer length;
    block_len = Length of a single block (it matters because media access commands on ATAPI);
    alloc_len = Allocated transfer length;
-   direction = Transfer direction (0 = read from host, 1 = write to host). */
+   direction = Transfer direction (0 = read from host, 1 = write to host).
+ */
 static void
 scsi_cdrom_data_command_finish(scsi_cdrom_t *dev, int len, int block_len, int alloc_len, int direction)
 {
-    scsi_cdrom_log("CD-ROM %i: Finishing command (%02X): %i, %i, %i, %i, %i\n",
-                   dev->id, dev->current_cdb[0], len, block_len, alloc_len, direction,
+    scsi_cdrom_log(dev->log, "Finishing command (%02X): %i, %i, %i, %i, %i\n",
+                   dev->current_cdb[0], len, block_len, alloc_len, direction,
                    dev->tf->request_length);
     dev->tf->pos = 0;
     if (alloc_len >= 0) {
@@ -1148,83 +791,91 @@ scsi_cdrom_data_command_finish(scsi_cdrom_t *dev, int len, int block_len, int al
                 scsi_cdrom_command_write_dma(dev);
         } else {
             scsi_cdrom_update_request_length(dev, len, block_len);
-            if (direction == 0)
+            if ((dev->drv->bus_type != CDROM_BUS_SCSI) &&
+                (dev->tf->request_length == 0))
+                scsi_cdrom_command_complete(dev);
+            else if (direction == 0)
                 scsi_cdrom_command_read(dev);
             else
                 scsi_cdrom_command_write(dev);
         }
     }
 
-    scsi_cdrom_log("CD-ROM %i: Status: %i, cylinder %i, packet length: %i, position: %i, phase: %i\n",
-                   dev->id, dev->packet_status, dev->tf->request_length, dev->packet_len, dev->tf->pos,
-                   dev->tf->phase);
+    scsi_cdrom_log(dev->log, "Status: %i, cylinder %i, packet length: %i, position: %i, "
+                   "phase: %i\n", dev->packet_status, dev->tf->request_length, dev->packet_len,
+                   dev->tf->pos, dev->tf->phase);
 }
 
 static void
 scsi_cdrom_sense_clear(scsi_cdrom_t *dev, UNUSED(int command))
 {
     scsi_cdrom_sense_key = scsi_cdrom_asc = scsi_cdrom_ascq = 0;
+    scsi_cdrom_info      = 0x00000000;
 }
 
 static void
-scsi_cdrom_set_phase(scsi_cdrom_t *dev, uint8_t phase)
+scsi_cdrom_set_phase(const scsi_cdrom_t *dev, const uint8_t phase)
 {
-    uint8_t scsi_bus = (dev->drv->scsi_device_id >> 4) & 0x0f;
-    uint8_t scsi_id  = dev->drv->scsi_device_id & 0x0f;
+    const uint8_t scsi_bus = (dev->drv->scsi_device_id >> 4) & 0x0f;
+    const uint8_t scsi_id  = dev->drv->scsi_device_id & 0x0f;
 
-    if (dev->drv->bus_type != CDROM_BUS_SCSI)
-        return;
-
-    scsi_devices[scsi_bus][scsi_id].phase = phase;
+    if (dev->drv->bus_type == CDROM_BUS_SCSI)
+        scsi_devices[scsi_bus][scsi_id].phase = phase;
 }
 
 static void
 scsi_cdrom_cmd_error(scsi_cdrom_t *dev)
 {
     scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-    dev->tf->error = ((scsi_cdrom_sense_key & 0xf) << 4) | ABRT_ERR;
-    if (dev->unit_attention)
-        dev->tf->error |= MCR_ERR;
-    dev->tf->status        = READY_STAT | ERR_STAT;
-    dev->tf->phase         = 3;
-    dev->tf->pos           = 0;
-    dev->packet_status     = PHASE_ERROR;
-    dev->callback          = 50.0 * CDROM_TIME;
-    scsi_cdrom_set_callback(dev);
-    ui_sb_update_icon(SB_CDROM | dev->id, 0);
-    scsi_cdrom_log("CD-ROM %i: ERROR: %02X/%02X/%02X\n", dev->id, scsi_cdrom_sense_key, scsi_cdrom_asc, scsi_cdrom_ascq);
-}
-
-static void
-scsi_cdrom_unit_attention(scsi_cdrom_t *dev)
-{
-    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-    dev->tf->error = (SENSE_UNIT_ATTENTION << 4) | ABRT_ERR;
-    if (dev->unit_attention)
-        dev->tf->error |= MCR_ERR;
-    dev->tf->status     = READY_STAT | ERR_STAT;
+    dev->tf->error     = ((scsi_cdrom_sense_key & 0xf) << 4) | ABRT_ERR;
+    dev->tf->status    = READY_STAT | ERR_STAT;
     dev->tf->phase     = 3;
     dev->tf->pos       = 0;
     dev->packet_status = PHASE_ERROR;
     dev->callback      = 50.0 * CDROM_TIME;
     scsi_cdrom_set_callback(dev);
     ui_sb_update_icon(SB_CDROM | dev->id, 0);
-    scsi_cdrom_log("CD-ROM %i: UNIT ATTENTION\n", dev->id);
+    scsi_cdrom_log(dev->log, "ERROR: %02X/%02X/%02X\n", scsi_cdrom_sense_key,
+                   scsi_cdrom_asc, scsi_cdrom_ascq);
 }
 
 static void
-scsi_cdrom_buf_alloc(scsi_cdrom_t *dev, uint32_t len)
+scsi_cdrom_unit_attention(scsi_cdrom_t *dev)
 {
-    if (!dev->buffer)
+    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+    dev->tf->error     = (SENSE_UNIT_ATTENTION << 4) | ABRT_ERR;
+    dev->tf->status    = READY_STAT | ERR_STAT;
+    dev->tf->phase     = 3;
+    dev->tf->pos       = 0;
+    dev->packet_status = PHASE_ERROR;
+    dev->callback      = 50.0 * CDROM_TIME;
+    scsi_cdrom_set_callback(dev);
+    ui_sb_update_icon(SB_CDROM | dev->id, 0);
+    scsi_cdrom_log(dev->log, "UNIT ATTENTION\n");
+}
+
+static void
+scsi_cdrom_buf_alloc(scsi_cdrom_t *dev, const uint32_t len)
+{
+    scsi_cdrom_log(dev->log, "Allocated buffer length: %i\n", len);
+
+    if (dev->buffer == NULL) {
         dev->buffer = (uint8_t *) malloc(len);
-    scsi_cdrom_log("CD-ROM %i: Allocated buffer length: %i, buffer = %p\n", dev->id, len, dev->buffer);
+        dev->buffer_sz = len;
+    }
+
+    if (len > dev->buffer_sz) {
+        uint8_t *buf = (uint8_t *) realloc(dev->buffer, len);
+        dev->buffer = buf;
+        dev->buffer_sz = len;
+    }
 }
 
 static void
 scsi_cdrom_buf_free(scsi_cdrom_t *dev)
 {
     if (dev->buffer) {
-        scsi_cdrom_log("CD-ROM %i: Freeing buffer...\n", dev->id);
+        scsi_cdrom_log(dev->log, "Freeing buffer...\n");
         free(dev->buffer);
         dev->buffer = NULL;
     }
@@ -1235,308 +886,270 @@ scsi_cdrom_bus_master_error(scsi_common_t *sc)
 {
     scsi_cdrom_t *dev = (scsi_cdrom_t *) sc;
 
+    scsi_cdrom_log(dev->log, "Bus master error\n");
     scsi_cdrom_buf_free(dev);
     scsi_cdrom_sense_key = scsi_cdrom_asc = scsi_cdrom_ascq = 0;
+    scsi_cdrom_info      =  (dev->sector_pos >> 24)        |
+                           ((dev->sector_pos >> 16) <<  8) |
+                           ((dev->sector_pos >> 8)  << 16) |
+                           ( dev->sector_pos        << 24);
+    scsi_cdrom_cmd_error(dev);
+}
+
+static void
+scsi_cdrom_error_common(scsi_cdrom_t *dev, uint8_t sense_key, uint8_t asc, uint8_t ascq, uint32_t info)
+{
+    scsi_cdrom_log(dev->log, "Medium not present\n");
+    scsi_cdrom_sense_key = sense_key;
+    scsi_cdrom_asc       = asc;
+    scsi_cdrom_ascq      = ascq;
+    scsi_cdrom_info      = info;
     scsi_cdrom_cmd_error(dev);
 }
 
 static void
 scsi_cdrom_not_ready(scsi_cdrom_t *dev)
 {
+    scsi_cdrom_log(dev->log, "Medium not present\n");
     scsi_cdrom_sense_key = SENSE_NOT_READY;
     scsi_cdrom_asc       = ASC_MEDIUM_NOT_PRESENT;
     scsi_cdrom_ascq      = 0;
+    scsi_cdrom_info      = 0x00000000;
     scsi_cdrom_cmd_error(dev);
 }
 
 static void
-scsi_cdrom_invalid_lun(scsi_cdrom_t *dev)
+scsi_cdrom_circ_error(scsi_cdrom_t *dev)
 {
+    scsi_cdrom_log(dev->log, "CIRC unrecovered error\n");
+    scsi_cdrom_sense_key = SENSE_MEDIUM_ERROR;
+    scsi_cdrom_asc       = ASC_UNRECOVERED_READ_ERROR;
+    scsi_cdrom_ascq      = ASCQ_CIRC_UNRECOVERED_ERROR;
+    scsi_cdrom_info      =  (dev->sector_pos >> 24)        |
+                           ((dev->sector_pos >> 16) <<  8) |
+                           ((dev->sector_pos >> 8)  << 16) |
+                           ( dev->sector_pos        << 24);
+    scsi_cdrom_cmd_error(dev);
+}
+
+static void
+scsi_cdrom_invalid_lun(scsi_cdrom_t *dev, const uint8_t lun)
+{
+    scsi_cdrom_log(dev->log, "Invalid LUN\n");
     scsi_cdrom_sense_key = SENSE_ILLEGAL_REQUEST;
     scsi_cdrom_asc       = ASC_INV_LUN;
     scsi_cdrom_ascq      = 0;
+    scsi_cdrom_info      = lun << 24;
     scsi_cdrom_cmd_error(dev);
 }
 
 static void
-scsi_cdrom_illegal_opcode(scsi_cdrom_t *dev)
+scsi_cdrom_illegal_opcode(scsi_cdrom_t *dev, const uint8_t opcode)
 {
+    scsi_cdrom_log(dev->log, "Illegal opcode: %02X\n", opcode);
     scsi_cdrom_sense_key = SENSE_ILLEGAL_REQUEST;
     scsi_cdrom_asc       = ASC_ILLEGAL_OPCODE;
     scsi_cdrom_ascq      = 0;
+    scsi_cdrom_info      = opcode << 24;
     scsi_cdrom_cmd_error(dev);
 }
 
 static void
 scsi_cdrom_lba_out_of_range(scsi_cdrom_t *dev)
 {
+    scsi_cdrom_log(dev->log, "LBA out of range: %08X\n", dev->sector_pos);
     scsi_cdrom_sense_key = SENSE_ILLEGAL_REQUEST;
     scsi_cdrom_asc       = ASC_LBA_OUT_OF_RANGE;
     scsi_cdrom_ascq      = 0;
+    scsi_cdrom_info      =  (dev->sector_pos >> 24)        |
+                           ((dev->sector_pos >> 16) <<  8) |
+                           ((dev->sector_pos >> 8)  << 16) |
+                           ( dev->sector_pos        << 24);
     scsi_cdrom_cmd_error(dev);
 }
 
 static void
-scsi_cdrom_invalid_field(scsi_cdrom_t *dev)
+scsi_cdrom_invalid_field(scsi_cdrom_t *dev, const uint32_t field)
 {
+    scsi_cdrom_log(dev->log, "Invalid field in command packet\n");
     scsi_cdrom_sense_key = SENSE_ILLEGAL_REQUEST;
     scsi_cdrom_asc       = ASC_INV_FIELD_IN_CMD_PACKET;
     scsi_cdrom_ascq      = 0;
+    scsi_cdrom_info      =  (field >> 24)        |
+                           ((field >> 16) <<  8) |
+                           ((field >> 8)  << 16) |
+                           ( field        << 24);
     scsi_cdrom_cmd_error(dev);
     dev->tf->status = 0x53;
 }
 
 static void
-scsi_cdrom_invalid_field_pl(scsi_cdrom_t *dev)
+scsi_cdrom_invalid_field_pl(scsi_cdrom_t *dev, const uint32_t field)
 {
+    scsi_cdrom_log(dev->log, "Invalid field in parameter list\n");
     scsi_cdrom_sense_key = SENSE_ILLEGAL_REQUEST;
     scsi_cdrom_asc       = ASC_INV_FIELD_IN_PARAMETER_LIST;
     scsi_cdrom_ascq      = 0;
+    scsi_cdrom_info      =  (field >> 24)        |
+                           ((field >> 16) <<  8) |
+                           ((field >> 8)  << 16) |
+                           ( field        << 24);
     scsi_cdrom_cmd_error(dev);
     dev->tf->status = 0x53;
 }
 
+static void
+scsi_cdrom_incompatible_format(scsi_cdrom_t *dev, const uint32_t val)
+{
+    scsi_cdrom_log(dev->log, "Incompatible format\n");
+    scsi_cdrom_sense_key = SENSE_ILLEGAL_REQUEST;
+    scsi_cdrom_asc       = ASC_INCOMPATIBLE_FORMAT;
+    scsi_cdrom_ascq      = 2;
+    scsi_cdrom_info      =  (val >> 24)        |
+                           ((val >> 16) <<  8) |
+                           ((val >> 8)  << 16) |
+                           ( val        << 24);
+    scsi_cdrom_cmd_error(dev);
+}
+
+static void
+scsi_cdrom_data_phase_error(scsi_cdrom_t *dev, const uint32_t info)
+{
+    scsi_cdrom_log(dev->log, "Data phase error\n");
+    scsi_cdrom_sense_key = SENSE_ILLEGAL_REQUEST;
+    scsi_cdrom_asc       = ASC_DATA_PHASE_ERROR;
+    scsi_cdrom_ascq      = 0;
+    scsi_cdrom_info      =  (info >> 24)        |
+                           ((info >> 16) <<  8) |
+                           ((info >> 8)  << 16) |
+                           ( info        << 24);
+    scsi_cdrom_cmd_error(dev);
+}
+
 static void
 scsi_cdrom_illegal_mode(scsi_cdrom_t *dev)
 {
+    scsi_cdrom_log(dev->log, "Illegal mode for this track\n");
     scsi_cdrom_sense_key = SENSE_ILLEGAL_REQUEST;
     scsi_cdrom_asc       = ASC_ILLEGAL_MODE_FOR_THIS_TRACK;
     scsi_cdrom_ascq      = 0;
-    scsi_cdrom_cmd_error(dev);
-}
-
-static void
-scsi_cdrom_incompatible_format(scsi_cdrom_t *dev)
-{
-    scsi_cdrom_sense_key = SENSE_ILLEGAL_REQUEST;
-    scsi_cdrom_asc       = ASC_INCOMPATIBLE_FORMAT;
-    scsi_cdrom_ascq      = 2;
-    scsi_cdrom_cmd_error(dev);
-}
-
-static void
-scsi_cdrom_data_phase_error(scsi_cdrom_t *dev)
-{
-    scsi_cdrom_sense_key = SENSE_ILLEGAL_REQUEST;
-    scsi_cdrom_asc       = ASC_DATA_PHASE_ERROR;
-    scsi_cdrom_ascq      = 0;
+    scsi_cdrom_info      =  (dev->sector_pos >> 24)        |
+                           ((dev->sector_pos >> 16) <<  8) |
+                           ((dev->sector_pos >> 8)  << 16) |
+                           ( dev->sector_pos        << 24);
     scsi_cdrom_cmd_error(dev);
 }
 
 static int
-scsi_cdrom_read_data(scsi_cdrom_t *dev, int msf, int type, int flags, int32_t *len, int vendor_type)
+scsi_cdrom_read_data(scsi_cdrom_t *dev, const int msf, const int type, const int flags,
+                     const int vendor_type)
 {
-    int      ret      = 0;
-    int      data_pos = 0;
-    int      temp_len = 0;
-    uint32_t cdsize   = 0;
+    int       temp_len = 0;
+    int       ret      = 0;
+    int       num      = (dev->drv->bus_type == CDROM_BUS_SCSI) ?
+                         dev->requested_blocks : 1;
 
-    if (dev->drv->cd_status == CD_STATUS_EMPTY) {
+    dev->sectors_num   = 0;
+
+    if ((dev->drv->cd_status == CD_STATUS_EMPTY) || (dev->drv->cd_status == CD_STATUS_DVD_REJECTED))
         scsi_cdrom_not_ready(dev);
-        return 0;
-    }
-
-    cdsize = dev->drv->cdrom_capacity;
-
-    if (dev->sector_pos >= cdsize) {
-        scsi_cdrom_log("CD-ROM %i: Trying to read from beyond the end of disc (%i >= %i)\n", dev->id,
-                       dev->sector_pos, cdsize);
+    else if (dev->sector_pos > dev->drv->cdrom_capacity) {
         scsi_cdrom_lba_out_of_range(dev);
-        return -1;
-    }
+        ret = -1;
+    } else {
+        ret = 1;
+        for (int i = 0; (i < num) && (ret > 0) && (dev->sector_len > 0); i++) {
+            ret = cdrom_readsector_raw(dev->drv, dev->buffer + dev->buffer_pos,
+                                       dev->sector_pos, msf, type,
+                                       flags, &temp_len, vendor_type);
 
-/* FIXME: Temporarily disabled this because the Triones ATAPI DMA driver seems to
-          always request a 4-sector read but sets the DMA bus master to transfer less
-          data than that. */
-#if 0
-    if ((dev->sector_pos + dev->sector_len - 1) >= cdsize) {
-        scsi_cdrom_log("CD-ROM %i: Trying to read to beyond the end of disc (%i >= %i)\n", dev->id,
-          (dev->sector_pos + dev->sector_len - 1), cdsize);
-        scsi_cdrom_lba_out_of_range(dev);
-        return -1;
-    }
-#endif
+            if (ret < 0)
+                scsi_cdrom_circ_error(dev);
+            else if (ret == 0)
+                scsi_cdrom_illegal_mode(dev);
+            else {
+                if (dev->block_len == 0xffffffff) {
+                    dev->block_len = temp_len;
 
-    dev->old_len = 0;
-    *len         = 0;
+                    if ((dev->drv->bus_type != CDROM_BUS_SCSI) &&
+                        (scsi_cdrom_current_mode(dev) != 2)) {
+                        num = (dev->tf->request_length < dev->block_len) ?
+                              dev->block_len : dev->tf->request_length;
+                        num = (num / dev->block_len) * dev->block_len;
+                        if (num > dev->sector_len)
+                            num = dev->sector_len;
+                    }
+                }
 
-    for (int i = 0; i < dev->requested_blocks; i++) {
-        ret = cdrom_readsector_raw(dev->drv, dev->buffer + data_pos,
-                                   dev->sector_pos + i, msf, type, flags, &temp_len, vendor_type);
+                dev->sector_pos++;
+                dev->drv->seek_pos = dev->sector_pos;
 
-        data_pos += temp_len;
-        dev->old_len += temp_len;
+                dev->sector_len--;
+                dev->sectors_num++;
 
-        *len += temp_len;
-
-        if (!ret) {
-            scsi_cdrom_illegal_mode(dev);
-            return 0;
+                dev->buffer_pos += temp_len;
+            }
         }
     }
 
-    return 1;
+    if ((ret < 1) || (dev->sector_len == 0))
+        dev->wait = 0;
+
+    return ret;
 }
 
 static int
-scsi_cdrom_read_blocks(scsi_cdrom_t *dev, int32_t *len, int first_batch, int vendor_type)
+scsi_cdrom_read_blocks(scsi_cdrom_t *dev)
 {
-    int ret   = 0;
+    int ret   = 1;
     int msf   = 0;
-    int type  = 0;
-    int flags = 0;
+    int type  = dev->sector_type;
+    int flags = dev->sector_flags;
+#ifdef ENABLE_SCSI_CDROM_LOG
+    int num   = (dev->drv->bus_type == CDROM_BUS_SCSI) ?
+                dev->requested_blocks : 1;
+#endif
 
-    if (dev->current_cdb[0] == GPCMD_READ_CD_MSF)
-        msf = 1;
-
-    if ((dev->current_cdb[0] == GPCMD_READ_CD_MSF) || (dev->current_cdb[0] == GPCMD_READ_CD)) {
-        type  = (dev->current_cdb[1] >> 2) & 7;
-        flags = dev->current_cdb[9] | (((uint32_t) dev->current_cdb[10]) << 8);
-    } else {
-        type  = 8;
-        flags = 0x10;
-    }
-
-    if (!dev->sector_len) {
-        scsi_cdrom_command_complete(dev);
-        return -1;
-    }
-
-    scsi_cdrom_log("Reading %i blocks starting from %i...\n", dev->requested_blocks, dev->sector_pos);
-
-    ret = scsi_cdrom_read_data(dev, msf, type, flags, len, vendor_type);
-
-    scsi_cdrom_log("Read %i bytes of blocks...\n", *len);
-
-    if (ret == -1)
-        return 0;
-    else if (!ret || (!first_batch && (dev->old_len != *len))) {
-        if (!first_batch && (dev->old_len != *len))
-            scsi_cdrom_illegal_mode(dev);
-
-        return 0;
-    }
-
-    dev->sector_pos += dev->requested_blocks;
-    dev->drv->seek_pos = dev->sector_pos;
-    dev->sector_len -= dev->requested_blocks;
-    return 1;
-}
-
-/*SCSI Read DVD Structure*/
-static int
-scsi_cdrom_read_dvd_structure(scsi_cdrom_t *dev, int format, const uint8_t *packet, uint8_t *buf)
-{
-    int      layer         = packet[6];
-    uint64_t total_sectors = 0;
-
-    switch (format) {
-        case 0x00: /* Physical format information */
-            if (dev->drv->cd_status == CD_STATUS_EMPTY) {
-                scsi_cdrom_not_ready(dev);
-                return 0;
+    switch (dev->current_cdb[0]) {
+        case GPCMD_READ_CD_MSF_OLD:
+        case GPCMD_READ_CD_MSF:
+            msf = 1;
+            fallthrough;
+        case GPCMD_PLAY_CD:
+        case GPCMD_READ_CD_OLD:
+        case GPCMD_READ_CD:
+            type  = (dev->current_cdb[1] >> 2) & 7;
+            flags = dev->current_cdb[9] | (((uint32_t) dev->current_cdb[10]) << 8);
+            break;
+        case GPCMD_READ_HEADER:
+        case GPCMD_READ_HEADER_SONY:
+            type  = 0x00;
+            flags = 0x20;
+            break;
+        default:
+            if (dev->sector_type == 0xff) {
+                scsi_cdrom_illegal_mode(dev);
+                ret   = 0;
             }
-
-            total_sectors = (uint64_t) dev->drv->cdrom_capacity;
-
-            if (layer != 0) {
-                scsi_cdrom_invalid_field(dev);
-                return 0;
-            }
-
-            total_sectors >>= 2;
-            if (total_sectors == 0) {
-                /* return -ASC_MEDIUM_NOT_PRESENT; */
-                scsi_cdrom_not_ready(dev);
-                return 0;
-            }
-
-            buf[4] = 18; /* Length of Layer Information */
-            buf[5] = 0;
-
-            buf[6] = 1;   /* DVD-ROM, part version 1 */
-            buf[7] = 0xf; /* 120mm disc, minimum rate unspecified */
-            buf[8] = 1;   /* one layer, read-only (per MMC-2 spec) */
-            buf[9] = 0;   /* default densities */
-
-            /* FIXME: 0x30000 per spec? */
-            buf[10] = 0x00;
-            buf[11] = 0x03;
-            buf[12] = buf[13] = 0; /* start sector */
-
-            buf[14] = 0x00;
-            buf[15] = (total_sectors >> 16) & 0xff; /* end sector */
-            buf[16] = (total_sectors >> 8) & 0xff;
-            buf[17] = total_sectors & 0xff;
-
-            buf[18] = 0x00;
-            buf[19] = (total_sectors >> 16) & 0xff; /* l0 end sector */
-            buf[20] = (total_sectors >> 8) & 0xff;
-            buf[21] = total_sectors & 0xff;
-
-            /* 20 bytes of data + 4 byte header */
-            return (20 + 4);
-
-        case 0x01:      /* DVD copyright information */
-            buf[4] = 0; /* no copyright data */
-            buf[5] = 0; /* no region restrictions */
-
-            /* Size of buffer, not including 2 byte size field */
-            buf[0] = ((4 + 2) >> 8) & 0xff;
-            buf[1] = (4 + 2) & 0xff;
-
-            /* 4 byte header + 4 byte data */
-            return (4 + 4);
-
-        case 0x03: /* BCA information - invalid field for no BCA info */
-            scsi_cdrom_invalid_field(dev);
-            return 0;
-
-        case 0x04: /* DVD disc manufacturing information */
-                   /* Size of buffer, not including 2 byte size field */
-            buf[0] = ((2048 + 2) >> 8) & 0xff;
-            buf[1] = (2048 + 2) & 0xff;
-
-            /* 2k data + 4 byte header */
-            return (2048 + 4);
-
-        case 0xff:
-            /*
-             * This lists all the command capabilities above.  Add new ones
-             * in order and update the length and buffer return values.
-             */
-
-            buf[4] = 0x00; /* Physical format */
-            buf[5] = 0x40; /* Not writable, is readable */
-            buf[6] = ((20 + 4) >> 8) & 0xff;
-            buf[7] = (20 + 4) & 0xff;
-
-            buf[8]  = 0x01; /* Copyright info */
-            buf[9]  = 0x40; /* Not writable, is readable */
-            buf[10] = ((4 + 4) >> 8) & 0xff;
-            buf[11] = (4 + 4) & 0xff;
-
-            buf[12] = 0x03; /* BCA info */
-            buf[13] = 0x40; /* Not writable, is readable */
-            buf[14] = ((188 + 4) >> 8) & 0xff;
-            buf[15] = (188 + 4) & 0xff;
-
-            buf[16] = 0x04; /* Manufacturing info */
-            buf[17] = 0x40; /* Not writable, is readable */
-            buf[18] = ((2048 + 4) >> 8) & 0xff;
-            buf[19] = (2048 + 4) & 0xff;
-
-            /* Size of buffer, not including 2 byte size field */
-            buf[6] = ((16 + 2) >> 8) & 0xff;
-            buf[7] = (16 + 2) & 0xff;
-
-            /* data written + 4 byte header */
-            return (16 + 4);
-
-        default: /* TODO: formats beyond DVD-ROM requires */
-            scsi_cdrom_invalid_field(dev);
-            return 0;
+            break;
     }
+
+    if (ret) {
+        if (dev->sector_len == 0) {
+            scsi_cdrom_command_complete(dev);
+            return -1;
+        }
+
+        scsi_cdrom_log(dev->log, "Reading %i blocks starting from %i...\n",
+                       num, dev->sector_pos);
+
+        ret = scsi_cdrom_read_data(dev, msf, type, flags, dev->vendor_type);
+
+        scsi_cdrom_log(dev->log, "Read %i bytes of blocks (ret = %i)...\n",
+                       dev->block_len, ret);
+    }
+
+    return ret;
 }
 
 static void
@@ -1544,157 +1157,279 @@ scsi_cdrom_insert(void *priv)
 {
     scsi_cdrom_t *dev = (scsi_cdrom_t *) priv;
 
-    if (!dev)
+    if ((dev == NULL) || (dev->drv == NULL))
         return;
 
-    dev->unit_attention = 1;
-    /* Turn off the medium changed status. */
-    dev->drv->cd_status &= ~CD_STATUS_MEDIUM_CHANGED;
-    scsi_cdrom_log("CD-ROM %i: Media insert\n", dev->id);
+    if (dev->drv->ops == NULL) {
+        dev->unit_attention = 0;
+        dev->drv->cd_status = CD_STATUS_EMPTY;
+        scsi_cdrom_log(dev->log, "Media removal\n");
+    } else if (dev->drv->cd_status & CD_STATUS_TRANSITION) {
+        dev->unit_attention = 1;
+        /* Turn off the medium changed status. */
+        dev->drv->cd_status &= ~CD_STATUS_TRANSITION;
+        scsi_cdrom_log(dev->log, "Media insert\n");
+    } else {
+        dev->unit_attention = 0;
+        dev->drv->cd_status |= CD_STATUS_TRANSITION;
+        scsi_cdrom_log(dev->log, "Media transition\n");
+    }
 }
 
 static int
-scsi_cdrom_pre_execution_check(scsi_cdrom_t *dev, uint8_t *cdb)
+scsi_command_check_ready(const scsi_cdrom_t *dev, const uint8_t *cdb)
 {
-    int ready = 0;
+    int ret = 0;
 
-    if ((cdb[0] != GPCMD_REQUEST_SENSE) && (dev->cur_lun == SCSI_LUN_USE_CDB) && (cdb[1] & 0xe0)) {
-        scsi_cdrom_log("CD-ROM %i: Attempting to execute a unknown command targeted at SCSI LUN %i\n",
-                       dev->id, ((dev->tf->request_length >> 5) & 7));
-        scsi_cdrom_invalid_lun(dev);
+    if (scsi_cdrom_command_flags[cdb[0]] & CHECK_READY) {
+        /*
+           Note by TC1995: Some vendor commands from X vendor don't really
+                           check for ready status but they do on Y vendor.
+                           Quite confusing I know.
+         */
+        if (!dev->drv->is_sony || (cdb[0] != 0xc0))
+            ret = 1;
+    } else if ((cdb[0] == GPCMD_READ_DVD_STRUCTURE) && (cdb[7] < 0xc0))
+        ret = 1;
+
+    return ret;
+}
+
+static int
+scsi_cdrom_pre_execution_check(scsi_cdrom_t *dev, const uint8_t *cdb)
+{
+    int       ready;
+
+    if ((cdb[0] != GPCMD_REQUEST_SENSE) && (dev->cur_lun == SCSI_LUN_USE_CDB) &&
+        (cdb[1] & 0xe0)) {
+        scsi_cdrom_log(dev->log, "Attempting to execute a unknown command targeted "
+                       "at SCSI LUN %i\n", ((dev->tf->request_length >> 5) & 7));
+        scsi_cdrom_invalid_lun(dev, cdb[1] >> 5);
         return 0;
     }
 
     if (!(scsi_cdrom_command_flags[cdb[0]] & IMPLEMENTED)) {
-        scsi_cdrom_log("CD-ROM %i: Attempting to execute unknown command %02X over %s\n", dev->id, cdb[0],
-                       (dev->drv->bus_type == CDROM_BUS_SCSI) ? "SCSI" : "ATAPI");
+        scsi_cdrom_log(dev->log, "Attempting to execute unknown command %02X over %s\n",
+                       cdb[0], (dev->drv->bus_type == CDROM_BUS_SCSI) ? "SCSI" : "ATAPI");
 
-        scsi_cdrom_illegal_opcode(dev);
+        scsi_cdrom_illegal_opcode(dev, cdb[0]);
         return 0;
     }
 
-    if ((dev->drv->bus_type < CDROM_BUS_SCSI) && (scsi_cdrom_command_flags[cdb[0]] & SCSI_ONLY)) {
-        scsi_cdrom_log("CD-ROM %i: Attempting to execute SCSI-only command %02X over ATAPI\n", dev->id, cdb[0]);
-        scsi_cdrom_illegal_opcode(dev);
+    if ((dev->drv->bus_type < CDROM_BUS_SCSI) &&
+        (scsi_cdrom_command_flags[cdb[0]] & SCSI_ONLY)) {
+        scsi_cdrom_log(dev->log, "Attempting to execute SCSI-only command %02X over "
+                       "ATAPI\n", cdb[0]);
+        scsi_cdrom_illegal_opcode(dev, cdb[0]);
         return 0;
     }
 
-    if ((dev->drv->bus_type == CDROM_BUS_SCSI) && (scsi_cdrom_command_flags[cdb[0]] & ATAPI_ONLY)) {
-        scsi_cdrom_log("CD-ROM %i: Attempting to execute ATAPI-only command %02X over SCSI\n", dev->id, cdb[0]);
-        scsi_cdrom_illegal_opcode(dev);
+    if ((dev->drv->bus_type == CDROM_BUS_SCSI) &&
+        (scsi_cdrom_command_flags[cdb[0]] & ATAPI_ONLY)) {
+        scsi_cdrom_log(dev->log, "Attempting to execute ATAPI-only command %02X over "
+                       "SCSI\n", cdb[0]);
+        scsi_cdrom_illegal_opcode(dev, cdb[0]);
         return 0;
     }
 
-    if ((dev->drv->cd_status == CD_STATUS_PLAYING) || (dev->drv->cd_status == CD_STATUS_PAUSED)) {
+    if ((dev->drv->cd_status == CD_STATUS_PLAYING) ||
+        (dev->drv->cd_status == CD_STATUS_PAUSED)) {
         ready = 1;
         goto skip_ready_check;
     }
 
-    if (dev->drv->cd_status & CD_STATUS_MEDIUM_CHANGED)
-        scsi_cdrom_insert((void *) dev);
+    if (dev->drv->cd_status & CD_STATUS_TRANSITION) {
+        if ((cdb[0] == GPCMD_TEST_UNIT_READY) || (cdb[0] == GPCMD_REQUEST_SENSE))
+            ready = 0;
+        else {
+            if (!(scsi_cdrom_command_flags[cdb[0]] & ALLOW_UA))
+                scsi_cdrom_insert((void *) dev);
 
-    ready = (dev->drv->cd_status != CD_STATUS_EMPTY);
+            ready = (dev->drv->cd_status != CD_STATUS_EMPTY) && (dev->drv->cd_status != CD_STATUS_DVD_REJECTED);
+        }
+    } else
+        ready = (dev->drv->cd_status != CD_STATUS_EMPTY) && (dev->drv->cd_status != CD_STATUS_DVD_REJECTED);
 
 skip_ready_check:
-    /* If the drive is not ready, there is no reason to keep the
+    /*
+       If the drive is not ready, there is no reason to keep the
        UNIT ATTENTION condition present, as we only use it to mark
-       disc changes. */
-    if (!ready && dev->unit_attention)
+       disc changes.
+     */
+    if (!ready && (dev->unit_attention > 0))
         dev->unit_attention = 0;
 
-    /* If the UNIT ATTENTION condition is set and the command does not allow
-       execution under it, error out and report the condition. */
+    /*
+       If the UNIT ATTENTION condition is set and the command does not allow
+       execution under it, error out and report the condition.
+     */
     if (dev->unit_attention == 1) {
-        /* Only increment the unit attention phase if the command can not pass through it. */
+        /*
+           Only increment the unit attention phase if the command can
+           not pass through it.
+         */
         if (!(scsi_cdrom_command_flags[cdb[0]] & ALLOW_UA)) {
-            /* scsi_cdrom_log("CD-ROM %i: Unit attention now 2\n", dev->id); */
+            scsi_cdrom_log(dev->log, "Unit attention now 2\n");
             dev->unit_attention++;
-            scsi_cdrom_log("CD-ROM %i: UNIT ATTENTION: Command %02X not allowed to pass through\n",
-                           dev->id, cdb[0]);
+            scsi_cdrom_log(dev->log, "UNIT ATTENTION: Command %02X not allowed to "
+                           "pass through\n", cdb[0]);
             scsi_cdrom_unit_attention(dev);
             return 0;
         }
     } else if (dev->unit_attention == 2) {
         if (cdb[0] != GPCMD_REQUEST_SENSE) {
-            /* scsi_cdrom_log("CD-ROM %i: Unit attention now 0\n", dev->id); */
+            scsi_cdrom_log(dev->log, "Unit attention now 0\n");
             dev->unit_attention = 0;
         }
     }
 
-    /* Unless the command is REQUEST SENSE, clear the sense. This will *NOT*
-       the UNIT ATTENTION condition if it's set. */
+    /*
+       Unless the command is REQUEST SENSE, clear the sense. This will *NOT* clear
+       the UNIT ATTENTION condition if it's set.
+     */
     if (cdb[0] != GPCMD_REQUEST_SENSE)
         scsi_cdrom_sense_clear(dev, cdb[0]);
 
-    /* Next it's time for NOT READY. */
-    if (!ready)
-        dev->media_status = MEC_MEDIA_REMOVAL;
-    else
-        dev->media_status = (dev->unit_attention) ? MEC_NEW_MEDIA : MEC_NO_CHANGE;
-
-    if ((scsi_cdrom_command_flags[cdb[0]] & CHECK_READY) && !ready) {
-        scsi_cdrom_log("CD-ROM %i: Not ready (%02X)\n", dev->id, cdb[0]);
+    if (!ready && scsi_command_check_ready(dev, cdb)) {
+        scsi_cdrom_log(dev->log, "Not ready (%02X)\n", cdb[0]);
         scsi_cdrom_not_ready(dev);
         return 0;
     }
 
-    scsi_cdrom_log("CD-ROM %i: Continuing with command %02X\n", dev->id, cdb[0]);
-
+    scsi_cdrom_log(dev->log, "Continuing with command %02X\n", cdb[0]);
     return 1;
 }
 
 static void
 scsi_cdrom_rezero(scsi_cdrom_t *dev)
 {
+    dev->drv->seek_diff = ABS(dev->sector_pos);
     dev->sector_pos = dev->sector_len = 0;
     cdrom_seek(dev->drv, 0, 0);
 }
 
+static int
+scsi_cdrom_update_sector_flags(scsi_cdrom_t *dev)
+{
+    int ret = 0;
+
+    switch (dev->drv->sector_size) {
+        default:
+            dev->sector_type  = 0xff;
+            scsi_cdrom_log(dev->log, "Invalid sector size: %i\n", dev->drv->sector_size);
+            scsi_cdrom_invalid_field_pl(dev, dev->drv->sector_size);
+            ret               = 1;
+            break;
+        case  128: case  256: case  512: case 2048:
+            /*
+               Internal type code indicating both Mode 1 and Mode 2 Form 1 are allowed.
+               Upper 4 bits indicate the divisor.
+             */
+            dev->sector_type  = 0x08 | ((2048 / dev->drv->sector_size) << 4);
+            dev->sector_flags = 0x0010;
+            break;
+        case 2052:
+            dev->sector_type  = 0x18;
+            dev->sector_flags = 0x0030;
+            break;
+        case 2056:
+            dev->sector_type  = 0x18;
+            dev->sector_flags = 0x0050;
+            break;
+        case 2060:
+            dev->sector_type  = 0x18;
+            dev->sector_flags = 0x0070;
+            break;
+        case 2324: case 2328:
+            dev->sector_type  = (dev->drv->sector_size == 2328) ? 0x1a : 0x1b;
+            dev->sector_flags = 0x0018;
+            break;
+        case 2332: case 2336:
+            dev->sector_type  = (dev->drv->sector_size == 2336) ? 0x1c : 0x1d;
+            dev->sector_flags = 0x0058;
+            break;
+        case 2340:
+            dev->sector_type  = 0x18;
+            dev->sector_flags = 0x0078;
+            break;
+        case 2352:
+            dev->sector_type  = 0x00;
+            dev->sector_flags = 0x00f8;
+            break;
+        case 2368:
+            dev->sector_type  = 0x00;
+            dev->sector_flags = 0x01f8;
+            break;
+        case 2448:
+            dev->sector_type  = 0x00;
+            dev->sector_flags = 0x02f8;
+            break;
+        case 2646:
+            dev->sector_type  = 0x00;
+            dev->sector_flags = 0x00fa;
+            break;
+    }
+
+    return ret;
+}
+
 void
 scsi_cdrom_reset(scsi_common_t *sc)
 {
     scsi_cdrom_t *dev = (scsi_cdrom_t *) sc;
 
-    if (!dev)
-        return;
+    if (dev != NULL) {
+        scsi_cdrom_rezero(dev);
+        dev->tf->status   = 0;
+        dev->callback     = 0.0;
+        scsi_cdrom_set_callback(dev);
+        dev->tf->phase          = 1;
+        dev->tf->request_length = 0xeb14;
+        dev->packet_status      = PHASE_NONE;
+        dev->unit_attention     = 0xff;
+        dev->cur_lun            = SCSI_LUN_USE_CDB;
 
-    scsi_cdrom_rezero(dev);
-    dev->tf->status   = 0;
-    dev->callback     = 0.0;
-    scsi_cdrom_set_callback(dev);
-    dev->tf->phase          = 1;
-    dev->tf->request_length = 0xeb14;
-    dev->packet_status      = PHASE_NONE;
-    dev->unit_attention     = 0xff;
-    dev->cur_lun            = SCSI_LUN_USE_CDB;
+        dev->drv->sector_size   = 2048;
+        (void) scsi_cdrom_update_sector_flags(dev);
+
+        scsi_cdrom_sense_key    = scsi_cdrom_asc = scsi_cdrom_ascq = dev->unit_attention = 0;
+        scsi_cdrom_info         = 0x00000000;
+        dev->drv->cd_status    &= ~CD_STATUS_TRANSITION;
+        dev->drv->cached_sector = -1;
+        dev->toc_cached         = 0;
+    }
 }
 
 static void
 scsi_cdrom_request_sense(scsi_cdrom_t *dev, uint8_t *buffer, uint8_t alloc_length)
 {
-    /*Will return 18 bytes of 0*/
+    /* Will return 18 bytes of 0x00. */
     if (alloc_length != 0) {
-        memset(buffer, 0, alloc_length);
+        memset(buffer, 0x00, alloc_length);
         memcpy(buffer, dev->sense, alloc_length);
     }
 
-    buffer[0] = 0x70;
+    buffer[0] = 0xf0;
+    buffer[7] = 0x0a;
 
     if ((scsi_cdrom_sense_key > 0) && (dev->drv->cd_status == CD_STATUS_PLAYING_COMPLETED)) {
         buffer[2]  = SENSE_ILLEGAL_REQUEST;
         buffer[12] = ASC_AUDIO_PLAY_OPERATION;
         buffer[13] = ASCQ_AUDIO_PLAY_OPERATION_COMPLETED;
-    } else if ((scsi_cdrom_sense_key == 0) && ((dev->drv->cd_status == CD_STATUS_PAUSED) || ((dev->drv->cd_status >= CD_STATUS_PLAYING) && (dev->drv->cd_status != CD_STATUS_STOPPED)))) {
+    } else if ((scsi_cdrom_sense_key == 0) &&
+               ((dev->drv->cd_status == CD_STATUS_PAUSED) || ((dev->drv->cd_status >= CD_STATUS_PLAYING) &&
+                (dev->drv->cd_status != CD_STATUS_STOPPED)))) {
         buffer[2]  = SENSE_ILLEGAL_REQUEST;
         buffer[12] = ASC_AUDIO_PLAY_OPERATION;
         buffer[13] = (dev->drv->cd_status == CD_STATUS_PLAYING) ? ASCQ_AUDIO_PLAY_OPERATION_IN_PROGRESS : ASCQ_AUDIO_PLAY_OPERATION_PAUSED;
-    } else if (dev->unit_attention && (scsi_cdrom_sense_key == 0)) {
+    } else if (dev->unit_attention && ((scsi_cdrom_sense_key == 0) || (scsi_cdrom_sense_key == 2))) {
         buffer[2]  = SENSE_UNIT_ATTENTION;
         buffer[12] = ASC_MEDIUM_MAY_HAVE_CHANGED;
         buffer[13] = 0;
     }
 
-    scsi_cdrom_log("CD-ROM %i: Reporting sense: %02X %02X %02X\n", dev->id, buffer[2], buffer[12], buffer[13]);
+    scsi_cdrom_log(dev->log, "Reporting sense: %02X %02X %02X\n", buffer[2], buffer[12],
+                   buffer[13]);
 
     if (buffer[2] == SENSE_UNIT_ATTENTION) {
         /* If the last remaining sense is unit attention, clear
@@ -1702,22 +1437,23 @@ scsi_cdrom_request_sense(scsi_cdrom_t *dev, uint8_t *buffer, uint8_t alloc_lengt
         dev->unit_attention = 0;
     }
 
-    /* Clear the sense stuff as per the spec. */
-    scsi_cdrom_sense_clear(dev, GPCMD_REQUEST_SENSE);
+    if (dev->drv->cd_status & CD_STATUS_TRANSITION) {
+        scsi_cdrom_log(dev->log, "CD_STATUS_TRANSITION: scsi_cdrom_insert()\n");
+        scsi_cdrom_insert((void *) dev);
+    }
 }
 
 void
 scsi_cdrom_request_sense_for_scsi(scsi_common_t *sc, uint8_t *buffer, uint8_t alloc_length)
 {
-    scsi_cdrom_t *dev = (scsi_cdrom_t *) sc;
+    scsi_cdrom_t *dev                = (scsi_cdrom_t *) sc;
 
-    if (dev->drv->cd_status & CD_STATUS_MEDIUM_CHANGED)
-        scsi_cdrom_insert((void *) dev);
-
-    if ((dev->drv->cd_status == CD_STATUS_EMPTY) && dev->unit_attention) {
-        /* If the drive is not ready, there is no reason to keep the
-           UNIT ATTENTION condition present, as we only use it to mark
-           disc changes. */
+    if (((dev->drv->cd_status == CD_STATUS_EMPTY) ||
+         (dev->drv->cd_status == CD_STATUS_DVD_REJECTED)) && dev->unit_attention) {
+        /*
+           If the drive is not ready, there is no reason to keep the UNIT ATTENTION
+           condition present, as we only use it to mark disc changes.
+         */
         dev->unit_attention = 0;
     }
 
@@ -1726,7 +1462,7 @@ scsi_cdrom_request_sense_for_scsi(scsi_common_t *sc, uint8_t *buffer, uint8_t al
 }
 
 static void
-scsi_cdrom_set_buf_len(scsi_cdrom_t *dev, int32_t *BufLen, int32_t *src_len)
+scsi_cdrom_set_buf_len(const scsi_cdrom_t *dev, int32_t *BufLen, int32_t *src_len)
 {
     if (dev->drv->bus_type == CDROM_BUS_SCSI) {
         if (*BufLen == -1)
@@ -1735,46 +1471,969 @@ scsi_cdrom_set_buf_len(scsi_cdrom_t *dev, int32_t *BufLen, int32_t *src_len)
             *BufLen  = MIN(*src_len, *BufLen);
             *src_len = *BufLen;
         }
-        scsi_cdrom_log("CD-ROM %i: Actual transfer length: %i\n", dev->id, *BufLen);
+        scsi_cdrom_log(dev->log, "Actual transfer length: %i\n", *BufLen);
     }
 }
 
 static void
-scsi_cdrom_stop(scsi_common_t *sc)
+scsi_cdrom_stop(const scsi_common_t *sc)
 {
-    scsi_cdrom_t *dev = (scsi_cdrom_t *) sc;
+    const scsi_cdrom_t *dev = (const scsi_cdrom_t *) sc;
 
     cdrom_stop(dev->drv);
+
+    ui_sb_update_icon(SB_CDROM | dev->id, 0);
+}
+
+static void
+scsi_cdrom_set_speed(scsi_cdrom_t *dev, const uint8_t *cdb)
+{
+    /* Stop the audio playing. */
+    cdrom_stop(dev->drv);
+
+    dev->drv->cur_speed = (cdb[3] | (cdb[2] << 8)) / 176;
+    if (dev->drv->cur_speed < 1)
+        dev->drv->cur_speed = 1;
+    else if (dev->drv->cur_speed > dev->drv->real_speed)
+        dev->drv->cur_speed = dev->drv->real_speed;
+    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+    scsi_cdrom_command_complete(dev);
+}
+
+static uint8_t
+scsi_cdrom_command_chinon(void *sc, const uint8_t *cdb, UNUSED(int32_t *BufLen))
+{
+    scsi_cdrom_t *dev                    = (scsi_cdrom_t *) sc;
+    uint8_t       cmd_stat               = 0x00;
+
+    switch (cdb[0]) {
+        default:
+            break;
+
+        case GPCMD_UNKNOWN_CHINON:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            scsi_cdrom_stop(sc);
+            scsi_cdrom_command_complete(dev);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_EJECT_CHINON:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            scsi_cdrom_stop(sc);
+            cdrom_eject(dev->id);
+            dev->toc_cached = 0;
+            scsi_cdrom_command_complete(dev);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_STOP_CHINON:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            scsi_cdrom_stop(sc);
+            scsi_cdrom_command_complete(dev);
+            cmd_stat = 0x01;
+            break;
+    }
+
+    return cmd_stat;
+}
+
+static void
+scsi_cdrom_cache_toc(scsi_cdrom_t *dev)
+{
+    if (!dev->toc_cached) {
+        dev->toc_cached         = 1;
+        dev->drv->seek_diff     = dev->drv->seek_pos + 150;
+        dev->sector_pos         = -150;
+        dev->drv->seek_pos      = -150;
+        dev->requested_blocks   = 150;
+        dev->drv->cached_sector = -1;
+    }
+}
+
+static void
+scsi_cdrom_one_sector_seek(scsi_cdrom_t *dev)
+{
+    if (!dev->was_cached) {
+        dev->drv->seek_diff   = 0;
+        dev->requested_blocks = 1;
+    }
+}
+
+static void
+scsi_cdrom_media_access_complete(scsi_cdrom_t *dev, const int ret)
+{
+    ui_sb_update_icon(SB_CDROM | dev->id, 0);
+    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+    dev->packet_status = (ret < 0) ? PHASE_ERROR : PHASE_COMPLETE;
+    dev->callback      = 20.0 * CDROM_TIME;
+    scsi_cdrom_set_callback(dev);
+}
+
+static void
+scsi_cdrom_read(scsi_common_t *sc)
+{
+    scsi_cdrom_t *dev   = (scsi_cdrom_t *) sc;
+    const int osl       = dev->sector_len;
+    const int ret       = scsi_cdrom_read_blocks(dev);
+
+    dev->drv->seek_diff = 0;
+
+    if (ret > 0) {
+        if (osl > 0)        
+            scsi_cdrom_set_period(dev);
+
+        ui_sb_update_icon(SB_CDROM | dev->id,
+                          (dev->packet_status != PHASE_COMPLETE));
+    } else
+        scsi_cdrom_media_access_complete(dev, ret);
+}
+
+static uint8_t
+scsi_cdrom_command_dec_sony_texel(void *sc, const uint8_t *cdb, int32_t *BufLen)
+{
+    scsi_cdrom_t *dev                    = (scsi_cdrom_t *) sc;
+    int           ret                    = 1;
+    uint8_t       cmd_stat               = 0x00;
+    int           msf;
+    int           len;
+    int           max_len;
+
+    switch (cdb[0]) {
+        default:
+            break;
+
+        case GPCMD_SET_ADDRESS_FORMAT_SONY:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            dev->drv->sony_msf = cdb[8] & 1;
+            scsi_cdrom_command_complete(dev);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_READ_TOC_SONY:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
+            dev->was_cached = dev->toc_cached;
+
+            msf             = dev->drv->sony_msf;
+
+            max_len = cdb[7];
+            max_len <<= 8;
+            max_len |= cdb[8];
+
+            scsi_cdrom_buf_alloc(dev, 65536);
+
+            if (dev->drv->ops == NULL)
+                scsi_cdrom_not_ready(dev);
+            else {
+                len = cdrom_read_toc_sony(dev->drv, dev->buffer, cdb[5], msf, max_len);
+
+                if (len == -1)
+                    /* If the returned length is -1, this means cdrom_read_toc_sony() has encountered an error. */
+                    scsi_cdrom_invalid_field(dev, dev->drv->inv_field);
+                else {
+                    scsi_cdrom_cache_toc(dev);
+
+                    scsi_cdrom_set_buf_len(dev, BufLen, &len);
+                    scsi_cdrom_data_command_finish(dev, len, len, len, 0);
+                }
+            }
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_READ_SUBCHANNEL_SONY:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
+            dev->was_cached = (dev->drv->cached_sector != -1);
+
+            max_len = cdb[7];
+            max_len <<= 8;
+            max_len |= cdb[8];
+            msf = dev->drv->sony_msf;
+
+            scsi_cdrom_log(dev->log, "Getting sub-channel type (%s), code-q = %02x\n",
+                           msf ? "MSF" : "LBA", cdb[2] & 0x40);
+
+            if (cdb[2] & 0x40) {
+                scsi_cdrom_buf_alloc(dev, 9);
+                memset(dev->buffer, 0, 9);
+                len = 9;
+                cdrom_get_current_subchannel_sony(dev->drv, dev->buffer, msf);
+                scsi_cdrom_one_sector_seek(dev);
+                len = MIN(len, max_len);
+                scsi_cdrom_set_buf_len(dev, BufLen, &len);
+                scsi_cdrom_data_command_finish(dev, len, len, len, 0);
+            } else {
+                scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+                scsi_cdrom_log(dev->log, "Drive Status All done - callback set\n");
+                dev->packet_status = PHASE_COMPLETE;
+                dev->callback      = 20.0 * CDROM_TIME;
+                scsi_cdrom_set_callback(dev);
+            }
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_READ_HEADER_SONY:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
+
+            len                   = (cdb[7] << 8) | cdb[8];
+            dev->sector_len       = 1;
+            dev->sector_pos       = (cdb[2] << 24) | (cdb[3] << 16) |
+                                    (cdb[4] << 8) | cdb[5];
+            dev->was_cached       = (dev->drv->cached_sector == dev->sector_pos);
+            scsi_cdrom_log(dev->log, "READ HEADER SONY: Length: %i, LBA: %i\n",
+                           dev->sector_len, dev->sector_pos);
+
+            if (len > 0) {
+                max_len               = 1;
+                dev->requested_blocks = 1;
+
+                dev->packet_len       = len;
+                scsi_cdrom_buf_alloc(dev, 2352);
+
+                scsi_cdrom_one_sector_seek(dev);
+
+                /* Any of these commands stop the audio playing. */
+                cdrom_stop(dev->drv);
+
+                dev->vendor_type      = 0x00;
+
+                dev->buffer_pos       = 0x00000000;
+
+                ret = scsi_cdrom_read_blocks(dev);
+
+                if (ret > 0) {
+                    len = MIN(4, len);
+
+                    scsi_cdrom_set_buf_len(dev, BufLen, &len);
+
+                    scsi_cdrom_data_command_finish(dev, len, len,
+                                                   len, 0);
+
+                    ui_sb_update_icon(SB_CDROM | dev->id, 0);
+                } else {
+                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+                    dev->packet_status = (ret < 0) ? PHASE_ERROR : PHASE_COMPLETE;
+                    dev->callback      = 20.0 * CDROM_TIME;
+                    scsi_cdrom_set_callback(dev);
+                }
+            } else {
+                scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+                /* scsi_cdrom_log(dev->log, "All done - callback set\n"); */
+                dev->packet_status = PHASE_COMPLETE;
+                dev->callback      = 20.0 * CDROM_TIME;
+                scsi_cdrom_set_callback(dev);
+            }
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_PLAYBACK_STATUS_SONY:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
+
+            max_len = cdb[7];
+            max_len <<= 8;
+            max_len |= cdb[8];
+            msf = dev->drv->sony_msf;
+
+            scsi_cdrom_buf_alloc(dev, 18);
+
+            len = 18;
+
+            memset(dev->buffer, 0, 18);
+            dev->buffer[0] = 0x00;                                    /* Reserved */
+            dev->buffer[1] = 0x00;                                    /* Reserved */
+            dev->buffer[2] = 0x00;                                    /* Audio Status data length */
+            dev->buffer[3] = 0x00;                                    /* Audio Status data length */
+            dev->buffer[4] = cdrom_get_audio_status_sony(dev->drv,    /* Audio status */
+                                                         &dev->buffer[6], msf);
+            dev->buffer[5] = 0x00;
+
+            scsi_cdrom_log(dev->log, "Audio Status = %02x\n", dev->buffer[4]);
+
+            len = MIN(len, max_len);
+            scsi_cdrom_set_buf_len(dev, BufLen, &len);
+
+            scsi_cdrom_data_command_finish(dev, len, len, len, 0);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_PAUSE_SONY:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            cdrom_audio_pause_resume(dev->drv, !(cdb[1] & 0x10));
+            scsi_cdrom_command_complete(dev);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_PLAY_TRACK_SONY:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+
+            msf = 3;
+            if ((cdb[5] != 1) || (cdb[8] != 1))
+                scsi_cdrom_illegal_mode(dev);
+            else {
+                const int     pos = cdb[4];
+
+                if ((dev->drv->image_path[0] == 0x00) ||
+                    (dev->drv->cd_status <= CD_STATUS_DVD))
+                    scsi_cdrom_illegal_mode(dev);
+                else {
+                    /* In this case, len is unused so just pass a fixed value of 1 intead. */
+                    const int ret         = cdrom_audio_play(dev->drv, pos, 1, msf);
+                    dev->requested_blocks = 0;
+
+                    dev->drv->seek_diff   = ABS(dev->sector_pos - dev->drv->seek_pos);
+                    dev->sector_pos       = dev->drv->seek_pos;
+
+                    if (ret)
+                        scsi_cdrom_command_complete(dev);
+                    else
+                        scsi_cdrom_illegal_mode(dev);
+                }
+            }
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_PLAY_MSF_SONY:
+            dev->current_cdb[0] = GPCMD_PLAY_AUDIO_MSF;
+            /*
+               Keep cmd_stat at 0x00, therefore, it's going to process it
+               as GPCMD_PLAY_AUDIO_MSF.
+             */
+            break;
+
+        case GPCMD_PLAY_AUDIO_SONY:
+            dev->current_cdb[0] = GPCMD_PLAY_AUDIO_10;
+            /*
+               Keep cmd_stat at 0x00, therefore, it's going to process it
+               as GPCMD_PLAY_AUDIO_10.
+             */
+            break;
+
+        case GPCMD_PLAYBACK_CONTROL_SONY:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_OUT);
+
+            len = (cdb[7] << 8) | cdb[8];
+            if (len == 0) {
+                scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+                scsi_cdrom_log(dev->log, "PlayBack Control Sony All done - "
+                               "callback set\n");
+                dev->packet_status = PHASE_COMPLETE;
+                dev->callback      = 20.0 * CDROM_TIME;
+                scsi_cdrom_set_callback(dev);
+            } else {
+                scsi_cdrom_buf_alloc(dev, 65536);
+
+                scsi_cdrom_set_buf_len(dev, BufLen, &len);
+                scsi_cdrom_data_command_finish(dev, len, len, len, 1);
+            }
+            cmd_stat = 0x01;
+            break;
+    }
+
+    return cmd_stat;
+}
+
+static uint8_t
+scsi_cdrom_command_matsushita(void *sc, const uint8_t *cdb, UNUSED(int32_t *BufLen))
+{
+    scsi_cdrom_t  *dev      = (scsi_cdrom_t *) sc;
+    const uint8_t  cmd_stat = 0x00;
+
+    switch (cdb[0]) {
+        default:
+            break;
+
+        case GPCMD_READ_SUBCHANNEL_MATSUSHITA:
+            dev->current_cdb[0] = GPCMD_READ_SUBCHANNEL;
+            /*
+               Keep cmd_stat at 0x00, therefore, it's going to process it
+               as GPCMD_READ_SUBCHANNEL.
+             */
+            break;
+
+        case GPCMD_READ_TOC_MATSUSHITA:
+            dev->current_cdb[0] = GPCMD_READ_TOC_PMA_ATIP;
+            /*
+               Keep cmd_stat at 0x00, therefore, it's going to process it
+               as GPCMD_READ_TOC_PMA_ATIP.
+             */
+            break;
+
+        case GPCMD_READ_HEADER_MATSUSHITA:
+            dev->current_cdb[0] = GPCMD_READ_HEADER;
+            /*
+               Keep cmd_stat at 0x00, therefore, it's going to process it
+               as GPCMD_READ_HEADER.
+             */
+            break;
+
+        case GPCMD_PLAY_AUDIO_MATSUSHITA:
+            dev->current_cdb[0] = GPCMD_PLAY_AUDIO_10;
+            /*
+               Keep cmd_stat at 0x00, therefore, it's going to process it
+               as GPCMD_PLAY_AUDIO_10.
+             */
+            break;
+
+        case GPCMD_PLAY_AUDIO_MSF_MATSUSHITA:
+            dev->current_cdb[0] = GPCMD_PLAY_AUDIO_MSF;
+            /*
+               Keep cmd_stat at 0x00, therefore, it's going to process it
+               as GPCMD_PLAY_AUDIO_MSF.
+             */
+            break;
+
+        case GPCMD_PLAY_AUDIO_TRACK_INDEX_MATSUSHITA:
+            dev->current_cdb[0] = GPCMD_PLAY_AUDIO_TRACK_INDEX;
+            /*
+               Keep cmd_stat at 0x00, therefore, it's going to process it
+               as GPCMD_PLAY_AUDIO_TRACK_INDEX.
+             */
+            break;
+
+        case GPCMD_PLAY_AUDIO_TRACK_RELATIVE_10_MATSUSHITA:
+            dev->current_cdb[0] = GPCMD_PLAY_AUDIO_TRACK_RELATIVE_10;
+            /*
+               Keep cmd_stat at 0x00, therefore, it's going to process it
+               as GPCMD_PLAY_AUDIO_TRACK_RELATIVE_10.
+             */
+            break;
+
+        case GPCMD_PAUSE_RESUME_MATSUSHITA:
+            dev->current_cdb[0] = GPCMD_PAUSE_RESUME;
+            /*
+               Keep cmd_stat at 0x00, therefore, it's going to process it
+               as GPCMD_PAUSE_RESUME.
+             */
+            break;
+
+        case GPCMD_PLAY_AUDIO_12_MATSUSHITA:
+            dev->current_cdb[0] = GPCMD_PLAY_AUDIO_12;
+            /*
+               Keep cmd_stat at 0x00, therefore, it's going to process it
+               as GPCMD_PLAY_AUDIO_12.
+             */
+            break;
+
+        case GPCMD_PLAY_AUDIO_TRACK_RELATIVE_12_MATSUSHITA:
+            dev->current_cdb[0] = GPCMD_PLAY_AUDIO_TRACK_RELATIVE_12;
+            /*
+               Keep cmd_stat at 0x00, therefore, it's going to process it
+               as GPCMD_PLAY_AUDIO_TRACK_RELATIVE_12.
+             */
+            break;
+    }
+
+    return cmd_stat;
+}
+
+static uint8_t
+scsi_cdrom_command_nec(void *sc, const uint8_t *cdb, int32_t *BufLen)
+{
+    scsi_cdrom_t *dev                    = (scsi_cdrom_t *) sc;
+    uint8_t       cmd_stat               = 0x00;
+    int           pos;
+    int           ret;
+    int           len;
+    int           alloc_length;
+
+    switch (cdb[0]) {
+        default:
+            break;
+
+        case GPCMD_NO_OPERATION_NEC:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            scsi_cdrom_command_complete(dev);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_UNKNOWN_SCSI2_NEC:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            scsi_cdrom_command_complete(dev);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_AUDIO_TRACK_SEARCH_NEC:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            dev->was_cached = 0;
+
+            if ((dev->drv->image_path[0] == 0x00) || (dev->drv->cd_status <= CD_STATUS_DVD))
+                scsi_cdrom_illegal_mode(dev);
+            else {
+                pos                 = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
+                ret                 = cdrom_audio_track_search(dev->drv, pos, cdb[9] & 0xc0, cdb[1] & 1);
+
+                dev->drv->seek_diff = ABS(dev->sector_pos - dev->drv->seek_pos);
+                dev->sector_pos     = dev->drv->seek_pos;
+
+                if (ret)
+                    scsi_cdrom_command_complete(dev);
+                else
+                    scsi_cdrom_illegal_mode(dev);
+            }
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_PLAY_AUDIO_NEC:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            if ((dev->drv->image_path[0] == 0x00) || (dev->drv->cd_status <= CD_STATUS_DVD))
+                ret = 0;
+            else {
+                pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
+                ret = cdrom_audio_play_toshiba(dev->drv, pos, cdb[9] & 0xc0);
+            }
+
+            if (ret)
+                scsi_cdrom_command_complete(dev);
+             else
+                scsi_cdrom_illegal_mode(dev);
+
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_STILL_NEC:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            cdrom_audio_pause_resume(dev->drv, 0x00);
+            scsi_cdrom_command_complete(dev);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_SET_STOP_TIME_NEC:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            scsi_cdrom_command_complete(dev);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_CADDY_EJECT_NEC:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            scsi_cdrom_stop(sc);
+            cdrom_eject(dev->id);
+            dev->toc_cached = 0;
+            scsi_cdrom_command_complete(dev);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_READ_SUBCODEQ_PLAYING_STATUS_NEC:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
+            dev->was_cached = (dev->drv->cached_sector == -1);
+
+            alloc_length = cdb[1] & 0x1f;
+            len          = 10;
+
+            if (dev->drv->ops == NULL)
+                scsi_cdrom_not_ready(dev);
+            else if (alloc_length <= 0) {
+                scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+                scsi_cdrom_log(dev->log, "Subcode Q All done - callback set\n");
+                dev->packet_status = PHASE_COMPLETE;
+                dev->callback      = 20.0 * CDROM_TIME;
+                scsi_cdrom_set_callback(dev);
+            } else {
+                scsi_cdrom_buf_alloc(dev, len);
+                len = MIN(len, alloc_length);
+
+                memset(dev->buffer, 0, len);
+                dev->buffer[0] = cdrom_get_current_subcodeq_playstatus(dev->drv, &dev->buffer[1]);
+                scsi_cdrom_log(dev->log, "Audio Status = %02x\n", dev->buffer[0]);
+
+                scsi_cdrom_set_buf_len(dev, BufLen, &alloc_length);
+                scsi_cdrom_data_command_finish(dev, len, len, len, 0);
+            }
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_READ_DISC_INFORMATION_NEC:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
+            dev->was_cached = dev->toc_cached;
+
+            /*
+               NEC manual claims 4 bytes but the Linux kernel
+               (namely sr_vendor.c) actually states otherwise.
+             */
+            scsi_cdrom_buf_alloc(dev, 22);
+
+            ret = cdrom_read_disc_info_toc(dev->drv, dev->buffer, cdb[2], cdb[1] & 3);
+            len = 22;
+            if (ret) {
+                scsi_cdrom_cache_toc(dev);
+
+                scsi_cdrom_set_buf_len(dev, BufLen, &len);
+                scsi_cdrom_data_command_finish(dev, len, len, len, 0);
+            } else
+                scsi_cdrom_invalid_field(dev, dev->drv->inv_field);
+
+            cmd_stat = 0x01;
+            break;
+    }
+
+    return cmd_stat;
+}
+
+static uint8_t
+scsi_cdrom_command_pioneer(void *sc, const uint8_t *cdb, int32_t *BufLen)
+{
+    scsi_cdrom_t *dev                    = (scsi_cdrom_t *) sc;
+    uint8_t       cmd_stat               = 0x00;
+    int           pos;
+    int           ret;
+    int           len;
+    int           max_len;
+    int           alloc_length;
+
+    switch (cdb[0]) {
+        default:
+            break;
+
+        case GPCMD_MAGAZINE_EJECT_PIONEER:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            scsi_cdrom_stop(sc);
+            cdrom_eject(dev->id);
+            dev->toc_cached = 0;
+            scsi_cdrom_command_complete(dev);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_READ_TOC_PIONEER:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
+            dev->was_cached = dev->toc_cached;
+
+            scsi_cdrom_buf_alloc(dev, 4);
+
+            if (dev->drv->ops == NULL)
+                scsi_cdrom_not_ready(dev);
+            else {
+                ret = cdrom_read_disc_info_toc(dev->drv, dev->buffer, cdb[2], cdb[1] & 3);
+                len = 4;
+
+                if (ret) {
+                    scsi_cdrom_cache_toc(dev);
+
+                    scsi_cdrom_set_buf_len(dev, BufLen, &len);
+                    scsi_cdrom_data_command_finish(dev, len, len, len, 0);
+                } else
+                    scsi_cdrom_invalid_field(dev, dev->drv->inv_field);
+            }
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_READ_SUBCODEQ_PIONEER:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
+            dev->was_cached = (dev->drv->cached_sector != -1);
+
+            alloc_length = cdb[1] & 0x1f;
+            len          = 9;
+
+            if (dev->drv->ops == NULL)
+                scsi_cdrom_not_ready(dev);
+            else if (!alloc_length) {
+                scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+                scsi_cdrom_log(dev->log, "Subcode Q All done - callback set\n");
+                dev->packet_status = PHASE_COMPLETE;
+                dev->callback      = 20.0 * CDROM_TIME;
+                scsi_cdrom_set_callback(dev);
+            } else {
+                scsi_cdrom_buf_alloc(dev, len);
+                len = MIN(len, alloc_length);
+
+                memset(dev->buffer, 0, len);
+                cdrom_get_current_subcodeq(dev->drv, &dev->buffer[1]);
+                scsi_cdrom_one_sector_seek(dev);
+                scsi_cdrom_log(dev->log, "Audio Status = %02x\n", dev->buffer[0]);
+
+                scsi_cdrom_set_buf_len(dev, BufLen, &alloc_length);
+                scsi_cdrom_data_command_finish(dev, len, len, len, 0);
+            }
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_AUDIO_TRACK_SEARCH_PIONEER:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            dev->was_cached = 0;
+
+            if ((dev->drv->image_path[0] == 0x00) || (dev->drv->cd_status <= CD_STATUS_DVD))
+                ret = 0;
+            else {
+                pos                = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
+                ret                = cdrom_audio_track_search_pioneer(dev->drv, pos, cdb[1] & 1);
+            }
+
+            dev->drv->seek_diff = ABS(dev->sector_pos - dev->drv->seek_pos);
+            dev->sector_pos     = dev->drv->seek_pos;
+
+            if (ret)
+                scsi_cdrom_command_complete(dev);
+            else
+                scsi_cdrom_illegal_mode(dev);
+
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_PLAY_AUDIO_PIONEER:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            if ((dev->drv->image_path[0] == 0x00) || (dev->drv->cd_status <= CD_STATUS_DVD))
+                ret = 0;
+            else {
+                pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
+                ret = cdrom_audio_play_pioneer(dev->drv, pos);
+            }
+
+            if (ret)
+                scsi_cdrom_command_complete(dev);
+            else
+                scsi_cdrom_illegal_mode(dev);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_PAUSE_PIONEER:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            cdrom_audio_pause_resume(dev->drv, !(cdb[1] & 0x10));
+            scsi_cdrom_command_complete(dev);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_STOP_PIONEER:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            scsi_cdrom_stop(sc);
+            scsi_cdrom_command_complete(dev);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_PLAYBACK_STATUS_PIONEER:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
+
+            max_len = cdb[7];
+            max_len <<= 8;
+            max_len |= cdb[8];
+
+            scsi_cdrom_buf_alloc(dev, 6);
+
+            len = 6;
+
+            memset(dev->buffer, 0, 6);
+            dev->buffer[0] = cdrom_get_audio_status_pioneer(dev->drv, &dev->buffer[1]); /*Audio status*/
+
+            scsi_cdrom_log(dev->log, "Audio Status = %02x\n", dev->buffer[4]);
+
+            len = MIN(len, max_len);
+            scsi_cdrom_set_buf_len(dev, BufLen, &len);
+
+            scsi_cdrom_data_command_finish(dev, len, len, len, 0);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_DRIVE_STATUS_PIONEER:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
+
+            len = (cdb[9] | (cdb[8] << 8));
+            scsi_cdrom_buf_alloc(dev, 65536);
+
+            if (!(scsi_cdrom_drive_status_page_flags & (1LL << (uint64_t) (cdb[2] & 0x3f))))
+                scsi_cdrom_invalid_field(dev, cdb[2]);
+            else if (len <= 0) {
+                scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+                scsi_cdrom_log(dev->log, "Drive Status All done - callback set\n");
+                dev->packet_status = PHASE_COMPLETE;
+                dev->callback      = 20.0 * CDROM_TIME;
+                scsi_cdrom_set_callback(dev);
+            } else {
+                memset(dev->buffer, 0, len);
+                alloc_length = len;
+
+                len = scsi_cdrom_drive_status(dev, dev->buffer, cdb[2]);
+                len = MIN(len, alloc_length);
+
+                scsi_cdrom_set_buf_len(dev, BufLen, &len);
+
+                scsi_cdrom_log(dev->log, "Reading drive status page: %02X...\n",
+                               cdb[2]);
+
+                scsi_cdrom_data_command_finish(dev, len, len, alloc_length, 0);
+            }
+            cmd_stat = 0x01;
+            break;
+    }
+
+    return cmd_stat;
+}
+
+static uint8_t
+scsi_cdrom_command_toshiba(void *sc, const uint8_t *cdb, int32_t *BufLen)
+{
+    scsi_cdrom_t *dev                    = (scsi_cdrom_t *) sc;
+    uint8_t       cmd_stat               = 0x00;
+    int           pos;
+    int           ret;
+    int           len;
+    int           alloc_length;
+
+    switch (cdb[0]) {
+        default:
+            break;
+
+        case GPCMD_NO_OPERATION_TOSHIBA:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            scsi_cdrom_command_complete(dev);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_AUDIO_TRACK_SEARCH_TOSHIBA:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            dev->was_cached = 0;
+
+            if ((dev->drv->image_path[0] == 0x00) || (dev->drv->cd_status <= CD_STATUS_DVD)) {
+                scsi_cdrom_illegal_mode(dev);
+                break;
+            }
+            pos                 = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
+            ret                 = cdrom_audio_track_search(dev->drv, pos, cdb[9] & 0xc0, cdb[1] & 1);
+
+            dev->drv->seek_diff = ABS(dev->sector_pos - dev->drv->seek_pos);
+            dev->sector_pos     = dev->drv->seek_pos;
+
+            if (ret)
+                scsi_cdrom_command_complete(dev);
+            else
+                scsi_cdrom_illegal_mode(dev);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_PLAY_AUDIO_TOSHIBA:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+
+            if ((dev->drv->image_path[0] == 0x00) || (dev->drv->cd_status <= CD_STATUS_DVD))
+                scsi_cdrom_illegal_mode(dev);
+            else {
+                pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
+                ret = cdrom_audio_play_toshiba(dev->drv, pos, cdb[9] & 0xc0);
+
+                if (ret)
+                    scsi_cdrom_command_complete(dev);
+                else
+                    scsi_cdrom_illegal_mode(dev);
+            }
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_STILL_TOSHIBA:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            cdrom_audio_pause_resume(dev->drv, 0x00);
+            scsi_cdrom_command_complete(dev);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_SET_STOP_TIME_TOSHIBA:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            scsi_cdrom_command_complete(dev);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_CADDY_EJECT_TOSHIBA:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            scsi_cdrom_stop(sc);
+            cdrom_eject(dev->id);
+            dev->toc_cached = 0;
+            scsi_cdrom_command_complete(dev);
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_READ_SUBCODEQ_PLAYING_STATUS_TOSHIBA:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
+            dev->was_cached = (dev->drv->cached_sector != -1);
+
+            alloc_length = cdb[1] & 0x1f;
+            len          = 10;
+
+            if (dev->drv->ops == NULL)
+                scsi_cdrom_not_ready(dev);
+            else if (alloc_length <= 0) {
+                scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+                scsi_cdrom_log(dev->log, "Subcode Q All done - callback set\n");
+                dev->packet_status = PHASE_COMPLETE;
+                dev->callback      = 20.0 * CDROM_TIME;
+                scsi_cdrom_set_callback(dev);
+            } else {
+                scsi_cdrom_buf_alloc(dev, len);
+                len = MIN(len, alloc_length);
+
+                memset(dev->buffer, 0, len);
+                dev->buffer[0] = cdrom_get_current_subcodeq_playstatus(dev->drv, &dev->buffer[1]);
+                scsi_cdrom_one_sector_seek(dev);
+                scsi_cdrom_log(dev->log, "Audio Status = %02x\n", dev->buffer[0]);
+
+                scsi_cdrom_set_buf_len(dev, BufLen, &alloc_length);
+                scsi_cdrom_data_command_finish(dev, len, len, len, 0);
+            }
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_READ_DISC_INFORMATION_TOSHIBA:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
+            dev->was_cached = dev->toc_cached;
+
+            scsi_cdrom_buf_alloc(dev, 4);
+
+            if (dev->drv->ops == NULL)
+                scsi_cdrom_not_ready(dev);
+            else {
+                ret = cdrom_read_disc_info_toc(dev->drv, dev->buffer, cdb[2], cdb[1] & 3);
+                len = 4;
+                if (ret) {
+                    scsi_cdrom_cache_toc(dev);
+
+                    scsi_cdrom_set_buf_len(dev, BufLen, &len);
+                    scsi_cdrom_data_command_finish(dev, len, len, len, 0);
+                } else
+                    scsi_cdrom_invalid_field(dev, dev->drv->inv_field);
+            }
+            cmd_stat = 0x01;
+            break;
+
+        case GPCMD_READ_CDROM_MODE_TOSHIBA:
+            scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
+            dev->was_cached = (dev->drv->cached_sector != -1);
+
+            scsi_cdrom_buf_alloc(dev, 1);
+
+            alloc_length    = 1;
+
+            len             = alloc_length;
+            dev->buffer[0]  = cdrom_get_current_mode(dev->drv);
+
+            scsi_cdrom_one_sector_seek(dev);
+
+            scsi_cdrom_set_buf_len(dev, BufLen, &len);
+            scsi_cdrom_data_command_finish(dev, len, len, len, 0);
+
+            cmd_stat = 0x01;
+            break;
+    }
+
+    return cmd_stat;
 }
 
 void
-scsi_cdrom_command(scsi_common_t *sc, uint8_t *cdb)
+scsi_cdrom_command(scsi_common_t *sc, const uint8_t *cdb)
 {
-    scsi_cdrom_t *dev = (scsi_cdrom_t *) sc;
+    scsi_cdrom_t *dev                    = (scsi_cdrom_t *) sc;
+    int           pos                    = dev->drv->seek_pos;
+    int           idx                    = 0;
+    int           ret                    = 1;
+    int32_t       blen                   = 0;
+    uint32_t      profiles[2]            = { MMC_PROFILE_CD_ROM, MMC_PROFILE_DVD_ROM };
+    uint8_t       scsi_bus               = (dev->drv->scsi_device_id >> 4) & 0x0f;
+    uint8_t       scsi_id                = dev->drv->scsi_device_id & 0x0f;
+    char          model[2048]            = { 0 };
+    int           msf;
+    int           block_desc;
     int           len;
     int           max_len;
     int           used_len;
     int           alloc_length;
-    int           msf;
-    int           pos = dev->drv->seek_pos;
     int           size_idx;
-    int           idx = 0;
     uint32_t      feature;
     unsigned      preamble_len;
     int           toc_format;
-    int           block_desc = 0;
-    int           ret;
-    int           format                 = 0;
-    int           real_pos;
-    int           track                  = 0;
-    char          device_identify[9]     = { '8', '6', 'B', '_', 'C', 'D', '0', '0', 0 };
-    char          device_identify_ex[15] = { '8', '6', 'B', '_', 'C', 'D', '0', '0', ' ', 'v', '1', '.', '0', '0', 0 };
-    int32_t       blen                   = 0;
     int32_t      *BufLen;
-    uint8_t      *b;
-    uint32_t      profiles[2] = { MMC_PROFILE_CD_ROM, MMC_PROFILE_DVD_ROM };
-    uint8_t       scsi_bus    = (dev->drv->scsi_device_id >> 4) & 0x0f;
-    uint8_t       scsi_id     = dev->drv->scsi_device_id & 0x0f;
+
+    dev->was_cached  = -1;
+    dev->sectors_num = 1;
 
     if (dev->drv->bus_type == CDROM_BUS_SCSI) {
         BufLen = &scsi_devices[scsi_bus][scsi_id].buffer_length;
@@ -1787,54 +2446,59 @@ scsi_cdrom_command(scsi_common_t *sc, uint8_t *cdb)
     dev->packet_len  = 0;
     dev->request_pos = 0;
 
-    device_identify[7] = dev->id + 0x30;
-
-    device_identify_ex[7]  = dev->id + 0x30;
-    device_identify_ex[10] = EMU_VERSION_EX[0];
-    device_identify_ex[12] = EMU_VERSION_EX[2];
-    device_identify_ex[13] = EMU_VERSION_EX[3];
+    dev->block_len   = 0;
 
     memcpy(dev->current_cdb, cdb, 12);
-    dev->sony_vendor = 0;
 
-    if (cdb[0] != 0) {
-        scsi_cdrom_log("CD-ROM %i: Command 0x%02X, Sense Key %02X, Asc %02X, Ascq %02X, Unit attention: %i\n",
-                       dev->id, cdb[0], scsi_cdrom_sense_key, scsi_cdrom_asc, scsi_cdrom_ascq,
-                       dev->unit_attention);
-        scsi_cdrom_log("CD-ROM %i: Request length: %04X\n", dev->id, dev->tf->request_length);
+#if ENABLE_SCSI_CDROM_LOG == 2
+        scsi_cdrom_log(dev->log, "Command 0x%02X, Sense Key %02X, Asc %02X, Ascq %02X, "
+                       "Unit attention: %i\n", cdb[0], scsi_cdrom_sense_key, scsi_cdrom_asc,
+                       scsi_cdrom_ascq, dev->unit_attention);
+        scsi_cdrom_log(dev->log, "Request length: %04X\n", dev->tf->request_length);
 
-        scsi_cdrom_log("CD-ROM %i: CDB: %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n",
-                       dev->id, cdb[0], cdb[1], cdb[2], cdb[3], cdb[4], cdb[5], cdb[6], cdb[7],
+        scsi_cdrom_log(dev->log, "CDB: %02X %02X %02X %02X %02X %02X %02X "
+                       "%02X %02X %02X %02X %02X\n",
+                       cdb[0], cdb[1], cdb[2], cdb[3], cdb[4], cdb[5], cdb[6], cdb[7],
                        cdb[8], cdb[9], cdb[10], cdb[11]);
-    }
+#endif
 
-    msf             = cdb[1] & 2;
-    dev->sector_len = 0;
+    msf                   = cdb[1] & 2;
+    dev->sector_len       = 0;
+    dev->requested_blocks = 0;
 
     scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
 
-    /* This handles the Not Ready/Unit Attention check if it has to be handled at this point. */
+    /*
+       This handles the Not Ready/Unit Attention check if it has to be
+       handled at this point.
+     */
     if (scsi_cdrom_pre_execution_check(dev, cdb) == 0)
         return;
 
-begin:
-    switch (cdb[0]) {
+    if (cdb[0] != GPCMD_REQUEST_SENSE) {
+        /* Clear the sense stuff as per the spec. */
+        scsi_cdrom_sense_clear(dev, cdb[0]);
+    }
+
+    if ((dev->ven_cmd == NULL) ||
+        (dev->ven_cmd(sc, cdb, BufLen) == 0x00))  switch (dev->current_cdb[0]) {
         case GPCMD_TEST_UNIT_READY:
             scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
             scsi_cdrom_command_complete(dev);
             break;
 
         case GPCMD_REZERO_UNIT:
+            dev->was_cached                   = 0;
             scsi_cdrom_stop(sc);
-            dev->sector_pos = dev->sector_len = 0;
+            dev->requested_blocks             = 0;
             dev->drv->seek_diff               = dev->drv->seek_pos;
             cdrom_seek(dev->drv, 0, 0);
+            dev->sector_pos                   = dev->drv->seek_pos;
+            dev->drv->cached_sector           = -1;
             scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
             break;
 
         case GPCMD_REQUEST_SENSE:
-            /* If there's a unit attention condition and there's a buffered not ready, a standalone REQUEST SENSE
-               should forget about the not ready, and report unit attention straight away. */
             scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
             max_len = cdb[4];
 
@@ -1852,42 +2516,26 @@ begin:
             scsi_cdrom_data_command_finish(dev, 18, 18, cdb[4], 0);
             break;
 
-        case 0xDA: /*GPCMD_SPEED_ALT*/
-            switch (dev->drv->type) {
-                case CDROM_TYPE_NEC_25_10a:
-                case CDROM_TYPE_NEC_38_103:
-                case CDROM_TYPE_NEC_75_103:
-                case CDROM_TYPE_NEC_77_106:
-                case CDROM_TYPE_NEC_211_100:
-                case CDROM_TYPE_NEC_464_105: /*GPCMD_STILL_NEC*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    cdrom_audio_pause_resume(dev->drv, 0x00);
-                    dev->drv->audio_op = 0x01;
-                    scsi_cdrom_command_complete(dev);
-                    break;
-            }
-            fallthrough;
         case GPCMD_SET_SPEED:
-            dev->drv->cur_speed = (cdb[3] | (cdb[2] << 8)) / 176;
-            if (dev->drv->cur_speed < 1)
-                dev->drv->cur_speed = 1;
-            else if (dev->drv->cur_speed > dev->drv->speed)
-                dev->drv->cur_speed = dev->drv->speed;
-            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-            scsi_cdrom_command_complete(dev);
+            scsi_cdrom_set_speed(dev, cdb);
             break;
 
-        case 0xCD:
+        case GPCMD_SCAN_PIONEER:
         case GPCMD_AUDIO_SCAN:
             scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            dev->was_cached = 0;
 
-            if ((dev->drv->host_drive < 1) || (dev->drv->cd_status <= CD_STATUS_DATA_ONLY)) {
+            if ((dev->drv->image_path[0] == 0x00) ||
+                (dev->drv->cd_status <= CD_STATUS_DVD)) {
                 scsi_cdrom_illegal_mode(dev);
                 break;
             }
 
             pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
-            ret = cdrom_audio_scan(dev->drv, pos, 0);
+            ret = cdrom_audio_scan(dev->drv, pos);
+
+            dev->drv->seek_diff   = ABS(dev->sector_pos - dev->drv->seek_pos);
+            dev->sector_pos       = dev->drv->seek_pos;
 
             if (ret)
                 scsi_cdrom_command_complete(dev);
@@ -1911,6 +2559,7 @@ begin:
 
         case GPCMD_READ_TOC_PMA_ATIP:
             scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
+            dev->was_cached = dev->toc_cached;
 
             max_len = cdb[7];
             max_len <<= 8;
@@ -1923,296 +2572,274 @@ begin:
             if (toc_format == 0)
                 toc_format = (cdb[9] >> 6) & 3;
 
-            if (!dev->drv->ops) {
+            if (dev->drv->ops == NULL)
                 scsi_cdrom_not_ready(dev);
-                return;
-            }
-
-            if (toc_format < 3) {
+            else if (toc_format < 3) {
                 len = cdrom_read_toc(dev->drv, dev->buffer, toc_format, cdb[6], msf, max_len);
-                if (len == -1) {
-                    /* If the returned length is -1, this means cdrom_read_toc() has encountered an error. */
-                    scsi_cdrom_invalid_field(dev);
-                    scsi_cdrom_buf_free(dev);
-                    return;
+                /* If the returned length is -1, this means cdrom_read_toc() has encountered an error. */
+                if (len == -1)
+                    scsi_cdrom_invalid_field(dev, dev->drv->inv_field);
+                else {
+                    scsi_cdrom_cache_toc(dev);
+
+                    scsi_cdrom_set_buf_len(dev, BufLen, &len);
+                    scsi_cdrom_data_command_finish(dev, len, len, len, 0);
                 }
-            } else {
-                scsi_cdrom_invalid_field(dev);
-                scsi_cdrom_buf_free(dev);
-                return;
-            }
-            scsi_cdrom_set_buf_len(dev, BufLen, &len);
-
-            scsi_cdrom_data_command_finish(dev, len, len, len, 0);
-            return;
-
-        case 0xC7:
-            switch (dev->drv->type) {
-                case CDROM_TYPE_MATSHITA_501_10b: /*GPCMD_PLAY_AUDIO_MSF_MATSUSHITA*/
-                    cdb[0]              = GPCMD_PLAY_AUDIO_MSF;
-                    dev->current_cdb[0] = cdb[0];
-                    goto begin;
-                    break;
-                case CDROM_TYPE_DEC_RRD45_0436:
-                case CDROM_TYPE_SONY_CDU541_10i:
-                case CDROM_TYPE_SONY_CDU561_18k:
-                case CDROM_TYPE_SONY_CDU76S_100:
-                case CDROM_TYPE_TEXEL_DMXX24_100: /*GPCMD_PLAY_MSF_SONY*/
-                    cdb[0] = GPCMD_PLAY_AUDIO_MSF;
-                    dev->current_cdb[0] = cdb[0];
-                    dev->sony_vendor    = 1;
-                    goto begin;
-                    break;
-                case CDROM_TYPE_TOSHIBA_XM_3433:
-                case CDROM_TYPE_TOSHIBA_XM3201B_3232:
-                case CDROM_TYPE_TOSHIBA_XM3301TA_0272:
-                case CDROM_TYPE_TOSHIBA_XM5701TA_3136:
-                case CDROM_TYPE_TOSHIBA_SDM1401_1008: /*GPCMD_READ_DISC_INFORMATION_TOSHIBA*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
-                    scsi_cdrom_buf_alloc(dev, 4);
-
-                    if (!dev->drv->ops) {
-                        scsi_cdrom_not_ready(dev);
-                        return;
-                    }
-
-                    ret = cdrom_read_disc_info_toc(dev->drv, dev->buffer, cdb[2], cdb[1] & 3);
-                    len = 4;
-                    if (!ret) {
-                        scsi_cdrom_invalid_field(dev);
-                        scsi_cdrom_buf_free(dev);
-                        return;
-                    }
-
-                    scsi_cdrom_set_buf_len(dev, BufLen, &len);
-                    scsi_cdrom_data_command_finish(dev, len, len, len, 0);
-                    return;
-                default:
-                    scsi_cdrom_illegal_opcode(dev);
-                    break;
-            }
+            } else
+                scsi_cdrom_invalid_field(dev, toc_format);
             break;
 
-        case 0xDE:
-            switch (dev->drv->type) {
-                case CDROM_TYPE_NEC_25_10a:
-                case CDROM_TYPE_NEC_38_103:
-                case CDROM_TYPE_NEC_75_103:
-                case CDROM_TYPE_NEC_77_106:
-                case CDROM_TYPE_NEC_211_100:
-                case CDROM_TYPE_NEC_464_105: /*GPCMD_READ_DISC_INFORMATION_NEC*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
-                    scsi_cdrom_buf_alloc(dev, 22); /* NEC manual claims 4 bytes, but the Linux kernel (namely sr_vendor.c) actually states otherwise. */
-
-                    if (!dev->drv->ops) {
-                        scsi_cdrom_not_ready(dev);
-                        return;
-                    }
-
-                    ret = cdrom_read_disc_info_toc(dev->drv, dev->buffer, cdb[2], cdb[1] & 3);
-                    len = 22;
-                    if (!ret) {
-                        scsi_cdrom_invalid_field(dev);
-                        scsi_cdrom_buf_free(dev);
-                        return;
-                    }
-
-                    scsi_cdrom_set_buf_len(dev, BufLen, &len);
-                    scsi_cdrom_data_command_finish(dev, len, len, len, 0);
-                    return;
-                default:
-                    scsi_cdrom_illegal_opcode(dev);
-                    break;
+        case GPCMD_PLAY_CD:
+            /*
+               According to the ATAPI specification, this was actually READ CD
+               on early drives.
+             */
+            if (!dev->drv->is_early) {
+                scsi_cdrom_illegal_opcode(dev, dev->current_cdb[0]);
+                break;
             }
-            break;
-        case GPCMD_READ_CD_OLD:
-            /* IMPORTANT: Convert the command to new read CD
-                          for pass through purposes. */
-            dev->current_cdb[0] = GPCMD_READ_CD;
             fallthrough;
-
         case GPCMD_READ_6:
         case GPCMD_READ_10:
         case GPCMD_READ_12:
+        case GPCMD_READ_CD_OLD:
+        case GPCMD_READ_CD_MSF_OLD:
         case GPCMD_READ_CD:
         case GPCMD_READ_CD_MSF:
             scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
-            alloc_length = 2048;
+            dev->was_cached = 0;
 
-            switch (cdb[0]) {
+            alloc_length    = dev->drv->sector_size;
+
+            switch (dev->current_cdb[0]) {
                 case GPCMD_READ_6:
                     dev->sector_len = cdb[4];
+                    /*
+                       For READ (6) and WRITE (6), a length of 0 indicates a transfer of
+                       256 sectors.
+                     */
                     if (dev->sector_len == 0)
-                        dev->sector_len = 256; /* For READ (6) and WRITE (6), a length of 0 indicates a transfer of 256 sector. */
-                    dev->sector_pos = ((((uint32_t) cdb[1]) & 0x1f) << 16) | (((uint32_t) cdb[2]) << 8) | ((uint32_t) cdb[3]);
-                    msf             = 0;
+                        dev->sector_len = 256;
+                    dev->sector_pos = ((((uint32_t) cdb[1]) & 0x1f) << 16) |
+                                      (((uint32_t) cdb[2]) << 8) | ((uint32_t) cdb[3]);
+                    if (cdrom_is_track_audio(dev->drv, dev->sector_pos, msf,
+                                             dev->sector_type, 0x00)) {
+                        scsi_cdrom_illegal_mode(dev);
+                        ret = 0;
+                    }                        
+                    scsi_cdrom_log(dev->log, "READ (6):  Length: %i, LBA: %i\n",
+                                   dev->sector_len, dev->sector_pos);
                     break;
                 case GPCMD_READ_10:
                     dev->sector_len = (cdb[7] << 8) | cdb[8];
-                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
-                    scsi_cdrom_log("CD-ROM %i: Length: %i, LBA: %i\n", dev->id, dev->sector_len,
-                                   dev->sector_pos);
-                    msf = 0;
+                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) |
+                                      (cdb[4] << 8) | cdb[5];
+                    if (cdrom_is_track_audio(dev->drv, dev->sector_pos, msf,
+                                             dev->sector_type, dev->use_cdb_9 ?
+                                             (cdb[9] & 0xc0) : 0x00)) {
+                        scsi_cdrom_illegal_mode(dev);
+                        ret = 0;
+                    }                        
+                    scsi_cdrom_log(dev->log, "READ (10): Length: %i, LBA: %i\n",
+                                   dev->sector_len, dev->sector_pos);
                     break;
                 case GPCMD_READ_12:
-                    dev->sector_len = (((uint32_t) cdb[6]) << 24) | (((uint32_t) cdb[7]) << 16) | (((uint32_t) cdb[8]) << 8) | ((uint32_t) cdb[9]);
-                    dev->sector_pos = (((uint32_t) cdb[2]) << 24) | (((uint32_t) cdb[3]) << 16) | (((uint32_t) cdb[4]) << 8) | ((uint32_t) cdb[5]);
-                    scsi_cdrom_log("CD-ROM %i: Length: %i, LBA: %i\n", dev->id, dev->sector_len,
-                                   dev->sector_pos);
-                    msf = 0;
+                    dev->sector_len = (((uint32_t) cdb[6]) << 24) |
+                                      (((uint32_t) cdb[7]) << 16) |
+                                      (((uint32_t) cdb[8]) << 8) | ((uint32_t) cdb[9]);
+                    dev->sector_pos = (((uint32_t) cdb[2]) << 24) |
+                                      (((uint32_t) cdb[3]) << 16) |
+                                      (((uint32_t) cdb[4]) << 8) | ((uint32_t) cdb[5]);
+                    if (cdrom_is_track_audio(dev->drv, dev->sector_pos, msf,
+                                             dev->sector_type, dev->use_cdb_9 ?
+                                             (cdb[9] & 0xc0) : 0x00)) {
+                        scsi_cdrom_illegal_mode(dev);
+                        ret = 0;
+                    }                        
+                    scsi_cdrom_log(dev->log, "READ (12): Length: %i, LBA: %i\n",
+                                   dev->sector_len, dev->sector_pos);
                     break;
+                case GPCMD_READ_CD_MSF_OLD:
                 case GPCMD_READ_CD_MSF:
-                    alloc_length    = 2856;
-                    dev->sector_len = MSFtoLBA(cdb[6], cdb[7], cdb[8]);
-                    dev->sector_pos = MSFtoLBA(cdb[3], cdb[4], cdb[5]);
-
-                    dev->sector_len -= dev->sector_pos;
-                    dev->sector_len++;
-
                     msf = 1;
-
-                    if ((cdb[9] & 0xf8) == 0x08) {
-                        /* 0x08 is an illegal mode */
-                        scsi_cdrom_invalid_field(dev);
-                        return;
-                    }
-
-                    /* If all the flag bits are cleared, then treat it as a non-data command. */
-                    if ((cdb[9] == 0x00) && ((cdb[10] & 0x07) == 0x00))
-                        dev->sector_len = 0;
-                    else if ((cdb[9] == 0x00) && ((cdb[10] & 0x07) != 0x00)) {
-                        scsi_cdrom_invalid_field(dev);
-                        return;
-                    }
-                    break;
+                    fallthrough;
+                case GPCMD_PLAY_CD:
                 case GPCMD_READ_CD_OLD:
                 case GPCMD_READ_CD:
                     alloc_length    = 2856;
-                    dev->sector_len = (cdb[6] << 16) | (cdb[7] << 8) | cdb[8];
-                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
 
-                    msf = 0;
+                    if (msf) {
+                        dev->sector_len = MSFtoLBA(cdb[6], cdb[7], cdb[8]);
+                        dev->sector_pos = MSFtoLBA(cdb[3], cdb[4], cdb[5]);
 
-                    if ((cdb[9] & 0xf8) == 0x08) {
-                        /* 0x08 is an illegal mode */
-                        scsi_cdrom_invalid_field(dev);
-                        return;
+                        dev->sector_len -= dev->sector_pos;
+                        dev->sector_len++;
+                    } else {
+                        dev->sector_len = (cdb[6] << 16) | (cdb[7] << 8) | cdb[8];
+                        dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) |
+                                          (cdb[4] << 8) | cdb[5];
                     }
 
-                    /* If all the flag bits are cleared, then treat it as a non-data command. */
-                    if ((cdb[9] == 0x00) && ((cdb[10] & 0x07) == 0x00))
+                    if (((cdb[9] & 0xf8) == 0x08) || ((cdb[9] == 0x00) &&
+                        ((cdb[10] & 0x07) != 0x00))) {
+                        /* Illegal mode */
+                        scsi_cdrom_invalid_field(dev, cdb[9]);
+                        ret = 0;
+                    } else if ((cdb[9] == 0x00) && ((cdb[10] & 0x07) == 0x00))
+                        /*
+                           If all the flag bits are cleared, then treat it as a
+                           non-data command.
+                         */
                         dev->sector_len = 0;
-                    else if ((cdb[9] == 0x00) && ((cdb[10] & 0x07) != 0x00)) {
-                        scsi_cdrom_invalid_field(dev);
-                        return;
-                    }
                     break;
 
                 default:
                     break;
             }
 
-            if (!dev->sector_len) {
-                scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                /* scsi_cdrom_log("CD-ROM %i: All done - callback set\n", dev->id); */
-                dev->packet_status = PHASE_COMPLETE;
-                dev->callback      = 20.0 * CDROM_TIME;
-                scsi_cdrom_set_callback(dev);
-                break;
-            }
+            if (ret) {
+                if (dev->sector_len > 0) {
+                    max_len               = dev->sector_len;
+                    dev->requested_blocks = max_len;
 
-            max_len               = dev->sector_len;
-            dev->requested_blocks = max_len; /* If we're reading all blocks in one go for DMA, why not also for PIO, it should NOT
-                                                matter anyway, this step should be identical and only the way the read dat is
-                                                transferred to the host should be different. */
+                    dev->packet_len = max_len * alloc_length;
+                    scsi_cdrom_buf_alloc(dev, dev->packet_len);
 
-            dev->packet_len = max_len * alloc_length;
-            scsi_cdrom_buf_alloc(dev, dev->packet_len);
+                    dev->drv->seek_diff = ABS((int) (pos - dev->sector_pos));
+                    dev->drv->seek_pos  = dev->sector_pos;                   
 
-            dev->drv->seek_diff = ABS((int) (pos - dev->sector_pos));
+                    /* Any of these commands stop the audio playing. */
+                    cdrom_stop(dev->drv);
 
-            if ((cdb[0] == GPCMD_READ_10) || (cdb[0] == GPCMD_READ_12)) {
-                switch (dev->drv->type) {
-                    case CDROM_TYPE_NEC_25_10a:
-                    case CDROM_TYPE_NEC_38_103:
-                    case CDROM_TYPE_NEC_75_103:
-                    case CDROM_TYPE_NEC_77_106:
-                    case CDROM_TYPE_NEC_211_100:
-                    case CDROM_TYPE_NEC_464_105:
-                    case CDROM_TYPE_TOSHIBA_XM_3433:
-                    case CDROM_TYPE_TOSHIBA_XM3201B_3232:
-                    case CDROM_TYPE_TOSHIBA_XM3301TA_0272:
-                    case CDROM_TYPE_TOSHIBA_XM5701TA_3136:
-                    case CDROM_TYPE_TOSHIBA_SDM1401_1008:
-                        ret = scsi_cdrom_read_blocks(dev, &alloc_length, 1, cdb[9] & 0xc0);
-                        break;
-                    default:
-                        ret = scsi_cdrom_read_blocks(dev, &alloc_length, 1, 0);
-                        break;
+                    if (dev->use_cdb_9 &&
+                        ((dev->current_cdb[0] == GPCMD_READ_10) ||
+                         (dev->current_cdb[0] == GPCMD_READ_12)))
+                        dev->vendor_type  = cdb[9] & 0xc0;
+                    else
+                        dev->vendor_type  = 0x00;
+
+                    dev->block_len      = 0xffffffff;
+                    dev->buffer_pos     = 0x00000000;
+
+                    ret                 = scsi_cdrom_read_blocks(dev);
+                    alloc_length        = dev->requested_blocks * dev->block_len;
+
+                    if (ret > 0) {
+                        dev->packet_len       = alloc_length;
+
+                        scsi_cdrom_set_buf_len(dev, BufLen,
+                                               (int32_t *) &dev->packet_len);
+
+                        scsi_cdrom_data_command_finish(dev, alloc_length,
+                                                       dev->block_len,
+                                                       alloc_length, 0);
+
+                        if (dev->packet_status != PHASE_COMPLETE)
+                            ui_sb_update_icon(SB_CDROM | dev->id, 1);
+                        else
+                            ui_sb_update_icon(SB_CDROM | dev->id, 0);
+                    } else {
+                        scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+                        dev->packet_status = (ret < 0) ? PHASE_ERROR : PHASE_COMPLETE;
+                        dev->callback      = 20.0 * CDROM_TIME;
+                        scsi_cdrom_set_callback(dev);
+                    }
+                } else {
+                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+                    /* scsi_cdrom_log(dev->log, "All done - callback set\n"); */
+                    dev->packet_status = PHASE_COMPLETE;
+                    dev->callback      = 20.0 * CDROM_TIME;
+                    scsi_cdrom_set_callback(dev);
                 }
-            } else
-                ret = scsi_cdrom_read_blocks(dev, &alloc_length, 1, 0);
-
-            if (ret <= 0) {
-                scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                dev->packet_status = PHASE_COMPLETE;
-                dev->callback      = 20.0 * CDROM_TIME;
-                scsi_cdrom_set_callback(dev);
-                scsi_cdrom_buf_free(dev);
-                return;
             }
-
-            dev->requested_blocks = max_len;
-            dev->packet_len       = alloc_length;
-
-            scsi_cdrom_set_buf_len(dev, BufLen, (int32_t *) &dev->packet_len);
-
-            scsi_cdrom_data_command_finish(dev, alloc_length, alloc_length / dev->requested_blocks,
-                                           alloc_length, 0);
-
-            if (dev->packet_status != PHASE_COMPLETE)
-                ui_sb_update_icon(SB_CDROM | dev->id, 1);
-            else
-                ui_sb_update_icon(SB_CDROM | dev->id, 0);
-            return;
+            break;
 
         case GPCMD_READ_HEADER:
             scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
 
-            alloc_length = ((cdb[7] << 8) | cdb[8]);
-            scsi_cdrom_buf_alloc(dev, 8);
+            alloc_length          = 2352;
 
-            dev->sector_len = 1;
-            dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
-            if (msf)
-                real_pos = cdrom_lba_to_msf_accurate(dev->sector_pos);
-            else
-                real_pos = dev->sector_pos;
-            dev->buffer[0] = 1; /*2048 bytes user data*/
-            dev->buffer[1] = dev->buffer[2] = dev->buffer[3] = 0;
-            dev->buffer[4]                                   = (real_pos >> 24);
-            dev->buffer[5]                                   = ((real_pos >> 16) & 0xff);
-            dev->buffer[6]                                   = ((real_pos >> 8) & 0xff);
-            dev->buffer[7]                                   = real_pos & 0xff;
+            len                   = (cdb[7] << 8) | cdb[8];
+            dev->sector_len       = 1;
+            dev->sector_pos       = (cdb[2] << 24) | (cdb[3] << 16) |
+                                    (cdb[4] << 8) | cdb[5];
+            dev->was_cached       = (dev->drv->cached_sector == dev->sector_pos);
+            scsi_cdrom_log(dev->log, "READ HEADER: Length: %i, LBA: %i\n",
+                           dev->sector_len, dev->sector_pos);
 
-            len = 8;
-            len = MIN(len, alloc_length);
+            if (len > 0) {
+                max_len               = 1;
+                dev->requested_blocks = max_len;
 
-            scsi_cdrom_set_buf_len(dev, BufLen, &len);
+                dev->packet_len       = len;
+                scsi_cdrom_buf_alloc(dev, 2352);
 
-            scsi_cdrom_data_command_finish(dev, len, len, len, 0);
-            return;
+                scsi_cdrom_one_sector_seek(dev);
+
+                /* Any of these commands stop the audio playing. */
+                cdrom_stop(dev->drv);
+
+                dev->vendor_type      = 0x00;
+
+                dev->buffer_pos       = 0x00000000;
+                ret = scsi_cdrom_read_blocks(dev);
+
+                if (ret > 0) {
+                    uint8_t header[4] = { 0 };
+
+                    memcpy(header, dev->buffer, 4);
+
+                    dev->buffer[0] = header[3];
+
+                    if (cdb[1] & 0x02) {
+                        memset(&(dev->buffer[1]), 0x00, 4);
+                        dev->buffer[5] = header[0];
+                        dev->buffer[6] = header[1];
+                        dev->buffer[7] = header[2];
+                    } else {
+                        memset(&(dev->buffer[1]), 0x00, 3);
+                        uint32_t lba = ((header[0] * 60 * 75) +
+                                        (header[1] * 75) +
+                                        header[2]) - 150;
+                        dev->buffer[4] = (lba >> 24) & 0xff;
+                        dev->buffer[5] = (lba >> 16) & 0xff;
+                        dev->buffer[6] = (lba >>  8) & 0xff;
+                        dev->buffer[7] = lba         & 0xff;
+                    }
+
+                    len = MIN(8, len);
+
+                    scsi_cdrom_set_buf_len(dev, BufLen, &len);
+
+                    scsi_cdrom_data_command_finish(dev, len, len,
+                                                   len, 0);
+
+                    ui_sb_update_icon(SB_CDROM | dev->id, 0);
+                } else {
+                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+                    dev->packet_status = (ret < 0) ? PHASE_ERROR : PHASE_COMPLETE;
+                    dev->callback      = 20.0 * CDROM_TIME;
+                    scsi_cdrom_set_callback(dev);
+                }
+            } else {
+                scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+                /* scsi_cdrom_log(dev->log, "All done - callback set\n"); */
+                dev->packet_status = PHASE_COMPLETE;
+                dev->callback      = 20.0 * CDROM_TIME;
+                scsi_cdrom_set_callback(dev);
+            }
+            break;
 
         case GPCMD_MODE_SENSE_6:
         case GPCMD_MODE_SENSE_10:
             scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
 
-            if (dev->drv->bus_type == CDROM_BUS_SCSI)
-                block_desc = ((cdb[1] >> 3) & 1) ? 0 : 1;
-            else
+            if (dev->drv->bus_type == CDROM_BUS_ATAPI)
                 block_desc = 0;
+            else
+                block_desc = !((cdb[1] >> 3) & 1);
 
-            if (cdb[0] == GPCMD_MODE_SENSE_6) {
+            if (dev->current_cdb[0] == GPCMD_MODE_SENSE_6) {
                 len = cdb[4];
                 scsi_cdrom_buf_alloc(dev, 256);
             } else {
@@ -2220,75 +2847,63 @@ begin:
                 scsi_cdrom_buf_alloc(dev, 65536);
             }
 
-            switch (dev->drv->type) {
-                case CDROM_TYPE_DEC_RRD45_0436:
-                case CDROM_TYPE_SONY_CDU541_10i:
-                case CDROM_TYPE_SONY_CDU561_18k:
-                case CDROM_TYPE_SONY_CDU76S_100:
-                case CDROM_TYPE_TEXEL_DMXX24_100:
-                    if (!(scsi_cdrom_mode_sense_page_flags_sony & (1LL << (uint64_t) (cdb[2] & 0x3f)))) {
-                        scsi_cdrom_invalid_field(dev);
-                        scsi_cdrom_buf_free(dev);
-                        return;
-                    }
-                    break;
-                default:
-                    if (!(scsi_cdrom_mode_sense_page_flags & (1LL << (uint64_t) (cdb[2] & 0x3f)))) {
-                        scsi_cdrom_invalid_field(dev);
-                        scsi_cdrom_buf_free(dev);
-                        return;
-                    }
-                    break;
-            }
-            memset(dev->buffer, 0, len);
-            alloc_length = len;
+            if (!(dev->ms_page_flags & (1LL << (uint64_t) (cdb[2] & 0x3f))))
+                ret = 0;
 
-            /* This determines the media type ID to return - this is
-               a SCSI/ATAPI-specific thing, so it makes the most sense
-               to keep this here.
-               Also, the max_len variable is reused as this command
-               does otherwise not use it, to avoid having to declare
-               another variable. */
-            if (dev->drv->cd_status == CD_STATUS_EMPTY)
-                max_len = 70; /* No media inserted. */
-            else if (dev->drv->cdrom_capacity > CD_MAX_SECTORS)
-                max_len = 65; /* DVD. */
-            else if (dev->drv->cd_status == CD_STATUS_DATA_ONLY)
-                max_len = 1; /* Data CD. */
-            else
-                max_len = 3; /* Audio or mixed-mode CD. */
+            if (ret == 1) {
+                memset(dev->buffer, 0, len);
+                alloc_length = len;
 
-            if (cdb[0] == GPCMD_MODE_SENSE_6) {
-                len            = scsi_cdrom_mode_sense(dev, dev->buffer, 4, cdb[2], block_desc);
-                len            = MIN(len, alloc_length);
-                dev->buffer[0] = len - 1;
-                dev->buffer[1] = max_len;
-                if (block_desc)
-                    dev->buffer[3] = 8;
-            } else {
-                len            = scsi_cdrom_mode_sense(dev, dev->buffer, 8, cdb[2], block_desc);
-                len            = MIN(len, alloc_length);
-                dev->buffer[0] = (len - 2) >> 8;
-                dev->buffer[1] = (len - 2) & 255;
-                dev->buffer[2] = max_len;
-                if (block_desc) {
-                    dev->buffer[6] = 0;
-                    dev->buffer[7] = 8;
+                /*
+                   This determines the media type ID to return which is a SCSI/ATAPI-specific
+                   thing, so it makes the most sense to keep this here.
+
+                   Also, the max_len variable is reused as this command does otherwise not
+                   use it, to avoid having to declare another variable.
+                 */
+                if ((dev->drv->cd_status == CD_STATUS_EMPTY) || (dev->drv->cd_status == CD_STATUS_DVD_REJECTED))
+                    max_len = 70; /* No media inserted. */
+                else if (dev->drv->cd_status == CD_STATUS_DVD)
+                    max_len = 65; /* DVD. */
+                else if (dev->drv->cd_status == CD_STATUS_DATA_ONLY)
+                    max_len = 1; /* Data CD. */
+                else
+                    max_len = 3; /* Audio or mixed-mode CD. */
+
+                if (dev->current_cdb[0] == GPCMD_MODE_SENSE_6) {
+                    len            = scsi_cdrom_mode_sense(dev, dev->buffer, 4, cdb[2], block_desc);
+                    len            = MIN(len, alloc_length);
+                    dev->buffer[0] = len - 1;
+                    dev->buffer[1] = max_len;
+                    if (block_desc)
+                        dev->buffer[3] = 8;
+                } else {
+                    len            = scsi_cdrom_mode_sense(dev, dev->buffer, 8,
+                                                           cdb[2], block_desc);
+                    len            = MIN(len, alloc_length);
+                    dev->buffer[0] = (len - 2) >> 8;
+                    dev->buffer[1] = (len - 2) & 255;
+                    dev->buffer[2] = max_len;
+                    if (block_desc) {
+                        dev->buffer[6] = 0;
+                        dev->buffer[7] = 8;
+                    }
                 }
-            }
 
-            scsi_cdrom_set_buf_len(dev, BufLen, &len);
+                scsi_cdrom_set_buf_len(dev, BufLen, &alloc_length);
 
-            scsi_cdrom_log("CD-ROM %i: Reading mode page: %02X...\n", dev->id, cdb[2]);
+                scsi_cdrom_log(dev->log, "Reading mode page: %02X...\n", cdb[2]);
 
-            scsi_cdrom_data_command_finish(dev, len, len, alloc_length, 0);
-            return;
+                scsi_cdrom_data_command_finish(dev, len, len, alloc_length, 0);
+            } else
+                 scsi_cdrom_invalid_field(dev, cdb[2]);
+            break;
 
         case GPCMD_MODE_SELECT_6:
         case GPCMD_MODE_SELECT_10:
             scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_OUT);
 
-            if (cdb[0] == GPCMD_MODE_SELECT_6) {
+            if (dev->current_cdb[0] == GPCMD_MODE_SELECT_6) {
                 len = cdb[4];
                 scsi_cdrom_buf_alloc(dev, 256);
             } else {
@@ -2302,102 +2917,161 @@ begin:
             dev->do_page_save = cdb[1] & 1;
 
             scsi_cdrom_data_command_finish(dev, len, len, len, 1);
-            return;
+            break;
 
         case GPCMD_GET_CONFIGURATION:
             scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
 
-            /* XXX: could result in alignment problems in some architectures */
+            /* XXX: Could result in alignment problems in some architectures */
             feature = (cdb[2] << 8) | cdb[3];
             max_len = (cdb[7] << 8) | cdb[8];
 
-            /* only feature 0 is supported */
-            if ((cdb[2] != 0) || (cdb[3] > 2)) {
-                scsi_cdrom_invalid_field(dev);
-                scsi_cdrom_buf_free(dev);
-                return;
-            }
+            /* Only feature 0 is supported */
+            if ((feature > 3) && (feature != 0x010) && (feature != 0x1d) && (feature != 0x01e) &&
+                (feature != 0x01f) && (feature != 0x103))
+                scsi_cdrom_invalid_field(dev, feature);
+            else {
+                scsi_cdrom_buf_alloc(dev, 65536);
+                memset(dev->buffer, 0, max_len);
 
-            scsi_cdrom_buf_alloc(dev, 65536);
-            memset(dev->buffer, 0, max_len);
+                uint8_t      *b = dev->buffer;
 
-            alloc_length = 0;
-            b            = dev->buffer;
+                alloc_length    = 0;
 
-            /*
-             * the number of sectors from the media tells us which profile
-             * to use as current.  0 means there is no media
-             */
-            if (dev->drv->cd_status != CD_STATUS_EMPTY) {
-                len = dev->drv->cdrom_capacity;
-                if (len > CD_MAX_SECTORS) {
-                    b[6] = (MMC_PROFILE_DVD_ROM >> 8) & 0xff;
-                    b[7] = MMC_PROFILE_DVD_ROM & 0xff;
-                    ret  = 1;
-                } else {
-                    b[6] = (MMC_PROFILE_CD_ROM >> 8) & 0xff;
-                    b[7] = MMC_PROFILE_CD_ROM & 0xff;
-                    ret  = 0;
+                if ((dev->drv->cd_status != CD_STATUS_EMPTY) && (dev->drv->cd_status != CD_STATUS_DVD_REJECTED)) {
+                    if (dev->drv->cd_status == CD_STATUS_DVD) {
+                        b[6] = (MMC_PROFILE_DVD_ROM >> 8) & 0xff;
+                        b[7] = MMC_PROFILE_DVD_ROM & 0xff;
+                        ret  = 1;
+                    } else {
+                        b[6] = (MMC_PROFILE_CD_ROM >> 8) & 0xff;
+                        b[7] = MMC_PROFILE_CD_ROM & 0xff;
+                        ret  = 0;
+                    }
+                } else
+                    ret = 2;
+
+                alloc_length = 8;
+                b += 8;
+
+                if ((feature == 0) || ((cdb[1] & 3) < 2)) {
+                    /* Persistent and current. */
+                    b[2] = (0 << 2) | 0x02 | 0x01;
+                    b[3] = 8;
+
+                    alloc_length += 4;
+                    b += 4;
+
+                    int max_profiles = cdrom_is_dvd(dev->drv->type) ? 2 : 1;
+                    for (uint8_t i = 0; i < max_profiles; i++) {
+                        b[0] = (profiles[i] >> 8) & 0xff;
+                        b[1] = profiles[i] & 0xff;
+
+                        if (ret == i)
+                            b[2] |= 1;
+
+                        alloc_length += 4;
+                        b += 4;
+                    }
                 }
-            } else
-                ret = 2;
+                if ((feature == 1) || ((cdb[1] & 3) < 2)) {
+                   /* Persistent and current. */
+                    b[1] = 1;
+                    b[2] = (2 << 2) | 0x02 | 0x01;
+                    b[3] = 8;
 
-            alloc_length = 8;
-            b += 8;
+                    if (dev->drv->bus_type == CDROM_BUS_SCSI)
+                        b[7] = 1;
+                    else
+                        b[7] = 2;
+                    b[8] = 1;
 
-            if ((feature == 0) || ((cdb[1] & 3) < 2)) {
-                b[2] = (0 << 2) | 0x02 | 0x01; /* persistent and current */
-                b[3] = 8;
+                    alloc_length += 12;
+                    b += 12;
+                }
+                if ((feature == 2) || ((cdb[1] & 3) < 2)) {
+                    b[1] = 2;
+                    b[2] = (1 << 2) | 0x02 | 0x01; /* persistent and current */
+                    b[3] = 4;
+                    b[4] = 2;
 
-                alloc_length += 4;
-                b += 4;
+                    alloc_length += 8;
+                    b += 8;
+                }
+                if ((feature == 3) || ((cdb[1] & 3) < 2)) {
+                    b[1] = 2;
+                    /* Persistent and current. */
+                    b[2] = (0 << 2) | 0x02 | 0x01;
+                    b[3] = 4;
+                    b[4] = 0x0d | (cdrom_is_caddy(dev->drv->type) ? 0x00 : 0x20);
 
-                for (uint8_t i = 0; i < 2; i++) {
-                    b[0] = (profiles[i] >> 8) & 0xff;
-                    b[1] = profiles[i] & 0xff;
+                    alloc_length += 8;
+                    b += 8;
+                }
+                if ((feature == 0x10) || ((cdb[1] & 3) < 2)) {
+                    b[1] = 0x10;
+                    /* Persistent and current. */
+                    b[2] = (0 << 2) | 0x02 | 0x01;
+                    b[3] = 8;
 
-                    if (ret == i)
-                        b[2] |= 1;
+                    b[6] = 8;
+                    b[9] = 0x10;
+
+                    alloc_length += 12;
+                    b += 12;
+                }
+                if ((feature == 0x1d) || ((cdb[1] & 3) < 2)) {
+                    b[1] = 0x1d;
+                    /* Persistent and current. */
+                    b[2] = (0 << 2) | 0x02 | 0x01;
+                    b[3] = 0;
 
                     alloc_length += 4;
                     b += 4;
                 }
+                if ((feature == 0x1e) || ((cdb[1] & 3) < 2)) {
+                    b[1] = 0x1e;
+                    /* Persistent and current. */
+                    b[2] = (2 << 2) | 0x02 | 0x01;
+                    b[3] = 4;
+                    b[4] = 0;
+
+                    alloc_length += 8;
+                    b += 8;
+                }
+                if (cdrom_is_dvd(dev->drv->type) && ((feature == 0x1f) || ((cdb[1] & 3) < 2))) {
+                    b[1] = 0x1f;
+                    b[2] = (0 << 2) | 0x02 | 0x01; /* persistent and current */
+                    b[3] = 0;
+
+                    alloc_length += 4;
+                    b += 4;
+                }
+                if ((feature == 0x103) || ((cdb[1] & 3) < 2)) {
+                    b[0] = 1;
+                    b[1] = 3;
+                    /* Persistent and current. */
+                    b[2] = (0 << 2) | 0x02 | 0x01;
+                    b[3] = 0;
+                    b[4] = 7;
+
+                    b[6] = 1;
+
+                    alloc_length += 8;
+                }
+
+                dev->buffer[0] = ((alloc_length - 4) >> 24) & 0xff;
+                dev->buffer[1] = ((alloc_length - 4) >> 16) & 0xff;
+                dev->buffer[2] = ((alloc_length - 4) >> 8) & 0xff;
+                dev->buffer[3] = (alloc_length - 4) & 0xff;
+
+                alloc_length = MIN(alloc_length, max_len);
+
+                scsi_cdrom_set_buf_len(dev, BufLen, &alloc_length);
+
+                scsi_cdrom_data_command_finish(dev, alloc_length, alloc_length,
+                                               alloc_length, 0);
             }
-            if ((feature == 1) || ((cdb[1] & 3) < 2)) {
-                b[1] = 1;
-                b[2] = (2 << 2) | 0x02 | 0x01; /* persistent and current */
-                b[3] = 8;
-
-                if (dev->drv->bus_type == CDROM_BUS_SCSI)
-                    b[7] = 1;
-                else
-                    b[7] = 2;
-                b[8] = 1;
-
-                alloc_length += 12;
-                b += 12;
-            }
-            if ((feature == 2) || ((cdb[1] & 3) < 2)) {
-                b[1] = 2;
-                b[2] = (1 << 2) | 0x02 | 0x01; /* persistent and current */
-                b[3] = 4;
-
-                b[4] = 2;
-
-                alloc_length += 8;
-                b += 8;
-            }
-
-            dev->buffer[0] = ((alloc_length - 4) >> 24) & 0xff;
-            dev->buffer[1] = ((alloc_length - 4) >> 16) & 0xff;
-            dev->buffer[2] = ((alloc_length - 4) >> 8) & 0xff;
-            dev->buffer[3] = (alloc_length - 4) & 0xff;
-
-            alloc_length = MIN(alloc_length, max_len);
-
-            scsi_cdrom_set_buf_len(dev, BufLen, &alloc_length);
-
-            scsi_cdrom_data_command_finish(dev, alloc_length, alloc_length, alloc_length, 0);
             break;
 
         case GPCMD_GET_EVENT_STATUS_NOTIFICATION:
@@ -2408,60 +3082,65 @@ begin:
             gesn_cdb          = (void *) cdb;
             gesn_event_header = (void *) dev->buffer;
 
-            /* It is fine by the MMC spec to not support async mode operations. */
-            if (!(gesn_cdb->polled & 0x01)) {
-                /* asynchronous mode */
-                /* Only polling is supported, asynchronous mode is not. */
-                scsi_cdrom_invalid_field(dev);
-                scsi_cdrom_buf_free(dev);
-                return;
-            }
+            if (gesn_cdb->polled & 0x01) {
+                /*
+                   These are the supported events.
 
-            /*
-             * These are the supported events.
-             *
-             * We currently only support requests of the 'media' type.
-             * Notification class requests and supported event classes are bitmasks,
-             * but they are built from the same values as the "notification class"
-             * field.
-             */
-            gesn_event_header->supported_events = 1 << GESN_MEDIA;
+                   We currently only support requests of the 'media' type.
+                   Notification class requests and supported event classes are bitmasks,
+                   but they are built from the same values as the "notification class"
+                   field.
+                 */
+                gesn_event_header->supported_events = 1 << GESN_MEDIA;
 
-            /*
-             * We use |= below to set the class field; other bits in this byte
-             * are reserved now but this is useful to do if we have to use the
-             * reserved fields later.
-             */
-            gesn_event_header->notification_class = 0;
+                /*
+                   We use |= below to set the class field; other bits in this byte
+                   are reserved now but this is useful to do if we have to use the
+                   reserved fields later.
+                 */
+                gesn_event_header->notification_class = 0;
 
-            /*
-             * Responses to requests are to be based on request priority.  The
-             * notification_class_request_type enum above specifies the
-             * priority: upper elements are higher prio than lower ones.
-             */
-            if (gesn_cdb->class & (1 << GESN_MEDIA)) {
-                gesn_event_header->notification_class |= GESN_MEDIA;
+                /*
+                   Responses to requests are to be based on request priority.  The
+                   notification_class_request_type enum above specifies the
+                   priority: upper elements are higher prio than lower ones.
+                 */
+                if (gesn_cdb->class & (1 << GESN_MEDIA)) {
+                    gesn_event_header->notification_class |= GESN_MEDIA;
 
-                dev->buffer[4] = dev->media_status; /* Bits 7-4 = Reserved, Bits 4-1 = Media Status */
-                dev->buffer[5] = 1;                 /* Power Status (1 = Active) */
-                dev->buffer[6] = 0;
-                dev->buffer[7] = 0;
-                used_len       = 8;
-            } else {
-                gesn_event_header->notification_class = 0x80; /* No event available */
-                used_len                              = sizeof(*gesn_event_header);
-            }
-            gesn_event_header->len = used_len - sizeof(*gesn_event_header);
+                    /* Bits 7-4 = Reserved, Bits 4-1 = Media Status. */
+                    if ((dev->drv->cd_status == CD_STATUS_EMPTY) || (dev->drv->cd_status == CD_STATUS_DVD_REJECTED))
+                        dev->buffer[4] = MEC_MEDIA_REMOVAL;
+                    else
+                        dev->buffer[4] = dev->unit_attention ? MEC_NEW_MEDIA : MEC_NO_CHANGE;
+                    /* Power Status (1 = Active). */
+                    dev->buffer[5] = 1;
+                    dev->buffer[6] = 0;
+                    dev->buffer[7] = 0;
+                    used_len       = 8;
+                } else {
+                    /* No event available. */
+                    gesn_event_header->notification_class = 0x80;
+                    used_len                              = sizeof(*gesn_event_header);
+                }
+                gesn_event_header->len = used_len - sizeof(*gesn_event_header);
 
-            memmove(dev->buffer, gesn_event_header, 4);
+                memmove(dev->buffer, gesn_event_header, 4);
 
-            scsi_cdrom_set_buf_len(dev, BufLen, &used_len);
+                scsi_cdrom_set_buf_len(dev, BufLen, &used_len);
 
-            scsi_cdrom_data_command_finish(dev, used_len, used_len, used_len, 0);
+                scsi_cdrom_data_command_finish(dev, used_len, used_len, used_len, 0);
+            } else
+                /*
+                   Only polling is supported, asynchronous mode is not.
+                   It is fine by the MMC spec to not support async mode operations.
+                 */
+                scsi_cdrom_invalid_field(dev, gesn_cdb->polled);
             break;
 
         case GPCMD_READ_DISC_INFORMATION:
             scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
+            dev->was_cached = dev->toc_cached;
 
             max_len = cdb[7];
             max_len <<= 8;
@@ -2469,16 +3148,11 @@ begin:
 
             scsi_cdrom_buf_alloc(dev, 65536);
 
-            memset(dev->buffer, 0, 34);
-            memset(dev->buffer, 1, 9);
-            dev->buffer[0] = 0;
-            dev->buffer[1] = 32;
-            dev->buffer[2] = 0xe;  /* last session complete, disc finalized */
-            dev->buffer[7] = 0x20; /* unrestricted use */
-            dev->buffer[8] = 0x00; /* CD-ROM */
+            cdrom_read_disc_information(dev->drv, dev->buffer);
 
-            len = 34;
-            len = MIN(len, max_len);
+            len = MIN(34, max_len);
+
+            scsi_cdrom_cache_toc(dev);
 
             scsi_cdrom_set_buf_len(dev, BufLen, &len);
 
@@ -2487,6 +3161,7 @@ begin:
 
         case GPCMD_READ_TRACK_INFORMATION:
             scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
+            dev->was_cached = dev->toc_cached;
 
             max_len = cdb[7];
             max_len <<= 8;
@@ -2494,219 +3169,23 @@ begin:
 
             scsi_cdrom_buf_alloc(dev, 65536);
 
-            track = ((uint32_t) cdb[2]) << 24;
-            track |= ((uint32_t) cdb[3]) << 16;
-            track |= ((uint32_t) cdb[4]) << 8;
-            track |= (uint32_t) cdb[5];
+            ret = cdrom_read_track_information(dev->drv, cdb, dev->buffer);
 
-            if (((cdb[1] & 0x03) != 1) || (track != 1)) {
-                scsi_cdrom_invalid_field(dev);
-                scsi_cdrom_buf_free(dev);
-                return;
-            }
+            if (ret > 0) {
+                len = ret;
 
-            len = 36;
+                if (len > max_len) {
+                    len            = max_len;
+                    dev->buffer[0] = ((max_len - 2) >> 8) & 0xff;
+                    dev->buffer[1] = (max_len - 2) & 0xff;
+                }
 
-            memset(dev->buffer, 0, 36);
-            dev->buffer[0] = 0;
-            dev->buffer[1] = 34;
-            dev->buffer[2] = 1;                                                    /* track number (LSB) */
-            dev->buffer[3] = 1;                                                    /* session number (LSB) */
-            dev->buffer[5] = (0 << 5) | (0 << 4) | (4 << 0);                       /* not damaged, primary copy, data track */
-            dev->buffer[6] = (0 << 7) | (0 << 6) | (0 << 5) | (0 << 6) | (1 << 0); /* not reserved track, not blank, not packet writing, not fixed packet, data mode 1 */
-            dev->buffer[7] = (0 << 1) | (0 << 0);                                  /* last recorded address not valid, next recordable address not valid */
+                scsi_cdrom_cache_toc(dev);
 
-            dev->buffer[24] = ((dev->drv->cdrom_capacity - 1) >> 24) & 0xff; /* track size */
-            dev->buffer[25] = ((dev->drv->cdrom_capacity - 1) >> 16) & 0xff; /* track size */
-            dev->buffer[26] = ((dev->drv->cdrom_capacity - 1) >> 8) & 0xff;  /* track size */
-            dev->buffer[27] = (dev->drv->cdrom_capacity - 1) & 0xff;         /* track size */
-
-            if (len > max_len) {
-                len            = max_len;
-                dev->buffer[0] = ((max_len - 2) >> 8) & 0xff;
-                dev->buffer[1] = (max_len - 2) & 0xff;
-            }
-
-            scsi_cdrom_set_buf_len(dev, BufLen, &len);
-
-            scsi_cdrom_data_command_finish(dev, len, len, max_len, 0);
-            break;
-
-        case 0xC0:
-            switch (dev->drv->type) {
-                case CDROM_TYPE_DEC_RRD45_0436:
-                case CDROM_TYPE_SONY_CDU541_10i:
-                case CDROM_TYPE_SONY_CDU561_18k:
-                case CDROM_TYPE_SONY_CDU76S_100:
-                case CDROM_TYPE_TEXEL_DMXX24_100: /*GPCMD_SET_ADDRESS_FORMAT_SONY*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    dev->sony_vendor    = 1;
-                    dev->drv->sony_msf = cdb[8] & 1;
-                    scsi_cdrom_command_complete(dev);
-                    break;
-                case CDROM_TYPE_PIONEER_DRM604X_2403: /*GPCMD_MAGAZINE_EJECT_PIONEER*/
-                case CDROM_TYPE_CHINON_CDS431_H42: /*GPCMD_EJECT_CHINON*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    scsi_cdrom_stop(sc);
-                    cdrom_eject(dev->id);
-                    scsi_cdrom_command_complete(dev);
-                    break;
-                case CDROM_TYPE_TOSHIBA_XM_3433:
-                case CDROM_TYPE_TOSHIBA_XM3201B_3232:
-                case CDROM_TYPE_TOSHIBA_XM3301TA_0272:
-                case CDROM_TYPE_TOSHIBA_XM5701TA_3136:
-                case CDROM_TYPE_TOSHIBA_SDM1401_1008: /*GPCMD_AUDIO_TRACK_SEARCH_TOSHIBA*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    if ((dev->drv->host_drive < 1) || (dev->drv->cd_status <= CD_STATUS_DATA_ONLY)) {
-                        scsi_cdrom_illegal_mode(dev);
-                        break;
-                    }
-                    pos                = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
-                    ret                = cdrom_audio_track_search(dev->drv, pos, cdb[9] & 0xc0, cdb[1] & 1);
-                    dev->drv->audio_op = (cdb[1] & 1) ? 0x03 : 0x02;
-
-                    if (ret)
-                        scsi_cdrom_command_complete(dev);
-                    else
-                        scsi_cdrom_illegal_mode(dev);
-                    break;
-                default:
-                    scsi_cdrom_illegal_opcode(dev);
-                    break;
-            }
-            break;
-
-        case 0xD8:
-            switch (dev->drv->type) {
-                case CDROM_TYPE_NEC_25_10a:
-                case CDROM_TYPE_NEC_38_103:
-                case CDROM_TYPE_NEC_75_103:
-                case CDROM_TYPE_NEC_77_106:
-                case CDROM_TYPE_NEC_211_100:
-                case CDROM_TYPE_NEC_464_105: /*GPCMD_AUDIO_TRACK_SEARCH_NEC*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    if ((dev->drv->host_drive < 1) || (dev->drv->cd_status <= CD_STATUS_DATA_ONLY)) {
-                        scsi_cdrom_illegal_mode(dev);
-                        break;
-                    }
-                    pos                = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
-                    ret                = cdrom_audio_track_search(dev->drv, pos, cdb[9] & 0xc0, cdb[1] & 1);
-                    dev->drv->audio_op = (cdb[1] & 1) ? 0x03 : 0x02;
-
-                    if (ret)
-                        scsi_cdrom_command_complete(dev);
-                    else
-                        scsi_cdrom_illegal_mode(dev);
-                    break;
-                default:
-                    scsi_cdrom_illegal_opcode(dev);
-                    break;
-            }
-            break;
-
-        case 0xC1:
-            switch (dev->drv->type) {
-                case CDROM_TYPE_DEC_RRD45_0436:
-                case CDROM_TYPE_SONY_CDU541_10i:
-                case CDROM_TYPE_SONY_CDU561_18k:
-                case CDROM_TYPE_SONY_CDU76S_100:
-                case CDROM_TYPE_TEXEL_DMXX24_100: /*GPCMD_READ_TOC_SONY*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
-                    msf              = dev->ms_pages_saved_sony.pages[GPMODE_CDROM_PAGE_SONY][2] & 0x01;
-                    dev->sony_vendor = 1;
-
-                    max_len = cdb[7];
-                    max_len <<= 8;
-                    max_len |= cdb[8];
-
-                    scsi_cdrom_buf_alloc(dev, 65536);
-
-                    if (!dev->drv->ops) {
-                        scsi_cdrom_not_ready(dev);
-                        return;
-                    }
-
-                    len = cdrom_read_toc_sony(dev->drv, dev->buffer, cdb[5], msf || dev->drv->sony_msf, max_len);
-                    if (len == -1) {
-                        /* If the returned length is -1, this means cdrom_read_toc_sony() has encountered an error. */
-                        scsi_cdrom_invalid_field(dev);
-                        scsi_cdrom_buf_free(dev);
-                        return;
-                    }
-
-                    scsi_cdrom_set_buf_len(dev, BufLen, &len);
-
-                    scsi_cdrom_data_command_finish(dev, len, len, len, 0);
-                    return;
-                case CDROM_TYPE_PIONEER_DRM604X_2403: /*GPCMD_READ_TOC_PIONEER*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
-                    scsi_cdrom_buf_alloc(dev, 4);
-
-                    if (!dev->drv->ops) {
-                        scsi_cdrom_not_ready(dev);
-                        return;
-                    }
-
-                    ret = cdrom_read_disc_info_toc(dev->drv, dev->buffer, cdb[2], cdb[1] & 3);
-                    len = 4;
-                    if (!ret) {
-                        scsi_cdrom_invalid_field(dev);
-                        scsi_cdrom_buf_free(dev);
-                        return;
-                    }
-
-                    scsi_cdrom_set_buf_len(dev, BufLen, &len);
-                    scsi_cdrom_data_command_finish(dev, len, len, len, 0);
-                    return;
-                case CDROM_TYPE_TOSHIBA_XM_3433:
-                case CDROM_TYPE_TOSHIBA_XM3201B_3232:
-                case CDROM_TYPE_TOSHIBA_XM3301TA_0272:
-                case CDROM_TYPE_TOSHIBA_XM5701TA_3136:
-                case CDROM_TYPE_TOSHIBA_SDM1401_1008: /*GPCMD_PLAY_AUDIO_TOSHIBA*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    if ((dev->drv->host_drive < 1) || (dev->drv->cd_status <= CD_STATUS_DATA_ONLY)) {
-                        scsi_cdrom_illegal_mode(dev);
-                        break;
-                    }
-                    pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
-                    ret = cdrom_audio_play_toshiba(dev->drv, pos, cdb[9] & 0xc0);
-
-                    if (ret)
-                        scsi_cdrom_command_complete(dev);
-                    else
-                        scsi_cdrom_illegal_mode(dev);
-                    break;
-                default:
-                    scsi_cdrom_illegal_opcode(dev);
-                    break;
-            }
-            break;
-
-        case 0xD9:
-            switch (dev->drv->type) {
-                case CDROM_TYPE_NEC_25_10a:
-                case CDROM_TYPE_NEC_38_103:
-                case CDROM_TYPE_NEC_75_103:
-                case CDROM_TYPE_NEC_77_106:
-                case CDROM_TYPE_NEC_211_100:
-                case CDROM_TYPE_NEC_464_105: /*GPCMD_PLAY_AUDIO_NEC*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    if ((dev->drv->host_drive < 1) || (dev->drv->cd_status <= CD_STATUS_DATA_ONLY)) {
-                        scsi_cdrom_illegal_mode(dev);
-                        break;
-                    }
-                    pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
-                    ret = cdrom_audio_play_toshiba(dev->drv, pos, cdb[9] & 0xc0);
-
-                    if (ret)
-                        scsi_cdrom_command_complete(dev);
-                    else
-                        scsi_cdrom_illegal_mode(dev);
-                    break;
-                default:
-                    scsi_cdrom_illegal_opcode(dev);
-                    break;
-            }
+                scsi_cdrom_set_buf_len(dev, BufLen, &len);
+                scsi_cdrom_data_command_finish(dev, len, len, max_len, 0);
+            } else
+                scsi_cdrom_invalid_field(dev, -ret);
             break;
 
         case GPCMD_PLAY_AUDIO_10:
@@ -2715,11 +3194,11 @@ begin:
         case GPCMD_PLAY_AUDIO_TRACK_INDEX:
         case GPCMD_PLAY_AUDIO_TRACK_RELATIVE_10:
         case GPCMD_PLAY_AUDIO_TRACK_RELATIVE_12:
-            len = 0;
-
             scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
 
-            switch (cdb[0]) {
+            len = 0;
+
+            switch (dev->current_cdb[0]) {
                 case GPCMD_PLAY_AUDIO_10:
                     msf = 0;
                     pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
@@ -2737,12 +3216,11 @@ begin:
                     break;
                 case GPCMD_PLAY_AUDIO_TRACK_INDEX:
                     msf = 2;
-                    if ((cdb[5] != 1) || (cdb[8] != 1)) {
-                        scsi_cdrom_illegal_mode(dev);
-                        break;
-                    }
-                    pos = cdb[4];
-                    len = cdb[7];
+                    if ((cdb[5] == 1) && (cdb[8] == 1)) {
+                        pos = cdb[4];
+                        len = cdb[7];
+                    } else
+                        ret = 0;
                     break;
                 case GPCMD_PLAY_AUDIO_TRACK_RELATIVE_10:
                     msf = 0x100 | cdb[6];
@@ -2759,12 +3237,13 @@ begin:
                     break;
             }
 
-            if ((dev->drv->host_drive < 1) || (dev->drv->cd_status <= CD_STATUS_DATA_ONLY)) {
-                scsi_cdrom_illegal_mode(dev);
-                break;
-            }
+            if (ret && (dev->drv->image_path[0] != 0x00) &&
+                (dev->drv->cd_status > CD_STATUS_DVD)) {
+                ret                   = cdrom_audio_play(dev->drv, pos, len, msf);
 
-            ret = cdrom_audio_play(dev->drv, pos, len, msf);
+                dev->sector_pos       = dev->drv->seek_pos;
+            } else
+                ret = 0;
 
             if (ret)
                 scsi_cdrom_command_complete(dev);
@@ -2774,30 +3253,33 @@ begin:
 
         case GPCMD_READ_SUBCHANNEL:
             scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
+            dev->was_cached = (dev->drv->cached_sector != -1);
 
             max_len = cdb[7];
             max_len <<= 8;
             max_len |= cdb[8];
             msf = (cdb[1] >> 1) & 1;
 
-            scsi_cdrom_buf_alloc(dev, 32);
+            scsi_cdrom_buf_alloc(dev, 128);
 
-            scsi_cdrom_log("CD-ROM %i: Getting page %i (%s)\n", dev->id, cdb[3], msf ? "MSF" : "LBA");
+            scsi_cdrom_log(dev->log, "Getting page %i (%s)\n", cdb[3],
+                           msf ? "MSF" : "LBA");
 
-            if (cdb[3] > 3) {
-                /* scsi_cdrom_log("CD-ROM %i: Read subchannel check condition %02X\n", dev->id,
-                             cdb[3]); */
-                scsi_cdrom_invalid_field(dev);
-                scsi_cdrom_buf_free(dev);
-                return;
-            }
-
-            if (!(cdb[2] & 0x40))
-                alloc_length = 4;
-            else
-                switch (cdb[3]) {
+            if (cdb[3] > 3)
+                scsi_cdrom_invalid_field(dev, cdb[3]);
+            else if ((cdb[3] != 3) && (cdb[6] != 0))
+                scsi_cdrom_invalid_field(dev, cdb[6]);
+            else if (max_len <= 0) {
+                scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+                dev->packet_status = PHASE_COMPLETE;
+                dev->callback      = 20.0 * CDROM_TIME;
+                scsi_cdrom_set_callback(dev);
+            } else {
+                if (!(cdb[2] & 0x40))
+                    alloc_length = 4;
+                else  switch (cdb[3]) {
                     case 0:
-                        /* SCSI-2: Q-type subchannel, ATAPI: reserved */
+                        /* SCSI-2: Q-type subchannel, ATAPI: reserved. */
                         alloc_length = (dev->drv->bus_type == CDROM_BUS_SCSI) ? 48 : 4;
                         break;
                     case 1:
@@ -2808,163 +3290,30 @@ begin:
                         break;
                 }
 
-            len = alloc_length;
+                len = alloc_length;
 
-            memset(dev->buffer, 0, 24);
-            pos                = 0;
-            dev->buffer[pos++] = 0;
-            dev->buffer[pos++] = 0; /*Audio status*/
-            dev->buffer[pos++] = 0;
-            dev->buffer[pos++] = 0; /*Subchannel length*/
-            /* Mode 0 = Q subchannel mode, first 16 bytes are indentical to mode 1 (current position),
-                        the rest are stuff like ISRC etc., which can be all zeroes. */
-            if (cdb[3] <= 3) {
-                dev->buffer[pos++] = cdb[3]; /*Format code*/
+                memset(dev->buffer, 0x00, 128);
 
-                if (alloc_length != 4) {
-                    dev->buffer[1] = cdrom_get_current_subchannel(dev->drv, &dev->buffer[4], msf);
-                    dev->buffer[2] = alloc_length - 4;
+                if (alloc_length > 4) {
+                    dev->buffer[4] = cdb[3];    /* Format code */
+                    cdrom_get_current_subchannel(dev->drv, &dev->buffer[4], msf);
+
+                    alloc_length = MIN(max_len, alloc_length);
+
+                    dev->buffer[3] = (alloc_length - 4) & 0xff;
+                    dev->buffer[4] = cdb[3];    /* Format code */
                 }
 
-                switch (dev->drv->cd_status) {
-                    case CD_STATUS_PLAYING:
-                        dev->buffer[1] = 0x11;
-                        break;
-                    case CD_STATUS_PAUSED:
-                        dev->buffer[1] = (dev->drv->type == CDROM_TYPE_CHINON_CDS431_H42) ? 0x15 : 0x12;
-                        break;
-                    case CD_STATUS_DATA_ONLY:
-                        dev->buffer[1] = (dev->drv->type == CDROM_TYPE_CHINON_CDS431_H42) ? 0x00 : 0x15;
-                        break;
-                    default:
-                        dev->buffer[1] = (dev->drv->type == CDROM_TYPE_CHINON_CDS431_H42) ? 0x00 : 0x13;
-                        break;
-                }
+                dev->buffer[1] = cdrom_get_current_status(dev->drv);
 
-                scsi_cdrom_log("Audio Status = %02x\n", dev->buffer[1]);
-            }
+                scsi_cdrom_log(dev->log, "Audio status: %02X\n", dev->buffer[1]);
 
-            len = MIN(len, max_len);
-            scsi_cdrom_set_buf_len(dev, BufLen, &len);
+                scsi_cdrom_one_sector_seek(dev);
 
-            scsi_cdrom_data_command_finish(dev, len, len, len, 0);
-            break;
+                len = MIN(len, max_len);
+                scsi_cdrom_set_buf_len(dev, BufLen, &len);
 
-        case 0xC6:
-            switch (dev->drv->type) {
-                case CDROM_TYPE_DEC_RRD45_0436:
-                case CDROM_TYPE_SONY_CDU541_10i:
-                case CDROM_TYPE_SONY_CDU561_18k:
-                case CDROM_TYPE_SONY_CDU76S_100:
-                case CDROM_TYPE_TEXEL_DMXX24_100: /*GPCMD_PLAY_TRACK_SONY*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    dev->sony_vendor = 1;
-
-                    msf = 3;
-                    if ((cdb[5] != 1) || (cdb[8] != 1)) {
-                        scsi_cdrom_illegal_mode(dev);
-                        break;
-                    }
-                    pos = cdb[4];
-
-                    if ((dev->drv->host_drive < 1) || (dev->drv->cd_status <= CD_STATUS_DATA_ONLY)) {
-                        scsi_cdrom_illegal_mode(dev);
-                        break;
-                    }
-
-                    /* In this case, len is unused so just pass a fixed value of 1 intead. */
-                    ret = cdrom_audio_play(dev->drv, pos, 1 /*len*/, msf);
-
-                    if (ret)
-                        scsi_cdrom_command_complete(dev);
-                    else
-                        scsi_cdrom_illegal_mode(dev);
-                    break;
-                case CDROM_TYPE_CHINON_CDS431_H42: /*GPCMD_STOP_CHINON*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    scsi_cdrom_stop(sc);
-                    scsi_cdrom_command_complete(dev);
-                    break;
-                case CDROM_TYPE_TOSHIBA_XM_3433:
-                case CDROM_TYPE_TOSHIBA_XM3201B_3232:
-                case CDROM_TYPE_TOSHIBA_XM3301TA_0272:
-                case CDROM_TYPE_TOSHIBA_XM5701TA_3136:
-                case CDROM_TYPE_TOSHIBA_SDM1401_1008: /*GPCMD_READ_SUBCODEQ_PLAYING_STATUS_TOSHIBA*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
-
-                    alloc_length = cdb[1] & 0x1f;
-                    len          = 10;
-
-                    if (!dev->drv->ops) {
-                        scsi_cdrom_not_ready(dev);
-                        return;
-                    }
-
-                    if (!alloc_length) {
-                        scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                        scsi_cdrom_log("CD-ROM %i: Subcode Q All done - callback set\n", dev->id);
-                        dev->packet_status = PHASE_COMPLETE;
-                        dev->callback      = 20.0 * CDROM_TIME;
-                        scsi_cdrom_set_callback(dev);
-                        break;
-                    }
-
-                    scsi_cdrom_buf_alloc(dev, len);
-                    len = MIN(len, alloc_length);
-
-                    memset(dev->buffer, 0, len);
-                    dev->buffer[0] = cdrom_get_current_subcodeq_playstatus(dev->drv, &dev->buffer[1]);
-                    scsi_cdrom_log("Audio Status = %02x\n", dev->buffer[0]);
-
-                    scsi_cdrom_set_buf_len(dev, BufLen, &alloc_length);
-                    scsi_cdrom_data_command_finish(dev, len, len, len, 0);
-                    break;
-                default:
-                    scsi_cdrom_illegal_opcode(dev);
-                    break;
-            }
-            break;
-
-        case 0xDD:
-            switch (dev->drv->type) {
-                case CDROM_TYPE_NEC_25_10a:
-                case CDROM_TYPE_NEC_38_103:
-                case CDROM_TYPE_NEC_75_103:
-                case CDROM_TYPE_NEC_77_106:
-                case CDROM_TYPE_NEC_211_100:
-                case CDROM_TYPE_NEC_464_105: /*GPCMD_READ_SUBCODEQ_PLAYING_STATUS_NEC*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
-
-                    alloc_length = cdb[1] & 0x1f;
-                    len          = 10;
-
-                    if (!dev->drv->ops) {
-                        scsi_cdrom_not_ready(dev);
-                        return;
-                    }
-
-                    if (!alloc_length) {
-                        scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                        scsi_cdrom_log("CD-ROM %i: Subcode Q All done - callback set\n", dev->id);
-                        dev->packet_status = PHASE_COMPLETE;
-                        dev->callback      = 20.0 * CDROM_TIME;
-                        scsi_cdrom_set_callback(dev);
-                        break;
-                    }
-
-                    scsi_cdrom_buf_alloc(dev, len);
-                    len = MIN(len, alloc_length);
-
-                    memset(dev->buffer, 0, len);
-                    dev->buffer[0] = cdrom_get_current_subcodeq_playstatus(dev->drv, &dev->buffer[1]);
-                    scsi_cdrom_log("Audio Status = %02x\n", dev->buffer[0]);
-
-                    scsi_cdrom_set_buf_len(dev, BufLen, &alloc_length);
-                    scsi_cdrom_data_command_finish(dev, len, len, len, 0);
-                    break;
-                default:
-                    scsi_cdrom_illegal_opcode(dev);
-                    break;
+                scsi_cdrom_data_command_finish(dev, len, len, len, 0);
             }
             break;
 
@@ -2972,45 +3321,39 @@ begin:
             scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
 
             alloc_length = (((uint32_t) cdb[8]) << 8) | ((uint32_t) cdb[9]);
-
             scsi_cdrom_buf_alloc(dev, alloc_length);
 
-            if ((cdb[7] < 0xc0) && (dev->drv->cdrom_capacity <= CD_MAX_SECTORS)) {
-                scsi_cdrom_incompatible_format(dev);
-                scsi_cdrom_buf_free(dev);
-                return;
-            }
+            if ((cdb[7] < 0xc0) && (dev->drv->cd_status != CD_STATUS_DVD))
+                scsi_cdrom_incompatible_format(dev, cdb[7]);
+            else {
+                memset(dev->buffer, 0, alloc_length);
 
-            memset(dev->buffer, 0, alloc_length);
+                if ((cdb[7] <= 0x7f) || (cdb[7] == 0xff)) {
+                    uint32_t info = 0x00000000;
 
-            if ((cdb[7] <= 0x7f) || (cdb[7] == 0xff)) {
-                if (cdb[1] == 0) {
-                    ret            = scsi_cdrom_read_dvd_structure(dev, format, cdb, dev->buffer);
-                    dev->buffer[0] = (ret >> 8);
-                    dev->buffer[1] = (ret & 0xff);
-                    dev->buffer[2] = dev->buffer[3] = 0x00;
-                    if (ret) {
-                        scsi_cdrom_set_buf_len(dev, BufLen, &alloc_length);
-                        scsi_cdrom_data_command_finish(dev, alloc_length, alloc_length,
-                                                       alloc_length, 0);
-                    } else
-                        scsi_cdrom_buf_free(dev);
-                    return;
-                }
-            } else {
-                scsi_cdrom_invalid_field(dev);
-                scsi_cdrom_buf_free(dev);
-                return;
-            }
-            break;
+                    if (cdb[1] == 0) {
+                        ret            = cdrom_read_dvd_structure(dev->drv, cdb[6], cdb[7], dev->buffer, &info);
+                        if (ret > 0) {
+                            dev->buffer[0] = (ret >> 8);
+                            dev->buffer[1] = (ret & 0xff);
+                            dev->buffer[2] = dev->buffer[3] = 0x00;
 
-        case 0x26:
-            if (dev->drv->type == CDROM_TYPE_CHINON_CDS431_H42) { /*GPCMD_UNKNOWN_CHINON*/
-                scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                scsi_cdrom_stop(sc);
-                scsi_cdrom_command_complete(dev);
-            } else {
-                scsi_cdrom_illegal_opcode(dev);
+                            scsi_cdrom_set_buf_len(dev, BufLen, &alloc_length);
+                            scsi_cdrom_data_command_finish(dev, alloc_length,
+                                                           alloc_length,
+                                                           alloc_length, 0);
+                        } else if (ret < 0)
+                            scsi_cdrom_error_common(dev, (ret >> 16) & 0xff,
+                                                    (ret >> 8) & 0xff, ret & 0xff, info);
+                        else {
+                            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+                            dev->packet_status = PHASE_COMPLETE;
+                            dev->callback      = 20.0 * CDROM_TIME;
+                            scsi_cdrom_set_callback(dev);
+                        }
+                    }
+                } else
+                    scsi_cdrom_invalid_field(dev, cdb[7]);
             }
             break;
 
@@ -3022,12 +3365,17 @@ begin:
                     scsi_cdrom_stop(sc);
                     break;
                 case 1: /* Start the disc and read the TOC. */
-                    /* This makes no sense under emulation as this would do
-                       absolutely nothing, so just break. */
+                    /*
+                       This makes no sense under emulation as this would do
+                       absolutely nothing, so just break.
+                     */
+                    dev->toc_cached = 0;
+                    scsi_cdrom_cache_toc(dev);
                     break;
                 case 2: /* Eject the disc if possible. */
                     scsi_cdrom_stop(sc);
                     cdrom_eject(dev->id);
+                    dev->toc_cached = 0;
                     break;
                 case 3: /* Load the disc (close tray). */
                     cdrom_reload(dev->id);
@@ -3040,80 +3388,6 @@ begin:
             scsi_cdrom_command_complete(dev);
             break;
 
-        case 0xC4:
-            switch (dev->drv->type) {
-                case CDROM_TYPE_MATSHITA_501_10b: /*GPCMD_READ_HEADER_MATSUSHITA*/
-                    cdb[0]              = GPCMD_READ_HEADER;
-                    dev->current_cdb[0] = cdb[0];
-                    goto begin;
-                    break;
-                case CDROM_TYPE_DEC_RRD45_0436:
-                case CDROM_TYPE_SONY_CDU541_10i:
-                case CDROM_TYPE_SONY_CDU561_18k:
-                case CDROM_TYPE_SONY_CDU76S_100:
-                case CDROM_TYPE_TEXEL_DMXX24_100: /*GPCMD_PLAYBACK_STATUS_SONY*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
-                    dev->sony_vendor = 1;
-
-                    max_len = cdb[7];
-                    max_len <<= 8;
-                    max_len |= cdb[8];
-                    msf = dev->ms_pages_saved_sony.pages[GPMODE_CDROM_PAGE_SONY][2] & 0x01;
-
-                    scsi_cdrom_buf_alloc(dev, 18);
-
-                    len = 18;
-
-                    memset(dev->buffer, 0, 18);
-                    dev->buffer[0] = 0x00;                                                        /*Reserved*/
-                    dev->buffer[1] = 0x00;                                                        /*Reserved*/
-                    dev->buffer[2] = 0x00;                                                        /*Audio Status data length*/
-                    dev->buffer[3] = 0x00;                                                        /*Audio Status data length*/
-                    dev->buffer[4] = cdrom_get_audio_status_sony(dev->drv, &dev->buffer[6], msf || dev->drv->sony_msf); /*Audio status*/
-                    dev->buffer[5] = 0x00;
-
-                    scsi_cdrom_log("Audio Status = %02x\n", dev->buffer[4]);
-
-                    len = MIN(len, max_len);
-                    scsi_cdrom_set_buf_len(dev, BufLen, &len);
-
-                    scsi_cdrom_data_command_finish(dev, len, len, len, 0);
-                    break;
-                case CDROM_TYPE_TOSHIBA_XM_3433:
-                case CDROM_TYPE_TOSHIBA_XM3201B_3232:
-                case CDROM_TYPE_TOSHIBA_XM3301TA_0272:
-                case CDROM_TYPE_TOSHIBA_XM5701TA_3136:
-                case CDROM_TYPE_TOSHIBA_SDM1401_1008: /*GPCMD_CADDY_EJECT_TOSHIBA*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    scsi_cdrom_stop(sc);
-                    cdrom_eject(dev->id);
-                    scsi_cdrom_command_complete(dev);
-                    break;
-                default:
-                    scsi_cdrom_illegal_opcode(dev);
-                    break;
-            }
-            break;
-
-        case 0xDC:
-            switch (dev->drv->type) {
-                case CDROM_TYPE_NEC_25_10a:
-                case CDROM_TYPE_NEC_38_103:
-                case CDROM_TYPE_NEC_75_103:
-                case CDROM_TYPE_NEC_77_106:
-                case CDROM_TYPE_NEC_211_100:
-                case CDROM_TYPE_NEC_464_105: /*GPCMD_CADDY_EJECT_NEC*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    scsi_cdrom_stop(sc);
-                    cdrom_eject(dev->id);
-                    scsi_cdrom_command_complete(dev);
-                    break;
-                default:
-                    scsi_cdrom_illegal_opcode(dev);
-                    break;
-            }
-            break;
-
         case GPCMD_INQUIRY:
             scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
 
@@ -3127,11 +3401,15 @@ begin:
                 preamble_len = 4;
                 size_idx     = 3;
 
-                dev->buffer[idx++] = 5;
-                dev->buffer[idx++] = cdb[2];
-                dev->buffer[idx++] = 0;
+                if ((cdb[1] & 0xe0) || ((dev->cur_lun > 0x00) && (dev->cur_lun < 0xff)))
+                    dev->buffer[idx++] = 0x7f;    /* No physical device on this LUN */
+                else
+                    dev->buffer[idx++] = 0x05;    /* CD-ROM */
 
-                idx++;
+                dev->buffer[idx++] = cdb[2];
+
+                dev->buffer[idx++] = 0x00;
+                dev->buffer[idx++] = 0x00;
 
                 switch (cdb[2]) {
                     case 0x00:
@@ -3140,7 +3418,7 @@ begin:
                         break;
                     case 0x83:
                         if (idx + 24 > max_len) {
-                            scsi_cdrom_data_phase_error(dev);
+                            scsi_cdrom_data_phase_error(dev, idx + 24);
                             scsi_cdrom_buf_free(dev);
                             return;
                         }
@@ -3148,37 +3426,33 @@ begin:
                         dev->buffer[idx++] = 0x02;
                         dev->buffer[idx++] = 0x00;
                         dev->buffer[idx++] = 0x00;
-                        dev->buffer[idx++] = 20;
-                        ide_padstr8(dev->buffer + idx, 20, "53R141"); /* Serial */
+                        dev->buffer[idx++] = 0x14;
+                        ide_padstr8(dev->buffer + idx, 20, "53R141");                            /* Serial */
                         idx += 20;
 
                         if (idx + 72 > cdb[4])
                             goto atapi_out;
+
                         dev->buffer[idx++] = 0x02;
                         dev->buffer[idx++] = 0x01;
                         dev->buffer[idx++] = 0x00;
-                        dev->buffer[idx++] = 68;
-
-                        if (dev->drv->type == CDROM_TYPE_86BOX_100)
-                            ide_padstr8(dev->buffer + idx, 8, EMU_NAME); /* Vendor */
-                        else
-                            ide_padstr8(dev->buffer + idx, 8, cdrom_drive_types[dev->drv->type].vendor); /* Vendor */
+                        dev->buffer[idx++] = 34;
 
+                        ide_padstr8(dev->buffer + idx,  8,
+                                    cdrom_get_vendor(dev->drv->type));    /* Vendor */
                         idx += 8;
 
-                        if (dev->drv->type == CDROM_TYPE_86BOX_100)
-                            ide_padstr8(dev->buffer + idx, 40, device_identify_ex); /* Product */
-                        else
-                            ide_padstr8(dev->buffer + idx, 40, cdrom_drive_types[dev->drv->type].model); /* Product */
+                        cdrom_get_model(dev->drv->type, model, dev->id);
+                        ide_padstr8(dev->buffer + idx, 16, model);                               /* Product */
+                        idx += 16;
 
-                        idx += 40;
-                        ide_padstr8(dev->buffer + idx, 20, "53R141"); /* Serial */
-                        idx += 20;
+                        ide_padstr8(dev->buffer + idx, 10, "53R141");                            /* Serial */
+                        idx += 10;
                         break;
 
                     default:
-                        scsi_cdrom_log("INQUIRY: Invalid page: %02X\n", cdb[2]);
-                        scsi_cdrom_invalid_field(dev);
+                        scsi_cdrom_log(dev->log, "INQUIRY: Invalid page: %02X\n", cdb[2]);
+                        scsi_cdrom_invalid_field(dev, cdb[2]);
                         scsi_cdrom_buf_free(dev);
                         return;
                 }
@@ -3187,104 +3461,48 @@ begin:
                 size_idx     = 4;
 
                 memset(dev->buffer, 0, 8);
-                dev->buffer[0] = 5;    /*CD-ROM*/
-                dev->buffer[1] = 0x80; /*Removable*/
+                if ((cdb[1] & 0xe0) || ((dev->cur_lun > 0x00) && (dev->cur_lun < 0xff)))
+                    dev->buffer[0] = 0x7f;    /* No physical device on this LUN */
+                else
+                    dev->buffer[0] = 0x05;    /* CD-ROM */
+
+                dev->buffer[1] = 0x80;    /* Removable */
 
                 if (dev->drv->bus_type == CDROM_BUS_SCSI) {
-                    dev->buffer[3] = 0x02;
-                    switch (dev->drv->type) {
-                        case CDROM_TYPE_86BOX_100:
-                            dev->buffer[2] = 0x05; /*SCSI-2 compliant*/
-                            break;
-                        case CDROM_TYPE_CHINON_CDS431_H42:
-                        case CDROM_TYPE_DEC_RRD45_0436:
-                        case CDROM_TYPE_MATSHITA_501_10b:
-                        case CDROM_TYPE_SONY_CDU541_10i:
-                        case CDROM_TYPE_SONY_CDU76S_100:
-                        case CDROM_TYPE_TEAC_CD50_100:
-                        case CDROM_TYPE_TEAC_R55S_10R:
-                        case CDROM_TYPE_TEXEL_DMXX24_100:
-                        case CDROM_TYPE_TOSHIBA_XM3201B_3232:
-                            dev->buffer[2] = 0x00;
-                            dev->buffer[3] = 0x01; /*SCSI-1 compliant*/
-                            break;
-                        case CDROM_TYPE_NEC_25_10a:
-                        case CDROM_TYPE_NEC_38_103:
-                        case CDROM_TYPE_NEC_75_103:
-                        case CDROM_TYPE_NEC_77_106:
-                        case CDROM_TYPE_NEC_211_100:
-                        case CDROM_TYPE_NEC_464_105:
-                            dev->buffer[3] = 0x00; /*SCSI unknown version per NEC manuals*/
-                            break;
-                        default:
-                            dev->buffer[2] = 0x02; /*SCSI-2 compliant*/
-                            break;
-                    }
+                    dev->buffer[2] = (dev->ven_cmd == scsi_cdrom_command_nec) ?
+                                     0x00 : cdrom_get_scsi_std(dev->drv->type);
+
+                    if (dev->drv->is_toshiba)
+                        /* Linked Command and Relative Addressing supported */
+                        dev->buffer[7] = 0x88;
                 } else {
                     dev->buffer[2] = 0x00;
                     dev->buffer[3] = 0x21;
                 }
 
-                dev->buffer[4] = 31;
-                if (dev->drv->bus_type == CDROM_BUS_SCSI) {
-                    switch (dev->drv->type) {
-                        case CDROM_TYPE_TOSHIBA_XM_3433:
-                        case CDROM_TYPE_TOSHIBA_XM3201B_3232:
-                        case CDROM_TYPE_TOSHIBA_XM3301TA_0272:
-                        case CDROM_TYPE_TOSHIBA_XM5701TA_3136:
-                            dev->buffer[4] = 91;   /* Always 91 on Toshiba SCSI-1 (or SCSI-2) CD-ROM drives from 1989-1990*/
-                            dev->buffer[7] = 0x88; /* Linked Command and Relative Addressing supported */
-                            break;
-                        case CDROM_TYPE_PIONEER_DRM604X_2403:
-                            dev->buffer[4] = 42;
-                            break;
-                        case CDROM_TYPE_NEC_25_10a:
-                        case CDROM_TYPE_NEC_38_103:
-                        case CDROM_TYPE_NEC_75_103:
-                        case CDROM_TYPE_NEC_77_106:
-                        case CDROM_TYPE_NEC_211_100:
-                        case CDROM_TYPE_NEC_464_105:
-                            break;
-                        default:
-                            dev->buffer[6] = 0x01; /* 16-bit transfers supported */
-                            dev->buffer[7] = 0x20; /* Wide bus supported */
-                            break;
-                    }
+                if (cdrom_is_generic(dev->drv->type)) {
+                    dev->buffer[6] = 0x01;    /* 16-bit transfers supported */
+                    dev->buffer[7] = 0x20;    /* Wide bus supported */
                 }
 
-                if (dev->drv->type == CDROM_TYPE_86BOX_100) {
-                    ide_padstr8(dev->buffer + 8, 8, EMU_NAME);          /* Vendor */
-                    ide_padstr8(dev->buffer + 16, 16, device_identify); /* Product */
-                    ide_padstr8(dev->buffer + 32, 4, EMU_VERSION_EX);   /* Revision */
-                } else {
-                    ide_padstr8(dev->buffer + 8, 8, cdrom_drive_types[dev->drv->type].vendor);    /* Vendor */
-                    ide_padstr8(dev->buffer + 16, 16, cdrom_drive_types[dev->drv->type].model);   /* Product */
-                    ide_padstr8(dev->buffer + 32, 4, cdrom_drive_types[dev->drv->type].revision); /* Revision */
-                    if (dev->drv->type == CDROM_TYPE_PIONEER_DRM604X_2403) {
-                        dev->buffer[36] = 0x20;
-                        ide_padstr8(dev->buffer + 37, 10, "1991/01/01"); /* Date */
-                    }
+                ide_padstr8(dev->buffer + 8,   8,
+                            cdrom_get_vendor(dev->drv->type));      /* Vendor */
+                cdrom_get_model(dev->drv->type, model, dev->id);
+                ide_padstr8(dev->buffer + 16, 16, model);                                 /* Product */
+                ide_padstr8(dev->buffer + 32,  4,
+                            cdrom_get_revision(dev->drv->type));    /* Revision */
+
+                if (dev->drv->is_pioneer) {
+                    dev->buffer[36] = 0x20;
+                    ide_padstr8(dev->buffer + 37, 10, "1991/01/01");                      /* Date */
                 }
 
-                idx = 36;
-                if (dev->drv->type == CDROM_TYPE_PIONEER_DRM604X_2403)
-                    idx = 47;
-                else {
-                    switch (dev->drv->type) {
-                        case CDROM_TYPE_TOSHIBA_XM_3433:
-                        case CDROM_TYPE_TOSHIBA_XM3201B_3232:
-                        case CDROM_TYPE_TOSHIBA_XM3301TA_0272:
-                        case CDROM_TYPE_TOSHIBA_XM5701TA_3136:
-                            idx = 96;
-                            break;
-                        default:
-                            if (max_len == 96) {
-                                dev->buffer[4] = 91;
-                                idx            = 96;
-                            }
-                            break;
-                    }
-                }
+                if (max_len == 96)
+                    idx = 96;
+                else
+                    idx =  cdrom_get_inquiry_len(dev->drv->bus_type);
+
+                dev->buffer[4] = idx - 5;
             }
 
 atapi_out:
@@ -3293,17 +3511,13 @@ atapi_out:
 
             len = MIN(len, max_len);
 
-            scsi_cdrom_set_buf_len(dev, BufLen, &len);
-            scsi_cdrom_log("Inquiry = %d, max = %d, BufLen = %d.\n", len, max_len, *BufLen);
+            scsi_cdrom_set_buf_len(dev, BufLen, &max_len);
+            scsi_cdrom_log(dev->log, "Inquiry = %d, max = %d, BufLen = %d.\n", len,
+                           max_len, *BufLen);
 
             scsi_cdrom_data_command_finish(dev, len, len, max_len, 0);
             break;
 
-        case 0x0D: /*GPCMD_NO_OPERATION_TOSHIBA and GPCMD_NO_OPERATION_NEC*/
-            scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-            scsi_cdrom_command_complete(dev);
-            break;
-
         case GPCMD_PREVENT_REMOVAL:
             scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
             scsi_cdrom_command_complete(dev);
@@ -3312,163 +3526,15 @@ atapi_out:
         case GPCMD_PAUSE_RESUME:
             scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
             cdrom_audio_pause_resume(dev->drv, cdb[8] & 0x01);
-            dev->drv->audio_op = (cdb[8] & 0x01) ? 0x03 : 0x01;
             scsi_cdrom_command_complete(dev);
             break;
 
-        case 0xC3:
-            switch (dev->drv->type) {
-                case CDROM_TYPE_MATSHITA_501_10b: /*GPCMD_READ_TOC_MATSUSHITA*/
-                    cdb[0]              = GPCMD_READ_TOC_PMA_ATIP;
-                    dev->current_cdb[0] = cdb[0];
-                    goto begin;
-                    break;
-                case CDROM_TYPE_DEC_RRD45_0436:
-                case CDROM_TYPE_SONY_CDU541_10i:
-                case CDROM_TYPE_SONY_CDU561_18k:
-                case CDROM_TYPE_SONY_CDU76S_100:
-                case CDROM_TYPE_TEXEL_DMXX24_100: /*GPCMD_READ_HEADER_SONY*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
-                    dev->sony_vendor = 1;
-
-                    alloc_length = ((cdb[7] << 8) | cdb[8]);
-                    scsi_cdrom_buf_alloc(dev, 4);
-
-                    dev->sector_len = 1;
-                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
-                    real_pos        = cdrom_lba_to_msf_accurate(dev->sector_pos);
-                    dev->buffer[0]  = ((real_pos >> 16) & 0xff);
-                    dev->buffer[1]  = ((real_pos >> 8) & 0xff);
-                    dev->buffer[2]  = real_pos & 0xff;
-                    dev->buffer[3]  = 1; /*2048 bytes user data*/
-
-                    len = 4;
-                    len = MIN(len, alloc_length);
-
-                    scsi_cdrom_set_buf_len(dev, BufLen, &len);
-
-                    scsi_cdrom_data_command_finish(dev, len, len, len, 0);
-                    return;
-                case CDROM_TYPE_TOSHIBA_XM_3433:
-                case CDROM_TYPE_TOSHIBA_XM3201B_3232:
-                case CDROM_TYPE_TOSHIBA_XM3301TA_0272:
-                case CDROM_TYPE_TOSHIBA_XM5701TA_3136:
-                case CDROM_TYPE_TOSHIBA_SDM1401_1008: /*GPCMD_SET_STOP_TIME_TOSHIBA*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    scsi_cdrom_command_complete(dev);
-                    break;
-                default:
-                    scsi_cdrom_illegal_opcode(dev);
-                    break;
-            }
-            break;
-
-        case 0xDB:
-            switch (dev->drv->type) {
-                case CDROM_TYPE_NEC_25_10a:
-                case CDROM_TYPE_NEC_38_103:
-                case CDROM_TYPE_NEC_75_103:
-                case CDROM_TYPE_NEC_77_106:
-                case CDROM_TYPE_NEC_211_100:
-                case CDROM_TYPE_NEC_464_105: /*GPCMD_SET_STOP_TIME_NEC*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    scsi_cdrom_command_complete(dev);
-                    break;
-                default:
-                    scsi_cdrom_illegal_opcode(dev);
-                    break;
-            }
-            break;
-
-        case 0xC2:
-            switch (dev->drv->type) {
-                case CDROM_TYPE_MATSHITA_501_10b: /*GPCMD_READ_SUBCHANNEL_MATSUSHITA*/
-                    cdb[0]              = GPCMD_READ_SUBCHANNEL;
-                    dev->current_cdb[0] = cdb[0];
-                    goto begin;
-                    break;
-                case CDROM_TYPE_DEC_RRD45_0436:
-                case CDROM_TYPE_SONY_CDU541_10i:
-                case CDROM_TYPE_SONY_CDU561_18k:
-                case CDROM_TYPE_SONY_CDU76S_100:
-                case CDROM_TYPE_TEXEL_DMXX24_100: /*GPCMD_READ_SUBCHANNEL_SONY*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
-                    dev->sony_vendor = 1;
-
-                    max_len = cdb[7];
-                    max_len <<= 8;
-                    max_len |= cdb[8];
-                    msf = dev->ms_pages_saved_sony.pages[GPMODE_CDROM_PAGE_SONY][2] & 0x01;
-
-                    scsi_cdrom_log("CD-ROM %i: Getting sub-channel type (%s), code-q = %02x\n", dev->id, msf ? "MSF" : "LBA", cdb[2] & 0x40);
-
-                    if (cdb[2] & 0x40) {
-                        scsi_cdrom_buf_alloc(dev, 9);
-                        memset(dev->buffer, 0, 9);
-                        len = 9;
-                        cdrom_get_current_subchannel_sony(dev->drv, dev->buffer, msf || dev->drv->sony_msf);
-                        len = MIN(len, max_len);
-                        scsi_cdrom_set_buf_len(dev, BufLen, &len);
-                        scsi_cdrom_data_command_finish(dev, len, len, len, 0);
-                    } else {
-                        scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                        scsi_cdrom_log("CD-ROM %i: Drive Status All done - callback set\n", dev->id);
-                        dev->packet_status = PHASE_COMPLETE;
-                        dev->callback      = 20.0 * CDROM_TIME;
-                        scsi_cdrom_set_callback(dev);
-                    }
-                    break;
-                case CDROM_TYPE_PIONEER_DRM604X_2403: /*GPCMD_READ_SUBCODEQ_PIONEER*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
-
-                    alloc_length = cdb[1] & 0x1f;
-                    len          = 9;
-
-                    if (!dev->drv->ops) {
-                        scsi_cdrom_not_ready(dev);
-                        return;
-                    }
-
-                    if (!alloc_length) {
-                        scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                        scsi_cdrom_log("CD-ROM %i: Subcode Q All done - callback set\n", dev->id);
-                        dev->packet_status = PHASE_COMPLETE;
-                        dev->callback      = 20.0 * CDROM_TIME;
-                        scsi_cdrom_set_callback(dev);
-                        break;
-                    }
-
-                    scsi_cdrom_buf_alloc(dev, len);
-                    len = MIN(len, alloc_length);
-
-                    memset(dev->buffer, 0, len);
-                    cdrom_get_current_subcodeq(dev->drv, &dev->buffer[1]);
-                    scsi_cdrom_log("Audio Status = %02x\n", dev->buffer[0]);
-
-                    scsi_cdrom_set_buf_len(dev, BufLen, &alloc_length);
-                    scsi_cdrom_data_command_finish(dev, len, len, len, 0);
-                    break;
-                case CDROM_TYPE_TOSHIBA_XM_3433:
-                case CDROM_TYPE_TOSHIBA_XM3201B_3232:
-                case CDROM_TYPE_TOSHIBA_XM3301TA_0272:
-                case CDROM_TYPE_TOSHIBA_XM5701TA_3136:
-                case CDROM_TYPE_TOSHIBA_SDM1401_1008: /*GPCMD_STILL_TOSHIBA*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    cdrom_audio_pause_resume(dev->drv, 0x00);
-                    dev->drv->audio_op = 0x01;
-                    scsi_cdrom_command_complete(dev);
-                    break;
-                default:
-                    scsi_cdrom_illegal_opcode(dev);
-                    break;
-            }
-            break;
-
         case GPCMD_SEEK_6:
         case GPCMD_SEEK_10:
             scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
+            dev->was_cached = 0;
 
-            switch (cdb[0]) {
+            switch (dev->current_cdb[0]) {
                 case GPCMD_SEEK_6:
                     pos = (cdb[2] << 8) | cdb[3];
                     break;
@@ -3479,34 +3545,26 @@ atapi_out:
                 default:
                     break;
             }
+
             dev->drv->seek_diff = ABS((int) (pos - dev->drv->seek_pos));
-            if (cdb[0] == GPCMD_SEEK_10) {
-                switch (dev->drv->type) {
-                    case CDROM_TYPE_NEC_25_10a:
-                    case CDROM_TYPE_NEC_38_103:
-                    case CDROM_TYPE_NEC_75_103:
-                    case CDROM_TYPE_NEC_77_106:
-                    case CDROM_TYPE_NEC_211_100:
-                    case CDROM_TYPE_NEC_464_105:
-                    case CDROM_TYPE_TOSHIBA_XM_3433:
-                    case CDROM_TYPE_TOSHIBA_XM3201B_3232:
-                    case CDROM_TYPE_TOSHIBA_XM3301TA_0272:
-                    case CDROM_TYPE_TOSHIBA_XM5701TA_3136:
-                    case CDROM_TYPE_TOSHIBA_SDM1401_1008:
-                        cdrom_seek(dev->drv, pos, cdb[9] & 0xc0);
-                        break;
-                    default:
-                        cdrom_seek(dev->drv, pos, 0);
-                        break;
-                }
-            } else
+
+            /* Stop the audio playing. */
+            cdrom_stop(dev->drv);
+
+            if (dev->use_cdb_9 && (dev->current_cdb[0] == GPCMD_SEEK_10))
+                cdrom_seek(dev->drv, pos, cdb[9] & 0xc0);
+            else
                 cdrom_seek(dev->drv, pos, 0);
 
+            dev->sector_pos         = dev->drv->seek_pos;
+            dev->drv->cached_sector = -1;
+
             scsi_cdrom_command_complete(dev);
             break;
 
         case GPCMD_READ_CDROM_CAPACITY:
             scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
+            dev->was_cached = dev->toc_cached;
 
             scsi_cdrom_buf_alloc(dev, 8);
 
@@ -3519,6 +3577,10 @@ atapi_out:
             dev->buffer[6] = 8;
             len            = 8;
 
+            scsi_cdrom_log(dev->log, "CD-ROM Capacity: %08X\n",
+                           dev->drv->cdrom_capacity - 1);
+
+            scsi_cdrom_cache_toc(dev);
             scsi_cdrom_set_buf_len(dev, BufLen, &len);
 
             scsi_cdrom_data_command_finish(dev, len, len, len, 0);
@@ -3527,7 +3589,7 @@ atapi_out:
         case GPCMD_STOP_PLAY_SCAN:
             scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
 
-            if (dev->drv->cd_status <= CD_STATUS_DATA_ONLY) {
+            if (dev->drv->cd_status <= CD_STATUS_DVD) {
                 scsi_cdrom_illegal_mode(dev);
                 break;
             }
@@ -3536,232 +3598,12 @@ atapi_out:
             scsi_cdrom_command_complete(dev);
             break;
 
-        case 0xC5:
-            switch (dev->drv->type) {
-                case CDROM_TYPE_MATSHITA_501_10b: /*GPCMD_PLAY_AUDIO_MATSUSHITA*/
-                    cdb[0]              = GPCMD_PLAY_AUDIO_10;
-                    dev->current_cdb[0] = cdb[0];
-                    goto begin;
-                    break;
-                case CDROM_TYPE_DEC_RRD45_0436:
-                case CDROM_TYPE_SONY_CDU541_10i:
-                case CDROM_TYPE_SONY_CDU561_18k:
-                case CDROM_TYPE_SONY_CDU76S_100:
-                case CDROM_TYPE_TEXEL_DMXX24_100: /*GPCMD_PAUSE_SONY*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    dev->sony_vendor = 1;
-                    cdrom_audio_pause_resume(dev->drv, !(cdb[1] & 0x10));
-                    scsi_cdrom_command_complete(dev);
-                    break;
-                default:
-                    scsi_cdrom_illegal_opcode(dev);
-                    break;
-            }
-            break;
-
-        case 0xC8:
-            switch (dev->drv->type) {
-                case CDROM_TYPE_MATSHITA_501_10b: /*GPCMD_PLAY_AUDIO_TRACK_INDEX_MATSUSHITA*/
-                    cdb[0]              = GPCMD_PLAY_AUDIO_TRACK_INDEX;
-                    dev->current_cdb[0] = cdb[0];
-                    goto begin;
-                    break;
-                case CDROM_TYPE_DEC_RRD45_0436:
-                case CDROM_TYPE_SONY_CDU541_10i:
-                case CDROM_TYPE_SONY_CDU561_18k:
-                case CDROM_TYPE_SONY_CDU76S_100:
-                case CDROM_TYPE_TEXEL_DMXX24_100: /*GPCMD_PLAY_AUDIO_SONY*/
-                    cdb[0] = GPCMD_PLAY_AUDIO_10;
-                    dev->current_cdb[0] = cdb[0];
-                    dev->sony_vendor    = 1;
-                    goto begin;
-                    break;
-                case CDROM_TYPE_PIONEER_DRM604X_2403: /*GPCMD_AUDIO_TRACK_SEARCH_PIONEER*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    if ((dev->drv->host_drive < 1) || (dev->drv->cd_status <= CD_STATUS_DATA_ONLY)) {
-                        scsi_cdrom_illegal_mode(dev);
-                        break;
-                    }
-                    pos                = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
-                    ret                = cdrom_audio_track_search_pioneer(dev->drv, pos, cdb[1] & 1);
-                    dev->drv->audio_op = (cdb[1] & 1) ? 0x03 : 0x02;
-
-                    if (ret)
-                        scsi_cdrom_command_complete(dev);
-                    else
-                        scsi_cdrom_illegal_mode(dev);
-                    break;
-                default:
-                    scsi_cdrom_illegal_opcode(dev);
-                    break;
-            }
-            break;
-
-        case 0xC9:
-            switch (dev->drv->type) {
-                case CDROM_TYPE_MATSHITA_501_10b: /*GPCMD_PLAY_AUDIO_TRACK_RELATIVE_10_MATSUSHITA*/
-                    cdb[0]              = GPCMD_PLAY_AUDIO_TRACK_RELATIVE_10;
-                    dev->current_cdb[0] = cdb[0];
-                    goto begin;
-                    break;
-                case CDROM_TYPE_DEC_RRD45_0436:
-                case CDROM_TYPE_SONY_CDU541_10i:
-                case CDROM_TYPE_SONY_CDU561_18k:
-                case CDROM_TYPE_SONY_CDU76S_100:
-                case CDROM_TYPE_TEXEL_DMXX24_100: /*GPCMD_PLAYBACK_CONTROL_SONY*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_OUT);
-                    dev->sony_vendor = 1;
-
-                    len = (cdb[7] << 8) | cdb[8];
-                    if (!len) {
-                        scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                        scsi_cdrom_log("CD-ROM %i: PlayBack Control Sony All done - callback set\n", dev->id);
-                        dev->packet_status = PHASE_COMPLETE;
-                        dev->callback      = 20.0 * CDROM_TIME;
-                        scsi_cdrom_set_callback(dev);
-                        break;
-                    }
-                    scsi_cdrom_buf_alloc(dev, 65536);
-
-                    scsi_cdrom_set_buf_len(dev, BufLen, &len);
-                    scsi_cdrom_data_command_finish(dev, len, len, len, 1);
-                    break;
-                case CDROM_TYPE_PIONEER_DRM604X_2403: /*GPCMD_PLAY_AUDIO_PIONEER*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    if ((dev->drv->host_drive < 1) || (dev->drv->cd_status <= CD_STATUS_DATA_ONLY)) {
-                        scsi_cdrom_illegal_mode(dev);
-                        break;
-                    }
-                    pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
-                    ret = cdrom_audio_play_pioneer(dev->drv, pos);
-
-                    if (ret)
-                        scsi_cdrom_command_complete(dev);
-                    else
-                        scsi_cdrom_illegal_mode(dev);
-                    break;
-                default:
-                    scsi_cdrom_illegal_opcode(dev);
-                    break;
-            }
-            break;
-
-        case 0xCA:
-            if (dev->drv->type == CDROM_TYPE_PIONEER_DRM604X_2403) { /*GPCMD_PAUSE_PIONEER*/
-                scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                cdrom_audio_pause_resume(dev->drv, !(cdb[1] & 0x10));
-                scsi_cdrom_command_complete(dev);
-            } else {
-                scsi_cdrom_illegal_opcode(dev);
-            }
-            break;
-
-        case 0xCB:
-            switch (dev->drv->type) {
-                case CDROM_TYPE_MATSHITA_501_10b: /*GPCMD_PAUSE_RESUME_MATSUSHITA*/
-                    cdb[0]              = GPCMD_PAUSE_RESUME;
-                    dev->current_cdb[0] = cdb[0];
-                    goto begin;
-                    break;
-                case CDROM_TYPE_PIONEER_DRM604X_2403: /*GPCMD_STOP_PIONEER*/
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    scsi_cdrom_stop(sc);
-                    scsi_cdrom_command_complete(dev);
-                    break;
-                default:
-                    scsi_cdrom_illegal_opcode(dev);
-                    break;
-            }
-            break;
-
-        case 0xCC:
-            if (dev->drv->type == CDROM_TYPE_PIONEER_DRM604X_2403) { /*GPCMD_PLAYBACK_STATUS_PIONEER*/
-                scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
-
-                max_len = cdb[7];
-                max_len <<= 8;
-                max_len |= cdb[8];
-
-                scsi_cdrom_buf_alloc(dev, 6);
-
-                len = 6;
-
-                memset(dev->buffer, 0, 6);
-                dev->buffer[0] = cdrom_get_audio_status_pioneer(dev->drv, &dev->buffer[1]); /*Audio status*/
-
-                scsi_cdrom_log("Audio Status = %02x\n", dev->buffer[4]);
-
-                len = MIN(len, max_len);
-                scsi_cdrom_set_buf_len(dev, BufLen, &len);
-
-                scsi_cdrom_data_command_finish(dev, len, len, len, 0);
-            } else {
-                scsi_cdrom_illegal_opcode(dev);
-            }
-            break;
-
-        case 0xE0:
-            if (dev->drv->type == CDROM_TYPE_PIONEER_DRM604X_2403) { /*GPCMD_DRIVE_STATUS_PIONEER*/
-                scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
-
-                len = (cdb[9] | (cdb[8] << 8));
-                scsi_cdrom_buf_alloc(dev, 65536);
-
-                if (!(scsi_cdrom_drive_status_page_flags & (1LL << (uint64_t) (cdb[2] & 0x3f)))) {
-                    scsi_cdrom_invalid_field(dev);
-                    scsi_cdrom_buf_free(dev);
-                    return;
-                }
-
-                if (!len) {
-                    scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
-                    scsi_cdrom_log("CD-ROM %i: Drive Status All done - callback set\n", dev->id);
-                    dev->packet_status = PHASE_COMPLETE;
-                    dev->callback      = 20.0 * CDROM_TIME;
-                    scsi_cdrom_set_callback(dev);
-                    break;
-                }
-
-                memset(dev->buffer, 0, len);
-                alloc_length = len;
-
-                len = scsi_cdrom_drive_status(dev, dev->buffer, 0, cdb[2]);
-                len = MIN(len, alloc_length);
-
-                scsi_cdrom_set_buf_len(dev, BufLen, &len);
-
-                scsi_cdrom_log("CD-ROM %i: Reading drive status page: %02X...\n", dev->id, cdb[2]);
-
-                scsi_cdrom_data_command_finish(dev, len, len, alloc_length, 0);
-                return;
-            } else {
-                scsi_cdrom_illegal_opcode(dev);
-            }
-            break;
-
-        case 0xE5:
-            if (dev->drv->type == CDROM_TYPE_MATSHITA_501_10b) { /*GPCMD_PLAY_AUDIO_12_MATSUSHITA*/
-                cdb[0]              = GPCMD_PLAY_AUDIO_12;
-                dev->current_cdb[0] = cdb[0];
-                goto begin;
-            } else {
-                scsi_cdrom_illegal_opcode(dev);
-            }
-            break;
-
-        case 0xE9:
-            if (dev->drv->type == CDROM_TYPE_MATSHITA_501_10b) { /*GPCMD_PLAY_AUDIO_TRACK_RELATIVE_12_MATSUSHITA*/
-                cdb[0]              = GPCMD_PLAY_AUDIO_TRACK_RELATIVE_12;
-                dev->current_cdb[0] = cdb[0];
-                goto begin;
-            }
-            fallthrough;
         default:
-            scsi_cdrom_illegal_opcode(dev);
+            scsi_cdrom_illegal_opcode(dev, dev->current_cdb[0]);
             break;
     }
 
-    /* scsi_cdrom_log("CD-ROM %i: Phase: %02X, request length: %i\n", dev->tf->phase,
+    /* scsi_cdrom_log(dev->log, "Phase: %02X, request length: %i\n", dev->tf->phase,
                       dev->tf->request_length); */
 
     if ((dev->packet_status == PHASE_COMPLETE) || (dev->packet_status == PHASE_ERROR))
@@ -3785,15 +3627,14 @@ scsi_cdrom_phase_data_out(scsi_common_t *sc)
     uint16_t      block_desc_len;
     uint16_t      pos;
     uint16_t      param_list_len;
-    uint16_t      i = 0;
-
-    uint8_t error = 0;
-    uint8_t page;
-    uint8_t page_len;
-    uint8_t hdr_len;
-    uint8_t val;
-    uint8_t old_val;
-    uint8_t ch;
+    uint16_t      i;
+    uint8_t       error          = 0;
+    uint8_t       page;
+    uint8_t       page_len;
+    uint8_t       hdr_len;
+    uint8_t       val;
+    uint8_t       old_val;
+    uint8_t       ch;
 
     switch (dev->current_cdb[0]) {
         case GPCMD_MODE_SELECT_6:
@@ -3813,6 +3654,8 @@ scsi_cdrom_phase_data_out(scsi_common_t *sc)
                     block_desc_len = dev->buffer[2];
                     block_desc_len <<= 8;
                     block_desc_len |= dev->buffer[3];
+                    scsi_cdrom_log(dev->log, "BlockDescLen (6): %d, "
+                                   "ParamListLen (6): %d\n", block_desc_len, param_list_len);
                 } else {
                     block_desc_len = dev->buffer[6];
                     block_desc_len <<= 8;
@@ -3821,11 +3664,31 @@ scsi_cdrom_phase_data_out(scsi_common_t *sc)
             } else
                 block_desc_len = 0;
 
+            if (block_desc_len >= 8) {
+                pos = hdr_len + 5;
+
+                dev->drv->sector_size = (dev->drv->sector_size & 0x0000ffff) |
+                                        (dev->buffer[pos++] << 16);
+                dev->drv->sector_size = (dev->drv->sector_size & 0x00ff00ff) |
+                                        (dev->buffer[pos++] << 8);
+                dev->drv->sector_size = (dev->drv->sector_size & 0x00ffff00) |
+                                        (dev->buffer[pos]);
+                scsi_cdrom_log(dev->log, "Sector size now %i bytes\n",
+                               dev->drv->sector_size);
+
+                error |= scsi_cdrom_update_sector_flags(dev);
+            }
+
             pos = hdr_len + block_desc_len;
 
-            while (1) {
+#ifdef ENABLE_SCSI_CDROM_LOG
+            for (uint16_t j = 0; j < pos; j++)
+                scsi_cdrom_log(dev->log, "Buffer Mode Select, pos=%d, data=%02x.\n",
+                               j, dev->buffer[j]);
+#endif
+            if (!error)  while (1) {
                 if (pos >= param_list_len) {
-                    scsi_cdrom_log("CD-ROM %i: Buffer has only block descriptor\n", dev->id);
+                    scsi_cdrom_log(dev->log, "Buffer has only block descriptor\n");
                     break;
                 }
 
@@ -3834,70 +3697,50 @@ scsi_cdrom_phase_data_out(scsi_common_t *sc)
 
                 pos += 2;
 
-                switch (dev->drv->type) {
-                    case CDROM_TYPE_DEC_RRD45_0436:
-                    case CDROM_TYPE_SONY_CDU541_10i:
-                    case CDROM_TYPE_SONY_CDU561_18k:
-                    case CDROM_TYPE_SONY_CDU76S_100:
-                    case CDROM_TYPE_TEXEL_DMXX24_100:
-                        if (!(scsi_cdrom_mode_sense_page_flags_sony & (1LL << ((uint64_t) page)))) {
-                            scsi_cdrom_log("CD-ROM %i: Unimplemented page %02X\n", dev->id, page);
-                            error |= 1;
-                        } else {
-                            for (i = 0; i < page_len; i++) {
-                                ch      = scsi_cdrom_mode_sense_pages_changeable_sony.pages[page][i + 2];
-                                val     = dev->buffer[pos + i];
-                                old_val = dev->ms_pages_saved_sony.pages[page][i + 2];
-                                if (val != old_val) {
-                                    if (ch)
-                                        dev->ms_pages_saved_sony.pages[page][i + 2] = val;
-                                    else {
-                                        scsi_cdrom_log("CD-ROM %i: Unchangeable value on position %02X on page %02X\n", dev->id, i + 2, page);
-                                        error |= 1;
-                                    }
-                                }
-                            }
-                        }
-                        break;
-                    default:
-                        if (!(scsi_cdrom_mode_sense_page_flags & (1LL << ((uint64_t) page)))) {
-                            scsi_cdrom_log("CD-ROM %i: Unimplemented page %02X\n", dev->id, page);
-                            error |= 1;
-                        } else {
-                            for (i = 0; i < page_len; i++) {
-                                ch      = scsi_cdrom_mode_sense_pages_changeable.pages[page][i + 2];
-                                val     = dev->buffer[pos + i];
-                                old_val = dev->ms_pages_saved.pages[page][i + 2];
-                                if (val != old_val) {
-                                    if (ch)
-                                        dev->ms_pages_saved.pages[page][i + 2] = val;
-                                    else {
-                                        scsi_cdrom_log("CD-ROM %i: Unchangeable value on position %02X on page %02X\n", dev->id, i + 2, page);
-                                        error |= 1;
-                                    }
-                                }
+                /* Ignore any page codes with zero length. */
+                if (page_len == 0)
+                    continue;
+
+                if (dev->drv->is_sony && (page == 0x08) && (page_len == 0x02))
+                    dev->drv->sony_msf = dev->buffer[pos] & 0x01;
+
+                if (!(dev->ms_page_flags & (1LL << ((uint64_t) page)))) {
+                    scsi_cdrom_log(dev->log, "Unimplemented page %02X\n", page);
+                    error |= 1;
+                    break;
+                } else {
+                    for (i = 0; i < page_len; i++) {
+                        uint8_t pg = page;
+
+                        if (dev->drv->is_sony &&
+                            (page == GPMODE_CDROM_AUDIO_PAGE_SONY) &&
+                            (i >= 6) && (i <= 13))
+                            pg = GPMODE_CDROM_AUDIO_PAGE;
+
+                        ch      = dev->ms_pages_changeable.pages[pg][i + 2];
+                        val     = dev->buffer[pos + i];
+                        old_val = dev->ms_pages_saved.pages[pg][i + 2];
+                        if (val != old_val) {
+                            if (ch)
+                                dev->ms_pages_saved.pages[pg][i + 2] = val;
+                            else {
+                                scsi_cdrom_log(dev->log, "Unchangeable value on position "
+                                               "%02X on page %02X\n", i + 2, page);
+                                scsi_cdrom_invalid_field_pl(dev, val);
+                                error |= 1;
+                                break;
                             }
                         }
+                    }
+
+                    if (error)
                         break;
                 }
 
                 pos += page_len;
 
-                switch (dev->drv->type) {
-                    case CDROM_TYPE_DEC_RRD45_0436:
-                    case CDROM_TYPE_SONY_CDU541_10i:
-                    case CDROM_TYPE_SONY_CDU561_18k:
-                    case CDROM_TYPE_SONY_CDU76S_100:
-                    case CDROM_TYPE_TEXEL_DMXX24_100:
-                        val = scsi_cdrom_mode_sense_pages_default_sony_scsi.pages[page][0] & 0x80;
-                        break;
-                    default:
-                        if (dev->drv->bus_type == CDROM_BUS_SCSI)
-                            val = scsi_cdrom_mode_sense_pages_default_scsi.pages[page][0] & 0x80;
-                        else
-                            val = scsi_cdrom_mode_sense_pages_default.pages[page][0] & 0x80;
-                        break;
-                }
+                val = dev->ms_pages_default.pages[page][0] & 0x80;
+
                 if (dev->do_page_save && val)
                     scsi_cdrom_mode_sense_save(dev);
 
@@ -3906,24 +3749,21 @@ scsi_cdrom_phase_data_out(scsi_common_t *sc)
             }
 
             if (error) {
-                scsi_cdrom_invalid_field_pl(dev);
                 scsi_cdrom_buf_free(dev);
+                scsi_cdrom_command_stop((scsi_common_t *) dev);
                 return 0;
             }
             break;
-        case 0xC9:
-            switch (dev->drv->type) {
-                case CDROM_TYPE_DEC_RRD45_0436:
-                case CDROM_TYPE_SONY_CDU541_10i:
-                case CDROM_TYPE_SONY_CDU561_18k:
-                case CDROM_TYPE_SONY_CDU76S_100:
-                case CDROM_TYPE_TEXEL_DMXX24_100:
-                    for (i = 0; i < 18; i++) {
-                        dev->ms_pages_saved_sony.pages[GPMODE_CDROM_AUDIO_PAGE_SONY][i] = dev->buffer[i];
-                    }
-                    break;
-                default:
-                    break;
+        case 0xc9:
+            if (dev->drv->is_sony) {
+                for (i = 0; i < 18; i++) {
+                    if ((i >= 8) && (i <= 15))
+                        dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE][i] =
+                            dev->buffer[i];
+                    else
+                        dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE_SONY][i] =
+                            dev->buffer[i];
+                }
             }
             break;
 
@@ -3940,30 +3780,31 @@ scsi_cdrom_close(void *priv)
 {
     scsi_cdrom_t *dev = (scsi_cdrom_t *) priv;
 
-    if (dev->tf)
-        free(dev->tf);
+    if (dev != NULL) {
+        if (dev->tf != NULL)
+            free(dev->tf);
+
+        if (dev->log != NULL) {
+            scsi_cdrom_log(dev->log, "Log closed\n");
+
+            log_close(dev->log);
+            dev->log = NULL;
+        }
 
-    if (dev)
         free(dev);
+    }
 }
 
 static int
-scsi_cdrom_get_max(int ide_has_dma, int type)
+scsi_cdrom_get_max(const ide_t *ide, UNUSED(const int ide_has_dma), const int type)
 {
-    int ret;
+    const scsi_cdrom_t *dev         = (scsi_cdrom_t *) ide->sc;
+    int                 ret;
 
     switch (type) {
-        case TYPE_PIO:
-            ret = ide_has_dma ? 4 : 0;
-            break;
-        case TYPE_SDMA:
-            ret = ide_has_dma ? 2 : -1;
-            break;
-        case TYPE_MDMA:
-            ret = ide_has_dma ? 2 : -1;
-            break;
-        case TYPE_UDMA:
-            ret = ide_has_dma ? 5 : -1;
+        case TYPE_PIO:  case TYPE_SDMA:
+        case TYPE_MDMA: case TYPE_UDMA:
+            ret = cdrom_get_transfer_max(dev->drv->type, type);
             break;
         default:
             ret = -1;
@@ -3974,19 +3815,33 @@ scsi_cdrom_get_max(int ide_has_dma, int type)
 }
 
 static int
-scsi_cdrom_get_timings(int ide_has_dma, int type)
+scsi_cdrom_get_timings(const ide_t *ide, UNUSED(const int ide_has_dma), const int type)
 {
-    int ret;
+    const scsi_cdrom_t *dev             = (scsi_cdrom_t *) ide->sc;
+    int                 has_dma         = cdrom_has_dma(dev->drv->type);
+    int                 pio_cyc_time[5] = { 600, 383, 240, 180, 120 };
+    int                 max_pio         = cdrom_get_transfer_max(dev->drv->type, TYPE_PIO);
+    int                 ret;
 
     switch (type) {
         case TIMINGS_DMA:
-            ret = ide_has_dma ? 120 : 0;
+            ret = has_dma ? 120 : 0;
             break;
         case TIMINGS_PIO:
-            ret = ide_has_dma ? 120 : 0;
+            if (max_pio <= 0)
+                ret = 600;
+            else if (max_pio == 1)
+                ret = 383;
+            else
+                ret = 240;
             break;
         case TIMINGS_PIO_FC:
-            ret = 0;
+            if (max_pio > 4)
+                ret = 120;
+            else if (max_pio < 0)
+                ret = 600;
+            else
+                ret = pio_cyc_time[max_pio];
             break;
         default:
             ret = 0;
@@ -4000,114 +3855,29 @@ scsi_cdrom_get_timings(int ide_has_dma, int type)
  * Fill in ide->buffer with the output of the "IDENTIFY PACKET DEVICE" command
  */
 static void
-scsi_cdrom_identify(ide_t *ide, int ide_has_dma)
+scsi_cdrom_identify(const ide_t *ide, UNUSED(const int ide_has_dma))
 {
-    const scsi_cdrom_t *dev;
-    char          device_identify[9] = { '8', '6', 'B', '_', 'C', 'D', '0', '0', 0 };
+    const scsi_cdrom_t *dev         = (scsi_cdrom_t *) ide->sc;
+    char                model[2048] = { 0 };
+    const int           has_dma     = cdrom_has_dma(dev->drv->type);
 
-    dev = (scsi_cdrom_t *) ide->sc;
+    cdrom_get_identify_model(dev->drv->type, model, dev->id);
 
-    device_identify[7] = dev->id + 0x30;
-    scsi_cdrom_log("ATAPI Identify: %s\n", device_identify);
+    scsi_cdrom_log(dev->log, "ATAPI Identify: %s\n", model);
 
-    if ((dev->drv->type == CDROM_TYPE_NEC_260_100) || (dev->drv->type == CDROM_TYPE_NEC_260_101)) /*NEC only*/
+    if (dev->drv->is_early)
         ide->buffer[0] = 0x8000 | (5 << 8) | 0x80 | (1 << 5); /* ATAPI device, CD-ROM drive, removable media, interrupt DRQ */
     else
         ide->buffer[0] = 0x8000 | (5 << 8) | 0x80 | (2 << 5); /* ATAPI device, CD-ROM drive, removable media, accelerated DRQ */
-    ide_padstr((char *) (ide->buffer + 10), "", 20);          /* Serial Number */
+    ide_padstr((char *) (ide->buffer + 10), "", 20);                                   /* Serial Number */
 
-    if (dev->drv->type == CDROM_TYPE_86BOX_100) {
-        ide_padstr((char *) (ide->buffer + 23), EMU_VERSION_EX, 8);   /* Firmware */
-        ide_padstr((char *) (ide->buffer + 27), device_identify, 40); /* Model */
-    } else {
-        switch (dev->drv->type) {
-            case CDROM_TYPE_AZT_CDA46802I_115:
-                ide_padstr((char *) (ide->buffer + 23), "1.15    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "AZT CDA46802I                           ", 40); /* Model */
-                break;
-            case CDROM_TYPE_BTC_BCD36XH_U10:
-                ide_padstr((char *) (ide->buffer + 23), "U1.0    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "BTC CD-ROM BCD36XH                      ", 40); /* Model */
-                break;
-            case CDROM_TYPE_GOLDSTAR_CRD_8160B_314:
-                ide_padstr((char *) (ide->buffer + 23), "3.14    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "GOLDSTAR CRD-8160B                      ", 40); /* Model */
-                break;
-            case CDROM_TYPE_HITACHI_CDR_8130_0020:
-                ide_padstr((char *) (ide->buffer + 23), "0020    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "HITACHI CDR-8130                        ", 40); /* Model */
-                break;
-            case CDROM_TYPE_KENWOOD_UCR_421_208E:
-                ide_padstr((char *) (ide->buffer + 23), "208E    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "KENWOOD CD-ROM UCR-421                  ", 40); /* Model */
-                break;
-            case CDROM_TYPE_MATSHITA_587_7S13:
-                ide_padstr((char *) (ide->buffer + 23), "7S13    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "MATSHITA CD-ROM CR-587                  ", 40); /* Model */
-                break;
-            case CDROM_TYPE_MATSHITA_588_LS15:
-                ide_padstr((char *) (ide->buffer + 23), "LS15    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "MATSHITA CD-ROM CR-588                  ", 40); /* Model */
-                break;
-            case CDROM_TYPE_MATSHITA_571_10e:
-                ide_padstr((char *) (ide->buffer + 23), "1.0e    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "MATSHITA CR-571                         ", 40); /* Model */
-                break;
-            case CDROM_TYPE_MATSHITA_572_10j:
-                ide_padstr((char *) (ide->buffer + 23), "1.0j    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "MATSHITA CR-572                         ", 40); /* Model */
-                break;
-            case CDROM_TYPE_MITSUMI_FX4820T_D02A:
-                ide_padstr((char *) (ide->buffer + 23), "D02A    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "MITSUMI CRMC-FX4820T                    ", 40); /* Model */
-                break;
-            case CDROM_TYPE_NEC_260_100:
-                ide_padstr((char *) (ide->buffer + 23), ".100    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "EN C                DCR-MOD IREV2:06    ", 40); /* Model */
-                break;
-            case CDROM_TYPE_NEC_260_101:
-                ide_padstr((char *) (ide->buffer + 23), ".110    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "EN C                DCR-MOD IREV2:06    ", 40); /* Model */
-                break;
-            case CDROM_TYPE_NEC_273_420:
-                ide_padstr((char *) (ide->buffer + 23), "4.20    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "NEC                 CD-ROM DRIVE:273    ", 40); /* Model */
-                break;
-            case CDROM_TYPE_NEC_280_105:
-                ide_padstr((char *) (ide->buffer + 23), "1.05    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "NEC                 CD-ROM DRIVE:280    ", 40); /* Model */
-                break;
-            case CDROM_TYPE_NEC_280_308:
-                ide_padstr((char *) (ide->buffer + 23), "3.08    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "NEC                 CD-ROM DRIVE:280    ", 40); /* Model */
-                break;
-            case CDROM_TYPE_PHILIPS_PCA403CD_U31P:
-                ide_padstr((char *) (ide->buffer + 23), "U31P    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "PHILIPS CD-ROM PCA403CD                 ", 40); /* Model */
-                break;
-            case CDROM_TYPE_SONY_CDU76_10i:
-                ide_padstr((char *) (ide->buffer + 23), "1.0i    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "SONY CD-ROM CDU76                       ", 40); /* Model */
-                break;
-            case CDROM_TYPE_SONY_CDU311_30h:
-                ide_padstr((char *) (ide->buffer + 23), "3.0h    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "SONY CD-ROM CDU311                      ", 40); /* Model */
-                break;
-            case CDROM_TYPE_TOSHIBA_5302TA_0305:
-                ide_padstr((char *) (ide->buffer + 23), "0305    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "TOSHIBA CD-ROM XM-5302TA                ", 40); /* Model */
-                break;
-            case CDROM_TYPE_TOSHIBA_5702B_TA70:
-                ide_padstr((char *) (ide->buffer + 23), "TA70    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "TOSHIBA CD-ROM XM-5702B                 ", 40); /* Model */
-                break;
-        }
-    }
+    ide_padstr((char *) (ide->buffer + 23), cdrom_get_revision(dev->drv->type), 8);    /* Firmware */
+    ide_padstr((char *) (ide->buffer + 27), model, 40);                                /* Model */
 
     ide->buffer[49]  = 0x200;  /* LBA supported */
     ide->buffer[126] = 0xfffe; /* Interpret zero byte count limit as maximum length */
 
-    if (ide_has_dma) {
+    if (has_dma) {
         ide->buffer[71] = 30;
         ide->buffer[72] = 30;
         ide->buffer[80] = 0x7e; /*ATA-1 to ATA-6 supported*/
@@ -4116,14 +3886,11 @@ scsi_cdrom_identify(ide_t *ide, int ide_has_dma)
 }
 
 void
-scsi_cdrom_drive_reset(int c)
+scsi_cdrom_drive_reset(const int c)
 {
     cdrom_t       *drv = &cdrom[c];
-    scsi_cdrom_t  *dev;
-    scsi_device_t *sd;
-    ide_t         *id;
-    uint8_t        scsi_bus = (drv->scsi_device_id >> 4) & 0x0f;
-    uint8_t        scsi_id  = drv->scsi_device_id & 0x0f;
+    const uint8_t  scsi_bus = (drv->scsi_device_id >> 4) & 0x0f;
+    const uint8_t  scsi_id  = drv->scsi_device_id & 0x0f;
     uint8_t        valid = 0;
 
     if (drv->bus_type == CDROM_BUS_SCSI) {
@@ -4140,70 +3907,130 @@ scsi_cdrom_drive_reset(int c)
     if ((drv->bus_type == CDROM_BUS_ATAPI) && (drv->ide_channel > 7))
         return;
 
-    if (!drv->priv) {
-        drv->priv = (scsi_cdrom_t *) malloc(sizeof(scsi_cdrom_t));
-        memset(drv->priv, 0, sizeof(scsi_cdrom_t));
+    if (drv->priv == NULL) {
+        drv->priv          = (scsi_cdrom_t *) calloc(1, sizeof(scsi_cdrom_t));
+        scsi_cdrom_t  *dev = (scsi_cdrom_t *) drv->priv;
+
+        char n[1024]       = { 0 };
+
+        sprintf(n, "CD-ROM %i SCSI ", c + 1);
+        dev->log = log_open(n);
     }
 
-    dev = (scsi_cdrom_t *) drv->priv;
+    scsi_cdrom_t  *dev = (scsi_cdrom_t *) drv->priv;
 
     dev->id  = c;
     dev->drv = drv;
 
-    dev->cur_lun = SCSI_LUN_USE_CDB;
+    dev->cur_lun       = SCSI_LUN_USE_CDB;
 
-    drv->insert      = scsi_cdrom_insert;
-    drv->get_volume  = scsi_cdrom_get_volume;
-    drv->get_channel = scsi_cdrom_get_channel;
-    drv->close       = scsi_cdrom_close;
+    dev->toc_cached    = 0;
+    drv->cached_sector = -1;
+
+    drv->insert        = scsi_cdrom_insert;
+    drv->get_volume    = scsi_cdrom_get_volume;
+    drv->get_channel   = scsi_cdrom_get_channel;
+    drv->close         = scsi_cdrom_close;
+
+    drv->sector_size = 2048;
+    (void) scsi_cdrom_update_sector_flags(dev);
 
     if (drv->bus_type == CDROM_BUS_SCSI) {
-        valid = 1;
+        char *vendor               = cdrom_get_vendor(dev->drv->type);
 
-        if (!dev->tf)
-            dev->tf        = (ide_tf_t *) calloc(1, sizeof(ide_tf_t));
+        dev->ven_cmd               = NULL;
+        memset(dev->ven_cmd_is_data, 0x00, sizeof(dev->ven_cmd_is_data));
+        dev->use_cdb_9             = 0;
+        dev->ms_page_flags         = scsi_cdrom_ms_page_flags_scsi;
+        dev->ms_pages_default      = scsi_cdrom_ms_pages_default_scsi;
+        dev->ms_pages_changeable   = scsi_cdrom_ms_pages_changeable_scsi;
+
+        if (dev->drv->is_chinon)
+            dev->ven_cmd               = scsi_cdrom_command_chinon;
+        else if (dev->drv->is_sony) {
+            dev->ven_cmd               = scsi_cdrom_command_dec_sony_texel;
+            dev->ven_cmd_is_data[0xc0] = 1;
+            dev->ven_cmd_is_data[0xc1] = 1;
+            dev->ven_cmd_is_data[0xc2] = 1;
+            dev->ven_cmd_is_data[0xc3] = 1;
+            dev->ms_page_flags         = scsi_cdrom_ms_page_flags_sony_scsi;
+            dev->ms_pages_default      = scsi_cdrom_ms_pages_default_sony_scsi;
+            dev->ms_pages_changeable   = scsi_cdrom_ms_pages_changeable_sony_scsi;
+        } else if (!strcmp(vendor, "MATSHITA"))
+            dev->ven_cmd               = scsi_cdrom_command_matsushita;
+        else if (!strcmp(vendor, "NEC")) {
+            dev->ven_cmd               = scsi_cdrom_command_nec;
+            dev->ven_cmd_is_data[0xdd] = 1;
+            dev->ven_cmd_is_data[0xde] = 1;
+        } else if (dev->drv->is_pioneer) {
+            dev->ven_cmd               = scsi_cdrom_command_pioneer;
+            dev->ven_cmd_is_data[0xc1] = 1;
+            dev->ven_cmd_is_data[0xc2] = 1;
+            dev->ven_cmd_is_data[0xc3] = 1;
+        } else if (dev->drv->is_toshiba) {
+            dev->ven_cmd               = scsi_cdrom_command_toshiba;
+            dev->ven_cmd_is_data[0xc6] = 1;
+            dev->ven_cmd_is_data[0xc7] = 1;
+            dev->use_cdb_9             = 1;
+        }
+
+        if (dev->tf == NULL)
+            dev->tf                  = (ide_tf_t *) calloc(1, sizeof(ide_tf_t));
 
         /* SCSI CD-ROM, attach to the SCSI bus. */
-        sd = &scsi_devices[scsi_bus][scsi_id];
+        scsi_device_t *sd        = &scsi_devices[scsi_bus][scsi_id];
 
-        sd->sc             = (scsi_common_t *) dev;
-        sd->command        = scsi_cdrom_command;
-        sd->request_sense  = scsi_cdrom_request_sense_for_scsi;
-        sd->reset          = scsi_cdrom_reset;
-        sd->phase_data_out = scsi_cdrom_phase_data_out;
-        sd->command_stop   = scsi_cdrom_command_stop;
-        sd->type           = SCSI_REMOVABLE_CDROM;
+        sd->sc                   = (scsi_common_t *) dev;
+        sd->command              = scsi_cdrom_command;
+        sd->request_sense        = scsi_cdrom_request_sense_for_scsi;
+        sd->reset                = scsi_cdrom_reset;
+        sd->phase_data_out       = scsi_cdrom_phase_data_out;
+        sd->command_stop         = scsi_cdrom_command_stop;
+        sd->type                 = SCSI_REMOVABLE_CDROM;
 
-        scsi_cdrom_log("SCSI CD-ROM drive %i attached to SCSI ID %i\n", c, cdrom[c].scsi_device_id);
+        valid                    = 1;
+
+        scsi_cdrom_log(dev->log, "SCSI CD-ROM drive %i attached to SCSI ID %i\n",
+                       c, cdrom[c].scsi_device_id);
     } else if (drv->bus_type == CDROM_BUS_ATAPI) {
         /* ATAPI CD-ROM, attach to the IDE bus. */
-        id = ide_get_drive(drv->ide_channel);
-        /* If the IDE channel is initialized, we attach to it,
-           otherwise, we do nothing - it's going to be a drive
-           that's not attached to anything. */
-        if (id) {
-            valid = 1;
+        ide_t *id = ide_get_drive(drv->ide_channel);
 
-            id->sc               = (scsi_common_t *) dev;
-            dev->tf              = id->tf;
-            if ((dev->drv->type == CDROM_TYPE_NEC_260_100) || (dev->drv->type == CDROM_TYPE_NEC_260_101))
-                IDE_ATAPI_IS_EARLY   = 1;
-            id->get_max          = scsi_cdrom_get_max;
-            id->get_timings      = scsi_cdrom_get_timings;
-            id->identify         = scsi_cdrom_identify;
-            id->stop             = scsi_cdrom_stop;
-            id->packet_command   = scsi_cdrom_command;
-            id->device_reset     = scsi_cdrom_reset;
-            id->phase_data_out   = scsi_cdrom_phase_data_out;
-            id->command_stop     = scsi_cdrom_command_stop;
-            id->bus_master_error = scsi_cdrom_bus_master_error;
-            id->interrupt_drq    = ((dev->drv->type == CDROM_TYPE_NEC_260_100) ||
-                                    (dev->drv->type == CDROM_TYPE_NEC_260_101));
+        /*
+           If the IDE channel is initialized, we attach to it, otherwise, we do
+           nothing - it's going to be a drive that's not attached to anything.
+         */
+        if (id) {
+            dev->ven_cmd               = NULL;
+            memset(dev->ven_cmd_is_data, 0x00, sizeof(dev->ven_cmd_is_data));
+            dev->use_cdb_9             = 0;
+            dev->ms_page_flags         = scsi_cdrom_ms_page_flags;
+            dev->ms_pages_default      = scsi_cdrom_ms_pages_default;
+            dev->ms_pages_changeable   = scsi_cdrom_ms_pages_changeable;
+
+            id->sc                     = (scsi_common_t *) dev;
+            dev->tf                    = id->tf;
+            IDE_ATAPI_IS_EARLY         = dev->drv->is_early;
+            id->get_max                = scsi_cdrom_get_max;
+            id->get_timings            = scsi_cdrom_get_timings;
+            id->identify               = scsi_cdrom_identify;
+            id->stop                   = scsi_cdrom_stop;
+            id->packet_command         = scsi_cdrom_command;
+            id->device_reset           = scsi_cdrom_reset;
+            id->phase_data_out         = scsi_cdrom_phase_data_out;
+            id->command_stop           = scsi_cdrom_command_stop;
+            id->bus_master_error       = scsi_cdrom_bus_master_error;
+            id->read                   = scsi_cdrom_read;
+            id->write                  = NULL;
+            id->interrupt_drq          = dev->drv->is_early;
+
+            valid = 1;
 
             ide_atapi_attach(id);
         }
 
-        scsi_cdrom_log("ATAPI CD-ROM drive %i attached to IDE channel %i\n", c, cdrom[c].ide_channel);
+        scsi_cdrom_log(dev->log, "ATAPI CD-ROM drive %i attached to IDE channel %i\n",
+                       c, cdrom[c].ide_channel);
     }
 
     if (valid)
diff --git a/src/scsi/scsi_device.c b/src/scsi/scsi_device.c
index 4442b2680..33d3fa89a 100644
--- a/src/scsi/scsi_device.c
+++ b/src/scsi/scsi_device.c
@@ -16,10 +16,14 @@
  *          Copyright 2016-2018 Miran Grca.
  *          Copyright 2017-2018 Fred N. van Kempen.
  */
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
 #include <wchar.h>
+#define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/device.h>
 #include <86box/hdd.h>
@@ -29,9 +33,29 @@
 #include <86box/plat_unused.h>
 
 scsi_device_t scsi_devices[SCSI_BUS_MAX][SCSI_ID_MAX];
-
+int scsi_command_length[8] = { 6, 10, 10, 6, 16, 12, 10, 6 };
 uint8_t scsi_null_device_sense[18] = { 0x70, 0, SENSE_ILLEGAL_REQUEST, 0, 0, 0, 0, 0, 0, 0, 0, 0, ASC_INV_LUN, 0, 0, 0, 0, 0 };
 
+#define SET_BUS_STATE(scsi_bus, state) scsi_bus->bus_out = (scsi_bus->bus_out & ~(SCSI_PHASE_MESSAGE_IN)) | (state & (SCSI_PHASE_MESSAGE_IN))
+
+#ifdef ENABLE_SCSI_DEVICE_LOG
+int scsi_device_do_log = ENABLE_SCSI_DEVICE_LOG;
+
+static void
+scsi_device_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (scsi_device_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define scsi_device_log(fmt, ...)
+#endif
+
 static uint8_t
 scsi_device_target_command(scsi_device_t *dev, uint8_t *cdb)
 {
@@ -189,3 +213,311 @@ scsi_device_init(void)
         }
     }
 }
+
+int
+scsi_device_get_id(uint8_t data)
+{
+    for (uint8_t c = 0; c < SCSI_ID_MAX; c++) {
+        if (data & (1 << c))
+            return c;
+    }
+
+    return -1;
+}
+
+
+static int
+scsi_device_get_msg(uint8_t *msgp, int len)
+{
+    uint8_t msg = msgp[0];
+    if ((msg == 0) || ((msg >= 0x02) && (msg <= 0x1f)) || (msg >= 0x80))
+        return 1;
+
+    if ((msg >= 0x20) && (msg <= 0x2f))
+        return 2;
+
+    if (len < 2)
+        return 3;
+
+    return msgp[1];
+}
+
+int
+scsi_bus_read(scsi_bus_t *scsi_bus)
+{
+    scsi_device_t *dev;
+    int phase;
+
+    /*Wait processes to handle bus requests*/
+    if (scsi_bus->clear_req) {
+        scsi_bus->clear_req--;
+        if (!scsi_bus->clear_req) {
+            scsi_device_log("Prelude to command data\n");
+            SET_BUS_STATE(scsi_bus, scsi_bus->bus_phase);
+            scsi_bus->bus_out |= BUS_REQ;
+        }
+    }
+
+    if (scsi_bus->wait_data) {
+        scsi_bus->wait_data--;
+        if (!scsi_bus->wait_data) {
+            dev = &scsi_devices[scsi_bus->bus_device][scsi_bus->target_id];
+            SET_BUS_STATE(scsi_bus, scsi_bus->bus_phase);
+            phase = scsi_bus->bus_out & SCSI_PHASE_MESSAGE_IN;
+
+            switch (phase) {
+                case SCSI_PHASE_DATA_IN:
+                    scsi_device_log("DataIn.\n");
+                    scsi_bus->state = STATE_DATAIN;
+                    if ((dev->sc != NULL) && (dev->sc->temp_buffer != NULL))
+                        scsi_bus->data = dev->sc->temp_buffer[scsi_bus->data_pos++];
+
+                    scsi_bus->bus_out = (scsi_bus->bus_out & ~BUS_DATAMASK) | BUS_SETDATA(scsi_bus->data) | BUS_DBP;
+                    break;
+                case SCSI_PHASE_DATA_OUT:
+                    if (scsi_bus->bus_phase & BUS_IDLE) {
+                        scsi_device_log("Bus Idle.\n");
+                        scsi_bus->state = STATE_IDLE;
+                        scsi_bus->bus_out &= ~BUS_BSY;
+                        scsi_bus->timer(scsi_bus->priv, 0.0);
+                    } else {
+                        scsi_device_log("DataOut.\n");
+                        scsi_bus->state = STATE_DATAOUT;
+                    }
+                    break;
+                case SCSI_PHASE_STATUS:
+                    scsi_device_log("Status.\n");
+                    scsi_bus->bus_out |= BUS_REQ;
+                    scsi_bus->state = STATE_STATUS;
+                    scsi_bus->bus_out = (scsi_bus->bus_out & ~BUS_DATAMASK) | BUS_SETDATA(dev->status) | BUS_DBP;
+                    break;
+                case SCSI_PHASE_MESSAGE_IN:
+                    scsi_device_log("Message In.\n");
+                    scsi_bus->state = STATE_MESSAGEIN;
+                    scsi_bus->bus_out = (scsi_bus->bus_out & ~BUS_DATAMASK) | BUS_SETDATA(0) | BUS_DBP;
+                    break;
+                case SCSI_PHASE_MESSAGE_OUT:
+                    scsi_device_log("Message Out.\n");
+                    scsi_bus->bus_out |= BUS_REQ;
+                    scsi_bus->state = STATE_MESSAGEOUT;
+                    scsi_bus->bus_out = (scsi_bus->bus_out & ~BUS_DATAMASK) | BUS_SETDATA(scsi_bus->target_id >> 5) | BUS_DBP;
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+
+    if (scsi_bus->wait_complete) {
+        scsi_bus->wait_complete--;
+        if (!scsi_bus->wait_complete)
+            scsi_bus->bus_out |= BUS_REQ;
+    }
+
+    return scsi_bus->bus_out;
+}
+
+void
+scsi_bus_update(scsi_bus_t *scsi_bus, int bus)
+{
+    scsi_device_t *dev = &scsi_devices[scsi_bus->bus_device][scsi_bus->target_id];
+    double         p;
+    uint8_t        sel_data;
+    int            msglen;
+
+    /*Start the SCSI command layer, which will also make the timings*/
+    if (bus & BUS_ARB)
+        scsi_bus->state = STATE_IDLE;
+
+    scsi_device_log("State = %i\n", scsi_bus->state);
+
+    switch (scsi_bus->state) {
+        case STATE_IDLE:
+            scsi_bus->clear_req = scsi_bus->wait_data = scsi_bus->wait_complete = 0;
+            if ((bus & BUS_SEL) && !(bus & BUS_BSY)) {
+                sel_data = BUS_GETDATA(bus);
+
+                scsi_bus->target_id = scsi_device_get_id(sel_data);
+
+                /*Once the device has been found and selected, mark it as busy*/
+                if ((scsi_bus->target_id != (uint8_t) -1) && scsi_device_present(&scsi_devices[scsi_bus->bus_device][scsi_bus->target_id])) {
+                    scsi_bus->bus_out |= BUS_BSY;
+                    scsi_bus->state = STATE_SELECT;
+                    scsi_device_log("Select - target ID = %i, moving to state = %d.\n", scsi_bus->target_id, scsi_bus->state);
+                } else {
+                    scsi_device_log("Device not found at ID %i, Current Bus BSY=%02x\n", scsi_bus->target_id, scsi_bus->bus_out);
+                    scsi_bus->bus_out = 0;
+                }
+            }
+            break;
+        case STATE_SELECT:
+            if (!(bus & BUS_SEL)) {
+                if (!(bus & BUS_ATN)) {
+                    if ((scsi_bus->target_id != (uint8_t) -1) && scsi_device_present(&scsi_devices[scsi_bus->bus_device][scsi_bus->target_id])) {
+                        scsi_device_log("Device found at ID %i, Current Bus BSY=%02x\n", scsi_bus->target_id, scsi_bus->bus_out);
+                        scsi_bus->state   = STATE_COMMAND;
+                        scsi_bus->bus_out = BUS_BSY | BUS_REQ;
+                        scsi_bus->command_pos = 0;
+                        SET_BUS_STATE(scsi_bus, SCSI_PHASE_COMMAND);
+                    } else {
+                        scsi_device_log("Device not found at ID %i again.\n", scsi_bus->target_id);
+                        scsi_bus->state   = STATE_IDLE;
+                        scsi_bus->bus_out = 0;
+                    }
+                } else {
+                    scsi_device_log("Set to SCSI Message Out\n");
+                    scsi_bus->bus_phase  = SCSI_PHASE_MESSAGE_OUT;
+                    scsi_bus->wait_data  = 4;
+                    scsi_bus->msgout_pos = 0;
+                    scsi_bus->is_msgout  = 1;
+                }
+            }
+            break;
+        case STATE_COMMAND:
+            if ((bus & BUS_ACK) && !(scsi_bus->bus_in & BUS_ACK)) {
+                /*Write command byte to the output data register*/
+                scsi_bus->command[scsi_bus->command_pos++] = BUS_GETDATA(bus);
+                scsi_bus->clear_req                   = 3;
+                scsi_bus->bus_phase                   = scsi_bus->bus_out & SCSI_PHASE_MESSAGE_IN;
+                scsi_bus->bus_out                    &= ~BUS_REQ;
+
+                scsi_device_log("Command pos=%i, output data=%02x\n", scsi_bus->command_pos, BUS_GETDATA(bus));
+
+                if (scsi_bus->command_pos == scsi_command_length[(scsi_bus->command[0] >> 5) & 7]) {
+                    if (scsi_bus->is_msgout) {
+                        scsi_bus->is_msgout = 0;
+#if 0
+                        scsi_bus->command[1] = (scsi_bus->command[1] & 0x1f) | (scsi_bus->msglun << 5);
+#endif
+                    }
+
+                    /*Reset data position to default*/
+                    scsi_bus->data_pos = 0;
+
+                    dev = &scsi_devices[scsi_bus->bus_device][scsi_bus->target_id];
+
+                    scsi_device_log("SCSI Command 0x%02X for ID %d, status code=%02x\n", scsi_bus->command[0], scsi_bus->target_id, dev->status);
+                    dev->buffer_length = -1;
+                    scsi_device_command_phase0(dev, scsi_bus->command);
+                    scsi_device_log("SCSI ID %i: Command %02X: Buffer Length %i, SCSI Phase %02X\n", scsi_bus->target_id, scsi_bus->command[0], dev->buffer_length, dev->phase);
+
+                    scsi_bus->period          = 1.0;
+                    scsi_bus->wait_data       = 4;
+                    scsi_bus->data_wait       = 0;
+                    scsi_bus->command_issued  = 1;
+
+                    if (dev->status == SCSI_STATUS_OK) {
+                        /*If the SCSI phase is Data In or Data Out, allocate the SCSI buffer based on the transfer length of the command*/
+                        if (dev->buffer_length && ((dev->phase == SCSI_PHASE_DATA_IN) || (dev->phase == SCSI_PHASE_DATA_OUT))) {
+                            p = scsi_device_get_callback(dev);
+                            scsi_bus->period = (p > 0.0) ? ((p / scsi_bus->divider) * scsi_bus->multi) : (((double) dev->buffer_length) * scsi_bus->speed);
+                            scsi_device_log("SCSI ID %i: command 0x%02x for p = %lf, update = %lf, len = %i, dmamode = %x\n", scsi_bus->target_id, scsi_bus->command[0], scsi_device_get_callback(dev), scsi_bus->period, dev->buffer_length, scsi_bus->tx_mode);
+                        }
+                    }
+                    scsi_bus->bus_phase = dev->phase;
+                }
+            }
+            break;
+        case STATE_DATAIN:
+            dev = &scsi_devices[scsi_bus->bus_device][scsi_bus->target_id];
+            if ((bus & BUS_ACK) && !(scsi_bus->bus_in & BUS_ACK)) {
+                if (scsi_bus->data_pos >= dev->buffer_length) {
+                    scsi_bus->bus_out &= ~BUS_REQ;
+                    scsi_device_command_phase1(dev);
+                    scsi_bus->bus_phase     = SCSI_PHASE_STATUS;
+                    scsi_bus->wait_data     = 4;
+                    scsi_bus->wait_complete = 8;
+                } else {
+                    if ((dev->sc != NULL) && (dev->sc->temp_buffer != NULL))
+                        scsi_bus->data = dev->sc->temp_buffer[scsi_bus->data_pos++];
+
+                    scsi_device_log("TXMode DataIn=%x, cmd=%02x.\n", scsi_bus->tx_mode, scsi_bus->command[0]);
+                    scsi_bus->bus_out = (scsi_bus->bus_out & ~BUS_DATAMASK) | BUS_SETDATA(scsi_bus->data) | BUS_DBP | BUS_REQ;
+                    if (scsi_bus->tx_mode == PIO_TX_BUS) { /*If a data in command that is not read 6/10 has been issued*/
+                        scsi_device_log("DMA mode idle IN=%d.\n", scsi_bus->data_pos);
+                        scsi_bus->data_wait |= 1;
+                        scsi_bus->timer(scsi_bus->priv, scsi_bus->period);
+                    } else {
+                        scsi_device_log("DMA mode IN=%d.\n", scsi_bus->data_pos);
+                        scsi_bus->clear_req = 3;
+                    }
+                    scsi_bus->bus_out &= ~BUS_REQ;
+                    scsi_bus->bus_phase = SCSI_PHASE_DATA_IN;
+                }
+            }
+            break;
+        case STATE_DATAOUT:
+            dev = &scsi_devices[scsi_bus->bus_device][scsi_bus->target_id];
+            if ((bus & BUS_ACK) && !(scsi_bus->bus_in & BUS_ACK)) {
+                if ((dev->sc != NULL) && (dev->sc->temp_buffer != NULL))
+                    dev->sc->temp_buffer[scsi_bus->data_pos++] = BUS_GETDATA(bus);
+
+                if (scsi_bus->data_pos >= dev->buffer_length) {
+                    scsi_bus->bus_out &= ~BUS_REQ;
+                    scsi_device_command_phase1(dev);
+                    scsi_bus->bus_phase     = SCSI_PHASE_STATUS;
+                    scsi_bus->wait_data     = 4;
+                    scsi_bus->wait_complete = 8;
+                } else {
+                    /*More data is to be transferred, place a request*/
+                    if (scsi_bus->tx_mode == PIO_TX_BUS) { /*If a data in command that is not write 6/10 has been issued*/
+                        scsi_device_log("DMA mode idle OUT=%d.\n", scsi_bus->data_pos);
+                        scsi_bus->data_wait |= 1;
+                        scsi_bus->timer(scsi_bus->priv, scsi_bus->period);
+                        scsi_bus->bus_out &= ~BUS_REQ;
+                    } else {
+                        scsi_device_log("DMA mode OUT=%d.\n", scsi_bus->data_pos);
+                        scsi_bus->bus_out |= BUS_REQ;
+                    }
+                }
+            }
+            break;
+        case STATE_STATUS:
+            if ((bus & BUS_ACK) && !(scsi_bus->bus_in & BUS_ACK)) {
+                /*All transfers done, wait until next transfer*/
+                scsi_device_identify(&scsi_devices[scsi_bus->bus_device][scsi_bus->target_id], SCSI_LUN_USE_CDB);
+                scsi_bus->bus_out &= ~BUS_REQ;
+                scsi_bus->bus_phase     = SCSI_PHASE_MESSAGE_IN;
+                scsi_bus->wait_data     = 4;
+                scsi_bus->wait_complete = 8;
+                scsi_bus->command_issued = 0;
+            }
+            break;
+        case STATE_MESSAGEIN:
+            if ((bus & BUS_ACK) && !(scsi_bus->bus_in & BUS_ACK)) {
+                scsi_bus->bus_out &= ~BUS_REQ;
+                scsi_bus->bus_phase = BUS_IDLE;
+                scsi_bus->wait_data = 4;
+            }
+            break;
+        case STATE_MESSAGEOUT:
+            if ((bus & BUS_ACK) && !(scsi_bus->bus_in & BUS_ACK)) {
+                scsi_bus->msgout[scsi_bus->msgout_pos++] = BUS_GETDATA(bus);
+                msglen                         = scsi_device_get_msg(scsi_bus->msgout, scsi_bus->msgout_pos);
+                if (scsi_bus->msgout_pos >= msglen) {
+                    if ((scsi_bus->msgout[0] & (0x80 | 0x20)) == 0x80)
+                        scsi_bus->msglun = scsi_bus->msgout[0] & 7;
+
+                    scsi_bus->bus_out &= ~BUS_REQ;
+                    scsi_bus->state = STATE_MESSAGE_ID;
+                }
+            }
+            break;
+        case STATE_MESSAGE_ID:
+            if ((scsi_bus->target_id != (uint8_t) -1) && scsi_device_present(&scsi_devices[scsi_bus->bus_device][scsi_bus->target_id])) {
+                scsi_device_log("Device found at ID %i on MSGOUT, Current Bus BSY=%02x\n", scsi_bus->target_id, scsi_bus->bus_out);
+                scsi_device_identify(&scsi_devices[scsi_bus->bus_device][scsi_bus->target_id], scsi_bus->msglun);
+                scsi_bus->state   = STATE_COMMAND;
+                scsi_bus->bus_out = BUS_BSY | BUS_REQ;
+                scsi_bus->command_pos = 0;
+                SET_BUS_STATE(scsi_bus, SCSI_PHASE_COMMAND);
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    scsi_bus->bus_in = bus;
+}
+
diff --git a/src/scsi/scsi_disk.c b/src/scsi/scsi_disk.c
index 39a69ea32..9c8d36f7f 100644
--- a/src/scsi/scsi_disk.c
+++ b/src/scsi/scsi_disk.c
@@ -12,26 +12,24 @@
  *
  *          Copyright 2017-2018 Miran Grca.
  */
-#include <stdarg.h>
 #include <inttypes.h>
 #include <math.h>
-#include <stdio.h>
+#ifdef ENABLE_SCSI_DISK_LOG
+#include <stdarg.h>
+#endif
 #include <stdint.h>
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <wchar.h>
-#define HAVE_STDARG_H
 #include <86box/86box.h>
-#include <86box/config.h>
 #include <86box/timer.h>
 #include <86box/device.h>
+#include <86box/log.h>
 #include <86box/scsi.h>
 #include <86box/scsi_device.h>
 #include <86box/machine.h>
 #include <86box/nvr.h>
-#include <86box/hdc.h>
 #include <86box/hdc_ide.h>
-#include <86box/sound.h>
 #include <86box/plat.h>
 #include <86box/ui.h>
 #include <86box/hdd.h>
@@ -42,86 +40,71 @@
 
 #define scsi_disk_sense_error dev->sense[0]
 #define scsi_disk_sense_key   dev->sense[2]
+#define scsi_disk_info        *(uint32_t *) &(dev->sense[3])
 #define scsi_disk_asc         dev->sense[12]
 #define scsi_disk_ascq        dev->sense[13]
 
-/* Table of all SCSI commands and their flags, needed for the new disc change / not ready handler. */
+// clang-format off
+/*
+   Table of all SCSI commands and their flags, needed for the new disc change /
+   not ready handler.
+ */
 const uint8_t scsi_disk_command_flags[0x100] = {
-    IMPLEMENTED | CHECK_READY | NONDATA,          /* 0x00 */
-    IMPLEMENTED | ALLOW_UA | NONDATA | SCSI_ONLY, /* 0x01 */
-    0,
-    IMPLEMENTED | ALLOW_UA,                                     /* 0x03 */
-    IMPLEMENTED | CHECK_READY | ALLOW_UA | NONDATA | SCSI_ONLY, /* 0x04 */
-    0, 0, 0,
-    IMPLEMENTED | CHECK_READY, /* 0x08 */
-    0,
-    IMPLEMENTED | CHECK_READY,           /* 0x0A */
-    IMPLEMENTED | CHECK_READY | NONDATA, /* 0x0B */
-    0, 0, 0, 0, 0, 0,
-    IMPLEMENTED | ALLOW_UA,                          /* 0x12 */
-    IMPLEMENTED | CHECK_READY | NONDATA | SCSI_ONLY, /* 0x13 */
-    0,
-    IMPLEMENTED,             /* 0x15 */
-    IMPLEMENTED | SCSI_ONLY, /* 0x16 */
-    IMPLEMENTED | SCSI_ONLY, /* 0x17 */
-    0, 0,
-    IMPLEMENTED, /* 0x1A */
-    0, 0,
-    IMPLEMENTED,               /* 0x1D */
-    IMPLEMENTED | CHECK_READY, /* 0x1E */
-    0, 0, 0, 0, 0, 0,
-    IMPLEMENTED | CHECK_READY, /* 0x25 */
-    0, 0,
-    IMPLEMENTED | CHECK_READY, /* 0x28 */
-    0,
-    IMPLEMENTED | CHECK_READY,           /* 0x2A */
-    IMPLEMENTED | CHECK_READY | NONDATA, /* 0x2B */
-    0, 0,
-    IMPLEMENTED | CHECK_READY,                       /* 0x2E */
-    IMPLEMENTED | CHECK_READY | NONDATA | SCSI_ONLY, /* 0x2F */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0,
-    IMPLEMENTED | CHECK_READY, /* 0x41 */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0,
-    IMPLEMENTED, /* 0x55 */
-    0, 0, 0, 0,
-    IMPLEMENTED, /* 0x5A */
-    0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    IMPLEMENTED | CHECK_READY, /* 0xA8 */
-    0,
-    IMPLEMENTED | CHECK_READY, /* 0xAA */
-    0, 0, 0,
-    IMPLEMENTED | CHECK_READY,                       /* 0xAE */
-    IMPLEMENTED | CHECK_READY | NONDATA | SCSI_ONLY, /* 0xAF */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    IMPLEMENTED, /* 0xBD */
-    0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    [0x00]          = IMPLEMENTED | CHECK_READY,
+    [0x01]          = IMPLEMENTED | ALLOW_UA | SCSI_ONLY,
+    [0x03]          = IMPLEMENTED | ALLOW_UA,
+    [0x04]          = IMPLEMENTED | CHECK_READY | ALLOW_UA | SCSI_ONLY,
+    [0x08]          = IMPLEMENTED | CHECK_READY,
+    [0x0a ... 0x0b] = IMPLEMENTED | CHECK_READY,
+    [0x12]          = IMPLEMENTED | ALLOW_UA,
+    [0x13]          = IMPLEMENTED | CHECK_READY | SCSI_ONLY,
+    [0x15]          = IMPLEMENTED,
+    [0x16 ... 0x17] = IMPLEMENTED | SCSI_ONLY,
+    [0x1a]          = IMPLEMENTED,
+    [0x1d]          = IMPLEMENTED,
+    [0x1e]          = IMPLEMENTED | CHECK_READY,
+    [0x25]          = IMPLEMENTED | CHECK_READY,
+    [0x28]          = IMPLEMENTED | CHECK_READY,
+    [0x2a ... 0x2b] = IMPLEMENTED | CHECK_READY,
+    [0x2e]          = IMPLEMENTED | CHECK_READY,
+    [0x2f]          = IMPLEMENTED | CHECK_READY | SCSI_ONLY,
+    [0x41]          = IMPLEMENTED | CHECK_READY,
+    [0x55]          = IMPLEMENTED,
+    [0x5a]          = IMPLEMENTED,
+    [0xa8]          = IMPLEMENTED | CHECK_READY,
+    [0xaa]          = IMPLEMENTED | CHECK_READY,
+    [0xae]          = IMPLEMENTED | CHECK_READY,
+    [0xaf]          = IMPLEMENTED | CHECK_READY | SCSI_ONLY,
+    [0xbd]          = IMPLEMENTED
 };
 
-uint64_t scsi_disk_mode_sense_page_flags = (GPMODEP_FORMAT_DEVICE_PAGE | GPMODEP_RIGID_DISK_PAGE | GPMODEP_UNK_VENDOR_PAGE | GPMODEP_ALL_PAGES);
+uint64_t scsi_disk_mode_sense_page_flags = (GPMODEP_FORMAT_DEVICE_PAGE | GPMODEP_RIGID_DISK_PAGE |
+                                            GPMODEP_UNK_VENDOR_PAGE | GPMODEP_ALL_PAGES);
 
-/* This should be done in a better way but for time being, it's been done this way so it's not as huge and more readable. */
 static const mode_sense_pages_t scsi_disk_mode_sense_pages_default = {
-    {[GPMODE_FORMAT_DEVICE_PAGE] = { GPMODE_FORMAT_DEVICE_PAGE, 0x16, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-     [GPMODE_RIGID_DISK_PAGE]    = { GPMODE_RIGID_DISK_PAGE, 0x16, 0, 0x10, 0, 64, 0, 0, 0, 0, 0, 0, 0, 200, 0xff, 0xff, 0xff, 0, 0, 0, 0x15, 0x18, 0, 0 },
-     [GPMODE_UNK_VENDOR_PAGE]    = { 0xB0, 0x16, '8', '6', 'B', 'o', 'x', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' }}
+    { [0x03] = { GPMODE_FORMAT_DEVICE_PAGE,           0x16, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
+                 0x00,                                0x01, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+      [0x04] = { GPMODE_RIGID_DISK_PAGE,              0x16, 0x00, 0x10, 0x00, 0x40, 0x00, 0x00,
+                  0x00,                               0x00, 0x00, 0x00, 0x00, 0xc8, 0xff, 0xff,
+                  0xff,                               0x00, 0x00, 0x00, 0x15, 0x18, 0x00, 0x00 },
+      [0x30] = { GPMODE_UNK_VENDOR_PAGE | 0x80,       0x16, '8' , '6' , 'B' , 'o' , 'x' , ' ' ,
+                  ' ' ,                               ' ' , ' ' , ' ' , ' ' , ' ' , ' ' , ' ' ,
+                  ' ' ,                               ' ' , ' ' , ' ' , ' ' , ' ' , ' ' , ' '  } }
 };
 
 static const mode_sense_pages_t scsi_disk_mode_sense_pages_changeable = {
-    {[GPMODE_FORMAT_DEVICE_PAGE] = { GPMODE_FORMAT_DEVICE_PAGE, 0x16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-     [GPMODE_RIGID_DISK_PAGE]    = { GPMODE_RIGID_DISK_PAGE, 0x16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-     [GPMODE_UNK_VENDOR_PAGE]    = { 0xB0, 0x16, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }}
+    { [0x03] = { GPMODE_FORMAT_DEVICE_PAGE,           0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+      [0x04] = { GPMODE_RIGID_DISK_PAGE,              0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00,                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+      [0x30] = { GPMODE_UNK_VENDOR_PAGE | 0x80,       0x16, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                 0xff,                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                 0xff,                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } }
 };
+// clang-format on
 
 static void scsi_disk_command_complete(scsi_disk_t *dev);
 
@@ -133,116 +116,116 @@ static void scsi_disk_init(scsi_disk_t *dev);
 int scsi_disk_do_log = ENABLE_SCSI_DISK_LOG;
 
 static void
-scsi_disk_log(const char *fmt, ...)
+scsi_disk_log(void *priv, const char *fmt, ...)
 {
     va_list ap;
 
     if (scsi_disk_do_log) {
         va_start(ap, fmt);
-        pclog_ex(fmt, ap);
+        log_out(priv, fmt, ap);
         va_end(ap);
     }
 }
 #else
-#    define scsi_disk_log(fmt, ...)
+#    define scsi_disk_log(priv, fmt, ...)
 #endif
 
 static void
-scsi_disk_set_callback(scsi_disk_t *dev)
+scsi_disk_set_callback(const scsi_disk_t *dev)
 {
-    if (dev->drv->bus != HDD_BUS_SCSI)
+    if (dev->drv->bus_type != HDD_BUS_SCSI)
         ide_set_callback(ide_drives[dev->drv->ide_channel], dev->callback);
 }
 
 static void
 scsi_disk_init(scsi_disk_t *dev)
 {
-    if (!dev)
-        return;
+    if (dev != NULL) {
+        /* Do a reset (which will also rezero it). */
+        scsi_disk_reset((scsi_common_t *) dev);
 
-    /* Do a reset (which will also rezero it). */
-    scsi_disk_reset((scsi_common_t *) dev);
+        /* Configure the drive. */
+        dev->requested_blocks = 1;
 
-    /* Configure the drive. */
-    dev->requested_blocks = 1;
+        dev->drv->bus_mode = 0;
+        if (dev->drv->bus_type >= HDD_BUS_ATAPI)
+            dev->drv->bus_mode |= 2;
+        if (dev->drv->bus_type < HDD_BUS_SCSI)
+            dev->drv->bus_mode |= 1;
+        scsi_disk_log(dev->log, "Bus type %i, bus mode %i\n",
+                      dev->drv->bus_type, dev->drv->bus_mode);
 
-    dev->drv->bus_mode = 0;
-    if (dev->drv->bus >= HDD_BUS_ATAPI)
-        dev->drv->bus_mode |= 2;
-    if (dev->drv->bus < HDD_BUS_SCSI)
-        dev->drv->bus_mode |= 1;
-    scsi_disk_log("SCSI HDD %i: Bus type %i, bus mode %i\n",
-                  dev->id, dev->drv->bus, dev->drv->bus_mode);
+        dev->sense[0] = 0xf0;
+        dev->sense[7] = 10;
 
-    dev->sense[0] = 0xf0;
-    dev->sense[7] = 10;
-    /* NEC only */
-    dev->tf->status      = 0;
-    dev->tf->pos         = 0;
-    dev->packet_status   = PHASE_NONE;
-    scsi_disk_sense_key = scsi_disk_asc = scsi_disk_ascq = dev->unit_attention = 0;
-    scsi_disk_mode_sense_load(dev);
+        dev->tf->status      = 0;
+        dev->tf->pos         = 0;
+        dev->packet_status   = PHASE_NONE;
+        scsi_disk_sense_key = scsi_disk_asc = scsi_disk_ascq = dev->unit_attention = 0;
+        scsi_disk_info      = 0x00;
+        scsi_disk_mode_sense_load(dev);
+    }
 }
 
 /* Returns: 0 for none, 1 for PIO, 2 for DMA. */
 static int
-scsi_disk_current_mode(scsi_disk_t *dev)
+scsi_disk_current_mode(const scsi_disk_t *dev)
 {
-    if (dev->drv->bus == HDD_BUS_SCSI)
-        return 2;
-    else if (dev->drv->bus == HDD_BUS_ATAPI) {
-        scsi_disk_log("SCSI DISK %i: ATAPI drive, setting to %s\n", dev->id,
+   int ret = 0;
+
+    if (dev->drv->bus_type == HDD_BUS_SCSI)
+        ret = 2;
+    else if (dev->drv->bus_type == HDD_BUS_ATAPI) {
+        scsi_disk_log(dev->log, "ATAPI drive, setting to %s\n",
                       (dev->tf->features & 1) ? "DMA" : "PIO",
                       dev->id);
-        return (dev->tf->features & 1) ? 2 : 1;
+        ret = (dev->tf->features & 1) ? 2 : 1;
     }
 
-    return 0;
+    return ret;
 }
 
-void
+static void
 scsi_disk_mode_sense_load(scsi_disk_t *dev)
 {
-    FILE *fp;
-    char  file_name[512];
+    char  file_name[512] = { 0 };
 
     memset(&dev->ms_pages_saved, 0, sizeof(mode_sense_pages_t));
-    memcpy(&dev->ms_pages_saved, &scsi_disk_mode_sense_pages_default, sizeof(mode_sense_pages_t));
+    memcpy(&dev->ms_pages_saved, &scsi_disk_mode_sense_pages_default,
+           sizeof(mode_sense_pages_t));
 
-    memset(file_name, 0, 512);
     sprintf(file_name, "scsi_disk_%02i_mode_sense.bin", dev->id);
-    fp = plat_fopen(nvr_path(file_name), "rb");
+    FILE *fp = plat_fopen(nvr_path(file_name), "rb");
     if (fp) {
         if (fread(dev->ms_pages_saved.pages[0x30], 1, 0x18, fp) != 0x18)
-            fatal("scsi_disk_mode_sense_load(): Error reading data\n");
+            log_fatal(dev->log, "scsi_disk_mode_sense_load(): Error reading data\n");
         fclose(fp);
     }
 }
 
-void
-scsi_disk_mode_sense_save(scsi_disk_t *dev)
+static void
+scsi_disk_mode_sense_save(const scsi_disk_t *dev)
 {
-    FILE *fp;
-    char  file_name[512];
+    char  file_name[512] = { 0 };
 
-    memset(file_name, 0, 512);
     sprintf(file_name, "scsi_disk_%02i_mode_sense.bin", dev->id);
-    fp = plat_fopen(nvr_path(file_name), "wb");
+    FILE *fp = plat_fopen(nvr_path(file_name), "wb");
     if (fp) {
         fwrite(dev->ms_pages_saved.pages[0x30], 1, 0x18, fp);
         fclose(fp);
     }
 }
 
-/*SCSI Mode Sense 6/10*/
+/* SCSI Mode Sense 6/10 */
 uint8_t
-scsi_disk_mode_sense_read(scsi_disk_t *dev, uint8_t page_control, uint8_t page, uint8_t pos)
+scsi_disk_mode_sense_read(const scsi_disk_t *dev, const uint8_t pgctl,
+                          const uint8_t page, const uint8_t pos)
 {
-    if (page_control == 1)
+    if (pgctl == 1)
         return scsi_disk_mode_sense_pages_changeable.pages[page][pos];
 
     if (page == GPMODE_RIGID_DISK_PAGE)
-        switch (page_control) {
+        switch (pgctl) {
             /* Rigid disk geometry page. */
             case 0:
             case 2:
@@ -272,7 +255,7 @@ scsi_disk_mode_sense_read(scsi_disk_t *dev, uint8_t page_control, uint8_t page,
                 break;
         }
     else if (page == GPMODE_FORMAT_DEVICE_PAGE)
-        switch (page_control) {
+        switch (pgctl) {
             /* Format device page. */
             case 0:
             case 2:
@@ -293,7 +276,7 @@ scsi_disk_mode_sense_read(scsi_disk_t *dev, uint8_t page_control, uint8_t page,
                 break;
         }
     else
-        switch (page_control) {
+        switch (pgctl) {
             case 0:
             case 3:
                 return dev->ms_pages_saved.pages[page][pos];
@@ -308,16 +291,13 @@ scsi_disk_mode_sense_read(scsi_disk_t *dev, uint8_t page_control, uint8_t page,
 }
 
 uint32_t
-scsi_disk_mode_sense(scsi_disk_t *dev, uint8_t *buf, uint32_t pos, uint8_t page, uint8_t block_descriptor_len)
+scsi_disk_mode_sense(const scsi_disk_t *dev, uint8_t *buf, uint32_t pos,
+                     uint8_t page, const uint8_t block_descriptor_len)
 {
-    uint8_t msplen;
-    uint8_t page_control = (page >> 6) & 3;
-    int     size = 0;
+    int     size = hdd_image_get_last_sector(dev->id);
 
     page &= 0x3f;
 
-    size = hdd_image_get_last_sector(dev->id);
-
     if (block_descriptor_len) {
         buf[pos++] = 1;                   /* Density code. */
         buf[pos++] = (size >> 16) & 0xff; /* Number of blocks (0 = all). */
@@ -332,12 +312,14 @@ scsi_disk_mode_sense(scsi_disk_t *dev, uint8_t *buf, uint32_t pos, uint8_t page,
     for (uint8_t i = 0; i < 0x40; i++) {
         if ((page == GPMODE_ALL_PAGES) || (page == i)) {
             if (scsi_disk_mode_sense_page_flags & (1LL << (uint64_t) page)) {
-                buf[pos++] = scsi_disk_mode_sense_read(dev, page_control, i, 0);
-                msplen     = scsi_disk_mode_sense_read(dev, page_control, i, 1);
-                buf[pos++] = msplen;
-                scsi_disk_log("SCSI HDD %i: MODE SENSE: Page [%02X] length %i\n", dev->id, i, msplen);
+                const uint8_t pgctl  = (page >> 6) & 3;
+                const uint8_t msplen = scsi_disk_mode_sense_read(dev, pgctl, i, 1);
+                buf[pos++]           = scsi_disk_mode_sense_read(dev, pgctl, i, 0);
+                buf[pos++]           = msplen;
+                scsi_disk_log(dev->log, "MODE SENSE: Page [%02X] length %i\n",
+                              i, msplen);
                 for (uint8_t j = 0; j < msplen; j++)
-                    buf[pos++] = scsi_disk_mode_sense_read(dev, page_control, i, 2 + j);
+                    buf[pos++] = scsi_disk_mode_sense_read(dev, pgctl, i, 2 + j);
             }
         }
     }
@@ -346,7 +328,7 @@ scsi_disk_mode_sense(scsi_disk_t *dev, uint8_t *buf, uint32_t pos, uint8_t page,
 }
 
 static void
-scsi_disk_update_request_length(scsi_disk_t *dev, int len, int block_len)
+scsi_disk_update_request_length(scsi_disk_t *dev, int len, const int block_len)
 {
     int bt;
     int min_len = 0;
@@ -407,7 +389,7 @@ scsi_disk_bus_speed(scsi_disk_t *dev)
 {
     double ret = -1.0;
 
-    if (dev && dev->drv && (dev->drv->bus == HDD_BUS_SCSI)) {
+    if (dev && dev->drv && (dev->drv->bus_type == HDD_BUS_SCSI)) {
         dev->callback = -1.0; /* Speed depends on SCSI controller */
         return 0.0;
     } else {
@@ -418,14 +400,15 @@ scsi_disk_bus_speed(scsi_disk_t *dev)
                 dev->callback = -1.0;
             return 0.0;
         } else
-            return ret * 1000000.0;
+            /* We get bytes per µs, so divide 1000000.0 by it. */
+            return 1000000.0 / ret;
     }
 }
 
 void
 scsi_disk_command_common(scsi_disk_t *dev)
 {
-    double bytes_per_second = 0.0;
+    double bytes_per_second;
     double period;
 
     /* MAP: BUSY_STAT, no DRQ, phase 1. */
@@ -435,6 +418,7 @@ scsi_disk_command_common(scsi_disk_t *dev)
     dev->callback      = 0;
 
     if (dev->packet_status == PHASE_COMPLETE) {
+
         switch (dev->current_cdb[0]) {
             case GPCMD_VERIFY_6:
             case GPCMD_VERIFY_10:
@@ -446,22 +430,23 @@ scsi_disk_command_common(scsi_disk_t *dev)
             case GPCMD_WRITE_AND_VERIFY_12:
             case GPCMD_WRITE_SAME_10:
                 /* Seek time is in us. */
-                period = hdd_timing_write(dev->drv, dev->drv->seek_pos, dev->drv->seek_len);
-                scsi_disk_log("SCSI HD %i: Seek period: %" PRIu64 " us\n",
-                              dev->id, (uint64_t) period);
+                period = hdd_timing_write(dev->drv, dev->drv->seek_pos,
+                                          dev->drv->seek_len);
+                scsi_disk_log(dev->log, "Seek period: %" PRIu64 " us\n",
+                              (uint64_t) period);
                 dev->callback += period;
                 /* Account for seek time. */
                 bytes_per_second = scsi_bus_get_speed(dev->drv->scsi_id >> 4);
 
                 period = 1000000.0 / bytes_per_second;
-                scsi_disk_log("SCSI HD %i: Byte transfer period: %" PRIu64 " us\n", dev->id,
+                scsi_disk_log(dev->log, "Byte transfer period: %" PRIu64 " us\n",
                               (uint64_t) period);
                 period = period * (double) (dev->packet_len);
-                scsi_disk_log("CD-ROM %i: Sector transfer period: %" PRIu64 " us\n", dev->id,
+                scsi_disk_log(dev->log, "Sector transfer period: %" PRIu64 " us\n",
                               (uint64_t) period);
                 dev->callback += period;
                 break;
-            default:    
+            default:
                 dev->callback = 0;
                 break;
         }
@@ -473,8 +458,8 @@ scsi_disk_command_common(scsi_disk_t *dev)
                 /* Seek time is in us. */
                 period = hdd_seek_get_time(dev->drv, (dev->current_cdb[0] == GPCMD_REZERO_UNIT) ?
                                            0 : dev->sector_pos, HDD_OP_SEEK, 0, 0.0);
-                scsi_disk_log("SCSI HD %i: Seek period: %" PRIu64 " us\n",
-                              dev->id, (uint64_t) period);
+                scsi_disk_log(dev->log, "Seek period: %" PRIu64 " us\n",
+                              (uint64_t) period);
                 dev->callback += period;
                 scsi_disk_set_callback(dev);
                 return;
@@ -482,9 +467,10 @@ scsi_disk_command_common(scsi_disk_t *dev)
             case 0x28:
             case 0xa8:
                 /* Seek time is in us. */
-                period = hdd_timing_read(dev->drv, dev->drv->seek_pos, dev->drv->seek_len);
-                scsi_disk_log("SCSI HD %i: Seek period: %" PRIu64 " us\n",
-                              dev->id, (uint64_t) period);
+                period = hdd_timing_read(dev->drv, dev->drv->seek_pos,
+                                         dev->drv->seek_len);
+                scsi_disk_log(dev->log, "Seek period: %" PRIu64 " us\n",
+                              (uint64_t) period);
                 dev->callback += period;
                 /* Account for seek time. */
                 bytes_per_second = scsi_bus_get_speed(dev->drv->scsi_id >> 4);
@@ -499,10 +485,16 @@ scsi_disk_command_common(scsi_disk_t *dev)
                 break;
         }
 
+        /*
+           For ATAPI, this will be 1000000.0 / µs_per_byte, and this will
+           convert it back to µs_per_byte.
+         */
         period = 1000000.0 / bytes_per_second;
-        scsi_disk_log("SCSI HD %i: Byte transfer period: %" PRIu64 " us\n", dev->id, (uint64_t) period);
+        scsi_disk_log(dev->log, "Byte transfer period: %" PRIu64 " us\n",
+                      (uint64_t) period);
         period = period * (double) (dev->packet_len);
-        scsi_disk_log("SCSI HD %i: Sector transfer period: %" PRIu64 " us\n", dev->id, (uint64_t) period);
+        scsi_disk_log(dev->log, "Sector transfer period: %" PRIu64 " us\n",
+                      (uint64_t) period);
         dev->callback += period;
     }
     scsi_disk_set_callback(dev);
@@ -511,7 +503,6 @@ scsi_disk_command_common(scsi_disk_t *dev)
 static void
 scsi_disk_command_complete(scsi_disk_t *dev)
 {
-    ui_sb_update_icon(SB_HDD | dev->drv->bus, 0);
     dev->packet_status = PHASE_COMPLETE;
     scsi_disk_command_common(dev);
 }
@@ -544,16 +535,19 @@ scsi_disk_command_write_dma(scsi_disk_t *dev)
     scsi_disk_command_common(dev);
 }
 
-/* id = Current ZIP device ID;
+/*
+   dev = Pointer to current SCSI disk device;
    len = Total transfer length;
    block_len = Length of a single block (why does it matter?!);
    alloc_len = Allocated transfer length;
-   direction = Transfer direction (0 = read from host, 1 = write to host). */
+   direction = Transfer direction (0 = read from host, 1 = write to host).
+ */
 static void
-scsi_disk_data_command_finish(scsi_disk_t *dev, int len, int block_len, int alloc_len, int direction)
+scsi_disk_data_command_finish(scsi_disk_t *dev, int len, const int block_len,
+                              const int alloc_len, const int direction)
 {
-    scsi_disk_log("SCSI HD %i: Finishing command (%02X): %i, %i, %i, %i, %i\n",
-                 dev->id, dev->current_cdb[0], len, block_len, alloc_len, direction,
+    scsi_disk_log(dev->log, "Finishing command (%02X): %i, %i, %i, %i, %i\n",
+                 dev->current_cdb[0], len, block_len, alloc_len, direction,
                  dev->tf->request_length);
     dev->tf->pos = 0;
     if (alloc_len >= 0) {
@@ -561,13 +555,13 @@ scsi_disk_data_command_finish(scsi_disk_t *dev, int len, int block_len, int allo
             len = alloc_len;
     }
     if ((len == 0) || (scsi_disk_current_mode(dev) == 0)) {
-        if (dev->drv->bus != HDD_BUS_SCSI)
+        if (dev->drv->bus_type != HDD_BUS_SCSI)
             dev->packet_len = 0;
 
         scsi_disk_command_complete(dev);
     } else {
         if (scsi_disk_current_mode(dev) == 2) {
-            if (dev->drv->bus != HDD_BUS_SCSI)
+            if (dev->drv->bus_type != HDD_BUS_SCSI)
                 dev->packet_len = alloc_len;
 
             if (direction == 0)
@@ -576,34 +570,37 @@ scsi_disk_data_command_finish(scsi_disk_t *dev, int len, int block_len, int allo
                 scsi_disk_command_write_dma(dev);
         } else {
             scsi_disk_update_request_length(dev, len, block_len);
-            if (direction == 0)
+            if ((dev->drv->bus_type != HDD_BUS_SCSI) &&
+                (dev->tf->request_length == 0))
+                scsi_disk_command_complete(dev);
+            else if (direction == 0)
                 scsi_disk_command_read(dev);
             else
                 scsi_disk_command_write(dev);
         }
     }
 
-    scsi_disk_log("SCSI HD %i: Status: %i, cylinder %i, packet length: %i, position: %i, phase: %i\n",
-                  dev->id, dev->packet_status, dev->tf->request_length, dev->packet_len, dev->tf->pos,
-                  dev->tf->phase);
+    scsi_disk_log(dev->log, "Status: %i, cylinder %i, packet length: %i, position: %i, "
+                  "phase: %i\n",
+                  dev->packet_status, dev->tf->request_length, dev->packet_len,
+                  dev->tf->pos, dev->tf->phase);
 }
 
 static void
 scsi_disk_sense_clear(scsi_disk_t *dev, UNUSED(int command))
 {
     scsi_disk_sense_key = scsi_disk_asc = scsi_disk_ascq = 0;
+    scsi_disk_info      = 0x00000000;
 }
 
 static void
-scsi_disk_set_phase(scsi_disk_t *dev, uint8_t phase)
+scsi_disk_set_phase(const scsi_disk_t *dev, const uint8_t phase)
 {
-    uint8_t scsi_bus = (dev->drv->scsi_id >> 4) & 0x0f;
-    uint8_t scsi_id  = dev->drv->scsi_id & 0x0f;
+    const uint8_t scsi_bus = (dev->drv->scsi_id >> 4) & 0x0f;
+    const uint8_t scsi_id  = dev->drv->scsi_id & 0x0f;
 
-    if (dev->drv->bus != HDD_BUS_SCSI)
-        return;
-
-    scsi_devices[scsi_bus][scsi_id].phase = phase;
+    if (dev->drv->bus_type == HDD_BUS_SCSI)
+        scsi_devices[scsi_bus][scsi_id].phase = phase;
 }
 
 static void
@@ -616,23 +613,34 @@ scsi_disk_cmd_error(scsi_disk_t *dev)
     dev->packet_status = PHASE_ERROR;
     dev->callback      = 50.0 * SCSI_TIME;
     scsi_disk_set_callback(dev);
-    ui_sb_update_icon(SB_HDD | dev->drv->bus, 0);
-    scsi_disk_log("SCSI HD %i: ERROR: %02X/%02X/%02X\n", dev->id, scsi_disk_sense_key, scsi_disk_asc, scsi_disk_ascq);
+    ui_sb_update_icon(SB_HDD | dev->drv->bus_type, 0);
+    ui_sb_update_icon_write(SB_HDD | dev->drv->bus_type, 0);
+    scsi_disk_log(dev->log, "ERROR: %02X/%02X/%02X\n", scsi_disk_sense_key,
+                  scsi_disk_asc, scsi_disk_ascq);
 }
 
 static void
 scsi_disk_buf_alloc(scsi_disk_t *dev, uint32_t len)
 {
-    scsi_disk_log("SCSI HD %i: Allocated buffer length: %i\n", dev->id, len);
-    if (!dev->temp_buffer)
+    scsi_disk_log(dev->log, "Allocated buffer length: %i\n", len);
+
+    if (dev->temp_buffer == NULL) {
         dev->temp_buffer = (uint8_t *) malloc(len);
+        dev->temp_buffer_sz = len;
+    }
+
+    if (len > dev->temp_buffer_sz) {
+        uint8_t *buf = (uint8_t *) realloc(dev->temp_buffer, len);
+        dev->temp_buffer = buf;
+        dev->temp_buffer_sz = len;
+    }
 }
 
 static void
 scsi_disk_buf_free(scsi_disk_t *dev)
 {
     if (dev->temp_buffer) {
-        scsi_disk_log("SCSI HD %i: Freeing buffer...\n", dev->id);
+        scsi_disk_log(dev->log, "Freeing buffer...\n");
         free(dev->temp_buffer);
         dev->temp_buffer = NULL;
     }
@@ -645,25 +653,57 @@ scsi_disk_bus_master_error(scsi_common_t *sc)
 
     scsi_disk_buf_free(dev);
     scsi_disk_sense_key = scsi_disk_asc = scsi_disk_ascq = 0;
+    scsi_disk_info      =  (dev->sector_pos >> 24)        |
+                          ((dev->sector_pos >> 16) <<  8) |
+                          ((dev->sector_pos >> 8)  << 16) |
+                          ( dev->sector_pos        << 24);
     scsi_disk_cmd_error(dev);
 }
 
 static void
-scsi_disk_invalid_lun(scsi_disk_t *dev)
+scsi_disk_write_error(scsi_disk_t *dev)
+{
+    scsi_disk_sense_key = SENSE_MEDIUM_ERROR;
+    scsi_disk_asc       = ASC_WRITE_ERROR;
+    scsi_disk_ascq      = 0;
+    scsi_disk_info      =  (dev->sector_pos >> 24)        |
+                          ((dev->sector_pos >> 16) <<  8) |
+                          ((dev->sector_pos >> 8)  << 16) |
+                          ( dev->sector_pos        << 24);
+    scsi_disk_cmd_error(dev);
+}
+
+static void
+scsi_disk_read_error(scsi_disk_t *dev)
+{
+    scsi_disk_sense_key = SENSE_MEDIUM_ERROR;
+    scsi_disk_asc       = ASC_UNRECOVERED_READ_ERROR;
+    scsi_disk_ascq      = 0;
+    scsi_disk_info      =  (dev->sector_pos >> 24)        |
+                          ((dev->sector_pos >> 16) <<  8) |
+                          ((dev->sector_pos >> 8)  << 16) |
+                          ( dev->sector_pos        << 24);
+    scsi_disk_cmd_error(dev);
+}
+
+static void
+scsi_disk_invalid_lun(scsi_disk_t *dev, const uint8_t lun)
 {
     scsi_disk_sense_key = SENSE_ILLEGAL_REQUEST;
     scsi_disk_asc       = ASC_INV_LUN;
     scsi_disk_ascq      = 0;
     scsi_disk_set_phase(dev, SCSI_PHASE_STATUS);
+    scsi_disk_info      = lun << 24;
     scsi_disk_cmd_error(dev);
 }
 
 static void
-scsi_disk_illegal_opcode(scsi_disk_t *dev)
+scsi_disk_illegal_opcode(scsi_disk_t *dev, const uint8_t opcode)
 {
     scsi_disk_sense_key = SENSE_ILLEGAL_REQUEST;
     scsi_disk_asc       = ASC_ILLEGAL_OPCODE;
     scsi_disk_ascq      = 0;
+    scsi_disk_info      = opcode << 24;
     scsi_disk_cmd_error(dev);
 }
 
@@ -673,54 +713,72 @@ scsi_disk_lba_out_of_range(scsi_disk_t *dev)
     scsi_disk_sense_key = SENSE_ILLEGAL_REQUEST;
     scsi_disk_asc       = ASC_LBA_OUT_OF_RANGE;
     scsi_disk_ascq      = 0;
+    scsi_disk_info      =  (dev->sector_pos >> 24)        |
+                          ((dev->sector_pos >> 16) <<  8) |
+                          ((dev->sector_pos >> 8)  << 16) |
+                          ( dev->sector_pos        << 24);
     scsi_disk_cmd_error(dev);
 }
 
 static void
-scsi_disk_invalid_field(scsi_disk_t *dev)
+scsi_disk_invalid_field(scsi_disk_t *dev, const uint32_t field)
 {
     scsi_disk_sense_key = SENSE_ILLEGAL_REQUEST;
     scsi_disk_asc       = ASC_INV_FIELD_IN_CMD_PACKET;
     scsi_disk_ascq      = 0;
+    scsi_disk_info      =  (field >> 24)        |
+                          ((field >> 16) <<  8) |
+                          ((field >> 8)  << 16) |
+                          ( field        << 24);
     scsi_disk_cmd_error(dev);
     dev->tf->status     = 0x53;
 }
 
 static void
-scsi_disk_invalid_field_pl(scsi_disk_t *dev)
+scsi_disk_invalid_field_pl(scsi_disk_t *dev, const uint32_t field)
 {
     scsi_disk_sense_key = SENSE_ILLEGAL_REQUEST;
     scsi_disk_asc       = ASC_INV_FIELD_IN_PARAMETER_LIST;
     scsi_disk_ascq      = 0;
+    scsi_disk_info      =  (field >> 24)        |
+                          ((field >> 16) <<  8) |
+                          ((field >> 8)  << 16) |
+                          ( field        << 24);
     scsi_disk_cmd_error(dev);
     dev->tf->status     = 0x53;
 }
 
 static void
-scsi_disk_data_phase_error(scsi_disk_t *dev)
+scsi_disk_data_phase_error(scsi_disk_t *dev, const uint32_t info)
 {
     scsi_disk_sense_key = SENSE_ILLEGAL_REQUEST;
     scsi_disk_asc       = ASC_DATA_PHASE_ERROR;
     scsi_disk_ascq      = 0;
+    scsi_disk_info      =  (info >> 24)        |
+                          ((info >> 16) <<  8) |
+                          ((info >> 8)  << 16) |
+                          ( info        << 24);
     scsi_disk_cmd_error(dev);
 }
 
 static int
-scsi_disk_blocks(scsi_disk_t *dev, int32_t *len, UNUSED(int first_batch), int out)
+scsi_disk_blocks(scsi_disk_t *dev, int32_t *len, UNUSED(int first_batch), const int out)
 {
+    const uint32_t medium_size = hdd_image_get_last_sector(dev->id) + 1;
+
     *len = 0;
-    uint32_t medium_size = hdd_image_get_last_sector(dev->id) + 1;
 
     if (!dev->sector_len) {
         scsi_disk_command_complete(dev);
         return -1;
     }
 
-    scsi_disk_log("%sing %i blocks starting from %i...\n", out ? "Writ" : "Read",
+    scsi_disk_log(dev->log, "%sing %i blocks starting from %i...\n", out ? "Writ" : "Read",
                   dev->requested_blocks, dev->sector_pos);
 
     if (dev->sector_pos >= medium_size) {
-        scsi_disk_log("SCSI HD %i: Trying to %s beyond the end of disk\n", dev->id, out ? "write" : "read");
+        scsi_disk_log(dev->log, "Trying to %s beyond the end of disk\n",
+                      out ? "write" : "read");
         scsi_disk_lba_out_of_range(dev);
         return 0;
     }
@@ -728,62 +786,91 @@ scsi_disk_blocks(scsi_disk_t *dev, int32_t *len, UNUSED(int first_batch), int ou
     *len = dev->requested_blocks << 9;
 
     for (int i = 0; i < dev->requested_blocks; i++) {
-        if (out)
-            hdd_image_write(dev->id, dev->sector_pos + i, 1, dev->temp_buffer + (i << 9));
-        else
-            hdd_image_read(dev->id, dev->sector_pos + i, 1, dev->temp_buffer + (i << 9));
+        if (out) {
+            if (hdd_image_write(dev->id, dev->sector_pos, 1, dev->temp_buffer +
+                                (i << 9)) < 0) {
+                scsi_disk_write_error(dev);
+                return -1;
+            }
+        } else {
+            if (hdd_image_read(dev->id, dev->sector_pos, 1, dev->temp_buffer +
+                               (i << 9)) < 0) {
+                scsi_disk_read_error(dev);
+                return -1;
+            }
+        }
+        dev->sector_pos++;
     }
 
-    scsi_disk_log("%s %i bytes of blocks...\n", out ? "Written" : "Read", *len);
+    scsi_disk_log(dev->log, "%s %i bytes of blocks...\n", out ? "Written" : "Read", *len);
 
-    dev->sector_pos += dev->requested_blocks;
     dev->sector_len -= dev->requested_blocks;
 
     return 1;
 }
 
 static int
-scsi_disk_pre_execution_check(scsi_disk_t *dev, uint8_t *cdb)
+scsi_disk_pre_execution_check(scsi_disk_t *dev, const uint8_t *cdb)
 {
-    if ((cdb[0] != GPCMD_REQUEST_SENSE) && (dev->cur_lun == SCSI_LUN_USE_CDB) && (cdb[1] & 0xe0)) {
-        scsi_disk_log("SCSI HD %i: Attempting to execute a unknown command targeted at SCSI LUN %i\n",
-                      dev->id, ((dev->tf->request_length >> 5) & 7));
-        scsi_disk_invalid_lun(dev);
+    if ((cdb[0] != GPCMD_REQUEST_SENSE) && (dev->cur_lun == SCSI_LUN_USE_CDB) &&
+        (cdb[1] & 0xe0)) {
+        scsi_disk_log(dev->log, "Attempting to execute a unknown command "
+                      "targeted at SCSI LUN %i\n",
+                      ((dev->tf->request_length >> 5) & 7));
+        scsi_disk_invalid_lun(dev, cdb[1] >> 5);
         return 0;
     }
 
     if (!(scsi_disk_command_flags[cdb[0]] & IMPLEMENTED)) {
-        scsi_disk_log("SCSI HD %i: Attempting to execute unknown command %02X over %s\n", dev->id, cdb[0],
-                      (dev->drv->bus == HDD_BUS_SCSI) ? "SCSI" : "ATAPI");
-        scsi_disk_illegal_opcode(dev);
+        scsi_disk_log(dev->log, "Attempting to execute unknown "
+                      "command %02X over %s\n", cdb[0],
+                      (dev->drv->bus_type == HDD_BUS_SCSI) ? "SCSI" : "ATAPI");
+        scsi_disk_illegal_opcode(dev, cdb[0]);
         return 0;
     }
 
-    /* Unless the command is REQUEST SENSE, clear the sense. This will *NOT*
-       the UNIT ATTENTION condition if it's set. */
+    if ((dev->drv->bus_type < HDD_BUS_SCSI) &&
+        (scsi_disk_command_flags[cdb[0]] & SCSI_ONLY)) {
+        scsi_disk_log(dev->log, "Attempting to execute SCSI-only command %02X "
+                      "over ATAPI\n", cdb[0]);
+        scsi_disk_illegal_opcode(dev, cdb[0]);
+        return 0;
+    }
+
+    if ((dev->drv->bus_type == HDD_BUS_SCSI) &&
+        (scsi_disk_command_flags[cdb[0]] & ATAPI_ONLY)) {
+        scsi_disk_log(dev->log, "Attempting to execute ATAPI-only command %02X "
+                      "over SCSI\n", cdb[0]);
+        scsi_disk_illegal_opcode(dev, cdb[0]);
+        return 0;
+    }
+
+    /*
+       Unless the command is REQUEST SENSE, clear the sense. This will *NOT*
+       the UNIT ATTENTION condition if it's set.
+     */
     if (cdb[0] != GPCMD_REQUEST_SENSE)
         scsi_disk_sense_clear(dev, cdb[0]);
 
-    scsi_disk_log("SCSI HD %i: Continuing with command\n", dev->id);
+    scsi_disk_log(dev->log, "Continuing with command %02X\n", cdb[0]);
 
     return 1;
 }
 
 static void
-scsi_disk_seek(scsi_disk_t *dev, uint32_t pos)
+scsi_disk_seek(const scsi_disk_t *dev, const uint32_t pos)
 {
-    /* scsi_disk_log("SCSI HD %i: Seek %08X\n", dev->id, pos); */
+    /* scsi_disk_log(dev->log, "Seek %08X\n", pos); */
     hdd_image_seek(dev->id, pos);
 }
 
 static void
 scsi_disk_rezero(scsi_disk_t *dev)
 {
-    if (dev->id == 0xff)
-        return;
-
-    dev->sector_pos = dev->sector_len = 0;
-    scsi_disk_seek(dev, 0);
+    if (dev->id != 0xff) {
+        dev->sector_pos = dev->sector_len = 0;
+        scsi_disk_seek(dev, 0);
+    }
 }
 
 void
@@ -800,34 +887,38 @@ scsi_disk_reset(scsi_common_t *sc)
     dev->packet_status      = PHASE_NONE;
     dev->unit_attention     = 0;
     dev->cur_lun            = SCSI_LUN_USE_CDB;
+    scsi_disk_sense_key = scsi_disk_asc = scsi_disk_ascq = dev->unit_attention = 0;
+    scsi_disk_info      = 0x00;
 }
 
 void
-scsi_disk_request_sense(scsi_disk_t *dev, uint8_t *buffer, uint8_t alloc_length, int desc)
+scsi_disk_request_sense(scsi_disk_t *dev, uint8_t *buffer,
+                        const uint8_t alloc_length, const int desc)
 {
-    /*Will return 18 bytes of 0*/
+    /* Will return 18 bytes of 0. */
     if (alloc_length != 0) {
         memset(buffer, 0, alloc_length);
-        if (!desc)
-            memcpy(buffer, dev->sense, alloc_length);
-        else {
+        if (desc) {
             buffer[1] = scsi_disk_sense_key;
             buffer[2] = scsi_disk_asc;
             buffer[3] = scsi_disk_ascq;
-        }
-    } else
-        return;
+        } else
+            memcpy(buffer, dev->sense, alloc_length);
 
-    buffer[0] = 0x70;
+        buffer[0] = desc ? 0x70 : 0xf0;
+        buffer[7] = 10;
 
-    scsi_disk_log("SCSI HD %i: Reporting sense: %02X %02X %02X\n", dev->id, buffer[2], buffer[12], buffer[13]);
+        scsi_disk_log(dev->log, "Reporting sense: %02X %02X %02X\n",
+                      buffer[2], buffer[12], buffer[13]);
 
-    /* Clear the sense stuff as per the spec. */
-    scsi_disk_sense_clear(dev, GPCMD_REQUEST_SENSE);
+        /* Clear the sense stuff as per the spec. */
+        scsi_disk_sense_clear(dev, GPCMD_REQUEST_SENSE);
+    }
 }
 
 static void
-scsi_disk_request_sense_for_scsi(scsi_common_t *sc, uint8_t *buffer, uint8_t alloc_length)
+scsi_disk_request_sense_for_scsi(scsi_common_t *sc, uint8_t *buffer,
+                                 const uint8_t alloc_length)
 {
     scsi_disk_t *dev = (scsi_disk_t *) sc;
 
@@ -835,41 +926,42 @@ scsi_disk_request_sense_for_scsi(scsi_common_t *sc, uint8_t *buffer, uint8_t all
 }
 
 static void
-scsi_disk_set_buf_len(scsi_disk_t *dev, int32_t *BufLen, int32_t *src_len)
+scsi_disk_set_buf_len(const scsi_disk_t *dev, int32_t *BufLen, int32_t *src_len)
 {
-    if (dev->drv->bus == HDD_BUS_SCSI) {
+    if (dev->drv->bus_type == HDD_BUS_SCSI) {
         if (*BufLen == -1)
             *BufLen = *src_len;
         else {
             *BufLen  = MIN(*src_len, *BufLen);
             *src_len = *BufLen;
         }
-        scsi_disk_log("SCSI HD %i: Actual transfer length: %i\n", dev->id, *BufLen);
+        scsi_disk_log(dev->log, "Actual transfer length: %i\n", *BufLen);
     }
 }
 
 static void
-scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
+scsi_disk_command(scsi_common_t *sc, const uint8_t *cdb)
 {
-    scsi_disk_t *dev = (scsi_disk_t *) sc;
-    int      ret;
-    int32_t      blen = 0;
-    int32_t     *BufLen;
-    int32_t      len;
-    int32_t      max_len;
-    int32_t      alloc_length;
-    int          pos = 0;
-    int          idx = 0;
-    unsigned     size_idx;
-    unsigned     preamble_len;
-    uint32_t     last_sector            = 0;
-    char         device_identify[9]     = { '8', '6', 'B', '_', 'H', 'D', '0', '0', 0 };
-    char         device_identify_ex[15] = { '8', '6', 'B', '_', 'H', 'D', '0', '0', ' ', 'v', '1', '.', '0', '0', 0 };
-    int          block_desc             = 0;
-    uint8_t      scsi_bus               = (dev->drv->scsi_id >> 4) & 0x0f;
-    uint8_t      scsi_id                = dev->drv->scsi_id & 0x0f;
+    char           device_identify[9]     = { '8', '6', 'B', '_', 'H', 'D', '0', '0', 0 };
+    char           device_identify_ex[15] = { '8', '6', 'B', '_', 'H', 'D', '0', '0', ' ',
+                                            'v', '1', '.', '0', '0', 0 };
+    scsi_disk_t *  dev                    = (scsi_disk_t *) sc;
+    const uint32_t last_sector            = hdd_image_get_last_sector(dev->id);
+    const uint8_t  scsi_bus               = (dev->drv->scsi_id >> 4) & 0x0f;
+    const uint8_t  scsi_id                = dev->drv->scsi_id & 0x0f;
+    int32_t        blen                   = 0;
+    int            pos                    = 0;
+    int            idx                    = 0;
+    int            block_desc;
+    int            ret;
+    int32_t *      BufLen;
+    int32_t        len;
+    int32_t        max_len;
+    int32_t        alloc_length;
+    unsigned       size_idx;
+    unsigned       preamble_len;
 
-    if (dev->drv->bus == HDD_BUS_SCSI) {
+    if (dev->drv->bus_type == HDD_BUS_SCSI) {
         BufLen = &scsi_devices[scsi_bus][scsi_id].buffer_length;
         dev->tf->status &= ~ERR_STAT;
     } else {
@@ -877,8 +969,6 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
         dev->tf->error   = 0;
     }
 
-    last_sector = hdd_image_get_last_sector(dev->id);
-
     dev->packet_len = 0;
     dev->request_pos = 0;
 
@@ -894,11 +984,12 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
     memcpy(dev->current_cdb, cdb, 12);
 
     if (cdb[0] != 0) {
-        scsi_disk_log("SCSI HD %i: Command 0x%02X, Sense Key %02X, Asc %02X, Ascq %02X\n",
-                      dev->id, cdb[0], scsi_disk_sense_key, scsi_disk_asc, scsi_disk_ascq);
-        scsi_disk_log("SCSI HD %i: Request length: %04X\n", dev->id, dev->tf->request_length);
+        scsi_disk_log(dev->log, "Command 0x%02X, Sense Key %02X, Asc %02X, Ascq %02X\n",
+                      cdb[0], scsi_disk_sense_key, scsi_disk_asc, scsi_disk_ascq);
+        scsi_disk_log(dev->log, "Request length: %04X\n", dev->tf->request_length);
 
-        scsi_disk_log("SCSI HD %i: CDB: %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", dev->id,
+        scsi_disk_log(dev->log, "CDB: %02X %02X %02X %02X %02X %02X %02X %02X "
+                      "%02X %02X %02X %02X\n",
                       cdb[0], cdb[1], cdb[2], cdb[3], cdb[4], cdb[5], cdb[6], cdb[7],
                       cdb[8], cdb[9], cdb[10], cdb[11]);
     }
@@ -907,14 +998,17 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
 
     scsi_disk_set_phase(dev, SCSI_PHASE_STATUS);
 
-    /* This handles the Not Ready/Unit Attention check if it has to be handled at this point. */
+    /*
+       This handles the Not Ready/Unit Attention check if it has to be
+       handled at this point.
+     */
     if (scsi_disk_pre_execution_check(dev, cdb) == 0)
         return;
 
     switch (cdb[0]) {
         case GPCMD_SEND_DIAGNOSTIC:
             if (!(cdb[1] & (1 << 2))) {
-                scsi_disk_invalid_field(dev);
+                scsi_disk_invalid_field(dev, cdb[1]);
                 return;
             }
             fallthrough;
@@ -937,9 +1031,6 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
             break;
 
         case GPCMD_REQUEST_SENSE:
-            /* If there's a unit attention condition and there's a buffered not
-               ready, a standalone REQUEST SENSE should forget about the not
-               ready, and report unit attention straight away. */
             len = cdb[4];
 
             if (!len) {
@@ -953,14 +1044,11 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
             scsi_disk_buf_alloc(dev, 256);
             scsi_disk_set_buf_len(dev, BufLen, &len);
 
-            if (*BufLen < cdb[4])
-                cdb[4] = *BufLen;
-
             len = (cdb[1] & 1) ? 8 : 18;
 
             scsi_disk_request_sense(dev, dev->temp_buffer, *BufLen, cdb[1] & 1);
             scsi_disk_set_phase(dev, SCSI_PHASE_DATA_IN);
-            scsi_disk_data_command_finish(dev, len, len, cdb[4], 0);
+            scsi_disk_data_command_finish(dev, len, len, *BufLen, 0);
             break;
 
         case GPCMD_MECHANISM_STATUS:
@@ -996,12 +1084,15 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
                     break;
                 case GPCMD_READ_10:
                     dev->sector_len = (cdb[7] << 8) | cdb[8];
-                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
+                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) |
+                                      (cdb[4] << 8) | cdb[5];
                     break;
                 case GPCMD_READ_12:
-                    dev->sector_len = (((uint32_t) cdb[6]) << 24) | (((uint32_t) cdb[7]) << 16) |
+                    dev->sector_len = (((uint32_t) cdb[6]) << 24) |
+                                      (((uint32_t) cdb[7]) << 16) |
                                       (((uint32_t) cdb[8]) << 8) | ((uint32_t) cdb[9]);
-                    dev->sector_pos = (((uint32_t) cdb[2]) << 24) | (((uint32_t) cdb[3]) << 16) |
+                    dev->sector_pos = (((uint32_t) cdb[2]) << 24) |
+                                      (((uint32_t) cdb[3]) << 16) |
                                       (((uint32_t) cdb[4]) << 8) | ((uint32_t) cdb[5]);
                     break;
 
@@ -1009,54 +1100,47 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
                     break;
             }
 
-            if (dev->sector_pos > last_sector) {
+            if (dev->sector_pos > last_sector)
                 scsi_disk_lba_out_of_range(dev);
-                return;
+            else {
+                if (dev->sector_len) {
+                    max_len               = dev->sector_len;
+                    dev->requested_blocks = max_len;
+
+                    dev->packet_len = max_len * alloc_length;
+                    scsi_disk_buf_alloc(dev, dev->packet_len);
+
+                    dev->drv->seek_pos = dev->sector_pos;
+                    dev->drv->seek_len = dev->sector_len;
+
+                    ret          = scsi_disk_blocks(dev, &alloc_length, 1, 0);
+                    alloc_length = dev->requested_blocks * 512;
+
+                    if (ret > 0) {
+                        dev->requested_blocks = max_len;
+                        dev->packet_len       = alloc_length;
+
+                        scsi_disk_set_buf_len(dev, BufLen, (int32_t *) &dev->packet_len);
+
+                        scsi_disk_data_command_finish(dev, alloc_length, 512, alloc_length, 0);
+
+                        ui_sb_update_icon(SB_HDD | dev->drv->bus_type, dev->packet_status != PHASE_COMPLETE);
+                    } else {
+                        scsi_disk_set_phase(dev, SCSI_PHASE_STATUS);
+                        dev->packet_status = (ret < 0) ? PHASE_ERROR : PHASE_COMPLETE;
+                        dev->callback      = 20.0 * SCSI_TIME;
+                        scsi_disk_set_callback(dev);
+                        scsi_disk_buf_free(dev);
+                    }
+                } else {
+                    scsi_disk_set_phase(dev, SCSI_PHASE_STATUS);
+                    scsi_disk_log(dev->log, "All done - callback set\n");
+                    dev->packet_status = PHASE_COMPLETE;
+                    dev->callback      = 20.0 * SCSI_TIME;
+                    scsi_disk_set_callback(dev);
+                }
             }
-
-            if (!dev->sector_len) {
-                scsi_disk_set_phase(dev, SCSI_PHASE_STATUS);
-                scsi_disk_log("SCSI HD %i: All done - callback set\n", dev->id);
-                dev->packet_status = PHASE_COMPLETE;
-                dev->callback      = 20.0 * SCSI_TIME;
-                scsi_disk_set_callback(dev);
-                break;
-            }
-
-            max_len               = dev->sector_len;
-            /*
-               If we're reading all blocks in one go for DMA, why not also for
-               PIO, it should NOT matter anyway, this step should be identical
-               and only the way the read dat is transferred to the host should
-               be different.
-             */
-            dev->requested_blocks = max_len;
-
-            dev->packet_len = max_len * alloc_length;
-            scsi_disk_buf_alloc(dev, dev->packet_len);
-
-            dev->drv->seek_pos = dev->sector_pos;
-            dev->drv->seek_len = dev->sector_len;
-
-            ret = scsi_disk_blocks(dev, &alloc_length, 1, 0);
-            if (ret <= 0) {
-                scsi_disk_set_phase(dev, SCSI_PHASE_STATUS);
-                dev->packet_status = PHASE_COMPLETE;
-                dev->callback      = 20.0 * SCSI_TIME;
-                scsi_disk_set_callback(dev);
-                scsi_disk_buf_free(dev);
-                return;
-            }
-
-            dev->requested_blocks = max_len;
-            dev->packet_len       = alloc_length;
-
-            scsi_disk_set_buf_len(dev, BufLen, (int32_t *) &dev->packet_len);
-
-            scsi_disk_data_command_finish(dev, alloc_length, 512, alloc_length, 0);
-
-            ui_sb_update_icon(SB_HDD | dev->drv->bus, dev->packet_status != PHASE_COMPLETE);
-            return;
+            break;
 
         case GPCMD_VERIFY_6:
         case GPCMD_VERIFY_10:
@@ -1087,23 +1171,26 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
                         dev->sector_len = 256;
                     dev->sector_pos = ((((uint32_t) cdb[1]) & 0x1f) << 16) |
                                       (((uint32_t) cdb[2]) << 8) | ((uint32_t) cdb[3]);
-                    scsi_disk_log("SCSI HD %i: Length: %i, LBA: %i\n", dev->id,
+                    scsi_disk_log(dev->log, "Length: %i, LBA: %i\n",
                                   dev->sector_len, dev->sector_pos);
                     break;
                 case GPCMD_VERIFY_10:
                 case GPCMD_WRITE_10:
                 case GPCMD_WRITE_AND_VERIFY_10:
                     dev->sector_len = (cdb[7] << 8) | cdb[8];
-                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
-                    scsi_disk_log("SCSI HD %i: Length: %i, LBA: %i\n", dev->id,
+                    dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) |
+                                      (cdb[4] << 8) | cdb[5];
+                    scsi_disk_log(dev->log, "Length: %i, LBA: %i\n",
                                   dev->sector_len, dev->sector_pos);
                     break;
                 case GPCMD_VERIFY_12:
                 case GPCMD_WRITE_12:
                 case GPCMD_WRITE_AND_VERIFY_12:
-                    dev->sector_len = (((uint32_t) cdb[6]) << 24) | (((uint32_t) cdb[7]) << 16) |
+                    dev->sector_len = (((uint32_t) cdb[6]) << 24) |
+                                      (((uint32_t) cdb[7]) << 16) |
                                       (((uint32_t) cdb[8]) << 8) | ((uint32_t) cdb[9]);
-                    dev->sector_pos = (((uint32_t) cdb[2]) << 24) | (((uint32_t) cdb[3]) << 16) |
+                    dev->sector_pos = (((uint32_t) cdb[2]) << 24) |
+                                      (((uint32_t) cdb[3]) << 16) |
                                       (((uint32_t) cdb[4]) << 8) | ((uint32_t) cdb[5]);
                     break;
 
@@ -1111,90 +1198,79 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
                     break;
             }
 
-            if (dev->sector_pos > last_sector) {
+            if (dev->sector_pos > last_sector)
                 scsi_disk_lba_out_of_range(dev);
-                return;
+            else {
+                if (dev->sector_len) {
+                    dev->drv->seek_pos = dev->sector_pos;
+                    dev->drv->seek_len = dev->sector_len;
+
+                    max_len               = dev->sector_len;
+                    dev->requested_blocks = max_len;
+
+                    dev->packet_len = max_len * alloc_length;
+                    scsi_disk_buf_alloc(dev, dev->packet_len);
+
+                    dev->requested_blocks = max_len;
+                    dev->packet_len       = max_len << 9;
+
+                    scsi_disk_set_buf_len(dev, BufLen, (int32_t *) &dev->packet_len);
+
+                    scsi_disk_data_command_finish(dev, dev->packet_len, 512, dev->packet_len, 1);
+
+                    ui_sb_update_icon_write(SB_HDD | dev->drv->bus_type, dev->packet_status != PHASE_COMPLETE);
+                } else {
+                    scsi_disk_set_phase(dev, SCSI_PHASE_STATUS);
+                    scsi_disk_log(dev->log, "All done - callback set\n");
+                    dev->packet_status = PHASE_COMPLETE;
+                    dev->callback      = 20.0 * SCSI_TIME;
+                    scsi_disk_set_callback(dev);
+                }
             }
-
-            if (!dev->sector_len) {
-                scsi_disk_set_phase(dev, SCSI_PHASE_STATUS);
-                scsi_disk_log("SCSI HD %i: All done - callback set\n", dev->id);
-                dev->packet_status = PHASE_COMPLETE;
-                dev->callback      = 20.0 * SCSI_TIME;
-                scsi_disk_set_callback(dev);
-                break;
-            }
-
-            dev->drv->seek_pos = dev->sector_pos;
-            dev->drv->seek_len = dev->sector_len;
-
-            max_len               = dev->sector_len;
-            /*
-               If we're writing all blocks in one go for DMA, why not also for
-               PIO, it should NOT matter anyway, this step should be identical
-               and only the way the read dat is transferred to the host should
-               be different.
-             */
-            dev->requested_blocks = max_len;
-
-            dev->packet_len = max_len * alloc_length;
-            scsi_disk_buf_alloc(dev, dev->packet_len);
-
-            dev->requested_blocks = max_len;
-            dev->packet_len       = max_len << 9;
-
-            scsi_disk_set_buf_len(dev, BufLen, (int32_t *) &dev->packet_len);
-
-            scsi_disk_data_command_finish(dev, dev->packet_len, 512, dev->packet_len, 1);
-
-            ui_sb_update_icon(SB_HDD | dev->drv->bus, dev->packet_status != PHASE_COMPLETE);
-            return;
+            break;
 
         case GPCMD_WRITE_SAME_10:
             alloc_length = 512;
 
-            if ((cdb[1] & 6) == 6) {
-                scsi_disk_invalid_field(dev);
-                return;
+            if ((cdb[1] & 6) == 6)
+                scsi_disk_invalid_field(dev, cdb[1]);
+            else {
+                dev->sector_len = (cdb[7] << 8) | cdb[8];
+                dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
+
+                if (dev->sector_pos > last_sector)
+                    scsi_disk_lba_out_of_range(dev);
+                else {
+                    if (dev->sector_len) {
+                        scsi_disk_buf_alloc(dev, alloc_length);
+                        scsi_disk_set_buf_len(dev, BufLen, (int32_t *) &dev->packet_len);
+
+                        dev->requested_blocks = 1;
+
+                        dev->packet_len = alloc_length;
+
+                        scsi_disk_set_phase(dev, SCSI_PHASE_DATA_OUT);
+
+                        scsi_disk_data_command_finish(dev, 512, 512, alloc_length, 1);
+
+                        ui_sb_update_icon_write(SB_HDD | dev->drv->bus_type,
+                                          dev->packet_status != PHASE_COMPLETE);
+                    } else {
+                        scsi_disk_set_phase(dev, SCSI_PHASE_STATUS);
+                        scsi_disk_log(dev->log, "All done - callback set\n");
+                        dev->packet_status = PHASE_COMPLETE;
+                        dev->callback      = 20.0 * SCSI_TIME;
+                        scsi_disk_set_callback(dev);
+                    }
+                }
             }
-
-            dev->sector_len = (cdb[7] << 8) | cdb[8];
-            dev->sector_pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
-
-            if (dev->sector_pos > last_sector) {
-                scsi_disk_lba_out_of_range(dev);
-                return;
-            }
-
-            if (!dev->sector_len) {
-                scsi_disk_set_phase(dev, SCSI_PHASE_STATUS);
-                scsi_disk_log("SCSI HD %i: All done - callback set\n", dev->id);
-                dev->packet_status = PHASE_COMPLETE;
-                dev->callback      = 20.0 * SCSI_TIME;
-                scsi_disk_set_callback(dev);
-                break;
-            }
-
-            scsi_disk_buf_alloc(dev, alloc_length);
-            scsi_disk_set_buf_len(dev, BufLen, (int32_t *) &dev->packet_len);
-
-            max_len               = 1;
-            dev->requested_blocks = 1;
-
-            dev->packet_len = alloc_length;
-
-            scsi_disk_set_phase(dev, SCSI_PHASE_DATA_OUT);
-
-            scsi_disk_data_command_finish(dev, 512, 512, alloc_length, 1);
-
-            ui_sb_update_icon(SB_HDD | dev->drv->bus, dev->packet_status != PHASE_COMPLETE);
-            return;
+            break;
 
         case GPCMD_MODE_SENSE_6:
         case GPCMD_MODE_SENSE_10:
             scsi_disk_set_phase(dev, SCSI_PHASE_DATA_IN);
 
-            if (dev->drv->bus == HDD_BUS_SCSI)
+            if (dev->drv->bus_type == HDD_BUS_SCSI)
                 block_desc = ((cdb[1] >> 3) & 1) ? 0 : 1;
             else
                 block_desc = 0;
@@ -1211,7 +1287,8 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
             alloc_length = len;
 
             if (cdb[0] == GPCMD_MODE_SENSE_6) {
-                len = scsi_disk_mode_sense(dev, dev->temp_buffer, 4, cdb[2], block_desc);
+                len = scsi_disk_mode_sense(dev, dev->temp_buffer, 4,
+                                           cdb[2], block_desc);
                 if (len > alloc_length)
                     len = alloc_length;
                 dev->temp_buffer[0] = len - 1;
@@ -1237,10 +1314,10 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
                 alloc_length = len;
 
             scsi_disk_set_buf_len(dev, BufLen, &alloc_length);
-            scsi_disk_log("SCSI HDD %i: Reading mode page: %02X...\n", dev->id, cdb[2]);
+            scsi_disk_log(dev->log, "Reading mode page: %02X...\n", cdb[2]);
 
             scsi_disk_data_command_finish(dev, len, len, alloc_length, 0);
-            return;
+            break;
 
         case GPCMD_MODE_SELECT_6:
         case GPCMD_MODE_SELECT_10:
@@ -1258,7 +1335,7 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
             dev->total_length = len;
             dev->do_page_save = cdb[1] & 1;
             scsi_disk_data_command_finish(dev, len, len, len, 1);
-            return;
+            break;
 
         case GPCMD_INQUIRY:
             max_len = cdb[3];
@@ -1267,7 +1344,7 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
 
             if ((!max_len) || (*BufLen == 0)) {
                 scsi_disk_set_phase(dev, SCSI_PHASE_STATUS);
-                /* scsi_disk_log("SCSI HD %i: All done - callback set\n", dev->id); */
+                /* scsi_disk_log(dev->log, "All done - callback set\n"); */
                 dev->packet_status = PHASE_COMPLETE;
                 dev->callback      = 20.0 * SCSI_TIME;
                 break;
@@ -1293,7 +1370,7 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
                     case 0x83:
                         if (idx + 24 > max_len) {
                             scsi_disk_buf_free(dev);
-                            scsi_disk_data_phase_error(dev);
+                            scsi_disk_data_phase_error(dev, idx + 24);
                             return;
                         }
 
@@ -1301,7 +1378,8 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
                         dev->temp_buffer[idx++] = 0x00;
                         dev->temp_buffer[idx++] = 0x00;
                         dev->temp_buffer[idx++] = 20;
-                        ide_padstr8(dev->temp_buffer + idx, 20, "53R141"); /* Serial */
+                        /* Serial */
+                        ide_padstr8(dev->temp_buffer + idx, 20, "53R141");
                         idx += 20;
 
                         if (idx + 72 > cdb[4])
@@ -1310,16 +1388,19 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
                         dev->temp_buffer[idx++] = 0x01;
                         dev->temp_buffer[idx++] = 0x00;
                         dev->temp_buffer[idx++] = 68;
-                        ide_padstr8(dev->temp_buffer + idx, 8, EMU_NAME); /* Vendor */
+                        /* Vendor */
+                        ide_padstr8(dev->temp_buffer + idx, 8, EMU_NAME);
                         idx += 8;
-                        ide_padstr8(dev->temp_buffer + idx, 40, device_identify_ex); /* Product */
+                        /* Product */
+                        ide_padstr8(dev->temp_buffer + idx, 40, device_identify_ex);
                         idx += 40;
-                        ide_padstr8(dev->temp_buffer + idx, 20, "53R141"); /* Product */
+                        /* Product */
+                        ide_padstr8(dev->temp_buffer + idx, 20, "53R141");
                         idx += 20;
                         break;
                     default:
-                        scsi_disk_log("INQUIRY: Invalid page: %02X\n", cdb[2]);
-                        scsi_disk_invalid_field(dev);
+                        scsi_disk_log(dev->log, "INQUIRY: Invalid page: %02X\n", cdb[2]);
+                        scsi_disk_invalid_field(dev, cdb[2]);
                         scsi_disk_buf_free(dev);
                         return;
                 }
@@ -1328,17 +1409,24 @@ scsi_disk_command(scsi_common_t *sc, uint8_t *cdb)
                 size_idx     = 4;
 
                 memset(dev->temp_buffer, 0, 8);
-                dev->temp_buffer[0] = 0;    /*SCSI HD*/
-                dev->temp_buffer[1] = 0;    /*Fixed*/
-                dev->temp_buffer[2] = (dev->drv->bus == HDD_BUS_SCSI) ? 0x02 : 0x00; /*SCSI-2 compliant*/
-                dev->temp_buffer[3] = (dev->drv->bus == HDD_BUS_SCSI) ? 0x02 : 0x21;
+                if ((cdb[1] & 0xe0) || ((dev->cur_lun > 0x00) && (dev->cur_lun < 0xff)))
+                    dev->temp_buffer[0] = 0x7f;    /* No physical device on this LUN */
+                else
+                    dev->temp_buffer[0] = 0;       /* SCSI HD */
+                dev->temp_buffer[1] = 0;           /* Fixed */
+                /* SCSI-2 compliant */
+                dev->temp_buffer[2] = (dev->drv->bus_type == HDD_BUS_SCSI) ? 0x02 : 0x00;
+                dev->temp_buffer[3] = (dev->drv->bus_type == HDD_BUS_SCSI) ? 0x02 : 0x21;
                 dev->temp_buffer[4] = 31;
-                dev->temp_buffer[6] = 1;    /* 16-bit transfers supported */
-                dev->temp_buffer[7] = 0x20; /* Wide bus supported */
+                dev->temp_buffer[6] = 1;           /* 16-bit transfers supported */
+                dev->temp_buffer[7] = 0x20;        /* Wide bus supported */
 
-                ide_padstr8(dev->temp_buffer + 8, 8, EMU_NAME);          /* Vendor */
-                ide_padstr8(dev->temp_buffer + 16, 16, device_identify); /* Product */
-                ide_padstr8(dev->temp_buffer + 32, 4, EMU_VERSION_EX);   /* Revision */
+                /* Vendor */
+                ide_padstr8(dev->temp_buffer + 8, 8, EMU_NAME);
+                /* Product */
+                ide_padstr8(dev->temp_buffer + 16, 16, device_identify);
+                /* Revision */
+                ide_padstr8(dev->temp_buffer + 32, 4, EMU_VERSION_EX);
                 idx = 36;
 
                 if (max_len == 96) {
@@ -1410,12 +1498,12 @@ atapi_out:
             break;
 
         default:
-            scsi_disk_illegal_opcode(dev);
+            scsi_disk_illegal_opcode(dev, cdb[0]);
             break;
     }
 
-    /* scsi_disk_log("SCSI HD %i: Phase: %02X, request length: %i\n", dev->id, dev->tf->phase,
-                     dev->tf->request_length); */
+    /* scsi_disk_log(dev->log, "Phase: %02X, request length: %i\n",
+                     dev->tf->phase, dev->tf->request_length); */
 
     if ((dev->packet_status == PHASE_COMPLETE) || (dev->packet_status == PHASE_ERROR))
         scsi_disk_buf_free(dev);
@@ -1433,35 +1521,30 @@ scsi_disk_command_stop(scsi_common_t *sc)
 static uint8_t
 scsi_disk_phase_data_out(scsi_common_t *sc)
 {
-    scsi_disk_t   *dev      = (scsi_disk_t *) sc;
-    uint8_t        scsi_bus = (dev->drv->scsi_id >> 4) & 0x0f;
-    uint8_t        scsi_id  = dev->drv->scsi_id & 0x0f;
+    scsi_disk_t   *dev           = (scsi_disk_t *) sc;
+    const uint8_t  scsi_bus      = (dev->drv->scsi_id >> 4) & 0x0f;
+    const uint8_t  scsi_id       = dev->drv->scsi_id & 0x0f;
+    const int32_t *BufLen        = &scsi_devices[scsi_bus][scsi_id].buffer_length;
+    const uint32_t last_sector   = hdd_image_get_last_sector(dev->id);
+    int            len           = 0;
+    uint8_t        error         = 0;
+    int            ret           = 1;
     int            i;
-    const int32_t *BufLen      = &scsi_devices[scsi_bus][scsi_id].buffer_length;
-    uint32_t       last_sector = hdd_image_get_last_sector(dev->id);
-    uint32_t       c;
-    uint32_t       h;
-    uint32_t       s;
-    int            len = 0;
-    uint32_t       last_to_write = 0;
+    uint32_t       last_to_write;
     uint16_t       block_desc_len;
     uint16_t       pos;
     uint16_t       param_list_len;
     uint8_t        hdr_len;
     uint8_t        val;
-    uint8_t        old_val;
-    uint8_t        ch;
-    uint8_t        error = 0;
-    uint8_t        page;
-    uint8_t        page_len;
 
-    if (!*BufLen) {
+    if (!*BufLen)
         scsi_disk_set_phase(dev, SCSI_PHASE_STATUS);
+    else  switch (dev->current_cdb[0]) {
+        default:
+            log_fatal(dev->log, "Bad Command for phase 2 (%02X)\n", dev->current_cdb[0]);
+            ret = 0;
+        break;
 
-        return 1;
-    }
-
-    switch (dev->current_cdb[0]) {
         case GPCMD_VERIFY_6:
         case GPCMD_VERIFY_10:
         case GPCMD_VERIFY_12:
@@ -1487,9 +1570,9 @@ scsi_disk_phase_data_out(scsi_common_t *sc)
                     dev->temp_buffer[2] = (i >> 8) & 0xff;
                     dev->temp_buffer[3] = i & 0xff;
                 } else if (dev->current_cdb[1] & 4) {
-                    s                   = (i % dev->drv->spt);
-                    h                   = ((i - s) / dev->drv->spt) % dev->drv->hpc;
-                    c                   = ((i - s) / dev->drv->spt) / dev->drv->hpc;
+                    uint32_t s          = (i % dev->drv->spt);
+                    uint32_t h          = ((i - s) / dev->drv->spt) % dev->drv->hpc;
+                    uint32_t c          = ((i - s) / dev->drv->spt) / dev->drv->hpc;
                     dev->temp_buffer[0] = (c >> 16) & 0xff;
                     dev->temp_buffer[1] = (c >> 8) & 0xff;
                     dev->temp_buffer[2] = c & 0xff;
@@ -1499,7 +1582,8 @@ scsi_disk_phase_data_out(scsi_common_t *sc)
                     dev->temp_buffer[6] = (s >> 8) & 0xff;
                     dev->temp_buffer[7] = s & 0xff;
                 }
-                hdd_image_write(dev->id, i, 1, dev->temp_buffer);
+                if (hdd_image_write(dev->id, i, 1, dev->temp_buffer) < 0)
+                    scsi_disk_write_error(dev);
             }
             break;
         case GPCMD_MODE_SELECT_6:
@@ -1514,7 +1598,7 @@ scsi_disk_phase_data_out(scsi_common_t *sc)
                 param_list_len = dev->current_cdb[4];
             }
 
-            if (dev->drv->bus == HDD_BUS_SCSI) {
+            if (dev->drv->bus_type == HDD_BUS_SCSI) {
                 if (dev->current_cdb[0] == GPCMD_MODE_SELECT_6) {
                     block_desc_len = dev->temp_buffer[2];
                     block_desc_len <<= 8;
@@ -1531,27 +1615,29 @@ scsi_disk_phase_data_out(scsi_common_t *sc)
 
             while (1) {
                 if (pos >= param_list_len) {
-                    scsi_disk_log("SCSI HD %i: Buffer has only block descriptor\n", dev->id);
+                    scsi_disk_log(dev->log, "Buffer has only block descriptor\n");
                     break;
                 }
 
-                page     = dev->temp_buffer[pos] & 0x3F;
-                page_len = dev->temp_buffer[pos + 1];
+                const uint8_t page     = dev->temp_buffer[pos] & 0x3f;
+                const uint8_t page_len = dev->temp_buffer[pos + 1];
 
                 pos += 2;
 
                 if (!(scsi_disk_mode_sense_page_flags & (1LL << ((uint64_t) page))))
                     error |= 1;
-                else {
-                    for (i = 0; i < page_len; i++) {
-                        ch      = scsi_disk_mode_sense_pages_changeable.pages[page][i + 2];
-                        val     = dev->temp_buffer[pos + i];
-                        old_val = dev->ms_pages_saved.pages[page][i + 2];
-                        if (val != old_val) {
-                            if (ch)
-                                dev->ms_pages_saved.pages[page][i + 2] = val;
-                            else
-                                error |= 1;
+                else  for (i = 0; i < page_len; i++) {
+                    const uint8_t old  = dev->ms_pages_saved.pages[page][i + 2];
+                    const uint8_t ch   = scsi_disk_mode_sense_pages_changeable.pages[page][i + 2];
+
+                    val     = dev->temp_buffer[pos + i];
+
+                    if (val != old) {
+                        if (ch)
+                            dev->ms_pages_saved.pages[page][i + 2] = val;
+                        else {
+                            scsi_disk_invalid_field_pl(dev, val);
+                            error |= 1;
                         }
                     }
                 }
@@ -1566,22 +1652,17 @@ scsi_disk_phase_data_out(scsi_common_t *sc)
                     break;
             }
 
-            if (error) {
+            if (error)
                 scsi_disk_buf_free(dev);
-                scsi_disk_invalid_field_pl(dev);
-            }
-            break;
-        default:
-            fatal("SCSI HDD %i: Bad Command for phase 2 (%02X)\n", dev->id, dev->current_cdb[0]);
             break;
     }
 
     scsi_disk_command_stop((scsi_common_t *) dev);
-    return 1;
+    return ret;
 }
 
 static int
-scsi_disk_get_max(int ide_has_dma, int type)
+scsi_disk_get_max(UNUSED(const ide_t *ide), int ide_has_dma, const int type)
 {
     int ret;
 
@@ -1607,7 +1688,7 @@ scsi_disk_get_max(int ide_has_dma, int type)
 }
 
 static int
-scsi_disk_get_timings(int ide_has_dma, int type)
+scsi_disk_get_timings(UNUSED(const ide_t *ide), const int ide_has_dma, const int type)
 {
     int ret;
 
@@ -1629,29 +1710,28 @@ scsi_disk_get_timings(int ide_has_dma, int type)
     return ret;
 }
 
-/**
- * Fill in ide->buffer with the output of the "IDENTIFY PACKET DEVICE" command
+/*
+   Fill in ide->buffer with the output of the "IDENTIFY PACKET DEVICE" command
  */
 static void
-scsi_disk_identify(ide_t *ide, int ide_has_dma)
+scsi_disk_identify(const ide_t *ide, const int ide_has_dma)
 {
-    const scsi_disk_t *dev;
-    char          device_identify[9] = { '8', '6', 'B', '_', 'H', 'D', '0', '0', 0 };
-
-    dev = (scsi_disk_t *) ide->sc;
+    const scsi_disk_t *dev                = (scsi_disk_t *) ide->sc;
+    char               device_identify[9] = { '8', '6', 'B', '_', 'H', 'D', '0', '0', 0 };
 
     device_identify[7] = dev->id + 0x30;
-    scsi_disk_log("ATAPI Identify: %s\n", device_identify);
+    scsi_disk_log(dev->log, "ATAPI Identify: %s\n", device_identify);
 
     /* ATAPI device, direct-access device, non-removable media, accelerated DRQ */
-    ide->buffer[0] = 0x8000 | (0 << 8) | 0x00 | (2 << 5); 
-    ide_padstr((char *) (ide->buffer + 10), "", 20);          /* Serial Number */
+    ide->buffer[0] = 0x8000 | (0 << 8) | 0x00 | (2 << 5);
+    ide_padstr((char *) (ide->buffer + 10), "", 20);               /* Serial Number */
 
-    ide_padstr((char *) (ide->buffer + 23), EMU_VERSION_EX, 8);   /* Firmware */
-    ide_padstr((char *) (ide->buffer + 27), device_identify, 40); /* Model */
+    ide_padstr((char *) (ide->buffer + 23), EMU_VERSION_EX, 8);    /* Firmware */
+    ide_padstr((char *) (ide->buffer + 27), device_identify, 40);     /* Model */
 
-    ide->buffer[49]  = 0x200;  /* LBA supported */
-    ide->buffer[126] = 0xfffe; /* Interpret zero byte count limit as maximum length */
+    ide->buffer[49]  = 0x200;                                            /* LBA supported */
+    /* Interpret zero byte count limit as maximum length. */
+    ide->buffer[126] = 0xfffe;
 
     if (ide_has_dma) {
         ide->buffer[71] = 30;
@@ -1665,19 +1745,13 @@ void
 scsi_disk_hard_reset(void)
 {
     scsi_disk_t   *dev;
-    scsi_device_t *sd;
-    ide_t         *id;
-    uint8_t        scsi_bus;
-    uint8_t        scsi_id;
-    uint8_t        valid = 0;
 
     for (uint8_t c = 0; c < HDD_NUM; c++) {
-        valid = 0;
-        if (hdd[c].bus == HDD_BUS_SCSI) {
-            scsi_disk_log("SCSI disk hard_reset drive=%d\n", c);
+        uint8_t valid = 0;
 
-            scsi_bus = (hdd[c].scsi_id >> 4) & 0x0f;
-            scsi_id  = hdd[c].scsi_id & 0x0f;
+        if (hdd[c].bus_type == HDD_BUS_SCSI) {
+            const uint8_t scsi_bus = (hdd[c].scsi_id >> 4) & 0x0f;
+            const uint8_t scsi_id  = hdd[c].scsi_id & 0x0f;
 
             /* Make sure to ignore any SCSI disk that has an out of range SCSI bus. */
             if (scsi_bus >= SCSI_BUS_MAX)
@@ -1699,16 +1773,25 @@ scsi_disk_hard_reset(void)
 
             hdd_preset_apply(c);
 
-            if (!hdd[c].priv)
-                hdd[c].priv = (scsi_disk_t *) calloc(1, sizeof(scsi_disk_t));
+            if (hdd[c].priv == NULL) {
+                hdd[c].priv  = (scsi_disk_t *) calloc(1, sizeof(scsi_disk_t));
+                dev          = (scsi_disk_t *) hdd[c].priv;
+
+                char n[1024] = { 0 };
+
+                sprintf(n, "HDD %i SCSI ", c + 1);
+                dev->log     = log_open(n);
+            }
 
             dev = (scsi_disk_t *) hdd[c].priv;
 
-            if (!dev->tf)
+            scsi_disk_log(dev->log, "SCSI disk hard_reset drive=%d\n", c);
+
+            if (dev->tf == NULL)
                 dev->tf     = (ide_tf_t *) calloc(1, sizeof(ide_tf_t));
 
             /* SCSI disk, attach to the SCSI bus. */
-            sd = &scsi_devices[scsi_bus][scsi_id];
+            scsi_device_t *sd = &scsi_devices[scsi_bus][scsi_id];
 
             sd->sc             = (scsi_common_t *) dev;
             sd->command        = scsi_disk_command;
@@ -1718,18 +1801,22 @@ scsi_disk_hard_reset(void)
             sd->command_stop   = scsi_disk_command_stop;
             sd->type           = SCSI_FIXED_DISK;
 
-            scsi_disk_log("SCSI disk %i attached to SCSI ID %i\n", c, hdd[c].scsi_id);
-        } else if (hdd[c].bus == HDD_BUS_ATAPI) {
+            scsi_disk_log(dev->log, "SCSI disk %i attached to SCSI ID %i\n", c, hdd[c].scsi_id);
+        } else if (hdd[c].bus_type == HDD_BUS_ATAPI) {
             /* Make sure to ignore any SCSI disk whose image file name is empty. */
             if (strlen(hdd[c].fn) == 0)
                 continue;
 
             /* Make sure to ignore any SCSI disk whose image fails to load. */
+
             /* ATAPI hard disk, attach to the IDE bus. */
-            id = ide_get_drive(hdd[c].ide_channel);
-            /* If the IDE channel is initialized, we attach to it,
+            ide_t *id = ide_get_drive(hdd[c].ide_channel);
+
+            /*
+               If the IDE channel is initialized, we attach to it,
                otherwise, we do nothing - it's going to be a drive
-               that's not attached to anything. */
+               that's not attached to anything.
+             */
             if (id) {
                 if (!hdd_image_load(c))
                     continue;
@@ -1738,7 +1825,7 @@ scsi_disk_hard_reset(void)
 
                 hdd_preset_apply(c);
 
-                if (!hdd[c].priv)
+                if (hdd[c].priv == NULL)
                     hdd[c].priv = (scsi_disk_t *) calloc(1, sizeof(scsi_disk_t));
 
                 dev = (scsi_disk_t *) hdd[c].priv;
@@ -1758,12 +1845,15 @@ scsi_disk_hard_reset(void)
                 id->interrupt_drq    = 0;
 
                 ide_atapi_attach(id);
-            }
 
-            scsi_disk_log("ATAPI hard disk drive %i attached to IDE channel %i\n", c, hdd[c].ide_channel);
+                scsi_disk_log(dev->log, "ATAPI hard disk drive %i attached to IDE channel %i\n",
+                              c, hdd[c].ide_channel);
+            }
         }
 
         if (valid) {
+            dev          = (scsi_disk_t *) hdd[c].priv;
+
             dev->id      = c;
             dev->drv     = &hdd[c];
 
@@ -1779,28 +1869,32 @@ scsi_disk_hard_reset(void)
 void
 scsi_disk_close(void)
 {
-    scsi_disk_t *dev;
-    uint8_t      scsi_bus;
-    uint8_t      scsi_id;
-
     for (uint8_t c = 0; c < HDD_NUM; c++) {
-        if ((hdd[c].bus == HDD_BUS_SCSI) || (hdd[c].bus == HDD_BUS_ATAPI)) {
-            if (hdd[c].bus == HDD_BUS_SCSI) {
-                scsi_bus = (hdd[c].scsi_id >> 4) & 0x0f;
-                scsi_id  = hdd[c].scsi_id & 0x0f;
+        if ((hdd[c].bus_type == HDD_BUS_SCSI) || (hdd[c].bus_type == HDD_BUS_ATAPI)) {
+            if (hdd[c].bus_type == HDD_BUS_SCSI) {
+                const uint8_t scsi_bus = (hdd[c].scsi_id >> 4) & 0x0f;
+                const uint8_t scsi_id  = hdd[c].scsi_id & 0x0f;
 
                 memset(&scsi_devices[scsi_bus][scsi_id], 0x00, sizeof(scsi_device_t));
             }
 
             hdd_image_close(c);
 
-            dev = hdd[c].priv;
+            scsi_disk_t *dev = hdd[c].priv;
 
             if (dev) {
                 if (dev->tf)
                     free(dev->tf);
 
+                if (dev->log != NULL) {
+                    scsi_disk_log(dev->log, "Log closed\n");
+
+                    log_close(dev->log);
+                    dev->log = NULL;
+                }
+
                 free(dev);
+
                 hdd[c].priv = NULL;
             }
         }
diff --git a/src/scsi/scsi_ncr5380.c b/src/scsi/scsi_ncr5380.c
index e9ebe8504..132fade37 100644
--- a/src/scsi/scsi_ncr5380.c
+++ b/src/scsi/scsi_ncr5380.c
@@ -6,8 +6,8 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          Implementation of the NCR 5380 series of SCSI Host Adapters
- *          made by NCR. These controllers were designed for the ISA bus.
+ *          Implementation of the NCR 5380 chip made by NCR
+ *          and used in various controllers.
  *
  *
  *
@@ -16,8 +16,8 @@
  *          Fred N. van Kempen, <decwiz@yahoo.com>
  *
  *          Copyright 2017-2019 Sarah Walker.
- *          Copyright 2017-2019 TheCollector1995.
  *          Copyright 2017-2019 Fred N. van Kempen.
+ *          Copyright 2017-2024 TheCollector1995.
  */
 #include <inttypes.h>
 #include <stdio.h>
@@ -42,156 +42,11 @@
 #include <86box/scsi_device.h>
 #include <86box/scsi_ncr5380.h>
 
-#define LCS6821N_ROM            "roms/scsi/ncr5380/Longshine LCS-6821N - BIOS version 1.04.bin"
-#define RT1000B_810R_ROM        "roms/scsi/ncr5380/Rancho_RT1000_RTBios_version_8.10R.bin"
-#define RT1000B_820R_ROM        "roms/scsi/ncr5380/RTBIOS82.ROM"
-#define T130B_ROM               "roms/scsi/ncr5380/trantor_t130b_bios_v2.14.bin"
-#define T128_ROM                "roms/scsi/ncr5380/trantor_t128_bios_v1.12.bin"
-#define COREL_LS2000_ROM        "roms/scsi/ncr5380/Corel LS2000 - BIOS ROM - Ver 1.65.bin"
-
-#define NCR_CURDATA             0 /* current SCSI data (read only) */
-#define NCR_OUTDATA             0 /* output data (write only) */
-#define NCR_INITCOMMAND         1 /* initiator command (read/write) */
-#define NCR_MODE                2 /* mode (read/write) */
-#define NCR_TARGETCMD           3 /* target command (read/write) */
-#define NCR_SELENABLE           4 /* select enable (write only) */
-#define NCR_BUSSTATUS           4 /* bus status (read only) */
-#define NCR_STARTDMA            5 /* start DMA send (write only) */
-#define NCR_BUSANDSTAT          5 /* bus and status (read only) */
-#define NCR_DMATARGET           6 /* DMA target (write only) */
-#define NCR_INPUTDATA           6 /* input data (read only) */
-#define NCR_DMAINIRECV          7 /* DMA initiator receive (write only) */
-#define NCR_RESETPARITY         7 /* reset parity/interrupt (read only) */
-
-#define ICR_DBP                 0x01
-#define ICR_ATN                 0x02
-#define ICR_SEL                 0x04
-#define ICR_BSY                 0x08
-#define ICR_ACK                 0x10
-#define ICR_ARB_LOST            0x20
-#define ICR_ARB_IN_PROGRESS     0x40
-
-#define MODE_ARBITRATE          0x01
-#define MODE_DMA                0x02
-#define MODE_MONITOR_BUSY       0x04
-#define MODE_ENA_EOP_INT        0x08
-
-#define STATUS_ACK              0x01
-#define STATUS_BUSY_ERROR       0x04
-#define STATUS_PHASE_MATCH      0x08
-#define STATUS_INT              0x10
-#define STATUS_DRQ              0x40
-#define STATUS_END_OF_DMA       0x80
-
-#define TCR_IO                  0x01
-#define TCR_CD                  0x02
-#define TCR_MSG                 0x04
-#define TCR_REQ                 0x08
-#define TCR_LAST_BYTE_SENT      0x80
-
-#define CTRL_DATA_DIR           0x40
-#define STATUS_BUFFER_NOT_READY 0x04
-#define STATUS_53C80_ACCESSIBLE 0x80
-
-typedef struct ncr_t {
-    uint8_t icr;
-    uint8_t mode;
-    uint8_t tcr;
-    uint8_t data_wait;
-    uint8_t isr;
-    uint8_t output_data;
-    uint8_t target_id;
-    uint8_t tx_data;
-    uint8_t msglun;
-
-    uint8_t command[20];
-    uint8_t msgout[4];
-    int     msgout_pos;
-    int     is_msgout;
-
-    int dma_mode;
-    int cur_bus;
-    int bus_in;
-    int new_phase;
-    int state;
-    int clear_req;
-    int wait_data;
-    int wait_complete;
-    int command_pos;
-    int data_pos;
-} ncr_t;
-
-typedef struct t128_t {
-    uint8_t ctrl;
-    uint8_t status;
-    uint8_t buffer[512];
-    uint8_t ext_ram[0x80];
-    uint8_t block_count;
-
-    int block_loaded;
-    int pos, host_pos;
-
-    int bios_enabled;
-} t128_t;
-
-typedef struct ncr5380_t {
-    ncr_t  ncr;
-    t128_t t128;
-
-    const char *name;
-
-    uint8_t buffer[128];
-    uint8_t int_ram[0x40];
-    uint8_t ext_ram[0x600];
-
-    uint32_t rom_addr;
-    uint16_t base;
-
-    int8_t  irq;
-    int8_t  type;
-    int8_t  bios_ver;
-    uint8_t block_count;
-    uint8_t status_ctrl;
-    uint8_t bus, pad;
-
-    rom_t         bios_rom;
-    mem_mapping_t mapping;
-
-    int block_count_loaded;
-
-    int buffer_pos;
-    int buffer_host_pos;
-
-    int dma_enabled;
-
-    pc_timer_t timer;
-    double     period;
-
-    int     ncr_busy;
-    uint8_t pos_regs[8];
-} ncr5380_t;
-
-#define STATE_IDLE            0
-#define STATE_COMMAND         1
-#define STATE_DATAIN          2
-#define STATE_DATAOUT         3
-#define STATE_STATUS          4
-#define STATE_MESSAGEIN       5
-#define STATE_SELECT          6
-#define STATE_MESSAGEOUT      7
-#define STATE_MESSAGE_ID      8
-
-#define DMA_IDLE              0
-#define DMA_SEND              1
-#define DMA_INITIATOR_RECEIVE 2
-
-static int cmd_len[8] = { 6, 10, 10, 6, 16, 12, 10, 6 };
-
 #ifdef ENABLE_NCR5380_LOG
 int ncr5380_do_log = ENABLE_NCR5380_LOG;
 
 static void
-ncr_log(const char *fmt, ...)
+ncr5380_log(const char *fmt, ...)
 {
     va_list ap;
 
@@ -202,66 +57,60 @@ ncr_log(const char *fmt, ...)
     }
 }
 #else
-#    define ncr_log(fmt, ...)
+#    define ncr5380_log(fmt, ...)
 #endif
 
-#define SET_BUS_STATE(ncr, state) ncr->cur_bus = (ncr->cur_bus & ~(SCSI_PHASE_MESSAGE_IN)) | (state & (SCSI_PHASE_MESSAGE_IN))
-
-static void
-ncr_callback(void *priv);
-
-static void
-ncr_irq(ncr5380_t *ncr_dev, ncr_t *ncr, int set_irq)
+void
+ncr5380_irq(ncr_t *ncr, int set_irq)
 {
     if (set_irq) {
+        ncr->irq_state = 1;
         ncr->isr |= STATUS_INT;
-        picint(1 << ncr_dev->irq);
+        if (ncr->irq != -1)
+            picint(1 << ncr->irq);
     } else {
+        ncr->irq_state = 0;
         ncr->isr &= ~STATUS_INT;
-        picintc(1 << ncr_dev->irq);
+        if (ncr->irq != 1)
+            picintc(1 << ncr->irq);
     }
 }
 
-static int
-get_dev_id(uint8_t data)
+void
+ncr5380_set_irq(ncr_t *ncr, int irq)
 {
-    for (uint8_t c = 0; c < SCSI_ID_MAX; c++) {
-        if (data & (1 << c))
-            return c;
-    }
-
-    return -1;
-}
-
-static int
-getmsglen(uint8_t *msgp, int len)
-{
-    uint8_t msg = msgp[0];
-    if (msg == 0 || (msg >= 0x02 && msg <= 0x1f) || msg >= 0x80)
-        return 1;
-    if (msg >= 0x20 && msg <= 0x2f)
-        return 2;
-    if (len < 2)
-        return 3;
-    return msgp[1];
+    ncr->irq = irq;
 }
 
 static void
-ncr_reset(ncr5380_t *ncr_dev, ncr_t *ncr)
+ncr5380_reset(ncr_t *ncr)
 {
-    memset(ncr, 0x00, sizeof(ncr_t));
-    ncr_log("NCR Reset\n");
+    scsi_bus_t *scsi_bus = &ncr->scsibus;
 
-    timer_stop(&ncr_dev->timer);
+    ncr->output_data = 0;
+    ncr->mode = 0;
+    ncr->tcr = 0;
+    ncr->icr = 0;
+    ncr5380_log("NCR Reset\n");
 
-    for (int i = 0; i < 8; i++)
-        scsi_device_reset(&scsi_devices[ncr_dev->bus][i]);
+    ncr->timer(ncr->priv, 0.0);
 
-    ncr_irq(ncr_dev, ncr, 0);
+    scsi_bus->state = STATE_IDLE;
+    scsi_bus->clear_req = 0;
+    scsi_bus->wait_complete = 0;
+    scsi_bus->wait_data = 0;
+    scsi_bus->bus_in = 0;
+    scsi_bus->bus_out = 0;
+    scsi_bus->command_pos = 0;
+    scsi_bus->data_wait = 0;
+    scsi_bus->data = 0;
+    scsi_bus->command_issued = 0;
+
+    ncr5380_irq(ncr, 0);
 }
 
-static uint32_t
-get_bus_host(ncr_t *ncr)
+uint32_t
+ncr5380_get_bus_host(ncr_t *ncr)
 {
     uint32_t bus_host = 0;
 
@@ -298,427 +147,123 @@ get_bus_host(ncr_t *ncr)
     return (bus_host | BUS_SETDATA(ncr->output_data));
 }
 
-static void
-ncr_bus_read(ncr5380_t *ncr_dev)
+void
+ncr5380_write(uint16_t port, uint8_t val, ncr_t *ncr)
 {
-    ncr_t               *ncr = &ncr_dev->ncr;
-    const scsi_device_t *dev;
-    int                  phase;
-
-    /*Wait processes to handle bus requests*/
-    if (ncr->clear_req) {
-        ncr->clear_req--;
-        if (!ncr->clear_req) {
-            ncr_log("Prelude to command data\n");
-            SET_BUS_STATE(ncr, ncr->new_phase);
-            ncr->cur_bus |= BUS_REQ;
-        }
-    }
-
-    if (ncr->wait_data) {
-        ncr->wait_data--;
-        if (!ncr->wait_data) {
-            dev = &scsi_devices[ncr_dev->bus][ncr->target_id];
-            SET_BUS_STATE(ncr, ncr->new_phase);
-            phase = (ncr->cur_bus & SCSI_PHASE_MESSAGE_IN);
-
-            if (phase == SCSI_PHASE_DATA_IN) {
-                ncr->tx_data = dev->sc->temp_buffer[ncr->data_pos++];
-                ncr->state   = STATE_DATAIN;
-                ncr->cur_bus = (ncr->cur_bus & ~BUS_DATAMASK) | BUS_SETDATA(ncr->tx_data) | BUS_DBP;
-            } else if (phase == SCSI_PHASE_DATA_OUT) {
-                if (ncr->new_phase & BUS_IDLE) {
-                    ncr->state = STATE_IDLE;
-                    ncr->cur_bus &= ~BUS_BSY;
-                } else
-                    ncr->state = STATE_DATAOUT;
-            } else if (phase == SCSI_PHASE_STATUS) {
-                ncr->cur_bus |= BUS_REQ;
-                ncr->state   = STATE_STATUS;
-                ncr->cur_bus = (ncr->cur_bus & ~BUS_DATAMASK) | BUS_SETDATA(dev->status) | BUS_DBP;
-            } else if (phase == SCSI_PHASE_MESSAGE_IN) {
-                ncr->state   = STATE_MESSAGEIN;
-                ncr->cur_bus = (ncr->cur_bus & ~BUS_DATAMASK) | BUS_SETDATA(0) | BUS_DBP;
-            } else if (phase == SCSI_PHASE_MESSAGE_OUT) {
-                ncr->cur_bus |= BUS_REQ;
-                ncr->state   = STATE_MESSAGEOUT;
-                ncr->cur_bus = (ncr->cur_bus & ~BUS_DATAMASK) | BUS_SETDATA(ncr->target_id >> 5) | BUS_DBP;
-            }
-        }
-    }
-
-    if (ncr->wait_complete) {
-        ncr->wait_complete--;
-        if (!ncr->wait_complete)
-            ncr->cur_bus |= BUS_REQ;
-    }
-}
-
-static void
-ncr_bus_update(void *priv, int bus)
-{
-    ncr5380_t     *ncr_dev = (ncr5380_t *) priv;
-    ncr_t         *ncr     = &ncr_dev->ncr;
-    scsi_device_t *dev     = &scsi_devices[ncr_dev->bus][ncr->target_id];
-    double         p;
-    uint8_t        sel_data;
-    int            msglen;
-
-    /*Start the SCSI command layer, which will also make the timings*/
-    if (bus & BUS_ARB)
-        ncr->state = STATE_IDLE;
-
-    ncr_log("State = %i\n", ncr->state);
-
-    switch (ncr->state) {
-        case STATE_IDLE:
-            ncr->clear_req = ncr->wait_data = ncr->wait_complete = 0;
-            if ((bus & BUS_SEL) && !(bus & BUS_BSY)) {
-                ncr_log("Selection phase\n");
-                sel_data = BUS_GETDATA(bus);
-
-                ncr->target_id = get_dev_id(sel_data);
-
-                ncr_log("Select - target ID = %i\n", ncr->target_id);
-
-                /*Once the device has been found and selected, mark it as busy*/
-                if ((ncr->target_id != (uint8_t) -1) && scsi_device_present(&scsi_devices[ncr_dev->bus][ncr->target_id])) {
-                    ncr->cur_bus |= BUS_BSY;
-                    ncr->state = STATE_SELECT;
-                } else {
-                    ncr_log("Device not found at ID %i, Current Bus BSY=%02x\n", ncr->target_id, ncr->cur_bus);
-                    ncr->cur_bus = 0;
-                }
-            }
-            break;
-        case STATE_SELECT:
-            if (!(bus & BUS_SEL)) {
-                if (!(bus & BUS_ATN)) {
-                    if ((ncr->target_id != (uint8_t) -1) && scsi_device_present(&scsi_devices[ncr_dev->bus][ncr->target_id])) {
-                        ncr_log("Device found at ID %i, Current Bus BSY=%02x\n", ncr->target_id, ncr->cur_bus);
-                        ncr->state   = STATE_COMMAND;
-                        ncr->cur_bus = BUS_BSY | BUS_REQ;
-                        ncr_log("CurBus BSY|REQ=%02x\n", ncr->cur_bus);
-                        ncr->command_pos = 0;
-                        SET_BUS_STATE(ncr, SCSI_PHASE_COMMAND);
-                    } else {
-                        ncr->state   = STATE_IDLE;
-                        ncr->cur_bus = 0;
-                    }
-                } else {
-                    ncr_log("Set to SCSI Message Out\n");
-                    ncr->new_phase  = SCSI_PHASE_MESSAGE_OUT;
-                    ncr->wait_data  = 4;
-                    ncr->msgout_pos = 0;
-                    ncr->is_msgout  = 1;
-                }
-            }
-            break;
-        case STATE_COMMAND:
-            if ((bus & BUS_ACK) && !(ncr->bus_in & BUS_ACK)) {
-                /*Write command byte to the output data register*/
-                ncr->command[ncr->command_pos++] = BUS_GETDATA(bus);
-                ncr->clear_req                   = 3;
-                ncr->new_phase                   = ncr->cur_bus & SCSI_PHASE_MESSAGE_IN;
-                ncr->cur_bus &= ~BUS_REQ;
-
-                ncr_log("Command pos=%i, output data=%02x\n", ncr->command_pos, BUS_GETDATA(bus));
-
-                if (ncr->command_pos == cmd_len[(ncr->command[0] >> 5) & 7]) {
-                    if (ncr->is_msgout) {
-                        ncr->is_msgout = 0;
-#if 0
-                        ncr->command[1] = (ncr->command[1] & 0x1f) | (ncr->msglun << 5);
-#endif
-                    }
-
-                    /*Reset data position to default*/
-                    ncr->data_pos = 0;
-
-                    dev = &scsi_devices[ncr_dev->bus][ncr->target_id];
-
-                    ncr_log("SCSI Command 0x%02X for ID %d, status code=%02x\n", ncr->command[0], ncr->target_id, dev->status);
-                    dev->buffer_length = -1;
-                    scsi_device_command_phase0(dev, ncr->command);
-                    ncr_log("SCSI ID %i: Command %02X: Buffer Length %i, SCSI Phase %02X\n", ncr->target_id, ncr->command[0], dev->buffer_length, dev->phase);
-
-                    ncr_dev->period = 1.0;
-                    ncr->wait_data  = 4;
-                    ncr->data_wait  = 0;
-
-                    if (dev->status == SCSI_STATUS_OK) {
-                        /*If the SCSI phase is Data In or Data Out, allocate the SCSI buffer based on the transfer length of the command*/
-                        if (dev->buffer_length && (dev->phase == SCSI_PHASE_DATA_IN || dev->phase == SCSI_PHASE_DATA_OUT)) {
-                            p = scsi_device_get_callback(dev);
-                            ncr_dev->period = (p > 0.0) ? p : (((double) dev->buffer_length) * 0.2);
-                            ncr_log("SCSI ID %i: command 0x%02x for p = %lf, update = %lf, len = %i, dmamode = %x\n", ncr->target_id, ncr->command[0], scsi_device_get_callback(dev), ncr_dev->period, dev->buffer_length, ncr->dma_mode);
-                        }
-                    }
-                    ncr->new_phase = dev->phase;
-                }
-            }
-            break;
-        case STATE_DATAIN:
-            dev = &scsi_devices[ncr_dev->bus][ncr->target_id];
-            if ((bus & BUS_ACK) && !(ncr->bus_in & BUS_ACK)) {
-                if (ncr->data_pos >= dev->buffer_length) {
-                    ncr->cur_bus &= ~BUS_REQ;
-                    scsi_device_command_phase1(dev);
-                    ncr->new_phase     = SCSI_PHASE_STATUS;
-                    ncr->wait_data     = 4;
-                    ncr->wait_complete = 8;
-                } else {
-                    ncr->tx_data = dev->sc->temp_buffer[ncr->data_pos++];
-                    ncr->cur_bus = (ncr->cur_bus & ~BUS_DATAMASK) | BUS_SETDATA(ncr->tx_data) | BUS_DBP | BUS_REQ;
-                    if (ncr->dma_mode == DMA_IDLE) { /*If a data in command that is not read 6/10 has been issued*/
-                        ncr->data_wait |= 1;
-                        ncr_log("DMA mode idle in\n");
-                        timer_on_auto(&ncr_dev->timer, ncr_dev->period);
-                    } else {
-                        ncr_log("DMA mode IN.\n");
-                        ncr->clear_req = 3;
-                    }
-
-                    ncr->cur_bus &= ~BUS_REQ;
-                    ncr->new_phase = SCSI_PHASE_DATA_IN;
-                }
-            }
-            break;
-        case STATE_DATAOUT:
-            dev = &scsi_devices[ncr_dev->bus][ncr->target_id];
-            if ((bus & BUS_ACK) && !(ncr->bus_in & BUS_ACK)) {
-                dev->sc->temp_buffer[ncr->data_pos++] = BUS_GETDATA(bus);
-
-                if (ncr->data_pos >= dev->buffer_length) {
-                    ncr->cur_bus &= ~BUS_REQ;
-                    scsi_device_command_phase1(dev);
-                    ncr->new_phase     = SCSI_PHASE_STATUS;
-                    ncr->wait_data     = 4;
-                    ncr->wait_complete = 8;
-                } else {
-                    /*More data is to be transferred, place a request*/
-                    if (ncr->dma_mode == DMA_IDLE) { /*If a data out command that is not write 6/10 has been issued*/
-                        ncr->data_wait |= 1;
-                        ncr_log("DMA mode idle out\n");
-                        timer_on_auto(&ncr_dev->timer, ncr_dev->period);
-                    } else
-                        ncr->clear_req = 3;
-
-                    ncr->cur_bus &= ~BUS_REQ;
-                    ncr_log("CurBus ~REQ_DataOut=%02x\n", ncr->cur_bus);
-                }
-            }
-            break;
-        case STATE_STATUS:
-            if ((bus & BUS_ACK) && !(ncr->bus_in & BUS_ACK)) {
-                /*All transfers done, wait until next transfer*/
-                scsi_device_identify(&scsi_devices[ncr_dev->bus][ncr->target_id], SCSI_LUN_USE_CDB);
-                ncr->cur_bus &= ~BUS_REQ;
-                ncr->new_phase     = SCSI_PHASE_MESSAGE_IN;
-                ncr->wait_data     = 4;
-                ncr->wait_complete = 8;
-            }
-            break;
-        case STATE_MESSAGEIN:
-            if ((bus & BUS_ACK) && !(ncr->bus_in & BUS_ACK)) {
-                ncr->cur_bus &= ~BUS_REQ;
-                ncr->new_phase = BUS_IDLE;
-                ncr->wait_data = 4;
-            }
-            break;
-        case STATE_MESSAGEOUT:
-            ncr_log("Ack on MSGOUT = %02x\n", (bus & BUS_ACK));
-            if ((bus & BUS_ACK) && !(ncr->bus_in & BUS_ACK)) {
-                ncr->msgout[ncr->msgout_pos++] = BUS_GETDATA(bus);
-                msglen                         = getmsglen(ncr->msgout, ncr->msgout_pos);
-                if (ncr->msgout_pos >= msglen) {
-                    if ((ncr->msgout[0] & (0x80 | 0x20)) == 0x80)
-                        ncr->msglun = ncr->msgout[0] & 7;
-                    ncr->cur_bus &= ~BUS_REQ;
-                    ncr->state = STATE_MESSAGE_ID;
-                }
-            }
-            break;
-        case STATE_MESSAGE_ID:
-            if ((ncr->target_id != (uint8_t) -1) && scsi_device_present(&scsi_devices[ncr_dev->bus][ncr->target_id])) {
-                ncr_log("Device found at ID %i on MSGOUT, Current Bus BSY=%02x\n", ncr->target_id, ncr->cur_bus);
-                scsi_device_identify(&scsi_devices[ncr_dev->bus][ncr->target_id], ncr->msglun);
-                ncr->state   = STATE_COMMAND;
-                ncr->cur_bus = BUS_BSY | BUS_REQ;
-                ncr_log("CurBus BSY|REQ=%02x\n", ncr->cur_bus);
-                ncr->command_pos = 0;
-                SET_BUS_STATE(ncr, SCSI_PHASE_COMMAND);
-            }
-            break;
-
-        default:
-            break;
-    }
-
-    ncr->bus_in = bus;
-}
-
-static void
-ncr_write(uint16_t port, uint8_t val, void *priv)
-{
-    ncr5380_t           *ncr_dev  = (ncr5380_t *) priv;
-    ncr_t               *ncr      = &ncr_dev->ncr;
-    scsi_device_t       *dev      = &scsi_devices[ncr_dev->bus][ncr->target_id];
+    scsi_bus_t          *scsi_bus   = &ncr->scsibus;
     int                  bus_host = 0;
 
-    ncr_log("NCR5380 write(%04x,%02x)\n", port & 7, val);
+    ncr5380_log("NCR5380 write(%04x,%02x)\n", port & 7, val);
 
     switch (port & 7) {
         case 0: /* Output data register */
-            ncr_log("Write: Output data register, val = %02x\n", val);
+            ncr5380_log("[%04X:%08X]: Write: Output data register, val=%02x\n", CS, cpu_state.pc, val);
             ncr->output_data = val;
             break;
 
         case 1: /* Initiator Command Register */
-            ncr_log("Write: Initiator command register\n");
+            ncr5380_log("[%04X:%08X]: Write: Initiator command register, val=%02x.\n", CS, cpu_state.pc, val);
             if ((val & 0x80) && !(ncr->icr & 0x80)) {
-                ncr_log("Resetting the 5380\n");
-                ncr_reset(ncr_dev, &ncr_dev->ncr);
+                ncr5380_log("Resetting the 5380\n");
+                ncr5380_reset(ncr);
+                ncr5380_irq(ncr, 1);
             }
             ncr->icr = val;
+            ncr5380_log("ICR WaitData=%d, ClearReq=%d.\n", scsi_bus->wait_data, scsi_bus->clear_req);
             break;
 
         case 2: /* Mode register */
-            ncr_log("Write: Mode register, val=%02x.\n", val);
+            ncr5380_log("Write: Mode register, val=%02x.\n", val);
             if ((val & MODE_ARBITRATE) && !(ncr->mode & MODE_ARBITRATE)) {
                 ncr->icr &= ~ICR_ARB_LOST;
                 ncr->icr |= ICR_ARB_IN_PROGRESS;
             }
-
             ncr->mode = val;
-
-            if (ncr_dev->type == 3) {
-                /*Don't stop the timer until it finishes the transfer*/
-                if (ncr_dev->t128.block_loaded && (ncr->mode & MODE_DMA)) {
-                    ncr_log("Continuing DMA mode\n");
-                    timer_on_auto(&ncr_dev->timer, ncr_dev->period + 1.0);
-                }
-
-                /*When a pseudo-DMA transfer has completed (Send or Initiator Receive), mark it as complete and idle the status*/
-                if (!ncr_dev->t128.block_loaded && !(ncr->mode & MODE_DMA)) {
-                    ncr_log("No DMA mode\n");
-                    ncr->tcr &= ~TCR_LAST_BYTE_SENT;
-                    ncr->isr &= ~STATUS_END_OF_DMA;
-                    ncr->dma_mode = DMA_IDLE;
-                }
-            } else {
-                /*When a pseudo-DMA transfer has completed (Send or Initiator Receive), mark it as complete and idle the status*/
-                if (!ncr_dev->block_count_loaded && !(ncr->mode & MODE_DMA)) {
-                    ncr_log("No DMA mode\n");
-                    ncr->tcr &= ~TCR_LAST_BYTE_SENT;
-                    ncr->isr &= ~STATUS_END_OF_DMA;
-                    ncr->dma_mode = DMA_IDLE;
-                }
-            }
+            ncr->dma_mode_ext(ncr, ncr->priv, val);
             break;
 
         case 3: /* Target Command Register */
-            ncr_log("Write: Target Command register\n");
+            ncr5380_log("Write: Target Command register, val=%02x.\n", val);
             ncr->tcr = val;
             break;
 
         case 4: /* Select Enable Register */
-            ncr_log("Write: Select Enable register\n");
+            ncr5380_log("Write: Select Enable register\n");
             break;
 
         case 5: /* start DMA Send */
-            ncr_log("Write: start DMA send register\n");
+            ncr5380_log("Write: start DMA send register\n");
             /*a Write 6/10 has occurred, start the timer when the block count is loaded*/
-            ncr->dma_mode = DMA_SEND;
-            if (ncr_dev->type == 3) {
-                if ((ncr->mode & MODE_DMA) && !timer_is_on(&ncr_dev->timer) && (dev->buffer_length > 0)) {
-                    memset(ncr_dev->t128.buffer, 0, MIN(512, dev->buffer_length));
-                    ncr_dev->t128.status |= 0x04;
-                    ncr_dev->t128.host_pos = 0;
-                    ncr_dev->t128.block_count = dev->buffer_length >> 9;
-
-                    if (dev->buffer_length < 512)
-                        ncr_dev->t128.block_count = 1;
-
-                    ncr_dev->t128.block_loaded = 1;
-                }
-            }
+            scsi_bus->tx_mode = DMA_OUT_TX_BUS;
+            if (ncr->dma_send_ext)
+                ncr->dma_send_ext(ncr, ncr->priv);
             break;
 
         case 7: /* start DMA Initiator Receive */
-            ncr_log("Write: start DMA initiator receive register, dma? = %02x\n", ncr->mode & MODE_DMA);
+            ncr5380_log("[%04X:%08X]: Write: start DMA initiator receive register, waitdata=%d, clearreq=%d.\n", CS, cpu_state.pc, scsi_bus->wait_data, scsi_bus->clear_req);
             /*a Read 6/10 has occurred, start the timer when the block count is loaded*/
-            ncr->dma_mode = DMA_INITIATOR_RECEIVE;
-            if (ncr_dev->type == 3) {
-                if ((ncr->mode & MODE_DMA) && !timer_is_on(&ncr_dev->timer) && (dev->buffer_length > 0)) {
-                    memset(ncr_dev->t128.buffer, 0, MIN(512, dev->buffer_length));
-                    ncr_dev->t128.status |= 0x04;
-                    ncr_dev->t128.host_pos = MIN(512, dev->buffer_length);
-                    ncr_dev->t128.block_count = dev->buffer_length >> 9;
-
-                    if (dev->buffer_length < 512)
-                        ncr_dev->t128.block_count = 1;
-
-                    ncr_dev->t128.block_loaded = 1;
-                    timer_on_auto(&ncr_dev->timer, 0.02);
-                }
-            }
+            scsi_bus->tx_mode = DMA_IN_TX_BUS;
+            if (ncr->dma_initiator_receive_ext)
+                ncr->dma_initiator_receive_ext(ncr, ncr->priv);
             break;
 
         default:
-            ncr_log("NCR5380: bad write %04x %02x\n", port, val);
+            ncr5380_log("NCR5380: bad write %04x %02x\n", port, val);
             break;
     }
 
-    bus_host = get_bus_host(ncr);
-    ncr_bus_update(priv, bus_host);
+    bus_host = ncr5380_get_bus_host(ncr);
+    scsi_bus_update(scsi_bus, bus_host);
 }
 
-static uint8_t
-ncr_read(uint16_t port, void *priv)
+uint8_t
+ncr5380_read(uint16_t port, ncr_t *ncr)
 {
-    ncr5380_t *ncr_dev = (ncr5380_t *) priv;
-    ncr_t     *ncr     = &ncr_dev->ncr;
-    uint8_t    ret     = 0xff;
+    scsi_bus_t *scsi_bus    = &ncr->scsibus;
+    uint8_t    ret          = 0xff;
     int        bus;
     int        bus_state;
 
     switch (port & 7) {
         case 0: /* Current SCSI data */
-            ncr_log("Read: Current SCSI data register\n");
+            ncr5380_log("Read: Current SCSI data register\n");
             if (ncr->icr & ICR_DBP) {
                 /*Return the data from the output register if on data bus phase from ICR*/
-                ncr_log("Data Bus Phase, ret = %02x\n", ncr->output_data);
-                ret = ncr->output_data;
+                if (scsi_bus->command_issued) {
+                    bus = scsi_bus_read(scsi_bus);
+                    ret = BUS_GETDATA(bus);
+                } else
+                    ret = ncr->output_data;
+
+                ncr5380_log("[%04X:%08X]: Data Bus Phase, CMDissued=%d, ret=%02x, clearreq=%d, waitdata=%x, txmode=%x.\n", CS, cpu_state.pc, scsi_bus->command_issued, ret, scsi_bus->clear_req, scsi_bus->wait_data, scsi_bus->tx_mode);
             } else {
                 /*Return the data from the SCSI bus*/
-                ncr_bus_read(ncr_dev);
-                ncr_log("NCR GetData=%02x\n", BUS_GETDATA(ncr->cur_bus));
-                ret = BUS_GETDATA(ncr->cur_bus);
+                bus = scsi_bus_read(scsi_bus);
+                ret = BUS_GETDATA(bus);
+                ncr5380_log("[%04X:%08X]: NCR Get SCSI bus data=%02x.\n", CS, cpu_state.pc, ret);
             }
             break;
 
         case 1: /* Initiator Command Register */
-            ncr_log("Read: Initiator Command register, NCR ICR Read=%02x\n", ncr->icr);
+            ncr5380_log("Read: Initiator Command register, NCR ICR Read=%02x\n", ncr->icr);
             ret = ncr->icr;
             break;
 
         case 2: /* Mode register */
-            ncr_log("Read: Mode register = %02x.\n", ncr->mode);
+            ncr5380_log("Read: Mode register = %02x.\n", ncr->mode);
             ret = ncr->mode;
             break;
 
         case 3: /* Target Command Register */
-            ncr_log("Read: Target Command register, NCR target stat=%02x\n", ncr->tcr);
+            ncr5380_log("Read: Target Command register, NCR target stat=%02x\n", ncr->tcr);
             ret = ncr->tcr;
             break;
 
         case 4: /* Current SCSI Bus status */
-            ncr_log("Read: SCSI bus status register\n");
+            ncr5380_log("Read: SCSI bus status register\n");
             ret = 0;
-            ncr_bus_read(ncr_dev);
-            ncr_log("NCR cur bus stat=%02x\n", ncr->cur_bus & 0xff);
-            ret |= (ncr->cur_bus & 0xff);
+            bus = scsi_bus_read(scsi_bus);
+            ret |= (bus & 0xff);
             if (ncr->icr & ICR_SEL)
                 ret |= BUS_SEL;
             if (ncr->icr & ICR_BSY)
@@ -726,20 +271,19 @@ ncr_read(uint16_t port, void *priv)
             break;
 
         case 5: /* Bus and Status register */
-            ncr_log("Read: Bus and Status register\n");
+            ncr5380_log("Read: Bus and Status register\n");
             ret = 0;
 
-            bus = get_bus_host(ncr);
-            ncr_log("Get host from Interrupt\n");
+            bus = ncr5380_get_bus_host(ncr);
+            ncr5380_log("Get host from Interrupt\n");
 
             /*Check if the phase in process matches with TCR's*/
-            if ((bus & SCSI_PHASE_MESSAGE_IN) == (ncr->cur_bus & SCSI_PHASE_MESSAGE_IN)) {
-                ncr_log("Phase match\n");
+            if ((bus & SCSI_PHASE_MESSAGE_IN) == (scsi_bus->bus_out & SCSI_PHASE_MESSAGE_IN)) {
+                ncr5380_log("Phase match\n");
                 ret |= STATUS_PHASE_MATCH;
             }
 
-            ncr_bus_read(ncr_dev);
-            bus = ncr->cur_bus;
+            bus = scsi_bus_read(scsi_bus);
 
             if ((bus & BUS_ACK) || (ncr->icr & ICR_ACK))
                 ret |= STATUS_ACK;
@@ -747,7 +291,7 @@ ncr_read(uint16_t port, void *priv)
                 ret |= 0x02;
 
             if ((bus & BUS_REQ) && (ncr->mode & MODE_DMA)) {
-                ncr_log("Entering DMA mode\n");
+                ncr5380_log("Entering DMA mode\n");
                 ret |= STATUS_DRQ;
 
                 bus_state = 0;
@@ -759,1202 +303,36 @@ ncr_read(uint16_t port, void *priv)
                 if (bus & BUS_MSG)
                     bus_state |= TCR_MSG;
                 if ((ncr->tcr & 7) != bus_state) {
-                    ncr_irq(ncr_dev, ncr, 1);
-                    ncr_log("IRQ issued\n");
+                    ncr5380_irq(ncr, 1);
+                    ncr5380_log("IRQ issued\n");
                 }
             }
             if (!(bus & BUS_BSY) && (ncr->mode & MODE_MONITOR_BUSY)) {
-                ncr_log("Busy error\n");
+                ncr5380_log("Busy error\n");
                 ret |= STATUS_BUSY_ERROR;
             }
             ret |= (ncr->isr & (STATUS_INT | STATUS_END_OF_DMA));
+            ncr->isr_reg = ret;
             break;
 
         case 6:
-            ret = ncr->tx_data;
+            ncr5380_log("Read: Input Data.\n");
+            bus = scsi_bus_read(scsi_bus);
+            ret = BUS_GETDATA(bus);
             break;
 
         case 7: /* reset Parity/Interrupt */
             ncr->isr &= ~(STATUS_BUSY_ERROR | 0x20);
-            ncr_irq(ncr_dev, ncr, 0);
-            ncr_log("Reset Interrupt\n");
+            ncr5380_irq(ncr, 0);
+            ncr5380_log("Reset Interrupt\n");
             break;
 
         default:
-            ncr_log("NCR5380: bad read %04x\n", port);
+            ncr5380_log("NCR5380: bad read %04x\n", port);
             break;
     }
 
-    ncr_log("NCR5380 read(%04x)=%02x\n", port & 7, ret);
+    ncr5380_log("NCR5380 read(%04x)=%02x\n", port & 7, ret);
 
     return ret;
 }
-
-/* Memory-mapped I/O READ handler. */
-static uint8_t
-memio_read(uint32_t addr, void *priv)
-{
-    ncr5380_t           *ncr_dev = (ncr5380_t *) priv;
-    ncr_t               *ncr     = &ncr_dev->ncr;
-    scsi_device_t       *dev     = &scsi_devices[ncr_dev->bus][ncr->target_id];
-    uint8_t              ret     = 0xff;
-
-    addr &= 0x3fff;
-
-    if (addr < 0x2000)
-        ret = ncr_dev->bios_rom.rom[addr & 0x1fff];
-    else if (addr < 0x3800)
-        ret = 0xff;
-    else if (addr >= 0x3a00)
-        ret = ncr_dev->ext_ram[addr - 0x3a00];
-    else
-        switch (addr & 0x3f80) {
-            case 0x3800:
-#if ENABLE_NCR5380_LOG
-                ncr_log("Read intRAM %02x %02x\n", addr & 0x3f, ncr_dev->int_ram[addr & 0x3f]);
-#endif
-                ret = ncr_dev->int_ram[addr & 0x3f];
-                break;
-
-            case 0x3880:
-#if ENABLE_NCR5380_LOG
-                ncr_log("Read 53c80 %04x\n", addr);
-#endif
-                ret = ncr_read(addr, ncr_dev);
-                break;
-
-            case 0x3900:
-                if (ncr_dev->buffer_host_pos >= MIN(128, dev->buffer_length) || (!(ncr_dev->status_ctrl & CTRL_DATA_DIR))) {
-                    ret = 0xff;
-                    ncr_log("No Read.\n");
-                } else {
-                    ret = ncr_dev->buffer[ncr_dev->buffer_host_pos++];
-                    ncr_log("Read host pos = %i, ret = %02x\n", ncr_dev->buffer_host_pos, ret);
-
-                    if (ncr_dev->buffer_host_pos == MIN(128, dev->buffer_length)) {
-                        ncr_dev->status_ctrl |= STATUS_BUFFER_NOT_READY;
-                        ncr_log("Transfer busy read, status = %02x\n", ncr_dev->status_ctrl);
-                    }
-                }
-                break;
-
-            case 0x3980:
-                switch (addr) {
-                    case 0x3980: /* status */
-                        ret = ncr_dev->status_ctrl;
-                        ncr_log("NCR status ctrl read=%02x\n", ncr_dev->status_ctrl & STATUS_BUFFER_NOT_READY);
-                        if (!ncr_dev->ncr_busy)
-                            ret |= STATUS_53C80_ACCESSIBLE;
-                        if (ncr->mode & 0x30) {            /*Parity bits*/
-                            if (!(ncr->mode & MODE_DMA)) { /*This is to avoid RTBios 8.10R BIOS problems with the hard disk and detection.*/
-                                ret |= 0x01;               /*If the parity bits are set, bit 0 of the 53c400 status port should be set as well.*/
-                                ncr->mode = 0;             /*Required by RTASPI10.SYS otherwise it won't initialize.*/
-                            }
-                        }
-                        ncr_log("NCR 53c400 status = %02x.\n", ret);
-                        break;
-
-                    case 0x3981: /* block counter register*/
-                        ret = ncr_dev->block_count;
-                        break;
-
-                    case 0x3982: /* switch register read */
-                        ret = 0xf8;
-                        ret |= (ncr_dev->irq & 0x07);
-                        ncr_log("Switches read=%02x.\n", ret);
-                        break;
-
-                    default:
-                        break;
-                }
-                break;
-
-            default:
-                break;
-        }
-
-#if ENABLE_NCR5380_LOG
-    if (addr >= 0x3880)
-        ncr_log("memio_read(%08x)=%02x\n", addr, ret);
-#endif
-
-    return ret;
-}
-
-/* Memory-mapped I/O WRITE handler. */
-static void
-memio_write(uint32_t addr, uint8_t val, void *priv)
-{
-    ncr5380_t           *ncr_dev = (ncr5380_t *) priv;
-    ncr_t               *ncr     = &ncr_dev->ncr;
-    scsi_device_t       *dev     = &scsi_devices[ncr_dev->bus][ncr->target_id];
-
-    addr &= 0x3fff;
-
-    if (addr >= 0x3a00)
-        ncr_dev->ext_ram[addr - 0x3a00] = val;
-    else
-        switch (addr & 0x3f80) {
-            case 0x3800:
-                ncr_dev->int_ram[addr & 0x3f] = val;
-                break;
-
-            case 0x3880:
-                ncr_write(addr, val, ncr_dev);
-                break;
-
-            case 0x3900:
-                if (!(ncr_dev->status_ctrl & CTRL_DATA_DIR) && ncr_dev->buffer_host_pos < MIN(128, dev->buffer_length)) {
-                    ncr_dev->buffer[ncr_dev->buffer_host_pos++] = val;
-
-                    ncr_log("Write host pos = %i, val = %02x\n", ncr_dev->buffer_host_pos, val);
-
-                    if (ncr_dev->buffer_host_pos == MIN(128, dev->buffer_length)) {
-                        ncr_dev->status_ctrl |= STATUS_BUFFER_NOT_READY;
-                        ncr_dev->ncr_busy = 1;
-                    }
-                }
-                break;
-
-            case 0x3980:
-                switch (addr) {
-                    case 0x3980: /* Control */
-                        ncr_log("NCR 53c400 control = %02x, mode = %02x.\n", val, ncr->mode);
-                        if ((val & CTRL_DATA_DIR) && !(ncr_dev->status_ctrl & CTRL_DATA_DIR)) {
-                            ncr_dev->buffer_host_pos = MIN(128, dev->buffer_length);
-                            ncr_dev->status_ctrl |= STATUS_BUFFER_NOT_READY;
-                        } else if (!(val & CTRL_DATA_DIR) && (ncr_dev->status_ctrl & CTRL_DATA_DIR)) {
-                            ncr_dev->buffer_host_pos = 0;
-                            ncr_dev->status_ctrl &= ~STATUS_BUFFER_NOT_READY;
-                        }
-                        ncr_dev->status_ctrl = (ncr_dev->status_ctrl & 0x87) | (val & 0x78);
-                        break;
-
-                    case 0x3981: /* block counter register */
-                        ncr_log("Write block counter register: val=%d, dma mode=%x, period=%lf\n", val, ncr->dma_mode, ncr_dev->period);
-                        ncr_dev->block_count        = val;
-                        ncr_dev->block_count_loaded = 1;
-
-                        if (ncr_dev->status_ctrl & CTRL_DATA_DIR) {
-                            ncr_dev->buffer_host_pos = MIN(128, dev->buffer_length);
-                            ncr_dev->status_ctrl |= STATUS_BUFFER_NOT_READY;
-                        } else {
-                            ncr_dev->buffer_host_pos = 0;
-                            ncr_dev->status_ctrl &= ~STATUS_BUFFER_NOT_READY;
-                        }
-                        if ((ncr->mode & MODE_DMA) && !timer_is_on(&ncr_dev->timer) && (dev->buffer_length > 0)) {
-                            memset(ncr_dev->buffer, 0, MIN(128, dev->buffer_length));
-                            ncr_log("DMA timer on\n");
-                            timer_on_auto(&ncr_dev->timer, ncr_dev->period);
-                        }
-                        break;
-
-                    default:
-                        break;
-                }
-                break;
-
-            default:
-                break;
-        }
-}
-
-/* Memory-mapped I/O READ handler for the Trantor T130B. */
-static uint8_t
-t130b_read(uint32_t addr, void *priv)
-{
-    const ncr5380_t *ncr_dev = (ncr5380_t *) priv;
-    uint8_t          ret     = 0xff;
-
-    addr &= 0x3fff;
-    if (addr < 0x1800)
-        ret = ncr_dev->bios_rom.rom[addr & 0x1fff];
-    else if (addr >= 0x1800 && addr < 0x1880)
-        ret = ncr_dev->ext_ram[addr & 0x7f];
-
-    ncr_log("MEM: Reading %02X from %08X\n", ret, addr);
-    return ret;
-}
-
-/* Memory-mapped I/O WRITE handler for the Trantor T130B. */
-static void
-t130b_write(uint32_t addr, uint8_t val, void *priv)
-{
-    ncr5380_t *ncr_dev = (ncr5380_t *) priv;
-
-    addr &= 0x3fff;
-    ncr_log("MEM: Writing %02X to %08X\n", val, addr);
-    if (addr >= 0x1800 && addr < 0x1880)
-        ncr_dev->ext_ram[addr & 0x7f] = val;
-}
-
-static uint8_t
-t130b_in(uint16_t port, void *priv)
-{
-    ncr5380_t *ncr_dev = (ncr5380_t *) priv;
-    uint8_t    ret     = 0xff;
-
-    switch (port & 0x0f) {
-        case 0x00:
-        case 0x01:
-        case 0x02:
-        case 0x03:
-            ret = memio_read((port & 7) | 0x3980, ncr_dev);
-            break;
-
-        case 0x04:
-        case 0x05:
-            ret = memio_read(0x3900, ncr_dev);
-            break;
-
-        case 0x08:
-        case 0x09:
-        case 0x0a:
-        case 0x0b:
-        case 0x0c:
-        case 0x0d:
-        case 0x0e:
-        case 0x0f:
-            ret = ncr_read(port, ncr_dev);
-            break;
-
-        default:
-            break;
-    }
-
-    ncr_log("I/O: Reading %02X from %04X\n", ret, port);
-    return ret;
-}
-
-static void
-t130b_out(uint16_t port, uint8_t val, void *priv)
-{
-    ncr5380_t *ncr_dev = (ncr5380_t *) priv;
-
-    ncr_log("I/O: Writing %02X to %04X\n", val, port);
-
-    switch (port & 0x0f) {
-        case 0x00:
-        case 0x01:
-        case 0x02:
-        case 0x03:
-            memio_write((port & 7) | 0x3980, val, ncr_dev);
-            break;
-
-        case 0x04:
-        case 0x05:
-            memio_write(0x3900, val, ncr_dev);
-            break;
-
-        case 0x08:
-        case 0x09:
-        case 0x0a:
-        case 0x0b:
-        case 0x0c:
-        case 0x0d:
-        case 0x0e:
-        case 0x0f:
-            ncr_write(port, val, ncr_dev);
-            break;
-
-        default:
-            break;
-    }
-}
-
-static void
-ncr_callback(void *priv)
-{
-    ncr5380_t     *ncr_dev = (ncr5380_t *) priv;
-    ncr_t         *ncr     = &ncr_dev->ncr;
-    scsi_device_t *dev     = &scsi_devices[ncr_dev->bus][ncr->target_id];
-    int            bus;
-    int            bytes_tx = 0;
-    int            limit = 100;
-    uint8_t        temp;
-
-    if (ncr_dev->type != 3) {
-        if (ncr->dma_mode != DMA_IDLE)
-            timer_on_auto(&ncr_dev->timer, 1.0);
-    } else {
-        if ((ncr->dma_mode != DMA_IDLE) && (ncr->mode & MODE_DMA) && ncr_dev->t128.block_loaded) {
-            if ((ncr_dev->t128.host_pos == MIN(512, dev->buffer_length)) && ncr_dev->t128.block_count)
-                ncr_dev->t128.status |= 0x04;
-
-            timer_on_auto(&ncr_dev->timer, ncr_dev->period / 55.0);
-        }
-    }
-
-    if (ncr->data_wait & 1) {
-        ncr->clear_req = 3;
-        ncr->data_wait &= ~1;
-        if (ncr_dev->type == 3) {
-            if (ncr->dma_mode == DMA_IDLE)
-                return;
-        }
-    }
-
-    if (ncr_dev->type != 3) {
-        if (ncr->dma_mode == DMA_IDLE)
-            return;
-    }
-
-    switch (ncr->dma_mode) {
-        case DMA_SEND:
-            if (ncr_dev->type != 3) {
-                if (ncr_dev->status_ctrl & CTRL_DATA_DIR) {
-                    ncr_log("DMA_SEND with DMA direction set wrong\n");
-                    break;
-                }
-
-                if (!(ncr_dev->status_ctrl & STATUS_BUFFER_NOT_READY)) {
-                    ncr_log("Write buffer status ready\n");
-                    break;
-                }
-
-                if (!ncr_dev->block_count_loaded)
-                    break;
-
-                while (bytes_tx < limit) {
-                    for (uint8_t c = 0; c < 10; c++) {
-                        ncr_bus_read(ncr_dev);
-                        if (ncr->cur_bus & BUS_REQ)
-                            break;
-                    }
-
-                    /* Data ready. */
-                    temp = ncr_dev->buffer[ncr_dev->buffer_pos];
-
-                    bus = get_bus_host(ncr) & ~BUS_DATAMASK;
-                    bus |= BUS_SETDATA(temp);
-
-                    ncr_bus_update(ncr_dev, bus | BUS_ACK);
-                    ncr_bus_update(ncr_dev, bus & ~BUS_ACK);
-
-                    ncr_dev->buffer_pos++;
-                    bytes_tx++;
-                    ncr_log("Buffer pos for writing = %d\n", ncr_dev->buffer_pos);
-
-                    if (ncr_dev->buffer_pos == MIN(128, dev->buffer_length)) {
-                        bytes_tx = 0;
-                        ncr_dev->status_ctrl &= ~STATUS_BUFFER_NOT_READY;
-                        ncr_dev->buffer_pos      = 0;
-                        ncr_dev->buffer_host_pos = 0;
-                        ncr_dev->ncr_busy    = 0;
-                        ncr_dev->block_count = (ncr_dev->block_count - 1) & 0xff;
-                        ncr_log("Remaining blocks to be written=%d\n", ncr_dev->block_count);
-                        if (!ncr_dev->block_count) {
-                            ncr_dev->block_count_loaded = 0;
-                            ncr_log("IO End of write transfer\n");
-                            ncr->tcr |= TCR_LAST_BYTE_SENT;
-                            ncr->isr |= STATUS_END_OF_DMA;
-                            timer_stop(&ncr_dev->timer);
-                            if (ncr->mode & MODE_ENA_EOP_INT) {
-                                ncr_log("NCR write irq\n");
-                                ncr_irq(ncr_dev, ncr, 1);
-                            }
-                        }
-                        break;
-                    }
-                }
-            } else {
-                if (!(ncr_dev->t128.status & 0x04)) {
-                    ncr_log("Write status busy, block count = %i, host pos = %i\n", ncr_dev->t128.block_count, ncr_dev->t128.host_pos);
-                    break;
-                }
-
-                if (!ncr_dev->t128.block_loaded) {
-                    ncr_log("Write block not loaded\n");
-                    break;
-                }
-
-                if (ncr_dev->t128.host_pos < MIN(512, dev->buffer_length))
-                    break;
-
-write_again:
-                for (uint8_t c = 0; c < 10; c++) {
-                    ncr_bus_read(ncr_dev);
-                    if (ncr->cur_bus & BUS_REQ)
-                        break;
-                }
-
-                /* Data ready. */
-                temp = ncr_dev->t128.buffer[ncr_dev->t128.pos];
-
-                bus = get_bus_host(ncr) & ~BUS_DATAMASK;
-                bus |= BUS_SETDATA(temp);
-
-                ncr_bus_update(ncr_dev, bus | BUS_ACK);
-                ncr_bus_update(ncr_dev, bus & ~BUS_ACK);
-
-                ncr_dev->t128.pos++;
-                ncr_log("Buffer pos for writing = %d\n", ncr_dev->t128.pos);
-
-                if (ncr_dev->t128.pos == MIN(512, dev->buffer_length)) {
-                    ncr_dev->t128.pos = 0;
-                    ncr_dev->t128.host_pos = 0;
-                    ncr_dev->t128.status &= ~0x02;
-                    ncr_dev->ncr_busy = 0;
-                    ncr_dev->t128.block_count = (ncr_dev->t128.block_count - 1) & 0xff;
-                    ncr_log("Remaining blocks to be written=%d\n", ncr_dev->t128.block_count);
-                    if (!ncr_dev->t128.block_count) {
-                        ncr_dev->t128.block_loaded = 0;
-                        ncr_log("IO End of write transfer\n");
-                        ncr->tcr |= TCR_LAST_BYTE_SENT;
-                        ncr->isr |= STATUS_END_OF_DMA;
-                        timer_stop(&ncr_dev->timer);
-                        if (ncr->mode & MODE_ENA_EOP_INT) {
-                            ncr_log("NCR write irq\n");
-                            ncr_irq(ncr_dev, ncr, 1);
-                        }
-                    }
-                    break;
-                } else
-                    goto write_again;
-            }
-            break;
-
-        case DMA_INITIATOR_RECEIVE:
-            if (ncr_dev->type != 3) {
-                if (!(ncr_dev->status_ctrl & CTRL_DATA_DIR)) {
-                    ncr_log("DMA_INITIATOR_RECEIVE with DMA direction set wrong\n");
-                    break;
-                }
-
-                if (!(ncr_dev->status_ctrl & STATUS_BUFFER_NOT_READY)) {
-                    ncr_log("Read buffer status ready\n");
-                    break;
-                }
-
-                if (!ncr_dev->block_count_loaded)
-                    break;
-
-                while (bytes_tx < limit) {
-                    for (uint8_t c = 0; c < 10; c++) {
-                        ncr_bus_read(ncr_dev);
-                        if (ncr->cur_bus & BUS_REQ)
-                            break;
-                    }
-
-                    /* Data ready. */
-                    ncr_bus_read(ncr_dev);
-                    temp = BUS_GETDATA(ncr->cur_bus);
-
-                    bus = get_bus_host(ncr);
-
-                    ncr_bus_update(ncr_dev, bus | BUS_ACK);
-                    ncr_bus_update(ncr_dev, bus & ~BUS_ACK);
-
-                    ncr_dev->buffer[ncr_dev->buffer_pos++] = temp;
-                    ncr_log("Buffer pos for reading = %d\n", ncr_dev->buffer_pos);
-                    bytes_tx++;
-
-                    if (ncr_dev->buffer_pos == MIN(128, dev->buffer_length)) {
-                        bytes_tx = 0;
-                        ncr_dev->status_ctrl &= ~STATUS_BUFFER_NOT_READY;
-                        ncr_dev->buffer_pos      = 0;
-                        ncr_dev->buffer_host_pos = 0;
-                        ncr_dev->block_count = (ncr_dev->block_count - 1) & 0xff;
-                        ncr_log("Remaining blocks to be read=%d\n", ncr_dev->block_count);
-                        if (!ncr_dev->block_count) {
-                            ncr_dev->block_count_loaded = 0;
-                            ncr_log("IO End of read transfer\n");
-                            ncr->isr |= STATUS_END_OF_DMA;
-                            timer_stop(&ncr_dev->timer);
-                            if (ncr->mode & MODE_ENA_EOP_INT) {
-                                ncr_log("NCR read irq\n");
-                                ncr_irq(ncr_dev, ncr, 1);
-                            }
-                        }
-                        break;
-                    }
-                }
-            } else {
-                if (!(ncr_dev->t128.status & 0x04)) {
-                    ncr_log("Read status busy, block count = %i, host pos = %i\n", ncr_dev->t128.block_count, ncr_dev->t128.host_pos);
-                    break;
-                }
-
-                if (!ncr_dev->t128.block_loaded) {
-                    ncr_log("Read block not loaded\n");
-                    break;
-                }
-
-                if (ncr_dev->t128.host_pos < MIN(512, dev->buffer_length))
-                    break;
-
-read_again:
-                for (uint8_t c = 0; c < 10; c++) {
-                    ncr_bus_read(ncr_dev);
-                    if (ncr->cur_bus & BUS_REQ)
-                        break;
-                }
-
-                /* Data ready. */
-                ncr_bus_read(ncr_dev);
-                temp = BUS_GETDATA(ncr->cur_bus);
-
-                bus = get_bus_host(ncr);
-
-                ncr_bus_update(ncr_dev, bus | BUS_ACK);
-                ncr_bus_update(ncr_dev, bus & ~BUS_ACK);
-
-                ncr_dev->t128.buffer[ncr_dev->t128.pos++] = temp;
-                ncr_log("Buffer pos for reading=%d, temp=%02x, len=%d.\n", ncr_dev->t128.pos, temp, dev->buffer_length);
-
-                if (ncr_dev->t128.pos == MIN(512, dev->buffer_length)) {
-                    ncr_dev->t128.pos      = 0;
-                    ncr_dev->t128.host_pos = 0;
-                    ncr_dev->t128.status &= ~0x02;
-                    ncr_dev->t128.block_count = (ncr_dev->t128.block_count - 1) & 0xff;
-                    ncr_log("Remaining blocks to be read=%d, status=%02x, len=%i, cdb[0] = %02x\n", ncr_dev->t128.block_count, ncr_dev->t128.status, dev->buffer_length, ncr->command[0]);
-                    if (!ncr_dev->t128.block_count) {
-                        ncr_dev->t128.block_loaded = 0;
-                        ncr_log("IO End of read transfer\n");
-                        ncr->isr |= STATUS_END_OF_DMA;
-                        timer_stop(&ncr_dev->timer);
-                        if (ncr->mode & MODE_ENA_EOP_INT) {
-                            ncr_log("NCR read irq\n");
-                            ncr_irq(ncr_dev, ncr, 1);
-                        }
-                    }
-                    break;
-                } else
-                    goto read_again;
-            }
-            break;
-
-        default:
-            break;
-    }
-
-    ncr_bus_read(ncr_dev);
-
-    if (!(ncr->cur_bus & BUS_BSY) && (ncr->mode & MODE_MONITOR_BUSY)) {
-        ncr_log("Updating DMA\n");
-        ncr->mode &= ~MODE_DMA;
-        ncr->dma_mode = DMA_IDLE;
-        if (ncr_dev->type == 3)
-            timer_on_auto(&ncr_dev->timer, 10.0);
-    }
-}
-
-static uint8_t
-t128_read(uint32_t addr, void *priv)
-{
-    ncr5380_t     *ncr_dev = (ncr5380_t *) priv;
-    const ncr_t   *ncr     = &ncr_dev->ncr;
-    scsi_device_t *dev     = &scsi_devices[ncr_dev->bus][ncr->target_id];
-    uint8_t        ret     = 0xff;
-
-    addr &= 0x3fff;
-    if (ncr_dev->t128.bios_enabled && (addr >= 0) && (addr < 0x1800))
-        ret = ncr_dev->bios_rom.rom[addr & 0x1fff];
-    else if ((addr >= 0x1800) && (addr < 0x1880))
-        ret = ncr_dev->t128.ext_ram[addr & 0x7f];
-    else if ((addr >= 0x1c00) && (addr < 0x1c20)) {
-        ret = ncr_dev->t128.ctrl;
-        ncr_log("T128 ctrl read=%02x, dma=%02x\n", ret, ncr->mode & MODE_DMA);
-    } else if ((addr >= 0x1c20) && (addr < 0x1c40)) {
-        ret = ncr_dev->t128.status;
-        ncr_log("T128 status read=%02x, dma=%02x\n", ret, ncr->mode & MODE_DMA);
-    } else if ((addr >= 0x1d00) && (addr < 0x1e00))
-        ret = ncr_read((addr - 0x1d00) >> 5, ncr_dev);
-    else if (addr >= 0x1e00 && addr < 0x2000) {
-        if ((ncr_dev->t128.host_pos >= MIN(512, dev->buffer_length)) ||
-            (ncr->dma_mode != DMA_INITIATOR_RECEIVE))
-            ret = 0xff;
-        else {
-            ret = ncr_dev->t128.buffer[ncr_dev->t128.host_pos++];
-
-            ncr_log("Read transfer, addr = %i, pos = %i\n", addr & 0x1ff,
-                    ncr_dev->t128.host_pos);
-
-            if (ncr_dev->t128.host_pos == MIN(512, dev->buffer_length)) {
-                ncr_dev->t128.status &= ~0x04;
-                ncr_log("Transfer busy read, status = %02x, period = %lf\n",
-                        ncr_dev->t128.status, ncr_dev->period);
-                if ((ncr_dev->period == 0.2) || (ncr_dev->period == 0.02))
-                    timer_on_auto(&ncr_dev->timer, 40.2);
-            } else if ((ncr_dev->t128.host_pos < MIN(512, dev->buffer_length)) &&
-                       (scsi_device_get_callback(dev) > 100.0))
-                cycles += 100; /*Needed to avoid timer de-syncing with transfers.*/
-        }
-    }
-
-    return ret;
-}
-
-static void
-t128_write(uint32_t addr, uint8_t val, void *priv)
-{
-    ncr5380_t           *ncr_dev = (ncr5380_t *) priv;
-    const ncr_t         *ncr     = &ncr_dev->ncr;
-    const scsi_device_t *dev     = &scsi_devices[ncr_dev->bus][ncr->target_id];
-
-    addr &= 0x3fff;
-    if ((addr >= 0x1800) && (addr < 0x1880))
-        ncr_dev->t128.ext_ram[addr & 0x7f] = val;
-    else if ((addr >= 0x1c00) && (addr < 0x1c20)) {
-        if ((val & 0x02) && !(ncr_dev->t128.ctrl & 0x02))
-            ncr_dev->t128.status |= 0x02;
-
-        ncr_dev->t128.ctrl = val;
-        ncr_log("T128 ctrl write=%02x\n", val);
-    } else if ((addr >= 0x1d00) && (addr < 0x1e00))
-        ncr_write((addr - 0x1d00) >> 5, val, ncr_dev);
-    else if ((addr >= 0x1e00) && (addr < 0x2000)) {
-        if ((ncr_dev->t128.host_pos < MIN(512, dev->buffer_length)) &&
-            (ncr->dma_mode == DMA_SEND)) {
-            ncr_dev->t128.buffer[ncr_dev->t128.host_pos] = val;
-            ncr_dev->t128.host_pos++;
-
-            ncr_log("Write transfer, addr = %i, pos = %i, val = %02x\n",
-                    addr & 0x1ff, ncr_dev->t128.host_pos, val);
-
-            if (ncr_dev->t128.host_pos == MIN(512, dev->buffer_length)) {
-                ncr_dev->t128.status &= ~0x04;
-                ncr_dev->ncr_busy = 1;
-                ncr_log("Transfer busy write, status = %02x\n", ncr_dev->t128.status);
-                timer_on_auto(&ncr_dev->timer, 0.02);
-            }
-        }
-    }
-}
-
-static uint8_t
-rt1000b_mc_read(int port, void *priv)
-{
-    const ncr5380_t *ncr_dev = (ncr5380_t *) priv;
-
-    return (ncr_dev->pos_regs[port & 7]);
-}
-
-static void
-rt1000b_mc_write(int port, uint8_t val, void *priv)
-{
-    ncr5380_t *ncr_dev = (ncr5380_t *) priv;
-
-    /* MCA does not write registers below 0x0100. */
-    if (port < 0x0102)
-        return;
-
-    mem_mapping_disable(&ncr_dev->bios_rom.mapping);
-    mem_mapping_disable(&ncr_dev->mapping);
-
-    /* Save the MCA register value. */
-    ncr_dev->pos_regs[port & 7] = val;
-
-    if (ncr_dev->pos_regs[2] & 1) {
-        switch (ncr_dev->pos_regs[2] & 0xe0) {
-            case 0:
-                ncr_dev->rom_addr = 0xd4000;
-                break;
-            case 0x20:
-                ncr_dev->rom_addr = 0xd0000;
-                break;
-            case 0x40:
-                ncr_dev->rom_addr = 0xcc000;
-                break;
-            case 0x60:
-                ncr_dev->rom_addr = 0xc8000;
-                break;
-            case 0xc0:
-                ncr_dev->rom_addr = 0xdc000;
-                break;
-            case 0xe0:
-                ncr_dev->rom_addr = 0xd8000;
-                break;
-
-            default:
-                break;
-        }
-
-        mem_mapping_set_addr(&ncr_dev->bios_rom.mapping, ncr_dev->rom_addr, 0x4000);
-        mem_mapping_set_addr(&ncr_dev->mapping, ncr_dev->rom_addr, 0x4000);
-    }
-}
-
-static uint8_t
-rt1000b_mc_feedb(void *priv)
-{
-    const ncr5380_t *ncr_dev = (ncr5380_t *) priv;
-
-    return ncr_dev->pos_regs[2] & 1;
-}
-
-static void *
-ncr_init(const device_t *info)
-{
-    const char *fn = NULL;
-    char        temp[128];
-    ncr5380_t  *ncr_dev;
-
-    ncr_dev = malloc(sizeof(ncr5380_t));
-    memset(ncr_dev, 0x00, sizeof(ncr5380_t));
-    ncr_dev->name = info->name;
-    ncr_dev->type = info->local;
-
-    ncr_dev->bus = scsi_get_bus();
-
-    switch (ncr_dev->type) {
-        case 0: /* Longshine LCS6821N */
-            ncr_dev->rom_addr = device_get_config_hex20("bios_addr");
-            ncr_dev->irq      = device_get_config_int("irq");
-            rom_init(&ncr_dev->bios_rom, LCS6821N_ROM,
-                     ncr_dev->rom_addr, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL);
-
-            mem_mapping_add(&ncr_dev->mapping, ncr_dev->rom_addr, 0x4000,
-                            memio_read, NULL, NULL,
-                            memio_write, NULL, NULL,
-                            ncr_dev->bios_rom.rom, MEM_MAPPING_EXTERNAL, ncr_dev);
-            break;
-
-        case 1: /* Rancho RT1000B/MC */
-            ncr_dev->rom_addr = device_get_config_hex20("bios_addr");
-            ncr_dev->irq      = device_get_config_int("irq");
-            ncr_dev->bios_ver = device_get_config_int("bios_ver");
-            if (info->flags & DEVICE_MCA) {
-                ncr_dev->rom_addr = 0xd8000;
-                ncr_dev->bios_ver = 1;
-            }
-
-            switch (ncr_dev->bios_ver) {
-                case 0:
-                    fn = RT1000B_810R_ROM;
-                    break;
-                case 1:
-                    fn = RT1000B_820R_ROM;
-                    break;
-            }
-
-            rom_init(&ncr_dev->bios_rom, fn,
-                     ncr_dev->rom_addr, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL);
-
-            if (info->flags & DEVICE_MCA) {
-                mem_mapping_add(&ncr_dev->mapping, 0, 0,
-                                memio_read, NULL, NULL,
-                                memio_write, NULL, NULL,
-                                ncr_dev->bios_rom.rom, MEM_MAPPING_EXTERNAL, ncr_dev);
-                ncr_dev->pos_regs[0] = 0x8d;
-                ncr_dev->pos_regs[1] = 0x70;
-                mca_add(rt1000b_mc_read, rt1000b_mc_write, rt1000b_mc_feedb, NULL, ncr_dev);
-            } else {
-                mem_mapping_add(&ncr_dev->mapping, ncr_dev->rom_addr, 0x4000,
-                                memio_read, NULL, NULL,
-                                memio_write, NULL, NULL,
-                                ncr_dev->bios_rom.rom, MEM_MAPPING_EXTERNAL, ncr_dev);
-            }
-            break;
-
-        case 2: /* Trantor T130B */
-            ncr_dev->rom_addr = device_get_config_hex20("bios_addr");
-            ncr_dev->base     = device_get_config_hex16("base");
-            ncr_dev->irq      = device_get_config_int("irq");
-
-            if (ncr_dev->rom_addr > 0x00000) {
-                rom_init(&ncr_dev->bios_rom, T130B_ROM,
-                         ncr_dev->rom_addr, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL);
-
-                mem_mapping_add(&ncr_dev->mapping, ncr_dev->rom_addr, 0x4000,
-                                t130b_read, NULL, NULL,
-                                t130b_write, NULL, NULL,
-                                ncr_dev->bios_rom.rom, MEM_MAPPING_EXTERNAL, ncr_dev);
-            }
-
-            io_sethandler(ncr_dev->base, 16,
-                          t130b_in, NULL, NULL, t130b_out, NULL, NULL, ncr_dev);
-            break;
-
-        case 3: /* Trantor T128 */
-            ncr_dev->rom_addr          = device_get_config_hex20("bios_addr");
-            ncr_dev->irq               = device_get_config_int("irq");
-            ncr_dev->t128.bios_enabled = device_get_config_int("boot");
-
-            if (ncr_dev->t128.bios_enabled)
-                rom_init(&ncr_dev->bios_rom, T128_ROM,
-                         ncr_dev->rom_addr, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL);
-
-            mem_mapping_add(&ncr_dev->mapping, ncr_dev->rom_addr, 0x4000,
-                            t128_read, NULL, NULL,
-                            t128_write, NULL, NULL,
-                            ncr_dev->bios_rom.rom, MEM_MAPPING_EXTERNAL, ncr_dev);
-            break;
-
-        case 4: /* Corel LS2000 */
-            ncr_dev->rom_addr = device_get_config_hex20("bios_addr");
-            ncr_dev->irq      = device_get_config_int("irq");
-            rom_init(&ncr_dev->bios_rom, COREL_LS2000_ROM,
-                     ncr_dev->rom_addr, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL);
-
-            mem_mapping_add(&ncr_dev->mapping, ncr_dev->rom_addr, 0x4000,
-                            memio_read, NULL, NULL,
-                            memio_write, NULL, NULL,
-                            ncr_dev->bios_rom.rom, MEM_MAPPING_EXTERNAL, ncr_dev);
-            break;
-
-        default:
-            break;
-    }
-
-    sprintf(temp, "%s: BIOS=%05X", ncr_dev->name, ncr_dev->rom_addr);
-    if (ncr_dev->base != 0)
-        sprintf(&temp[strlen(temp)], " I/O=%04x", ncr_dev->base);
-    if (ncr_dev->irq != 0)
-        sprintf(&temp[strlen(temp)], " IRQ=%d", ncr_dev->irq);
-    ncr_log("%s\n", temp);
-
-    if ((ncr_dev->type < 3) || (ncr_dev->type == 4)) {
-        ncr_dev->status_ctrl       = STATUS_BUFFER_NOT_READY;
-        ncr_dev->buffer_host_pos   = 128;
-    } else {
-        ncr_dev->t128.status       = 0x04;
-        ncr_dev->t128.host_pos     = 512;
-        if (!ncr_dev->t128.bios_enabled)
-            ncr_dev->t128.status |= 0x80;
-    }
-    timer_add(&ncr_dev->timer, ncr_callback, ncr_dev, 0);
-
-    scsi_bus_set_speed(ncr_dev->bus, 5000000.0);
-
-    return ncr_dev;
-}
-
-static void
-ncr_close(void *priv)
-{
-    ncr5380_t *ncr_dev = (ncr5380_t *) priv;
-
-    if (ncr_dev) {
-        /* Tell the timer to terminate. */
-        timer_stop(&ncr_dev->timer);
-
-        free(ncr_dev);
-        ncr_dev = NULL;
-    }
-}
-
-static int
-lcs6821n_available(void)
-{
-    return (rom_present(LCS6821N_ROM));
-}
-
-static int
-rt1000b_available(void)
-{
-    return (rom_present(RT1000B_820R_ROM) && rom_present(RT1000B_810R_ROM));
-}
-
-static int
-rt1000b_820_available(void)
-{
-    return (rom_present(RT1000B_820R_ROM));
-}
-
-static int
-t130b_available(void)
-{
-    return (rom_present(T130B_ROM));
-}
-
-static int
-t128_available(void)
-{
-    return (rom_present(T128_ROM));
-}
-
-static int
-corel_ls2000_available(void)
-{
-    return (rom_present(COREL_LS2000_ROM));
-}
-
-// clang-format off
-static const device_config_t ncr5380_mmio_config[] = {
-    {
-        .name = "bios_addr",
-        .description = "BIOS Address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0xD8000,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "C800H", .value = 0xc8000 },
-            { .description = "CC00H", .value = 0xcc000 },
-            { .description = "D000H", .value = 0xd0000 },
-            { .description = "D400H", .value = 0xd4000 },
-            { .description = "D800H", .value = 0xd8000 },
-            { .description = "DC00H", .value = 0xdc000 },
-            { .description = ""                        }
-        },
-    },
-    {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "IRQ 3", .value = 3 },
-            { .description = "IRQ 5", .value = 5 },
-            { .description = "IRQ 7", .value = 7 },
-            { .description = ""                  }
-        },
-    },
-    { .name = "", .description = "", .type = CONFIG_END }
-};
-
-static const device_config_t rancho_config[] = {
-    {
-        .name = "bios_addr",
-        .description = "BIOS Address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0xD8000,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "C800H", .value = 0xc8000 },
-            { .description = "CC00H", .value = 0xcc000 },
-            { .description = "D000H", .value = 0xd0000 },
-            { .description = "D400H", .value = 0xd4000 },
-            { .description = "D800H", .value = 0xd8000 },
-            { .description = "DC00H", .value = 0xdc000 },
-            { .description = ""                        }
-        },
-    },
-    {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "IRQ 3", .value = 3 },
-            { .description = "IRQ 5", .value = 5 },
-            { .description = "IRQ 7", .value = 7 },
-            { .description = ""                  }
-        },
-    },
-    {
-        .name = "bios_ver",
-        .description = "BIOS Version",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 1,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "8.20R", .value = 1 },
-            { .description = "8.10R", .value = 0 },
-            { .description = ""                  }
-        },
-    },
-    { .name = "", .description = "", .type = CONFIG_END }
-};
-
-static const device_config_t rancho_mc_config[] = {
-    {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "IRQ 3", .value = 3 },
-            { .description = "IRQ 5", .value = 5 },
-            { .description = "IRQ 7", .value = 7 },
-            { .description = ""                  }
-        },
-    },
-    { .name = "", .description = "", .type = CONFIG_END }
-};
-
-static const device_config_t t130b_config[] = {
-    {
-        .name = "bios_addr",
-        .description = "BIOS Address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0xD8000,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "Disabled", .value =       0 },
-            { .description = "C800H",    .value = 0xc8000 },
-            { .description = "CC00H",    .value = 0xcc000 },
-            { .description = "D800H",    .value = 0xd8000 },
-            { .description = "DC00H",    .value = 0xdc000 },
-            { .description = ""                           }
-        },
-    },
-    {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x0350,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "240H", .value = 0x0240 },
-            { .description = "250H", .value = 0x0250 },
-            { .description = "340H", .value = 0x0340 },
-            { .description = "350H", .value = 0x0350 },
-            { .description = ""                      }
-        },
-    },
-    {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "IRQ 3", .value = 3 },
-            { .description = "IRQ 5", .value = 5 },
-            { .description = "IRQ 7", .value = 7 },
-            { .description = ""                  }
-        },
-    },
-    { .name = "", .description = "", .type = CONFIG_END }
-};
-
-static const device_config_t t128_config[] = {
-    {
-        .name = "bios_addr",
-        .description = "BIOS Address",
-        .type = CONFIG_HEX20,
-        .default_string = "",
-        .default_int = 0xD8000,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "C800H", .value = 0xc8000 },
-            { .description = "CC00H", .value = 0xcc000 },
-            { .description = "D000H", .value = 0xd0000 },
-            { .description = "D400H", .value = 0xd4000 },
-            { .description = "D800H", .value = 0xd8000 },
-            { .description = "DC00H", .value = 0xdc000 },
-            { .description = ""                        }
-        },
-    },
-    {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner ={ 0 },
-        .selection = {
-            { .description = "IRQ 3", .value = 3 },
-            { .description = "IRQ 5", .value = 5 },
-            { .description = "IRQ 7", .value = 7 },
-            { .description = ""                  }
-        },
-    },
-    {
-        .name = "boot",
-        .description = "Enable Boot ROM",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
-    },
-    { .name = "", .description = "", .type = CONFIG_END }
-};
-// clang-format on
-
-const device_t scsi_lcs6821n_device = {
-    .name          = "Longshine LCS-6821N",
-    .internal_name = "lcs6821n",
-    .flags         = DEVICE_ISA,
-    .local         = 0,
-    .init          = ncr_init,
-    .close         = ncr_close,
-    .reset         = NULL,
-    { .available = lcs6821n_available },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = ncr5380_mmio_config
-};
-
-const device_t scsi_rt1000b_device = {
-    .name          = "Rancho RT1000B",
-    .internal_name = "rt1000b",
-    .flags         = DEVICE_ISA,
-    .local         = 1,
-    .init          = ncr_init,
-    .close         = ncr_close,
-    .reset         = NULL,
-    { .available = rt1000b_available },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = rancho_config
-};
-
-const device_t scsi_rt1000mc_device = {
-    .name          = "Rancho RT1000B-MC",
-    .internal_name = "rt1000mc",
-    .flags         = DEVICE_MCA,
-    .local         = 1,
-    .init          = ncr_init,
-    .close         = ncr_close,
-    .reset         = NULL,
-    { .available = rt1000b_820_available },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = rancho_mc_config
-};
-
-const device_t scsi_t130b_device = {
-    .name          = "Trantor T130B",
-    .internal_name = "t130b",
-    .flags         = DEVICE_ISA,
-    .local         = 2,
-    .init          = ncr_init,
-    .close         = ncr_close,
-    .reset         = NULL,
-    { .available = t130b_available },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = t130b_config
-};
-
-const device_t scsi_t128_device = {
-    .name          = "Trantor T128",
-    .internal_name = "t128",
-    .flags         = DEVICE_ISA,
-    .local         = 3,
-    .init          = ncr_init,
-    .close         = ncr_close,
-    .reset         = NULL,
-    { .available = t128_available },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = t128_config
-};
-
-const device_t scsi_ls2000_device = {
-    .name          = "Corel LS2000",
-    .internal_name = "ls2000",
-    .flags         = DEVICE_ISA,
-    .local         = 4,
-    .init          = ncr_init,
-    .close         = ncr_close,
-    .reset         = NULL,
-    { .available = corel_ls2000_available },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = ncr5380_mmio_config
-};
diff --git a/src/scsi/scsi_ncr53c400.c b/src/scsi/scsi_ncr53c400.c
new file mode 100644
index 000000000..5f2302b4f
--- /dev/null
+++ b/src/scsi/scsi_ncr53c400.c
@@ -0,0 +1,1078 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the NCR 53c400 series of SCSI Host Adapters
+ *          made by NCR. These controllers were designed for the ISA and MCA bus.
+ *
+ *
+ *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          TheCollector1995, <mariogplayer@gmail.com>
+ *          Fred N. van Kempen, <decwiz@yahoo.com>
+ *
+ *          Copyright 2017-2019 Sarah Walker.
+ *          Copyright 2017-2019 Fred N. van Kempen.
+ *          Copyright 2017-2024 TheCollector1995.
+ */
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/io.h>
+#include <86box/dma.h>
+#include <86box/pic.h>
+#include <86box/mca.h>
+#include <86box/mem.h>
+#include <86box/timer.h>
+#include <86box/rom.h>
+#include <86box/device.h>
+#include <86box/nvr.h>
+#include <86box/plat.h>
+#include <86box/scsi.h>
+#include <86box/scsi_device.h>
+#include <86box/scsi_ncr5380.h>
+#include "cpu.h"
+
+#define LCS6821N_ROM            "roms/scsi/ncr5380/Longshine LCS-6821N - BIOS version 1.04.bin"
+#define COREL_LS2000_ROM        "roms/scsi/ncr5380/Corel LS2000 - BIOS ROM - Ver 1.65.bin"
+#define RT1000B_810R_ROM        "roms/scsi/ncr5380/Rancho_RT1000_RTBios_version_8.10R.bin"
+#define RT1000B_820R_ROM        "roms/scsi/ncr5380/RTBIOS82.ROM"
+#define T130B_ROM               "roms/scsi/ncr5380/trantor_t130b_bios_v2.14.bin"
+
+#define CTRL_DATA_DIR           0x40
+#define STATUS_BUFFER_NOT_READY 0x04
+#define STATUS_5380_ACCESSIBLE  0x80
+
+enum {
+    ROM_LCS6821N = 0,
+    ROM_LS2000,
+    ROM_RT1000B,
+    ROM_T130B
+};
+
+typedef struct ncr53c400_t {
+    rom_t         bios_rom;
+    mem_mapping_t mapping;
+    ncr_t   ncr;
+    uint8_t buffer[128];
+    uint8_t int_ram[0x40];
+    uint8_t ext_ram[0x600];
+
+    uint32_t rom_addr;
+    uint16_t base;
+
+    int8_t  type;
+    uint8_t block_count;
+    uint8_t status_ctrl;
+
+    int block_count_loaded;
+
+    int buffer_pos;
+    int buffer_host_pos;
+
+    int     busy;
+    int     reset;
+    uint8_t pos_regs[8];
+
+    pc_timer_t timer;
+} ncr53c400_t;
+
+#ifdef ENABLE_NCR53C400_LOG
+int ncr53c400_do_log = ENABLE_NCR53C400_LOG;
+
+static void
+ncr53c400_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (ncr53c400_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define ncr53c400_log(fmt, ...)
+#endif
+
+static void
+ncr53c400_timer_on_auto(void *ext_priv, double period)
+{
+    ncr53c400_t *ncr400 = (ncr53c400_t *) ext_priv;
+
+    ncr53c400_log("53c400: PERIOD=%lf, timer=%x.\n", period, timer_is_enabled(&ncr400->timer));
+    if (period <= 0.0)
+        timer_stop(&ncr400->timer);
+    else if ((period > 0.0) && !timer_is_enabled(&ncr400->timer))
+        timer_on_auto(&ncr400->timer, period);
+}
+
+/* Memory-mapped I/O WRITE handler. */
+static void
+ncr53c400_write(uint32_t addr, uint8_t val, void *priv)
+{
+    ncr53c400_t         *ncr400     = (ncr53c400_t *) priv;
+    ncr_t               *ncr        = &ncr400->ncr;
+    scsi_bus_t          *scsi_bus   = &ncr->scsibus;
+    scsi_device_t       *dev        = &scsi_devices[ncr->bus][scsi_bus->target_id];
+
+    addr &= 0x3fff;
+
+    if (addr >= 0x3880)
+        ncr53c400_log("%04X:%08X: memio_write(%04x)=%02x\n", CS, cpu_state.pc, addr, val);
+
+    if (addr >= 0x3a00)
+        ncr400->ext_ram[addr - 0x3a00] = val;
+    else {
+        switch (addr & 0x3f80) {
+            case 0x3800:
+                ncr400->int_ram[addr & 0x3f] = val;
+                break;
+
+            case 0x3880:
+                ncr5380_write(addr, val, ncr);
+                break;
+
+            case 0x3900:
+                if (!(ncr400->status_ctrl & CTRL_DATA_DIR) && (ncr400->buffer_host_pos < MIN(128, dev->buffer_length))) {
+                    ncr400->buffer[ncr400->buffer_host_pos++] = val;
+
+                    ncr53c400_log("Write host pos=%i, val=%02x.\n", ncr400->buffer_host_pos, val);
+
+                    if (ncr400->buffer_host_pos == MIN(128, dev->buffer_length)) {
+                        ncr400->status_ctrl |= STATUS_BUFFER_NOT_READY;
+                        ncr400->busy = 1;
+                        if (ncr400->type != ROM_T130B)
+                            timer_on_auto(&ncr400->timer, 1.0);
+                    }
+                } else
+                    ncr53c400_log("No Write.\n");
+                break;
+
+            case 0x3980:
+                switch (addr) {
+                    case 0x3980: /* Control */
+                        /*Parity bits*/
+                        /*This is to avoid RTBios 8.10R BIOS problems with the hard disk and detection.*/
+                        /*If the parity bits are set, bit 0 of the 53c400 status port should be set as well.*/
+                        /*Required by RTASPI10.SYS otherwise it won't initialize.*/
+                        if (val & 0x80) {
+                            if (ncr->mode & 0x30) {
+                                if (!(ncr->mode & MODE_DMA)) {
+                                    ncr->mode = 0x00;
+                                    ncr400->reset = 1;
+                                }
+                            }
+                        }
+
+                        ncr53c400_log("NCR 53c400 control=%02x, mode=%02x.\n", val, ncr->mode);
+                        if ((val & CTRL_DATA_DIR) && !(ncr400->status_ctrl & CTRL_DATA_DIR)) {
+                            ncr400->buffer_host_pos = MIN(128, dev->buffer_length);
+                            ncr400->status_ctrl |= STATUS_BUFFER_NOT_READY;
+                        } else if (!(val & CTRL_DATA_DIR) && (ncr400->status_ctrl & CTRL_DATA_DIR)) {
+                            ncr400->buffer_host_pos = 0;
+                            ncr400->status_ctrl &= ~STATUS_BUFFER_NOT_READY;
+                        }
+                        ncr400->status_ctrl = (ncr400->status_ctrl & 0x87) | (val & 0x78);
+                        break;
+
+                    case 0x3981: /* block counter register */
+                        ncr53c400_log("Write block counter register: val=%d, dma mode=%x, period=%lf.\n", val, scsi_bus->tx_mode, scsi_bus->period);
+                        ncr400->block_count        = val;
+                        ncr400->block_count_loaded = 1;
+
+                        if (ncr400->status_ctrl & CTRL_DATA_DIR) {
+                            ncr400->buffer_host_pos = MIN(128, dev->buffer_length);
+                            ncr400->status_ctrl |= STATUS_BUFFER_NOT_READY;
+                        } else {
+                            ncr400->buffer_host_pos = 0;
+                            ncr400->status_ctrl &= ~STATUS_BUFFER_NOT_READY;
+                        }
+                        if ((ncr->mode & MODE_DMA) && (dev->buffer_length > 0)) {
+                            memset(ncr400->buffer, 0, MIN(128, dev->buffer_length));
+                            timer_on_auto(&ncr400->timer, 10.0);
+                            ncr53c400_log("DMA timer on=%02x, callback=%lf, scsi buflen=%d, waitdata=%d, waitcomplete=%d, clearreq=%d, p=%lf enabled=%d.\n",
+                                  ncr->mode & MODE_MONITOR_BUSY, scsi_device_get_callback(dev), dev->buffer_length, scsi_bus->wait_data, scsi_bus->wait_complete, scsi_bus->clear_req, scsi_bus->period, timer_is_enabled(&ncr400->timer));
+                        } else
+                            ncr53c400_log("No Timer.\n");
+                        break;
+
+                    default:
+                        break;
+                }
+                break;
+
+            default:
+                break;
+        }
+    }
+}
+
+/* Memory-mapped I/O READ handler. */
+static uint8_t
+ncr53c400_read(uint32_t addr, void *priv)
+{
+    ncr53c400_t         *ncr400     = (ncr53c400_t *) priv;
+    ncr_t               *ncr        = &ncr400->ncr;
+    scsi_bus_t          *scsi_bus   = &ncr->scsibus;
+    scsi_device_t       *dev        = &scsi_devices[ncr->bus][scsi_bus->target_id];
+    uint8_t              ret        = 0xff;
+
+    addr &= 0x3fff;
+
+    if (addr < 0x2000)
+        ret = ncr400->bios_rom.rom[addr & 0x1fff];
+    else if (addr < 0x3800)
+        ret = 0xff;
+    else if (addr >= 0x3a00)
+        ret = ncr400->ext_ram[addr - 0x3a00];
+    else {
+        switch (addr & 0x3f80) {
+            case 0x3800:
+                ncr53c400_log("Read intRAM %02x %02x.\n", addr & 0x3f, ncr400->int_ram[addr & 0x3f]);
+                ret = ncr400->int_ram[addr & 0x3f];
+                break;
+
+            case 0x3880:
+                ncr53c400_log("Read 5380 %04x.\n", addr);
+                ret = ncr5380_read(addr, ncr);
+                break;
+
+            case 0x3900:
+                if ((ncr400->buffer_host_pos >= MIN(128, dev->buffer_length)) || (!(ncr400->status_ctrl & CTRL_DATA_DIR))) {
+                    ret = 0xff;
+                    ncr53c400_log("No Read.\n");
+                } else {
+                    ret = ncr400->buffer[ncr400->buffer_host_pos++];
+                    ncr53c400_log("Read host pos=%i, ret=%02x.\n", ncr400->buffer_host_pos, ret);
+
+                    if (ncr400->buffer_host_pos == MIN(128, dev->buffer_length)) {
+                        ncr400->status_ctrl |= STATUS_BUFFER_NOT_READY;
+                        if (ncr400->type != ROM_T130B) {
+                            if (!ncr400->block_count_loaded) {
+                                scsi_bus->tx_mode = PIO_TX_BUS;
+                                ncr53c400_log("IO End of read transfer\n");
+                                ncr->isr |= STATUS_END_OF_DMA;
+                                if (ncr->mode & MODE_ENA_EOP_INT) {
+                                    ncr53c400_log("NCR read irq\n");
+                                    ncr5380_irq(ncr, 1);
+                                }
+                            } else if (!timer_is_enabled(&ncr400->timer)) {
+                                ncr53c400_log("Timer re-enabled.\n");
+                                timer_on_auto(&ncr400->timer, 1.0);
+                            }
+                        }
+                    }
+                }
+                break;
+
+            case 0x3980:
+                switch (addr) {
+                    case 0x3980: /* status */
+                        ret = ncr400->status_ctrl;
+                        ncr53c400_log("NCR status ctrl read=%02x.\n", ncr400->status_ctrl & STATUS_BUFFER_NOT_READY);
+                        if (!ncr400->busy)
+                            ret |= STATUS_5380_ACCESSIBLE;
+
+                        if (ncr400->reset) {
+                            ncr400->reset = 0;
+                            ret |= 0x01;
+                        }
+                        ncr53c400_log("NCR 53c400 status=%02x.\n", ret);
+                        break;
+
+                    case 0x3981: /* block counter register*/
+                        ret = ncr400->block_count;
+                        ncr53c400_log("NCR 53c400 block count read=%02x.\n", ret);
+                        break;
+
+                    case 0x3982: /* switch register read */
+                        if (ncr->irq != -1) {
+                            ret = 0xf8;
+                            ret += ncr->irq;
+                        }
+                        ncr53c400_log("Switches read=%02x.\n", ret);
+                        break;
+
+                    default:
+                        break;
+                }
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    if (addr >= 0x3880)
+        ncr53c400_log("%04X:%08X: memio_read(%04x)=%02x\n", CS, cpu_state.pc, addr, ret);
+
+    return ret;
+}
+
+
+/* Memory-mapped I/O WRITE handler for the Trantor T130B. */
+static void
+t130b_write(uint32_t addr, uint8_t val, void *priv)
+{
+    ncr53c400_t *ncr400 = (ncr53c400_t *) priv;
+
+    addr &= 0x3fff;
+    ncr53c400_log("MEM: Writing %02X to %08X\n", val, addr);
+    if (addr >= 0x1800 && addr < 0x1880)
+        ncr400->ext_ram[addr & 0x7f] = val;
+}
+
+/* Memory-mapped I/O READ handler for the Trantor T130B. */
+static uint8_t
+t130b_read(uint32_t addr, void *priv)
+{
+    const ncr53c400_t *ncr400  = (ncr53c400_t *) priv;
+    uint8_t            ret     = 0xff;
+
+    addr &= 0x3fff;
+    if (addr < 0x1800)
+        ret = ncr400->bios_rom.rom[addr & 0x1fff];
+    else if (addr >= 0x1800 && addr < 0x1880)
+        ret = ncr400->ext_ram[addr & 0x7f];
+
+    ncr53c400_log("MEM: Reading %02X from %08X\n", ret, addr);
+    return ret;
+}
+
+static void
+t130b_out(uint16_t port, uint8_t val, void *priv)
+{
+    ncr53c400_t *ncr400 = (ncr53c400_t *) priv;
+    ncr_t       *ncr    = &ncr400->ncr;
+
+    ncr53c400_log("I/O: Writing %02X to %04X\n", val, port);
+
+    switch (port & 0x0f) {
+        case 0x00:
+        case 0x01:
+        case 0x02:
+        case 0x03:
+            ncr53c400_write((port & 7) | 0x3980, val, ncr400);
+            break;
+
+        case 0x04:
+        case 0x05:
+            ncr53c400_write(0x3900, val, ncr400);
+            break;
+
+        case 0x08:
+        case 0x09:
+        case 0x0a:
+        case 0x0b:
+        case 0x0c:
+        case 0x0d:
+        case 0x0e:
+        case 0x0f:
+            ncr5380_write(port, val, ncr);
+            break;
+
+        default:
+            break;
+    }
+}
+
+static uint8_t
+t130b_in(uint16_t port, void *priv)
+{
+    ncr53c400_t *ncr400 = (ncr53c400_t *) priv;
+    ncr_t       *ncr    = &ncr400->ncr;
+    uint8_t      ret     = 0xff;
+
+    switch (port & 0x0f) {
+        case 0x00:
+        case 0x01:
+        case 0x02:
+        case 0x03:
+            ret = ncr53c400_read((port & 7) | 0x3980, ncr400);
+            break;
+
+        case 0x04:
+        case 0x05:
+            ret = ncr53c400_read(0x3900, ncr400);
+            break;
+
+        case 0x08:
+        case 0x09:
+        case 0x0a:
+        case 0x0b:
+        case 0x0c:
+        case 0x0d:
+        case 0x0e:
+        case 0x0f:
+            ret = ncr5380_read(port, ncr);
+            break;
+
+        default:
+            break;
+    }
+
+    ncr53c400_log("I/O: Reading %02X from %04X\n", ret, port);
+    return ret;
+}
+
+static void
+ncr53c400_dma_mode_ext(void *priv, void *ext_priv, uint8_t val)
+{
+    ncr53c400_t    *ncr400     = (ncr53c400_t *) ext_priv;
+    ncr_t          *ncr        = (ncr_t *) priv;
+    scsi_bus_t     *scsi_bus   = &ncr->scsibus;
+
+    /*When a pseudo-DMA transfer has completed (Send or Initiator Receive), mark it as complete and idle the status*/
+    ncr53c400_log("NCR 53c400: Loaded?=%d, DMA mode enabled=%02x, valDMA=%02x.\n", ncr400->block_count_loaded, ncr->mode & MODE_DMA, val & MODE_DMA);
+    if (!ncr400->block_count_loaded) {
+        if (!(val & MODE_DMA)) {
+            ncr->tcr &= ~TCR_LAST_BYTE_SENT;
+            ncr->isr &= ~STATUS_END_OF_DMA;
+            scsi_bus->tx_mode = PIO_TX_BUS;
+        }
+    }
+}
+
+static void
+ncr53c400_callback(void *priv)
+{
+    ncr53c400_t    *ncr400     = (ncr53c400_t *) priv;
+    ncr_t          *ncr        = &ncr400->ncr;
+    scsi_bus_t     *scsi_bus   = &ncr->scsibus;
+    scsi_device_t  *dev        = &scsi_devices[ncr->bus][scsi_bus->target_id];
+    int            bus;
+    uint8_t        c;
+    uint8_t        temp;
+    uint8_t        status;
+
+    if (scsi_bus->tx_mode != PIO_TX_BUS) {
+        ncr53c400_log("PERIOD T130B DMA=%lf.\n", scsi_bus->period / 225.0);
+        timer_on_auto(&ncr400->timer, scsi_bus->period / 225.0);
+    }
+
+    if (scsi_bus->data_wait & 1) {
+        scsi_bus->clear_req = 3;
+        scsi_bus->data_wait &= ~1;
+    }
+
+    if (scsi_bus->tx_mode == PIO_TX_BUS) {
+        ncr53c400_log("Timer CMD=%02x.\n", scsi_bus->command[0]);
+        return;
+    }
+
+    switch (scsi_bus->tx_mode) {
+        case DMA_OUT_TX_BUS:
+            if (ncr400->status_ctrl & CTRL_DATA_DIR) {
+                ncr53c400_log("DMA_SEND with DMA direction set wrong\n");
+                break;
+            }
+
+            if (!(ncr400->status_ctrl & STATUS_BUFFER_NOT_READY)) {
+                ncr53c400_log("Write buffer status ready\n");
+                break;
+            }
+
+            if (!ncr400->block_count_loaded) {
+                ncr53c400_log("Write block count not loaded.\n");
+                break;
+            }
+
+            while (1) {
+                for (c = 0; c < 10; c++) {
+                    status = scsi_bus_read(scsi_bus);
+                    if (status & BUS_REQ)
+                        break;
+                }
+                /* Data ready. */
+                temp = ncr400->buffer[ncr400->buffer_pos];
+
+                bus = ncr5380_get_bus_host(ncr) & ~BUS_DATAMASK;
+                bus |= BUS_SETDATA(temp);
+
+                scsi_bus_update(scsi_bus, bus | BUS_ACK);
+                scsi_bus_update(scsi_bus, bus & ~BUS_ACK);
+
+                ncr400->buffer_pos++;
+                ncr53c400_log("NCR 53c400 Buffer pos for writing = %d\n", ncr400->buffer_pos);
+
+                if (ncr400->buffer_pos == MIN(128, dev->buffer_length)) {
+                    ncr400->status_ctrl &= ~STATUS_BUFFER_NOT_READY;
+                    ncr400->buffer_pos      = 0;
+                    ncr400->buffer_host_pos = 0;
+                    ncr400->busy    = 0;
+                    ncr400->block_count = (ncr400->block_count - 1) & 0xff;
+                    ncr53c400_log("NCR 53c400 Remaining blocks to be written=%d\n", ncr400->block_count);
+                    if (!ncr400->block_count) {
+                        scsi_bus->tx_mode = PIO_TX_BUS;
+                        ncr400->block_count_loaded = 0;
+                        ncr53c400_log("IO End of write transfer\n");
+                        ncr->tcr |= TCR_LAST_BYTE_SENT;
+                        ncr->isr |= STATUS_END_OF_DMA;
+                        if (ncr->mode & MODE_ENA_EOP_INT) {
+                            ncr53c400_log("NCR 53c400 write irq\n");
+                            ncr5380_irq(ncr, 1);
+                        }
+                    }
+                    break;
+                }
+            }
+            break;
+
+        case DMA_IN_TX_BUS:
+            if (!(ncr400->status_ctrl & CTRL_DATA_DIR)) {
+                ncr53c400_log("DMA_INITIATOR_RECEIVE with DMA direction set wrong\n");
+                break;
+            }
+
+            if (!(ncr400->status_ctrl & STATUS_BUFFER_NOT_READY)) {
+                ncr53c400_log("Read buffer status ready\n");
+                break;
+            }
+
+            if (!ncr400->block_count_loaded)
+                break;
+
+            while (1) {
+                for (c = 0; c < 10; c++) {
+                    status = scsi_bus_read(scsi_bus);
+                    if (status & BUS_REQ)
+                        break;
+                }
+                /* Data ready. */
+                bus = scsi_bus_read(scsi_bus);
+                temp = BUS_GETDATA(bus);
+
+                bus = ncr5380_get_bus_host(ncr);
+
+                scsi_bus_update(scsi_bus, bus | BUS_ACK);
+                scsi_bus_update(scsi_bus, bus & ~BUS_ACK);
+
+                ncr400->buffer[ncr400->buffer_pos++] = temp;
+                ncr53c400_log("NCR 53c400 Buffer pos for reading = %d\n", ncr400->buffer_pos);
+
+                if (ncr400->buffer_pos == MIN(128, dev->buffer_length)) {
+                    ncr400->status_ctrl &= ~STATUS_BUFFER_NOT_READY;
+                    ncr400->buffer_pos      = 0;
+                    ncr400->buffer_host_pos = 0;
+                    ncr400->block_count = (ncr400->block_count - 1) & 0xff;
+                    ncr53c400_log("NCR 53c400 Remaining blocks to be read=%d\n", ncr400->block_count);
+                    if (!ncr400->block_count) {
+                        ncr400->block_count_loaded = 0;
+                        if (ncr400->type == ROM_T130B) {
+                            scsi_bus->tx_mode = PIO_TX_BUS;
+                            ncr53c400_log("IO End of read transfer\n");
+                            ncr->isr |= STATUS_END_OF_DMA;
+                            if (ncr->mode & MODE_ENA_EOP_INT) {
+                                ncr53c400_log("NCR read irq\n");
+                                ncr5380_irq(ncr, 1);
+                            }
+                        } else
+                            timer_on_auto(&ncr400->timer, 1.0);
+                    }
+                    break;
+                }
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    status = scsi_bus_read(scsi_bus);
+
+    if (!(status & BUS_BSY) && (ncr->mode & MODE_MONITOR_BUSY)) {
+        ncr53c400_log("Updating DMA\n");
+        ncr->mode &= ~MODE_DMA;
+        scsi_bus->tx_mode = PIO_TX_BUS;
+        ncr400->block_count_loaded = 0;
+    }
+}
+
+static uint8_t
+rt1000b_mc_read(int port, void *priv)
+{
+    const ncr53c400_t *ncr400 = (ncr53c400_t *) priv;
+
+    return (ncr400->pos_regs[port & 7]);
+}
+
+static void
+rt1000b_mc_write(int port, uint8_t val, void *priv)
+{
+    ncr53c400_t *ncr400 = (ncr53c400_t *) priv;
+
+    /* MCA does not write registers below 0x0100. */
+    if (port < 0x0102)
+        return;
+
+    mem_mapping_disable(&ncr400->bios_rom.mapping);
+    mem_mapping_disable(&ncr400->mapping);
+
+    /* Save the MCA register value. */
+    ncr400->pos_regs[port & 7] = val;
+
+    if (ncr400->pos_regs[2] & 1) {
+        switch (ncr400->pos_regs[2] & 0xe0) {
+            case 0:
+                ncr400->rom_addr = 0xd4000;
+                break;
+            case 0x20:
+                ncr400->rom_addr = 0xd0000;
+                break;
+            case 0x40:
+                ncr400->rom_addr = 0xcc000;
+                break;
+            case 0x60:
+                ncr400->rom_addr = 0xc8000;
+                break;
+            case 0xc0:
+                ncr400->rom_addr = 0xdc000;
+                break;
+            case 0xe0:
+                ncr400->rom_addr = 0xd8000;
+                break;
+
+            default:
+                break;
+        }
+
+        mem_mapping_set_addr(&ncr400->bios_rom.mapping, ncr400->rom_addr, 0x4000);
+        mem_mapping_set_addr(&ncr400->mapping, ncr400->rom_addr, 0x4000);
+    }
+}
+
+static uint8_t
+rt1000b_mc_feedb(void *priv)
+{
+    const ncr53c400_t *ncr400 = (ncr53c400_t *) priv;
+
+    return ncr400->pos_regs[2] & 1;
+}
+
+static void *
+ncr53c400_init(const device_t *info)
+{
+    const char  *bios_ver = NULL;
+    const char  *fn;
+    ncr53c400_t *ncr400 = calloc(1, sizeof(ncr53c400_t));
+    ncr_t       *ncr    = &ncr400->ncr;
+    scsi_bus_t  *scsi_bus;
+
+    ncr400->type = info->local;
+
+    ncr->bus = scsi_get_bus();
+    scsi_bus = &ncr->scsibus;
+
+    switch (ncr400->type) {
+        case ROM_LCS6821N: /* Longshine LCS6821N */
+            ncr400->rom_addr = device_get_config_hex20("bios_addr");
+            ncr->irq         = device_get_config_int("irq");
+
+            rom_init(&ncr400->bios_rom, LCS6821N_ROM,
+                     ncr400->rom_addr, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL);
+
+            mem_mapping_add(&ncr400->mapping, ncr400->rom_addr, 0x4000,
+                            ncr53c400_read, NULL, NULL,
+                            ncr53c400_write, NULL, NULL,
+                            ncr400->bios_rom.rom, MEM_MAPPING_EXTERNAL, ncr400);
+            break;
+
+
+        case ROM_LS2000: /* Corel LS2000 */
+            ncr400->rom_addr = device_get_config_hex20("bios_addr");
+            ncr->irq         = device_get_config_int("irq");
+
+            rom_init(&ncr400->bios_rom, COREL_LS2000_ROM,
+                     ncr400->rom_addr, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL);
+
+            mem_mapping_add(&ncr400->mapping, ncr400->rom_addr, 0x4000,
+                            ncr53c400_read, NULL, NULL,
+                            ncr53c400_write, NULL, NULL,
+                            ncr400->bios_rom.rom, MEM_MAPPING_EXTERNAL, ncr400);
+            break;
+
+        case ROM_RT1000B: /* Rancho RT1000B/MC */
+            ncr400->rom_addr = device_get_config_hex20("bios_addr");
+            ncr->irq         = device_get_config_int("irq");
+            if (info->flags & DEVICE_MCA) {
+                rom_init(&ncr400->bios_rom, RT1000B_820R_ROM,
+                         0xd8000, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL);
+                mem_mapping_add(&ncr400->mapping, 0xd8000, 0x4000,
+                                ncr53c400_read, NULL, NULL,
+                                ncr53c400_write, NULL, NULL,
+                                ncr400->bios_rom.rom, MEM_MAPPING_EXTERNAL, ncr400);
+                mem_mapping_disable(&ncr400->bios_rom.mapping);
+                ncr400->pos_regs[0] = 0x8d;
+                ncr400->pos_regs[1] = 0x70;
+                mca_add(rt1000b_mc_read, rt1000b_mc_write, rt1000b_mc_feedb, NULL, ncr400);
+            } else {
+                bios_ver     = (char *) device_get_config_bios("bios_ver");
+                fn           = (char *) device_get_bios_file(info, bios_ver, 0);
+                rom_init(&ncr400->bios_rom, fn,
+                         ncr400->rom_addr, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL);
+                mem_mapping_add(&ncr400->mapping, ncr400->rom_addr, 0x4000,
+                                ncr53c400_read, NULL, NULL,
+                                ncr53c400_write, NULL, NULL,
+                                ncr400->bios_rom.rom, MEM_MAPPING_EXTERNAL, ncr400);
+            }
+            break;
+
+        case ROM_T130B: /* Trantor T130B */
+            ncr400->rom_addr = device_get_config_hex20("bios_addr");
+            ncr400->base     = device_get_config_hex16("base");
+            ncr->irq     = device_get_config_int("irq");
+
+            if (ncr400->rom_addr > 0x00000) {
+                rom_init(&ncr400->bios_rom, T130B_ROM,
+                         ncr400->rom_addr, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL);
+
+                mem_mapping_add(&ncr400->mapping, ncr400->rom_addr, 0x4000,
+                                t130b_read, NULL, NULL,
+                                t130b_write, NULL, NULL,
+                                ncr400->bios_rom.rom, MEM_MAPPING_EXTERNAL, ncr400);
+            }
+
+            io_sethandler(ncr400->base, 16,
+                          t130b_in, NULL, NULL, t130b_out, NULL, NULL, ncr400);
+            break;
+
+        default:
+            break;
+    }
+
+    ncr->priv                       = ncr400;
+    ncr->dma_mode_ext               = ncr53c400_dma_mode_ext;
+    ncr->dma_send_ext               = NULL;
+    ncr->dma_initiator_receive_ext  = NULL;
+    ncr->timer                      = ncr53c400_timer_on_auto;
+    scsi_bus->bus_device            = ncr->bus;
+    scsi_bus->timer                 = ncr->timer;
+    scsi_bus->priv                  = ncr->priv;
+    ncr400->status_ctrl             = 0x00;
+    ncr400->buffer_host_pos         = 128;
+    timer_add(&ncr400->timer, ncr53c400_callback, ncr400, 0);
+
+    scsi_bus_set_speed(ncr->bus, 5000000.0);
+    scsi_bus->speed = 0.2;
+    if (ncr400->type == ROM_T130B) {
+        scsi_bus->divider = 2.0;
+        scsi_bus->multi = 1.750;
+    } else {
+        scsi_bus->divider = 1.0;
+        scsi_bus->multi = 1.0;
+    }
+
+    for (int i = 0; i < 8; i++)
+        scsi_device_reset(&scsi_devices[ncr->bus][i]);
+
+    return ncr400;
+}
+
+static void
+ncr53c400_close(void *priv)
+{
+    ncr53c400_t *ncr400 = (ncr53c400_t *) priv;
+
+    if (ncr400) {
+        /* Tell the timer to terminate. */
+        timer_stop(&ncr400->timer);
+
+        free(ncr400);
+        ncr400 = NULL;
+    }
+}
+
+static int
+lcs6821n_available(void)
+{
+    return (rom_present(LCS6821N_ROM));
+}
+
+static int
+rt1000b_mc_available(void)
+{
+    return (rom_present(RT1000B_820R_ROM));
+}
+
+static int
+t130b_available(void)
+{
+    return (rom_present(T130B_ROM));
+}
+
+static int
+corel_ls2000_available(void)
+{
+    return (rom_present(COREL_LS2000_ROM));
+}
+
+// clang-format off
+static const device_config_t ncr53c400_mmio_config[] = {
+    {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xD8000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "C800H", .value = 0xc8000 },
+            { .description = "CC00H", .value = 0xcc000 },
+            { .description = "D000H", .value = 0xd0000 },
+            { .description = "D400H", .value = 0xd4000 },
+            { .description = "D800H", .value = 0xd8000 },
+            { .description = "DC00H", .value = 0xdc000 },
+            { .description = ""                        }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",  .value = -1 },
+            { .description = "IRQ 3", .value =  3 },
+            { .description = "IRQ 5", .value =  5 },
+            { .description = "IRQ 7", .value =  7 },
+            { .description = ""                   }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t rt1000b_config[] = {
+    {
+        .name           = "bios_ver",
+        .description    = "BIOS Revision",
+        .type           = CONFIG_BIOS,
+        .default_string = "v8_10r",
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios = {
+            {
+                .name          = "Version 8.10R",
+                .internal_name = "v8_10r",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 8192,
+                .files         = { RT1000B_810R_ROM, "" }
+            },
+            {
+                .name          = "Version 8.20R",
+                .internal_name = "v8_20r",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 8192,
+                .files         = { RT1000B_820R_ROM, "" }
+            },
+            { .files_no = 0 }
+        },
+    },
+    {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xD8000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "C800H", .value = 0xc8000 },
+            { .description = "CC00H", .value = 0xcc000 },
+            { .description = "D000H", .value = 0xd0000 },
+            { .description = "D400H", .value = 0xd4000 },
+            { .description = "D800H", .value = 0xd8000 },
+            { .description = "DC00H", .value = 0xdc000 },
+            { .description = ""                        }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",  .value = -1 },
+            { .description = "IRQ 3", .value =  3 },
+            { .description = "IRQ 5", .value =  5 },
+            { .description = "IRQ 7", .value =  7 },
+            { .description = ""                   }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t rt1000b_mc_config[] = {
+    {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",  .value = -1 },
+            { .description = "IRQ 3", .value =  3 },
+            { .description = "IRQ 5", .value =  5 },
+            { .description = "IRQ 7", .value =  7 },
+            { .description = ""                   }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t t130b_config[] = {
+    {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xD8000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled", .value =       0 },
+            { .description = "C800H",    .value = 0xc8000 },
+            { .description = "CC00H",    .value = 0xcc000 },
+            { .description = "D800H",    .value = 0xd8000 },
+            { .description = "DC00H",    .value = 0xdc000 },
+            { .description = ""                           }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0350,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "240H", .value = 0x0240 },
+            { .description = "250H", .value = 0x0250 },
+            { .description = "340H", .value = 0x0340 },
+            { .description = "350H", .value = 0x0350 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",  .value = -1 },
+            { .description = "IRQ 3", .value =  3 },
+            { .description = "IRQ 5", .value =  5 },
+            { .description = "IRQ 7", .value =  7 },
+            { .description = ""                   }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+// clang-format on
+
+const device_t scsi_lcs6821n_device = {
+    .name          = "Longshine LCS-6821N",
+    .internal_name = "lcs6821n",
+    .flags         = DEVICE_ISA,
+    .local         = ROM_LCS6821N,
+    .init          = ncr53c400_init,
+    .close         = ncr53c400_close,
+    .reset         = NULL,
+    .available     = lcs6821n_available,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ncr53c400_mmio_config
+};
+
+const device_t scsi_rt1000b_device = {
+    .name          = "Rancho RT1000B",
+    .internal_name = "rt1000b",
+    .flags         = DEVICE_ISA,
+    .local         = ROM_RT1000B,
+    .init          = ncr53c400_init,
+    .close         = ncr53c400_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = rt1000b_config
+};
+
+const device_t scsi_rt1000mc_device = {
+    .name          = "Rancho RT1000B-MC",
+    .internal_name = "rt1000mc",
+    .flags         = DEVICE_MCA,
+    .local         = ROM_RT1000B,
+    .init          = ncr53c400_init,
+    .close         = ncr53c400_close,
+    .reset         = NULL,
+    .available     = rt1000b_mc_available,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = rt1000b_mc_config
+};
+
+const device_t scsi_t130b_device = {
+    .name          = "Trantor T130B",
+    .internal_name = "t130b",
+    .flags         = DEVICE_ISA,
+    .local         = ROM_T130B,
+    .init          = ncr53c400_init,
+    .close         = ncr53c400_close,
+    .reset         = NULL,
+    .available     = t130b_available,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = t130b_config
+};
+
+const device_t scsi_ls2000_device = {
+    .name          = "Corel LS2000",
+    .internal_name = "ls2000",
+    .flags         = DEVICE_ISA | DEVICE_SIDECAR,
+    .local         = ROM_LS2000,
+    .init          = ncr53c400_init,
+    .close         = ncr53c400_close,
+    .reset         = NULL,
+    .available     = corel_ls2000_available,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ncr53c400_mmio_config
+};
diff --git a/src/scsi/scsi_ncr53c8xx.c b/src/scsi/scsi_ncr53c8xx.c
index 42925338d..f87f22452 100644
--- a/src/scsi/scsi_ncr53c8xx.c
+++ b/src/scsi/scsi_ncr53c8xx.c
@@ -205,7 +205,7 @@ typedef enum {
 } scsi_state_t;
 
 typedef struct ncr53c8xx_t {
-    char         *nvr_path;
+    char          nvr_path[64];
     uint8_t       pci_slot;
     uint8_t       chip, wide;
     int           has_bios;
@@ -280,6 +280,7 @@ typedef struct ncr53c8xx_t {
     uint8_t swide;
     uint8_t gpcntl;
     uint8_t last_command;
+    uint8_t sodl;
 
     int                command_complete;
     ncr53c8xx_request *current;
@@ -1704,6 +1705,8 @@ ncr53c8xx_reg_writeb(ncr53c8xx_t *dev, uint32_t offset, uint8_t val)
             dev->stest3 = val;
             break;
         case 0x54:
+            dev->sodl = val;
+            break;
         case 0x55:
             break;
             CASE_SET_REG32(scratchb, 0x5c)
@@ -1989,6 +1992,9 @@ ncr53c8xx_reg_readb(ncr53c8xx_t *dev, uint32_t offset)
             if ((dev->sstat1 & PHASE_MASK) == PHASE_MI) {
                 ncr53c8xx_log("NCR 810: Read SBDL %02X\n", dev->msg[0]);
                 return dev->msg[0];
+            } else if (dev->stest2 & 0x80) {
+                ncr53c8xx_log("NCR 810: Read SBDL %02X\n", dev->sodl);
+                return dev->sodl;
             }
             ncr53c8xx_log("NCR 810: Read SBDL 00\n");
             return 0;
@@ -2524,10 +2530,7 @@ ncr53c8xx_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
 static void *
 ncr53c8xx_init(const device_t *info)
 {
-    ncr53c8xx_t *dev;
-
-    dev = malloc(sizeof(ncr53c8xx_t));
-    memset(dev, 0x00, sizeof(ncr53c8xx_t));
+    ncr53c8xx_t *dev = calloc(1, sizeof(ncr53c8xx_t));
 
     dev->bus = scsi_get_bus();
 
@@ -2561,28 +2564,39 @@ ncr53c8xx_init(const device_t *info)
     else
         pci_add_card(PCI_ADD_NORMAL, ncr53c8xx_pci_read, ncr53c8xx_pci_write, dev, &dev->pci_slot);
 
-    if (dev->chip == CHIP_875) {
-        dev->chip_rev = 0x04;
-        dev->nvr_path = "ncr53c875.nvr";
-        dev->wide     = 1;
-    } else if (dev->chip == CHIP_860) {
-        dev->chip_rev = 0x04;
-        dev->nvr_path = "ncr53c860.nvr";
-        dev->wide     = 1;
-    } else if (dev->chip == CHIP_820) {
-        dev->nvr_path = "ncr53c820.nvr";
-        dev->wide     = 1;
-    } else if (dev->chip == CHIP_825) {
-        dev->chip_rev = 0x26;
-        dev->nvr_path = "ncr53c825a.nvr";
-        dev->wide     = 1;
-    } else if (dev->chip == CHIP_810) {
-        dev->nvr_path = "ncr53c810.nvr";
-        dev->wide     = 0;
-    } else if (dev->chip == CHIP_815) {
-        dev->chip_rev = 0x04;
-        dev->nvr_path = "ncr53c815.nvr";
-        dev->wide     = 0;
+    scsi_bus_set_speed(dev->bus, 10000000.0);
+
+    switch (dev->chip) {
+        case CHIP_810:
+            sprintf(dev->nvr_path, "ncr53c810_%i.nvr", device_get_instance());
+            dev->wide     = 0;
+            break;
+        case CHIP_815:
+            dev->chip_rev = 0x04;
+            sprintf(dev->nvr_path, "ncr53c815_%i.nvr", device_get_instance());
+            dev->wide     = 0;
+            break;
+        case CHIP_820:
+            sprintf(dev->nvr_path, "ncr53c820_%i.nvr", device_get_instance());
+            dev->wide     = 1;
+            break;
+        case CHIP_825:
+            dev->chip_rev = 0x26;
+            sprintf(dev->nvr_path, "ncr53c825a_%i.nvr", device_get_instance());
+            dev->wide     = 1;
+            break;
+        case CHIP_860:
+            scsi_bus_set_speed(dev->bus, 20000000.0);
+            dev->chip_rev = 0x04;
+            sprintf(dev->nvr_path, "ncr53c860_%i.nvr", device_get_instance());
+            dev->wide     = 1;
+            break;
+        case CHIP_875:
+            scsi_bus_set_speed(dev->bus, 40000000.0);
+            dev->chip_rev = 0x04;
+            sprintf(dev->nvr_path, "ncr53c875_%i.nvr", device_get_instance());
+            dev->wide     = 1;
+            break;
     }
 
     ncr53c8xx_pci_bar[0].addr_regs[0] = 1;
@@ -2623,8 +2637,6 @@ ncr53c8xx_init(const device_t *info)
 
     timer_add(&dev->timer, ncr53c8xx_callback, dev, 0);
 
-    scsi_bus_set_speed(dev->bus, 10000000.0);
-
     return dev;
 }
 
@@ -2651,19 +2663,20 @@ ncr53c8xx_close(void *priv)
 static const device_config_t ncr53c8xx_pci_config[] = {
   // clang-format off
     {
-        .name = "bios",
-        .description = "BIOS",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 1,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "bios",
+        .description    = "BIOS Revision",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "SDMS 4.x BIOS", .value = 2 },
             { .description = "SDMS 3.x BIOS", .value = 1 },
             { .description = "Disable BIOS",  .value = 0 },
             { .description = ""                          }
         },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -2677,7 +2690,7 @@ const device_t ncr53c810_pci_device = {
     .init          = ncr53c8xx_init,
     .close         = ncr53c8xx_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2691,7 +2704,7 @@ const device_t ncr53c810_onboard_pci_device = {
     .init          = ncr53c8xx_init,
     .close         = ncr53c8xx_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2705,7 +2718,7 @@ const device_t ncr53c815_pci_device = {
     .init          = ncr53c8xx_init,
     .close         = ncr53c8xx_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     ncr53c8xx_pci_config
@@ -2719,7 +2732,7 @@ const device_t ncr53c820_pci_device = {
     .init          = ncr53c8xx_init,
     .close         = ncr53c8xx_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -2733,7 +2746,7 @@ const device_t ncr53c825a_pci_device = {
     .init          = ncr53c8xx_init,
     .close         = ncr53c8xx_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = ncr53c8xx_pci_config
@@ -2747,7 +2760,7 @@ const device_t ncr53c860_pci_device = {
     .init          = ncr53c8xx_init,
     .close         = ncr53c8xx_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = ncr53c8xx_pci_config
@@ -2761,7 +2774,7 @@ const device_t ncr53c875_pci_device = {
     .init          = ncr53c8xx_init,
     .close         = ncr53c8xx_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = ncr53c8xx_pci_config
diff --git a/src/scsi/scsi_pcscsi.c b/src/scsi/scsi_pcscsi.c
index 674bbdabf..2c73066a1 100644
--- a/src/scsi/scsi_pcscsi.c
+++ b/src/scsi/scsi_pcscsi.c
@@ -26,6 +26,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 #define HAVE_STDARG_H
 #include <wchar.h>
 #include <86box/86box.h>
@@ -39,19 +40,31 @@
 #include <86box/pci.h>
 #include <86box/device.h>
 #include <86box/nvr.h>
+#include <86box/nmc93cxx.h>
 #include <86box/plat.h>
 #include <86box/scsi.h>
 #include <86box/scsi_device.h>
 #include <86box/scsi_pcscsi.h>
-#include <86box/vid_ati_eeprom.h>
 #include <86box/fifo8.h>
+#include "cpu.h"
 
-#define DC390_ROM        "roms/scsi/esp_pci/INT13.BIN"
+#define DC390_ROM             "roms/scsi/esp_pci/INT13.BIN"
+#define AM53C974_3_01_AMD_ROM "roms/scsi/esp_pci/ebrom.bin"
+#define AM53C974_3_43_ROM     "roms/scsi/esp_pci/2974BIOS.BIN"
+#define AM53C974_4_00_ROM     "roms/scsi/esp_pci/2974bios-4-00.bin"
+#define AM53C974_5_00_ROM     "roms/scsi/esp_pci/2974bios-5-00.bin"
+#define AM53C974_5_11_ROM     "roms/scsi/esp_pci/2974bios-5-11.bin"
 
 #define ESP_REGS         16
 #define ESP_FIFO_SZ      16
 #define ESP_CMDFIFO_SZ   32
 
+enum ESPASCMode {
+    ESP_ASC_MODE_DIS = 0,    /* Disconnected */
+    ESP_ASC_MODE_INI = 1,    /* Initiator */
+    ESP_ASC_MODE_TGT = 2     /* Target */
+};
+
 #define ESP_TCLO         0x0
 #define ESP_TCMID        0x1
 #define ESP_FIFO         0x2
@@ -78,6 +91,13 @@
 #define CMD_DMA          0x80
 #define CMD_CMD          0x7f
 
+#define CMD_GRP_MASK     0x70
+
+#define CMD_GRP_MISC     0x00
+#define CMD_GRP_INIT     0x01
+#define CMD_GRP_TRGT     0x02
+#define CMD_GRP_DISC     0x04
+
 #define CMD_NOP          0x00
 #define CMD_FLUSH        0x01
 #define CMD_RESET        0x02
@@ -112,6 +132,7 @@
 #define INTR_FC          0x08
 #define INTR_BS          0x10
 #define INTR_DC          0x20
+#define INTR_IL          0x40
 #define INTR_RST         0x80
 
 #define SEQ_0            0x0
@@ -120,6 +141,7 @@
 
 #define CFG1_RESREPT     0x40
 
+#define TCHI_ESP100A     0x01
 #define TCHI_FAS100A     0x04
 #define TCHI_AM53C974    0x12
 
@@ -150,15 +172,13 @@
 #define SBAC_PABTEN      (1 << 25)
 
 typedef struct esp_t {
-    mem_mapping_t mmio_mapping;
-    mem_mapping_t ram_mapping;
-    char         *nvr_path;
+    char         *bios_path;
+    char          nvr_path[64];
     uint8_t       pci_slot;
     int           has_bios;
     int           BIOSBase;
     int           MMIOBase;
     rom_t         bios;
-    ati_eeprom_t  eeprom;
     int           PCIBase;
 
     uint8_t  rregs[ESP_REGS];
@@ -172,11 +192,12 @@ typedef struct esp_t {
     uint8_t  bus;
     uint8_t  id, lun;
     Fifo8    cmdfifo;
-    uint32_t do_cmd;
     uint8_t  cmdfifo_cdb_offset;
+    uint8_t  asc_mode;
+    int      data_ready;
 
-    int32_t xfer_counter;
-    int     dma_enabled;
+    int32_t  xfer_counter;
+    int      dma_enabled;
 
     uint32_t buffer_pos;
     uint32_t dma_regs[8];
@@ -186,6 +207,7 @@ typedef struct esp_t {
 
     pc_timer_t timer;
 
+    int      local;
     int      mca;
     uint16_t Base;
     uint8_t  HostID;
@@ -194,16 +216,27 @@ typedef struct esp_t {
     struct {
         uint8_t mode;
         uint8_t status;
+        int     interrupt;
         int     pos;
     } dma_86c01;
 
     uint8_t irq_state;
     uint8_t pos_regs[8];
+
+    uint8_t eeprom_inst;
+    uint8_t eeprom_data[128];
+
+    nmc93cxx_eeprom_t *eeprom;
 } esp_t;
 
+static esp_t *reset_state = NULL;
+
 #define READ_FROM_DEVICE 1
 #define WRITE_TO_DEVICE  0
 
+uint8_t esp_pci_regs[256];
+bar_t   esp_pci_bar[2];
+
 #ifdef ENABLE_ESP_LOG
 int esp_do_log = ENABLE_ESP_LOG;
 
@@ -223,15 +256,61 @@ esp_log(const char *fmt, ...)
 #endif
 
 static void esp_dma_enable(esp_t *dev, int level);
-static void esp_do_dma(esp_t *dev, scsi_device_t *sd);
-static void esp_do_nodma(esp_t *dev, scsi_device_t *sd);
+static void esp_do_dma(esp_t *dev);
+static void esp_do_nodma(esp_t *dev);
 static void esp_pci_dma_memory_rw(esp_t *dev, uint8_t *buf, uint32_t len, int dir);
 static void esp_timer_on(esp_t *dev, scsi_device_t *sd, double p);
 static void esp_command_complete(void *priv, uint32_t status);
-static void esp_pci_command_complete(void *priv, uint32_t status);
+static void esp_dma_ti_check(esp_t *dev);
+static void esp_nodma_ti_dataout(esp_t *dev);
 static void esp_pci_soft_reset(esp_t *dev);
 static void esp_pci_hard_reset(esp_t *dev);
-static void handle_ti(void *priv);
+static void handle_ti(esp_t *dev);
+
+static int
+esp_cdb_length(uint8_t *buf)
+{
+    int cdb_len;
+
+    switch (buf[0] >> 5) {
+        case 0:
+        case 3:
+            cdb_len = 6;
+            break;
+        case 1:
+        case 2:
+        case 6: /*Vendor unique*/
+            cdb_len = 10;
+            break;
+        case 4:
+            cdb_len = 16;
+            break;
+        case 5:
+            cdb_len = 12;
+            break;
+        default:
+            cdb_len = -1;
+            break;
+    }
+    return cdb_len;
+}
+
+static void
+esp_pci_update_irq(esp_t *dev)
+{
+    int scsi_level = !!(dev->dma_regs[DMA_STAT] & DMA_STAT_SCSIINT);
+    int dma_level = (dev->dma_regs[DMA_CMD] & DMA_CMD_INTE_D) ?
+                    !!(dev->dma_regs[DMA_STAT] & DMA_STAT_DONE) : 0;
+    int level = scsi_level || dma_level;
+
+    if (level) {
+        pci_set_irq(dev->pci_slot, PCI_INTA, &dev->irq_state);
+        esp_log("Raising PCI IRQ..., SCSIL=%d, DMAL=%d\n", scsi_level, dma_level);
+    } else {
+        pci_clear_irq(dev->pci_slot, PCI_INTA, &dev->irq_state);
+        esp_log("Lowering PCI IRQ..., SCSIL=%d, DMAL=%d\n", scsi_level, dma_level);
+    }
+}
 
 static void
 esp_irq(esp_t *dev, int level)
@@ -239,19 +318,31 @@ esp_irq(esp_t *dev, int level)
     if (dev->mca) {
         if (level) {
             picintlevel(1 << dev->irq, &dev->irq_state);
+            dev->dma_86c01.mode |= 0x40;
             esp_log("Raising IRQ...\n");
         } else {
             picintclevel(1 << dev->irq, &dev->irq_state);
+            dev->dma_86c01.mode &= ~0x40;
             esp_log("Lowering IRQ...\n");
         }
     } else {
         if (level) {
-            pci_set_irq(dev->pci_slot, PCI_INTA, &dev->irq_state);
-            esp_log("Raising IRQ...\n");
-        } else {
-            pci_clear_irq(dev->pci_slot, PCI_INTA, &dev->irq_state);
-            esp_log("Lowering IRQ...\n");
-        }
+            dev->dma_regs[DMA_STAT] |= DMA_STAT_SCSIINT;
+            /*
+             * If raising the ESP IRQ to indicate end of DMA transfer, set
+             * DMA_STAT_DONE at the same time. In theory this should be done in
+             * esp_pci_dma_memory_rw(), however there is a delay between setting
+             * DMA_STAT_DONE and the ESP IRQ arriving which is visible to the
+             * guest that can cause confusion e.g. Linux
+             */
+            esp_log("ESP IRQ issuing: WBC=%d, CMDMask=%03x.\n", dev->dma_regs[DMA_WBC], dev->dma_regs[DMA_CMD] & DMA_CMD_MASK);
+            if (((dev->dma_regs[DMA_CMD] & DMA_CMD_MASK) == 0x03) &&
+                (dev->dma_regs[DMA_WBC] == 0))
+                dev->dma_regs[DMA_STAT] |= DMA_STAT_DONE;
+        } else
+            dev->dma_regs[DMA_STAT] &= ~DMA_STAT_SCSIINT;
+
+        esp_pci_update_irq(dev);
     }
 }
 
@@ -274,41 +365,46 @@ esp_lower_irq(esp_t *dev)
 }
 
 static void
-esp_fifo_push(Fifo8 *fifo, uint8_t val)
+esp_set_phase(esp_t *dev, uint8_t phase)
 {
-    if (fifo8_num_used(fifo) == fifo->capacity) {
-        return;
-    }
-
-    fifo8_push(fifo, val);
+    dev->rregs[ESP_RSTAT] &= ~7;
+    dev->rregs[ESP_RSTAT] |= phase;
 }
 
 static uint8_t
-esp_fifo_pop(Fifo8 *fifo)
+esp_get_phase(esp_t *dev)
 {
-    if (fifo8_is_empty(fifo)) {
-        return 0;
-    }
+    return dev->rregs[ESP_RSTAT] & 7;
+}
 
-    return fifo8_pop(fifo);
+static void
+esp_fifo_push(esp_t *dev, uint8_t val)
+{
+    if (fifo8_num_used(&dev->fifo) == dev->fifo.capacity)
+        return;
+
+    fifo8_push(&dev->fifo, val);
+}
+
+static uint8_t
+esp_fifo_pop(esp_t *dev)
+{
+    uint8_t val;
+
+    if (fifo8_is_empty(&dev->fifo))
+        val = 0;
+    else
+        val = fifo8_pop(&dev->fifo);
+
+    return val;
 }
 
 static uint32_t
-esp_fifo_pop_buf(Fifo8 *fifo, uint8_t *dest, int maxlen)
+esp_fifo_pop_buf(esp_t *dev, uint8_t *dest, int maxlen)
 {
-    const uint8_t *buf;
-    uint32_t       n;
+    uint32_t len = fifo8_pop_buf(&dev->fifo, dest, maxlen);
 
-    if (maxlen == 0) {
-        return 0;
-    }
-
-    buf = fifo8_pop_buf(fifo, maxlen, &n);
-    if (dest) {
-        memcpy(dest, buf, n);
-    }
-
-    return n;
+    return len;
 }
 
 static uint32_t
@@ -316,7 +412,7 @@ esp_get_tc(esp_t *dev)
 {
     uint32_t dmalen;
 
-    dmalen = dev->rregs[ESP_TCLO];
+    dmalen = dev->rregs[ESP_TCLO] & 0xff;
     dmalen |= dev->rregs[ESP_TCMID] << 8;
     dmalen |= dev->rregs[ESP_TCHI] << 16;
 
@@ -326,9 +422,15 @@ esp_get_tc(esp_t *dev)
 static void
 esp_set_tc(esp_t *dev, uint32_t dmalen)
 {
-    dev->rregs[ESP_TCLO]  = dmalen;
+    uint32_t old_tc = esp_get_tc(dev);
+
+    dev->rregs[ESP_TCLO]  = dmalen & 0xff;
     dev->rregs[ESP_TCMID] = dmalen >> 8;
     dev->rregs[ESP_TCHI]  = dmalen >> 16;
+
+    esp_log("OLDTC=%d, DMALEN=%d.\n", old_tc, dmalen);
+    if (old_tc && !dmalen)
+        dev->rregs[ESP_RSTAT] |= STAT_TC;
 }
 
 static uint32_t
@@ -336,71 +438,106 @@ esp_get_stc(esp_t *dev)
 {
     uint32_t dmalen;
 
-    dmalen = dev->wregs[ESP_TCLO];
-    dmalen |= dev->wregs[ESP_TCMID] << 8;
-    dmalen |= dev->wregs[ESP_TCHI] << 16;
+    dmalen = dev->wregs[ESP_TCLO] & 0xff;
+    dmalen |= (dev->wregs[ESP_TCMID] << 8);
+    dmalen |= (dev->wregs[ESP_TCHI] << 16);
 
+    esp_log("STCW=%d.\n", dmalen);
     return dmalen;
 }
 
-static void
-esp_dma_done(esp_t *dev)
+static int
+esp_select(esp_t *dev)
 {
-    dev->rregs[ESP_RSTAT] |= STAT_TC;
-    dev->rregs[ESP_RINTR]  = INTR_BS;
-    dev->rregs[ESP_RSEQ]   = 0;
-    dev->rregs[ESP_RFLAGS] = 0;
-    esp_set_tc(dev, 0);
-    esp_log("ESP DMA Finished\n");
-    esp_raise_irq(dev);
-}
-
-static uint32_t
-esp_get_cmd(esp_t *dev, uint32_t maxlen)
-{
-    uint8_t  buf[ESP_CMDFIFO_SZ];
-    uint32_t dmalen;
-    uint32_t n;
+    scsi_device_t *sd;
 
     dev->id = dev->wregs[ESP_WBUSID] & BUSID_DID;
-    if (dev->dma) {
-        dmalen = MIN(esp_get_tc(dev), maxlen);
-        esp_log("ESP Get data, dmalen = %d\n", dmalen);
-        if (dmalen == 0)
-            return 0;
-        if (dev->mca) {
-            dma_set_drq(dev->DmaChannel, 1);
-            while (dev->dma_86c01.pos < dmalen) {
-                int val                   = dma_channel_read(dev->DmaChannel);
-                buf[dev->dma_86c01.pos++] = val & 0xff;
-            }
-            dev->dma_86c01.pos = 0;
-            dma_set_drq(dev->DmaChannel, 0);
-        } else {
-            esp_pci_dma_memory_rw(dev, buf, dmalen, WRITE_TO_DEVICE);
-        }
-        dmalen = MIN(fifo8_num_free(&dev->cmdfifo), dmalen);
-        fifo8_push_all(&dev->cmdfifo, buf, dmalen);
-    } else {
-        dmalen = MIN(fifo8_num_used(&dev->fifo), maxlen);
-        esp_log("ESP Get command, dmalen = %i\n", dmalen);
-        if (dmalen == 0) {
-            return 0;
-        }
-        n = esp_fifo_pop_buf(&dev->fifo, buf, dmalen);
-        n = MIN(fifo8_num_free(&dev->cmdfifo), n);
-        fifo8_push_all(&dev->cmdfifo, buf, n);
-    }
+    sd = &scsi_devices[dev->bus][dev->id];
 
     dev->ti_size = 0;
-    fifo8_reset(&dev->fifo);
+    dev->rregs[ESP_RSEQ] = SEQ_0;
 
-    dev->rregs[ESP_RINTR] |= INTR_FC;
-    dev->rregs[ESP_RSEQ] = SEQ_CD;
+    if (!scsi_device_present(sd)) {
+        esp_log("ESP SCSI no devices on ID %d, LUN %d\n", dev->id, dev->lun);
+        /* No such drive */
+        dev->rregs[ESP_RSTAT] = 0;
+        dev->asc_mode = ESP_ASC_MODE_DIS;
+        dev->rregs[ESP_RINTR] = INTR_DC;
+        esp_raise_irq(dev);
+        return -1;
+    } else
+        esp_log("ESP SCSI device present on ID %d, LUN %d\n", dev->id, dev->lun);
 
-    return dmalen;
+    dev->asc_mode = ESP_ASC_MODE_INI;
+    return 0;
 }
 
+ /* Callback to indicate that the SCSI layer has completed a transfer.  */
+static void
+esp_transfer_data(esp_t *dev)
+{
+    if (!dev->data_ready) {
+        dev->data_ready = 1;
+
+        switch (dev->rregs[ESP_CMD]) {
+            case CMD_SEL:
+            case (CMD_SEL | CMD_DMA):
+            case CMD_SELATN:
+            case (CMD_SELATN | CMD_DMA):
+                /*
+                 * Initial incoming data xfer is complete for sequencer command
+                 * so raise deferred bus service and function complete interrupt
+                 */
+                dev->rregs[ESP_RINTR] |= (INTR_BS | INTR_FC);
+                dev->rregs[ESP_RSEQ] = SEQ_CD;
+                esp_raise_irq(dev);
+                break;
+
+            case CMD_SELATNS:
+            case (CMD_SELATNS | CMD_DMA):
+                /*
+                 * Initial incoming data xfer is complete so raise command
+                 * completion interrupt
+                 */
+                dev->rregs[ESP_RINTR] |= INTR_BS;
+                dev->rregs[ESP_RSEQ] = SEQ_MO;
+                esp_raise_irq(dev);
+                break;
+
+            case CMD_TI:
+            case (CMD_TI | CMD_DMA):
+                /*
+                 * If the final COMMAND phase data was transferred using a TI
+                 * command, clear ESP_CMD to terminate the TI command and raise
+                 * the completion interrupt
+                 */
+                dev->rregs[ESP_CMD] = 0;
+                dev->rregs[ESP_RINTR] |= INTR_BS;
+                esp_raise_irq(dev);
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    /*
+     * Always perform the initial transfer upon reception of the next TI
+     * command to ensure the DMA/non-DMA status of the command is correct.
+     * It is not possible to use s->dma directly in the section below as
+     * some OSs send non-DMA NOP commands after a DMA transfer. Hence if the
+     * async data transfer is delayed then s->dma is set incorrectly.
+     */
+
+    if (dev->rregs[ESP_CMD] == (CMD_TI | CMD_DMA)) {
+        /* When the SCSI layer returns more data, raise deferred INTR_BS */
+        esp_dma_ti_check(dev);
+        esp_do_dma(dev);
+    } else if (dev->rregs[ESP_CMD] == CMD_TI)
+        esp_do_nodma(dev);
+}
+
+
 static void
 esp_do_command_phase(esp_t *dev)
 {
@@ -416,7 +553,7 @@ esp_do_command_phase(esp_t *dev)
     if (!cmdlen)
         return;
 
-    esp_fifo_pop_buf(&dev->cmdfifo, buf, cmdlen);
+    fifo8_pop_buf(&dev->cmdfifo, buf, cmdlen);
 
     for (int i = 0; i < cmdlen; i++)
         esp_log("CDB[%i] = %02x\n", i, buf[i]);
@@ -427,46 +564,32 @@ esp_do_command_phase(esp_t *dev)
     dev->ti_size      = sd->buffer_length;
     dev->xfer_counter = sd->buffer_length;
 
-    esp_log("ESP SCSI Command = 0x%02x, ID = %d, LUN = %d, len = %d\n", buf[0], dev->id, dev->lun, sd->buffer_length);
+    esp_log("ESP SCSI Command = 0x%02x, ID = %d, LUN = %d, len = %d, phase = %02x, PCI DMA cmd mask = %02x.\n", buf[0], dev->id, dev->lun, sd->buffer_length, sd->phase, dev->dma_regs[DMA_CMD] & DMA_CMD_MASK);
 
     fifo8_reset(&dev->cmdfifo);
 
+    dev->data_ready = 0;
     if (sd->buffer_length > 0) {
-        /* This should be set to the underlying device's buffer by command phase 0. */
-        dev->rregs[ESP_RSTAT] = STAT_TC;
-        dev->rregs[ESP_RSEQ]  = SEQ_CD;
-
         if (sd->phase == SCSI_PHASE_DATA_IN) {
-            dev->rregs[ESP_RSTAT] |= STAT_DI;
+            esp_set_phase(dev, STAT_DI);
             esp_log("ESP Data In\n");
             esp_timer_on(dev, sd, scsi_device_get_callback(sd));
         } else if (sd->phase == SCSI_PHASE_DATA_OUT) {
-            dev->rregs[ESP_RSTAT] |= STAT_DO;
-            esp_log("ESP Data Out\n");
+            esp_set_phase(dev, STAT_DO);
             dev->ti_size = -sd->buffer_length;
+            esp_log("ESP Data Out\n");
             esp_timer_on(dev, sd, scsi_device_get_callback(sd));
         }
         esp_log("ESP SCSI Start reading/writing\n");
-        esp_do_dma(dev, sd);
+        esp_do_dma(dev);
     } else {
         esp_log("ESP SCSI Command with no length\n");
-        if (dev->mca) {
-            if (buf[0] == 0x43) {
-                dev->rregs[ESP_RSTAT] = STAT_DI | STAT_TC;
-                dev->rregs[ESP_RSEQ]  = SEQ_CD;
-                esp_do_dma(dev, sd);
-            } else
-                esp_command_complete(dev, sd->status);
-        } else
-            esp_pci_command_complete(dev, sd->status);
+        esp_command_complete(dev, sd->status);
     }
-
-    scsi_device_identify(sd, SCSI_LUN_USE_CDB);
-
-    dev->rregs[ESP_RINTR] |= (INTR_BS | INTR_FC);
-    esp_raise_irq(dev);
+    esp_transfer_data(dev);
 }
 
+
 static void
 esp_do_message_phase(esp_t *dev)
 {
@@ -474,15 +597,18 @@ esp_do_message_phase(esp_t *dev)
     uint8_t message;
 
     if (dev->cmdfifo_cdb_offset) {
-        message = esp_fifo_pop(&dev->cmdfifo);
+        message = fifo8_is_empty(&dev->cmdfifo) ? 0 :
+                          fifo8_pop(&dev->cmdfifo);
 
         dev->lun = message & 7;
         dev->cmdfifo_cdb_offset--;
 
+        esp_log("Scanning LUN=%d.\n", dev->lun);
         if (scsi_device_present(&scsi_devices[dev->bus][dev->id]) && (dev->lun > 0)) {
             /* We only support LUN 0 */
             esp_log("LUN = %i\n", dev->lun);
             dev->rregs[ESP_RSTAT] = 0;
+            dev->asc_mode = ESP_ASC_MODE_DIS;
             dev->rregs[ESP_RINTR] = INTR_DC;
             dev->rregs[ESP_RSEQ]  = SEQ_0;
             esp_raise_irq(dev);
@@ -497,7 +623,7 @@ esp_do_message_phase(esp_t *dev)
 
     if (dev->cmdfifo_cdb_offset) {
         len = MIN(dev->cmdfifo_cdb_offset, fifo8_num_used(&dev->cmdfifo));
-        esp_fifo_pop_buf(&dev->cmdfifo, NULL, len);
+        fifo8_drop(&dev->cmdfifo, len);
         dev->cmdfifo_cdb_offset = 0;
     }
 }
@@ -505,8 +631,9 @@ esp_do_message_phase(esp_t *dev)
 static void
 esp_do_cmd(esp_t *dev)
 {
+    esp_log("DO CMD.\n");
     esp_do_message_phase(dev);
-    if (dev->cmdfifo_cdb_offset == 0)
+    if (dev->cmdfifo_cdb_offset >= 0)
         esp_do_command_phase(dev);
 }
 
@@ -518,7 +645,10 @@ esp_dma_enable(esp_t *dev, int level)
         dev->dma_enabled = 1;
         timer_stop(&dev->timer);
         if (((dev->rregs[ESP_CMD] & CMD_CMD) != CMD_TI) && ((dev->rregs[ESP_CMD] & CMD_CMD) != CMD_PAD)) {
-            timer_on_auto(&dev->timer, 40.0);
+            if (dev->wregs[ESP_WCCF] & 0x07)
+                timer_on_auto(&dev->timer, ((double)(dev->wregs[ESP_WCCF] & 0x07)) * 5.0);
+            else
+                timer_on_auto(&dev->timer, 40.0);
         } else {
             esp_log("Period = %lf\n", dev->period);
             timer_on_auto(&dev->timer, dev->period);
@@ -534,275 +664,574 @@ esp_hard_reset(esp_t *dev)
 {
     memset(dev->rregs, 0, ESP_REGS);
     memset(dev->wregs, 0, ESP_REGS);
-    dev->tchi_written = 0;
     dev->ti_size      = 0;
     fifo8_reset(&dev->fifo);
     fifo8_reset(&dev->cmdfifo);
     dev->dma             = 0;
-    dev->do_cmd          = 0;
+    dev->tchi_written    = 0;
+    dev->asc_mode = ESP_ASC_MODE_DIS;
     dev->rregs[ESP_CFG1] = dev->mca ? dev->HostID : 7;
+    dev->sbac = 1 << 19;
+
     esp_log("ESP Reset\n");
-    for (uint8_t i = 0; i < 16; i++)
-        scsi_device_reset(&scsi_devices[dev->bus][i]);
+
     timer_stop(&dev->timer);
 }
 
-static void
-esp_do_nodma(esp_t *dev, scsi_device_t *sd)
+static int
+esp_cdb_ready(esp_t *dev)
 {
-    int count;
+    int len = fifo8_num_used(&dev->cmdfifo) - dev->cmdfifo_cdb_offset;
+    const uint8_t *pbuf;
+    uint32_t n;
+    int cdblen;
 
-    esp_log("ESP SCSI Actual FIFO len = %d\n", dev->xfer_counter);
+    if (len <= 0)
+        return 0;
 
-    if (dev->do_cmd) {
-        esp_log("ESP Command on FIFO\n");
-        dev->ti_size = 0;
-
-        if ((dev->rregs[ESP_RSTAT] & 7) == STAT_CD) {
-            if (dev->cmdfifo_cdb_offset == fifo8_num_used(&dev->cmdfifo)) {
-                esp_log("CDB offset = %i used return\n", dev->cmdfifo_cdb_offset);
-                return;
-            }
-
-            dev->do_cmd = 0;
-            esp_do_cmd(dev);
-        } else {
-            dev->cmdfifo_cdb_offset = fifo8_num_used(&dev->cmdfifo);
-            esp_log("CDB offset = %i used\n", dev->cmdfifo_cdb_offset);
-
-            dev->rregs[ESP_RSTAT] = STAT_TC | STAT_CD;
-            dev->rregs[ESP_RSEQ]  = SEQ_CD;
-            dev->rregs[ESP_RINTR] |= INTR_BS;
-            esp_raise_irq(dev);
-        }
-        return;
+    pbuf = fifo8_peek_bufptr(&dev->cmdfifo, len, &n);
+    if (n < len) {
+        /*
+         * In normal use the cmdfifo should never wrap, but include this check
+         * to prevent a malicious guest from reading past the end of the
+         * cmdfifo data buffer below
+         */
+        return 0;
     }
 
-    if (dev->xfer_counter == 0) {
-        /* Wait until data is available.  */
-        esp_log("(ID=%02i LUN=%02i): FIFO no data available\n", dev->id, dev->lun);
-        return;
-    }
+    cdblen = esp_cdb_length((uint8_t *)&pbuf[dev->cmdfifo_cdb_offset]);
 
-    esp_log("ESP FIFO = %d, buffer length = %d\n", dev->xfer_counter, sd->buffer_length);
+    return (cdblen < 0) ? 0 : (len >= cdblen);
+}
 
-    if (sd->phase == SCSI_PHASE_DATA_IN) {
-        if (fifo8_is_empty(&dev->fifo)) {
-            fifo8_push(&dev->fifo, sd->sc->temp_buffer[dev->buffer_pos]);
-            dev->buffer_pos++;
-            dev->ti_size--;
-            dev->xfer_counter--;
-        }
-    } else if (sd->phase == SCSI_PHASE_DATA_OUT) {
-        count = MIN(fifo8_num_used(&dev->fifo), ESP_FIFO_SZ);
-        esp_fifo_pop_buf(&dev->fifo, sd->sc->temp_buffer + dev->buffer_pos, count);
-        dev->buffer_pos += count;
-        dev->ti_size += count;
-        dev->xfer_counter -= count;
-    }
-
-    esp_log("ESP FIFO Transfer bytes = %d\n", dev->xfer_counter);
-    if (dev->xfer_counter <= 0) {
-        if (sd->phase == SCSI_PHASE_DATA_OUT) {
-            if (dev->ti_size < 0) {
-                esp_log("ESP FIFO Keep writing\n");
-                esp_do_nodma(dev, sd);
-            } else {
-                esp_log("ESP FIFO Write finished\n");
-                scsi_device_command_phase1(sd);
-                if (dev->mca) {
-                    esp_command_complete(dev, sd->status);
-                } else
-                    esp_pci_command_complete(dev, sd->status);
-            }
-        } else if (sd->phase == SCSI_PHASE_DATA_IN) {
-            /* If there is still data to be read from the device then
-               complete the DMA operation immediately.  Otherwise defer
-               until the scsi layer has completed.  */
-            if (dev->ti_size <= 0) {
-                esp_log("ESP FIFO Read finished\n");
-                scsi_device_command_phase1(sd);
-                if (dev->mca) {
-                    esp_command_complete(dev, sd->status);
-                } else
-                    esp_pci_command_complete(dev, sd->status);
-            } else {
-                esp_log("ESP FIFO Keep reading\n");
-                esp_do_nodma(dev, sd);
-            }
-        }
-    } else {
-        /* Partially filled a scsi buffer. Complete immediately.  */
-        esp_log("ESP SCSI Partially filled the FIFO buffer\n");
+static void
+esp_dma_ti_check(esp_t *dev)
+{
+    if ((esp_get_tc(dev) == 0) && (fifo8_num_used(&dev->fifo) < 2)) {
         dev->rregs[ESP_RINTR] |= INTR_BS;
         esp_raise_irq(dev);
     }
 }
 
 static void
-esp_do_dma(esp_t *dev, scsi_device_t *sd)
+esp_do_dma(esp_t *dev)
 {
+    scsi_device_t *sd  = &scsi_devices[dev->bus][dev->id];
     uint8_t  buf[ESP_CMDFIFO_SZ];
-    uint32_t tdbc;
-    int      count;
+    uint32_t len;
 
-    esp_log("ESP SCSI Actual DMA len = %d\n", esp_get_tc(dev));
+    len = esp_get_tc(dev);
 
-    if (!scsi_device_present(sd)) {
-        esp_log("ESP SCSI no devices on ID %d, LUN %d\n", dev->id, dev->lun);
-        /* No such drive */
-        dev->rregs[ESP_RSTAT] = 0;
-        dev->rregs[ESP_RINTR] = INTR_DC;
-        dev->rregs[ESP_RSEQ]  = SEQ_0;
-        esp_raise_irq(dev);
-        fifo8_reset(&dev->cmdfifo);
-        return;
-    } else {
-        esp_log("ESP SCSI device found on ID %d, LUN %d\n", dev->id, dev->lun);
-    }
+    esp_log("ESP SCSI Actual DMA len=%d, cfg3=%02x, phase=%x.\n", len, dev->rregs[ESP_CFG3], esp_get_phase(dev));
 
-    count = tdbc = esp_get_tc(dev);
+    switch (esp_get_phase(dev)) {
+        case STAT_MO:
+            len = MIN(len, fifo8_num_free(&dev->cmdfifo));
+            esp_log("ESP SCSI Message Out len=%d.\n", len);
+            if (len) {
+                if (dev->mca) {
+                    dma_set_drq(dev->DmaChannel, 1);
+                    while (dev->dma_86c01.pos < len) {
+                        int val                   = dma_channel_read(dev->DmaChannel);
+                        buf[dev->dma_86c01.pos++] = val & 0xff;
+                    }
+                    dev->dma_86c01.pos = 0;
+                    dma_set_drq(dev->DmaChannel, 0);
+                } else
+                    esp_pci_dma_memory_rw(dev, buf, len, WRITE_TO_DEVICE);
 
-    if (dev->mca) {
-        if (sd->buffer_length < 0) {
-            if (dev->dma_enabled)
-                goto done;
-            else
-                goto partial;
-        }
-    }
-
-    if (dev->do_cmd) {
-        esp_log("ESP Command on DMA\n");
-        count = MIN(count, fifo8_num_free(&dev->cmdfifo));
-        if (dev->mca) {
-            dma_set_drq(dev->DmaChannel, 1);
-            while (dev->dma_86c01.pos < count) {
-                dma_channel_write(dev->DmaChannel, buf[dev->dma_86c01.pos]);
-                dev->dma_86c01.pos++;
+                esp_set_tc(dev, esp_get_tc(dev) - len);
             }
-            dev->dma_86c01.pos = 0;
-            dma_set_drq(dev->DmaChannel, 0);
-        } else
-            esp_pci_dma_memory_rw(dev, buf, count, READ_FROM_DEVICE);
-        fifo8_push_all(&dev->cmdfifo, buf, count);
-        dev->ti_size = 0;
+            fifo8_push_all(&dev->cmdfifo, buf, len);
+            dev->cmdfifo_cdb_offset += len;
 
-        if ((dev->rregs[ESP_RSTAT] & 7) == STAT_CD) {
-            if (dev->cmdfifo_cdb_offset == fifo8_num_used(&dev->cmdfifo))
+            switch (dev->rregs[ESP_CMD]) {
+                case (CMD_SELATN | CMD_DMA):
+                    if (fifo8_num_used(&dev->cmdfifo) >= 1) {
+                        /* First byte received, switch to command phase */
+                        esp_set_phase(dev, STAT_CD);
+                        dev->rregs[ESP_RSEQ] = SEQ_CD;
+                        dev->cmdfifo_cdb_offset = 1;
+
+                        if (fifo8_num_used(&dev->cmdfifo) > 1) {
+                            /* Process any additional command phase data */
+                            esp_do_dma(dev);
+                        }
+                    }
+                    break;
+
+                case (CMD_SELATNS | CMD_DMA):
+                    if (fifo8_num_used(&dev->cmdfifo) == 1) {
+                        /* First byte received, stop in message out phase */
+                        dev->rregs[ESP_RSEQ] = SEQ_MO;
+                        dev->cmdfifo_cdb_offset = 1;
+
+                        /* Raise command completion interrupt */
+                        dev->rregs[ESP_RINTR] |= (INTR_BS | INTR_FC);
+                        esp_raise_irq(dev);
+                    }
+                    break;
+
+                case (CMD_TI | CMD_DMA):
+                    /* ATN remains asserted until TC == 0 */
+                    if (esp_get_tc(dev) == 0) {
+                        esp_set_phase(dev, STAT_CD);
+                        dev->rregs[ESP_CMD] = 0;
+                        dev->rregs[ESP_RINTR] |= INTR_BS;
+                        esp_raise_irq(dev);
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+            break;
+
+        case STAT_CD:
+            len = MIN(len, fifo8_num_free(&dev->cmdfifo));
+            if (len) {
+                if (dev->mca) {
+                    dma_set_drq(dev->DmaChannel, 1);
+                    while (dev->dma_86c01.pos < len) {
+                        int val                   = dma_channel_read(dev->DmaChannel);
+                        buf[dev->dma_86c01.pos++] = val & 0xff;
+                    }
+                    dev->dma_86c01.pos = 0;
+                    dma_set_drq(dev->DmaChannel, 0);
+                } else
+                    esp_pci_dma_memory_rw(dev, buf, len, WRITE_TO_DEVICE);
+
+                fifo8_push_all(&dev->cmdfifo, buf, len);
+                esp_set_tc(dev, esp_get_tc(dev) - len);
+            }
+            dev->ti_size = 0;
+            if (esp_get_tc(dev) == 0) {
+                /* Command has been received */
+                esp_do_cmd(dev);
+            }
+            break;
+
+        case STAT_DO:
+            if (!dev->xfer_counter && esp_get_tc(dev)) {
+                /* Defer until data is available.  */
                 return;
-
-            dev->do_cmd = 0;
-            esp_do_cmd(dev);
-        } else {
-            dev->cmdfifo_cdb_offset = fifo8_num_used(&dev->cmdfifo);
-
-            dev->rregs[ESP_RSTAT] = STAT_TC | STAT_CD;
-            dev->rregs[ESP_RSEQ]  = SEQ_CD;
-            dev->rregs[ESP_RINTR] |= INTR_BS;
-            esp_raise_irq(dev);
-        }
-        return;
-    }
-
-    if (dev->xfer_counter == 0) {
-        /* Wait until data is available.  */
-        esp_log("(ID=%02i LUN=%02i): DMA no data available\n", dev->id, dev->lun);
-        return;
-    }
-
-    esp_log("ESP SCSI dmaleft = %d, buffer length = %d\n", esp_get_tc(dev), sd->buffer_length);
-
-    /* Make sure count is never bigger than buffer_length. */
-    if (count > dev->xfer_counter)
-        count = dev->xfer_counter;
-
-    if (sd->phase == SCSI_PHASE_DATA_IN) {
-        esp_log("ESP SCSI Read, dma cnt = %i, ti size = %i, positive len = %i\n", esp_get_tc(dev), dev->ti_size, count);
-        if (dev->mca) {
-            dma_set_drq(dev->DmaChannel, 1);
-            while (dev->dma_86c01.pos < count) {
-                dma_channel_write(dev->DmaChannel, sd->sc->temp_buffer[dev->buffer_pos + dev->dma_86c01.pos]);
-                esp_log("ESP SCSI DMA read for 53C9x: pos = %i, val = %02x\n", dev->dma_86c01.pos, sd->sc->temp_buffer[dev->buffer_pos + dev->dma_86c01.pos]);
-                dev->dma_86c01.pos++;
             }
-            dev->dma_86c01.pos = 0;
-            dma_set_drq(dev->DmaChannel, 0);
-        } else {
-            esp_pci_dma_memory_rw(dev, sd->sc->temp_buffer + dev->buffer_pos, count, READ_FROM_DEVICE);
-        }
-    } else if (sd->phase == SCSI_PHASE_DATA_OUT) {
-        esp_log("ESP SCSI Write, negative len = %i, ti size = %i, dma cnt = %i\n", count, -dev->ti_size, esp_get_tc(dev));
-        if (dev->mca) {
-            dma_set_drq(dev->DmaChannel, 1);
-            while (dev->dma_86c01.pos < count) {
-                int val = dma_channel_read(dev->DmaChannel);
-                esp_log("ESP SCSI DMA write for 53C9x: pos = %i, val = %02x\n", dev->dma_86c01.pos, val & 0xff);
-                sd->sc->temp_buffer[dev->buffer_pos + dev->dma_86c01.pos] = val & 0xff;
-                dev->dma_86c01.pos++;
-            }
-            dma_set_drq(dev->DmaChannel, 0);
-            dev->dma_86c01.pos = 0;
-        } else
-            esp_pci_dma_memory_rw(dev, sd->sc->temp_buffer + dev->buffer_pos, count, WRITE_TO_DEVICE);
-    }
-    esp_set_tc(dev, esp_get_tc(dev) - count);
-    dev->buffer_pos += count;
-    dev->xfer_counter -= count;
-    if (sd->phase == SCSI_PHASE_DATA_IN) {
-        dev->ti_size -= count;
-    } else if (sd->phase == SCSI_PHASE_DATA_OUT) {
-        dev->ti_size += count;
-    }
+            if (len > dev->xfer_counter)
+                len = dev->xfer_counter;
 
-    esp_log("ESP SCSI Transfer bytes = %d\n", dev->xfer_counter);
-    if (dev->xfer_counter <= 0) {
-        if (sd->phase == SCSI_PHASE_DATA_OUT) {
-            if (dev->ti_size < 0) {
-                esp_log("ESP SCSI Keep writing\n");
-                esp_do_dma(dev, sd);
-            } else {
-                esp_log("ESP SCSI Write finished\n");
-                scsi_device_command_phase1(sd);
-                if (dev->mca) {
+            switch (dev->rregs[ESP_CMD]) {
+                case (CMD_TI | CMD_DMA):
+                    if (len) {
+                        if (dev->mca) {
+                            dma_set_drq(dev->DmaChannel, 1);
+                            while (dev->dma_86c01.pos < len) {
+                                int val = dma_channel_read(dev->DmaChannel);
+                                esp_log("ESP SCSI DMA write for 53C9x: pos = %i, val = %02x\n", dev->dma_86c01.pos, val & 0xff);
+                                sd->sc->temp_buffer[dev->buffer_pos + dev->dma_86c01.pos] = val & 0xff;
+                                dev->dma_86c01.pos++;
+                            }
+                            dma_set_drq(dev->DmaChannel, 0);
+                            dev->dma_86c01.pos = 0;
+                        } else
+                            esp_pci_dma_memory_rw(dev, sd->sc->temp_buffer + dev->buffer_pos, len, WRITE_TO_DEVICE);
+
+                        esp_set_tc(dev, esp_get_tc(dev) - len);
+                    }
+                    dev->buffer_pos += len;
+                    dev->xfer_counter -= len;
+                    dev->ti_size += len;
+                    break;
+
+                case (CMD_PAD | CMD_DMA):
+                    /* Copy TC zero bytes into the incoming stream */
+                    memset(sd->sc->temp_buffer + dev->buffer_pos, 0, len);
+
+                    dev->buffer_pos += len;
+                    dev->xfer_counter -= len;
+                    dev->ti_size += len;
+                    break;
+
+                default:
+                    break;
+            }
+
+            if ((dev->xfer_counter <= 0) && (fifo8_num_used(&dev->fifo) < 2)) {
+                /* Defer until the scsi layer has completed */
+                if (dev->ti_size < 0) {
+                    esp_log("ESP SCSI Keep writing\n");
+                    esp_do_dma(dev);
+                } else {
+                    esp_log("ESP SCSI Write finished\n");
+                    scsi_device_command_phase1(sd);
                     esp_command_complete(dev, sd->status);
-                } else
-                    esp_pci_command_complete(dev, sd->status);
+                }
+                return;
             }
-        } else if (sd->phase == SCSI_PHASE_DATA_IN) {
-            /* If there is still data to be read from the device then
-               complete the DMA operation immediately.  Otherwise defer
-               until the scsi layer has completed.  */
-            if (dev->ti_size <= 0) {
-done:
-                esp_log("ESP SCSI Read finished\n");
-                scsi_device_command_phase1(sd);
-                if (dev->mca) {
+
+            esp_dma_ti_check(dev);
+            break;
+
+        case STAT_DI:
+            if (!dev->xfer_counter && esp_get_tc(dev)) {
+                /* Defer until data is available.  */
+                return;
+            }
+
+            if (len > dev->xfer_counter)
+                len = dev->xfer_counter;
+
+            switch (dev->rregs[ESP_CMD]) {
+                case (CMD_TI | CMD_DMA):
+                    if (len) {
+                        if (dev->mca) {
+                            dma_set_drq(dev->DmaChannel, 1);
+                            while (dev->dma_86c01.pos < len) {
+                                dma_channel_write(dev->DmaChannel, sd->sc->temp_buffer[dev->buffer_pos + dev->dma_86c01.pos]);
+                                esp_log("ESP SCSI DMA read for 53C9x: pos = %i, val = %02x\n", dev->dma_86c01.pos, sd->sc->temp_buffer[dev->buffer_pos + dev->dma_86c01.pos]);
+                                dev->dma_86c01.pos++;
+                            }
+                            dev->dma_86c01.pos = 0;
+                            dma_set_drq(dev->DmaChannel, 0);
+                        } else
+                            esp_pci_dma_memory_rw(dev, sd->sc->temp_buffer + dev->buffer_pos, len, READ_FROM_DEVICE);
+                    }
+                    dev->buffer_pos += len;
+                    dev->xfer_counter -= len;
+                    dev->ti_size -= len;
+                    esp_set_tc(dev, esp_get_tc(dev) - len);
+                    break;
+
+                case (CMD_PAD | CMD_DMA):
+                    dev->buffer_pos += len;
+                    dev->xfer_counter -= len;
+                    dev->ti_size -= len;
+                    esp_set_tc(dev, esp_get_tc(dev) - len);
+                    break;
+
+                default:
+                    break;
+            }
+
+            if ((dev->xfer_counter <= 0) && (fifo8_num_used(&dev->fifo) < 2)) {
+                /* Defer until the scsi layer has completed */
+                if (dev->ti_size <= 0) {
+                    esp_log("ESP SCSI Read finished\n");
+                    scsi_device_command_phase1(sd);
                     esp_command_complete(dev, sd->status);
-                } else
-                    esp_pci_command_complete(dev, sd->status);
-            } else {
-                esp_log("ESP SCSI Keep reading\n");
-                esp_do_dma(dev, sd);
+                } else {
+                    esp_log("ESP SCSI Keep reading\n");
+                    esp_do_dma(dev);
+                }
+                return;
             }
-        }
-    } else {
-        /* Partially filled a scsi buffer. Complete immediately.  */
-partial:
-        esp_log("ESP SCSI Partially filled the SCSI buffer\n");
-        esp_dma_done(dev);
+            esp_dma_ti_check(dev);
+            break;
+
+        case STAT_ST:
+            switch (dev->rregs[ESP_CMD]) {
+                case (CMD_ICCS | CMD_DMA):
+                    len = MIN(len, 1);
+
+                    if (len) {
+                        buf[0] = dev->status;
+
+                        /* Length already non-zero */
+                        if (dev->mca) {
+                            dma_set_drq(dev->DmaChannel, 1);
+                            while (dev->dma_86c01.pos < len) {
+                                dma_channel_write(dev->DmaChannel, buf[dev->dma_86c01.pos]);
+                                dev->dma_86c01.pos++;
+                            }
+                            dev->dma_86c01.pos = 0;
+                            dma_set_drq(dev->DmaChannel, 0);
+                        } else
+                            esp_pci_dma_memory_rw(dev, buf, len, READ_FROM_DEVICE);
+
+                        esp_set_tc(dev, esp_get_tc(dev) - len);
+                        esp_set_phase(dev, STAT_MI);
+
+                        if (esp_get_tc(dev) > 0) {
+                            /* Process any message in phase data */
+                            esp_do_dma(dev);
+                        }
+                    }
+                    break;
+
+                default:
+                    /* Consume remaining data if the guest underflows TC */
+                    if (fifo8_num_used(&dev->fifo) < 2) {
+                        dev->rregs[ESP_RINTR] |= INTR_BS;
+                        esp_raise_irq(dev);
+                    }
+                    break;
+            }
+            break;
+
+        case STAT_MI:
+            switch (dev->rregs[ESP_CMD]) {
+                case (CMD_ICCS | CMD_DMA):
+                    len = MIN(len, 1);
+
+                    if (len) {
+                        buf[0] = 0;
+
+                        /* Length already non-zero */
+                        if (dev->mca) {
+                            dma_set_drq(dev->DmaChannel, 1);
+                            while (dev->dma_86c01.pos < len) {
+                                dma_channel_write(dev->DmaChannel, buf[dev->dma_86c01.pos]);
+                                dev->dma_86c01.pos++;
+                            }
+                            dev->dma_86c01.pos = 0;
+                            dma_set_drq(dev->DmaChannel, 0);
+                        } else
+                            esp_pci_dma_memory_rw(dev, buf, len, READ_FROM_DEVICE);
+
+                        esp_set_tc(dev, esp_get_tc(dev) - len);
+
+                        /* Raise end of command interrupt */
+                        dev->rregs[ESP_RINTR] |= INTR_FC;
+                        esp_raise_irq(dev);
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+            break;
+
+        default:
+            break;
     }
 }
 
 static void
-esp_report_command_complete(esp_t *dev, uint32_t status)
+esp_nodma_ti_dataout(esp_t *dev)
 {
-    esp_log("ESP Command complete\n");
+    scsi_device_t *sd  = &scsi_devices[dev->bus][dev->id];
+    int len;
 
-    dev->ti_size          = 0;
-    dev->status           = status;
-    dev->rregs[ESP_RSTAT] = STAT_TC | STAT_ST;
-    esp_dma_done(dev);
+    if (!dev->xfer_counter) {
+        /* Defer until data is available.  */
+        return;
+    }
+    len = MIN(dev->xfer_counter, ESP_FIFO_SZ);
+    len = MIN(len, fifo8_num_used(&dev->fifo));
+    esp_fifo_pop_buf(dev, sd->sc->temp_buffer + dev->buffer_pos, len);
+    dev->buffer_pos += len;
+    dev->xfer_counter -= len;
+    dev->ti_size += len;
+
+    if (dev->xfer_counter <= 0) {
+        if (dev->ti_size < 0) {
+            esp_log("ESP SCSI Keep writing\n");
+            esp_nodma_ti_dataout(dev);
+        } else {
+            esp_log("ESP SCSI Write finished\n");
+            scsi_device_command_phase1(sd);
+            esp_command_complete(dev, sd->status);
+        }
+        return;
+    }
+
+    dev->rregs[ESP_RINTR] |= INTR_BS;
+    esp_raise_irq(dev);
+}
+
+static void
+esp_do_nodma(esp_t *dev)
+{
+    scsi_device_t *sd  = &scsi_devices[dev->bus][dev->id];
+    uint8_t buf[ESP_FIFO_SZ];
+    int len;
+
+    esp_log("No DMA phase=%x.\n", esp_get_phase(dev));
+    switch (esp_get_phase(dev)) {
+        case STAT_MO:
+            switch (dev->rregs[ESP_CMD]) {
+                case CMD_SELATN:
+                    /* Copy FIFO into cmdfifo */
+                    len = esp_fifo_pop_buf(dev, buf, fifo8_num_used(&dev->fifo));
+                    len = MIN(fifo8_num_free(&dev->cmdfifo), len);
+                    esp_log("ESP Message Out CMD SelAtn len=%d.\n", len);
+                    fifo8_push_all(&dev->cmdfifo, buf, len);
+
+                    esp_log("ESP Message Out CMD SelAtn FIFO num used=%d.\n", fifo8_num_used(&dev->cmdfifo));
+                    if (fifo8_num_used(&dev->cmdfifo) >= 1) {
+                        /* First byte received, switch to command phase */
+                        esp_set_phase(dev, STAT_CD);
+                        dev->rregs[ESP_RSEQ] = SEQ_CD;
+                        dev->cmdfifo_cdb_offset = 1;
+
+                        if (fifo8_num_used(&dev->cmdfifo) > 1) {
+                            /* Process any additional command phase data */
+                            esp_do_nodma(dev);
+                        }
+                    }
+                    break;
+
+                case CMD_SELATNS:
+                    /* Copy one byte from FIFO into cmdfifo */
+                    len = esp_fifo_pop_buf(dev, buf, MIN(fifo8_num_used(&dev->fifo), 1));
+                    esp_log("ESP Message Out CMD SelAtnStop len1=%d.\n", len);
+                    len = MIN(fifo8_num_free(&dev->cmdfifo), len);
+                    esp_log("ESP Message Out CMD SelAtnStop len2=%d.\n", len);
+                    fifo8_push_all(&dev->cmdfifo, buf, len);
+
+                    esp_log("ESP Message Out CMD SelAtnStop FIFO num used=%d.\n", fifo8_num_used(&dev->cmdfifo));
+                    if (fifo8_num_used(&dev->cmdfifo) >= 1) {
+                        /* First byte received, stop in message out phase */
+                        dev->rregs[ESP_RSEQ] = SEQ_MO;
+                        dev->cmdfifo_cdb_offset = 1;
+
+                        /* Raise command completion interrupt */
+                        dev->rregs[ESP_RINTR] |= (INTR_BS | INTR_FC);
+                        esp_raise_irq(dev);
+                    }
+                    break;
+
+                case CMD_TI:
+                    /* Copy FIFO into cmdfifo */
+                    len = esp_fifo_pop_buf(dev, buf, fifo8_num_used(&dev->fifo));
+                    esp_log("ESP Message Out CMD TI len1=%d.\n", len);
+                    len = MIN(fifo8_num_free(&dev->cmdfifo), len);
+                    esp_log("ESP Message Out CMD TI len2=%d.\n", len);
+                    fifo8_push_all(&dev->cmdfifo, buf, len);
+
+                    /* ATN remains asserted until FIFO empty */
+                    dev->cmdfifo_cdb_offset = fifo8_num_used(&dev->cmdfifo);
+                    esp_log("ESP Message Out CMD TI CDB offset=%d.\n", dev->cmdfifo_cdb_offset);
+                    esp_set_phase(dev, STAT_CD);
+                    dev->rregs[ESP_CMD] = 0;
+                    dev->rregs[ESP_RINTR] |= INTR_BS;
+                    esp_raise_irq(dev);
+                    break;
+
+                default:
+                    break;
+            }
+            break;
+
+        case STAT_CD:
+            switch (dev->rregs[ESP_CMD]) {
+                case CMD_TI:
+                    /* Copy FIFO into cmdfifo */
+                    len = esp_fifo_pop_buf(dev, buf, fifo8_num_used(&dev->fifo));
+                    len = MIN(fifo8_num_free(&dev->cmdfifo), len);
+                    fifo8_push_all(&dev->cmdfifo, buf, len);
+
+                    /* CDB may be transferred in one or more TI commands */
+                    if (esp_cdb_ready(dev)) {
+                        /* Command has been received */
+                        esp_do_cmd(dev);
+                    } else {
+                        /*
+                         * If data was transferred from the FIFO then raise bus
+                         * service interrupt to indicate transfer complete. Otherwise
+                         * defer until the next FIFO write.
+                         */
+                        if (len) {
+                            /* Raise interrupt to indicate transfer complete */
+                            dev->rregs[ESP_RINTR] |= INTR_BS;
+                            esp_raise_irq(dev);
+                        }
+                    }
+                    break;
+
+                case (CMD_SEL | CMD_DMA):
+                case (CMD_SELATN | CMD_DMA):
+                    /* Copy FIFO into cmdfifo */
+                    len = esp_fifo_pop_buf(dev, buf, fifo8_num_used(&dev->fifo));
+                    len = MIN(fifo8_num_free(&dev->cmdfifo), len);
+                    fifo8_push_all(&dev->cmdfifo, buf, len);
+
+                    /* Handle when DMA transfer is terminated by non-DMA FIFO write */
+                    if (esp_cdb_ready(dev)) {
+                        /* Command has been received */
+                        esp_do_cmd(dev);
+                    }
+                    break;
+
+                case CMD_SEL:
+                case CMD_SELATN:
+                    /* FIFO already contain entire CDB: copy to cmdfifo and execute */
+                    len = esp_fifo_pop_buf(dev, buf, fifo8_num_used(&dev->fifo));
+                    len = MIN(fifo8_num_free(&dev->cmdfifo), len);
+                    fifo8_push_all(&dev->cmdfifo, buf, len);
+
+                    esp_do_cmd(dev);
+                    break;
+
+                default:
+                    break;
+            }
+            break;
+
+        case STAT_DO:
+            /* Accumulate data in FIFO until non-DMA TI is executed */
+            break;
+
+        case STAT_DI:
+            if (!dev->xfer_counter) {
+                /* Defer until data is available.  */
+                return;
+            }
+            if (fifo8_is_empty(&dev->fifo)) {
+                esp_fifo_push(dev, sd->sc->temp_buffer[dev->buffer_pos]);
+                dev->buffer_pos++;
+                dev->ti_size--;
+                dev->xfer_counter--;
+            }
+
+            if (dev->xfer_counter <= 0) {
+                if (dev->ti_size <= 0) {
+                    esp_log("ESP FIFO Read finished\n");
+                    scsi_device_command_phase1(sd);
+                    esp_command_complete(dev, sd->status);
+                } else {
+                    esp_log("ESP FIFO Keep reading\n");
+                    esp_do_nodma(dev);
+                }
+                return;
+            }
+
+            /* If preloading the FIFO, defer until TI command issued */
+            if (dev->rregs[ESP_CMD] != CMD_TI)
+                return;
+
+            dev->rregs[ESP_RINTR] |= INTR_BS;
+            esp_raise_irq(dev);
+            break;
+
+        case STAT_ST:
+            switch (dev->rregs[ESP_CMD]) {
+                case CMD_ICCS:
+                    esp_log("ICCS Status=%x.\n", dev->status);
+                    esp_fifo_push(dev, dev->status);
+                    esp_set_phase(dev, STAT_MI);
+
+                    /* Process any message in phase data */
+                    esp_do_nodma(dev);
+                    break;
+                default:
+                    break;
+            }
+            break;
+
+        case STAT_MI:
+            switch (dev->rregs[ESP_CMD]) {
+                case CMD_ICCS:
+                    esp_fifo_push(dev, 0);
+
+                    /* Raise end of command interrupt */
+                    dev->rregs[ESP_RINTR] |= INTR_FC;
+                    esp_raise_irq(dev);
+                    break;
+                default:
+                    break;
+            }
+            break;
+    }
 }
 
 /* Callback to indicate that the SCSI layer has completed a command.  */
@@ -810,46 +1239,78 @@ static void
 esp_command_complete(void *priv, uint32_t status)
 {
     esp_t *dev = (esp_t *) priv;
+    scsi_device_t *sd  = &scsi_devices[dev->bus][dev->id];
 
-    esp_report_command_complete(dev, status);
-}
+    dev->ti_size = 0;
+    dev->status = status;
 
-static void
-esp_pci_command_complete(void *priv, uint32_t status)
-{
-    esp_t *dev = (esp_t *) priv;
+    switch (dev->rregs[ESP_CMD]) {
+        case CMD_SEL:
+        case (CMD_SEL | CMD_DMA):
+        case CMD_SELATN:
+        case (CMD_SELATN | CMD_DMA):
+            /*
+             * Switch to status phase. For non-DMA transfers from the target the last
+             * byte is still in the FIFO
+             */
+            dev->rregs[ESP_RINTR] |= (INTR_BS | INTR_FC);
+            dev->rregs[ESP_RSEQ]  = SEQ_CD;
+            break;
+        case CMD_TI:
+        case (CMD_TI | CMD_DMA):
+            dev->rregs[ESP_CMD] = 0;
+            break;
+        default:
+            break;
+    }
+    /* Raise bus service interrupt to indicate change to STATUS phase */
+    scsi_device_identify(sd, SCSI_LUN_USE_CDB);
 
-    esp_command_complete(dev, status);
-    dev->dma_regs[DMA_WBC] = 0;
-    dev->dma_regs[DMA_STAT] |= DMA_STAT_DONE;
+    esp_set_phase(dev, STAT_ST);
+    dev->rregs[ESP_RINTR] |= INTR_BS;
+    esp_raise_irq(dev);
 }
 
 static void
 esp_timer_on(esp_t *dev, scsi_device_t *sd, double p)
 {
-    if (dev->mca) {
-        /* Normal SCSI: 5000000 bytes per second */
-        dev->period = (p > 0.0) ? p : (((double) sd->buffer_length) * 0.2);
-    } else {
+    if ((dev->wregs[ESP_CFG3] & 0x18) == 0x18) {
         /* Fast SCSI: 10000000 bytes per second */
         dev->period = (p > 0.0) ? p : (((double) sd->buffer_length) * 0.1);
+    } else  {
+        /* Normal SCSI: 5000000 bytes per second */
+        dev->period = (p > 0.0) ? p : (((double) sd->buffer_length) * 0.2);
     }
 
-    timer_on_auto(&dev->timer, dev->period + 40.0);
+    if ((dev->wregs[ESP_WCCF] & 0x07) == 0x00)
+        timer_on_auto(&dev->timer, dev->period + 40.0);
+    else
+        timer_on_auto(&dev->timer, dev->period + (((double)(dev->wregs[ESP_WCCF] & 0x07)) * 5.0));
 }
 
 static void
-handle_ti(void *priv)
+handle_pad(esp_t *dev)
 {
-    esp_t         *dev = (esp_t *) priv;
-    scsi_device_t *sd  = &scsi_devices[dev->bus][dev->id];
+    if (dev->dma) {
+        esp_log("ESP Handle PAD, do data, minlen = %i\n", esp_get_tc(dev));
+        esp_do_dma(dev);
+    } else {
+        esp_log("ESP Handle PAD, do nodma, minlen = %i\n", dev->xfer_counter);
+        esp_do_nodma(dev);
+    }
+}
 
+static void
+handle_ti(esp_t *dev)
+{
     if (dev->dma) {
         esp_log("ESP Handle TI, do data, minlen = %i\n", esp_get_tc(dev));
-        esp_do_dma(dev, sd);
+        esp_do_dma(dev);
     } else {
         esp_log("ESP Handle TI, do nodma, minlen = %i\n", dev->xfer_counter);
-        esp_do_nodma(dev, sd);
+        esp_do_nodma(dev);
+        if (esp_get_phase(dev) == STAT_DO)
+            esp_nodma_ti_dataout(dev);
     }
 }
 
@@ -857,95 +1318,61 @@ static void
 handle_s_without_atn(void *priv)
 {
     esp_t *dev = (esp_t *) priv;
-    int    len;
 
-    len = esp_get_cmd(dev, ESP_CMDFIFO_SZ);
-    esp_log("ESP SEL w/o ATN len = %d, id = %d\n", len, dev->id);
-    if (len > 0) {
-        dev->cmdfifo_cdb_offset = 0;
-        dev->do_cmd             = 0;
-        esp_do_cmd(dev);
-    } else if (len == 0) {
-        dev->do_cmd = 1;
-        /* Target present, but no cmd yet - switch to command phase */
-        dev->rregs[ESP_RSEQ]  = SEQ_CD;
-        dev->rregs[ESP_RSTAT] = STAT_CD;
-    }
+    if (esp_select(dev) < 0)
+        return;
+
+    esp_log("Selection without ATN.\n");
+    esp_set_phase(dev, STAT_CD);
+    dev->cmdfifo_cdb_offset = 0;
+
+    if (dev->dma)
+        esp_do_dma(dev);
+    else
+        esp_do_nodma(dev);
 }
 
 static void
 handle_satn(void *priv)
 {
     esp_t *dev = (esp_t *) priv;
-    int    len;
 
-    len = esp_get_cmd(dev, ESP_CMDFIFO_SZ);
-    esp_log("ESP SEL with ATN len = %d, id = %d\n", len, dev->id);
-    if (len > 0) {
-        dev->cmdfifo_cdb_offset = 1;
-        dev->do_cmd             = 0;
-        esp_do_cmd(dev);
-    } else if (len == 0) {
-        dev->do_cmd = 1;
-        /* Target present, but no cmd yet - switch to command phase */
-        dev->rregs[ESP_RSEQ]  = SEQ_CD;
-        dev->rregs[ESP_RSTAT] = STAT_CD;
-    }
+    if (esp_select(dev) < 0)
+        return;
+
+    esp_log("Selection with ATN.\n");
+    esp_set_phase(dev, STAT_MO);
+
+    if (dev->dma)
+        esp_do_dma(dev);
+    else
+        esp_do_nodma(dev);
 }
 
 static void
 handle_satn_stop(void *priv)
 {
     esp_t *dev = (esp_t *) priv;
-    int    cmdlen;
 
-    cmdlen = esp_get_cmd(dev, 1);
-    if (cmdlen > 0) {
-        dev->do_cmd             = 1;
-        dev->cmdfifo_cdb_offset = 1;
-        dev->rregs[ESP_RSTAT]   = STAT_MO;
-        dev->rregs[ESP_RINTR]   = INTR_BS | INTR_FC;
-        dev->rregs[ESP_RSEQ]    = SEQ_MO;
-        esp_log("ESP SCSI Command len = %d, raising IRQ\n", cmdlen);
-        esp_raise_irq(dev);
-    } else if (cmdlen == 0) {
-        dev->do_cmd = 1;
-        /* Target present, switch to message out phase */
-        dev->rregs[ESP_RSEQ]  = SEQ_MO;
-        dev->rregs[ESP_RSTAT] = STAT_MO;
-    }
+    if (esp_select(dev) < 0)
+        return;
+
+    esp_log("Selection with ATN and Stop.\n");
+    esp_set_phase(dev, STAT_MO);
+
+    if (dev->dma)
+        esp_do_dma(dev);
+    else
+        esp_do_nodma(dev);
 }
 
 static void
 esp_write_response(esp_t *dev)
 {
-    uint8_t buf[2];
-
-    buf[0] = dev->status;
-    buf[1] = 0;
-    esp_log("esp_write_response(): %02X %02X\n", buf[0], buf[1]);
-
-    if (dev->dma) {
-        if (dev->mca) {
-            dma_set_drq(dev->DmaChannel, 1);
-            while (dev->dma_86c01.pos < 2) {
-                int val                   = dma_channel_read(dev->DmaChannel);
-                buf[dev->dma_86c01.pos++] = val & 0xff;
-            }
-            dev->dma_86c01.pos = 0;
-            dma_set_drq(dev->DmaChannel, 0);
-        } else
-            esp_pci_dma_memory_rw(dev, buf, 2, WRITE_TO_DEVICE);
-        dev->rregs[ESP_RSTAT] = STAT_TC | STAT_ST;
-        dev->rregs[ESP_RINTR] = INTR_BS | INTR_FC;
-        dev->rregs[ESP_RSEQ]  = SEQ_CD;
-    } else {
-        fifo8_reset(&dev->fifo);
-        fifo8_push_all(&dev->fifo, buf, 2);
-        dev->rregs[ESP_RFLAGS] = 2;
-    }
-    esp_log("ESP SCSI ICCS IRQ\n");
-    esp_raise_irq(dev);
+    if (dev->dma)
+        esp_do_dma(dev);
+    else
+        esp_do_nodma(dev);
 }
 
 static void
@@ -953,17 +1380,46 @@ esp_callback(void *priv)
 {
     esp_t *dev = (esp_t *) priv;
 
-    if (dev->dma_enabled || dev->do_cmd || ((dev->rregs[ESP_CMD] & CMD_CMD) == CMD_PAD)) {
+    if (dev->dma_enabled || !dev->dma || ((dev->rregs[ESP_CMD] & CMD_CMD) == CMD_PAD)) {
         if ((dev->rregs[ESP_CMD] & CMD_CMD) == CMD_TI) {
             esp_log("ESP SCSI Handle TI Callback\n");
             handle_ti(dev);
         } else if ((dev->rregs[ESP_CMD] & CMD_CMD) == CMD_PAD) {
             esp_log("ESP SCSI Handle PAD Callback\n");
-            handle_ti(dev);
+            handle_pad(dev);
         }
     }
+}
 
-    esp_log("ESP DMA activated = %d, CMD activated = %d, CMD = %02x\n", dev->dma_enabled, dev->do_cmd, (dev->rregs[ESP_CMD] & CMD_CMD));
+static int
+esp_cmd_is_valid(esp_t *dev, uint8_t cmd)
+{
+    uint8_t cmd_group = (cmd & CMD_GRP_MASK) >> 4;
+
+    /* Always allow misc commands */
+    if (cmd_group == CMD_GRP_MISC)
+        return 1;
+
+    switch (dev->asc_mode) {
+        case ESP_ASC_MODE_DIS:
+            /* Disconnected mode: only allow disconnected commands */
+            if (cmd_group == CMD_GRP_DISC)
+                return 1;
+
+            break;
+
+        case ESP_ASC_MODE_INI:
+            /* Initiator mode: allow initiator commands */
+            if (cmd_group == CMD_GRP_INIT)
+                return 1;
+
+            break;
+
+        default:
+            break;
+    }
+
+    return 0;
 }
 
 static uint32_t
@@ -973,20 +1429,7 @@ esp_reg_read(esp_t *dev, uint32_t saddr)
 
     switch (saddr) {
         case ESP_FIFO:
-            if ((dev->rregs[ESP_RSTAT] & 7) == STAT_DI) {
-                if (dev->ti_size) {
-                    esp_log("TI size FIFO = %i\n", dev->ti_size);
-                    esp_do_nodma(dev, &scsi_devices[dev->bus][dev->id]);
-                } else {
-                    /*
-                     * The last byte of a non-DMA transfer has been read out
-                     * of the FIFO so switch to status phase
-                     */
-                    dev->rregs[ESP_RSTAT] = STAT_TC | STAT_ST;
-                }
-            }
-
-            dev->rregs[ESP_FIFO] = esp_fifo_pop(&dev->fifo);
+            dev->rregs[ESP_FIFO] = esp_fifo_pop(dev);
             ret                  = dev->rregs[ESP_FIFO];
             break;
         case ESP_RINTR:
@@ -994,27 +1437,43 @@ esp_reg_read(esp_t *dev, uint32_t saddr)
             except TC */
             ret                   = dev->rregs[ESP_RINTR];
             dev->rregs[ESP_RINTR] = 0;
-            dev->rregs[ESP_RSTAT] &= ~STAT_TC;
-            esp_log("ESP SCSI Clear sequence step\n");
+            dev->rregs[ESP_RSTAT] &= ~(0x08 | STAT_PE | STAT_GE | STAT_TC);
             esp_lower_irq(dev);
-            esp_log("ESP RINTR read old val = %02x\n", ret);
+            esp_log("Read Interrupt=%02x (old).\n", ret);
             break;
-        case ESP_TCHI:
-            /* Return the unique id if the value has never been written */
-            if (!dev->tchi_written && !dev->mca) {
-                esp_log("ESP TCHI read id 0x12\n");
-                ret = TCHI_AM53C974;
-            } else
-                ret = dev->rregs[saddr];
+        case ESP_TCHI: /* Return the unique id if the value has never been written */
+            if (!dev->tchi_written) {
+                if (dev->mca)
+                    ret = TCHI_ESP100A;
+                else
+                    ret = TCHI_AM53C974;
+
+                esp_log("ChipID=%02x.\n", ret);
+            } else {
+                ret = dev->rregs[ESP_TCHI];
+                esp_log("Read TCHI Register=%02x.\n", ret);
+            }
             break;
         case ESP_RFLAGS:
             ret = fifo8_num_used(&dev->fifo);
             break;
+        case ESP_RSTAT:
+            ret = dev->rregs[ESP_RSTAT];
+            esp_log("Read SCSI Status Register=%02x.\n", ret);
+            break;
+        case ESP_RSEQ:
+            ret = dev->rregs[ESP_RSEQ];
+            esp_log("Read Sequence Step=%02x, intr=%02x.\n", ret, dev->rregs[ESP_RINTR]);
+            break;
+        case ESP_CFG2:
+            ret = dev->rregs[ESP_CFG2] & 0x40;
+            esp_log("Read CFG2 Register=%02x.\n", ret);
+            break;
         default:
             ret = dev->rregs[saddr];
             break;
     }
-    esp_log("Read reg %02x = %02x\n", saddr, ret);
+    esp_log("%04X:%08X: Read ESP reg%02x=%02x\n", CS, cpu_state.pc, saddr, ret);
     return ret;
 }
 
@@ -1022,40 +1481,39 @@ static void
 esp_reg_write(esp_t *dev, uint32_t saddr, uint32_t val)
 {
     esp_log("Write reg %02x = %02x\n", saddr, val);
-
     switch (saddr) {
         case ESP_TCHI:
             dev->tchi_written = 1;
             fallthrough;
         case ESP_TCLO:
         case ESP_TCMID:
-            esp_log("Transfer count regs %02x = %i\n", saddr, val);
+            esp_log("ESP TCW reg%02x = %02x.\n", saddr, val);
             dev->rregs[ESP_RSTAT] &= ~STAT_TC;
             break;
         case ESP_FIFO:
-            if (dev->do_cmd) {
-                esp_fifo_push(&dev->cmdfifo, val);
-                esp_log("ESP CmdVal = %02x\n", val);
-                /*
-                 * If any unexpected message out/command phase data is
-                 * transferred using non-DMA, raise the interrupt
-                 */
-                if (dev->rregs[ESP_CMD] == CMD_TI) {
-                    dev->rregs[ESP_RINTR] |= INTR_BS;
-                    esp_raise_irq(dev);
-                }
-            } else {
-                esp_fifo_push(&dev->fifo, val);
-                esp_log("ESP fifoval = %02x\n", val);
-            }
+            if (!fifo8_is_full(&dev->fifo))
+                esp_fifo_push(dev, val);
+
+            esp_do_nodma(dev);
             break;
         case ESP_CMD:
-            dev->rregs[saddr] = val;
+            dev->rregs[ESP_CMD] = val;
+            if (!esp_cmd_is_valid(dev, dev->rregs[ESP_CMD])) {
+                dev->rregs[ESP_RSTAT] |= INTR_IL;
+                esp_raise_irq(dev);
+                break;
+            }
 
             if (val & CMD_DMA) {
                 dev->dma = 1;
                 /* Reload DMA counter.  */
                 esp_set_tc(dev, esp_get_stc(dev));
+                if (!esp_get_stc(dev)) {
+                    if (dev->rregs[ESP_CFG2] & 0x40)
+                        esp_set_tc(dev, 0x1000000);
+                    else
+                        esp_set_tc(dev, 0x10000);
+                }
             } else {
                 dev->dma = 0;
                 esp_log("ESP Command not for DMA\n");
@@ -1079,6 +1537,7 @@ esp_reg_write(esp_t *dev, uint32_t saddr, uint32_t val)
                         esp_pci_soft_reset(dev);
                     break;
                 case CMD_BUSRESET:
+                    esp_log("ESP Bus Reset val=%02x.\n", (dev->wregs[ESP_CFG1] & CFG1_RESREPT));
                     for (uint8_t i = 0; i < 16; i++)
                         scsi_device_reset(&scsi_devices[dev->bus][i]);
 
@@ -1086,10 +1545,22 @@ esp_reg_write(esp_t *dev, uint32_t saddr, uint32_t val)
                         dev->rregs[ESP_RINTR] |= INTR_RST;
                         esp_log("ESP Bus Reset with IRQ\n");
                         esp_raise_irq(dev);
+                    } else {
+                        if (dev->mca) {
+                            esp_lower_irq(dev);
+                            esp_hard_reset(dev);
+                        } else
+                            esp_pci_soft_reset(dev);
                     }
                     break;
                 case CMD_TI:
-                    esp_log("Transfer Information val = %02X\n", val);
+                    esp_log("Transfer Information val=%02X\n", val);
+                    break;
+                case CMD_ICCS:
+                    esp_log("ESP SCSI ICCS\n");
+                    esp_write_response(dev);
+                    dev->rregs[ESP_RINTR] |= INTR_FC;
+                    dev->rregs[ESP_RSTAT] |= STAT_MI;
                     break;
                 case CMD_SEL:
                     handle_s_without_atn(dev);
@@ -1100,20 +1571,15 @@ esp_reg_write(esp_t *dev, uint32_t saddr, uint32_t val)
                 case CMD_SELATNS:
                     handle_satn_stop(dev);
                     break;
-                case CMD_ICCS:
-                    esp_write_response(dev);
-                    dev->rregs[ESP_RINTR] |= INTR_FC;
-                    dev->rregs[ESP_RSTAT] |= STAT_MI;
-                    break;
                 case CMD_MSGACC:
+                    dev->asc_mode = ESP_ASC_MODE_DIS;
                     dev->rregs[ESP_RINTR] |= INTR_DC;
-                    dev->rregs[ESP_RSEQ]   = 0;
                     dev->rregs[ESP_RFLAGS] = 0;
                     esp_log("ESP SCSI MSGACC IRQ\n");
                     esp_raise_irq(dev);
                     break;
                 case CMD_PAD:
-                    esp_log("val = %02X\n", val);
+                    esp_log("PAD=%02X\n", val);
                     timer_stop(&dev->timer);
                     timer_on_auto(&dev->timer, dev->period);
                     esp_log("ESP Transfer Pad\n");
@@ -1123,7 +1589,7 @@ esp_reg_write(esp_t *dev, uint32_t saddr, uint32_t val)
                     break;
                 case CMD_ENSEL:
                     dev->rregs[ESP_RINTR] = 0;
-                    esp_log("ESP Enable Selection, do cmd = %d\n", dev->do_cmd);
+                    esp_log("ESP Enable Selection.\n");
                     break;
                 case CMD_DISSEL:
                     dev->rregs[ESP_RINTR] = 0;
@@ -1136,12 +1602,20 @@ esp_reg_write(esp_t *dev, uint32_t saddr, uint32_t val)
             }
             break;
         case ESP_WBUSID:
+            esp_log("ESP BUS ID=%d.\n", val & BUSID_DID);
+            break;
         case ESP_WSEL:
         case ESP_WSYNTP:
         case ESP_WSYNO:
             break;
         case ESP_CFG1:
+            dev->rregs[ESP_CFG1] = val;
+            esp_log("ESP CFG1=%02x.\n", val);
+            break;
         case ESP_CFG2:
+            dev->rregs[ESP_CFG2] = val & ~0x8f;
+            esp_log("ESP CFG2=%02x.\n", dev->rregs[ESP_CFG2]);
+            break;
         case ESP_CFG3:
         case ESP_RES3:
         case ESP_RES4:
@@ -1160,15 +1634,18 @@ esp_reg_write(esp_t *dev, uint32_t saddr, uint32_t val)
 static void
 esp_pci_dma_memory_rw(esp_t *dev, uint8_t *buf, uint32_t len, int dir)
 {
+    uint32_t addr;
     int expected_dir;
+    int sg_pos = 0;
+    uint32_t DMALen;
+    uint32_t DMAPtr;
+    uint32_t WAC = 0;
 
     if (dev->dma_regs[DMA_CMD] & DMA_CMD_DIR)
         expected_dir = READ_FROM_DEVICE;
     else
         expected_dir = WRITE_TO_DEVICE;
 
-    esp_log("ESP DMA WBC = %d, addr = %06x, expected direction = %d, dir = %i\n", dev->dma_regs[DMA_WBC], dev->dma_regs[DMA_SPA], expected_dir, dir);
-
     if (dir != expected_dir) {
         esp_log("ESP unexpected direction\n");
         return;
@@ -1177,20 +1654,72 @@ esp_pci_dma_memory_rw(esp_t *dev, uint8_t *buf, uint32_t len, int dir)
     if (dev->dma_regs[DMA_WBC] < len)
         len = dev->dma_regs[DMA_WBC];
 
-    if (expected_dir) {
-        dma_bm_write(dev->dma_regs[DMA_SPA], buf, len, 4);
-    } else {
-        dma_bm_read(dev->dma_regs[DMA_SPA], buf, len, 4);
-    }
-    esp_log("DMA: Address = %08X, Length = %08X (%02X %02X %02X %02X -> %02X %02X %02X %02X)\n", dev->dma_regs[DMA_SPA], len,
-            ram[dev->dma_regs[DMA_SPA]], ram[dev->dma_regs[DMA_SPA] + 1], ram[dev->dma_regs[DMA_SPA] + 2], ram[dev->dma_regs[DMA_SPA] + 3],
-            buf[0], buf[1], buf[2], buf[3]);
+    esp_log("DMA Length=%d.\n", len);
+    if (dev->dma_regs[DMA_CMD] & DMA_CMD_MDL) {
+        if (len) {
+            dma_bm_read(dev->dma_regs[DMA_WMAC], (uint8_t *)&DMAPtr, 4, 4);
+            dev->dma_regs[DMA_WAC] = DMAPtr | dev->dma_regs[DMA_SPA];
+            DMALen = len;
+            WAC = dev->dma_regs[DMA_SPA];
+            for (uint32_t i = 0; i < len; i += 4) {
+                if (WAC == 0) {
+                    dma_bm_read(dev->dma_regs[DMA_WMAC], (uint8_t *)&DMAPtr, 4, 4);
+                    dev->dma_regs[DMA_WAC] = DMAPtr;
+                }
 
-    /* update status registers */
-    dev->dma_regs[DMA_WBC] -= len;
-    dev->dma_regs[DMA_WAC] += len;
-    if (dev->dma_regs[DMA_WBC] == 0)
+                addr = dev->dma_regs[DMA_WAC];
+
+                esp_log("Data Buffer %s: length %d (%u), pointer 0x%04X\n",
+                         expected_dir ? "read" : "write", len, len, addr);
+
+                if (addr && DMALen) {
+                    if (expected_dir)
+                        dma_bm_write(addr, &buf[sg_pos], DMALen, 4);
+                    else
+                        dma_bm_read(addr, &buf[sg_pos], DMALen, 4);
+                }
+
+                sg_pos += 4;
+                DMALen -= 4;
+
+                /* update status registers */
+                dev->dma_regs[DMA_WBC] -= 4;
+                dev->dma_regs[DMA_WAC] += 4;
+                WAC += 4;
+                if (WAC >= 0x1000) {
+                    WAC = 0;
+                    dev->dma_regs[DMA_WMAC] += 4;
+                }
+
+                if (DMALen < 0)
+                    DMALen = 0;
+
+                if (dev->dma_regs[DMA_WBC] <= 0) {
+                    dev->dma_regs[DMA_WBC] = 0;
+                    break;
+                }
+            }
+        }
+    } else {
+        if (len) {
+            addr = dev->dma_regs[DMA_WAC];
+
+            if (expected_dir)
+                dma_bm_write(addr, buf, len, 4);
+            else
+                dma_bm_read(addr, buf, len, 4);
+
+            /* update status registers */
+            dev->dma_regs[DMA_WBC] -= len;
+            dev->dma_regs[DMA_WAC] += len;
+        }
+    }
+
+    esp_log("Finished count=%d.\n", dev->dma_regs[DMA_WBC]);
+    if (dev->dma_regs[DMA_WBC] == 0) {
+        esp_log("DMA transfer finished.\n");
         dev->dma_regs[DMA_STAT] |= DMA_STAT_DONE;
+    }
 }
 
 static uint32_t
@@ -1201,17 +1730,14 @@ esp_pci_dma_read(esp_t *dev, uint16_t saddr)
     ret = dev->dma_regs[saddr];
 
     if (saddr == DMA_STAT) {
-        if (dev->rregs[ESP_RSTAT] & STAT_INT) {
-            ret |= DMA_STAT_SCSIINT;
-            esp_log("ESP PCI DMA Read SCSI interrupt issued\n");
-        }
         if (!(dev->sbac & SBAC_STATUS)) {
-            dev->dma_regs[DMA_STAT] &= ~(DMA_STAT_ERROR | DMA_STAT_ABORT | DMA_STAT_DONE);
+            dev->dma_regs[DMA_STAT] &= ~(DMA_STAT_PWDN | DMA_STAT_ERROR | DMA_STAT_ABORT | DMA_STAT_DONE);
             esp_log("ESP PCI DMA Read done cleared\n");
+            esp_pci_update_irq(dev);
         }
     }
 
-    esp_log("ESP PCI DMA Read regs addr = %04x, temp = %06x\n", saddr, ret);
+    esp_log("ESP PCI DMA Read regs addr=%04x, ret=%06x, STAT=%02x\n", saddr, ret, dev->dma_regs[DMA_STAT]);
     return ret;
 }
 
@@ -1222,40 +1748,53 @@ esp_pci_dma_write(esp_t *dev, uint16_t saddr, uint32_t val)
 
     switch (saddr) {
         case DMA_CMD:
-            dev->dma_regs[saddr] = val;
+            dev->dma_regs[DMA_CMD] = val;
             esp_log("ESP PCI DMA Write CMD = %02x\n", val & DMA_CMD_MASK);
             switch (val & DMA_CMD_MASK) {
                 case 0: /*IDLE*/
+                    esp_log("IDLE/NOP\n");
                     esp_dma_enable(dev, 0);
-                    esp_log("PCI DMA disable\n");
                     break;
                 case 1: /*BLAST*/
+                    dev->dma_regs[DMA_STAT] |= DMA_STAT_BCMBLT;
                     break;
                 case 2: /*ABORT*/
                     scsi_device_command_stop(&scsi_devices[dev->bus][dev->id]);
                     break;
                 case 3: /*START*/
-                    dev->dma_regs[DMA_WBC]  = dev->dma_regs[DMA_STC];
-                    dev->dma_regs[DMA_WAC]  = dev->dma_regs[DMA_SPA];
-                    dev->dma_regs[DMA_WMAC] = dev->dma_regs[DMA_SMDLA];
+                    dev->dma_regs[DMA_WBC] = dev->dma_regs[DMA_STC];
+                    dev->dma_regs[DMA_WAC] = dev->dma_regs[DMA_SPA];
+
+                    if (val & DMA_CMD_MDL)
+                        dev->dma_regs[DMA_WMAC] = dev->dma_regs[DMA_SMDLA] & 0xfffffffc;
+
                     dev->dma_regs[DMA_STAT] &= ~(DMA_STAT_BCMBLT | DMA_STAT_SCSIINT | DMA_STAT_DONE | DMA_STAT_ABORT | DMA_STAT_ERROR | DMA_STAT_PWDN);
                     esp_dma_enable(dev, 1);
-                    esp_log("PCI DMA enable\n");
+                    esp_log("PCI DMA enable, MDL bit=%02x, SPA=%08x, SMDLA=%08x, STC=%d, ID=%d, SCSICMD=%02x.\n", val & DMA_CMD_MDL, dev->dma_regs[DMA_SPA], dev->dma_regs[DMA_SMDLA], dev->dma_regs[DMA_STC], dev->id, dev->cmdfifo.data[1]);
                     break;
                 default: /* can't happen */
                     abort();
+                    break;
             }
             break;
         case DMA_STC:
+            dev->dma_regs[DMA_STC] = val;
+            esp_log("DMASTC PCI write=%08x.\n", val);
+            break;
         case DMA_SPA:
+            dev->dma_regs[DMA_SPA] = val;
+            esp_log("DMASPA PCI write=%08x.\n", val);
+            break;
         case DMA_SMDLA:
-            dev->dma_regs[saddr] = val;
+            dev->dma_regs[DMA_SMDLA] = val;
+            esp_log("DMASMDLA PCI write=%08x.\n", val);
             break;
         case DMA_STAT:
             if (dev->sbac & SBAC_STATUS) {
                 /* clear some bits on write */
                 mask = DMA_STAT_ERROR | DMA_STAT_ABORT | DMA_STAT_DONE;
                 dev->dma_regs[DMA_STAT] &= ~(val & mask);
+                esp_pci_update_irq(dev);
             }
             break;
 
@@ -1283,7 +1822,7 @@ esp_pci_hard_reset(esp_t *dev)
     dev->dma_regs[DMA_STAT] &= ~(DMA_STAT_BCMBLT | DMA_STAT_SCSIINT
                                  | DMA_STAT_DONE | DMA_STAT_ABORT
                                  | DMA_STAT_ERROR);
-    dev->dma_regs[DMA_WMAC] = 0xfffffffd;
+    dev->dma_regs[DMA_WMAC] = 0xfffffffc;
 }
 
 static uint32_t
@@ -1303,7 +1842,7 @@ esp_io_pci_read(esp_t *dev, uint32_t addr, unsigned int size)
     } else if (addr == 0x70) {
         /* DMA SCSI Bus and control */
         ret = dev->sbac;
-        esp_log("ESP PCI SBAC read = %02x\n", ret);
+        esp_log("ESP PCI SBAC read=%08x\n", ret);
     } else {
         /* Invalid region */
         ret = 0;
@@ -1313,7 +1852,11 @@ esp_io_pci_read(esp_t *dev, uint32_t addr, unsigned int size)
     ret >>= (addr & 3) * 8;
     ret &= ~(~(uint64_t) 0 << (8 * size));
 
-    esp_log("ESP PCI I/O read: addr = %02x, val = %02x\n", addr, ret);
+    if (addr == 0x70)
+        esp_log("%04X:%08X: SBAC PCI I/O read: addr=%02x, val=%02x\n", CS, cpu_state.pc, addr, ret);
+    else
+        esp_log("%04X:%08X: ESP PCI I/O read: addr=%02x, val=%02x\n", CS, cpu_state.pc, addr, ret);
+
     return ret;
 }
 
@@ -1334,7 +1877,7 @@ esp_io_pci_write(esp_t *dev, uint32_t addr, uint32_t val, unsigned int size)
             current = dev->wregs[addr >> 2];
         } else if (addr < 0x60) {
             current = dev->dma_regs[(addr - 0x40) >> 2];
-        } else if (addr < 0x74) {
+        } else if (addr == 0x70) {
             current = dev->sbac;
         }
 
@@ -1358,6 +1901,7 @@ esp_io_pci_write(esp_t *dev, uint32_t addr, uint32_t val, unsigned int size)
         esp_pci_dma_write(dev, (addr - 0x40) >> 2, val);
     } else if (addr == 0x70) {
         /* DMA SCSI Bus and control */
+        esp_log("ESP PCI SBAC write=%08x\n", val);
         dev->sbac = val;
     }
 }
@@ -1454,203 +1998,27 @@ esp_bios_disable(esp_t *dev)
 #define EE_ADAPT_OPTION_INT13           0x04
 #define EE_ADAPT_OPTION_SCAM_SUPPORT    0x08
 
-/*To do: make this separate from the SCSI card*/
-static void
-dc390_save_eeprom(esp_t *dev)
-{
-    FILE *fp = nvr_fopen(dev->nvr_path, "wb");
-    if (!fp)
-        return;
-    fwrite(dev->eeprom.data, 1, 128, fp);
-    fclose(fp);
-}
-
-static void
-dc390_write_eeprom(esp_t *dev, int ena, int clk, int dat)
-{
-    /*Actual EEPROM is the same as the one used by the ATI cards, the 93cxx series.*/
-    ati_eeprom_t *eeprom  = &dev->eeprom;
-    uint8_t       tick    = eeprom->count;
-    uint8_t       eedo    = eeprom->out;
-    uint16_t      address = eeprom->address;
-    uint8_t       command = eeprom->opcode;
-
-    esp_log("EEPROM CS=%02x,SK=%02x,DI=%02x,DO=%02x,tick=%d\n",
-            ena, clk, dat, eedo, tick);
-
-    if (!eeprom->oldena && ena) {
-        esp_log("EEPROM Start chip select cycle\n");
-        tick    = 0;
-        command = 0;
-        address = 0;
-    } else if (eeprom->oldena && !ena) {
-        if (!eeprom->wp) {
-            uint8_t subcommand = address >> 4;
-            if (command == 0 && subcommand == 2) {
-                esp_log("EEPROM Erase All\n");
-                for (address = 0; address < 64; address++)
-                    eeprom->data[address] = 0xffff;
-                dc390_save_eeprom(dev);
-            } else if (command == 3) {
-                esp_log("EEPROM Erase Word\n");
-                eeprom->data[address] = 0xffff;
-                dc390_save_eeprom(dev);
-            } else if (tick >= 26) {
-                if (command == 1) {
-                    esp_log("EEPROM Write Word\n");
-                    eeprom->data[address] &= eeprom->dat;
-                    dc390_save_eeprom(dev);
-                } else if (command == 0 && subcommand == 1) {
-                    esp_log("EEPROM Write All\n");
-                    for (address = 0; address < 64; address++)
-                        eeprom->data[address] &= eeprom->dat;
-                    dc390_save_eeprom(dev);
-                }
-            }
-        }
-        eedo = 1;
-        esp_log("EEPROM DO read\n");
-    } else if (ena && !eeprom->oldclk && clk) {
-        if (tick == 0) {
-            if (dat == 0) {
-                esp_log("EEPROM Got correct 1st start bit, waiting for 2nd start bit (1)\n");
-                tick++;
-            } else {
-                esp_log("EEPROM Wrong 1st start bit (is 1, should be 0)\n");
-                tick = 2;
-            }
-        } else if (tick == 1) {
-            if (dat != 0) {
-                esp_log("EEPROM Got correct 2nd start bit, getting command + address\n");
-                tick++;
-            } else {
-                esp_log("EEPROM 1st start bit is longer than needed\n");
-            }
-        } else if (tick < 4) {
-            tick++;
-            command <<= 1;
-            if (dat)
-                command += 1;
-        } else if (tick < 10) {
-            tick++;
-            address = (address << 1) | dat;
-            if (tick == 10) {
-                esp_log("EEPROM command = %02x, address = %02x (val = %04x)\n", command,
-                        address, eeprom->data[address]);
-                if (command == 2)
-                    eedo = 0;
-                address = address % 64;
-                if (command == 0) {
-                    switch (address >> 4) {
-                        case 0:
-                            esp_log("EEPROM Write disable command\n");
-                            eeprom->wp = 1;
-                            break;
-                        case 1:
-                            esp_log("EEPROM Write all command\n");
-                            break;
-                        case 2:
-                            esp_log("EEPROM Erase all command\n");
-                            break;
-                        case 3:
-                            esp_log("EEPROM Write enable command\n");
-                            eeprom->wp = 0;
-                            break;
-
-                        default:
-                            break;
-                    }
-                } else {
-                    esp_log("EEPROM Read, write or erase word\n");
-                    eeprom->dat = eeprom->data[address];
-                }
-            }
-        } else if (tick < 26) {
-            tick++;
-            if (command == 2) {
-                esp_log("EEPROM Read Word\n");
-                eedo = ((eeprom->dat & 0x8000) != 0);
-            }
-            eeprom->dat <<= 1;
-            eeprom->dat += dat;
-        } else {
-            esp_log("EEPROM Additional unneeded tick, not processed\n");
-        }
-    }
-
-    eeprom->count   = tick;
-    eeprom->oldena  = ena;
-    eeprom->oldclk  = clk;
-    eeprom->out     = eedo;
-    eeprom->address = address;
-    eeprom->opcode  = command;
-    esp_log("EEPROM EEDO = %d\n", eeprom->out);
-}
-
-static void
-dc390_load_eeprom(esp_t *dev)
-{
-    ati_eeprom_t *eeprom = &dev->eeprom;
-    uint8_t      *nvr    = (uint8_t *) eeprom->data;
-    int           i;
-    uint16_t      checksum = 0;
-    FILE         *fp;
-
-    eeprom->out = 1;
-
-    fp = nvr_fopen(dev->nvr_path, "rb");
-    if (fp) {
-        esp_log("EEPROM Load\n");
-        if (fread(nvr, 1, 128, fp) != 128)
-            fatal("dc390_eeprom_load(): Error reading data\n");
-        fclose(fp);
-    } else {
-        for (i = 0; i < 16; i++) {
-            nvr[i * 2]     = 0x57;
-            nvr[i * 2 + 1] = 0x00;
-        }
-
-        esp_log("EEPROM Defaults\n");
-
-        nvr[EE_ADAPT_SCSI_ID] = 7;
-        nvr[EE_MODE2]         = 0x0f;
-        nvr[EE_TAG_CMD_NUM]   = 0x04;
-        nvr[EE_ADAPT_OPTIONS] = EE_ADAPT_OPTION_F6_F8_AT_BOOT | EE_ADAPT_OPTION_BOOT_FROM_CDROM | EE_ADAPT_OPTION_INT13;
-        for (i = 0; i < EE_CHKSUM1; i += 2) {
-            checksum += ((nvr[i] & 0xff) | (nvr[i + 1] << 8));
-            esp_log("Checksum calc = %04x, nvr = %02x\n", checksum, nvr[i]);
-        }
-
-        checksum        = 0x1234 - checksum;
-        nvr[EE_CHKSUM1] = checksum & 0xff;
-        nvr[EE_CHKSUM2] = checksum >> 8;
-        esp_log("EEPROM Checksum = %04x\n", checksum);
-    }
-}
-
-uint8_t esp_pci_regs[256];
-bar_t   esp_pci_bar[2];
-
 static uint8_t
 esp_pci_read(UNUSED(int func), int addr, void *priv)
 {
     esp_t *dev = (esp_t *) priv;
 
-    // esp_log("ESP PCI: Reading register %02X\n", addr & 0xff);
+    esp_log("ESP PCI: Reading register %02X\n", addr & 0xff);
 
     switch (addr) {
         case 0x00:
             // esp_log("ESP PCI: Read DO line = %02x\n", dev->eeprom.out);
-            if (!dev->has_bios)
+            if (!dev->has_bios || dev->local)
                 return 0x22;
             else {
-                if (dev->eeprom.out)
+                if (nmc93cxx_eeprom_read(dev->eeprom))
                     return 0x22;
                 else {
-                    dev->eeprom.out = 1;
+                    dev->eeprom->dev.out = 1;
                     return 2;
                 }
             }
+            break;
         case 0x01:
             return 0x10;
         case 0x02:
@@ -1664,17 +2032,19 @@ esp_pci_read(UNUSED(int func), int addr, void *priv)
         case 0x07:
             return esp_pci_regs[0x07] | 0x02;
         case 0x08:
-            return 0; /*Revision ID*/
+            return (dev->local == 1) ? 0 : 0x10; /*Revision ID*/
         case 0x09:
             return 0; /*Programming interface*/
         case 0x0A:
             return 0; /*devubclass*/
         case 0x0B:
             return 1; /*Class code*/
+        case 0x0C:
+            return esp_pci_regs[0x0c];
         case 0x0E:
             return 0; /*Header type */
         case 0x10:
-            return (esp_pci_bar[0].addr_regs[0] & 0x80) | 0x01; /*I/O space*/
+            return esp_pci_bar[0].addr_regs[0] | 0x01; /*I/O space*/
         case 0x11:
             return esp_pci_bar[0].addr_regs[1];
         case 0x12:
@@ -1701,7 +2071,10 @@ esp_pci_read(UNUSED(int func), int addr, void *priv)
             return dev->irq;
         case 0x3D:
             return PCI_INTA;
-
+        case 0x3E:
+            return 0x04;
+        case 0x3F:
+            return 0x28;
         case 0x40 ... 0x4f:
             return esp_pci_regs[addr];
 
@@ -1720,22 +2093,24 @@ esp_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
     int     eesk;
     int     eedi;
 
-    // esp_log("ESP PCI: Write value %02X to register %02X\n", val, addr);
+    esp_log("%04X:%08X: ESP PCI: Write value %02X to register %02X\n", CS, cpu_state.pc, val, addr);
 
-    if ((addr >= 0x80) && (addr <= 0xFF)) {
-        if (addr == 0x80) {
-            eesk = val & 0x80 ? 1 : 0;
-            eedi = val & 0x40 ? 1 : 0;
-            dc390_write_eeprom(dev, 1, eesk, eedi);
-        } else if (addr == 0xc0)
-            dc390_write_eeprom(dev, 0, 0, 0);
-        // esp_log("ESP PCI: Write value %02X to register %02X\n", val, addr);
-        return;
+    if (!dev->local) {
+        if ((addr >= 0x80) && (addr <= 0xFF)) {
+            if (addr == 0x80) {
+                eesk = val & 0x80 ? 1 : 0;
+                eedi = val & 0x40 ? 1 : 0;
+                nmc93cxx_eeprom_write(dev->eeprom, 1, eesk, eedi);
+            } else if (addr == 0xc0)
+                nmc93cxx_eeprom_write(dev->eeprom, 0, 0, 0);
+            // esp_log("ESP PCI: Write value %02X to register %02X\n", val, addr);
+            return;
+        }
     }
 
     switch (addr) {
         case 0x04:
-            valxor = (val & 3) ^ esp_pci_regs[addr];
+            valxor = (val & 0x01) ^ esp_pci_regs[addr];
             if (valxor & PCI_COMMAND_IO) {
                 esp_io_remove(dev, dev->PCIBase, 0x80);
                 if ((val & PCI_COMMAND_IO) && (dev->PCIBase != 0))
@@ -1759,6 +2134,10 @@ esp_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
             esp_pci_regs[addr] &= ~(val & 0xf9);
             break;
 
+        case 0x0c:
+            esp_pci_regs[addr] = val;
+            break;
+
         case 0x10:
         case 0x11:
         case 0x12:
@@ -1817,16 +2196,45 @@ esp_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
     }
 }
 
-static void *
-dc390_init(UNUSED(const device_t *info))
+static void
+esp_pci_reset(void *priv)
 {
-    esp_t *dev;
+    esp_t *dev = (esp_t *) priv;
 
-    dev = malloc(sizeof(esp_t));
-    memset(dev, 0x00, sizeof(esp_t));
+    if (reset_state != NULL) {
+        esp_io_remove(dev, dev->PCIBase, 0x80);
+        esp_bios_disable(dev);
+        timer_stop(&dev->timer);
+
+        reset_state->bios.mapping     = dev->bios.mapping;
+        reset_state->timer            = dev->timer;
+        reset_state->pci_slot         = dev->pci_slot;
+
+        *dev = *reset_state;
+
+        esp_pci_soft_reset(dev);
+        esp_log("PCI Reset.\n");
+    } else
+        esp_log("NULL.\n");
+}
+
+static void *
+dc390_init(const device_t *info)
+{
+    esp_t *dev = calloc(1, sizeof(esp_t));
+    reset_state = calloc(1, sizeof(esp_t));
+    const char *bios_rev = NULL;
+    uint32_t mask = 0;
+    uint32_t size = 0x8000;
+    nmc93cxx_eeprom_params_t params;
+    char        eeprom_filename[1024] = { 0 };
+    char        filename[1024] = { 0 };
+    uint16_t    checksum = 0x0000;
+    uint8_t     i;
 
     dev->bus = scsi_get_bus();
 
+    dev->local = info->local;
     dev->mca = 0;
 
     fifo8_create(&dev->fifo, ESP_FIFO_SZ);
@@ -1842,31 +2250,77 @@ dc390_init(UNUSED(const device_t *info))
 
     dev->has_bios = device_get_config_int("bios");
     if (dev->has_bios) {
-        dev->BIOSBase = 0xd0000;
-        rom_init(&dev->bios, DC390_ROM, 0xd0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
+        dev->BIOSBase = 0xc8000;
+        if (dev->local) {
+            bios_rev         = (char *) device_get_config_bios("bios_rev");
+            dev->bios_path   = (char *) device_get_bios_file(info, bios_rev, 0);
+            if (!strcmp(bios_rev, "v3_43"))
+                mask = 0x4000;
+            else if (!strcmp(bios_rev, "v3_01_amd"))
+                size = 0x4000;
+
+            rom_init(&dev->bios, dev->bios_path, dev->BIOSBase, size, size - 1, mask, MEM_MAPPING_EXTERNAL);
+        } else
+            rom_init(&dev->bios, DC390_ROM, dev->BIOSBase, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
     }
 
     /* Enable our BIOS space in PCI, if needed. */
-    if (dev->has_bios) {
+    if (dev->has_bios)
         esp_pci_bar[1].addr = 0xffff0000;
-    } else {
+    else
         esp_pci_bar[1].addr = 0;
-    }
 
     if (dev->has_bios)
         esp_bios_disable(dev);
 
-    dev->nvr_path = "dc390.nvr";
+    if (!dev->local) {
+        dev->eeprom_inst = device_get_instance();
 
-    /* Load the serial EEPROM. */
-    dc390_load_eeprom(dev);
+        snprintf(eeprom_filename, sizeof(eeprom_filename), "dc390_%d.nvr", dev->eeprom_inst);
+
+        /* Load the serial EEPROM. */
+        for (i = 0; i < 16; i++) {
+            dev->eeprom_data[i * 2]     = 0x57;
+            dev->eeprom_data[i * 2 + 1] = 0x00;
+        }
+
+        esp_log("EEPROM Defaults\n");
+
+        dev->eeprom_data[EE_ADAPT_SCSI_ID] = 7;
+        dev->eeprom_data[EE_MODE2]         = 0x0f;
+        dev->eeprom_data[EE_TAG_CMD_NUM]   = 0x04;
+        dev->eeprom_data[EE_ADAPT_OPTIONS] = EE_ADAPT_OPTION_F6_F8_AT_BOOT | EE_ADAPT_OPTION_BOOT_FROM_CDROM | EE_ADAPT_OPTION_INT13;
+        for (i = 0; i < EE_CHKSUM1; i += 2) {
+            checksum += ((dev->eeprom_data[i] & 0xff) | (dev->eeprom_data[i + 1] << 8));
+            esp_log("Checksum calc = %04x, nvr = %02x\n", checksum, dev->eeprom_data[i]);
+        }
+
+        checksum        = 0x1234 - checksum;
+        dev->eeprom_data[EE_CHKSUM1] = checksum & 0xff;
+        dev->eeprom_data[EE_CHKSUM2] = checksum >> 8;
+
+        params.nwords          = 64;
+        params.default_content = (uint16_t *) dev->eeprom_data;
+        params.filename        = filename;
+        snprintf(filename, sizeof(filename), "nmc93cxx_eeprom_%s_%d.nvr", info->internal_name, dev->eeprom_inst);
+        dev->eeprom = device_add_inst_params(&nmc93cxx_device, dev->eeprom_inst, &params);
+        if (dev->eeprom == NULL) {
+            free(dev);
+            return NULL;
+        }
+    }
 
     esp_pci_hard_reset(dev);
+    for (uint8_t i = 0; i < 16; i++) {
+        scsi_device_reset(&scsi_devices[dev->bus][i]);
+    }
 
     timer_add(&dev->timer, esp_callback, dev, 0);
 
     scsi_bus_set_speed(dev->bus, 10000000.0);
 
+    *reset_state = *dev;
+
     return dev;
 }
 
@@ -1887,12 +2341,12 @@ ncr53c9x_in(uint16_t port, void *priv)
                 break;
 
             case 0x0c:
-                if (dev->rregs[ESP_RSTAT] & STAT_INT)
+                if (dev->dma_86c01.mode & 0x40)
                     dev->dma_86c01.status |= 0x01;
                 else
                     dev->dma_86c01.status &= ~0x01;
 
-                if ((dev->dma_86c01.mode & 0x40) || dev->dma_enabled)
+                if (dev->dma_enabled)
                     dev->dma_86c01.status |= 0x02;
                 else
                     dev->dma_86c01.status &= ~0x02;
@@ -1905,7 +2359,7 @@ ncr53c9x_in(uint16_t port, void *priv)
         }
     }
 
-    esp_log("[%04X:%08X]: NCR53c9x DMA read port = %02x, ret = %02x.\n\n", CS, cpu_state.pc, port, ret);
+    esp_log("[%04X:%08X]: NCR53c9x DMA read port = %02x, ret = %02x, local = %d.\n\n", CS, cpu_state.pc, port, ret, dev->local);
 
     return ret;
 }
@@ -1929,7 +2383,7 @@ ncr53c9x_out(uint16_t port, uint16_t val, void *priv)
 
     port &= 0x1f;
 
-    esp_log("[%04X:%08X]: NCR53c9x DMA write port = %02x, val = %02x\n", CS, cpu_state.pc, port, val);
+    esp_log("[%04X:%08X]: NCR53c9x DMA write port = %02x, val = %02x.\n\n", CS, cpu_state.pc, port, val);
 
     if (port >= 0x10)
         esp_reg_write(dev, port - 0x10, val);
@@ -2007,6 +2461,8 @@ ncr53c9x_mca_write(int port, uint8_t val, void *priv)
                           ncr53c9x_outb, ncr53c9x_outw, NULL, dev);
 
             esp_hard_reset(dev);
+            for (uint8_t i = 0; i < 8; i++)
+                scsi_device_reset(&scsi_devices[dev->bus][i]);
         }
 
         /* Say hello. */
@@ -2024,29 +2480,29 @@ ncr53c9x_mca_feedb(void *priv)
 }
 
 static void *
-ncr53c9x_mca_init(UNUSED(const device_t *info))
+ncr53c9x_mca_init(const device_t *info)
 {
-    esp_t *dev;
-
-    dev = malloc(sizeof(esp_t));
-    memset(dev, 0x00, sizeof(esp_t));
+    esp_t *dev = calloc(1, sizeof(esp_t));
 
     dev->bus = scsi_get_bus();
 
     dev->mca = 1;
+    dev->local = info->local;
 
     fifo8_create(&dev->fifo, ESP_FIFO_SZ);
     fifo8_create(&dev->cmdfifo, ESP_CMDFIFO_SZ);
 
-    dev->pos_regs[0] = 0x4f; /* MCA board ID */
+    dev->pos_regs[0] = 0x4d; /* MCA board ID */
     dev->pos_regs[1] = 0x7f;
     mca_add(ncr53c9x_mca_read, ncr53c9x_mca_write, ncr53c9x_mca_feedb, NULL, dev);
 
     esp_hard_reset(dev);
+    for (uint8_t i = 0; i < 8; i++)
+        scsi_device_reset(&scsi_devices[dev->bus][i]);
 
     timer_add(&dev->timer, esp_callback, dev, 0);
 
-    scsi_bus_set_speed(dev->bus, 5000000.0);
+    scsi_bus_set_speed(dev->bus, 10000000.0);
 
     return dev;
 }
@@ -2060,6 +2516,11 @@ esp_close(void *priv)
         fifo8_destroy(&dev->fifo);
         fifo8_destroy(&dev->cmdfifo);
 
+        if (reset_state != NULL) {
+            free(reset_state);
+            reset_state = NULL;
+        }
+
         free(dev);
         dev = NULL;
     }
@@ -2068,11 +2529,127 @@ esp_close(void *priv)
 static const device_config_t bios_enable_config[] = {
   // clang-format off
     {
-        .name = "bios",
-        .description = "Enable BIOS",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "bios",
+        .description    = "Enable BIOS",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
+static const device_config_t am53c974_bios_enable_config[] = {
+  // clang-format off
+    {
+        .name           = "bios_rev",
+        .description    = "BIOS Revision",
+        .type           = CONFIG_BIOS,
+        .default_string = "v3_01_amd",
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .bios           = {
+            {
+                .name          = "Version 3.01 (AMD)",
+                .internal_name = "v3_01_amd",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 16384,
+                .files         = { AM53C974_3_01_AMD_ROM, "" }
+            },
+            { .files_no = 0 }
+        },
+    },
+    {
+        .name           = "bios",
+        .description    = "Enable BIOS",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
+static const device_config_t am53c974a_bios_enable_config[] = {
+  // clang-format off
+    {
+        .name           = "bios_rev",
+        .description    = "BIOS Revision",
+        .type           = CONFIG_BIOS,
+        .default_string = "v3_01_amd",
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .bios           = {
+            {
+                .name          = "Version 3.01 (AMD)",
+                .internal_name = "v3_01_amd",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 16384,
+                .files         = { AM53C974_3_01_AMD_ROM, "" }
+            },
+            {
+                .name          = "Version 3.43 (Dawicontrol)",
+                .internal_name = "v3_43",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 32768,
+                .files         = { AM53C974_3_43_ROM, "" }
+            },
+            {
+                .name          = "Version 4.00 (Dawicontrol)",
+                .internal_name = "v4_00",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 32768,
+                .files         = { AM53C974_4_00_ROM, "" }
+            },
+            {
+                .name          = "Version 5.00 (Dawicontrol)",
+                .internal_name = "v5_00",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 32768,
+                .files         = { AM53C974_5_00_ROM, "" }
+            },
+            {
+                .name          = "Version 5.11 (Dawicontrol)",
+                .internal_name = "v5_11",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 32768,
+                .files         = { AM53C974_5_11_ROM, "" }
+            },
+            { .files_no = 0 }
+        },
+    },
+    {
+        .name           = "bios",
+        .description    = "Enable BIOS",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -2085,13 +2662,41 @@ const device_t dc390_pci_device = {
     .local         = 0,
     .init          = dc390_init,
     .close         = esp_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .reset         = esp_pci_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = bios_enable_config
 };
 
+const device_t am53c974_pci_device = {
+    .name          = "AMD 53c974 PCI",
+    .internal_name = "am53c974",
+    .flags         = DEVICE_PCI,
+    .local         = 1,
+    .init          = dc390_init,
+    .close         = esp_close,
+    .reset         = esp_pci_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = am53c974_bios_enable_config
+};
+
+const device_t am53c974a_pci_device = {
+    .name          = "AMD 53c974A PCI",
+    .internal_name = "am53c974a",
+    .flags         = DEVICE_PCI,
+    .local         = 2,
+    .init          = dc390_init,
+    .close         = esp_close,
+    .reset         = esp_pci_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = am53c974a_bios_enable_config
+};
+
 const device_t ncr53c90a_mca_device = {
     .name          = "NCR 53c90a MCA",
     .internal_name = "ncr53c90a",
@@ -2100,7 +2705,7 @@ const device_t ncr53c90a_mca_device = {
     .init          = ncr53c9x_mca_init,
     .close         = esp_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/scsi/scsi_spock.c b/src/scsi/scsi_spock.c
index ba2817fe3..0bb2d70ba 100644
--- a/src/scsi/scsi_spock.c
+++ b/src/scsi/scsi_spock.c
@@ -130,6 +130,7 @@ typedef struct {
     int   adapter_id;
     int   assign;
     int   present[8];
+    int   id_connected;
 
     int cmd_status;
     int cir_status;
@@ -196,6 +197,7 @@ typedef struct {
 #define CMD_UNKNOWN_1C11            0x1c11
 #define CMD_WRITE_DATA              0x1c02
 #define CMD_VERIFY                  0x1c03
+#define CMD_WRITE_VERIFY            0x1c04
 
 #define IRQ_TYPE_NONE               0x0
 #define IRQ_TYPE_SCB_COMPLETE       0x1
@@ -205,7 +207,6 @@ typedef struct {
 #define IRQ_TYPE_COMMAND_FAIL       0xc
 #define IRQ_TYPE_COMMAND_ERROR      0xe
 #define IRQ_TYPE_SW_SEQ_ERROR       0xf
-#define IRQ_TYPE_RESET_COMPLETE     0x10
 
 #ifdef ENABLE_SPOCK_LOG
 int spock_do_log = ENABLE_SPOCK_LOG;
@@ -225,7 +226,9 @@ spock_log(const char *fmt, ...)
 #    define spock_log(fmt, ...)
 #endif
 
-static void
+static void spock_reset(void *priv);
+
+static __inline void
 spock_rethink_irqs(spock_t *scsi)
 {
     int irq_pending = 0;
@@ -235,7 +238,7 @@ spock_rethink_irqs(spock_t *scsi)
             if (scsi->irq_requests[c] != IRQ_TYPE_NONE) {
                 /* Found IRQ */
                 scsi->irq_status = c | (scsi->irq_requests[c] << 4);
-                spock_log("Found IRQ: status = %02x\n", scsi->irq_status);
+                spock_log("Found IRQ: status=%02x.\n", scsi->irq_status);
                 scsi->status |= STATUS_IRQ;
                 irq_pending = 1;
                 break;
@@ -244,38 +247,37 @@ spock_rethink_irqs(spock_t *scsi)
     } else
         irq_pending = 1;
 
+    spock_log("spock_rethink_irqs: irqstat=%02x, ctrl=%02x, irqpend=%d.\n", scsi->irq_status, scsi->basic_ctrl, irq_pending);
     if (scsi->basic_ctrl & CTRL_IRQ_ENA) {
         if (irq_pending) {
             spock_log("IRQ issued\n");
-            scsi->irq_inactive = 0;
+            scsi->status |= STATUS_IRQ;
             picint(1 << scsi->irq);
         } else {
             /* No IRQs pending, clear IRQ state */
             spock_log("IRQ cleared\n");
-            scsi->irq_status   = 0;
-            scsi->irq_inactive = 1;
-            scsi->status &= ~STATUS_IRQ;
             picintc(1 << scsi->irq);
         }
     } else {
-        spock_log("IRQ disabled\n");
-        picintc(1 << scsi->irq);
+        spock_log("IRQ disabled, pending=%d.\n", irq_pending);
+        if (irq_pending)
+            scsi->status |= STATUS_IRQ;
     }
 }
 
-static __inline void
+static void
 spock_set_irq(spock_t *scsi, int id, int type)
 {
-    spock_log("spock_set_irq id=%i type=%x %02x\n", id, type, scsi->irq_status);
+    spock_log("spock_set_irq: id=%i, type=%x, irqstat=%02x\n", id, type, scsi->irq_status);
     scsi->irq_requests[id] = type;
     if (!scsi->irq_status) /* Don't change IRQ status if one is currently being processed */
         spock_rethink_irqs(scsi);
 }
 
-static __inline void
+static void
 spock_clear_irq(spock_t *scsi, int id)
 {
-    spock_log("spock_clear_irq id=%i\n", id);
+    spock_log("spock_clear_irq: id=%i.\n", id);
     scsi->irq_requests[id] = IRQ_TYPE_NONE;
     spock_rethink_irqs(scsi);
 }
@@ -291,7 +293,7 @@ spock_write(uint16_t port, uint8_t val, void *priv)
 {
     spock_t *scsi = (spock_t *) priv;
 
-    spock_log("spock_write: port=%04x val=%02x %04x:%04x\n", port, val, CS, cpu_state.pc);
+    spock_log("%04X:%08X: spock_writeb: port=%04x, val=%02x.\n", CS, cpu_state.pc, port & 7, val);
 
     switch (port & 7) {
         case 0:
@@ -307,16 +309,14 @@ spock_write(uint16_t port, uint8_t val, void *priv)
 
         case 4: /*Attention Register*/
             scsi->attention_pending = val;
-            scsi->attention_wait    = 2;
+            scsi->attention_wait = 2;
             scsi->status |= STATUS_BUSY;
             break;
 
         case 5: /*Basic Control Register*/
-            if ((scsi->basic_ctrl & CTRL_RESET) && !(val & CTRL_RESET)) {
+            if (!(scsi->basic_ctrl & CTRL_RESET) && (val & CTRL_RESET)) {
                 spock_log("Spock: SCSI reset and busy\n");
-                scsi->in_reset  = 1;
-                scsi->cmd_timer = SPOCK_TIME * 2;
-                scsi->status |= STATUS_BUSY;
+                spock_reset(scsi);
             }
             scsi->basic_ctrl = val;
             spock_rethink_irqs(scsi);
@@ -332,6 +332,8 @@ spock_writew(uint16_t port, uint16_t val, void *priv)
 {
     spock_t *scsi = (spock_t *) priv;
 
+    spock_log("%04X:%08X: spock_writew: port=%04x, val=%04x.\n", CS, cpu_state.pc, port & 7, val);
+
     switch (port & 7) {
         case 0: /*Command Interface Register*/
             scsi->cir_pending[0] = val & 0xff;
@@ -347,8 +349,6 @@ spock_writew(uint16_t port, uint16_t val, void *priv)
         default:
             break;
     }
-
-    spock_log("spock_writew: port=%04x val=%04x\n", port, val);
 }
 
 static uint8_t
@@ -390,7 +390,7 @@ spock_read(uint16_t port, void *priv)
             break;
     }
 
-    spock_log("spock_read: port=%04x val=%02x %04x(%05x):%04x.\n", port, temp, CS, cs, cpu_state.pc);
+    spock_log("%04X:%08X: spock_readb: port=%04x, temp=%02x.\n", CS, cpu_state.pc, port & 7, temp);
     return temp;
 }
 
@@ -412,7 +412,7 @@ spock_readw(uint16_t port, void *priv)
             break;
     }
 
-    spock_log("spock_readw: port=%04x val=%04x\n", port, temp);
+    spock_log("spock_readw: port=%04x, val=%04x, %04x:%04x.\n", port & 7, temp, CS, cpu_state.pc);
     return temp;
 }
 
@@ -441,25 +441,20 @@ spock_get_len(spock_t *scsi, scb_t *scb)
             DataToTransfer += scb->sge.sys_buf_byte_count;
         }
         return DataToTransfer;
-    } else {
-        return (scsi->data_len);
     }
+    return (scsi->data_len);
 }
 
 static void
 spock_process_imm_cmd(spock_t *scsi)
 {
     int i;
-    int j = 0;
     int adapter_id;
     int phys_id;
     int lun_id;
 
-    scsi->assign = 0;
-
     switch (scsi->command & CMD_MASK) {
         case CMD_ASSIGN:
-            scsi->assign = 1;
             adapter_id   = (scsi->command >> 16) & 15;
             phys_id      = (scsi->command >> 20) & 7;
             lun_id       = (scsi->command >> 24) & 7;
@@ -472,14 +467,23 @@ spock_process_imm_cmd(spock_t *scsi)
                 if (scsi->command & (1 << 23)) {
                     spock_log("Assign: adapter id=%d\n", adapter_id);
                     scsi->dev_id[adapter_id].phys_id = -1;
+                    scsi->id_connected = 0;
                     spock_set_irq(scsi, scsi->attention & 0x0f, IRQ_TYPE_IMM_CMD_COMPLETE);
                 } else {
                     if (phys_id != scsi->adapter_id) {
                         scsi->dev_id[adapter_id].phys_id = phys_id;
                         scsi->dev_id[adapter_id].lun_id  = lun_id;
-                        spock_log("Assign: adapter dev=%x scsi ID=%i LUN=%i.\n", adapter_id, scsi->dev_id[adapter_id].phys_id, scsi->dev_id[adapter_id].lun_id);
+                        if (scsi_device_present(&scsi_devices[scsi->bus][phys_id])) {
+                            scsi->present[scsi->id_connected] = 1;
+                            if (lun_id == 0)
+                                scsi->id_connected++;
+                        } else
+                            scsi->present[scsi->id_connected] = 0;
+
+                        spock_log("Assign: adapter dev=%d, scsi ID=%i, LUN=%i, attention devsel=%d, present=%d, connected=%d.\n", adapter_id, scsi->dev_id[adapter_id].phys_id, scsi->dev_id[adapter_id].lun_id, scsi->attention & 0x0f, scsi->present[scsi->id_connected], scsi->id_connected);
                         spock_set_irq(scsi, scsi->attention & 0x0f, IRQ_TYPE_IMM_CMD_COMPLETE);
                     } else { /*Can not assign adapter*/
+                        scsi->id_connected = 0;
                         spock_log("Assign: PUN=%d, cannot assign adapter.\n", phys_id);
                         spock_set_irq(scsi, scsi->attention & 0x0f, IRQ_TYPE_COMMAND_FAIL);
                     }
@@ -496,29 +500,20 @@ spock_process_imm_cmd(spock_t *scsi)
             spock_set_irq(scsi, scsi->attention & 0x0f, IRQ_TYPE_IMM_CMD_COMPLETE);
             break;
         case CMD_INVALID_412:
-            spock_log("Invalid 412\n");
+            spock_log("Invalid 412.\n");
             spock_set_irq(scsi, scsi->attention & 0x0f, IRQ_TYPE_IMM_CMD_COMPLETE);
             break;
         case CMD_RESET:
-            spock_log("Reset Command, attention = %d.\n", scsi->attention & 0x0f);
+            scsi->id_connected = 0;
+            spock_log("Reset command, attention=%02x.\n", scsi->attention & 0x0f);
             if ((scsi->attention & 0x0f) == 0x0f) { /*Adapter reset*/
-                for (i = 0; i < 8; i++) {
+                for (i = 0; i < 8; i++)
                     scsi_device_reset(&scsi_devices[scsi->bus][i]);
-                }
 
-                for (i = 6; i > -1; i--) {
-                    if (scsi_device_present(&scsi_devices[scsi->bus][i])) {
-                        spock_log("Adapter Reset, SCSI reset present devices=%d, phys ID=%d, type=%04x.\n", j, scsi->dev_id[i].phys_id, scsi_devices[scsi->bus][i].type);
-                        scsi->present[j] = i;
-                        j++;
-                    } else {
-                        spock_log("Adapter Reset, SCSI reset not present devices=%d, phys ID=%d, type=%04x.\n", j, scsi->dev_id[i].phys_id, scsi_devices[scsi->bus][i].type);
-                    }
-                }
-
-                scsi->scb_state = 0;
-            }
+            } else if ((scsi->attention & 0x0f) < 7) /*Device reset*/
+                scsi_device_reset(&scsi_devices[scsi->bus][scsi->attention & 0x0f]);
 
+            scsi->scb_state = 0;
             spock_set_irq(scsi, scsi->attention & 0x0f, IRQ_TYPE_IMM_CMD_COMPLETE);
             break;
 
@@ -532,23 +527,13 @@ static void
 spock_execute_cmd(spock_t *scsi, scb_t *scb)
 {
     int c;
-    int j = 0;
     int old_scb_state;
 
     if (scsi->in_reset) {
-        spock_log("Reset type = %d\n", scsi->in_reset);
-
         scsi->status &= ~STATUS_BUSY;
-        scsi->irq_status = 0;
 
-        for (c = 0; c < SCSI_ID_MAX; c++)
-            spock_clear_irq(scsi, c);
-
-        if (scsi->in_reset == 1) {
-            scsi->basic_ctrl |= CTRL_IRQ_ENA;
-        }
-
-        spock_set_irq(scsi, 0x0f, IRQ_TYPE_RESET_COMPLETE);
+        scsi->irq_status = 0x0f;
+        spock_rethink_irqs(scsi);
 
         /*Reset device mappings*/
         for (c = 0; c < 7; c++) {
@@ -559,16 +544,7 @@ spock_execute_cmd(spock_t *scsi, scb_t *scb)
             scsi->dev_id[c].phys_id = -1;
 
         scsi->in_reset = 0;
-
-        for (c = 6; c > -1; c--) {
-            if (scsi_device_present(&scsi_devices[scsi->bus][c])) {
-                spock_log("Reset, SCSI reset present devices=%d, phys ID=%d, type=%04x.\n", j, scsi->dev_id[c].phys_id, scsi_devices[scsi->bus][c].type);
-                scsi->present[j] = c;
-                j++;
-            } else {
-                spock_log("Reset, SCSI reset not present devices=%d, phys ID=%d, type=%04x.\n", j, scsi->dev_id[c].phys_id, scsi_devices[scsi->bus][c].type);
-            }
-        }
+        spock_log("Reset.\n");
         return;
     }
 
@@ -586,6 +562,7 @@ spock_execute_cmd(spock_t *scsi, scb_t *scb)
 
         switch (scsi->scb_state) {
             case 0: /* Idle */
+                spock_log("Start Idle.\n");
                 break;
 
             case 1: /* Select */
@@ -678,7 +655,7 @@ spock_execute_cmd(spock_t *scsi, scb_t *scb)
                             get_pos_info->pos  = scsi->spock_16bit ? 0x8efe : 0x8eff;
                             get_pos_info->pos1 = scsi->pos_regs[3] | (scsi->pos_regs[2] << 8);
                             get_pos_info->pos2 = scsi->irq | (scsi->pos_regs[4] << 8);
-                            get_pos_info->pos3 = 1 << 12;
+                            get_pos_info->pos3 = scsi->spock_16bit ? (1 << 12) : (0 << 12);
                             get_pos_info->pos4 = (7 << 8) | 8;
                             get_pos_info->pos5 = (16 << 8) | scsi->pacing;
                             get_pos_info->pos6 = (30 << 8) | 1;
@@ -699,8 +676,15 @@ spock_execute_cmd(spock_t *scsi, scb_t *scb)
                         break;
 
                     case CMD_DEVICE_INQUIRY:
-                        scsi->cdb_id = scsi->assign ? scsi->dev_id[scsi->scb_id].phys_id : scsi->present[scsi->scb_id];
-                        spock_log("Device Inquiry, ID=%d\n", scsi->cdb_id);
+                        if (scsi->scb_id != 15) {
+                            if (scsi->present[scsi->scb_id])
+                                scsi->cdb_id = scsi->dev_id[scsi->scb_id].phys_id;
+                            else
+                                scsi->cdb_id = 0xff;
+                        } else
+                            scsi->cdb_id = scsi->dev_id[scsi->scb_id].phys_id;
+
+                        spock_log("Device Inquiry, ID=%d, connected=%d, present=%d.\n", scsi->cdb_id, scsi->id_connected, scsi->present[scsi->scb_id + 1]);
                         scsi->cdb[0]     = GPCMD_INQUIRY;
                         scsi->cdb[1]     = scsi->dev_id[scsi->scb_id].lun_id << 5; /*LUN*/
                         scsi->cdb[2]     = 0;                                      /*Page code*/
@@ -715,9 +699,16 @@ spock_execute_cmd(spock_t *scsi, scb_t *scb)
                         return;
 
                     case CMD_SEND_OTHER_SCSI:
-                        scsi->cdb_id = scsi->assign ? scsi->dev_id[scsi->scb_id].phys_id : scsi->present[scsi->scb_id];
+                        if (scsi->scb_id != 15) {
+                            if (scsi->present[scsi->scb_id])
+                                scsi->cdb_id = scsi->dev_id[scsi->scb_id].phys_id;
+                            else
+                                scsi->cdb_id = 0xff;
+                        } else
+                            scsi->cdb_id = scsi->dev_id[scsi->scb_id].phys_id;
+
                         dma_bm_read(scsi->scb_addr + 0x18, scsi->cdb, 12, 2);
-                        spock_log("Send Other SCSI, SCB ID=%d, PHYS ID=%d, CDB[0]=%02x, CDB_ID=%d\n", scsi->scb_id, scsi->dev_id[scsi->scb_id].phys_id, scsi->cdb[0], scsi->cdb_id);
+                        spock_log("Send Other SCSI, SCB ID=%d, PHYS ID=%d, LUN=%d, CDB[0]=%02x, CDB_ID=%d, ID Present=%d.\n", scsi->scb_id, scsi->dev_id[scsi->scb_id].phys_id, scsi->dev_id[scsi->scb_id].lun_id, scsi->cdb[0], scsi->cdb_id, scsi->present[scsi->scb_id + 1]);
                         scsi->cdb[1]     = (scsi->cdb[1] & 0x1f) | (scsi->dev_id[scsi->scb_id].lun_id << 5); /*Patch correct LUN into command*/
                         scsi->cdb_len    = (scb->lba_addr & 0xff) ? (scb->lba_addr & 0xff) : 6;
                         scsi->scsi_state = SCSI_STATE_SELECT;
@@ -725,7 +716,14 @@ spock_execute_cmd(spock_t *scsi, scb_t *scb)
                         return;
 
                     case CMD_READ_DEVICE_CAPACITY:
-                        scsi->cdb_id = scsi->assign ? scsi->dev_id[scsi->scb_id].phys_id : scsi->present[scsi->scb_id];
+                        if (scsi->scb_id != 15) {
+                            if (scsi->present[scsi->scb_id])
+                                scsi->cdb_id = scsi->dev_id[scsi->scb_id].phys_id;
+                            else
+                                scsi->cdb_id = 0xff;
+                        } else
+                            scsi->cdb_id = scsi->dev_id[scsi->scb_id].phys_id;
+
                         spock_log("Device Capacity, SCB ID=%d, PHYS ID=%d\n", scsi->scb_id, scsi->dev_id[scsi->scb_id].phys_id);
                         scsi->cdb[0]     = GPCMD_READ_CDROM_CAPACITY;
                         scsi->cdb[1]     = scsi->dev_id[scsi->scb_id].lun_id << 5; /*LUN*/
@@ -743,7 +741,14 @@ spock_execute_cmd(spock_t *scsi, scb_t *scb)
                         return;
 
                     case CMD_READ_DATA:
-                        scsi->cdb_id = scsi->assign ? scsi->dev_id[scsi->scb_id].phys_id : scsi->present[scsi->scb_id];
+                        if (scsi->scb_id != 15) {
+                            if (scsi->present[scsi->scb_id])
+                                scsi->cdb_id = scsi->dev_id[scsi->scb_id].phys_id;
+                            else
+                                scsi->cdb_id = 0xff;
+                        } else
+                            scsi->cdb_id = scsi->dev_id[scsi->scb_id].phys_id;
+
                         spock_log("Device Read Data, SCB ID=%d, PHYS ID=%d\n", scsi->scb_id, scsi->dev_id[scsi->scb_id].phys_id);
                         scsi->cdb[0]     = GPCMD_READ_10;
                         scsi->cdb[1]     = scsi->dev_id[scsi->scb_id].lun_id << 5; /*LUN*/
@@ -761,7 +766,14 @@ spock_execute_cmd(spock_t *scsi, scb_t *scb)
                         return;
 
                     case CMD_WRITE_DATA:
-                        scsi->cdb_id = scsi->assign ? scsi->dev_id[scsi->scb_id].phys_id : scsi->present[scsi->scb_id];
+                        if (scsi->scb_id != 15) {
+                            if (scsi->present[scsi->scb_id])
+                                scsi->cdb_id = scsi->dev_id[scsi->scb_id].phys_id;
+                            else
+                                scsi->cdb_id = 0xff;
+                        } else
+                            scsi->cdb_id = scsi->dev_id[scsi->scb_id].phys_id;
+
                         spock_log("Device Write Data\n");
                         scsi->cdb[0]     = GPCMD_WRITE_10;
                         scsi->cdb[1]     = scsi->dev_id[scsi->scb_id].lun_id << 5; /*LUN*/
@@ -779,7 +791,14 @@ spock_execute_cmd(spock_t *scsi, scb_t *scb)
                         return;
 
                     case CMD_VERIFY:
-                        scsi->cdb_id = scsi->assign ? scsi->dev_id[scsi->scb_id].phys_id : scsi->present[scsi->scb_id];
+                        if (scsi->scb_id != 15) {
+                            if (scsi->present[scsi->scb_id])
+                                scsi->cdb_id = scsi->dev_id[scsi->scb_id].phys_id;
+                            else
+                                scsi->cdb_id = 0xff;
+                        } else
+                            scsi->cdb_id = scsi->dev_id[scsi->scb_id].phys_id;
+
                         spock_log("Device Verify\n");
                         scsi->cdb[0]     = GPCMD_VERIFY_10;
                         scsi->cdb[1]     = scsi->dev_id[scsi->scb_id].lun_id << 5; /*LUN*/
@@ -797,8 +816,40 @@ spock_execute_cmd(spock_t *scsi, scb_t *scb)
                         scsi->scb_state  = 2;
                         return;
 
+                    case CMD_WRITE_VERIFY:
+                        if (scsi->scb_id != 15) {
+                            if (scsi->present[scsi->scb_id])
+                                scsi->cdb_id = scsi->dev_id[scsi->scb_id].phys_id;
+                            else
+                                scsi->cdb_id = 0xff;
+                        } else
+                            scsi->cdb_id = scsi->dev_id[scsi->scb_id].phys_id;
+
+                        spock_log("Device Write with Verify\n");
+                        scsi->cdb[0]     = GPCMD_WRITE_AND_VERIFY_10;
+                        scsi->cdb[1]     = scsi->dev_id[scsi->scb_id].lun_id << 5; /*LUN*/
+                        scsi->cdb[2]     = (scb->lba_addr >> 24) & 0xff;           /*LBA*/
+                        scsi->cdb[3]     = (scb->lba_addr >> 16) & 0xff;
+                        scsi->cdb[4]     = (scb->lba_addr >> 8) & 0xff;
+                        scsi->cdb[5]     = scb->lba_addr & 0xff;
+                        scsi->cdb[6]     = 0; /*Reserved*/
+                        scsi->cdb[7]     = (scb->block_count >> 8) & 0xff;
+                        scsi->cdb[8]     = scb->block_count & 0xff;
+                        scsi->cdb[9]     = 0; /*Control*/
+                        scsi->cdb_len    = 10;
+                        scsi->scsi_state = SCSI_STATE_SELECT;
+                        scsi->scb_state  = 2;
+                        return;
+
                     case CMD_REQUEST_SENSE:
-                        scsi->cdb_id = scsi->assign ? scsi->dev_id[scsi->scb_id].phys_id : scsi->present[scsi->scb_id];
+                        if (scsi->scb_id != 15) {
+                            if (scsi->present[scsi->scb_id])
+                                scsi->cdb_id = scsi->dev_id[scsi->scb_id].phys_id;
+                            else
+                                scsi->cdb_id = 0xff;
+                        } else
+                            scsi->cdb_id = scsi->dev_id[scsi->scb_id].phys_id;
+
                         spock_log("Device Request Sense, ID=%d\n", scsi->cdb_id);
                         scsi->cdb[0]     = GPCMD_REQUEST_SENSE;
                         scsi->cdb[1]     = scsi->dev_id[scsi->scb_id].lun_id << 5; /*LUN*/
@@ -818,10 +869,10 @@ spock_execute_cmd(spock_t *scsi, scb_t *scb)
 
             case 2: /* Wait */
                 if (scsi->scsi_state == SCSI_STATE_IDLE) {
-                    if (scsi_device_present(&scsi_devices[scsi->bus][scsi->cdb_id])) {
+                    if (scsi_device_present(&scsi_devices[scsi->bus][scsi->cdb_id]) && (scsi->cdb_id != 0xff)) {
                         if (scsi->last_status == SCSI_STATUS_OK) {
                             scsi->scb_state = 3;
-                            spock_log("Status is Good on device ID %d, cdb id = %d.\n", scsi->scb_id, scsi->cdb_id);
+                            spock_log("Status is Good on device ID %d, cdb id = %d, devsel = %d.\n", scsi->scb_id, scsi->cdb_id, scsi->attention & 0x0f);
                         } else if (scsi->last_status == SCSI_STATUS_CHECK_CONDITION) {
                             uint16_t term_stat_block_addr7 = (0xc << 8) | 2;
                             uint16_t term_stat_block_addr8 = 0x20;
@@ -856,7 +907,7 @@ spock_execute_cmd(spock_t *scsi, scb_t *scb)
                 } else {
                     spock_set_irq(scsi, scsi->scb_id, IRQ_TYPE_SCB_COMPLETE);
                     scsi->scb_state = 0;
-                    spock_log("Complete SCB ID = %d.\n", scsi->attention & 0x0f);
+                    spock_log("Complete SCB ID = %d.\n", scsi->scb_id);
                 }
                 break;
 
@@ -878,7 +929,7 @@ spock_process_scsi(spock_t *scsi, scb_t *scb)
 
         case SCSI_STATE_SELECT:
             spock_log("Selecting ID %d, SCB ID %d, LUN %d, adapter id = %d.\n", scsi->cdb_id, scsi->scb_id, scsi->dev_id[scsi->scb_id].lun_id, scsi->attention);
-            if ((scsi->cdb_id != (uint8_t) -1) && scsi_device_present(&scsi_devices[scsi->bus][scsi->cdb_id])) {
+            if ((scsi->cdb_id != 0xff) && scsi_device_present(&scsi_devices[scsi->bus][scsi->cdb_id])) {
                 scsi->scsi_state = SCSI_STATE_SEND_COMMAND;
                 spock_log("Device selected at ID %i.\n", scsi->cdb_id);
             } else {
@@ -893,6 +944,7 @@ spock_process_scsi(spock_t *scsi, scb_t *scb)
             break;
 
         case SCSI_STATE_SEND_COMMAND:
+            spock_log("Send Command ID=%d.\n", scsi->cdb_id);
             sd = &scsi_devices[scsi->bus][scsi->cdb_id];
             memset(scsi->temp_cdb, 0x00, 12);
 
@@ -914,8 +966,10 @@ spock_process_scsi(spock_t *scsi, scb_t *scb)
             else
                 sd->buffer_length = spock_get_len(scsi, scb);
 
+            scsi_device_identify(sd, scsi->temp_cdb[1] >> 5);
+
             scsi_device_command_phase0(sd, scsi->temp_cdb);
-            spock_log("SCSI ID %i: Current CDB[0] = %02x, LUN = %i, data len = %i, max len = %i, phase val = %02x\n", scsi->cdb_id, scsi->temp_cdb[0], scsi->temp_cdb[1] >> 5, sd->buffer_length, spock_get_len(scsi, scb), sd->phase);
+            spock_log("SCSI ID %i: Current CDB[0]=%02x, LUN=%i, buffer len=%i, max len=%i, phase val=%02x, data len=%d, enable bit 10=%03x\n", scsi->cdb_id, scsi->temp_cdb[0], scsi->temp_cdb[1] >> 5, sd->buffer_length, spock_get_len(scsi, scb), sd->phase, scsi->data_len, scb->enable & 0x400);
 
             if ((sd->phase != SCSI_PHASE_STATUS) && (sd->buffer_length > 0)) {
                 p = scsi_device_get_callback(sd);
@@ -954,9 +1008,9 @@ spock_process_scsi(spock_t *scsi, scb_t *scb)
                     }
                 } else {
                     spock_log("Normal Transfer\n");
-                    if (sd->phase == SCSI_PHASE_DATA_IN) {
+                    if (sd->phase == SCSI_PHASE_DATA_IN)
                         dma_bm_write(scsi->data_ptr, sd->sc->temp_buffer, MIN(sd->buffer_length, (int) scsi->data_len), 2);
-                    } else if (sd->phase == SCSI_PHASE_DATA_OUT)
+                    else if (sd->phase == SCSI_PHASE_DATA_OUT)
                         dma_bm_read(scsi->data_ptr, sd->sc->temp_buffer, MIN(sd->buffer_length, (int) scsi->data_len), 2);
                 }
 
@@ -967,8 +1021,12 @@ spock_process_scsi(spock_t *scsi, scb_t *scb)
             break;
 
         case SCSI_STATE_END_PHASE:
+            sd = &scsi_devices[scsi->bus][scsi->cdb_id];
             scsi->scsi_state = SCSI_STATE_IDLE;
 
+            if (sd->type != SCSI_NONE)
+                scsi_device_identify(sd, SCSI_LUN_USE_CDB);
+
             spock_log("State to idle, cmd timer %d\n", scsi->cmd_timer);
             if (!scsi->cmd_timer)
                 scsi->cmd_timer = 1;
@@ -990,12 +1048,11 @@ spock_callback(void *priv)
 
     if (scsi->cmd_timer) {
         scsi->cmd_timer--;
-        if (!scsi->cmd_timer) {
+        if (!scsi->cmd_timer)
             spock_execute_cmd(scsi, scb);
-        }
     }
 
-    if (scsi->attention_wait && (scsi->scb_state == 0 || (scsi->attention_pending & 0xf0) == 0xe0)) {
+    if (scsi->attention_wait && ((scsi->scb_state == 0) || (scsi->attention_pending & 0xf0) == 0xe0)) {
         scsi->attention_wait--;
         if (!scsi->attention_wait) {
             scsi->attention = scsi->attention_pending;
@@ -1029,10 +1086,10 @@ spock_callback(void *priv)
                 case 4:
                 case 0x0f: /*Start SCB*/
                     scsi->cmd_status = 1;
-                    scsi->scb_addr   = scsi->cir[0] | (scsi->cir[1] << 8) | (scsi->cir[2] << 16) | (scsi->cir[3] << 24);
-                    scsi->scb_id     = scsi->attention & 0x0f;
+                    scsi->scb_addr = scsi->cir[0] | (scsi->cir[1] << 8) | (scsi->cir[2] << 16) | (scsi->cir[3] << 24);
+                    scsi->scb_id = scsi->attention & 0x0f;
                     scsi->cmd_timer  = SPOCK_TIME * 2;
-                    spock_log("Start SCB at ID = %d, attention = %02x\n", scsi->scb_id, scsi->attention >> 4);
+                    spock_log("Start SCB at ID = %d, attention = %02x, cdb_id = %d\n", scsi->scb_id, scsi->attention >> 4, scsi->cdb_id);
                     scsi->scb_state = 1;
                     break;
 
@@ -1044,6 +1101,7 @@ spock_callback(void *priv)
 
                 case 0x0e: /*EOI*/
                     scsi->irq_status = 0;
+                    scsi->status &= ~STATUS_IRQ;
                     spock_clear_irq(scsi, scsi->attention & 0x0f);
                     break;
 
@@ -1068,21 +1126,30 @@ spock_mca_write(int port, uint8_t val, void *priv)
     if (port < 0x102)
         return;
 
-    io_removehandler((((scsi->pos_regs[2] >> 1) & 7) * 8) + 0x3540, 0x0008, spock_read, spock_readw, NULL, spock_write, spock_writew, NULL, scsi);
+    io_removehandler((((scsi->pos_regs[2] >> 1) & 7) << 3) + 0x3540, 0x0008, spock_read, spock_readw, NULL, spock_write, spock_writew, NULL, scsi);
     mem_mapping_disable(&scsi->bios_rom.mapping);
 
     scsi->pos_regs[port & 7] = val;
 
     scsi->adapter_id = (scsi->pos_regs[3] & 0xe0) >> 5;
 
-    if (scsi->pos_regs[2] & 1) {
-        io_sethandler((((scsi->pos_regs[2] >> 1) & 7) * 8) + 0x3540, 0x0008, spock_read, spock_readw, NULL, spock_write, spock_writew, NULL, scsi);
-        if ((scsi->pos_regs[2] & 0xf0) != 0xf0) {
-            mem_mapping_set_addr(&scsi->bios_rom.mapping, ((scsi->pos_regs[2] >> 4) * 0x2000) + 0xc0000, 0x8000);
-            mem_mapping_enable(&scsi->bios_rom.mapping);
+    if (scsi->pos_regs[2] & 0x01) {
+        io_sethandler((((scsi->pos_regs[2] >> 1) & 7) << 3) + 0x3540, 0x0008, spock_read, spock_readw, NULL, spock_write, spock_writew, NULL, scsi);
+        if (scsi->pos_regs[4] & 0x02) {
+            if (scsi->pos_regs[4] & 0x80) {
+                if (((scsi->pos_regs[2] >> 4) & 0x0f) != 0x0f) {
+                    mem_mapping_set_addr(&scsi->bios_rom.mapping, ((scsi->pos_regs[2] >> 4) * 0x2000) + 0xc0000, 0x8000);
+                    mem_mapping_enable(&scsi->bios_rom.mapping);
+                }
+            } else {
+                if (((scsi->pos_regs[2] >> 4) & 0x0f) != 0x0f) {
+                    mem_mapping_set_addr(&scsi->bios_rom.mapping, ((scsi->pos_regs[2] >> 4) * 0x2000) + 0xc0000, 0x4000);
+                    mem_mapping_enable(&scsi->bios_rom.mapping);
+                }
+            }
         }
     }
-    spock_log("[%04X:%08X]: POS Write Port = %x, val = %02x, rom addr = %05x\n", CS, cpu_state.pc, port & 7, val, ((scsi->pos_regs[2] >> 4) * 0x2000) + 0xc0000);
+    spock_log("%04X:%08X: POS Write Port=%x, val=%02x.\n", CS, cpu_state.pc, port & 7, val);
 }
 
 static uint8_t
@@ -1090,7 +1157,7 @@ spock_mca_read(int port, void *priv)
 {
     const spock_t *scsi = (spock_t *) priv;
 
-    spock_log("[%04X:%08X]: POS Read Port = %x, val = %02x\n", CS, cpu_state.pc,
+    spock_log("%04X:%08X: POS Read Port=%x, temp=%02x.\n", CS, cpu_state.pc,
             port & 7, scsi->pos_regs[port & 7]);
     return scsi->pos_regs[port & 7];
 }
@@ -1103,12 +1170,13 @@ spock_mca_feedb(void *priv)
     return (scsi->pos_regs[2] & 0x01);
 }
 
+
 static void
-spock_mca_reset(void *priv)
+spock_reset(void *priv)
 {
     spock_t *scsi = (spock_t *) priv;
 
-    scsi->in_reset       = 2;
+    scsi->in_reset       = 1;
     scsi->cmd_timer      = SPOCK_TIME * 50;
     scsi->status         = STATUS_BUSY;
     scsi->scsi_state     = SCSI_STATE_IDLE;
@@ -1116,23 +1184,26 @@ spock_mca_reset(void *priv)
     scsi->in_invalid     = 0;
     scsi->attention_wait = 0;
     scsi->basic_ctrl     = 0;
+    scsi->id_connected   = 0;
 
-    /* Reset all devices on controller reset. */
-    for (uint8_t i = 0; i < 8; i++) {
-        scsi_device_reset(&scsi_devices[scsi->bus][i]);
-        scsi->present[i] = 0;
-    }
+    spock_log("Actual Reset.\n");
+}
 
-    spock_log("Reset.\n");
+static void
+spock_mca_reset(void *priv)
+{
+    spock_t *scsi = (spock_t *) priv;
+
+    spock_reset(scsi);
     mem_mapping_disable(&scsi->bios_rom.mapping);
+    scsi->pos_regs[4] = 0x02;
     spock_mca_write(0x102, 0, scsi);
 }
 
 static void *
 spock_init(const device_t *info)
 {
-    spock_t *scsi = malloc(sizeof(spock_t));
-    memset(scsi, 0x00, sizeof(spock_t));
+    spock_t *scsi = calloc(1, sizeof(spock_t));
 
     scsi->bus = scsi_get_bus();
 
@@ -1158,12 +1229,9 @@ spock_init(const device_t *info)
 
     scsi->pos_regs[0] = scsi->spock_16bit ? 0xfe : 0xff;
     scsi->pos_regs[1] = 0x8e;
+    scsi->pos_regs[4] = 0x02;
     mca_add(spock_mca_read, spock_mca_write, spock_mca_feedb, spock_mca_reset, scsi);
 
-    scsi->in_reset  = 2;
-    scsi->cmd_timer = SPOCK_TIME * 50;
-    scsi->status    = STATUS_BUSY;
-
     for (uint8_t c = 0; c < (SCSI_ID_MAX - 1); c++)
         scsi->dev_id[c].phys_id = -1;
 
@@ -1177,6 +1245,8 @@ spock_init(const device_t *info)
 
     scsi_bus_set_speed(scsi->bus, 5000000.0);
 
+    spock_reset(scsi);
+
     return scsi;
 }
 
@@ -1200,18 +1270,19 @@ spock_available(void)
 static const device_config_t spock_rom_config[] = {
   // clang-format off
     {
-        .name = "bios_ver",
-        .description = "BIOS Version",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 1,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
+        .name           = "bios_ver",
+        .description    = "BIOS Revision",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
             { .description = "1991 BIOS (>1GB)", .value = 1 },
             { .description = "1990 BIOS",        .value = 0 },
             { .description = ""                             }
         },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -1224,8 +1295,8 @@ const device_t spock_device = {
     .local         = 0,
     .init          = spock_init,
     .close         = spock_close,
-    .reset         = NULL,
-    { .available = spock_available },
+    .reset         = spock_reset,
+    .available     = spock_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = spock_rom_config
@@ -1238,8 +1309,8 @@ const device_t tribble_device = {
     .local         = 1,
     .init          = spock_init,
     .close         = spock_close,
-    .reset         = NULL,
-    { .available = spock_available },
+    .reset         = spock_reset,
+    .available     = spock_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = spock_rom_config
diff --git a/src/scsi/scsi_t128.c b/src/scsi/scsi_t128.c
new file mode 100644
index 000000000..e2f963900
--- /dev/null
+++ b/src/scsi/scsi_t128.c
@@ -0,0 +1,642 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the Trantor 128/228 series of SCSI Host Adapters
+ *          made by Trantor. These controllers were designed for the ISA and MCA bus.
+ *
+ *
+ *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          TheCollector1995, <mariogplayer@gmail.com>
+ *          Fred N. van Kempen, <decwiz@yahoo.com>
+ *
+ *          Copyright 2017-2019 Sarah Walker.
+ *          Copyright 2017-2019 Fred N. van Kempen.
+ *          Copyright 2017-2024 TheCollector1995.
+ */
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/io.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/dma.h>
+#include <86box/pic.h>
+#include <86box/mca.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/device.h>
+#include <86box/nvr.h>
+#include <86box/plat.h>
+#include <86box/scsi.h>
+#include <86box/scsi_device.h>
+#include <86box/scsi_ncr5380.h>
+#include <86box/scsi_t128.h>
+
+#define T128_ROM                "roms/scsi/ncr5380/trantor_t128_bios_v1.12.bin"
+
+#ifdef ENABLE_T128_LOG
+int t128_do_log = ENABLE_T128_LOG;
+
+static void
+t128_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (t128_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define t128_log(fmt, ...)
+#endif
+
+/* Memory-mapped I/O WRITE handler. */
+void
+t128_write(uint32_t addr, uint8_t val, void *priv)
+{
+    t128_t              *t128    = (t128_t *) priv;
+    ncr_t               *ncr     = &t128->ncr;
+    scsi_bus_t          *scsi_bus = &ncr->scsibus;
+    const scsi_device_t *dev     = &scsi_devices[ncr->bus][scsi_bus->target_id];
+
+    addr &= 0x3fff;
+    if ((addr >= 0x1800) && (addr < 0x1880))
+        t128->ext_ram[addr & 0x7f] = val;
+    else if ((addr >= 0x1c00) && (addr < 0x1c20)) {
+        t128_log("T128 ctrl write=%02x, mode=%02x.\n", val, ncr->mode & MODE_DMA);
+        t128->ctrl = val;
+    } else if ((addr >= 0x1d00) && (addr < 0x1e00))
+        ncr5380_write((addr - 0x1d00) >> 5, val, ncr);
+    else if ((addr >= 0x1e00) && (addr < 0x2000)) {
+        if ((t128->host_pos < MIN(512, dev->buffer_length)) &&
+            (scsi_bus->tx_mode == DMA_OUT_TX_BUS)) {
+            t128->buffer[t128->host_pos] = val;
+            t128->host_pos++;
+
+            t128_log("T128 Write transfer: pos=%i, addr=%x.\n",
+                    t128->host_pos, addr & 0x1ff);
+
+            if (t128->host_pos == MIN(512, dev->buffer_length)) {
+                t128_log("T128 Transfer busy write, status=%02x, period=%lf, enabled=%d, loaded=%d.\n",
+                        t128->status, scsi_bus->period, timer_is_enabled(&t128->timer), t128->block_loaded);
+
+                t128->status &= ~0x04;
+                timer_on_auto(&t128->timer, 1.0);
+            }
+        } else
+            t128_log("Write not allowed.\n");
+    }
+}
+
+/* Memory-mapped I/O READ handler. */
+uint8_t
+t128_read(uint32_t addr, void *priv)
+{
+    t128_t        *t128    = (t128_t *) priv;
+    ncr_t         *ncr     = &t128->ncr;
+    scsi_bus_t    *scsi_bus = &ncr->scsibus;
+    scsi_device_t *dev     = &scsi_devices[ncr->bus][scsi_bus->target_id];
+    uint8_t        ret     = 0xff;
+
+    addr &= 0x3fff;
+    if (t128->bios_enabled && (addr >= 0) && (addr < 0x1800))
+        ret = t128->bios_rom.rom[addr & 0x1fff];
+    else if ((addr >= 0x1800) && (addr < 0x1880))
+        ret = t128->ext_ram[addr & 0x7f];
+    else if ((addr >= 0x1c00) && (addr < 0x1c20)) {
+        ret = t128->ctrl;
+        t128_log("T128 ctrl read=%02x, dma=%02x, load=%d, cnt=%d.\n", ret, ncr->mode & MODE_DMA, t128->block_loaded, t128->block_count);
+    } else if ((addr >= 0x1c20) && (addr < 0x1c40)) {
+        ret = t128->status;
+        t128_log("T128 status read=%02x, dma=%02x, blockload=%d, timer=%d.\n", ret, ncr->mode & MODE_DMA, t128->block_loaded, timer_is_enabled(&t128->timer));
+    } else if ((addr >= 0x1d00) && (addr < 0x1e00))
+        ret = ncr5380_read((addr - 0x1d00) >> 5, ncr);
+    else if (addr >= 0x1e00 && addr < 0x2000) {
+        if ((scsi_bus->tx_mode == DMA_IN_TX_BUS) &&
+            (t128->host_pos < MIN(512, dev->buffer_length))) {
+            ret = t128->buffer[t128->host_pos++];
+
+            t128_log("T128 Read transfer: pos=%i, addr=%x, enabled timer=%d.\n",
+                    t128->host_pos, addr & 0x1ff, timer_is_enabled(&t128->timer));
+
+            if (t128->host_pos == MIN(512, dev->buffer_length)) {
+                t128_log("T128 Transfer busy read, status=%02x, period=%lf, enabled=%d, block=%d.\n",
+                        t128->status, scsi_bus->period, timer_is_enabled(&t128->timer), scsi_bus->data_pos);
+
+                t128->status &= ~0x04;
+                if (!t128->block_loaded) {
+                    ncr->isr |= STATUS_END_OF_DMA;
+                    if (ncr->mode & MODE_ENA_EOP_INT) {
+                        t128_log("T128 read irq\n");
+                        ncr5380_irq(ncr, 1);
+                    }
+                    scsi_bus->bus_out |= BUS_CD;
+                    scsi_bus->tx_mode = PIO_TX_BUS;
+                    timer_stop(&t128->timer);
+                } else if (!timer_is_enabled(&t128->timer))
+                    timer_on_auto(&t128->timer, 1.0);
+            }
+        } else {
+            /*According to the WinNT DDK sources, just get the status timeout bit from here.*/
+            if (!(t128->status & 0x02))
+                t128->status |= 0x02;
+
+            t128_log("Read not allowed.\n");
+        }
+    }
+
+    return ret;
+}
+
+static void
+t128_dma_mode_ext(void *priv, void *ext_priv, uint8_t val)
+{
+    t128_t      *t128   = (t128_t *) ext_priv;
+    ncr_t       *ncr    = (ncr_t *) priv;
+    scsi_bus_t  *scsi_bus = &ncr->scsibus;
+
+    /*When a pseudo-DMA transfer has completed (Send or Initiator Receive), mark it as complete and idle the status*/
+    if (!t128->block_loaded) {
+        if (!(val & MODE_DMA)) {
+            ncr->tcr &= ~TCR_LAST_BYTE_SENT;
+            ncr->isr &= ~STATUS_END_OF_DMA;
+            scsi_bus->tx_mode = PIO_TX_BUS;
+            t128_log("End of DMA.\n");
+        }
+    }
+}
+
+static int
+t128_dma_send_ext(void *priv, void *ext_priv)
+{
+    t128_t          *t128   = (t128_t *) ext_priv;
+    ncr_t           *ncr    = (ncr_t *) priv;
+    scsi_bus_t      *scsi_bus = &ncr->scsibus;
+    scsi_device_t   *dev    = &scsi_devices[ncr->bus][scsi_bus->target_id];
+
+    if ((ncr->mode & MODE_DMA) && (dev->buffer_length > 0)) {
+        t128_log("T128 DMA OUT, len=%d.\n", dev->buffer_length);
+        memset(t128->buffer, 0, MIN(512, dev->buffer_length));
+        t128->host_pos = 0;
+
+        t128->block_loaded = 1;
+        t128->status |= 0x04;
+    }
+    return 1;
+}
+
+static int
+t128_dma_initiator_receive_ext(void *priv, void *ext_priv)
+{
+    t128_t          *t128   = (t128_t *) ext_priv;
+    ncr_t           *ncr    = (ncr_t *) priv;
+    scsi_bus_t      *scsi_bus = &ncr->scsibus;
+    scsi_device_t   *dev    = &scsi_devices[ncr->bus][scsi_bus->target_id];
+
+    if ((ncr->mode & MODE_DMA) && (dev->buffer_length > 0)) {
+        t128_log("T128 DMA IN, len=%d.\n", dev->buffer_length);
+        memset(t128->buffer, 0, MIN(512, dev->buffer_length));
+        t128->host_pos = MIN(512, dev->buffer_length);
+
+        t128->block_loaded = 1;
+        t128->status &= ~0x04;
+        timer_on_auto(&t128->timer, 10.0);
+    }
+    return 1;
+}
+
+static void
+t128_timer_on_auto(void *ext_priv, double period)
+{
+    t128_t          *t128   = (t128_t *) ext_priv;
+
+    if (period <= 0.0)
+        timer_stop(&t128->timer);
+    else if ((period > 0.0) && !timer_is_enabled(&t128->timer))
+        timer_on_auto(&t128->timer, period);
+}
+
+void
+t128_callback(void *priv)
+{
+    t128_t         *t128       = (t128_t *) priv;
+    ncr_t          *ncr        = &t128->ncr;
+    scsi_bus_t     *scsi_bus   = &ncr->scsibus;
+    scsi_device_t  *dev        = &scsi_devices[ncr->bus][scsi_bus->target_id];
+    int             bus;
+    uint8_t         c;
+    uint8_t         temp;
+    uint8_t         status;
+    double          period     = scsi_bus->period / 60.0;
+
+    if (scsi_bus->tx_mode != PIO_TX_BUS) {
+        if (period >= 10.0)
+            timer_on_auto(&t128->timer, period);
+        else
+            timer_on_auto(&t128->timer, 10.0);
+    }
+
+    if (scsi_bus->data_wait & 1) {
+        scsi_bus->clear_req = 3;
+        scsi_bus->data_wait &= ~1;
+    }
+
+    if (scsi_bus->tx_mode == PIO_TX_BUS) {
+        t128_log("Timer CMD=%02x.\n", scsi_bus->command[0]);
+        return;
+    }
+
+    switch (scsi_bus->tx_mode) {
+        case DMA_OUT_TX_BUS:
+            if (t128->host_pos < MIN(512, dev->buffer_length))
+                break;
+
+            if (!t128->block_loaded)
+                break;
+
+            while (1) {
+                for (c = 0; c < 10; c++) {
+                    status = scsi_bus_read(scsi_bus);
+                    if (status & BUS_REQ)
+                        break;
+                }
+
+                /* Data ready. */
+                temp = t128->buffer[t128->pos];
+
+                bus = ncr5380_get_bus_host(ncr) & ~BUS_DATAMASK;
+                bus |= BUS_SETDATA(temp);
+
+                scsi_bus_update(scsi_bus, bus | BUS_ACK);
+                scsi_bus_update(scsi_bus, bus & ~BUS_ACK);
+
+                t128->pos++;
+                t128_log("T128 Buffer pos for writing = %d\n", t128->pos);
+
+                if (t128->pos == MIN(512, dev->buffer_length)) {
+                    t128->status |= 0x04;
+                    t128->status &= ~0x02;
+                    t128->pos = 0;
+                    t128->host_pos = 0;
+                    t128_log("T128 Remaining blocks to be written=%d\n", t128->block_count);
+                    if (scsi_bus->data_pos >= dev->buffer_length) {
+                        t128->block_loaded = 0;
+                        ncr->tcr |= TCR_LAST_BYTE_SENT;
+                        ncr->isr |= STATUS_END_OF_DMA;
+                        if (ncr->mode & MODE_ENA_EOP_INT) {
+                            t128_log("T128 write irq\n");
+                            ncr5380_irq(ncr, 1);
+                        }
+                        scsi_bus->tx_mode = PIO_TX_BUS;
+                        timer_stop(&t128->timer);
+                        t128_log("IO End of write transfer\n");
+                    }
+                    break;
+                }
+            }
+            break;
+
+        case DMA_IN_TX_BUS:
+            if (t128->host_pos < MIN(512, dev->buffer_length))
+                break;
+
+            if (!t128->block_loaded)
+                break;
+
+            while (1) {
+                for (c = 0; c < 10; c++) {
+                    status = scsi_bus_read(scsi_bus);
+                    if (status & BUS_REQ)
+                        break;
+                }
+                /* Data ready. */
+                bus = scsi_bus_read(scsi_bus);
+                temp = BUS_GETDATA(bus);
+
+                bus = ncr5380_get_bus_host(ncr);
+
+                scsi_bus_update(scsi_bus, bus | BUS_ACK);
+                scsi_bus_update(scsi_bus, bus & ~BUS_ACK);
+
+                t128->buffer[t128->pos++] = temp;
+                t128_log("T128 Buffer pos for reading = %d\n", t128->pos);
+
+                if (t128->pos == MIN(512, dev->buffer_length)) {
+                    t128->status |= 0x04;
+                    t128->status &= ~0x02;
+                    t128->pos      = 0;
+                    t128->host_pos = 0;
+                    t128_log("T128 blocks read=%d, total len=%d\n", scsi_bus->data_pos, dev->buffer_length);
+                    if (scsi_bus->data_pos >= dev->buffer_length) {
+                        scsi_bus->bus_out |= BUS_REQ;
+                        t128->block_loaded = 0;
+                        timer_on_auto(&t128->timer, 10.0);
+                        t128_log("IO End of read transfer\n");
+                    }
+                    break;
+                }
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    status = scsi_bus_read(scsi_bus);
+
+    if (!(status & BUS_BSY) && (ncr->mode & MODE_MONITOR_BUSY)) {
+        t128_log("Updating DMA\n");
+        ncr->mode &= ~MODE_DMA;
+        scsi_bus->tx_mode = PIO_TX_BUS;
+        t128->block_loaded = 0;
+    }
+}
+
+static uint8_t
+t228_read(int port, void *priv)
+{
+    const t128_t *t128 = (t128_t *) priv;
+
+    return (t128->pos_regs[port & 7]);
+}
+
+static void
+t228_write(int port, uint8_t val, void *priv)
+{
+    t128_t *t128 = (t128_t *) priv;
+    ncr_t  *ncr  = &t128->ncr;
+
+    /* MCA does not write registers below 0x0100. */
+    if (port < 0x0102)
+        return;
+
+    mem_mapping_disable(&t128->bios_rom.mapping);
+    mem_mapping_disable(&t128->mapping);
+
+    /* Save the MCA register value. */
+    t128->pos_regs[port & 7] = val;
+
+    if (t128->pos_regs[2] & 1) {
+        switch (t128->pos_regs[2] & 6) {
+            case 0:
+                t128->rom_addr = 0xcc000;
+                break;
+            case 2:
+                t128->rom_addr = 0xc8000;
+                break;
+            case 4:
+                t128->rom_addr = 0xdc000;
+                break;
+            case 6:
+                t128->rom_addr = 0xd8000;
+                break;
+
+            default:
+                break;
+        }
+
+        t128->bios_enabled = !(t128->pos_regs[2] & 8);
+
+        switch (t128->pos_regs[2] & 0x70) {
+            case 0:
+                ncr->irq = -1;
+                break;
+            case 0x10:
+                ncr->irq = 3;
+                break;
+            case 0x20:
+                ncr->irq = 5;
+                break;
+            case 0x30:
+                ncr->irq = 7;
+                break;
+            case 0x40:
+                ncr->irq = 10;
+                break;
+            case 0x50:
+                ncr->irq = 12;
+                break;
+            case 0x60:
+                ncr->irq = 14;
+                break;
+            case 0x70:
+                ncr->irq = 15;
+                break;
+
+            default:
+                break;
+        }
+
+        if (t128->bios_enabled) {
+            t128->status &= ~0x80;
+            mem_mapping_set_addr(&t128->bios_rom.mapping, t128->rom_addr, 0x4000);
+            mem_mapping_set_addr(&t128->mapping, t128->rom_addr, 0x4000);
+        } else
+            t128->status |= 0x80;
+    }
+}
+
+static uint8_t
+t228_feedb(void *priv)
+{
+    const t128_t *t128 = (t128_t *) priv;
+
+    return t128->pos_regs[2] & 1;
+}
+
+static void *
+t128_init(const device_t *info)
+{
+    t128_t      *t128 = calloc(1, sizeof(t128_t));
+    ncr_t       *ncr  = &t128->ncr;
+    scsi_bus_t  *scsi_bus;
+
+    ncr->bus = scsi_get_bus();
+    scsi_bus = &ncr->scsibus;
+    t128->type = info->local;
+
+    if (info->flags & DEVICE_MCA) {
+        rom_init(&t128->bios_rom, T128_ROM,
+                 0xd8000, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL);
+        mem_mapping_add(&t128->mapping, 0xd8000, 0x4000,
+                        t128_read, NULL, NULL,
+                        t128_write, NULL, NULL,
+                        t128->bios_rom.rom, MEM_MAPPING_EXTERNAL, t128);
+        mem_mapping_disable(&t128->bios_rom.mapping);
+        t128->pos_regs[0]   = 0x8c;
+        t128->pos_regs[1]   = 0x50;
+        mca_add(t228_read, t228_write, t228_feedb, NULL, t128);
+    } else if (info->local == 0) {
+        ncr->irq            = device_get_config_int("irq");
+        t128->rom_addr      = device_get_config_hex20("bios_addr");
+        t128->bios_enabled  = device_get_config_int("boot");
+        if (t128->bios_enabled)
+            rom_init(&t128->bios_rom, T128_ROM,
+                     t128->rom_addr, 0x4000, 0x3fff, 0, MEM_MAPPING_EXTERNAL);
+
+        mem_mapping_add(&t128->mapping, t128->rom_addr, 0x4000,
+                        t128_read, NULL, NULL,
+                        t128_write, NULL, NULL,
+                        t128->bios_rom.rom, MEM_MAPPING_EXTERNAL, t128);
+    }
+
+    ncr->priv                       = t128;
+    ncr->dma_mode_ext               = t128_dma_mode_ext;
+    ncr->dma_send_ext               = t128_dma_send_ext;
+    ncr->dma_initiator_receive_ext  = t128_dma_initiator_receive_ext;
+    ncr->timer                      = t128_timer_on_auto;
+    scsi_bus->bus_device            = ncr->bus;
+    scsi_bus->timer                 = ncr->timer;
+    scsi_bus->priv                  = ncr->priv;
+    t128->status                    = 0x00;
+    t128->host_pos                  = 512;
+    if (!t128->bios_enabled && !(info->flags & DEVICE_MCA))
+        t128->status                |= 0x80;
+
+    if (info->flags & DEVICE_MCA)
+        t128->status                |= 0x08;
+
+    if (info->local == 0)
+        timer_add(&t128->timer, t128_callback, t128, 0);
+
+    scsi_bus_set_speed(ncr->bus, 5000000.0);
+    scsi_bus->speed = 0.2;
+    scsi_bus->divider = 1.0;
+    scsi_bus->multi = 1.0;
+
+    for (int i = 0; i < 8; i++)
+        scsi_device_reset(&scsi_devices[ncr->bus][i]);
+
+    return t128;
+}
+
+static void
+t128_close(void *priv)
+{
+    t128_t *t128 = (t128_t *) priv;
+
+    if (t128) {
+        /* Tell the timer to terminate. */
+        timer_stop(&t128->timer);
+
+        free(t128);
+        t128 = NULL;
+    }
+}
+
+static int
+t128_available(void)
+{
+    return (rom_present(T128_ROM));
+}
+
+// clang-format off
+static const device_config_t t128_config[] = {
+    {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xD8000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "C800H", .value = 0xc8000 },
+            { .description = "CC00H", .value = 0xcc000 },
+            { .description = "D800H", .value = 0xd8000 },
+            { .description = "DC00H", .value = 0xdc000 },
+            { .description = ""                        }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",  .value = -1 },
+            { .description = "IRQ 3", .value = 3 },
+            { .description = "IRQ 5", .value = 5 },
+            { .description = "IRQ 7", .value = 7 },
+            { .description = "IRQ 10", .value = 10 },
+            { .description = "IRQ 12", .value = 12 },
+            { .description = "IRQ 14", .value = 14 },
+            { .description = "IRQ 15", .value = 15 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "boot",
+        .description    = "Enable BIOS",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+// clang-format on
+
+const device_t scsi_t128_device = {
+    .name          = "Trantor T128",
+    .internal_name = "t128",
+    .flags         = DEVICE_ISA,
+    .local         = 0,
+    .init          = t128_init,
+    .close         = t128_close,
+    .reset         = NULL,
+    .available     = t128_available,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = t128_config
+};
+
+const device_t scsi_t228_device = {
+    .name          = "Trantor T228",
+    .internal_name = "t228",
+    .flags         = DEVICE_MCA,
+    .local         = 0,
+    .init          = t128_init,
+    .close         = t128_close,
+    .reset         = NULL,
+    .available     = t128_available,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t scsi_pas_device = {
+    .name          = "Pro Audio Spectrum Plus/16 SCSI",
+    .internal_name = "scsi_pas",
+    .flags         = DEVICE_ISA,
+    .local         = 1,
+    .init          = t128_init,
+    .close         = t128_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/scsi/scsi_x54x.c b/src/scsi/scsi_x54x.c
index 6876e4385..c248fbe92 100644
--- a/src/scsi/scsi_x54x.c
+++ b/src/scsi/scsi_x54x.c
@@ -287,10 +287,9 @@ x54x_bios_scsi_command(scsi_device_t *dev, uint8_t *cdb, uint8_t *buf, int len,
 static uint8_t
 x54x_bios_read_capacity(scsi_device_t *sd, uint8_t *buf, int transfer_size)
 {
-    uint8_t *cdb;
+    uint8_t *cdb = (uint8_t *) malloc(12);;
     uint8_t  ret;
 
-    cdb = (uint8_t *) malloc(12);
     memset(cdb, 0, 12);
     cdb[0] = GPCMD_READ_CDROM_CAPACITY;
 
@@ -305,10 +304,9 @@ x54x_bios_read_capacity(scsi_device_t *sd, uint8_t *buf, int transfer_size)
 static uint8_t
 x54x_bios_inquiry(scsi_device_t *sd, uint8_t *buf, int transfer_size)
 {
-    uint8_t *cdb;
+    uint8_t *cdb = (uint8_t *) malloc(12);
     uint8_t  ret;
 
-    cdb = (uint8_t *) malloc(12);
     memset(cdb, 0, 12);
     cdb[0] = GPCMD_INQUIRY;
     cdb[4] = 36;
@@ -324,14 +322,13 @@ x54x_bios_inquiry(scsi_device_t *sd, uint8_t *buf, int transfer_size)
 static uint8_t
 x54x_bios_command_08(scsi_device_t *sd, uint8_t *buffer, int transfer_size)
 {
-    uint8_t *rcbuf;
+    uint8_t *rcbuf = (uint8_t *) malloc(8);
     uint8_t  ret;
     int      i;
 
     memset(buffer, 0x00, 6);
 
-    rcbuf = (uint8_t *) malloc(8);
-    ret   = x54x_bios_read_capacity(sd, rcbuf, transfer_size);
+    ret = x54x_bios_read_capacity(sd, rcbuf, transfer_size);
     if (ret) {
         free(rcbuf);
         return ret;
@@ -353,13 +350,12 @@ x54x_bios_command_08(scsi_device_t *sd, uint8_t *buffer, int transfer_size)
 static int
 x54x_bios_command_15(scsi_device_t *sd, uint8_t *buffer, int transfer_size)
 {
-    uint8_t *inqbuf;
+    uint8_t *inqbuf = (uint8_t *) malloc(36);
     uint8_t *rcbuf;
     uint8_t  ret;
 
     memset(buffer, 0x00, 6);
 
-    inqbuf = (uint8_t *) malloc(36);
     ret    = x54x_bios_inquiry(sd, inqbuf, transfer_size);
     if (ret) {
         free(inqbuf);
@@ -1896,13 +1892,11 @@ x54x_mem_disable(x54x_t *dev)
 void *
 x54x_init(const device_t *info)
 {
-    x54x_t *dev;
+    x54x_t *dev = calloc(1, sizeof(x54x_t));
 
     /* Allocate control block and set up basic stuff. */
-    dev = malloc(sizeof(x54x_t));
     if (dev == NULL)
         return dev;
-    memset(dev, 0x00, sizeof(x54x_t));
     dev->type = info->local;
 
     dev->card_bus       = info->flags;
diff --git a/src/sio/CMakeLists.txt b/src/sio/CMakeLists.txt
index 3140a7181..b2ca643cf 100644
--- a/src/sio/CMakeLists.txt
+++ b/src/sio/CMakeLists.txt
@@ -9,17 +9,41 @@
 #          CMake build script.
 #
 # Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
 #
 #          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2024      Jasmine Iwanek.
 #
 
-add_library(sio OBJECT sio_acc3221.c sio_ali5123.c sio_f82c710.c sio_82091aa.c
-    sio_fdc37c6xx.c sio_fdc37c67x.c sio_fdc37c669.c sio_fdc37c93x.c sio_fdc37m60x.c
+add_library(sio OBJECT
+    sio_82091aa.c
+    sio_90c50.c
+    sio_acc3221.c
+    sio_ali5123.c
+    sio_cbm_io.c
+    sio_gm82c803ab.c
+    sio_gm82c803c.c
+    sio_f82c606.c
+    sio_f82c710.c
+    sio_fdc37c6xx.c
+    sio_fdc37c67x.c
+    sio_fdc37c669.c
+    sio_fdc37c93x.c
+    sio_fdc37m60x.c
     sio_it86x1f.c
-    sio_pc87306.c sio_pc87307.c sio_pc87309.c sio_pc87310.c sio_pc87311.c sio_pc87332.c
-    sio_prime3b.c sio_prime3c.c
-    sio_w83787f.c sio_w83877f.c sio_w83977f.c sio_um8669f.c
-    sio_vt82c686.c)
+    sio_pc87310.c
+    sio_pc873xx.c
+    sio_pc87306.c
+    sio_pc87307.c
+    sio_pc87309.c
+    sio_w837x7.c
+    sio_w83877.c
+    sio_w83977.c
+    sio_um866x.c
+    sio_um8669f.c
+    sio_vl82c113.c
+    sio_vt82c686.c
+)
 
 if(SIO_DETECT)
     target_sources(sio PRIVATE sio_detect.c)
diff --git a/src/sio/sio_82091aa.c b/src/sio/sio_82091aa.c
index cbe89c682..cfe33df12 100644
--- a/src/sio/sio_82091aa.c
+++ b/src/sio/sio_82091aa.c
@@ -42,6 +42,7 @@ typedef struct i82091aa_t {
     uint16_t  base_address;
     fdc_t    *fdc;
     serial_t *uart[2];
+    lpt_t    *lpt;
 } i82091aa_t;
 
 static void
@@ -53,11 +54,36 @@ fdc_handler(i82091aa_t *dev)
 }
 
 static void
-lpt1_handler(i82091aa_t *dev)
+lpt_handler(i82091aa_t *dev)
 {
     uint16_t lpt_port = LPT1_ADDR;
+    int      enable   = (dev->regs[0x20] & 0x01);
 
-    lpt1_remove();
+    lpt_port_remove(dev->lpt);
+
+    lpt_set_fifo_threshold(dev->lpt, (dev->regs[0x20] & 0x80) ? 15 : 8);
+
+    switch (dev->regs[0x20] & 0x60) {
+        default:
+        case 0x00:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x20:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 1);
+            break;
+        case 0x40:
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x60:
+            enable  = 0;
+            break;
+    }
 
     switch ((dev->regs[0x20] >> 1) & 0x03) {
         case 0x00:
@@ -77,10 +103,10 @@ lpt1_handler(i82091aa_t *dev)
             break;
     }
 
-    if ((dev->regs[0x20] & 0x01) && lpt_port)
-        lpt1_init(lpt_port);
+    if (enable && lpt_port)
+        lpt_port_setup(dev->lpt, lpt_port);
 
-    lpt1_irq((dev->regs[0x20] & 0x08) ? LPT1_IRQ : LPT2_IRQ);
+    lpt_port_irq(dev->lpt, (dev->regs[0x20] & 0x08) ? LPT1_IRQ : LPT2_IRQ);
 }
 
 static void
@@ -175,8 +201,8 @@ i82091aa_write(uint16_t port, uint8_t val, void *priv)
             break;
         case 0x20:
             *reg = (val & 0xef);
-            if (valxor & 0x07)
-                lpt1_handler(dev);
+            if (valxor & 0xe8)
+                lpt_handler(dev);
             break;
         case 0x21:
             *reg = (val & 0x2f);
@@ -217,6 +243,8 @@ i82091aa_read(uint16_t port, void *priv)
 
     if (index)
         ret = dev->cur_reg;
+    else if (dev->cur_reg == 0x20)
+        ret = dev->regs[dev->cur_reg] | lpt_read_ecp_mode(dev->lpt);
     else if (dev->cur_reg < 0x51)
         ret = dev->regs[dev->cur_reg];
 
@@ -236,7 +264,7 @@ i82091aa_reset(i82091aa_t *dev)
     fdc_reset(dev->fdc);
 
     fdc_handler(dev);
-    lpt1_handler(dev);
+    lpt_handler(dev);
     serial_handler(dev, 0);
     serial_handler(dev, 1);
     serial_set_clock_src(dev->uart[0], (24000000.0 / 13.0));
@@ -257,14 +285,18 @@ i82091aa_close(void *priv)
 static void *
 i82091aa_init(const device_t *info)
 {
-    i82091aa_t *dev = (i82091aa_t *) malloc(sizeof(i82091aa_t));
-    memset(dev, 0, sizeof(i82091aa_t));
+    i82091aa_t *dev = (i82091aa_t *) calloc(1, sizeof(i82091aa_t));
 
     dev->fdc = device_add(&fdc_at_device);
 
     dev->uart[0] = device_add_inst(&ns16550_device, 1);
     dev->uart[1] = device_add_inst(&ns16550_device, 2);
 
+    dev->lpt     = device_add_inst(&lpt_port_device, 1);
+
+    lpt_set_cnfga_readout(dev->lpt, 0x90);
+    lpt_set_cnfgb_readout(dev->lpt, 0x00);
+
     dev->has_ide = (info->local >> 9) & 0x03;
 
     i82091aa_reset(dev);
@@ -286,53 +318,11 @@ const device_t i82091aa_device = {
     .name          = "Intel 82091AA Super I/O",
     .internal_name = "i82091aa",
     .flags         = 0,
-    .local         = 0x40,
+    .local         = 0,
     .init          = i82091aa_init,
     .close         = i82091aa_close,
     .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t i82091aa_398_device = {
-    .name          = "Intel 82091AA Super I/O (Port 398h)",
-    .internal_name = "i82091aa_398",
-    .flags         = 0,
-    .local         = 0x148,
-    .init          = i82091aa_init,
-    .close         = i82091aa_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t i82091aa_ide_pri_device = {
-    .name          = "Intel 82091AA Super I/O (With Primary IDE)",
-    .internal_name = "i82091aa_ide",
-    .flags         = 0,
-    .local         = 0x240,
-    .init          = i82091aa_init,
-    .close         = i82091aa_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t i82091aa_ide_device = {
-    .name          = "Intel 82091AA Super I/O (With IDE)",
-    .internal_name = "i82091aa_ide",
-    .flags         = 0,
-    .local         = 0x440,
-    .init          = i82091aa_init,
-    .close         = i82091aa_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sio/sio_90c50.c b/src/sio/sio_90c50.c
new file mode 100644
index 000000000..5e7f19b6f
--- /dev/null
+++ b/src/sio/sio_90c50.c
@@ -0,0 +1,266 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Emulation of the Dataworld 90C50 (COMBAT) Super I/O chip.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2020-2025 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/device.h>
+#include <86box/lpt.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
+#include <86box/pci.h>
+#include <86box/rom.h>
+#include <86box/serial.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/sio.h>
+#include <86box/plat_unused.h>
+
+#ifdef ENABLE_90C50_LOG
+int dw90c50_do_log = ENABLE_90C50_LOG;
+
+static void
+dw90c50_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (dw90c50_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define dw90c50_log(fmt, ...)
+#endif
+
+typedef struct dw90c50_t {
+    uint8_t   flags;
+    uint8_t   reg;
+    fdc_t    *fdc;
+    serial_t *uart[2];
+    lpt_t    *lpt;
+} dw90c50_t;
+
+static void
+lpt_handler(dw90c50_t *dev)
+{
+    int      temp;
+    uint16_t lpt_port = LPT1_ADDR;
+    uint8_t  lpt_irq  = LPT1_IRQ;
+
+    /* bits 0-1:
+     * 00 378h
+     * 01 3bch
+     * 10 278h
+     * 11 disabled
+     */
+    temp = (dev->reg & 0x06) >> 1;
+
+    lpt_port_remove(dev->lpt);
+
+    switch (temp) {
+        case 0x00:
+            lpt_port = 0x000;
+            lpt_irq  = 0xff;
+            break;
+        case 0x01:
+            lpt_port = LPT_MDA_ADDR;
+            break;
+        case 0x02:
+            lpt_port = LPT1_ADDR;
+            break;
+        case 0x03:
+            lpt_port = LPT2_ADDR;
+            break;
+
+        default:
+            break;
+    }
+
+    if (lpt_port)
+        lpt_port_setup(dev->lpt, lpt_port);
+
+    lpt_port_irq(dev->lpt, lpt_irq);
+}
+
+static void
+serial_handler(dw90c50_t *dev)
+{
+    uint16_t base1 = 0x0000, base2 = 0x0000;
+    uint8_t irq1, irq2;
+
+    serial_remove(dev->uart[0]);
+    serial_remove(dev->uart[1]);
+
+    switch ((dev->reg >> 3) & 0x07) {
+        case 0x0001:
+            base1 = 0x03f8;
+            break;
+        case 0x0002:
+            base2 = 0x02f8;
+            break;
+        case 0x0003:
+            base1 = 0x03f8;
+            base2 = 0x02f8;
+            break;
+        case 0x0004:
+            base1 = 0x03e8;
+            base2 = 0x02e8;
+            break;
+        case 0x0006:
+            base2 = 0x03f8;
+            break;
+        case 0x0007:
+            base1 = 0x02f8;
+            base2 = 0x03f8;
+            break;
+    }
+
+    irq1 = (base1 & 0x0100) ? COM1_IRQ : COM2_IRQ;
+    irq2 = (base2 & 0x0100) ? COM1_IRQ : COM2_IRQ;
+
+    if (base1 != 0x0000)
+        serial_setup(dev->uart[0], base1, irq1);
+
+    if (base2 != 0x0000)
+        serial_setup(dev->uart[0], base2, irq2);
+}
+
+static void
+dw90c50_write(UNUSED(uint16_t port), uint8_t val, void *priv)
+{
+    dw90c50_t *dev = (dw90c50_t *) priv;
+    uint8_t    valxor;
+
+    dw90c50_log("[%04X:%08X] [W] %02X = %02X (%i)\n", CS, cpu_state.pc, port, val, dev->tries);
+
+    /* Second write to config register. */
+    valxor   = val ^ dev->reg;
+    dev->reg = val;
+
+    dw90c50_log("SIO: Register written %02X\n", val);
+
+    /* Reconfigure floppy disk controller. */
+    if (valxor & 0x01) {
+        dw90c50_log("SIO: FDC disabled\n");
+        fdc_remove(dev->fdc);
+        /* Bit 0: 1 = Enable FDC. */
+        if (val & 0x01) {
+            dw90c50_log("SIO: FDC enabled\n");
+            fdc_set_base(dev->fdc, FDC_PRIMARY_ADDR);
+        }
+    }
+
+    /* Reconfigure parallel port. */
+    if (valxor & 0x06)
+        lpt_handler(dev);
+
+    /* Reconfigure serial ports. */
+    if (valxor & 0x38)
+        serial_handler(dev);
+
+    /* Reconfigure IDE controller. */
+    if ((dev->flags & PCX73XX_IDE) && (valxor & 0x40))  {
+        dw90c50_log("SIO: HDC disabled\n");
+        ide_pri_disable();
+        /* Bit 6: 1 = Enable IDE controller. */
+        if (val & 0x40) {
+            dw90c50_log("SIO: HDC enabled\n");
+            ide_set_base(0, 0x1f0);
+            ide_set_side(0, 0x3f6);
+            ide_pri_enable();
+        }
+    }
+}
+
+uint8_t
+dw90c50_read(UNUSED(uint16_t port), void *priv)
+{
+    dw90c50_t *dev = (dw90c50_t *) priv;
+    uint8_t    ret = 0xff;
+
+    ret = dev->reg;
+
+    dw90c50_log("[%04X:%08X] [R] %02X = %02X\n", CS, cpu_state.pc, port, ret);
+
+    return ret;
+}
+
+void
+dw90c50_reset(dw90c50_t *dev)
+{
+    fdc_reset(dev->fdc);
+
+    dev->reg = 0x62;
+    dw90c50_write(0x03f3, 0x9d, dev);
+}
+
+static void
+dw90c50_close(void *priv)
+{
+    dw90c50_t *dev = (dw90c50_t *) priv;
+
+    free(dev);
+}
+
+static void *
+dw90c50_init(const device_t *info)
+{
+    dw90c50_t *dev = (dw90c50_t *) calloc(1, sizeof(dw90c50_t));
+
+    /* Avoid conflicting with machines that make no use of the 90C50 Internal IDE */
+    dev->flags = info->local;
+
+    dev->fdc = device_add(&fdc_at_nsc_device);
+
+    dev->uart[0] = device_add_inst(&ns16450_device, 1);
+    dev->uart[1] = device_add_inst(&ns16450_device, 2);
+
+    dev->lpt = device_add_inst(&lpt_port_device, 1);
+    lpt_set_ext(dev->lpt, 1);
+
+    if (dev->flags & DW90C50_IDE)
+        device_add(&ide_isa_device);
+
+    dw90c50_reset(dev);
+
+    io_sethandler(0x03f3, 0x0001,
+                  dw90c50_read, NULL, NULL, dw90c50_write, NULL, NULL, dev);
+
+    return dev;
+}
+
+const device_t dw90c50_device = {
+    .name          = "National Semiconductor 90C50 Super I/O",
+    .internal_name = "90c50",
+    .flags         = 0,
+    .local         = 0,
+    .init          = dw90c50_init,
+    .close         = dw90c50_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/sio/sio_acc3221.c b/src/sio/sio_acc3221.c
index 275d9ae2e..c9cb8b6cf 100644
--- a/src/sio/sio_acc3221.c
+++ b/src/sio/sio_acc3221.c
@@ -38,6 +38,7 @@ typedef struct acc3221_t {
     uint8_t   regs[256];
     fdc_t    *fdc;
     serial_t *uart[2];
+    lpt_t    *lpt;
 } acc3221_t;
 
 /* Configuration Register Index, BE (R/W):
@@ -302,10 +303,10 @@ typedef struct acc3221_t {
 static void
 acc3221_lpt_handle(acc3221_t *dev)
 {
-    lpt1_remove();
+    lpt_port_remove(dev->lpt);
 
     if (!(dev->regs[0xbe] & REG_BE_LPT1_DISABLE))
-        lpt1_init(dev->regs[0xbf] << 2);
+        lpt_port_setup(dev->lpt, dev->regs[0xbf] << 2);
 }
 
 static void
@@ -436,9 +437,10 @@ acc3221_reset(acc3221_t *dev)
     serial_remove(dev->uart[1]);
     serial_setup(dev->uart[1], COM2_ADDR, COM2_IRQ);
 
-    lpt1_remove();
-    lpt1_init(LPT1_ADDR);
-    lpt1_irq(LPT1_IRQ);
+    lpt_port_remove(dev->lpt);
+    lpt_port_setup(dev->lpt, LPT1_ADDR);
+
+    lpt_port_irq(dev->lpt, LPT1_IRQ);
 
     fdc_reset(dev->fdc);
 }
@@ -454,14 +456,15 @@ acc3221_close(void *priv)
 static void *
 acc3221_init(UNUSED(const device_t *info))
 {
-    acc3221_t *dev = (acc3221_t *) malloc(sizeof(acc3221_t));
-    memset(dev, 0, sizeof(acc3221_t));
+    acc3221_t *dev = (acc3221_t *) calloc(1, sizeof(acc3221_t));
 
     dev->fdc = device_add(&fdc_at_device);
 
     dev->uart[0] = device_add_inst(&ns16450_device, 1);
     dev->uart[1] = device_add_inst(&ns16450_device, 2);
 
+    dev->lpt     = device_add_inst(&lpt_port_device, 1);
+
     io_sethandler(0x00f2, 0x0002, acc3221_read, NULL, NULL, acc3221_write, NULL, NULL, dev);
 
     acc3221_reset(dev);
@@ -477,7 +480,7 @@ const device_t acc3221_device = {
     .init          = acc3221_init,
     .close         = acc3221_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sio/sio_ali5123.c b/src/sio/sio_ali5123.c
index 78c585c11..5dad42252 100644
--- a/src/sio/sio_ali5123.c
+++ b/src/sio/sio_ali5123.c
@@ -47,6 +47,7 @@ typedef struct ali5123_t {
     int       cur_reg;
     fdc_t    *fdc;
     serial_t *uart[3];
+    lpt_t    *lpt;
 } ali5123_t;
 
 static void    ali5123_write(uint16_t port, uint8_t val, void *priv);
@@ -81,21 +82,66 @@ ali5123_fdc_handler(ali5123_t *dev)
 static void
 ali5123_lpt_handler(ali5123_t *dev)
 {
-    uint16_t ld_port       = 0;
-    uint8_t  global_enable = !(dev->regs[0x22] & (1 << 3));
-    uint8_t  local_enable  = !!dev->ld_regs[3][0x30];
-    uint8_t  lpt_irq       = dev->ld_regs[3][0x70];
+    uint16_t ld_port         = 0x0000;
+    uint16_t mask            = 0xfffc;
+    uint8_t  global_enable   = !(dev->regs[0x22] & (1 << 3));
+    uint8_t  local_enable    = !!dev->ld_regs[3][0x30];
+    uint8_t  lpt_irq         = dev->ld_regs[3][0x70];
+    uint8_t  lpt_dma         = dev->ld_regs[3][0x74];
+    uint8_t  lpt_mode        = dev->ld_regs[3][0xf0] & 0x07;
+    uint8_t  irq_readout[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x08,
+                                 0x00, 0x10, 0x18, 0x20, 0x00, 0x28, 0x30, 0x00 };
 
     if (lpt_irq > 15)
         lpt_irq = 0xff;
 
-    lpt1_remove();
-    if (global_enable && local_enable) {
-        ld_port = make_port(dev, 3) & 0xFFFC;
-        if ((ld_port >= 0x0100) && (ld_port <= 0x0FFC))
-            lpt1_init(ld_port);
+    if (lpt_dma >= 4)
+        lpt_dma = 0xff;
+
+    lpt_port_remove(dev->lpt);
+    lpt_set_fifo_threshold(dev->lpt, (dev->ld_regs[3][0xf0] & 0x78) >> 3);
+    if ((lpt_mode == 0x04) && (dev->ld_regs[3][0xf1] & 0x80))
+        lpt_mode = 0x00;
+    switch (lpt_mode) {
+        default:
+        case 0x04:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x00:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 1);
+            break;
+        case 0x01: case 0x05:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x02:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x03: case 0x07:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
     }
-    lpt1_irq(lpt_irq);
+    if (global_enable && local_enable) {
+        ld_port = (make_port(dev, 3) & 0xfffc) & mask;
+        if ((ld_port >= 0x0100) && (ld_port <= (0x0ffc & mask)))
+            lpt_port_setup(dev->lpt, ld_port);
+    }
+    lpt_port_irq(dev->lpt, lpt_irq);
+    lpt_port_dma(dev->lpt, lpt_dma);
+
+    lpt_set_cnfgb_readout(dev->lpt, ((lpt_irq > 15) ? 0x00 : irq_readout[lpt_irq]) |
+                                    ((lpt_dma >= 4) ? 0x00 : lpt_dma));
 }
 
 static void
@@ -133,8 +179,10 @@ ali5123_serial_handler(ali5123_t *dev, int uart)
 }
 
 static void
-ali5123_reset(ali5123_t *dev)
+ali5123_reset(void *priv)
 {
+    ali5123_t *dev = (ali5123_t *) priv;
+
     memset(dev->regs, 0, 48);
 
     dev->regs[0x20] = 0x43;
@@ -245,7 +293,7 @@ ali5123_write(uint16_t port, uint8_t val, void *priv)
                 dev->regs[dev->cur_reg] = val;
             } else {
                 valxor = val ^ dev->ld_regs[cur_ld][dev->cur_reg];
-                if (((dev->cur_reg & 0xf0) == 0x70) && (cur_ld < 4))
+                if (((dev->cur_reg & 0xf0) == 0x70) && (cur_ld < 4) && (cur_ld != 3))
                     return;
                 /* Block writes to some logical devices. */
                 if (cur_ld > 0x0c)
@@ -355,6 +403,9 @@ ali5123_write(uint16_t port, uint8_t val, void *priv)
                 case 0x60:
                 case 0x61:
                 case 0x70:
+                case 0x74:
+                case 0xf0:
+                case 0xf1:
                     if ((dev->cur_reg == 0x30) && (val & 0x01))
                         dev->regs[0x22] &= ~0x08;
                     if (valxor)
@@ -463,14 +514,14 @@ ali5123_close(void *priv)
 static void *
 ali5123_init(const device_t *info)
 {
-    ali5123_t *dev = (ali5123_t *) malloc(sizeof(ali5123_t));
-    memset(dev, 0, sizeof(ali5123_t));
+    ali5123_t *dev = (ali5123_t *) calloc(1, sizeof(ali5123_t));
 
     dev->fdc = device_add(&fdc_at_ali_device);
 
     dev->uart[0] = device_add_inst(&ns16550_device, 1);
     dev->uart[1] = device_add_inst(&ns16550_device, 2);
     dev->uart[2] = device_add_inst(&ns16550_device, 3);
+    dev->lpt     = device_add_inst(&lpt_port_device, 1);
 
     dev->chip_id = info->local & 0xff;
 
@@ -479,7 +530,7 @@ ali5123_init(const device_t *info)
     io_sethandler(FDC_PRIMARY_ADDR, 0x0002,
                   ali5123_read, NULL, NULL, ali5123_write, NULL, NULL, dev);
 
-    device_add(&keyboard_ps2_ali_pci_device);
+    device_add_params(&kbc_at_device, (void *) KBC_VEN_ALI);
 
     return dev;
 }
@@ -491,8 +542,8 @@ const device_t ali5123_device = {
     .local         = 0x40,
     .init          = ali5123_init,
     .close         = ali5123_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .reset         = ali5123_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sio/sio_cbm_io.c b/src/sio/sio_cbm_io.c
new file mode 100644
index 000000000..477c30a44
--- /dev/null
+++ b/src/sio/sio_cbm_io.c
@@ -0,0 +1,112 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the ACC 3221-SP Super I/O Chip.
+ *
+ *
+ *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *
+ *          Copyright 2019 Sarah Walker.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/device.h>
+#include <86box/pci.h>
+#include <86box/lpt.h>
+#include <86box/serial.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/sio.h>
+#include <86box/plat_unused.h>
+
+typedef struct cbm_io_t {
+    serial_t *uart;
+    lpt_t    *lpt;
+} cbm_io_t;
+
+static void
+cbm_io_write(UNUSED(uint16_t port), uint8_t val, void *priv)
+{
+    cbm_io_t *dev = (cbm_io_t *) priv;
+
+    lpt_port_remove(dev->lpt);
+
+    switch (val & 0x03) {
+        case 0x01:
+            lpt_port_setup(dev->lpt, LPT_MDA_ADDR);
+            break;
+        case 0x02:
+            lpt_port_setup(dev->lpt, LPT1_ADDR);
+            break;
+        case 0x03:
+            lpt_port_setup(dev->lpt, LPT2_ADDR);
+            break;
+
+        default:
+            break;
+    }
+
+    switch (val & 0x0c) {
+        case 0x04:
+            serial_setup(dev->uart, COM2_ADDR, COM2_IRQ);
+            break;
+        case 0x08:
+            serial_setup(dev->uart, COM1_ADDR, COM1_IRQ);
+            break;
+
+        default:
+            break;
+    }
+}
+
+static void
+cbm_io_close(void *priv)
+{
+    cbm_io_t *dev = (cbm_io_t *) priv;
+
+    free(dev);
+}
+
+static void *
+cbm_io_init(UNUSED(const device_t *info))
+{
+    cbm_io_t *dev = (cbm_io_t *) calloc(1, sizeof(cbm_io_t));
+
+    dev->uart = device_add_inst(&ns16450_device, 1);
+
+    dev->lpt  = device_add_inst(&lpt_port_device, 1);
+
+    io_sethandler(0x0230, 0x0001,
+                  NULL, NULL, NULL, cbm_io_write, NULL, NULL,
+                  dev);
+
+    return dev;
+}
+
+const device_t cbm_io_device = {
+    .name          = "Commodore CBM I/O",
+    .internal_name = "cbm_io",
+    .flags         = 0,
+    .local         = 0,
+    .init          = cbm_io_init,
+    .close         = cbm_io_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/sio/sio_detect.c b/src/sio/sio_detect.c
index 38faf3c2c..d36522fe0 100644
--- a/src/sio/sio_detect.c
+++ b/src/sio/sio_detect.c
@@ -47,11 +47,12 @@ sio_detect_write(uint16_t port, uint8_t val, void *priv)
 static uint8_t
 sio_detect_read(uint16_t port, void *priv)
 {
-    const sio_detect_t *dev = (sio_detect_t *) priv;
+    /*const sio_detect_t *dev = (sio_detect_t *) priv*/;
+    uint8_t             ret = 0xff /*dev->regs[port & 1]*/;
 
-    pclog("sio_detect_read : port=%04x = %02X\n", port, dev->regs[port & 1]);
+    pclog("sio_detect_read : port=%04x = %02X\n", port, ret);
 
-    return 0xff /*dev->regs[port & 1]*/;
+    return ret;
 }
 
 static void
@@ -65,8 +66,7 @@ sio_detect_close(void *priv)
 static void *
 sio_detect_init(UNUSED(const device_t *info))
 {
-    sio_detect_t *dev = (sio_detect_t *) malloc(sizeof(sio_detect_t));
-    memset(dev, 0, sizeof(sio_detect_t));
+    sio_detect_t *dev = (sio_detect_t *) calloc(1, sizeof(sio_detect_t));
 
     device_add(&fdc_at_smc_device);
 
@@ -110,7 +110,7 @@ const device_t sio_detect_device = {
     .init          = sio_detect_init,
     .close         = sio_detect_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sio/sio_f82c606.c b/src/sio/sio_f82c606.c
new file mode 100644
index 000000000..1e6eacccc
--- /dev/null
+++ b/src/sio/sio_f82c606.c
@@ -0,0 +1,329 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the Chips & Technologies 82C606 CHIPSpak
+ *          Multifunction Controller.
+ *
+ * Relevant literature:
+ *
+ *          [1] Chips and Technologies, Inc.,
+ *              82C605/82C606 CHIPSpak/CHIPSport MULTIFUNCTION CONTROLLERS,
+ *              PRELIMINARY Data Sheet, Revision 1, May 1987.
+ *              <https://archive.org/download/82C606/82C606.pdf>
+ *
+ * Authors: Eluan Costa Miranda, <eluancm@gmail.com>
+ *          Lubomir Rintel, <lkundrak@v3.sk>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2020-2025 Eluan Costa Miranda.
+ *          Copyright 2021-2025 Lubomir Rintel.
+ *          Copyright 2025 Miran Grca.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/device.h>
+#include <86box/lpt.h>
+#include <86box/serial.h>
+#include <86box/gameport.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/nvr.h>
+#include <86box/sio.h>
+#include <86box/machine.h>
+
+typedef struct upc_t {
+    int      configuration_state; /* state of algorithm to enter configuration mode */
+    int      configuration_mode;
+    uint16_t cri_addr; /* cri = configuration index register, addr is even */
+    uint16_t cap_addr; /* cap = configuration access port, addr is odd and is cri_addr + 1 */
+    uint8_t  cri;      /* currently indexed register */
+    uint8_t  last_write;
+
+    /* these regs are not affected by reset */
+    uint8_t   regs[15]; /* there are 16 indexes, but there is no need to store the last one which is: R = cri_addr / 4, W = exit config mode */
+    nvr_t    *nvr;
+    void     *gameport;
+    serial_t *uart[2];
+    lpt_t    *lpt;
+} upc_t;
+
+#ifdef ENABLE_F82C606_LOG
+int f82c606_do_log = ENABLE_F82C606_LOG;
+
+static void
+f82c606_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (f82c606_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define f82c606_log(fmt, ...)
+#endif
+
+static void
+f82c606_update_ports(upc_t *dev, int set)
+{
+    uint8_t uart1_int = 0xff;
+    uint8_t uart2_int = 0xff;
+    uint8_t lpt_int   = 0xff;
+    int     nvr_int   = -1;
+
+    serial_remove(dev->uart[0]);
+    serial_remove(dev->uart[1]);
+    lpt_port_remove(dev->lpt);
+
+    nvr_at_handler(0, ((uint16_t) dev->regs[3]) << 2, dev->nvr);
+    nvr_at_handler(0, 0x70, dev->nvr);
+
+    gameport_remap(dev->gameport, 0);
+
+    if (!set)
+        return;
+
+    switch (dev->regs[8] & 0xc0) {
+        case 0x40:
+            nvr_int = 3;
+            break;
+        case 0x80:
+            uart1_int = COM2_IRQ;
+            break;
+        case 0xc0:
+            uart2_int = COM2_IRQ;
+            break;
+
+        default:
+            break;
+    }
+
+    switch (dev->regs[8] & 0x30) {
+        case 0x10:
+            nvr_int = 4;
+            break;
+        case 0x20:
+            uart1_int = COM1_IRQ;
+            break;
+        case 0x30:
+            uart2_int = COM1_IRQ;
+            break;
+
+        default:
+            break;
+    }
+
+    switch (dev->regs[8] & 0x0c) {
+        case 0x04:
+            nvr_int = 5;
+            break;
+        case 0x08:
+            uart1_int = 5;
+            break;
+        case 0x0c:
+            lpt_int = LPT2_IRQ;
+            break;
+
+        default:
+            break;
+    }
+
+    switch (dev->regs[8] & 0x03) {
+        case 0x01:
+            nvr_int = 7;
+            break;
+        case 0x02:
+            uart2_int = 7;
+            break;
+        case 0x03:
+            lpt_int = LPT1_IRQ;
+            break;
+
+        default:
+            break;
+    }
+
+    if (dev->regs[0] & 1) {
+        gameport_remap(dev->gameport, ((uint16_t) dev->regs[7]) << 2);
+        f82c606_log("Game port at %04X\n", ((uint16_t) dev->regs[7]) << 2);
+    }
+
+    if (dev->regs[0] & 2) {
+        serial_setup(dev->uart[0], ((uint16_t) dev->regs[4]) << 2, uart1_int);
+        f82c606_log("UART 1 at %04X, IRQ %i\n", ((uint16_t) dev->regs[4]) << 2, uart1_int);
+    }
+
+    if (dev->regs[0] & 4) {
+        serial_setup(dev->uart[1], ((uint16_t) dev->regs[5]) << 2, uart2_int);
+        f82c606_log("UART 2 at %04X, IRQ %i\n", ((uint16_t) dev->regs[5]) << 2, uart2_int);
+    }
+
+    if (dev->regs[0] & 8) {
+        lpt_port_setup(dev->lpt, ((uint16_t) dev->regs[6]) << 2);
+        lpt_port_irq(dev->lpt, lpt_int);
+        f82c606_log("LPT1 at %04X, IRQ %i\n", ((uint16_t) dev->regs[6]) << 2, lpt_int);
+    }
+
+    nvr_at_handler(1, ((uint16_t) dev->regs[3]) << 2, dev->nvr);
+    nvr_irq_set(nvr_int, dev->nvr);
+    f82c606_log("RTC at %04X, IRQ %i\n", ((uint16_t) dev->regs[3]) << 2, nvr_int);
+}
+
+static uint8_t
+f82c606_config_read(uint16_t port, void *priv)
+{
+    const upc_t  *dev  = (upc_t *) priv;
+    uint8_t       temp = 0xff;
+
+    if (dev->configuration_mode) {
+        if (port == dev->cri_addr) {
+            temp = dev->cri;
+        } else if (port == dev->cap_addr) {
+            if (dev->cri == 0xf)
+                temp = dev->cri_addr / 4;
+            else
+                temp = dev->regs[dev->cri];
+        }
+    }
+
+    return temp;
+}
+
+static void
+f82c606_config_write(uint16_t port, uint8_t val, void *priv)
+{
+    upc_t *dev                       = (upc_t *) priv;
+    int    configuration_state_event = 0;
+
+    switch (port) {
+        case 0x2fa:
+            if ((dev->configuration_state == 0) && (val != 0x00) && (val != 0xff)) {
+                configuration_state_event = 1;
+                dev->last_write           = val;
+            } else if (dev->configuration_state == 4) {
+                if ((val | dev->last_write) == 0xff) {
+                    dev->cri_addr           = ((uint16_t) dev->last_write) << 2;
+                    dev->cap_addr           = dev->cri_addr + 1;
+                    dev->configuration_mode = 1;
+                    f82c606_update_ports(dev, 0);
+                    /* TODO: is the value of cri reset here or when exiting configuration mode? */
+                    io_sethandler(dev->cri_addr, 0x0002,
+                                  f82c606_config_read, NULL, NULL,
+                                  f82c606_config_write, NULL, NULL, dev);
+                } else
+                    dev->configuration_mode = 0;
+            }
+            break;
+        case 0x3fa:
+            if ((dev->configuration_state == 1) && ((val | dev->last_write) == 0xff))
+                configuration_state_event = 1;
+            else if ((dev->configuration_state == 2) && (val == 0x36))
+                configuration_state_event = 1;
+            else if (dev->configuration_state == 3) {
+                dev->last_write           = val;
+                configuration_state_event = 1;
+            }
+            break;
+        default:
+            break;
+    }
+
+    if (dev->configuration_mode) {
+        if (port == dev->cri_addr) {
+            dev->cri = val & 0xf;
+        } else if (port == dev->cap_addr) {
+            if (dev->cri == 0xf) {
+                dev->configuration_mode = 0;
+                io_removehandler(dev->cri_addr, 0x0002,
+                                 f82c606_config_read, NULL, NULL,
+                                 f82c606_config_write, NULL, NULL, dev);
+                /* TODO: any benefit in updating at each register write instead of when exiting config mode? */
+                f82c606_update_ports(dev, 1);
+            } else
+                dev->regs[dev->cri] = val;
+        }
+    }
+
+    /* TODO: is the state only reset when accessing 0x2fa and 0x3fa wrongly? */
+    if ((port == 0x2fa || port == 0x3fa) && configuration_state_event)
+        dev->configuration_state++;
+    else
+        dev->configuration_state = 0;
+}
+
+static void
+f82c606_reset(void *priv)
+{
+    upc_t *dev = (upc_t *) priv;
+
+    /* Set power-on defaults. */
+    dev->regs[0] = 0x00; /* Enable */
+    dev->regs[1] = 0x00; /* Configuration Register */
+    dev->regs[2] = 0x00; /* Ext Baud Rate Select */
+    dev->regs[3] = 0xb0; /* RTC Base */
+    dev->regs[4] = 0xfe; /* UART1 Base */
+    dev->regs[5] = 0xbe; /* UART2 Base */
+    dev->regs[6] = 0x9e; /* Parallel Base */
+    dev->regs[7] = 0x80; /* Game Base */
+    dev->regs[8] = 0xec; /* Interrupt Select */
+
+    f82c606_update_ports(dev, 1);
+}
+
+static void
+f82c606_close(void *priv)
+{
+    upc_t *dev = (upc_t *) priv;
+
+    free(dev);
+}
+
+static void *
+f82c606_init(const device_t *info)
+{
+    upc_t *dev    = (upc_t *) calloc(1, sizeof(upc_t));
+
+    dev->nvr      = device_add(&at_nvr_old_device);
+    dev->gameport = gameport_add(&gameport_sio_device);
+
+    dev->uart[0]   = device_add_inst(&ns16450_device, 1);
+    dev->uart[1]   = device_add_inst(&ns16450_device, 2);
+
+    dev->lpt       = device_add_inst(&lpt_port_device, 1);
+
+    io_sethandler(0x02fa, 0x0001, NULL, NULL, NULL, f82c606_config_write, NULL, NULL, dev);
+    io_sethandler(0x03fa, 0x0001, NULL, NULL, NULL, f82c606_config_write, NULL, NULL, dev);
+
+    f82c606_reset(dev);
+
+    return dev;
+}
+
+const device_t f82c606_device = {
+    .name          = "82C606 CHIPSpak Multifunction Controller",
+    .internal_name = "f82c606",
+    .flags         = 0,
+    .local         = 0,
+    .init          = f82c606_init,
+    .close         = f82c606_close,
+    .reset         = f82c606_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/sio/sio_f82c710.c b/src/sio/sio_f82c710.c
index d4afb11da..f7ff1409f 100644
--- a/src/sio/sio_f82c710.c
+++ b/src/sio/sio_f82c710.c
@@ -6,23 +6,23 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          Implementation of the Chips & Technologies F82C710 Universal Peripheral
- *          Controller (UPC) and 82C606 CHIPSpak Multifunction Controller.
+ *          Implementation of the Chips & Technologies F82C710 Universal
+ *          Peripheral Controller (UPC).
  *
  * Relevant literature:
  *
  *          [1] Chips and Technologies, Inc.,
- *              82C605/82C606 CHIPSpak/CHIPSport MULTIFUNCTION CONTROLLERS,
- *              PRELIMINARY Data Sheet, Revision 1, May 1987.
- *              <https://archive.org/download/82C606/82C606.pdf>
+ *              82710 Univeral Peripheral Controller, Data Sheet,
+ *              PRELIMINARY, August 1990.
+ *              <http://66.113.161.23/~mR_Slug/pub/datasheets/chipsets/CandT/82C710.pdf>
  *
+ * Authors: Eluan Costa Miranda, <eluancm@gmail.com>
+ *          Lubomir Rintel, <lkundrak@v3.sk>
+ *          Miran Grca, <mgrca8@gmail.com>
  *
- *
- * Authors: Eluan Costa Miranda <eluancm@gmail.com>
- *          Lubomir Rintel <lkundrak@v3.sk>
- *
- *          Copyright 2020 Eluan Costa Miranda.
- *          Copyright 2021 Lubomir Rintel.
+ *          Copyright 2020-2025 Eluan Costa Miranda.
+ *          Copyright 2021-2025 Lubomir Rintel.
+ *          Copyright 2025 Miran Grca.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -40,24 +40,38 @@
 #include <86box/hdc_ide.h>
 #include <86box/fdd.h>
 #include <86box/fdc.h>
-#include <86box/nvr.h>
+#include <86box/machine.h>
+#include <86box/mouse.h>
+#include <86box/plat_fallthrough.h>
 #include <86box/sio.h>
+#include "cpu.h"
 
 typedef struct upc_t {
-    uint32_t local;
-    int      configuration_state; /* state of algorithm to enter configuration mode */
+    int      configuration_state;    /* State of algorithm to enter the
+                                        configuration mode. */
     int      configuration_mode;
-    uint16_t cri_addr; /* cri = configuration index register, addr is even */
-    uint16_t cap_addr; /* cap = configuration access port, addr is odd and is cri_addr + 1 */
-    uint8_t  cri;      /* currently indexed register */
+    uint8_t  next_value;
+    uint16_t cri_addr;               /* CRI = Configuration Index Register,
+                                              addr is even. */
+    uint16_t cap_addr;               /* CAP = Configuration Access Port, addr is
+                                              odd and is cri_addr + 1. */
+    uint8_t  cri;                    /* Currently indexed register. */
     uint8_t  last_write;
+    uint16_t mouse_base;
 
-    /* these regs are not affected by reset */
-    uint8_t   regs[15]; /* there are 16 indexes, but there is no need to store the last one which is: R = cri_addr / 4, W = exit config mode */
+    /* These regs are not affected by reset */
+    uint8_t   regs[15];              /* There are 16 indexes, but there is no
+                                        need to store the last one which is:
+                                        R = cri_addr / 4, W = exit config mode. */
+    int       serial_irq;
+    int       lpt_irq;
+    int       xta;
     fdc_t    *fdc;
-    nvr_t    *nvr;
     void     *gameport;
-    serial_t *uart[2];
+    void     *mouse;
+    void     *hdc_xta;
+    serial_t *uart;
+    lpt_t    *lpt;
 } upc_t;
 
 #ifdef ENABLE_F82C710_LOG
@@ -79,150 +93,86 @@ f82c710_log(const char *fmt, ...)
 #endif
 
 static void
-f82c710_update_ports(upc_t *dev, int set)
+serial_handler(upc_t *dev)
 {
-    uint16_t com_addr = 0;
-    uint16_t lpt_addr = 0;
+    uint16_t com_addr = 0x0000;
 
-    serial_remove(dev->uart[0]);
-    serial_remove(dev->uart[1]);
-    lpt1_remove();
-    lpt2_remove();
-    fdc_remove(dev->fdc);
-    ide_pri_disable();
+    serial_remove(dev->uart);
 
-    if (!set)
-        return;
+    if (dev->regs[0x00] & 0x04) {
+        com_addr = dev->regs[0x04] << 2;
 
-    if (dev->regs[0] & 4) {
-        com_addr = dev->regs[4] * 4;
-        if (com_addr == COM1_ADDR)
-            serial_setup(dev->uart[0], com_addr, COM1_IRQ);
-        else if (com_addr == COM2_ADDR)
-            serial_setup(dev->uart[1], com_addr, COM2_IRQ);
+        serial_setup(dev->uart, com_addr, dev->serial_irq);
     }
-
-    if (dev->regs[0] & 8) {
-        lpt_addr = dev->regs[6] * 4;
-        lpt1_init(lpt_addr);
-        if ((lpt_addr == LPT1_ADDR) || (lpt_addr == LPT_MDA_ADDR))
-            lpt1_irq(LPT1_IRQ);
-        else if (lpt_addr == LPT2_ADDR)
-            lpt1_irq(LPT2_IRQ);
-    }
-
-    if (dev->regs[12] & 0x80)
-        ide_pri_enable();
-
-    if (dev->regs[12] & 0x20)
-        fdc_set_base(dev->fdc, FDC_PRIMARY_ADDR);
 }
 
 static void
-f82c606_update_ports(upc_t *dev, int set)
+lpt_handler(upc_t *dev)
 {
-    uint8_t uart1_int = 0xff;
-    uint8_t uart2_int = 0xff;
-    uint8_t lpt1_int  = 0xff;
-    int     nvr_int   = -1;
+    uint16_t lpt_addr = 0x0000;
 
-    serial_remove(dev->uart[0]);
-    serial_remove(dev->uart[1]);
-    lpt1_remove();
-    lpt2_remove();
+    lpt_port_remove(dev->lpt);
 
-    nvr_at_handler(0, ((uint16_t) dev->regs[3]) << 2, dev->nvr);
-    nvr_at_handler(0, 0x70, dev->nvr);
+    if (dev->regs[0x00] & 0x08) {
+        lpt_addr = dev->regs[0x06] << 2;
 
-    gameport_remap(dev->gameport, 0);
+        lpt_port_setup(dev->lpt, lpt_addr);
+        lpt_port_irq(dev->lpt, dev->lpt_irq);
 
-    if (!set)
-        return;
-
-    switch (dev->regs[8] & 0xc0) {
-        case 0x40:
-            nvr_int = 3;
-            break;
-        case 0x80:
-            uart1_int = COM2_IRQ;
-            break;
-        case 0xc0:
-            uart2_int = COM2_IRQ;
-            break;
-
-        default:
-            break;
+        lpt_set_ext(dev->lpt, !!(dev->regs[0x01] & 0x40));
     }
+}
 
-    switch (dev->regs[8] & 0x30) {
-        case 0x10:
-            nvr_int = 4;
-            break;
-        case 0x20:
-            uart1_int = COM1_IRQ;
-            break;
-        case 0x30:
-            uart2_int = COM1_IRQ;
-            break;
+static void
+ide_handler(upc_t *dev)
+{
+    if (dev->xta) {
+        if (dev->hdc_xta != NULL)
+            xta_handler(dev->hdc_xta, 0);
+    } else
+        ide_pri_disable();
 
-        default:
-            break;
+    if (dev->regs[0x0c] & 0x80) {
+        if (dev->regs[0x0c] & 0x40) {
+            if (dev->xta && (dev->hdc_xta != NULL))
+                xta_handler(dev->hdc_xta, 1);
+        } else {
+            if (!dev->xta)
+                ide_pri_enable();
+        }
     }
+}
 
-    switch (dev->regs[8] & 0x0c) {
-        case 0x04:
-            nvr_int = 5;
-            break;
-        case 0x08:
-            uart1_int = 5;
-            break;
-        case 0x0c:
-            lpt1_int = LPT2_IRQ;
-            break;
+static void
+fdc_handler(upc_t *dev)
+{
+    fdc_remove(dev->fdc);
 
-        default:
-            break;
-    }
+    if (dev->regs[0x0c] & 0x20)
+        fdc_set_base(dev->fdc, FDC_PRIMARY_ADDR);
 
-    switch (dev->regs[8] & 0x03) {
-        case 0x01:
-            nvr_int = 7;
-            break;
-        case 0x02:
-            uart2_int = 7;
-            break;
-        case 0x03:
-            lpt1_int = LPT1_IRQ;
-            break;
+    fdc_set_power_down(dev->fdc, !!(dev->regs[0x0c] & 0x10));
+}
 
-        default:
-            break;
-    }
+static void
+mouse_handler(upc_t *dev)
+{
+    if (dev->mouse_base != 0x0000)
+        mouse_upc_handler(0, dev->mouse_base, dev->mouse);
 
-    if (dev->regs[0] & 1) {
-        gameport_remap(dev->gameport, ((uint16_t) dev->regs[7]) << 2);
-        f82c710_log("Game port at %04X\n", ((uint16_t) dev->regs[7]) << 2);
-    }
+    dev->mouse_base = dev->regs[0x0d] << 2;
 
-    if (dev->regs[0] & 2) {
-        serial_setup(dev->uart[0], ((uint16_t) dev->regs[4]) << 2, uart1_int);
-        f82c710_log("UART 1 at %04X, IRQ %i\n", ((uint16_t) dev->regs[4]) << 2, uart1_int);
-    }
+    if (dev->mouse_base != 0x0000)
+        mouse_upc_handler(1, dev->mouse_base, dev->mouse);
+}
 
-    if (dev->regs[0] & 4) {
-        serial_setup(dev->uart[1], ((uint16_t) dev->regs[5]) << 2, uart2_int);
-        f82c710_log("UART 2 at %04X, IRQ %i\n", ((uint16_t) dev->regs[5]) << 2, uart2_int);
-    }
-
-    if (dev->regs[0] & 8) {
-        lpt1_init(((uint16_t) dev->regs[6]) << 2);
-        lpt1_irq(lpt1_int);
-        f82c710_log("LPT1 at %04X, IRQ %i\n", ((uint16_t) dev->regs[6]) << 2, lpt1_int);
-    }
-
-    nvr_at_handler(1, ((uint16_t) dev->regs[3]) << 2, dev->nvr);
-    nvr_irq_set(nvr_int, dev->nvr);
-    f82c710_log("RTC at %04X, IRQ %i\n", ((uint16_t) dev->regs[3]) << 2, nvr_int);
+static void
+f82c710_update_ports(upc_t *dev)
+{
+    serial_handler(dev);
+    lpt_handler(dev);
+    ide_handler(dev);
+    fdc_handler(dev);
 }
 
 static uint8_t
@@ -235,9 +185,9 @@ f82c710_config_read(uint16_t port, void *priv)
         if (port == dev->cri_addr) {
             temp = dev->cri;
         } else if (port == dev->cap_addr) {
-            if (dev->cri == 0xf)
-                temp = dev->cri_addr / 4;
-            else
+            if (dev->cri == 0x0f)
+                temp = dev->cri_addr >> 2;
+            else if (dev->cri < 0x0f)
                 temp = dev->regs[dev->cri];
         }
     }
@@ -248,66 +198,111 @@ f82c710_config_read(uint16_t port, void *priv)
 static void
 f82c710_config_write(uint16_t port, uint8_t val, void *priv)
 {
-    upc_t *dev                       = (upc_t *) priv;
-    int    configuration_state_event = 0;
+    upc_t * dev                       = (upc_t *) priv;
+    uint8_t valxor                    = 0x00;
+    int     configuration_state_event = 0;
 
     switch (port) {
+        default:
+            break;
         case 0x2fa:
-            if ((dev->configuration_state == 0) && (val != 0x00) && (val != 0xff) && (dev->local == 606)) {
+            if (dev->configuration_state == 0) {
                 configuration_state_event = 1;
-                dev->last_write           = val;
-            } else if ((dev->configuration_state == 0) && (val == 0x55) && (dev->local == 710))
-                configuration_state_event = 1;
-            else if (dev->configuration_state == 4) {
-                if ((val | dev->last_write) == 0xff) {
-                    dev->cri_addr           = ((uint16_t) dev->last_write) << 2;
-                    dev->cap_addr           = dev->cri_addr + 1;
+                dev->next_value = 0xff - val;
+            } else if (dev->configuration_state == 4) {
+                uint8_t addr_verify = dev->cri_addr >> 2;
+                addr_verify += val;
+                if (addr_verify == 0xff) {
                     dev->configuration_mode = 1;
-                    if (dev->local == 606)
-                        f82c606_update_ports(dev, 0);
-                    else if (dev->local == 710)
-                        f82c710_update_ports(dev, 0);
                     /* TODO: is the value of cri reset here or when exiting configuration mode? */
-                    io_sethandler(dev->cri_addr, 0x0002, f82c710_config_read, NULL, NULL, f82c710_config_write, NULL, NULL, dev);
+                    io_sethandler(dev->cri_addr, 0x0002,
+                                  f82c710_config_read, NULL, NULL,
+                                  f82c710_config_write, NULL, NULL, dev);
                 } else
                     dev->configuration_mode = 0;
             }
             break;
         case 0x3fa:
-            if ((dev->configuration_state == 1) && ((val | dev->last_write) == 0xff) && (dev->local == 606))
-                configuration_state_event = 1;
-            else if ((dev->configuration_state == 1) && (val == 0xaa) && (dev->local == 710))
+            if ((dev->configuration_state == 1) && (val == dev->next_value))
                 configuration_state_event = 1;
             else if ((dev->configuration_state == 2) && (val == 0x36))
                 configuration_state_event = 1;
             else if (dev->configuration_state == 3) {
-                dev->last_write           = val;
+                dev->cri_addr = val << 2;
+                dev->cap_addr = dev->cri_addr + 1;
                 configuration_state_event = 1;
             }
             break;
-        default:
-            break;
     }
 
     if (dev->configuration_mode) {
-        if (port == dev->cri_addr) {
+        if (port == dev->cri_addr)
             dev->cri = val & 0xf;
-        } else if (port == dev->cap_addr) {
-            if (dev->cri == 0xf) {
-                dev->configuration_mode = 0;
-                io_removehandler(dev->cri_addr, 0x0002, f82c710_config_read, NULL, NULL, f82c710_config_write, NULL, NULL, dev);
-                /* TODO: any benefit in updating at each register write instead of when exiting config mode? */
-                if (dev->local == 606)
-                    f82c606_update_ports(dev, 1);
-                else if (dev->local == 710)
-                    f82c710_update_ports(dev, 1);
-            } else
-                dev->regs[dev->cri] = val;
+        else if (port == dev->cap_addr) {
+            valxor = (dev->regs[dev->cri] ^ val);
+            switch (dev->cri) {
+                case 0x00:
+                    dev->regs[dev->cri] = (dev->regs[dev->cri] & 0x10) | (val & 0xef);
+                    if (valxor & 0x08)
+                        lpt_handler(dev);
+                    if (valxor & 0x04)
+                        serial_handler(dev);
+                    break;
+                case 0x01:
+                    dev->regs[dev->cri] = (dev->regs[dev->cri] & 0x07) | (val & 0xf8);
+                    if (valxor & 0x40)
+                        serial_handler(dev);
+                    break;
+                case 0x02:
+                    dev->regs[dev->cri] = (dev->regs[dev->cri] & 0x08) | (val & 0xf0);
+                    break;
+                case 0x03:
+                case 0x07: case 0x08:
+                    /* TODO: Reserved - is it actually writable? */
+                    fallthrough;
+                case 0x09: case 0x0a:
+                case 0x0b:
+                    dev->regs[dev->cri] = val;
+                    break;
+                case 0x04:
+                    dev->regs[dev->cri] = (dev->regs[dev->cri] & 0x01) | (val & 0xfe);
+                    if (valxor & 0xfe)
+                        serial_handler(dev);
+                    break;
+                case 0x06:
+                    dev->regs[dev->cri] = val;
+                    if (valxor)
+                        lpt_handler(dev);
+                    break;
+                case 0x0c:
+                    dev->regs[dev->cri] = val;
+                    if (valxor & 0xc0)
+                        ide_handler(dev);
+                    if (valxor & 0x30)
+                        fdc_handler(dev);
+                    break;
+                case 0x0d:
+                    dev->regs[dev->cri] = val;
+                    if (valxor)
+                        mouse_handler(dev);
+                    break;
+                case 0x0e:
+                    dev->regs[dev->cri] = (dev->regs[dev->cri] & 0x20) | (val & 0xdf);
+                    if (valxor)
+                        mouse_handler(dev);
+                    break;
+                case 0x0f:
+                    dev->configuration_mode = 0;
+                    io_removehandler(dev->cri_addr, 0x0002,
+                                     f82c710_config_read, NULL, NULL,
+                                     f82c710_config_write, NULL, NULL, dev);
+                    break;
+            }
         }
     }
 
     /* TODO: is the state only reset when accessing 0x2fa and 0x3fa wrongly? */
-    if ((port == 0x2fa || port == 0x3fa) && configuration_state_event)
+    if (((port == 0x2fa) || (port == 0x3fa)) && configuration_state_event)
         dev->configuration_state++;
     else
         dev->configuration_state = 0;
@@ -318,39 +313,27 @@ f82c710_reset(void *priv)
 {
     upc_t *dev = (upc_t *) priv;
 
-    /* Set power-on defaults. */
-    if (dev->local == 606) {
-        dev->regs[0] = 0x00; /* Enable */
-        dev->regs[1] = 0x00; /* Configuration Register */
-        dev->regs[2] = 0x00; /* Ext Baud Rate Select */
-        dev->regs[3] = 0xb0; /* RTC Base */
-        dev->regs[4] = 0xfe; /* UART1 Base */
-        dev->regs[5] = 0xbe; /* UART2 Base */
-        dev->regs[6] = 0x9e; /* Parallel Base */
-        dev->regs[7] = 0x80; /* Game Base */
-        dev->regs[8] = 0xec; /* Interrupt Select */
-    } else if (dev->local == 710) {
-        dev->regs[0]  = 0x0c;
-        dev->regs[1]  = 0x00;
-        dev->regs[2]  = 0x00;
-        dev->regs[3]  = 0x00;
-        dev->regs[4]  = 0xfe;
-        dev->regs[5]  = 0x00;
-        dev->regs[6]  = 0x9e;
-        dev->regs[7]  = 0x00;
-        dev->regs[8]  = 0x00;
-        dev->regs[9]  = 0xb0;
-        dev->regs[10] = 0x00;
-        dev->regs[11] = 0x00;
-        dev->regs[12] = 0xa0;
-        dev->regs[13] = 0x00;
-        dev->regs[14] = 0x00;
-    }
+    dev->configuration_state = 0;
+    dev->configuration_mode  = 0;
 
-    if (dev->local == 606)
-        f82c606_update_ports(dev, 1);
-    else if (dev->local == 710)
-        f82c710_update_ports(dev, 1);
+    /* Set power-on defaults. */
+    dev->regs[0x00] = 0x0c;
+    dev->regs[0x01] = 0x00;
+    dev->regs[0x02] = 0x00;
+    dev->regs[0x03] = 0x00;
+    dev->regs[0x04] = 0xfe;
+    dev->regs[0x05] = 0x00;
+    dev->regs[0x06] = 0x9e;
+    dev->regs[0x07] = 0x00;
+    dev->regs[0x08] = 0x00;
+    dev->regs[0x09] = 0xb0;
+    dev->regs[0x0a] = 0x00;
+    dev->regs[0x0b] = 0x00;
+    dev->regs[0x0c] = 0xa0;
+    dev->regs[0x0d] = 0x00;
+    dev->regs[0x0e] = 0x00;
+
+    f82c710_update_ports(dev);
 }
 
 static void
@@ -364,18 +347,20 @@ f82c710_close(void *priv)
 static void *
 f82c710_init(const device_t *info)
 {
-    upc_t *dev = (upc_t *) malloc(sizeof(upc_t));
-    memset(dev, 0, sizeof(upc_t));
-    dev->local = info->local;
+    upc_t *dev = (upc_t *) calloc(1, sizeof(upc_t));
 
-    if (dev->local == 606) {
-        dev->nvr      = device_add(&at_nvr_old_device);
-        dev->gameport = gameport_add(&gameport_sio_device);
-    } else if (dev->local == 710)
-        dev->fdc = device_add(&fdc_at_device);
+    if (strstr(machine_get_internal_name(), "5086") != NULL)
+        dev->fdc        = device_add(&fdc_at_actlow_device);
+    else
+        dev->fdc        = device_add(&fdc_at_device);
 
-    dev->uart[0] = device_add_inst(&ns16450_device, 1);
-    dev->uart[1] = device_add_inst(&ns16450_device, 2);
+    dev->uart       = device_add_inst(&ns16450_device, 1);
+    dev->lpt        = device_add_inst(&lpt_port_device, 1);
+
+    dev->mouse      = device_add_params(&mouse_upc_device, (void *) (uintptr_t) (is286 ? 12 : 2));
+
+    dev->serial_irq = device_get_config_int("serial_irq");
+    dev->lpt_irq    = device_get_config_int("lpt_irq");
 
     io_sethandler(0x02fa, 0x0001, NULL, NULL, NULL, f82c710_config_write, NULL, NULL, dev);
     io_sethandler(0x03fa, 0x0001, NULL, NULL, NULL, f82c710_config_write, NULL, NULL, dev);
@@ -385,30 +370,126 @@ f82c710_init(const device_t *info)
     return dev;
 }
 
-const device_t f82c606_device = {
-    .name          = "82C606 CHIPSpak Multifunction Controller",
-    .internal_name = "f82c606",
-    .flags         = 0,
-    .local         = 606,
-    .init          = f82c710_init,
-    .close         = f82c710_close,
-    .reset         = f82c710_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
+static void *
+f82c710_pc5086_init(const device_t *info)
+{
+    upc_t *dev = f82c710_init(info);
+
+    int hdc_present = device_get_config_int("hdc_present");
+
+    if (hdc_present)
+       dev->hdc_xta = device_add(&xta_st50x_pc5086_device);
+
+    dev->xta = 1;
+
+    f82c710_reset(dev);
+
+    return dev;
+}
+
+static const device_config_t f82c710_config[] = {
+    {
+        .name           = "serial_irq",
+        .description    = "Serial port IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 4,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 4",  .value =  4 },
+            { .description = "IRQ 3",  .value =  3 },
+            { .description = ""                    }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "lpt_irq",
+        .description    = "Parallel port IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 7,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 7",  .value =  7 },
+            { .description = "IRQ 5",  .value =  5 },
+            { .description = ""                    }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t f82c710_pc5086_config[] = {
+    {
+        .name           = "serial_irq",
+        .description    = "Serial port IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 4,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 4",  .value =  4 },
+            { .description = "IRQ 3",  .value =  3 },
+            { .description = ""                    }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "lpt_irq",
+        .description    = "Parallel port IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 7,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 7",  .value =  7 },
+            { .description = "IRQ 5",  .value =  5 },
+            { .description = ""                    }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "hdc_present",
+        .description    = "Hard disk",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 const device_t f82c710_device = {
     .name          = "F82C710 UPC Super I/O",
     .internal_name = "f82c710",
     .flags         = 0,
-    .local         = 710,
+    .local         = 0,
     .init          = f82c710_init,
     .close         = f82c710_close,
     .reset         = f82c710_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
-    .config        = NULL
+    .config        = f82c710_config
+};
+
+const device_t f82c710_pc5086_device = {
+    .name          = "F82C710 UPC Super I/O (PC5086)",
+    .internal_name = "f82c710_pc5086",
+    .flags         = 0,
+    .local         = 0,
+    .init          = f82c710_pc5086_init,
+    .close         = f82c710_close,
+    .reset         = f82c710_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = f82c710_pc5086_config
 };
diff --git a/src/sio/sio_fdc37c669.c b/src/sio/sio_fdc37c669.c
index 0cd686991..57ca37619 100644
--- a/src/sio/sio_fdc37c669.c
+++ b/src/sio/sio_fdc37c669.c
@@ -33,15 +33,20 @@
 #include <86box/fdd.h>
 #include <86box/fdc.h>
 #include <86box/sio.h>
+#include "cpu.h"
 
 typedef struct fdc37c669_t {
     uint8_t   id;
     uint8_t   tries;
-    uint8_t   regs[42];
+    uint8_t   has_ide;
+    uint8_t   dma_map[4];
+    uint8_t   irq_map[16];
+    uint8_t   regs[256];
     int       locked;
     int       rw_locked;
     int       cur_reg;
     fdc_t    *fdc;
+    lpt_t    *lpt;
     serial_t *uart[2];
 } fdc37c669_t;
 
@@ -69,6 +74,7 @@ static void
 fdc37c669_fdc_handler(fdc37c669_t *dev)
 {
     fdc_remove(dev->fdc);
+
     if (dev->regs[0x20] & 0xc0)
         fdc_set_base(dev->fdc, ((uint16_t) dev->regs[0x20]) << 2);
 }
@@ -81,6 +87,7 @@ fdc37c669_uart_handler(fdc37c669_t *dev, uint8_t uart)
     uint8_t uart_shift = ((uart ^ 1) << 2);
 
     serial_remove(dev->uart[uart]);
+
     if ((dev->regs[0x02] & pwrdn_mask) && (dev->regs[uart_reg] & 0xc0))
         serial_setup(dev->uart[0], ((uint16_t) dev->regs[0x24]) << 2,
                      (dev->regs[0x28] >> uart_shift) & 0x0f);
@@ -105,9 +112,40 @@ fdc37c669_lpt_handler(fdc37c669_t *dev)
 {
     uint8_t mask = ~(dev->regs[0x04] & 0x01);
 
-    lpt_port_remove(dev->id);
+    lpt_port_remove(dev->lpt);
+
+    if (dev->regs[0x01] & 0x08) {
+        lpt_set_ext(dev->lpt, 0);
+
+        lpt_set_epp(dev->lpt, 0);
+        lpt_set_ecp(dev->lpt, 0);
+    } else {
+        lpt_set_ext(dev->lpt, 1);
+
+        lpt_set_epp(dev->lpt, dev->regs[0x04] & 0x01);
+        lpt_set_ecp(dev->lpt, dev->regs[0x04] & 0x02);
+    }
+
+    lpt_set_fifo_threshold(dev->lpt, dev->regs[0x0a] & 0x0f);
+
     if ((dev->regs[0x01] & 0x04) && (dev->regs[0x23] >= 0x40))
-        lpt_port_init(dev->id, ((uint16_t) (dev->regs[0x23] & mask)) << 2);
+        lpt_port_setup(dev->lpt, ((uint16_t) (dev->regs[0x23] & mask)) << 2);
+}
+
+static void
+ide_handler(fdc37c669_t *dev)
+{
+    if (dev->has_ide > 0) {
+        int ide_id = dev->has_ide - 1;
+
+        ide_handlers(ide_id, 0);
+
+        ide_set_base_addr(ide_id, 0, ((uint16_t) (dev->regs[0x21] & 0xfc)) << 2);
+        ide_set_base_addr(ide_id, 1, (((uint16_t) (dev->regs[0x22] & 0xfc)) << 2) | 0x0006);
+
+        if ((dev->regs[0x00] & 0x03) == 0x02)
+            ide_handlers(ide_id, 1);
+    }
 }
 
 static void
@@ -138,12 +176,14 @@ fdc37c669_write(uint16_t port, uint8_t val, void *priv)
     } else if (!dev->rw_locked || (dev->cur_reg > 0x0f))  switch (dev->cur_reg) {
         case 0x00:
             dev->regs[dev->cur_reg] = (dev->regs[dev->cur_reg] & 0x74) | (val & 0x8b);
-            if (!dev->id && (valxor & 8))
+            if (!dev->id && (valxor & 0x08))
                 fdc_set_power_down(dev->fdc, !(val & 0x08));
+            if (!dev->id && (valxor & 0x03))
+                ide_handler(dev);
             break;
         case 0x01:
             dev->regs[dev->cur_reg] = (dev->regs[dev->cur_reg] & 0x73) | (val & 0x8c);
-            if (valxor & 0x04)
+            if (valxor & 0x0c)
                 fdc37c669_lpt_handler(dev);
             if (valxor & 0x80)
                 dev->rw_locked = !(val & 0x80);
@@ -157,6 +197,17 @@ fdc37c669_write(uint16_t port, uint8_t val, void *priv)
             break;
         case 0x03:
             dev->regs[dev->cur_reg] = (dev->regs[dev->cur_reg] & 0x08) | (val & 0xf7);
+            if ((valxor & 0x60) && (dev->fdc != NULL)) {
+                fdc_clear_flags(dev->fdc, FDC_FLAG_PS2 | FDC_FLAG_PS2_MCA);
+                switch (val & 0x0c) {
+                    case 0x00:
+                        fdc_set_flags(dev->fdc, FDC_FLAG_PS2);
+                        break;
+                    case 0x20:
+                        fdc_set_flags(dev->fdc, FDC_FLAG_PS2_MCA);
+                        break;
+                }
+            }
             if (!dev->id && (valxor & 0x02))
                 fdc_update_enh_mode(dev->fdc, !!(val & 0x02));
             break;
@@ -190,6 +241,8 @@ fdc37c669_write(uint16_t port, uint8_t val, void *priv)
             break;
         case 0x0a:
             dev->regs[dev->cur_reg] = (dev->regs[dev->cur_reg] & 0xf0) | (val & 0x0f);
+            if (valxor & 0x0f)
+                fdc37c669_lpt_handler(dev);
             break;
         case 0x0b:
             dev->regs[dev->cur_reg] = val;
@@ -222,9 +275,13 @@ fdc37c669_write(uint16_t port, uint8_t val, void *priv)
             break;
         case 0x21:
             dev->regs[dev->cur_reg] = val & 0xfc;
+            if (!dev->id && (valxor & 0xfc))
+                ide_handler(dev);
             break;
         case 0x22:
             dev->regs[dev->cur_reg] = (dev->regs[dev->cur_reg] & 0x03) | (val & 0xfc);
+            if (!dev->id && (valxor & 0xfc))
+                ide_handler(dev);
             break;
         case 0x23:
             dev->regs[dev->cur_reg] = val;
@@ -245,13 +302,15 @@ fdc37c669_write(uint16_t port, uint8_t val, void *priv)
             dev->regs[dev->cur_reg] = val;
             if (valxor & 0xf0)
                 fdc_set_dma_ch(dev->fdc, val >> 4);
+            if (valxor & 0x0f)
+                lpt_port_dma(dev->lpt, val & 0x0f);
             break;
         case 0x27:
             dev->regs[dev->cur_reg] = val;
             if (valxor & 0xf0)
                 fdc_set_irq(dev->fdc, val >> 4);
             if (valxor & 0x0f)
-                lpt_port_irq(dev->id, val & 0x0f);
+                lpt_port_irq(dev->lpt, val & 0x0f);
             break;
         case 0x28:
             dev->regs[dev->cur_reg] = val;
@@ -305,9 +364,13 @@ fdc37c669_reset(void *priv)
     dev->regs[0x21] = 0x3c;
     dev->regs[0x22] = 0x3d;
 
-    if (dev->id != 1) {
+    if (!dev->id) {
         fdc_reset(dev->fdc);
+
         fdc37c669_fdc_handler(dev);
+        fdc_clear_flags(dev->fdc, FDC_FLAG_PS2 | FDC_FLAG_PS2_MCA);
+
+        ide_handler(dev);
     }
 
     fdc37c669_uart_handler(dev, 0);
@@ -335,20 +398,39 @@ fdc37c669_close(void *priv)
 static void *
 fdc37c669_init(const device_t *info)
 {
-    fdc37c669_t *dev = (fdc37c669_t *) malloc(sizeof(fdc37c669_t));
-    memset(dev, 0, sizeof(fdc37c669_t));
+    fdc37c669_t *dev = (fdc37c669_t *) calloc(1, sizeof(fdc37c669_t));
 
     dev->id = next_id;
 
-    if (next_id != 1)
-        dev->fdc = device_add(&fdc_at_smc_device);
+    if (next_id != 1) {
+        dev->fdc     = device_add(&fdc_at_smc_device);
+        dev->has_ide = (info->local >> 8) & 0xff;
+    }
 
     dev->uart[0] = device_add_inst(&ns16550_device, (next_id << 1) + 1);
     dev->uart[1] = device_add_inst(&ns16550_device, (next_id << 1) + 2);
 
-    io_sethandler(info->local ? FDC_SECONDARY_ADDR : (next_id ? FDC_SECONDARY_ADDR : FDC_PRIMARY_ADDR),
+    dev->lpt     = device_add_inst(&lpt_port_device, next_id + 1);
+    lpt_set_cnfgb_readout(dev->lpt, 0x00);
+
+    io_sethandler((info->local & FDC37C6XX_370) ? FDC_SECONDARY_ADDR : (next_id ? FDC_SECONDARY_ADDR : FDC_PRIMARY_ADDR),
                   0x0002, fdc37c669_read, NULL, NULL, fdc37c669_write, NULL, NULL, dev);
 
+    dev->dma_map[0] = 4;
+    for (int i = 1; i < 4; i++)
+        dev->dma_map[i] = i;
+
+    memset(dev->irq_map, 0xff, 16);
+    dev->irq_map[0]  = 0xff;
+    for (int i = 1; i < 7; i++)
+         dev->irq_map[i] = i;
+    dev->irq_map[1]  = 5;
+    dev->irq_map[5]  = 7;
+    dev->irq_map[7]  = 0xff;    /* Reserved. */
+    dev->irq_map[8]  = 10;
+    dev->irq_map[9]  = 9;       /* This is used by the Acrosser PJ-A511M for IRQ 9. */
+    dev->irq_map[11] = 11;      /* This is used by the Acrosser PJ-A511M for IRQ 11. */
+
     fdc37c669_reset(dev);
 
     next_id++;
@@ -364,21 +446,7 @@ const device_t fdc37c669_device = {
     .init          = fdc37c669_init,
     .close         = fdc37c669_close,
     .reset         = fdc37c669_reset,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t fdc37c669_370_device = {
-    .name          = "SMC FDC37C669 Super I/O (Port 370h)",
-    .internal_name = "fdc37c669_370",
-    .flags         = 0,
-    .local         = 1,
-    .init          = fdc37c669_init,
-    .close         = fdc37c669_close,
-    .reset         = fdc37c669_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sio/sio_fdc37c67x.c b/src/sio/sio_fdc37c67x.c
index 871f3b1c8..943b78b21 100644
--- a/src/sio/sio_fdc37c67x.c
+++ b/src/sio/sio_fdc37c67x.c
@@ -6,16 +6,15 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          Implementation of the SMC FDC37C67X Super I/O Chip.
- *
- *
+ *          Implementation of the SMC FDC37C67x Super I/O Chips.
  *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2016-2018 Miran Grca.
+ *          Copyright 2025 Miran Grca.
  */
-#include <stdio.h>
+#include <inttypes.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
@@ -23,65 +22,69 @@
 #include <86box/io.h>
 #include <86box/timer.h>
 #include <86box/device.h>
-#include <86box/pic.h>
 #include <86box/pci.h>
+#include <86box/pic.h>
 #include <86box/lpt.h>
 #include <86box/serial.h>
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
 #include <86box/fdd.h>
 #include <86box/fdc.h>
-#include "cpu.h"
-#include <86box/sio.h>
+#include <86box/keyboard.h>
+#include <86box/machine.h>
+#include <86box/apm.h>
+#include <86box/plat.h>
 #include <86box/plat_unused.h>
-
-#define AB_RST 0x80
+#include <86box/video.h>
+#include <86box/sio.h>
+#include "cpu.h"
 
 typedef struct fdc37c67x_t {
-    uint8_t   chip_id;
-    uint8_t   is_apm;
-    uint8_t   tries;
-    uint8_t   gpio_regs[2];
-    uint8_t   auxio_reg;
-    uint8_t   regs[48];
-    uint8_t   ld_regs[11][256];
-    uint16_t  gpio_base; /* Set to EA */
-    uint16_t  auxio_base;
-    uint16_t  sio_base;
-    int       locked;
-    int       cur_reg;
-    fdc_t    *fdc;
-    serial_t *uart[2];
+    uint8_t       is_compaq;
+    uint8_t       max_ld;
+    uint8_t       tries;
+    uint8_t       port_370;
+    uint8_t       gpio_reg;
+    uint8_t       regs[48];
+    uint8_t       ld_regs[11][256];
+    uint16_t      kbc_type;
+    uint16_t      superio_base;
+    uint16_t      fdc_base;
+    uint16_t      lpt_base;
+    uint16_t      kbc_base;
+    uint16_t      gpio_base; /* Set to EA */
+    uint16_t      uart_base[2];
+    int           locked;
+    int           cur_reg;
+    fdc_t        *fdc;
+    void         *kbc;
+    serial_t     *uart[2];
+    lpt_t        *lpt;
 } fdc37c67x_t;
 
 static void    fdc37c67x_write(uint16_t port, uint8_t val, void *priv);
 static uint8_t fdc37c67x_read(uint16_t port, void *priv);
 
 static uint16_t
-make_port(fdc37c67x_t *dev, uint8_t ld)
+make_port_superio(const fdc37c67x_t *dev)
 {
-    uint16_t r0 = dev->ld_regs[ld][0x60];
-    uint16_t r1 = dev->ld_regs[ld][0x61];
+    const uint16_t r0 = dev->regs[0x26];
+    const uint16_t r1 = dev->regs[0x27];
 
-    uint16_t p = (r0 << 8) + r1;
+    const uint16_t p = (r1 << 8) + r0;
 
     return p;
 }
 
-static uint8_t
-fdc37c67x_auxio_read(UNUSED(uint16_t port), void *priv)
+static uint16_t
+make_port(const fdc37c67x_t *dev, const uint8_t ld)
 {
-    const fdc37c67x_t *dev = (fdc37c67x_t *) priv;
+    const uint16_t r0 = dev->ld_regs[ld][0x60];
+    const uint16_t r1 = dev->ld_regs[ld][0x61];
 
-    return dev->auxio_reg;
-}
+    const uint16_t p = (r0 << 8) + r1;
 
-static void
-fdc37c67x_auxio_write(UNUSED(uint16_t port), uint8_t val, void *priv)
-{
-    fdc37c67x_t *dev = (fdc37c67x_t *) priv;
-
-    dev->auxio_reg = val;
+    return p;
 }
 
 static uint8_t
@@ -90,7 +93,18 @@ fdc37c67x_gpio_read(uint16_t port, void *priv)
     const fdc37c67x_t *dev = (fdc37c67x_t *) priv;
     uint8_t            ret = 0xff;
 
-    ret = dev->gpio_regs[port & 1];
+    if (dev->locked) { 
+        if (dev->is_compaq)
+            ret = fdc37c67x_read(port & 0x0001, priv);
+    } else if (port & 0x0001)  switch (dev->gpio_reg) {
+        case 0x03:
+            ret = dev->ld_regs[0x08][0xf4];
+            break;
+        case 0x0c ... 0x0f:
+            ret = dev->ld_regs[0x08][0xb0 + dev->gpio_reg - 0x08];
+            break;
+    } else
+        ret = dev->gpio_reg;
 
     return ret;
 }
@@ -100,377 +114,502 @@ fdc37c67x_gpio_write(uint16_t port, uint8_t val, void *priv)
 {
     fdc37c67x_t *dev = (fdc37c67x_t *) priv;
 
-    if (!(port & 1))
-        dev->gpio_regs[0] = (dev->gpio_regs[0] & 0xfc) | (val & 0x03);
+    if (dev->locked) { 
+        if (dev->is_compaq)
+            fdc37c67x_write(port & 0x0001, val, priv);
+    } else if (port & 0x0001)  switch (dev->gpio_reg) {
+        case 0x03:
+            dev->ld_regs[0x08][0xf4] = val & 0xef;
+            break;
+        case 0x0c: case 0x0e:
+            dev->ld_regs[0x08][0xb0 + dev->gpio_reg - 0x08] = val & 0x9e;
+            break;
+        case 0x0d:
+            dev->ld_regs[0x08][0xb0 + dev->gpio_reg - 0x08] = val & 0xd7;
+            break;
+        case 0x0f:
+            dev->ld_regs[0x08][0xb0 + dev->gpio_reg - 0x08] = val & 0x17;
+            break;
+    } else
+        dev->gpio_reg = val;
+}
+
+static void
+fdc37c67x_superio_handler(fdc37c67x_t *dev)
+{
+    if (!dev->is_compaq) {
+        if (dev->superio_base != 0x0000)
+            io_removehandler(dev->superio_base, 0x0002,
+                             fdc37c67x_read, NULL, NULL, fdc37c67x_write, NULL, NULL, dev);
+        dev->superio_base = make_port_superio(dev);
+        if (dev->superio_base != 0x0000)
+            io_sethandler(dev->superio_base, 0x0002,
+                          fdc37c67x_read, NULL, NULL, fdc37c67x_write, NULL, NULL, dev);
+    }
 }
 
 static void
 fdc37c67x_fdc_handler(fdc37c67x_t *dev)
 {
-    uint16_t ld_port       = 0;
-    uint8_t  global_enable = !!(dev->regs[0x22] & (1 << 0));
-    uint8_t  local_enable  = !!dev->ld_regs[0][0x30];
+    const uint8_t  global_enable = !!(dev->regs[0x22] & (1 << 0));
+    const uint8_t  local_enable  = !!dev->ld_regs[0][0x30];
+    const uint16_t old_base      = dev->fdc_base;
 
-    fdc_remove(dev->fdc);
-    if (global_enable && local_enable) {
-        ld_port = make_port(dev, 0) & 0xFFF8;
-        if ((ld_port >= 0x0100) && (ld_port <= 0x0FF8))
-            fdc_set_base(dev->fdc, ld_port);
+    dev->fdc_base = 0x0000;
+
+    if (global_enable && local_enable)
+        dev->fdc_base = make_port(dev, 0) & 0xfff8;
+
+    if (dev->fdc_base != old_base) {
+        if ((old_base >= 0x0100) && (old_base <= 0x0ff8))
+            fdc_remove(dev->fdc);
+
+        if ((dev->fdc_base >= 0x0100) && (dev->fdc_base <= 0x0ff8))
+            fdc_set_base(dev->fdc, dev->fdc_base);
     }
 }
 
 static void
 fdc37c67x_lpt_handler(fdc37c67x_t *dev)
 {
-    uint16_t ld_port       = 0;
-    uint8_t  global_enable = !!(dev->regs[0x22] & (1 << 3));
-    uint8_t  local_enable  = !!dev->ld_regs[3][0x30];
-    uint8_t  lpt_irq       = dev->ld_regs[3][0x70];
+    uint16_t ld_port         = 0x0000;
+    uint16_t mask            = 0xfffc;
+    uint8_t  global_enable   = !!(dev->regs[0x22] & (1 << 3));
+    uint8_t  local_enable    = !!dev->ld_regs[3][0x30];
+    uint8_t  lpt_irq         = dev->ld_regs[3][0x70];
+    uint8_t  lpt_dma         = dev->ld_regs[3][0x74];
+    uint8_t  lpt_mode        = dev->ld_regs[3][0xf0] & 0x07;
+    uint8_t  irq_readout[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x08,
+                                 0x00, 0x10, 0x18, 0x20, 0x00, 0x00, 0x28, 0x30 };
 
     if (lpt_irq > 15)
         lpt_irq = 0xff;
 
-    lpt1_remove();
+    if (lpt_dma >= 4)
+        lpt_dma = 0xff;
+
+    lpt_port_remove(dev->lpt);
+    lpt_set_fifo_threshold(dev->lpt, (dev->ld_regs[3][0xf0] & 0x78) >> 3);
+    switch (lpt_mode) {
+        default:
+        case 0x04:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x00:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 1);
+            break;
+        case 0x01: case 0x05:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x02:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x03: case 0x07:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+    }
     if (global_enable && local_enable) {
-        ld_port = make_port(dev, 3) & 0xFFFC;
-        if ((ld_port >= 0x0100) && (ld_port <= 0x0FFC))
-            lpt1_init(ld_port);
+        ld_port = (make_port(dev, 3) & 0xfffc) & mask;
+        if ((ld_port >= 0x0100) && (ld_port <= (0x0ffc & mask)))
+            lpt_port_setup(dev->lpt, ld_port);
     }
-    lpt1_irq(lpt_irq);
+    lpt_port_irq(dev->lpt, lpt_irq);
+    lpt_port_dma(dev->lpt, lpt_dma);
+
+    lpt_set_cnfgb_readout(dev->lpt, ((lpt_irq > 15) ? 0x00 : irq_readout[lpt_irq]) |
+                                    ((lpt_dma >= 4) ? 0x00 : lpt_dma));
 }
 
 static void
-fdc37c67x_serial_handler(fdc37c67x_t *dev, int uart)
+fdc37c67x_serial_handler(fdc37c67x_t *dev, const int uart)
 {
-    uint16_t ld_port       = 0;
-    uint8_t  uart_no       = 4 + uart;
-    uint8_t  global_enable = !!(dev->regs[0x22] & (1 << uart_no));
-    uint8_t  local_enable  = !!dev->ld_regs[uart_no][0x30];
+    const uint8_t  uart_no       = 4 + uart;
+    const uint8_t  global_enable = !!(dev->regs[0x22] & (1 << uart_no));
+    const uint8_t  local_enable  = !!dev->ld_regs[uart_no][0x30];
+    const uint16_t old_base      = dev->uart_base[uart];
+    double         clock_src     = 24000000.0 / 13.0;
 
-    serial_remove(dev->uart[uart]);
-    if (global_enable && local_enable) {
-        ld_port = make_port(dev, uart_no) & 0xFFF8;
-        if ((ld_port >= 0x0100) && (ld_port <= 0x0FF8))
-            serial_setup(dev->uart[uart], ld_port, dev->ld_regs[uart_no][0x70]);
+    dev->uart_base[uart] = 0x0000;
+
+    if (global_enable && local_enable)
+        dev->uart_base[uart] = make_port(dev, uart_no) & 0xfff8;
+
+    if (dev->uart_base[uart] != old_base) {
+        if ((old_base >= 0x0100) && (old_base <= 0x0ff8))
+            serial_remove(dev->uart[uart]);
+
+        if ((dev->uart_base[uart] >= 0x0100) && (dev->uart_base[uart] <= 0x0ff8))
+            serial_setup(dev->uart[uart], dev->uart_base[uart], dev->ld_regs[uart_no][0x70]);
     }
+
+    switch (dev->ld_regs[uart_no][0xf0] & 0x03) {
+        case 0x00:
+            clock_src = 24000000.0 / 13.0;
+            break;
+        case 0x01:
+            clock_src = 24000000.0 / 12.0;
+            break;
+        case 0x02:
+            clock_src = 24000000.0 / 1.0;
+            break;
+        case 0x03:
+            clock_src = 24000000.0 / 1.625;
+            break;
+
+        default:
+            break;
+    }
+
+    serial_set_clock_src(dev->uart[uart], clock_src);
+
+    /*
+       TODO: If UART 2's own IRQ pin is also enabled when shared,
+             it should also be asserted.
+     */
+    if (dev->ld_regs[4][0xf0] & 0x80) {
+        serial_irq(dev->uart[0], dev->ld_regs[4][0x70]);
+        serial_irq(dev->uart[1], dev->ld_regs[4][0x70]);
+    } else
+        serial_irq(dev->uart[uart], dev->ld_regs[uart_no][0x70]);
 }
 
 static void
-fdc37c67x_auxio_handler(fdc37c67x_t *dev)
+fdc37c67x_kbc_handler(fdc37c67x_t *dev)
 {
-    uint16_t ld_port      = 0;
-    uint8_t  local_enable = !!dev->ld_regs[8][0x30];
+    const uint8_t  local_enable = !!dev->ld_regs[7][0x30];
+    const uint16_t old_base = dev->kbc_base;
 
-    io_removehandler(dev->auxio_base, 0x0001,
-                     fdc37c67x_auxio_read, NULL, NULL, fdc37c67x_auxio_write, NULL, NULL, dev);
-    if (local_enable) {
-        dev->auxio_base = ld_port = make_port(dev, 8);
-        if ((ld_port >= 0x0100) && (ld_port <= 0x0FFF))
-            io_sethandler(dev->auxio_base, 0x0001,
-                          fdc37c67x_auxio_read, NULL, NULL, fdc37c67x_auxio_write, NULL, NULL, dev);
-    }
-}
+    dev->kbc_base = local_enable ? 0x0060 : 0x0000;
 
-static void
-fdc37c67x_sio_handler(UNUSED(fdc37c67x_t *dev))
-{
-#if 0
-    if (dev->sio_base) {
-        io_removehandler(dev->sio_base, 0x0002,
-             fdc37c67x_read, NULL, NULL, fdc37c67x_write, NULL, NULL, dev);
-    }
-    dev->sio_base = (((uint16_t) dev->regs[0x27]) << 8) | dev->regs[0x26];
-    if (dev->sio_base) {
-        io_sethandler(dev->sio_base, 0x0002,
-             fdc37c67x_read, NULL, NULL, fdc37c67x_write, NULL, NULL, dev);
-    }
-#endif
+    if (dev->kbc_base != old_base)
+        kbc_at_handler(local_enable, dev->kbc_base, dev->kbc);
+
+    kbc_at_set_irq(0, dev->ld_regs[7][0x70], dev->kbc);
+    kbc_at_set_irq(1, dev->ld_regs[7][0x72], dev->kbc);
 }
 
 static void
 fdc37c67x_gpio_handler(fdc37c67x_t *dev)
 {
-    uint16_t ld_port = 0;
-    uint8_t  local_enable;
+    const uint8_t local_enable = !!(dev->regs[0x03] & 0x80) ||
+                                   (dev->is_compaq && dev->locked);
+    const uint16_t old_base    = dev->gpio_base;
 
-    local_enable = !!(dev->regs[0x03] & 0x80);
+    dev->gpio_base = 0x0000;
 
-    io_removehandler(dev->gpio_base, 0x0002,
-                     fdc37c67x_gpio_read, NULL, NULL, fdc37c67x_gpio_write, NULL, NULL, dev);
-    if (local_enable) {
-        switch (dev->regs[0x03] & 0x03) {
-            case 0:
-                ld_port = 0xe0;
-                break;
-            case 1:
-                ld_port = 0xe2;
-                break;
-            case 2:
-                ld_port = 0xe4;
-                break;
-            case 3:
-                ld_port = 0xea; /* Default */
-                break;
+    if (local_enable)  switch (dev->regs[0x03] & 0x03) {
+        default:
+            break;
+        case 0:
+            dev->gpio_base = 0x00e0;
+            break;
+        case 1:
+            dev->gpio_base = 0x00e2;
+            break;
+        case 2:
+            dev->gpio_base = 0x00e4;
+            break;
+        case 3:
+            dev->gpio_base = 0x00ea; /* Default */
+            break;
+    }
 
-            default:
-                break;
-        }
-        dev->gpio_base = ld_port;
-        if (ld_port > 0x0000)
+    if (dev->gpio_base != old_base) {
+        if (old_base != 0x0000)
+            io_removehandler(old_base, 0x0002,
+                         fdc37c67x_gpio_read, NULL, NULL, fdc37c67x_gpio_write, NULL, NULL, dev);
+
+        if (dev->gpio_base > 0x0000)
             io_sethandler(dev->gpio_base, 0x0002,
                           fdc37c67x_gpio_read, NULL, NULL, fdc37c67x_gpio_write, NULL, NULL, dev);
     }
 }
 
 static void
-fdc37c67x_smi_handler(fdc37c67x_t *dev)
+fdc37c67x_state_change(fdc37c67x_t *dev, const uint8_t locked)
 {
-    /* TODO: 8042 P1.2 SMI#. */
-    pic_reset_smi_irq_mask();
-    pic_set_smi_irq_mask(dev->ld_regs[3][0x70], dev->ld_regs[8][0xb4] & 0x02);
-    pic_set_smi_irq_mask(dev->ld_regs[5][0x70], dev->ld_regs[8][0xb4] & 0x04);
-    pic_set_smi_irq_mask(dev->ld_regs[4][0x70], dev->ld_regs[8][0xb4] & 0x08);
-    pic_set_smi_irq_mask(dev->ld_regs[0][0x70], dev->ld_regs[8][0xb4] & 0x10);
-    pic_set_smi_irq_mask(12, dev->ld_regs[8][0xb5] & 0x01);
-    pic_set_smi_irq_mask(1, dev->ld_regs[8][0xb5] & 0x02);
-    pic_set_smi_irq_mask(10, dev->ld_regs[8][0xb5] & 0x80);
+    dev->locked = locked;
+    fdc_3f1_enable(dev->fdc, !locked);
 }
 
 static void
 fdc37c67x_write(uint16_t port, uint8_t val, void *priv)
 {
     fdc37c67x_t *dev    = (fdc37c67x_t *) priv;
-    uint8_t      index  = (port & 1) ? 0 : 1;
-    uint8_t      valxor = 0x00;
-    uint8_t      keep   = 0x00;
+    uint8_t      index  = !(port & 1);
+    uint8_t      valxor;
 
-    if (index) {
-        if ((val == 0x55) && !dev->locked) {
-            if (dev->tries) {
-                dev->locked = 1;
-                fdc_3f1_enable(dev->fdc, 0);
-                dev->tries = 0;
-            } else
-                dev->tries++;
-        } else {
-            if (dev->locked) {
-                if (val == 0xaa) {
-                    dev->locked = 0;
-                    fdc_3f1_enable(dev->fdc, 1);
-                    return;
-                }
+    if (port == 0x00fb) {
+        fdc37c67x_state_change(dev, 1);
+        dev->tries = 0;
+    } else if (port == 0x00f9)
+        fdc37c67x_state_change(dev, 0);
+    else if (index) {
+        if ((!dev->is_compaq) && (val == 0x55) && !dev->locked) {
+            fdc37c67x_state_change(dev, 1);
+            dev->tries = 0;
+        } else if (dev->locked) {
+            if ((!dev->is_compaq) && (val == 0xaa))
+                fdc37c67x_state_change(dev, 0);
+            else
                 dev->cur_reg = val;
-            } else {
-                if (dev->tries)
-                    dev->tries = 0;
-            }
-        }
-        return;
-    } else {
-        if (dev->locked) {
-            if (dev->cur_reg < 48) {
-                valxor = val ^ dev->regs[dev->cur_reg];
-                if ((val == 0x20) || (val == 0x21))
-                    return;
-                dev->regs[dev->cur_reg] = val;
-            } else {
-                valxor = val ^ dev->ld_regs[dev->regs[7]][dev->cur_reg];
-                if (((dev->cur_reg & 0xF0) == 0x70) && (dev->regs[7] < 4))
-                    return;
-                /* Block writes to some logical devices. */
-                if (dev->regs[7] > 0x0a)
-                    return;
-                else
-                    switch (dev->regs[7]) {
-                        case 0x01:
-                        case 0x02:
-                        case 0x07:
-                            return;
+        } else if ((!dev->is_compaq) && dev->tries)
+            dev->tries = 0;
+    } else if (dev->locked) {
+        if (dev->cur_reg < 0x30) {
+            valxor = val ^ dev->regs[dev->cur_reg];
 
-                        default:
+            switch (dev->cur_reg) {
+                case 0x02:
+                    dev->regs[dev->cur_reg] = val;
+                    if (val == 0x02)
+                        fdc37c67x_state_change(dev, 0);
+                    break;
+                case 0x03:
+                    dev->regs[dev->cur_reg] = val & 0x83;
+                    fdc37c67x_gpio_handler(dev);
+                    break;
+                case 0x07: case 0x26:
+                case 0x2b ... 0x2f:
+                    dev->regs[dev->cur_reg] = val;
+                    break;
+                case 0x22:
+                    dev->regs[dev->cur_reg] = val & 0x39;
+
+                    if (valxor & 0x01)
+                        fdc37c67x_fdc_handler(dev);
+                    if (valxor & 0x08)
+                        fdc37c67x_lpt_handler(dev);
+                    if (valxor & 0x10)
+                        fdc37c67x_serial_handler(dev, 0);
+                    if (valxor & 0x20)
+                        fdc37c67x_serial_handler(dev, 1);
+                    break;
+                case 0x23:
+                    dev->regs[dev->cur_reg] = val & 0x39;
+                    break;
+                case 0x24:
+                    dev->regs[dev->cur_reg] = val & 0x4e;
+                    break;
+                case 0x27:
+                    dev->regs[dev->cur_reg] = val;
+                    fdc37c67x_superio_handler(dev);
+                    break;
+                default:
+                    break;
+            }
+        } else {
+            valxor = val ^ dev->ld_regs[dev->regs[7]][dev->cur_reg];
+
+            if (dev->regs[7] <= dev->max_ld)  switch (dev->regs[7]) {
+                case 0x00:    /* FDD */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x70:
+                        case 0x74:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                dev->regs[0x22] |= 0x01;
+                            if (valxor)
+                                fdc37c67x_fdc_handler(dev);
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0xef;
+
+                            if (valxor & 0x01)
+                                fdc_update_enh_mode(dev->fdc, val & 0x01);
+                            if (valxor & 0x0c) {
+                                fdc_clear_flags(dev->fdc, FDC_FLAG_PS2 | FDC_FLAG_PS2_MCA);
+                                switch (val & 0x0c) {
+                                    case 0x00:
+                                        fdc_set_flags(dev->fdc, FDC_FLAG_PS2);
+                                        break;
+                                    case 0x04:
+                                        fdc_set_flags(dev->fdc, FDC_FLAG_PS2_MCA);
+                                        break;
+                                }
+                            }
+                            if (valxor & 0x10)
+                                fdc_set_swap(dev->fdc, (val & 0x10) >> 4);
+                            break;
+                        case 0xf1:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0xfc;
+
+                            if (valxor & 0x0c)
+                                fdc_update_densel_force(dev->fdc, (val & 0xc) >> 2);
+                            break;
+                        case 0xf2:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if (valxor & 0xc0)
+                                fdc_update_rwc(dev->fdc, 3, (val & 0xc0) >> 6);
+                            if (valxor & 0x30)
+                                fdc_update_rwc(dev->fdc, 2, (val & 0x30) >> 4);
+                            if (valxor & 0x0c)
+                                fdc_update_rwc(dev->fdc, 1, (val & 0x0c) >> 2);
+                            if (valxor & 0x03)
+                                fdc_update_rwc(dev->fdc, 0, (val & 0x03));
+                            break;
+                        case 0xf4 ... 0xf7:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x5b;
+
+                            if (valxor & 0x18)
+                                fdc_update_drvrate(dev->fdc, dev->cur_reg - 0xf4,
+                                                   (val & 0x18) >> 3);
                             break;
                     }
-                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val | keep;
+                    break;
+                case 0x03:    /* Parallel Port */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x70:
+                        case 0x74:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                dev->regs[0x22] |= 0x08;
+                            if (valxor)
+                                fdc37c67x_lpt_handler(dev);
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            if (valxor & 0x7f)
+                                fdc37c67x_lpt_handler(dev);
+                            break;
+                        case 0xf1:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x03;
+                            break;
+                    }
+                    break;
+                case 0x04:    /* Serial port 1 */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x70:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                dev->regs[0x22] |= 0x10;
+                            if (valxor)
+                                fdc37c67x_serial_handler(dev, 0);
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x83;
+
+                            if (valxor & 0x83) {
+                                fdc37c67x_serial_handler(dev, 0);
+                                fdc37c67x_serial_handler(dev, 1);
+                            }
+                            break;
+                    }
+                    break;
+                case 0x05:    /* Serial port 2 */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x62: case 0x63:
+                        case 0x70:
+                        case 0x74:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                dev->regs[0x22] |= 0x20;
+                            if (valxor)
+                                fdc37c67x_serial_handler(dev, 1);
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x03;
+
+                            if (valxor & 0x03) {
+                                fdc37c67x_serial_handler(dev, 0);
+                                fdc37c67x_serial_handler(dev, 1);
+                            }
+                            break;
+                        case 0xf1:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x7f;
+                            break;
+                        case 0xf2:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            break;
+                    }
+                    break;
+                case 0x07:    /* Keyboard */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x70: case 0x72:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if (valxor)
+                                fdc37c67x_kbc_handler(dev);
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x84;
+                            break;
+                    }
+                    break;
+                case 0x08:    /* Aux. I/O */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            break;
+                        case 0xb4: case 0xb6:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x9e;
+                            break;
+                        case 0xb5:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0xd7;
+                            break;
+                        case 0xb7:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x17;
+                            break;
+                        case 0xb8:
+                        case 0xf1 ... 0xf3:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            break;
+                        case 0xc0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = (dev->ld_regs[dev->regs[7]][dev->cur_reg] & 0xe4) | (val & 0x1b);
+                            break;
+                        case 0xc1:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x0f;
+                            for (int i = 0; i < 4; i++)
+                                fdc_set_fdd_changed(i, !!(val & (1 << i)));
+                            break;
+                        case 0xf4:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0xef;
+                            break;
+                    }
+                    break;
             }
-        } else
-            return;
-    }
-
-    if (dev->cur_reg < 48) {
-        switch (dev->cur_reg) {
-            case 0x03:
-                if (valxor & 0x83)
-                    fdc37c67x_gpio_handler(dev);
-                dev->regs[0x03] &= 0x83;
-                break;
-            case 0x22:
-                if (valxor & 0x01)
-                    fdc37c67x_fdc_handler(dev);
-                if (valxor & 0x08)
-                    fdc37c67x_lpt_handler(dev);
-                if (valxor & 0x10)
-                    fdc37c67x_serial_handler(dev, 0);
-                if (valxor & 0x20)
-                    fdc37c67x_serial_handler(dev, 1);
-                break;
-            case 0x26:
-            case 0x27:
-                fdc37c67x_sio_handler(dev);
-                break;
-
-            default:
-                break;
         }
-
-        return;
-    }
-
-    switch (dev->regs[7]) {
-        case 0:
-            /* FDD */
-            switch (dev->cur_reg) {
-                case 0x30:
-                case 0x60:
-                case 0x61:
-                    if ((dev->cur_reg == 0x30) && (val & 0x01))
-                        dev->regs[0x22] |= 0x01;
-                    if (valxor)
-                        fdc37c67x_fdc_handler(dev);
-                    break;
-                case 0xF0:
-                    if (valxor & 0x01)
-                        fdc_update_enh_mode(dev->fdc, val & 0x01);
-                    if (valxor & 0x10)
-                        fdc_set_swap(dev->fdc, (val & 0x10) >> 4);
-                    break;
-                case 0xF1:
-                    if (valxor & 0xC)
-                        fdc_update_densel_force(dev->fdc, (val & 0xc) >> 2);
-                    break;
-                case 0xF2:
-                    if (valxor & 0xC0)
-                        fdc_update_rwc(dev->fdc, 3, (val & 0xc0) >> 6);
-                    if (valxor & 0x30)
-                        fdc_update_rwc(dev->fdc, 2, (val & 0x30) >> 4);
-                    if (valxor & 0x0C)
-                        fdc_update_rwc(dev->fdc, 1, (val & 0x0c) >> 2);
-                    if (valxor & 0x03)
-                        fdc_update_rwc(dev->fdc, 0, (val & 0x03));
-                    break;
-                case 0xF4:
-                    if (valxor & 0x18)
-                        fdc_update_drvrate(dev->fdc, 0, (val & 0x18) >> 3);
-                    break;
-                case 0xF5:
-                    if (valxor & 0x18)
-                        fdc_update_drvrate(dev->fdc, 1, (val & 0x18) >> 3);
-                    break;
-                case 0xF6:
-                    if (valxor & 0x18)
-                        fdc_update_drvrate(dev->fdc, 2, (val & 0x18) >> 3);
-                    break;
-                case 0xF7:
-                    if (valxor & 0x18)
-                        fdc_update_drvrate(dev->fdc, 3, (val & 0x18) >> 3);
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-        case 3:
-            /* Parallel port */
-            switch (dev->cur_reg) {
-                case 0x30:
-                case 0x60:
-                case 0x61:
-                case 0x70:
-                    if ((dev->cur_reg == 0x30) && (val & 0x01))
-                        dev->regs[0x22] |= 0x08;
-                    if (valxor)
-                        fdc37c67x_lpt_handler(dev);
-                    if (dev->cur_reg == 0x70)
-                        fdc37c67x_smi_handler(dev);
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-        case 4:
-            /* Serial port 1 */
-            switch (dev->cur_reg) {
-                case 0x30:
-                case 0x60:
-                case 0x61:
-                case 0x70:
-                    if ((dev->cur_reg == 0x30) && (val & 0x01))
-                        dev->regs[0x22] |= 0x10;
-                    if (valxor)
-                        fdc37c67x_serial_handler(dev, 0);
-                    if (dev->cur_reg == 0x70)
-                        fdc37c67x_smi_handler(dev);
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-        case 5:
-            /* Serial port 2 */
-            switch (dev->cur_reg) {
-                case 0x30:
-                case 0x60:
-                case 0x61:
-                case 0x70:
-                    if ((dev->cur_reg == 0x30) && (val & 0x01))
-                        dev->regs[0x22] |= 0x20;
-                    if (valxor)
-                        fdc37c67x_serial_handler(dev, 1);
-                    if (dev->cur_reg == 0x70)
-                        fdc37c67x_smi_handler(dev);
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-        case 8:
-            /* Auxiliary I/O */
-            switch (dev->cur_reg) {
-                case 0x30:
-                case 0x60:
-                case 0x61:
-                case 0x70:
-                    if (valxor)
-                        fdc37c67x_auxio_handler(dev);
-                    break;
-                case 0xb4:
-                case 0xb5:
-                    fdc37c67x_smi_handler(dev);
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-
-        default:
-            break;
     }
 }
 
 static uint8_t
 fdc37c67x_read(uint16_t port, void *priv)
 {
-    fdc37c67x_t *dev      = (fdc37c67x_t *) priv;
-    uint8_t      index    = (port & 1) ? 0 : 1;
-    uint8_t      ret      = 0xff;
-    uint16_t     smi_stat = pic_get_smi_irq_status();
-    int          f_irq    = dev->ld_regs[0][0x70];
-    int          p_irq    = dev->ld_regs[3][0x70];
-    int          s1_irq   = dev->ld_regs[4][0x70];
-    int          s2_irq   = dev->ld_regs[5][0x70];
+    fdc37c67x_t *dev   = (fdc37c67x_t *) priv;
+    uint8_t      index = (port & 1) ? 0 : 1;
+    uint8_t      ret   = 0xff;
+
+    /* Compaq Presario 4500: Unlock at FB, Register at EA, Data at EB, Lock at F9. */
+    if ((port == 0xea) || (port == 0xf9) || (port == 0xfb))
+        index = 1;
+    else if (port == 0xeb)
+        index = 0;
 
     if (dev->locked) {
         if (index)
@@ -478,28 +617,25 @@ fdc37c67x_read(uint16_t port, void *priv)
         else {
             if (dev->cur_reg < 0x30) {
                 if (dev->cur_reg == 0x20)
-                    ret = dev->chip_id;
+                    ret = 0x47;
                 else
                     ret = dev->regs[dev->cur_reg];
-            } else {
-                if ((dev->regs[7] == 0) && (dev->cur_reg == 0xF2)) {
-                    ret = (fdc_get_rwc(dev->fdc, 0) | (fdc_get_rwc(dev->fdc, 1) << 2) | (fdc_get_rwc(dev->fdc, 2) << 4) | (fdc_get_rwc(dev->fdc, 3) << 6));
-                } else
+            } else if (dev->regs[7] <= dev->max_ld) {
+                if ((dev->regs[7] == 0x00) && (dev->cur_reg == 0xf2))
+                    ret = (fdc_get_rwc(dev->fdc, 0) | (fdc_get_rwc(dev->fdc, 1) << 2) |
+                          (fdc_get_rwc(dev->fdc, 2) << 4) | (fdc_get_rwc(dev->fdc, 3) << 6));
+                else if ((dev->regs[7] == 0x08) && (dev->cur_reg == 0xc1)) {
+                    ret = dev->ld_regs[dev->regs[7]][dev->cur_reg] & 0xf0;
+                    for (int i = 0; i < 4; i++)
+                        ret |= (fdc_get_fdd_changed(i) << i);
+                } else if ((dev->regs[7] == 0x08) && (dev->cur_reg == 0xc2))
+                    ret = fdc_get_shadow(dev->fdc);
+                else if ((dev->regs[7] == 0x08) && (dev->cur_reg == 0xc3))
+                    ret = serial_get_shadow(dev->uart[0]);
+                else if ((dev->regs[7] == 0x08) && (dev->cur_reg == 0xc4))
+                    ret = serial_get_shadow(dev->uart[1]);
+                else if ((dev->regs[7] != 0x06) || (dev->cur_reg != 0xf3))
                     ret = dev->ld_regs[dev->regs[7]][dev->cur_reg];
-
-                /* TODO: 8042 P1.2 SMI#. */
-                if ((dev->regs[7] == 8) && (dev->cur_reg == 0xb6)) {
-                    ret = dev->ld_regs[dev->regs[7]][dev->cur_reg] & 0xe1;
-                    ret |= ((!!(smi_stat & (1 << p_irq))) << 1);
-                    ret |= ((!!(smi_stat & (1 << s2_irq))) << 2);
-                    ret |= ((!!(smi_stat & (1 << s1_irq))) << 3);
-                    ret |= ((!!(smi_stat & (1 << f_irq))) << 4);
-                } else if ((dev->regs[7] == 8) && (dev->cur_reg == 0xb7)) {
-                    ret = dev->ld_regs[dev->regs[7]][dev->cur_reg] & 0xec;
-                    ret |= ((!!(smi_stat & (1 << 12))) << 0);
-                    ret |= ((!!(smi_stat & (1 << 1))) << 1);
-                    ret |= ((!!(smi_stat & (1 << 10))) << 4);
-                }
             }
         }
     }
@@ -508,75 +644,86 @@ fdc37c67x_read(uint16_t port, void *priv)
 }
 
 static void
-fdc37c67x_reset(fdc37c67x_t *dev)
+fdc37c67x_reset(void *priv)
 {
-    memset(dev->regs, 0, 48);
+    fdc37c67x_t *dev = (fdc37c67x_t *) priv;
+
+    memset(dev->regs, 0x00, sizeof(dev->regs));
 
     dev->regs[0x03] = 0x03;
-    dev->regs[0x20] = dev->chip_id;
+    dev->regs[0x20] = 0x40;
+    dev->regs[0x21] = 0x01;
     dev->regs[0x22] = 0x39;
     dev->regs[0x24] = 0x04;
-    dev->regs[0x26] = 0xf0;
+    dev->regs[0x26] = dev->port_370 ? 0x70 : 0xf0;
     dev->regs[0x27] = 0x03;
 
-    for (uint8_t i = 0; i < 11; i++)
-        memset(dev->ld_regs[i], 0, 256);
+    for (uint8_t i = 0; i <= 0x0a; i++)
+        memset(dev->ld_regs[i], 0x00, 256);
 
     /* Logical device 0: FDD */
-    dev->ld_regs[0][0x30] = 1;
-    dev->ld_regs[0][0x60] = 3;
-    dev->ld_regs[0][0x61] = 0xf0;
-    dev->ld_regs[0][0x70] = 6;
-    dev->ld_regs[0][0x74] = 2;
-    dev->ld_regs[0][0xf0] = 0x0e;
-    dev->ld_regs[0][0xf2] = 0xff;
+    dev->ld_regs[0x00][0x30] = 0x00;
+    dev->ld_regs[0x00][0x60] = 0x03;
+    dev->ld_regs[0x00][0x61] = 0xf0;
+    dev->ld_regs[0x00][0x70] = 0x06;
+    dev->ld_regs[0x00][0x74] = 0x02;
+    dev->ld_regs[0x00][0xf0] = 0x0e;
+    dev->ld_regs[0x00][0xf2] = 0xff;
 
     /* Logical device 3: Parallel Port */
-    dev->ld_regs[3][0x30] = 1;
-    dev->ld_regs[3][0x60] = 3;
-    dev->ld_regs[3][0x61] = 0x78;
-    dev->ld_regs[3][0x70] = 7;
-    dev->ld_regs[3][0x74] = 4;
-    dev->ld_regs[3][0xf0] = 0x3c;
+    dev->ld_regs[0x03][0x30] = 0x00;
+    dev->ld_regs[0x03][0x60] = 0x03;
+    dev->ld_regs[0x03][0x61] = 0x78;
+    dev->ld_regs[0x03][0x70] = 0x07;
+    dev->ld_regs[0x03][0x74] = 0x04;
+    dev->ld_regs[0x03][0xf0] = 0x3c;
 
     /* Logical device 4: Serial Port 1 */
-    dev->ld_regs[4][0x30] = 1;
-    dev->ld_regs[4][0x60] = 3;
-    dev->ld_regs[4][0x61] = 0xf8;
-    dev->ld_regs[4][0x70] = 4;
-    dev->ld_regs[4][0xf0] = 3;
-    serial_setup(dev->uart[0], COM1_ADDR, dev->ld_regs[4][0x70]);
+    dev->ld_regs[0x04][0x30] = 0x00;
+    dev->ld_regs[0x04][0x60] = 0x03;
+    dev->ld_regs[0x04][0x61] = 0xf8;
+    dev->ld_regs[0x04][0x70] = 0x04;
+    serial_irq(dev->uart[0], dev->ld_regs[4][0x70]);
 
     /* Logical device 5: Serial Port 2 */
-    dev->ld_regs[5][0x30] = 1;
-    dev->ld_regs[5][0x60] = 2;
-    dev->ld_regs[5][0x61] = 0xf8;
-    dev->ld_regs[5][0x70] = 3;
-    dev->ld_regs[5][0x74] = 4;
-    dev->ld_regs[5][0xf1] = 2;
-    dev->ld_regs[5][0xf2] = 3;
-    serial_setup(dev->uart[1], COM2_ADDR, dev->ld_regs[5][0x70]);
+    dev->ld_regs[0x05][0x30] = 0x00;
+    dev->ld_regs[0x05][0x60] = 0x02;
+    dev->ld_regs[0x05][0x61] = 0xf8;
+    dev->ld_regs[0x05][0x70] = 0x03;
+    dev->ld_regs[0x05][0x74] = 0x04;
+    dev->ld_regs[0x05][0xf1] = 0x02;
+    dev->ld_regs[0x05][0xf2] = 0x03;
+    serial_irq(dev->uart[1], dev->ld_regs[5][0x70]);
 
     /* Logical device 7: Keyboard */
-    dev->ld_regs[7][0x30] = 1;
-    dev->ld_regs[7][0x61] = 0x60;
-    dev->ld_regs[7][0x70] = 1;
-    dev->ld_regs[7][0x72] = 12;
+    dev->ld_regs[0x07][0x30] = 0x00;
+    dev->ld_regs[0x07][0x61] = 0x60;
+    dev->ld_regs[0x07][0x70] = 0x01;
 
     /* Logical device 8: Auxiliary I/O */
-    dev->ld_regs[8][0xc0] = 6;
-    dev->ld_regs[8][0xc1] = 3;
+    dev->ld_regs[0x08][0x30] = 0x00;
+    dev->ld_regs[0x08][0x60] = 0x00;
+    dev->ld_regs[0x08][0x61] = 0x00;
+    dev->ld_regs[0x08][0xc0] = 0x06;
+    dev->ld_regs[0x08][0xc1] = 0x03;
 
     fdc37c67x_gpio_handler(dev);
     fdc37c67x_lpt_handler(dev);
     fdc37c67x_serial_handler(dev, 0);
     fdc37c67x_serial_handler(dev, 1);
-    fdc37c67x_auxio_handler(dev);
-    fdc37c67x_sio_handler(dev);
 
+    fdc_clear_flags(dev->fdc, FDC_FLAG_PS2 | FDC_FLAG_PS2_MCA);
     fdc_reset(dev->fdc);
+
     fdc37c67x_fdc_handler(dev);
 
+    for (int i = 0; i < 4; i++)
+        fdc_set_fdd_changed(i, 1);
+
+    fdc37c67x_kbc_handler(dev);
+
+    fdc37c67x_superio_handler(dev);
+
     dev->locked = 0;
 }
 
@@ -591,41 +738,70 @@ fdc37c67x_close(void *priv)
 static void *
 fdc37c67x_init(const device_t *info)
 {
-    fdc37c67x_t *dev = (fdc37c67x_t *) malloc(sizeof(fdc37c67x_t));
-    memset(dev, 0, sizeof(fdc37c67x_t));
+    fdc37c67x_t *dev = (fdc37c67x_t *) calloc(1, sizeof(fdc37c67x_t));
 
     dev->fdc = device_add(&fdc_at_smc_device);
 
-    dev->uart[0] = device_add_inst(&ns16550_device, 1);
-    dev->uart[1] = device_add_inst(&ns16550_device, 2);
+    dev->uart[0]   = device_add_inst(&ns16550_device, 1);
+    dev->uart[1]   = device_add_inst(&ns16550_device, 2);
 
-    dev->chip_id = info->local & 0xff;
+    dev->lpt       = device_add_inst(&lpt_port_device, 1);
 
-    dev->gpio_regs[0] = 0xff;
-#if 0
-    dev->gpio_regs[1] = (info->local == 0x0030) ? 0xff : 0xfd;
-#endif
-    dev->gpio_regs[1] = (dev->chip_id == 0x30) ? 0xff : 0xfd;
+    dev->kbc_type  = info->local & FDC37XXXX_KBC;
+
+    dev->is_compaq = (dev->kbc_type == FDC37XXX1);
+
+    dev->port_370  = !!(info->local & FDC37XXXX_370);
+
+    dev->max_ld    = 8;
+
+    if (dev->is_compaq) {
+        io_sethandler(0x0f9, 0x0001,
+                      fdc37c67x_read, NULL, NULL, fdc37c67x_write, NULL, NULL, dev);
+        io_sethandler(0x0fb, 0x0001,
+                      fdc37c67x_read, NULL, NULL, fdc37c67x_write, NULL, NULL, dev);
+    }
+
+    switch (dev->kbc_type) {
+        case FDC37XXX1:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) KBC_VEN_COMPAQ);
+            break;
+        case FDC37XXX2:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_AMI | 0x00003500));
+            break;
+        case FDC37XXX3:
+        default:
+            dev->kbc = device_add(&kbc_at_device);
+            break;
+        case FDC37XXX5:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_PHOENIX | 0x00013800));
+            break;
+        case FDC37XXX7:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_PHOENIX | 0x00041600));
+            break;
+    }
+
+    /* Set the defaults here so the ports can be removed by fdc37c67x_reset(). */
+    dev->fdc_base     = 0x03f0;
+    dev->lpt_base     = 0x0378;
+    dev->uart_base[0] = 0x03f8;
+    dev->uart_base[1] = 0x02f8;
+    dev->kbc_base     = 0x0060;
 
     fdc37c67x_reset(dev);
 
-    io_sethandler(FDC_SECONDARY_ADDR, 0x0002,
-                  fdc37c67x_read, NULL, NULL, fdc37c67x_write, NULL, NULL, dev);
-    io_sethandler(FDC_PRIMARY_ADDR, 0x0002,
-                  fdc37c67x_read, NULL, NULL, fdc37c67x_write, NULL, NULL, dev);
-
     return dev;
 }
 
 const device_t fdc37c67x_device = {
-    .name          = "SMC FDC37C67X Super I/O",
+    .name          = "SMC FDC37C67x Super I/O",
     .internal_name = "fdc37c67x",
     .flags         = 0,
-    .local         = 0x40,
+    .local         = 0,
     .init          = fdc37c67x_init,
     .close         = fdc37c67x_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .reset         = fdc37c67x_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sio/sio_fdc37c6xx.c b/src/sio/sio_fdc37c6xx.c
index 22b88615d..64fa8d6c7 100644
--- a/src/sio/sio_fdc37c6xx.c
+++ b/src/sio/sio_fdc37c6xx.c
@@ -9,11 +9,9 @@
  *          Implementation of the SMC FDC37C663 and FDC37C665 Super
  *          I/O Chips.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2016-2020 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -32,6 +30,7 @@
 #include <86box/fdd.h>
 #include <86box/fdc.h>
 #include <86box/sio.h>
+#include "cpu.h"
 
 typedef struct fdc37c6xx_t {
     uint8_t   max_reg;
@@ -44,6 +43,7 @@ typedef struct fdc37c6xx_t {
     int       com4_addr;
     fdc_t    *fdc;
     serial_t *uart[2];
+    lpt_t    *lpt;
 } fdc37c6xx_t;
 
 static void
@@ -106,26 +106,73 @@ set_serial_addr(fdc37c6xx_t *dev, int port)
 }
 
 static void
-lpt1_handler(fdc37c6xx_t *dev)
+lpt_handler(fdc37c6xx_t *dev)
 {
-    lpt1_remove();
-    switch (dev->regs[1] & 3) {
-        case 1:
-            lpt1_init(LPT_MDA_ADDR);
-            lpt1_irq(7);
+    uint16_t lpt_port     = 0x0000;
+    uint16_t mask         = 0xfffc;
+    uint8_t  local_enable = 1;
+    uint8_t  lpt_irq      = LPT1_IRQ;
+    uint8_t  lpt_ext      = !(dev->regs[1] & 0x08);
+    uint8_t  lpt_mode     = (dev->chip_id >= 0x65) ? (dev->regs[4] & 0x03) : 0x00;
+
+    switch (dev->regs[1] & 0x03) {
+        case 0x01:
+            lpt_port     = LPT_MDA_ADDR;
+            lpt_irq      = LPT_MDA_IRQ;
             break;
-        case 2:
-            lpt1_init(LPT1_ADDR);
-            lpt1_irq(7 /*5*/);
+        case 0x02:
+            lpt_port     = LPT1_ADDR;
+            lpt_irq      = LPT1_IRQ /*LPT2_IRQ*/;
             break;
-        case 3:
-            lpt1_init(LPT2_ADDR);
-            lpt1_irq(7 /*5*/);
+        case 0x03:
+            lpt_port     = LPT2_ADDR;
+            lpt_irq      = LPT1_IRQ /*LPT2_IRQ*/;
             break;
 
         default:
+            local_enable = 0;
             break;
     }
+
+    if (lpt_irq > 15)
+        lpt_irq = 0xff;
+
+    lpt_port_remove(dev->lpt);
+    lpt_set_fifo_threshold(dev->lpt, dev->regs[0x0a] & 0x0f);
+    if (lpt_ext)  switch (lpt_mode) {
+        default:
+        case 0x00:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 1);
+            break;
+        case 0x01:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x02:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x03:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+    } else {
+        lpt_set_epp(dev->lpt, 0);
+        lpt_set_ecp(dev->lpt, 0);
+        lpt_set_ext(dev->lpt, 0);
+    }
+
+    if (local_enable && (lpt_port >= 0x0100) && (lpt_port <= (0x0ffc & mask)))
+        lpt_port_setup(dev->lpt, lpt_port);
+
+    lpt_port_irq(dev->lpt, lpt_irq);
 }
 
 static void
@@ -139,19 +186,16 @@ fdc_handler(fdc37c6xx_t *dev)
 static void
 ide_handler(fdc37c6xx_t *dev)
 {
-    /* TODO: Make an ide_disable(channel) and ide_enable(channel) so we can simplify this. */
-    if (dev->has_ide == 2) {
-        ide_sec_disable();
-        ide_set_base(1, (dev->regs[0x05] & 0x02) ? 0x170 : 0x1f0);
-        ide_set_side(1, (dev->regs[0x05] & 0x02) ? 0x376 : 0x3f6);
+    if (dev->has_ide > 0) {
+        int ide_id = dev->has_ide - 1;
+
+        ide_handlers(ide_id, 0);
+
+        ide_set_base_addr(ide_id, 0, (dev->regs[0x05] & 0x02) ? 0x0170 : 0x01f0);
+        ide_set_base_addr(ide_id, 1, (dev->regs[0x05] & 0x02) ? 0x0376 : 0x03f6);
+
         if (dev->regs[0x00] & 0x01)
-            ide_sec_enable();
-    } else if (dev->has_ide == 1) {
-        ide_pri_disable();
-        ide_set_base(0, (dev->regs[0x05] & 0x02) ? 0x170 : 0x1f0);
-        ide_set_side(0, (dev->regs[0x05] & 0x02) ? 0x376 : 0x3f6);
-        if (dev->regs[0x00] & 0x01)
-            ide_pri_enable();
+            ide_handlers(ide_id, 1);
     }
 }
 
@@ -175,38 +219,38 @@ fdc37c6xx_write(uint16_t port, uint8_t val, void *priv)
             dev->regs[dev->cur_reg] = val;
 
             switch (dev->cur_reg) {
-                case 0:
+                case 0x00:
                     if (dev->has_ide && (valxor & 0x01))
                         ide_handler(dev);
                     if (valxor & 0x10)
                         fdc_handler(dev);
                     break;
-                case 1:
-                    if (valxor & 3)
-                        lpt1_handler(dev);
+                case 0x01:
+                    if (valxor & 0x0b)
+                        lpt_handler(dev);
                     if (valxor & 0x60) {
                         set_com34_addr(dev);
                         set_serial_addr(dev, 0);
                         set_serial_addr(dev, 1);
                     }
                     break;
-                case 2:
-                    if (valxor & 7)
+                case 0x02:
+                    if (valxor & 0x07)
                         set_serial_addr(dev, 0);
                     if (valxor & 0x70)
                         set_serial_addr(dev, 1);
                     break;
-                case 3:
-                    if (valxor & 2)
-                        fdc_update_enh_mode(dev->fdc, (dev->regs[3] & 2) ? 1 : 0);
+                case 0x03:
+                    if (valxor & 0x02)
+                        fdc_update_enh_mode(dev->fdc, !!(dev->regs[0x03] & 0x02));
                     break;
-                case 4:
+                case 0x04:
                     if (valxor & 0x10)
                         set_serial_addr(dev, 0);
                     if (valxor & 0x20)
                         set_serial_addr(dev, 1);
                     break;
-                case 5:
+                case 0x05:
                     if (valxor & 0x01)
                         fdc_handler(dev);
                     if (dev->has_ide && (valxor & 0x02))
@@ -216,6 +260,10 @@ fdc37c6xx_write(uint16_t port, uint8_t val, void *priv)
                     if (valxor & 0x20)
                         fdc_set_swap(dev->fdc, (dev->regs[5] & 0x20) >> 5);
                     break;
+                case 0x0a:
+                    if (valxor)
+                        lpt_handler(dev);
+                    break;
 
                 default:
                     break;
@@ -232,7 +280,7 @@ fdc37c6xx_read(uint16_t port, void *priv)
     uint8_t            ret = 0xff;
 
     if (dev->tries == 2) {
-        if (port == 0x3f1)
+        if ((port == 0x03f1) && (dev->cur_reg <= dev->max_reg))
             ret = dev->regs[dev->cur_reg];
     }
 
@@ -251,8 +299,8 @@ fdc37c6xx_reset(fdc37c6xx_t *dev)
     serial_remove(dev->uart[1]);
     serial_setup(dev->uart[1], COM2_ADDR, COM2_IRQ);
 
-    lpt1_remove();
-    lpt1_init(LPT1_ADDR);
+    lpt_port_remove(dev->lpt);
+    lpt_port_setup(dev->lpt, LPT1_ADDR);
 
     fdc_reset(dev->fdc);
     fdc_remove(dev->fdc);
@@ -293,7 +341,7 @@ fdc37c6xx_reset(fdc37c6xx_t *dev)
     set_serial_addr(dev, 0);
     set_serial_addr(dev, 1);
 
-    lpt1_handler(dev);
+    lpt_handler(dev);
 
     fdc_handler(dev);
 
@@ -312,10 +360,12 @@ fdc37c6xx_close(void *priv)
 static void *
 fdc37c6xx_init(const device_t *info)
 {
-    fdc37c6xx_t *dev = (fdc37c6xx_t *) malloc(sizeof(fdc37c6xx_t));
-    memset(dev, 0, sizeof(fdc37c6xx_t));
+    fdc37c6xx_t *dev = (fdc37c6xx_t *) calloc(1, sizeof(fdc37c6xx_t));
 
-    dev->fdc = device_add(&fdc_at_smc_device);
+    if (dev->chip_id >= 0x63)
+        dev->fdc = device_add(&fdc_at_smc_device);
+    else
+        dev->fdc = device_add(&fdc_at_smc_661_device);
 
     dev->chip_id = info->local & 0xff;
     dev->has_ide = (info->local >> 8) & 0xff;
@@ -328,179 +378,30 @@ fdc37c6xx_init(const device_t *info)
         dev->uart[1] = device_add_inst(&ns16450_device, 2);
     }
 
-    io_sethandler(FDC_PRIMARY_ADDR, 0x0002,
-                  fdc37c6xx_read, NULL, NULL, fdc37c6xx_write, NULL, NULL, dev);
+    dev->lpt = device_add_inst(&lpt_port_device, 1);
+    lpt_set_cnfgb_readout(dev->lpt, 0x00);
+
+    if (info->local & FDC37C6XX_370)
+        io_sethandler(FDC_SECONDARY_ADDR, 0x0002,
+                      fdc37c6xx_read, NULL, NULL, fdc37c6xx_write, NULL, NULL, dev);
+    else
+        io_sethandler(FDC_PRIMARY_ADDR, 0x0002,
+                      fdc37c6xx_read, NULL, NULL, fdc37c6xx_write, NULL, NULL, dev);
 
     fdc37c6xx_reset(dev);
 
     return dev;
 }
 
-/* The three appear to differ only in the chip ID, if I
-   understood their datasheets correctly. */
-const device_t fdc37c651_device = {
-    .name          = "SMC FDC37C651 Super I/O",
-    .internal_name = "fdc37c651",
+const device_t fdc37c6xx_device = {
+    .name          = "SMC FDC37C6xx Super I/O",
+    .internal_name = "fdc37c6xx",
     .flags         = 0,
-    .local         = 0x51,
+    .local         = 0,
     .init          = fdc37c6xx_init,
     .close         = fdc37c6xx_close,
     .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t fdc37c651_ide_device = {
-    .name          = "SMC FDC37C651 Super I/O (With IDE)",
-    .internal_name = "fdc37c651_ide",
-    .flags         = 0,
-    .local         = 0x151,
-    .init          = fdc37c6xx_init,
-    .close         = fdc37c6xx_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t fdc37c661_device = {
-    .name          = "SMC FDC37C661 Super I/O",
-    .internal_name = "fdc37c661",
-    .flags         = 0,
-    .local         = 0x61,
-    .init          = fdc37c6xx_init,
-    .close         = fdc37c6xx_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t fdc37c661_ide_device = {
-    .name          = "SMC FDC37C661 Super I/O (With IDE)",
-    .internal_name = "fdc37c661_ide",
-    .flags         = 0,
-    .local         = 0x161,
-    .init          = fdc37c6xx_init,
-    .close         = fdc37c6xx_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t fdc37c661_ide_sec_device = {
-    .name          = "SMC FDC37C661 Super I/O (With Secondary IDE)",
-    .internal_name = "fdc37c661_ide",
-    .flags         = 0,
-    .local         = 0x261,
-    .init          = fdc37c6xx_init,
-    .close         = fdc37c6xx_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t fdc37c663_device = {
-    .name          = "SMC FDC37C663 Super I/O",
-    .internal_name = "fdc37c663",
-    .flags         = 0,
-    .local         = 0x63,
-    .init          = fdc37c6xx_init,
-    .close         = fdc37c6xx_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t fdc37c663_ide_device = {
-    .name          = "SMC FDC37C663 Super I/O (With IDE)",
-    .internal_name = "fdc37c663_ide",
-    .flags         = 0,
-    .local         = 0x163,
-    .init          = fdc37c6xx_init,
-    .close         = fdc37c6xx_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t fdc37c665_device = {
-    .name          = "SMC FDC37C665 Super I/O",
-    .internal_name = "fdc37c665",
-    .flags         = 0,
-    .local         = 0x65,
-    .init          = fdc37c6xx_init,
-    .close         = fdc37c6xx_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t fdc37c665_ide_device = {
-    .name          = "SMC FDC37C665 Super I/O (With IDE)",
-    .internal_name = "fdc37c665_ide",
-    .flags         = 0,
-    .local         = 0x265,
-    .init          = fdc37c6xx_init,
-    .close         = fdc37c6xx_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t fdc37c665_ide_pri_device = {
-    .name          = "SMC FDC37C665 Super I/O (With Primary IDE)",
-    .internal_name = "fdc37c665_ide_pri",
-    .flags         = 0,
-    .local         = 0x165,
-    .init          = fdc37c6xx_init,
-    .close         = fdc37c6xx_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t fdc37c665_ide_sec_device = {
-    .name          = "SMC FDC37C665 Super I/O (With Secondary IDE)",
-    .internal_name = "fdc37c665_ide_sec",
-    .flags         = 0,
-    .local         = 0x265,
-    .init          = fdc37c6xx_init,
-    .close         = fdc37c6xx_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t fdc37c666_device = {
-    .name          = "SMC FDC37C666 Super I/O",
-    .internal_name = "fdc37c666",
-    .flags         = 0,
-    .local         = 0x66,
-    .init          = fdc37c6xx_init,
-    .close         = fdc37c6xx_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sio/sio_fdc37c93x.c b/src/sio/sio_fdc37c93x.c
index 4acbfeff5..47e73ebae 100644
--- a/src/sio/sio_fdc37c93x.c
+++ b/src/sio/sio_fdc37c93x.c
@@ -6,17 +6,15 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          Implementation of the SMC FDC37C932FR and FDC37C935 Super
- *          I/O Chips.
- *
- *
+ *          Implementation of the SMC FDC37C93x Super I/O Chips.
  *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
  *          Copyright 2016-2018 Miran Grca.
  */
-#include <stdio.h>
+#include <inttypes.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
@@ -25,67 +23,102 @@
 #include <86box/timer.h>
 #include <86box/device.h>
 #include <86box/pci.h>
+#include <86box/pic.h>
 #include <86box/lpt.h>
 #include <86box/serial.h>
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
 #include <86box/fdd.h>
 #include <86box/fdc.h>
+#include <86box/keyboard.h>
+#include <86box/machine.h>
 #include <86box/nvr.h>
 #include <86box/apm.h>
+#include <86box/access_bus.h>
 #include <86box/acpi.h>
-#include <86box/sio.h>
+#include <86box/plat.h>
 #include <86box/plat_unused.h>
-
-#define AB_RST 0x80
-
-typedef struct access_bus_t {
-    uint8_t  control;
-    uint8_t  status;
-    uint8_t  own_addr;
-    uint8_t  data;
-    uint8_t  clock;
-    uint16_t base;
-} access_bus_t;
+#include <86box/video.h>
+#include <86box/sio.h>
+#include "cpu.h"
 
 typedef struct fdc37c93x_t {
     uint8_t       chip_id;
     uint8_t       is_apm;
+    uint8_t       is_compaq;
+    uint8_t       has_nvr;
+    uint8_t       max_ld;
     uint8_t       tries;
-    uint8_t       gpio_regs[2];
+    uint8_t       port_370;
+    uint8_t       gpio_reg;
+    uint8_t       gpio_regs[256];
+    uint8_t       gpio_pulldn[8];
     uint8_t       auxio_reg;
     uint8_t       regs[48];
+    uint8_t       alt_regs[3][8];
     uint8_t       ld_regs[11][256];
+    uint16_t      kbc_type;
+    uint16_t      superio_base;
+    uint16_t      fdc_base;
+    uint16_t      lpt_base;
+    uint16_t      nvr_pri_base;
+    uint16_t      nvr_sec_base;
+    uint16_t      kbc_base;
     uint16_t      gpio_base; /* Set to EA */
     uint16_t      auxio_base;
-    uint16_t      nvr_sec_base;
+    uint16_t      uart_base[2];
     int           locked;
     int           cur_reg;
     fdc_t        *fdc;
-    serial_t     *uart[2];
     access_bus_t *access_bus;
     nvr_t        *nvr;
     acpi_t       *acpi;
+    void         *kbc;
+    serial_t     *uart[2];
+    lpt_t        *lpt;
 } fdc37c93x_t;
 
-static uint16_t
-make_port(fdc37c93x_t *dev, uint8_t ld)
-{
-    uint16_t r0 = dev->ld_regs[ld][0x60];
-    uint16_t r1 = dev->ld_regs[ld][0x61];
+static void    fdc37c93x_write(uint16_t port, uint8_t val, void *priv);
+static uint8_t fdc37c93x_read(uint16_t port, void *priv);
 
-    uint16_t p = (r0 << 8) + r1;
+static uint8_t gp_func_regs[8][8] = { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },      /* GP00-GP07 */
+                                      { 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7 },      /* GP10-GP17 */
+                                      { 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef },      /* GP20-GP27 */
+                                      { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },      /* GP30-GP37 */
+                                      { 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7 },      /* GP40-GP47 */
+                                      { 0xc8, 0xc9, 0xff, 0xcb, 0xcc, 0xff, 0xff, 0xff },      /* GP50-GP57 */
+                                      { 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7 },      /* GP60-GP67 */
+                                      { 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf } };    /* GP70-GP77 */
+
+static uint16_t
+make_port_superio(const fdc37c93x_t *dev)
+{
+    const uint16_t r0 = dev->regs[0x26];
+    const uint16_t r1 = dev->regs[0x27];
+
+    const uint16_t p = (r1 << 8) + r0;
 
     return p;
 }
 
 static uint16_t
-make_port_sec(fdc37c93x_t *dev, uint8_t ld)
+make_port(const fdc37c93x_t *dev, const uint8_t ld)
 {
-    uint16_t r0 = dev->ld_regs[ld][0x62];
-    uint16_t r1 = dev->ld_regs[ld][0x63];
+    const uint16_t r0 = dev->ld_regs[ld][0x60];
+    const uint16_t r1 = dev->ld_regs[ld][0x61];
 
-    uint16_t p = (r0 << 8) + r1;
+    const uint16_t p = (r0 << 8) + r1;
+
+    return p;
+}
+
+static uint16_t
+make_port_sec(const fdc37c93x_t *dev, const uint8_t ld)
+{
+    const uint16_t r0 = dev->ld_regs[ld][0x62];
+    const uint16_t r1 = dev->ld_regs[ld][0x63];
+
+    const uint16_t p = (r0 << 8) + r1;
 
     return p;
 }
@@ -106,13 +139,562 @@ fdc37c93x_auxio_write(UNUSED(uint16_t port), uint8_t val, void *priv)
     dev->auxio_reg = val;
 }
 
+static __inline uint8_t
+fdc37c93x_do_read_gp(fdc37c93x_t *dev, int reg, int bit)
+{
+    /* Update bit 2 on the Acer V35N according to the selected graphics card type. */
+    if ((reg == 2) && (strstr(machine_get_internal_name(), "acer") != NULL))
+        dev->gpio_pulldn[reg] = (dev->gpio_pulldn[reg] & 0xfb) | (video_is_mda() ? 0x00 : 0x04);
+
+    return dev->gpio_regs[reg] & dev->gpio_pulldn[reg] & (1 << bit);
+}
+
+static __inline uint8_t
+fdc37c93x_do_read_alt(const fdc37c93x_t *dev, int alt, int reg, int bit)
+{
+    return dev->alt_regs[alt][reg] & (1 << bit);
+}
+
+static uint8_t
+fdc37c93x_read_gp(const fdc37c93x_t *dev, int reg, int bit)
+{
+    uint8_t gp_reg      = gp_func_regs[reg][bit];
+    uint8_t gp_func_reg = dev->ld_regs[0x08][gp_reg];
+    uint8_t gp_func;
+    uint8_t ret         = 1 << bit;
+
+    if (gp_func_reg & 0x01)  switch (reg) {
+        default:
+            /* Do nothing, this GP does not exist. */
+            break;
+        case 1:
+            switch (bit) {
+               default:
+                    gp_func = (gp_func_reg >> 3) & 0x01;
+                    if (gp_func == 0x00)
+                        ret = fdc37c93x_do_read_gp((fdc37c93x_t *) dev, reg, bit);
+                    else
+                        ret = fdc37c93x_do_read_alt(dev, 0, reg, bit);
+                    break;
+                case 1:
+                    gp_func = (gp_func_reg >> 3) & 0x03;
+                    if (!(gp_func & 0x01)) {
+                        if (gp_func & 0x02)
+                            ret = fdc37c93x_do_read_alt(dev, 0, reg, bit);
+                        else
+                            ret = fdc37c93x_do_read_gp((fdc37c93x_t *) dev, reg, bit);
+                    }
+                    break;
+                case 3:
+                    gp_func = (gp_func_reg >> 3) & 0x01;
+                    if (gp_func == 0x01)
+                        /* TODO: Write to power LED if it's ever implemented. */
+                        ret = fdc37c93x_do_read_alt(dev, 0, reg, bit);
+                    else
+                        ret = fdc37c93x_do_read_gp((fdc37c93x_t *) dev, reg, bit);
+                    break;
+               case 6:
+                    gp_func = (gp_func_reg >> 3) & 0x03;
+                    switch (gp_func) {
+                        case 0:
+                            ret = fdc37c93x_do_read_gp((fdc37c93x_t *) dev, reg, bit);
+                            break;
+                        case 1 ... 3:
+                            ret = fdc37c93x_do_read_alt(dev, gp_func - 1, reg, bit);
+                            break;
+                    }
+                    break;
+            }
+            break;
+        case 2:
+            switch (bit) {
+                default:
+                    gp_func = (gp_func_reg >> 3) & 0x01;
+                    if (gp_func == 0x00)
+                        ret = fdc37c93x_do_read_gp((fdc37c93x_t *) dev, reg, bit);
+                    else
+                        ret = fdc37c93x_do_read_alt(dev, 0, reg, bit);
+                    break;
+                case 0:
+                    gp_func = (gp_func_reg >> 3) & 0x03;
+                    switch (gp_func) {
+                        case 0:
+                            ret = fdc37c93x_do_read_gp((fdc37c93x_t *) dev, reg, bit);
+                            break;
+                        case 1:
+                            ret = fdc37c93x_do_read_alt(dev, 0, reg, bit);
+                            break;
+                        case 2:
+                            ret = kbc_at_read_p(dev->kbc, 2, 0x01) ? (1 << bit) : 0x00;
+                            break;
+                    }
+                    break;
+                case 1: case 2:
+                    gp_func = (gp_func_reg >> 3) & 0x03;
+                    switch (gp_func) {
+                        case 0:
+                            ret = fdc37c93x_do_read_gp((fdc37c93x_t *) dev, reg, bit);
+                            break;
+                        case 1: case 2:
+                            ret = fdc37c93x_do_read_alt(dev, gp_func - 1, reg, bit);
+                            break;
+                    }
+                    break;
+                case 5:
+                    gp_func = (gp_func_reg >> 3) & 0x01;
+                    if (gp_func == 0x00)
+                        ret = fdc37c93x_do_read_gp((fdc37c93x_t *) dev, reg, bit);
+                    else
+                        ret = kbc_at_read_p(dev->kbc, 2, 0x02) ? (1 << bit) : 0x00;
+                    break;
+                case 6: case 7:
+                    /* Do nothing, these bits do not exist. */
+                    break;
+            }
+            break;
+        case 4:
+            gp_func = (gp_func_reg >> 3) & 0x03;
+            switch (bit) {
+                default:
+                    switch (gp_func) {
+                        case 0:
+                            ret = fdc37c93x_do_read_alt(dev, 0, reg, bit);
+                            break;
+                        case 1:
+                            ret = fdc37c93x_do_read_gp((fdc37c93x_t *) dev, reg, bit);
+                            break;
+                    }
+                    break;
+                case 0: case 1:
+                    switch (gp_func) {
+                        case 0:
+                            ret = fdc_get_media_id(dev->fdc, bit ^ 1) ? (1 << bit) : 0x00;
+                            break;
+                        case 1:
+                            ret = fdc37c93x_do_read_gp((fdc37c93x_t *) dev, reg, bit);
+                            break;
+                    }
+                    break;
+                case 6:
+                    switch (gp_func) {
+                        case 0:
+                            ret = fdc37c93x_do_read_alt(dev, 0, reg, bit);
+                            break;
+                        case 1:
+                            ret = fdc37c93x_do_read_gp((fdc37c93x_t *) dev, reg, bit);
+                            break;
+                        case 2:
+                            /* TODO: Write to power LED if it's ever implemented. */
+                            ret = fdc37c93x_do_read_alt(dev, 1, reg, bit);
+                            break;
+                        case 3:
+                            ret = fdc37c93x_do_read_alt(dev, 2, reg, bit);
+                            break;
+                    }
+                    break;
+                case 7:
+                    switch (gp_func) {
+                        case 0:
+                            ret = fdc37c93x_do_read_alt(dev, 0, reg, bit);
+                            break;
+                        case 1:
+                            ret = fdc37c93x_do_read_gp((fdc37c93x_t *) dev, reg, bit);
+                            break;
+                        case 2:
+                            ret = fdc37c93x_do_read_alt(dev, 1, reg, bit);
+                            break;
+                    }
+                    break;
+            }
+            break;
+        case 5:
+            gp_func = (gp_func_reg >> 3) & 0x03;
+            switch (bit) {
+                default:
+                    break;
+                case 0: case 3: case 4:
+                    switch (gp_func) {
+                        case 0:
+                            ret = fdc37c93x_do_read_alt(dev, 0, reg, bit);
+                            break;
+                        case 1:
+                            ret = fdc37c93x_do_read_gp((fdc37c93x_t *) dev, reg, bit);
+                            break;
+                    }
+                    break;
+                case 1:
+                    switch (gp_func) {
+                        case 0:
+                            ret = fdc37c93x_do_read_alt(dev, 0, reg, bit);
+                            break;
+                        case 1:
+                            ret = fdc37c93x_do_read_gp((fdc37c93x_t *) dev, reg, bit);
+                            break;
+                    }
+                    break;
+            }
+            break;
+        case 6:
+            gp_func = (gp_func_reg >> 3) & 0x03;
+            switch (bit) {
+                default:
+                    switch (gp_func) {
+                        case 0:
+                            ret = fdc37c93x_do_read_alt(dev, 0, reg, bit);
+                            break;
+                        case 1:
+                            ret = fdc37c93x_do_read_gp((fdc37c93x_t *) dev, reg, bit);
+                            break;
+                        case 2:
+                            ret = kbc_at_read_p(dev->kbc, 1, 1 << bit);
+                            break;
+                    }
+                    break;
+                case 0:
+                    switch (gp_func) {
+                        case 0:
+                            ret = fdc37c93x_do_read_alt(dev, 0, reg, bit);
+                            break;
+                        case 1:
+                            ret = fdc37c93x_do_read_gp((fdc37c93x_t *) dev, reg, bit);
+                            break;
+                        case 2:
+                            /* TODO: Write to power LED if it's ever implemented. */
+                            ret = fdc37c93x_do_read_alt(dev, 1, reg, bit);
+                            break;
+                    }
+                    break;
+                case 1:
+                    switch (gp_func) {
+                        case 0:
+                            ret = fdc37c93x_do_read_alt(dev, 0, reg, bit);
+                            break;
+                        case 1:
+                            ret = fdc37c93x_do_read_gp((fdc37c93x_t *) dev, reg, bit);
+                            break;
+                        case 2:
+                            ret = fdc37c93x_do_read_alt(dev, 1, reg, bit);
+                            break;
+                    }
+                    break;
+            }
+            break;
+        case 7:
+            gp_func = (gp_func_reg >> 3) & 0x03;
+            switch (bit) {
+                default:
+                    switch (gp_func) {
+                        case 0:
+                            ret = fdc37c93x_do_read_alt(dev, 0, reg, bit);
+                            break;
+                        case 1:
+                            ret = fdc37c93x_do_read_gp((fdc37c93x_t *) dev, reg, bit);
+                            break;
+                    }
+                    break;
+            }
+            break;
+    }
+
+    if (gp_func_reg & 0x02)
+        ret ^= (1 << bit);
+
+    return ret;
+}
+
+static __inline void
+fdc37c93x_do_write_gp(fdc37c93x_t *dev, int reg, int bit, int set)
+{
+    dev->gpio_regs[reg] = (dev->gpio_regs[reg] & ~(1 << bit)) |
+                          (set << bit);
+}
+
+static __inline void
+fdc37c93x_do_write_alt(fdc37c93x_t *dev, int alt, int reg, int bit, int set)
+{
+    dev->alt_regs[alt][reg] = (dev->alt_regs[alt][reg] & ~(1 << bit)) |
+                              (set << bit);
+}
+
+static void
+fdc37c93x_write_gp(fdc37c93x_t *dev, int reg, int bit, int set)
+{
+    uint8_t gp_func_reg = dev->ld_regs[0x08][gp_func_regs[reg][bit]];
+    uint8_t gp_func;
+
+    if (gp_func_reg & 0x02)
+        set = !set;
+
+    if (!(gp_func_reg & 0x01))  switch (reg) {
+        default:
+            /* Do nothing, this GP does not exist. */
+            break;
+        case 1:
+            switch (bit) {
+               default:
+                    gp_func = (gp_func_reg >> 3) & 0x01;
+                    if (gp_func == 0x00)
+                        fdc37c93x_do_write_gp(dev, reg, bit, set);
+                    else
+                        fdc37c93x_do_write_alt(dev, 0, reg, bit, set);
+                    break;
+                case 1:
+                    gp_func = (gp_func_reg >> 3) & 0x03;
+                    if (!(gp_func & 0x01)) {
+                        if (gp_func & 0x02) {
+                            set ? picint(1 << 13) : picintc(1 << 13);
+                            fdc37c93x_do_write_alt(dev, 0, reg, bit, set);
+                        } else
+                            fdc37c93x_do_write_gp(dev, reg, bit, set);
+                    }
+                    break;
+                case 3:
+                    gp_func = (gp_func_reg >> 3) & 0x01;
+                    if (gp_func == 0x01)
+                        /* TODO: Write to power LED if it's ever implemented. */
+                        fdc37c93x_do_write_alt(dev, 0, reg, bit, set);
+                    else
+                        fdc37c93x_do_write_gp(dev, reg, bit, set);
+                    break;
+               case 6:
+                    gp_func = (gp_func_reg >> 3) & 0x03;
+                    switch (gp_func) {
+                        case 0:
+                            fdc37c93x_do_write_gp(dev, reg, bit, set);
+                            break;
+                        case 1 ... 3:
+                            fdc37c93x_do_write_alt(dev, gp_func - 1, reg, bit, set);
+                            break;
+                    }
+                    break;
+            }
+            break;
+        case 2:
+            switch (bit) {
+                default:
+                    gp_func = (gp_func_reg >> 3) & 0x01;
+                    if (gp_func == 0x00)
+                        fdc37c93x_do_write_gp(dev, reg, bit, set);
+                    else
+                        fdc37c93x_do_write_alt(dev, 0, reg, bit, set);
+                    break;
+                case 0:
+                    gp_func = (gp_func_reg >> 3) & 0x03;
+                    switch (gp_func) {
+                        case 0:
+                            fdc37c93x_do_write_gp(dev, reg, bit, set);
+                            break;
+                        case 1:
+                            fdc37c93x_do_write_alt(dev, 0, reg, bit, set);
+                            break;
+                        case 2:
+                            kbc_at_write_p(dev->kbc, 2, 0xfe, set);
+                            break;
+                    }
+                    break;
+                case 1: case 2:
+                    gp_func = (gp_func_reg >> 3) & 0x03;
+                    switch (gp_func) {
+                        case 0:
+                            fdc37c93x_do_write_gp(dev, reg, bit, set);
+                            break;
+                        case 1: case 2:
+                            fdc37c93x_do_write_alt(dev, gp_func - 1, reg, bit, set);
+                            break;
+                    }
+                    break;
+                case 5:
+                    gp_func = (gp_func_reg >> 3) & 0x01;
+                    if (gp_func == 0x00)
+                        fdc37c93x_do_write_gp(dev, reg, bit, set);
+                    else
+                        kbc_at_write_p(dev->kbc, 2, 0xfd, set << 1);
+                    break;
+                case 6: case 7:
+                    /* Do nothing, these bits do not exist. */
+                    break;
+            }
+            break;
+        case 4:
+            gp_func = (gp_func_reg >> 3) & 0x03;
+            switch (bit) {
+                default:
+                    switch (gp_func) {
+                        case 0:
+                            fdc37c93x_do_write_alt(dev, 0, reg, bit, set);
+                            break;
+                        case 1:
+                            fdc37c93x_do_write_gp(dev, reg, bit, set);
+                            break;
+                    }
+                    break;
+                case 0: case 1:
+                    switch (gp_func) {
+                        case 0:
+                            fdc_set_media_id(dev->fdc, bit ^ 1, set);
+                            break;
+                        case 1:
+                            fdc37c93x_do_write_gp(dev, reg, bit, set);
+                            break;
+                    }
+                    break;
+                case 6:
+                    switch (gp_func) {
+                        case 0:
+                            fdc37c93x_do_write_alt(dev, 0, reg, bit, set);
+                            break;
+                        case 1:
+                            fdc37c93x_do_write_gp(dev, reg, bit, set);
+                            break;
+                        case 2:
+                            /* TODO: Write to power LED if it's ever implemented. */
+                            fdc37c93x_do_write_alt(dev, 1, reg, bit, set);
+                            break;
+                        case 3:
+                            fdc37c93x_do_write_alt(dev, 2, reg, bit, set);
+                            break;
+                    }
+                    break;
+                case 7:
+                    switch (gp_func) {
+                        case 0:
+                            fdc37c93x_do_write_alt(dev, 0, reg, bit, set);
+                            break;
+                        case 1:
+                            fdc37c93x_do_write_gp(dev, reg, bit, set);
+                            break;
+                        case 2:
+                            fdc37c93x_do_write_alt(dev, 1, reg, bit, set);
+                            if (!set)
+                                smi_raise();
+                            break;
+                    }
+                    break;
+            }
+            break;
+        case 5:
+            gp_func = (gp_func_reg >> 3) & 0x03;
+            switch (bit) {
+                default:
+                    break;
+                case 0: case 3: case 4:
+                    switch (gp_func) {
+                        case 0:
+                            fdc37c93x_do_write_alt(dev, 0, reg, bit, set);
+                            break;
+                        case 1:
+                            fdc37c93x_do_write_gp(dev, reg, bit, set);
+                            break;
+                    }
+                    break;
+                case 1:
+                    switch (gp_func) {
+                        case 0:
+                            fdc37c93x_do_write_alt(dev, 0, reg, bit, set);
+                            if (set)
+                                plat_power_off();
+                            break;
+                        case 1:
+                            fdc37c93x_do_write_gp(dev, reg, bit, set);
+                            break;
+                    }
+                    break;
+            }
+            break;
+        case 6:
+            gp_func = (gp_func_reg >> 3) & 0x03;
+            switch (bit) {
+                default:
+                    switch (gp_func) {
+                        case 0:
+                            fdc37c93x_do_write_alt(dev, 0, reg, bit, set);
+                            break;
+                        case 1:
+                            fdc37c93x_do_write_gp(dev, reg, bit, set);
+                            break;
+                        case 2:
+                            kbc_at_write_p(dev->kbc, 1, ~(1 << bit), set << bit);
+                            break;
+                    }
+                    break;
+                case 0:
+                    switch (gp_func) {
+                        case 0:
+                            fdc37c93x_do_write_alt(dev, 0, reg, bit, set);
+                            break;
+                        case 1:
+                            fdc37c93x_do_write_gp(dev, reg, bit, set);
+                            break;
+                        case 2:
+                            /* TODO: Write to power LED if it's ever implemented. */
+                            fdc37c93x_do_write_alt(dev, 1, reg, bit, set);
+                            break;
+                    }
+                    break;
+                case 1:
+                    switch (gp_func) {
+                        case 0:
+                            fdc37c93x_do_write_alt(dev, 0, reg, bit, set);
+                            break;
+                        case 1:
+                            fdc37c93x_do_write_gp(dev, reg, bit, set);
+                            break;
+                        case 2:
+                            fdc37c93x_do_write_alt(dev, 1, reg, bit, set);
+                            break;
+                    }
+                    break;
+            }
+            break;
+        case 7:
+            gp_func = (gp_func_reg >> 3) & 0x03;
+            switch (bit) {
+                default:
+                    switch (gp_func) {
+                        case 0:
+                            fdc37c93x_do_write_alt(dev, 0, reg, bit, set);
+                            break;
+                        case 1:
+                            fdc37c93x_do_write_gp(dev, reg, bit, set);
+                            break;
+                    }
+                    break;
+            }
+            break;
+    }
+}
+
 static uint8_t
 fdc37c93x_gpio_read(uint16_t port, void *priv)
 {
     const fdc37c93x_t *dev = (fdc37c93x_t *) priv;
     uint8_t            ret = 0xff;
 
-    ret = dev->gpio_regs[port & 1];
+    if (dev->locked) { 
+        if (dev->is_compaq)
+            ret = fdc37c93x_read(port & 0x0001, priv);
+    } else if (port & 0x0001)  switch (dev->gpio_reg) {
+        case 0x01: case 0x02:
+            ret = 0x00;
+            for (uint8_t i = 0; i < 8; i++)
+                ret |= fdc37c93x_read_gp(dev, dev->gpio_reg, i);
+            break;
+        case 0x03:
+            ret = dev->ld_regs[0x08][0xf4];
+            break;
+        case 0x04 ... 0x07:
+            if (dev->chip_id >= FDC37C93X_FR) {
+                ret = 0x00;
+                for (uint8_t i = 0; i < 8; i++)
+                    ret |= fdc37c93x_read_gp(dev, dev->gpio_reg, i);
+            }
+            break;
+        case 0x08 ... 0x0f:
+            if (dev->chip_id >= FDC37C93X_FR)
+                ret = dev->ld_regs[0x08][0xb0 + dev->gpio_reg - 0x08];
+            break;
+    } else
+        ret = dev->gpio_reg;
 
     return ret;
 }
@@ -122,98 +704,277 @@ fdc37c93x_gpio_write(uint16_t port, uint8_t val, void *priv)
 {
     fdc37c93x_t *dev = (fdc37c93x_t *) priv;
 
-    if (!(port & 1))
-        dev->gpio_regs[0] = (dev->gpio_regs[0] & 0xfc) | (val & 0x03);
+    if (dev->locked) { 
+        if (dev->is_compaq)
+            fdc37c93x_write(port & 0x0001, val, priv);
+    } else if (port & 0x0001)  switch (dev->gpio_reg) {
+        case 0x01: case 0x02:
+            for (uint8_t i = 0; i < 8; i++)
+                fdc37c93x_write_gp(dev, dev->gpio_reg, i, val & (1 << i));
+            break;
+        case 0x03:
+            if (dev->chip_id >= FDC37C93X_FR)
+                dev->ld_regs[0x08][0xf4] = val & 0xef;
+            else
+                dev->ld_regs[0x08][0xf4] = val & 0x0f;
+            break;
+        case 0x04 ... 0x07:
+            if (dev->chip_id >= FDC37C93X_FR)
+                for (uint8_t i = 0; i < 8; i++)
+                    fdc37c93x_write_gp(dev, dev->gpio_reg, i, val & (1 << i));
+            break;
+        case 0x08: case 0x0a:
+        case 0x0c: case 0x0e:
+            if (dev->chip_id >= FDC37C93X_FR)
+                dev->ld_regs[0x08][0xb0 + dev->gpio_reg - 0x08] = val;
+            break;
+        case 0x09:
+            if (dev->chip_id >= FDC37C93X_FR)
+                dev->ld_regs[0x08][0xb0 + dev->gpio_reg - 0x08] = val & 0xd3;
+            break;
+        case 0x0b:
+            if (dev->chip_id >= FDC37C93X_FR)
+                dev->ld_regs[0x08][0xb0 + dev->gpio_reg - 0x08] = val & 0x17;
+            break;
+        case 0x0d:
+            if (dev->chip_id == FDC37C93X_APM)
+                dev->ld_regs[0x08][0xb0 + dev->gpio_reg - 0x08] = val;
+            else if (dev->chip_id == FDC37C93X_FR)
+                dev->ld_regs[0x08][0xb0 + dev->gpio_reg - 0x08] = val & 0xbf;
+            break;
+        case 0x0f:
+            if (dev->chip_id == FDC37C93X_APM)
+                dev->ld_regs[0x08][0xb0 + dev->gpio_reg - 0x08] = val & 0x7f;
+            else if (dev->chip_id == FDC37C93X_FR)
+                dev->ld_regs[0x08][0xb0 + dev->gpio_reg - 0x08] = val & 0x3f;
+            break;
+    } else
+        dev->gpio_reg = val;
+}
+
+static void
+fdc37c93x_superio_handler(fdc37c93x_t *dev)
+{
+    if (!dev->is_compaq) {
+        if (dev->superio_base != 0x0000)
+            io_removehandler(dev->superio_base, 0x0002,
+                             fdc37c93x_read, NULL, NULL, fdc37c93x_write, NULL, NULL, dev);
+        dev->superio_base = make_port_superio(dev);
+        if (dev->superio_base != 0x0000)
+            io_sethandler(dev->superio_base, 0x0002,
+                          fdc37c93x_read, NULL, NULL, fdc37c93x_write, NULL, NULL, dev);
+    }
 }
 
 static void
 fdc37c93x_fdc_handler(fdc37c93x_t *dev)
 {
-    uint16_t ld_port       = 0;
-    uint8_t  global_enable = !!(dev->regs[0x22] & (1 << 0));
-    uint8_t  local_enable  = !!dev->ld_regs[0][0x30];
+    const uint8_t  global_enable = !!(dev->regs[0x22] & (1 << 0));
+    const uint8_t  local_enable  = !!dev->ld_regs[0][0x30];
+    const uint16_t old_base      = dev->fdc_base;
 
-    fdc_remove(dev->fdc);
-    if (global_enable && local_enable) {
-        ld_port = make_port(dev, 0) & 0xFFF8;
-        if ((ld_port >= 0x0100) && (ld_port <= 0x0FF8))
-            fdc_set_base(dev->fdc, ld_port);
+    dev->fdc_base = 0x0000;
+
+    if (global_enable && local_enable)
+        dev->fdc_base = make_port(dev, 0) & 0xfff8;
+
+    if (dev->fdc_base != old_base) {
+        if ((old_base >= 0x0100) && (old_base <= 0x0ff8))
+            fdc_remove(dev->fdc);
+
+        if ((dev->fdc_base >= 0x0100) && (dev->fdc_base <= 0x0ff8))
+            fdc_set_base(dev->fdc, dev->fdc_base);
     }
 }
 
 static void
 fdc37c93x_lpt_handler(fdc37c93x_t *dev)
 {
-    uint16_t ld_port       = 0;
-    uint8_t  global_enable = !!(dev->regs[0x22] & (1 << 3));
-    uint8_t  local_enable  = !!dev->ld_regs[3][0x30];
-    uint8_t  lpt_irq       = dev->ld_regs[3][0x70];
+    uint16_t ld_port       = 0x0000;
+    uint16_t mask          = 0xfffc;
+    uint8_t  global_enable   = !!(dev->regs[0x22] & (1 << 3));
+    uint8_t  local_enable    = !!dev->ld_regs[3][0x30];
+    uint8_t  lpt_irq         = dev->ld_regs[3][0x70];
+    uint8_t  lpt_dma         = dev->ld_regs[3][0x74];
+    uint8_t  lpt_mode        = dev->ld_regs[3][0xf0] & 0x07;
+    uint8_t  irq_readout[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x08,
+                                 0x00, 0x10, 0x18, 0x20, 0x00, 0x00, 0x28, 0x30 };
 
     if (lpt_irq > 15)
         lpt_irq = 0xff;
 
-    lpt1_remove();
-    if (global_enable && local_enable) {
-        ld_port = make_port(dev, 3) & 0xFFFC;
-        if ((ld_port >= 0x0100) && (ld_port <= 0x0FFC))
-            lpt1_init(ld_port);
+    if (lpt_dma >= 4)
+        lpt_dma = 0xff;
+
+    lpt_port_remove(dev->lpt);
+    lpt_set_fifo_threshold(dev->lpt, (dev->ld_regs[3][0xf0] & 0x78) >> 3);
+    switch (lpt_mode) {
+        default:
+        case 0x04:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x00:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 1);
+            break;
+        case 0x01: case 0x05:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x02:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x03: case 0x07:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
     }
-    lpt1_irq(lpt_irq);
+    if (global_enable && local_enable) {
+        ld_port = (make_port(dev, 3) & 0xfffc) & mask;
+        if ((ld_port >= 0x0100) && (ld_port <= (0x0ffc & mask)))
+            lpt_port_setup(dev->lpt, ld_port);
+    }
+    lpt_port_irq(dev->lpt, lpt_irq);
+    lpt_port_dma(dev->lpt, lpt_dma);
+
+    lpt_set_cnfgb_readout(dev->lpt, ((lpt_irq > 15) ? 0x00 : irq_readout[lpt_irq]) |
+                                    ((lpt_dma >= 4) ? 0x00 : lpt_dma));
 }
 
 static void
-fdc37c93x_serial_handler(fdc37c93x_t *dev, int uart)
+fdc37c93x_serial_handler(fdc37c93x_t *dev, const int uart)
 {
-    uint16_t ld_port       = 0;
-    uint8_t  uart_no       = 4 + uart;
-    uint8_t  global_enable = !!(dev->regs[0x22] & (1 << uart_no));
-    uint8_t  local_enable  = !!dev->ld_regs[uart_no][0x30];
+    const uint8_t  uart_no       = 4 + uart;
+    const uint8_t  global_enable = !!(dev->regs[0x22] & (1 << uart_no));
+    const uint8_t  local_enable  = !!dev->ld_regs[uart_no][0x30];
+    const uint16_t old_base      = dev->uart_base[uart];
+    double         clock_src     = 24000000.0 / 13.0;
 
-    serial_remove(dev->uart[uart]);
-    if (global_enable && local_enable) {
-        ld_port = make_port(dev, uart_no) & 0xFFF8;
-        if ((ld_port >= 0x0100) && (ld_port <= 0x0FF8))
-            serial_setup(dev->uart[uart], ld_port, dev->ld_regs[uart_no][0x70]);
+    dev->uart_base[uart] = 0x0000;
+
+    if (global_enable && local_enable)
+        dev->uart_base[uart] = make_port(dev, uart_no) & 0xfff8;
+
+    if (dev->uart_base[uart] != old_base) {
+        if ((old_base >= 0x0100) && (old_base <= 0x0ff8))
+            serial_remove(dev->uart[uart]);
+
+        if ((dev->uart_base[uart] >= 0x0100) && (dev->uart_base[uart] <= 0x0ff8))
+            serial_setup(dev->uart[uart], dev->uart_base[uart], dev->ld_regs[uart_no][0x70]);
     }
+
+    switch (dev->ld_regs[uart_no][0xf0] & 0x03) {
+        case 0x00:
+            clock_src = 24000000.0 / 13.0;
+            break;
+        case 0x01:
+            clock_src = 24000000.0 / 12.0;
+            break;
+        case 0x02:
+            clock_src = 24000000.0 / 1.0;
+            break;
+        case 0x03:
+            clock_src = 24000000.0 / 1.625;
+            break;
+
+        default:
+            break;
+    }
+
+    serial_set_clock_src(dev->uart[uart], clock_src);
+
+    /*
+       TODO: If UART 2's own IRQ pin is also enabled when shared,
+             it should also be asserted.
+     */
+    if ((dev->chip_id >= FDC37C93X_FR) && (dev->ld_regs[4][0xf0] & 0x80)) {
+        serial_irq(dev->uart[0], dev->ld_regs[4][0x70]);
+        serial_irq(dev->uart[1], dev->ld_regs[4][0x70]);
+    } else
+        serial_irq(dev->uart[uart], dev->ld_regs[uart_no][0x70]);
 }
 
 static void
-fdc37c93x_nvr_pri_handler(fdc37c93x_t *dev)
+fdc37c93x_nvr_pri_handler(const fdc37c93x_t *dev)
 {
-    uint8_t local_enable = !!dev->ld_regs[6][0x30];
+    uint8_t  local_enable = !!dev->ld_regs[6][0x30];
 
-    nvr_at_handler(0, 0x70, dev->nvr);
-    if (local_enable)
-        nvr_at_handler(1, 0x70, dev->nvr);
+    if (dev->chip_id != 0x02)
+        local_enable &= ((dev->ld_regs[6][0xf0] & 0x90) != 0x80);
+
+    if (dev->has_nvr) {
+        nvr_at_handler(0, 0x70, dev->nvr);
+        if (local_enable)
+            nvr_at_handler(1, 0x70, dev->nvr);
+    }
 }
 
 static void
 fdc37c93x_nvr_sec_handler(fdc37c93x_t *dev)
 {
-    uint16_t ld_port      = 0;
-    uint8_t  local_enable = !!dev->ld_regs[6][0x30];
+    uint8_t        local_enable = !!dev->ld_regs[6][0x30];
+    const uint16_t old_base     = dev->nvr_sec_base;
+
+    local_enable &= (((dev->ld_regs[6][0xf0] & 0xe0) == 0x80) ||
+                     ((dev->ld_regs[6][0xf0] & 0xe0) == 0xe0));
+
+    dev->nvr_sec_base = 0x0000;
+
+    if (local_enable)
+        dev->nvr_sec_base = make_port_sec(dev, 6) & 0xfffe;
+
+    if (dev->nvr_sec_base != old_base) {
+        if (dev->has_nvr && (old_base > 0x0000) && (old_base <= 0x0ffe))
+            nvr_at_sec_handler(0, dev->nvr_sec_base, dev->nvr);
 
-    nvr_at_sec_handler(0, dev->nvr_sec_base, dev->nvr);
-    if (local_enable) {
-        dev->nvr_sec_base = ld_port = make_port_sec(dev, 6) & 0xFFFE;
         /* Datasheet erratum: First it says minimum address is 0x0100, but later implies that it's 0x0000
                               and that default is 0x0070, same as (unrelocatable) primary NVR. */
-        if (ld_port <= 0x0FFE)
+        if (dev->has_nvr && (dev->nvr_sec_base > 0x0000) && (dev->nvr_sec_base <= 0x0ffe))
             nvr_at_sec_handler(1, dev->nvr_sec_base, dev->nvr);
     }
 }
 
+static void
+fdc37c93x_kbc_handler(fdc37c93x_t *dev)
+{
+    const uint8_t  local_enable = !!dev->ld_regs[7][0x30];
+    const uint16_t old_base = dev->kbc_base;
+
+    dev->kbc_base = local_enable ? 0x0060 : 0x0000;
+
+    if (dev->kbc_base != old_base)
+        kbc_at_handler(local_enable, dev->kbc_base, dev->kbc);
+
+    kbc_at_set_irq(0, dev->ld_regs[7][0x70], dev->kbc);
+    kbc_at_set_irq(1, dev->ld_regs[7][0x72], dev->kbc);
+}
+
 static void
 fdc37c93x_auxio_handler(fdc37c93x_t *dev)
 {
-    uint16_t ld_port      = 0;
-    uint8_t  local_enable = !!dev->ld_regs[8][0x30];
+    const uint8_t local_enable = !!dev->ld_regs[8][0x30];
+    const uint16_t old_base    = dev->auxio_base;
 
-    io_removehandler(dev->auxio_base, 0x0001,
-                     fdc37c93x_auxio_read, NULL, NULL, fdc37c93x_auxio_write, NULL, NULL, dev);
-    if (local_enable) {
-        dev->auxio_base = ld_port = make_port(dev, 8);
-        if ((ld_port >= 0x0100) && (ld_port <= 0x0FFF))
+    if (local_enable)
+        dev->auxio_base = make_port(dev, 8);
+    else
+        dev->auxio_base = 0x0000;
+
+    if (dev->auxio_base != old_base) {
+        if ((old_base >= 0x0100) && (old_base <= 0x0fff))
+            io_removehandler(old_base, 0x0001,
+                         fdc37c93x_auxio_read, NULL, NULL, fdc37c93x_auxio_write, NULL, NULL, dev);
+
+        if ((dev->auxio_base >= 0x0100) && (dev->auxio_base <= 0x0fff))
             io_sethandler(dev->auxio_base, 0x0001,
                           fdc37c93x_auxio_read, NULL, NULL, fdc37c93x_auxio_write, NULL, NULL, dev);
     }
@@ -222,113 +983,56 @@ fdc37c93x_auxio_handler(fdc37c93x_t *dev)
 static void
 fdc37c93x_gpio_handler(fdc37c93x_t *dev)
 {
-    uint16_t ld_port = 0;
-    uint8_t  local_enable;
+    const uint8_t local_enable = !!(dev->regs[0x03] & 0x80) ||
+                                   (dev->is_compaq && dev->locked);
+    const uint16_t old_base    = dev->gpio_base;
 
-    local_enable = !!(dev->regs[0x03] & 0x80);
+    dev->gpio_base = 0x0000;
 
-    io_removehandler(dev->gpio_base, 0x0002,
-                     fdc37c93x_gpio_read, NULL, NULL, fdc37c93x_gpio_write, NULL, NULL, dev);
-    if (local_enable) {
-        switch (dev->regs[0x03] & 0x03) {
-            case 0:
-                ld_port = 0xe0;
-                break;
-            case 1:
-                ld_port = 0xe2;
-                break;
-            case 2:
-                ld_port = 0xe4;
-                break;
-            case 3:
-                ld_port = 0xea; /* Default */
-                break;
+    if (local_enable)  switch (dev->regs[0x03] & 0x03) {
+        default:
+            break;
+        case 0:
+            dev->gpio_base = 0x00e0;
+            break;
+        case 1:
+            dev->gpio_base = 0x00e2;
+            break;
+        case 2:
+            dev->gpio_base = 0x00e4;
+            break;
+        case 3:
+            dev->gpio_base = 0x00ea; /* Default */
+            break;
+    }
 
-            default:
-                break;
-        }
-        dev->gpio_base = ld_port;
-        if (ld_port > 0x0000)
+    if (dev->gpio_base != old_base) {
+        if (old_base != 0x0000)
+            io_removehandler(old_base, 0x0002,
+                         fdc37c93x_gpio_read, NULL, NULL, fdc37c93x_gpio_write, NULL, NULL, dev);
+
+        if (dev->gpio_base > 0x0000)
             io_sethandler(dev->gpio_base, 0x0002,
                           fdc37c93x_gpio_read, NULL, NULL, fdc37c93x_gpio_write, NULL, NULL, dev);
     }
 }
 
-static uint8_t
-fdc37c93x_access_bus_read(uint16_t port, void *priv)
-{
-    const access_bus_t *dev = (access_bus_t *) priv;
-    uint8_t             ret = 0xff;
-
-    switch (port & 3) {
-        case 0:
-            ret = (dev->status & 0xBF);
-            break;
-        case 1:
-            ret = (dev->own_addr & 0x7F);
-            break;
-        case 2:
-            ret = dev->data;
-            break;
-        case 3:
-            ret = (dev->clock & 0x87);
-            break;
-
-        default:
-            break;
-    }
-
-    return ret;
-}
-
-static void
-fdc37c93x_access_bus_write(uint16_t port, uint8_t val, void *priv)
-{
-    access_bus_t *dev = (access_bus_t *) priv;
-
-    switch (port & 3) {
-        case 0:
-            dev->control = (val & 0xCF);
-            break;
-        case 1:
-            dev->own_addr = (val & 0x7F);
-            break;
-        case 2:
-            dev->data = val;
-            break;
-        case 3:
-            dev->clock &= 0x80;
-            dev->clock |= (val & 0x07);
-            break;
-
-        default:
-            break;
-    }
-}
-
 static void
 fdc37c93x_access_bus_handler(fdc37c93x_t *dev)
 {
-    uint16_t ld_port       = 0;
-    uint8_t  global_enable = !!(dev->regs[0x22] & (1 << 6));
-    uint8_t  local_enable  = !!dev->ld_regs[9][0x30];
+    const uint8_t  global_enable = !!(dev->regs[0x22] & (1 << 6));
+    const uint8_t  local_enable  = !!dev->ld_regs[9][0x30];
+    const uint16_t ld_port = dev->access_bus->base = make_port(dev, 9);
 
-    io_removehandler(dev->access_bus->base, 0x0004,
-                     fdc37c93x_access_bus_read, NULL, NULL, fdc37c93x_access_bus_write, NULL, NULL, dev->access_bus);
-    if (global_enable && local_enable) {
-        dev->access_bus->base = ld_port = make_port(dev, 9);
-        if ((ld_port >= 0x0100) && (ld_port <= 0x0FFC))
-            io_sethandler(dev->access_bus->base, 0x0004,
-                          fdc37c93x_access_bus_read, NULL, NULL, fdc37c93x_access_bus_write, NULL, NULL, dev->access_bus);
-    }
+    access_bus_handler(dev->access_bus, global_enable && local_enable, ld_port);
 }
 
 static void
 fdc37c93x_acpi_handler(fdc37c93x_t *dev)
 {
-    uint16_t ld_port      = 0;
-    uint8_t  local_enable = !!dev->ld_regs[0x0a][0x30];
-    uint8_t  sci_irq      = dev->ld_regs[0x0a][0x70];
+    uint16_t      ld_port;
+    const uint8_t local_enable = !!dev->ld_regs[0x0a][0x30];
+    const uint8_t sci_irq      = dev->ld_regs[0x0a][0x70];
 
     acpi_update_io_mapping(dev->acpi, 0x0000, local_enable);
     if (local_enable) {
@@ -347,335 +1051,530 @@ fdc37c93x_acpi_handler(fdc37c93x_t *dev)
     acpi_set_irq_line(dev->acpi, sci_irq);
 }
 
+static void
+fdc37c93x_state_change(fdc37c93x_t *dev, const uint8_t locked)
+{
+    dev->locked = locked;
+    fdc_3f1_enable(dev->fdc, !locked);
+    fdc37c93x_gpio_handler(dev);
+}
+
 static void
 fdc37c93x_write(uint16_t port, uint8_t val, void *priv)
 {
     fdc37c93x_t *dev    = (fdc37c93x_t *) priv;
-    uint8_t      index  = (port & 1) ? 0 : 1;
-    uint8_t      valxor = 0x00;
-    uint8_t      keep = 0x00;
+    uint8_t      index  = !(port & 1);
+    uint8_t      valxor;
 
-    /* Compaq Presario 4500: Unlock at FB, Register at EA, Data at EB, Lock at F9. */
-    if ((port == 0xea) || (port == 0xf9) || (port == 0xfb))
-        index = 1;
-    else if (port == 0xeb)
-        index = 0;
-
-    if (index) {
-        if ((val == 0x55) && !dev->locked) {
+    if (port == 0x00fb) {
+        fdc37c93x_state_change(dev, 1);
+        dev->tries = 0;
+    } else if (port == 0x00f9)
+        fdc37c93x_state_change(dev, 0);
+    else if (index) {
+        if ((!dev->is_compaq) && (val == 0x55) && !dev->locked) {
             if (dev->tries) {
-                dev->locked = 1;
-                fdc_3f1_enable(dev->fdc, 0);
+                fdc37c93x_state_change(dev, 1);
                 dev->tries = 0;
             } else
                 dev->tries++;
-        } else {
-            if (dev->locked) {
-                if (val == 0xaa) {
-                    dev->locked = 0;
-                    fdc_3f1_enable(dev->fdc, 1);
-                    return;
-                }
+        } else if (dev->locked) {
+            if ((!dev->is_compaq) && (val == 0xaa))
+                fdc37c93x_state_change(dev, 0);
+            else
                 dev->cur_reg = val;
-            } else {
-                if (dev->tries)
-                    dev->tries = 0;
-            }
-        }
-        return;
-    } else {
-        if (dev->locked) {
-            if (dev->cur_reg < 48) {
-                valxor = val ^ dev->regs[dev->cur_reg];
-                if ((val == 0x20) || (val == 0x21))
-                    return;
-                dev->regs[dev->cur_reg] = val;
-            } else {
-                valxor = val ^ dev->ld_regs[dev->regs[7]][dev->cur_reg];
-                if (((dev->cur_reg & 0xF0) == 0x70) && (dev->regs[7] < 4))
-                    return;
-                /* Block writes to some logical devices. */
-                if (dev->regs[7] > 0x0a)
-                    return;
-                else
-                    switch (dev->regs[7]) {
-                        case 0x01:
-                        case 0x02:
-                        case 0x07:
-                            return;
-                        case 0x06:
-                            if (dev->chip_id != 0x30)
-                                return;
-                            /* Bits 0 to 3 of logical device 6 (RTC) register F0h must stay set
-                               once they are set. */
-                            else if (dev->cur_reg == 0xf0)
-                                keep = dev->ld_regs[dev->regs[7]][dev->cur_reg] & 0x0f;
-                            break;
-                        case 0x09:
-                            /* If we're on the FDC37C935, return as this is not a valid
-                               logical device there. */
-                            if (!dev->is_apm && (dev->chip_id == 0x02))
-                                return;
-                            break;
-                        case 0x0a:
-                            /* If we're not on the FDC37C931APM, return as this is not a
-                               valid logical device there. */
-                            if (!dev->is_apm)
-                                return;
-                            break;
+        } else if ((!dev->is_compaq) && dev->tries)
+            dev->tries = 0;
+    } else if (dev->locked) {
+        if (dev->cur_reg < 0x30) {
+            valxor = val ^ dev->regs[dev->cur_reg];
 
-                        default:
-                            break;
-                    }
-                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val | keep;
-            }
-        } else
-            return;
-    }
-
-    if (dev->cur_reg < 48) {
-        switch (dev->cur_reg) {
-            case 0x03:
-                if (valxor & 0x83)
+            switch (dev->cur_reg) {
+                case 0x02:
+                    dev->regs[dev->cur_reg] = val;
+                    if (val == 0x02)
+                        fdc37c93x_state_change(dev, 0);
+                    break;
+                case 0x03:
+                    dev->regs[dev->cur_reg] = val & 0x83;
                     fdc37c93x_gpio_handler(dev);
-                dev->regs[0x03] &= 0x83;
-                break;
-            case 0x22:
-                if (valxor & 0x01)
-                    fdc37c93x_fdc_handler(dev);
-                if (valxor & 0x08)
-                    fdc37c93x_lpt_handler(dev);
-                if (valxor & 0x10)
-                    fdc37c93x_serial_handler(dev, 0);
-                if (valxor & 0x20)
-                    fdc37c93x_serial_handler(dev, 1);
-                if ((valxor & 0x40) && (dev->chip_id != 0x02))
-                    fdc37c93x_access_bus_handler(dev);
-                break;
-
-            default:
-                break;
-        }
-
-        return;
-    }
-
-    switch (dev->regs[7]) {
-        case 0:
-            /* FDD */
-            switch (dev->cur_reg) {
-                case 0x30:
-                case 0x60:
-                case 0x61:
-                    if ((dev->cur_reg == 0x30) && (val & 0x01))
-                        dev->regs[0x22] |= 0x01;
-                    if (valxor)
-                        fdc37c93x_fdc_handler(dev);
                     break;
-                case 0xF0:
+                case 0x07: case 0x26:
+                case 0x2e ... 0x2f:
+                    dev->regs[dev->cur_reg] = val;
+                    break;
+                case 0x22:
+                    if (dev->chip_id >= FDC37C93X_FR)
+                        dev->regs[dev->cur_reg] = val & 0x7f;
+                    else
+                        dev->regs[dev->cur_reg] = val & 0x6f;
+
                     if (valxor & 0x01)
-                        fdc_update_enh_mode(dev->fdc, val & 0x01);
-                    if (valxor & 0x10)
-                        fdc_set_swap(dev->fdc, (val & 0x10) >> 4);
-                    break;
-                case 0xF1:
-                    if (valxor & 0xC)
-                        fdc_update_densel_force(dev->fdc, (val & 0xc) >> 2);
-                    break;
-                case 0xF2:
-                    if (valxor & 0xC0)
-                        fdc_update_rwc(dev->fdc, 3, (val & 0xc0) >> 6);
-                    if (valxor & 0x30)
-                        fdc_update_rwc(dev->fdc, 2, (val & 0x30) >> 4);
-                    if (valxor & 0x0C)
-                        fdc_update_rwc(dev->fdc, 1, (val & 0x0c) >> 2);
-                    if (valxor & 0x03)
-                        fdc_update_rwc(dev->fdc, 0, (val & 0x03));
-                    break;
-                case 0xF4:
-                    if (valxor & 0x18)
-                        fdc_update_drvrate(dev->fdc, 0, (val & 0x18) >> 3);
-                    break;
-                case 0xF5:
-                    if (valxor & 0x18)
-                        fdc_update_drvrate(dev->fdc, 1, (val & 0x18) >> 3);
-                    break;
-                case 0xF6:
-                    if (valxor & 0x18)
-                        fdc_update_drvrate(dev->fdc, 2, (val & 0x18) >> 3);
-                    break;
-                case 0xF7:
-                    if (valxor & 0x18)
-                        fdc_update_drvrate(dev->fdc, 3, (val & 0x18) >> 3);
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-        case 3:
-            /* Parallel port */
-            switch (dev->cur_reg) {
-                case 0x30:
-                case 0x60:
-                case 0x61:
-                case 0x70:
-                    if ((dev->cur_reg == 0x30) && (val & 0x01))
-                        dev->regs[0x22] |= 0x08;
-                    if (valxor)
+                        fdc37c93x_fdc_handler(dev);
+                    if (valxor & 0x08)
                         fdc37c93x_lpt_handler(dev);
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-        case 4:
-            /* Serial port 1 */
-            switch (dev->cur_reg) {
-                case 0x30:
-                case 0x60:
-                case 0x61:
-                case 0x70:
-                    if ((dev->cur_reg == 0x30) && (val & 0x01))
-                        dev->regs[0x22] |= 0x10;
-                    if (valxor)
+                    if (valxor & 0x10)
                         fdc37c93x_serial_handler(dev, 0);
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-        case 5:
-            /* Serial port 2 */
-            switch (dev->cur_reg) {
-                case 0x30:
-                case 0x60:
-                case 0x61:
-                case 0x70:
-                    if ((dev->cur_reg == 0x30) && (val & 0x01))
-                        dev->regs[0x22] |= 0x20;
-                    if (valxor)
+                    if (valxor & 0x20)
                         fdc37c93x_serial_handler(dev, 1);
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-        case 6:
-            /* RTC/NVR */
-            if (dev->chip_id != 0x30)
-                break;
-            switch (dev->cur_reg) {
-                case 0x30:
-                    if (valxor)
-                        fdc37c93x_nvr_pri_handler(dev);
-                case 0x62:
-                case 0x63:
-                    if (valxor)
-                        fdc37c93x_nvr_sec_handler(dev);
-                    break;
-                case 0xf0:
-                    if (valxor) {
-                        nvr_lock_set(0x80, 0x20, !!(dev->ld_regs[6][dev->cur_reg] & 0x01), dev->nvr);
-                        nvr_lock_set(0xa0, 0x20, !!(dev->ld_regs[6][dev->cur_reg] & 0x02), dev->nvr);
-                        nvr_lock_set(0xc0, 0x20, !!(dev->ld_regs[6][dev->cur_reg] & 0x04), dev->nvr);
-                        nvr_lock_set(0xe0, 0x20, !!(dev->ld_regs[6][dev->cur_reg] & 0x08), dev->nvr);
-                        if (dev->ld_regs[6][dev->cur_reg] & 0x80)
-                            switch ((dev->ld_regs[6][dev->cur_reg] >> 4) & 0x07) {
-                                default:
-                                case 0x00:
-                                    nvr_bank_set(0, 0xff, dev->nvr);
-                                    nvr_bank_set(1, 1, dev->nvr);
-                                    break;
-                                case 0x01:
-                                    nvr_bank_set(0, 0, dev->nvr);
-                                    nvr_bank_set(1, 1, dev->nvr);
-                                    break;
-                                case 0x02:
-                                case 0x04:
-                                    nvr_bank_set(0, 0xff, dev->nvr);
-                                    nvr_bank_set(1, 0xff, dev->nvr);
-                                    break;
-                                case 0x03:
-                                case 0x05:
-                                    nvr_bank_set(0, 0, dev->nvr);
-                                    nvr_bank_set(1, 0xff, dev->nvr);
-                                    break;
-                                case 0x06:
-                                    nvr_bank_set(0, 0xff, dev->nvr);
-                                    nvr_bank_set(1, 2, dev->nvr);
-                                    break;
-                                case 0x07:
-                                    nvr_bank_set(0, 0, dev->nvr);
-                                    nvr_bank_set(1, 2, dev->nvr);
-                                    break;
-                            }
-                        else {
-                            nvr_bank_set(0, 0, dev->nvr);
-                            nvr_bank_set(1, 0xff, dev->nvr);
-                        }
-                    }
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-        case 8:
-            /* Auxiliary I/O */
-            switch (dev->cur_reg) {
-                case 0x30:
-                case 0x60:
-                case 0x61:
-                case 0x70:
-                    if (valxor)
-                        fdc37c93x_auxio_handler(dev);
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-        case 9:
-            /* Access bus (FDC37C932FR and FDC37C931APM only) */
-            switch (dev->cur_reg) {
-                case 0x30:
-                case 0x60:
-                case 0x61:
-                case 0x70:
-                    if ((dev->cur_reg == 0x30) && (val & 0x01))
-                        dev->regs[0x22] |= 0x40;
-                    if (valxor)
+                    if ((dev->chip_id >= FDC37C93X_FR) && (valxor & 0x40))
                         fdc37c93x_access_bus_handler(dev);
                     break;
+                case 0x23:
+                    if (dev->chip_id >= FDC37C93X_FR)
+                        dev->regs[dev->cur_reg] = val & 0x7f;
+                    else
+                        dev->regs[dev->cur_reg] = val & 0x6f;
+                    break;
+                case 0x24:
+                    if (dev->chip_id >= FDC37C93X_FR)
+                        dev->regs[dev->cur_reg] = val & 0xcf;
+                    else
+                        dev->regs[dev->cur_reg] = val & 0xcc;
+
+                    if ((dev->chip_id >= FDC37C93X_FR) && (valxor & 0x01)) {
+                        serial_set_clock_src(dev->uart[0], (val & 0x01) ?
+                                             48000000.0 : 24000000.0);
+                        serial_set_clock_src(dev->uart[1], (val & 0x01) ?
+                                             48000000.0 : 24000000.0);
+                    }
+                    break;
+                case 0x27:
+                    if (dev->chip_id >= FDC37C93X_FR) {
+                        dev->regs[dev->cur_reg] = val;
+
+                        fdc37c93x_superio_handler(dev);
+                    }
+                    break;
+                case 0x28:
+                    if (dev->chip_id >= FDC37C93X_FR)
+                        dev->regs[dev->cur_reg] = val & 0x1f;
+                     break;
 
                 default:
                     break;
             }
-            break;
-        case 10:
-            /* Access bus (FDC37C931APM only) */
-            switch (dev->cur_reg) {
-                case 0x30:
-                case 0x60:
-                case 0x61:
-                case 0x62:
-                case 0x63:
-                case 0x70:
-                    if (valxor)
-                        fdc37c93x_acpi_handler(dev);
-                    break;
+        } else {
+            valxor = val ^ dev->ld_regs[dev->regs[7]][dev->cur_reg];
 
-                default:
+            if ((dev->regs[7] <= dev->max_ld) && ((dev->regs[7] != 0x08) ||
+                (dev->cur_reg < 0xb0) || (dev->cur_reg > 0xdf) ||
+                (dev->chip_id >= FDC37C93X_FR)))  switch (dev->regs[7]) {
+                case 0x00:    /* FDD */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x70:
+                        case 0x74:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                dev->regs[0x22] |= 0x01;
+                            if (valxor)
+                                fdc37c93x_fdc_handler(dev);
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x1f;
+
+                            if (valxor & 0x01)
+                                fdc_update_enh_mode(dev->fdc, val & 0x01);
+                            if (valxor & 0x0c) {
+                                fdc_clear_flags(dev->fdc, FDC_FLAG_PS2 | FDC_FLAG_PS2_MCA);
+                                switch (val & 0x0c) {
+                                    case 0x00:
+                                        fdc_set_flags(dev->fdc, FDC_FLAG_PS2);
+                                        break;
+                                    case 0x04:
+                                        fdc_set_flags(dev->fdc, FDC_FLAG_PS2_MCA);
+                                        break;
+                                }
+                            }
+                            if (valxor & 0x10)
+                                fdc_set_swap(dev->fdc, (val & 0x10) >> 4);
+                            break;
+                        case 0xf1:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0xfc;
+
+                            if (valxor & 0x0c)
+                                fdc_update_densel_force(dev->fdc, (val & 0xc) >> 2);
+                            break;
+                        case 0xf2:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if (valxor & 0xc0)
+                                fdc_update_rwc(dev->fdc, 3, (val & 0xc0) >> 6);
+                            if (valxor & 0x30)
+                                fdc_update_rwc(dev->fdc, 2, (val & 0x30) >> 4);
+                            if (valxor & 0x0c)
+                                fdc_update_rwc(dev->fdc, 1, (val & 0x0c) >> 2);
+                            if (valxor & 0x03)
+                                fdc_update_rwc(dev->fdc, 0, (val & 0x03));
+                            break;
+                        case 0xf4 ... 0xf7:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x5b;
+
+                            if (valxor & 0x18)
+                                fdc_update_drvrate(dev->fdc, dev->cur_reg - 0xf4,
+                                                   (val & 0x18) >> 3);
+                            break;
+                    }
+                    break;
+                case 0x01:    /* IDE1 */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x62: case 0x63:
+                        case 0x70:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                dev->regs[0x22] |= 0x02;
+                            break;
+                        case 0xf0: case 0xf1:
+                            if (dev->chip_id >= FDC37C93X_FR)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x1f;
+                            else if (dev->cur_reg == 0xf0)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            break;
+                    }
+                    break;
+                case 0x02:    /* IDE2 */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x62: case 0x63:
+                        case 0x70:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                dev->regs[0x22] |= 0x04;
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x01;
+                            break;
+                    }
+                    break;
+                case 0x03:    /* Parallel Port */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x70:
+                        case 0x74:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                dev->regs[0x22] |= 0x08;
+                            if (valxor)
+                                fdc37c93x_lpt_handler(dev);
+                            break;
+                        /*
+                           Bits 2:0: Mode:
+                               - 000: Bi-directional (SPP);
+                               - 001: EPP-1.9 and SPP;
+                               - 010: ECP;
+                               - 011: ECP and EPP-1.9;
+                               - 101: EPP-1.7 and SPP;
+                               - 110: ECP and EPP-1.7.
+                           Bits 6:3: ECP FIFO Threshold.
+                         */
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            if (valxor & 0x7f)
+                                fdc37c93x_lpt_handler(dev);
+                            break;
+                        case 0xf1:
+                            if (dev->chip_id >= FDC37C93X_FR)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x03;
+                            break;
+                    }
+                    break;
+                case 0x04:    /* Serial port 1 */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x70:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                dev->regs[0x22] |= 0x10;
+                            if (valxor)
+                                fdc37c93x_serial_handler(dev, 0);
+                            break;
+                        case 0xf0:
+                            if (dev->chip_id >= FDC37C93X_FR) {
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x83;
+                            } else
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x03;
+
+                            if (valxor & 0x83) {
+                                fdc37c93x_serial_handler(dev, 0);
+                                fdc37c93x_serial_handler(dev, 1);
+                            }
+                            break;
+                    }
+                    break;
+                case 0x05:    /* Serial port 2 */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x62: case 0x63:
+                        case 0x70:
+                        case 0x74:
+                            if (((dev->cur_reg != 0x62) && (dev->cur_reg != 0x63)) ||
+                                (dev->chip_id == FDC37C93X_FR)) {
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                                if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                    dev->regs[0x22] |= 0x20;
+                                if (valxor)
+                                    fdc37c93x_serial_handler(dev, 1);
+                            }
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x03;
+
+                            if (valxor & 0x03) {
+                                fdc37c93x_serial_handler(dev, 0);
+                                fdc37c93x_serial_handler(dev, 1);
+                            }
+                            break;
+                        case 0xf1:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x7f;
+                            break;
+                        case 0xf2:
+                            if (dev->chip_id >= FDC37C93X_FR)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            break;
+                    }
+                    break;
+                case 0x06:    /* RTC */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        // case 0x60: case 0x61:
+                        case 0x62: case 0x63:
+                        case 0x70:
+                            if (((dev->cur_reg != 0x62) && (dev->cur_reg != 0x63)) ||
+                                (dev->chip_id >= FDC37C93X_FR)) {
+                               dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                               if (valxor) {
+                                    fdc37c93x_nvr_pri_handler(dev);
+
+                                    if (dev->chip_id >= FDC37C93X_FR)
+                                        fdc37c93x_nvr_sec_handler(dev);
+                                }
+                            }
+                            break;
+                        case 0xf0:
+                            if (dev->chip_id >= FDC37C93X_FR)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            else
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x8f;
+
+                            if (dev->has_nvr && valxor) {
+                                nvr_lock_set(0x80, 0x20, !!(dev->ld_regs[6][dev->cur_reg] & 0x01), dev->nvr);
+                                nvr_lock_set(0xa0, 0x20, !!(dev->ld_regs[6][dev->cur_reg] & 0x02), dev->nvr);
+                                nvr_lock_set(0xc0, 0x20, !!(dev->ld_regs[6][dev->cur_reg] & 0x04), dev->nvr);
+                                nvr_lock_set(0xe0, 0x20, !!(dev->ld_regs[6][dev->cur_reg] & 0x08), dev->nvr);
+                                if (dev->ld_regs[6][dev->cur_reg] & 0x80) {
+                                    if (dev->chip_id == FDC37C93X_NORMAL)
+                                        nvr_bank_set(0, 1, dev->nvr);
+                                    else  switch ((dev->ld_regs[6][dev->cur_reg] >> 4) & 0x07) {
+                                        case 0x00:
+                                        default:
+                                            nvr_bank_set(0, 0xff, dev->nvr);
+                                            nvr_bank_set(1, 1, dev->nvr);
+                                            break;
+                                        case 0x01:
+                                            nvr_bank_set(0, 0, dev->nvr);
+                                            nvr_bank_set(1, 1, dev->nvr);
+                                            break;
+                                        case 0x02: case 0x04:
+                                            nvr_bank_set(0, 0xff, dev->nvr);
+                                            nvr_bank_set(1, 0xff, dev->nvr);
+                                            break;
+                                        case 0x03: case 0x05:
+                                            nvr_bank_set(0, 0, dev->nvr);
+                                            nvr_bank_set(1, 0xff, dev->nvr);
+                                            break;
+                                        case 0x06:
+                                            nvr_bank_set(0, 0xff, dev->nvr);
+                                            nvr_bank_set(1, 2, dev->nvr);
+                                            break;
+                                        case 0x07:
+                                            nvr_bank_set(0, 0, dev->nvr);
+                                            nvr_bank_set(1, 2, dev->nvr);
+                                            break;
+                                    }
+                                } else {
+                                    nvr_bank_set(0, 0, dev->nvr);
+                                    if (dev->chip_id >= FDC37C93X_FR)
+                                        nvr_bank_set(1, 0xff, dev->nvr);
+                                }
+
+                                fdc37c93x_nvr_pri_handler(dev);
+                                if (dev->chip_id >= FDC37C93X_FR)
+                                   fdc37c93x_nvr_sec_handler(dev);
+                            }
+                            break;
+                        case 0xf1:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x1f;
+                            break;
+                        case 0xf2: case 0xf3:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            break;
+                        case 0xf4:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x83;
+                            break;
+                    }
+                    break;
+                case 0x07:    /* Keyboard */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x70: case 0x72:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if (valxor)
+                                fdc37c93x_kbc_handler(dev);
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x87;
+                            break;
+                    }
+                    break;
+                case 0x08:    /* Aux. I/O */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x62: case 0x63:
+                        case 0x70:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if (valxor)
+                                fdc37c93x_auxio_handler(dev);
+                            break;
+                        case 0xb0: case 0xb2:
+                        case 0xb4: case 0xb6:
+                        case 0xe0: case 0xe1:
+                        case 0xe9: case 0xf2:
+                        case 0xf3:
+                        case 0xc0 ... 0xc9:
+                        case 0xcb ... 0xcc:
+                        case 0xd0 ... 0xdf:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            break;
+                        case 0xb1:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0xd3;
+                            break;
+                        case 0xb3:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x17;
+                            break;
+                        case 0xb5:
+                            if (dev->chip_id == FDC37C93X_APM)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            else
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0xbf;
+                            break;
+                        case 0xb7:
+                            if (dev->chip_id == FDC37C93X_APM)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x7f;
+                            else
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x3f;
+                            break;
+                        case 0xb8:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x3f;
+                            break;
+                        case 0x18:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x18;
+                            break;
+                        case 0xe2 ... 0xe5:
+                        case 0xe7:
+                        case 0xeb ... 0xed:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x0f;
+                            break;
+                        case 0xe6: case 0xe8:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x1f;
+                            break;
+                        case 0xea:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x9f;
+                            break;
+                        case 0xef:
+                            if (dev->chip_id >= FDC37C93X_FR)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0xf8;
+                            break;
+                        case 0xf1:
+                            if (dev->chip_id >= FDC37C93X_FR)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x83;
+                            else
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x03;
+                            break;
+                        case 0xf4:
+                            if (dev->chip_id >= FDC37C93X_FR)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0xef;
+                            else
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x0f;
+                            break;
+                        case 0xf6:
+                            if (dev->chip_id >= FDC37C93X_FR)
+                                for (uint8_t i = 0; i < 8; i++)
+                                    fdc37c93x_write_gp(dev, 1, i, val & (1 << i));
+                            break;
+                        case 0xf7:
+                            if (dev->chip_id >= FDC37C93X_FR)
+                                for (uint8_t i = 0; i < 8; i++)
+                                    fdc37c93x_write_gp(dev, 2, i, val & (1 << i));
+                            break;
+                        case 0xf8:
+                            if (dev->chip_id >= FDC37C93X_FR)
+                                for (uint8_t i = 0; i < 8; i++)
+                                    fdc37c93x_write_gp(dev, 4, i, val & (1 << i));
+                            break;
+                        case 0xf9:
+                            if (dev->chip_id >= FDC37C93X_FR)
+                                for (uint8_t i = 0; i < 8; i++)
+                                    fdc37c93x_write_gp(dev, 5, i, val & (1 << i));
+                            break;
+                        case 0xfa:
+                            if (dev->chip_id >= FDC37C93X_FR)
+                                for (uint8_t i = 0; i < 8; i++)
+                                    fdc37c93x_write_gp(dev, 6, i, val & (1 << i));
+                            break;
+                        case 0xfb:
+                            if (dev->chip_id >= FDC37C93X_FR)
+                                for (uint8_t i = 0; i < 8; i++)
+                                    fdc37c93x_write_gp(dev, 7, i, val & (1 << i));
+                            break;
+                    }
+                    break;
+                case 0x09:    /* Access.Bus */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x70:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                dev->regs[0x22] |= 0x40;
+                            if (valxor)
+                                fdc37c93x_access_bus_handler(dev);
+                            break;
+                    }
+                    break;
+                case 0x0a:    /* ACPI */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x62: case 0x63:
+                        case 0x70:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if (valxor)
+                                fdc37c93x_acpi_handler(dev);
+                            break;
+                    }
                     break;
             }
-            break;
-
-        default:
-            break;
+        }
     }
 }
 
@@ -701,10 +1600,56 @@ fdc37c93x_read(uint16_t port, void *priv)
                     ret = dev->chip_id;
                 else
                     ret = dev->regs[dev->cur_reg];
-            } else {
-                if ((dev->regs[7] == 0) && (dev->cur_reg == 0xF2)) {
-                    ret = (fdc_get_rwc(dev->fdc, 0) | (fdc_get_rwc(dev->fdc, 1) << 2) | (fdc_get_rwc(dev->fdc, 2) << 4) | (fdc_get_rwc(dev->fdc, 3) << 6));
-                } else
+            } else if (dev->regs[7] <= dev->max_ld) {
+                if ((dev->regs[7] == 0x00) && (dev->cur_reg == 0xf2))
+                    ret = (fdc_get_rwc(dev->fdc, 0) | (fdc_get_rwc(dev->fdc, 1) << 2) |
+                          (fdc_get_rwc(dev->fdc, 2) << 4) | (fdc_get_rwc(dev->fdc, 3) << 6));
+                else if ((dev->regs[7] == 0x08) && (dev->cur_reg >= 0xf6) &&
+                         (dev->cur_reg <= 0xfb) &&
+                         (dev->chip_id >= FDC37C93X_FR))  switch (dev->cur_reg) {
+                    case 0xf6:
+                        if (dev->chip_id >= FDC37C93X_FR) {
+                            ret = 0x00;
+                            for (uint8_t i = 0; i < 8; i++)
+                                ret |= fdc37c93x_read_gp(dev, 1, i);
+                        }
+                        break;
+                    case 0xf7:
+                        if (dev->chip_id >= FDC37C93X_FR) {
+                            ret = 0x00;
+                            for (uint8_t i = 0; i < 8; i++)
+                                ret |= fdc37c93x_read_gp(dev, 2, i);
+                        }
+                        break;
+                    case 0xf8:
+                        if (dev->chip_id >= FDC37C93X_FR) {
+                            ret = 0x00;
+                            for (uint8_t i = 0; i < 8; i++)
+                                ret |= fdc37c93x_read_gp(dev, 4, i);
+                        }
+                        break;
+                    case 0xf9:
+                        if (dev->chip_id >= FDC37C93X_FR) {
+                            ret = 0x00;
+                            for (uint8_t i = 0; i < 8; i++)
+                                ret |= fdc37c93x_read_gp(dev, 5, i);
+                        }
+                        break;
+                    case 0xfa:
+                        if (dev->chip_id >= FDC37C93X_FR) {
+                            ret = 0x00;
+                            for (uint8_t i = 0; i < 8; i++)
+                                ret |= fdc37c93x_read_gp(dev, 6, i);
+                        }
+                        break;
+                    case 0xfb:
+                        if (dev->chip_id >= FDC37C93X_FR) {
+                            ret = 0x00;
+                            for (uint8_t i = 0; i < 8; i++)
+                                ret |= fdc37c93x_read_gp(dev, 7, i);
+                        }
+                        break;
+                } else if ((dev->regs[7] != 0x06) || (dev->cur_reg != 0xf3))
                     ret = dev->ld_regs[dev->regs[7]][dev->cur_reg];
             }
         }
@@ -714,88 +1659,122 @@ fdc37c93x_read(uint16_t port, void *priv)
 }
 
 static void
-fdc37c93x_reset(fdc37c93x_t *dev)
+fdc37c93x_reset(void *priv)
 {
-    memset(dev->regs, 0, 48);
+    fdc37c93x_t *dev = (fdc37c93x_t *) priv;
+
+    memset(dev->regs, 0x00, sizeof(dev->regs));
 
     dev->regs[0x03] = 0x03;
     dev->regs[0x20] = dev->chip_id;
     dev->regs[0x21] = 0x01;
     dev->regs[0x22] = 0x39;
     dev->regs[0x24] = 0x04;
-    dev->regs[0x26] = 0xF0;
+    if (dev->chip_id >= FDC37C93X_FR)
+        dev->regs[0x26] = dev->port_370 ? 0x70 : 0xf0;
     dev->regs[0x27] = 0x03;
 
-    for (uint8_t i = 0; i < 11; i++)
-        memset(dev->ld_regs[i], 0, 256);
+    for (uint8_t i = 0; i <= 0x0a; i++)
+        memset(dev->ld_regs[i], 0x00, 256);
 
     /* Logical device 0: FDD */
-    dev->ld_regs[0][0x30] = 1;
-    dev->ld_regs[0][0x60] = 3;
-    dev->ld_regs[0][0x61] = 0xF0;
-    dev->ld_regs[0][0x70] = 6;
-    dev->ld_regs[0][0x74] = 2;
-    dev->ld_regs[0][0xF0] = 0xE;
-    dev->ld_regs[0][0xF2] = 0xFF;
+    dev->ld_regs[0x00][0x30] = 0x00;
+    dev->ld_regs[0x00][0x60] = 0x03;
+    dev->ld_regs[0x00][0x61] = 0xf0;
+    dev->ld_regs[0x00][0x70] = 0x06;
+    dev->ld_regs[0x00][0x74] = 0x02;
+    dev->ld_regs[0x00][0xf0] = 0x0e;
+    dev->ld_regs[0x00][0xf2] = 0xff;
 
     /* Logical device 1: IDE1 */
-    dev->ld_regs[1][0x30] = 0;
-    dev->ld_regs[1][0x60] = 1;
-    dev->ld_regs[1][0x61] = 0xF0;
-    dev->ld_regs[1][0x62] = 3;
-    dev->ld_regs[1][0x63] = 0xF6;
-    dev->ld_regs[1][0x70] = 0xE;
-    dev->ld_regs[1][0xF0] = 0xC;
+    dev->ld_regs[0x01][0x30] = 0x00;
+    dev->ld_regs[0x01][0x60] = 0x01;
+    dev->ld_regs[0x01][0x61] = 0xf0;
+    dev->ld_regs[0x01][0x62] = 0x03;
+    dev->ld_regs[0x01][0x63] = 0xf6;
+    dev->ld_regs[0x01][0x70] = 0x0e;
+    if (dev->chip_id >= FDC37C93X_FR)
+        dev->ld_regs[0x01][0xf0] = 0x0c;
 
     /* Logical device 2: IDE2 */
-    dev->ld_regs[2][0x30] = 0;
-    dev->ld_regs[2][0x60] = 1;
-    dev->ld_regs[2][0x61] = 0x70;
-    dev->ld_regs[2][0x62] = 3;
-    dev->ld_regs[2][0x63] = 0x76;
-    dev->ld_regs[2][0x70] = 0xF;
+    dev->ld_regs[0x02][0x30] = 0x00;
+    dev->ld_regs[0x02][0x60] = 0x01;
+    dev->ld_regs[0x02][0x61] = 0x70;
+    dev->ld_regs[0x02][0x62] = 0x03;
+    dev->ld_regs[0x02][0x63] = 0x76;
+    dev->ld_regs[0x02][0x70] = 0x0f;
 
     /* Logical device 3: Parallel Port */
-    dev->ld_regs[3][0x30] = 1;
-    dev->ld_regs[3][0x60] = 3;
-    dev->ld_regs[3][0x61] = 0x78;
-    dev->ld_regs[3][0x70] = 7;
-    dev->ld_regs[3][0x74] = 4;
-    dev->ld_regs[3][0xF0] = 0x3C;
+    dev->ld_regs[0x03][0x30] = 0x00;
+    dev->ld_regs[0x03][0x60] = 0x03;
+    dev->ld_regs[0x03][0x61] = 0x78;
+    dev->ld_regs[0x03][0x70] = 0x07;
+    dev->ld_regs[0x03][0x74] = 0x04;
+    dev->ld_regs[0x03][0xf0] = 0x3c;
 
     /* Logical device 4: Serial Port 1 */
-    dev->ld_regs[4][0x30] = 1;
-    dev->ld_regs[4][0x60] = 3;
-    dev->ld_regs[4][0x61] = 0xf8;
-    dev->ld_regs[4][0x70] = 4;
-    dev->ld_regs[4][0xF0] = 3;
-    serial_setup(dev->uart[0], COM1_ADDR, dev->ld_regs[4][0x70]);
+    dev->ld_regs[0x04][0x30] = 0x00;
+    dev->ld_regs[0x04][0x60] = 0x03;
+    dev->ld_regs[0x04][0x61] = 0xf8;
+    dev->ld_regs[0x04][0x70] = 0x04;
+    dev->ld_regs[0x04][0xf0] = 0x03;
+    serial_irq(dev->uart[0], dev->ld_regs[4][0x70]);
 
     /* Logical device 5: Serial Port 2 */
-    dev->ld_regs[5][0x30] = 1;
-    dev->ld_regs[5][0x60] = 2;
-    dev->ld_regs[5][0x61] = 0xf8;
-    dev->ld_regs[5][0x70] = 3;
-    dev->ld_regs[5][0x74] = 4;
-    dev->ld_regs[5][0xF1] = 2;
-    dev->ld_regs[5][0xF2] = 3;
-    serial_setup(dev->uart[1], COM2_ADDR, dev->ld_regs[5][0x70]);
+    dev->ld_regs[0x05][0x30] = 0x00;
+    dev->ld_regs[0x05][0x60] = 0x02;
+    dev->ld_regs[0x05][0x61] = 0xf8;
+    dev->ld_regs[0x05][0x70] = 0x03;
+    dev->ld_regs[0x05][0x74] = 0x04;
+    dev->ld_regs[0x05][0xf1] = 0x02;
+    if (dev->chip_id >= FDC37C93X_FR)
+        dev->ld_regs[0x05][0xf2] = 0x03;
+    serial_irq(dev->uart[1], dev->ld_regs[5][0x70]);
 
     /* Logical device 6: RTC */
-    dev->ld_regs[6][0x30] = 1;
-    dev->ld_regs[6][0x63] = (dev->chip_id == 0x30) ? 0x70 : 0x00;
-    dev->ld_regs[6][0xF4] = 3;
+    dev->ld_regs[0x06][0x30] = 0x00;
+    dev->ld_regs[0x06][0x63] = (dev->has_nvr) ? 0x70 : 0x00;
+    dev->ld_regs[0x06][0xf0] = 0x00;
+    dev->ld_regs[0x06][0xf4] = 0x03;
 
     /* Logical device 7: Keyboard */
-    dev->ld_regs[7][0x30] = 1;
-    dev->ld_regs[7][0x61] = 0x60;
-    dev->ld_regs[7][0x70] = 1;
+    dev->ld_regs[0x07][0x30] = 0x00;
+    dev->ld_regs[0x07][0x61] = 0x60;
+    dev->ld_regs[0x07][0x70] = 0x01;
+    dev->ld_regs[0x07][0x72] = 0x0c;
 
     /* Logical device 8: Auxiliary I/O */
+    dev->ld_regs[0x08][0x30] = 0x00;
+    dev->ld_regs[0x08][0x60] = 0x00;
+    dev->ld_regs[0x08][0x61] = 0x00;
+    if (dev->chip_id >= FDC37C93X_FR) {
+        dev->ld_regs[0x08][0xb1] = 0x80;
+        dev->ld_regs[0x08][0xc0] = 0x01;
+        dev->ld_regs[0x08][0xc1] = 0x01;
+        dev->ld_regs[0x08][0xc5] = 0x01;
+        dev->ld_regs[0x08][0xc6] = 0x01;
+        dev->ld_regs[0x08][0xc7] = 0x01;
+        dev->ld_regs[0x08][0xc8] = 0x01;
+        dev->ld_regs[0x08][0xc9] = 0x80;
+        dev->ld_regs[0x08][0xcb] = 0x01;
+        dev->ld_regs[0x08][0xcc] = 0x01;
+        memset(&(dev->ld_regs[0x08][0xd0]), 0x01, 16);
+    }
+    memset(&(dev->ld_regs[0x08][0xe0]), 0x01, 14);
 
     /* Logical device 9: ACCESS.bus */
+    if (dev->chip_id >= FDC37C93X_FR) {
+        dev->ld_regs[0x09][0x30] = 0x00;
+        dev->ld_regs[0x09][0x60] = 0x00;
+        dev->ld_regs[0x09][0x61] = 0x00;
+    }
 
     /* Logical device A: ACPI */
+    if (dev->chip_id == FDC37C93X_APM) {
+        dev->ld_regs[0x0a][0x30] = 0x00;
+        dev->ld_regs[0x0a][0x60] = 0x00;
+        dev->ld_regs[0x0a][0x61] = 0x00;
+    }
 
     fdc37c93x_gpio_handler(dev);
     fdc37c93x_lpt_handler(dev);
@@ -807,50 +1786,82 @@ fdc37c93x_reset(fdc37c93x_t *dev)
     if (dev->is_apm)
         fdc37c93x_acpi_handler(dev);
 
+    fdc_clear_flags(dev->fdc, FDC_FLAG_PS2 | FDC_FLAG_PS2_MCA);
     fdc_reset(dev->fdc);
+
     fdc37c93x_fdc_handler(dev);
 
-    if (dev->chip_id == 0x30) {
+    if (dev->has_nvr) {
         fdc37c93x_nvr_pri_handler(dev);
         fdc37c93x_nvr_sec_handler(dev);
         nvr_bank_set(0, 0, dev->nvr);
         nvr_bank_set(1, 0xff, dev->nvr);
+
+        nvr_lock_set(0x80, 0x20, 0, dev->nvr);
+        nvr_lock_set(0xa0, 0x20, 0, dev->nvr);
+        nvr_lock_set(0xc0, 0x20, 0, dev->nvr);
+        nvr_lock_set(0xe0, 0x20, 0, dev->nvr);
     }
 
+    fdc37c93x_kbc_handler(dev);
+
+    if (dev->chip_id != 0x02)
+        fdc37c93x_superio_handler(dev);
+
+    memset(dev->gpio_regs,   0xff, 256);
+    memset(dev->gpio_pulldn, 0xff, 8);
+
+    /* Acer V62X requires bit 0 to be clear to not be stuck in "clear password" mode. */
+    if (!strcmp(machine_get_internal_name(), "vectra54")) {
+        dev->gpio_pulldn[1] = 0x40;
+
+        /*
+           HP Vectra VL/5 Series 4 GPIO
+           (TODO: Find how multipliers > 3.0 are defined):
+
+           Bit 6: 1 = can boot, 0 = no;
+           Bit 7, 1 = multiplier (00 = 2.5, 01 = 2.0,
+                                  10 = 3.0, 11 = 1.5);
+           Bit 5, 4 = bus speed (00 = 50 MHz, 01 = 66 MHz,
+                                 10 = 60 MHz, 11 = ????):
+           Bit 7, 5, 4, 1: 0000 = 125 MHz, 0010 = 166 MHz,
+                           0100 = 150 MHz, 0110 = ??? MHz;
+                           0001 = 100 MHz, 0011 = 133 MHz,
+                           0101 = 120 MHz, 0111 = ??? MHz;
+                           1000 = 150 MHz, 1010 = 200 MHz,
+                           1100 = 180 MHz, 1110 = ??? MHz;
+                           1001 =  75 MHz, 1011 = 100 MHz,
+                           1101 =  90 MHz, 1111 = ??? MHz
+         */
+        if (cpu_busspeed <= 40000000)
+            dev->gpio_pulldn[1] |= 0x30;
+        else if ((cpu_busspeed > 40000000) && (cpu_busspeed <= 50000000))
+            dev->gpio_pulldn[1] |= 0x00;
+        else if ((cpu_busspeed > 50000000) && (cpu_busspeed <= 60000000))
+            dev->gpio_pulldn[1] |= 0x20;
+        else if (cpu_busspeed > 60000000)
+            dev->gpio_pulldn[1] |= 0x10;
+
+        if (cpu_dmulti <= 1.5)
+            dev->gpio_pulldn[1] |= 0x82;
+        else if ((cpu_dmulti > 1.5) && (cpu_dmulti <= 2.0))
+            dev->gpio_pulldn[1] |= 0x02;
+        else if ((cpu_dmulti > 2.0) && (cpu_dmulti <= 2.5))
+            dev->gpio_pulldn[1] |= 0x00;
+        else if (cpu_dmulti > 2.5)
+            dev->gpio_pulldn[1] |= 0x80;
+    } else if (!strcmp(machine_get_internal_name(), "acerv62x"))
+        dev->gpio_pulldn[1] = 0xfe;
+    else
+        dev->gpio_pulldn[1] = (dev->chip_id == 0x30) ? 0xff : 0xfd;
+
+    if (strstr(machine_get_internal_name(), "acer") != NULL)
+        /* Bit 2 on the Acer V35N is the text/graphics toggle, bits 1 and 3 = ????. */
+        dev->gpio_pulldn[2] = 0x10;
+
     dev->locked = 0;
 }
 
-static void
-access_bus_close(void *priv)
-{
-    access_bus_t *dev = (access_bus_t *) priv;
-
-    free(dev);
-}
-
-static void *
-access_bus_init(UNUSED(const device_t *info))
-{
-    access_bus_t *dev = (access_bus_t *) malloc(sizeof(access_bus_t));
-    memset(dev, 0, sizeof(access_bus_t));
-
-    return dev;
-}
-
-static const device_t access_bus_device = {
-    .name          = "SMC FDC37C932FR ACCESS.bus",
-    .internal_name = "access_bus",
-    .flags         = 0,
-    .local         = 0x03,
-    .init          = access_bus_init,
-    .close         = access_bus_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
 static void
 fdc37c93x_close(void *priv)
 {
@@ -862,122 +1873,100 @@ fdc37c93x_close(void *priv)
 static void *
 fdc37c93x_init(const device_t *info)
 {
-    int          is_compaq;
-    fdc37c93x_t *dev = (fdc37c93x_t *) malloc(sizeof(fdc37c93x_t));
-    memset(dev, 0, sizeof(fdc37c93x_t));
+    fdc37c93x_t *dev = (fdc37c93x_t *) calloc(1, sizeof(fdc37c93x_t));
 
     dev->fdc = device_add(&fdc_at_smc_device);
 
-    dev->uart[0] = device_add_inst(&ns16550_device, 1);
-    dev->uart[1] = device_add_inst(&ns16550_device, 2);
+    dev->uart[0]   = device_add_inst(&ns16550_device, 1);
+    dev->uart[1]   = device_add_inst(&ns16550_device, 2);
 
-    dev->chip_id = info->local & 0xff;
-    dev->is_apm  = (info->local >> 8) & 0x01;
-    is_compaq    = (info->local >> 8) & 0x02;
+    dev->lpt       = device_add_inst(&lpt_port_device, 1);
 
-    dev->gpio_regs[0] = 0xff;
-#if 0
-    dev->gpio_regs[1] = (info->local == 0x0030) ? 0xff : 0xfd;
-#endif
-    dev->gpio_regs[1] = (dev->chip_id == 0x30) ? 0xff : 0xfd;
+    dev->chip_id   = info->local & FDC37C93X_CHIP_ID;
+    dev->kbc_type  = info->local & FDC37XXXX_KBC;
 
-    if (dev->chip_id == 0x30) {
-        dev->nvr = device_add(&at_nvr_device);
+    dev->is_apm    = (dev->chip_id == FDC37C93X_APM);
+    dev->is_compaq = (dev->kbc_type == FDC37XXX1);
+
+    dev->has_nvr   = !(info->local & FDC37C93X_NO_NVR);
+    dev->port_370  = !!(info->local & FDC37XXXX_370);
+
+    if (dev->has_nvr) {
+        dev->nvr = device_add(&amstrad_megapc_nvr_device);
 
         nvr_bank_set(0, 0, dev->nvr);
         nvr_bank_set(1, 0xff, dev->nvr);
     }
 
-    if (dev->is_apm || (dev->chip_id == 0x03))
+    dev->max_ld = 8;
+
+    if (dev->chip_id >= FDC37C93X_FR) {
         dev->access_bus = device_add(&access_bus_device);
+        dev->max_ld++;
+    }
 
-    if (dev->is_apm)
+    if (dev->chip_id == FDC37C93X_APM) {
         dev->acpi = device_add(&acpi_smc_device);
+        dev->max_ld++;
+    }
 
-    if (is_compaq) {
-        io_sethandler(0x0ea, 0x0002,
-                      fdc37c93x_read, NULL, NULL, fdc37c93x_write, NULL, NULL, dev);
+    if (dev->is_compaq) {
         io_sethandler(0x0f9, 0x0001,
                       fdc37c93x_read, NULL, NULL, fdc37c93x_write, NULL, NULL, dev);
         io_sethandler(0x0fb, 0x0001,
                       fdc37c93x_read, NULL, NULL, fdc37c93x_write, NULL, NULL, dev);
-    } else {
-        io_sethandler(FDC_SECONDARY_ADDR, 0x0002,
-                      fdc37c93x_read, NULL, NULL, fdc37c93x_write, NULL, NULL, dev);
-        io_sethandler(FDC_PRIMARY_ADDR, 0x0002,
-                      fdc37c93x_read, NULL, NULL, fdc37c93x_write, NULL, NULL, dev);
     }
 
+    switch (dev->kbc_type) {
+        case FDC37XXX1:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) KBC_VEN_COMPAQ);
+            break;
+        case FDC37XXX2:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_AMI | 0x00003500));
+            break;
+        case FDC37XXX3:
+        default:
+            dev->kbc = device_add(&kbc_at_device);
+            break;
+        case FDC37XXX5:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_PHOENIX | 0x00013800));
+            break;
+        case FDC37XXX7:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_PHOENIX | 0x00041600));
+            break;
+    }
+
+    /* Set the defaults here so the ports can be removed by fdc37c93x_reset(). */
+    dev->fdc_base     = 0x03f0;
+    dev->lpt_base     = 0x0378;
+    dev->uart_base[0] = 0x03f8;
+    dev->uart_base[1] = 0x02f8;
+    dev->nvr_pri_base = 0x0070;
+    dev->nvr_sec_base = 0x0070;
+    dev->kbc_base     = 0x0060;
+    dev->gpio_base    = 0x00ea;
+
     fdc37c93x_reset(dev);
 
+    if (dev->chip_id == 0x02) {
+        io_sethandler(0x03f0, 0x0002,
+                      fdc37c93x_read, NULL, NULL, fdc37c93x_write, NULL, NULL, dev);
+        io_sethandler(0x0370, 0x0002,
+                      fdc37c93x_read, NULL, NULL, fdc37c93x_write, NULL, NULL, dev);
+    }
+
     return dev;
 }
 
-const device_t fdc37c931apm_device = {
-    .name          = "SMC FDC37C932QF Super I/O",
-    .internal_name = "fdc37c931apm",
+const device_t fdc37c93x_device = {
+    .name          = "SMC FDC37C93x Super I/O",
+    .internal_name = "fdc37c93x",
     .flags         = 0,
-    .local         = 0x130, /* Share the same ID with the 932QF. */
+    .local         = 0,
     .init          = fdc37c93x_init,
     .close         = fdc37c93x_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t fdc37c931apm_compaq_device = {
-    .name          = "SMC FDC37C932QF Super I/O (Compaq Presario 4500)",
-    .internal_name = "fdc37c931apm_compaq",
-    .flags         = 0,
-    .local         = 0x330, /* Share the same ID with the 932QF. */
-    .init          = fdc37c93x_init,
-    .close         = fdc37c93x_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t fdc37c932fr_device = {
-    .name          = "SMC FDC37C932FR Super I/O",
-    .internal_name = "fdc37c932fr",
-    .flags         = 0,
-    .local         = 0x03,
-    .init          = fdc37c93x_init,
-    .close         = fdc37c93x_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t fdc37c932qf_device = {
-    .name          = "SMC FDC37C932QF Super I/O",
-    .internal_name = "fdc37c932qf",
-    .flags         = 0,
-    .local         = 0x30,
-    .init          = fdc37c93x_init,
-    .close         = fdc37c93x_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t fdc37c935_device = {
-    .name          = "SMC FDC37C935 Super I/O",
-    .internal_name = "fdc37c935",
-    .flags         = 0,
-    .local         = 0x02,
-    .init          = fdc37c93x_init,
-    .close         = fdc37c93x_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .reset         = fdc37c93x_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sio/sio_fdc37m60x.c b/src/sio/sio_fdc37m60x.c
index 38a163538..e6470a6ea 100644
--- a/src/sio/sio_fdc37m60x.c
+++ b/src/sio/sio_fdc37m60x.c
@@ -6,252 +6,535 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          Emulation of the SMSC FDC37M60x Super I/O
+ *          Implementation of the SMC FDC37M60x Super I/O Chips.
  *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *
- * Authors: Tiseno100
- *
- *          Copyright 2020 Tiseno100
+ *          Copyright 2025 Miran Grca.
  */
-#include <stdarg.h>
-#include <stdio.h>
+#include <inttypes.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/io.h>
 #include <86box/timer.h>
 #include <86box/device.h>
-#include <86box/keyboard.h>
+#include <86box/pci.h>
+#include <86box/pic.h>
 #include <86box/lpt.h>
 #include <86box/serial.h>
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
 #include <86box/fdd.h>
 #include <86box/fdc.h>
+#include <86box/keyboard.h>
+#include <86box/machine.h>
+#include <86box/apm.h>
+#include <86box/plat.h>
+#include <86box/plat_unused.h>
+#include <86box/video.h>
 #include <86box/sio.h>
-
-#define SIO_INDEX_PORT dev->sio_index_port
-#define INDEX          dev->index
-
-/* Current Logical Device Number */
-#define CURRENT_LOGICAL_DEVICE dev->regs[0x07]
-
-/* Global Device Configuration */
-#define ENABLED(ld)      dev->device_regs[ld][0x30]
-#define BASE_ADDRESS(ld) ((dev->device_regs[ld][0x60] << 8) | (dev->device_regs[ld][0x61]))
-#define IRQ(ld)          dev->device_regs[ld][0x70]
-#define DMA(ld)          dev->device_regs[ld][0x74]
-
-/* Miscellaneous Chip Functionality */
-#define SOFT_RESET    (val & 0x01)
-#define POWER_CONTROL dev->regs[0x22]
-
-#ifdef ENABLE_FDC37M60X_LOG
-int fdc37m60x_do_log = ENABLE_FDC37M60X_LOG;
-
-static void
-fdc37m60x_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (fdc37m60x_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define fdc37m60x_log(fmt, ...)
-#endif
+#include "cpu.h"
 
 typedef struct fdc37m60x_t {
-    uint8_t  index;
-    uint8_t  regs[256];
-    uint8_t  device_regs[10][256];
-    uint8_t  cfg_lock;
-    uint8_t  ide_function;
-    uint16_t sio_index_port;
-
-    fdc_t    *fdc;
-    serial_t *uart[2];
-
+    uint8_t       is_compaq;
+    uint8_t       max_ld;
+    uint8_t       tries;
+    uint8_t       port_370;
+    uint8_t       regs[48];
+    uint8_t       ld_regs[11][256];
+    uint16_t      kbc_type;
+    uint16_t      superio_base;
+    uint16_t      fdc_base;
+    uint16_t      lpt_base;
+    uint16_t      kbc_base;
+    uint16_t      uart_base[2];
+    int           locked;
+    int           cur_reg;
+    fdc_t        *fdc;
+    void         *kbc;
+    serial_t     *uart[2];
+    lpt_t        *lpt;
 } fdc37m60x_t;
 
-static void fdc37m60x_fdc_handler(fdc37m60x_t *dev);
-static void fdc37m60x_uart_handler(uint8_t num, fdc37m60x_t *dev);
-static void fdc37m60x_lpt_handler(fdc37m60x_t *dev);
-static void fdc37m60x_logical_device_handler(fdc37m60x_t *dev);
-static void fdc37m60x_reset(void *priv);
+static void    fdc37m60x_write(uint16_t port, uint8_t val, void *priv);
+static uint8_t fdc37m60x_read(uint16_t port, void *priv);
 
-static void
-fdc37m60x_write(uint16_t addr, uint8_t val, void *priv)
+static uint16_t
+make_port_superio(const fdc37m60x_t *dev)
 {
-    fdc37m60x_t *dev = (fdc37m60x_t *) priv;
+    const uint16_t r0 = dev->regs[0x26];
+    const uint16_t r1 = dev->regs[0x27];
 
-    if (addr & 1) {
-        if (!dev->cfg_lock) {
-            switch (INDEX) {
-                /* Global Configuration */
-                case 0x02:
-                    dev->regs[INDEX] = val;
-                    if (SOFT_RESET)
-                        fdc37m60x_reset(dev);
-                    break;
+    const uint16_t p = (r1 << 8) + r0;
 
-                case 0x07:
-                    CURRENT_LOGICAL_DEVICE = val;
-                    break;
-
-                case 0x22:
-                    POWER_CONTROL = val & 0x3f;
-                    break;
-
-                case 0x23:
-                    dev->regs[INDEX] = val & 0x3f;
-                    break;
-
-                case 0x24:
-                    dev->regs[INDEX] = val & 0x4e;
-                    break;
-
-                case 0x2b:
-                case 0x2c:
-                case 0x2d:
-                case 0x2e:
-                case 0x2f:
-                    dev->regs[INDEX] = val;
-                    break;
-
-                /* Device Configuration */
-                case 0x30:
-                case 0x60:
-                case 0x61:
-                case 0x70:
-                case 0x74:
-                case 0xf0:
-                case 0xf1:
-                case 0xf2:
-                case 0xf3:
-                case 0xf4:
-                case 0xf5:
-                case 0xf6:
-                case 0xf7:
-                    if (CURRENT_LOGICAL_DEVICE <= 0x81) /* Avoid Overflow */
-                        dev->device_regs[CURRENT_LOGICAL_DEVICE][INDEX] = (INDEX == 0x30) ? (val & 1) : val;
-                    fdc37m60x_logical_device_handler(dev);
-                    break;
-
-                default:
-                    break;
-            }
-        }
-    } else {
-        /* Enter/Escape Configuration Mode */
-        if (val == 0x55)
-            dev->cfg_lock = 0;
-        else if (!dev->cfg_lock && (val == 0xaa))
-            dev->cfg_lock = 1;
-        else if (!dev->cfg_lock)
-            INDEX = val;
-    }
+    return p;
 }
 
-static uint8_t
-fdc37m60x_read(uint16_t addr, void *priv)
+static uint16_t
+make_port(const fdc37m60x_t *dev, const uint8_t ld)
 {
-    const fdc37m60x_t *dev = (fdc37m60x_t *) priv;
-    uint8_t            ret = 0xff;
+    const uint16_t r0 = dev->ld_regs[ld][0x60];
+    const uint16_t r1 = dev->ld_regs[ld][0x61];
 
-    if (addr & 1)
-        ret = (INDEX >= 0x30) ? dev->device_regs[CURRENT_LOGICAL_DEVICE][INDEX] : dev->regs[INDEX];
+    const uint16_t p = (r0 << 8) + r1;
 
-    return ret;
+    return p;
+}
+
+static void
+fdc37m60x_superio_handler(fdc37m60x_t *dev)
+{
+    if (!dev->is_compaq) {
+        if (dev->superio_base != 0x0000)
+            io_removehandler(dev->superio_base, 0x0002,
+                             fdc37m60x_read, NULL, NULL, fdc37m60x_write, NULL, NULL, dev);
+        dev->superio_base = make_port_superio(dev);
+        if (dev->superio_base != 0x0000)
+            io_sethandler(dev->superio_base, 0x0002,
+                          fdc37m60x_read, NULL, NULL, fdc37m60x_write, NULL, NULL, dev);
+    }
 }
 
 static void
 fdc37m60x_fdc_handler(fdc37m60x_t *dev)
 {
-    fdc_remove(dev->fdc);
+    const uint8_t  global_enable = !!(dev->regs[0x22] & (1 << 0));
+    const uint8_t  local_enable  = !!dev->ld_regs[0][0x30];
+    const uint16_t old_base      = dev->fdc_base;
 
-    if (ENABLED(0) || (POWER_CONTROL & 0x01)) {
-        fdc_set_base(dev->fdc, BASE_ADDRESS(0));
-        fdc_set_irq(dev->fdc, IRQ(0) & 0xf);
-        fdc_set_dma_ch(dev->fdc, DMA(0) & 0x07);
-        fdc37m60x_log("SMC60x-FDC: BASE %04x IRQ %d DMA %d\n", BASE_ADDRESS(0), IRQ(0) & 0xf, DMA(0) & 0x07);
+    dev->fdc_base = 0x0000;
+
+    if (global_enable && local_enable)
+        dev->fdc_base = make_port(dev, 0) & 0xfff8;
+
+    if (dev->fdc_base != old_base) {
+        if ((old_base >= 0x0100) && (old_base <= 0x0ff8))
+            fdc_remove(dev->fdc);
+
+        if ((dev->fdc_base >= 0x0100) && (dev->fdc_base <= 0x0ff8))
+            fdc_set_base(dev->fdc, dev->fdc_base);
     }
-
-    fdc_update_enh_mode(dev->fdc, dev->device_regs[0][0xf0] & 0x01);
-
-    fdc_update_densel_force(dev->fdc, (dev->device_regs[0][0xf1] & 0xc) >> 2);
-
-    fdc_update_rwc(dev->fdc, 3, (dev->device_regs[0][0xf2] & 0xc0) >> 6);
-    fdc_update_rwc(dev->fdc, 2, (dev->device_regs[0][0xf2] & 0x30) >> 4);
-    fdc_update_rwc(dev->fdc, 1, (dev->device_regs[0][0xf2] & 0x0c) >> 2);
-    fdc_update_rwc(dev->fdc, 0, (dev->device_regs[0][0xf2] & 0x03));
-
-    fdc_update_drvrate(dev->fdc, 0, (dev->device_regs[0][0xf4] & 0x18) >> 3);
-    fdc_update_drvrate(dev->fdc, 1, (dev->device_regs[0][0xf5] & 0x18) >> 3);
-    fdc_update_drvrate(dev->fdc, 2, (dev->device_regs[0][0xf6] & 0x18) >> 3);
-    fdc_update_drvrate(dev->fdc, 3, (dev->device_regs[0][0xf7] & 0x18) >> 3);
 }
 
 static void
-fdc37m60x_uart_handler(uint8_t num, fdc37m60x_t *dev)
-{
-    serial_remove(dev->uart[num & 1]);
-
-    if (ENABLED(4 + (num & 1)) || (POWER_CONTROL & (1 << (4 + (num & 1))))) {
-        serial_setup(dev->uart[num & 1], BASE_ADDRESS(4 + (num & 1)), IRQ(4 + (num & 1)) & 0xf);
-        fdc37m60x_log("SMC60x-UART%d: BASE %04x IRQ %d\n", num & 1, BASE_ADDRESS(4 + (num & 1)), IRQ(4 + (num & 1)) & 0xf);
-    }
-}
-
-void
 fdc37m60x_lpt_handler(fdc37m60x_t *dev)
 {
-    lpt1_remove();
+    uint16_t ld_port         = 0x0000;
+    uint16_t mask            = 0xfffc;
+    uint8_t  global_enable   = !!(dev->regs[0x22] & (1 << 3));
+    uint8_t  local_enable    = !!dev->ld_regs[3][0x30];
+    uint8_t  lpt_irq         = dev->ld_regs[3][0x70];
+    uint8_t  lpt_dma         = dev->ld_regs[3][0x74];
+    uint8_t  lpt_mode        = dev->ld_regs[3][0xf0] & 0x07;
+    uint8_t  irq_readout[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x08,
+                                 0x00, 0x10, 0x18, 0x20, 0x00, 0x00, 0x28, 0x30 };
 
-    if (ENABLED(3) || (POWER_CONTROL & 0x08)) {
-        lpt1_init(BASE_ADDRESS(3));
-        lpt1_irq(IRQ(3) & 0xf);
-        fdc37m60x_log("SMC60x-LPT: BASE %04x IRQ %d\n", BASE_ADDRESS(3), IRQ(3) & 0xf);
+    if (lpt_irq > 15)
+        lpt_irq = 0xff;
+
+    if (lpt_dma >= 4)
+        lpt_dma = 0xff;
+
+    lpt_port_remove(dev->lpt);
+    lpt_set_fifo_threshold(dev->lpt, (dev->ld_regs[3][0xf0] & 0x78) >> 3);
+    switch (lpt_mode) {
+        default:
+        case 0x04:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x00:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 1);
+            break;
+        case 0x01: case 0x05:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x02:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x03: case 0x07:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
     }
+    if (global_enable && local_enable) {
+        ld_port = (make_port(dev, 3) & 0xfffc) & mask;
+        if ((ld_port >= 0x0100) && (ld_port <= (0x0ffc & mask)))
+            lpt_port_setup(dev->lpt, ld_port);
+    }
+    lpt_port_irq(dev->lpt, lpt_irq);
+    lpt_port_dma(dev->lpt, lpt_dma);
+
+    lpt_set_cnfgb_readout(dev->lpt, ((lpt_irq > 15) ? 0x00 : irq_readout[lpt_irq]) |
+                                    ((lpt_dma >= 4) ? 0x00 : lpt_dma));
 }
 
-void
-fdc37m60x_logical_device_handler(fdc37m60x_t *dev)
+static void
+fdc37m60x_serial_handler(fdc37m60x_t *dev, const int uart)
 {
-    /* Register 07h:
-        Device 0: FDC
-        Device 3: LPT
-        Device 4: UART1
-        Device 5: UART2
-     */
+    const uint8_t  uart_no       = 4 + uart;
+    const uint8_t  global_enable = !!(dev->regs[0x22] & (1 << uart_no));
+    const uint8_t  local_enable  = !!dev->ld_regs[uart_no][0x30];
+    const uint16_t old_base      = dev->uart_base[uart];
+    double         clock_src     = 24000000.0 / 13.0;
 
-    switch (CURRENT_LOGICAL_DEVICE) {
+    dev->uart_base[uart] = 0x0000;
+
+    if (global_enable && local_enable)
+        dev->uart_base[uart] = make_port(dev, uart_no) & 0xfff8;
+
+    if (dev->uart_base[uart] != old_base) {
+        if ((old_base >= 0x0100) && (old_base <= 0x0ff8))
+            serial_remove(dev->uart[uart]);
+
+        if ((dev->uart_base[uart] >= 0x0100) && (dev->uart_base[uart] <= 0x0ff8))
+            serial_setup(dev->uart[uart], dev->uart_base[uart], dev->ld_regs[uart_no][0x70]);
+    }
+
+    switch (dev->ld_regs[uart_no][0xf0] & 0x03) {
         case 0x00:
-            fdc37m60x_fdc_handler(dev);
+            clock_src = 24000000.0 / 13.0;
+            break;
+        case 0x01:
+            clock_src = 24000000.0 / 12.0;
+            break;
+        case 0x02:
+            clock_src = 24000000.0 / 1.0;
             break;
-
         case 0x03:
-            fdc37m60x_lpt_handler(dev);
-            break;
-
-        case 0x04:
-            fdc37m60x_uart_handler(0, dev);
-            break;
-
-        case 0x05:
-            fdc37m60x_uart_handler(1, dev);
+            clock_src = 24000000.0 / 1.625;
             break;
 
         default:
             break;
     }
+
+    serial_set_clock_src(dev->uart[uart], clock_src);
+
+    /*
+       TODO: If UART 2's own IRQ pin is also enabled when shared,
+             it should also be asserted.
+     */
+    if (dev->ld_regs[4][0xf0] & 0x80) {
+        serial_irq(dev->uart[0], dev->ld_regs[4][0x70]);
+        serial_irq(dev->uart[1], dev->ld_regs[4][0x70]);
+    } else
+        serial_irq(dev->uart[uart], dev->ld_regs[uart_no][0x70]);
+}
+
+static void
+fdc37m60x_kbc_handler(fdc37m60x_t *dev)
+{
+    const uint8_t  local_enable = !!dev->ld_regs[7][0x30];
+    const uint16_t old_base = dev->kbc_base;
+
+    dev->kbc_base = local_enable ? 0x0060 : 0x0000;
+
+    if (dev->kbc_base != old_base)
+        kbc_at_handler(local_enable, dev->kbc_base, dev->kbc);
+
+    kbc_at_set_irq(0, dev->ld_regs[7][0x70], dev->kbc);
+    kbc_at_set_irq(1, dev->ld_regs[7][0x72], dev->kbc);
+}
+
+static void
+fdc37m60x_state_change(fdc37m60x_t *dev, const uint8_t locked)
+{
+    dev->locked = locked;
+    fdc_3f1_enable(dev->fdc, !locked);
+}
+
+static void
+fdc37m60x_write(uint16_t port, uint8_t val, void *priv)
+{
+    fdc37m60x_t *dev    = (fdc37m60x_t *) priv;
+    uint8_t      index  = !(port & 1);
+    uint8_t      valxor;
+
+    if (port == 0x00fb) {
+        fdc37m60x_state_change(dev, 1);
+        dev->tries = 0;
+    } else if (port == 0x00f9)
+        fdc37m60x_state_change(dev, 0);
+    else if (index) {
+        if ((!dev->is_compaq) && (val == 0x55) && !dev->locked) {
+            fdc37m60x_state_change(dev, 1);
+            dev->tries = 0;
+        } else if (dev->locked) {
+            if ((!dev->is_compaq) && (val == 0xaa))
+                fdc37m60x_state_change(dev, 0);
+            else
+                dev->cur_reg = val;
+        } else if ((!dev->is_compaq) && dev->tries)
+            dev->tries = 0;
+    } else if (dev->locked) {
+        if (dev->cur_reg < 0x30) {
+            valxor = val ^ dev->regs[dev->cur_reg];
+
+            switch (dev->cur_reg) {
+                case 0x02:
+                    dev->regs[dev->cur_reg] = val;
+                    if (val == 0x02)
+                        fdc37m60x_state_change(dev, 0);
+                    break;
+                case 0x07: case 0x26:
+                case 0x2b ... 0x2f:
+                    dev->regs[dev->cur_reg] = val;
+                    break;
+                case 0x22:
+                    dev->regs[dev->cur_reg] = val & 0x39;
+
+                    if (valxor & 0x01)
+                        fdc37m60x_fdc_handler(dev);
+                    if (valxor & 0x08)
+                        fdc37m60x_lpt_handler(dev);
+                    if (valxor & 0x10)
+                        fdc37m60x_serial_handler(dev, 0);
+                    if (valxor & 0x20)
+                        fdc37m60x_serial_handler(dev, 1);
+                    break;
+                case 0x23:
+                    dev->regs[dev->cur_reg] = val & 0x39;
+                    break;
+                case 0x24:
+                    dev->regs[dev->cur_reg] = val & 0x4e;
+                    break;
+                case 0x27:
+                    dev->regs[dev->cur_reg] = val;
+                    fdc37m60x_superio_handler(dev);
+                    break;
+                default:
+                    break;
+            }
+        } else {
+            valxor = val ^ dev->ld_regs[dev->regs[7]][dev->cur_reg];
+
+            if (dev->regs[7] <= dev->max_ld)  switch (dev->regs[7]) {
+                case 0x00:    /* FDD */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x70:
+                        case 0x74:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                dev->regs[0x22] |= 0x01;
+                            if (valxor)
+                                fdc37m60x_fdc_handler(dev);
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0xef;
+
+                            if (valxor & 0x01)
+                                fdc_update_enh_mode(dev->fdc, val & 0x01);
+                            if (valxor & 0x0c) {
+                                fdc_clear_flags(dev->fdc, FDC_FLAG_PS2 | FDC_FLAG_PS2_MCA);
+                                switch (val & 0x0c) {
+                                    case 0x00:
+                                        fdc_set_flags(dev->fdc, FDC_FLAG_PS2);
+                                        break;
+                                    case 0x04:
+                                        fdc_set_flags(dev->fdc, FDC_FLAG_PS2_MCA);
+                                        break;
+                                }
+                            }
+                            if (valxor & 0x10)
+                                fdc_set_swap(dev->fdc, (val & 0x10) >> 4);
+                            break;
+                        case 0xf1:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0xfc;
+
+                            if (valxor & 0x0c)
+                                fdc_update_densel_force(dev->fdc, (val & 0xc) >> 2);
+                            break;
+                        case 0xf2:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if (valxor & 0xc0)
+                                fdc_update_rwc(dev->fdc, 3, (val & 0xc0) >> 6);
+                            if (valxor & 0x30)
+                                fdc_update_rwc(dev->fdc, 2, (val & 0x30) >> 4);
+                            if (valxor & 0x0c)
+                                fdc_update_rwc(dev->fdc, 1, (val & 0x0c) >> 2);
+                            if (valxor & 0x03)
+                                fdc_update_rwc(dev->fdc, 0, (val & 0x03));
+                            break;
+                        case 0xf4 ... 0xf7:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x5b;
+
+                            if (valxor & 0x18)
+                                fdc_update_drvrate(dev->fdc, dev->cur_reg - 0xf4,
+                                                   (val & 0x18) >> 3);
+                            break;
+                    }
+                    break;
+                case 0x03:    /* Parallel Port */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x70:
+                        case 0x74:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                dev->regs[0x22] |= 0x08;
+                            if (valxor)
+                                fdc37m60x_lpt_handler(dev);
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            if (valxor & 0x7f)
+                                fdc37m60x_lpt_handler(dev);
+                            break;
+                    }
+                    break;
+                case 0x04:    /* Serial port 1 */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x70:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                dev->regs[0x22] |= 0x10;
+                            if (valxor)
+                                fdc37m60x_serial_handler(dev, 0);
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x83;
+
+                            if (valxor & 0x83) {
+                                fdc37m60x_serial_handler(dev, 0);
+                                fdc37m60x_serial_handler(dev, 1);
+                            }
+                            break;
+                    }
+                    break;
+                case 0x05:    /* Serial port 2 */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x62: case 0x63:
+                        case 0x70:
+                        case 0x74:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                dev->regs[0x22] |= 0x20;
+                            if (valxor)
+                                fdc37m60x_serial_handler(dev, 1);
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x03;
+
+                            if (valxor & 0x03) {
+                                fdc37m60x_serial_handler(dev, 0);
+                                fdc37m60x_serial_handler(dev, 1);
+                            }
+                            break;
+                        case 0xf1:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x7f;
+                            break;
+                        case 0xf2:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            break;
+                    }
+                    break;
+                case 0x07:    /* Keyboard */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x70: case 0x72:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if (valxor)
+                                fdc37m60x_kbc_handler(dev);
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x84;
+                            break;
+                    }
+                    break;
+                case 0x08:    /* Aux. I/O */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            break;
+                        case 0xb8:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            break;
+                        case 0xc0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = (dev->ld_regs[dev->regs[7]][dev->cur_reg] & 0xe4) | (val & 0x1b);
+                            break;
+                        case 0xc1:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x0f;
+                            for (int i = 0; i < 4; i++)
+                                fdc_set_fdd_changed(i, !!(val & (1 << i)));
+                            break;
+                    }
+                    break;
+            }
+        }
+    }
+}
+
+static uint8_t
+fdc37m60x_read(uint16_t port, void *priv)
+{
+    fdc37m60x_t *dev   = (fdc37m60x_t *) priv;
+    uint8_t      index = (port & 1) ? 0 : 1;
+    uint8_t      ret   = 0xff;
+
+    /* Compaq Presario 4500: Unlock at FB, Register at EA, Data at EB, Lock at F9. */
+    if ((port == 0xea) || (port == 0xf9) || (port == 0xfb))
+        index = 1;
+    else if (port == 0xeb)
+        index = 0;
+
+    if (dev->locked) {
+        if (index)
+            ret = dev->cur_reg;
+        else {
+            if (dev->cur_reg < 0x30) {
+                if (dev->cur_reg == 0x20)
+                    ret = 0x47;
+                else
+                    ret = dev->regs[dev->cur_reg];
+            } else if (dev->regs[7] <= dev->max_ld) {
+                if ((dev->regs[7] == 0x00) && (dev->cur_reg == 0xf2))
+                    ret = (fdc_get_rwc(dev->fdc, 0) | (fdc_get_rwc(dev->fdc, 1) << 2) |
+                          (fdc_get_rwc(dev->fdc, 2) << 4) | (fdc_get_rwc(dev->fdc, 3) << 6));
+                else if ((dev->regs[7] == 0x08) && (dev->cur_reg == 0xc1)) {
+                    ret = dev->ld_regs[dev->regs[7]][dev->cur_reg] & 0xf0;
+                    for (int i = 0; i < 4; i++)
+                        ret |= (fdc_get_fdd_changed(i) << i);
+                } else if ((dev->regs[7] == 0x08) && (dev->cur_reg == 0xc2))
+                    ret = fdc_get_shadow(dev->fdc);
+                else if ((dev->regs[7] == 0x08) && (dev->cur_reg == 0xc3))
+                    ret = serial_get_shadow(dev->uart[0]);
+                else if ((dev->regs[7] == 0x08) && (dev->cur_reg == 0xc4))
+                    ret = serial_get_shadow(dev->uart[1]);
+                else if ((dev->regs[7] != 0x06) || (dev->cur_reg != 0xf3))
+                    ret = dev->ld_regs[dev->regs[7]][dev->cur_reg];
+            }
+        }
+    }
+
+    return ret;
 }
 
 static void
@@ -259,40 +542,80 @@ fdc37m60x_reset(void *priv)
 {
     fdc37m60x_t *dev = (fdc37m60x_t *) priv;
 
-    memset(dev->regs, 0, sizeof(dev->regs));
-    for (uint8_t i = 0; i < 10; i++)
-        memset(dev->device_regs[i], 0, sizeof(dev->device_regs[i]));
+    memset(dev->regs, 0x00, sizeof(dev->regs));
 
     dev->regs[0x20] = 0x47;
+    dev->regs[0x22] = 0x39;
     dev->regs[0x24] = 0x04;
-    dev->regs[0x26] = SIO_INDEX_PORT & 0xf;
-    dev->regs[0x27] = (SIO_INDEX_PORT >> 4) & 0xf;
+    dev->regs[0x26] = dev->port_370 ? 0x70 : 0xf0;
+    dev->regs[0x27] = 0x03;
 
-    /* FDC Registers */
-    dev->device_regs[0][0x60] = 0x03; /* Base Address */
-    dev->device_regs[0][0x61] = 0xf0;
-    dev->device_regs[0][0x70] = 0x06;
-    dev->device_regs[0][0x74] = 0x02;
-    dev->device_regs[0][0xf0] = 0x0e;
-    dev->device_regs[0][0xf2] = 0xff;
+    for (uint8_t i = 0; i <= 0x0a; i++)
+        memset(dev->ld_regs[i], 0x00, 256);
 
-    /* LPT Port */
-    dev->device_regs[3][0x74] = 0x04;
-    dev->device_regs[3][0xf0] = 0x3c;
+    /* Logical device 0: FDD */
+    dev->ld_regs[0x00][0x30] = 0x00;
+    dev->ld_regs[0x00][0x60] = 0x03;
+    dev->ld_regs[0x00][0x61] = 0xf0;
+    dev->ld_regs[0x00][0x70] = 0x06;
+    dev->ld_regs[0x00][0x74] = 0x02;
+    dev->ld_regs[0x00][0xf0] = 0x0e;
+    dev->ld_regs[0x00][0xf2] = 0xff;
 
-    /* UART1 */
-    dev->device_regs[4][0x74] = 0x04;
-    dev->device_regs[4][0xf1] = 0x02;
-    dev->device_regs[4][0xf2] = 0x03;
+    /* Logical device 3: Parallel Port */
+    dev->ld_regs[0x03][0x30] = 0x00;
+    dev->ld_regs[0x03][0x60] = 0x03;
+    dev->ld_regs[0x03][0x61] = 0x78;
+    dev->ld_regs[0x03][0x70] = 0x07;
+    dev->ld_regs[0x03][0x74] = 0x04;
+    dev->ld_regs[0x03][0xf0] = 0x3c;
 
-    /* AUX */
-    dev->device_regs[8][0xc0] = 0x06;
-    dev->device_regs[8][0xc1] = 0x03;
+    /* Logical device 4: Serial Port 1 */
+    dev->ld_regs[0x04][0x30] = 0x00;
+    dev->ld_regs[0x04][0x60] = 0x03;
+    dev->ld_regs[0x04][0x61] = 0xf8;
+    dev->ld_regs[0x04][0x70] = 0x04;
+    serial_irq(dev->uart[0], dev->ld_regs[4][0x70]);
+
+    /* Logical device 5: Serial Port 2 */
+    dev->ld_regs[0x05][0x30] = 0x00;
+    dev->ld_regs[0x05][0x60] = 0x02;
+    dev->ld_regs[0x05][0x61] = 0xf8;
+    dev->ld_regs[0x05][0x70] = 0x03;
+    dev->ld_regs[0x05][0x74] = 0x04;
+    dev->ld_regs[0x05][0xf1] = 0x02;
+    dev->ld_regs[0x05][0xf2] = 0x03;
+    serial_irq(dev->uart[1], dev->ld_regs[5][0x70]);
+
+    /* Logical device 7: Keyboard */
+    dev->ld_regs[0x07][0x30] = 0x00;
+    dev->ld_regs[0x07][0x61] = 0x60;
+    dev->ld_regs[0x07][0x70] = 0x01;
+
+    /* Logical device 8: Auxiliary I/O */
+    dev->ld_regs[0x08][0x30] = 0x00;
+    dev->ld_regs[0x08][0x60] = 0x00;
+    dev->ld_regs[0x08][0x61] = 0x00;
+    dev->ld_regs[0x08][0xc0] = 0x06;
+    dev->ld_regs[0x08][0xc1] = 0x03;
+
+    fdc37m60x_lpt_handler(dev);
+    fdc37m60x_serial_handler(dev, 0);
+    fdc37m60x_serial_handler(dev, 1);
+
+    fdc_clear_flags(dev->fdc, FDC_FLAG_PS2 | FDC_FLAG_PS2_MCA);
+    fdc_reset(dev->fdc);
 
     fdc37m60x_fdc_handler(dev);
-    fdc37m60x_uart_handler(0, dev);
-    fdc37m60x_uart_handler(1, dev);
-    fdc37m60x_lpt_handler(dev);
+
+    for (int i = 0; i < 4; i++)
+        fdc_set_fdd_changed(i, 1);
+
+    fdc37m60x_kbc_handler(dev);
+
+    fdc37m60x_superio_handler(dev);
+
+    dev->locked = 0;
 }
 
 static void
@@ -306,15 +629,55 @@ fdc37m60x_close(void *priv)
 static void *
 fdc37m60x_init(const device_t *info)
 {
-    fdc37m60x_t *dev = (fdc37m60x_t *) malloc(sizeof(fdc37m60x_t));
-    memset(dev, 0, sizeof(fdc37m60x_t));
-    SIO_INDEX_PORT = info->local;
+    fdc37m60x_t *dev = (fdc37m60x_t *) calloc(1, sizeof(fdc37m60x_t));
 
-    dev->fdc     = device_add(&fdc_at_smc_device);
-    dev->uart[0] = device_add_inst(&ns16550_device, 1);
-    dev->uart[1] = device_add_inst(&ns16550_device, 2);
+    dev->fdc = device_add(&fdc_at_smc_device);
 
-    io_sethandler(SIO_INDEX_PORT, 0x0002, fdc37m60x_read, NULL, NULL, fdc37m60x_write, NULL, NULL, dev);
+    dev->uart[0]   = device_add_inst(&ns16550_device, 1);
+    dev->uart[1]   = device_add_inst(&ns16550_device, 2);
+
+    dev->lpt       = device_add_inst(&lpt_port_device, 1);
+
+    dev->kbc_type  = info->local & FDC37XXXX_KBC;
+
+    dev->is_compaq = (dev->kbc_type == FDC37XXX1);
+
+    dev->port_370  = !!(info->local & FDC37XXXX_370);
+
+    dev->max_ld    = 8;
+
+    if (dev->is_compaq) {
+        io_sethandler(0x0f9, 0x0001,
+                      fdc37m60x_read, NULL, NULL, fdc37m60x_write, NULL, NULL, dev);
+        io_sethandler(0x0fb, 0x0001,
+                      fdc37m60x_read, NULL, NULL, fdc37m60x_write, NULL, NULL, dev);
+    }
+
+    switch (dev->kbc_type) {
+        case FDC37XXX1:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) KBC_VEN_COMPAQ);
+            break;
+        case FDC37XXX2:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_AMI | 0x00003500));
+            break;
+        case FDC37XXX3:
+        default:
+            dev->kbc = device_add(&kbc_at_device);
+            break;
+        case FDC37XXX5:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_PHOENIX | 0x00013800));
+            break;
+        case FDC37XXX7:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_PHOENIX | 0x00041600));
+            break;
+    }
+
+    /* Set the defaults here so the ports can be removed by fdc37m60x_reset(). */
+    dev->fdc_base     = 0x03f0;
+    dev->lpt_base     = 0x0378;
+    dev->uart_base[0] = 0x03f8;
+    dev->uart_base[1] = 0x02f8;
+    dev->kbc_base     = 0x0060;
 
     fdc37m60x_reset(dev);
 
@@ -322,28 +685,14 @@ fdc37m60x_init(const device_t *info)
 }
 
 const device_t fdc37m60x_device = {
-    .name          = "SMSC FDC37M60X",
+    .name          = "SMC FDC37C93x Super I/O",
     .internal_name = "fdc37m60x",
     .flags         = 0,
-    .local         = FDC_PRIMARY_ADDR,
+    .local         = 0,
     .init          = fdc37m60x_init,
     .close         = fdc37m60x_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t fdc37m60x_370_device = {
-    .name          = "SMSC FDC37M60X with 10K Pull Up Resistor",
-    .internal_name = "fdc37m60x_370",
-    .flags         = 0,
-    .local         = FDC_SECONDARY_ADDR,
-    .init          = fdc37m60x_init,
-    .close         = fdc37m60x_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .reset         = fdc37m60x_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sio/sio_gm82c803ab.c b/src/sio/sio_gm82c803ab.c
new file mode 100644
index 000000000..bf74dc703
--- /dev/null
+++ b/src/sio/sio_gm82c803ab.c
@@ -0,0 +1,373 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the GoldStar GM82C803 A andB Super I/O
+ *          Chips.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2025 Miran Grca.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/device.h>
+#include <86box/pci.h>
+#include <86box/lpt.h>
+#include <86box/serial.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/sio.h>
+
+typedef struct gm82c803ab_t {
+    uint8_t   type;
+    uint8_t   tries;
+    uint8_t   has_ide;
+    uint8_t   regs[256];
+    int       cur_reg;
+    int       com3_addr;
+    int       com4_addr;
+    fdc_t    *fdc;
+    serial_t *uart[2];
+    lpt_t    *lpt;
+} gm82c803ab_t;
+
+#ifdef ENABLE_GM82C803AB_LOG
+int gm82c803ab_do_log = ENABLE_GM82C803AB_LOG;
+
+static void
+gm82c803ab_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (gm82c803ab_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define gm82c803ab_log(fmt, ...)
+#endif
+
+static void
+ide_handler(gm82c803ab_t *dev)
+{
+    if (dev->has_ide > 0) {
+        int ide_id = dev->has_ide - 1;
+
+        ide_handlers(ide_id, 0);
+
+        ide_set_base_addr(ide_id, 0, (dev->regs[0xa1] & 0x80) ? 0x0170 : 0x01f0);
+        ide_set_base_addr(ide_id, 1, (dev->regs[0xa1] & 0x80) ? 0x0376 : 0x03f6);
+
+        if (dev->regs[0xa0] & 0x20)
+            ide_handlers(ide_id, 1);
+    }
+}
+
+static void
+fdc_handler(gm82c803ab_t *dev)
+{
+    fdc_remove(dev->fdc);
+    if (dev->regs[0xa0] & 0x10)
+        fdc_set_base(dev->fdc, (dev->regs[0xa1] & 0x40) ? FDC_SECONDARY_ADDR : FDC_PRIMARY_ADDR);
+}
+
+static void
+set_com34_addr(gm82c803ab_t *dev)
+{
+    switch (dev->regs[0xa4] & 0xc0) {
+        case 0x00:
+            dev->com3_addr = COM3_ADDR;
+            dev->com4_addr = COM4_ADDR;
+            break;
+        case 0x40:
+            dev->com3_addr = 0x338;
+            dev->com4_addr = 0x238;
+            break;
+        case 0x80:
+            dev->com3_addr = COM3_ADDR;
+            dev->com4_addr = 0x2e0;
+            break;
+        case 0xc0:
+            dev->com3_addr = 0x220;
+            dev->com4_addr = 0x228;
+            break;
+
+        default:
+            break;
+    }
+}
+
+static void
+set_serial_addr(gm82c803ab_t *dev, int port)
+{
+    uint8_t shift     = 2 + (port << 1);
+    double  clock_src = 24000000.0 / 13.0;
+
+    if (dev->regs[0xa4] & (1 << (4 + port)))
+        clock_src = 24000000.0 / 12.0;
+
+    serial_remove(dev->uart[port]);
+    if (dev->regs[0xa0] & (0x04 << port)) {
+        switch ((dev->regs[0xa1] >> shift) & 0x03) {
+            case 0x00:
+                serial_setup(dev->uart[port], COM1_ADDR, COM1_IRQ);
+                break;
+            case 0x01:
+                serial_setup(dev->uart[port], COM2_ADDR, COM2_IRQ);
+                break;
+            case 0x02:
+                serial_setup(dev->uart[port], dev->com3_addr, COM3_IRQ);
+                break;
+            case 0x03:
+                serial_setup(dev->uart[port], dev->com4_addr, COM4_IRQ);
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    serial_set_clock_src(dev->uart[port], clock_src);
+}
+
+static void
+lpt_handler(gm82c803ab_t *dev)
+{
+    uint16_t lpt_port     = 0x0000;
+    uint16_t mask         = 0xfffc;
+    uint8_t  local_enable = 1;
+    uint8_t  lpt_irq      = LPT1_IRQ;
+    uint8_t  lpt_mode     = (dev->regs[0xa0] & 0x03);
+
+    switch (lpt_mode) {
+        default:
+            local_enable = 0;
+            break;
+        case 0x00:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 1);
+            break;
+        case 0x01:
+            if (dev->type == GM82C803B) {
+                lpt_set_epp(dev->lpt, !!(dev->regs[0xa5] & 0x20));
+                lpt_set_ecp(dev->lpt, 1);
+                lpt_set_ext(dev->lpt, 0);
+            } else
+                local_enable = 0;
+            break;
+        case 0x02:
+            if (dev->type == GM82C803B) {
+                mask = 0xfff8;
+                lpt_set_epp(dev->lpt, 1);
+                lpt_set_ecp(dev->lpt, !!(dev->regs[0xa5] & 0x20));
+                lpt_set_ext(dev->lpt, 0);
+            } else
+                local_enable = 0;
+            break;
+    }
+
+    switch (dev->regs[0xa1] & 0x03) {
+        default:
+            lpt_port     = LPT_MDA_ADDR;
+            lpt_irq      = LPT_MDA_IRQ;
+            break;
+        case 0x00:
+            lpt_port     = LPT1_ADDR;
+            lpt_irq      = LPT1_IRQ /*LPT2_IRQ*/;
+            break;
+        case 0x01:
+            lpt_port     = LPT2_ADDR;
+            lpt_irq      = LPT1_IRQ /*LPT2_IRQ*/;
+            break;
+    }
+
+    if (lpt_irq > 15)
+        lpt_irq = 0xff;
+
+    lpt_port_remove(dev->lpt);
+    lpt_set_fifo_threshold(dev->lpt, dev->regs[0x0a] & 0x0f);
+
+    if (local_enable && (lpt_port >= 0x0100) && (lpt_port <= (0x0ffc & mask)))
+        lpt_port_setup(dev->lpt, lpt_port);
+
+    lpt_port_irq(dev->lpt, lpt_irq);
+}
+
+static void
+gm82c803ab_write(uint16_t port, uint8_t val, void *priv)
+{
+    gm82c803ab_t *dev    = (gm82c803ab_t *) priv;
+    uint8_t       valxor = 0;
+
+    if (dev->tries == 2) {
+        if (port == 0x0398) {
+            if (val == 0xcc)
+                dev->tries = 0;
+            else
+                dev->cur_reg = val;
+        } else {
+            if ((dev->cur_reg < 0xa0) || (dev->cur_reg > 0xa5))
+                return;
+
+            valxor                  = val ^ dev->regs[dev->cur_reg];
+            dev->regs[dev->cur_reg] = val;
+
+            switch (dev->cur_reg) {
+                default:
+                    break;
+                case 0xa0: /* Function Selection Register (FSR) */
+                    if (valxor & 0x20)
+                        ide_handler(dev);
+                    if (valxor & 0x10)
+                        fdc_handler(dev);
+                    if (valxor & 0x08)
+                        set_serial_addr(dev, 1);
+                    if (valxor & 0x04)
+                        set_serial_addr(dev, 0);
+                    if (valxor & 0x03)
+                        lpt_handler(dev);
+                    break;
+                case 0xa1: /* Address Selection Register (ASR) */
+                    if (valxor & 0x80)
+                        ide_handler(dev);
+                    if (valxor & 0x40)
+                        fdc_handler(dev);
+                    if (valxor & 0x30)
+                        set_serial_addr(dev, 1);
+                    if (valxor & 0x0c)
+                        set_serial_addr(dev, 0);
+                    if (valxor & 0x03)
+                        lpt_handler(dev);
+                    break;
+                case 0xa4: /* Miscellaneous Function Register */
+                    if (valxor & 0xc0) {
+                        set_com34_addr(dev);
+                        set_serial_addr(dev, 0);
+                        set_serial_addr(dev, 1);
+                    }
+                    if (valxor & 0x20)
+                        set_serial_addr(dev, 1);
+                    if (valxor & 0x10)
+                        set_serial_addr(dev, 0);
+                    if (valxor & 0x01)
+                        fdc_set_swap(dev->fdc, val & 0x01);
+                    break;
+                case 0xa5: /* ECP Register */
+                    if (valxor & 0x20)
+                        lpt_handler(dev);
+                    break;
+            }
+        }
+    } else if ((port == 0x0398) && (val == 0x33))
+        dev->tries++;
+}
+
+static uint8_t
+gm82c803ab_read(uint16_t port, void *priv)
+{
+    const gm82c803ab_t *dev = (gm82c803ab_t *) priv;
+    uint8_t             ret = 0xff;
+
+    if (dev->tries == 2) {
+        if ((port == 0x0399) && (dev->cur_reg >= 0xa0) && (dev->cur_reg <= 0xa1))
+            ret = dev->regs[dev->cur_reg];
+    }
+
+    return ret;
+}
+
+static void
+gm82c803ab_reset(gm82c803ab_t *dev)
+{
+    dev->com3_addr = 0x338;
+    dev->com4_addr = 0x238;
+
+    serial_remove(dev->uart[0]);
+    serial_setup(dev->uart[0], COM1_ADDR, COM1_IRQ);
+
+    serial_remove(dev->uart[1]);
+    serial_setup(dev->uart[1], COM2_ADDR, COM2_IRQ);
+
+    lpt_port_remove(dev->lpt);
+    lpt_port_setup(dev->lpt, LPT1_ADDR);
+
+    fdc_reset(dev->fdc);
+    fdc_remove(dev->fdc);
+
+    dev->tries = 0;
+    memset(dev->regs, 0, 256);
+
+    dev->regs[0xa0] = 0xff;
+
+    set_serial_addr(dev, 0);
+    set_serial_addr(dev, 1);
+
+    lpt_handler(dev);
+
+    fdc_handler(dev);
+
+    if (dev->has_ide)
+        ide_handler(dev);
+}
+
+static void
+gm82c803ab_close(void *priv)
+{
+    gm82c803ab_t *dev = (gm82c803ab_t *) priv;
+
+    free(dev);
+}
+
+static void *
+gm82c803ab_init(const device_t *info)
+{
+    gm82c803ab_t *dev = (gm82c803ab_t *) calloc(1, sizeof(gm82c803ab_t));
+
+    dev->fdc = device_add(&fdc_at_smc_device);
+
+    dev->type    = info->local & 0xff;
+    dev->has_ide = (info->local >> 8) & 0xff;
+
+    dev->uart[0] = device_add_inst(&ns16550_device, 1);
+    dev->uart[1] = device_add_inst(&ns16550_device, 2);
+
+    dev->lpt = device_add_inst(&lpt_port_device, 1);
+    lpt_set_cnfgb_readout(dev->lpt, 0x00);
+
+    io_sethandler(0x0398, 0x0002,
+                  gm82c803ab_read, NULL, NULL, gm82c803ab_write, NULL, NULL, dev);
+
+    gm82c803ab_reset(dev);
+
+    return dev;
+}
+
+const device_t gm82c803ab_device = {
+    .name          = "Goldstar GMC82C803A/B",
+    .internal_name = "gm82c803ab",
+    .flags         = 0,
+    .local         = 0,
+    .init          = gm82c803ab_init,
+    .close         = gm82c803ab_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/sio/sio_gm82c803c.c b/src/sio/sio_gm82c803c.c
new file mode 100644
index 000000000..e9787fa39
--- /dev/null
+++ b/src/sio/sio_gm82c803c.c
@@ -0,0 +1,383 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the GoldStar GM82C803C Super I/O Chip.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2025 Miran Grca.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/device.h>
+#include <86box/pci.h>
+#include <86box/lpt.h>
+#include <86box/serial.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/sio.h>
+
+typedef struct gm82c803c_t {
+    uint8_t   tries;
+    uint8_t   has_ide;
+    uint8_t   dma_map[4];
+    uint8_t   irq_map[10];
+    uint8_t   regs[256];
+    int       cur_reg;
+    fdc_t    *fdc;
+    serial_t *uart[2];
+    lpt_t    *lpt;
+} gm82c803c_t;
+
+#ifdef ENABLE_GM82C803C_LOG
+int gm82c803c_do_log = ENABLE_GM82C803C_LOG;
+
+static void
+gm82c803c_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (gm82c803c_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define gm82c803c_log(fmt, ...)
+#endif
+
+static void
+ide_handler(gm82c803c_t *dev)
+{
+    uint16_t ide_port     = 0x0000;
+
+    if (dev->has_ide > 0) {
+        int ide_id = dev->has_ide - 1;
+
+        ide_handlers(ide_id, 0);
+
+        ide_port     = (dev->regs[0xc4] << 2) & 0xfff0;
+        ide_set_base_addr(ide_id, 0, ide_port);
+
+        ide_port     = ((dev->regs[0xc5] << 2) & 0xfff0) | 0x0006;
+        ide_set_base_addr(ide_id, 1, ide_port);
+
+        if (dev->regs[0xc2] & 0x20)
+            ide_handlers(ide_id, 1);
+    }
+}
+
+static void
+fdc_handler(gm82c803c_t *dev)
+{
+    uint16_t fdc_port     = 0x0000;
+    uint8_t  fdc_irq      = 6;
+    uint8_t  fdc_dma      = 2;
+
+    fdc_port     = (dev->regs[0xc3] << 2) & 0xfff0;
+
+    fdc_irq      = dev->irq_map[dev->regs[0xca] >> 4];
+    fdc_dma      = dev->dma_map[(dev->regs[0xc9] >> 4) & 0x03];
+
+    fdc_set_irq(dev->fdc, fdc_irq);
+    fdc_set_dma_ch(dev->fdc, fdc_dma);
+
+    fdc_remove(dev->fdc);
+    if (dev->regs[0xc2] & 0x10)
+        fdc_set_base(dev->fdc, fdc_port);
+}
+
+static void
+set_serial_addr(gm82c803c_t *dev, int port)
+{
+    uint16_t serial_port = 0x0000;
+    uint8_t  serial_irq  = COM1_IRQ;
+    double   clock_src   = 24000000.0 / 13.0;
+
+    if (dev->regs[0xce] & (1 << (6 + port)))
+        clock_src = 24000000.0 / 3.0;
+    else if (dev->regs[0xd1] & (1 << port))
+        clock_src = 24000000.0 / 12.0;
+
+    serial_remove(dev->uart[port]);
+    if (dev->regs[0xc2] & (0x04 << port)) {
+        serial_port = (dev->regs[0xc7 + port] << 2) & 0xfff8;
+        serial_irq  = dev->irq_map[dev->regs[0xcb] >> ((port ^ 1) * 0xff)];
+
+        serial_setup(dev->uart[port], serial_port, serial_irq);
+    }
+
+    serial_set_clock_src(dev->uart[port], clock_src);
+}
+
+static void
+lpt_handler(gm82c803c_t *dev)
+{
+    uint16_t lpt_port     = 0x0000;
+    uint16_t mask         = 0xfffc;
+    uint8_t  local_enable = 1;
+    uint8_t  lpt_irq      = LPT1_IRQ;
+    uint8_t  lpt_dma      = 3;
+    uint8_t  lpt_mode     = (dev->regs[0xc2] & 0x03);
+
+    switch (lpt_mode) {
+        default:
+            local_enable = 0;
+            break;
+        case 0x00:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 1);
+            break;
+        case 0x01:
+            lpt_set_epp(dev->lpt, !!(dev->regs[0xd0] & 0x20));
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x02:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, !!(dev->regs[0xd0] & 0x20));
+            lpt_set_ext(dev->lpt, 0);
+            break;
+    }
+
+    lpt_port     = ((dev->regs[0xc6] << 2) & 0xfffc) & mask;
+
+    lpt_irq      = dev->irq_map[dev->regs[0xca] & 0x0f];
+    lpt_dma      = dev->dma_map[dev->regs[0xc9] & 0x03];
+
+    if (lpt_irq > 15)
+        lpt_irq = 0xff;
+
+    lpt_port_remove(dev->lpt);
+    lpt_set_fifo_threshold(dev->lpt, dev->regs[0x0a] & 0x0f);
+
+    if (local_enable && (lpt_port >= 0x0100) && (lpt_port <= (0x0ffc & mask)))
+        lpt_port_setup(dev->lpt, lpt_port);
+
+    lpt_port_irq(dev->lpt, lpt_irq);
+    lpt_port_dma(dev->lpt, lpt_dma);
+}
+
+static void
+gm82c803c_write(uint16_t port, uint8_t val, void *priv)
+{
+    gm82c803c_t *dev    = (gm82c803c_t *) priv;
+    uint8_t      valxor = 0;
+
+    if (dev->tries == 2) {
+        if (port == 0x0398) {
+            if (val == 0xcc)
+                dev->tries = 0;
+            else
+                dev->cur_reg = val;
+        } else {
+            if ((dev->cur_reg < 0xc2) || (dev->cur_reg > 0xd8))
+                return;
+
+            valxor                  = val ^ dev->regs[dev->cur_reg];
+            dev->regs[dev->cur_reg] = val;
+
+            switch (dev->cur_reg) {
+                default:
+                    break;
+                case 0xc2:
+                    if (valxor & 0x20)
+                        ide_handler(dev);
+                    if (valxor & 0x10)
+                        fdc_handler(dev);
+                    if (valxor & 0x08)
+                        set_serial_addr(dev, 1);
+                    if (valxor & 0x04)
+                        set_serial_addr(dev, 0);
+                    if (valxor & 0x03)
+                        lpt_handler(dev);
+                    break;
+                case 0xc3:
+                    if (valxor)
+                        fdc_handler(dev);
+                    break;
+                case 0xc4: case 0xc5:
+                    if (valxor)
+                        ide_handler(dev);
+                    break;
+                case 0xc6:
+                    if (valxor)
+                        lpt_handler(dev);
+                    break;
+                case 0xc7:
+                    if (valxor)
+                        set_serial_addr(dev, 0);
+                case 0xc8:
+                    if (valxor)
+                        set_serial_addr(dev, 1);
+                case 0xc9:
+                    if (valxor & 0xf0)
+                        fdc_handler(dev);
+                    if (valxor & 0x0f)
+                        lpt_handler(dev);
+                    break;
+                case 0xca:
+                    if (valxor & 0xf0)
+                        fdc_handler(dev);
+                    if (valxor & 0x0f)
+                        lpt_handler(dev);
+                    break;
+                case 0xcb:
+                    if (valxor & 0xf0)
+                        set_serial_addr(dev, 0);
+                    if (valxor & 0x0f)
+                        set_serial_addr(dev, 1);
+                    break;
+                case 0xce:
+                    if (valxor & 0x80)
+                        set_serial_addr(dev, 1);
+                    if (valxor & 0x40)
+                        set_serial_addr(dev, 0);
+                    break;
+                case 0xd0:
+                    if (valxor & 0x20)
+                        lpt_handler(dev);
+                    break;
+                case 0xd1:
+                    if (valxor & 0x02)
+                        set_serial_addr(dev, 1);
+                    if (valxor & 0x01)
+                        set_serial_addr(dev, 0);
+                    break;
+
+                    if (valxor & 0x20)
+                        ide_handler(dev);
+                    if (valxor & 0x08)
+                        set_serial_addr(dev, 1);
+                    if (valxor & 0x04)
+                        set_serial_addr(dev, 0);
+                    break;
+            }
+        }
+    } else if ((port == 0x0398) && (val == 0x33))
+        dev->tries++;
+}
+
+static uint8_t
+gm82c803c_read(uint16_t port, void *priv)
+{
+    const gm82c803c_t *dev = (gm82c803c_t *) priv;
+    uint8_t            ret = 0xff;
+
+    if (dev->tries == 2) {
+        if ((port == 0x0399) && (dev->cur_reg >= 0xa0) && (dev->cur_reg <= 0xa1))
+            ret = dev->regs[dev->cur_reg];
+    }
+
+    return ret;
+}
+
+static void
+gm82c803c_reset(gm82c803c_t *dev)
+{
+    serial_remove(dev->uart[0]);
+    serial_setup(dev->uart[0], COM1_ADDR, COM1_IRQ);
+
+    serial_remove(dev->uart[1]);
+    serial_setup(dev->uart[1], COM2_ADDR, COM2_IRQ);
+
+    lpt_port_remove(dev->lpt);
+    lpt_port_setup(dev->lpt, LPT1_ADDR);
+
+    fdc_reset(dev->fdc);
+    fdc_remove(dev->fdc);
+
+    dev->tries = 0;
+    memset(dev->regs, 0, 256);
+
+    dev->regs[0xc0] = 0x3c;
+    dev->regs[0xc2] = 0x03;
+    dev->regs[0xc3] = 0x3c;
+    dev->regs[0xc4] = 0x3c;
+    dev->regs[0xc5] = 0x3d;
+    dev->regs[0xd5] = 0x3c;
+
+    set_serial_addr(dev, 0);
+    set_serial_addr(dev, 1);
+
+    lpt_handler(dev);
+
+    fdc_handler(dev);
+
+    if (dev->has_ide)
+        ide_handler(dev);
+}
+
+static void
+gm82c803c_close(void *priv)
+{
+    gm82c803c_t *dev = (gm82c803c_t *) priv;
+
+    free(dev);
+}
+
+static void *
+gm82c803c_init(const device_t *info)
+{
+    gm82c803c_t *dev = (gm82c803c_t *) calloc(1, sizeof(gm82c803c_t));
+
+    dev->fdc = device_add(&fdc_at_smc_device);
+
+    dev->has_ide = (info->local >> 8) & 0xff;
+
+    dev->uart[0] = device_add_inst(&ns16550_device, 1);
+    dev->uart[1] = device_add_inst(&ns16550_device, 2);
+
+    dev->lpt = device_add_inst(&lpt_port_device, 1);
+    lpt_set_cnfgb_readout(dev->lpt, 0x00);
+
+    io_sethandler(0x0398, 0x0002,
+                  gm82c803c_read, NULL, NULL, gm82c803c_write, NULL, NULL, dev);
+
+    dev->dma_map[0] = 4;
+    for (int i = 1; i < 4; i++)
+        dev->dma_map[i] = i;
+
+    memset(dev->irq_map, 0xff, 16);
+    dev->irq_map[0]  = 0xff;
+    for (int i = 1; i < 7; i++)
+         dev->irq_map[i] = i;
+    dev->irq_map[1]  = 5;
+    dev->irq_map[5]  = 7;
+    dev->irq_map[7]  = 0xff;    /* Reserved. */
+    dev->irq_map[8]  = 10;
+
+    gm82c803c_reset(dev);
+
+    return dev;
+}
+
+const device_t gm82c803c_device = {
+    .name          = "Goldstar GM82C803C",
+    .internal_name = "gm82c803c",
+    .flags         = 0,
+    .local         = 0,
+    .init          = gm82c803c_init,
+    .close         = gm82c803c_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/sio/sio_it86x1f.c b/src/sio/sio_it86x1f.c
index 74e79bbed..324914355 100644
--- a/src/sio/sio_it86x1f.c
+++ b/src/sio/sio_it86x1f.c
@@ -32,6 +32,7 @@
 #include <86box/fdd.h>
 #include <86box/fdc.h>
 #include <86box/gameport.h>
+#include <86box/keyboard.h>
 #include <86box/sio.h>
 #include <86box/isapnp.h>
 #include <86box/plat_fallthrough.h>
@@ -243,6 +244,7 @@ typedef struct it86x1f_t {
 
     fdc_t    *fdc;
     serial_t *uart[2];
+    lpt_t    *lpt;
     void     *gameport;
 } it86x1f_t;
 
@@ -290,11 +292,14 @@ it8661f_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *pri
             break;
 
         case 3:
-            lpt1_remove();
+            lpt_port_remove(dev->lpt);
 
             if (config->activate && (config->io[0].base != ISAPNP_IO_DISABLED)) {
                 it86x1f_log("IT86x1F: LPT enabled at port %04X IRQ %d\n", config->io[0].base, config->irq[0].irq);
-                lpt1_init(config->io[0].base);
+                lpt_port_setup(dev->lpt, config->io[0].base);
+
+                lpt_port_irq(dev->lpt, config->irq[0].irq);
+                lpt_port_dma(dev->lpt, (config->dma[0].dma == ISAPNP_DMA_DISABLED) ? -1 : config->dma[0].dma);
             } else {
                 it86x1f_log("IT86x1F: LPT disabled\n");
             }
@@ -414,8 +419,10 @@ it86x1f_pnp_write_vendor_reg(uint8_t ld, uint8_t reg, uint8_t val, void *priv)
         case 0x23:
             val &= (1 << dev->gpio_ldn) - 1;
             dev->global_regs[reg & 0x0f] = val;
+#ifdef ENABLE_IT86X1F_LOG
             if (val)
-                pclog("IT86x1F: Warning: ISAPnP mode enabled.\n");
+                it86x1f_log("IT86x1F: Warning: ISAPnP mode enabled.\n");
+#endif
             break;
 
         case 0x24:
@@ -463,6 +470,13 @@ it86x1f_pnp_write_vendor_reg(uint8_t ld, uint8_t reg, uint8_t val, void *priv)
                 case 0x0f0:
                     dev->ldn_regs[ld][reg & 0x0f] = val & 0x0f;
                     fdc_set_swwp(dev->fdc, !!(val & 0x01));
+                    if (val & 0x02) {
+                        for (int i = 0; i < 4; i++)
+                            fdc_update_drvrate(dev->fdc, i, 1);
+                    } else {
+                        for (int i = 0; i < 4; i++)
+                            fdc_update_drvrate(dev->fdc, i, 0);
+                    }
                     fdc_set_swap(dev->fdc, !!(val & 0x04));
                     break;
 
@@ -481,6 +495,8 @@ it86x1f_pnp_write_vendor_reg(uint8_t ld, uint8_t reg, uint8_t val, void *priv)
 
                 case 0x3f0:
                     dev->ldn_regs[ld][reg & 0x0f] = val & 0x07;
+                    lpt_set_epp(dev->lpt, val & 0x01);
+                    lpt_set_ecp(dev->lpt, val & 0x02);
                     break;
 
                 case 0x4f0:
@@ -600,7 +616,7 @@ it86x1f_pnp_write_vendor_reg(uint8_t ld, uint8_t reg, uint8_t val, void *priv)
 }
 
 static void
-it86x1f_write_addr(uint16_t port, uint8_t val, void *priv)
+it86x1f_write_addr(UNUSED(uint16_t port), uint8_t val, void *priv)
 {
     it86x1f_t *dev = (it86x1f_t *) priv;
 
@@ -621,7 +637,7 @@ it86x1f_write_addr(uint16_t port, uint8_t val, void *priv)
 }
 
 static void
-it86x1f_write_data(uint16_t port, uint8_t val, void *priv)
+it86x1f_write_data(UNUSED(uint16_t port), uint8_t val, void *priv)
 {
     it86x1f_t *dev = (it86x1f_t *) priv;
 
@@ -657,7 +673,7 @@ it86x1f_write_data(uint16_t port, uint8_t val, void *priv)
 }
 
 static uint8_t
-it86x1f_read_addr(uint16_t port, void *priv)
+it86x1f_read_addr(UNUSED(uint16_t port), void *priv)
 {
     it86x1f_t *dev = (it86x1f_t *) priv;
     uint8_t    ret = dev->locked ? 0xff : dev->cur_reg;
@@ -668,7 +684,7 @@ it86x1f_read_addr(uint16_t port, void *priv)
 }
 
 static uint8_t
-it86x1f_read_data(uint16_t port, void *priv)
+it86x1f_read_data(UNUSED(uint16_t port), void *priv)
 {
     it86x1f_t *dev = (it86x1f_t *) priv;
     uint8_t    ret = 0xff;
@@ -769,13 +785,19 @@ it86x1f_reset(it86x1f_t *dev)
 {
     it86x1f_log("IT86x1F: reset()\n");
 
+    for (int i = 0; i < 4; i++)
+        fdc_update_drvrate(dev->fdc, i, 0);
+
     fdc_reset(dev->fdc);
 
     serial_remove(dev->uart[0]);
 
     serial_remove(dev->uart[1]);
 
-    lpt1_remove();
+    lpt_port_remove(dev->lpt);
+
+    lpt_set_epp(dev->lpt, 0);
+    lpt_set_ecp(dev->lpt, 0);
 
     isapnp_enable_card(dev->pnp_card, ISAPNP_CARD_DISABLE);
 
@@ -797,8 +819,7 @@ it86x1f_close(void *priv)
 static void *
 it86x1f_init(UNUSED(const device_t *info))
 {
-    it86x1f_t *dev = (it86x1f_t *) malloc(sizeof(it86x1f_t));
-    memset(dev, 0, sizeof(it86x1f_t));
+    it86x1f_t *dev = (it86x1f_t *) calloc(1, sizeof(it86x1f_t));
 
     uint8_t i;
     for (i = 0; i < (sizeof(it86x1f_models) / sizeof(it86x1f_models[0])); i++) {
@@ -806,18 +827,10 @@ it86x1f_init(UNUSED(const device_t *info))
             break;
     }
     if (i >= (sizeof(it86x1f_models) / sizeof(it86x1f_models[0]))) {
-#if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
-        fatal("IT86x1F: Unknown type %04" PRIX64 " selected\n", info->local);
-#else
-        fatal("IT86x1F: Unknown type %04X selected\n", info->local);
-#endif
+        fatal("IT86x1F: Unknown type %04" PRIXPTR " selected\n", info->local);
         return NULL;
     }
-#if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
-    it86x1f_log("IT86x1F: init(%04" PRIX64 ")\n", info->local);
-#else
-    it86x1f_log("IT86x1F: init(%04X)\n", info->local);
-#endif
+    it86x1f_log("IT86x1F: init(%04" PRIXPTR ")\n", info->local);
 
     /* Let the resource data parser figure out the ROM size. */
     dev->pnp_card = isapnp_add_card(it86x1f_models[i].pnp_rom, -1, it86x1f_models[i].pnp_config_changed, NULL, it86x1f_pnp_read_vendor_reg, it86x1f_pnp_write_vendor_reg, dev);
@@ -829,6 +842,11 @@ it86x1f_init(UNUSED(const device_t *info))
     dev->uart[0] = device_add_inst(&ns16550_device, 1);
     dev->uart[1] = device_add_inst(&ns16550_device, 2);
 
+    dev->lpt = device_add_inst(&lpt_port_device, 1);
+
+    lpt_set_cnfgb_readout(dev->lpt, 0x00);
+    lpt_set_ext(dev->lpt, 1);
+
     dev->gameport = gameport_add(&gameport_sio_device);
 
     dev->instance = device_get_instance();
@@ -837,6 +855,9 @@ it86x1f_init(UNUSED(const device_t *info))
     dev->unlock_id = it86x1f_models[i].unlock_id;
     io_sethandler(0x279, 1, NULL, NULL, NULL, it86x1f_write_unlock, NULL, NULL, dev);
 
+    if (info->local == ITE_IT8671F)
+        device_add_params(&kbc_at_device, (void *) (KBC_VEN_AMI | 0x00004800));
+
     it86x1f_reset(dev);
 
     return dev;
@@ -850,7 +871,7 @@ const device_t it8661f_device = {
     .init          = it86x1f_init,
     .close         = it86x1f_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -864,7 +885,7 @@ const device_t it8671f_device = {
     .init          = it86x1f_init,
     .close         = it86x1f_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sio/sio_pc87306.c b/src/sio/sio_pc87306.c
index ab7f8597e..f3c635dc8 100644
--- a/src/sio/sio_pc87306.c
+++ b/src/sio/sio_pc87306.c
@@ -23,6 +23,7 @@
 #include <86box/io.h>
 #include <86box/timer.h>
 #include <86box/device.h>
+#include <86box/keyboard.h>
 #include <86box/lpt.h>
 #include <86box/mem.h>
 #include <86box/nvr.h>
@@ -42,9 +43,12 @@ typedef struct pc87306_t {
     uint8_t   regs[29];
     uint8_t   gpio[2];
     uint16_t  gpioba;
+    uint16_t  kbc_type;
     int       cur_reg;
     fdc_t    *fdc;
+    void     *kbc;
     serial_t *uart[2];
+    lpt_t    *lpt;
     nvr_t    *nvr;
 } pc87306_t;
 
@@ -68,7 +72,7 @@ pc87306_gpio_write(uint16_t port, uint8_t val, void *priv)
 }
 
 uint8_t
-pc87306_gpio_read(uint16_t port, void *priv)
+pc87306_gpio_read(uint16_t port, UNUSED(void *priv))
 {
     uint32_t ret = machine_handle_gpio(0, 0xffffffff);
 
@@ -115,12 +119,15 @@ pc87306_gpio_handler(pc87306_t *dev)
 }
 
 static void
-lpt1_handler(pc87306_t *dev)
+lpt_handler(pc87306_t *dev)
 {
     int      temp;
     uint16_t lptba;
-    uint16_t lpt_port = LPT1_ADDR;
-    uint8_t  lpt_irq = LPT2_IRQ;
+    uint16_t lpt_port      = LPT1_ADDR;
+    uint8_t  lpt_irq       = LPT2_IRQ;
+    uint8_t  cnfgb_readout = 0x08;
+
+    lpt_port_remove(dev->lpt);
 
     temp  = dev->regs[0x01] & 3;
     lptba = ((uint16_t) dev->regs[0x19]) << 2;
@@ -153,10 +160,23 @@ lpt1_handler(pc87306_t *dev)
     if (dev->regs[0x1b] & 0x10)
         lpt_irq = (dev->regs[0x1b] & 0x20) ? 7 : 5;
 
-    if (lpt_port)
-        lpt1_init(lpt_port);
+    cnfgb_readout |= (lpt_irq == 5) ? 0x30 : 0x00;
+    cnfgb_readout |= (dev->regs[0x18] & 0x06) >> 1;
 
-    lpt1_irq(lpt_irq);
+    lpt_set_cnfgb_readout(dev->lpt, cnfgb_readout);
+    lpt_set_ext(dev->lpt, !!(dev->regs[0x02] & 0x80));
+
+    lpt_set_epp(dev->lpt, !!(dev->regs[0x04] & 0x01));
+    lpt_set_ecp(dev->lpt, !!(dev->regs[0x04] & 0x04));
+
+    if (lpt_port)
+        lpt_port_setup(dev->lpt, lpt_port);
+
+    lpt_port_irq(dev->lpt, lpt_irq);
+
+    if (((jumpered_internal_ecp_dma < 0) || (jumpered_internal_ecp_dma == 4)) &&
+        ((dev->regs[0x18] & 0x06) != 0x00))
+        lpt_port_dma(dev->lpt, (dev->regs[0x18] & 0x08) ? 3 : 1);
 }
 
 static void
@@ -169,7 +189,7 @@ serial_handler(pc87306_t *dev, int uart)
     uint8_t pnp_shift;
     uint8_t irq;
 
-    temp = (dev->regs[1] >> (2 << uart)) & 3;
+    temp = (dev->regs[0x01] >> (2 << uart)) & 3;
 
     fer_shift = 2 << uart;       /* 2 for UART 1, 4 for UART 2 */
     pnp_shift = 2 + (uart << 2); /* 2 for UART 1, 6 for UART 2 */
@@ -188,7 +208,7 @@ serial_handler(pc87306_t *dev, int uart)
             serial_setup(dev->uart[uart], COM2_ADDR, irq);
             break;
         case 2:
-            switch ((dev->regs[1] >> 6) & 3) {
+            switch ((dev->regs[0x01] >> 6) & 3) {
                 case 0:
                     serial_setup(dev->uart[uart], COM3_ADDR, irq);
                     break;
@@ -207,7 +227,7 @@ serial_handler(pc87306_t *dev, int uart)
             }
             break;
         case 3:
-            switch ((dev->regs[1] >> 6) & 3) {
+            switch ((dev->regs[0x01] >> 6) & 3) {
                 case 0:
                     serial_setup(dev->uart[uart], COM4_ADDR, irq);
                     break;
@@ -231,6 +251,15 @@ serial_handler(pc87306_t *dev, int uart)
     }
 }
 
+static void
+kbc_handler(pc87306_t *dev)
+{
+    kbc_at_handler(0, 0x0060, dev->kbc);
+
+    if (dev->regs[0x05] & 0x01)
+        kbc_at_handler(1, 0x0060, dev->kbc);
+}
+
 static void
 pc87306_write(uint16_t port, uint8_t val, void *priv)
 {
@@ -264,73 +293,80 @@ pc87306_write(uint16_t port, uint8_t val, void *priv)
 
     switch (dev->cur_reg) {
         case 0x00:
-            if (valxor & 1) {
-                lpt1_remove();
-                if ((val & 1) && !(dev->regs[2] & 1))
-                    lpt1_handler(dev);
+            if (valxor & 0x01) {
+                lpt_port_remove(dev->lpt);
+                if ((val & 1) && !(dev->regs[0x02] & 1))
+                    lpt_handler(dev);
             }
-            if (valxor & 2) {
-                serial_remove(dev->uart[0]);
-                if ((val & 2) && !(dev->regs[2] & 1))
+            if (valxor & 0x02) {
+                serial_remove(dev->uart[0x00]);
+                if ((val & 2) && !(dev->regs[0x02] & 1))
                     serial_handler(dev, 0);
             }
-            if (valxor & 4) {
-                serial_remove(dev->uart[1]);
-                if ((val & 4) && !(dev->regs[2] & 1))
+            if (valxor & 0x04) {
+                serial_remove(dev->uart[0x01]);
+                if ((val & 4) && !(dev->regs[0x02] & 1))
                     serial_handler(dev, 1);
             }
             if (valxor & 0x28) {
                 fdc_remove(dev->fdc);
-                if ((val & 8) && !(dev->regs[2] & 1))
+                if ((val & 8) && !(dev->regs[0x02] & 1))
                     fdc_set_base(dev->fdc, (val & 0x20) ? FDC_SECONDARY_ADDR : FDC_PRIMARY_ADDR);
             }
             break;
         case 0x01:
-            if (valxor & 3) {
-                lpt1_remove();
-                if ((dev->regs[0] & 1) && !(dev->regs[2] & 1))
-                    lpt1_handler(dev);
+            if (valxor & 0x03) {
+                lpt_port_remove(dev->lpt);
+                if ((dev->regs[0x00] & 1) && !(dev->regs[0x02] & 1))
+                    lpt_handler(dev);
             }
             if (valxor & 0xcc) {
-                serial_remove(dev->uart[0]);
-                if ((dev->regs[0] & 2) && !(dev->regs[2] & 1))
+                serial_remove(dev->uart[0x00]);
+                if ((dev->regs[0x00] & 2) && !(dev->regs[0x02] & 1))
                     serial_handler(dev, 0);
             }
             if (valxor & 0xf0) {
-                serial_remove(dev->uart[1]);
-                if ((dev->regs[0] & 4) && !(dev->regs[2] & 1))
+                serial_remove(dev->uart[0x01]);
+                if ((dev->regs[0x00] & 4) && !(dev->regs[0x02] & 1))
                     serial_handler(dev, 1);
             }
             break;
         case 0x02:
-            if (valxor & 1) {
-                lpt1_remove();
-                serial_remove(dev->uart[0]);
-                serial_remove(dev->uart[1]);
+            if (valxor & 0x01) {
+                lpt_port_remove(dev->lpt);
+                serial_remove(dev->uart[0x00]);
+                serial_remove(dev->uart[0x01]);
                 fdc_remove(dev->fdc);
 
                 if (!(val & 1)) {
-                    if (dev->regs[0] & 1)
-                        lpt1_handler(dev);
-                    if (dev->regs[0] & 2)
+                    if (dev->regs[0x00] & 0x01)
+                        lpt_handler(dev);
+                    if (dev->regs[0x00] & 0x02)
                         serial_handler(dev, 0);
-                    if (dev->regs[0] & 4)
+                    if (dev->regs[0x00] & 0x04)
                         serial_handler(dev, 1);
-                    if (dev->regs[0] & 8)
-                        fdc_set_base(dev->fdc, (dev->regs[0] & 0x20) ? FDC_SECONDARY_ADDR : FDC_PRIMARY_ADDR);
+                    if (dev->regs[0x00] & 0x08)
+                        fdc_set_base(dev->fdc, (dev->regs[0x00] & 0x20) ? FDC_SECONDARY_ADDR : FDC_PRIMARY_ADDR);
                 }
             }
-            if (valxor & 8) {
-                lpt1_remove();
-                if ((dev->regs[0] & 1) && !(dev->regs[2] & 1))
-                    lpt1_handler(dev);
+            if (valxor & 0x88) {
+                lpt_port_remove(dev->lpt);
+                if ((dev->regs[0x00] & 1) && !(dev->regs[0x02] & 1))
+                    lpt_handler(dev);
             }
             break;
         case 0x04:
+            if (valxor & (0x05)) {
+                lpt_port_remove(dev->lpt);
+                if ((dev->regs[0x00] & 0x01) && !(dev->regs[0x02] & 0x01))
+                    lpt_handler(dev);
+            }
             if (valxor & 0x80)
                 nvr_lock_set(0x00, 256, !!(val & 0x80), dev->nvr);
             break;
         case 0x05:
+            if (valxor & 0x01)
+                kbc_handler(dev);
             if (valxor & 0x08)
                 nvr_at_handler(!!(val & 0x08), 0x0070, dev->nvr);
             if (valxor & 0x20)
@@ -341,6 +377,8 @@ pc87306_write(uint16_t port, uint8_t val, void *priv)
                 fdc_update_enh_mode(dev->fdc, (val & 4) ? 1 : 0);
                 fdc_update_densel_polarity(dev->fdc, (val & 0x40) ? 1 : 0);
             }
+            if (valxor & 0x20)
+                lpt_set_cnfga_readout(dev->lpt, (val & 0x20) ? 0x18 : 0x10);
             break;
         case 0x0f:
             if (valxor)
@@ -352,30 +390,37 @@ pc87306_write(uint16_t port, uint8_t val, void *priv)
             if (valxor & 0x30)
                 pc87306_gpio_handler(dev);
             break;
+        case 0x18:
+            if (valxor & (0x0e)) {
+                lpt_port_remove(dev->lpt);
+                if ((dev->regs[0x00] & 0x01) && !(dev->regs[0x02] & 0x01))
+                    lpt_handler(dev);
+            }
+            break;
         case 0x19:
             if (valxor) {
-                lpt1_remove();
-                if ((dev->regs[0] & 1) && !(dev->regs[2] & 1))
-                    lpt1_handler(dev);
+                lpt_port_remove(dev->lpt);
+                if ((dev->regs[0x00] & 1) && !(dev->regs[0x02] & 1))
+                    lpt_handler(dev);
             }
             break;
-        case 0x1B:
+        case 0x1b:
             if (valxor & 0x70) {
-                lpt1_remove();
+                lpt_port_remove(dev->lpt);
                 if (!(val & 0x40))
-                    dev->regs[0x19] = 0xEF;
-                if ((dev->regs[0] & 1) && !(dev->regs[2] & 1))
-                    lpt1_handler(dev);
+                    dev->regs[0x19] = 0xef;
+                if ((dev->regs[0x00] & 1) && !(dev->regs[0x02] & 1))
+                    lpt_handler(dev);
             }
             break;
-        case 0x1C:
+        case 0x1c:
             if (valxor) {
-                serial_remove(dev->uart[0]);
-                serial_remove(dev->uart[1]);
+                serial_remove(dev->uart[0x00]);
+                serial_remove(dev->uart[0x01]);
 
-                if ((dev->regs[0] & 2) && !(dev->regs[2] & 1))
+                if ((dev->regs[0x00] & 2) && !(dev->regs[0x02] & 1))
                     serial_handler(dev, 0);
-                if ((dev->regs[0] & 4) && !(dev->regs[2] & 1))
+                if ((dev->regs[0x00] & 4) && !(dev->regs[0x02] & 1))
                     serial_handler(dev, 1);
             }
             break;
@@ -394,15 +439,21 @@ pc87306_read(uint16_t port, void *priv)
 
     index = (port & 1) ? 0 : 1;
 
-    dev->tries = 0;
-
-    if (index)
+    if (dev->tries == 0xff) {
+        ret = 0x88;
+        dev->tries = 0xfe;
+    } else if (dev->tries == 0xfe) {
+        ret = 0x00;
+        dev->tries = 0;
+    } else if (index) {
         ret = dev->cur_reg & 0x1f;
-    else {
+        dev->tries = 0;
+    } else {
         if (dev->cur_reg == 8)
             ret = 0x70;
         else if (dev->cur_reg < 28)
             ret = dev->regs[dev->cur_reg];
+        dev->tries = 0;
     }
 
     return ret;
@@ -415,6 +466,8 @@ pc87306_reset_common(void *priv)
 
     memset(dev->regs, 0, 29);
 
+    dev->tries = 0xff;
+
     dev->regs[0x00] = 0x0B;
     dev->regs[0x01] = 0x01;
     dev->regs[0x03] = 0x01;
@@ -430,10 +483,11 @@ pc87306_reset_common(void *priv)
         0 = 360 rpm @ 500 kbps for 3.5"
         1 = Default, 300 rpm @ 500, 300, 250, 1000 kbps for 3.5"
     */
-    lpt1_remove();
-    lpt1_handler(dev);
-    serial_remove(dev->uart[0]);
-    serial_remove(dev->uart[1]);
+    lpt_set_cnfga_readout(dev->lpt, 0x10);
+    lpt_port_remove(dev->lpt);
+    lpt_handler(dev);
+    serial_remove(dev->uart[0x00]);
+    serial_remove(dev->uart[0x01]);
     serial_handler(dev, 0);
     serial_handler(dev, 1);
     fdc_reset(dev->fdc);
@@ -467,16 +521,33 @@ pc87306_close(void *priv)
 static void *
 pc87306_init(UNUSED(const device_t *info))
 {
-    pc87306_t *dev = (pc87306_t *) malloc(sizeof(pc87306_t));
-    memset(dev, 0, sizeof(pc87306_t));
+    pc87306_t *dev = (pc87306_t *) calloc(1, sizeof(pc87306_t));
+
+    dev->kbc_type  = info->local & PCX730X_KBC;
 
     dev->fdc = device_add(&fdc_at_nsc_device);
 
-    dev->uart[0] = device_add_inst(&ns16550_device, 1);
-    dev->uart[1] = device_add_inst(&ns16550_device, 2);
+    dev->uart[0x00] = device_add_inst(&ns16550_device, 1);
+    dev->uart[0x01] = device_add_inst(&ns16550_device, 2);
+
+    dev->lpt = device_add_inst(&lpt_port_device, 1);
+    lpt_set_cnfga_readout(dev->lpt, 0x10);
 
     dev->nvr = device_add(&at_mb_nvr_device);
 
+    switch (dev->kbc_type) {
+        case PCX730X_AMI:
+        default:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_AMI | 0x00003500));
+            break;
+        case PCX730X_PHOENIX_42:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_PHOENIX | 0x00013700));
+            break;
+        case PCX730X_PHOENIX_42I:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_PHOENIX | 0x00041600));
+            break;
+    }
+
     dev->gpio[0] = dev->gpio[1] = 0xff;
 
     pc87306_reset_common(dev);
@@ -495,7 +566,7 @@ const device_t pc87306_device = {
     .init          = pc87306_init,
     .close         = pc87306_close,
     .reset         = pc87306_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sio/sio_pc87307.c b/src/sio/sio_pc87307.c
index 63e19c03d..44db6ee9d 100644
--- a/src/sio/sio_pc87307.c
+++ b/src/sio/sio_pc87307.c
@@ -8,60 +8,106 @@
  *
  *          Emulation of the NatSemi PC87307 Super I/O chip.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2020 Miran Grca.
+ *          Copyright 2020-2025 Miran Grca.
  */
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
+#define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/io.h>
 #include <86box/timer.h>
 #include <86box/device.h>
 #include <86box/lpt.h>
+#include <86box/machine.h>
 #include <86box/mem.h>
 #include <86box/nvr.h>
 #include <86box/pci.h>
 #include <86box/rom.h>
 #include <86box/serial.h>
-#include <86box/hdc.h>
-#include <86box/hdc_ide.h>
 #include <86box/fdd.h>
 #include <86box/fdc.h>
+#include <86box/keyboard.h>
 #include <86box/sio.h>
+#include <86box/plat_fallthrough.h>
+#include "cpu.h"
 
 typedef struct pc87307_t {
     uint8_t   id;
+    uint8_t   baddr;
     uint8_t   pm_idx;
     uint8_t   regs[48];
-    uint8_t   ld_regs[256][208];
+    uint8_t   ld_regs[256][256];
     uint8_t   pcregs[16];
-    uint8_t   gpio[2][4];
+    uint8_t   gpio[2][8];
     uint8_t   pm[8];
+    uint16_t  superio_base;
     uint16_t  gpio_base;
     uint16_t  gpio_base2;
     uint16_t  pm_base;
     int       cur_reg;
+    void     *kbc;
     fdc_t    *fdc;
     serial_t *uart[2];
+    lpt_t    *lpt;
 } pc87307_t;
 
-static void fdc_handler(pc87307_t *dev);
-static void lpt1_handler(pc87307_t *dev);
-static void serial_handler(pc87307_t *dev, int uart);
+enum {
+    LD_KBD   = 0,
+    LD_MOUSE,
+    LD_RTC,
+    LD_FDC,
+    LD_LPT,
+    LD_UART2,
+    LD_UART1,
+    LD_GPIO,
+    LD_PM
+} pc87307_ld_t;
+
+#define LD_MIN LD_KBD
+#define LD_MAX LD_PM
+
+static void    fdc_handler(pc87307_t *dev);
+static void    lpt_handler(pc87307_t *dev);
+static void    serial_handler(pc87307_t *dev, int uart);
+static void    kbc_handler(pc87307_t *dev);
+static void    pc87307_write(uint16_t port, uint8_t val, void *priv);
+static uint8_t pc87307_read(uint16_t port, void *priv);
+
+#ifdef ENABLE_PC87307_LOG
+int pc87307_do_log = ENABLE_PC87307_LOG;
+
+static void
+pc87307_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (pc87307_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define pc87307_log(fmt, ...)
+#endif
 
 static void
 pc87307_gpio_write(uint16_t port, uint8_t val, void *priv)
 {
     pc87307_t *dev  = (pc87307_t *) priv;
-    uint8_t    bank = ((port & 0xfffc) == dev->gpio_base2);
+    uint8_t    bank = !!(dev->regs[0x22] & 0x80);
 
-    dev->gpio[bank][port & 3] = val;
+    /* Bit 7 of SCNF2 = bank. */
+    pc87307_log("[%04X:%08X] [W] (%04X) Bank %i = %02X\n",
+                CS, cpu_state.pc, port, bank, val);
+
+    dev->gpio[bank][port & 0x0007] = val;
 }
 
 uint8_t
@@ -69,20 +115,36 @@ pc87307_gpio_read(uint16_t port, void *priv)
 {
     const pc87307_t *dev  = (pc87307_t *) priv;
     uint8_t          pins = 0xff;
-    uint8_t          bank = ((port & 0xfffc) == dev->gpio_base2);
-    uint8_t          mask;
-    uint8_t          ret  = dev->gpio[bank][port & 0x0003];
+    uint8_t          bank = !!(dev->regs[0x22] & 0x80);
+    uint8_t          ret  = dev->gpio[bank][port & 0x0007];
 
     switch (port & 0x0003) {
         case 0x0000:
-            mask = dev->gpio[bank][0x0001];
-            ret  = (ret & mask) | (pins & ~mask);
+            if (bank == 0) {
+                uint8_t mask = dev->gpio[0][1];
+                pins = 0x7f;
+                ret  = (ret & mask) | (pins & ~mask);
+            }
+            break;
+        case 0x0004:
+            if (bank == 0) {
+                uint8_t mask = dev->gpio[0][5];
+                pins = 0xfb;
+                ret  = (ret & mask) | (pins & ~mask);
+            } else
+                ret = 0xff;
             break;
 
         default:
+            if (bank == 1)
+                ret = 0xff;
             break;
     }
 
+    /* Bit 7 of SCNF2 = bank. */
+    pc87307_log("[%04X:%08X] [R] (%04X) Bank %i = %02X\n",
+                CS, cpu_state.pc, port, bank, ret);
+
     return ret;
 }
 
@@ -122,10 +184,11 @@ pc87307_pm_write(uint16_t port, uint8_t val, void *priv)
         dev->pm[dev->pm_idx] = val;
     else {
         dev->pm_idx = val & 0x07;
+
         switch (dev->pm_idx) {
             case 0x00:
                 fdc_handler(dev);
-                lpt1_handler(dev);
+                lpt_handler(dev);
                 serial_handler(dev, 1);
                 serial_handler(dev, 0);
                 break;
@@ -166,286 +229,503 @@ pc87307_pm_init(pc87307_t *dev, uint16_t addr)
                   pc87307_pm_read, NULL, NULL, pc87307_pm_write, NULL, NULL, dev);
 }
 
+static void
+kbc_handler(pc87307_t *dev)
+{
+    uint8_t  active   = (dev->ld_regs[LD_KBD][0x00] & 0x01) &&
+                        (dev->pm[0x00] & 0x01);
+    uint8_t  active_2 = dev->ld_regs[LD_MOUSE][0x00] & 0x01;
+    uint8_t  irq      = (dev->ld_regs[LD_KBD][0x40] & 0x0f);
+    uint8_t  irq_2    = (dev->ld_regs[LD_MOUSE][0x40] & 0x0f);
+    uint16_t addr     = (dev->ld_regs[LD_KBD][0x30] << 8) |
+                        dev->ld_regs[LD_KBD][0x31];
+    uint16_t addr_2   = (dev->ld_regs[LD_KBD][0x32] << 8) |
+                        dev->ld_regs[LD_KBD][0x33];
+
+    pc87307_log("%02X, %02X, %02X, %02X, %04X, %04X\n",
+                active, active_2, irq, irq_2, addr, addr_2);
+
+    if (addr <= 0xfff8) {
+        pc87307_log("Enabling KBC #1 on %04X...\n", addr);
+        kbc_at_port_handler(0, active, addr,   dev->kbc);
+    }
+
+    if (addr_2 <= 0xfff8) {
+        pc87307_log("Enabling KBC #2 on %04X...\n", addr_2);
+        kbc_at_port_handler(1, active, addr_2, dev->kbc);
+    }
+
+    kbc_at_set_irq(0, active               ? irq   : 0xffff, dev->kbc);
+    kbc_at_set_irq(1, (active && active_2) ? irq_2 : 0xffff, dev->kbc);
+}
+
 static void
 fdc_handler(pc87307_t *dev)
 {
-    uint8_t  irq;
-    uint8_t  active;
-    uint16_t addr;
-
     fdc_remove(dev->fdc);
 
-    active = (dev->ld_regs[0x03][0x00] & 0x01) && (dev->pm[0x00] & 0x08);
-    addr   = ((dev->ld_regs[0x03][0x30] << 8) | dev->ld_regs[0x03][0x31]) - 0x0002;
-    irq    = (dev->ld_regs[0x03][0x40] & 0x0f);
+    uint8_t  active = (dev->ld_regs[LD_FDC][0x00] & 0x01) &&
+                      (dev->pm[0x00] & 0x08);
+    uint8_t  irq    = (dev->ld_regs[LD_FDC][0x40] & 0x0f);
+    uint8_t  dma    = (dev->ld_regs[LD_FDC][0x44] & 0x0f);
+    uint16_t addr   = ((dev->ld_regs[LD_FDC][0x30] << 8) |
+                      dev->ld_regs[LD_FDC][0x31]) & 0xfff8;
 
     if (active && (addr <= 0xfff8)) {
+        pc87307_log("Enabling FDC on %04X, IRQ %i...\n", addr, irq);
         fdc_set_base(dev->fdc, addr);
         fdc_set_irq(dev->fdc, irq);
+        fdc_set_dma_ch(dev->fdc, dma);
     }
 }
 
 static void
-lpt1_handler(pc87307_t *dev)
+lpt_handler(pc87307_t *dev)
 {
-    uint8_t  irq;
-    uint8_t  active;
-    uint16_t addr;
+    uint8_t  active = (dev->ld_regs[LD_LPT][0x00] & 0x01) &&
+                      (dev->pm[0x00] & 0x10);
+    uint8_t  irq    = (dev->ld_regs[LD_LPT][0x40] & 0x0f);
+    uint8_t  dma    = (dev->ld_regs[LD_LPT][0x44] & 0x0f);
+    uint16_t addr   = (dev->ld_regs[LD_LPT][0x30] << 8) |
+                      dev->ld_regs[LD_LPT][0x31];
+    uint8_t  mode   = (dev->ld_regs[LD_LPT][0xf0] >> 7);
+    uint16_t mask   = 0xfffc;
 
-    lpt1_remove();
+    if (irq > 15)
+        irq = 0xff;
 
-    active = (dev->ld_regs[0x04][0x00] & 0x01) && (dev->pm[0x00] & 0x10);
-    addr   = (dev->ld_regs[0x04][0x30] << 8) | dev->ld_regs[0x04][0x31];
-    irq    = (dev->ld_regs[0x04][0x40] & 0x0f);
+    if (dma >= 4)
+        dma = 0xff;
 
-    if (active && (addr <= 0xfffc)) {
-        lpt1_init(addr);
-        lpt1_irq(irq);
+    lpt_port_remove(dev->lpt);
+
+    switch (mode) {
+        default:
+        case 0x00:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x01:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 1);
+            break;
+        case 0x02: case 0x03:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x04:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x07:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
     }
+
+    lpt_set_cfg_regs_enabled(dev->lpt, !!(dev->ld_regs[LD_LPT][0xf0] & 0x10));
+
+    if (active && (addr <= (0xfffc & mask))) {
+        pc87307_log("Enabling LPT1 on %04X...\n", addr);
+        lpt_port_setup(dev->lpt, addr & mask);
+    } else
+        lpt_port_setup(dev->lpt, 0xffff);
+
+    lpt_port_irq(dev->lpt, irq);
+    lpt_port_dma(dev->lpt, dma);
 }
 
 static void
 serial_handler(pc87307_t *dev, int uart)
 {
-    uint8_t  irq;
-    uint8_t  active;
-    uint16_t addr;
-
     serial_remove(dev->uart[uart]);
 
-    active = (dev->ld_regs[0x06 - uart][0x00] & 0x01) && (dev->pm[0x00] & (1 << (6 - uart)));
-    addr   = (dev->ld_regs[0x06 - uart][0x30] << 8) | dev->ld_regs[0x06 - uart][0x31];
-    irq    = (dev->ld_regs[0x06 - uart][0x40] & 0x0f);
+    uint8_t  active = (dev->ld_regs[LD_UART1 - uart][0x00] & 0x01) &&
+                      (dev->pm[0x00] & (1 << (6 - uart)));
+    uint8_t  irq    = (dev->ld_regs[LD_UART1 - uart][0x40] & 0x0f);
+    uint16_t addr   = (dev->ld_regs[LD_UART1 - uart][0x30] << 8) |
+                      dev->ld_regs[LD_UART1 - uart][0x31];
 
-    if (active && (addr <= 0xfff8))
+    if (active && (addr <= 0xfff8)) {
+        pc87307_log("Enabling COM%i on %04X...\n", uart + 1, addr);
         serial_setup(dev->uart[uart], addr, irq);
+    } else
+        serial_setup(dev->uart[uart], 0x0000, irq);
 }
 
 static void
 gpio_handler(pc87307_t *dev)
 {
-    uint8_t  active;
-    uint16_t addr;
-
     pc87307_gpio_remove(dev);
 
-    active = (dev->ld_regs[0x07][0x00] & 0x01);
-    addr   = (dev->ld_regs[0x07][0x30] << 8) | dev->ld_regs[0x07][0x31];
+    uint8_t  active = (dev->ld_regs[LD_GPIO][0x00] & 0x01);
+    uint16_t addr   = (dev->ld_regs[LD_GPIO][0x30] << 8) |
+                      dev->ld_regs[LD_GPIO][0x31];
+    uint16_t addr_2 = (dev->ld_regs[LD_GPIO][0x32] << 8) |
+                      dev->ld_regs[LD_GPIO][0x33];
 
-    if (active)
+    if (active) {
+        pc87307_log("Enabling GPIO #1 on %04X...\n", addr);
         pc87307_gpio_init(dev, 0, addr);
-
-    addr = (dev->ld_regs[0x07][0x32] << 8) | dev->ld_regs[0x07][0x33];
-
-    if (active)
-        pc87307_gpio_init(dev, 1, addr);
+        pc87307_log("Enabling GPIO #2 on %04X...\n", addr_2);
+        pc87307_gpio_init(dev, 1, addr_2);
+    }
 }
 
 static void
 pm_handler(pc87307_t *dev)
 {
-    uint8_t  active;
-    uint16_t addr;
-
     pc87307_pm_remove(dev);
 
-    active = (dev->ld_regs[0x08][0x00] & 0x01);
-    addr   = (dev->ld_regs[0x08][0x30] << 8) | dev->ld_regs[0x08][0x31];
+    uint8_t  active = (dev->ld_regs[LD_PM][0x00] & 0x01);
+    uint16_t addr   = (dev->ld_regs[LD_PM][0x30] << 8) |
+                      dev->ld_regs[LD_PM][0x31];
 
-    if (active)
+    if (active) {
+        pc87307_log("Enabling power management on %04X...\n", addr);
         pc87307_pm_init(dev, addr);
+    }
+}
+
+static void
+superio_handler(pc87307_t *dev)
+{
+    if (dev->superio_base != 0x0000)
+        io_removehandler(dev->superio_base, 0x0002,
+                         pc87307_read, NULL, NULL,
+                         pc87307_write, NULL, NULL, dev);
+
+    switch (dev->regs[0x22] & 0x03) {
+        default:
+            dev->superio_base = 0x0000;
+            break;        case 0x02:
+            dev->superio_base = 0x015c;
+            break;
+        case 0x03:
+            dev->superio_base = 0x002e;
+            break;
+    }
+
+    if (dev->superio_base != 0x0000) {
+        pc87307_log("Enabling Super I/O on %04X...\n", dev->superio_base);
+        io_sethandler(dev->superio_base, 0x0002,
+                      pc87307_read, NULL, NULL,
+                      pc87307_write, NULL, NULL, dev);
+    }
 }
 
 static void
 pc87307_write(uint16_t port, uint8_t val, void *priv)
 {
-    pc87307_t *dev = (pc87307_t *) priv;
-    uint8_t    index;
-
-    index = (port & 1) ? 0 : 1;
+    pc87307_t *dev   = (pc87307_t *) priv;
+    uint8_t    ld    = dev->regs[0x07];
+    uint8_t    reg   = dev->cur_reg - 0x30;
+    uint8_t    index = (port & 1) ? 0 : 1;
+    uint8_t    old   = dev->regs[dev->cur_reg];
 
     if (index) {
         dev->cur_reg = val;
         return;
     } else {
+#ifdef ENABLE_PC87307_LOG
+        if (dev->cur_reg >= 0x30)
+            pc87307_log("[%04X:%08X] [W] (%04X) %02X:%02X = %02X\n",
+                        CS, cpu_state.pc, port, ld, dev->cur_reg, val);
+        else
+            pc87307_log("[%04X:%08X] [W] (%04X)    %02X = %02X\n",
+                        CS, cpu_state.pc, port,     dev->cur_reg, val);
+#endif
         switch (dev->cur_reg) {
             case 0x00:
-            case 0x02:
-            case 0x03:
-            case 0x06:
-            case 0x07:
-            case 0x21:
+            case 0x02: case 0x03:
+            case 0x06: case 0x07:
                 dev->regs[dev->cur_reg] = val;
                 break;
+            case 0x21:
+                dev->regs[dev->cur_reg] = val;
+                fdc_toggle_flag(dev->fdc, FDC_FLAG_PS2_MCA, !(val & 0x04));
+                break;
             case 0x22:
-                dev->regs[dev->cur_reg] = val & 0x7f;
+                dev->regs[dev->cur_reg] = val;
+                superio_handler(dev);
                 break;
             case 0x23:
-                dev->regs[dev->cur_reg] = val & 0x0f;
+                dev->regs[dev->cur_reg] = (old & 0xf0) | (val & 0x0f);
                 break;
             case 0x24:
                 dev->pcregs[dev->regs[0x23]] = val;
                 break;
             default:
-                if (dev->cur_reg >= 0x30) {
-                    if ((dev->regs[0x07] != 0x06) || !(dev->regs[0x21] & 0x10))
-                        dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val;
-                }
+                if (dev->cur_reg >= 0x30)
+                    old = dev->ld_regs[ld][reg];
                 break;
         }
     }
 
     switch (dev->cur_reg) {
         case 0x30:
-            dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0x01;
-            switch (dev->regs[0x07]) {
-                case 0x03:
+            switch (ld) {
+                default:
+                    break;
+                case LD_KBD: case LD_MOUSE:
+                    dev->ld_regs[ld][reg] = val;
+                    kbc_handler(dev);
+                    break;
+                case LD_RTC:
+                    dev->ld_regs[ld][reg] = val;
+                    break;
+                case LD_FDC:
+                    dev->ld_regs[ld][reg] = val;
                     fdc_handler(dev);
                     break;
-                case 0x04:
-                    lpt1_handler(dev);
+                case LD_LPT:
+                    dev->ld_regs[ld][reg] = val;
+                    lpt_handler(dev);
                     break;
-                case 0x05:
+                case LD_UART2:
+                    dev->ld_regs[ld][reg] = val;
                     serial_handler(dev, 1);
                     break;
-                case 0x06:
+                case LD_UART1:
+                    dev->ld_regs[ld][reg] = val;
                     serial_handler(dev, 0);
                     break;
-                case 0x07:
+                case LD_GPIO:
+                    dev->ld_regs[ld][reg] = val;
                     gpio_handler(dev);
                     break;
-                case 0x08:
+                case LD_PM:
+                    dev->ld_regs[ld][reg] = val;
                     pm_handler(dev);
                     break;
-
-                default:
-                    break;
             }
             break;
+        /* I/O Range Check. */
+        case 0x31:
+            switch (ld) {
+                default:
+                    break;
+                case LD_MIN ... LD_MAX:
+                    if (ld != LD_MOUSE)
+                        dev->ld_regs[ld][reg] = val;
+                    break;
+            }
+            break;
+        /* Base Address 0 MSB. */
         case 0x60:
-        case 0x62:
-            dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0x07;
-            if ((dev->cur_reg == 0x62) && (dev->regs[0x07] != 0x07))
-                break;
-            switch (dev->regs[0x07]) {
-                case 0x03:
+            switch (ld) {
+                default:
+                    break;
+                case LD_KBD:
+                    dev->ld_regs[ld][reg] = val;
+                    kbc_handler(dev);
+                    break;
+                case LD_RTC:
+                    dev->ld_regs[ld][reg] = val;
+                    break;
+                case LD_FDC:
+                    dev->ld_regs[ld][reg] = val;
                     fdc_handler(dev);
                     break;
-                case 0x04:
-                    lpt1_handler(dev);
+                case LD_LPT:
+                    dev->ld_regs[ld][reg] = (old & 0xfc) | (val & 0x03);
+                    lpt_handler(dev);
                     break;
-                case 0x05:
+                case LD_UART2:
+                    dev->ld_regs[ld][reg] = val;
                     serial_handler(dev, 1);
                     break;
-                case 0x06:
+                case LD_UART1:
+                    dev->ld_regs[ld][reg] = val;
                     serial_handler(dev, 0);
                     break;
-                case 0x07:
+                case LD_GPIO:
+                    dev->ld_regs[ld][reg] = val;
                     gpio_handler(dev);
                     break;
-                case 0x08:
+                case LD_PM:
+                    dev->ld_regs[ld][reg] = val;
                     pm_handler(dev);
                     break;
-
-                default:
-                    break;
             }
             break;
+        /* Base Address 0 LSB. */
         case 0x61:
-            switch (dev->regs[0x07]) {
-                case 0x00:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0xfb;
+            switch (ld) {
+                default:
                     break;
-                case 0x03:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = (val & 0xfa) | 0x02;
+                case LD_KBD:
+                    dev->ld_regs[ld][reg] = (old & 0x04) | (val & 0xfb);
+                    kbc_handler(dev);
+                    break;
+                case LD_RTC:
+                    dev->ld_regs[ld][reg] = (old & 0x01) | (val & 0xfe);
+                    break;
+                case LD_FDC:
+                    dev->ld_regs[ld][reg] = (old & 0x07) | (val & 0xf8);
                     fdc_handler(dev);
                     break;
-                case 0x04:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0xfc;
-                    lpt1_handler(dev);
+                case LD_LPT:
+                    dev->ld_regs[ld][reg] = (old & 0x03) | (val & 0xfc);
+                    lpt_handler(dev);
                     break;
-                case 0x05:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0xf8;
+                case LD_UART2:
+                    dev->ld_regs[ld][reg] = (old & 0x07) | (val & 0xf8);
                     serial_handler(dev, 1);
                     break;
-                case 0x06:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0xf8;
+                case LD_UART1:
+                    dev->ld_regs[ld][reg] = (old & 0x07) | (val & 0xf8);
                     serial_handler(dev, 0);
                     break;
-                case 0x07:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0xf8;
+                case LD_GPIO:
+                    dev->ld_regs[ld][reg] = (old & 0x07) | (val & 0xf8);
                     gpio_handler(dev);
                     break;
-                case 0x08:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0xfe;
+                case LD_PM:
+                    dev->ld_regs[ld][reg] = (old & 0x01) | (val & 0xfe);
                     pm_handler(dev);
                     break;
-
-                default:
-                    break;
             }
             break;
+        /* Base Address 1 MSB (undocumented for Logical Device 7). */
+        case 0x62:
+            switch (ld) {
+                default:
+                    break;
+                case LD_KBD:
+                    dev->ld_regs[ld][reg] = val;
+                    kbc_handler(dev);
+                    break;
+                case LD_GPIO:
+                    dev->ld_regs[ld][reg] = val;
+                    gpio_handler(dev);
+                    break;
+            }
+            break;
+        /* Base Address 1 LSB (undocumented for Logical Device 7). */
         case 0x63:
-            if (dev->regs[0x07] == 0x00)
-                dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = (val & 0xfb) | 0x04;
-            else if (dev->regs[0x07] == 0x07) {
-                dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0xfe;
-                gpio_handler(dev);
-            }
-            break;
-        case 0x70:
-        case 0x74:
-        case 0x75:
-            switch (dev->regs[0x07]) {
-                case 0x03:
-                    fdc_handler(dev);
-                    break;
-                case 0x04:
-                    lpt1_handler(dev);
-                    break;
-                case 0x05:
-                    serial_handler(dev, 1);
-                    break;
-                case 0x06:
-                    serial_handler(dev, 0);
-                    break;
-                case 0x07:
-                    gpio_handler(dev);
-                    break;
-                case 0x08:
-                    pm_handler(dev);
-                    break;
-
+            switch (ld) {
                 default:
                     break;
+                case LD_KBD:
+                    dev->ld_regs[ld][reg] = (old & 0x04) | (val & 0xfb);
+                    kbc_handler(dev);
+                    break;
+                case LD_GPIO:
+                    dev->ld_regs[ld][reg] = (old & 0x01) | (val & 0xfe);
+                    gpio_handler(dev);
+                    break;
             }
             break;
-        case 0xf0:
-            switch (dev->regs[0x07]) {
-                case 0x00:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0xc1;
+        /* Interrupt Select. */
+        case 0x70:
+            switch (ld) {
+                default:
                     break;
-                case 0x03:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0xe1;
+                case LD_KBD: case LD_MOUSE:
+                    dev->ld_regs[ld][reg] = val;
+                    kbc_handler(dev);
+                    break;
+                case LD_RTC:
+                    dev->ld_regs[ld][reg] = val;
+                    break;
+                case LD_FDC:
+                    dev->ld_regs[ld][reg] = val;
+                    fdc_handler(dev);
+                    break;
+                case LD_LPT:
+                    dev->ld_regs[ld][reg] = val;
+                    lpt_handler(dev);
+                    break;
+                case LD_UART2:
+                    dev->ld_regs[ld][reg] = val;
+                    serial_handler(dev, 1);
+                    break;
+                case LD_UART1:
+                    dev->ld_regs[ld][reg] = val;
+                    serial_handler(dev, 0);
+                    break;
+            }
+            break;
+        /* Interrupt Type. */
+        case 0x71:
+            switch (ld) {
+                default:
+                    break;
+                case LD_MIN ... LD_MAX:
+                    if ((ld == LD_KBD) || (ld == LD_MOUSE))
+                        dev->ld_regs[ld][reg] = (old & 0xfc) | (val & 0x03);
+                    else
+                        dev->ld_regs[ld][reg] = (old & 0xfd) | (val & 0x02);
+                    break;
+            }
+            break;
+        /* DMA Channel Select 0. */
+        case 0x74:
+            switch (ld) {
+                default:
+                    break;
+                case LD_FDC:
+                    dev->ld_regs[ld][reg] = val;
+                    fdc_handler(dev);
+                    break;
+                case LD_LPT:
+                    dev->ld_regs[ld][reg] = val;
+                    lpt_handler(dev);
+                    break;
+                case LD_UART2:
+                    dev->ld_regs[ld][reg] = val;
+                    break;
+            }
+            break;
+        /* DMA Channel Select 1. */
+        case 0x75:
+            switch (ld) {
+                default:
+                    break;
+                case LD_UART2:
+                    dev->ld_regs[ld][reg] = val;
+                    break;
+            }
+            break;
+        /* Configuration Register 0. */
+        case 0xf0:
+            switch (ld) {
+                default:
+                    break;
+                case LD_KBD:
+                    dev->ld_regs[ld][reg] = val;
+                    break;
+                case LD_FDC:
+                    dev->ld_regs[ld][reg] = val;
                     fdc_update_densel_polarity(dev->fdc, (val & 0x20) ? 1 : 0);
                     fdc_update_enh_mode(dev->fdc, (val & 0x40) ? 1 : 0);
                     break;
-                case 0x04:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0xf3;
-                    lpt1_handler(dev);
+                case LD_LPT:
+                    dev->ld_regs[ld][reg] = val;
+                    lpt_handler(dev);
                     break;
-                case 0x05:
-                case 0x06:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0x87;
-                    break;
-
-                default:
+                case LD_UART2: case LD_UART1:
+                    dev->ld_regs[ld][reg] = val;
                     break;
             }
             break;
+        /* Configuration Register 1. */
         case 0xf1:
-            if (dev->regs[0x07] == 0x03)
-                dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0x0f;
+            switch (ld) {
+                default:
+                    break;
+                case LD_FDC:
+                    dev->ld_regs[ld][reg] = val;
+                    break;
+            }
             break;
 
         default:
@@ -453,32 +733,46 @@ pc87307_write(uint16_t port, uint8_t val, void *priv)
     }
 }
 
-uint8_t
+static uint8_t
 pc87307_read(uint16_t port, void *priv)
 {
-    const pc87307_t *dev = (pc87307_t *) priv;
-    uint8_t          ret = 0xff;
-    uint8_t          index;
-
-    index = (port & 1) ? 0 : 1;
+    const pc87307_t *dev   = (pc87307_t *) priv;
+    uint8_t          ld    = dev->regs[0x07];
+    uint8_t          reg   = dev->cur_reg - 0x30;
+    uint8_t          index = (port & 1) ? 0 : 1;
+    uint8_t          ret   = 0xff;
 
     if (index)
         ret = dev->cur_reg;
     else {
         if (dev->cur_reg >= 0x30)
-            ret = dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30];
+            ret = dev->ld_regs[ld][reg];
         else if (dev->cur_reg == 0x24)
             ret = dev->pcregs[dev->regs[0x23]];
+        /* Write-only registers. */
+        else if ((dev->cur_reg == 0x00) ||
+                 (dev->cur_reg == 0x02) || (dev->cur_reg == 0x03))
+            ret = 0x00;
         else
             ret = dev->regs[dev->cur_reg];
+#ifdef EANBLE_PC87307_LOG
+        if (dev->cur_reg >= 0x30)
+            pc87307_log("[%04X:%08X] [R] (%04X) %02X:%02X = %02X\n",
+                        CS, cpu_state.pc, port, ld, dev->cur_reg, ret);
+        else
+            pc87307_log("[%04X:%08X] [R] (%04X)    %02X = %02X\n",
+                        CS, cpu_state.pc, port,     dev->cur_reg, ret);
+#endif
     }
 
     return ret;
 }
 
 void
-pc87307_reset(pc87307_t *dev)
+pc87307_reset(void *priv)
 {
+    pc87307_t *dev = (pc87307_t *) priv;
+
     memset(dev->regs, 0x00, 0x30);
     for (uint16_t i = 0; i < 256; i++)
         memset(dev->ld_regs[i], 0x00, 0xd0);
@@ -488,77 +782,77 @@ pc87307_reset(pc87307_t *dev)
 
     dev->regs[0x20] = dev->id;
     dev->regs[0x21] = 0x04;
+    dev->regs[0x22] = dev->baddr;
 
-    dev->ld_regs[0x00][0x01] = 0x01;
-    dev->ld_regs[0x00][0x31] = 0x60;
-    dev->ld_regs[0x00][0x33] = 0x64;
-    dev->ld_regs[0x00][0x40] = 0x01;
-    dev->ld_regs[0x00][0x41] = 0x02;
-    dev->ld_regs[0x00][0x44] = 0x04;
-    dev->ld_regs[0x00][0x45] = 0x04;
-    dev->ld_regs[0x00][0xc0] = 0x40;
+    dev->ld_regs[LD_KBD  ][0x00] = 0x01;
+    dev->ld_regs[LD_KBD  ][0x31] = 0x60;
+    dev->ld_regs[LD_KBD  ][0x33] = 0x64;
+    dev->ld_regs[LD_KBD  ][0x40] = 0x01;
+    dev->ld_regs[LD_KBD  ][0x41] = 0x02;
+    dev->ld_regs[LD_KBD  ][0x44] = 0x04;
+    dev->ld_regs[LD_KBD  ][0x45] = 0x04;
+    dev->ld_regs[LD_KBD  ][0xc0] = 0x40;
 
-    dev->ld_regs[0x01][0x40] = 0x0c;
-    dev->ld_regs[0x01][0x41] = 0x02;
-    dev->ld_regs[0x01][0x44] = 0x04;
-    dev->ld_regs[0x01][0x45] = 0x04;
+    dev->ld_regs[LD_MOUSE][0x40] = 0x0c;
+    dev->ld_regs[LD_MOUSE][0x41] = 0x02;
+    dev->ld_regs[LD_MOUSE][0x44] = 0x04;
+    dev->ld_regs[LD_MOUSE][0x45] = 0x04;
 
-    dev->ld_regs[0x02][0x00] = 0x01;
-    dev->ld_regs[0x02][0x31] = 0x70;
-    dev->ld_regs[0x02][0x40] = 0x08;
-    dev->ld_regs[0x02][0x44] = 0x04;
-    dev->ld_regs[0x02][0x45] = 0x04;
+    dev->ld_regs[LD_RTC  ][0x00] = 0x01;
+    dev->ld_regs[LD_RTC  ][0x31] = 0x70;
+    dev->ld_regs[LD_RTC  ][0x40] = 0x08;
+    dev->ld_regs[LD_RTC  ][0x44] = 0x04;
+    dev->ld_regs[LD_RTC  ][0x45] = 0x04;
 
-    dev->ld_regs[0x03][0x01] = 0x01;
-    dev->ld_regs[0x03][0x30] = 0x03;
-    dev->ld_regs[0x03][0x31] = 0xf2;
-    dev->ld_regs[0x03][0x40] = 0x06;
-    dev->ld_regs[0x03][0x41] = 0x03;
-    dev->ld_regs[0x03][0x44] = 0x02;
-    dev->ld_regs[0x03][0x45] = 0x04;
-    dev->ld_regs[0x03][0xc0] = 0x02;
+    dev->ld_regs[LD_FDC  ][0x01] = 0x01;
+    dev->ld_regs[LD_FDC  ][0x30] = 0x03;
+    dev->ld_regs[LD_FDC  ][0x31] = 0xf0;
+    dev->ld_regs[LD_FDC  ][0x32] = 0x03;
+    dev->ld_regs[LD_FDC  ][0x33] = 0xf7;
+    dev->ld_regs[LD_FDC  ][0x40] = 0x06;
+    dev->ld_regs[LD_FDC  ][0x41] = 0x03;
+    dev->ld_regs[LD_FDC  ][0x44] = 0x02;
+    dev->ld_regs[LD_FDC  ][0x45] = 0x04;
+    dev->ld_regs[LD_FDC  ][0xc0] = 0x02;
 
-    dev->ld_regs[0x04][0x30] = 0x02;
-    dev->ld_regs[0x04][0x31] = 0x78;
-    dev->ld_regs[0x04][0x40] = 0x07;
-    dev->ld_regs[0x04][0x44] = 0x04;
-    dev->ld_regs[0x04][0x45] = 0x04;
-    dev->ld_regs[0x04][0xc0] = 0xf2;
+    dev->ld_regs[LD_LPT  ][0x30] = 0x02;
+    dev->ld_regs[LD_LPT  ][0x31] = 0x78;
+    dev->ld_regs[LD_LPT  ][0x40] = 0x07;
+    dev->ld_regs[LD_LPT  ][0x44] = 0x04;
+    dev->ld_regs[LD_LPT  ][0x45] = 0x04;
+    dev->ld_regs[LD_LPT  ][0xc0] = 0xf2;
 
-    dev->ld_regs[0x05][0x30] = 0x02;
-    dev->ld_regs[0x05][0x31] = 0xf8;
-    dev->ld_regs[0x05][0x40] = 0x03;
-    dev->ld_regs[0x05][0x41] = 0x03;
-    dev->ld_regs[0x05][0x44] = 0x04;
-    dev->ld_regs[0x05][0x45] = 0x04;
-    dev->ld_regs[0x05][0xc0] = 0x02;
+    dev->ld_regs[LD_UART2][0x30] = 0x02;
+    dev->ld_regs[LD_UART2][0x31] = 0xf8;
+    dev->ld_regs[LD_UART2][0x40] = 0x03;
+    dev->ld_regs[LD_UART2][0x41] = 0x03;
+    dev->ld_regs[LD_UART2][0x44] = 0x04;
+    dev->ld_regs[LD_UART2][0x45] = 0x04;
+    dev->ld_regs[LD_UART2][0xc0] = 0x02;
 
-    dev->ld_regs[0x06][0x30] = 0x03;
-    dev->ld_regs[0x06][0x31] = 0xf8;
-    dev->ld_regs[0x06][0x40] = 0x04;
-    dev->ld_regs[0x06][0x41] = 0x03;
-    dev->ld_regs[0x06][0x44] = 0x04;
-    dev->ld_regs[0x06][0x45] = 0x04;
-    dev->ld_regs[0x06][0xc0] = 0x02;
+    dev->ld_regs[LD_UART1][0x30] = 0x03;
+    dev->ld_regs[LD_UART1][0x31] = 0xf8;
+    dev->ld_regs[LD_UART1][0x40] = 0x04;
+    dev->ld_regs[LD_UART1][0x41] = 0x03;
+    dev->ld_regs[LD_UART1][0x44] = 0x04;
+    dev->ld_regs[LD_UART1][0x45] = 0x04;
+    dev->ld_regs[LD_UART1][0xc0] = 0x02;
 
-    dev->ld_regs[0x07][0x44] = 0x04;
-    dev->ld_regs[0x07][0x45] = 0x04;
+    dev->ld_regs[LD_GPIO ][0x44] = 0x04;
+    dev->ld_regs[LD_GPIO ][0x45] = 0x04;
 
-    dev->ld_regs[0x08][0x44] = 0x04;
-    dev->ld_regs[0x08][0x45] = 0x04;
+    dev->ld_regs[LD_PM   ][0x44] = 0x04;
+    dev->ld_regs[LD_PM   ][0x45] = 0x04;
 
-#if 0
-    dev->gpio[0] = 0xff;
-    dev->gpio[1] = 0xfb;
-#endif
     dev->gpio[0][0] = 0xff;
     dev->gpio[0][1] = 0x00;
     dev->gpio[0][2] = 0x00;
     dev->gpio[0][3] = 0xff;
-    dev->gpio[1][0] = 0xff;
+    dev->gpio[0][4] = 0xff;
+    dev->gpio[0][5] = 0x00;
+    dev->gpio[0][6] = 0x00;
+    dev->gpio[0][7] = 0xff;
     dev->gpio[1][1] = 0x00;
-    dev->gpio[1][2] = 0x00;
-    dev->gpio[1][3] = 0xff;
 
     dev->pm[0] = 0xff;
     dev->pm[1] = 0xff;
@@ -571,10 +865,17 @@ pc87307_reset(pc87307_t *dev)
         0 = 360 rpm @ 500 kbps for 3.5"
         1 = Default, 300 rpm @ 500, 300, 250, 1000 kbps for 3.5"
     */
-    lpt1_remove();
-    serial_remove(dev->uart[0]);
-    serial_remove(dev->uart[1]);
+    fdc_toggle_flag(dev->fdc, FDC_FLAG_PS2_MCA, 0);
     fdc_reset(dev->fdc);
+
+    kbc_handler(dev);
+    fdc_handler(dev);
+    lpt_handler(dev);
+    serial_handler(dev, 0);
+    serial_handler(dev, 1);
+    gpio_handler(dev);
+    pm_handler(dev);
+    superio_handler(dev);
 }
 
 static void
@@ -588,8 +889,7 @@ pc87307_close(void *priv)
 static void *
 pc87307_init(const device_t *info)
 {
-    pc87307_t *dev = (pc87307_t *) malloc(sizeof(pc87307_t));
-    memset(dev, 0, sizeof(pc87307_t));
+    pc87307_t *dev = (pc87307_t *) calloc(1, sizeof(pc87307_t));
 
     dev->id = info->local & 0xff;
 
@@ -598,17 +898,30 @@ pc87307_init(const device_t *info)
     dev->uart[0] = device_add_inst(&ns16550_device, 1);
     dev->uart[1] = device_add_inst(&ns16550_device, 2);
 
-    pc87307_reset(dev);
+    dev->lpt     = device_add_inst(&lpt_port_device, 1);
+    lpt_set_cnfga_readout(dev->lpt, 0x14);
 
-    if (info->local & 0x100) {
-        io_sethandler(0x02e, 0x0002,
-                      pc87307_read, NULL, NULL, pc87307_write, NULL, NULL, dev);
-    }
-    if (info->local & 0x200) {
-        io_sethandler(0x15c, 0x0002,
-                      pc87307_read, NULL, NULL, pc87307_write, NULL, NULL, dev);
+    switch (info->local & PCX730X_KBC) {
+        case PCX730X_AMI:
+        default:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_AMI | 0x00003500));
+            break;
+        /* Optiplex! */
+        case PCX730X_PHOENIX_42:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_PHOENIX | 0x00013700));
+            break;
+        case PCX730X_PHOENIX_42I:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_PHOENIX | 0x00041600));
+            break;
     }
 
+    if (info->local & PCX730X_15C)
+        dev->baddr = 0x02;
+    else
+        dev->baddr = 0x03;
+
+    pc87307_reset(dev);
+
     return dev;
 }
 
@@ -619,8 +932,8 @@ const device_t pc87307_device = {
     .local         = 0x1c0,
     .init          = pc87307_init,
     .close         = pc87307_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .reset         = pc87307_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -633,8 +946,8 @@ const device_t pc87307_15c_device = {
     .local         = 0x2c0,
     .init          = pc87307_init,
     .close         = pc87307_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .reset         = pc87307_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -647,8 +960,8 @@ const device_t pc87307_both_device = {
     .local         = 0x3c0,
     .init          = pc87307_init,
     .close         = pc87307_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .reset         = pc87307_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -661,8 +974,8 @@ const device_t pc97307_device = {
     .local         = 0x1cf,
     .init          = pc87307_init,
     .close         = pc87307_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .reset         = pc87307_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sio/sio_pc87309.c b/src/sio/sio_pc87309.c
index d10cb3e0b..415bbbdc4 100644
--- a/src/sio/sio_pc87309.c
+++ b/src/sio/sio_pc87309.c
@@ -8,61 +8,103 @@
  *
  *          Emulation of the NatSemi PC87309 Super I/O chip.
  *
- *
- *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2020 Miran Grca.
+ *          Copyright 2020-2025 Miran Grca.
  */
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
+#define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/io.h>
 #include <86box/timer.h>
 #include <86box/device.h>
 #include <86box/lpt.h>
+#include <86box/machine.h>
 #include <86box/mem.h>
 #include <86box/nvr.h>
 #include <86box/pci.h>
 #include <86box/rom.h>
 #include <86box/serial.h>
-#include <86box/hdc.h>
-#include <86box/hdc_ide.h>
 #include <86box/fdd.h>
 #include <86box/fdc.h>
+#include <86box/keyboard.h>
 #include <86box/sio.h>
+#include <86box/plat_fallthrough.h>
+#include "cpu.h"
 
 typedef struct pc87309_t {
     uint8_t   id;
+    uint8_t   baddr;
     uint8_t   pm_idx;
     uint8_t   regs[48];
-    uint8_t   ld_regs[256][208];
+    uint8_t   ld_regs[256][256];
     uint8_t   pm[8];
+    uint16_t  superio_base;
     uint16_t  pm_base;
     int       cur_reg;
+    void     *kbc;
     fdc_t    *fdc;
     serial_t *uart[2];
+    lpt_t    *lpt;
 } pc87309_t;
 
-static void fdc_handler(pc87309_t *dev);
-static void lpt1_handler(pc87309_t *dev);
-static void serial_handler(pc87309_t *dev, int uart);
+enum {
+    LD_FDC   = 0,
+    LD_LPT,
+    LD_UART2,
+    LD_UART1,
+    LD_PM,
+    LD_MOUSE,
+    LD_KBD
+} pc87309_ld_t;
+
+#define LD_MIN LD_FDC
+#define LD_MAX LD_MOUSE
+
+static void    fdc_handler(pc87309_t *dev);
+static void    lpt_handler(pc87309_t *dev);
+static void    serial_handler(pc87309_t *dev, int uart);
+static void    kbc_handler(pc87309_t *dev);
+static void    pc87309_write(uint16_t port, uint8_t val, void *priv);
+static uint8_t pc87309_read(uint16_t port, void *priv);
+
+#ifdef ENABLE_PC87309_LOG
+int pc87309_do_log = ENABLE_PC87309_LOG;
+
+static void
+pc87309_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (pc87309_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define pc87309_log(fmt, ...)
+#endif
 
 static void
 pc87309_pm_write(uint16_t port, uint8_t val, void *priv)
 {
     pc87309_t *dev = (pc87309_t *) priv;
 
-    if (port & 1) {
+    if (port & 1)
         dev->pm[dev->pm_idx] = val;
+    else {
+        dev->pm_idx = val & 0x07;
 
         switch (dev->pm_idx) {
             case 0x00:
                 fdc_handler(dev);
-                lpt1_handler(dev);
+                lpt_handler(dev);
                 serial_handler(dev, 1);
                 serial_handler(dev, 0);
                 break;
@@ -70,8 +112,7 @@ pc87309_pm_write(uint16_t port, uint8_t val, void *priv)
             default:
                 break;
         }
-    } else
-        dev->pm_idx = val & 0x07;
+    }
 }
 
 uint8_t
@@ -104,243 +145,449 @@ pc87309_pm_init(pc87309_t *dev, uint16_t addr)
                   pc87309_pm_read, NULL, NULL, pc87309_pm_write, NULL, NULL, dev);
 }
 
+static void
+kbc_handler(pc87309_t *dev)
+{
+    uint8_t  active   = (dev->ld_regs[LD_KBD][0x00] & 0x01) &&
+                        (dev->pm[0x00] & 0x01);
+    uint8_t  active_2 = dev->ld_regs[LD_MOUSE][0x00] & 0x01;
+    uint8_t  irq      = (dev->ld_regs[LD_KBD][0x40] & 0x0f);
+    uint8_t  irq_2    = (dev->ld_regs[LD_MOUSE][0x40] & 0x0f);
+    uint16_t addr     = (dev->ld_regs[LD_KBD][0x30] << 8) |
+                        dev->ld_regs[LD_KBD][0x31];
+    uint16_t addr_2   = (dev->ld_regs[LD_KBD][0x32] << 8) |
+                        dev->ld_regs[LD_KBD][0x33];
+
+    pc87309_log("%02X, %02X, %02X, %02X, %04X, %04X\n",
+                active, active_2, irq, irq_2, addr, addr_2);
+
+    if (addr <= 0xfff8) {
+        pc87309_log("Enabling KBC #1 on %04X...\n", addr);
+        kbc_at_port_handler(0, active, addr,   dev->kbc);
+    }
+
+    if (addr_2 <= 0xfff8) {
+        pc87309_log("Enabling KBC #2 on %04X...\n", addr_2);
+        kbc_at_port_handler(1, active, addr_2, dev->kbc);
+    }
+
+    kbc_at_set_irq(0, active               ? irq   : 0xffff, dev->kbc);
+    kbc_at_set_irq(1, (active && active_2) ? irq_2 : 0xffff, dev->kbc);
+}
+
 static void
 fdc_handler(pc87309_t *dev)
 {
-    uint8_t  irq;
-    uint8_t  active;
-    uint16_t addr;
-
     fdc_remove(dev->fdc);
 
-    active = (dev->ld_regs[0x00][0x00] & 0x01) && (dev->pm[0x00] & 0x08);
-    addr   = ((dev->ld_regs[0x00][0x30] << 8) | dev->ld_regs[0x00][0x31]) - 0x0002;
-    irq    = (dev->ld_regs[0x00][0x40] & 0x0f);
+    uint8_t  active = (dev->ld_regs[LD_FDC][0x00] & 0x01) &&
+                      (dev->pm[0x00] & 0x08);
+    uint8_t  irq    = (dev->ld_regs[LD_FDC][0x40] & 0x0f);
+    uint8_t  dma    = (dev->ld_regs[LD_FDC][0x44] & 0x0f);
+    uint16_t addr   = ((dev->ld_regs[LD_FDC][0x30] << 8) |
+                      dev->ld_regs[LD_FDC][0x31]) & 0xfff8;
 
-    if (active) {
+    if (active && (addr <= 0xfff8)) {
+        pc87309_log("Enabling FDC on %04X, IRQ %i...\n", addr, irq);
         fdc_set_base(dev->fdc, addr);
         fdc_set_irq(dev->fdc, irq);
+        fdc_set_dma_ch(dev->fdc, dma);
     }
 }
 
 static void
-lpt1_handler(pc87309_t *dev)
+lpt_handler(pc87309_t *dev)
 {
-    uint8_t  irq;
-    uint8_t  active;
-    uint16_t addr;
+    uint8_t  active = (dev->ld_regs[LD_LPT][0x00] & 0x01) &&
+                      (dev->pm[0x00] & 0x10);
+    uint8_t  irq    = (dev->ld_regs[LD_LPT][0x40] & 0x0f);
+    uint8_t  dma    = (dev->ld_regs[LD_LPT][0x44] & 0x0f);
+    uint16_t addr   = (dev->ld_regs[LD_LPT][0x30] << 8) |
+                      dev->ld_regs[LD_LPT][0x31];
+    uint8_t  mode   = (dev->ld_regs[LD_LPT][0xf0] >> 7);
+    uint16_t mask   = 0xfffc;
 
-    lpt1_remove();
+    if (irq > 15)
+        irq = 0xff;
 
-    active = (dev->ld_regs[0x01][0x00] & 0x01) && (dev->pm[0x00] & 0x10);
-    addr   = (dev->ld_regs[0x01][0x30] << 8) | dev->ld_regs[0x01][0x31];
-    irq    = (dev->ld_regs[0x01][0x40] & 0x0f);
+    if (dma >= 4)
+        dma = 0xff;
 
-    if (active) {
-        lpt1_init(addr);
-        lpt1_irq(irq);
+    lpt_port_remove(dev->lpt);
+
+    switch (mode) {
+        default:
+        case 0x00:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x01:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 1);
+            break;
+        case 0x02: case 0x03:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x04:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x07:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
     }
+
+    lpt_set_cfg_regs_enabled(dev->lpt, !!(dev->ld_regs[LD_LPT][0xf0] & 0x10));
+
+    if (active && (addr <= (0xfffc & mask))) {
+        pc87309_log("Enabling LPT1 on %04X...\n", addr);
+        lpt_port_setup(dev->lpt, addr & mask);
+    } else
+        lpt_port_setup(dev->lpt, 0xffff);
+
+    lpt_port_irq(dev->lpt, irq);
+    lpt_port_dma(dev->lpt, dma);
 }
 
 static void
 serial_handler(pc87309_t *dev, int uart)
 {
-    uint8_t  irq;
-    uint8_t  active;
-    uint16_t addr;
-
     serial_remove(dev->uart[uart]);
 
-    active = (dev->ld_regs[0x03 - uart][0x00] & 0x01) && (dev->pm[0x00] & (1 << (6 - uart)));
-    addr   = (dev->ld_regs[0x03 - uart][0x30] << 8) | dev->ld_regs[0x03 - uart][0x31];
-    irq    = (dev->ld_regs[0x03 - uart][0x40] & 0x0f);
+    uint8_t  active = (dev->ld_regs[LD_UART1 - uart][0x00] & 0x01) &&
+                      (dev->pm[0x00] & (1 << (6 - uart)));
+    uint8_t  irq    = (dev->ld_regs[LD_UART1 - uart][0x40] & 0x0f);
+    uint16_t addr   = (dev->ld_regs[LD_UART1 - uart][0x30] << 8) |
+                      dev->ld_regs[LD_UART1 - uart][0x31];
 
-    if (active)
+    if (active && (addr <= 0xfff8)) {
+        pc87309_log("Enabling COM%i on %04X...\n", uart + 1, addr);
         serial_setup(dev->uart[uart], addr, irq);
+    } else
+        serial_setup(dev->uart[uart], 0x0000, irq);
 }
 
 static void
 pm_handler(pc87309_t *dev)
 {
-    uint8_t  active;
-    uint16_t addr;
-
     pc87309_pm_remove(dev);
 
-    active = (dev->ld_regs[0x04][0x00] & 0x01);
-    addr   = (dev->ld_regs[0x04][0x30] << 8) | dev->ld_regs[0x04][0x31];
+    uint8_t  active = (dev->ld_regs[LD_PM][0x00] & 0x01);
+    uint16_t addr   = (dev->ld_regs[LD_PM][0x30] << 8) |
+                      dev->ld_regs[LD_PM][0x31];
 
-    if (active)
+    if (active) {
+        pc87309_log("Enabling power management on %04X...\n", addr);
         pc87309_pm_init(dev, addr);
+    }
+}
+
+static void
+superio_handler(pc87309_t *dev)
+{
+    if (dev->superio_base != 0x0000)
+        io_removehandler(dev->superio_base, 0x0002,
+                         pc87309_read, NULL, NULL,
+                         pc87309_write, NULL, NULL, dev);
+
+    switch (dev->regs[0x21] & 0x0b) {
+        default:
+            dev->superio_base = 0x0000;
+            break;
+        case 0x02:
+        case 0x08: case 0x0a:
+            dev->superio_base = 0x015c;
+            break;
+        case 0x03:
+        case 0x09: case 0x0b:
+            dev->superio_base = 0x002e;
+            break;
+    }
+
+    if (dev->superio_base != 0x0000) {
+        pc87309_log("Enabling Super I/O on %04X...\n", dev->superio_base);
+        io_sethandler(dev->superio_base, 0x0002,
+                      pc87309_read, NULL, NULL,
+                      pc87309_write, NULL, NULL, dev);
+    }
 }
 
 static void
 pc87309_write(uint16_t port, uint8_t val, void *priv)
 {
-    pc87309_t *dev = (pc87309_t *) priv;
-    uint8_t    index;
-
-    index = (port & 1) ? 0 : 1;
+    pc87309_t *dev   = (pc87309_t *) priv;
+    uint8_t    ld    = dev->regs[0x07];
+    uint8_t    reg   = dev->cur_reg - 0x30;
+    uint8_t    index = (port & 1) ? 0 : 1;
+    uint8_t    old   = dev->regs[dev->cur_reg];
 
     if (index) {
         dev->cur_reg = val;
         return;
     } else {
+#ifdef ENABLE_PC87309_LOG
+        if (dev->cur_reg >= 0x30)
+            pc87309_log("[%04X:%08X] [W] (%04X) %02X:%02X = %02X\n",
+                        CS, cpu_state.pc, port, ld, dev->cur_reg, val);
+        else
+            pc87309_log("[%04X:%08X] [W] (%04X)    %02X = %02X\n",
+                        CS, cpu_state.pc, port,     dev->cur_reg, val);
+#endif
         switch (dev->cur_reg) {
             case 0x00:
-            case 0x02:
-            case 0x03:
-            case 0x06:
-            case 0x07:
-            case 0x21:
+            case 0x02: case 0x03:
+            case 0x06: case 0x07:
                 dev->regs[dev->cur_reg] = val;
                 break;
+            case 0x21:
+                dev->regs[dev->cur_reg] = val;
+                fdc_toggle_flag(dev->fdc, FDC_FLAG_PS2_MCA, !(val & 0x04));
+                superio_handler(dev);
+                break;
             case 0x22:
-                dev->regs[dev->cur_reg] = val & 0x7f;
+                dev->regs[dev->cur_reg] = val;
                 break;
             default:
-                if (dev->cur_reg >= 0x30) {
-                    if ((dev->regs[0x07] != 0x06) || !(dev->regs[0x21] & 0x10))
-                        dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val;
-                }
+                if (dev->cur_reg >= 0x30)
+                    old = dev->ld_regs[ld][reg];
                 break;
         }
     }
 
     switch (dev->cur_reg) {
         case 0x30:
-            dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0x01;
-            switch (dev->regs[0x07]) {
-                case 0x00:
+            switch (ld) {
+                default:
+                    break;
+                case LD_KBD: case LD_MOUSE:
+                    dev->ld_regs[ld][reg] = val;
+                    kbc_handler(dev);
+                    break;
+                case LD_FDC:
+                    dev->ld_regs[ld][reg] = val;
                     fdc_handler(dev);
                     break;
-                case 0x01:
-                    lpt1_handler(dev);
+                case LD_LPT:
+                    dev->ld_regs[ld][reg] = val;
+                    lpt_handler(dev);
                     break;
-                case 0x02:
+                case LD_UART2:
+                    dev->ld_regs[ld][reg] = val;
                     serial_handler(dev, 1);
                     break;
-                case 0x03:
+                case LD_UART1:
+                    dev->ld_regs[ld][reg] = val;
                     serial_handler(dev, 0);
                     break;
-                case 0x04:
+                case LD_PM:
+                    dev->ld_regs[ld][reg] = val;
                     pm_handler(dev);
                     break;
-
-                default:
-                    break;
             }
             break;
+        /* I/O Range Check. */
+        case 0x31:
+            switch (ld) {
+                default:
+                    break;
+                case LD_MIN ... LD_MAX:
+                    if (ld != LD_MOUSE)
+                        dev->ld_regs[ld][reg] = val;
+                    break;
+            }
+            break;
+        /* Base Address 0 MSB. */
         case 0x60:
-        case 0x62:
-            dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0x07;
-            if (dev->cur_reg == 0x62)
-                break;
-            switch (dev->regs[0x07]) {
-                case 0x00:
+            switch (ld) {
+                default:
+                    break;
+                case LD_KBD:
+                    dev->ld_regs[ld][reg] = val;
+                    kbc_handler(dev);
+                    break;
+                case LD_FDC:
+                    dev->ld_regs[ld][reg] = val;
                     fdc_handler(dev);
                     break;
-                case 0x01:
-                    lpt1_handler(dev);
+                case LD_LPT:
+                    dev->ld_regs[ld][reg] = (old & 0xfc) | (val & 0x03);
+                    lpt_handler(dev);
                     break;
-                case 0x02:
+                case LD_UART2:
+                    dev->ld_regs[ld][reg] = val;
                     serial_handler(dev, 1);
                     break;
-                case 0x03:
+                case LD_UART1:
+                    dev->ld_regs[ld][reg] = val;
                     serial_handler(dev, 0);
                     break;
-                case 0x04:
+                case LD_PM:
+                    dev->ld_regs[ld][reg] = val;
                     pm_handler(dev);
                     break;
-
-                default:
-                    break;
             }
             break;
-        case 0x63:
-            if (dev->regs[0x07] == 0x06)
-                dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = (val & 0xf8) | 0x04;
-            break;
+        /* Base Address 0 LSB. */
         case 0x61:
-            switch (dev->regs[0x07]) {
-                case 0x00:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = (val & 0xfa) | 0x02;
+            switch (ld) {
+                default:
+                    break;
+                case LD_KBD:
+                    dev->ld_regs[ld][reg] = (old & 0x04) | (val & 0xfb);
+                    kbc_handler(dev);
+                    break;
+                case LD_FDC:
+                    dev->ld_regs[ld][reg] = (old & 0x07) | (val & 0xf8);
                     fdc_handler(dev);
                     break;
-                case 0x01:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0xfc;
-                    lpt1_handler(dev);
+                case LD_LPT:
+                    dev->ld_regs[ld][reg] = (old & 0x03) | (val & 0xfc);
+                    lpt_handler(dev);
                     break;
-                case 0x02:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0xf8;
+                case LD_UART2:
+                    dev->ld_regs[ld][reg] = (old & 0x07) | (val & 0xf8);
                     serial_handler(dev, 1);
                     break;
-                case 0x03:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0xf8;
+                case LD_UART1:
+                    dev->ld_regs[ld][reg] = (old & 0x07) | (val & 0xf8);
                     serial_handler(dev, 0);
                     break;
-                case 0x04:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0xfe;
+                case LD_PM:
+                    dev->ld_regs[ld][reg] = (old & 0x01) | (val & 0xfe);
                     pm_handler(dev);
                     break;
-                case 0x06:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0xf8;
-                    break;
-
-                default:
-                    break;
             }
             break;
+        /* Base Address 1 MSB (undocumented for Logical Device 7). */
+        case 0x62:
+            switch (ld) {
+                default:
+                    break;
+                case LD_KBD:
+                    dev->ld_regs[ld][reg] = val;
+                    kbc_handler(dev);
+                    break;
+            }
+            break;
+        /* Base Address 1 LSB (undocumented for Logical Device 7). */
+        case 0x63:
+            switch (ld) {
+                default:
+                    break;
+                case LD_KBD:
+                    dev->ld_regs[ld][reg] = (old & 0x04) | (val & 0xfb);
+                    kbc_handler(dev);
+                    break;
+            }
+            break;
+        /* Interrupt Select. */
         case 0x70:
-        case 0x74:
-        case 0x75:
-            switch (dev->regs[0x07]) {
-                case 0x00:
+            switch (ld) {
+                default:
+                    break;
+                case LD_KBD: case LD_MOUSE:
+                    dev->ld_regs[ld][reg] = val;
+                    kbc_handler(dev);
+                    break;
+                case LD_FDC:
+                    dev->ld_regs[ld][reg] = val;
                     fdc_handler(dev);
                     break;
-                case 0x01:
-                    lpt1_handler(dev);
+                case LD_LPT:
+                    dev->ld_regs[ld][reg] = val;
+                    lpt_handler(dev);
                     break;
-                case 0x02:
+                case LD_UART2:
+                    dev->ld_regs[ld][reg] = val;
                     serial_handler(dev, 1);
                     break;
-                case 0x03:
+                case LD_UART1:
+                    dev->ld_regs[ld][reg] = val;
                     serial_handler(dev, 0);
                     break;
-                case 0x04:
-                    pm_handler(dev);
-                    break;
-
-                default:
-                    break;
             }
             break;
+        /* Interrupt Type. */
+        case 0x71:
+            switch (ld) {
+                default:
+                    break;
+                case LD_MIN ... LD_MAX:
+                    if ((ld == LD_KBD) || (ld == LD_MOUSE))
+                        dev->ld_regs[ld][reg] = (old & 0xfc) | (val & 0x03);
+                    else
+                        dev->ld_regs[ld][reg] = (old & 0xfd) | (val & 0x02);
+                    break;
+            }
+            break;
+        /* DMA Channel Select 0. */
+        case 0x74:
+            switch (ld) {
+                default:
+                    break;
+                case LD_FDC:
+                    dev->ld_regs[ld][reg] = val;
+                    fdc_handler(dev);
+                    break;
+                case LD_LPT:
+                    dev->ld_regs[ld][reg] = val;
+                    lpt_handler(dev);
+                    break;
+                case LD_UART2:
+                    dev->ld_regs[ld][reg] = val;
+                    break;
+            }
+            break;
+        /* DMA Channel Select 1. */
+        case 0x75:
+            switch (ld) {
+                default:
+                    break;
+                case LD_UART2:
+                    dev->ld_regs[ld][reg] = val;
+                    break;
+            }
+            break;
+        /* Configuration Register 0. */
         case 0xf0:
-            switch (dev->regs[0x07]) {
-                case 0x00:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0xe1;
+            switch (ld) {
+                default:
+                    break;
+                case LD_KBD:
+                    dev->ld_regs[ld][reg] = val;
+                    break;
+                case LD_FDC:
+                    dev->ld_regs[ld][reg] = val;
                     fdc_update_densel_polarity(dev->fdc, (val & 0x20) ? 1 : 0);
                     fdc_update_enh_mode(dev->fdc, (val & 0x40) ? 1 : 0);
                     break;
-                case 0x01:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0xf3;
-                    lpt1_handler(dev);
+                case LD_LPT:
+                    dev->ld_regs[ld][reg] = val;
+                    lpt_handler(dev);
                     break;
-                case 0x02:
-                case 0x03:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0x87;
-                    break;
-                case 0x06:
-                    dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0xc1;
-                    break;
-
-                default:
+                case LD_UART2: case LD_UART1:
+                    dev->ld_regs[ld][reg] = val;
                     break;
             }
             break;
+        /* Configuration Register 1. */
         case 0xf1:
-            if (dev->regs[0x07] == 0x00)
-                dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30] = val & 0x0f;
+            switch (ld) {
+                default:
+                    break;
+                case LD_FDC:
+                    dev->ld_regs[ld][reg] = val;
+                    break;
+            }
             break;
 
         default:
@@ -348,97 +595,102 @@ pc87309_write(uint16_t port, uint8_t val, void *priv)
     }
 }
 
-uint8_t
+static uint8_t
 pc87309_read(uint16_t port, void *priv)
 {
-    const pc87309_t *dev = (pc87309_t *) priv;
-    uint8_t          ret = 0xff;
-    uint8_t          index;
-
-    index = (port & 1) ? 0 : 1;
+    const pc87309_t *dev   = (pc87309_t *) priv;
+    uint8_t          ld    = dev->regs[0x07];
+    uint8_t          reg   = dev->cur_reg - 0x30;
+    uint8_t          index = (port & 1) ? 0 : 1;
+    uint8_t          ret   = 0xff;
 
     if (index)
-        ret = dev->cur_reg & 0x1f;
+        ret = dev->cur_reg;
     else {
         if (dev->cur_reg >= 0x30)
-            ret = dev->ld_regs[dev->regs[0x07]][dev->cur_reg - 0x30];
+            ret = dev->ld_regs[ld][reg];
+        /* Write-only registers. */
+        else if ((dev->cur_reg == 0x00) ||
+                 (dev->cur_reg == 0x02) || (dev->cur_reg == 0x03))
+            ret = 0x00;
         else
             ret = dev->regs[dev->cur_reg];
+#ifdef ENABLE_PC87309_LOG
+        if (dev->cur_reg >= 0x30)
+            pc87309_log("[%04X:%08X] [R] (%04X) %02X:%02X = %02X\n",
+                        CS, cpu_state.pc, port, ld, dev->cur_reg, ret);
+        else
+            pc87309_log("[%04X:%08X] [R] (%04X)    %02X = %02X\n",
+                        CS, cpu_state.pc, port,     dev->cur_reg, ret);
+#endif
     }
 
     return ret;
 }
 
 void
-pc87309_reset(pc87309_t *dev)
+pc87309_reset(void *priv)
 {
+    pc87309_t *dev = (pc87309_t *) priv;
+
     memset(dev->regs, 0x00, 0x30);
     for (uint16_t i = 0; i < 256; i++)
         memset(dev->ld_regs[i], 0x00, 0xd0);
     memset(dev->pm, 0x00, 0x08);
 
     dev->regs[0x20] = dev->id;
-    dev->regs[0x21] = 0x04;
+    dev->regs[0x21] = 0x04 | dev->baddr;
 
-    dev->ld_regs[0x00][0x01] = 0x01;
-    dev->ld_regs[0x00][0x30] = 0x03;
-    dev->ld_regs[0x00][0x31] = 0xf2;
-    dev->ld_regs[0x00][0x40] = 0x06;
-    dev->ld_regs[0x00][0x41] = 0x03;
-    dev->ld_regs[0x00][0x44] = 0x02;
-    dev->ld_regs[0x00][0x45] = 0x04;
-    dev->ld_regs[0x00][0xc0] = 0x02;
+    dev->ld_regs[LD_KBD  ][0x00] = 0x01;
+    dev->ld_regs[LD_KBD  ][0x31] = 0x60;
+    dev->ld_regs[LD_KBD  ][0x33] = 0x64;
+    dev->ld_regs[LD_KBD  ][0x40] = 0x01;
+    dev->ld_regs[LD_KBD  ][0x41] = 0x02;
+    dev->ld_regs[LD_KBD  ][0x44] = 0x04;
+    dev->ld_regs[LD_KBD  ][0x45] = 0x04;
+    dev->ld_regs[LD_KBD  ][0xc0] = 0x40;
 
-    dev->ld_regs[0x01][0x30] = 0x02;
-    dev->ld_regs[0x01][0x31] = 0x78;
-    dev->ld_regs[0x01][0x40] = 0x07;
-    dev->ld_regs[0x01][0x44] = 0x04;
-    dev->ld_regs[0x01][0x45] = 0x04;
-    dev->ld_regs[0x01][0xc0] = 0xf2;
+    dev->ld_regs[LD_MOUSE][0x40] = 0x0c;
+    dev->ld_regs[LD_MOUSE][0x41] = 0x02;
+    dev->ld_regs[LD_MOUSE][0x44] = 0x04;
+    dev->ld_regs[LD_MOUSE][0x45] = 0x04;
 
-    dev->ld_regs[0x02][0x30] = 0x02;
-    dev->ld_regs[0x02][0x31] = 0xf8;
-    dev->ld_regs[0x02][0x40] = 0x03;
-    dev->ld_regs[0x02][0x41] = 0x03;
-    dev->ld_regs[0x02][0x44] = 0x04;
-    dev->ld_regs[0x02][0x45] = 0x04;
-    dev->ld_regs[0x02][0xc0] = 0x02;
+    dev->ld_regs[LD_FDC  ][0x01] = 0x01;
+    dev->ld_regs[LD_FDC  ][0x30] = 0x03;
+    dev->ld_regs[LD_FDC  ][0x31] = 0xf0;
+    dev->ld_regs[LD_FDC  ][0x32] = 0x03;
+    dev->ld_regs[LD_FDC  ][0x33] = 0xf7;
+    dev->ld_regs[LD_FDC  ][0x40] = 0x06;
+    dev->ld_regs[LD_FDC  ][0x41] = 0x03;
+    dev->ld_regs[LD_FDC  ][0x44] = 0x02;
+    dev->ld_regs[LD_FDC  ][0x45] = 0x04;
+    dev->ld_regs[LD_FDC  ][0xc0] = 0x02;
 
-    dev->ld_regs[0x03][0x30] = 0x03;
-    dev->ld_regs[0x03][0x31] = 0xf8;
-    dev->ld_regs[0x03][0x40] = 0x04;
-    dev->ld_regs[0x03][0x41] = 0x03;
-    dev->ld_regs[0x03][0x44] = 0x04;
-    dev->ld_regs[0x03][0x45] = 0x04;
-    dev->ld_regs[0x03][0xc0] = 0x02;
+    dev->ld_regs[LD_LPT  ][0x30] = 0x02;
+    dev->ld_regs[LD_LPT  ][0x31] = 0x78;
+    dev->ld_regs[LD_LPT  ][0x40] = 0x07;
+    dev->ld_regs[LD_LPT  ][0x44] = 0x04;
+    dev->ld_regs[LD_LPT  ][0x45] = 0x04;
+    dev->ld_regs[LD_LPT  ][0xc0] = 0xf2;
 
-    dev->ld_regs[0x04][0x44] = 0x04;
-    dev->ld_regs[0x04][0x45] = 0x04;
+    dev->ld_regs[LD_UART2][0x30] = 0x02;
+    dev->ld_regs[LD_UART2][0x31] = 0xf8;
+    dev->ld_regs[LD_UART2][0x40] = 0x03;
+    dev->ld_regs[LD_UART2][0x41] = 0x03;
+    dev->ld_regs[LD_UART2][0x44] = 0x04;
+    dev->ld_regs[LD_UART2][0x45] = 0x04;
+    dev->ld_regs[LD_UART2][0xc0] = 0x02;
 
-    dev->ld_regs[0x05][0x40] = 0x0c;
-    dev->ld_regs[0x05][0x41] = 0x02;
-    dev->ld_regs[0x05][0x44] = 0x04;
-    dev->ld_regs[0x05][0x45] = 0x04;
+    dev->ld_regs[LD_UART1][0x30] = 0x03;
+    dev->ld_regs[LD_UART1][0x31] = 0xf8;
+    dev->ld_regs[LD_UART1][0x40] = 0x04;
+    dev->ld_regs[LD_UART1][0x41] = 0x03;
+    dev->ld_regs[LD_UART1][0x44] = 0x04;
+    dev->ld_regs[LD_UART1][0x45] = 0x04;
+    dev->ld_regs[LD_UART1][0xc0] = 0x02;
 
-    dev->ld_regs[0x06][0x01] = 0x01;
-    dev->ld_regs[0x06][0x31] = 0x60;
-    dev->ld_regs[0x06][0x33] = 0x64;
-    dev->ld_regs[0x06][0x40] = 0x01;
-    dev->ld_regs[0x06][0x41] = 0x02;
-    dev->ld_regs[0x06][0x44] = 0x04;
-    dev->ld_regs[0x06][0x45] = 0x04;
-    dev->ld_regs[0x06][0xc0] = 0x40;
-
-    dev->regs[0x00] = 0x0B;
-    dev->regs[0x01] = 0x01;
-    dev->regs[0x03] = 0x01;
-    dev->regs[0x05] = 0x0D;
-    dev->regs[0x08] = 0x70;
-    dev->regs[0x09] = 0xC0;
-    dev->regs[0x0b] = 0x80;
-    dev->regs[0x0f] = 0x1E;
-    dev->regs[0x12] = 0x30;
-    dev->regs[0x19] = 0xEF;
+    dev->ld_regs[LD_PM   ][0x44] = 0x04;
+    dev->ld_regs[LD_PM   ][0x45] = 0x04;
 
     dev->pm[0] = 0x79;
     dev->pm[4] = 0x0e;
@@ -449,10 +701,16 @@ pc87309_reset(pc87309_t *dev)
         0 = 360 rpm @ 500 kbps for 3.5"
         1 = Default, 300 rpm @ 500, 300, 250, 1000 kbps for 3.5"
     */
-    lpt1_remove();
-    serial_remove(dev->uart[0]);
-    serial_remove(dev->uart[1]);
+    fdc_toggle_flag(dev->fdc, FDC_FLAG_PS2_MCA, 0);
     fdc_reset(dev->fdc);
+
+    kbc_handler(dev);
+    fdc_handler(dev);
+    lpt_handler(dev);
+    serial_handler(dev, 0);
+    serial_handler(dev, 1);
+    pm_handler(dev);
+    superio_handler(dev);
 }
 
 static void
@@ -466,8 +724,7 @@ pc87309_close(void *priv)
 static void *
 pc87309_init(const device_t *info)
 {
-    pc87309_t *dev = (pc87309_t *) malloc(sizeof(pc87309_t));
-    memset(dev, 0, sizeof(pc87309_t));
+    pc87309_t *dev = (pc87309_t *) calloc(1, sizeof(pc87309_t));
 
     dev->id = info->local & 0xff;
 
@@ -476,16 +733,30 @@ pc87309_init(const device_t *info)
     dev->uart[0] = device_add_inst(&ns16550_device, 1);
     dev->uart[1] = device_add_inst(&ns16550_device, 2);
 
-    pc87309_reset(dev);
+    dev->lpt = device_add_inst(&lpt_port_device, 1);
+    lpt_set_cnfga_readout(dev->lpt, 0x14);
 
-    if (info->local & 0x100) {
-        io_sethandler(0x15c, 0x0002,
-                      pc87309_read, NULL, NULL, pc87309_write, NULL, NULL, dev);
-    } else {
-        io_sethandler(0x02e, 0x0002,
-                      pc87309_read, NULL, NULL, pc87309_write, NULL, NULL, dev);
+    switch (info->local & PCX730X_KBC) {
+        case PCX730X_AMI:
+        default:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_AMI | 0x00003500));
+            break;
+        /* Optiplex! */
+        case PCX730X_PHOENIX_42:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_PHOENIX | 0x00013700));
+            break;
+        case PCX730X_PHOENIX_42I:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_PHOENIX | 0x00041600));
+            break;
     }
 
+    if (info->local & PCX730X_15C)
+        dev->baddr = 0x0a;
+    else
+        dev->baddr = 0x0b;
+
+    pc87309_reset(dev);
+
     return dev;
 }
 
@@ -493,25 +764,11 @@ const device_t pc87309_device = {
     .name          = "National Semiconductor PC87309 Super I/O",
     .internal_name = "pc87309",
     .flags         = 0,
-    .local         = 0xe0,
+    .local         = 0,
     .init          = pc87309_init,
     .close         = pc87309_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t pc87309_15c_device = {
-    .name          = "National Semiconductor PC87309 Super I/O (Port 15Ch)",
-    .internal_name = "pc87309_15c",
-    .flags         = 0,
-    .local         = 0x1e0,
-    .init          = pc87309_init,
-    .close         = pc87309_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .reset         = pc87309_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sio/sio_pc87310.c b/src/sio/sio_pc87310.c
index 075b819ff..b6341abc5 100644
--- a/src/sio/sio_pc87310.c
+++ b/src/sio/sio_pc87310.c
@@ -40,9 +40,6 @@
 #include <86box/sio.h>
 #include <86box/plat_unused.h>
 
-#define FLAG_IDE    0x00000001
-#define FLAG_ALI    0x00000002
-
 #ifdef ENABLE_PC87310_LOG
 int pc87310_do_log = ENABLE_PC87310_LOG;
 
@@ -67,10 +64,11 @@ typedef struct pc87310_t {
     uint8_t   regs[2];
     fdc_t    *fdc;
     serial_t *uart[2];
+    lpt_t    *lpt;
 } pc87310_t;
 
 static void
-lpt1_handler(pc87310_t *dev)
+lpt_handler(pc87310_t *dev)
 {
     int      temp;
     uint16_t lpt_port = LPT1_ADDR;
@@ -84,19 +82,19 @@ lpt1_handler(pc87310_t *dev)
      */
     temp = dev->regs[1] & 0x03;
 
-    lpt1_remove();
+    lpt_port_remove(dev->lpt);
 
     switch (temp) {
-        case 0:
+        case 0x00:
             lpt_port = LPT1_ADDR;
             break;
-        case 1:
+        case 0x01:
             lpt_port = LPT_MDA_ADDR;
             break;
-        case 2:
+        case 0x02:
             lpt_port = LPT2_ADDR;
             break;
-        case 3:
+        case 0x03:
             lpt_port = 0x000;
             lpt_irq  = 0xff;
             break;
@@ -106,9 +104,9 @@ lpt1_handler(pc87310_t *dev)
     }
 
     if (lpt_port)
-        lpt1_init(lpt_port);
+        lpt_port_setup(dev->lpt, lpt_port);
 
-    lpt1_irq(lpt_irq);
+    lpt_port_irq(dev->lpt, lpt_irq);
 }
 
 static void
@@ -137,7 +135,7 @@ serial_handler(pc87310_t *dev)
      * Then they become simple toggle bits.
      * Therefore, we do this for easier operation.
      */
-    if (dev->flags & FLAG_ALI) {
+    if (dev->flags & PC87310_ALI) {
         temp2 = dev->regs[0] & 0x03;
         temp2 ^= ((temp2 & 0x02) >> 1);
     }
@@ -190,22 +188,22 @@ pc87310_write(UNUSED(uint16_t port), uint8_t val, void *priv)
             /* Reconfigure parallel port. */
             if (valxor & 0x03)
                 /* Bits 1, 0: 1, 1 = Disable parallel port. */
-                lpt1_handler(dev);
+                lpt_handler(dev);
 
             /* Reconfigure serial ports. */
             if (valxor & 0x1c)
                 serial_handler(dev);
 
             /* Reconfigure IDE controller. */
-            if ((dev->flags & FLAG_IDE) && (valxor & 0x20))  {
+            if ((dev->flags & PCX73XX_IDE) && (valxor & 0x20))  {
                 pc87310_log("SIO: HDC disabled\n");
                 ide_pri_disable();
                 /* Bit 5: 1 = Disable IDE controller. */
                 if (!(val & 0x20)) {
                     pc87310_log("SIO: HDC enabled\n");
                     ide_set_base(0, 0x1f0);
-                   ide_set_side(0, 0x3f6);
-                     ide_pri_enable();
+                    ide_set_side(0, 0x3f6);
+                    ide_pri_enable();
                 }
             }
 
@@ -256,9 +254,9 @@ pc87310_reset(pc87310_t *dev)
 
     dev->tries   = 0;
 
-    lpt1_handler(dev);
+    lpt_handler(dev);
     serial_handler(dev);
-    if (dev->flags & FLAG_IDE) {
+    if (dev->flags & PCX73XX_IDE) {
         ide_pri_disable();
         ide_pri_enable();
     }
@@ -286,21 +284,25 @@ pc87310_init(const device_t *info)
     dev->uart[0] = device_add_inst(&ns16450_device, 1);
     dev->uart[1] = device_add_inst(&ns16450_device, 2);
 
-    if (dev->flags & FLAG_IDE)
-        device_add((dev->flags & FLAG_ALI) ? &ide_vlb_device : &ide_isa_device);
+    dev->lpt = device_add_inst(&lpt_port_device, 1);
+    lpt_set_ext(dev->lpt, 1);
+
+    if (dev->flags & PCX73XX_IDE)
+        device_add((dev->flags & PC87310_ALI) ? &ide_vlb_device : &ide_isa_device);
 
     pc87310_reset(dev);
 
-    io_sethandler(0x3f3, 0x0001,
+    io_sethandler(0x03f3, 0x0001,
                   pc87310_read, NULL, NULL, pc87310_write, NULL, NULL, dev);
 
-    if (dev->flags & FLAG_ALI)
-        io_sethandler(0x3f1, 0x0001,
+    if (dev->flags & PC87310_ALI)
+        io_sethandler(0x03f1, 0x0001,
                       pc87310_read, NULL, NULL, pc87310_write, NULL, NULL, dev);
 
     return dev;
 }
 
+/* The ALi M5105 is an extended clone of this. */
 const device_t pc87310_device = {
     .name          = "National Semiconductor PC87310 Super I/O",
     .internal_name = "pc87310",
@@ -309,35 +311,7 @@ const device_t pc87310_device = {
     .init          = pc87310_init,
     .close         = pc87310_close,
     .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t pc87310_ide_device = {
-    .name          = "National Semiconductor PC87310 Super I/O with IDE functionality",
-    .internal_name = "pc87310_ide",
-    .flags         = 0,
-    .local         = FLAG_IDE,
-    .init          = pc87310_init,
-    .close         = pc87310_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t ali5105_device = {
-    .name          = "ALi M5105 Super I/O",
-    .internal_name = "ali5105",
-    .flags         = 0,
-    .local         = FLAG_ALI,
-    .init          = pc87310_init,
-    .close         = pc87310_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sio/sio_pc87311.c b/src/sio/sio_pc87311.c
deleted file mode 100644
index 9740753d1..000000000
--- a/src/sio/sio_pc87311.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Emulation of the National Semiconductor PC87311 Super I/O
- *
- *
- *
- * Authors: Tiseno100
- *
- *          Copyright 2020 Tiseno100
- */
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include <86box/io.h>
-#include <86box/timer.h>
-#include <86box/device.h>
-#include <86box/lpt.h>
-#include <86box/serial.h>
-#include <86box/hdc.h>
-#include <86box/hdc_ide.h>
-#include <86box/fdd.h>
-#include <86box/fdc.h>
-#include <86box/sio.h>
-#include <86box/plat_unused.h>
-
-#define HAS_IDE_FUNCTIONALITY dev->ide_function
-
-/* Basic Functionalities */
-#define FUNCTION_ENABLE  dev->regs[0x00]
-#define FUNCTION_ADDRESS dev->regs[0x01]
-#define POWER_TEST       dev->regs[0x02]
-
-/* Base Addresses */
-#define LPT_BA   (FUNCTION_ADDRESS & 0x03)
-#define UART1_BA ((FUNCTION_ADDRESS >> 2) & 0x03)
-#define UART2_BA ((FUNCTION_ADDRESS >> 4) & 0x03)
-#define COM_BA   ((FUNCTION_ADDRESS >> 6) & 0x03)
-
-#ifdef ENABLE_PC87311_LOG
-int pc87311_do_log = ENABLE_PC87311_LOG;
-
-static void
-pc87311_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (pc87311_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define pc87311_log(fmt, ...)
-#endif
-
-typedef struct pc87311_t {
-    uint8_t   index;
-    uint8_t   regs[256];
-    uint8_t   cfg_lock;
-    uint8_t   ide_function;
-    uint16_t  base;
-    uint16_t  irq;
-    fdc_t    *fdc_controller;
-    serial_t *uart[2];
-
-} pc87311_t;
-
-void pc87311_fdc_handler(pc87311_t *dev);
-void pc87311_uart_handler(uint8_t num, pc87311_t *dev);
-void pc87311_lpt_handler(pc87311_t *dev);
-void pc87311_ide_handler(pc87311_t *dev);
-void pc87311_enable(pc87311_t *dev);
-
-static void
-pc87311_write(uint16_t addr, uint8_t val, void *priv)
-{
-    pc87311_t *dev = (pc87311_t *) priv;
-
-    switch (addr) {
-        case 0x398:
-        case 0x26e:
-            dev->index = val;
-            break;
-
-        case 0x399:
-        case 0x26f:
-            switch (dev->index) {
-                case 0x00:
-                    FUNCTION_ENABLE = val;
-                    break;
-                case 0x01:
-                    FUNCTION_ADDRESS = val;
-                    break;
-                case 0x02:
-                    POWER_TEST = val;
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-
-        default:
-            break;
-    }
-
-    pc87311_enable(dev);
-}
-
-static uint8_t
-pc87311_read(UNUSED(uint16_t addr), void *priv)
-{
-    const pc87311_t *dev = (pc87311_t *) priv;
-
-    return dev->regs[dev->index];
-}
-
-void
-pc87311_fdc_handler(pc87311_t *dev)
-{
-    fdc_remove(dev->fdc_controller);
-    fdc_set_base(dev->fdc_controller, (FUNCTION_ENABLE & 0x20) ? FDC_SECONDARY_ADDR : FDC_PRIMARY_ADDR);
-    pc87311_log("PC87311-FDC: BASE %04x\n", (FUNCTION_ENABLE & 0x20) ? FDC_SECONDARY_ADDR : FDC_PRIMARY_ADDR);
-}
-
-uint16_t
-com3(pc87311_t *dev)
-{
-    switch (COM_BA) {
-        case 0:
-            return COM3_ADDR;
-        case 1:
-            return 0x0338;
-        case 2:
-            return COM4_ADDR;
-        case 3:
-            return 0x0220;
-        default:
-            return COM3_ADDR;
-    }
-}
-
-uint16_t
-com4(pc87311_t *dev)
-{
-    switch (COM_BA) {
-        case 0:
-            return COM4_ADDR;
-        case 1:
-            return 0x0238;
-        case 2:
-            return 0x02e0;
-        case 3:
-            return 0x0228;
-        default:
-            return COM4_ADDR;
-    }
-}
-
-void
-pc87311_uart_handler(uint8_t num, pc87311_t *dev)
-{
-    serial_remove(dev->uart[num & 1]);
-
-    switch (!(num & 1) ? UART1_BA : UART2_BA) {
-        case 0:
-            dev->base = COM1_ADDR;
-            dev->irq  = COM1_IRQ;
-            break;
-        case 1:
-            dev->base = COM2_ADDR;
-            dev->irq  = COM2_IRQ;
-            break;
-        case 2:
-            dev->base = com3(dev);
-            dev->irq  = COM3_IRQ;
-            break;
-        case 3:
-            dev->base = com4(dev);
-            dev->irq  = COM4_IRQ;
-            break;
-
-        default:
-            break;
-    }
-    serial_setup(dev->uart[num & 1], dev->base, dev->irq);
-    pc87311_log("PC87311-UART%01x: BASE %04x IRQ %01x\n", num & 1, dev->base, dev->irq);
-}
-
-void
-pc87311_lpt_handler(pc87311_t *dev)
-{
-    lpt1_remove();
-    switch (LPT_BA) {
-        case 0:
-            dev->base = LPT1_ADDR;
-            dev->irq  = (POWER_TEST & 0x08) ? LPT1_IRQ : LPT2_IRQ;
-            break;
-        case 1:
-            dev->base = LPT_MDA_ADDR;
-            dev->irq  = LPT_MDA_IRQ;
-            break;
-        case 2:
-            dev->base = LPT2_ADDR;
-            dev->irq  = LPT2_IRQ;
-            break;
-
-        default:
-            break;
-    }
-    lpt1_init(dev->base);
-    lpt1_irq(dev->irq);
-    pc87311_log("PC87311-LPT: BASE %04x IRQ %01x\n", dev->base, dev->irq);
-}
-
-void
-pc87311_ide_handler(pc87311_t *dev)
-{
-    ide_pri_disable();
-    ide_sec_disable();
-
-    ide_set_base(0, 0x1f0);
-    ide_set_side(0, 0x3f6);
-    ide_pri_enable();
-
-    if (FUNCTION_ENABLE & 0x80) {
-        ide_set_base(1, 0x170);
-        ide_set_side(1, 0x376);
-        ide_sec_enable();
-    }
-    pc87311_log("PC87311-IDE: PRI %01x SEC %01x\n", (FUNCTION_ENABLE >> 6) & 1, (FUNCTION_ENABLE >> 7) & 1);
-}
-
-void
-pc87311_enable(pc87311_t *dev)
-{
-    (FUNCTION_ENABLE & 0x01) ? pc87311_lpt_handler(dev) : lpt1_remove();
-    (FUNCTION_ENABLE & 0x02) ? pc87311_uart_handler(0, dev) : serial_remove(dev->uart[0]);
-    (FUNCTION_ENABLE & 0x04) ? pc87311_uart_handler(1, dev) : serial_remove(dev->uart[1]);
-    (FUNCTION_ENABLE & 0x08) ? pc87311_fdc_handler(dev) : fdc_remove(dev->fdc_controller);
-    if (FUNCTION_ENABLE & 0x20)
-        pc87311_fdc_handler(dev);
-    if (HAS_IDE_FUNCTIONALITY) {
-        (FUNCTION_ENABLE & 0x40) ? pc87311_ide_handler(dev) : ide_pri_disable();
-        (FUNCTION_ADDRESS & 0x80) ? pc87311_ide_handler(dev) : ide_sec_disable();
-    }
-}
-
-static void
-pc87311_close(void *priv)
-{
-    pc87311_t *dev = (pc87311_t *) priv;
-
-    free(dev);
-}
-
-static void *
-pc87311_init(const device_t *info)
-{
-    pc87311_t *dev = (pc87311_t *) malloc(sizeof(pc87311_t));
-    memset(dev, 0, sizeof(pc87311_t));
-
-    /* Avoid conflicting with machines that make no use of the PC87311 Internal IDE */
-    HAS_IDE_FUNCTIONALITY = info->local;
-
-    dev->fdc_controller = device_add(&fdc_at_nsc_device);
-    dev->uart[0]        = device_add_inst(&ns16450_device, 1);
-    dev->uart[1]        = device_add_inst(&ns16450_device, 2);
-
-    if (HAS_IDE_FUNCTIONALITY)
-        device_add(&ide_isa_2ch_device);
-
-    io_sethandler(0x0398, 0x0002, pc87311_read, NULL, NULL, pc87311_write, NULL, NULL, dev);
-    io_sethandler(0x026e, 0x0002, pc87311_read, NULL, NULL, pc87311_write, NULL, NULL, dev);
-
-    pc87311_enable(dev);
-
-    return dev;
-}
-
-const device_t pc87311_device = {
-    .name          = "National Semiconductor PC87311",
-    .internal_name = "pc87311",
-    .flags         = 0,
-    .local         = 0,
-    .init          = pc87311_init,
-    .close         = pc87311_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t pc87311_ide_device = {
-    .name          = "National Semiconductor PC87311 with IDE functionality",
-    .internal_name = "pc87311_ide",
-    .flags         = 0,
-    .local         = 1,
-    .init          = pc87311_init,
-    .close         = pc87311_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
diff --git a/src/sio/sio_pc87332.c b/src/sio/sio_pc873xx.c
similarity index 58%
rename from src/sio/sio_pc87332.c
rename to src/sio/sio_pc873xx.c
index 5cbf9f694..05f5d9be2 100644
--- a/src/sio/sio_pc87332.c
+++ b/src/sio/sio_pc873xx.c
@@ -6,9 +6,7 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          Emulation of the NatSemi PC87332 Super I/O chip.
- *
- *
+ *          Emulation of the NatSemi PC87311 and PC87332 Super I/O chips.
  *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
@@ -35,39 +33,50 @@
 #include <86box/fdc.h>
 #include <86box/sio.h>
 
-typedef struct pc87332_t {
+typedef struct pc873xx_t {
+    uint8_t   baddr;
+    uint8_t   is_332;
     uint8_t   tries;
     uint8_t   has_ide;
     uint8_t   fdc_on;
-    uint8_t   regs[15];
+    uint8_t   regs[256];
+    uint16_t  base_addr;
     int       cur_reg;
+    int       max_reg;
     fdc_t    *fdc;
     serial_t *uart[2];
-} pc87332_t;
+    lpt_t    *lpt;
+} pc873xx_t;
 
 static void
-lpt1_handler(pc87332_t *dev)
+lpt_handler(pc873xx_t *dev)
 {
     int      temp;
     uint16_t lpt_port = LPT1_ADDR;
-    uint8_t  lpt_irq  = LPT2_IRQ;
+    uint8_t  lpt_irq = LPT2_IRQ;
+    uint8_t  lpt_dma = ((dev->regs[0x18] & 0x06) >> 1);
 
-    temp = dev->regs[0x01] & 3;
+    lpt_port_remove(dev->lpt);
+
+    if (lpt_dma == 0x00)
+        lpt_dma = 0xff;
+
+    temp  = dev->regs[0x01] & 0x03;
 
     switch (temp) {
-        case 0:
+        case 0x00:
             lpt_port = LPT1_ADDR;
             lpt_irq  = (dev->regs[0x02] & 0x08) ? LPT1_IRQ : LPT2_IRQ;
             break;
-        case 1:
+        case 0x01:
             lpt_port = LPT_MDA_ADDR;
-            lpt_irq  = LPT_MDA_IRQ;
+            lpt_irq = LPT_MDA_IRQ;
             break;
-        case 2:
+        case 0x02:
             lpt_port = LPT2_ADDR;
             lpt_irq  = LPT2_IRQ;
             break;
-        case 3:
+        case 0x03:
             lpt_port = 0x000;
             lpt_irq  = 0xff;
             break;
@@ -76,14 +85,24 @@ lpt1_handler(pc87332_t *dev)
             break;
     }
 
-    if (lpt_port)
-        lpt1_init(lpt_port);
+    lpt_set_cnfgb_readout(dev->lpt, (lpt_irq == 5) ? 0x38 : 0x08);
+    lpt_set_ext(dev->lpt, !!(dev->regs[0x02] & 0x80));
 
-    lpt1_irq(lpt_irq);
+    if (dev->is_332) {
+        lpt_set_epp(dev->lpt, !!(dev->regs[0x04] & 0x01));
+        lpt_set_ecp(dev->lpt, !!(dev->regs[0x04] & 0x04));
+
+        lpt_port_dma(dev->lpt, lpt_dma);
+    }
+
+    if (lpt_port)
+        lpt_port_setup(dev->lpt, lpt_port);
+
+    lpt_port_irq(dev->lpt, lpt_irq);
 }
 
 static void
-serial_handler(pc87332_t *dev, int uart)
+serial_handler(pc873xx_t *dev, int uart)
 {
     int temp;
 
@@ -141,7 +160,7 @@ serial_handler(pc87332_t *dev, int uart)
 }
 
 static void
-ide_handler(pc87332_t *dev)
+ide_handler(pc873xx_t *dev)
 {
     /* TODO: Make an ide_disable(channel) and ide_enable(channel) so we can simplify this. */
     if (dev->has_ide == 2) {
@@ -160,9 +179,9 @@ ide_handler(pc87332_t *dev)
 }
 
 static void
-pc87332_write(uint16_t port, uint8_t val, void *priv)
+pc873xx_write(uint16_t port, uint8_t val, void *priv)
 {
-    pc87332_t *dev = (pc87332_t *) priv;
+    pc873xx_t *dev = (pc873xx_t *) priv;
     uint8_t    index;
     uint8_t    valxor;
 
@@ -176,7 +195,7 @@ pc87332_write(uint16_t port, uint8_t val, void *priv)
         if (dev->tries) {
             valxor     = val ^ dev->regs[dev->cur_reg];
             dev->tries = 0;
-            if ((dev->cur_reg <= 14) && (dev->cur_reg != 8))
+            if ((dev->cur_reg <= dev->max_reg) && (dev->cur_reg != 8))
                 dev->regs[dev->cur_reg] = val;
             else
                 return;
@@ -186,70 +205,84 @@ pc87332_write(uint16_t port, uint8_t val, void *priv)
         }
     }
 
-    switch (dev->cur_reg) {
-        case 0:
-            if (valxor & 1) {
-                lpt1_remove();
-                if ((val & 1) && !(dev->regs[2] & 1))
-                    lpt1_handler(dev);
+    if (dev->cur_reg <= dev->max_reg)  switch (dev->cur_reg) {
+        case 0x00:
+            if (valxor & 0x01) {
+                lpt_port_remove(dev->lpt);
+                if ((val & 0x01) && !(dev->regs[0x02] & 0x01))
+                    lpt_handler(dev);
             }
-            if (valxor & 2) {
+            if (valxor & 0x02) {
                 serial_remove(dev->uart[0]);
-                if ((val & 2) && !(dev->regs[2] & 1))
+                if ((val & 0x02) && !(dev->regs[0x02] & 0x01))
                     serial_handler(dev, 0);
             }
-            if (valxor & 4) {
+            if (valxor & 0x04) {
                 serial_remove(dev->uart[1]);
-                if ((val & 4) && !(dev->regs[2] & 1))
+                if ((val & 0x04) && !(dev->regs[0x02] & 0x01))
                     serial_handler(dev, 1);
             }
             if (valxor & 0x28) {
                 fdc_remove(dev->fdc);
-                if ((val & 8) && !(dev->regs[2] & 1))
+                if ((val & 0x08) && !(dev->regs[0x02] & 0x01))
                     fdc_set_base(dev->fdc, (val & 0x20) ? FDC_SECONDARY_ADDR : FDC_PRIMARY_ADDR);
             }
             if (dev->has_ide && (valxor & 0xc0))
                 ide_handler(dev);
             break;
-        case 1:
-            if (valxor & 3) {
-                lpt1_remove();
-                if ((dev->regs[0] & 1) && !(dev->regs[2] & 1))
-                    lpt1_handler(dev);
+        case 0x01:
+            if (valxor & 0x03) {
+                lpt_port_remove(dev->lpt);
+                if ((dev->regs[0x00] & 0x01) && !(dev->regs[0x02] & 0x01))
+                    lpt_handler(dev);
             }
             if (valxor & 0xcc) {
                 serial_remove(dev->uart[0]);
-                if ((dev->regs[0] & 2) && !(dev->regs[2] & 1))
+                if ((dev->regs[0x00] & 0x02) && !(dev->regs[0x02] & 0x01))
                     serial_handler(dev, 0);
             }
             if (valxor & 0xf0) {
                 serial_remove(dev->uart[1]);
-                if ((dev->regs[0] & 4) && !(dev->regs[2] & 1))
+                if ((dev->regs[0x00] & 0x04) && !(dev->regs[0x02] & 0x01))
                     serial_handler(dev, 1);
             }
             break;
-        case 2:
-            if (valxor & 1) {
-                lpt1_remove();
+        case 0x02:
+            if (valxor & 0x01) {
+                lpt_port_remove(dev->lpt);
                 serial_remove(dev->uart[0]);
                 serial_remove(dev->uart[1]);
                 fdc_remove(dev->fdc);
 
-                if (!(val & 1)) {
-                    if (dev->regs[0] & 1)
-                        lpt1_handler(dev);
-                    if (dev->regs[0] & 2)
+                if (!(val & 0x01)) {
+                    if (dev->regs[0x00] & 0x01)
+                        lpt_handler(dev);
+                    if (dev->regs[0x00] & 0x02)
                         serial_handler(dev, 0);
-                    if (dev->regs[0] & 4)
+                    if (dev->regs[0x00] & 0x04)
                         serial_handler(dev, 1);
-                    if (dev->regs[0] & 8)
-                        fdc_set_base(dev->fdc, (dev->regs[0] & 0x20) ? FDC_SECONDARY_ADDR : FDC_PRIMARY_ADDR);
+                    if (dev->regs[0x00] & 0x08)
+                        fdc_set_base(dev->fdc, (dev->regs[0x00] & 0x20) ? FDC_SECONDARY_ADDR : FDC_PRIMARY_ADDR);
                 }
             }
-            if (valxor & 8) {
-                lpt1_remove();
-                if ((dev->regs[0] & 1) && !(dev->regs[2] & 1))
-                    lpt1_handler(dev);
+            if (valxor & 0x88) {
+                lpt_port_remove(dev->lpt);
+                if ((dev->regs[0x00] & 0x01) && !(dev->regs[0x02] & 0x01))
+                    lpt_handler(dev);
+            }
+            break;
+        case 0x04:
+            if (valxor & 0x05) {
+                lpt_port_remove(dev->lpt);
+                if ((dev->regs[0x00] & 0x01) && !(dev->regs[0x02] & 0x01))
+                    lpt_handler(dev);
+            }
+            break;
+        case 0x06:
+            if (valxor & 0x08) {
+                lpt_port_remove(dev->lpt);
+                if ((dev->regs[0x00] & 0x01) && !(dev->regs[0x02] & 0x01))
+                    lpt_handler(dev);
             }
             break;
 
@@ -259,9 +292,9 @@ pc87332_write(uint16_t port, uint8_t val, void *priv)
 }
 
 uint8_t
-pc87332_read(uint16_t port, void *priv)
+pc873xx_read(uint16_t port, void *priv)
 {
-    pc87332_t *dev = (pc87332_t *) priv;
+    pc873xx_t *dev = (pc873xx_t *) priv;
     uint8_t    ret = 0xff;
     uint8_t    index;
 
@@ -282,7 +315,7 @@ pc87332_read(uint16_t port, void *priv)
 }
 
 void
-pc87332_reset(pc87332_t *dev)
+pc873xx_reset(pc873xx_t *dev)
 {
     memset(dev->regs, 0, 15);
 
@@ -298,8 +331,8 @@ pc87332_reset(pc87332_t *dev)
         0 = 360 rpm @ 500 kbps for 3.5"
         1 = Default, 300 rpm @ 500, 300, 250, 1000 kbps for 3.5"
     */
-    lpt1_remove();
-    lpt1_handler(dev);
+    lpt_port_remove(dev->lpt);
+    lpt_handler(dev);
     serial_remove(dev->uart[0]);
     serial_remove(dev->uart[1]);
     serial_handler(dev, 0);
@@ -313,104 +346,67 @@ pc87332_reset(pc87332_t *dev)
 }
 
 static void
-pc87332_close(void *priv)
+pc873xx_close(void *priv)
 {
-    pc87332_t *dev = (pc87332_t *) priv;
+    pc873xx_t *dev = (pc873xx_t *) priv;
 
     free(dev);
 }
 
 static void *
-pc87332_init(const device_t *info)
+pc873xx_init(const device_t *info)
 {
-    pc87332_t *dev = (pc87332_t *) malloc(sizeof(pc87332_t));
-    memset(dev, 0, sizeof(pc87332_t));
+    pc873xx_t *dev = (pc873xx_t *) calloc(1, sizeof(pc873xx_t));
 
     dev->fdc = device_add(&fdc_at_nsc_device);
 
     dev->uart[0] = device_add_inst(&ns16550_device, 1);
     dev->uart[1] = device_add_inst(&ns16550_device, 2);
 
-    dev->has_ide = (info->local >> 8) & 0xff;
-    dev->fdc_on  = (info->local >> 16) & 0xff;
-    pc87332_reset(dev);
+    dev->lpt = device_add_inst(&lpt_port_device, 1);
+    lpt_set_cnfgb_readout(dev->lpt, 0x08);
 
-    if ((info->local & 0xff) == 0x01) {
-        io_sethandler(0x398, 0x0002,
-                      pc87332_read, NULL, NULL, pc87332_write, NULL, NULL, dev);
-    } else {
-        io_sethandler(0x02e, 0x0002,
-                      pc87332_read, NULL, NULL, pc87332_write, NULL, NULL, dev);
+    dev->is_332  = !!(info->local & PC87332);
+    dev->max_reg = dev->is_332 ? 0x08 : 0x02;
+
+    dev->has_ide = info->local & (PCX73XX_IDE_PRI | PCX73XX_IDE_SEC);
+    dev->fdc_on  = info->local & PCX73XX_FDC_ON;
+
+    dev->baddr   = (info->local & PCX730X_BADDR) >> PCX730X_BADDR_SHIFT;
+    pc873xx_reset(dev);
+
+    switch (dev->baddr) {
+        default:
+        case 0x00:
+            dev->base_addr = 0x0398;
+            break;
+        case 0x01:
+            dev->base_addr = 0x026e;
+            break;
+        case 0x02:
+            dev->base_addr = 0x015c;
+            break;
+        case 0x03:
+            /* Our PC87332 machine use this unless otherwise specified. */
+            dev->base_addr = 0x002e;
+            break;
     }
 
+    io_sethandler(dev->base_addr, 0x0002,
+                  pc873xx_read, NULL, NULL, pc873xx_write, NULL, NULL, dev);
+
     return dev;
 }
 
-const device_t pc87332_device = {
-    .name          = "National Semiconductor PC87332 Super I/O",
-    .internal_name = "pc87332",
+const device_t pc873xx_device = {
+    .name          = "National Semiconductor PC873xx Super I/O",
+    .internal_name = "pc873xx",
     .flags         = 0,
     .local         = 0x00,
-    .init          = pc87332_init,
-    .close         = pc87332_close,
+    .init          = pc873xx_init,
+    .close         = pc873xx_close,
     .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t pc87332_398_device = {
-    .name          = "National Semiconductor PC87332 Super I/O (Port 398h)",
-    .internal_name = "pc87332_398",
-    .flags         = 0,
-    .local         = 0x01,
-    .init          = pc87332_init,
-    .close         = pc87332_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t pc87332_398_ide_device = {
-    .name          = "National Semiconductor PC87332 Super I/O (Port 398h) (With IDE)",
-    .internal_name = "pc87332_398_ide",
-    .flags         = 0,
-    .local         = 0x101,
-    .init          = pc87332_init,
-    .close         = pc87332_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t pc87332_398_ide_sec_device = {
-    .name          = "National Semiconductor PC87332 Super I/O (Port 398h) (With Secondary IDE)",
-    .internal_name = "pc87332_398_ide_sec",
-    .flags         = 0,
-    .local         = 0x201,
-    .init          = pc87332_init,
-    .close         = pc87332_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t pc87332_398_ide_fdcon_device = {
-    .name          = "National Semiconductor PC87332 Super I/O (Port 398h) (With IDE and FDC on)",
-    .internal_name = "pc87332_398_ide_fdcon",
-    .flags         = 0,
-    .local         = 0x10101,
-    .init          = pc87332_init,
-    .close         = pc87332_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sio/sio_prime3b.c b/src/sio/sio_prime3b.c
deleted file mode 100644
index c93630516..000000000
--- a/src/sio/sio_prime3b.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Emulation of the Goldstar Prime3B Super I/O
- *
- *
- *
- * Authors: Tiseno100
- *
- *          Copyright 2021 Tiseno100
- */
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include <86box/io.h>
-#include <86box/timer.h>
-#include <86box/device.h>
-#include <86box/lpt.h>
-#include <86box/serial.h>
-#include <86box/hdc.h>
-#include <86box/hdc_ide.h>
-#include <86box/fdd.h>
-#include <86box/fdc.h>
-#include <86box/sio.h>
-#include <86box/plat_unused.h>
-
-#define FSR                   dev->regs[0xa0]
-#define ASR                   dev->regs[0xa1]
-#define PDR                   dev->regs[0xa2]
-#define HAS_IDE_FUNCTIONALITY dev->ide_function
-
-#ifdef ENABLE_PRIME3B_LOG
-int prime3b_do_log = ENABLE_PRIME3B_LOG;
-
-static void
-prime3b_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (prime3b_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define prime3b_log(fmt, ...)
-#endif
-
-typedef struct prime3b_t {
-    uint8_t  index;
-    uint8_t  regs[256];
-    uint8_t  cfg_lock;
-    uint8_t  ide_function;
-    uint16_t com3_addr;
-    uint16_t com4_addr;
-
-    fdc_t    *fdc_controller;
-    serial_t *uart[2];
-
-} prime3b_t;
-
-void prime3b_fdc_handler(prime3b_t *dev);
-void prime3b_uart_handler(uint8_t num, prime3b_t *dev);
-void prime3b_lpt_handler(prime3b_t *dev);
-void prime3b_ide_handler(prime3b_t *dev);
-void prime3b_enable(prime3b_t *dev);
-void prime3b_powerdown(prime3b_t *dev);
-
-static void
-prime3b_write(uint16_t addr, uint8_t val, void *priv)
-{
-    prime3b_t *dev = (prime3b_t *) priv;
-
-    if (addr == 0x398) {
-        dev->index = val;
-
-        /* Enter/Escape Configuration Mode */
-        if (val == 0x33)
-            dev->cfg_lock = 0;
-        else if (val == 0xcc)
-            dev->cfg_lock = 1;
-    } else if ((addr == 0x399) && !dev->cfg_lock) {
-        switch (dev->index) {
-            case 0xa0: /* Function Selection Register (FSR) */
-                FSR = val;
-                prime3b_enable(dev);
-                break;
-            case 0xa1: /* Address Selection Register (ASR) */
-                ASR = val;
-                prime3b_enable(dev);
-                break;
-            case 0xa2: /* Power Down Register (PDR) */
-                dev->regs[0xa2] = val;
-                break;
-            case 0xa3: /* Test Mode Register (TMR) */
-                dev->regs[0xa3] = val;
-                break;
-            case 0xa4: /* Miscellaneous Function Register */
-                dev->regs[0xa4] = val;
-                switch ((dev->regs[0xa4] >> 6) & 3) {
-                    case 0:
-                        dev->com3_addr = COM3_ADDR;
-                        dev->com4_addr = COM4_ADDR;
-                        break;
-                    case 1:
-                        dev->com3_addr = 0x338;
-                        dev->com4_addr = 0x238;
-                        break;
-                    case 2:
-                        dev->com3_addr = COM4_ADDR;
-                        dev->com4_addr = 0x2e0;
-                        break;
-                    case 3:
-                        dev->com3_addr = 0x220;
-                        dev->com4_addr = 0x228;
-                        break;
-
-                    default:
-                        break;
-                }
-                break;
-            case 0xa5: /* ECP Register */
-                dev->regs[0xa5] = val;
-                break;
-
-            default:
-                break;
-        }
-    }
-}
-
-static uint8_t
-prime3b_read(UNUSED(uint16_t addr), void *priv)
-{
-    const prime3b_t *dev = (prime3b_t *) priv;
-
-    return dev->regs[dev->index];
-}
-
-void
-prime3b_fdc_handler(prime3b_t *dev)
-{
-    uint16_t fdc_base = !(ASR & 0x40) ? FDC_PRIMARY_ADDR : FDC_SECONDARY_ADDR;
-    fdc_remove(dev->fdc_controller);
-    fdc_set_base(dev->fdc_controller, fdc_base);
-    prime3b_log("Prime3B-FDC: Enabled with base %03x\n", fdc_base);
-}
-
-void
-prime3b_uart_handler(uint8_t num, prime3b_t *dev)
-{
-    uint16_t uart_base;
-    if ((ASR >> (3 + 2 * num)) & 1)
-        uart_base = !((ASR >> (2 + 2 * num)) & 1) ? dev->com3_addr : dev->com4_addr;
-    else
-        uart_base = !((ASR >> (2 + 2 * num)) & 1) ? COM1_ADDR : COM2_ADDR;
-
-    serial_remove(dev->uart[num]);
-    serial_setup(dev->uart[num], uart_base, 4 - num);
-    prime3b_log("Prime3B-UART%d: Enabled with base %03x\n", num, uart_base);
-}
-
-void
-prime3b_lpt_handler(prime3b_t *dev)
-{
-    uint16_t lpt_base = (ASR & 2) ? LPT_MDA_ADDR : (!(ASR & 1) ? LPT1_ADDR : LPT2_ADDR);
-    lpt1_remove();
-    lpt1_init(lpt_base);
-    lpt1_irq(LPT1_IRQ);
-    prime3b_log("Prime3B-LPT: Enabled with base %03x\n", lpt_base);
-}
-
-void
-prime3b_ide_handler(prime3b_t *dev)
-{
-    ide_pri_disable();
-    uint16_t ide_base = !(ASR & 0x80) ? 0x1f0 : 0x170;
-    uint16_t ide_side = ide_base + 0x206;
-    ide_set_base(0, ide_base);
-    ide_set_side(0, ide_side);
-    prime3b_log("Prime3B-IDE: Enabled with base %03x and side %03x\n", ide_base, ide_side);
-}
-
-void
-prime3b_enable(prime3b_t *dev)
-{
-    /*
-        Simulate a device enable/disable scenario
-
-            Register A0: Function Selection Register (FSR)
-            Bit 7: Gameport
-            Bit 6: 4 FDD Enable
-            Bit 5: IDE
-            Bit 4: FDC
-            Bit 3: UART 2
-            Bit 2: UART 1
-            Bit 1/0: PIO (0/0 Bidirectional , 0/1 ECP, 1/0 EPP, 1/1 Disabled)
-
-            Note: 86Box LPT is simplistic and can't do ECP or EPP.
-    */
-
-    !(FSR & 3) ? prime3b_lpt_handler(dev) : lpt1_remove();
-    (FSR & 4) ? prime3b_uart_handler(0, dev) : serial_remove(dev->uart[0]);
-    (FSR & 8) ? prime3b_uart_handler(1, dev) : serial_remove(dev->uart[1]);
-    (FSR & 0x10) ? prime3b_fdc_handler(dev) : fdc_remove(dev->fdc_controller);
-    if (HAS_IDE_FUNCTIONALITY)
-        (FSR & 0x20) ? prime3b_ide_handler(dev) : ide_pri_disable();
-}
-
-void
-prime3b_powerdown(prime3b_t *dev)
-{
-    /* Note: It can be done more efficiently for sure */
-    uint8_t old_base = PDR;
-
-    if (PDR & 1)
-        PDR |= 0x1e;
-
-    if (PDR & 0x40)
-        io_removehandler(0x0398, 0x0002, prime3b_read, NULL, NULL, prime3b_write, NULL, NULL, dev);
-
-    if (PDR & 2)
-        fdc_remove(dev->fdc_controller);
-
-    if (PDR & 4)
-        serial_remove(dev->uart[0]);
-
-    if (PDR & 8)
-        serial_remove(dev->uart[1]);
-
-    if (PDR & 0x10)
-        lpt1_remove();
-
-    if (PDR & 1)
-        PDR = old_base;
-}
-
-static void
-prime3b_close(void *priv)
-{
-    prime3b_t *dev = (prime3b_t *) priv;
-
-    free(dev);
-}
-
-static void *
-prime3b_init(const device_t *info)
-{
-    prime3b_t *dev = (prime3b_t *) malloc(sizeof(prime3b_t));
-    memset(dev, 0, sizeof(prime3b_t));
-
-    /* Avoid conflicting with machines that make no use of the Prime3B Internal IDE */
-    HAS_IDE_FUNCTIONALITY = info->local;
-
-    dev->regs[0xa0] = 3;
-
-    dev->fdc_controller = device_add(&fdc_at_device);
-    dev->uart[0]        = device_add_inst(&ns16550_device, 1);
-    dev->uart[1]        = device_add_inst(&ns16550_device, 2);
-    if (HAS_IDE_FUNCTIONALITY)
-        device_add(&ide_isa_device);
-
-    dev->com3_addr = COM3_ADDR;
-    dev->com4_addr = COM4_ADDR;
-    fdc_reset(dev->fdc_controller);
-
-    prime3b_enable(dev);
-
-    io_sethandler(0x0398, 0x0002, prime3b_read, NULL, NULL, prime3b_write, NULL, NULL, dev);
-
-    return dev;
-}
-
-const device_t prime3b_device = {
-    .name          = "Goldstar Prime3B",
-    .internal_name = "prime3b",
-    .flags         = 0,
-    .local         = 0,
-    .init          = prime3b_init,
-    .close         = prime3b_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t prime3b_ide_device = {
-    .name          = "Goldstar Prime3B with IDE functionality",
-    .internal_name = "prime3b_ide",
-    .flags         = 0,
-    .local         = 1,
-    .init          = prime3b_init,
-    .close         = prime3b_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
diff --git a/src/sio/sio_prime3c.c b/src/sio/sio_prime3c.c
deleted file mode 100644
index b19f861bf..000000000
--- a/src/sio/sio_prime3c.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Emulation of the LG Prime3C Super I/O
- *
- *
- *
- * Authors: Tiseno100
- *
- *          Copyright 2020 Tiseno100
- */
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include <86box/io.h>
-#include <86box/timer.h>
-#include <86box/device.h>
-#include <86box/lpt.h>
-#include <86box/serial.h>
-#include <86box/hdc.h>
-#include <86box/hdc_ide.h>
-#include <86box/fdd.h>
-#include <86box/fdc.h>
-#include <86box/sio.h>
-#include <86box/plat_unused.h>
-
-#ifdef ENABLE_PRIME3C_LOG
-int prime3c_do_log = ENABLE_PRIME3C_LOG;
-
-static void
-prime3c_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (prime3c_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define prime3c_log(fmt, ...)
-#endif
-
-/* Function Select(Note on prime3c_enable) */
-#define FUNCTION_SELECT dev->regs[0xc2]
-
-/* Base Address Registers */
-#define FDC_BASE_ADDRESS   dev->regs[0xc3]
-#define IDE_BASE_ADDRESS   dev->regs[0xc4]
-#define IDE_SIDE_ADDRESS   dev->regs[0xc5]
-#define LPT_BASE_ADDRESS   dev->regs[0xc6]
-#define UART1_BASE_ADDRESS dev->regs[0xc7]
-#define UART2_BASE_ADDRESS dev->regs[0xc8]
-
-/* FDC/LPT Configuration */
-#define FDC_LPT_DMA dev->regs[0xc9]
-#define FDC_LPT_IRQ dev->regs[0xca]
-
-/* UART 1/2 Configuration */
-#define UART_IRQ dev->regs[0xcb]
-
-/* Miscellaneous Configuration*/
-#define FDC_SWAP (dev->regs[0xd6] & 0x01)
-
-/* IDE functionality(Note on Init) */
-#define HAS_IDE_FUNCTIONALITY dev->ide_function
-
-typedef struct prime3c_t {
-    uint8_t index;
-    uint8_t regs[256];
-    uint8_t cfg_lock;
-    uint8_t ide_function;
-
-    fdc_t    *fdc_controller;
-    serial_t *uart[2];
-
-} prime3c_t;
-
-void prime3c_fdc_handler(prime3c_t *dev);
-void prime3c_uart_handler(uint8_t num, prime3c_t *dev);
-void prime3c_lpt_handler(prime3c_t *dev);
-void prime3c_ide_handler(prime3c_t *dev);
-void prime3c_enable(prime3c_t *dev);
-
-static void
-prime3c_write(uint16_t addr, uint8_t val, void *priv)
-{
-    prime3c_t *dev = (prime3c_t *) priv;
-
-    switch (addr) {
-        case 0x398:
-            dev->index = val;
-
-            /* Enter/Escape Configuration Mode */
-            if (val == 0x33)
-                dev->cfg_lock = 0;
-            else if (val == 0x55)
-                dev->cfg_lock = 1;
-            break;
-
-        case 0x399:
-            if (!dev->cfg_lock) {
-                switch (dev->index) {
-                    case 0xc2:
-                        FUNCTION_SELECT = val & 0xbf;
-                        prime3c_enable(dev);
-                        break;
-
-                    case 0xc3:
-                        FDC_BASE_ADDRESS = val & 0xfc;
-                        prime3c_fdc_handler(dev);
-                        break;
-
-                    case 0xc4:
-                        IDE_BASE_ADDRESS = val & 0xfc;
-                        if (HAS_IDE_FUNCTIONALITY)
-                            prime3c_ide_handler(dev);
-                        break;
-
-                    case 0xc5:
-                        IDE_SIDE_ADDRESS = (val & 0xfc) | 0x02;
-                        if (HAS_IDE_FUNCTIONALITY)
-                            prime3c_ide_handler(dev);
-                        break;
-
-                    case 0xc6:
-                        LPT_BASE_ADDRESS = val;
-                        break;
-
-                    case 0xc7:
-                        UART1_BASE_ADDRESS = val & 0xfe;
-                        prime3c_uart_handler(0, dev);
-                        break;
-
-                    case 0xc8:
-                        UART2_BASE_ADDRESS = val & 0xfe;
-                        prime3c_uart_handler(1, dev);
-                        break;
-
-                    case 0xc9:
-                        FDC_LPT_DMA = val;
-                        prime3c_fdc_handler(dev);
-                        break;
-
-                    case 0xca:
-                        FDC_LPT_IRQ = val;
-                        prime3c_fdc_handler(dev);
-                        prime3c_lpt_handler(dev);
-                        break;
-
-                    case 0xcb:
-                        UART_IRQ = val;
-                        prime3c_uart_handler(0, dev);
-                        prime3c_uart_handler(1, dev);
-                        break;
-
-                    case 0xcd:
-                    case 0xce:
-                        dev->regs[dev->index] = val;
-                        break;
-
-                    case 0xcf:
-                        dev->regs[dev->index] = val & 0x3f;
-                        break;
-
-                    case 0xd0:
-                        dev->regs[dev->index] = val & 0xfc;
-                        break;
-
-                    case 0xd1:
-                        dev->regs[dev->index] = val & 0x3f;
-                        break;
-
-                    case 0xd3:
-                        dev->regs[dev->index] = val & 0x7c;
-                        break;
-
-                    case 0xd5:
-                    case 0xd6:
-                    case 0xd7:
-                    case 0xd8:
-                        dev->regs[dev->index] = val;
-                        break;
-
-                    default:
-                        break;
-                }
-            }
-            break;
-
-        default:
-            break;
-    }
-}
-
-static uint8_t
-prime3c_read(UNUSED(uint16_t addr), void *priv)
-{
-    const prime3c_t *dev = (prime3c_t *) priv;
-
-    return dev->regs[dev->index];
-}
-
-void
-prime3c_fdc_handler(prime3c_t *dev)
-{
-    fdc_remove(dev->fdc_controller);
-    if (FUNCTION_SELECT & 0x10) {
-        fdc_set_base(dev->fdc_controller, FDC_BASE_ADDRESS << 2);
-        fdc_set_irq(dev->fdc_controller, (FDC_LPT_IRQ >> 4) & 0xf);
-        fdc_set_dma_ch(dev->fdc_controller, (FDC_LPT_DMA >> 4) & 0xf);
-        fdc_set_swap(dev->fdc_controller, FDC_SWAP);
-        prime3c_log("Prime3C-FDC: BASE %04x IRQ %01x DMA %01x\n", FDC_BASE_ADDRESS << 2, (FDC_LPT_IRQ >> 4) & 0xf, (FDC_LPT_DMA >> 4) & 0xf);
-    }
-}
-
-void
-prime3c_uart_handler(uint8_t num, prime3c_t *dev)
-{
-    serial_remove(dev->uart[num & 1]);
-    if (FUNCTION_SELECT & (!(num & 1) ? 0x04 : 0x08)) {
-        serial_setup(dev->uart[num & 1], (!(num & 1) ? UART1_BASE_ADDRESS : UART2_BASE_ADDRESS) << 2, (UART_IRQ >> (!(num & 1) ? 4 : 0)) & 0xf);
-        prime3c_log("Prime3C-UART%01x: BASE %04x IRQ %01x\n", num & 1, (!(num & 1) ? UART1_BASE_ADDRESS : UART2_BASE_ADDRESS) << 2, (UART_IRQ >> (!(num & 1) ? 4 : 0)) & 0xf);
-    }
-}
-
-void
-prime3c_lpt_handler(prime3c_t *dev)
-{
-    lpt1_remove();
-    if (!(FUNCTION_SELECT & 0x03)) {
-
-        lpt1_init(LPT_BASE_ADDRESS << 2);
-        lpt1_irq(FDC_LPT_IRQ & 0xf);
-        prime3c_log("Prime3C-LPT: BASE %04x IRQ %02x\n", LPT_BASE_ADDRESS << 2, FDC_LPT_IRQ & 0xf);
-    }
-}
-
-void
-prime3c_ide_handler(prime3c_t *dev)
-{
-    ide_pri_disable();
-    if (FUNCTION_SELECT & 0x20) {
-        ide_set_base(0, IDE_BASE_ADDRESS << 2);
-        ide_set_side(0, IDE_SIDE_ADDRESS << 2);
-        ide_pri_enable();
-        prime3c_log("Prime3C-IDE: BASE %04x SIDE %04x\n", IDE_BASE_ADDRESS << 2, IDE_SIDE_ADDRESS << 2);
-    }
-}
-
-void
-prime3c_enable(prime3c_t *dev)
-{
-    /*
-    Simulate a device enable/disable scenario
-
-    Register C2: Function Select
-    Bit 7: Gameport
-    Bit 6: Reserved
-    Bit 5: IDE
-    Bit 4: FDC
-    Bit 3: UART 2
-    Bit 2: UART 1
-    Bit 1/0: PIO (0/0 Unidirectional , 0/1 ECP, 1/0 EPP, 1/1 Disabled)
-
-    Note: 86Box LPT is simplistic and can't do ECP or EPP.
-    */
-
-    !(FUNCTION_SELECT & 0x03) ? prime3c_lpt_handler(dev) : lpt1_remove();
-    (FUNCTION_SELECT & 0x04) ? prime3c_uart_handler(0, dev) : serial_remove(dev->uart[0]);
-    (FUNCTION_SELECT & 0x08) ? prime3c_uart_handler(1, dev) : serial_remove(dev->uart[1]);
-    (FUNCTION_SELECT & 0x10) ? prime3c_fdc_handler(dev) : fdc_remove(dev->fdc_controller);
-    if (HAS_IDE_FUNCTIONALITY)
-        (FUNCTION_SELECT & 0x20) ? prime3c_ide_handler(dev) : ide_pri_disable();
-}
-
-static void
-prime3c_close(void *priv)
-{
-    prime3c_t *dev = (prime3c_t *) priv;
-
-    free(dev);
-}
-
-static void *
-prime3c_init(const device_t *info)
-{
-    prime3c_t *dev = (prime3c_t *) malloc(sizeof(prime3c_t));
-    memset(dev, 0, sizeof(prime3c_t));
-
-    /* Avoid conflicting with machines that make no use of the Prime3C Internal IDE */
-    HAS_IDE_FUNCTIONALITY = info->local;
-
-    dev->regs[0xc0] = 0x3c;
-    dev->regs[0xc2] = 0x03;
-    dev->regs[0xc3] = 0x3c;
-    dev->regs[0xc4] = 0x3c;
-    dev->regs[0xc5] = 0x3d;
-    dev->regs[0xd5] = 0x3c;
-
-    dev->fdc_controller = device_add(&fdc_at_device);
-    dev->uart[0]        = device_add_inst(&ns16550_device, 1);
-    dev->uart[1]        = device_add_inst(&ns16550_device, 2);
-    if (HAS_IDE_FUNCTIONALITY)
-        device_add(&ide_isa_device);
-
-    prime3c_fdc_handler(dev);
-    prime3c_uart_handler(0, dev);
-    prime3c_uart_handler(1, dev);
-    prime3c_lpt_handler(dev);
-    if (HAS_IDE_FUNCTIONALITY)
-        prime3c_ide_handler(dev);
-
-    io_sethandler(0x0398, 0x0002, prime3c_read, NULL, NULL, prime3c_write, NULL, NULL, dev);
-
-    return dev;
-}
-
-const device_t prime3c_device = {
-    .name          = "Goldstar Prime3C",
-    .internal_name = "prime3c",
-    .flags         = 0,
-    .local         = 0,
-    .init          = prime3c_init,
-    .close         = prime3c_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t prime3c_ide_device = {
-    .name          = "Goldstar Prime3C with IDE functionality",
-    .internal_name = "prime3c_ide",
-    .flags         = 0,
-    .local         = 1,
-    .init          = prime3c_init,
-    .close         = prime3c_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
diff --git a/src/sio/sio_um8669f.c b/src/sio/sio_um8669f.c
index 136b1add6..96c37573d 100644
--- a/src/sio/sio_um8669f.c
+++ b/src/sio/sio_um8669f.c
@@ -8,8 +8,6 @@
  *
  *          Emulation of the UMC UM8669F Super I/O chip.
  *
- *
- *
  * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
  *          Miran Grca, <mgrca8@gmail.com>
  *          RichardG, <richardg867@gmail.com>
@@ -92,7 +90,8 @@ static uint8_t um8669f_pnp_rom[] = {
 
     0x15, 0x41, 0xd0, 0x04, 0x00, 0x01,             /* logical device PNP0400, can participate in boot */
     0x22, 0xfa, 0x1f,                               /* IRQ 1/3/4/5/6/7/8/9/10/11/12 */
-    0x47, 0x00, 0x00, 0x01, 0xf8, 0x03, 0x08, 0x08, /* I/O 0x100-0x3F8, decodes 10-bit, 8-byte alignment, 8 addresses */
+    0x2a, 0x0f, 0x0c,                               /* DMA 0/1/2/3, compatibility, no count by word, count by byte, is bus master, 8-bit only */
+    0x47, 0x01, 0x00, 0x01, 0xf8, 0x0f, 0x08, 0x08, /* I/O 0x100-0x3F8, decodes 16-bit, 8-byte alignment, 8 addresses */
 
     0x15, 0x41, 0xd0, 0x06, 0x00, 0x01,             /* logical device PNP0600, can participate in boot */
     0x22, 0xfa, 0x1f,                               /* IRQ 1/3/4/5/6/7/8/9/10/11/12 */
@@ -120,7 +119,8 @@ static const isapnp_device_config_t um8669f_pnp_defaults[] = {
     }, {
         .activate = 1,
         .io = { { .base = LPT1_ADDR }, },
-        .irq = { { .irq = LPT1_IRQ }, }
+        .irq = { { .irq = LPT1_IRQ }, },
+        .dma = { { .dma = 3 }, }
     }, {
         .activate = 0,
         .io = { { .base = 0x1f0 }, },
@@ -157,6 +157,7 @@ typedef struct um8669f_t {
 
     fdc_t    *fdc;
     serial_t *uart[2];
+    lpt_t *   lpt;
     uint8_t   ide;
     void     *gameport;
 } um8669f_t;
@@ -203,11 +204,14 @@ um8669f_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *pri
             break;
 
         case 3:
-            lpt1_remove();
+            lpt_port_remove(dev->lpt);
 
             if (config->activate && (config->io[0].base != ISAPNP_IO_DISABLED)) {
                 um8669f_log("UM8669F: LPT enabled at port %04X IRQ %d\n", config->io[0].base, config->irq[0].irq);
-                lpt1_init(config->io[0].base);
+                lpt_port_setup(dev->lpt, config->io[0].base);
+
+                lpt_port_irq(dev->lpt, config->irq[0].irq);
+                lpt_port_dma(dev->lpt, (config->dma[0].dma == ISAPNP_DMA_DISABLED) ? -1 : config->dma[0].dma);
             } else {
                 um8669f_log("UM8669F: LPT disabled\n");
             }
@@ -267,6 +271,9 @@ um8669f_write(uint16_t port, uint8_t val, void *priv)
             if (dev->cur_reg == 0xc1) {
                 um8669f_log("UM8669F: ISAPnP %sabled\n", (val & 0x80) ? "en" : "dis");
                 isapnp_enable_card(dev->pnp_card, (val & 0x80) ? ISAPNP_CARD_FORCE_CONFIG : ISAPNP_CARD_DISABLE);
+            } else if (dev->cur_reg == 0xc0) {
+                lpt_set_epp(dev->lpt, val & 0x08);
+                lpt_set_ecp(dev->lpt, val & 0x10);
             }
         }
     }
@@ -301,7 +308,10 @@ um8669f_reset(um8669f_t *dev)
 
     serial_remove(dev->uart[1]);
 
-    lpt1_remove();
+    lpt_port_remove(dev->lpt);
+
+    lpt_set_epp(dev->lpt, 0);
+    lpt_set_ecp(dev->lpt, 0);
 
     if (dev->ide < IDE_BUS_MAX)
         ide_remove_handlers(dev->ide);
@@ -328,8 +338,7 @@ um8669f_init(const device_t *info)
 {
     um8669f_log("UM8669F: init(%02X)\n", info->local);
 
-    um8669f_t *dev = (um8669f_t *) malloc(sizeof(um8669f_t));
-    memset(dev, 0, sizeof(um8669f_t));
+    um8669f_t *dev = (um8669f_t *) calloc(1, sizeof(um8669f_t));
 
     dev->pnp_card = isapnp_add_card(um8669f_pnp_rom, sizeof(um8669f_pnp_rom), um8669f_pnp_config_changed, NULL, NULL, NULL, dev);
     for (uint8_t i = 0; i < (sizeof(um8669f_pnp_defaults) / sizeof(isapnp_device_config_t)); i++)
@@ -340,7 +349,12 @@ um8669f_init(const device_t *info)
     dev->uart[0] = device_add_inst(&ns16550_device, 1);
     dev->uart[1] = device_add_inst(&ns16550_device, 2);
 
-    dev->ide = info->local;
+    dev->lpt = device_add_inst(&lpt_port_device, 1);
+
+    lpt_set_cnfgb_readout(dev->lpt, 0x00);
+    lpt_set_ext(dev->lpt, 1);
+
+    dev->ide = (uint8_t) (info->local - 1);
     if (dev->ide < IDE_BUS_MAX)
         device_add(&ide_isa_device);
 
@@ -358,39 +372,11 @@ const device_t um8669f_device = {
     .name          = "UMC UM8669F Super I/O",
     .internal_name = "um8669f",
     .flags         = 0,
-    .local         = 0xff,
-    .init          = um8669f_init,
-    .close         = um8669f_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t um8669f_ide_device = {
-    .name          = "UMC UM8669F Super I/O (With IDE)",
-    .internal_name = "um8669f_ide",
-    .flags         = 0,
     .local         = 0,
     .init          = um8669f_init,
     .close         = um8669f_close,
     .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t um8669f_ide_sec_device = {
-    .name          = "UMC UM8669F Super I/O (With Secondary IDE)",
-    .internal_name = "um8669f_ide_sec",
-    .flags         = 0,
-    .local         = 1,
-    .init          = um8669f_init,
-    .close         = um8669f_close,
-    .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sio/sio_um866x.c b/src/sio/sio_um866x.c
new file mode 100644
index 000000000..0c6f04484
--- /dev/null
+++ b/src/sio/sio_um866x.c
@@ -0,0 +1,327 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the UMC UM82C862F, UM82C863F, UM86863F,
+ *          and UM8663BF Super I/O chips.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2024 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/pci.h>
+#include <86box/lpt.h>
+#include <86box/serial.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/gameport.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/sio.h>
+#include <86box/random.h>
+#include <86box/plat_unused.h>
+
+#ifdef ENABLE_UM866X_LOG
+int um866x_do_log = ENABLE_UM866X_LOG;
+
+static void
+um866x_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (um866x_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define um866x_log(fmt, ...)
+#endif
+
+typedef struct um866x_t {
+    uint8_t max_reg;
+    uint8_t ide;
+    uint8_t locked;
+    uint8_t cur_reg;
+    uint8_t regs[5];
+
+    fdc_t    *fdc;
+
+    serial_t *uart[2];
+    lpt_t *   lpt;
+} um866x_t;
+
+static void
+um866x_fdc_handler(um866x_t *dev)
+{
+    fdc_remove(dev->fdc);
+    if (dev->regs[0] & 0x01)
+        fdc_set_base(dev->fdc, (dev->regs[1] & 0x01) ? FDC_PRIMARY_ADDR : FDC_SECONDARY_ADDR);
+}
+
+static void
+um866x_uart_handler(um866x_t *dev, int port)
+{
+    uint8_t shift     = (port + 1);
+
+    serial_remove(dev->uart[port]);
+    if (dev->regs[0] & (2 << port)) {
+        switch ((dev->regs[1] >> shift) & 0x01) {
+            case 0x00:
+                if (port == 1)
+                    serial_setup(dev->uart[port], COM4_ADDR, COM4_IRQ);
+                else
+                    serial_setup(dev->uart[port], COM3_ADDR, COM1_IRQ);
+                break;
+            case 0x01:
+                if (port == 1)
+                    serial_setup(dev->uart[port], COM2_ADDR, COM2_IRQ);
+                else
+                    serial_setup(dev->uart[port], COM1_ADDR, COM1_IRQ);
+                break;
+
+            default:
+                break;
+        }
+    }
+}
+
+static void
+um866x_lpt_handler(um866x_t *dev)
+{
+    int enabled = (dev->regs[0] & 0x08);
+
+    lpt_port_remove(dev->lpt);
+    if (dev->max_reg != 0x00) {
+        switch(dev->regs[1] & 0xc0) {
+            case 0x00:
+                enabled = 0;
+                break;
+            case 0x40:
+                lpt_set_epp(dev->lpt, 1);
+                lpt_set_ecp(dev->lpt, 0);
+                lpt_set_ext(dev->lpt, 0);
+                break;
+            case 0x80:
+                lpt_set_epp(dev->lpt, 0);
+                lpt_set_ecp(dev->lpt, 0);
+                lpt_set_ext(dev->lpt, 1);
+                break;
+            case 0xc0:
+                lpt_set_epp(dev->lpt, 0);
+                lpt_set_ecp(dev->lpt, 1);
+                lpt_set_ext(dev->lpt, 0);
+                break;
+        }
+    }
+    if (enabled) {
+        switch ((dev->regs[1] >> 3) & 0x01) {
+            case 0x01:
+                lpt_port_setup(dev->lpt, LPT1_ADDR);
+                lpt_port_irq(dev->lpt, LPT1_IRQ);
+                break;
+            case 0x00:
+                lpt_port_setup(dev->lpt, LPT2_ADDR);
+                lpt_port_irq(dev->lpt, LPT2_IRQ);
+                break;
+
+            default:
+                break;
+        }
+    }
+}
+
+static void
+um866x_ide_handler(um866x_t *dev)
+{
+    int board = dev->ide - 1;
+
+    if (dev->ide > 0) {
+        ide_handlers(board, 0);
+        ide_set_base(board, (dev->regs[1] & 0x10) ? 0x01f0 : 0x0170);
+        ide_set_side(board, (dev->regs[1] & 0x10) ? 0x03f6 : 0x0376);
+        if (dev->regs[0] & 0x10)
+            ide_handlers(board, 1);
+    }
+}
+
+static void
+um866x_write(uint16_t port, uint8_t val, void *priv)
+{
+    um866x_t *dev = (um866x_t *) priv;
+    uint8_t valxor;
+
+    um866x_log("UM866X: write(%04X, %02X)\n", port, val);
+
+    if (dev->locked) {
+        if ((port == 0x108) && (val == 0xaa))
+            dev->locked = 0;
+    } else {
+        if (port == 0x108) {
+            if (val == 0x55)
+                dev->locked = 1;
+            else
+                dev->cur_reg = val;
+        } else if ((dev->cur_reg >= 0xc0) && (dev->cur_reg <= dev->max_reg)) {
+            valxor = (dev->regs[dev->cur_reg - 0xc0] ^ val);
+            dev->regs[dev->cur_reg - 0xc0] = val;
+            switch (dev->cur_reg - 0xc0) {
+                /* Port enable register. */
+                case 0x00:
+                    if (valxor & 0x10)
+                        um866x_ide_handler(dev);
+                    if (valxor & 0x08)
+                        um866x_lpt_handler(dev);
+                    if (valxor & 0x04)
+                        um866x_uart_handler(dev, 1);
+                    if (valxor & 0x02)
+                        um866x_uart_handler(dev, 0);
+                    if (valxor & 0x01)
+                        um866x_fdc_handler(dev);
+                    break;
+                /*
+                   Port configuration register:
+                   - Bits 7, 6:
+                     - 0, 0 = LPT 1 is none;
+                     - 0, 1 = LPT 1 is EPP;
+                     - 1, 0 = LPT 1 is SPP;
+                     - 1, 1 = LPT 1 is ECP;
+                   - Bit 4 = 0 = IDE is secondary, 1 = IDE is primary;
+                   - Bit 3 = 0 = LPT 1 is 278h, 1 = LPT 1 is 378h;
+                   - Bit 2 = 0 = UART 2 is COM4, 1 = UART 2 is COM2;
+                   - Bit 1 = 0 = UART 1 is COM3, 1 = UART 2 is COM1;
+                   - Bit 0 = 0 = FDC is 370h, 1 = UART 2 is 3f0h.
+                  */
+                case 0x01:
+                    if (valxor & 0xc8)
+                        um866x_lpt_handler(dev);
+                    if (valxor & 0x10)
+                        um866x_ide_handler(dev);
+                    if (valxor & 0x04)
+                        um866x_uart_handler(dev, 1);
+                    if (valxor & 0x02)
+                        um866x_uart_handler(dev, 0);
+                    if (valxor & 0x01)
+                        um866x_fdc_handler(dev);
+                    break;
+            }
+        }
+    }
+}
+
+static uint8_t
+um866x_read(uint16_t port, void *priv)
+{
+    const um866x_t *dev = (um866x_t *) priv;
+    uint8_t          ret = 0xff;
+
+    if (!dev->locked) {
+        if (port == 0x108)
+            ret = dev->cur_reg; /* ??? */
+        else if ((dev->cur_reg >= 0xc0) && (dev->cur_reg <= dev->max_reg)) {
+            ret = dev->regs[dev->cur_reg - 0xc0];
+            if (dev->cur_reg == 0xc0)
+                ret = (ret & 0x1f) | ((random_generate() & 0x07) << 5);
+        }
+    }
+
+    um866x_log("UM866X: read(%04X) = %02X\n", port, ret);
+
+    return ret;
+}
+
+static void
+um866x_reset(void *priv)
+{
+    um866x_t *dev = (um866x_t *) priv;
+
+    serial_remove(dev->uart[0]);
+    serial_setup(dev->uart[0], COM1_ADDR, COM1_IRQ);
+
+    serial_remove(dev->uart[1]);
+    serial_setup(dev->uart[1], COM2_ADDR, COM2_IRQ);
+
+    lpt_port_remove(dev->lpt);
+    lpt_port_setup(dev->lpt, LPT1_ADDR);
+
+    fdc_reset(dev->fdc);
+    fdc_remove(dev->fdc);
+
+    memset(dev->regs, 0x00, sizeof(dev->regs));
+
+    dev->regs[0x00] = (dev->ide > 0) ? 0x1f : 0x0f;
+    dev->regs[0x01] = (dev->ide == 2) ? 0x0f : 0x1f;
+
+    um866x_fdc_handler(dev);
+    um866x_uart_handler(dev, 0);
+    um866x_uart_handler(dev, 1);
+    um866x_lpt_handler(dev);
+    um866x_ide_handler(dev);
+
+    dev->locked = 1;
+}
+
+static void
+um866x_close(void *priv)
+{
+    um866x_t *dev = (um866x_t *) priv;
+
+    free(dev);
+}
+
+static void *
+um866x_init(UNUSED(const device_t *info))
+{
+    um866x_t *dev = (um866x_t *) calloc(1, sizeof(um866x_t));
+
+    dev->fdc = device_add(&fdc_at_smc_device);
+
+    dev->uart[0] = device_add_inst(&ns16550_device, 1);
+    dev->uart[1] = device_add_inst(&ns16550_device, 2);
+
+    dev->lpt = device_add_inst(&lpt_port_device, 1);
+    lpt_set_cnfgb_readout(dev->lpt, 0x00);
+
+    dev->ide = info->local & 0xff;
+    if (dev->ide < IDE_BUS_MAX)
+        device_add(&ide_isa_device);
+
+    dev->max_reg = info->local >> 8;
+
+    if (dev->max_reg != 0x00)
+        io_sethandler(0x0108, 0x0002, um866x_read, NULL, NULL, um866x_write, NULL, NULL, dev);
+
+    um866x_reset(dev);
+
+    return dev;
+}
+
+const device_t um866x_device = {
+    .name          = "UMC UM82C86x/866x Super I/O",
+    .internal_name = "um866x",
+    .flags         = 0,
+    .local         = 0,
+    .init          = um866x_init,
+    .close         = um866x_close,
+    .reset         = um866x_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/sio/sio_vl82c113.c b/src/sio/sio_vl82c113.c
new file mode 100644
index 000000000..bf63e9023
--- /dev/null
+++ b/src/sio/sio_vl82c113.c
@@ -0,0 +1,168 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the VLSI VL82c113 Combination I/O Chip.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2024 Miran Grca.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/device.h>
+#include <86box/keyboard.h>
+#include <86box/machine.h>
+#include <86box/nvr.h>
+#include <86box/sio.h>
+#include <86box/plat_unused.h>
+
+typedef struct vl82c113_t {
+    uint8_t       index;
+    uint8_t       nvr_enabled;
+    uint8_t       regs[3];
+    uint8_t       pad;
+    uint16_t      nvr_base;
+    int           cur_reg;
+    nvr_t        *nvr;
+    void         *kbc;
+} vl82c113_t;
+
+static void
+vl82c113_nvr_handler(vl82c113_t *dev)
+{
+    const uint8_t  nvr_enabled = (dev->regs[0x00]) & 0x01;
+    const uint16_t nvr_base    = ((dev->regs[0x01] << 8) | dev->regs[0x00]) & 0xfffe;
+
+    if ((nvr_enabled != dev->nvr_enabled) || (nvr_base != dev->nvr_base)) {
+        if (dev->nvr_enabled && (dev->nvr_base != 0x0000))
+            nvr_at_handler(0, dev->nvr_base, dev->nvr);
+
+        dev->nvr_enabled           = nvr_enabled;
+        dev->nvr_base              = nvr_base;
+
+        if (dev->nvr_enabled && (dev->nvr_base != 0x0000))
+            nvr_at_handler(1, dev->nvr_base, dev->nvr);
+    }
+}
+
+static void
+vl82c113_out(uint16_t port, uint8_t val, void *priv)
+{
+    vl82c113_t *dev = (vl82c113_t *) priv;
+
+    if (port == 0xec)
+        dev->index = val;
+    else if ((dev->index >= 0x1b) && (dev->index <= 0x1d)) {
+        const uint8_t index  = dev->index - 0x1b;
+        const uint8_t valxor = dev->regs[index] ^ val;
+
+        dev->regs[index] = val;
+
+        switch (index) {
+            default:
+                break;
+
+            case 0x00:
+            case 0x01:
+                if (valxor)
+                    vl82c113_nvr_handler(dev);
+                break;
+
+            case 0x02:
+                if (valxor & 0x02)
+                    kbc_at_set_ps2(dev->kbc, !(val & 0x02));
+                break;
+        }
+    }
+}
+
+static uint8_t
+vl82c113_in(uint16_t port, void *priv)
+{
+    const vl82c113_t *dev = (vl82c113_t *) priv;
+    uint8_t           ret = 0xff;
+
+    if (port == 0xed) {
+        if ((dev->index >= 0x1b) && (dev->index <= 0x1d))
+            ret = dev->regs[dev->index - 0x1b];
+        else if (dev->index == 0x1f)
+            /* REVID */
+            ret = 0xc0;
+    }
+
+    return ret;
+}
+
+static void
+vl82c113_reset(void *priv)
+{
+    vl82c113_t *dev = (vl82c113_t *) priv;
+
+    memset(dev->regs, 0x00, sizeof(dev->regs));
+
+    dev->regs[0x00] = 0x71;
+    dev->regs[0x01] = 0x00;
+
+    dev->regs[0x02] = 0xc3;
+
+    kbc_at_set_ps2(dev->kbc, 0);
+
+    vl82c113_nvr_handler(dev);
+}
+
+static void
+vl82c113_close(void *priv)
+{
+    vl82c113_t *dev = (vl82c113_t *) priv;
+
+    free(dev);
+}
+
+static void *
+vl82c113_init(UNUSED(const device_t *info))
+{
+    vl82c113_t *dev  = (vl82c113_t *) calloc(1, sizeof(vl82c113_t));
+
+    if (!strcmp(machine_get_internal_name(), "martin"))
+        dev->nvr         = device_add(&martin_nvr_device);
+    else
+        dev->nvr         = device_add(&amstrad_megapc_nvr_device);
+
+    dev->nvr_enabled = 1;
+    dev->nvr_base    = 0x0070;
+
+    /* Commands are standard. */
+    dev->kbc         = device_add(&kbc_at_device);
+
+    vl82c113_reset(dev);
+
+    io_sethandler(0x00ec, 0x0002, vl82c113_in, NULL, NULL, vl82c113_out, NULL, NULL, dev);
+
+    return dev;
+}
+
+const device_t vl82c113_device = {
+    .name          = "VLSI VL82c113 Combination I/O",
+    .internal_name = "vl82c113",
+    .flags         = 0,
+    .local         = 0,
+    .init          = vl82c113_init,
+    .close         = vl82c113_close,
+    .reset         = vl82c113_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
diff --git a/src/sio/sio_vt82c686.c b/src/sio/sio_vt82c686.c
index f22af07df..4caffbc00 100644
--- a/src/sio/sio_vt82c686.c
+++ b/src/sio/sio_vt82c686.c
@@ -44,6 +44,7 @@ typedef struct vt82c686_t {
     uint8_t   lpt_irq;
     fdc_t    *fdc;
     serial_t *uart[2];
+    lpt_t    *lpt;
 } vt82c686_t;
 
 static uint8_t
@@ -83,16 +84,30 @@ vt82c686_lpt_handler(vt82c686_t *dev)
     if (io_len == 8)
         io_mask = 0x3f8; /* EPP */
 
-    lpt1_remove();
+    lpt_port_remove(dev->lpt);
+
+    lpt_set_ext(dev->lpt, !!(dev->regs[0x10] & 0x80));
+
+    switch (dev->regs[0x10] & 0x03) {
+        case 0x01:
+            lpt_set_epp(dev->lpt, !!(dev->regs[0x10] & 0x20));
+            lpt_set_ecp(dev->lpt, 1);
+            break;
+        case 0x02:
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, !!(dev->regs[0x10] & 0x20));
+            break;
+    }
 
     if (((dev->regs[0x02] & 0x03) != 0x03) && !(dev->regs[0x0f] & 0x11) && (io_base >= 0x100) && (io_base <= io_mask))
-        lpt1_init(io_base);
+        lpt_port_setup(dev->lpt, io_base);
 
-    if (dev->lpt_irq) {
-        lpt1_irq(dev->lpt_irq);
-    } else {
-        lpt1_irq(0xff);
-    }
+    if (dev->lpt_irq)
+        lpt_port_irq(dev->lpt, dev->lpt_irq);
+    else
+        lpt_port_irq(dev->lpt, 0xff);
+
+    lpt_port_dma(dev->lpt, dev->lpt_dma);
 }
 
 static void
@@ -177,6 +192,7 @@ vt82c686_write(uint16_t port, uint8_t val, void *priv)
 
         case 0x10:
             dev->regs[reg] &= 0xf4;
+            vt82c686_lpt_handler(dev);
             break;
 
         case 0x11:
@@ -287,8 +303,7 @@ vt82c686_close(void *priv)
 static void *
 vt82c686_init(UNUSED(const device_t *info))
 {
-    vt82c686_t *dev = (vt82c686_t *) malloc(sizeof(vt82c686_t));
-    memset(dev, 0, sizeof(vt82c686_t));
+    vt82c686_t *dev = (vt82c686_t *) calloc(1, sizeof(vt82c686_t));
 
     dev->fdc     = device_add(&fdc_at_smc_device);
     dev->fdc_dma = 2;
@@ -296,6 +311,7 @@ vt82c686_init(UNUSED(const device_t *info))
     dev->uart[0] = device_add_inst(&ns16550_device, 1);
     dev->uart[1] = device_add_inst(&ns16550_device, 2);
 
+    dev->lpt     = device_add_inst(&lpt_port_device, 1);
     dev->lpt_dma = 3;
 
     vt82c686_reset(dev);
@@ -311,7 +327,7 @@ const device_t via_vt82c686_sio_device = {
     .init          = vt82c686_init,
     .close         = vt82c686_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sio/sio_w83787f.c b/src/sio/sio_w83787f.c
deleted file mode 100644
index 2e4b82059..000000000
--- a/src/sio/sio_w83787f.c
+++ /dev/null
@@ -1,537 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Emulation of the Winbond W83787F/IF Super I/O Chip.
- *
- *          Winbond W83787F Super I/O Chip
- *          Used by the Award 430HX
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          Copyright 2020 Miran Grca.
- */
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include <86box/device.h>
-#include <86box/io.h>
-#include <86box/timer.h>
-#include <86box/mem.h>
-#include <86box/lpt.h>
-#include <86box/serial.h>
-#include <86box/fdd.h>
-#include <86box/fdc.h>
-#include <86box/hdc.h>
-#include <86box/hdc_ide.h>
-#include <86box/gameport.h>
-#include <86box/sio.h>
-
-#ifdef ENABLE_W83787_LOG
-int w83787_do_log = ENABLE_W83787_LOG;
-
-static void
-w83787_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (w83787_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define w83787_log(fmt, ...)
-#endif
-
-#define FDDA_TYPE             (dev->regs[7] & 3)
-#define FDDB_TYPE             ((dev->regs[7] >> 2) & 3)
-#define FDDC_TYPE             ((dev->regs[7] >> 4) & 3)
-#define FDDD_TYPE             ((dev->regs[7] >> 6) & 3)
-
-#define FD_BOOT               (dev->regs[8] & 3)
-#define SWWP                  ((dev->regs[8] >> 4) & 1)
-#define DISFDDWR              ((dev->regs[8] >> 5) & 1)
-
-#define EN3MODE               ((dev->regs[9] >> 5) & 1)
-
-#define DRV2EN_NEG            (dev->regs[0xB] & 1)        /* 0 = drive 2 installed */
-#define INVERTZ               ((dev->regs[0xB] >> 1) & 1) /* 0 = invert DENSEL polarity */
-#define IDENT                 ((dev->regs[0xB] >> 3) & 1)
-
-#define HEFERE                ((dev->regs[0xC] >> 5) & 1)
-
-#define HAS_IDE_FUNCTIONALITY dev->ide_function
-
-typedef struct w83787f_t {
-    uint8_t  tries;
-    uint8_t  regs[42];
-    uint16_t reg_init;
-    int      locked;
-    int      rw_locked;
-    int      cur_reg;
-    int      key;
-    int      ide_function;
-    int      ide_start;
-    fdc_t    *fdc;
-    serial_t *uart[2];
-    void     *gameport;
-} w83787f_t;
-
-static void    w83787f_write(uint16_t port, uint8_t val, void *priv);
-static uint8_t w83787f_read(uint16_t port, void *priv);
-
-static void
-w83787f_remap(w83787f_t *dev)
-{
-    io_removehandler(0x250, 0x0004,
-                     w83787f_read, NULL, NULL, w83787f_write, NULL, NULL, dev);
-    io_sethandler(0x250, 0x0004,
-                  w83787f_read, NULL, NULL, w83787f_write, NULL, NULL, dev);
-    dev->key = 0x88 | HEFERE;
-}
-
-#ifdef FIXME
-/* FIXME: Implement EPP (and ECP) parallel port modes. */
-static uint8_t
-get_lpt_length(w83787f_t *dev)
-{
-    uint8_t length = 4;
-
-    if (dev->regs[9] & 0x80) {
-        if (dev->regs[0] & 0x04)
-            length = 8; /* EPP mode. */
-        if (dev->regs[0] & 0x08)
-            length |= 0x80; /* ECP mode. */
-    }
-
-    return length;
-}
-#endif
-
-static void
-w83787f_serial_handler(w83787f_t *dev, int uart)
-{
-    int      urs0 = !!(dev->regs[1] & (1 << uart));
-    int      urs1 = !!(dev->regs[1] & (4 << uart));
-    int      urs2 = !!(dev->regs[3] & (8 >> uart));
-    int      urs;
-    int      irq = COM1_IRQ;
-    uint16_t addr = COM1_ADDR;
-    uint16_t enable = 1;
-
-    urs = (urs1 << 1) | urs0;
-
-    if (urs2) {
-        addr = uart ? COM1_ADDR : COM2_ADDR;
-        irq  = uart ? COM1_IRQ : COM2_IRQ;
-    } else {
-        switch (urs) {
-            case 0:
-                addr = uart ? COM3_ADDR : COM4_ADDR;
-                irq  = uart ? COM3_IRQ : COM4_IRQ;
-                break;
-            case 1:
-                addr = uart ? COM4_ADDR : COM3_ADDR;
-                irq  = uart ? COM4_IRQ : COM3_IRQ;
-                break;
-            case 2:
-                addr = uart ? COM2_ADDR : COM1_ADDR;
-                irq  = uart ? COM2_IRQ : COM1_IRQ;
-                break;
-            case 3:
-            default:
-                enable = 0;
-                break;
-        }
-    }
-
-    if (dev->regs[4] & (0x20 >> uart))
-        enable = 0;
-
-    serial_remove(dev->uart[uart]);
-    if (enable)
-        serial_setup(dev->uart[uart], addr, irq);
-}
-
-static void
-w83787f_lpt_handler(w83787f_t *dev)
-{
-    int      ptras = (dev->regs[1] >> 4) & 0x03;
-    int      irq   = LPT1_IRQ;
-    uint16_t addr = LPT1_ADDR;
-    uint16_t enable = 1;
-
-    switch (ptras) {
-        case 0x00:
-            addr = LPT_MDA_ADDR;
-            irq  = LPT_MDA_IRQ;
-            break;
-        case 0x01:
-            addr = LPT2_ADDR;
-            irq  = LPT2_IRQ;
-            break;
-        case 0x02:
-            addr = LPT1_ADDR;
-            irq  = LPT1_IRQ;
-            break;
-        case 0x03:
-        default:
-            enable = 0;
-            break;
-    }
-
-    if (dev->regs[4] & 0x80)
-        enable = 0;
-
-    lpt1_remove();
-    if (enable) {
-        lpt1_init(addr);
-        lpt1_irq(irq);
-    }
-}
-
-static void
-w83787f_gameport_handler(w83787f_t *dev)
-{
-    if (!(dev->regs[3] & 0x40) && !(dev->regs[4] & 0x40))
-        gameport_remap(dev->gameport, 0x201);
-    else
-        gameport_remap(dev->gameport, 0);
-}
-
-static void
-w83787f_fdc_handler(w83787f_t *dev)
-{
-    fdc_remove(dev->fdc);
-    if (!(dev->regs[0] & 0x20))
-        fdc_set_base(dev->fdc, (dev->regs[0] & 0x10) ? FDC_PRIMARY_ADDR : FDC_SECONDARY_ADDR);
-    fdc_set_power_down(dev->fdc, !!(dev->regs[6] & 0x08));
-}
-
-static void
-w83787f_ide_handler(w83787f_t *dev)
-{
-    if (dev->ide_function & 0x20) {
-        ide_sec_disable();
-        if (!(dev->regs[0] & 0x80)) {
-            ide_set_base(1, (dev->regs[0] & 0x40) ? 0x1f0 : 0x170);
-            ide_set_side(1, (dev->regs[0] & 0x40) ? 0x3f6 : 0x376);
-            ide_sec_enable();
-        }
-    } else {
-        ide_pri_disable();
-        if (!(dev->regs[0] & 0x80)) {
-            ide_set_base(0, (dev->regs[0] & 0x40) ? 0x1f0 : 0x170);
-            ide_set_side(0, (dev->regs[0] & 0x40) ? 0x3f6 : 0x376);
-            ide_pri_enable();
-        }
-    }
-}
-
-static void
-w83787f_write(uint16_t port, uint8_t val, void *priv)
-{
-    w83787f_t *dev    = (w83787f_t *) priv;
-    uint8_t    valxor = 0;
-    uint8_t    max    = 0x15;
-
-    if (port == 0x250) {
-        if (val == dev->key)
-            dev->locked = 1;
-        else
-            dev->locked = 0;
-        return;
-    } else if (port == 0x251) {
-        if (val <= max)
-            dev->cur_reg = val;
-        return;
-    } else {
-        if (dev->locked) {
-            if (dev->rw_locked && (dev->cur_reg <= 0x0b))
-                return;
-            if (dev->cur_reg == 6)
-                val &= 0xFB;
-            valxor                  = val ^ dev->regs[dev->cur_reg];
-            dev->regs[dev->cur_reg] = val;
-        } else
-            return;
-    }
-
-    switch (dev->cur_reg) {
-        case 0:
-            w83787_log("REG 00: %02X\n", val);
-            if ((valxor & 0xc0) && (HAS_IDE_FUNCTIONALITY))
-                w83787f_ide_handler(dev);
-            if (valxor & 0x30)
-                w83787f_fdc_handler(dev);
-            if (valxor & 0x0c)
-                w83787f_lpt_handler(dev);
-            break;
-        case 1:
-            if (valxor & 0x80)
-                fdc_set_swap(dev->fdc, (dev->regs[1] & 0x80) ? 1 : 0);
-            if (valxor & 0x30)
-                w83787f_lpt_handler(dev);
-            if (valxor & 0x0a)
-                w83787f_serial_handler(dev, 1);
-            if (valxor & 0x05)
-                w83787f_serial_handler(dev, 0);
-            break;
-        case 3:
-            if (valxor & 0x80)
-                w83787f_lpt_handler(dev);
-            if (valxor & 0x40)
-                w83787f_gameport_handler(dev);
-            if (valxor & 0x08)
-                w83787f_serial_handler(dev, 0);
-            if (valxor & 0x04)
-                w83787f_serial_handler(dev, 1);
-            break;
-        case 4:
-            if (valxor & 0x10)
-                w83787f_serial_handler(dev, 1);
-            if (valxor & 0x20)
-                w83787f_serial_handler(dev, 0);
-            if (valxor & 0x80)
-                w83787f_lpt_handler(dev);
-            if (valxor & 0x40)
-                w83787f_gameport_handler(dev);
-            break;
-        case 6:
-            if (valxor & 0x08)
-                w83787f_fdc_handler(dev);
-            break;
-        case 7:
-            if (valxor & 0x03)
-                fdc_update_rwc(dev->fdc, 0, FDDA_TYPE);
-            if (valxor & 0x0c)
-                fdc_update_rwc(dev->fdc, 1, FDDB_TYPE);
-            if (valxor & 0x30)
-                fdc_update_rwc(dev->fdc, 2, FDDC_TYPE);
-            if (valxor & 0xc0)
-                fdc_update_rwc(dev->fdc, 3, FDDD_TYPE);
-            break;
-        case 8:
-            if (valxor & 0x03)
-                fdc_update_boot_drive(dev->fdc, FD_BOOT);
-            if (valxor & 0x10)
-                fdc_set_swwp(dev->fdc, SWWP ? 1 : 0);
-            if (valxor & 0x20)
-                fdc_set_diswr(dev->fdc, DISFDDWR ? 1 : 0);
-            break;
-        case 9:
-            if (valxor & 0x20)
-                fdc_update_enh_mode(dev->fdc, EN3MODE ? 1 : 0);
-            if (valxor & 0x40)
-                dev->rw_locked = (val & 0x40) ? 1 : 0;
-            if (valxor & 0x80)
-                w83787f_lpt_handler(dev);
-            break;
-        case 0xB:
-            w83787_log("Writing %02X to CRB\n", val);
-            break;
-        case 0xC:
-            if (valxor & 0x20)
-                w83787f_remap(dev);
-            break;
-
-        default:
-            break;
-    }
-}
-
-static uint8_t
-w83787f_read(uint16_t port, void *priv)
-{
-    w83787f_t *dev = (w83787f_t *) priv;
-    uint8_t    ret = 0xff;
-
-    if (dev->locked) {
-        if (port == 0x251)
-            ret = dev->cur_reg;
-        else if (port == 0x252) {
-            if (dev->cur_reg == 7)
-                ret = (fdc_get_rwc(dev->fdc, 0) | (fdc_get_rwc(dev->fdc, 1) << 2));
-            else if (!dev->rw_locked || (dev->cur_reg > 0x0b))
-                ret = dev->regs[dev->cur_reg];
-        }
-    }
-
-    return ret;
-}
-
-static void
-w83787f_reset(w83787f_t *dev)
-{
-    uint16_t hefere = dev->reg_init & 0x0100;
-
-    lpt1_remove();
-    lpt1_init(LPT1_ADDR);
-    lpt1_irq(LPT1_IRQ);
-
-    memset(dev->regs, 0, 0x2A);
-
-    if (HAS_IDE_FUNCTIONALITY) {
-        if (dev->ide_function & 0x20) {
-            dev->regs[0x00] = 0x90;
-            ide_sec_disable();
-            ide_set_base(1, 0x170);
-            ide_set_side(1, 0x376);
-        } else {
-            dev->regs[0x00] = 0xd0;
-            ide_pri_disable();
-            ide_set_base(0, 0x1f0);
-            ide_set_side(0, 0x3f6);
-        }
-
-        if (dev->ide_start) {
-            dev->regs[0x00] &= 0x7f;
-            if (dev->ide_function & 0x20)
-                ide_sec_enable();
-            else
-                ide_pri_enable();
-        }
-    } else
-        dev->regs[0x00] = 0xd0;
-
-    fdc_reset(dev->fdc);
-    w83787f_fdc_handler(dev);
-
-    dev->regs[0x01] = 0x2C;
-    dev->regs[0x03] = 0x70;
-    dev->regs[0x07] = 0xF5;
-    dev->regs[0x09] = dev->reg_init & 0xff;
-    dev->regs[0x0a] = 0x1F;
-    dev->regs[0x0c] = 0x0C | (hefere >> 3);
-    dev->regs[0x0d] = 0xA3;
-
-    gameport_remap(dev->gameport, 0);
-
-    serial_setup(dev->uart[0], COM1_ADDR, COM1_IRQ);
-    serial_setup(dev->uart[1], COM2_ADDR, COM2_IRQ);
-
-    w83787f_lpt_handler(dev);
-
-    dev->key = 0x88 | (hefere >> 8);
-
-    w83787f_remap(dev);
-
-    dev->locked    = 0;
-    dev->rw_locked = 0;
-}
-
-static void
-w83787f_close(void *priv)
-{
-    w83787f_t *dev = (w83787f_t *) priv;
-
-    free(dev);
-}
-
-static void *
-w83787f_init(const device_t *info)
-{
-    w83787f_t *dev = (w83787f_t *) malloc(sizeof(w83787f_t));
-    memset(dev, 0, sizeof(w83787f_t));
-
-    HAS_IDE_FUNCTIONALITY = (info->local & 0x30);
-
-    dev->fdc = device_add(&fdc_at_winbond_device);
-
-    dev->uart[0] = device_add_inst(&ns16550_device, 1);
-    dev->uart[1] = device_add_inst(&ns16550_device, 2);
-
-    dev->gameport = gameport_add(&gameport_sio_1io_device);
-
-    if ((dev->ide_function & 0x30) == 0x10)
-        device_add(&ide_isa_device);
-
-    dev->ide_start = !!(info->local & 0x40);
-
-    dev->reg_init = info->local & 0x010f;
-    w83787f_reset(dev);
-
-    return dev;
-}
-
-const device_t w83787f_88h_device = {
-    .name          = "Winbond W83787F/IF Super I/O",
-    .internal_name = "w83787f",
-    .flags         = 0,
-    .local         = 0x0009,
-    .init          = w83787f_init,
-    .close         = w83787f_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t w83787f_device = {
-    .name          = "Winbond W83787F/IF Super I/O",
-    .internal_name = "w83787f",
-    .flags         = 0,
-    .local         = 0x0109,
-    .init          = w83787f_init,
-    .close         = w83787f_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t w83787f_ide_device = {
-    .name          = "Winbond W83787F/IF Super I/O (With IDE)",
-    .internal_name = "w83787f_ide",
-    .flags         = 0,
-    .local         = 0x0119,
-    .init          = w83787f_init,
-    .close         = w83787f_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t w83787f_ide_en_device = {
-    .name          = "Winbond W83787F/IF Super I/O (With IDE Enabled)",
-    .internal_name = "w83787f_ide_en",
-    .flags         = 0,
-    .local         = 0x0159,
-    .init          = w83787f_init,
-    .close         = w83787f_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t w83787f_ide_sec_device = {
-    .name          = "Winbond W83787F/IF Super I/O (With Secondary IDE)",
-    .internal_name = "w83787f_ide_sec",
-    .flags         = 0,
-    .local         = 0x0139,
-    .init          = w83787f_init,
-    .close         = w83787f_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
diff --git a/src/sio/sio_w837x7.c b/src/sio/sio_w837x7.c
new file mode 100644
index 000000000..0b6aae240
--- /dev/null
+++ b/src/sio/sio_w837x7.c
@@ -0,0 +1,476 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Emulation of the Winbond W837x7F/IF Super I/O Chip.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          Copyright 2020-2025 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/mem.h>
+#include <86box/lpt.h>
+#include <86box/serial.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/gameport.h>
+#include <86box/sio.h>
+
+#define FDDA_TYPE             (dev->regs[7] & 3)
+#define FDDB_TYPE             ((dev->regs[7] >> 2) & 3)
+#define FDDC_TYPE             ((dev->regs[7] >> 4) & 3)
+#define FDDD_TYPE             ((dev->regs[7] >> 6) & 3)
+
+#define FD_BOOT               (dev->regs[8] & 3)
+#define SWWP                  ((dev->regs[8] >> 4) & 1)
+#define DISFDDWR              ((dev->regs[8] >> 5) & 1)
+
+#define EN3MODE               ((dev->regs[9] >> 5) & 1)
+
+#define DRV2EN_NEG            (dev->regs[0xB] & 1)        /* 0 = drive 2 installed */
+#define INVERTZ               ((dev->regs[0xB] >> 1) & 1) /* 0 = invert DENSEL polarity */
+#define IDENT                 ((dev->regs[0xB] >> 3) & 1)
+
+#define HEFERE                ((dev->regs[0xC] >> 5) & 1)
+
+typedef struct w837x7_t {
+    uint8_t  tries;
+    uint8_t  has_ide;
+    uint8_t  type;
+    uint8_t  hefere;
+    uint8_t  max_reg;
+    uint8_t  regs[256];
+    int      locked;
+    int      rw_locked;
+    int      cur_reg;
+    int      key;
+    int      ide_start;
+    fdc_t    *fdc;
+    serial_t *uart[2];
+    lpt_t    *lpt;
+    void     *gameport;
+} w837x7_t;
+
+#ifdef ENABLE_W837X7_LOG
+int w837x7_do_log = ENABLE_W837X7_LOG;
+
+static void
+w837x7_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (w837x7_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define w837x7_log(fmt, ...)
+#endif
+
+static void
+w837x7_serial_handler(w837x7_t *dev, int uart)
+{
+    int      urs0      = !!(dev->regs[0x01] & (0x01 << uart));
+    int      urs1      = !!(dev->regs[0x01] & (0x04 << uart));
+    int      urs2      = !!(dev->regs[0x03] & (0x08 >> uart));
+    int      urs;
+    int      irq       = COM1_IRQ;
+    uint16_t addr      = COM1_ADDR;
+    uint16_t enable    = 1;
+    double   clock_src = 24000000.0 / 13.0;
+
+    if (dev->regs[0x03] & (1 << (1 - uart)))
+        clock_src = 24000000.0 / 12.0;
+
+    urs = (urs1 << 1) | urs0;
+
+    if (urs2) {
+        addr = uart ? COM1_ADDR : COM2_ADDR;
+        irq  = uart ? COM1_IRQ : COM2_IRQ;
+    } else {
+        switch (urs) {
+            case 0x00:
+                addr = uart ? COM3_ADDR : COM4_ADDR;
+                irq  = uart ? COM3_IRQ : COM4_IRQ;
+                break;
+            case 0x01:
+                addr = uart ? COM4_ADDR : COM3_ADDR;
+                irq  = uart ? COM4_IRQ : COM3_IRQ;
+                break;
+            case 0x02:
+                addr = uart ? COM2_ADDR : COM1_ADDR;
+                irq  = uart ? COM2_IRQ : COM1_IRQ;
+                break;
+            case 0x03:
+            default:
+                enable = 0;
+                break;
+        }
+    }
+
+    if (dev->regs[0x04] & (0x20 >> uart))
+        enable = 0;
+
+    serial_remove(dev->uart[uart]);
+    if (enable)
+        serial_setup(dev->uart[uart], addr, irq);
+
+    serial_set_clock_src(dev->uart[uart], clock_src);
+}
+
+static void
+w837x7_lpt_handler(w837x7_t *dev)
+{
+    int      ptras        = (dev->regs[1] >> 4) & 0x03;
+    uint16_t lpt_port     = 0x0000;
+    uint16_t mask         = 0xfffc;
+    uint8_t  local_enable = 1;
+    uint8_t  lpt_irq      = LPT1_IRQ;
+    uint8_t  lpt_mode     = (dev->regs[0x09] & 0x80) | (dev->regs[0x00] & 0x0c);
+
+    switch (ptras) {
+        case 0x00:
+            lpt_port     = LPT_MDA_ADDR;
+            lpt_irq      = LPT_MDA_IRQ;
+            break;
+        case 0x01:
+            lpt_port     = LPT2_ADDR;
+            lpt_irq      = LPT1_IRQ /*LPT2_IRQ*/;
+            break;
+        case 0x02:
+            lpt_port     = LPT1_ADDR;
+            lpt_irq      = LPT1_IRQ /*LPT2_IRQ*/;
+            break;
+
+        default:
+            local_enable = 0;
+            break;
+    }
+
+    if (dev->regs[0x04] & 0x80)
+        local_enable = 0;
+
+    if (lpt_irq > 15)
+        lpt_irq = 0xff;
+
+    lpt_port_remove(dev->lpt);
+    lpt_set_fifo_threshold(dev->lpt, dev->regs[0x05] & 0x0f);
+    switch (lpt_mode) {
+        default:
+            local_enable = 0;
+            break;
+        case 0x00:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 1);
+            break;
+        case 0x84:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x88:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x8c:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+    }
+
+    if (local_enable && (lpt_port >= 0x0100) && (lpt_port <= (0x0ffc & mask)))
+        lpt_port_setup(dev->lpt, lpt_port);
+
+    lpt_port_irq(dev->lpt, lpt_irq);
+}
+
+static void
+w837x7_gameport_handler(w837x7_t *dev)
+{
+    if (!(dev->regs[3] & 0x40) && !(dev->regs[4] & 0x40))
+        gameport_remap(dev->gameport, 0x201);
+    else
+        gameport_remap(dev->gameport, 0);
+}
+
+static void
+w837x7_fdc_handler(w837x7_t *dev)
+{
+    fdc_remove(dev->fdc);
+    if (!(dev->regs[0] & 0x20))
+        fdc_set_base(dev->fdc, (dev->regs[0] & 0x10) ? FDC_PRIMARY_ADDR : FDC_SECONDARY_ADDR);
+    fdc_set_power_down(dev->fdc, !!(dev->regs[6] & 0x08));
+}
+
+static void
+w837x7_ide_handler(w837x7_t *dev)
+{
+    if (dev->has_ide > 0) {
+        int ide_id = dev->has_ide - 1;
+
+        ide_handlers(ide_id, 0);
+
+        ide_set_base_addr(ide_id, 0, (dev->regs[0x00] & 0x40) ? 0x01f0 : 0x0170);
+        ide_set_base_addr(ide_id, 1, (dev->regs[0x00] & 0x40) ? 0x03f6 : 0x0376);
+
+        if (!(dev->regs[0x00] & 0x80))
+            ide_handlers(ide_id, 1);
+    }
+}
+
+static void
+w837x7_write(uint16_t port, uint8_t val, void *priv)
+{
+    w837x7_t *dev    = (w837x7_t *) priv;
+    uint8_t    valxor = 0;
+
+    if (port == 0x0250) {
+        if (val == dev->key)
+            dev->locked = 1;
+        else
+            dev->locked = 0;
+        return;
+    } else if (port == 0x0251) {
+        dev->cur_reg = val;
+        return;
+    } else {
+        if (dev->locked) {
+            if (dev->rw_locked && (dev->cur_reg <= 0x0b))
+                return;
+            valxor                  = val ^ dev->regs[dev->cur_reg];
+            dev->regs[dev->cur_reg] = val;
+        } else
+            return;
+    }
+
+    if (dev->cur_reg <= dev->max_reg)  switch (dev->cur_reg) {
+        case 0x00:
+            w837x7_log("REG 00: %02X\n", val);
+            if (valxor & 0xc0)
+                w837x7_ide_handler(dev);
+            if (valxor & 0x30)
+                w837x7_fdc_handler(dev);
+            if (valxor & 0x0c)
+                w837x7_lpt_handler(dev);
+            break;
+        case 0x01:
+            if (valxor & 0x80)
+                fdc_set_swap(dev->fdc, (dev->regs[1] & 0x80) ? 1 : 0);
+            if (valxor & 0x30)
+                w837x7_lpt_handler(dev);
+            if (valxor & 0x0a)
+                w837x7_serial_handler(dev, 1);
+            if (valxor & 0x05)
+                w837x7_serial_handler(dev, 0);
+            break;
+        case 0x03:
+            if (valxor & 0x80)
+                w837x7_lpt_handler(dev);
+            if (valxor & 0x40)
+                w837x7_gameport_handler(dev);
+            if (valxor & 0x0a)
+                w837x7_serial_handler(dev, 0);
+            if (valxor & 0x05)
+                w837x7_serial_handler(dev, 1);
+            break;
+        case 0x04:
+            if (valxor & 0x10)
+                w837x7_serial_handler(dev, 1);
+            if (valxor & 0x20)
+                w837x7_serial_handler(dev, 0);
+            if (valxor & 0x80)
+                w837x7_lpt_handler(dev);
+            if (valxor & 0x40)
+                w837x7_gameport_handler(dev);
+            break;
+        case 0x05:
+            if (valxor & 0x0f)
+                w837x7_lpt_handler(dev);
+            break;
+        case 0x06:
+            if (valxor & 0x08)
+                w837x7_fdc_handler(dev);
+            break;
+        case 0x07:
+            if (valxor & 0x03)
+                fdc_update_rwc(dev->fdc, 0, FDDA_TYPE);
+            if (valxor & 0x0c)
+                fdc_update_rwc(dev->fdc, 1, FDDB_TYPE);
+            if (valxor & 0x30)
+                fdc_update_rwc(dev->fdc, 2, FDDC_TYPE);
+            if (valxor & 0xc0)
+                fdc_update_rwc(dev->fdc, 3, FDDD_TYPE);
+            break;
+        case 0x08:
+            if (valxor & 0x03)
+                fdc_update_boot_drive(dev->fdc, FD_BOOT);
+            if (valxor & 0x10)
+                fdc_set_swwp(dev->fdc, SWWP ? 1 : 0);
+            if (valxor & 0x20)
+                fdc_set_diswr(dev->fdc, DISFDDWR ? 1 : 0);
+            break;
+        case 0x09:
+            if (valxor & 0x20)
+                fdc_update_enh_mode(dev->fdc, EN3MODE ? 1 : 0);
+            if (valxor & 0x40)
+                dev->rw_locked = (val & 0x40) ? 1 : 0;
+            if (valxor & 0x80)
+                w837x7_lpt_handler(dev);
+            break;
+        case 0x0b:
+            if ((valxor & 0x0c) && (dev->type == W83777F)) {
+                fdc_clear_flags(dev->fdc, FDC_FLAG_PS2 | FDC_FLAG_PS2_MCA);
+                switch (val & 0x0c) {
+                    case 0x00:
+                        fdc_set_flags(dev->fdc, FDC_FLAG_PS2);
+                        break;
+                    case 0x04:
+                        fdc_set_flags(dev->fdc, FDC_FLAG_PS2_MCA);
+                        break;
+                }
+            }
+            break;
+        case 0x0c:
+            if (dev->type == W83787IF)
+                dev->key = 0x88 | HEFERE;
+            break;
+
+        default:
+            break;
+    }
+}
+
+static uint8_t
+w837x7_read(uint16_t port, void *priv)
+{
+    w837x7_t *dev = (w837x7_t *) priv;
+    uint8_t    ret = 0xff;
+
+    if (dev->locked) {
+        if (port == 0x0251)
+            ret = dev->cur_reg;
+        else if (port == 0x0252) {
+            if (dev->cur_reg == 7)
+                ret = (fdc_get_rwc(dev->fdc, 0) | (fdc_get_rwc(dev->fdc, 1) << 2));
+            else if (!dev->rw_locked || (dev->cur_reg > 0x0b))
+                ret = dev->regs[dev->cur_reg];
+        }
+    }
+
+    return ret;
+}
+
+static void
+w837x7_reset(w837x7_t *dev)
+{
+    memset(dev->regs, 0x00, dev->max_reg + 1);
+
+    if (dev->has_ide == 0x02)
+        dev->regs[0x00] = 0x90;
+    else
+        dev->regs[0x00] = 0xd0;
+
+    if (dev->ide_start)
+        dev->regs[0x00] &= 0x7f;
+
+    dev->regs[0x01] = 0x2c;
+    dev->regs[0x03] = 0x30;
+    dev->regs[0x09] = dev->type;
+    dev->regs[0x0a] = 0x1f;
+
+    if (dev->type == W83787IF) {
+        dev->regs[0x0c] = 0x0c | dev->hefere;
+        dev->regs[0x0d] = 0x03;
+    } else
+        dev->regs[0x0c] = dev->hefere;
+
+    dev->key = 0x88 | HEFERE;
+
+    fdc_reset(dev->fdc);
+    fdc_clear_flags(dev->fdc, FDC_FLAG_PS2 | FDC_FLAG_PS2_MCA);
+
+    w837x7_fdc_handler(dev);
+
+    w837x7_lpt_handler(dev);
+    w837x7_serial_handler(dev, 0);
+    w837x7_serial_handler(dev, 1);
+    w837x7_gameport_handler(dev);
+    w837x7_ide_handler(dev);
+
+    dev->locked    = 0;
+    dev->rw_locked = 0;
+}
+
+static void
+w837x7_close(void *priv)
+{
+    w837x7_t *dev = (w837x7_t *) priv;
+
+    free(dev);
+}
+
+static void *
+w837x7_init(const device_t *info)
+{
+    w837x7_t *dev = (w837x7_t *) calloc(1, sizeof(w837x7_t));
+
+    dev->type      = info->local & 0x0f;
+    dev->hefere    = info->local & W837X7_KEY_89;
+    dev->max_reg   = (dev->type == W83787IF) ? 0x15 : ((dev->type == W83787F) ? 0x0a : 0x0b);
+    dev->has_ide   = (info->local >> 16) & 0xff;
+    dev->ide_start = !!(info->local & W837X7_IDE_START);
+
+    dev->fdc       = device_add(&fdc_at_winbond_device);
+
+    dev->uart[0]   = device_add_inst(&ns16550_device, 1);
+    dev->uart[1]   = device_add_inst(&ns16550_device, 2);
+
+    dev->lpt       = device_add_inst(&lpt_port_device, 1);
+    lpt_set_cnfgb_readout(dev->lpt, 0x3f);
+
+    dev->gameport  = gameport_add(&gameport_sio_1io_device);
+
+    w837x7_reset(dev);
+
+    io_sethandler(0x250, 0x0004,
+                  w837x7_read, NULL, NULL, w837x7_write, NULL, NULL, dev);
+
+    return dev;
+}
+
+const device_t w837x7_device = {
+    .name          = "Winbond W837x7 Super I/O",
+    .internal_name = "w837x7",
+    .flags         = 0,
+    .local         = 0,
+    .init          = w837x7_init,
+    .close         = w837x7_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/sio/sio_w83877.c b/src/sio/sio_w83877.c
new file mode 100644
index 000000000..a7a2b4ea2
--- /dev/null
+++ b/src/sio/sio_w83877.c
@@ -0,0 +1,567 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Emulation of the Winbond W83877 family of Super I/O Chips.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          Copyright 2016-2025 Miran Grca.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/pci.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/lpt.h>
+#include <86box/serial.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/machine.h>
+#include <86box/sio.h>
+
+#define FDDA_TYPE  (dev->regs[0x07] & 3)
+#define FDDB_TYPE  ((dev->regs[0x07] >> 2) & 3)
+#define FDDC_TYPE  ((dev->regs[0x07] >> 4) & 3)
+#define FDDD_TYPE  ((dev->regs[0x07] >> 6) & 3)
+
+#define FD_BOOT    (dev->regs[0x08] & 3)
+#define SWWP       ((dev->regs[0x08] >> 4) & 1)
+#define DISFDDWR   ((dev->regs[0x08] >> 5) & 1)
+
+#define EN3MODE    ((dev->regs[0x09] >> 5) & 1)
+
+#define DRV2EN_NEG (dev->regs[0x0b] & 1)        /* 0 = drive 2 installed */
+#define INVERTZ    ((dev->regs[0x0b] >> 1) & 1) /* 0 = invert DENSEL polarity */
+#define IDENT      ((dev->regs[0x0b] >> 3) & 1)
+
+#define HEFERE     ((dev->regs[0x0c] >> 5) & 1)
+
+#define HEFRAS     (dev->regs[0x16] & 1)
+
+#define PRTIQS     (dev->regs[0x27] & 0x0f)
+#define ECPIRQ     ((dev->regs[0x27] >> 5) & 0x07)
+
+typedef struct w83877_t {
+    uint8_t   tries;
+    uint8_t   has_ide;
+    uint8_t   dma_map[4];
+    uint8_t   irq_map[10];
+    uint8_t   regs[256];
+    uint16_t  reg_init;
+    int       locked;
+    int       rw_locked;
+    int       cur_reg;
+    int       base_address;
+    int       key;
+    int       key_times;
+    fdc_t    *fdc;
+    serial_t *uart[2];
+    lpt_t    *lpt;
+} w83877_t;
+
+static void    w83877_write(uint16_t port, uint8_t val, void *priv);
+static uint8_t w83877_read(uint16_t port, void *priv);
+
+static void
+w83877_remap(w83877_t *dev)
+{
+    uint8_t hefras = HEFRAS;
+
+    io_removehandler(0x250, 0x0003,
+                     w83877_read, NULL, NULL, w83877_write, NULL, NULL, dev);
+    io_removehandler(FDC_PRIMARY_ADDR, 0x0002,
+                     w83877_read, NULL, NULL, w83877_write, NULL, NULL, dev);
+    dev->base_address = (hefras ? FDC_PRIMARY_ADDR : 0x250);
+    io_sethandler(dev->base_address, hefras ? 0x0002 : 0x0003,
+                  w83877_read, NULL, NULL, w83877_write, NULL, NULL, dev);
+    dev->key_times = hefras + 1;
+    dev->key       = (hefras ? 0x86 : 0x88) | HEFERE;
+}
+
+static uint8_t
+get_lpt_length(w83877_t *dev)
+{
+    uint8_t length = 4;
+
+    if (dev->regs[0x09] & 0x80) {
+        if (dev->regs[0x00] & 0x04)
+            length = 8; /* EPP mode. */
+        if (dev->regs[0x00] & 0x08)
+            length |= 0x80; /* ECP mode. */
+    }
+
+    return length;
+}
+
+static uint16_t
+make_port(w83877_t *dev, uint8_t reg)
+{
+    uint16_t p = 0;
+    uint8_t  l;
+
+    switch (reg) {
+        case 0x20:
+            p = ((uint16_t) (dev->regs[reg] & 0xfc)) << 2;
+            p &= 0x0ff0;
+            if ((p < 0x0100) || (p > 0x03f0))
+                p = 0x03f0;
+            break;
+        case 0x23:
+            l = get_lpt_length(dev);
+            p = ((uint16_t) (dev->regs[reg] & 0xff)) << 2;
+            /* 8 ports in EPP mode, 4 in non-EPP mode. */
+            if ((l & 0x0f) == 8)
+                p &= 0x03f8;
+            else
+                p &= 0x03fc;
+            if ((p < 0x0100) || (p > 0x03ff))
+                p = LPT1_ADDR;
+            break;
+        case 0x24:
+            p = ((uint16_t) (dev->regs[reg] & 0xfe)) << 2;
+            p &= 0x0ff8;
+            if ((p < 0x0100) || (p > 0x03f8))
+                p = COM1_ADDR;
+            break;
+        case 0x25:
+            p = ((uint16_t) (dev->regs[reg] & 0xfe)) << 2;
+            p &= 0x0ff8;
+            if ((p < 0x0100) || (p > 0x03f8))
+                p = COM2_ADDR;
+            break;
+
+        default:
+            break;
+    }
+
+    return p;
+}
+
+static void
+w83877_ide_handler(w83877_t *dev)
+{
+    uint16_t ide_port     = 0x0000;
+
+    if (dev->has_ide > 0) {
+        int ide_id = dev->has_ide - 1;
+
+        ide_handlers(ide_id, 0);
+
+        ide_port     = (dev->regs[0x21] << 2) & 0xfff0;
+        ide_set_base_addr(ide_id, 0, ide_port);
+
+        ide_port     = ((dev->regs[0x22] << 2) & 0xfff0) | 0x0006;
+        ide_set_base_addr(ide_id, 1, ide_port);
+
+        if (!(dev->regs[0x06] & 0x04))
+            ide_handlers(ide_id, 1);
+    }
+}
+
+static void
+w83877_fdc_handler(w83877_t *dev)
+{
+    fdc_remove(dev->fdc);
+    if (!(dev->regs[0x06] & 0x08) && (dev->regs[0x20] & 0xc0))
+        fdc_set_base(dev->fdc, make_port(dev, 0x20));
+    fdc_set_irq(dev->fdc, dev->irq_map[dev->regs[0x29] >> 4]);
+    fdc_set_dma_ch(dev->fdc, dev->dma_map[(dev->regs[0x26] >> 4) & 0x03]);
+    fdc_set_power_down(dev->fdc, !!(dev->regs[0x06] & 0x08));
+}
+
+static void
+w83877_lpt_handler(w83877_t *dev)
+{
+    const uint8_t lpt_irq = dev->irq_map[PRTIQS];
+
+    lpt_port_remove(dev->lpt);
+
+    lpt_set_ext(dev->lpt, 1);
+
+    lpt_set_epp(dev->lpt, (dev->regs[0x09] & 0x80) && (dev->regs[0x00] & 0x04));
+    lpt_set_ecp(dev->lpt, (dev->regs[0x09] & 0x80) && (dev->regs[0x00] & 0x08));
+
+    lpt_set_fifo_threshold(dev->lpt, dev->regs[0x05] & 0x0f);
+
+    if (!(dev->regs[0x04] & 0x80) && (dev->regs[0x23] & 0xc0))
+        lpt_port_setup(dev->lpt, make_port(dev, 0x23));
+
+    lpt_port_irq(dev->lpt, lpt_irq);
+    lpt_port_dma(dev->lpt, dev->dma_map[dev->regs[0x26] & 0x03]);
+
+    lpt_set_cnfgb_readout(dev->lpt, ((dev->regs[0x27] & 0xe0) >> 2) | 0x07);
+}
+
+static void
+w83877_serial_handler(w83877_t *dev, int uart)
+{
+    int    reg_mask  = uart ? 0x10 : 0x20;
+    int    reg_id    = uart ? 0x25 : 0x24;
+    int    irq_mask  = uart ? 0x0f : 0xf0;
+    int    irq_shift = uart ? 0 : 4;
+    double clock_src = 24000000.0 / 13.0;
+
+    serial_remove(dev->uart[uart]);
+    if (!(dev->regs[4] & reg_mask) && (dev->regs[reg_id] & 0xc0))
+        serial_setup(dev->uart[uart], make_port(dev, reg_id), dev->irq_map[(dev->regs[0x28] & irq_mask) >> irq_shift]);
+
+    if (dev->regs[0x19] & (0x02 >> uart)) {
+        clock_src = 14769000.0;
+    } else if (dev->regs[0x03] & (0x02 >> uart)) {
+        clock_src = 24000000.0 / 12.0;
+    } else {
+        clock_src = 24000000.0 / 13.0;
+    }
+
+    serial_set_clock_src(dev->uart[uart], clock_src);
+}
+
+static void
+w83877_write(uint16_t port, uint8_t val, void *priv)
+{
+    w83877_t *dev    = (w83877_t *) priv;
+    uint8_t    valxor = 0;
+
+    if (port == 0x0250) {
+        if (val == dev->key)
+            dev->locked = 1;
+        else
+            dev->locked = 0;
+        return;
+    } else if (port == 0x0251) {
+        dev->cur_reg = val;
+        return;
+    } else if (port == FDC_PRIMARY_ADDR) {
+        if ((val == dev->key) && !dev->locked) {
+            if (dev->key_times == 2) {
+                if (dev->tries) {
+                    dev->locked = 1;
+                    dev->tries  = 0;
+                } else
+                    dev->tries++;
+            } else {
+                dev->locked = 1;
+                dev->tries  = 0;
+            }
+        } else {
+            if (dev->locked) {
+                dev->cur_reg = val;
+
+                if (val == 0xaa)
+                    dev->locked = 0;
+            } else {
+                if (dev->tries)
+                    dev->tries = 0;
+            }
+        }
+        return;
+    } else if ((port == 0x0252) || (port == 0x03f1)) {
+        if (dev->locked) {
+            if (dev->rw_locked)
+                return;
+            valxor                  = val ^ dev->regs[dev->cur_reg];
+            dev->regs[dev->cur_reg] = val;
+        } else
+            return;
+    }
+
+    switch (dev->cur_reg) {
+        case 0x00:
+            if (valxor & 0x0c)
+                w83877_lpt_handler(dev);
+            break;
+        case 0x01:
+            if (valxor & 0x80)
+                fdc_set_swap(dev->fdc, (dev->regs[0x01] & 0x80) ? 1 : 0);
+            break;
+        case 0x03:
+            if (valxor & 0x02)
+                w83877_serial_handler(dev, 0);
+            if (valxor & 0x01)
+                w83877_serial_handler(dev, 1);
+            break;
+        case 0x04:
+            if (valxor & 0x10)
+                w83877_serial_handler(dev, 1);
+            if (valxor & 0x20)
+                w83877_serial_handler(dev, 0);
+            if (valxor & 0x80)
+                w83877_lpt_handler(dev);
+            break;
+        case 0x05:
+            if (valxor & 0x0f)
+                w83877_lpt_handler(dev);
+            break;
+        case 0x06:
+            if (valxor & 0x08)
+                w83877_fdc_handler(dev);
+            if (valxor & 0x04)
+                w83877_ide_handler(dev);
+            break;
+        case 0x07:
+            if (valxor & 0x03)
+                fdc_update_rwc(dev->fdc, 0, FDDA_TYPE);
+            if (valxor & 0x0c)
+                fdc_update_rwc(dev->fdc, 1, FDDB_TYPE);
+            if (valxor & 0x30)
+                fdc_update_rwc(dev->fdc, 2, FDDC_TYPE);
+            if (valxor & 0xc0)
+                fdc_update_rwc(dev->fdc, 3, FDDD_TYPE);
+            break;
+        case 0x08:
+            if (valxor & 0x03)
+                fdc_update_boot_drive(dev->fdc, FD_BOOT);
+            if (valxor & 0x10)
+                fdc_set_swwp(dev->fdc, SWWP ? 1 : 0);
+            if (valxor & 0x20)
+                fdc_set_diswr(dev->fdc, DISFDDWR ? 1 : 0);
+            break;
+        case 0x09:
+            if (valxor & 0x20)
+                fdc_update_enh_mode(dev->fdc, EN3MODE ? 1 : 0);
+            if (valxor & 0x40)
+                dev->rw_locked = (val & 0x40) ? 1 : 0;
+            if (valxor & 0x80)
+                w83877_lpt_handler(dev);
+            break;
+        case 0x0b:
+            if (valxor & 0x0c) {
+                fdc_clear_flags(dev->fdc, FDC_FLAG_PS2 | FDC_FLAG_PS2_MCA);
+                switch (val & 0x0c) {
+                    case 0x00:
+                        fdc_set_flags(dev->fdc, FDC_FLAG_PS2);
+                        break;
+                    case 0x04:
+                        fdc_set_flags(dev->fdc, FDC_FLAG_PS2_MCA);
+                        break;
+                }
+            }
+            if (valxor & 0x02)
+                fdc_update_densel_polarity(dev->fdc, INVERTZ ? 1 : 0);
+            if (valxor & 0x01)
+                fdc_update_drv2en(dev->fdc, DRV2EN_NEG ? 0 : 1);
+            break;
+        case 0x0c:
+            if (valxor & 0x20)
+                w83877_remap(dev);
+            break;
+        case 0x16:
+            if (valxor & 0x02) {
+                dev->regs[0x1e] = (val & 0x02) ? 0x81 : 0x00;
+                dev->regs[0x20] = (val & 0x02) ? 0xfc : 0x00;
+                dev->regs[0x21] = (val & 0x02) ? 0x7c : 0x00;
+                dev->regs[0x22] = (val & 0x02) ? 0xfd : 0x00;
+                dev->regs[0x23] = (val & 0x02) ? 0xde : 0x00;
+                dev->regs[0x24] = (val & 0x02) ? 0xfe : 0x00;
+                dev->regs[0x25] = (val & 0x02) ? 0xbe : 0x00;
+                dev->regs[0x26] = (val & 0x02) ? 0x23 : 0x00;
+                dev->regs[0x27] = (val & 0x02) ? 0x65 : 0x00;
+                dev->regs[0x28] = (val & 0x02) ? 0x43 : 0x00;
+                dev->regs[0x29] = (val & 0x02) ? 0x62 : 0x00;
+                w83877_fdc_handler(dev);
+                w83877_lpt_handler(dev);
+                w83877_serial_handler(dev, 0);
+                w83877_serial_handler(dev, 1);
+            }
+            if (valxor & 0x01)
+                w83877_remap(dev);
+            break;
+        case 0x19:
+            if (valxor & 0x02)
+                w83877_serial_handler(dev, 0);
+            if (valxor & 0x01)
+                w83877_serial_handler(dev, 1);
+            break;
+        case 0x20:
+            if (valxor)
+                w83877_fdc_handler(dev);
+            break;
+        case 0x21: case 0x22:
+            if (valxor)
+                w83877_ide_handler(dev);
+            break;
+        case 0x23:
+            if (valxor)
+                w83877_lpt_handler(dev);
+            break;
+        case 0x24:
+            if (valxor & 0xfe)
+                w83877_serial_handler(dev, 0);
+            break;
+        case 0x25:
+            if (valxor & 0xfe)
+                w83877_serial_handler(dev, 1);
+            break;
+        case 0x26:
+            if (valxor & 0x0f)
+                w83877_lpt_handler(dev);
+            if (valxor & 0xf0)
+                w83877_fdc_handler(dev);
+            break;
+        case 0x27:
+            if (valxor & 0xef)
+                w83877_lpt_handler(dev);
+            break;
+        case 0x28:
+            if (valxor & 0x0f) {
+                if ((dev->regs[0x28] & 0x0f) == 0)
+                    dev->regs[0x28] |= 0x03;
+                w83877_serial_handler(dev, 1);
+            }
+            if (valxor & 0xf0) {
+                if ((dev->regs[0x28] & 0xf0) == 0)
+                    dev->regs[0x28] |= 0x40;
+                w83877_serial_handler(dev, 0);
+            }
+            break;
+        case 0x29:
+            if (valxor & 0xf0)
+                w83877_fdc_handler(dev);
+            break;
+
+        default:
+            break;
+    }
+}
+
+static uint8_t
+w83877_read(uint16_t port, void *priv)
+{
+    w83877_t *dev = (w83877_t *) priv;
+    uint8_t    ret = 0xff;
+
+    if (dev->locked) {
+        if ((port == FDC_PRIMARY_ADDR) || (port == 0x251))
+            ret = dev->cur_reg;
+        else if ((port == 0x3f1) || (port == 0x252)) {
+            if (dev->cur_reg == 7)
+                ret = (fdc_get_rwc(dev->fdc, 0) | (fdc_get_rwc(dev->fdc, 1) << 2) | (fdc_get_rwc(dev->fdc, 2) << 4) | (fdc_get_rwc(dev->fdc, 3) << 6));
+            else if ((dev->cur_reg >= 0x18) || !dev->rw_locked)
+                ret = dev->regs[dev->cur_reg];
+        }
+    }
+
+    return ret;
+}
+
+static void
+w83877_reset(w83877_t *dev)
+{
+    fdc_reset(dev->fdc);
+
+    memset(dev->regs, 0, 256);
+    dev->regs[0x03] = 0x30;
+    dev->regs[0x07] = 0xf5;
+    dev->regs[0x09] = (dev->reg_init >> 8) & 0xff;
+    dev->regs[0x0a] = 0x1f;
+    dev->regs[0x0c] = 0x28;
+    dev->regs[0x0d] = 0xa3;
+    dev->regs[0x16] = (dev->reg_init & 0xff) | 0x02;
+    dev->regs[0x1e] = 0x81;
+    dev->regs[0x20] = 0xfc;
+    dev->regs[0x21] = 0x7c;
+    dev->regs[0x22] = 0xfd;
+    dev->regs[0x23] = 0xde;
+    dev->regs[0x24] = 0xfe;
+    dev->regs[0x25] = 0xbe;
+    dev->regs[0x26] = 0x23;
+    dev->regs[0x27] = 0x65;
+    dev->regs[0x28] = 0x43;
+    dev->regs[0x29] = 0x62;
+
+    w83877_fdc_handler(dev);
+    fdc_clear_flags(dev->fdc, FDC_FLAG_PS2 | FDC_FLAG_PS2_MCA);
+
+    w83877_lpt_handler(dev);
+
+    w83877_serial_handler(dev, 0);
+    w83877_serial_handler(dev, 1);
+
+    if (dev->has_ide)
+        w83877_ide_handler(dev);
+
+    dev->base_address = FDC_PRIMARY_ADDR;
+    dev->key          = 0x89;
+    dev->key_times    = 1;
+
+    w83877_remap(dev);
+
+    dev->locked    = 0;
+    dev->rw_locked = 0;
+}
+
+static void
+w83877_close(void *priv)
+{
+    w83877_t *dev = (w83877_t *) priv;
+
+    free(dev);
+}
+
+static void *
+w83877_init(const device_t *info)
+{
+    w83877_t *dev = (w83877_t *) calloc(1, sizeof(w83877_t));
+
+    dev->fdc = device_add(&fdc_at_winbond_device);
+
+    dev->uart[0] = device_add_inst(&ns16550_device, 1);
+    dev->uart[1] = device_add_inst(&ns16550_device, 2);
+
+    dev->lpt = device_add_inst(&lpt_port_device, 1);
+
+    dev->reg_init = info->local;
+
+    dev->has_ide = (info->local >> 16) & 0xff;
+
+    if (!strcmp(machine_get_internal_name(), "ficpa2012")) {
+        dev->dma_map[0] = 4;
+        dev->dma_map[1] = 3;
+        dev->dma_map[2] = 1;
+        dev->dma_map[3] = 2;
+    } else {
+        dev->dma_map[0] = 4;
+        for (int i = 1; i < 4; i++)
+            dev->dma_map[i] = i;
+    }
+
+    memset(dev->irq_map, 0xff, 16);
+    dev->irq_map[0] = 0xff;
+    for (int i = 1; i < 7; i++)
+         dev->irq_map[i] = i;
+    dev->irq_map[1] = 5;
+    dev->irq_map[5] = 7;
+    dev->irq_map[7] = 9;    /* Guesswork, I can't find a single BIOS that lets me assign IRQ_G to something. */
+    dev->irq_map[8] = 10;
+
+    w83877_reset(dev);
+
+    return dev;
+}
+
+const device_t w83877_device = {
+    .name          = "Winbond W83877F Super I/O",
+    .internal_name = "w83877",
+    .flags         = 0,
+    .local         = 0,
+    .init          = w83877_init,
+    .close         = w83877_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/sio/sio_w83877f.c b/src/sio/sio_w83877f.c
deleted file mode 100644
index c9a437630..000000000
--- a/src/sio/sio_w83877f.c
+++ /dev/null
@@ -1,516 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Emulation of the Winbond W83877F Super I/O Chip.
- *
- *          Winbond W83877F Super I/O Chip
- *          Used by the Award 430HX
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          Copyright 2016-2020 Miran Grca.
- */
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/device.h>
-#include <86box/io.h>
-#include <86box/timer.h>
-#include <86box/pci.h>
-#include <86box/mem.h>
-#include <86box/rom.h>
-#include <86box/lpt.h>
-#include <86box/serial.h>
-#include <86box/fdd.h>
-#include <86box/fdc.h>
-#include <86box/sio.h>
-
-#define FDDA_TYPE  (dev->regs[7] & 3)
-#define FDDB_TYPE  ((dev->regs[7] >> 2) & 3)
-#define FDDC_TYPE  ((dev->regs[7] >> 4) & 3)
-#define FDDD_TYPE  ((dev->regs[7] >> 6) & 3)
-
-#define FD_BOOT    (dev->regs[8] & 3)
-#define SWWP       ((dev->regs[8] >> 4) & 1)
-#define DISFDDWR   ((dev->regs[8] >> 5) & 1)
-
-#define EN3MODE    ((dev->regs[9] >> 5) & 1)
-
-#define DRV2EN_NEG (dev->regs[0xB] & 1)        /* 0 = drive 2 installed */
-#define INVERTZ    ((dev->regs[0xB] >> 1) & 1) /* 0 = invert DENSEL polarity */
-#define IDENT      ((dev->regs[0xB] >> 3) & 1)
-
-#define HEFERE     ((dev->regs[0xC] >> 5) & 1)
-
-#define HEFRAS     (dev->regs[0x16] & 1)
-
-#define PRTIQS     (dev->regs[0x27] & 0x0f)
-#define ECPIRQ     ((dev->regs[0x27] >> 5) & 0x07)
-
-typedef struct w83877f_t {
-    uint8_t   tries;
-    uint8_t   regs[42];
-    uint16_t  reg_init;
-    int       locked;
-    int       rw_locked;
-    int       cur_reg;
-    int       base_address;
-    int       key;
-    int       key_times;
-    fdc_t    *fdc;
-    serial_t *uart[2];
-} w83877f_t;
-
-static void    w83877f_write(uint16_t port, uint8_t val, void *priv);
-static uint8_t w83877f_read(uint16_t port, void *priv);
-
-static void
-w83877f_remap(w83877f_t *dev)
-{
-    uint8_t hefras = HEFRAS;
-
-    io_removehandler(0x250, 0x0003,
-                     w83877f_read, NULL, NULL, w83877f_write, NULL, NULL, dev);
-    io_removehandler(FDC_PRIMARY_ADDR, 0x0002,
-                     w83877f_read, NULL, NULL, w83877f_write, NULL, NULL, dev);
-    dev->base_address = (hefras ? FDC_PRIMARY_ADDR : 0x250);
-    io_sethandler(dev->base_address, hefras ? 0x0002 : 0x0003,
-                  w83877f_read, NULL, NULL, w83877f_write, NULL, NULL, dev);
-    dev->key_times = hefras + 1;
-    dev->key       = (hefras ? 0x86 : 0x88) | HEFERE;
-}
-
-static uint8_t
-get_lpt_length(w83877f_t *dev)
-{
-    uint8_t length = 4;
-
-    if (dev->regs[9] & 0x80) {
-        if (dev->regs[0] & 0x04)
-            length = 8; /* EPP mode. */
-        if (dev->regs[0] & 0x08)
-            length |= 0x80; /* ECP mode. */
-    }
-
-    return length;
-}
-
-static uint16_t
-make_port(w83877f_t *dev, uint8_t reg)
-{
-    uint16_t p = 0;
-    uint8_t  l;
-
-    switch (reg) {
-        case 0x20:
-            p = ((uint16_t) (dev->regs[reg] & 0xfc)) << 2;
-            p &= 0xFF0;
-            if ((p < 0x100) || (p > 0x3F0))
-                p = 0x3F0;
-            break;
-        case 0x23:
-            l = get_lpt_length(dev);
-            p = ((uint16_t) (dev->regs[reg] & 0xff)) << 2;
-            /* 8 ports in EPP mode, 4 in non-EPP mode. */
-            if ((l & 0x0f) == 8)
-                p &= 0x3F8;
-            else
-                p &= 0x3FC;
-            if ((p < 0x100) || (p > 0x3FF))
-                p = LPT1_ADDR;
-            /* In ECP mode, A10 is active. */
-            if (l & 0x80)
-                p |= 0x400;
-            break;
-        case 0x24:
-            p = ((uint16_t) (dev->regs[reg] & 0xfe)) << 2;
-            p &= 0xFF8;
-            if ((p < 0x100) || (p > 0x3F8))
-                p = COM1_ADDR;
-            break;
-        case 0x25:
-            p = ((uint16_t) (dev->regs[reg] & 0xfe)) << 2;
-            p &= 0xFF8;
-            if ((p < 0x100) || (p > 0x3F8))
-                p = COM2_ADDR;
-            break;
-
-        default:
-            break;
-    }
-
-    return p;
-}
-
-static void
-w83877f_fdc_handler(w83877f_t *dev)
-{
-    fdc_remove(dev->fdc);
-    if (dev->regs[0x20] & 0xc0)
-        fdc_set_base(dev->fdc, make_port(dev, 0x20));
-    fdc_set_power_down(dev->fdc, !!(dev->regs[6] & 0x08));
-}
-
-static void
-w83877f_lpt_handler(w83877f_t *dev)
-{
-    uint8_t lpt_irq;
-    uint8_t lpt_irqs[8] = { 0, 7, 9, 10, 11, 14, 15, 5 };
-
-    lpt1_remove();
-    if (!(dev->regs[4] & 0x80) && (dev->regs[0x23] & 0xc0))
-        lpt1_init(make_port(dev, 0x23));
-
-    lpt_irq = 0xff;
-
-    lpt_irq = lpt_irqs[ECPIRQ];
-    if (lpt_irq == 0)
-        lpt_irq = PRTIQS;
-
-    lpt1_irq(lpt_irq);
-}
-
-static void
-w83877f_serial_handler(w83877f_t *dev, int uart)
-{
-    int    reg_mask  = uart ? 0x10 : 0x20;
-    int    reg_id    = uart ? 0x25 : 0x24;
-    int    irq_mask  = uart ? 0x0f : 0xf0;
-    int    irq_shift = uart ? 0 : 4;
-    double clock_src = 24000000.0 / 13.0;
-
-    serial_remove(dev->uart[uart]);
-    if (!(dev->regs[4] & reg_mask) && (dev->regs[reg_id] & 0xc0))
-        serial_setup(dev->uart[uart], make_port(dev, reg_id), (dev->regs[0x28] & irq_mask) >> irq_shift);
-
-    if (dev->regs[0x19] & (0x02 >> uart)) {
-        clock_src = 14769000.0;
-    } else if (dev->regs[0x03] & (0x02 >> uart)) {
-        clock_src = 24000000.0 / 12.0;
-    } else {
-        clock_src = 24000000.0 / 13.0;
-    }
-
-    serial_set_clock_src(dev->uart[uart], clock_src);
-}
-
-static void
-w83877f_write(uint16_t port, uint8_t val, void *priv)
-{
-    w83877f_t *dev    = (w83877f_t *) priv;
-    uint8_t    valxor = 0;
-    uint8_t    max    = 0x2A;
-
-    if (port == 0x250) {
-        if (val == dev->key)
-            dev->locked = 1;
-        else
-            dev->locked = 0;
-        return;
-    } else if (port == 0x251) {
-        if (val <= max)
-            dev->cur_reg = val;
-        return;
-    } else if (port == FDC_PRIMARY_ADDR) {
-        if ((val == dev->key) && !dev->locked) {
-            if (dev->key_times == 2) {
-                if (dev->tries) {
-                    dev->locked = 1;
-                    dev->tries  = 0;
-                } else
-                    dev->tries++;
-            } else {
-                dev->locked = 1;
-                dev->tries  = 0;
-            }
-        } else {
-            if (dev->locked) {
-                if (val < max)
-                    dev->cur_reg = val;
-                if (val == 0xaa)
-                    dev->locked = 0;
-            } else {
-                if (dev->tries)
-                    dev->tries = 0;
-            }
-        }
-        return;
-    } else if ((port == 0x252) || (port == 0x3f1)) {
-        if (dev->locked) {
-            if (dev->rw_locked)
-                return;
-            if ((dev->cur_reg >= 0x26) && (dev->cur_reg <= 0x27))
-                return;
-            if (dev->cur_reg == 0x29)
-                return;
-            if (dev->cur_reg == 6)
-                val &= 0xFB;
-            valxor                  = val ^ dev->regs[dev->cur_reg];
-            dev->regs[dev->cur_reg] = val;
-        } else
-            return;
-    }
-
-    switch (dev->cur_reg) {
-        case 0:
-            if (valxor & 0x0c)
-                w83877f_lpt_handler(dev);
-            break;
-        case 1:
-            if (valxor & 0x80)
-                fdc_set_swap(dev->fdc, (dev->regs[1] & 0x80) ? 1 : 0);
-            break;
-        case 3:
-            if (valxor & 0x02)
-                w83877f_serial_handler(dev, 0);
-            if (valxor & 0x01)
-                w83877f_serial_handler(dev, 1);
-            break;
-        case 4:
-            if (valxor & 0x10)
-                w83877f_serial_handler(dev, 1);
-            if (valxor & 0x20)
-                w83877f_serial_handler(dev, 0);
-            if (valxor & 0x80)
-                w83877f_lpt_handler(dev);
-            break;
-        case 6:
-            if (valxor & 0x08)
-                w83877f_fdc_handler(dev);
-            break;
-        case 7:
-            if (valxor & 0x03)
-                fdc_update_rwc(dev->fdc, 0, FDDA_TYPE);
-            if (valxor & 0x0c)
-                fdc_update_rwc(dev->fdc, 1, FDDB_TYPE);
-            if (valxor & 0x30)
-                fdc_update_rwc(dev->fdc, 2, FDDC_TYPE);
-            if (valxor & 0xc0)
-                fdc_update_rwc(dev->fdc, 3, FDDD_TYPE);
-            break;
-        case 8:
-            if (valxor & 0x03)
-                fdc_update_boot_drive(dev->fdc, FD_BOOT);
-            if (valxor & 0x10)
-                fdc_set_swwp(dev->fdc, SWWP ? 1 : 0);
-            if (valxor & 0x20)
-                fdc_set_diswr(dev->fdc, DISFDDWR ? 1 : 0);
-            break;
-        case 9:
-            if (valxor & 0x20)
-                fdc_update_enh_mode(dev->fdc, EN3MODE ? 1 : 0);
-            if (valxor & 0x40)
-                dev->rw_locked = (val & 0x40) ? 1 : 0;
-            if (valxor & 0x80)
-                w83877f_lpt_handler(dev);
-            break;
-        case 0xB:
-            if (valxor & 1)
-                fdc_update_drv2en(dev->fdc, DRV2EN_NEG ? 0 : 1);
-            if (valxor & 2)
-                fdc_update_densel_polarity(dev->fdc, INVERTZ ? 1 : 0);
-            break;
-        case 0xC:
-            if (valxor & 0x20)
-                w83877f_remap(dev);
-            break;
-        case 0x16:
-            if (valxor & 1)
-                w83877f_remap(dev);
-            break;
-        case 0x19:
-            if (valxor & 0x02)
-                w83877f_serial_handler(dev, 0);
-            if (valxor & 0x01)
-                w83877f_serial_handler(dev, 1);
-            break;
-        case 0x20:
-            if (valxor)
-                w83877f_fdc_handler(dev);
-            break;
-        case 0x23:
-            if (valxor)
-                w83877f_lpt_handler(dev);
-            break;
-        case 0x24:
-            if (valxor & 0xfe)
-                w83877f_serial_handler(dev, 0);
-            break;
-        case 0x25:
-            if (valxor & 0xfe)
-                w83877f_serial_handler(dev, 1);
-            break;
-        case 0x27:
-            if (valxor & 0xef)
-                w83877f_lpt_handler(dev);
-            break;
-        case 0x28:
-            if (valxor & 0xf) {
-                if ((dev->regs[0x28] & 0x0f) == 0)
-                    dev->regs[0x28] |= 0x03;
-                w83877f_serial_handler(dev, 1);
-            }
-            if (valxor & 0xf0) {
-                if ((dev->regs[0x28] & 0xf0) == 0)
-                    dev->regs[0x28] |= 0x40;
-                w83877f_serial_handler(dev, 0);
-            }
-            break;
-
-        default:
-            break;
-    }
-}
-
-static uint8_t
-w83877f_read(uint16_t port, void *priv)
-{
-    w83877f_t *dev = (w83877f_t *) priv;
-    uint8_t    ret = 0xff;
-
-    if (dev->locked) {
-        if ((port == FDC_PRIMARY_ADDR) || (port == 0x251))
-            ret = dev->cur_reg;
-        else if ((port == 0x3f1) || (port == 0x252)) {
-            if (dev->cur_reg == 7)
-                ret = (fdc_get_rwc(dev->fdc, 0) | (fdc_get_rwc(dev->fdc, 1) << 2) | (fdc_get_rwc(dev->fdc, 2) << 4) | (fdc_get_rwc(dev->fdc, 3) << 6));
-            else if ((dev->cur_reg >= 0x18) || !dev->rw_locked)
-                ret = dev->regs[dev->cur_reg];
-        }
-    }
-
-    return ret;
-}
-
-static void
-w83877f_reset(w83877f_t *dev)
-{
-    fdc_reset(dev->fdc);
-
-    memset(dev->regs, 0, 0x2A);
-    dev->regs[0x03] = 0x30;
-    dev->regs[0x07] = 0xF5;
-    dev->regs[0x09] = (dev->reg_init >> 8) & 0xff;
-    dev->regs[0x0a] = 0x1F;
-    dev->regs[0x0c] = 0x28;
-    dev->regs[0x0d] = 0xA3;
-    dev->regs[0x16] = dev->reg_init & 0xff;
-    dev->regs[0x1e] = 0x81;
-    dev->regs[0x20] = (FDC_PRIMARY_ADDR >> 2) & 0xfc;
-    dev->regs[0x21] = (0x1f0 >> 2) & 0xfc;
-    dev->regs[0x22] = ((0x3f6 >> 2) & 0xfc) | 1;
-    dev->regs[0x23] = (LPT1_ADDR >> 2);
-    dev->regs[0x24] = (COM1_ADDR >> 2) & 0xfe;
-    dev->regs[0x25] = (COM2_ADDR >> 2) & 0xfe;
-    dev->regs[0x26] = (2 << 4) | 4;
-    dev->regs[0x27] = (2 << 4) | 5;
-    dev->regs[0x28] = (4 << 4) | 3;
-    dev->regs[0x29] = 0x62;
-
-    w83877f_fdc_handler(dev);
-
-    w83877f_lpt_handler(dev);
-
-    w83877f_serial_handler(dev, 0);
-    w83877f_serial_handler(dev, 1);
-
-    dev->base_address = FDC_PRIMARY_ADDR;
-    dev->key          = 0x89;
-    dev->key_times    = 1;
-
-    w83877f_remap(dev);
-
-    dev->locked    = 0;
-    dev->rw_locked = 0;
-}
-
-static void
-w83877f_close(void *priv)
-{
-    w83877f_t *dev = (w83877f_t *) priv;
-
-    free(dev);
-}
-
-static void *
-w83877f_init(const device_t *info)
-{
-    w83877f_t *dev = (w83877f_t *) malloc(sizeof(w83877f_t));
-    memset(dev, 0, sizeof(w83877f_t));
-
-    dev->fdc = device_add(&fdc_at_winbond_device);
-
-    dev->uart[0] = device_add_inst(&ns16550_device, 1);
-    dev->uart[1] = device_add_inst(&ns16550_device, 2);
-
-    dev->reg_init = info->local;
-
-    w83877f_reset(dev);
-
-    return dev;
-}
-
-const device_t w83877f_device = {
-    .name          = "Winbond W83877F Super I/O",
-    .internal_name = "w83877f",
-    .flags         = 0,
-    .local         = 0x0a05,
-    .init          = w83877f_init,
-    .close         = w83877f_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t w83877f_president_device = {
-    .name          = "Winbond W83877F Super I/O (President)",
-    .internal_name = "w83877f_president",
-    .flags         = 0,
-    .local         = 0x0a04,
-    .init          = w83877f_init,
-    .close         = w83877f_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t w83877tf_device = {
-    .name          = "Winbond W83877TF Super I/O",
-    .internal_name = "w83877tf",
-    .flags         = 0,
-    .local         = 0x0c04,
-    .init          = w83877f_init,
-    .close         = w83877f_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t w83877tf_acorp_device = {
-    .name          = "Winbond W83877TF Super I/O",
-    .internal_name = "w83877tf_acorp",
-    .flags         = 0,
-    .local         = 0x0c05,
-    .init          = w83877f_init,
-    .close         = w83877f_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
diff --git a/src/sio/sio_w83977.c b/src/sio/sio_w83977.c
new file mode 100644
index 000000000..a14e50942
--- /dev/null
+++ b/src/sio/sio_w83977.c
@@ -0,0 +1,1344 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Implementation of the Winbond W83977 Super I/O Chips.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2025 Miran Grca.
+ */
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/device.h>
+#include <86box/pci.h>
+#include <86box/pic.h>
+#include <86box/lpt.h>
+#include <86box/serial.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/keyboard.h>
+#include <86box/machine.h>
+#include <86box/nvr.h>
+#include <86box/apm.h>
+#include <86box/plat.h>
+#include <86box/plat_unused.h>
+#include <86box/video.h>
+#include <86box/sio.h>
+#include "cpu.h"
+
+typedef struct w83977_gpio_t {
+    uint8_t       id;
+    uint8_t       reg;
+    uint8_t       pulldn;
+    uint8_t       pad;
+
+    uint8_t       alt[4];
+
+    uint16_t      base;
+
+    void *        parent;
+} w83977_gpio_t;
+
+typedef struct w83977_t {
+    uint8_t       id;
+    uint8_t       hefras;
+    uint8_t       has_nvr;
+    uint8_t       tries;
+    uint8_t       lockreg;
+    uint8_t       gpio_reg;
+    uint8_t       regs[48];
+    uint8_t       ld_regs[11][256];
+    uint16_t      kbc_type;
+    uint16_t      superio_base;
+    uint16_t      fdc_base;
+    uint16_t      lpt_base;
+    uint16_t      nvr_base;
+    uint16_t      kbc_base[2];
+    uint16_t      gpio_base; /* Set to EA */
+    uint16_t      uart_base[2];
+    int           locked;
+    int           cur_reg;
+    uint32_t      type;
+    w83977_gpio_t gpio[3];
+    fdc_t        *fdc;
+    nvr_t        *nvr;
+    void         *kbc;
+    serial_t     *uart[2];
+    lpt_t        *lpt;
+} w83977_t;
+
+static int next_id = 0;
+
+static void    w83977_write(uint16_t port, uint8_t val, void *priv);
+static uint8_t w83977_read(uint16_t port, void *priv);
+
+static uint16_t
+make_port(const w83977_t *dev, const uint8_t ld)
+{
+    const uint16_t r0 = dev->ld_regs[ld][0x60];
+    const uint16_t r1 = dev->ld_regs[ld][0x61];
+
+    const uint16_t p = (r0 << 8) + r1;
+
+    return p;
+}
+
+static uint16_t
+make_port_sec(const w83977_t *dev, const uint8_t ld)
+{
+    const uint16_t r0 = dev->ld_regs[ld][0x62];
+    const uint16_t r1 = dev->ld_regs[ld][0x63];
+
+    const uint16_t p = (r0 << 8) + r1;
+
+    return p;
+}
+
+static __inline uint8_t
+w83977_do_read_gp(w83977_gpio_t *dev, int reg, int bit)
+{
+    return dev->reg & dev->pulldn & (1 << bit);
+}
+
+static __inline uint8_t
+w83977_do_read_alt(const w83977_gpio_t *dev, int alt, int reg, int bit)
+{
+    return dev->alt[alt] & (1 << bit);
+}
+
+static uint8_t
+w83977_read_gp(const w83977_gpio_t *dev, int bit)
+{
+    uint8_t   reg         = dev->id;
+    w83977_t *sio         = (w83977_t *) dev->parent;
+    uint8_t   gp_func_reg = sio->ld_regs[0x07 + reg - 1][0xe0 + ((((reg - 1) << 3) + bit) & 0x0f)];
+    uint8_t   gp_func;
+    uint8_t   ret         = 1 << bit;
+
+    if (gp_func_reg & 0x01)  switch (reg) {
+        default:
+            /* Do nothing, this GP does not exist. */
+            break;
+        case 1:
+            switch (bit) {
+               default:
+                    gp_func = (gp_func_reg >> 3) & 0x03;
+                    if (gp_func == 0x00)
+                        ret = w83977_do_read_gp((w83977_gpio_t *) dev, reg - 1, bit);
+                    else
+                        ret = w83977_do_read_alt(dev, gp_func - 1, reg - 1, bit);
+                    break;
+                case 0: case 1:
+                    gp_func = (gp_func_reg >> 3) & 0x01;
+                    if (gp_func == 0x00)
+                        ret = w83977_do_read_gp((w83977_gpio_t *) dev, reg - 1, bit);
+                    else
+                        ret = w83977_do_read_alt(dev, 0, reg - 1, bit);
+                    break;
+               case 4:
+                    gp_func = (gp_func_reg >> 3) & 0x03;
+                    if (gp_func == 0x00)
+                        ret = w83977_do_read_gp((w83977_gpio_t *) dev, reg - 1, bit);
+                    else if (gp_func == 0x02)
+                        ret = kbc_at_read_p(sio->kbc, 1, 0x80) ? (1 << bit) : 0x00;
+                    else
+                        ret = w83977_do_read_alt(dev, gp_func - 1, reg - 1, bit);
+                    break;
+            }
+            break;
+        case 2:
+            switch (bit) {
+                default:
+                    break;
+               case 0:
+                    gp_func = (gp_func_reg >> 3) & 0x03;
+                    if (gp_func == 0x00)
+                        ret = w83977_do_read_gp((w83977_gpio_t *) dev, reg - 1, bit);
+                    else if (gp_func == 0x02)
+                        ret = kbc_at_read_p(sio->kbc, 2, 0x01) ? (1 << bit) : 0x00;
+                    else
+                        ret = w83977_do_read_alt(dev, gp_func - 1, reg - 1, bit);
+                    break;
+               case 1 ... 4:
+                    gp_func = (gp_func_reg >> 3) & 0x03;
+                    if (gp_func == 0x00)
+                        ret = w83977_do_read_gp((w83977_gpio_t *) dev, reg - 1, bit);
+                    else if (gp_func == 0x02)
+                        ret = kbc_at_read_p(sio->kbc, 1, 1 << (bit + 2)) ? (1 << bit) : 0x00;
+                    else
+                        ret = w83977_do_read_alt(dev, gp_func - 1, reg - 1, bit);
+                    break;
+                case 5:
+                    gp_func = (gp_func_reg >> 3) & 0x01;
+                    if (gp_func == 0x00)
+                        ret = w83977_do_read_gp((w83977_gpio_t *) dev, reg, bit);
+                    else
+                        ret = kbc_at_read_p(sio->kbc, 2, 0x02) ? (1 << bit) : 0x00;
+                    break;
+                case 6: case 7:
+                    /* Do nothing, these bits do not exist. */
+                    break;
+            }
+            break;
+        case 3:
+            if (sio->type == W83977TF)  switch (bit) {
+                default:
+                    break;
+               case 0 ... 4:
+                    gp_func = (gp_func_reg >> 3) & 0x03;
+                    if (gp_func == 0x00)
+                        ret = w83977_do_read_gp((w83977_gpio_t *) dev, reg - 1, bit);
+                    else
+                        ret = w83977_do_read_alt(dev, gp_func - 1, reg - 1, bit);
+                    break;
+                case 5 ... 7:
+                    /* Do nothing, these bits have no function. */
+                    break;
+            }
+            break;
+    }
+
+    if (gp_func_reg & 0x02)
+        ret ^= (1 << bit);
+
+    return ret;
+}
+
+static __inline void
+w83977_do_write_gp(w83977_gpio_t *dev, int reg, int bit, int set)
+{
+    dev->reg = (dev->reg & ~(1 << bit)) | (set << bit);
+}
+
+static __inline void
+w83977_do_write_alt(w83977_gpio_t *dev, int alt, int reg, int bit, int set)
+{
+    dev->alt[alt] = (dev->alt[alt] & ~(1 << bit)) | (set << bit);
+}
+
+static void
+w83977_write_gp(w83977_gpio_t *dev, int bit, int set)
+{
+    uint8_t   reg         = dev->id;
+    w83977_t *sio         = (w83977_t *) dev->parent;
+    uint8_t   gp_func_reg = sio->ld_regs[0x07 + reg - 1][0xe0 + ((((reg - 1) << 3) + bit) & 0x0f)];
+    uint8_t   gp_func;
+
+    if (gp_func_reg & 0x02)
+        set = !set;
+
+    if (!(gp_func_reg & 0x01))  switch (reg) {
+        default:
+            /* Do nothing, this GP does not exist. */
+            break;
+        case 1:
+            switch (bit) {
+               default:
+                    gp_func = (gp_func_reg >> 3) & 0x03;
+                    if (gp_func == 0x00)
+                        w83977_do_write_gp(dev, reg - 1, bit, set);
+                    else
+                        w83977_do_write_alt(dev, gp_func - 1, reg - 1, bit, set);
+                    break;
+                case 0: case 1:
+                    gp_func = (gp_func_reg >> 3) & 0x01;
+                    if (gp_func == 0x00)
+                        w83977_do_write_gp(dev, reg - 1, bit, set);
+                    else
+                        w83977_do_write_alt(dev, 0, reg - 1, bit, set);
+                    break;
+               case 4:
+                    gp_func = (gp_func_reg >> 3) & 0x03;
+                    if (gp_func == 0x00)
+                        w83977_do_write_gp(dev, reg - 1, bit, set);
+                    else if (gp_func == 0x02)
+                        kbc_at_write_p(sio->kbc, 1, 0x7f, set << 7);
+                    else
+                        w83977_do_write_alt(dev, gp_func - 1, reg - 1, bit, set);
+                    break;
+            }
+            break;
+        case 2:
+            switch (bit) {
+                default:
+                    break;
+               case 0:
+                    gp_func = (gp_func_reg >> 3) & 0x03;
+                    if (gp_func == 0x00)
+                        w83977_do_write_gp(dev, reg - 1, bit, set);
+                    else if (gp_func == 0x02)
+                        kbc_at_write_p(sio->kbc, 2, 0xfe, set);
+                    else
+                        w83977_do_write_alt(dev, gp_func - 1, reg - 1, bit, set);
+                    break;
+               case 1 ... 4:
+                    gp_func = (gp_func_reg >> 3) & 0x03;
+                    if (gp_func == 0x00)
+                        w83977_do_write_gp(dev, reg - 1, bit, set);
+                    else if (gp_func == 0x02)
+                        kbc_at_write_p(sio->kbc, 1, ~(1 << (bit + 2)), set << (bit + 2));
+                    else
+                        w83977_do_write_alt(dev, gp_func - 1, reg - 1, bit, set);
+                    break;
+                case 5:
+                    gp_func = (gp_func_reg >> 3) & 0x01;
+                    if (gp_func == 0x00)
+                        w83977_do_write_gp(dev, reg - 1, bit, set);
+                    else
+                        kbc_at_write_p(sio->kbc, 2, 0xfd, set << 1);
+                    break;
+                case 6: case 7:
+                    /* Do nothing, these bits do not exist. */
+                    break;
+            }
+            break;
+        case 3:
+            if (sio->type == W83977TF)  switch (bit) {
+                default:
+                    break;
+               case 0 ... 4:
+                    gp_func = (gp_func_reg >> 3) & 0x03;
+                    if (gp_func == 0x00)
+                        w83977_do_write_gp(dev, reg - 1, bit, set);
+                    else
+                        w83977_do_write_alt(dev, gp_func - 1, reg - 1, bit, set);
+                    break;
+                case 5 ... 7:
+                    /* Do nothing, these bits have no function. */
+                    break;
+            }
+            break;
+    }
+}
+
+static uint8_t
+w83977_gpio_read(uint16_t port, void *priv)
+{
+    const w83977_gpio_t *dev = (w83977_gpio_t *) priv;
+    uint8_t              ret = 0x00;
+
+    for (uint8_t i = 0; i < 8; i++)
+        ret |= w83977_read_gp(dev, i);
+
+    return ret;
+}
+
+static void
+w83977_gpio_write(uint16_t port, uint8_t val, void *priv)
+{
+    w83977_gpio_t *dev = (w83977_gpio_t *) priv;
+
+    for (uint8_t i = 0; i < 8; i++)
+        w83977_write_gp(dev, i, val & (1 << i));
+}
+
+static void
+w83977_superio_handler(w83977_t *dev)
+{
+    if (dev->superio_base != 0x0000)
+        io_removehandler(dev->superio_base, 0x0002,
+                         w83977_read, NULL, NULL, w83977_write, NULL, NULL, dev);
+
+    dev->superio_base = (dev->regs[0x26] & 0x40) ? 0x0370 : 0x03f0;
+
+    io_sethandler(dev->superio_base, 0x0002,
+                  w83977_read, NULL, NULL, w83977_write, NULL, NULL, dev);
+}
+
+static void
+w83977_fdc_handler(w83977_t *dev)
+{
+    const uint8_t  global_enable = !!(dev->regs[0x22] & (1 << 0));
+    const uint8_t  local_enable  = !!dev->ld_regs[0][0x30];
+    const uint16_t old_base      = dev->fdc_base;
+
+    dev->fdc_base = 0x0000;
+
+    if (global_enable && local_enable)
+        dev->fdc_base = make_port(dev, 0) & 0xfff8;
+
+    if (dev->fdc_base != old_base) {
+        if ((dev->id != 1) && (old_base >= 0x0100) && (old_base <= 0x0ff8))
+            fdc_remove(dev->fdc);
+
+        if ((dev->id != 1) && (dev->fdc_base >= 0x0100) && (dev->fdc_base <= 0x0ff8))
+            fdc_set_base(dev->fdc, dev->fdc_base);
+    }
+}
+
+static void
+w83977_lpt_handler(w83977_t *dev)
+{
+    uint16_t ld_port         = 0x0000;
+    uint16_t mask            = 0xfffc;
+    uint8_t  global_enable   = !!(dev->regs[0x22] & (1 << 3));
+    uint8_t  local_enable    = !!dev->ld_regs[1][0x30];
+    uint8_t  lpt_irq         = dev->ld_regs[1][0x70];
+    uint8_t  lpt_dma         = dev->ld_regs[1][0x74];
+    uint8_t  lpt_mode        = dev->ld_regs[1][0xf0] & 0x07;
+    uint8_t  irq_readout[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x08,
+                                 0x00, 0x10, 0x18, 0x20, 0x00, 0x00, 0x28, 0x30 };
+
+    if (lpt_irq > 15)
+        lpt_irq = 0xff;
+
+    if (lpt_dma >= 4)
+        lpt_dma = 0xff;
+
+    lpt_port_remove(dev->lpt);
+    lpt_set_fifo_threshold(dev->lpt, (dev->ld_regs[1][0xf0] & 0x78) >> 3);
+    switch (lpt_mode) {
+        default:
+        case 0x04:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x00:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 1);
+            break;
+        case 0x01: case 0x05:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 0);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x02:
+            lpt_set_epp(dev->lpt, 0);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+        case 0x03: case 0x07:
+            mask = 0xfff8;
+            lpt_set_epp(dev->lpt, 1);
+            lpt_set_ecp(dev->lpt, 1);
+            lpt_set_ext(dev->lpt, 0);
+            break;
+    }
+    if (global_enable && local_enable) {
+        ld_port = (make_port(dev, 1) & 0xfffc) & mask;
+        if ((ld_port >= 0x0100) && (ld_port <= (0x0ffc & mask)))
+            lpt_port_setup(dev->lpt, ld_port);
+    }
+    lpt_port_irq(dev->lpt, lpt_irq);
+    lpt_port_dma(dev->lpt, lpt_dma);
+
+    lpt_set_cnfgb_readout(dev->lpt, ((lpt_irq > 15) ? 0x00 : irq_readout[lpt_irq]) | 0x07);
+}
+
+static void
+w83977_serial_handler(w83977_t *dev, const int uart)
+{
+    const uint8_t  uart_no       = 2 + uart;
+    const uint8_t  global_enable = !!(dev->regs[0x22] & (1 << uart_no));
+    const uint8_t  local_enable  = !!dev->ld_regs[uart_no][0x30];
+    const uint16_t old_base      = dev->uart_base[uart];
+    double         clock_src     = 24000000.0 / 13.0;
+
+    dev->uart_base[uart] = 0x0000;
+
+    if (global_enable && local_enable)
+        dev->uart_base[uart] = make_port(dev, uart_no) & 0xfff8;
+
+    if (dev->uart_base[uart] != old_base) {
+        if ((old_base >= 0x0100) && (old_base <= 0x0ff8))
+            serial_remove(dev->uart[uart]);
+
+        if ((dev->uart_base[uart] >= 0x0100) && (dev->uart_base[uart] <= 0x0ff8))
+            serial_setup(dev->uart[uart], dev->uart_base[uart], dev->ld_regs[uart_no][0x70]);
+    }
+
+    switch (dev->ld_regs[uart_no][0xf0] & 0x03) {
+        case 0x00:
+            clock_src = 24000000.0 / 13.0;
+            break;
+        case 0x01:
+            clock_src = 24000000.0 / 12.0;
+            break;
+        case 0x02:
+            clock_src = 24000000.0 / 1.0;
+            break;
+        case 0x03:
+            clock_src = 24000000.0 / 1.625;
+            break;
+
+        default:
+            break;
+    }
+
+    serial_set_clock_src(dev->uart[uart], clock_src);
+
+    serial_irq(dev->uart[uart], dev->ld_regs[uart_no][0x70]);
+}
+
+static void
+w83977_nvr_handler(w83977_t *dev)
+{
+    uint8_t        local_enable = !!dev->ld_regs[6][0x30];
+    const uint16_t old_base     = dev->nvr_base;
+
+    local_enable &= (((dev->ld_regs[6][0xf0] & 0xe0) == 0x80) ||
+                     ((dev->ld_regs[6][0xf0] & 0xe0) == 0xe0));
+
+    dev->nvr_base = 0x0000;
+
+    if (local_enable)
+        dev->nvr_base = make_port(dev, 6) & 0xfffe;
+
+    if (dev->nvr_base != old_base) {
+        if ((dev->id != 1) && dev->has_nvr && (old_base > 0x0000) && (old_base <= 0x0ffe))
+            nvr_at_handler(0, dev->nvr_base, dev->nvr);
+
+        if ((dev->id != 1) && dev->has_nvr && (dev->nvr_base > 0x0000) && (dev->nvr_base <= 0x0ffe))
+            nvr_at_handler(1, dev->nvr_base, dev->nvr);
+    }
+}
+
+static void
+w83977_kbc_handler(w83977_t *dev)
+{
+    const uint8_t  local_enable = !!dev->ld_regs[5][0x30];
+    const uint16_t old_base = dev->kbc_base[0];
+    const uint16_t old_base2 = dev->kbc_base[1];
+
+    dev->kbc_base[0] = dev->kbc_base[1] = 0x0000;
+
+    if (local_enable) {
+        dev->kbc_base[0] = make_port(dev, 5);
+        dev->kbc_base[1] = make_port_sec(dev, 5);
+    }
+
+    if (dev->kbc_base[0] != old_base) {
+        if ((dev->id != 1) && (dev->kbc != NULL) && (old_base >= 0x0100) && (old_base <= 0x0ff8))
+            kbc_at_port_handler(0, 0, old_base, dev->kbc);
+
+        if ((dev->id != 1) && (dev->kbc != NULL) && (dev->kbc_base[0] >= 0x0100) && (dev->kbc_base[0] <= 0x0ff8))
+            kbc_at_port_handler(0, 1, dev->kbc_base[0], dev->kbc);
+    }
+
+    if (dev->kbc_base[1] != old_base2) {
+        if ((dev->id != 1) && (dev->kbc != NULL) && (old_base2 >= 0x0100) && (old_base2 <= 0x0ff8))
+            kbc_at_port_handler(1, 0, old_base2, dev->kbc);
+
+        if ((dev->id != 1) && (dev->kbc != NULL) && (dev->kbc_base[1] >= 0x0100) && (dev->kbc_base[1] <= 0x0ff8))
+            kbc_at_port_handler(1, 1, dev->kbc_base[1], dev->kbc);
+    }
+
+    if ((dev->id != 1) && (dev->kbc != NULL)) {
+        kbc_at_set_irq(0, dev->ld_regs[5][0x70], dev->kbc);
+        kbc_at_set_irq(1, dev->ld_regs[5][0x72], dev->kbc);
+    }
+}
+
+static void
+w83977_gpio_handler(w83977_t *dev, const int gpio)
+{
+    const uint8_t  gpio_no      = 7 + gpio;
+    const uint8_t  local_enable = !!dev->ld_regs[gpio_no][0x30];
+    const uint16_t old_base     = dev->gpio[gpio].base;
+
+    dev->gpio[gpio].base = 0x0000;
+
+    if (local_enable)
+        dev->gpio[gpio].base = make_port(dev, gpio_no) & 0xfff8;
+
+    if (dev->gpio[gpio].base != old_base) {
+        if ((old_base >= 0x0100) && (old_base <= 0x0ff8))
+            io_removehandler(old_base, 0x0002,
+                             w83977_gpio_read, NULL, NULL, w83977_gpio_write, NULL, NULL, dev);
+
+        if ((dev->gpio[gpio].base >= 0x0100) && (dev->gpio[gpio].base <= 0x0ff8))
+            io_sethandler(dev->gpio[gpio].base, 0x0002,
+                          w83977_gpio_read, NULL, NULL, w83977_gpio_write, NULL, NULL, dev);
+    }
+}
+
+static void
+w83977_state_change(w83977_t *dev, const uint8_t locked)
+{
+    dev->locked = locked;
+
+    if (dev->id != 1)
+        fdc_3f1_enable(dev->fdc, !locked);
+}
+
+static void
+w83977_write(uint16_t port, uint8_t val, void *priv)
+{
+    w83977_t *dev    = (w83977_t *) priv;
+    uint8_t   index  = !(port & 1);
+    uint8_t   valxor;
+
+    if (index) {
+        if ((val == 0x87) && !dev->locked) {
+            if (dev->tries) {
+                w83977_state_change(dev, 1);
+                dev->tries = 0;
+            } else
+                dev->tries++;
+        } else if (dev->locked) {
+            if (val == 0xaa)
+                w83977_state_change(dev, 0);
+            else
+                dev->cur_reg = val;
+        } else if (dev->tries)
+            dev->tries = 0;
+    } else if (dev->locked && !dev->lockreg) {
+        if (dev->cur_reg < 0x30) {
+            valxor = val ^ dev->regs[dev->cur_reg];
+
+            switch (dev->cur_reg) {
+                case 0x02:
+                    dev->regs[dev->cur_reg] = val;
+                    if (val == 0x02)
+                        w83977_state_change(dev, 0);
+                    break;
+                case 0x07:
+                case 0x2c ... 0x2f:
+                    dev->regs[dev->cur_reg] = val;
+                    break;
+                case 0x22:
+                    if (dev->type == W83977F)
+                        dev->regs[dev->cur_reg] = val & 0x3d;
+                    else
+                        dev->regs[dev->cur_reg] = val & 0x39;
+
+                    if (valxor & 0x01)
+                        w83977_fdc_handler(dev);
+                    if (valxor & 0x08)
+                        w83977_lpt_handler(dev);
+                    if (valxor & 0x10)
+                        w83977_serial_handler(dev, 0);
+                    if (valxor & 0x20)
+                        w83977_serial_handler(dev, 1);
+                    break;
+                case 0x23:
+                    if (dev->type == W83977F)
+                        dev->regs[dev->cur_reg] = val & 0x3f;
+                    else
+                        dev->regs[dev->cur_reg] = (dev->regs[dev->cur_reg] & 0xfe) | (val & 0x01);
+                    break;
+                case 0x24:
+                    if (dev->type == W83977F)
+                        dev->regs[dev->cur_reg] = (dev->regs[dev->cur_reg] & 0x04) | (val & 0xf3);
+                    else
+                        dev->regs[dev->cur_reg] = (dev->regs[dev->cur_reg] & 0x04) | (val & 0xc1);
+                    break;
+                case 0x25:
+                    if (dev->type == W83977F)
+                        dev->regs[dev->cur_reg] = val & 0x3d;
+                    else
+                        dev->regs[dev->cur_reg] = val & 0x39;
+                    break;
+                case 0x26:
+                    if (dev->type == W83977F)
+                        dev->regs[dev->cur_reg] = val;
+                    else
+                        dev->regs[dev->cur_reg] = val & 0xef;
+                    dev->lockreg = !!(val & 0x20);
+                    w83977_superio_handler(dev);
+                    break;
+                case 0x28:
+                    dev->regs[dev->cur_reg] = val & 0x17;
+                    break;
+                case 0x2a:
+                    if (dev->type == W83977TF)
+                        dev->regs[dev->cur_reg] = val & 0xf3;
+                    else
+                        dev->regs[dev->cur_reg] = val;
+                    break;
+                case 0x2b:
+                    if (dev->type == W83977TF)
+                        dev->regs[dev->cur_reg] = val & 0xf9;
+                    else
+                        dev->regs[dev->cur_reg] = val;
+                    break;
+
+                default:
+                    break;
+            }
+        } else {
+            valxor = val ^ dev->ld_regs[dev->regs[7]][dev->cur_reg];
+
+            if (dev->regs[7] <= 0x0a)  switch (dev->regs[7]) {
+                case 0x00:    /* FDD */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x70:
+                        case 0x74:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                dev->regs[0x22] |= 0x01;
+                            if (valxor)
+                                w83977_fdc_handler(dev);
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((valxor & 0x01) && (val & 0x01)) {
+                                uint8_t reg_f2 = dev->ld_regs[dev->regs[7]][0xf2];
+
+                                fdc_update_rwc(dev->fdc, 3, (reg_f2 & 0xc0) >> 6);
+                                fdc_update_rwc(dev->fdc, 2, (reg_f2 & 0x30) >> 4);
+                                fdc_update_rwc(dev->fdc, 1, (reg_f2 & 0x0c) >> 2);
+                                fdc_update_rwc(dev->fdc, 0, (reg_f2 & 0x03));
+                            } else {
+                                fdc_update_rwc(dev->fdc, 3, 0x00);
+                                fdc_update_rwc(dev->fdc, 2, 0x00);
+                                fdc_update_rwc(dev->fdc, 1, 0x00);
+                                fdc_update_rwc(dev->fdc, 0, 0x00);
+                            }
+                            if (valxor & 0x0c) {
+                                fdc_clear_flags(dev->fdc, FDC_FLAG_PS2 | FDC_FLAG_PS2_MCA);
+                                switch (val & 0x0c) {
+                                    case 0x00:
+                                        fdc_set_flags(dev->fdc, FDC_FLAG_PS2);
+                                        break;
+                                    case 0x04:
+                                        fdc_set_flags(dev->fdc, FDC_FLAG_PS2_MCA);
+                                        break;
+                                }
+                            }
+                            if (valxor & 0x10)
+                                fdc_set_swap(dev->fdc, (val & 0x10) >> 4);
+                            break;
+                        case 0xf1:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if (valxor & 0x01)
+                                fdc_set_swwp(dev->fdc, !!(val & 0x01));
+                            if (valxor & 0x02)
+                                fdc_set_diswr(dev->fdc, !!(val & 0x02));
+                            if (valxor & 0x0c)
+                                fdc_update_densel_force(dev->fdc, (val & 0xc) >> 2);
+                            break;
+                        case 0xf2:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if (dev->ld_regs[dev->regs[7]][0xf0] & 0x01) {
+                                if (valxor & 0xc0)
+                                    fdc_update_rwc(dev->fdc, 3, (val & 0xc0) >> 6);
+                                if (valxor & 0x30)
+                                    fdc_update_rwc(dev->fdc, 2, (val & 0x30) >> 4);
+                                if (valxor & 0x0c)
+                                    fdc_update_rwc(dev->fdc, 1, (val & 0x0c) >> 2);
+                                if (valxor & 0x03)
+                                    fdc_update_rwc(dev->fdc, 0, (val & 0x03));
+                            }
+                            break;
+                        case 0xf4 ... 0xf7:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x5b;
+
+                            if (valxor & 0x18)
+                                fdc_update_drvrate(dev->fdc, dev->cur_reg - 0xf4,
+                                                   (val & 0x18) >> 3);
+                            break;
+                    }
+                    break;
+                case 0x01:    /* Parallel Port */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x70:
+                        case 0x74:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                dev->regs[0x22] |= 0x08;
+                            if (valxor)
+                                w83977_lpt_handler(dev);
+                            break;
+                        /*
+                           Bits 2:0: Mode:
+                               - 000: Bi-directional (SPP);
+                               - 001: EPP-1.9 and SPP;
+                               - 010: ECP;
+                               - 011: ECP and EPP-1.9;
+                               - 100: Printer Mode (Default);
+                               - 101: EPP-1.7 and SPP;
+                               - 110: ECP and EPP-1.7.
+                           Bits 6:3: ECP FIFO Threshold.
+                         */
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            if (valxor)
+                                w83977_lpt_handler(dev);
+                            break;
+                    }
+                    break;
+                case 0x02:    /* Serial port 1 */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x70:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                dev->regs[0x22] |= 0x10;
+                            if (valxor)
+                                w83977_serial_handler(dev, 0);
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x03;
+
+                            if (valxor & 0x03)
+                                w83977_serial_handler(dev, 0);
+                            break;
+                    }
+                    break;
+                case 0x03:    /* Serial port 2 */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x70:
+                        case 0x74:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->cur_reg == 0x30) && (val & 0x01))
+                                dev->regs[0x22] |= 0x20;
+                            if (valxor)
+                                w83977_serial_handler(dev, 1);
+                            break;
+                        case 0xf0:
+                            if (dev->type == W83977F)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x03;
+                            else
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x0f;
+
+                            if (valxor & 0x03)
+                                w83977_serial_handler(dev, 1);
+                            break;
+                        case 0xf1:
+                            if (dev->type != W83977F)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x7f;
+                            break;
+                    }
+                    break;
+                case 0x04:    /* Real Time Clock */
+                    if (dev->type == W83977F)  switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x70:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if (valxor)
+                                w83977_nvr_handler(dev);
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if ((dev->id != 1) && dev->has_nvr && valxor) {
+                                nvr_lock_set(0x80, 0x20, !!(dev->ld_regs[6][dev->cur_reg] & 0x01), dev->nvr);
+                                nvr_lock_set(0xa0, 0x20, !!(dev->ld_regs[6][dev->cur_reg] & 0x02), dev->nvr);
+                                nvr_lock_set(0xc0, 0x20, !!(dev->ld_regs[6][dev->cur_reg] & 0x04), dev->nvr);
+                                nvr_lock_set(0xe0, 0x20, !!(dev->ld_regs[6][dev->cur_reg] & 0x08), dev->nvr);
+
+                                nvr_bank_set(0, val >> 6, dev->nvr);
+                            }
+                            break;
+                    }
+                    break;
+                case 0x05:    /* KBC */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x62: case 0x63:
+                        case 0x70: case 0x72:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if (valxor)
+                                w83977_kbc_handler(dev);
+                            break;
+                        case 0xf0:
+                            if (dev->type == W83977F)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0xc7;
+                            else
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x83;
+                            if (valxor & 0x01)
+                                kbc_at_set_fast_reset(val & 0x01);
+                            break;
+                    }
+                    break;
+                case 0x06:    /* IR */
+                    if (dev->type == W83977F)  switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x70:
+                        case 0x74: case 0x75:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x0f;
+                            break;
+                    }
+                    break;
+                case 0x07:    /* GP I/O Port I */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x62: case 0x63:
+                        case 0x64: case 0x65:
+                        case 0x70: case 0x72:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if (valxor)
+                                w83977_gpio_handler(dev, 0);
+                            break;
+                        case 0xe0 ... 0xe7:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x1b;
+                            break;
+                        case 0xf1:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x03;
+                            break;
+                    }
+                    break;
+                case 0x08:    /* GP I/O Port II */
+                    switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x70: case 0x72:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if (valxor)
+                                w83977_gpio_handler(dev, 0);
+                            break;
+                        case 0xe8 ... 0xed:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x1f;
+                            break;
+                        case 0xee:
+                            if (dev->type == W83977TF)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x1f;
+                            break;
+                        case 0xf0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x08;
+                            break;
+                        case 0xf2:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            break;
+                        case 0xf3:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x0e;
+                            break;
+                        case 0xf4:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x0f;
+                            break;
+                    }
+                    break;
+                case 0x09:    /* GP I/O Port III */
+                    if (dev->type == W83977TF)  switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x60: case 0x61:
+                        case 0x62: case 0x63:
+                        case 0x64: case 0x65:
+                        case 0x70: case 0x72:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+
+                            if (valxor)
+                                w83977_gpio_handler(dev, 0);
+                            break;
+                        case 0xe0 ... 0xe7:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x1b;
+                            break;
+                        case 0xf1:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x07;
+                            break;
+                    }
+                    break;
+                case 0x0a:    /* ACPI */
+                    if (dev->type != W83977F)  switch (dev->cur_reg) {
+                        case 0x30:
+                        case 0x70:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            break;
+                        case 0x60: case 0x61:
+                        case 0x62: case 0x63:
+                        case 0x64: case 0x65:
+                            if (dev->type == W83977TF)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            break;
+                        case 0xe0:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0xf7;
+                            break;
+                        case 0xe1: case 0xe2:
+                        case 0xfe: case 0xff:
+                            dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            break;
+                        case 0xe4:
+                            if (dev->type == W83977EF)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0xf0;
+                            else
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val;
+                            break;
+                        case 0xe5:
+                            if (dev->type == W83977EF)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x7f;
+                            break;
+                        case 0xe7:
+                            if (dev->type == W83977EF)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x03;
+                            break;
+                        case 0xf0:
+                            if (dev->type == W83977EF)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0xcf;
+                            else
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x8f;
+                            break;
+                        case 0xf1:
+                            if (dev->type == W83977EF)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] &= ~(val & 0xcf);
+                            else
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] &= ~(val & 0x0f);
+                            break;
+                        case 0xf2:
+                            if (dev->type != W83977EF)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] &= ~(val & 0x0f);
+                            break;
+                        case 0xf3:
+                            if (dev->type == W83977EF)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] &= ~(val & 0x7f);
+                            else
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] &= ~(val & 0x3f);
+                            break;
+                        case 0xf4:
+                            if (dev->type == W83977EF)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] &= ~(val & 0x17);
+                            else
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x0f;
+                            break;
+                        case 0xf5:
+                            if (dev->type != W83977EF)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x0f;
+                            break;
+                        case 0xf6:
+                            if (dev->type == W83977EF)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x7f;
+                            else
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x3f;
+                            break;
+                        case 0xf7:
+                            if (dev->type == W83977EF)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x17;
+                            else
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x01;
+                            break;
+                        case 0xf9:
+                            if (dev->type == W83977EF)
+                                dev->ld_regs[dev->regs[7]][dev->cur_reg] = val & 0x07;
+                            break;
+                    }
+                    break;
+            }
+        }
+    }
+} 
+
+static uint8_t
+w83977_read(uint16_t port, void *priv)
+{
+    w83977_t *dev   = (w83977_t *) priv;
+    uint8_t      index = (port & 1) ? 0 : 1;
+    uint8_t      ret   = 0xff;
+
+    if (dev->locked) {
+        if (index)
+            ret = dev->cur_reg;
+        else {
+            if (dev->cur_reg < 0x30) {
+                if (dev->cur_reg == 0x20)
+                    ret = dev->type >> (W83977_TYPE_SHIFT + 8);
+                else if (dev->cur_reg == 0x21)
+                    ret = (dev->type >> W83977_TYPE_SHIFT) & 0xff;
+                else
+                    ret = dev->regs[dev->cur_reg];
+            } else if ((dev->regs[7] == 0x0a) && (dev->cur_reg == 0xe3)) {
+                ret = dev->ld_regs[dev->regs[7]][dev->cur_reg];
+                if (dev->type == W83977EF)
+                    dev->ld_regs[dev->regs[7]][dev->cur_reg] &= ~0x17;
+                else
+                    dev->ld_regs[dev->regs[7]][dev->cur_reg] &= ~0x07;
+            } else if (dev->regs[7] <= 0x0a) {
+                if ((dev->regs[7] == 0x00) && (dev->cur_reg == 0xf2))
+                    ret = (fdc_get_rwc(dev->fdc, 0) | (fdc_get_rwc(dev->fdc, 1) << 2) |
+                          (fdc_get_rwc(dev->fdc, 2) << 4) | (fdc_get_rwc(dev->fdc, 3) << 6));
+                else
+                    ret = dev->ld_regs[dev->regs[7]][dev->cur_reg];
+            }
+        }
+    }
+
+    return ret;
+}
+
+static void
+w83977_reset(void *priv)
+{
+    w83977_t *dev = (w83977_t *) priv;
+
+    dev->lockreg = 0;
+
+    memset(dev->regs, 0x00, sizeof(dev->regs));
+
+    dev->regs[0x03] = 0x03;
+    dev->regs[0x20] = dev->type >> (W83977_TYPE_SHIFT + 8);
+    dev->regs[0x21] = (dev->type >> W83977_TYPE_SHIFT) & 0xff;
+    dev->regs[0x22] = 0xff;
+    dev->regs[0x23] = (dev->type != W83977F) ? 0xfe : 0x00;
+    dev->regs[0x24] = 0x80;
+    dev->regs[0x26] = dev->hefras << 6;
+
+    for (uint8_t i = 0; i <= 0x0a; i++)
+        memset(dev->ld_regs[i], 0x00, 256);
+
+    /* Logical device 0: FDD */
+    dev->ld_regs[0x00][0x30] = 0x01;
+    dev->ld_regs[0x00][0x60] = 0x03;
+    dev->ld_regs[0x00][0x61] = (dev->id == 1) ? 0x70 : 0xf0;
+    dev->ld_regs[0x00][0x70] = 0x06;
+    if (dev->type == W83977F)
+        dev->ld_regs[0x00][0x71] = 0x02;
+    dev->ld_regs[0x00][0x74] = 0x02;
+    dev->ld_regs[0x00][0xf0] = 0x0e;
+    dev->ld_regs[0x00][0xf2] = 0xff;
+
+    /* Logical device 1: Parallel Port */
+    dev->ld_regs[0x01][0x30] = 0x01;
+    dev->ld_regs[0x01][0x60] = (dev->id == 1) ? 0x02 : 0x03;
+    dev->ld_regs[0x01][0x61] = 0x78;
+    dev->ld_regs[0x01][0x70] = (dev->id == 1) ? 0x05 : 0x07;
+    if (dev->type == W83977F)
+        dev->ld_regs[0x01][0x71] = 0x02;
+    dev->ld_regs[0x01][0x74] = 0x04;
+    dev->ld_regs[0x01][0xf0] = 0x3f;
+
+    /* Logical device 2: Serial Port 1 */
+    dev->ld_regs[0x02][0x30] = 0x01;
+    dev->ld_regs[0x02][0x60] = 0x03;
+    dev->ld_regs[0x02][0x61] = (dev->id == 1) ? 0xe8 : 0xf8;
+    dev->ld_regs[0x02][0x70] = 0x04;
+    if (dev->type == W83977F)
+        dev->ld_regs[0x02][0x71] = 0x02;
+    serial_irq(dev->uart[0], dev->ld_regs[2][0x70]);
+
+    /* Logical device 3: Serial Port 2 */
+    dev->ld_regs[0x03][0x30] = 0x01;
+    dev->ld_regs[0x03][0x60] = 0x02;
+    dev->ld_regs[0x03][0x61] = (dev->id == 1) ? 0xe8 : 0xf8;
+    dev->ld_regs[0x03][0x70] = 0x03;
+    if (dev->type == W83977F)
+        dev->ld_regs[0x03][0x71] = 0x02;
+    dev->ld_regs[0x03][0x74] = 0x04;
+    serial_irq(dev->uart[1], dev->ld_regs[3][0x70]);
+
+    if (dev->type == W83977F) {
+        /* Logical device 4: Real Time Clock */
+        dev->ld_regs[0x04][0x30] = 0x01;
+        dev->ld_regs[0x04][0x61] = 0x70;
+        dev->ld_regs[0x04][0x70] = 0x08;
+    }
+
+    /* Logical device 5: KBC */
+    dev->ld_regs[0x05][0x30] = 0x01;
+    dev->ld_regs[0x05][0x61] = 0x60;
+    dev->ld_regs[0x05][0x63] = 0x64;
+    dev->ld_regs[0x05][0x70] = 0x01;
+    if (dev->type == W83977F)
+        dev->ld_regs[0x05][0x71] = 0x02;
+    dev->ld_regs[0x05][0x72] = 0x0c;
+    if (dev->type == W83977F)
+        dev->ld_regs[0x05][0x73] = 0x02;
+    if (dev->type == W83977F)
+        dev->ld_regs[0x05][0xf0] = 0x40;
+    else
+        dev->ld_regs[0x05][0xf0] = 0x83;
+
+    if (dev->type == W83977F) {
+        /* Logical device 6: IR */
+        dev->ld_regs[0x06][0x71] = 0x02;
+        dev->ld_regs[0x06][0x74] = 0x04;
+    }
+
+    /* Logical device 7: GP I/O Port I */
+    if (dev->type == W83977F)
+        dev->ld_regs[0x07][0x71] = 0x02;
+    dev->ld_regs[0x07][0xe0] = 0x01;
+    dev->ld_regs[0x07][0xe1] = 0x01;
+    dev->ld_regs[0x07][0xe2] = 0x01;
+    dev->ld_regs[0x07][0xe3] = 0x01;
+    dev->ld_regs[0x07][0xe4] = 0x01;
+    dev->ld_regs[0x07][0xe5] = 0x01;
+    dev->ld_regs[0x07][0xe6] = 0x01;
+    dev->ld_regs[0x07][0xe7] = 0x01;
+
+    /* Logical device 8: GP I/O Port II */
+    if (dev->type == W83977F)
+        dev->ld_regs[0x08][0x71] = 0x02;
+    dev->ld_regs[0x08][0xe8] = 0x01;
+    dev->ld_regs[0x08][0xe9] = 0x01;
+    dev->ld_regs[0x08][0xea] = 0x01;
+    dev->ld_regs[0x08][0xeb] = 0x01;
+    dev->ld_regs[0x08][0xec] = 0x01;
+    dev->ld_regs[0x08][0xed] = 0x01;
+    if (dev->type == W83977TF)
+        dev->ld_regs[0x08][0xee] = 0x01;
+
+    if (dev->type == W83977TF) {
+        /* Logical device 9: GP I/O Port III */
+        dev->ld_regs[0x09][0xe0] = 0x01;
+        dev->ld_regs[0x09][0xe1] = 0x01;
+        dev->ld_regs[0x09][0xe2] = 0x01;
+        dev->ld_regs[0x09][0xe3] = 0x01;
+        dev->ld_regs[0x09][0xe4] = 0x01;
+        dev->ld_regs[0x09][0xe5] = 0x01;
+        dev->ld_regs[0x09][0xe6] = 0x01;
+        dev->ld_regs[0x09][0xe7] = 0x01;
+    }
+
+    /* Logical device A: ACPI - not on W83977F */
+    if (dev->type == W83977EF)
+        dev->ld_regs[0x0a][0xe3] = 0x10;
+
+    w83977_lpt_handler(dev);
+    w83977_serial_handler(dev, 0);
+    w83977_serial_handler(dev, 1);
+
+    /* W83977EF has ACPI but no ACPI I/O ports. */
+
+    if (dev->id != 1) {
+        fdc_clear_flags(dev->fdc, FDC_FLAG_PS2 | FDC_FLAG_PS2_MCA);
+        fdc_reset(dev->fdc);
+
+        w83977_fdc_handler(dev);
+
+        if ((dev->type == W83977F) && dev->has_nvr) {
+            w83977_nvr_handler(dev);
+            nvr_bank_set(0, 0, dev->nvr);
+
+            nvr_lock_set(0x80, 0x20, 0, dev->nvr);
+            nvr_lock_set(0xa0, 0x20, 0, dev->nvr);
+            nvr_lock_set(0xc0, 0x20, 0, dev->nvr);
+            nvr_lock_set(0xe0, 0x20, 0, dev->nvr);
+        }
+
+        w83977_kbc_handler(dev);
+    }
+
+    w83977_superio_handler(dev);
+
+    for (int i = 0; i < 3; i++) {
+        dev->gpio[i].reg    = 0xff;
+        dev->gpio[i].pulldn = 0xff;
+
+        w83977_gpio_handler(dev, i);
+    }
+
+    dev->locked = 0;
+}
+
+static void
+w83977_close(void *priv)
+{
+    w83977_t *dev = (w83977_t *) priv;
+
+    next_id = 0;
+
+    free(dev);
+}
+
+static void *
+w83977_init(const device_t *info)
+{
+    w83977_t *dev = (w83977_t *) calloc(1, sizeof(w83977_t));
+
+    dev->hefras    = info->local & W83977_370;
+
+    dev->id = next_id;
+
+    if (next_id == 1)
+        dev->hefras   ^= W83977_370;
+    else
+        dev->fdc       = device_add(&fdc_at_smc_device);
+
+    dev->uart[0]   = device_add_inst(&ns16550_device, (next_id << 1) + 1);
+    dev->uart[1]   = device_add_inst(&ns16550_device, (next_id << 1) + 2);
+
+    dev->lpt       = device_add_inst(&lpt_port_device, next_id + 1);
+
+    dev->type      = info->local & W83977_TYPE;
+
+    dev->kbc_type  = info->local & W83977_KBC;
+
+    dev->has_nvr   = !(info->local & W83977_NO_NVR);
+
+    if (dev->has_nvr && (dev->id != 1)) {
+        dev->nvr = device_add(&amstrad_megapc_nvr_device);
+
+        nvr_bank_set(0, 0, dev->nvr);
+    }
+
+    switch (dev->kbc_type) {
+        case W83977_AMI:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_AMI | 0x00004800));
+            break;
+        case W83977_PHOENIX:
+            dev->kbc = device_add_params(&kbc_at_device, (void *) (KBC_VEN_PHOENIX | 0x00041900));
+            break;
+    }
+
+    /* Set the defaults here so the ports can be removed by w83977_reset(). */
+    dev->fdc_base     = (dev->id == 1) ? 0x0000 : 0x03f0;
+    dev->lpt_base     = (dev->id == 1) ? 0x0278 : 0x0378;
+    dev->uart_base[0] = (dev->id == 1) ? 0x03e8 : 0x03f8;
+    dev->uart_base[1] = (dev->id == 1) ? 0x02e8 : 0x02f8;
+    dev->nvr_base     = (dev->id == 1) ? 0x0000 : 0x0070;
+    dev->kbc_base[0]  = (dev->id == 1) ? 0x0000 : 0x0060;
+    dev->kbc_base[1]  = (dev->id == 1) ? 0x0000 : 0x0064;
+
+    for (int i = 0; i < 3; i++) {
+        dev->gpio[i].id     = i + 1;
+ 
+        dev->gpio[i].reg    = 0xff;
+        dev->gpio[i].pulldn = 0xff;
+
+        for (int j = 0; j < 4; j++)
+            dev->gpio[i].alt[j] = 0xff;
+
+        dev->gpio[i].parent = dev;
+    }
+
+    w83977_reset(dev);
+
+    next_id++;
+
+    return dev;
+}
+
+const device_t w83977_device = {
+    .name          = "SMC FDC37C93x Super I/O",
+    .internal_name = "w83977",
+    .flags         = 0,
+    .local         = 0,
+    .init          = w83977_init,
+    .close         = w83977_close,
+    .reset         = w83977_reset,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/sio/sio_w83977f.c b/src/sio/sio_w83977f.c
deleted file mode 100644
index 063f0ca69..000000000
--- a/src/sio/sio_w83977f.c
+++ /dev/null
@@ -1,687 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Emulation of the Winbond W83977F Super I/O Chip.
- *
- *          Winbond W83977F Super I/O Chip
- *          Used by the Award 430TX
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          Copyright 2016-2020 Miran Grca.
- */
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/device.h>
-#include <86box/io.h>
-#include <86box/timer.h>
-#include <86box/pci.h>
-#include <86box/mem.h>
-#include <86box/rom.h>
-#include <86box/lpt.h>
-#include <86box/serial.h>
-#include <86box/fdd.h>
-#include <86box/fdc.h>
-#include <86box/sio.h>
-
-#define HEFRAS (dev->regs[0x26] & 0x40)
-
-typedef struct w83977f_t {
-    uint8_t   id;
-    uint8_t   tries;
-    uint8_t   regs[48];
-    uint8_t   dev_regs[256][208];
-    int       locked;
-    int       rw_locked;
-    int       cur_reg;
-    int       base_address;
-    int       type;
-    int       hefras;
-    fdc_t    *fdc;
-    serial_t *uart[2];
-} w83977f_t;
-
-static int next_id = 0;
-
-static void    w83977f_write(uint16_t port, uint8_t val, void *priv);
-static uint8_t w83977f_read(uint16_t port, void *priv);
-
-static void
-w83977f_remap(w83977f_t *dev)
-{
-    io_removehandler(FDC_PRIMARY_ADDR, 0x0002,
-                     w83977f_read, NULL, NULL, w83977f_write, NULL, NULL, dev);
-    io_removehandler(FDC_SECONDARY_ADDR, 0x0002,
-                     w83977f_read, NULL, NULL, w83977f_write, NULL, NULL, dev);
-
-    dev->base_address = (HEFRAS ? FDC_SECONDARY_ADDR : FDC_PRIMARY_ADDR);
-
-    io_sethandler(dev->base_address, 0x0002,
-                  w83977f_read, NULL, NULL, w83977f_write, NULL, NULL, dev);
-}
-
-static uint8_t
-get_lpt_length(w83977f_t *dev)
-{
-    uint8_t length = 4;
-
-    if (((dev->dev_regs[1][0xc0] & 0x07) != 0x00) && ((dev->dev_regs[1][0xc0] & 0x07) != 0x02) && ((dev->dev_regs[1][0xc0] & 0x07) != 0x04))
-        length = 8;
-
-    return length;
-}
-
-static void
-w83977f_fdc_handler(w83977f_t *dev)
-{
-    uint16_t io_base = (dev->dev_regs[0][0x30] << 8) | dev->dev_regs[0][0x31];
-
-    if (dev->id == 1)
-        return;
-
-    fdc_remove(dev->fdc);
-
-    if ((dev->dev_regs[0][0x00] & 0x01) && (dev->regs[0x22] & 0x01) && (io_base >= 0x100) && (io_base <= 0xff8))
-        fdc_set_base(dev->fdc, io_base);
-
-    fdc_set_irq(dev->fdc, dev->dev_regs[0][0x40] & 0x0f);
-}
-
-static void
-w83977f_lpt_handler(w83977f_t *dev)
-{
-    uint16_t io_mask;
-    uint16_t io_base = (dev->dev_regs[1][0x30] << 8) | dev->dev_regs[1][0x31];
-    int      io_len = get_lpt_length(dev);
-    io_base &= (0xff8 | io_len);
-    io_mask = 0xffc;
-    if (io_len == 8)
-        io_mask = 0xff8;
-
-    if (dev->id == 1) {
-        lpt2_remove();
-
-        if ((dev->dev_regs[1][0x00] & 0x01) && (dev->regs[0x22] & 0x08) && (io_base >= 0x100) && (io_base <= io_mask))
-            lpt2_init(io_base);
-
-        lpt2_irq(dev->dev_regs[1][0x40] & 0x0f);
-    } else {
-        lpt1_remove();
-
-        if ((dev->dev_regs[1][0x00] & 0x01) && (dev->regs[0x22] & 0x08) && (io_base >= 0x100) && (io_base <= io_mask))
-            lpt1_init(io_base);
-
-        lpt1_irq(dev->dev_regs[1][0x40] & 0x0f);
-    }
-}
-
-static void
-w83977f_serial_handler(w83977f_t *dev, int uart)
-{
-    uint16_t io_base   = (dev->dev_regs[2 + uart][0x30] << 8) | dev->dev_regs[2 + uart][0x31];
-    double   clock_src = 24000000.0 / 13.0;
-
-    serial_remove(dev->uart[uart]);
-
-    if ((dev->dev_regs[2 + uart][0x00] & 0x01) && (dev->regs[0x22] & (0x10 << uart)) && (io_base >= 0x100) && (io_base <= 0xff8))
-        serial_setup(dev->uart[uart], io_base, dev->dev_regs[2 + uart][0x40] & 0x0f);
-
-    switch (dev->dev_regs[2 + uart][0xc0] & 0x03) {
-        case 0x00:
-            clock_src = 24000000.0 / 13.0;
-            break;
-        case 0x01:
-            clock_src = 24000000.0 / 12.0;
-            break;
-        case 0x02:
-            clock_src = 24000000.0 / 1.0;
-            break;
-        case 0x03:
-            clock_src = 24000000.0 / 1.625;
-            break;
-
-        default:
-            break;
-    }
-
-    serial_set_clock_src(dev->uart[uart], clock_src);
-}
-
-static void
-w83977f_write(uint16_t port, uint8_t val, void *priv)
-{
-    w83977f_t *dev    = (w83977f_t *) priv;
-    uint8_t    index  = (port & 1) ? 0 : 1;
-    uint8_t    valxor = 0;
-    uint8_t    ld     = dev->regs[7];
-
-    if (index) {
-        if ((val == 0x87) && !dev->locked) {
-            if (dev->tries) {
-                dev->locked = 1;
-                dev->tries  = 0;
-            } else
-                dev->tries++;
-        } else {
-            if (dev->locked) {
-                if (val == 0xaa)
-                    dev->locked = 0;
-                else
-                    dev->cur_reg = val;
-            } else {
-                if (dev->tries)
-                    dev->tries = 0;
-            }
-        }
-        return;
-    } else {
-        if (dev->locked) {
-            if (dev->rw_locked)
-                return;
-            if (dev->cur_reg >= 0x30) {
-                valxor                                 = val ^ dev->dev_regs[ld][dev->cur_reg - 0x30];
-                dev->dev_regs[ld][dev->cur_reg - 0x30] = val;
-            } else {
-                valxor                  = val ^ dev->regs[dev->cur_reg];
-                dev->regs[dev->cur_reg] = val;
-            }
-        } else
-            return;
-    }
-
-    switch (dev->cur_reg) {
-        case 0x02:
-#if 0
-            if (valxor & 0x02)
-                    softresetx86();
-#endif
-            break;
-        case 0x22:
-            if (valxor & 0x20)
-                w83977f_serial_handler(dev, 1);
-            if (valxor & 0x10)
-                w83977f_serial_handler(dev, 0);
-            if (valxor & 0x08)
-                w83977f_lpt_handler(dev);
-            if (valxor & 0x01)
-                w83977f_fdc_handler(dev);
-            break;
-        case 0x26:
-            if (valxor & 0x40)
-                w83977f_remap(dev);
-            if (valxor & 0x20)
-                dev->rw_locked = (val & 0x20) ? 1 : 0;
-            break;
-        case 0x30:
-            if (valxor & 0x01)
-                switch (ld) {
-                    case 0x00:
-                        w83977f_fdc_handler(dev);
-                        break;
-                    case 0x01:
-                        w83977f_lpt_handler(dev);
-                        break;
-                    case 0x02:
-                    case 0x03:
-                        w83977f_serial_handler(dev, ld - 2);
-                        break;
-
-                    default:
-                        break;
-                }
-            break;
-        case 0x60:
-        case 0x61:
-            if (valxor & 0xff)
-                switch (ld) {
-                    case 0x00:
-                        w83977f_fdc_handler(dev);
-                        break;
-                    case 0x01:
-                        w83977f_lpt_handler(dev);
-                        break;
-                    case 0x02:
-                    case 0x03:
-                        w83977f_serial_handler(dev, ld - 2);
-                        break;
-
-                    default:
-                        break;
-                }
-            break;
-        case 0x70:
-            if (valxor & 0x0f)
-                switch (ld) {
-                    case 0x00:
-                        w83977f_fdc_handler(dev);
-                        break;
-                    case 0x01:
-                        w83977f_lpt_handler(dev);
-                        break;
-                    case 0x02:
-                    case 0x03:
-                        w83977f_serial_handler(dev, ld - 2);
-                        break;
-
-                    default:
-                        break;
-                }
-            break;
-        case 0xf0:
-            switch (ld) {
-                case 0x00:
-                    if (dev->id == 1)
-                        break;
-
-                    if (!dev->id && (valxor & 0x20))
-                        fdc_update_drv2en(dev->fdc, (val & 0x20) ? 0 : 1);
-                    if (!dev->id && (valxor & 0x10))
-                        fdc_set_swap(dev->fdc, (val & 0x10) ? 1 : 0);
-                    if (!dev->id && (valxor & 0x01))
-                        fdc_update_enh_mode(dev->fdc, (val & 0x01) ? 1 : 0);
-                    break;
-                case 0x01:
-                    if (valxor & 0x07)
-                        w83977f_lpt_handler(dev);
-                    break;
-                case 0x02:
-                case 0x03:
-                    if (valxor & 0x03)
-                        w83977f_serial_handler(dev, ld - 2);
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-        case 0xf1:
-            switch (ld) {
-                case 0x00:
-                    if (dev->id == 1)
-                        break;
-
-                    if (!dev->id && (valxor & 0xc0))
-                        fdc_update_boot_drive(dev->fdc, (val & 0xc0) >> 6);
-                    if (!dev->id && (valxor & 0x0c))
-                        fdc_update_densel_force(dev->fdc, (val & 0x0c) >> 2);
-                    if (!dev->id && (valxor & 0x02))
-                        fdc_set_diswr(dev->fdc, (val & 0x02) ? 1 : 0);
-                    if (!dev->id && (valxor & 0x01))
-                        fdc_set_swwp(dev->fdc, (val & 0x01) ? 1 : 0);
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-        case 0xf2:
-            switch (ld) {
-                case 0x00:
-                    if (dev->id == 1)
-                        break;
-
-                    if (!dev->id && (valxor & 0xc0))
-                        fdc_update_rwc(dev->fdc, 3, (val & 0xc0) >> 6);
-                    if (!dev->id && (valxor & 0x30))
-                        fdc_update_rwc(dev->fdc, 2, (val & 0x30) >> 4);
-                    if (!dev->id && (valxor & 0x0c))
-                        fdc_update_rwc(dev->fdc, 1, (val & 0x0c) >> 2);
-                    if (!dev->id && (valxor & 0x03))
-                        fdc_update_rwc(dev->fdc, 0, val & 0x03);
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-        case 0xf4:
-        case 0xf5:
-        case 0xf6:
-        case 0xf7:
-            switch (ld) {
-                case 0x00:
-                    if (dev->id == 1)
-                        break;
-
-                    if (!dev->id && (valxor & 0x18))
-                        fdc_update_drvrate(dev->fdc, dev->cur_reg & 0x03, (val & 0x18) >> 3);
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-
-        default:
-            break;
-    }
-}
-
-static uint8_t
-w83977f_read(uint16_t port, void *priv)
-{
-    w83977f_t *dev   = (w83977f_t *) priv;
-    uint8_t    ret   = 0xff;
-    uint8_t    index = (port & 1) ? 0 : 1;
-    uint8_t    ld    = dev->regs[7];
-
-    if (dev->locked) {
-        if (index)
-            ret = dev->cur_reg;
-        else {
-            if (!dev->rw_locked) {
-                if (!dev->id && ((dev->cur_reg == 0xf2) && (ld == 0x00)))
-                    ret = (fdc_get_rwc(dev->fdc, 0) | (fdc_get_rwc(dev->fdc, 1) << 2) | (fdc_get_rwc(dev->fdc, 2) << 4) | (fdc_get_rwc(dev->fdc, 3) << 6));
-                else if (dev->cur_reg >= 0x30)
-                    ret = dev->dev_regs[ld][dev->cur_reg - 0x30];
-                else
-                    ret = dev->regs[dev->cur_reg];
-            }
-        }
-    }
-
-    return ret;
-}
-
-static void
-w83977f_reset(w83977f_t *dev)
-{
-    memset(dev->regs, 0, 48);
-    for (uint16_t i = 0; i < 256; i++)
-        memset(dev->dev_regs[i], 0, 208);
-
-    if (dev->type < 2) {
-        dev->regs[0x20] = 0x97;
-        dev->regs[0x21] = dev->type ? 0x73 : 0x71;
-    } else {
-        dev->regs[0x20] = 0x52;
-        dev->regs[0x21] = 0xf0;
-    }
-    dev->regs[0x22] = 0xff;
-    dev->regs[0x24] = dev->type ? 0x84 : 0xa4;
-    dev->regs[0x26] = dev->hefras;
-
-    /* WARNING: Array elements are register - 0x30. */
-    /* Logical Device 0 (FDC) */
-    dev->dev_regs[0][0x00] = 0x01;
-    if (!dev->type)
-        dev->dev_regs[0][0x01] = 0x02;
-    if (next_id == 1) {
-        dev->dev_regs[0][0x30] = 0x03;
-        dev->dev_regs[0][0x31] = 0x70;
-    } else {
-        dev->dev_regs[0][0x30] = 0x03;
-        dev->dev_regs[0][0x31] = 0xf0;
-    }
-    dev->dev_regs[0][0x40] = 0x06;
-    if (!dev->type)
-        dev->dev_regs[0][0x41] = 0x02; /* Read-only */
-    dev->dev_regs[0][0x44] = 0x02;
-    dev->dev_regs[0][0xc0] = 0x0e;
-
-    /* Logical Device 1 (Parallel Port) */
-    dev->dev_regs[1][0x00] = 0x01;
-    if (!dev->type)
-        dev->dev_regs[1][0x01] = 0x02;
-    if (next_id == 1) {
-        dev->dev_regs[1][0x30] = 0x02;
-        dev->dev_regs[1][0x31] = 0x78;
-        dev->dev_regs[1][0x40] = 0x05;
-    } else {
-        dev->dev_regs[1][0x30] = 0x03;
-        dev->dev_regs[1][0x31] = 0x78;
-        dev->dev_regs[1][0x40] = 0x07;
-    }
-    if (!dev->type)
-        dev->dev_regs[1][0x41] = 0x01 /*0x02*/; /* Read-only */
-    dev->dev_regs[1][0x44] = 0x04;
-    dev->dev_regs[1][0xc0] = 0x3c; /* The datasheet says default is 3f, but also default is printer mode. */
-
-    /* Logical Device 2 (UART A) */
-    dev->dev_regs[2][0x00] = 0x01;
-    if (!dev->type)
-        dev->dev_regs[2][0x01] = 0x02;
-    if (next_id == 1) {
-        dev->dev_regs[2][0x30] = 0x03;
-        dev->dev_regs[2][0x31] = 0xe8;
-    } else {
-        dev->dev_regs[2][0x30] = 0x03;
-        dev->dev_regs[2][0x31] = 0xf8;
-    }
-    dev->dev_regs[2][0x40] = 0x04;
-    if (!dev->type)
-        dev->dev_regs[2][0x41] = 0x02; /* Read-only */
-
-    /* Logical Device 3 (UART B) */
-    dev->dev_regs[3][0x00] = 0x01;
-    if (!dev->type)
-        dev->dev_regs[3][0x01] = 0x02;
-    if (next_id == 1) {
-        dev->dev_regs[3][0x30] = 0x02;
-        dev->dev_regs[3][0x31] = 0xe8;
-    } else {
-        dev->dev_regs[3][0x30] = 0x02;
-        dev->dev_regs[3][0x31] = 0xf8;
-    }
-    dev->dev_regs[3][0x40] = 0x03;
-    if (!dev->type)
-        dev->dev_regs[3][0x41] = 0x02; /* Read-only */
-
-    /* Logical Device 4 (RTC) */
-    if (!dev->type) {
-        dev->dev_regs[4][0x00] = 0x01;
-        dev->dev_regs[4][0x01] = 0x02;
-        dev->dev_regs[4][0x30] = 0x00;
-        dev->dev_regs[4][0x31] = 0x70;
-        dev->dev_regs[4][0x40] = 0x08;
-        dev->dev_regs[4][0x41] = 0x02; /* Read-only */
-    }
-
-    /* Logical Device 5 (KBC) */
-    dev->dev_regs[5][0x00] = 0x01;
-    if (!dev->type)
-        dev->dev_regs[5][0x01] = 0x02;
-    dev->dev_regs[5][0x30] = 0x00;
-    dev->dev_regs[5][0x31] = 0x60;
-    dev->dev_regs[5][0x32] = 0x00;
-    dev->dev_regs[5][0x33] = 0x64;
-    dev->dev_regs[5][0x40] = 0x01;
-    if (!dev->type)
-        dev->dev_regs[5][0x41] = 0x02; /* Read-only */
-    dev->dev_regs[5][0x42] = 0x0c;
-    if (!dev->type)
-        dev->dev_regs[5][0x43] = 0x02; /* Read-only? */
-    dev->dev_regs[5][0xc0] = dev->type ? 0x83 : 0x40;
-
-    /* Logical Device 6 (IR) = UART C */
-    if (!dev->type) {
-        dev->dev_regs[6][0x01] = 0x02;
-        dev->dev_regs[6][0x41] = 0x02; /* Read-only */
-        dev->dev_regs[6][0x44] = 0x04;
-        dev->dev_regs[6][0x45] = 0x04;
-    }
-
-    /* Logical Device 7 (Auxiliary I/O Part I) */
-    if (!dev->type)
-        dev->dev_regs[7][0x01] = 0x02;
-    if (!dev->type)
-        dev->dev_regs[7][0x41] = 0x02; /* Read-only */
-    if (!dev->type)
-        dev->dev_regs[7][0x43] = 0x02; /* Read-only? */
-    dev->dev_regs[7][0xb0] = 0x01;
-    dev->dev_regs[7][0xb1] = 0x01;
-    dev->dev_regs[7][0xb2] = 0x01;
-    dev->dev_regs[7][0xb3] = 0x01;
-    dev->dev_regs[7][0xb4] = 0x01;
-    dev->dev_regs[7][0xb5] = 0x01;
-    dev->dev_regs[7][0xb6] = 0x01;
-    if (dev->type)
-        dev->dev_regs[7][0xb7] = 0x01;
-
-    /* Logical Device 8 (Auxiliary I/O Part II) */
-    if (!dev->type)
-        dev->dev_regs[8][0x01] = 0x02;
-    if (!dev->type)
-        dev->dev_regs[8][0x41] = 0x02; /* Read-only */
-    if (!dev->type)
-        dev->dev_regs[8][0x43] = 0x02; /* Read-only? */
-    dev->dev_regs[8][0xb8] = 0x01;
-    dev->dev_regs[8][0xb9] = 0x01;
-    dev->dev_regs[8][0xba] = 0x01;
-    dev->dev_regs[8][0xbb] = 0x01;
-    dev->dev_regs[8][0xbc] = 0x01;
-    dev->dev_regs[8][0xbd] = 0x01;
-    dev->dev_regs[8][0xbe] = 0x01;
-    dev->dev_regs[8][0xbf] = 0x01;
-
-    /* Logical Device 9 (Auxiliary I/O Part III) */
-    if (dev->type) {
-        dev->dev_regs[9][0xb0] = 0x01;
-        dev->dev_regs[9][0xb1] = 0x01;
-        dev->dev_regs[9][0xb2] = 0x01;
-        dev->dev_regs[9][0xb3] = 0x01;
-        dev->dev_regs[9][0xb4] = 0x01;
-        dev->dev_regs[9][0xb5] = 0x01;
-        dev->dev_regs[9][0xb6] = 0x01;
-        dev->dev_regs[9][0xb7] = 0x01;
-
-        dev->dev_regs[10][0xc0] = 0x8f;
-    }
-
-    if (dev->id == 1) {
-        serial_setup(dev->uart[0], COM3_ADDR, COM3_IRQ);
-        serial_setup(dev->uart[1], COM4_ADDR, COM4_IRQ);
-    } else {
-        fdc_reset(dev->fdc);
-
-        serial_setup(dev->uart[0], COM1_ADDR, COM1_IRQ);
-        serial_setup(dev->uart[1], COM2_ADDR, COM2_IRQ);
-
-        w83977f_fdc_handler(dev);
-    }
-
-    w83977f_lpt_handler(dev);
-    w83977f_serial_handler(dev, 0);
-    w83977f_serial_handler(dev, 1);
-
-    w83977f_remap(dev);
-
-    dev->locked    = 0;
-    dev->rw_locked = 0;
-}
-
-static void
-w83977f_close(void *priv)
-{
-    w83977f_t *dev = (w83977f_t *) priv;
-
-    next_id = 0;
-
-    free(dev);
-}
-
-static void *
-w83977f_init(const device_t *info)
-{
-    w83977f_t *dev = (w83977f_t *) malloc(sizeof(w83977f_t));
-    memset(dev, 0, sizeof(w83977f_t));
-
-    dev->type   = info->local & 0x0f;
-    dev->hefras = info->local & 0x40;
-
-    dev->id = next_id;
-
-    if (next_id == 1)
-        dev->hefras ^= 0x40;
-    else
-        dev->fdc = device_add(&fdc_at_smc_device);
-
-    dev->uart[0] = device_add_inst(&ns16550_device, (next_id << 1) + 1);
-    dev->uart[1] = device_add_inst(&ns16550_device, (next_id << 1) + 2);
-
-    w83977f_reset(dev);
-
-    next_id++;
-
-    return dev;
-}
-
-const device_t w83977f_device = {
-    .name          = "Winbond W83977F Super I/O",
-    .internal_name = "w83977f",
-    .flags         = 0,
-    .local         = 0,
-    .init          = w83977f_init,
-    .close         = w83977f_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t w83977f_370_device = {
-    .name          = "Winbond W83977F Super I/O (Port 370h)",
-    .internal_name = "w83977f_370",
-    .flags         = 0,
-    .local         = 0x40,
-    .init          = w83977f_init,
-    .close         = w83977f_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t w83977tf_device = {
-    .name          = "Winbond W83977TF Super I/O",
-    .internal_name = "w83977tf",
-    .flags         = 0,
-    .local         = 1,
-    .init          = w83977f_init,
-    .close         = w83977f_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t w83977ef_device = {
-    .name          = "Winbond W83977TF Super I/O",
-    .internal_name = "w83977ef",
-    .flags         = 0,
-    .local         = 2,
-    .init          = w83977f_init,
-    .close         = w83977f_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t w83977ef_370_device = {
-    .name          = "Winbond W83977TF Super I/O (Port 370h)",
-    .internal_name = "w83977ef_370",
-    .flags         = 0,
-    .local         = 0x42,
-    .init          = w83977f_init,
-    .close         = w83977f_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
diff --git a/src/sound/CMakeLists.txt b/src/sound/CMakeLists.txt
index d6672ac18..9e2a75198 100644
--- a/src/sound/CMakeLists.txt
+++ b/src/sound/CMakeLists.txt
@@ -9,18 +9,69 @@
 #          CMake build script.
 #
 # Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
 #
 #          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2024      Jasmine Iwanek.
 #
 
-add_library(snd OBJECT sound.c snd_opl.c snd_opl_nuked.c snd_opl_ymfm.cpp snd_resid.cc
-    midi.c snd_speaker.c snd_pssj.c snd_lpt_dac.c snd_ac97_codec.c snd_ac97_via.c
-    snd_lpt_dss.c snd_ps1.c snd_adlib.c snd_adlibgold.c snd_ad1848.c snd_audiopci.c
-    snd_azt2316a.c snd_cms.c snd_cmi8x38.c snd_cs423x.c snd_gus.c snd_sb.c snd_sb_dsp.c
-    snd_emu8k.c snd_mpu401.c snd_sn76489.c snd_ssi2001.c snd_wss.c snd_ym7128.c
-    snd_optimc.c midi_opl4.c midi_opl4_yrw801.c)
+add_library(snd OBJECT
+    sound.c
+    snd_opl.c
+    snd_opl_nuked.c
+    snd_opl_ymfm.cpp
+    snd_resid.cpp
+    midi.c
+    snd_speaker.c
+    snd_pssj.c
+    snd_lpt_dac.c
+    snd_ac97_codec.c
+    snd_ac97_via.c
+    snd_lpt_dss.c
+    snd_ps1.c
+    snd_adlib.c
+    snd_adlibgold.c
+    snd_ad1848.c
+    snd_audiopci.c
+    snd_azt2316a.c
+    snd_cms.c
+    snd_cmi8x38.c
+    snd_covox.c
+    snd_cs423x.c
+    snd_gus.c
+    snd_sb.c
+    snd_sb_dsp.c
+    snd_emu8k.c
+    snd_mmb.c
+    snd_mpu401.c
+    snd_pas16.c
+    snd_sn76489.c
+    snd_ssi2001.c
+    snd_wss.c
+    snd_ym7128.c
+    snd_optimc.c
+    snd_opl_esfm.c
+)
 
-if(OPENAL)
+# TODO: Should platform-specific audio driver be here?
+if(AUDIO4)
+    target_sources(snd PRIVATE audio4.c)
+elseif(SNDIO)
+    target_sources(snd PRIVATE sndio.c)
+    find_package(PkgConfig REQUIRED)
+
+    pkg_check_modules(SNDIO IMPORTED_TARGET sndio)
+    if(SNDIO_FOUND)
+        target_link_libraries(86Box PkgConfig::SNDIO)
+    else()
+        find_path(SNDIO_INCLUDE_DIR NAMES "sndio.h")
+        find_library(SNDIO_LIBRARY sndio)
+
+        target_link_libraries(86Box ${SNDIO_LIBRARY})
+    endif()
+
+    include_directories(${SNDIO_INCLUDE_DIRS})
+elseif(OPENAL)
     if(VCPKG_TOOLCHAIN)
         find_package(OpenAL CONFIG REQUIRED)
     elseif(MINGW)
@@ -31,8 +82,14 @@ if(OPENAL)
 
     if(TARGET OpenAL::OpenAL)
         target_link_libraries(86Box OpenAL::OpenAL)
+        if(WIN32 AND STATIC_BUILD)
+            target_link_libraries(OpenAL::OpenAL INTERFACE avrt)
+        endif()
     else()
         target_link_libraries(86Box ${OPENAL_LIBRARY})
+        if(WIN32 AND STATIC_BUILD)
+            target_link_libraries(${OPENAL_LIBRARY} INTERFACE avrt)
+        endif()
     endif()
 
     include_directories(${OPENAL_INCLUDE_DIR})
@@ -90,6 +147,13 @@ if(FLUIDSYNTH)
     target_link_libraries(86Box PkgConfig::FLUIDSYNTH)
     if(STATIC_BUILD)
         target_link_libraries(86Box -static ${FLUIDSYNTH_STATIC_LIBRARIES} -fopenmp)
+        if(WIN32)
+            add_compile_definitions(FLUIDSYNTH_NOT_A_DLL)
+
+            if(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
+                target_link_libraries(86Box psapi)
+            endif()
+        endif()
     endif()
 
     target_compile_definitions(snd PRIVATE USE_FLUIDSYNTH)
@@ -113,16 +177,40 @@ if(MUNT)
     endif()
 endif()
 
+add_subdirectory(ayumi)
+target_link_libraries(86Box ayumi)
+
+add_subdirectory(esfmu)
+target_link_libraries(86Box esfmu)
+
 add_subdirectory(ymfm)
 target_link_libraries(86Box ymfm)
 
-if(PAS16)
-    target_compile_definitions(snd PRIVATE USE_PAS16)
-    target_sources(snd PRIVATE snd_pas16.c)
+if(OPL4ML)
+    target_compile_definitions(snd PRIVATE USE_OPL4ML)
+    target_sources(snd PRIVATE midi_opl4.c midi_opl4_yrw801.c)
 endif()
+ 
+find_package(PkgConfig)
+pkg_check_modules(SERIALPORT libserialport)
 
-if(GUSMAX)
-    target_compile_definitions(snd PRIVATE USE_GUSMAX)
+if(SERIALPORT_FOUND OR DEFINED LIBSERIALPORT_ROOT)
+    add_compile_definitions(USE_LIBSERIALPORT=1)
+
+    if(APPLE)
+        include_directories(${LIBSERIALPORT_ROOT}/include)
+        target_link_libraries(86Box ${LIBSERIALPORT_ROOT}/lib/libserialport.dylib)
+    elseif(WIN32)
+        include_directories(${SERIALPORT_INCLUDE_DIRS})
+        target_link_libraries(86Box ${SERIALPORT_LIBRARIES} SetupAPI)
+    else()
+        include_directories(${SERIALPORT_INCLUDE_DIRS})
+        target_link_libraries(86Box ${SERIALPORT_LIBRARIES})
+    endif()
+    target_sources(snd PRIVATE
+    snd_opl2board.c
+    snd_opl_opl2board.cpp
+)
 endif()
 
 add_subdirectory(resid-fp)
diff --git a/src/sound/audio4.c b/src/sound/audio4.c
new file mode 100644
index 000000000..4e74d2c0c
--- /dev/null
+++ b/src/sound/audio4.c
@@ -0,0 +1,161 @@
+/*
+ * 86Box     A hypervisor and IBM PC system emulator that specializes in
+ *           running old operating systems and software designed for IBM
+ *           PC systems and compatibles from 1981 through fairly recent
+ *           system designs based on the PCI bus.
+ *
+ *           This file is part of the 86Box distribution.
+ *
+ *           Interface to audio(4) for NetBSD/OpenBSD.
+ *
+ *
+ * Authors:  Nishi
+ *
+ *           Copyright 2025 Nishi.
+ */
+#include <stdint.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+
+#include <sys/audioio.h>
+#include <sys/param.h>
+
+#include <86box/86box.h>
+#include <86box/sound.h>
+#include <86box/plat_unused.h>
+
+#if defined(OpenBSD) && OpenBSD >= 201709
+#define USE_NEW_API
+#endif
+
+#define I_NORMAL 0
+#define I_MUSIC 1
+#define I_WT 2
+#define I_CD 3
+#define I_MIDI 4
+
+static int audio[5] = {-1, -1, -1, -1, -1};
+#ifdef USE_NEW_API
+static struct audio_swpar info[5];
+#else
+static audio_info_t info[5];
+#endif
+static int freqs[5] = {SOUND_FREQ, MUSIC_FREQ, WT_FREQ, CD_FREQ, 0};
+
+void closeal(void){
+	int i;
+	for(i = 0; i < sizeof(audio) / sizeof(audio[0]); i++){
+		if(audio[i] != -1){
+			close(audio[i]);
+		}
+		audio[i] = -1;
+	}
+}
+
+void inital(void){
+	int i;
+	for(i = 0; i < sizeof(audio) / sizeof(audio[0]); i++){
+		audio[i] = open("/dev/audio", O_WRONLY);
+		if(audio[i] == -1) audio[i] = open("/dev/audio0", O_WRONLY);
+		if(audio[i] != -1){
+#ifdef USE_NEW_API
+			AUDIO_INITPAR(&info[i]);
+			ioctl(audio[i], AUDIO_GETPAR, &info[i]);
+			info[i].sig = 1;
+			info[i].bits = 16;
+			info[i].pchan = 2;
+			info[i].bps = 2;
+			ioctl(audio[i], AUDIO_SETPAR, &info[i]);
+#else
+			AUDIO_INITINFO(&info[i]);
+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 900000000)
+			ioctl(audio[i], AUDIO_GETFORMAT, &info[i]);
+#else
+			ioctl(audio[i], AUDIO_GETINFO, &info[i]);
+#endif
+			info[i].play.channels = 2;
+			info[i].play.precision = 16;
+			info[i].play.encoding = AUDIO_ENCODING_SLINEAR;
+			info[i].hiwat = 5;
+			info[i].lowat = 3;
+			ioctl(audio[i], AUDIO_SETINFO, &info[i]);
+#endif
+		}
+	}
+}
+
+void givealbuffer_common(const void *buf, const uint8_t src, const int size){
+	const int freq = freqs[src];
+	int16_t* output;
+	int output_size;
+	int16_t* conv;
+	int conv_size;
+	int i;
+        double gain;
+	int target_rate;
+	if(audio[src] == -1) return;
+
+	gain = sound_muted ? 0.0 : pow(10.0, (double) sound_gain / 20.0);
+
+	if(sound_is_float){
+		float* input = (float*)buf;
+		conv_size = sizeof(int16_t) * size;
+		conv = malloc(conv_size);
+		for(i = 0; i < conv_size / sizeof(int16_t); i++){
+			conv[i] = 32767 * input[i];
+		}
+	}else{
+		conv_size = size * sizeof(int16_t);
+		conv = malloc(conv_size);
+		memcpy(conv, buf, conv_size);
+	}
+
+#ifdef USE_NEW_API
+	target_rate = info[src].rate;
+#else
+	target_rate = info[src].play.sample_rate;
+#endif
+
+	output_size = (double)conv_size * target_rate / freq;
+	output_size -= output_size % 4;
+	output = malloc(output_size);
+	
+	for(i = 0; i < output_size / sizeof(int16_t) / 2; i++){
+		int ind = i * freq / target_rate * 2;
+		output[i * 2 + 0] = conv[ind + 0] * gain;
+		output[i * 2 + 1] = conv[ind + 1] * gain;
+	}
+
+	write(audio[src], output, output_size);
+
+	free(conv);
+	free(output);
+}
+
+void givealbuffer(const void *buf){
+	givealbuffer_common(buf, I_NORMAL, SOUNDBUFLEN << 1);
+}
+
+void givealbuffer_music(const void *buf){
+	givealbuffer_common(buf, I_MUSIC, MUSICBUFLEN << 1);
+}
+
+void givealbuffer_wt(const void *buf){
+	givealbuffer_common(buf, I_WT, WTBUFLEN << 1);
+}
+
+void givealbuffer_cd(const void *buf){
+	givealbuffer_common(buf, I_CD, CD_BUFLEN << 1);
+}
+void givealbuffer_midi(const void *buf, const uint32_t size){
+	givealbuffer_common(buf, I_MIDI, (int) size);
+}
+	
+void al_set_midi(const int freq, UNUSED(const int buf_size)){
+	freqs[I_MIDI] = freq;
+}
diff --git a/src/sound/ayumi/CMakeLists.txt b/src/sound/ayumi/CMakeLists.txt
new file mode 100644
index 000000000..f3e4b18c7
--- /dev/null
+++ b/src/sound/ayumi/CMakeLists.txt
@@ -0,0 +1,14 @@
+#
+# 86Box    A hypervisor and IBM PC system emulator that specializes in
+#          running old operating systems and software designed for IBM
+#          PC systems and compatibles from 1981 through fairly recent
+#          system designs based on the PCI bus.
+#
+#          This file is part of the 86Box distribution.
+#
+#          CMake build script.
+#
+
+add_library(ayumi STATIC
+    ayumi.c
+)
diff --git a/src/sound/ayumi/LICENSE b/src/sound/ayumi/LICENSE
new file mode 100644
index 000000000..25371edc6
--- /dev/null
+++ b/src/sound/ayumi/LICENSE
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) Peter Sovietov, http://sovietov.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/src/sound/ayumi/ayumi.c b/src/sound/ayumi/ayumi.c
new file mode 100644
index 000000000..861b0fd45
--- /dev/null
+++ b/src/sound/ayumi/ayumi.c
@@ -0,0 +1,338 @@
+/* Author: Peter Sovietov */
+
+#include <string.h>
+#include <math.h>
+#include "ayumi.h"
+
+static const double AY_dac_table[] = {
+  0.0, 0.0,
+  0.00999465934234, 0.00999465934234,
+  0.0144502937362, 0.0144502937362,
+  0.0210574502174, 0.0210574502174,
+  0.0307011520562, 0.0307011520562,
+  0.0455481803616, 0.0455481803616,
+  0.0644998855573, 0.0644998855573,
+  0.107362478065, 0.107362478065,
+  0.126588845655, 0.126588845655,
+  0.20498970016, 0.20498970016,
+  0.292210269322, 0.292210269322,
+  0.372838941024, 0.372838941024,
+  0.492530708782, 0.492530708782,
+  0.635324635691, 0.635324635691,
+  0.805584802014, 0.805584802014,
+  1.0, 1.0
+};
+
+static const double YM_dac_table[] = {
+  0.0, 0.0,
+  0.00465400167849, 0.00772106507973,
+  0.0109559777218, 0.0139620050355,
+  0.0169985503929, 0.0200198367285,
+  0.024368657969, 0.029694056611,
+  0.0350652323186, 0.0403906309606,
+  0.0485389486534, 0.0583352407111,
+  0.0680552376593, 0.0777752346075,
+  0.0925154497597, 0.111085679408,
+  0.129747463188, 0.148485542077,
+  0.17666895552, 0.211551079576,
+  0.246387426566, 0.281101701381,
+  0.333730067903, 0.400427252613,
+  0.467383840696, 0.53443198291,
+  0.635172045472, 0.75800717174,
+  0.879926756695, 1.0
+};
+
+static void reset_segment(struct ayumi* ay);
+
+static int update_tone(struct ayumi* ay, int index) {
+  struct tone_channel* ch = &ay->channels[index];
+  ch->tone_counter += 1;
+  if (ch->tone_counter >= ch->tone_period) {
+    ch->tone_counter = 0;
+    ch->tone ^= 1;
+  }
+  return ch->tone;
+}
+
+static int update_noise(struct ayumi* ay) {
+  int bit0x3;
+  ay->noise_counter += 1;
+  if (ay->noise_counter >= (ay->noise_period << 1)) {
+    ay->noise_counter = 0;
+    bit0x3 = ((ay->noise ^ (ay->noise >> 3)) & 1);
+    ay->noise = (ay->noise >> 1) | (bit0x3 << 16);
+  }
+  return ay->noise & 1;
+}
+
+static void slide_up(struct ayumi* ay) {
+  ay->envelope += 1;
+  if (ay->envelope > 31) {
+    ay->envelope_segment ^= 1;
+    reset_segment(ay);
+  }
+}
+
+static void slide_down(struct ayumi* ay) {
+  ay->envelope -= 1;
+  if (ay->envelope < 0) {
+    ay->envelope_segment ^= 1;
+    reset_segment(ay);
+  }
+}
+
+static void hold_top(struct ayumi* ay) {
+  (void) ay;
+}
+
+static void hold_bottom(struct ayumi* ay) {
+  (void) ay;
+}
+
+static void (* const Envelopes[][2])(struct ayumi*) = {
+  {slide_down, hold_bottom},
+  {slide_down, hold_bottom},
+  {slide_down, hold_bottom},
+  {slide_down, hold_bottom},
+  {slide_up, hold_bottom},
+  {slide_up, hold_bottom},
+  {slide_up, hold_bottom},
+  {slide_up, hold_bottom},
+  {slide_down, slide_down},
+  {slide_down, hold_bottom},
+  {slide_down, slide_up},
+  {slide_down, hold_top},
+  {slide_up, slide_up},
+  {slide_up, hold_top},
+  {slide_up, slide_down},
+  {slide_up, hold_bottom}
+};
+
+static void reset_segment(struct ayumi* ay) {
+  if (Envelopes[ay->envelope_shape][ay->envelope_segment] == slide_down
+    || Envelopes[ay->envelope_shape][ay->envelope_segment] == hold_top) {
+    ay->envelope = 31;
+    return;
+  }
+  ay->envelope = 0;
+}
+
+int update_envelope(struct ayumi* ay) {
+  ay->envelope_counter += 1;
+  if (ay->envelope_counter >= ay->envelope_period) {
+    ay->envelope_counter = 0;
+    Envelopes[ay->envelope_shape][ay->envelope_segment](ay);
+  }
+  return ay->envelope;
+}
+
+static void update_mixer(struct ayumi* ay) {
+  int i;
+  int out;
+  int noise = update_noise(ay);
+  int envelope = update_envelope(ay);
+  ay->left = 0;
+  ay->right = 0;
+  for (i = 0; i < TONE_CHANNELS; i += 1) {
+    out = (update_tone(ay, i) | ay->channels[i].t_off) & (noise | ay->channels[i].n_off);
+    out *= ay->channels[i].e_on ? envelope : ay->channels[i].volume * 2 + 1;
+    ay->left += ay->dac_table[out] * ay->channels[i].pan_left;
+    ay->right += ay->dac_table[out] * ay->channels[i].pan_right;
+  }
+}
+
+int ayumi_configure(struct ayumi* ay, int is_ym, double clock_rate, int sr) {
+  int i;
+  memset(ay, 0, sizeof(struct ayumi));
+  ay->step = clock_rate / (sr * 8 * DECIMATE_FACTOR);
+  ay->dac_table = is_ym ? YM_dac_table : AY_dac_table;
+  ay->noise = 1;
+  ayumi_set_envelope(ay, 1);
+  for (i = 0; i < TONE_CHANNELS; i += 1) {
+    ayumi_set_tone(ay, i, 1);
+  }
+  return ay->step < 1;
+}
+
+void ayumi_set_pan(struct ayumi* ay, int index, double pan, int is_eqp) {
+  if (is_eqp) {
+    ay->channels[index].pan_left = sqrt(1 - pan);
+    ay->channels[index].pan_right = sqrt(pan);
+  } else {
+    ay->channels[index].pan_left = 1 - pan;
+    ay->channels[index].pan_right = pan;
+  }
+}
+
+void ayumi_set_tone(struct ayumi* ay, int index, int period) {
+  period &= 0xfff;
+  ay->channels[index].tone_period = (period == 0) | period;
+}
+
+void ayumi_set_noise(struct ayumi* ay, int period) {
+  period &= 0x1f;
+  ay->noise_period = (period == 0) | period;
+}
+
+void ayumi_set_mixer(struct ayumi* ay, int index, int t_off, int n_off, int e_on) {
+  ay->channels[index].t_off = t_off & 1;
+  ay->channels[index].n_off = n_off & 1;
+  ay->channels[index].e_on = e_on;
+}
+
+void ayumi_set_volume(struct ayumi* ay, int index, int volume) {
+  ay->channels[index].volume = volume & 0xf;
+}
+
+void ayumi_set_envelope(struct ayumi* ay, int period) {
+  period &= 0xffff;
+  ay->envelope_period = (period == 0) | period;
+}
+
+void ayumi_set_envelope_shape(struct ayumi* ay, int shape) {
+  ay->envelope_shape = shape & 0xf;
+  ay->envelope_counter = 0;
+  ay->envelope_segment = 0;
+  reset_segment(ay);
+}
+
+static double decimate(double* x) {
+  double y = -0.0000046183113992051936 * (x[1] + x[191]) +
+    -0.00001117761640887225 * (x[2] + x[190]) +
+    -0.000018610264502005432 * (x[3] + x[189]) +
+    -0.000025134586135631012 * (x[4] + x[188]) +
+    -0.000028494281690666197 * (x[5] + x[187]) +
+    -0.000026396828793275159 * (x[6] + x[186]) +
+    -0.000017094212558802156 * (x[7] + x[185]) +
+    0.000023798193576966866 * (x[9] + x[183]) +
+    0.000051281160242202183 * (x[10] + x[182]) +
+    0.00007762197826243427 * (x[11] + x[181]) +
+    0.000096759426664120416 * (x[12] + x[180]) +
+    0.00010240229300393402 * (x[13] + x[179]) +
+    0.000089344614218077106 * (x[14] + x[178]) +
+    0.000054875700118949183 * (x[15] + x[177]) +
+    -0.000069839082210680165 * (x[17] + x[175]) +
+    -0.0001447966132360757 * (x[18] + x[174]) +
+    -0.00021158452917708308 * (x[19] + x[173]) +
+    -0.00025535069106550544 * (x[20] + x[172]) +
+    -0.00026228714374322104 * (x[21] + x[171]) +
+    -0.00022258805927027799 * (x[22] + x[170]) +
+    -0.00013323230495695704 * (x[23] + x[169]) +
+    0.00016182578767055206 * (x[25] + x[167]) +
+    0.00032846175385096581 * (x[26] + x[166]) +
+    0.00047045611576184863 * (x[27] + x[165]) +
+    0.00055713851457530944 * (x[28] + x[164]) +
+    0.00056212565121518726 * (x[29] + x[163]) +
+    0.00046901918553962478 * (x[30] + x[162]) +
+    0.00027624866838952986 * (x[31] + x[161]) +
+    -0.00032564179486838622 * (x[33] + x[159]) +
+    -0.00065182310286710388 * (x[34] + x[158]) +
+    -0.00092127787309319298 * (x[35] + x[157]) +
+    -0.0010772534348943575 * (x[36] + x[156]) +
+    -0.0010737727700273478 * (x[37] + x[155]) +
+    -0.00088556645390392634 * (x[38] + x[154]) +
+    -0.00051581896090765534 * (x[39] + x[153]) +
+    0.00059548767193795277 * (x[41] + x[151]) +
+    0.0011803558710661009 * (x[42] + x[150]) +
+    0.0016527320270369871 * (x[43] + x[149]) +
+    0.0019152679330965555 * (x[44] + x[148]) +
+    0.0018927324805381538 * (x[45] + x[147]) +
+    0.0015481870327877937 * (x[46] + x[146]) +
+    0.00089470695834941306 * (x[47] + x[145]) +
+    -0.0010178225878206125 * (x[49] + x[143]) +
+    -0.0020037400552054292 * (x[50] + x[142]) +
+    -0.0027874356824117317 * (x[51] + x[141]) +
+    -0.003210329988021943 * (x[52] + x[140]) +
+    -0.0031540624117984395 * (x[53] + x[139]) +
+    -0.0025657163651900345 * (x[54] + x[138]) +
+    -0.0014750752642111449 * (x[55] + x[137]) +
+    0.0016624165446378462 * (x[57] + x[135]) +
+    0.0032591192839069179 * (x[58] + x[134]) +
+    0.0045165685815867747 * (x[59] + x[133]) +
+    0.0051838984346123896 * (x[60] + x[132]) +
+    0.0050774264697459933 * (x[61] + x[131]) +
+    0.0041192521414141585 * (x[62] + x[130]) +
+    0.0023628575417966491 * (x[63] + x[129]) +
+    -0.0026543507866759182 * (x[65] + x[127]) +
+    -0.0051990251084333425 * (x[66] + x[126]) +
+    -0.0072020238234656924 * (x[67] + x[125]) +
+    -0.0082672928192007358 * (x[68] + x[124]) +
+    -0.0081033739572956287 * (x[69] + x[123]) +
+    -0.006583111539570221 * (x[70] + x[122]) +
+    -0.0037839040415292386 * (x[71] + x[121]) +
+    0.0042781252851152507 * (x[73] + x[119]) +
+    0.0084176358598320178 * (x[74] + x[118]) +
+    0.01172566057463055 * (x[75] + x[117]) +
+    0.013550476647788672 * (x[76] + x[116]) +
+    0.013388189369997496 * (x[77] + x[115]) +
+    0.010979501242341259 * (x[78] + x[114]) +
+    0.006381274941685413 * (x[79] + x[113]) +
+    -0.007421229604153888 * (x[81] + x[111]) +
+    -0.01486456304340213 * (x[82] + x[110]) +
+    -0.021143584622178104 * (x[83] + x[109]) +
+    -0.02504275058758609 * (x[84] + x[108]) +
+    -0.025473530942547201 * (x[85] + x[107]) +
+    -0.021627310017882196 * (x[86] + x[106]) +
+    -0.013104323383225543 * (x[87] + x[105]) +
+    0.017065133989980476 * (x[89] + x[103]) +
+    0.036978919264451952 * (x[90] + x[102]) +
+    0.05823318062093958 * (x[91] + x[101]) +
+    0.079072012081405949 * (x[92] + x[100]) +
+    0.097675998716952317 * (x[93] + x[99]) +
+    0.11236045936950932 * (x[94] + x[98]) +
+    0.12176343577287731 * (x[95] + x[97]) +
+    0.125 * x[96];
+  memcpy(&x[FIR_SIZE - DECIMATE_FACTOR], x, DECIMATE_FACTOR * sizeof(double));
+  return y;
+}
+
+void ayumi_process(struct ayumi* ay) {
+  int i;
+  double y1;
+  double* c_left = ay->interpolator_left.c;
+  double* y_left = ay->interpolator_left.y;
+  double* c_right = ay->interpolator_right.c;
+  double* y_right = ay->interpolator_right.y;
+  double* fir_left = &ay->fir_left[FIR_SIZE - ay->fir_index * DECIMATE_FACTOR];
+  double* fir_right = &ay->fir_right[FIR_SIZE - ay->fir_index * DECIMATE_FACTOR];
+  ay->fir_index = (ay->fir_index + 1) % (FIR_SIZE / DECIMATE_FACTOR - 1);
+  for (i = DECIMATE_FACTOR - 1; i >= 0; i -= 1) {
+    ay->x += ay->step;
+    if (ay->x >= 1) {
+      ay->x -= 1;
+      y_left[0] = y_left[1];
+      y_left[1] = y_left[2];
+      y_left[2] = y_left[3];
+      y_right[0] = y_right[1];
+      y_right[1] = y_right[2];
+      y_right[2] = y_right[3];
+      update_mixer(ay);
+      y_left[3] = ay->left;
+      y_right[3] = ay->right;
+      y1 = y_left[2] - y_left[0];
+      c_left[0] = 0.5 * y_left[1] + 0.25 * (y_left[0] + y_left[2]);
+      c_left[1] = 0.5 * y1;
+      c_left[2] = 0.25 * (y_left[3] - y_left[1] - y1);
+      y1 = y_right[2] - y_right[0];
+      c_right[0] = 0.5 * y_right[1] + 0.25 * (y_right[0] + y_right[2]);
+      c_right[1] = 0.5 * y1;
+      c_right[2] = 0.25 * (y_right[3] - y_right[1] - y1);
+    }
+    fir_left[i] = (c_left[2] * ay->x + c_left[1]) * ay->x + c_left[0];
+    fir_right[i] = (c_right[2] * ay->x + c_right[1]) * ay->x + c_right[0];
+  }
+  ay->left = decimate(fir_left);
+  ay->right = decimate(fir_right);
+}
+
+static double dc_filter(struct dc_filter* dc, int index, double x) {
+  dc->sum += -dc->delay[index] + x;
+  dc->delay[index] = x; 
+  return x - dc->sum / DC_FILTER_SIZE;
+}
+
+void ayumi_remove_dc(struct ayumi* ay) {
+  ay->left = dc_filter(&ay->dc_left, ay->dc_index, ay->left);
+  ay->right = dc_filter(&ay->dc_right, ay->dc_index, ay->right);
+  ay->dc_index = (ay->dc_index + 1) & (DC_FILTER_SIZE - 1);
+}
diff --git a/src/sound/ayumi/ayumi.h b/src/sound/ayumi/ayumi.h
new file mode 100644
index 000000000..f15939514
--- /dev/null
+++ b/src/sound/ayumi/ayumi.h
@@ -0,0 +1,71 @@
+/* Author: Peter Sovietov */
+
+#ifndef AYUMI_H
+#define AYUMI_H
+
+enum {
+  TONE_CHANNELS = 3,
+  DECIMATE_FACTOR = 8,
+  FIR_SIZE = 192,
+  DC_FILTER_SIZE = 1024
+};
+
+struct tone_channel {
+  int tone_period;
+  int tone_counter;
+  int tone;
+  int t_off;
+  int n_off;
+  int e_on;
+  int volume;
+  double pan_left;
+  double pan_right;
+};
+
+struct interpolator {
+  double c[4];
+  double y[4];
+};
+
+struct dc_filter {
+  double sum;
+  double delay[DC_FILTER_SIZE];
+};
+
+struct ayumi {
+  struct tone_channel channels[TONE_CHANNELS];
+  int noise_period;
+  int noise_counter;
+  int noise;
+  int envelope_counter;
+  int envelope_period;
+  int envelope_shape;
+  int envelope_segment;
+  int envelope;
+  const double* dac_table;
+  double step;
+  double x;
+  struct interpolator interpolator_left;
+  struct interpolator interpolator_right;
+  double fir_left[FIR_SIZE * 2];
+  double fir_right[FIR_SIZE * 2];
+  int fir_index;
+  struct dc_filter dc_left;
+  struct dc_filter dc_right;
+  int dc_index;
+  double left;
+  double right;
+};
+
+int ayumi_configure(struct ayumi* ay, int is_ym, double clock_rate, int sr);
+void ayumi_set_pan(struct ayumi* ay, int index, double pan, int is_eqp);
+void ayumi_set_tone(struct ayumi* ay, int index, int period);
+void ayumi_set_noise(struct ayumi* ay, int period);
+void ayumi_set_mixer(struct ayumi* ay, int index, int t_off, int n_off, int e_on);
+void ayumi_set_volume(struct ayumi* ay, int index, int volume);
+void ayumi_set_envelope(struct ayumi* ay, int period);
+void ayumi_set_envelope_shape(struct ayumi* ay, int shape);
+void ayumi_process(struct ayumi* ay);
+void ayumi_remove_dc(struct ayumi* ay);
+
+#endif
diff --git a/src/sound/esfmu/CMakeLists.txt b/src/sound/esfmu/CMakeLists.txt
new file mode 100644
index 000000000..2505038f1
--- /dev/null
+++ b/src/sound/esfmu/CMakeLists.txt
@@ -0,0 +1,15 @@
+#
+# 86Box    A hypervisor and IBM PC system emulator that specializes in
+#          running old operating systems and software designed for IBM
+#          PC systems and compatibles from 1981 through fairly recent
+#          system designs based on the PCI bus.
+#
+#          This file is part of the 86Box distribution.
+#
+#          CMake build script.
+#
+
+add_library(esfmu STATIC
+    esfm.c
+    esfm_registers.c
+)
diff --git a/src/sound/esfmu/esfm.c b/src/sound/esfmu/esfm.c
new file mode 100644
index 000000000..89fa82d4f
--- /dev/null
+++ b/src/sound/esfmu/esfm.c
@@ -0,0 +1,2327 @@
+/*
+ * ESFMu: emulator for the ESS "ESFM" enhanced OPL3 clone
+ * Copyright (C) 2023 Kagamiin~
+ *
+ * This file includes code and data from the Nuked OPL3 project, copyright (C)
+ * 2013-2023 Nuke.YKT. Its usage, modification and redistribution is allowed
+ * under the terms of the GNU Lesser General Public License version 2.1 or
+ * later.
+ *
+ * ESFMu is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * ESFMu is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ESFMu. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/*
+ * ESFMu wouldn't have been possible without the hard work and dedication of
+ * the retro computer hardware research and preservation community.
+ *
+ * I'd like to thank:
+ *  - Nuke.YKT
+ *        Developer of Nuked OPL3, which was the basis for ESFMu's code and
+ *        also a great learning resource on Yamaha FM synthesis for myself.
+ *        Nuke.YKT also gives shoutouts on behalf of Nuked OPL3 to:
+ *        - MAME Development Team(Jarek Burczynski, Tatsuyuki Satoh):
+ *              Feedback and Rhythm part calculation information.
+ *        - forums.submarine.org.uk(carbon14, opl3):
+ *              Tremolo and phase generator calculation information.
+ *        - OPLx decapsulated(Matthew Gambrell, Olli Niemitalo):
+ *              OPL2 ROMs.
+ *        - siliconpr0n.org(John McMaster, digshadow):
+ *              YMF262 and VRC VII decaps and die shots.
+ * - rainwarrior
+ *       For performing the initial research on ESFM drivers and documenting
+ *       ESS's patent on native mode operator organization.
+ * - jwt27
+ *       For kickstarting the ESFM research project and compiling rainwarrior's
+ *       findings and more in an accessible document ("ESFM Demystified").
+ * - pachuco/CatButts
+ *       For documenting ESS's patent on ESFM's feedback implementation, which
+ *       was vital in getting ESFMu's sound output to be accurate.
+ * - akumanatt
+ *       For helping out with code optimization.
+ * - And everybody who helped out with real hardware testing
+ */
+
+#include "esfm.h"
+#include <stdint.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <stdbool.h>
+
+/*
+ * Log-scale quarter sine table extracted from OPL3 ROM; taken straight from
+ * Nuked OPL3 source code.
+ * TODO: Extract sine table from ESFM die scans... does ESFM even use a sine
+ * table? Patent documents give a hint to a possible method of generating sine
+ * waves using some sort of boolean logic wizardry (lol)
+ * Optimization: All 8 waveforms are calculated and unfolded from the actual
+ * data in OPL3's ROM. Negative entries are marked by 0x8000.
+ */
+static const uint16_t logsinrom[1024*8] = {
+	// wave 0
+	0x0859, 0x06c3, 0x0607, 0x058b, 0x052e, 0x04e4, 0x04a6, 0x0471, 
+	0x0443, 0x041a, 0x03f5, 0x03d3, 0x03b5, 0x0398, 0x037e, 0x0365, 
+	0x034e, 0x0339, 0x0324, 0x0311, 0x02ff, 0x02ed, 0x02dc, 0x02cd, 
+	0x02bd, 0x02af, 0x02a0, 0x0293, 0x0286, 0x0279, 0x026d, 0x0261, 
+	0x0256, 0x024b, 0x0240, 0x0236, 0x022c, 0x0222, 0x0218, 0x020f, 
+	0x0206, 0x01fd, 0x01f5, 0x01ec, 0x01e4, 0x01dc, 0x01d4, 0x01cd, 
+	0x01c5, 0x01be, 0x01b7, 0x01b0, 0x01a9, 0x01a2, 0x019b, 0x0195, 
+	0x018f, 0x0188, 0x0182, 0x017c, 0x0177, 0x0171, 0x016b, 0x0166, 
+	0x0160, 0x015b, 0x0155, 0x0150, 0x014b, 0x0146, 0x0141, 0x013c, 
+	0x0137, 0x0133, 0x012e, 0x0129, 0x0125, 0x0121, 0x011c, 0x0118, 
+	0x0114, 0x010f, 0x010b, 0x0107, 0x0103, 0x00ff, 0x00fb, 0x00f8, 
+	0x00f4, 0x00f0, 0x00ec, 0x00e9, 0x00e5, 0x00e2, 0x00de, 0x00db, 
+	0x00d7, 0x00d4, 0x00d1, 0x00cd, 0x00ca, 0x00c7, 0x00c4, 0x00c1, 
+	0x00be, 0x00bb, 0x00b8, 0x00b5, 0x00b2, 0x00af, 0x00ac, 0x00a9, 
+	0x00a7, 0x00a4, 0x00a1, 0x009f, 0x009c, 0x0099, 0x0097, 0x0094, 
+	0x0092, 0x008f, 0x008d, 0x008a, 0x0088, 0x0086, 0x0083, 0x0081, 
+	0x007f, 0x007d, 0x007a, 0x0078, 0x0076, 0x0074, 0x0072, 0x0070, 
+	0x006e, 0x006c, 0x006a, 0x0068, 0x0066, 0x0064, 0x0062, 0x0060, 
+	0x005e, 0x005c, 0x005b, 0x0059, 0x0057, 0x0055, 0x0053, 0x0052, 
+	0x0050, 0x004e, 0x004d, 0x004b, 0x004a, 0x0048, 0x0046, 0x0045, 
+	0x0043, 0x0042, 0x0040, 0x003f, 0x003e, 0x003c, 0x003b, 0x0039, 
+	0x0038, 0x0037, 0x0035, 0x0034, 0x0033, 0x0031, 0x0030, 0x002f, 
+	0x002e, 0x002d, 0x002b, 0x002a, 0x0029, 0x0028, 0x0027, 0x0026, 
+	0x0025, 0x0024, 0x0023, 0x0022, 0x0021, 0x0020, 0x001f, 0x001e, 
+	0x001d, 0x001c, 0x001b, 0x001a, 0x0019, 0x0018, 0x0017, 0x0017, 
+	0x0016, 0x0015, 0x0014, 0x0014, 0x0013, 0x0012, 0x0011, 0x0011, 
+	0x0010, 0x000f, 0x000f, 0x000e, 0x000d, 0x000d, 0x000c, 0x000c, 
+	0x000b, 0x000a, 0x000a, 0x0009, 0x0009, 0x0008, 0x0008, 0x0007, 
+	0x0007, 0x0007, 0x0006, 0x0006, 0x0005, 0x0005, 0x0005, 0x0004, 
+	0x0004, 0x0004, 0x0003, 0x0003, 0x0003, 0x0002, 0x0002, 0x0002, 
+	0x0002, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 
+	0x0002, 0x0002, 0x0002, 0x0003, 0x0003, 0x0003, 0x0004, 0x0004, 
+	0x0004, 0x0005, 0x0005, 0x0005, 0x0006, 0x0006, 0x0007, 0x0007, 
+	0x0007, 0x0008, 0x0008, 0x0009, 0x0009, 0x000a, 0x000a, 0x000b, 
+	0x000c, 0x000c, 0x000d, 0x000d, 0x000e, 0x000f, 0x000f, 0x0010, 
+	0x0011, 0x0011, 0x0012, 0x0013, 0x0014, 0x0014, 0x0015, 0x0016, 
+	0x0017, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 
+	0x001e, 0x001f, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 
+	0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002d, 0x002e, 
+	0x002f, 0x0030, 0x0031, 0x0033, 0x0034, 0x0035, 0x0037, 0x0038, 
+	0x0039, 0x003b, 0x003c, 0x003e, 0x003f, 0x0040, 0x0042, 0x0043, 
+	0x0045, 0x0046, 0x0048, 0x004a, 0x004b, 0x004d, 0x004e, 0x0050, 
+	0x0052, 0x0053, 0x0055, 0x0057, 0x0059, 0x005b, 0x005c, 0x005e, 
+	0x0060, 0x0062, 0x0064, 0x0066, 0x0068, 0x006a, 0x006c, 0x006e, 
+	0x0070, 0x0072, 0x0074, 0x0076, 0x0078, 0x007a, 0x007d, 0x007f, 
+	0x0081, 0x0083, 0x0086, 0x0088, 0x008a, 0x008d, 0x008f, 0x0092, 
+	0x0094, 0x0097, 0x0099, 0x009c, 0x009f, 0x00a1, 0x00a4, 0x00a7, 
+	0x00a9, 0x00ac, 0x00af, 0x00b2, 0x00b5, 0x00b8, 0x00bb, 0x00be, 
+	0x00c1, 0x00c4, 0x00c7, 0x00ca, 0x00cd, 0x00d1, 0x00d4, 0x00d7, 
+	0x00db, 0x00de, 0x00e2, 0x00e5, 0x00e9, 0x00ec, 0x00f0, 0x00f4, 
+	0x00f8, 0x00fb, 0x00ff, 0x0103, 0x0107, 0x010b, 0x010f, 0x0114, 
+	0x0118, 0x011c, 0x0121, 0x0125, 0x0129, 0x012e, 0x0133, 0x0137, 
+	0x013c, 0x0141, 0x0146, 0x014b, 0x0150, 0x0155, 0x015b, 0x0160, 
+	0x0166, 0x016b, 0x0171, 0x0177, 0x017c, 0x0182, 0x0188, 0x018f, 
+	0x0195, 0x019b, 0x01a2, 0x01a9, 0x01b0, 0x01b7, 0x01be, 0x01c5, 
+	0x01cd, 0x01d4, 0x01dc, 0x01e4, 0x01ec, 0x01f5, 0x01fd, 0x0206, 
+	0x020f, 0x0218, 0x0222, 0x022c, 0x0236, 0x0240, 0x024b, 0x0256, 
+	0x0261, 0x026d, 0x0279, 0x0286, 0x0293, 0x02a0, 0x02af, 0x02bd, 
+	0x02cd, 0x02dc, 0x02ed, 0x02ff, 0x0311, 0x0324, 0x0339, 0x034e, 
+	0x0365, 0x037e, 0x0398, 0x03b5, 0x03d3, 0x03f5, 0x041a, 0x0443, 
+	0x0471, 0x04a6, 0x04e4, 0x052e, 0x058b, 0x0607, 0x06c3, 0x0859, 
+	0x8859, 0x86c3, 0x8607, 0x858b, 0x852e, 0x84e4, 0x84a6, 0x8471, 
+	0x8443, 0x841a, 0x83f5, 0x83d3, 0x83b5, 0x8398, 0x837e, 0x8365, 
+	0x834e, 0x8339, 0x8324, 0x8311, 0x82ff, 0x82ed, 0x82dc, 0x82cd, 
+	0x82bd, 0x82af, 0x82a0, 0x8293, 0x8286, 0x8279, 0x826d, 0x8261, 
+	0x8256, 0x824b, 0x8240, 0x8236, 0x822c, 0x8222, 0x8218, 0x820f, 
+	0x8206, 0x81fd, 0x81f5, 0x81ec, 0x81e4, 0x81dc, 0x81d4, 0x81cd, 
+	0x81c5, 0x81be, 0x81b7, 0x81b0, 0x81a9, 0x81a2, 0x819b, 0x8195, 
+	0x818f, 0x8188, 0x8182, 0x817c, 0x8177, 0x8171, 0x816b, 0x8166, 
+	0x8160, 0x815b, 0x8155, 0x8150, 0x814b, 0x8146, 0x8141, 0x813c, 
+	0x8137, 0x8133, 0x812e, 0x8129, 0x8125, 0x8121, 0x811c, 0x8118, 
+	0x8114, 0x810f, 0x810b, 0x8107, 0x8103, 0x80ff, 0x80fb, 0x80f8, 
+	0x80f4, 0x80f0, 0x80ec, 0x80e9, 0x80e5, 0x80e2, 0x80de, 0x80db, 
+	0x80d7, 0x80d4, 0x80d1, 0x80cd, 0x80ca, 0x80c7, 0x80c4, 0x80c1, 
+	0x80be, 0x80bb, 0x80b8, 0x80b5, 0x80b2, 0x80af, 0x80ac, 0x80a9, 
+	0x80a7, 0x80a4, 0x80a1, 0x809f, 0x809c, 0x8099, 0x8097, 0x8094, 
+	0x8092, 0x808f, 0x808d, 0x808a, 0x8088, 0x8086, 0x8083, 0x8081, 
+	0x807f, 0x807d, 0x807a, 0x8078, 0x8076, 0x8074, 0x8072, 0x8070, 
+	0x806e, 0x806c, 0x806a, 0x8068, 0x8066, 0x8064, 0x8062, 0x8060, 
+	0x805e, 0x805c, 0x805b, 0x8059, 0x8057, 0x8055, 0x8053, 0x8052, 
+	0x8050, 0x804e, 0x804d, 0x804b, 0x804a, 0x8048, 0x8046, 0x8045, 
+	0x8043, 0x8042, 0x8040, 0x803f, 0x803e, 0x803c, 0x803b, 0x8039, 
+	0x8038, 0x8037, 0x8035, 0x8034, 0x8033, 0x8031, 0x8030, 0x802f, 
+	0x802e, 0x802d, 0x802b, 0x802a, 0x8029, 0x8028, 0x8027, 0x8026, 
+	0x8025, 0x8024, 0x8023, 0x8022, 0x8021, 0x8020, 0x801f, 0x801e, 
+	0x801d, 0x801c, 0x801b, 0x801a, 0x8019, 0x8018, 0x8017, 0x8017, 
+	0x8016, 0x8015, 0x8014, 0x8014, 0x8013, 0x8012, 0x8011, 0x8011, 
+	0x8010, 0x800f, 0x800f, 0x800e, 0x800d, 0x800d, 0x800c, 0x800c, 
+	0x800b, 0x800a, 0x800a, 0x8009, 0x8009, 0x8008, 0x8008, 0x8007, 
+	0x8007, 0x8007, 0x8006, 0x8006, 0x8005, 0x8005, 0x8005, 0x8004, 
+	0x8004, 0x8004, 0x8003, 0x8003, 0x8003, 0x8002, 0x8002, 0x8002, 
+	0x8002, 0x8001, 0x8001, 0x8001, 0x8001, 0x8001, 0x8001, 0x8001, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8001, 0x8001, 0x8001, 0x8001, 0x8001, 0x8001, 0x8001, 0x8002, 
+	0x8002, 0x8002, 0x8002, 0x8003, 0x8003, 0x8003, 0x8004, 0x8004, 
+	0x8004, 0x8005, 0x8005, 0x8005, 0x8006, 0x8006, 0x8007, 0x8007, 
+	0x8007, 0x8008, 0x8008, 0x8009, 0x8009, 0x800a, 0x800a, 0x800b, 
+	0x800c, 0x800c, 0x800d, 0x800d, 0x800e, 0x800f, 0x800f, 0x8010, 
+	0x8011, 0x8011, 0x8012, 0x8013, 0x8014, 0x8014, 0x8015, 0x8016, 
+	0x8017, 0x8017, 0x8018, 0x8019, 0x801a, 0x801b, 0x801c, 0x801d, 
+	0x801e, 0x801f, 0x8020, 0x8021, 0x8022, 0x8023, 0x8024, 0x8025, 
+	0x8026, 0x8027, 0x8028, 0x8029, 0x802a, 0x802b, 0x802d, 0x802e, 
+	0x802f, 0x8030, 0x8031, 0x8033, 0x8034, 0x8035, 0x8037, 0x8038, 
+	0x8039, 0x803b, 0x803c, 0x803e, 0x803f, 0x8040, 0x8042, 0x8043, 
+	0x8045, 0x8046, 0x8048, 0x804a, 0x804b, 0x804d, 0x804e, 0x8050, 
+	0x8052, 0x8053, 0x8055, 0x8057, 0x8059, 0x805b, 0x805c, 0x805e, 
+	0x8060, 0x8062, 0x8064, 0x8066, 0x8068, 0x806a, 0x806c, 0x806e, 
+	0x8070, 0x8072, 0x8074, 0x8076, 0x8078, 0x807a, 0x807d, 0x807f, 
+	0x8081, 0x8083, 0x8086, 0x8088, 0x808a, 0x808d, 0x808f, 0x8092, 
+	0x8094, 0x8097, 0x8099, 0x809c, 0x809f, 0x80a1, 0x80a4, 0x80a7, 
+	0x80a9, 0x80ac, 0x80af, 0x80b2, 0x80b5, 0x80b8, 0x80bb, 0x80be, 
+	0x80c1, 0x80c4, 0x80c7, 0x80ca, 0x80cd, 0x80d1, 0x80d4, 0x80d7, 
+	0x80db, 0x80de, 0x80e2, 0x80e5, 0x80e9, 0x80ec, 0x80f0, 0x80f4, 
+	0x80f8, 0x80fb, 0x80ff, 0x8103, 0x8107, 0x810b, 0x810f, 0x8114, 
+	0x8118, 0x811c, 0x8121, 0x8125, 0x8129, 0x812e, 0x8133, 0x8137, 
+	0x813c, 0x8141, 0x8146, 0x814b, 0x8150, 0x8155, 0x815b, 0x8160, 
+	0x8166, 0x816b, 0x8171, 0x8177, 0x817c, 0x8182, 0x8188, 0x818f, 
+	0x8195, 0x819b, 0x81a2, 0x81a9, 0x81b0, 0x81b7, 0x81be, 0x81c5, 
+	0x81cd, 0x81d4, 0x81dc, 0x81e4, 0x81ec, 0x81f5, 0x81fd, 0x8206, 
+	0x820f, 0x8218, 0x8222, 0x822c, 0x8236, 0x8240, 0x824b, 0x8256, 
+	0x8261, 0x826d, 0x8279, 0x8286, 0x8293, 0x82a0, 0x82af, 0x82bd, 
+	0x82cd, 0x82dc, 0x82ed, 0x82ff, 0x8311, 0x8324, 0x8339, 0x834e, 
+	0x8365, 0x837e, 0x8398, 0x83b5, 0x83d3, 0x83f5, 0x841a, 0x8443, 
+	0x8471, 0x84a6, 0x84e4, 0x852e, 0x858b, 0x8607, 0x86c3, 0x8859, 
+	// wave 1
+	0x0859, 0x06c3, 0x0607, 0x058b, 0x052e, 0x04e4, 0x04a6, 0x0471, 
+	0x0443, 0x041a, 0x03f5, 0x03d3, 0x03b5, 0x0398, 0x037e, 0x0365, 
+	0x034e, 0x0339, 0x0324, 0x0311, 0x02ff, 0x02ed, 0x02dc, 0x02cd, 
+	0x02bd, 0x02af, 0x02a0, 0x0293, 0x0286, 0x0279, 0x026d, 0x0261, 
+	0x0256, 0x024b, 0x0240, 0x0236, 0x022c, 0x0222, 0x0218, 0x020f, 
+	0x0206, 0x01fd, 0x01f5, 0x01ec, 0x01e4, 0x01dc, 0x01d4, 0x01cd, 
+	0x01c5, 0x01be, 0x01b7, 0x01b0, 0x01a9, 0x01a2, 0x019b, 0x0195, 
+	0x018f, 0x0188, 0x0182, 0x017c, 0x0177, 0x0171, 0x016b, 0x0166, 
+	0x0160, 0x015b, 0x0155, 0x0150, 0x014b, 0x0146, 0x0141, 0x013c, 
+	0x0137, 0x0133, 0x012e, 0x0129, 0x0125, 0x0121, 0x011c, 0x0118, 
+	0x0114, 0x010f, 0x010b, 0x0107, 0x0103, 0x00ff, 0x00fb, 0x00f8, 
+	0x00f4, 0x00f0, 0x00ec, 0x00e9, 0x00e5, 0x00e2, 0x00de, 0x00db, 
+	0x00d7, 0x00d4, 0x00d1, 0x00cd, 0x00ca, 0x00c7, 0x00c4, 0x00c1, 
+	0x00be, 0x00bb, 0x00b8, 0x00b5, 0x00b2, 0x00af, 0x00ac, 0x00a9, 
+	0x00a7, 0x00a4, 0x00a1, 0x009f, 0x009c, 0x0099, 0x0097, 0x0094, 
+	0x0092, 0x008f, 0x008d, 0x008a, 0x0088, 0x0086, 0x0083, 0x0081, 
+	0x007f, 0x007d, 0x007a, 0x0078, 0x0076, 0x0074, 0x0072, 0x0070, 
+	0x006e, 0x006c, 0x006a, 0x0068, 0x0066, 0x0064, 0x0062, 0x0060, 
+	0x005e, 0x005c, 0x005b, 0x0059, 0x0057, 0x0055, 0x0053, 0x0052, 
+	0x0050, 0x004e, 0x004d, 0x004b, 0x004a, 0x0048, 0x0046, 0x0045, 
+	0x0043, 0x0042, 0x0040, 0x003f, 0x003e, 0x003c, 0x003b, 0x0039, 
+	0x0038, 0x0037, 0x0035, 0x0034, 0x0033, 0x0031, 0x0030, 0x002f, 
+	0x002e, 0x002d, 0x002b, 0x002a, 0x0029, 0x0028, 0x0027, 0x0026, 
+	0x0025, 0x0024, 0x0023, 0x0022, 0x0021, 0x0020, 0x001f, 0x001e, 
+	0x001d, 0x001c, 0x001b, 0x001a, 0x0019, 0x0018, 0x0017, 0x0017, 
+	0x0016, 0x0015, 0x0014, 0x0014, 0x0013, 0x0012, 0x0011, 0x0011, 
+	0x0010, 0x000f, 0x000f, 0x000e, 0x000d, 0x000d, 0x000c, 0x000c, 
+	0x000b, 0x000a, 0x000a, 0x0009, 0x0009, 0x0008, 0x0008, 0x0007, 
+	0x0007, 0x0007, 0x0006, 0x0006, 0x0005, 0x0005, 0x0005, 0x0004, 
+	0x0004, 0x0004, 0x0003, 0x0003, 0x0003, 0x0002, 0x0002, 0x0002, 
+	0x0002, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 
+	0x0002, 0x0002, 0x0002, 0x0003, 0x0003, 0x0003, 0x0004, 0x0004, 
+	0x0004, 0x0005, 0x0005, 0x0005, 0x0006, 0x0006, 0x0007, 0x0007, 
+	0x0007, 0x0008, 0x0008, 0x0009, 0x0009, 0x000a, 0x000a, 0x000b, 
+	0x000c, 0x000c, 0x000d, 0x000d, 0x000e, 0x000f, 0x000f, 0x0010, 
+	0x0011, 0x0011, 0x0012, 0x0013, 0x0014, 0x0014, 0x0015, 0x0016, 
+	0x0017, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 
+	0x001e, 0x001f, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 
+	0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002d, 0x002e, 
+	0x002f, 0x0030, 0x0031, 0x0033, 0x0034, 0x0035, 0x0037, 0x0038, 
+	0x0039, 0x003b, 0x003c, 0x003e, 0x003f, 0x0040, 0x0042, 0x0043, 
+	0x0045, 0x0046, 0x0048, 0x004a, 0x004b, 0x004d, 0x004e, 0x0050, 
+	0x0052, 0x0053, 0x0055, 0x0057, 0x0059, 0x005b, 0x005c, 0x005e, 
+	0x0060, 0x0062, 0x0064, 0x0066, 0x0068, 0x006a, 0x006c, 0x006e, 
+	0x0070, 0x0072, 0x0074, 0x0076, 0x0078, 0x007a, 0x007d, 0x007f, 
+	0x0081, 0x0083, 0x0086, 0x0088, 0x008a, 0x008d, 0x008f, 0x0092, 
+	0x0094, 0x0097, 0x0099, 0x009c, 0x009f, 0x00a1, 0x00a4, 0x00a7, 
+	0x00a9, 0x00ac, 0x00af, 0x00b2, 0x00b5, 0x00b8, 0x00bb, 0x00be, 
+	0x00c1, 0x00c4, 0x00c7, 0x00ca, 0x00cd, 0x00d1, 0x00d4, 0x00d7, 
+	0x00db, 0x00de, 0x00e2, 0x00e5, 0x00e9, 0x00ec, 0x00f0, 0x00f4, 
+	0x00f8, 0x00fb, 0x00ff, 0x0103, 0x0107, 0x010b, 0x010f, 0x0114, 
+	0x0118, 0x011c, 0x0121, 0x0125, 0x0129, 0x012e, 0x0133, 0x0137, 
+	0x013c, 0x0141, 0x0146, 0x014b, 0x0150, 0x0155, 0x015b, 0x0160, 
+	0x0166, 0x016b, 0x0171, 0x0177, 0x017c, 0x0182, 0x0188, 0x018f, 
+	0x0195, 0x019b, 0x01a2, 0x01a9, 0x01b0, 0x01b7, 0x01be, 0x01c5, 
+	0x01cd, 0x01d4, 0x01dc, 0x01e4, 0x01ec, 0x01f5, 0x01fd, 0x0206, 
+	0x020f, 0x0218, 0x0222, 0x022c, 0x0236, 0x0240, 0x024b, 0x0256, 
+	0x0261, 0x026d, 0x0279, 0x0286, 0x0293, 0x02a0, 0x02af, 0x02bd, 
+	0x02cd, 0x02dc, 0x02ed, 0x02ff, 0x0311, 0x0324, 0x0339, 0x034e, 
+	0x0365, 0x037e, 0x0398, 0x03b5, 0x03d3, 0x03f5, 0x041a, 0x0443, 
+	0x0471, 0x04a6, 0x04e4, 0x052e, 0x058b, 0x0607, 0x06c3, 0x0859, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	// wave 2
+	0x0859, 0x06c3, 0x0607, 0x058b, 0x052e, 0x04e4, 0x04a6, 0x0471, 
+	0x0443, 0x041a, 0x03f5, 0x03d3, 0x03b5, 0x0398, 0x037e, 0x0365, 
+	0x034e, 0x0339, 0x0324, 0x0311, 0x02ff, 0x02ed, 0x02dc, 0x02cd, 
+	0x02bd, 0x02af, 0x02a0, 0x0293, 0x0286, 0x0279, 0x026d, 0x0261, 
+	0x0256, 0x024b, 0x0240, 0x0236, 0x022c, 0x0222, 0x0218, 0x020f, 
+	0x0206, 0x01fd, 0x01f5, 0x01ec, 0x01e4, 0x01dc, 0x01d4, 0x01cd, 
+	0x01c5, 0x01be, 0x01b7, 0x01b0, 0x01a9, 0x01a2, 0x019b, 0x0195, 
+	0x018f, 0x0188, 0x0182, 0x017c, 0x0177, 0x0171, 0x016b, 0x0166, 
+	0x0160, 0x015b, 0x0155, 0x0150, 0x014b, 0x0146, 0x0141, 0x013c, 
+	0x0137, 0x0133, 0x012e, 0x0129, 0x0125, 0x0121, 0x011c, 0x0118, 
+	0x0114, 0x010f, 0x010b, 0x0107, 0x0103, 0x00ff, 0x00fb, 0x00f8, 
+	0x00f4, 0x00f0, 0x00ec, 0x00e9, 0x00e5, 0x00e2, 0x00de, 0x00db, 
+	0x00d7, 0x00d4, 0x00d1, 0x00cd, 0x00ca, 0x00c7, 0x00c4, 0x00c1, 
+	0x00be, 0x00bb, 0x00b8, 0x00b5, 0x00b2, 0x00af, 0x00ac, 0x00a9, 
+	0x00a7, 0x00a4, 0x00a1, 0x009f, 0x009c, 0x0099, 0x0097, 0x0094, 
+	0x0092, 0x008f, 0x008d, 0x008a, 0x0088, 0x0086, 0x0083, 0x0081, 
+	0x007f, 0x007d, 0x007a, 0x0078, 0x0076, 0x0074, 0x0072, 0x0070, 
+	0x006e, 0x006c, 0x006a, 0x0068, 0x0066, 0x0064, 0x0062, 0x0060, 
+	0x005e, 0x005c, 0x005b, 0x0059, 0x0057, 0x0055, 0x0053, 0x0052, 
+	0x0050, 0x004e, 0x004d, 0x004b, 0x004a, 0x0048, 0x0046, 0x0045, 
+	0x0043, 0x0042, 0x0040, 0x003f, 0x003e, 0x003c, 0x003b, 0x0039, 
+	0x0038, 0x0037, 0x0035, 0x0034, 0x0033, 0x0031, 0x0030, 0x002f, 
+	0x002e, 0x002d, 0x002b, 0x002a, 0x0029, 0x0028, 0x0027, 0x0026, 
+	0x0025, 0x0024, 0x0023, 0x0022, 0x0021, 0x0020, 0x001f, 0x001e, 
+	0x001d, 0x001c, 0x001b, 0x001a, 0x0019, 0x0018, 0x0017, 0x0017, 
+	0x0016, 0x0015, 0x0014, 0x0014, 0x0013, 0x0012, 0x0011, 0x0011, 
+	0x0010, 0x000f, 0x000f, 0x000e, 0x000d, 0x000d, 0x000c, 0x000c, 
+	0x000b, 0x000a, 0x000a, 0x0009, 0x0009, 0x0008, 0x0008, 0x0007, 
+	0x0007, 0x0007, 0x0006, 0x0006, 0x0005, 0x0005, 0x0005, 0x0004, 
+	0x0004, 0x0004, 0x0003, 0x0003, 0x0003, 0x0002, 0x0002, 0x0002, 
+	0x0002, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 
+	0x0002, 0x0002, 0x0002, 0x0003, 0x0003, 0x0003, 0x0004, 0x0004, 
+	0x0004, 0x0005, 0x0005, 0x0005, 0x0006, 0x0006, 0x0007, 0x0007, 
+	0x0007, 0x0008, 0x0008, 0x0009, 0x0009, 0x000a, 0x000a, 0x000b, 
+	0x000c, 0x000c, 0x000d, 0x000d, 0x000e, 0x000f, 0x000f, 0x0010, 
+	0x0011, 0x0011, 0x0012, 0x0013, 0x0014, 0x0014, 0x0015, 0x0016, 
+	0x0017, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 
+	0x001e, 0x001f, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 
+	0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002d, 0x002e, 
+	0x002f, 0x0030, 0x0031, 0x0033, 0x0034, 0x0035, 0x0037, 0x0038, 
+	0x0039, 0x003b, 0x003c, 0x003e, 0x003f, 0x0040, 0x0042, 0x0043, 
+	0x0045, 0x0046, 0x0048, 0x004a, 0x004b, 0x004d, 0x004e, 0x0050, 
+	0x0052, 0x0053, 0x0055, 0x0057, 0x0059, 0x005b, 0x005c, 0x005e, 
+	0x0060, 0x0062, 0x0064, 0x0066, 0x0068, 0x006a, 0x006c, 0x006e, 
+	0x0070, 0x0072, 0x0074, 0x0076, 0x0078, 0x007a, 0x007d, 0x007f, 
+	0x0081, 0x0083, 0x0086, 0x0088, 0x008a, 0x008d, 0x008f, 0x0092, 
+	0x0094, 0x0097, 0x0099, 0x009c, 0x009f, 0x00a1, 0x00a4, 0x00a7, 
+	0x00a9, 0x00ac, 0x00af, 0x00b2, 0x00b5, 0x00b8, 0x00bb, 0x00be, 
+	0x00c1, 0x00c4, 0x00c7, 0x00ca, 0x00cd, 0x00d1, 0x00d4, 0x00d7, 
+	0x00db, 0x00de, 0x00e2, 0x00e5, 0x00e9, 0x00ec, 0x00f0, 0x00f4, 
+	0x00f8, 0x00fb, 0x00ff, 0x0103, 0x0107, 0x010b, 0x010f, 0x0114, 
+	0x0118, 0x011c, 0x0121, 0x0125, 0x0129, 0x012e, 0x0133, 0x0137, 
+	0x013c, 0x0141, 0x0146, 0x014b, 0x0150, 0x0155, 0x015b, 0x0160, 
+	0x0166, 0x016b, 0x0171, 0x0177, 0x017c, 0x0182, 0x0188, 0x018f, 
+	0x0195, 0x019b, 0x01a2, 0x01a9, 0x01b0, 0x01b7, 0x01be, 0x01c5, 
+	0x01cd, 0x01d4, 0x01dc, 0x01e4, 0x01ec, 0x01f5, 0x01fd, 0x0206, 
+	0x020f, 0x0218, 0x0222, 0x022c, 0x0236, 0x0240, 0x024b, 0x0256, 
+	0x0261, 0x026d, 0x0279, 0x0286, 0x0293, 0x02a0, 0x02af, 0x02bd, 
+	0x02cd, 0x02dc, 0x02ed, 0x02ff, 0x0311, 0x0324, 0x0339, 0x034e, 
+	0x0365, 0x037e, 0x0398, 0x03b5, 0x03d3, 0x03f5, 0x041a, 0x0443, 
+	0x0471, 0x04a6, 0x04e4, 0x052e, 0x058b, 0x0607, 0x06c3, 0x0859, 
+	0x0859, 0x06c3, 0x0607, 0x058b, 0x052e, 0x04e4, 0x04a6, 0x0471, 
+	0x0443, 0x041a, 0x03f5, 0x03d3, 0x03b5, 0x0398, 0x037e, 0x0365, 
+	0x034e, 0x0339, 0x0324, 0x0311, 0x02ff, 0x02ed, 0x02dc, 0x02cd, 
+	0x02bd, 0x02af, 0x02a0, 0x0293, 0x0286, 0x0279, 0x026d, 0x0261, 
+	0x0256, 0x024b, 0x0240, 0x0236, 0x022c, 0x0222, 0x0218, 0x020f, 
+	0x0206, 0x01fd, 0x01f5, 0x01ec, 0x01e4, 0x01dc, 0x01d4, 0x01cd, 
+	0x01c5, 0x01be, 0x01b7, 0x01b0, 0x01a9, 0x01a2, 0x019b, 0x0195, 
+	0x018f, 0x0188, 0x0182, 0x017c, 0x0177, 0x0171, 0x016b, 0x0166, 
+	0x0160, 0x015b, 0x0155, 0x0150, 0x014b, 0x0146, 0x0141, 0x013c, 
+	0x0137, 0x0133, 0x012e, 0x0129, 0x0125, 0x0121, 0x011c, 0x0118, 
+	0x0114, 0x010f, 0x010b, 0x0107, 0x0103, 0x00ff, 0x00fb, 0x00f8, 
+	0x00f4, 0x00f0, 0x00ec, 0x00e9, 0x00e5, 0x00e2, 0x00de, 0x00db, 
+	0x00d7, 0x00d4, 0x00d1, 0x00cd, 0x00ca, 0x00c7, 0x00c4, 0x00c1, 
+	0x00be, 0x00bb, 0x00b8, 0x00b5, 0x00b2, 0x00af, 0x00ac, 0x00a9, 
+	0x00a7, 0x00a4, 0x00a1, 0x009f, 0x009c, 0x0099, 0x0097, 0x0094, 
+	0x0092, 0x008f, 0x008d, 0x008a, 0x0088, 0x0086, 0x0083, 0x0081, 
+	0x007f, 0x007d, 0x007a, 0x0078, 0x0076, 0x0074, 0x0072, 0x0070, 
+	0x006e, 0x006c, 0x006a, 0x0068, 0x0066, 0x0064, 0x0062, 0x0060, 
+	0x005e, 0x005c, 0x005b, 0x0059, 0x0057, 0x0055, 0x0053, 0x0052, 
+	0x0050, 0x004e, 0x004d, 0x004b, 0x004a, 0x0048, 0x0046, 0x0045, 
+	0x0043, 0x0042, 0x0040, 0x003f, 0x003e, 0x003c, 0x003b, 0x0039, 
+	0x0038, 0x0037, 0x0035, 0x0034, 0x0033, 0x0031, 0x0030, 0x002f, 
+	0x002e, 0x002d, 0x002b, 0x002a, 0x0029, 0x0028, 0x0027, 0x0026, 
+	0x0025, 0x0024, 0x0023, 0x0022, 0x0021, 0x0020, 0x001f, 0x001e, 
+	0x001d, 0x001c, 0x001b, 0x001a, 0x0019, 0x0018, 0x0017, 0x0017, 
+	0x0016, 0x0015, 0x0014, 0x0014, 0x0013, 0x0012, 0x0011, 0x0011, 
+	0x0010, 0x000f, 0x000f, 0x000e, 0x000d, 0x000d, 0x000c, 0x000c, 
+	0x000b, 0x000a, 0x000a, 0x0009, 0x0009, 0x0008, 0x0008, 0x0007, 
+	0x0007, 0x0007, 0x0006, 0x0006, 0x0005, 0x0005, 0x0005, 0x0004, 
+	0x0004, 0x0004, 0x0003, 0x0003, 0x0003, 0x0002, 0x0002, 0x0002, 
+	0x0002, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 
+	0x0002, 0x0002, 0x0002, 0x0003, 0x0003, 0x0003, 0x0004, 0x0004, 
+	0x0004, 0x0005, 0x0005, 0x0005, 0x0006, 0x0006, 0x0007, 0x0007, 
+	0x0007, 0x0008, 0x0008, 0x0009, 0x0009, 0x000a, 0x000a, 0x000b, 
+	0x000c, 0x000c, 0x000d, 0x000d, 0x000e, 0x000f, 0x000f, 0x0010, 
+	0x0011, 0x0011, 0x0012, 0x0013, 0x0014, 0x0014, 0x0015, 0x0016, 
+	0x0017, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 
+	0x001e, 0x001f, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 
+	0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002d, 0x002e, 
+	0x002f, 0x0030, 0x0031, 0x0033, 0x0034, 0x0035, 0x0037, 0x0038, 
+	0x0039, 0x003b, 0x003c, 0x003e, 0x003f, 0x0040, 0x0042, 0x0043, 
+	0x0045, 0x0046, 0x0048, 0x004a, 0x004b, 0x004d, 0x004e, 0x0050, 
+	0x0052, 0x0053, 0x0055, 0x0057, 0x0059, 0x005b, 0x005c, 0x005e, 
+	0x0060, 0x0062, 0x0064, 0x0066, 0x0068, 0x006a, 0x006c, 0x006e, 
+	0x0070, 0x0072, 0x0074, 0x0076, 0x0078, 0x007a, 0x007d, 0x007f, 
+	0x0081, 0x0083, 0x0086, 0x0088, 0x008a, 0x008d, 0x008f, 0x0092, 
+	0x0094, 0x0097, 0x0099, 0x009c, 0x009f, 0x00a1, 0x00a4, 0x00a7, 
+	0x00a9, 0x00ac, 0x00af, 0x00b2, 0x00b5, 0x00b8, 0x00bb, 0x00be, 
+	0x00c1, 0x00c4, 0x00c7, 0x00ca, 0x00cd, 0x00d1, 0x00d4, 0x00d7, 
+	0x00db, 0x00de, 0x00e2, 0x00e5, 0x00e9, 0x00ec, 0x00f0, 0x00f4, 
+	0x00f8, 0x00fb, 0x00ff, 0x0103, 0x0107, 0x010b, 0x010f, 0x0114, 
+	0x0118, 0x011c, 0x0121, 0x0125, 0x0129, 0x012e, 0x0133, 0x0137, 
+	0x013c, 0x0141, 0x0146, 0x014b, 0x0150, 0x0155, 0x015b, 0x0160, 
+	0x0166, 0x016b, 0x0171, 0x0177, 0x017c, 0x0182, 0x0188, 0x018f, 
+	0x0195, 0x019b, 0x01a2, 0x01a9, 0x01b0, 0x01b7, 0x01be, 0x01c5, 
+	0x01cd, 0x01d4, 0x01dc, 0x01e4, 0x01ec, 0x01f5, 0x01fd, 0x0206, 
+	0x020f, 0x0218, 0x0222, 0x022c, 0x0236, 0x0240, 0x024b, 0x0256, 
+	0x0261, 0x026d, 0x0279, 0x0286, 0x0293, 0x02a0, 0x02af, 0x02bd, 
+	0x02cd, 0x02dc, 0x02ed, 0x02ff, 0x0311, 0x0324, 0x0339, 0x034e, 
+	0x0365, 0x037e, 0x0398, 0x03b5, 0x03d3, 0x03f5, 0x041a, 0x0443, 
+	0x0471, 0x04a6, 0x04e4, 0x052e, 0x058b, 0x0607, 0x06c3, 0x0859, 
+	// wave 3
+	0x0859, 0x06c3, 0x0607, 0x058b, 0x052e, 0x04e4, 0x04a6, 0x0471, 
+	0x0443, 0x041a, 0x03f5, 0x03d3, 0x03b5, 0x0398, 0x037e, 0x0365, 
+	0x034e, 0x0339, 0x0324, 0x0311, 0x02ff, 0x02ed, 0x02dc, 0x02cd, 
+	0x02bd, 0x02af, 0x02a0, 0x0293, 0x0286, 0x0279, 0x026d, 0x0261, 
+	0x0256, 0x024b, 0x0240, 0x0236, 0x022c, 0x0222, 0x0218, 0x020f, 
+	0x0206, 0x01fd, 0x01f5, 0x01ec, 0x01e4, 0x01dc, 0x01d4, 0x01cd, 
+	0x01c5, 0x01be, 0x01b7, 0x01b0, 0x01a9, 0x01a2, 0x019b, 0x0195, 
+	0x018f, 0x0188, 0x0182, 0x017c, 0x0177, 0x0171, 0x016b, 0x0166, 
+	0x0160, 0x015b, 0x0155, 0x0150, 0x014b, 0x0146, 0x0141, 0x013c, 
+	0x0137, 0x0133, 0x012e, 0x0129, 0x0125, 0x0121, 0x011c, 0x0118, 
+	0x0114, 0x010f, 0x010b, 0x0107, 0x0103, 0x00ff, 0x00fb, 0x00f8, 
+	0x00f4, 0x00f0, 0x00ec, 0x00e9, 0x00e5, 0x00e2, 0x00de, 0x00db, 
+	0x00d7, 0x00d4, 0x00d1, 0x00cd, 0x00ca, 0x00c7, 0x00c4, 0x00c1, 
+	0x00be, 0x00bb, 0x00b8, 0x00b5, 0x00b2, 0x00af, 0x00ac, 0x00a9, 
+	0x00a7, 0x00a4, 0x00a1, 0x009f, 0x009c, 0x0099, 0x0097, 0x0094, 
+	0x0092, 0x008f, 0x008d, 0x008a, 0x0088, 0x0086, 0x0083, 0x0081, 
+	0x007f, 0x007d, 0x007a, 0x0078, 0x0076, 0x0074, 0x0072, 0x0070, 
+	0x006e, 0x006c, 0x006a, 0x0068, 0x0066, 0x0064, 0x0062, 0x0060, 
+	0x005e, 0x005c, 0x005b, 0x0059, 0x0057, 0x0055, 0x0053, 0x0052, 
+	0x0050, 0x004e, 0x004d, 0x004b, 0x004a, 0x0048, 0x0046, 0x0045, 
+	0x0043, 0x0042, 0x0040, 0x003f, 0x003e, 0x003c, 0x003b, 0x0039, 
+	0x0038, 0x0037, 0x0035, 0x0034, 0x0033, 0x0031, 0x0030, 0x002f, 
+	0x002e, 0x002d, 0x002b, 0x002a, 0x0029, 0x0028, 0x0027, 0x0026, 
+	0x0025, 0x0024, 0x0023, 0x0022, 0x0021, 0x0020, 0x001f, 0x001e, 
+	0x001d, 0x001c, 0x001b, 0x001a, 0x0019, 0x0018, 0x0017, 0x0017, 
+	0x0016, 0x0015, 0x0014, 0x0014, 0x0013, 0x0012, 0x0011, 0x0011, 
+	0x0010, 0x000f, 0x000f, 0x000e, 0x000d, 0x000d, 0x000c, 0x000c, 
+	0x000b, 0x000a, 0x000a, 0x0009, 0x0009, 0x0008, 0x0008, 0x0007, 
+	0x0007, 0x0007, 0x0006, 0x0006, 0x0005, 0x0005, 0x0005, 0x0004, 
+	0x0004, 0x0004, 0x0003, 0x0003, 0x0003, 0x0002, 0x0002, 0x0002, 
+	0x0002, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x0859, 0x06c3, 0x0607, 0x058b, 0x052e, 0x04e4, 0x04a6, 0x0471, 
+	0x0443, 0x041a, 0x03f5, 0x03d3, 0x03b5, 0x0398, 0x037e, 0x0365, 
+	0x034e, 0x0339, 0x0324, 0x0311, 0x02ff, 0x02ed, 0x02dc, 0x02cd, 
+	0x02bd, 0x02af, 0x02a0, 0x0293, 0x0286, 0x0279, 0x026d, 0x0261, 
+	0x0256, 0x024b, 0x0240, 0x0236, 0x022c, 0x0222, 0x0218, 0x020f, 
+	0x0206, 0x01fd, 0x01f5, 0x01ec, 0x01e4, 0x01dc, 0x01d4, 0x01cd, 
+	0x01c5, 0x01be, 0x01b7, 0x01b0, 0x01a9, 0x01a2, 0x019b, 0x0195, 
+	0x018f, 0x0188, 0x0182, 0x017c, 0x0177, 0x0171, 0x016b, 0x0166, 
+	0x0160, 0x015b, 0x0155, 0x0150, 0x014b, 0x0146, 0x0141, 0x013c, 
+	0x0137, 0x0133, 0x012e, 0x0129, 0x0125, 0x0121, 0x011c, 0x0118, 
+	0x0114, 0x010f, 0x010b, 0x0107, 0x0103, 0x00ff, 0x00fb, 0x00f8, 
+	0x00f4, 0x00f0, 0x00ec, 0x00e9, 0x00e5, 0x00e2, 0x00de, 0x00db, 
+	0x00d7, 0x00d4, 0x00d1, 0x00cd, 0x00ca, 0x00c7, 0x00c4, 0x00c1, 
+	0x00be, 0x00bb, 0x00b8, 0x00b5, 0x00b2, 0x00af, 0x00ac, 0x00a9, 
+	0x00a7, 0x00a4, 0x00a1, 0x009f, 0x009c, 0x0099, 0x0097, 0x0094, 
+	0x0092, 0x008f, 0x008d, 0x008a, 0x0088, 0x0086, 0x0083, 0x0081, 
+	0x007f, 0x007d, 0x007a, 0x0078, 0x0076, 0x0074, 0x0072, 0x0070, 
+	0x006e, 0x006c, 0x006a, 0x0068, 0x0066, 0x0064, 0x0062, 0x0060, 
+	0x005e, 0x005c, 0x005b, 0x0059, 0x0057, 0x0055, 0x0053, 0x0052, 
+	0x0050, 0x004e, 0x004d, 0x004b, 0x004a, 0x0048, 0x0046, 0x0045, 
+	0x0043, 0x0042, 0x0040, 0x003f, 0x003e, 0x003c, 0x003b, 0x0039, 
+	0x0038, 0x0037, 0x0035, 0x0034, 0x0033, 0x0031, 0x0030, 0x002f, 
+	0x002e, 0x002d, 0x002b, 0x002a, 0x0029, 0x0028, 0x0027, 0x0026, 
+	0x0025, 0x0024, 0x0023, 0x0022, 0x0021, 0x0020, 0x001f, 0x001e, 
+	0x001d, 0x001c, 0x001b, 0x001a, 0x0019, 0x0018, 0x0017, 0x0017, 
+	0x0016, 0x0015, 0x0014, 0x0014, 0x0013, 0x0012, 0x0011, 0x0011, 
+	0x0010, 0x000f, 0x000f, 0x000e, 0x000d, 0x000d, 0x000c, 0x000c, 
+	0x000b, 0x000a, 0x000a, 0x0009, 0x0009, 0x0008, 0x0008, 0x0007, 
+	0x0007, 0x0007, 0x0006, 0x0006, 0x0005, 0x0005, 0x0005, 0x0004, 
+	0x0004, 0x0004, 0x0003, 0x0003, 0x0003, 0x0002, 0x0002, 0x0002, 
+	0x0002, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	// wave 4
+	0x0859, 0x0607, 0x052e, 0x04a6, 0x0443, 0x03f5, 0x03b5, 0x037e, 
+	0x034e, 0x0324, 0x02ff, 0x02dc, 0x02bd, 0x02a0, 0x0286, 0x026d, 
+	0x0256, 0x0240, 0x022c, 0x0218, 0x0206, 0x01f5, 0x01e4, 0x01d4, 
+	0x01c5, 0x01b7, 0x01a9, 0x019b, 0x018f, 0x0182, 0x0177, 0x016b, 
+	0x0160, 0x0155, 0x014b, 0x0141, 0x0137, 0x012e, 0x0125, 0x011c, 
+	0x0114, 0x010b, 0x0103, 0x00fb, 0x00f4, 0x00ec, 0x00e5, 0x00de, 
+	0x00d7, 0x00d1, 0x00ca, 0x00c4, 0x00be, 0x00b8, 0x00b2, 0x00ac, 
+	0x00a7, 0x00a1, 0x009c, 0x0097, 0x0092, 0x008d, 0x0088, 0x0083, 
+	0x007f, 0x007a, 0x0076, 0x0072, 0x006e, 0x006a, 0x0066, 0x0062, 
+	0x005e, 0x005b, 0x0057, 0x0053, 0x0050, 0x004d, 0x004a, 0x0046, 
+	0x0043, 0x0040, 0x003e, 0x003b, 0x0038, 0x0035, 0x0033, 0x0030, 
+	0x002e, 0x002b, 0x0029, 0x0027, 0x0025, 0x0023, 0x0021, 0x001f, 
+	0x001d, 0x001b, 0x0019, 0x0017, 0x0016, 0x0014, 0x0013, 0x0011, 
+	0x0010, 0x000f, 0x000d, 0x000c, 0x000b, 0x000a, 0x0009, 0x0008, 
+	0x0007, 0x0006, 0x0005, 0x0005, 0x0004, 0x0003, 0x0003, 0x0002, 
+	0x0002, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0002, 
+	0x0002, 0x0003, 0x0003, 0x0004, 0x0005, 0x0005, 0x0006, 0x0007, 
+	0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000f, 0x0010, 
+	0x0011, 0x0013, 0x0014, 0x0016, 0x0017, 0x0019, 0x001b, 0x001d, 
+	0x001f, 0x0021, 0x0023, 0x0025, 0x0027, 0x0029, 0x002b, 0x002e, 
+	0x0030, 0x0033, 0x0035, 0x0038, 0x003b, 0x003e, 0x0040, 0x0043, 
+	0x0046, 0x004a, 0x004d, 0x0050, 0x0053, 0x0057, 0x005b, 0x005e, 
+	0x0062, 0x0066, 0x006a, 0x006e, 0x0072, 0x0076, 0x007a, 0x007f, 
+	0x0083, 0x0088, 0x008d, 0x0092, 0x0097, 0x009c, 0x00a1, 0x00a7, 
+	0x00ac, 0x00b2, 0x00b8, 0x00be, 0x00c4, 0x00ca, 0x00d1, 0x00d7, 
+	0x00de, 0x00e5, 0x00ec, 0x00f4, 0x00fb, 0x0103, 0x010b, 0x0114, 
+	0x011c, 0x0125, 0x012e, 0x0137, 0x0141, 0x014b, 0x0155, 0x0160, 
+	0x016b, 0x0177, 0x0182, 0x018f, 0x019b, 0x01a9, 0x01b7, 0x01c5, 
+	0x01d4, 0x01e4, 0x01f5, 0x0206, 0x0218, 0x022c, 0x0240, 0x0256, 
+	0x026d, 0x0286, 0x02a0, 0x02bd, 0x02dc, 0x02ff, 0x0324, 0x034e, 
+	0x037e, 0x03b5, 0x03f5, 0x0443, 0x04a6, 0x052e, 0x0607, 0x0859, 
+	0x8859, 0x8607, 0x852e, 0x84a6, 0x8443, 0x83f5, 0x83b5, 0x837e, 
+	0x834e, 0x8324, 0x82ff, 0x82dc, 0x82bd, 0x82a0, 0x8286, 0x826d, 
+	0x8256, 0x8240, 0x822c, 0x8218, 0x8206, 0x81f5, 0x81e4, 0x81d4, 
+	0x81c5, 0x81b7, 0x81a9, 0x819b, 0x818f, 0x8182, 0x8177, 0x816b, 
+	0x8160, 0x8155, 0x814b, 0x8141, 0x8137, 0x812e, 0x8125, 0x811c, 
+	0x8114, 0x810b, 0x8103, 0x80fb, 0x80f4, 0x80ec, 0x80e5, 0x80de, 
+	0x80d7, 0x80d1, 0x80ca, 0x80c4, 0x80be, 0x80b8, 0x80b2, 0x80ac, 
+	0x80a7, 0x80a1, 0x809c, 0x8097, 0x8092, 0x808d, 0x8088, 0x8083, 
+	0x807f, 0x807a, 0x8076, 0x8072, 0x806e, 0x806a, 0x8066, 0x8062, 
+	0x805e, 0x805b, 0x8057, 0x8053, 0x8050, 0x804d, 0x804a, 0x8046, 
+	0x8043, 0x8040, 0x803e, 0x803b, 0x8038, 0x8035, 0x8033, 0x8030, 
+	0x802e, 0x802b, 0x8029, 0x8027, 0x8025, 0x8023, 0x8021, 0x801f, 
+	0x801d, 0x801b, 0x8019, 0x8017, 0x8016, 0x8014, 0x8013, 0x8011, 
+	0x8010, 0x800f, 0x800d, 0x800c, 0x800b, 0x800a, 0x8009, 0x8008, 
+	0x8007, 0x8006, 0x8005, 0x8005, 0x8004, 0x8003, 0x8003, 0x8002, 
+	0x8002, 0x8001, 0x8001, 0x8001, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8001, 0x8001, 0x8001, 0x8002, 
+	0x8002, 0x8003, 0x8003, 0x8004, 0x8005, 0x8005, 0x8006, 0x8007, 
+	0x8008, 0x8009, 0x800a, 0x800b, 0x800c, 0x800d, 0x800f, 0x8010, 
+	0x8011, 0x8013, 0x8014, 0x8016, 0x8017, 0x8019, 0x801b, 0x801d, 
+	0x801f, 0x8021, 0x8023, 0x8025, 0x8027, 0x8029, 0x802b, 0x802e, 
+	0x8030, 0x8033, 0x8035, 0x8038, 0x803b, 0x803e, 0x8040, 0x8043, 
+	0x8046, 0x804a, 0x804d, 0x8050, 0x8053, 0x8057, 0x805b, 0x805e, 
+	0x8062, 0x8066, 0x806a, 0x806e, 0x8072, 0x8076, 0x807a, 0x807f, 
+	0x8083, 0x8088, 0x808d, 0x8092, 0x8097, 0x809c, 0x80a1, 0x80a7, 
+	0x80ac, 0x80b2, 0x80b8, 0x80be, 0x80c4, 0x80ca, 0x80d1, 0x80d7, 
+	0x80de, 0x80e5, 0x80ec, 0x80f4, 0x80fb, 0x8103, 0x810b, 0x8114, 
+	0x811c, 0x8125, 0x812e, 0x8137, 0x8141, 0x814b, 0x8155, 0x8160, 
+	0x816b, 0x8177, 0x8182, 0x818f, 0x819b, 0x81a9, 0x81b7, 0x81c5, 
+	0x81d4, 0x81e4, 0x81f5, 0x8206, 0x8218, 0x822c, 0x8240, 0x8256, 
+	0x826d, 0x8286, 0x82a0, 0x82bd, 0x82dc, 0x82ff, 0x8324, 0x834e, 
+	0x837e, 0x83b5, 0x83f5, 0x8443, 0x84a6, 0x852e, 0x8607, 0x8859, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	// wave 5
+	0x0859, 0x0607, 0x052e, 0x04a6, 0x0443, 0x03f5, 0x03b5, 0x037e, 
+	0x034e, 0x0324, 0x02ff, 0x02dc, 0x02bd, 0x02a0, 0x0286, 0x026d, 
+	0x0256, 0x0240, 0x022c, 0x0218, 0x0206, 0x01f5, 0x01e4, 0x01d4, 
+	0x01c5, 0x01b7, 0x01a9, 0x019b, 0x018f, 0x0182, 0x0177, 0x016b, 
+	0x0160, 0x0155, 0x014b, 0x0141, 0x0137, 0x012e, 0x0125, 0x011c, 
+	0x0114, 0x010b, 0x0103, 0x00fb, 0x00f4, 0x00ec, 0x00e5, 0x00de, 
+	0x00d7, 0x00d1, 0x00ca, 0x00c4, 0x00be, 0x00b8, 0x00b2, 0x00ac, 
+	0x00a7, 0x00a1, 0x009c, 0x0097, 0x0092, 0x008d, 0x0088, 0x0083, 
+	0x007f, 0x007a, 0x0076, 0x0072, 0x006e, 0x006a, 0x0066, 0x0062, 
+	0x005e, 0x005b, 0x0057, 0x0053, 0x0050, 0x004d, 0x004a, 0x0046, 
+	0x0043, 0x0040, 0x003e, 0x003b, 0x0038, 0x0035, 0x0033, 0x0030, 
+	0x002e, 0x002b, 0x0029, 0x0027, 0x0025, 0x0023, 0x0021, 0x001f, 
+	0x001d, 0x001b, 0x0019, 0x0017, 0x0016, 0x0014, 0x0013, 0x0011, 
+	0x0010, 0x000f, 0x000d, 0x000c, 0x000b, 0x000a, 0x0009, 0x0008, 
+	0x0007, 0x0006, 0x0005, 0x0005, 0x0004, 0x0003, 0x0003, 0x0002, 
+	0x0002, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0002, 
+	0x0002, 0x0003, 0x0003, 0x0004, 0x0005, 0x0005, 0x0006, 0x0007, 
+	0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000f, 0x0010, 
+	0x0011, 0x0013, 0x0014, 0x0016, 0x0017, 0x0019, 0x001b, 0x001d, 
+	0x001f, 0x0021, 0x0023, 0x0025, 0x0027, 0x0029, 0x002b, 0x002e, 
+	0x0030, 0x0033, 0x0035, 0x0038, 0x003b, 0x003e, 0x0040, 0x0043, 
+	0x0046, 0x004a, 0x004d, 0x0050, 0x0053, 0x0057, 0x005b, 0x005e, 
+	0x0062, 0x0066, 0x006a, 0x006e, 0x0072, 0x0076, 0x007a, 0x007f, 
+	0x0083, 0x0088, 0x008d, 0x0092, 0x0097, 0x009c, 0x00a1, 0x00a7, 
+	0x00ac, 0x00b2, 0x00b8, 0x00be, 0x00c4, 0x00ca, 0x00d1, 0x00d7, 
+	0x00de, 0x00e5, 0x00ec, 0x00f4, 0x00fb, 0x0103, 0x010b, 0x0114, 
+	0x011c, 0x0125, 0x012e, 0x0137, 0x0141, 0x014b, 0x0155, 0x0160, 
+	0x016b, 0x0177, 0x0182, 0x018f, 0x019b, 0x01a9, 0x01b7, 0x01c5, 
+	0x01d4, 0x01e4, 0x01f5, 0x0206, 0x0218, 0x022c, 0x0240, 0x0256, 
+	0x026d, 0x0286, 0x02a0, 0x02bd, 0x02dc, 0x02ff, 0x0324, 0x034e, 
+	0x037e, 0x03b5, 0x03f5, 0x0443, 0x04a6, 0x052e, 0x0607, 0x0859, 
+	0x0859, 0x0607, 0x052e, 0x04a6, 0x0443, 0x03f5, 0x03b5, 0x037e, 
+	0x034e, 0x0324, 0x02ff, 0x02dc, 0x02bd, 0x02a0, 0x0286, 0x026d, 
+	0x0256, 0x0240, 0x022c, 0x0218, 0x0206, 0x01f5, 0x01e4, 0x01d4, 
+	0x01c5, 0x01b7, 0x01a9, 0x019b, 0x018f, 0x0182, 0x0177, 0x016b, 
+	0x0160, 0x0155, 0x014b, 0x0141, 0x0137, 0x012e, 0x0125, 0x011c, 
+	0x0114, 0x010b, 0x0103, 0x00fb, 0x00f4, 0x00ec, 0x00e5, 0x00de, 
+	0x00d7, 0x00d1, 0x00ca, 0x00c4, 0x00be, 0x00b8, 0x00b2, 0x00ac, 
+	0x00a7, 0x00a1, 0x009c, 0x0097, 0x0092, 0x008d, 0x0088, 0x0083, 
+	0x007f, 0x007a, 0x0076, 0x0072, 0x006e, 0x006a, 0x0066, 0x0062, 
+	0x005e, 0x005b, 0x0057, 0x0053, 0x0050, 0x004d, 0x004a, 0x0046, 
+	0x0043, 0x0040, 0x003e, 0x003b, 0x0038, 0x0035, 0x0033, 0x0030, 
+	0x002e, 0x002b, 0x0029, 0x0027, 0x0025, 0x0023, 0x0021, 0x001f, 
+	0x001d, 0x001b, 0x0019, 0x0017, 0x0016, 0x0014, 0x0013, 0x0011, 
+	0x0010, 0x000f, 0x000d, 0x000c, 0x000b, 0x000a, 0x0009, 0x0008, 
+	0x0007, 0x0006, 0x0005, 0x0005, 0x0004, 0x0003, 0x0003, 0x0002, 
+	0x0002, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0002, 
+	0x0002, 0x0003, 0x0003, 0x0004, 0x0005, 0x0005, 0x0006, 0x0007, 
+	0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000f, 0x0010, 
+	0x0011, 0x0013, 0x0014, 0x0016, 0x0017, 0x0019, 0x001b, 0x001d, 
+	0x001f, 0x0021, 0x0023, 0x0025, 0x0027, 0x0029, 0x002b, 0x002e, 
+	0x0030, 0x0033, 0x0035, 0x0038, 0x003b, 0x003e, 0x0040, 0x0043, 
+	0x0046, 0x004a, 0x004d, 0x0050, 0x0053, 0x0057, 0x005b, 0x005e, 
+	0x0062, 0x0066, 0x006a, 0x006e, 0x0072, 0x0076, 0x007a, 0x007f, 
+	0x0083, 0x0088, 0x008d, 0x0092, 0x0097, 0x009c, 0x00a1, 0x00a7, 
+	0x00ac, 0x00b2, 0x00b8, 0x00be, 0x00c4, 0x00ca, 0x00d1, 0x00d7, 
+	0x00de, 0x00e5, 0x00ec, 0x00f4, 0x00fb, 0x0103, 0x010b, 0x0114, 
+	0x011c, 0x0125, 0x012e, 0x0137, 0x0141, 0x014b, 0x0155, 0x0160, 
+	0x016b, 0x0177, 0x0182, 0x018f, 0x019b, 0x01a9, 0x01b7, 0x01c5, 
+	0x01d4, 0x01e4, 0x01f5, 0x0206, 0x0218, 0x022c, 0x0240, 0x0256, 
+	0x026d, 0x0286, 0x02a0, 0x02bd, 0x02dc, 0x02ff, 0x0324, 0x034e, 
+	0x037e, 0x03b5, 0x03f5, 0x0443, 0x04a6, 0x052e, 0x0607, 0x0859, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 
+	// wave 6
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 
+	// wave 7
+	0x0000, 0x0008, 0x0010, 0x0018, 0x0020, 0x0028, 0x0030, 0x0038, 
+	0x0040, 0x0048, 0x0050, 0x0058, 0x0060, 0x0068, 0x0070, 0x0078, 
+	0x0080, 0x0088, 0x0090, 0x0098, 0x00a0, 0x00a8, 0x00b0, 0x00b8, 
+	0x00c0, 0x00c8, 0x00d0, 0x00d8, 0x00e0, 0x00e8, 0x00f0, 0x00f8, 
+	0x0100, 0x0108, 0x0110, 0x0118, 0x0120, 0x0128, 0x0130, 0x0138, 
+	0x0140, 0x0148, 0x0150, 0x0158, 0x0160, 0x0168, 0x0170, 0x0178, 
+	0x0180, 0x0188, 0x0190, 0x0198, 0x01a0, 0x01a8, 0x01b0, 0x01b8, 
+	0x01c0, 0x01c8, 0x01d0, 0x01d8, 0x01e0, 0x01e8, 0x01f0, 0x01f8, 
+	0x0200, 0x0208, 0x0210, 0x0218, 0x0220, 0x0228, 0x0230, 0x0238, 
+	0x0240, 0x0248, 0x0250, 0x0258, 0x0260, 0x0268, 0x0270, 0x0278, 
+	0x0280, 0x0288, 0x0290, 0x0298, 0x02a0, 0x02a8, 0x02b0, 0x02b8, 
+	0x02c0, 0x02c8, 0x02d0, 0x02d8, 0x02e0, 0x02e8, 0x02f0, 0x02f8, 
+	0x0300, 0x0308, 0x0310, 0x0318, 0x0320, 0x0328, 0x0330, 0x0338, 
+	0x0340, 0x0348, 0x0350, 0x0358, 0x0360, 0x0368, 0x0370, 0x0378, 
+	0x0380, 0x0388, 0x0390, 0x0398, 0x03a0, 0x03a8, 0x03b0, 0x03b8, 
+	0x03c0, 0x03c8, 0x03d0, 0x03d8, 0x03e0, 0x03e8, 0x03f0, 0x03f8, 
+	0x0400, 0x0408, 0x0410, 0x0418, 0x0420, 0x0428, 0x0430, 0x0438, 
+	0x0440, 0x0448, 0x0450, 0x0458, 0x0460, 0x0468, 0x0470, 0x0478, 
+	0x0480, 0x0488, 0x0490, 0x0498, 0x04a0, 0x04a8, 0x04b0, 0x04b8, 
+	0x04c0, 0x04c8, 0x04d0, 0x04d8, 0x04e0, 0x04e8, 0x04f0, 0x04f8, 
+	0x0500, 0x0508, 0x0510, 0x0518, 0x0520, 0x0528, 0x0530, 0x0538, 
+	0x0540, 0x0548, 0x0550, 0x0558, 0x0560, 0x0568, 0x0570, 0x0578, 
+	0x0580, 0x0588, 0x0590, 0x0598, 0x05a0, 0x05a8, 0x05b0, 0x05b8, 
+	0x05c0, 0x05c8, 0x05d0, 0x05d8, 0x05e0, 0x05e8, 0x05f0, 0x05f8, 
+	0x0600, 0x0608, 0x0610, 0x0618, 0x0620, 0x0628, 0x0630, 0x0638, 
+	0x0640, 0x0648, 0x0650, 0x0658, 0x0660, 0x0668, 0x0670, 0x0678, 
+	0x0680, 0x0688, 0x0690, 0x0698, 0x06a0, 0x06a8, 0x06b0, 0x06b8, 
+	0x06c0, 0x06c8, 0x06d0, 0x06d8, 0x06e0, 0x06e8, 0x06f0, 0x06f8, 
+	0x0700, 0x0708, 0x0710, 0x0718, 0x0720, 0x0728, 0x0730, 0x0738, 
+	0x0740, 0x0748, 0x0750, 0x0758, 0x0760, 0x0768, 0x0770, 0x0778, 
+	0x0780, 0x0788, 0x0790, 0x0798, 0x07a0, 0x07a8, 0x07b0, 0x07b8, 
+	0x07c0, 0x07c8, 0x07d0, 0x07d8, 0x07e0, 0x07e8, 0x07f0, 0x07f8, 
+	0x0800, 0x0808, 0x0810, 0x0818, 0x0820, 0x0828, 0x0830, 0x0838, 
+	0x0840, 0x0848, 0x0850, 0x0858, 0x0860, 0x0868, 0x0870, 0x0878, 
+	0x0880, 0x0888, 0x0890, 0x0898, 0x08a0, 0x08a8, 0x08b0, 0x08b8, 
+	0x08c0, 0x08c8, 0x08d0, 0x08d8, 0x08e0, 0x08e8, 0x08f0, 0x08f8, 
+	0x0900, 0x0908, 0x0910, 0x0918, 0x0920, 0x0928, 0x0930, 0x0938, 
+	0x0940, 0x0948, 0x0950, 0x0958, 0x0960, 0x0968, 0x0970, 0x0978, 
+	0x0980, 0x0988, 0x0990, 0x0998, 0x09a0, 0x09a8, 0x09b0, 0x09b8, 
+	0x09c0, 0x09c8, 0x09d0, 0x09d8, 0x09e0, 0x09e8, 0x09f0, 0x09f8, 
+	0x0a00, 0x0a08, 0x0a10, 0x0a18, 0x0a20, 0x0a28, 0x0a30, 0x0a38, 
+	0x0a40, 0x0a48, 0x0a50, 0x0a58, 0x0a60, 0x0a68, 0x0a70, 0x0a78, 
+	0x0a80, 0x0a88, 0x0a90, 0x0a98, 0x0aa0, 0x0aa8, 0x0ab0, 0x0ab8, 
+	0x0ac0, 0x0ac8, 0x0ad0, 0x0ad8, 0x0ae0, 0x0ae8, 0x0af0, 0x0af8, 
+	0x0b00, 0x0b08, 0x0b10, 0x0b18, 0x0b20, 0x0b28, 0x0b30, 0x0b38, 
+	0x0b40, 0x0b48, 0x0b50, 0x0b58, 0x0b60, 0x0b68, 0x0b70, 0x0b78, 
+	0x0b80, 0x0b88, 0x0b90, 0x0b98, 0x0ba0, 0x0ba8, 0x0bb0, 0x0bb8, 
+	0x0bc0, 0x0bc8, 0x0bd0, 0x0bd8, 0x0be0, 0x0be8, 0x0bf0, 0x0bf8, 
+	0x0c00, 0x0c08, 0x0c10, 0x0c18, 0x0c20, 0x0c28, 0x0c30, 0x0c38, 
+	0x0c40, 0x0c48, 0x0c50, 0x0c58, 0x0c60, 0x0c68, 0x0c70, 0x0c78, 
+	0x0c80, 0x0c88, 0x0c90, 0x0c98, 0x0ca0, 0x0ca8, 0x0cb0, 0x0cb8, 
+	0x0cc0, 0x0cc8, 0x0cd0, 0x0cd8, 0x0ce0, 0x0ce8, 0x0cf0, 0x0cf8, 
+	0x0d00, 0x0d08, 0x0d10, 0x0d18, 0x0d20, 0x0d28, 0x0d30, 0x0d38, 
+	0x0d40, 0x0d48, 0x0d50, 0x0d58, 0x0d60, 0x0d68, 0x0d70, 0x0d78, 
+	0x0d80, 0x0d88, 0x0d90, 0x0d98, 0x0da0, 0x0da8, 0x0db0, 0x0db8, 
+	0x0dc0, 0x0dc8, 0x0dd0, 0x0dd8, 0x0de0, 0x0de8, 0x0df0, 0x0df8, 
+	0x0e00, 0x0e08, 0x0e10, 0x0e18, 0x0e20, 0x0e28, 0x0e30, 0x0e38, 
+	0x0e40, 0x0e48, 0x0e50, 0x0e58, 0x0e60, 0x0e68, 0x0e70, 0x0e78, 
+	0x0e80, 0x0e88, 0x0e90, 0x0e98, 0x0ea0, 0x0ea8, 0x0eb0, 0x0eb8, 
+	0x0ec0, 0x0ec8, 0x0ed0, 0x0ed8, 0x0ee0, 0x0ee8, 0x0ef0, 0x0ef8, 
+	0x0f00, 0x0f08, 0x0f10, 0x0f18, 0x0f20, 0x0f28, 0x0f30, 0x0f38, 
+	0x0f40, 0x0f48, 0x0f50, 0x0f58, 0x0f60, 0x0f68, 0x0f70, 0x0f78, 
+	0x0f80, 0x0f88, 0x0f90, 0x0f98, 0x0fa0, 0x0fa8, 0x0fb0, 0x0fb8, 
+	0x0fc0, 0x0fc8, 0x0fd0, 0x0fd8, 0x0fe0, 0x0fe8, 0x0ff0, 0x0ff8, 
+	0x8ff8, 0x8ff0, 0x8fe8, 0x8fe0, 0x8fd8, 0x8fd0, 0x8fc8, 0x8fc0, 
+	0x8fb8, 0x8fb0, 0x8fa8, 0x8fa0, 0x8f98, 0x8f90, 0x8f88, 0x8f80, 
+	0x8f78, 0x8f70, 0x8f68, 0x8f60, 0x8f58, 0x8f50, 0x8f48, 0x8f40, 
+	0x8f38, 0x8f30, 0x8f28, 0x8f20, 0x8f18, 0x8f10, 0x8f08, 0x8f00, 
+	0x8ef8, 0x8ef0, 0x8ee8, 0x8ee0, 0x8ed8, 0x8ed0, 0x8ec8, 0x8ec0, 
+	0x8eb8, 0x8eb0, 0x8ea8, 0x8ea0, 0x8e98, 0x8e90, 0x8e88, 0x8e80, 
+	0x8e78, 0x8e70, 0x8e68, 0x8e60, 0x8e58, 0x8e50, 0x8e48, 0x8e40, 
+	0x8e38, 0x8e30, 0x8e28, 0x8e20, 0x8e18, 0x8e10, 0x8e08, 0x8e00, 
+	0x8df8, 0x8df0, 0x8de8, 0x8de0, 0x8dd8, 0x8dd0, 0x8dc8, 0x8dc0, 
+	0x8db8, 0x8db0, 0x8da8, 0x8da0, 0x8d98, 0x8d90, 0x8d88, 0x8d80, 
+	0x8d78, 0x8d70, 0x8d68, 0x8d60, 0x8d58, 0x8d50, 0x8d48, 0x8d40, 
+	0x8d38, 0x8d30, 0x8d28, 0x8d20, 0x8d18, 0x8d10, 0x8d08, 0x8d00, 
+	0x8cf8, 0x8cf0, 0x8ce8, 0x8ce0, 0x8cd8, 0x8cd0, 0x8cc8, 0x8cc0, 
+	0x8cb8, 0x8cb0, 0x8ca8, 0x8ca0, 0x8c98, 0x8c90, 0x8c88, 0x8c80, 
+	0x8c78, 0x8c70, 0x8c68, 0x8c60, 0x8c58, 0x8c50, 0x8c48, 0x8c40, 
+	0x8c38, 0x8c30, 0x8c28, 0x8c20, 0x8c18, 0x8c10, 0x8c08, 0x8c00, 
+	0x8bf8, 0x8bf0, 0x8be8, 0x8be0, 0x8bd8, 0x8bd0, 0x8bc8, 0x8bc0, 
+	0x8bb8, 0x8bb0, 0x8ba8, 0x8ba0, 0x8b98, 0x8b90, 0x8b88, 0x8b80, 
+	0x8b78, 0x8b70, 0x8b68, 0x8b60, 0x8b58, 0x8b50, 0x8b48, 0x8b40, 
+	0x8b38, 0x8b30, 0x8b28, 0x8b20, 0x8b18, 0x8b10, 0x8b08, 0x8b00, 
+	0x8af8, 0x8af0, 0x8ae8, 0x8ae0, 0x8ad8, 0x8ad0, 0x8ac8, 0x8ac0, 
+	0x8ab8, 0x8ab0, 0x8aa8, 0x8aa0, 0x8a98, 0x8a90, 0x8a88, 0x8a80, 
+	0x8a78, 0x8a70, 0x8a68, 0x8a60, 0x8a58, 0x8a50, 0x8a48, 0x8a40, 
+	0x8a38, 0x8a30, 0x8a28, 0x8a20, 0x8a18, 0x8a10, 0x8a08, 0x8a00, 
+	0x89f8, 0x89f0, 0x89e8, 0x89e0, 0x89d8, 0x89d0, 0x89c8, 0x89c0, 
+	0x89b8, 0x89b0, 0x89a8, 0x89a0, 0x8998, 0x8990, 0x8988, 0x8980, 
+	0x8978, 0x8970, 0x8968, 0x8960, 0x8958, 0x8950, 0x8948, 0x8940, 
+	0x8938, 0x8930, 0x8928, 0x8920, 0x8918, 0x8910, 0x8908, 0x8900, 
+	0x88f8, 0x88f0, 0x88e8, 0x88e0, 0x88d8, 0x88d0, 0x88c8, 0x88c0, 
+	0x88b8, 0x88b0, 0x88a8, 0x88a0, 0x8898, 0x8890, 0x8888, 0x8880, 
+	0x8878, 0x8870, 0x8868, 0x8860, 0x8858, 0x8850, 0x8848, 0x8840, 
+	0x8838, 0x8830, 0x8828, 0x8820, 0x8818, 0x8810, 0x8808, 0x8800, 
+	0x87f8, 0x87f0, 0x87e8, 0x87e0, 0x87d8, 0x87d0, 0x87c8, 0x87c0, 
+	0x87b8, 0x87b0, 0x87a8, 0x87a0, 0x8798, 0x8790, 0x8788, 0x8780, 
+	0x8778, 0x8770, 0x8768, 0x8760, 0x8758, 0x8750, 0x8748, 0x8740, 
+	0x8738, 0x8730, 0x8728, 0x8720, 0x8718, 0x8710, 0x8708, 0x8700, 
+	0x86f8, 0x86f0, 0x86e8, 0x86e0, 0x86d8, 0x86d0, 0x86c8, 0x86c0, 
+	0x86b8, 0x86b0, 0x86a8, 0x86a0, 0x8698, 0x8690, 0x8688, 0x8680, 
+	0x8678, 0x8670, 0x8668, 0x8660, 0x8658, 0x8650, 0x8648, 0x8640, 
+	0x8638, 0x8630, 0x8628, 0x8620, 0x8618, 0x8610, 0x8608, 0x8600, 
+	0x85f8, 0x85f0, 0x85e8, 0x85e0, 0x85d8, 0x85d0, 0x85c8, 0x85c0, 
+	0x85b8, 0x85b0, 0x85a8, 0x85a0, 0x8598, 0x8590, 0x8588, 0x8580, 
+	0x8578, 0x8570, 0x8568, 0x8560, 0x8558, 0x8550, 0x8548, 0x8540, 
+	0x8538, 0x8530, 0x8528, 0x8520, 0x8518, 0x8510, 0x8508, 0x8500, 
+	0x84f8, 0x84f0, 0x84e8, 0x84e0, 0x84d8, 0x84d0, 0x84c8, 0x84c0, 
+	0x84b8, 0x84b0, 0x84a8, 0x84a0, 0x8498, 0x8490, 0x8488, 0x8480, 
+	0x8478, 0x8470, 0x8468, 0x8460, 0x8458, 0x8450, 0x8448, 0x8440, 
+	0x8438, 0x8430, 0x8428, 0x8420, 0x8418, 0x8410, 0x8408, 0x8400, 
+	0x83f8, 0x83f0, 0x83e8, 0x83e0, 0x83d8, 0x83d0, 0x83c8, 0x83c0, 
+	0x83b8, 0x83b0, 0x83a8, 0x83a0, 0x8398, 0x8390, 0x8388, 0x8380, 
+	0x8378, 0x8370, 0x8368, 0x8360, 0x8358, 0x8350, 0x8348, 0x8340, 
+	0x8338, 0x8330, 0x8328, 0x8320, 0x8318, 0x8310, 0x8308, 0x8300, 
+	0x82f8, 0x82f0, 0x82e8, 0x82e0, 0x82d8, 0x82d0, 0x82c8, 0x82c0, 
+	0x82b8, 0x82b0, 0x82a8, 0x82a0, 0x8298, 0x8290, 0x8288, 0x8280, 
+	0x8278, 0x8270, 0x8268, 0x8260, 0x8258, 0x8250, 0x8248, 0x8240, 
+	0x8238, 0x8230, 0x8228, 0x8220, 0x8218, 0x8210, 0x8208, 0x8200, 
+	0x81f8, 0x81f0, 0x81e8, 0x81e0, 0x81d8, 0x81d0, 0x81c8, 0x81c0, 
+	0x81b8, 0x81b0, 0x81a8, 0x81a0, 0x8198, 0x8190, 0x8188, 0x8180, 
+	0x8178, 0x8170, 0x8168, 0x8160, 0x8158, 0x8150, 0x8148, 0x8140, 
+	0x8138, 0x8130, 0x8128, 0x8120, 0x8118, 0x8110, 0x8108, 0x8100, 
+	0x80f8, 0x80f0, 0x80e8, 0x80e0, 0x80d8, 0x80d0, 0x80c8, 0x80c0, 
+	0x80b8, 0x80b0, 0x80a8, 0x80a0, 0x8098, 0x8090, 0x8088, 0x8080, 
+	0x8078, 0x8070, 0x8068, 0x8060, 0x8058, 0x8050, 0x8048, 0x8040, 
+	0x8038, 0x8030, 0x8028, 0x8020, 0x8018, 0x8010, 0x8008, 0x8000,
+};
+
+/*
+ * Inverse exponent table extracted from OPL3 ROM; taken straight from
+ * Nuked OPL3 source code.
+ * TODO: Verify if ESFM uses an exponent table or if it possibly uses another
+ * method to skirt around Yamaha's patents?
+ * Optimization: All entries are shifted left by one from the actual data in
+ * OPL3's ROM.
+ */
+static const uint16_t exprom[256] = {
+	0xff4, 0xfea, 0xfde, 0xfd4, 0xfc8, 0xfbe, 0xfb4, 0xfa8,
+	0xf9e, 0xf92, 0xf88, 0xf7e, 0xf72, 0xf68, 0xf5c, 0xf52,
+	0xf48, 0xf3e, 0xf32, 0xf28, 0xf1e, 0xf14, 0xf08, 0xefe,
+	0xef4, 0xeea, 0xee0, 0xed4, 0xeca, 0xec0, 0xeb6, 0xeac,
+	0xea2, 0xe98, 0xe8e, 0xe84, 0xe7a, 0xe70, 0xe66, 0xe5c,
+	0xe52, 0xe48, 0xe3e, 0xe34, 0xe2a, 0xe20, 0xe16, 0xe0c,
+	0xe04, 0xdfa, 0xdf0, 0xde6, 0xddc, 0xdd2, 0xdca, 0xdc0,
+	0xdb6, 0xdac, 0xda4, 0xd9a, 0xd90, 0xd88, 0xd7e, 0xd74,
+	0xd6a, 0xd62, 0xd58, 0xd50, 0xd46, 0xd3c, 0xd34, 0xd2a,
+	0xd22, 0xd18, 0xd10, 0xd06, 0xcfe, 0xcf4, 0xcec, 0xce2,
+	0xcda, 0xcd0, 0xcc8, 0xcbe, 0xcb6, 0xcae, 0xca4, 0xc9c,
+	0xc92, 0xc8a, 0xc82, 0xc78, 0xc70, 0xc68, 0xc60, 0xc56,
+	0xc4e, 0xc46, 0xc3c, 0xc34, 0xc2c, 0xc24, 0xc1c, 0xc12,
+	0xc0a, 0xc02, 0xbfa, 0xbf2, 0xbea, 0xbe0, 0xbd8, 0xbd0,
+	0xbc8, 0xbc0, 0xbb8, 0xbb0, 0xba8, 0xba0, 0xb98, 0xb90,
+	0xb88, 0xb80, 0xb78, 0xb70, 0xb68, 0xb60, 0xb58, 0xb50,
+	0xb48, 0xb40, 0xb38, 0xb32, 0xb2a, 0xb22, 0xb1a, 0xb12,
+	0xb0a, 0xb02, 0xafc, 0xaf4, 0xaec, 0xae4, 0xade, 0xad6,
+	0xace, 0xac6, 0xac0, 0xab8, 0xab0, 0xaa8, 0xaa2, 0xa9a,
+	0xa92, 0xa8c, 0xa84, 0xa7c, 0xa76, 0xa6e, 0xa68, 0xa60,
+	0xa58, 0xa52, 0xa4a, 0xa44, 0xa3c, 0xa36, 0xa2e, 0xa28,
+	0xa20, 0xa18, 0xa12, 0xa0c, 0xa04, 0x9fe, 0x9f6, 0x9f0,
+	0x9e8, 0x9e2, 0x9da, 0x9d4, 0x9ce, 0x9c6, 0x9c0, 0x9b8,
+	0x9b2, 0x9ac, 0x9a4, 0x99e, 0x998, 0x990, 0x98a, 0x984,
+	0x97c, 0x976, 0x970, 0x96a, 0x962, 0x95c, 0x956, 0x950,
+	0x948, 0x942, 0x93c, 0x936, 0x930, 0x928, 0x922, 0x91c,
+	0x916, 0x910, 0x90a, 0x904, 0x8fc, 0x8f6, 0x8f0, 0x8ea,
+	0x8e4, 0x8de, 0x8d8, 0x8d2, 0x8cc, 0x8c6, 0x8c0, 0x8ba,
+	0x8b4, 0x8ae, 0x8a8, 0x8a2, 0x89c, 0x896, 0x890, 0x88a,
+	0x884, 0x87e, 0x878, 0x872, 0x86c, 0x866, 0x860, 0x85a,
+	0x854, 0x850, 0x84a, 0x844, 0x83e, 0x838, 0x832, 0x82c,
+	0x828, 0x822, 0x81c, 0x816, 0x810, 0x80c, 0x806, 0x800
+};
+
+/*
+ * Frequency multiplier table multiplied by 2; taken straight from Nuked OPL3
+ * source code.
+ */
+static const uint8_t mt[16] = {
+	1, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 20, 24, 24, 30, 30
+};
+
+/*
+ * This is used during the envelope generation to apply KSL to the envelope by
+ * determining how much to shift right the keyscale attenuation value before
+ * adding it to the envelope level.
+ */
+static const uint8_t kslshift[4] = {
+	8, 1, 2, 0
+};
+
+/*
+ * This encodes which emulation mode channels are the secondary channel in a
+ * 4-op channel pair (where the entry is non-negative), and which is the
+ * corresponding primary channel for that secondary channel.
+ */
+static const int emu_4op_secondary_to_primary[18] =
+{
+	-1, -1, -1, 0,  1,  2, -1, -1, -1,
+	-1, -1, -1, 9, 10, 11, -1, -1, -1
+};
+
+/*
+ * Envelope generator dither table, taken straight from Nuked OPL3 source code.
+ */
+static const uint8_t eg_incstep[4][4] = {
+	{ 0, 0, 0, 0 },
+	{ 1, 0, 0, 0 },
+	{ 1, 0, 1, 0 },
+	{ 1, 1, 1, 0 }
+};
+
+/* ------------------------------------------------------------------------- */
+static inline int13
+ESFM_envelope_wavegen(uint3 waveform, int16 phase, uint10 envelope)
+{
+	int13 out;
+	uint16 lookup = logsinrom[((uint16)waveform << 10) | (phase & 0x3ff)];
+	uint16 level = (lookup & 0x1fff) + (envelope << 3);
+	if (level > 0x1fff)
+	{
+		level = 0x1fff;
+	}
+	out = exprom[level & 0xff] >> (level >> 8);
+	if (lookup & 0x8000)
+	{
+		out = -out;
+	}
+	return out;
+}
+
+/* ------------------------------------------------------------------------- */
+static void
+ESFM_envelope_calc(esfm_slot *slot)
+{
+	uint8 nonzero;
+	uint8 rate;
+	uint5 rate_hi;
+	uint2 rate_lo;
+	uint4 reg_rate = 0;
+	uint4 ks;
+	uint8 eg_shift, shift;
+	bool eg_off;
+	uint9 eg_rout;
+	int16 eg_inc;
+	bool reset = 0;
+	bool key_on;
+	bool key_on_signal;
+
+	key_on = *slot->in.key_on;
+	if (!slot->chip->native_mode)
+	{
+		int pair_primary_idx = emu_4op_secondary_to_primary[slot->channel->channel_idx];
+		if (pair_primary_idx >= 0)
+		{
+			esfm_channel *pair_primary = &slot->channel->chip->channels[pair_primary_idx];
+			if (pair_primary->emu_mode_4op_enable)
+			{
+				key_on = *pair_primary->slots[0].in.key_on;
+			}
+		}
+		else if ((slot->channel->channel_idx == 7 || slot->channel->channel_idx == 8)
+			&& slot->slot_idx == 1)
+		{
+			key_on = slot->channel->key_on_2;
+		}
+	}
+
+	slot->in.eg_output = slot->in.eg_position + (slot->t_level << 2)
+		+ (slot->in.eg_ksl_offset >> kslshift[slot->ksl]);
+	if (slot->tremolo_en)
+	{
+		uint8 tremolo;
+		if (slot->chip->native_mode)
+		{
+			tremolo = slot->channel->chip->tremolo >> ((!slot->tremolo_deep << 1) + 2);
+		}
+		else
+		{
+			tremolo = slot->channel->chip->tremolo >> ((!slot->chip->emu_tremolo_deep << 1) + 2);
+		}
+		slot->in.eg_output += tremolo;
+	}
+	
+	if (slot->in.eg_delay_run && slot->in.eg_delay_counter < 32768)
+	{
+		slot->in.eg_delay_counter++;
+	}
+	
+	// triggers on key-on edge
+	if (key_on && !slot->in.key_on_gate)
+	{
+		slot->in.eg_delay_run = 1;
+		slot->in.eg_delay_counter = 0;
+		slot->in.eg_delay_transitioned_01 = 0;
+		slot->in.eg_delay_transitioned_01_gate = 0;
+		slot->in.eg_delay_transitioned_10 = 0;
+		slot->in.eg_delay_transitioned_10_gate = 0;
+		slot->in.eg_delay_counter_compare = 0;
+		if (slot->env_delay > 0)
+		{
+			slot->in.eg_delay_counter_compare = 256 << slot->env_delay;
+		}
+	}
+	else if (!key_on)
+	{
+		slot->in.eg_delay_run = 0;
+	}
+	
+	// TODO: is this really how the chip behaves? Can it only transition the envelope delay once? Am I implementing this in a sane way? I feel like this is a roundabout hack.
+	if ((slot->in.eg_delay_transitioned_10 && !slot->in.eg_delay_transitioned_10_gate) ||
+		(slot->in.eg_delay_transitioned_01 && !slot->in.eg_delay_transitioned_01_gate)
+	)
+	{
+		slot->in.eg_delay_counter_compare = 0;
+		if (slot->env_delay > 0)
+		{
+			slot->in.eg_delay_counter_compare = 256 << slot->env_delay;
+		}
+		if (slot->in.eg_delay_transitioned_10)
+		{
+			slot->in.eg_delay_transitioned_10_gate = 1;
+		}
+		if (slot->in.eg_delay_transitioned_01)
+		{
+			slot->in.eg_delay_transitioned_01_gate = 1;
+		}
+	}
+	
+	if (key_on && ((slot->in.eg_delay_counter >= slot->in.eg_delay_counter_compare) || !slot->chip->native_mode))
+	{
+		key_on_signal = 1;
+	} else {
+		key_on_signal = 0;
+	}
+	
+	if (key_on && slot->in.eg_state == EG_RELEASE)
+	{
+
+		if ((slot->in.eg_delay_counter >= slot->in.eg_delay_counter_compare) || !slot->chip->native_mode)
+		{
+			reset = 1;
+			reg_rate = slot->attack_rate;
+		}
+		else
+		{
+			reg_rate = slot->release_rate;
+		}
+	}
+	else
+	{
+		switch (slot->in.eg_state)
+		{
+			case EG_ATTACK:
+				reg_rate = slot->attack_rate;
+				break;
+			case EG_DECAY:
+				reg_rate = slot->decay_rate;
+				break;
+			case EG_SUSTAIN:
+				if (!slot->env_sustaining)
+				{
+					reg_rate = slot->release_rate;
+				}
+				break;
+			case EG_RELEASE:
+				reg_rate = slot->release_rate;
+				break;
+		}
+	}
+	slot->in.key_on_gate = key_on;
+	slot->in.phase_reset = reset;
+	ks = slot->in.keyscale >> ((!slot->ksr) << 1);
+	nonzero = (reg_rate != 0);
+	rate = ks + (reg_rate << 2);
+	rate_hi = rate >> 2;
+	rate_lo = rate & 0x03;
+	if (rate_hi & 0x10)
+	{
+		rate_hi = 0x0f;
+	}
+	eg_shift = rate_hi + slot->chip->eg_clocks;
+	shift = 0;
+	if (nonzero)
+	{
+		if (rate_hi < 12)
+		{
+			if (slot->chip->eg_tick)
+			{
+				switch (eg_shift)
+				{
+					case 12:
+						shift = 1;
+						break;
+					case 13:
+						shift = (rate_lo >> 1) & 0x01;
+						break;
+					case 14:
+						shift = rate_lo & 0x01;
+						break;
+					default:
+						break;
+				}
+			}
+		}
+		else
+		{
+			shift = (rate_hi & 0x03)
+				+ eg_incstep[rate_lo][slot->chip->global_timer & 0x03];
+			if (shift & 0x04)
+			{
+				shift = 0x03;
+			}
+			if (!shift)
+			{
+				shift = slot->chip->eg_tick;
+			}
+		}
+	}
+	eg_rout = slot->in.eg_position;
+	eg_inc = 0;
+	eg_off = 0;
+	/* Instant attack */
+	if (reset && rate_hi == 0x0f)
+	{
+		eg_rout = 0x00;
+	}
+	/* Envelope off */
+	if ((slot->in.eg_position & 0x1f8) == 0x1f8)
+	{
+		eg_off = 1;
+	}
+	if (slot->in.eg_state != EG_ATTACK && !reset && eg_off)
+	{
+		eg_rout = 0x1ff;
+	}
+	switch (slot->in.eg_state)
+	{
+		case EG_ATTACK:
+			if (slot->in.eg_position == 0)
+			{
+				slot->in.eg_state = EG_DECAY;
+			}
+			else if (key_on_signal && shift > 0 && rate_hi != 0x0f)
+			{
+				eg_inc = ~slot->in.eg_position >> (4 - shift);
+			}
+			break;
+		case EG_DECAY:
+			if ((slot->in.eg_position >> 4) == slot->sustain_lvl)
+			{
+				slot->in.eg_state = EG_SUSTAIN;
+			}
+			else if (!eg_off && !reset && shift > 0)
+			{
+				eg_inc = 1 << (shift - 1);
+			}
+			break;
+		case EG_SUSTAIN:
+		case EG_RELEASE:
+			if (!eg_off && !reset && shift > 0)
+			{
+				eg_inc = 1 << (shift - 1);
+			}
+			break;
+	}
+	slot->in.eg_position = (eg_rout + eg_inc) & 0x1ff;
+	/* Key off */
+	if (reset)
+	{
+		slot->in.eg_state = EG_ATTACK;
+	}
+	if (!key_on_signal)
+	{
+		slot->in.eg_state = EG_RELEASE;
+	}
+}
+
+/* ------------------------------------------------------------------------- */
+static void
+ESFM_phase_generate(esfm_slot *slot)
+{
+	esfm_chip *chip;
+	uint10 f_num;
+	uint32 basefreq;
+	bool rm_xor, n_bit;
+	uint23 noise;
+	uint10 phase;
+
+	chip = slot->chip;
+	f_num = slot->f_num;
+	if (slot->vibrato_en)
+	{
+		int8_t range;
+		uint8_t vibpos;
+
+		range = (f_num >> 7) & 7;
+		vibpos = chip->vibrato_pos;
+
+		if (!(vibpos & 3))
+		{
+			range = 0;
+		}
+		else if (vibpos & 1)
+		{
+			range >>= 1;
+		}
+		range >>= !slot->vibrato_deep;
+
+		if (vibpos & 4)
+		{
+			range = -range;
+		}
+		f_num += range;
+	}
+	basefreq = (f_num << slot->block) >> 1;
+	phase = (uint10)(slot->in.phase_acc >> 9);
+	if (slot->in.phase_reset)
+	{
+		slot->in.phase_acc = 0;
+	}
+	slot->in.phase_acc += (basefreq * mt[slot->mult]) >> 1;
+	slot->in.phase_acc &= (1 << 19) - 1;
+	slot->in.phase_out = phase;
+	/* Noise mode (rhythm) sounds */
+	noise = chip->lfsr;
+	if (slot->slot_idx == 3 && slot->rhy_noise)
+	{
+		esfm_slot *prev_slot = &slot->channel->slots[2];
+
+		chip->rm_hh_bit2 = (phase >> 2) & 1;
+		chip->rm_hh_bit3 = (phase >> 3) & 1;
+		chip->rm_hh_bit7 = (phase >> 7) & 1;
+		chip->rm_hh_bit8 = (phase >> 8) & 1;
+
+		chip->rm_tc_bit3 = (prev_slot->in.phase_out >> 3) & 1;
+		chip->rm_tc_bit5 = (prev_slot->in.phase_out >> 5) & 1;
+
+		rm_xor = (chip->rm_hh_bit2 ^ chip->rm_hh_bit7)
+			   | (chip->rm_hh_bit3 ^ chip->rm_tc_bit5)
+			   | (chip->rm_tc_bit3 ^ chip->rm_tc_bit5);
+
+		switch(slot->rhy_noise)
+		{
+			case 1:
+				// SD
+				slot->in.phase_out = (chip->rm_hh_bit8 << 9)
+					| ((chip->rm_hh_bit8 ^ (noise & 1)) << 8);
+				break;
+			case 2:
+				// HH
+				slot->in.phase_out = rm_xor << 9;
+				if (rm_xor ^ (noise & 1))
+				{
+					slot->in.phase_out |= 0xd0;
+				}
+				else
+				{
+					slot->in.phase_out |= 0x34;
+				}
+				break;
+			case 3:
+				// TC
+				slot->in.phase_out = (rm_xor << 9) | 0x80;
+				break;
+		}
+	}
+
+	n_bit = ((noise >> 14) ^ noise) & 0x01;
+	chip->lfsr = (noise >> 1) | (n_bit << 22);
+}
+
+/* ------------------------------------------------------------------------- */
+static void
+ESFM_phase_generate_emu(esfm_slot *slot)
+{
+	esfm_chip *chip;
+	uint3 block;
+	uint10 f_num;
+	uint32 basefreq;
+	bool rm_xor, n_bit;
+	uint23 noise;
+	uint10 phase;
+	int pair_primary_idx;
+
+	chip = slot->chip;
+	block = slot->channel->slots[0].block;
+	f_num = slot->channel->slots[0].f_num;
+
+	pair_primary_idx = emu_4op_secondary_to_primary[slot->channel->channel_idx];
+	if (pair_primary_idx >= 0)
+	{
+		esfm_channel *pair_primary = &slot->channel->chip->channels[pair_primary_idx];
+		if (pair_primary->emu_mode_4op_enable)
+		{
+			block = pair_primary->slots[0].block;
+			f_num = pair_primary->slots[0].f_num;
+		}
+	}
+
+	if (slot->vibrato_en)
+	{
+		int8_t range;
+		uint8_t vibpos;
+
+		range = (f_num >> 7) & 7;
+		vibpos = chip->vibrato_pos;
+
+		if (!(vibpos & 3))
+		{
+			range = 0;
+		}
+		else if (vibpos & 1)
+		{
+			range >>= 1;
+		}
+		range >>= !chip->emu_vibrato_deep;
+
+		if (vibpos & 4)
+		{
+			range = -range;
+		}
+		f_num += range;
+	}
+	basefreq = (f_num << block) >> 1;
+	phase = (uint10)(slot->in.phase_acc >> 9);
+	if (slot->in.phase_reset)
+	{
+		slot->in.phase_acc = 0;
+	}
+	slot->in.phase_acc += (basefreq * mt[slot->mult]) >> 1;
+	slot->in.phase_acc &= (1 << 19) - 1;
+	slot->in.phase_out = phase;
+
+	/* Noise mode (rhythm) sounds */
+	noise = chip->lfsr;
+	// HH
+	if (slot->channel->channel_idx == 7 && slot->slot_idx == 0)
+	{
+		chip->rm_hh_bit2 = (phase >> 2) & 1;
+		chip->rm_hh_bit3 = (phase >> 3) & 1;
+		chip->rm_hh_bit7 = (phase >> 7) & 1;
+		chip->rm_hh_bit8 = (phase >> 8) & 1;
+	}
+	// TC
+	if (slot->channel->channel_idx == 8 && slot->slot_idx == 1)
+	{
+		chip->rm_tc_bit3 = (phase >> 3) & 1;
+		chip->rm_tc_bit5 = (phase >> 5) & 1;
+	}
+	if (chip->emu_rhy_mode_flags & 0x20)
+	{
+		rm_xor = (chip->rm_hh_bit2 ^ chip->rm_hh_bit7)
+			   | (chip->rm_hh_bit3 ^ chip->rm_tc_bit5)
+			   | (chip->rm_tc_bit3 ^ chip->rm_tc_bit5);
+		if (slot->channel->channel_idx == 7)
+		{
+			if (slot->slot_idx == 0) {
+				// HH
+				slot->in.phase_out = rm_xor << 9;
+				if (rm_xor ^ (noise & 1))
+				{
+					slot->in.phase_out |= 0xd0;
+				}
+				else
+				{
+					slot->in.phase_out |= 0x34;
+				}
+			}
+			else if (slot->slot_idx == 1)
+			{
+				// SD
+				slot->in.phase_out = (chip->rm_hh_bit8 << 9)
+					| ((chip->rm_hh_bit8 ^ (noise & 1)) << 8);
+			}
+		}
+		else if (slot->channel->channel_idx == 8 && slot->slot_idx == 1)
+		{
+			// TC
+			slot->in.phase_out = (rm_xor << 9) | 0x80;
+		}
+	}
+
+	n_bit = ((noise >> 14) ^ noise) & 0x01;
+	chip->lfsr = (noise >> 1) | (n_bit << 22);
+}
+
+/**
+ * TODO: Figure out what's ACTUALLY going on inside the real chip!
+ * This is not accurate at all, but it's the closest I was able to get with
+ * empirical testing (and it's closer than nothing).
+ */
+/* ------------------------------------------------------------------------- */
+static int16
+ESFM_slot3_noise3_mod_input_calc(esfm_slot *slot)
+{
+	esfm_channel *channel = slot->channel;
+	int16 phase;
+	int13 output_buf = *channel->slots[1].in.mod_input;
+	int i;
+	
+	// Go through previous slots' partial results and recalculate outputs
+	// (we skip slot 0 because its calculation happens at the end, not at the beginning)
+	for (i = 1; i < 3; i++)
+	{
+		// double the pitch
+		phase = channel->slots[i].in.phase_acc >> 8;
+		if (channel->slots[i].mod_in_level)
+		{
+			phase += output_buf >> (7 - channel->slots[i].mod_in_level);
+		}
+		output_buf = ESFM_envelope_wavegen(channel->slots[2].waveform, phase, channel->slots[i].in.eg_output);
+	}
+
+	return output_buf >> (8 - slot->mod_in_level);
+}
+
+/* ------------------------------------------------------------------------- */
+static void
+ESFM_slot_generate(esfm_slot *slot)
+{
+	int16 phase = slot->in.phase_out;
+	if (slot->mod_in_level)
+	{
+		if (slot->slot_idx == 3 && slot->rhy_noise == 3)
+		{
+			phase += ESFM_slot3_noise3_mod_input_calc(slot);
+		}
+		else
+		{
+			phase += *slot->in.mod_input >> (7 - slot->mod_in_level);
+		}
+	}
+	slot->in.output = ESFM_envelope_wavegen(slot->waveform, phase, slot->in.eg_output);
+	if (slot->output_level)
+	{
+		int13 output_value = slot->in.output >> (7 - slot->output_level);
+		slot->channel->output[0] += output_value & slot->out_enable[0];
+		slot->channel->output[1] += output_value & slot->out_enable[1];
+	}
+}
+
+/* ------------------------------------------------------------------------- */
+static void
+ESFM_slot_generate_emu(esfm_slot *slot)
+{
+	const esfm_chip *chip = slot->chip;
+	uint3 waveform = slot->waveform & (chip->emu_newmode != 0 ? 0x07 : 0x03);
+	bool rhythm_slot_double_volume = (slot->chip->emu_rhy_mode_flags & 0x20) != 0
+		&& slot->channel->channel_idx >= 6 && slot->channel->channel_idx < 9;
+	int16 phase = slot->in.phase_out;
+	int14 output_value;
+
+	phase += *slot->in.mod_input & slot->in.emu_mod_enable;
+	slot->in.output = ESFM_envelope_wavegen(waveform, phase, slot->in.eg_output);
+	output_value = (slot->in.output & slot->in.emu_output_enable) << rhythm_slot_double_volume;
+	if (chip->emu_newmode)
+	{
+		slot->channel->output[0] += output_value & slot->channel->slots[0].out_enable[0];
+		slot->channel->output[1] += output_value & slot->channel->slots[0].out_enable[1];
+	}
+	else
+	{
+		slot->channel->output[0] += output_value;
+		slot->channel->output[1] += output_value;
+	}
+}
+
+/* ------------------------------------------------------------------------- */
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
+#pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+static void
+ESFM_process_feedback(esfm_chip *chip)
+{
+	int channel_idx;
+
+	for (channel_idx = 0; channel_idx < 18; channel_idx++)
+	{
+		esfm_slot *slot = &chip->channels[channel_idx].slots[0];
+		uint32 basefreq, phase_offset;
+		uint3 block;
+		uint10 f_num;
+		int32_t wave_out, wave_last;
+		int32_t phase_feedback;
+		uint32_t iter_counter;
+		uint3 waveform;
+		uint3 mod_in_shift;
+		uint32_t phase, phase_acc;
+		uint10 eg_output;
+
+		if (slot->mod_in_level && (chip->native_mode || (slot->in.mod_input == &slot->in.feedback_buf)))
+		{
+			if (chip->native_mode)
+			{
+				waveform = slot->waveform;
+			}
+			else
+			{
+				waveform = slot->waveform & (0x03 | (0x02 << (chip->emu_newmode != 0)));
+			}
+			f_num = slot->f_num;
+			block = slot->block;
+			basefreq = (f_num << block) >> 1;
+			phase_offset = (basefreq * mt[slot->mult]) >> 1;
+			mod_in_shift = 7 - slot->mod_in_level;
+			phase_acc = (uint32_t)(slot->in.phase_acc - phase_offset * 28);
+			eg_output = slot->in.eg_output;
+
+			// ASM optimizaions!
+#if defined(__GNUC__) && defined(__x86_64__) && !defined(_ESFMU_DISABLE_ASM_OPTIMIZATIONS)
+			asm (
+				"movzbq  %[wave], %%r8               \n\t"
+				"shll    $11, %%r8d                  \n\t"
+				"leaq    %[sinrom], %%rax            \n\t"
+				"addq    %%rax, %%r8                 \n\t"
+				"leaq    %[exprom], %%r9             \n\t"
+				"movzwl  %[eg_out], %%r10d           \n\t"
+				"shll    $3, %%r10d                  \n\t"
+				"xorl    %%r11d, %%r11d              \n\t"
+				"movl    %%r11d, %[out]              \n\t"
+				"movl    $29, %%edx                  \n"
+				"1:                                  \n\t"
+				// phase_feedback = (wave_out + wave_last) >> 2;
+				"movl    %[out], %[p_fb]             \n\t"
+				"addl    %%r11d, %[p_fb]             \n\t"
+				"sarl    $2, %[p_fb]                 \n\t"
+				// wave_last = wave_out
+				"movl    %[out], %%r11d              \n\t"
+				// phase = phase_feedback >> mod_in_shift;
+				"movl    %[p_fb], %%eax              \n\t"
+				"movb    %[mod_in], %%cl             \n\t"
+				"sarl    %%cl, %%eax                 \n\t"
+				// phase += phase_acc >> 9;
+				"movl    %[p_acc], %%ebx             \n\t"
+				"sarl    $9, %%ebx                   \n\t"
+				"addl    %%ebx, %%eax                \n\t"
+				// lookup = logsinrom[(waveform << 10) | (phase & 0x3ff)];
+				"andq    $0x3ff, %%rax               \n\t"
+				"movzwl  (%%r8, %%rax, 2), %%ebx     \n\t"
+				"movl    %%ebx, %%eax                \n\t"
+				// level = (lookup & 0x1fff) + (envelope << 3);
+				"movl    $0x1fff, %%ecx              \n\t"
+				"andl    %%ecx, %%eax                \n\t"
+				"addl    %%r10d, %%eax               \n\t"
+				// if (level > 0x1fff) level = 0x1fff;
+				"cmpl    %%ecx, %%eax                \n\t"
+				"cmoval  %%ecx, %%eax                \n\t"
+				// wave_out = exprom[level & 0xff] >> (level >> 8);
+				"movb    %%ah, %%cl                  \n\t"
+				"movzbl  %%al, %%eax                 \n\t"
+				"movzwl  (%%r9, %%rax, 2), %[out]    \n\t"
+				"shrl    %%cl, %[out]                \n\t"
+				// if (lookup & 0x8000) wave_out = -wave_out;
+				// in other words, lookup is negative
+				"movl    %[out], %%ecx               \n\t"
+				"negl    %%ecx                       \n\t"
+				"testw   %%bx, %%bx                  \n\t"
+				"cmovsl  %%ecx, %[out]               \n\t"
+				// phase_acc += phase_offset
+				"addl    %[p_off], %[p_acc]          \n\t"
+				// loop
+				"decl    %%edx                       \n\t"
+				"jne     1b                          \n\t"
+				: [p_fb]   "=&r" (phase_feedback),
+				  [p_acc]  "+r"  (phase_acc),
+				  [out]    "=&r" (wave_out)
+				: [p_off]  "r"   (phase_offset),
+				  [mod_in] "r"   (mod_in_shift),
+				  [wave]   "g"   (waveform),
+				  [eg_out] "g"   (eg_output),
+				  [sinrom] "m"   (logsinrom),
+				  [exprom] "m"   (exprom)
+				: "cc", "ax", "bx", "cx", "dx", "r8", "r9", "r10", "r11"
+			);
+#elif defined(__GNUC__) && defined(__i386__) && !defined(_ESFMU_DISABLE_ASM_OPTIMIZATIONS)
+			size_t logsinrom_addr = (size_t)logsinrom;
+			size_t exprom_addr = (size_t)exprom;
+
+			asm (
+				"movzbl  %b[wave], %%eax             \n\t"
+				"shll    $11, %%eax                  \n\t"
+				"movl    %[sinrom], %%edi            \n\t"
+				"addl    %%eax, %%edi                \n\t"
+				"shlw    $3, %[eg_out]               \n\t"
+				"xorl    %[out], %[out]              \n\t"
+				"movl    %[out], %[last]             \n\t"
+				"movl    $29, %[i]                   \n"
+				"1:                                  \n\t"
+				// phase_feedback = (wave_out + wave_last) >> 2;
+				"movl    %[out], %%eax               \n\t"
+				"addl    %[last], %%eax              \n\t"
+				"sarl    $2, %%eax                   \n\t"
+				"movl    %%eax, %[p_fb]              \n\t"
+				// wave_last = wave_out
+				"movl    %[out], %[last]             \n\t"
+				// phase = phase_feedback >> mod_in_shift;
+				"movb    %[mod_in], %%cl             \n\t"
+				"sarl    %%cl, %%eax                 \n\t"
+				// phase += phase_acc >> 9;
+				"movl    %[p_acc], %%ebx             \n\t"
+				"shrl    $9, %%ebx                   \n\t"
+				"addl    %%ebx, %%eax                \n\t"
+				// lookup = logsinrom[(waveform << 10) | (phase & 0x3ff)];
+				"andl    $0x3ff, %%eax               \n\t"
+				"movzwl  (%%edi, %%eax, 2), %%ebx    \n\t"
+				"movl    %%ebx, %%eax                \n\t"
+				// level = (lookup & 0x1fff) + (envelope << 3);
+				"movl    $0x1fff, %%ecx              \n\t"
+				"andl    %%ecx, %%eax                \n\t"
+				"addw    %[eg_out], %%ax             \n\t"
+				// if (level > 0x1fff) level = 0x1fff;
+				"cmpl    %%ecx, %%eax                \n\t"
+				"cmoval  %%ecx, %%eax                \n\t"
+				// wave_out = exprom[level & 0xff] >> (level >> 8);
+				"movb    %%ah, %%cl                  \n\t"
+				"movzbl  %%al, %%eax                 \n\t"
+				"movl    %[exprom], %[out]           \n\t"
+				"movzwl  (%[out], %%eax, 2), %[out]  \n\t"
+				"shrl    %%cl, %[out]                \n\t"
+				// if (lookup & 0x8000) wave_out = -wave_out;
+				// in other words, lookup is negative
+				"movl    %[out], %%ecx               \n\t"
+				"negl    %%ecx                       \n\t"
+				"testw   %%bx, %%bx                  \n\t"
+				"cmovsl  %%ecx, %[out]               \n\t"
+				// phase_acc += phase_offset
+				"addl    %[p_off], %[p_acc]          \n\t"
+				// loop
+				"decl    %[i]                        \n\t"
+				"jne     1b                          \n\t"
+				: [p_fb]   "=&m" (phase_feedback),
+				  [p_acc]  "+r"  (phase_acc),
+				  [out]    "=&r" (wave_out),
+				  [last]   "=&m" (wave_last),
+				  [eg_out] "+m"  (eg_output)
+				: [p_off]  "m"   (phase_offset),
+				  [mod_in] "m"   (mod_in_shift),
+				  [wave]   "m"   (waveform),
+				  [sinrom] "m"   (logsinrom_addr),
+				  [exprom] "m"   (exprom_addr),
+				  [i]      "m"   (iter_counter)
+				: "cc", "ax", "bx", "cx", "di"
+			);
+#elif defined(__GNUC__) && defined(__arm__) && !defined(_ESFMU_DISABLE_ASM_OPTIMIZATIONS)
+			asm (
+				"movs    r3, #0                     \n\t"
+				"movs    %[out], #0                 \n\t"
+				"ldr     r8, =0x1fff                \n\t"
+				"movs    r2, #29                    \n"
+				"1:                                 \n\t"
+				// phase_feedback = (wave_out + wave_last) >> 2;
+				"adds    %[p_fb], %[out], r3        \n\t"
+				"asrs    %[p_fb], %[p_fb], #2       \n\t"
+				// wave_last = wave_out
+				"mov     r3, %[out]                 \n\t"
+				// phase = phase_feedback >> mod_in_shift;
+				"asr     r0, %[p_fb], %[mod_in]     \n\t"
+				// phase += phase_acc >> 9;
+				"add     r0, r0, %[p_acc], asr #9   \n\t"
+				// lookup = logsinrom[(waveform << 10) | (phase & 0x3ff)];
+				"lsls    r0, r0, #22                \n\t"
+				"lsrs    r0, r0, #21                \n\t"
+				"ldrsh   r1, [%[sinrom], r0]        \n\t"
+				// level = (lookup & 0x1fff) + (envelope << 3);
+				"and     r0, r8, r1                 \n\t"
+				"add     r0, r0, %[eg_out], lsl #3  \n\t"
+				// if (level > 0x1fff) level = 0x1fff;
+				"cmp     r0, r8                     \n\t"
+				"it      hi                         \n\t"
+				"movhi   r0, r8                     \n\t"
+				// wave_out = exprom[level & 0xff] >> (level >> 8);
+				"lsrs    %[out], r0, #8             \n\t"
+				"ands    r0, r0, #255               \n\t"
+				"lsls    r0, r0, #1                 \n\t"
+				"ldrh    r0, [%[exprom], r0]        \n\t"
+				"lsr     %[out], r0, %[out]         \n\t"
+				// if (lookup & 0x8000) wave_out = -wave_out;
+				// in other words, lookup is negative
+				"tst     r1, r1                     \n\t"
+				"it      mi                         \n\t"
+				"negmi   %[out], %[out]             \n\t"
+				// phase_acc += phase_offset
+				"adds    %[p_acc], %[p_acc], %[p_off]\n\t"
+				// loop
+				"subs    r2, r2, #1                 \n\t"
+				"bne     1b                         \n\t"
+				: [p_fb]   "=&r" (phase_feedback),
+				  [p_acc]  "+r"  (phase_acc),
+				  [out]    "=&r" (wave_out)
+				: [p_off]  "r"   (phase_offset),
+				  [mod_in] "r"   (mod_in_shift),
+				  [eg_out] "r"   (eg_output),
+				  [sinrom] "r"   (logsinrom + waveform * 1024),
+				  [exprom] "r"   (exprom)
+				: "cc", "r0", "r1", "r2", "r3", "r8"
+			);
+#else
+			wave_out = 0;
+			wave_last = 0;
+			for (iter_counter = 0; iter_counter < 29; iter_counter++)
+			{
+				phase_feedback = (wave_out + wave_last) >> 2;
+				wave_last = wave_out;
+				phase = phase_feedback >> mod_in_shift;
+				phase += phase_acc >> 9;
+				wave_out = ESFM_envelope_wavegen(waveform, phase, eg_output);
+				phase_acc += phase_offset;
+			}
+#endif
+
+			// TODO: Figure out - is this how the ESFM chip does it, like the
+			// patent literally says? (it's really hacky...)
+			//   slot->in.output = wave_out;
+
+			// This would be the more canonical way to do it, reusing the rest of
+			// the synthesis pipeline to finish the calculation:
+			if (chip->native_mode)
+			{
+				slot->in.feedback_buf = phase_feedback;
+			}
+			else
+			{
+				slot->in.feedback_buf = phase_feedback >> (7 - slot->mod_in_level);
+			}
+		}
+	}
+}
+
+/* ------------------------------------------------------------------------- */
+static void
+ESFM_process_channel(esfm_channel *channel)
+{
+	int slot_idx;
+	channel->output[0] = channel->output[1] = 0;
+	for (slot_idx = 0; slot_idx < 4; slot_idx++)
+	{
+		esfm_slot *slot = &channel->slots[slot_idx];
+		ESFM_envelope_calc(slot);
+		ESFM_phase_generate(slot);
+		if(slot_idx > 0)
+		{
+			ESFM_slot_generate(slot);
+		}
+	}
+	// ESFM feedback calculation takes a large number of clock cycles, so
+	// defer slot 0 generation to the end
+	// TODO: verify this behavior on real hardware
+}
+
+/* ------------------------------------------------------------------------- */
+static void
+ESFM_process_channel_emu(esfm_channel *channel)
+{
+	int slot_idx;
+	channel->output[0] = channel->output[1] = 0;
+	for (slot_idx = 0; slot_idx < 2; slot_idx++)
+	{
+		esfm_slot *slot = &channel->slots[slot_idx];
+		ESFM_envelope_calc(slot);
+		ESFM_phase_generate_emu(slot);
+		if(slot_idx > 0)
+		{
+			ESFM_slot_generate_emu(slot);
+		}
+	}
+	// ESFM feedback calculation takes a large number of clock cycles, so
+	// defer slot 0 generation to the end
+	// TODO: verify this behavior on real hardware
+}
+
+/* ------------------------------------------------------------------------- */
+static int16_t
+ESFM_clip_sample(int32 sample)
+{
+	// TODO: Supposedly, the real ESFM chip actually overflows rather than
+	// clipping. Verify that.
+	if (sample > 32767)
+	{
+		sample = 32767;
+	}
+	else if (sample < -32768)
+	{
+		sample = -32768;
+	}
+	return (int16_t)sample;
+}
+
+#define TIMER1_CONST (0.2517482517482517)
+#define TIMER2_CONST (0.06293706293706293)
+/* ------------------------------------------------------------------------- */
+static void
+ESFM_update_timers(esfm_chip *chip)
+{	
+	int i;
+	// Tremolo
+	if ((chip->global_timer & 0x3f) == 0x3f)
+	{
+		chip->tremolo_pos = (chip->tremolo_pos + 1) % 210;
+		if (chip->tremolo_pos < 105)
+		{
+			chip->tremolo = chip->tremolo_pos;
+		}
+		else
+		{
+			chip->tremolo = (210 - chip->tremolo_pos);
+		}
+	}
+
+	// Vibrato
+	if ((chip->global_timer & 0x3ff) == 0x3ff)
+	{
+		chip->vibrato_pos = (chip->vibrato_pos + 1) & 0x07;
+	}
+
+	chip->global_timer = (chip->global_timer + 1) & 0x3ff;
+
+	// Envelope generator dither clocks
+	chip->eg_clocks = 0;
+	if (chip->eg_timer)
+	{
+		uint8 shift = 0;
+		while (shift < 36 && ((chip->eg_timer >> shift) & 1) == 0)
+		{
+			shift++;
+		}
+
+		if (shift <= 12)
+		{
+			chip->eg_clocks = shift + 1;
+		}
+	}
+
+	if (chip->eg_tick || chip->eg_timer_overflow)
+	{
+		if (chip->eg_timer == (1llu << 36) - 1)
+		{
+			chip->eg_timer = 0;
+			chip->eg_timer_overflow = 1;
+		}
+		else
+		{
+			chip->eg_timer++;
+			chip->eg_timer_overflow = 0;
+		}
+	}
+
+	for (i = 0; i < 2; i++)
+	{
+		if (chip->timer_enable[i])
+		{
+			chip->timer_accumulator[i] += (i == 0) ? TIMER1_CONST : TIMER2_CONST;
+			if (chip->timer_accumulator[i] > 1.0)
+			{
+				chip->timer_accumulator[i] -= 1.0;
+				chip->timer_counter[i]++;
+				if (chip->timer_counter[i] == 0)
+				{
+					if (chip->timer_mask[i] == 0)
+					{
+						chip->irq_bit = true;
+						chip->timer_overflow[i] = true;
+					}
+					chip->timer_counter[i] = chip->timer_reload[i];
+				}
+			}
+		}
+	}
+
+	chip->eg_tick ^= 1;
+}
+
+#define KEY_ON_REGS_START (18 * 4 * 8)
+/* ------------------------------------------------------------------------- */
+int
+ESFM_reg_write_chan_idx(esfm_chip *chip, uint16_t reg)
+{
+	int which_reg = -1;
+	if (chip->native_mode)
+	{
+		bool is_key_on_reg = reg >= KEY_ON_REGS_START && reg < (KEY_ON_REGS_START + 20);
+		if (is_key_on_reg)
+		{
+			which_reg = reg - KEY_ON_REGS_START;
+		}
+	}
+	else
+	{
+		uint8_t reg_low = reg & 0xff;
+		bool high = reg & 0x100;
+		bool is_key_on_reg = reg_low >= 0xb0 && reg_low < 0xb9;
+		if (is_key_on_reg)
+		{
+			which_reg = (reg_low & 0x0f) + high * 9;
+		}
+	}
+
+	return which_reg;
+}
+
+/* ------------------------------------------------------------------------- */
+void
+ESFM_update_write_buffer(esfm_chip *chip)
+{
+	esfm_write_buf *write_buf;
+	bool note_off_written[20];
+	bool bassdrum_written = false;
+	int i;
+	for (i = 0; i < 20; i++)
+	{
+		note_off_written[i] = false;
+	}
+	while((write_buf = &chip->write_buf[chip->write_buf_start]),
+		write_buf->valid && write_buf->timestamp <= chip->write_buf_timestamp)
+	{
+		int is_which_note_on_reg =
+			ESFM_reg_write_chan_idx(chip, write_buf->address);
+		if (is_which_note_on_reg >= 0)
+		{
+			if ((chip->native_mode && (write_buf->data & 0x01) == 0)
+				|| (!chip->native_mode && (write_buf->data & 0x20) == 0)
+			)
+			{
+				// this is a note off command; note down that we got note off for this channel
+				note_off_written[is_which_note_on_reg] = true;
+			}
+			else
+			{
+				// this is a note on command; have we gotten a note off for this channel in this cycle?
+				if (note_off_written[is_which_note_on_reg])
+				{
+					// we have a conflict; let the note off be processed first and defer the
+					// rest of the buffer to the next cycle
+					break;
+				}
+			}
+		}
+		if ((chip->native_mode && write_buf->address == 0x4bd)
+			|| (!chip->native_mode && (write_buf->address & 0xff) == 0xbd)
+		)
+		{
+			// bassdrum register write (rhythm mode note-on/off control)
+			// have we already written to the bassdrum register in this cycle
+			if (bassdrum_written) {
+				// we have a conflict
+				break;
+			}
+			bassdrum_written = true;
+		}
+
+		write_buf->valid = 0;
+		ESFM_write_reg(chip, write_buf->address, write_buf->data);
+		chip->write_buf_start = (chip->write_buf_start + 1) % ESFM_WRITEBUF_SIZE;
+	}
+
+	chip->write_buf_timestamp++;
+}
+
+/* ------------------------------------------------------------------------- */
+void
+ESFM_generate(esfm_chip *chip, int32_t *buf)
+{
+	int channel_idx;
+
+	chip->output_accm[0] = chip->output_accm[1] = 0;
+	for (channel_idx = 0; channel_idx < 18; channel_idx++)
+	{
+		esfm_channel *channel = &chip->channels[channel_idx];
+		if (chip->native_mode)
+		{
+			ESFM_process_channel(channel);
+		}
+		else
+		{
+			ESFM_process_channel_emu(channel);
+		}
+	}
+	ESFM_process_feedback(chip);
+	for (channel_idx = 0; channel_idx < 18; channel_idx++)
+	{
+		esfm_channel *channel = &chip->channels[channel_idx];
+		if (chip->native_mode)
+		{
+			ESFM_slot_generate(&channel->slots[0]);
+		}
+		else
+		{
+			ESFM_slot_generate_emu(&channel->slots[0]);
+		}
+		chip->output_accm[0] += channel->output[0];
+		chip->output_accm[1] += channel->output[1];
+	}
+
+	buf[0] = chip->output_accm[0];
+	buf[1] = chip->output_accm[1];
+
+	ESFM_update_timers(chip);
+	ESFM_update_write_buffer(chip);
+}
+
+/* ------------------------------------------------------------------------- */
+int16_t
+ESFM_get_channel_output_native(esfm_chip *chip, int channel_idx)
+{
+	int16_t result;
+	int32_t temp_mix = 0;
+	int i;
+	
+	if (channel_idx < 0 || channel_idx >= 18)
+	{
+		return 0;
+	}
+	
+	for (i = 0; i < 4; i++)
+	{
+		esfm_slot *slot = &chip->channels[channel_idx].slots[i];
+		
+		if (slot->output_level)
+		{
+			int13 output_value = slot->in.output >> (7 - slot->output_level);
+			temp_mix += output_value & slot->out_enable[0];
+			temp_mix += output_value & slot->out_enable[1];
+		}
+	}
+	
+	if (temp_mix > 32767)
+	{
+		temp_mix = 32767;
+	}
+	else if (temp_mix < -32768)
+	{
+		temp_mix = -32768;
+	}
+	result = temp_mix;
+	return result;
+}
+
+/* ------------------------------------------------------------------------- */
+void
+ESFM_generate_stream(esfm_chip *chip, int16_t *sndptr, uint32_t num_samples)
+{
+	uint32_t i;
+	int32_t  buf[2] = { 0 };
+
+	for (i = 0; i < num_samples; i++)
+	{
+		ESFM_generate(chip, buf);
+		sndptr[0] = ESFM_clip_sample(buf[0]);
+		sndptr[1] = ESFM_clip_sample(buf[1]);
+		sndptr += 2;
+	}
+}
diff --git a/src/sound/esfmu/esfm.h b/src/sound/esfmu/esfm.h
new file mode 100644
index 000000000..766c7312d
--- /dev/null
+++ b/src/sound/esfmu/esfm.h
@@ -0,0 +1,289 @@
+/*
+ * ESFMu: emulator for the ESS "ESFM" enhanced OPL3 clone
+ * Copyright (C) 2023 Kagamiin~
+ *
+ * ESFMu is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * ESFMu is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ESFMu. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/*
+ * ESFMu wouldn't have been possible without the hard work and dedication of
+ * the retro computer hardware research and preservation community.
+ *
+ * I'd like to thank:
+ *  - Nuke.YKT
+ *        Developer of Nuked OPL3, which was the basis for ESFMu's code and
+ *        also a great learning resource on Yamaha FM synthesis for myself.
+ *        Nuke.YKT also gives shoutouts on behalf of Nuked OPL3 to:
+ *        - MAME Development Team(Jarek Burczynski, Tatsuyuki Satoh):
+ *              Feedback and Rhythm part calculation information.
+ *        - forums.submarine.org.uk(carbon14, opl3):
+ *              Tremolo and phase generator calculation information.
+ *        - OPLx decapsulated(Matthew Gambrell, Olli Niemitalo):
+ *              OPL2 ROMs.
+ *        - siliconpr0n.org(John McMaster, digshadow):
+ *              YMF262 and VRC VII decaps and die shots.
+ * - rainwarrior
+ *       For performing the initial research on ESFM drivers and documenting
+ *       ESS's patent on native mode operator organization.
+ * - jwt27
+ *       For kickstarting the ESFM research project and compiling rainwarrior's
+ *       findings and more in an accessible document ("ESFM Demystified").
+ * - pachuco/CatButts
+ *       For documenting ESS's patent on ESFM's feedback implementation, which
+ *       was vital in getting ESFMu's sound output to be accurate.
+ * - akumanatt
+ *       For helping out with code optimization.
+ * - And everybody who helped out with real hardware testing
+ */
+
+#include <stddef.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _esfm_slot esfm_slot;
+typedef struct _esfm_slot_internal esfm_slot_internal;
+typedef struct _esfm_channel esfm_channel;
+typedef struct _esfm_chip esfm_chip;
+
+
+void ESFM_init (esfm_chip *chip);
+void ESFM_write_reg (esfm_chip *chip, uint16_t address, uint8_t data);
+void ESFM_write_reg_buffered (esfm_chip *chip, uint16_t address, uint8_t data);
+void ESFM_write_reg_buffered_fast (esfm_chip *chip, uint16_t address, uint8_t data);
+void ESFM_write_port (esfm_chip *chip, uint8_t offset, uint8_t data);
+uint8_t ESFM_readback_reg (esfm_chip *chip, uint16_t address);
+uint8_t ESFM_read_port (esfm_chip *chip, uint8_t offset);
+void ESFM_generate(esfm_chip *chip, int32_t *buf);
+void ESFM_generate_stream(esfm_chip *chip, int16_t *sndptr, uint32_t num_samples);
+int16_t ESFM_get_channel_output_native(esfm_chip *chip, int channel_idx);
+
+
+// These are fake types just for syntax sugar.
+// Beware of their underlying types when reading/writing to them.
+typedef uint8_t ebit;
+typedef uint8_t uint2;
+typedef uint8_t uint3;
+typedef uint8_t uint4;
+typedef uint8_t uint5;
+typedef uint8_t uint6;
+typedef uint8_t uint8;
+typedef uint16_t uint9;
+typedef uint16_t uint10;
+typedef uint16_t uint11;
+typedef uint16_t uint12;
+typedef uint16_t uint16;
+typedef uint32_t uint19;
+typedef uint32_t uint23;
+typedef uint32_t uint32;
+typedef uint64_t uint36;
+
+typedef int16_t int13;
+typedef int16_t int14;
+typedef int16_t int16;
+typedef int32_t int32;
+
+enum eg_states
+{
+	EG_ATTACK,
+	EG_DECAY,
+	EG_SUSTAIN,
+	EG_RELEASE
+};
+
+
+typedef struct _esfm_write_buf
+{
+	uint64_t timestamp;
+	uint16_t address;
+	uint8_t data;
+	ebit valid;
+
+} esfm_write_buf;
+
+typedef struct _emu_slot_channel_mapping
+{
+	int channel_idx;
+	int slot_idx;
+
+} emu_slot_channel_mapping;
+
+typedef struct _esfm_slot_internal
+{
+	uint9 eg_position;
+	uint9 eg_ksl_offset;
+	uint10 eg_output;
+
+	uint4 keyscale;
+
+	int13 output;
+	int13 emu_output_enable;
+	int13 emu_mod_enable;
+	int13 feedback_buf;
+	int13 *mod_input;
+
+	uint19 phase_acc;
+	uint10 phase_out;
+	ebit phase_reset;
+	ebit *key_on;
+	ebit key_on_gate;
+
+	uint2 eg_state;
+	ebit eg_delay_run;
+	ebit eg_delay_transitioned_10;
+	ebit eg_delay_transitioned_10_gate;
+	ebit eg_delay_transitioned_01;
+	ebit eg_delay_transitioned_01_gate;
+	uint16 eg_delay_counter;
+	uint16 eg_delay_counter_compare;
+
+} esfm_slot_internal;
+
+struct _esfm_slot
+{
+	// Metadata
+	esfm_channel *channel;
+	esfm_chip *chip;
+	uint2 slot_idx;
+
+	// Register data
+	int13 out_enable[2];
+	uint10 f_num;
+	uint3 block;
+	uint3 output_level;
+	// a.k.a. feedback level in emu mode
+	uint3 mod_in_level;
+
+	uint6 t_level;
+	uint4 mult;
+	uint3 waveform;
+	// Only for 4th slot
+	uint2 rhy_noise;
+
+	uint4 attack_rate;
+	uint4 decay_rate;
+	uint4 sustain_lvl;
+	uint4 release_rate;
+
+	ebit tremolo_en;
+	ebit tremolo_deep;
+	ebit vibrato_en;
+	ebit vibrato_deep;
+	ebit emu_connection_typ;
+	ebit env_sustaining;
+	ebit ksr;
+	uint2 ksl;
+	uint3 env_delay;
+	// overlaps with env_delay bit 0
+	// TODO: check if emu mode only uses this, or if it actually overwrites the channel field used by native mode
+	ebit emu_key_on;
+
+	// Internal state
+	esfm_slot_internal in;
+};
+
+struct _esfm_channel
+{
+	esfm_chip *chip;
+	esfm_slot slots[4];
+	uint5 channel_idx;
+	int16 output[2];
+	ebit key_on;
+	ebit emu_mode_4op_enable;
+	// Only for 17th and 18th channels
+	ebit key_on_2;
+	ebit emu_mode_4op_enable_2;
+};
+
+#define ESFM_WRITEBUF_SIZE 1024
+#define ESFM_WRITEBUF_DELAY 2
+
+struct _esfm_chip
+{
+	esfm_channel channels[18];
+	int32 output_accm[2];
+	uint16 addr_latch;
+
+	ebit emu_wavesel_enable;
+	ebit emu_newmode;
+	ebit native_mode;
+
+	ebit keyscale_mode;
+
+	// Global state
+	uint36 eg_timer;
+	uint10 global_timer;
+	uint8 eg_clocks;
+	ebit eg_tick;
+	ebit eg_timer_overflow;
+	uint8 tremolo;
+	uint8 tremolo_pos;
+	uint8 vibrato_pos;
+	uint23 lfsr;
+
+	ebit rm_hh_bit2;
+	ebit rm_hh_bit3;
+	ebit rm_hh_bit7;
+	ebit rm_hh_bit8;
+	ebit rm_tc_bit3;
+	ebit rm_tc_bit5;
+
+	// 0xbd register in emulation mode, exposed in 0x4bd in native mode
+	// ("bass drum" register)
+	uint8 emu_rhy_mode_flags;
+
+	ebit emu_vibrato_deep;
+	ebit emu_tremolo_deep;
+
+	double timer_accumulator[2];
+	uint8 timer_reload[2];
+	uint8 timer_counter[2];
+	ebit timer_enable[2];
+	ebit timer_mask[2];
+	ebit timer_overflow[2];
+	ebit irq_bit;
+
+	// -- Test bits (NOT IMPLEMENTED) --
+	// Halts the envelope generators from advancing. Written on bit 0, read back from bit 5.
+	ebit test_bit_w0_r5_eg_halt;
+	/*
+	 * Activates some sort of waveform test mode that amplifies the output volume greatly
+	 * and continuously shifts the waveform table downwards, possibly also outputting the
+	 * waveform's derivative? (it's so weird!)
+	 */
+	ebit test_bit_1_distort;
+	// Seems to do nothing.
+	ebit test_bit_2;
+	// Seems to do nothing.
+	ebit test_bit_3;
+	// Appears to attenuate the output by about 3 dB.
+	ebit test_bit_4_attenuate;
+	// Written on bit 5, read back from bit 0. Seems to do nothing.
+	ebit test_bit_w5_r0;
+	// Resets all phase generators and holds them in the reset state while this bit is set.
+	ebit test_bit_6_phase_stop_reset;
+	// Seems to do nothing.
+	ebit test_bit_7;
+
+	esfm_write_buf write_buf[ESFM_WRITEBUF_SIZE];
+	size_t write_buf_start;
+	size_t write_buf_end;
+	uint64_t write_buf_timestamp;
+};
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/sound/esfmu/esfm_registers.c b/src/sound/esfmu/esfm_registers.c
new file mode 100644
index 000000000..e2f432ed1
--- /dev/null
+++ b/src/sound/esfmu/esfm_registers.c
@@ -0,0 +1,1009 @@
+/*
+ * ESFMu: emulator for the ESS "ESFM" enhanced OPL3 clone
+ * Copyright (C) 2023 Kagamiin~
+ *
+ * This file includes code and data from the Nuked OPL3 project, copyright (C)
+ * 2013-2023 Nuke.YKT. Its usage, modification and redistribution is allowed
+ * under the terms of the GNU Lesser General Public License version 2.1 or
+ * later.
+ *
+ * ESFMu is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * ESFMu is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ESFMu. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/*
+ * ESFMu wouldn't have been possible without the hard work and dedication of
+ * the retro computer hardware research and preservation community.
+ *
+ * I'd like to thank:
+ *  - Nuke.YKT
+ *        Developer of Nuked OPL3, which was the basis for ESFMu's code and
+ *        also a great learning resource on Yamaha FM synthesis for myself.
+ *        Nuke.YKT also gives shoutouts on behalf of Nuked OPL3 to:
+ *        - MAME Development Team(Jarek Burczynski, Tatsuyuki Satoh):
+ *              Feedback and Rhythm part calculation information.
+ *        - forums.submarine.org.uk(carbon14, opl3):
+ *              Tremolo and phase generator calculation information.
+ *        - OPLx decapsulated(Matthew Gambrell, Olli Niemitalo):
+ *              OPL2 ROMs.
+ *        - siliconpr0n.org(John McMaster, digshadow):
+ *              YMF262 and VRC VII decaps and die shots.
+ * - rainwarrior
+ *       For performing the initial research on ESFM drivers and documenting
+ *       ESS's patent on native mode operator organization.
+ * - jwt27
+ *       For kickstarting the ESFM research project and compiling rainwarrior's
+ *       findings and more in an accessible document ("ESFM Demystified").
+ * - pachuco/CatButts
+ *       For documenting ESS's patent on ESFM's feedback implementation, which
+ *       was vital in getting ESFMu's sound output to be accurate.
+ * - And everybody who helped out with real hardware testing
+ */
+
+#include "esfm.h"
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <stdbool.h>
+
+
+/*
+ * Table of KSL values extracted from OPL3 ROM; taken straight from Nuked OPL3
+ * source code.
+ * TODO: Check if ESFM uses the same KSL values.
+ */
+
+static const int16 kslrom[16] = {
+	0, 32, 40, 45, 48, 51, 53, 55, 56, 58, 59, 60, 61, 62, 63, 64
+};
+
+/*
+ * This maps the low 5 bits of emulation mode address to an emulation mode
+ * slot; taken straight from Nuked OPL3. Used for decoding certain emulation
+ * mode address ranges.
+ */
+static const int8_t ad_slot[0x20] = {
+	 0,  1,  2,  3,  4,  5, -1, -1,  6,  7,  8,  9, 10, 11, -1, -1,
+	12, 13, 14, 15, 16, 17, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
+};
+
+/*
+ * This maps an emulation mode slot index to a tuple representing the
+ * corresponding native mode channel and slot.
+ */
+static const emu_slot_channel_mapping emu_slot_map[36] =
+{
+	{ 0, 0}, { 1, 0}, { 2, 0}, { 0, 1}, { 1, 1}, { 2, 1},
+	{ 3, 0}, { 4, 0}, { 5, 0}, { 3, 1}, { 4, 1}, { 5, 1},
+	{ 6, 0}, { 7, 0}, { 8, 0}, { 6, 1}, { 7, 1}, { 8, 1},
+	{ 9, 0}, {10, 0}, {11, 0}, { 9, 1}, {10, 1}, {11, 1},
+	{12, 0}, {13, 0}, {14, 0}, {12, 1}, {13, 1}, {14, 1},
+	{15, 0}, {16, 0}, {17, 0}, {15, 1}, {16, 1}, {17, 1}
+};
+
+/*
+ * This encodes which emulation mode channels are the secondary channel in a
+ * 4-op channel pair (where the entry is non-negative), and which is the
+ * corresponding primary channel for that secondary channel.
+ */
+static const int emu_4op_secondary_to_primary[18] =
+{
+	-1, -1, -1, 0,  1,  2, -1, -1, -1,
+	-1, -1, -1, 9, 10, 11, -1, -1, -1
+};
+
+/*
+ * This encodes the operator outputs to be enabled or disabled for
+ * each 4-op algorithm in emulation mode.
+ * Indices: FM+FM, FM+AM, AM+FM, AM+AM (lower channel MSB, upper channel LSB)
+ * Values: enable OP1, OP2, OP3, OP4
+ */
+static const bool emu_4op_alg_output_enable[4][4] =
+{
+	{0, 0, 0, 1},
+	{0, 1, 0, 1},
+	{1, 0, 0, 1},
+	{1, 0, 1, 1}
+};
+
+/*
+ * This encodes the operator interconnections to be enabled or disabled for
+ * each 4-op algorithm in emulation mode.
+ * Indices: FM+FM, FM+AM, AM+FM, AM+AM (lower channel MSB, upper channel LSB)
+ * Values: enable OP1FB, OP1->2, OP2->3, OP3->4
+ */
+static const bool emu_4op_alg_mod_enable[4][4] =
+{
+	{1, 1, 1, 1},
+	{1, 1, 0, 1},
+	{1, 0, 1, 1},
+	{1, 0, 1, 0}
+};
+
+
+/* ------------------------------------------------------------------------- */
+static void
+ESFM_emu_rearrange_connections(esfm_channel *channel)
+{
+	int secondary_to_primary;
+
+	secondary_to_primary = emu_4op_secondary_to_primary[channel->channel_idx];
+	if (secondary_to_primary >= 0)
+	{
+		esfm_channel *pair_primary = &channel->chip->channels[secondary_to_primary];
+		if (pair_primary->emu_mode_4op_enable)
+		{
+			// always work from primary channel in pair when dealing with 4-op
+			channel = pair_primary;
+		}
+	}
+
+	if (channel->emu_mode_4op_enable && (channel->channel_idx % 9) < 3 && channel->chip->emu_newmode)
+	{
+		esfm_channel *secondary = &channel->chip->channels[channel->channel_idx + 3];
+		uint2 algorithm = ((channel->slots[0].emu_connection_typ != 0) << 1)
+			| (secondary->slots[0].emu_connection_typ != 0);
+		int i;
+
+		secondary->slots[0].in.mod_input = &channel->slots[1].in.output;
+
+		for (i = 0; i < 2; i++)
+		{
+			channel->slots[i].in.emu_mod_enable =
+				emu_4op_alg_mod_enable[algorithm][i] ? ~((int13) 0) : 0;
+			channel->slots[i].in.emu_output_enable =
+				emu_4op_alg_output_enable[algorithm][i] ? ~((int13) 0) : 0;
+
+			secondary->slots[i].in.emu_mod_enable =
+				emu_4op_alg_mod_enable[algorithm][i + 2] ? ~((int13) 0) : 0;
+			secondary->slots[i].in.emu_output_enable =
+				emu_4op_alg_output_enable[algorithm][i + 2] ? ~((int13) 0) : 0;
+		}
+	}
+	else if ((channel->chip->emu_rhy_mode_flags & 0x20) != 0
+		&& (channel->channel_idx == 7 || channel->channel_idx == 8))
+	{
+		channel->slots[0].in.emu_mod_enable = 0;
+		channel->slots[1].in.emu_mod_enable = 0;
+		channel->slots[0].in.emu_output_enable = ~((int13) 0);
+		channel->slots[1].in.emu_output_enable = ~((int13) 0);
+	}
+	else
+	{
+		channel->slots[0].in.mod_input = &channel->slots[0].in.feedback_buf;
+
+		channel->slots[0].in.emu_mod_enable = ~((int13) 0);
+		channel->slots[0].in.emu_output_enable =
+			(channel->slots[0].emu_connection_typ != 0) ? ~((int13) 0) : 0;
+		channel->slots[1].in.emu_output_enable = ~((int13) 0);
+		channel->slots[1].in.emu_mod_enable =
+			(channel->slots[0].emu_connection_typ != 0) ? 0 : ~((int13) 0);
+	}
+}
+
+
+/* ------------------------------------------------------------------------- */
+static void
+ESFM_emu_to_native_switch(esfm_chip *chip)
+{
+	size_t channel_idx, slot_idx;
+	for (channel_idx = 0; channel_idx < 18; channel_idx++)
+	{
+		for (slot_idx = 0; slot_idx < 4; slot_idx++)
+		{
+			esfm_channel *channel = &chip->channels[channel_idx];
+			esfm_slot *slot = &channel->slots[slot_idx];
+
+			if (slot_idx == 0)
+			{
+				slot->in.mod_input = &slot->in.feedback_buf;
+			}
+			else
+			{
+				esfm_slot *prev_slot = &channel->slots[slot_idx - 1];
+				slot->in.mod_input = &prev_slot->in.output;
+			}
+		}
+	}
+}
+
+/* ------------------------------------------------------------------------- */
+static void
+ESFM_native_to_emu_switch(esfm_chip *chip)
+{
+	size_t channel_idx;
+	for (channel_idx = 0; channel_idx < 18; channel_idx++)
+	{
+		ESFM_emu_rearrange_connections(&chip->channels[channel_idx]);
+	}
+}
+
+/* ------------------------------------------------------------------------- */
+static void
+ESFM_slot_update_keyscale(esfm_slot *slot)
+{
+	if (slot->slot_idx > 0 && !slot->chip->native_mode)
+	{
+		return;
+	}
+
+	int16 ksl = (kslrom[slot->f_num >> 6] << 2) - ((0x08 - slot->block) << 5);
+	if (ksl < 0)
+	{
+		ksl = 0;
+	}
+	slot->in.eg_ksl_offset = ksl;
+	slot->in.keyscale = (slot->block << 1)
+		| ((slot->f_num >> (8 + !slot->chip->keyscale_mode)) & 0x01);
+}
+
+/* ------------------------------------------------------------------------- */
+static void
+ESFM_emu_channel_update_keyscale(esfm_channel *channel)
+{
+	int secondary_to_primary;
+
+	secondary_to_primary = emu_4op_secondary_to_primary[channel->channel_idx];
+	if (secondary_to_primary >= 0)
+	{
+		esfm_channel *pair_primary = &channel->chip->channels[secondary_to_primary];
+		if (pair_primary->emu_mode_4op_enable)
+		{
+			// always work from primary channel in pair when dealing with 4-op
+			channel = pair_primary;
+		}
+	}
+
+	ESFM_slot_update_keyscale(&channel->slots[0]);
+	channel->slots[1].in.eg_ksl_offset = channel->slots[0].in.eg_ksl_offset;
+	channel->slots[1].in.keyscale = channel->slots[0].in.keyscale;
+
+	if (channel->emu_mode_4op_enable && (channel->channel_idx % 9) < 3 && channel->chip->emu_newmode)
+	{
+		int i;
+		esfm_channel *secondary = &channel->chip->channels[channel->channel_idx + 3];
+		secondary->slots[0].f_num = channel->slots[0].f_num;
+		secondary->slots[0].block = channel->slots[0].block;
+
+		for (i = 0; i < 2; i++)
+		{
+			secondary->slots[i].in.eg_ksl_offset = channel->slots[0].in.eg_ksl_offset;
+			secondary->slots[i].in.keyscale = channel->slots[0].in.keyscale;
+		}
+	}
+}
+
+/* ------------------------------------------------------------------------- */
+static inline uint8_t
+ESFM_slot_readback (esfm_slot *slot, uint8_t register_idx)
+{
+	uint8_t data = 0;
+	switch (register_idx & 0x07)
+	{
+	case 0x00:
+		data |= (slot->tremolo_en != 0) << 7;
+		data |= (slot->vibrato_en != 0) << 6;
+		data |= (slot->env_sustaining != 0) << 5;
+		data |= (slot->vibrato_en != 0) << 4;
+		data |= slot->mult & 0x0f;
+		break;
+	case 0x01:
+		data |= slot->ksl << 6;
+		data |= slot->t_level & 0x3f;
+		break;
+	case 0x02:
+		data |= slot->attack_rate << 4;
+		data |= slot->decay_rate & 0x0f;
+		break;
+	case 0x03:
+		data |= slot->sustain_lvl << 4;
+		data |= slot->release_rate & 0x0f;
+		break;
+	case 0x04:
+		data = slot->f_num & 0xff;
+		break;
+	case 0x05:
+		data |= slot->env_delay << 5;
+		data |= (slot->block & 0x07) << 2;
+		data |= (slot->f_num >> 8) & 0x03;
+		break;
+	case 0x06:
+		data |= (slot->tremolo_deep != 0) << 7;
+		data |= (slot->vibrato_deep != 0) << 6;
+		data |= (slot->out_enable[1] != 0) << 5;
+		data |= (slot->out_enable[0] != 0) << 4;
+		data |= (slot->mod_in_level & 0x07) << 1;
+		data |= slot->emu_connection_typ & 0x01;
+		break;
+	case 0x07:
+		data |= slot->output_level << 5;
+		data |= (slot->rhy_noise & 0x03) << 3;
+		data |= slot->waveform & 0x07;
+		break;
+	}
+	return data;
+}
+
+/* ------------------------------------------------------------------------- */
+static inline void
+ESFM_slot_write (esfm_slot *slot, uint8_t register_idx, uint8_t data)
+{
+	switch (register_idx & 0x07)
+	{
+	case 0x00:
+		slot->tremolo_en = (data & 0x80) != 0;
+		slot->vibrato_en = (data & 0x40) != 0;
+		slot->env_sustaining = (data & 0x20) != 0;
+		slot->ksr = (data & 0x10) != 0;
+		slot->mult = data & 0x0f;
+		break;
+	case 0x01:
+		slot->ksl = data >> 6;
+		slot->t_level = data & 0x3f;
+		ESFM_slot_update_keyscale(slot);
+		break;
+	case 0x02:
+		slot->attack_rate = data >> 4;
+		slot->decay_rate = data & 0x0f;
+		break;
+	case 0x03:
+		slot->sustain_lvl = data >> 4;
+		slot->release_rate = data & 0x0f;
+		break;
+	case 0x04:
+		slot->f_num = (slot->f_num & 0x300) | data;
+		ESFM_slot_update_keyscale(slot);
+		break;
+	case 0x05:
+		if (slot->env_delay < (data >> 5))
+		{
+			slot->in.eg_delay_transitioned_01 = 1;
+		}
+		else if (slot->env_delay > (data >> 5))
+		{
+			slot->in.eg_delay_transitioned_10 = 1;
+		}
+		slot->env_delay = data >> 5;
+		slot->emu_key_on = (data >> 5) & 0x01;
+		slot->block = (data >> 2) & 0x07;
+		slot->f_num = (slot->f_num & 0xff) | ((data & 0x03) << 8);
+		ESFM_slot_update_keyscale(slot);
+		break;
+	case 0x06:
+		slot->tremolo_deep = (data & 0x80) != 0;
+		slot->vibrato_deep = (data & 0x40) != 0;
+		slot->out_enable[1] = (data & 0x20) ? ~((int13) 0) : 0;
+		slot->out_enable[0] = (data & 0x10) ? ~((int13) 0) : 0;
+		slot->mod_in_level = (data >> 1) & 0x07;
+		slot->emu_connection_typ = data & 0x01;
+		break;
+	case 0x07:
+		slot->output_level = data >> 5;
+		slot->rhy_noise = (data >> 3) & 0x03;
+		slot->waveform = data & 0x07;
+		break;
+	}
+}
+
+#define KEY_ON_REGS_START (18 * 4 * 8)
+#define TIMER1_REG (0x402)
+#define TIMER2_REG (0x403)
+#define TIMER_SETUP_REG (0x404)
+#define CONFIG_REG (0x408)
+#define BASSDRUM_REG (0x4bd)
+#define TEST_REG (0x501)
+#define FOUROP_CONN_REG (0x504)
+#define NATIVE_MODE_REG (0x505)
+
+/* ------------------------------------------------------------------------- */
+static void
+ESFM_write_reg_native (esfm_chip *chip, uint16_t address, uint8_t data)
+{
+	int i;
+	address = address & 0x7ff;
+
+	if (address < KEY_ON_REGS_START)
+	{
+		// Slot register write
+		size_t channel_idx = address >> 5;
+		size_t slot_idx = (address >> 3) & 0x03;
+		size_t register_idx = address & 0x07;
+		esfm_slot *slot = &chip->channels[channel_idx].slots[slot_idx];
+
+		ESFM_slot_write(slot, register_idx, data);
+	}
+	else if (address < KEY_ON_REGS_START + 16)
+	{
+		// Key-on registers
+		size_t channel_idx = (address - KEY_ON_REGS_START);
+		esfm_channel *channel = &chip->channels[channel_idx];
+		channel->key_on = data & 0x01;
+		channel->emu_mode_4op_enable = (data & 0x02) != 0;
+	}
+	else if (address < KEY_ON_REGS_START + 20)
+	{
+		// Key-on channels 17 and 18 (each half)
+		size_t channel_idx = 16 + ((address & 0x02) >> 1);
+		bool second_half = address & 0x01;
+		esfm_channel *channel = &chip->channels[channel_idx];
+		if (second_half)
+		{
+			channel->key_on_2 = data & 0x01;
+			channel->emu_mode_4op_enable_2 = (data & 0x02) != 0;
+		}
+		else
+		{
+			channel->key_on = data & 0x01;
+			channel->emu_mode_4op_enable = (data & 0x02) != 0;
+		}
+	}
+	else
+	{
+		switch (address & 0x5ff)
+		{
+		case TIMER1_REG:
+			chip->timer_reload[0] = data;
+			chip->timer_counter[0] = data;
+			break;
+		case TIMER2_REG:
+			chip->timer_reload[1] = data;
+			chip->timer_counter[1] = data;
+			break;
+		case TIMER_SETUP_REG:
+			if (data & 0x80)
+			{
+				chip->irq_bit = 0;
+				chip->timer_overflow[0] = 0;
+				chip->timer_overflow[1] = 0;
+				break;
+			}
+			chip->timer_enable[0] = (data & 0x01) != 0;
+			chip->timer_enable[1] = (data & 0x02) != 0;
+			chip->timer_mask[1] = (data & 0x20) != 0;
+			chip->timer_mask[0] = (data & 0x40) != 0;
+			break;
+		case CONFIG_REG:
+			chip->keyscale_mode = (data & 0x40) != 0;
+			break;
+		case BASSDRUM_REG:
+			chip->emu_rhy_mode_flags = data & 0x3f;
+			chip->emu_vibrato_deep = (data & 0x40) != 0;
+			chip->emu_tremolo_deep = (data & 0x80) != 0;
+			break;
+		case FOUROP_CONN_REG:
+			for (i = 0; i < 3; i++)
+			{
+				chip->channels[i].emu_mode_4op_enable = (data >> i) & 0x01;
+				chip->channels[i + 9].emu_mode_4op_enable = (data >> (i + 3)) & 0x01;
+			}
+			break;
+		case TEST_REG:
+			chip->test_bit_w0_r5_eg_halt = (data & 0x01) | ((data & 0x20) != 0);
+			chip->test_bit_1_distort = (data & 0x02) != 0;
+			chip->test_bit_2 = (data & 0x04) != 0;
+			chip->test_bit_3 = (data & 0x08) != 0;
+			chip->test_bit_4_attenuate = (data & 0x10) != 0;
+			chip->test_bit_w5_r0 = (data & 0x20) != 0;
+			chip->test_bit_6_phase_stop_reset = (data & 0x40) != 0;
+			chip->test_bit_7 = (data & 0x80) != 0;
+			break;
+		}
+	}
+}
+
+/* ------------------------------------------------------------------------- */
+static uint8_t
+ESFM_readback_reg_native (esfm_chip *chip, uint16_t address)
+{
+	int i;
+	uint8_t data = 0;
+	address = address & 0x7ff;
+
+	if (address < KEY_ON_REGS_START)
+	{
+		// Slot register read
+		size_t channel_idx = address >> 5;
+		size_t slot_idx = (address >> 3) & 0x03;
+		size_t register_idx = address & 0x07;
+		esfm_slot *slot = &chip->channels[channel_idx].slots[slot_idx];
+
+		data = ESFM_slot_readback(slot, register_idx);
+	}
+	else if (address < KEY_ON_REGS_START + 16)
+	{
+		// Key-on registers
+		size_t channel_idx = (address - KEY_ON_REGS_START);
+		esfm_channel *channel = &chip->channels[channel_idx];
+
+		data |= channel->key_on != 0;
+		data |= (channel->emu_mode_4op_enable != 0) << 1;
+	}
+	else if (address < KEY_ON_REGS_START + 20)
+	{
+		// Key-on channels 17 and 18 (each half)
+		size_t channel_idx = 16 + ((address & 0x02) >> 1);
+		bool second_half = address & 0x01;
+		esfm_channel *channel = &chip->channels[channel_idx];
+		if (second_half)
+		{
+			data |= channel->key_on_2 != 0;
+			data |= (channel->emu_mode_4op_enable_2 != 0) << 1;
+		}
+		else
+		{
+			data |= channel->key_on != 0;
+			data |= (channel->emu_mode_4op_enable != 0) << 1;
+		}
+	}
+	else
+	{
+		switch (address & 0x5ff)
+		{
+		case TIMER1_REG:
+			data = chip->timer_counter[0];
+			break;
+		case TIMER2_REG:
+			data = chip->timer_counter[1];
+			break;
+		case TIMER_SETUP_REG:
+			data |= chip->timer_enable[0] != 0;
+			data |= (chip->timer_enable[1] != 0) << 1;
+			data |= (chip->timer_mask[1] != 0) << 5;
+			data |= (chip->timer_mask[0] != 0) << 6;
+			break;
+		case CONFIG_REG:
+			data |= (chip->keyscale_mode != 0) << 6;
+			break;
+		case BASSDRUM_REG:
+			data |= chip->emu_rhy_mode_flags;
+			data |= chip->emu_vibrato_deep << 6;
+			data |= chip->emu_tremolo_deep << 7;
+			break;
+		case TEST_REG:
+			data |= chip->test_bit_w5_r0 != 0;
+			data |= (chip->test_bit_1_distort != 0) << 1;
+			data |= (chip->test_bit_2 != 0) << 2;
+			data |= (chip->test_bit_3 != 0) << 3;
+			data |= (chip->test_bit_4_attenuate != 0) << 4;
+			data |= (chip->test_bit_w0_r5_eg_halt != 0) << 5;
+			data |= (chip->test_bit_6_phase_stop_reset != 0) << 6;
+			data |= (chip->test_bit_7 != 0) << 7;
+			break;
+		case FOUROP_CONN_REG:
+			for (i = 0; i < 3; i++)
+			{
+				data |= (chip->channels[i].emu_mode_4op_enable != 0) << i;
+				data |= (chip->channels[i + 9].emu_mode_4op_enable != 0) << (i + 3);
+			}
+			break;
+		case NATIVE_MODE_REG:
+			data |= (chip->emu_newmode != 0);
+			data |= (chip->native_mode != 0) << 7;
+			break;
+		}
+	}
+	return data;
+}
+
+/* ------------------------------------------------------------------------- */
+static void
+ESFM_write_reg_emu (esfm_chip *chip, uint16_t address, uint8_t data)
+{
+	bool high = (address & 0x100) != 0;
+	uint8_t reg = address & 0xff;
+	int emu_slot_idx = ad_slot[address & 0x1f];
+	int natv_chan_idx = -1;
+	int natv_slot_idx = -1;
+	int emu_chan_idx = (reg & 0x0f) > 8 ? -1 : ((reg & 0x0f) + high * 9);
+
+	if (emu_slot_idx >= 0)
+	{
+		if (high)
+		{
+			emu_slot_idx += 18;
+		}
+
+		natv_chan_idx = emu_slot_map[emu_slot_idx].channel_idx;
+		natv_slot_idx = emu_slot_map[emu_slot_idx].slot_idx;
+	}
+
+	if (reg == 0xbd)
+	{
+		chip->emu_rhy_mode_flags = data & 0x3f;
+		chip->emu_vibrato_deep = (data & 0x40) != 0;
+		chip->emu_tremolo_deep = (data & 0x80) != 0;
+		if (chip->emu_rhy_mode_flags & 0x20)
+		{
+			// TODO: check if writes to 0xbd actually affect the readable key-on flags at
+			// 0x246, 0x247, 0x248; and if there's any visible effect from the SD and TC flags
+			chip->channels[6].key_on = (data & 0x10) != 0;
+			chip->channels[7].key_on = (data & 0x01) != 0;
+			chip->channels[8].key_on = (data & 0x04) != 0;
+			chip->channels[7].key_on_2 = (data & 0x08) != 0;
+			chip->channels[8].key_on_2 = (data & 0x02) != 0;
+		}
+		ESFM_emu_rearrange_connections(&chip->channels[7]);
+		ESFM_emu_rearrange_connections(&chip->channels[8]);
+		return;
+	}
+
+	switch(reg & 0xf0)
+	{
+	case 0x00:
+		if (high)
+		{
+			int i;
+			switch(reg & 0x0f)
+			{
+			case 0x01:
+				chip->emu_wavesel_enable = (data & 0x20) != 0;
+				break;
+			case 0x02:
+				chip->timer_reload[0] = data;
+				chip->timer_counter[0] = data;
+				break;
+			case 0x03:
+				chip->timer_reload[1] = data;
+				chip->timer_counter[1] = data;
+				break;
+			case 0x04:
+				for (i = 0; i < 3; i++)
+				{
+					chip->channels[i].emu_mode_4op_enable = (data >> i) & 0x01;
+					chip->channels[i + 9].emu_mode_4op_enable = (data >> (i + 3)) & 0x01;
+				}
+				for (i = 0; i < 6; i++)
+				{
+					ESFM_emu_rearrange_connections(&chip->channels[i]);
+					ESFM_emu_rearrange_connections(&chip->channels[i + 9]);
+				}
+				break;
+			case 0x05:
+				chip->emu_newmode = data & 0x01;
+				if ((data & 0x80) != 0)
+				{
+					chip->native_mode = 1;
+					ESFM_emu_to_native_switch(chip);
+				}
+				break;
+			case 0x08:
+				chip->keyscale_mode = (data & 0x40) != 0;
+				break;
+			}
+		}
+		else
+		{
+			switch(reg & 0x0f)
+			{
+			case 0x01:
+				chip->emu_wavesel_enable = (data & 0x20) != 0;
+				break;
+			case 0x02:
+				chip->timer_reload[0] = data;
+				chip->timer_counter[0] = data;
+				break;
+			case 0x03:
+				chip->timer_reload[1] = data;
+				chip->timer_counter[1] = data;
+				break;
+			case 0x04:
+				if (data & 0x80)
+				{
+					chip->irq_bit = 0;
+					chip->timer_overflow[0] = 0;
+					chip->timer_overflow[1] = 0;
+					break;
+				}
+				chip->timer_enable[0] = data & 0x01;
+				chip->timer_enable[1] = (data & 0x02) != 0;
+				chip->timer_mask[1] = (data & 0x20) != 0;
+				chip->timer_mask[0] = (data & 0x40) != 0;
+				break;
+			case 0x08:
+				chip->keyscale_mode = (data & 0x40) != 0;
+				break;
+			}
+		}
+		break;
+	case 0x20: case 0x30:
+		if (emu_slot_idx >= 0)
+		{
+			ESFM_slot_write(&chip->channels[natv_chan_idx].slots[natv_slot_idx], 0x0, data);
+		}
+		break;
+	case 0x40: case 0x50:
+		if (emu_slot_idx >= 0)
+		{
+			ESFM_slot_write(&chip->channels[natv_chan_idx].slots[natv_slot_idx], 0x1, data);
+			ESFM_emu_channel_update_keyscale(&chip->channels[natv_chan_idx]);
+		}
+		break;
+	case 0x60: case 0x70:
+		if (emu_slot_idx >= 0)
+		{
+			ESFM_slot_write(&chip->channels[natv_chan_idx].slots[natv_slot_idx], 0x2, data);
+		}
+		break;
+	case 0x80: case 0x90:
+		if (emu_slot_idx >= 0)
+		{
+			ESFM_slot_write(&chip->channels[natv_chan_idx].slots[natv_slot_idx], 0x3, data);
+		}
+		break;
+	case 0xa0:
+		if (emu_chan_idx >= 0)
+		{
+			ESFM_slot_write(&chip->channels[emu_chan_idx].slots[0], 0x4, data);
+			ESFM_emu_channel_update_keyscale(&chip->channels[emu_chan_idx]);
+		}
+		break;
+	case 0xb0:
+		if (emu_chan_idx >= 0)
+		{
+			esfm_channel *channel = &chip->channels[emu_chan_idx];
+			// TODO: check if emulation mode actually writes to the native mode key on registers
+			// it might only use slot 0's emu key on field...
+			channel->key_on = (data & 0x20) != 0;
+			if (channel->channel_idx == 7 || channel->channel_idx == 8)
+			{
+				channel->key_on_2 = (data & 0x20) != 0;
+			}
+			ESFM_slot_write(&channel->slots[0], 0x5, data);
+			ESFM_emu_channel_update_keyscale(&chip->channels[emu_chan_idx]);
+		}
+		break;
+	case 0xc0:
+		if (emu_chan_idx >= 0)
+		{
+			ESFM_slot_write(&chip->channels[emu_chan_idx].slots[0], 0x6, data);
+			ESFM_emu_rearrange_connections(&chip->channels[emu_chan_idx]);
+		}
+		break;
+	case 0xe0: case 0xf0:
+		if (emu_slot_idx >= 0)
+		{
+			ESFM_slot_write(&chip->channels[natv_chan_idx].slots[natv_slot_idx], 0x7, data);
+		}
+		break;
+	}
+}
+
+
+/* ------------------------------------------------------------------------- */
+void
+ESFM_write_reg (esfm_chip *chip, uint16_t address, uint8_t data)
+{
+	if (chip->native_mode)
+	{
+		ESFM_write_reg_native(chip, address, data);
+		return;
+	}
+	else
+	{
+		ESFM_write_reg_emu(chip, address, data);
+		return;
+	}
+}
+
+/* ------------------------------------------------------------------------- */
+void
+ESFM_write_reg_buffered (esfm_chip *chip, uint16_t address, uint8_t data)
+{
+	uint64_t timestamp;
+	esfm_write_buf *new_entry, *last_entry;
+
+	new_entry = &chip->write_buf[chip->write_buf_end];
+	last_entry = &chip->write_buf[(chip->write_buf_end - 1) % ESFM_WRITEBUF_SIZE];
+
+	if (new_entry->valid) {
+		ESFM_write_reg(chip, new_entry->address, new_entry->data);
+		chip->write_buf_start = (chip->write_buf_end + 1) % ESFM_WRITEBUF_SIZE;
+	}
+
+	new_entry->valid = 1;
+	new_entry->address = address;
+	new_entry->data = data;
+	timestamp = last_entry->timestamp + ESFM_WRITEBUF_DELAY;
+	if (timestamp < chip->write_buf_timestamp)
+	{
+		timestamp = chip->write_buf_timestamp;
+	}
+
+	new_entry->timestamp = timestamp;
+	chip->write_buf_end = (chip->write_buf_end + 1) % ESFM_WRITEBUF_SIZE;
+}
+
+/* ------------------------------------------------------------------------- */
+void
+ESFM_write_reg_buffered_fast (esfm_chip *chip, uint16_t address, uint8_t data)
+{
+	esfm_write_buf *new_entry;
+
+	new_entry = &chip->write_buf[chip->write_buf_end];
+
+	if (new_entry->valid) {
+		ESFM_write_reg(chip, new_entry->address, new_entry->data);
+		chip->write_buf_start = (chip->write_buf_end + 1) % ESFM_WRITEBUF_SIZE;
+	}
+
+	new_entry->valid = 1;
+	new_entry->address = address;
+	new_entry->data = data;
+	new_entry->timestamp = chip->write_buf_timestamp;
+	chip->write_buf_end = (chip->write_buf_end + 1) % ESFM_WRITEBUF_SIZE;
+}
+
+/* ------------------------------------------------------------------------- */
+uint8_t
+ESFM_readback_reg (esfm_chip *chip, uint16_t address)
+{
+	if (chip->native_mode)
+	{
+		return ESFM_readback_reg_native(chip, address);
+	}
+	else
+	{
+		return 0;
+	}
+}
+
+/* ------------------------------------------------------------------------- */
+void
+ESFM_write_port (esfm_chip *chip, uint8_t offset, uint8_t data)
+{
+	if (chip->native_mode)
+	{
+		switch(offset)
+		{
+		case 0:
+			chip->native_mode = 0;
+			ESFM_native_to_emu_switch(chip);
+			// TODO: verify if the address write goes through
+			chip->addr_latch = data;
+			break;
+		case 1:
+			ESFM_write_reg_native(chip, chip->addr_latch, data);
+			break;
+		case 2:
+			chip->addr_latch = (chip->addr_latch & 0xff00) | data;
+			break;
+		case 3:
+			chip->addr_latch = chip->addr_latch & 0xff;
+			chip->addr_latch |= (uint16)data << 8;
+			break;
+		}
+	}
+	else
+	{
+		switch(offset)
+		{
+		case 0:
+			chip->addr_latch = data;
+			break;
+		case 1: case 3:
+			ESFM_write_reg_emu(chip, chip->addr_latch, data);
+			break;
+		case 2:
+			chip->addr_latch = (uint16)data | 0x100;
+			break;
+		}
+	}
+}
+
+/* ------------------------------------------------------------------------- */
+uint8_t
+ESFM_read_port (esfm_chip *chip, uint8_t offset)
+{
+	uint8_t data = 0;
+
+	switch(offset)
+	{
+	case 0:
+		data |= (chip->irq_bit != 0) << 7;
+		data |= (chip->timer_overflow[0] != 0) << 6;
+		data |= (chip->timer_overflow[1] != 0) << 5;
+		break;
+	case 1:
+		if (chip->native_mode)
+		{
+			data = ESFM_readback_reg_native(chip, chip->addr_latch);
+		}
+		else
+		{
+			data = 0;
+		}
+		break;
+	case 2: case 3:
+		// This matches OPL3 behavior.
+		data = 0xff;
+		break;
+	}
+
+	return data;
+}
+
+/* ------------------------------------------------------------------------- */
+void
+ESFM_set_mode (esfm_chip *chip, bool native_mode)
+{
+	native_mode = native_mode != 0;
+
+	if (native_mode != (chip->native_mode != 0))
+	{
+		chip->native_mode = native_mode;
+		if (native_mode)
+		{
+			ESFM_emu_to_native_switch(chip);
+		}
+		else
+		{
+			ESFM_native_to_emu_switch(chip);
+		}
+	}
+}
+
+/* ------------------------------------------------------------------------- */
+void
+ESFM_init (esfm_chip *chip)
+{
+	esfm_slot *slot;
+	esfm_channel *channel;
+	size_t channel_idx, slot_idx;
+
+	memset(chip, 0, sizeof(esfm_chip));
+	for (channel_idx = 0; channel_idx < 18; channel_idx++)
+	{
+		for (slot_idx = 0; slot_idx < 4; slot_idx++)
+		{
+			channel = &chip->channels[channel_idx];
+			slot = &channel->slots[slot_idx];
+
+			channel->chip = chip;
+			channel->channel_idx = channel_idx;
+			slot->channel = channel;
+			slot->chip = chip;
+			slot->slot_idx = slot_idx;
+			slot->in.eg_position = slot->in.eg_output = 0x1ff;
+			slot->in.eg_state = EG_RELEASE;
+			slot->in.emu_mod_enable = ~((int13) 0);
+			if (slot_idx == 0)
+			{
+				slot->in.mod_input = &slot->in.feedback_buf;
+			}
+			else
+			{
+				esfm_slot *prev_slot = &channel->slots[slot_idx - 1];
+				slot->in.mod_input = &prev_slot->in.output;
+			}
+
+			if (slot_idx == 1)
+			{
+				slot->in.emu_output_enable = ~((int13) 0);
+			}
+
+			if (channel_idx > 15 && slot_idx & 0x02)
+			{
+				slot->in.key_on = &channel->key_on_2;
+			}
+			else
+			{
+				slot->in.key_on = &channel->key_on;
+			}
+
+			slot->out_enable[0] = slot->out_enable[1] = ~((int13) 0);
+		}
+	}
+
+	chip->lfsr = 1;
+}
+
diff --git a/src/sound/midi.c b/src/sound/midi.c
index c5dbd666f..9f83e88dc 100644
--- a/src/sound/midi.c
+++ b/src/sound/midi.c
@@ -71,60 +71,34 @@ typedef struct
     const device_t *device;
 } MIDI_OUT_DEVICE, MIDI_IN_DEVICE;
 
-static const device_t midi_out_none_device = {
-    .name          = "None",
-    .internal_name = "none",
-    .flags         = 0,
-    .local         = 0,
-    .init          = NULL,
-    .close         = NULL,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-static const MIDI_OUT_DEVICE devices[] = {
+static const MIDI_OUT_DEVICE midi_out_devices[] = {
     // clang-format off
-    { &midi_out_none_device  },
+    { &device_none          },
 #ifdef USE_FLUIDSYNTH
-    { &fluidsynth_device     },
-#endif
+    { &fluidsynth_device    },
+#endif /* USE_FLUIDSYNTH */
 #ifdef USE_MUNT
-    { &mt32_old_device       },
-    { &mt32_new_device       },
-    { &cm32l_device          },
-    { &cm32ln_device         },
-#endif
+    { &mt32_old_device      },
+    { &mt32_new_device      },
+    { &cm32l_device         },
+    { &cm32ln_device        },
+#endif /*USE_MUNT */
+#ifdef USE_OPL4ML
+    { &opl4_midi_device     },
+#endif /* USE_OPL4ML */
 #ifdef USE_RTMIDI
-    { &rtmidi_output_device  },
-#endif
-    { &opl4_midi_device      },
-    { NULL                   }
+    { &rtmidi_output_device },
+#endif /* USE_RTMIDI */
+    { NULL                  }
     // clang-format on
 };
 
-static const device_t midi_in_none_device = {
-    .name          = "None",
-    .internal_name = "none",
-    .flags         = 0,
-    .local         = 0,
-    .init          = NULL,
-    .close         = NULL,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
 static const MIDI_IN_DEVICE midi_in_devices[] = {
     // clang-format off
-    { &midi_in_none_device },
+    { &device_none         },
 #ifdef USE_RTMIDI
     { &rtmidi_input_device },
-#endif
+#endif /* USE_RTMIDI */
     { NULL                 }
     // clang-format on
 };
@@ -132,8 +106,8 @@ static const MIDI_IN_DEVICE midi_in_devices[] = {
 int
 midi_out_device_available(int card)
 {
-    if (devices[card].device)
-        return device_available(devices[card].device);
+    if (midi_out_devices[card].device)
+        return device_available(midi_out_devices[card].device);
 
     return 1;
 }
@@ -141,21 +115,21 @@ midi_out_device_available(int card)
 const device_t *
 midi_out_device_getdevice(int card)
 {
-    return devices[card].device;
+    return midi_out_devices[card].device;
 }
 
 int
 midi_out_device_has_config(int card)
 {
-    if (!devices[card].device)
+    if (!midi_out_devices[card].device)
         return 0;
-    return devices[card].device->config ? 1 : 0;
+    return midi_out_devices[card].device->config ? 1 : 0;
 }
 
 const char *
 midi_out_device_get_internal_name(int card)
 {
-    return device_get_internal_name(devices[card].device);
+    return device_get_internal_name(midi_out_devices[card].device);
 }
 
 int
@@ -163,8 +137,8 @@ midi_out_device_get_from_internal_name(char *s)
 {
     int c = 0;
 
-    while (devices[c].device != NULL) {
-        if (!strcmp(devices[c].device->internal_name, s))
+    while (midi_out_devices[c].device != NULL) {
+        if (!strcmp(midi_out_devices[c].device->internal_name, s))
             return c;
         c++;
     }
@@ -175,16 +149,15 @@ midi_out_device_get_from_internal_name(char *s)
 void
 midi_out_device_init(void)
 {
-    if ((midi_output_device_current > 0) && devices[midi_output_device_current].device)
-        device_add(devices[midi_output_device_current].device);
+    if ((midi_output_device_current > 0) && midi_out_devices[midi_output_device_current].device)
+        device_add(midi_out_devices[midi_output_device_current].device);
     midi_output_device_last = midi_output_device_current;
 }
 
 void
 midi_out_init(midi_device_t *device)
 {
-    midi_out = (midi_t *) malloc(sizeof(midi_t));
-    memset(midi_out, 0, sizeof(midi_t));
+    midi_out = (midi_t *) calloc(1, sizeof(midi_t));
 
     midi_out->m_out_device = device;
 }
@@ -192,8 +165,7 @@ midi_out_init(midi_device_t *device)
 void
 midi_in_init(midi_device_t *device, midi_t **mididev)
 {
-    *mididev = (midi_t *) malloc(sizeof(midi_t));
-    memset(*mididev, 0, sizeof(midi_t));
+    *mididev = (midi_t *) calloc(1, sizeof(midi_t));
 
     (*mididev)->m_in_device = device;
 }
@@ -367,7 +339,7 @@ midi_raw_out_byte(uint8_t val)
                     else if ((midi_out->midi_sysex_data[5] == 0x10) && (midi_out->midi_sysex_data[6] == 0x00) && (midi_out->midi_sysex_data[7] == 0x01))
                         midi_out->midi_sysex_delay = 30; /* Dark Sun 1 */
                     else
-                        midi_out->midi_sysex_delay = (unsigned int) (((float) (midi_out->midi_pos) * 1.25f) * 1000.0f / 3125.0f) + 2;
+                        midi_out->midi_sysex_delay = (unsigned int) (((double) (midi_out->midi_pos) * 1.25) / 3.125) + 2;
 
                     midi_out->midi_sysex_start = plat_get_ticks();
                 }
@@ -420,8 +392,7 @@ midi_in_handler(int set, void (*msg)(void *priv, uint8_t *msg, uint32_t len), in
         if ((mih_first != NULL) && (mih_last == NULL))
             fatal("First MIDI IN handler present with no last MIDI IN handler\n");
 
-        temp = (midi_in_handler_t *) malloc(sizeof(midi_in_handler_t));
-        memset(temp, 0, sizeof(midi_in_handler_t));
+        temp = (midi_in_handler_t *) calloc(1, sizeof(midi_in_handler_t));
         temp->msg   = msg;
         temp->sysex = sysex;
         temp->priv  = priv;
@@ -610,3 +581,10 @@ midi_in_sysex(uint8_t *buffer, uint32_t len)
             break;
     }
 }
+
+void
+midi_reset(void)
+{
+    if (midi_out && midi_out->m_out_device && midi_out->m_out_device->reset)
+        midi_out->m_out_device->reset();
+}
diff --git a/src/sound/midi_fluidsynth.c b/src/sound/midi_fluidsynth.c
index c1b9956d0..1afefd905 100644
--- a/src/sound/midi_fluidsynth.c
+++ b/src/sound/midi_fluidsynth.c
@@ -7,7 +7,6 @@
 #ifdef __unix__
 #    include <unistd.h>
 #endif
-#define FLUIDSYNTH_NOT_A_DLL
 #include <fluidsynth.h>
 
 #include <86box/86box.h>
@@ -162,6 +161,7 @@ fluidsynth_init(UNUSED(const device_t *info))
 
     fluid_settings_setnum(data->settings, "synth.sample-rate", 44100);
     fluid_settings_setnum(data->settings, "synth.gain", device_get_config_int("output_gain") / 100.0f);
+    fluid_settings_setint(data->settings, "synth.dynamic-sample-loading", device_get_config_int("dynamic_sample_loading"));
 
     data->synth = new_fluid_synth(data->settings);
 
@@ -263,8 +263,7 @@ fluidsynth_init(UNUSED(const device_t *info))
 
     al_set_midi(data->samplerate, data->buf_size);
 
-    dev = malloc(sizeof(midi_device_t));
-    memset(dev, 0, sizeof(midi_device_t));
+    dev = calloc(1, sizeof(midi_device_t));
 
     dev->play_msg   = fluidsynth_msg;
     dev->play_sysex = fluidsynth_sysex;
@@ -321,164 +320,206 @@ fluidsynth_close(void *priv)
 static const device_config_t fluidsynth_config[] = {
   // clang-format off
     {
-        .name = "sound_font",
-        .description = "Sound Font",
-        .type = CONFIG_FNAME,
-        .default_string = "",
-        .file_filter = "SF2 Sound Fonts (*.sf2)|*.sf2"
+        .name           = "sound_font",
+        .description    = "SoundFont",
+        .type           = CONFIG_FNAME,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = "SoundFont files (*.sf2 *.sf3)|*.sf2,*.sf3",
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "output_gain",
-        .description = "Output Gain",
-        .type = CONFIG_SPINNER,
-        .spinner =
-        {
-            .min = 0,
+        .name           = "output_gain",
+        .description    = "Output Gain",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 100,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min =   0,
             .max = 100
         },
-        .default_int = 100
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "chorus",
-        .description = "Chorus",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "chorus",
+        .description    = "Chorus",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "chorus_voices",
-        .description = "Chorus Voices",
-        .type = CONFIG_SPINNER,
-        .spinner =
-        {
-            .min = 0,
+        .name           = "chorus_voices",
+        .description    = "Chorus Voices",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 3,
+        .file_filter    = NULL,
+        .spinner = {
+            .min =  0,
             .max = 99
         },
-        .default_int = 3
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "chorus_level",
-        .description = "Chorus Level",
-        .type = CONFIG_SPINNER,
-        .spinner =
-        {
-            .min = 0,
+        .name           = "chorus_level",
+        .description    = "Chorus Level",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 20,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min =   0,
             .max = 100
         },
-        .default_int = 20
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "chorus_speed",
-        .description = "Chorus Speed",
-        .type = CONFIG_SPINNER,
-        .spinner =
-        {
-            .min = 10,
+        .name           = "chorus_speed",
+        .description    = "Chorus Speed",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 30,
+        .file_filter    = NULL,
+        .spinner = {
+            .min =  10,
             .max = 500
         },
-        .default_int = 30
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "chorus_depth",
-        .description = "Chorus Depth",
-        .type = CONFIG_SPINNER,
-        .spinner =
-        {
-            .min = 0,
+        .name           = "chorus_depth",
+        .description    = "Chorus Depth",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 80,
+        .file_filter    = NULL,
+        .spinner = {
+            .min =    0,
             .max = 2560
         },
-        .default_int = 80
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "chorus_waveform",
-        .description = "Chorus Waveform",
-        .type = CONFIG_SELECTION,
-        .selection =
-        {
-            {
-                .description = "Sine",
-                .value = 0
-            },
-            {
-                .description = "Triangle",
-                .value = 1
-            }
+        .name           = "chorus_waveform",
+        .description    = "Chorus Waveform",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Sine",     .value = 0 },
+            { .description = "Triangle", .value = 1 },
+            { .description = ""                     }
         },
-        .default_int = 0
+        .bios           = { { 0 } }
     },
     {
-        .name = "reverb",
-        .description = "Reverb",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "reverb",
+        .description    = "Reverb",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "reverb_room_size",
-        .description = "Reverb Room Size",
-        .type = CONFIG_SPINNER,
-        .spinner =
-        {
-            .min = 0,
+        .name           = "reverb_room_size",
+        .description    = "Reverb Room Size",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 20,
+        .file_filter    = NULL,
+        .spinner = {
+            .min =   0,
             .max = 100
         },
-        .default_int = 20
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "reverb_damping",
-        .description = "Reverb Damping",
-        .type = CONFIG_SPINNER,
-        .spinner =
-        {
-            .min = 0,
+        .name           = "reverb_damping",
+        .description    = "Reverb Damping",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner = {
+            .min =   0,
             .max = 100
         },
-        .default_int = 0
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "reverb_width",
-        .description = "Reverb Width",
-        .type = CONFIG_SPINNER,
-        .spinner =
-        {
-            .min = 0,
+        .name           = "reverb_width",
+        .description    = "Reverb Width",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min =    0,
             .max = 1000
         },
-        .default_int = 5
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "reverb_level",
-        .description = "Reverb Level",
-        .type = CONFIG_SPINNER,
-        .spinner =
-        {
-            .min = 0,
+        .name           = "reverb_level",
+        .description    = "Reverb Level",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 90,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min =   0,
             .max = 100
         },
-        .default_int = 90
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "interpolation",
-        .description = "Interpolation Method",
-        .type = CONFIG_SELECTION,
-        .selection =
-        {
-            {
-                .description = "None",
-                .value = 0
-            },
-            {
-                .description = "Linear",
-                .value = 1
-            },
-            {
-                .description = "4th Order",
-                .value = 2
-            },
-            {
-                .description = "7th Order",
-                .value = 3
-            }
+        .name           = "interpolation",
+        .description    = "Interpolation Method",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",      .value = 0 },
+            { .description = "Linear",    .value = 1 },
+            { .description = "4th Order", .value = 2 },
+            { .description = "7th Order", .value = 3 },
+            { .description = ""                      }
         },
-        .default_int = 2
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "dynamic_sample_loading",
+        .description    = "Dynamic Sample Loading",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -492,9 +533,8 @@ const device_t fluidsynth_device = {
     .init          = fluidsynth_init,
     .close         = fluidsynth_close,
     .reset         = NULL,
-    { .available = fluidsynth_available },
+    .available     = fluidsynth_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = fluidsynth_config
 };
-
diff --git a/src/sound/midi_mt32.c b/src/sound/midi_mt32.c
index 91d85e438..67f1d26c8 100644
--- a/src/sound/midi_mt32.c
+++ b/src/sound/midi_mt32.c
@@ -298,8 +298,7 @@ mt32emu_init(char *control_rom, char *pcm_rom)
 
     al_set_midi(samplerate, buf_size);
 
-    dev = malloc(sizeof(midi_device_t));
-    memset(dev, 0, sizeof(midi_device_t));
+    dev = calloc(1, sizeof(midi_device_t));
 
     dev->play_msg   = mt32_msg;
     dev->play_sysex = mt32_sysex;
@@ -378,42 +377,60 @@ mt32_close(void *priv)
 static const device_config_t mt32_config[] = {
   // clang-format off
     {
-        .name = "output_gain",
-        .description = "Output Gain",
-        .type = CONFIG_SPINNER,
-        .spinner = {
+        .name           = "output_gain",
+        .description    = "Output Gain",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 100,
+        .file_filter    = NULL,
+        .spinner        = {
+            .min =   0,
+            .max = 100
+        },
+        .selection      = { { 0 } }
+    },
+    {
+        .name           = "reverb",
+        .description    = "Reverb",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } }
+    },
+    {
+        .name           = "reverb_output_gain",
+        .description    = "Reverb Output Gain",
+        .type           = CONFIG_SPINNER,
+        .default_string = NULL,
+        .default_int    = 100,
+        .file_filter    = NULL,
+        .spinner        = {
             .min = 0,
             .max = 100
         },
-        .default_int = 100
+        .selection      = { { 0 } }
     },
     {
-        .name = "reverb",
-        .description = "Reverb",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "reversed_stereo",
+        .description    = "Reversed stereo",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } }
     },
     {
-        .name = "reverb_output_gain",
-        .description = "Reverb Output Gain",
-        .type = CONFIG_SPINNER,
-        .spinner = {
-            .min = 0,
-            .max = 100
-        },
-        .default_int = 100
-    },
-    {
-        .name = "reversed_stereo",
-        .description = "Reversed stereo",
-        .type = CONFIG_BINARY,
-        .default_int = 0
-    },
-    {
-        .name = "nice_ramp",
-        .description = "Nice ramp",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "nice_ramp",
+        .description    = "Nice ramp",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -427,7 +444,7 @@ const device_t mt32_old_device = {
     .init          = mt32_old_init,
     .close         = mt32_close,
     .reset         = NULL,
-    { .available = mt32_old_available },
+    .available     = mt32_old_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = mt32_config
@@ -435,13 +452,13 @@ const device_t mt32_old_device = {
 
 const device_t mt32_new_device = {
     .name          = "Roland MT-32 (New) Emulation",
-    .internal_name = "mt32",
+    .internal_name = "mt32_new",
     .flags         = 0,
     .local         = 0,
     .init          = mt32_new_init,
     .close         = mt32_close,
     .reset         = NULL,
-    { .available = mt32_new_available },
+    .available     = mt32_new_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = mt32_config
@@ -455,7 +472,7 @@ const device_t cm32l_device = {
     .init          = cm32l_init,
     .close         = mt32_close,
     .reset         = NULL,
-    { .available = cm32l_available },
+    .available     = cm32l_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = mt32_config
@@ -469,7 +486,7 @@ const device_t cm32ln_device = {
     .init          = cm32ln_init,
     .close         = mt32_close,
     .reset         = NULL,
-    { .available = cm32ln_available },
+    .available     = cm32ln_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = mt32_config
diff --git a/src/sound/midi_opl4.c b/src/sound/midi_opl4.c
index 9708db150..25f44c9e7 100644
--- a/src/sound/midi_opl4.c
+++ b/src/sound/midi_opl4.c
@@ -436,7 +436,8 @@ note_on(uint8_t note, uint8_t velocity, MIDI_CHANNEL_DATA *midi_channel, opl4_mi
     const YRW801_REGION_DATA_PTR *region_ptr = &snd_yrw801_regions[0];
     const YRW801_WAVE_DATA       *wave_data[2];
     VOICE_DATA                   *voice[2];
-    uint8_t                       i = 0, voices = 0;
+    int                           i      = 0;
+    uint8_t                       voices = 0;
 
     while (opl4_midi->gen_in_progress) { }
 
@@ -557,7 +558,7 @@ program_change(uint8_t midi_channel, uint8_t program, opl4_midi_t *opl4_midi)
 }
 
 static void
-opl4_midi_thread(void *arg)
+opl4_midi_thread(UNUSED(void *arg))
 {
     opl4_midi_t *opl4_midi         = opl4_midi_cur;
     uint32_t     i                 = 0;
@@ -648,18 +649,18 @@ opl4_midi_msg(uint8_t *val)
 }
 
 void
-opl4_midi_sysex(uint8_t *data, unsigned int len)
+opl4_midi_sysex(UNUSED(uint8_t *data), UNUSED(unsigned int len))
 {
+    //
 }
 
 void *
-opl4_init(const device_t *info)
+opl4_init(UNUSED(const device_t *info))
 {
     midi_device_t *dev;
     extern void    al_set_midi(int freq, int buf_size);
 
-    dev = malloc(sizeof(midi_device_t));
-    memset(dev, 0, sizeof(midi_device_t));
+    dev = calloc(1, sizeof(midi_device_t));
 
     dev->play_msg   = opl4_midi_msg;
     dev->play_sysex = opl4_midi_sysex;
@@ -724,7 +725,7 @@ const device_t opl4_midi_device = {
     .init          = opl4_init,
     .close         = opl4_close,
     .reset         = NULL,
-    { .available = opl4_midi_available },
+    .available     = opl4_midi_available,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sound/midi_rtmidi.cpp b/src/sound/midi_rtmidi.cpp
index 72df8fd32..11203c3f2 100644
--- a/src/sound/midi_rtmidi.cpp
+++ b/src/sound/midi_rtmidi.cpp
@@ -73,8 +73,7 @@ rtmidi_play_sysex(uint8_t *sysex, unsigned int len)
 void *
 rtmidi_output_init(UNUSED(const device_t *info))
 {
-    midi_device_t *dev = (midi_device_t *) malloc(sizeof(midi_device_t));
-    memset(dev, 0, sizeof(midi_device_t));
+    midi_device_t *dev = (midi_device_t *) calloc(1, sizeof(midi_device_t));
 
     dev->play_msg   = rtmidi_play_msg;
     dev->play_sysex = rtmidi_play_sysex;
@@ -156,8 +155,7 @@ rtmidi_input_callback(UNUSED(double timeStamp), std::vector<unsigned char> *mess
 void *
 rtmidi_input_init(UNUSED(const device_t *info))
 {
-    midi_device_t *dev = (midi_device_t *) malloc(sizeof(midi_device_t));
-    memset(dev, 0, sizeof(midi_device_t));
+    midi_device_t *dev = (midi_device_t *) calloc(1, sizeof(midi_device_t));
 
     try {
         if (!midiin)
@@ -233,11 +231,15 @@ rtmidi_in_get_dev_name(int num, char *s)
 static const device_config_t system_midi_config[] = {
   // clang-format off
     {
-        .name = "midi",
-        .description = "MIDI out device",
-        .type = CONFIG_MIDI_OUT,
-        .default_string = "",
-        .default_int = 0
+        .name           = "midi",
+        .description    = "MIDI Output Device",
+        .type           = CONFIG_MIDI_OUT,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -246,32 +248,48 @@ static const device_config_t system_midi_config[] = {
 static const device_config_t midi_input_config[] = {
   // clang-format off
     {
-        .name = "midi_input",
-        .description = "MIDI in device",
-        .type = CONFIG_MIDI_IN,
-        .default_string = "",
-        .default_int = 0
+        .name           = "midi_input",
+        .description    = "MIDI Input Device",
+        .type           = CONFIG_MIDI_IN,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "realtime",
-        .description = "MIDI Real time",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "realtime",
+        .description    = "MIDI Real time",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "thruchan",
-        .description = "MIDI Thru",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "thruchan",
+        .description    = "MIDI Thru",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "clockout",
-        .description = "MIDI Clockout",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "clockout",
+        .description    = "MIDI Clockout",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -285,7 +303,7 @@ const device_t rtmidi_output_device = {
     .init          = rtmidi_output_init,
     .close         = rtmidi_output_close,
     .reset         = NULL,
-    { .available = rtmidi_out_get_num_devs },
+    .available     = rtmidi_out_get_num_devs,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = system_midi_config
@@ -299,7 +317,7 @@ const device_t rtmidi_input_device = {
     .init          = rtmidi_input_init,
     .close         = rtmidi_input_close,
     .reset         = NULL,
-    { .available = rtmidi_in_get_num_devs },
+    .available     = rtmidi_in_get_num_devs,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = midi_input_config
diff --git a/src/sound/openal.c b/src/sound/openal.c
index 76656c66e..90f626362 100644
--- a/src/sound/openal.c
+++ b/src/sound/openal.c
@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wchar.h>
 #undef AL_API
 #undef ALC_API
 #define AL_LIBTYPE_STATIC
@@ -38,10 +37,12 @@
 #define FREQ   SOUND_FREQ
 #define BUFLEN SOUNDBUFLEN
 
-ALuint        buffers[4];      /* front and back buffers */
-ALuint        buffers_cd[4];   /* front and back buffers */
-ALuint        buffers_midi[4]; /* front and back buffers */
-static ALuint source[3];       /* audio source */
+ALuint        buffers[4];       /* front and back buffers */
+ALuint        buffers_music[4]; /* front and back buffers */
+ALuint        buffers_wt[4];    /* front and back buffers */
+ALuint        buffers_cd[4];    /* front and back buffers */
+ALuint        buffers_midi[4];  /* front and back buffers */
+static ALuint source[5];        /* audio source */
 
 static int         midi_freq     = 44100;
 static int         midi_buf_size = 4410;
@@ -51,13 +52,12 @@ static ALCcontext *Context;
 static ALCdevice  *Device;
 
 void
-al_set_midi(int freq, int buf_size)
+al_set_midi(const int freq, const int buf_size)
 {
     midi_freq     = freq;
     midi_buf_size = buf_size;
 }
 
-void closeal(void);
 ALvoid
 alutInit(UNUSED(ALint *argc), UNUSED(ALbyte **argv))
 {
@@ -99,9 +99,10 @@ closeal(void)
     alSourceStopv(sources, source);
     alDeleteSources(sources, source);
 
-    if (sources == 3)
+    if (sources == 4)
         alDeleteBuffers(4, buffers_midi);
     alDeleteBuffers(4, buffers_cd);
+    alDeleteBuffers(4, buffers_music);
     alDeleteBuffers(4, buffers);
 
     alutExit();
@@ -112,14 +113,17 @@ closeal(void)
 void
 inital(void)
 {
-    float   *buf            = NULL;
-    float   *cd_buf         = NULL;
-    float   *midi_buf       = NULL;
-    int16_t *buf_int16      = NULL;
-    int16_t *cd_buf_int16   = NULL;
-    int16_t *midi_buf_int16 = NULL;
+    float   *buf             = NULL;
+    float   *music_buf       = NULL;
+    float   *wt_buf          = NULL;
+    float   *cd_buf          = NULL;
+    float   *midi_buf        = NULL;
+    int16_t *buf_int16       = NULL;
+    int16_t *music_buf_int16 = NULL;
+    int16_t *wt_buf_int16    = NULL;
+    int16_t *cd_buf_int16    = NULL;
+    int16_t *midi_buf_int16  = NULL;
 
-    const char *mdn;
     int         init_midi = 0;
 
     if (initialized)
@@ -128,60 +132,80 @@ inital(void)
     alutInit(0, 0);
     atexit(closeal);
 
-    mdn = midi_out_device_get_internal_name(midi_output_device_current);
-    if (strcmp(mdn, "none") && strcmp(mdn, SYSTEM_MIDI_INTERNAL_NAME))
+    const char *mdn = midi_out_device_get_internal_name(midi_output_device_current);
+    if ((strcmp(mdn, "none") != 0) && (strcmp(mdn, SYSTEM_MIDI_INTERNAL_NAME) != 0))
         init_midi = 1; /* If the device is neither none, nor system MIDI, initialize the
-                MIDI buffer and source, otherwise, do not. */
-    sources = 2 + !!init_midi;
+                          MIDI buffer and source, otherwise, do not. */
+    sources = 4 + !!init_midi;
 
     if (sound_is_float) {
-        buf    = (float *) calloc((BUFLEN << 1), sizeof(float));
-        cd_buf = (float *) calloc((CD_BUFLEN << 1), sizeof(float));
+        buf       = (float *) calloc((BUFLEN << 1), sizeof(float));
+        music_buf = (float *) calloc((MUSICBUFLEN << 1), sizeof(float));
+        wt_buf    = (float *) calloc((WTBUFLEN << 1), sizeof(float));
+        cd_buf    = (float *) calloc((CD_BUFLEN << 1), sizeof(float));
         if (init_midi)
             midi_buf = (float *) calloc(midi_buf_size, sizeof(float));
     } else {
-        buf_int16    = (int16_t *) calloc((BUFLEN << 1), sizeof(int16_t));
-        cd_buf_int16 = (int16_t *) calloc((CD_BUFLEN << 1), sizeof(int16_t));
+        buf_int16       = (int16_t *) calloc((BUFLEN << 1), sizeof(int16_t));
+        music_buf_int16 = (int16_t *) calloc((MUSICBUFLEN << 1), sizeof(int16_t));
+        wt_buf_int16    = (int16_t *) calloc((WTBUFLEN << 1), sizeof(int16_t));
+        cd_buf_int16    = (int16_t *) calloc((CD_BUFLEN << 1), sizeof(int16_t));
         if (init_midi)
             midi_buf_int16 = (int16_t *) calloc(midi_buf_size, sizeof(int16_t));
     }
 
     alGenBuffers(4, buffers);
     alGenBuffers(4, buffers_cd);
+    alGenBuffers(4, buffers_music);
+    alGenBuffers(4, buffers_wt);
     if (init_midi)
         alGenBuffers(4, buffers_midi);
 
     if (init_midi)
-        alGenSources(3, source);
+        alGenSources(5, source);
     else
-        alGenSources(2, source);
+        alGenSources(4, source);
 
-    alSource3f(source[0], AL_POSITION, 0.0, 0.0, 0.0);
-    alSource3f(source[0], AL_VELOCITY, 0.0, 0.0, 0.0);
-    alSource3f(source[0], AL_DIRECTION, 0.0, 0.0, 0.0);
-    alSourcef(source[0], AL_ROLLOFF_FACTOR, 0.0);
+    alSource3f(source[0], AL_POSITION, 0.0f, 0.0f, 0.0f);
+    alSource3f(source[0], AL_VELOCITY, 0.0f, 0.0f, 0.0f);
+    alSource3f(source[0], AL_DIRECTION, 0.0f, 0.0f, 0.0f);
+    alSourcef(source[0], AL_ROLLOFF_FACTOR, 0.0f);
     alSourcei(source[0], AL_SOURCE_RELATIVE, AL_TRUE);
-    alSource3f(source[1], AL_POSITION, 0.0, 0.0, 0.0);
-    alSource3f(source[1], AL_VELOCITY, 0.0, 0.0, 0.0);
-    alSource3f(source[1], AL_DIRECTION, 0.0, 0.0, 0.0);
-    alSourcef(source[1], AL_ROLLOFF_FACTOR, 0.0);
+    alSource3f(source[1], AL_POSITION, 0.0f, 0.0f, 0.0f);
+    alSource3f(source[1], AL_VELOCITY, 0.0f, 0.0f, 0.0f);
+    alSource3f(source[1], AL_DIRECTION, 0.0f, 0.0f, 0.0f);
+    alSourcef(source[1], AL_ROLLOFF_FACTOR, 0.0f);
     alSourcei(source[1], AL_SOURCE_RELATIVE, AL_TRUE);
+    alSource3f(source[2], AL_POSITION, 0.0f, 0.0f, 0.0f);
+    alSource3f(source[2], AL_VELOCITY, 0.0f, 0.0f, 0.0f);
+    alSource3f(source[2], AL_DIRECTION, 0.0f, 0.0f, 0.0f);
+    alSourcef(source[2], AL_ROLLOFF_FACTOR, 0.0f);
+    alSourcei(source[2], AL_SOURCE_RELATIVE, AL_TRUE);
+    alSource3f(source[3], AL_POSITION, 0.0f, 0.0f, 0.0f);
+    alSource3f(source[3], AL_VELOCITY, 0.0f, 0.0f, 0.0f);
+    alSource3f(source[3], AL_DIRECTION, 0.0f, 0.0f, 0.0f);
+    alSourcef(source[3], AL_ROLLOFF_FACTOR, 0.0f);
+    alSourcei(source[3], AL_SOURCE_RELATIVE, AL_TRUE);
     if (init_midi) {
-        alSource3f(source[2], AL_POSITION, 0.0, 0.0, 0.0);
-        alSource3f(source[2], AL_VELOCITY, 0.0, 0.0, 0.0);
-        alSource3f(source[2], AL_DIRECTION, 0.0, 0.0, 0.0);
-        alSourcef(source[2], AL_ROLLOFF_FACTOR, 0.0);
-        alSourcei(source[2], AL_SOURCE_RELATIVE, AL_TRUE);
+        alSource3f(source[4], AL_POSITION, 0.0f, 0.0f, 0.0f);
+        alSource3f(source[4], AL_VELOCITY, 0.0f, 0.0f, 0.0f);
+        alSource3f(source[4], AL_DIRECTION, 0.0f, 0.0f, 0.0f);
+        alSourcef(source[4], AL_ROLLOFF_FACTOR, 0.0f);
+        alSourcei(source[4], AL_SOURCE_RELATIVE, AL_TRUE);
     }
 
     if (sound_is_float) {
         memset(buf, 0, BUFLEN * 2 * sizeof(float));
-        memset(cd_buf, 0, BUFLEN * 2 * sizeof(float));
+        memset(cd_buf, 0, CD_BUFLEN * 2 * sizeof(float));
+        memset(music_buf, 0, MUSICBUFLEN * 2 * sizeof(float));
+        memset(wt_buf, 0, WTBUFLEN * 2 * sizeof(float));
         if (init_midi)
             memset(midi_buf, 0, midi_buf_size * sizeof(float));
     } else {
         memset(buf_int16, 0, BUFLEN * 2 * sizeof(int16_t));
-        memset(cd_buf_int16, 0, BUFLEN * 2 * sizeof(int16_t));
+        memset(cd_buf_int16, 0, CD_BUFLEN * 2 * sizeof(int16_t));
+        memset(music_buf_int16, 0, MUSICBUFLEN * 2 * sizeof(int16_t));
+        memset(wt_buf_int16, 0, WTBUFLEN * 2 * sizeof(int16_t));
         if (init_midi)
             memset(midi_buf_int16, 0, midi_buf_size * sizeof(int16_t));
     }
@@ -189,35 +213,47 @@ inital(void)
     for (uint8_t c = 0; c < 4; c++) {
         if (sound_is_float) {
             alBufferData(buffers[c], AL_FORMAT_STEREO_FLOAT32, buf, BUFLEN * 2 * sizeof(float), FREQ);
+            alBufferData(buffers_music[c], AL_FORMAT_STEREO_FLOAT32, music_buf, MUSICBUFLEN * 2 * sizeof(float), MUSIC_FREQ);
+            alBufferData(buffers_wt[c], AL_FORMAT_STEREO_FLOAT32, wt_buf, WTBUFLEN * 2 * sizeof(float), WT_FREQ);
             alBufferData(buffers_cd[c], AL_FORMAT_STEREO_FLOAT32, cd_buf, CD_BUFLEN * 2 * sizeof(float), CD_FREQ);
             if (init_midi)
-                alBufferData(buffers_midi[c], AL_FORMAT_STEREO_FLOAT32, midi_buf, midi_buf_size * sizeof(float), midi_freq);
+                alBufferData(buffers_midi[c], AL_FORMAT_STEREO_FLOAT32, midi_buf, midi_buf_size * (int) sizeof(float), midi_freq);
         } else {
             alBufferData(buffers[c], AL_FORMAT_STEREO16, buf_int16, BUFLEN * 2 * sizeof(int16_t), FREQ);
+            alBufferData(buffers_music[c], AL_FORMAT_STEREO16, music_buf_int16, MUSICBUFLEN * 2 * sizeof(int16_t), MUSIC_FREQ);
+            alBufferData(buffers_wt[c], AL_FORMAT_STEREO16, wt_buf_int16, WTBUFLEN * 2 * sizeof(int16_t), WT_FREQ);
             alBufferData(buffers_cd[c], AL_FORMAT_STEREO16, cd_buf_int16, CD_BUFLEN * 2 * sizeof(int16_t), CD_FREQ);
             if (init_midi)
-                alBufferData(buffers_midi[c], AL_FORMAT_STEREO16, midi_buf_int16, midi_buf_size * sizeof(int16_t), midi_freq);
+                alBufferData(buffers_midi[c], AL_FORMAT_STEREO16, midi_buf_int16, midi_buf_size * (int) sizeof(int16_t), midi_freq);
         }
     }
 
     alSourceQueueBuffers(source[0], 4, buffers);
-    alSourceQueueBuffers(source[1], 4, buffers_cd);
+    alSourceQueueBuffers(source[1], 4, buffers_music);
+    alSourceQueueBuffers(source[2], 4, buffers_wt);
+    alSourceQueueBuffers(source[3], 4, buffers_cd);
     if (init_midi)
-        alSourceQueueBuffers(source[2], 4, buffers_midi);
+        alSourceQueueBuffers(source[4], 4, buffers_midi);
     alSourcePlay(source[0]);
     alSourcePlay(source[1]);
+    alSourcePlay(source[2]);
+    alSourcePlay(source[3]);
     if (init_midi)
-        alSourcePlay(source[2]);
+        alSourcePlay(source[4]);
 
     if (sound_is_float) {
         if (init_midi)
             free(midi_buf);
         free(cd_buf);
+        free(wt_buf);
+        free(music_buf);
         free(buf);
     } else {
         if (init_midi)
             free(midi_buf_int16);
         free(cd_buf_int16);
+        free(wt_buf_int16);
+        free(music_buf_int16);
         free(buf_int16);
     }
 
@@ -225,12 +261,11 @@ inital(void)
 }
 
 void
-givealbuffer_common(void *buf, uint8_t src, int size, int freq)
+givealbuffer_common(const void *buf, const uint8_t src, const int size, const int freq)
 {
     int    processed;
     int    state;
     ALuint buffer;
-    double gain;
 
     if (!initialized)
         return;
@@ -243,34 +278,46 @@ givealbuffer_common(void *buf, uint8_t src, int size, int freq)
 
     alGetSourcei(source[src], AL_BUFFERS_PROCESSED, &processed);
     if (processed >= 1) {
-        gain = pow(10.0, (double) sound_gain / 20.0);
-        alListenerf(AL_GAIN, gain);
+        const double gain = sound_muted ? 0.0 : pow(10.0, (double) sound_gain / 20.0);
+        alListenerf(AL_GAIN, (float) gain);
 
         alSourceUnqueueBuffers(source[src], 1, &buffer);
 
         if (sound_is_float)
-            alBufferData(buffer, AL_FORMAT_STEREO_FLOAT32, buf, size * sizeof(float), freq);
+            alBufferData(buffer, AL_FORMAT_STEREO_FLOAT32, buf, size * (int) sizeof(float), freq);
         else
-            alBufferData(buffer, AL_FORMAT_STEREO16, buf, size * sizeof(int16_t), freq);
+            alBufferData(buffer, AL_FORMAT_STEREO16, buf, size * (int) sizeof(int16_t), freq);
 
         alSourceQueueBuffers(source[src], 1, &buffer);
     }
 }
 
 void
-givealbuffer(void *buf)
+givealbuffer(const void *buf)
 {
     givealbuffer_common(buf, 0, BUFLEN << 1, FREQ);
 }
 
 void
-givealbuffer_cd(void *buf)
+givealbuffer_music(const void *buf)
 {
-    givealbuffer_common(buf, 1, CD_BUFLEN << 1, CD_FREQ);
+    givealbuffer_common(buf, 1, MUSICBUFLEN << 1, MUSIC_FREQ);
 }
 
 void
-givealbuffer_midi(void *buf, uint32_t size)
+givealbuffer_wt(const void *buf)
 {
-    givealbuffer_common(buf, 2, size, midi_freq);
+    givealbuffer_common(buf, 2, WTBUFLEN << 1, WT_FREQ);
+}
+
+void
+givealbuffer_cd(const void *buf)
+{
+    givealbuffer_common(buf, 3, CD_BUFLEN << 1, CD_FREQ);
+}
+
+void
+givealbuffer_midi(const void *buf, const uint32_t size)
+{
+    givealbuffer_common(buf, 4, (int) size, midi_freq);
 }
diff --git a/src/sound/resid-fp/AUTHORS b/src/sound/resid-fp/AUTHORS
index cd2ca3fcc..b04ee0f01 100644
--- a/src/sound/resid-fp/AUTHORS
+++ b/src/sound/resid-fp/AUTHORS
@@ -1,4 +1,6 @@
-Authors of reSID.
+Authors of reSIDfp.
 
 Dag Lem: Designed and programmed complete emulation engine.
-Antti S. Lankila: Support 6581 filter distortion, envelope & voice nonlinearities, output amp clipping effects.
+Antti S. Lankila: Distortion simulation and calculation of combined waveforms
+Ken Händel: source code conversion to Java
+Leandro Nini: port to c++, merge with reSID 1.0
diff --git a/src/sound/resid-fp/CMakeLists.txt b/src/sound/resid-fp/CMakeLists.txt
index 699fcae54..b91b48bba 100644
--- a/src/sound/resid-fp/CMakeLists.txt
+++ b/src/sound/resid-fp/CMakeLists.txt
@@ -13,7 +13,10 @@
 #          Copyright 2020-2021 David Hrdlička.
 #
 
-add_library(resid-fp STATIC convolve-sse.cc convolve.cc envelope.cc extfilt.cc
-    filter.cc pot.cc sid.cc voice.cc wave.cc wave6581_PST.cc
-    wave6581_PS_.cc wave6581_P_T.cc wave6581__ST.cc wave8580_PST.cc
-    wave8580_PS_.cc wave8580_P_T.cc wave8580__ST.cc)
\ No newline at end of file
+set(CMAKE_CXX_STANDARD 17)
+
+add_library(resid-fp STATIC Dac.cpp EnvelopeGenerator.cpp ExternalFilter.cpp
+    Filter.cpp Filter6581.cpp Filter8580.cpp FilterModelConfig.cpp
+    FilterModelConfig6581.cpp FilterModelConfig8580.cpp
+    Integrator6581.cpp Integrator8580.cpp OpAmp.cpp SID.cpp
+    Spline.cpp WaveformCalculator.cpp WaveformGenerator.cpp resample/SincResampler.cpp)
diff --git a/src/sound/resid-fp/COPYING b/src/sound/resid-fp/COPYING
index d60c31a97..d159169d1 100644
--- a/src/sound/resid-fp/COPYING
+++ b/src/sound/resid-fp/COPYING
@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/src/sound/resid-fp/ChangeLog b/src/sound/resid-fp/ChangeLog
deleted file mode 100644
index c12e828b9..000000000
--- a/src/sound/resid-fp/ChangeLog
+++ /dev/null
@@ -1,136 +0,0 @@
-2008-12-05  Antti S. Lankila  <alankila@bel.fi>
-
-	* Sync against V27 patch version. Filter updates described below.
-
-	* Reduce Q maximum to 2.2 or so. This may still be slightly too much,
-	  but it's hard to say exactly...
-
-	* Arrange for about 3 dB boost of lowpass output that is independent
-	  of state variable mixing or other feedback. This seems to produce
-	  the right kind of sounds for songs like AMJ's Blasphemy.
-
-	* Assume that bp is slightly louder than bp (= more distorted).
-	  This seems to help against very large number of songs which sport
-	  lead sounds and effects distorted in a smooth, bassy way.
-
-	* Parameter tuneup.
-
-2008-10-31  Antti S. Lankila  <alankila@bel.fi>
-
-	* Sync against V25 patch version. Filter updates described below.
-
-	* Tweak filter algorithm to do some state variable mixing in the
-	  6581 code path. This corresponds with assumed output impedance of
-	  the SID "amplifiers", and is separate effect to the output strip
-	  backmixing.
-	
-	* Retire the V24 attempt of dynamically adjusting BP distortion
-	  threshold. It doesn't really seem to work.
-
-	* Increase Q value maximum to 2.5. This may be too much, but it sounds
-	  fine to me.
-
-	* JT's Star Ball was very distorted when played by V24.  This related
-	  to the hardclipping I had assumed to occur in the filter output amp,
-	  but maybe that theory is incorrect. I now only add distortion to the
-	  unfiltered voice path, but I'm not happy about it.
-
-2008-08-29  Antti S. Lankila  <alankila@bel.fi>
-
-	* Optimized resampling to be about 2x faster through using aliasing
-	  to increase passband width and hence reduce FIR length.
-	  
-	* Fixed some valgrind warnings.
-	
-	* Added nuke_denormals() method to periodically flush these to zero, as
-	  this can only be done for SSE registers by the FPU and we can't use
-	  any in order to support CPUs older than P3.
-
-	* Marco, Hannu and me developed a runtime switching system
-	  that detects SSE from cpuinfo and calls some SSE routines when they
-	  are compiled in and the CPU can support them. We lost only very
-	  little performance, but gained compatibility to very, very old
-	  hardware.
-	  
-	* The old code for ST_lockup proved unnecessary, so it is now removed. 
-
-2008-08-21  Antti S. Lankila  <alankila@bel.fi>
-
-	* Fixed a bug where nonlinearity setting appeared to get lost, and
-	  kenchis discovered further bugs in it. Oh well.
-
-	* I removed a lot of code associated with the lower quality modes of
-	  ReSID, and only left the 1 MHz clock routines. Analysis shows that the
-	  filter code is a major culprit, but the digital side emulation is not
-	  completely cheap, either. I already added some small hacks to optimize
-	  it, and I now think about reinjecting pieces of those clocking modes
-	  that run the analog parts with reduced accuracy.
-
-	* I defined type4 filters based on equation of straight line. These are
-	  characterized by parameters k and b, and the equation is
-	  freq = k * fc. Strictly speaking, straight line is not 100 %
-	  accurate, and a 2nd degree component would help, but based on
-	  measurements against two of Trurl's 8580s, the maximum error
-	  introduced using linear approximation is mere 3 %.
-
-2008-08-10  Antti S. Lankila  <alankila@bel.fi>
-
-	* I ripped off Type1 definitions from the filter, and the spline.h
-	  and PointPlotter were unnecessary and so removed.
-
-	* I also added a bit of hardclipping in the output that seems to be
-	  required to get Fred Gray's Break Thru. This might not occur so
-	  strongly on all chips, so it should probably be added as a proper
-	  tunable. For now, I just settled for a slight effect to collect
-	  feedback. 
-
-2008-07-15  Antti S. Lankila  <alankila@bel.fi>
-
-	* This release is a bit slower than usual. The culprit is the changes in
-	  voice.h where a new kinked-dac style calculation is used to simulate
-	  the nonlinear shape of the waveform outputs. The cost of the new
-	  calculation varies by song as I was lazy and only cached the result of
-	  previous calculation, so speed depends on the pitch of the waveforms
-	  and the precise waveform chosen.
-
-	* exp() is back, but this time it is implemented as an integer
-	  calculation according to Schraudolph's paper "A Fast, Compact
-	  Approximation of the Exponential Function". Using near-proper exp()
-	  simplified the distortion algorithm. I think it all sounds much better
-	  now.
-
-	* A new effect where I mix bp-hp and lp-bp together by their difference
-	  to simulate a small resistor between them appears to improve SidRiders
-	  and several other songs, largerly eliminating some types of hard
-	  distortion sounds that do not occur on the chip. It also helped
-	  Mechanicus. I am trying to understand where this term comes from... 
-
-2008-07-09  Antti S. Lankila  <alankila@bel.fi>
-
-	* I now have somewhat less arbitrary values for the distortion
-	  tunables. They are now related to the relative signal levels in the
-	  simulation. I'm still sorting out the particulars of the values I
-	  ended up with ("why 128 instead of 256").
-
-2008-03-02  Antti S. Lankila  <alankila@bel.fi>
-
-	* Exposed the filter at sid.cc to callers through get_filter()
-	  method, and fixed a few types. 
-
-2008-02-19  Antti S. Lankila  <alankila@bel.fi>
-
-	* For some reason ReSID code adjusted the external filter frequency
-	  based on calculated passband, while in the real C64 the filter is
-	  fixed to about 16 kHz.
-
-2008-02-06  Antti S. Lankila  <alankila@bel.fi>
-
-	* I got interested to improve ReSID after chatting with Kevtris. He is
-	  aiming to replicate the filter using analog hardware. He has the EE
-	  experience that I have sorely lacked and made an infinitely valuable
-	  contribution by telling me exactly how the distortion works.
-
-2004-06-11  Dag Lem  <resid@nimrod.no>
-
-	* Version 0.16 released. (From this point forwards, read
-	  ../resid/ChangeLog.)
diff --git a/src/sound/resid-fp/Dac.cpp b/src/sound/resid-fp/Dac.cpp
new file mode 100644
index 000000000..5ae5429b6
--- /dev/null
+++ b/src/sound/resid-fp/Dac.cpp
@@ -0,0 +1,122 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2024 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004,2010 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include "Dac.h"
+
+#include "sidcxx11.h"
+
+namespace reSIDfp
+{
+
+constexpr double MOSFET_LEAKAGE_6581 = 0.0075;
+constexpr double MOSFET_LEAKAGE_8580 = 0.0035;
+
+Dac::Dac(unsigned int bits) :
+    dac(new double[bits]),
+    dacLength(bits)
+{}
+
+Dac::~Dac()
+{
+    delete [] dac;
+}
+
+double Dac::getOutput(unsigned int input) const
+{
+    double dacValue = 0.;
+
+    for (unsigned int i = 0; i < dacLength; i++)
+    {
+        const bool transistor_on = (input & (1 << i)) != 0;
+        dacValue += transistor_on ? dac[i] : dac[i] * leakage;
+    }
+
+    return dacValue;
+}
+
+void Dac::kinkedDac(ChipModel chipModel)
+{
+    constexpr double R_INFINITY = 1e6;
+
+    // Non-linearity parameter, 8580 DACs are perfectly linear
+    const double _2R_div_R = chipModel == MOS6581 ? 2.20 : 2.00;
+
+    // 6581 DACs are not terminated by a 2R resistor
+    const bool term = chipModel == MOS8580;
+
+    leakage = chipModel == MOS6581 ? MOSFET_LEAKAGE_6581 : MOSFET_LEAKAGE_8580;
+
+    double Vsum = 0.;
+
+    // Calculate voltage contribution by each individual bit in the R-2R ladder.
+    for (unsigned int set_bit = 0; set_bit < dacLength; set_bit++)
+    {
+        double Vn = 1.;                   // Normalized bit voltage.
+        double R = 1.;                    // Normalized R
+        const double _2R = _2R_div_R * R; // 2R
+        double Rn = term ?                // Rn = 2R for correct termination,
+                    _2R : R_INFINITY;     // INFINITY for missing termination.
+
+        unsigned int bit;
+
+        // Calculate DAC "tail" resistance by repeated parallel substitution.
+        for (bit = 0; bit < set_bit; bit++)
+        {
+            Rn = (Rn == R_INFINITY) ?
+                 R + _2R :
+                 R + (_2R * Rn) / (_2R + Rn); // R + 2R || Rn
+        }
+
+        // Source transformation for bit voltage.
+        if (Rn == R_INFINITY)
+        {
+            Rn = _2R;
+        }
+        else
+        {
+            Rn = (_2R * Rn) / (_2R + Rn); // 2R || Rn
+            Vn = Vn * Rn / _2R;
+        }
+
+        // Calculate DAC output voltage by repeated source transformation from
+        // the "tail".
+
+        for (++bit; bit < dacLength; bit++)
+        {
+            Rn += R;
+            const double I = Vn / Rn;
+            Rn = (_2R * Rn) / (_2R + Rn); // 2R || Rn
+            Vn = Rn * I;
+        }
+
+        dac[set_bit] = Vn;
+        Vsum += Vn;
+    }
+
+    // Normalize to integerish behavior
+    for (unsigned int i = 0; i < dacLength; i++)
+    {
+        dac[i] /= Vsum;
+    }
+}
+
+} // namespace reSIDfp
diff --git a/src/sound/resid-fp/Dac.h b/src/sound/resid-fp/Dac.h
new file mode 100644
index 000000000..757f12e4e
--- /dev/null
+++ b/src/sound/resid-fp/Dac.h
@@ -0,0 +1,120 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2016 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004,2010 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef DAC_H
+#define DAC_H
+
+#include "siddefs-fp.h"
+
+namespace reSIDfp
+{
+
+/**
+ * Estimate DAC nonlinearity.
+ * The SID DACs are built up as R-2R ladder as follows:
+ *
+ *         n  n-1      2   1   0    VGND
+ *         |   |       |   |   |      |   Termination
+ *        2R  2R      2R  2R  2R     2R   only for
+ *         |   |       |   |   |      |   MOS 8580
+ *     Vo -o-R-o-R-...-o-R-o-R--    --+
+ *
+ *
+ * All MOS 6581 DACs are missing a termination resistor at bit 0. This causes
+ * pronounced errors for the lower 4 - 5 bits (e.g. the output for bit 0 is
+ * actually equal to the output for bit 1), resulting in DAC discontinuities
+ * for the lower bits.
+ * In addition to this, the 6581 DACs exhibit further severe discontinuities
+ * for higher bits, which may be explained by a less than perfect match between
+ * the R and 2R resistors, or by output impedance in the NMOS transistors
+ * providing the bit voltages. A good approximation of the actual DAC output is
+ * achieved for 2R/R ~ 2.20.
+ *
+ * The MOS 8580 DACs, on the other hand, do not exhibit any discontinuities.
+ * These DACs include the correct termination resistor, and also seem to have
+ * very accurately matched R and 2R resistors (2R/R = 2.00).
+ *
+ * On the 6581 the output of the waveform and envelope DACs go through
+ * a voltage follower built with two NMOS:
+ *
+ *             Vdd
+ *
+ *              |
+ *            |-+
+ * Vin -------|    T1 (enhancement-mode)
+ *            |-+
+ *              |
+ *              o-------- Vout
+ *              |
+ *            |-+
+ *        +---|    T2 (depletion-mode)
+ *        |   |-+
+ *        |     |
+ *
+ *       GND   GND
+ */
+class Dac
+{
+private:
+    /**
+     * DAC leakage
+     *
+     * "Even in standard transistors a small amount of current leaks even when they are technically switched off."
+     *
+     * https://en.wikipedia.org/wiki/Subthreshold_conduction
+     */
+    double leakage;
+
+    /// analog values
+    double * const dac;
+
+    /// the dac array length
+    const unsigned int dacLength;
+
+public:
+    /**
+     * Initialize DAC model.
+     *
+     * @param bits the number of input bits
+     */
+    Dac(unsigned int bits);
+    ~Dac();
+
+    /**
+     * Build DAC model for specific chip.
+     *
+     * @param chipModel 6581 or 8580
+     */
+    void kinkedDac(ChipModel chipModel);
+
+    /**
+     * Get the Vo output for a  given combination of input bits.
+     *
+     * @param input the digital input
+     * @return the analog output value
+     */
+    double getOutput(unsigned int input) const;
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/EnvelopeGenerator.cpp b/src/sound/resid-fp/EnvelopeGenerator.cpp
new file mode 100644
index 000000000..e7f5f4e8a
--- /dev/null
+++ b/src/sound/resid-fp/EnvelopeGenerator.cpp
@@ -0,0 +1,155 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2020 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2018 VICE Project
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004,2010 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#define ENVELOPEGENERATOR_CPP
+
+#include "EnvelopeGenerator.h"
+
+namespace reSIDfp
+{
+
+/**
+ * Lookup table to convert from attack, decay, or release value to rate
+ * counter period.
+ *
+ * The rate counter is a 15 bit register which is left shifted each cycle.
+ * When the counter reaches a specific comparison value,
+ * the envelope counter is incremented (attack) or decremented
+ * (decay/release) and the rate counter is resetted.
+ *
+ * see [kevtris.org](http://blog.kevtris.org/?p=13)
+ */
+const unsigned int EnvelopeGenerator::adsrtable[16] =
+{
+    0x007f,
+    0x3000,
+    0x1e00,
+    0x0660,
+    0x0182,
+    0x5573,
+    0x000e,
+    0x3805,
+    0x2424,
+    0x2220,
+    0x090c,
+    0x0ecd,
+    0x010e,
+    0x23f7,
+    0x5237,
+    0x64a8
+};
+
+void EnvelopeGenerator::reset()
+{
+    // counter is not changed on reset
+    envelope_pipeline = 0;
+
+    state_pipeline = 0;
+
+    attack = 0;
+    decay = 0;
+    sustain = 0;
+    release = 0;
+
+    gate = false;
+
+    resetLfsr = true;
+
+    exponential_counter = 0;
+    exponential_counter_period = 1;
+    new_exponential_counter_period = 0;
+
+    state = State::RELEASE;
+    counter_enabled = true;
+    rate = adsrtable[release];
+}
+
+void EnvelopeGenerator::writeCONTROL_REG(unsigned char control)
+{
+    const bool gate_next = (control & 0x01) != 0;
+
+    if (gate_next != gate)
+    {
+        gate = gate_next;
+
+        // The rate counter is never reset, thus there will be a delay before the
+        // envelope counter starts counting up (attack) or down (release).
+
+        if (gate_next)
+        {
+            // Gate bit on:  Start attack, decay, sustain.
+            next_state = State::ATTACK;
+            state_pipeline = 2;
+
+            if (resetLfsr || (exponential_pipeline == 2))
+            {
+                envelope_pipeline = (exponential_counter_period == 1) || (exponential_pipeline == 2) ? 2 : 4;
+            }
+            else if (exponential_pipeline == 1)
+            {
+                state_pipeline = 3;
+            }
+        }
+        else
+        {
+            // Gate bit off: Start release.
+            next_state = State::RELEASE;
+            state_pipeline = envelope_pipeline > 0 ? 3 : 2;
+        }
+    }
+}
+
+void EnvelopeGenerator::writeATTACK_DECAY(unsigned char attack_decay)
+{
+    attack = (attack_decay >> 4) & 0x0f;
+    decay = attack_decay & 0x0f;
+
+    if (state == State::ATTACK)
+    {
+        rate = adsrtable[attack];
+    }
+    else if (state == State::DECAY_SUSTAIN)
+    {
+        rate = adsrtable[decay];
+    }
+}
+
+void EnvelopeGenerator::writeSUSTAIN_RELEASE(unsigned char sustain_release)
+{
+    // From the sustain levels it follows that both the low and high 4 bits
+    // of the envelope counter are compared to the 4-bit sustain value.
+    // This has been verified by sampling ENV3.
+    //
+    // For a detailed description see:
+    // http://ploguechipsounds.blogspot.it/2010/11/new-research-on-sid-adsr.html
+    sustain = (sustain_release & 0xf0) | ((sustain_release >> 4) & 0x0f);
+
+    release = sustain_release & 0x0f;
+
+    if (state == State::RELEASE)
+    {
+        rate = adsrtable[release];
+    }
+}
+
+} // namespace reSIDfp
diff --git a/src/sound/resid-fp/EnvelopeGenerator.h b/src/sound/resid-fp/EnvelopeGenerator.h
new file mode 100644
index 000000000..554b814b1
--- /dev/null
+++ b/src/sound/resid-fp/EnvelopeGenerator.h
@@ -0,0 +1,394 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2022 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2018 VICE Project
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004,2010 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef ENVELOPEGENERATOR_H
+#define ENVELOPEGENERATOR_H
+
+#include "siddefs-fp.h"
+
+namespace reSIDfp
+{
+
+/**
+ * A 15 bit [LFSR] is used to implement the envelope rates, in effect dividing
+ * the clock to the envelope counter by the currently selected rate period.
+ *
+ * In addition, another 5 bit counter is used to implement the exponential envelope decay,
+ * in effect further dividing the clock to the envelope counter.
+ * The period of this counter is set to 1, 2, 4, 8, 16, 30 at the envelope counter
+ * values 255, 93, 54, 26, 14, 6, respectively.
+ *
+ * [LFSR]: https://en.wikipedia.org/wiki/Linear_feedback_shift_register
+ */
+class EnvelopeGenerator
+{
+private:
+    /**
+     * The envelope state machine's distinct states. In addition to this,
+     * envelope has a hold mode, which freezes envelope counter to zero.
+     */
+    enum class State
+    {
+        ATTACK, DECAY_SUSTAIN, RELEASE
+    };
+
+private:
+    /// XOR shift register for ADSR prescaling.
+    unsigned int lfsr = 0x7fff;
+
+    /// Comparison value (period) of the rate counter before next event.
+    unsigned int rate = 0;
+
+    /**
+     * During release mode, the SID approximates envelope decay via piecewise
+     * linear decay rate.
+     */
+    unsigned int exponential_counter = 0;
+
+    /**
+     * Comparison value (period) of the exponential decay counter before next
+     * decrement.
+     */
+    unsigned int exponential_counter_period = 1;
+    unsigned int new_exponential_counter_period = 0;
+
+    unsigned int state_pipeline = 0;
+
+    ///
+    unsigned int envelope_pipeline = 0;
+
+    unsigned int exponential_pipeline = 0;
+
+    /// Current envelope state
+    State state = State::RELEASE;
+    State next_state = State::RELEASE;
+
+    /// Whether counter is enabled. Only switching to ATTACK can release envelope.
+    bool counter_enabled = true;
+
+    /// Gate bit
+    bool gate = false;
+
+    ///
+    bool resetLfsr = false;
+
+    /// The current digital value of envelope output.
+    unsigned char envelope_counter = 0xaa;
+
+    /// Attack register
+    unsigned char attack = 0;
+
+    /// Decay register
+    unsigned char decay = 0;
+
+    /// Sustain register
+    unsigned char sustain = 0;
+
+    /// Release register
+    unsigned char release = 0;
+
+    /// The ENV3 value, sampled at the first phase of the clock
+    unsigned char env3 = 0;
+
+private:
+    static const unsigned int adsrtable[16];
+
+private:
+    void set_exponential_counter();
+
+    void state_change();
+
+public:
+    /**
+     * SID clocking.
+     */
+    void clock();
+
+    /**
+     * Get the Envelope Generator digital output.
+     */
+    unsigned int output() const { return envelope_counter; }
+
+    /**
+     * SID reset.
+     */
+    void reset();
+
+    /**
+     * Write control register.
+     *
+     * @param control
+     *            control register value
+     */
+    void writeCONTROL_REG(unsigned char control);
+
+    /**
+     * Write Attack/Decay register.
+     *
+     * @param attack_decay
+     *            attack/decay value
+     */
+    void writeATTACK_DECAY(unsigned char attack_decay);
+
+    /**
+     * Write Sustain/Release register.
+     *
+     * @param sustain_release
+     *            sustain/release value
+     */
+    void writeSUSTAIN_RELEASE(unsigned char sustain_release);
+
+    /**
+     * Return the envelope current value.
+     *
+     * @return envelope counter value
+     */
+    unsigned char readENV() const { return env3; }
+};
+
+} // namespace reSIDfp
+
+#if RESID_INLINING || defined(ENVELOPEGENERATOR_CPP)
+
+namespace reSIDfp
+{
+
+RESID_INLINE
+void EnvelopeGenerator::clock()
+{
+    env3 = envelope_counter;
+
+    if (unlikely(new_exponential_counter_period > 0))
+    {
+        exponential_counter_period = new_exponential_counter_period;
+        new_exponential_counter_period = 0;
+    }
+
+    if (unlikely(state_pipeline))
+    {
+        state_change();
+    }
+
+    if (unlikely(envelope_pipeline != 0) && (--envelope_pipeline == 0))
+    {
+        if (likely(counter_enabled))
+        {
+            if (state == State::ATTACK)
+            {
+                if (++envelope_counter==0xff)
+                {
+                    next_state = State::DECAY_SUSTAIN;
+                    state_pipeline = 3;
+                }
+            }
+            else if ((state == State::DECAY_SUSTAIN) || (state == State::RELEASE))
+            {
+                if (--envelope_counter==0x00)
+                {
+                    counter_enabled = false;
+                }
+            }
+
+            set_exponential_counter();
+        }
+    }
+    else if (unlikely(exponential_pipeline != 0) && (--exponential_pipeline == 0))
+    {
+        exponential_counter = 0;
+
+        if (((state == State::DECAY_SUSTAIN) && (envelope_counter != sustain))
+            || (state == State::RELEASE))
+        {
+            // The envelope counter can flip from 0x00 to 0xff by changing state to
+            // attack, then to release. The envelope counter will then continue
+            // counting down in the release state.
+            // This has been verified by sampling ENV3.
+
+            envelope_pipeline = 1;
+        }
+    }
+    else if (unlikely(resetLfsr))
+    {
+        lfsr = 0x7fff;
+        resetLfsr = false;
+
+        if (state == State::ATTACK)
+        {
+            // The first envelope step in the attack state also resets the exponential
+            // counter. This has been verified by sampling ENV3.
+            exponential_counter = 0; // NOTE this is actually delayed one cycle, not modeled
+
+            // The envelope counter can flip from 0xff to 0x00 by changing state to
+            // release, then to attack. The envelope counter is then frozen at
+            // zero; to unlock this situation the state must be changed to release,
+            // then to attack. This has been verified by sampling ENV3.
+
+            envelope_pipeline = 2;
+        }
+        else
+        {
+            if (counter_enabled && (++exponential_counter == exponential_counter_period))
+                exponential_pipeline = exponential_counter_period != 1 ? 2 : 1;
+        }
+    }
+
+    // ADSR delay bug.
+    // If the rate counter comparison value is set below the current value of the
+    // rate counter, the counter will continue counting up until it wraps around
+    // to zero at 2^15 = 0x8000, and then count rate_period - 1 before the
+    // envelope can constly be stepped.
+    // This has been verified by sampling ENV3.
+
+    // check to see if LFSR matches table value
+    if (likely(lfsr != rate))
+    {
+        // it wasn't a match, clock the LFSR once
+        // by performing XOR on last 2 bits
+        const unsigned int feedback = ((lfsr << 14) ^ (lfsr << 13)) & 0x4000;
+        lfsr = (lfsr >> 1) | feedback;
+    }
+    else
+    {
+        resetLfsr = true;
+    }
+}
+
+/**
+ * This is what happens on chip during state switching,
+ * based on die reverse engineering and transistor level
+ * emulation.
+ *
+ * Attack
+ *
+ *  0 - Gate on
+ *  1 - Counting direction changes
+ *      During this cycle the decay rate is "accidentally" activated
+ *  2 - Counter is being inverted
+ *      Now the attack rate is correctly activated
+ *      Counter is enabled
+ *  3 - Counter will be counting upward from now on
+ *
+ * Decay
+ *
+ *  0 - Counter == $ff
+ *  1 - Counting direction changes
+ *      The attack state is still active
+ *  2 - Counter is being inverted
+ *      During this cycle the decay state is activated
+ *  3 - Counter will be counting downward from now on
+ *
+ * Release
+ *
+ *  0 - Gate off
+ *  1 - During this cycle the release state is activated if coming from sustain/decay
+ * *2 - Counter is being inverted, the release state is activated
+ * *3 - Counter will be counting downward from now on
+ *
+ *  (* only if coming directly from Attack state)
+ *
+ * Freeze
+ *
+ *  0 - Counter == $00
+ *  1 - Nothing
+ *  2 - Counter is disabled
+ */
+RESID_INLINE
+void EnvelopeGenerator::state_change()
+{
+    state_pipeline--;
+
+    switch (next_state)
+    {
+    case State::ATTACK:
+        if (state_pipeline == 1)
+        {
+            // The decay rate is "accidentally" enabled during first cycle of attack phase
+            rate = adsrtable[decay];
+        }
+        else if (state_pipeline == 0)
+        {
+            state = State::ATTACK;
+            // The attack rate is correctly enabled during second cycle of attack phase
+            rate = adsrtable[attack];
+            counter_enabled = true;
+        }
+        break;
+    case State::DECAY_SUSTAIN:
+        if (state_pipeline == 0)
+        {
+            state = State::DECAY_SUSTAIN;
+            rate = adsrtable[decay];
+        }
+        break;
+    case State::RELEASE:
+        if (((state == State::ATTACK) && (state_pipeline == 0))
+            || ((state == State::DECAY_SUSTAIN) && (state_pipeline == 1)))
+        {
+            state = State::RELEASE;
+            rate = adsrtable[release];
+        }
+        break;
+    }
+}
+
+RESID_INLINE
+void EnvelopeGenerator::set_exponential_counter()
+{
+    // Check for change of exponential counter period.
+    //
+    // For a detailed description see:
+    // http://ploguechipsounds.blogspot.it/2010/03/sid-6581r3-adsr-tables-up-close.html
+    switch (envelope_counter)
+    {
+    case 0xff:
+    case 0x00:
+        new_exponential_counter_period = 1;
+        break;
+
+    case 0x5d:
+        new_exponential_counter_period = 2;
+        break;
+
+    case 0x36:
+        new_exponential_counter_period = 4;
+        break;
+
+    case 0x1a:
+        new_exponential_counter_period = 8;
+        break;
+
+    case 0x0e:
+        new_exponential_counter_period = 16;
+        break;
+
+    case 0x06:
+        new_exponential_counter_period = 30;
+        break;
+    }
+}
+
+} // namespace reSIDfp
+
+#endif
+
+#endif
diff --git a/src/sound/resid-fp/ExternalFilter.cpp b/src/sound/resid-fp/ExternalFilter.cpp
new file mode 100644
index 000000000..7f44715b5
--- /dev/null
+++ b/src/sound/resid-fp/ExternalFilter.cpp
@@ -0,0 +1,66 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2020 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#define EXTERNALFILTER_CPP
+
+#include "ExternalFilter.h"
+
+namespace reSIDfp
+{
+
+/**
+ * Get the 3 dB attenuation point.
+ *
+ * @param res the resistance value in Ohms
+ * @param cap the capacitance value in Farads
+ */
+inline double getRC(double res, double cap)
+{
+    return res * cap;
+}
+
+ExternalFilter::ExternalFilter()
+{
+    reset();
+}
+
+void ExternalFilter::setClockFrequency(double frequency)
+{
+    const double dt = 1. / frequency;
+
+    // Low-pass:  R = 10kOhm, C = 1000pF; w0l = dt/(dt+RC) = 1e-6/(1e-6+1e4*1e-9) = 0.091
+    // Cutoff 1/2*PI*RC = 1/2*PI*1e4*1e-9 = 15915.5 Hz
+    w0lp_1_s7 = static_cast<int>((dt / (dt + getRC(10e3, 1000e-12))) * (1 << 7) + 0.5);
+
+    // High-pass: R = 10kOhm, C = 10uF;   w0h = dt/(dt+RC) = 1e-6/(1e-6+1e4*1e-5) = 0.00000999
+    // Cutoff 1/2*PI*RC = 1/2*PI*1e4*1e-5 = 1.59155 Hz
+    w0hp_1_s17 = static_cast<int>((dt / (dt + getRC(10e3, 10e-6))) * (1 << 17) + 0.5);
+}
+
+void ExternalFilter::reset()
+{
+    // State of filter.
+    Vlp = 0; //1 << (15 + 11);
+    Vhp = 0;
+}
+
+} // namespace reSIDfp
diff --git a/src/sound/resid-fp/ExternalFilter.h b/src/sound/resid-fp/ExternalFilter.h
new file mode 100644
index 000000000..17e8b1649
--- /dev/null
+++ b/src/sound/resid-fp/ExternalFilter.h
@@ -0,0 +1,126 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2020 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef EXTERNALFILTER_H
+#define EXTERNALFILTER_H
+
+#include "siddefs-fp.h"
+
+namespace reSIDfp
+{
+
+/**
+ * The audio output stage in a Commodore 64 consists of two STC networks, a
+ * low-pass RC filter with 3 dB frequency 16kHz followed by a DC-blocker which
+ * acts as a high-pass filter with a cutoff dependent on the attached audio
+ * equipment impedance. Here we suppose an impedance of 10kOhm resulting
+ * in a 3 dB attenuation at 1.6Hz.
+ *
+ * ~~~
+ *                                 9/12V
+ * -----+
+ * audio|       10k                  |
+ *      +---o----R---o--------o-----(K)          +-----
+ *  out |   |        |        |      |           |audio
+ * -----+   R 1k     C 1000   |      |    10 uF  |
+ *          |        |  pF    +-C----o-----C-----+ 10k
+ *                             470   |           |
+ *         GND      GND         pF   R 1K        | amp
+ *          *                   **   |           +-----
+ *
+ *                                  GND
+ * ~~~
+ *
+ * The STC networks are connected with a [BJT] based [common collector]
+ * used as a voltage follower (featuring a 2SC1815 NPN transistor).
+ *
+ * * To operate properly the 6581 audio output needs a pull-down resistor
+ *   (1KOhm recommended, not needed on 8580)
+ * ** The C64c board additionally includes a [bootstrap] condenser to increase
+ *    the input impedance of the common collector.
+ *
+ * [BJT]: https://en.wikipedia.org/wiki/Bipolar_junction_transistor
+ * [common collector]: https://en.wikipedia.org/wiki/Common_collector
+ * [bootstrap]: https://en.wikipedia.org/wiki/Bootstrapping_(electronics)
+ */
+class ExternalFilter
+{
+private:
+    /// Lowpass filter voltage
+    int Vlp;
+
+    /// Highpass filter voltage
+    int Vhp;
+
+    int w0lp_1_s7 = 0;
+
+    int w0hp_1_s17 = 0;
+
+public:
+    /**
+     * SID clocking.
+     *
+     * @param input
+     */
+    int clock(int input);
+
+    /**
+     * Constructor.
+     */
+    ExternalFilter();
+
+    /**
+     * Setup of the external filter sampling parameters.
+     *
+     * @param frequency the main system clock frequency
+     */
+    void setClockFrequency(double frequency);
+
+    /**
+     * SID reset.
+     */
+    void reset();
+};
+
+} // namespace reSIDfp
+
+#if RESID_INLINING || defined(EXTERNALFILTER_CPP)
+
+namespace reSIDfp
+{
+
+RESID_INLINE
+int ExternalFilter::clock(int input)
+{
+    const int Vi = (input<<11) - (1 << (11+15));
+    const int dVlp = (w0lp_1_s7 * (Vi - Vlp) >> 7);
+    const int dVhp = (w0hp_1_s17 * (Vlp - Vhp) >> 17);
+    Vlp += dVlp;
+    Vhp += dVhp;
+    return (Vlp - Vhp) >> 11;
+}
+
+} // namespace reSIDfp
+
+#endif
+
+#endif
diff --git a/src/sound/resid-fp/Filter.cpp b/src/sound/resid-fp/Filter.cpp
new file mode 100644
index 000000000..6255c5729
--- /dev/null
+++ b/src/sound/resid-fp/Filter.cpp
@@ -0,0 +1,126 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2024 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#define FILTER_CPP
+
+#include "Filter.h"
+
+namespace reSIDfp
+{
+
+void Filter::updateMixing()
+{
+    currentVolume = volume[vol];
+
+    unsigned int Nsum = 0;
+    unsigned int Nmix = 0;
+
+    (filt1 ? Nsum : Nmix)++;
+    (filt2 ? Nsum : Nmix)++;
+
+    if (filt3) Nsum++;
+    else if (!voice3off) Nmix++;
+
+    (filtE ? Nsum : Nmix)++;
+
+    currentSummer = summer[Nsum];
+
+    if (lp) Nmix++;
+    if (bp) Nmix++;
+    if (hp) Nmix++;
+
+    currentMixer = mixer[Nmix];
+}
+
+void Filter::writeFC_LO(unsigned char fc_lo)
+{
+    fc = (fc & 0x7f8) | (fc_lo & 0x007);
+    updateCenterFrequency();
+}
+
+void Filter::writeFC_HI(unsigned char fc_hi)
+{
+    fc = (fc_hi << 3 & 0x7f8) | (fc & 0x007);
+    updateCenterFrequency();
+}
+
+void Filter::writeRES_FILT(unsigned char res_filt)
+{
+    filt = res_filt;
+
+    updateResonance((res_filt >> 4) & 0x0f);
+
+    if (enabled)
+    {
+        filt1 = (filt & 0x01) != 0;
+        filt2 = (filt & 0x02) != 0;
+        filt3 = (filt & 0x04) != 0;
+        filtE = (filt & 0x08) != 0;
+    }
+
+    updateMixing();
+}
+
+void Filter::writeMODE_VOL(unsigned char mode_vol)
+{
+    vol = mode_vol & 0x0f;
+    lp = (mode_vol & 0x10) != 0;
+    bp = (mode_vol & 0x20) != 0;
+    hp = (mode_vol & 0x40) != 0;
+    voice3off = (mode_vol & 0x80) != 0;
+
+    updateMixing();
+}
+
+Filter::Filter(FilterModelConfig& fmc) :
+    mixer(fmc.getMixer()),
+    summer(fmc.getSummer()),
+    resonance(fmc.getResonance()),
+    volume(fmc.getVolume()),
+    fmc(fmc)
+{
+    input(0);
+}
+
+void Filter::enable(bool enable)
+{
+    enabled = enable;
+
+    if (enabled)
+    {
+        writeRES_FILT(filt);
+    }
+    else
+    {
+        filt1 = filt2 = filt3 = filtE = false;
+    }
+}
+
+void Filter::reset()
+{
+    writeFC_LO(0);
+    writeFC_HI(0);
+    writeMODE_VOL(0);
+    writeRES_FILT(0);
+}
+
+} // namespace reSIDfp
diff --git a/src/sound/resid-fp/Filter.h b/src/sound/resid-fp/Filter.h
new file mode 100644
index 000000000..6873d9906
--- /dev/null
+++ b/src/sound/resid-fp/Filter.h
@@ -0,0 +1,192 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2024 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef FILTER_H
+#define FILTER_H
+
+#include "FilterModelConfig.h"
+
+#include "siddefs-fp.h"
+
+namespace reSIDfp
+{
+
+/**
+ * SID filter base class
+ */
+class Filter
+{
+private:
+    unsigned short** mixer;
+    unsigned short** summer;
+    unsigned short** resonance;
+    unsigned short** volume;
+
+protected:
+    FilterModelConfig& fmc;
+
+    /// Current filter/voice mixer setting.
+    unsigned short* currentMixer = nullptr;
+
+    /// Filter input summer setting.
+    unsigned short* currentSummer = nullptr;
+
+    /// Filter resonance value.
+    unsigned short* currentResonance = nullptr;
+
+    /// Current volume amplifier setting.
+    unsigned short* currentVolume = nullptr;
+
+    /// Filter highpass state.
+    int Vhp = 0;
+
+    /// Filter bandpass state.
+    int Vbp = 0;
+
+    /// Filter lowpass state.
+    int Vlp = 0;
+
+    /// Filter external input.
+    int Ve = 0;
+
+    /// Filter cutoff frequency.
+    unsigned int fc = 0;
+
+    /// Routing to filter or outside filter
+    //@{
+    bool filt1 = false;
+    bool filt2 = false;
+    bool filt3 = false;
+    bool filtE = false;
+    //@}
+
+    /// Switch voice 3 off.
+    bool voice3off = false;
+
+    /// Highpass, bandpass, and lowpass filter modes.
+    //@{
+    bool hp = false;
+    bool bp = false;
+    bool lp = false;
+    //@}
+
+private:
+    /// Current volume.
+    unsigned char vol = 0;
+
+    /// Filter enabled.
+    bool enabled = true;
+
+    /// Selects which inputs to route through filter.
+    unsigned char filt = 0;
+
+protected:
+    /**
+     * Update filter cutoff frequency.
+     */
+    virtual void updateCenterFrequency() = 0;
+
+    /**
+     * Update filter resonance.
+     *
+     * @param res the new resonance value
+     */
+    void updateResonance(unsigned char res) { currentResonance = resonance[res]; }
+
+    /**
+     * Mixing configuration modified (offsets change)
+     */
+    void updateMixing();
+
+    /**
+     * Get the filter cutoff register value
+     */
+    unsigned int getFC() const { return fc; }
+
+public:
+    Filter(FilterModelConfig& fmc);
+
+    virtual ~Filter() = default;
+
+    /**
+     * SID clocking - 1 cycle
+     *
+     * @param v1 voice 1 in
+     * @param v2 voice 2 in
+     * @param v3 voice 3 in
+     * @return filtered output
+     */
+    virtual unsigned short clock(int v1, int v2, int v3) = 0;
+
+    /**
+     * Enable filter.
+     *
+     * @param enable
+     */
+    void enable(bool enable);
+
+    /**
+     * SID reset.
+     */
+    void reset();
+
+    /**
+     * Write Frequency Cutoff Low register.
+     *
+     * @param fc_lo Frequency Cutoff Low-Byte
+     */
+    void writeFC_LO(unsigned char fc_lo);
+
+    /**
+     * Write Frequency Cutoff High register.
+     *
+     * @param fc_hi Frequency Cutoff High-Byte
+     */
+    void writeFC_HI(unsigned char fc_hi);
+
+    /**
+     * Write Resonance/Filter register.
+     *
+     * @param res_filt Resonance/Filter
+     */
+    void writeRES_FILT(unsigned char res_filt);
+
+    /**
+     * Write filter Mode/Volume register.
+     *
+     * @param mode_vol Filter Mode/Volume
+     */
+    void writeMODE_VOL(unsigned char mode_vol);
+
+    /**
+     * Apply a signal to EXT-IN
+     *
+     * @param input a signed 16 bit sample
+     */
+    void input(short input) { Ve = fmc.getNormalizedVoice(input/32768.f, 0); }
+
+    inline int getNormalizedVoice(float value, unsigned int env) const { return fmc.getNormalizedVoice(value, env); }
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/Filter6581.cpp b/src/sound/resid-fp/Filter6581.cpp
new file mode 100644
index 000000000..b761c22ea
--- /dev/null
+++ b/src/sound/resid-fp/Filter6581.cpp
@@ -0,0 +1,86 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2024 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004,2010 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include "Filter6581.h"
+
+#include "Integrator6581.h"
+
+namespace reSIDfp
+{
+
+unsigned short Filter6581::clock(int voice1, int voice2, int voice3)
+{
+    const int V1 = voice1;
+    const int V2 = voice2;
+    // Voice 3 is silenced by voice3off if it is not routed through the filter.
+    const int V3 = (filt3 || !voice3off) ? voice3 : 0;
+
+    int Vsum = 0;
+    int Vmix = 0;
+
+    (filt1 ? Vsum : Vmix) += V1;
+    (filt2 ? Vsum : Vmix) += V2;
+    (filt3 ? Vsum : Vmix) += V3;
+    (filtE ? Vsum : Vmix) += Ve;
+
+    Vhp = currentSummer[currentResonance[Vbp] + Vlp + Vsum];
+    Vbp = hpIntegrator.solve(Vhp);
+    Vlp = bpIntegrator.solve(Vbp);
+
+    int Vfilt = 0;
+    if (lp) Vfilt += Vlp;
+    if (bp) Vfilt += Vbp;
+    if (hp) Vfilt += Vhp;
+
+    // The filter input resistors are slightly bigger than the voice ones
+    // Scale the values accordingly
+    constexpr int filterGain = static_cast<int>(0.93 * (1 << 12));
+    Vfilt = (Vfilt * filterGain) >> 12;
+
+    return currentVolume[currentMixer[Vmix + Vfilt]];
+}
+
+Filter6581::~Filter6581()
+{
+    delete [] f0_dac;
+}
+
+void Filter6581::updateCenterFrequency()
+{
+    const unsigned short Vw = f0_dac[getFC()];
+    hpIntegrator.setVw(Vw);
+    bpIntegrator.setVw(Vw);
+}
+
+void Filter6581::setFilterCurve(double curvePosition)
+{
+    delete [] f0_dac;
+    f0_dac = FilterModelConfig6581::getInstance()->getDAC(curvePosition);
+    updateCenterFrequency();
+}
+
+void Filter6581::setFilterRange(double adjustment)
+{
+    FilterModelConfig6581::getInstance()->setFilterRange(adjustment);
+}
+
+} // namespace reSIDfp
diff --git a/src/sound/resid-fp/Filter6581.h b/src/sound/resid-fp/Filter6581.h
new file mode 100644
index 000000000..27b97b991
--- /dev/null
+++ b/src/sound/resid-fp/Filter6581.h
@@ -0,0 +1,368 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2024 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004,2010 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef FILTER6581_H
+#define FILTER6581_H
+
+#include "Filter.h"
+#include "FilterModelConfig6581.h"
+#include "Integrator6581.h"
+
+#include "sidcxx11.h"
+
+namespace reSIDfp
+{
+
+class Integrator6581;
+
+/**
+ * The SID filter is modeled with a two-integrator-loop biquadratic filter,
+ * which has been confirmed by Bob Yannes to be the actual circuit used in
+ * the SID chip.
+ *
+ * Measurements show that excellent emulation of the SID filter is achieved,
+ * except when high resonance is combined with high sustain levels.
+ * In this case the SID op-amps are performing less than ideally and are
+ * causing some peculiar behavior of the SID filter. This however seems to
+ * have more effect on the overall amplitude than on the color of the sound.
+ *
+ * The theory for the filter circuit can be found in "Microelectric Circuits"
+ * by Adel S. Sedra and Kenneth C. Smith.
+ * The circuit is modeled based on the explanation found there except that
+ * an additional inverter is used in the feedback from the bandpass output,
+ * allowing the summer op-amp to operate in single-ended mode. This yields
+ * filter outputs with levels independent of Q, which corresponds with the
+ * results obtained from a real SID.
+ *
+ * We have been able to model the summer and the two integrators of the circuit
+ * to form components of an IIR filter.
+ * Vhp is the output of the summer, Vbp is the output of the first integrator,
+ * and Vlp is the output of the second integrator in the filter circuit.
+ *
+ * According to Bob Yannes, the active stages of the SID filter are not really
+ * op-amps. Rather, simple NMOS inverters are used. By biasing an inverter
+ * into its region of quasi-linear operation using a feedback resistor from
+ * input to output, a MOS inverter can be made to act like an op-amp for
+ * small signals centered around the switching threshold.
+ *
+ * In 2008, Michael Huth facilitated closer investigation of the SID 6581
+ * filter circuit by publishing high quality microscope photographs of the die.
+ * Tommi Lempinen has done an impressive work on re-vectorizing and annotating
+ * the die photographs, substantially simplifying further analysis of the
+ * filter circuit.
+ * 
+ * The filter schematics below are reverse engineered from these re-vectorized
+ * and annotated die photographs. While the filter first depicted in reSID 0.9
+ * is a correct model of the basic filter, the schematics are now completed
+ * with the audio mixer and output stage, including details on intended
+ * relative resistor values. Also included are schematics for the NMOS FET
+ * voltage controlled resistors (VCRs) used to control cutoff frequency, the
+ * DAC which controls the VCRs, the NMOS op-amps, and the output buffer.
+ *
+ *
+ * SID filter / mixer / output
+ * ---------------------------
+ * ~~~
+ *               +---------------------------------------------------+
+ *               |                                                   |
+ *               |                        +--1R1-- \--+ D7           |
+ *               |             +---R1--+  |           |              |
+ *               |             |       |  o--2R1-- \--o D6           |
+ *               |   +---------o--<A]--o--o           |     $17      |
+ *               |   |                    o--4R1-- \--o D5  1=open   | (3.5R1)
+ *               |   |                    |           |              |
+ *               |   |                    +--8R1-- \--o D4           | (7.0R1)
+ *               |   |                                |              |
+ * $17           |   |                    (CAP2B)     |  (CAP1B)     |
+ * 0=to mixer    |   +--R8--+  +---R8--+      +---C---o      +---C---o
+ * 1=to filter   |          |  |       |      |       |      |       |
+ *                ------R8--o--o--[A>--o--Rw--o--[A>--o--Rw--o--[A>--o
+ *     ve (EXT IN)          |          |              |              |
+ * D3  \ ---------------R8--o          |              | (CAP2A)      | (CAP1A)
+ *     |   v3               |          | vhp          | vbp          | vlp
+ * D2  |   \ -----------R8--o    +-----+              |              |
+ *     |   |   v2           |    |                    |              |
+ * D1  |   |   \ -------R8--o    |   +----------------+              |
+ *     |   |   |   v1       |    |   |                               |
+ * D0  |   |   |   \ ---R8--+    |   |   +---------------------------+
+ *     |   |   |   |             |   |   |
+ *     R6  R6  R6  R6            R6* R6* R6*
+ *     |   |   |   | $18         |   |   |  $18
+ *     |    \  |   | D7: 1=open   \   \   \ D6 - D4: 0=open
+ *     |   |   |   |             |   |   |
+ *     +---o---o---o-------------o---o---+                         12V
+ *                 |
+ *                 |               D3 +--/ --1R2--+                 |
+ *                 |   +---R8--+      |           |  +---R2--+      |
+ *                 |   |       |   D2 o--/ --2R2--o  |       |  ||--+
+ *                 +---o--[A>--o------o           o--o--[A>--o--||
+ *                                 D1 o--/ --4R2--o (4.25R2)    ||--+
+ *                        $18         |           |                 |
+ *                        0=open   D0 +--/ --8R2--+ (8.75R2)        |
+ *
+ *                                                                  vo (AUDIO
+ *                                                                      OUT)
+ *
+ *
+ * v1  - voice 1
+ * v2  - voice 2
+ * v3  - voice 3
+ * ve  - ext in
+ * vhp - highpass output
+ * vbp - bandpass output
+ * vlp - lowpass output
+ * vo  - audio out
+ * [A> - single ended inverting op-amp (self-biased NMOS inverter)
+ * Rn  - "resistors", implemented with custom NMOS FETs
+ * Rw  - cutoff frequency resistor (VCR)
+ * C   - capacitor
+ * ~~~
+ * Notes:
+ *
+ *     R2  ~  2.0*R1
+ *     R6  ~  6.0*R1
+ *     R6* ~  1.07*R6
+ *     R8  ~  8.0*R1
+ *     R24 ~ 24.0*R1
+ *
+ * The Rn "resistors" in the circuit are implemented with custom NMOS FETs,
+ * probably because of space constraints on the SID die. The silicon substrate
+ * is laid out in a narrow strip or "snake", with a strip length proportional
+ * to the intended resistance. The polysilicon gate electrode covers the entire
+ * silicon substrate and is fixed at 12V in order for the NMOS FET to operate
+ * in triode mode (a.k.a. linear mode or ohmic mode).
+ *
+ * Even in "linear mode", an NMOS FET is only an approximation of a resistor,
+ * as the apparant resistance increases with increasing drain-to-source
+ * voltage. If the drain-to-source voltage should approach the gate voltage
+ * of 12V, the NMOS FET will enter saturation mode (a.k.a. active mode), and
+ * the NMOS FET will not operate anywhere like a resistor.
+ *
+ *
+ *
+ * NMOS FET voltage controlled resistor (VCR)
+ * ------------------------------------------
+ * ~~~
+ *                Vw
+ *
+ *                |
+ *                |
+ *                R1
+ *                |
+ *         +--R1--o
+ *         |    __|__
+ *         |    -----
+ *         |    |   |
+ * vi -----o----+   +--o----- vo
+ *         |           |
+ *         +----R24----+
+ *
+ *
+ * vi  - input
+ * vo  - output
+ * Rn  - "resistors", implemented with custom NMOS FETs
+ * Vw  - voltage from 11-bit DAC (frequency cutoff control)
+ * ~~~
+ * Notes:
+ *
+ * An approximate value for R24 can be found by using the formula for the
+ * filter cutoff frequency:
+ *
+ *     FCmin = 1/(2*pi*Rmax*C)
+ *
+ * Assuming that a the setting for minimum cutoff frequency in combination with
+ * a low level input signal ensures that only negligible current will flow
+ * through the transistor in the schematics above, values for FCmin and C can
+ * be substituted in this formula to find Rmax.
+ * Using C = 470pF and FCmin = 220Hz (measured value), we get:
+ *
+ *     FCmin = 1/(2*pi*Rmax*C)
+ *     Rmax = 1/(2*pi*FCmin*C) = 1/(2*pi*220*470e-12) ~ 1.5MOhm
+ *
+ * From this it follows that:
+ *     R24 =  Rmax   ~ 1.5MOhm
+ *     R1  ~  R24/24 ~  64kOhm
+ *     R2  ~  2.0*R1 ~ 128kOhm
+ *     R6  ~  6.0*R1 ~ 384kOhm
+ *     R8  ~  8.0*R1 ~ 512kOhm
+ *
+ * Note that these are only approximate values for one particular SID chip,
+ * due to process variations the values can be substantially different in
+ * other chips.
+ *
+ *
+ *
+ * Filter frequency cutoff DAC
+ * ---------------------------
+ *
+ * ~~~
+ *    12V  10   9   8   7   6   5   4   3   2   1   0   VGND
+ *      |   |   |   |   |   |   |   |   |   |   |   |     |   Missing
+ *     2R  2R  2R  2R  2R  2R  2R  2R  2R  2R  2R  2R    2R   termination
+ *      |   |   |   |   |   |   |   |   |   |   |   |     |
+ * Vw --o-R-o-R-o-R-o-R-o-R-o-R-o-R-o-R-o-R-o-R-o-R-o-   -+
+ *
+ *
+ * Bit on:  12V
+ * Bit off:  5V (VGND)
+ * ~~~
+ * As is the case with all MOS 6581 DACs, the termination to (virtual) ground
+ * at bit 0 is missing.
+ *
+ * Furthermore, the control of the two VCRs imposes a load on the DAC output
+ * which varies with the input signals to the VCRs. This can be seen from the
+ * VCR figure above.
+ *
+ * 
+ * 
+ * "Op-amp" (self-biased NMOS inverter)
+ * ------------------------------------
+ * ~~~
+ *
+ *                        12V
+ *
+ *                         |
+ *             +-----------o
+ *             |           |
+ *             |    +------o
+ *             |    |      |
+ *             |    |  ||--+
+ *             |    +--||
+ *             |       ||--+
+ *         ||--+           |
+ * vi -----||              o---o----- vo
+ *         ||--+           |   |
+ *             |       ||--+   |
+ *             |-------||      |
+ *             |       ||--+   |
+ *         ||--+           |   |
+ *      +--||              |   |
+ *      |  ||--+           |   |
+ *      |      |           |   |
+ *      |      +-----------o   |
+ *      |                  |   |
+ *      |                      |
+ *      |                 GND  |
+ *      |                      |
+ *      +----------------------+
+ *
+ *
+ * vi  - input
+ * vo  - output
+ * ~~~
+ * Notes:
+ *
+ * The schematics above are laid out to show that the "op-amp" logically
+ * consists of two building blocks; a saturated load NMOS inverter (on the
+ * right hand side of the schematics) with a buffer / bias input stage
+ * consisting of a variable saturated load NMOS inverter (on the left hand
+ * side of the schematics).
+ *
+ * Provided a reasonably high input impedance and a reasonably low output
+ * impedance, the "op-amp" can be modeled as a voltage transfer function
+ * mapping input voltage to output voltage.
+ *
+ *
+ *
+ * Output buffer (NMOS voltage follower)
+ * -------------------------------------
+ * ~~~
+ *
+ *            12V
+ * 
+ *             |
+ *             |
+ *         ||--+
+ * vi -----||
+ *         ||--+
+ *             |
+ *             o------ vo
+ *             |     (AUDIO
+ *            Rext    OUT)
+ *             |
+ *             |
+ * 
+ *            GND
+ *
+ * vi   - input
+ * vo   - output
+ * Rext - external resistor, 1kOhm
+ * ~~~
+ * Notes:
+ *
+ * The external resistor Rext is needed to complete the NMOS voltage follower,
+ * this resistor has a recommended value of 1kOhm.
+ *
+ * Die photographs show that actually, two NMOS transistors are used in the
+ * voltage follower. However the two transistors are coupled in parallel (all
+ * terminals are pairwise common), which implies that we can model the two
+ * transistors as one.
+ */
+class Filter6581 final : public Filter
+{
+private:
+    /// VCR + associated capacitor connected to highpass output.
+    Integrator6581 hpIntegrator;
+
+    /// VCR + associated capacitor connected to bandpass output.
+    Integrator6581 bpIntegrator;
+
+    const unsigned short* f0_dac;
+
+protected:
+    /**
+     * Set filter cutoff frequency.
+     */
+    void updateCenterFrequency() override;
+
+public:
+    Filter6581() :
+        Filter(*FilterModelConfig6581::getInstance()),
+        hpIntegrator(*FilterModelConfig6581::getInstance()),
+        bpIntegrator(*FilterModelConfig6581::getInstance()),
+        f0_dac(FilterModelConfig6581::getInstance()->getDAC(0.5))
+    {}
+
+    ~Filter6581() override;
+
+    unsigned short clock(int v1, int v2, int v3) override;
+
+    /**
+     * Set filter curve type based on single parameter.
+     *
+     * @param curvePosition 0 .. 1, where 0 sets center frequency high ("bright") and 1 sets it low ("dark").
+     *                      Default is 0.5
+     */
+    void setFilterCurve(double curvePosition);
+
+    /**
+     * Set filter offset and range based on single parameter.
+     *
+     * @param adjustment 0 .. 1, where 0 sets center frequency low ("dark"), 1 sets it high ("bright").
+     *                   This also affects the range. Default is 0.5
+     */
+    void setFilterRange(double adjustment);
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/Filter8580.cpp b/src/sound/resid-fp/Filter8580.cpp
new file mode 100644
index 000000000..c54e2b741
--- /dev/null
+++ b/src/sound/resid-fp/Filter8580.cpp
@@ -0,0 +1,101 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2024 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004,2010 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include "Filter8580.h"
+
+#include "Integrator8580.h"
+
+namespace reSIDfp
+{
+
+unsigned short Filter8580::clock(int voice1, int voice2, int voice3)
+{
+    const int V1 = voice1;
+    const int V2 = voice2;
+    // Voice 3 is silenced by voice3off if it is not routed through the filter.
+    const int V3 = (filt3 || !voice3off) ? voice3 : 0;
+
+    int Vsum = 0;
+    int Vmix = 0;
+
+    (filt1 ? Vsum : Vmix) += V1;
+    (filt2 ? Vsum : Vmix) += V2;
+    (filt3 ? Vsum : Vmix) += V3;
+    (filtE ? Vsum : Vmix) += Ve;
+
+    Vhp = currentSummer[currentResonance[Vbp] + Vlp + Vsum];
+    Vbp = hpIntegrator.solve(Vhp);
+    Vlp = bpIntegrator.solve(Vbp);
+
+    if (lp) Vmix += Vlp;
+    if (bp) Vmix += Vbp;
+    if (hp) Vmix += Vhp;
+
+    return currentVolume[currentMixer[Vmix]];
+}
+
+/**
+ * W/L ratio of frequency DAC bit 0,
+ * other bit are proportional.
+ * When no bit are selected a resistance with half
+ * W/L ratio is selected.
+ */
+const double DAC_WL0 = 0.00615;
+
+Filter8580::~Filter8580() = default;
+
+void Filter8580::updateCenterFrequency()
+{
+    double wl;
+    double dacWL = DAC_WL0;
+    if (getFC())
+    {
+        wl = 0.;
+        for (unsigned int i = 0; i < 11; i++)
+        {
+            if (getFC() & (1 << i))
+            {
+                wl += dacWL;
+            }
+            dacWL *= 2.;
+        }
+    }
+    else
+    {
+        wl = dacWL/2.;
+    }
+
+    hpIntegrator.setFc(wl);
+    bpIntegrator.setFc(wl);
+}
+
+void Filter8580::setFilterCurve(double curvePosition)
+{
+    // Adjust cp
+    // 1.2 <= cp <= 1.8
+    cp = 1.8 - curvePosition * 3./5.;
+
+    hpIntegrator.setV(cp);
+    bpIntegrator.setV(cp);
+}
+
+} // namespace reSIDfp
diff --git a/src/sound/resid-fp/Filter8580.h b/src/sound/resid-fp/Filter8580.h
new file mode 100644
index 000000000..59dbfceee
--- /dev/null
+++ b/src/sound/resid-fp/Filter8580.h
@@ -0,0 +1,317 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2024 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004,2010 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef FILTER8580_H
+#define FILTER8580_H
+
+#include "Filter.h"
+#include "FilterModelConfig8580.h"
+#include "Integrator8580.h"
+
+#include "sidcxx11.h"
+
+namespace reSIDfp
+{
+
+class Integrator8580;
+
+/**
+ * Filter for 8580 chip
+ * --------------------
+ * The 8580 filter stage had been redesigned to be more linear and robust
+ * against temperature change. It also features real op-amps and a
+ * revisited resonance model.
+ * The filter schematics below are reverse engineered from re-vectorized
+ * and annotated die photographs. Credits to Michael Huth for the microscope
+ * photographs of the die, Tommi Lempinen for re-vectorizating and annotating
+ * the images and ttlworks from forum.6502.org for the circuit analysis.
+ *
+ * ~~~
+ *
+ *               +---------------------------------------------------+
+ *               |    $17      +----Rf-+                             |
+ *               |             |       |                             |
+ *               |      D4&!D5 o- \-R3-o                             |
+ *               |             |       |                    $17      |
+ *               |     !D4&!D5 o- \-R2-o                             |
+ *               |             |       |  +---R8-- \--+  !D6&D7      |
+ *               |      D4&!D5 o- \-R1-o  |           |              |
+ *               |             |       |  o---RC-- \--o   D6&D7      |
+ *               |   +---------o--<A]--o--o           |              |
+ *               |   |                    o---R4-- \--o  D6&!D7      |
+ *               |   |                    |           |              |
+ *               |   |                    +---Ri-- \--o !D6&!D7      |
+ *               |   |                                |              |
+ * $17           |   |                    (CAP2B)     |  (CAP1B)     |
+ * 0=to mixer    |   +--R7--+  +---R7--+      +---C---o      +---C---o
+ * 1=to filter   |          |  |       |      |       |      |       |
+ *               +------R7--o--o--[A>--o--Rfc-o--[A>--o--Rfc-o--[A>--o
+ *     ve (EXT IN)          |          |              |              |
+ * D3  \ --------------R12--o          |              | (CAP2A)      | (CAP1A)
+ *     |   v3               |          | vhp          | vbp          | vlp
+ * D2  |   \ -----------R7--o    +-----+              |              |
+ *     |   |   v2           |    |                    |              |
+ * D1  |   |   \ -------R7--o    |   +----------------+              |
+ *     |   |   |   v1       |    |   |                               |
+ * D0  |   |   |   \ ---R7--+    |   |   +---------------------------+
+ *     |   |   |   |             |   |   |
+ *     R9  R5  R5  R5            R5  R5  R5
+ *     |   |   |   | $18         |   |   |  $18
+ *     |    \  |   | D7: 1=open   \   \   \ D6 - D4: 0=open
+ *     |   |   |   |             |   |   |
+ *     +---o---o---o-------------o---o---+
+ *                 |
+ *                 |               D3 +--/ --1R4--+
+ *                 |   +---R8--+      |           |  +---R2--+
+ *                 |   |       |   D2 o--/ --2R4--o  |       |
+ *                 +---o--[A>--o------o           o--o--[A>--o-- vo (AUDIO OUT)
+ *                                 D1 o--/ --4R4--o
+ *                        $18         |           |
+ *                        0=open   D0 +--/ --8R4--+
+ *
+ *
+ *
+ * Resonance
+ * ---------
+ * For resonance, we have two tiny DACs that controls both the input
+ * and feedback resistances.
+ *
+ * The "resistors" are switched in as follows by bits in register $17:
+ *
+ * feedback:
+ * R1: bit4&!bit5
+ * R2: !bit4&bit5
+ * R3: bit4&bit5
+ * Rf: always on
+ *
+ * input:
+ * R4: bit6&!bit7
+ * R8: !bit6&bit7
+ * RC: bit6&bit7
+ * Ri: !(R4|R8|RC) = !(bit6|bit7) = !bit6&!bit7
+ *
+ *
+ * The relative "resistor" values are approximately (using channel length):
+ *
+ * R1 = 15.3*Ri
+ * R2 =  7.3*Ri
+ * R3 =  4.7*Ri
+ * Rf =  1.4*Ri
+ * R4 =  1.4*Ri
+ * R8 =  2.0*Ri
+ * RC =  2.8*Ri
+ *
+ *
+ * Approximate values for 1/Q can now be found as follows (assuming an
+ * ideal op-amp):
+ *
+ * res  feedback  input  -gain (1/Q)
+ * ---  --------  -----  ----------
+ *  0   Rf        Ri     Rf/Ri      = 1/(Ri*(1/Rf))      = 1/0.71
+ *  1   Rf|R1     Ri     (Rf|R1)/Ri = 1/(Ri*(1/Rf+1/R1)) = 1/0.78
+ *  2   Rf|R2     Ri     (Rf|R2)/Ri = 1/(Ri*(1/Rf+1/R2)) = 1/0.85
+ *  3   Rf|R3     Ri     (Rf|R3)/Ri = 1/(Ri*(1/Rf+1/R3)) = 1/0.92
+ *  4   Rf        R4     Rf/R4      = 1/(R4*(1/Rf))      = 1/1.00
+ *  5   Rf|R1     R4     (Rf|R1)/R4 = 1/(R4*(1/Rf+1/R1)) = 1/1.10
+ *  6   Rf|R2     R4     (Rf|R2)/R4 = 1/(R4*(1/Rf+1/R2)) = 1/1.20
+ *  7   Rf|R3     R4     (Rf|R3)/R4 = 1/(R4*(1/Rf+1/R3)) = 1/1.30
+ *  8   Rf        R8     Rf/R8      = 1/(R8*(1/Rf))      = 1/1.43
+ *  9   Rf|R1     R8     (Rf|R1)/R8 = 1/(R8*(1/Rf+1/R1)) = 1/1.56
+ *  A   Rf|R2     R8     (Rf|R2)/R8 = 1/(R8*(1/Rf+1/R2)) = 1/1.70
+ *  B   Rf|R3     R8     (Rf|R3)/R8 = 1/(R8*(1/Rf+1/R3)) = 1/1.86
+ *  C   Rf        RC     Rf/RC      = 1/(RC*(1/Rf))      = 1/2.00
+ *  D   Rf|R1     RC     (Rf|R1)/RC = 1/(RC*(1/Rf+1/R1)) = 1/2.18
+ *  E   Rf|R2     RC     (Rf|R2)/RC = 1/(RC*(1/Rf+1/R2)) = 1/2.38
+ *  F   Rf|R3     RC     (Rf|R3)/RC = 1/(RC*(1/Rf+1/R3)) = 1/2.60
+ *
+ *
+ * These data indicate that the following function for 1/Q has been
+ * modeled in the MOS 8580:
+ *
+ *    1/Q = 2^(1/2)*2^(-x/8) = 2^(1/2 - x/8) = 2^((4 - x)/8)
+ *
+ *
+ *
+ * Op-amps
+ * -------
+ * Unlike the 6581, the 8580 has real OpAmps.
+ *
+ * Temperature compensated differential amplifier:
+ *
+ *                9V
+ *
+ *                |
+ *      +-------o-o-o-------+
+ *      |       |   |       |
+ *      |       R   R       |
+ *      +--||   |   |   ||--+
+ *         ||---o   o---||
+ *      +--||   |   |   ||--+
+ *      |       |   |       |
+ *      o-----+ |   |       o--- Va
+ *      |     | |   |       |
+ *      +--|| | |   |   ||--+
+ *         ||-o-+---+---||
+ *      +--||   |   |   ||--+
+ *      |       |   |       |
+ *              |   |
+ *     GND      |   |      GND
+ *          ||--+   +--||
+ * in- -----||         ||------ in+
+ *          ||----o----||
+ *                |
+ *                8 Current sink
+ *                |
+ *
+ *               GND
+ *
+ * Inverter + non-inverting output amplifier:
+ *
+ * Va ---o---||-------------------o--------------------+
+ *       |                        |               9V   |
+ *       |             +----------+----------+     |   |
+ *       |        9V   |          |     9V   | ||--+   |
+ *       |         |   |      9V  |      |   +-||      |
+ *       |         R   |       |  |  ||--+     ||--+   |
+ *       |         |   |   ||--+  +--||            o---o--- Vout
+ *       |         o---o---||        ||--+     ||--+
+ *       |         |       ||--+         o-----||
+ *       |     ||--+           |     ||--+     ||--+
+ *       +-----||              o-----||            |
+ *             ||--+           |     ||--+
+ *                 |           R         |        GND
+ *                             |
+ *                GND                   GND
+ *                            GND
+ *
+ *
+ *
+ * Virtual ground
+ * --------------
+ * A PolySi resitive voltage divider provides the voltage
+ * for the positive input of the filter op-amps.
+ *
+ *     5V
+ *          +----------+
+ *      |   |   |\     |
+ *      R1  +---|-\    |
+ * 5V   |       |A >---o--- Vref
+ *      o-------|+/
+ *  |   |       |/
+ * R10  R4
+ *  |   |
+ *  o---+
+ *  |
+ * R10
+ *  |
+ *
+ * GND
+ *
+ * Rn = n*R1
+ *
+ *
+ *
+ * Rfc - freq control DAC resistance ladder
+ * ----------------------------------------
+ * The 8580 has 11 bits for frequency control, but 12 bit DACs.
+ * If those 11 bits would be '0', the impedance of the DACs would be "infinitely high".
+ * To get around this, there is an 11 input NOR gate below the DACs sensing those 11 bits.
+ * If all are 0, the NOR gate gives the gate control voltage to the 12 bit DAC LSB.
+ *
+ *     ----o---o--...--o---o---o---
+ *         |   |       |   |   |
+ *       Rb10 Rb9 ... Rb1 Rb0  R0
+ *         |   |       |   |   |
+ *     ----o---o--...--o---o---o---
+ *
+ *
+ *
+ * Crystal stabilized precision switched capacitor voltage divider
+ * ---------------------------------------------------------------
+ * There is a FET working as a temperature sensor close to the DACs which changes the gate voltage
+ * of the frequency control DACs according to the temperature of the DACs,
+ * to reduce the effects of temperature on the filter curve.
+ * An asynchronous 3 bit binary counter, running at the speed of PHI2, drives two big capacitors
+ * whose AC resistance is then used as a voltage divider.
+ * This implicates that frequency difference between PAL and NTSC might shift the filter curve by 4% or such.
+ *
+ *                                |\  OpAmp has a smaller capacitor than the other OPs
+ *                        Vref ---|+\
+ *                                |A >---o--- Vdac
+ *                        +-------|-/    |
+ *                        |       |/     |
+ *                        |              |
+ *       C1               |     C2       |
+ *   +---||---o---+   +---o-----||-------o
+ *   |        |   |   |   |              |
+ *   o----+   |   -----   |              |
+ *   |    |   |   -----   +----+   +-----o
+ *   |    -----     |          |   |     |
+ *   |    -----     |          -----     |
+ *   |      |       |          -----     |
+ *   |    +-----------+          |       |
+ *        | /Q      Q |          +-------+
+ *  GND   +-----------+      FET close to DAC
+ *        |   clk/8   |      working as temperature sensor
+ *        +-----------+
+ */
+class Filter8580 final : public Filter
+{
+private:
+    /// VCR + associated capacitor connected to highpass output.
+    Integrator8580 hpIntegrator;
+
+    /// VCR + associated capacitor connected to bandpass output.
+    Integrator8580 bpIntegrator;
+
+    double cp;
+
+protected:
+    /**
+     * Set filter cutoff frequency.
+     */
+    void updateCenterFrequency() override;
+
+public:
+    Filter8580() :
+        Filter(*FilterModelConfig8580::getInstance()),
+        hpIntegrator(*FilterModelConfig8580::getInstance()),
+        bpIntegrator(*FilterModelConfig8580::getInstance())
+    {
+        setFilterCurve(0.5);
+    }
+
+    ~Filter8580() override;
+
+    unsigned short clock(int v1, int v2, int v3) override;
+
+    /**
+     * Set filter curve type based on single parameter.
+     *
+     * @param curvePosition 0 .. 1, where 0 sets center frequency high ("light") and 1 sets it low ("dark"), default is 0.5
+     */
+    void setFilterCurve(double curvePosition);
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/FilterModelConfig.cpp b/src/sound/resid-fp/FilterModelConfig.cpp
new file mode 100644
index 000000000..2ab459164
--- /dev/null
+++ b/src/sound/resid-fp/FilterModelConfig.cpp
@@ -0,0 +1,104 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2024 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004,2010 Dag Lem
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include "FilterModelConfig.h"
+
+#include <vector>
+
+namespace reSIDfp
+{
+
+FilterModelConfig::FilterModelConfig(
+    double vvr,
+    double c,
+    double vdd,
+    double vth,
+    double ucox,
+    const Spline::Point *opamp_voltage,
+    int opamp_size
+) :
+    C(c),
+    Vdd(vdd),
+    Vth(vth),
+    Vddt(Vdd - Vth),
+    vmin(opamp_voltage[0].x),
+    vmax(std::max(Vddt, opamp_voltage[0].y)),
+    denorm(vmax - vmin),
+    norm(1.0 / denorm),
+    N16(norm * ((1 << 16) - 1)),
+    voice_voltage_range(vvr)
+{
+    setUCox(ucox);
+
+    // Convert op-amp voltage transfer to 16 bit values.
+
+    std::vector<Spline::Point> scaled_voltage(opamp_size);
+
+    for (int i = 0; i < opamp_size; i++)
+    {
+        scaled_voltage[i].x = N16 * (opamp_voltage[i].x - opamp_voltage[i].y) / 2.;
+        // We add 32768 to get a positive number in the range [0-65535]
+        scaled_voltage[i].x += static_cast<double>(1u << 15);
+
+        scaled_voltage[i].y = N16 * (opamp_voltage[i].x - vmin);
+    }
+
+    // Create lookup table mapping capacitor voltage to op-amp input voltage:
+
+    Spline s(scaled_voltage);
+
+    for (int x = 0; x < (1 << 16); x++)
+    {
+        const Spline::Point out = s.evaluate(x);
+        // When interpolating outside range the first elements may be negative
+        double tmp = out.x > 0. ? out.x : 0.;
+        assert(tmp < 65535.5);
+        opamp_rev[x] = static_cast<unsigned short>(tmp + 0.5);
+    }
+}
+
+FilterModelConfig::~FilterModelConfig()
+{
+    for (int i = 0; i < 8; i++)
+    {
+        delete [] mixer[i];
+    }
+
+    for (int i = 0; i < 5; i++)
+    {
+        delete [] summer[i];
+    }
+
+    for (int i = 0; i < 16; i++)
+    {
+        delete [] volume[i];
+        delete [] resonance[i];
+    }
+}
+
+void FilterModelConfig::setUCox(double new_uCox)
+{
+    uCox = new_uCox;
+    currFactorCoeff = denorm * (uCox / 2. * 1.0e-6 / C);
+}
+
+} // namespace reSIDfp
diff --git a/src/sound/resid-fp/FilterModelConfig.h b/src/sound/resid-fp/FilterModelConfig.h
new file mode 100644
index 000000000..1d37a8bf3
--- /dev/null
+++ b/src/sound/resid-fp/FilterModelConfig.h
@@ -0,0 +1,294 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2024 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004,2010 Dag Lem
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef FILTERMODELCONFIG_H
+#define FILTERMODELCONFIG_H
+
+#include <algorithm>
+#include <random>
+#include <cassert>
+
+#include "OpAmp.h"
+#include "Spline.h"
+
+#include "sidcxx11.h"
+
+namespace reSIDfp
+{
+
+class FilterModelConfig
+{
+private:
+    /*
+     * Hack to add quick dither when converting values from float to int
+     * and avoid quantization noise.
+     * Hopefully this can be removed the day we move all the analog part
+     * processing to floats.
+     *
+     * Not sure about the effect of using such small buffer of numbers
+     * since the random sequence repeats every 1024 values but for
+     * now it seems to do the job.
+     */
+    class Randomnoise
+    {
+    private:
+        double buffer[1024];
+        mutable int index = 0;
+    public:
+        Randomnoise()
+        {
+            std::uniform_real_distribution<double> unif(0., 1.);
+            std::default_random_engine re;
+            for (int i=0; i<1024; i++)
+                buffer[i] = unif(re);
+        }
+        double getNoise() const { index = (index + 1) & 0x3ff; return buffer[index]; }
+    };
+
+protected:
+    /// Capacitor value.
+    const double C;
+
+    /// Transistor parameters.
+    //@{
+    /// Thermal voltage: Ut = kT/q = 8.61734315e-5*T ~ 26mV
+    static constexpr double Ut = 26.0e-3;
+
+    const double Vdd;           ///< Positive supply voltage
+    const double Vth;           ///< Threshold voltage
+    const double Vddt;          ///< Vdd - Vth
+    double uCox;                ///< Transconductance coefficient: u*Cox
+    //@}
+
+    // Derived stuff
+    const double vmin, vmax;
+    const double denorm, norm;
+
+    /// Fixed point scaling for 16 bit op-amp output.
+    const double N16;
+
+    const double voice_voltage_range;
+
+    /// Current factor coefficient for op-amp integrators.
+    double currFactorCoeff;
+
+    /// Lookup tables for gain and summer op-amps in output stage / filter.
+    //@{
+    unsigned short* mixer[8];       //-V730_NOINIT this is initialized in the derived class constructor
+    unsigned short* summer[5];      //-V730_NOINIT this is initialized in the derived class constructor
+    unsigned short* volume[16];     //-V730_NOINIT this is initialized in the derived class constructor
+    unsigned short* resonance[16];  //-V730_NOINIT this is initialized in the derived class constructor
+    //@}
+
+    /// Reverse op-amp transfer function.
+    unsigned short opamp_rev[1 << 16]; //-V730_NOINIT this is initialized in the derived class constructor
+
+private:
+    Randomnoise rnd;
+
+private:
+    FilterModelConfig(const FilterModelConfig&) = delete;
+    FilterModelConfig& operator= (const FilterModelConfig&) = delete;
+
+    inline double getVoiceVoltage(float value, unsigned int env) const
+    {
+        return value * voice_voltage_range + getVoiceDC(env);
+    }
+
+protected:
+    /**
+     * @param vvr voice voltage range
+     * @param c   capacitor value
+     * @param vdd Vdd supply voltage
+     * @param vth threshold voltage
+     * @param ucox u*Cox
+     * @param opamp_voltage opamp voltage array
+     * @param opamp_size opamp voltage array size
+     */
+    FilterModelConfig(
+        double vvr,
+        double c,
+        double vdd,
+        double vth,
+        double ucox,
+        const Spline::Point *opamp_voltage,
+        int opamp_size
+    );
+
+    ~FilterModelConfig();
+
+    void setUCox(double new_uCox);
+
+    virtual double getVoiceDC(unsigned int env) const = 0;
+
+    /**
+     * The filter summer operates at n ~ 1, and has 5 fundamentally different
+     * input configurations (2 - 6 input "resistors").
+     *
+     * Note that all "on" transistors are modeled as one. This is not
+     * entirely accurate, since the input for each transistor is different,
+     * and transistors are not linear components. However modeling all
+     * transistors separately would be extremely costly.
+     */
+    inline void buildSummerTable(const OpAmp& opampModel)
+    {
+        const double r_N16 = 1. / N16;
+
+        for (int i = 0; i < 5; i++)
+        {
+            const int idiv = 2 + i;        // 2 - 6 input "resistors".
+            const int size = idiv << 16;
+            const double n = idiv;
+            const double r_idiv = 1. / idiv;
+            opampModel.reset();
+            summer[i] = new unsigned short[size];
+
+            for (int vi = 0; vi < size; vi++)
+            {
+                const double vin = vmin + vi * r_N16 * r_idiv; /* vmin .. vmax */
+                summer[i][vi] = getNormalizedValue(opampModel.solve(n, vin));
+            }
+        }
+    }
+
+    /**
+     * The audio mixer operates at n ~ 8/6 (6581) or 8/5 (8580),
+     * and has 8 fundamentally different input configurations
+     * (0 - 7 input "resistors").
+     *
+     * All "on", transistors are modeled as one - see comments above for
+     * the filter summer.
+     */
+    inline void buildMixerTable(const OpAmp& opampModel, double nRatio)
+    {
+        const double r_N16 = 1. / N16;
+
+        for (int i = 0; i < 8; i++)
+        {
+            const int idiv = (i == 0) ? 1 : i;
+            const int size = (i == 0) ? 1 : i << 16;
+            const double n = i * nRatio;
+            const double r_idiv = 1. / idiv;
+            opampModel.reset();
+            mixer[i] = new unsigned short[size];
+
+            for (int vi = 0; vi < size; vi++)
+            {
+                const double vin = vmin + vi * r_N16 * r_idiv; /* vmin .. vmax */
+                mixer[i][vi] = getNormalizedValue(opampModel.solve(n, vin));
+            }
+        }
+    }
+
+    /**
+     * 4 bit "resistor" ladders in the audio output gain
+     * necessitate 16 gain tables.
+     * From die photographs of the volume "resistor" ladders
+     * it follows that gain ~ vol/12 (6581) or vol/16 (8580)
+     * (assuming ideal op-amps and ideal "resistors").
+     */
+    inline void buildVolumeTable(const OpAmp& opampModel, double nDivisor)
+    {
+        const double r_N16 = 1. / N16;
+
+        for (int n8 = 0; n8 < 16; n8++)
+        {
+            const int size = 1 << 16;
+            const double n = n8 / nDivisor;
+            opampModel.reset();
+            volume[n8] = new unsigned short[size];
+
+            for (int vi = 0; vi < size; vi++)
+            {
+                const double vin = vmin + vi * r_N16; /* vmin .. vmax */
+                volume[n8][vi] = getNormalizedValue(opampModel.solve(n, vin));
+            }
+        }
+    }
+
+    /**
+     * 4 bit "resistor" ladders in the bandpass resonance gain
+     * necessitate 16 gain tables.
+     * From die photographs of the bandpass "resistor" ladders
+     * it follows that 1/Q ~ ~res/8 (6581) or 2^((4 - res)/8) (8580)
+     * (assuming ideal op-amps and ideal "resistors").
+     */
+    inline void buildResonanceTable(const OpAmp& opampModel, const double resonance_n[16])
+    {
+        const double r_N16 = 1. / N16;
+
+        for (int n8 = 0; n8 < 16; n8++)
+        {
+            const int size = 1 << 16;
+            opampModel.reset();
+            resonance[n8] = new unsigned short[size];
+
+            for (int vi = 0; vi < size; vi++)
+            {
+                const double vin = vmin + vi * r_N16; /* vmin .. vmax */
+                resonance[n8][vi] = getNormalizedValue(opampModel.solve(resonance_n[n8], vin));
+            }
+        }
+    }
+
+public:
+    unsigned short** getVolume() { return volume; }
+    unsigned short** getResonance() { return resonance; }
+    unsigned short** getSummer() { return summer; }
+    unsigned short** getMixer() { return mixer; }
+
+    inline unsigned short getOpampRev(int i) const { return opamp_rev[i]; }
+    inline double getVddt() const { return Vddt; }
+    inline double getVth() const { return Vth; }
+
+    // helper functions
+
+    inline unsigned short getNormalizedValue(double value) const
+    {
+        const double tmp = N16 * (value - vmin);
+        assert(tmp >= 0. && tmp <= 65535.);
+        return static_cast<unsigned short>(tmp + rnd.getNoise());
+    }
+
+    inline unsigned short getNormalizedCurrentFactor(double wl) const
+    {
+        const double tmp = (1 << 13) * currFactorCoeff * wl;
+        assert(tmp > -0.5 && tmp < 65535.5);
+        return static_cast<unsigned short>(tmp + 0.5);
+    }
+
+    inline unsigned short getNVmin() const
+    {
+        const double tmp = N16 * vmin;
+        assert(tmp > -0.5 && tmp < 65535.5);
+        return static_cast<unsigned short>(tmp + 0.5);
+    }
+
+    inline int getNormalizedVoice(float value, unsigned int env) const
+    {
+        return static_cast<int>(getNormalizedValue(getVoiceVoltage(value, env)));
+    }
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/FilterModelConfig6581.cpp b/src/sound/resid-fp/FilterModelConfig6581.cpp
new file mode 100644
index 000000000..fcbf32a46
--- /dev/null
+++ b/src/sound/resid-fp/FilterModelConfig6581.cpp
@@ -0,0 +1,291 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2024 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2010 Dag Lem
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include "FilterModelConfig6581.h"
+
+#include "Integrator6581.h"
+#include "OpAmp.h"
+
+#include "sidcxx11.h"
+
+#include <algorithm>
+#include <mutex>
+#include <thread>
+#include <cmath>
+
+namespace reSIDfp
+{
+
+constexpr unsigned int OPAMP_SIZE = 33;
+
+/**
+ * This is the SID 6581 op-amp voltage transfer function, measured on
+ * CAP1B/CAP1A on a chip marked MOS 6581R4AR 0687 14.
+ * All measured chips have op-amps with output voltages (and thus input
+ * voltages) within the range of 0.81V - 10.31V.
+ */
+constexpr Spline::Point opamp_voltage[OPAMP_SIZE] =
+{
+  {  0.81, 10.31 },  // Approximate start of actual range
+  {  2.40, 10.31 },
+  {  2.60, 10.30 },
+  {  2.70, 10.29 },
+  {  2.80, 10.26 },
+  {  2.90, 10.17 },
+  {  3.00, 10.04 },
+  {  3.10,  9.83 },
+  {  3.20,  9.58 },
+  {  3.30,  9.32 },
+  {  3.50,  8.69 },
+  {  3.70,  8.00 },
+  {  4.00,  6.89 },
+  {  4.40,  5.21 },
+  {  4.54,  4.54 },  // Working point (vi = vo)
+  {  4.60,  4.19 },
+  {  4.80,  3.00 },
+  {  4.90,  2.30 },  // Change of curvature
+  {  4.95,  2.03 },
+  {  5.00,  1.88 },
+  {  5.05,  1.77 },
+  {  5.10,  1.69 },
+  {  5.20,  1.58 },
+  {  5.40,  1.44 },
+  {  5.60,  1.33 },
+  {  5.80,  1.26 },
+  {  6.00,  1.21 },
+  {  6.40,  1.12 },
+  {  7.00,  1.02 },
+  {  7.50,  0.97 },
+  {  8.50,  0.89 },
+  { 10.00,  0.81 },
+  { 10.31,  0.81 },  // Approximate end of actual range
+};
+
+std::unique_ptr<FilterModelConfig6581> FilterModelConfig6581::instance(nullptr);
+
+std::mutex Instance6581_Lock;
+
+FilterModelConfig6581* FilterModelConfig6581::getInstance()
+{
+    std::lock_guard<std::mutex> lock(Instance6581_Lock);
+
+    if (!instance.get())
+    {
+        instance.reset(new FilterModelConfig6581());
+    }
+
+    return instance.get();
+}
+
+void FilterModelConfig6581::setFilterRange(double adjustment)
+{
+    // clamp into allowed range
+#ifdef HAVE_CXX17
+     adjustment = std::clamp(adjustment, 0.0, 1.0);
+#else
+     adjustment = std::max(std::min(adjustment, 1.0), 0.);
+#endif
+
+     // Get the new uCox value, in the range [1,40]
+     const double new_uCox = (1. + 39. * adjustment) * 1e-6;
+
+    // Ignore small changes
+    if (std::abs(uCox - new_uCox) < 1e-12)
+        return;
+
+    setUCox(new_uCox);
+}
+
+FilterModelConfig6581::FilterModelConfig6581() :
+    FilterModelConfig(
+        1.5,                    // voice voltage range FIXME should theoretically be ~3,571V
+        470e-12,                // capacitor value
+        12. * VOLTAGE_SKEW,     // Vdd
+        1.31,                   // Vth
+        20e-6,                  // uCox
+        opamp_voltage,
+        OPAMP_SIZE
+    ),
+    WL_vcr(9.0 / 1.0),
+    WL_snake(1.0 / 115.0),
+    dac_zero(6.65),
+    dac_scale(2.63),
+    dac(DAC_BITS)
+{
+    dac.kinkedDac(MOS6581);
+
+    {
+        Dac envDac(8);
+        envDac.kinkedDac(MOS6581);
+        for(int i=0; i<256; i++)
+        {
+            const double envI = envDac.getOutput(i);
+            voiceDC[i] = 5. * VOLTAGE_SKEW + (0.2143 * envI);
+        }
+    }
+
+    // Create lookup tables for gains / summers.
+
+    //
+    // We spawn six threads to calculate these tables in parallel
+    //
+    auto filterSummer = [this]
+    {
+        OpAmp opampModel(
+            std::vector<Spline::Point>(
+                std::begin(opamp_voltage),
+                std::end(opamp_voltage)),
+            Vddt,
+            vmin,
+            vmax);
+
+        buildSummerTable(opampModel);
+    };
+
+    auto filterMixer = [this]
+    {
+        OpAmp opampModel(
+            std::vector<Spline::Point>(
+                std::begin(opamp_voltage),
+                std::end(opamp_voltage)),
+            Vddt,
+            vmin,
+            vmax);
+
+        buildMixerTable(opampModel, 8.0 / 6.0);
+    };
+
+    auto filterGain = [this]
+    {
+        OpAmp opampModel(
+            std::vector<Spline::Point>(
+                std::begin(opamp_voltage),
+                std::end(opamp_voltage)),
+            Vddt,
+            vmin,
+            vmax);
+
+        buildVolumeTable(opampModel, 12.0);
+    };
+
+    auto filterResonance = [this]
+    {
+        OpAmp opampModel(
+            std::vector<Spline::Point>(
+                std::begin(opamp_voltage),
+                std::end(opamp_voltage)),
+            Vddt,
+            vmin,
+            vmax);
+
+        // build temp n table
+        double resonance_n[16];
+        for (int n8 = 0; n8 < 16; n8++)
+        {
+            resonance_n[n8] = (~n8 & 0xf) / 8.0;
+        }
+
+        buildResonanceTable(opampModel, resonance_n);
+    };
+
+    auto filterVcrVg = [this]
+    {
+        const double nVddt = N16 * (Vddt - vmin);
+
+        for (unsigned int i = 0; i < (1 << 16); i++)
+        {
+            // The table index is right-shifted 16 times in order to fit in
+            // 16 bits; the argument to sqrt is thus multiplied by (1 << 16).
+            const double tmp = nVddt - std::sqrt(static_cast<double>(i << 16));
+            assert(tmp > -0.5 && tmp < 65535.5);
+            vcr_nVg[i] = static_cast<unsigned short>(tmp + 0.5);
+        }
+    };
+
+    auto filterVcrIds = [this]
+    {
+        //  EKV model:
+        //
+        //  Ids = Is * (if - ir)
+        //  Is = (2 * u*Cox * Ut^2)/k * W/L
+        //  if = ln^2(1 + e^((k*(Vg - Vt) - Vs)/(2*Ut))
+        //  ir = ln^2(1 + e^((k*(Vg - Vt) - Vd)/(2*Ut))
+
+        // moderate inversion characteristic current
+        // will be multiplied by uCox later
+        const double Is = (2. * Ut * Ut) * WL_vcr;
+
+        // Normalized current factor for 1 cycle at 1MHz.
+        const double N15 = norm * ((1 << 15) - 1);
+        const double n_Is = N15 * 1.0e-6 / C * Is;
+
+        // kVgt_Vx = k*(Vg - Vt) - Vx
+        // I.e. if k != 1.0, Vg must be scaled accordingly.
+        const double  r_N16_2Ut = 1.0 / (N16 * 2.0 * Ut);
+        for (int i = 0; i < (1 << 16); i++)
+        {
+            const int kVgt_Vx = i - (1 << 15);
+            const double log_term = std::log1p(std::exp(kVgt_Vx * r_N16_2Ut));
+            // Scaled by m*2^15
+            vcr_n_Ids_term[i] = n_Is * log_term * log_term;
+        }
+    };
+
+#if defined(HAVE_CXX20) && defined(__cpp_lib_jthread)
+    using sidThread = std::jthread;
+#else
+    using sidThread = std::thread;
+#endif
+
+    sidThread thdSummer(filterSummer);
+    sidThread thdMixer(filterMixer);
+    sidThread thdGain(filterGain);
+    sidThread thdResonance(filterResonance);
+    sidThread thdVcrVg(filterVcrVg);
+    sidThread thdVcrIds(filterVcrIds);
+
+#if !defined(HAVE_CXX20) || !defined(__cpp_lib_jthread)
+    thdSummer.join();
+    thdMixer.join();
+    thdGain.join();
+    thdResonance.join();
+    thdVcrVg.join();
+    thdVcrIds.join();
+#endif
+}
+
+unsigned short* FilterModelConfig6581::getDAC(double adjustment) const
+{
+    const double dac_zero = getDacZero(adjustment);
+
+    unsigned short* f0_dac = new unsigned short[1 << DAC_BITS];
+
+    for (unsigned int i = 0; i < (1 << DAC_BITS); i++)
+    {
+        const double fcd = dac.getOutput(i);
+        f0_dac[i] = getNormalizedValue(dac_zero + fcd * dac_scale);
+    }
+
+    return f0_dac;
+}
+
+} // namespace reSIDfp
diff --git a/src/sound/resid-fp/FilterModelConfig6581.h b/src/sound/resid-fp/FilterModelConfig6581.h
new file mode 100644
index 000000000..75a52dadb
--- /dev/null
+++ b/src/sound/resid-fp/FilterModelConfig6581.h
@@ -0,0 +1,128 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2020 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004,2010 Dag Lem
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef FILTERMODELCONFIG6581_H
+#define FILTERMODELCONFIG6581_H
+
+#include "FilterModelConfig.h"
+
+#include <memory>
+
+#include "Dac.h"
+
+#include "sidcxx11.h"
+
+namespace reSIDfp
+{
+
+class Integrator6581;
+
+/**
+ * Calculate parameters for 6581 filter emulation.
+ */
+class FilterModelConfig6581 final : public FilterModelConfig
+{
+private:
+    static std::unique_ptr<FilterModelConfig6581> instance;
+    // This allows access to the private constructor
+    friend std::unique_ptr<FilterModelConfig6581>::deleter_type;
+
+private:
+    static constexpr unsigned int DAC_BITS = 11;
+
+    /**
+     * Power bricks generate voltages slightly out of spec
+     */
+    static constexpr double VOLTAGE_SKEW = 1.015;
+
+    /// Transistor parameters.
+    //@{
+    const double WL_vcr;        ///< W/L for VCR
+    const double WL_snake;      ///< W/L for "snake"
+    //@}
+
+    /// DAC parameters.
+    //@{
+    const double dac_zero;
+    const double dac_scale;
+    //@}
+
+    /// DAC lookup table
+    Dac dac;
+
+    /// Voltage Controlled Resistors
+    //@{
+    unsigned short vcr_nVg[1 << 16];
+    double vcr_n_Ids_term[1 << 16];
+    //@}
+
+    // Voice DC offset LUT
+    double voiceDC[256];
+
+private:
+    double getDacZero(double adjustment) const { return dac_zero + (1. - adjustment); }
+
+    FilterModelConfig6581();
+    ~FilterModelConfig6581() = default;
+
+protected:
+    /**
+     * On 6581 the DC offset varies between ~5.0V and ~5.214V depending on
+     * the envelope value.
+     */
+    inline double getVoiceDC(unsigned int env) const override
+    {
+        return voiceDC[env];
+    }
+
+public:
+    static FilterModelConfig6581* getInstance();
+
+    void setFilterRange(double adjustment);
+
+    /**
+     * Construct an 11 bit cutoff frequency DAC output voltage table.
+     * Ownership is transferred to the requester which becomes responsible
+     * of freeing the object when done.
+     *
+     * @param adjustment
+     * @return the DAC table
+     */
+    unsigned short* getDAC(double adjustment) const;
+
+    inline double getWL_snake() const { return WL_snake; }
+
+    inline unsigned short getVcr_nVg(int i) const { return vcr_nVg[i]; }
+    inline unsigned short getVcr_n_Ids_term(int i) const
+    {
+        const double tmp = vcr_n_Ids_term[i] * uCox;
+        assert(tmp > -0.5 && tmp < 65535.5);
+        return static_cast<unsigned short>(tmp + 0.5);
+    }
+    // only used if SLOPE_FACTOR is defined
+    inline constexpr double getUt() const { return Ut; }
+    inline double getN16() const { return N16; }
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/FilterModelConfig8580.cpp b/src/sound/resid-fp/FilterModelConfig8580.cpp
new file mode 100644
index 000000000..a0a0c9ad8
--- /dev/null
+++ b/src/sound/resid-fp/FilterModelConfig8580.cpp
@@ -0,0 +1,218 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2023 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2010 Dag Lem
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include "FilterModelConfig8580.h"
+
+#include "Integrator8580.h"
+#include "OpAmp.h"
+
+#include "sidcxx11.h"
+
+#include <mutex>
+#include <thread>
+
+namespace reSIDfp
+{
+
+/*
+ * R1 = 15.3*Ri
+ * R2 =  7.3*Ri
+ * R3 =  4.7*Ri
+ * Rf =  1.4*Ri
+ * R4 =  1.4*Ri
+ * R8 =  2.0*Ri
+ * RC =  2.8*Ri
+ *
+ * res  feedback  input
+ * ---  --------  -----
+ *  0   Rf        Ri
+ *  1   Rf|R1     Ri
+ *  2   Rf|R2     Ri
+ *  3   Rf|R3     Ri
+ *  4   Rf        R4
+ *  5   Rf|R1     R4
+ *  6   Rf|R2     R4
+ *  7   Rf|R3     R4
+ *  8   Rf        R8
+ *  9   Rf|R1     R8
+ *  A   Rf|R2     R8
+ *  B   Rf|R3     R8
+ *  C   Rf        RC
+ *  D   Rf|R1     RC
+ *  E   Rf|R2     RC
+ *  F   Rf|R3     RC
+ */
+constexpr double resGain[16] =
+{
+                        1.4/1.0, //      Rf/Ri   1.4
+    ((1.4*15.3)/(1.4+15.3))/1.0, // (Rf|R1)/Ri   1.28263
+      ((1.4*7.3)/(1.4+7.3))/1.0, // (Rf|R2)/Ri   1.17471
+      ((1.4*4.7)/(1.4+4.7))/1.0, // (Rf|R3)/Ri   1.07869
+                        1.4/1.4, //      Rf/R4   1
+    ((1.4*15.3)/(1.4+15.3))/1.4, // (Rf|R1)/R4   0.916168
+      ((1.4*7.3)/(1.4+7.3))/1.4, // (Rf|R2)/R4   0.83908
+      ((1.4*4.7)/(1.4+4.7))/1.4, // (Rf|R3)/R4   0.770492
+                        1.4/2.0, //      Rf/R8   0.7
+    ((1.4*15.3)/(1.4+15.3))/2.0, // (Rf|R1)/R8   0.641317
+      ((1.4*7.3)/(1.4+7.3))/2.0, // (Rf|R2)/R8   0.587356
+      ((1.4*4.7)/(1.4+4.7))/2.0, // (Rf|R3)/R8   0.539344
+                        1.4/2.8, //      Rf/RC   0.5
+    ((1.4*15.3)/(1.4+15.3))/2.8, // (Rf|R1)/RC   0.458084
+      ((1.4*7.3)/(1.4+7.3))/2.8, // (Rf|R2)/RC   0.41954
+      ((1.4*4.7)/(1.4+4.7))/2.8, // (Rf|R3)/RC   0.385246
+};
+
+constexpr unsigned int OPAMP_SIZE = 21;
+
+/**
+ * This is the SID 8580 op-amp voltage transfer function, measured on
+ * CAP1B/CAP1A on a chip marked CSG 8580R5 1690 25.
+ */
+constexpr Spline::Point opamp_voltage[OPAMP_SIZE] =
+{
+    {  1.30,  8.91 },  // Approximate start of actual range
+    {  4.76,  8.91 },
+    {  4.77,  8.90 },
+    {  4.78,  8.88 },
+    {  4.785, 8.86 },
+    {  4.79,  8.80 },
+    {  4.795, 8.60 },
+    {  4.80,  8.25 },
+    {  4.805, 7.50 },
+    {  4.81,  6.10 },
+    {  4.815, 4.05 },  // Change of curvature
+    {  4.82,  2.27 },
+    {  4.825, 1.65 },
+    {  4.83,  1.55 },
+    {  4.84,  1.47 },
+    {  4.85,  1.43 },
+    {  4.87,  1.37 },
+    {  4.90,  1.34 },
+    {  5.00,  1.30 },
+    {  5.10,  1.30 },
+    {  8.91,  1.30 },  // Approximate end of actual range
+};
+
+std::unique_ptr<FilterModelConfig8580> FilterModelConfig8580::instance(nullptr);
+
+std::mutex Instance8580_Lock;
+
+FilterModelConfig8580* FilterModelConfig8580::getInstance()
+{
+    std::lock_guard<std::mutex> lock(Instance8580_Lock);
+
+    if (!instance.get())
+    {
+        instance.reset(new FilterModelConfig8580());
+    }
+
+    return instance.get();
+}
+
+FilterModelConfig8580::FilterModelConfig8580() :
+    FilterModelConfig(
+        0.24,               // voice voltage range FIXME should theoretically be ~0,474V
+        22e-9,              // capacitor value
+        9. * VOLTAGE_SKEW,  // Vdd
+        0.80,               // Vth
+        100e-6,             // uCox
+        opamp_voltage,
+        OPAMP_SIZE
+    )
+{
+    // Create lookup tables for gains / summers.
+
+    //
+    // We spawn four threads to calculate these tables in parallel
+    //
+    auto filterSummer = [this]
+    {
+        OpAmp opampModel(
+            std::vector<Spline::Point>(
+                std::begin(opamp_voltage),
+                std::end(opamp_voltage)),
+            Vddt,
+            vmin,
+            vmax);
+
+        buildSummerTable(opampModel);
+    };
+
+    auto filterMixer = [this]
+    {
+        OpAmp opampModel(
+            std::vector<Spline::Point>(
+                std::begin(opamp_voltage),
+                std::end(opamp_voltage)),
+            Vddt,
+            vmin,
+            vmax);
+
+        buildMixerTable(opampModel, 8.0 / 5.0);
+    };
+
+    auto filterGain = [this]
+    {
+        OpAmp opampModel(
+            std::vector<Spline::Point>(
+                std::begin(opamp_voltage),
+                std::end(opamp_voltage)),
+            Vddt,
+            vmin,
+            vmax);
+
+        buildVolumeTable(opampModel, 16.0);
+    };
+
+    auto filterResonance = [this]
+    {
+        OpAmp opampModel(
+            std::vector<Spline::Point>(
+                std::begin(opamp_voltage),
+                std::end(opamp_voltage)),
+            Vddt,
+            vmin,
+            vmax);
+
+        buildResonanceTable(opampModel, resGain);
+    };
+
+#if defined(HAVE_CXX20) && defined(__cpp_lib_jthread)
+    using sidThread = std::jthread;
+#else
+    using sidThread = std::thread;
+#endif
+
+    sidThread thdSummer(filterSummer);
+    sidThread thdMixer(filterMixer);
+    sidThread thdGain(filterGain);
+    sidThread thdResonance(filterResonance);
+
+#if !defined(HAVE_CXX20) || !defined(__cpp_lib_jthread)
+    thdSummer.join();
+    thdMixer.join();
+    thdGain.join();
+    thdResonance.join();
+#endif
+}
+
+} // namespace reSIDfp
diff --git a/src/sound/resid-fp/FilterModelConfig8580.h b/src/sound/resid-fp/FilterModelConfig8580.h
new file mode 100644
index 000000000..72a055929
--- /dev/null
+++ b/src/sound/resid-fp/FilterModelConfig8580.h
@@ -0,0 +1,73 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2020 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004,2010 Dag Lem
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef FILTERMODELCONFIG8580_H
+#define FILTERMODELCONFIG8580_H
+
+#include "FilterModelConfig.h"
+
+#include <memory>
+
+#include "sidcxx11.h"
+
+namespace reSIDfp
+{
+
+class Integrator8580;
+
+/**
+ * Calculate parameters for 8580 filter emulation.
+ */
+class FilterModelConfig8580 final : public FilterModelConfig
+{
+private:
+    static std::unique_ptr<FilterModelConfig8580> instance;
+    // This allows access to the private constructor
+    friend std::unique_ptr<FilterModelConfig8580>::deleter_type;
+
+private:
+    /**
+     * Reference voltage generated from Vcc by a voltage divider
+     */
+    static constexpr double Vref = 4.75;
+
+    /**
+     * Power bricks generate voltages slightly out of spec
+     */
+    static constexpr double VOLTAGE_SKEW = 1.01;
+
+private:
+    FilterModelConfig8580();
+    ~FilterModelConfig8580() = default;
+
+protected:
+    inline double getVoiceDC(unsigned int) const override { return getVref(); }
+
+public:
+    static FilterModelConfig8580* getInstance();
+
+    inline constexpr double getVref() const { return Vref * VOLTAGE_SKEW; }
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/INSTALL b/src/sound/resid-fp/INSTALL
deleted file mode 100644
index 4573d6544..000000000
--- a/src/sound/resid-fp/INSTALL
+++ /dev/null
@@ -1,14 +0,0 @@
-Unless you want to do anything fancy, just say:
-
-% ./configure
-% make
-
-ReSID-FP is compiled with a C++ compiler, so if you wish to specify compiler
-and compiler flags you must set CXX and CXXFLAGS, e.g.:
-% CXX=g++ CXXFLAGS="-g -O" ./configure
-
-In addition to normal configure flags, you may specify
---disable-inline - Disable inlining of functions (for debugging/profiling)
-
-ReSID-FP makes no installable files. The libresid.a is linked to final
-executable automatically.
diff --git a/src/sound/resid-fp/Integrator.h b/src/sound/resid-fp/Integrator.h
new file mode 100644
index 000000000..e8b5ec0b7
--- /dev/null
+++ b/src/sound/resid-fp/Integrator.h
@@ -0,0 +1,47 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2024 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004, 2010 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef INTEGRATOR_H
+#define INTEGRATOR_H
+
+namespace reSIDfp
+{
+
+class Integrator
+{
+protected:
+    mutable int vx;
+    mutable int vc;
+
+    Integrator() :
+        vx(0),
+        vc(0) {}
+
+public:
+    virtual int solve(int vi) const = 0;
+
+    virtual ~Integrator() = default;
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/Integrator6581.cpp b/src/sound/resid-fp/Integrator6581.cpp
new file mode 100644
index 000000000..0a48f5c49
--- /dev/null
+++ b/src/sound/resid-fp/Integrator6581.cpp
@@ -0,0 +1,97 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2014 Leandro Nini <drfiemost@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include "Integrator6581.h"
+
+#ifdef SLOPE_FACTOR
+#  include <cmath>
+#  include "sidcxx11.h"
+#endif
+
+namespace reSIDfp
+{
+
+int Integrator6581::solve(int vi) const
+{
+    // Make sure Vgst>0 so we're not in subthreshold mode
+    assert(vx < nVddt);
+
+    // Check that transistor is actually in triode mode
+    // Vds < Vgs - Vth
+    assert(vi < nVddt);
+
+    // "Snake" voltages for triode mode calculation.
+    const unsigned int Vgst = nVddt - vx;
+    const unsigned int Vgdt = nVddt - vi;
+
+    const unsigned int Vgst_2 = Vgst * Vgst;
+    const unsigned int Vgdt_2 = Vgdt * Vgdt;
+
+    // "Snake" current, scaled by (1/m)*2^13*m*2^16*m*2^16*2^-15 = m*2^30
+    const int n_I_snake = fmc.getNormalizedCurrentFactor(wlSnake) * (static_cast<int>(Vgst_2 - Vgdt_2) >> 15);
+
+    // VCR gate voltage.       // Scaled by m*2^16
+    // Vg = Vddt - sqrt(((Vddt - Vw)^2 + Vgdt^2)/2)
+    const int nVg = static_cast<int>(fmc.getVcr_nVg((nVddt_Vw_2 + (Vgdt_2 >> 1)) >> 16));
+#ifdef SLOPE_FACTOR
+    const double nVp = static_cast<double>(nVg - nVt) / n; // Pinch-off voltage
+    const int kVgt = static_cast<int>(nVp + 0.5) - nVmin;
+#else
+    const int kVgt = (nVg - nVt) - nVmin;
+#endif
+
+    // VCR voltages for EKV model table lookup.
+    const int kVgt_Vs = (kVgt - vx) + (1 << 15);
+    assert((kVgt_Vs >= 0) && (kVgt_Vs < (1 << 16)));
+    const int kVgt_Vd = (kVgt - vi) + (1 << 15);
+    assert((kVgt_Vd >= 0) && (kVgt_Vd < (1 << 16)));
+
+    // VCR current, scaled by m*2^15*2^15 = m*2^30
+    const unsigned int If = static_cast<unsigned int>(fmc.getVcr_n_Ids_term(kVgt_Vs)) << 15;
+    const unsigned int Ir = static_cast<unsigned int>(fmc.getVcr_n_Ids_term(kVgt_Vd)) << 15;
+#ifdef SLOPE_FACTOR
+    const double iVcr = static_cast<double>(If - Ir);
+    const int n_I_vcr = static_cast<int>(iVcr * n);
+#else
+    const int n_I_vcr = If - Ir;
+#endif
+
+#ifdef SLOPE_FACTOR
+    // estimate new slope factor based on gate voltage
+    constexpr double gamma = 1.0;   // body effect factor
+    constexpr double phi = 0.8;     // bulk Fermi potential
+    const double Vp = nVp / fmc.getN16();
+    n = 1. + (gamma / (2. * std::sqrt(Vp + phi + 4. * fmc.getUt())));
+    assert((n > 1.2) && (n < 1.8));
+#endif
+
+    // Change in capacitor charge.
+    vc += n_I_snake + n_I_vcr;
+
+    // vx = g(vc)
+    const int tmp = (vc >> 15) + (1 << 15);
+    assert(tmp < (1 << 16));
+    vx = fmc.getOpampRev(tmp);
+
+    // Return vo.
+    return vx - (vc >> 14);
+}
+
+} // namespace reSIDfp
diff --git a/src/sound/resid-fp/Integrator6581.h b/src/sound/resid-fp/Integrator6581.h
new file mode 100644
index 000000000..71db37342
--- /dev/null
+++ b/src/sound/resid-fp/Integrator6581.h
@@ -0,0 +1,203 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2023 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004, 2010 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef INTEGRATOR6581_H
+#define INTEGRATOR6581_H
+
+#include "Integrator.h"
+#include "FilterModelConfig6581.h"
+
+#include <stdint.h>
+#include <cassert>
+
+// uncomment to enable use of the slope factor
+// in the EKV model
+// actually produces worse results, needs investigation
+//#define SLOPE_FACTOR
+
+#include "siddefs-fp.h"
+
+namespace reSIDfp
+{
+
+/**
+ * Find output voltage in inverting integrator SID op-amp circuits, using a
+ * single fixpoint iteration step.
+ *
+ * A circuit diagram of a MOS 6581 integrator is shown below.
+ *
+ *                   +---C---+
+ *                   |       |
+ *     vi --o--Rw--o-o--[A>--o-- vo
+ *          |      | vx
+ *          +--Rs--+
+ *
+ * From Kirchoff's current law it follows that
+ *
+ *     IRw + IRs + ICr = 0
+ *
+ * Using the formula for current through a capacitor, i = C*dv/dt, we get
+ *
+ *     IRw + IRs + C*(vc - vc0)/dt = 0
+ *     dt/C*(IRw + IRs) + vc - vc0 = 0
+ *     vc = vc0 - n*(IRw(vi,vx) + IRs(vi,vx))
+ *
+ * which may be rewritten as the following iterative fixpoint function:
+ *
+ *     vc = vc0 - n*(IRw(vi,g(vc)) + IRs(vi,g(vc)))
+ *
+ * To accurately calculate the currents through Rs and Rw, we need to use
+ * transistor models. Rs has a gate voltage of Vdd = 12V, and can be
+ * assumed to always be in triode mode. For Rw, the situation is rather
+ * more complex, as it turns out that this transistor will operate in
+ * both subthreshold, triode, and saturation modes.
+ *
+ * The Shichman-Hodges transistor model routinely used in textbooks may
+ * be written as follows:
+ *
+ *     Ids = 0                          , Vgst < 0               (subthreshold mode)
+ *     Ids = K*W/L*(2*Vgst - Vds)*Vds   , Vgst >= 0, Vds < Vgst  (triode mode)
+ *     Ids = K*W/L*Vgst^2               , Vgst >= 0, Vds >= Vgst (saturation mode)
+ *
+ * where
+ *     K   = u*Cox/2 (transconductance coefficient)
+ *     W/L = ratio between substrate width and length
+ *     Vgst = Vg - Vs - Vt (overdrive voltage)
+ *
+ * This transistor model is also called the quadratic model.
+ *
+ * Note that the equation for the triode mode can be reformulated as
+ * independent terms depending on Vgs and Vgd, respectively, by the
+ * following substitution:
+ *
+ *     Vds = Vgst - (Vgst - Vds) = Vgst - Vgdt
+ *
+ *     Ids = K*W/L*(2*Vgst - Vds)*Vds
+ *         = K*W/L*(2*Vgst - (Vgst - Vgdt)*(Vgst - Vgdt)
+ *         = K*W/L*(Vgst + Vgdt)*(Vgst - Vgdt)
+ *         = K*W/L*(Vgst^2 - Vgdt^2)
+ *
+ * This turns out to be a general equation which covers both the triode
+ * and saturation modes (where the second term is 0 in saturation mode).
+ * The equation is also symmetrical, i.e. it can calculate negative
+ * currents without any change of parameters (since the terms for drain
+ * and source are identical except for the sign).
+ *
+ * FIXME: Subthreshold as function of Vgs, Vgd.
+ *
+ *     Ids = I0*W/L*e^(Vgst/(Ut/k))   , Vgst < 0               (subthreshold mode)
+ *
+ * where
+ *     I0 = (2 * uCox * Ut^2) / k
+ *
+ * The remaining problem with the textbook model is that the transition
+ * from subthreshold to triode/saturation is not continuous.
+ *
+ * Realizing that the subthreshold and triode/saturation modes may both
+ * be defined by independent (and equal) terms of Vgs and Vds,
+ * respectively, the corresponding terms can be blended into (equal)
+ * continuous functions suitable for table lookup.
+ *
+ * The EKV model (Enz, Krummenacher and Vittoz) essentially performs this
+ * blending using an elegant mathematical formulation:
+ *
+ *     Ids = Is * (if - ir)
+ *     Is = ((2 * u*Cox * Ut^2)/k) * W/L
+ *     if = ln^2(1 + e^((k*(Vg - Vt) - Vs)/(2*Ut))
+ *     ir = ln^2(1 + e^((k*(Vg - Vt) - Vd)/(2*Ut))
+ *
+ * For our purposes, the EKV model preserves two important properties
+ * discussed above:
+ *
+ * - It consists of two independent terms, which can be represented by
+ *   the same lookup table.
+ * - It is symmetrical, i.e. it calculates current in both directions,
+ *   facilitating a branch-free implementation.
+ *
+ * Rw in the circuit diagram above is a VCR (voltage controlled resistor),
+ * as shown in the circuit diagram below.
+ *
+ *
+ *                        Vdd
+ *                           |
+ *              Vdd         _|_
+ *                 |    +---+ +---- Vw
+ *                _|_   |
+ *             +--+ +---o Vg
+ *             |      __|__
+ *             |      -----  Rw
+ *             |      |   |
+ *     vi -----o------+   +-------- vo
+ *
+ *
+ * In order to calculalate the current through the VCR, its gate voltage
+ * must be determined.
+ *
+ * Assuming triode mode and applying Kirchoff's current law, we get the
+ * following equation for Vg:
+ *
+ *     u*Cox/2*W/L*((nVddt - Vg)^2 - (nVddt - vi)^2 + (nVddt - Vg)^2 - (nVddt - Vw)^2) = 0
+ *     2*(nVddt - Vg)^2 - (nVddt - vi)^2 - (nVddt - Vw)^2 = 0
+ *     (nVddt - Vg) = sqrt(((nVddt - vi)^2 + (nVddt - Vw)^2)/2)
+ *
+ *     Vg = nVddt - sqrt(((nVddt - vi)^2 + (nVddt - Vw)^2)/2)
+ */
+class Integrator6581 : public Integrator
+{
+private:
+    const double wlSnake;
+
+#ifdef SLOPE_FACTOR
+    // Slope factor n = 1/k
+    // where k is the gate coupling coefficient
+    // k = Cox/(Cox+Cdep) ~ 0.7 (depends on gate voltage)
+    mutable double n;
+#endif
+
+    unsigned int nVddt_Vw_2;
+
+    const unsigned short nVddt;
+    const unsigned short nVt;
+    const unsigned short nVmin;
+
+    FilterModelConfig6581& fmc;
+
+public:
+    Integrator6581(FilterModelConfig6581& fmc) :
+        wlSnake(fmc.getWL_snake()),
+#ifdef SLOPE_FACTOR
+        n(1.4),
+#endif
+        nVddt_Vw_2(0),
+        nVddt(fmc.getNormalizedValue(fmc.getVddt())),
+        nVt(fmc.getNormalizedValue(fmc.getVth())),
+        nVmin(fmc.getNVmin()),
+        fmc(fmc) {}
+
+    void setVw(unsigned short Vw) { nVddt_Vw_2 = ((nVddt - Vw) * (nVddt - Vw)) >> 1; }
+
+    int solve(int vi) const override;
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/Integrator8580.cpp b/src/sound/resid-fp/Integrator8580.cpp
new file mode 100644
index 000000000..762442d92
--- /dev/null
+++ b/src/sound/resid-fp/Integrator8580.cpp
@@ -0,0 +1,53 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2014-2016 Leandro Nini <drfiemost@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include "Integrator8580.h"
+
+namespace reSIDfp
+{
+
+int Integrator8580::solve(int vi) const
+{
+    // Make sure we're not in subthreshold mode
+    assert(vx < nVgt);
+
+    // DAC voltages
+    const unsigned int Vgst = nVgt - vx;
+    const unsigned int Vgdt = (vi < nVgt) ? nVgt - vi : 0;  // triode/saturation mode
+
+    const unsigned int Vgst_2 = Vgst * Vgst;
+    const unsigned int Vgdt_2 = Vgdt * Vgdt;
+
+    // DAC current, scaled by (1/m)*2^13*m*2^16*m*2^16*2^-15 = m*2^30
+    const int n_I_dac = n_dac * (static_cast<int>(Vgst_2 - Vgdt_2) >> 15);
+
+    // Change in capacitor charge.
+    vc += n_I_dac;
+
+    // vx = g(vc)
+    const int tmp = (vc >> 15) + (1 << 15);
+    assert(tmp < (1 << 16));
+    vx = fmc.getOpampRev(tmp);
+
+    // Return vo.
+    return vx - (vc >> 14);
+}
+
+} // namespace reSIDfp
diff --git a/src/sound/resid-fp/Integrator8580.h b/src/sound/resid-fp/Integrator8580.h
new file mode 100644
index 000000000..857d22ca2
--- /dev/null
+++ b/src/sound/resid-fp/Integrator8580.h
@@ -0,0 +1,101 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2023 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004, 2010 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef INTEGRATOR8580_H
+#define INTEGRATOR8580_H
+
+#include "Integrator.h"
+#include "FilterModelConfig8580.h"
+
+#include <stdint.h>
+#include <cassert>
+
+#include "siddefs-fp.h"
+
+namespace reSIDfp
+{
+
+/**
+ * 8580 integrator
+ *
+ *                   +---C---+
+ *                   |       |
+ *     vi -----Rfc---o--[A>--o-- vo
+ *                   vx
+ *
+ *     IRfc + ICr = 0
+ *     IRfc + C*(vc - vc0)/dt = 0
+ *     dt/C*(IRfc) + vc - vc0 = 0
+ *     vc = vc0 - n*(IRfc(vi,vx))
+ *     vc = vc0 - n*(IRfc(vi,g(vc)))
+ *
+ * IRfc = K*W/L*(Vgst^2 - Vgdt^2) = n*((Vddt - vx)^2 - (Vddt - vi)^2)
+ *
+ * Rfc gate voltage is generated by an OP Amp and depends on chip temperature.
+ */
+class Integrator8580 : public Integrator
+{
+private:
+    unsigned short nVgt;
+    unsigned short n_dac;
+
+    FilterModelConfig8580& fmc;
+
+public:
+    Integrator8580(FilterModelConfig8580& fmc) :
+        fmc(fmc)
+    {
+        setV(1.5);
+    }
+
+    /**
+     * Set Filter Cutoff resistor ratio.
+     */
+    void setFc(double wl)
+    {
+        // Normalized current factor, 1 cycle at 1MHz.
+        // Fit in 5 bits.
+        n_dac = fmc.getNormalizedCurrentFactor(wl);
+    }
+
+    /**
+     * Set FC gate voltage multiplier.
+     */
+    void setV(double v)
+    {
+        // Gate voltage is controlled by the switched capacitor voltage divider
+        // Ua = Ue * v = 4.75v  1<v<2
+        assert(v > 1.0 && v < 2.0);
+        const double Vg = fmc.getVref() * v;
+        const double Vgt = Vg - fmc.getVth();
+
+        // Vg - Vth, normalized so that translated values can be subtracted:
+        // Vgt - x = (Vgt - t) - (x - t)
+        nVgt = fmc.getNormalizedValue(Vgt);
+    }
+
+    int solve(int vi) const override;
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/Makefile.am b/src/sound/resid-fp/Makefile.am
deleted file mode 100644
index 5af263229..000000000
--- a/src/sound/resid-fp/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-AR = @AR@
-
-noinst_LIBRARIES = libresidfp.a
-
-libresidfp_a_SOURCES = sid.cc voice.cc wave.cc envelope.cc filter.cc extfilt.cc pot.cc version.cc convolve.cc $(noinst_DATA:.dat=.cc)
-
-BUILT_SOURCES = $(noinst_DATA:.dat=.cc)
-
-noinst_HEADERS = sid.h voice.h wave.h envelope.h filter.h extfilt.h pot.h
-
-noinst_DATA = wave6581_PST.dat wave6581_PS_.dat wave6581_P_T.dat wave6581__ST.dat wave8580_PST.dat wave8580_PS_.dat wave8580_P_T.dat wave8580__ST.dat
-
-noinst_SCRIPTS = samp2src.pl
-
-EXTRA_DIST = $(noinst_HEADERS) $(noinst_DATA) $(noinst_SCRIPTS) README.VICE convolve-sse.cc
-
-SUFFIXES = .dat
-
-.dat.cc:
-	$(PERL) $(srcdir)/samp2src.pl $* $< $(srcdir)/$@
-
-if USE_SSE
-convolve-sse.o: convolve-sse.cc
-	$(CXXCOMPILE) -msse -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-libresidfp_a_LIBADD = convolve-sse.o
-endif
diff --git a/src/sound/resid-fp/Makefile.in b/src/sound/resid-fp/Makefile.in
deleted file mode 100644
index 5045f99a1..000000000
--- a/src/sound/resid-fp/Makefile.in
+++ /dev/null
@@ -1,557 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(noinst_HEADERS) \
-	$(srcdir)/../../depcomp $(srcdir)/../../install-sh \
-	$(srcdir)/../../missing $(srcdir)/../../mkinstalldirs \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/siddefs-fp.h.in $(top_srcdir)/configure AUTHORS \
-	COPYING ChangeLog INSTALL NEWS
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
-CONFIG_CLEAN_FILES = siddefs-fp.h
-LIBRARIES = $(noinst_LIBRARIES)
-ARFLAGS = cru
-libresidfp_a_AR = $(AR) $(ARFLAGS)
-@USE_SSE_TRUE@libresidfp_a_DEPENDENCIES = convolve-sse.o
-am__objects_1 = wave6581_PST.$(OBJEXT) wave6581_PS_.$(OBJEXT) \
-	wave6581_P_T.$(OBJEXT) wave6581__ST.$(OBJEXT) \
-	wave8580_PST.$(OBJEXT) wave8580_PS_.$(OBJEXT) \
-	wave8580_P_T.$(OBJEXT) wave8580__ST.$(OBJEXT)
-am_libresidfp_a_OBJECTS = sid.$(OBJEXT) voice.$(OBJEXT) wave.$(OBJEXT) \
-	envelope.$(OBJEXT) filter.$(OBJEXT) extfilt.$(OBJEXT) \
-	pot.$(OBJEXT) version.$(OBJEXT) convolve.$(OBJEXT) \
-	$(am__objects_1)
-libresidfp_a_OBJECTS = $(am_libresidfp_a_OBJECTS)
-SCRIPTS = $(noinst_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir)
-depcomp = $(SHELL) $(top_srcdir)/../../depcomp
-am__depfiles_maybe = depfiles
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
-SOURCES = $(libresidfp_a_SOURCES)
-DIST_SOURCES = $(libresidfp_a_SOURCES)
-DATA = $(noinst_DATA)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-HAVE_EXPF_PROTOTYPE = @HAVE_EXPF_PROTOTYPE@
-HAVE_LOGF_PROTOTYPE = @HAVE_LOGF_PROTOTYPE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-RANLIB = @RANLIB@
-RESID_HAVE_BOOL = @RESID_HAVE_BOOL@
-RESID_INLINE = @RESID_INLINE@
-RESID_USE_SSE = @RESID_USE_SSE@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_SSE_FALSE = @USE_SSE_FALSE@
-USE_SSE_TRUE = @USE_SSE_TRUE@
-VERSION = @VERSION@
-ac_ct_CXX = @ac_ct_CXX@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-noinst_LIBRARIES = libresidfp.a
-libresidfp_a_SOURCES = sid.cc voice.cc wave.cc envelope.cc filter.cc extfilt.cc pot.cc version.cc convolve.cc $(noinst_DATA:.dat=.cc)
-BUILT_SOURCES = $(noinst_DATA:.dat=.cc)
-noinst_HEADERS = sid.h voice.h wave.h envelope.h filter.h extfilt.h pot.h
-noinst_DATA = wave6581_PST.dat wave6581_PS_.dat wave6581_P_T.dat wave6581__ST.dat wave8580_PST.dat wave8580_PS_.dat wave8580_P_T.dat wave8580__ST.dat
-noinst_SCRIPTS = samp2src.pl
-EXTRA_DIST = $(noinst_HEADERS) $(noinst_DATA) $(noinst_SCRIPTS) README.VICE convolve-sse.cc
-SUFFIXES = .dat
-@USE_SSE_TRUE@libresidfp_a_LIBADD = convolve-sse.o
-all: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .dat .cc .o .obj
-am--refresh:
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-siddefs-fp.h: $(top_builddir)/config.status $(srcdir)/siddefs-fp.h.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libresidfp.a: $(libresidfp_a_OBJECTS) $(libresidfp_a_DEPENDENCIES) 
-	-rm -f libresidfp.a
-	$(libresidfp_a_AR) libresidfp.a $(libresidfp_a_OBJECTS) $(libresidfp_a_LIBADD)
-	$(RANLIB) libresidfp.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convolve.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/envelope.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extfilt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pot.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sid.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/voice.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wave.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wave6581_PST.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wave6581_PS_.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wave6581_P_T.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wave6581__ST.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wave8580_PST.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wave8580_PS_.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wave8580_P_T.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wave8580__ST.Po@am__quote@
-
-.cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
-
-.cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/../..
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LIBRARIES) $(SCRIPTS) $(DATA) $(HEADERS)
-installdirs:
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-clean: clean-am
-
-clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-generic clean-noinstLIBRARIES ctags dist dist-all \
-	dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip distcheck \
-	distclean distclean-compile distclean-generic distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
-
-
-.dat.cc:
-	$(PERL) $(srcdir)/samp2src.pl $* $< $(srcdir)/$@
-
-@USE_SSE_TRUE@convolve-sse.o: convolve-sse.cc
-@USE_SSE_TRUE@	$(CXXCOMPILE) -msse -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/sound/resid-fp/NEWS b/src/sound/resid-fp/NEWS
deleted file mode 100644
index 70b2d4f8e..000000000
--- a/src/sound/resid-fp/NEWS
+++ /dev/null
@@ -1 +0,0 @@
-See ChangeLog for information about new features.
diff --git a/src/sound/resid-fp/OpAmp.cpp b/src/sound/resid-fp/OpAmp.cpp
new file mode 100644
index 000000000..ed4f2700c
--- /dev/null
+++ b/src/sound/resid-fp/OpAmp.cpp
@@ -0,0 +1,84 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2024 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include "OpAmp.h"
+
+#include <cmath>
+
+#include "siddefs-fp.h"
+
+namespace reSIDfp
+{
+
+constexpr double EPSILON = 1e-8;
+
+double OpAmp::solve(double n, double vi) const
+{
+    // Start off with an estimate of x and a root bracket [ak, bk].
+    // f is decreasing, so that f(ak) > 0 and f(bk) < 0.
+    double ak = vmin;
+    double bk = vmax;
+
+    const double a = n + 1.;
+    const double b = Vddt;
+    const double b_vi = (b > vi) ? (b - vi) : 0.;
+    const double c = n * (b_vi * b_vi);
+
+    for (;;)
+    {
+        const double xk = x;
+
+        // Calculate f and df.
+
+        Spline::Point out = opamp.evaluate(x);
+        const double vo = out.x;
+        const double dvo = out.y;
+
+        const double b_vx = (b > x) ? b - x : 0.;
+        const double b_vo = (b > vo) ? b - vo : 0.;
+
+        // f = a*(b - vx)^2 - c - (b - vo)^2
+        const double f = a * (b_vx * b_vx) - c - (b_vo * b_vo);
+
+        // df = 2*((b - vo)*dvo - a*(b - vx))
+        const double df = 2. * (b_vo * dvo - a * b_vx);
+
+        // Newton-Raphson step: xk1 = xk - f(xk)/f'(xk)
+        x -= f / df;
+
+        if (unlikely(std::fabs(x - xk) < EPSILON))
+        {
+            out = opamp.evaluate(x);
+            return out.x;
+        }
+
+        // Narrow down root bracket.
+        (f < 0. ? bk : ak) = xk;
+
+        if (unlikely(x <= ak) || unlikely(x >= bk))
+        {
+            // Bisection step (ala Dekker's method).
+            x = (ak + bk) * 0.5;
+        }
+    }
+}
+
+} // namespace reSIDfp
diff --git a/src/sound/resid-fp/OpAmp.h b/src/sound/resid-fp/OpAmp.h
new file mode 100644
index 000000000..ec9d68cbb
--- /dev/null
+++ b/src/sound/resid-fp/OpAmp.h
@@ -0,0 +1,119 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2024 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004,2010 Dag Lem
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef OPAMP_H
+#define OPAMP_H
+
+#include <vector>
+
+#include "Spline.h"
+
+#include "sidcxx11.h"
+
+namespace reSIDfp
+{
+
+/**
+ * Find output voltage in inverting gain and inverting summer SID op-amp
+ * circuits, using a combination of Newton-Raphson and bisection.
+ *
+ *               +---R2--+
+ *               |       |
+ *     vi ---R1--o--[A>--o-- vo
+ *               vx
+ *
+ * From Kirchoff's current law it follows that
+ *
+ *     IR1f + IR2r = 0
+ *
+ * Substituting the triode mode transistor model K*W/L*(Vgst^2 - Vgdt^2)
+ * for the currents, we get:
+ *
+ *     n*((Vddt - vx)^2 - (Vddt - vi)^2) + (Vddt - vx)^2 - (Vddt - vo)^2 = 0
+ * 
+ * where n is the ratio between R1 and R2.
+ *
+ * Our root function f can thus be written as:
+ *
+ *     f = (n + 1)*(Vddt - vx)^2 - n*(Vddt - vi)^2 - (Vddt - vo)^2 = 0
+ *
+ * Using substitution constants
+ *
+ *     a = n + 1
+ *     b = Vddt
+ *     c = n*(Vddt - vi)^2
+ *
+ * the equations for the root function and its derivative can be written as:
+ *
+ *     f = a*(b - vx)^2 - c - (b - vo)^2
+ *     df = 2*((b - vo)*dvo - a*(b - vx))
+ */
+class OpAmp
+{
+private:
+    /// Current root position (cached as guess to speed up next iteration)
+    mutable double x = 0.;
+
+    const double Vddt;
+    const double vmin;
+    const double vmax;
+
+    Spline opamp;
+
+public:
+    /**
+     * Opamp input -> output voltage conversion
+     *
+     * @param opamp opamp mapping table as pairs of points (in -> out)
+     * @param Vddt transistor dt parameter (in volts)
+     * @param vmin
+     * @param vmax
+     */
+    OpAmp(const std::vector<Spline::Point> &opamp_voltages, double Vddt,
+            double vmin, double vmax
+    ) :
+        Vddt(Vddt),
+        vmin(vmin),
+        vmax(vmax),
+        opamp(opamp_voltages) {}
+
+    /**
+     * Reset root position
+     */
+    void reset() const
+    {
+        x = vmin;
+    }
+
+    /**
+     * Solve the opamp equation for input vi in loading context n
+     *
+     * @param n the ratio of input/output loading
+     * @param vi input voltage
+     * @return vo output voltage
+     */
+    double solve(double n, double vi) const;
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/Potentiometer.h b/src/sound/resid-fp/Potentiometer.h
new file mode 100644
index 000000000..8b63df130
--- /dev/null
+++ b/src/sound/resid-fp/Potentiometer.h
@@ -0,0 +1,50 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2013 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright (C) 2004  Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef POTENTIOMETER_H
+#define POTENTIOMETER_H
+
+namespace reSIDfp
+{
+
+/**
+ * Potentiometer representation.
+ *
+ * This class will probably never be implemented in any real way.
+ *
+ * @author Ken Händel
+ * @author Dag Lem
+ */
+class Potentiometer
+{
+public:
+    /**
+     * Read paddle value. Not modeled.
+     *
+     * @return paddle value (always 0xff)
+     */
+    unsigned char readPOT() const { return 0xff; }
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/README b/src/sound/resid-fp/README
index ac4f4275e..45d4bfb92 100644
--- a/src/sound/resid-fp/README
+++ b/src/sound/resid-fp/README
@@ -1,79 +1,20 @@
-Please refer to original ../resid/README file for general discussion what
-ReSID is.
+reSIDfp is a fork of Dag Lem's reSID 0.16, a reverse engineered software emulation
+of the MOS6581/8580 SID (Sound Interface Device).
 
-This is ReSID-FP, a fork of ReSID that has been adapted to floating point
-numbers. Some SSE assembly is used for vector convolutions when both the CPU
-and compiler support it. In addition, some liberties have been taken in the
-frequency region > 20 kHz which should be inaudible to humans.
+The project was started by Antti S. Lankila in order to improve SID emulation
+with special focus on the 6581 filter.
+The codebase has been later on ported to java by Ken Händel within the jsidplay2 project
+and has seen further work by Antti Lankila.
+It was then ported back to c++ and integrated with improvements from reSID 1.0 by Leandro Nini.
 
-In the emulation front, several changes to the original ReSID (henceforth
-classical ReSID) have been made. These changes are listed here:
 
-Waveforms:
+Main differences from reSID:
 
-- Noise waveform control via test bit is now possible.
-  (Unknown: how long does it take for the noise bits to fade with test bit on?)
-  This is used in SounDemoN's Tamaking, Bojojoing, etc, and the patch to
-  implement it in ReSID is his.
+* combined waveforms are emulated by a parametrized model based on samplings from Kevtris;
+* envelope generator is implemented like in the real machine with a shift register;
+* high quality resampling is done in two steps to allow computational savings using lower order filters;
+* part of the calculations are done with floats instead of fixed point;
+* interpolation is accomplished with Fritsch-Carlson method to preserve monotonicity.
 
-- Waveform 0, the frozen DAC, is emulated, which should make the new 8-bit
-  sample player routine work.
 
-- Envelope and waveform outputs contain approximation of the imperfect DACs
-  (Unknown: are there other significant effects that affect the analog waveform
-   before it goes into filter, which should be modelled?)
-
-- I changed voice DC offsets around for 6581 to better match my R4AR 3789.
-
-Envelope:
-
-- Performance work at envelope. Validation pending, should ensure that the new
-  code behaves 100% identically to the old one.
-
-Mixer:
-
-- Experimentally, a subtle negative offset is injected into the mixer through
-  ext-in pin. This part seems, however, physically incorrect and is likely
-  removed in the future. (The coupling capacitor external to the chip must
-  eliminate any DC offset, and the ext-in circuit inside the chip has nothing
-  that could generate offsets. In the meantime, this fix still helps 8580
-  Netherworld to play more correctly.)
-
-- I removed the mixer_DC very subtle effect on 6581, as it already has 10x
-  more offsets elsewhere.
-
-Filter:
-
-- 6581 filter output contains approximation of the distortion effect
-- 8580 filter output has bp flipped in phase with the other outputs
-- 6581 resonance is slightly boosted. Potentially 8580 resonance needs to be
-  slightly stronger as well, as many songs show a bit more "punch" on the real
-  chip and one way to get more of that is increasing resonance. 10-20 %
-  increment is a practical maximum.
-
-The upshot of all this is that for i386/x86-64 hardware, ReSID-FP's more
-complicated algorithms may not seem any more expensive than the original ReSID.
-For high-quality modes, it is virtually certain that ReSID-FP is actually
-faster.
-
-Meanwhile, emulation quality should be improved. If there are bugs, I'd like
-to know about them. If the filter sounds wrong, I might be able to improve it,
-too.
-
-Here are some problematic songs, to get a feel for what's left to do:
-
-- Markus Mueller: Mechanicus
-  * the distorted guitar effect is too distorted, but don't know how/why.
-
-- Galway: Wizball
-  * the initial lead punches through with too much distortion. The "toggle"
-    between the muffled and more intense sound is too hard, even if similar
-    things do occur on the chip.
-
-Undoubtedly, many more such examples will be found. However, samplings and such
-are really valueable only if they can be made on a chip that I have modelled
-for ReSID-FP. In practice I want to know about badly-playing chips, but might
-conclude that it actually plays alright. At any event, information about sound
-issues is welcome.
-
-alankila@bel.fi
+reSIDfp is free software. See the file COPYING for copying permission.
diff --git a/src/sound/resid-fp/README.VICE b/src/sound/resid-fp/README.VICE
deleted file mode 100644
index 02072ce9e..000000000
--- a/src/sound/resid-fp/README.VICE
+++ /dev/null
@@ -1,14 +0,0 @@
-This version of reSID has been modified for use with VICE. It is based on the
-work contained in the resid/ directory, with duplicate files removed. All
-classes have been renamed with suffix FP to avoid link-time clashes with the
-other RESID implementation.
-
-These files reuse some define terms also defined by resid. You should not mix
-resid/* and resid-fp/* files in one compile unit, or the results are probably
-invalid.
-
-In particular, libtool is not used to build the library, and there
-might be some workarounds for various substandard compilers.
-
-Please get the original version if you want to use reSID in your own
-project.
diff --git a/src/sound/resid-fp/SID.cpp b/src/sound/resid-fp/SID.cpp
new file mode 100644
index 000000000..4db69af0c
--- /dev/null
+++ b/src/sound/resid-fp/SID.cpp
@@ -0,0 +1,534 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2024 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#define SID_CPP
+
+#include "sid.h"
+
+#include <limits>
+
+#include "sidcxx11.h"
+
+#include "array.h"
+#include "Dac.h"
+#include "Filter6581.h"
+#include "Filter8580.h"
+#include "WaveformCalculator.h"
+#include "resample/TwoPassSincResampler.h"
+#include "resample/ZeroOrderResampler.h"
+
+namespace reSIDfp
+{
+
+constexpr unsigned int ENV_DAC_BITS = 8;
+constexpr unsigned int OSC_DAC_BITS = 12;
+
+/**
+ * The waveform D/A converter introduces a DC offset in the signal
+ * to the envelope multiplying D/A converter. The "zero" level of
+ * the waveform D/A converter can be found as follows:
+ *
+ * Measure the "zero" voltage of voice 3 on the SID audio output
+ * pin, routing only voice 3 to the mixer ($d417 = $0b, $d418 =
+ * $0f, all other registers zeroed).
+ *
+ * Then set the sustain level for voice 3 to maximum and search for
+ * the waveform output value yielding the same voltage as found
+ * above. This is done by trying out different waveform output
+ * values until the correct value is found, e.g. with the following
+ * program:
+ *
+ *        lda #$08
+ *        sta $d412
+ *        lda #$0b
+ *        sta $d417
+ *        lda #$0f
+ *        sta $d418
+ *        lda #$f0
+ *        sta $d414
+ *        lda #$21
+ *        sta $d412
+ *        lda #$01
+ *        sta $d40e
+ *
+ *        ldx #$00
+ *        lda #$38        ; Tweak this to find the "zero" level
+ *l       cmp $d41b
+ *        bne l
+ *        stx $d40e        ; Stop frequency counter - freeze waveform output
+ *        brk
+ *
+ * The waveform output range is 0x000 to 0xfff, so the "zero"
+ * level should ideally have been 0x800. In the measured chip, the
+ * waveform output "zero" level was found to be 0x380 (i.e. $d41b
+ * = 0x38) at an audio output voltage of 5.94V.
+ *
+ * With knowledge of the mixer op-amp characteristics, further estimates
+ * of waveform voltages can be obtained by sampling the EXT IN pin.
+ * From EXT IN samples, the corresponding waveform output can be found by
+ * using the model for the mixer.
+ *
+ * Such measurements have been done on a chip marked MOS 6581R4AR
+ * 0687 14, and the following results have been obtained:
+ * * The full range of one voice is approximately 1.5V.
+ * * The "zero" level rides at approximately 5.0V.
+ *
+ *
+ * zero-x did the measuring on the 8580 (https://sourceforge.net/p/vice-emu/bugs/1036/#c5b3):
+ * When it sits on basic from powerup it's at 4.72
+ * Run 1.prg and check the output pin level.
+ * Then run 2.prg and adjust it until the output level is the same...
+ * 0x94-0xA8 gives me the same 4.72 1.prg shows.
+ * On another 8580 it's 0x90-0x9C
+ * Third chip 0x94-0xA8
+ * Fourth chip 0x90-0xA4
+ * On the 8580 that plays digis the output is 4.66 and 0x93 is the only value to reach that.
+ * To me that seems as regular 8580s have somewhat wide 0-level range,
+ * whereas that digi-compatible 8580 has it very narrow.
+ * On my 6581R4AR has 0x3A as the only value giving the same output level as 1.prg
+ */
+//@{
+#ifdef USE_RESID_UNUSED
+constexpr unsigned int OFFSET_6581 = 0x380;
+constexpr unsigned int OFFSET_8580 = 0x9c0;
+#endif
+//@}
+
+/**
+ * Bus value stays alive for some time after each operation.
+ * Values differs between chip models, the timings used here
+ * are taken from VICE [1].
+ * See also the discussion "How do I reliably detect 6581/8580 sid?" on CSDb [2].
+ *
+ *   Results from real C64 (testprogs/SID/bitfade/delayfrq0.prg):
+ *
+ *   (new SID) (250469/8580R5) (250469/8580R5)
+ *   delayfrq0    ~7a000        ~108000
+ *
+ *   (old SID) (250407/6581)
+ *   delayfrq0    ~01d00
+ *
+ * [1]: http://sourceforge.net/p/vice-emu/patches/99/
+ * [2]: http://noname.c64.org/csdb/forums/?roomid=11&topicid=29025&showallposts=1
+ */
+//@{
+constexpr int BUS_TTL_6581 = 0x01d00;
+constexpr int BUS_TTL_8580 = 0xa2000;
+//@}
+
+SID::SID() :
+    filter6581(new Filter6581()),
+    filter8580(new Filter8580()),
+    resampler(nullptr),
+    cws(AVERAGE)
+{
+    setChipModel(MOS6581);
+    reset();
+}
+
+SID::~SID()
+{
+    delete filter6581;
+    delete filter8580;
+}
+
+void SID::setFilter6581Curve(double filterCurve)
+{
+    filter6581->setFilterCurve(filterCurve);
+}
+
+void SID::setFilter6581Range(double adjustment)
+{
+    filter6581->setFilterRange(adjustment);
+}
+
+void SID::setFilter8580Curve(double filterCurve)
+{
+    filter8580->setFilterCurve(filterCurve);
+}
+
+void SID::enableFilter(bool enable)
+{
+    filter6581->enable(enable);
+    filter8580->enable(enable);
+}
+
+void SID::voiceSync(bool sync)
+{
+    if (sync)
+    {
+        // Synchronize the 3 waveform generators.
+        for (int i = 0; i < 3; i++)
+        {
+            voice[i].wave()->synchronize(voice[(i + 1) % 3].wave(), voice[(i + 2) % 3].wave());
+        }
+    }
+
+    // Calculate the time to next voice sync
+    nextVoiceSync = std::numeric_limits<int>::max();
+
+    for (int i = 0; i < 3; i++)
+    {
+        WaveformGenerator* const wave = voice[i].wave();
+        const unsigned int freq = wave->readFreq();
+
+        if (wave->readTest() || freq == 0 || !voice[(i + 1) % 3].wave()->readSync())
+        {
+            continue;
+        }
+
+        const unsigned int accumulator = wave->readAccumulator();
+        const unsigned int thisVoiceSync = ((0x7fffff - accumulator) & 0xffffff) / freq + 1;
+
+        if (thisVoiceSync < nextVoiceSync)
+        {
+            nextVoiceSync = thisVoiceSync;
+        }
+    }
+}
+
+void SID::setChipModel(ChipModel model)
+{
+    switch (model)
+    {
+    case MOS6581:
+        filter = filter6581;
+        scaleFactor = 3;
+        modelTTL = BUS_TTL_6581;
+        break;
+
+    case MOS8580:
+        filter = filter8580;
+        scaleFactor = 5;
+        modelTTL = BUS_TTL_8580;
+        break;
+
+    default:
+        throw SIDError("Unknown chip type");
+    }
+
+    this->model = model;
+
+    // calculate waveform-related tables
+    matrix_t* wavetables = WaveformCalculator::getInstance()->getWaveTable();
+    matrix_t* pulldowntables = WaveformCalculator::getInstance()->buildPulldownTable(model, cws);
+
+    // calculate envelope DAC table
+    {
+        Dac dacBuilder(ENV_DAC_BITS);
+        dacBuilder.kinkedDac(model);
+
+        for (unsigned int i = 0; i < (1 << ENV_DAC_BITS); i++)
+        {
+            envDAC[i] = static_cast<float>(dacBuilder.getOutput(i));
+        }
+    }
+
+    // calculate oscillator DAC table
+    const bool is6581 = model == MOS6581;
+
+    {
+        Dac dacBuilder(OSC_DAC_BITS);
+        dacBuilder.kinkedDac(model);
+
+        //const double offset = dacBuilder.getOutput(is6581 ? OFFSET_6581 : OFFSET_8580);
+        const double offset = dacBuilder.getOutput(0x7ff);
+
+        for (unsigned int i = 0; i < (1 << OSC_DAC_BITS); i++)
+        {
+            const double dacValue = dacBuilder.getOutput(i);
+            oscDAC[i] = static_cast<float>(dacValue - offset);
+        }
+    }
+
+    // set voice tables
+    for (int i = 0; i < 3; i++)
+    {
+        voice[i].setEnvDAC(envDAC);
+        voice[i].setWavDAC(oscDAC);
+        voice[i].wave()->setModel(is6581);
+        voice[i].wave()->setWaveformModels(wavetables);
+        voice[i].wave()->setPulldownModels(pulldowntables);
+    }
+}
+
+void SID::setCombinedWaveforms(CombinedWaveforms cws)
+{
+    switch (cws)
+    {
+    case AVERAGE:
+    case WEAK:
+    case STRONG:
+        break;
+
+    default:
+        throw SIDError("Unknown combined waveforms type");
+    }
+
+    this->cws = cws;
+
+    // rebuild waveform-related tables
+    matrix_t* pulldowntables = WaveformCalculator::getInstance()->buildPulldownTable(model, cws);
+
+    for (int i = 0; i < 3; i++)
+    {
+        voice[i].wave()->setPulldownModels(pulldowntables);
+    }
+}
+
+void SID::reset()
+{
+    for (int i = 0; i < 3; i++)
+    {
+        voice[i].reset();
+    }
+
+    filter6581->reset();
+    filter8580->reset();
+    externalFilter.reset();
+
+    if (resampler.get())
+    {
+        resampler->reset();
+    }
+
+    busValue = 0;
+    busValueTtl = 0;
+    voiceSync(false);
+}
+
+void SID::input(int value)
+{
+    filter6581->input(value);
+    filter8580->input(value);
+}
+
+unsigned char SID::read(int offset)
+{
+    switch (offset)
+    {
+    case 0x19: // X value of paddle
+        busValue = potX.readPOT();
+        busValueTtl = modelTTL;
+        break;
+
+    case 0x1a: // Y value of paddle
+        busValue = potY.readPOT();
+        busValueTtl = modelTTL;
+        break;
+
+    case 0x1b: // Voice #3 waveform output
+        busValue = voice[2].wave()->readOSC();
+        busValueTtl = modelTTL;
+        break;
+
+    case 0x1c: // Voice #3 ADSR output
+        busValue = voice[2].envelope()->readENV();
+        busValueTtl = modelTTL;
+        break;
+
+    default:
+        // Reading from a write-only or non-existing register
+        // makes the bus discharge faster.
+        // Emulate this by halving the residual TTL.
+        busValueTtl /= 2;
+        break;
+    }
+
+    return busValue;
+}
+
+void SID::write(int offset, unsigned char value)
+{
+    busValue = value;
+    busValueTtl = modelTTL;
+
+    switch (offset)
+    {
+    case 0x00: // Voice #1 frequency (Low-byte)
+        voice[0].wave()->writeFREQ_LO(value);
+        break;
+
+    case 0x01: // Voice #1 frequency (High-byte)
+        voice[0].wave()->writeFREQ_HI(value);
+        break;
+
+    case 0x02: // Voice #1 pulse width (Low-byte)
+        voice[0].wave()->writePW_LO(value);
+        break;
+
+    case 0x03: // Voice #1 pulse width (bits #8-#15)
+        voice[0].wave()->writePW_HI(value);
+        break;
+
+    case 0x04: // Voice #1 control register
+        voice[0].writeCONTROL_REG(value);
+        break;
+
+    case 0x05: // Voice #1 Attack and Decay length
+        voice[0].envelope()->writeATTACK_DECAY(value);
+        break;
+
+    case 0x06: // Voice #1 Sustain volume and Release length
+        voice[0].envelope()->writeSUSTAIN_RELEASE(value);
+        break;
+
+    case 0x07: // Voice #2 frequency (Low-byte)
+        voice[1].wave()->writeFREQ_LO(value);
+        break;
+
+    case 0x08: // Voice #2 frequency (High-byte)
+        voice[1].wave()->writeFREQ_HI(value);
+        break;
+
+    case 0x09: // Voice #2 pulse width (Low-byte)
+        voice[1].wave()->writePW_LO(value);
+        break;
+
+    case 0x0a: // Voice #2 pulse width (bits #8-#15)
+        voice[1].wave()->writePW_HI(value);
+        break;
+
+    case 0x0b: // Voice #2 control register
+        voice[1].writeCONTROL_REG(value);
+        break;
+
+    case 0x0c: // Voice #2 Attack and Decay length
+        voice[1].envelope()->writeATTACK_DECAY(value);
+        break;
+
+    case 0x0d: // Voice #2 Sustain volume and Release length
+        voice[1].envelope()->writeSUSTAIN_RELEASE(value);
+        break;
+
+    case 0x0e: // Voice #3 frequency (Low-byte)
+        voice[2].wave()->writeFREQ_LO(value);
+        break;
+
+    case 0x0f: // Voice #3 frequency (High-byte)
+        voice[2].wave()->writeFREQ_HI(value);
+        break;
+
+    case 0x10: // Voice #3 pulse width (Low-byte)
+        voice[2].wave()->writePW_LO(value);
+        break;
+
+    case 0x11: // Voice #3 pulse width (bits #8-#15)
+        voice[2].wave()->writePW_HI(value);
+        break;
+
+    case 0x12: // Voice #3 control register
+        voice[2].writeCONTROL_REG(value);
+        break;
+
+    case 0x13: // Voice #3 Attack and Decay length
+        voice[2].envelope()->writeATTACK_DECAY(value);
+        break;
+
+    case 0x14: // Voice #3 Sustain volume and Release length
+        voice[2].envelope()->writeSUSTAIN_RELEASE(value);
+        break;
+
+    case 0x15: // Filter cut off frequency (bits #0-#2)
+        filter6581->writeFC_LO(value);
+        filter8580->writeFC_LO(value);
+        break;
+
+    case 0x16: // Filter cut off frequency (bits #3-#10)
+        filter6581->writeFC_HI(value);
+        filter8580->writeFC_HI(value);
+        break;
+
+    case 0x17: // Filter control
+        filter6581->writeRES_FILT(value);
+        filter8580->writeRES_FILT(value);
+        break;
+
+    case 0x18: // Volume and filter modes
+        filter6581->writeMODE_VOL(value);
+        filter8580->writeMODE_VOL(value);
+        break;
+
+    default:
+        break;
+    }
+
+    // Update voicesync just in case.
+    voiceSync(false);
+}
+
+void SID::setSamplingParameters(double clockFrequency, SamplingMethod method, double samplingFrequency)
+{
+    externalFilter.setClockFrequency(clockFrequency);
+
+    switch (method)
+    {
+    case DECIMATE:
+        resampler.reset(new ZeroOrderResampler(clockFrequency, samplingFrequency));
+        break;
+
+    case RESAMPLE:
+        resampler.reset(TwoPassSincResampler::create(clockFrequency, samplingFrequency));
+        break;
+
+    default:
+        throw SIDError("Unknown sampling method");
+    }
+}
+
+void SID::clockSilent(unsigned int cycles)
+{
+    ageBusValue(cycles);
+
+    while (cycles != 0)
+    {
+        int delta_t = std::min(nextVoiceSync, cycles);
+
+        if (delta_t > 0)
+        {
+            for (int i = 0; i < delta_t; i++)
+            {
+                // clock waveform generators (can affect OSC3)
+                voice[0].wave()->clock();
+                voice[1].wave()->clock();
+                voice[2].wave()->clock();
+
+                voice[0].wave()->output(voice[2].wave());
+                voice[1].wave()->output(voice[0].wave());
+                voice[2].wave()->output(voice[1].wave());
+
+                // clock ENV3 only
+                voice[2].envelope()->clock();
+            }
+
+            cycles -= delta_t;
+            nextVoiceSync -= delta_t;
+        }
+
+        if (nextVoiceSync == 0)
+        {
+            voiceSync(true);
+        }
+    }
+}
+
+} // namespace reSIDfp
diff --git a/src/sound/resid-fp/Spline.cpp b/src/sound/resid-fp/Spline.cpp
new file mode 100644
index 000000000..273fea032
--- /dev/null
+++ b/src/sound/resid-fp/Spline.cpp
@@ -0,0 +1,119 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2015 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include "Spline.h"
+
+#include <cassert>
+#include <limits>
+
+namespace reSIDfp
+{
+
+Spline::Spline(const std::vector<Point> &input) :
+    params(input.size()),
+    c(&params[0])
+{
+    assert(input.size() > 2);
+
+    const size_t coeffLength = input.size() - 1;
+
+    std::vector<double> dxs(coeffLength);
+    std::vector<double> ms(coeffLength);
+
+    // Get consecutive differences and slopes
+    for (size_t i = 0; i < coeffLength; i++)
+    {
+        assert(input[i].x < input[i + 1].x);
+
+        const double dx = input[i + 1].x - input[i].x;
+        const double dy = input[i + 1].y - input[i].y;
+        dxs[i] = dx;
+        ms[i] = dy/dx;
+    }
+
+    // Get degree-1 coefficients
+    params[0].c = ms[0];
+    for (size_t i = 1; i < coeffLength; i++)
+    {
+        const double m = ms[i - 1];
+        const double mNext = ms[i];
+        if (m * mNext <= 0)
+        {
+            params[i].c = 0.0;
+        }
+        else
+        {
+            const double dx = dxs[i - 1];
+            const double dxNext = dxs[i];
+            const double common = dx + dxNext;
+            params[i].c = 3.0 * common / ((common + dxNext) / m + (common + dx) / mNext);
+        }
+    }
+    params[coeffLength].c = ms[coeffLength - 1];
+
+    // Get degree-2 and degree-3 coefficients
+    for (size_t i = 0; i < coeffLength; i++)
+    {
+        params[i].x1 = input[i].x;
+        params[i].x2 = input[i + 1].x;
+        params[i].d = input[i].y;
+
+        const double c1 = params[i].c;
+        const double m = ms[i];
+        const double invDx = 1.0 / dxs[i];
+        const double common = c1 + params[i + 1].c - m - m;
+        params[i].b = (m - c1 - common) * invDx;
+        params[i].a = common * invDx * invDx;
+    }
+
+    // Fix the upper range, because we interpolate outside original bounds if necessary.
+    params[coeffLength - 1].x2 = std::numeric_limits<double>::max();
+}
+
+Spline::Point Spline::evaluate(double x) const
+{
+    if ((x < c->x1) || (x > c->x2))
+    {
+        for (const auto & param : params)
+        {
+            if (x <= param.x2)
+            {
+                c = &param;
+                break;
+            }
+        }
+    }
+
+    // Interpolate
+    const double diff = x - c->x1;
+
+    Point out;
+
+    // y = a*x^3 + b*x^2 + c*x + d
+    out.x = ((c->a * diff + c->b) * diff + c->c) * diff + c->d;
+
+    // dy = 3*a*x^2 + 2*b*x + c
+    out.y = (3.0 * c->a * diff + 2.0 * c->b) * diff + c->c;
+
+    return out;
+}
+
+} // namespace reSIDfp
diff --git a/src/sound/resid-fp/Spline.h b/src/sound/resid-fp/Spline.h
new file mode 100644
index 000000000..c3ef1637b
--- /dev/null
+++ b/src/sound/resid-fp/Spline.h
@@ -0,0 +1,78 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2015 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef SPLINE_H
+#define SPLINE_H
+
+#include <cstddef>
+#include <vector>
+
+namespace reSIDfp
+{
+
+/**
+ * Fritsch-Carlson monotone cubic spline interpolation.
+ *
+ * Based on the implementation from the [Monotone cubic interpolation] wikipedia page.
+ *
+ * [Monotone cubic interpolation]: https://en.wikipedia.org/wiki/Monotone_cubic_interpolation
+ */
+class Spline
+{
+public:
+    using Point = struct
+    {
+        double x;
+        double y;
+    };
+
+private:
+    using Param = struct
+    {
+        double x1;
+        double x2;
+        double a;
+        double b;
+        double c;
+        double d;
+    };
+
+    using ParamVector = std::vector<Param>;
+
+private:
+    /// Interpolation parameters
+    ParamVector params;
+
+    /// Last used parameters, cached for speed up
+    mutable ParamVector::const_pointer c;
+
+public:
+    Spline(const std::vector<Point> &input);
+
+    /**
+     * Evaluate y and its derivative at given point x.
+     */
+    Point evaluate(double x) const;
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/Voice.h b/src/sound/resid-fp/Voice.h
new file mode 100644
index 000000000..0fb708b1e
--- /dev/null
+++ b/src/sound/resid-fp/Voice.h
@@ -0,0 +1,119 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2022 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef VOICE_H
+#define VOICE_H
+
+#include "siddefs-fp.h"
+#include "WaveformGenerator.h"
+#include "EnvelopeGenerator.h"
+
+namespace reSIDfp
+{
+
+/**
+ * Representation of SID voice block.
+ */
+class Voice
+{
+private:
+    WaveformGenerator waveformGenerator;
+
+    EnvelopeGenerator envelopeGenerator;
+
+    /// The DAC LUT for analog waveform output
+    float* wavDAC; //-V730_NOINIT this is initialized in the SID constructor
+
+    /// The DAC LUT for analog envelope output
+    float* envDAC; //-V730_NOINIT this is initialized in the SID constructor
+
+public:
+    /**
+     * Amplitude modulated waveform output.
+     *
+     * The waveform DAC generates a voltage between virtual ground and Vdd
+     * (5-12 V for the 6581 and 4.75-9 V for the 8580)
+     * corresponding to oscillator state 0 .. 4095.
+     *
+     * The envelope DAC generates a voltage between waveform gen output and
+     * the virtual ground level, corresponding to envelope state 0 .. 255.
+     *
+     * Ideal range [-2048*255, 2047*255].
+     *
+     * @param ringModulator Ring-modulator for waveform
+     * @return the voice analog output
+     */
+    RESID_INLINE
+    float output(const WaveformGenerator* ringModulator)
+    {
+        unsigned int const wav = waveformGenerator.output(ringModulator);
+        unsigned int const env = envelopeGenerator.output();
+
+        // DAC imperfections are emulated by using the digital output
+        // as an index into a DAC lookup table.
+        return wavDAC[wav] * envDAC[env];
+    }
+
+    /**
+     * Set the analog DAC emulation for waveform generator.
+     * Must be called before any operation.
+     *
+     * @param dac
+     */
+    void setWavDAC(float* dac) { wavDAC = dac; }
+
+    /**
+     * Set the analog DAC emulation for envelope.
+     * Must be called before any operation.
+     *
+     * @param dac
+     */
+    void setEnvDAC(float* dac) { envDAC = dac; }
+
+    WaveformGenerator* wave() { return &waveformGenerator; }
+
+    EnvelopeGenerator* envelope() { return &envelopeGenerator; }
+
+    /**
+     * Write control register.
+     *
+     * @param control Control register value.
+     */
+    void writeCONTROL_REG(unsigned char control)
+    {
+        waveformGenerator.writeCONTROL_REG(control);
+        envelopeGenerator.writeCONTROL_REG(control);
+    }
+
+    /**
+     * SID reset.
+     */
+    void reset()
+    {
+        waveformGenerator.reset();
+        envelopeGenerator.reset();
+    }
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/WaveformCalculator.cpp b/src/sound/resid-fp/WaveformCalculator.cpp
new file mode 100644
index 000000000..7e167bb18
--- /dev/null
+++ b/src/sound/resid-fp/WaveformCalculator.cpp
@@ -0,0 +1,303 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2023 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include "WaveformCalculator.h"
+
+#include "sidcxx11.h"
+
+#include <map>
+#include <mutex>
+#include <cmath>
+
+namespace reSIDfp
+{
+
+/**
+ * Combined waveform model parameters.
+ */
+using distance_t = float (*)(float, int);
+
+using CombinedWaveformConfig = struct
+{
+    distance_t distFunc;
+    float threshold;
+    float topbit;
+    float pulsestrength;
+    float distance1;
+    float distance2;
+};
+
+using cw_cache_t = std::map<const CombinedWaveformConfig*, matrix_t>;
+
+cw_cache_t PULLDOWN_CACHE;
+
+std::mutex PULLDOWN_CACHE_Lock;
+
+WaveformCalculator* WaveformCalculator::getInstance()
+{
+    static WaveformCalculator instance;
+    return &instance;
+}
+
+// Distance functions
+static float exponentialDistance(float distance, int i)
+{
+    return pow(distance, -i);
+}
+
+MAYBE_UNUSED static float linearDistance(float distance, int i)
+{
+    return 1.f / (1.f + i * distance);
+}
+
+static float quadraticDistance(float distance, int i)
+{
+    return 1.f / (1.f + (i*i) * distance);
+}
+
+/**
+ * Parameters derived with the Monte Carlo method based on
+ * samplings from real machines.
+ * Code and data available in the project repository [1].
+ * Sampling program made by Dag Lem [2].
+ *
+ * The score here reported is the acoustic error
+ * calculated XORing the estimated and the sampled values.
+ * In parentheses the number of mispredicted bits.
+ *
+ * [1] https://github.com/libsidplayfp/combined-waveforms
+ * [2] https://github.com/daglem/reDIP-SID/blob/master/research/combsample.d64
+ */
+const CombinedWaveformConfig configAverage[2][5] =
+{
+    { /* 6581 R3 0486S sampled by Trurl */
+        // TS  error  3555 (324/32768) [RMS: 73.98]
+        { exponentialDistance,  0.877322257f, 1.11349654f, 0.f, 2.14537621f, 9.08618164f },
+        // PT  error  4590 (124/32768) [RMS: 68.90]
+        { linearDistance, 0.941692829f, 1.f, 1.80072665f, 0.033124879f, 0.232303441f },
+        // PS  error 19352 (763/32768) [RMS: 96.91]
+        { linearDistance, 1.66494179f, 1.03760982f, 5.62705326f, 0.291590303f, 0.283631504f },
+        // PTS error  5068 ( 94/32768) [RMS: 41.69]
+        { linearDistance, 1.09762526f, 0.975265801f, 1.52196741f, 0.151528224f, 0.841949463f },
+        // NP  guessed
+        { exponentialDistance, 0.96f, 1.f, 2.5f, 1.1f, 1.2f },
+    },
+    { /* 8580 R5 1088 sampled by reFX-Mike */
+        // TS  error 10660 (353/32768) [RMS: 58.34]
+        { exponentialDistance, 0.853578329f, 1.09615636f, 0.f, 1.8819375f, 6.80794907f },
+        // PT  error 10635 (289/32768) [RMS: 108.81]
+        { exponentialDistance, 0.929835618f, 1.f, 1.12836814f, 1.10453653f, 1.48065746f },
+        // PS  error 12255 (554/32768) [RMS: 102.27]
+        { quadraticDistance, 0.911938608f, 0.996440411f, 1.2278074f, 0.000117214302f, 0.18948476f },
+        // PTS error  6913 (127/32768) [RMS: 55.80]
+        { exponentialDistance, 0.938004673f, 1.04827631f, 1.21178246f, 0.915959001f, 1.42698038f },
+        // NP  guessed
+        { exponentialDistance, 0.95f, 1.f, 1.15f, 1.f, 1.45f },
+    },
+};
+
+const CombinedWaveformConfig configWeak[2][5] =
+{
+    { /* 6581 R2 4383 sampled by ltx128 */
+        // TS  error 1474 (198/32768) [RMS: 62.81]
+        { exponentialDistance, 0.892563999f, 1.11905622f, 0.f, 2.21876144f, 9.63837719f },
+        // PT  error  612 (102/32768) [RMS: 43.71]
+        { linearDistance, 1.01262534f, 1.f, 2.46070528f, 0.0537485816f, 0.0986242667f },
+        // PS  error 8135 (575/32768) [RMS: 75.10]
+        { linearDistance, 2.14896345f, 1.0216713f, 10.5400085f, 0.244498149f, 0.126134038f },
+        // PTS error 2489 (60/32768) [RMS: 24.41]
+        { linearDistance, 1.22330308f, 0.933797896f, 2.83245254f, 0.0615176819f, 0.323831677f },
+        // NP  guessed
+        { exponentialDistance, 0.96f, 1.f, 2.5f, 1.1f, 1.2f },
+    },
+    { /* 8580 R5 4887 sampled by reFX-Mike */
+        // TS  error  741 (76/32768) [RMS: 53.74]
+        { exponentialDistance, 0.812351167f, 1.1727736f, 0.f, 1.87459648f, 2.31578159f },
+        // PT  error 7199 (192/32768) [RMS: 88.43]
+        { exponentialDistance, 0.917997837f, 1.f, 1.01248944f, 1.05761552f, 1.37529826f },
+        // PS  error 9856 (332/32768) [RMS: 86.29]
+        { quadraticDistance, 0.968754232f, 1.00669801f, 1.29909098f, 0.00962483883f, 0.146850556f },
+        // PTS error 4809 (60/32768) [RMS: 45.37]
+        { exponentialDistance, 0.941834152f, 1.06401193f, 0.991132736f, 0.995310068f, 1.41105855f },
+        // NP  guessed
+        { exponentialDistance, 0.95f, 1.f, 1.15f, 1.f, 1.45f },
+    },
+};
+
+const CombinedWaveformConfig configStrong[2][5] =
+{
+    { /* 6581 R2 0384 sampled by Trurl */
+        // TS  error 20337 (1579/32768) [RMS: 88.57]
+        { exponentialDistance, 0.000637792516f, 1.56725872f, 0.f, 0.00036806846f, 1.51800942f },
+        // PT  error  5190 (238/32768) [RMS: 83.54]
+        { linearDistance, 0.924780309f, 1.f, 1.96809769f, 0.0888123438f, 0.234606609f },
+        // PS  error 31015 (2181/32768) [RMS: 114.99]
+        { linearDistance, 1.2328074f, 0.73079139f, 3.9719491f, 0.00156516861f, 0.314677745f },
+        // PTS error  9874 (201/32768) [RMS: 52.30]
+        { linearDistance, 1.08558261f, 0.857638359f, 1.52781796f, 0.152927235f, 1.02657032f },
+        // NP  guessed
+        { exponentialDistance, 0.96f, 1.f, 2.5f, 1.1f, 1.2f },
+    },
+    { /* 8580 R5 1489 sampled by reFX-Mike */
+        // TS  error  4837 (388/32768) [RMS: 76.07]
+        { exponentialDistance, 0.89762634f, 56.7594185f, 0.f, 7.68995237f, 12.0754194f },
+        // PT  error  9266 (508/32768) [RMS: 127.83]
+        { exponentialDistance,  0.87147671f, 1.f, 1.44887495f, 1.05899632f, 1.43786001f },
+        // PS  error 13168 (718/32768) [RMS: 123.35]
+        { quadraticDistance, 0.89255774f, 1.2253896f, 1.75615835f, 0.0245045591f, 0.12982437f },
+        // PTS error  6702 (300/32768) [RMS: 71.01]
+        { linearDistance, 0.91124934f, 0.963609755f, 0.909965038f, 1.07445884f, 1.82399702f },
+        // NP  guessed
+        { exponentialDistance, 0.95f, 1.f, 1.15f, 1.f, 1.45f },
+    },
+};
+
+/// Calculate triangle waveform
+static unsigned int triXor(unsigned int val)
+{
+    return (((val & 0x800) == 0) ? val : (val ^ 0xfff)) << 1;
+}
+
+/**
+ * Generate bitstate based on emulation of combined waves pulldown.
+ *
+ * @param distancetable
+ * @param pulsestrength
+ * @param threshold
+ * @param accumulator the high bits of the accumulator value
+ */
+short calculatePulldown(float distancetable[], float topbit, float pulsestrength, float threshold, unsigned int accumulator)
+{
+    float bit[12];
+
+    for (unsigned int i = 0; i < 12; i++)
+    {
+        bit[i] = (accumulator & (1u << i)) != 0 ? 1.f : 0.f;
+    }
+
+    bit[11] *= topbit;
+
+    float pulldown[12];
+
+    for (int sb = 0; sb < 12; sb++)
+    {
+        float avg = 0.f;
+        float n = 0.f;
+
+        for (int cb = 0; cb < 12; cb++)
+        {
+            if (cb == sb)
+                continue;
+            const float weight = distancetable[sb - cb + 12];
+            avg += (1.f - bit[cb]) * weight;
+            n += weight;
+        }
+
+        avg -= pulsestrength;
+
+        pulldown[sb] = avg / n;
+    }
+
+    // Get the predicted value
+    short value = 0;
+
+    for (unsigned int i = 0; i < 12; i++)
+    {
+        const float bitValue = bit[i] > 0.f ? 1.f - pulldown[i] : 0.f;
+        if (bitValue > threshold)
+        {
+            value |= 1u << i;
+        }
+    }
+
+    return value;
+}
+
+WaveformCalculator::WaveformCalculator() :
+    wftable(4, 4096)
+{
+    // Build waveform table.
+    for (unsigned int idx = 0; idx < (1u << 12); idx++)
+    {
+        const short saw = static_cast<short>(idx);
+        const short tri = static_cast<short>(triXor(idx));
+
+        wftable[0][idx] = 0xfff;
+        wftable[1][idx] = tri;
+        wftable[2][idx] = saw;
+        wftable[3][idx] = saw & (saw << 1);
+    }
+}
+
+matrix_t* WaveformCalculator::buildPulldownTable(ChipModel model, CombinedWaveforms cws)
+{
+    std::lock_guard<std::mutex> lock(PULLDOWN_CACHE_Lock);
+
+    const int modelIdx = model == MOS6581 ? 0 : 1;
+    const CombinedWaveformConfig* cfgArray;
+
+    switch (cws)
+    {
+    default:
+    case AVERAGE:
+        cfgArray = configAverage[modelIdx];
+        break;
+    case WEAK:
+        cfgArray = configWeak[modelIdx];
+        break;
+    case STRONG:
+        cfgArray = configStrong[modelIdx];
+        break;
+    }
+
+    cw_cache_t::iterator lb = PULLDOWN_CACHE.lower_bound(cfgArray);
+
+    if (lb != PULLDOWN_CACHE.end() && !(PULLDOWN_CACHE.key_comp()(cfgArray, lb->first)))
+    {
+        return &(lb->second);
+    }
+
+    matrix_t pdTable(5, 4096);
+
+    for (int wav = 0; wav < 5; wav++)
+    {
+        const CombinedWaveformConfig& cfg = cfgArray[wav];
+
+        const distance_t distFunc = cfg.distFunc;
+
+        float distancetable[12 * 2 + 1];
+        distancetable[12] = 1.f;
+        for (int i = 12; i > 0; i--)
+        {
+            distancetable[12-i] = distFunc(cfg.distance1, i);
+            distancetable[12+i] = distFunc(cfg.distance2, i);
+        }
+
+        for (unsigned int idx = 0; idx < (1u << 12); idx++)
+        {
+            pdTable[wav][idx] = calculatePulldown(distancetable, cfg.topbit, cfg.pulsestrength, cfg.threshold, idx);
+        }
+    }
+
+    return &(PULLDOWN_CACHE.emplace_hint(lb, cw_cache_t::value_type(cfgArray, pdTable))->second);
+}
+
+} // namespace reSIDfp
diff --git a/src/sound/resid-fp/WaveformCalculator.h b/src/sound/resid-fp/WaveformCalculator.h
new file mode 100644
index 000000000..f6db00c7d
--- /dev/null
+++ b/src/sound/resid-fp/WaveformCalculator.h
@@ -0,0 +1,119 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2023 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef WAVEFORMCALCULATOR_h
+#define WAVEFORMCALCULATOR_h
+
+#include "array.h"
+
+#include "siddefs-fp.h"
+
+
+namespace reSIDfp
+{
+
+/**
+ * Combined waveform calculator for WaveformGenerator.
+ * By combining waveforms, the bits of each waveform are effectively short
+ * circuited, a zero bit in one waveform will result in a zero output bit,
+ * thus the claim that the waveforms are AND'ed.
+ * However, a zero bit in one waveform may also affect the neighboring bits
+ * in the output.
+ *
+ * Example:
+ *
+ *                 1 1
+ *     Bit #       1 0 9 8 7 6 5 4 3 2 1 0
+ *                 -----------------------
+ *     Sawtooth    0 0 0 1 1 1 1 1 1 0 0 0
+ *
+ *     Triangle    0 0 1 1 1 1 1 1 0 0 0 0
+ *
+ *     AND         0 0 0 1 1 1 1 1 0 0 0 0
+ *
+ *     Output      0 0 0 0 1 1 1 0 0 0 0 0
+ *
+ *
+ * Re-vectorized die photographs reveal the mechanism behind this behavior.
+ * Each waveform selector bit acts as a switch, which directly connects
+ * internal outputs into the waveform DAC inputs as follows:
+ *
+ * - Noise outputs the shift register bits to DAC inputs as described above.
+ *   Each output is also used as input to the next bit when the shift register
+ *   is shifted. Lower four bits are grounded.
+ * - Pulse connects a single line to all DAC inputs. The line is connected to
+ *   either 5V (pulse on) or 0V (pulse off) at bit 11, and ends at bit 0.
+ * - Triangle connects the upper 11 bits of the (MSB EOR'ed) accumulator to the
+ *   DAC inputs, so that DAC bit 0 = 0, DAC bit n = accumulator bit n - 1.
+ * - Sawtooth connects the upper 12 bits of the accumulator to the DAC inputs,
+ *   so that DAC bit n = accumulator bit n. Sawtooth blocks out the MSB from
+ *   the EOR used to generate the triangle waveform.
+ *
+ * We can thus draw the following conclusions:
+ *
+ * - The shift register may be written to by combined waveforms.
+ * - The pulse waveform interconnects all bits in combined waveforms via the
+ *   pulse line.
+ * - The combination of triangle and sawtooth interconnects neighboring bits
+ *   of the sawtooth waveform.
+ *
+ * Also in the 6581 the MSB of the oscillator, used as input for the
+ * triangle xor logic and the pulse adder's last bit, is connected directly
+ * to the waveform selector, while in the 8580 it is latched at sid_clk2
+ * before being forwarded to the selector. Thus in the 6581 if the sawtooth MSB
+ * is pulled down it might affect the oscillator's adder
+ * driving the top bit low.
+ *
+ */
+class WaveformCalculator
+{
+private:
+    matrix_t wftable;
+
+private:
+    WaveformCalculator();
+
+public:
+    /**
+     * Get the singleton instance.
+     */
+    static WaveformCalculator* getInstance();
+
+    /**
+     * Get the waveform table for use by WaveformGenerator.
+     *
+     * @return Waveform table
+     */
+    matrix_t* getWaveTable() { return &wftable; }
+
+    /**
+     * Build pulldown table for use by WaveformGenerator.
+     *
+     * @param model Chip model to use
+     * @param cws strength of combined waveforms
+     * @return Pulldown table
+     */
+    matrix_t* buildPulldownTable(ChipModel model, CombinedWaveforms cws);
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/WaveformGenerator.cpp b/src/sound/resid-fp/WaveformGenerator.cpp
new file mode 100644
index 000000000..847560f2a
--- /dev/null
+++ b/src/sound/resid-fp/WaveformGenerator.cpp
@@ -0,0 +1,494 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2023 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#define WAVEFORMGENERATOR_CPP
+
+#include "WaveformGenerator.h"
+
+namespace reSIDfp
+{
+
+/**
+ * Number of cycles after which the waveform output fades to 0 when setting
+ * the waveform register to 0.
+ * Values measured on warm chips (6581R3/R4 and 8580R5)
+ * checking OSC3.
+ * Times vary wildly with temperature and may differ
+ * from chip to chip so the numbers here represent
+ * only the big difference between the old and new models.
+ *
+ * See [VICE Bug #290](http://sourceforge.net/p/vice-emu/bugs/290/)
+ * and [VICE Bug #1128](http://sourceforge.net/p/vice-emu/bugs/1128/)
+ */
+// ~95ms
+constexpr unsigned int FLOATING_OUTPUT_TTL_6581R3  =   54000;
+constexpr unsigned int FLOATING_OUTPUT_FADE_6581R3 =    1400;
+// ~1s
+#ifdef USE_RESID_UNUSED
+constexpr unsigned int FLOATING_OUTPUT_TTL_6581R4  = 1000000;
+#endif
+// ~1s
+constexpr unsigned int FLOATING_OUTPUT_TTL_8580R5  =  800000;
+constexpr unsigned int FLOATING_OUTPUT_FADE_8580R5 =   50000;
+
+/**
+ * Number of cycles after which the shift register is reset
+ * when the test bit is set.
+ * Values measured on warm chips (6581R3/R4 and 8580R5)
+ * checking OSC3.
+ * Times vary wildly with temperature and may differ
+ * from chip to chip so the numbers here represent
+ * only the big difference between the old and new models.
+ */
+// ~210ms
+constexpr unsigned int SHIFT_REGISTER_RESET_6581R3 =   50000;
+constexpr unsigned int SHIFT_REGISTER_FADE_6581R3  =   15000;
+// ~2.15s
+#ifdef USE_RESID_UNUSED
+constexpr unsigned int SHIFT_REGISTER_RESET_6581R4 = 2150000;
+#endif
+// ~2.8s
+constexpr unsigned int SHIFT_REGISTER_RESET_8580R5 =  986000;
+constexpr unsigned int SHIFT_REGISTER_FADE_8580R5  =  314300;
+
+constexpr unsigned int shift_mask =
+    ~(
+        (1u <<  2) |  // Bit 20
+        (1u <<  4) |  // Bit 18
+        (1u <<  8) |  // Bit 14
+        (1u << 11) |  // Bit 11
+        (1u << 13) |  // Bit  9
+        (1u << 17) |  // Bit  5
+        (1u << 20) |  // Bit  2
+        (1u << 22)    // Bit  0
+    );
+
+/*
+ * This is what happens when the lfsr is clocked:
+ *
+ * cycle 0: bit 19 of the accumulator goes from low to high, the noise register acts normally,
+ *          the output may pulldown a bit;
+ *
+ * cycle 1: first phase of the shift, the bits are interconnected and the output of each bit
+ *          is latched into the following. The output may overwrite the latched value.
+ *
+ * cycle 2: second phase of the shift, the latched value becomes active in the first
+ *          half of the clock and from the second half the register returns to normal operation.
+ *
+ * When the test or reset lines are active the first phase is executed at every cyle
+ * until the signal is released triggering the second phase.
+ *
+ *      |       |    bit n     |   bit n+1
+ *      | bit19 | latch output | latch output
+ * -----+-------+--------------+--------------
+ * phi1 |   0   |   A <-> A    |   B <-> B
+ * phi2 |   0   |   A <-> A    |   B <-> B
+ * -----+-------+--------------+--------------
+ * phi1 |   1   |   A <-> A    |   B <-> B      <- bit19 raises
+ * phi2 |   1   |   A <-> A    |   B <-> B
+ * -----+-------+--------------+--------------
+ * phi1 |   1   |   X     A  --|-> A     B      <- shift phase 1
+ * phi2 |   1   |   X     A  --|-> A     B
+ * -----+-------+--------------+--------------
+ * phi1 |   1   |   X --> X    |   A --> A      <- shift phase 2
+ * phi2 |   1   |   X <-> X    |   A <-> A
+ *
+ *
+ * Normal cycles
+ * -------------
+ * Normally, when noise is selected along with another waveform,
+ * c1 and c2 are closed and the output bits pull down the corresponding
+ * shift register bits.
+ * 
+ *        noi_out_x             noi_out_x+1
+ *          ^                     ^
+ *          |                     |
+ *          +-------------+       +-------------+
+ *          |             |       |             |
+ *          +---o<|---+   |       +---o<|---+   |
+ *          |         |   |       |         |   |
+ *       c2 |      c1 |   |    c2 |      c1 |   |
+ *          |         |   |       |         |   |
+ *  >---/---+---|>o---+   +---/---+---|>o---+   +---/--->
+ *      LC                    LC                    LC
+ *
+ *
+ * Shift phase 1
+ * -------------
+ * During shift phase 1 c1 and c2 are open, the SR bits are floating
+ * and will be driven by the output of combined waveforms,
+ * or slowly turn high.
+ *
+ *        noi_out_x             noi_out_x+1
+ *          ^                     ^
+ *          |                     |
+ *          +-------------+       +-------------+
+ *          |             |       |             |
+ *          +---o<|---+   |       +---o<|---+   |
+ *          |         |   |       |         |   |
+ *       c2 /      c1 /   |    c2 /      c1 /   |
+ *          |         |   |       |         |   |
+ *  >-------+---|>o---+   +-------+---|>o---+   +------->
+ *      LC                    LC                    LC
+ *
+ *
+ * Shift phase 2 (phi1)
+ * --------------------
+ * During the first half cycle of shift phase 2 c1 is closed
+ * so the value from of noi_out_x-1 enters the bit.
+ *
+ *        noi_out_x             noi_out_x+1
+ *          ^                     ^
+ *          |                     |
+ *          +-------------+       +-------------+
+ *          |             |       |             |
+ *          +---o<|---+   |       +---o<|---+   |
+ *          |         |   |       |         |   |
+ *       c2 /      c1 |   |    c2 /      c1 |   |
+ *          |         |   |       |         |   |
+ *  >---/---+---|>o---+   +---/---+---|>o---+   +---/--->
+ *      LC                    LC                    LC
+ *
+ *
+ * Shift phase 2 (phi2)
+ * --------------------
+ * On the second half of shift phase 2 c2 closes and
+ * we're back to normal cycles.
+ */
+
+inline bool do_writeback(unsigned int waveform_old, unsigned int waveform_new, bool is6581)
+{
+    // no writeback without combined waveforms
+
+    if (waveform_old <= 8)
+        // fixes SID/noisewriteback/noise_writeback_test2-{old,new}
+        return false;
+
+    if (waveform_new < 8)
+        return false;
+
+    if ((waveform_new == 8)
+        // breaks noise_writeback_check_F_to_8_old
+        // but fixes simple and scan
+        && (waveform_old != 0xf))
+    {
+        // fixes
+        // noise_writeback_check_9_to_8_old
+        // noise_writeback_check_A_to_8_old
+        // noise_writeback_check_B_to_8_old
+        // noise_writeback_check_D_to_8_old
+        // noise_writeback_check_E_to_8_old
+        // noise_writeback_check_F_to_8_old
+        // noise_writeback_check_9_to_8_new
+        // noise_writeback_check_A_to_8_new
+        // noise_writeback_check_D_to_8_new
+        // noise_writeback_check_E_to_8_new
+        // noise_writeback_test1-{old,new}
+        return false;
+    }
+
+    // What's happening here?
+    if (is6581 &&
+            ((((waveform_old & 0x3) == 0x1) && ((waveform_new & 0x3) == 0x2))
+            || (((waveform_old & 0x3) == 0x2) && ((waveform_new & 0x3) == 0x1))))
+    {
+        // fixes
+        // noise_writeback_check_9_to_A_old
+        // noise_writeback_check_9_to_E_old
+        // noise_writeback_check_A_to_9_old
+        // noise_writeback_check_A_to_D_old
+        // noise_writeback_check_D_to_A_old
+        // noise_writeback_check_E_to_9_old
+        return false;
+    }
+    if (waveform_old == 0xc)
+    {
+        // fixes
+        // noise_writeback_check_C_to_A_new
+        return false;
+    }
+    if (waveform_new == 0xc)
+    {
+        // fixes
+        // noise_writeback_check_9_to_C_old
+        // noise_writeback_check_A_to_C_old
+        return false;
+    }
+
+    // ok do the writeback
+    return true;
+}
+
+inline unsigned int get_noise_writeback(unsigned int waveform_output)
+{
+  return
+    ((waveform_output & (1u << 11)) >>  9) |  // Bit 11 -> bit 20
+    ((waveform_output & (1u << 10)) >>  6) |  // Bit 10 -> bit 18
+    ((waveform_output & (1u <<  9)) >>  1) |  // Bit  9 -> bit 14
+    ((waveform_output & (1u <<  8)) <<  3) |  // Bit  8 -> bit 11
+    ((waveform_output & (1u <<  7)) <<  6) |  // Bit  7 -> bit  9
+    ((waveform_output & (1u <<  6)) << 11) |  // Bit  6 -> bit  5
+    ((waveform_output & (1u <<  5)) << 15) |  // Bit  5 -> bit  2
+    ((waveform_output & (1u <<  4)) << 18);   // Bit  4 -> bit  0
+}
+
+/*
+ * Perform the actual shifting, moving the latched value into following bits.
+ * The XORing for bit0 is done in this cycle using the test bit latched during
+ * the previous phi2 cycle.
+ */
+void WaveformGenerator::shift_phase2(unsigned int waveform_old, unsigned int waveform_new)
+{
+    if (do_writeback(waveform_old, waveform_new, is6581))
+    {
+        // if noise is combined with another waveform the output drives the SR bits
+        shift_latch = (shift_register & shift_mask) | get_noise_writeback(waveform_output);
+    }
+
+    // bit0 = (bit22 | test | reset) ^ bit17 = 1 ^ bit17 = ~bit17
+    const unsigned int bit22 = ((test_or_reset ? 1 : 0) | shift_latch) << 22;
+    const unsigned int bit0 = (bit22 ^ (shift_latch << 17)) & (1 << 22);
+
+    shift_register = (shift_latch >> 1) | bit0;
+#ifdef TRACE
+    std::cout << std::hex << shift_latch << " -> " << shift_register << std::endl;
+#endif
+    set_noise_output();
+}
+
+void WaveformGenerator::write_shift_register()
+{
+    if (unlikely(waveform > 0x8))
+    {
+#if 0
+        // FIXME this breaks SID/wf12nsr/wf12nsr
+        if (waveform == 0xc)
+            // fixes
+            // noise_writeback_check_8_to_C_old
+            // noise_writeback_check_9_to_C_old
+            // noise_writeback_check_A_to_C_old
+            // noise_writeback_check_C_to_C_old
+            return;
+#endif
+
+        // Write changes to the shift register output caused by combined waveforms
+        // back into the shift register.
+        if (likely(shift_pipeline != 1) && !test)
+        {
+#ifdef TRACE
+            std::cout << "write shift_register" << std::endl;
+#endif
+            // the output pulls down the SR bits
+            shift_register = shift_register & (shift_mask | get_noise_writeback(waveform_output));
+            noise_output &= waveform_output;
+        }
+        else
+        {
+#ifdef TRACE
+            std::cout << "write shift_latch" << std::endl;
+#endif
+            // shift phase 1: the output drives the SR bits
+            noise_output = waveform_output;
+        }
+
+        set_no_noise_or_noise_output();
+    }
+}
+
+void WaveformGenerator::set_noise_output()
+{
+    noise_output =
+        ((shift_register & (1u <<  2)) <<  9) |  // Bit 20 -> bit 11
+        ((shift_register & (1u <<  4)) <<  6) |  // Bit 18 -> bit 10
+        ((shift_register & (1u <<  8)) <<  1) |  // Bit 14 -> bit  9
+        ((shift_register & (1u << 11)) >>  3) |  // Bit 11 -> bit  8
+        ((shift_register & (1u << 13)) >>  6) |  // Bit  9 -> bit  7
+        ((shift_register & (1u << 17)) >> 11) |  // Bit  5 -> bit  6
+        ((shift_register & (1u << 20)) >> 15) |  // Bit  2 -> bit  5
+        ((shift_register & (1u << 22)) >> 18);   // Bit  0 -> bit  4
+
+    set_no_noise_or_noise_output();
+}
+
+void WaveformGenerator::setWaveformModels(matrix_t* models)
+{
+    model_wave = models;
+}
+
+void WaveformGenerator::setPulldownModels(matrix_t* models)
+{
+    model_pulldown = models;
+}
+
+void WaveformGenerator::synchronize(WaveformGenerator* syncDest, const WaveformGenerator* syncSource) const
+{
+    // A special case occurs when a sync source is synced itself on the same
+    // cycle as when its MSB is set high. In this case the destination will
+    // not be synced. This has been verified by sampling OSC3.
+    if (unlikely(msb_rising) && syncDest->sync && !(sync && syncSource->msb_rising))
+    {
+        syncDest->accumulator = 0;
+    }
+}
+
+void WaveformGenerator::set_no_noise_or_noise_output()
+{
+    no_noise_or_noise_output = no_noise | noise_output;
+}
+
+void WaveformGenerator::writeCONTROL_REG(unsigned char control)
+{
+    const unsigned int waveform_prev = waveform;
+    const bool test_prev = test;
+
+    waveform = (control >> 4) & 0x0f;
+    test = (control & 0x08) != 0;
+    sync = (control & 0x02) != 0;
+
+    // Substitution of accumulator MSB when sawtooth = 0, ring_mod = 1.
+    ring_msb_mask = ((~control >> 5) & (control >> 2) & 0x1) << 23;
+
+    if (waveform != waveform_prev)
+    {
+        // Set up waveform tables
+        wave = (*model_wave)[waveform & 0x3];
+        // We assume tha combinations including noise
+        // behave the same as without
+        switch (waveform & 0x7)
+        {
+        case 3:
+            pulldown = (*model_pulldown)[0];
+            break;
+        case 4:
+            pulldown = (waveform & 0x8) ? (*model_pulldown)[4] : nullptr;
+            break;
+        case 5:
+            pulldown = (*model_pulldown)[1];
+            break;
+        case 6:
+            pulldown = (*model_pulldown)[2];
+            break;
+        case 7:
+            pulldown = (*model_pulldown)[3];
+            break;
+        default:
+            pulldown = nullptr;
+            break;
+        }
+
+        // no_noise and no_pulse are used in set_waveform_output() as bitmasks to
+        // only let the noise or pulse influence the output when the noise or pulse
+        // waveforms are selected.
+        no_noise = (waveform & 0x8) != 0 ? 0x000 : 0xfff;
+        set_no_noise_or_noise_output();
+        no_pulse = (waveform & 0x4) != 0 ? 0x000 : 0xfff;
+
+        if (waveform == 0)
+        {
+            // Change to floating DAC input.
+            // Reset fading time for floating DAC input.
+            floating_output_ttl = is6581 ? FLOATING_OUTPUT_TTL_6581R3 : FLOATING_OUTPUT_TTL_8580R5;
+        }
+    }
+
+    if (test != test_prev)
+    {
+        if (test)
+        {
+            // Reset accumulator.
+            accumulator = 0;
+
+            // Flush shift pipeline.
+            shift_pipeline = 0;
+
+            // Latch the shift register value.
+            shift_latch = shift_register;
+#ifdef TRACE
+            std::cout << "shift phase 1 (test)" << std::endl;
+#endif
+
+            // Set reset time for shift register.
+            shift_register_reset = is6581 ? SHIFT_REGISTER_RESET_6581R3 : SHIFT_REGISTER_RESET_8580R5;
+        }
+        else
+        {
+            // When the test bit is falling, the second phase of the shift is
+            // completed by enabling SRAM write.
+            shift_phase2(waveform_prev, waveform);
+        }
+    }
+}
+
+void WaveformGenerator::waveBitfade()
+{
+    waveform_output &= waveform_output >> 1;
+    osc3 = waveform_output;
+    if (waveform_output != 0)
+        floating_output_ttl = is6581 ? FLOATING_OUTPUT_FADE_6581R3 : FLOATING_OUTPUT_FADE_8580R5;
+}
+
+void WaveformGenerator::shiftregBitfade()
+{
+    shift_register |= shift_register >> 1;
+    shift_register |= 0x400000;
+    if (shift_register != 0x7fffff)
+        shift_register_reset = is6581 ? SHIFT_REGISTER_FADE_6581R3 : SHIFT_REGISTER_FADE_8580R5;
+}
+
+void WaveformGenerator::reset()
+{
+    // accumulator is not changed on reset
+    freq = 0;
+    pw = 0;
+
+    msb_rising = false;
+
+    waveform = 0;
+    osc3 = 0;
+
+    test = false;
+    sync = false;
+
+    wave = model_wave ? (*model_wave)[0] : nullptr;
+    pulldown = nullptr;
+
+    ring_msb_mask = 0;
+    no_noise = 0xfff;
+    no_pulse = 0xfff;
+    pulse_output = 0xfff;
+
+    shift_register_reset = 0;
+    shift_register = 0x7fffff;
+    // when reset is released the shift register is clocked once
+    // so the lower bit is zeroed out
+    // bit0 = (bit22 | test) ^ bit17 = 1 ^ 1 = 0
+    test_or_reset = true;
+    shift_latch = shift_register;
+    shift_phase2(0, 0);
+
+    shift_pipeline = 0;
+
+    waveform_output = 0;
+    floating_output_ttl = 0;
+}
+
+} // namespace reSIDfp
diff --git a/src/sound/resid-fp/WaveformGenerator.h b/src/sound/resid-fp/WaveformGenerator.h
new file mode 100644
index 000000000..7bbccbc80
--- /dev/null
+++ b/src/sound/resid-fp/WaveformGenerator.h
@@ -0,0 +1,411 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2023 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004,2010 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef WAVEFORMGENERATOR_H
+#define WAVEFORMGENERATOR_H
+
+#include "siddefs-fp.h"
+#include "array.h"
+
+#include "sidcxx11.h"
+
+// print SR debugging info
+//#define TRACE 1
+
+#ifdef TRACE
+#  include <iostream>
+#endif
+
+namespace reSIDfp
+{
+
+/**
+ * A 24 bit accumulator is the basis for waveform generation.
+ * FREQ is added to the lower 16 bits of the accumulator each cycle.
+ * The accumulator is set to zero when TEST is set, and starts counting
+ * when TEST is cleared.
+ *
+ * Waveforms are generated as follows:
+ *
+ * - No waveform:
+ * When no waveform is selected, the DAC input is floating.
+ *
+ *
+ * - Triangle:
+ * The upper 12 bits of the accumulator are used.
+ * The MSB is used to create the falling edge of the triangle by inverting
+ * the lower 11 bits. The MSB is thrown away and the lower 11 bits are
+ * left-shifted (half the resolution, full amplitude).
+ * Ring modulation substitutes the MSB with MSB EOR NOT sync_source MSB.
+ *
+ *
+ * - Sawtooth:
+ * The output is identical to the upper 12 bits of the accumulator.
+ *
+ *
+ * - Pulse:
+ * The upper 12 bits of the accumulator are used.
+ * These bits are compared to the pulse width register by a 12 bit digital
+ * comparator; output is either all one or all zero bits.
+ * The pulse setting is delayed one cycle after the compare.
+ * The test bit, when set to one, holds the pulse waveform output at 0xfff
+ * regardless of the pulse width setting.
+ *
+ *
+ * - Noise:
+ * The noise output is taken from intermediate bits of a 23-bit shift register
+ * which is clocked by bit 19 of the accumulator.
+ * The shift is delayed 2 cycles after bit 19 is set high.
+ *
+ * Operation: Calculate EOR result, shift register, set bit 0 = result.
+ *
+ *                    reset  +--------------------------------------------+
+ *                      |    |                                            |
+ *               test--OR-->EOR<--+                                       |
+ *                      |         |                                       |
+ *                      2 2 2 1 1 1 1 1 1 1 1 1 1                         |
+ *     Register bits:   2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 <---+
+ *                          |   |       |     |   |       |     |   |
+ *     Waveform bits:       1   1       9     8   7       6     5   4
+ *                          1   0
+ *
+ * The low 4 waveform bits are zero (grounded).
+ */
+class WaveformGenerator
+{
+private:
+    matrix_t* model_wave = nullptr;
+    matrix_t* model_pulldown = nullptr;
+
+    short* wave = nullptr;
+    short* pulldown = nullptr;
+
+    // PWout = (PWn/40.95)%
+    unsigned int pw = 0;
+
+    unsigned int shift_register = 0;
+
+    /// Shift register is latched when transitioning to shift phase 1.
+    unsigned int shift_latch = 0;
+
+    /// Emulation of pipeline causing bit 19 to clock the shift register.
+    int shift_pipeline = 0;
+
+    unsigned int ring_msb_mask = 0;
+    unsigned int no_noise = 0;
+    unsigned int noise_output = 0;
+    unsigned int no_noise_or_noise_output = 0;
+    unsigned int no_pulse = 0;
+    unsigned int pulse_output = 0;
+
+    /// The control register right-shifted 4 bits; used for output function table lookup.
+    unsigned int waveform = 0;
+
+    unsigned int waveform_output = 0;
+
+    /// Current accumulator value.
+    unsigned int accumulator = 0x555555; // Accumulator's even bits are high on powerup
+
+    // Fout = (Fn*Fclk/16777216)Hz
+    unsigned int freq = 0;
+
+    /// 8580 tri/saw pipeline
+    unsigned int tri_saw_pipeline = 0x555;
+
+    /// The OSC3 value
+    unsigned int osc3 = 0;
+
+    /// Remaining time to fully reset shift register.
+    unsigned int shift_register_reset = 0;
+
+    // The wave signal TTL when no waveform is selected.
+    unsigned int floating_output_ttl = 0;
+
+    /// The control register bits. Gate is handled by EnvelopeGenerator.
+    //@{
+    bool test = false;
+    bool sync = false;
+    //@}
+
+    /// Test bit is latched at phi2 for the noise XOR.
+    bool test_or_reset;
+
+    /// Tell whether the accumulator MSB was set high on this cycle.
+    bool msb_rising = false;
+
+    bool is6581; //-V730_NOINIT this is initialized in the SID constructor
+
+private:
+    void shift_phase2(unsigned int waveform_old, unsigned int waveform_new);
+
+    void write_shift_register();
+
+    void set_noise_output();
+
+    void set_no_noise_or_noise_output();
+
+    void waveBitfade();
+
+    void shiftregBitfade();
+
+public:
+    void setWaveformModels(matrix_t* models);
+    void setPulldownModels(matrix_t* models);
+
+    /**
+     * Set the chip model.
+     * Must be called before any operation.
+     *
+     * @param is6581 true if MOS6581, false if CSG8580
+     */
+    void setModel(bool is6581) { this->is6581 = is6581; }
+
+    /**
+     * SID clocking.
+     */
+    void clock();
+
+    /**
+     * Synchronize oscillators.
+     * This must be done after all the oscillators have been clock()'ed,
+     * so that they are in the same state.
+     *
+     * @param syncDest The oscillator that will be synced
+     * @param syncSource The sync source oscillator
+     */
+    void synchronize(WaveformGenerator* syncDest, const WaveformGenerator* syncSource) const;
+
+    /**
+     * Write FREQ LO register.
+     *
+     * @param freq_lo low 8 bits of frequency
+     */
+    void writeFREQ_LO(unsigned char freq_lo) { freq = (freq & 0xff00) | (freq_lo & 0xff); }
+
+    /**
+     * Write FREQ HI register.
+     *
+     * @param freq_hi high 8 bits of frequency
+     */
+    void writeFREQ_HI(unsigned char freq_hi) { freq = (freq_hi << 8 & 0xff00) | (freq & 0xff); }
+
+    /**
+     * Write PW LO register.
+     *
+     * @param pw_lo low 8 bits of pulse width
+     */
+    void writePW_LO(unsigned char pw_lo) { pw = (pw & 0xf00) | (pw_lo & 0x0ff); }
+
+    /**
+     * Write PW HI register.
+     *
+     * @param pw_hi high 8 bits of pulse width
+     */
+    void writePW_HI(unsigned char pw_hi) { pw = (pw_hi << 8 & 0xf00) | (pw & 0x0ff); }
+
+    /**
+     * Write CONTROL REGISTER register.
+     *
+     * @param control control register value
+     */
+    void writeCONTROL_REG(unsigned char control);
+
+    /**
+     * SID reset.
+     */
+    void reset();
+
+    /**
+     * 12-bit waveform output.
+     *
+     * @param ringModulator The oscillator ring-modulating current one.
+     * @return the waveform generator digital output
+     */
+    unsigned int output(const WaveformGenerator* ringModulator);
+
+    /**
+     * Read OSC3 value.
+     */
+    unsigned char readOSC() const { return static_cast<unsigned char>(osc3 >> 4); }
+
+    /**
+     * Read accumulator value.
+     */
+    unsigned int readAccumulator() const { return accumulator; }
+
+    /**
+     * Read freq value.
+     */
+    unsigned int readFreq() const { return freq; }
+
+    /**
+     * Read test value.
+     */
+    bool readTest() const { return test; }
+
+    /**
+     * Read sync value.
+     */
+    bool readSync() const { return sync; }
+};
+
+} // namespace reSIDfp
+
+#if RESID_INLINING || defined(WAVEFORMGENERATOR_CPP)
+
+namespace reSIDfp
+{
+
+RESID_INLINE
+void WaveformGenerator::clock()
+{
+    if (unlikely(test))
+    {
+        if (unlikely(shift_register_reset != 0) && unlikely(--shift_register_reset == 0))
+        {
+#ifdef TRACE
+            std::cout << "shiftregBitfade" << std::endl;
+#endif
+            shiftregBitfade();
+            shift_latch = shift_register;
+
+            // New noise waveform output.
+            set_noise_output();
+        }
+
+        // Latch the test bit value for shift phase 2.
+        test_or_reset = true;
+
+        // The test bit sets pulse high.
+        pulse_output = 0xfff;
+    }
+    else
+    {
+        // Calculate new accumulator value;
+        const unsigned int accumulator_old = accumulator;
+        accumulator = (accumulator + freq) & 0xffffff;
+
+        // Check which bit have changed from low to high
+        const unsigned int accumulator_bits_set = ~accumulator_old & accumulator;
+
+        // Check whether the MSB is set high. This is used for synchronization.
+        msb_rising = (accumulator_bits_set & 0x800000) != 0;
+
+        // Shift noise register once for each time accumulator bit 19 is set high.
+        // The shift is delayed 2 cycles.
+        if (unlikely((accumulator_bits_set & 0x080000) != 0))
+        {
+            // Pipeline: Detect rising bit, shift phase 1, shift phase 2.
+            shift_pipeline = 2;
+        }
+        else if (unlikely(shift_pipeline != 0))
+        {
+            switch (--shift_pipeline)
+            {
+            case 0:
+#ifdef TRACE
+                std::cout << "shift phase 2" << std::endl;
+#endif
+                shift_phase2(waveform, waveform);
+                break;
+            case 1:
+#ifdef TRACE
+                std::cout << "shift phase 1" << std::endl;
+#endif
+                // Start shift phase 1.
+                test_or_reset = false;
+                shift_latch = shift_register;
+                break;
+            }
+        }
+    }
+}
+
+RESID_INLINE
+unsigned int WaveformGenerator::output(const WaveformGenerator* ringModulator)
+{
+    // Set output value.
+    if (likely(waveform != 0))
+    {
+        const unsigned int ix = (accumulator ^ (~ringModulator->accumulator & ring_msb_mask)) >> 12;
+
+        // The bit masks no_pulse and no_noise are used to achieve branch-free
+        // calculation of the output value.
+        waveform_output = wave[ix] & (no_pulse | pulse_output) & no_noise_or_noise_output;
+        if (pulldown != nullptr)
+            waveform_output = pulldown[waveform_output];
+
+        // Triangle/Sawtooth output is delayed half cycle on 8580.
+        // This will appear as a one cycle delay on OSC3 as it is latched
+        // in the first phase of the clock.
+        if ((waveform & 3) && !is6581)
+        {
+            osc3 = tri_saw_pipeline & (no_pulse | pulse_output) & no_noise_or_noise_output;
+            if (pulldown != nullptr)
+                osc3 = pulldown[osc3];
+            tri_saw_pipeline = wave[ix];
+        }
+        else
+        {
+            osc3 = waveform_output;
+        }
+        // In the 6581 the top bit of the accumulator may be driven low by combined waveforms
+        // when the sawtooth is selected
+        if (is6581 && (waveform & 0x2) && ((waveform_output & 0x800) == 0))
+        {
+            msb_rising = 0;
+            accumulator &= 0x7fffff;
+        }
+
+        write_shift_register();
+    }
+    else
+    {
+        // Age floating DAC input.
+        if (likely(floating_output_ttl != 0) && unlikely(--floating_output_ttl == 0))
+        {
+            waveBitfade();
+        }
+    }
+
+    // The pulse level is defined as (accumulator >> 12) >= pw ? 0xfff : 0x000.
+    // The expression -((accumulator >> 12) >= pw) & 0xfff yields the same
+    // results without any branching (and thus without any pipeline stalls).
+    // NB! This expression relies on that the result of a boolean expression
+    // is either 0 or 1, and furthermore requires two's complement integer.
+    // A few more cycles may be saved by storing the pulse width left shifted
+    // 12 bits, and dropping the and with 0xfff (this is valid since pulse is
+    // used as a bit mask on 12 bit values), yielding the expression
+    // -(accumulator >= pw24). However this only results in negligible savings.
+
+    // The result of the pulse width compare is delayed one cycle.
+    // Push next pulse level into pulse level pipeline.
+    pulse_output = ((accumulator >> 12) >= pw) ? 0xfff : 0x000;
+
+    return waveform_output;
+}
+
+} // namespace reSIDfp
+
+#endif
+
+#endif
diff --git a/src/sound/resid-fp/aclocal.m4 b/src/sound/resid-fp/aclocal.m4
deleted file mode 100644
index aef181a6d..000000000
--- a/src/sound/resid-fp/aclocal.m4
+++ /dev/null
@@ -1,850 +0,0 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 7
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
diff --git a/src/sound/resid-fp/array.h b/src/sound/resid-fp/array.h
new file mode 100644
index 000000000..58c4617ae
--- /dev/null
+++ b/src/sound/resid-fp/array.h
@@ -0,0 +1,80 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ *  Copyright (C) 2011-2014 Leandro Nini
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef ARRAY_H
+#define ARRAY_H
+
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include <atomic>
+
+/**
+ * Counter.
+ */
+class counter
+{
+private:
+    std::atomic<unsigned int> c;
+
+public:
+    counter() : c(1) {}
+    void increase() { ++c; }
+    unsigned int decrease() { return --c; }
+};
+
+/**
+ * Reference counted pointer to matrix wrapper, for use with standard containers.
+ */
+template<typename T>
+class matrix
+{
+private:
+    T* data;
+    counter* count;
+    const unsigned int x, y;
+
+public:
+    matrix(unsigned int x, unsigned int y) :
+        data(new T[x * y]),
+        count(new counter()),
+        x(x),
+        y(y) {}
+
+    matrix(const matrix& p) :
+        data(p.data),
+        count(p.count),
+        x(p.x),
+        y(p.y) { count->increase(); }
+
+    ~matrix() { if (count->decrease() == 0) { delete count; delete [] data; } }
+
+    unsigned int length() const { return x * y; }
+
+    T* operator[](unsigned int a) { return &data[a * y]; }
+
+    T const* operator[](unsigned int a) const { return &data[a * y]; }
+};
+
+using matrix_t = matrix<short>;
+
+#endif
diff --git a/src/sound/resid-fp/config.h b/src/sound/resid-fp/config.h
new file mode 100644
index 000000000..399003a55
--- /dev/null
+++ b/src/sound/resid-fp/config.h
@@ -0,0 +1 @@
+#define HAVE_CXX17
diff --git a/src/sound/resid-fp/configure b/src/sound/resid-fp/configure
deleted file mode 100644
index 35a9c8f7d..000000000
--- a/src/sound/resid-fp/configure
+++ /dev/null
@@ -1,5955 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes && 	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  case $as_dir in
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="sid.h"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-RESID_INLINE
-CXX
-CXXFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CXX
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CXXDEPMODE
-am__fastdepCXX_TRUE
-am__fastdepCXX_FALSE
-AR
-RANLIB
-PERL
-CXXCPP
-GREP
-EGREP
-USE_SSE_TRUE
-USE_SSE_FALSE
-RESID_HAVE_BOOL
-RESID_USE_SSE
-HAVE_LOGF_PROTOTYPE
-HAVE_EXPF_PROTOTYPE
-LIBOBJS
-LTLIBOBJS'
-ac_subst_files=''
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CXX
-CXXFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CCC
-CXXCPP'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute directory names.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-inline         enable inlining of functions default=yes
-  --enable-sse            enable the use of SSE default=yes
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-
-Some influential environment variables:
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CXXCPP      C++ preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.61
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
-fi
-shift
-for ac_site_file
-do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-am__api_version="1.9"
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE=resid
- VERSION=0.16vice
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-LTVERSION=5:0:0
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-# Check whether --enable-inline was given.
-if test "${enable_inline+set}" = set; then
-  enableval=$enable_inline;
-fi
-
-# Check whether --enable-sse was given.
-if test "${enable_sse+set}" = set; then
-  enableval=$enable_sse;
-fi
-
-
-if test "$enable_inline" != no; then
-  RESID_INLINE=inline
-else
-  RESID_INLINE=
-fi
-
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-  fi
-fi
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
-echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
-echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C++ compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CXXFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-
-depcc="$CXX"  am_compiler_list=
-
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
-
-
-
-if test x"$enable_sse" != "xno"; then
-  if test "$GXX" = yes; then
-    if test "$ac_test_CXXFLAGS" != set; then
-      CXXFLAGS="-g -Wall -O2 -msse"
-      { echo "$as_me:$LINENO: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-echo $ECHO_N "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works... $ECHO_C" >&6; }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-int test;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-                       MSSE="-msse"
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	 { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                       MSSE=""
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-  fi
-else
-  MSSE=""
-fi
-
-if test "$GXX" = yes; then
-  if test "$ac_test_CXXFLAGS" != set; then
-    CXXFLAGS="-g -Wall -O2 $MSSE -fno-exceptions"
-    { echo "$as_me:$LINENO: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-echo $ECHO_N "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works... $ECHO_C" >&6; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-int test;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-                     NO_EXCEPTIONS="-fno-exceptions"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	 { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                     NO_EXCEPTIONS=""
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  fi
-fi
-
-if test "$GXX" = yes; then
-  if test "$ac_test_CXXFLAGS" != set; then
-    CXXFLAGS="-g -Wall -O2 $MSSE -fno-exceptions $NO_EXCEPTIONS -fno-pic"
-    { echo "$as_me:$LINENO: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-echo $ECHO_N "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works... $ECHO_C" >&6; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-int test;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-                     NO_PIC="-fno-pic"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	 { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                     NO_PIC=""
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  fi
-fi
-
-CXXFLAGS="-g -Wall -O2 $MSSE $NO_EXCEPTIONS $NO_PIC"
-if test x"$MSSE" = "x-msse"; then
-  { echo "$as_me:$LINENO: checking if the xmmintrin.h include can be used" >&5
-echo $ECHO_N "checking if the xmmintrin.h include can be used... $ECHO_C" >&6; }
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <xmmintrin.h>
-int
-main ()
-{
-int test;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	 { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                   MSSE=""
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CXXFLAGS="-g -Wall -O2 $NO_EXCEPTIONS $NO_PIC"
-fi
-
-# Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_PERL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $PERL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PERL=$ac_cv_path_PERL
-if test -n "$PERL"; then
-  { echo "$as_me:$LINENO: result: $PERL" >&5
-echo "${ECHO_T}$PERL" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-
-
-
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
-if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_GREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_EGREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-
-   fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-{ echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6; }
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef int ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int=$ac_lo;;
-'') if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_int=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_int=0
-   fi
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
-
-
-
-if test $ac_cv_sizeof_int -lt 4; then
-  { { echo "$as_me:$LINENO: error: only 32 bit or better CPUs are supported" >&5
-echo "$as_me: error: only 32 bit or better CPUs are supported" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-{ echo "$as_me:$LINENO: checking for working bool" >&5
-echo $ECHO_N "checking for working bool... $ECHO_C" >&6; }
-if test "${ac_cv_cxx_bool+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-bool flag;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_cxx_bool=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_cxx_bool=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_bool" >&5
-echo "${ECHO_T}$ac_cv_cxx_bool" >&6; }
-
-if test $ac_cv_cxx_bool = no; then
-  RESID_HAVE_BOOL=0
-else
-  RESID_HAVE_BOOL=1
-fi
-
-if test x"$MSSE" = "x-msse"; then
-  RESID_USE_SSE=1
-
-
-if true; then
-  USE_SSE_TRUE=
-  USE_SSE_FALSE='#'
-else
-  USE_SSE_TRUE='#'
-  USE_SSE_FALSE=
-fi
-
-else
-  RESID_USE_SSE=0
-
-
-if false; then
-  USE_SSE_TRUE=
-  USE_SSE_FALSE='#'
-else
-  USE_SSE_TRUE='#'
-  USE_SSE_FALSE=
-fi
-
-fi
-
-
-
-
-
-
-
-for ac_func in logf expf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-{ echo "$as_me:$LINENO: checking if the logf prototype is present" >&5
-echo $ECHO_N "checking if the logf prototype is present... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <math.h>
-                #include <stdio.h>
-int
-main ()
-{
-printf("%d",logf);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-                 HAVE_LOGF_PROTOTYPE=1
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	 { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                HAVE_LOGF_PROTOTYPE=0
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-{ echo "$as_me:$LINENO: checking if the expf prototype is present" >&5
-echo $ECHO_N "checking if the expf prototype is present... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <math.h>
-                #include <stdio.h>
-int
-main ()
-{
-printf("%d",expf);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-                 HAVE_EXPF_PROTOTYPE=1
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	 { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                HAVE_EXPF_PROTOTYPE=0
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-
-
-ac_config_files="$ac_config_files Makefile siddefs-fp.h"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-ac_script='
-t clear
-:clear
-s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
-t quote
-s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
-t quote
-b any
-:quote
-s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
-s/\[/\\&/g
-s/\]/\\&/g
-s/\$/$$/g
-H
-:any
-${
-	g
-	s/^\n//
-	s/\n/ /g
-	p
-}
-'
-DEFS=`sed -n "$ac_script" confdefs.h`
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${USE_SSE_TRUE}" && test -z "${USE_SSE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_SSE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_SSE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${USE_SSE_TRUE}" && test -z "${USE_SSE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_SSE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_SSE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2006 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --he | --h |  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
-  export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "siddefs-fp.h") CONFIG_FILES="$CONFIG_FILES siddefs-fp.h" ;;
-
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-RESID_INLINE!$RESID_INLINE$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CXXDEPMODE!$CXXDEPMODE$ac_delim
-am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-AR!$AR$ac_delim
-RANLIB!$RANLIB$ac_delim
-PERL!$PERL$ac_delim
-CXXCPP!$CXXCPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-USE_SSE_TRUE!$USE_SSE_TRUE$ac_delim
-USE_SSE_FALSE!$USE_SSE_FALSE$ac_delim
-RESID_HAVE_BOOL!$RESID_HAVE_BOOL$ac_delim
-RESID_USE_SSE!$RESID_USE_SSE$ac_delim
-HAVE_LOGF_PROTOTYPE!$HAVE_LOGF_PROTOTYPE$ac_delim
-HAVE_EXPF_PROTOTYPE!$HAVE_EXPF_PROTOTYPE$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
-_ACEOF
-
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-fi # test -n "$CONFIG_FILES"
-
-
-for ac_tag in  :F $CONFIG_FILES      :C $CONFIG_COMMANDS
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    fi
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
- ;;
-
-
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-
-  esac
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/src/sound/resid-fp/configure.in b/src/sound/resid-fp/configure.in
deleted file mode 100644
index f4b3b5731..000000000
--- a/src/sound/resid-fp/configure.in
+++ /dev/null
@@ -1,166 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(sid.h)
-
-dnl Use Automake
-AM_INIT_AUTOMAKE(resid, 0.16vice)
-LTVERSION=5:0:0
-
-dnl Use C++ for tests.
-AC_LANG_CPLUSPLUS
-
-dnl Enable inlining.
-AC_ARG_ENABLE(inline,
-[  --enable-inline         enable inlining of functions [default=yes]])
-AC_ARG_ENABLE(sse,
-[  --enable-sse            enable the use of SSE [default=yes]])
-
-if test "$enable_inline" != no; then
-  RESID_INLINE=inline
-else
-  RESID_INLINE=
-fi
-
-AC_SUBST(RESID_INLINE)
-
-dnl Checks for programs.
-AC_PROG_CXX
-
-dnl Set CXXFLAGS for g++. Use -msse if supported.
-if test x"$enable_sse" != "xno"; then
-  if test "$GXX" = yes; then
-    if test "$ac_test_CXXFLAGS" != set; then
-      CXXFLAGS="-g -Wall -O2 -msse"
-      AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
-      AC_TRY_COMPILE([],
-                     [int test;],
-                     [ AC_MSG_RESULT(yes)
-                       MSSE="-msse"
-                       ],
-                     [ AC_MSG_RESULT(no)
-                       MSSE=""
-                       ])
-    fi
-  fi
-else
-  MSSE=""
-fi
-
-dnl Set CXXFLAGS for g++. Use -fno-exceptions if supported.
-if test "$GXX" = yes; then
-  if test "$ac_test_CXXFLAGS" != set; then
-    CXXFLAGS="-g -Wall -O2 $MSSE -fno-exceptions"
-    AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
-    AC_TRY_COMPILE([],
-                   [int test;],
-                   [ AC_MSG_RESULT(yes)
-                     NO_EXCEPTIONS="-fno-exceptions" ],
-                   [ AC_MSG_RESULT(no)
-                     NO_EXCEPTIONS=""
-                     ])
-  fi
-fi
-
-dnl Set CXXFLAGS for g++. Use -fno-pic if supported.
-if test "$GXX" = yes; then
-  if test "$ac_test_CXXFLAGS" != set; then
-    CXXFLAGS="-g -Wall -O2 $MSSE -fno-exceptions $NO_EXCEPTIONS -fno-pic"
-    AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
-    AC_TRY_COMPILE([],
-                   [int test;],
-                   [ AC_MSG_RESULT(yes)
-                     NO_PIC="-fno-pic" ],
-                   [ AC_MSG_RESULT(no)
-                     NO_PIC=""
-                     ])
-  fi
-fi
-
-CXXFLAGS="-g -Wall -O2 $MSSE $NO_EXCEPTIONS $NO_PIC"
-if test x"$MSSE" = "x-msse"; then
-  AC_MSG_CHECKING([if the xmmintrin.h include can be used])
-  AC_TRY_COMPILE([#include <xmmintrin.h>],
-                 [int test;],
-                 [ AC_MSG_RESULT(yes)
-                   ],
-                 [ AC_MSG_RESULT(no)
-                   MSSE=""
-                   ])
-  CXXFLAGS="-g -Wall -O2 $NO_EXCEPTIONS $NO_PIC"
-fi
-
-AC_CHECK_PROG(AR, ar, ar, ar)
-AC_PROG_RANLIB
-AC_PATH_PROG(PERL, perl)
-
-dnl Libtool
-
-dnl AC_DISABLE_SHARED
-dnl AM_PROG_LIBTOOL
-dnl AC_SUBST(LIBTOOL_DEPS)
-dnl AC_SUBST(LTVERSION)
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_CHECK_SIZEOF(int, 4)
-
-if test $ac_cv_sizeof_int -lt 4; then
-  AC_MSG_ERROR([only 32 bit or better CPUs are supported])
-fi
-
-AC_CACHE_CHECK([for working bool], ac_cv_cxx_bool,
-[AC_TRY_COMPILE(,
-[
-bool flag;
-],
-ac_cv_cxx_bool=yes, ac_cv_cxx_bool=no)])
-
-if test $ac_cv_cxx_bool = no; then
-  RESID_HAVE_BOOL=0
-else
-  RESID_HAVE_BOOL=1
-fi
-
-if test x"$MSSE" = "x-msse"; then
-  RESID_USE_SSE=1
-  AM_CONDITIONAL(USE_SSE, true)
-else
-  RESID_USE_SSE=0
-  AM_CONDITIONAL(USE_SSE, false)
-fi
-
-AC_SUBST(RESID_HAVE_BOOL)
-AC_SUBST(RESID_USE_SSE)
-
-dnl Checks for library functions.
-
-AC_CHECK_FUNCS(logf expf)
-
-AC_MSG_CHECKING([if the logf prototype is present])
-AC_TRY_COMPILE([#include <math.h>
-                #include <stdio.h>],
-               [printf("%d",logf);],
-               [ AC_MSG_RESULT(yes)
-                 HAVE_LOGF_PROTOTYPE=1
-                ],
-               [ AC_MSG_RESULT(no)
-                HAVE_LOGF_PROTOTYPE=0
-                ])
-
-AC_MSG_CHECKING([if the expf prototype is present])
-AC_TRY_COMPILE([#include <math.h>
-                #include <stdio.h>],
-               [printf("%d",expf);],
-               [ AC_MSG_RESULT(yes)
-                 HAVE_EXPF_PROTOTYPE=1
-                ],
-               [ AC_MSG_RESULT(no)
-                HAVE_EXPF_PROTOTYPE=0
-                ])
-
-AC_SUBST(HAVE_LOGF_PROTOTYPE)
-AC_SUBST(HAVE_EXPF_PROTOTYPE)
-
-AC_OUTPUT(Makefile siddefs-fp.h)
diff --git a/src/sound/resid-fp/convolve-sse.cc b/src/sound/resid-fp/convolve-sse.cc
deleted file mode 100644
index daf3979f2..000000000
--- a/src/sound/resid-fp/convolve-sse.cc
+++ /dev/null
@@ -1,76 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-#include <stdint.h>
-#include "sid.h"
-
-#if (RESID_USE_SSE==1)
-
-#include <xmmintrin.h>
-
-float convolve_sse(const float *a, const float *b, int n)
-{
-    float out = 0.f;
-    __m128 out4 = { 0, 0, 0, 0 };
-
-    /* examine if we can use aligned loads on both pointers */
-    int diff = (int) (a - b) & 0xf;
-    /* long cast is no-op for x86-32, but x86-64 gcc needs 64 bit intermediate
-     * to convince compiler we mean this. */
-    unsigned int a_align = (unsigned int) (uintptr_t) a & 0xf;
-
-    /* advance if necessary. We can't let n fall < 0, so no while (n --). */
-    while (n > 0 && a_align != 0 && a_align != 16) {
-        out += (*(a ++)) * (*(b ++));
-        --n;
-        a_align += 4;
-    }
-
-    int n4 = n / 4;
-    if (diff == 0) {
-        for (int i = 0; i < n4; i ++) {
-            out4 = _mm_add_ps(out4, _mm_mul_ps(_mm_load_ps(a), _mm_load_ps(b)));
-            a += 4;
-            b += 4;
-        }
-    } else {
-        /* XXX loadu is 4x slower than load, at least. We could at 4x memory
-         * use prepare versions of b aligned for any a alignment. We could
-         * also issue aligned loads and shuffle the halves at each iteration.
-         * Initial results indicate only very small improvements. */
-        for (int i = 0; i < n4; i ++) {
-            out4 = _mm_add_ps(out4, _mm_mul_ps(_mm_load_ps(a), _mm_loadu_ps(b)));
-            a += 4;
-            b += 4;
-        }
-    }
-
-    out4 = _mm_add_ps(_mm_movehl_ps(out4, out4), out4);
-    out4 = _mm_add_ss(_mm_shuffle_ps(out4, out4, 1), out4);
-    float out_tmp;
-    _mm_store_ss(&out_tmp, out4);
-    out += out_tmp;
-
-    n &= 3;
-    
-    while (n --)
-        out += (*(a ++)) * (*(b ++));
-
-    return out;
-}
-#endif
diff --git a/src/sound/resid-fp/convolve.cc b/src/sound/resid-fp/convolve.cc
deleted file mode 100644
index b028ace86..000000000
--- a/src/sound/resid-fp/convolve.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-float convolve(const float *a, const float *b, int n)
-{
-    float out = 0.f;
-    while (n --)
-        out += (*(a ++)) * (*(b ++));
-    return out;
-}
-
diff --git a/src/sound/resid-fp/envelope.cc b/src/sound/resid-fp/envelope.cc
deleted file mode 100644
index 5417adc43..000000000
--- a/src/sound/resid-fp/envelope.cc
+++ /dev/null
@@ -1,254 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#define __ENVELOPE_CC__
-#include "envelope.h"
-
-// ----------------------------------------------------------------------------
-// Constructor.
-// ----------------------------------------------------------------------------
-EnvelopeGeneratorFP::EnvelopeGeneratorFP()
-{
-  reset();
-}
-
-// ----------------------------------------------------------------------------
-// SID reset.
-// ----------------------------------------------------------------------------
-void EnvelopeGeneratorFP::reset()
-{
-  envelope_counter = 0;
-
-  attack = 0;
-  decay = 0;
-  sustain = 0;
-  release = 0;
-
-  gate = 0;
-
-  rate_counter = 0;
-  exponential_counter = 0;
-  exponential_counter_period = 1;
-
-  state = RELEASE;
-  rate_period = rate_counter_period[release];
-  hold_zero = true;
-}
-
-
-// Rate counter periods are calculated from the Envelope Rates table in
-// the Programmer's Reference Guide. The rate counter period is the number of
-// cycles between each increment of the envelope counter.
-// The rates have been verified by sampling ENV3. 
-//
-// The rate counter is a 16 bit register which is incremented each cycle.
-// When the counter reaches a specific comparison value, the envelope counter
-// is incremented (attack) or decremented (decay/release) and the
-// counter is zeroed.
-//
-// NB! Sampling ENV3 shows that the calculated values are not exact.
-// It may seem like most calculated values have been rounded (.5 is rounded
-// down) and 1 has beed added to the result. A possible explanation for this
-// is that the SID designers have used the calculated values directly
-// as rate counter comparison values, not considering a one cycle delay to
-// zero the counter. This would yield an actual period of comparison value + 1.
-//
-// The time of the first envelope count can not be exactly controlled, except
-// possibly by resetting the chip. Because of this we cannot do cycle exact
-// sampling and must devise another method to calculate the rate counter
-// periods.
-//
-// The exact rate counter periods can be determined e.g. by counting the number
-// of cycles from envelope level 1 to envelope level 129, and dividing the
-// number of cycles by 128. CIA1 timer A and B in linked mode can perform
-// the cycle count. This is the method used to find the rates below.
-//
-// To avoid the ADSR delay bug, sampling of ENV3 should be done using
-// sustain = release = 0. This ensures that the attack state will not lower
-// the current rate counter period.
-//
-// The ENV3 sampling code below yields a maximum timing error of 14 cycles.
-//     lda #$01
-// l1: cmp $d41c
-//     bne l1
-//     ...
-//     lda #$ff
-// l2: cmp $d41c
-//     bne l2
-//
-// This yields a maximum error for the calculated rate period of 14/128 cycles.
-// The described method is thus sufficient for exact calculation of the rate
-// periods.
-//
-reg16 EnvelopeGeneratorFP::rate_counter_period[] = {
-      9,  //   2ms*1.0MHz/256 =     7.81
-     32,  //   8ms*1.0MHz/256 =    31.25
-     63,  //  16ms*1.0MHz/256 =    62.50
-     95,  //  24ms*1.0MHz/256 =    93.75
-    149,  //  38ms*1.0MHz/256 =   148.44
-    220,  //  56ms*1.0MHz/256 =   218.75
-    267,  //  68ms*1.0MHz/256 =   265.63
-    313,  //  80ms*1.0MHz/256 =   312.50
-    392,  // 100ms*1.0MHz/256 =   390.63
-    977,  // 250ms*1.0MHz/256 =   976.56
-   1954,  // 500ms*1.0MHz/256 =  1953.13
-   3126,  // 800ms*1.0MHz/256 =  3125.00
-   3907,  //   1 s*1.0MHz/256 =  3906.25
-  11720,  //   3 s*1.0MHz/256 = 11718.75
-  19532,  //   5 s*1.0MHz/256 = 19531.25
-  31251   //   8 s*1.0MHz/256 = 31250.00
-};
-
-
-// For decay and release, the clock to the envelope counter is sequentially
-// divided by 1, 2, 4, 8, 16, 30, 1 to create a piece-wise linear approximation
-// of an exponential. The exponential counter period is loaded at the envelope
-// counter values 255, 93, 54, 26, 14, 6, 0. The period can be different for the
-// same envelope counter value, depending on whether the envelope has been
-// rising (attack -> release) or sinking (decay/release).
-//
-// Since it is not possible to reset the rate counter (the test bit has no
-// influence on the envelope generator whatsoever) a method must be devised to
-// do cycle exact sampling of ENV3 to do the investigation. This is possible
-// with knowledge of the rate period for A=0, found above.
-//
-// The CPU can be synchronized with ENV3 by first synchronizing with the rate
-// counter by setting A=0 and wait in a carefully timed loop for the envelope
-// counter _not_ to change for 9 cycles. We can then wait for a specific value
-// of ENV3 with another timed loop to fully synchronize with ENV3.
-//
-// At the first period when an exponential counter period larger than one
-// is used (decay or relase), one extra cycle is spent before the envelope is
-// decremented. The envelope output is then delayed one cycle until the state
-// is changed to attack. Now one cycle less will be spent before the envelope
-// is incremented, and the situation is normalized.
-// The delay is probably caused by the comparison with the exponential counter,
-// and does not seem to affect the rate counter. This has been verified by
-// timing 256 consecutive complete envelopes with A = D = R = 1, S = 0, using
-// CIA1 timer A and B in linked mode. If the rate counter is not affected the
-// period of each complete envelope is
-// (255 + 162*1 + 39*2 + 28*4 + 12*8 + 8*16 + 6*30)*32 = 756*32 = 32352
-// which corresponds exactly to the timed value divided by the number of
-// complete envelopes.
-// NB! This one cycle delay is not modeled.
-
-
-// From the sustain levels it follows that both the low and high 4 bits of the
-// envelope counter are compared to the 4-bit sustain value.
-// This has been verified by sampling ENV3.
-//
-reg8 EnvelopeGeneratorFP::sustain_level[] = {
-  0x00,
-  0x11,
-  0x22,
-  0x33,
-  0x44,
-  0x55,
-  0x66,
-  0x77,
-  0x88,
-  0x99,
-  0xaa,
-  0xbb,
-  0xcc,
-  0xdd,
-  0xee,
-  0xff,
-};
-
-
-// ----------------------------------------------------------------------------
-// Register functions.
-// ----------------------------------------------------------------------------
-void EnvelopeGeneratorFP::writeCONTROL_REG(reg8 control)
-{
-  reg8 gate_next = control & 0x01;
-
-  // The rate counter is never reset, thus there will be a delay before the
-  // envelope counter starts counting up (attack) or down (release).
-
-  // Gate bit on: Start attack, decay, sustain.
-  if (!gate && gate_next) {
-    state = ATTACK;
-    update_rate_period(rate_counter_period[attack]);
-
-    // Switching to attack state unlocks the zero freeze.
-    hold_zero = false;
-  }
-  // Gate bit off: Start release.
-  else if (gate && !gate_next) {
-    state = RELEASE;
-    update_rate_period(rate_counter_period[release]);
-  }
-
-  gate = gate_next;
-}
-
-void EnvelopeGeneratorFP::writeATTACK_DECAY(reg8 attack_decay)
-{
-  attack = (attack_decay >> 4) & 0x0f;
-  decay = attack_decay & 0x0f;
-  if (state == ATTACK) {
-    update_rate_period(rate_counter_period[attack]);
-  }
-  else if (state == DECAY_SUSTAIN) {
-    update_rate_period(rate_counter_period[decay]);
-  }
-}
-
-void EnvelopeGeneratorFP::writeSUSTAIN_RELEASE(reg8 sustain_release)
-{
-  sustain = (sustain_release >> 4) & 0x0f;
-  release = sustain_release & 0x0f;
-  if (state == RELEASE) {
-    update_rate_period(rate_counter_period[release]);
-  }
-}
-
-reg8 EnvelopeGeneratorFP::readENV()
-{
-  return output();
-}
-
-void EnvelopeGeneratorFP::update_rate_period(reg16 newperiod)
-{
-    rate_period = newperiod;
-
-   /* The ADSR counter is XOR shift register with 0x7fff unique values.
-    * If the rate_period is adjusted to a value already seen in this cycle,
-    * the register will wrap around. This is known as the ADSR delay bug.
-    *
-    * To simplify the hot path calculation, we simulate this through observing
-    * that we add the 0x7fff cycle delay by changing the rate_counter variable
-    * directly. This takes care of the 99 % common case. However, playroutine
-    * could make multiple consequtive rate_period adjustments, in which case we
-    * need to cancel the previous adjustment. */
-
-    /* if the new period exeecds 0x7fff, we need to wrap */
-    if (rate_period - rate_counter > 0x7fff)
-        rate_counter += 0x7fff;
-
-    /* simulate 0x7fff wraparound, if the period-to-be-written
-     * is less than the current value. */
-    if (rate_period <= rate_counter)
-        rate_counter -= 0x7fff;
-
-    /* at this point it should be impossible for
-     * rate_counter >= rate_period. If it is, there is a bug... */
-}
diff --git a/src/sound/resid-fp/envelope.h b/src/sound/resid-fp/envelope.h
deleted file mode 100644
index af0764ccd..000000000
--- a/src/sound/resid-fp/envelope.h
+++ /dev/null
@@ -1,174 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#ifndef __ENVELOPE_H__
-#define __ENVELOPE_H__
-
-#include "siddefs-fp.h"
-
-// ----------------------------------------------------------------------------
-// A 15 bit counter is used to implement the envelope rates, in effect
-// dividing the clock to the envelope counter by the currently selected rate
-// period.
-// In addition, another counter is used to implement the exponential envelope
-// decay, in effect further dividing the clock to the envelope counter.
-// The period of this counter is set to 1, 2, 4, 8, 16, 30 at the envelope
-// counter values 255, 93, 54, 26, 14, 6, respectively.
-// ----------------------------------------------------------------------------
-class EnvelopeGeneratorFP
-{
-public:
-  EnvelopeGeneratorFP();
-
-  enum State { ATTACK, DECAY_SUSTAIN, RELEASE };
-
-  RESID_INLINE void clock();
-  void reset();
-
-  void writeCONTROL_REG(reg8);
-  void writeATTACK_DECAY(reg8);
-  void writeSUSTAIN_RELEASE(reg8);
-  reg8 readENV();
-
-  // 8-bit envelope output.
-  RESID_INLINE reg8 output();
-
-protected:
-  void update_rate_period(reg16 period);
-
-  int rate_counter;
-  int rate_period;
-  reg8 exponential_counter;
-  reg8 exponential_counter_period;
-  reg8 envelope_counter;
-  bool hold_zero;
-
-  reg4 attack;
-  reg4 decay;
-  reg4 sustain;
-  reg4 release;
-
-  reg8 gate;
-
-  State state;
-
-  // Lookup table to convert from attack, decay, or release value to rate
-  // counter period.
-  static reg16 rate_counter_period[];
-
-  // The 16 selectable sustain levels.
-  static reg8 sustain_level[];
-
-friend class SIDFP;
-};
-
-
-// ----------------------------------------------------------------------------
-// SID clocking - 1 cycle.
-// ----------------------------------------------------------------------------
-RESID_INLINE
-void EnvelopeGeneratorFP::clock()
-{
-  if (++ rate_counter != rate_period)
-    return;
-
-  rate_counter = 0;
-
-  // The first envelope step in the attack state also resets the exponential
-  // counter. This has been verified by sampling ENV3.
-  //
-  if (state == ATTACK || ++exponential_counter == exponential_counter_period)
-  {
-    exponential_counter = 0;
-
-    // Check whether the envelope counter is frozen at zero.
-    if (hold_zero) {
-      return;
-    }
-
-    switch (state) {
-    case ATTACK:
-      // The envelope counter can flip from 0xff to 0x00 by changing state to
-      // release, then to attack. The envelope counter is then frozen at
-      // zero; to unlock this situation the state must be changed to release,
-      // then to attack. This has been verified by sampling ENV3.
-      //
-      ++envelope_counter &= 0xff;
-      if (envelope_counter == 0xff) {
-        state = DECAY_SUSTAIN;
-        update_rate_period(rate_counter_period[decay]);
-      }
-      break;
-    case DECAY_SUSTAIN:
-      if (envelope_counter != sustain_level[sustain]) {
-        --envelope_counter;
-      }
-      break;
-    case RELEASE:
-      // The envelope counter can flip from 0x00 to 0xff by changing state to
-      // attack, then to release. The envelope counter will then continue
-      // counting down in the release state.
-      // This has been verified by sampling ENV3.
-      // NB! The operation below requires two's complement integer.
-      //
-      --envelope_counter &= 0xff;
-      break;
-    }
-
-    // Check for change of exponential counter period.
-    switch (envelope_counter) {
-    case 0xff:
-      exponential_counter_period = 1;
-      break;
-    case 0x5d:
-      exponential_counter_period = 2;
-      break;
-    case 0x36:
-      exponential_counter_period = 4;
-      break;
-    case 0x1a:
-      exponential_counter_period = 8;
-      break;
-    case 0x0e:
-      exponential_counter_period = 16;
-      break;
-    case 0x06:
-      exponential_counter_period = 30;
-      break;
-    case 0x00:
-      exponential_counter_period = 1;
-
-      // When the envelope counter is changed to zero, it is frozen at zero.
-      // This has been verified by sampling ENV3.
-      hold_zero = true;
-      break;
-    }
-  }
-}
-
-// ----------------------------------------------------------------------------
-// Read the envelope generator output.
-// ----------------------------------------------------------------------------
-RESID_INLINE
-reg8 EnvelopeGeneratorFP::output()
-{
-  return envelope_counter;
-}
-
-#endif // not __ENVELOPE_H__
diff --git a/src/sound/resid-fp/extfilt.cc b/src/sound/resid-fp/extfilt.cc
deleted file mode 100644
index 777a23ee3..000000000
--- a/src/sound/resid-fp/extfilt.cc
+++ /dev/null
@@ -1,94 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#define __EXTFILT_CC__
-#include "extfilt.h"
-
-// ----------------------------------------------------------------------------
-// Constructor.
-// ----------------------------------------------------------------------------
-ExternalFilterFP::ExternalFilterFP()
-{
-  reset();
-  enable_filter(true);
-  set_chip_model(MOS6581FP);
-  set_clock_frequency(1e6f);
-  set_sampling_parameter(15915.6f);
-}
-
-
-// ----------------------------------------------------------------------------
-// Enable filter.
-// ----------------------------------------------------------------------------
-void ExternalFilterFP::enable_filter(bool enable)
-{
-  enabled = enable;
-}
-
-// ----------------------------------------------------------------------------
-// Setup of the external filter sampling parameters.
-// ----------------------------------------------------------------------------
-void ExternalFilterFP::set_clock_frequency(float clock)
-{
-  clock_frequency = clock;
-  _set_sampling_parameter();
-}
-
-void ExternalFilterFP::set_sampling_parameter(float freq)
-{
-  pass_frequency = freq;
-  _set_sampling_parameter();
-}
-
-void ExternalFilterFP::_set_sampling_parameter()
-{
-  // Low-pass:  R = 10kOhm, C = 1000pF; w0l = 1/RC = 1/(1e4*1e-9) = 100000
-  // High-pass: R =  1kOhm, C =   10uF; w0h = 1/RC = 1/(1e3*1e-5) =    100
-  w0hp = 100.f / clock_frequency;
-  w0lp = pass_frequency * 2.f * M_PI_f / clock_frequency;
-}
-
-// ----------------------------------------------------------------------------
-// Set chip model.
-// ----------------------------------------------------------------------------
-void ExternalFilterFP::set_chip_model(chip_model model)
-{
-  if (model == MOS6581FP) {
-    // Approximate the DC output level to be removed if the external
-    // filter is turned off. (0x800 - wave_zero + voice DC) * maxenv * voices
-    //  - extin offset...
-    mixer_DC = (-0x600 + 0x800) * 0xff * 3 - 0x20000;
-  }
-  else {
-    // No DC offsets in the MOS8580.
-    mixer_DC = 0;
-  }
-}
-
-
-// ----------------------------------------------------------------------------
-// SID reset.
-// ----------------------------------------------------------------------------
-void ExternalFilterFP::reset()
-{
-  // State of filter.
-  Vlp = 0;
-  Vhp = 0;
-  Vo = 0;
-}
diff --git a/src/sound/resid-fp/extfilt.h b/src/sound/resid-fp/extfilt.h
deleted file mode 100644
index b0e04d3b8..000000000
--- a/src/sound/resid-fp/extfilt.h
+++ /dev/null
@@ -1,120 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#ifndef __EXTFILT_H__
-#define __EXTFILT_H__
-
-#include <math.h>
-
-#include "siddefs-fp.h"
-
-// ----------------------------------------------------------------------------
-// The audio output stage in a Commodore 64 consists of two STC networks,
-// a low-pass filter with 3-dB frequency 16kHz followed by a high-pass
-// filter with 3-dB frequency 16Hz (the latter provided an audio equipment
-// input impedance of 1kOhm).
-// The STC networks are connected with a BJT supposedly meant to act as
-// a unity gain buffer, which is not really how it works. A more elaborate
-// model would include the BJT, however DC circuit analysis yields BJT
-// base-emitter and emitter-base impedances sufficiently low to produce
-// additional low-pass and high-pass 3dB-frequencies in the order of hundreds
-// of kHz. This calls for a sampling frequency of several MHz, which is far
-// too high for practical use.
-// ----------------------------------------------------------------------------
-class ExternalFilterFP
-{
-public:
-  ExternalFilterFP();
-
-  void enable_filter(bool enable);
-  void set_sampling_parameter(float pass_freq);
-  void set_chip_model(chip_model model);
-  void set_clock_frequency(float);
-
-  RESID_INLINE void clock(float Vi);
-  void reset();
-
-  // Audio output (20 bits).
-  RESID_INLINE float output();
-
-private:
-  void _set_sampling_parameter();
-  void nuke_denormals();
-
-  // Filter enabled.
-  bool enabled;
-
-  // Maximum mixer DC offset.
-  float mixer_DC;
-
-  // Relevant clocks
-  float clock_frequency, pass_frequency;
-
-  // State of filters.
-  float Vlp; // lowpass
-  float Vhp; // highpass
-  float Vo;
-
-  // Cutoff frequencies.
-  float w0lp;
-  float w0hp;
-
-friend class SIDFP;
-};
-
-// ----------------------------------------------------------------------------
-// SID clocking - 1 cycle.
-// ----------------------------------------------------------------------------
-RESID_INLINE
-void ExternalFilterFP::clock(float Vi)
-{
-  // This is handy for testing.
-  if (! enabled) {
-    // Remove maximum DC level since there is no filter to do it.
-    Vlp = Vhp = 0.f;
-    Vo = Vi - mixer_DC;
-    return;
-  }
-
-  float dVlp = w0lp * (Vi - Vlp);
-  float dVhp = w0hp * (Vlp - Vhp);
-  Vo = Vlp - Vhp;
-  Vlp += dVlp;
-  Vhp += dVhp;
-}
-
-// ----------------------------------------------------------------------------
-// Audio output (19.5 bits).
-// ----------------------------------------------------------------------------
-RESID_INLINE
-float ExternalFilterFP::output()
-{
-  return Vo;
-}
-
-RESID_INLINE
-void ExternalFilterFP::nuke_denormals()
-{
-    if (Vhp > -1e-12f && Vhp < 1e-12f)
-        Vhp = 0;
-    if (Vlp > -1e-12f && Vlp < 1e-12f)
-        Vlp = 0;
-}
-
-#endif // not __EXTFILT_H__
diff --git a/src/sound/resid-fp/filter.cc b/src/sound/resid-fp/filter.cc
deleted file mode 100644
index c327fadec..000000000
--- a/src/sound/resid-fp/filter.cc
+++ /dev/null
@@ -1,194 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-//  Filter distortion code written by Antti S. Lankila 2007 - 2008.
-
-#define __FILTER_CC__
-#include "filter.h"
-#include "sid.h"
-  
-#ifndef HAVE_LOGF_PROTOTYPE
-extern float logf(float val);
-#endif
-
-#ifndef HAVE_EXPF_PROTOTYPE
-extern float expf(float val);
-#endif
-
-#ifndef HAVE_LOGF
-float logf(float val)
-{
-    return (float)log((double)val);
-}
-#endif
-
-#ifndef HAVE_EXPF
-float expf(float val)
-{
-    return (float)exp((double)val);
-}
-#endif
-
-// ----------------------------------------------------------------------------
-// Constructor.
-// ----------------------------------------------------------------------------
-FilterFP::FilterFP()
-{
-  model = (chip_model) 0; // neither 6581/8580; init time only
-  enable_filter(true);
-  /* approximate; sid.cc calls us when set_sampling_parameters() occurs. */
-  set_clock_frequency(1e6f);
-  /* these parameters are a work-in-progress. */
-  set_distortion_properties(2.5e-3f, 1536.f, 1e-4f);
-  /* sound similar to alankila6581r4ar3789 */
-  set_type3_properties(1.40e6f, 1.47e8f, 1.0059f, 1.55e4f);
-  /* sound similar to trurl8580r5_3691 */
-  set_type4_properties(6.55f, 20.f);
-  reset();
-  set_chip_model(MOS6581FP);
-}
-
-
-// ----------------------------------------------------------------------------
-// Enable filter.
-// ----------------------------------------------------------------------------
-void FilterFP::enable_filter(bool enable)
-{
-  enabled = enable;
-}
-
-
-// ----------------------------------------------------------------------------
-// Set chip model.
-// ----------------------------------------------------------------------------
-void FilterFP::set_chip_model(chip_model model)
-{
-    this->model = model;
-    set_Q();
-    set_w0();
-}
-
-/* dist_CT eliminates 1/x at hot spot */
-void FilterFP::set_clock_frequency(float clock) {
-    clock_frequency = clock;
-    calculate_helpers();
-}
-
-void FilterFP::set_distortion_properties(float r, float p, float cft)
-{
-    distortion_rate = r;
-    distortion_point = p;
-    /* baseresistance is used to determine material resistivity later */
-    distortion_cf_threshold = cft;
-    calculate_helpers();
-}
-
-void FilterFP::set_type4_properties(float k, float b)
-{
-    type4_k = k;
-    type4_b = b;
-}
-
-void FilterFP::set_type3_properties(float br, float o, float s, float mfr)
-{
-    type3_baseresistance = br;
-    type3_offset = o;
-    type3_steepness = -logf(s); /* s^x to e^(x*ln(s)), 1/e^x == e^-x. */
-    type3_minimumfetresistance = mfr;
-}
-
-void FilterFP::calculate_helpers()
-{
-    if (clock_frequency != 0.f)
-        distortion_CT = 1.f / (sidcaps_6581 * clock_frequency);
-    set_w0();
-}
-
-// ----------------------------------------------------------------------------
-// SID reset.
-// ----------------------------------------------------------------------------
-void FilterFP::reset()
-{
-  fc = 0;
-  res = filt = voice3off = hp_bp_lp = 0; 
-  vol = 0;
-  volf = Vhp = Vbp = Vlp = 0;
-  set_w0();
-  set_Q();
-}
-
-// ----------------------------------------------------------------------------
-// Register functions.
-// ----------------------------------------------------------------------------
-void FilterFP::writeFC_LO(reg8 fc_lo)
-{
-  fc = (fc & 0x7f8) | (fc_lo & 0x007);
-  set_w0();
-}
-
-void FilterFP::writeFC_HI(reg8 fc_hi)
-{
-  fc = ((fc_hi << 3) & 0x7f8) | (fc & 0x007);
-  set_w0();
-}
-
-void FilterFP::writeRES_FILT(reg8 res_filt)
-{
-  res = (res_filt >> 4) & 0x0f;
-  set_Q();
-
-  filt = res_filt & 0x0f;
-}
-
-void FilterFP::writeMODE_VOL(reg8 mode_vol)
-{
-  voice3off = mode_vol & 0x80;
-
-  hp_bp_lp = (mode_vol >> 4) & 0x07;
-
-  vol = mode_vol & 0x0f;
-  volf = (float) vol / 15.f;
-}
-
-// Set filter cutoff frequency.
-void FilterFP::set_w0()
-{
-  if (model == MOS6581FP) {
-    /* div once by extra kinkiness because I fitted the type3 eq with that variant. */
-    float type3_fc_kink = SIDFP::kinked_dac(fc, kinkiness, 11) / kinkiness;
-    type3_fc_kink_exp = type3_offset * expf(type3_fc_kink * type3_steepness);
-    if (distortion_rate != 0.f) {
-        type3_fc_distortion_offset_hp = (distortion_point - type3_fc_kink) * (0.5f) / distortion_rate;
-        type3_fc_distortion_offset_bp = type3_fc_distortion_offset_hp;
-    }
-    else {
-        type3_fc_distortion_offset_bp = 9e9f;
-        type3_fc_distortion_offset_hp = 9e9f;
-    }
-  }
-  if (model == MOS8580FP) {
-    type4_w0_cache = type4_w0();
-  }
-}
-
-// Set filter resonance.
-void FilterFP::set_Q()
-{
-  float Q = res / 15.f;
-  _1_div_Q = 1.f / (0.707f + Q * 1.5f);
-}
diff --git a/src/sound/resid-fp/filter.h b/src/sound/resid-fp/filter.h
deleted file mode 100644
index 9ca254564..000000000
--- a/src/sound/resid-fp/filter.h
+++ /dev/null
@@ -1,383 +0,0 @@
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-//  Filter distortion code written by Antti S. Lankila 2007 - 2008.
-
-#ifndef __FILTER_H__
-#define __FILTER_H__
-
-#include <math.h>
-#include "siddefs-fp.h"
-
-// ----------------------------------------------------------------------------
-// The SID filter is modeled with a two-integrator-loop biquadratic filter,
-// which has been confirmed by Bob Yannes to be the actual circuit used in
-// the SID chip.
-//
-// Measurements show that excellent emulation of the SID filter is achieved,
-// except when high resonance is combined with high sustain levels.
-// In this case the SID op-amps are performing less than ideally and are
-// causing some peculiar behavior of the SID filter. This however seems to
-// have more effect on the overall amplitude than on the color of the sound.
-//
-// The theory for the filter circuit can be found in "Microelectric Circuits"
-// by Adel S. Sedra and Kenneth C. Smith.
-// The circuit is modeled based on the explanation found there except that
-// an additional inverter is used in the feedback from the bandpass output,
-// allowing the summer op-amp to operate in single-ended mode. This yields
-// inverted filter outputs with levels independent of Q, which corresponds with
-// the results obtained from a real SID.
-//
-// We have been able to model the summer and the two integrators of the circuit
-// to form components of an IIR filter.
-// Vhp is the output of the summer, Vbp is the output of the first integrator,
-// and Vlp is the output of the second integrator in the filter circuit.
-//
-// According to Bob Yannes, the active stages of the SID filter are not really
-// op-amps. Rather, simple NMOS inverters are used. By biasing an inverter
-// into its region of quasi-linear operation using a feedback resistor from
-// input to output, a MOS inverter can be made to act like an op-amp for
-// small signals centered around the switching threshold.
-//
-// Qualified guesses at SID filter schematics are depicted below.
-//
-// SID filter
-// ----------
-//
-//     -----------------------------------------------
-//    |                                               |
-//    |            ---Rq--                            |
-//    |           |       |                           |
-//    |  ------------<A]-----R1---------              |
-//    | |                               |             |
-//    | |                        ---C---|      ---C---|
-//    | |                       |       |     |       |
-//    |  --R1--    ---R1--      |---Rs--|     |---Rs--|
-//    |        |  |       |     |       |     |       |
-//     ----R1--|-----[A>--|--R-----[A>--|--R-----[A>--|
-//             |          |             |             |
-// vi -----R1--           |             |             |
-//
-//                       vhp           vbp           vlp
-//
-//
-// vi  - input voltage
-// vhp - highpass output
-// vbp - bandpass output
-// vlp - lowpass output
-// [A> - op-amp
-// R1  - summer resistor
-// Rq  - resistor array controlling resonance (4 resistors)
-// R   - NMOS FET voltage controlled resistor controlling cutoff frequency
-// Rs  - shunt resitor
-// C   - capacitor
-//
-//
-//
-// SID integrator
-// --------------
-//
-//                                   V+
-//
-//                                   |
-//                                   |
-//                              -----|
-//                             |     |
-//                             | ||--
-//                              -||
-//                   ---C---     ||->
-//                  |       |        |
-//                  |---Rs-----------|---- vo
-//                  |                |
-//                  |            ||--
-// vi ----     -----|------------||
-//        |   ^     |            ||->
-//        |___|     |                |
-//        -----     |                |
-//          |       |                |
-//          |---R2--                 |
-//          |
-//          R1                       V-
-//          |
-//          |
-//
-//          Vw
-//
-// ----------------------------------------------------------------------------
-class FilterFP
-{
-public:
-  FilterFP();
-
-  void enable_filter(bool enable);
-  void set_chip_model(chip_model model);
-  void set_distortion_properties(float, float, float);
-  void set_type3_properties(float, float, float, float);
-  void set_type4_properties(float, float);
-  void set_clock_frequency(float);
-
-  RESID_INLINE
-  float clock(float voice1, float voice2, float voice3,
-              float ext_in);
-  void reset();
-
-  // Write registers.
-  void writeFC_LO(reg8);
-  void writeFC_HI(reg8);
-  void writeRES_FILT(reg8);
-  void writeMODE_VOL(reg8);
-
-private:
-  void set_Q();
-  void set_w0();
-  float type3_w0(const float source, const float offset);
-  float type4_w0();
-  void calculate_helpers();
-  void nuke_denormals();
-
-  // Filter enabled.
-  bool enabled;
-
-  // 6581/8580 filter model (XXX: we should specialize in separate classes)
-  chip_model model;
-
-  // Filter cutoff frequency.
-  reg12 fc;
-
-  // Filter resonance.
-  reg8 res;
-
-  // Selects which inputs to route through filter.
-  reg8 filt;
-
-  // Switch voice 3 off.
-  reg8 voice3off;
-
-  // Highpass, bandpass, and lowpass filter modes.
-  reg8 hp_bp_lp;
-
-  // Output master volume.
-  reg4 vol;
-  float volf; /* avoid integer-to-float conversion at output */
-
-  // clock
-  float clock_frequency;
-
-  /* Distortion params for Type3 */
-  float distortion_rate, distortion_point, distortion_cf_threshold;
-
-  /* Type3 params. */
-  float type3_baseresistance, type3_offset, type3_steepness, type3_minimumfetresistance;
-
-  /* Type4 params */
-  float type4_k, type4_b;
-
-  // State of filter.
-  float Vhp, Vbp, Vlp;
-
-  /* Resonance/Distortion/Type3/Type4 helpers. */
-  float type4_w0_cache, _1_div_Q, type3_fc_kink_exp, distortion_CT,
-        type3_fc_distortion_offset_bp, type3_fc_distortion_offset_hp;
-
-friend class SIDFP;
-};
-
-// ----------------------------------------------------------------------------
-// Inline functions.
-// The following functions are defined inline because they are called every
-// time a sample is calculated.
-// ----------------------------------------------------------------------------
-
-/* kinkiness of DAC:
- * some chips have more, some less. We should make this tunable. */
-const float kinkiness = 0.966f;
-const float sidcaps_6581 = 470e-12f;
-const float outputleveldifference_lp_bp = 1.4f;
-const float outputleveldifference_bp_hp = 1.2f;
-
-RESID_INLINE
-static float fastexp(float val) {
-    typedef union {
-        int i;
-        float f;
-    } conv;
-
-    conv tmp;
-
-    /* single precision fp has 1 + 8 + 23 bits, exponent bias is 127.
-     * It therefore follows that we need to shift left by 23 bits, and to
-     * calculate exp(x) instead of pow(2, x) we divide the power by ln(2). */
-    const float a = (1 << 23) / M_LN2_f;
-    /* The other factor corrects for the exponent bias so that 2^0 = 1. */
-    const float b = (1 << 23) * 127;
-    /* According to "A Fast, Compact Approximation of the Exponential Function"
-     * by Nicol N. Schraudolph, 60801.48 yields the minimum RMS error for the
-     * piecewise-linear approximation when using doubles (20 bits residual).
-     * We have 23 bits, so we scale this value by 8. */
-    const float c = 60801.48f * 8.f + 0.5f;
-
-    /* Parenthesis are important: C standard disallows folding subtraction.
-     * Unfortunately GCC appears to generate a write to memory rather than
-     * handle this conversion entirely in registers. */
-    tmp.i = (int)(a * val + (b - c));
-    return tmp.f;
-}
-
-RESID_INLINE
-float FilterFP::type3_w0(const float source, const float distoffset)
-{
-    /* The distortion appears to be the result of MOSFET entering saturation
-     * mode. The conductance of a FET is proportional to:
-     *
-     * ohmic = 2 * (Vgs - Vt) * Vds - Vds^2
-     * saturation = (Vgs - Vt)^2
-     *
-     * The FET switches to saturation mode when Vgs - Vt < Vds.
-     *
-     * In the circuit, the Vgs is mixed with the Vds signal, which gives
-     * (Vgs + Vds) / 2 as the gate voltage. Doing the substitutions we get:
-     *
-     * ohmic = 2 * ((Vgs + Vds) / 2 - Vt) * Vds - Vds^2 = (Vgs - Vt) * Vds
-     * saturation = ((Vgs + Vds) / 2 - Vt)^2
-     *
-     * Therefore: once the Vds crosses a threshold given by the gate and
-     * threshold FET conductance begins to increase faster. The exact shape
-     * for this effect is a parabola.
-     *
-     * The scaling term here tries to match the FC control level with
-     * the signal level in simulation. On the chip, the FC control is
-     * biased by forcing its highest DAC bit in the 1 position, thus
-     * limiting the electrical range to half. Therefore one can guess that
-     * the real FC range is half of the full voice range.
-     *
-     * On the simulation, FC goes to 2047 and the voices to 4095 * 255.
-     * If the FC control was intact, then the scaling factor would be
-     * 1/512. (Simulation voices are 512 times "louder" intrinsically.)
-     * As the real chip's FC has reduced range, the scaling required to
-     * match levels is 1/256. */
-
-    float fetresistance = type3_fc_kink_exp;
-    if (source > distoffset) {
-        const float dist = source - distoffset;
-        fetresistance *= fastexp(dist * type3_steepness * distortion_rate);
-    }
-    const float dynamic_resistance = type3_minimumfetresistance + fetresistance;
-
-    /* 2 parallel resistors */
-    const float _1_div_resistance = (type3_baseresistance + dynamic_resistance) / (type3_baseresistance * dynamic_resistance);
-    /* 1.f / (clock * caps * resistance) */
-    return distortion_CT * _1_div_resistance;
-}
-
-RESID_INLINE
-float FilterFP::type4_w0()
-{
-    const float freq = type4_k * fc + type4_b;
-    return 2.f * M_PI_f * freq / clock_frequency;
-}
-
-// ----------------------------------------------------------------------------
-// SID clocking - 1 cycle.
-// ----------------------------------------------------------------------------
-RESID_INLINE
-float FilterFP::clock(float voice1,
-                   float voice2,
-                   float voice3,
-                   float ext_in)
-{
-    /* Avoid denormal numbers by using small offsets from 0 */
-    float Vi = 0.f, Vnf = 0.f, Vf = 0.f;
-
-    // Route voices into or around filter.
-    ((filt & 1) ? Vi : Vnf) += voice1;
-    ((filt & 2) ? Vi : Vnf) += voice2;
-    // NB! Voice 3 is not silenced by voice3off if it is routed through
-    // the filter.
-    if (filt & 4)
-        Vi += voice3;
-    else if (! voice3off)
-        Vnf += voice3;
-    ((filt & 8) ? Vi : Vnf) += ext_in;
-
-    if (! enabled)
-        return (Vnf - Vi) * volf;
-
-    if (hp_bp_lp & 1)
-        Vf += Vlp;
-    if (hp_bp_lp & 2)
-        Vf += Vbp;
-    if (hp_bp_lp & 4)
-        Vf += Vhp;
-
-    if (model == MOS6581FP) {
-        float diff1, diff2;
-
-        Vhp = Vbp * _1_div_Q * (1.f/outputleveldifference_bp_hp) - Vlp * (1.f/outputleveldifference_bp_hp) - Vi * 0.5f;
-
-        /* the input summer mixing, or something like it... */
-        diff1 = (Vlp - Vbp) * distortion_cf_threshold;
-        diff2 = (Vhp - Vbp) * distortion_cf_threshold;
-        Vlp -= diff1;
-        Vbp += diff1;
-        Vbp += diff2;
-        Vhp -= diff2;
-
-        /* Model output strip mixing. Doing it now that HP state
-         * variable modifying still makes some difference.
-         * (Phase error, though.) */
-        if (hp_bp_lp & 1)
-            Vlp += (Vf + Vnf - Vlp) * distortion_cf_threshold;
-        if (hp_bp_lp & 2)
-            Vbp += (Vf + Vnf - Vbp) * distortion_cf_threshold;
-        if (hp_bp_lp & 4)
-            Vhp += (Vf + Vnf - Vhp) * distortion_cf_threshold;
-
-        /* Simulating the exponential VCR that the FET block is... */
-        Vlp -= Vbp * type3_w0(Vbp, type3_fc_distortion_offset_bp);
-        Vbp -= Vhp * type3_w0(Vhp, type3_fc_distortion_offset_hp) * outputleveldifference_bp_hp;
-
-        /* Tuned based on Fred Gray's Break Thru. It is probably not a hard
-         * discontinuity but a saturation effect... */
-        if (Vnf > 3.2e6f)
-            Vnf = 3.2e6f;
-
-        Vf += Vnf + Vlp * (outputleveldifference_lp_bp - 1.f);
-    } else {
-        /* On the 8580, BP appears mixed in phase with the rest. */
-        Vhp = -Vbp * _1_div_Q - Vlp - Vi;
-        Vlp += Vbp * type4_w0_cache;
-        Vbp += Vhp * type4_w0_cache;
-
-        Vf += Vnf;
-    }
-
-    return Vf * volf;
-}
-
-RESID_INLINE
-void FilterFP::nuke_denormals()
-{
-    /* We could use the flush-to-zero flag or denormals-are-zero on systems
-     * where compiling with -msse and -mfpmath=sse is acceptable. Since this
-     * doesn't include general VICE builds, we do this instead. */
-    if (Vbp > -1e-12f && Vbp < 1e-12f)
-        Vbp = 0;
-    if (Vlp > -1e-12f && Vlp < 1e-12f)
-        Vlp = 0;
-}
-
-#endif // not __FILTER_H__
diff --git a/src/sound/resid-fp/pot.cc b/src/sound/resid-fp/pot.cc
deleted file mode 100644
index 4cd85a5c3..000000000
--- a/src/sound/resid-fp/pot.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#include "pot.h"
-
-reg8 PotentiometerFP::readPOT()
-{
-  // NB! Not modeled.
-  return 0xff;
-}
diff --git a/src/sound/resid-fp/pot.h b/src/sound/resid-fp/pot.h
deleted file mode 100644
index e1deeabda..000000000
--- a/src/sound/resid-fp/pot.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#ifndef __POT_H__
-#define __POT_H__
-
-#include "siddefs-fp.h"
-
-class PotentiometerFP
-{
-public:
-  reg8 readPOT();
-};
-
-#endif
diff --git a/src/sound/resid-fp/resample/Resampler.h b/src/sound/resid-fp/resample/Resampler.h
new file mode 100644
index 000000000..293fda6ce
--- /dev/null
+++ b/src/sound/resid-fp/resample/Resampler.h
@@ -0,0 +1,105 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2024 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef RESAMPLER_H
+#define RESAMPLER_H
+
+#include <cmath>
+#include <cassert>
+
+#include "../sidcxx11.h"
+
+#include "../siddefs-fp.h"
+
+namespace reSIDfp
+{
+
+/**
+ * Abstraction of a resampling process. Given enough input, produces output.
+ * Constructors take additional arguments that configure these objects.
+ */
+class Resampler
+{
+private:
+    template<int m>
+    static inline int clipper(int x)
+    {
+        assert(x >= 0);
+        constexpr int threshold = 28000;
+        if (likely(x < threshold))
+            return x;
+
+        constexpr double max_val = static_cast<double>(m);
+        constexpr double t = threshold / max_val;
+        constexpr double a = 1. - t;
+        constexpr double b = 1. / a;
+
+        double value = static_cast<double>(x - threshold) / max_val;
+        value = t + a * std::tanh(b * value);
+        return static_cast<int>(value * max_val);
+    }
+
+    /*
+     * Soft Clipping implementation, splitted for test.
+     */
+    static inline int softClipImpl(int x)
+    {
+        return x < 0 ? -clipper<32768>(-x) : clipper<32767>(x);
+    }
+
+protected:
+    /*
+     * Soft Clipping into 16 bit range [-32768,32767]
+     */
+    static inline short softClip(int x) { return static_cast<short>(softClipImpl(x)); }
+
+    virtual int output() const = 0;
+
+    Resampler() {}
+
+public:
+    virtual ~Resampler() = default;
+
+    /**
+     * Input a sample into resampler. Output "true" when resampler is ready with new sample.
+     *
+     * @param sample input sample
+     * @return true when a sample is ready
+     */
+    virtual bool input(int sample) = 0;
+
+    /**
+     * Output a sample from resampler.
+     *
+     * @return resampled sample
+     */
+    inline short getOutput(int scaleFactor) const
+    {
+        const int out = (scaleFactor * output()) / 2;
+        return softClip(out);
+    }
+
+    virtual void reset() = 0;
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/resample/SincResampler.cpp b/src/sound/resid-fp/resample/SincResampler.cpp
new file mode 100644
index 000000000..14ae13752
--- /dev/null
+++ b/src/sound/resid-fp/resample/SincResampler.cpp
@@ -0,0 +1,386 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2024 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include "SincResampler.h"
+
+#ifdef HAVE_CXX20
+#  include <numbers>
+#endif
+
+#include <algorithm>
+#include <iterator>
+#include <cassert>
+#include <cstring>
+#include <cmath>
+#include <cstdint>
+
+#include "../siddefs-fp.h"
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#ifdef HAVE_SMMINTRIN_H
+#  include <smmintrin.h>
+#elif defined(HAVE_ARM_NEON_H)
+#  include <arm_neon.h>
+#endif
+
+namespace reSIDfp
+{
+
+/// Maximum error acceptable in I0 is 1e-6, or ~96 dB.
+constexpr double I0E = 1e-6;
+
+constexpr int BITS = 16;
+
+/**
+ * Compute the 0th order modified Bessel function of the first kind.
+ * This function is originally from resample-1.5/filterkit.c by J. O. Smith.
+ * It is used to build the Kaiser window for resampling.
+ *
+ * @param x evaluate I0 at x
+ * @return value of I0 at x.
+ */
+double I0(double x)
+{
+    double sum = 1.;
+    double u = 1.;
+    double n = 1.;
+    const double halfx = x / 2.;
+
+    do
+    {
+        const double temp = halfx / n;
+        u *= temp * temp;
+        sum += u;
+        n += 1.;
+    }
+    while (u >= I0E * sum);
+
+    return sum;
+}
+
+/**
+ * Calculate convolution with sample and sinc.
+ *
+ * @param a sample buffer input
+ * @param b sinc buffer
+ * @param bLength length of the sinc buffer
+ * @return convolved result
+ */
+int convolve(const int* a, const short* b, int bLength)
+{
+#ifdef HAVE_EMMINTRIN_H
+    int out = 0;
+
+    const uintptr_t offset = (uintptr_t)(a) & 0x0f;
+
+    // check for aligned accesses
+    if (offset == ((uintptr_t)(b) & 0x0f))
+    {
+        if (offset)
+        {
+            const int l = (0x10 - offset) / 2;
+
+            for (int i = 0; i < l; i++)
+            {
+                out += *a++ * *b++;
+            }
+
+            bLength -= offset;
+        }
+
+        __m128i acc = _mm_setzero_si128();
+
+        const int n = bLength / 8;
+
+        for (int i = 0; i < n; i++)
+        {
+            const __m128i tmp = _mm_madd_epi16(*(__m128i*)a, *(__m128i*)b);
+            acc = _mm_add_epi16(acc, tmp);
+            a += 8;
+            b += 8;
+        }
+
+        __m128i vsum = _mm_add_epi32(acc, _mm_srli_si128(acc, 8));
+        vsum = _mm_add_epi32(vsum, _mm_srli_si128(vsum, 4));
+        out += _mm_cvtsi128_si32(vsum);
+
+        bLength &= 7;
+    }
+#elif defined HAVE_MMINTRIN_H
+    __m64 acc = _mm_setzero_si64();
+
+    const int n = bLength / 4;
+
+    for (int i = 0; i < n; i++)
+    {
+        const __m64 tmp = _mm_madd_pi16(*(__m64*)a, *(__m64*)b);
+        acc = _mm_add_pi16(acc, tmp);
+        a += 4;
+        b += 4;
+    }
+
+    int out = _mm_cvtsi64_si32(acc) + _mm_cvtsi64_si32(_mm_srli_si64(acc, 32));
+    _mm_empty();
+
+    bLength &= 3;
+#elif defined(HAVE_ARM_NEON_H)
+#if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
+    int32x4_t acc1Low = vdupq_n_s32(0);
+    int32x4_t acc1High = vdupq_n_s32(0);
+    int32x4_t acc2Low = vdupq_n_s32(0);
+    int32x4_t acc2High = vdupq_n_s32(0);
+
+    const int n = bLength / 16;
+
+    for (int i = 0; i < n; i++)
+    {
+        int16x8_t v11 = vld1q_s16(a);
+        int16x8_t v12 = vld1q_s16(a + 8);
+        int16x8_t v21 = vld1q_s16(b);
+        int16x8_t v22 = vld1q_s16(b + 8);
+
+        acc1Low  = vmlal_s16(acc1Low, vget_low_s16(v11), vget_low_s16(v21));
+        acc1High = vmlal_high_s16(acc1High, v11, v21);
+        acc2Low  = vmlal_s16(acc2Low, vget_low_s16(v12), vget_low_s16(v22));
+        acc2High = vmlal_high_s16(acc2High, v12, v22);
+
+        a += 16;
+        b += 16;
+    }
+
+    bLength &= 15;
+
+    if (bLength >= 8)
+    {
+        int16x8_t v1 = vld1q_s16(a);
+        int16x8_t v2 = vld1q_s16(b);
+
+        acc1Low  = vmlal_s16(acc1Low, vget_low_s16(v1), vget_low_s16(v2));
+        acc1High = vmlal_high_s16(acc1High, v1, v2);
+
+        a += 8;
+        b += 8;
+    }
+
+    bLength &= 7;
+
+    if (bLength >= 4)
+    {
+        int16x4_t v1 = vld1_s16(a);
+        int16x4_t v2 = vld1_s16(b);
+
+        acc1Low  = vmlal_s16(acc1Low, v1, v2);
+
+        a += 4;
+        b += 4;
+    }
+
+    int32x4_t accSumsNeon = vaddq_s32(acc1Low, acc1High);
+    accSumsNeon = vaddq_s32(accSumsNeon, acc2Low);
+    accSumsNeon = vaddq_s32(accSumsNeon, acc2High);
+
+    int out = vaddvq_s32(accSumsNeon);
+
+    bLength &= 3;
+#else
+    int32x4_t acc = vdupq_n_s32(0);
+
+    const int n = bLength / 4;
+
+    for (int i = 0; i < n; i++)
+    {
+        const int16x4_t h_vec = vld1_s16(a);
+        const int16x4_t x_vec = vld1_s16(b);
+        acc = vmlal_s16(acc, h_vec, x_vec);
+        a += 4;
+        b += 4;
+    }
+
+    int out = vgetq_lane_s32(acc, 0) +
+              vgetq_lane_s32(acc, 1) +
+              vgetq_lane_s32(acc, 2) +
+              vgetq_lane_s32(acc, 3);
+
+    bLength &= 3;
+#endif
+#else
+    int out = 0;
+#endif
+
+    for (int i = 0; i < bLength; i++)
+    {
+        out += a[i] * static_cast<int>(b[i]);
+    }
+
+    return (out + (1 << 14)) >> 15;
+}
+
+int SincResampler::fir(int subcycle)
+{
+    // Find the first of the nearest fir tables close to the phase
+    int firTableFirst = (subcycle * firRES >> 10);
+    const int firTableOffset = (subcycle * firRES) & 0x3ff;
+
+    // Find firN most recent samples, plus one extra in case the FIR wraps.
+    int sampleStart = sampleIndex - firN + RINGSIZE - 1;
+
+    const int v1 = convolve(sample + sampleStart, (*firTable)[firTableFirst], firN);
+
+    // Use next FIR table, wrap around to first FIR table using
+    // previous sample.
+    if (unlikely(++firTableFirst == firRES))
+    {
+        firTableFirst = 0;
+        ++sampleStart;
+    }
+
+    const int v2 = convolve(sample + sampleStart, (*firTable)[firTableFirst], firN);
+
+    // Linear interpolation between the sinc tables yields good
+    // approximation for the exact value.
+    return v1 + (firTableOffset * (v2 - v1) >> 10);
+}
+
+SincResampler::SincResampler(
+        double clockFrequency,
+        double samplingFrequency,
+        double highestAccurateFrequency) :
+    cyclesPerSample(static_cast<int>(clockFrequency / samplingFrequency * 1024.))
+{
+#if defined(HAVE_CXX20) && defined(__cpp_lib_constexpr_cmath)
+    constexpr double PI = std::numbers::pi;
+#else
+#  ifdef M_PI
+        constexpr double PI = M_PI;
+#else
+        constexpr double PI = 3.14159265358979323846;
+#  endif
+#endif
+
+    // 16 bits -> -96dB stopband attenuation.
+    const double A = -20. * std::log10(1.0 / (1 << BITS));
+    // A fraction of the bandwidth is allocated to the transition band, which we double
+    // because we design the filter to transition halfway at nyquist.
+    const double dw = (1. - 2.*highestAccurateFrequency / samplingFrequency) * PI * 2.;
+
+    // For calculation of beta and N see the reference for the kaiserord
+    // function in the MATLAB Signal Processing Toolbox:
+    // http://www.mathworks.com/help/signal/ref/kaiserord.html
+    const double beta = 0.1102 * (A - 8.7);
+    const double I0beta = I0(beta);
+    const double cyclesPerSampleD = clockFrequency / samplingFrequency;
+    const double inv_cyclesPerSampleD = samplingFrequency / clockFrequency;
+
+    {
+        // The filter order will maximally be 124 with the current constraints.
+        // N >= (96.33 - 7.95)/(2 * pi * 2.285 * (maxfreq - passbandfreq) >= 123
+        // The filter order is equal to the number of zero crossings, i.e.
+        // it should be an even number (sinc is symmetric with respect to x = 0).
+        int N = static_cast<int>((A - 7.95) / (2.285 * dw) + 0.5);
+        N += N & 1;
+
+        // The filter length is equal to the filter order + 1.
+        // The filter length must be an odd number (sinc is symmetric with respect to
+        // x = 0).
+        firN = static_cast<int>(N * cyclesPerSampleD) + 1;
+        firN |= 1;
+
+        // Check whether the sample ring buffer would overflow.
+        assert(firN < RINGSIZE);
+
+        // Error is bounded by err < 1.234 / L^2, so L = sqrt(1.234 / (2^-16)) = sqrt(1.234 * 2^16).
+        firRES = static_cast<int>(std::ceil(std::sqrt(1.234 * (1 << BITS)) * inv_cyclesPerSampleD));
+
+        // firN*firRES represent the total resolution of the sinc sampling. JOS
+        // recommends a length of 2^BITS, but we don't quite use that good a filter.
+        // The filter test program indicates that the filter performs well, though.
+    }
+
+    {
+        // Allocate memory for FIR tables.
+        firTable = new matrix_t(firRES, firN);
+
+        // The cutoff frequency is midway through the transition band, in effect the same as nyquist.
+        const double wc = PI;
+
+        // Calculate the sinc tables.
+        const double scale = 32768.0 * wc * inv_cyclesPerSampleD / PI;
+
+        // we're not interested in the fractional part
+        // so use int division before converting to double
+        const int tmp = firN / 2;
+        const double firN_2 = static_cast<double>(tmp);
+
+        for (int i = 0; i < firRES; i++)
+        {
+            const double jPhase = (double) i / firRES + firN_2;
+
+            for (int j = 0; j < firN; j++)
+            {
+                const double x = j - jPhase;
+
+                const double xt = x / firN_2;
+                const double kaiserXt = std::fabs(xt) < 1. ? I0(beta * std::sqrt(1. - xt * xt)) / I0beta : 0.;
+
+                const double wt = wc * x * inv_cyclesPerSampleD;
+                const double sincWt = std::fabs(wt) >= 1e-8 ? std::sin(wt) / wt : 1.;
+
+                (*firTable)[i][j] = static_cast<short>(scale * sincWt * kaiserXt);
+            }
+        }
+    }
+}
+
+SincResampler::~SincResampler()
+{
+    delete firTable;
+}
+
+bool SincResampler::input(int input)
+{
+    bool ready = false;
+
+    sample[sampleIndex] = sample[sampleIndex + RINGSIZE] = input;
+    sampleIndex = (sampleIndex + 1) & (RINGSIZE - 1);
+
+    if (sampleOffset < 1024)
+    {
+        outputValue = fir(sampleOffset);
+        ready = true;
+        sampleOffset += cyclesPerSample;
+    }
+
+    sampleOffset -= 1024;
+
+    return ready;
+}
+
+void SincResampler::reset()
+{
+    std::fill(std::begin(sample), std::end(sample), 0);
+    sampleOffset = 0;
+}
+
+} // namespace reSIDfp
diff --git a/src/sound/resid-fp/resample/SincResampler.h b/src/sound/resid-fp/resample/SincResampler.h
new file mode 100644
index 000000000..c3228171f
--- /dev/null
+++ b/src/sound/resid-fp/resample/SincResampler.h
@@ -0,0 +1,109 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2024 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef SINCRESAMPLER_H
+#define SINCRESAMPLER_H
+
+#include "Resampler.h"
+
+#include "../array.h"
+
+namespace reSIDfp
+{
+
+/**
+ * This is the theoretically correct (and computationally intensive) audio sample generation.
+ * The samples are generated by resampling to the specified sampling frequency.
+ * The work rate is inversely proportional to the percentage of the bandwidth
+ * allocated to the filter transition band.
+ *
+ * This implementation is based on the paper "A Flexible Sampling-Rate Conversion Method",
+ * by J. O. Smith and P. Gosset, or rather on the expanded tutorial on the
+ * [Digital Audio Resampling Home Page](http://www-ccrma.stanford.edu/~jos/resample/).
+ *
+ * By building shifted FIR tables with samples according to the sampling frequency,
+ * this implementation dramatically reduces the computational effort in the
+ * filter convolutions, without any loss of accuracy.
+ * The filter convolutions are also vectorizable on current hardware.
+ */
+class SincResampler final : public Resampler
+{
+private:
+    /// Size of the ring buffer, must be a power of 2
+    static constexpr int RINGSIZE = 2048;
+
+private:
+    /// Table of the fir filter coefficients
+    matrix_t* firTable;
+
+    int sampleIndex = 0;
+
+    /// Filter resolution
+    int firRES;
+
+    /// Filter length
+    int firN;
+
+    const int cyclesPerSample;
+
+    int sampleOffset = 0;
+
+    int outputValue = 0;
+
+    int sample[RINGSIZE * 2];
+
+private:
+    int fir(int subcycle);
+
+public:
+    /**
+     * Use a clock freqency of 985248Hz for PAL C64, 1022730Hz for NTSC C64.
+     *
+     * For resampling, the ratio between the clock frequency
+     * and the sample frequency is limited as follows:
+     *   125*clock_freq/sample_freq < 16384
+     *
+     * E.g. provided a clock frequency of ~ 1MHz, the sample frequency
+     * can not be set lower than ~ 8kHz.
+     * A lower sample frequency would make the resampling code overfill
+     * its 16k sample ring buffer.
+     *
+     * @param clockFrequency System clock frequency at Hz
+     * @param samplingFrequency Desired output sampling rate
+     * @param highestAccurateFrequency passband frequency limit
+     */
+    SincResampler(
+        double clockFrequency,
+        double samplingFrequency,
+        double highestAccurateFrequency);
+    ~SincResampler() override;
+
+    bool input(int input) override;
+
+    int output() const override { return outputValue; }
+
+    void reset() override;
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/resample/TwoPassSincResampler.h b/src/sound/resid-fp/resample/TwoPassSincResampler.h
new file mode 100644
index 000000000..7ba28ea8e
--- /dev/null
+++ b/src/sound/resid-fp/resample/TwoPassSincResampler.h
@@ -0,0 +1,94 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2015 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef TWOPASSSINCRESAMPLER_H
+#define TWOPASSSINCRESAMPLER_H
+
+#include <cmath>
+
+#include <memory>
+
+#include "Resampler.h"
+#include "SincResampler.h"
+
+#include "../sidcxx11.h"
+
+namespace reSIDfp
+{
+
+/**
+ * Compose a more efficient SINC from chaining two other SINCs.
+ */
+class TwoPassSincResampler final : public Resampler
+{
+private:
+    std::unique_ptr<SincResampler> const s1;
+    std::unique_ptr<SincResampler> const s2;
+
+private:
+    TwoPassSincResampler(double clockFrequency, double samplingFrequency, double highestAccurateFrequency, double intermediateFrequency) :
+        s1(new SincResampler(clockFrequency, intermediateFrequency, highestAccurateFrequency)),
+        s2(new SincResampler(intermediateFrequency, samplingFrequency, highestAccurateFrequency))
+    {}
+
+public:
+    // Named constructor
+    static TwoPassSincResampler* create(double clockFrequency, double samplingFrequency)
+    {
+        // Set the passband frequency slightly below half sampling frequency
+        //   pass_freq <= 0.9*sample_freq/2
+        //
+        // This constraint ensures that the FIR table is not overfilled.
+        // For higher sampling frequencies we're fine with 20KHz
+        const double halfFreq = (samplingFrequency > 44000.)
+            ? 20000. : samplingFrequency * 0.45;
+
+        // Calculation according to Laurent Ganier.
+        // It evaluates to about 120 kHz at typical settings.
+        // Some testing around the chosen value seems to confirm that this does work.
+        double const intermediateFrequency = 2. * halfFreq
+            + std::sqrt(2. * halfFreq * clockFrequency
+                * (samplingFrequency - 2. * halfFreq) / samplingFrequency);
+
+        return new TwoPassSincResampler(
+            clockFrequency, samplingFrequency, halfFreq, intermediateFrequency);
+    }
+
+    bool input(int sample) override
+    {
+        return s1->input(sample) && s2->input(s1->output());
+    }
+
+    int output() const override
+    {
+        return s2->output();
+    }
+
+    void reset() override
+    {
+        s1->reset();
+        s2->reset();
+    }
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/resample/ZeroOrderResampler.h b/src/sound/resid-fp/resample/ZeroOrderResampler.h
new file mode 100644
index 000000000..2bc80cded
--- /dev/null
+++ b/src/sound/resid-fp/resample/ZeroOrderResampler.h
@@ -0,0 +1,88 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2013 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef ZEROORDER_RESAMPLER_H
+#define ZEROORDER_RESAMPLER_H
+
+#include "Resampler.h"
+
+#include "../sidcxx11.h"
+
+namespace reSIDfp
+{
+
+/**
+ * Return sample with linear interpolation.
+ *
+ * @author Antti Lankila
+ */
+class ZeroOrderResampler final : public Resampler
+{
+
+private:
+    /// Last sample
+    int cachedSample;
+
+    /// Number of cycles per sample
+    const int cyclesPerSample;
+
+    int sampleOffset;
+
+    /// Calculated sample
+    int outputValue;
+
+public:
+    ZeroOrderResampler(double clockFrequency, double samplingFrequency) :
+        cachedSample(0),
+        cyclesPerSample(static_cast<int>(clockFrequency / samplingFrequency * 1024.)),
+        sampleOffset(0),
+        outputValue(0) {}
+
+    bool input(int sample) override
+    {
+        bool ready = false;
+
+        if (sampleOffset < 1024)
+        {
+            outputValue = cachedSample + (sampleOffset * (sample - cachedSample) >> 10);
+            ready = true;
+            sampleOffset += cyclesPerSample;
+        }
+
+        sampleOffset -= 1024;
+
+        cachedSample = sample;
+
+        return ready;
+    }
+
+    int output() const override { return outputValue; }
+
+    void reset() override
+    {
+        sampleOffset = 0;
+        cachedSample = 0;
+    }
+};
+
+} // namespace reSIDfp
+
+#endif
diff --git a/src/sound/resid-fp/resample/test.cpp b/src/sound/resid-fp/resample/test.cpp
new file mode 100644
index 000000000..d84e641d2
--- /dev/null
+++ b/src/sound/resid-fp/resample/test.cpp
@@ -0,0 +1,95 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2012-2013 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include <map>
+#include <memory>
+#include <ctime>
+#include <iostream>
+#include <iomanip>
+#include <cmath>
+
+#include "../siddefs-fp.h"
+
+#include "Resampler.h"
+#include "TwoPassSincResampler.h"
+
+#if __cplusplus < 201103L
+#  define unique_ptr auto_ptr
+#endif
+
+#ifndef M_PI
+#  define M_PI    3.14159265358979323846
+#endif
+
+/**
+ * Simple sin waveform in, power output measurement function.
+ * It would be far better to use FFT.
+ */
+int main(int, const char*[])
+{
+    const double RATE = 985248.4;
+    const int RINGSIZE = 2048;
+
+    std::unique_ptr<reSIDfp::TwoPassSincResampler> r(reSIDfp::TwoPassSincResampler::create(RATE, 48000.0, 20000.0));
+
+    std::map<double, double> results;
+    clock_t start = clock();
+
+    for (double freq = 1000.; freq < RATE / 2.; freq *= 1.01)
+    {
+        /* prefill resampler buffer */
+        int k = 0;
+        double omega = 2 * M_PI * freq / RATE;
+
+        for (int j = 0; j < RINGSIZE; j ++)
+        {
+            int signal = static_cast<int>(32768.0 * std::sin(k++ * omega) * sqrt(2));
+            r->input(signal);
+        }
+
+        int n = 0;
+        float pwr = 0;
+
+        /* Now, during measurement stage, put 100 cycles of waveform through filter. */
+        for (int j = 0; j < 100000; j ++)
+        {
+            int signal = static_cast<int>(32768.0 * std::sin(k++ * omega) * std::sqrt(2));
+
+            if (r->input(signal))
+            {
+                float out = r->output();
+                pwr += out * out;
+                n += 1;
+            }
+        }
+
+        results.insert(std::make_pair(freq, 10 * std::log10(pwr / n)));
+    }
+
+    clock_t end = clock();
+
+    for (std::map<double, double>::iterator it = results.begin(); it != results.end(); ++it)
+    {
+        std::cout << std::fixed << std::setprecision(0) << std::setw(6) << (*it).first  << " Hz " << (*it).second << " dB" << std::endl;
+    }
+
+    std::cout << "Filtering time " << (end - start) * 1000. / CLOCKS_PER_SEC << " ms" << std::endl;
+}
diff --git a/src/sound/resid-fp/samp2src.pl b/src/sound/resid-fp/samp2src.pl
deleted file mode 100644
index fc6398382..000000000
--- a/src/sound/resid-fp/samp2src.pl
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /usr/bin/perl -w
-#   ---------------------------------------------------------------------------
-#   This file is part of reSID, a MOS6581 SID emulator engine.
-#   Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-# 
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-# 
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-# 
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#   ---------------------------------------------------------------------------
-
-use strict;
-
-die("Usage: samp2src name data-in src-out\n") unless @ARGV == 3;
-my ($name, $in, $out) = @ARGV;
-
-open(F, "<$in") or die($!);
-local $/ = undef;
-my $data = <F>;
-close(F) or die($!);
-
-open(F, ">$out") or die($!);
-
-print F <<\EOF;
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-EOF
-
-print F "#include \"wave.h\"\n\nreg8 WaveformGeneratorFP::$name\[\] =\n{\n";
-
-for (my $i = 0; $i < length($data); $i += 8) {
-  print F sprintf("/* 0x%03x: */ ", $i), map(sprintf(" 0x%02x,", $_), unpack("C*", substr($data, $i, 8))), "\n";
-}
-
-print F "};\n";
-
-close(F) or die($!);
-
-exit(0);
diff --git a/src/sound/resid-fp/sid.cc b/src/sound/resid-fp/sid.cc
deleted file mode 100644
index ad72d9d51..000000000
--- a/src/sound/resid-fp/sid.cc
+++ /dev/null
@@ -1,946 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#include "sid.h"
-#include <stdio.h>
-#include <math.h>
-
-extern float convolve(const float *a, const float *b, int n);
-extern float convolve_sse(const float *a, const float *b, int n);
-
-enum host_cpu_feature {
-    HOST_CPU_MMX=1, HOST_CPU_SSE=2, HOST_CPU_SSE2=4, HOST_CPU_SSE3=8
-};
-
-/* This code is appropriate for 32-bit and 64-bit x86 CPUs. */
-#if defined(__x86_64__) || defined(__i386__) || defined(_M_IX86) || (defined(_M_X64) && !(defined(_MSC_VER) && !defined(__clang__)))
-
-struct cpu_x86_regs_s {
-  unsigned int eax;
-  unsigned int ebx;
-  unsigned int ecx;
-  unsigned int edx;
-};
-typedef struct cpu_x86_regs_s cpu_x86_regs_t;
-
-static cpu_x86_regs_t get_cpuid_regs(unsigned int index)
-{
-  cpu_x86_regs_t retval;
-
-#if defined(_MSC_VER) && !defined(__clang__) /* MSVC assembly */
-  __asm {
-    mov eax, [index]
-    cpuid
-    mov [retval.eax], eax
-    mov [retval.ebx], ebx
-    mov [retval.ecx], ecx
-    mov [retval.edx], edx
-  }
-#else /* GNU assembly */
-  asm("movl %1, %%eax; cpuid; movl %%eax, %0;"
-      : "=m" (retval.eax)
-      : "r"  (index)
-      : "eax", "ebx", "ecx", "edx");
-  asm("movl %1, %%eax; cpuid; movl %%ebx, %0;"
-      : "=m" (retval.ebx)
-      : "r"  (index)
-      : "eax", "ebx", "ecx", "edx");
-  asm("movl %1, %%eax; cpuid; movl %%ecx, %0;"
-      : "=m" (retval.ecx)
-      : "r"  (index)
-      : "eax", "ebx", "ecx", "edx");
-  asm("movl %1, %%eax; cpuid; movl %%edx, %0;"
-      : "=m" (retval.edx)
-      : "r"  (index)
-      : "eax", "ebx", "ecx", "edx");
-#endif
-
-  return retval;
-}
-
-static int host_cpu_features_by_cpuid(void)
-{
-  cpu_x86_regs_t regs = get_cpuid_regs(1);
-
-  int features = 0;
-  if (regs.edx & (1 << 23))
-    features |= HOST_CPU_MMX;
-  if (regs.edx & (1 << 25))
-    features |= HOST_CPU_SSE;
-  if (regs.edx & (1 << 26))
-    features |= HOST_CPU_SSE2;
-  if (regs.ecx & (1 << 0))
-    features |= HOST_CPU_SSE3;
-
-  return features;
-}
-
-#if (RESID_USE_SSE==1)
-static int host_cpu_features(void)
-{
-  static int features = 0;
-  static int features_detected = 0;
-/* 32-bit only */
-#if defined(__i386__) || (defined(_MSC_VER) && defined(_M_IX86))
-  unsigned long temp1, temp2;
-#endif
-
-  if (features_detected)
-    return features;
-  features_detected = 1;
-
-#if defined(_MSC_VER) && defined(_M_IX86) /* MSVC compatible assembly appropriate for 32-bit Windows */
-  /* see if we are dealing with a cpu that has the cpuid instruction */
-  __asm {
-    pushf
-    pop eax
-    mov [temp1], eax
-    xor eax, 0x200000
-    push eax
-    popf
-    pushf
-    pop eax
-    mov [temp2], eax
-    push [temp1]
-    popf
-  }
-#endif
-#if defined(__i386__) /* GNU assembly */
-  asm("pushfl; popl %%eax; movl %%eax, %0; xorl $0x200000, %%eax; pushl %%eax; popfl; pushfl; popl %%eax; movl %%eax, %1; pushl %0; popfl "
-      : "=r" (temp1),
-      "=r" (temp2)
-      :
-      : "eax");
-#endif
-#if defined(__i386__) || (defined(_MSC_VER) && defined(_M_IX86))
-  temp1 &= 0x200000;
-  temp2 &= 0x200000;
-  if (temp1 == temp2) {
-    /* no cpuid support, so we can't test for SSE availability -> false */
-    return 0;
-  }
-#endif
-
-  /* find the highest supported cpuid function, returned in %eax */
-  if (get_cpuid_regs(0).eax < 1) {
-    /* no cpuid 1 function, we can't test for features -> no features */
-    return 0;
-  }
-
-  features = host_cpu_features_by_cpuid();
-  return features;
-}
-
-#else /* !__x86_64__ && !__i386__ && !_MSC_VER */
-static int host_cpu_features(void)
-{
-  return 0;
-}
-#endif
-#endif
-
-float SIDFP::kinked_dac(const int x, const float nonlinearity, const int max)
-{
-    float value = 0.f;
-    
-    int bit = 1;
-    float weight = 1.f;
-    const float dir = 2.0f * nonlinearity;
-    for (int i = 0; i < max; i ++) {
-        if (x & bit)
-            value += weight;
-        bit <<= 1;
-        weight *= dir;
-    }
-
-    return value / (weight / nonlinearity) * (1 << max);
-}
-
-// ----------------------------------------------------------------------------
-// Constructor.
-// ----------------------------------------------------------------------------
-SIDFP::SIDFP()
-{
-#if (RESID_USE_SSE==1)
-  can_use_sse = (host_cpu_features() & HOST_CPU_SSE) != 0;
-#else
-  can_use_sse = false;
-#endif
-
-  // Initialize pointers.
-  sample = 0;
-  fir = 0;
-
-  voice[0].set_sync_source(&voice[2]);
-  voice[1].set_sync_source(&voice[0]);
-  voice[2].set_sync_source(&voice[1]);
-
-  set_sampling_parameters(985248, SAMPLE_INTERPOLATE, 44100);
-
-  bus_value = 0;
-  bus_value_ttl = 0;
-
-  input(0);
-}
-
-
-// ----------------------------------------------------------------------------
-// Destructor.
-// ----------------------------------------------------------------------------
-SIDFP::~SIDFP()
-{
-  delete[] sample;
-  delete[] fir;
-}
-
-
-// ----------------------------------------------------------------------------
-// Set chip model.
-// ----------------------------------------------------------------------------
-void SIDFP::set_chip_model(chip_model model)
-{
-  for (int i = 0; i < 3; i++) {
-    voice[i].set_chip_model(model);
-  }
-
-  filter.set_chip_model(model);
-  extfilt.set_chip_model(model);
-}
-
-/* nonlinear DAC support, set 1 for 8580 / no effect, about 0.96 otherwise */
-void SIDFP::set_voice_nonlinearity(float nl)
-{
-  for (int i = 0; i < 3; i++) {
-    voice[i].set_nonlinearity(nl);
-  }
-}
-
-// ----------------------------------------------------------------------------
-// SID reset.
-// ----------------------------------------------------------------------------
-void SIDFP::reset()
-{
-  for (int i = 0; i < 3; i++) {
-    voice[i].reset();
-  }
-  filter.reset();
-  extfilt.reset();
-
-  bus_value = 0;
-  bus_value_ttl = 0;
-}
-
-
-// ----------------------------------------------------------------------------
-// Write 16-bit sample to audio input.
-// NB! The caller is responsible for keeping the value within 16 bits.
-// Note that to mix in an external audio signal, the signal should be
-// resampled to 1MHz first to avoid sampling noise.
-// ----------------------------------------------------------------------------
-void SIDFP::input(int sample)
-{
-  // Voice outputs are 20 bits. Scale up to match three voices in order
-  // to facilitate simulation of the MOS8580 "digi boost" hardware hack.
-  ext_in = (float) ( (sample << 4) * 3 );
-}
-
-float SIDFP::output()
-{
-  const float range = 1 << 15;
-  return extfilt.output() / (4095.f * 255.f * 3.f * 1.5f / range);
-}
-
-// ----------------------------------------------------------------------------
-// Read registers.
-//
-// Reading a write only register returns the last byte written to any SID
-// register. The individual bits in this value start to fade down towards
-// zero after a few cycles. All bits reach zero within approximately
-// $2000 - $4000 cycles.
-// It has been claimed that this fading happens in an orderly fashion, however
-// sampling of write only registers reveals that this is not the case.
-// NB! This is not correctly modeled.
-// The actual use of write only registers has largely been made in the belief
-// that all SID registers are readable. To support this belief the read
-// would have to be done immediately after a write to the same register
-// (remember that an intermediate write to another register would yield that
-// value instead). With this in mind we return the last value written to
-// any SID register for $2000 cycles without modeling the bit fading.
-// ----------------------------------------------------------------------------
-reg8 SIDFP::read(reg8 offset)
-{
-  switch (offset) {
-  case 0x19:
-    return potx.readPOT();
-  case 0x1a:
-    return poty.readPOT();
-  case 0x1b:
-    return voice[2].wave.readOSC();
-  case 0x1c:
-    return voice[2].envelope.readENV();
-  default:
-    return bus_value;
-  }
-}
-
-
-// ----------------------------------------------------------------------------
-// Write registers.
-// ----------------------------------------------------------------------------
-void SIDFP::write(reg8 offset, reg8 value)
-{
-  bus_value = value;
-  bus_value_ttl = 0x4000;
-
-  switch (offset) {
-  case 0x00:
-    voice[0].wave.writeFREQ_LO(value);
-    break;
-  case 0x01:
-    voice[0].wave.writeFREQ_HI(value);
-    break;
-  case 0x02:
-    voice[0].wave.writePW_LO(value);
-    break;
-  case 0x03:
-    voice[0].wave.writePW_HI(value);
-    break;
-  case 0x04:
-    voice[0].writeCONTROL_REG(value);
-    break;
-  case 0x05:
-    voice[0].envelope.writeATTACK_DECAY(value);
-    break;
-  case 0x06:
-    voice[0].envelope.writeSUSTAIN_RELEASE(value);
-    break;
-  case 0x07:
-    voice[1].wave.writeFREQ_LO(value);
-    break;
-  case 0x08:
-    voice[1].wave.writeFREQ_HI(value);
-    break;
-  case 0x09:
-    voice[1].wave.writePW_LO(value);
-    break;
-  case 0x0a:
-    voice[1].wave.writePW_HI(value);
-    break;
-  case 0x0b:
-    voice[1].writeCONTROL_REG(value);
-    break;
-  case 0x0c:
-    voice[1].envelope.writeATTACK_DECAY(value);
-    break;
-  case 0x0d:
-    voice[1].envelope.writeSUSTAIN_RELEASE(value);
-    break;
-  case 0x0e:
-    voice[2].wave.writeFREQ_LO(value);
-    break;
-  case 0x0f:
-    voice[2].wave.writeFREQ_HI(value);
-    break;
-  case 0x10:
-    voice[2].wave.writePW_LO(value);
-    break;
-  case 0x11:
-    voice[2].wave.writePW_HI(value);
-    break;
-  case 0x12:
-    voice[2].writeCONTROL_REG(value);
-    break;
-  case 0x13:
-    voice[2].envelope.writeATTACK_DECAY(value);
-    break;
-  case 0x14:
-    voice[2].envelope.writeSUSTAIN_RELEASE(value);
-    break;
-  case 0x15:
-    filter.writeFC_LO(value);
-    break;
-  case 0x16:
-    filter.writeFC_HI(value);
-    break;
-  case 0x17:
-    filter.writeRES_FILT(value);
-    break;
-  case 0x18:
-    filter.writeMODE_VOL(value);
-    break;
-  default:
-    break;
-  }
-}
-
-
-// ----------------------------------------------------------------------------
-// Constructor.
-// ----------------------------------------------------------------------------
-SIDFP::State::State()
-{
-  int i;
-
-  for (i = 0; i < 0x20; i++) {
-    sid_register[i] = 0;
-  }
-
-  bus_value = 0;
-  bus_value_ttl = 0;
-
-  for (i = 0; i < 3; i++) {
-    accumulator[i] = 0;
-    shift_register[i] = 0x7ffff8;
-    rate_counter[i] = 0;
-    rate_counter_period[i] = 9;
-    exponential_counter[i] = 0;
-    exponential_counter_period[i] = 1;
-    envelope_counter[i] = 0;
-    envelope_state[i] = EnvelopeGeneratorFP::RELEASE;
-    hold_zero[i] = true;
-  }
-}
-
-
-// ----------------------------------------------------------------------------
-// Read state.
-// ----------------------------------------------------------------------------
-SIDFP::State SIDFP::read_state()
-{
-  State state;
-  int i, j;
-
-  for (i = 0, j = 0; i < 3; i++, j += 7) {
-    WaveformGeneratorFP& wave = voice[i].wave;
-    EnvelopeGeneratorFP& envelope = voice[i].envelope;
-    state.sid_register[j + 0] = wave.freq & 0xff;
-    state.sid_register[j + 1] = wave.freq >> 8;
-    state.sid_register[j + 2] = wave.pw & 0xff;
-    state.sid_register[j + 3] = wave.pw >> 8;
-    state.sid_register[j + 4] =
-      (wave.waveform << 4)
-      | (wave.test ? 0x08 : 0)
-      | (wave.ring_mod ? 0x04 : 0)
-      | (wave.sync ? 0x02 : 0)
-      | (envelope.gate ? 0x01 : 0);
-    state.sid_register[j + 5] = (envelope.attack << 4) | envelope.decay;
-    state.sid_register[j + 6] = (envelope.sustain << 4) | envelope.release;
-  }
-
-  state.sid_register[j++] = filter.fc & 0x007;
-  state.sid_register[j++] = filter.fc >> 3;
-  state.sid_register[j++] = (filter.res << 4) | filter.filt;
-  state.sid_register[j++] =
-    (filter.voice3off ? 0x80 : 0)
-    | (filter.hp_bp_lp << 4)
-    | filter.vol;
-
-  // These registers are superfluous, but included for completeness.
-  for (; j < 0x1d; j++) {
-    state.sid_register[j] = read(j);
-  }
-  for (; j < 0x20; j++) {
-    state.sid_register[j] = 0;
-  }
-
-  state.bus_value = bus_value;
-  state.bus_value_ttl = bus_value_ttl;
-
-  for (i = 0; i < 3; i++) {
-    state.accumulator[i] = voice[i].wave.accumulator;
-    state.shift_register[i] = voice[i].wave.shift_register;
-    state.rate_counter[i] = voice[i].envelope.rate_counter;
-    state.rate_counter_period[i] = voice[i].envelope.rate_period;
-    state.exponential_counter[i] = voice[i].envelope.exponential_counter;
-    state.exponential_counter_period[i] = voice[i].envelope.exponential_counter_period;
-    state.envelope_counter[i] = voice[i].envelope.envelope_counter;
-    state.envelope_state[i] = voice[i].envelope.state;
-    state.hold_zero[i] = voice[i].envelope.hold_zero;
-  }
-
-  return state;
-}
-
-
-// ----------------------------------------------------------------------------
-// Write state.
-// ----------------------------------------------------------------------------
-void SIDFP::write_state(const State& state)
-{
-  int i;
-
-  for (i = 0; i <= 0x18; i++) {
-    write(i, state.sid_register[i]);
-  }
-
-  bus_value = state.bus_value;
-  bus_value_ttl = state.bus_value_ttl;
-
-  for (i = 0; i < 3; i++) {
-    voice[i].wave.accumulator = state.accumulator[i];
-    voice[i].wave.shift_register = state.shift_register[i];
-    voice[i].envelope.rate_counter = state.rate_counter[i];
-    voice[i].envelope.rate_period = state.rate_counter_period[i];
-    voice[i].envelope.exponential_counter = state.exponential_counter[i];
-    voice[i].envelope.exponential_counter_period = state.exponential_counter_period[i];
-    voice[i].envelope.envelope_counter = state.envelope_counter[i];
-    voice[i].envelope.state = state.envelope_state[i];
-    voice[i].envelope.hold_zero = state.hold_zero[i];
-  }
-}
-
-
-// ----------------------------------------------------------------------------
-// Enable filter.
-// ----------------------------------------------------------------------------
-void SIDFP::enable_filter(bool enable)
-{
-  filter.enable_filter(enable);
-}
-
-
-// ----------------------------------------------------------------------------
-// Enable external filter.
-// ----------------------------------------------------------------------------
-void SIDFP::enable_external_filter(bool enable)
-{
-  extfilt.enable_filter(enable);
-}
-
-
-// ----------------------------------------------------------------------------
-// I0() computes the 0th order modified Bessel function of the first kind.
-// This function is originally from resample-1.5/filterkit.c by J. O. Smith.
-// ----------------------------------------------------------------------------
-double SIDFP::I0(double x)
-{
-  // Max error acceptable in I0 could be 1e-6, which gives that 96 dB already.
-  // I'm overspecify these errors to get a beautiful FFT dump of the FIR.
-  const double I0e = 1e-10;
-
-  double sum, u, halfx, temp;
-  int n;
-
-  sum = u = n = 1;
-  halfx = x/2.0;
-
-  do {
-    temp = halfx/n++;
-    u *= temp*temp;
-    sum += u;
-  } while (u >= I0e*sum);
-
-  return sum;
-}
-
-
-// ----------------------------------------------------------------------------
-// Setting of SID sampling parameters.
-//
-// Use a clock freqency of 985248Hz for PAL C64, 1022730Hz for NTSC C64.
-// The default end of passband frequency is pass_freq = 0.9*sample_freq/2
-// for sample frequencies up to ~ 44.1kHz, and 20kHz for higher sample
-// frequencies.
-//
-// For resampling, the ratio between the clock frequency and the sample
-// frequency is limited as follows:
-//   125*clock_freq/sample_freq < 16384
-// E.g. provided a clock frequency of ~ 1MHz, the sample frequency can not
-// be set lower than ~ 8kHz. A lower sample frequency would make the
-// resampling code overfill its 16k sample ring buffer.
-// 
-// The end of passband frequency is also limited:
-//   pass_freq <= 0.9*sample_freq/2
-
-// E.g. for a 44.1kHz sampling rate the end of passband frequency is limited
-// to slightly below 20kHz. This constraint ensures that the FIR table is
-// not overfilled.
-// ----------------------------------------------------------------------------
-bool SIDFP::set_sampling_parameters(float clock_freq, sampling_method method,
-                                  float sample_freq, float pass_freq)
-{
-  clock_frequency = clock_freq;
-  sampling = method;
-
-  filter.set_clock_frequency(clock_freq);
-  extfilt.set_clock_frequency(clock_freq);
-  adjust_sampling_frequency(sample_freq);
-
-  sample_offset = 0;
-  sample_prev = 0;
-
-  // FIR initialization is only necessary for resampling.
-  if (method != SAMPLE_RESAMPLE_INTERPOLATE)
-  {
-    delete[] sample;
-    delete[] fir;
-    sample = 0;
-    fir = 0;
-    return true;
-  }
-  
-  const int bits = 16;
-
-  if (pass_freq > 20000)
-    pass_freq = 20000;  
-  if (2*pass_freq/sample_freq > 0.9)
-    pass_freq = 0.9f*sample_freq/2;
-
-  // 16 bits -> -96dB stopband attenuation.
-  const double A = -20*log10(1.0/(1 << bits));
-
-  // For calculation of beta and N see the reference for the kaiserord
-  // function in the MATLAB Signal Processing Toolbox:
-  // http://www.mathworks.com/access/helpdesk/help/toolbox/signal/kaiserord.html
-  const double beta = 0.1102*(A - 8.7);
-  const double I0beta = I0(beta);
-
-  double f_samples_per_cycle = sample_freq/clock_freq;
-  double f_cycles_per_sample = clock_freq/sample_freq;
-
-  /* This code utilizes the fact that aliasing back to 20 kHz from
-   * sample_freq/2 is inaudible. This allows us to define a passband
-   * wider than normally. We might also consider aliasing back to pass_freq,
-   * but as this can be less than 20 kHz, it might become audible... */
-  double aliasing_allowance = sample_freq / 2 - 20000;
-  if (aliasing_allowance < 0)
-    aliasing_allowance = 0;
-
-  double transition_bandwidth = sample_freq/2 - pass_freq + aliasing_allowance;
-  {
-    /* Filter order according to Kaiser's paper. */
-
-    int N = (int) ((A - 7.95)/(2 * M_PI * 2.285 * transition_bandwidth/sample_freq) + 0.5);
-    N += N & 1;
-
-    // The filter length is equal to the filter order + 1.
-    // The filter length must be an odd number (sinc is symmetric about x = 0).
-    fir_N = int(N*f_cycles_per_sample) + 1;
-    fir_N |= 1;
-
-    // Check whether the sample ring buffer would overfill.
-    if (fir_N > RINGSIZE - 1)
-      return false;
-
-    /* Error is bound by 1.234 / L^2 */
-    fir_RES = (int) (sqrt(1.234 * (1 << bits)) / f_cycles_per_sample + 0.5);
-  }
- 
-  // Allocate memory for FIR tables.
-  delete[] fir;
-  fir = new float[fir_N*fir_RES];
-
-  // The cutoff frequency is midway through the transition band.
-  double wc = (pass_freq + transition_bandwidth/2) / sample_freq * M_PI * 2;
-
-  // Calculate fir_RES FIR tables for linear interpolation.
-  for (int i = 0; i < fir_RES; i++) {
-    double j_offset = double(i)/fir_RES;
-    // Calculate FIR table. This is the sinc function, weighted by the
-    // Kaiser window.
-    for (int j = 0; j < fir_N; j ++) {
-      double jx = j - fir_N/2. - j_offset;
-      double wt = wc*jx/f_cycles_per_sample;
-      double temp = jx/(fir_N/2);
-      double Kaiser =
-        fabs(temp) <= 1 ? I0(beta*sqrt(1 - temp*temp))/I0beta : 0;
-      double sincwt =
-        fabs(wt) >= 1e-8 ? sin(wt)/wt : 1;
-      fir[i * fir_N + j] = (float) (f_samples_per_cycle*wc/M_PI*sincwt*Kaiser);
-    }
-  }
-
-  // Allocate sample buffer.
-  if (!sample) {
-    sample = new float[RINGSIZE*2];
-  }
-  // Clear sample buffer.
-  for (int j = 0; j < RINGSIZE*2; j++) {
-    sample[j] = 0;
-  }
-  sample_index = 0;
-
-  return true;
-}
-
-// ----------------------------------------------------------------------------
-// Adjustment of SID sampling frequency.
-//
-// In some applications, e.g. a C64 emulator, it can be desirable to
-// synchronize sound with a timer source. This is supported by adjustment of
-// the SID sampling frequency.
-//
-// NB! Adjustment of the sampling frequency may lead to noticeable shifts in
-// frequency, and should only be used for interactive applications. Note also
-// that any adjustment of the sampling frequency will change the
-// characteristics of the resampling filter, since the filter is not rebuilt.
-// ----------------------------------------------------------------------------
-void SIDFP::adjust_sampling_frequency(float sample_freq)
-{
-  cycles_per_sample = clock_frequency/sample_freq;
-}
-
-void SIDFP::age_bus_value(cycle_count n) {
-  if (bus_value_ttl != 0) {
-    bus_value_ttl -= n;
-    if (bus_value_ttl <= 0) {
-        bus_value = 0;
-        bus_value_ttl = 0;
-    }
-  }
-}
-
-// ----------------------------------------------------------------------------
-// SID clocking - 1 cycle.
-// ----------------------------------------------------------------------------
-void SIDFP::clock()
-{
-  int i;
-
-  // Clock amplitude modulators.
-  for (i = 0; i < 3; i++) {
-    voice[i].envelope.clock();
-  }
-
-  // Clock oscillators.
-  for (i = 0; i < 3; i++) {
-    voice[i].wave.clock();
-  }
-
-  // Synchronize oscillators.
-  for (i = 0; i < 3; i++) {
-    voice[i].wave.synchronize();
-  }
-
-  // Clock filter.
-  extfilt.clock(filter.clock(voice[0].output(), voice[1].output(), voice[2].output(), ext_in));
-}
-
-// ----------------------------------------------------------------------------
-// SID clocking with audio sampling.
-// Fixpoint arithmetics is used.
-//
-// The example below shows how to clock the SID a specified amount of cycles
-// while producing audio output:
-//
-// while (delta_t) {
-//   bufindex += sid.clock(delta_t, buf + bufindex, buflength - bufindex);
-//   write(dsp, buf, bufindex*2);
-//   bufindex = 0;
-// }
-// 
-// ----------------------------------------------------------------------------
-int SIDFP::clock(cycle_count& delta_t, short* buf, int n, int interleave)
-{
-  /* XXX I assume n is generally large enough for delta_t here... */
-  age_bus_value(delta_t);
-  int res;
-  switch (sampling) {
-  default:
-  case SAMPLE_INTERPOLATE:
-    res = clock_interpolate(delta_t, buf, n, interleave);
-    break;
-  case SAMPLE_RESAMPLE_INTERPOLATE:
-    res = clock_resample_interpolate(delta_t, buf, n, interleave);
-    break;
-  }
-
-  filter.nuke_denormals();
-  extfilt.nuke_denormals();
-
-  return res;
-}
-
-// ----------------------------------------------------------------------------
-// SID clocking with audio sampling - cycle based with linear sample
-// interpolation.
-//
-// Here the chip is clocked every cycle. This yields higher quality
-// sound since the samples are linearly interpolated, and since the
-// external filter attenuates frequencies above 16kHz, thus reducing
-// sampling noise.
-// ----------------------------------------------------------------------------
-RESID_INLINE
-int SIDFP::clock_interpolate(cycle_count& delta_t, short* buf, int n,
-                           int interleave)
-{
-  int s = 0;
-  int i;
-
-  for (;;) {
-    float next_sample_offset = sample_offset + cycles_per_sample;
-    int delta_t_sample = (int) next_sample_offset;
-    if (delta_t_sample > delta_t) {
-      break;
-    }
-    if (s >= n) {
-      return s;
-    }
-    for (i = 0; i < delta_t_sample - 1; i++) {
-      clock();
-    }
-    if (i < delta_t_sample) {
-      sample_prev = output();
-      clock();
-    }
-
-    delta_t -= delta_t_sample;
-    sample_offset = next_sample_offset - delta_t_sample;
-
-    float sample_now = output();
-    int v = (int)(sample_prev + (sample_offset * (sample_now - sample_prev)));
-    // Saturated arithmetics to guard against 16 bit sample overflow.
-    const int half = 1 << 15;
-    if (v >= half) {
-      v = half - 1;
-    }
-    else if (v < -half) {
-      v = -half;
-    }
-    buf[s++*interleave] = v;
-    sample_prev = sample_now;
-  }
-
-  for (i = 0; i < delta_t - 1; i++) {
-    clock();
-  }
-  if (i < delta_t) {
-    sample_prev = output();
-    clock();
-  }
-  sample_offset -= delta_t;
-  delta_t = 0;
-  return s;
-}
-
-// ----------------------------------------------------------------------------
-// SID clocking with audio sampling - cycle based with audio resampling.
-//
-// This is the theoretically correct (and computationally intensive) audio
-// sample generation. The samples are generated by resampling to the specified
-// sampling frequency. The work rate is inversely proportional to the
-// percentage of the bandwidth allocated to the filter transition band.
-//
-// This implementation is based on the paper "A Flexible Sampling-Rate
-// Conversion Method", by J. O. Smith and P. Gosset, or rather on the
-// expanded tutorial on the "Digital Audio Resampling Home Page":
-// http://www-ccrma.stanford.edu/~jos/resample/
-//
-// By building shifted FIR tables with samples according to the
-// sampling frequency, this implementation dramatically reduces the
-// computational effort in the filter convolutions, without any loss
-// of accuracy. The filter convolutions are also vectorizable on
-// current hardware.
-//
-// Further possible optimizations are:
-// * An equiripple filter design could yield a lower filter order, see
-//   http://www.mwrf.com/Articles/ArticleID/7229/7229.html
-// * The Convolution Theorem could be used to bring the complexity of
-//   convolution down from O(n*n) to O(n*log(n)) using the Fast Fourier
-//   Transform, see http://en.wikipedia.org/wiki/Convolution_theorem
-// * Simply resampling in two steps can also yield computational
-//   savings, since the transition band will be wider in the first step
-//   and the required filter order is thus lower in this step.
-//   Laurent Ganier has found the optimal intermediate sampling frequency
-//   to be (via derivation of sum of two steps):
-//     2 * pass_freq + sqrt [ 2 * pass_freq * orig_sample_freq
-//       * (dest_sample_freq - 2 * pass_freq) / dest_sample_freq ]
-//
-// NB! the result of right shifting negative numbers is really
-// implementation dependent in the C++ standard.
-// ----------------------------------------------------------------------------
-RESID_INLINE
-int SIDFP::clock_resample_interpolate(cycle_count& delta_t, short* buf, int n,
-                                    int interleave)
-{
-  int s = 0;
-
-  for (;;) {
-    float next_sample_offset = sample_offset + cycles_per_sample;
-    /* full clocks left to next sample */
-    int delta_t_sample = (int) next_sample_offset;
-    if (delta_t_sample > delta_t || s >= n)
-      break;
-
-    /* clock forward delta_t_sample samples */
-    for (int i = 0; i < delta_t_sample; i++) {
-      clock();
-      sample[sample_index] = sample[sample_index + RINGSIZE] = output();
-      ++ sample_index;
-      sample_index &= RINGSIZE - 1;
-    }
-    delta_t -= delta_t_sample;
-
-    /* Phase of the sample in terms of clock, [0 .. 1[. */
-    sample_offset = next_sample_offset - (float) delta_t_sample;
-
-    /* find the first of the nearest fir tables close to the phase */
-    float fir_offset_rmd = sample_offset * fir_RES;
-    int fir_offset = (int) fir_offset_rmd;
-    /* [0 .. 1[ */
-    fir_offset_rmd -= (float) fir_offset;
-
-    /* find fir_N most recent samples, plus one extra in case the FIR wraps. */
-    float* sample_start = sample + sample_index - fir_N + RINGSIZE - 1;
-
-    float v1 =
-#if (RESID_USE_SSE==1)
-      can_use_sse ? convolve_sse(sample_start, fir + fir_offset*fir_N, fir_N) :
-#endif
-        convolve(sample_start, fir + fir_offset*fir_N, fir_N);
-
-    // Use next FIR table, wrap around to first FIR table using
-    // previous sample.
-    if (++ fir_offset == fir_RES) {
-      fir_offset = 0;
-      ++ sample_start;
-    }
-    float v2 =
-#if (RESID_USE_SSE==1)
-      can_use_sse ? convolve_sse(sample_start, fir + fir_offset*fir_N, fir_N) :
-#endif
-        convolve(sample_start, fir + fir_offset*fir_N, fir_N);
-
-    // Linear interpolation between the sinc tables yields good approximation
-    // for the exact value.
-    int v = (int) (v1 + fir_offset_rmd * (v2 - v1));
-
-    // Saturated arithmetics to guard against 16 bit sample overflow.
-    const int half = 1 << 15;
-    if (v >= half) {
-      v = half - 1;
-    }
-    else if (v < -half) {
-      v = -half;
-    }
-
-    buf[s ++ * interleave] = v;
-  }
-
-  /* clock forward delta_t samples */
-  for (int i = 0; i < delta_t; i++) {
-    clock();
-    sample[sample_index] = sample[sample_index + RINGSIZE] = output();
-    ++ sample_index;
-    sample_index &= RINGSIZE - 1;
-  }
-  sample_offset -= (float) delta_t;
-  delta_t = 0;
-  return s;
-}
diff --git a/src/sound/resid-fp/sid.h b/src/sound/resid-fp/sid.h
index 5180898fb..ef3dc71b3 100644
--- a/src/sound/resid-fp/sid.h
+++ b/src/sound/resid-fp/sid.h
@@ -1,130 +1,395 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ * Copyright 2011-2024 Leandro Nini <drfiemost@users.sourceforge.net>
+ * Copyright 2007-2010 Antti Lankila
+ * Copyright 2004 Dag Lem <resid@nimrod.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
 
-#ifndef __SID_FP_H__
-#define __SID_FP_H__
+#ifndef SIDFP_H
+#define SIDFP_H
+
+#include <memory>
 
 #include "siddefs-fp.h"
-#include "voice.h"
-#include "filter.h"
-#include "extfilt.h"
-#include "pot.h"
+#include "ExternalFilter.h"
+#include "Potentiometer.h"
+#include "Voice.h"
 
-class SIDFP
+#include "sidcxx11.h"
+
+namespace reSIDfp
 {
+
+class Filter;
+class Filter6581;
+class Filter8580;
+class Resampler;
+
+/**
+ * SID error exception.
+ */
+class SIDError
+{
+private:
+    const char* message;
+
 public:
-  SIDFP();
-  ~SIDFP();
-
-  static float kinked_dac(const int x, const float nonlinearity, const int bits);
-  bool sse_enabled() { return can_use_sse; }
-
-  void set_chip_model(chip_model model);
-  FilterFP& get_filter() { return filter; }
-  void enable_filter(bool enable);
-  void enable_external_filter(bool enable);
-  bool set_sampling_parameters(float clock_freq, sampling_method method,
-                               float sample_freq, float pass_freq = -1);
-  void adjust_sampling_frequency(float sample_freq);
-  void set_voice_nonlinearity(float nonlinearity);
-
-  void clock();
-  int clock(cycle_count& delta_t, short* buf, int n, int interleave = 1);
-  void reset();
-
-  // Read/write registers.
-  reg8 read(reg8 offset);
-  void write(reg8 offset, reg8 value);
-
-  // Read/write state.
-  class State
-  {
-  public:
-    State();
-
-    char sid_register[0x20];
-
-    reg8 bus_value;
-    cycle_count bus_value_ttl;
-
-    reg24 accumulator[3];
-    reg24 shift_register[3];
-    reg16 rate_counter[3];
-    reg16 rate_counter_period[3];
-    reg16 exponential_counter[3];
-    reg16 exponential_counter_period[3];
-    reg8 envelope_counter[3];
-    EnvelopeGeneratorFP::State envelope_state[3];
-    bool hold_zero[3];
-  };
-
-  State read_state();
-  void write_state(const State& state);
-
-  // 16-bit input (EXT IN).
-  void input(int sample);
-
-  // output in range -32768 .. 32767, not clipped (AUDIO OUT)
-  float output();
-
-protected:
-  static double I0(double x);
-  RESID_INLINE int clock_interpolate(cycle_count& delta_t, short* buf, int n,
-                                     int interleave);
-  RESID_INLINE int clock_resample_interpolate(cycle_count& delta_t, short* buf,
-                                              int n, int interleave);
-  RESID_INLINE void age_bus_value(cycle_count);
-
-  VoiceFP voice[3];
-  FilterFP filter;
-  ExternalFilterFP extfilt;
-  PotentiometerFP potx;
-  PotentiometerFP poty;
-
-  reg8 bus_value;
-  cycle_count bus_value_ttl;
-
-  float clock_frequency;
-
-  // External audio input.
-  float ext_in;
-
-  enum { RINGSIZE = 16384 };
-
-  // Sampling variables.
-  sampling_method sampling;
-  float cycles_per_sample;
-  float sample_offset;
-  int sample_index;
-  int fir_N;
-  int fir_RES;
-
-  // Linear interpolation helper
-  float sample_prev;
-
-  // Ring buffer with overflow for contiguous storage of RINGSIZE samples.
-  float* sample;
-
-  // FIR_RES filter tables (FIR_N*FIR_RES).
-  float* fir;
-
-  bool can_use_sse;
+    SIDError(const char* msg) :
+        message(msg) {}
+    const char* getMessage() const { return message; }
 };
 
-#endif // not __SID_H__
+/**
+ * MOS6581/MOS8580 emulation.
+ */
+class SID
+{
+private:
+    /// Currently active filter
+    Filter* filter;
+
+    /// Filter used, if model is set to 6581
+    Filter6581* const filter6581;
+
+    /// Filter used, if model is set to 8580
+    Filter8580* const filter8580;
+
+    /// Resampler used by audio generation code.
+    std::unique_ptr<Resampler> resampler;
+
+    /**
+     * External filter that provides high-pass and low-pass filtering
+     * to adjust sound tone slightly.
+     */
+    ExternalFilter externalFilter;
+
+    /// Paddle X register support
+    Potentiometer potX;
+
+    /// Paddle Y register support
+    Potentiometer potY;
+
+    /// SID voices
+    Voice voice[3];
+
+    /// Used to amplify the output by x/2 to get an adequate playback volume
+    int scaleFactor;
+
+    /// Time to live for the last written value
+    int busValueTtl;
+
+    /// Current chip model's bus value TTL
+    int modelTTL;
+
+    /// Time until #voiceSync must be run.
+    unsigned int nextVoiceSync;
+
+    /// Currently active chip model.
+    ChipModel model;
+
+    /// Currently selected combined waveforms strength.
+    CombinedWaveforms cws;
+
+    /// Last written value
+    unsigned char busValue;
+
+    /**
+     * Emulated nonlinearity of the envelope DAC.
+     *
+     * @See Dac
+     */
+    float envDAC[256];
+
+    /**
+     * Emulated nonlinearity of the oscillator DAC.
+     *
+     * @See Dac
+     */
+    float oscDAC[4096];
+
+private:
+    /**
+     * Age the bus value and zero it if it's TTL has expired.
+     *
+     * @param n the number of cycles
+     */
+    void ageBusValue(unsigned int n);
+
+    /**
+     * Get output sample.
+     *
+     * @return the output sample
+     */
+    int output();
+
+    /**
+     * Calculate the numebr of cycles according to current parameters
+     * that it takes to reach sync.
+     *
+     * @param sync whether to do the actual voice synchronization
+     */
+    void voiceSync(bool sync);
+
+public:
+    SID();
+    ~SID();
+
+    /**
+     * Set chip model.
+     *
+     * @param model chip model to use
+     * @throw SIDError
+     */
+    void setChipModel(ChipModel model);
+
+    /**
+     * Get currently emulated chip model.
+     */
+    ChipModel getChipModel() const { return model; }
+
+    /**
+     * Set combined waveforms strength.
+     *
+     * @param cws strength of combined waveforms
+     * @throw SIDError
+     */
+    void setCombinedWaveforms(CombinedWaveforms cws);
+
+    /**
+     * SID reset.
+     */
+    void reset();
+
+    /**
+     * 16-bit input (EXT IN). Write 16-bit sample to audio input. NB! The caller
+     * is responsible for keeping the value within 16 bits. Note that to mix in
+     * an external audio signal, the signal should be resampled to 1MHz first to
+     * avoid sampling noise.
+     *
+     * @param value input level to set
+     */
+    void input(int value);
+
+    /**
+     * Read registers.
+     *
+     * Reading a write only register returns the last char written to any SID register.
+     * The individual bits in this value start to fade down towards zero after a few cycles.
+     * All bits reach zero within approximately $2000 - $4000 cycles.
+     * It has been claimed that this fading happens in an orderly fashion,
+     * however sampling of write only registers reveals that this is not the case.
+     * NOTE: This is not correctly modeled.
+     * The actual use of write only registers has largely been made
+     * in the belief that all SID registers are readable.
+     * To support this belief the read would have to be done immediately
+     * after a write to the same register (remember that an intermediate write
+     * to another register would yield that value instead).
+     * With this in mind we return the last value written to any SID register
+     * for $2000 cycles without modeling the bit fading.
+     *
+     * @param offset SID register to read
+     * @return value read from chip
+     */
+    unsigned char read(int offset);
+
+    /**
+     * Write registers.
+     *
+     * @param offset chip register to write
+     * @param value value to write
+     */
+    void write(int offset, unsigned char value);
+
+    /**
+     * Setting of SID sampling parameters.
+     *
+     * Use a clock freqency of 985248Hz for PAL C64, 1022730Hz for NTSC C64.
+     * The default end of passband frequency is pass_freq = 0.9*sample_freq/2
+     * for sample frequencies up to ~ 44.1kHz, and 20kHz for higher sample frequencies.
+     *
+     * For resampling, the ratio between the clock frequency and the sample frequency
+     * is limited as follows: 125*clock_freq/sample_freq < 16384
+     * E.g. provided a clock frequency of ~ 1MHz, the sample frequency can not be set
+     * lower than ~ 8kHz. A lower sample frequency would make the resampling code
+     * overfill its 16k sample ring buffer.
+     *
+     * The end of passband frequency is also limited: pass_freq <= 0.9*sample_freq/2
+     *
+     * E.g. for a 44.1kHz sampling rate the end of passband frequency
+     * is limited to slightly below 20kHz.
+     * This constraint ensures that the FIR table is not overfilled.
+     *
+     * @param clockFrequency System clock frequency at Hz
+     * @param method sampling method to use
+     * @param samplingFrequency Desired output sampling rate
+     * @param highestAccurateFrequency
+     * @throw SIDError
+     */
+    void setSamplingParameters(
+        double clockFrequency,
+        SamplingMethod method,
+        double samplingFrequency
+    );
+
+    /**
+     * Clock SID forward using chosen output sampling algorithm.
+     *
+     * @param cycles c64 clocks to clock
+     * @param buf audio output buffer
+     * @return number of samples produced
+     */
+    int clock(unsigned int cycles, short* buf);
+
+    /**
+     * Clock SID forward with no audio production.
+     *
+     * _Warning_:
+     * You can't mix this method of clocking with the audio-producing
+     * clock() because components that don't affect OSC3/ENV3 are not
+     * emulated.
+     *
+     * @param cycles c64 clocks to clock.
+     */
+    void clockSilent(unsigned int cycles);
+
+    /**
+     * Set filter curve parameter for 6581 model.
+     *
+     * @see Filter6581::setFilterCurve(double)
+     */
+    void setFilter6581Curve(double filterCurve);
+
+    /**
+    * Set filter range parameter for 6581 model
+    *
+    * @see Filter6581::setFilterRange(double)
+    */
+    void setFilter6581Range ( double adjustment );
+
+    /**
+     * Set filter curve parameter for 8580 model.
+     *
+     * @see Filter8580::setFilterCurve(double)
+     */
+    void setFilter8580Curve(double filterCurve);
+
+    /**
+     * Enable filter emulation.
+     *
+     * @param enable false to turn off filter emulation
+     */
+    void enableFilter(bool enable);
+};
+
+} // namespace reSIDfp
+
+#if RESID_INLINING || defined(SID_CPP)
+
+#include <algorithm>
+
+#include "Filter.h"
+#include "ExternalFilter.h"
+#include "Voice.h"
+#include "resample/Resampler.h"
+
+namespace reSIDfp
+{
+
+RESID_INLINE
+void SID::ageBusValue(unsigned int n)
+{
+    if (likely(busValueTtl != 0))
+    {
+        busValueTtl -= n;
+
+        if (unlikely(busValueTtl <= 0))
+        {
+            busValue = 0;
+            busValueTtl = 0;
+        }
+    }
+}
+
+RESID_INLINE
+int SID::output()
+{
+    const float o1 = voice[0].output(voice[2].wave());
+    const float o2 = voice[1].output(voice[0].wave());
+    const float o3 = voice[2].output(voice[1].wave());
+
+    const unsigned int env1 = voice[0].envelope()->output();
+    const unsigned int env2 = voice[1].envelope()->output();
+    const unsigned int env3 = voice[2].envelope()->output();
+
+    const int v1 = filter->getNormalizedVoice(o1, env1);
+    const int v2 = filter->getNormalizedVoice(o2, env2);
+    const int v3 = filter->getNormalizedVoice(o3, env3);
+
+    const int input = static_cast<int>(filter->clock(v1, v2, v3));
+    return externalFilter.clock(input);
+}
+
+
+RESID_INLINE
+int SID::clock(unsigned int cycles, short* buf)
+{
+    ageBusValue(cycles);
+    int s = 0;
+
+    while (cycles != 0)
+    {
+        unsigned int delta_t = std::min(nextVoiceSync, cycles);
+
+        if (likely(delta_t > 0))
+        {
+            for (unsigned int i = 0; i < delta_t; i++)
+            {
+                // clock waveform generators
+                voice[0].wave()->clock();
+                voice[1].wave()->clock();
+                voice[2].wave()->clock();
+
+                // clock envelope generators
+                voice[0].envelope()->clock();
+                voice[1].envelope()->clock();
+                voice[2].envelope()->clock();
+
+                if (unlikely(resampler->input(output())))
+                {
+                    buf[s++] = resampler->getOutput(scaleFactor);
+                }
+            }
+
+            cycles -= delta_t;
+            nextVoiceSync -= delta_t;
+        }
+
+        if (unlikely(nextVoiceSync == 0))
+        {
+            voiceSync(true);
+        }
+    }
+
+    return s;
+}
+
+} // namespace reSIDfp
+
+#endif
+
+#endif
diff --git a/src/sound/resid-fp/sidcxx11.h b/src/sound/resid-fp/sidcxx11.h
new file mode 100644
index 000000000..96380be77
--- /dev/null
+++ b/src/sound/resid-fp/sidcxx11.h
@@ -0,0 +1,58 @@
+/*
+ * This file is part of libsidplayfp, a SID player engine.
+ *
+ *  Copyright 2014-2022 Leandro Nini
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef SIDCXX_H
+#define SIDCXX_H
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#define HAVE_CXX11 true
+
+
+#ifdef HAVE_CXX17
+#  define HAVE_CXX14
+#  define MAYBE_UNUSED [[ maybe_unused ]]
+#else
+#  define MAYBE_UNUSED
+#endif
+
+#ifdef HAVE_CXX14
+#  define HAVE_CXX11
+#  define MAKE_UNIQUE(type, ...) std::make_unique<type>(__VA_ARGS__)
+#else
+#  define MAKE_UNIQUE(type, ...) std::unique_ptr<type>(new type(__VA_ARGS__))
+#endif
+
+#ifndef HAVE_CXX11
+#  define nullptr    0
+#  define override
+#  define final
+#  define unique_ptr auto_ptr
+#  define DEFAULT {}
+#  define DELETE {}
+#else
+#  define DEFAULT = default
+#  define DELETE  = delete
+#endif
+
+
+#endif
diff --git a/src/sound/resid-fp/siddefs-fp.h b/src/sound/resid-fp/siddefs-fp.h
index fb10d5dff..22e40f4fb 100644
--- a/src/sound/resid-fp/siddefs-fp.h
+++ b/src/sound/resid-fp/siddefs-fp.h
@@ -14,75 +14,51 @@
 //
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //  ---------------------------------------------------------------------------
 
-#ifndef __SIDDEFS_FP_H__
-#define __SIDDEFS_FP_H__
+#ifndef SIDDEFS_FP_H
+#define SIDDEFS_FP_H
 
-#ifndef M_PI
-#define M_PI    3.14159265358979323846
-#define M_PI_f  3.14159265358979323846f
+// Compilation configuration.
+#define RESID_BRANCH_HINTS true
+
+// Compiler specifics.
+#ifndef _MSC_VER
+#define HAVE_BUILTIN_EXPECT true
 #else
-#define M_PI_f  ((float) M_PI)
+#define HAVE_BUILTIN_EXPECT false
 #endif
 
-#ifndef M_LN2
-#define M_LN2   0.69314718055994530942
-#define M_LN2_f 0.69314718055994530942f
+// Branch prediction macros, lifted off the Linux kernel.
+#if RESID_BRANCH_HINTS && HAVE_BUILTIN_EXPECT
+#  define likely(x)      __builtin_expect(!!(x), 1)
+#  define unlikely(x)    __builtin_expect(!!(x), 0)
 #else
-#define M_LN2_f ((float) M_LN2)
+#  define likely(x)      (x)
+#  define unlikely(x)    (x)
 #endif
 
-// Define bool, true, and false for C++ compilers that lack these keywords.
-#define RESID_HAVE_BOOL 1
+namespace reSIDfp {
 
-#if !RESID_HAVE_BOOL
-typedef int bool;
-const bool true = 1;
-const bool false = 0;
-#endif
+typedef enum { MOS6581=1, MOS8580 } ChipModel;
 
-// We could have used the smallest possible data type for each SID register,
-// however this would give a slower engine because of data type conversions.
-// An int is assumed to be at least 32 bits (necessary in the types reg24,
-// cycle_count, and sound_sample). GNU does not support 16-bit machines
-// (GNU Coding Standards: Portability between CPUs), so this should be
-// a valid assumption.
+typedef enum { AVERAGE=1, WEAK, STRONG } CombinedWaveforms;
 
-typedef unsigned int reg4;
-typedef unsigned int reg8;
-typedef unsigned int reg12;
-typedef unsigned int reg16;
-typedef unsigned int reg24;
-
-typedef int cycle_count;
-
-enum chip_model { MOS6581FP=1, MOS8580FP };
-
-enum sampling_method { SAMPLE_INTERPOLATE=1, SAMPLE_RESAMPLE_INTERPOLATE };
+typedef enum { DECIMATE=1, RESAMPLE } SamplingMethod;
+}
 
 extern "C"
 {
 #ifndef __VERSION_CC__
-extern const char* resid_version_string;
+extern const char* residfp_version_string;
 #else
-const char* resid_version_string = VERSION;
+const char* residfp_version_string = VERSION;
 #endif
 }
 
 // Inlining on/off.
+#define RESID_INLINING true
 #define RESID_INLINE inline
 
-#if defined(__SSE__) || (defined(_M_IX86_FP ) && _M_IX86_FP >= 1) || defined(_M_X64)
-#define RESID_USE_SSE 1
-#else
-#define RESID_USE_SSE 0
-#endif
-
-#define HAVE_LOGF
-#define HAVE_EXPF
-#define HAVE_LOGF_PROTOTYPE
-#define HAVE_EXPF_PROTOTYPE
-
-#endif // not __SIDDEFS_H__
+#endif // SIDDEFS_FP_H
diff --git a/src/sound/resid-fp/siddefs-fp.h.in b/src/sound/resid-fp/siddefs-fp.h.in
index ec44b3619..dfe543db5 100644
--- a/src/sound/resid-fp/siddefs-fp.h.in
+++ b/src/sound/resid-fp/siddefs-fp.h.in
@@ -14,74 +14,47 @@
 //
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //  ---------------------------------------------------------------------------
 
-#ifndef __SIDDEFS_FP_H__
-#define __SIDDEFS_FP_H__
+#ifndef SIDDEFS_FP_H
+#define SIDDEFS_FP_H
 
-#ifndef M_PI
-#define M_PI    3.14159265358979323846
-#define M_PI_f  3.14159265358979323846f
+// Compilation configuration.
+#define RESID_BRANCH_HINTS @RESID_BRANCH_HINTS@
+
+// Compiler specifics.
+#define HAVE_BUILTIN_EXPECT @HAVE_BUILTIN_EXPECT@
+
+// Branch prediction macros, lifted off the Linux kernel.
+#if RESID_BRANCH_HINTS && HAVE_BUILTIN_EXPECT
+#  define likely(x)      __builtin_expect(!!(x), 1)
+#  define unlikely(x)    __builtin_expect(!!(x), 0)
 #else
-#define M_PI_f  ((float) M_PI)
+#  define likely(x)      (x)
+#  define unlikely(x)    (x)
 #endif
 
-#ifndef M_LN2
-#define M_LN2   0.69314718055994530942
-#define M_LN2_f 0.69314718055994530942f
-#else
-#define M_LN2_f ((float) M_LN2)
-#endif
+namespace reSIDfp {
 
-// Define bool, true, and false for C++ compilers that lack these keywords.
-#define RESID_HAVE_BOOL @RESID_HAVE_BOOL@
+typedef enum { MOS6581=1, MOS8580 } ChipModel;
 
-#if !RESID_HAVE_BOOL
-typedef int bool;
-const bool true = 1;
-const bool false = 0;
-#endif
+typedef enum { AVERAGE=1, WEAK, STRONG } CombinedWaveforms;
 
-// We could have used the smallest possible data type for each SID register,
-// however this would give a slower engine because of data type conversions.
-// An int is assumed to be at least 32 bits (necessary in the types reg24,
-// cycle_count, and sound_sample). GNU does not support 16-bit machines
-// (GNU Coding Standards: Portability between CPUs), so this should be
-// a valid assumption.
-
-typedef unsigned int reg4;
-typedef unsigned int reg8;
-typedef unsigned int reg12;
-typedef unsigned int reg16;
-typedef unsigned int reg24;
-
-typedef int cycle_count;
-
-enum chip_model { MOS6581FP=1, MOS8580FP };
-
-enum sampling_method { SAMPLE_INTERPOLATE=1, SAMPLE_RESAMPLE_INTERPOLATE };
+typedef enum { DECIMATE=1, RESAMPLE } SamplingMethod;
+}
 
 extern "C"
 {
 #ifndef __VERSION_CC__
-extern const char* resid_version_string;
+extern const char* residfp_version_string;
 #else
-const char* resid_version_string = VERSION;
+const char* residfp_version_string = "@PACKAGE_VERSION@";
 #endif
 }
 
 // Inlining on/off.
+#define RESID_INLINING @RESID_INLINING@
 #define RESID_INLINE @RESID_INLINE@
 
-#define RESID_USE_SSE @RESID_USE_SSE@
-
-#if @HAVE_LOGF_PROTOTYPE@
-#define HAVE_LOGF_PROTOTYPE
-#endif
-
-#if @HAVE_EXPF_PROTOTYPE@
-#define HAVE_EXPF_PROTOTYPE
-#endif
-
-#endif // not __SIDDEFS_H__
+#endif // SIDDEFS_FP_H
diff --git a/src/sound/resid-fp/version.cc b/src/sound/resid-fp/version.cc
index fe9d4595f..3ed8b4490 100644
--- a/src/sound/resid-fp/version.cc
+++ b/src/sound/resid-fp/version.cc
@@ -14,7 +14,7 @@
 //
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //  ---------------------------------------------------------------------------
 
 #define __VERSION_CC__
diff --git a/src/sound/resid-fp/voice.cc b/src/sound/resid-fp/voice.cc
deleted file mode 100644
index 18c36cc71..000000000
--- a/src/sound/resid-fp/voice.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#define __VOICE_CC__
-#include "voice.h"
-#include "sid.h"
-
-// ----------------------------------------------------------------------------
-// Constructor.
-// ----------------------------------------------------------------------------
-VoiceFP::VoiceFP()
-{
-  nonlinearity = 1.f;
-  set_chip_model(MOS6581FP);
-}
-
-/* Keep this at 1.f for 8580, there are no 6581-only codepaths in this file! */
-void VoiceFP::set_nonlinearity(float nl)
-{
-    nonlinearity = nl;
-    calculate_dac_tables();
-}
-
-// ----------------------------------------------------------------------------
-// Set chip model.
-// ----------------------------------------------------------------------------
-void VoiceFP::set_chip_model(chip_model model)
-{
-  wave.set_chip_model(model);
-
-  if (model == MOS6581FP) {
-    /* there is some level from each voice even if the env is down and osc
-     * is stopped. You can hear this by routing a voice into filter (filter
-     * should be kept disabled for this) as the master level changes. This
-     * tunable affects the volume of digis. */
-    voice_DC = 0x800 * 0xff;
-    /* In 8580 the waveforms seem well centered, but on the 6581 there is some
-     * offset change as envelope grows, indicating that the waveforms are not
-     * perfectly centered. I estimate the value ~ 0x600 for my R4AR, and ReSID
-     * has used another measurement technique and got 0x380. */
-    wave_zero = 0x600;
-    calculate_dac_tables();
-  }
-  else {
-    /* 8580 is thought to be perfect, apart from small negative offset due to
-     * ext-in mixing, I think. */
-    voice_DC = 0;
-    wave_zero = 0x800;
-    calculate_dac_tables();
-  }
-}
-
-void VoiceFP::calculate_dac_tables()
-{
-    int i;
-    for (i = 0; i < 256; i ++)
-        env_dac[i] = SIDFP::kinked_dac(i, nonlinearity, 8);
-    for (i = 0; i < 4096; i ++)
-        voice_dac[i] = SIDFP::kinked_dac(i, nonlinearity, 12) - wave_zero;
-}
-
-// ----------------------------------------------------------------------------
-// Set sync source.
-// ----------------------------------------------------------------------------
-void VoiceFP::set_sync_source(VoiceFP* source)
-{
-  wave.set_sync_source(&source->wave);
-}
-
-// ----------------------------------------------------------------------------
-// Register functions.
-// ----------------------------------------------------------------------------
-void VoiceFP::writeCONTROL_REG(reg8 control)
-{
-  wave.writeCONTROL_REG(control);
-  envelope.writeCONTROL_REG(control);
-}
-
-// ----------------------------------------------------------------------------
-// SID reset.
-// ----------------------------------------------------------------------------
-void VoiceFP::reset()
-{
-  wave.reset();
-  envelope.reset();
-}
diff --git a/src/sound/resid-fp/voice.h b/src/sound/resid-fp/voice.h
deleted file mode 100644
index 3a9e3fc95..000000000
--- a/src/sound/resid-fp/voice.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#ifndef __VOICE_H__
-#define __VOICE_H__
-
-#include "siddefs-fp.h"
-#include "wave.h"
-#include "envelope.h"
-
-class VoiceFP
-{
-public:
-  VoiceFP();
-
-  void set_chip_model(chip_model model);
-  void set_sync_source(VoiceFP*);
-  void reset();
-
-  void writeCONTROL_REG(reg8);
-
-  // Amplitude modulated waveform output.
-  // Range [-2048*255, 2047*255].
-  RESID_INLINE float output();
-
-  void set_nonlinearity(float nl);
-protected:
-  void calculate_dac_tables();
-
-  WaveformGeneratorFP wave;
-  EnvelopeGeneratorFP envelope;
-
-  // Multiplying D/A DC offset.
-  float voice_DC, wave_zero, nonlinearity;
-
-  float env_dac[256];
-  float voice_dac[4096];
-friend class SIDFP;
-};
-
-// ----------------------------------------------------------------------------
-// Amplitude modulated waveform output.
-// Ideal range [-2048*255, 2047*255].
-// ----------------------------------------------------------------------------
-
-RESID_INLINE
-float VoiceFP::output()
-{
-    unsigned int w = wave.output();
-    unsigned int e = envelope.output();
-    float _w = voice_dac[w];
-    float _e = env_dac[e];
-
-    return _w * _e + voice_DC;
-}
-
-#endif // not __VOICE_H__
diff --git a/src/sound/resid-fp/wave.cc b/src/sound/resid-fp/wave.cc
deleted file mode 100644
index 018c4e2be..000000000
--- a/src/sound/resid-fp/wave.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#define __WAVE_CC__
-#include "wave.h"
-
-// ----------------------------------------------------------------------------
-// Constructor.
-// ----------------------------------------------------------------------------
-WaveformGeneratorFP::WaveformGeneratorFP()
-{
-  sync_source = this;
-
-  set_chip_model(MOS6581FP);
-
-  reset();
-}
-
-
-// ----------------------------------------------------------------------------
-// Set sync source.
-// ----------------------------------------------------------------------------
-void WaveformGeneratorFP::set_sync_source(WaveformGeneratorFP* source)
-{
-  sync_source = source;
-  source->sync_dest = this;
-}
-
-
-// ----------------------------------------------------------------------------
-// Set chip model.
-// ----------------------------------------------------------------------------
-void WaveformGeneratorFP::set_chip_model(chip_model model)
-{
-  if (model == MOS6581FP) {
-    wave__ST = wave6581__ST;
-    wave_P_T = wave6581_P_T;
-    wave_PS_ = wave6581_PS_;
-    wave_PST = wave6581_PST;
-  }
-  else {
-    wave__ST = wave8580__ST;
-    wave_P_T = wave8580_P_T;
-    wave_PS_ = wave8580_PS_;
-    wave_PST = wave8580_PST;
-  }
-}
-
-
-// ----------------------------------------------------------------------------
-// Register functions.
-// ----------------------------------------------------------------------------
-void WaveformGeneratorFP::writeFREQ_LO(reg8 freq_lo)
-{
-  freq = (freq & 0xff00) | (freq_lo & 0x00ff);
-}
-
-void WaveformGeneratorFP::writeFREQ_HI(reg8 freq_hi)
-{
-  freq = ((freq_hi << 8) & 0xff00) | (freq & 0x00ff);
-}
-
-/* The original form was (acc >> 12) >= pw, where truth value is not affected
- * by the contents of the low 12 bits. Therefore the lowest bits must be zero
- * in the new formulation acc >= (pw << 12). */
-void WaveformGeneratorFP::writePW_LO(reg8 pw_lo)
-{
-  pw = (pw & 0xf00) | (pw_lo & 0x0ff);
-  pw_acc_scale = pw << 12;
-}
-
-void WaveformGeneratorFP::writePW_HI(reg8 pw_hi)
-{
-  pw = ((pw_hi << 8) & 0xf00) | (pw & 0x0ff);
-  pw_acc_scale = pw << 12;
-}
-
-void WaveformGeneratorFP::writeCONTROL_REG(reg8 control)
-{
-  waveform = (control >> 4) & 0x0f;
-  ring_mod = control & 0x04;
-  sync = control & 0x02;
-
-  reg8 test_next = control & 0x08;
-
-  /* SounDemoN found out that test bit can be used to control the noise
-   * register. Hear the result in Bojojoing.sid. */
-
-  // testbit set. invert bit 19 and write it to bit 1
-  if (test_next && !test) {
-    accumulator = 0;
-    reg24 bit19 = (shift_register >> 19) & 1;
-    shift_register = (shift_register & 0x7ffffd) | ((bit19^1) << 1);
-    noise_overwrite_delay = 200000; /* 200 ms, probably too generous? */
-  }
-  // Test bit cleared.
-  // The accumulator starts counting, and the shift register is reset to
-  // the value 0x7ffff8.
-  else if (!test_next && test) {
-    reg24 bit0 = ((shift_register >> 22) ^ (shift_register >> 17)) & 0x1;
-    shift_register <<= 1;
-    shift_register |= bit0;
-  }
-  // clear output bits of shift register if noise and other waveforms
-  // are selected simultaneously
-  if (waveform > 8) {
-    shift_register &= 0x7fffff^(1<<22)^(1<<20)^(1<<16)^(1<<13)^(1<<11)^(1<<7)^(1<<4)^(1<<2);
-  }
-
-  test = test_next;
-  
-  /* update noise anyway, just in case the above paths triggered */
-  noise_output_cached = outputN___();
-}
-
-reg8 WaveformGeneratorFP::readOSC()
-{
-  return output() >> 4;
-}
-
-// ----------------------------------------------------------------------------
-// SID reset.
-// ----------------------------------------------------------------------------
-void WaveformGeneratorFP::reset()
-{
-  accumulator = 0;
-  previous = 0;
-  shift_register = 0x7ffffc;
-  freq = 0;
-  pw = 0;
-  pw_acc_scale = 0;
-  test = 0;
-  writeCONTROL_REG(0);
-  msb_rising = false;
-}
diff --git a/src/sound/resid-fp/wave.h b/src/sound/resid-fp/wave.h
deleted file mode 100644
index 64684228b..000000000
--- a/src/sound/resid-fp/wave.h
+++ /dev/null
@@ -1,457 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#ifndef __WAVE_H__
-#define __WAVE_H__
-
-#include "siddefs-fp.h"
-
-// ----------------------------------------------------------------------------
-// A 24 bit accumulator is the basis for waveform generation. FREQ is added to
-// the lower 16 bits of the accumulator each cycle.
-// The accumulator is set to zero when TEST is set, and starts counting
-// when TEST is cleared.
-// The noise waveform is taken from intermediate bits of a 23 bit shift
-// register. This register is clocked by bit 19 of the accumulator.
-// ----------------------------------------------------------------------------
-class WaveformGeneratorFP
-{
-public:
-  WaveformGeneratorFP();
-
-  void set_sync_source(WaveformGeneratorFP*);
-  void set_chip_model(chip_model model);
-
-  RESID_INLINE void clock();
-  RESID_INLINE void synchronize();
-  void reset();
-
-  void writeFREQ_LO(reg8);
-  void writeFREQ_HI(reg8);
-  void writePW_LO(reg8);
-  void writePW_HI(reg8);
-  void writeCONTROL_REG(reg8);
-  reg8 readOSC();
-
-  // 12-bit waveform output.
-  RESID_INLINE reg12 output();
-
-protected:
-  const WaveformGeneratorFP* sync_source;
-  WaveformGeneratorFP* sync_dest;
-
-  // Tell whether the accumulator MSB was set high on this cycle.
-  bool msb_rising;
-
-  reg24 accumulator;
-  reg24 shift_register;
-  reg12 previous, noise_output_cached;
-  int noise_overwrite_delay;
-
-  // Fout  = (Fn*Fclk/16777216)Hz
-  reg16 freq;
-  // PWout = (PWn/40.95)%, also the same << 12 for direct comparison against acc
-  reg12 pw; reg24 pw_acc_scale;
-
-  // The control register right-shifted 4 bits; used for output function
-  // table lookup.
-  reg8 waveform;
-
-  // The remaining control register bits.
-  reg8 test;
-  reg8 ring_mod;
-  reg8 sync;
-  // The gate bit is handled by the EnvelopeGenerator.
-
-  // 16 possible combinations of waveforms.
-  RESID_INLINE reg12 output___T();
-  RESID_INLINE reg12 output__S_();
-  RESID_INLINE reg12 output__ST();
-  RESID_INLINE reg12 output_P__();
-  RESID_INLINE reg12 output_P_T();
-  RESID_INLINE reg12 output_PS_();
-  RESID_INLINE reg12 output_PST();
-  RESID_INLINE reg12 outputN___();
-  RESID_INLINE reg12 outputN__T();
-  RESID_INLINE reg12 outputN_S_();
-  RESID_INLINE reg12 outputN_ST();
-  RESID_INLINE reg12 outputNP__();
-  RESID_INLINE reg12 outputNP_T();
-  RESID_INLINE reg12 outputNPS_();
-  RESID_INLINE reg12 outputNPST();
-
-  // Sample data for combinations of waveforms.
-  static reg8 wave6581__ST[];
-  static reg8 wave6581_P_T[];
-  static reg8 wave6581_PS_[];
-  static reg8 wave6581_PST[];
-
-  static reg8 wave8580__ST[];
-  static reg8 wave8580_P_T[];
-  static reg8 wave8580_PS_[];
-  static reg8 wave8580_PST[];
-
-  reg8* wave__ST;
-  reg8* wave_P_T;
-  reg8* wave_PS_;
-  reg8* wave_PST;
-
-friend class VoiceFP;
-friend class SIDFP;
-};
-
-// ----------------------------------------------------------------------------
-// SID clocking - 1 cycle.
-// ----------------------------------------------------------------------------
-RESID_INLINE
-void WaveformGeneratorFP::clock()
-{
-  /* no digital operation if test bit is set. Only emulate analog fade. */
-  if (test) {
-    if (noise_overwrite_delay != 0) {
-        if (-- noise_overwrite_delay == 0) {
-            shift_register |= 0x7ffffc;
-            noise_output_cached = outputN___();
-        }
-    }
-    return;
-  }
-
-  reg24 accumulator_prev = accumulator;
-
-  // Calculate new accumulator value;
-  accumulator += freq;
-  accumulator &= 0xffffff;
-
-  // Check whether the MSB became set high. This is used for synchronization.
-  msb_rising = !(accumulator_prev & 0x800000) && (accumulator & 0x800000);
-
-  // Shift noise register once for each time accumulator bit 19 is set high.
-  if (!(accumulator_prev & 0x080000) && (accumulator & 0x080000)) {
-    reg24 bit0 = ((shift_register >> 22) ^ (shift_register >> 17)) & 0x1;
-    shift_register <<= 1;
-    // optimization: fall into the bit bucket
-    //shift_register &= 0x7fffff;
-    shift_register |= bit0;
-
-    /* since noise changes relatively infrequently, we'll avoid the relatively
-     * expensive bit shuffling at output time. */
-    noise_output_cached = outputN___();
-  }
-
-  // clear output bits of shift register if noise and other waveforms
-  // are selected simultaneously
-  if (waveform > 8) {
-    shift_register &= 0x7fffff^(1<<22)^(1<<20)^(1<<16)^(1<<13)^(1<<11)^(1<<7)^(1<<4)^(1<<2);
-    noise_output_cached = outputN___();
-  }
-}
-
-// ----------------------------------------------------------------------------
-// Synchronize oscillators.
-// This must be done after all the oscillators have been clock()'ed since the
-// oscillators operate in parallel.
-// Note that the oscillators must be clocked exactly on the cycle when the
-// MSB is set high for hard sync to operate correctly. See SID::clock().
-// ----------------------------------------------------------------------------
-RESID_INLINE
-void WaveformGeneratorFP::synchronize()
-{
-  // A special case occurs when a sync source is synced itself on the same
-  // cycle as when its MSB is set high. In this case the destination will
-  // not be synced. This has been verified by sampling OSC3.
-  if (msb_rising && sync_dest->sync && !(sync && sync_source->msb_rising)) {
-    sync_dest->accumulator = 0;
-  }
-}
-
-
-// ----------------------------------------------------------------------------
-// Output functions.
-// NB! The output from SID 8580 is delayed one cycle compared to SID 6581,
-// this is not modeled.
-// ----------------------------------------------------------------------------
-
-// Triangle:
-// The upper 12 bits of the accumulator are used.
-// The MSB is used to create the falling edge of the triangle by inverting
-// the lower 11 bits. The MSB is thrown away and the lower 11 bits are
-// left-shifted (half the resolution, full amplitude).
-// Ring modulation substitutes the MSB with MSB EOR sync_source MSB.
-//
-RESID_INLINE
-reg12 WaveformGeneratorFP::output___T()
-{
-  reg24 msb = (ring_mod ? accumulator ^ sync_source->accumulator : accumulator)
-    & 0x800000;
-  return ((msb ? ~accumulator : accumulator) >> 11) & 0xfff;
-}
-
-// Sawtooth:
-// The output is identical to the upper 12 bits of the accumulator.
-//
-RESID_INLINE
-reg12 WaveformGeneratorFP::output__S_()
-{
-  return accumulator >> 12;
-}
-
-// Pulse:
-// The upper 12 bits of the accumulator are used.
-// These bits are compared to the pulse width register by a 12 bit digital
-// comparator; output is either all one or all zero bits.
-// NB! The output is actually delayed one cycle after the compare.
-// This is not modeled.
-//
-// The test bit, when set to one, holds the pulse waveform output at 0xfff
-// regardless of the pulse width setting.
-//
-RESID_INLINE
-reg12 WaveformGeneratorFP::output_P__()
-{
-  return (test || accumulator >= pw_acc_scale) ? 0xfff : 0x000;
-}
-
-// Noise:
-// The noise output is taken from intermediate bits of a 23-bit shift register
-// which is clocked by bit 19 of the accumulator.
-// NB! The output is actually delayed 2 cycles after bit 19 is set high.
-// This is not modeled.
-//
-// Operation: Calculate EOR result, shift register, set bit 0 = result.
-//
-//                        ----------------------->---------------------
-//                        |                                            |
-//                   ----EOR----                                       |
-//                   |         |                                       |
-//                   2 2 2 1 1 1 1 1 1 1 1 1 1                         |
-// Register bits:    2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 <---
-//                   |   |       |     |   |       |     |   |
-// OSC3 bits  :      7   6       5     4   3       2     1   0
-//
-// Since waveform output is 12 bits the output is left-shifted 4 times.
-//
-RESID_INLINE
-reg12 WaveformGeneratorFP::outputN___()
-{
-  return
-    ((shift_register & 0x400000) >> 11) |
-    ((shift_register & 0x100000) >> 10) |
-    ((shift_register & 0x010000) >> 7) |
-    ((shift_register & 0x002000) >> 5) |
-    ((shift_register & 0x000800) >> 4) |
-    ((shift_register & 0x000080) >> 1) |
-    ((shift_register & 0x000010) << 1) |
-    ((shift_register & 0x000004) << 2);
-}
-
-// Combined waveforms:
-// By combining waveforms, the bits of each waveform are effectively short
-// circuited. A zero bit in one waveform will result in a zero output bit
-// (thus the infamous claim that the waveforms are AND'ed).
-// However, a zero bit in one waveform will also affect the neighboring bits
-// in the output. The reason for this has not been determined.
-//
-// Example:
-//
-//             1 1
-// Bit #       1 0 9 8 7 6 5 4 3 2 1 0
-//             -----------------------
-// Sawtooth    0 0 0 1 1 1 1 1 1 0 0 0
-//
-// Triangle    0 0 1 1 1 1 1 1 0 0 0 0
-//
-// AND         0 0 0 1 1 1 1 1 0 0 0 0
-//
-// Output      0 0 0 0 1 1 1 0 0 0 0 0
-//
-//
-// This behavior would be quite difficult to model exactly, since the SID
-// in this case does not act as a digital state machine. Tests show that minor
-// (1 bit)  differences can actually occur in the output from otherwise
-// identical samples from OSC3 when waveforms are combined. To further
-// complicate the situation the output changes slightly with time (more
-// neighboring bits are successively set) when the 12-bit waveform
-// registers are kept unchanged.
-//
-// It is probably possible to come up with a valid model for the
-// behavior, however this would be far too slow for practical use since it
-// would have to be based on the mutual influence of individual bits.
-//
-// The output is instead approximated by using the upper bits of the
-// accumulator as an index to look up the combined output in a table
-// containing actual combined waveform samples from OSC3.
-// These samples are 8 bit, so 4 bits of waveform resolution is lost.
-// All OSC3 samples are taken with FREQ=0x1000, adding a 1 to the upper 12
-// bits of the accumulator each cycle for a sample period of 4096 cycles.
-//
-// Sawtooth+Triangle:
-// The sawtooth output is used to look up an OSC3 sample.
-//
-// Pulse+Triangle:
-// The triangle output is right-shifted and used to look up an OSC3 sample.
-// The sample is output if the pulse output is on.
-// The reason for using the triangle output as the index is to handle ring
-// modulation. Only the first half of the sample is used, which should be OK
-// since the triangle waveform has half the resolution of the accumulator.
-//
-// Pulse+Sawtooth:
-// The sawtooth output is used to look up an OSC3 sample.
-// The sample is output if the pulse output is on.
-//
-// Pulse+Sawtooth+Triangle:
-// The sawtooth output is used to look up an OSC3 sample.
-// The sample is output if the pulse output is on.
-//
-RESID_INLINE
-reg12 WaveformGeneratorFP::output__ST()
-{
-  return wave__ST[output__S_()] << 4;
-}
-
-RESID_INLINE
-reg12 WaveformGeneratorFP::output_P_T()
-{
-  /* ring modulation does something odd with this waveform. But I don't know
-   * how to emulate it. */
-  return (wave_P_T[output___T() >> 1] << 4) & output_P__();
-}
-
-RESID_INLINE
-reg12 WaveformGeneratorFP::output_PS_()
-{
-  return (wave_PS_[output__S_()] << 4) & output_P__();
-}
-
-RESID_INLINE
-reg12 WaveformGeneratorFP::output_PST()
-{
-  return (wave_PST[output__S_()] << 4) & output_P__();
-}
-
-// Combined waveforms including noise:
-// All waveform combinations including noise output zero after a few cycles.
-// NB! The effects of such combinations are not fully explored. It is claimed
-// that the shift register may be filled with zeroes and locked up, which
-// seems to be true.
-// We have not attempted to model this behavior, suffice to say that
-// there is very little audible output from waveform combinations including
-// noise. We hope that nobody is actually using it.
-//
-RESID_INLINE
-reg12 WaveformGeneratorFP::outputN__T()
-{
-  return 0;
-}
-
-RESID_INLINE
-reg12 WaveformGeneratorFP::outputN_S_()
-{
-  return 0;
-}
-
-RESID_INLINE
-reg12 WaveformGeneratorFP::outputN_ST()
-{
-  return 0;
-}
-
-RESID_INLINE
-reg12 WaveformGeneratorFP::outputNP__()
-{
-  return 0;
-}
-
-RESID_INLINE
-reg12 WaveformGeneratorFP::outputNP_T()
-{
-  return 0;
-}
-
-RESID_INLINE
-reg12 WaveformGeneratorFP::outputNPS_()
-{
-  return 0;
-}
-
-RESID_INLINE
-reg12 WaveformGeneratorFP::outputNPST()
-{
-  return 0;
-}
-
-// ----------------------------------------------------------------------------
-// Select one of 16 possible combinations of waveforms.
-// ----------------------------------------------------------------------------
-RESID_INLINE
-reg12 WaveformGeneratorFP::output()
-{
-  switch (waveform) {
-  case 0x1:
-    previous = output___T();
-    break;
-  case 0x2:
-    previous = output__S_();
-    break;
-  case 0x3:
-    previous = output__ST();
-    break;
-  case 0x4:
-    previous = output_P__();
-    break;
-  case 0x5:
-    previous = output_P_T();
-    break;
-  case 0x6:
-    previous = output_PS_();
-    break;
-  case 0x7:
-    previous = output_PST();
-    break;
-  case 0x8:
-    previous = noise_output_cached;
-    break;
-  case 0x9:
-    previous = outputN__T();
-    break;
-  case 0xa:
-    previous = outputN_S_();
-    break;
-  case 0xb:
-    previous = outputN_ST();
-    break;
-  case 0xc:
-    previous = outputNP__();
-    break;
-  case 0xd:
-    previous = outputNP_T();
-    break;
-  case 0xe:
-    previous = outputNPS_();
-    break;
-  case 0xf:
-    previous = outputNPST();
-    break;
-  default:
-    break;
-  }
-  return previous;
-}
-
-#endif // not __WAVE_H__
diff --git a/src/sound/resid-fp/wave6581_PST.cc b/src/sound/resid-fp/wave6581_PST.cc
deleted file mode 100644
index 19d2126ef..000000000
--- a/src/sound/resid-fp/wave6581_PST.cc
+++ /dev/null
@@ -1,536 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#include "wave.h"
-
-reg8 WaveformGeneratorFP::wave6581_PST[] =
-{
-/* 0x000: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x008: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x010: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x018: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x020: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x028: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x030: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x038: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x040: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x048: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x050: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x058: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x060: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x068: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x070: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x078: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x080: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x088: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x090: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x098: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x100: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x108: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x110: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x118: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x120: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x128: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x130: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x138: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x140: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x148: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x150: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x158: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x160: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x168: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x170: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x178: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x180: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x188: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x190: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x198: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x200: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x208: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x210: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x218: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x220: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x228: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x230: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x238: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x240: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x248: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x250: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x258: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x260: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x268: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x270: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x278: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x280: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x288: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x290: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x298: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x300: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x308: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x310: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x318: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x320: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x328: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x330: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x338: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x340: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x348: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x350: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x358: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x360: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x368: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x370: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x378: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x380: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x388: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x390: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x398: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f,
-/* 0x400: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x408: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x410: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x418: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x420: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x428: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x430: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x438: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x440: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x448: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x450: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x458: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x460: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x468: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x470: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x478: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x480: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x488: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x490: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x498: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x500: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x508: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x510: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x518: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x520: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x528: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x530: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x538: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x540: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x548: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x550: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x558: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x560: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x568: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x570: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x578: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x580: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x588: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x590: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x598: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x600: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x608: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x610: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x618: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x620: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x628: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x630: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x638: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x640: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x648: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x650: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x658: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x660: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x668: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x670: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x678: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x680: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x688: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x690: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x698: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x700: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x708: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x710: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x718: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x720: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x728: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x730: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x738: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x740: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x748: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x750: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x758: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x760: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x768: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x770: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x778: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x780: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x788: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x790: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x798: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,
-/* 0x7f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30,
-/* 0x7f8: */  0x00, 0x00, 0x00, 0x78, 0x78, 0x7e, 0x7f, 0x7f,
-/* 0x800: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x808: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x810: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x818: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x820: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x828: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x830: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x838: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x840: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x848: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x850: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x858: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x860: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x868: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x870: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x878: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x880: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x888: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x890: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x898: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x900: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x908: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x910: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x918: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x920: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x928: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x930: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x938: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x940: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x948: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x950: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x958: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x960: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x968: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x970: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x978: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x980: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x988: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x990: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x998: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaa0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaa8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xab0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xab8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xac0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xac8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xad0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xad8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xae0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xae8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaf8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xba0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xba8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbe0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbe8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbf8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f,
-/* 0xc00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xca0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xca8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xce0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xce8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcf8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xda0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xda8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xde0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xde8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdf8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xea0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xea8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xeb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xeb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xec0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xec8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xed0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xed8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xee0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xee8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xef0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xef8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfa0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfa8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfe0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfe8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,
-/* 0xff0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30,
-/* 0xff8: */  0x00, 0x00, 0x00, 0x78, 0x78, 0x7e, 0x7f, 0x7f,
-};
diff --git a/src/sound/resid-fp/wave6581_PS_.cc b/src/sound/resid-fp/wave6581_PS_.cc
deleted file mode 100644
index bf133e542..000000000
--- a/src/sound/resid-fp/wave6581_PS_.cc
+++ /dev/null
@@ -1,536 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#include "wave.h"
-
-reg8 WaveformGeneratorFP::wave6581_PS_[] =
-{
-/* 0x000: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x008: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x010: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x018: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x020: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x028: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x030: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x038: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x040: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x048: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x050: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x058: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x060: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x068: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x070: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x078: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x080: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x088: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x090: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x098: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,
-/* 0x100: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x108: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x110: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x118: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x120: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x128: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x130: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x138: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x140: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x148: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x150: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x158: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x160: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x168: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x170: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x178: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-/* 0x180: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x188: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x190: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x198: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-/* 0x1c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x1f,
-/* 0x200: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x208: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x210: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x218: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x220: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x228: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x230: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x238: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x240: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x248: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x250: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x258: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x260: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x268: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x270: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x278: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-/* 0x280: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x288: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x290: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x298: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x2c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2f,
-/* 0x300: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x308: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x310: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x318: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x320: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x328: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x330: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x338: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x340: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x348: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x350: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x358: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x360: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x368: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x370: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x378: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x37,
-/* 0x380: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x388: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x390: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x398: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3b,
-/* 0x3c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3d,
-/* 0x3e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e,
-/* 0x3f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x3f,
-/* 0x3f8: */  0x00, 0x30, 0x38, 0x3f, 0x3e, 0x3f, 0x3f, 0x3f,
-/* 0x400: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x408: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x410: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x418: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x420: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x428: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x430: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x438: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x440: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x448: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x450: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x458: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x460: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x468: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x470: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x478: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-/* 0x480: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x488: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x490: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x498: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4f,
-/* 0x500: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x508: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x510: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x518: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x520: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x528: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x530: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x538: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x540: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x548: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x550: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x558: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x560: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x568: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x570: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x578: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57,
-/* 0x580: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x588: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x590: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x598: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
-/* 0x5c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5d,
-/* 0x5e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5e,
-/* 0x5f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x5f,
-/* 0x5f8: */  0x00, 0x40, 0x40, 0x5f, 0x5c, 0x5f, 0x5f, 0x5f,
-/* 0x600: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x608: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x610: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x618: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x620: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x628: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x630: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x638: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x640: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x648: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x650: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x658: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x660: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x668: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x670: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x678: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x67,
-/* 0x680: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x688: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x690: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x698: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6b,
-/* 0x6c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x6d,
-/* 0x6e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0x6e8: */  0x00, 0x00, 0x00, 0x40, 0x00, 0x40, 0x40, 0x6e,
-/* 0x6f0: */  0x00, 0x00, 0x00, 0x40, 0x00, 0x60, 0x60, 0x6f,
-/* 0x6f8: */  0x00, 0x60, 0x60, 0x6f, 0x60, 0x6f, 0x6f, 0x6f,
-/* 0x700: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x708: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x710: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x718: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0x720: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x728: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0x730: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0x738: */  0x00, 0x00, 0x00, 0x40, 0x00, 0x40, 0x60, 0x73,
-/* 0x740: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x748: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0x750: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0x758: */  0x00, 0x00, 0x00, 0x40, 0x00, 0x60, 0x60, 0x75,
-/* 0x760: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
-/* 0x768: */  0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x76,
-/* 0x770: */  0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x77,
-/* 0x778: */  0x00, 0x70, 0x70, 0x77, 0x70, 0x77, 0x77, 0x77,
-/* 0x780: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x788: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
-/* 0x790: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
-/* 0x798: */  0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x79,
-/* 0x7a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
-/* 0x7a8: */  0x00, 0x00, 0x00, 0x60, 0x00, 0x70, 0x70, 0x7a,
-/* 0x7b0: */  0x00, 0x00, 0x00, 0x70, 0x00, 0x70, 0x70, 0x7b,
-/* 0x7b8: */  0x40, 0x70, 0x70, 0x7b, 0x78, 0x7b, 0x7b, 0x7b,
-/* 0x7c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
-/* 0x7c8: */  0x00, 0x00, 0x00, 0x70, 0x00, 0x70, 0x70, 0x7c,
-/* 0x7d0: */  0x00, 0x00, 0x00, 0x70, 0x40, 0x70, 0x70, 0x7d,
-/* 0x7d8: */  0x40, 0x70, 0x78, 0x7d, 0x78, 0x7d, 0x7d, 0x7d,
-/* 0x7e0: */  0x00, 0x40, 0x40, 0x78, 0x60, 0x78, 0x78, 0x7e,
-/* 0x7e8: */  0x60, 0x78, 0x78, 0x7e, 0x7c, 0x7e, 0x7e, 0x7e,
-/* 0x7f0: */  0x70, 0x7c, 0x7c, 0x7f, 0x7e, 0x7f, 0x7f, 0x7f,
-/* 0x7f8: */  0x7e, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
-/* 0x800: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x808: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x810: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x818: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x820: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x828: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x830: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x838: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x840: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x848: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x850: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x858: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x860: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x868: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x870: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x878: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x880: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x888: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x890: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x898: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,
-/* 0x900: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x908: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x910: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x918: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x920: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x928: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x930: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x938: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x940: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x948: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x950: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x958: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x960: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x968: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x970: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x978: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-/* 0x980: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x988: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x990: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x998: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-/* 0x9c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x1f,
-/* 0xa00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-/* 0xa80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaa0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaa8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xab0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xab8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0xac0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xac8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xad0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xad8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xae0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xae8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaf8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2f,
-/* 0xb00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x37,
-/* 0xb80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xba0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xba8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3b,
-/* 0xbc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3d,
-/* 0xbe0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbe8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e,
-/* 0xbf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x3f,
-/* 0xbf8: */  0x00, 0x30, 0x38, 0x3f, 0x3e, 0x3f, 0x3f, 0x3f,
-/* 0xc00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-/* 0xc80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xca0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xca8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xce0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xce8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcf8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4f,
-/* 0xd00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57,
-/* 0xd80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xda0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xda8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b,
-/* 0xdc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5d,
-/* 0xde0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xde8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5e,
-/* 0xdf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x5f,
-/* 0xdf8: */  0x00, 0x40, 0x40, 0x5f, 0x5c, 0x5f, 0x5f, 0x5f,
-/* 0xe00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x67,
-/* 0xe80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xea0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xea8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xeb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xeb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6b,
-/* 0xec0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xec8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xed0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xed8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6d,
-/* 0xee0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0xee8: */  0x00, 0x00, 0x00, 0x40, 0x00, 0x40, 0x40, 0x6e,
-/* 0xef0: */  0x00, 0x00, 0x00, 0x40, 0x00, 0x60, 0x60, 0x6f,
-/* 0xef8: */  0x00, 0x60, 0x60, 0x6f, 0x60, 0x6f, 0x6f, 0x6f,
-/* 0xf00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0xf20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0xf30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0xf38: */  0x00, 0x00, 0x00, 0x40, 0x00, 0x40, 0x60, 0x73,
-/* 0xf40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0xf50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0xf58: */  0x00, 0x00, 0x00, 0x40, 0x00, 0x60, 0x60, 0x75,
-/* 0xf60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
-/* 0xf68: */  0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x76,
-/* 0xf70: */  0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x77,
-/* 0xf78: */  0x00, 0x70, 0x70, 0x77, 0x70, 0x77, 0x77, 0x77,
-/* 0xf80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
-/* 0xf90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
-/* 0xf98: */  0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x79,
-/* 0xfa0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
-/* 0xfa8: */  0x00, 0x00, 0x00, 0x60, 0x00, 0x70, 0x70, 0x7a,
-/* 0xfb0: */  0x00, 0x00, 0x00, 0x70, 0x00, 0x70, 0x70, 0x7b,
-/* 0xfb8: */  0x40, 0x70, 0x70, 0x7b, 0x78, 0x7b, 0x7b, 0x7b,
-/* 0xfc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
-/* 0xfc8: */  0x00, 0x00, 0x00, 0x70, 0x00, 0x70, 0x70, 0x7c,
-/* 0xfd0: */  0x00, 0x00, 0x00, 0x70, 0x40, 0x70, 0x70, 0x7d,
-/* 0xfd8: */  0x40, 0x70, 0x78, 0x7d, 0x78, 0x7d, 0x7d, 0x7d,
-/* 0xfe0: */  0x00, 0x40, 0x40, 0x78, 0x60, 0x78, 0x78, 0x7e,
-/* 0xfe8: */  0x60, 0x78, 0x78, 0x7e, 0x7c, 0x7e, 0x7e, 0x7e,
-/* 0xff0: */  0x70, 0x7c, 0x7c, 0x7f, 0x7c, 0x7f, 0x7f, 0x7f,
-/* 0xff8: */  0x7e, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
-};
diff --git a/src/sound/resid-fp/wave6581_PS_.dat b/src/sound/resid-fp/wave6581_PS_.dat
deleted file mode 100644
index ea2fb9c53..000000000
Binary files a/src/sound/resid-fp/wave6581_PS_.dat and /dev/null differ
diff --git a/src/sound/resid-fp/wave6581_P_T.cc b/src/sound/resid-fp/wave6581_P_T.cc
deleted file mode 100644
index 30736169e..000000000
--- a/src/sound/resid-fp/wave6581_P_T.cc
+++ /dev/null
@@ -1,536 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#include "wave.h"
-
-reg8 WaveformGeneratorFP::wave6581_P_T[] =
-{
-/* 0x000: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x008: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x010: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x018: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x020: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x028: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x030: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x038: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x040: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x048: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x050: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x058: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x060: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x068: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x070: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x078: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x080: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x088: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x090: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x098: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x100: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x108: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x110: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x118: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x120: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x128: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x130: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x138: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x140: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x148: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x150: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x158: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x160: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x168: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x170: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x178: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x180: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x188: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x190: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x198: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x38, 0x3f,
-/* 0x200: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x208: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x210: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x218: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x220: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x228: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x230: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x238: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x240: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x248: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x250: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x258: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x260: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x268: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x270: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x278: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x280: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x288: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x290: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x298: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2f8: */  0x00, 0x00, 0x00, 0x40, 0x00, 0x40, 0x40, 0x5f,
-/* 0x300: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x308: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x310: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x318: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x320: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x328: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x330: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x338: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x340: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x348: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x350: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x358: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x360: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x368: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0x370: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0x378: */  0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x6f,
-/* 0x380: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x388: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x390: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x398: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0x3a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
-/* 0x3b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
-/* 0x3b8: */  0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x70, 0x77,
-/* 0x3c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
-/* 0x3d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
-/* 0x3d8: */  0x00, 0x00, 0x00, 0x70, 0x40, 0x70, 0x70, 0x7b,
-/* 0x3e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x70,
-/* 0x3e8: */  0x00, 0x40, 0x40, 0x70, 0x60, 0x70, 0x78, 0x7d,
-/* 0x3f0: */  0x00, 0x40, 0x60, 0x78, 0x60, 0x78, 0x78, 0x7e,
-/* 0x3f8: */  0x70, 0x7c, 0x7c, 0x7f, 0x7e, 0x7f, 0x7f, 0x7f,
-/* 0x400: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x408: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x410: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x418: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x420: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x428: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x430: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x438: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x440: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x448: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x450: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x458: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x460: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x468: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x470: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x478: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x480: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x488: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x490: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x498: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x4c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x4e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x4f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x4f8: */  0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x9f,
-/* 0x500: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x508: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x510: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x518: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x520: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x528: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x530: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x538: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x540: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x548: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x550: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x558: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x560: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x568: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x570: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x578: */  0x00, 0x80, 0x80, 0x80, 0x80, 0xa0, 0xa0, 0xaf,
-/* 0x580: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x588: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x590: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x598: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x5a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80,
-/* 0x5b0: */  0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0xa0,
-/* 0x5b8: */  0x00, 0x80, 0x80, 0xa0, 0x80, 0xa0, 0xb0, 0xb7,
-/* 0x5c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x5c8: */  0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0xa0,
-/* 0x5d0: */  0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0xa0,
-/* 0x5d8: */  0x00, 0x80, 0x80, 0xa0, 0x80, 0xb0, 0xb0, 0xbb,
-/* 0x5e0: */  0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xb0,
-/* 0x5e8: */  0x80, 0x80, 0x80, 0xb0, 0x80, 0xb0, 0xb8, 0xbd,
-/* 0x5f0: */  0x80, 0x80, 0x80, 0xb8, 0xa0, 0xb8, 0xb8, 0xbe,
-/* 0x5f8: */  0xa0, 0xb8, 0xbc, 0xbf, 0xbe, 0xbf, 0xbf, 0xbf,
-/* 0x600: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x608: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x610: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x618: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x620: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x628: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x630: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x638: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
-/* 0x640: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x648: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x650: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x658: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0,
-/* 0x660: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x668: */  0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0xc0,
-/* 0x670: */  0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0xc0,
-/* 0x678: */  0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xcf,
-/* 0x680: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x688: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x690: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x698: */  0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0xc0,
-/* 0x6a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x6a8: */  0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0xc0,
-/* 0x6b0: */  0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0xc0, 0xc0,
-/* 0x6b8: */  0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xd0, 0xd7,
-/* 0x6c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x6c8: */  0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0,
-/* 0x6d0: */  0x00, 0x80, 0x80, 0xc0, 0x80, 0xc0, 0xc0, 0xc0,
-/* 0x6d8: */  0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xd0, 0xd0, 0xdb,
-/* 0x6e0: */  0x00, 0x80, 0x80, 0xc0, 0x80, 0xc0, 0xc0, 0xd0,
-/* 0x6e8: */  0x80, 0xc0, 0xc0, 0xd0, 0xc0, 0xd0, 0xd8, 0xdd,
-/* 0x6f0: */  0xc0, 0xc0, 0xc0, 0xd0, 0xc0, 0xd8, 0xd8, 0xde,
-/* 0x6f8: */  0xc0, 0xd8, 0xdc, 0xdf, 0xdc, 0xdf, 0xdf, 0xdf,
-/* 0x700: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x708: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x710: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x718: */  0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0,
-/* 0x720: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x728: */  0x00, 0x80, 0x80, 0xc0, 0x80, 0xc0, 0xc0, 0xe0,
-/* 0x730: */  0x00, 0x80, 0x80, 0xc0, 0x80, 0xc0, 0xc0, 0xe0,
-/* 0x738: */  0x80, 0xc0, 0xc0, 0xe0, 0xc0, 0xe0, 0xe0, 0xe7,
-/* 0x740: */  0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0xc0,
-/* 0x748: */  0x00, 0x80, 0x80, 0xc0, 0x80, 0xc0, 0xc0, 0xe0,
-/* 0x750: */  0x00, 0x80, 0x80, 0xc0, 0x80, 0xc0, 0xc0, 0xe0,
-/* 0x758: */  0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xeb,
-/* 0x760: */  0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0,
-/* 0x768: */  0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xed,
-/* 0x770: */  0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe8, 0xe8, 0xee,
-/* 0x778: */  0xe0, 0xe8, 0xec, 0xef, 0xec, 0xef, 0xef, 0xef,
-/* 0x780: */  0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xc0,
-/* 0x788: */  0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xf0,
-/* 0x790: */  0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0,
-/* 0x798: */  0xc0, 0xe0, 0xe0, 0xf0, 0xe0, 0xf0, 0xf0, 0xf3,
-/* 0x7a0: */  0x80, 0xc0, 0xc0, 0xe0, 0xc0, 0xe0, 0xe0, 0xf0,
-/* 0x7a8: */  0xc0, 0xe0, 0xe0, 0xf0, 0xe0, 0xf0, 0xf0, 0xf5,
-/* 0x7b0: */  0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf6,
-/* 0x7b8: */  0xf0, 0xf0, 0xf4, 0xf7, 0xf4, 0xf7, 0xf7, 0xf7,
-/* 0x7c0: */  0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0,
-/* 0x7c8: */  0xe0, 0xe0, 0xe0, 0xf8, 0xf0, 0xf8, 0xf8, 0xf9,
-/* 0x7d0: */  0xe0, 0xf0, 0xf0, 0xf8, 0xf0, 0xf8, 0xf8, 0xfa,
-/* 0x7d8: */  0xf0, 0xf8, 0xf8, 0xfb, 0xf8, 0xfb, 0xfb, 0xfb,
-/* 0x7e0: */  0xe0, 0xf0, 0xf0, 0xf8, 0xf0, 0xf8, 0xfc, 0xfc,
-/* 0x7e8: */  0xf8, 0xfc, 0xfc, 0xfd, 0xfc, 0xfd, 0xfd, 0xfd,
-/* 0x7f0: */  0xf8, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
-/* 0x7f8: */  0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-/* 0x800: */  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
-/* 0x808: */  0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xf8,
-/* 0x810: */  0xfd, 0xfd, 0xfd, 0xfc, 0xfd, 0xfc, 0xfc, 0xf8,
-/* 0x818: */  0xfc, 0xfc, 0xfc, 0xf0, 0xf8, 0xf0, 0xf0, 0xe0,
-/* 0x820: */  0xfb, 0xfb, 0xfb, 0xf8, 0xfb, 0xf8, 0xf8, 0xf0,
-/* 0x828: */  0xfa, 0xf8, 0xf8, 0xf0, 0xf8, 0xf0, 0xf0, 0xe0,
-/* 0x830: */  0xf9, 0xf8, 0xf8, 0xf0, 0xf8, 0xf0, 0xe0, 0xe0,
-/* 0x838: */  0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0,
-/* 0x840: */  0xf7, 0xf7, 0xf7, 0xf4, 0xf7, 0xf4, 0xf0, 0xf0,
-/* 0x848: */  0xf6, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0,
-/* 0x850: */  0xf5, 0xf0, 0xf0, 0xe0, 0xf0, 0xe0, 0xe0, 0xc0,
-/* 0x858: */  0xf0, 0xe0, 0xe0, 0xc0, 0xe0, 0xc0, 0xc0, 0x80,
-/* 0x860: */  0xf3, 0xf0, 0xf0, 0xe0, 0xf0, 0xe0, 0xe0, 0xc0,
-/* 0x868: */  0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80,
-/* 0x870: */  0xf0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80,
-/* 0x878: */  0xc0, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
-/* 0x880: */  0xef, 0xef, 0xef, 0xec, 0xef, 0xec, 0xe8, 0xe0,
-/* 0x888: */  0xee, 0xe8, 0xe8, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0,
-/* 0x890: */  0xed, 0xe8, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0,
-/* 0x898: */  0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80,
-/* 0x8a0: */  0xeb, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0,
-/* 0x8a8: */  0xe0, 0xc0, 0xc0, 0x80, 0xc0, 0x80, 0x80, 0x00,
-/* 0x8b0: */  0xe0, 0xc0, 0xc0, 0x80, 0xc0, 0x80, 0x80, 0x00,
-/* 0x8b8: */  0xc0, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00,
-/* 0x8c0: */  0xe7, 0xe0, 0xe0, 0xc0, 0xe0, 0xc0, 0xc0, 0x80,
-/* 0x8c8: */  0xe0, 0xc0, 0xc0, 0x80, 0xc0, 0x80, 0x80, 0x00,
-/* 0x8d0: */  0xe0, 0xc0, 0xc0, 0x80, 0xc0, 0x80, 0x80, 0x00,
-/* 0x8d8: */  0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8e0: */  0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00,
-/* 0x8e8: */  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8f0: */  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x900: */  0xdf, 0xdf, 0xdf, 0xdc, 0xdf, 0xdc, 0xd8, 0xc0,
-/* 0x908: */  0xde, 0xd8, 0xd8, 0xc0, 0xd8, 0xc0, 0xc0, 0xc0,
-/* 0x910: */  0xdd, 0xd8, 0xd0, 0xc0, 0xd0, 0xc0, 0xc0, 0x80,
-/* 0x918: */  0xd0, 0xc0, 0xc0, 0x80, 0xc0, 0x80, 0x80, 0x00,
-/* 0x920: */  0xdb, 0xd0, 0xd0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80,
-/* 0x928: */  0xc0, 0xc0, 0xc0, 0x80, 0xc0, 0x80, 0x80, 0x00,
-/* 0x930: */  0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
-/* 0x938: */  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x940: */  0xd7, 0xd0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80,
-/* 0x948: */  0xc0, 0xc0, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00,
-/* 0x950: */  0xc0, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00,
-/* 0x958: */  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x960: */  0xc0, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00,
-/* 0x968: */  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x970: */  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x978: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x980: */  0xcf, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00,
-/* 0x988: */  0xc0, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00,
-/* 0x990: */  0xc0, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00,
-/* 0x998: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9a0: */  0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9c0: */  0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa00: */  0xbf, 0xbf, 0xbf, 0xbe, 0xbf, 0xbc, 0xbc, 0xa0,
-/* 0xa08: */  0xbe, 0xbc, 0xb8, 0xa0, 0xb8, 0xa0, 0x80, 0x80,
-/* 0xa10: */  0xbd, 0xb8, 0xb0, 0x80, 0xb0, 0x80, 0x80, 0x80,
-/* 0xa18: */  0xb0, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
-/* 0xa20: */  0xbb, 0xb0, 0xb0, 0x80, 0xa0, 0x80, 0x80, 0x00,
-/* 0xa28: */  0xa0, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00,
-/* 0xa30: */  0xa0, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00,
-/* 0xa38: */  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa40: */  0xb7, 0xb0, 0xa0, 0x80, 0xa0, 0x80, 0x80, 0x00,
-/* 0xa48: */  0xa0, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00,
-/* 0xa50: */  0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa60: */  0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa80: */  0xaf, 0xa0, 0xa0, 0x80, 0x80, 0x80, 0x80, 0x00,
-/* 0xa88: */  0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa90: */  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaa0: */  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaa8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xab0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xab8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xac0: */  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xac8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xad0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xad8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xae0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xae8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaf8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb00: */  0x9f, 0x90, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
-/* 0xb08: */  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb10: */  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb20: */  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb40: */  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb80: */  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xba0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xba8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbe0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbe8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbf8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc00: */  0x7f, 0x7f, 0x7f, 0x7e, 0x7f, 0x7c, 0x7c, 0x70,
-/* 0xc08: */  0x7e, 0x7c, 0x78, 0x60, 0x78, 0x60, 0x60, 0x00,
-/* 0xc10: */  0x7d, 0x78, 0x78, 0x60, 0x70, 0x40, 0x40, 0x00,
-/* 0xc18: */  0x70, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc20: */  0x7b, 0x78, 0x70, 0x40, 0x70, 0x40, 0x00, 0x00,
-/* 0xc28: */  0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc30: */  0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc40: */  0x77, 0x70, 0x70, 0x00, 0x60, 0x00, 0x00, 0x00,
-/* 0xc48: */  0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc50: */  0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc60: */  0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc80: */  0x6f, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00,
-/* 0xc88: */  0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc90: */  0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xca0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xca8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xce0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xce8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcf8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd00: */  0x5f, 0x58, 0x40, 0x00, 0x40, 0x00, 0x00, 0x00,
-/* 0xd08: */  0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xda0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xda8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xde0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xde8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdf8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe00: */  0x3f, 0x3c, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xea0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xea8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xeb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xeb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xec0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xec8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xed0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xed8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xee0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xee8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xef0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xef8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfa0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfa8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfe0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfe8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xff0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xff8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
diff --git a/src/sound/resid-fp/wave6581_P_T.dat b/src/sound/resid-fp/wave6581_P_T.dat
deleted file mode 100644
index 1cc8874da..000000000
Binary files a/src/sound/resid-fp/wave6581_P_T.dat and /dev/null differ
diff --git a/src/sound/resid-fp/wave6581__ST.cc b/src/sound/resid-fp/wave6581__ST.cc
deleted file mode 100644
index d193550f2..000000000
--- a/src/sound/resid-fp/wave6581__ST.cc
+++ /dev/null
@@ -1,536 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#include "wave.h"
-
-reg8 WaveformGeneratorFP::wave6581__ST[] =
-{
-/* 0x000: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x008: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x010: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x018: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x020: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x028: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x030: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x038: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x040: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x048: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x050: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x058: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x060: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x068: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x070: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x078: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x080: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x088: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x090: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x098: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x0c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0f8: */  0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07,
-/* 0x100: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x108: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x110: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x118: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x120: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x128: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x130: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x138: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x140: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x148: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x150: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x158: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x160: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x168: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x170: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x178: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x180: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x188: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x190: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x198: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x1c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1f8: */  0x0e, 0x0e, 0x0e, 0x0e, 0x0f, 0x0f, 0x0f, 0x0f,
-/* 0x200: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x208: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x210: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x218: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x220: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x228: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x230: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x238: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x240: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x248: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x250: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x258: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x260: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x268: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x270: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x278: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x280: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x288: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x290: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x298: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x2c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2f8: */  0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07,
-/* 0x300: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x308: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x310: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x318: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x320: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x328: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x330: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x338: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x340: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x348: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x350: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x358: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x360: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x368: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x370: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x378: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x380: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x388: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x390: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x398: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x3c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3f0: */  0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c,
-/* 0x3f8: */  0x1e, 0x1e, 0x1e, 0x1e, 0x1f, 0x1f, 0x3f, 0x3f,
-/* 0x400: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x408: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x410: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x418: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x420: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x428: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x430: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x438: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x440: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x448: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x450: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x458: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x460: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x468: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x470: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x478: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x480: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x488: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x490: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x498: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x4c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4f8: */  0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07,
-/* 0x500: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x508: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x510: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x518: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x520: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x528: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x530: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x538: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x540: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x548: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x550: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x558: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x560: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x568: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x570: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x578: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x580: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x588: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x590: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x598: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x5c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5f8: */  0x0e, 0x0e, 0x0e, 0x0e, 0x0f, 0x0f, 0x0f, 0x1f,
-/* 0x600: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x608: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x610: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x618: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x620: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x628: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x630: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x638: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x640: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x648: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x650: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x658: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x660: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x668: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x670: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x678: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x680: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x688: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x690: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x698: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x6c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6f8: */  0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07,
-/* 0x700: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x708: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x710: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x718: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x720: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x728: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x730: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x738: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x740: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x748: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x750: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x758: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x760: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x768: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x770: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x778: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x780: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x788: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x790: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x798: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x7c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7e0: */  0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
-/* 0x7e8: */  0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
-/* 0x7f0: */  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-/* 0x7f8: */  0x3e, 0x3e, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f,
-/* 0x800: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x808: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x810: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x818: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x820: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x828: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x830: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x838: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x840: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x848: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x850: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x858: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x860: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x868: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x870: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x878: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x880: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x888: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x890: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x898: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x8c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8f8: */  0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07,
-/* 0x900: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x908: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x910: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x918: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x920: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x928: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x930: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x938: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x940: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x948: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x950: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x958: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x960: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x968: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x970: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x978: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x980: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x988: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x990: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x998: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x9c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9f8: */  0x0e, 0x0e, 0x0e, 0x0e, 0x0f, 0x0f, 0x0f, 0x0f,
-/* 0xa00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0xa80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaa0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaa8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xab0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xab8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0xac0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xac8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xad0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xad8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xae0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xae8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaf8: */  0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07,
-/* 0xb00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0xb40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0xb80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xba0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xba8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0xbc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbe0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbe8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbf0: */  0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c,
-/* 0xbf8: */  0x1e, 0x1e, 0x1e, 0x1e, 0x1f, 0x1f, 0x3f, 0x3f,
-/* 0xc00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0xc80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xca0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xca8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0xcc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xce0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xce8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcf8: */  0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07,
-/* 0xd00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0xd40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0xd80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xda0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xda8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0xdc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xde0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xde8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdf8: */  0x0e, 0x0e, 0x0e, 0x0e, 0x0f, 0x0f, 0x0f, 0x1f,
-/* 0xe00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0xe80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xea0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xea8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xeb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xeb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0xec0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xec8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xed0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xed8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xee0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xee8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xef0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xef8: */  0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07,
-/* 0xf00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0xf40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0xf80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfa0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfa8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0xfc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfe0: */  0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
-/* 0xfe8: */  0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
-/* 0xff0: */  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
-/* 0xff8: */  0x3e, 0x3e, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f,
-};
diff --git a/src/sound/resid-fp/wave6581__ST.dat b/src/sound/resid-fp/wave6581__ST.dat
deleted file mode 100644
index 2e5d9872c..000000000
Binary files a/src/sound/resid-fp/wave6581__ST.dat and /dev/null differ
diff --git a/src/sound/resid-fp/wave8580_PST.cc b/src/sound/resid-fp/wave8580_PST.cc
deleted file mode 100644
index 51ae21612..000000000
--- a/src/sound/resid-fp/wave8580_PST.cc
+++ /dev/null
@@ -1,536 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#include "wave.h"
-
-reg8 WaveformGeneratorFP::wave8580_PST[] =
-{
-/* 0x000: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x008: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x010: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x018: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x020: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x028: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x030: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x038: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x040: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x048: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x050: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x058: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x060: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x068: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x070: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x078: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x080: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x088: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x090: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x098: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x100: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x108: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x110: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x118: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x120: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x128: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x130: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x138: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x140: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x148: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x150: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x158: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x160: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x168: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x170: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x178: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x180: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x188: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x190: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x198: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x200: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x208: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x210: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x218: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x220: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x228: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x230: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x238: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x240: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x248: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x250: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x258: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x260: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x268: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x270: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x278: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x280: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x288: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x290: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x298: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x300: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x308: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x310: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x318: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x320: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x328: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x330: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x338: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x340: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x348: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x350: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x358: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x360: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x368: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x370: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x378: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x380: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x388: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x390: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x398: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f,
-/* 0x400: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x408: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x410: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x418: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x420: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x428: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x430: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x438: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x440: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x448: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x450: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x458: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x460: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x468: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x470: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x478: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x480: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x488: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x490: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x498: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x500: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x508: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x510: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x518: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x520: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x528: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x530: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x538: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x540: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x548: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x550: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x558: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x560: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x568: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x570: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x578: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x580: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x588: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x590: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x598: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x600: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x608: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x610: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x618: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x620: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x628: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x630: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x638: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x640: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x648: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x650: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x658: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x660: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x668: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x670: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x678: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x680: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x688: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x690: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x698: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x700: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x708: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x710: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x718: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x720: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x728: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x730: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x738: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x740: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x748: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x750: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x758: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x760: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x768: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x770: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x778: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x780: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x788: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x790: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x798: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x70,
-/* 0x7f0: */  0x60, 0x20, 0x70, 0x70, 0x70, 0x70, 0x70, 0x78,
-/* 0x7f8: */  0x78, 0x78, 0x7c, 0x7c, 0x7e, 0x7e, 0x7f, 0x7f,
-/* 0x800: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x808: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x810: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x818: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x820: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x828: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x830: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x838: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x840: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x848: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x850: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x858: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x860: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x868: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x870: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x878: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x880: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x888: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x890: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x898: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x900: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x908: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x910: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x918: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x920: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x928: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x930: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x938: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x940: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x948: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x950: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x958: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x960: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x968: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x970: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x978: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x980: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x988: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x990: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x998: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaa0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaa8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xab0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xab8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xac0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xac8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xad0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xad8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xae0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xae8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaf8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xba0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xba8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbe0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbe8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbf8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1e, 0x3f,
-/* 0xc00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xca0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xca8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xce0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xce8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcf8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xda0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xda8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xde0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xde8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0xdf8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x8c, 0x9f,
-/* 0xe00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80,
-/* 0xe40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80,
-/* 0xe60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00,
-/* 0xe68: */  0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xe70: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xe78: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xe80: */  0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x80, 0x80,
-/* 0xe88: */  0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xe90: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xe98: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xea0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xea8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xeb0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xeb8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xec0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xec8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xed0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xed8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xee0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xee8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0,
-/* 0xef0: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xef8: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xcf,
-/* 0xf00: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xf08: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xf10: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xf18: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xf20: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xf28: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xf30: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xf38: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xf40: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xf48: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xf50: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xf58: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xf60: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xf68: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0,
-/* 0xf70: */  0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xf78: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe3,
-/* 0xf80: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xf88: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xf90: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xf98: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xfa0: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xfa8: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xfb0: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0,
-/* 0xfb8: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0xfc0: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0xfc8: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0xfd0: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0xfd8: */  0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8,
-/* 0xfe0: */  0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8,
-/* 0xfe8: */  0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc,
-/* 0xff0: */  0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe,
-/* 0xff8: */  0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-};
diff --git a/src/sound/resid-fp/wave8580_PST.dat b/src/sound/resid-fp/wave8580_PST.dat
deleted file mode 100644
index 22706cf25..000000000
Binary files a/src/sound/resid-fp/wave8580_PST.dat and /dev/null differ
diff --git a/src/sound/resid-fp/wave8580_PS_.cc b/src/sound/resid-fp/wave8580_PS_.cc
deleted file mode 100644
index e33a2cee5..000000000
--- a/src/sound/resid-fp/wave8580_PS_.cc
+++ /dev/null
@@ -1,536 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#include "wave.h"
-
-reg8 WaveformGeneratorFP::wave8580_PS_[] =
-{
-/* 0x000: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x008: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x010: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x018: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x020: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x028: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x030: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x038: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x040: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x048: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x050: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x058: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x060: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x068: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x070: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x078: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-/* 0x080: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x088: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x090: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x098: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x0c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f,
-/* 0x100: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x108: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x110: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x118: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x120: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x128: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x130: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x138: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x140: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x148: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x150: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x158: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x160: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x168: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x170: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x178: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,
-/* 0x180: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x188: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x190: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x198: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-/* 0x1c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x1e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x1f,
-/* 0x200: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x208: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x210: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x218: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x220: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x228: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x230: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x238: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x240: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x248: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x250: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x258: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x260: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x268: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x270: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x278: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-/* 0x280: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x288: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x290: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x298: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-/* 0x2c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x2e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0f,
-/* 0x300: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x308: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x310: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x318: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x320: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x328: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x330: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x338: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x340: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x348: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x350: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x358: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x360: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x368: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x370: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x378: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17,
-/* 0x380: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x388: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x390: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x398: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3b,
-/* 0x3c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3d,
-/* 0x3e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e,
-/* 0x3f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f,
-/* 0x3f8: */  0x00, 0x0c, 0x1c, 0x3f, 0x1e, 0x3f, 0x3f, 0x3f,
-/* 0x400: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x408: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x410: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x418: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x420: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x428: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x430: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x438: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x440: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x448: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x450: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x458: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x460: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x468: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x470: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x478: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-/* 0x480: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x488: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x490: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x498: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x4c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f,
-/* 0x500: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x508: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x510: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x518: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x520: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x528: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x530: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x538: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x540: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x548: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x550: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x558: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x560: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x568: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x570: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x578: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,
-/* 0x580: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x588: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x590: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x598: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b,
-/* 0x5c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a,
-/* 0x5e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5e,
-/* 0x5f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f,
-/* 0x5f8: */  0x00, 0x00, 0x00, 0x5f, 0x0c, 0x5f, 0x5f, 0x5f,
-/* 0x600: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x608: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x610: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x618: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x620: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x628: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x630: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x638: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x640: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x648: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x650: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x658: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x660: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x668: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x670: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x678: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,
-/* 0x680: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x688: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x690: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x698: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43,
-/* 0x6c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x65,
-/* 0x6e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e,
-/* 0x6f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6f,
-/* 0x6f8: */  0x00, 0x40, 0x40, 0x6f, 0x40, 0x6f, 0x6f, 0x6f,
-/* 0x700: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x708: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x710: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x718: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x720: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x728: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x730: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x738: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63,
-/* 0x740: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x748: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x750: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x758: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x61,
-/* 0x760: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0x768: */  0x00, 0x00, 0x00, 0x40, 0x00, 0x40, 0x40, 0x70,
-/* 0x770: */  0x00, 0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0x70,
-/* 0x778: */  0x40, 0x60, 0x60, 0x77, 0x60, 0x77, 0x77, 0x77,
-/* 0x780: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x788: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0x790: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x60,
-/* 0x798: */  0x00, 0x40, 0x40, 0x60, 0x40, 0x60, 0x60, 0x79,
-/* 0x7a0: */  0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x60,
-/* 0x7a8: */  0x40, 0x40, 0x40, 0x60, 0x60, 0x60, 0x60, 0x78,
-/* 0x7b0: */  0x40, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x78,
-/* 0x7b8: */  0x60, 0x70, 0x70, 0x78, 0x70, 0x79, 0x7b, 0x7b,
-/* 0x7c0: */  0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x70,
-/* 0x7c8: */  0x60, 0x60, 0x60, 0x70, 0x60, 0x70, 0x70, 0x7c,
-/* 0x7d0: */  0x60, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x7c,
-/* 0x7d8: */  0x70, 0x78, 0x78, 0x7c, 0x78, 0x7c, 0x7c, 0x7d,
-/* 0x7e0: */  0x70, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x7c,
-/* 0x7e8: */  0x78, 0x7c, 0x7c, 0x7e, 0x7c, 0x7e, 0x7e, 0x7e,
-/* 0x7f0: */  0x7c, 0x7c, 0x7c, 0x7e, 0x7e, 0x7f, 0x7f, 0x7f,
-/* 0x7f8: */  0x7e, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff,
-/* 0x800: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x808: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x810: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x818: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x820: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x828: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x830: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x838: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x840: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x848: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x850: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x858: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x860: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x868: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x870: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x878: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-/* 0x880: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x888: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x890: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x898: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x8c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8f,
-/* 0x900: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x908: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x910: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x918: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x920: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x928: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x930: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x938: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x940: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x948: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x950: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x958: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x960: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x968: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x970: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x978: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87,
-/* 0x980: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x988: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x990: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x998: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83,
-/* 0x9c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x8d,
-/* 0x9e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x9e8: */  0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0x8e,
-/* 0x9f0: */  0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x8f,
-/* 0x9f8: */  0x80, 0x80, 0x80, 0x9f, 0x80, 0x9f, 0x9f, 0x9f,
-/* 0xa00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0xa40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0xa70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0xa78: */  0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0x87,
-/* 0xa80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0xaa0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaa8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0xab0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0xab8: */  0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x83,
-/* 0xac0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xac8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0xad0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80,
-/* 0xad8: */  0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x81,
-/* 0xae0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xae8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x84,
-/* 0xaf0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x87,
-/* 0xaf8: */  0x80, 0x80, 0x80, 0x87, 0x80, 0x8f, 0xaf, 0xaf,
-/* 0xb00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0xb10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0xb18: */  0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xb20: */  0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x80,
-/* 0xb28: */  0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xb30: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xb38: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x83,
-/* 0xb40: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xb48: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xb50: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xb58: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x81,
-/* 0xb60: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xb68: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xa0,
-/* 0xb70: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xa0,
-/* 0xb78: */  0x80, 0x80, 0x80, 0xa0, 0x80, 0xa3, 0xb7, 0xb7,
-/* 0xb80: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xb88: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xb90: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xb98: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xb1,
-/* 0xba0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xba8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xb0,
-/* 0xbb0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xb0,
-/* 0xbb8: */  0x80, 0xa0, 0xa0, 0xb0, 0xa0, 0xb8, 0xb9, 0xbb,
-/* 0xbc0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xa0,
-/* 0xbc8: */  0x80, 0x80, 0x80, 0xa0, 0x80, 0xa0, 0xa0, 0xb8,
-/* 0xbd0: */  0x80, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xb8,
-/* 0xbd8: */  0xa0, 0xb0, 0xb0, 0xb8, 0xb0, 0xbc, 0xbc, 0xbd,
-/* 0xbe0: */  0xa0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb8, 0xb8, 0xbc,
-/* 0xbe8: */  0xb0, 0xb8, 0xb8, 0xbc, 0xb8, 0xbc, 0xbe, 0xbe,
-/* 0xbf0: */  0xb8, 0xbc, 0xbc, 0xbe, 0xbc, 0xbe, 0xbe, 0xbf,
-/* 0xbf8: */  0xbe, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf,
-/* 0xc00: */  0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80,
-/* 0xc08: */  0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80,
-/* 0xc10: */  0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xc18: */  0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xc20: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xc28: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xc30: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xc38: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x81,
-/* 0xc40: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xc48: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xc50: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xc58: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xc60: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xc68: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xc70: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xc78: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc7,
-/* 0xc80: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xc88: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xc90: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xc98: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xca0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xca8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xcb0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xcb8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc3,
-/* 0xcc0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xcc8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0,
-/* 0xcd0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0,
-/* 0xcd8: */  0x80, 0x80, 0x80, 0xc0, 0x80, 0xc0, 0xc0, 0xc1,
-/* 0xce0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0,
-/* 0xce8: */  0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xcf0: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc7,
-/* 0xcf8: */  0xc0, 0xc0, 0xc0, 0xc7, 0xc0, 0xcf, 0xcf, 0xcf,
-/* 0xd00: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xd08: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xd10: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xd18: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0,
-/* 0xd20: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xd28: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0,
-/* 0xd30: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0,
-/* 0xd38: */  0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc3,
-/* 0xd40: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0,
-/* 0xd48: */  0x80, 0x80, 0x80, 0xc0, 0x80, 0xc0, 0xc0, 0xc0,
-/* 0xd50: */  0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xd58: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc1,
-/* 0xd60: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xd68: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xd70: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xd78: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc1, 0xc7, 0xd7,
-/* 0xd80: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xd88: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xd90: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xd98: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xda0: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xda8: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xd0,
-/* 0xdb0: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xd0,
-/* 0xdb8: */  0xc0, 0xc0, 0xc0, 0xd0, 0xc0, 0xd0, 0xd8, 0xdb,
-/* 0xdc0: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xdc8: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xd8,
-/* 0xdd0: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xd8,
-/* 0xdd8: */  0xc0, 0xc0, 0xc0, 0xd8, 0xd0, 0xd8, 0xd8, 0xdd,
-/* 0xde0: */  0xc0, 0xc0, 0xc0, 0xd0, 0xc0, 0xd0, 0xd0, 0xdc,
-/* 0xde8: */  0xd0, 0xd8, 0xd8, 0xdc, 0xd8, 0xdc, 0xdc, 0xde,
-/* 0xdf0: */  0xd8, 0xdc, 0xdc, 0xde, 0xdc, 0xde, 0xde, 0xdf,
-/* 0xdf8: */  0xde, 0xdf, 0xdf, 0xdf, 0xdf, 0xdf, 0xdf, 0xdf,
-/* 0xe00: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xe08: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xe10: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xe18: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xe20: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xe28: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xe30: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xe38: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe3,
-/* 0xe40: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xe48: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xe50: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0,
-/* 0xe58: */  0xc0, 0xc0, 0xc0, 0xe0, 0xc0, 0xe0, 0xe0, 0xe1,
-/* 0xe60: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0,
-/* 0xe68: */  0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xe70: */  0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xe78: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe1, 0xe3, 0xe7,
-/* 0xe80: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0,
-/* 0xe88: */  0xc0, 0xc0, 0xc0, 0xe0, 0xc0, 0xe0, 0xe0, 0xe0,
-/* 0xe90: */  0xc0, 0xc0, 0xc0, 0xe0, 0xc0, 0xe0, 0xe0, 0xe0,
-/* 0xe98: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xea0: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xea8: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xeb0: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xeb8: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xeb,
-/* 0xec0: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xec8: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xed0: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xed8: */  0xe0, 0xe0, 0xe0, 0xe8, 0xe0, 0xe8, 0xe8, 0xed,
-/* 0xee0: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xec,
-/* 0xee8: */  0xe0, 0xe0, 0xe0, 0xec, 0xe8, 0xec, 0xec, 0xee,
-/* 0xef0: */  0xe8, 0xe8, 0xe8, 0xec, 0xec, 0xee, 0xee, 0xef,
-/* 0xef8: */  0xec, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef,
-/* 0xf00: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xf08: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xf10: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xf18: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0,
-/* 0xf20: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0,
-/* 0xf28: */  0xe0, 0xe0, 0xe0, 0xf0, 0xe0, 0xf0, 0xf0, 0xf0,
-/* 0xf30: */  0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0xf38: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf3,
-/* 0xf40: */  0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0xf48: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0xf50: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0xf58: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf5,
-/* 0xf60: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0xf68: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf4, 0xf4, 0xf6,
-/* 0xf70: */  0xf0, 0xf0, 0xf0, 0xf4, 0xf0, 0xf4, 0xf6, 0xf7,
-/* 0xf78: */  0xf4, 0xf6, 0xf6, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7,
-/* 0xf80: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8,
-/* 0xf88: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8,
-/* 0xf90: */  0xf0, 0xf0, 0xf0, 0xf8, 0xf0, 0xf8, 0xf8, 0xf8,
-/* 0xf98: */  0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf9,
-/* 0xfa0: */  0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8,
-/* 0xfa8: */  0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xfa,
-/* 0xfb0: */  0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xfb,
-/* 0xfb8: */  0xf8, 0xfa, 0xfa, 0xfb, 0xfb, 0xfb, 0xfb, 0xfb,
-/* 0xfc0: */  0xf8, 0xf8, 0xf8, 0xfc, 0xf8, 0xfc, 0xfc, 0xfc,
-/* 0xfc8: */  0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc,
-/* 0xfd0: */  0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfd,
-/* 0xfd8: */  0xfc, 0xfc, 0xfc, 0xfd, 0xfd, 0xfd, 0xfd, 0xfd,
-/* 0xfe0: */  0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
-/* 0xfe8: */  0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
-/* 0xff0: */  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-/* 0xff8: */  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-};
diff --git a/src/sound/resid-fp/wave8580_PS_.dat b/src/sound/resid-fp/wave8580_PS_.dat
deleted file mode 100644
index 9a20a9eee..000000000
Binary files a/src/sound/resid-fp/wave8580_PS_.dat and /dev/null differ
diff --git a/src/sound/resid-fp/wave8580_P_T.cc b/src/sound/resid-fp/wave8580_P_T.cc
deleted file mode 100644
index 206a91728..000000000
--- a/src/sound/resid-fp/wave8580_P_T.cc
+++ /dev/null
@@ -1,536 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#include "wave.h"
-
-reg8 WaveformGeneratorFP::wave8580_P_T[] =
-{
-/* 0x000: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x008: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x010: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x018: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x020: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x028: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x030: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x038: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x040: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x048: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x050: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x058: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x060: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x068: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x070: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x078: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x080: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x088: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x090: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x098: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,
-/* 0x100: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x108: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x110: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x118: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x120: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x128: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x130: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x138: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x140: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x148: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x150: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x158: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x160: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x168: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x170: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x178: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x180: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x188: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x190: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x198: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1f8: */  0x00, 0x00, 0x00, 0x1c, 0x00, 0x3c, 0x3f, 0x3f,
-/* 0x200: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x208: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x210: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x218: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x220: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x228: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x230: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x238: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x240: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x248: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x250: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x258: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x260: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x268: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x270: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x278: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x280: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x288: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x290: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x298: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2f8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x5e, 0x5f,
-/* 0x300: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x308: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x310: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x318: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x320: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x328: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x330: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x338: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x340: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x348: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x350: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x358: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x360: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x368: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x370: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0x378: */  0x00, 0x00, 0x00, 0x40, 0x40, 0x60, 0x60, 0x6f,
-/* 0x380: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x388: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x390: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x398: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-/* 0x3a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40,
-/* 0x3b0: */  0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x40, 0x60,
-/* 0x3b8: */  0x40, 0x40, 0x60, 0x60, 0x60, 0x60, 0x70, 0x77,
-/* 0x3c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40,
-/* 0x3c8: */  0x40, 0x40, 0x40, 0x40, 0x40, 0x60, 0x60, 0x60,
-/* 0x3d0: */  0x40, 0x40, 0x40, 0x60, 0x60, 0x60, 0x60, 0x70,
-/* 0x3d8: */  0x60, 0x60, 0x60, 0x70, 0x70, 0x70, 0x78, 0x7b,
-/* 0x3e0: */  0x60, 0x60, 0x60, 0x70, 0x60, 0x70, 0x70, 0x70,
-/* 0x3e8: */  0x70, 0x70, 0x70, 0x78, 0x78, 0x78, 0x78, 0x7c,
-/* 0x3f0: */  0x78, 0x78, 0x78, 0x7c, 0x78, 0x7c, 0x7c, 0x7e,
-/* 0x3f8: */  0x7c, 0x7e, 0x7e, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
-/* 0x400: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x408: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x410: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x418: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x420: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x428: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x430: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x438: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x440: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x448: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x450: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x458: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x460: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x468: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x470: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x478: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x480: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x488: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x490: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x498: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80,
-/* 0x4c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x4d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x4d8: */  0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x4e0: */  0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x4e8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x4f0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x4f8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x8e, 0x9f,
-/* 0x500: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x508: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x510: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x518: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-/* 0x520: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x528: */  0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0x80,
-/* 0x530: */  0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x538: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x540: */  0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0x80,
-/* 0x548: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x550: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x558: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x560: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x568: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x570: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x578: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xaf,
-/* 0x580: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x588: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x590: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x598: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x5a0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x5a8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x5b0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x5b8: */  0x80, 0x80, 0x80, 0xa0, 0xa0, 0xa0, 0xa0, 0xb7,
-/* 0x5c0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x5c8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xa0,
-/* 0x5d0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xa0, 0xa0,
-/* 0x5d8: */  0xa0, 0xa0, 0xa0, 0xb0, 0xa0, 0xb0, 0xb0, 0xbb,
-/* 0x5e0: */  0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xb0, 0xb0,
-/* 0x5e8: */  0xa0, 0xb0, 0xb0, 0xb8, 0xb0, 0xb8, 0xb8, 0xbc,
-/* 0x5f0: */  0xb0, 0xb8, 0xb8, 0xb8, 0xb8, 0xbc, 0xbc, 0xbe,
-/* 0x5f8: */  0xbc, 0xbc, 0xbe, 0xbf, 0xbe, 0xbf, 0xbf, 0xbf,
-/* 0x600: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x608: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x610: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x618: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x620: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x628: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x630: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x638: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0,
-/* 0x640: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x648: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x650: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0,
-/* 0x658: */  0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x660: */  0x80, 0x80, 0x80, 0xc0, 0x80, 0xc0, 0xc0, 0xc0,
-/* 0x668: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x670: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x678: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xcf,
-/* 0x680: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0,
-/* 0x688: */  0xc0, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x690: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x698: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x6a0: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x6a8: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x6b0: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x6b8: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xd7,
-/* 0x6c0: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x6c8: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x6d0: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x6d8: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xd0, 0xd0, 0xd9,
-/* 0x6e0: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xd0,
-/* 0x6e8: */  0xc0, 0xd0, 0xd0, 0xd0, 0xd0, 0xd8, 0xd8, 0xdc,
-/* 0x6f0: */  0xd0, 0xd0, 0xd8, 0xd8, 0xd8, 0xdc, 0xdc, 0xde,
-/* 0x6f8: */  0xdc, 0xdc, 0xde, 0xdf, 0xde, 0xdf, 0xdf, 0xdf,
-/* 0x700: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x708: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x710: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x718: */  0xc0, 0xc0, 0xc0, 0xe0, 0xc0, 0xe0, 0xe0, 0xe0,
-/* 0x720: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0,
-/* 0x728: */  0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0x730: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0x738: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe7,
-/* 0x740: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0x748: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0x750: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0x758: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe8,
-/* 0x760: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0x768: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe8, 0xec,
-/* 0x770: */  0xe0, 0xe0, 0xe0, 0xe8, 0xe8, 0xe8, 0xec, 0xee,
-/* 0x778: */  0xec, 0xec, 0xec, 0xee, 0xee, 0xef, 0xef, 0xef,
-/* 0x780: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0x788: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0,
-/* 0x790: */  0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0x798: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0x7a0: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0x7a8: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf4,
-/* 0x7b0: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf4,
-/* 0x7b8: */  0xf0, 0xf4, 0xf4, 0xf6, 0xf6, 0xf7, 0xf7, 0xf7,
-/* 0x7c0: */  0xf0, 0xf0, 0xf0, 0xf8, 0xf0, 0xf8, 0xf8, 0xf8,
-/* 0x7c8: */  0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8,
-/* 0x7d0: */  0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8,
-/* 0x7d8: */  0xf8, 0xf8, 0xf8, 0xfa, 0xfa, 0xfb, 0xfb, 0xfb,
-/* 0x7e0: */  0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc,
-/* 0x7e8: */  0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfd, 0xfd, 0xfd,
-/* 0x7f0: */  0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
-/* 0x7f8: */  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-/* 0x800: */  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-/* 0x808: */  0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc,
-/* 0x810: */  0xfd, 0xfd, 0xfd, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc,
-/* 0x818: */  0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8,
-/* 0x820: */  0xfb, 0xfb, 0xfb, 0xfa, 0xfa, 0xf8, 0xf8, 0xf8,
-/* 0x828: */  0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8,
-/* 0x830: */  0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8,
-/* 0x838: */  0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0x840: */  0xf7, 0xf7, 0xf7, 0xf6, 0xf6, 0xf4, 0xf4, 0xf0,
-/* 0x848: */  0xf4, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0x850: */  0xf4, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0x858: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0x860: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0x868: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0,
-/* 0x870: */  0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0x878: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0x880: */  0xef, 0xef, 0xef, 0xee, 0xee, 0xec, 0xec, 0xe8,
-/* 0x888: */  0xee, 0xec, 0xe8, 0xe8, 0xe8, 0xe0, 0xe0, 0xe0,
-/* 0x890: */  0xec, 0xe8, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0x898: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0x8a0: */  0xe8, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0x8a8: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0x8b0: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0x8b8: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0x8c0: */  0xe7, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0x8c8: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0x8d0: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0,
-/* 0x8d8: */  0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x8e0: */  0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x8e8: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x8f0: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x8f8: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x900: */  0xdf, 0xdf, 0xdf, 0xde, 0xdf, 0xde, 0xdc, 0xdc,
-/* 0x908: */  0xde, 0xdc, 0xdc, 0xd8, 0xd8, 0xd8, 0xd0, 0xd0,
-/* 0x910: */  0xdc, 0xd8, 0xd8, 0xd0, 0xd0, 0xd0, 0xd0, 0xc0,
-/* 0x918: */  0xd0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x920: */  0xd9, 0xd0, 0xd0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x928: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x930: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x938: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x940: */  0xd7, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x948: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x950: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x958: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x960: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x968: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x970: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80,
-/* 0x978: */  0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x980: */  0xcf, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x988: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x990: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0x998: */  0xc0, 0xc0, 0xc0, 0x80, 0xc0, 0x80, 0x80, 0x80,
-/* 0x9a0: */  0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80,
-/* 0x9a8: */  0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x9b0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x9b8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x9c0: */  0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x9c8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x9d0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x9d8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x9e0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x9e8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x9f0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0x9f8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xa00: */  0xbf, 0xbf, 0xbf, 0xbe, 0xbf, 0xbe, 0xbc, 0xbc,
-/* 0xa08: */  0xbe, 0xbc, 0xbc, 0xb8, 0xb8, 0xb8, 0xb8, 0xb0,
-/* 0xa10: */  0xbc, 0xb8, 0xb8, 0xb0, 0xb8, 0xb0, 0xb0, 0xb0,
-/* 0xa18: */  0xb0, 0xb0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0,
-/* 0xa20: */  0xbb, 0xb0, 0xb0, 0xa0, 0xb0, 0xa0, 0xa0, 0xa0,
-/* 0xa28: */  0xa0, 0xa0, 0xa0, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xa30: */  0xa0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xa38: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xa40: */  0xb7, 0xb0, 0xa0, 0xa0, 0xa0, 0x80, 0x80, 0x80,
-/* 0xa48: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xa50: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xa58: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xa60: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xa68: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xa70: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xa78: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xa80: */  0xaf, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xa88: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xa90: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xa98: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xaa0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xaa8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xab0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xab8: */  0x80, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00,
-/* 0xac0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xac8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00,
-/* 0xad0: */  0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
-/* 0xad8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xae0: */  0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xae8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaf8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb00: */  0x9f, 0x9e, 0x88, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xb08: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xb10: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xb18: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
-/* 0xb20: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
-/* 0xb28: */  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb30: */  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb40: */  0x80, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00,
-/* 0xb48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb80: */  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xba0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xba8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbe0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbe8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbf8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc00: */  0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7e, 0x7e, 0x7c,
-/* 0xc08: */  0x7e, 0x7c, 0x7c, 0x78, 0x7c, 0x78, 0x78, 0x78,
-/* 0xc10: */  0x7c, 0x78, 0x78, 0x78, 0x78, 0x70, 0x70, 0x70,
-/* 0xc18: */  0x78, 0x70, 0x70, 0x60, 0x70, 0x60, 0x60, 0x60,
-/* 0xc20: */  0x7b, 0x78, 0x70, 0x70, 0x70, 0x60, 0x60, 0x60,
-/* 0xc28: */  0x70, 0x60, 0x60, 0x60, 0x60, 0x40, 0x40, 0x40,
-/* 0xc30: */  0x60, 0x60, 0x60, 0x40, 0x40, 0x40, 0x40, 0x40,
-/* 0xc38: */  0x40, 0x40, 0x40, 0x00, 0x40, 0x00, 0x00, 0x00,
-/* 0xc40: */  0x77, 0x70, 0x60, 0x60, 0x60, 0x60, 0x40, 0x40,
-/* 0xc48: */  0x60, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00,
-/* 0xc50: */  0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc60: */  0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc80: */  0x6f, 0x64, 0x60, 0x40, 0x40, 0x00, 0x00, 0x00,
-/* 0xc88: */  0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xca0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xca8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xce0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xce8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcf8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd00: */  0x5f, 0x5e, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xda0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xda8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xde0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xde8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdf8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe00: */  0x3f, 0x3f, 0x3e, 0x00, 0x1c, 0x00, 0x00, 0x00,
-/* 0xe08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xea0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xea8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xeb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xeb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xec0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xec8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xed0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xed8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xee0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xee8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xef0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xef8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf00: */  0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xf98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfa0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfa8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfe0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xfe8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xff0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xff8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
diff --git a/src/sound/resid-fp/wave8580_P_T.dat b/src/sound/resid-fp/wave8580_P_T.dat
deleted file mode 100644
index 5423dd9ac..000000000
Binary files a/src/sound/resid-fp/wave8580_P_T.dat and /dev/null differ
diff --git a/src/sound/resid-fp/wave8580__ST.cc b/src/sound/resid-fp/wave8580__ST.cc
deleted file mode 100644
index cfe583786..000000000
--- a/src/sound/resid-fp/wave8580__ST.cc
+++ /dev/null
@@ -1,536 +0,0 @@
-//  ---------------------------------------------------------------------------
-//  This file is part of reSID, a MOS6581 SID emulator engine.
-//  Copyright (C) 2004  Dag Lem <resid@nimrod.no>
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//  ---------------------------------------------------------------------------
-
-#include "wave.h"
-
-reg8 WaveformGeneratorFP::wave8580__ST[] =
-{
-/* 0x000: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x008: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x010: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x018: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x020: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x028: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x030: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x038: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x040: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x048: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x050: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x058: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x060: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x068: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x070: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x078: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x080: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x088: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x090: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x098: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x0f8: */  0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07,
-/* 0x100: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x108: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x110: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x118: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x120: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x128: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x130: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x138: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x140: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x148: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x150: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x158: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x160: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x168: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x170: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x178: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x180: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x188: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x190: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x198: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x1f8: */  0x0e, 0x0e, 0x0e, 0x0e, 0x0f, 0x0f, 0x0f, 0x0f,
-/* 0x200: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x208: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x210: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x218: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x220: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x228: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x230: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x238: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x240: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x248: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x250: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x258: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x260: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x268: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x270: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x278: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x280: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x288: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x290: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x298: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x2f8: */  0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07,
-/* 0x300: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x308: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x310: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x318: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x320: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x328: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x330: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x338: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x340: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x348: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x350: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x358: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x360: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x368: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x370: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x378: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x380: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x388: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x390: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x398: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x3c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x3f0: */  0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c,
-/* 0x3f8: */  0x1e, 0x1e, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f,
-/* 0x400: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x408: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x410: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x418: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x420: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x428: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x430: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x438: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x440: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x448: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x450: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x458: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x460: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x468: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x470: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x478: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x480: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x488: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x490: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x498: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x4f8: */  0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07,
-/* 0x500: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x508: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x510: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x518: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x520: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x528: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x530: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x538: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x540: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x548: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x550: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x558: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x560: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x568: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x570: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x578: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x580: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x588: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x590: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x598: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x5f8: */  0x0e, 0x0e, 0x0e, 0x0e, 0x0f, 0x0f, 0x0f, 0x1f,
-/* 0x600: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x608: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x610: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x618: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x620: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x628: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x630: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x638: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x640: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x648: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x650: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x658: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x660: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x668: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x670: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x678: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x680: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x688: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x690: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x698: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x6f8: */  0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07,
-/* 0x700: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x708: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x710: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x718: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x720: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x728: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x730: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x738: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x740: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x748: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x750: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x758: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x760: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x768: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x770: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x778: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x780: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x788: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x790: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x798: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0x7c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x7e0: */  0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
-/* 0x7e8: */  0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
-/* 0x7f0: */  0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3e,
-/* 0x7f8: */  0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
-/* 0x800: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x808: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x810: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x818: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x820: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x828: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x830: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x838: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x840: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x848: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x850: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x858: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x860: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x868: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x870: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x878: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x880: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x888: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x890: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x898: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x8f8: */  0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07,
-/* 0x900: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x908: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x910: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x918: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x920: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x928: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x930: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x938: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x940: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x948: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x950: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x958: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x960: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x968: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x970: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x978: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0x980: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x988: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x990: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x998: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9a0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9a8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9b0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9b8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9c0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9c8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9d0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9d8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9e0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9e8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9f0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0x9f8: */  0x0e, 0x0e, 0x0e, 0x0e, 0x0f, 0x0f, 0x0f, 0x0f,
-/* 0xa00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0xa80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xa98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaa0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaa8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xab0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xab8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xac0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xac8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xad0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xad8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xae0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xae8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xaf8: */  0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07,
-/* 0xb00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0xb80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xb98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xba0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xba8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0xbc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbe0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbe8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xbf0: */  0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c,
-/* 0xbf8: */  0x1e, 0x1e, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f,
-/* 0xc00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0xc80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xc98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xca0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xca8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xce0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xce8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xcf8: */  0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07,
-/* 0xd00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd78: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03,
-/* 0xd80: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd88: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd90: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xd98: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xda0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xda8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdb0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdb8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-/* 0xdc0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdc8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdd0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdd8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xde0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xde8: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdf0: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xdf8: */  0x0e, 0x0e, 0x0e, 0x0e, 0x0f, 0x0f, 0x1f, 0x1f,
-/* 0xe00: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe08: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe10: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe18: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe20: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe28: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe30: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe38: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe40: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe48: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe50: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe58: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe60: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe68: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe70: */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/* 0xe78: */  0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x83, 0x83,
-/* 0xe80: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xe88: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xe90: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xe98: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xea0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xea8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xeb0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xeb8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xec0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xec8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xed0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xed8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xee0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xee8: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xef0: */  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-/* 0xef8: */  0x80, 0x80, 0x80, 0x80, 0x87, 0x87, 0x87, 0x8f,
-/* 0xf00: */  0xc0, 0xe0, 0xe0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0,
-/* 0xf08: */  0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xf10: */  0xc0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xf18: */  0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-/* 0xf20: */  0xc0, 0xe0, 0xe0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0,
-/* 0xf28: */  0xe0, 0xe0, 0xe0, 0xc0, 0xe0, 0xc0, 0xe0, 0xe0,
-/* 0xf30: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xf38: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xf40: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xf48: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xf50: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xf58: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xf60: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xf68: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xf70: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-/* 0xf78: */  0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe3, 0xe3,
-/* 0xf80: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0xf88: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0xf90: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0xf98: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0xfa0: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0xfa8: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0xfb0: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-/* 0xfb8: */  0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf1,
-/* 0xfc0: */  0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8,
-/* 0xfc8: */  0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8,
-/* 0xfd0: */  0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8,
-/* 0xfd8: */  0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8,
-/* 0xfe0: */  0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc,
-/* 0xfe8: */  0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc,
-/* 0xff0: */  0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
-/* 0xff8: */  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-};
diff --git a/src/sound/resid-fp/wave8580__ST.dat b/src/sound/resid-fp/wave8580__ST.dat
deleted file mode 100644
index f30002ceb..000000000
Binary files a/src/sound/resid-fp/wave8580__ST.dat and /dev/null differ
diff --git a/src/sound/snd_ac97_codec.c b/src/sound/snd_ac97_codec.c
index d302db6ae..1b28a8aab 100644
--- a/src/sound/snd_ac97_codec.c
+++ b/src/sound/snd_ac97_codec.c
@@ -43,73 +43,75 @@ static const struct {
 } ac97_codecs[] = {
   // clang-format off
     {
-    .device = &ad1881_device,
-    .min_rate = 7000,
-    .max_rate = 48000,
-    .misc_flags = AC97_MASTER_6B | AC97_MONOOUT | AC97_PCBEEP | AC97_PHONE | AC97_VIDEO | AC97_AUXIN | AC97_POP | AC97_MS | AC97_LPBK,
-    .reset_flags = (1 << AC97_3D_SHIFT), /* datasheet contradicts itself on AC97_HPOUT */
-    .extid_flags = AC97_VRA,
-    .pcsr_mask = 0xbf,
-    .vendor_regs = (const ac97_vendor_reg_t[]) {{0, 0x74, 0x0000, 0xff07}, {0, 0x76, 0x0404, 0xdde5}, {0, 0x78, 48000, 0x0000}, {0, 0x7a, 48000, 0x0000}, {0}}
+        .device      = &ad1881_device,
+        .min_rate    = 7000,
+        .max_rate    = 48000,
+        .misc_flags  = AC97_MASTER_6B | AC97_MONOOUT | AC97_PCBEEP | AC97_PHONE | AC97_VIDEO | AC97_AUXIN | AC97_POP | AC97_MS | AC97_LPBK,
+        .reset_flags = (1 << AC97_3D_SHIFT), /* datasheet contradicts itself on AC97_HPOUT */
+        .extid_flags = AC97_VRA,
+        .pcsr_mask   = 0xbf,
+        .vendor_regs = (const ac97_vendor_reg_t[]) {{0, 0x74, 0x0000, 0xff07}, {0, 0x76, 0x0404, 0xdde5}, {0, 0x78, 48000, 0x0000}, {0, 0x7a, 48000, 0x0000}, {0}}
     },
     {
-    .device = &ak4540_device,
-    .misc_flags = AC97_MONOOUT | AC97_PCBEEP | AC97_PHONE | AC97_VIDEO | AC97_AUXIN | AC97_MS | AC97_LPBK,
-    .pcsr_mask = 0x1f
+        .device      = &ak4540_device,
+        .misc_flags  = AC97_MONOOUT | AC97_PCBEEP | AC97_PHONE | AC97_VIDEO | AC97_AUXIN | AC97_MS | AC97_LPBK,
+        .pcsr_mask   = 0x1f
     },
     {
-    .device = &alc100_device,
-    .misc_flags = AC97_AUXOUT | AC97_MONOOUT | AC97_PCBEEP | AC97_PHONE | AC97_VIDEO | AC97_AUXIN | AC97_POP | AC97_MS | AC97_LPBK,
-    .reset_flags = (22 << AC97_3D_SHIFT),
-    .extid_flags = AC97_AMAP,
-    .pcsr_mask = 0xbf
+        .device      = &alc100_device,
+        .misc_flags  = AC97_AUXOUT | AC97_MONOOUT | AC97_PCBEEP | AC97_PHONE | AC97_VIDEO | AC97_AUXIN | AC97_POP | AC97_MS | AC97_LPBK,
+        .reset_flags = (22 << AC97_3D_SHIFT),
+        .extid_flags = AC97_AMAP,
+        .pcsr_mask   = 0xbf
     },
     {
-    .device = &cs4297_device,
-    .misc_flags = AC97_MASTER_6B | AC97_AUXOUT | AC97_AUXOUT_6B | AC97_MONOOUT | AC97_MONOOUT_6B | AC97_PCBEEP | AC97_PHONE | AC97_VIDEO | AC97_AUXIN | AC97_MS | AC97_LPBK,
-    .reset_flags = AC97_HPOUT | AC97_DAC_18B | AC97_ADC_18B,
-    .extid_flags = 0,
-    .pcsr_mask = 0x7f,
-    .vendor_regs = (const ac97_vendor_reg_t[]) {{0, 0x5a, 0x0301, 0x0000}, {0}}
+        .device      = &cs4297_device,
+        .misc_flags  = AC97_MASTER_6B | AC97_AUXOUT | AC97_AUXOUT_6B | AC97_MONOOUT | AC97_MONOOUT_6B | AC97_PCBEEP | AC97_PHONE | AC97_VIDEO | AC97_AUXIN | AC97_MS | AC97_LPBK,
+        .reset_flags = AC97_HPOUT | AC97_DAC_18B | AC97_ADC_18B,
+        .pcsr_mask   = 0x7f,
+        .vendor_regs = (const ac97_vendor_reg_t[]) {{0, 0x5a, 0x0301, 0x0000}, {0}}
     },
     {
-    .device = &cs4297a_device,
-    .misc_flags = AC97_MASTER_6B | AC97_AUXOUT | AC97_MONOOUT | AC97_PCBEEP | AC97_PHONE | AC97_VIDEO | AC97_AUXIN | AC97_MS | AC97_LPBK,
-    .reset_flags = AC97_HPOUT | AC97_DAC_20B | AC97_ADC_18B | (6 << AC97_3D_SHIFT),
-    .extid_flags = AC97_AMAP,
-    .pcsr_mask = 0xff,
-    .vendor_regs = (const ac97_vendor_reg_t[]) {{0, 0x5e, 0x0000, 0x01b0}, {0, 0x60, 0x0023, 0x0001}, {0, 0x68, 0x0000, 0xdfff}, {0}}
+        .device      = &cs4297a_device,
+        .misc_flags  = AC97_MASTER_6B | AC97_AUXOUT | AC97_MONOOUT | AC97_PCBEEP | AC97_PHONE | AC97_VIDEO | AC97_AUXIN | AC97_MS | AC97_LPBK,
+        .reset_flags = AC97_HPOUT | AC97_DAC_20B | AC97_ADC_18B | (6 << AC97_3D_SHIFT),
+        .extid_flags = AC97_AMAP,
+        .pcsr_mask   = 0xff,
+        .vendor_regs = (const ac97_vendor_reg_t[]) {{0, 0x5e, 0x0000, 0x01b0}, {0, 0x60, 0x0023, 0x0001}, {0, 0x68, 0x0000, 0xdfff}, {0}}
     },
     {
-    .device = &stac9708_device,
-    .misc_flags = AC97_AUXOUT | AC97_MONOOUT | AC97_PCBEEP | AC97_PHONE | AC97_VIDEO | AC97_AUXIN | AC97_MS | AC97_LPBK,
-    .reset_flags = (26 << AC97_3D_SHIFT) | AC97_DAC_18B | AC97_ADC_18B,
-    .extid_flags = AC97_SDAC,
-    .pcsr_mask = 0xff,
-    .eascr_mask = 0x02,
-    .vendor_regs = (const ac97_vendor_reg_t[]) {{0, 0x6c, 0x0000, 0x0003}, {0, 0x74, 0x0000, 0x0003}, {0}}
+        .device      = &stac9708_device,
+        .misc_flags  = AC97_AUXOUT | AC97_MONOOUT | AC97_PCBEEP | AC97_PHONE | AC97_VIDEO | AC97_AUXIN | AC97_MS | AC97_LPBK,
+        .reset_flags = (26 << AC97_3D_SHIFT) | AC97_DAC_18B | AC97_ADC_18B,
+        .extid_flags = AC97_SDAC,
+        .pcsr_mask   = 0xff,
+        .eascr_mask  = 0x02,
+        .vendor_regs = (const ac97_vendor_reg_t[]) {{0, 0x6c, 0x0000, 0x0003}, {0, 0x74, 0x0000, 0x0003}, {0}}
     },
     {
-    .device = &stac9721_device,
-    .misc_flags = AC97_AUXOUT | AC97_MONOOUT | AC97_PCBEEP | AC97_PHONE | AC97_VIDEO | AC97_AUXIN | AC97_MS | AC97_LPBK,
-    .reset_flags = (26 << AC97_3D_SHIFT) | AC97_DAC_18B | AC97_ADC_18B,
-    .extid_flags = AC97_AMAP,
-    .pcsr_mask = 0xff,
-    .vendor_regs = (const ac97_vendor_reg_t[]) {{0, 0x6c, 0x0000, 0x0000}, {0, 0x6e, 0x0000, 0x0003}, {0, 0x70, 0x0000, 0xffff}, {0, 0x72, 0x0000, 0x0006}, {0, 0x74, 0x0000, 0x0003}, {0, 0x76, 0x0000, 0xffff}, {0, 0x78, 0x0000, 0x3802}, {0}}
+        .device      = &stac9721_device,
+        .misc_flags  = AC97_AUXOUT | AC97_MONOOUT | AC97_PCBEEP | AC97_PHONE | AC97_VIDEO | AC97_AUXIN | AC97_MS | AC97_LPBK,
+        .reset_flags = (26 << AC97_3D_SHIFT) | AC97_DAC_18B | AC97_ADC_18B,
+        .extid_flags = AC97_AMAP,
+        .pcsr_mask   = 0xff,
+        .vendor_regs = (const ac97_vendor_reg_t[]) {{0, 0x6c, 0x0000, 0x0000}, {0, 0x6e, 0x0000, 0x0003}, {0, 0x70, 0x0000, 0xffff}, {0, 0x72, 0x0000, 0x0006}, {0, 0x74, 0x0000, 0x0003}, {0, 0x76, 0x0000, 0xffff}, {0, 0x78, 0x0000, 0x3802}, {0}}
     },
     {
-    .device = &tr28023_device,
-    .misc_flags = AC97_MASTER_6B | AC97_MONOOUT | AC97_MONOOUT_6B | AC97_PCBEEP | AC97_PHONE | AC97_POP | AC97_MS | AC97_LPBK,
-    .reset_flags = 0,
-    .extid_flags = 0,
-    .pcsr_mask = 0x3f
+        .device      = &tr28023_device,
+        .misc_flags  = AC97_MASTER_6B | AC97_MONOOUT | AC97_MONOOUT_6B | AC97_PCBEEP | AC97_PHONE | AC97_POP | AC97_MS | AC97_LPBK,
+        .pcsr_mask   = 0x3f
     },
     {
-    .device = &wm9701a_device,
-    .misc_flags = AC97_AUXOUT | AC97_MONOOUT | AC97_PCBEEP | AC97_PHONE | AC97_VIDEO | AC97_AUXIN | AC97_MS | AC97_LPBK,
-    .reset_flags = AC97_DAC_18B | AC97_ADC_18B,
-    .extid_flags = 0,
-    .pcsr_mask = 0x3f
+        .device      = &w83971d_device,
+        .misc_flags  = AC97_MASTER_6B | AC97_MONOOUT | AC97_MONOOUT_6B | AC97_PCBEEP | AC97_PHONE | AC97_VIDEO | AC97_AUXIN | AC97_MS | AC97_LPBK,
+        .reset_flags = (27 << AC97_3D_SHIFT),
+        .pcsr_mask   = 0x3f
+    },
+    {
+        .device      = &wm9701a_device,
+        .misc_flags  = AC97_AUXOUT | AC97_MONOOUT | AC97_PCBEEP | AC97_PHONE | AC97_VIDEO | AC97_AUXIN | AC97_MS | AC97_LPBK,
+        .reset_flags = AC97_DAC_18B | AC97_ADC_18B,
+        .pcsr_mask   = 0x3f
     }
   // clang-format on
 };
@@ -284,8 +286,9 @@ line_gain:
 
         case 0x22:      /* 3D Control */
             switch (ac97_codecs[dev->model].reset_flags >> AC97_3D_SHIFT) {
-                case 1: /* Analog Devices */
-                case 6: /* Crystal */
+                case 1:  /* Analog Devices */
+                case 6:  /* Crystal */
+                case 27: /* Winbond */
                     val &= 0x000f;
                     break;
 
@@ -316,7 +319,7 @@ line_gain:
             val = (val & i) | (prev & ~i);
 
             /* Update status bits to reflect powerdowns. */
-            val = (val & ~0x000f) | (~(val >> 8) & 0x000f);
+            val = (val & ~0x300f) | (~(val >> 8) & 0x000f); /* also clear write-only PR4 and PR5 */
             if (val & 0x0800) /* PR3 clears both ANL and REF */
                 val &= ~0x0004;
             break;
@@ -527,7 +530,7 @@ ac97_codec_getattn(void *priv, uint8_t reg, int *l, int *r)
     /* Apply full mute and powerdowns. */
     int full_mute = (reg < 0x36);
     if ((full_mute && (val & AC97_MUTE)) ||                     /* full mute */
-        (dev->regs[0x26 >> 1] & 0x3e00) ||                      /* DAC powerdown */
+        (dev->regs[0x26 >> 1] & 0x0e00) ||                      /* DAC powerdown */
         ((reg == 0x38) && (dev->regs[0x2a >> 1] & AC97_PRJ))) { /* surround DAC powerdown */
         *l = 0;
         *r = 0;
@@ -577,8 +580,7 @@ ac97_codec_getrate(void *priv, uint8_t reg)
 static void *
 ac97_codec_init(const device_t *info)
 {
-    ac97_codec_t *dev = malloc(sizeof(ac97_codec_t));
-    memset(dev, 0, sizeof(ac97_codec_t));
+    ac97_codec_t *dev = calloc(1, sizeof(ac97_codec_t));
 
     for (; dev->model < (sizeof(ac97_codecs) / sizeof(ac97_codecs[0])); dev->model++) {
         if (ac97_codecs[dev->model].device->local == info->local)
@@ -661,7 +663,7 @@ const device_t ad1881_device = {
     .init          = ac97_codec_init,
     .close         = ac97_codec_close,
     .reset         = ac97_codec_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -675,7 +677,7 @@ const device_t ak4540_device = {
     .init          = ac97_codec_init,
     .close         = ac97_codec_close,
     .reset         = ac97_codec_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -689,7 +691,7 @@ const device_t alc100_device = {
     .init          = ac97_codec_init,
     .close         = ac97_codec_close,
     .reset         = ac97_codec_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -703,7 +705,7 @@ const device_t cs4297_device = {
     .init          = ac97_codec_init,
     .close         = ac97_codec_close,
     .reset         = ac97_codec_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -717,7 +719,7 @@ const device_t cs4297a_device = {
     .init          = ac97_codec_init,
     .close         = ac97_codec_close,
     .reset         = ac97_codec_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -731,7 +733,7 @@ const device_t stac9708_device = {
     .init          = ac97_codec_init,
     .close         = ac97_codec_close,
     .reset         = ac97_codec_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -745,7 +747,7 @@ const device_t stac9721_device = {
     .init          = ac97_codec_init,
     .close         = ac97_codec_close,
     .reset         = ac97_codec_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -759,7 +761,21 @@ const device_t tr28023_device = {
     .init          = ac97_codec_init,
     .close         = ac97_codec_close,
     .reset         = ac97_codec_reset,
-    { .available = NULL },
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t w83971d_device = {
+    .name          = "Winbond W83971D",
+    .internal_name = "w83971d",
+    .flags         = DEVICE_AC97,
+    .local         = AC97_CODEC_W83971D,
+    .init          = ac97_codec_init,
+    .close         = ac97_codec_close,
+    .reset         = ac97_codec_reset,
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -773,7 +789,7 @@ const device_t wm9701a_device = {
     .init          = ac97_codec_init,
     .close         = ac97_codec_close,
     .reset         = ac97_codec_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sound/snd_ac97_via.c b/src/sound/snd_ac97_via.c
index ceac42387..2d994b08f 100644
--- a/src/sound/snd_ac97_via.c
+++ b/src/sound/snd_ac97_via.c
@@ -24,6 +24,7 @@
 #include <86box/86box.h>
 #include <86box/device.h>
 #include <86box/io.h>
+#include <86box/dma.h>
 #include <86box/mem.h>
 #include <86box/pci.h>
 #include <86box/pic.h>
@@ -31,10 +32,13 @@
 #include <86box/sound.h>
 #include <86box/timer.h>
 #include <86box/plat_unused.h>
+#include "cpu.h"
 
 typedef struct ac97_via_sgd_t {
     uint8_t            id;
     uint8_t            always_run;
+    uint8_t            modem;
+    uint8_t            pad;
     struct _ac97_via_ *dev;
 
     uint32_t entry_ptr;
@@ -63,7 +67,7 @@ typedef struct _ac97_via_ {
     uint16_t audio_codec_base;
     uint16_t modem_sgd_base;
     uint16_t modem_codec_base;
-    uint8_t  sgd_regs[256];
+    uint8_t  sgd_regs[2][256];
     uint8_t  pcm_enabled : 1;
     uint8_t  fm_enabled : 1;
     uint8_t  vsr_enabled : 1;
@@ -78,7 +82,7 @@ typedef struct _ac97_via_ {
     int irq_pin;
 
     ac97_codec_t  *codec[2][2];
-    ac97_via_sgd_t sgd[6];
+    ac97_via_sgd_t sgd[2][6];
 
     int master_vol_l;
     int master_vol_r;
@@ -105,7 +109,7 @@ ac97_via_log(const char *fmt, ...)
 #endif
 
 static void ac97_via_sgd_process(void *priv);
-static void ac97_via_update_codec(ac97_via_t *dev);
+static void ac97_via_update_codec(ac97_via_t *dev, int modem);
 static void ac97_via_speed_changed(void *priv);
 static void ac97_via_filter_cd_audio(int channel, double *buffer, void *priv);
 
@@ -160,29 +164,29 @@ ac97_via_write_control(void *priv, uint8_t modem, uint8_t val)
         /* Start or stop PCM playback. */
         i = (val & 0xf4) == 0xc4;
         if (i && !dev->pcm_enabled)
-            timer_advance_u64(&dev->sgd[0].poll_timer, dev->sgd[0].timer_latch);
+            timer_advance_u64(&dev->sgd[0][0].poll_timer, dev->sgd[0][0].timer_latch);
         dev->pcm_enabled = i;
 
         /* Start or stop FM playback. */
         i = (val & 0xf2) == 0xc2;
         if (i && !dev->fm_enabled)
-            timer_advance_u64(&dev->sgd[2].poll_timer, dev->sgd[2].timer_latch);
+            timer_advance_u64(&dev->sgd[0][2].poll_timer, dev->sgd[0][2].timer_latch);
         dev->fm_enabled = i;
 
         /* Update primary audio codec state. */
         if (dev->codec[0][0])
-            ac97_via_update_codec(dev);
+            ac97_via_update_codec(dev, 0);
     }
 }
 
 static void
-ac97_via_update_irqs(ac97_via_t *dev)
+ac97_via_update_irqs(ac97_via_t *dev, int modem)
 {
     /* Check interrupt flags in all SGDs. */
     for (uint8_t i = 0x00; i < ((sizeof(dev->sgd) / sizeof(dev->sgd[0])) << 4); i += 0x10) {
         /* Stop immediately if any flag is set. Doing it this way optimizes
            rising edges for the playback SGD (0 - first to be checked). */
-        if (dev->sgd_regs[i] & (dev->sgd_regs[i | 0x2] & 0x03)) {
+        if (dev->sgd_regs[modem][i] & (dev->sgd_regs[modem][i | 0x2] & 0x03)) {
             pci_set_irq(dev->pci_slot, dev->irq_pin, &dev->irq_state);
             return;
         }
@@ -192,15 +196,15 @@ ac97_via_update_irqs(ac97_via_t *dev)
 }
 
 static void
-ac97_via_update_codec(ac97_via_t *dev)
+ac97_via_update_codec(ac97_via_t *dev, int modem)
 {
     /* Get primary audio codec. */
-    ac97_codec_t *codec = dev->codec[0][0];
+    ac97_codec_t *codec = dev->codec[modem][0];
 
     /* Update volumes according to codec registers. */
     ac97_codec_getattn(codec, 0x02, &dev->master_vol_l, &dev->master_vol_r);
-    ac97_codec_getattn(codec, 0x18, &dev->sgd[0].vol_l, &dev->sgd[0].vol_r);
-    ac97_codec_getattn(codec, 0x18, &dev->sgd[2].vol_l, &dev->sgd[2].vol_r); /* VIAFMTSR sets Master, CD and PCM volumes to 0 dB */
+    ac97_codec_getattn(codec, 0x18, &dev->sgd[modem][0].vol_l, &dev->sgd[modem][0].vol_r);
+    ac97_codec_getattn(codec, 0x18, &dev->sgd[modem][2].vol_l, &dev->sgd[modem][2].vol_r); /* VIAFMTSR sets Master, CD and PCM volumes to 0 dB */
     ac97_codec_getattn(codec, 0x12, &dev->cd_vol_l, &dev->cd_vol_r);
 
     /* Update sample rate according to codec registers and the variable sample rate flag. */
@@ -211,9 +215,9 @@ uint8_t
 ac97_via_sgd_read(uint16_t addr, void *priv)
 {
     const ac97_via_t *dev = (ac97_via_t *) priv;
-#ifdef ENABLE_AC97_VIA_LOG
+// #ifdef ENABLE_AC97_VIA_LOG
     uint8_t modem = (addr & 0xff00) == dev->modem_sgd_base;
-#endif
+// #endif
     addr &= 0xff;
     uint8_t ret;
 
@@ -221,83 +225,83 @@ ac97_via_sgd_read(uint16_t addr, void *priv)
         /* Process SGD channel registers. */
         switch (addr & 0xf) {
             case 0x4:
-                ret = dev->sgd[addr >> 4].entry_ptr;
+                ret = dev->sgd[modem][addr >> 4].entry_ptr;
                 break;
 
             case 0x5:
-                ret = dev->sgd[addr >> 4].entry_ptr >> 8;
+                ret = dev->sgd[modem][addr >> 4].entry_ptr >> 8;
                 break;
 
             case 0x6:
-                ret = dev->sgd[addr >> 4].entry_ptr >> 16;
+                ret = dev->sgd[modem][addr >> 4].entry_ptr >> 16;
                 break;
 
             case 0x7:
-                ret = dev->sgd[addr >> 4].entry_ptr >> 24;
+                ret = dev->sgd[modem][addr >> 4].entry_ptr >> 24;
                 break;
 
             case 0xc:
-                ret = dev->sgd[addr >> 4].sample_count;
+                ret = dev->sgd[modem][addr >> 4].sample_count;
                 break;
 
             case 0xd:
-                ret = dev->sgd[addr >> 4].sample_count >> 8;
+                ret = dev->sgd[modem][addr >> 4].sample_count >> 8;
                 break;
 
             case 0xe:
-                ret = dev->sgd[addr >> 4].sample_count >> 16;
+                ret = dev->sgd[modem][addr >> 4].sample_count >> 16;
                 break;
 
             default:
-                ret = dev->sgd_regs[addr];
+                ret = dev->sgd_regs[modem][addr];
                 break;
         }
     } else {
         /* Process regular registers. */
         switch (addr) {
             case 0x84:
-                ret = (dev->sgd_regs[0x00] & 0x01);
-                ret |= (dev->sgd_regs[0x10] & 0x01) << 1;
-                ret |= (dev->sgd_regs[0x20] & 0x01) << 2;
+                ret = (dev->sgd_regs[modem][0x00] & 0x01);
+                ret |= (dev->sgd_regs[modem][0x10] & 0x01) << 1;
+                ret |= (dev->sgd_regs[modem][0x20] & 0x01) << 2;
 
-                ret |= (dev->sgd_regs[0x00] & 0x02) << 3;
-                ret |= (dev->sgd_regs[0x10] & 0x02) << 4;
-                ret |= (dev->sgd_regs[0x20] & 0x02) << 5;
+                ret |= (dev->sgd_regs[modem][0x00] & 0x02) << 3;
+                ret |= (dev->sgd_regs[modem][0x10] & 0x02) << 4;
+                ret |= (dev->sgd_regs[modem][0x20] & 0x02) << 5;
                 break;
 
             case 0x85:
-                ret = (dev->sgd_regs[0x00] & 0x04) >> 2;
-                ret |= (dev->sgd_regs[0x10] & 0x04) >> 1;
-                ret |= (dev->sgd_regs[0x20] & 0x04);
+                ret = (dev->sgd_regs[modem][0x00] & 0x04) >> 2;
+                ret |= (dev->sgd_regs[modem][0x10] & 0x04) >> 1;
+                ret |= (dev->sgd_regs[modem][0x20] & 0x04);
 
-                ret |= (dev->sgd_regs[0x00] & 0x80) >> 3;
-                ret |= (dev->sgd_regs[0x10] & 0x80) >> 2;
-                ret |= (dev->sgd_regs[0x20] & 0x80) >> 1;
+                ret |= (dev->sgd_regs[modem][0x00] & 0x80) >> 3;
+                ret |= (dev->sgd_regs[modem][0x10] & 0x80) >> 2;
+                ret |= (dev->sgd_regs[modem][0x20] & 0x80) >> 1;
                 break;
 
             case 0x86:
-                ret = (dev->sgd_regs[0x40] & 0x01);
-                ret |= (dev->sgd_regs[0x50] & 0x01) << 1;
+                ret = (dev->sgd_regs[modem][0x40] & 0x01);
+                ret |= (dev->sgd_regs[modem][0x50] & 0x01) << 1;
 
-                ret |= (dev->sgd_regs[0x40] & 0x02) << 3;
-                ret |= (dev->sgd_regs[0x50] & 0x02) << 4;
+                ret |= (dev->sgd_regs[modem][0x40] & 0x02) << 3;
+                ret |= (dev->sgd_regs[modem][0x50] & 0x02) << 4;
                 break;
 
             case 0x87:
-                ret = (dev->sgd_regs[0x40] & 0x04) >> 2;
-                ret |= (dev->sgd_regs[0x50] & 0x04) >> 1;
+                ret = (dev->sgd_regs[modem][0x40] & 0x04) >> 2;
+                ret |= (dev->sgd_regs[modem][0x50] & 0x04) >> 1;
 
-                ret |= (dev->sgd_regs[0x40] & 0x80) >> 3;
-                ret |= (dev->sgd_regs[0x50] & 0x80) >> 2;
+                ret |= (dev->sgd_regs[modem][0x40] & 0x80) >> 3;
+                ret |= (dev->sgd_regs[modem][0x50] & 0x80) >> 2;
                 break;
 
             default:
-                ret = dev->sgd_regs[addr];
+                ret = dev->sgd_regs[modem][addr];
                 break;
         }
     }
 
-    ac97_via_log("AC97 VIA %d: sgd_read(%02X) = %02X\n", modem, addr, ret);
+    ac97_via_log("[%04X:%08X] [%i] AC97 VIA %d: sgd_read(%02X) = %02X\n", CS, cpu_state.pc, msw & 1, modem, addr, ret);
 
     return ret;
 }
@@ -311,7 +315,9 @@ ac97_via_sgd_write(uint16_t addr, uint8_t val, void *priv)
     ac97_codec_t *codec;
     addr &= 0xff;
 
-    ac97_via_log("AC97 VIA %d: sgd_write(%02X, %02X)\n", modem, addr, val);
+    ac97_via_log("[%04X:%08X] [%i] AC97 VIA %d: sgd_write(%02X, %02X)\n", CS, cpu_state.pc, msw & 1, modem, addr, val);
+
+    // if ((CS == 0x10000) && (cpu_state.pc == 0x000073d1))
 
     /* Check function-specific read only registers. */
     if ((addr >= (modem ? 0x00 : 0x40)) && (addr < (modem ? 0x40 : 0x60)))
@@ -324,42 +330,42 @@ ac97_via_sgd_write(uint16_t addr, uint8_t val, void *priv)
         switch (addr & 0xf) {
             case 0x0:
                 /* Clear RWC status bits. */
-                dev->sgd_regs[addr] &= ~(val & 0x07);
+                dev->sgd_regs[modem][addr] &= ~(val & 0x07);
 
                 /* Update status interrupts. */
-                ac97_via_update_irqs(dev);
+                ac97_via_update_irqs(dev, modem);
 
                 return;
 
             case 0x1:
                 /* Start SGD if requested. */
                 if (val & 0x80) {
-                    if (dev->sgd_regs[addr & 0xf0] & 0x80) {
+                    if (dev->sgd_regs[modem][addr & 0xf0] & 0x80) {
                         /* Queue SGD trigger if already running. */
-                        dev->sgd_regs[addr & 0xf0] |= 0x08;
+                        dev->sgd_regs[modem][addr & 0xf0] |= 0x08;
                     } else {
                         /* Start SGD immediately. */
-                        dev->sgd_regs[addr & 0xf0] = (dev->sgd_regs[addr & 0xf0] & ~0x47) | 0x80;
+                        dev->sgd_regs[modem][addr & 0xf0] = (dev->sgd_regs[modem][addr & 0xf0] & ~0x47) | 0x80;
 
                         /* Start at the specified entry pointer. */
-                        dev->sgd[addr >> 4].entry_ptr  = *((uint32_t *) &dev->sgd_regs[(addr & 0xf0) | 0x4]) & 0xfffffffe;
-                        dev->sgd[addr >> 4].restart    = 2;
+                        dev->sgd[modem][addr >> 4].entry_ptr  = *((uint32_t *) &dev->sgd_regs[modem][(addr & 0xf0) | 0x4]) & 0xfffffffe;
+                        dev->sgd[modem][addr >> 4].restart    = 2;
 
                         /* Start the actual SGD process. */
-                        ac97_via_sgd_process(&dev->sgd[addr >> 4]);
+                        ac97_via_sgd_process(&dev->sgd[modem][addr >> 4]);
                     }
                 }
                 /* Stop SGD if requested. */
                 if (val & 0x40)
-                    dev->sgd_regs[addr & 0xf0] &= ~0x88;
+                    dev->sgd_regs[modem][addr & 0xf0] &= ~0x88;
 
                 val &= 0x08;
 
                 /* (Un)pause SGD if requested. */
                 if (val & 0x08)
-                    dev->sgd_regs[addr & 0xf0] |= 0x40;
+                    dev->sgd_regs[modem][addr & 0xf0] |= 0x40;
                 else
-                    dev->sgd_regs[addr & 0xf0] &= ~0x40;
+                    dev->sgd_regs[modem][addr & 0xf0] &= ~0x40;
 
                 break;
 
@@ -387,7 +393,7 @@ ac97_via_sgd_write(uint16_t addr, uint8_t val, void *priv)
 
             case 0x82:
                 /* Determine the selected codec. */
-                i     = !!(dev->sgd_regs[0x83] & 0x40);
+                i     = !!(dev->sgd_regs[modem][0x83] & 0x40);
                 codec = dev->codec[modem][i];
 
                 /* Keep value in register if this codec is not present. */
@@ -395,20 +401,20 @@ ac97_via_sgd_write(uint16_t addr, uint8_t val, void *priv)
                     /* Read from or write to codec. */
                     if (val & 0x80) {
                         if (val & 1) { /* return 0x0000 on unaligned reads (real 686B behavior) */
-                            dev->sgd_regs[0x80] = dev->sgd_regs[0x81] = 0x00;
+                            dev->sgd_regs[modem][0x80] = dev->sgd_regs[modem][0x81] = 0x00;
                         } else {
-                            *((uint16_t *) &dev->codec_shadow[modem].regs_codec[i][val & 0x7f]) = *((uint16_t *) &dev->sgd_regs[0x80]) = ac97_codec_readw(codec, val);
+                            *((uint16_t *) &dev->codec_shadow[modem].regs_codec[i][val & 0x7f]) = *((uint16_t *) &dev->sgd_regs[modem][0x80]) = ac97_codec_readw(codec, val);
                         }
 
                         /* Flag data/status/index for this codec as valid. */
-                        dev->sgd_regs[0x83] |= 0x02 << (i << 1);
+                        dev->sgd_regs[modem][0x83] |= 0x02 << (i << 1);
                     } else if (!(val & 1)) { /* do nothing on unaligned writes */
                         ac97_codec_writew(codec, val,
-                                          *((uint16_t *) &dev->codec_shadow[modem].regs_codec[i][val & 0x7f]) = *((uint16_t *) &dev->sgd_regs[0x80]));
+                                          *((uint16_t *) &dev->codec_shadow[modem].regs_codec[i][val & 0x7f]) = *((uint16_t *) &dev->sgd_regs[modem][0x80]));
 
                         /* Update primary audio codec state if that codec was written to. */
                         if (!modem && !i) {
-                            ac97_via_update_codec(dev);
+                            ac97_via_update_codec(dev, 0);
 
                             /* Set up CD audio filter if CD volume was written to. Setting it
                                up at init prevents CD audio from working on other cards, but
@@ -424,9 +430,9 @@ ac97_via_sgd_write(uint16_t addr, uint8_t val, void *priv)
             case 0x83:
                 /* Clear RWC status bits. */
 #if 0 /* race condition with Linux accessing a register and clearing status bits on the same dword write */
-            val = (dev->sgd_regs[addr] & ~(val & 0x0a)) | (val & 0xc0);
+            val = ((dev->sgd_regs[modem][addr] & 0x3f) & ~(val & 0x0a)) | (val & 0xc0);
 #else
-                val = dev->sgd_regs[addr] | (val & 0xc0);
+                val = (dev->sgd_regs[modem][addr] & 0x3f) | (val & 0xc0);
 #endif
                 break;
 
@@ -435,7 +441,7 @@ ac97_via_sgd_write(uint16_t addr, uint8_t val, void *priv)
         }
     }
 
-    dev->sgd_regs[addr] = val;
+    dev->sgd_regs[modem][addr] = val;
 }
 
 void
@@ -479,6 +485,8 @@ ac97_via_codec_read(uint16_t addr, void *priv)
 
     ac97_via_log("AC97 VIA %d: codec_read(%02X) = %02X\n", modem, addr, ret);
 
+    ac97_via_log("[%04X:%08X] [%i] AC97 VIA %d: codec_read(%02X) = %02X\n", CS, cpu_state.pc, msw & 1, modem, addr, ret);
+
     return ret;
 }
 
@@ -489,6 +497,8 @@ ac97_via_codec_write(uint16_t addr, uint8_t val, void *priv)
     uint8_t     modem = (addr & 0xff00) == dev->modem_codec_base;
     addr &= 0xff;
 
+    ac97_via_log("[%04X:%08X] [%i] AC97 VIA %d: codec_write(%02X, %02X)\n", CS, cpu_state.pc, msw & 1, modem, addr, val);
+
     ac97_via_log("AC97 VIA %d: codec_write(%02X, %02X)\n", modem, addr, val);
 
     /* Unknown behavior, maybe it does write to the shadow registers? */
@@ -501,12 +511,12 @@ ac97_via_remap_audio_codec(void *priv, uint16_t new_io_base, uint8_t enable)
     ac97_via_t *dev = (ac97_via_t *) priv;
 
     if (dev->audio_codec_base)
-        io_removehandler(dev->audio_codec_base, 256, ac97_via_codec_read, NULL, NULL, ac97_via_codec_write, NULL, NULL, dev);
+        io_removehandler(dev->audio_codec_base, 4, ac97_via_codec_read, NULL, NULL, ac97_via_codec_write, NULL, NULL, dev);
 
     dev->audio_codec_base = new_io_base;
 
     if (dev->audio_codec_base && enable)
-        io_sethandler(dev->audio_codec_base, 256, ac97_via_codec_read, NULL, NULL, ac97_via_codec_write, NULL, NULL, dev);
+        io_sethandler(dev->audio_codec_base, 4, ac97_via_codec_read, NULL, NULL, ac97_via_codec_write, NULL, NULL, dev);
 }
 
 void
@@ -515,19 +525,24 @@ ac97_via_remap_modem_codec(void *priv, uint16_t new_io_base, uint8_t enable)
     ac97_via_t *dev = (ac97_via_t *) priv;
 
     if (dev->modem_codec_base)
-        io_removehandler(dev->modem_codec_base, 256, ac97_via_codec_read, NULL, NULL, ac97_via_codec_write, NULL, NULL, dev);
+        io_removehandler(dev->modem_codec_base, 4, ac97_via_codec_read, NULL, NULL, ac97_via_codec_write, NULL, NULL, dev);
 
     dev->modem_codec_base = new_io_base;
 
     if (dev->modem_codec_base && enable)
-        io_sethandler(dev->modem_codec_base, 256, ac97_via_codec_read, NULL, NULL, ac97_via_codec_write, NULL, NULL, dev);
+        io_sethandler(dev->modem_codec_base, 4, ac97_via_codec_read, NULL, NULL, ac97_via_codec_write, NULL, NULL, dev);
 }
 
 static void
 ac97_via_update_stereo(ac97_via_t *dev, ac97_via_sgd_t *sgd)
 {
+#ifdef OLD_CODE
     int32_t l = (((sgd->out_l * sgd->vol_l) >> 15) * dev->master_vol_l) >> 15;
     int32_t r = (((sgd->out_r * sgd->vol_r) >> 15) * dev->master_vol_r) >> 15;
+#else
+    int32_t l = (((sgd->out_l * sgd->vol_l) / 208925) * dev->master_vol_l) >> 15;
+    int32_t r = (((sgd->out_r * sgd->vol_r) / 208925) * dev->master_vol_r) >> 15;
+#endif
 
     if (l < -32768)
         l = -32768;
@@ -551,12 +566,12 @@ ac97_via_sgd_process(void *priv)
     ac97_via_t     *dev = sgd->dev;
 
     /* Stop if this SGD is not active. */
-    uint8_t sgd_status = dev->sgd_regs[sgd->id] & 0xc4;
+    uint8_t sgd_status = dev->sgd_regs[sgd->modem][sgd->id] & 0xc4;
     if (!(sgd_status & 0x80))
         return;
 
     /* Schedule next run. */
-    timer_on_auto(&sgd->dma_timer, 10.0);
+    timer_on_auto(&sgd->dma_timer, 1.0);
 
     /* Process SGD if it's active, and the FIFO has room or is disabled. */
     if (((sgd_status & 0xc7) == 0x80) && (sgd->always_run || ((sgd->fifo_end - sgd->fifo_pos) <= (sizeof(sgd->fifo) - 4)))) {
@@ -564,13 +579,15 @@ ac97_via_sgd_process(void *priv)
         if (sgd->restart) {
             /* (Re)load entry pointer if required. */
             if (sgd->restart & 2)
-                sgd->entry_ptr = *((uint32_t *) &dev->sgd_regs[sgd->id | 0x4]) & 0xfffffffe; /* TODO: probe real hardware - does "even addr" actually mean dword aligned? */
+                sgd->entry_ptr = *((uint32_t *) &dev->sgd_regs[sgd->modem][sgd->id | 0x4]) & 0xfffffffe; /* TODO: probe real hardware - does "even addr" actually mean dword aligned? */
             sgd->restart = 0;
 
             /* Read entry. */
-            sgd->sample_ptr = mem_readl_phys(sgd->entry_ptr);
+            // sgd->sample_ptr = mem_readl_phys(sgd->entry_ptr);
+            dma_bm_read(sgd->entry_ptr, (uint8_t *) &sgd->sample_ptr, 4, 4);
             sgd->entry_ptr += 4;
-            sgd->sample_count = mem_readl_phys(sgd->entry_ptr);
+            // sgd->sample_count = mem_readl_phys(sgd->entry_ptr);
+            dma_bm_read(sgd->entry_ptr, (uint8_t *) &sgd->sample_count, 4, 4);
             sgd->entry_ptr += 4;
 #ifdef ENABLE_AC97_VIA_LOG
             if (((sgd->sample_ptr == 0xffffffff) && (sgd->sample_count == 0xffffffff)) || ((sgd->sample_ptr == 0x00000000) && (sgd->sample_count == 0x00000000)))
@@ -588,10 +605,12 @@ ac97_via_sgd_process(void *priv)
 
         if (sgd->id & 0x10) {
             /* Write channel: read data from FIFO. */
-            mem_writel_phys(sgd->sample_ptr, *((uint32_t *) &sgd->fifo[sgd->fifo_end & (sizeof(sgd->fifo) - 1)]));
+            // mem_writel_phys(sgd->sample_ptr, *((uint32_t *) &sgd->fifo[sgd->fifo_end & (sizeof(sgd->fifo) - 1)]));
+            dma_bm_write(sgd->sample_ptr, &sgd->fifo[sgd->fifo_end & (sizeof(sgd->fifo) - 1)], 4, 4);
         } else {
             /* Read channel: write data to FIFO. */
-            *((uint32_t *) &sgd->fifo[sgd->fifo_end & (sizeof(sgd->fifo) - 1)]) = mem_readl_phys(sgd->sample_ptr);
+            // *((uint32_t *) &sgd->fifo[sgd->fifo_end & (sizeof(sgd->fifo) - 1)]) = mem_readl_phys(sgd->sample_ptr);
+            dma_bm_read(sgd->sample_ptr, &sgd->fifo[sgd->fifo_end & (sizeof(sgd->fifo) - 1)], 4, 4);
         }
         sgd->fifo_end += 4;
         sgd->sample_ptr += 4;
@@ -608,17 +627,17 @@ ac97_via_sgd_process(void *priv)
                 ac97_via_log(" with STOP");
 
                 /* Raise STOP to pause SGD. */
-                dev->sgd_regs[sgd->id] |= 0x04;
+                dev->sgd_regs[sgd->modem][sgd->id] |= 0x04;
             }
 
             if (sgd->entry_flags & 0x40) {
                 ac97_via_log(" with FLAG");
 
                 /* Raise FLAG to pause SGD. */
-                dev->sgd_regs[sgd->id] |= 0x01;
+                dev->sgd_regs[sgd->modem][sgd->id] |= 0x01;
 
 #ifdef ENABLE_AC97_VIA_LOG
-                if (dev->sgd_regs[sgd->id | 0x2] & 0x01)
+                if (dev->sgd_regs[sgd->modem][sgd->id | 0x2] & 0x01)
                     ac97_via_log(" interrupt");
 #endif
             }
@@ -627,19 +646,19 @@ ac97_via_sgd_process(void *priv)
                 ac97_via_log(" with EOL");
 
                 /* Raise EOL. */
-                dev->sgd_regs[sgd->id] |= 0x02;
+                dev->sgd_regs[sgd->modem][sgd->id] |= 0x02;
 
 #ifdef ENABLE_AC97_VIA_LOG
-                if (dev->sgd_regs[sgd->id | 0x2] & 0x02)
+                if (dev->sgd_regs[sgd->modem][sgd->id | 0x2] & 0x02)
                     ac97_via_log(" interrupt");
 #endif
 
                 /* Restart SGD if a trigger is queued or auto-start is enabled. */
-                if ((dev->sgd_regs[sgd->id] & 0x08) || (dev->sgd_regs[sgd->id | 0x2] & 0x80)) {
+                if ((dev->sgd_regs[sgd->modem][sgd->id] & 0x08) || (dev->sgd_regs[sgd->modem][sgd->id | 0x2] & 0x80)) {
                     ac97_via_log(" restart");
 
                     /* Un-queue trigger. */
-                    dev->sgd_regs[sgd->id] &= ~0x08;
+                    dev->sgd_regs[sgd->modem][sgd->id] &= ~0x08;
 
                     /* Go back to the starting block on the next run. */
                     sgd->restart = 2;
@@ -647,13 +666,13 @@ ac97_via_sgd_process(void *priv)
                     ac97_via_log(" finish");
 
                     /* Terminate SGD. */
-                    dev->sgd_regs[sgd->id] &= ~0x80;
+                    dev->sgd_regs[sgd->modem][sgd->id] &= ~0x80;
                 }
             }
             ac97_via_log("\n");
 
             /* Fire any requested status interrupts. */
-            ac97_via_update_irqs(dev);
+            ac97_via_update_irqs(dev, sgd->modem);
         }
     }
 }
@@ -662,7 +681,7 @@ static void
 ac97_via_poll_stereo(void *priv)
 {
     ac97_via_t     *dev = (ac97_via_t *) priv;
-    ac97_via_sgd_t *sgd = &dev->sgd[0]; /* Audio Read */
+    ac97_via_sgd_t *sgd = &dev->sgd[0][0]; /* Audio Read */
 
     /* Schedule next run if PCM playback is enabled. */
     if (dev->pcm_enabled)
@@ -672,7 +691,7 @@ ac97_via_poll_stereo(void *priv)
     ac97_via_update_stereo(dev, sgd);
 
     /* Feed next sample from the FIFO. */
-    switch (dev->sgd_regs[sgd->id | 0x2] & 0x30) {
+    switch (dev->sgd_regs[0][sgd->id | 0x2] & 0x30) {
         case 0x00: /* Mono, 8-bit PCM */
             if ((sgd->fifo_end - sgd->fifo_pos) >= 1) {
                 sgd->out_l = sgd->out_r = (sgd->fifo[sgd->fifo_pos++ & (sizeof(sgd->fifo) - 1)] ^ 0x80) << 8;
@@ -718,7 +737,7 @@ static void
 ac97_via_poll_fm(void *priv)
 {
     ac97_via_t     *dev = (ac97_via_t *) priv;
-    ac97_via_sgd_t *sgd = &dev->sgd[2]; /* FM Read */
+    ac97_via_sgd_t *sgd = &dev->sgd[0][2]; /* FM Read */
 
     /* Schedule next run if FM playback is enabled. */
     if (dev->fm_enabled)
@@ -746,15 +765,15 @@ ac97_via_get_buffer(int32_t *buffer, int len, void *priv)
 {
     ac97_via_t *dev = (ac97_via_t *) priv;
 
-    ac97_via_update_stereo(dev, &dev->sgd[0]);
-    ac97_via_update_stereo(dev, &dev->sgd[2]);
+    ac97_via_update_stereo(dev, &dev->sgd[0][0]);
+    ac97_via_update_stereo(dev, &dev->sgd[0][2]);
 
     for (int c = 0; c < len * 2; c++) {
-        buffer[c] += dev->sgd[0].buffer[c] / 2;
-        buffer[c] += dev->sgd[2].buffer[c] / 2;
+        buffer[c] += dev->sgd[0][0].buffer[c] / 2;
+        buffer[c] += dev->sgd[0][2].buffer[c] / 2;
     }
 
-    dev->sgd[0].pos = dev->sgd[2].pos = 0;
+    dev->sgd[0][0].pos = dev->sgd[0][2].pos = 0;
 }
 
 static void
@@ -780,15 +799,14 @@ ac97_via_speed_changed(void *priv)
     else
         freq = (double) SOUND_FREQ;
 
-    dev->sgd[0].timer_latch = (uint64_t) ((double) TIMER_USEC * (1000000.0 / freq));
-    dev->sgd[2].timer_latch = (uint64_t) ((double) TIMER_USEC * (1000000.0 / 24000.0)); /* FM operates at a fixed 24 KHz */
+    dev->sgd[0][0].timer_latch = (uint64_t) ((double) TIMER_USEC * (1000000.0 / freq));
+    dev->sgd[0][2].timer_latch = (uint64_t) ((double) TIMER_USEC * (1000000.0 / 24000.0)); /* FM operates at a fixed 24 KHz */
 }
 
 static void *
 ac97_via_init(UNUSED(const device_t *info))
 {
-    ac97_via_t *dev = malloc(sizeof(ac97_via_t));
-    memset(dev, 0, sizeof(ac97_via_t));
+    ac97_via_t *dev = calloc(1, sizeof(ac97_via_t));
 
     ac97_via_log("AC97 VIA: init()\n");
 
@@ -800,19 +818,23 @@ ac97_via_init(UNUSED(const device_t *info))
 
     /* Set up SGD channels. */
     for (uint8_t i = 0; i < (sizeof(dev->sgd) / sizeof(dev->sgd[0])); i++) {
-        dev->sgd[i].id  = i << 4;
-        dev->sgd[i].dev = dev;
+        for (uint8_t j = 0; j < 2; j++) {
+            dev->sgd[j][i].id  = i << 4;
+            dev->sgd[j][i].dev = dev;
 
-        /* Disable the FIFO on SGDs we don't care about. */
-        if ((i != 0) && (i != 2))
-            dev->sgd[i].always_run = 1;
+            dev->sgd[j][i].modem = j;
 
-        timer_add(&dev->sgd[i].dma_timer, ac97_via_sgd_process, &dev->sgd[i], 0);
+            /* Disable the FIFO on SGDs we don't care about. */
+            if ((i != 0) && (i != 2))
+                dev->sgd[j][i].always_run = 1;
+
+            timer_add(&dev->sgd[j][i].dma_timer, ac97_via_sgd_process, &dev->sgd[j][i], 0);
+        }
     }
 
     /* Set up playback pollers. */
-    timer_add(&dev->sgd[0].poll_timer, ac97_via_poll_stereo, dev, 0);
-    timer_add(&dev->sgd[2].poll_timer, ac97_via_poll_fm, dev, 0);
+    timer_add(&dev->sgd[0][0].poll_timer, ac97_via_poll_stereo, dev, 0);
+    timer_add(&dev->sgd[0][2].poll_timer, ac97_via_poll_fm, dev, 0);
     ac97_via_speed_changed(dev);
 
     /* Set up playback handler. */
@@ -839,7 +861,7 @@ const device_t ac97_via_device = {
     .init          = ac97_via_init,
     .close         = ac97_via_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = ac97_via_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sound/snd_ad1848.c b/src/sound/snd_ad1848.c
index d2a05fd6f..e9a4390c0 100644
--- a/src/sound/snd_ad1848.c
+++ b/src/sound/snd_ad1848.c
@@ -16,14 +16,15 @@
  *
  *           Copyright 2008-2020 Sarah Walker.
  *           Copyright 2018-2020 TheCollector1995.
- *           Copyright 2021-2022 RichardG.
+ *           Copyright 2021-2025 RichardG.
  */
 #include <math.h>
+#include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <wchar.h>
-
+#define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/dma.h>
 #include <86box/pic.h>
@@ -33,8 +34,27 @@
 #include <86box/plat_fallthrough.h>
 
 #define CS4231 0x80
+#define CS4232 0x02
 #define CS4236 0x03
 
+#ifdef ENABLE_AD1848_LOG
+int ad1848_do_log = ENABLE_AD1848_LOG;
+
+static void
+ad1848_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (ad1848_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define ad1848_log(fmt, ...)
+#endif
+
 static int    ad1848_vols_7bits[128];
 static double ad1848_vols_5bits_aux_gain[32];
 
@@ -45,64 +65,110 @@ extern uint8_t adjustMap4[64];
 void
 ad1848_setirq(ad1848_t *ad1848, int irq)
 {
+    ad1848_log("AD1848: setirq(%d)\n", irq);
     ad1848->irq = irq;
 }
 
 void
 ad1848_setdma(ad1848_t *ad1848, int newdma)
 {
+    ad1848_log("AD1848: setdma(%d)\n", newdma);
     ad1848->dma = newdma;
 }
 
 void
 ad1848_updatevolmask(ad1848_t *ad1848)
 {
-    if ((ad1848->type >= AD1848_TYPE_CS4235) && ((ad1848->xregs[4] & 0x10) || ad1848->wten))
-        ad1848->wave_vol_mask = 0x3f;
-    else
+    if ((ad1848->type == AD1848_TYPE_CS4236B) && !(ad1848->xregs[4] & 0x10) && !ad1848->wten)
         ad1848->wave_vol_mask = 0x7f;
+    else
+        ad1848->wave_vol_mask = 0x3f;
+    ad1848_log("AD1848: updatevolmask(%02X)\n", ad1848->wave_vol_mask);
+}
+
+static double
+ad1848_get_default_freq(ad1848_t *ad1848)
+{
+    double freq = (ad1848->regs[8] & 1) ? 16934400.0 : 24576000.0;
+
+    switch ((ad1848->regs[8] >> 1) & 7) {
+        default:
+            break;
+
+        case 0:
+            freq /= 3072.0;
+            break;
+        case 1:
+            freq /= 1536.0;
+            break;
+        case 2:
+            freq /= 896.0;
+            break;
+        case 3:
+            freq /= 768.0;
+            break;
+        case 4:
+            freq /= 448.0;
+            break;
+        case 5:
+            freq /= 384.0;
+            break;
+        case 6:
+            freq /= 512.0;
+            break;
+        case 7:
+            freq /= 2560.0;
+            break;
+    }
+
+    ad1848_log("AD1848: Frequency %f through default path\n", freq);
+
+    return freq;
 }
 
 static void
 ad1848_updatefreq(ad1848_t *ad1848)
 {
-    double  freq = 0.0;
-    uint8_t set  = 0;
+    double  freq;
 
-    if (ad1848->type >= AD1848_TYPE_CS4235) {
-        if (ad1848->xregs[11] & 0x20) {
-            freq = 16934400LL;
+    if (ad1848->type >= AD1848_TYPE_CS4232) {
+        if (ad1848->xregs[11] & 0x20) { /* CS4236B+ only */
+            freq = 16934400.0;
             switch (ad1848->xregs[13]) {
+                default:
+                    freq /= 16.0 * MAX(ad1848->xregs[13], 21);
+                    break;
                 case 1:
-                    freq /= 353;
+                    freq /= 353.0;
                     break;
                 case 2:
-                    freq /= 529;
+                    freq /= 529.0;
                     break;
                 case 3:
-                    freq /= 617;
+                    freq /= 617.0;
                     break;
                 case 4:
-                    freq /= 1058;
+                    freq /= 1058.0;
                     break;
                 case 5:
-                    freq /= 1764;
+                    freq /= 1764.0;
                     break;
                 case 6:
-                    freq /= 2117;
+                    freq /= 2117.0;
                     break;
                 case 7:
-                    freq /= 2558;
-                    break;
-                default:
-                    freq /= 16 * MAX(ad1848->xregs[13], 21);
+                    freq /= 2558.0;
                     break;
             }
-            set = 1;
+
+            ad1848_log("AD1848: Frequency %f through CS4236B+ path\n", freq);
         } else if (ad1848->regs[22] & 0x80) {
-            freq = (ad1848->regs[22] & 1) ? 33868800LL : 49152000LL;
-            set  = (ad1848->regs[22] >> 1) & 0x3f;
+            const uint8_t set = (ad1848->regs[22] >> 1) & 0x3f;
+            freq = (ad1848->regs[22] & 1) ? 33868800.0 : 49152000.0;
             switch (ad1848->regs[10] & 0x30) {
+                default:
+                    break;
+
                 case 0x00:
                     freq /= 128 * set;
                     break;
@@ -112,48 +178,15 @@ ad1848_updatefreq(ad1848_t *ad1848)
                 case 0x20:
                     freq /= 256 * set;
                     break;
-
-                default:
-                    break;
             }
-            set = 1;
-        }
-    }
 
-    if (!set) {
-        freq = (ad1848->regs[8] & 1) ? 16934400LL : 24576000LL;
-        switch ((ad1848->regs[8] >> 1) & 7) {
-            case 0:
-                freq /= 3072;
-                break;
-            case 1:
-                freq /= 1536;
-                break;
-            case 2:
-                freq /= 896;
-                break;
-            case 3:
-                freq /= 768;
-                break;
-            case 4:
-                freq /= 448;
-                break;
-            case 5:
-                freq /= 384;
-                break;
-            case 6:
-                freq /= 512;
-                break;
-            case 7:
-                freq /= 2560;
-                break;
+            ad1848_log("AD1848: Frequency %f through CS4232+ path\n", freq);
+        } else
+            freq = ad1848_get_default_freq(ad1848);
+    } else
+        freq = ad1848_get_default_freq(ad1848);
 
-            default:
-                break;
-        }
-    }
-
-    ad1848->freq        = freq;
+    ad1848->freq        = (int) trunc(freq);
     ad1848->timer_latch = (uint64_t) ((double) TIMER_USEC * (1000000.0 / (double) ad1848->freq));
 }
 
@@ -162,6 +195,7 @@ ad1848_read(uint16_t addr, void *priv)
 {
     ad1848_t *ad1848 = (ad1848_t *) priv;
     uint8_t   ret    = 0xff;
+    uint8_t   temp   = 0;
 
     switch (addr & 3) {
         case 0: /* Index */
@@ -176,36 +210,61 @@ ad1848_read(uint16_t addr, void *priv)
                     ad1848->regs[ad1848->index] = ret;
                     break;
 
-                case 18:
-                case 19:
-                    if (ad1848->type >= AD1848_TYPE_CS4235) {
+                case 18 ... 19:
+                    if (ad1848->type >= AD1848_TYPE_CS4236B) {
                         if ((ad1848->xregs[4] & 0x14) == 0x14)               /* FM remapping */
-                            ret = ad1848->xregs[ad1848->index - 12];         /* real FM volume on registers 6 and 7 */
+                            ret = ad1848->xregs[6 | (ad1848->index & 1)];    /* real FM volume on registers 6 and 7 */
                         else if (ad1848->wten && !(ad1848->xregs[4] & 0x08)) /* wavetable remapping */
-                            ret = ad1848->xregs[ad1848->index - 2];          /* real wavetable volume on registers 16 and 17 */
+                            ret = ad1848->xregs[16 | (ad1848->index & 1)];   /* real wavetable volume on registers 16 and 17 */
                     }
                     break;
 
-                case 20:
-                case 21:
-                    /* Backdoor to the Control/RAM registers on CS4235. */
-                    if ((ad1848->type == AD1848_TYPE_CS4235) && (ad1848->xregs[18] & 0x80))
+                case 20 ... 21:
+                    /* Backdoor to the Control/RAM registers on CS4235+. */
+                    if ((ad1848->type >= AD1848_TYPE_CS4235) && (ad1848->xregs[18] & 0x80))
                         ret = ad1848->cram_read(ad1848->index - 15, ad1848->cram_priv);
                     break;
 
                 case 23:
-                    if ((ad1848->type >= AD1848_TYPE_CS4235) && (ad1848->regs[23] & 0x08)) {
-                        if ((ad1848->xindex & 0xfe) == 0x00) /* remapped line volume */
-                            ret = ad1848->regs[18 + ad1848->xindex];
-                        else
-                            ret = ad1848->xregs[ad1848->xindex];
+                    if ((ad1848->type >= AD1848_TYPE_CS4236B) && (ad1848->regs[23] & 0x08)) {
+                        ret = ad1848->xregs[ad1848->xindex];
+                        switch (ad1848->xindex) {
+                            case 0 ... 1:
+                                /* Remapped line volume. */
+                                ret = ad1848->regs[18 + ad1848->xindex];
+                                break;
+
+                            case 23 ... 24:
+                            case 29:
+                                /* Backdoor to control indirect registers on CS4235+. */
+                                if (ad1848->type >= AD1848_TYPE_CS4235) {
+                                    temp = ad1848->cram_read(3, ad1848->cram_priv);
+                                    ad1848->cram_write(3, (ad1848->xindex == 23) ? 2 : ((ad1848->xindex == 24) ? 8 : 9), ad1848->cram_priv);
+                                    ret = ad1848->cram_read(4, ad1848->cram_priv);
+                                    ad1848->cram_write(3, temp, ad1848->cram_priv);
+                                }
+                                break;
+
+                            case 26 ... 28:
+                            case 30:
+                                /* Backdoor to control registers on CS4235+. */
+                                if (ad1848->type >= AD1848_TYPE_CS4235)
+                                    ret = ad1848->cram_read((ad1848->xindex == 30) ? 7 : (ad1848->xindex - 26), ad1848->cram_priv);
+                                break;
+
+                            default:
+                                break;
+                        }
+                        ad1848_log("AD1848: read(X%d) = %02X\n", ad1848->xindex, ret);
+                        return ret;
                     }
                     break;
 
                 default:
                     break;
             }
-            break;
+            ad1848_log("AD1848: read(I%d) = %02X\n", ad1848->index, ret);
+            return ret;
 
         case 2:
             ret = ad1848->status;
@@ -215,6 +274,8 @@ ad1848_read(uint16_t addr, void *priv)
             break;
     }
 
+    ad1848_log("AD1848: read(%04X) = %02X\n", addr, ret);
+
     return ret;
 }
 
@@ -231,7 +292,7 @@ ad1848_write(uint16_t addr, uint8_t val, void *priv)
                 ad1848->index = val & 0x1f; /* cs4231a extended mode enabled */
             else
                 ad1848->index = val & 0x0f; /* ad1848/cs4248 mode TODO: some variants/clones DO NOT mirror, just ignore the writes? */
-            if (ad1848->type >= AD1848_TYPE_CS4235)
+            if (ad1848->type >= AD1848_TYPE_CS4236B)
                 ad1848->regs[23] &= ~0x08; /* clear XRAE */
             ad1848->trd = val & 0x20;
             ad1848->mce = val & 0x40;
@@ -240,7 +301,7 @@ ad1848_write(uint16_t addr, uint8_t val, void *priv)
         case 1:
             switch (ad1848->index) {
                 case 10:
-                    if (ad1848->type < AD1848_TYPE_CS4235)
+                    if (ad1848->type < AD1848_TYPE_CS4232)
                         break;
                     fallthrough;
 
@@ -251,6 +312,7 @@ ad1848_write(uint16_t addr, uint8_t val, void *priv)
                 case 9:
                     if (!ad1848->enable && (val & 0x41) == 0x01) {
                         ad1848->adpcm_pos = 0;
+                        ad1848->dma_ff = 0;
                         if (ad1848->timer_latch)
                             timer_set_delay_u64(&ad1848->timer_count, ad1848->timer_latch);
                         else
@@ -264,50 +326,56 @@ ad1848_write(uint16_t addr, uint8_t val, void *priv)
                     break;
 
                 case 11:
-                    return;
+                    goto readonly_i;
 
                 case 12:
-                    if (ad1848->type != AD1848_TYPE_DEFAULT)
-                        ad1848->regs[12] = ((ad1848->regs[12] & 0x0f) + (val & 0xf0)) | 0x80;
-                    return;
+                    if (ad1848->type >= AD1848_TYPE_CS4248) {
+                        ad1848->regs[12] = 0x80 | (val & 0x70) | (ad1848->regs[12] & 0x0f);
+                        if ((ad1848->type >= AD1848_TYPE_CS4231) && (ad1848->type < AD1848_TYPE_CS4235)) {
+                            if (val & 0x40)
+                                ad1848->fmt_mask |= 0x80;
+                            else
+                                ad1848->fmt_mask &= ~0x80;
+                        }
+                    }
+                    goto readonly_i;
 
                 case 14:
                     ad1848->count = ad1848->regs[15] | (val << 8);
                     break;
 
-                case 17:
-                    /* Enable additional data formats on modes 2 and 3 where supported. */
-                    if ((ad1848->type == AD1848_TYPE_CS4231) || (ad1848->type == AD1848_TYPE_CS4236))
-                        ad1848->fmt_mask = (val & 0x40) ? 0xf0 : 0x70;
-                    break;
+                case 18 ... 19:
+                    if (ad1848->type >= AD1848_TYPE_CS4236B) {
+                        if (ad1848->type >= AD1848_TYPE_CS4235) {
+                            if (ad1848->xregs[18] & 0x20)              /* AUX1 remapping */
+                                ad1848->regs[ad1848->index & 3] = val; /* also controls AUX1 on registers 2 and 3 */
+                        } else {
+                            temp = 0;
+                            if ((ad1848->xregs[4] & 0x14) == 0x14) {          /* FM remapping */
+                                ad1848->xregs[6 | (ad1848->index & 1)] = val; /* real FM volume on extended registers 6 and 7 */
+                                temp                                   = 1;
 
-                case 18:
-                case 19:
-                    if (ad1848->type >= AD1848_TYPE_CS4235) {
-                        if ((ad1848->xregs[4] & 0x14) == 0x14) {     /* FM remapping */
-                            ad1848->xregs[ad1848->index - 12] = val; /* real FM volume on extended registers 6 and 7 */
-                            temp                              = 1;
-
-                            if (ad1848->index == 18) {
-                                if (val & 0x80)
-                                    ad1848->fm_vol_l = 0;
-                                else
-                                    ad1848->fm_vol_l = ad1848_vols_7bits[val & 0x3f];
-                            } else {
-                                if (val & 0x80)
-                                    ad1848->fm_vol_r = 0;
-                                else
-                                    ad1848->fm_vol_r = ad1848_vols_7bits[val & 0x3f];
+                                if (ad1848->index == 18) {
+                                    if (val & 0x80)
+                                        ad1848->fm_vol_l = 0;
+                                    else
+                                        ad1848->fm_vol_l = ad1848_vols_7bits[val & 0x3f];
+                                } else {
+                                    if (val & 0x80)
+                                        ad1848->fm_vol_r = 0;
+                                    else
+                                        ad1848->fm_vol_r = ad1848_vols_7bits[val & 0x3f];
+                                }
+                            }
+                            if (ad1848->wten && !(ad1848->xregs[4] & 0x08)) {  /* wavetable remapping */
+                                ad1848->xregs[16 | (ad1848->index & 1)] = val; /* real wavetable volume on extended registers 16 and 17 */
+                                temp                                    = 1;
                             }
-                        }
-                        if (ad1848->wten && !(ad1848->xregs[4] & 0x08)) { /* wavetable remapping */
-                            ad1848->xregs[ad1848->index - 2] = val;       /* real wavetable volume on extended registers 16 and 17 */
-                            temp                             = 1;
-                        }
 
-                        /* Stop here if any remapping is enabled. */
-                        if (temp)
-                            return;
+                            /* Stop here if any remapping is enabled. */
+                            if (temp)
+                                goto readonly_i;
+                        }
 
                         /* HACK: the Windows 9x driver's "Synth" control writes to this
                            register with no remapping, even if internal FM is enabled. */
@@ -325,10 +393,9 @@ ad1848_write(uint16_t addr, uint8_t val, void *priv)
                     }
                     break;
 
-                case 20:
-                case 21:
-                    /* Backdoor to the Control/RAM registers on CS4235. */
-                    if ((ad1848->type == AD1848_TYPE_CS4235) && (ad1848->xregs[18] & 0x80)) {
+                case 20 ... 21:
+                    /* Backdoor to the Control/RAM registers on CS4235+. */
+                    if ((ad1848->type >= AD1848_TYPE_CS4235) && (ad1848->xregs[18] & 0x80)) {
                         ad1848->cram_write(ad1848->index - 15, val, ad1848->cram_priv);
                         val = ad1848->regs[ad1848->index];
                     }
@@ -339,17 +406,19 @@ ad1848_write(uint16_t addr, uint8_t val, void *priv)
                     break;
 
                 case 23:
-                    if ((ad1848->type >= AD1848_TYPE_CS4235) && ((ad1848->regs[12] & 0x60) == 0x60)) {
+                    if ((ad1848->type >= AD1848_TYPE_CS4236B) && ((ad1848->regs[12] & 0x60) == 0x60)) {
                         if (!(ad1848->regs[23] & 0x08)) { /* existing (not new) XRAE is clear */
                             ad1848->xindex = ((val & 0x04) << 2) | (val >> 4);
                             break;
                         }
 
                         switch (ad1848->xindex) {
-                            case 0:
-                            case 1: /* remapped line volume */
-                                ad1848->regs[18 + ad1848->xindex] = val;
-                                return;
+                            case 0 ... 1:
+                                if (ad1848->type < AD1848_TYPE_CS4235) {
+                                    /* Remapped line volume. */
+                                    ad1848->regs[18 | ad1848->xindex] = val;
+                                }
+                                break;
 
                             case 6:
                                 if (val & 0x80)
@@ -370,8 +439,26 @@ ad1848_write(uint16_t addr, uint8_t val, void *priv)
                                 updatefreq = 1;
                                 break;
 
+                            case 23 ... 24:
+                            case 29:
+                                /* Backdoor to control indirect registers on CS4235+. */
+                                if (ad1848->type >= AD1848_TYPE_CS4235) {
+                                    temp = ad1848->cram_read(3, ad1848->cram_priv);
+                                    ad1848->cram_write(3, (ad1848->xindex == 23) ? 2 : ((ad1848->xindex == 24) ? 8 : 9), ad1848->cram_priv);
+                                    ad1848->cram_write(4, val, ad1848->cram_priv);
+                                    ad1848->cram_write(3, temp, ad1848->cram_priv);
+                                }
+                                break;
+
                             case 25:
-                                return;
+                                goto readonly_x;
+
+                            case 26 ... 28:
+                            case 30:
+                                /* Backdoor to control registers on CS4235+. */
+                                if (ad1848->type >= AD1848_TYPE_CS4235)
+                                    ad1848->cram_write((ad1848->xindex == 30) ? 7 : (ad1848->xindex - 26), val, ad1848->cram_priv);
+                                break;
 
                             default:
                                 break;
@@ -381,6 +468,8 @@ ad1848_write(uint16_t addr, uint8_t val, void *priv)
                         if (updatefreq)
                             ad1848_updatefreq(ad1848);
 
+readonly_x:
+                        ad1848_log("AD1848: write(X%d, %02X)\n", ad1848->xindex, val);
                         return;
                     }
                     break;
@@ -394,10 +483,14 @@ ad1848_write(uint16_t addr, uint8_t val, void *priv)
                     break;
 
                 case 25:
-                    return;
+                    goto readonly_i;
                 case 27:
-                    if (ad1848->type != AD1848_TYPE_DEFAULT)
-                        return;
+                    if ((ad1848->type != AD1848_TYPE_CS4232) && (ad1848->type != AD1848_TYPE_CS4236))
+                        goto readonly_i;
+                    break;
+                case 29:
+                    if ((ad1848->type != AD1848_TYPE_CS4232) && (ad1848->type != AD1848_TYPE_CS4236))
+                        goto readonly_i;
                     break;
 
                 default:
@@ -419,7 +512,9 @@ ad1848_write(uint16_t addr, uint8_t val, void *priv)
             else
                 ad1848->cd_vol_r = ad1848_vols_5bits_aux_gain[ad1848->regs[temp] & 0x1f];
 
-            break;
+readonly_i:
+            ad1848_log("AD1848: write(I%d, %02X)\n", ad1848->index, val);
+            return;
 
         case 2:
             ad1848->status &= 0xfe;
@@ -429,6 +524,8 @@ ad1848_write(uint16_t addr, uint8_t val, void *priv)
         default:
             break;
     }
+
+    ad1848_log("AD1848: write(%04X, %02X)\n", addr, val);
 }
 
 void
@@ -450,18 +547,28 @@ static int16_t
 ad1848_process_mulaw(uint8_t byte)
 {
     byte        = ~byte;
-    int16_t dec = ((byte & 0x0f) << 3) + 0x84;
-    dec <<= (byte & 0x70) >> 4;
-    return (byte & 0x80) ? (0x84 - dec) : (dec - 0x84);
+    int temp    = (((byte & 0x0f) << 3) + 0x84);
+    temp <<= ((byte & 0x70) >> 4);
+    temp = (byte & 0x80) ? (0x84 - temp) : (temp - 0x84);
+    if (temp > 32767)
+        return 32767;
+    else if (temp < -32768)
+        return -32768;
+    return (int16_t) temp;
 }
 
 static int16_t
 ad1848_process_alaw(uint8_t byte)
 {
     byte ^= 0x55;
-    int16_t dec = (byte & 0x0f) << 4;
-    int     seg = (byte & 0x70) >> 4;
+    int           dec = ((byte & 0x0f) << 4);;
+    const int     seg = (int) ((byte & 0x70) >> 4);
     switch (seg) {
+        default:
+            dec |= 0x108;
+            dec <<= seg - 1;
+            break;
+
         case 0:
             dec |= 0x8;
             break;
@@ -469,13 +576,33 @@ ad1848_process_alaw(uint8_t byte)
         case 1:
             dec |= 0x108;
             break;
-
-        default:
-            dec |= 0x108;
-            dec <<= seg - 1;
-            break;
     }
-    return (byte & 0x80) ? dec : -dec;
+    return (int16_t) ((byte & 0x80) ? dec : -dec);
+}
+
+static uint32_t
+ad1848_dma_channel_read(ad1848_t *ad1848, int channel)
+{
+    uint32_t ret;
+
+    if (channel >= 4) {
+       if (ad1848->dma_ff) {
+           ret = (ad1848->dma_data & 0xff00) >> 8;
+           ret |= (ad1848->dma_data & 0xffff0000);
+       } else {
+           ad1848->dma_data = dma_channel_read(channel);
+
+           if (ad1848->dma_data == DMA_NODATA)
+               return DMA_NODATA;
+
+           ret = ad1848->dma_data & 0xff;
+       }
+
+       ad1848->dma_ff = !ad1848->dma_ff;
+    } else
+        ret = dma_channel_read(channel);
+
+    return ret;
 }
 
 static int16_t
@@ -485,7 +612,7 @@ ad1848_process_adpcm(ad1848_t *ad1848)
     if (ad1848->adpcm_pos++ & 1) {
         temp = (ad1848->adpcm_data & 0x0f) + ad1848->adpcm_step;
     } else {
-        ad1848->adpcm_data = dma_channel_read(ad1848->dma);
+        ad1848->adpcm_data = (int) (ad1848_dma_channel_read(ad1848, ad1848->dma) & 0xffff);
         temp               = (ad1848->adpcm_data >> 4) + ad1848->adpcm_step;
     }
     if (temp < 0)
@@ -499,9 +626,9 @@ ad1848_process_adpcm(ad1848_t *ad1848)
     else if (ad1848->adpcm_ref < 0x00)
         ad1848->adpcm_ref = 0x00;
 
-    ad1848->adpcm_step = (ad1848->adpcm_step + adjustMap4[temp]) & 0xff;
+    ad1848->adpcm_step = (int8_t) ((ad1848->adpcm_step + adjustMap4[temp]) & 0xff);
 
-    return (ad1848->adpcm_ref ^ 0x80) << 8;
+    return (int16_t) ((ad1848->adpcm_ref ^ 0x80) << 8);
 }
 
 static void
@@ -521,42 +648,42 @@ ad1848_poll(void *priv)
 
         switch (ad1848->regs[8] & ad1848->fmt_mask) {
             case 0x00: /* Mono, 8-bit PCM */
-                ad1848->out_l = ad1848->out_r = (dma_channel_read(ad1848->dma) ^ 0x80) << 8;
+                ad1848->out_l = ad1848->out_r = (int16_t) ((ad1848_dma_channel_read(ad1848, ad1848->dma) ^ 0x80) << 8);
                 break;
 
             case 0x10: /* Stereo, 8-bit PCM */
-                ad1848->out_l = (dma_channel_read(ad1848->dma) ^ 0x80) << 8;
-                ad1848->out_r = (dma_channel_read(ad1848->dma) ^ 0x80) << 8;
+                ad1848->out_l = (int16_t) ((ad1848_dma_channel_read(ad1848, ad1848->dma) ^ 0x80) << 8);
+                ad1848->out_r = (int16_t) ((ad1848_dma_channel_read(ad1848, ad1848->dma) ^ 0x80) << 8);
                 break;
 
             case 0x20: /* Mono, 8-bit Mu-Law */
-                ad1848->out_l = ad1848->out_r = ad1848_process_mulaw(dma_channel_read(ad1848->dma));
+                ad1848->out_l = ad1848->out_r = ad1848_process_mulaw(ad1848_dma_channel_read(ad1848, ad1848->dma));
                 break;
 
             case 0x30: /* Stereo, 8-bit Mu-Law */
-                ad1848->out_l = ad1848_process_mulaw(dma_channel_read(ad1848->dma));
-                ad1848->out_r = ad1848_process_mulaw(dma_channel_read(ad1848->dma));
+                ad1848->out_l = ad1848_process_mulaw(ad1848_dma_channel_read(ad1848, ad1848->dma));
+                ad1848->out_r = ad1848_process_mulaw(ad1848_dma_channel_read(ad1848, ad1848->dma));
                 break;
 
             case 0x40: /* Mono, 16-bit PCM little endian */
-                temp          = dma_channel_read(ad1848->dma);
-                ad1848->out_l = ad1848->out_r = (dma_channel_read(ad1848->dma) << 8) | temp;
+                temp          = (int32_t) ad1848_dma_channel_read(ad1848, ad1848->dma);
+                ad1848->out_l = ad1848->out_r = (int16_t) ((ad1848_dma_channel_read(ad1848, ad1848->dma) << 8) | temp);
                 break;
 
             case 0x50: /* Stereo, 16-bit PCM little endian */
-                temp          = dma_channel_read(ad1848->dma);
-                ad1848->out_l = (dma_channel_read(ad1848->dma) << 8) | temp;
-                temp          = dma_channel_read(ad1848->dma);
-                ad1848->out_r = (dma_channel_read(ad1848->dma) << 8) | temp;
+                temp          = (int32_t) ad1848_dma_channel_read(ad1848, ad1848->dma);
+                ad1848->out_l = (int16_t) ((ad1848_dma_channel_read(ad1848, ad1848->dma) << 8) | temp);
+                temp          = (int32_t) ad1848_dma_channel_read(ad1848, ad1848->dma);
+                ad1848->out_r = (int16_t) ((ad1848_dma_channel_read(ad1848, ad1848->dma) << 8) | temp);
                 break;
 
             case 0x60: /* Mono, 8-bit A-Law */
-                ad1848->out_l = ad1848->out_r = ad1848_process_alaw(dma_channel_read(ad1848->dma));
+                ad1848->out_l = ad1848->out_r = ad1848_process_alaw(ad1848_dma_channel_read(ad1848, ad1848->dma));
                 break;
 
             case 0x70: /* Stereo, 8-bit A-Law */
-                ad1848->out_l = ad1848_process_alaw(dma_channel_read(ad1848->dma));
-                ad1848->out_r = ad1848_process_alaw(dma_channel_read(ad1848->dma));
+                ad1848->out_l = ad1848_process_alaw(ad1848_dma_channel_read(ad1848, ad1848->dma));
+                ad1848->out_r = ad1848_process_alaw(ad1848_dma_channel_read(ad1848, ad1848->dma));
                 break;
 
                 /* 0x80 and 0x90 reserved */
@@ -571,15 +698,15 @@ ad1848_poll(void *priv)
                 break;
 
             case 0xc0: /* Mono, 16-bit PCM big endian */
-                temp          = dma_channel_read(ad1848->dma);
-                ad1848->out_l = ad1848->out_r = dma_channel_read(ad1848->dma) | (temp << 8);
+                temp          = (int32_t) ad1848_dma_channel_read(ad1848, ad1848->dma);
+                ad1848->out_l = ad1848->out_r = (int16_t) (ad1848_dma_channel_read(ad1848, ad1848->dma) | (temp << 8));
                 break;
 
             case 0xd0: /* Stereo, 16-bit PCM big endian */
-                temp          = dma_channel_read(ad1848->dma);
-                ad1848->out_l = dma_channel_read(ad1848->dma) | (temp << 8);
-                temp          = dma_channel_read(ad1848->dma);
-                ad1848->out_r = dma_channel_read(ad1848->dma) | (temp << 8);
+                temp          = (int32_t) ad1848_dma_channel_read(ad1848, ad1848->dma);
+                ad1848->out_l = (int16_t) (ad1848_dma_channel_read(ad1848, ad1848->dma) | (temp << 8));
+                temp          = (int32_t) ad1848_dma_channel_read(ad1848, ad1848->dma);
+                ad1848->out_r = (int16_t) (ad1848_dma_channel_read(ad1848, ad1848->dma) | (temp << 8));
                 break;
 
                 /* 0xe0 and 0xf0 reserved */
@@ -591,12 +718,12 @@ ad1848_poll(void *priv)
         if (ad1848->regs[6] & 0x80)
             ad1848->out_l = 0;
         else
-            ad1848->out_l = (ad1848->out_l * ad1848_vols_7bits[ad1848->regs[6] & ad1848->wave_vol_mask]) >> 16;
+            ad1848->out_l = (int16_t) ((ad1848->out_l * ad1848_vols_7bits[ad1848->regs[6] & ad1848->wave_vol_mask]) >> 16);
 
         if (ad1848->regs[7] & 0x80)
             ad1848->out_r = 0;
         else
-            ad1848->out_r = (ad1848->out_r * ad1848_vols_7bits[ad1848->regs[7] & ad1848->wave_vol_mask]) >> 16;
+            ad1848->out_r = (int16_t) ((ad1848->out_r * ad1848_vols_7bits[ad1848->regs[7] & ad1848->wave_vol_mask]) >> 16);
 
         if (ad1848->count < 0) {
             ad1848->count     = ad1848->regs[15] | (ad1848->regs[14] << 8);
@@ -604,9 +731,11 @@ ad1848_poll(void *priv)
             if (!(ad1848->status & 0x01)) {
                 ad1848->status |= 0x01;
                 ad1848->regs[24] |= 0x10;
-                if (ad1848->regs[10] & 2)
-                    picint(1 << ad1848->irq);
             }
+            if (ad1848->regs[10] & 2)
+                picint(1 << ad1848->irq);
+            else
+                picintc(1 << ad1848->irq);
         }
 
         if (!(ad1848->adpcm_pos & 7)) /* ADPCM counts down every 4 bytes */
@@ -652,6 +781,8 @@ ad1848_init(ad1848_t *ad1848, uint8_t type)
     uint8_t c;
     double  attenuation;
 
+    ad1848_log("AD1848: init(%02X)\n", type);
+
     ad1848->status = 0xcc;
     ad1848->index = ad1848->trd = 0;
     ad1848->mce                 = 0x40;
@@ -664,10 +795,7 @@ ad1848_init(ad1848_t *ad1848, uint8_t type)
     ad1848->regs[8]                   = 0;
     ad1848->regs[9]                   = 0x08;
     ad1848->regs[10] = ad1848->regs[11] = 0;
-    if ((type == AD1848_TYPE_CS4248) || (type == AD1848_TYPE_CS4231) || (type >= AD1848_TYPE_CS4235))
-        ad1848->regs[12] = 0x8a;
-    else
-        ad1848->regs[12] = 0xa;
+    ad1848->regs[12] = (type >= AD1848_TYPE_CS4248) ? 0x8a : 0xa;
     ad1848->regs[13] = 0;
     ad1848->regs[14] = ad1848->regs[15] = 0;
 
@@ -679,27 +807,30 @@ ad1848_init(ad1848_t *ad1848, uint8_t type)
         ad1848->regs[25]                    = CS4231;
         ad1848->regs[26]                    = 0x80;
         ad1848->regs[29]                    = 0x80;
-    } else if (type >= AD1848_TYPE_CS4235) {
+    } else if (type >= AD1848_TYPE_CS4232) {
         ad1848->regs[16] = ad1848->regs[17] = 0;
         ad1848->regs[18] = ad1848->regs[19] = 0;
         ad1848->regs[20] = ad1848->regs[21] = 0;
         ad1848->regs[22] = ad1848->regs[23] = 0;
         ad1848->regs[24]                    = 0;
-        ad1848->regs[25]                    = CS4236;
+        ad1848->regs[25]                    = (type == AD1848_TYPE_CS4232) ? CS4232 : CS4236;
         ad1848->regs[26]                    = 0xa0;
         ad1848->regs[27] = ad1848->regs[29] = 0;
         ad1848->regs[30] = ad1848->regs[31] = 0;
 
-        ad1848->xregs[0] = ad1848->xregs[1] = 0xe8;
-        ad1848->xregs[2] = ad1848->xregs[3] = 0xcf;
-        ad1848->xregs[4]                    = 0x84;
-        ad1848->xregs[5]                    = 0;
-        ad1848->xregs[6] = ad1848->xregs[7] = 0x80;
-        ad1848->xregs[8] = ad1848->xregs[9] = 0;
-        ad1848->xregs[10]                   = 0x3f;
-        ad1848->xregs[11]                   = 0xc0;
-        ad1848->xregs[14] = ad1848->xregs[15] = 0;
-        ad1848->xregs[16] = ad1848->xregs[17] = 0;
+        if (type >= AD1848_TYPE_CS4236B) {
+            if (type < AD1848_TYPE_CS4235)
+                ad1848->xregs[0] = ad1848->xregs[1] = 0xe8;
+            ad1848->xregs[2] = ad1848->xregs[3] = 0xcf;
+            ad1848->xregs[4]                    = 0x84;
+            ad1848->xregs[5]                    = 0;
+            ad1848->xregs[6] = ad1848->xregs[7] = 0x80;
+            ad1848->xregs[8] = ad1848->xregs[9] = 0;
+            ad1848->xregs[10]                   = 0x3f;
+            ad1848->xregs[11]                   = 0xc0;
+            ad1848->xregs[14] = ad1848->xregs[15] = 0;
+            ad1848->xregs[16] = ad1848->xregs[17] = 0;
+        }
     }
 
     ad1848_updatefreq(ad1848);
@@ -707,7 +838,7 @@ ad1848_init(ad1848_t *ad1848, uint8_t type)
     ad1848->out_l = ad1848->out_r = 0;
     ad1848->fm_vol_l = ad1848->fm_vol_r = 65536;
     ad1848_updatevolmask(ad1848);
-    if (type == AD1848_TYPE_CS4235)
+    if (type >= AD1848_TYPE_CS4235)
         ad1848->fmt_mask = 0x50;
     else
         ad1848->fmt_mask = 0x70;
diff --git a/src/sound/snd_adlib.c b/src/sound/snd_adlib.c
index 5d0d7c7aa..b21a1f472 100644
--- a/src/sound/snd_adlib.c
+++ b/src/sound/snd_adlib.c
@@ -1,3 +1,21 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Adlib emulation.
+ *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
+ *
+ *          Copyright 2008-2018 Sarah Walker.
+ *          Copyright 2016-2025 Miran Grca.
+ *          Copyright 2024-2025 Jasmine Iwanek.
+ */
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -33,7 +51,7 @@ adlib_log(const char *fmt, ...)
 #    define adlib_log(fmt, ...)
 #endif
 
-typedef struct adlib_t {
+typedef struct adlib_s {
     fm_drv_t opl;
 
     uint8_t pos_regs[8];
@@ -103,8 +121,7 @@ adlib_mca_feedb(void *priv)
 void *
 adlib_init(UNUSED(const device_t *info))
 {
-    adlib_t *adlib = malloc(sizeof(adlib_t));
-    memset(adlib, 0, sizeof(adlib_t));
+    adlib_t *adlib = calloc(1, sizeof(adlib_t));
 
     adlib_log("adlib_init\n");
     fm_driver_get(FM_YM3812, &adlib->opl);
@@ -112,7 +129,7 @@ adlib_init(UNUSED(const device_t *info))
                   adlib->opl.read, NULL, NULL,
                   adlib->opl.write, NULL, NULL,
                   adlib->opl.priv);
-    sound_add_handler(adlib_get_buffer, adlib);
+    music_add_handler(adlib_get_buffer, adlib);
     return adlib;
 }
 
@@ -146,12 +163,12 @@ adlib_close(void *priv)
 const device_t adlib_device = {
     .name          = "AdLib",
     .internal_name = "adlib",
-    .flags         = DEVICE_ISA,
+    .flags         = DEVICE_ISA | DEVICE_SIDECAR,
     .local         = 0,
     .init          = adlib_init,
     .close         = adlib_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -165,7 +182,7 @@ const device_t adlib_mca_device = {
     .init          = adlib_mca_init,
     .close         = adlib_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sound/snd_adlibgold.c b/src/sound/snd_adlibgold.c
index 71cbbcaa6..360da3fec 100644
--- a/src/sound/snd_adlibgold.c
+++ b/src/sound/snd_adlibgold.c
@@ -788,14 +788,11 @@ adgold_get_buffer(int32_t *buffer, int len, void *priv)
 
     int c;
 
-    const int32_t *opl_buf = adgold->opl.update(adgold->opl.priv);
     adgold_update(adgold);
 
     for (c = 0; c < len * 2; c += 2) {
-        adgold_buffer[c] = ((opl_buf[c] * adgold->fm_vol_l) >> 7) / 2;
-        adgold_buffer[c] += ((adgold->mma_buffer[0][c >> 1] * adgold->samp_vol_l) >> 7) / 4;
-        adgold_buffer[c + 1] = ((opl_buf[c + 1] * adgold->fm_vol_r) >> 7) / 2;
-        adgold_buffer[c + 1] += ((adgold->mma_buffer[1][c >> 1] * adgold->samp_vol_r) >> 7) / 4;
+        adgold_buffer[c] = ((adgold->mma_buffer[0][c >> 1] * adgold->samp_vol_l) >> 7) / 4;
+        adgold_buffer[c + 1] = ((adgold->mma_buffer[1][c >> 1] * adgold->samp_vol_r) >> 7) / 4;
     }
 
     if (adgold->surround_enabled)
@@ -857,8 +854,8 @@ adgold_get_buffer(int32_t *buffer, int len, void *priv)
 
         /*Output is deliberately halved to avoid clipping*/
         temp     = ((int32_t) adgold_buffer[c] * adgold->vol_l) >> 17;
-        lowpass  = adgold_lowpass_iir(0, temp);
-        highpass = adgold_highpass_iir(0, temp);
+        lowpass  = adgold_lowpass_iir(0, 0, temp);
+        highpass = adgold_highpass_iir(0, 0, temp);
         if (adgold->bass > 6)
             temp += (lowpass * bass_attenuation[adgold->bass]) >> 14;
         else if (adgold->bass < 6)
@@ -874,8 +871,123 @@ adgold_get_buffer(int32_t *buffer, int len, void *priv)
         buffer[c] += temp;
 
         temp     = ((int32_t) adgold_buffer[c + 1] * adgold->vol_r) >> 17;
-        lowpass  = adgold_lowpass_iir(1, temp);
-        highpass = adgold_highpass_iir(1, temp);
+        lowpass  = adgold_lowpass_iir(0, 1, temp);
+        highpass = adgold_highpass_iir(0, 1, temp);
+        if (adgold->bass > 6)
+            temp += (lowpass * bass_attenuation[adgold->bass]) >> 14;
+        else if (adgold->bass < 6)
+            temp = highpass + ((temp * bass_cut[adgold->bass]) >> 14);
+        if (adgold->treble > 6)
+            temp += (highpass * treble_attenuation[adgold->treble]) >> 14;
+        else if (adgold->treble < 6)
+            temp = lowpass + ((temp * treble_cut[adgold->treble]) >> 14);
+        if (temp < -32768)
+            temp = -32768;
+        if (temp > 32767)
+            temp = 32767;
+        buffer[c + 1] += temp;
+    }
+
+    adgold->pos = 0;
+
+    free(adgold_buffer);
+}
+
+static void
+adgold_get_music_buffer(int32_t *buffer, int len, void *priv)
+{
+    adgold_t *adgold        = (adgold_t *) priv;
+    int16_t  *adgold_buffer = malloc(sizeof(int16_t) * len * 2);
+    if (adgold_buffer == NULL)
+        fatal("adgold_buffer = NULL");
+
+    int c;
+
+    const int32_t *opl_buf = adgold->opl.update(adgold->opl.priv);
+
+    for (c = 0; c < len * 2; c += 2) {
+        adgold_buffer[c] = ((opl_buf[c] * adgold->fm_vol_l) >> 7) / 2;
+        adgold_buffer[c + 1] = ((opl_buf[c + 1] * adgold->fm_vol_r) >> 7) / 2;
+    }
+
+    if (adgold->surround_enabled)
+        ym7128_apply(&adgold->ym7128, adgold_buffer, len);
+
+    switch (adgold->adgold_38x_regs[0x8] & 6) {
+        case 0:
+            for (c = 0; c < len * 2; c++)
+                adgold_buffer[c] = 0;
+            break;
+        case 2: /*Left channel only*/
+            for (c = 0; c < len * 2; c += 2)
+                adgold_buffer[c + 1] = adgold_buffer[c];
+            break;
+        case 4: /*Right channel only*/
+            for (c = 0; c < len * 2; c += 2)
+                adgold_buffer[c] = adgold_buffer[c + 1];
+            break;
+        case 6: /*Left and right channels*/
+            break;
+
+        default:
+            break;
+    }
+
+    switch (adgold->adgold_38x_regs[0x8] & 0x18) {
+        case 0x00: /*Forced mono*/
+            for (c = 0; c < len * 2; c += 2)
+                adgold_buffer[c] = adgold_buffer[c + 1] = ((int32_t) adgold_buffer[c] + (int32_t) adgold_buffer[c + 1]) / 2;
+            break;
+        case 0x08: /*Linear stereo*/
+            break;
+        case 0x10: /*Pseudo stereo*/
+            /*Filter left channel, leave right channel unchanged*/
+            /*Filter cutoff is largely a guess*/
+            for (c = 0; c < len * 2; c += 2)
+                adgold_buffer[c] += adgold_pseudo_stereo_iir(adgold_buffer[c]);
+            break;
+        case 0x18: /*Spatial stereo*/
+            /*Quite probably wrong, I only have the diagram in the TDA8425 datasheet
+              and a very vague understanding of how op-amps work to go on*/
+            for (c = 0; c < len * 2; c += 2) {
+                int16_t l = adgold_buffer[c];
+                int16_t r = adgold_buffer[c + 1];
+
+                adgold_buffer[c] += (r / 3) + ((l * 2) / 3);
+                adgold_buffer[c + 1] += (l / 3) + ((r * 2) / 3);
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    for (c = 0; c < len * 2; c += 2) {
+        int32_t temp;
+        int32_t lowpass;
+        int32_t highpass;
+
+        /*Output is deliberately halved to avoid clipping*/
+        temp     = ((int32_t) adgold_buffer[c] * adgold->vol_l) >> 17;
+        lowpass  = adgold_lowpass_iir(1, 0, temp);
+        highpass = adgold_highpass_iir(1, 0, temp);
+        if (adgold->bass > 6)
+            temp += (lowpass * bass_attenuation[adgold->bass]) >> 14;
+        else if (adgold->bass < 6)
+            temp = highpass + ((temp * bass_cut[adgold->bass]) >> 14);
+        if (adgold->treble > 6)
+            temp += (highpass * treble_attenuation[adgold->treble]) >> 14;
+        else if (adgold->treble < 6)
+            temp = lowpass + ((temp * treble_cut[adgold->treble]) >> 14);
+        if (temp < -32768)
+            temp = -32768;
+        if (temp > 32767)
+            temp = 32767;
+        buffer[c] += temp;
+
+        temp     = ((int32_t) adgold_buffer[c + 1] * adgold->vol_r) >> 17;
+        lowpass  = adgold_lowpass_iir(1, 1, temp);
+        highpass = adgold_highpass_iir(1, 1, temp);
         if (adgold->bass > 6)
             temp += (lowpass * bass_attenuation[adgold->bass]) >> 14;
         else if (adgold->bass < 6)
@@ -892,7 +1004,6 @@ adgold_get_buffer(int32_t *buffer, int len, void *priv)
     }
 
     adgold->opl.reset_buffer(adgold->opl.priv);
-    adgold->pos = 0;
 
     free(adgold_buffer);
 }
@@ -955,8 +1066,7 @@ adgold_init(UNUSED(const device_t *info))
     FILE     *fp;
     int       c;
     double    out;
-    adgold_t *adgold = malloc(sizeof(adgold_t));
-    memset(adgold, 0, sizeof(adgold_t));
+    adgold_t *adgold = calloc(1, sizeof(adgold_t));
 
     adgold->dma              = device_get_config_int("dma");
     adgold->irq              = device_get_config_int("irq");
@@ -1054,6 +1164,8 @@ adgold_init(UNUSED(const device_t *info))
     timer_add(&adgold->adgold_mma_timer_count, adgold_timer_poll, adgold, 1);
 
     sound_add_handler(adgold_get_buffer, adgold);
+    music_add_handler(adgold_get_music_buffer, adgold);
+
     sound_set_cd_audio_filter(adgold_filter_cd_audio, adgold);
 
     if (device_get_config_int("receive_input"))
@@ -1080,73 +1192,69 @@ adgold_close(void *priv)
 static const device_config_t adgold_config[] = {
   // clang-format off
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 7,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "IRQ 3",
-                .value = 3
-            },
-            {
-                .description = "IRQ 4",
-                .value = 4
-            },
-            {
-                .description = "IRQ 5",
-                .value = 5
-            },
-            {
-                .description = "IRQ 7",
-                .value = 7
-            },
-            { .description = "" }
-        }
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 7,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 3", .value = 3 },
+            { .description = "IRQ 4", .value = 4 },
+            { .description = "IRQ 5", .value = 5 },
+            { .description = "IRQ 7", .value = 7 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dma",
-        .description = "Low DMA channel",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 1,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "DMA 1",
-                .value = 1
-            },
-            {
-                .description = "DMA 3",
-                .value = 3
-            },
-            { .description = "" }
-        }
+        .name           = "dma",
+        .description    = "Low DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "DMA 1", .value = 1 },
+            { .description = "DMA 3", .value = 3 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "gameport",
-        .description = "Enable Game port",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "gameport",
+        .description    = "Enable Game port",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "surround",
-        .description = "Surround module",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "surround",
+        .description    = "Surround module",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input (MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -1160,7 +1268,7 @@ const device_t adgold_device = {
     .init          = adgold_init,
     .close         = adgold_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = adgold_config
diff --git a/src/sound/snd_audiopci.c b/src/sound/snd_audiopci.c
index 1405d8769..1ca547650 100644
--- a/src/sound/snd_audiopci.c
+++ b/src/sound/snd_audiopci.c
@@ -1,22 +1,24 @@
 /*
- * 86Box     A hypervisor and IBM PC system emulator that specializes in
- *           running old operating systems and software designed for IBM
- *           PC systems and compatibles from 1981 through fairly recent
- *           system designs based on the PCI bus.
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
  *
- *           This file is part of the 86Box distribution.
+ *          This file is part of the 86Box distribution.
  *
- *           Ensoniq AudioPCI (ES1371) emulation.
+ *          Ensoniq AudioPCI family emulation.
  *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          RichardG, <richardg867@gmail.com>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
+ *          Cacodemon345
  *
- *
- * Authors:  Sarah Walker, <https://pcem-emulator.co.uk/>
- *           RichardG, <richardg867@gmail.com>
- *           Miran Grca, <mgrca8@gmail.com>
- *
- *           Copyright 2008-2021 Sarah Walker.
- *           Copyright 2021 RichardG.
- *           Copyright 2021 Miran Grca.
+ *          Copyright 2008-2021 Sarah Walker.
+ *          Copyright 2021-2024 RichardG.
+ *          Copyright 2021      Miran Grca.
+ *          Copyright 2024-2025 Jasmine Iwanek.
+ *          Copyright 2024-2025 Cacodemon345.
  */
 #include <stdarg.h>
 #include <stdint.h>
@@ -37,19 +39,24 @@
 #include <86box/pci.h>
 #include <86box/snd_ac97.h>
 #include <86box/sound.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/plat_unused.h>
+#include <86box/snd_akm4531.h>
 
 #define N            16
 
-#define ES1371_NCoef 91
+#define ES137x_NCoef 91
 
-static float low_fir_es1371_coef[ES1371_NCoef];
+static float low_fir_es137x_coef[ES137x_NCoef];
 
-typedef struct es1371_t {
+typedef struct es137x_t {
     uint8_t pci_command;
     uint8_t pci_serr;
 
+    uint8_t subsys_lock;
+    uint8_t subsys_id[4];
+
     uint32_t base_addr;
 
     uint8_t int_line;
@@ -60,6 +67,7 @@ typedef struct es1371_t {
     uint32_t int_ctrl;
     uint32_t int_status;
     uint32_t legacy_ctrl;
+    uint32_t spdif_chstatus;
     void    *gameport;
 
     int mem_page;
@@ -107,6 +115,9 @@ typedef struct es1371_t {
         int16_t out_l;
         int16_t out_r;
 
+        int16_t prev_out_l;
+        int16_t prev_out_r;
+
         int32_t vol_l;
         int32_t vol_r;
     } dac[2], adc;
@@ -118,16 +129,48 @@ typedef struct es1371_t {
     int master_vol_r;
     int pcm_vol_l;
     int pcm_vol_r;
+    int pcm_rear_vol_l;
+    int pcm_rear_vol_r;
     int cd_vol_l;
     int cd_vol_r;
 
     uint8_t pci_slot;
 
     int     pos;
-    int16_t buffer[SOUNDBUFLEN * 2];
+    int16_t buffer[WTBUFLEN * 2];
 
-    int type;
-} es1371_t;
+    uint32_t type;
+
+    akm4531_t akm_codec;
+
+    uint32_t calc_sample_rate;
+    uint32_t calc_sample_rate_synth;
+
+    double   interp_factor;
+    uint32_t interp_step;
+
+    double   interp_factor_synth;
+    uint32_t interp_step_synth;
+
+    uint32_t step_pcm;
+    uint32_t step_synth;
+} es137x_t;
+
+static const double akm4531_att_2dbstep_5bits[] = {
+    // clang-format off
+       25.0,    32.0,    41.0,    51.0,    65.0,    82.0,   103.0,   130.0,
+      164.0,   206.0,   260.0,   327.0,   412.0,   519.0,   653.0,   822.0,
+     1036.0,  1304.0,  1641.0,  2067.0,  2602.0,  3276.0,  4125.0,  5192.0,
+     6537.0,  8230.0, 10362.0, 13044.0, 16422.0, 20674.0, 26027.0, 32767.0
+    // clang-format on
+};
+
+static double akm4531_gain_2dbstep_5bits[0x20];
+
+#define AUDIOPCI_ES1370           0x50000000
+#define AUDIOPCI_ES1371           0x13710200
+#define AUDIOPCI_ES1373           0x13710400
+#define AUDIOPCI_CT5880           0x58800400
 
 #define LEGACY_SB_ADDR            (1 << 29)
 #define LEGACY_SSCAPE_ADDR_SHIFT  27
@@ -160,6 +203,8 @@ typedef struct es1371_t {
 #define CODEC_READ                (1 << 23)
 #define CODEC_READY               (1 << 31)
 
+#define INT_DAC1_BYPASS           (1 << 31)
+#define INT_DAC2_BYPASS           (1 << 30)
 #define INT_DAC1_EN               (1 << 6)
 #define INT_DAC2_EN               (1 << 5)
 #define INT_UART_EN               (1 << 3)
@@ -170,6 +215,9 @@ typedef struct es1371_t {
 #define SI_P1_INTR_EN             (1 << 8)
 
 #define INT_STATUS_INTR           (1 << 31)
+#define INT_STATUS_REAR_B27       (1 << 27)
+#define INT_STATUS_REAR_B26       (1 << 26)
+#define INT_STATUS_REAR_B24       (1 << 24)
 #define INT_STATUS_UART           (1 << 3)
 #define INT_STATUS_DAC1           (1 << 2)
 #define INT_STATUS_DAC2           (1 << 1)
@@ -189,8 +237,8 @@ typedef struct es1371_t {
 #define FORMAT_MONO_16            2
 #define FORMAT_STEREO_16          3
 
-static void es1371_fetch(es1371_t *dev, int dac_nr);
-static void update_legacy(es1371_t *dev, uint32_t old_legacy_ctrl);
+static void es137x_fetch(es137x_t *dev, int dac_nr);
+static void update_legacy(es137x_t *dev, uint32_t old_legacy_ctrl);
 
 #ifdef ENABLE_AUDIOPCI_LOG
 int audiopci_do_log = ENABLE_AUDIOPCI_LOG;
@@ -211,7 +259,7 @@ audiopci_log(const char *fmt, ...)
 #endif
 
 static void
-es1371_update_irqs(es1371_t *dev)
+es137x_update_irqs(es137x_t *dev)
 {
     int irq = 0;
 
@@ -242,63 +290,63 @@ es1371_update_irqs(es1371_t *dev)
 }
 
 static void
-es1371_update_tx_irq(es1371_t *dev)
+es137x_update_tx_irq(es137x_t *dev)
 {
     dev->uart_status &= ~UART_STATUS_TXINT;
 
     if (((dev->uart_ctrl & UART_CTRL_TXINTEN) == 0x20) && (dev->uart_status & UART_STATUS_TXRDY))
         dev->uart_status |= UART_STATUS_TXINT;
 
-    es1371_update_irqs(dev);
+    es137x_update_irqs(dev);
 }
 
 static void
-es1371_set_tx_irq(es1371_t *dev, int set)
+es137x_set_tx_irq(es137x_t *dev, int set)
 {
     dev->uart_status &= ~UART_STATUS_TXRDY;
 
     if (set)
         dev->uart_status |= UART_STATUS_TXRDY;
 
-    es1371_update_tx_irq(dev);
+    es137x_update_tx_irq(dev);
 }
 
 static void
-es1371_update_rx_irq(es1371_t *dev)
+es137x_update_rx_irq(es137x_t *dev)
 {
     dev->uart_status &= ~UART_STATUS_RXINT;
 
     if ((dev->uart_ctrl & UART_CTRL_RXINTEN) && (dev->uart_status & UART_STATUS_RXRDY))
         dev->uart_status |= UART_STATUS_RXINT;
 
-    es1371_update_irqs(dev);
+    es137x_update_irqs(dev);
 }
 
 static void
-es1371_set_rx_irq(es1371_t *dev, int set)
+es137x_set_rx_irq(es137x_t *dev, int set)
 {
     dev->uart_status &= ~UART_STATUS_RXRDY;
 
     if (set)
         dev->uart_status |= UART_STATUS_RXRDY;
 
-    es1371_update_rx_irq(dev);
+    es137x_update_rx_irq(dev);
 }
 
 static void
-es1371_scan_fifo(es1371_t *dev)
+es137x_scan_fifo(es137x_t *dev)
 {
     if (dev->read_fifo_pos != dev->write_fifo_pos) {
         dev->uart_data     = dev->uart_fifo[dev->read_fifo_pos];
         dev->read_fifo_pos = (dev->read_fifo_pos + 1) & 7;
 
-        es1371_set_rx_irq(dev, 1);
+        es137x_set_rx_irq(dev, 1);
     } else
-        es1371_set_rx_irq(dev, 0);
+        es137x_set_rx_irq(dev, 0);
 }
 
 static void
-es1371_write_fifo(es1371_t *dev, uint8_t val)
+es137x_write_fifo(es137x_t *dev, uint8_t val)
 {
     if (dev->write_fifo_pos < 8) {
         dev->uart_fifo[dev->write_fifo_pos] = val | UART_FIFO_BYTE_VALID;
@@ -307,30 +355,106 @@ es1371_write_fifo(es1371_t *dev, uint8_t val)
 }
 
 static void
-es1371_reset_fifo(es1371_t *dev)
+es137x_reset_fifo(es137x_t *dev)
 {
     for (uint8_t i = 0; i < 8; i++)
         dev->uart_fifo[i] = 0x00000000;
 
     dev->read_fifo_pos = dev->write_fifo_pos = 0;
 
-    es1371_set_rx_irq(dev, 0);
+    es137x_set_rx_irq(dev, 0);
 }
 
 static void
-es1371_reset(void *priv)
+akm4531_reset(es137x_t *dev)
 {
-    es1371_t *dev = (es1371_t *) priv;
+    akm4531_t *codec = &dev->akm_codec;
+
+    memset(codec->registers, 0, sizeof(codec->registers));
+
+    codec->registers[0] = 0x80;
+    codec->registers[1] = 0x80;
+
+    for (int i = 0x02; i <= 0x0E; i++) {
+        codec->registers[i] = 0b10000110;
+    }
+
+    codec->registers[0xf] = 0x80;
+
+    codec->registers[0x17] = 0x3;
+    codec->registers[0x16] = 0x3;
+}
+
+static double
+lerp(double v0, double v1, double t)
+{
+    return (1. - t) * v0 + t * v1;
+}
+
+static void
+es1370_calc_sample_rate(es137x_t *dev)
+{
+    if (dev->type != AUDIOPCI_ES1370)
+        return;
+
+    dev->calc_sample_rate = 1411200 / (((dev->int_ctrl >> 16) & 0x1fff) + 2);
+
+    // audiopci_log("ES1370 calc sample rate %u\n", dev->calc_sample_rate);
+
+    dev->interp_factor = 1.0;
+    dev->interp_step   = 1;
+
+    if (dev->calc_sample_rate >= 44100 || dev->calc_sample_rate < 11025) {
+        dev->interp_factor    = 1.0;
+        dev->interp_step      = 1;
+        dev->calc_sample_rate = 44100;
+    }
+    if (dev->calc_sample_rate == 22050) {
+        dev->interp_factor = 0.5;
+        dev->interp_step   = 2;
+    }
+    if (dev->calc_sample_rate == 11025) {
+        dev->interp_factor = 0.25;
+        dev->interp_step   = 4;
+    }
+    if ((((dev->int_ctrl >> 16) & 0x1fff) + 2) == 256) {
+        /* 5512.5 Hz */
+        dev->interp_factor    = 0.125;
+        dev->interp_step      = 8;
+        dev->calc_sample_rate = 5512;
+    }
+
+    dev->calc_sample_rate_synth = 44100 / (1 << (((dev->int_ctrl >> 12) & 3) ^ 3));
+    dev->interp_factor_synth    = 1. / (double) ((1 << ((dev->int_ctrl >> 12) & 3) ^ 3));
+    dev->interp_step_synth      = (1 << (((dev->int_ctrl >> 12) & 3) ^ 3));
+}
+
+static void
+es137x_reset(void *priv)
+{
+    es137x_t *dev = (es137x_t *) priv;
 
     nmi = 0;
 
+    /* Default subsystem ID. */
+    dev->subsys_lock                   = 0x00;
+    *((uint16_t *) &dev->subsys_id[0]) = (dev->type == AUDIOPCI_ES1370) ? 0x4942 : 0x1274;
+    *((uint16_t *) &dev->subsys_id[2]) = (dev->type == AUDIOPCI_ES1370) ? 0x4c4c : 0x1371;
+
     /* Interrupt/Chip Select Control Register, Address 00H
        Addressable as byte, word, longword */
     dev->int_ctrl = 0xfcff0000;
 
-    /* Interrupt/Chip Select Control Register, Address 00H
+    /* Interrupt/Chip Select Status Register, Address 04H
        Addressable as longword only */
-    dev->int_status = 0x7ffffec0;
+    if (dev->type == AUDIOPCI_ES1370)
+        dev->int_status = 0x00000060;
+    else if (dev->type == AUDIOPCI_CT5880)
+        dev->int_status = 0x52080ec0;
+    else if (dev->type == AUDIOPCI_ES1373)
+        dev->int_status = 0x7f080ec0;
+    else /* AUDIOPCI_ES1371 */
+        dev->int_status = 0x7ffffec0;
 
     /* UART Status Register, Address 09H
        Addressable as byte only */
@@ -360,9 +484,16 @@ es1371_reset(void *priv)
        Addressable as byte, word, longword */
     dev->legacy_ctrl = 0x0000f801;
 
+    /* S/PDIF Channel Status Control Register, Address 1CH
+       Addressable as byte, word, longword */
+    dev->spdif_chstatus = 0xc0200004;
+
     /* Serial Interface Control Register, Address 20H
        Addressable as byte, word, longword */
-    dev->si_cr = 0xff800000;
+    if (dev->type == AUDIOPCI_ES1370)
+        dev->si_cr = 0x00000000;
+    else
+        dev->si_cr = 0xff800000;
 
     /* DAC1 Channel Sample Count Register, Address 24H
        Addressable as word, longword */
@@ -412,17 +543,20 @@ es1371_reset(void *priv)
         dev->uart_fifo[i] = 0xffff0000;
 
     /* Reset the UART TX. */
-    es1371_set_tx_irq(dev, 0);
+    es137x_set_tx_irq(dev, 0);
 
     /* Reset the UART (RX) FIFO. */
-    es1371_reset_fifo(dev);
+    es137x_reset_fifo(dev);
 
     /* Update interrupts to ensure they're all correctly cleared. */
-    es1371_update_irqs(dev);
+    es137x_update_irqs(dev);
+
+    /* Reset the codec. */
+    akm4531_reset(dev);
 }
 
 static uint32_t
-es1371_read_frame_reg(es1371_t *dev, int frame, int page)
+es137x_read_frame_reg(es137x_t *dev, int frame, int page)
 {
     uint32_t ret = 0xffffffff;
 
@@ -530,7 +664,7 @@ es1371_read_frame_reg(es1371_t *dev, int frame, int page)
 }
 
 static void
-es1371_write_frame_reg(es1371_t *dev, int frame, int page, uint32_t val)
+es137x_write_frame_reg(es137x_t *dev, int frame, int page, uint32_t val)
 {
     switch (frame) {
         case 0x30:
@@ -637,9 +771,9 @@ es1371_write_frame_reg(es1371_t *dev, int frame, int page, uint32_t val)
 }
 
 static uint8_t
-es1371_inb(uint16_t port, void *priv)
+es137x_inb(uint16_t port, void *priv)
 {
-    es1371_t *dev = (es1371_t *) priv;
+    es137x_t *dev = (es137x_t *) priv;
     uint8_t   ret = 0xff;
 
     switch (port & 0x3f) {
@@ -655,7 +789,9 @@ es1371_inb(uint16_t port, void *priv)
             ret = (dev->int_ctrl >> 16) & 0x0f;
             break;
         case 0x03:
-            ret = ((dev->int_ctrl >> 24) & 0x03) | 0xfc;
+            ret = dev->int_ctrl >> 24;
+            if (dev->type == AUDIOPCI_ES1371)
+                ret |= 0xfc;
             break;
 
         /* Interrupt/Chip Select Status Register, Address 04H
@@ -682,7 +818,7 @@ es1371_inb(uint16_t port, void *priv)
            Addressable as byte only */
         case 0x08:
             ret = dev->uart_data;
-            es1371_set_rx_irq(dev, 0);
+            es137x_set_rx_irq(dev, 0);
             audiopci_log("[R] UART DATA = %02X\n", ret);
             break;
 
@@ -724,6 +860,25 @@ es1371_inb(uint16_t port, void *priv)
             ret = dev->legacy_ctrl >> 24;
             break;
 
+        /* S/PDIF Channel Status Control Register, Address 1CH
+           Addressable as byte, word, longword */
+        case 0x1c:
+            if ((dev->type == AUDIOPCI_ES1373) || (dev->type == AUDIOPCI_CT5880))
+                ret = dev->spdif_chstatus & 0xff;
+            break;
+        case 0x1d:
+            if ((dev->type == AUDIOPCI_ES1373) || (dev->type == AUDIOPCI_CT5880))
+                ret = dev->spdif_chstatus >> 8;
+            break;
+        case 0x1e:
+            if ((dev->type == AUDIOPCI_ES1373) || (dev->type == AUDIOPCI_CT5880))
+                ret = dev->spdif_chstatus >> 16;
+            break;
+        case 0x1f:
+            if ((dev->type == AUDIOPCI_ES1373) || (dev->type == AUDIOPCI_CT5880))
+                ret = dev->spdif_chstatus >> 24;
+            break;
+
         /* Serial Interface Control Register, Address 20H
             Addressable as byte, word, longword */
         case 0x20:
@@ -733,24 +888,29 @@ es1371_inb(uint16_t port, void *priv)
             ret = dev->si_cr >> 8;
             break;
         case 0x22:
-            ret = (dev->si_cr >> 16) | 0x80;
+            ret = dev->si_cr >> 16;
+            if (dev->type != AUDIOPCI_ES1370)
+                ret |= 0x80;
             break;
         case 0x23:
-            ret = 0xff;
+            if (dev->type == AUDIOPCI_ES1370)
+                ret = 0x00;
+            else
+                ret = 0xff;
             break;
 
         default:
-            audiopci_log("Bad es1371_inb: port=%04x\n", port);
+            audiopci_log("Bad es137x_inb: port=%04x\n", port);
     }
 
-    audiopci_log("es1371_inb: port=%04x ret=%02x\n", port, ret);
+    audiopci_log("es137x_inb: port=%04x ret=%02x\n", port, ret);
     return ret;
 }
 
 static uint16_t
-es1371_inw(uint16_t port, void *priv)
+es137x_inw(uint16_t port, void *priv)
 {
-    es1371_t *dev = (es1371_t *) priv;
+    es137x_t *dev = (es137x_t *) priv;
     uint16_t  ret = 0xffff;
 
     switch (port & 0x3e) {
@@ -760,7 +920,9 @@ es1371_inw(uint16_t port, void *priv)
             ret = dev->int_ctrl & 0xffff;
             break;
         case 0x02:
-            ret = ((dev->int_ctrl >> 16) & 0x030f) | 0xfc00;
+            ret = (dev->int_ctrl >> 16) & 0xff0f;
+            if (dev->type == AUDIOPCI_ES1371)
+                ret |= 0xfc00;
             break;
 
         /* Memory Page Register, Address 0CH
@@ -781,13 +943,26 @@ es1371_inw(uint16_t port, void *priv)
             ret = dev->legacy_ctrl >> 16;
             break;
 
+        /* S/PDIF Channel Status Control Register, Address 1CH
+           Addressable as byte, word, longword */
+        case 0x1c:
+            if ((dev->type == AUDIOPCI_ES1373) || (dev->type == AUDIOPCI_CT5880))
+                ret = dev->spdif_chstatus & 0xffff;
+            break;
+        case 0x1e:
+            if ((dev->type == AUDIOPCI_ES1373) || (dev->type == AUDIOPCI_CT5880))
+                ret = dev->spdif_chstatus >> 16;
+            break;
+
         /* Serial Interface Control Register, Address 20H
             Addressable as byte, word, longword */
         case 0x20:
             ret = dev->si_cr & 0xffff;
             break;
         case 0x22:
-            ret = (dev->si_cr >> 16) | 0xff80;
+            ret = dev->si_cr >> 16;
+            if (dev->type != AUDIOPCI_ES1370)
+                ret |= 0xff80;
             break;
 
         /* DAC1 Channel Sample Count Register, Address 24H
@@ -821,35 +996,40 @@ es1371_inw(uint16_t port, void *priv)
         case 0x34:
         case 0x38:
         case 0x3c:
-            ret = es1371_read_frame_reg(dev, port & 0x3c, dev->mem_page) & 0xffff;
+            ret = es137x_read_frame_reg(dev, port & 0x3c, dev->mem_page) & 0xffff;
             break;
         case 0x32:
         case 0x36:
         case 0x3a:
         case 0x3e:
-            ret = es1371_read_frame_reg(dev, port & 0x3c, dev->mem_page) >> 16;
+            ret = es137x_read_frame_reg(dev, port & 0x3c, dev->mem_page) >> 16;
             break;
 
         default:
             break;
     }
 
-    audiopci_log("es1371_inw: port=%04x ret=%04x\n", port, ret);
+    audiopci_log("es137x_inw: port=%04x ret=%04x\n", port, ret);
 
     return ret;
 }
 
 static uint32_t
-es1371_inl(uint16_t port, void *priv)
+es137x_inl(uint16_t port, void *priv)
 {
-    es1371_t *dev = (es1371_t *) priv;
+    es137x_t *dev = (es137x_t *) priv;
     uint32_t  ret = 0xffffffff;
 
+    if ((dev->type == AUDIOPCI_ES1370) && (port & 0x3c) == 0x14)
+        port = 0x10;
+
     switch (port & 0x3c) {
         /* Interrupt/Chip Select Control Register, Address 00H
            Addressable as byte, word, longword */
         case 0x00:
-            ret = (dev->int_ctrl & 0x030fffff) | 0xfc000000;
+            ret = dev->int_ctrl & 0xff0fffff;
+            if ((ret < AUDIOPCI_ES1373) && (ret != AUDIOPCI_ES1370))
+                ret |= 0xfc000000;
             break;
 
         /* Interrupt/Chip Select Status Register, Address 04H
@@ -875,6 +1055,8 @@ es1371_inl(uint16_t port, void *priv)
         /* CODEC Read Register, Address 14H
            Addressable as longword only */
         case 0x14:
+            if (dev->type == AUDIOPCI_ES1370)
+                break;
             ret = dev->codec_ctrl | CODEC_READY;
             break;
 
@@ -884,10 +1066,19 @@ es1371_inl(uint16_t port, void *priv)
             ret = (dev->legacy_ctrl & 0xffff07fd) | 0x0000f800;
             break;
 
+        /* S/PDIF Channel Status Control Register, Address 1CH
+           Addressable as byte, word, longword */
+        case 0x1c:
+            if ((dev->type == AUDIOPCI_ES1373) || (dev->type == AUDIOPCI_CT5880))
+                ret = dev->spdif_chstatus;
+            break;
+
         /* Serial Interface Control Register, Address 20H
             Addressable as byte, word, longword */
         case 0x20:
-            ret = dev->si_cr | 0xff800000;
+            ret = dev->si_cr;
+            if (dev->type != AUDIOPCI_ES1370)
+                ret |= 0xff800000;
             break;
 
         /* DAC1 Channel Sample Count Register, Address 24H
@@ -912,24 +1103,24 @@ es1371_inl(uint16_t port, void *priv)
         case 0x34:
         case 0x38:
         case 0x3c:
-            ret = es1371_read_frame_reg(dev, port & 0x3c, dev->mem_page);
+            ret = es137x_read_frame_reg(dev, port & 0x3c, dev->mem_page);
             break;
 
         default:
             break;
     }
 
-    audiopci_log("es1371_inl: port=%04x ret=%08x\n", port, ret);
+    audiopci_log("es137x_inl: port=%04x ret=%08x\n", port, ret);
     return ret;
 }
 
 static void
-es1371_outb(uint16_t port, uint8_t val, void *priv)
+es137x_outb(uint16_t port, uint8_t val, void *priv)
 {
-    es1371_t *dev = (es1371_t *) priv;
+    es137x_t *dev = (es137x_t *) priv;
     uint32_t  old_legacy_ctrl;
 
-    audiopci_log("es1371_outb: port=%04x val=%02x\n", port, val);
+    audiopci_log("es137x_outb: port=%04x val=%02x\n", port, val);
 
     switch (port & 0x3f) {
         /* Interrupt/Chip Select Control Register, Address 00H
@@ -939,25 +1130,45 @@ es1371_outb(uint16_t port, uint8_t val, void *priv)
                 dev->dac[0].addr           = dev->dac[0].addr_latch;
                 dev->dac[0].buffer_pos     = 0;
                 dev->dac[0].buffer_pos_end = 0;
-                es1371_fetch(dev, 0);
+                dev->dac[0].prev_out_l     = 0;
+                dev->dac[0].prev_out_r     = 0;
+                es137x_fetch(dev, 0);
             }
             if (!(dev->int_ctrl & INT_DAC2_EN) && (val & INT_DAC2_EN)) {
                 dev->dac[1].addr           = dev->dac[1].addr_latch;
                 dev->dac[1].buffer_pos     = 0;
                 dev->dac[1].buffer_pos_end = 0;
-                es1371_fetch(dev, 1);
+                dev->dac[1].prev_out_l     = 0;
+                dev->dac[1].prev_out_r     = 0;
+                es137x_fetch(dev, 1);
             }
+            // audiopci_log("INTCTRL 0x%02X\n", val & 0xff);
             dev->int_ctrl = (dev->int_ctrl & 0xffffff00) | val;
             break;
         case 0x01:
             dev->int_ctrl = (dev->int_ctrl & 0xffff00ff) | (val << 8);
+            es1370_calc_sample_rate(dev);
             break;
         case 0x02:
             dev->int_ctrl = (dev->int_ctrl & 0xff00ffff) | (val << 16);
+            es1370_calc_sample_rate(dev);
             break;
         case 0x03:
             dev->int_ctrl = (dev->int_ctrl & 0x00ffffff) | (val << 24);
             gameport_remap(dev->gameport, 0x200 | ((val & 0x03) << 3));
+            es1370_calc_sample_rate(dev);
+            break;
+
+        /* Interrupt/Chip Select Status Register, Address 04H
+           Addressable as longword only, but PCem implements byte access, which
+           must be for a reason */
+        case 0x06:
+            if ((dev->type == AUDIOPCI_ES1373) || (dev->type == AUDIOPCI_CT5880))
+                dev->int_status = (dev->int_status & 0xff08ffff) | (val << 16);
+            break;
+        case 0x07:
+            if (dev->type == AUDIOPCI_CT5880)
+                dev->int_status = (dev->int_status & 0xd2ffffff) | (val << 24);
             break;
 
         /* UART Data Register, Address 08H
@@ -966,7 +1177,7 @@ es1371_outb(uint16_t port, uint8_t val, void *priv)
             audiopci_log("MIDI data = %02x\n", val);
             /* TX does not use FIFO. */
             midi_raw_out_byte(val);
-            es1371_set_tx_irq(dev, 1);
+            es137x_set_tx_irq(dev, 1);
             break;
 
         /* UART Control Register, Address 09H
@@ -977,15 +1188,15 @@ es1371_outb(uint16_t port, uint8_t val, void *priv)
 
             if ((val & 0x03) == 0x03) {
                 /* Reset TX */
-                es1371_set_tx_irq(dev, 1);
+                es137x_set_tx_irq(dev, 1);
 
                 /* Software reset */
-                es1371_reset_fifo(dev);
+                es137x_reset_fifo(dev);
             } else {
-                es1371_set_tx_irq(dev, 1);
+                es137x_set_tx_irq(dev, 1);
 
-                es1371_update_tx_irq(dev);
-                es1371_update_rx_irq(dev);
+                es137x_update_tx_irq(dev);
+                es137x_update_rx_irq(dev);
             }
             break;
 
@@ -1017,36 +1228,61 @@ es1371_outb(uint16_t port, uint8_t val, void *priv)
         case 0x1b:
             old_legacy_ctrl  = dev->legacy_ctrl;
             dev->legacy_ctrl = (dev->legacy_ctrl & 0x00ffffff) | (val << 24);
-            es1371_update_irqs(dev);
+            es137x_update_irqs(dev);
             update_legacy(dev, old_legacy_ctrl);
             break;
 
+        /* S/PDIF Channel Status Control Register, Address 1CH
+           Addressable as byte, word, longword */
+        case 0x1c:
+            dev->spdif_chstatus = (dev->spdif_chstatus & 0xffffff00) | val;
+            break;
+        case 0x1d:
+            dev->spdif_chstatus = (dev->spdif_chstatus & 0xffff00ff) | (val << 8);
+            break;
+        case 0x1e:
+            dev->spdif_chstatus = (dev->spdif_chstatus & 0xff00ffff) | (val << 16);
+            break;
+        case 0x1f:
+            dev->spdif_chstatus = (dev->spdif_chstatus & 0x00ffffff) | (val << 24);
+            break;
+
         /* Serial Interface Control Register, Address 20H
             Addressable as byte, word, longword */
         case 0x20:
-            dev->si_cr = (dev->si_cr & 0xffffff00) | val;
+            if (dev->type == AUDIOPCI_ES1370)
+                dev->si_cr = (dev->si_cr & 0xffff00) | val;
+            else
+                dev->si_cr = (dev->si_cr & 0xffffff00) | val;
             break;
         case 0x21:
-            dev->si_cr = (dev->si_cr & 0xffff00ff) | (val << 8);
+            if (dev->type == AUDIOPCI_ES1370)
+                dev->si_cr = (dev->si_cr & 0xff00ff) | (val << 8);
+            else
+                dev->si_cr = (dev->si_cr & 0xffff00ff) | (val << 8);
             if (!(dev->si_cr & SI_P1_INTR_EN))
                 dev->int_status &= ~INT_STATUS_DAC1;
             if (!(dev->si_cr & SI_P2_INTR_EN))
                 dev->int_status &= ~INT_STATUS_DAC2;
-            es1371_update_irqs(dev);
+
+            es137x_update_irqs(dev);
             break;
         case 0x22:
-            dev->si_cr = (dev->si_cr & 0xff80ffff) | ((val & 0x7f) << 16);
+            if (dev->type == AUDIOPCI_ES1370)
+                dev->si_cr = (dev->si_cr & 0xc0ffff) | ((val & 0x3f) << 16);
+            else
+                dev->si_cr = (dev->si_cr & 0xff80ffff) | ((val & 0x7f) << 16);
             break;
 
         default:
-            audiopci_log("Bad es1371_outb: port=%04x val=%02x\n", port, val);
+            audiopci_log("Bad es137x_outb: port=%04x val=%02x\n", port, val);
     }
 }
 
 static void
-es1371_outw(uint16_t port, uint16_t val, void *priv)
+es137x_outw(uint16_t port, uint16_t val, void *priv)
 {
-    es1371_t *dev = (es1371_t *) priv;
+    es137x_t *dev = (es137x_t *) priv;
     uint32_t  old_legacy_ctrl;
 
     switch (port & 0x3f) {
@@ -1057,19 +1293,27 @@ es1371_outw(uint16_t port, uint16_t val, void *priv)
                 dev->dac[0].addr           = dev->dac[0].addr_latch;
                 dev->dac[0].buffer_pos     = 0;
                 dev->dac[0].buffer_pos_end = 0;
-                es1371_fetch(dev, 0);
+                dev->dac[0].prev_out_l     = 0;
+                dev->dac[0].prev_out_r     = 0;
+                dev->step_synth            = dev->interp_step_synth;
+                es137x_fetch(dev, 0);
             }
             if (!(dev->int_ctrl & INT_DAC2_EN) && (val & INT_DAC2_EN)) {
                 dev->dac[1].addr           = dev->dac[1].addr_latch;
                 dev->dac[1].buffer_pos     = 0;
                 dev->dac[1].buffer_pos_end = 0;
-                es1371_fetch(dev, 1);
+                dev->dac[1].prev_out_l     = 0;
+                dev->dac[1].prev_out_r     = 0;
+                dev->step_pcm              = dev->interp_step;
+                es137x_fetch(dev, 1);
             }
+            // audiopci_log("INTCTRL 0x%02X\n", val & 0xff);
             dev->int_ctrl = (dev->int_ctrl & 0xffff0000) | val;
             break;
         case 0x02:
             dev->int_ctrl = (dev->int_ctrl & 0x0000ffff) | (val << 16);
             gameport_remap(dev->gameport, 0x200 | ((val & 0x0300) >> 5));
+            es1370_calc_sample_rate(dev);
             break;
 
         /* Memory Page Register, Address 0CH
@@ -1080,6 +1324,17 @@ es1371_outw(uint16_t port, uint16_t val, void *priv)
         case 0x0e:
             break;
 
+        /* CODEC Write Register, Address 10H
+           Addressable as word, longword */
+        case 0x10:
+            if (dev->type != AUDIOPCI_ES1370)
+                break;
+
+            dev->akm_codec.registers[(val >> 8) & 0xFF] = val & 0xFF;
+            if ((val >> 8) == 0x16 && !(val & 1))
+                akm4531_reset(dev);
+            break;
+
         /* Legacy Control/Status Register, Address 18H
            Addressable as byte, word, longword */
         case 0x18:
@@ -1088,22 +1343,38 @@ es1371_outw(uint16_t port, uint16_t val, void *priv)
         case 0x1a:
             old_legacy_ctrl  = dev->legacy_ctrl;
             dev->legacy_ctrl = (dev->legacy_ctrl & 0x0000ffff) | (val << 16);
-            es1371_update_irqs(dev);
+            es137x_update_irqs(dev);
             update_legacy(dev, old_legacy_ctrl);
             break;
 
+        /* S/PDIF Channel Status Control Register, Address 1CH
+           Addressable as byte, word, longword */
+        case 0x1c:
+            dev->spdif_chstatus = (dev->spdif_chstatus & 0xffff0000) | val;
+            break;
+        case 0x1e:
+            dev->spdif_chstatus = (dev->spdif_chstatus & 0x0000ffff) | (val << 16);
+            break;
+
         /* Serial Interface Control Register, Address 20H
             Addressable as byte, word, longword */
         case 0x20:
-            dev->si_cr = (dev->si_cr & 0xffff0000) | val;
+            if (dev->type == AUDIOPCI_ES1370)
+                dev->si_cr = (dev->si_cr & 0xff0000) | val;
+            else
+                dev->si_cr = (dev->si_cr & 0xffff0000) | val;
+
             if (!(dev->si_cr & SI_P1_INTR_EN))
                 dev->int_status &= ~INT_STATUS_DAC1;
             if (!(dev->si_cr & SI_P2_INTR_EN))
                 dev->int_status &= ~INT_STATUS_DAC2;
-            es1371_update_irqs(dev);
+            es137x_update_irqs(dev);
             break;
         case 0x22:
-            dev->si_cr = (dev->si_cr & 0xff80ffff) | ((val & 0x007f) << 16);
+            if (dev->type == AUDIOPCI_ES1370)
+                dev->si_cr = (dev->si_cr & 0xc0ffff) | ((val & 0x3f) << 16);
+            else
+                dev->si_cr = (dev->si_cr & 0xff80ffff) | ((val & 0x007f) << 16);
             break;
 
         /* DAC1 Channel Sample Count Register, Address 24H
@@ -1130,37 +1401,58 @@ es1371_outw(uint16_t port, uint16_t val, void *priv)
 }
 
 static void
-es1371_outl(uint16_t port, uint32_t val, void *priv)
+es137x_outl(uint16_t port, uint32_t val, void *priv)
 {
-    es1371_t *dev = (es1371_t *) priv;
+    es137x_t *dev = (es137x_t *) priv;
     uint32_t  old_legacy_ctrl;
 
-    audiopci_log("es1371_outl: port=%04x val=%08x\n", port, val);
+    audiopci_log("es137x_outl: port=%04x val=%08x\n", port, val);
 
     switch (port & 0x3f) {
         /* Interrupt/Chip Select Control Register, Address 00H
            Addressable as byte, word, longword */
         case 0x00:
-            if (!(dev->int_ctrl & INT_DAC1_EN) && (val & INT_DAC1_EN)) {
-                dev->dac[0].addr           = dev->dac[0].addr_latch;
-                dev->dac[0].buffer_pos     = 0;
-                dev->dac[0].buffer_pos_end = 0;
-                es1371_fetch(dev, 0);
+            {
+                uint8_t dac1start = 0;
+                uint8_t dac2start = 0;
+
+                if (!(dev->int_ctrl & INT_DAC1_EN) && (val & INT_DAC1_EN)) {
+                    dev->dac[0].addr           = dev->dac[0].addr_latch;
+                    dev->dac[0].buffer_pos     = 0;
+                    dev->dac[0].buffer_pos_end = 0;
+                    dev->dac[0].prev_out_l     = 0;
+                    dev->dac[0].prev_out_r     = 0;
+                    dac1start                  = 1;
+                    es137x_fetch(dev, 0);
+                }
+                if (!(dev->int_ctrl & INT_DAC2_EN) && (val & INT_DAC2_EN)) {
+                    dev->dac[1].addr           = dev->dac[1].addr_latch;
+                    dev->dac[1].buffer_pos     = 0;
+                    dev->dac[1].buffer_pos_end = 0;
+                    dev->dac[1].prev_out_l     = 0;
+                    dev->dac[1].prev_out_r     = 0;
+                    dac2start                  = 1;
+                    es137x_fetch(dev, 1);
+                }
+                // audiopci_log("INTCTRL 0x%02X\n", val & 0xff);
+                dev->int_ctrl = val;
+                gameport_remap(dev->gameport, 0x200 | ((val & 0x03000000) >> 21));
+                es1370_calc_sample_rate(dev);
+                if (dac1start)
+                    dev->step_synth = dev->interp_step_synth;
+                if (dac2start)
+                    dev->step_pcm = dev->interp_step;
+                break;
             }
-            if (!(dev->int_ctrl & INT_DAC2_EN) && (val & INT_DAC2_EN)) {
-                dev->dac[1].addr           = dev->dac[1].addr_latch;
-                dev->dac[1].buffer_pos     = 0;
-                dev->dac[1].buffer_pos_end = 0;
-                es1371_fetch(dev, 1);
-            }
-            dev->int_ctrl = val;
-            gameport_remap(dev->gameport, 0x200 | ((val & 0x03000000) >> 21));
-            break;
 
         /* Interrupt/Chip Select Status Register, Address 04H
            Addressable as longword only */
         case 0x04:
             audiopci_log("[W] STATUS = %08X\n", val);
+            if (dev->type == AUDIOPCI_CT5880)
+                dev->int_status = (dev->int_status & 0xd208ffff) | (val & 0x2df70000);
+            else if (dev->type == AUDIOPCI_ES1373)
+                dev->int_status = (dev->int_status & 0xff08ffff) | (val & 0x00f70000);
             break;
 
         /* Memory Page Register, Address 0CH
@@ -1172,6 +1464,12 @@ es1371_outl(uint16_t port, uint32_t val, void *priv)
         /* Sample Rate Converter Interface Register, Address 10H
            Addressable as longword only */
         case 0x10:
+            if (dev->type == AUDIOPCI_ES1370) {
+                dev->akm_codec.registers[(val >> 8) & 0xFF] = val & 0xFF;
+                if ((val >> 8) == 0x16 && !(val & 1))
+                    akm4531_reset(dev);
+                break;
+            }
             dev->sr_cir = val & 0xfff8ffff; /*Bits 16 to 18 are undefined*/
             if (dev->sr_cir & SRC_RAM_WE) {
                 dev->sr_ram[dev->sr_cir >> 25] = val & 0xffff;
@@ -1222,6 +1520,8 @@ es1371_outl(uint16_t port, uint32_t val, void *priv)
         /* CODEC Write Register, Address 14H
            Addressable as longword only */
         case 0x14:
+            if (dev->type == AUDIOPCI_ES1370)
+                break;
             if (val & CODEC_READ) {
                 dev->codec_ctrl &= 0x00ff0000;
                 dev->codec_ctrl |= ac97_codec_readw(dev->codec, val >> 16);
@@ -1231,6 +1531,7 @@ es1371_outl(uint16_t port, uint32_t val, void *priv)
 
                 ac97_codec_getattn(dev->codec, 0x02, &dev->master_vol_l, &dev->master_vol_r);
                 ac97_codec_getattn(dev->codec, 0x18, &dev->pcm_vol_l, &dev->pcm_vol_r);
+                ac97_codec_getattn(dev->codec, 0x38, &dev->pcm_rear_vol_l, &dev->pcm_rear_vol_r);
                 ac97_codec_getattn(dev->codec, 0x12, &dev->cd_vol_l, &dev->cd_vol_r);
             }
             break;
@@ -1241,19 +1542,28 @@ es1371_outl(uint16_t port, uint32_t val, void *priv)
             old_legacy_ctrl  = dev->legacy_ctrl;
             dev->legacy_ctrl = (dev->legacy_ctrl & 0x0000ffff) | (val & 0xffff0000);
             dev->legacy_ctrl |= LEGACY_INT;
-            es1371_update_irqs(dev);
+            es137x_update_irqs(dev);
             update_legacy(dev, old_legacy_ctrl);
             break;
 
+        /* S/PDIF Channel Status Control Register, Address 1CH
+           Addressable as byte, word, longword */
+        case 0x1c:
+            dev->spdif_chstatus = val;
+            break;
+
         /* Serial Interface Control Register, Address 20H
             Addressable as byte, word, longword */
         case 0x20:
-            dev->si_cr = (val & 0x007fffff) | 0xff800000;
+            if (dev->type == AUDIOPCI_ES1370)
+                dev->si_cr = val & 0x3fffff;
+            else
+                dev->si_cr = (val & 0x007fffff) | 0xff800000;
             if (!(dev->si_cr & SI_P1_INTR_EN))
                 dev->int_status &= ~INT_STATUS_DAC1;
             if (!(dev->si_cr & SI_P2_INTR_EN))
                 dev->int_status &= ~INT_STATUS_DAC2;
-            es1371_update_irqs(dev);
+            es137x_update_irqs(dev);
             break;
 
         /* DAC1 Channel Sample Count Register, Address 24H
@@ -1278,7 +1588,7 @@ es1371_outl(uint16_t port, uint32_t val, void *priv)
         case 0x34:
         case 0x38:
         case 0x3c:
-            es1371_write_frame_reg(dev, port & 0x3c, dev->mem_page, val);
+            es137x_write_frame_reg(dev, port & 0x3c, dev->mem_page, val);
             break;
 
         default:
@@ -1287,7 +1597,7 @@ es1371_outl(uint16_t port, uint32_t val, void *priv)
 }
 
 static void
-capture_event(es1371_t *dev, int type, int rw, uint16_t port)
+capture_event(es137x_t *dev, int type, int rw, uint16_t port)
 {
     dev->legacy_ctrl &= ~(LEGACY_EVENT_MASK | LEGACY_EVENT_ADDR_MASK);
     dev->legacy_ctrl |= type;
@@ -1405,7 +1715,7 @@ capture_read_slave_dma(uint16_t port, void *priv)
 }
 
 static void
-update_legacy(es1371_t *dev, uint32_t old_legacy_ctrl)
+update_legacy(es137x_t *dev, uint32_t old_legacy_ctrl)
 {
     if (old_legacy_ctrl & LEGACY_CAPTURE_SSCAPE) {
         switch ((old_legacy_ctrl >> LEGACY_SSCAPE_ADDR_SHIFT) & 3) {
@@ -1594,10 +1904,106 @@ update_legacy(es1371_t *dev, uint32_t old_legacy_ctrl)
     }
 }
 
+static uint8_t
+es1370_pci_read(int func, int addr, void *priv)
+{
+    const es137x_t *dev = (es137x_t *) priv;
+
+    if (func > 0)
+        return 0xff;
+
+    if ((addr > 0x3f) && ((addr < 0xdc) || (addr > 0xe1)))
+        return 0x00;
+
+    switch (addr) {
+        case 0x00:       /* Vendor ID */
+            return 0x74; /* Ensoniq */
+        case 0x01:
+            return 0x12;
+
+        case 0x02:       /* Device ID */
+            return dev->type >> 16; /* ES1370 */
+        case 0x03:
+            return dev->type >> 24;
+
+        case 0x04: /* Command TODO */
+            return dev->pci_command;
+        case 0x05:
+            return dev->pci_serr;
+
+        case 0x06:       /* Status TODO */
+            return 0x10; /* Supports ACPI */
+        case 0x07:
+            return 0x00;
+
+        case 0x08:       /* Class Code & Revision ID */
+            return dev->type >> 8; /* Revision ID - 0x00 is actual Ensoniq-branded ES1370 */
+        case 0x09:
+            return 0x00; /* Multimedia audio device */
+        case 0x0a:
+            return 0x01;
+        case 0x0b:
+            return 0x04;
+
+//        case 0x0c: /* Cache Line Size TODO */
+//        case 0x0d: /* Latency Timer TODO */
+//        case 0x0e: /* Header Type TODO */
+//        case 0x0f: /* BIST TODO */
+
+        case 0x10:                                 /* Base Address TODO */
+            return 0x01 | (dev->base_addr & 0xc0); /* memBaseAddr */
+        case 0x11:
+            return dev->base_addr >> 8;
+        case 0x12:
+            return dev->base_addr >> 16;
+        case 0x13:
+            return dev->base_addr >> 24;
+
+        case 0x2c ... 0x2f:
+            return dev->subsys_id[addr & 3]; /* Subsystem vendor ID */
+
+#if 0
+        case 0x34: // TODO
+            return 0xdc; /* Capabilites pointer */
+#endif
+
+        case 0x3c:
+            return dev->int_line;
+        case 0x3d:
+            return 0x01; /* INTA */
+
+        case 0x3e:
+            return 0xc; /* Minimum grant */
+        case 0x3f:
+            return 0x80; /* Maximum latency */
+
+#if 0
+        case 0xdc:
+            return 0x01; /* Capabilities identifier */
+        case 0xdd:
+            return 0x00; /* Next item pointer */
+        case 0xde:
+            return 0x31; /* Power management capabilities */
+        case 0xdf:
+            return 0x6c;
+
+        case 0xe0:
+            return dev->pmcsr & 0xff;
+        case 0xe1:
+            return dev->pmcsr >> 8;
+#endif
+
+        default:
+            break;
+    }
+
+    return 0x00;
+}
+
 static uint8_t
 es1371_pci_read(int func, int addr, void *priv)
 {
-    const es1371_t *dev = (es1371_t *) priv;
+    const es137x_t *dev = (es137x_t *) priv;
 
     if (func > 0)
         return 0xff;
@@ -1612,9 +2018,9 @@ es1371_pci_read(int func, int addr, void *priv)
             return 0x12;
 
         case 0x02:
-            return 0x71; /* ES1371 */
+            return dev->type >> 16; /* ES1371 */
         case 0x03:
-            return 0x13;
+            return dev->type >> 24;
 
         case 0x04:
             return dev->pci_command;
@@ -1627,7 +2033,7 @@ es1371_pci_read(int func, int addr, void *priv)
             return 0x00;
 
         case 0x08:
-            return 0x02; /* Revision ID - 0x02 is actual Ensoniq-branded ES1371 */
+            return dev->type >> 8; /* Revision ID */
         case 0x09:
             return 0x00; /* Multimedia audio device */
         case 0x0a:
@@ -1644,14 +2050,8 @@ es1371_pci_read(int func, int addr, void *priv)
         case 0x13:
             return dev->base_addr >> 24;
 
-        case 0x2c:
-            return 0x74; /* Subsystem vendor ID */
-        case 0x2d:
-            return 0x12;
-        case 0x2e:
-            return 0x71;
-        case 0x2f:
-            return 0x13;
+        case 0x2c ... 0x2f:
+            return dev->subsys_id[addr & 3]; /* Subsystem vendor ID */
 
         case 0x34:
             return 0xdc; /* Capabilites pointer */
@@ -1666,6 +2066,11 @@ es1371_pci_read(int func, int addr, void *priv)
         case 0x3f:
             return 0x80; /* Maximum latency */
 
+        case 0x40:
+            if ((dev->type == AUDIOPCI_ES1373) || (dev->type == AUDIOPCI_CT5880))
+                return dev->subsys_lock;
+            break;
+
         case 0xdc:
             return 0x01; /* Capabilities identifier */
         case 0xdd:
@@ -1688,42 +2093,42 @@ es1371_pci_read(int func, int addr, void *priv)
 }
 
 static void
-es1371_io_set(es1371_t *dev, int set)
+es137x_io_set(es137x_t *dev, int set)
 {
     if (dev->pci_command & PCI_COMMAND_IO) {
         io_handler(set, dev->base_addr, 0x0040,
-                   es1371_inb, es1371_inw, es1371_inl,
-                   es1371_outb, es1371_outw, es1371_outl, dev);
+                   es137x_inb, es137x_inw, es137x_inl,
+                   es137x_outb, es137x_outw, es137x_outl, dev);
     }
 }
 
 static void
-es1371_pci_write(int func, int addr, uint8_t val, void *priv)
+es1370_pci_write(int func, int addr, uint8_t val, void *priv)
 {
-    es1371_t *dev = (es1371_t *) priv;
+    es137x_t *dev = (es137x_t *) priv;
 
     if (func)
         return;
 
     switch (addr) {
         case 0x04:
-            es1371_io_set(dev, 0);
+            es137x_io_set(dev, 0);
             dev->pci_command = val & 0x05;
-            es1371_io_set(dev, 1);
+            es137x_io_set(dev, 1);
             break;
         case 0x05:
             dev->pci_serr = val & 1;
             break;
 
         case 0x10:
-            es1371_io_set(dev, 0);
+            es137x_io_set(dev, 0);
             dev->base_addr = (dev->base_addr & 0xffffff00) | (val & 0xc0);
-            es1371_io_set(dev, 1);
+            es137x_io_set(dev, 1);
             break;
         case 0x11:
-            es1371_io_set(dev, 0);
+            es137x_io_set(dev, 0);
             dev->base_addr = (dev->base_addr & 0xffff00c0) | (val << 8);
-            es1371_io_set(dev, 1);
+            es137x_io_set(dev, 1);
             break;
         case 0x12:
             dev->base_addr = (dev->base_addr & 0xff00ffc0) | (val << 16);
@@ -1749,7 +2154,68 @@ es1371_pci_write(int func, int addr, uint8_t val, void *priv)
 }
 
 static void
-es1371_fetch(es1371_t *dev, int dac_nr)
+es1371_pci_write(int func, int addr, uint8_t val, void *priv)
+{
+    es137x_t *dev = (es137x_t *) priv;
+
+    if (func)
+        return;
+
+    switch (addr) {
+        case 0x04:
+            es137x_io_set(dev, 0);
+            dev->pci_command = val & 0x05;
+            es137x_io_set(dev, 1);
+            break;
+        case 0x05:
+            dev->pci_serr = val & 1;
+            break;
+
+        case 0x10:
+            es137x_io_set(dev, 0);
+            dev->base_addr = (dev->base_addr & 0xffffff00) | (val & 0xc0);
+            es137x_io_set(dev, 1);
+            break;
+        case 0x11:
+            es137x_io_set(dev, 0);
+            dev->base_addr = (dev->base_addr & 0xffff00c0) | (val << 8);
+            es137x_io_set(dev, 1);
+            break;
+        case 0x12:
+            dev->base_addr = (dev->base_addr & 0xff00ffc0) | (val << 16);
+            break;
+        case 0x13:
+            dev->base_addr = (dev->base_addr & 0x00ffffc0) | (val << 24);
+            break;
+
+        case 0x2c ... 0x2f:
+            if (dev->subsys_lock == 0xea)
+                dev->subsys_id[addr & 3] = val;
+            break;
+
+        case 0x3c:
+            dev->int_line = val;
+            break;
+
+        case 0x40:
+            if ((dev->type == AUDIOPCI_ES1373) || (dev->type == AUDIOPCI_CT5880))
+                dev->subsys_lock = val;
+            break;
+
+        case 0xe0:
+            dev->pmcsr = (dev->pmcsr & 0xff00) | (val & 0x03);
+            break;
+        case 0xe1:
+            dev->pmcsr = (dev->pmcsr & 0x00ff) | ((val & 0x01) << 8);
+            break;
+
+        default:
+            break;
+    }
+}
+
+static void
+es137x_fetch(es137x_t *dev, int dac_nr)
 {
     if (dev->si_cr & (dac_nr ? SI_P2_PAUSE : SI_P1_PAUSE))
         return;
@@ -1853,8 +2319,8 @@ low_fir_es1371(int dac_nr, int i, float NewSample)
     read_pos = (pos + 15) & (127 & ~15);
     n_coef   = (16 - pos) & 15;
 
-    while (n_coef < ES1371_NCoef) {
-        out += low_fir_es1371_coef[n_coef] * x[dac_nr][i][read_pos];
+    while (n_coef < ES137x_NCoef) {
+        out += low_fir_es137x_coef[n_coef] * x[dac_nr][i][read_pos];
         read_pos = (read_pos + 16) & (127 & ~15);
         n_coef += 16;
     }
@@ -1869,13 +2335,13 @@ low_fir_es1371(int dac_nr, int i, float NewSample)
 }
 
 static void
-es1371_next_sample_filtered(es1371_t *dev, int dac_nr, int out_idx)
+es137x_next_sample_filtered(es137x_t *dev, int dac_nr, int out_idx)
 {
     int out_l;
     int out_r;
 
     if ((dev->dac[dac_nr].buffer_pos - dev->dac[dac_nr].buffer_pos_end) >= 0)
-        es1371_fetch(dev, dac_nr);
+        es137x_fetch(dev, dac_nr);
 
     out_l = dev->dac[dac_nr].buffer_l[dev->dac[dac_nr].buffer_pos & 63];
     out_r = dev->dac[dac_nr].buffer_r[dev->dac[dac_nr].buffer_pos & 63];
@@ -1892,21 +2358,35 @@ es1371_next_sample_filtered(es1371_t *dev, int dac_nr, int out_idx)
 }
 
 static void
-es1371_update(es1371_t *dev)
+es137x_update(es137x_t *dev)
 {
     int32_t l;
     int32_t r;
 
-    l = (dev->dac[0].out_l * dev->dac[0].vol_l) >> 12;
-    l += ((dev->dac[1].out_l * dev->dac[1].vol_l) >> 12);
-    r = (dev->dac[0].out_r * dev->dac[0].vol_r) >> 12;
-    r += ((dev->dac[1].out_r * dev->dac[1].vol_r) >> 12);
+    if (dev->type == AUDIOPCI_ES1370) {
+        l = dev->dac[0].out_l * (((dev->akm_codec.registers[0x4] & 0x80) ? 0 : akm4531_gain_2dbstep_5bits[(dev->akm_codec.registers[0x4] & 0x1f)]) / 32767.0);
+        r = dev->dac[0].out_r * (((dev->akm_codec.registers[0x5] & 0x80) ? 0 : akm4531_gain_2dbstep_5bits[(dev->akm_codec.registers[0x5] & 0x1f)]) / 32767.0);
 
-    l >>= 1;
-    r >>= 1;
+        l += dev->dac[1].out_l * (((dev->akm_codec.registers[0x2] & 0x80) ? 0 : akm4531_gain_2dbstep_5bits[(dev->akm_codec.registers[0x2] & 0x1f)]) / 32767.0);
+        r += dev->dac[1].out_r * (((dev->akm_codec.registers[0x3] & 0x80) ? 0 : akm4531_gain_2dbstep_5bits[(dev->akm_codec.registers[0x3] & 0x1f)]) / 32767.0);
 
-    l = (((l * dev->pcm_vol_l) >> 15) * dev->master_vol_l) >> 15;
-    r = (((r * dev->pcm_vol_r) >> 15) * dev->master_vol_r) >> 15;
+        l >>= 1;
+        r >>= 1;
+
+        l *= (((dev->akm_codec.registers[0x0] & 0x80) ? 0 : akm4531_att_2dbstep_5bits[(dev->akm_codec.registers[0x0] & 0x1f) ^ 0x1f]) / 32767.0);
+        r *= (((dev->akm_codec.registers[0x1] & 0x80) ? 0 : akm4531_att_2dbstep_5bits[(dev->akm_codec.registers[0x1] & 0x1f) ^ 0x1f]) / 32767.0);
+    } else {
+        l = (dev->dac[0].out_l * dev->dac[0].vol_l) >> 12;
+        l += ((dev->dac[1].out_l * dev->dac[1].vol_l) >> 12);
+        r = (dev->dac[0].out_r * dev->dac[0].vol_r) >> 12;
+        r += ((dev->dac[1].out_r * dev->dac[1].vol_r) >> 12);
+
+        l >>= 1;
+        r >>= 1;
+
+        l = (((l * dev->pcm_vol_l) >> 15) * dev->master_vol_l) >> 15;
+        r = (((r * dev->pcm_vol_r) >> 15) * dev->master_vol_r) >> 15;
+    }
 
     if (l < -32768)
         l = -32768;
@@ -1917,16 +2397,16 @@ es1371_update(es1371_t *dev)
     else if (r > 32767)
         r = 32767;
 
-    for (; dev->pos < sound_pos_global; dev->pos++) {
+    for (; dev->pos < ((dev->type == AUDIOPCI_ES1370) ? wavetable_pos_global : sound_pos_global); dev->pos++) {
         dev->buffer[dev->pos * 2]     = l;
         dev->buffer[dev->pos * 2 + 1] = r;
     }
 }
 
 static void
-es1371_poll(void *priv)
+es137x_poll(void *priv)
 {
-    es1371_t *dev = (es1371_t *) priv;
+    es137x_t *dev = (es137x_t *) priv;
     int       frac;
     int       idx;
     int       samp1_l;
@@ -1936,67 +2416,133 @@ es1371_poll(void *priv)
 
     timer_advance_u64(&dev->dac[1].timer, dev->dac[1].latch);
 
-    es1371_scan_fifo(dev);
+    es137x_scan_fifo(dev);
 
-    es1371_update(dev);
+    es137x_update(dev);
 
     if (dev->int_ctrl & INT_DAC1_EN) {
-        frac    = dev->dac[0].ac & 0x7fff;
-        idx     = dev->dac[0].ac >> 15;
-        samp1_l = dev->dac[0].filtered_l[idx];
-        samp1_r = dev->dac[0].filtered_r[idx];
-        samp2_l = dev->dac[0].filtered_l[(idx + 1) & 31];
-        samp2_r = dev->dac[0].filtered_r[(idx + 1) & 31];
+        if ((((dev->type == AUDIOPCI_ES1373) || (dev->type == AUDIOPCI_CT5880)) && (dev->int_ctrl & INT_DAC1_BYPASS)) || (dev->type == AUDIOPCI_ES1370)) {
+            if ((dev->calc_sample_rate_synth != 44100) && (dev->type == AUDIOPCI_ES1370)) {
+                if ((dev->dac[0].buffer_pos - dev->dac[0].buffer_pos_end) >= 0 && dev->step_synth >= dev->interp_step_synth)
+                    es137x_fetch(dev, 0);
 
-        dev->dac[0].out_l = ((samp1_l * (0x8000 - frac)) + (samp2_l * frac)) >> 15;
-        dev->dac[0].out_r = ((samp1_r * (0x8000 - frac)) + (samp2_r * frac)) >> 15;
-        dev->dac[0].ac += dev->dac[0].vf;
-        dev->dac[0].ac &= ((32 << 15) - 1);
-        if ((dev->dac[0].ac >> (15 + 4)) != dev->dac[0].f_pos) {
-            es1371_next_sample_filtered(dev, 0, dev->dac[0].f_pos ? 16 : 0);
-            dev->dac[0].f_pos = (dev->dac[0].f_pos + 1) & 1;
+                if (dev->step_synth >= dev->interp_step_synth) {
+                    dev->step_synth = 0;
+                }
 
-            dev->dac[0].curr_samp_ct--;
-            if (dev->dac[0].curr_samp_ct < 0) {
-                dev->int_status |= INT_STATUS_DAC1;
-                es1371_update_irqs(dev);
-                dev->dac[0].curr_samp_ct = dev->dac[0].samp_ct;
+                dev->dac[0].out_l = lerp(dev->dac[0].prev_out_l, dev->dac[0].buffer_l[(dev->dac[0].buffer_pos) & 63], (dev->step_synth + 1) * dev->interp_factor_synth);
+                dev->dac[0].out_r = lerp(dev->dac[0].prev_out_r, dev->dac[0].buffer_r[(dev->dac[0].buffer_pos) & 63], (dev->step_synth + 1) * dev->interp_factor_synth);
+
+                dev->step_synth++;
+                if (dev->step_synth >= dev->interp_step_synth) {
+                    dev->dac[0].prev_out_l = dev->dac[0].out_l;
+                    dev->dac[0].prev_out_r = dev->dac[0].out_r;
+                    dev->dac[0].buffer_pos++;
+                    goto dac0_count;
+                }
+            } else {
+                /* SRC bypass. */
+                if ((dev->dac[0].buffer_pos - dev->dac[0].buffer_pos_end) >= 0)
+                    es137x_fetch(dev, 0);
+
+                dev->dac[0].out_l = dev->dac[0].buffer_l[dev->dac[0].buffer_pos & 63];
+                dev->dac[0].out_r = dev->dac[0].buffer_r[dev->dac[0].buffer_pos & 63];
+                dev->dac[0].buffer_pos++;
+
+                goto dac0_count;
+            }
+        } else {
+            frac    = dev->dac[0].ac & 0x7fff;
+            idx     = dev->dac[0].ac >> 15;
+            samp1_l = dev->dac[0].filtered_l[idx];
+            samp1_r = dev->dac[0].filtered_r[idx];
+            samp2_l = dev->dac[0].filtered_l[(idx + 1) & 31];
+            samp2_r = dev->dac[0].filtered_r[(idx + 1) & 31];
+
+            dev->dac[0].out_l = ((samp1_l * (0x8000 - frac)) + (samp2_l * frac)) >> 15;
+            dev->dac[0].out_r = ((samp1_r * (0x8000 - frac)) + (samp2_r * frac)) >> 15;
+            dev->dac[0].ac += dev->dac[0].vf;
+            dev->dac[0].ac &= ((32 << 15) - 1);
+            if ((dev->dac[0].ac >> (15 + 4)) != dev->dac[0].f_pos) {
+                es137x_next_sample_filtered(dev, 0, dev->dac[0].f_pos ? 16 : 0);
+                dev->dac[0].f_pos = (dev->dac[0].f_pos + 1) & 1;
+
+dac0_count:
+                dev->dac[0].curr_samp_ct--;
+                if (dev->dac[0].curr_samp_ct < 0) {
+                    dev->int_status |= INT_STATUS_DAC1;
+                    es137x_update_irqs(dev);
+                    dev->dac[0].curr_samp_ct = dev->dac[0].samp_ct;
+                }
             }
         }
     }
 
     if (dev->int_ctrl & INT_DAC2_EN) {
-        frac    = dev->dac[1].ac & 0x7fff;
-        idx     = dev->dac[1].ac >> 15;
-        samp1_l = dev->dac[1].filtered_l[idx];
-        samp1_r = dev->dac[1].filtered_r[idx];
-        samp2_l = dev->dac[1].filtered_l[(idx + 1) & 31];
-        samp2_r = dev->dac[1].filtered_r[(idx + 1) & 31];
+        if ((((dev->type == AUDIOPCI_ES1373) || (dev->type == AUDIOPCI_CT5880)) && (dev->int_ctrl & INT_DAC2_BYPASS)) || (dev->type == AUDIOPCI_ES1370)) {
+            if ((dev->calc_sample_rate != 44100) && (dev->type == AUDIOPCI_ES1370)) {
+                if ((dev->dac[1].buffer_pos - dev->dac[1].buffer_pos_end) >= 0 && dev->step_pcm >= dev->interp_step)
+                    es137x_fetch(dev, 1);
 
-        dev->dac[1].out_l = ((samp1_l * (0x8000 - frac)) + (samp2_l * frac)) >> 15;
-        dev->dac[1].out_r = ((samp1_r * (0x8000 - frac)) + (samp2_r * frac)) >> 15;
-        dev->dac[1].ac += dev->dac[1].vf;
-        dev->dac[1].ac &= ((32 << 15) - 1);
-        if ((dev->dac[1].ac >> (15 + 4)) != dev->dac[1].f_pos) {
-            es1371_next_sample_filtered(dev, 1, dev->dac[1].f_pos ? 16 : 0);
-            dev->dac[1].f_pos = (dev->dac[1].f_pos + 1) & 1;
+                if (dev->step_pcm >= dev->interp_step) {
+                    dev->step_pcm = 0;
+                }
 
-            dev->dac[1].curr_samp_ct--;
-            if (dev->dac[1].curr_samp_ct < 0) {
-                dev->int_status |= INT_STATUS_DAC2;
-                es1371_update_irqs(dev);
-                dev->dac[1].curr_samp_ct = dev->dac[1].samp_ct;
+                dev->dac[1].out_l = lerp(dev->dac[1].prev_out_l, dev->dac[1].buffer_l[(dev->dac[1].buffer_pos) & 63], (dev->step_pcm + 1) * dev->interp_factor);
+                dev->dac[1].out_r = lerp(dev->dac[1].prev_out_r, dev->dac[1].buffer_r[(dev->dac[1].buffer_pos) & 63], (dev->step_pcm + 1) * dev->interp_factor);
+
+                dev->step_pcm++;
+                if (dev->step_pcm >= dev->interp_step) {
+                    dev->dac[1].prev_out_l = dev->dac[1].out_l;
+                    dev->dac[1].prev_out_r = dev->dac[1].out_r;
+                    dev->dac[1].buffer_pos++;
+                    goto dac1_count;
+                }
+            } else {
+                /* SRC bypass. */
+                if ((dev->dac[1].buffer_pos - dev->dac[1].buffer_pos_end) >= 0)
+                    es137x_fetch(dev, 1);
+
+                dev->dac[1].out_l = dev->dac[1].buffer_l[dev->dac[1].buffer_pos & 63];
+                dev->dac[1].out_r = dev->dac[1].buffer_r[dev->dac[1].buffer_pos & 63];
+                dev->dac[1].buffer_pos++;
+
+                goto dac1_count;
+            }
+        } else {
+            frac    = dev->dac[1].ac & 0x7fff;
+            idx     = dev->dac[1].ac >> 15;
+            samp1_l = dev->dac[1].filtered_l[idx];
+            samp1_r = dev->dac[1].filtered_r[idx];
+            samp2_l = dev->dac[1].filtered_l[(idx + 1) & 31];
+            samp2_r = dev->dac[1].filtered_r[(idx + 1) & 31];
+
+            dev->dac[1].out_l = ((samp1_l * (0x8000 - frac)) + (samp2_l * frac)) >> 15;
+            dev->dac[1].out_r = ((samp1_r * (0x8000 - frac)) + (samp2_r * frac)) >> 15;
+            dev->dac[1].ac += dev->dac[1].vf;
+            dev->dac[1].ac &= ((32 << 15) - 1);
+            if ((dev->dac[1].ac >> (15 + 4)) != dev->dac[1].f_pos) {
+                es137x_next_sample_filtered(dev, 1, dev->dac[1].f_pos ? 16 : 0);
+                dev->dac[1].f_pos = (dev->dac[1].f_pos + 1) & 1;
+
+dac1_count:
+                dev->dac[1].curr_samp_ct--;
+                if (dev->dac[1].curr_samp_ct < 0) {
+                    dev->int_status |= INT_STATUS_DAC2;
+                    es137x_update_irqs(dev);
+                    dev->dac[1].curr_samp_ct = dev->dac[1].samp_ct;
+                }
             }
         }
     }
 }
 
 static void
-es1371_get_buffer(int32_t *buffer, int len, void *priv)
+es137x_get_buffer(int32_t *buffer, int len, void *priv)
 {
-    es1371_t *dev = (es1371_t *) priv;
+    es137x_t *dev = (es137x_t *) priv;
 
-    es1371_update(dev);
+    es137x_update(dev);
 
     for (int c = 0; c < len * 2; c++)
         buffer[c] += (dev->buffer[c] / 2);
@@ -2004,10 +2550,22 @@ es1371_get_buffer(int32_t *buffer, int len, void *priv)
     dev->pos = 0;
 }
 
+static void
+es1370_filter_cd_audio(int channel, double *buffer, void *priv)
+{
+    const es137x_t *dev       = (es137x_t *) priv;
+    double          c         = 0.0;
+    double          mastervol = ((dev->akm_codec.registers[channel] & 0x80) ? 0 : akm4531_att_2dbstep_5bits[(dev->akm_codec.registers[channel] & 0x1f) ^ 0x1f]) / 32767.0;
+    double          cdvol     = ((dev->akm_codec.registers[channel + 0x6] & 0x80) ? 0 : akm4531_gain_2dbstep_5bits[(dev->akm_codec.registers[channel + 0x6] & 0x1f)]) / 32767.0;
+
+    c       = *buffer * mastervol * cdvol;
+    *buffer = c;
+}
+
 static void
 es1371_filter_cd_audio(int channel, double *buffer, void *priv)
 {
-    const es1371_t *dev = (es1371_t *) priv;
+    const es137x_t *dev = (es137x_t *) priv;
     double          c;
     int             cd     = channel ? dev->cd_vol_r : dev->cd_vol_l;
     int             master = channel ? dev->master_vol_r : dev->master_vol_l;
@@ -2023,49 +2581,49 @@ sinc(double x)
 }
 
 static void
-generate_es1371_filter(void)
+generate_es137x_filter(void)
 {
     /* Cutoff frequency = 1 / 32 */
     float fC = 1.0 / 32.0;
     float gain;
     int   n;
 
-    for (n = 0; n < ES1371_NCoef; n++) {
+    for (n = 0; n < ES137x_NCoef; n++) {
         /* Blackman window */
-        double w = 0.42 - (0.5 * cos((2.0 * n * M_PI) / (double) (ES1371_NCoef - 1))) + (0.08 * cos((4.0 * n * M_PI) / (double) (ES1371_NCoef - 1)));
+        double w = 0.42 - (0.5 * cos((2.0 * n * M_PI) / (double) (ES137x_NCoef - 1))) + (0.08 * cos((4.0 * n * M_PI) / (double) (ES137x_NCoef - 1)));
         /* Sinc filter */
-        double h = sinc(2.0 * fC * ((double) n - ((double) (ES1371_NCoef - 1) / 2.0)));
+        double h = sinc(2.0 * fC * ((double) n - ((double) (ES137x_NCoef - 1) / 2.0)));
 
         /* Create windowed-sinc filter */
-        low_fir_es1371_coef[n] = w * h;
+        low_fir_es137x_coef[n] = w * h;
     }
 
-    low_fir_es1371_coef[(ES1371_NCoef - 1) / 2] = 1.0;
+    low_fir_es137x_coef[(ES137x_NCoef - 1) / 2] = 1.0;
 
     gain = 0.0;
-    for (n = 0; n < ES1371_NCoef; n++)
-        gain += low_fir_es1371_coef[n] / (float) N;
+    for (n = 0; n < ES137x_NCoef; n++)
+        gain += low_fir_es137x_coef[n] / (float) N;
 
     gain /= 0.65;
 
     /* Normalise filter, to produce unity gain */
-    for (n = 0; n < ES1371_NCoef; n++)
-        low_fir_es1371_coef[n] /= gain;
+    for (n = 0; n < ES137x_NCoef; n++)
+        low_fir_es137x_coef[n] /= gain;
 }
 
 static void
-es1371_input_msg(void *priv, uint8_t *msg, uint32_t len)
+es137x_input_msg(void *priv, uint8_t *msg, uint32_t len)
 {
-    es1371_t *dev = (es1371_t *) priv;
+    es137x_t *dev = (es137x_t *) priv;
 
     for (uint32_t i = 0; i < len; i++)
-        es1371_write_fifo(dev, msg[i]);
+        es137x_write_fifo(dev, msg[i]);
 }
 
 static int
-es1371_input_sysex(void *priv, uint8_t *buffer, uint32_t len, int abort)
+es137x_input_sysex(void *priv, uint8_t *buffer, uint32_t len, int abort)
 {
-    es1371_t *dev = (es1371_t *) priv;
+    es137x_t *dev = (es137x_t *) priv;
     uint32_t  i   = -1;
 
     audiopci_log("Abort = %i\n", abort);
@@ -2075,7 +2633,7 @@ es1371_input_sysex(void *priv, uint8_t *buffer, uint32_t len, int abort)
 
     if (!abort) {
         for (i = 0; i < len; i++) {
-            es1371_write_fifo(dev, buffer[i]);
+            es137x_write_fifo(dev, buffer[i]);
             if (dev->uart_status & UART_STATUS_RXRDY)
                 break;
         }
@@ -2086,108 +2644,255 @@ es1371_input_sysex(void *priv, uint8_t *buffer, uint32_t len, int abort)
     return 7 - i;
 }
 
+static void es137x_speed_changed(void *priv);
+
+static void *
+es1370_init(const device_t *info)
+{
+    es137x_t *dev = calloc(1, sizeof(es137x_t));
+    dev->type = info->local;
+
+    if (device_get_config_int("receive_input"))
+        midi_in_handler(1, es137x_input_msg, es137x_input_sysex, dev);
+
+    wavetable_add_handler(es137x_get_buffer, dev);
+    sound_set_cd_audio_filter(es1370_filter_cd_audio, dev);
+
+    dev->gameport = gameport_add(&gameport_pnp_device);
+    gameport_remap(dev->gameport, 0x200);
+
+    pci_add_card((info->local & 1) ? PCI_ADD_SOUND : PCI_ADD_NORMAL, es1370_pci_read, es1370_pci_write, dev, &dev->pci_slot);
+
+    timer_add(&dev->dac[1].timer, es137x_poll, dev, 1);
+
+    generate_es137x_filter();
+
+    dev->dac[0].vol_l = 1 << 12;
+    dev->dac[0].vol_r = 1 << 12;
+    dev->dac[1].vol_l = 1 << 12;
+    dev->dac[1].vol_r = 1 << 12;
+
+    dev->pcm_vol_l    = 1 << 15;
+    dev->pcm_vol_r    = 1 << 15;
+    dev->master_vol_l = 1 << 15;
+    dev->master_vol_r = 1 << 15;
+
+    es137x_reset(dev);
+
+    es137x_speed_changed(dev);
+
+    for (int i = 0; i < 0x20; i++) {
+        double attn                   = (12.0 - (i * 2.0));
+        akm4531_gain_2dbstep_5bits[i] = pow(10, attn / 10.) * 32767.0;
+    }
+
+    return dev;
+}
+
 static void *
 es1371_init(const device_t *info)
 {
-    es1371_t *dev = malloc(sizeof(es1371_t));
-    memset(dev, 0x00, sizeof(es1371_t));
+    es137x_t *dev = calloc(1, sizeof(es137x_t));
+    dev->type = info->local & 0xffffff00;
 
     if (device_get_config_int("receive_input"))
-        midi_in_handler(1, es1371_input_msg, es1371_input_sysex, dev);
+        midi_in_handler(1, es137x_input_msg, es137x_input_sysex, dev);
 
-    sound_add_handler(es1371_get_buffer, dev);
+    sound_add_handler(es137x_get_buffer, dev);
     sound_set_cd_audio_filter(es1371_filter_cd_audio, dev);
 
     dev->gameport = gameport_add(&gameport_pnp_device);
     gameport_remap(dev->gameport, 0x200);
 
-    pci_add_card(info->local ? PCI_ADD_SOUND : PCI_ADD_NORMAL, es1371_pci_read, es1371_pci_write, dev, &dev->pci_slot);
+    pci_add_card((info->local & 1) ? PCI_ADD_SOUND : PCI_ADD_NORMAL, es1371_pci_read, es1371_pci_write, dev, &dev->pci_slot);
 
-    timer_add(&dev->dac[1].timer, es1371_poll, dev, 1);
+    timer_add(&dev->dac[1].timer, es137x_poll, dev, 1);
 
-    generate_es1371_filter();
+    generate_es137x_filter();
 
     ac97_codec       = &dev->codec;
     ac97_codec_count = 1;
     ac97_codec_id    = 0;
     /* Let the machine decide the codec on onboard implementations. */
-    if (!info->local)
+    if (!(info->local & 1))
         device_add(ac97_codec_get(device_get_config_int("codec")));
 
-    es1371_reset(dev);
+    es137x_reset(dev);
 
     return dev;
 }
 
 static void
-es1371_close(void *priv)
+es137x_close(void *priv)
 {
-    es1371_t *dev = (es1371_t *) priv;
+    es137x_t *dev = (es137x_t *) priv;
 
     free(dev);
 }
 
 static void
-es1371_speed_changed(void *priv)
+es137x_speed_changed(void *priv)
 {
-    es1371_t *dev = (es1371_t *) priv;
+    es137x_t *dev = (es137x_t *) priv;
 
-    dev->dac[1].latch = (uint64_t) ((double) TIMER_USEC * (1000000.0 / (double) SOUND_FREQ));
+    dev->dac[1].latch = (uint64_t) ((double) TIMER_USEC * (1000000.0 / (double) ((dev->type == AUDIOPCI_ES1370) ? WT_FREQ : SOUND_FREQ)));
 }
 
-static const device_config_t es1371_config[] = {
-  // clang-format off
+static const device_config_t es1370_config[] = {
+    // clang-format off
     {
-        .name = "codec",
-        .description = "Codec",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "Asahi Kasei AK4540",
-                .value = AC97_CODEC_AK4540
-            },
-            {
-                .description = "TriTech TR28023 / Creative CT1297",
-                .value = AC97_CODEC_TR28023
-            },
-            { .description = "" }
-        },
-        .default_int = AC97_CODEC_TR28023
-    },
-    {
-        .name = "receive_input",
-        .description = "Receive input (MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
-  // clang-format on
+    // clang-format on
+};
+
+static const device_config_t es1371_config[] = {
+    // clang-format off
+    {
+        .name           = "codec",
+        .description    = "Codec",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = AC97_CODEC_TR28023,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Asahi Kasei AK4540",                .value = AC97_CODEC_AK4540  },
+            { .description = "TriTech TR28023 / Creative CT1297", .value = AC97_CODEC_TR28023 },
+            { .description = ""                                                               }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+static const device_config_t es1373_config[] = {
+    // clang-format off
+    {
+        .name           = "codec",
+        .description    = "Codec",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = AC97_CODEC_CS4297A,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Crystal CS4297A",                   .value = AC97_CODEC_CS4297A  },
+            { .description = "SigmaTel STAC9721T",                .value = AC97_CODEC_STAC9721 },
+            { .description = "TriTech TR28023 / Creative CT1297", .value = AC97_CODEC_TR28023  },
+            { .description = "" }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+static const device_config_t ct5880_config[] = {
+    // clang-format off
+    {
+        .name           = "codec",
+        .description    = "Codec",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = AC97_CODEC_STAC9708,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "SigmaTel STAC9708T",                .value = AC97_CODEC_STAC9708 },
+            { .description = "SigmaTel STAC9721T (stereo)",       .value = AC97_CODEC_STAC9721 },
+            { .description = "TriTech TR28023 / Creative CT1297", .value = AC97_CODEC_TR28023  },
+            { .description = ""                                                                }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
 };
 
 static const device_config_t es1371_onboard_config[] = {
-  // clang-format off
+    // clang-format off
     {
-        .name = "receive_input",
-        .description = "Receive input (MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
-  // clang-format on
+    // clang-format on
+};
+
+const device_t es1370_device = {
+    .name          = "Ensoniq AudioPCI (ES1370)",
+    .internal_name = "es1370",
+    .flags         = DEVICE_PCI,
+    .local         = AUDIOPCI_ES1370,
+    .init          = es1370_init,
+    .close         = es137x_close,
+    .reset         = es137x_reset,
+    .available     = NULL,
+    .speed_changed = es137x_speed_changed,
+    .force_redraw  = NULL,
+    .config        = es1370_config
 };
 
 const device_t es1371_device = {
     .name          = "Ensoniq AudioPCI (ES1371)",
     .internal_name = "es1371",
     .flags         = DEVICE_PCI,
-    .local         = 0,
+    .local         = AUDIOPCI_ES1371,
     .init          = es1371_init,
-    .close         = es1371_close,
-    .reset         = es1371_reset,
-    { .available = NULL },
-    .speed_changed = es1371_speed_changed,
+    .close         = es137x_close,
+    .reset         = es137x_reset,
+    .available     = NULL,
+    .speed_changed = es137x_speed_changed,
     .force_redraw  = NULL,
     .config        = es1371_config
 };
@@ -2196,12 +2901,68 @@ const device_t es1371_onboard_device = {
     .name          = "Ensoniq AudioPCI (ES1371) (On-Board)",
     .internal_name = "es1371_onboard",
     .flags         = DEVICE_PCI,
-    .local         = 1,
+    .local         = AUDIOPCI_ES1371 | 1,
     .init          = es1371_init,
-    .close         = es1371_close,
-    .reset         = es1371_reset,
-    { .available = NULL },
-    .speed_changed = es1371_speed_changed,
+    .close         = es137x_close,
+    .reset         = es137x_reset,
+    .available     = NULL,
+    .speed_changed = es137x_speed_changed,
+    .force_redraw  = NULL,
+    .config        = es1371_onboard_config
+};
+
+const device_t es1373_device = {
+    .name          = "Sound Blaster PCI 128 (ES1373)",
+    .internal_name = "es1373",
+    .flags         = DEVICE_PCI,
+    .local         = AUDIOPCI_ES1373,
+    .init          = es1371_init,
+    .close         = es137x_close,
+    .reset         = es137x_reset,
+    .available     = NULL,
+    .speed_changed = es137x_speed_changed,
+    .force_redraw  = NULL,
+    .config        = es1373_config
+};
+
+const device_t es1373_onboard_device = {
+    .name          = "Sound Blaster PCI 128 (ES1373) (On-Board)",
+    .internal_name = "es1373_onboard",
+    .flags         = DEVICE_PCI,
+    .local         = AUDIOPCI_ES1373 | 1,
+    .init          = es1371_init,
+    .close         = es137x_close,
+    .reset         = es137x_reset,
+    .available     = NULL,
+    .speed_changed = es137x_speed_changed,
+    .force_redraw  = NULL,
+    .config        = es1371_onboard_config
+};
+
+const device_t ct5880_device = {
+    .name          = "Sound Blaster PCI 4.1 (CT5880)",
+    .internal_name = "ct5880",
+    .flags         = DEVICE_PCI,
+    .local         = AUDIOPCI_CT5880,
+    .init          = es1371_init,
+    .close         = es137x_close,
+    .reset         = es137x_reset,
+    .available     = NULL,
+    .speed_changed = es137x_speed_changed,
+    .force_redraw  = NULL,
+    .config        = ct5880_config
+};
+
+const device_t ct5880_onboard_device = {
+    .name          = "Sound Blaster PCI 4.1 (CT5880) (On-Board)",
+    .internal_name = "ct5880_onboard",
+    .flags         = DEVICE_PCI,
+    .local         = AUDIOPCI_CT5880 | 1,
+    .init          = es1371_init,
+    .close         = es137x_close,
+    .reset         = es137x_reset,
+    .available     = NULL,
+    .speed_changed = es137x_speed_changed,
     .force_redraw  = NULL,
     .config        = es1371_onboard_config
 };
diff --git a/src/sound/snd_azt2316a.c b/src/sound/snd_azt2316a.c
index 80d668599..76bf1b24f 100644
--- a/src/sound/snd_azt2316a.c
+++ b/src/sound/snd_azt2316a.c
@@ -974,8 +974,7 @@ azt_init(const device_t *info)
     int         loaded_from_eeprom = 0;
     uint16_t    addr_setting;
     uint8_t     read_eeprom[AZTECH_EEPROM_SIZE];
-    azt2316a_t *azt2316a = malloc(sizeof(azt2316a_t));
-    memset(azt2316a, 0, sizeof(azt2316a_t));
+    azt2316a_t *azt2316a = calloc(1, sizeof(azt2316a_t));
 
     azt2316a->type = info->local;
 
@@ -1226,8 +1225,7 @@ azt_init(const device_t *info)
       2x4 to 2x5 -> Mixer interface
       2x6, 2xA, 2xC, 2xE -> DSP chip
       2x8, 2x9, 388 and 389 FM chip (9 voices).*/
-    azt2316a->sb = malloc(sizeof(sb_t));
-    memset(azt2316a->sb, 0, sizeof(sb_t));
+    azt2316a->sb = calloc(1, sizeof(sb_t));
 
     azt2316a->sb->opl_enabled = device_get_config_int("opl");
 
@@ -1237,7 +1235,8 @@ azt_init(const device_t *info)
     if (azt2316a->sb->opl_enabled)
         fm_driver_get(FM_YMF262, &azt2316a->sb->opl);
 
-    sb_dsp_init(&azt2316a->sb->dsp, SBPRO2, azt2316a->type, azt2316a);
+    sb_dsp_set_real_opl(&azt2316a->sb->dsp, 1);
+    sb_dsp_init(&azt2316a->sb->dsp, SBPRO2_DSP_302, azt2316a->type, azt2316a);
     sb_dsp_setaddr(&azt2316a->sb->dsp, azt2316a->cur_addr);
     sb_dsp_setirq(&azt2316a->sb->dsp, azt2316a->cur_irq);
     sb_dsp_setdma8(&azt2316a->sb->dsp, azt2316a->cur_dma);
@@ -1253,11 +1252,12 @@ azt_init(const device_t *info)
 
     azt2316a_create_config_word(azt2316a);
     sound_add_handler(azt2316a_get_buffer, azt2316a);
+    if (azt2316a->sb->opl_enabled)
+        music_add_handler(sb_get_music_buffer_sbpro, azt2316a->sb);
     sound_set_cd_audio_filter(sbpro_filter_cd_audio, azt2316a->sb);
 
     if (azt2316a->cur_mpu401_enabled) {
-        azt2316a->mpu = (mpu_t *) malloc(sizeof(mpu_t));
-        memset(azt2316a->mpu, 0, sizeof(mpu_t));
+        azt2316a->mpu = (mpu_t *) calloc(1, sizeof(mpu_t));
         mpu401_init(azt2316a->mpu, azt2316a->cur_mpu401_addr, azt2316a->cur_mpu401_irq, M_UART, device_get_config_int("receive_input401"));
     } else
         azt2316a->mpu = NULL;
@@ -1315,142 +1315,127 @@ azt_speed_changed(void *priv)
 static const device_config_t azt1605_config[] = {
   // clang-format off
     {
-        .name = "codec",
-        .description = "CODEC",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "CS4248",
-                .value = AD1848_TYPE_CS4248
-            },
-            {
-                .description = "CS4231",
-                .value = AD1848_TYPE_CS4231
-            },
+        .name           = "codec",
+        .description    = "CODEC",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = AD1848_TYPE_CS4248,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "CS4248", .value = AD1848_TYPE_CS4248 },
+            { .description = "CS4231", .value = AD1848_TYPE_CS4231 },
+            { .description = ""                                    }
         },
-        .default_int = AD1848_TYPE_CS4248
+        .bios           = { { 0 } }
     },
     {
-        .name = "wss_interrupt_after_config",
-        .description = "Raise CODEC interrupt on CODEC setup (needed by some drivers)",
-        .type = CONFIG_BINARY,
-        .default_int = 0
+        .name           = "wss_interrupt_after_config",
+        .description    = "Raise CODEC interrupt on CODEC setup (needed by some drivers)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "addr",
-        .description = "SB Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "0x220",
-                .value = 0x220
-            },
-            {
-                .description = "0x240",
-                .value = 0x240
-            },
-            {
-                .description = "Use EEPROM setting",
-                .value = 0
-            },
-            {
-                .description = ""
-            }
-        }
-    },
-    {
-        .name = "sb_dma8",
-        .description = "SB low DMA",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "DMA 0",
-                .value = 0
-            },
-            {
-                .description = "DMA 1",
-                .value = 1
-            },
-            {
-                .description = "DMA 3",
-                .value = 3
-            },
-            {
-                .description = ""
-            }
+        .name           = "addr",
+        .description    = "SB Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x220",              .value = 0x220 },
+            { .description = "0x240",              .value = 0x240 },
+            { .description = "Use EEPROM setting", .value =     0 },
+            { .description = ""                                   }
         },
-        .default_int = 1
+        .bios           = { { 0 } }
     },
     {
-        .name = "wss_irq",
-        .description = "WSS IRQ",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "IRQ 11",
-                .value = 11
-            },
-            {
-                .description = "IRQ 10",
-                .value = 10
-            },
-            {
-                .description = "IRQ 7",
-                .value = 7
-            },
-            {
-                .description = ""
-            }
+        .name           = "sb_dma8",
+        .description    = "SB low DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "DMA 0", .value = 0 },
+            { .description = "DMA 1", .value = 1 },
+            { .description = "DMA 3", .value = 3 },
+            { .description = ""                  }
         },
-        .default_int = 10
+        .bios           = { { 0 } }
     },
-        {
-            .name = "wss_dma",
-            .description = "WSS DMA",
-            .type = CONFIG_SELECTION,
-            .selection = {
-                {
-                    .description = "DMA 0",
-                    .value = 0
-                },
-                {
-                    .description = "DMA 1",
-                    .value = 1
-                },
-                {
-                    .description = "DMA 3",
-                    .value = 3
-                },
-                {
-                    .description = ""
-                }
-            },
-            .default_int = 0
+    {
+        .name           = "wss_irq",
+        .description    = "WSS IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 10,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 11", .value = 11 },
+            { .description = "IRQ 10", .value = 10 },
+            { .description = "IRQ 7",  .value =  7 },
+            { .description = ""                    }
         },
-    {
-        .name = "opl",
-        .description = "Enable OPL",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input (SB MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "wss_dma",
+        .description    = "WSS DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "DMA 0", .value = 0 },
+            { .description = "DMA 1", .value = 1 },
+            { .description = "DMA 3", .value = 3 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input401",
-        .description = "Receive input (MPU-401)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "opl",
+        .description    = "Enable OPL",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "receive_input401",
+        .description    = "Receive MIDI input (MPU-401)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -1459,119 +1444,111 @@ static const device_config_t azt1605_config[] = {
 static const device_config_t azt2316a_config[] = {
   // clang-format off
     {
-        .name = "codec",
-        .description = "CODEC",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "CS4248",
-                .value = AD1848_TYPE_CS4248
-            },
-            {
-                .description = "CS4231",
-                .value = AD1848_TYPE_CS4231
-            },
+        .name           = "codec",
+        .description    = "CODEC",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = AD1848_TYPE_CS4248,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "CS4248", .value = AD1848_TYPE_CS4248 },
+            { .description = "CS4231", .value = AD1848_TYPE_CS4231 },
+            { .description = ""                                    }
         },
-        .default_int = AD1848_TYPE_CS4248
+        .bios           = { { 0 } }
     },
     {
-        .name = "wss_interrupt_after_config",
-        .description = "Raise CODEC interrupt on CODEC setup (needed by some drivers)",
-        .type = CONFIG_BINARY,
-        .default_int = 0
+        .name           = "wss_interrupt_after_config",
+        .description    = "Raise CODEC interrupt on CODEC setup (needed by some drivers)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "addr",
-        .description = "SB Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "0x220",
-                .value = 0x220
-            },
-            {
-                .description = "0x240",
-                .value = 0x240
-            },
-            {
-                .description = "Use EEPROM setting",
-                .value = 0
-            },
-            {
-                .description = ""
-            }
-        }
-    },
-    {
-        .name = "wss_irq",
-        .description = "WSS IRQ",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "IRQ 11",
-                .value = 11
-            },
-            {
-                .description = "IRQ 10",
-                .value = 10
-            },
-            {
-                .description = "IRQ 7",
-                .value = 7
-            },
-            {
-                .description = ""
-            }
+        .name           = "addr",
+        .description    = "SB Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x220",              .value = 0x220 },
+            { .description = "0x240",              .value = 0x240 },
+            { .description = "Use EEPROM setting", .value =     0 },
+            { .description = ""                                   }
         },
-        .default_int = 10
+        .bios           = { { 0 } }
     },
     {
-        .name = "wss_dma",
-        .description = "WSS DMA",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "DMA 0",
-                .value = 0
-            },
-            {
-                .description = "DMA 1",
-                .value = 1
-            },
-            {
-                .description = "DMA 3",
-                .value = 3
-            },
-            {
-                .description = ""
-            }
+        .name           = "wss_irq",
+        .description    = "WSS IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 10,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 11", .value = 11 },
+            { .description = "IRQ 10", .value = 10 },
+            { .description = "IRQ 7",  .value =  7 },
+            { .description = ""                    }
         },
-        .default_int = 0
+        .bios           = { { 0 } }
     },
     {
-        .name = "opl",
-        .description = "Enable OPL",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "wss_dma",
+        .description    = "WSS DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "DMA 0", .value = 0 },
+            { .description = "DMA 1", .value = 1 },
+            { .description = "DMA 3", .value = 3 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input (SB MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "opl",
+        .description    = "Enable OPL",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input401",
-        .description = "Receive input (MPU-401)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "receive_input401",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -1580,12 +1557,12 @@ static const device_config_t azt2316a_config[] = {
 const device_t azt2316a_device = {
     .name          = "Aztech Sound Galaxy Pro 16 AB (Washington)",
     .internal_name = "azt2316a",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = SB_SUBTYPE_CLONE_AZT2316A_0X11,
     .init          = azt_init,
     .close         = azt_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = azt_speed_changed,
     .force_redraw  = NULL,
     .config        = azt2316a_config
@@ -1594,12 +1571,12 @@ const device_t azt2316a_device = {
 const device_t azt1605_device = {
     .name          = "Aztech Sound Galaxy Nova 16 Extra (Clinton)",
     .internal_name = "azt1605",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = SB_SUBTYPE_CLONE_AZT1605_0X0C,
     .init          = azt_init,
     .close         = azt_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = azt_speed_changed,
     .force_redraw  = NULL,
     .config        = azt1605_config
diff --git a/src/sound/snd_cmi8x38.c b/src/sound/snd_cmi8x38.c
index 359563b99..a41f53865 100644
--- a/src/sound/snd_cmi8x38.c
+++ b/src/sound/snd_cmi8x38.c
@@ -497,7 +497,7 @@ cmi8x38_sb_mixer_write(uint16_t addr, uint8_t val, void *priv)
         /* Set TDMA channels if auto-detection is enabled. */
         if ((dev->io_regs[0x27] & 0x01) && (mixer->index == 0x81)) {
             dev->tdma_8 = dev->sb->dsp.sb_8_dmanum;
-            if (dev->sb->dsp.sb_type >= SB16)
+            if (dev->sb->dsp.sb_type >= SB16_DSP_404)
                 dev->tdma_16 = dev->sb->dsp.sb_16_dmanum;
         }
     } else {
@@ -706,11 +706,11 @@ cmi8x38_write(uint16_t addr, uint8_t val, void *priv)
 
         case 0x02:
             /* Reset or start DMA channels if requested. */
-            dev->io_regs[addr] = val & 0x03;
+            dev->io_regs[addr] = val & 0x0f;
             for (int i = 0; i < (sizeof(dev->dma) / sizeof(dev->dma[0])); i++) {
                 if (val & (0x04 << i)) {
                     /* Reset DMA channel. */
-                    val &= ~(0x01 << i);
+                    dev->io_regs[addr] &= ~(0x01 << i); /* clear enable */
                     dev->io_regs[0x10] &= ~(0x01 << i); /* clear interrupt */
 
                     /* Reset Sound Blaster as well when resetting channel 0. */
@@ -724,15 +724,11 @@ cmi8x38_write(uint16_t addr, uint8_t val, void *priv)
                 }
             }
 
-            /* Clear reset bits. */
-            val &= 0x03;
-
             /* Start playback along with DMA channels. */
-            if (val & 0x03)
+            if (dev->io_regs[addr] & 0x03)
                 cmi8x38_start_playback(dev);
 
             /* Update interrupts. */
-            dev->io_regs[addr] = val;
             cmi8x38_update_irqs(dev);
             break;
 
@@ -864,7 +860,7 @@ cmi8x38_write(uint16_t addr, uint8_t val, void *priv)
 
         case 0x1b:
             if (dev->type == CMEDIA_CMI8338)
-                val &= 0xf0;
+                val &= 0xf4; /* bit 2 reserved, mpxplay driver expects writable */
             else
                 val &= 0xd7;
             break;
@@ -883,7 +879,7 @@ cmi8x38_write(uint16_t addr, uint8_t val, void *priv)
             dev->sb->dsp.sbleftright_default = !!(val & 0x02);
 
             /* Enable or disable SB16 mode. */
-            dev->sb->dsp.sb_type = (val & 0x01) ? SBPRO2 : SB16;
+            dev->sb->dsp.sb_type = (val & 0x01) ? SBPRO2_DSP_302 : SB16_DSP_405;
             break;
 
         case 0x22:
@@ -913,6 +909,24 @@ cmi8x38_write(uint16_t addr, uint8_t val, void *priv)
                 dev->sb->opl.write(addr, val, dev->sb->opl.priv);
             return;
 
+        case 0x80 ... 0x83:
+        case 0x88 ... 0x8b:
+            dev->io_regs[addr]                      = val;
+            dev->dma[(addr & 0x78) >> 3].sample_ptr = *((uint32_t *) &dev->io_regs[addr & 0xfc]);
+            return;
+
+        case 0x84 ... 0x85:
+        case 0x8c ... 0x8d:
+            dev->io_regs[addr]                           = val;
+            dev->dma[(addr & 0x78) >> 3].frame_count_dma = dev->dma[(addr & 0x78) >> 3].sample_count_out = *((uint16_t *) &dev->io_regs[addr & 0xfe]) + 1;
+            return;
+
+        case 0x86 ... 0x87:
+        case 0x8e ... 0x8f:
+            dev->io_regs[addr]                                = val;
+            dev->dma[(addr & 0x78) >> 3].frame_count_fragment = *((uint16_t *) &dev->io_regs[addr & 0xfe]) + 1;
+            return;
+
         case 0x92:
             if (dev->type == CMEDIA_CMI8338)
                 return;
@@ -931,7 +945,6 @@ cmi8x38_write(uint16_t addr, uint8_t val, void *priv)
         case 0x26:
         case 0x70:
         case 0x71:
-        case 0x80 ... 0x8f:
             break;
 
         default:
@@ -1421,8 +1434,7 @@ cmi8x38_reset(void *priv)
 static void *
 cmi8x38_init(const device_t *info)
 {
-    cmi8x38_t *dev = malloc(sizeof(cmi8x38_t));
-    memset(dev, 0, sizeof(cmi8x38_t));
+    cmi8x38_t *dev = calloc(1, sizeof(cmi8x38_t));
 
     /* Set the chip type. */
     if ((info->local == CMEDIA_CMI8738_6CH) && !device_get_config_int("six_channel"))
@@ -1496,11 +1508,15 @@ cmi8x38_close(void *priv)
 static const device_config_t cmi8x38_config[] = {
   // clang-format off
     {
-        .name = "receive_input",
-        .description = "Receive input (MPU-401)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -1509,18 +1525,26 @@ static const device_config_t cmi8x38_config[] = {
 static const device_config_t cmi8738_config[] = {
   // clang-format off
     {
-        .name = "six_channel",
-        .description = "6CH variant (6-channel)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "six_channel",
+        .description    = "6CH variant (6-channel)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input (MPU-401)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -1534,7 +1558,7 @@ const device_t cmi8338_device = {
     .init          = cmi8x38_init,
     .close         = cmi8x38_close,
     .reset         = cmi8x38_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = cmi8x38_speed_changed,
     .force_redraw  = NULL,
     .config        = cmi8x38_config
@@ -1548,7 +1572,7 @@ const device_t cmi8338_onboard_device = {
     .init          = cmi8x38_init,
     .close         = cmi8x38_close,
     .reset         = cmi8x38_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = cmi8x38_speed_changed,
     .force_redraw  = NULL,
     .config        = cmi8x38_config
@@ -1562,7 +1586,7 @@ const device_t cmi8738_device = {
     .init          = cmi8x38_init,
     .close         = cmi8x38_close,
     .reset         = cmi8x38_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = cmi8x38_speed_changed,
     .force_redraw  = NULL,
     .config        = cmi8738_config
@@ -1576,7 +1600,7 @@ const device_t cmi8738_onboard_device = {
     .init          = cmi8x38_init,
     .close         = cmi8x38_close,
     .reset         = cmi8x38_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = cmi8x38_speed_changed,
     .force_redraw  = NULL,
     .config        = cmi8x38_config
@@ -1590,7 +1614,7 @@ const device_t cmi8738_6ch_onboard_device = {
     .init          = cmi8x38_init,
     .close         = cmi8x38_close,
     .reset         = cmi8x38_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = cmi8x38_speed_changed,
     .force_redraw  = NULL,
     .config        = cmi8x38_config
diff --git a/src/sound/snd_cms.c b/src/sound/snd_cms.c
index d33eba83a..66dff80f3 100644
--- a/src/sound/snd_cms.c
+++ b/src/sound/snd_cms.c
@@ -95,15 +95,15 @@ cms_write(uint16_t addr, uint8_t val, void *priv)
     int    chip = (addr & 2) >> 1;
 
     switch (addr & 0xf) {
-        case 1:
+        case 0x1: /* SAA #1 Register Select Port */
             cms->addrs[0] = val & 31;
             break;
-        case 3:
+        case 0x3: /* SAA #2 Register Select Port */
             cms->addrs[1] = val & 31;
             break;
 
-        case 0:
-        case 2:
+        case 0x0: /* SAA #1 Data Port */
+        case 0x2: /* SAA #2 Data Port */
             cms_update(cms);
             cms->regs[chip][cms->addrs[chip] & 31] = val;
             switch (cms->addrs[chip] & 31) {
@@ -145,8 +145,9 @@ cms_write(uint16_t addr, uint8_t val, void *priv)
                     break;
             }
             break;
-        case 0x6:
-        case 0x7:
+
+        case 0x6: /* GameBlaster Write Port */
+        case 0x7: /* GameBlaster Write Port */
             cms->latched_data = val;
             break;
 
@@ -161,14 +162,14 @@ cms_read(uint16_t addr, void *priv)
     const cms_t *cms = (cms_t *) priv;
 
     switch (addr & 0xf) {
-        case 0x1:
+        case 0x1: /* SAA #1 Register Select Port */
             return cms->addrs[0];
-        case 0x3:
+        case 0x3: /* SAA #2 Register Select Port */
             return cms->addrs[1];
-        case 0x4:
+        case 0x4: /* GameBlaster Read port (Always returns 0x7F) */
             return 0x7f;
-        case 0xa:
-        case 0xb:
+        case 0xa: /* GameBlaster Read Port */
+        case 0xb: /* GameBlaster Read Port */
             return cms->latched_data;
 
         default:
@@ -180,8 +181,7 @@ cms_read(uint16_t addr, void *priv)
 void *
 cms_init(UNUSED(const device_t *info))
 {
-    cms_t *cms = malloc(sizeof(cms_t));
-    memset(cms, 0, sizeof(cms_t));
+    cms_t *cms = calloc(1, sizeof(cms_t));
 
     uint16_t addr = device_get_config_hex16("base");
     io_sethandler(addr, 0x0010, cms_read, NULL, NULL, cms_write, NULL, NULL, cms);
@@ -200,42 +200,23 @@ cms_close(void *priv)
 static const device_config_t cms_config[] = {
   // clang-format off
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x220,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "0x210",
-                .value = 0x210
-            },
-            {
-                .description = "0x220",
-                .value = 0x220
-            },
-            {
-                .description = "0x230",
-                .value = 0x230
-            },
-            {
-                .description = "0x240",
-                .value = 0x240
-            },
-            {
-                .description = "0x250",
-                .value = 0x250
-            },
-            {
-                .description = "0x260",
-                .value = 0x260
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x220,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x210", .value = 0x210 },
+            { .description = "0x220", .value = 0x220 },
+            { .description = "0x230", .value = 0x230 },
+            { .description = "0x240", .value = 0x240 },
+            { .description = "0x250", .value = 0x250 },
+            { .description = "0x260", .value = 0x260 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -249,7 +230,7 @@ const device_t cms_device = {
     .init          = cms_init,
     .close         = cms_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = cms_config
diff --git a/src/sound/snd_covox.c b/src/sound/snd_covox.c
new file mode 100644
index 000000000..c7e32c7dc
--- /dev/null
+++ b/src/sound/snd_covox.c
@@ -0,0 +1,475 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Rainbow Arts PC-Soundman Emulation
+ *
+ * Authors: Jasmine Iwanek, <jriwanek@gmail.com>
+ *
+ *          Copyright 2025 Jasmine Iwanek.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#define HAVE_STDARG_H
+
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/mca.h>
+#include <86box/sound.h>
+#include <86box/filters.h>
+#include <86box/timer.h>
+#include <86box/snd_opl.h>
+#include <86box/plat_fallthrough.h>
+#include <86box/plat_unused.h>
+
+#define  COVOX_SOUNDMAN        0
+#define  COVOX_VOICEMASTERKEY  1
+#define  COVOX_SOUNDMASTERPLUS 2
+#define  COVOX_ISADACR0        3
+#define  COVOX_ISADACR1        4
+
+#ifdef ENABLE_COVOX_LOG
+int covox_do_log = ENABLE_COVOX_LOG;
+
+static void
+covox_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (covox_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define covox_log(fmt, ...)
+#endif
+
+typedef struct covox_s {
+    fm_drv_t opl;
+
+    uint8_t  dac_val;
+
+    int16_t  buffer[2][SOUNDBUFLEN];
+    int      pos;
+} covox_t;
+
+// TODO: Can this be rolled into covox_get_buffer?
+static void
+covox_update(covox_t *covox)
+{
+    for (; covox->pos < sound_pos_global; covox->pos++) {
+        covox->buffer[0][covox->pos] = (int8_t) (covox->dac_val ^ 0x80) * 0x40;
+        covox->buffer[1][covox->pos] = (int8_t) (covox->dac_val ^ 0x80) * 0x40;
+    }
+}
+
+uint8_t
+covox_read(uint16_t addr, void *priv)
+{
+#if 0
+    const covox_t *covox = (covox_t *) priv;
+#endif
+
+    covox_log("covox_read: addr=%04x\n", addr);
+
+    return 0xff;
+}
+
+void
+covox_write(uint16_t addr, uint8_t val, void *priv)
+{
+    covox_t *covox = (covox_t *) priv;
+
+    covox_log("covox_write: addr=%04x val=%02x\n", addr, val);
+
+    switch (addr) {
+        case 0x221: // Soundman
+        case 0x229: // Soundman
+        case 0x22f: // Soundman, voicemasterkey soundmasterplus
+        case 0x231: //                                           isadac-r1?
+        case 0x24f: //           voicemasterkey soundmasterplus
+        case 0x279: //                                           isadac-r0 (lPT2)
+        case 0x28f: //           voicemasterkey
+        case 0x2cf: //           voicemasterkey
+        case 0x301: // Soundman
+        case 0x309: // Soundman
+        case 0x30f: // soundman
+        case 0x331: //
+        case 0x339: //
+        case 0x371: //                                           isadac-r0
+        case 0x379: //                                           isadac-r0 (lPT1)
+        case 0x381: //                                           isadac-r0
+        case 0x3bd: //                                           isadac-r0 (lPT1-Mono)
+            covox->dac_val = val;
+            // TODO: Is this needed here?
+            covox_update(covox);
+            break;
+
+        default:
+            break;
+    }
+}
+
+static void
+covox_get_buffer(int32_t *buffer, int len, void *priv)
+{
+    covox_t *covox = (covox_t *) priv;
+
+    covox_update(covox);
+
+    for (int c = 0; c < len; c++) {
+        buffer[c * 2]     += dac_iir(0, covox->buffer[0][c]);
+        buffer[c * 2 + 1] += dac_iir(1, covox->buffer[1][c]);
+    }
+    covox->pos = 0;
+}
+
+static void
+covox_get_music_buffer(int32_t *buffer, int len, void *priv)
+{
+    covox_t *covox = (covox_t *) priv;
+
+    const int32_t *opl_buf = covox->opl.update(covox->opl.priv);
+
+    for (int c = 0; c < len * 2; c++)
+        buffer[c] += opl_buf[c];
+
+    if (covox->opl.reset_buffer)
+        covox->opl.reset_buffer(covox->opl.priv);
+}
+
+#define IO_SETHANDLER_COVOX_DAC(addr, len) \
+    io_sethandler((addr), (len),           \
+                  covox_read, NULL, NULL,  \
+                  covox_write, NULL, NULL, \
+                  covox)
+
+#define IO_SETHANDLER_COVOX_ADLIB(addr, len)    \
+    io_sethandler((addr), (len),                \
+                  covox->opl.read, NULL, NULL,  \
+                  covox->opl.write, NULL, NULL, \
+                  covox->opl.priv)
+
+void *
+covox_init(UNUSED(const device_t *info))
+{
+    covox_t *covox         = calloc(1, sizeof(covox_t));
+    uint8_t  has_adlib     = 0;
+    uint8_t  has_stereo    = 0;
+    uint8_t  fixed_address = 0;
+    if (!covox)
+        return NULL;
+
+    covox_log("covox_init\n");
+    switch (info->local) {
+        case COVOX_SOUNDMAN:
+            fixed_address = 1;
+            fallthrough;
+        case COVOX_SOUNDMASTERPLUS:
+            has_adlib = 1;
+            break;
+
+        case COVOX_ISADACR0:
+            has_stereo = 1;
+            break;
+
+        case COVOX_ISADACR1:
+            has_stereo = 2;
+            break;
+
+        default:
+            break;
+    }
+
+    if (fixed_address) {
+        IO_SETHANDLER_COVOX_DAC(0x220, 0x0002);
+        IO_SETHANDLER_COVOX_DAC(0x228, 0x0002);
+        IO_SETHANDLER_COVOX_DAC(0x22e, 0x0002);
+#if 0
+        // According to vgmpf, this is the address
+        IO_SETHANDLER_COVOX_DAC(0x22f, 0x0001);
+#endif
+        IO_SETHANDLER_COVOX_DAC(0x300, 0x0002);
+        IO_SETHANDLER_COVOX_DAC(0x308, 0x0002);
+        IO_SETHANDLER_COVOX_DAC(0x30e, 0x0002);
+    } else {
+        IO_SETHANDLER_COVOX_DAC(device_get_config_hex16("base"), 0x0002);
+
+        // TODO: Needs more work
+        if (has_stereo)
+            IO_SETHANDLER_COVOX_DAC(device_get_config_hex16("base2"), 0x0002);
+    }
+    sound_add_handler(covox_get_buffer, covox);
+
+    if (has_adlib) {
+        fm_driver_get(FM_YM3812, &covox->opl);
+        if (fixed_address) {
+            // Adlib Clone part
+            IO_SETHANDLER_COVOX_ADLIB(0x380, 0x0002);
+            IO_SETHANDLER_COVOX_ADLIB(0x388, 0x0002);
+            IO_SETHANDLER_COVOX_ADLIB(0x38e, 0x0002);
+        } else
+            IO_SETHANDLER_COVOX_ADLIB(device_get_config_hex16("adlibbase"), 0x0002);
+
+        music_add_handler(covox_get_music_buffer, covox);
+    }
+
+    return covox;
+}
+
+void
+covox_close(void *priv)
+{
+    covox_t *covox = (covox_t *) priv;
+
+    if (covox)
+        free(covox);
+}
+
+// clang-format off
+static const device_config_t voicemasterkey_config[] = {
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x388,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x22f", .value = 0x22f },
+            { .description = "0x24f", .value = 0x24f },
+            { .description = "0x28f", .value = 0x28f },
+            { .description = "0x2cf", .value = 0x2cf },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+// clang-format on
+
+// Note: We don't support sound input on this yet
+const device_t voicemasterkey_device = {
+    .name          = "Covox Voice Master Key",
+    .internal_name = "voicemasterkey",
+    .flags         = DEVICE_ISA | DEVICE_SIDECAR,
+    .local         = COVOX_VOICEMASTERKEY,
+    .init          = covox_init,
+    .close         = covox_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = voicemasterkey_config
+};
+
+// clang-format off
+static const device_config_t soundmasterplus_config[] = {
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x22e,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x22e", .value = 0x22e },
+            { .description = "0x24e", .value = 0x24e },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "adlibbase",
+        .description    = "Adlib Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x388,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x388", .value = 0x388 },
+            { .description = "0x380", .value = 0x380 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+// clang-format on
+
+const device_t soundmasterplus_device = {
+    .name          = "Covox Sound Master Plus",
+    .internal_name = "soundmasterplus",
+    .flags         = DEVICE_ISA | DEVICE_SIDECAR,
+    .local         = COVOX_SOUNDMASTERPLUS,
+    .init          = covox_init,
+    .close         = covox_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = soundmasterplus_config
+};
+
+// clang-format off
+static const device_config_t isadacr0_config[] = {
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x380,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x220", .value = 0x220 },
+            { .description = "0x228", .value = 0x228 },
+            { .description = "0x22e", .value = 0x22e },
+            { .description = "0x230", .value = 0x230 },
+            { .description = "0x24e", .value = 0x24e },
+            { .description = "0x278", .value = 0x278 },
+            { .description = "0x28e", .value = 0x28e },
+            { .description = "0x2ce", .value = 0x2ce },
+            { .description = "0x300", .value = 0x300 },
+            { .description = "0x308", .value = 0x308 },
+            { .description = "0x303", .value = 0x30e },
+            { .description = "0x330", .value = 0x330 },
+            { .description = "0x338", .value = 0x338 },
+            { .description = "0x370", .value = 0x370 },
+            { .description = "0x378", .value = 0x378 },
+            { .description = "0x380", .value = 0x380 },
+            { .description = "0x3bc", .value = 0x3bc },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "base2",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x370,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x220", .value = 0x220 },
+            { .description = "0x228", .value = 0x228 },
+            { .description = "0x22e", .value = 0x22e },
+            { .description = "0x230", .value = 0x230 },
+            { .description = "0x24e", .value = 0x24e },
+            { .description = "0x278", .value = 0x278 },
+            { .description = "0x28e", .value = 0x28e },
+            { .description = "0x2ce", .value = 0x2ce },
+            { .description = "0x300", .value = 0x300 },
+            { .description = "0x308", .value = 0x308 },
+            { .description = "0x303", .value = 0x30e },
+            { .description = "0x330", .value = 0x330 },
+            { .description = "0x338", .value = 0x338 },
+            { .description = "0x370", .value = 0x370 },
+            { .description = "0x378", .value = 0x378 },
+            { .description = "0x380", .value = 0x380 },
+            { .description = "0x3bc", .value = 0x3bc },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+// clang-format on
+
+// Note: We don't support stereo on this yet
+const device_t isadacr0_device = {
+    .name          = "ISA DAC-r0",
+    .internal_name = "isadacr0",
+    .flags         = DEVICE_ISA | DEVICE_SIDECAR,
+    .local         = COVOX_ISADACR0,
+    .init          = covox_init,
+    .close         = covox_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = isadacr0_config
+};
+
+// clang-format off
+static const device_config_t isadacr1_config[] = {
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x378,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x378", .value = 0x378 },
+            { .description = "0x3bc", .value = 0x3bc },
+            { .description = "0x278", .value = 0x278 },
+            { .description = "0x230", .value = 0x230 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "base2",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x278,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x378", .value = 0x378 },
+            { .description = "0x3bc", .value = 0x3bc },
+            { .description = "0x278", .value = 0x278 },
+            { .description = "0x230", .value = 0x230 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+// clang-format on
+
+// Note: We don't support stereo on this yet
+const device_t isadacr1_device = {
+    .name          = "ISA DAC-r1",
+    .internal_name = "isadacr1",
+    .flags         = DEVICE_ISA | DEVICE_SIDECAR,
+    .local         = COVOX_ISADACR1,
+    .init          = covox_init,
+    .close         = covox_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = isadacr1_config
+};
+
+const device_t soundman_device = {
+    .name          = "Rainbow Arts PC-Soundman",
+    .internal_name = "soundman",
+    .flags         = DEVICE_ISA | DEVICE_SIDECAR,
+    .local         = COVOX_SOUNDMAN,
+    .init          = covox_init,
+    .close         = covox_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/sound/snd_cs423x.c b/src/sound/snd_cs423x.c
index fad1d76b9..74382a53b 100644
--- a/src/sound/snd_cs423x.c
+++ b/src/sound/snd_cs423x.c
@@ -12,15 +12,16 @@
  *
  * Authors:  RichardG, <richardg867@gmail.com>
  *
- *           Copyright 2021-2022 RichardG.
+ *           Copyright 2021-2025 RichardG.
  */
 #include <math.h>
+#include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-
+#define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/device.h>
 #include <86box/dma.h>
@@ -30,7 +31,9 @@
 #include <86box/isapnp.h>
 #include <86box/midi.h>
 #include <86box/timer.h>
+#include <86box/mem.h>
 #include <86box/nvr.h>
+#include <86box/rom.h>
 #include <86box/pic.h>
 #include <86box/sound.h>
 #include <86box/snd_ad1848.h>
@@ -39,13 +42,24 @@
 #include <86box/plat_fallthrough.h>
 #include <86box/plat_unused.h>
 
+#define PNP_ROM_CS4236B      "roms/sound/crystal/PNPISA01.BIN"
+
 #define CRYSTAL_NOEEPROM 0x100
 
 enum {
-    CRYSTAL_CS4235  = 0xdd,
-    CRYSTAL_CS4236B = 0xcb,
+    CRYSTAL_CS4232  = 0x32, /* no chip ID; dummy value */
+    CRYSTAL_CS4236  = 0x36, /* no chip ID; dummy value */
+    CRYSTAL_CS4236B = 0xab, /* report an older revision ID to make the values nice and incremental */
     CRYSTAL_CS4237B = 0xc8,
-    CRYSTAL_CS4238B = 0xc9
+    CRYSTAL_CS4238B = 0xc9,
+    CRYSTAL_CS4235  = 0xdd,
+    CRYSTAL_CS4239  = 0xde
+};
+enum {
+    CRYSTAL_RAM_CMD     = 0,
+    CRYSTAL_RAM_ADDR_LO = 1,
+    CRYSTAL_RAM_ADDR_HI = 2,
+    CRYSTAL_RAM_DATA    = 3
 };
 enum {
     CRYSTAL_SLAM_NONE  = 0,
@@ -54,79 +68,43 @@ enum {
     CRYSTAL_SLAM_BYTE2 = 3
 };
 
+#ifdef ENABLE_CS423X_LOG
+int cs423x_do_log = ENABLE_CS423X_LOG;
+
+static void
+cs423x_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (cs423x_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define cs423x_log(fmt, ...)
+#endif
+
 static const uint8_t slam_init_key[32] = { 0x96, 0x35, 0x9A, 0xCD, 0xE6, 0xF3, 0x79, 0xBC,
                                            0x5E, 0xAF, 0x57, 0x2B, 0x15, 0x8A, 0xC5, 0xE2,
                                            0xF1, 0xF8, 0x7C, 0x3E, 0x9F, 0x4F, 0x27, 0x13,
                                            0x09, 0x84, 0x42, 0xA1, 0xD0, 0x68, 0x34, 0x1A };
-static const uint8_t cs4236b_eeprom[]  = {
+static const uint8_t cs4236_default[] = {
     // clang-format off
     /* Chip configuration */
-    0x55, 0xbb, /* magic */
-    0x00, 0x00, /* length */
     0x00, 0x03, /* CD-ROM and modem decode */
     0x80, /* misc. config */
     0x80, /* global config */
-    0x0b, /* chip ID */
+    0x0b, /* [code base byte (CS4236B+)] / reserved (CS4236) */
     0x20, 0x04, 0x08, 0x10, 0x80, 0x00, 0x00, /* reserved */
     0x00, /* external decode length */
     0x48, /* reserved */
     0x75, 0xb9, 0xfc, /* IRQ routing */
     0x10, 0x03, /* DMA routing */
 
-    /* PnP resources */
-    0x0e, 0x63, 0x42, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00, /* CSC4236, dummy checksum (filled in by isapnp_add_card) */
-    0x0a, 0x10, 0x01, /* PnP version 1.0, vendor version 0.1 */
-    0x82, 0x0e, 0x00, 'C', 'r', 'y', 's', 't', 'a', 'l', ' ', 'C', 'o', 'd', 'e' ,'c', 0x00, /* ANSI identifier */
-
-    0x15, 0x0e, 0x63, 0x00, 0x00, 0x00, /* logical device CSC0000 */
-    0x82, 0x07, 0x00, 'W', 'S', 'S', '/', 'S', 'B', 0x00, /* ANSI identifier */
-    0x31, 0x00, /* start dependent functions, preferred */
-        0x2a, 0x02, 0x28, /* DMA 1, type A, no count by word, count by byte, not bus master, 8-bit only */
-        0x2a, 0x09, 0x28, /* DMA 0/3, type A, no count by word, count by byte, not bus master, 8-bit only */
-        0x22, 0x20, 0x00, /* IRQ 5 */
-        0x47, 0x01, 0x34, 0x05, 0x34, 0x05, 0x04, 0x04, /* I/O 0x534, decodes 16-bit, 4-byte alignment, 4 addresses */
-        0x47, 0x01, 0x88, 0x03, 0x88, 0x03, 0x08, 0x04, /* I/O 0x388, decodes 16-bit, 8-byte alignment, 4 addresses */
-        0x47, 0x01, 0x20, 0x02, 0x20, 0x02, 0x20, 0x10, /* I/O 0x220, decodes 16-bit, 32-byte alignment, 16 addresses */
-    0x31, 0x01, /* start dependent functions, acceptable */
-        0x2a, 0x0a, 0x28, /* DMA 1/3, type A, no count by word, count by byte, not bus master, 8-bit only */
-        0x2a, 0x0b, 0x28, /* DMA 0/1/3, type A, no count by word, count by byte, not bus master, 8-bit only */
-        0x22, 0xa0, 0x9a, /* IRQ 5/7/9/11/12/15 */
-        0x47, 0x01, 0x34, 0x05, 0xfc, 0x0f, 0x04, 0x04, /* I/O 0x534-0xFFC, decodes 16-bit, 4-byte alignment, 4 addresses */
-        0x47, 0x01, 0x88, 0x03, 0x88, 0x03, 0x08, 0x04, /* I/O 0x388, decodes 16-bit, 8-byte alignment, 4 addresses */
-        0x47, 0x01, 0x20, 0x02, 0x60, 0x02, 0x20, 0x10, /* I/O 0x220-0x260, decodes 16-bit, 32-byte alignment, 16 addresses */
-    0x31, 0x02, /* start dependent functions, sub-optimal */
-        0x2a, 0x0b, 0x28, /* DMA 0/1/3, type A, no count by word, count by byte, not bus master, 8-bit only */
-        0x22, 0xa0, 0x9a, /* IRQ 5/7/9/11/12/15 */
-        0x47, 0x01, 0x34, 0x05, 0xfc, 0x0f, 0x04, 0x04, /* I/O 0x534-0xFFC, decodes 16-bit, 4-byte alignment, 4 addresses */
-        0x47, 0x01, 0x88, 0x03, 0xf8, 0x03, 0x08, 0x04, /* I/O 0x388-0x3F8, decodes 16-bit, 8-byte alignment, 4 addresses */
-        0x47, 0x01, 0x20, 0x02, 0x00, 0x03, 0x20, 0x10, /* I/O 0x220-0x300, decodes 16-bit, 32-byte alignment, 16 addresses */
-    0x38, /* end dependent functions */
-
-    0x15, 0x0e, 0x63, 0x00, 0x01, 0x00, /* logical device CSC0001 */
-    0x82, 0x05, 0x00, 'G', 'A', 'M', 'E', 0x00, /* ANSI identifier */
-    0x31, 0x00, /* start dependent functions, preferred */
-        0x47, 0x01, 0x00, 0x02, 0x00, 0x02, 0x08, 0x08, /* I/O 0x200, decodes 16-bit, 8-byte alignment, 8 addresses */
-    0x31, 0x01, /* start dependent functions, acceptable */
-        0x47, 0x01, 0x08, 0x02, 0x08, 0x02, 0x08, 0x08, /* I/O 0x208, decodes 16-bit, 8-byte alignment, 8 addresses */
-    0x38, /* end dependent functions */
-
-    0x15, 0x0e, 0x63, 0x00, 0x10, 0x00, /* logical device CSC0010 */
-    0x82, 0x05, 0x00, 'C', 'T', 'R', 'L', 0x00, /* ANSI identifier */
-    0x47, 0x01, 0x20, 0x01, 0xf8, 0x0f, 0x08, 0x08, /* I/O 0x120-0xFF8, decodes 16-bit, 8-byte alignment, 8 addresses */
-
-    0x15, 0x0e, 0x63, 0x00, 0x03, 0x00, /* logical device CSC0003 */
-    0x82, 0x04, 0x00, 'M', 'P', 'U', 0x00, /* ANSI identifier */
-    0x31, 0x00, /* start dependent functions, preferred */
-        0x22, 0x00, 0x02, /* IRQ 9 */
-        0x47, 0x01, 0x30, 0x03, 0x30, 0x03, 0x08, 0x02, /* I/O 0x330, decodes 16-bit, 8-byte alignment, 2 addresses */
-    0x31, 0x01, /* start dependent functions, acceptable */
-        0x22, 0x00, 0x9a, /* IRQ 9/11/12/15 */
-        0x47, 0x01, 0x30, 0x03, 0x60, 0x03, 0x08, 0x02, /* I/O 0x330-0x360, decodes 16-bit, 8-byte alignment, 2 addresses */
-    0x31, 0x02, /* start dependent functions, sub-optimal */
-        0x47, 0x01, 0x30, 0x03, 0xe0, 0x03, 0x08, 0x02, /* I/O 0x330-0x3E0, decodes 16-bit, 8-byte alignment, 2 addresses */
-    0x38, /* end dependent functions */
-
-    0x79, 0x00 /* end tag, dummy checksum (filled in by isapnp_add_card) */
+    /* Default PnP data */
+    0x0e, 0x63, 0x42, 0x36, 0xff, 0xff, 0xff, 0xff, 0x00 /* hinted by documentation to be just the header */
     // clang-format on
 };
 
@@ -145,6 +123,7 @@ typedef struct cs423x_t {
     uint16_t ram_addr;
     uint16_t eeprom_size : 11;
     uint16_t pnp_offset;
+    uint16_t pnp_size;
     uint8_t  type;
     uint8_t  ad1848_type;
     uint8_t  regs[8];
@@ -165,8 +144,10 @@ typedef struct cs423x_t {
 } cs423x_t;
 
 static void cs423x_slam_enable(cs423x_t *dev, uint8_t enable);
+static void cs423x_ctxswitch_write(uint16_t addr, UNUSED(uint8_t val), void *priv);
 static void cs423x_pnp_enable(cs423x_t *dev, uint8_t update_rom, uint8_t update_hwconfig);
 static void cs423x_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *priv);
+static void cs423x_reset(void *priv);
 
 static void
 cs423x_nvram(cs423x_t *dev, uint8_t save)
@@ -178,6 +159,8 @@ cs423x_nvram(cs423x_t *dev, uint8_t save)
         else
             (void) !fread(dev->eeprom_data, sizeof(dev->eeprom_data), 1, fp);
         fclose(fp);
+    } else {
+        cs423x_log("CS423x: EEPROM data %s failed\n", save ? "save" : "load");
     }
 }
 
@@ -195,17 +178,32 @@ cs423x_read(uint16_t addr, void *priv)
                 ret |= 0x04;
             break;
 
-        case 4: /* Control Indirect Data Register */
-            ret = dev->indirect_regs[dev->regs[3]];
+        case 3: /* Control Indirect Access Register (CS4236B+) */
+            /* Intel VS440FX BIOS tells CS4236 from CS4232 through the upper bits. Setting them is enough. */
+            if (dev->type >= CRYSTAL_CS4236)
+                ret |= 0xf0;
+            break;
+
+        case 4: /* Control Indirect Data Register (CS4236B+) / Control Data Register (CS4236) */
+            if (dev->type >= CRYSTAL_CS4236B)
+                ret = dev->indirect_regs[dev->regs[3]];
             break;
 
         case 5: /* Control/RAM Access */
-            /* Reading RAM is undocumented; the Windows drivers do so. */
-            if (dev->ram_dl == 3)
-                ret = dev->ram_data[dev->ram_addr++];
+            /* Reading RAM is undocumented, but performed by:
+               - Windows drivers (unknown purpose)
+               - Intel VS440FX BIOS (PnP ROM checksum recalculation) */
+            if (dev->ram_dl == CRYSTAL_RAM_DATA) {
+                ret = dev->ram_data[dev->ram_addr];
+                cs423x_log("CS423x: RAM read(%04X) = %02X\n", dev->ram_addr, ret);
+                dev->ram_addr++;
+            }
             break;
 
-        case 7: /* Global Status */
+        case 7: /* Global Status (CS4236+) */
+            if (dev->type < CRYSTAL_CS4236)
+                break;
+
             /* Context switching: take active context and interrupt flag, then clear interrupt flag. */
             ret &= 0xc0;
             dev->regs[7] &= 0x80;
@@ -223,6 +221,8 @@ cs423x_read(uint16_t addr, void *priv)
             break;
     }
 
+    cs423x_log("CS423x: read(%X) = %02X\n", reg, ret);
+
     return ret;
 }
 
@@ -230,53 +230,86 @@ static void
 cs423x_write(uint16_t addr, uint8_t val, void *priv)
 {
     cs423x_t *dev = (cs423x_t *) priv;
-    uint8_t   reg = addr & 0x07;
+    uint8_t   reg = addr & 7;
+
+    cs423x_log("CS423x: write(%X, %02X)\n", reg, val);
 
     switch (reg) {
+        case 0: /* Joystick and Power Control */
+            if (dev->type <= CRYSTAL_CS4232)
+                val &= 0xeb;
+            if ((dev->type >= CRYSTAL_CS4235) && (addr == 0) && (val & 0x08)) {
+                /* CS4235+ through X26 backdoor only (hence the addr check): WSS off (one-way trip?) */
+                io_removehandler(dev->wss_base, 4, ad1848_read, NULL, NULL, ad1848_write, NULL, NULL, &dev->ad1848);
+                io_removehandler(dev->wss_base, 4, NULL, NULL, NULL, cs423x_ctxswitch_write, NULL, NULL, dev);
+                dev->wss_base = 0;
+            }
+            break;
+
         case 1: /* EEPROM Interface */
+            if (dev->type <= CRYSTAL_CS4232)
+                val &= 0x37;
             if (val & 0x04)
                 i2c_gpio_set(dev->i2c, val & 0x01, val & 0x02);
             break;
 
-        case 3: /* Control Indirect Access Register */
+        case 2: /* Block Power Down (CS4236+) */
+            if (dev->type < CRYSTAL_CS4236)
+                return;
+            break;
+
+        case 3: /* Control Indirect Access Register (CS4236B+) */
+            if (dev->type < CRYSTAL_CS4236) /* must be writable on CS4236 for the aforementioned VS440FX BIOS check */
+                return;
             val &= 0x0f;
             break;
 
-        case 4: /* Control Indirect Data Register */
+        case 4: /* Control Indirect Data Register (CS4236B+) / Control Data Register (CS4236) */
+            if (dev->type < CRYSTAL_CS4236) {
+                return;
+            } else if (dev->type == CRYSTAL_CS4236) {
+                val &= 0x40;
+                break;
+            }
             switch (dev->regs[3] & 0x0f) {
                 case 0: /* WSS Master Control */
-                    if (val & 0x80)
+                    if ((dev->type < CRYSTAL_CS4235) && (val & 0x80))
                         ad1848_init(&dev->ad1848, dev->ad1848_type);
                     val = 0x00;
                     break;
 
-                case 1:        /* Version / Chip ID */
-                case 7:        /* Reserved */
-                case 9 ... 15: /* unspecified */
+                case 1:         /* Version / Chip ID */
+                case 7:         /* Reserved */
+                case 10 ... 15: /* unspecified */
                     return;
 
-                case 2: /* 3D Space and {Center|Volume} */
-                case 6: /* Upper Channel Status */
+                case 2: /* 3D Space and {Center|Volume} (CS4237B+) */
                     if (dev->type < CRYSTAL_CS4237B)
                         return;
                     break;
 
-                case 3: /* 3D Enable */
+                case 3: /* 3D Enable (CS4237B+) */
                     if (dev->type < CRYSTAL_CS4237B)
                         return;
                     val &= 0xe0;
                     break;
 
-                case 4: /* Consumer Serial Port Enable */
+                case 4: /* Consumer Serial Port Enable (CS423[78]B, unused on CS4235+) */
                     if (dev->type < CRYSTAL_CS4237B)
                         return;
                     val &= 0xf0;
                     break;
 
-                case 5: /* Lower Channel Status */
+                case 5: /* Lower Channel Status (CS423[78]B, unused on CS4235+) */
+                    if (dev->type < CRYSTAL_CS4237B)
+                        return;
+                    if (dev->type < CRYSTAL_CS4235) /* bit 0 changed from reserved to unused on CS4235 */
+                        val &= 0xfe;
+                    break;
+
+                case 6: /* Upper Channel Status (CS423[78]B, unused on CS4235+) */
                     if (dev->type < CRYSTAL_CS4237B)
                         return;
-                    val &= 0xfe;
                     break;
 
                 case 8: /* CS9236 Wavetable Control */
@@ -288,6 +321,16 @@ cs423x_write(uint16_t addr, uint8_t val, void *priv)
                     ad1848_updatevolmask(&dev->ad1848);
                     break;
 
+                case 9: /* Power Management (CS4235+) */
+                    if (dev->type < CRYSTAL_CS4235)
+                        return;
+                    if ((dev->indirect_regs[dev->regs[3]] & 0x80) && !(val & 0x80)) {
+                        cs423x_reset(dev);
+                        return;
+                    }
+                    val &= 0x83;
+                    break;
+
                 default:
                     break;
             }
@@ -296,7 +339,7 @@ cs423x_write(uint16_t addr, uint8_t val, void *priv)
 
         case 5: /* Control/RAM Access */
             switch (dev->ram_dl) {
-                case 0: /* commands */
+                case CRYSTAL_RAM_CMD: /* commands */
                     switch (val) {
                         case 0x55: /* Disable PnP Key */
                             dev->pnp_enable = 0;
@@ -314,7 +357,7 @@ cs423x_write(uint16_t addr, uint8_t val, void *priv)
                             break;
 
                         case 0xaa: /* Download RAM */
-                            dev->ram_dl = 1;
+                            dev->ram_dl = CRYSTAL_RAM_ADDR_LO;
                             break;
 
                         default:
@@ -322,17 +365,19 @@ cs423x_write(uint16_t addr, uint8_t val, void *priv)
                     }
                     break;
 
-                case 1: /* low address byte */
+                case CRYSTAL_RAM_ADDR_LO: /* low address byte */
                     dev->ram_addr = val;
-                    dev->ram_dl++;
+                    dev->ram_dl = CRYSTAL_RAM_ADDR_HI;
                     break;
 
-                case 2: /* high address byte */
-                    dev->ram_addr |= (val << 8);
-                    dev->ram_dl++;
+                case CRYSTAL_RAM_ADDR_HI: /* high address byte */
+                    dev->ram_addr |= val << 8;
+                    dev->ram_dl = CRYSTAL_RAM_DATA;
+                    cs423x_log("CS423x: RAM start(%04X)\n", dev->ram_addr);
                     break;
 
-                case 3: /* data */
+                case CRYSTAL_RAM_DATA: /* data */
+                    cs423x_log("CS423x: RAM write(%04X, %02X)\n", dev->ram_addr, val);
                     dev->ram_data[dev->ram_addr++] = val;
                     break;
 
@@ -344,14 +389,16 @@ cs423x_write(uint16_t addr, uint8_t val, void *priv)
         case 6: /* RAM Access End */
             /* TriGem Delhi-III BIOS writes undocumented value 0x40 instead of 0x00. */
             if ((val == 0x00) || (val == 0x40)) {
-                dev->ram_dl = 0;
+                cs423x_log("CS423x: RAM end\n");
+                dev->ram_dl = CRYSTAL_RAM_CMD;
 
                 /* Update PnP state and resource data. */
+                dev->pnp_size = (dev->type >= CRYSTAL_CS4236) ? 384 : 256; /* we don't know the length */
                 cs423x_pnp_enable(dev, 1, 0);
             }
             break;
 
-        case 7: /* Global Status */
+        case 7: /* Global Status (CS4236+) */
             return;
 
         default:
@@ -367,6 +414,9 @@ cs423x_slam_write(UNUSED(uint16_t addr), uint8_t val, void *priv)
     cs423x_t *dev = (cs423x_t *) priv;
     uint8_t   idx;
 
+    if ((dev->slam_state != CRYSTAL_SLAM_NONE) || (val == slam_init_key[dev->key_pos])) /* cut down on ISAPnP-related noise */
+        cs423x_log("CS423x: slam_write(%02X)\n", val);
+
     switch (dev->slam_state) {
         case CRYSTAL_SLAM_NONE:
             /* Not in SLAM: read and compare Crystal key. */
@@ -381,6 +431,7 @@ cs423x_slam_write(UNUSED(uint16_t addr), uint8_t val, void *priv)
                     }
 
                     /* Enter SLAM. */
+                    cs423x_log("CS423x: SLAM unlocked\n");
                     dev->slam_state = CRYSTAL_SLAM_INDEX;
                 }
             } else {
@@ -391,6 +442,8 @@ cs423x_slam_write(UNUSED(uint16_t addr), uint8_t val, void *priv)
         case CRYSTAL_SLAM_INDEX:
             /* Intercept the Activate Audio Device command. */
             if (val == 0x79) {
+                cs423x_log("CS423x: Exiting SLAM\n");
+
                 /* Apply the last logical device's configuration. */
                 if (dev->slam_config) {
                     cs423x_pnp_config_changed(dev->slam_ld, dev->slam_config, dev);
@@ -411,6 +464,7 @@ cs423x_slam_write(UNUSED(uint16_t addr), uint8_t val, void *priv)
         case CRYSTAL_SLAM_BYTE1:
         case CRYSTAL_SLAM_BYTE2:
             /* Write register value: two bytes for I/O ports, single byte otherwise. */
+            cs423x_log("CS423x: SLAM write(%02X, %02X)\n", dev->slam_reg, val);
             switch (dev->slam_reg) {
                 case 0x06: /* Card Select Number */
                     isapnp_set_csn(dev->pnp_card, val);
@@ -421,10 +475,9 @@ cs423x_slam_write(UNUSED(uint16_t addr), uint8_t val, void *priv)
                     if (dev->slam_config)
                         cs423x_pnp_config_changed(dev->slam_ld, dev->slam_config, dev);
                     else
-                        dev->slam_config = (isapnp_device_config_t *) malloc(sizeof(isapnp_device_config_t));
+                        dev->slam_config = (isapnp_device_config_t *) calloc(1, sizeof(isapnp_device_config_t));
 
                     /* Start new logical device. */
-                    memset(dev->slam_config, 0, sizeof(isapnp_device_config_t));
                     dev->slam_ld = val;
                     break;
 
@@ -481,7 +534,7 @@ cs423x_slam_write(UNUSED(uint16_t addr), uint8_t val, void *priv)
                     break;
             }
 
-            /* Prepare for the next register, unless a two-byte read returns above. */
+            /* Prepare for the next register, unless a two-byte write returns above. */
             dev->slam_state = CRYSTAL_SLAM_INDEX;
             break;
 
@@ -502,8 +555,11 @@ cs423x_slam_enable(cs423x_t *dev, uint8_t enable)
 
     /* Enable SLAM if the CKD bit is not set. */
     if (enable && !(dev->ram_data[0x4002] & 0x10)) {
+        cs423x_log("CS423x: Enabling SLAM\n");
         dev->slam_enable = 1;
         io_sethandler(0x279, 1, NULL, NULL, NULL, cs423x_slam_write, NULL, NULL, dev);
+    } else {
+        cs423x_log("CS423x: Disabling SLAM\n");
     }
 }
 
@@ -519,6 +575,7 @@ cs423x_ctxswitch_write(uint16_t addr, UNUSED(uint8_t val), void *priv)
         /* Flip context bit. */
         dev->regs[7] ^= 0x80;
         ctx ^= 0x80;
+        cs423x_log("CS423x: Context switch to %s\n", ctx ? "WSS" : "SBPro");
 
         /* Update CD audio filter.
            FIXME: not thread-safe: filter function TOCTTOU in sound_cd_thread! */
@@ -545,49 +602,55 @@ static void
 cs423x_get_buffer(int32_t *buffer, int len, void *priv)
 {
     cs423x_t       *dev = (cs423x_t *) priv;
-    int             opl_wss = dev->opl_wss;
-    const int32_t  *opl_buf = NULL;
 
     /* Output audio from the WSS codec, and also the OPL if we're in charge of it. */
     ad1848_update(&dev->ad1848);
-    if (opl_wss)
-        opl_buf = dev->sb->opl.update(dev->sb->opl.priv);
 
-    /* Don't output anything if the analog section is powered down. */
-    if (!(dev->indirect_regs[2] & 0xa4)) {
+    /* Don't output anything if the analog section or DAC is powered down. */
+    if (!(dev->regs[2] & 0xb4) && !(dev->indirect_regs[9] & 0x04)) {
         for (int c = 0; c < len * 2; c += 2) {
-            if (opl_wss) {
-                buffer[c] += (opl_buf[c] * dev->ad1848.fm_vol_l) >> 16;
-                buffer[c + 1] += (opl_buf[c + 1] * dev->ad1848.fm_vol_r) >> 16;
-            }
-
             buffer[c] += dev->ad1848.buffer[c] / 2;
             buffer[c + 1] += dev->ad1848.buffer[c + 1] / 2;
         }
     }
 
     dev->ad1848.pos = 0;
-    if (opl_wss)
+}
+
+static void
+cs423x_get_music_buffer(int32_t *buffer, int len, void *priv)
+{
+    cs423x_t *dev = (cs423x_t *) priv;
+
+    /* Output audio from the WSS codec, and also the OPL if we're in charge of it. */
+    if (dev->opl_wss) {
+        const int32_t *opl_buf = dev->sb->opl.update(dev->sb->opl.priv);
+
+        /* Don't output anything if the analog section, DAC (DAC2 instead on CS4235+) or FM synth is powered down. */
+        uint8_t bpd_mask = (dev->type >= CRYSTAL_CS4235) ? 0xb1 : 0xb5;
+        if (!(dev->regs[2] & bpd_mask) && !(dev->indirect_regs[9] & 0x06)) {
+            for (int c = 0; c < len * 2; c += 2) {
+                buffer[c] += (opl_buf[c] * dev->ad1848.fm_vol_l) >> 16;
+                buffer[c + 1] += (opl_buf[c + 1] * dev->ad1848.fm_vol_r) >> 16;
+            }
+        }
+
         dev->sb->opl.reset_buffer(dev->sb->opl.priv);
+    }
 }
 
 static void
 cs423x_pnp_enable(cs423x_t *dev, uint8_t update_rom, uint8_t update_hwconfig)
 {
+    cs423x_log("CS423x: Updating PnP ROM=%d hwconfig=%d\n", update_rom, update_hwconfig);
+
     if (dev->pnp_card) {
         /* Update PnP resource data if requested. */
         if (update_rom)
-            isapnp_update_card_rom(dev->pnp_card, &dev->ram_data[dev->pnp_offset], 384);
+            isapnp_update_card_rom(dev->pnp_card, &dev->ram_data[dev->pnp_offset], dev->pnp_size);
 
         /* Disable PnP key if the PKD bit is set, or if it was disabled by command 0x55. */
-        /* But wait! The TriGem Delhi-III BIOS sends command 0x55, and its behavior doesn't
-           line up with real hardware (still listed in the POST summary and seen by software).
-           Disable the PnP key disabling mechanism until someone figures something out. */
-#if 0
         isapnp_enable_card(dev->pnp_card, ((dev->ram_data[0x4002] & 0x20) || !dev->pnp_enable) ? ISAPNP_CARD_NO_KEY : ISAPNP_CARD_ENABLE);
-#endif
-        if ((dev->ram_data[0x4002] & 0x20) || !dev->pnp_enable)
-            pclog("CS423x: Attempted to disable PnP key\n");
     }
 
     /* Update some register bits based on the config data in RAM if requested. */
@@ -602,7 +665,7 @@ cs423x_pnp_enable(cs423x_t *dev, uint8_t update_rom, uint8_t update_hwconfig)
         }
 
         /* Update SPS. */
-        if (dev->type != CRYSTAL_CS4235) {
+        if ((dev->type >= CRYSTAL_CS4236B) && (dev->type <= CRYSTAL_CS4238B)) {
             if (dev->ram_data[0x4003] & 0x04)
                 dev->indirect_regs[8] |= 0x04;
             else
@@ -615,6 +678,20 @@ cs423x_pnp_enable(cs423x_t *dev, uint8_t update_rom, uint8_t update_hwconfig)
         else
             dev->ad1848.xregs[4] &= ~0x10;
 
+        if (dev->type == CRYSTAL_CS4236) {
+            /* Update VCEN. */
+            if (dev->ram_data[0x4002] & 0x04)
+                dev->regs[4] |= 0x40;
+            else
+                dev->regs[4] &= ~0x40;            
+        }
+
+        if (dev->type >= CRYSTAL_CS4235) {
+            /* Update X18 and X19 values. */
+            dev->ad1848.xregs[18] = (dev->ad1848.xregs[18] & ~0x3e) | (dev->ram_data[0x400b] & 0x3e);
+            dev->ad1848.xregs[19] = dev->ram_data[0x4005];
+        }
+
         /* Inform WSS codec of the changes. */
         ad1848_updatevolmask(&dev->ad1848);
     }
@@ -723,6 +800,34 @@ cs423x_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *priv
     }
 }
 
+static void
+cs423x_load_defaults(cs423x_t *dev, uint8_t *dest)
+{
+    switch (dev->type) {
+        case CRYSTAL_CS4236:
+        case CRYSTAL_CS4236B:
+        case CRYSTAL_CS4237B:
+        case CRYSTAL_CS4238B:
+        case CRYSTAL_CS4235:
+        case CRYSTAL_CS4239:
+            memcpy(dest, cs4236_default, sizeof(cs4236_default));
+            dev->pnp_size = 9; /* header-only PnP ROM size */
+
+            switch (dev->type) {
+                case CRYSTAL_CS4236:
+                    dest[4] = 0x43; /* code base byte */
+                    break;
+
+                case CRYSTAL_CS4235:
+                case CRYSTAL_CS4239:
+                    dest[4]  = 0x05; /* code base byte */
+                    dest[12] = 0x08; /* external decode length */
+                    break;
+            }
+            break;
+    }
+}
+
 static void
 cs423x_reset(void *priv)
 {
@@ -731,9 +836,20 @@ cs423x_reset(void *priv)
     /* Clear RAM. */
     memset(dev->ram_data, 0, sizeof(dev->ram_data));
 
+    /* Load default configuration data to RAM. */
+    cs423x_load_defaults(dev, &dev->ram_data[0x4000]);
+
     if (dev->eeprom) {
-        /* Load EEPROM data to RAM. */
-        memcpy(&dev->ram_data[0x4000], &dev->eeprom_data[4], MIN(384, ((dev->eeprom_data[2] << 8) | dev->eeprom_data[3]) - 4));
+        /* Load EEPROM data to RAM if the magic bytes are present. */
+        if ((dev->eeprom_data[0] == 0x55) && (dev->eeprom_data[1] == 0xbb)) {
+            cs423x_log("CS423x: EEPROM data valid, loading to RAM\n");
+            dev->pnp_size = (dev->eeprom_data[2] << 8) | dev->eeprom_data[3];
+            if (dev->pnp_size > 384)
+                dev->pnp_size = 384;
+            memcpy(&dev->ram_data[0x4000], &dev->eeprom_data[4], sizeof(dev->eeprom_data) - 4);
+        } else {
+            cs423x_log("CS423x: EEPROM data invalid, ignoring\n");
+        }
 
         /* Save EEPROM contents to file. */
         cs423x_nvram(dev, 1);
@@ -763,38 +879,60 @@ cs423x_reset(void *priv)
 static void *
 cs423x_init(const device_t *info)
 {
-    cs423x_t *dev = malloc(sizeof(cs423x_t));
-    memset(dev, 0, sizeof(cs423x_t));
+    cs423x_t *dev = calloc(1, sizeof(cs423x_t));
 
     /* Initialize model-specific data. */
     dev->type = info->local & 0xff;
+    cs423x_log("CS423x: init(%02X)\n", dev->type);
     switch (dev->type) {
-        case CRYSTAL_CS4235:
+        case CRYSTAL_CS4236:
         case CRYSTAL_CS4236B:
         case CRYSTAL_CS4237B:
         case CRYSTAL_CS4238B:
-            /* Same WSS codec and EEPROM structure. */
-            dev->ad1848_type = (dev->type == CRYSTAL_CS4235) ? AD1848_TYPE_CS4235 : AD1848_TYPE_CS4236;
-            dev->pnp_offset  = 0x4013;
+        case CRYSTAL_CS4235:
+        case CRYSTAL_CS4239:
+            /* Different WSS codec families. */
+            dev->ad1848_type = (dev->type >= CRYSTAL_CS4235) ? AD1848_TYPE_CS4235 : ((dev->type >= CRYSTAL_CS4236B) ? AD1848_TYPE_CS4236B : AD1848_TYPE_CS4236);
 
-            /* Different Chip Version and ID registers, which shouldn't be reset by ad1848_init */
+            /* Different Chip Version and ID values (N/A on CS4236), which shouldn't be reset by ad1848_init. */
             dev->ad1848.xregs[25] = dev->type;
 
+            /* Same EEPROM structure. */
+            dev->pnp_offset = 0x4013;
+
             if (!(info->local & CRYSTAL_NOEEPROM)) {
-                /* Load EEPROM contents from template. */
-                memcpy(dev->eeprom_data, cs4236b_eeprom, sizeof(cs4236b_eeprom));
+                /* Start a new EEPROM with the default configuration data. */
+                cs423x_load_defaults(dev, &dev->eeprom_data[4]);
 
-                /* Set content size. */
-                dev->eeprom_data[2] = sizeof(cs4236b_eeprom) >> 8;
-                dev->eeprom_data[3] = sizeof(cs4236b_eeprom) & 0xff;
+                /* Load PnP resource data ROM. */
+                FILE *fp = rom_fopen(PNP_ROM_CS4236B, "rb");
+                if (fp) {
+                    uint16_t eeprom_pnp_offset = (dev->pnp_offset & 0x1ff) + 4;
+                    /* This is wrong. The header field only indicates PnP resource data length, and real chips use
+                       it to locate the firmware patch area, but we don't need any of that, so we can get away
+                       with pretending the whole ROM is PnP data, at least until we can get full EEPROM dumps. */
+                    dev->pnp_size = fread(&dev->eeprom_data[eeprom_pnp_offset], 1, sizeof(dev->eeprom_data) - eeprom_pnp_offset, fp);
+                    fclose(fp);
+                } else {
+                    dev->pnp_size = 0;
+                }
 
-                /* Set PnP card ID and EEPROM file name. */
+                /* Populate EEPROM header if the PnP ROM was loaded. */
+                if (dev->pnp_size) {
+                    dev->eeprom_data[0] = 0x55;
+                    dev->eeprom_data[1] = 0xbb;
+                    dev->eeprom_data[2] = dev->pnp_size >> 8;
+                    dev->eeprom_data[3] = dev->pnp_size;
+                }
+
+                /* Patch PnP ROM and set EEPROM file name. */
                 switch (dev->type) {
-                    case CRYSTAL_CS4235:
-                        dev->eeprom_data[8]  = 0x05;
-                        dev->eeprom_data[16] = 0x08;
-                        dev->eeprom_data[26] = 0x25;
-                        dev->nvr_path        = "cs4235.nvr";
+                    case CRYSTAL_CS4236:
+                        if (dev->pnp_size) {
+                            dev->eeprom_data[26] = 0x36;
+                            dev->eeprom_data[45] = ' ';
+                        }
+                        dev->nvr_path = "cs4236.nvr";
                         break;
 
                     case CRYSTAL_CS4236B:
@@ -802,13 +940,37 @@ cs423x_init(const device_t *info)
                         break;
 
                     case CRYSTAL_CS4237B:
-                        dev->eeprom_data[26] = 0x37;
-                        dev->nvr_path        = "cs4237b.nvr";
+                        if (dev->pnp_size) {
+                            dev->eeprom_data[26] = 0x37;
+                            dev->eeprom_data[44] = '7';
+                        }
+                        dev->nvr_path = "cs4237b.nvr";
                         break;
 
                     case CRYSTAL_CS4238B:
-                        dev->eeprom_data[26] = 0x38;
-                        dev->nvr_path        = "cs4238b.nvr";
+                        if (dev->pnp_size) {
+                            dev->eeprom_data[26] = 0x38;
+                            dev->eeprom_data[44] = '8';
+                        }
+                        dev->nvr_path = "cs4238b.nvr";
+                        break;
+
+                    case CRYSTAL_CS4235:
+                        if (dev->pnp_size) {
+                            dev->eeprom_data[26] = 0x25;
+                            dev->eeprom_data[44] = '5';
+                            dev->eeprom_data[45] = ' ';
+                        }
+                        dev->nvr_path = "cs4235.nvr";
+                        break;
+
+                    case CRYSTAL_CS4239:
+                        if (dev->pnp_size) {
+                            dev->eeprom_data[26] = 0x29;
+                            dev->eeprom_data[44] = '9';
+                            dev->eeprom_data[45] = ' ';
+                        }
+                        dev->nvr_path = "cs4239.nvr";
                         break;
 
                     default:
@@ -819,9 +981,9 @@ cs423x_init(const device_t *info)
                 cs423x_nvram(dev, 0);
             }
 
-            /* Initialize game port. The '7B and '8B game port only responds to 6 I/O ports; the remaining
-               2 ports are reserved on those chips, and probably connected to the Digital Assist feature. */
-            dev->gameport = gameport_add(((dev->type == CRYSTAL_CS4235) || (dev->type == CRYSTAL_CS4236B)) ? &gameport_pnp_device : &gameport_pnp_6io_device);
+            /* Initialize game port. The game port on all B chips only
+               responds to 6 I/O ports; the remaining 2 are reserved. */
+            dev->gameport = gameport_add((dev->ad1848_type == CRYSTAL_CS4236B) ? &gameport_pnp_6io_device : &gameport_pnp_device);
 
             break;
 
@@ -832,8 +994,8 @@ cs423x_init(const device_t *info)
     /* Initialize I2C bus for the EEPROM. */
     dev->i2c = i2c_gpio_init("nvr_cs423x");
 
-    /* Initialize I2C EEPROM if the contents are valid. */
-    if ((dev->eeprom_data[0] == 0x55) && (dev->eeprom_data[1] == 0xbb))
+    /* Initialize I2C EEPROM if enabled. */
+    if (!(info->local & CRYSTAL_NOEEPROM))
         dev->eeprom = i2c_eeprom_init(i2c_gpio_get_bus(dev->i2c), 0x50, dev->eeprom_data, sizeof(dev->eeprom_data), 1);
 
     /* Initialize ISAPnP. */
@@ -846,6 +1008,7 @@ cs423x_init(const device_t *info)
     /* Initialize RAM, registers and WSS codec. */
     cs423x_reset(dev);
     sound_add_handler(cs423x_get_buffer, dev);
+    music_add_handler(cs423x_get_music_buffer, dev);
 
     /* Add Control/RAM backdoor handlers for CS4235. */
     dev->ad1848.cram_priv  = dev;
@@ -860,6 +1023,8 @@ cs423x_close(void *priv)
 {
     cs423x_t *dev = (cs423x_t *) priv;
 
+    cs423x_log("CS423x: close()\n");
+
     /* Save EEPROM contents to file. */
     if (dev->eeprom) {
         cs423x_nvram(dev, 1);
@@ -871,6 +1036,12 @@ cs423x_close(void *priv)
     free(dev);
 }
 
+static int
+cs423x_available(void)
+{
+    return rom_present(PNP_ROM_CS4236B);
+}
+
 static void
 cs423x_speed_changed(void *priv)
 {
@@ -882,12 +1053,12 @@ cs423x_speed_changed(void *priv)
 const device_t cs4235_device = {
     .name          = "Crystal CS4235",
     .internal_name = "cs4235",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = CRYSTAL_CS4235,
     .init          = cs423x_init,
     .close         = cs423x_close,
     .reset         = cs423x_reset,
-    { .available = NULL },
+    .available     = cs423x_available,
     .speed_changed = cs423x_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -896,12 +1067,26 @@ const device_t cs4235_device = {
 const device_t cs4235_onboard_device = {
     .name          = "Crystal CS4235 (On-Board)",
     .internal_name = "cs4235_onboard",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = CRYSTAL_CS4235 | CRYSTAL_NOEEPROM,
     .init          = cs423x_init,
     .close         = cs423x_close,
     .reset         = cs423x_reset,
-    { .available = NULL },
+    .available     = cs423x_available,
+    .speed_changed = cs423x_speed_changed,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t cs4236_onboard_device = {
+    .name          = "Crystal CS4236 (On-Board)",
+    .internal_name = "cs4236_onboard",
+    .flags         = DEVICE_ISA16,
+    .local         = CRYSTAL_CS4236 | CRYSTAL_NOEEPROM,
+    .init          = cs423x_init,
+    .close         = cs423x_close,
+    .reset         = cs423x_reset,
+    .available     = cs423x_available,
     .speed_changed = cs423x_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -910,12 +1095,26 @@ const device_t cs4235_onboard_device = {
 const device_t cs4236b_device = {
     .name          = "Crystal CS4236B",
     .internal_name = "cs4236b",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = CRYSTAL_CS4236B,
     .init          = cs423x_init,
     .close         = cs423x_close,
     .reset         = cs423x_reset,
-    { .available = NULL },
+    .available     = cs423x_available,
+    .speed_changed = cs423x_speed_changed,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t cs4236b_onboard_device = {
+    .name          = "Crystal CS4236B",
+    .internal_name = "cs4236b",
+    .flags         = DEVICE_ISA16,
+    .local         = CRYSTAL_CS4236B | CRYSTAL_NOEEPROM,
+    .init          = cs423x_init,
+    .close         = cs423x_close,
+    .reset         = cs423x_reset,
+    .available     = cs423x_available,
     .speed_changed = cs423x_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -924,12 +1123,12 @@ const device_t cs4236b_device = {
 const device_t cs4237b_device = {
     .name          = "Crystal CS4237B",
     .internal_name = "cs4237b",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = CRYSTAL_CS4237B,
     .init          = cs423x_init,
     .close         = cs423x_close,
     .reset         = cs423x_reset,
-    { .available = NULL },
+    .available     = cs423x_available,
     .speed_changed = cs423x_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -938,12 +1137,12 @@ const device_t cs4237b_device = {
 const device_t cs4238b_device = {
     .name          = "Crystal CS4238B",
     .internal_name = "cs4238b",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = CRYSTAL_CS4238B,
     .init          = cs423x_init,
     .close         = cs423x_close,
     .reset         = cs423x_reset,
-    { .available = NULL },
+    .available     = cs423x_available,
     .speed_changed = cs423x_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sound/snd_emu8k.c b/src/sound/snd_emu8k.c
index 22435c065..822abeeaa 100644
--- a/src/sound/snd_emu8k.c
+++ b/src/sound/snd_emu8k.c
@@ -328,7 +328,7 @@ emu8k_log(const char *fmt, ...)
 static inline int16_t
 EMU8K_READ(emu8k_t *emu8k, uint32_t addr)
 {
-    const register emu8k_mem_pointers_t addrmem = { { addr } };
+    register const emu8k_mem_pointers_t addrmem = { { addr } };
     return emu8k->ram_pointers[addrmem.hb_address][addrmem.lw_address];
 }
 
@@ -1758,8 +1758,7 @@ int32_t old_vol[32]   = { 0 };
 void
 emu8k_update(emu8k_t *emu8k)
 {
-    int new_pos = (sound_pos_global * FREQ_44100) / SOUND_FREQ;
-    if (emu8k->pos >= new_pos)
+    if (emu8k->pos >= wavetable_pos_global)
         return;
 
     int32_t       *buf;
@@ -1768,16 +1767,16 @@ emu8k_update(emu8k_t *emu8k)
 
     /* Clean the buffers since we will accumulate into them. */
     buf = &emu8k->buffer[emu8k->pos * 2];
-    memset(buf, 0, 2 * (new_pos - emu8k->pos) * sizeof(emu8k->buffer[0]));
-    memset(&emu8k->chorus_in_buffer[emu8k->pos], 0, (new_pos - emu8k->pos) * sizeof(emu8k->chorus_in_buffer[0]));
-    memset(&emu8k->reverb_in_buffer[emu8k->pos], 0, (new_pos - emu8k->pos) * sizeof(emu8k->reverb_in_buffer[0]));
+    memset(buf, 0, 2 * (wavetable_pos_global - emu8k->pos) * sizeof(emu8k->buffer[0]));
+    memset(&emu8k->chorus_in_buffer[emu8k->pos], 0, (wavetable_pos_global - emu8k->pos) * sizeof(emu8k->chorus_in_buffer[0]));
+    memset(&emu8k->reverb_in_buffer[emu8k->pos], 0, (wavetable_pos_global - emu8k->pos) * sizeof(emu8k->reverb_in_buffer[0]));
 
     /* Voices section  */
     for (uint8_t c = 0; c < 32; c++) {
         emu_voice = &emu8k->voice[c];
         buf       = &emu8k->buffer[emu8k->pos * 2];
 
-        for (pos = emu8k->pos; pos < new_pos; pos++) {
+        for (pos = emu8k->pos; pos < wavetable_pos_global; pos++) {
             int32_t dat;
 
             if (emu_voice->cvcf_curr_volume) {
@@ -2121,29 +2120,14 @@ emu8k_update(emu8k_t *emu8k)
     }
 
     buf = &emu8k->buffer[emu8k->pos * 2];
-    emu8k_work_reverb(&emu8k->reverb_in_buffer[emu8k->pos], buf, &emu8k->reverb_engine, new_pos - emu8k->pos);
-    emu8k_work_chorus(&emu8k->chorus_in_buffer[emu8k->pos], buf, &emu8k->chorus_engine, new_pos - emu8k->pos);
-    emu8k_work_eq(buf, new_pos - emu8k->pos);
-
-    // Clip signal
-    for (pos = emu8k->pos; pos < new_pos; pos++) {
-        if (buf[0] < -32768)
-            buf[0] = -32768;
-        else if (buf[0] > 32767)
-            buf[0] = 32767;
-
-        if (buf[1] < -32768)
-            buf[1] = -32768;
-        else if (buf[1] > 32767)
-            buf[1] = 32767;
-
-        buf += 2;
-    }
+    emu8k_work_reverb(&emu8k->reverb_in_buffer[emu8k->pos], buf, &emu8k->reverb_engine, wavetable_pos_global - emu8k->pos);
+    emu8k_work_chorus(&emu8k->chorus_in_buffer[emu8k->pos], buf, &emu8k->chorus_engine, wavetable_pos_global - emu8k->pos);
+    emu8k_work_eq(buf, wavetable_pos_global - emu8k->pos);
 
     /* Update EMU clock. */
-    emu8k->wc += (new_pos - emu8k->pos);
+    emu8k->wc += (wavetable_pos_global - emu8k->pos);
 
-    emu8k->pos = new_pos;
+    emu8k->pos = wavetable_pos_global;
 }
 
 void
@@ -2172,7 +2156,7 @@ emu8k_init(emu8k_t *emu8k, uint16_t emu_addr, int onboard_ram)
     int            c;
     double         out;
 
-    fp = rom_fopen("roms/sound/creative/awe32.raw", "rb");
+    fp = rom_fopen(EMU8K_ROM_PATH, "rb");
     if (!fp)
         fatal("AWE32.RAW not found\n");
 
@@ -2187,8 +2171,7 @@ emu8k_init(emu8k_t *emu8k, uint16_t emu_addr, int onboard_ram)
         emu8k->rom[0x7ffff] = 0;
     }
 
-    emu8k->empty = malloc(2 * BLOCK_SIZE_WORDS);
-    memset(emu8k->empty, 0, 2 * BLOCK_SIZE_WORDS);
+    emu8k->empty = calloc(2, BLOCK_SIZE_WORDS);
 
     int j = 0;
     for (; j < 0x8; j++) {
@@ -2202,8 +2185,7 @@ emu8k_init(emu8k_t *emu8k, uint16_t emu_addr, int onboard_ram)
         /*Clip to 28MB, since that's the max that we can address. */
         if (onboard_ram > 0x7000)
             onboard_ram = 0x7000;
-        emu8k->ram = malloc(onboard_ram * 1024);
-        memset(emu8k->ram, 0, onboard_ram * 1024);
+        emu8k->ram = calloc(1024, onboard_ram);
         const int i_end = onboard_ram >> 7;
         int       i     = 0;
         for (; i < i_end; i++, j++) {
diff --git a/src/sound/snd_gus.c b/src/sound/snd_gus.c
index d0af5c564..80ce6781d 100644
--- a/src/sound/snd_gus.c
+++ b/src/sound/snd_gus.c
@@ -15,10 +15,9 @@
 #include <86box/nmi.h>
 #include <86box/pic.h>
 #include <86box/sound.h>
+#include "cpu.h"
 #include <86box/timer.h>
-#if defined(DEV_BRANCH) && defined(USE_GUSMAX)
-#    include <86box/snd_ad1848.h>
-#endif
+#include <86box/snd_ad1848.h>
 #include <86box/plat_fallthrough.h>
 #include <86box/plat_unused.h>
 
@@ -144,11 +143,9 @@ typedef struct gus_t {
 
     uint8_t usrr;
 
-#if defined(DEV_BRANCH) && defined(USE_GUSMAX)
     uint8_t max_ctrl;
 
     ad1848_t ad1848;
-#endif
 } gus_t;
 
 static int gus_gf1_irqs[8]  = { -1, 2, 5, 3, 7, 11, 12, 15 };
@@ -249,16 +246,14 @@ gus_midi_update_int_status(gus_t *gus)
 }
 
 void
-writegus(uint16_t addr, uint8_t val, void *priv)
+gus_write(uint16_t addr, uint8_t val, void *priv)
 {
     gus_t   *gus = (gus_t *) priv;
     int      c;
     int      d;
     int      old;
     uint16_t port;
-#if defined(DEV_BRANCH) && defined(USE_GUSMAX)
     uint16_t csioport;
-#endif
 
     if ((addr == 0x388) || (addr == 0x389))
         port = addr;
@@ -606,10 +601,9 @@ writegus(uint16_t addr, uint8_t val, void *priv)
                                 gus->irq_midi = gus->irq;
                         } else
                             gus->irq_midi = gus_midi_irqs[(val >> 3) & 7];
-#if defined(DEV_BRANCH) && defined(USE_GUSMAX)
+
                         if (gus->type == GUS_MAX)
                             ad1848_setirq(&gus->ad1848, gus->irq);
-#endif
 
                         gus->sb_nmi = val & 0x80;
                     } else {
@@ -622,10 +616,9 @@ writegus(uint16_t addr, uint8_t val, void *priv)
                                 gus->dma2 = gus->dma;
                         } else
                             gus->dma2 = gus_dmas[(val >> 3) & 7];
-#if defined(DEV_BRANCH) && defined(USE_GUSMAX)
+
                         if (gus->type == GUS_MAX)
                             ad1848_setdma(&gus->ad1848, gus->dma2);
-#endif
                     }
                     break;
                 case 1:
@@ -683,7 +676,6 @@ writegus(uint16_t addr, uint8_t val, void *priv)
             break;
         case 0x306:
         case 0x706:
-#if defined(DEV_BRANCH) && defined(USE_GUSMAX)
             if (gus->type == GUS_MAX) {
                 if (gus->dma >= 4)
                     val |= 0x10;
@@ -703,7 +695,6 @@ writegus(uint16_t addr, uint8_t val, void *priv)
                     }
                 }
             }
-#endif
             break;
 
         default:
@@ -712,7 +703,7 @@ writegus(uint16_t addr, uint8_t val, void *priv)
 }
 
 uint8_t
-readgus(uint16_t addr, void *priv)
+gus_read(uint16_t addr, void *priv)
 {
     gus_t   *gus = (gus_t *) priv;
     uint8_t  val = 0xff;
@@ -755,11 +746,9 @@ readgus(uint16_t addr, void *priv)
             return val;
 
         case 0x20F:
-#if defined(DEV_BRANCH) && defined(USE_GUSMAX)
             if (gus->type == GUS_MAX)
                 val = 0x02;
             else
-#endif
                 val = 0x00;
             break;
 
@@ -878,11 +867,9 @@ readgus(uint16_t addr, void *priv)
             break;
         case 0x306:
         case 0x706:
-#if defined(DEV_BRANCH) && defined(USE_GUSMAX)
             if (gus->type == GUS_MAX)
                 val = 0x0a; /* GUS MAX */
             else
-#endif
                 val = 0xff; /*Pre 3.7 - no mixer*/
             break;
 
@@ -939,7 +926,7 @@ readgus(uint16_t addr, void *priv)
             gus->ad_status &= ~0x01;
 #ifdef OLD_NMI_BEHAVIOR
             nmi = 0;
-#endif
+#endif /* OLD_NMI_BEHAVIOR */
             fallthrough;
         case 0x389:
             val = gus->ad_data;
@@ -1182,24 +1169,20 @@ gus_get_buffer(int32_t *buffer, int len, void *priv)
 {
     gus_t *gus = (gus_t *) priv;
 
-#if defined(DEV_BRANCH) && defined(USE_GUSMAX)
     if ((gus->type == GUS_MAX) && (gus->max_ctrl))
         ad1848_update(&gus->ad1848);
-#endif
+
     gus_update(gus);
 
     for (int c = 0; c < len * 2; c++) {
-#if defined(DEV_BRANCH) && defined(USE_GUSMAX)
         if ((gus->type == GUS_MAX) && (gus->max_ctrl))
             buffer[c] += (int32_t) (gus->ad1848.buffer[c] / 2);
-#endif
         buffer[c] += (int32_t) gus->buffer[c & 1][c >> 1];
     }
 
-#if defined(DEV_BRANCH) && defined(USE_GUSMAX)
     if ((gus->type == GUS_MAX) && (gus->max_ctrl))
         gus->ad1848.pos = 0;
-#endif
+
     gus->pos = 0;
 }
 
@@ -1332,9 +1315,7 @@ gus_reset(void *priv)
 
     gus->usrr = 0;
 
-#if defined(DEV_BRANCH) && defined(USE_GUSMAX)
     gus->max_ctrl = 0;
-#endif
 
     gus->irq_state = 0;
     gus->midi_irq_state = 0;
@@ -1348,12 +1329,10 @@ gus_init(UNUSED(const device_t *info))
     int     c;
     double  out     = 1.0;
     uint8_t gus_ram = device_get_config_int("gus_ram");
-    gus_t  *gus     = malloc(sizeof(gus_t));
-    memset(gus, 0x00, sizeof(gus_t));
+    gus_t  *gus     = calloc(1, sizeof(gus_t));
 
     gus->gus_end_ram = 1 << (18 + gus_ram);
-    gus->ram         = (uint8_t *) malloc(gus->gus_end_ram);
-    memset(gus->ram, 0x00, (gus->gus_end_ram));
+    gus->ram         = (uint8_t *) calloc(1, gus->gus_end_ram);
 
     for (c = 0; c < 32; c++) {
         gus->ctrl[c]  = 1;
@@ -1374,16 +1353,15 @@ gus_init(UNUSED(const device_t *info))
 
     gus->uart_out = 1;
 
-    gus->type = device_get_config_int("type");
+    gus->type = info->local;
 
     gus->base = device_get_config_hex16("base");
 
-    io_sethandler(gus->base, 0x0010, readgus, NULL, NULL, writegus, NULL, NULL, gus);
-    io_sethandler(0x0100 + gus->base, 0x0010, readgus, NULL, NULL, writegus, NULL, NULL, gus);
-    io_sethandler(0x0506 + gus->base, 0x0001, readgus, NULL, NULL, writegus, NULL, NULL, gus);
-    io_sethandler(0x0388, 0x0002, readgus, NULL, NULL, writegus, NULL, NULL, gus);
+    io_sethandler(gus->base, 0x0010, gus_read, NULL, NULL, gus_write, NULL, NULL, gus);
+    io_sethandler(0x0100 + gus->base, 0x0010, gus_read, NULL, NULL, gus_write, NULL, NULL, gus);
+    io_sethandler(0x0506 + gus->base, 0x0001, gus_read, NULL, NULL, gus_write, NULL, NULL, gus);
+    io_sethandler(0x0388, 0x0002, gus_read, NULL, NULL, gus_write, NULL, NULL, gus);
 
-#if defined(DEV_BRANCH) && defined(USE_GUSMAX)
     if (gus->type == GUS_MAX) {
         ad1848_init(&gus->ad1848, AD1848_TYPE_CS4231);
         ad1848_setirq(&gus->ad1848, 5);
@@ -1391,7 +1369,6 @@ gus_init(UNUSED(const device_t *info))
         io_sethandler(0x10C + gus->base, 4,
                       ad1848_read, NULL, NULL, ad1848_write, NULL, NULL, &gus->ad1848);
     }
-#endif
 
     timer_add(&gus->samp_timer, gus_poll_wave, gus, 1);
     timer_add(&gus->timer_1, gus_poll_timer_1, gus, 1);
@@ -1424,116 +1401,86 @@ gus_speed_changed(void *priv)
     else
         gus->samp_latch = (uint64_t) (TIMER_USEC * (1000000.0 / gusfreqs[gus->voices - 14]));
 
-#if defined(DEV_BRANCH) && defined(USE_GUSMAX)
     if ((gus->type == GUS_MAX) && (gus->max_ctrl))
         ad1848_speed_changed(&gus->ad1848);
-#endif
 }
 
 static const device_config_t gus_config[] = {
     // clang-format off
     {
-        .name = "type",
-        .description = "GUS type",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "Classic",
-                .value = GUS_CLASSIC
-        },
-#if defined(DEV_BRANCH) && defined(USE_GUSMAX)
-            {
-                .description = "MAX",
-                .value = GUS_MAX
-            },
-#endif
-            { NULL }
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x220,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "210H", .value = 0x210 },
+            { .description = "220H", .value = 0x220 },
+            { .description = "230H", .value = 0x230 },
+            { .description = "240H", .value = 0x240 },
+            { .description = "250H", .value = 0x250 },
+            { .description = "260H", .value = 0x260 },
+            { NULL                                  }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x220,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "210H",
-                .value = 0x210
-            },
-            {
-                .description = "220H",
-                .value = 0x220
-            },
-            {
-                .description = "230H",
-                .value = 0x230
-            },
-            {
-                .description = "240H",
-                .value = 0x240
-            },
-            {
-                .description = "250H",
-                .value = 0x250
-            },
-            {
-                .description = "260H",
-                .value = 0x260
-            },
+        .name           = "gus_ram",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "256 KB", .value = 0 },
+            { .description = "512 KB", .value = 1 },
+            { .description = "1 MB",   .value = 2 },
+            { NULL                                }
         },
+        .bios           = { { 0 } }
     },
     {
-        .name = "gus_ram",
-        "Onboard RAM",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "256 KB",
-                .value = 0
-            },
-            {
-                .description = "512 KB",
-                .value = 1
-            },
-            {
-                .description = "1 MB",
-                .value = 2
-            },
-            { NULL }
-        }
-    },
-    {
-        .name = "receive_input",
-        .description = "Receive input (SB MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 // clang-format off
 };
 
 const device_t gus_device = {
-    .name = "Gravis UltraSound",
+    .name          = "Gravis UltraSound",
     .internal_name = "gus",
-    .flags = DEVICE_ISA | DEVICE_AT,
-    .local = 0,
-    .init = gus_init,
-    .close = gus_close,
-    .reset = gus_reset,
-    { .available = NULL },
+    .flags         = DEVICE_ISA16,
+    .local         = GUS_CLASSIC,
+    .init          = gus_init,
+    .close         = gus_close,
+    .reset         = gus_reset,
+    .available     = NULL,
     .speed_changed = gus_speed_changed,
-    .force_redraw = NULL,
-    .config = gus_config
+    .force_redraw  = NULL,
+    .config        = gus_config
+};
+
+const device_t gus_max_device = {
+    .name          = "Gravis UltraSound MAX",
+    .internal_name = "gusmax",
+    .flags         = DEVICE_ISA16,
+    .local         = GUS_MAX,
+    .init          = gus_init,
+    .close         = gus_close,
+    .reset         = gus_reset,
+    .available     = NULL,
+    .speed_changed = gus_speed_changed,
+    .force_redraw  = NULL,
+    .config        = gus_config
 };
diff --git a/src/sound/snd_lpt_dac.c b/src/sound/snd_lpt_dac.c
index 8fb526f14..33b197230 100644
--- a/src/sound/snd_lpt_dac.c
+++ b/src/sound/snd_lpt_dac.c
@@ -7,10 +7,11 @@
 #include "cpu.h"
 #include <86box/86box.h>
 #include <86box/filters.h>
+#include <86box/timer.h>
+#include <86box/device.h>
 #include <86box/lpt.h>
 #include <86box/machine.h>
 #include <86box/sound.h>
-#include <86box/timer.h>
 #include <86box/plat_unused.h>
 
 typedef struct lpt_dac_t {
@@ -50,6 +51,14 @@ dac_write_data(uint8_t val, void *priv)
     dac_update(lpt_dac);
 }
 
+static void
+dac_strobe(uint8_t old, uint8_t val, void *priv)
+{
+    lpt_dac_t *lpt_dac = (lpt_dac_t *) priv;
+
+    lpt_dac->channel = val;
+}
+
 static void
 dac_write_ctrl(uint8_t val, void *priv)
 {
@@ -82,8 +91,7 @@ dac_get_buffer(int32_t *buffer, int len, void *priv)
 static void *
 dac_init(void *lpt)
 {
-    lpt_dac_t *lpt_dac = malloc(sizeof(lpt_dac_t));
-    memset(lpt_dac, 0, sizeof(lpt_dac_t));
+    lpt_dac_t *lpt_dac = calloc(1, sizeof(lpt_dac_t));
 
     lpt_dac->lpt = lpt;
 
@@ -110,25 +118,33 @@ dac_close(void *priv)
 }
 
 const lpt_device_t lpt_dac_device = {
-    .name          = "LPT DAC / Covox Speech Thing",
-    .internal_name = "lpt_dac",
-    .init          = dac_init,
-    .close         = dac_close,
-    .write_data    = dac_write_data,
-    .write_ctrl    = dac_write_ctrl,
-    .read_data     = NULL,
-    .read_status   = dac_read_status,
-    .read_ctrl     = NULL
+    .name             = "LPT DAC / Covox Speech Thing",
+    .internal_name    = "lpt_dac",
+    .init             = dac_init,
+    .close            = dac_close,
+    .write_data       = dac_write_data,
+    .write_ctrl       = dac_write_ctrl,
+    .strobe           = dac_strobe,
+    .read_status      = dac_read_status,
+    .read_ctrl        = NULL,
+    .epp_write_data   = NULL,
+    .epp_request_read = NULL,
+    .priv             = NULL,
+    .lpt              = NULL
 };
 
 const lpt_device_t lpt_dac_stereo_device = {
-    .name          = "Stereo LPT DAC",
-    .internal_name = "lpt_dac_stereo",
-    .init          = dac_stereo_init,
-    .close         = dac_close,
-    .write_data    = dac_write_data,
-    .write_ctrl    = dac_write_ctrl,
-    .read_data     = NULL,
-    .read_status   = dac_read_status,
-    .read_ctrl     = NULL
+    .name             = "Stereo LPT DAC",
+    .internal_name    = "lpt_dac_stereo",
+    .init             = dac_stereo_init,
+    .close            = dac_close,
+    .write_data       = dac_write_data,
+    .write_ctrl       = dac_write_ctrl,
+    .strobe           = dac_strobe,
+    .read_status      = dac_read_status,
+    .read_ctrl        = NULL,
+    .epp_write_data   = NULL,
+    .epp_request_read = NULL,
+    .priv             = NULL,
+    .lpt              = NULL
 };
diff --git a/src/sound/snd_lpt_dss.c b/src/sound/snd_lpt_dss.c
index bd794fffb..5ea0048f4 100644
--- a/src/sound/snd_lpt_dss.c
+++ b/src/sound/snd_lpt_dss.c
@@ -7,10 +7,11 @@
 #include "cpu.h"
 #include <86box/86box.h>
 #include <86box/filters.h>
+#include <86box/timer.h>
+#include <86box/device.h>
 #include <86box/lpt.h>
 #include <86box/machine.h>
 #include <86box/sound.h>
-#include <86box/timer.h>
 #include <86box/plat_unused.h>
 
 typedef struct dss_t {
@@ -115,8 +116,7 @@ dss_callback(void *priv)
 static void *
 dss_init(void *lpt)
 {
-    dss_t *dss = malloc(sizeof(dss_t));
-    memset(dss, 0, sizeof(dss_t));
+    dss_t *dss = calloc(1, sizeof(dss_t));
 
     dss->lpt = lpt;
 
@@ -134,13 +134,17 @@ dss_close(void *priv)
 }
 
 const lpt_device_t dss_device = {
-    .name          = "Disney Sound Source",
-    .internal_name = "dss",
-    .init          = dss_init,
-    .close         = dss_close,
-    .write_data    = dss_write_data,
-    .write_ctrl    = dss_write_ctrl,
-    .read_data     = NULL,
-    .read_status   = dss_read_status,
-    .read_ctrl     = NULL
+    .name             = "Disney Sound Source",
+    .internal_name    = "dss",
+    .init             = dss_init,
+    .close            = dss_close,
+    .write_data       = dss_write_data,
+    .strobe           = NULL,
+    .write_ctrl       = dss_write_ctrl,
+    .read_status      = dss_read_status,
+    .read_ctrl        = NULL,
+    .epp_write_data   = NULL,
+    .epp_request_read = NULL,
+    .priv             = NULL,
+    .lpt              = NULL
 };
diff --git a/src/sound/snd_mmb.c b/src/sound/snd_mmb.c
new file mode 100644
index 000000000..35a72efbc
--- /dev/null
+++ b/src/sound/snd_mmb.c
@@ -0,0 +1,339 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Mindscape Music Board emulation.
+ *
+ * Authors: Roy Baer, <https://pcem-emulator.co.uk/>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
+ *
+ *          Copyright 2025 Roy Baer.
+ *          Copyright 2025 Jasmine Iwanek.
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/sound.h>
+//#i nclude "cpu.h"
+#include "ayumi/ayumi.h"
+#include <86box/snd_mmb.h>
+#include <86box/plat_unused.h>
+
+#ifdef ENABLE_MMB_LOG
+int mmb_do_log = ENABLE_MMB_LOG;
+
+static void
+mmb_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (mmb_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define mmb_log(fmt, ...)
+#endif
+
+void
+mmb_update(mmb_t *mmb)
+{
+    for (; mmb->pos < sound_pos_global; mmb->pos++) {
+        ayumi_process(&mmb->first.chip);
+        ayumi_process(&mmb->second.chip);
+
+        ayumi_remove_dc(&mmb->first.chip);
+        ayumi_remove_dc(&mmb->second.chip);
+
+        mmb->buffer[mmb->pos << 1]       = (mmb->first.chip.left + mmb->second.chip.left) * 16000;
+        mmb->buffer[(mmb->pos << 1) + 1] = (mmb->first.chip.right + mmb->second.chip.right) * 16000;
+    }
+}
+
+void
+mmb_get_buffer(int32_t *buffer, int len, void *priv)
+{
+    mmb_t *mmb = (mmb_t *) priv;
+
+    mmb_update(mmb);
+
+    for (int c = 0; c < len * 2; c++)
+        buffer[c] += mmb->buffer[c];
+
+    mmb->pos = 0;
+}
+
+void
+mmb_write(uint16_t addr, uint8_t val, void *priv)
+{
+    mmb_t *mmb = (mmb_t *) priv;
+
+    mmb_update(mmb);
+
+    mmb_log("mmb_write(%04X): activity now: %02X\n", addr, val);
+
+    switch (addr & 3) {
+        case 0:
+            mmb->first.index = val;
+            break;
+        case 2:
+            mmb->second.index = val;
+            break;
+        case 1:
+        case 3:
+            {
+                ay_3_891x_t *ay = ((addr & 2) == 0) ? &mmb->first : &mmb->second;
+
+                switch (ay->index) {
+                    case 0:
+                        ay->regs[0] = val;
+                        ayumi_set_tone(&ay->chip, 0, (ay->regs[1] << 8) | ay->regs[0]);
+                        break;
+                    case 1:
+                        ay->regs[1] = val & 0xf;
+                        ayumi_set_tone(&ay->chip, 0, (ay->regs[1] << 8) | ay->regs[0]);
+                        break;
+                    case 2:
+                        ay->regs[2] = val;
+                        ayumi_set_tone(&ay->chip, 1, (ay->regs[3] << 8) | ay->regs[2]);
+                        break;
+                    case 3:
+                        ay->regs[3] = val & 0xf;
+                        ayumi_set_tone(&ay->chip, 1, (ay->regs[3] << 8) | ay->regs[2]);
+                        break;
+                    case 4:
+                        ay->regs[4] = val;
+                        ayumi_set_tone(&ay->chip, 2, (ay->regs[5] << 8) | ay->regs[4]);
+                        break;
+                    case 5:
+                        ay->regs[5] = val & 0xf;
+                        ayumi_set_tone(&ay->chip, 2, (ay->regs[5] << 8) | ay->regs[4]);
+                        break;
+                    case 6:
+                        ay->regs[6] = val & 0x1f;
+                        ayumi_set_noise(&ay->chip, ay->regs[6]);
+                        break;
+                    case 7:
+                        ay->regs[7] = val;
+                        ayumi_set_mixer(&ay->chip, 0, val & 1, (val >> 3) & 1, (ay->regs[8] >> 4) & 1);
+                        ayumi_set_mixer(&ay->chip, 1, (val >> 1) & 1, (val >> 4) & 1, (ay->regs[9] >> 4) & 1);
+                        ayumi_set_mixer(&ay->chip, 2, (val >> 2) & 1, (val >> 5) & 1, (ay->regs[10] >> 4) & 1);
+                        break;
+                    case 8:
+                        ay->regs[8] = val;
+                        ayumi_set_volume(&ay->chip, 0, val & 0xf);
+                        ayumi_set_mixer(&ay->chip, 0, ay->regs[7] & 1, (ay->regs[7] >> 3) & 1, (val >> 4) & 1);
+                        break;
+                    case 9:
+                        ay->regs[9] = val;
+                        ayumi_set_volume(&ay->chip, 1, val & 0xf);
+                        ayumi_set_mixer(&ay->chip, 1, (ay->regs[7] >> 1) & 1, (ay->regs[7] >> 4) & 1, (val >> 4) & 1);
+                        break;
+                    case 10:
+                        ay->regs[10] = val;
+                        ayumi_set_volume(&ay->chip, 2, val & 0xf);
+                        ayumi_set_mixer(&ay->chip, 2, (ay->regs[7] >> 2) & 1, (ay->regs[7] >> 5) & 1, (val >> 4) & 1);
+                        break;
+                    case 11:
+                        ay->regs[11] = val;
+                        ayumi_set_envelope(&ay->chip, (ay->regs[12] >> 8) | ay->regs[11]);
+                        break;
+                    case 12:
+                        ay->regs[12] = val;
+                        ayumi_set_envelope(&ay->chip, (ay->regs[12] >> 8) | ay->regs[11]);
+                        break;
+                    case 13:
+                        ay->regs[13] = val;
+                        ayumi_set_envelope_shape(&ay->chip, val & 0xf);
+                        break;
+                    case 14:
+                        ay->regs[14] = val;
+                        break;
+                    case 15:
+                        ay->regs[15] = val;
+                        break;
+
+                    default:
+                        break;
+                }
+                break;
+            }
+
+        default:
+            break;
+    }
+}
+
+uint8_t
+mmb_read(uint16_t addr, void *priv)
+{
+    mmb_t       *mmb = (mmb_t *) priv;
+    ay_3_891x_t *ay  = ((addr & 2) == 0) ? &mmb->first : &mmb->second;
+    uint8_t      ret = 0;
+
+    switch (ay->index) {
+        case 0:
+        case 1:
+        case 2:
+        case 3:
+        case 4:
+        case 5:
+        case 6:
+        case 7:
+        case 8:
+        case 9:
+        case 10:
+        case 11:
+        case 12:
+        case 13:
+            ret = ay->regs[ay->index];
+            break;
+        case 14:
+            if (ay->regs[7] & 0x40)
+                ret = ay->regs[14];
+            break;
+        case 15:
+            if (ay->regs[7] & 0x80)
+                ret = ay->regs[15];
+            break;
+
+        default:
+            break;
+    }
+
+    mmb_log("mmb_read(%04X): activity now: %02X\n", addr, ret);
+
+    return ret;
+}
+
+void *
+mmb_init(UNUSED(const device_t *info))
+{
+    mmb_t   *mmb  = calloc(1, sizeof(mmb_t));
+# if 0
+    uint16_t addr = (device_get_config_int("addr96") << 6) | (device_get_config_int("addr52") << 2);
+#else
+    uint16_t addr = 0x300;
+
+#endif
+    sound_add_handler(mmb_get_buffer, mmb);
+
+    ayumi_configure(&mmb->first.chip, 0, MMB_CLOCK, MMB_FREQ);
+    ayumi_configure(&mmb->second.chip, 0, MMB_CLOCK, MMB_FREQ);
+
+    for (uint8_t i = 0; i < 3; i++) {
+        ayumi_set_pan(&mmb->first.chip, i, 0.5, 1);
+        ayumi_set_pan(&mmb->second.chip, i, 0.5, 1);
+    }
+
+    io_sethandler(addr, 0x0004,
+                  mmb_read, NULL, NULL,
+                  mmb_write, NULL, NULL,
+                  mmb);
+
+    return mmb;
+}
+
+void
+mmb_close(void *priv)
+{
+    mmb_t *mmb = (mmb_t *) priv;
+
+    free(mmb);
+}
+
+// clang-format off
+#if 0
+static device_config_t mmb_config[] = {
+    {
+        .name           = "addr96",
+        .description    = "Base address A9...A6",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 12,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection   = {
+            { .description = "0000", .value =  0 },
+            { .description = "0001", .value =  1 },
+            { .description = "0010", .value =  2 },
+            { .description = "0011", .value =  3 },
+            { .description = "0100", .value =  4 },
+            { .description = "0101", .value =  5 },
+            { .description = "0110", .value =  6 },
+            { .description = "0111", .value =  7 },
+            { .description = "1000", .value =  8 },
+            { .description = "1001", .value =  9 },
+            { .description = "1010", .value = 10 },
+            { .description = "1011", .value = 11 },
+            { .description = "1100", .value = 12 },
+            { .description = "1101", .value = 13 },
+            { .description = "1110", .value = 14 },
+            { .description = "1111", .value = 15 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "addr52",
+        .description    = "Base address A5...A2",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection   = {
+            { .description = "0000", .value =  0 },
+            { .description = "0001", .value =  1 },
+            { .description = "0010", .value =  2 },
+            { .description = "0011", .value =  3 },
+            { .description = "0100", .value =  4 },
+            { .description = "0101", .value =  5 },
+            { .description = "0110", .value =  6 },
+            { .description = "0111", .value =  7 },
+            { .description = "1000", .value =  8 },
+            { .description = "1001", .value =  9 },
+            { .description = "1010", .value = 10 },
+            { .description = "1011", .value = 11 },
+            { .description = "1100", .value = 12 },
+            { .description = "1101", .value = 13 },
+            { .description = "1110", .value = 14 },
+            { .description = "1111", .value = 15 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
+    },
+    { .type = CONFIG_END }
+};
+#endif
+// clang-format on
+
+const device_t mmb_device = {
+    .name          = "Mindscape Music Board",
+    .internal_name = "mmb",
+    .flags         = DEVICE_ISA,
+    .local         = 0,
+    .init          = mmb_init,
+    .close         = mmb_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+#if 0
+    .config        = mmb_config
+#else
+    .config        = NULL
+#endif
+};
diff --git a/src/sound/snd_mpu401.c b/src/sound/snd_mpu401.c
index a8c9d3e3c..bec2ed39c 100644
--- a/src/sound/snd_mpu401.c
+++ b/src/sound/snd_mpu401.c
@@ -8,15 +8,13 @@
  *
  *           Roland MPU-401 emulation.
  *
- *
- *
  * Authors:  DOSBox Team,
  *           Miran Grca, <mgrca8@gmail.com>
  *           TheCollector1995, <mariogplayer@gmail.com>
  *
- *           Copyright 2008-2020 DOSBox Team.
- *           Copyright 2016-2020 Miran Grca.
- *           Copyright 2016-2020 TheCollector1995.
+ *           Copyright 2008-2024 DOSBox Team.
+ *           Copyright 2016-2024 Miran Grca.
+ *           Copyright 2016-2024 TheCollector1995.
  */
 #include <inttypes.h>
 #include <stdarg.h>
@@ -51,10 +49,11 @@ enum {
 int mpu401_standalone_enable = 0;
 
 static void MPU401_WriteCommand(mpu_t *mpu, uint8_t val);
+static void MPU401_WriteData(mpu_t *mpu, uint8_t val);
 static void MPU401_IntelligentOut(mpu_t *mpu, uint8_t track);
 static void MPU401_EOIHandler(void *priv);
 static void MPU401_EOIHandlerDispatch(void *priv);
-static void MPU401_NotesOff(mpu_t *mpu, int i);
+static __inline void MPU401_NotesOff(mpu_t *mpu, unsigned int i);
 
 #ifdef ENABLE_MPU401_LOG
 int mpu401_do_log = ENABLE_MPU401_LOG;
@@ -74,11 +73,26 @@ mpu401_log(const char *fmt, ...)
 #    define mpu401_log(fmt, ...)
 #endif
 
+static void
+MPU401_UpdateIRQ(mpu_t *mpu, int set)
+{
+    /* Clear IRQ. */
+    if ((mpu->irq > 0) && (mpu->irq <= 15)) {
+        mpu401_log("MPU401_UpdateIRQ(): Int IRQ %i %s.\n", mpu->irq, set ? "set" : "cleared");
+        picint_common(1 << mpu->irq, PIC_IRQ_EDGE, set, NULL);
+    }
+
+    if (mpu->ext_irq_update) {
+        mpu401_log("MPU401_UpdateIRQ(): Ext IRQ %s.\n", set ? "set" : "cleared");
+        mpu->ext_irq_update(mpu->priv, set);
+    }
+}
+
 static void
 MPU401_ReCalcClock(mpu_t *mpu)
 {
     int32_t mintempo = 16;
-    int32_t maxtempo = 240; 
+    int32_t maxtempo = 240;
     int32_t freq;
 
     if (mpu->clock.timebase < 72) {
@@ -96,10 +110,11 @@ MPU401_ReCalcClock(mpu_t *mpu)
     }
 
     mpu->clock.freq = ((uint32_t) (mpu->clock.tempo * 2 * mpu->clock.tempo_rel)) >> 6;
-    mpu->clock.freq = mpu->clock.timebase * (mpu->clock.freq < (mintempo * 2) ? mintempo : ((mpu->clock.freq / 2) < maxtempo ? (mpu->clock.freq / 2) : maxtempo));
+    mpu->clock.freq = mpu->clock.timebase * (mpu->clock.freq < (mintempo * 2) ?
+                      mintempo : ((mpu->clock.freq / 2) < maxtempo ? (mpu->clock.freq / 2) : maxtempo));
 
     if (mpu->state.sync_in) {
-        freq = (int32_t) ((float) (mpu->clock.freq) * mpu->clock.freq_mod);
+        freq = (int32_t) ((double) (mpu->clock.freq) * mpu->clock.freq_mod);
         if ((freq > (mpu->clock.timebase * mintempo)) && (freq < (mpu->clock.timebase * maxtempo)))
             mpu->clock.freq = freq;
     }
@@ -110,135 +125,109 @@ MPU401_ReStartClock(mpu_t *mpu)
 {
     if (mpu->clock.active) {
         timer_disable(&mpu->mpu401_event_callback);
-        timer_set_delay_u64(&mpu->mpu401_event_callback, (MPU401_TIMECONSTANT / mpu->clock.freq) * 1000 * TIMER_USEC);
+        timer_set_delay_u64(&mpu->mpu401_event_callback,
+                            (MPU401_TIMECONSTANT / mpu->clock.freq) * 1000 * TIMER_USEC);
+        mpu401_log("MPU-401: Clock restarted\n");
     }
 }
 
-static void
+static __inline void
 MPU401_StartClock(mpu_t *mpu)
 {
-    mpu401_log("MPU401_StartClock(): %i, %i, %i, %i\n", mpu->clock.active, mpu->state.clock_to_host,
-               mpu->state.playing, (mpu->state.rec == M_RECON));
-    if (mpu->clock.active)
-        return;
-    if (mpu->state.clock_to_host || mpu->state.playing || (mpu->state.rec == M_RECON))
-        return;
-
-    mpu->clock.active = 1;
-    timer_set_delay_u64(&mpu->mpu401_event_callback, (MPU401_TIMECONSTANT / mpu->clock.freq) * 1000 * TIMER_USEC);
+    if (!mpu->clock.active && (mpu->state.playing ||
+        mpu->state.clock_to_host || (mpu->state.rec == M_RECON))) {
+        mpu->clock.active = 1;
+        timer_set_delay_u64(&mpu->mpu401_event_callback,
+                            (MPU401_TIMECONSTANT / mpu->clock.freq) * 1000 * TIMER_USEC);
+        mpu401_log("MPU-401: Clock started\n");
+    }
 }
 
-static void
+static __inline void
 MPU401_StopClock(mpu_t *mpu)
 {
-    if (!mpu->state.clock_to_host && !mpu->state.playing && (mpu->state.rec == M_RECOFF))
-        return;
-    mpu->clock.active = 0;
-    timer_disable(&mpu->mpu401_event_callback);
+    if (mpu->clock.active && !mpu->state.playing &&
+        !mpu->state.clock_to_host && (mpu->state.rec != M_RECON)) {
+        mpu->clock.active = 0;
+        timer_disable(&mpu->mpu401_event_callback);
+        mpu401_log("MPU-401: Clock stopped\n");
+    }
 }
 
-static void
+static __inline void
 MPU401_RunClock(mpu_t *mpu)
 {
-    if (!mpu->clock.active) {
+    if (mpu->clock.active)
+        timer_advance_u64(&mpu->mpu401_event_callback,
+                          (MPU401_TIMECONSTANT / mpu->clock.freq) * 1000 * TIMER_USEC);
+    else
         timer_disable(&mpu->mpu401_event_callback);
-        return;
-    }
-    timer_advance_u64(&mpu->mpu401_event_callback, (MPU401_TIMECONSTANT / mpu->clock.freq) * 1000 * TIMER_USEC);
-#if 0
-    mpu401_log("Next event after %" PRIu64 " us (time constant: %i)\n", (uint64_t) ((MPU401_TIMECONSTANT / mpu->clock.freq) * 1000 * TIMER_USEC), (int) MPU401_TIMECONSTANT);
-#endif
 }
 
 static void
-MPU401_QueueByteEx(mpu_t *mpu, uint8_t data, UNUSED(int irq))
+MPU401_QueueByte(mpu_t *mpu, uint8_t data)
 {
     if (mpu->state.block_ack) {
         mpu->state.block_ack = 0;
         return;
     }
 
-    if (mpu->queue_used == 0) {
-        if (mpu->ext_irq_update)
-            mpu->ext_irq_update(mpu->priv, 1);
-        else {
-            mpu->state.irq_pending = 1;
-            picint(1 << mpu->irq);
-        }
+    mpu401_log("QueueByte Used=%d.\n", mpu->queue_used);
+    if (!mpu->queue_used) {
+        mpu->state.irq_pending = 1;
+        MPU401_UpdateIRQ(mpu, 1);
     }
 
     if (mpu->queue_used < MPU401_QUEUE) {
-        int pos = mpu->queue_used + mpu->queue_pos;
-
+        if (mpu->queue_pos > MPU401_QUEUE)  fatal("MPU queue overflow\n");
+        uint8_t pos = mpu->queue_used + mpu->queue_pos;
         if (mpu->queue_pos >= MPU401_QUEUE)
             mpu->queue_pos -= MPU401_QUEUE;
         if (pos >= MPU401_QUEUE)
             pos -= MPU401_QUEUE;
 
         mpu->queue_used++;
+        if (pos >= MPU401_QUEUE)  fatal("MPU position overflow\n");
         mpu->queue[pos] = data;
     }
 }
 
 static void
-MPU401_QueueByte(mpu_t *mpu, uint8_t data)
+MPU401_RecQueueBuffer(mpu_t *mpu, uint8_t *buf, unsigned int len)
 {
-    MPU401_QueueByteEx(mpu, data, 1);
-}
-
-static int
-MPU401_IRQPending(mpu_t *mpu)
-{
-    int irq_pending;
-
-    if (mpu->ext_irq_pending)
-        irq_pending = mpu->ext_irq_pending(mpu->priv);
-    else
-        irq_pending = mpu->state.irq_pending;
-
-    return irq_pending;
-}
-
-static void
-MPU401_RecQueueBuffer(mpu_t *mpu, uint8_t *buf, uint32_t len, UNUSED(int block))
-{
-    uint32_t cnt = 0;
-    int      pos;
+    unsigned int cnt = 0;
 
     while (cnt < len) {
         if (mpu->rec_queue_used < MPU401_INPUT_QUEUE) {
-            pos = mpu->rec_queue_used + mpu->rec_queue_pos;
+            unsigned int pos = mpu->rec_queue_used + mpu->rec_queue_pos;
             if (pos >= MPU401_INPUT_QUEUE)
                 pos -= MPU401_INPUT_QUEUE;
             mpu->rec_queue[pos] = buf[cnt];
             mpu->rec_queue_used++;
-            if ((!mpu->state.sysex_in_finished) && (buf[cnt] == MSG_EOX)) {
-                /* finish sysex */
+            if (!mpu->state.sysex_in_finished && (buf[cnt] == MSG_EOX)) {
+                /* Finish SysEx */
                 mpu->state.sysex_in_finished = 1;
                 break;
             }
             cnt++;
         }
     }
-
-    if (mpu->queue_used == 0) {
-        if (mpu->state.rec_copy || MPU401_IRQPending(mpu)) {
-            if (MPU401_IRQPending(mpu)) {
-                if (mpu->ext_irq_update)
-                    mpu->ext_irq_update(mpu->priv, 0);
-                else {
-                    mpu->state.irq_pending = 0;
-                    picintc(1 << mpu->irq);
-                }
+    if (!mpu->queue_used) {
+        if (mpu->state.rec_copy || mpu->state.irq_pending) {
+            if (mpu->state.irq_pending) {
+                mpu->state.irq_pending = 0;
+                MPU401_UpdateIRQ(mpu, 0);
             }
             return;
         }
+
         mpu->state.rec_copy = 1;
         if (mpu->rec_queue_pos >= MPU401_INPUT_QUEUE)
             mpu->rec_queue_pos -= MPU401_INPUT_QUEUE;
+
         MPU401_QueueByte(mpu, mpu->rec_queue[mpu->rec_queue_pos]);
-        mpu->rec_queue_used--;
-        mpu->rec_queue_pos++;
+            mpu->rec_queue_used--;
+            mpu->rec_queue_pos++;
     }
 }
 
@@ -250,12 +239,8 @@ MPU401_ClrQueue(mpu_t *mpu)
     mpu->rec_queue_used          = 0;
     mpu->rec_queue_pos           = 0;
     mpu->state.sysex_in_finished = 1;
-    if (mpu->ext_irq_update)
-        mpu->ext_irq_update(mpu->priv, 0);
-    else {
-        mpu->state.irq_pending = 0;
-        picintc(1 << mpu->irq);
-    }
+    mpu->state.irq_pending       = 0;
+    MPU401_UpdateIRQ(mpu, 0);
 }
 
 static void
@@ -263,86 +248,85 @@ MPU401_Reset(mpu_t *mpu)
 {
     uint8_t i;
 
-#ifdef DOSBOX_CODE
-    if (mpu->mode == M_INTELLIGENT) {
-        if (mpu->ext_irq_update)
-            mpu->ext_irq_update(mpu->priv, 0);
-        else {
-            mpu->state.irq_pending = 0;
-            picintc(1 << mpu->irq);
-        }
+    midi_reset();
+    /* Clear MIDI buffers, terminate notes. */
+    midi_clear_buffer();
+    for (i = 0xb0; i <= 0xbf; i++) {
+        midi_raw_out_byte(i);
+        midi_raw_out_byte(0x7b);
+        midi_raw_out_byte(0);
     }
-#else
-    if (mpu->ext_irq_update)
-        mpu->ext_irq_update(mpu->priv, 0);
-    else {
-        mpu->state.irq_pending = 0;
-        picintc(1 << mpu->irq);
-    }
-#endif
 
-    mpu->mode                = M_INTELLIGENT;
-    mpu->midi_thru           = 0;
-    mpu->state.rec           = M_RECOFF;
-    mpu->state.eoi_scheduled = 0;
-    mpu->state.wsd           = 0;
-    mpu->state.wsm           = 0;
-    mpu->state.conductor     = 0;
-    mpu->state.cond_req      = 0;
-    mpu->state.cond_set      = 0;
-    mpu->state.playing       = 0;
-    mpu->state.run_irq       = 0;
-    mpu->state.cmask         = 0xff;
-    mpu->state.amask = mpu->state.tmask = 0;
-    mpu->state.midi_mask                = 0xffff;
-    mpu->state.command_byte             = 0;
-    mpu->state.block_ack                = 0;
-    mpu->clock.tempo = mpu->clock.old_tempo = 100;
-    mpu->clock.timebase = mpu->clock.old_timebase = 120;
+    mpu->state.irq_pending = 0;
+    MPU401_UpdateIRQ(mpu, 0);
+
+    timer_disable(&mpu->mpu401_event_callback);
+
+    mpu->mode                                       = M_INTELLIGENT;
+    mpu->midi_thru                                  = 0;
+    mpu->state.rec                                  = M_RECOFF;
+    mpu->state.eoi_scheduled                        = 0;
+    mpu->state.wsd                                  = 0;
+    mpu->state.wsm                                  = 0;
+    mpu->state.conductor                            = 0;
+    mpu->state.cond_req                             = 0;
+    mpu->state.cond_set                             = 0;
+    mpu->state.playing                              = 0;
+    mpu->state.run_irq                              = 0;
+    mpu->state.cmask                                = 0xff;
+    mpu->state.amask = mpu->state.tmask             = 0;
+    mpu->state.midi_mask                            = 0xffff;
+    mpu->state.command_byte                         = 0;
+    mpu->state.block_ack                            = 0;
+    mpu->clock.tempo = mpu->clock.old_tempo         = 100;
+    mpu->clock.timebase = mpu->clock.old_timebase   = 120;
     mpu->clock.tempo_rel = mpu->clock.old_tempo_rel = 0x40;
     mpu->clock.freq_mod                             = 1.0;
     mpu->clock.tempo_grad                           = 0;
+    mpu->state.clock_to_host                        = 0;
     MPU401_StopClock(mpu);
     MPU401_ReCalcClock(mpu);
 
     for (i = 0; i < 4; i++)
-        mpu->clock.cth_rate[i] = 60;
+        mpu->clock.cth_rate[i]                      = 60;
 
-    mpu->clock.cth_counter      = 0;
-    mpu->clock.midimetro        = 12;
-    mpu->clock.metromeas        = 8;
-    mpu->filter.rec_measure_end = 1;
-    mpu->filter.rt_out          = 1;
-    mpu->filter.rt_affection    = 1;
-    mpu->filter.allnotesoff_out = 1;
-    mpu->filter.all_thru        = 1;
-    mpu->filter.midi_thru       = 1;
-    mpu->filter.commonmsgs_thru = 1;
+    mpu->clock.cth_counter                          = 0;
+    mpu->clock.midimetro                            = 12;
+    mpu->clock.metromeas                            = 8;
+    mpu->filter.rec_measure_end                     = 1;
+    mpu->filter.rt_out                              = 1;
+    mpu->filter.rt_affection                        = 1;
+    mpu->filter.allnotesoff_out                     = 1;
+    mpu->filter.all_thru                            = 1;
+    mpu->filter.midi_thru                           = 1;
+    mpu->filter.commonmsgs_thru                     = 1;
 
     /* Reset channel reference and input tables. */
     for (i = 0; i < 4; i++) {
-        mpu->chanref[i].on   = 1;
-        mpu->chanref[i].chan = i;
-        mpu->ch_toref[i]     = i;
+        mpu->chanref[i].on                          = 1;
+        mpu->chanref[i].chan                        = i;
+
+        mpu->ch_toref[i]                            = i;
     }
 
     for (i = 0; i < 16; i++) {
-        mpu->inputref[i].on   = 1;
-        mpu->inputref[i].chan = i;
+        mpu->inputref[i].on                         = 1;
+        mpu->inputref[i].chan                       = i;
         if (i > 3)
-            mpu->ch_toref[i] = 4; /* Dummy reftable. */
+            mpu->ch_toref[i]                        = 4; /* Dummy reftable. */
     }
 
     MPU401_ClrQueue(mpu);
-    mpu->state.data_onoff = -1;
+    mpu->state.data_onoff                           = -1;
 
-    mpu->state.req_mask  = 0;
-    mpu->condbuf.counter = 0;
-    mpu->condbuf.type    = T_OVERFLOW;
+    mpu->state.req_mask                             = 0;
+    mpu->condbuf.counter                            = 0;
+
+    mpu->condbuf.type                               = T_OVERFLOW;
 
     for (i = 0; i < 8; i++) {
-        mpu->playbuf[i].type    = T_OVERFLOW;
-        mpu->playbuf[i].counter = 0;
+        mpu->playbuf[i].type                        = T_OVERFLOW;
+        mpu->playbuf[i].counter                     = 0;
     }
 
     /* Clear MIDI buffers, terminate notes. */
@@ -355,15 +339,26 @@ MPU401_Reset(mpu_t *mpu)
     }
 }
 
+static uint8_t
+MPU401_ReadStatus(mpu_t *mpu)
+{
+    uint8_t ret = 0x00;
+
+    if (mpu->state.cmd_pending)
+        ret = STATUS_OUTPUT_NOT_READY;
+    if (!mpu->queue_used)
+        ret = STATUS_INPUT_NOT_READY;
+
+    ret |= 0x3f;
+
+    return ret;
+}
+
 static void
 MPU401_ResetDone(void *priv)
 {
     mpu_t *mpu = (mpu_t *) priv;
 
-    mpu401_log("MPU-401 reset callback\n");
-
-    timer_disable(&mpu->mpu401_reset_callback);
-
     mpu->state.reset = 0;
 
     if (mpu->state.cmd_pending) {
@@ -425,15 +420,15 @@ MPU401_WriteCommand(mpu_t *mpu, uint8_t val)
             }
             switch (val & 0xc) { /* Playing */
                 case 0x4:        /* Stop */
-                    MPU401_StopClock(mpu);
                     mpu->state.playing = 0;
+                    MPU401_StopClock(mpu);
                     for (i = 0; i < 16; i++)
                         MPU401_NotesOff(mpu, i);
                     mpu->filter.prchg_mask = 0;
                     break;
                 case 0x8: /* Start */
-                    MPU401_StartClock(mpu);
                     mpu->state.playing = 1;
+                    MPU401_StartClock(mpu);
                     MPU401_ClrQueue(mpu);
                     break;
 
@@ -444,14 +439,14 @@ MPU401_WriteCommand(mpu_t *mpu, uint8_t val)
                 case 0:           /* check if it waited for MIDI RT command */
                     if (((val & 3) < 2) || !mpu->filter.rt_affection || (mpu->state.rec != M_RECSTB))
                         break;
-                    MPU401_StartClock(mpu);
                     mpu->state.rec = M_RECON;
+                    MPU401_StartClock(mpu);
                     if (mpu->filter.prchg_mask)
                         send_prchg = 1;
                     break;
                 case 0x10: /* Stop */
-                    MPU401_StopClock(mpu);
                     mpu->state.rec = M_RECOFF;
+                    MPU401_StopClock(mpu);
                     MPU401_QueueByte(mpu, MSG_MPU_ACK);
                     MPU401_QueueByte(mpu, mpu->clock.rec_counter);
                     MPU401_QueueByte(mpu, MSG_MPU_END);
@@ -480,7 +475,7 @@ MPU401_WriteCommand(mpu_t *mpu, uint8_t val)
         /* record counter hack: needed by Prism, but sent only on cmd 0x20/0x26 (or breaks Ballade) */
         uint8_t rec_cnt = mpu->clock.rec_counter;
         if (((val == 0x20) || (val == 0x26)) && (mpu->state.rec == M_RECON))
-            MPU401_RecQueueBuffer(mpu, &rec_cnt, 1, 0);
+            MPU401_RecQueueBuffer(mpu, &rec_cnt, 1);
 
         if (send_prchg) {
             for (i = 0; i < 16; i++) {
@@ -488,11 +483,12 @@ MPU401_WriteCommand(mpu_t *mpu, uint8_t val)
                     recmsg[0] = mpu->clock.rec_counter;
                     recmsg[1] = 0xc0 | i;
                     recmsg[2] = mpu->filter.prchg_buf[i];
-                    MPU401_RecQueueBuffer(mpu, recmsg, 3, 0);
+                    MPU401_RecQueueBuffer(mpu, recmsg, 3);
                     mpu->filter.prchg_mask &= ~(1 << i);
                 }
             }
         }
+        return;
     } else if ((val >= 0xa0) && (val <= 0xa7)) /* Request play counter */
         MPU401_QueueByte(mpu, mpu->playbuf[val & 7].counter);
     else if ((val >= 0xd0) && (val <= 0xd7)) { /* Send data */
@@ -552,7 +548,8 @@ MPU401_WriteCommand(mpu_t *mpu, uint8_t val)
                 return;
             case 0x80: /* Internal clock */
                 if (mpu->clock.active && mpu->state.sync_in) {
-                    timer_set_delay_u64(&mpu->mpu401_event_callback, (MPU401_TIMECONSTANT / mpu->clock.freq) * 1000 * TIMER_USEC);
+                    timer_set_delay_u64(&mpu->mpu401_event_callback,
+                                        (MPU401_TIMECONSTANT / mpu->clock.freq) * 1000 * TIMER_USEC);
                     mpu->clock.freq_mod = 1.0;
                 }
                 mpu->state.sync_in = 0;
@@ -594,12 +591,12 @@ MPU401_WriteCommand(mpu_t *mpu, uint8_t val)
                 mpu->filter.rt_affection = !!(val & 1);
                 break;
             case 0x94: /* Clock to host */
-                MPU401_StopClock(mpu);
                 mpu->state.clock_to_host = 0;
+                MPU401_StopClock(mpu);
                 break;
             case 0x95:
-                MPU401_StartClock(mpu);
                 mpu->state.clock_to_host = 1;
+                MPU401_StartClock(mpu);
                 break;
             case 0x96:
             case 0x97: /* Sysex input allow */
@@ -650,6 +647,8 @@ MPU401_WriteCommand(mpu_t *mpu, uint8_t val)
                 mpu->state.conductor   = mpu->state.cond_set;
                 mpu->clock.cth_counter = mpu->clock.cth_old = 0;
                 mpu->clock.measure_counter = mpu->clock.meas_old = 0;
+                mpu->state.req_mask    = 0;
+                mpu->state.irq_pending = 1;
                 break;
             case 0xb9: /* Clear play map */
                 for (i = 0; i < 16; i++)
@@ -661,6 +660,8 @@ MPU401_WriteCommand(mpu_t *mpu, uint8_t val)
                 mpu->state.last_rtcmd  = 0;
                 mpu->clock.cth_counter = mpu->clock.cth_old = 0;
                 mpu->clock.measure_counter = mpu->clock.meas_old = 0;
+                mpu->state.req_mask    = 0;
+                mpu->state.irq_pending = 1;
                 break;
             case 0xba: /* Clear record counter */
                 mpu->clock.rec_counter = 0;
@@ -704,38 +705,106 @@ MPU401_WriteCommand(mpu_t *mpu, uint8_t val)
                     return;
                 break;
 
-                default:
+            default:
 #if 0
-                    mpu401_log("MPU-401:Unhandled command %X",val);
+                mpu401_log("MPU-401:Unhandled command %X",val);
 #endif
-                    break;
+                break;
         }
 
     MPU401_QueueByte(mpu, MSG_MPU_ACK);
 }
 
+void
+MPU401_ReadRaiseIRQ(mpu_t *mpu)
+{
+    /* Clear IRQ. */
+    MPU401_UpdateIRQ(mpu, 0);
+
+    if (mpu->queue_used)
+        MPU401_UpdateIRQ(mpu, 1);
+}
+
+uint8_t
+MPU401_ReadData(mpu_t *mpu)
+{
+    uint8_t ret = MSG_MPU_ACK;
+
+    if (mpu->queue_used) {
+        mpu->queue_pos -= (mpu->queue_pos >= MPU401_QUEUE) ? MPU401_QUEUE : 0;
+        ret = mpu->queue[mpu->queue_pos];
+        mpu->queue_pos++;
+        mpu->queue_used--;
+    }
+
+    /* Shouldn't this check mpu->mode? */
+    if (!mpu->intelligent || (mpu->mode == M_UART)) {
+        MPU401_ReadRaiseIRQ(mpu);
+        return ret;
+    }
+
+    mpu401_log("QueueUsed=%d.\n", mpu->queue_used);
+    if (!mpu->queue_used)
+        MPU401_UpdateIRQ(mpu, 0);
+
+    if (mpu->state.rec_copy && !mpu->rec_queue_used) {
+        MPU401_ReadRaiseIRQ(mpu);
+        mpu->state.rec_copy = 0;
+        MPU401_EOIHandler(mpu);
+        return ret;
+    }
+
+    /* Copy from recording buffer. */
+    if (!mpu->queue_used && mpu->rec_queue_used) {
+        mpu->state.rec_copy = 1;
+        if (mpu->rec_queue_pos >= MPU401_INPUT_QUEUE)
+            mpu->rec_queue_pos -= MPU401_INPUT_QUEUE;
+
+        MPU401_QueueByte(mpu, mpu->rec_queue[mpu->rec_queue_pos]);
+        mpu->rec_queue_pos++;
+        mpu->rec_queue_used--;
+    }
+
+    MPU401_ReadRaiseIRQ(mpu);
+
+    if ((ret >= 0xf0) && (ret <= 0xf7)) { /* MIDI data request */
+        mpu->state.track      = ret & 7;
+        mpu->state.data_onoff = 0;
+        mpu->state.cond_req   = 0;
+        mpu->state.track_req  = 1;
+    }
+
+    if (ret == MSG_MPU_COMMAND_REQ) {
+        mpu->state.data_onoff = 0;
+        mpu->state.cond_req   = 1;
+        if (mpu->condbuf.type != T_OVERFLOW) {
+            mpu->state.block_ack = 1;
+            MPU401_WriteCommand(mpu, mpu->condbuf.value[0]);
+            if (mpu->state.command_byte)
+                MPU401_WriteData(mpu, mpu->condbuf.value[1]);
+            mpu->condbuf.type = T_OVERFLOW;
+        }
+    }
+
+    if ((ret == MSG_MPU_END) || (ret == MSG_MPU_CLOCK) || (ret == MSG_MPU_ACK) || (ret == MSG_MPU_OVERFLOW))
+        MPU401_EOIHandlerDispatch(mpu);
+
+    return ret;
+}
+
 static void
 MPU401_WriteData(mpu_t *mpu, uint8_t val)
 {
-    static int length;
-    static int cnt;
+    static unsigned int length;
+    static unsigned int cnt;
+    static unsigned int posd;
 
-#ifdef DOSBOX_CODE
-    if (mpu->mode == M_UART) {
-        midi_raw_out_byte(val);
-        return;
-    }
-
-    if (!mpu->intelligent) {
-        mpu->state.command_byte = 0;
-        return;
-    }
-#else
     if (!mpu->intelligent || (mpu->mode == M_UART)) {
         midi_raw_out_byte(val);
+        if (val == 0xff)
+            midi_reset();
         return;
     }
-#endif
 
     switch (mpu->state.command_byte) { /* 0xe# command data */
         case 0x00:
@@ -759,6 +828,7 @@ MPU401_WriteData(mpu_t *mpu, uint8_t val)
             MPU401_ReStartClock(mpu);
             return;
         case 0xe2: /* Set gradation for relative tempo */
+            mpu->state.command_byte = 0;
             mpu->clock.tempo_grad = val;
             MPU401_ReCalcClock(mpu);
             MPU401_ReStartClock(mpu);
@@ -844,6 +914,7 @@ MPU401_WriteData(mpu_t *mpu, uint8_t val)
         }
 
         if (cnt == length) {
+            mpu->playbuf[mpu->state.track].vlength = cnt;
             MPU401_IntelligentOut(mpu, mpu->state.track);
             mpu->state.wsd   = 0;
             mpu->state.track = mpu->state.old_track;
@@ -874,8 +945,9 @@ MPU401_WriteData(mpu_t *mpu, uint8_t val)
                     break;
 
                 default:
+                    length = 0;
                     mpu->state.wsm = 0;
-                    return;
+                    break;
             }
         } else if (val & 0x80) {
             midi_raw_out_byte(MSG_EOX);
@@ -900,38 +972,36 @@ MPU401_WriteData(mpu_t *mpu, uint8_t val)
             case -1:
                 return;
             case 0: /* Timing byte */
-                mpu->condbuf.length = 0;
+                mpu->condbuf.vlength = 0;
                 if (val < 0xf0)
                     mpu->state.data_onoff++;
                 else {
-                    mpu->state.cond_req   = 0;
                     mpu->state.data_onoff = -1;
                     MPU401_EOIHandlerDispatch(mpu);
-                    break;
+                    return;
                 }
-                mpu->state.send_now  = !val ? 1 : 0;
+                /* A timing value of 0 means send it now! */
+                mpu->state.send_now  = (val == 0);
                 mpu->condbuf.counter = val;
                 break;
             case 1: /* Command byte #1 */
                 mpu->condbuf.type = T_COMMAND;
                 if ((val == 0xf8) || (val == 0xf9) || (val == 0xfc))
                     mpu->condbuf.type = T_OVERFLOW;
-                mpu->condbuf.value[mpu->condbuf.length] = val;
-                mpu->condbuf.length++;
-                if ((val & 0xf0) != 0xe0) { /*no cmd data byte*/
-                    MPU401_EOIHandler(mpu);
-                    mpu->state.data_onoff = -1;
-                    mpu->state.cond_req   = 0;
-                } else
+
+                mpu->condbuf.value[mpu->condbuf.vlength] = val;
+                mpu->condbuf.vlength++;
+
+                if ((val & 0xf0) != 0xe0)
+                    MPU401_EOIHandlerDispatch(mpu);
+                else
                     mpu->state.data_onoff++;
                 break;
 
             case 2: /* Command byte #2 */
-                mpu->condbuf.value[mpu->condbuf.length] = val;
-                mpu->condbuf.length++;
-                MPU401_EOIHandler(mpu);
-                mpu->state.data_onoff = -1;
-                mpu->state.cond_req   = 0;
+                mpu->condbuf.value[mpu->condbuf.vlength] = val;
+                mpu->condbuf.vlength++;
+                MPU401_EOIHandlerDispatch(mpu);
                 break;
 
             default:
@@ -939,103 +1009,95 @@ MPU401_WriteData(mpu_t *mpu, uint8_t val)
         }
         return;
     }
-
     switch (mpu->state.data_onoff) {
         /* Data */
         case -1:
-            break;
+            return;
         case 0: /* Timing byte */
             if (val < 0xf0)
-                mpu->state.data_onoff++;
+                mpu->state.data_onoff = 1;
             else {
                 mpu->state.data_onoff = -1;
                 MPU401_EOIHandlerDispatch(mpu);
                 mpu->state.track_req = 0;
                 return;
             }
-            mpu->state.send_now                    = !val ? 1 : 0;
+            mpu->state.send_now                    = (val == 0);
             mpu->playbuf[mpu->state.track].counter = val;
             break;
         case 1: /* MIDI */
-            cnt = 0;
-            mpu->state.data_onoff++;
-            switch (val & 0xf0) {
-                case 0xc0:
-                case 0xd0: /* MIDI Message */
-                    length = mpu->playbuf[mpu->state.track].length = 2;
-                    mpu->playbuf[mpu->state.track].type            = T_MIDI_NORM;
-                    break;
-                case 0x80:
-                case 0x90:
-                case 0xa0:
-                case 0xb0:
-                case 0xe0:
-                    length = mpu->playbuf[mpu->state.track].length = 3;
-                    mpu->playbuf[mpu->state.track].type            = T_MIDI_NORM;
-                    break;
-                case 0xf0: /* System message or mark */
-                    mpu->playbuf[mpu->state.track].sys_val = val;
-                    if (val > 0xf7) {
-                        mpu->playbuf[mpu->state.track].type = T_MARK;
-                        if (val == 0xf9)
-                            mpu->clock.measure_counter = 0;
-                    } else {
-#if 0
-                        mpu401_log("MPU-401:Illegal message");
-#endif
-                        mpu->playbuf[mpu->state.track].type = T_OVERFLOW;
-                    }
-                    mpu->state.data_onoff = -1;
-                    MPU401_EOIHandler(mpu);
-                    mpu->state.track_req = 0;
-                    return;
-                default: /* MIDI with running status */
-                    cnt++;
-                    length                              = mpu->playbuf[mpu->state.track].length;
-                    mpu->playbuf[mpu->state.track].type = T_MIDI_NORM;
-                    break;
-            }
-            break;
-        case 2:
-            if (cnt < length) {
-                mpu->playbuf[mpu->state.track].value[cnt] = val;
-                cnt++;
-            }
-            if (cnt == length) {
-                mpu->state.data_onoff = -1;
-                mpu->state.track_req  = 0;
-                MPU401_EOIHandler(mpu);
-            }
-            break;
+            mpu->playbuf[mpu->state.track].vlength++;
+            posd = mpu->playbuf[mpu->state.track].vlength;
+  
+            if (posd == 1) {
+                switch (val & 0xf0) {
+                    case 0xc0:
+                    case 0xd0: /* MIDI Message */
+                        mpu->playbuf[mpu->state.track].type            = T_MIDI_NORM;
+                        length = mpu->playbuf[mpu->state.track].length = 2;
+                        break;
+                    case 0x80:
+                    case 0x90:
+                    case 0xa0:
+                    case 0xb0:
+                    case 0xe0:
+                        mpu->playbuf[mpu->state.track].type            = T_MIDI_NORM;
+                        length = mpu->playbuf[mpu->state.track].length = 3;
+                        break;
+                    case 0xf0: /* System message or mark */
+                        mpu->playbuf[mpu->state.track].sys_val = val;
+                        if (val > 0xf7) {
+                            mpu->playbuf[mpu->state.track].type = T_MARK;
+                            if (val == 0xf9)
+                                mpu->clock.measure_counter = 0;
+                        } else
+                            mpu->playbuf[mpu->state.track].type = T_OVERFLOW;
 
-        default:
+                        length = 1;
+                        break;
+
+                    default: /* MIDI with running status */
+                        posd++;
+                        length                              = mpu->playbuf[mpu->state.track].length;
+                        mpu->playbuf[mpu->state.track].vlength++;
+                        mpu->playbuf[mpu->state.track].type = T_MIDI_NORM;
+                        break;
+                }
+            }
+
+            if (!((posd == 1) && (val >= 0xf0)))
+                mpu->playbuf[mpu->state.track].value[posd - 1] = val;
+
+            if (posd == length) {
+                MPU401_EOIHandlerDispatch(mpu);
+                mpu->state.track_req = 0;
+            }
             break;
     }
-
-    return;
 }
 
 static void
 MPU401_IntelligentOut(mpu_t *mpu, uint8_t track)
 {
-    uint8_t chan;
-    uint8_t chrefnum;
-    uint8_t key;
-    uint8_t msg;
-    int     send;
-    int     retrigger;
+    unsigned int chan;
+    unsigned int chrefnum;
+    uint8_t      key;
+    uint8_t      msg;
+    uint8_t      val;
+    int          send;
+    int          retrigger;
 
     switch (mpu->playbuf[track].type) {
         case T_OVERFLOW:
             break;
-
         case T_MARK:
-            if (mpu->playbuf[track].sys_val == 0xfc) {
-                midi_raw_out_rt_byte(mpu->playbuf[track].sys_val);
+            val = mpu->playbuf[track].sys_val;
+            if (val == 0xfc) {
+                midi_raw_out_rt_byte(val);
                 mpu->state.amask &= ~(1 << track);
+                mpu->state.req_mask &= ~(1 << track);
             }
             break;
-
         case T_MIDI_NORM:
             chan      = mpu->playbuf[track].value[0] & 0xf;
             key       = mpu->playbuf[track].value[1] & 0x7f;
@@ -1043,18 +1105,20 @@ MPU401_IntelligentOut(mpu_t *mpu, uint8_t track)
             send      = 1;
             retrigger = 0;
             switch (msg = mpu->playbuf[track].value[0] & 0xf0) {
-                case 0x80: /* note off */
+                case 0x80: /* Note off */
                     if (mpu->inputref[chan].on && (mpu->inputref[chan].M_GETKEY))
                         send = 0;
                     if (mpu->chanref[chrefnum].on && (!(mpu->chanref[chrefnum].M_GETKEY)))
                         send = 0;
+
                     mpu->chanref[chrefnum].M_DELKEY;
                     break;
-                case 0x90: /* note on */
+                case 0x90: /* Note on */
                     if (mpu->inputref[chan].on && (mpu->inputref[chan].M_GETKEY))
                         retrigger = 1;
                     if (mpu->chanref[chrefnum].on && (!(mpu->chanref[chrefnum].M_GETKEY)))
                         retrigger = 1;
+
                     mpu->chanref[chrefnum].M_SETKEY;
                     break;
                 case 0xb0:
@@ -1063,7 +1127,6 @@ MPU401_IntelligentOut(mpu_t *mpu, uint8_t track)
                         return;
                     }
                     break;
-
                 default:
                     break;
             }
@@ -1073,7 +1136,7 @@ MPU401_IntelligentOut(mpu_t *mpu, uint8_t track)
                 midi_raw_out_byte(0);
             }
             if (send) {
-                for (uint8_t i = 0; i < mpu->playbuf[track].length; i++)
+                for (uint8_t i = 0; i < mpu->playbuf[track].vlength; ++i)
                     midi_raw_out_byte(mpu->playbuf[track].value[i]);
             }
             break;
@@ -1087,8 +1150,8 @@ static void
 UpdateTrack(mpu_t *mpu, uint8_t track)
 {
     MPU401_IntelligentOut(mpu, track);
-
     if (mpu->state.amask & (1 << track)) {
+        mpu->playbuf[track].vlength = 0;
         mpu->playbuf[track].type    = T_OVERFLOW;
         mpu->playbuf[track].counter = 0xf0;
         mpu->state.req_mask |= (1 << track);
@@ -1098,46 +1161,78 @@ UpdateTrack(mpu_t *mpu, uint8_t track)
     }
 }
 
-/* Updates counters and requests new data on "End of Input" */
 static void
-MPU401_EOIHandler(void *priv)
+MPU401_Event(void *priv)
 {
     mpu_t  *mpu = (mpu_t *) priv;
-    uint8_t i;
 
-    mpu401_log("MPU-401 end of input callback\n");
-
-    timer_disable(&mpu->mpu401_eoi_callback);
-    mpu->state.eoi_scheduled = 0;
-    if (mpu->state.send_now) {
-        mpu->state.send_now = 0;
-        if (mpu->state.cond_req) {
-            mpu->condbuf.counter = 0xf0;
-            mpu->state.req_mask |= (1 << 9);
-        } else
-            UpdateTrack(mpu, mpu->state.track);
-    }
-
-    if (mpu->state.rec_copy || !mpu->state.sysex_in_finished)
+    if (!mpu->intelligent || (mpu->mode == M_UART))
         return;
 
-    if (!mpu->state.req_mask || !mpu->clock.active)
-        return;
+    if (mpu->state.irq_pending)
+        goto next_event;
 
-    if (mpu->ext_irq_update)
-        mpu->ext_irq_update(mpu->priv, 0);
-    else {
-        mpu->state.irq_pending = 0;
-    }
-
-    i = 0;
-    do {
-        if (mpu->state.req_mask & (1 << i)) {
-            MPU401_QueueByte(mpu, 0xf0 + i);
-            mpu->state.req_mask &= ~(1 << i);
-            break;
+    if (mpu->state.playing) {
+        /* Decrease counters. */
+        for (uint8_t i = 0; i < 8; i++) {
+            if (mpu->state.amask & (1 << i)) {
+                if (mpu->playbuf[i].counter)
+                    mpu->playbuf[i].counter--;
+                if (!mpu->playbuf[i].counter)
+                    UpdateTrack(mpu, i);
+            }
         }
-    } while ((i++) < 16);
+        if (mpu->state.conductor) {
+            if (mpu->condbuf.counter)
+                mpu->condbuf.counter--;
+            if (!mpu->condbuf.counter) {
+                mpu->condbuf.vlength = 0;
+                mpu->condbuf.counter = 0xf0;
+                mpu->state.req_mask |= (1 << 9);
+            }
+        }
+    }
+
+    if (mpu->state.clock_to_host) {
+        mpu->clock.cth_counter++;
+        if (mpu->clock.cth_counter >= mpu->clock.cth_rate[mpu->clock.cth_mode]) {
+            mpu->clock.cth_counter = 0;
+            ++mpu->clock.cth_mode;
+            mpu->clock.cth_mode %= 4;
+            mpu->state.req_mask |= (1 << 13);
+        }
+    }
+
+    /* Recording */
+    if (mpu->state.rec == M_RECON) {
+        mpu->clock.rec_counter++;
+        if (mpu->clock.rec_counter >= 240) {
+            mpu->clock.rec_counter = 0;
+            mpu->state.req_mask |= (1 << 8);
+        }
+    }
+
+    if (mpu->state.playing || (mpu->state.rec == M_RECON)) {
+        int max_meascnt = (mpu->clock.timebase * mpu->clock.midimetro * mpu->clock.metromeas) / 24;
+        if (max_meascnt != 0) { /* Measure end */
+            if (++mpu->clock.measure_counter >= max_meascnt) {
+                if (mpu->filter.rt_out)
+                    midi_raw_out_rt_byte(0xf8);
+
+                mpu->clock.measure_counter=0;
+                if (mpu->filter.rec_measure_end && (mpu->state.rec == M_RECON))
+                    mpu->state.req_mask |= (1 << 12);
+            }
+        }
+    }
+
+    if (!mpu->state.irq_pending && mpu->state.req_mask)
+        MPU401_EOIHandler(mpu);
+
+next_event:
+    MPU401_RunClock(mpu);
+    if (mpu->state.sync_in)
+        mpu->clock.ticks_in++;
 }
 
 static void
@@ -1148,111 +1243,78 @@ MPU401_EOIHandlerDispatch(void *priv)
     mpu401_log("EOI handler dispatch\n");
     if (mpu->state.send_now) {
         mpu->state.eoi_scheduled = 1;
-        timer_advance_u64(&mpu->mpu401_eoi_callback, 60LL * TIMER_USEC); /* Possibly a bit longer */
+        timer_set_delay_u64(&mpu->mpu401_eoi_callback, 60LL * TIMER_USEC); /* Possibly a bit longer */
     } else if (!mpu->state.eoi_scheduled)
         MPU401_EOIHandler(mpu);
 }
 
+/* Updates counters and requests new data on "End of Input" */
+static void
+MPU401_EOIHandler(void *priv)
+{
+    mpu_t  *mpu = (mpu_t *) priv;
+
+    mpu401_log("MPU-401 end of input callback\n");
+
+    mpu->state.eoi_scheduled = 0;
+    if (mpu->state.send_now) {
+        mpu->state.send_now = 0;
+        if (mpu->state.cond_req) {
+            mpu->condbuf.vlength = 0;
+            mpu->condbuf.counter = 0xf0;
+            mpu->state.req_mask |= (1 << 9);
+        } else
+            UpdateTrack(mpu, mpu->state.track);
+    }
+    if (mpu->state.rec_copy || !mpu->state.sysex_in_finished)
+        return;
+
+    mpu->state.irq_pending = 0;
+
+    if (!mpu->state.req_mask || !mpu->clock.active)
+        return;
+
+    uint8_t i = 0;
+    do {
+        if (mpu->state.req_mask & (1 << i)) {
+            MPU401_QueueByte(mpu, 0xf0 + i);
+            mpu->state.req_mask &= ~(1 << i);
+            break;
+        }
+    } while ((i++) < 16);
+}
+
+static __inline void
+MPU401_NotesOff(mpu_t *mpu, unsigned int i)
+{
+    if (mpu->filter.allnotesoff_out && !(mpu->inputref[i].on &&
+        (mpu->inputref[i].key[0] | mpu->inputref[i].key[1] |
+        mpu->inputref[i].key[2] | mpu->inputref[i].key[3]))) {
+        for (uint8_t j = 0;j < 4; j++)
+            mpu->chanref[mpu->ch_toref[i]].key[j] = 0;
+
+        midi_raw_out_byte(0xb0 | i);
+        midi_raw_out_byte(123);
+        midi_raw_out_byte(0);
+    } else if (mpu->chanref[mpu->ch_toref[i]].on) {
+        for (uint8_t key = 0; key < 128; key++) {
+            if ((mpu->chanref[mpu->ch_toref[i]].M_GETKEY) &&
+                !(mpu->inputref[i].on && (mpu->inputref[i].M_GETKEY))) {
+                midi_raw_out_byte(0x80 | i);
+                midi_raw_out_byte(key);
+                midi_raw_out_byte(0);
+            }
+            mpu->chanref[mpu->ch_toref[i]].M_DELKEY;
+        }
+    }
+}
+
 static void
 imf_write(UNUSED(uint16_t addr), UNUSED(uint8_t val), UNUSED(void *priv))
 {
     mpu401_log("IMF:Wr %4X,%X\n", addr, val);
 }
 
-void
-MPU401_ReadRaiseIRQ(mpu_t *mpu)
-{
-    /* Clear IRQ. */
-    if (mpu->ext_irq_update)
-        mpu->ext_irq_update(mpu->priv, 0);
-    else {
-        mpu->state.irq_pending = 0;
-        picintc(1 << mpu->irq);
-    }
-
-    if (mpu->queue_used) {
-        /* Bytes remaining in queue, raise IRQ again. */
-        if (mpu->ext_irq_update)
-            mpu->ext_irq_update(mpu->priv, 1);
-        else {
-            mpu->state.irq_pending = 1;
-            picint(1 << mpu->irq);
-        }
-    }
-}
-
-uint8_t
-MPU401_ReadData(mpu_t *mpu)
-{
-    uint8_t ret;
-
-    ret = MSG_MPU_ACK;
-
-    if (mpu->queue_used) {
-        if (mpu->queue_pos >= MPU401_QUEUE)
-            mpu->queue_pos -= MPU401_QUEUE;
-        ret = mpu->queue[mpu->queue_pos];
-        mpu->queue_pos++;
-        mpu->queue_used--;
-    }
-
-    /* Shouldn't this check mpu->mode? */
-#ifdef DOSBOX_CODE
-    if (mpu->mode == M_UART) {
-        MPU401_ReadRaiseIRQ(mpu);
-        return ret;
-    }
-#else
-    if (!mpu->intelligent || (mpu->mode == M_UART)) {
-        MPU401_ReadRaiseIRQ(mpu);
-        return ret;
-    }
-#endif
-
-    if (mpu->state.rec_copy && !mpu->rec_queue_used) {
-        mpu->state.rec_copy = 0;
-        MPU401_EOIHandler(mpu);
-        return ret;
-    }
-
-    /* Copy from recording buffer. */
-    if (!mpu->queue_used && mpu->rec_queue_used) {
-        mpu->state.rec_copy = 1;
-        if (mpu->rec_queue_pos >= MPU401_INPUT_QUEUE)
-            mpu->rec_queue_pos -= MPU401_INPUT_QUEUE;
-        MPU401_QueueByte(mpu, mpu->rec_queue[mpu->rec_queue_pos]);
-        mpu->rec_queue_pos++;
-        mpu->rec_queue_used--;
-    }
-
-    MPU401_ReadRaiseIRQ(mpu);
-
-    if ((ret >= 0xf0) && (ret <= 0xf7)) {
-        /* MIDI data request */
-        mpu->state.track      = ret & 7;
-        mpu->state.data_onoff = 0;
-        mpu->state.cond_req   = 0;
-        mpu->state.track_req  = 1;
-    }
-
-    if (ret == MSG_MPU_COMMAND_REQ) {
-        mpu->state.data_onoff = 0;
-        mpu->state.cond_req   = 1;
-        if (mpu->condbuf.type != T_OVERFLOW) {
-            mpu->state.block_ack = 1;
-            MPU401_WriteCommand(mpu, mpu->condbuf.value[0]);
-            if (mpu->state.command_byte)
-                MPU401_WriteData(mpu, mpu->condbuf.value[1]);
-            mpu->condbuf.type = T_OVERFLOW;
-        }
-    }
-
-    if ((ret == MSG_MPU_END) || (ret == MSG_MPU_CLOCK) || (ret == MSG_MPU_ACK) || (ret == MSG_MPU_OVERFLOW))
-        MPU401_EOIHandlerDispatch(mpu);
-
-    return ret;
-}
-
 void
 mpu401_write(uint16_t addr, uint8_t val, void *priv)
 {
@@ -1288,12 +1350,7 @@ mpu401_read(uint16_t addr, void *priv)
             break;
 
         case 1: /* Read Status */
-            if (mpu->state.cmd_pending)
-                ret = STATUS_OUTPUT_NOT_READY;
-            if (!mpu->queue_used)
-                ret = STATUS_INPUT_NOT_READY;
-            ret |= 0x3f;
-
+            ret = MPU401_ReadStatus(mpu);
             mpu401_log("Read Status (0x331) %x\n", ret);
             break;
 
@@ -1305,111 +1362,6 @@ mpu401_read(uint16_t addr, void *priv)
     return ret;
 }
 
-static void
-MPU401_Event(void *priv)
-{
-    mpu_t  *mpu = (mpu_t *) priv;
-    int     max_meascnt;
-
-    mpu401_log("MPU-401 event callback\n");
-
-#ifdef DOSBOX_CODE
-    if (mpu->mode == M_UART) {
-        timer_disable(&mpu->mpu401_event_callback);
-        return;
-    }
-#else
-    if (!mpu->intelligent || (mpu->mode == M_UART)) {
-        timer_disable(&mpu->mpu401_event_callback);
-        return;
-    }
-#endif
-
-    if (MPU401_IRQPending(mpu))
-        goto next_event;
-
-    if (mpu->state.playing) {
-        for (uint8_t i = 0; i < 8; i++) {
-            /* Decrease counters. */
-            if (mpu->state.amask & (1 << i)) {
-                mpu->playbuf[i].counter--;
-                if (mpu->playbuf[i].counter <= 0)
-                    UpdateTrack(mpu, i);
-            }
-        }
-
-        if (mpu->state.conductor) {
-            mpu->condbuf.counter--;
-            if (mpu->condbuf.counter <= 0) {
-                mpu->condbuf.counter = 0xf0;
-                mpu->state.req_mask |= (1 << 9);
-            }
-        }
-    }
-
-    if (mpu->state.clock_to_host) {
-        mpu->clock.cth_counter++;
-        if (mpu->clock.cth_counter >= mpu->clock.cth_rate[mpu->clock.cth_mode]) {
-            mpu->clock.cth_counter = 0;
-            mpu->clock.cth_mode++;
-            mpu->clock.cth_mode %= 4;
-            mpu->state.req_mask |= (1 << 13);
-        }
-    }
-
-    if (mpu->state.rec == M_RECON) {
-        /* Recording. */
-        mpu->clock.rec_counter++;
-        if (mpu->clock.rec_counter >= 240) {
-            mpu->clock.rec_counter = 0;
-            mpu->state.req_mask |= (1 << 8);
-        }
-    }
-
-    if (mpu->state.playing || (mpu->state.rec == M_RECON)) {
-        max_meascnt = (mpu->clock.timebase * mpu->clock.midimetro * mpu->clock.metromeas) / 24;
-        if (max_meascnt != 0) {
-            /* Measure end. */
-            if (++mpu->clock.measure_counter >= max_meascnt) {
-                if (mpu->filter.rt_out)
-                    midi_raw_out_rt_byte(0xf8);
-                mpu->clock.measure_counter = 0;
-                if (mpu->filter.rec_measure_end && (mpu->state.rec == M_RECON))
-                    mpu->state.req_mask |= (1 << 12);
-            }
-        }
-    }
-
-    if (!MPU401_IRQPending(mpu) && mpu->state.req_mask)
-        MPU401_EOIHandler(mpu);
-
-next_event:
-    MPU401_RunClock(mpu);
-    if (mpu->state.sync_in)
-        mpu->clock.ticks_in++;
-}
-
-static void
-MPU401_NotesOff(mpu_t *mpu, int i)
-{
-    if (mpu->filter.allnotesoff_out && !(mpu->inputref[i].on && (mpu->inputref[i].key[0] | mpu->inputref[i].key[1] | mpu->inputref[i].key[2] | mpu->inputref[i].key[3]))) {
-        for (uint8_t j = 0; j < 4; j++)
-            mpu->chanref[mpu->ch_toref[i]].key[j] = 0;
-        midi_raw_out_byte(0xb0 | i);
-        midi_raw_out_byte(123);
-        midi_raw_out_byte(0);
-    } else if (mpu->chanref[mpu->ch_toref[i]].on) {
-        for (uint8_t key = 0; key < 128; key++) {
-            if ((mpu->chanref[mpu->ch_toref[i]].M_GETKEY) && !(mpu->inputref[i].on && (mpu->inputref[i].M_GETKEY))) {
-                midi_raw_out_byte(0x80 | i);
-                midi_raw_out_byte(key);
-                midi_raw_out_byte(0);
-            }
-            mpu->chanref[mpu->ch_toref[i]].M_DELKEY;
-        }
-    }
-}
-
 /*Input handler for SysEx */
 int
 MPU401_InputSysex(void *priv, uint8_t *buffer, uint32_t len, int abort)
@@ -1420,14 +1372,12 @@ MPU401_InputSysex(void *priv, uint8_t *buffer, uint32_t len, int abort)
 
     mpu401_log("MPU401 Input Sysex\n");
 
-#ifdef DOSBOX_CODE
-    if (mpu->mode == M_UART) {
-#else
     if (!mpu->intelligent || mpu->mode == M_UART) {
-#endif
         /* UART mode input. */
         for (i = 0; i < len; i++)
             MPU401_QueueByte(mpu, buffer[i]);
+
+        MPU401_ReadRaiseIRQ(mpu);
         return 0;
     }
 
@@ -1440,7 +1390,7 @@ MPU401_InputSysex(void *priv, uint8_t *buffer, uint32_t len, int abort)
         if (mpu->state.sysex_in_finished) {
             if (mpu->rec_queue_used >= MPU401_INPUT_QUEUE)
                 return len;
-            MPU401_RecQueueBuffer(mpu, &val_ff, 1, 1);
+            MPU401_RecQueueBuffer(mpu, &val_ff, 1);
             mpu->state.sysex_in_finished = 0;
             mpu->clock.rec_counter       = 0;
         }
@@ -1449,10 +1399,10 @@ MPU401_InputSysex(void *priv, uint8_t *buffer, uint32_t len, int abort)
         int available = MPU401_INPUT_QUEUE - mpu->rec_queue_used;
 
         if (available >= len) {
-            MPU401_RecQueueBuffer(mpu, buffer, len, 1);
+            MPU401_RecQueueBuffer(mpu, buffer, len);
             return 0;
         } else {
-            MPU401_RecQueueBuffer(mpu, buffer, available, 1);
+            MPU401_RecQueueBuffer(mpu, buffer, available);
             if (mpu->state.sysex_in_finished)
                 return 0;
             return (len - available);
@@ -1490,11 +1440,7 @@ MPU401_InputMsg(void *priv, uint8_t *msg, uint32_t len)
 
     mpu401_log("MPU401 Input Msg\n");
 
-#ifdef DOSBOX_CODE
-    if (mpu->mode == M_INTELLIGENT) {
-#else
     if (mpu->intelligent && (mpu->mode == M_INTELLIGENT)) {
-#endif
         if (msg[0] < 0x80) {
             /* Expand running status */
             msg[2] = msg[1];
@@ -1606,7 +1552,7 @@ MPU401_InputMsg(void *priv, uint8_t *msg, uint32_t len)
                         if (!(mpu->filter.rt_in && (msg[0] <= 0xfc) && (msg[0] >= 0xfa))) {
                             recdata[0] = 0xff;
                             recdata[1] = msg[0];
-                            MPU401_RecQueueBuffer(mpu, recdata, 2, 1);
+                            MPU401_RecQueueBuffer(mpu, recdata, 2);
                             send = 0;
                         }
                     } else { /* Common or system. */
@@ -1624,7 +1570,7 @@ MPU401_InputMsg(void *priv, uint8_t *msg, uint32_t len)
                         recmsg[1] = msg[0];
                         recmsg[2] = msg[1];
                         recmsg[3] = msg[2];
-                        MPU401_RecQueueBuffer(mpu, recmsg, len + 1, 1);
+                        MPU401_RecQueueBuffer(mpu, recmsg, len + 1);
                     }
                     if (mpu->filter.rt_affection) {
                         switch (msg[0]) {
@@ -1678,7 +1624,7 @@ MPU401_InputMsg(void *priv, uint8_t *msg, uint32_t len)
                 recmsg[1] = msg[0];
                 recmsg[2] = msg[1];
                 recmsg[3] = msg[2];
-                MPU401_RecQueueBuffer(mpu, recmsg, len + 1, 1);
+                MPU401_RecQueueBuffer(mpu, recmsg, len + 1);
                 mpu->clock.rec_counter = 0;
             } else if (mpu->filter.data_in_stop) {
                 if (mpu->filter.timing_in_stop) {
@@ -1686,13 +1632,13 @@ MPU401_InputMsg(void *priv, uint8_t *msg, uint32_t len)
                     recmsg[1] = msg[0];
                     recmsg[2] = msg[1];
                     recmsg[3] = msg[2];
-                    MPU401_RecQueueBuffer(mpu, recmsg, len + 1, 1);
+                    MPU401_RecQueueBuffer(mpu, recmsg, len + 1);
                 } else {
                     recmsg[0] = msg[0];
                     recmsg[1] = msg[1];
                     recmsg[2] = msg[2];
                     recmsg[3] = 0;
-                    MPU401_RecQueueBuffer(mpu, recmsg, len, 1);
+                    MPU401_RecQueueBuffer(mpu, recmsg, len);
                 }
             }
         }
@@ -1702,6 +1648,8 @@ MPU401_InputMsg(void *priv, uint8_t *msg, uint32_t len)
     /* UART mode input. */
     for (i = 0; i < len; i++)
         MPU401_QueueByte(mpu, msg[i]);
+
+    MPU401_ReadRaiseIRQ(mpu);
 }
 
 void
@@ -1823,8 +1771,7 @@ mpu401_standalone_init(const device_t *info)
     int      irq;
     uint16_t base;
 
-    mpu = malloc(sizeof(mpu_t));
-    memset(mpu, 0, sizeof(mpu_t));
+    mpu = calloc(1, sizeof(mpu_t));
 
     mpu401_log("mpu_init\n");
 
@@ -1857,106 +1804,59 @@ mpu401_standalone_close(void *priv)
 static const device_config_t mpu401_standalone_config[] = {
   // clang-format off
     {
-        .name = "base",
-        .description = "MPU-401 Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x330,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "0x220",
-                .value = 0x220
-            },
-            {
-                .description = "0x230",
-                .value = 0x230
-            },
-            {
-                .description = "0x240",
-                .value = 0x240
-            },
-            {
-                .description = "0x250",
-                .value = 0x250
-            },
-            {
-                .description = "0x300",
-                .value = 0x300
-            },
-            {
-                .description = "0x320",
-                .value = 0x320
-            },
-            {
-                .description = "0x330",
-                .value = 0x330
-            },
-            {
-                .description = "0x332",
-                .value = 0x332
-            },
-            {
-                .description = "0x334",
-                .value = 0x334
-            },
-            {
-                .description = "0x336",
-                .value = 0x336
-            },
-            {
-                .description = "0x340",
-                .value = 0x340
-            },
-            {
-                .description = "0x350",
-                .value = 0x350
-            },
-            { .description = "" }
-        }
+        .name           = "base",
+        .description    = "MPU-401 Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x330,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x220", .value = 0x220 },
+            { .description = "0x230", .value = 0x230 },
+            { .description = "0x240", .value = 0x240 },
+            { .description = "0x250", .value = 0x250 },
+            { .description = "0x300", .value = 0x300 },
+            { .description = "0x320", .value = 0x320 },
+            { .description = "0x330", .value = 0x330 },
+            { .description = "0x332", .value = 0x332 },
+            { .description = "0x334", .value = 0x334 },
+            { .description = "0x336", .value = 0x336 },
+            { .description = "0x340", .value = 0x340 },
+            { .description = "0x350", .value = 0x350 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "MPU-401 IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 2,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "IRQ 2",
-                .value = 2
-            },
-            {
-                .description = "IRQ 3",
-                .value = 3
-            },
-            {
-                .description = "IRQ 4",
-                .value = 4
-            },
-            {
-                .description = "IRQ 5",
-                .value = 5
-            },
-            {
-                .description = "IRQ 6",
-                .value = 6
-            },
-            {
-                .description = "IRQ 7",
-                .value = 7
-            },
-            { .description = "" }
-        }
+        .name           = "irq",
+        .description    = "MPU-401 IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 2", .value = 2 },
+            { .description = "IRQ 3", .value = 3 },
+            { .description = "IRQ 4", .value = 4 },
+            { .description = "IRQ 5", .value = 5 },
+            { .description = "IRQ 6", .value = 6 },
+            { .description = "IRQ 7", .value = 7 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -1965,46 +1865,34 @@ static const device_config_t mpu401_standalone_config[] = {
 static const device_config_t mpu401_standalone_mca_config[] = {
   // clang-format off
     {
-        .name = "irq",
-        .description = "MPU-401 IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 9,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "IRQ 3",
-                .value = 3
-            },
-            {
-                .description = "IRQ 4",
-                .value = 4
-            },
-            {
-                .description = "IRQ 5",
-                .value = 5
-            },
-            {
-                .description = "IRQ 6",
-                .value = 6
-            },
-            {
-                .description = "IRQ 7",
-                .value = 7
-            },
-            {
-                .description = "IRQ 9",
-                .value = 9
-            },
-            { .description = "" }
-        }
+        .name           = "irq",
+        .description    = "MPU-401 IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 9,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 3", .value = 3 },
+            { .description = "IRQ 4", .value = 4 },
+            { .description = "IRQ 5", .value = 5 },
+            { .description = "IRQ 6", .value = 6 },
+            { .description = "IRQ 7", .value = 7 },
+            { .description = "IRQ 9", .value = 9 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -2018,7 +1906,7 @@ const device_t mpu401_device = {
     .init          = mpu401_standalone_init,
     .close         = mpu401_standalone_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = mpu401_standalone_config
@@ -2032,7 +1920,7 @@ const device_t mpu401_mca_device = {
     .init          = mpu401_standalone_init,
     .close         = mpu401_standalone_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = mpu401_standalone_mca_config
diff --git a/src/sound/snd_opl.c b/src/sound/snd_opl.c
index 21cc66f04..1ee687f1e 100644
--- a/src/sound/snd_opl.c
+++ b/src/sound/snd_opl.c
@@ -39,7 +39,22 @@ uint8_t
 fm_driver_get(int chip_id, fm_drv_t *drv)
 {
     switch (chip_id) {
-        case FM_YM3812:
+        case FM_YM2149: /* SSG */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ym2149_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+        case FM_YM3526: /* OPL */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ym3526_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+        case FM_Y8950: /* MSX-Audio (OPL with ADPCM) */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&y8950_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+        case FM_YM3812: /* OPL2 */
             if (fm_driver == FM_DRV_NUKED) {
                 *drv      = nuked_opl_drv;
                 drv->priv = device_add_inst(&ym3812_nuked_device, fm_dev_inst[fm_driver][chip_id]++);
@@ -49,7 +64,7 @@ fm_driver_get(int chip_id, fm_drv_t *drv)
             }
             break;
 
-        case FM_YMF262:
+        case FM_YMF262: /* OPL3 */
             if (fm_driver == FM_DRV_NUKED) {
                 *drv      = nuked_opl_drv;
                 drv->priv = device_add_inst(&ymf262_nuked_device, fm_dev_inst[fm_driver][chip_id]++);
@@ -59,16 +74,115 @@ fm_driver_get(int chip_id, fm_drv_t *drv)
             }
             break;
 
-        case FM_YMF289B:
+        case FM_YMF289B: /* OPL3-L */
             *drv      = ymfm_drv;
             drv->priv = device_add_inst(&ymf289b_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
             break;
 
-        case FM_YMF278B:
+        case FM_YMF278B: /* OPL4 */
             *drv      = ymfm_drv;
             drv->priv = device_add_inst(&ymf278b_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
             break;
 
+        case FM_YM2413: /* OPLL */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ym2413_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+        case FM_YM2423: /* OPLL-X */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ym2423_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+        case FM_YMF281: /* OPLLP */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ymf281_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+        case FM_DS1001: /* Konami VRC7 MMC */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ds1001_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+        case FM_YM2151: /* OPM */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ym2151_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+        case FM_YM2203: /* OPN */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ym2203_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+        case FM_YM2608: /* OPNA */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ym2608_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+        case FM_YMF288: /* OPN3L */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ymf288_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+        case FM_YM2610: /* OPNB */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ym2610_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+        case FM_YM2610B: /* OPNB2 */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ym2610b_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+        case FM_YM2612: /* OPN2 */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ym2612_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+        case FM_YM3438: /* OPN2C */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ym3438_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+        case FM_YMF276: /* OPN2L */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ymf276_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+        case FM_YM2164: /* OPP */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ym2164_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+        case FM_YM3806: /* OPQ */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ym3806_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+#if 0
+        case FM_YMF271: /* OPX */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ymf271_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+#endif
+
+        case FM_YM2414: /* OPZ */
+            *drv      = ymfm_drv;
+            drv->priv = device_add_inst(&ym2414_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+        
+        case FM_ESFM:
+            *drv      = esfmu_opl_drv;
+            drv->priv = device_add_inst(&esfm_esfmu_device, fm_dev_inst[fm_driver][chip_id]++);
+            break;
+
+#ifdef USE_LIBSERIALPORT
+        case FM_OPL2BOARD:
+            *drv      = ymfm_opl2board_drv;
+            drv->priv = device_add_inst(&ym_opl2board_device, fm_dev_inst[fm_driver][chip_id]++);  
+            break;
+#endif
+
         default:
             return 0;
     }
diff --git a/src/sound/snd_opl2board.c b/src/sound/snd_opl2board.c
new file mode 100644
index 000000000..632ad85f1
--- /dev/null
+++ b/src/sound/snd_opl2board.c
@@ -0,0 +1,195 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Interface to the OPL2Board External audio device (USB)
+ *        
+ *
+ * Authors: Jose Phillips <jose@hddlive.net>
+ *          Fred N. van Kempen, <decwiz@yahoo.com>
+ *          Miran Grca, <mgrca8@gmail.com>
+ * 
+ *          Copyright 2024 Jose Phillips.
+ *          Copyright 2017-2020 Fred N. van Kempen.
+ *          Copyright 2016-2020 Miran Grca.
+ */
+
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/mca.h>
+#include <86box/sound.h>
+#include <86box/timer.h>
+#include <86box/snd_opl.h>
+#include <86box/plat_unused.h>
+
+
+#ifdef ENABLE_OPL2DEVICE_LOG
+int opl2board_device_do_log = ENABLE_OPL2DEVICE_LOG;
+
+static void
+opl2board_device_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (opl2board_device_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define opl2board_device_log(fmt, ...)
+#endif
+
+typedef struct opl2board_device_t {
+    fm_drv_t opl;
+    uint8_t  pos_regs[8];
+} opl2board_device_t;
+
+static void
+opl2board_device_get_buffer(int32_t *buffer, int len, void *priv)
+{
+    opl2board_device_t *serial = (opl2board_device_t *) priv;
+
+    const int32_t *opl_buf = serial->opl.update(serial->opl.priv);
+
+    for (int c = 0; c < len * 2; c++)
+        buffer[c] += opl_buf[c];
+
+    serial->opl.reset_buffer(serial->opl.priv);
+}
+
+uint8_t
+opl2board_device_mca_read(int port, void *priv)
+{
+    const opl2board_device_t *serial = (opl2board_device_t *) priv;
+
+    opl2board_device_log("opl2board_device_mca_read: port=%04x\n", port);
+
+    return serial->pos_regs[port & 7];
+}
+
+void
+opl2board_device_mca_write(int port, uint8_t val, void *priv)
+{
+    opl2board_device_t *serial = (opl2board_device_t *) priv;
+
+    if (port < 0x102)
+        return;
+
+    opl2board_device_log("opl2board_device_mca_write: port=%04x val=%02x\n", port, val);
+
+    switch (port) {
+        case 0x102:
+            if ((serial->pos_regs[2] & 1) && !(val & 1))
+                io_removehandler(0x0388, 0x0002,
+                                 serial->opl.read, NULL, NULL,
+                                 serial->opl.write, NULL, NULL,
+                                 serial->opl.priv);
+            if (!(serial->pos_regs[2] & 1) && (val & 1))
+                io_sethandler(0x0388, 0x0002,
+                              serial->opl.read, NULL, NULL,
+                              serial->opl.write, NULL, NULL,
+                              serial->opl.priv);
+            break;
+
+        default:
+            break;
+    }
+
+    serial->pos_regs[port & 7] = val;
+}
+
+uint8_t
+opl2board_device_mca_feedb(void *priv)
+{
+    const opl2board_device_t *serial = (opl2board_device_t *) priv;
+
+    return (serial->pos_regs[2] & 1);
+}
+
+void *
+opl2board_device_init(UNUSED(const device_t *info))
+{
+    opl2board_device_t *serial = calloc(1, sizeof(opl2board_device_t));
+
+    opl2board_device_log("opl2board_device_init\n");
+    fm_driver_get(FM_OPL2BOARD, &serial->opl);
+    io_sethandler(0x0388, 0x0002,
+                  serial->opl.read, NULL, NULL,
+                  serial->opl.write, NULL, NULL,
+                  serial->opl.priv);
+    music_add_handler(opl2board_device_get_buffer, serial);
+
+    return serial;
+}
+
+void *
+opl2board_device_mca_init(const device_t *info)
+{
+    opl2board_device_t *serial = opl2board_device_init(info);
+
+    io_removehandler(0x0388, 0x0002,
+                     serial->opl.read, NULL, NULL,
+                     serial->opl.write, NULL, NULL,
+                     serial->opl.priv);
+    mca_add(opl2board_device_mca_read,
+            opl2board_device_mca_write,
+            opl2board_device_mca_feedb,
+            NULL,
+            serial);
+    serial->pos_regs[0] = 0xd7;
+    serial->pos_regs[1] = 0x70;
+
+    return serial;
+}
+
+void
+opl2board_device_close(void *priv)
+{
+    opl2board_device_t *serial = (opl2board_device_t *) priv;
+    free(serial);
+}
+
+
+static const device_config_t opl2board_config[] = {
+    {
+        .name           = "host_serial_path",
+        .description    = "Host Serial Device",
+        .type           = CONFIG_SERPORT,
+        .default_string = "",
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+const device_t opl2board_device = {
+    .name          = "OPL2Board (External Device)",
+    .internal_name = "opl2board_device",
+    .flags         = DEVICE_ISA,
+    .local         = 0,
+    .init          = opl2board_device_init,
+    .close         = opl2board_device_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = opl2board_config
+};
diff --git a/src/sound/snd_opl_esfm.c b/src/sound/snd_opl_esfm.c
new file mode 100644
index 000000000..b80d264d5
--- /dev/null
+++ b/src/sound/snd_opl_esfm.c
@@ -0,0 +1,359 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          ESFMu ESFM emulator.
+ *
+ *
+ * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *          Alexey Khokholov (Nuke.YKT)
+ *          Cacodemon345
+ *
+ *          Copyright 2017-2020 Fred N. van Kempen.
+ *          Copyright 2016-2020 Miran Grca.
+ *          Copyright 2013-2018 Alexey Khokholov (Nuke.YKT)
+ *          Copyright 2024 Cacodemon345
+ */
+
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "esfmu/esfm.h"
+
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/sound.h>
+#include <86box/device.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/snd_opl.h>
+#include <86box/plat_unused.h>
+
+#define RSM_FRAC 10
+
+typedef struct {
+    esfm_chip opl;
+    int8_t    flags;
+    int8_t    pad;
+
+    uint8_t  status;
+    uint8_t  timer_ctrl;
+    uint16_t timer_count[2];
+    uint16_t timer_cur_count[2];
+
+    pc_timer_t timers[2];
+
+    int16_t samples[2];
+
+    int     pos;
+    int32_t buffer[MUSICBUFLEN * 2];
+} esfm_drv_t;
+
+enum {
+    FLAG_CYCLES = 0x02,
+    FLAG_OPL3   = 0x01
+};
+
+enum {
+    STAT_TMR_OVER  = 0x60,
+    STAT_TMR1_OVER = 0x40,
+    STAT_TMR2_OVER = 0x20,
+    STAT_TMR_ANY   = 0x80
+};
+
+enum {
+    CTRL_RESET      = 0x80,
+    CTRL_TMR_MASK   = 0x60,
+    CTRL_TMR1_MASK  = 0x40,
+    CTRL_TMR2_MASK  = 0x20,
+    CTRL_TMR2_START = 0x02,
+    CTRL_TMR1_START = 0x01
+};
+
+#ifdef ENABLE_OPL_LOG
+int esfm_do_log = ENABLE_OPL_LOG;
+
+static void
+esfm_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (esfm_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define esfm_log(fmt, ...)
+#endif
+
+void
+esfm_generate_raw(esfm_drv_t *dev, int32_t *bufp)
+{
+    ESFM_generate(&dev->opl, bufp);
+}
+
+void
+esfm_drv_generate_stream(esfm_drv_t *dev, int32_t *sndptr, uint32_t num)
+{
+    for (uint32_t i = 0; i < num; i++) {
+        esfm_generate_raw(dev, sndptr);
+        sndptr += 2;
+    }
+}
+
+static void
+esfm_timer_tick(esfm_drv_t *dev, int tmr)
+{
+    dev->timer_cur_count[tmr] = (dev->timer_cur_count[tmr] + 1) & 0xff;
+
+    esfm_log("Ticking timer %i, count now %02X...\n", tmr, dev->timer_cur_count[tmr]);
+
+    if (dev->timer_cur_count[tmr] == 0x00) {
+        dev->status |= ((STAT_TMR1_OVER >> tmr) & ~dev->timer_ctrl);
+        dev->timer_cur_count[tmr] = dev->timer_count[tmr];
+
+        esfm_log("Count wrapped around to zero, reloading timer %i (%02X), status = %02X...\n", tmr, (STAT_TMR1_OVER >> tmr), dev->status);
+    }
+
+    timer_on_auto(&dev->timers[tmr], (tmr == 1) ? 320.0 : 80.0);
+}
+
+static void
+esfm_timer_control(esfm_drv_t *dev, int tmr, int start)
+{
+    timer_on_auto(&dev->timers[tmr], 0.0);
+
+    if (start) {
+        esfm_log("Loading timer %i count: %02X = %02X\n", tmr, dev->timer_cur_count[tmr], dev->timer_count[tmr]);
+        dev->timer_cur_count[tmr] = dev->timer_count[tmr];
+        if (dev->flags & FLAG_OPL3)
+            esfm_timer_tick(dev, tmr); /* Per the YMF 262 datasheet, OPL3 starts counting immediately, unlike OPL2. */
+        else
+            timer_on_auto(&dev->timers[tmr], (tmr == 1) ? 320.0 : 80.0);
+    } else {
+        esfm_log("Timer %i stopped\n", tmr);
+        if (tmr == 1) {
+            dev->status &= ~STAT_TMR2_OVER;
+        } else
+            dev->status &= ~STAT_TMR1_OVER;
+    }
+}
+
+static void
+esfm_timer_1(void *priv)
+{
+    esfm_drv_t *dev = (esfm_drv_t *) priv;
+
+    esfm_timer_tick(dev, 0);
+}
+
+static void
+esfm_timer_2(void *priv)
+{
+    esfm_drv_t *dev = (esfm_drv_t *) priv;
+
+    esfm_timer_tick(dev, 1);
+}
+
+static void
+esfm_drv_set_do_cycles(void *priv, int8_t do_cycles)
+{
+    esfm_drv_t *dev = (esfm_drv_t *) priv;
+
+    if (do_cycles)
+        dev->flags |= FLAG_CYCLES;
+    else
+        dev->flags &= ~FLAG_CYCLES;
+}
+
+static void *
+esfm_drv_init(UNUSED(const device_t *info))
+{
+    esfm_drv_t *dev = (esfm_drv_t *) calloc(1, sizeof(esfm_drv_t));
+    dev->flags      = FLAG_CYCLES | FLAG_OPL3;
+
+    /* Initialize the ESFMu object. */
+    ESFM_init(&dev->opl);
+
+    timer_add(&dev->timers[0], esfm_timer_1, dev, 0);
+    timer_add(&dev->timers[1], esfm_timer_2, dev, 0);
+
+    return dev;
+}
+
+static void
+esfm_drv_close(void *priv)
+{
+    esfm_drv_t *dev = (esfm_drv_t *) priv;
+    free(dev);
+}
+
+static int32_t *
+esfm_drv_update(void *priv)
+{
+    esfm_drv_t *dev = (esfm_drv_t *) priv;
+
+    if (dev->pos >= music_pos_global)
+        return dev->buffer;
+
+    esfm_drv_generate_stream(dev,
+                             &dev->buffer[dev->pos * 2],
+                             music_pos_global - dev->pos);
+
+    for (; dev->pos < music_pos_global; dev->pos++) {
+        dev->buffer[dev->pos * 2] /= 2;
+        dev->buffer[(dev->pos * 2) + 1] /= 2;
+    }
+
+    return dev->buffer;
+}
+
+static void
+esfm_drv_reset_buffer(void *priv)
+{
+    esfm_drv_t *dev = (esfm_drv_t *) priv;
+
+    dev->pos = 0;
+}
+
+static uint8_t
+esfm_drv_read(uint16_t port, void *priv)
+{
+    esfm_drv_t *dev = (esfm_drv_t *) priv;
+
+    if (dev->flags & FLAG_CYCLES)
+        cycles -= ((int) (isa_timing * 8));
+
+    esfm_drv_update(dev);
+
+    uint8_t ret = 0xff;
+
+    switch (port & 0x0003) {
+        case 0x0000:
+            ret = dev->status;
+            if (dev->status & STAT_TMR_OVER)
+                ret |= STAT_TMR_ANY;
+            break;
+
+        case 0x0001:
+            ret = ESFM_read_port(&dev->opl, port & 3);
+            switch (dev->opl.addr_latch & 0x5ff) {
+                case 0x402:
+                    ret = dev->timer_count[0];
+                    break;
+                case 0x403:
+                    ret = dev->timer_count[1];
+                    break;
+                case 0x404:
+                    ret = dev->timer_ctrl;
+                    break;
+            }
+            break;
+
+        case 0x0002:
+        case 0x0003:
+            ret = 0xff;
+            break;
+    }
+
+    return ret;
+}
+
+static void
+esfm_drv_write_buffered(esfm_drv_t *dev, uint8_t val)
+{
+    uint16_t p = dev->opl.addr_latch & 0x07ff;
+
+    if (dev->opl.native_mode) {
+        p -= 0x400;
+    }
+    p &= 0x1ff;
+
+    switch (p) {
+        case 0x002: /* Timer 1 */
+            dev->timer_count[0] = val;
+            esfm_log("Timer 0 count now: %i\n", dev->timer_count[0]);
+            break;
+
+        case 0x003: /* Timer 2 */
+            dev->timer_count[1] = val;
+            esfm_log("Timer 1 count now: %i\n", dev->timer_count[1]);
+            break;
+
+        case 0x004: /* Timer control */
+            if (val & CTRL_RESET) {
+                esfm_log("Resetting timer status...\n");
+                dev->status &= ~STAT_TMR_OVER;
+            } else {
+                dev->timer_ctrl = val;
+                esfm_timer_control(dev, 0, val & CTRL_TMR1_START);
+                esfm_timer_control(dev, 1, val & CTRL_TMR2_START);
+                esfm_log("Status mask now %02X (val = %02X)\n", (val & ~CTRL_TMR_MASK) & CTRL_TMR_MASK, val);
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    ESFM_write_reg_buffered_fast(&dev->opl, dev->opl.addr_latch, val);
+}
+
+static void
+esfm_drv_write(uint16_t port, uint8_t val, void *priv)
+{
+    esfm_drv_t *dev = (esfm_drv_t *) priv;
+
+    if (dev->flags & FLAG_CYCLES)
+        cycles -= ((int) (isa_timing * 8));
+
+    esfm_drv_update(dev);
+
+    if (dev->opl.native_mode) {
+        if ((port & 0x0003) == 0x0001)
+            esfm_drv_write_buffered(dev, val);
+        else {
+            ESFM_write_port(&dev->opl, port & 3, val);
+        }
+    } else {
+        if ((port & 0x0001) == 0x0001)
+            esfm_drv_write_buffered(dev, val);
+        else {
+            ESFM_write_port(&dev->opl, port & 3, val);
+        }
+    }
+}
+
+const device_t esfm_esfmu_device = {
+    .name          = "ESS Technology ESFM (ESFMu)",
+    .internal_name = "esfm_esfmu",
+    .flags         = 0,
+    .local         = FM_ESFM,
+    .init          = esfm_drv_init,
+    .close         = esfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const fm_drv_t esfmu_opl_drv = {
+    .read          = &esfm_drv_read,
+    .write         = &esfm_drv_write,
+    .update        = &esfm_drv_update,
+    .reset_buffer  = &esfm_drv_reset_buffer,
+    .set_do_cycles = &esfm_drv_set_do_cycles,
+    .priv          = NULL,
+    .generate      = NULL,
+};
diff --git a/src/sound/snd_opl_nuked.c b/src/sound/snd_opl_nuked.c
index d8281ba1d..60f5ed2a6 100644
--- a/src/sound/snd_opl_nuked.c
+++ b/src/sound/snd_opl_nuked.c
@@ -18,7 +18,7 @@
  *            siliconpr0n.org(John McMaster, digshadow):
  *            YMF262 and VRC VII decaps and die shots.
  *
- *          Version: 1.8.0
+ *          Version: 1.8
  *
  *          Translation from C++ into C done by Miran Grca.
  *
@@ -35,7 +35,7 @@
  *
  *          Copyright 2017-2020 Fred N. van Kempen.
  *          Copyright 2016-2020 Miran Grca.
- *          Copyright 2013-2018 Alexey Khokholov (Nuke.YKT)
+ *          Copyright 2013-2020 Alexey Khokholov (Nuke.YKT)
  */
 #include <stdarg.h>
 #include <stdint.h>
@@ -45,18 +45,30 @@
 
 #define HAVE_STDARG_H
 #include <86box/86box.h>
-#include <86box/snd_opl_nuked.h>
 #include <86box/sound.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/device.h>
 #include <86box/snd_opl.h>
+#include <86box/snd_opl_nuked.h>
+
+
+#if OPL_ENABLE_STEREOEXT && !defined OPL_SIN
+#ifndef _USE_MATH_DEFINES
+#define _USE_MATH_DEFINES 1
+#endif
+#include <math.h>
+// input: [0, 256), output: [0, 65536]
+#define OPL_SIN(x) ((int32_t)(sin((x) * M_PI / 512.0) * 65536.0))
+#endif
+
+/* Quirk: Some FM channels are output one sample later on the left side than the right. */
+#ifndef OPL_QUIRK_CHANNELSAMPLEDELAY
+#define OPL_QUIRK_CHANNELSAMPLEDELAY (!OPL_ENABLE_STEREOEXT)
+#endif
 
-#define WRBUF_SIZE  1024
-#define WRBUF_DELAY 1
 #define RSM_FRAC    10
 
-#define OPL_FREQ FREQ_48000
-
 // Channel types
 enum {
     ch_2op  = 0,
@@ -71,148 +83,6 @@ enum {
     egk_drum = 0x02
 };
 
-enum envelope_gen_num {
-    envelope_gen_num_attack  = 0,
-    envelope_gen_num_decay   = 1,
-    envelope_gen_num_sustain = 2,
-    envelope_gen_num_release = 3
-};
-
-struct chan;
-struct chip;
-
-typedef struct slot {
-    struct chan *chan;
-    struct chip *dev;
-    int16_t      out;
-    int16_t      fbmod;
-    int16_t     *mod;
-    int16_t      prout;
-    int16_t      eg_rout;
-    int16_t      eg_out;
-    uint8_t      eg_inc;
-    uint8_t      eg_gen;
-    uint8_t      eg_rate;
-    uint8_t      eg_ksl;
-    uint8_t     *trem;
-    uint8_t      reg_vib;
-    uint8_t      reg_type;
-    uint8_t      reg_ksr;
-    uint8_t      reg_mult;
-    uint8_t      reg_ksl;
-    uint8_t      reg_tl;
-    uint8_t      reg_ar;
-    uint8_t      reg_dr;
-    uint8_t      reg_sl;
-    uint8_t      reg_rr;
-    uint8_t      reg_wf;
-    uint8_t      key;
-    uint32_t     pg_reset;
-    uint32_t     pg_phase;
-    uint16_t     pg_phase_out;
-    uint8_t      slot_num;
-} slot_t;
-
-typedef struct chan {
-    slot_t      *slots[2];
-    struct chan *pair;
-    struct chip *dev;
-    int16_t     *out[4];
-    uint8_t      chtype;
-    uint16_t     f_num;
-    uint8_t      block;
-    uint8_t      fb;
-    uint8_t      con;
-    uint8_t      alg;
-    uint8_t      ksv;
-    uint16_t     cha;
-    uint16_t     chb;
-    uint8_t      ch_num;
-} chan_t;
-
-typedef struct wrbuf {
-    uint64_t time;
-    uint16_t reg;
-    uint8_t  data;
-} wrbuf_t;
-
-typedef struct chip {
-    chan_t   chan[18];
-    slot_t   slot[36];
-    uint16_t timer;
-    uint64_t eg_timer;
-    uint8_t  eg_timerrem;
-    uint8_t  eg_state;
-    uint8_t  eg_add;
-    uint8_t  newm;
-    uint8_t  nts;
-    uint8_t  rhy;
-    uint8_t  vibpos;
-    uint8_t  vibshift;
-    uint8_t  tremolo;
-    uint8_t  tremolopos;
-    uint8_t  tremoloshift;
-    uint32_t noise;
-    int16_t  zeromod;
-    int32_t  mixbuff[2];
-    uint8_t  rm_hh_bit2;
-    uint8_t  rm_hh_bit3;
-    uint8_t  rm_hh_bit7;
-    uint8_t  rm_hh_bit8;
-    uint8_t  rm_tc_bit3;
-    uint8_t  rm_tc_bit5;
-
-    // OPL3L
-    int32_t rateratio;
-    int32_t samplecnt;
-    int32_t oldsamples[2];
-    int32_t samples[2];
-
-    uint64_t wrbuf_samplecnt;
-    uint32_t wrbuf_cur;
-    uint32_t wrbuf_last;
-    uint64_t wrbuf_lasttime;
-    wrbuf_t  wrbuf[WRBUF_SIZE];
-} nuked_t;
-
-typedef struct {
-    nuked_t opl;
-    int8_t  flags;
-    int8_t  pad;
-
-    uint16_t port;
-    uint8_t  status;
-    uint8_t  timer_ctrl;
-    uint16_t timer_count[2];
-    uint16_t timer_cur_count[2];
-
-    pc_timer_t timers[2];
-
-    int     pos;
-    int32_t buffer[SOUNDBUFLEN * 2];
-} nuked_drv_t;
-
-enum {
-    FLAG_CYCLES = 0x02,
-    FLAG_OPL3   = 0x01
-};
-
-enum {
-    STAT_TMR_OVER  = 0x60,
-    STAT_TMR1_OVER = 0x40,
-    STAT_TMR2_OVER = 0x20,
-    STAT_TMR_ANY   = 0x80
-};
-
-enum {
-    CTRL_RESET      = 0x80,
-    CTRL_TMR_MASK   = 0x60,
-    CTRL_TMR1_MASK  = 0x40,
-    CTRL_TMR2_MASK  = 0x20,
-    CTRL_TMR2_START = 0x02,
-    CTRL_TMR1_START = 0x01
-};
-
 #ifdef ENABLE_OPL_LOG
 int nuked_do_log = ENABLE_OPL_LOG;
 
@@ -321,10 +191,10 @@ static const uint8_t kslshift[4] = {
 
 // envelope generator constants
 static const uint8_t eg_incstep[4][4] = {
-    {0,  0, 0, 0},
-    { 1, 0, 0, 0},
-    { 1, 0, 1, 0},
-    { 1, 1, 1, 0}
+    { 0, 0, 0, 0 },
+    { 1, 0, 0, 0 },
+    { 1, 0, 1, 0 },
+    { 1, 1, 1, 0 }
 };
 
 // address decoding
@@ -337,21 +207,30 @@ static const uint8_t ch_slot[18] = {
     0, 1, 2, 6, 7, 8, 12, 13, 14, 18, 19, 20, 24, 25, 26, 30, 31, 32
 };
 
+#if OPL_ENABLE_STEREOEXT
+/*
+    stereo extension panning table
+*/
+
+static int32_t panpot_lut[256];
+static uint8_t panpot_lut_build = 0;
+#endif
+
 // Envelope generator
-typedef int16_t (*env_sinfunc)(uint16_t phase, uint16_t envelope);
-typedef void (*env_genfunc)(slot_t *slot);
+typedef int16_t (*envelope_sinfunc)(uint16_t phase, uint16_t envelope);
+typedef void (*envelope_genfunc)(opl3_slot *slot);
 
 static int16_t
-env_calc_exp(uint32_t level)
+OPL3_EnvelopeCalcExp(uint32_t level)
 {
     if (level > 0x1fff)
         level = 0x1fff;
 
-    return ((exprom[level & 0xff] << 1) >> (level >> 8));
+    return ((exprom[level & 0xffu] << 1) >> (level >> 8));
 }
 
 static int16_t
-env_calc_sin0(uint16_t phase, uint16_t env)
+OPL3_EnvelopeCalcSin0(uint16_t phase, uint16_t envelope)
 {
     uint16_t out = 0;
     uint16_t neg = 0;
@@ -362,15 +241,15 @@ env_calc_sin0(uint16_t phase, uint16_t env)
         neg = 0xffff;
 
     if (phase & 0x0100)
-        out = logsinrom[(phase & 0xff) ^ 0xff];
+        out = logsinrom[(phase & 0xffu) ^ 0xffu];
     else
-        out = logsinrom[phase & 0xff];
+        out = logsinrom[phase & 0xffu];
 
-    return (env_calc_exp(out + (env << 3)) ^ neg);
+    return (OPL3_EnvelopeCalcExp(out + (envelope << 3)) ^ neg);
 }
 
 static int16_t
-env_calc_sin1(uint16_t phase, uint16_t env)
+OPL3_EnvelopeCalcSin1(uint16_t phase, uint16_t envelope)
 {
     uint16_t out = 0;
 
@@ -379,30 +258,30 @@ env_calc_sin1(uint16_t phase, uint16_t env)
     if (phase & 0x0200)
         out = 0x1000;
     else if (phase & 0x0100)
-        out = logsinrom[(phase & 0xff) ^ 0xff];
+        out = logsinrom[(phase & 0xffu) ^ 0xffu];
     else
-        out = logsinrom[phase & 0xff];
+        out = logsinrom[phase & 0xffu];
 
-    return (env_calc_exp(out + (env << 3)));
+    return (OPL3_EnvelopeCalcExp(out + (envelope << 3)));
 }
 
 static int16_t
-env_calc_sin2(uint16_t phase, uint16_t env)
+OPL3_EnvelopeCalcSin2(uint16_t phase, uint16_t envelope)
 {
     uint16_t out = 0;
 
     phase &= 0x03ff;
 
     if (phase & 0x0100)
-        out = logsinrom[(phase & 0xff) ^ 0xff];
+        out = logsinrom[(phase & 0xffu) ^ 0xffu];
     else
-        out = logsinrom[phase & 0xff];
+        out = logsinrom[phase & 0xffu];
 
-    return (env_calc_exp(out + (env << 3)));
+    return (OPL3_EnvelopeCalcExp(out + (envelope << 3)));
 }
 
 static int16_t
-env_calc_sin3(uint16_t phase, uint16_t env)
+OPL3_EnvelopeCalcSin3(uint16_t phase, uint16_t envelope)
 {
     uint16_t out = 0;
 
@@ -411,13 +290,13 @@ env_calc_sin3(uint16_t phase, uint16_t env)
     if (phase & 0x0100)
         out = 0x1000;
     else
-        out = logsinrom[phase & 0xff];
+        out = logsinrom[phase & 0xffu];
 
-    return (env_calc_exp(out + (env << 3)));
+    return (OPL3_EnvelopeCalcExp(out + (envelope << 3)));
 }
 
 static int16_t
-env_calc_sin4(uint16_t phase, uint16_t env)
+OPL3_EnvelopeCalcSin4(uint16_t phase, uint16_t envelope)
 {
     uint16_t out = 0;
     uint16_t neg = 0;
@@ -430,15 +309,15 @@ env_calc_sin4(uint16_t phase, uint16_t env)
     if (phase & 0x0200)
         out = 0x1000;
     else if (phase & 0x80)
-        out = logsinrom[((phase ^ 0xff) << 1) & 0xff];
+        out = logsinrom[((phase ^ 0xffu) << 1u) & 0xffu];
     else
-        out = logsinrom[(phase << 1) & 0xff];
+        out = logsinrom[(phase << 1u) & 0xffu];
 
-    return (env_calc_exp(out + (env << 3)) ^ neg);
+    return (OPL3_EnvelopeCalcExp(out + (envelope << 3)) ^ neg);
 }
 
 static int16_t
-env_calc_sin5(uint16_t phase, uint16_t env)
+OPL3_EnvelopeCalcSin5(uint16_t phase, uint16_t envelope)
 {
     uint16_t out = 0;
 
@@ -447,15 +326,15 @@ env_calc_sin5(uint16_t phase, uint16_t env)
     if (phase & 0x0200)
         out = 0x1000;
     else if (phase & 0x80)
-        out = logsinrom[((phase ^ 0xff) << 1) & 0xff];
+        out = logsinrom[((phase ^ 0xffu) << 1u) & 0xffu];
     else
-        out = logsinrom[(phase << 1) & 0xff];
+        out = logsinrom[(phase << 1u) & 0xffu];
 
-    return (env_calc_exp(out + (env << 3)));
+    return (OPL3_EnvelopeCalcExp(out + (envelope << 3)));
 }
 
 static int16_t
-env_calc_sin6(uint16_t phase, uint16_t env)
+OPL3_EnvelopeCalcSin6(uint16_t phase, uint16_t envelope)
 {
     uint16_t neg = 0;
 
@@ -464,11 +343,11 @@ env_calc_sin6(uint16_t phase, uint16_t env)
     if (phase & 0x0200)
         neg = 0xffff;
 
-    return (env_calc_exp(env << 3) ^ neg);
+    return (OPL3_EnvelopeCalcExp(envelope << 3) ^ neg);
 }
 
 static int16_t
-env_calc_sin7(uint16_t phase, uint16_t env)
+OPL3_EnvelopeCalcSin7(uint16_t phase, uint16_t envelope)
 {
     uint16_t out = 0;
     uint16_t neg = 0;
@@ -482,24 +361,32 @@ env_calc_sin7(uint16_t phase, uint16_t env)
 
     out = phase << 3;
 
-    return (env_calc_exp(out + (env << 3)) ^ neg);
+    return (OPL3_EnvelopeCalcExp(out + (envelope << 3)) ^ neg);
 }
 
-static const env_sinfunc env_sin[8] = {
-    env_calc_sin0,
-    env_calc_sin1,
-    env_calc_sin2,
-    env_calc_sin3,
-    env_calc_sin4,
-    env_calc_sin5,
-    env_calc_sin6,
-    env_calc_sin7
+static const envelope_sinfunc envelope_sin[8] = {
+    OPL3_EnvelopeCalcSin0,
+    OPL3_EnvelopeCalcSin1,
+    OPL3_EnvelopeCalcSin2,
+    OPL3_EnvelopeCalcSin3,
+    OPL3_EnvelopeCalcSin4,
+    OPL3_EnvelopeCalcSin5,
+    OPL3_EnvelopeCalcSin6,
+    OPL3_EnvelopeCalcSin7
+};
+
+enum envelope_gen_num {
+    envelope_gen_num_attack  = 0,
+    envelope_gen_num_decay   = 1,
+    envelope_gen_num_sustain = 2,
+    envelope_gen_num_release = 3
 };
 
 static void
-env_update_ksl(slot_t *slot)
+OPL3_EnvelopeUpdateKSL(opl3_slot *slot)
 {
-    int16_t ksl = (kslrom[slot->chan->f_num >> 6] << 2) - ((0x08 - slot->chan->block) << 5);
+    int16_t ksl = (kslrom[slot->channel->f_num >> 6u] << 2)
+                  - ((0x08 - slot->channel->block) << 5);
 
     if (ksl < 0)
         ksl = 0;
@@ -508,7 +395,7 @@ env_update_ksl(slot_t *slot)
 }
 
 static void
-env_calc(slot_t *slot)
+OPL3_EnvelopeCalc(opl3_slot *slot)
 {
     uint8_t  nonzero;
     uint8_t  rate;
@@ -523,7 +410,8 @@ env_calc(slot_t *slot)
     uint8_t  eg_off;
     uint8_t  reset = 0;
 
-    slot->eg_out = slot->eg_rout + (slot->reg_tl << 2) + (slot->eg_ksl >> kslshift[slot->reg_ksl]) + *slot->trem;
+    slot->eg_out = slot->eg_rout + (slot->reg_tl << 2)
+                 + (slot->eg_ksl >> kslshift[slot->reg_ksl]) + *slot->trem;
     if (slot->key && slot->eg_gen == envelope_gen_num_release) {
         reset    = 1;
         reg_rate = slot->reg_ar;
@@ -551,19 +439,21 @@ env_calc(slot_t *slot)
         }
 
     slot->pg_reset = reset;
-    ks             = slot->chan->ksv >> ((slot->reg_ksr ^ 1) << 1);
+    ks             = slot->channel->ksv >> ((slot->reg_ksr ^ 1) << 1);
     nonzero        = (reg_rate != 0);
     rate           = ks + (reg_rate << 2);
     rate_hi        = rate >> 2;
     rate_lo        = rate & 0x03;
+
     if (rate_hi & 0x10)
         rate_hi = 0x0f;
-    eg_shift = rate_hi + slot->dev->eg_add;
+
+    eg_shift = rate_hi + slot->chip->eg_add;
     shift    = 0;
 
     if (nonzero) {
         if (rate_hi < 12) {
-            if (slot->dev->eg_state)
+            if (slot->chip->eg_state)
                 switch (eg_shift) {
                     case 12:
                         shift = 1;
@@ -581,11 +471,11 @@ env_calc(slot_t *slot)
                         break;
                 }
         } else {
-            shift = (rate_hi & 0x03) + eg_incstep[rate_lo][slot->dev->timer & 0x03];
+            shift = (rate_hi & 0x03) + eg_incstep[rate_lo][slot->chip->eg_timer_lo];
             if (shift & 0x04)
                 shift = 0x03;
             if (!shift)
-                shift = slot->dev->eg_state;
+                shift = slot->chip->eg_state;
         }
     }
 
@@ -609,7 +499,7 @@ env_calc(slot_t *slot)
             if (!slot->eg_rout)
                 slot->eg_gen = envelope_gen_num_decay;
             else if (slot->key && shift > 0 && rate_hi != 0x0f)
-                eg_inc = ((~slot->eg_rout) << shift) >> 4;
+                eg_inc = ~slot->eg_rout >> (4 - shift);
             break;
 
         case envelope_gen_num_decay:
@@ -639,48 +529,50 @@ env_calc(slot_t *slot)
 }
 
 static void
-env_key_on(slot_t *slot, uint8_t type)
+OPL3_EnvelopeKeyOn(opl3_slot *slot, uint8_t type)
 {
     slot->key |= type;
 }
 
 static void
-env_key_off(slot_t *slot, uint8_t type)
+OPL3_EnvelopeKeyOff(opl3_slot *slot, uint8_t type)
 {
     slot->key &= ~type;
 }
 
+// Phase Generator
 static void
-phase_generate(slot_t *slot)
+OPL3_PhaseGenerate(opl3_slot *slot)
 {
-    uint16_t f_num;
-    uint32_t basefreq;
-    uint8_t  rm_xor;
-    uint8_t  n_bit;
-    uint32_t noise;
-    uint16_t phase;
-    int8_t   range;
-    uint8_t  vibpos;
-    nuked_t *dev;
+    opl3_chip *chip;
+    uint16_t   f_num;
+    uint32_t   basefreq;
+    uint8_t    rm_xor;
+    uint8_t    n_bit;
+    uint32_t   noise;
+    uint16_t   phase;
 
-    dev   = slot->dev;
-    f_num = slot->chan->f_num;
+    chip  = slot->chip;
+    f_num = slot->channel->f_num;
     if (slot->reg_vib) {
+        int8_t  range;
+        uint8_t vibpos;
+
         range  = (f_num >> 7) & 7;
-        vibpos = dev->vibpos;
+        vibpos = chip->vibpos;
 
         if (!(vibpos & 3))
             range = 0;
         else if (vibpos & 1)
             range >>= 1;
-        range >>= dev->vibshift;
+        range >>= chip->vibshift;
 
         if (vibpos & 4)
             range = -range;
         f_num += range;
     }
 
-    basefreq = (f_num << slot->chan->block) >> 1;
+    basefreq = (f_num << slot->channel->block) >> 1;
     phase    = (uint16_t) (slot->pg_phase >> 9);
 
     if (slot->pg_reset)
@@ -688,20 +580,22 @@ phase_generate(slot_t *slot)
     slot->pg_phase += (basefreq * mt[slot->reg_mult]) >> 1;
 
     // Rhythm mode
-    noise              = dev->noise;
+    noise              = chip->noise;
     slot->pg_phase_out = phase;
     if (slot->slot_num == 13) { // hh
-        dev->rm_hh_bit2 = (phase >> 2) & 1;
-        dev->rm_hh_bit3 = (phase >> 3) & 1;
-        dev->rm_hh_bit7 = (phase >> 7) & 1;
-        dev->rm_hh_bit8 = (phase >> 8) & 1;
+        chip->rm_hh_bit2 = (phase >> 2) & 1;
+        chip->rm_hh_bit3 = (phase >> 3) & 1;
+        chip->rm_hh_bit7 = (phase >> 7) & 1;
+        chip->rm_hh_bit8 = (phase >> 8) & 1;
     }
-    if (slot->slot_num == 17 && (dev->rhy & 0x20)) { // tc
-        dev->rm_tc_bit3 = (phase >> 3) & 1;
-        dev->rm_tc_bit5 = (phase >> 5) & 1;
+    if (slot->slot_num == 17 && (chip->rhy & 0x20)) { // tc
+        chip->rm_tc_bit3 = (phase >> 3) & 1;
+        chip->rm_tc_bit5 = (phase >> 5) & 1;
     }
-    if (dev->rhy & 0x20) {
-        rm_xor = (dev->rm_hh_bit2 ^ dev->rm_hh_bit7) | (dev->rm_hh_bit3 ^ dev->rm_tc_bit5) | (dev->rm_tc_bit3 ^ dev->rm_tc_bit5);
+    if (chip->rhy & 0x20) {
+        rm_xor = (chip->rm_hh_bit2 ^ chip->rm_hh_bit7)
+                 | (chip->rm_hh_bit3 ^ chip->rm_tc_bit5)
+                 | (chip->rm_tc_bit3 ^ chip->rm_tc_bit5);
 
         switch (slot->slot_num) {
             case 13: // hh
@@ -713,7 +607,8 @@ phase_generate(slot_t *slot)
                 break;
 
             case 16: // sd
-                slot->pg_phase_out = (dev->rm_hh_bit8 << 9) | ((dev->rm_hh_bit8 ^ (noise & 1)) << 8);
+                slot->pg_phase_out = (chip->rm_hh_bit8 << 9)
+                                     | ((chip->rm_hh_bit8 ^ (noise & 1)) << 8);
                 break;
 
             case 17: // tc
@@ -727,16 +622,17 @@ phase_generate(slot_t *slot)
 
     n_bit = ((noise >> 14) ^ noise) & 0x01;
 
-    dev->noise = (noise >> 1) | (n_bit << 22);
+    chip->noise = (noise >> 1) | (n_bit << 22);
 }
 
+// Slot
 static void
-slot_write_20(slot_t *slot, uint8_t data)
+OPL3_SlotWrite20(opl3_slot *slot, uint8_t data)
 {
     if ((data >> 7) & 0x01)
-        slot->trem = &slot->dev->tremolo;
+        slot->trem = &slot->chip->tremolo;
     else
-        slot->trem = (uint8_t *) &slot->dev->zeromod;
+        slot->trem = (uint8_t *) &slot->chip->zeromod;
 
     slot->reg_vib  = (data >> 6) & 0x01;
     slot->reg_type = (data >> 5) & 0x01;
@@ -745,23 +641,23 @@ slot_write_20(slot_t *slot, uint8_t data)
 }
 
 static void
-slot_write_40(slot_t *slot, uint8_t data)
+OPL3_SlotWrite40(opl3_slot *slot, uint8_t data)
 {
     slot->reg_ksl = (data >> 6) & 0x03;
     slot->reg_tl  = data & 0x3f;
 
-    env_update_ksl(slot);
+    OPL3_EnvelopeUpdateKSL(slot);
 }
 
 static void
-slot_write_60(slot_t *slot, uint8_t data)
+OPL3_SlotWrite60(opl3_slot *slot, uint8_t data)
 {
     slot->reg_ar = (data >> 4) & 0x0f;
     slot->reg_dr = data & 0x0f;
 }
 
 static void
-slot_write_80(slot_t *slot, uint8_t data)
+OPL3_SlotWrite80(opl3_slot *slot, uint8_t data)
 {
     slot->reg_sl = (data >> 4) & 0x0f;
 
@@ -772,329 +668,363 @@ slot_write_80(slot_t *slot, uint8_t data)
 }
 
 static void
-slot_write_e0(slot_t *slot, uint8_t data)
+OPL3_SlotWriteE0(opl3_slot *slot, uint8_t data)
 {
     slot->reg_wf = data & 0x07;
 
-    if (slot->dev->newm == 0x00)
+    if (slot->chip->newm == 0x00)
         slot->reg_wf &= 0x03;
 }
 
 static void
-slot_generate(slot_t *slot)
+OPL3_SlotGenerate(opl3_slot *slot)
 {
-    slot->out = env_sin[slot->reg_wf](slot->pg_phase_out + *slot->mod,
-                                      slot->eg_out);
+    slot->out = envelope_sin[slot->reg_wf](slot->pg_phase_out + *slot->mod, slot->eg_out);
 }
 
 static void
-slot_calc_fb(slot_t *slot)
+OPL3_SlotCalcFB(opl3_slot *slot)
 {
-    if (slot->chan->fb != 0x00)
-        slot->fbmod = (slot->prout + slot->out) >> (0x09 - slot->chan->fb);
+    if (slot->channel->fb != 0x00)
+        slot->fbmod = (slot->prout + slot->out) >> (0x09 - slot->channel->fb);
     else
         slot->fbmod = 0;
 
     slot->prout = slot->out;
 }
 
+// Channel
 static void
-channel_setup_alg(chan_t *ch)
-{
-    if (ch->chtype == ch_drum) {
-        if (ch->ch_num == 7 || ch->ch_num == 8) {
-            ch->slots[0]->mod = &ch->dev->zeromod;
-            ch->slots[1]->mod = &ch->dev->zeromod;
-            return;
-        }
-
-        switch (ch->alg & 0x01) {
-            case 0x00:
-                ch->slots[0]->mod = &ch->slots[0]->fbmod;
-                ch->slots[1]->mod = &ch->slots[0]->out;
-                break;
-
-            case 0x01:
-                ch->slots[0]->mod = &ch->slots[0]->fbmod;
-                ch->slots[1]->mod = &ch->dev->zeromod;
-                break;
-
-            default:
-                break;
-        }
-        return;
-    }
-
-    if (ch->alg & 0x08)
-        return;
-
-    if (ch->alg & 0x04) {
-        ch->pair->out[0] = &ch->dev->zeromod;
-        ch->pair->out[1] = &ch->dev->zeromod;
-        ch->pair->out[2] = &ch->dev->zeromod;
-        ch->pair->out[3] = &ch->dev->zeromod;
-
-        switch (ch->alg & 0x03) {
-            case 0x00:
-                ch->pair->slots[0]->mod = &ch->pair->slots[0]->fbmod;
-                ch->pair->slots[1]->mod = &ch->pair->slots[0]->out;
-                ch->slots[0]->mod       = &ch->pair->slots[1]->out;
-                ch->slots[1]->mod       = &ch->slots[0]->out;
-                ch->out[0]              = &ch->slots[1]->out;
-                ch->out[1]              = &ch->dev->zeromod;
-                ch->out[2]              = &ch->dev->zeromod;
-                ch->out[3]              = &ch->dev->zeromod;
-                break;
-
-            case 0x01:
-                ch->pair->slots[0]->mod = &ch->pair->slots[0]->fbmod;
-                ch->pair->slots[1]->mod = &ch->pair->slots[0]->out;
-                ch->slots[0]->mod       = &ch->dev->zeromod;
-                ch->slots[1]->mod       = &ch->slots[0]->out;
-                ch->out[0]              = &ch->pair->slots[1]->out;
-                ch->out[1]              = &ch->slots[1]->out;
-                ch->out[2]              = &ch->dev->zeromod;
-                ch->out[3]              = &ch->dev->zeromod;
-                break;
-
-            case 0x02:
-                ch->pair->slots[0]->mod = &ch->pair->slots[0]->fbmod;
-                ch->pair->slots[1]->mod = &ch->dev->zeromod;
-                ch->slots[0]->mod       = &ch->pair->slots[1]->out;
-                ch->slots[1]->mod       = &ch->slots[0]->out;
-                ch->out[0]              = &ch->pair->slots[0]->out;
-                ch->out[1]              = &ch->slots[1]->out;
-                ch->out[2]              = &ch->dev->zeromod;
-                ch->out[3]              = &ch->dev->zeromod;
-                break;
-
-            case 0x03:
-                ch->pair->slots[0]->mod = &ch->pair->slots[0]->fbmod;
-                ch->pair->slots[1]->mod = &ch->dev->zeromod;
-                ch->slots[0]->mod       = &ch->pair->slots[1]->out;
-                ch->slots[1]->mod       = &ch->dev->zeromod;
-                ch->out[0]              = &ch->pair->slots[0]->out;
-                ch->out[1]              = &ch->slots[0]->out;
-                ch->out[2]              = &ch->slots[1]->out;
-                ch->out[3]              = &ch->dev->zeromod;
-                break;
-
-            default:
-                break;
-        }
-    } else
-        switch (ch->alg & 0x01) {
-            case 0x00:
-                ch->slots[0]->mod = &ch->slots[0]->fbmod;
-                ch->slots[1]->mod = &ch->slots[0]->out;
-                ch->out[0]        = &ch->slots[1]->out;
-                ch->out[1]        = &ch->dev->zeromod;
-                ch->out[2]        = &ch->dev->zeromod;
-                ch->out[3]        = &ch->dev->zeromod;
-                break;
-
-            case 0x01:
-                ch->slots[0]->mod = &ch->slots[0]->fbmod;
-                ch->slots[1]->mod = &ch->dev->zeromod;
-                ch->out[0]        = &ch->slots[0]->out;
-                ch->out[1]        = &ch->slots[1]->out;
-                ch->out[2]        = &ch->dev->zeromod;
-                ch->out[3]        = &ch->dev->zeromod;
-                break;
-
-            default:
-                break;
-        }
-}
+OPL3_ChannelSetupAlg(opl3_channel *channel);
 
 static void
-channel_update_rhythm(nuked_t *dev, uint8_t data)
+OPL3_ChannelUpdateRhythm(opl3_chip *chip, uint8_t data)
 {
-    chan_t *ch6;
-    chan_t *ch7;
-    chan_t *ch8;
+    opl3_channel *channel6;
+    opl3_channel *channel7;
+    opl3_channel *channel8;
     uint8_t chnum;
 
-    dev->rhy = data & 0x3f;
-    if (dev->rhy & 0x20) {
-        ch6         = &dev->chan[6];
-        ch7         = &dev->chan[7];
-        ch8         = &dev->chan[8];
-        ch6->out[0] = &ch6->slots[1]->out;
-        ch6->out[1] = &ch6->slots[1]->out;
-        ch6->out[2] = &dev->zeromod;
-        ch6->out[3] = &dev->zeromod;
-        ch7->out[0] = &ch7->slots[0]->out;
-        ch7->out[1] = &ch7->slots[0]->out;
-        ch7->out[2] = &ch7->slots[1]->out;
-        ch7->out[3] = &ch7->slots[1]->out;
-        ch8->out[0] = &ch8->slots[0]->out;
-        ch8->out[1] = &ch8->slots[0]->out;
-        ch8->out[2] = &ch8->slots[1]->out;
-        ch8->out[3] = &ch8->slots[1]->out;
+    chip->rhy = data & 0x3f;
+    if (chip->rhy & 0x20) {
+        channel6         = &chip->channel[6];
+        channel7         = &chip->channel[7];
+        channel8         = &chip->channel[8];
+        channel6->out[0] = &channel6->slotz[1]->out;
+        channel6->out[1] = &channel6->slotz[1]->out;
+        channel6->out[2] = &chip->zeromod;
+        channel6->out[3] = &chip->zeromod;
+        channel7->out[0] = &channel7->slotz[0]->out;
+        channel7->out[1] = &channel7->slotz[0]->out;
+        channel7->out[2] = &channel7->slotz[1]->out;
+        channel7->out[3] = &channel7->slotz[1]->out;
+        channel8->out[0] = &channel8->slotz[0]->out;
+        channel8->out[1] = &channel8->slotz[0]->out;
+        channel8->out[2] = &channel8->slotz[1]->out;
+        channel8->out[3] = &channel8->slotz[1]->out;
 
         for (chnum = 6; chnum < 9; chnum++)
-            dev->chan[chnum].chtype = ch_drum;
+            chip->channel[chnum].chtype = ch_drum;
 
-        channel_setup_alg(ch6);
-        channel_setup_alg(ch7);
-        channel_setup_alg(ch8);
+        OPL3_ChannelSetupAlg(channel6);
+        OPL3_ChannelSetupAlg(channel7);
+        OPL3_ChannelSetupAlg(channel8);
 
         // hh
-        if (dev->rhy & 0x01)
-            env_key_on(ch7->slots[0], egk_drum);
+        if (chip->rhy & 0x01)
+            OPL3_EnvelopeKeyOn(channel7->slotz[0], egk_drum);
         else
-            env_key_off(ch7->slots[0], egk_drum);
+            OPL3_EnvelopeKeyOff(channel7->slotz[0], egk_drum);
 
         // tc
-        if (dev->rhy & 0x02)
-            env_key_on(ch8->slots[1], egk_drum);
+        if (chip->rhy & 0x02)
+            OPL3_EnvelopeKeyOn(channel8->slotz[1], egk_drum);
         else
-            env_key_off(ch8->slots[1], egk_drum);
+            OPL3_EnvelopeKeyOff(channel8->slotz[1], egk_drum);
 
         // tom
-        if (dev->rhy & 0x04)
-            env_key_on(ch8->slots[0], egk_drum);
+        if (chip->rhy & 0x04)
+            OPL3_EnvelopeKeyOn(channel8->slotz[0], egk_drum);
         else
-            env_key_off(ch8->slots[0], egk_drum);
+            OPL3_EnvelopeKeyOff(channel8->slotz[0], egk_drum);
 
         // sd
-        if (dev->rhy & 0x08)
-            env_key_on(ch7->slots[1], egk_drum);
+        if (chip->rhy & 0x08)
+            OPL3_EnvelopeKeyOn(channel7->slotz[1], egk_drum);
         else
-            env_key_off(ch7->slots[1], egk_drum);
+            OPL3_EnvelopeKeyOff(channel7->slotz[1], egk_drum);
 
         // bd
-        if (dev->rhy & 0x10) {
-            env_key_on(ch6->slots[0], egk_drum);
-            env_key_on(ch6->slots[1], egk_drum);
+        if (chip->rhy & 0x10) {
+            OPL3_EnvelopeKeyOn(channel6->slotz[0], egk_drum);
+            OPL3_EnvelopeKeyOn(channel6->slotz[1], egk_drum);
         } else {
-            env_key_off(ch6->slots[0], egk_drum);
-            env_key_off(ch6->slots[1], egk_drum);
+            OPL3_EnvelopeKeyOff(channel6->slotz[0], egk_drum);
+            OPL3_EnvelopeKeyOff(channel6->slotz[1], egk_drum);
         }
     } else {
         for (chnum = 6; chnum < 9; chnum++) {
-            dev->chan[chnum].chtype = ch_2op;
+            chip->channel[chnum].chtype = ch_2op;
 
-            channel_setup_alg(&dev->chan[chnum]);
-            env_key_off(dev->chan[chnum].slots[0], egk_drum);
-            env_key_off(dev->chan[chnum].slots[1], egk_drum);
+            OPL3_ChannelSetupAlg(&chip->channel[chnum]);
+            OPL3_EnvelopeKeyOff(chip->channel[chnum].slotz[0], egk_drum);
+            OPL3_EnvelopeKeyOff(chip->channel[chnum].slotz[1], egk_drum);
         }
     }
 }
 
 static void
-channel_write_a0(chan_t *ch, uint8_t data)
+OPL3_ChannelWriteA0(opl3_channel *channel, uint8_t data)
 {
-    if (ch->dev->newm && ch->chtype == ch_4op2)
+    if (channel->chip->newm && channel->chtype == ch_4op2)
         return;
 
-    ch->f_num = (ch->f_num & 0x300) | data;
-    ch->ksv   = (ch->block << 1) | ((ch->f_num >> (0x09 - ch->dev->nts)) & 0x01);
+    channel->f_num = (channel->f_num & 0x300) | data;
+    channel->ksv   = (channel->block << 1)
+                      | ((channel->f_num >> (0x09 - channel->chip->nts)) & 0x01);
 
-    env_update_ksl(ch->slots[0]);
-    env_update_ksl(ch->slots[1]);
+    OPL3_EnvelopeUpdateKSL(channel->slotz[0]);
+    OPL3_EnvelopeUpdateKSL(channel->slotz[1]);
 
-    if (ch->dev->newm && ch->chtype == ch_4op) {
-        ch->pair->f_num = ch->f_num;
-        ch->pair->ksv   = ch->ksv;
+    if (channel->chip->newm && channel->chtype == ch_4op) {
+        channel->pair->f_num = channel->f_num;
+        channel->pair->ksv   = channel->ksv;
 
-        env_update_ksl(ch->pair->slots[0]);
-        env_update_ksl(ch->pair->slots[1]);
+        OPL3_EnvelopeUpdateKSL(channel->pair->slotz[0]);
+        OPL3_EnvelopeUpdateKSL(channel->pair->slotz[1]);
     }
 }
 
 static void
-channel_write_b0(chan_t *ch, uint8_t data)
+OPL3_ChannelWriteB0(opl3_channel *channel, uint8_t data)
 {
-    if (ch->dev->newm && ch->chtype == ch_4op2)
+    if (channel->chip->newm && channel->chtype == ch_4op2)
         return;
 
-    ch->f_num = (ch->f_num & 0xff) | ((data & 0x03) << 8);
-    ch->block = (data >> 2) & 0x07;
-    ch->ksv   = (ch->block << 1) | ((ch->f_num >> (0x09 - ch->dev->nts)) & 0x01);
+    channel->f_num = (channel->f_num & 0xff) | ((data & 0x03) << 8);
+    channel->block = (data >> 2) & 0x07;
+    channel->ksv   = (channel->block << 1)
+                      | ((channel->f_num >> (0x09 - channel->chip->nts)) & 0x01);
 
-    env_update_ksl(ch->slots[0]);
-    env_update_ksl(ch->slots[1]);
+    OPL3_EnvelopeUpdateKSL(channel->slotz[0]);
+    OPL3_EnvelopeUpdateKSL(channel->slotz[1]);
 
-    if (ch->dev->newm && ch->chtype == ch_4op) {
-        ch->pair->f_num = ch->f_num;
-        ch->pair->block = ch->block;
-        ch->pair->ksv   = ch->ksv;
+    if (channel->chip->newm && channel->chtype == ch_4op) {
+        channel->pair->f_num = channel->f_num;
+        channel->pair->block = channel->block;
+        channel->pair->ksv   = channel->ksv;
 
-        env_update_ksl(ch->pair->slots[0]);
-        env_update_ksl(ch->pair->slots[1]);
+        OPL3_EnvelopeUpdateKSL(channel->pair->slotz[0]);
+        OPL3_EnvelopeUpdateKSL(channel->pair->slotz[1]);
     }
 }
 
 static void
-channel_write_c0(chan_t *ch, uint8_t data)
+OPL3_ChannelSetupAlg(opl3_channel *channel)
 {
-    ch->fb  = (data & 0x0e) >> 1;
-    ch->con = data & 0x01;
-    ch->alg = ch->con;
+    if (channel->chtype == ch_drum) {
+        if (channel->ch_num == 7 || channel->ch_num == 8) {
+            channel->slotz[0]->mod = &channel->chip->zeromod;
+            channel->slotz[1]->mod = &channel->chip->zeromod;
+            return;
+        }
 
-    if (ch->dev->newm) {
-        if (ch->chtype == ch_4op) {
-            ch->pair->alg = 0x04 | (ch->con << 1) | ch->pair->con;
-            ch->alg       = 0x08;
-            channel_setup_alg(ch->pair);
-        } else if (ch->chtype == ch_4op2) {
-            ch->alg       = 0x04 | (ch->pair->con << 1) | ch->con;
-            ch->pair->alg = 0x08;
-            channel_setup_alg(ch);
+        switch (channel->alg & 0x01) {
+            case 0x00:
+                channel->slotz[0]->mod = &channel->slotz[0]->fbmod;
+                channel->slotz[1]->mod = &channel->slotz[0]->out;
+                break;
+
+            case 0x01:
+                channel->slotz[0]->mod = &channel->slotz[0]->fbmod;
+                channel->slotz[1]->mod = &channel->chip->zeromod;
+                break;
+
+            default:
+                break;
+        }
+        return;
+    }
+
+    if (channel->alg & 0x08)
+        return;
+
+    if (channel->alg & 0x04) {
+        channel->pair->out[0] = &channel->chip->zeromod;
+        channel->pair->out[1] = &channel->chip->zeromod;
+        channel->pair->out[2] = &channel->chip->zeromod;
+        channel->pair->out[3] = &channel->chip->zeromod;
+
+        switch (channel->alg & 0x03) {
+            case 0x00:
+                channel->pair->slotz[0]->mod = &channel->pair->slotz[0]->fbmod;
+                channel->pair->slotz[1]->mod = &channel->pair->slotz[0]->out;
+                channel->slotz[0]->mod       = &channel->pair->slotz[1]->out;
+                channel->slotz[1]->mod       = &channel->slotz[0]->out;
+                channel->out[0]              = &channel->slotz[1]->out;
+                channel->out[1]              = &channel->chip->zeromod;
+                channel->out[2]              = &channel->chip->zeromod;
+                channel->out[3]              = &channel->chip->zeromod;
+                break;
+
+            case 0x01:
+                channel->pair->slotz[0]->mod = &channel->pair->slotz[0]->fbmod;
+                channel->pair->slotz[1]->mod = &channel->pair->slotz[0]->out;
+                channel->slotz[0]->mod       = &channel->chip->zeromod;
+                channel->slotz[1]->mod       = &channel->slotz[0]->out;
+                channel->out[0]              = &channel->pair->slotz[1]->out;
+                channel->out[1]              = &channel->slotz[1]->out;
+                channel->out[2]              = &channel->chip->zeromod;
+                channel->out[3]              = &channel->chip->zeromod;
+                break;
+
+            case 0x02:
+                channel->pair->slotz[0]->mod = &channel->pair->slotz[0]->fbmod;
+                channel->pair->slotz[1]->mod = &channel->chip->zeromod;
+                channel->slotz[0]->mod       = &channel->pair->slotz[1]->out;
+                channel->slotz[1]->mod       = &channel->slotz[0]->out;
+                channel->out[0]              = &channel->pair->slotz[0]->out;
+                channel->out[1]              = &channel->slotz[1]->out;
+                channel->out[2]              = &channel->chip->zeromod;
+                channel->out[3]              = &channel->chip->zeromod;
+                break;
+
+            case 0x03:
+                channel->pair->slotz[0]->mod = &channel->pair->slotz[0]->fbmod;
+                channel->pair->slotz[1]->mod = &channel->chip->zeromod;
+                channel->slotz[0]->mod       = &channel->pair->slotz[1]->out;
+                channel->slotz[1]->mod       = &channel->chip->zeromod;
+                channel->out[0]              = &channel->pair->slotz[0]->out;
+                channel->out[1]              = &channel->slotz[0]->out;
+                channel->out[2]              = &channel->slotz[1]->out;
+                channel->out[3]              = &channel->chip->zeromod;
+                break;
+
+            default:
+                break;
+        }
+    } else
+        switch (channel->alg & 0x01) {
+            case 0x00:
+                channel->slotz[0]->mod = &channel->slotz[0]->fbmod;
+                channel->slotz[1]->mod = &channel->slotz[0]->out;
+                channel->out[0]        = &channel->slotz[1]->out;
+                channel->out[1]        = &channel->chip->zeromod;
+                channel->out[2]        = &channel->chip->zeromod;
+                channel->out[3]        = &channel->chip->zeromod;
+                break;
+
+            case 0x01:
+                channel->slotz[0]->mod = &channel->slotz[0]->fbmod;
+                channel->slotz[1]->mod = &channel->chip->zeromod;
+                channel->out[0]        = &channel->slotz[0]->out;
+                channel->out[1]        = &channel->slotz[1]->out;
+                channel->out[2]        = &channel->chip->zeromod;
+                channel->out[3]        = &channel->chip->zeromod;
+                break;
+
+            default:
+                break;
+        }
+}
+
+static void
+OPL3_ChannelUpdateAlg(opl3_channel *channel)
+{
+    channel->alg = channel->con;
+
+    if (channel->chip->newm) {
+        if (channel->chtype == ch_4op) {
+            channel->pair->alg = 0x04 | (channel->con << 1) | (channel->pair->con);
+            channel->alg       = 0x08;
+            OPL3_ChannelSetupAlg(channel->pair);
+        } else if (channel->chtype == ch_4op2) {
+            channel->alg       = 0x04 | (channel->pair->con << 1) | (channel->con);
+            channel->pair->alg = 0x08;
+            OPL3_ChannelSetupAlg(channel);
         } else
-            channel_setup_alg(ch);
+            OPL3_ChannelSetupAlg(channel);
     } else
-        channel_setup_alg(ch);
-
-    if (ch->dev->newm) {
-        ch->cha = ((data >> 4) & 0x01) ? ~0 : 0;
-        ch->chb = ((data >> 5) & 0x01) ? ~0 : 0;
-    } else
-        ch->cha = ch->chb = (uint16_t) ~0;
+        OPL3_ChannelSetupAlg(channel);
 }
 
 static void
-channel_key_on(chan_t *ch)
+OPL3_ChannelWriteC0(opl3_channel *channel, uint8_t data)
 {
-    if (ch->dev->newm) {
-        if (ch->chtype == ch_4op) {
-            env_key_on(ch->slots[0], egk_norm);
-            env_key_on(ch->slots[1], egk_norm);
-            env_key_on(ch->pair->slots[0], egk_norm);
-            env_key_on(ch->pair->slots[1], egk_norm);
-        } else if (ch->chtype == ch_2op || ch->chtype == ch_drum) {
-            env_key_on(ch->slots[0], egk_norm);
-            env_key_on(ch->slots[1], egk_norm);
+    channel->fb  = (data & 0x0e) >> 1;
+    channel->con = data & 0x01;
+    OPL3_ChannelUpdateAlg(channel);
+
+    if (channel->chip->newm) {
+        channel->cha = ((data >> 4) & 0x01) ? ~0 : 0;
+        channel->chb = ((data >> 5) & 0x01) ? ~0 : 0;
+        channel->chc = ((data >> 6) & 0x01) ? ~0 : 0;
+        channel->chd = ((data >> 7) & 0x01) ? ~0 : 0;
+    } else {
+        channel->cha = channel->chb = (uint16_t) ~0;
+        // TODO: Verify on real chip if DAC2 output is disabled in compat mode
+        channel->chc = channel->chd = 0;
+    }
+
+#if OPL_ENABLE_STEREOEXT
+    if (!channel->chip->stereoext) {
+        channel->leftpan  = channel->cha << 16;
+        channel->rightpan = channel->chb << 16;
+    }
+#endif
+}
+
+#if OPL_ENABLE_STEREOEXT
+static void
+OPL3_ChannelWriteD0(opl3_channel *channel, uint8_t data)
+{
+    if (channel->chip->stereoext) {
+        channel->leftpan  = panpot_lut[data ^ 0xffu];
+        channel->rightpan = panpot_lut[data];
+    }
+}
+#endif
+
+static void
+OPL3_ChannelKeyOn(opl3_channel *channel)
+{
+    if (channel->chip->newm) {
+        if (channel->chtype == ch_4op) {
+            OPL3_EnvelopeKeyOn(channel->slotz[0], egk_norm);
+            OPL3_EnvelopeKeyOn(channel->slotz[1], egk_norm);
+            OPL3_EnvelopeKeyOn(channel->pair->slotz[0], egk_norm);
+            OPL3_EnvelopeKeyOn(channel->pair->slotz[1], egk_norm);
+        } else if (channel->chtype == ch_2op || channel->chtype == ch_drum) {
+            OPL3_EnvelopeKeyOn(channel->slotz[0], egk_norm);
+            OPL3_EnvelopeKeyOn(channel->slotz[1], egk_norm);
         }
     } else {
-        env_key_on(ch->slots[0], egk_norm);
-        env_key_on(ch->slots[1], egk_norm);
+        OPL3_EnvelopeKeyOn(channel->slotz[0], egk_norm);
+        OPL3_EnvelopeKeyOn(channel->slotz[1], egk_norm);
     }
 }
 
 static void
-channel_key_off(chan_t *ch)
+OPL3_ChannelKeyOff(opl3_channel *channel)
 {
-    if (ch->dev->newm) {
-        if (ch->chtype == ch_4op) {
-            env_key_off(ch->slots[0], egk_norm);
-            env_key_off(ch->slots[1], egk_norm);
-            env_key_off(ch->pair->slots[0], egk_norm);
-            env_key_off(ch->pair->slots[1], egk_norm);
-        } else if (ch->chtype == ch_2op || ch->chtype == ch_drum) {
-            env_key_off(ch->slots[0], egk_norm);
-            env_key_off(ch->slots[1], egk_norm);
+    if (channel->chip->newm) {
+        if (channel->chtype == ch_4op) {
+            OPL3_EnvelopeKeyOff(channel->slotz[0], egk_norm);
+            OPL3_EnvelopeKeyOff(channel->slotz[1], egk_norm);
+            OPL3_EnvelopeKeyOff(channel->pair->slotz[0], egk_norm);
+            OPL3_EnvelopeKeyOff(channel->pair->slotz[1], egk_norm);
+        } else if (channel->chtype == ch_2op || channel->chtype == ch_drum) {
+            OPL3_EnvelopeKeyOff(channel->slotz[0], egk_norm);
+            OPL3_EnvelopeKeyOff(channel->slotz[1], egk_norm);
         }
     } else {
-        env_key_off(ch->slots[0], egk_norm);
-        env_key_off(ch->slots[1], egk_norm);
+        OPL3_EnvelopeKeyOff(channel->slotz[0], egk_norm);
+        OPL3_EnvelopeKeyOff(channel->slotz[1], egk_norm);
     }
 }
 
 static void
-channel_set_4op(nuked_t *dev, uint8_t data)
+OPL3_ChannelSet4Op(opl3_chip *chip, uint8_t data)
 {
     uint8_t chnum;
 
@@ -1105,45 +1035,291 @@ channel_set_4op(nuked_t *dev, uint8_t data)
             chnum += 9 - 3;
 
         if ((data >> bit) & 0x01) {
-            dev->chan[chnum].chtype     = ch_4op;
-            dev->chan[chnum + 3].chtype = ch_4op2;
+            chip->channel[chnum].chtype      = ch_4op;
+            chip->channel[chnum + 3u].chtype = ch_4op2;
+            OPL3_ChannelUpdateAlg(&chip->channel[chnum]);
         } else {
-            dev->chan[chnum].chtype     = ch_2op;
-            dev->chan[chnum + 3].chtype = ch_2op;
+            chip->channel[chnum].chtype      = ch_2op;
+            chip->channel[chnum + 3u].chtype = ch_2op;
+            OPL3_ChannelUpdateAlg(&chip->channel[chnum]);
+            OPL3_ChannelUpdateAlg(&chip->channel[chnum + 3u]);
         }
     }
 }
 
+static void
+OPL3_ProcessSlot(opl3_slot *slot)
+{
+    OPL3_SlotCalcFB(slot);
+    OPL3_EnvelopeCalc(slot);
+    OPL3_PhaseGenerate(slot);
+    OPL3_SlotGenerate(slot);
+}
+
+static inline void
+OPL3_Generate4Ch(void *priv, int32_t *buf4)
+{
+    opl3_chip     *chip = (opl3_chip *) priv;
+    opl3_channel  *channel;
+    opl3_writebuf *writebuf;
+    int16_t      **out;
+    int32_t        mix[2];
+    uint8_t        i;
+    int16_t        accm;
+    uint8_t        shift = 0;
+
+    buf4[1] = chip->mixbuff[1];
+    buf4[3] = chip->mixbuff[3];
+
+#if OPL_QUIRK_CHANNELSAMPLEDELAY
+    for (i = 0; i < 15; i++)
+#else
+    for (i = 0; i < 36; i++)
+#endif
+        OPL3_ProcessSlot(&chip->slot[i]);
+
+    mix[0] = mix[1] = 0;
+
+    for (i = 0; i < 18; i++) {
+        channel = &chip->channel[i];
+        out     = channel->out;
+        accm    = *out[0] + *out[1] + *out[2] + *out[3];
+#if OPL_ENABLE_STEREOEXT
+        mix[0] += (int16_t) ((accm * channel->leftpan) >> 16);
+#else
+        mix[0] += (int16_t) (accm & channel->cha);
+#endif
+        mix[1] += (int16_t) (accm & channel->chc);
+    }
+
+    chip->mixbuff[0] = mix[0];
+    chip->mixbuff[2] = mix[1];
+
+#if OPL_QUIRK_CHANNELSAMPLEDELAY
+    for (i = 15; i < 18; i++)
+        OPL3_ProcessSlot(&chip->slot[i]);
+#endif
+
+    buf4[0] = chip->mixbuff[0];
+    buf4[2] = chip->mixbuff[2];
+
+#if OPL_QUIRK_CHANNELSAMPLEDELAY
+    for (i = 18; i < 33; i++)
+        OPL3_ProcessSlot(&chip->slot[i]);
+#endif
+
+    mix[0] = mix[1] = 0;
+
+    for (i = 0; i < 18; i++) {
+        channel = &chip->channel[i];
+        out     = channel->out;
+        accm    = *out[0] + *out[1] + *out[2] + *out[3];
+#if OPL_ENABLE_STEREOEXT
+        mix[0] += (int16_t) ((accm * channel->rightpan) >> 16);
+#else
+        mix[0] += (int16_t) (accm & channel->chb);
+#endif
+        mix[1] += (int16_t) (accm & channel->chd);
+    }
+
+    chip->mixbuff[1] = mix[0];
+    chip->mixbuff[3] = mix[1];
+
+#if OPL_QUIRK_CHANNELSAMPLEDELAY
+    for (i = 33; i < 36; i++)
+        OPL3_ProcessSlot(&chip->slot[i]);
+#endif
+
+    if ((chip->timer & 0x3f) == 0x3f)
+        chip->tremolopos = (chip->tremolopos + 1) % 210;
+
+    if (chip->tremolopos < 105)
+        chip->tremolo = chip->tremolopos >> chip->tremoloshift;
+    else
+        chip->tremolo = (210 - chip->tremolopos) >> chip->tremoloshift;
+
+    if ((chip->timer & 0x03ff) == 0x03ff)
+        chip->vibpos = (chip->vibpos + 1) & 7;
+
+    chip->timer++;
+
+    if (chip->eg_state) {
+        while (shift < 13 && ((chip->eg_timer >> shift) & 1) == 0)
+            shift++;
+
+        if (shift > 12)
+            chip->eg_add = 0;
+        else
+            chip->eg_add = shift + 1;
+
+        chip->eg_timer_lo = (uint8_t) (chip->eg_timer & 0x3u);
+    }
+
+    if (chip->eg_timerrem || chip->eg_state) {
+        if (chip->eg_timer == UINT64_C(0xfffffffff)) {
+            chip->eg_timer    = 0;
+            chip->eg_timerrem = 1;
+        } else {
+            chip->eg_timer++;
+            chip->eg_timerrem = 0;
+        }
+    }
+
+    chip->eg_state ^= 1;
+
+    while ((writebuf = &chip->writebuf[chip->writebuf_cur]), writebuf->time <= chip->writebuf_samplecnt) {
+        if (!(writebuf->reg & 0x200))
+            break;
+
+        writebuf->reg &= 0x01ff;
+
+        OPL3_WriteReg(chip, writebuf->reg, writebuf->data);
+
+        chip->writebuf_cur = (chip->writebuf_cur + 1) % OPL_WRITEBUF_SIZE;
+    }
+
+    chip->writebuf_samplecnt++;
+}
+
+void
+OPL3_Generate(opl3_chip *chip, int32_t *buf)
+{
+    int32_t samples[4];
+    OPL3_Generate4Ch(chip, samples);
+    buf[0] = samples[0];
+    buf[1] = samples[1];
+}
+
+void
+OPL3_Generate4ChResampled(opl3_chip *chip, int32_t *buf4)
+{
+    while (chip->samplecnt >= chip->rateratio) {
+        chip->oldsamples[0] = chip->samples[0];
+        chip->oldsamples[1] = chip->samples[1];
+        chip->oldsamples[2] = chip->samples[2];
+        chip->oldsamples[3] = chip->samples[3];
+        OPL3_Generate4Ch(chip, chip->samples);
+        chip->samplecnt -= chip->rateratio;
+    }
+
+    buf4[0] = (int32_t) ((chip->oldsamples[0] * (chip->rateratio - chip->samplecnt)
+                          + chip->samples[0] * chip->samplecnt) / chip->rateratio);
+    buf4[1] = (int32_t) ((chip->oldsamples[1] * (chip->rateratio - chip->samplecnt)
+                          + chip->samples[1] * chip->samplecnt) / chip->rateratio);
+    buf4[2] = (int32_t) ((chip->oldsamples[2] * (chip->rateratio - chip->samplecnt)
+                          + chip->samples[2] * chip->samplecnt) / chip->rateratio);
+    buf4[3] = (int32_t) ((chip->oldsamples[3] * (chip->rateratio - chip->samplecnt)
+                          + chip->samples[3] * chip->samplecnt) / chip->rateratio);
+
+    chip->samplecnt += 1 << RSM_FRAC;
+}
+
+void
+OPL3_GenerateResampled(opl3_chip *chip, int32_t *buf)
+{
+    int32_t samples[4];
+    OPL3_Generate4ChResampled(chip, samples);
+    buf[0] = samples[0];
+    buf[1] = samples[1];
+}
+
+void
+OPL3_Reset(opl3_chip *chip, uint32_t samplerate)
+{
+    opl3_slot    *slot;
+    opl3_channel *channel;
+    uint8_t       local_ch_slot;
+
+    memset(chip, 0x00, sizeof(opl3_chip));
+
+    for (uint8_t slotnum = 0; slotnum < 36; slotnum++) {
+        slot             = &chip->slot[slotnum];
+        slot->chip       = chip;
+        slot->mod        = &chip->zeromod;
+        slot->eg_rout    = 0x01ff;
+        slot->eg_out     = 0x01ff;
+        slot->eg_gen     = envelope_gen_num_release;
+        slot->trem       = (uint8_t *) &chip->zeromod;
+        slot->slot_num   = slotnum;
+    }
+
+    for (uint8_t channum = 0; channum < 18; channum++) {
+        channel                                = &chip->channel[channum];
+        local_ch_slot                          = ch_slot[channum];
+        channel->slotz[0]                      = &chip->slot[local_ch_slot];
+        channel->slotz[1]                      = &chip->slot[local_ch_slot + 3u];
+        chip->slot[local_ch_slot].channel      = channel;
+        chip->slot[local_ch_slot + 3u].channel = channel;
+
+        if ((channum % 9) < 3)
+            channel->pair = &chip->channel[channum + 3u];
+        else if ((channum % 9) < 6)
+            channel->pair = &chip->channel[channum - 3u];
+
+        channel->chip   = chip;
+        channel->out[0] = &chip->zeromod;
+        channel->out[1] = &chip->zeromod;
+        channel->out[2] = &chip->zeromod;
+        channel->out[3] = &chip->zeromod;
+        channel->chtype = ch_2op;
+        channel->cha    = 0xffff;
+        channel->chb    = 0xffff;
+#if OPL_ENABLE_STEREOEXT
+        channel->leftpan  = 0x10000;
+        channel->rightpan = 0x10000;
+#endif
+        channel->ch_num = channum;
+
+        OPL3_ChannelSetupAlg(channel);
+    }
+
+    chip->noise        = 1;
+    chip->rateratio    = (samplerate << RSM_FRAC) / FREQ_49716;
+    chip->tremoloshift = 4;
+    chip->vibshift     = 1;
+
+#if OPL_ENABLE_STEREOEXT
+    if (!panpot_lut_build) {
+        for (int32_t i = 0; i < 256; i++)
+            panpot_lut[i] = OPL_SIN(i);
+        panpot_lut_build = 1;
+    }
+#endif
+}
+
 uint16_t
 nuked_write_addr(void *priv, uint16_t port, uint8_t val)
 {
-    const nuked_t *dev = (nuked_t *) priv;
+    const opl3_chip *chip = (opl3_chip *) priv;
     uint16_t addr;
 
     addr = val;
-    if ((port & 0x0002) && ((addr == 0x0005) || dev->newm))
+    if ((port & 0x0002) && ((addr == 0x0005) || chip->newm))
         addr |= 0x0100;
 
     return addr;
 }
 
 void
-nuked_write_reg(void *priv, uint16_t reg, uint8_t val)
+OPL3_WriteReg(void *priv, uint16_t reg, uint8_t val)
 {
-    nuked_t *dev  = (nuked_t *) priv;
-    uint8_t  high = (reg >> 8) & 0x01;
-    uint8_t  regm = reg & 0xff;
+    opl3_chip *chip = (opl3_chip *) priv;
+    uint8_t    high = (reg >> 8) & 0x01;
+    uint8_t    regm = reg & 0xff;
 
     switch (regm & 0xf0) {
         case 0x00:
             if (high)
                 switch (regm & 0x0f) {
                     case 0x04:
-                        channel_set_4op(dev, val);
+                        OPL3_ChannelSet4Op(chip, val);
                         break;
 
                     case 0x05:
-                        dev->newm = val & 0x01;
+                        chip->newm = val & 0x01;
+#if OPL_ENABLE_STEREOEXT
+                        chip->stereoext = (val >> 1) & 0x01;
+#endif
                         break;
 
                     default:
@@ -1152,7 +1328,7 @@ nuked_write_reg(void *priv, uint16_t reg, uint8_t val)
             else
                 switch (regm & 0x0f) {
                     case 0x08:
-                        dev->nts = (val >> 6) & 0x01;
+                        chip->nts = (val >> 6) & 0x01;
                         break;
 
                     default:
@@ -1162,58 +1338,65 @@ nuked_write_reg(void *priv, uint16_t reg, uint8_t val)
 
         case 0x20:
         case 0x30:
-            if (ad_slot[regm & 0x1f] >= 0)
-                slot_write_20(&dev->slot[18 * high + ad_slot[regm & 0x1f]], val);
+            if (ad_slot[regm & 0x1fu] >= 0)
+                OPL3_SlotWrite20(&chip->slot[18u * high + ad_slot[regm & 0x1fu]], val);
             break;
 
         case 0x40:
         case 0x50:
-            if (ad_slot[regm & 0x1f] >= 0)
-                slot_write_40(&dev->slot[18 * high + ad_slot[regm & 0x1f]], val);
+            if (ad_slot[regm & 0x1fu] >= 0)
+                OPL3_SlotWrite40(&chip->slot[18u * high + ad_slot[regm & 0x1fu]], val);
             break;
 
         case 0x60:
         case 0x70:
-            if (ad_slot[regm & 0x1f] >= 0)
-                slot_write_60(&dev->slot[18 * high + ad_slot[regm & 0x1f]], val);
+            if (ad_slot[regm & 0x1fu] >= 0)
+                OPL3_SlotWrite60(&chip->slot[18u * high + ad_slot[regm & 0x1fu]], val);
             break;
 
         case 0x80:
         case 0x90:
-            if (ad_slot[regm & 0x1f] >= 0)
-                slot_write_80(&dev->slot[18 * high + ad_slot[regm & 0x1f]], val);
+            if (ad_slot[regm & 0x1fu] >= 0)
+                OPL3_SlotWrite80(&chip->slot[18u * high + ad_slot[regm & 0x1fu]], val);
+            break;
+
+        case 0xe0:
+        case 0xf0:
+            if (ad_slot[regm & 0x1fu] >= 0)
+                OPL3_SlotWriteE0(&chip->slot[18u * high + ad_slot[regm & 0x1fu]], val);
             break;
 
         case 0xa0:
             if ((regm & 0x0f) < 9)
-                channel_write_a0(&dev->chan[9 * high + (regm & 0x0f)], val);
+                OPL3_ChannelWriteA0(&chip->channel[9u * high + (regm & 0x0fu)], val);
             break;
 
         case 0xb0:
             if (regm == 0xbd && !high) {
-                dev->tremoloshift = (((val >> 7) ^ 1) << 1) + 2;
-                dev->vibshift     = ((val >> 6) & 0x01) ^ 1;
-                channel_update_rhythm(dev, val);
+                chip->tremoloshift = (((val >> 7) ^ 1) << 1) + 2;
+                chip->vibshift     = ((val >> 6) & 0x01) ^ 1;
+                OPL3_ChannelUpdateRhythm(chip, val);
             } else if ((regm & 0x0f) < 9) {
-                channel_write_b0(&dev->chan[9 * high + (regm & 0x0f)], val);
+                OPL3_ChannelWriteB0(&chip->channel[9u * high + (regm & 0x0fu)], val);
 
                 if (val & 0x20)
-                    channel_key_on(&dev->chan[9 * high + (regm & 0x0f)]);
+                    OPL3_ChannelKeyOn(&chip->channel[9u * high + (regm & 0x0fu)]);
                 else
-                    channel_key_off(&dev->chan[9 * high + (regm & 0x0f)]);
+                    OPL3_ChannelKeyOff(&chip->channel[9u * high + (regm & 0x0fu)]);
             }
             break;
 
         case 0xc0:
             if ((regm & 0x0f) < 9)
-                channel_write_c0(&dev->chan[9 * high + (regm & 0x0f)], val);
+                OPL3_ChannelWriteC0(&chip->channel[9u * high + (regm & 0x0fu)], val);
             break;
 
-        case 0xe0:
-        case 0xf0:
-            if (ad_slot[regm & 0x1f] >= 0)
-                slot_write_e0(&dev->slot[18 * high + ad_slot[regm & 0x1f]], val);
+#if OPL_ENABLE_STEREOEXT
+        case 0xd0:
+            if ((regm & 0x0f) < 9)
+                OPL3_ChannelWriteD0(&chip->channel[9u * high + (regm & 0x0fu)], val);
             break;
+#endif
 
         default:
             break;
@@ -1221,222 +1404,62 @@ nuked_write_reg(void *priv, uint16_t reg, uint8_t val)
 }
 
 void
-nuked_write_reg_buffered(void *priv, uint16_t reg, uint8_t val)
+OPL3_WriteRegBuffered(void *priv, uint16_t reg, uint8_t val)
 {
-    nuked_t *dev = (nuked_t *) priv;
-    uint64_t time1;
-    uint64_t time2;
+    opl3_chip     *chip = (opl3_chip *) priv;
+    uint64_t       time1;
+    uint64_t       time2;
+    opl3_writebuf *writebuf;
+    uint32_t       writebuf_last;
 
-    if (dev->wrbuf[dev->wrbuf_last].reg & 0x0200) {
-        nuked_write_reg(dev, dev->wrbuf[dev->wrbuf_last].reg & 0x01ff,
-                        dev->wrbuf[dev->wrbuf_last].data);
+    writebuf_last = chip->writebuf_last;
+    writebuf      = &chip->writebuf[writebuf_last];
 
-        dev->wrbuf_cur       = (dev->wrbuf_last + 1) % WRBUF_SIZE;
-        dev->wrbuf_samplecnt = dev->wrbuf[dev->wrbuf_last].time;
+    if (writebuf->reg & 0x0200) {
+        OPL3_WriteReg(chip, writebuf->reg & 0x01ff, writebuf->data);
+
+        chip->writebuf_cur       = (writebuf_last + 1) % OPL_WRITEBUF_SIZE;
+        chip->writebuf_samplecnt = writebuf->time;
     }
 
-    dev->wrbuf[dev->wrbuf_last].reg  = reg | 0x0200;
-    dev->wrbuf[dev->wrbuf_last].data = val;
-    time1                            = dev->wrbuf_lasttime + WRBUF_DELAY;
-    time2                            = dev->wrbuf_samplecnt;
+    writebuf->reg  = reg | 0x0200;
+    writebuf->data = val;
+    time1          = chip->writebuf_lasttime + OPL_WRITEBUF_DELAY;
+    time2          = chip->writebuf_samplecnt;
 
     if (time1 < time2)
         time1 = time2;
 
-    dev->wrbuf[dev->wrbuf_last].time = time1;
-    dev->wrbuf_lasttime              = time1;
-    dev->wrbuf_last                  = (dev->wrbuf_last + 1) % WRBUF_SIZE;
+    writebuf->time          = time1;
+    chip->writebuf_lasttime = time1;
+    chip->writebuf_last     = (writebuf_last + 1) % OPL_WRITEBUF_SIZE;
 }
 
 void
-nuked_generate(void *priv, int32_t *bufp)
+OPL3_Generate4ChStream(opl3_chip *chip, int32_t *sndptr1, int32_t *sndptr2, uint32_t numsamples)
 {
-    nuked_t *dev = (nuked_t *) priv;
-    int16_t  accm;
-    int16_t  shift = 0;
-    uint8_t  i;
-    uint8_t  j;
+    int32_t samples[4];
 
-    bufp[1] = dev->mixbuff[1];
-
-    for (i = 0; i < 15; i++) {
-        slot_calc_fb(&dev->slot[i]);
-        env_calc(&dev->slot[i]);
-        phase_generate(&dev->slot[i]);
-        slot_generate(&dev->slot[i]);
+    for (uint_fast32_t i = 0; i < numsamples; i++) {
+        OPL3_Generate4Ch(chip, samples);
+        sndptr1[0] = samples[0];
+        sndptr1[1] = samples[1];
+        sndptr2[0] = samples[2];
+        sndptr2[1] = samples[3];
+        sndptr1 += 2;
+        sndptr2 += 2;
     }
-
-    dev->mixbuff[0] = 0;
-
-    for (i = 0; i < 18; i++) {
-        accm = 0;
-
-        for (j = 0; j < 4; j++)
-            accm += *dev->chan[i].out[j];
-
-        dev->mixbuff[0] += (int16_t) (accm & dev->chan[i].cha);
-    }
-    for (i = 15; i < 18; i++) {
-        slot_calc_fb(&dev->slot[i]);
-        env_calc(&dev->slot[i]);
-        phase_generate(&dev->slot[i]);
-        slot_generate(&dev->slot[i]);
-    }
-
-    bufp[0] = dev->mixbuff[0];
-
-    for (i = 18; i < 33; i++) {
-        slot_calc_fb(&dev->slot[i]);
-        env_calc(&dev->slot[i]);
-        phase_generate(&dev->slot[i]);
-        slot_generate(&dev->slot[i]);
-    }
-
-    dev->mixbuff[1] = 0;
-
-    for (i = 0; i < 18; i++) {
-        accm = 0;
-
-        for (j = 0; j < 4; j++)
-            accm += *dev->chan[i].out[j];
-
-        dev->mixbuff[1] += (int16_t) (accm & dev->chan[i].chb);
-    }
-
-    for (i = 33; i < 36; i++) {
-        slot_calc_fb(&dev->slot[i]);
-        env_calc(&dev->slot[i]);
-        phase_generate(&dev->slot[i]);
-        slot_generate(&dev->slot[i]);
-    }
-
-    if ((dev->timer & 0x3f) == 0x3f)
-        dev->tremolopos = (dev->tremolopos + 1) % 210;
-
-    if (dev->tremolopos < 105)
-        dev->tremolo = dev->tremolopos >> dev->tremoloshift;
-    else
-        dev->tremolo = (210 - dev->tremolopos) >> dev->tremoloshift;
-
-    if ((dev->timer & 0x03ff) == 0x03ff)
-        dev->vibpos = (dev->vibpos + 1) & 7;
-
-    dev->timer++;
-    dev->eg_add = 0;
-
-    if (dev->eg_timer) {
-        while (shift < 36 && ((dev->eg_timer >> shift) & 1) == 0)
-            shift++;
-
-        if (shift > 12)
-            dev->eg_add = 0;
-        else
-            dev->eg_add = shift + 1;
-    }
-
-    if (dev->eg_timerrem || dev->eg_state) {
-        if (dev->eg_timer == 0xfffffffff) {
-            dev->eg_timer    = 0;
-            dev->eg_timerrem = 1;
-        } else {
-            dev->eg_timer++;
-            dev->eg_timerrem = 0;
-        }
-    }
-
-    dev->eg_state ^= 1;
-
-    while (dev->wrbuf[dev->wrbuf_cur].time <= dev->wrbuf_samplecnt) {
-        if (!(dev->wrbuf[dev->wrbuf_cur].reg & 0x200))
-            break;
-
-        dev->wrbuf[dev->wrbuf_cur].reg &= 0x01ff;
-
-        nuked_write_reg(dev, dev->wrbuf[dev->wrbuf_cur].reg,
-                        dev->wrbuf[dev->wrbuf_cur].data);
-
-        dev->wrbuf_cur = (dev->wrbuf_cur + 1) % WRBUF_SIZE;
-    }
-
-    dev->wrbuf_samplecnt++;
 }
 
 void
-nuked_generate_resampled(nuked_t *dev, int32_t *bufp)
+OPL3_GenerateStream(opl3_chip *chip, int32_t *sndptr, uint32_t numsamples)
 {
-    while (dev->samplecnt >= dev->rateratio) {
-        dev->oldsamples[0] = dev->samples[0];
-        dev->oldsamples[1] = dev->samples[1];
-        nuked_generate(dev, dev->samples);
-        dev->samplecnt -= dev->rateratio;
-    }
-
-    bufp[0] = (int32_t) ((dev->oldsamples[0] * (dev->rateratio - dev->samplecnt)
-                          + dev->samples[0] * dev->samplecnt)
-                         / dev->rateratio);
-    bufp[1] = (int32_t) ((dev->oldsamples[1] * (dev->rateratio - dev->samplecnt)
-                          + dev->samples[1] * dev->samplecnt)
-                         / dev->rateratio);
-
-    dev->samplecnt += 1 << RSM_FRAC;
-}
-
-void
-nuked_generate_stream(nuked_t *dev, int32_t *sndptr, uint32_t num)
-{
-    for (uint32_t i = 0; i < num; i++) {
-        nuked_generate_resampled(dev, sndptr);
+    for (uint_fast32_t i = 0; i < numsamples; i++) {
+        OPL3_Generate(chip, sndptr);
         sndptr += 2;
     }
 }
 
-void
-nuked_init(nuked_t *dev, uint32_t samplerate)
-{
-    uint8_t i;
-
-    memset(dev, 0x00, sizeof(nuked_t));
-
-    for (i = 0; i < 36; i++) {
-        dev->slot[i].dev      = dev;
-        dev->slot[i].mod      = &dev->zeromod;
-        dev->slot[i].eg_rout  = 0x01ff;
-        dev->slot[i].eg_out   = 0x01ff;
-        dev->slot[i].eg_gen   = envelope_gen_num_release;
-        dev->slot[i].trem     = (uint8_t *) &dev->zeromod;
-        dev->slot[i].slot_num = i;
-    }
-
-    for (i = 0; i < 18; i++) {
-        dev->chan[i].slots[0]          = &dev->slot[ch_slot[i]];
-        dev->chan[i].slots[1]          = &dev->slot[ch_slot[i] + 3];
-        dev->slot[ch_slot[i]].chan     = &dev->chan[i];
-        dev->slot[ch_slot[i] + 3].chan = &dev->chan[i];
-
-        if ((i % 9) < 3)
-            dev->chan[i].pair = &dev->chan[i + 3];
-        else if ((i % 9) < 6)
-            dev->chan[i].pair = &dev->chan[i - 3];
-
-        dev->chan[i].dev    = dev;
-        dev->chan[i].out[0] = &dev->zeromod;
-        dev->chan[i].out[1] = &dev->zeromod;
-        dev->chan[i].out[2] = &dev->zeromod;
-        dev->chan[i].out[3] = &dev->zeromod;
-        dev->chan[i].chtype = ch_2op;
-        dev->chan[i].cha    = 0xffff;
-        dev->chan[i].chb    = 0xffff;
-        dev->chan[i].ch_num = i;
-
-        channel_setup_alg(&dev->chan[i]);
-    }
-
-    dev->noise        = 1;
-    dev->rateratio    = (samplerate << RSM_FRAC) / 49716;
-    dev->tremoloshift = 4;
-    dev->vibshift     = 1;
-}
-
 static void
 nuked_timer_tick(nuked_drv_t *dev, int tmr)
 {
@@ -1513,7 +1536,7 @@ nuked_drv_init(const device_t *info)
         dev->status = 0x06;
 
     /* Initialize the NukedOPL object. */
-    nuked_init(&dev->opl, OPL_FREQ);
+    OPL3_Reset(&dev->opl, FREQ_49716);
 
     timer_add(&dev->timers[0], nuked_timer_1, dev, 0);
     timer_add(&dev->timers[1], nuked_timer_2, dev, 0);
@@ -1533,14 +1556,14 @@ nuked_drv_update(void *priv)
 {
     nuked_drv_t *dev = (nuked_drv_t *) priv;
 
-    if (dev->pos >= sound_pos_global)
+    if (dev->pos >= music_pos_global)
         return dev->buffer;
 
-    nuked_generate_stream(&dev->opl,
+    OPL3_GenerateStream(&dev->opl,
                           &dev->buffer[dev->pos * 2],
-                          sound_pos_global - dev->pos);
+                          music_pos_global - dev->pos);
 
-    for (; dev->pos < sound_pos_global; dev->pos++) {
+    for (; dev->pos < music_pos_global; dev->pos++) {
         dev->buffer[dev->pos * 2] /= 2;
         dev->buffer[(dev->pos * 2) + 1] /= 2;
     }
@@ -1578,7 +1601,7 @@ nuked_drv_write(uint16_t port, uint8_t val, void *priv)
     nuked_drv_update(dev);
 
     if ((port & 0x0001) == 0x0001) {
-        nuked_write_reg_buffered(&dev->opl, dev->port, val);
+        OPL3_WriteRegBuffered(&dev->opl, dev->port, val);
 
         switch (dev->port) {
             case 0x002: /* Timer 1 */
@@ -1634,7 +1657,7 @@ const device_t ym3812_nuked_device = {
     .init          = nuked_drv_init,
     .close         = nuked_drv_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL ,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -1648,18 +1671,18 @@ const device_t ymf262_nuked_device = {
     .init          = nuked_drv_init,
     .close         = nuked_drv_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
 };
 
 const fm_drv_t nuked_opl_drv = {
-    &nuked_drv_read,
-    &nuked_drv_write,
-    &nuked_drv_update,
-    &nuked_drv_reset_buffer,
-    &nuked_drv_set_do_cycles,
-    NULL,
-    NULL,
-};
\ No newline at end of file
+    .read          = &nuked_drv_read,
+    .write         = &nuked_drv_write,
+    .update        = &nuked_drv_update,
+    .reset_buffer  = &nuked_drv_reset_buffer,
+    .set_do_cycles = &nuked_drv_set_do_cycles,
+    .priv          = NULL,
+    .generate      = NULL,
+};
diff --git a/src/sound/snd_opl_opl2board.cpp b/src/sound/snd_opl_opl2board.cpp
new file mode 100644
index 000000000..286e62d4f
--- /dev/null
+++ b/src/sound/snd_opl_opl2board.cpp
@@ -0,0 +1,527 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Interface to the YMFM External audio device (USB)
+ *          For OPL2Board arduino based.
+ *
+ * Authors: Jose Phillips, <jose@hddlive.net>
+ *          Adrien Moulin, <adrien@elyosh.org>
+ *          
+ *          Copyright 2024 Jose Phillips.
+ *          Copyright 2022 Adrien Moulin.
+ */
+#include <cstdarg>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include "ymfm/ymfm_opl.h"
+#include <libserialport.h>
+
+extern "C" {
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/timer.h>
+#include <86box/device.h>
+#include <86box/sound.h>
+#include <86box/snd_opl.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/plat_unused.h>
+#include <86box/config.h>
+#include <86box/ini.h>
+#include <86box/device.h>
+
+// Disable c99-designator to avoid the warnings in *_ymfm_device
+#ifdef __clang__
+#    if __has_warning("-Wc99-designator")
+#        pragma clang diagnostic push
+#        pragma clang diagnostic ignored "-Wc99-designator"
+#    endif
+#endif
+}
+
+#define RSM_FRAC 10
+
+enum {
+    FLAG_CYCLES = (1 << 0)
+};
+
+uint8_t lastval = 0x00;
+
+class OPLBOARDChipBase {
+public:
+    OPLBOARDChipBase(UNUSED(uint32_t clock), fm_type type, uint32_t samplerate)
+        : m_buf_pos(0)
+        , m_flags(0)
+        , m_type(type)
+        , m_samplerate(samplerate)
+    {
+        memset(m_buffer, 0, sizeof(m_buffer));
+    }
+
+    virtual ~OPLBOARDChipBase()
+    {
+    }
+
+    fm_type  type() const { return m_type; }
+    int8_t   flags() const { return m_flags; }
+    void     set_do_cycles(int8_t do_cycles) { do_cycles ? m_flags |= FLAG_CYCLES : m_flags &= ~FLAG_CYCLES; }
+    int32_t *buffer() const { return (int32_t *) m_buffer; }
+    void     reset_buffer() { m_buf_pos = 0; }
+
+    virtual uint32_t sample_rate() const = 0;
+
+    virtual void     write(uint16_t addr, uint8_t data)                      = 0;
+    virtual void     generate(int32_t *data, uint32_t num_samples)           = 0;
+    virtual int32_t *update()                                                = 0;
+    virtual uint8_t  read(uint16_t addr)                                     = 0;
+    virtual void     set_clock(uint32_t clock)                               = 0;
+
+protected:
+    int32_t  m_buffer[MUSICBUFLEN * 2];
+    int      m_buf_pos;
+    int      *m_buf_pos_global;
+    int8_t   m_flags;
+    fm_type  m_type;
+    uint32_t m_samplerate;
+};
+
+template <typename ChipType>
+class OPLBOARDChip : public OPLBOARDChipBase, public ymfm::ymfm_interface {
+public:
+    OPLBOARDChip(uint32_t clock, fm_type type, uint32_t samplerate)
+        : OPLBOARDChipBase(clock, type, samplerate)
+        , m_chip(*this)
+        , m_clock(clock)
+        , m_samplerate(samplerate)
+        , m_samplecnt(0)
+    {
+        memset(m_samples, 0, sizeof(m_samples));
+        memset(m_oldsamples, 0, sizeof(m_oldsamples));
+        m_rateratio      = (samplerate << RSM_FRAC) / m_chip.sample_rate(m_clock);
+        m_clock_us       = 1000000.0 / (double) m_clock;
+        m_subtract[0]    = 80.0;
+        m_subtract[1]    = 320.0;
+        m_type           = type;
+        m_buf_pos_global = (samplerate == FREQ_49716) ? &music_pos_global : &wavetable_pos_global;
+
+        if (m_type == FM_YMF278B) {
+            if (rom_load_linear("roms/sound/yamaha/yrw801.rom", 0, 0x200000, 0, m_yrw801) == 0) {
+                fatal("YRW801 ROM image \"roms/sound/yamaha/yrw801.rom\" not found\n");
+            }
+        }
+
+        timer_add(&m_timers[0], OPLBOARDChip::timer1, this, 0);
+        timer_add(&m_timers[1], OPLBOARDChip::timer2, this, 0);
+    }
+
+    virtual uint32_t sample_rate() const override
+    {
+        return m_chip.sample_rate(m_clock);
+    }
+
+    virtual void ymfm_set_timer(uint32_t tnum, int32_t duration_in_clocks) override
+    {
+        if (tnum > 1)
+            return;
+
+        m_duration_in_clocks[tnum] = duration_in_clocks;
+        pc_timer_t *timer          = &m_timers[tnum];
+        if (duration_in_clocks < 0)
+            timer_stop(timer);
+        else {
+            double period = m_clock_us * duration_in_clocks;
+            if (period < m_subtract[tnum])
+                m_engine->engine_timer_expired(tnum);
+            else
+                timer_on_auto(timer, period);
+        }
+    }
+
+    virtual void set_clock(uint32_t clock) override
+    {
+        m_clock     = clock;
+        m_clock_us  = 1000000.0 / (double) m_clock;
+        m_rateratio = (m_samplerate << RSM_FRAC) / m_chip.sample_rate(m_clock);
+
+        ymfm_set_timer(0, m_duration_in_clocks[0]);
+        ymfm_set_timer(1, m_duration_in_clocks[1]);
+    }
+
+    virtual void generate(int32_t *data, uint32_t num_samples) override
+    {
+        for (uint32_t i = 0; i < num_samples; i++) {
+            m_chip.generate(&m_output);
+            if ((m_type == FM_YMF278B) && (sizeof(m_output.data) > (4 * sizeof(int32_t)))) {
+                if (ChipType::OUTPUTS == 1) {
+                    *data++ = m_output.data[4];
+                    *data++ = m_output.data[4];
+                } else {
+                    *data++ = m_output.data[4];
+                    *data++ = m_output.data[5];
+                }
+            } else if (ChipType::OUTPUTS == 1) {
+                *data++ = m_output.data[0];
+                *data++ = m_output.data[0];
+            } else {
+                *data++ = m_output.data[0];
+                *data++ = m_output.data[1 % ChipType::OUTPUTS];
+            }
+        }
+    }
+
+#if 0
+    virtual void generate_resampled(int32_t *data, uint32_t num_samples) override
+    {
+        if ((m_samplerate == FREQ_49716) || (m_samplerate == FREQ_44100)) {
+            generate(data, num_samples);
+            return;
+        }
+
+        for (uint32_t i = 0; i < num_samples; i++) {
+            while (m_samplecnt >= m_rateratio) {
+                m_oldsamples[0] = m_samples[0];
+                m_oldsamples[1] = m_samples[1];
+                m_chip.generate(&m_output);
+                if ((m_type == FM_YMF278B) && (sizeof(m_output.data) > (4 * sizeof(int32_t)))) {
+                    if (ChipType::OUTPUTS == 1) {
+                        m_samples[0] = m_output.data[4];
+                        m_samples[1] = m_output.data[4];
+                    } else {
+                        m_samples[0] = m_output.data[4];
+                        m_samples[1] = m_output.data[5];
+                    }
+                } else if (ChipType::OUTPUTS == 1) {
+                    m_samples[0] = m_output.data[0];
+                    m_samples[1] = m_output.data[0];
+                } else {
+                    m_samples[0] = m_output.data[0];
+                    m_samples[1] = m_output.data[1 % ChipType::OUTPUTS];
+                }
+                m_samplecnt -= m_rateratio;
+            }
+
+            *data++ = ((int32_t) ((m_oldsamples[0] * (m_rateratio - m_samplecnt)
+                                   + m_samples[0] * m_samplecnt)
+                                  / m_rateratio));
+            *data++ = ((int32_t) ((m_oldsamples[1] * (m_rateratio - m_samplecnt)
+                                   + m_samples[1] * m_samplecnt)
+                                  / m_rateratio));
+
+            m_samplecnt += 1 << RSM_FRAC;
+        }
+    }
+#endif
+
+    virtual int32_t *update() override
+    {
+        if (m_buf_pos >= *m_buf_pos_global)
+            return m_buffer;
+
+        generate(&m_buffer[m_buf_pos * 2], *m_buf_pos_global - m_buf_pos);
+
+        for (; m_buf_pos < *m_buf_pos_global; m_buf_pos++) {
+            m_buffer[m_buf_pos * 2] /= 2;
+            m_buffer[(m_buf_pos * 2) + 1] /= 2;
+        }
+
+        return m_buffer;
+    }
+
+    virtual void write(uint16_t addr, uint8_t data) override
+    {
+        m_chip.write(addr, data);
+    }
+
+    virtual uint8_t read(uint16_t addr) override
+    {
+        return m_chip.read(addr);
+    }
+
+    virtual uint32_t get_special_flags(void) override
+    {
+        return ((m_type == FM_YMF262) || (m_type == FM_YMF289B) || (m_type == FM_YMF278B)) ? 0x8000 : 0x0000;
+    }
+
+    static void timer1(void *priv)
+    {
+        OPLBOARDChip<ChipType> *drv = (OPLBOARDChip<ChipType> *) priv;
+        drv->m_engine->engine_timer_expired(0);
+    }
+
+    static void timer2(void *priv)
+    {
+        OPLBOARDChip<ChipType> *drv = (OPLBOARDChip<ChipType> *) priv;
+        drv->m_engine->engine_timer_expired(1);
+    }
+
+    virtual uint8_t ymfm_external_read(ymfm::access_class type, uint32_t address) override
+    {
+        if (type == ymfm::access_class::ACCESS_PCM && address < 0x200000) {
+            return m_yrw801[address];
+        }
+        return 0xFF;
+    }
+
+private:
+    ChipType                       m_chip;
+    uint32_t                       m_clock;
+    double                         m_clock_us;
+    double                         m_subtract[2];
+    typename ChipType::output_data m_output;
+    pc_timer_t                     m_timers[2];
+    int32_t                        m_duration_in_clocks[2]; // Needed for clock switches.
+    uint32_t                       m_samplerate;
+
+    // YRW801-M wavetable ROM.
+    uint8_t m_yrw801[0x200000];
+
+    // Resampling
+    int32_t m_rateratio;
+    int32_t m_samplecnt;
+    int32_t m_oldsamples[2];
+    int32_t m_samples[2];
+};
+
+extern "C" {
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+
+#include "cpu.h"
+#include <86box/86box.h>
+#include <86box/io.h>
+#include <86box/snd_opl.h>
+#include <86box/device.h>
+#include <86box/config.h>
+#include <86box/ini.h>
+
+#ifdef ENABLE_OPL_LOG
+int oplboard_do_log = ENABLE_OPL_LOG;
+
+static void
+oplboard_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (oplboard_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define oplboard_log(fmt, ...)
+#endif
+
+struct sp_port *port;
+
+void opl2board_init() {
+    device_add(&opl2board_device);
+    const char* port_name = device_get_config_string("host_serial_path");
+    device_context_restore();
+
+    enum sp_return result;
+
+    result = sp_get_port_by_name(port_name, &port);
+    if (result != SP_OK) {
+        oplboard_log("Error: Cannot find port %s\n", port_name);
+        return;
+    }
+
+    result = sp_open(port, SP_MODE_READ_WRITE);
+    if (result != SP_OK) {
+        oplboard_log ("Error: Cannot open port %s\n", port_name);
+        return;
+    }
+
+    // Set port configuration this values are hardcoded.
+    sp_set_baudrate(port, 115200);
+    sp_set_bits(port, 8);
+    sp_set_parity(port, SP_PARITY_NONE);
+    sp_set_stopbits(port, 1);
+    sp_set_flowcontrol(port, SP_FLOWCONTROL_NONE);
+
+    oplboard_log("OPL2Board Serial port %s initialized at 115200 baud.\n", port_name);
+}
+
+void opl2board_write(uint8_t data) {
+    if (port == NULL) {
+        oplboard_log(stderr, "Error: OPL2Board Port not initialized.\n");
+
+        return;    
+    }
+
+    enum sp_return result = sp_blocking_write(port, &data, sizeof(data), 1000);
+    if (result < 0) {
+        oplboard_log(stderr, "Error: Failed to write to OPL2Board port.\n");
+    } else {
+        oplboard_log("OPL2Board: data sent: %02X\n", data);
+    }
+}
+
+void opl2board_reset() {
+
+    // Reset all voices to 0 
+    oplboard_log("Performing OPL2Board reset\n");
+    for (uint8_t i = 0x00; i < 0xFF; i++) {
+		if (i >= 0x40 && i <= 0x55) {
+			opl2board_write(i);
+            opl2board_write(0x3F);
+		} else {
+            opl2board_write (i);
+			opl2board_write(0x00);        
+		}	}
+}
+
+void opl2board_close() {
+    
+    if (port != NULL) {
+        opl2board_reset();
+        sp_close(port);
+        sp_free_port(port);
+        port = NULL;
+        oplboard_log("OPL2Board port closed.\n");
+    }
+}
+
+static void *
+ymfm_opl2board_drv_init(const device_t *info)
+{
+    OPLBOARDChipBase *fm;
+    
+    switch (info->local) {
+        default:
+        case FM_OPL2BOARD:
+            fm = (OPLBOARDChipBase *) new OPLBOARDChip<ymfm::ym3812>(3579545, FM_OPL2BOARD, FREQ_49716);
+            break;
+    }
+    fm->set_do_cycles(1);
+
+    return fm;
+}
+
+static void
+ymfm_opl2board_drv_close(void *priv)
+{
+    OPLBOARDChipBase *drv = (OPLBOARDChipBase *) priv;
+
+    opl2board_close();
+    if (drv != NULL)
+        delete drv;
+}
+
+static uint8_t
+ymfm_opl2board_drv_read(uint16_t port, void *priv)
+{
+    OPLBOARDChipBase *drv = (OPLBOARDChipBase *) priv;
+
+    if ((port == 0x380) || (port == 0x381))
+        port |= 4;
+
+    /* Point to register read port. */
+    if (drv->flags() & FLAG_CYCLES)
+        cycles -= ((int) (isa_timing * 8));
+
+    uint8_t ret = drv->read(port);
+    drv->update();
+
+    oplboard_log("OPLBoard read port %04x, status = %02x\n", port, ret);
+    return ret;
+}
+
+static void
+ymfm_opl2board_drv_write(uint16_t port, uint8_t val, void *priv)
+{
+    OPLBOARDChipBase *drv = (OPLBOARDChipBase *) priv;
+ 
+    oplboard_log("OPLBoard write port %04x value = %02x\n", port, val);
+    if ((port == 0x380) || (port == 0x381))
+        port |= 4;
+    // Allow initialization of adlib
+    if ((val == 0x04 || val == 0x02) || (lastval == 0x04 || lastval == 0x02))
+        drv->write(port, val);
+
+    lastval = val;   
+    opl2board_write(val);
+    drv->update();
+}
+
+static int32_t *
+ymfm_opl2board_drv_update(void *priv)
+{
+    if (port == NULL) {
+        opl2board_init();
+        opl2board_reset();
+    }
+    OPLBOARDChipBase *drv = (OPLBOARDChipBase *) priv;
+
+    return drv->update();
+}
+
+static void
+ymfm_opl2board_drv_reset_buffer(void *priv)
+{
+    OPLBOARDChipBase *drv = (OPLBOARDChipBase *) priv;
+
+    drv->reset_buffer();
+}
+
+static void
+ymfm_opl2board_drv_set_do_cycles(void *priv, int8_t do_cycles)
+{
+    OPLBOARDChipBase *drv = (OPLBOARDChipBase *) priv;
+
+    drv->set_do_cycles(do_cycles);
+}
+
+static void
+ymfm_opl2board_drv_generate(void *priv, int32_t *data, uint32_t num_samples)
+{
+    OPLBOARDChipBase *drv = (OPLBOARDChipBase *) priv;
+
+    // drv->generate_resampled(data, num_samples);
+    drv->generate(data, num_samples);
+}
+
+const device_t ym_opl2board_device = {
+    .name          = "YMOPL2Board (External Device)",
+    .internal_name = "ym_opl2board_device",
+    .flags         = 0,
+    .local         = FM_OPL2BOARD,
+    .init          = ymfm_opl2board_drv_init,
+    .close         = ymfm_opl2board_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const fm_drv_t ymfm_opl2board_drv {
+    .read          = &ymfm_opl2board_drv_read,
+    .write         = &ymfm_opl2board_drv_write,
+    .update        = &ymfm_opl2board_drv_update,
+    .reset_buffer  = &ymfm_opl2board_drv_reset_buffer,
+    .set_do_cycles = &ymfm_opl2board_drv_set_do_cycles,
+    .priv          = NULL,
+    .generate      = ymfm_opl2board_drv_generate
+};
+
+#ifdef __clang__
+#    if __has_warning("-Wc99-designator")
+#        pragma clang diagnostic pop
+#    endif
+#endif
+
+}
diff --git a/src/sound/snd_opl_ymfm.cpp b/src/sound/snd_opl_ymfm.cpp
index 0f996f6bc..fb00401d5 100644
--- a/src/sound/snd_opl_ymfm.cpp
+++ b/src/sound/snd_opl_ymfm.cpp
@@ -18,7 +18,16 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include "ymfm/ymfm_ssg.h"
+#include "ymfm/ymfm_misc.h"
 #include "ymfm/ymfm_opl.h"
+#include "ymfm/ymfm_opm.h"
+#include "ymfm/ymfm_opn.h"
+#include "ymfm/ymfm_opq.h"
+#if 0
+#include "ymfm/ymfm_opx.h"
+#endif
+#include "ymfm/ymfm_opz.h"
 
 extern "C" {
 #define HAVE_STDARG_H
@@ -38,23 +47,21 @@ extern "C" {
 #        pragma clang diagnostic ignored "-Wc99-designator"
 #    endif
 #endif
-
 }
 
 #define RSM_FRAC 10
 
-#define OPL_FREQ FREQ_48000
-
 enum {
     FLAG_CYCLES = (1 << 0)
 };
 
 class YMFMChipBase {
 public:
-    YMFMChipBase(UNUSED(uint32_t clock), fm_type type, UNUSED(uint32_t samplerate))
+    YMFMChipBase(UNUSED(uint32_t clock), fm_type type, uint32_t samplerate)
         : m_buf_pos(0)
         , m_flags(0)
         , m_type(type)
+        , m_samplerate(samplerate)
     {
         memset(m_buffer, 0, sizeof(m_buffer));
     }
@@ -73,16 +80,17 @@ public:
 
     virtual void     write(uint16_t addr, uint8_t data)                      = 0;
     virtual void     generate(int32_t *data, uint32_t num_samples)           = 0;
-    virtual void     generate_resampled(int32_t *data, uint32_t num_samples) = 0;
     virtual int32_t *update()                                                = 0;
     virtual uint8_t  read(uint16_t addr)                                     = 0;
     virtual void     set_clock(uint32_t clock)                               = 0;
 
 protected:
-    int32_t m_buffer[SOUNDBUFLEN * 2];
-    int     m_buf_pos;
-    int8_t  m_flags;
-    fm_type m_type;
+    int32_t  m_buffer[MUSICBUFLEN * 2];
+    int      m_buf_pos;
+    int      *m_buf_pos_global;
+    int8_t   m_flags;
+    fm_type  m_type;
+    uint32_t m_samplerate;
 };
 
 template <typename ChipType>
@@ -97,11 +105,12 @@ public:
     {
         memset(m_samples, 0, sizeof(m_samples));
         memset(m_oldsamples, 0, sizeof(m_oldsamples));
-        m_rateratio   = (samplerate << RSM_FRAC) / m_chip.sample_rate(m_clock);
-        m_clock_us    = 1000000.0 / (double) m_clock;
-        m_subtract[0] = 80.0;
-        m_subtract[1] = 320.0;
-        m_type        = type;
+        m_rateratio      = (samplerate << RSM_FRAC) / m_chip.sample_rate(m_clock);
+        m_clock_us       = 1000000.0 / (double) m_clock;
+        m_subtract[0]    = 80.0;
+        m_subtract[1]    = 320.0;
+        m_type           = type;
+        m_buf_pos_global = (samplerate == FREQ_49716) ? &music_pos_global : &wavetable_pos_global;
 
         if (m_type == FM_YMF278B) {
             if (rom_load_linear("roms/sound/yamaha/yrw801.rom", 0, 0x200000, 0, m_yrw801) == 0) {
@@ -168,8 +177,14 @@ public:
         }
     }
 
+#if 0
     virtual void generate_resampled(int32_t *data, uint32_t num_samples) override
     {
+        if ((m_samplerate == FREQ_49716) || (m_samplerate == FREQ_44100)) {
+            generate(data, num_samples);
+            return;
+        }
+
         for (uint32_t i = 0; i < num_samples; i++) {
             while (m_samplecnt >= m_rateratio) {
                 m_oldsamples[0] = m_samples[0];
@@ -203,15 +218,16 @@ public:
             m_samplecnt += 1 << RSM_FRAC;
         }
     }
+#endif
 
     virtual int32_t *update() override
     {
-        if (m_buf_pos >= sound_pos_global)
+        if (m_buf_pos >= *m_buf_pos_global)
             return m_buffer;
 
-        generate_resampled(&m_buffer[m_buf_pos * 2], sound_pos_global - m_buf_pos);
+        generate(&m_buffer[m_buf_pos * 2], *m_buf_pos_global - m_buf_pos);
 
-        for (; m_buf_pos < sound_pos_global; m_buf_pos++) {
+        for (; m_buf_pos < *m_buf_pos_global; m_buf_pos++) {
             m_buffer[m_buf_pos * 2] /= 2;
             m_buffer[(m_buf_pos * 2) + 1] /= 2;
         }
@@ -312,23 +328,125 @@ ymfm_drv_init(const device_t *info)
     YMFMChipBase *fm;
 
     switch (info->local) {
+        case FM_YM2149: /* OPL */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ym2149>(14318181, FM_YM2149, FREQ_49716);
+            break;
+
+        case FM_YM3526: /* OPL */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ym3526>(14318181, FM_YM3526, FREQ_49716);
+            break;
+
+        case FM_Y8950: /* MSX-Audio (OPL with ADPCM) */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::y8950>(14318181, FM_Y8950, FREQ_49716);
+            break;
+
         default:
-        case FM_YM3812:
-            fm = (YMFMChipBase *) new YMFMChip<ymfm::ym3812>(3579545, FM_YM3812, OPL_FREQ);
+        case FM_YM3812: /* OPL2 */
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ym3812>(3579545, FM_YM3812, FREQ_49716);
             break;
 
-        case FM_YMF262:
-            fm = (YMFMChipBase *) new YMFMChip<ymfm::ymf262>(14318181, FM_YMF262, OPL_FREQ);
+        case FM_YMF262: /* OPL3 */
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ymf262>(14318181, FM_YMF262, FREQ_49716);
             break;
 
-        case FM_YMF289B:
+        case FM_YMF289B: /* OPL3-L */
             /* According to the datasheet, we should be using 33868800, but YMFM appears
                to cheat and does it using the same values as the YMF262. */
-            fm = (YMFMChipBase *) new YMFMChip<ymfm::ymf289b>(14318181, FM_YMF289B, OPL_FREQ);
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ymf289b>(14318181, FM_YMF289B, FREQ_49716);
             break;
 
-        case FM_YMF278B:
-            fm = (YMFMChipBase *) new YMFMChip<ymfm::ymf278b>(33868800, FM_YMF278B, OPL_FREQ);
+        case FM_YMF278B: /* OPL4 */
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ymf278b>(33868800, FM_YMF278B, FREQ_44100);
+            break;
+
+        case FM_YM2413: /* OPLL */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ym2413>(14318181, FM_YM2413, FREQ_49716);
+            break;
+
+        case FM_YM2423: /* OPLL-X */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ym2423>(14318181, FM_YM2423, FREQ_49716);
+            break;
+
+        case FM_YMF281: /* OPLLP */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ymf281>(14318181, FM_YMF281, FREQ_49716);
+            break;
+
+        case FM_DS1001: /* Konami VRC7 MMC */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ds1001>(14318181, FM_DS1001, FREQ_49716);
+            break;
+
+        case FM_YM2151: /* OPM */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ym2151>(14318181, FM_YM2151, FREQ_49716);
+            break;
+
+        case FM_YM2203: /* OPN */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ym2203>(14318181, FM_YM2203, FREQ_49716);
+            break;
+
+        case FM_YM2608: /* OPNA */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ym2608>(14318181, FM_YM2608, FREQ_49716);
+            break;
+
+        case FM_YMF288: /* OPN3L */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ymf288>(14318181, FM_YMF288, FREQ_49716);
+            break;
+
+        case FM_YM2610: /* OPNB */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ym2610>(14318181, FM_YM2610, FREQ_49716);
+            break;
+
+        case FM_YM2610B: /* OPNB2 */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ym2610b>(14318181, FM_YM2610B, FREQ_49716);
+            break;
+
+        case FM_YM2612: /* OPN2 */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ym2612>(14318181, FM_YM2612, FREQ_49716);
+            break;
+
+        case FM_YM3438: /* OPN2C */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ym3438>(14318181, FM_YM3438, FREQ_49716);
+            break;
+
+        case FM_YMF276: /* OPN2L */
+            // TODO: Check function call, rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ymf276>(14318181, FM_YMF276, FREQ_49716);
+            break;
+
+        case FM_YM2164: /* OPP */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ym2164>(14318181, FM_YM2164, FREQ_49716);
+            break;
+
+        case FM_YM3806: /* OPQ */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ym3806>(14318181, FM_YM3806, FREQ_49716);
+            break;
+
+#if 0
+        case FM_YMF271: /* OPX */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ymf271>(14318181, FM_YMF271, FREQ_49716);
+            break;
+#endif
+
+        case FM_YM2414: /* OPZ */
+            // TODO: Check rates and frequency
+            fm = (YMFMChipBase *) new YMFMChip<ymfm::ym2414>(14318181, FM_YM2414, FREQ_49716);
             break;
     }
 
@@ -369,6 +487,7 @@ static void
 ymfm_drv_write(uint16_t port, uint8_t val, void *priv)
 {
     YMFMChipBase *drv = (YMFMChipBase *) priv;
+
     ymfm_log("YMFM write port %04x value = %02x\n", port, val);
     if ((port == 0x380) || (port == 0x381))
         port |= 4;
@@ -396,6 +515,7 @@ static void
 ymfm_drv_set_do_cycles(void *priv, int8_t do_cycles)
 {
     YMFMChipBase *drv = (YMFMChipBase *) priv;
+
     drv->set_do_cycles(do_cycles);
 }
 
@@ -403,9 +523,53 @@ static void
 ymfm_drv_generate(void *priv, int32_t *data, uint32_t num_samples)
 {
     YMFMChipBase *drv = (YMFMChipBase *) priv;
-    drv->generate_resampled(data, num_samples);
+
+    // drv->generate_resampled(data, num_samples);
+    drv->generate(data, num_samples);
 }
 
+const device_t ym2149_ymfm_device = {
+    .name          = "Yamaha 2149 SSG (YMFM)",
+    .internal_name = "ym2149_ymfm",
+    .flags         = 0,
+    .local         = FM_YM2149,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ym3526_ymfm_device = {
+    .name          = "Yamaha YM3526 OPL (YMFM)",
+    .internal_name = "ym3526_ymfm",
+    .flags         = 0,
+    .local         = FM_YM3526,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t y8950_ymfm_device = {
+    .name          = "Yamaha Y8950 (YMFM)",
+    .internal_name = "y8950_ymfm",
+    .flags         = 0,
+    .local         = FM_Y8950,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
 const device_t ym3812_ymfm_device = {
     .name          = "Yamaha YM3812 OPL2 (YMFM)",
     .internal_name = "ym3812_ymfm",
@@ -414,7 +578,7 @@ const device_t ym3812_ymfm_device = {
     .init          = ymfm_drv_init,
     .close         = ymfm_drv_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -428,7 +592,7 @@ const device_t ymf262_ymfm_device = {
     .init          = ymfm_drv_init,
     .close         = ymfm_drv_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -442,7 +606,7 @@ const device_t ymf289b_ymfm_device = {
     .init          = ymfm_drv_init,
     .close         = ymfm_drv_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -456,20 +620,261 @@ const device_t ymf278b_ymfm_device = {
     .init          = ymfm_drv_init,
     .close         = ymfm_drv_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
 };
 
+const device_t ym2413_ymfm_device = {
+    .name          = "Yamaha YM2413 OPLL (YMFM)",
+    .internal_name = "ym2413_ymfm",
+    .flags         = 0,
+    .local         = FM_YM2413,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ym2423_ymfm_device = {
+    .name          = "Yamaha YM2423 OPLL-X (YMFM)",
+    .internal_name = "ym2423_ymfm",
+    .flags         = 0,
+    .local         = FM_YM2423,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ymf281_ymfm_device = {
+    .name          = "Yamaha YMF281 OPLLP (YMFM)",
+    .internal_name = "ymf281_ymfm",
+    .flags         = 0,
+    .local         = FM_YMF281,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ds1001_ymfm_device = {
+    .name          = "Konami VRC7 MMC (YMFM)",
+    .internal_name = "ds1001_ymfm",
+    .flags         = 0,
+    .local         = FM_DS1001,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ym2151_ymfm_device = {
+    .name          = "Yamaha YM2151 OPM (YMFM)",
+    .internal_name = "ym2151_ymfm",
+    .flags         = 0,
+    .local         = FM_YM2151,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ym2203_ymfm_device = {
+    .name          = "Yamaha YM2203 OPN (YMFM)",
+    .internal_name = "ym2203_ymfm",
+    .flags         = 0,
+    .local         = FM_YM2203,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ym2608_ymfm_device = {
+    .name          = "Yamaha YM2608 OPNA (YMFM)",
+    .internal_name = "ym2608_ymfm",
+    .flags         = 0,
+    .local         = FM_YM2608,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ymf288_ymfm_device = {
+    .name          = "Yamaha YMF288 OPN3L (YMFM)",
+    .internal_name = "ymf288_ymfm",
+    .flags         = 0,
+    .local         = FM_YMF288,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ym2610_ymfm_device = {
+    .name          = "Yamaha YM2610 OPNB (YMFM)",
+    .internal_name = "ym2610_ymfm",
+    .flags         = 0,
+    .local         = FM_YM2610,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ym2610b_ymfm_device = {
+    .name          = "Yamaha YM2610b OPNB2 (YMFM)",
+    .internal_name = "ym2610b_ymfm",
+    .flags         = 0,
+    .local         = FM_YM2610B,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ym2612_ymfm_device = {
+    .name          = "Yamaha YM2612 OPN2 (YMFM)",
+    .internal_name = "ym2612_ymfm",
+    .flags         = 0,
+    .local         = FM_YM2612,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ym3438_ymfm_device = {
+    .name          = "Yamaha YM3438 OPN2C (YMFM)",
+    .internal_name = "ym3438_ymfm",
+    .flags         = 0,
+    .local         = FM_YM3438,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ymf276_ymfm_device = {
+    .name          = "Yamaha YMF276 OPN2L (YMFM)",
+    .internal_name = "ymf276_ymfm",
+    .flags         = 0,
+    .local         = FM_YMF276,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ym2164_ymfm_device = {
+    .name          = "Yamaha YM2164 OPP (YMFM)",
+    .internal_name = "ym2164_ymfm",
+    .flags         = 0,
+    .local         = FM_YM2164,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ym3806_ymfm_device = {
+    .name          = "Yamaha YM3806 OPQ (YMFM)",
+    .internal_name = "ym3806_ymfm",
+    .flags         = 0,
+    .local         = FM_YM3806,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+#if 0
+const device_t ymf271_ymfm_device = {
+    .name          = "Yamaha YMF271 OPX (YMFM)",
+    .internal_name = "ym271_ymfm",
+    .flags         = 0,
+    .local         = FM_YMF271,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+#endif
+
+const device_t ym2414_ymfm_device = {
+    .name          = "Yamaha YM2414 OPZ (YMFM)",
+    .internal_name = "ym2414_ymfm",
+    .flags         = 0,
+    .local         = FM_YM2414,
+    .init          = ymfm_drv_init,
+    .close         = ymfm_drv_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+
 const fm_drv_t ymfm_drv {
-    &ymfm_drv_read,
-    &ymfm_drv_write,
-    &ymfm_drv_update,
-    &ymfm_drv_reset_buffer,
-    &ymfm_drv_set_do_cycles,
-    NULL,
-    ymfm_drv_generate,
+    .read          = &ymfm_drv_read,
+    .write         = &ymfm_drv_write,
+    .update        = &ymfm_drv_update,
+    .reset_buffer  = &ymfm_drv_reset_buffer,
+    .set_do_cycles = &ymfm_drv_set_do_cycles,
+    .priv          = NULL,
+    .generate      = ymfm_drv_generate,
 };
 
 #ifdef __clang__
diff --git a/src/sound/snd_optimc.c b/src/sound/snd_optimc.c
index d7afca382..d0b05741a 100644
--- a/src/sound/snd_optimc.c
+++ b/src/sound/snd_optimc.c
@@ -391,7 +391,10 @@ optimc_init(const device_t *info)
     optimc->sb              = calloc(1, sizeof(sb_t));
     optimc->sb->opl_enabled = 1;
 
-    sb_dsp_init(&optimc->sb->dsp, SBPRO2, SB_SUBTYPE_DEFAULT, optimc);
+    optimc->fm_type = (info->local & OPTIMC_OPL4) ? FM_YMF278B : FM_YMF262;
+
+    sb_dsp_set_real_opl(&optimc->sb->dsp, optimc->fm_type != FM_YMF278B);
+    sb_dsp_init(&optimc->sb->dsp, SBPRO2_DSP_302, SB_SUBTYPE_DEFAULT, optimc);
     sb_dsp_setaddr(&optimc->sb->dsp, optimc->cur_addr);
     sb_dsp_setirq(&optimc->sb->dsp, optimc->cur_irq);
     sb_dsp_setdma8(&optimc->sb->dsp, optimc->cur_dma);
@@ -400,7 +403,6 @@ optimc_init(const device_t *info)
     optimc->sb->opl_mixer = optimc;
     optimc->sb->opl_mix   = optimc_filter_opl;
 
-    optimc->fm_type = (info->local & OPTIMC_OPL4) ? FM_YMF278B : FM_YMF262;
     fm_driver_get(optimc->fm_type, &optimc->sb->opl);
     io_sethandler(optimc->cur_addr + 0, 0x0004, optimc->sb->opl.read, NULL, NULL, optimc->sb->opl.write, NULL, NULL, optimc->sb->opl.priv);
     io_sethandler(optimc->cur_addr + 8, 0x0002, optimc->sb->opl.read, NULL, NULL, optimc->sb->opl.write, NULL, NULL, optimc->sb->opl.priv);
@@ -411,10 +413,13 @@ optimc_init(const device_t *info)
     io_sethandler(optimc->cur_addr + 4, 0x0002, sb_ct1345_mixer_read, NULL, NULL, sb_ct1345_mixer_write, NULL, NULL, optimc->sb);
 
     sound_add_handler(optimc_get_buffer, optimc);
+    if (optimc->fm_type == FM_YMF278B)
+        wavetable_add_handler(sb_get_music_buffer_sbpro, optimc->sb);
+    else
+        music_add_handler(sb_get_music_buffer_sbpro, optimc->sb);
     sound_set_cd_audio_filter(sbpro_filter_cd_audio, optimc->sb); /* CD audio filter for the default context */
 
-    optimc->mpu = (mpu_t *) malloc(sizeof(mpu_t));
-    memset(optimc->mpu, 0, sizeof(mpu_t));
+    optimc->mpu = (mpu_t *) calloc(1, sizeof(mpu_t));
     mpu401_init(optimc->mpu, optimc->cur_mpu401_addr, optimc->cur_mpu401_irq, M_UART, device_get_config_int("receive_input401"));
 
     if (device_get_config_int("receive_input"))
@@ -451,18 +456,26 @@ mirosound_pcm10_available(void)
 static const device_config_t optimc_config[] = {
   // clang-format off
     {
-        .name = "receive_input",
-        .description = "Receive input (SB MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input401",
-        .description = "Receive input (MPU-401)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "receive_input401",
+        .description    = "Receive MIDI input (MPU-401)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -471,12 +484,12 @@ static const device_config_t optimc_config[] = {
 const device_t acermagic_s20_device = {
     .name          = "AcerMagic S20",
     .internal_name = "acermagic_s20",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0xE3 | OPTIMC_CS4231,
     .init          = optimc_init,
     .close         = optimc_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = optimc_speed_changed,
     .force_redraw  = NULL,
     .config        = optimc_config
@@ -485,12 +498,12 @@ const device_t acermagic_s20_device = {
 const device_t mirosound_pcm10_device = {
     .name          = "miroSOUND PCM10",
     .internal_name = "mirosound_pcm10",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0xE3 | OPTIMC_OPL4,
     .init          = optimc_init,
     .close         = optimc_close,
     .reset         = NULL,
-    { .available = mirosound_pcm10_available },
+    .available     = mirosound_pcm10_available,
     .speed_changed = optimc_speed_changed,
     .force_redraw  = NULL,
     .config        = optimc_config
diff --git a/src/sound/snd_pas16.c b/src/sound/snd_pas16.c
index 674acfcbb..9b82d580d 100644
--- a/src/sound/snd_pas16.c
+++ b/src/sound/snd_pas16.c
@@ -1,9 +1,98 @@
+/*
+ * 86Box     A hypervisor and IBM PC system emulator that specializes in
+ *           running old operating systems and software designed for IBM
+ *           PC systems and compatibles from 1981 through fairly recent
+ *           system designs based on the PCI bus.
+ *
+ *           This file is part of the 86Box distribution.
+ *
+ *           Pro Audio Spectrum Plus and 16 emulation.
+ *
+ *           Original PAS uses:
+ *               - 2 x OPL2;
+ *               - PIT - sample rate/count;
+ *               - LMC835N/LMC1982 - mixer;
+ *               - YM3802 - MIDI Control System.
+ *
+ *           9A01 - I/O base:
+ *               - base >> 2.
+ *
+ *           All below + I/O base.
+ *
+ *           B89 - Interrupt status / clear:
+ *               - Bit 2 - sample rate;
+ *               - Bit 3 - PCM;
+ *               - Bit 4 - MIDI.
+ *
+ *           B88 - Audio mixer control register.
+ *
+ *           B8A - Audio filter control:
+ *               - Bit 5 - mute?.
+ *
+ *           B8B - Interrupt mask / board ID:
+ *               - Bits 5-7 - board ID (read only on PAS16).
+ *
+ *           F88 - PCM data (low).
+ *
+ *           F89 - PCM data (high).
+ *
+ *           F8A - PCM control?:
+ *               - Bit 4 - input/output select (1 = output);
+ *               - Bit 5 - mono/stereo select;
+ *               - Bit 6 - PCM enable.
+ *
+ *           1388-138B - PIT clocked at 1193180 Hz:
+ *               - 1388 - Sample rate;
+ *               - 1389 - Sample count.
+ *
+ *           178B - ????.
+ *           2789 - Board revision.
+ *
+ *           8389:
+ *               - Bit 2 - 8/16 bit.
+ *
+ *           BF88 - Wait states.
+ *
+ *           EF8B:
+ *               - Bit 3 - 16 bits okay ?.
+ *
+ *           F388:
+ *               - Bit 6 - joystick enable.
+ *
+ *           F389:
+ *               - Bits 0-2 - DMA.
+ *
+ *           F38A:
+ *               - Bits 0-3 - IRQ.
+ *
+ *           F788:
+ *               - Bit 1 - SB emulation;
+ *               - Bit 0 - MPU401 emulation.
+ *
+ *           F789 - SB base address:
+ *               - Bits 0-3 - Address bits 4-7.
+ *
+ *           FB8A - SB IRQ/DMA:
+ *               - Bits 3-5 - IRQ;
+ *               - Bits 6-7 - DMA.
+ *
+ *           FF88 - board model:
+ *               - 3 = PAS16.
+ *
+ * Authors:  Sarah Walker, <https://pcem-emulator.co.uk/>
+ *           Miran Grca, <mgrca8@gmail.com>
+ *           TheCollector1995, <mariogplayer@gmail.com>
+ *
+ *           Copyright 2008-2024 Sarah Walker.
+ *           Copyright 2024 Miran Grca.
+ */
+#define _USE_MATH_DEFINES
+#include <math.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wchar.h>
 #define HAVE_STDARG_H
 
 #include "cpu.h"
@@ -11,170 +100,178 @@
 #include <86box/device.h>
 #include <86box/dma.h>
 #include <86box/filters.h>
+#include <86box/plat_unused.h>
 #include <86box/io.h>
+#include <86box/mem.h>
+#include <86box/midi.h>
 #include <86box/pic.h>
 #include <86box/timer.h>
 #include <86box/pit.h>
+#include <86box/pit_fast.h>
+#include <86box/rom.h>
+#include <86box/scsi_device.h>
+#include <86box/scsi_ncr5380.h>
+#include <86box/scsi_t128.h>
 #include <86box/snd_mpu401.h>
 #include <86box/sound.h>
 #include <86box/snd_opl.h>
 #include <86box/snd_sb.h>
 #include <86box/snd_sb_dsp.h>
-#include <86box/plat_unused.h>
 
-/*      Original PAS uses
-                2 x OPL2
-                PIT - sample rate/count
-                LMC835N/LMC1982 - mixer
-                YM3802 - MIDI Control System
+typedef struct nsc_mixer_t {
+    double master_l;
+    double master_r;
 
+    int bass;
+    int treble;
 
-        9A01 - IO base
-                base >> 2
+    double fm_l;
+    double fm_r;
+    double imixer_l;
+    double imixer_r;
+    double line_l;
+    double line_r;
+    double cd_l;
+    double cd_r;
+    double mic_l;
+    double mic_r;
+    double pcm_l;
+    double pcm_r;
+    double speaker_l;
+    double speaker_r;
 
-        All below + IO base
+    uint8_t lmc1982_regs[8];
+    uint8_t lmc835_regs[32];
 
-        B89 - interrupt status / clear
-                bit 2 - sample rate
-                bit 3 - PCM
-                bit 4 - MIDI
+    uint8_t  im_state;
+    uint16_t im_data[4];
+} nsc_mixer_t;
 
-        B88 - Audio mixer control register
+typedef struct mv508_mixer_t {
+    double master_l;
+    double master_r;
 
-        B8A - Audio filter control
-                bit 5 - mute?
+    int bass;
+    int treble;
 
-        B8B - interrupt mask / board ID
-                bits 5-7 - board ID (read only on PAS16)
+    double fm_l;
+    double fm_r;
+    double imixer_l;
+    double imixer_r;
+    double line_l;
+    double line_r;
+    double cd_l;
+    double cd_r;
+    double mic_l;
+    double mic_r;
+    double pcm_l;
+    double pcm_r;
+    double speaker_l;
+    double speaker_r;
+    double sb_l;
+    double sb_r;
 
-        F88 - PCM data (low)
-
-        F89 - PCM data (high)
-
-        F8A - PCM control?
-                bit 4 - input/output select (1 = output)
-                bit 5 - mono/stereo select
-                bit 6 - PCM enable
-
-        1388-138b - PIT clocked at 1193180 Hz
-                1388 - sample rate
-                1389 - sample count
-
-        178b -
-        2789 - board revision
-
-        8389 -
-                bit 2 - 8/16 bit
-
-        BF88 - wait states
-
-        EF8B -
-                bit 3 - 16 bits okay ?
-
-        F388 -
-                bit 6 - joystick enable
-
-        F389 -
-                bits 0-2 - DMA
-
-        F38A -
-                bits 0-3 - IRQ
-
-        F788 -
-                bit 1 - SB emulation
-                bit 0 - MPU401 emulation
-
-        F789 - SB base addr
-                bits 0-3 - addr bits 4-7
-
-        FB8A - SB IRQ/DMA
-                bits 3-5 - IRQ
-                bits 6-7 - DMA
-
-        FF88 - board model
-                3 = PAS16
-*/
+    uint8_t index;
+    uint8_t regs[3][128];
+} mv508_mixer_t;
 
 typedef struct pas16_t {
-    uint16_t base;
+    uint8_t  this_id;
+    uint8_t  board_id;
+    uint8_t  master_ff;
+    uint8_t  has_scsi;
+    uint8_t  dma;
+    uint8_t  sb_irqdma;
+    uint8_t  type;
+    uint8_t  filter;
 
-    int irq;
-    int dma;
-
-    uint8_t audiofilt;
-
-    uint8_t audio_mixer;
-
-    uint8_t compat;
-    uint8_t compat_base;
-
-    uint8_t enhancedscsi;
-
-    uint8_t io_conf_1;
-    uint8_t io_conf_2;
-    uint8_t io_conf_3;
-    uint8_t io_conf_4;
-
-    uint8_t irq_stat;
-    uint8_t irq_ena;
+    uint8_t  audiofilt;
+    uint8_t  audio_mixer;
+    uint8_t  compat;
+    uint8_t  compat_base;
+    uint8_t  io_conf_1;
+    uint8_t  io_conf_2;
+    uint8_t  io_conf_3;
+    uint8_t  io_conf_4;
 
+    uint8_t  irq_stat;
+    uint8_t  irq_ena;
     uint8_t  pcm_ctrl;
-    uint16_t pcm_dat;
+    uint8_t  prescale_div;
+    uint8_t  stereo_lr;
+    uint8_t  dma8_ff;
+    uint8_t  waitstates;
+    uint8_t  enhancedscsi;
 
+    uint8_t  sys_conf_1;
+    uint8_t  sys_conf_2;
+    uint8_t  sys_conf_3;
+    uint8_t  sys_conf_4;
+    uint8_t  midi_ctrl;
+    uint8_t  midi_stat;
+    uint8_t  midi_data;
+    uint8_t  fifo_stat;
+
+    uint8_t  timeout_count;
+    uint8_t  timeout_status;
+    uint8_t  pad_array[6];
+
+    uint8_t  midi_queue[256];
+
+    uint16_t base;
+    uint16_t new_base;
+    uint16_t sb_compat_base;
+    uint16_t mpu401_base;
+    uint16_t dma8_dat;
+    uint16_t ticks;
     uint16_t pcm_dat_l;
     uint16_t pcm_dat_r;
 
-    uint8_t sb_irqdma;
+    int32_t  pcm_buffer[2][SOUNDBUFLEN * 2];
 
-    int stereo_lr;
+    int      pos;
+    int      midi_r;
+    int      midi_w;
+    int      midi_uart_out;
+    int      midi_uart_in;
+    int      sysex;
 
-    uint8_t sys_conf_1;
-    uint8_t sys_conf_2;
-    uint8_t sys_conf_3;
-    uint8_t sys_conf_4;
+    int      irq;
+    int      scsi_irq;
 
-    struct {
-        uint32_t   l[3];
-        int64_t    c[3];
-        pc_timer_t timer[3];
-        uint8_t    m[3];
-        uint8_t    ctrl;
-        uint8_t    ctrls[2];
-        int        wp;
-        int        rm[3];
-        int        wm[3];
-        uint16_t   rl[3];
-        int        thit[3];
-        int        delay[3];
-        int        rereadlatch[3];
-        int64_t    enable[3];
-    } pit;
+    nsc_mixer_t   nsc_mixer;
+    mv508_mixer_t mv508_mixer;
 
     fm_drv_t opl;
     sb_dsp_t dsp;
 
-    int16_t pcm_buffer[2][SOUNDBUFLEN];
+    mpu_t *  mpu;
 
-    int pos;
+    pitf_t * pit;
+
+    t128_t * scsi;
+
+    pc_timer_t scsi_timer;
 } pas16_t;
 
-static uint8_t pas16_pit_in(uint16_t port, void *priv);
-static void    pas16_pit_out(uint16_t port, uint8_t val, void *priv);
+static uint8_t pas16_next = 0;
+
 static void    pas16_update(pas16_t *pas16);
 
 static int pas16_dmas[8]    = { 4, 1, 2, 3, 0, 5, 6, 7 };
-static int pas16_irqs[16]   = { 0, 2, 3, 4, 5, 6, 7, 10, 11, 12, 14, 15, 0, 0, 0, 0 };
 static int pas16_sb_irqs[8] = { 0, 2, 3, 5, 7, 10, 11, 12 };
 static int pas16_sb_dmas[8] = { 0, 1, 2, 3 };
 
 enum {
     PAS16_INT_SAMP = 0x04,
-    PAS16_INT_PCM  = 0x08
+    PAS16_INT_PCM  = 0x08,
+    PAS16_INT_MIDI = 0x10
 };
 
 enum {
     PAS16_PCM_MONO = 0x20,
-    PAS16_PCM_ENA  = 0x40
+    PAS16_PCM_ENA  = 0x40,
+    PAS16_PCM_DMA_ENA = 0x80
 };
 
 enum {
@@ -186,6 +283,387 @@ enum {
     PAS16_FILT_MUTE = 0x20
 };
 
+enum {
+    STATE_SM_IDLE = 0x00,
+    STATE_LMC1982_ADDR   = 0x10,
+    STATE_LMC1982_ADDR_0 = 0x10,
+    STATE_LMC1982_ADDR_1,
+    STATE_LMC1982_ADDR_2,
+    STATE_LMC1982_ADDR_3,
+    STATE_LMC1982_ADDR_4,
+    STATE_LMC1982_ADDR_5,
+    STATE_LMC1982_ADDR_6,
+    STATE_LMC1982_ADDR_7,
+    STATE_LMC1982_ADDR_OVER,
+    STATE_LMC1982_DATA   = 0x10,
+    STATE_LMC1982_DATA_0 = 0x20,
+    STATE_LMC1982_DATA_1,
+    STATE_LMC1982_DATA_2,
+    STATE_LMC1982_DATA_3,
+    STATE_LMC1982_DATA_4,
+    STATE_LMC1982_DATA_5,
+    STATE_LMC1982_DATA_6,
+    STATE_LMC1982_DATA_7,
+    STATE_LMC1982_DATA_8,
+    STATE_LMC1982_DATA_9,
+    STATE_LMC1982_DATA_A,
+    STATE_LMC1982_DATA_B,
+    STATE_LMC1982_DATA_C,
+    STATE_LMC1982_DATA_D,
+    STATE_LMC1982_DATA_E,
+    STATE_LMC1982_DATA_F,
+    STATE_LMC1982_DATA_OVER,
+    STATE_LMC835_DATA   = 0x40,
+    STATE_LMC835_DATA_0 = 0x40,
+    STATE_LMC835_DATA_1,
+    STATE_LMC835_DATA_2,
+    STATE_LMC835_DATA_3,
+    STATE_LMC835_DATA_4,
+    STATE_LMC835_DATA_5,
+    STATE_LMC835_DATA_6,
+    STATE_LMC835_DATA_7,
+    STATE_LMC835_DATA_OVER,
+};
+
+#define    STATE_DATA_MASK           0x07
+#define    STATE_DATA_MASK_W         0x0f
+
+#define    LMC1982_ADDR              0x00
+#define    LMC1982_DATA              0x01
+#define    LMC835_ADDR               0x02
+#define    LMC835_DATA               0x03
+
+#define    LMC835_FLAG_ADDR          0x80
+
+#define    SERIAL_MIXER_IDENT        0x10
+#define    SERIAL_MIXER_STROBE       0x04
+#define    SERIAL_MIXER_CLOCK        0x02
+#define    SERIAL_MIXER_DATA         0x01
+#define    SERIAL_MIXER_RESET_PCM    0x01
+
+#define PAS16_PCM_AND_DMA_ENA (PAS16_PCM_ENA | PAS16_PCM_DMA_ENA)
+
+/*
+   LMC1982CIN registers (data bits 7 and 6 are always don't care):
+   - 40              = Mode (0x01 = INPUT2);
+   - 41              = 0 = Loudness (1 = on, 0 = off), 1 = Stereo Enhance (1 = on, 0 = off)
+                       (0x00);
+   - 42              = Bass, 00-0c (0x06);
+   - 43              = Treble, 00-0c (0x06);
+   - 45 [L] / 44 [R] = Master, 28-00, counting down (0x28, later 0xa8);
+   - 46              = ???? (0x05 = Stereo).
+ */
+#define LMC1982_REG_MASK      0xf8    /* LMC1982CIN: Register Mask */
+#define LMC1982_REG_VALID     0x40    /* LMC1982CIN: Register Valid Value */
+
+#define LMC1982_REG_ISELECT   0x00    /* LMC1982CIN: Input Select + Mute */
+#define LMC1982_REG_LES       0x01    /* LMC1982CIN: Loudness, Enhanced Stereo */
+#define LMC1982_REG_BASS      0x02    /* LMC1982CIN: Bass */
+#define LMC1982_REG_TREBLE    0x03    /* LMC1982CIN: Treble */
+/* The Windows 95 driver indicates left and right are swapped in the wiring. */
+#define LMC1982_REG_VOL_L     0x04    /* LMC1982CIN: Left Volume */
+#define LMC1982_REG_VOL_R     0x05    /* LMC1982CIN: Right Volume */
+#define LMC1982_REG_MODE      0x06    /* LMC1982CIN: Mode */
+#define LMC1982_REG_DINPUT    0x07    /* LMC1982CIN: Digital Input 1 and 2 */
+
+/* Bits 7-2: Don't care. */
+#define LMC1982_ISELECT_MASK  0x03    /* LMC1982CIN: Input Select: Mask */
+#define LMC1982_ISELECT_I1    0x00    /* LMC1982CIN: Input Select: INPUT1 */
+#define LMC1982_ISELECT_I2    0x01    /* LMC1982CIN: Input Select: INPUT2 */
+#define LMC1982_ISELECT_NA    0x02    /* LMC1982CIN: Input Select: N/A */
+#define LMC1982_ISELECT_MUTE  0x03    /* LMC1982CIN: Input Select: MUTE */
+
+/* Bits 7-2: Don't care. */
+#define LMC1982_LES_MASK      0x03    /* LMC1982CIN: Loudness, Enhanced Stereo: Mask */
+#define LMC1982_LES_BOTH_OFF  0x00    /* LMC1982CIN: Loudness OFF, Enhanced Stereo OFF */
+#define LMC1982_L_ON_ES_OFF   0x01    /* LMC1982CIN: Loudness ON, Enhanced Stereo OFF */
+#define LMC1982_L_OFF_ES_ON   0x02    /* LMC1982CIN: Loudness OFF, Enhanced Stereo ON */
+#define LMC1982_LES_BOTH_ON   0x03    /* LMC1982CIN: Loudness OFF, Enhanced Stereo ON */
+
+/* Bits 7-3: Don't care. */
+#define LMC1982_MODE_MASK     0x07    /* LMC1982CIN: Mode: Mask */
+#define LMC1982_MODE_MONO_L   0x04    /* LMC1982CIN: Mode: Left Mono */
+#define LMC1982_MODE_STEREO   0x05    /* LMC1982CIN: Mode: Stereo */
+#define LMC1982_MODE_MONO_R   0x06    /* LMC1982CIN: Mode: Right Mono */
+#define LMC1982_MODE_MONO_R_2 0x07    /* LMC1982CIN: Mode: Right Mono (Alternate value) */
+
+/* Bits 7-2: Don't care. */
+#define LMC1982_DINPUT_MASK   0x03    /* LMC1982CIN: Digital Input 1 and 2: Mask */
+#define LMC1982_DINPUT_DI1    0x01    /* LMC1982CIN: Digital Input 1 */
+#define LMC1982_DINPUT_DI2    0x02    /* LMC1982CIN: Digital Input 2 */
+
+/*
+   LMC835N registers:
+   - 01 [L] / 08 [R] = FM, 00-2f, bit 6 = clear, but the DOS driver sets
+                       the bit, indicating a volume boost (0x69);
+   - 02 [L] / 09 [R] = Rec. monitor, 00-2f, bit 6 = clear (0x29);
+   - 03 [L] / 0A [R] = Line in, 00-2f, bit 6 = clear, except for the DOS
+                       driver (0x69);
+   - 04 [L] / 0B [R] = CD, 00-2f, bit 6 = clear, except for the DOS driver
+                       (0x69);
+   - 05 [L] / 0C [R] = Microphone, 00-2f, bit 6 = clear, except for the DOS
+                       driver (0x44);
+   - 06 [L] / 0D [R] = Wave out, 00-2f, bit 6 = set, except for DOS driver,
+                       which clears the bit (0x29);
+   - 07 [L] / 0E [R] = PC speaker, 00-2f, bit 6 = clear, except for the DOS
+                       drive (0x06).
+   The registers for which the DOS driver sets the boost, also have bit 6
+   set in the address, despite the fact it should be a don't care - why?
+   Apparently, no Sound Blaster control.
+*/
+#define LMC835_REG_MODE       0x00    /* LMC835N: Mode, not an actual register, but our internal register
+                                                  to store the mode for Channels A (1-7) and B (8-e). */
+
+#define LMC835_REG_FM_L       0x01    /* LMC835N: FM Left */
+#define LMC835_REG_IMIXER_L   0x02    /* LMC835N: Record Monitor Left */
+#define LMC835_REG_LINE_L     0x03    /* LMC835N: Line in Left */
+#define LMC835_REG_CDROM_L    0x04    /* LMC835N: CD Left */
+#define LMC835_REG_MIC_L      0x05    /* LMC835N: Microphone Left */
+#define LMC835_REG_PCM_L      0x06    /* LMC835N: Wave out Left */
+#define LMC835_REG_SPEAKER_L  0x07    /* LMC83N5: PC speaker Left */
+
+#define LMC835_REG_FM_R       0x08    /* LMC835N: FM Right */
+#define LMC835_REG_IMIXER_R   0x09    /* LMC835N: Record Monitor Right */
+#define LMC835_REG_LINE_R     0x0a    /* LMC835N: Line in Right */
+#define LMC835_REG_CDROM_R    0x0b    /* LMC835N: CD Right */
+#define LMC835_REG_MIC_R      0x0c    /* LMC835N: Microphone Right */
+#define LMC835_REG_PCM_R      0x0d    /* LMC835N: Wave out Right */
+#define LMC835_REG_SPEAKER_R  0x0e    /* LMC83N5: PC speaker Right */
+
+#define MV508_ADDRESS    0x80    /* Flag indicating it is the address */
+/*
+   I think this may actually operate as such:
+       - Bit 6: Mask left channel;
+       - Bit 5: Mask right channel.
+ */
+#define MV508_CHANNEL    0x60
+#define MV508_LEFT       0x20
+#define MV508_RIGHT      0x40
+#define MV508_BOTH       0x00
+#define MV508_MIXER      0x10    /* Flag indicating it is a mixer rather than a volume */
+
+#define MV508_INPUT_MIX  0x20    /* Flag indicating the selected mixer is input */
+
+#define MV508_MASTER_A   0x01    /* Volume: Output */
+#define MV508_MASTER_B   0x02    /* Volume: DSP input */
+#define MV508_BASS       0x03    /* Volume: Bass */
+#define MV508_TREBLE     0x04    /* Volume: Treble */
+#define MV508_MODE       0x05    /* Volume: Mode */
+
+#define MV508_LOUDNESS   0x04    /* Mode: Loudness */
+#define MV508_ENH_MASK   0x03    /* Mode: Stereo enhancement bit mask */
+#define MV508_ENH_NONE   0x00    /* Mode: No stereo enhancement */
+#define MV508_ENH_40     0x01    /* Mode: 40% stereo enhancement */
+#define MV508_ENH_60     0x02    /* Mode: 60% stereo enhancement */
+#define MV508_ENH_80     0x03    /* Mode: 80% stereo enhancement */
+
+#define MV508_FM         0x00    /* Mixer: FM */
+#define MV508_IMIXER     0x01    /* Mixer: Input mixer (recording monitor) */
+#define MV508_LINE       0x02    /* Mixer: Line in */
+#define MV508_CDROM      0x03    /* Mixer: CD-ROM */
+#define MV508_MIC        0x04    /* Mixer: Microphone */
+#define MV508_PCM        0x05    /* Mixer: PCM */
+#define MV508_SPEAKER    0x06    /* Mixer: PC Speaker */
+#define MV508_SB         0x07    /* Mixer: Sound Blaster DSP */
+
+#define MV508_REG_MASTER_A_L    (MV508_MASTER_A | MV508_LEFT)
+#define MV508_REG_MASTER_A_R    (MV508_MASTER_A | MV508_RIGHT)
+#define MV508_REG_MASTER_B_L    (MV508_MASTER_B | MV508_LEFT)
+#define MV508_REG_MASTER_B_R    (MV508_MASTER_B | MV508_RIGHT)
+#define MV508_REG_BASS          (MV508_BASS | MV508_LEFT)
+#define MV508_REG_TREBLE        (MV508_TREBLE | MV508_LEFT)
+
+#define MV508_REG_FM_L          (MV508_MIXER | MV508_FM | MV508_LEFT)
+#define MV508_REG_FM_R          (MV508_MIXER | MV508_FM | MV508_RIGHT)
+#define MV508_REG_IMIXER_L      (MV508_MIXER | MV508_IMIXER | MV508_LEFT)
+#define MV508_REG_IMIXER_R      (MV508_MIXER | MV508_IMIXER | MV508_RIGHT)
+#define MV508_REG_LINE_L        (MV508_MIXER | MV508_LINE | MV508_LEFT)
+#define MV508_REG_LINE_R        (MV508_MIXER | MV508_LINE | MV508_RIGHT)
+#define MV508_REG_CDROM_L       (MV508_MIXER | MV508_CDROM | MV508_LEFT)
+#define MV508_REG_CDROM_R       (MV508_MIXER | MV508_CDROM | MV508_RIGHT)
+#define MV508_REG_MIC_L         (MV508_MIXER | MV508_MIC | MV508_LEFT)
+#define MV508_REG_MIC_R         (MV508_MIXER | MV508_MIC | MV508_RIGHT)
+#define MV508_REG_PCM_L         (MV508_MIXER | MV508_PCM | MV508_LEFT)
+#define MV508_REG_PCM_R         (MV508_MIXER | MV508_PCM | MV508_RIGHT)
+#define MV508_REG_SPEAKER_L     (MV508_MIXER | MV508_SPEAKER | MV508_LEFT)
+#define MV508_REG_SPEAKER_R     (MV508_MIXER | MV508_SPEAKER | MV508_RIGHT)
+#define MV508_REG_SB_L          (MV508_MIXER | MV508_SB | MV508_LEFT)
+#define MV508_REG_SB_R          (MV508_MIXER | MV508_SB | MV508_RIGHT)
+
+double low_fir_pas16_coef[SB16_NCoef];
+
+/*
+   Also used for the MVA508.
+ */
+static double lmc1982_bass_treble_4bits[16];
+
+/*
+   Copied from the Sound Blaster code: -62 dB to 0 dB in 2 dB steps.
+   Note that these are voltage dB's, so it corresonds in power dB
+   (formula for conversion to percentage: 10 ^ (dB / 10)) to -31 dB
+   to 0 dB in 1 dB steps.
+
+   This is used for the MVA508 Volumes.
+ */
+static const double mva508_att_2dbstep_5bits[] = {
+       25.0,    32.0,    41.0,    51.0,    65.0,    82.0,   103.0,   130.0,
+      164.0,   206.0,   260.0,   327.0,   412.0,   519.0,   653.0,   822.0,
+     1036.0,  1304.0,  1641.0,  2067.0,  2602.0,  3276.0,  4125.0,  5192.0,
+     6537.0,  8230.0, 10362.0, 13044.0, 16422.0, 20674.0, 26027.0, 32767.0
+};
+
+/*
+   The same but in 1 dB steps, used for the MVA508 Master Volume.
+ */
+static const double mva508_att_1dbstep_6bits[] = {
+       18.0,    25.0,    29.0,    32.0,    36.0,    41.0,    46.0,    51.0,
+       58.0,    65.0,    73.0,    82.0,    92.0,   103.0,   116.0,   130.0,
+      146.0,   164.0,   184.0,   206.0,   231.0,   260.0,   292.0,   327.0,
+      367.0,   412.0,   462.0,   519.0,   582.0,   653.0,   733.0,   822.0,
+      923.0,  1036.0,  1162.0,  1304.0,  1463.0,  1641.0,  1842.0,  2067.0,
+     2319.0,  2602.0,  2920.0,  3276.0,  3676.0,  4125.0,  4628.0,  5192.0,
+     5826.0,  6537.0,  7335.0,  8230.0,  9234.0, 10362.0, 11626.0, 13044.0,
+    14636.0, 16422.0, 18426.0, 20674.0, 23197.0, 26027.0, 29204.0, 32767.0
+};
+
+/*
+   In 2 dB steps again, but to -80 dB and counting down (0 = Flat), used
+   for the LMC1982CIN Master Volume.
+ */
+static const double lmc1982_att_2dbstep_6bits[] = {
+    32767.0, 26027.0, 20674.0, 16422.0, 13044.0, 10362.0,  8230.0,  6537.0,
+     5192.0,  4125.0,  3276.0,  2602.0,  2067.0,  1641.0,  1304.0,  1036.0,
+      822.0,   653.0,   519.0,   412.0,   327.0,   260.0,   206.0,   164.0,
+      130.0,   103.0,    82.0,    65.0,    51.0,    41.0,    32.0,    25.0,
+       20.0,    16.0,    13.0,    10.0,     8.0,     6.0,     5.0,     4.0,
+        3.0,     3.0,     3.0,     3.0,     3.0,     3.0,     3.0,     3.0,
+        3.0,     3.0,     3.0,     3.0,     3.0,     3.0,     3.0,     3.0,
+        3.0,     3.0,     3.0,     3.0,     3.0,     3.0,     3.0,     3.0
+};
+
+/*
+    LMC385N attenuation, both +/- 12 dB and +/- 6 dB.
+
+    Since the DOS and Windows 95 driver diverge on boost vs. cut for
+    the various inputs, I think it is best to just do a 12 dB cut on
+    the input, and then apply cut or boost as needed. I have factored
+    in said cut in the below values.
+ */
+static const double lmc835_att_1dbstep_7bits[128] = {
+    /* Flat */
+    [0x40] =  8230.0,    /*       Flat  */
+    /* Boost */
+    [0x60] =  9234.0,    /*  1 dB Boost */
+    [0x50] = 10362.0,    /*  2 dB Boost */
+    [0x48] = 11626.0,    /*  3 dB Boost */
+    [0x44] = 13044.0,    /*  4 dB Boost */
+    [0x42] = 14636.0,    /*  5 dB Boost */
+    [0x52] = 16422.0,    /*  6 dB Boost */
+    [0x6a] = 18426.0,    /*  7 dB Boost */
+    [0x56] = 20674.0,    /*  8 dB Boost */
+    [0x41] = 23197.0,    /*  9 dB Boost */
+    [0x69] = 26027.0,    /* 10 dB Boost */
+    [0x6d] = 29204.0,    /* 11 dB Boost */
+    /* The Win95 drivers use D5-D0 = 1D instead of 2D, datasheet erratum? */
+    [0x5d] = 29204.0,    /* 11 dB Boost */
+    [0x6f] = 32767.0,    /* 12 dB Boost */
+    /* Flat */
+    /* The datasheet says this should be Flat (1.0) but the
+       Windows 95 drivers use this as basically mute (12 dB Cut). */
+    [0x00] =  2067.0,    /* 12 dB Cut   */
+    /* Cut - D5-D0 = 2F is minimum cut (0 dB) according to Windows 95 */
+    [0x20] =  2319.0,    /* 11 dB Cut   */
+    [0x10] =  2602.0,    /* 10 dB Cut   */
+    [0x08] =  2920.0,    /*  9 dB Cut   */
+    [0x04] =  3276.0,    /*  8 dB Cut   */
+    [0x02] =  3676.0,    /*  7 dB Cut   */
+    [0x12] =  4125.0,    /*  6 dB Cut   */
+    [0x2a] =  4628.0,    /*  5 dB Cut   */
+    [0x16] =  5192.0,    /*  4 dB Cut   */
+    [0x01] =  5826.0,    /*  3 dB Cut   */
+    [0x29] =  6537.0,    /*  2 dB Cut   */
+    [0x2d] =  7335.0,    /*  1 dB Cut   */
+    /* The Win95 drivers use D5-D0 = 1D instead of 2D, datasheet erratum? */
+    [0x1d] =  7335.0,    /*  1 dB Cut   */
+    [0x2f] =  8230.0,    /*       Flat  */
+                 0.0
+};
+
+static const double lmc835_att_05dbstep_7bits[128] = {
+    /* Flat */
+    [0x40] =  8230.0,    /*        Flat  */
+    /* Boost */
+    [0x60] =  8718.0,    /* 0.5 dB Boost */
+    [0x50] =  9234.0,    /* 1.0 dB Boost */
+    [0x48] =  9782.0,    /* 1.5 dB Boost */
+    [0x44] = 10362.0,    /* 2.0 dB Boost */
+    [0x42] = 10975.0,    /* 2.5 dB Boost */
+    [0x52] = 11626.0,    /* 3.0 dB Boost */
+    [0x6a] = 12315.0,    /* 3.5 dB Boost */
+    [0x56] = 13044.0,    /* 4.0 dB Boost */
+    [0x41] = 13817.0,    /* 4.5 dB Boost */
+    [0x69] = 14636.0,    /* 5.0 dB Boost */
+    [0x6d] = 15503.0,    /* 5.5 dB Boost */
+    /* The Win95 drivers use D5-D0 = 1D instead of 2D, datasheet erratum? */
+    [0x5d] = 15503.0,    /* 5.5 dB Boost */
+    [0x6f] = 16422.0,    /* 6.0 dB Boost */
+    /* Flat */
+    /* The datasheet says this should be Flat (1.0) but the
+       Windows 95 drivers use this as basically mute (12 dB Cut). */
+    [0x00] =  4125.0,    /* 6.0 dB Cut   */
+    /* Cut - D5-D0 = 2F is minimum cut (0 dB) according to Windows 95 */
+    [0x20] =  4369.0,    /* 5.5 dB Cut   */
+    [0x10] =  4628.0,    /* 5.0 dB Cut   */
+    [0x08] =  4920.0,    /* 4.5 dB Cut   */
+    [0x04] =  5192.0,    /* 4.0 dB Cut   */
+    [0x02] =  5500.0,    /* 3.5 dB Cut   */
+    [0x12] =  5826.0,    /* 3.0 dB Cut   */
+    [0x2a] =  6172.0,    /* 2.5 dB Cut   */
+    [0x16] =  6537.0,    /* 2.0 dB Cut   */
+    [0x01] =  6925.0,    /* 1.5 dB Cut   */
+    [0x29] =  7335.0,    /* 1.0 dB Cut   */
+    [0x2d] =  7770.0,    /* 0.5 dB Cut   */
+    /* The Win95 drivers use D5-D0 = 1D instead of 2D, datasheet erratum? */
+    [0x1d] =  7770.0,    /* 0.5 dB Cut   */
+    [0x2f] =  8230.0,    /*        Flat  */
+                 0.0
+};
+
+static __inline double
+sinc(const double x)
+{
+    return sin(M_PI * x) / (M_PI * x);
+}
+
+static void
+recalc_pas16_filter(const int playback_freq)
+{
+    /* Cutoff frequency = playback / 2 */
+    int          n;
+    const double fC = ((double) playback_freq) / (double) FREQ_96000;
+    double       gain = 0.0;
+
+    for (n = 0; n < SB16_NCoef; n++) {
+        /* Blackman window */
+        const double w = 0.42 - (0.5 * cos((2.0 * n * M_PI) / (double) (SB16_NCoef - 1))) +
+                         (0.08 * cos((4.0 * n * M_PI) / (double) (SB16_NCoef - 1)));
+        /* Sinc filter */
+        const double h = sinc(2.0 * fC * ((double) n - ((double) (SB16_NCoef - 1) / 2.0)));
+
+        /* Create windowed-sinc filter */
+        low_fir_pas16_coef[n] = w * h;
+    }
+
+    low_fir_pas16_coef[(SB16_NCoef - 1) / 2] = 1.0;
+
+    for (n = 0; n < SB16_NCoef; n++)
+        gain += low_fir_pas16_coef[n];
+
+    /* Normalise filter, to produce unity gain */
+    for (n = 0; n < SB16_NCoef; n++)
+        low_fir_pas16_coef[n] /= gain;
+}
+
 #ifdef ENABLE_PAS16_LOG
 int pas16_do_log = ENABLE_PAS16_LOG;
 
@@ -204,458 +682,1198 @@ pas16_log(const char *fmt, ...)
 #    define pas16_log(fmt, ...)
 #endif
 
+static uint8_t
+pas16_in(uint16_t port, void *priv);
+static void
+pas16_out(uint16_t port, uint8_t val, void *priv);
+
+static void
+pas16_update_irq(pas16_t *pas16)
+{
+    if (pas16->midi_uart_out && (pas16->midi_stat & 0x18)) {
+        pas16->irq_stat |= PAS16_INT_MIDI;
+        if ((pas16->irq != -1) && (pas16->irq_ena & PAS16_INT_MIDI))
+            picint(1 << pas16->irq);
+    }
+    if (pas16->midi_uart_in && (pas16->midi_stat & 0x04)) {
+        pas16->irq_stat |= PAS16_INT_MIDI;
+        if ((pas16->irq != -1) && (pas16->irq_ena & PAS16_INT_MIDI))
+            picint(1 << pas16->irq);
+    }
+}
+
 static uint8_t
 pas16_in(uint16_t port, void *priv)
 {
     pas16_t *pas16 = (pas16_t *) priv;
-    uint8_t  temp  = 0xff;
-    switch ((port - pas16->base) + 0x388) {
-        case 0x388:
-        case 0x389:
-        case 0x38a:
-        case 0x38b:
-            temp = pas16->opl.read((port - pas16->base) + 0x388, pas16->opl.priv);
+    scsi_bus_t *scsi_bus = NULL;
+    uint8_t  ret   = 0xff;
+
+    port -= pas16->base;
+
+    switch (port) {
+        case 0x0000 ... 0x0003:
+            ret = pas16->opl.read(port + 0x0388, pas16->opl.priv);
             break;
 
-        case 0xb88:
-            temp = pas16->audio_mixer;
+        case 0x0800:
+            ret = pas16->type ? pas16->audio_mixer : 0xff;
+            break;
+        case 0x0801:
+            ret = pas16->irq_stat & 0xdf;
+            break;
+        case 0x0802:
+            ret = pas16->audiofilt;
+            break;
+        case 0x0803:
+            ret = pas16->irq_ena | 0x20;
+            pas16_log("IRQ Mask read=%02x.\n", ret);
             break;
 
-        case 0xb89:
-            temp = pas16->irq_stat;
+        case 0x0c02:
+            ret = pas16->pcm_ctrl;
             break;
 
-        case 0xb8a:
-            temp = pas16->audiofilt;
+        case 0x1401:
+        case 0x1403:
+            ret = pas16->midi_ctrl;
+            break;
+        case 0x1402:
+        case 0x1802:
+            ret = 0;
+            if (pas16->midi_uart_in) {
+                if ((pas16->midi_data == 0xaa) && (pas16->midi_ctrl & 0x04))
+                    ret = pas16->midi_data;
+                else {
+                    ret = pas16->midi_queue[pas16->midi_r];
+                    if (pas16->midi_r != pas16->midi_w) {
+                        pas16->midi_r++;
+                        pas16->midi_r &= 0xff;
+                    }
+                }
+                pas16->midi_stat &= ~0x04;
+                pas16_update_irq(pas16);
+            }
             break;
 
-        case 0xb8b:
-            temp = (pas16->irq_ena & ~0xe0) | 0x20;
+        case 0x1800:
+            ret = pas16->midi_stat;
+            break;
+        case 0x1801:
+            ret = pas16->fifo_stat;
             break;
 
-        case 0xf8a:
-            temp = pas16->pcm_ctrl;
+        case 0x1c00 ... 0x1c03:    /* NCR5380 ports 0 to 3. */
+        case 0x3c00 ... 0x3c03:    /* NCR5380 ports 4 to 7. */
+            if (pas16->has_scsi)
+                ret = ncr5380_read((port & 0x0003) | ((port & 0x2000) >> 11), &pas16->scsi->ncr);
             break;
 
-        case 0x1388:
-        case 0x1389:
-        case 0x138a:
-        case 0x138b:
-            temp = pas16_pit_in(port, pas16);
+        case 0x2401:    /* Board revision */
+            ret = 0x00;
             break;
 
-        case 0x2789: /*Board revision*/
-            temp = 0;
+        case 0x4000:
+            ret = pas16->timeout_count;
+            break;
+        case 0x4001:
+            ret = pas16->timeout_status;
             break;
 
-        case 0x7f89:
-            temp = pas16->enhancedscsi & ~1;
+        case 0x5c00:
+            if (pas16->has_scsi)
+                ret = t128_read(0x1e00, pas16->scsi);
+            break;
+        case 0x5c01:
+            if (pas16->has_scsi) {
+                scsi_bus = &pas16->scsi->ncr.scsibus;
+                /* Bits 0-6 must absolutely be set for SCSI hard disk drivers to work. */
+                ret = (((scsi_bus->tx_mode != PIO_TX_BUS) && (pas16->scsi->status & 0x04)) << 7) | 0x7f;
+                if ((scsi_bus->tx_mode == PIO_TX_BUS) && !(ret & 0x80))
+                    ret |= 0x80;
+
+                if ((pas16->scsi->status & 0x06) == 0x00)
+                    ret = 0x00;
+
+                pas16_log("%04X:%08X: Port %04x read ret=%02x, status=%02x, txmode=%x, repeat=%d, total=%d.\n", CS, cpu_state.pc, port + pas16->base, ret, pas16->scsi->status & 0x06, scsi_bus->tx_mode, scsi_bus->data_repeat, MIN(511, scsi_bus->total_len));
+            }
+            break;
+        case 0x5c03:
+            if (pas16->has_scsi)
+                ret = pas16->scsi->ncr.irq_state << 7;
             break;
 
-        case 0x8388:
-            temp = pas16->sys_conf_1;
-            break;
-        case 0x8389:
-            temp = pas16->sys_conf_2;
-            break;
-        case 0x838b:
-            temp = pas16->sys_conf_3;
-            break;
-        case 0x838c:
-            temp = pas16->sys_conf_4;
+        case 0x7c01:
+            ret = pas16->enhancedscsi & ~0x01;
             break;
 
-        case 0xef8b:
-            temp = 0x0c;
+        case 0x8000:
+            ret = pas16->sys_conf_1;
+            break;
+        case 0x8001:
+            ret = pas16->sys_conf_2;
+            break;
+        case 0x8002:
+            ret = pas16->sys_conf_3;
+            break;
+        case 0x8003:
+            ret = pas16->sys_conf_4;
             break;
 
-        case 0xf388:
-            temp = pas16->io_conf_1;
+        case 0xbc00:
+            ret = pas16->waitstates;
             break;
-        case 0xf389:
-            temp = pas16->io_conf_2;
-            break;
-        case 0xf38b:
-            temp = pas16->io_conf_3;
-            break;
-        case 0xf38c:
-            temp = pas16->io_conf_4;
+        case 0xbc02:
+            ret = pas16->prescale_div;
             break;
 
-        case 0xf788:
-            temp = pas16->compat;
-            break;
-        case 0xf789:
-            temp = pas16->compat_base;
+        case 0xec03:
+            /*
+               Operation mode 1:
+               - 1,0 = CD-ROM (1,1 = SCSI, 1,0 = Sony, 0,0 = N/A);
+               -   2 = FM (1 = stereo, 0 = mono);
+               -   3 = Code (1 = 16-bit, 0 = 8-bit).
+             */
+            ret = pas16->type ? pas16->type : 0x07;
             break;
 
-        case 0xfb8a:
-            temp = pas16->sb_irqdma;
+        case 0xf000:
+            ret = pas16->io_conf_1;
+            break;
+        case 0xf001:
+            ret = pas16->io_conf_2;
+            pas16_log("pas16_in : set PAS DMA %i\n", pas16->dma);
+            break;
+        case 0xf002:
+            ret = pas16->io_conf_3;
+            pas16_log("pas16_in : set PAS IRQ %i\n", pas16->irq);
+            break;
+        case 0xf003:
+            ret = pas16->io_conf_4;
             break;
 
-        case 0xff88:  /*Board model*/
-            temp = 4; /*PAS16*/
+        case 0xf400:
+            ret = (pas16->compat & 0xf3);
+
+            if (pas16->dsp.sb_irqm8 || pas16->dsp.sb_irqm16 || pas16->dsp.sb_irqm401)
+                ret |= 0x04;
+
+            if (pas16->mpu->mode == M_UART)
+                ret |= 0x08;
             break;
-        case 0xff8b:                   /*Master mode read*/
-            temp = 0x20 | 0x10 | 0x01; /*AT bus, XT/AT timing*/
+        case 0xf401:
+            ret = pas16->compat_base;
+            break;
+
+        case 0xf802:
+            ret = pas16->sb_irqdma;
+            break;
+
+        case 0xfc00:    /* Board model */
+            /* PAS16 or PASPlus */
+            ret = pas16->type ? 0x0c : 0x01;
+            break;
+        case 0xfc03:    /* Master mode read */
+            /* AT bus, XT/AT timing */
+            ret = 0x11;
+            if (pas16->type)
+                ret |= 0x20;
             break;
 
         default:
             break;
     }
-    pas16_log("pas16_in : port %04X return %02X  %04X:%04X\n", port, temp, CS, cpu_state.pc);
-    return temp;
+
+    pas16_log("[%04X:%08X] PAS16: [R] %04X (%04X) = %02X\n",
+              CS, cpu_state.pc, port + pas16->base, port, ret);
+
+    return ret;
+}
+
+static void
+pas16_change_pit_clock_speed(void *priv)
+{
+    pas16_t *pas16 = (pas16_t *) priv;
+    pitf_t *pit = (pitf_t *) pas16->pit;
+
+    if (pas16->type && (pas16->sys_conf_1 & 0x02) && pas16->prescale_div) {
+        pit_change_pas16_consts((double) pas16->prescale_div);
+        if (pas16->sys_conf_3 & 0x02)
+            pitf_set_pit_const(pit, PAS16CONST2);
+        else
+            pitf_set_pit_const(pit, PAS16CONST);
+    } else
+        pitf_set_pit_const(pit, PITCONST);
+}
+
+static void
+pas16_io_handler(pas16_t *pas16, int set)
+{
+    if (pas16->base != 0x0000) {
+        for (uint32_t addr = 0x0000; addr <= 0xffff; addr += 0x0400) {
+            pas16_log("%04X-%04X: %i\n", pas16->base + addr, pas16->base + addr + 3, set);
+            if (addr != 0x1000)
+                io_handler(set, pas16->base + addr, 0x0004,
+                           pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
+        }
+
+        pitf_handler(set, pas16->base + 0x1000, 0x0004, pas16->pit);
+    }
+}
+
+static void
+pas16_reset_pcm(void *priv)
+{
+    pas16_t *pas16 = (pas16_t *) priv;
+
+    pas16->pcm_ctrl = 0x00;
+
+    pas16->stereo_lr = 0;
+
+    pas16->irq_stat &= 0xd7;
+
+    if ((pas16->irq != -1) && !pas16->irq_stat)
+        picintc(1 << pas16->irq);
+}
+
+static void
+lmc1982_recalc(nsc_mixer_t *mixer)
+{
+    /* LMC1982CIN */
+    /* According to the Windows 95 driver, the two volumes are swapped. */
+    if ((mixer->lmc1982_regs[LMC1982_REG_ISELECT] & LMC1982_ISELECT_MASK) == LMC1982_ISELECT_I2) {
+        switch (mixer->lmc1982_regs[LMC1982_REG_MODE] & LMC1982_MODE_MASK) {
+            case LMC1982_MODE_MONO_L:
+                mixer->master_l = mixer->master_r = lmc1982_att_2dbstep_6bits[mixer->lmc1982_regs[LMC1982_REG_VOL_R]] / 32767.0;
+                break;
+            case LMC1982_MODE_STEREO:
+                mixer->master_l  = lmc1982_att_2dbstep_6bits[mixer->lmc1982_regs[LMC1982_REG_VOL_R]] / 32767.0;
+                mixer->master_r  = lmc1982_att_2dbstep_6bits[mixer->lmc1982_regs[LMC1982_REG_VOL_L]] / 32767.0;
+                break;
+            case LMC1982_MODE_MONO_R:
+            case LMC1982_MODE_MONO_R_2:
+                mixer->master_l = mixer->master_r = lmc1982_att_2dbstep_6bits[mixer->lmc1982_regs[LMC1982_REG_VOL_L]] / 32767.0;
+                break;
+            default:
+                mixer->master_l = mixer->master_r = 0.0;
+                break;
+        }
+
+        mixer->bass      = mixer->lmc1982_regs[LMC1982_REG_BASS] & 0x0f;
+        mixer->treble    = mixer->lmc1982_regs[LMC1982_REG_TREBLE] & 0x0f;
+    } else {
+        mixer->master_l  = mixer->master_r  = 0.0;
+
+        mixer->bass      = 0x06;
+        mixer->treble    = 0x06;
+    }
+}
+
+static void
+lmc835_recalc(nsc_mixer_t *mixer)
+{
+    /* LMC835N */
+    /* Channel A (1-7) */
+    const double *lmc835_att = (const double *) ((mixer->lmc835_regs[LMC835_REG_MODE] & 0x20) ?
+                                                lmc835_att_05dbstep_7bits : lmc835_att_1dbstep_7bits);
+
+    mixer->fm_l      = lmc835_att[mixer->lmc835_regs[LMC835_REG_FM_L] & 0x7f] / 32767.0;
+    mixer->imixer_l  = lmc835_att[mixer->lmc835_regs[LMC835_REG_IMIXER_L] & 0x7f] / 32767.0;
+    mixer->line_l    = lmc835_att[mixer->lmc835_regs[LMC835_REG_LINE_L] & 0x7f] / 32767.0;
+    mixer->cd_l      = lmc835_att[mixer->lmc835_regs[LMC835_REG_CDROM_L] & 0x7f] / 32767.0;
+    mixer->mic_l     = lmc835_att[mixer->lmc835_regs[LMC835_REG_MIC_L] & 0x7f] / 32767.0;
+    mixer->pcm_l     = lmc835_att[mixer->lmc835_regs[LMC835_REG_PCM_L] & 0x7f] / 32767.0;
+    mixer->speaker_l = lmc835_att[mixer->lmc835_regs[LMC835_REG_SPEAKER_L] & 0x7f] / 32767.0;
+
+    /* Channel B (8-e) */
+    lmc835_att       = (const double *) ((mixer->lmc835_regs[LMC835_REG_MODE] & 0x08) ?
+                                        lmc835_att_05dbstep_7bits : lmc835_att_1dbstep_7bits);
+
+    mixer->fm_r      = lmc835_att[mixer->lmc835_regs[LMC835_REG_FM_R] & 0x7f] / 32767.0;
+    mixer->imixer_r  = lmc835_att[mixer->lmc835_regs[LMC835_REG_IMIXER_R] & 0x7f] / 32767.0;
+    mixer->line_r    = lmc835_att[mixer->lmc835_regs[LMC835_REG_LINE_R] & 0x7f] / 32767.0;
+    mixer->cd_r      = lmc835_att[mixer->lmc835_regs[LMC835_REG_CDROM_R] & 0x7f] / 32767.0;
+    mixer->mic_r     = lmc835_att[mixer->lmc835_regs[LMC835_REG_MIC_R] & 0x7f] / 32767.0;
+    mixer->pcm_r     = lmc835_att[mixer->lmc835_regs[LMC835_REG_PCM_R] & 0x7f] / 32767.0;
+    mixer->speaker_r = lmc835_att[mixer->lmc835_regs[LMC835_REG_SPEAKER_R] & 0x7f] / 32767.0;
+}
+
+static void
+mv508_mixer_recalc(mv508_mixer_t *mixer)
+{
+    mixer->fm_l      = mva508_att_2dbstep_5bits[mixer->regs[0][MV508_REG_FM_L]] / 32767.0;
+    mixer->fm_r      = mva508_att_2dbstep_5bits[mixer->regs[0][MV508_REG_FM_R]] / 32767.0;
+    mixer->imixer_l  = mva508_att_2dbstep_5bits[mixer->regs[0][MV508_REG_IMIXER_L]] / 32767.0;
+    mixer->imixer_r  = mva508_att_2dbstep_5bits[mixer->regs[0][MV508_REG_IMIXER_R]] / 32767.0;
+    mixer->line_l    = mva508_att_2dbstep_5bits[mixer->regs[0][MV508_REG_LINE_L]] / 32767.0;
+    mixer->line_r    = mva508_att_2dbstep_5bits[mixer->regs[0][MV508_REG_LINE_R]] / 32767.0;
+    mixer->cd_l      = mva508_att_2dbstep_5bits[mixer->regs[0][MV508_REG_CDROM_L]] / 32767.0;
+    mixer->cd_r      = mva508_att_2dbstep_5bits[mixer->regs[0][MV508_REG_CDROM_R]] / 32767.0;
+    mixer->mic_l     = mva508_att_2dbstep_5bits[mixer->regs[0][MV508_REG_MIC_L]] / 32767.0;
+    mixer->mic_r     = mva508_att_2dbstep_5bits[mixer->regs[0][MV508_REG_MIC_R]] / 32767.0;
+    mixer->pcm_l     = mva508_att_2dbstep_5bits[mixer->regs[0][MV508_REG_PCM_L]] / 32767.0;
+    mixer->pcm_r     = mva508_att_2dbstep_5bits[mixer->regs[0][MV508_REG_PCM_R]] / 32767.0;
+    mixer->speaker_l = mva508_att_2dbstep_5bits[mixer->regs[0][MV508_REG_SPEAKER_L]] / 32767.0;
+    mixer->speaker_r = mva508_att_2dbstep_5bits[mixer->regs[0][MV508_REG_SPEAKER_R]] / 32767.0;
+    mixer->sb_l      = mva508_att_2dbstep_5bits[mixer->regs[0][MV508_REG_SB_L]] / 32767.0;
+    mixer->sb_r      = mva508_att_2dbstep_5bits[mixer->regs[0][MV508_REG_SB_R]] / 32767.0;
+
+    mixer->master_l  = mva508_att_1dbstep_6bits[mixer->regs[2][MV508_REG_MASTER_A_L]] / 32767.0;
+    mixer->master_r  = mva508_att_1dbstep_6bits[mixer->regs[2][MV508_REG_MASTER_A_R]] / 32767.0;
+
+    mixer->bass      = mixer->regs[2][MV508_REG_BASS] & 0x0f;
+    mixer->treble    = mixer->regs[2][MV508_REG_TREBLE] & 0x0f;
+}
+
+static void
+pas16_nsc_mixer_reset(nsc_mixer_t *mixer)
+{
+    mixer->lmc1982_regs[LMC1982_REG_ISELECT] = 0x01;
+    mixer->lmc1982_regs[LMC1982_REG_LES]     = 0x00;
+    mixer->lmc1982_regs[LMC1982_REG_BASS]    = mixer->lmc1982_regs[LMC1982_REG_TREBLE]  = 0x06;
+    mixer->lmc1982_regs[LMC1982_REG_VOL_L]   = mixer->lmc1982_regs[LMC1982_REG_VOL_R]   = 0x00; /*0x28*/ /*Note by TC1995: otherwise the volume gets lowered too much*/
+    mixer->lmc1982_regs[LMC1982_REG_MODE]    = 0x05;
+
+    lmc1982_recalc(mixer);
+
+    mixer->lmc835_regs[LMC835_REG_MODE]      = 0x00;
+
+    mixer->lmc835_regs[LMC835_REG_FM_L]      = mixer->lmc835_regs[LMC835_REG_FM_R]      = 0x69;
+    mixer->lmc835_regs[LMC835_REG_IMIXER_L]  = mixer->lmc835_regs[LMC835_REG_IMIXER_R]  = 0x29;
+    mixer->lmc835_regs[LMC835_REG_LINE_L]    = mixer->lmc835_regs[LMC835_REG_LINE_R]    = 0x69;
+    mixer->lmc835_regs[LMC835_REG_CDROM_L]   = mixer->lmc835_regs[LMC835_REG_CDROM_R]   = 0x69;
+    mixer->lmc835_regs[LMC835_REG_MIC_L]     = mixer->lmc835_regs[LMC835_REG_MIC_R]     = 0x44;
+    mixer->lmc835_regs[LMC835_REG_PCM_L]     = mixer->lmc835_regs[LMC835_REG_PCM_R]     = 0x29;
+    mixer->lmc835_regs[LMC835_REG_SPEAKER_L] = mixer->lmc835_regs[LMC835_REG_SPEAKER_R] = 0x06;
+
+    lmc835_recalc(mixer);
+}
+
+static void
+pas16_mv508_mixer_reset(mv508_mixer_t *mixer)
+{
+    /* Based on the Linux driver - TODO: The actual card's defaults. */
+    mixer->regs[0][MV508_REG_FM_L]       = mixer->regs[0][MV508_REG_FM_R]       = 0x18;
+    mixer->regs[0][MV508_REG_IMIXER_L]   = mixer->regs[0][MV508_REG_IMIXER_R]   = 0x1f;
+    mixer->regs[0][MV508_REG_LINE_L]     = mixer->regs[0][MV508_REG_LINE_R]     = 0x17;
+    mixer->regs[0][MV508_REG_CDROM_L]    = mixer->regs[0][MV508_REG_CDROM_R]    = 0x17;
+    mixer->regs[0][MV508_REG_MIC_L]      = mixer->regs[0][MV508_REG_MIC_R]      = 0x17;
+    mixer->regs[0][MV508_REG_PCM_L]      = mixer->regs[0][MV508_REG_PCM_R]      = 0x17;
+    mixer->regs[0][MV508_REG_SPEAKER_L]  = mixer->regs[0][MV508_REG_SPEAKER_R]  = 0x0f;
+    mixer->regs[0][MV508_REG_SB_L]       = mixer->regs[0][MV508_REG_SB_R]       = 0x17;
+
+    mixer->regs[2][MV508_REG_MASTER_A_L] = mixer->regs[2][MV508_REG_MASTER_A_R] = 0x1f;
+
+    mixer->regs[2][MV508_REG_BASS]       = 0x06;
+    mixer->regs[2][MV508_REG_TREBLE]     = 0x06;
+
+    mv508_mixer_recalc(mixer);
+}
+
+static void
+pas16_reset_regs(void *priv)
+{
+    pas16_t *pas16 = (pas16_t *) priv;
+    nsc_mixer_t *nsc_mixer = &pas16->nsc_mixer;
+    mv508_mixer_t *mv508_mixer = &pas16->mv508_mixer;
+    pitf_t *pit = (pitf_t *) pas16->pit;
+
+    if (pas16->irq != -1)
+        picintc(1 << pas16->irq);
+
+    pas16->sys_conf_1 &= 0xfd;
+
+    pas16->sys_conf_2 = 0x00;
+    pas16->sys_conf_3 = 0x00;
+
+    pas16->prescale_div = 0x00;
+
+    pitf_set_pit_const(pit, PITCONST);
+
+    pas16->audiofilt = 0x00;
+    pas16->filter = 0;
+
+    pitf_ctr_set_gate(pit, 0, 0);
+    pitf_ctr_set_gate(pit, 1, 0);
+
+    pas16_reset_pcm(pas16);
+    pas16->dma8_ff = 0;
+
+    pas16->irq_ena = 0x00;
+    pas16->irq_stat = 0x00;
+
+    if (pas16->type)
+        pas16_mv508_mixer_reset(mv508_mixer);
+    else
+        pas16_nsc_mixer_reset(nsc_mixer);
+}
+
+static void
+pas16_reset_common(void *priv)
+{
+    pas16_t *pas16 = (pas16_t *) priv;
+
+    pas16_reset_regs(pas16);
+
+    if (pas16->irq != -1)
+        picintc(1 << pas16->irq);
+
+    pas16_io_handler(pas16, 0);
+    pas16->base = 0x0000;
+}
+
+static void
+pas16_reset(void *priv)
+{
+    pas16_t *pas16 = (pas16_t *) priv;
+
+    pas16_reset_common(priv);
+
+    pas16->board_id = 0;
+    pas16->master_ff = 0;
+
+    pas16->base = 0x0388;
+    pas16_io_handler(pas16, 1);
+
+    pas16->new_base = 0x0388;
+
+    pas16->sb_compat_base = 0x0220;
+    pas16->compat = 0x02;
+    pas16->compat_base = 0x02;
+    sb_dsp_setaddr(&pas16->dsp, pas16->sb_compat_base);
+}
+
+static int
+pas16_irq_convert(uint8_t val)
+{
+    int ret = val;
+
+    if (ret == 0)
+        ret = -1;
+    else if (ret <= 6)
+        ret++;
+    else if (ret < 0x0b)
+        ret += 3;
+    else
+        ret += 4;
+
+    return ret;
+}
+
+static void
+lmc1982_update_reg(nsc_mixer_t *mixer)
+{
+    pas16_log("LMC1982CIN register %02X = %04X\n",
+              mixer->im_data[LMC1982_ADDR], mixer->im_data[LMC1982_DATA]);
+
+    if ((mixer->im_data[LMC1982_ADDR] & LMC1982_REG_MASK) == LMC1982_REG_VALID) {
+        mixer->im_data[LMC1982_ADDR] &= ~LMC1982_REG_MASK;
+        mixer->lmc1982_regs[mixer->im_data[LMC1982_ADDR]] = mixer->im_data[LMC1982_DATA] & 0xff;
+        lmc1982_recalc(mixer);
+    }
+
+    mixer->im_state = STATE_SM_IDLE;
+}
+
+static void
+lmc835_update_reg(nsc_mixer_t *mixer)
+{
+    pas16_log("LMC835N register %02X = %02X\n",
+              mixer->im_data[LMC835_ADDR], mixer->im_data[LMC835_DATA]);
+
+    mixer->lmc835_regs[LMC835_REG_MODE] = mixer->im_data[LMC835_ADDR] & 0xf0;
+    mixer->im_data[LMC835_ADDR] &= 0x0f;
+    if ((mixer->im_data[LMC835_ADDR] >= 0x01) && (mixer->im_data[LMC835_ADDR] <= 0x0e))
+        mixer->lmc835_regs[mixer->im_data[LMC835_ADDR] & 0x0f] = mixer->im_data[LMC835_DATA];
+    lmc835_recalc(mixer);
+}
+
+static void
+pas16_scsi_callback(void *priv)
+{
+    pas16_t *      pas16 = (pas16_t *) priv;
+    t128_t  *      dev   = pas16->scsi;
+    scsi_bus_t *   scsi_bus = &dev->ncr.scsibus;
+
+    t128_callback(pas16->scsi);
+
+    pas16_log("TimeOutStatus=%02x, t128stat=%02x.\n", pas16->timeout_status, dev->status);
+    if ((scsi_bus->tx_mode != PIO_TX_BUS) && (dev->status & 0x04)) {
+        timer_stop(&pas16->scsi_timer);
+        pas16->timeout_status &= 0x7f;
+    }
+}
+
+static void
+pas16_timeout_callback(void *priv)
+{
+    pas16_t *      pas16       = (pas16_t *) priv;
+
+    pas16->timeout_status |= 0x80;
+
+    if ((pas16->timeout_status & 0x08) && (pas16->irq != -1))
+        picint(1 << pas16->irq);
+
+    timer_advance_u64(&pas16->scsi_timer, (pas16->timeout_count & 0x3f) * PASSCSICONST);
 }
 
 static void
 pas16_out(uint16_t port, uint8_t val, void *priv)
 {
-    pas16_t *pas16 = (pas16_t *) priv;
-    pas16_log("pas16_out : port %04X val %02X  %04X:%04X\n", port, val, CS, cpu_state.pc);
-    switch ((port - pas16->base) + 0x388) {
-        case 0x388:
-        case 0x389:
-        case 0x38a:
-        case 0x38b:
-            pas16->opl.write((port - pas16->base) + 0x388, val, pas16->opl.priv);
+    pas16_t *      pas16       = (pas16_t *) priv;
+    nsc_mixer_t *  nsc_mixer   = &pas16->nsc_mixer;
+    mv508_mixer_t *mv508_mixer = &pas16->mv508_mixer;
+
+    pas16_log("[%04X:%08X] PAS16: [W] %04X (%04X) = %02X\n",
+              CS, cpu_state.pc, port, port - pas16->base, val);
+
+    port -= pas16->base;
+
+    switch (port) {
+        case 0x0000 ... 0x0003:
+            pas16->opl.write(port + 0x0388, val, pas16->opl.priv);
             break;
 
-        case 0xb88:
-            pas16->audio_mixer = val;
+        case 0x0400 ... 0x0402:
+            break;
+        case 0x0403:
+            if (val & MV508_ADDRESS)
+		mv508_mixer->index = val & ~MV508_ADDRESS;
+            else {
+                uint8_t bank;
+                uint8_t mask;
+
+                pas16_log("MVA508 register %02X = %02X\n",
+                          mv508_mixer->index, val);
+
+                if (mv508_mixer->index & MV508_MIXER) {
+		    bank = !!(val & MV508_INPUT_MIX);
+                    mask = 0x1f;
+                } else {
+		    bank = 2;
+                    mask = 0x3f;
+                }
+
+                if (mv508_mixer->index & MV508_CHANNEL)
+                    mv508_mixer->regs[bank][mv508_mixer->index] = val & mask;
+                else {
+                    mv508_mixer->regs[bank][mv508_mixer->index | MV508_LEFT] = val & mask;
+                    mv508_mixer->regs[bank][mv508_mixer->index | MV508_RIGHT] = val & mask;
+                }
+
+                mv508_mixer_recalc(mv508_mixer);
+            }
             break;
 
-        case 0xb89:
+        case 0x0800:
+            if (pas16->type && !(val & SERIAL_MIXER_RESET_PCM)) {
+                pas16->audio_mixer = val;
+                pas16_reset_pcm(pas16);
+            } else if (!pas16->type) {
+                switch (nsc_mixer->im_state) {
+                    default:
+                        break;
+                    case STATE_SM_IDLE:
+                        /* Transmission initiated. */
+                        if (val & SERIAL_MIXER_IDENT) {
+                            if (!(val & SERIAL_MIXER_CLOCK) && (pas16->audio_mixer & SERIAL_MIXER_CLOCK)) {
+                                /* Prepare for receiving LMC835N data. */
+                                nsc_mixer->im_data[LMC835_DATA] = 0x0000;
+                                nsc_mixer->im_state |= STATE_LMC835_DATA;
+                            }
+                        } else {
+                            if ((pas16->audio_mixer & SERIAL_MIXER_IDENT)) {
+                                /*
+                                   Prepare for receiving the LMC1982CIN address.
+                                 */
+                                nsc_mixer->im_data[LMC1982_ADDR] = 0x0000;
+                                nsc_mixer->im_state |= STATE_LMC1982_ADDR;
+                            }
+                            if ((val & SERIAL_MIXER_CLOCK) && !(pas16->audio_mixer & SERIAL_MIXER_CLOCK)) {
+                                /*
+                                   Clock the least siginificant bit of the LMC1982CIN address.
+                                 */
+                                nsc_mixer->im_data[LMC1982_ADDR] |=
+                                    ((val & SERIAL_MIXER_DATA) << (nsc_mixer->im_state & STATE_DATA_MASK));
+                                nsc_mixer->im_state++;
+                            }
+                        }
+                        break;
+                    case STATE_LMC1982_ADDR_0:
+                        if (val & SERIAL_MIXER_IDENT) {
+                            /*
+                               IDENT went high in LM1982CIN address state 0,
+                               behave as if we were in the idle state.
+                             */
+                            if (!(val & SERIAL_MIXER_CLOCK) && (pas16->audio_mixer & SERIAL_MIXER_CLOCK)) {
+                                nsc_mixer->im_data[LMC835_DATA] = 0x0000;
+                                nsc_mixer->im_state = STATE_LMC835_DATA_0;
+                            }
+                        } else if ((val & SERIAL_MIXER_CLOCK) &&
+                                   !(pas16->audio_mixer & SERIAL_MIXER_CLOCK)) {
+                            /*
+                               Clock the least siginificant bit of the LMC1982CIN address.
+                             */
+                            nsc_mixer->im_data[LMC1982_ADDR] |=
+                                ((val & SERIAL_MIXER_DATA) << (nsc_mixer->im_state & STATE_DATA_MASK));
+                            nsc_mixer->im_state++;
+                        }
+                        break;
+                    case STATE_LMC1982_ADDR_1 ... STATE_LMC1982_ADDR_7:
+                        if ((val & 0x02) && !(pas16->audio_mixer & 0x02)) {
+                            /*
+                               Clock the next bit of the LMC1982CIN address.
+                             */
+                            nsc_mixer->im_data[LMC1982_ADDR] |=
+                                ((val & SERIAL_MIXER_DATA) << (nsc_mixer->im_state & STATE_DATA_MASK));
+                            nsc_mixer->im_state++;
+                        }
+                        break;
+                    case STATE_LMC1982_ADDR_OVER:
+                        /*
+                           Prepare for receiving the LMC1982CIN data.
+                         */
+                        nsc_mixer->im_data[LMC1982_DATA] = 0x0000;
+                        nsc_mixer->im_state = STATE_LMC1982_DATA_0;
+                        break;
+                    case STATE_LMC1982_DATA_0 ... STATE_LMC1982_DATA_7:
+                    case STATE_LMC1982_DATA_9 ... STATE_LMC1982_DATA_F:
+                        if ((val & SERIAL_MIXER_CLOCK) && !(pas16->audio_mixer & SERIAL_MIXER_CLOCK)) {
+                            /*
+                               Clock the next bit of the LMC1982CIN data.
+                             */
+                            nsc_mixer->im_data[LMC1982_DATA] |=
+                                ((val & SERIAL_MIXER_DATA) << (nsc_mixer->im_state & STATE_DATA_MASK_W));
+                            nsc_mixer->im_state++;
+                        }
+                        break;
+                    case STATE_LMC1982_DATA_8:
+                        if (val & SERIAL_MIXER_IDENT) {
+                            if (!(pas16->audio_mixer & SERIAL_MIXER_IDENT))
+                                /*
+                                   LMC1982CIN data transfer ended after 8 bits, process the data and
+                                   reset the state back to idle.
+                                 */
+                                lmc1982_update_reg(nsc_mixer);
+                            else if ((val & SERIAL_MIXER_CLOCK) &&
+                                     !(pas16->audio_mixer & SERIAL_MIXER_CLOCK)) {
+                                /*
+                                   Clock the next bit of the LMC1982CIN data.
+                                 */
+                                nsc_mixer->im_data[LMC1982_DATA] |=
+                                    ((val & SERIAL_MIXER_DATA) << (nsc_mixer->im_state & STATE_DATA_MASK_W));
+                                nsc_mixer->im_state++;
+                            }
+                        }
+                        break;
+                    case STATE_LMC1982_DATA_OVER:
+                        if ((val & SERIAL_MIXER_IDENT) && !(pas16->audio_mixer & SERIAL_MIXER_IDENT))
+                            /*
+                               LMC1982CIN data transfer ended, process the data and reset the state
+                               back to idle.
+                             */
+                            lmc1982_update_reg(nsc_mixer);
+                        break;
+                    case STATE_LMC835_DATA_0 ... STATE_LMC835_DATA_7:
+                        if ((val & SERIAL_MIXER_CLOCK) && !(pas16->audio_mixer & SERIAL_MIXER_CLOCK)) {
+                            /*
+                               Clock the next bit of the LMC835N data.
+                             */
+                            nsc_mixer->im_data[LMC835_DATA] |=
+                                ((val &  SERIAL_MIXER_DATA) << (nsc_mixer->im_state & STATE_DATA_MASK));
+                            nsc_mixer->im_state++;
+                        }
+                        break;
+                    case STATE_LMC835_DATA_OVER:
+                        if ((val & SERIAL_MIXER_STROBE) && !(pas16->audio_mixer & SERIAL_MIXER_STROBE)) {
+                            if (nsc_mixer->im_data[LMC835_DATA] & LMC835_FLAG_ADDR)
+                                /*
+                                   The LMC835N data is an address, copy it into its own space for usage
+                                   when processing it at the end and strip bits 7 (it's the address/data
+                                   indicator) and 6 (it's a "don't care" bit).
+                                 */
+                                nsc_mixer->im_data[LMC835_ADDR] = nsc_mixer->im_data[LMC835_DATA] & 0x7f;
+                            else
+                                lmc835_update_reg(nsc_mixer);
+                            nsc_mixer->im_state = STATE_SM_IDLE;
+                        }
+                        break;
+                }
+
+                pas16->audio_mixer = val;
+            }
+            break;
+        case 0x0801:
             pas16->irq_stat &= ~val;
+            if ((pas16->irq != -1) && !(pas16->irq_stat & 0x1f))
+                picintc(1 << pas16->irq);
             break;
-
-        case 0xb8a:
+        case 0x0802:
             pas16_update(pas16);
+
+            pitf_ctr_set_gate(pas16->pit, 1, !!(val & 0x80));
+            pitf_ctr_set_gate(pas16->pit, 0, !!(val & 0x40));
+
+            pas16->stereo_lr = 0;
+            pas16->dma8_ff = 0;
+
+            if ((val & 0x20) && !(pas16->audiofilt & 0x20)) {
+                pas16_log("Reset.\n");
+                pas16_reset_regs(pas16);
+            }
+
             pas16->audiofilt = val;
+
+            if (val & 0x1f) {
+                pas16->filter = 1;
+                switch (val & 0x1f) {
+                    default:
+                        pas16->filter = 0;
+                        break;
+                    case 0x01:
+                        recalc_pas16_filter(17897);
+                        break;
+                    case 0x02:
+                        recalc_pas16_filter(15909);
+                        break;
+                    case 0x04:
+                        recalc_pas16_filter(2982);
+                        break;
+                    case 0x09:
+                        recalc_pas16_filter(11931);
+                        break;
+                    case 0x11:
+                        recalc_pas16_filter(8948);
+                        break;
+                    case 0x19:
+                        recalc_pas16_filter(5965);
+                        break;
+                }
+            } else
+                pas16->filter = 0;
+            break;
+        case 0x0803:
+            pas16->irq_ena = val & 0x1f;
+            pas16->irq_stat &= ((val & 0x1f) | 0xe0);
+
+            if ((pas16->irq != -1) && !(pas16->irq_stat & 0x1f))
+                picintc(1 << pas16->irq);
             break;
 
-        case 0xb8b:
-            pas16->irq_ena = val;
-            break;
-
-        case 0xf88:
+        case 0x0c00:
+        case 0x0c01:
             pas16_update(pas16);
-            pas16->pcm_dat = (pas16->pcm_dat & 0xff00) | val;
             break;
-        case 0xf89:
-            pas16_update(pas16);
-            pas16->pcm_dat = (pas16->pcm_dat & 0x00ff) | (val << 8);
-            break;
-        case 0xf8a:
-            if ((val & PAS16_PCM_ENA) && !(pas16->pcm_ctrl & PAS16_PCM_ENA)) /*Guess*/
+        case 0x0c02:
+            if ((val & PAS16_PCM_ENA) && !(pas16->pcm_ctrl & PAS16_PCM_ENA)) {
+                /* Guess */
                 pas16->stereo_lr = 0;
+                pas16->irq_stat &= 0xd7;
+                /* Needed for 8-bit DMA to work correctly on a 16-bit DMA channel. */
+                pas16->dma8_ff = 0;
+            }
+
             pas16->pcm_ctrl = val;
+            pas16_log("Now in: %s (%02X)\n", (pas16->pcm_ctrl & PAS16_PCM_MONO) ? "Mono" : "Stereo", val);
             break;
 
-        case 0x1388:
-        case 0x1389:
-        case 0x138a:
-        case 0x138b:
-            pas16_pit_out(port, val, pas16);
+        case 0x1401:
+        case 0x1403:
+            pas16->midi_ctrl = val;
+            if ((val & 0x60) == 0x60) {
+                pas16->midi_uart_out = 0;
+                pas16->midi_uart_in = 0;
+            } else if ((val & 0x1c) == 0x04)
+                pas16->midi_uart_in = 1;
+            else
+                pas16->midi_uart_out = 1;
+
+            pas16_update_irq(pas16);
+            break;
+        case 0x1402:
+        case 0x1802:
+            pas16->midi_data = val;
+            pas16_log("UART OUT=%d.\n", pas16->midi_uart_out);
+            if (pas16->midi_uart_out)
+                midi_raw_out_byte(val);
             break;
 
-        case 0x7f89:
+        case 0x1800:
+            pas16->midi_stat = val;
+            pas16_update_irq(pas16);
+            break;
+        case 0x1801:
+            pas16->fifo_stat = val;
+            break;
+
+        case 0x1c00 ... 0x1c03:    /* NCR5380 ports 0 to 3. */
+        case 0x3c00 ... 0x3c03:    /* NCR5380 ports 4 to 7. */
+            if (pas16->has_scsi)
+                ncr5380_write((port & 0x0003) | ((port & 0x2000) >> 11), val, &pas16->scsi->ncr);
+            break;
+
+        case 0x4000:
+            if (pas16->has_scsi) {
+                pas16->timeout_count = val;
+                if (timer_is_enabled(&pas16->scsi_timer))
+                    timer_disable(&pas16->scsi_timer);
+                if ((val & 0x3f) > 0x00)
+                    timer_set_delay_u64(&pas16->scsi_timer, (val & 0x3f) * PASSCSICONST);
+            }
+            break;
+
+        case 0x4001:
+            if (pas16->has_scsi) {
+                pas16->timeout_status = val & 0x7f;
+                if (pas16->scsi_irq != -1)
+                    picintc(1 << pas16->scsi_irq);
+            }
+            break;
+
+        case 0x5c00:
+            if (pas16->has_scsi)
+                t128_write(0x1e00, val, pas16->scsi);
+            break;
+        case 0x5c03:
+            if (pas16->has_scsi) {
+                if (val & 0x80) {
+                    pas16->scsi->ncr.irq_state = 0;
+                    if (pas16->scsi_irq != -1)
+                        picintc(1 << pas16->scsi_irq);
+                }
+            }
+            break;
+
+        case 0x7c01:
             pas16->enhancedscsi = val;
             break;
 
-        case 0x8388:
+        case 0x8000:
+            if ((val & 0xc0) && !(pas16->sys_conf_1 & 0xc0)) {
+                pas16_log("Reset.\n");
+                val = 0x00;
+                pas16_reset_common(pas16);
+                pas16->base = pas16->new_base;
+                pas16_io_handler(pas16, 1);
+            }
+
             pas16->sys_conf_1 = val;
+            pas16_change_pit_clock_speed(pas16);
+            pas16_log("Now in: %s mode\n", (pas16->sys_conf_1 & 0x02) ? "native" : "compatibility");
             break;
-        case 0x8389:
+        case 0x8001:
             pas16->sys_conf_2 = val;
+            pas16_log("Now in: %i bits (%02X)\n",
+                      (pas16->sys_conf_2 & 0x04) ? ((pas16->sys_conf_2 & 0x08) ? 12 : 16) : 8, val);
             break;
-        case 0x838a:
+        case 0x8002:
             pas16->sys_conf_3 = val;
+            pas16_change_pit_clock_speed(pas16);
+            pas16_log("Use 1.008 MHz clok for PCM: %c\n", (val & 0x02) ? 'Y' : 'N');
             break;
-        case 0x838b:
+        case 0x8003:
             pas16->sys_conf_4 = val;
+            if (pas16->has_scsi && (pas16->scsi_irq != -1) && !(val & 0x20))
+                picintc(1 << pas16->scsi_irq);
             break;
 
-        case 0xf388:
+        case 0xbc00:
+            pas16->waitstates = val;
+            break;
+        case 0xbc02:
+            pas16->prescale_div = val;
+            pas16_change_pit_clock_speed(pas16);
+            pas16_log("Prescale divider now: %i\n", val);
+            break;
+
+        case 0xf000:
             pas16->io_conf_1 = val;
             break;
-        case 0xf389:
+        case 0xf001:
             pas16->io_conf_2 = val;
             pas16->dma       = pas16_dmas[val & 0x7];
+            pas16_change_pit_clock_speed(pas16);
             pas16_log("pas16_out : set PAS DMA %i\n", pas16->dma);
             break;
-        case 0xf38a:
+        case 0xf002:
             pas16->io_conf_3 = val;
-            pas16->irq       = pas16_irqs[val & 0xf];
-            pas16_log("pas16_out : set PAS IRQ %i\n", pas16->irq);
+            if (pas16->irq != -1)
+                picintc(1 << pas16->irq);
+            pas16->irq       = pas16_irq_convert(val & 0x0f);
+            if (pas16->has_scsi) {
+                if (pas16->scsi_irq != -1)
+                    picintc(1 << pas16->scsi_irq);
+                pas16->scsi_irq  = pas16_irq_convert(val >> 4);
+                ncr5380_set_irq(&pas16->scsi->ncr, pas16->scsi_irq);
+            }
+
+            pas16_log("pas16_out : set PAS IRQ %i, val=%02x\n", pas16->irq, val & 0x0f);
             break;
-        case 0xf38b:
+        case 0xf003:
             pas16->io_conf_4 = val;
             break;
 
-        case 0xf788:
-            pas16->compat = val;
+        case 0xf400:
+            pas16->compat = val & 0xf3;
+            pas16_log("PCM compression is now %sabled\n", (val & 0x10) ? "en" : "dis");
             if (pas16->compat & 0x02)
-                sb_dsp_setaddr(&pas16->dsp, ((pas16->compat_base & 0xf) << 4) | 0x200);
+                sb_dsp_setaddr(&pas16->dsp, pas16->sb_compat_base);
             else
                 sb_dsp_setaddr(&pas16->dsp, 0);
+            if (pas16->compat & 0x01)
+                mpu401_change_addr(pas16->mpu, ((pas16->compat_base & 0xf0) | 0x300));
+            else
+                mpu401_change_addr(pas16->mpu, 0);
             break;
-        case 0xf789:
+        case 0xf401:
             pas16->compat_base = val;
+            pas16->sb_compat_base = ((pas16->compat_base & 0xf) << 4) | 0x200;
+            pas16_log("SB Compatibility base: %04X\n", pas16->sb_compat_base);
             if (pas16->compat & 0x02)
-                sb_dsp_setaddr(&pas16->dsp, ((pas16->compat_base & 0xf) << 4) | 0x200);
+                sb_dsp_setaddr(&pas16->dsp, pas16->sb_compat_base);
+            if (pas16->compat & 0x01)
+                mpu401_change_addr(pas16->mpu, ((pas16->compat_base & 0xf0) | 0x300));
             break;
 
-        case 0xfb8a:
+        case 0xf802:
             pas16->sb_irqdma = val;
+            mpu401_setirq(pas16->mpu, pas16_sb_irqs[val & 7]);
             sb_dsp_setirq(&pas16->dsp, pas16_sb_irqs[(val >> 3) & 7]);
             sb_dsp_setdma8(&pas16->dsp, pas16_sb_dmas[(val >> 6) & 3]);
-            pas16_log("pas16_out : set SB IRQ %i DMA %i\n", pas16_sb_irqs[(val >> 3) & 7], pas16_sb_dmas[(val >> 6) & 3]);
+            pas16_log("pas16_out : set SB IRQ %i DMA %i.\n", pas16_sb_irqs[(val >> 3) & 7],
+                      pas16_sb_dmas[(val >> 6) & 3]);
             break;
 
         default:
             pas16_log("pas16_out : unknown %04X\n", port);
     }
-#if 0
-    if (cpu_state.pc == 0x80048CF3) {
-        if (output)
-            fatal("here\n");
-        output = 3;
+}
+
+/*
+   8-bit mono:
+    - 8-bit DMA : On every timer 0 over, read the 8-bit sample and ctr_clock();
+      (One ctr_clock() per timer 0 over)
+    - 16-bit DMA: On every even timer 0 over, read two 8-bit samples at once and ctr_clock();
+                  On every odd timer 0 over, read the MSB of the previously read sample word.
+      (One ctr_clock() per two timer 0 overs)
+   8-bit stereo:
+    - 8-bit DMA : On every timer 0, read two 8-bit samples and ctr_clock() twice;
+      (Two ctr_clock()'s per timer 0 over)
+    - 16-bit DMA: On every timer 0, read two 8-bit samples and ctr_clock() once.
+      (One ctr_clock() per timer 0 over)
+   16-bit mono (to be verified):
+    - 8-bit DMA : On every timer 0, read one 16-bit sample and ctr_clock() twice;
+      (Two ctr_clock()'s per timer 0 over)
+    - 16-bit DMA: On every timer 0, read one 16-bit sample and ctr_clock() once.
+      (One ctr_clock() per timer 0 over)
+   16-bit stereo:
+    - 8-bit DMA : On every timer 0, read one 16-bit sample and ctr_clock() twice;
+      (Two ctr_clock()'s per timer 0 over)
+    - 16-bit DMA: On every timer 0, read one 16-bit sample and ctr_clock() twice.
+      (Two ctr_clock()'s per timer 0 over)
+
+   What we can conclude from this is:
+    - Maximum 16 bits per timer 0 over;
+    - A 8-bit sample always takes one ctr_clock() tick, unless it has been read
+      alongside the previous sample;
+    - A 16-bit sample always takes two ctr_clock() ticks.
+ */
+static uint16_t
+pas16_dma_channel_read(pas16_t *pas16, UNUSED(int channel))
+{
+    int status;
+    uint16_t ret;
+
+    if (pas16->pcm_ctrl & PAS16_PCM_DMA_ENA) {
+        if (pas16->dma >= 5) {
+            dma_channel_advance(pas16->dma);
+            status = dma_channel_read_only(pas16->dma);
+        } else
+            status = dma_channel_read(pas16->dma);
+        ret = (status == DMA_NODATA) ? 0x0000 : (status & 0xffff);
+    } else
+        ret = 0x0000;
+
+    return ret;
+}
+
+static uint16_t
+pas16_dma_readb(pas16_t *pas16)
+{
+    const uint16_t ret = pas16_dma_channel_read(pas16, pas16->dma);
+
+    pas16->ticks++;
+
+    return ret;
+}
+
+static uint16_t
+pas16_dma_readw(pas16_t *pas16, const uint8_t timer1_ticks)
+{
+    uint16_t ret;
+
+    if (pas16->dma >= 5)
+        ret = pas16_dma_channel_read(pas16, pas16->dma);
+    else {
+        ret = pas16_dma_channel_read(pas16, pas16->dma);
+        ret |= (pas16_dma_channel_read(pas16, pas16->dma) << 8);
     }
-#endif
+
+    pas16->ticks += timer1_ticks;
+
+    return ret;
 }
 
-static void
-pas16_pit_out(uint16_t port, uint8_t val, void *priv)
+static uint16_t
+pas16_readdmab(pas16_t *pas16)
 {
-    pas16_t *pas16 = (pas16_t *) priv;
-    int      t;
-    switch (port & 3) {
-        case 3: /*CTRL*/
-            if ((val & 0xC0) == 0xC0) {
-                if (!(val & 0x20)) {
-                    if (val & 2)
-                        pas16->pit.rl[0] = timer_get_remaining_u64(&pas16->pit.timer[0]) / PITCONST;
-                    if (val & 4)
-                        pas16->pit.rl[1] = pas16->pit.c[1];
-                    if (val & 8)
-                        pas16->pit.rl[2] = pas16->pit.c[2];
-                }
-                return;
-            }
-            t                   = val >> 6;
-            pas16->pit.ctrls[t] = pas16->pit.ctrl = val;
-            if (t == 3) {
-                printf("Bad PIT reg select\n");
-                return;
-            }
-            if (!(pas16->pit.ctrl & 0x30)) {
-                if (!t)
-                    pas16->pit.rl[t] = timer_get_remaining_u64(&pas16->pit.timer[t]) / PITCONST;
-                else {
-                    pas16->pit.rl[t] = pas16->pit.c[t];
-                    if (pas16->pit.c[t] < 0)
-                        pas16->pit.rl[t] = 0;
-                }
-                pas16->pit.ctrl |= 0x30;
-                pas16->pit.rereadlatch[t] = 0;
-                pas16->pit.rm[t]          = 3;
-            } else {
-                pas16->pit.rm[t] = pas16->pit.wm[t] = (pas16->pit.ctrl >> 4) & 3;
-                pas16->pit.m[t]                     = (val >> 1) & 7;
-                if (pas16->pit.m[t] > 5)
-                    pas16->pit.m[t] &= 3;
-                if (!pas16->pit.rm[t]) {
-                    pas16->pit.rm[t] = 3;
-                    if (!t)
-                        pas16->pit.rl[t] = timer_get_remaining_u64(&pas16->pit.timer[t]) / PITCONST;
-                    else
-                        pas16->pit.rl[t] = pas16->pit.c[t];
-                }
-                pas16->pit.rereadlatch[t] = 1;
-            }
-            pas16->pit.wp      = 0;
-            pas16->pit.thit[t] = 0;
-            break;
-        case 0:
-        case 1:
-        case 2: /*Timers*/
-            t = port & 3;
-            switch (pas16->pit.wm[t]) {
-                case 1:
-                    pas16->pit.l[t]    = val;
-                    pas16->pit.thit[t] = 0;
-                    pas16->pit.c[t]    = pas16->pit.l[t];
-                    if (!t)
-                        timer_set_delay_u64(&pas16->pit.timer[t], pas16->pit.c[t] * PITCONST);
-                    pas16->pit.enable[t] = 1;
-                    break;
-                case 2:
-                    pas16->pit.l[t]    = val << 8;
-                    pas16->pit.thit[t] = 0;
-                    pas16->pit.c[t]    = pas16->pit.l[t];
-                    if (!t)
-                        timer_set_delay_u64(&pas16->pit.timer[t], pas16->pit.c[t] * PITCONST);
-                    pas16->pit.enable[t] = 1;
-                    break;
-                case 0:
-                    pas16->pit.l[t] &= 0xFF;
-                    pas16->pit.l[t] |= (val << 8);
-                    pas16->pit.c[t] = pas16->pit.l[t];
-                    if (!t)
-                        timer_set_delay_u64(&pas16->pit.timer[t], pas16->pit.c[t] * PITCONST);
-                    pas16->pit.thit[t]   = 0;
-                    pas16->pit.wm[t]     = 3;
-                    pas16->pit.enable[t] = 1;
-                    break;
-                case 3:
-                    pas16->pit.l[t] &= 0xFF00;
-                    pas16->pit.l[t] |= val;
-                    pas16->pit.wm[t] = 0;
-                    break;
-
-                default:
-                    break;
-            }
-            if (!pas16->pit.l[t]) {
-                pas16->pit.l[t] |= 0x10000;
-                pas16->pit.c[t] = pas16->pit.l[t];
-                if (!t)
-                    timer_set_delay_u64(&pas16->pit.timer[t], pas16->pit.c[t] * PITCONST);
-            }
-            break;
-
-        default:
-            break;
-    }
-}
-
-static uint8_t
-pas16_pit_in(uint16_t port, void *priv)
-{
-    pas16_t *pas16 = (pas16_t *) priv;
-    uint8_t  temp  = 0xff;
-    int      t     = port & 3;
-    switch (port & 3) {
-        case 0:
-        case 1:
-        case 2: /*Timers*/
-            if (pas16->pit.rereadlatch[t]) {
-                pas16->pit.rereadlatch[t] = 0;
-                if (!t) {
-                    pas16->pit.rl[t] = timer_get_remaining_u64(&pas16->pit.timer[t]) / PITCONST;
-                    if ((timer_get_remaining_u64(&pas16->pit.timer[t]) / PITCONST) > 65536)
-                        pas16->pit.rl[t] = 0xFFFF;
-                } else {
-                    pas16->pit.rl[t] = pas16->pit.c[t];
-                    if (pas16->pit.c[t] > 65536)
-                        pas16->pit.rl[t] = 0xFFFF;
-                }
-            }
-            switch (pas16->pit.rm[t]) {
-                case 0:
-                    temp                      = pas16->pit.rl[t] >> 8;
-                    pas16->pit.rm[t]          = 3;
-                    pas16->pit.rereadlatch[t] = 1;
-                    break;
-                case 1:
-                    temp                      = (pas16->pit.rl[t]) & 0xFF;
-                    pas16->pit.rereadlatch[t] = 1;
-                    break;
-                case 2:
-                    temp                      = (pas16->pit.rl[t]) >> 8;
-                    pas16->pit.rereadlatch[t] = 1;
-                    break;
-                case 3:
-                    temp = (pas16->pit.rl[t]) & 0xFF;
-                    if (pas16->pit.m[t] & 0x80)
-                        pas16->pit.m[t] &= 7;
-                    else
-                        pas16->pit.rm[t] = 0;
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-        case 3: /*Control*/
-            temp = pas16->pit.ctrl;
-            break;
-
-        default:
-            break;
-    }
-    return temp;
-}
-
-static uint8_t
-pas16_readdma(pas16_t *pas16)
-{
-    return dma_channel_read(pas16->dma);
-}
-
-static void
-pas16_pcm_poll(void *priv)
-{
-    pas16_t *pas16 = (pas16_t *) priv;
-
-    pas16_update(pas16);
-    if (pas16->pit.m[0] & 2) {
-        if (pas16->pit.l[0])
-            timer_advance_u64(&pas16->pit.timer[0], pas16->pit.l[0] * PITCONST);
+    if (pas16->dma >= 5) {
+        if (pas16->dma8_ff)
+            pas16->dma8_dat >>= 8;
         else
-            timer_advance_u64(&pas16->pit.timer[0], 0x10000 * PITCONST);
-    } else {
-        pas16->pit.enable[0] = 0;
-    }
+            pas16->dma8_dat = pas16_dma_readb(pas16);
 
-    pas16->irq_stat |= PAS16_INT_SAMP;
-    if (pas16->irq_ena & PAS16_INT_SAMP)
-        picint(1 << pas16->irq);
+        pas16->dma8_ff = !pas16->dma8_ff;
+    } else
+        pas16->dma8_dat = pas16_dma_readb(pas16);
 
-    /*Update sample rate counter*/
-    if (pas16->pit.enable[1]) {
-        if (pas16->pcm_ctrl & PAS16_PCM_ENA) {
-            uint16_t temp;
+    return ((pas16->dma8_dat & 0xff) ^ 0x80) << 8;
+}
 
-            if (pas16->sys_conf_2 & PAS16_SC2_16BIT) {
-                temp = pas16_readdma(pas16) << 8;
-                temp |= pas16_readdma(pas16);
-            } else
-                temp = (pas16_readdma(pas16) ^ 0x80) << 8;
+static uint16_t
+pas16_readdmaw_mono(pas16_t *pas16)
+{
+    const uint16_t ret = pas16_dma_readw(pas16, 1 + (pas16->dma < 5));
 
-            if (pas16->sys_conf_2 & PAS16_SC2_MSBINV)
-                temp ^= 0x8000;
-            if (pas16->pcm_ctrl & PAS16_PCM_MONO)
-                pas16->pcm_dat_l = pas16->pcm_dat_r = temp;
-            else {
+    return ret;
+}
+
+static uint16_t
+pas16_readdmaw_stereo(pas16_t *pas16)
+{
+    uint16_t ret;
+    uint16_t ticks = (pas16->sys_conf_1 & 0x02) ? (1 + (pas16->dma < 5)) : 1;
+
+    ret = pas16_dma_readw(pas16, ticks);
+
+    return ret;
+}
+
+static uint16_t
+pas16_readdma_mono(pas16_t *pas16)
+{
+    uint16_t ret;
+
+    if (pas16->sys_conf_2 & 0x04) {
+        ret = pas16_readdmaw_mono(pas16);
+
+        if (pas16->sys_conf_2 & 0x08)
+            ret &= 0xfff0;
+    } else
+        ret = pas16_readdmab(pas16);
+
+    if (pas16->sys_conf_2 & PAS16_SC2_MSBINV)
+        ret ^= 0x8000;
+
+    return ret;
+}
+
+static uint16_t
+pas16_readdma_stereo(pas16_t *pas16)
+{
+    uint16_t ret;
+
+    if (pas16->sys_conf_2 & 0x04) {
+        ret = pas16_readdmaw_stereo(pas16);
+
+        if (pas16->sys_conf_2 & 0x08)
+            ret &= 0xfff0;
+    } else
+        ret = pas16_readdmab(pas16);
+
+    if (pas16->sys_conf_2 & PAS16_SC2_MSBINV)
+        ret ^= 0x8000;
+
+    return ret;
+}
+
+static void
+pas16_pit_timer0(const int new_out, UNUSED(int old_out), void *priv)
+{
+    const pitf_t *pit   = (const pitf_t *) priv;
+    pas16_t *     pas16 = (pas16_t *) pit->dev_priv;
+
+    if (!pas16->pit->counters[0].gate)
+        return;
+
+    if (!dma_channel_readable(pas16->dma))
+        return;
+
+    pas16_update_irq(pas16);
+
+    if (((pas16->pcm_ctrl & PAS16_PCM_ENA) == PAS16_PCM_ENA) && (pit->counters[1].m & 2) && new_out) {
+        uint16_t temp;
+
+        pas16->ticks = 0;
+
+        if (pas16->pcm_ctrl & PAS16_PCM_MONO) {
+            temp = pas16_readdma_mono(pas16);
+
+            pas16->pcm_dat_l = pas16->pcm_dat_r = temp;
+        } else {
+            temp = pas16_readdma_stereo(pas16);
+
+            if (pas16->sys_conf_1 & 0x02) {
+                pas16->pcm_dat_l = temp;
+
+                temp = pas16_readdma_stereo(pas16);
+
+                pas16->pcm_dat_r = temp;
+            } else {
                 if (pas16->stereo_lr)
                     pas16->pcm_dat_r = temp;
                 else
                     pas16->pcm_dat_l = temp;
 
                 pas16->stereo_lr = !pas16->stereo_lr;
+                pas16->irq_stat = (pas16->irq_stat & 0xdf) | (pas16->stereo_lr << 5);
             }
         }
-        if (pas16->sys_conf_2 & PAS16_SC2_16BIT)
-            pas16->pit.c[1] -= 2;
-        else
-            pas16->pit.c[1]--;
-        if (pas16->pit.c[1] == 0) {
-            if (pas16->pit.m[1] & 2) {
-                if (pas16->pit.l[1])
-                    pas16->pit.c[1] += pas16->pit.l[1];
-                else
-                    pas16->pit.c[1] += 0x10000;
-            } else {
-                pas16->pit.c[1]      = -1;
-                pas16->pit.enable[1] = 0;
-            }
 
-            pas16->irq_stat |= PAS16_INT_PCM;
-            if (pas16->irq_ena & PAS16_INT_PCM) {
-                pas16_log("pas16_pcm_poll : cause IRQ %i %02X\n", pas16->irq, 1 << pas16->irq);
+        if (pas16->ticks) {
+            for (uint16_t i = 0; i < pas16->ticks; i++)
+                pitf_ctr_clock(pas16->pit, 1);
+
+            pas16->ticks = 0;
+        }
+
+        pas16->irq_stat |= PAS16_INT_SAMP;
+        if (pas16->irq_ena & PAS16_INT_SAMP) {
+            pas16_log("INT SAMP.\n");
+            if (pas16->irq != -1)
+                picint(1 << pas16->irq);
+        }
+
+        pas16_update(pas16);
+    }
+}
+
+static void
+pas16_pit_timer1(const int new_out, UNUSED(int old_out), void *priv)
+{
+    const pitf_t *pit   = (pitf_t * )priv;
+    pas16_t *     pas16 = (pas16_t *) pit->dev_priv;
+
+    if (!pas16->pit->counters[1].gate)
+        return;
+
+    /* At new_out = 0, it's in the counter reload phase. */
+    if ((pas16->pcm_ctrl & PAS16_PCM_ENA) && (pit->counters[1].m & 2) && new_out) {
+        if (pas16->irq_ena & PAS16_INT_PCM) {
+            pas16->irq_stat |= PAS16_INT_PCM;
+            pas16_log("pas16_pcm_poll : cause IRQ %i %02X\n", pas16->irq, 1 << pas16->irq);
+            if (pas16->irq != -1)
                 picint(1 << pas16->irq);
-            }
         }
     }
 }
@@ -665,46 +1883,54 @@ pas16_out_base(UNUSED(uint16_t port), uint8_t val, void *priv)
 {
     pas16_t *pas16 = (pas16_t *) priv;
 
-    io_removehandler((pas16->base - 0x388) + 0x0388, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_removehandler((pas16->base - 0x388) + 0x0788, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_removehandler((pas16->base - 0x388) + 0x0b88, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_removehandler((pas16->base - 0x388) + 0x0f88, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_removehandler((pas16->base - 0x388) + 0x1388, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_removehandler((pas16->base - 0x388) + 0x1788, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_removehandler((pas16->base - 0x388) + 0x2788, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_removehandler((pas16->base - 0x388) + 0x7f88, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_removehandler((pas16->base - 0x388) + 0x8388, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_removehandler((pas16->base - 0x388) + 0xbf88, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_removehandler((pas16->base - 0x388) + 0xe388, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_removehandler((pas16->base - 0x388) + 0xe788, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_removehandler((pas16->base - 0x388) + 0xeb88, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_removehandler((pas16->base - 0x388) + 0xef88, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_removehandler((pas16->base - 0x388) + 0xf388, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_removehandler((pas16->base - 0x388) + 0xf788, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_removehandler((pas16->base - 0x388) + 0xfb88, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_removehandler((pas16->base - 0x388) + 0xff88, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
+    pas16_log("[%04X:%08X] PAS16: [W] %04X = %02X\n", CS, cpu_state.pc, port, val);
 
-    pas16->base = val << 2;
-    pas16_log("pas16_write_base : PAS16 base now at %04X\n", pas16->base);
+    if (pas16->master_ff && (pas16->board_id == pas16->this_id))
+        pas16->new_base = val << 2;
+    else if (!pas16->master_ff)
+        pas16->board_id = val;
 
-    io_sethandler((pas16->base - 0x388) + 0x0388, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_sethandler((pas16->base - 0x388) + 0x0788, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_sethandler((pas16->base - 0x388) + 0x0b88, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_sethandler((pas16->base - 0x388) + 0x0f88, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_sethandler((pas16->base - 0x388) + 0x1388, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_sethandler((pas16->base - 0x388) + 0x1788, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_sethandler((pas16->base - 0x388) + 0x2788, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_sethandler((pas16->base - 0x388) + 0x7f88, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_sethandler((pas16->base - 0x388) + 0x8388, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_sethandler((pas16->base - 0x388) + 0xbf88, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_sethandler((pas16->base - 0x388) + 0xe388, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_sethandler((pas16->base - 0x388) + 0xe788, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_sethandler((pas16->base - 0x388) + 0xeb88, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_sethandler((pas16->base - 0x388) + 0xef88, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_sethandler((pas16->base - 0x388) + 0xf388, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_sethandler((pas16->base - 0x388) + 0xf788, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_sethandler((pas16->base - 0x388) + 0xfb88, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
-    io_sethandler((pas16->base - 0x388) + 0xff88, 0x0004, pas16_in, NULL, NULL, pas16_out, NULL, NULL, pas16);
+    pas16->master_ff = !pas16->master_ff;
+}
+
+static void
+pas16_input_msg(void *priv, uint8_t *msg, uint32_t len)
+{
+    pas16_t  *pas16 = (pas16_t *) priv;
+
+    if (pas16->sysex)
+        return;
+
+    if (pas16->midi_uart_in) {
+        pas16->midi_stat |= 0x04;
+
+        for (uint32_t i = 0; i < len; i++) {
+            pas16->midi_queue[pas16->midi_w++] = msg[i];
+            pas16->midi_w &= 0xff;
+        }
+
+        pas16_update_irq(pas16);
+    }
+}
+
+static int
+pas16_input_sysex(void *priv, uint8_t *buffer, uint32_t len, int abort)
+{
+    pas16_t  *pas16 = (pas16_t *) priv;
+
+    if (abort) {
+        pas16->sysex = 0;
+        return 0;
+    }
+    pas16->sysex = 1;
+    for (uint32_t i = 0; i < len; i++) {
+        if (pas16->midi_r == pas16->midi_w)
+            return (int) (len - i);
+        pas16->midi_queue[pas16->midi_w++] = buffer[i];
+        pas16->midi_w &= 0xff;
+    }
+    pas16->sysex = 0;
+    return 0;
 }
 
 static void
@@ -724,38 +1950,449 @@ pas16_update(pas16_t *pas16)
 }
 
 void
-pas16_get_buffer(int32_t *buffer, int len, void *priv)
+pasplus_get_buffer(int32_t *buffer, int len, void *priv)
 {
-    pas16_t *pas16 = (pas16_t *) priv;
+    pas16_t *          pas16   = (pas16_t *) priv;
+    const nsc_mixer_t *mixer   = &pas16->nsc_mixer;
+    double             bass_treble;
 
-    const int32_t *opl_buf = pas16->opl.update(pas16->opl.priv);
     sb_dsp_update(&pas16->dsp);
     pas16_update(pas16);
-    for (int c = 0; c < len * 2; c++) {
-        buffer[c] += opl_buf[c];
-        buffer[c] += (int16_t) (sb_iir(0, c & 1, (double) pas16->dsp.buffer[c]) / 1.3) / 2;
-        buffer[c] += (pas16->pcm_buffer[c & 1][c >> 1] / 2);
+    for (int c = 0; c < len * 2; c += 2) {
+        double out_l = pas16->dsp.buffer[c];
+        double out_r = pas16->dsp.buffer[c + 1];
+
+        if (pas16->filter) {
+            /* We divide by 3 to get the volume down to normal. */
+            out_l += low_fir_pas16(0, (double) pas16->pcm_buffer[0][c >> 1]) * mixer->pcm_l;
+            out_r += low_fir_pas16(1, (double) pas16->pcm_buffer[1][c >> 1]) * mixer->pcm_r;
+        } else {
+            out_l += ((double) pas16->pcm_buffer[0][c >> 1]) * mixer->pcm_l;
+            out_r += ((double) pas16->pcm_buffer[1][c >> 1]) * mixer->pcm_r;
+        }
+
+        out_l *= mixer->master_l;
+        out_r *= mixer->master_r;
+
+        /* This is not exactly how one does bass/treble controls, but the end result is like it.
+           A better implementation would reduce the CPU usage. */
+        if (mixer->bass != 6) {
+            bass_treble = lmc1982_bass_treble_4bits[mixer->bass];
+
+            if (mixer->bass > 6) {
+                out_l += (low_iir(0, 0, out_l) * bass_treble);
+                out_r += (low_iir(0, 1, out_r) * bass_treble);
+            } else if (mixer->bass < 6) {
+                out_l = (out_l *bass_treble + low_cut_iir(0, 0, out_l) * (1.0 - bass_treble));
+                out_r = (out_r *bass_treble + low_cut_iir(0, 1, out_r) * (1.0 - bass_treble));
+            }
+        }
+
+        if (mixer->treble != 6) {
+            bass_treble = lmc1982_bass_treble_4bits[mixer->treble];
+
+            if (mixer->treble > 6) {
+                out_l += (high_iir(0, 0, out_l) * bass_treble);
+                out_r += (high_iir(0, 1, out_r) * bass_treble);
+            } else if (mixer->treble < 6) {
+                out_l = (out_l *bass_treble + high_cut_iir(0, 0, out_l) * (1.0 - bass_treble));
+                out_r = (out_r *bass_treble + high_cut_iir(0, 1, out_r) * (1.0 - bass_treble));
+            }
+        }
+
+        buffer[c] += (int32_t) out_l;
+        buffer[c + 1] += (int32_t) out_r;
     }
 
     pas16->pos = 0;
-    pas16->opl.reset_buffer(pas16->opl.priv);
     pas16->dsp.pos = 0;
 }
 
-static void *
-pas16_init(UNUSED(const device_t *info))
+void
+pasplus_get_music_buffer(int32_t *buffer, int len, void *priv)
 {
-    pas16_t *pas16 = malloc(sizeof(pas16_t));
-    memset(pas16, 0, sizeof(pas16_t));
+    const pas16_t *    pas16   = (const pas16_t *) priv;
+    const nsc_mixer_t *mixer   = &pas16->nsc_mixer;
+    const int32_t *    opl_buf = pas16->opl.update(pas16->opl.priv);
+    double             bass_treble;
 
+    for (int c = 0; c < len * 2; c += 2) {
+        double out_l = (((double) opl_buf[c]) * mixer->fm_l) * 0.7171630859375;
+        double out_r = (((double) opl_buf[c + 1]) * mixer->fm_r) * 0.7171630859375;
+
+        /* TODO: recording CD, Mic with AGC or line in. Note: mic volume does not affect recording. */
+        out_l *= mixer->master_l;
+        out_r *= mixer->master_r;
+
+        /* This is not exactly how one does bass/treble controls, but the end result is like it.
+           A better implementation would reduce the CPU usage. */
+        if (mixer->bass != 6) {
+            bass_treble = lmc1982_bass_treble_4bits[mixer->bass];
+
+            if (mixer->bass > 6) {
+                out_l += (low_iir(1, 0, out_l) * bass_treble);
+                out_r += (low_iir(1, 1, out_r) * bass_treble);
+            } else if (mixer->bass < 6) {
+                out_l = (out_l *bass_treble + low_cut_iir(1, 0, out_l) * (1.0 - bass_treble));
+                out_r = (out_r *bass_treble + low_cut_iir(1, 1, out_r) * (1.0 - bass_treble));
+            }
+        }
+
+        if (mixer->treble != 6) {
+            bass_treble = lmc1982_bass_treble_4bits[mixer->treble];
+
+            if (mixer->treble > 6) {
+                out_l += (high_iir(1, 0, out_l) * bass_treble);
+                out_r += (high_iir(1, 1, out_r) * bass_treble);
+            } else if (mixer->treble < 6) {
+                out_l = (out_l *bass_treble + high_cut_iir(1, 0, out_l) * (1.0 - bass_treble));
+                out_r = (out_r *bass_treble + high_cut_iir(1, 1, out_r) * (1.0 - bass_treble));
+            }
+        }
+
+        buffer[c] += (int32_t) out_l;
+        buffer[c + 1] += (int32_t) out_r;
+    }
+
+    pas16->opl.reset_buffer(pas16->opl.priv);
+}
+
+void
+pasplus_filter_cd_audio(int channel, double *buffer, void *priv)
+{
+    const pas16_t *    pas16  = (const pas16_t *) priv;
+    const nsc_mixer_t *mixer  = &pas16->nsc_mixer;
+    const double       cd     = channel ? mixer->cd_r : mixer->cd_l;
+    const double       master = channel ? mixer->master_r : mixer->master_l;
+    const int32_t      bass   = mixer->bass;
+    const int32_t      treble = mixer->treble;
+    double             c      = (*buffer) * cd * master;
+    double             bass_treble;
+
+    /* This is not exactly how one does bass/treble controls, but the end result is like it.
+       A better implementation would reduce the CPU usage. */
+    if (bass != 6) {
+        bass_treble = lmc1982_bass_treble_4bits[bass];
+
+        if (bass > 6)
+            c += (low_iir(2, channel, c) * bass_treble);
+        else
+            c = (c * bass_treble + low_cut_iir(2, channel, c) * (1.0 - bass_treble));
+    }
+
+    if (treble != 6) {
+        bass_treble = lmc1982_bass_treble_4bits[treble];
+
+        if (treble > 6)
+            c += (high_iir(2, channel, c) * bass_treble);
+        else
+            c = (c * bass_treble + high_cut_iir(2, channel, c) * (1.0 - bass_treble));
+    }
+
+    *buffer = c;
+}
+
+void
+pasplus_filter_pc_speaker(int channel, double *buffer, void *priv)
+{
+    const pas16_t *    pas16  =  (pas16_t *) priv;
+    const nsc_mixer_t *mixer  = &pas16->nsc_mixer;
+    const double       spk    = channel ? mixer->speaker_r : mixer->speaker_l;
+    const double       master = channel ? mixer->master_r : mixer->master_l;
+    const int32_t      bass   = mixer->bass;
+    const int32_t      treble = mixer->treble;
+    double             c      = (*buffer) * spk * master;
+    double             bass_treble;
+
+    /* This is not exactly how one does bass/treble controls, but the end result is like it.
+       A better implementation would reduce the CPU usage. */
+    if (bass != 6) {
+        bass_treble = lmc1982_bass_treble_4bits[bass];
+
+        if (bass > 6)
+            c += (low_iir(3, channel, c) * bass_treble);
+        else
+            c = (c * bass_treble + low_cut_iir(3, channel, c) * (1.0 - bass_treble));
+    }
+
+    if (treble != 6) {
+        bass_treble = lmc1982_bass_treble_4bits[treble];
+
+        if (treble > 6)
+            c += (high_iir(3, channel, c) * bass_treble);
+        else
+            c = (c * bass_treble + high_cut_iir(3, channel, c) * (1.0 - bass_treble));
+    }
+
+    *buffer = c;
+}
+
+void
+pas16_get_buffer(int32_t *buffer, int len, void *priv)
+{
+    pas16_t *            pas16 =  (pas16_t *) priv;
+    const mv508_mixer_t *mixer   = &pas16->mv508_mixer;
+    double               bass_treble;
+
+    sb_dsp_update(&pas16->dsp);
+    pas16_update(pas16);
+    for (int c = 0; c < len * 2; c += 2) {
+        double out_l = (pas16->dsp.buffer[c] * mixer->sb_l) / 3.0;
+        double out_r = (pas16->dsp.buffer[c + 1] * mixer->sb_r) / 3.0;
+
+        if (pas16->filter) {
+            /* We divide by 3 to get the volume down to normal. */
+            out_l += (low_fir_pas16(0, (double) pas16->pcm_buffer[0][c >> 1]) * mixer->pcm_l) / 3.0;
+            out_r += (low_fir_pas16(1, (double) pas16->pcm_buffer[1][c >> 1]) * mixer->pcm_r) / 3.0;
+        } else {
+            out_l += (((double) pas16->pcm_buffer[0][c >> 1]) * mixer->pcm_l) / 3.0;
+            out_r += (((double) pas16->pcm_buffer[1][c >> 1]) * mixer->pcm_r) / 3.0;
+        }
+
+        out_l *= mixer->master_l;
+        out_r *= mixer->master_r;
+
+        /* This is not exactly how one does bass/treble controls, but the end result is like it.
+           A better implementation would reduce the CPU usage. */
+        if (mixer->bass != 6) {
+            bass_treble = lmc1982_bass_treble_4bits[mixer->bass];
+
+            if (mixer->bass > 6) {
+                out_l += (low_iir(0, 0, out_l) * bass_treble);
+                out_r += (low_iir(0, 1, out_r) * bass_treble);
+            } else if (mixer->bass < 6) {
+                out_l = (out_l *bass_treble + low_cut_iir(0, 0, out_l) * (1.0 - bass_treble));
+                out_r = (out_r *bass_treble + low_cut_iir(0, 1, out_r) * (1.0 - bass_treble));
+            }
+        }
+
+        if (mixer->treble != 6) {
+            bass_treble = lmc1982_bass_treble_4bits[mixer->treble];
+
+            if (mixer->treble > 6) {
+                out_l += (high_iir(0, 0, out_l) * bass_treble);
+                out_r += (high_iir(0, 1, out_r) * bass_treble);
+            } else if (mixer->treble < 6) {
+                out_l = (out_l *bass_treble + high_cut_iir(0, 0, out_l) * (1.0 - bass_treble));
+                out_r = (out_r *bass_treble + high_cut_iir(0, 1, out_r) * (1.0 - bass_treble));
+            }
+        }
+
+        buffer[c] += (int32_t) out_l;
+        buffer[c + 1] += (int32_t) out_r;
+    }
+
+    pas16->pos = 0;
+    pas16->dsp.pos = 0;
+}
+
+void
+pas16_get_music_buffer(int32_t *buffer, int len, void *priv)
+{
+    const pas16_t *      pas16   = (const pas16_t *) priv;
+    const mv508_mixer_t *mixer   = &pas16->mv508_mixer;
+    const int32_t *      opl_buf = pas16->opl.update(pas16->opl.priv);
+    double               bass_treble;
+
+    for (int c = 0; c < len * 2; c += 2) {
+        double out_l = (((double) opl_buf[c]) * mixer->fm_l) * 0.7171630859375;
+        double out_r = (((double) opl_buf[c + 1]) * mixer->fm_r) * 0.7171630859375;
+
+        /* TODO: recording CD, Mic with AGC or line in. Note: mic volume does not affect recording. */
+        out_l *= mixer->master_l;
+        out_r *= mixer->master_r;
+
+        /* This is not exactly how one does bass/treble controls, but the end result is like it.
+           A better implementation would reduce the CPU usage. */
+        if (mixer->bass != 6) {
+            bass_treble = lmc1982_bass_treble_4bits[mixer->bass];
+
+            if (mixer->bass > 6) {
+                out_l += (low_iir(1, 0, out_l) * bass_treble);
+                out_r += (low_iir(1, 1, out_r) * bass_treble);
+            } else if (mixer->bass < 6) {
+                out_l = (out_l *bass_treble + low_cut_iir(1, 0, out_l) * (1.0 - bass_treble));
+                out_r = (out_r *bass_treble + low_cut_iir(1, 1, out_r) * (1.0 - bass_treble));
+            }
+        }
+
+        if (mixer->treble != 6) {
+            bass_treble = lmc1982_bass_treble_4bits[mixer->treble];
+
+            if (mixer->treble > 6) {
+                out_l += (high_iir(1, 0, out_l) * bass_treble);
+                out_r += (high_iir(1, 1, out_r) * bass_treble);
+            } else if (mixer->treble < 6) {
+                out_l = (out_l *bass_treble + high_cut_iir(1, 0, out_l) * (1.0 - bass_treble));
+                out_r = (out_r *bass_treble + high_cut_iir(1, 1, out_r) * (1.0 - bass_treble));
+            }
+        }
+
+        buffer[c] += (int32_t) out_l;
+        buffer[c + 1] += (int32_t) out_r;
+    }
+
+    pas16->opl.reset_buffer(pas16->opl.priv);
+}
+
+void
+pas16_filter_cd_audio(int channel, double *buffer, void *priv)
+{
+    const pas16_t *      pas16  = (const pas16_t *) priv;
+    const mv508_mixer_t *mixer  = &pas16->mv508_mixer;
+    const double         cd     = channel ? mixer->cd_r : mixer->cd_l;
+    const double         master = channel ? mixer->master_r : mixer->master_l;
+    const int32_t        bass   = mixer->bass;
+    const int32_t        treble = mixer->treble;
+    double               c      = (((*buffer) * cd) / 3.0) * master;
+    double               bass_treble;
+
+    /* This is not exactly how one does bass/treble controls, but the end result is like it.
+       A better implementation would reduce the CPU usage. */
+    if (bass != 6) {
+        bass_treble = lmc1982_bass_treble_4bits[bass];
+
+        if (bass > 6)
+            c += (low_iir(2, channel, c) * bass_treble);
+        else
+            c = (c * bass_treble + low_cut_iir(2, channel, c) * (1.0 - bass_treble));
+    }
+
+    if (treble != 6) {
+        bass_treble = lmc1982_bass_treble_4bits[treble];
+
+        if (treble > 6)
+            c += (high_iir(2, channel, c) * bass_treble);
+        else
+            c = (c * bass_treble + high_cut_iir(2, channel, c) * (1.0 - bass_treble));
+    }
+
+    *buffer = c;
+}
+
+void
+pas16_filter_pc_speaker(int channel, double *buffer, void *priv)
+{
+    const pas16_t *      pas16  = (const pas16_t *) priv;
+    const mv508_mixer_t *mixer  = &pas16->mv508_mixer;
+    const double         spk    = channel ? mixer->speaker_r : mixer->speaker_l;
+    const double         master = channel ? mixer->master_r : mixer->master_l;
+    const int32_t        bass   = mixer->bass;
+    const int32_t        treble = mixer->treble;
+    double               c      = (((*buffer) * spk) / 3.0) * master;
+    double               bass_treble;
+
+    /* This is not exactly how one does bass/treble controls, but the end result is like it.
+       A better implementation would reduce the CPU usage. */
+    if (bass != 6) {
+        bass_treble = lmc1982_bass_treble_4bits[bass];
+
+        if (bass > 6)
+            c += (low_iir(3, channel, c) * bass_treble);
+        else
+            c = (c * bass_treble + low_cut_iir(3, channel, c) * (1.0 - bass_treble));
+    }
+
+    if (treble != 6) {
+        bass_treble = lmc1982_bass_treble_4bits[treble];
+
+        if (treble > 6)
+            c += (high_iir(3, channel, c) * bass_treble);
+        else
+            c = (c * bass_treble + high_cut_iir(3, channel, c) * (1.0 - bass_treble));
+    }
+
+    *buffer = c;
+}
+
+static void
+pas16_speed_changed(void *priv)
+{
+    pas16_change_pit_clock_speed(priv);
+}
+
+static void *
+pas16_init(const device_t *info)
+{
+    pas16_t *pas16 = calloc(1, sizeof(pas16_t));
+
+    if (pas16_next > 3) {
+        fatal("Attempting to add a Pro Audio Spectrum instance beyond the maximum amount\n");
+
+        free(pas16);
+        return NULL;
+    }
+
+    pas16->type = info->local & 0xff;
+    pas16->has_scsi = (!pas16->type) || (pas16->type == 0x0f);
     fm_driver_get(FM_YMF262, &pas16->opl);
-    sb_dsp_init(&pas16->dsp, SB2, SB_SUBTYPE_DEFAULT, pas16);
+    sb_dsp_set_real_opl(&pas16->dsp, 1);
+    sb_dsp_init(&pas16->dsp, SB_DSP_201, SB_SUBTYPE_DEFAULT, pas16);
+    pas16->mpu = (mpu_t *) calloc(1, sizeof(mpu_t));
+    mpu401_init(pas16->mpu, 0, 0, M_UART, device_get_config_int("receive_input401"));
+    sb_dsp_set_mpu(&pas16->dsp, pas16->mpu);
+
+    pas16->sb_compat_base = 0x0000;
 
     io_sethandler(0x9a01, 0x0001, NULL, NULL, NULL, pas16_out_base, NULL, NULL, pas16);
+    pas16->this_id = 0xbc + pas16_next;
 
-    timer_add(&pas16->pit.timer[0], pas16_pcm_poll, pas16, 0);
+    if (pas16->has_scsi) {
+        pas16->scsi = device_add(&scsi_pas_device);
+        timer_add(&pas16->scsi->timer, pas16_scsi_callback, pas16, 0);
+        timer_add(&pas16->scsi_timer, pas16_timeout_callback, pas16, 0);
+        other_scsi_present++;
+    }
 
-    sound_add_handler(pas16_get_buffer, pas16);
+    pas16->pit = device_add(&i8254_ext_io_fast_device);
+    pas16_reset(pas16);
+    pas16->pit->dev_priv = pas16;
+    pas16->irq = pas16->type ? 10 : 5;
+    pas16->io_conf_3 = pas16->type ? 0x07 : 0x04;
+    if (pas16->has_scsi) {
+        pas16->scsi_irq = pas16->type ? 11 : 7;
+        pas16->io_conf_3 |= (pas16->type ? 0x80 : 0x60);
+        ncr5380_set_irq(&pas16->scsi->ncr, pas16->scsi_irq);
+    }
+    pas16->dma = 3;
+    for (uint8_t i = 0; i < 3; i++)
+        pitf_ctr_set_gate(pas16->pit, i, 0);
+
+    pitf_ctr_set_out_func(pas16->pit, 0, pas16_pit_timer0);
+    pitf_ctr_set_out_func(pas16->pit, 1, pas16_pit_timer1);
+    pitf_ctr_set_using_timer(pas16->pit, 0, 1);
+    pitf_ctr_set_using_timer(pas16->pit, 1, 0);
+    pitf_ctr_set_using_timer(pas16->pit, 2, 0);
+
+    if (pas16->type) {
+        sound_add_handler(pas16_get_buffer, pas16);
+        music_add_handler(pas16_get_music_buffer, pas16);
+        sound_set_cd_audio_filter(pas16_filter_cd_audio, pas16);
+        if (device_get_config_int("control_pc_speaker"))
+            sound_set_pc_speaker_filter(pas16_filter_pc_speaker, pas16);
+    } else {
+        sound_add_handler(pasplus_get_buffer, pas16);
+        music_add_handler(pasplus_get_music_buffer, pas16);
+        sound_set_cd_audio_filter(pasplus_filter_cd_audio, pas16);
+        if (device_get_config_int("control_pc_speaker"))
+            sound_set_pc_speaker_filter(pasplus_filter_pc_speaker, pas16);
+    }
+
+    if (device_get_config_int("receive_input"))
+        midi_in_handler(1, pas16_input_msg, pas16_input_sysex, pas16);
+
+    for (uint8_t i = 0; i < 16; i++) {
+        if (i < 6)
+            lmc1982_bass_treble_4bits[i] = pow(10.0, (-((double) (12 - (i << 1))) / 10.0));
+        else if (i == 6)
+            lmc1982_bass_treble_4bits[i] = 0.0;
+        else if ((i > 6) && (i <= 12))
+            lmc1982_bass_treble_4bits[i] = 1.0 - pow(10.0, ((double) ((i - 6) << 1) / 10.0));
+        else
+            lmc1982_bass_treble_4bits[i] = 1.0 - pow(10.0, 1.2);
+    }
+
+    pas16_next++;
 
     return pas16;
 }
@@ -766,18 +2403,85 @@ pas16_close(void *priv)
     pas16_t *pas16 = (pas16_t *) priv;
 
     free(pas16);
+
+    pas16_next = 0;
 }
 
-const device_t pas16_device = {
-    .name          = "Pro Audio Spectrum 16",
-    .internal_name = "pas16",
+static const device_config_t pas16_config[] = {
+    {
+        .name           = "control_pc_speaker",
+        .description    = "Control PC speaker",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "receive_input401",
+        .description    = "Receive MIDI input (MPU-401)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+const device_t pasplus_device = {
+    .name          = "Pro Audio Spectrum Plus",
+    .internal_name = "pasplus",
     .flags         = DEVICE_ISA,
     .local         = 0,
     .init          = pas16_init,
     .close         = pas16_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
+    .reset         = pas16_reset,
+    .available     = NULL,
+    .speed_changed = pas16_speed_changed,
     .force_redraw  = NULL,
-    .config        = NULL
+    .config        = pas16_config
+};
+
+const device_t pas16_device = {
+    .name          = "Pro Audio Spectrum 16",
+    .internal_name = "pas16",
+    .flags         = DEVICE_ISA16,
+    .local         = 0x0f,
+    .init          = pas16_init,
+    .close         = pas16_close,
+    .reset         = pas16_reset,
+    .available     = NULL,
+    .speed_changed = pas16_speed_changed,
+    .force_redraw  = NULL,
+    .config        = pas16_config
+};
+
+const device_t pas16d_device = {
+    .name          = "Pro Audio Spectrum 16D",
+    .internal_name = "pas16d",
+    .flags         = DEVICE_ISA16,
+    .local         = 0x0c,
+    .init          = pas16_init,
+    .close         = pas16_close,
+    .reset         = pas16_reset,
+    .available     = NULL,
+    .speed_changed = pas16_speed_changed,
+    .force_redraw  = NULL,
+    .config        = pas16_config
 };
diff --git a/src/sound/snd_ps1.c b/src/sound/snd_ps1.c
index 60b4515f8..15cad0051 100644
--- a/src/sound/snd_ps1.c
+++ b/src/sound/snd_ps1.c
@@ -166,8 +166,7 @@ ps1snd_get_buffer(int32_t *buffer, int len, void *priv)
 static void *
 ps1snd_init(UNUSED(const device_t *info))
 {
-    ps1snd_t *ps1snd = malloc(sizeof(ps1snd_t));
-    memset(ps1snd, 0x00, sizeof(ps1snd_t));
+    ps1snd_t *ps1snd = calloc(1, sizeof(ps1snd_t));
 
     sn76489_init(&ps1snd->sn76489, 0x0205, 0x0001, SN76496, 4000000);
 
@@ -203,7 +202,7 @@ const device_t ps1snd_device = {
     .init          = ps1snd_init,
     .close         = ps1snd_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sound/snd_pssj.c b/src/sound/snd_pssj.c
index 1e6f48ae3..7de8ec824 100644
--- a/src/sound/snd_pssj.c
+++ b/src/sound/snd_pssj.c
@@ -193,8 +193,7 @@ pssj_get_buffer(int32_t *buffer, int len, void *priv)
 void *
 pssj_init(UNUSED(const device_t *info))
 {
-    pssj_t *pssj = malloc(sizeof(pssj_t));
-    memset(pssj, 0, sizeof(pssj_t));
+    pssj_t *pssj = calloc(1, sizeof(pssj_t));
 
     sn76489_init(&pssj->sn76489, 0x00c0, 0x0004, PSSJ, 3579545);
 
@@ -208,8 +207,7 @@ pssj_init(UNUSED(const device_t *info))
 void *
 pssj_1e0_init(UNUSED(const device_t *info))
 {
-    pssj_t *pssj = malloc(sizeof(pssj_t));
-    memset(pssj, 0, sizeof(pssj_t));
+    pssj_t *pssj = calloc(1, sizeof(pssj_t));
 
     sn76489_init(&pssj->sn76489, 0x01e0, 0x0004, PSSJ, 3579545);
 
@@ -223,8 +221,7 @@ pssj_1e0_init(UNUSED(const device_t *info))
 void *
 pssj_isa_init(UNUSED(const device_t *info))
 {
-    pssj_t *pssj = malloc(sizeof(pssj_t));
-    memset(pssj, 0, sizeof(pssj_t));
+    pssj_t *pssj = calloc(1, sizeof(pssj_t));
 
     uint16_t addr = device_get_config_hex16("base");
 
@@ -248,40 +245,23 @@ pssj_close(void *priv)
 static const device_config_t pssj_isa_config[] = {
   // clang-format off
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x2C0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "0x0C0",
-                .value = 0x0C0
-            },
-            {
-                .description = "0x0E0",
-                .value = 0x0E0
-            },
-            {
-                .description = "0x1C0",
-                .value = 0x1C0
-            },
-            {
-                .description = "0x1E0",
-                .value = 0x1E0
-            },
-            {
-                .description = "0x2C0",
-                .value = 0x2C0
-            },
-            {
-                .description = "0x2E0",
-                .value = 0x2E0
-            },
-            { .description = "" }
-        }
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x2C0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x0C0", .value = 0x0C0 },
+            { .description = "0x0E0", .value = 0x0E0 },
+            { .description = "0x1C0", .value = 0x1C0 },
+            { .description = "0x1E0", .value = 0x1E0 },
+            { .description = "0x2C0", .value = 0x2C0 },
+            { .description = "0x2E0", .value = 0x2E0 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -295,7 +275,7 @@ const device_t pssj_device = {
     .init          = pssj_init,
     .close         = pssj_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -309,7 +289,7 @@ const device_t pssj_1e0_device = {
     .init          = pssj_1e0_init,
     .close         = pssj_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -323,7 +303,7 @@ const device_t pssj_isa_device = {
     .init          = pssj_isa_init,
     .close         = pssj_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = pssj_isa_config
diff --git a/src/sound/snd_resid.cc b/src/sound/snd_resid.cc
deleted file mode 100644
index 94bbcd591..000000000
--- a/src/sound/snd_resid.cc
+++ /dev/null
@@ -1,134 +0,0 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "resid-fp/sid.h"
-#include <86box/plat.h>
-#include <86box/snd_resid.h>
-
-#define RESID_FREQ 48000
-
-typedef struct psid_t {
-    /* resid sid implementation */
-    SIDFP  *sid;
-    int16_t last_sample;
-} psid_t;
-
-psid_t *psid;
-
-void *
-sid_init(void)
-{
-#if 0
-    psid_t *psid;
-#endif
-    sampling_method method         = SAMPLE_INTERPOLATE;
-    float           cycles_per_sec = 14318180.0 / 16.0;
-
-    psid = new psid_t;
-#if 0
-    psid = (psid_t *)malloc(sizeof(sound_t));
-#endif
-    psid->sid = new SIDFP;
-
-    psid->sid->set_chip_model(MOS8580FP);
-
-    psid->sid->set_voice_nonlinearity(1.0f);
-    psid->sid->get_filter().set_distortion_properties(0.f, 0.f, 0.f);
-    psid->sid->get_filter().set_type4_properties(6.55f, 20.0f);
-
-    psid->sid->enable_filter(true);
-    psid->sid->enable_external_filter(true);
-
-    psid->sid->reset();
-
-    for (uint8_t c = 0; c < 32; c++)
-        psid->sid->write(c, 0);
-
-    if (!psid->sid->set_sampling_parameters(cycles_per_sec, method,
-                                            (float) RESID_FREQ, 0.9 * (float) RESID_FREQ / 2.0)) {
-#if 0
-        printf("reSID failed!\n");
-#endif
-    }
-
-    psid->sid->set_chip_model(MOS6581FP);
-    psid->sid->set_voice_nonlinearity(0.96f);
-    psid->sid->get_filter().set_distortion_properties(3.7e-3f, 2048.f, 1.2e-4f);
-
-    psid->sid->input(0);
-    psid->sid->get_filter().set_type3_properties(1.33e6f, 2.2e9f, 1.0056f, 7e3f);
-
-    return (void *) psid;
-}
-
-void
-sid_close(UNUSED(void *priv))
-{
-#if 0
-    psid_t *psid = (psid_t *) priv;
-#endif
-    delete psid->sid;
-#if 0
-    free(psid);
-#endif
-}
-
-void
-sid_reset(UNUSED(void *priv))
-{
-#if 0
-    psid_t *psid = (psid_t *) priv;
-#endif
-
-    psid->sid->reset();
-
-    for (uint8_t c = 0; c < 32; c++)
-        psid->sid->write(c, 0);
-}
-
-uint8_t
-sid_read(uint16_t addr, UNUSED(void *priv))
-{
-#if 0
-    psid_t *psid = (psid_t *) priv;
-#endif
-
-    return psid->sid->read(addr & 0x1f);
-#if 0
-    return 0xFF;
-#endif
-}
-
-void
-sid_write(uint16_t addr, uint8_t val, UNUSED(void *priv))
-{
-#if 0
-    psid_t *psid = (psid_t *) priv;
-#endif
-
-    psid->sid->write(addr & 0x1f, val);
-}
-
-#define CLOCK_DELTA(n) (int) (((14318180.0 * n) / 16.0) / (float) RESID_FREQ)
-
-static void
-fillbuf2(int &count, int16_t *buf, int len)
-{
-    int c;
-    c = psid->sid->clock(count, buf, len, 1);
-    if (!c)
-        *buf = psid->last_sample;
-    psid->last_sample = *buf;
-}
-void
-sid_fillbuf(int16_t *buf, int len, UNUSED(void *priv))
-{
-#if 0
-    psid_t *psid = (psid_t *) priv;
-#endif
-    int x = CLOCK_DELTA(len);
-
-    fillbuf2(x, buf, len);
-}
diff --git a/src/sound/snd_resid.cpp b/src/sound/snd_resid.cpp
new file mode 100644
index 000000000..3dda5363b
--- /dev/null
+++ b/src/sound/snd_resid.cpp
@@ -0,0 +1,109 @@
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "resid-fp/sid.h"
+#include <86box/plat.h>
+#include <86box/snd_resid.h>
+
+#define RESID_FREQ 48000
+
+using reSIDfp::SID;
+
+typedef struct psid_t {
+    /* resid sid implementation */
+    SID    *sid;
+    int16_t last_sample;
+} psid_t;
+
+psid_t *psid;
+
+void *
+sid_init(uint8_t type, double range)
+{
+    reSIDfp::SamplingMethod method         = reSIDfp::RESAMPLE;
+    float                   cycles_per_sec = 14318180.0 / 16.0;
+
+    psid      = new psid_t;
+    psid->sid = new SID;
+	psid->sid->setFilter6581Range(range);
+	psid->sid->reset();
+    switch (type) {
+        default:
+		    psid->sid->setChipModel(reSIDfp::MOS6581);
+			break;
+        case 0:
+            psid->sid->setChipModel(reSIDfp::MOS6581);
+			break;
+        case 1:
+            psid->sid->setChipModel(reSIDfp::MOS8580);
+			break;
+    }
+
+
+
+    for (uint8_t c = 0; c < 32; c++)
+        psid->sid->write(c, 0);
+
+    try {
+        psid->sid->setSamplingParameters(cycles_per_sec, method, (float) RESID_FREQ);
+    } catch (reSIDfp::SIDError) {
+#if 0
+        printf("reSID failed!\n");
+#endif
+    }
+
+    psid->sid->input(0);
+
+    return (void *) psid;
+}
+
+void
+sid_close(UNUSED(void *priv))
+{
+    delete psid->sid;
+#if 0
+    free(psid);
+#endif
+}
+
+void
+sid_reset(UNUSED(void *priv))
+{
+    psid->sid->reset();
+
+    for (uint8_t c = 0; c < 32; c++)
+        psid->sid->write(c, 0);
+}
+
+uint8_t
+sid_read(uint16_t addr, UNUSED(void *priv))
+{
+    return psid->sid->read(addr & 0x1f);
+}
+
+void
+sid_write(uint16_t addr, uint8_t val, UNUSED(void *priv))
+{
+    psid->sid->write(addr & 0x1f, val);
+}
+
+#define CLOCK_DELTA(n) (int) (((14318180.0 * n) / 16.0) / (float) RESID_FREQ)
+
+static void
+fillbuf2(int &count, int16_t *buf, UNUSED(int len))
+{
+    int c = psid->sid->clock(count, buf);
+
+    if (!c)
+        *buf = psid->last_sample;
+    psid->last_sample = *buf;
+}
+void
+sid_fillbuf(int16_t *buf, int len, UNUSED(void *priv))
+{
+    int x = CLOCK_DELTA(len);
+
+    fillbuf2(x, buf, len);
+}
\ No newline at end of file
diff --git a/src/sound/snd_sb.c b/src/sound/snd_sb.c
index 3aa152b8f..f041ebb8c 100644
--- a/src/sound/snd_sb.c
+++ b/src/sound/snd_sb.c
@@ -1,21 +1,21 @@
 /*
- * 86Box     A hypervisor and IBM PC system emulator that specializes in
- *           running old operating systems and software designed for IBM
- *           PC systems and compatibles from 1981 through fairly recent
- *           system designs based on the PCI bus.
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
  *
- *           This file is part of the 86Box distribution.
+ *          This file is part of the 86Box distribution.
  *
- *           Sound Blaster emulation.
+ *          Sound Blaster emulation.
  *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *          TheCollector1995, <mariogplayer@gmail.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
- *
- * Authors:  Sarah Walker, <https://pcem-emulator.co.uk/>
- *           Miran Grca, <mgrca8@gmail.com>
- *           TheCollector1995, <mariogplayer@gmail.com>
- *
- *           Copyright 2008-2020 Sarah Walker.
- *           Copyright 2016-2020 Miran Grca.
+ *          Copyright 2008-2020 Sarah Walker.
+ *          Copyright 2016-2020 Miran Grca.
+ *          Copyright 2024-2025 Jasmine Iwanek.
  */
 #include <stdarg.h>
 #include <stdint.h>
@@ -39,10 +39,46 @@
 #include <86box/pic.h>
 #include <86box/rom.h>
 #include <86box/sound.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/snd_sb.h>
 #include <86box/plat_unused.h>
 
+#define SB_1  0
+#define SB_15 1
+#define SB_2  2
+
+#define SB_16_PNP_NOIDE 0
+#define SB_16_PNP_IDE   1
+
+#define SB_VIBRA16XV 0
+#define SB_VIBRA16C  1
+#define SB_VIBRA16CL  2
+
+#define SB_32_PNP      0
+#define SB_AWE32_PNP   1
+#define SB_AWE64_VALUE 2
+#define SB_AWE64_NOIDE 3
+#define SB_AWE64_IDE   4
+#define SB_AWE64_GOLD  5
+
+#define PNP_ROM_SB_16_PNP_NOIDE "roms/sound/creative/CT2941 PnP.BIN"
+#define PNP_ROM_SB_16_PNP_IDE   "roms/sound/creative/CTL0024A.BIN" /* CT2940 */
+#define PNP_ROM_SB_VIBRA16C     "roms/sound/creative/CT4180 PnP.BIN"
+#define PNP_ROM_SB_VIBRA16CL    "roms/sound/creative/CT4100 PnP.BIN"
+#define PNP_ROM_SB_VIBRA16XV    "roms/sound/creative/CT4170 PnP.BIN"
+#define PNP_ROM_SB_GOLDFINCH    "roms/sound/creative/CT1920 PnP.BIN"
+#define PNP_ROM_SB_32_PNP       "roms/sound/creative/CT3600 PnP.BIN"
+#define PNP_ROM_SB_AWE32_PNP    "roms/sound/creative/CT3980 PnP.BIN"
+#define PNP_ROM_SB_AWE64_VALUE  "roms/sound/creative/CT4520 PnP.BIN"
+#define PNP_ROM_SB_AWE64_NOIDE  "roms/sound/creative/CT4380 PnP noIDE.BIN"
+#define PNP_ROM_SB_AWE64_IDE    "roms/sound/creative/CTL009DA.BIN" /* CT4381? */
+#define PNP_ROM_SB_AWE64_GOLD   "roms/sound/creative/CT4540 PnP.BIN"
+/* TODO: Find real ESS PnP ROM dumps. */
+#define PNP_ROM_ESS0100         "roms/sound/ess/ESS0100.BIN"
+#define PNP_ROM_ESS0102         "roms/sound/ess/ESS0102.BIN"
+#define PNP_ROM_ESS0968         "roms/sound/ess/ESS0968.BIN"
+
 /* 0 to 7 -> -14dB to 0dB i 2dB steps. 8 to 15 -> 0 to +14dB in 2dB steps.
    Note that for positive dB values, this is not amplitude, it is amplitude - 1. */
 static const double sb_bass_treble_4bits[] = {
@@ -67,97 +103,30 @@ static const double sb_att_4dbstep_3bits[] = {
 static const double sb_att_7dbstep_2bits[] = {
       164.0,  6537.0, 14637.0, 32767.0
 };
+
+/* Attenuation table for ESS 4-bit microphone volume.
+ * The last step is a jump to -48 dB. */
+static const double sb_att_1p4dbstep_4bits[] = {
+      164.0,  3431.0,  4031.0,  4736.0,  5565.0,  6537.0,  7681.0,  9025.0,
+    10603.0, 12458.0, 14637.0, 17196.0, 20204.0, 23738.0, 27889.0, 32767.0
+};
+
+/* Attenuation table for ESS 4-bit mixer volume.
+ * The last step is a jump to -48 dB. */
+static const double sb_att_2dbstep_4bits[] = {
+      164.0,  1304.0,  1641.0,  2067.0,  2602.0,  3276.0,  4125.0,  5192.0,
+     6537.0,  8230.0, 10362.0, 13044.0, 16422.0, 20674.0, 26027.0, 32767.0
+};
+
+/* Attenuation table for ESS 3-bit PC speaker volume. */
+static const double sb_att_3dbstep_3bits[] = {
+        0.0,  4125.0,  5826.0,  8230.0, 11626.0, 16422.0, 23197.0, 32767.0
+};
 // clang-format on
 
 static const uint16_t sb_mcv_addr[8]     = { 0x200, 0x210, 0x220, 0x230, 0x240, 0x250, 0x260, 0x270 };
 static const int      sb_pro_mcv_irqs[4] = { 7, 5, 3, 3 };
 
-/* Each card in the SB16 family has a million variants, and it shows in the large variety of device IDs for the PnP models.
-   This ROM was reconstructed in a best-effort basis around a pnpdump output log found in a forum. */
-static uint8_t sb_16_pnp_rom[] = {
-    // clang-format off
-    0x0e, 0x8c, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, /* CTL0024, dummy checksum (filled in by isapnp_add_card) */
-    0x0a, 0x10, 0x10, /* PnP version 1.0, vendor version 1.0 */
-    0x82, 0x11, 0x00, 'C', 'r', 'e', 'a', 't', 'i', 'v', 'e', ' ', 'S', 'B', '1', '6', ' ', 'P', 'n', 'P', /* ANSI identifier */
-
-    0x16, 0x0e, 0x8c, 0x00, 0x31, 0x00, 0x65, /* logical device CTL0031, supports vendor-specific registers 0x39/0x3A/0x3D/0x3F */
-    0x82, 0x05, 0x00, 'A', 'u', 'd', 'i', 'o', /* ANSI identifier */
-    0x31, 0x00, /* start dependent functions, preferred */
-        0x22, 0x20, 0x00, /* IRQ 5 */
-        0x2a, 0x02, 0x08, /* DMA 1, compatibility, no count by word, count by byte, not bus master, 8-bit only */
-        0x2a, 0x20, 0x12, /* DMA 5, compatibility, count by word, no count by byte, not bus master, 16-bit only */
-        0x47, 0x01, 0x20, 0x02, 0x20, 0x02, 0x01, 0x10, /* I/O 0x220, decodes 16-bit, 1-byte alignment, 16 addresses */
-        0x47, 0x01, 0x30, 0x03, 0x30, 0x03, 0x01, 0x02, /* I/O 0x330, decodes 16-bit, 1-byte alignment, 2 addresses */
-        0x47, 0x01, 0x88, 0x03, 0x88, 0x03, 0x01, 0x04, /* I/O 0x388, decodes 16-bit, 1-byte alignment, 4 addresses */
-    0x31, 0x01, /* start dependent functions, acceptable */
-        0x22, 0xa0, 0x04, /* IRQ 5/7/10 */
-        0x2a, 0x0b, 0x08, /* DMA 0/1/3, compatibility, no count by word, count by byte, not bus master, 8-bit only */
-        0x2a, 0xe0, 0x12, /* DMA 5/6/7, compatibility, count by word, no count by byte, not bus master, 16-bit only */
-        0x47, 0x01, 0x20, 0x02, 0x80, 0x02, 0x20, 0x10, /* I/O 0x220-0x280, decodes 16-bit, 32-byte alignment, 16 addresses */
-        0x47, 0x01, 0x00, 0x03, 0x30, 0x03, 0x30, 0x02, /* I/O 0x300-0x330, decodes 16-bit, 48-byte alignment, 2 addresses */
-        0x47, 0x01, 0x88, 0x03, 0x88, 0x03, 0x01, 0x04, /* I/O 0x388, decodes 16-bit, 1-byte alignment, 4 addresses */
-    0x31, 0x01, /* start dependent functions, acceptable */
-        0x22, 0xa0, 0x04, /* IRQ 5/7/10 */
-        0x2a, 0x0b, 0x08, /* DMA 0/1/3, compatibility, no count by word, count by byte, not bus master, 8-bit only */
-        0x2a, 0xe0, 0x12, /* DMA 5/6/7, compatibility, count by word, no count by byte, not bus master, 16-bit only */
-        0x47, 0x01, 0x20, 0x02, 0x80, 0x02, 0x20, 0x10, /* I/O 0x220-0x280, decodes 16-bit, 32-byte alignment, 16 addresses */
-        0x47, 0x01, 0x00, 0x03, 0x30, 0x03, 0x30, 0x02, /* I/O 0x300-0x330, decodes 16-bit, 48-byte alignment, 2 addresses */
-    0x31, 0x02, /* start dependent functions, functional */
-        0x22, 0xa0, 0x04, /* IRQ 5/7/10 */
-        0x2a, 0x0b, 0x08, /* DMA 0/1/3, compatibility, no count by word, count by byte, not bus master, 8-bit only */
-        0x2a, 0xe0, 0x12, /* DMA 5/6/7, compatibility, count by word, no count by byte, not bus master, 16-bit only */
-        0x47, 0x01, 0x20, 0x02, 0x80, 0x02, 0x20, 0x10, /* I/O 0x220-0x280, decodes 16-bit, 32-byte alignment, 16 addresses */
-    0x31, 0x02, /* start dependent functions, functional */
-        0x22, 0xa0, 0x04, /* IRQ 5/7/10 */
-        0x2a, 0x0b, 0x08, /* DMA 0/1/3, compatibility, no count by word, count by byte, not bus master, 8-bit only */
-        0x47, 0x01, 0x20, 0x02, 0x80, 0x02, 0x20, 0x10, /* I/O 0x220-0x280, decodes 16-bit, 32-byte alignment, 16 addresses */
-        0x47, 0x01, 0x00, 0x03, 0x30, 0x03, 0x30, 0x02, /* I/O 0x300-0x330, decodes 16-bit, 48-byte alignment, 2 addresses */
-        0x47, 0x01, 0x88, 0x03, 0x88, 0x03, 0x01, 0x04, /* I/O 0x388, decodes 16-bit, 1-byte alignment, 4 addresses */
-    0x31, 0x02, /* start dependent functions, functional */
-        0x22, 0xa0, 0x04, /* IRQ 5/7/10 */
-        0x2a, 0x0b, 0x08, /* DMA 0/1/3, compatibility, no count by word, count by byte, not bus master, 8-bit only */
-        0x47, 0x01, 0x20, 0x02, 0x80, 0x02, 0x20, 0x10, /* I/O 0x220-0x280, decodes 16-bit, 32-byte alignment, 16 addresses */
-        0x47, 0x01, 0x00, 0x03, 0x30, 0x03, 0x30, 0x02, /* I/O 0x300-0x330, decodes 16-bit, 48-byte alignment, 2 addresses */
-    0x31, 0x02, /* start dependent functions, functional */
-        0x22, 0xa0, 0x04, /* IRQ 5/7/10 */
-        0x2a, 0x0b, 0x08, /* DMA 0/1/3, compatibility, no count by word, count by byte, not bus master, 8-bit only */
-        0x47, 0x01, 0x20, 0x02, 0x80, 0x02, 0x20, 0x10, /* I/O 0x220-0x280, decodes 16-bit, 32-byte alignment, 16 addresses */
-    0x38, /* end dependent functions */
-
-    0x16, 0x0e, 0x8c, 0x20, 0x11, 0x00, 0x5a, /* logical device CTL2011, supports vendor-specific registers 0x39/0x3B/0x3C/0x3E */
-    0x1c, 0x41, 0xd0, 0x06, 0x00, /* compatible device PNP0600 */
-    0x82, 0x03, 0x00, 'I', 'D', 'E', /* ANSI identifier */
-    0x31, 0x00, /* start dependent functions, preferred */
-        0x22, 0x00, 0x04, /* IRQ 10 */
-        0x47, 0x01, 0x68, 0x01, 0x68, 0x01, 0x01, 0x08, /* I/O 0x168, decodes 16-bit, 1-byte alignment, 8 addresses */
-        0x47, 0x01, 0x6e, 0x03, 0x6e, 0x03, 0x01, 0x02, /* I/O 0x36E, decodes 16-bit, 1-byte alignment, 2 addresses */
-    0x31, 0x01, /* start dependent functions, acceptable */
-        0x22, 0x00, 0x08, /* IRQ 11 */
-        0x47, 0x01, 0xe8, 0x01, 0xe8, 0x01, 0x01, 0x08, /* I/O 0x1E8, decodes 16-bit, 1-byte alignment, 8 addresses */
-        0x47, 0x01, 0xee, 0x03, 0xee, 0x03, 0x01, 0x02, /* I/O 0x3EE, decodes 16-bit, 1-byte alignment, 2 addresses */
-    0x31, 0x01, /* start dependent functions, acceptable */
-        0x22, 0x00, 0x8c, /* IRQ 10/11/15 */
-        0x47, 0x01, 0x00, 0x01, 0xf8, 0x01, 0x08, 0x08, /* I/O 0x100-0x1F8, decodes 16-bit, 8-byte alignment, 8 addresses */
-        0x47, 0x01, 0x00, 0x03, 0xfe, 0x03, 0x02, 0x02, /* I/O 0x300-0x3FE, decodes 16-bit, 2-byte alignment, 2 addresses */
-    0x31, 0x02, /* start dependent functions, functional */
-        0x22, 0x00, 0x80, /* IRQ 15 */
-        0x47, 0x01, 0x70, 0x01, 0x70, 0x01, 0x01, 0x08, /* I/O 0x170, decodes 16-bit, 1-byte alignment, 8 addresses */
-        0x47, 0x01, 0x76, 0x03, 0x76, 0x03, 0x01, 0x02, /* I/O 0x376, decodes 16-bit, 1-byte alignment, 1 addresses */
-    0x38, /* end dependent functions */
-
-    0x16, 0x41, 0xd0, 0xff, 0xff, 0x00, 0xda, /* logical device PNPFFFF, supports vendor-specific registers 0x38/0x39/0x3B/0x3C/0x3E */
-    0x82, 0x08, 0x00, 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', /* ANSI identifier */
-    0x47, 0x01, 0x00, 0x01, 0xf8, 0x03, 0x08, 0x01, /* I/O 0x100-0x3F8, decodes 16-bit, 8-byte alignment, 1 address */
-
-    0x15, 0x0e, 0x8c, 0x70, 0x01, 0x00, /* logical device CTL7001 */
-    0x1c, 0x41, 0xd0, 0xb0, 0x2f, /* compatible device PNPB02F */
-    0x82, 0x04, 0x00, 'G', 'a', 'm', 'e', /* ANSI identifier */
-    0x47, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x08, /* I/O 0x200, decodes 16-bit, 1-byte alignment, 8 addresses */
-
-    0x79, 0x00 /* end tag, dummy checksum (filled in by isapnp_add_card) */
-    // clang-format on
-};
-
 #ifdef ENABLE_SB_LOG
 int sb_do_log = ENABLE_SB_LOG;
 
@@ -182,13 +151,7 @@ sb_get_buffer_sb2(int32_t *buffer, int len, void *priv)
 {
     sb_t                    *sb    = (sb_t *) priv;
     const sb_ct1335_mixer_t *mixer = &sb->mixer_sb2;
-    double                   out_mono = 0.0;
-    double                   out_l = 0.0;
-    double                   out_r = 0.0;
-    const int32_t           *opl_buf = NULL;
-
-    if (sb->opl_enabled)
-        opl_buf = sb->opl.update(sb->opl.priv);
+    double                   out_mono;
 
     sb_dsp_update(&sb->dsp);
 
@@ -196,21 +159,15 @@ sb_get_buffer_sb2(int32_t *buffer, int len, void *priv)
         cms_update(&sb->cms);
 
     for (int c = 0; c < len * 2; c += 2) {
-        out_mono = 0.0;
-        out_l    = 0.0;
-        out_r    = 0.0;
-
-        if (sb->opl_enabled)
-            out_mono = ((double) opl_buf[c]) * 0.7171630859375;
+        double out_l = 0.0;
+        double out_r = 0.0;
 
         if (sb->cms_enabled) {
             out_l += sb->cms.buffer[c];
             out_r += sb->cms.buffer[c + 1];
         }
-        out_l += out_mono;
-        out_r += out_mono;
 
-        if (((sb->opl_enabled) || (sb->cms_enabled)) && sb->mixer_enabled) {
+        if (sb->cms_enabled && sb->mixer_enabled) {
             out_l *= mixer->fm;
             out_r *= mixer->fm;
         }
@@ -234,17 +191,47 @@ sb_get_buffer_sb2(int32_t *buffer, int len, void *priv)
         buffer[c + 1] += (int32_t) out_r;
     }
 
-    sb->pos = 0;
-
-    if (sb->opl_enabled)
-        sb->opl.reset_buffer(sb->opl.priv);
-
     sb->dsp.pos = 0;
 
     if (sb->cms_enabled)
         sb->cms.pos = 0;
 }
 
+static void
+sb_get_music_buffer_sb2(int32_t *buffer, int len, void *priv)
+{
+    const sb_t              *sb      = (const sb_t *) priv;
+    const sb_ct1335_mixer_t *mixer   = &sb->mixer_sb2;
+    const int32_t           *opl_buf = NULL;
+
+    opl_buf = sb->opl.update(sb->opl.priv);
+
+    for (int c = 0; c < len * 2; c += 2) {
+        double out_l = 0.0;
+        double out_r = 0.0;
+
+        const double out_mono = ((double) opl_buf[c]) * 0.7171630859375;
+
+        out_l += out_mono;
+        out_r += out_mono;
+
+        if (sb->mixer_enabled) {
+            out_l *= mixer->fm;
+            out_r *= mixer->fm;
+        }
+
+        if (sb->mixer_enabled) {
+            out_l *= mixer->master;
+            out_r *= mixer->master;
+        }
+
+        buffer[c] += (int32_t) out_l;
+        buffer[c + 1] += (int32_t) out_r;
+    }
+
+    sb->opl.reset_buffer(sb->opl.priv);
+}
+
 static void
 sb2_filter_cd_audio(UNUSED(int channel), double *buffer, void *priv)
 {
@@ -253,52 +240,25 @@ sb2_filter_cd_audio(UNUSED(int channel), double *buffer, void *priv)
     double                   c;
 
     if (sb->mixer_enabled) {
-        c       = ((sb_iir(1, 0, *buffer) / 1.3) * mixer->cd) / 3.0;
+        c       = ((sb_iir(2, 0, *buffer) / 1.3) * mixer->cd) / 3.0;
         *buffer = c * mixer->master;
     } else {
-        c       = (((sb_iir(1, 0, (*buffer)) / 1.3) * 65536) / 3.0) / 65536.0;
+        c       = (((sb_iir(2, 0, (*buffer)) / 1.3) * 65536) / 3.0) / 65536.0;
         *buffer = c;
     }
 }
 
 void
-sb_get_buffer_sbpro(int32_t *buffer, int len, void *priv)
+sb_get_buffer_sbpro(int32_t *buffer, const int len, void *priv)
 {
     sb_t                    *sb    = (sb_t *) priv;
     const sb_ct1345_mixer_t *mixer = &sb->mixer_sbpro;
-    double                   out_l = 0.0;
-    double                   out_r = 0.0;
-    const int32_t           *opl_buf = NULL;
-    const int32_t           *opl2_buf = NULL;
-
-    if (sb->opl_enabled) {
-        if (sb->dsp.sb_type == SBPRO) {
-            opl_buf  = sb->opl.update(sb->opl.priv);
-            opl2_buf = sb->opl2.update(sb->opl2.priv);
-        } else
-            opl_buf = sb->opl.update(sb->opl.priv);
-    }
 
     sb_dsp_update(&sb->dsp);
 
     for (int c = 0; c < len * 2; c += 2) {
-        out_l = 0.0;
-        out_r = 0.0;
-
-        if (sb->opl_enabled) {
-            if (sb->dsp.sb_type == SBPRO) {
-                /* Two chips for LEFT and RIGHT channels.
-                   Each chip stores data into the LEFT channel only (no sample alternating.) */
-                out_l = (((double) opl_buf[c]) * mixer->fm_l) * 0.7171630859375;
-                out_r = (((double) opl2_buf[c]) * mixer->fm_r) * 0.7171630859375;
-            } else {
-                out_l = (((double) opl_buf[c]) * mixer->fm_l) * 0.7171630859375;
-                out_r = (((double) opl_buf[c + 1]) * mixer->fm_r) * 0.7171630859375;
-                if (sb->opl_mix && sb->opl_mixer) {
-                    sb->opl_mix(sb->opl_mixer, &out_l, &out_r);
-                }
-            }
-        }
+        double out_l = 0.0;
+        double out_r = 0.0;
 
         /* TODO: Implement the stereo switch on the mixer instead of on the dsp? */
         if (mixer->output_filter) {
@@ -317,78 +277,84 @@ sb_get_buffer_sbpro(int32_t *buffer, int len, void *priv)
         buffer[c + 1] += (int32_t) out_r;
     }
 
-    sb->pos = 0;
-
-    if (sb->opl_enabled) {
-        sb->opl.reset_buffer(sb->opl.priv);
-        if (sb->dsp.sb_type == SBPRO)
-            sb->opl2.reset_buffer(sb->opl2.priv);
-    }
-
     sb->dsp.pos = 0;
 }
 
 void
-sbpro_filter_cd_audio(int channel, double *buffer, void *priv)
+sb_get_music_buffer_sbpro(int32_t *buffer, int len, void *priv)
 {
-    const sb_t              *sb    = (sb_t *) priv;
-    const sb_ct1345_mixer_t *mixer = &sb->mixer_sbpro;
-    double                   c;
-    double                   cd     = channel ? mixer->cd_r : mixer->cd_l;
-    double                   master = channel ? mixer->master_r : mixer->master_l;
+    sb_t                    *sb       = (sb_t *) priv;
+    const sb_ct1345_mixer_t *mixer    = &sb->mixer_sbpro;
+    double                   out_l    = 0.0;
+    double                   out_r    = 0.0;
+    const int32_t           *opl_buf  = NULL;
+    const int32_t           *opl2_buf = NULL;
 
-    if (mixer->output_filter)
-        c = (sb_iir(1, channel, *buffer) * cd) / 3.9;
-    else
-        c = (*buffer * cd) / 3.0;
-    *buffer = c * master;
-}
+    if (!sb->opl_enabled)
+        return;
 
-static void
-sb_get_buffer_sb16_awe32(int32_t *buffer, int len, void *priv)
-{
-    sb_t                    *sb    = (sb_t *) priv;
-    const sb_ct1745_mixer_t *mixer = &sb->mixer_sb16;
-    int                      dsp_rec_pos = sb->dsp.record_pos_write;
-    int                      c_emu8k = 0;
-    int                      c_record;
-    int32_t                  in_l;
-    int32_t                  in_r;
-    double                   out_l = 0.0;
-    double                   out_r = 0.0;
-    double                   bass_treble;
-    const int32_t           *opl_buf = NULL;
-
-    if (sb->opl_enabled)
+    if (sb->dsp.sb_type == SBPRO_DSP_300) {
+        opl_buf  = sb->opl.update(sb->opl.priv);
+        opl2_buf = sb->opl2.update(sb->opl2.priv);
+    } else
         opl_buf = sb->opl.update(sb->opl.priv);
 
-    if (sb->dsp.sb_type > SB16)
-        emu8k_update(&sb->emu8k);
-
     sb_dsp_update(&sb->dsp);
 
     for (int c = 0; c < len * 2; c += 2) {
         out_l = 0.0;
         out_r = 0.0;
 
-        if (sb->dsp.sb_type > SB16)
-            c_emu8k = ((((c / 2) * FREQ_44100) / SOUND_FREQ) * 2);
-
-        if (sb->opl_enabled) {
-            out_l = ((double) opl_buf[c]) * mixer->fm_l * 0.7171630859375;
-            out_r = ((double) opl_buf[c + 1]) * mixer->fm_r * 0.7171630859375;
+        if (sb->dsp.sb_type == SBPRO_DSP_300) {
+            /* Two chips for LEFT and RIGHT channels.
+               Each chip stores data into the LEFT channel only (no sample alternating.) */
+            out_l = (((double) opl_buf[c]) * mixer->fm_l) * 0.7171630859375;
+            if (opl2_buf != NULL)
+                out_r = (((double) opl2_buf[c]) * mixer->fm_r) * 0.7171630859375;
+        } else {
+            out_l = (((double) opl_buf[c]) * mixer->fm_l) * 0.7171630859375;
+            out_r = (((double) opl_buf[c + 1]) * mixer->fm_r) * 0.7171630859375;
+            if (sb->opl_mix && sb->opl_mixer)
+                sb->opl_mix(sb->opl_mixer, &out_l, &out_r);
         }
 
-        if (sb->dsp.sb_type > SB16) {
-            out_l += (((double) sb->emu8k.buffer[c_emu8k]) * mixer->fm_l);
-            out_r += (((double) sb->emu8k.buffer[c_emu8k + 1]) * mixer->fm_r);
-        }
+        /* TODO: recording CD, Mic with AGC or line in. Note: mic volume does not affect recording. */
+        out_l *= mixer->master_l;
+        out_r *= mixer->master_r;
 
-        /* TODO: Multi-recording mic with agc/+20db, CD, and line in with channel inversion */
-        in_l = (mixer->input_selector_left & INPUT_MIDI_L) ? ((int32_t) out_l) : 0 + (mixer->input_selector_left & INPUT_MIDI_R) ? ((int32_t) out_r)
-                                                                                                                                 : 0;
-        in_r = (mixer->input_selector_right & INPUT_MIDI_L) ? ((int32_t) out_l) : 0 + (mixer->input_selector_right & INPUT_MIDI_R) ? ((int32_t) out_r)
-                                                                                                                                   : 0;
+        buffer[c] += (int32_t) out_l;
+        buffer[c + 1] += (int32_t) out_r;
+    }
+
+    sb->opl.reset_buffer(sb->opl.priv);
+    if (sb->dsp.sb_type == SBPRO_DSP_300)
+        sb->opl2.reset_buffer(sb->opl2.priv);
+}
+
+void
+sbpro_filter_cd_audio(int channel, double *buffer, void *priv)
+{
+    const sb_t              *sb     = (sb_t *) priv;
+    const sb_ct1345_mixer_t *mixer  = &sb->mixer_sbpro;
+    const double             cd     = channel ? mixer->cd_r : mixer->cd_l;
+    const double             master = channel ? mixer->master_r : mixer->master_l;
+    double                   c      = ((*buffer * cd) / 3.0) * master;
+
+    *buffer = c;
+}
+
+static void
+sb_get_buffer_sb16_awe32(int32_t *buffer, int len, void *priv)
+{
+    sb_t                    *sb    = (sb_t *) priv;
+    const sb_ct1745_mixer_t *mixer = &sb->mixer_sb16;
+    double                   bass_treble;
+
+    sb_dsp_update(&sb->dsp);
+
+    for (int c = 0; c < len * 2; c += 2) {
+        double out_l = 0.0;
+        double out_r = 0.0;
 
         if (mixer->output_filter) {
             /* We divide by 3 to get the volume down to normal. */
@@ -409,7 +375,7 @@ sb_get_buffer_sb16_awe32(int32_t *buffer, int len, void *priv)
 
             if (mixer->bass_l > 8)
                 out_l += (low_iir(0, 0, out_l) * bass_treble);
-            else if (mixer->bass_l < 8)
+            else
                 out_l = (out_l *bass_treble + low_cut_iir(0, 0, out_l) * (1.0 - bass_treble));
         }
 
@@ -418,7 +384,7 @@ sb_get_buffer_sb16_awe32(int32_t *buffer, int len, void *priv)
 
             if (mixer->bass_r > 8)
                 out_r += (low_iir(0, 1, out_r) * bass_treble);
-            else if (mixer->bass_r < 8)
+            else
                 out_r = (out_r *bass_treble + low_cut_iir(0, 1, out_r) * (1.0 - bass_treble));
         }
 
@@ -427,7 +393,7 @@ sb_get_buffer_sb16_awe32(int32_t *buffer, int len, void *priv)
 
             if (mixer->treble_l > 8)
                 out_l += (high_iir(0, 0, out_l) * bass_treble);
-            else if (mixer->treble_l < 8)
+            else
                 out_l = (out_l *bass_treble + high_cut_iir(0, 0, out_l) * (1.0 - bass_treble));
         }
 
@@ -436,12 +402,88 @@ sb_get_buffer_sb16_awe32(int32_t *buffer, int len, void *priv)
 
             if (mixer->treble_r > 8)
                 out_r += (high_iir(0, 1, out_r) * bass_treble);
-            else if (mixer->treble_r < 8)
+            else
                 out_r = (out_l *bass_treble + high_cut_iir(0, 1, out_r) * (1.0 - bass_treble));
         }
 
+        buffer[c] += (int32_t) (out_l * mixer->output_gain_L);
+        buffer[c + 1] += (int32_t) (out_r * mixer->output_gain_R);
+    }
+
+    sb->dsp.pos = 0;
+}
+
+static void
+sb_get_music_buffer_sb16_awe32(int32_t *buffer, const int len, void *priv)
+{
+    sb_t                    *sb          = (sb_t *) priv;
+    const sb_ct1745_mixer_t *mixer       = &sb->mixer_sb16;
+    const int                dsp_rec_pos = sb->dsp.record_pos_write;
+    double                   bass_treble;
+    const int32_t           *opl_buf     = NULL;
+
+    if (sb->opl_enabled)
+        opl_buf = sb->opl.update(sb->opl.priv);
+
+    for (int c = 0; c < len * 2; c += 2) {
+        double out_l = 0.0;
+        double out_r = 0.0;
+
+        if (sb->opl_enabled) {
+            out_l = ((double) opl_buf[c]) * mixer->fm_l * 0.7171630859375;
+            out_r = ((double) opl_buf[c + 1]) * mixer->fm_r * 0.7171630859375;
+        }
+
+        /* TODO: Multi-recording mic with agc/+20db, CD, and line in with channel inversion */
+        int32_t in_l = (mixer->input_selector_left & INPUT_MIDI_L) ?
+                       ((int32_t) out_l) : 0 + (mixer->input_selector_left & INPUT_MIDI_R) ? ((int32_t) out_r) : 0;
+        int32_t in_r = (mixer->input_selector_right & INPUT_MIDI_L) ?
+                       ((int32_t) out_l) : 0 + (mixer->input_selector_right & INPUT_MIDI_R) ? ((int32_t) out_r) : 0;
+
+        out_l *= mixer->master_l;
+        out_r *= mixer->master_r;
+
+        /* This is not exactly how one does bass/treble controls, but the end result is like it.
+           A better implementation would reduce the CPU usage. */
+        if (mixer->bass_l != 8) {
+            bass_treble = sb_bass_treble_4bits[mixer->bass_l];
+
+            if (mixer->bass_l > 8)
+                out_l += (low_iir(1, 0, out_l) * bass_treble);
+            else
+                out_l = (out_l *bass_treble + low_cut_iir(1, 0, out_l) * (1.0 - bass_treble));
+        }
+
+        if (mixer->bass_r != 8) {
+            bass_treble = sb_bass_treble_4bits[mixer->bass_r];
+
+            if (mixer->bass_r > 8)
+                out_r += (low_iir(1, 1, out_r) * bass_treble);
+            else
+                out_r = (out_r *bass_treble + low_cut_iir(1, 1, out_r) * (1.0 - bass_treble));
+        }
+
+        if (mixer->treble_l != 8) {
+            bass_treble = sb_bass_treble_4bits[mixer->treble_l];
+
+            if (mixer->treble_l > 8)
+                out_l += (high_iir(1, 0, out_l) * bass_treble);
+            else
+                out_l = (out_l *bass_treble + high_cut_iir(1, 0, out_l) * (1.0 - bass_treble));
+        }
+
+        if (mixer->treble_r != 8) {
+            bass_treble = sb_bass_treble_4bits[mixer->treble_r];
+
+            if (mixer->treble_r > 8)
+                out_r += (high_iir(1, 1, out_r) * bass_treble);
+            else
+                out_r = (out_l *bass_treble + high_cut_iir(1, 1, out_r) * (1.0 - bass_treble));
+        }
+
         if (sb->dsp.sb_enable_i) {
-            c_record = dsp_rec_pos + ((c * sb->dsp.sb_freq) / SOUND_FREQ);
+            const int c_record = dsp_rec_pos + ((c * sb->dsp.sb_freq) / MUSIC_FREQ);
+
             in_l <<= mixer->input_gain_L;
             in_r <<= mixer->input_gain_R;
 
@@ -456,8 +498,8 @@ sb_get_buffer_sb16_awe32(int32_t *buffer, int len, void *priv)
             else if (in_r > 32767)
                 in_r = 32767;
 
-            sb->dsp.record_buffer[c_record & 0xffff]       = in_l;
-            sb->dsp.record_buffer[(c_record + 1) & 0xffff] = in_r;
+            sb->dsp.record_buffer[c_record & 0xffff]       = (int16_t) in_l;
+            sb->dsp.record_buffer[(c_record + 1) & 0xffff] = (int16_t) in_r;
         }
 
         buffer[c] += (int32_t) (out_l * mixer->output_gain_L);
@@ -467,35 +509,107 @@ sb_get_buffer_sb16_awe32(int32_t *buffer, int len, void *priv)
     sb->dsp.record_pos_write += ((len * sb->dsp.sb_freq) / 24000);
     sb->dsp.record_pos_write &= 0xffff;
 
-    sb->pos = 0;
-
     if (sb->opl_enabled)
         sb->opl.reset_buffer(sb->opl.priv);
+}
 
-    sb->dsp.pos = 0;
+static void
+sb_get_wavetable_buffer_goldfinch(int32_t *buffer, const int len, void *priv)
+{
+    goldfinch_t *goldfinch = (goldfinch_t *) priv;
 
-    if (sb->dsp.sb_type > SB16)
-        sb->emu8k.pos = 0;
+    emu8k_update(&goldfinch->emu8k);
+
+    for (int c = 0; c < len * 2; c += 2) {
+        double out_l = 0.0;
+        double out_r = 0.0;
+
+        out_l += ((double) goldfinch->emu8k.buffer[c]);
+        out_r += ((double) goldfinch->emu8k.buffer[c + 1]);
+
+        buffer[c] += (int32_t) out_l;
+        buffer[c + 1] += (int32_t) out_r;
+    }
+
+    goldfinch->emu8k.pos = 0;
+}
+
+static void
+sb_get_wavetable_buffer_sb16_awe32(int32_t *buffer, const int len, void *priv)
+{
+    sb_t                    *sb    = (sb_t *) priv;
+    const sb_ct1745_mixer_t *mixer = &sb->mixer_sb16;
+    double                   bass_treble;
+
+    emu8k_update(&sb->emu8k);
+
+    for (int c = 0; c < len * 2; c += 2) {
+        double out_l = 0.0;
+        double out_r = 0.0;
+
+        out_l += (((double) sb->emu8k.buffer[c]) * mixer->fm_l);
+        out_r += (((double) sb->emu8k.buffer[c + 1]) * mixer->fm_r);
+
+        out_l *= mixer->master_l;
+        out_r *= mixer->master_r;
+
+        /* This is not exactly how one does bass/treble controls, but the end result is like it.
+           A better implementation would reduce the CPU usage. */
+        if (mixer->bass_l != 8) {
+            bass_treble = sb_bass_treble_4bits[mixer->bass_l];
+
+            if (mixer->bass_l > 8)
+                out_l += (low_iir(4, 0, out_l) * bass_treble);
+            else
+                out_l = (out_l *bass_treble + low_cut_iir(4, 0, out_l) * (1.0 - bass_treble));
+        }
+
+        if (mixer->bass_r != 8) {
+            bass_treble = sb_bass_treble_4bits[mixer->bass_r];
+
+            if (mixer->bass_r > 8)
+                out_r += (low_iir(4, 1, out_r) * bass_treble);
+            else
+                out_r = (out_r *bass_treble + low_cut_iir(4, 1, out_r) * (1.0 - bass_treble));
+        }
+
+        if (mixer->treble_l != 8) {
+            bass_treble = sb_bass_treble_4bits[mixer->treble_l];
+
+            if (mixer->treble_l > 8)
+                out_l += (high_iir(4, 0, out_l) * bass_treble);
+            else
+                out_l = (out_l *bass_treble + high_cut_iir(4, 0, out_l) * (1.0 - bass_treble));
+        }
+
+        if (mixer->treble_r != 8) {
+            bass_treble = sb_bass_treble_4bits[mixer->treble_r];
+
+            if (mixer->treble_r > 8)
+                out_r += (high_iir(4, 1, out_r) * bass_treble);
+            else
+                out_r = (out_l *bass_treble + high_cut_iir(4, 1, out_r) * (1.0 - bass_treble));
+        }
+
+        buffer[c] += (int32_t) (out_l * mixer->output_gain_L);
+        buffer[c + 1] += (int32_t) (out_r * mixer->output_gain_R);
+    }
+
+    sb->emu8k.pos = 0;
 }
 
 void
 sb16_awe32_filter_cd_audio(int channel, double *buffer, void *priv)
 {
-    const sb_t              *sb    = (sb_t *) priv;
-    const sb_ct1745_mixer_t *mixer = &sb->mixer_sb16;
-    double                   c;
-    double                   cd     = channel ? mixer->cd_r : mixer->cd_l /* / 3.0 */;
-    double                   master = channel ? mixer->master_r : mixer->master_l;
-    int32_t                  bass   = channel ? mixer->bass_r : mixer->bass_l;
-    int32_t                  treble = channel ? mixer->treble_r : mixer->treble_l;
+    const sb_t              *sb          = (sb_t *) priv;
+    const sb_ct1745_mixer_t *mixer       = &sb->mixer_sb16;
+    const double             cd          = channel ? mixer->cd_r : mixer->cd_l /* / 3.0 */;
+    const double             master      = channel ? mixer->master_r : mixer->master_l;
+    const int32_t            bass        = channel ? mixer->bass_r : mixer->bass_l;
+    const int32_t            treble      = channel ? mixer->treble_r : mixer->treble_l;
+    const double             output_gain = (channel ? mixer->output_gain_R : mixer->output_gain_L);
     double                   bass_treble;
-    double                   output_gain = (channel ? mixer->output_gain_R : mixer->output_gain_L);
-
-    if (mixer->output_filter)
-        c = (low_fir_sb16(1, channel, *buffer) * cd) / 3.0;
-    else
-        c = ((*buffer) * cd) / 3.0;
-    c *= master;
+    double                   c           = (((*buffer) * cd) / 3.0) * master;
 
     /* This is not exactly how one does bass/treble controls, but the end result is like it.
        A better implementation would reduce the CPU usage. */
@@ -503,18 +617,18 @@ sb16_awe32_filter_cd_audio(int channel, double *buffer, void *priv)
         bass_treble = sb_bass_treble_4bits[bass];
 
         if (bass > 8)
-            c += (low_iir(1, channel, c) * bass_treble);
-        else if (bass < 8)
-            c = (c * bass_treble + low_cut_iir(1, channel, c) * (1.0 - bass_treble));
+            c += (low_iir(2, channel, c) * bass_treble);
+        else
+            c = (c * bass_treble + low_cut_iir(2, channel, c) * (1.0 - bass_treble));
     }
 
     if (treble != 8) {
         bass_treble = sb_bass_treble_4bits[treble];
 
         if (treble > 8)
-            c += (high_iir(1, channel, c) * bass_treble);
-        else if (treble < 8)
-            c = (c * bass_treble + high_cut_iir(1, channel, c) * (1.0 - bass_treble));
+            c += (high_iir(2, channel, c) * bass_treble);
+        else
+            c = (c * bass_treble + high_cut_iir(2, channel, c) * (1.0 - bass_treble));
     }
 
     *buffer = c * output_gain;
@@ -523,18 +637,18 @@ sb16_awe32_filter_cd_audio(int channel, double *buffer, void *priv)
 void
 sb16_awe32_filter_pc_speaker(int channel, double *buffer, void *priv)
 {
-    const sb_t              *sb    = (sb_t *) priv;
-    const sb_ct1745_mixer_t *mixer = &sb->mixer_sb16;
-    double                   c;
-    double                   spk    = mixer->speaker;
-    double                   master = channel ? mixer->master_r : mixer->master_l;
-    int32_t                  bass   = channel ? mixer->bass_r : mixer->bass_l;
-    int32_t                  treble = channel ? mixer->treble_r : mixer->treble_l;
+    const sb_t              *sb          = (sb_t *) priv;
+    const sb_ct1745_mixer_t *mixer       = &sb->mixer_sb16;
+    const double             spk         = mixer->speaker;
+    const double             master      = channel ? mixer->master_r : mixer->master_l;
+    const int32_t            bass        = channel ? mixer->bass_r : mixer->bass_l;
+    const int32_t            treble      = channel ? mixer->treble_r : mixer->treble_l;
+    const double             output_gain = (channel ? mixer->output_gain_R : mixer->output_gain_L);
     double                   bass_treble;
-    double                   output_gain = (channel ? mixer->output_gain_R : mixer->output_gain_L);
+    double                   c;
 
     if (mixer->output_filter)
-        c = (low_fir_sb16(2, channel, *buffer) * spk) / 3.0;
+        c = (low_fir_sb16(3, channel, *buffer) * spk) / 3.0;
     else
         c = ((*buffer) * spk) / 3.0;
     c *= master;
@@ -545,23 +659,118 @@ sb16_awe32_filter_pc_speaker(int channel, double *buffer, void *priv)
         bass_treble = sb_bass_treble_4bits[bass];
 
         if (bass > 8)
-            c += (low_iir(2, channel, c) * bass_treble);
-        else if (bass < 8)
-            c = (c * bass_treble + low_cut_iir(1, channel, c) * (1.0 - bass_treble));
+            c += (low_iir(3, channel, c) * bass_treble);
+        else
+            c = (c * bass_treble + low_cut_iir(3, channel, c) * (1.0 - bass_treble));
     }
 
     if (treble != 8) {
         bass_treble = sb_bass_treble_4bits[treble];
 
         if (treble > 8)
-            c += (high_iir(2, channel, c) * bass_treble);
-        else if (treble < 8)
-            c = (c * bass_treble + high_cut_iir(1, channel, c) * (1.0 - bass_treble));
+            c += (high_iir(3, channel, c) * bass_treble);
+        else
+            c = (c * bass_treble + high_cut_iir(3, channel, c) * (1.0 - bass_treble));
     }
 
     *buffer = c * output_gain;
 }
 
+void
+sb_get_buffer_ess(int32_t *buffer, int len, void *priv)
+{
+    sb_t              *ess   = (sb_t *) priv;
+    const ess_mixer_t *mixer = &ess->mixer_ess;
+
+    sb_dsp_update(&ess->dsp);
+
+    for (int c = 0; c < len * 2; c += 2) {
+        double out_l = 0.0;
+        double out_r = 0.0;
+
+        /* TODO: Implement the stereo switch on the mixer instead of on the dsp? */
+        if (mixer->output_filter) {
+            out_l += (low_fir_sb16(0, 0, (double) ess->dsp.buffer[c]) * mixer->voice_l) / 3.0;
+            out_r += (low_fir_sb16(0, 1, (double) ess->dsp.buffer[c + 1]) * mixer->voice_r) / 3.0;
+        } else {
+            out_l += (ess->dsp.buffer[c] * mixer->voice_l) / 3.0;
+            out_r += (ess->dsp.buffer[c + 1] * mixer->voice_r) / 3.0;
+        }
+
+        /* TODO: recording from the mixer. */
+        out_l *= mixer->master_l;
+        out_r *= mixer->master_r;
+
+        buffer[c] += (int32_t) out_l;
+        buffer[c + 1] += (int32_t) out_r;
+    }
+
+    ess->dsp.pos = 0;
+}
+
+void
+sb_get_music_buffer_ess(int32_t *buffer, int len, void *priv)
+{
+    sb_t              *ess     = (sb_t *) priv;
+    const ess_mixer_t *mixer   = &ess->mixer_ess;
+    double             out_l   = 0.0;
+    double             out_r   = 0.0;
+    const int32_t     *opl_buf = NULL;
+
+    opl_buf = ess->opl.update(ess->opl.priv);
+
+    for (int c = 0; c < len * 2; c += 2) {
+        out_l = 0.0;
+        out_r = 0.0;
+
+        out_l = (((double) opl_buf[c]) * mixer->fm_l) * 0.7171630859375;
+        out_r = (((double) opl_buf[c + 1]) * mixer->fm_r) * 0.7171630859375;
+        if (ess->opl_mix && ess->opl_mixer)
+            ess->opl_mix(ess->opl_mixer, &out_l, &out_r);
+
+        /* TODO: recording from the mixer. */
+        out_l *= mixer->master_l;
+        out_r *= mixer->master_r;
+
+        buffer[c] += (int32_t) out_l;
+        buffer[c + 1] += (int32_t) out_r;
+    }
+
+    ess->opl.reset_buffer(ess->opl.priv);
+}
+
+void
+ess_filter_cd_audio(int channel, double *buffer, void *priv)
+{
+    const sb_t        *ess   = (sb_t *) priv;
+    const ess_mixer_t *mixer = &ess->mixer_ess;
+    double             c;
+    double             cd     = channel ? mixer->cd_r : mixer->cd_l;
+    double             master = channel ? mixer->master_r : mixer->master_l;
+
+    /* TODO: recording from the mixer. */
+    c       = (*buffer * cd) / 3.0;
+    *buffer = c * master;
+}
+
+void
+ess_filter_pc_speaker(int channel, double *buffer, void *priv)
+{
+    const sb_t        *ess   = (sb_t *) priv;
+    const ess_mixer_t *mixer = &ess->mixer_ess;
+    double             c;
+    double             spk    = mixer->speaker;
+    double             master = channel ? mixer->master_r : mixer->master_l;
+
+    if (mixer->output_filter)
+        c = (low_fir_sb16(3, channel, *buffer) * spk) / 3.0;
+    else
+        c = ((*buffer) * spk) / 3.0;
+    c *= master;
+
+    *buffer = c;
+}
+
 void
 sb_ct1335_mixer_write(uint16_t addr, uint8_t val, void *priv)
 {
@@ -636,7 +845,10 @@ void
 sb_ct1345_mixer_write(uint16_t addr, uint8_t val, void *priv)
 {
     sb_t              *sb    = (sb_t *) priv;
-    sb_ct1345_mixer_t *mixer = &sb->mixer_sbpro;
+    sb_ct1345_mixer_t *mixer = (sb == NULL) ? NULL : &sb->mixer_sbpro;
+
+    if (mixer == NULL)
+        return;
 
     if (!(addr & 1)) {
         mixer->index      = val;
@@ -774,7 +986,10 @@ void
 sb_ct1745_mixer_write(uint16_t addr, uint8_t val, void *priv)
 {
     sb_t              *sb    = (sb_t *) priv;
-    sb_ct1745_mixer_t *mixer = &sb->mixer_sb16;
+    sb_ct1745_mixer_t *mixer = (sb == NULL) ? NULL : &sb->mixer_sb16;
+
+    if (mixer == NULL)
+        return;
 
     if (!(addr & 1))
         mixer->index = val;
@@ -937,17 +1152,20 @@ sb_ct1745_mixer_write(uint16_t addr, uint8_t val, void *priv)
                         else if ((val & 0x06) == 0x02)
                             mpu401_change_addr(sb->mpu, 0);
                     }
+
                     sb->gameport_addr = 0;
-                    gameport_remap(sb->gameport, 0);
-                    if (!(val & 0x01)) {
-                        sb->gameport_addr = 0x200;
-                        gameport_remap(sb->gameport, 0x200);
+                    if (sb->gameport != NULL) {
+                        gameport_remap(sb->gameport, 0);
+                        if (!(val & 0x01)) {
+                            sb->gameport_addr = 0x200;
+                            gameport_remap(sb->gameport, 0x200);
+                        }
                     }
                 }
                 break;
 
             case 0xff:
-                if ((sb->dsp.sb_type > SBAWE32) && !sb->dsp.sb_16_dma_supported) {
+                if ((sb->dsp.sb_type > SBAWE32_DSP_412) && !sb->dsp.sb_16_dma_supported) {
                     /*
                        Bit 5: High DMA channel enabled (0 = yes, 1 = no);
                        Bit 2: ????;
@@ -1004,15 +1222,13 @@ sb_ct1745_mixer_read(uint16_t addr, void *priv)
 {
     const sb_t              *sb    = (sb_t *) priv;
     const sb_ct1745_mixer_t *mixer = &sb->mixer_sb16;
-    uint8_t                  temp;
-    uint8_t                  ret = 0xff;
-
-    if (!(addr & 1))
-        ret = mixer->index;
+    uint8_t                  ret   = 0xff;
 
     sb_log("sb_ct1745: received register READ: %02X\t%02X\n", mixer->index, mixer->regs[mixer->index]);
 
-    if ((mixer->index >= 0x30) && (mixer->index <= 0x47))
+    if (!(addr & 1))
+        ret = 0xff /*mixer->index*/;
+    else if ((mixer->index >= 0x30) && (mixer->index <= 0x47))
         ret = mixer->regs[mixer->index];
     else {
         switch (mixer->index) {
@@ -1107,6 +1323,8 @@ sb_ct1745_mixer_read(uint16_t addr, void *priv)
                         break;
                 }
                 switch (sb->dsp.sb_16_dmanum) {
+                    default:
+                        break;
                     case 5:
                         ret |= 0x20;
                         break;
@@ -1120,6 +1338,7 @@ sb_ct1745_mixer_read(uint16_t addr, void *priv)
                 break;
 
             case 0x82:
+                ; /* Empty statement to make compilers happy about the following variable declaration. */
                 /* The Interrupt status register, addressed as register 82h on the Mixer register map,
                    is used by the ISR to determine whether the interrupt is meant for it or for some
                    other ISR, in which case it should chain to the previous routine. */
@@ -1128,12 +1347,12 @@ sb_ct1745_mixer_read(uint16_t addr, void *priv)
                    I haven't seen this making any difference, but I'm keeping it for now. */
                 /* If QEMU is any indication, then the values are actually 0x20, 0x40, and 0x80. */
                 /* http://the.earth.li/~tfm/oldpage/sb_mixer.html - 0x10, 0x20, 0x80. */
-                temp = ((sb->dsp.sb_irq8) ? 1 : 0) | ((sb->dsp.sb_irq16) ? 2 : 0) |
-                       ((sb->dsp.sb_irq401) ? 4 : 0);
-                if (sb->dsp.sb_type >= SBAWE32)
-                    ret  = temp | 0x80;
+                const uint8_t temp = ((sb->dsp.sb_irq8) ? 1 : 0) | ((sb->dsp.sb_irq16) ? 2 : 0) |
+                                     ((sb->dsp.sb_irq401) ? 4 : 0);
+                if (sb->dsp.sb_type >= SBAWE32_DSP_412)
+                    ret = temp | 0x80;
                 else
-                    ret  = temp | 0x40;
+                    ret = temp | 0x40;
                 break;
 
             case 0x83:
@@ -1159,23 +1378,23 @@ sb_ct1745_mixer_read(uint16_t addr, void *priv)
                     ret |= 0x01;
                 break;
 
-            case 0x49:    /* Undocumented register used by some Creative drivers. */
-            case 0x4a:    /* Undocumented register used by some Creative drivers. */
-            case 0x8c:    /* Undocumented register used by some Creative drivers. */
-            case 0x8e:    /* Undocumented register used by some Creative drivers. */
-            case 0x90:    /* 3D Enhancement switch. */
-            case 0xfd:    /* Undocumented register used by some Creative drivers. */
-            case 0xfe:    /* Undocumented register used by some Creative drivers. */
+            case 0x49: /* Undocumented register used by some Creative drivers. */
+            case 0x4a: /* Undocumented register used by some Creative drivers. */
+            case 0x8c: /* Undocumented register used by some Creative drivers. */
+            case 0x8e: /* Undocumented register used by some Creative drivers. */
+            case 0x90: /* 3D Enhancement switch. */
+            case 0xfd: /* Undocumented register used by some Creative drivers. */
+            case 0xfe: /* Undocumented register used by some Creative drivers. */
                 ret = mixer->regs[mixer->index];
                 break;
 
-            case 0xff:    /* Undocumented register used by some Creative drivers.
-                             This and the upper bits of 0x82 seem to affect the
-                             playback volume:
-                             - Register FF = FF: Volume playback normal.
-                             - Register FF = Not FF: Volume playback low unless
-                                             bit 6 of 82h is set. */
-                if (sb->dsp.sb_type > SBAWE32)
+            case 0xff: /* Undocumented register used by some Creative drivers.
+                          This and the upper bits of 0x82 seem to affect the
+                          playback volume:
+                          - Register FF = FF: Volume playback normal.
+                          - Register FF = Not FF: Volume playback low unless
+                                          bit 6 of 82h is set. */
+                if (sb->dsp.sb_type > SBAWE32_DSP_412)
                     ret = mixer->regs[mixer->index];
                 break;
 
@@ -1195,8 +1414,395 @@ sb_ct1745_mixer_read(uint16_t addr, void *priv)
 void
 sb_ct1745_mixer_reset(sb_t *sb)
 {
-    sb_ct1745_mixer_write(4, 0, sb);
-    sb_ct1745_mixer_write(5, 0, sb);
+    if (sb != NULL) {
+        sb_ct1745_mixer_write(4, 0, sb);
+        sb_ct1745_mixer_write(5, 0, sb);
+    }
+}
+
+static void
+ess_base_write(uint16_t addr, UNUSED(uint8_t val), void *priv)
+{
+    sb_t *ess = (sb_t *) priv;
+
+    switch (addr & 0x000f) {
+        case 0x0002:
+        case 0x0003:
+        case 0x0006:
+        case 0x000c:
+            ess->dsp.activity &= 0xdf;
+            break;
+        case 0x0008:
+        case 0x0009:
+            ess->dsp.activity &= 0x7f;
+            break;
+    }
+}
+
+static uint8_t
+ess_base_read(uint16_t addr, void *priv)
+{
+    sb_t *ess = (sb_t *) priv;
+
+    switch (addr & 0x000f) {
+        case 0x0002:
+        case 0x0003:
+        case 0x0004: /* Undocumented but tested by the LBA 2 ES688 driver. */
+        case 0x000a:
+            ess->dsp.activity &= 0xdf;
+            break;
+        case 0x0008:
+        case 0x0009:
+            ess->dsp.activity &= 0x7f;
+            break;
+        case 0x000c:
+        case 0x000e:
+            ess->dsp.activity &= 0xbf;
+            break;
+    }
+
+    sb_log("ess_base_read(%04X): %04X, activity now: %02X\n", addr, addr & 0x000f, ess->dsp.activity);
+
+    return 0xff;
+}
+
+static void
+ess_fm_midi_write(UNUSED(uint16_t addr), UNUSED(uint8_t val), void *priv)
+{
+    sb_t *ess = (sb_t *) priv;
+
+    ess->dsp.activity &= 0x7f;
+}
+
+static uint8_t
+ess_fm_midi_read(UNUSED(uint16_t addr), void *priv)
+{
+    sb_t *ess = (sb_t *) priv;
+
+    ess->dsp.activity &= 0x7f;
+
+    return 0xff;
+}
+
+void
+ess_mixer_write(uint16_t addr, uint8_t val, void *priv)
+{
+    sb_t        *ess   = (sb_t *) priv;
+    ess_mixer_t *mixer = (ess == NULL) ? NULL : &ess->mixer_ess;
+
+    sb_log("[%04X:%08X] [W] %04X = %02X\n", CS, cpu_state.pc, addr, val);
+
+    if (mixer == NULL)
+        return;
+
+    if (!(addr & 1)) {
+        mixer->index      = val;
+        mixer->regs[0x01] = val;
+    } else {
+        if (mixer->index == 0) {
+            /* Reset */
+            mixer->regs[0x0a] = mixer->regs[0x0c] = 0x00;
+            mixer->regs[0x0e]                     = 0x00;
+            /* Changed default from -11dB to 0dB */
+            mixer->regs[0x04] = mixer->regs[0x22] = 0xee;
+            mixer->regs[0x26] = mixer->regs[0x28] = 0xee;
+            mixer->regs[0x2e]                     = 0x00;
+
+            /* Initialize ESS regs
+             * Defaulting to 0dB instead of the standard -11dB. */
+            mixer->regs[0x14] = mixer->regs[0x32] = 0xff;
+            mixer->regs[0x36] = mixer->regs[0x38] = 0xff;
+            mixer->regs[0x3a]                     = 0x00;
+            mixer->regs[0x3c]                     = 0x05;
+            mixer->regs[0x3e]                     = 0x00;
+
+            mixer->regs[0x64]                     = 0x08;
+
+            sb_dsp_set_stereo(&ess->dsp, mixer->regs[0x0e] & 2);
+        } else {
+            mixer->regs[mixer->index] = val;
+
+            switch (mixer->index) {
+                /* Compatibility: chain registers 0x02 and 0x22 as well as 0x06 and 0x26 */
+                case 0x02:
+                case 0x06:
+                case 0x08:
+                    mixer->regs[mixer->index + 0x20] = ((val & 0xe) << 4) | (val & 0xe);
+                    break;
+
+                case 0x0A:
+                    {
+                        uint8_t mic_vol_2bit = (mixer->regs[0x0a] >> 1) & 0x3;
+                        mixer->mic_l = mixer->mic_r = sb_att_7dbstep_2bits[mic_vol_2bit] / 32767.0;
+                        mixer->regs[0x1A]           = mic_vol_2bit | (mic_vol_2bit << 2) | (mic_vol_2bit << 4) | (mic_vol_2bit << 6);
+                        break;
+                    }
+
+                case 0x0C:
+                    switch (mixer->regs[0x0C] & 6) {
+                        case 2:
+                            mixer->input_selector = INPUT_CD_L | INPUT_CD_R;
+                            break;
+                        case 6:
+                            mixer->input_selector = INPUT_LINE_L | INPUT_LINE_R;
+                            break;
+                        default:
+                            mixer->input_selector = INPUT_MIC;
+                            break;
+                    }
+                    mixer->input_filter   = !(mixer->regs[0xC] & 0x20);
+                    mixer->in_filter_freq = ((mixer->regs[0xC] & 0x8) == 0) ? 3200 : 8800;
+                    break;
+
+                case 0x0E:
+                    mixer->output_filter = !(mixer->regs[0xE] & 0x20);
+                    mixer->stereo        = mixer->regs[0xE] & 2;
+                    sb_dsp_set_stereo(&ess->dsp, val & 2);
+                    break;
+
+                case 0x14:
+                    mixer->regs[0x4] = val & 0xee;
+                    break;
+
+                case 0x1A:
+                    mixer->mic_l = sb_att_1p4dbstep_4bits[(mixer->regs[0x1A] >> 4) & 0xF] / 32767.0;
+                    mixer->mic_r = sb_att_1p4dbstep_4bits[mixer->regs[0x1A] & 0xF] / 32767.0;
+                    break;
+
+                case 0x1C:
+                    mixer->regs[mixer->index] = val & 0x2f;
+                    if ((mixer->regs[0x1C] & 0x07) == 0x07) {
+                        mixer->input_selector = INPUT_MIXER_L | INPUT_MIXER_R;
+                    } else if ((mixer->regs[0x1C] & 0x07) == 0x06) {
+                        mixer->input_selector = INPUT_LINE_L | INPUT_LINE_R;
+                    } else if ((mixer->regs[0x1C] & 0x06) == 0x02) {
+                        mixer->input_selector = INPUT_CD_L | INPUT_CD_R;
+                    } else if ((mixer->regs[0x1C] & 0x02) == 0) {
+                        mixer->input_selector = INPUT_MIC;
+                    }
+                    break;
+
+                case 0x22:
+                case 0x26:
+                case 0x28:
+                case 0x2E:
+                    mixer->regs[mixer->index - 0x20] = (val & 0xe);
+                    mixer->regs[mixer->index + 0x10] = val;
+                    break;
+
+                /* More compatibility:
+                   SoundBlaster Pro selects register 020h for 030h, 022h for 032h,
+                   026h for 036h, and 028h for 038h. */
+                case 0x30:
+                case 0x32:
+                case 0x36:
+                case 0x38:
+                case 0x3e:
+                    mixer->regs[mixer->index - 0x10] = (val & 0xee);
+                    break;
+
+                case 0x00:
+                case 0x04:
+                case 0x3a:
+                case 0x3c:
+                    break;
+
+                case 0x64:
+                    if (ess->dsp.sb_subtype > SB_SUBTYPE_ESS_ES1688)
+                        mixer->regs[mixer->index] = (mixer->regs[mixer->index] & 0xf7) | 0x20;
+                    break;
+
+                case 0x40:
+                    if (ess->dsp.sb_subtype >= SB_SUBTYPE_ESS_ES1688) {
+                        uint16_t mpu401_base_addr = 0x300 | ((mixer->regs[0x40] << 1) & 0x30);
+                        sb_log("mpu401_base_addr = %04X\n", mpu401_base_addr);
+
+                        io_removehandler(ess->midi_addr, 0x0002,
+                                         ess_fm_midi_read, NULL, NULL,
+                                         ess_fm_midi_write, NULL, NULL,
+                                         ess);
+
+                        if (ess->gameport != NULL)
+                            gameport_remap(ess->gameport, !(mixer->regs[0x40] & 0x2) ? 0x00 : 0x200);
+
+                        if (ess->dsp.sb_subtype > SB_SUBTYPE_ESS_ES1688) {
+                            /* Not on ES1688. */
+                            io_removehandler(0x0388, 0x0004,
+                                             ess->opl.read, NULL, NULL,
+                                             ess->opl.write, NULL, NULL,
+                                             ess->opl.priv);
+                            if ((mixer->regs[0x40] & 0x1) != 0) {
+                                io_sethandler(0x0388, 0x0004,
+                                              ess->opl.read, NULL, NULL,
+                                              ess->opl.write, NULL, NULL,
+                                              ess->opl.priv);
+                            }
+                        }
+
+                        if (ess->mpu != NULL)
+                            switch ((mixer->regs[0x40] >> 5) & 0x7) {
+                                default:
+                                    break;
+                                case 0:
+                                    mpu401_base_addr = 0x0000;
+                                    mpu401_change_addr(ess->mpu, mpu401_base_addr);
+                                    mpu401_setirq(ess->mpu, -1);
+                                    break;
+                                case 1:
+                                    mpu401_change_addr(ess->mpu, mpu401_base_addr);
+                                    mpu401_setirq(ess->mpu, -1);
+                                    break;
+                                case 2:
+                                    mpu401_change_addr(ess->mpu, mpu401_base_addr);
+                                    mpu401_setirq(ess->mpu, ess->dsp.sb_irqnum);
+                                    break;
+                                case 3:
+                                    mpu401_change_addr(ess->mpu, mpu401_base_addr);
+                                    mpu401_setirq(ess->mpu, 11);
+                                    break;
+                                case 4:
+                                    mpu401_change_addr(ess->mpu, mpu401_base_addr);
+                                    mpu401_setirq(ess->mpu, 9);
+                                    break;
+                                case 5:
+                                    mpu401_change_addr(ess->mpu, mpu401_base_addr);
+                                    mpu401_setirq(ess->mpu, 5);
+                                    break;
+                                case 6:
+                                    mpu401_change_addr(ess->mpu, mpu401_base_addr);
+                                    mpu401_setirq(ess->mpu, 7);
+                                    break;
+                                case 7:
+                                    mpu401_change_addr(ess->mpu, mpu401_base_addr);
+                                    mpu401_setirq(ess->mpu, 10);
+                                    break;
+                            }
+                        ess->midi_addr = mpu401_base_addr;
+                        io_sethandler(addr, 0x0002,
+                                      ess_fm_midi_read, NULL, NULL,
+                                      ess_fm_midi_write, NULL, NULL,
+                                      ess);
+                    }
+                    break;
+
+                default:
+                    sb_log("ess: Unknown mixer register WRITE: %02X\t%02X\n",
+                           mixer->index, mixer->regs[mixer->index]);
+                    break;
+            }
+        }
+
+        mixer->voice_l  = sb_att_2dbstep_4bits[(mixer->regs[0x14] >> 4) & 0x0F] / 32767.0;
+        mixer->voice_r  = sb_att_2dbstep_4bits[mixer->regs[0x14] & 0x0F] / 32767.0;
+        mixer->master_l = sb_att_2dbstep_4bits[(mixer->regs[0x32] >> 4) & 0x0F] / 32767.0;
+        mixer->master_r = sb_att_2dbstep_4bits[mixer->regs[0x32] & 0x0F] / 32767.0;
+        mixer->fm_l     = sb_att_2dbstep_4bits[(mixer->regs[0x36] >> 4) & 0x0F] / 32767.0;
+        mixer->fm_r     = sb_att_2dbstep_4bits[mixer->regs[0x36] & 0x0F] / 32767.0;
+        mixer->cd_l     = sb_att_2dbstep_4bits[(mixer->regs[0x38] >> 4) & 0x0F] / 32767.0;
+        mixer->cd_r     = sb_att_2dbstep_4bits[mixer->regs[0x38] & 0x0F] / 32767.0;
+        mixer->auxb_l   = sb_att_2dbstep_4bits[(mixer->regs[0x3a] >> 4) & 0x0F] / 32767.0;
+        mixer->auxb_r   = sb_att_2dbstep_4bits[mixer->regs[0x3a] & 0x0F] / 32767.0;
+        mixer->line_l   = sb_att_2dbstep_4bits[(mixer->regs[0x3e] >> 4) & 0x0F] / 32767.0;
+        mixer->line_r   = sb_att_2dbstep_4bits[mixer->regs[0x3e] & 0x0F] / 32767.0;
+        mixer->speaker  = sb_att_3dbstep_3bits[mixer->regs[0x3c] & 0x07] / 32767.0;
+    }
+}
+
+uint8_t
+ess_mixer_read(uint16_t addr, void *priv)
+{
+    const sb_t        *ess   = (sb_t *) priv;
+    const ess_mixer_t *mixer = &ess->mixer_ess;
+    uint8_t            ret   = 0x0a;
+
+    if (!(addr & 1))
+        ret = mixer->index;
+    else
+        switch (mixer->index) {
+            case 0x00:
+            case 0x0a:
+            case 0x0c:
+            case 0x0e:
+            case 0x14:
+            case 0x1a:
+            case 0x02:
+            case 0x06:
+            case 0x30:
+            case 0x32:
+            case 0x36:
+            case 0x38:
+            case 0x3a:
+            case 0x3e:
+                ret = mixer->regs[mixer->index];
+                break;
+
+            case 0x04:
+            case 0x22:
+            case 0x26:
+            case 0x28:
+            case 0x2e:
+                ret = mixer->regs[mixer->index] | 0x11;
+                break;
+
+            /* Bit 1 always set, bits 7-6 always clear on both the real ES688 and ES1688. */
+            case 0x1c:
+                ret = mixer->regs[mixer->index] | 0x10;
+                break;
+
+            /*
+               Real ES688: Always 0x00;
+               Real ES1688: Bit 2 always clear.
+             */
+            case 0x40:
+                if (ess->dsp.sb_subtype > SB_SUBTYPE_ESS_ES1688)
+                    ret = mixer->regs[mixer->index];
+                else if (ess->dsp.sb_subtype >= SB_SUBTYPE_ESS_ES1688)
+                    ret = mixer->regs[mixer->index] & 0xfb;
+                else
+                    ret = 0x00;
+                break;
+
+            /*
+               Real ES688: Always 0x00;
+               Real ES1688: All bits writable.
+             */
+            case 0x48:
+                if (ess->dsp.sb_subtype >= SB_SUBTYPE_ESS_ES1688)
+                    ret = mixer->regs[mixer->index];
+                else
+                    ret = 0x00;
+                break;
+
+            /*
+               Return 0x00 so it has bit 3 clear, so NT 5.x drivers don't misdetect it as ES1788.
+               Bit 3 set and writable: ESSCFG detects the card as ES1788 if register 70h is read-only,
+               otherwise, as ES1887.
+               Bit 3 set and read-only: ESSCFG detects the card as ES1788 if register 70h is read-only,
+               otherwise, as ES1888.
+               Real ES688 and ES1688: Always 0x00.
+             */
+            case 0x64:
+                if (ess->dsp.sb_subtype > SB_SUBTYPE_ESS_ES1688)
+                    ret = (mixer->regs[mixer->index] & 0xf7) | 0x20;
+                else
+                    ret = 0x00;
+                break;
+
+            default:
+                sb_log("ess: Unknown mixer register READ: %02X\t%02X\n", mixer->index, mixer->regs[mixer->index]);
+                break;
+        }
+
+    sb_log("[%04X:%08X] [R] %04X = %02X (%02X)\n", CS, cpu_state.pc, addr, ret, mixer->index);
+
+    return ret;
+}
+
+void
+ess_mixer_reset(sb_t *ess)
+{
+    ess_mixer_write(4, 0, ess);
+    ess_mixer_write(5, 0, ess);
 }
 
 uint8_t
@@ -1212,8 +1818,8 @@ sb_mcv_read(int port, void *priv)
 void
 sb_mcv_write(int port, uint8_t val, void *priv)
 {
-    uint16_t addr;
-    sb_t    *sb = (sb_t *) priv;
+    uint16_t addr = 0;
+    sb_t    *sb   = (sb_t *) priv;
 
     if (port < 0x102)
         return;
@@ -1265,8 +1871,8 @@ sb_mcv_feedb(void *priv)
 static uint8_t
 sb_pro_mcv_read(int port, void *priv)
 {
-    const sb_t   *sb  = (sb_t *) priv;
-    uint8_t       ret = sb->pos_regs[port & 7];
+    const sb_t *sb  = (sb_t *) priv;
+    uint8_t     ret = sb->pos_regs[port & 7];
 
     sb_log("sb_pro_mcv_read: port=%04x ret=%02x\n", port, ret);
 
@@ -1276,8 +1882,8 @@ sb_pro_mcv_read(int port, void *priv)
 static void
 sb_pro_mcv_write(int port, uint8_t val, void *priv)
 {
-    uint16_t addr;
-    sb_t    *sb = (sb_t *) priv;
+    uint16_t addr = 0;
+    sb_t    *sb   = (sb_t *) priv;
 
     if (port < 0x102)
         return;
@@ -1336,8 +1942,8 @@ sb_pro_mcv_write(int port, uint8_t val, void *priv)
 static uint8_t
 sb_16_reply_mca_read(int port, void *priv)
 {
-    const sb_t   *sb  = (sb_t *) priv;
-    uint8_t       ret = sb->pos_regs[port & 7];
+    const sb_t *sb  = (sb_t *) priv;
+    uint8_t     ret = sb->pos_regs[port & 7];
 
     sb_log("sb_16_reply_mca_read: port=%04x ret=%02x\n", port, ret);
 
@@ -1345,13 +1951,10 @@ sb_16_reply_mca_read(int port, void *priv)
 }
 
 static void
-sb_16_reply_mca_write(int port, uint8_t val, void *priv)
+sb_16_reply_mca_write(const int port, const uint8_t val, void *priv)
 {
-    uint16_t addr;
-    uint16_t mpu401_addr;
-    int      low_dma;
-    int      high_dma;
-    sb_t    *sb = (sb_t *) priv;
+    uint16_t addr = 0;
+    sb_t    *sb   = (sb_t *) priv;
 
     if (port < 0x102)
         return;
@@ -1404,6 +2007,8 @@ sb_16_reply_mca_write(int port, uint8_t val, void *priv)
     sb->pos_regs[port & 7] = val;
 
     if (sb->pos_regs[2] & 1) {
+        uint16_t mpu401_addr;
+
         switch (sb->pos_regs[2] & 0xc4) {
             case 4:
                 addr = 0x220;
@@ -1422,6 +2027,7 @@ sb_16_reply_mca_write(int port, uint8_t val, void *priv)
                 addr = 0;
                 break;
         }
+
         switch (sb->pos_regs[2] & 0x18) {
             case 8:
                 mpu401_addr = 0x330;
@@ -1474,8 +2080,8 @@ sb_16_reply_mca_write(int port, uint8_t val, void *priv)
             break;
     }
 
-    low_dma  = sb->pos_regs[3] & 3;
-    high_dma = (sb->pos_regs[3] >> 4) & 7;
+    const int low_dma  = sb->pos_regs[3] & 3;
+    int       high_dma = (sb->pos_regs[3] >> 4) & 7;
     if (!high_dma)
         high_dma = low_dma;
 
@@ -1489,47 +2095,54 @@ sb_vibra16s_onboard_relocate_base(uint16_t new_addr, void *priv)
     sb_t    *sb   = (sb_t *) priv;
     uint16_t addr = sb->dsp.sb_addr;
 
-    io_removehandler(addr, 0x0004,
-                     sb->opl.read, NULL, NULL,
-                     sb->opl.write, NULL, NULL,
-                     sb->opl.priv);
-    io_removehandler(addr + 8, 0x0002,
-                     sb->opl.read, NULL, NULL,
-                     sb->opl.write, NULL, NULL,
-                     sb->opl.priv);
-    io_removehandler(addr + 4, 0x0002,
-                     sb_ct1745_mixer_read, NULL, NULL,
-                     sb_ct1745_mixer_write, NULL, NULL,
-                     sb);
+    if (addr != 0x0000) {
+        io_removehandler(addr, 0x0004,
+                         sb->opl.read, NULL, NULL,
+                         sb->opl.write, NULL, NULL,
+                         sb->opl.priv);
+        io_removehandler(addr + 8, 0x0002,
+                         sb->opl.read, NULL, NULL,
+                         sb->opl.write, NULL, NULL,
+                         sb->opl.priv);
+        io_removehandler(addr + 4, 0x0002,
+                         sb_ct1745_mixer_read, NULL, NULL,
+                         sb_ct1745_mixer_write, NULL, NULL,
+                         sb);
+    }
 
     sb_dsp_setaddr(&sb->dsp, 0);
 
     addr = new_addr;
 
-    io_sethandler(addr, 0x0004,
-                  sb->opl.read, NULL, NULL,
-                  sb->opl.write, NULL, NULL,
-                  sb->opl.priv);
-    io_sethandler(addr + 8, 0x0002,
-                  sb->opl.read, NULL, NULL,
-                  sb->opl.write, NULL, NULL,
-                  sb->opl.priv);
-    io_sethandler(addr + 4, 0x0002,
-                  sb_ct1745_mixer_read, NULL, NULL,
-                  sb_ct1745_mixer_write, NULL, NULL,
-                  sb);
+    if (addr != 0x0000) {
+        io_sethandler(addr, 0x0004,
+                      sb->opl.read, NULL, NULL,
+                      sb->opl.write, NULL, NULL,
+                      sb->opl.priv);
+        io_sethandler(addr + 8, 0x0002,
+                      sb->opl.read, NULL, NULL,
+                      sb->opl.write, NULL, NULL,
+                      sb->opl.priv);
+        io_sethandler(addr + 4, 0x0002,
+                      sb_ct1745_mixer_read, NULL, NULL,
+                      sb_ct1745_mixer_write, NULL, NULL,
+                      sb);
+    }
 
     sb_dsp_setaddr(&sb->dsp, addr);
 }
 
 static void
-sb_16_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *priv)
+sb_16_pnp_config_changed(const uint8_t ld, isapnp_device_config_t *config, void *priv)
 {
     sb_t    *sb   = (sb_t *) priv;
     uint16_t addr = sb->dsp.sb_addr;
-    uint8_t  val;
 
     switch (ld) {
+        default:
+        case 4: /* StereoEnhance (32) */
+            break;
+
         case 0: /* Audio */
             io_removehandler(addr, 0x0004,
                              sb->opl.read, NULL, NULL,
@@ -1561,6 +2174,8 @@ sb_16_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *priv)
             mpu401_change_addr(sb->mpu, 0);
 
             if (config->activate) {
+                uint8_t val = config->irq[0].irq;
+
                 addr = config->io[0].base;
                 if (addr != ISAPNP_IO_DISABLED) {
                     io_sethandler(addr, 0x0004,
@@ -1592,7 +2207,6 @@ sb_16_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *priv)
                                   sb->opl.priv);
                 }
 
-                val = config->irq[0].irq;
                 if (val != ISAPNP_IRQ_DISABLED)
                     sb_dsp_setirq(&sb->dsp, val);
 
@@ -1614,30 +2228,25 @@ sb_16_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *priv)
             break;
 
         case 1: /* IDE */
-            ide_pnp_config_changed(0, config, (void *) 3);
+            if (sb->has_ide)
+                ide_pnp_config_changed(0, config, (void *) 3);
             break;
 
         case 2: /* Reserved (16) / WaveTable (32+) */
-            if (sb->dsp.sb_type > SB16)
+            if (sb->dsp.sb_type >= SBAWE32_DSP_412)
                 emu8k_change_addr(&sb->emu8k, (config->activate && (config->io[0].base != ISAPNP_IO_DISABLED)) ? config->io[0].base : 0);
             break;
 
         case 3: /* Game */
             gameport_remap(sb->gameport, (config->activate && (config->io[0].base != ISAPNP_IO_DISABLED)) ? config->io[0].base : 0);
             break;
-
-        case 4: /* StereoEnhance (32) */
-            break;
-
-        default:
-            break;
     }
 }
 
 static void
-sb_vibra16_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *priv)
+sb_vibra16_pnp_config_changed(const uint8_t ld, isapnp_device_config_t *config, void *priv)
 {
-    sb_t    *sb   = (sb_t *) priv;
+    sb_t *sb = (sb_t *) priv;
 
     switch (ld) {
         case 0: /* Audio */
@@ -1651,7 +2260,22 @@ sb_vibra16_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *
 }
 
 static void
-sb_awe32_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *priv)
+goldfinch_pnp_config_changed(const uint8_t ld, isapnp_device_config_t *config, void *priv)
+{
+    goldfinch_t *goldfinch = (goldfinch_t *) priv;
+
+    switch (ld) {
+        default:
+            break;
+
+        case 0: /* WaveTable */
+            emu8k_change_addr(&goldfinch->emu8k, (config->activate && (config->io[0].base != ISAPNP_IO_DISABLED)) ? config->io[0].base : 0);
+            break;
+    }
+}
+
+static void
+sb_awe32_pnp_config_changed(const uint8_t ld, isapnp_device_config_t *config, void *priv)
 {
     sb_t *sb = (sb_t *) priv;
 
@@ -1672,7 +2296,28 @@ sb_awe32_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *pr
 }
 
 static void
-sb_awe64_gold_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *priv)
+sb_awe64_pnp_ide_config_changed(const uint8_t ld, isapnp_device_config_t *config, void *priv)
+{
+    sb_t *sb = (sb_t *) priv;
+
+    switch (ld) {
+        case 0: /* Audio */
+        case 2: /* WaveTable */
+            sb_16_pnp_config_changed(ld, config, sb);
+            break;
+
+        case 1: /* Game */
+        case 3: /* IDE */
+            sb_16_pnp_config_changed(ld ^ 2, config, sb);
+            break;
+
+        default:
+            break;
+    }
+}
+
+static void
+sb_awe64_pnp_noide_config_changed(const uint8_t ld, isapnp_device_config_t *config, void *priv)
 {
     sb_t *sb = (sb_t *) priv;
 
@@ -1691,173 +2336,552 @@ sb_awe64_gold_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, voi
     }
 }
 
-void *
-sb_1_init(UNUSED(const device_t *info))
+static void
+ess_x688_pnp_config_changed(UNUSED(const uint8_t ld), isapnp_device_config_t *config, void *priv)
 {
-    /* SB1/2 port mappings, 210h to 260h in 10h steps
-       2x0 to 2x3 -> CMS chip
-       2x6, 2xA, 2xC, 2xE -> DSP chip
-       2x8, 2x9, 388 and 389 FM chip */
-    sb_t    *sb   = malloc(sizeof(sb_t));
-    uint16_t addr = device_get_config_hex16("base");
-    memset(sb, 0, sizeof(sb_t));
+    sb_t    *ess  = (sb_t *) priv;
+    uint16_t addr = ess->dsp.sb_addr;
+    uint8_t  val;
 
-    sb->opl_enabled = device_get_config_int("opl");
-    if (sb->opl_enabled)
-        fm_driver_get(FM_YM3812, &sb->opl);
+    switch (ld) {
+        case 0: /* Audio */
+            io_removehandler(addr, 0x0004,
+                             ess->opl.read, NULL, NULL,
+                             ess->opl.write, NULL, NULL,
+                             ess->opl.priv);
+            io_removehandler(addr + 8, 0x0002,
+                             ess->opl.read, NULL, NULL,
+                             ess->opl.write, NULL, NULL,
+                             ess->opl.priv);
+            io_removehandler(addr + 8, 0x0002,
+                             ess_fm_midi_read, NULL, NULL,
+                             ess_fm_midi_write, NULL, NULL,
+                             ess);
+            io_removehandler(addr + 4, 0x0002,
+                             ess_mixer_read, NULL, NULL,
+                             ess_mixer_write, NULL, NULL,
+                             ess);
+
+            io_removehandler(addr + 2, 0x0004,
+                             ess_base_read, NULL, NULL,
+                             ess_base_write, NULL, NULL,
+                             ess);
+            io_removehandler(addr + 6, 0x0001,
+                             ess_base_read, NULL, NULL,
+                             ess_base_write, NULL, NULL,
+                             ess);
+            io_removehandler(addr + 0x0a, 0x0006,
+                             ess_base_read, NULL, NULL,
+                             ess_base_write, NULL, NULL,
+                             ess);
+
+            addr = ess->opl_pnp_addr;
+            if (addr) {
+                ess->opl_pnp_addr = 0;
+                io_removehandler(addr, 0x0004,
+                                 ess->opl.read, NULL, NULL,
+                                 ess->opl.write, NULL, NULL,
+                                 ess->opl.priv);
+                io_removehandler(addr, 0x0004,
+                                 ess_fm_midi_read, NULL, NULL,
+                                 ess_fm_midi_write, NULL, NULL,
+                                 ess);
+            }
+
+            if (ess->pnp == 3) {
+                addr = ess->midi_addr;
+                if (addr) {
+                    ess->midi_addr = 0;
+                    if (ess->mpu != NULL)
+                        mpu401_change_addr(ess->mpu, 0);
+                    io_removehandler(addr, 0x0002,
+                                     ess_fm_midi_read, NULL, NULL,
+                                     ess_fm_midi_write, NULL, NULL,
+                                     ess);
+                }
+            }
+
+            sb_dsp_setaddr(&ess->dsp, 0);
+            sb_dsp_setirq(&ess->dsp, 0);
+            if ((ess->pnp == 3) && (ess->mpu != NULL))
+                mpu401_setirq(ess->mpu, -1);
+            sb_dsp_setdma8(&ess->dsp, ISAPNP_DMA_DISABLED);
+            sb_dsp_setdma16_8(&ess->dsp, ISAPNP_DMA_DISABLED);
+
+            if (config->activate) {
+                addr = config->io[0].base;
+                if (addr != ISAPNP_IO_DISABLED) {
+                    io_sethandler(addr, 0x0004,
+                                  ess->opl.read, NULL, NULL,
+                                  ess->opl.write, NULL, NULL,
+                                  ess->opl.priv);
+                    io_sethandler(addr + 8, 0x0002,
+                                  ess->opl.read, NULL, NULL,
+                                  ess->opl.write, NULL, NULL,
+                                  ess->opl.priv);
+                    io_sethandler(addr + 8, 0x0002,
+                                  ess_fm_midi_read, NULL, NULL,
+                                  ess_fm_midi_write, NULL, NULL,
+                                  ess);
+                    io_sethandler(addr + 4, 0x0002,
+                                  ess_mixer_read, NULL, NULL,
+                                  ess_mixer_write, NULL, NULL,
+                                  ess);
+
+                    sb_dsp_setaddr(&ess->dsp, addr);
+                    io_sethandler(addr + 2, 0x0004,
+                                  ess_base_read, NULL, NULL,
+                                  ess_base_write, NULL, NULL,
+                                  ess);
+                    io_sethandler(addr + 6, 0x0001,
+                                  ess_base_read, NULL, NULL,
+                                  ess_base_write, NULL, NULL,
+                                  ess);
+                    io_sethandler(addr + 0x0a, 0x0006,
+                                  ess_base_read, NULL, NULL,
+                                  ess_base_write, NULL, NULL,
+                                  ess);
+                }
+
+                addr = config->io[1].base;
+                if (addr != ISAPNP_IO_DISABLED) {
+                    ess->opl_pnp_addr = addr;
+                    io_sethandler(addr, 0x0004,
+                                  ess->opl.read, NULL, NULL,
+                                  ess->opl.write, NULL, NULL,
+                                  ess->opl.priv);
+                    io_sethandler(addr, 0x0004,
+                                  ess_fm_midi_read, NULL, NULL,
+                                  ess_fm_midi_write, NULL, NULL,
+                                  ess);
+                }
+
+                if (ess->pnp == 3) {
+                    addr = config->io[2].base;
+                    if (addr != ISAPNP_IO_DISABLED) {
+                        if (ess->mpu != NULL)
+                            mpu401_change_addr(ess->mpu, addr);
+                        io_sethandler(addr, 0x0002,
+                                      ess_fm_midi_read, NULL, NULL,
+                                      ess_fm_midi_write, NULL, NULL,
+                                      ess);
+                    }
+                }
+
+                val = config->irq[0].irq;
+                if (val != ISAPNP_IRQ_DISABLED) {
+                    sb_dsp_setirq(&ess->dsp, val);
+                    if ((ess->pnp == 3) && (ess->mpu != NULL))
+                        mpu401_setirq(ess->mpu, val);
+                }
+
+                val = config->dma[0].dma;
+                if (val != ISAPNP_DMA_DISABLED) {
+                    sb_dsp_setdma8(&ess->dsp, val);
+                    sb_dsp_setdma16_8(&ess->dsp, val);
+                }
+            }
+            break;
+
+        case 1:
+            if (ess->pnp == 3) { /* Game */
+                gameport_remap(ess->gameport, (config->activate && (config->io[0].base != ISAPNP_IO_DISABLED)) ? config->io[0].base : 0);
+            } else if (ess->mpu != NULL) { /* MPU-401 */
+                mpu401_change_addr(ess->mpu, 0);
+                mpu401_setirq(ess->mpu, -1);
+
+                if (config->activate) {
+                    addr = config->io[0].base;
+                    if (addr != ISAPNP_IO_DISABLED)
+                        mpu401_change_addr(ess->mpu, addr);
+
+                    val = config->irq[0].irq;
+                    if (val != ISAPNP_IRQ_DISABLED)
+                        mpu401_setirq(ess->mpu, val);
+                }
+            }
+            break;
+
+        case 2:
+            if (ess->pnp == 3) /* IDE */
+                ide_pnp_config_changed_1addr(0, config, (void *) 3);
+            else /* Game */
+                gameport_remap(ess->gameport, (config->activate && (config->io[0].base != ISAPNP_IO_DISABLED)) ? config->io[0].base : 0);
+            break;
+
+        case 3:
+            if (ess->pnp <= 2) /* IDE */
+                ide_pnp_config_changed_1addr(0, config, (void *) 3);
+            break;
+
+        default:
+            break;
+    }
+}
+
+/* This function is common to all the ESS MCA cards. */
+static uint8_t
+ess_x688_mca_read(const int port, void *priv)
+{
+    const sb_t   *ess = (sb_t *) priv;
+    const uint8_t ret = ess->pos_regs[port & 7];
+
+    sb_log("ess_mca_read: port=%04x ret=%02x\n", port, ret);
+
+    return ret;
+}
+
+static void
+ess_soundpiper_mca_write(const int port, const uint8_t val, void *priv)
+{
+    sb_t *ess = (sb_t *) priv;
+
+    if (port < 0x102)
+        return;
+
+    sb_log("ess_soundpiper_mca_write: port=%04x val=%02x\n", port, val);
+
+    if (ess->dsp.sb_addr != 0x0000) {
+        io_removehandler(ess->dsp.sb_addr, 0x0004,
+                         ess->opl.read, NULL, NULL,
+                         ess->opl.write, NULL, NULL,
+                         ess->opl.priv);
+        io_removehandler(ess->dsp.sb_addr + 8, 0x0002,
+                         ess->opl.read, NULL, NULL,
+                         ess->opl.write, NULL, NULL,
+                         ess->opl.priv);
+        io_removehandler(ess->dsp.sb_addr + 8, 0x0002,
+                         ess_fm_midi_read, NULL, NULL,
+                         ess_fm_midi_write, NULL, NULL,
+                         ess);
+        io_removehandler(0x0388, 0x0004,
+                         ess->opl.read, NULL, NULL,
+                         ess->opl.write, NULL, NULL,
+                         ess->opl.priv);
+        io_removehandler(0x0388, 0x0004,
+                         ess_fm_midi_read, NULL, NULL,
+                         ess_fm_midi_write, NULL, NULL,
+                         ess);
+        io_removehandler(ess->dsp.sb_addr + 4, 0x0002,
+                         ess_mixer_read, NULL, NULL,
+                         ess_mixer_write, NULL, NULL,
+                         ess);
+
+        io_removehandler(ess->dsp.sb_addr + 2, 0x0004,
+                         ess_base_read, NULL, NULL,
+                         ess_base_write, NULL, NULL,
+                         ess);
+        io_removehandler(ess->dsp.sb_addr + 6, 0x0001,
+                         ess_base_read, NULL, NULL,
+                         ess_base_write, NULL, NULL,
+                         ess);
+        io_removehandler(ess->dsp.sb_addr + 0x0a, 0x0006,
+                         ess_base_read, NULL, NULL,
+                         ess_base_write, NULL, NULL,
+                         ess);
+    }
 
-    sb_dsp_init(&sb->dsp, SB1, SB_SUBTYPE_DEFAULT, sb);
-    sb_dsp_setaddr(&sb->dsp, addr);
-    sb_dsp_setirq(&sb->dsp, device_get_config_int("irq"));
-    sb_dsp_setdma8(&sb->dsp, device_get_config_int("dma"));
     /* DSP I/O handler is activated in sb_dsp_setaddr */
-    if (sb->opl_enabled) {
-        io_sethandler(addr + 8, 0x0002,
-                      sb->opl.read, NULL, NULL,
-                      sb->opl.write, NULL, NULL,
-                      sb->opl.priv);
-        io_sethandler(0x0388, 0x0002,
-                      sb->opl.read, NULL, NULL,
-                      sb->opl.write, NULL, NULL,
-                      sb->opl.priv);
+    sb_dsp_setaddr(&ess->dsp, 0);
+    gameport_remap(ess->gameport, 0);
+
+    if (ess->dsp.sb_subtype == SB_SUBTYPE_ESS_ES1688) {
+        mpu401_change_addr(ess->mpu, 0);
+
+        io_removehandler(0x0330, 0x0002,
+                         ess_fm_midi_read, NULL, NULL,
+                         ess_fm_midi_write, NULL, NULL,
+                         ess);
     }
 
-    sb->cms_enabled = 1;
-    memset(&sb->cms, 0, sizeof(cms_t));
-    io_sethandler(addr, 0x0004,
-                  cms_read, NULL, NULL,
-                  cms_write, NULL, NULL,
-                  &sb->cms);
+    ess->pos_regs[port & 7] = val;
 
-    sb->mixer_enabled = 0;
-    sound_add_handler(sb_get_buffer_sb2, sb);
-    sound_set_cd_audio_filter(sb2_filter_cd_audio, sb);
+    if (ess->pos_regs[2] & 1) {
+        switch (ess->pos_regs[2] & 0x0e) {
+            default:
+                ess->dsp.sb_addr = 0x0000;
+                break;
+            case 0x08:
+                ess->dsp.sb_addr = 0x0220;
+                break;
+            case 0x0c:
+                ess->dsp.sb_addr = 0x0240;
+                break;
+        }
 
-    if (device_get_config_int("receive_input"))
-        midi_in_handler(1, sb_dsp_input_msg, sb_dsp_input_sysex, &sb->dsp);
+        if (ess->dsp.sb_addr != 0x0000) {
+            io_sethandler(ess->dsp.sb_addr, 0x0004,
+                          ess->opl.read, NULL, NULL,
+                          ess->opl.write, NULL, NULL,
+                          ess->opl.priv);
+            io_sethandler(ess->dsp.sb_addr + 8, 0x0002,
+                          ess->opl.read, NULL, NULL,
+                          ess->opl.write, NULL, NULL,
+                          ess->opl.priv);
+            io_sethandler(ess->dsp.sb_addr + 8, 0x0002,
+                          ess_fm_midi_read, NULL, NULL,
+                          ess_fm_midi_write, NULL, NULL,
+                          ess);
+            io_sethandler(0x0388, 0x0004,
+                          ess->opl.read, NULL, NULL,
+                          ess->opl.write, NULL, NULL, ess->opl.priv);
+            io_sethandler(0x0388, 0x0004,
+                          ess_fm_midi_read, NULL, NULL,
+                          ess_fm_midi_write, NULL, NULL,
+                          ess);
+            io_sethandler(ess->dsp.sb_addr + 4, 0x0002,
+                          ess_mixer_read, NULL, NULL,
+                          ess_mixer_write, NULL, NULL,
+                          ess);
 
-    return sb;
+            io_sethandler(ess->dsp.sb_addr + 2, 0x0004,
+                          ess_base_read, NULL, NULL,
+                          ess_base_write, NULL, NULL,
+                          ess);
+            io_sethandler(ess->dsp.sb_addr + 6, 0x0001,
+                          ess_base_read, NULL, NULL,
+                          ess_base_write, NULL, NULL,
+                          ess);
+            io_sethandler(ess->dsp.sb_addr + 0x0a, 0x0006,
+                          ess_base_read, NULL, NULL,
+                          ess_base_write, NULL, NULL,
+                          ess);
+
+            if (ess->dsp.sb_subtype == SB_SUBTYPE_ESS_ES1688) {
+                mpu401_change_addr(ess->mpu, ess->pos_regs[3] & 0x02 ? 0x0330 : 0);
+
+                if (ess->pos_regs[3] & 0x02)
+                    io_sethandler(0x0330, 0x0002,
+                                  ess_fm_midi_read, NULL, NULL,
+                                  ess_fm_midi_write, NULL, NULL,
+                                  ess);
+            }
+        }
+
+        /* DSP I/O handler is activated in sb_dsp_setaddr */
+        sb_dsp_setaddr(&ess->dsp, ess->dsp.sb_addr);
+        gameport_remap(ess->gameport, (ess->pos_regs[3] & 0x01) ? 0x200 : 0);
+    }
+
+    switch (ess->pos_regs[3] & 0xc0) {
+        default:
+            break;
+        case 0x80:
+            sb_dsp_setirq(&ess->dsp, 9);
+            if (ess->dsp.sb_subtype == SB_SUBTYPE_ESS_ES1688)
+                mpu401_setirq(ess->mpu, 9);
+            break;
+        case 0xa0:
+            sb_dsp_setirq(&ess->dsp, 5);
+            if (ess->dsp.sb_subtype == SB_SUBTYPE_ESS_ES1688)
+                mpu401_setirq(ess->mpu, 5);
+            break;
+        case 0xc0:
+            sb_dsp_setirq(&ess->dsp, 7);
+            if (ess->dsp.sb_subtype == SB_SUBTYPE_ESS_ES1688)
+                mpu401_setirq(ess->mpu, 7);
+            break;
+        case 0xe0:
+            sb_dsp_setirq(&ess->dsp, 10);
+            if (ess->dsp.sb_subtype == SB_SUBTYPE_ESS_ES1688)
+                mpu401_setirq(ess->mpu, 10);
+            break;
+    }
+
+    if (ess->pos_regs[3] & 0x04) {
+        sb_dsp_setdma8(&ess->dsp, ess->pos_regs[2] >> 4);
+        sb_dsp_setdma16_8(&ess->dsp, ess->pos_regs[2] >> 4);
+    }
 }
 
-void *
-sb_15_init(UNUSED(const device_t *info))
+static void
+ess_chipchat_mca_write(int port, uint8_t val, void *priv)
 {
-    /* SB1/2 port mappings, 210h to 260h in 10h steps
-       2x0 to 2x3 -> CMS chip
-       2x6, 2xA, 2xC, 2xE -> DSP chip
-       2x8, 2x9, 388 and 389 FM chip */
-    sb_t    *sb   = malloc(sizeof(sb_t));
-    uint16_t addr = device_get_config_hex16("base");
-    memset(sb, 0, sizeof(sb_t));
+    sb_t *ess = (sb_t *) priv;
 
-    sb->opl_enabled = device_get_config_int("opl");
-    if (sb->opl_enabled)
-        fm_driver_get(FM_YM3812, &sb->opl);
+    if (port < 0x102)
+        return;
+
+    sb_log("ess_chipchat_mca_write: port=%04x val=%02x\n", port, val);
+
+    if (ess->dsp.sb_addr != 0x0000) {
+        io_removehandler(ess->dsp.sb_addr, 0x0004,
+                         ess->opl.read, NULL, NULL,
+                         ess->opl.write, NULL, NULL,
+                         ess->opl.priv);
+        io_removehandler(ess->dsp.sb_addr + 8, 0x0002,
+                         ess->opl.read, NULL, NULL,
+                         ess->opl.write, NULL, NULL,
+                         ess->opl.priv);
+        io_removehandler(ess->dsp.sb_addr + 8, 0x0002,
+                         ess_fm_midi_read, NULL, NULL,
+                         ess_fm_midi_write, NULL, NULL,
+                         ess);
+        io_removehandler(0x0388, 0x0004,
+                         ess->opl.read, NULL, NULL,
+                         ess->opl.write, NULL, NULL,
+                         ess->opl.priv);
+        io_removehandler(0x0388, 0x0004,
+                         ess_fm_midi_read, NULL, NULL,
+                         ess_fm_midi_write, NULL, NULL,
+                         ess);
+        io_removehandler(ess->dsp.sb_addr + 4, 0x0002,
+                         ess_mixer_read, NULL, NULL,
+                         ess_mixer_write, NULL, NULL,
+                         ess);
+
+        io_removehandler(ess->dsp.sb_addr + 2, 0x0004,
+                         ess_base_read, NULL, NULL,
+                         ess_base_write, NULL, NULL,
+                         ess);
+        io_removehandler(ess->dsp.sb_addr + 6, 0x0001,
+                         ess_base_read, NULL, NULL,
+                         ess_base_write, NULL, NULL,
+                         ess);
+        io_removehandler(ess->dsp.sb_addr + 0x0a, 0x0006,
+                         ess_base_read, NULL, NULL,
+                         ess_base_write, NULL, NULL,
+                         ess);
+    }
 
-    sb_dsp_init(&sb->dsp, SB15, SB_SUBTYPE_DEFAULT, sb);
-    sb_dsp_setaddr(&sb->dsp, addr);
-    sb_dsp_setirq(&sb->dsp, device_get_config_int("irq"));
-    sb_dsp_setdma8(&sb->dsp, device_get_config_int("dma"));
     /* DSP I/O handler is activated in sb_dsp_setaddr */
-    if (sb->opl_enabled) {
-        io_sethandler(addr + 8, 0x0002,
-                      sb->opl.read, NULL, NULL,
-                      sb->opl.write, NULL, NULL,
-                      sb->opl.priv);
-        io_sethandler(0x0388, 0x0002,
-                      sb->opl.read, NULL, NULL,
-                      sb->opl.write, NULL, NULL,
-                      sb->opl.priv);
+    sb_dsp_setaddr(&ess->dsp, 0);
+    gameport_remap(ess->gameport, 0);
+
+    if (ess->dsp.sb_subtype == SB_SUBTYPE_ESS_ES1688) {
+        mpu401_change_addr(ess->mpu, 0);
+
+        io_removehandler(0x0330, 0x0002,
+                         ess_fm_midi_read, NULL, NULL,
+                         ess_fm_midi_write, NULL, NULL,
+                         ess);
     }
 
-    sb->cms_enabled = device_get_config_int("cms");
-    if (sb->cms_enabled) {
-        memset(&sb->cms, 0, sizeof(cms_t));
-        io_sethandler(addr, 0x0004,
-                      cms_read, NULL, NULL,
-                      cms_write, NULL, NULL,
-                      &sb->cms);
+    ess->pos_regs[port & 7] = val;
+
+    if (ess->pos_regs[2] & 0x01) {
+        ess->dsp.sb_addr = 0x0220;
+
+        io_sethandler(ess->dsp.sb_addr, 0x0004,
+                      ess->opl.read, NULL, NULL,
+                      ess->opl.write, NULL, NULL,
+                      ess->opl.priv);
+        io_sethandler(ess->dsp.sb_addr + 8, 0x0002,
+                      ess->opl.read, NULL, NULL,
+                      ess->opl.write, NULL, NULL,
+                      ess->opl.priv);
+        io_sethandler(ess->dsp.sb_addr + 8, 0x0002,
+                      ess_fm_midi_read, NULL, NULL,
+                      ess_fm_midi_write, NULL, NULL,
+                      ess);
+        io_sethandler(0x0388, 0x0004,
+                      ess->opl.read, NULL, NULL,
+                      ess->opl.write, NULL, NULL, ess->opl.priv);
+        io_sethandler(0x0388, 0x0004,
+                      ess_fm_midi_read, NULL, NULL,
+                      ess_fm_midi_write, NULL, NULL,
+                      ess);
+        io_sethandler(ess->dsp.sb_addr + 4, 0x0002,
+                      ess_mixer_read, NULL, NULL,
+                      ess_mixer_write, NULL, NULL,
+                      ess);
+
+        io_sethandler(ess->dsp.sb_addr + 2, 0x0004,
+                      ess_base_read, NULL, NULL,
+                      ess_base_write, NULL, NULL,
+                      ess);
+        io_sethandler(ess->dsp.sb_addr + 6, 0x0001,
+                      ess_base_read, NULL, NULL,
+                      ess_base_write, NULL, NULL,
+                      ess);
+        io_sethandler(ess->dsp.sb_addr + 0x0a, 0x0006,
+                      ess_base_read, NULL, NULL,
+                      ess_base_write, NULL, NULL,
+                      ess);
+
+        if (ess->dsp.sb_subtype == SB_SUBTYPE_ESS_ES1688) {
+            mpu401_change_addr(ess->mpu, 0x0330);
+
+            io_sethandler(0x0330, 0x0002,
+                          ess_fm_midi_read, NULL, NULL,
+                          ess_fm_midi_write, NULL, NULL,
+                          ess);
+        }
+
+        /* DSP I/O handler is activated in sb_dsp_setaddr */
+        sb_dsp_setaddr(&ess->dsp, ess->dsp.sb_addr);
+        gameport_remap(ess->gameport, 0x0200);
+
+        sb_dsp_setirq(&ess->dsp, 7);
+        mpu401_setirq(ess->mpu, 7);
+
+        sb_dsp_setdma8(&ess->dsp, 1);
+        sb_dsp_setdma16_8(&ess->dsp, 1);
     }
-
-    sb->mixer_enabled = 0;
-    sound_add_handler(sb_get_buffer_sb2, sb);
-    sound_set_cd_audio_filter(sb2_filter_cd_audio, sb);
-
-    if (device_get_config_int("receive_input"))
-        midi_in_handler(1, sb_dsp_input_msg, sb_dsp_input_sysex, &sb->dsp);
-
-    return sb;
 }
 
 void *
-sb_mcv_init(UNUSED(const device_t *info))
+sb_init(UNUSED(const device_t *info))
 {
-    /* SB1/2 port mappings, 210h to 260h in 10h steps
-       2x6, 2xA, 2xC, 2xE -> DSP chip
-       2x8, 2x9, 388 and 389 FM chip */
-    sb_t *sb = malloc(sizeof(sb_t));
-    memset(sb, 0, sizeof(sb_t));
-
-    sb->opl_enabled = device_get_config_int("opl");
-    if (sb->opl_enabled)
-        fm_driver_get(FM_YM3812, &sb->opl);
-
-    sb_dsp_init(&sb->dsp, SB15, SB_SUBTYPE_DEFAULT, sb);
-    sb_dsp_setaddr(&sb->dsp, 0);
-    sb_dsp_setirq(&sb->dsp, device_get_config_int("irq"));
-    sb_dsp_setdma8(&sb->dsp, device_get_config_int("dma"));
-
-    sb->mixer_enabled = 0;
-    sound_add_handler(sb_get_buffer_sb2, sb);
-    sound_set_cd_audio_filter(sb2_filter_cd_audio, sb);
-
-    /* I/O handlers activated in sb_mcv_write */
-    mca_add(sb_mcv_read, sb_mcv_write, sb_mcv_feedb, NULL, sb);
-    sb->pos_regs[0] = 0x84;
-    sb->pos_regs[1] = 0x50;
-
-    if (device_get_config_int("receive_input"))
-        midi_in_handler(1, sb_dsp_input_msg, sb_dsp_input_sysex, &sb->dsp);
-
-    return sb;
-}
-
-void *
-sb_2_init(UNUSED(const device_t *info))
-{
-    /* SB2 port mappings, 220h or 240h.
-       2x0 to 2x3 -> CMS chip
-       2x6, 2xA, 2xC, 2xE -> DSP chip
-       2x8, 2x9, 388 and 389 FM chip
-       "CD version" also uses 250h or 260h for
-       2x0 to 2x3 -> CDROM interface
-       2x4 to 2x5 -> Mixer interface */
+    /* SB1.x port mappings, 210h to 260h in 10h steps:
+       (SB2 port mappings are 220h or 240h)
+           2x0 to 2x3 -> CMS chip
+           2x6, 2xA, 2xC, 2xE -> DSP chip
+           2x8, 2x9, 388 and 389 FM chip
+       SB2 "CD version" also uses 250h or 260h:
+           2x0 to 2x3 -> CDROM interface
+           2x4 to 2x5 -> Mixer interface */
     /* My SB 2.0 mirrors the OPL2 at ports 2x0/2x1. Presumably this mirror is disabled when the
        CMS chips are present.
        This mirror may also exist on SB 1.5 & MCV, however I am unable to test this. It shouldn't
        exist on SB 1.0 as the CMS chips are always present there. Syndicate requires this mirror
-       for music to play.*/
-    sb_t    *sb         = malloc(sizeof(sb_t));
-    uint16_t addr       = device_get_config_hex16("base");
-    uint16_t mixer_addr = device_get_config_int("mixaddr");
+       for music to play. */
+    sb_t          *sb         = calloc(1, sizeof(sb_t));
+    const uint16_t addr       = device_get_config_hex16("base");
+    uint16_t       mixer_addr = 0x0000;
+    uint8_t        model      = 0;
 
-    memset(sb, 0, sizeof(sb_t));
+    switch (info->local) {
+        default:
+        case SB_1:
+            model           = SB_DSP_105;
+            sb->cms_enabled = 1;
+            break;
+
+        case SB_15:
+            model           = SB_DSP_200;
+            sb->cms_enabled = device_get_config_int("cms");
+            break;
+
+        case SB_2:
+            model           = SB_DSP_201;
+            sb->cms_enabled = device_get_config_int("cms");
+            mixer_addr      = device_get_config_int("mixaddr");
+            break;
+    }
 
     sb->opl_enabled = device_get_config_int("opl");
     if (sb->opl_enabled)
         fm_driver_get(FM_YM3812, &sb->opl);
 
-    sb_dsp_init(&sb->dsp, SB2, SB_SUBTYPE_DEFAULT, sb);
+    sb_dsp_set_real_opl(&sb->dsp, 1);
+    sb_dsp_init(&sb->dsp, model, SB_SUBTYPE_DEFAULT, sb);
     sb_dsp_setaddr(&sb->dsp, addr);
     sb_dsp_setirq(&sb->dsp, device_get_config_int("irq"));
-    sb_dsp_setdma8(&sb->dsp, device_get_config_int("dma"));
-    if (mixer_addr > 0x000)
+    sb_dsp_setdma8(&sb->dsp, 1); // SB 1, SB1.5 and 2 don't support DMA3
+
+    if (mixer_addr > 0x0000)
         sb_ct1335_mixer_reset(sb);
 
-    sb->cms_enabled = device_get_config_int("cms");
+    if (device_get_config_int("gameport")) {
+        sb->gameport      = gameport_add(&gameport_200_device);
+        sb->gameport_addr = 0x200;
+    }
+
     /* DSP I/O handler is activated in sb_dsp_setaddr */
     if (sb->opl_enabled) {
-        if (!sb->cms_enabled) {
+        // TODO: See if this applies to the SB1.5 as well
+        if ((!sb->cms_enabled) && ((model == SB_DSP_201) || (model == SB_DSP_202))) {
             io_sethandler(addr, 0x0002,
                           sb->opl.read, NULL, NULL,
                           sb->opl.write, NULL, NULL,
@@ -1889,7 +2913,10 @@ sb_2_init(UNUSED(const device_t *info))
                       sb);
     } else
         sb->mixer_enabled = 0;
+
     sound_add_handler(sb_get_buffer_sb2, sb);
+    if (sb->opl_enabled)
+        music_add_handler(sb_get_music_buffer_sb2, sb);
     sound_set_cd_audio_filter(sb2_filter_cd_audio, sb);
 
     if (device_get_config_int("receive_input"))
@@ -1898,6 +2925,46 @@ sb_2_init(UNUSED(const device_t *info))
     return sb;
 }
 
+void *
+sb_mcv_init(UNUSED(const device_t *info))
+{
+    /* SB1/2 port mappings, 210h to 260h in 10h steps
+       2x6, 2xA, 2xC, 2xE -> DSP chip
+       2x8, 2x9, 388 and 389 FM chip */
+    sb_t *sb = calloc(1, sizeof(sb_t));
+
+    sb->opl_enabled = device_get_config_int("opl");
+    if (sb->opl_enabled)
+        fm_driver_get(FM_YM3812, &sb->opl);
+
+    sb_dsp_set_real_opl(&sb->dsp, 1);
+    sb_dsp_init(&sb->dsp, SB_DSP_105, SB_SUBTYPE_DEFAULT, sb);
+    sb_dsp_setaddr(&sb->dsp, 0);
+    sb_dsp_setirq(&sb->dsp, device_get_config_int("irq"));
+    sb_dsp_setdma8(&sb->dsp, device_get_config_int("dma"));
+
+    sb->mixer_enabled = 0;
+    sound_add_handler(sb_get_buffer_sb2, sb);
+    if (sb->opl_enabled)
+        music_add_handler(sb_get_music_buffer_sb2, sb);
+    sound_set_cd_audio_filter(sb2_filter_cd_audio, sb);
+
+    /* I/O handlers activated in sb_mcv_write */
+    mca_add(sb_mcv_read, sb_mcv_write, sb_mcv_feedb, NULL, sb);
+    sb->pos_regs[0] = 0x84;
+    sb->pos_regs[1] = 0x50;
+
+    if (device_get_config_int("receive_input"))
+        midi_in_handler(1, sb_dsp_input_msg, sb_dsp_input_sysex, &sb->dsp);
+
+    if (device_get_config_int("gameport")) {
+        sb->gameport      = gameport_add(&gameport_200_device);
+        sb->gameport_addr = 0x200;
+    }
+
+    return sb;
+}
+
 static uint8_t
 sb_pro_v1_opl_read(uint16_t port, void *priv)
 {
@@ -1927,9 +2994,8 @@ sb_pro_v1_init(UNUSED(const device_t *info))
        2x6, 2xA, 2xC, 2xE -> DSP chip
        2x8, 2x9, 388 and 389 FM chip (9 voices)
        2x0+10 to 2x0+13 CDROM interface. */
-    sb_t    *sb   = malloc(sizeof(sb_t));
+    sb_t    *sb   = calloc(1, sizeof(sb_t));
     uint16_t addr = device_get_config_hex16("base");
-    memset(sb, 0, sizeof(sb_t));
 
     sb->opl_enabled = device_get_config_int("opl");
     if (sb->opl_enabled) {
@@ -1939,7 +3005,8 @@ sb_pro_v1_init(UNUSED(const device_t *info))
         sb->opl2.set_do_cycles(sb->opl2.priv, 0);
     }
 
-    sb_dsp_init(&sb->dsp, SBPRO, SB_SUBTYPE_DEFAULT, sb);
+    sb_dsp_set_real_opl(&sb->dsp, 1);
+    sb_dsp_init(&sb->dsp, SBPRO_DSP_300, SB_SUBTYPE_DEFAULT, sb);
     sb_dsp_setaddr(&sb->dsp, addr);
     sb_dsp_setirq(&sb->dsp, device_get_config_int("irq"));
     sb_dsp_setdma8(&sb->dsp, device_get_config_int("dma"));
@@ -1970,11 +3037,18 @@ sb_pro_v1_init(UNUSED(const device_t *info))
                   sb_ct1345_mixer_write, NULL, NULL,
                   sb);
     sound_add_handler(sb_get_buffer_sbpro, sb);
+    if (sb->opl_enabled)
+        music_add_handler(sb_get_music_buffer_sbpro, sb);
     sound_set_cd_audio_filter(sbpro_filter_cd_audio, sb);
 
     if (device_get_config_int("receive_input"))
         midi_in_handler(1, sb_dsp_input_msg, sb_dsp_input_sysex, &sb->dsp);
 
+    if (device_get_config_int("gameport")) {
+        sb->gameport      = gameport_add(&gameport_200_device);
+        sb->gameport_addr = 0x200;
+    }
+
     return sb;
 }
 
@@ -1987,15 +3061,15 @@ sb_pro_v2_init(UNUSED(const device_t *info))
        2x6, 2xA, 2xC, 2xE -> DSP chip
        2x8, 2x9, 388 and 389 FM chip (9 voices)
        2x0+10 to 2x0+13 CDROM interface. */
-    sb_t    *sb   = malloc(sizeof(sb_t));
+    sb_t    *sb   = calloc(1, sizeof(sb_t));
     uint16_t addr = device_get_config_hex16("base");
-    memset(sb, 0, sizeof(sb_t));
 
     sb->opl_enabled = device_get_config_int("opl");
     if (sb->opl_enabled)
         fm_driver_get(FM_YMF262, &sb->opl);
 
-    sb_dsp_init(&sb->dsp, SBPRO2, SB_SUBTYPE_DEFAULT, sb);
+    sb_dsp_set_real_opl(&sb->dsp, 1);
+    sb_dsp_init(&sb->dsp, SBPRO2_DSP_302, SB_SUBTYPE_DEFAULT, sb);
     sb_dsp_setaddr(&sb->dsp, addr);
     sb_dsp_setirq(&sb->dsp, device_get_config_int("irq"));
     sb_dsp_setdma8(&sb->dsp, device_get_config_int("dma"));
@@ -2022,11 +3096,18 @@ sb_pro_v2_init(UNUSED(const device_t *info))
                   sb_ct1345_mixer_write, NULL, NULL,
                   sb);
     sound_add_handler(sb_get_buffer_sbpro, sb);
+    if (sb->opl_enabled)
+        music_add_handler(sb_get_music_buffer_sbpro, sb);
     sound_set_cd_audio_filter(sbpro_filter_cd_audio, sb);
 
     if (device_get_config_int("receive_input"))
         midi_in_handler(1, sb_dsp_input_msg, sb_dsp_input_sysex, &sb->dsp);
 
+    if (device_get_config_int("gameport")) {
+        sb->gameport      = gameport_add(&gameport_200_device);
+        sb->gameport_addr = 0x200;
+    }
+
     return sb;
 }
 
@@ -2038,17 +3119,18 @@ sb_pro_mcv_init(UNUSED(const device_t *info))
        2x4 to 2x5 -> Mixer interface
        2x6, 2xA, 2xC, 2xE -> DSP chip
        2x8, 2x9, 388 and 389 FM chip (9 voices) */
-    sb_t *sb = malloc(sizeof(sb_t));
-    memset(sb, 0, sizeof(sb_t));
+    sb_t *sb = calloc(1, sizeof(sb_t));
 
     sb->opl_enabled = 1;
     fm_driver_get(FM_YMF262, &sb->opl);
 
-    sb_dsp_init(&sb->dsp, SBPRO2, SB_SUBTYPE_DEFAULT, sb);
+    sb_dsp_set_real_opl(&sb->dsp, 1);
+    sb_dsp_init(&sb->dsp, SBPRO2_DSP_302, SB_SUBTYPE_DEFAULT, sb);
     sb_ct1345_mixer_reset(sb);
 
     sb->mixer_enabled = 1;
     sound_add_handler(sb_get_buffer_sbpro, sb);
+    music_add_handler(sb_get_music_buffer_sbpro, sb);
     sound_set_cd_audio_filter(sbpro_filter_cd_audio, sb);
 
     /* I/O handlers activated in sb_pro_mcv_write */
@@ -2059,25 +3141,31 @@ sb_pro_mcv_init(UNUSED(const device_t *info))
     if (device_get_config_int("receive_input"))
         midi_in_handler(1, sb_dsp_input_msg, sb_dsp_input_sysex, &sb->dsp);
 
+    if (device_get_config_int("gameport")) {
+        sb->gameport      = gameport_add(&gameport_200_device);
+        sb->gameport_addr = 0x200;
+    }
+
     return sb;
 }
 
 static void *
 sb_pro_compat_init(UNUSED(const device_t *info))
 {
-    sb_t *sb = malloc(sizeof(sb_t));
-    memset(sb, 0, sizeof(sb_t));
+    sb_t *sb = calloc(1, sizeof(sb_t));
 
     fm_driver_get(FM_YMF262, &sb->opl);
 
-    sb_dsp_init(&sb->dsp, SBPRO2, SB_SUBTYPE_DEFAULT, sb);
+    sb_dsp_set_real_opl(&sb->dsp, 1);
+    sb_dsp_init(&sb->dsp, SBPRO2_DSP_302, SB_SUBTYPE_DEFAULT, sb);
     sb_ct1345_mixer_reset(sb);
 
     sb->mixer_enabled = 1;
     sound_add_handler(sb_get_buffer_sbpro, sb);
+    if (sb->opl_enabled)
+        music_add_handler(sb_get_music_buffer_sbpro, sb);
 
-    sb->mpu = (mpu_t *) malloc(sizeof(mpu_t));
-    memset(sb->mpu, 0, sizeof(mpu_t));
+    sb->mpu = (mpu_t *) calloc(1, sizeof(mpu_t));
     mpu401_init(sb->mpu, 0, 0, M_UART, 1);
     sb_dsp_set_mpu(&sb->dsp, sb->mpu);
 
@@ -2087,17 +3175,16 @@ sb_pro_compat_init(UNUSED(const device_t *info))
 static void *
 sb_16_init(UNUSED(const device_t *info))
 {
-    sb_t    *sb       = malloc(sizeof(sb_t));
-    uint16_t addr     = device_get_config_hex16("base");
-    uint16_t mpu_addr = device_get_config_hex16("base401");
-
-    memset(sb, 0x00, sizeof(sb_t));
+    sb_t          *sb       = calloc(1, sizeof(sb_t));
+    const uint16_t addr     = device_get_config_hex16("base");
+    const uint16_t mpu_addr = device_get_config_hex16("base401");
 
     sb->opl_enabled = device_get_config_int("opl");
     if (sb->opl_enabled)
-        fm_driver_get(info->local, &sb->opl);
+        fm_driver_get((int) (intptr_t) info->local, &sb->opl);
 
-    sb_dsp_init(&sb->dsp, (info->local == FM_YMF289B) ? SBAWE32PNP : SB16, SB_SUBTYPE_DEFAULT, sb);
+    sb_dsp_set_real_opl(&sb->dsp, 1);
+    sb_dsp_init(&sb->dsp, (info->local == FM_YMF289B) ? SBAWE32_DSP_413 : SB16_DSP_405, SB_SUBTYPE_DEFAULT, sb);
     sb_dsp_setaddr(&sb->dsp, addr);
     sb_dsp_setirq(&sb->dsp, device_get_config_int("irq"));
     sb_dsp_setdma8(&sb->dsp, device_get_config_int("dma"));
@@ -2126,14 +3213,16 @@ sb_16_init(UNUSED(const device_t *info))
     io_sethandler(addr + 4, 0x0002, sb_ct1745_mixer_read, NULL, NULL,
                   sb_ct1745_mixer_write, NULL, NULL, sb);
     sound_add_handler(sb_get_buffer_sb16_awe32, sb);
+    if (sb->opl_enabled)
+        music_add_handler(sb_get_music_buffer_sb16_awe32, sb);
     sound_set_cd_audio_filter(sb16_awe32_filter_cd_audio, sb);
     if (device_get_config_int("control_pc_speaker"))
         sound_set_pc_speaker_filter(sb16_awe32_filter_pc_speaker, sb);
 
     if (mpu_addr) {
-        sb->mpu = (mpu_t *) malloc(sizeof(mpu_t));
-        memset(sb->mpu, 0, sizeof(mpu_t));
-        mpu401_init(sb->mpu, device_get_config_hex16("base401"), device_get_config_int("irq"), M_UART, device_get_config_int("receive_input401"));
+        sb->mpu = (mpu_t *) calloc(1, sizeof(mpu_t));
+        mpu401_init(sb->mpu, device_get_config_hex16("base401"), 0, M_UART,
+                    device_get_config_int("receive_input401"));
     } else
         sb->mpu = NULL;
     sb_dsp_set_mpu(&sb->dsp, sb->mpu);
@@ -2141,9 +3230,16 @@ sb_16_init(UNUSED(const device_t *info))
     if (device_get_config_int("receive_input"))
         midi_in_handler(1, sb_dsp_input_msg, sb_dsp_input_sysex, &sb->dsp);
 
-    sb->gameport = gameport_add(&gameport_pnp_device);
-    sb->gameport_addr = 0x200;
-    gameport_remap(sb->gameport, sb->gameport_addr);
+    if (info->local == FM_YMF289B) {
+        sb->gameport      = gameport_add(&gameport_pnp_device);
+        sb->gameport_addr = 0x200;
+        gameport_remap(sb->gameport, sb->gameport_addr);
+    } else {
+        if (device_get_config_int("gameport")) {
+            sb->gameport      = gameport_add(&gameport_200_device);
+            sb->gameport_addr = 0x200;
+        }
+    }
 
     return sb;
 }
@@ -2151,13 +3247,13 @@ sb_16_init(UNUSED(const device_t *info))
 static void *
 sb_16_reply_mca_init(UNUSED(const device_t *info))
 {
-    sb_t *sb = malloc(sizeof(sb_t));
-    memset(sb, 0x00, sizeof(sb_t));
+    sb_t *sb = calloc(1, sizeof(sb_t));
 
     sb->opl_enabled = 1;
     fm_driver_get(FM_YMF262, &sb->opl);
 
-    sb_dsp_init(&sb->dsp, SB16, SB_SUBTYPE_DEFAULT, sb);
+    sb_dsp_set_real_opl(&sb->dsp, 1);
+    sb_dsp_init(&sb->dsp, SB16_DSP_405, SB_SUBTYPE_DEFAULT, sb);
     sb_dsp_setdma16_supported(&sb->dsp, 1);
     sb_dsp_setdma16_enabled(&sb->dsp, 1);
     sb_ct1745_mixer_reset(sb);
@@ -2165,19 +3261,19 @@ sb_16_reply_mca_init(UNUSED(const device_t *info))
     sb->mixer_enabled            = 1;
     sb->mixer_sb16.output_filter = 1;
     sound_add_handler(sb_get_buffer_sb16_awe32, sb);
+    music_add_handler(sb_get_music_buffer_sb16_awe32, sb);
     sound_set_cd_audio_filter(sb16_awe32_filter_cd_audio, sb);
     if (device_get_config_int("control_pc_speaker"))
         sound_set_pc_speaker_filter(sb16_awe32_filter_pc_speaker, sb);
 
-    sb->mpu = (mpu_t *) malloc(sizeof(mpu_t));
-    memset(sb->mpu, 0, sizeof(mpu_t));
+    sb->mpu = (mpu_t *) calloc(1, sizeof(mpu_t));
     mpu401_init(sb->mpu, 0, 0, M_UART, device_get_config_int("receive_input401"));
     sb_dsp_set_mpu(&sb->dsp, sb->mpu);
 
     if (device_get_config_int("receive_input"))
         midi_in_handler(1, sb_dsp_input_msg, sb_dsp_input_sysex, &sb->dsp);
 
-    sb->gameport = gameport_add(&gameport_device);
+    sb->gameport = gameport_add(&gameport_200_device);
 
     /* I/O handlers activated in sb_pro_mcv_write */
     mca_add(sb_16_reply_mca_read, sb_16_reply_mca_write, sb_mcv_feedb, NULL, sb);
@@ -2189,30 +3285,41 @@ sb_16_reply_mca_init(UNUSED(const device_t *info))
     return sb;
 }
 
+static int
+sb_16_pnp_noide_available(void)
+{
+    return rom_present(PNP_ROM_SB_16_PNP_NOIDE);
+}
+
+static int
+sb_16_pnp_ide_available(void)
+{
+    return rom_present(PNP_ROM_SB_16_PNP_IDE);
+}
+
 static void *
 sb_16_pnp_init(UNUSED(const device_t *info))
 {
-    sb_t *sb = malloc(sizeof(sb_t));
-    memset(sb, 0x00, sizeof(sb_t));
+    sb_t *sb = calloc(1, sizeof(sb_t));
 
     sb->pnp = 1;
 
     sb->opl_enabled = 1;
     fm_driver_get(FM_YMF262, &sb->opl);
 
-    sb_dsp_init(&sb->dsp, SB16, SB_SUBTYPE_DEFAULT, sb);
+    sb_dsp_init(&sb->dsp, SB16_DSP_405, SB_SUBTYPE_DEFAULT, sb);
     sb_dsp_setdma16_supported(&sb->dsp, 1);
     sb_ct1745_mixer_reset(sb);
 
     sb->mixer_enabled            = 1;
     sb->mixer_sb16.output_filter = 1;
     sound_add_handler(sb_get_buffer_sb16_awe32, sb);
+    music_add_handler(sb_get_music_buffer_sb16_awe32, sb);
     sound_set_cd_audio_filter(sb16_awe32_filter_cd_audio, sb);
     if (device_get_config_int("control_pc_speaker"))
         sound_set_pc_speaker_filter(sb16_awe32_filter_pc_speaker, sb);
 
-    sb->mpu = (mpu_t *) malloc(sizeof(mpu_t));
-    memset(sb->mpu, 0, sizeof(mpu_t));
+    sb->mpu = (mpu_t *) calloc(1, sizeof(mpu_t));
     mpu401_init(sb->mpu, 0, 0, M_UART, device_get_config_int("receive_input401"));
     sb_dsp_set_mpu(&sb->dsp, sb->mpu);
 
@@ -2221,77 +3328,23 @@ sb_16_pnp_init(UNUSED(const device_t *info))
 
     sb->gameport = gameport_add(&gameport_pnp_device);
 
-    device_add(&ide_qua_pnp_device);
+    // Does it have IDE?
+    if (info->local != SB_16_PNP_NOIDE) {
+        device_add(&ide_qua_pnp_device);
+        other_ide_present++;
 
-    isapnp_add_card(sb_16_pnp_rom, sizeof(sb_16_pnp_rom), sb_16_pnp_config_changed, NULL, NULL, NULL, sb);
-
-    sb_dsp_setaddr(&sb->dsp, 0);
-    sb_dsp_setirq(&sb->dsp, 0);
-    sb_dsp_setdma8(&sb->dsp, ISAPNP_DMA_DISABLED);
-    sb_dsp_setdma16(&sb->dsp, ISAPNP_DMA_DISABLED);
-
-    mpu401_change_addr(sb->mpu, 0);
-    ide_remove_handlers(3);
-
-    sb->gameport_addr = 0;
-    gameport_remap(sb->gameport, 0);
-
-    return sb;
-}
-
-static int
-sb_vibra16xv_available(void)
-{
-    return rom_present("roms/sound/creative/CT4170 PnP.BIN");
-}
-
-static int
-sb_vibra16c_available(void)
-{
-    return rom_present("roms/sound/creative/CT4180 PnP.BIN");
-}
-
-static void *
-sb_vibra16_pnp_init(UNUSED(const device_t *info))
-{
-    sb_t *sb = malloc(sizeof(sb_t));
-    memset(sb, 0x00, sizeof(sb_t));
-
-    sb->pnp = 1;
-
-    sb->opl_enabled = 1;
-    fm_driver_get(FM_YMF262, &sb->opl);
-
-    sb_dsp_init(&sb->dsp, (info->local == 0) ? SBAWE64 : SBAWE32PNP, SB_SUBTYPE_DEFAULT, sb);
-    /* The ViBRA 16XV does 16-bit DMA through 8-bit DMA. */
-    sb_dsp_setdma16_supported(&sb->dsp, info->local != 0);
-    sb_ct1745_mixer_reset(sb);
-
-    sb->mixer_enabled            = 1;
-    sb->mixer_sb16.output_filter = 1;
-    sound_add_handler(sb_get_buffer_sb16_awe32, sb);
-    sound_set_cd_audio_filter(sb16_awe32_filter_cd_audio, sb);
-    if (device_get_config_int("control_pc_speaker"))
-        sound_set_pc_speaker_filter(sb16_awe32_filter_pc_speaker, sb);
-
-    sb->mpu = (mpu_t *) malloc(sizeof(mpu_t));
-    memset(sb->mpu, 0, sizeof(mpu_t));
-    mpu401_init(sb->mpu, 0, 0, M_UART, device_get_config_int("receive_input401"));
-    sb_dsp_set_mpu(&sb->dsp, sb->mpu);
-
-    if (device_get_config_int("receive_input"))
-        midi_in_handler(1, sb_dsp_input_msg, sb_dsp_input_sysex, &sb->dsp);
-
-    sb->gameport = gameport_add(&gameport_pnp_device);
+        sb->has_ide = 1;
+    }
 
     const char *pnp_rom_file = NULL;
+    uint16_t    pnp_rom_len  = 512;
     switch (info->local) {
-        case 0:
-            pnp_rom_file = "roms/sound/creative/CT4170 PnP.BIN";
+        case SB_16_PNP_NOIDE:
+            pnp_rom_file = PNP_ROM_SB_16_PNP_NOIDE;
             break;
 
-        case 1:
-            pnp_rom_file = "roms/sound/creative/CT4180 PnP.BIN";
+        case SB_16_PNP_IDE:
+            pnp_rom_file = PNP_ROM_SB_16_PNP_IDE;
             break;
 
         default:
@@ -2302,15 +3355,128 @@ sb_vibra16_pnp_init(UNUSED(const device_t *info))
     if (pnp_rom_file) {
         FILE *fp = rom_fopen(pnp_rom_file, "rb");
         if (fp) {
-            if (fread(sb->pnp_rom, 1, 512, fp) == 512)
+            if (fread(sb->pnp_rom, 1, pnp_rom_len, fp) == pnp_rom_len)
+                pnp_rom = sb->pnp_rom;
+            fclose(fp);
+        }
+    }
+
+    isapnp_add_card(pnp_rom, sizeof(sb->pnp_rom), sb_16_pnp_config_changed,
+                    NULL, NULL, NULL, sb);
+
+    sb_dsp_set_real_opl(&sb->dsp, 1);
+    sb_dsp_setaddr(&sb->dsp, 0);
+    sb_dsp_setirq(&sb->dsp, 0);
+    sb_dsp_setdma8(&sb->dsp, ISAPNP_DMA_DISABLED);
+    sb_dsp_setdma16(&sb->dsp, ISAPNP_DMA_DISABLED);
+
+    mpu401_change_addr(sb->mpu, 0);
+
+    if (info->local != SB_16_PNP_NOIDE)
+        ide_remove_handlers(3);
+
+    sb->gameport_addr = 0;
+    gameport_remap(sb->gameport, 0);
+
+    return sb;
+}
+
+static int
+sb_vibra16c_available(void)
+{
+    return rom_present(PNP_ROM_SB_VIBRA16C);
+}
+
+static int
+sb_vibra16cl_available(void)
+{
+    return rom_present(PNP_ROM_SB_VIBRA16CL);
+}
+
+static int
+sb_vibra16xv_available(void)
+{
+    return rom_present(PNP_ROM_SB_VIBRA16XV);
+}
+
+static void *
+sb_vibra16_pnp_init(UNUSED(const device_t *info))
+{
+    sb_t *sb = calloc(1, sizeof(sb_t));
+
+    sb->pnp = 1;
+
+    sb->opl_enabled = 1;
+    fm_driver_get(FM_YMF262, &sb->opl);
+
+    sb_dsp_set_real_opl(&sb->dsp, 1);
+    sb_dsp_init(&sb->dsp, (info->local == SB_VIBRA16XV) ? SBAWE64_DSP_416 : SBAWE32_DSP_413, SB_SUBTYPE_DEFAULT, sb);
+    /* The ViBRA 16XV does 16-bit DMA through 8-bit DMA. */
+    sb_dsp_setdma16_supported(&sb->dsp, info->local != SB_VIBRA16XV);
+    sb_ct1745_mixer_reset(sb);
+
+    sb->mixer_enabled            = 1;
+    sb->mixer_sb16.output_filter = 1;
+    sound_add_handler(sb_get_buffer_sb16_awe32, sb);
+    music_add_handler(sb_get_music_buffer_sb16_awe32, sb);
+    sound_set_cd_audio_filter(sb16_awe32_filter_cd_audio, sb);
+    if (device_get_config_int("control_pc_speaker"))
+        sound_set_pc_speaker_filter(sb16_awe32_filter_pc_speaker, sb);
+
+    sb->mpu = (mpu_t *) calloc(1, sizeof(mpu_t));
+    mpu401_init(sb->mpu, 0, 0, M_UART, device_get_config_int("receive_input401"));
+    sb_dsp_set_mpu(&sb->dsp, sb->mpu);
+
+    if (device_get_config_int("receive_input"))
+        midi_in_handler(1, sb_dsp_input_msg, sb_dsp_input_sysex, &sb->dsp);
+
+    switch (info->local) {
+        case SB_VIBRA16C:  /* CTL7001 */
+        case SB_VIBRA16CL: /* CTL7002 */
+            sb->gameport = gameport_add(&gameport_pnp_device);
+            break;
+
+        case SB_VIBRA16XV: /* CTL7005 */
+            sb->gameport = gameport_add(&gameport_pnp_1io_device);
+            break;
+
+        default:
+            break;
+    }
+
+    const char *pnp_rom_file = NULL;
+    switch (info->local) {
+        case SB_VIBRA16C:
+            pnp_rom_file = PNP_ROM_SB_VIBRA16C;
+            break;
+
+        case SB_VIBRA16CL:
+            pnp_rom_file = PNP_ROM_SB_VIBRA16CL;
+            break;
+
+        case SB_VIBRA16XV:
+            pnp_rom_file = PNP_ROM_SB_VIBRA16XV;
+            break;
+
+        default:
+            break;
+    }
+
+    uint8_t *pnp_rom = NULL;
+    if (pnp_rom_file) {
+        FILE    *fp          = rom_fopen(pnp_rom_file, "rb");
+        uint16_t pnp_rom_len = 512;
+        if (fp) {
+            if (fread(sb->pnp_rom, 1, pnp_rom_len, fp) == pnp_rom_len)
                 pnp_rom = sb->pnp_rom;
             fclose(fp);
         }
     }
 
     switch (info->local) {
-        case 0:
-        case 1:
+        case SB_VIBRA16C:
+        case SB_VIBRA16CL:
+        case SB_VIBRA16XV:
             isapnp_add_card(pnp_rom, sizeof(sb->pnp_rom), sb_vibra16_pnp_config_changed,
                             NULL, NULL, NULL, sb);
             break;
@@ -2335,25 +3501,26 @@ sb_vibra16_pnp_init(UNUSED(const device_t *info))
 static void *
 sb_16_compat_init(const device_t *info)
 {
-    sb_t *sb = malloc(sizeof(sb_t));
-    memset(sb, 0, sizeof(sb_t));
+    sb_t *sb = calloc(1, sizeof(sb_t));
 
     fm_driver_get(FM_YMF262, &sb->opl);
 
-    sb_dsp_init(&sb->dsp, SB16, SB_SUBTYPE_DEFAULT, sb);
+    sb_dsp_set_real_opl(&sb->dsp, 1);
+    sb_dsp_init(&sb->dsp, SB16_DSP_405, SB_SUBTYPE_DEFAULT, sb);
     sb_dsp_setdma16_supported(&sb->dsp, 1);
     sb_dsp_setdma16_enabled(&sb->dsp, 1);
     sb_ct1745_mixer_reset(sb);
 
+    sb->opl_enabled   = 1;
     sb->mixer_enabled = 1;
     sound_add_handler(sb_get_buffer_sb16_awe32, sb);
+    music_add_handler(sb_get_music_buffer_sb16_awe32, sb);
 
-    sb->mpu = (mpu_t *) malloc(sizeof(mpu_t));
-    memset(sb->mpu, 0, sizeof(mpu_t));
-    mpu401_init(sb->mpu, 0, 0, M_UART, info->local);
+    sb->mpu = (mpu_t *) calloc(1, sizeof(mpu_t));
+    mpu401_init(sb->mpu, 0, 0, M_UART, (int) (intptr_t) info->local);
     sb_dsp_set_mpu(&sb->dsp, sb->mpu);
 
-    sb->gameport = gameport_add(&gameport_pnp_device);
+    sb->gameport      = gameport_add(&gameport_pnp_device);
     sb->gameport_addr = 0x200;
     gameport_remap(sb->gameport, sb->gameport_addr);
 
@@ -2363,55 +3530,66 @@ sb_16_compat_init(const device_t *info)
 static int
 sb_awe32_available(void)
 {
-    return rom_present("roms/sound/creative/awe32.raw");
+    return rom_present(EMU8K_ROM_PATH);
+}
+
+static int
+sb_goldfinch_available(void)
+{
+    return sb_awe32_available() && rom_present(PNP_ROM_SB_GOLDFINCH);
 }
 
 static int
 sb_32_pnp_available(void)
 {
-    return sb_awe32_available() && rom_present("roms/sound/creative/CT3600 PnP.BIN");
+    return sb_awe32_available() && rom_present(PNP_ROM_SB_32_PNP);
 }
 
 static int
 sb_awe32_pnp_available(void)
 {
-    return sb_awe32_available() && rom_present("roms/sound/creative/CT3980 PnP.BIN");
+    return sb_awe32_available() && rom_present(PNP_ROM_SB_AWE32_PNP);
 }
 
 static int
 sb_awe64_value_available(void)
 {
-    return sb_awe32_available() && rom_present("roms/sound/creative/CT4520 PnP.BIN");
+    return sb_awe32_available() && rom_present(PNP_ROM_SB_AWE64_VALUE);
 }
 
 static int
-sb_awe64_available(void)
+sb_awe64_noide_available(void)
 {
-    return sb_awe32_available() && rom_present("roms/sound/creative/CT4520 PnP.BIN");
+    return sb_awe32_available() && rom_present(PNP_ROM_SB_AWE64_NOIDE);
+}
+
+static int
+sb_awe64_ide_available(void)
+{
+    return sb_awe32_available() && rom_present(PNP_ROM_SB_AWE64_IDE);
 }
 
 static int
 sb_awe64_gold_available(void)
 {
-    return sb_awe32_available() && rom_present("roms/sound/creative/CT4540 PnP.BIN");
+    return sb_awe32_available() && rom_present(PNP_ROM_SB_AWE64_GOLD);
 }
 
 static void *
 sb_awe32_init(UNUSED(const device_t *info))
 {
-    sb_t    *sb          = malloc(sizeof(sb_t));
+    sb_t    *sb          = calloc(1, sizeof(sb_t));
     uint16_t addr        = device_get_config_hex16("base");
     uint16_t mpu_addr    = device_get_config_hex16("base401");
     uint16_t emu_addr    = device_get_config_hex16("emu_base");
     int      onboard_ram = device_get_config_int("onboard_ram");
 
-    memset(sb, 0x00, sizeof(sb_t));
-
     sb->opl_enabled = device_get_config_int("opl");
     if (sb->opl_enabled)
         fm_driver_get(FM_YMF262, &sb->opl);
 
-    sb_dsp_init(&sb->dsp, SBAWE32, SB_SUBTYPE_DEFAULT, sb);
+    sb_dsp_set_real_opl(&sb->dsp, 1);
+    sb_dsp_init(&sb->dsp, SBAWE32_DSP_412, SB_SUBTYPE_DEFAULT, sb);
     sb_dsp_setaddr(&sb->dsp, addr);
     sb_dsp_setirq(&sb->dsp, device_get_config_int("irq"));
     sb_dsp_setdma8(&sb->dsp, device_get_config_int("dma"));
@@ -2440,14 +3618,17 @@ sb_awe32_init(UNUSED(const device_t *info))
     io_sethandler(addr + 4, 0x0002, sb_ct1745_mixer_read, NULL, NULL,
                   sb_ct1745_mixer_write, NULL, NULL, sb);
     sound_add_handler(sb_get_buffer_sb16_awe32, sb);
+    if (sb->opl_enabled)
+        music_add_handler(sb_get_music_buffer_sb16_awe32, sb);
+    wavetable_add_handler(sb_get_wavetable_buffer_sb16_awe32, sb);
     sound_set_cd_audio_filter(sb16_awe32_filter_cd_audio, sb);
     if (device_get_config_int("control_pc_speaker"))
         sound_set_pc_speaker_filter(sb16_awe32_filter_pc_speaker, sb);
 
     if (mpu_addr) {
-        sb->mpu = (mpu_t *) malloc(sizeof(mpu_t));
-        memset(sb->mpu, 0, sizeof(mpu_t));
-        mpu401_init(sb->mpu, device_get_config_hex16("base401"), device_get_config_int("irq"), M_UART, device_get_config_int("receive_input401"));
+        sb->mpu = (mpu_t *) calloc(1, sizeof(mpu_t));
+        mpu401_init(sb->mpu, device_get_config_hex16("base401"), 0, M_UART,
+                    device_get_config_int("receive_input401"));
     } else
         sb->mpu = NULL;
     sb_dsp_set_mpu(&sb->dsp, sb->mpu);
@@ -2457,40 +3638,87 @@ sb_awe32_init(UNUSED(const device_t *info))
     if (device_get_config_int("receive_input"))
         midi_in_handler(1, sb_dsp_input_msg, sb_dsp_input_sysex, &sb->dsp);
 
-    sb->gameport = gameport_add(&gameport_pnp_device);
-    sb->gameport_addr = 0x200;
-    gameport_remap(sb->gameport, sb->gameport_addr);
+    if (device_get_config_int("gameport")) {
+        sb->gameport      = gameport_add(&gameport_200_device);
+        sb->gameport_addr = 0x200;
+    }
 
     return sb;
 }
 
+static void *
+sb_goldfinch_init(const device_t *info)
+{
+    goldfinch_t *goldfinch   = calloc(1, sizeof(goldfinch_t));
+    int          onboard_ram = device_get_config_int("onboard_ram");
+
+    wavetable_add_handler(sb_get_wavetable_buffer_goldfinch, goldfinch);
+
+    emu8k_init(&goldfinch->emu8k, 0, onboard_ram);
+
+    const char *pnp_rom_file = NULL;
+    switch (info->local) {
+        case 0:
+            pnp_rom_file = PNP_ROM_SB_GOLDFINCH;
+            break;
+
+        default:
+            break;
+    }
+
+    uint8_t *pnp_rom = NULL;
+    if (pnp_rom_file) {
+        FILE    *fp          = rom_fopen(pnp_rom_file, "rb");
+        uint16_t pnp_rom_len = 256;
+        if (fp) {
+            if (fread(goldfinch->pnp_rom, 1, pnp_rom_len, fp) == pnp_rom_len)
+                pnp_rom = goldfinch->pnp_rom;
+            fclose(fp);
+        }
+    }
+
+    switch (info->local) {
+        case 0:
+            isapnp_add_card(pnp_rom, sizeof(goldfinch->pnp_rom), goldfinch_pnp_config_changed,
+                            NULL, NULL, NULL, goldfinch);
+            break;
+
+        default:
+            break;
+    }
+
+    emu8k_change_addr(&goldfinch->emu8k, 0);
+
+    return goldfinch;
+}
+
 static void *
 sb_awe32_pnp_init(const device_t *info)
 {
-    sb_t *sb          = malloc(sizeof(sb_t));
+    sb_t *sb          = calloc(1, sizeof(sb_t));
     int   onboard_ram = device_get_config_int("onboard_ram");
 
-    memset(sb, 0x00, sizeof(sb_t));
-
     sb->pnp = 1;
 
     sb->opl_enabled = 1;
     fm_driver_get(FM_YMF262, &sb->opl);
 
-    sb_dsp_init(&sb->dsp, ((info->local == 2) || (info->local == 3) || (info->local == 4)) ?
-                SBAWE64 : SBAWE32PNP, SB_SUBTYPE_DEFAULT, sb);
+    sb_dsp_init(&sb->dsp, (info->local >= SB_AWE64_VALUE) ?
+                SBAWE64_DSP_416 : SBAWE32_DSP_413, SB_SUBTYPE_DEFAULT, sb);
     sb_dsp_setdma16_supported(&sb->dsp, 1);
     sb_ct1745_mixer_reset(sb);
 
+    sb_dsp_set_real_opl(&sb->dsp, 1);
     sb->mixer_enabled            = 1;
     sb->mixer_sb16.output_filter = 1;
     sound_add_handler(sb_get_buffer_sb16_awe32, sb);
+    music_add_handler(sb_get_music_buffer_sb16_awe32, sb);
+    wavetable_add_handler(sb_get_wavetable_buffer_sb16_awe32, sb);
     sound_set_cd_audio_filter(sb16_awe32_filter_cd_audio, sb);
     if (device_get_config_int("control_pc_speaker"))
         sound_set_pc_speaker_filter(sb16_awe32_filter_pc_speaker, sb);
 
-    sb->mpu = (mpu_t *) malloc(sizeof(mpu_t));
-    memset(sb->mpu, 0, sizeof(mpu_t));
+    sb->mpu = (mpu_t *) calloc(1, sizeof(mpu_t));
     mpu401_init(sb->mpu, 0, 0, M_UART, device_get_config_int("receive_input401"));
     sb_dsp_set_mpu(&sb->dsp, sb->mpu);
 
@@ -2501,26 +3729,38 @@ sb_awe32_pnp_init(const device_t *info)
 
     sb->gameport = gameport_add(&gameport_pnp_device);
 
-    if ((info->local != 2) && (info->local != 3) && (info->local != 4))
+    // Does it have IDE?
+    if ((info->local != SB_AWE64_VALUE) && (info->local != SB_AWE64_NOIDE) && (info->local != SB_AWE64_GOLD)) {
         device_add(&ide_qua_pnp_device);
+        other_ide_present++;
+
+        sb->has_ide = 1;
+    }
 
     const char *pnp_rom_file = NULL;
     switch (info->local) {
-        case 0:
-            pnp_rom_file = "roms/sound/creative/CT3600 PnP.BIN";
+        case SB_32_PNP:
+            pnp_rom_file = PNP_ROM_SB_32_PNP;
             break;
 
-        case 1:
-            pnp_rom_file = "roms/sound/creative/CT3980 PnP.BIN";
+        case SB_AWE32_PNP:
+            pnp_rom_file = PNP_ROM_SB_AWE32_PNP;
             break;
 
-        case 2:
-        case 3:
-            pnp_rom_file = "roms/sound/creative/CT4520 PnP.BIN";
+        case SB_AWE64_VALUE:
+            pnp_rom_file = PNP_ROM_SB_AWE64_VALUE;
             break;
 
-        case 4:
-            pnp_rom_file = "roms/sound/creative/CT4540 PnP.BIN";
+        case SB_AWE64_NOIDE:
+            pnp_rom_file = PNP_ROM_SB_AWE64_NOIDE;
+            break;
+
+        case SB_AWE64_IDE:
+            pnp_rom_file = PNP_ROM_SB_AWE64_IDE;
+            break;
+
+        case SB_AWE64_GOLD:
+            pnp_rom_file = PNP_ROM_SB_AWE64_GOLD;
             break;
 
         default:
@@ -2529,27 +3769,36 @@ sb_awe32_pnp_init(const device_t *info)
 
     uint8_t *pnp_rom = NULL;
     if (pnp_rom_file) {
-        FILE *fp = rom_fopen(pnp_rom_file, "rb");
+        FILE    *fp          = rom_fopen(pnp_rom_file, "rb");
+        uint16_t pnp_rom_len = 512;
         if (fp) {
-            if (fread(sb->pnp_rom, 1, 512, fp) == 512)
+            if (fread(sb->pnp_rom, 1, pnp_rom_len, fp) == pnp_rom_len)
                 pnp_rom = sb->pnp_rom;
             fclose(fp);
         }
     }
 
     switch (info->local) {
-        case 0:
-            isapnp_add_card(pnp_rom, sizeof(sb->pnp_rom), sb_16_pnp_config_changed, NULL, NULL, NULL, sb);
+        case SB_32_PNP:
+            isapnp_add_card(pnp_rom, sizeof(sb->pnp_rom), sb_16_pnp_config_changed,
+                            NULL, NULL, NULL, sb);
             break;
 
-        case 1:
-            isapnp_add_card(pnp_rom, sizeof(sb->pnp_rom), sb_awe32_pnp_config_changed, NULL, NULL, NULL, sb);
+        case SB_AWE32_PNP:
+            isapnp_add_card(pnp_rom, sizeof(sb->pnp_rom), sb_awe32_pnp_config_changed,
+                            NULL, NULL, NULL, sb);
             break;
 
-        case 2:
-        case 3:
-        case 4:
-            isapnp_add_card(pnp_rom, sizeof(sb->pnp_rom), sb_awe64_gold_pnp_config_changed, NULL, NULL, NULL, sb);
+        case SB_AWE64_IDE:
+            isapnp_add_card(pnp_rom, sizeof(sb->pnp_rom), sb_awe64_pnp_ide_config_changed,
+                            NULL, NULL, NULL, sb);
+            break;
+
+        case SB_AWE64_VALUE:
+        case SB_AWE64_NOIDE:
+        case SB_AWE64_GOLD:
+            isapnp_add_card(pnp_rom, sizeof(sb->pnp_rom), sb_awe64_pnp_noide_config_changed,
+                            NULL, NULL, NULL, sb);
             break;
 
         default:
@@ -2562,7 +3811,8 @@ sb_awe32_pnp_init(const device_t *info)
     sb_dsp_setdma16(&sb->dsp, ISAPNP_DMA_DISABLED);
 
     mpu401_change_addr(sb->mpu, 0);
-    if ((info->local != 2) && (info->local != 3) && (info->local != 4))
+
+    if ((info->local != SB_AWE64_VALUE) && (info->local != SB_AWE64_NOIDE) && (info->local != SB_AWE64_GOLD))
         ide_remove_handlers(3);
 
     emu8k_change_addr(&sb->emu8k, 0);
@@ -2574,6 +3824,258 @@ sb_awe32_pnp_init(const device_t *info)
     return sb;
 }
 
+static void *
+ess_x688_init(UNUSED(const device_t *info))
+{
+    sb_t          *ess      = calloc(sizeof(sb_t), 1);
+    const uint16_t addr     = device_get_config_hex16("base");
+    const uint16_t ide_ctrl = (const uint16_t) device_get_config_int("ide_ctrl");
+    const uint16_t ide_base = ide_ctrl & 0x0fff;
+    const uint16_t ide_side = ide_base + 0x0206;
+    const uint16_t ide_irq  = ide_ctrl >> 12;
+
+    fm_driver_get(info->local ? FM_ESFM : FM_YMF262, &ess->opl);
+
+    sb_dsp_set_real_opl(&ess->dsp, 1);
+    sb_dsp_init(&ess->dsp, SBPRO2_DSP_302, info->local ? SB_SUBTYPE_ESS_ES1688 : SB_SUBTYPE_ESS_ES688, ess);
+    sb_dsp_setaddr(&ess->dsp, addr);
+    sb_dsp_setirq(&ess->dsp, device_get_config_int("irq"));
+    sb_dsp_setdma8(&ess->dsp, device_get_config_int("dma"));
+    sb_dsp_setdma16_8(&ess->dsp, device_get_config_int("dma"));
+    sb_dsp_setdma16_supported(&ess->dsp, 0);
+    ess_mixer_reset(ess);
+
+    /* DSP I/O handler is activated in sb_dsp_setaddr */
+    io_sethandler(addr, 0x0004,
+                  ess->opl.read, NULL, NULL,
+                  ess->opl.write, NULL, NULL,
+                  ess->opl.priv);
+    io_sethandler(addr + 8, 0x0002,
+                  ess->opl.read, NULL, NULL,
+                  ess->opl.write, NULL, NULL,
+                  ess->opl.priv);
+    io_sethandler(addr + 8, 0x0002,
+                  ess_fm_midi_read, NULL, NULL,
+                  ess_fm_midi_write, NULL, NULL,
+                  ess);
+    io_sethandler(0x0388, 0x0004,
+                  ess->opl.read, NULL, NULL,
+                  ess->opl.write, NULL, NULL,
+                  ess->opl.priv);
+    io_sethandler(0x0388, 0x0004,
+                  ess_fm_midi_read, NULL, NULL,
+                  ess_fm_midi_write, NULL, NULL,
+                  ess);
+
+    io_sethandler(addr + 2, 0x0004,
+                  ess_base_read, NULL, NULL,
+                  ess_base_write, NULL, NULL,
+                  ess);
+    io_sethandler(addr + 6, 0x0001,
+                  ess_base_read, NULL, NULL,
+                  ess_base_write, NULL, NULL,
+                  ess);
+    io_sethandler(addr + 0x0a, 0x0006,
+                  ess_base_read, NULL, NULL,
+                  ess_base_write, NULL, NULL,
+                  ess);
+
+    ess->mixer_enabled = 1;
+    ess->mixer_ess.regs[0x40] = 0x0a;
+    io_sethandler(addr + 4, 0x0002,
+                  ess_mixer_read, NULL, NULL,
+                  ess_mixer_write, NULL, NULL,
+                  ess);
+    sound_add_handler(sb_get_buffer_ess, ess);
+    music_add_handler(sb_get_music_buffer_ess, ess);
+    sound_set_cd_audio_filter(ess_filter_cd_audio, ess);
+    if (info->local && device_get_config_int("control_pc_speaker"))
+        sound_set_pc_speaker_filter(ess_filter_pc_speaker, ess);
+
+    if (device_get_config_int("receive_input"))
+        midi_in_handler(1, sb_dsp_input_msg, sb_dsp_input_sysex, &ess->dsp);
+
+    if (info->local) {
+        ess->mpu = (mpu_t *) calloc(1, sizeof(mpu_t));
+        /* NOTE: The MPU is initialized disabled and with no IRQ assigned.
+         * It will be later initialized by the guest OS's drivers. */
+        mpu401_init(ess->mpu, 0, -1, M_UART, device_get_config_int("receive_input401"));
+        sb_dsp_set_mpu(&ess->dsp, ess->mpu);
+    }
+
+    if (device_get_config_int("gameport")) {
+        ess->gameport      = gameport_add(&gameport_200_device);
+        ess->gameport_addr = 0x200;
+    }
+
+    if (ide_base > 0x0000) {
+        device_add(&ide_qua_pnp_device);
+        ide_set_base(4, ide_base);
+        ide_set_side(4, ide_side);
+        ide_set_irq(4, ide_irq);
+        other_ide_present++;
+
+        ess->has_ide = 1;
+    }
+
+    return ess;
+}
+
+static int
+ess_688_pnp_available(void)
+{
+    return rom_present(PNP_ROM_ESS0100);
+}
+
+static int
+ess_1688_pnp_available(void)
+{
+    return rom_present(PNP_ROM_ESS0102);
+}
+
+static int
+ess_1688_968_pnp_available(void)
+{
+    return rom_present(PNP_ROM_ESS0968);
+}
+
+static void *
+ess_x688_pnp_init(UNUSED(const device_t *info))
+{
+    sb_t *ess = calloc(sizeof(sb_t), 1);
+
+    ess->pnp = 1 + (int) info->local;
+
+    fm_driver_get(info->local ? FM_ESFM : FM_YMF262, &ess->opl);
+
+    sb_dsp_set_real_opl(&ess->dsp, 1);
+    sb_dsp_init(&ess->dsp, SBPRO2_DSP_302, info->local ? SB_SUBTYPE_ESS_ES1688 : SB_SUBTYPE_ESS_ES688, ess);
+    sb_dsp_setdma16_supported(&ess->dsp, 0);
+    ess_mixer_reset(ess);
+
+    ess->mixer_enabled = 1;
+    sound_add_handler(sb_get_buffer_ess, ess);
+    music_add_handler(sb_get_music_buffer_ess, ess);
+    sound_set_cd_audio_filter(ess_filter_cd_audio, ess);
+    if (info->local && device_get_config_int("control_pc_speaker"))
+        sound_set_pc_speaker_filter(ess_filter_pc_speaker, ess);
+
+    if (device_get_config_int("receive_input"))
+        midi_in_handler(1, sb_dsp_input_msg, sb_dsp_input_sysex, &ess->dsp);
+
+    ess->mpu = (mpu_t *) calloc(1, sizeof(mpu_t));
+    /* NOTE: The MPU is initialized disabled and with no IRQ assigned.
+     * It will be later initialized by the guest OS's drivers. */
+    mpu401_init(ess->mpu, 0, -1, M_UART, device_get_config_int("receive_input401"));
+    sb_dsp_set_mpu(&ess->dsp, ess->mpu);
+
+    ess->gameport = gameport_add(&gameport_pnp_device);
+
+    device_add(&ide_qua_pnp_device);
+    other_ide_present++;
+
+    ess->has_ide = 1;
+
+    const char *pnp_rom_file = NULL;
+    uint16_t    pnp_rom_len  = 512;
+    switch (info->local) {
+        case 0:
+            pnp_rom_file = PNP_ROM_ESS0100;
+            pnp_rom_len  = 145;
+            break;
+
+        case 1:
+            pnp_rom_file = PNP_ROM_ESS0102;
+            pnp_rom_len  = 145;
+            break;
+
+        case 2:
+            pnp_rom_file = PNP_ROM_ESS0968;
+            pnp_rom_len  = 135;
+            break;
+
+        default:
+            break;
+    }
+
+    uint8_t *pnp_rom = NULL;
+    if (pnp_rom_file) {
+        FILE *fp = rom_fopen(pnp_rom_file, "rb");
+        if (fp) {
+            if (fread(ess->pnp_rom, 1, pnp_rom_len, fp) == pnp_rom_len)
+                pnp_rom = ess->pnp_rom;
+            fclose(fp);
+        }
+    }
+
+    isapnp_add_card(pnp_rom, sizeof(ess->pnp_rom), ess_x688_pnp_config_changed,
+                    NULL, NULL, NULL, ess);
+
+    sb_dsp_setaddr(&ess->dsp, 0);
+    sb_dsp_setirq(&ess->dsp, 0);
+    sb_dsp_setdma8(&ess->dsp, ISAPNP_DMA_DISABLED);
+    sb_dsp_setdma16_8(&ess->dsp, ISAPNP_DMA_DISABLED);
+
+    mpu401_change_addr(ess->mpu, 0);
+
+    ess->gameport_addr = 0;
+    gameport_remap(ess->gameport, 0);
+
+    ide_remove_handlers(3);
+
+    return ess;
+}
+
+static void *
+ess_x688_mca_init(UNUSED(const device_t *info))
+{
+    sb_t *ess = calloc(1, sizeof(sb_t));
+
+    ess->opl_enabled = 1;
+    fm_driver_get(info->local ? FM_ESFM : FM_YMF262, &ess->opl);
+
+    sb_dsp_set_real_opl(&ess->dsp, 1);
+    sb_dsp_init(&ess->dsp, SBPRO2_DSP_302, info->local ? SB_SUBTYPE_ESS_ES1688 : SB_SUBTYPE_ESS_ES688, ess);
+    sb_dsp_setdma16_supported(&ess->dsp, 0);
+    ess_mixer_reset(ess);
+
+    ess->mixer_enabled = 1;
+    sound_add_handler(sb_get_buffer_ess, ess);
+    music_add_handler(sb_get_music_buffer_ess, ess);
+    sound_set_cd_audio_filter(ess_filter_cd_audio, ess);
+    if (info->local && device_get_config_int("control_pc_speaker"))
+        sound_set_pc_speaker_filter(ess_filter_pc_speaker, ess);
+
+    if (info->local) {
+        ess->mpu = (mpu_t *) calloc(1, sizeof(mpu_t));
+        mpu401_init(ess->mpu, 0, -1, M_UART, device_get_config_int("receive_input401"));
+        sb_dsp_set_mpu(&ess->dsp, ess->mpu);
+    }
+
+    ess->gameport = gameport_add(&gameport_200_device);
+
+    mpu401_change_addr(ess->mpu, 0);
+
+    if (device_get_config_int("receive_input"))
+        midi_in_handler(1, sb_dsp_input_msg, sb_dsp_input_sysex, &ess->dsp);
+
+    ess->gameport_addr = 0;
+    gameport_remap(ess->gameport, 0);
+
+    /* I/O handlers activated in sb_pro_mcv_write */
+    if (info->local == 2) {
+        mca_add(ess_x688_mca_read, ess_chipchat_mca_write, sb_mcv_feedb, NULL, ess);
+        ess->pos_regs[0] = 0x50;
+        ess->pos_regs[1] = 0x51;
+    } else {
+        mca_add(ess_x688_mca_read, ess_soundpiper_mca_write, sb_mcv_feedb, NULL, ess);
+        ess->pos_regs[0] = 0x30;
+        ess->pos_regs[1] = 0x51;
+    }
+
+    return ess;
+}
+
 void
 sb_close(void *priv)
 {
@@ -2583,6 +4085,16 @@ sb_close(void *priv)
     free(sb);
 }
 
+static void
+sb_goldfinch_close(void *priv)
+{
+    goldfinch_t *goldfinch = (goldfinch_t *) priv;
+
+    emu8k_close(&goldfinch->emu8k);
+
+    free(goldfinch);
+}
+
 static void
 sb_awe32_close(void *priv)
 {
@@ -2604,1241 +4116,1360 @@ sb_speed_changed(void *priv)
 // clang-format off
 static const device_config_t sb_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x220,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "0x210",
-                .value = 0x210
-            },
-            {
-                .description = "0x220",
-                .value = 0x220
-            },
-            {
-                .description = "0x230",
-                .value = 0x230
-            },
-            {
-                .description = "0x240",
-                .value = 0x240
-            },
-            {
-                .description = "0x250",
-                .value = 0x250
-            },
-            {
-                .description = "0x260",
-                .value = 0x260 },
-            { .description = "" }
-        }
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x220,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x210", .value = 0x210 },
+            { .description = "0x220", .value = 0x220 },
+            { .description = "0x230", .value = 0x230 },
+            { .description = "0x240", .value = 0x240 },
+            { .description = "0x250", .value = 0x250 },
+            { .description = "0x260", .value = 0x260 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 7,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "IRQ 2",
-                .value = 2
-            },
-            {
-                .description = "IRQ 3",
-                .value = 3
-            },
-            {
-                .description = "IRQ 5",
-                .value = 5
-            },
-            {
-                .description = "IRQ 7",
-                .value = 7
-            },
-            { .description = "" }
-        }
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 7,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 2", .value = 2 },
+            { .description = "IRQ 3", .value = 3 },
+            { .description = "IRQ 5", .value = 5 },
+            { .description = "IRQ 7", .value = 7 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dma",
-        .description = "DMA",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 1,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "DMA 1",
-                .value = 1
-            },
-            {
-                .description = "DMA 3",
-                .value = 3
-            },
-            { "" }
-        }
+        .name           = "gameport",
+        .description    = "Enable Game port",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "opl",
-        .description = "Enable OPL",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "opl",
+        .description    = "Enable OPL",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input (SB MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t sb15_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x220,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "0x210",
-                .value = 0x210
-            },
-            {
-                .description = "0x220",
-                .value = 0x220
-            },
-            {
-                .description = "0x230",
-                .value = 0x230
-            },
-            {
-                .description = "0x240",
-                .value = 0x240
-            },
-            {
-                .description = "0x250",
-                .value = 0x250
-            },
-            {
-                .description = "0x260",
-                .value = 0x260
-            },
-            {
-                .description = "" }
-        }
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x220,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x210", .value = 0x210 },
+            { .description = "0x220", .value = 0x220 },
+            { .description = "0x230", .value = 0x230 },
+            { .description = "0x240", .value = 0x240 },
+            { .description = "0x250", .value = 0x250 },
+            { .description = "0x260", .value = 0x260 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 7,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "IRQ 2",
-                .value = 2
-            },
-            {
-                .description = "IRQ 3",
-                .value = 3
-            },
-            {
-                .description = "IRQ 5",
-                .value = 5
-            },
-            {
-                .description = "IRQ 7",
-                .value = 7
-            },
-            { .description = "" }
-        }
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 7,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 2", .value = 2 },
+            { .description = "IRQ 3", .value = 3 },
+            { .description = "IRQ 5", .value = 5 },
+            { .description = "IRQ 7", .value = 7 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dma",
-        .description = "DMA",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 1,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "DMA 1",
-                .value = 1
-            },
-            {
-                .description = "DMA 3",
-                .value = 3
-            },
-            { .description = "" }
-        }
+        .name           = "gameport",
+        .description    = "Enable Game port",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "opl",
-        .description = "Enable OPL",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "opl",
+        .description    = "Enable OPL",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "cms",
-        .description = "Enable CMS",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "cms",
+        .description    = "Enable CMS",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input (SB MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t sb2_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x220,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "0x220",
-                .value = 0x220
-            },
-            {
-                .description = "0x240",
-                .value = 0x240
-            },
-            {
-                .description = "0x260",
-                .value = 0x260
-            },
-            { .description = "" }
-        }
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x220,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x220", .value = 0x220 },
+            { .description = "0x240", .value = 0x240 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "mixaddr",
-        .description = "Mixer",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "Disabled",
-                .value = 0
-            },
-            {
-                .description = "0x220",
-                .value = 0x220
-            },
-            {
-                .description = "0x240",
-                .value = 0x240
-            },
-            {
-                .description = "0x250",
-                .value = 0x250
-            },
-            {
-                .description = "0x260",
-                .value = 0x260
-            },
-            { .description = "" }
-        }
+        .name           = "mixaddr",
+        .description    = "Mixer",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled", .value =     0 },
+            { .description = "0x250",    .value = 0x250 },
+            { .description = "0x260",    .value = 0x260 },
+            { .description = ""                         }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "IRQ 2",
-                .value = 2
-            },
-            {
-                .description = "IRQ 3",
-                .value = 3
-            },
-            {
-                .description = "IRQ 5",
-                .value = 5
-            },
-            {
-                .description = "IRQ 7",
-                .value = 7
-            },
-            { .description = "" }
-        }
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 2", .value = 2 },
+            { .description = "IRQ 3", .value = 3 },
+            { .description = "IRQ 5", .value = 5 },
+            { .description = "IRQ 7", .value = 7 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dma",
-        .description = "DMA",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 1,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "DMA 1",
-                .value = 1
-            },
-            {
-                .description = "DMA 3",
-                .value = 3
-            },
-            { .description = "" }
-        }
+        .name           = "gameport",
+        .description    = "Enable Game port",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "opl",
-        .description = "Enable OPL",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "opl",
+        .description    = "Enable OPL",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "cms",
-        .description = "Enable CMS",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "cms",
+        .description    = "Enable CMS",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input (SB MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t sb_mcv_config[] = {
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 7,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "IRQ 2",
-                .value = 2
-            },
-            {
-                .description = "IRQ 3",
-                .value = 3
-            },
-            {
-                .description = "IRQ 5",
-                .value = 5
-            },
-            {
-                .description = "IRQ 7",
-                .value = 7
-            },
-            { .description = "" }
-        }
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 7,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 2", .value = 2 },
+            { .description = "IRQ 3", .value = 3 },
+            { .description = "IRQ 5", .value = 5 },
+            { .description = "IRQ 7", .value = 7 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dma",
-        .description = "DMA",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 1,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "DMA 1",
-                .value = 1
-            },
-            {
-                .description = "DMA 3",
-                .value = 3
-            },
-            { .description = "" }
-        }
+        .name           = "dma",
+        .description    = "DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "DMA 1", .value = 1 },
+            { .description = "DMA 3", .value = 3 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "opl",
-        .description = "Enable OPL",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "gameport",
+        .description    = "Enable Game port",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input (SB MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "opl",
+        .description    = "Enable OPL",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t sb_pro_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x220,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "0x220",
-                .value = 0x220
-            },
-            {
-                .description = "0x240",
-                .value = 0x240
-            },
-            { .description = "" }
-        }
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x220,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x220", .value = 0x220 },
+            { .description = "0x240", .value = 0x240 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 7,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "IRQ 2",
-                .value = 2
-            },
-            {
-                .description = "IRQ 5",
-                .value = 5
-            },
-            {
-                .description = "IRQ 7",
-                .value = 7
-            },
-            {
-                .description = "IRQ 10",
-                .value = 10
-            },
-            { .description = "" }
-        }
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 7,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description =  "IRQ 2", .value =  2 },
+            { .description =  "IRQ 5", .value =  5 },
+            { .description =  "IRQ 7", .value =  7 },
+            { .description = "IRQ 10", .value = 10 },
+            { .description = ""                    }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dma",
-        .description = "DMA",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 1,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "DMA 0",
-                .value = 0
-            },
-            {
-                .description = "DMA 1",
-                .value = 1
-            },
-            {
-                .description = "DMA 3",
-                .value = 3
-            },
-            { .description = "" }
-        }
+        .name           = "dma",
+        .description    = "DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "DMA 0", .value = 0 },
+            { .description = "DMA 1", .value = 1 },
+            { .description = "DMA 3", .value = 3 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "opl",
-        .description = "Enable OPL",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "gameport",
+        .description    = "Enable Game port",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input (SB MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "opl",
+        .description    = "Enable OPL",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t sb_pro_mcv_config[] = {
     {
-        .name = "receive_input",
-        .description = "Receive input (SB MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "gameport",
+        .description    = "Enable Game port",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t sb_16_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x220,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "0x220",
-                .value = 0x220
-            },
-            {
-                .description = "0x240",
-                .value = 0x240
-            },
-            {
-                .description = "0x260",
-                .value = 0x260
-            },
-            {
-                .description = "0x280",
-                .value = 0x280
-            },
-            { .description = "" }
-        }
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x220,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x220", .value = 0x220 },
+            { .description = "0x240", .value = 0x240 },
+            { .description = "0x260", .value = 0x260 },
+            { .description = "0x280", .value = 0x280 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "base401",
-        .description = "MPU-401 Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x330,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "Disabled",
-                .value = 0
-            },
-            {
-                .description = "0x300",
-                .value = 0x300
-            },
-            {
-                .description = "0x330",
-                .value = 0x330
-            },
-            { .description = "" }
-        }
+        .name           = "base401",
+        .description    = "MPU-401 Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x330,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled", .value =     0 },
+            { .description = "0x300",    .value = 0x300 },
+            { .description = "0x330",    .value = 0x330 },
+            { .description = ""                         }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "IRQ 2",
-                .value = 2
-            },
-            {
-                .description = "IRQ 5",
-                .value = 5
-            },
-            {
-                .description = "IRQ 7",
-                .value = 7
-            },
-            {
-                .description = "IRQ 10",
-                .value = 10
-            },
-            { .description = "" }
-        }
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description =  "IRQ 2", .value =  2 },
+            { .description =  "IRQ 5", .value =  5 },
+            { .description =  "IRQ 7", .value =  7 },
+            { .description = "IRQ 10", .value = 10 },
+            { .description = ""                    }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dma",
-        .description = "Low DMA channel",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 1,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "DMA 0",
-                .value = 0
-            },
-            {
-                .description = "DMA 1",
-                .value = 1
-            },
-            {
-                .description = "DMA 3",
-                .value = 3
-            },
-            { .description = "" }
-        }
+        .name           = "dma",
+        .description    = "Low DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "DMA 0", .value = 0 },
+            { .description = "DMA 1", .value = 1 },
+            { .description = "DMA 3", .value = 3 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dma16",
-        .description = "High DMA channel",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "DMA 5",
-                .value = 5
-            },
-            {
-                .description = "DMA 6",
-                .value = 6
-            },
-            {
-                .description = "DMA 7",
-                .value = 7
-            },
-            { .description = "" }
-        }
+        .name           = "dma16",
+        .description    = "High DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "DMA 5", .value = 5 },
+            { .description = "DMA 6", .value = 6 },
+            { .description = "DMA 7", .value = 7 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "opl",
-        .description = "Enable OPL",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "gameport",
+        .description    = "Enable Game port",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "control_pc_speaker",
-        .description = "Control PC speaker",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "opl",
+        .description    = "Enable OPL",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input (SB MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "control_pc_speaker",
+        .description    = "Control PC speaker",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input401",
-        .description = "Receive input (MPU-401)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "receive_input401",
+        .description    = "Receive MIDI input (MPU-401)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t sb_16_pnp_config[] = {
     {
-        .name = "control_pc_speaker",
-        .description = "Control PC speaker",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "control_pc_speaker",
+        .description    = "Control PC speaker",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input (SB MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input401",
-        .description = "Receive input (MPU-401)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "receive_input401",
+        .description    = "Receive MIDI input (MPU-401)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t sb_goldfinch_config[] = {
+    {
+        .name           = "onboard_ram",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",   .value =     0 },
+            { .description = "512 KB", .value =   512 },
+            { .description =  "1 MB",  .value =  1024 },
+            { .description =  "2 MB",  .value =  2048 },
+            { .description =  "4 MB",  .value =  4096 },
+            { .description =  "8 MB",  .value =  8192 },
+            { .description = "16 MB",  .value = 16384 },
+            { .description = "28 MB",  .value = 28672 },
+            { .description = ""                       }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t sb_32_pnp_config[] = {
     {
-        .name = "onboard_ram",
-        .description = "Onboard RAM",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "None",
-                .value = 0
-            },
-            {
-                .description = "512 KB",
-                .value = 512
-            },
-            {
-                .description = "2 MB",
-                .value = 2048
-            },
-            {
-                .description = "8 MB",
-                .value = 8192
-            },
-            {
-                .description = "28 MB",
-                .value = 28672
-            },
-            { .description = "" }
-        }
+        .name           = "onboard_ram",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",   .value =     0 },
+            { .description = "512 KB", .value =   512 },
+            { .description =  "2 MB",  .value =  2048 },
+            { .description =  "8 MB",  .value =  8192 },
+            { .description = "28 MB",  .value = 28672 },
+            { .description = ""                       }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "control_pc_speaker",
-        .description = "Control PC speaker",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "control_pc_speaker",
+        .description    = "Control PC speaker",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input (SB MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input401",
-        .description = "Receive input (MPU-401)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "receive_input401",
+        .description    = "Receive MIDI input (MPU-401)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t sb_awe32_config[] = {
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x220,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "0x220",
-                .value = 0x220
-            },
-            {
-                .description = "0x240",
-                .value = 0x240
-            },
-            {
-                .description = "0x260",
-                .value = 0x260
-            },
-            {
-                .description = "0x280",
-                .value = 0x280
-            },
-            { .description = "" }
-        }
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x220,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x220", .value = 0x220 },
+            { .description = "0x240", .value = 0x240 },
+            { .description = "0x260", .value = 0x260 },
+            { .description = "0x280", .value = 0x280 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "emu_base",
-        .description =  "EMU8000 Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x620,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "0x620",
-                .value = 0x620
-            },
-            {
-                .description = "0x640",
-                .value = 0x640
-            },
-            {
-                .description = "0x660",
-                .value = 0x660
-            },
-            {
-                .description = "0x680",
-                .value = 0x680
-            },
-            { .description = ""}
-        }
+        .name           = "emu_base",
+        .description    = "EMU8000 Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x620,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x620", .value = 0x620 },
+            { .description = "0x640", .value = 0x640 },
+            { .description = "0x660", .value = 0x660 },
+            { .description = "0x680", .value = 0x680 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "base401",
-        .description = "MPU-401 Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x330,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "Disabled",
-                .value = 0
-            },
-            {
-                .description = "0x300",
-                .value = 0x300
-            },
-            {
-                .description = "0x330",
-                .value = 0x330
-            },
-            { .description = "" }
-        }
+        .name           = "base401",
+        .description    = "MPU-401 Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x330,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled", .value =     0 },
+            { .description = "0x300",    .value = 0x300 },
+            { .description = "0x330",    .value = 0x330 },
+            { .description = ""                         }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "irq",
-        .description = "IRQ",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "IRQ 2",
-                .value = 2
-            },
-            {
-                .description = "IRQ 5",
-                .value = 5
-            },
-            {
-                .description = "IRQ 7",
-                .value = 7
-            },
-            {
-                .description = "IRQ 10",
-                .value = 10
-            },
-            { .description = "" }
-        }
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description =  "IRQ 2", .value =  2 },
+            { .description =  "IRQ 5", .value =  5 },
+            { .description =  "IRQ 7", .value =  7 },
+            { .description = "IRQ 10", .value = 10 },
+            { .description = ""                    }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dma",
-        .description = "Low DMA channel",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 1,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "DMA 0",
-                .value = 0
-            },
-            {
-                .description = "DMA 1",
-                .value = 1
-            },
-            {
-                .description = "DMA 3",
-                .value = 3
-            },
-            { .description = "" }
-        }
+        .name           = "dma",
+        .description    = "Low DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "DMA 0", .value = 0 },
+            { .description = "DMA 1", .value = 1 },
+            { .description = "DMA 3", .value = 3 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dma16",
-        .description = "High DMA channel",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 5,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "DMA 5",
-                .value = 5
-            },
-            {
-                .description = "DMA 6",
-                .value = 6
-            },
-            {
-                .description = "DMA 7",
-                .value = 7
-            },
-            { .description = "" }
-        }
+        .name           = "dma16",
+        .description    = "High DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "DMA 5", .value = 5 },
+            { .description = "DMA 6", .value = 6 },
+            { .description = "DMA 7", .value = 7 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "onboard_ram",
-        .description = "Onboard RAM",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 512,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "None",
-                .value = 0
-            },
-            {
-                .description = "512 KB",
-                .value = 512
-            },
-            {
-                .description = "2 MB",
-                .value = 2048
-            },
-            {
-                .description = "8 MB",
-                .value = 8192
-            },
-            {
-                .description = "28 MB",
-                .value = 28672
-            },
-            { "" }
-        }
+        .name           = "onboard_ram",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",   .value =     0 },
+            { .description = "512 KB", .value =   512 },
+            { .description =  "2 MB",  .value =  2048 },
+            { .description =  "8 MB",  .value =  8192 },
+            { .description = "28 MB",  .value = 28672 },
+            { .description = ""                       }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "opl",
-        .description = "Enable OPL",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "gameport",
+        .description    = "Enable Game port",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "control_pc_speaker",
-        .description = "Control PC speaker",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "opl",
+        .description    = "Enable OPL",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input (SB MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "control_pc_speaker",
+        .description    = "Control PC speaker",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input401",
-        .description = "Receive input (MPU-401)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "receive_input401",
+        .description    = "Receive MIDI input (MPU-401)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t sb_awe32_pnp_config[] = {
     {
-        .name = "onboard_ram",
-        .description = "Onboard RAM",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 512,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "None",
-                .value = 0
-            },
-            {
-                .description = "512 KB",
-                .value = 512
-            },
-            {
-                .description = "2 MB",
-                .value = 2048
-            },
-            {
-                .description = "8 MB",
-                .value = 8192
-            },
-            {
-                .description = "28 MB",
-                .value = 28672
-            },
-            { .description = "" }
-        }
+        .name           = "onboard_ram",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",   .value =     0 },
+            { .description = "512 KB", .value =   512 },
+            { .description =  "2 MB",  .value =  2048 },
+            { .description =  "8 MB",  .value =  8192 },
+            { .description = "28 MB",  .value = 28672 },
+            { .description = ""                       }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "control_pc_speaker",
-        .description = "Control PC speaker",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "control_pc_speaker",
+        .description    = "Control PC speaker",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input (SB MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input401",
-        .description = "Receive input (MPU-401)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "receive_input401",
+        .description    = "Receive MIDI input (MPU-401)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t sb_awe64_value_config[] = {
     {
-        .name = "onboard_ram",
-        .description = "Onboard RAM",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 512,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "512 KB",
-                .value = 512
-            },
-            {
-                .description = "1 MB",
-                .value = 1024
-            },
-            {
-                .description = "2 MB",
-                .value = 2048
-            },
-            {
-                .description = "4 MB",
-                .value = 4096
-            },
-            {
-                .description = "8 MB",
-                .value = 8192
-            },
-            {
-                .description = "12 MB",
-                .value = 12288
-            },
-            {
-                .description = "16 MB",
-                .value = 16384
-            },
-            {
-                .description = "20 MB",
-                .value = 20480
-            },
-            {
-                .description = "24 MB",
-                .value = 24576
-            },
-            {
-                .description = "28 MB",
-                .value = 28672
-            },
-            { .description = "" }
-        }
+        .name           = "onboard_ram",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "512 KB", .value =   512 },
+            { .description =  "1 MB",  .value =  1024 },
+            { .description =  "2 MB",  .value =  2048 },
+            { .description =  "4 MB",  .value =  4096 },
+            { .description =  "8 MB",  .value =  8192 },
+            { .description = "12 MB",  .value = 12288 },
+            { .description = "16 MB",  .value = 16384 },
+            { .description = "20 MB",  .value = 20480 },
+            { .description = "24 MB",  .value = 24576 },
+            { .description = "28 MB",  .value = 28672 },
+            { .description = ""                       }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "control_pc_speaker",
-        .description = "Control PC speaker",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "control_pc_speaker",
+        .description    = "Control PC speaker",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input (SB MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input401",
-        .description = "Receive input (MPU-401)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "receive_input401",
+        .description    = "Receive MIDI input (MPU-401)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t sb_awe64_config[] = {
     {
-        .name = "onboard_ram",
-        .description = "Onboard RAM",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 1024,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "1 MB",
-                .value = 1024
-            },
-            {
-                .description = "2 MB",
-                .value = 2048
-            },
-            {
-                .description = "4 MB",
-                .value = 4096
-            },
-            {
-                .description = "8 MB",
-                .value = 8192
-            },
-            {
-                .description = "12 MB",
-                .value = 12288
-            },
-            {
-                .description = "16 MB",
-                .value = 16384
-            },
-            {
-                .description = "20 MB",
-                .value = 20480
-            },
-            {
-                .description = "24 MB",
-                .value = 24576
-            },
-            {
-                .description = "28 MB",
-                .value = 28672
-            },
-            { .description = "" }
-        }
+        .name           = "onboard_ram",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1024,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description =  "1 MB", .value =  1024 },
+            { .description =  "2 MB", .value =  2048 },
+            { .description =  "4 MB", .value =  4096 },
+            { .description =  "8 MB", .value =  8192 },
+            { .description = "12 MB", .value = 12288 },
+            { .description = "16 MB", .value = 16384 },
+            { .description = "20 MB", .value = 20480 },
+            { .description = "24 MB", .value = 24576 },
+            { .description = "28 MB", .value = 28672 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "control_pc_speaker",
-        .description = "Control PC speaker",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "control_pc_speaker",
+        .description    = "Control PC speaker",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input (SB MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input401",
-        .description = "Receive input (MPU-401)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "receive_input401",
+        .description    = "Receive MIDI input (MPU-401)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t sb_awe64_gold_config[] = {
     {
-        .name = "onboard_ram",
-        .description = "Onboard RAM",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 4096,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "4 MB",
-                .value = 4096
-            },
-            {
-                .description = "8 MB",
-                .value = 8192
-            },
-            {
-                .description = "12 MB",
-                .value = 12288
-            },
-            {
-                .description = "16 MB",
-                .value = 16384
-            },
-            {
-                .description = "20 MB",
-                .value = 20480
-            },
-            {
-                .description = "24 MB",
-                .value = 24576
-            },
-            {
-                .description = "28 MB",
-                .value = 28672
-            },
-            { .description = "" }
-        }
+        .name           = "onboard_ram",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 4096,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description =  "4 MB", .value =  4096 },
+            { .description =  "8 MB", .value =  8192 },
+            { .description = "12 MB", .value = 12288 },
+            { .description = "16 MB", .value = 16384 },
+            { .description = "20 MB", .value = 20480 },
+            { .description = "24 MB", .value = 24576 },
+            { .description = "28 MB", .value = 28672 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "control_pc_speaker",
-        .description = "Control PC speaker",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "control_pc_speaker",
+        .description    = "Control PC speaker",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input",
-        .description = "Receive input (SB MIDI)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "receive_input401",
-        .description = "Receive input (MPU-401)",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 0
+        .name           = "receive_input401",
+        .description    = "Receive MIDI input (MPU-401)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t ess_688_config[] = {
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x220,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x220", .value = 0x220 },
+            { .description = "0x230", .value = 0x230 },
+            { .description = "0x240", .value = 0x240 },
+            { .description = "0x250", .value = 0x250 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description =  "IRQ 2", .value =  2 },
+            { .description =  "IRQ 5", .value =  5 },
+            { .description =  "IRQ 7", .value =  7 },
+            { .description = "IRQ 10", .value = 10 },
+            { .description = ""                    }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "dma",
+        .description    = "DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "DMA 0", .value = 0 },
+            { .description = "DMA 1", .value = 1 },
+            { .description = "DMA 3", .value = 3 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "gameport",
+        .description    = "Enable Game port",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "ide_ctrl",
+        .description    = "IDE Controller",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled",      .value = 0x0000 },
+            { .description = "0x170, IRQ 15", .value = 0xf170 },
+            { .description = "0x1E8, IRQ 11", .value = 0xb1e8 },
+            { .description = "0x168, IRQ 9",  .value = 0x9168 },
+            { .description = "0x168, IRQ 10", .value = 0xa168 },
+            { .description = ""                               }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t ess_1688_config[] = {
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x220,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x220", .value = 0x220 },
+            { .description = "0x230", .value = 0x230 },
+            { .description = "0x240", .value = 0x240 },
+            { .description = "0x250", .value = 0x250 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "irq",
+        .description    = "IRQ",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IRQ 2",  .value =  2 },
+            { .description = "IRQ 5",  .value =  5 },
+            { .description = "IRQ 7",  .value =  7 },
+            { .description = "IRQ 10", .value = 10 },
+            { .description = ""                    }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "dma",
+        .description    = "DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "DMA 0", .value = 0 },
+            { .description = "DMA 1", .value = 1 },
+            { .description = "DMA 3", .value = 3 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "gameport",
+        .description    = "Enable Game port",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "ide_ctrl",
+        .description    = "IDE Controller",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled",      .value = 0x0000 },
+            { .description = "0x170, IRQ 15", .value = 0xf170 },
+            { .description = "0x1E8, IRQ 11", .value = 0xb1e8 },
+            { .description = "0x168, IRQ 9",  .value = 0x9168 },
+            { .description = "0x168, IRQ 10", .value = 0xa168 },
+            { .description = ""                               }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "control_pc_speaker",
+        .description    = "Control PC speaker",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "receive_input401",
+        .description    = "Receive MIDI input (MPU-401)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t ess_688_pnp_config[] = {
+    {
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t ess_1688_pnp_config[] = {
+    {
+        .name           = "control_pc_speaker",
+        .description    = "Control PC speaker",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "receive_input",
+        .description    = "Receive MIDI input",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "receive_input401",
+        .description    = "Receive MIDI input (MPU-401)",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
 };
@@ -3848,11 +5479,11 @@ const device_t sb_1_device = {
     .name          = "Sound Blaster v1.0",
     .internal_name = "sb",
     .flags         = DEVICE_ISA,
-    .local         = 0,
-    .init          = sb_1_init,
+    .local         = SB_1,
+    .init          = sb_init,
     .close         = sb_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = sb_config
@@ -3862,11 +5493,11 @@ const device_t sb_15_device = {
     .name          = "Sound Blaster v1.5",
     .internal_name = "sb1.5",
     .flags         = DEVICE_ISA,
-    .local         = 0,
-    .init          = sb_15_init,
+    .local         = SB_15,
+    .init          = sb_init,
     .close         = sb_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = sb15_config
@@ -3880,7 +5511,7 @@ const device_t sb_mcv_device = {
     .init          = sb_mcv_init,
     .close         = sb_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = sb_mcv_config
@@ -3890,11 +5521,11 @@ const device_t sb_2_device = {
     .name          = "Sound Blaster v2.0",
     .internal_name = "sb2.0",
     .flags         = DEVICE_ISA,
-    .local         = 0,
-    .init          = sb_2_init,
+    .local         = SB_2,
+    .init          = sb_init,
     .close         = sb_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = sb2_config
@@ -3908,7 +5539,7 @@ const device_t sb_pro_v1_device = {
     .init          = sb_pro_v1_init,
     .close         = sb_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = sb_pro_config
@@ -3922,7 +5553,7 @@ const device_t sb_pro_v2_device = {
     .init          = sb_pro_v2_init,
     .close         = sb_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = sb_pro_config
@@ -3936,7 +5567,7 @@ const device_t sb_pro_mcv_device = {
     .init          = sb_pro_mcv_init,
     .close         = sb_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = sb_pro_mcv_config
@@ -3945,12 +5576,12 @@ const device_t sb_pro_mcv_device = {
 const device_t sb_pro_compat_device = {
     .name          = "Sound Blaster Pro (Compatibility)",
     .internal_name = "sbpro_compat",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0,
     .init          = sb_pro_compat_init,
     .close         = sb_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -3959,68 +5590,26 @@ const device_t sb_pro_compat_device = {
 const device_t sb_16_device = {
     .name          = "Sound Blaster 16",
     .internal_name = "sb16",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = FM_YMF262,
     .init          = sb_16_init,
     .close         = sb_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = sb_16_config
 };
 
-const device_t sb_vibra16s_onboard_device = {
-    .name          = "Sound Blaster ViBRA 16S (On-Board)",
-    .internal_name = "sb_vibra16s_onboard",
-    .flags         = DEVICE_ISA | DEVICE_AT,
-    .local         = FM_YMF289B,
-    .init          = sb_16_init,
-    .close         = sb_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = sb_speed_changed,
-    .force_redraw  = NULL,
-    .config        = sb_16_config
-};
-
-const device_t sb_vibra16s_device = {
-    .name          = "Sound Blaster ViBRA 16S",
-    .internal_name = "sb_vibra16s",
-    .flags         = DEVICE_ISA | DEVICE_AT,
-    .local         = FM_YMF289B,
-    .init          = sb_16_init,
-    .close         = sb_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = sb_speed_changed,
-    .force_redraw  = NULL,
-    .config        = sb_16_config
-};
-
-const device_t sb_vibra16xv_device = {
-    .name          = "Sound Blaster ViBRA 16XV",
-    .internal_name = "sb_vibra16xv",
-    .flags         = DEVICE_ISA | DEVICE_AT,
-    .local         = 0,
-    .init          = sb_vibra16_pnp_init,
-    .close         = sb_close,
-    .reset         = NULL,
-    { .available = sb_vibra16xv_available },
-    .speed_changed = sb_speed_changed,
-    .force_redraw  = NULL,
-    .config        = sb_16_pnp_config
-};
-
 const device_t sb_vibra16c_onboard_device = {
     .name          = "Sound Blaster ViBRA 16C (On-Board)",
     .internal_name = "sb_vibra16c_onboard",
-    .flags         = DEVICE_ISA | DEVICE_AT,
-    .local         = 1,
+    .flags         = DEVICE_ISA16,
+    .local         = SB_VIBRA16C,
     .init          = sb_vibra16_pnp_init,
     .close         = sb_close,
     .reset         = NULL,
-    { .available = sb_vibra16c_available },
+    .available     = sb_vibra16c_available,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = sb_16_pnp_config
@@ -4029,12 +5618,96 @@ const device_t sb_vibra16c_onboard_device = {
 const device_t sb_vibra16c_device = {
     .name          = "Sound Blaster ViBRA 16C",
     .internal_name = "sb_vibra16c",
-    .flags         = DEVICE_ISA | DEVICE_AT,
-    .local         = 1,
+    .flags         = DEVICE_ISA16,
+    .local         = SB_VIBRA16C,
     .init          = sb_vibra16_pnp_init,
     .close         = sb_close,
     .reset         = NULL,
-    { .available = sb_vibra16c_available },
+    .available     = sb_vibra16c_available,
+    .speed_changed = sb_speed_changed,
+    .force_redraw  = NULL,
+    .config        = sb_16_pnp_config
+};
+
+const device_t sb_vibra16cl_onboard_device = {
+    .name          = "Sound Blaster ViBRA 16CL (On-Board)",
+    .internal_name = "sb_vibra16cl_onboard",
+    .flags         = DEVICE_ISA16,
+    .local         = SB_VIBRA16CL,
+    .init          = sb_vibra16_pnp_init,
+    .close         = sb_close,
+    .reset         = NULL,
+    .available     = sb_vibra16cl_available,
+    .speed_changed = sb_speed_changed,
+    .force_redraw  = NULL,
+    .config        = sb_16_pnp_config
+};
+
+const device_t sb_vibra16cl_device = {
+    .name          = "Sound Blaster ViBRA 16CL",
+    .internal_name = "sb_vibra16cl",
+    .flags         = DEVICE_ISA16,
+    .local         = SB_VIBRA16CL,
+    .init          = sb_vibra16_pnp_init,
+    .close         = sb_close,
+    .reset         = NULL,
+    .available     = sb_vibra16cl_available,
+    .speed_changed = sb_speed_changed,
+    .force_redraw  = NULL,
+    .config        = sb_16_pnp_config
+};
+
+const device_t sb_vibra16s_onboard_device = {
+    .name          = "Sound Blaster ViBRA 16S (On-Board)",
+    .internal_name = "sb_vibra16s_onboard",
+    .flags         = DEVICE_ISA16,
+    .local         = FM_YMF289B,
+    .init          = sb_16_init,
+    .close         = sb_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = sb_speed_changed,
+    .force_redraw  = NULL,
+    .config        = sb_16_config
+};
+
+const device_t sb_vibra16s_device = {
+    .name          = "Sound Blaster ViBRA 16S",
+    .internal_name = "sb_vibra16s",
+    .flags         = DEVICE_ISA16,
+    .local         = FM_YMF289B,
+    .init          = sb_16_init,
+    .close         = sb_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = sb_speed_changed,
+    .force_redraw  = NULL,
+    .config        = sb_16_config
+};
+
+const device_t sb_vibra16xv_onboard_device = {
+    .name          = "Sound Blaster ViBRA 16XV (On-Board)",
+    .internal_name = "sb_vibra16xv_onboard",
+    .flags         = DEVICE_ISA16,
+    .local         = SB_VIBRA16XV,
+    .init          = sb_vibra16_pnp_init,
+    .close         = sb_close,
+    .reset         = NULL,
+    .available     = sb_vibra16xv_available,
+    .speed_changed = sb_speed_changed,
+    .force_redraw  = NULL,
+    .config        = sb_16_pnp_config
+};
+
+const device_t sb_vibra16xv_device = {
+    .name          = "Sound Blaster ViBRA 16XV",
+    .internal_name = "sb_vibra16xv",
+    .flags         = DEVICE_ISA16,
+    .local         = SB_VIBRA16XV,
+    .init          = sb_vibra16_pnp_init,
+    .close         = sb_close,
+    .reset         = NULL,
+    .available     = sb_vibra16xv_available,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = sb_16_pnp_config
@@ -4048,7 +5721,7 @@ const device_t sb_16_reply_mca_device = {
     .init          = sb_16_reply_mca_init,
     .close         = sb_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = sb_16_pnp_config
@@ -4057,12 +5730,26 @@ const device_t sb_16_reply_mca_device = {
 const device_t sb_16_pnp_device = {
     .name          = "Sound Blaster 16 PnP",
     .internal_name = "sb16_pnp",
-    .flags         = DEVICE_ISA | DEVICE_AT,
-    .local         = 0,
+    .flags         = DEVICE_ISA16,
+    .local         = SB_16_PNP_NOIDE,
     .init          = sb_16_pnp_init,
     .close         = sb_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = sb_16_pnp_noide_available,
+    .speed_changed = sb_speed_changed,
+    .force_redraw  = NULL,
+    .config        = sb_16_pnp_config
+};
+
+const device_t sb_16_pnp_ide_device = {
+    .name          = "Sound Blaster 16 PnP (IDE)",
+    .internal_name = "sb16_pnp_ide",
+    .flags         = DEVICE_ISA16,
+    .local         = SB_16_PNP_IDE,
+    .init          = sb_16_pnp_init,
+    .close         = sb_close,
+    .reset         = NULL,
+    .available     = sb_16_pnp_ide_available,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = sb_16_pnp_config
@@ -4071,12 +5758,12 @@ const device_t sb_16_pnp_device = {
 const device_t sb_16_compat_device = {
     .name          = "Sound Blaster 16 (Compatibility)",
     .internal_name = "sb16_compat",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 1,
     .init          = sb_16_compat_init,
     .close         = sb_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
@@ -4085,26 +5772,40 @@ const device_t sb_16_compat_device = {
 const device_t sb_16_compat_nompu_device = {
     .name          = "Sound Blaster 16 (Compatibility - MPU-401 Off)",
     .internal_name = "sb16_compat",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0,
     .init          = sb_16_compat_init,
     .close         = sb_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
 };
 
+const device_t sb_goldfinch_device = {
+    .name          = "Creative EMU8000 PnP (Goldfinch)",
+    .internal_name = "sb_goldfinch",
+    .flags         = DEVICE_ISA16,
+    .local         = 0,
+    .init          = sb_goldfinch_init,
+    .close         = sb_goldfinch_close,
+    .reset         = NULL,
+    .available     = sb_goldfinch_available,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = sb_goldfinch_config
+};
+
 const device_t sb_32_pnp_device = {
     .name          = "Sound Blaster 32 PnP",
     .internal_name = "sb32_pnp",
-    .flags         = DEVICE_ISA | DEVICE_AT,
-    .local         = 0,
+    .flags         = DEVICE_ISA16,
+    .local         = SB_32_PNP,
     .init          = sb_awe32_pnp_init,
     .close         = sb_awe32_close,
     .reset         = NULL,
-    { .available = sb_32_pnp_available },
+    .available     = sb_32_pnp_available,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = sb_32_pnp_config
@@ -4113,12 +5814,12 @@ const device_t sb_32_pnp_device = {
 const device_t sb_awe32_device = {
     .name          = "Sound Blaster AWE32",
     .internal_name = "sbawe32",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0,
     .init          = sb_awe32_init,
     .close         = sb_awe32_close,
     .reset         = NULL,
-    { .available = sb_awe32_available },
+    .available     = sb_awe32_available,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = sb_awe32_config
@@ -4127,12 +5828,12 @@ const device_t sb_awe32_device = {
 const device_t sb_awe32_pnp_device = {
     .name          = "Sound Blaster AWE32 PnP",
     .internal_name = "sbawe32_pnp",
-    .flags         = DEVICE_ISA | DEVICE_AT,
-    .local         = 1,
+    .flags         = DEVICE_ISA16,
+    .local         = SB_AWE32_PNP,
     .init          = sb_awe32_pnp_init,
     .close         = sb_awe32_close,
     .reset         = NULL,
-    { .available = sb_awe32_pnp_available },
+    .available     = sb_awe32_pnp_available,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = sb_awe32_pnp_config
@@ -4141,12 +5842,12 @@ const device_t sb_awe32_pnp_device = {
 const device_t sb_awe64_value_device = {
     .name          = "Sound Blaster AWE64 Value",
     .internal_name = "sbawe64_value",
-    .flags         = DEVICE_ISA | DEVICE_AT,
-    .local         = 2,
+    .flags         = DEVICE_ISA16,
+    .local         = SB_AWE64_VALUE,
     .init          = sb_awe32_pnp_init,
     .close         = sb_awe32_close,
     .reset         = NULL,
-    { .available = sb_awe64_value_available },
+    .available     = sb_awe64_value_available,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = sb_awe64_value_config
@@ -4155,12 +5856,26 @@ const device_t sb_awe64_value_device = {
 const device_t sb_awe64_device = {
     .name          = "Sound Blaster AWE64",
     .internal_name = "sbawe64",
-    .flags         = DEVICE_ISA | DEVICE_AT,
-    .local         = 3,
+    .flags         = DEVICE_ISA16,
+    .local         = SB_AWE64_NOIDE,
     .init          = sb_awe32_pnp_init,
     .close         = sb_awe32_close,
     .reset         = NULL,
-    { .available = sb_awe64_available },
+    .available     = sb_awe64_noide_available,
+    .speed_changed = sb_speed_changed,
+    .force_redraw  = NULL,
+    .config        = sb_awe64_config
+};
+
+const device_t sb_awe64_ide_device = {
+    .name          = "Sound Blaster AWE64 (IDE)",
+    .internal_name = "sbawe64_ide",
+    .flags         = DEVICE_ISA16,
+    .local         = SB_AWE64_IDE,
+    .init          = sb_awe32_pnp_init,
+    .close         = sb_awe32_close,
+    .reset         = NULL,
+    .available     = sb_awe64_ide_available,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = sb_awe64_config
@@ -4169,13 +5884,125 @@ const device_t sb_awe64_device = {
 const device_t sb_awe64_gold_device = {
     .name          = "Sound Blaster AWE64 Gold",
     .internal_name = "sbawe64_gold",
-    .flags         = DEVICE_ISA | DEVICE_AT,
-    .local         = 4,
+    .flags         = DEVICE_ISA16,
+    .local         = SB_AWE64_GOLD,
     .init          = sb_awe32_pnp_init,
     .close         = sb_awe32_close,
     .reset         = NULL,
-    { .available = sb_awe64_gold_available },
+    .available     = sb_awe64_gold_available,
     .speed_changed = sb_speed_changed,
     .force_redraw  = NULL,
     .config        = sb_awe64_gold_config
 };
+
+const device_t ess_688_device = {
+    .name          = "ESS AudioDrive ES688",
+    .internal_name = "ess_es688",
+    .flags         = DEVICE_ISA,
+    .local         = 0,
+    .init          = ess_x688_init,
+    .close         = sb_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = sb_speed_changed,
+    .force_redraw  = NULL,
+    .config        = ess_688_config
+};
+
+const device_t ess_ess0100_pnp_device = {
+    .name          = "ESS AudioDrive ES688 (ESS0100) PnP",
+    .internal_name = "ess_ess0100_pnp",
+    .flags         = DEVICE_ISA,
+    .local         = 0,
+    .init          = ess_x688_pnp_init,
+    .close         = sb_close,
+    .reset         = NULL,
+    .available     = ess_688_pnp_available,
+    .speed_changed = sb_speed_changed,
+    .force_redraw  = NULL,
+    .config        = ess_688_pnp_config
+};
+
+const device_t ess_1688_device = {
+    .name          = "ESS AudioDrive ES1688",
+    .internal_name = "ess_es1688",
+    .flags         = DEVICE_ISA,
+    .local         = 1,
+    .init          = ess_x688_init,
+    .close         = sb_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = sb_speed_changed,
+    .force_redraw  = NULL,
+    .config        = ess_1688_config
+};
+
+const device_t ess_ess0102_pnp_device = {
+    .name          = "ESS AudioDrive ES1688 (ESS0102) PnP",
+    .internal_name = "ess_ess0102_pnp",
+    .flags         = DEVICE_ISA,
+    .local         = 1,
+    .init          = ess_x688_pnp_init,
+    .close         = sb_close,
+    .reset         = NULL,
+    .available     = ess_1688_pnp_available,
+    .speed_changed = sb_speed_changed,
+    .force_redraw  = NULL,
+    .config        = ess_1688_pnp_config
+};
+
+const device_t ess_ess0968_pnp_device = {
+    .name          = "ESS AudioDrive ES1688 (ESS0968) PnP",
+    .internal_name = "ess_ess0968_pnp",
+    .flags         = DEVICE_ISA,
+    .local         = 2,
+    .init          = ess_x688_pnp_init,
+    .close         = sb_close,
+    .reset         = NULL,
+    .available     = ess_1688_968_pnp_available,
+    .speed_changed = sb_speed_changed,
+    .force_redraw  = NULL,
+    .config        = ess_1688_pnp_config
+};
+
+const device_t ess_soundpiper_16_mca_device = {
+    .name          = "SoundPiper 16 (ESS AudioDrive ES688) MCA",
+    .internal_name = "soundpiper_16_mca",
+    .flags         = DEVICE_MCA,
+    .local         = 0,
+    .init          = ess_x688_mca_init,
+    .close         = sb_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = sb_speed_changed,
+    .force_redraw  = NULL,
+    .config        = ess_688_pnp_config
+};
+
+const device_t ess_soundpiper_32_mca_device = {
+    .name          = "SoundPiper 32 (ESS AudioDrive ES1688) MCA",
+    .internal_name = "soundpiper_32_mca",
+    .flags         = DEVICE_MCA,
+    .local         = 1,
+    .init          = ess_x688_mca_init,
+    .close         = sb_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = sb_speed_changed,
+    .force_redraw  = NULL,
+    .config        = ess_1688_pnp_config
+};
+
+const device_t ess_chipchat_16_mca_device = {
+    .name          = "ChipChat 16 (ESS AudioDrive ES1688) MCA",
+    .internal_name = "chipchat_16_mca",
+    .flags         = DEVICE_MCA,
+    .local         = 2,
+    .init          = ess_x688_mca_init,
+    .close         = sb_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = sb_speed_changed,
+    .force_redraw  = NULL,
+    .config        = ess_1688_pnp_config
+};
diff --git a/src/sound/snd_sb_dsp.c b/src/sound/snd_sb_dsp.c
index 6fc7815ab..76956c417 100644
--- a/src/sound/snd_sb_dsp.c
+++ b/src/sound/snd_sb_dsp.c
@@ -6,6 +6,7 @@
 
 #define _USE_MATH_DEFINES
 #include <math.h>
+#include <stdbool.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -28,74 +29,106 @@
 #include <86box/plat_fallthrough.h>
 #include <86box/plat_unused.h>
 
+/* NON-PCM SAMPLE FORMATS */
 #define ADPCM_4  1
 #define ADPCM_26 2
 #define ADPCM_2  3
+#define ESPCM_4  4
+#define ESPCM_3  5
+/*      ESPCM_2?   */
+#define ESPCM_1  7
+#define ESPCM_4E 8    /* For differentiating between 4-bit encoding and decoding modes. */
 
-/*The recording safety margin is intended for uneven "len" calls to the get_buffer mixer calls on sound_sb*/
+/* The recording safety margin is intended for uneven "len" calls to the get_buffer mixer calls on sound_sb. */
 #define SB_DSP_REC_SAFEFTY_MARGIN 4096
 
+enum {
+    DSP_S_NORMAL = 0,
+    DSP_S_RESET,
+    DSP_S_RESET_WAIT
+};
+
 void pollsb(void *priv);
 void sb_poll_i(void *priv);
 
 static int sbe2dat[4][9] = {
-    {0x01,   -0x02, -0x04, 0x08,  -0x10, 0x20,  0x40,  -0x80, -106},
-    { -0x01, 0x02,  -0x04, 0x08,  0x10,  -0x20, 0x40,  -0x80, 165 },
-    { -0x01, 0x02,  0x04,  -0x08, 0x10,  -0x20, -0x40, 0x80,  -151},
-    { 0x01,  -0x02, 0x04,  -0x08, -0x10, 0x20,  -0x40, 0x80,  90  }
+    {  0x01, -0x02, -0x04,  0x08, -0x10,  0x20,  0x40, -0x80, -106 },
+    { -0x01,  0x02, -0x04,  0x08,  0x10, -0x20,  0x40, -0x80,  165 },
+    { -0x01,  0x02,  0x04, -0x08,  0x10, -0x20, -0x40,  0x80, -151 },
+    {  0x01, -0x02,  0x04, -0x08, -0x10,  0x20, -0x40,  0x80,  90  }
 };
 
 static int sb_commands[256] = {
-    -1, 2, -1, 0, 1, 2, -1, 0, 1, -1, -1, -1, -1, -1, 2, 1,
-    1, -1, -1, -1, 2, -1, 2, 2, -1, -1, -1, -1, 0, -1, -1, 0,
-    0, -1, -1, -1, 2, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1,
+    -1,  2, -1,  0,  1,  2, -1,  0,  1, -1, -1, -1, -1, -1,  2,  1,
+     1, -1, -1, -1,  2, -1,  2,  2, -1, -1, -1, -1,  0, -1, -1,  0,
+     0, -1, -1, -1,  2, -1, -1, -1, -1, -1, -1, -1,  0, -1, -1, -1,
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    1, 2, 2, -1, -1, -1, -1, -1, 2, -1, -1, -1, -1, -1, -1, -1,
+     1,  2,  2, -1, -1, -1, -1, -1,  2, -1, -1, -1, -1, -1, -1, -1,
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, 2, 2, 2, 2, -1, -1, -1, -1, -1, 0, -1, 0,
-    2, 2, -1, -1, -1, -1, -1, -1, 2, 2, -1, -1, -1, -1, -1, -1,
-    0, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1,  2,  2,  2,  2, -1, -1, -1, -1, -1,  0, -1,  0,
+     2,  2, -1, -1, -1, -1, -1, -1,  2,  2, -1, -1, -1, -1, -1, -1,
+     0, -1, -1, -1, -1, -1, -1, -1,  0, -1, -1, -1, -1, -1, -1, -1,
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    0, 0, -1, 0, 0, 0, 0, -1, 0, 0, 0, -1, -1, -1, -1, -1,
-    1, 0, 1, 0, 1, -1, -1, 0, 0, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, 0, 0, -1, -1, -1, -1, -1, 1, 2, -1, -1, -1, -1, 0
+     3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
+     3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
+     0,  0, -1,  0,  0,  0,  0, -1,  0,  0,  0, -1, -1, -1, -1, -1,
+     1,  0,  1,  0,  1, -1, -1,  0,  0, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1,  0,  0, -1, -1, -1, -1, -1,  1,  2, -1, -1, -1, -1,  0
 };
 
+#if 0
+// Currently unused, here for reference if ever needed
+char     sb202_copyright[] = "COPYRIGHT(C) CREATIVE TECHNOLOGY PTE. LTD. (1991) "
+#endif
 char     sb16_copyright[]  = "COPYRIGHT (C) CREATIVE TECHNOLOGY LTD, 1992.";
-uint16_t sb_dsp_versions[] = { 0, 0, 0x105, 0x200, 0x201, 0x300, 0x302, 0x405, 0x40c, 0x40d, 0x410 };
+uint16_t sb_dsp_versions[] = {
+    0,     /* Pad */
+    0,     /* SADLIB      - No DSP */
+    0x105, /* SB_DSP_105      - SB1/1.5, DSP v1.05 */
+    0x200, /* SB_DSP_200      - SB1.5/2, DSP v2.00 */
+    0x201, /* SB_DSP_201      - SB1.5/2, DSP v2.01 - needed for high-speed DMA */
+    0x202, /* SB_DSP_202      - SB2, DSP v2.02 */
+    0x300, /* SB_PRO_DSP_300  - SB Pro, DSP v3.00 */
+    0x302, /* SBPRO2_DSP_302 - SB Pro 2, DSP v3.02 + OPL3 */
+    0x404, /* SB16_DSP_404        - DSP v4.04 + OPL3 */
+    0x405, /* SB16_405        - DSP v4.05 + OPL3 */
+    0x406, /* SB16_406        - DSP v4.06 + OPL3 */
+    0x40b, /* SB16_411        - DSP v4.11 + OPL3 */
+    0x40c, /* SBAWE32         - DSP v4.12 + OPL3 */
+    0x40d, /* SBAWE32PNP      - DSP v4.13 + OPL3 */
+    0x410  /* SBAWE64         - DSP v4.16 + OPL3 */
+};
 
 /*These tables were 'borrowed' from DOSBox*/
 int8_t scaleMap4[64] = {
-    0, 1, 2, 3, 4, 5, 6, 7, 0, -1, -2, -3, -4, -5, -6, -7,
-    1, 3, 5, 7, 9, 11, 13, 15, -1, -3, -5, -7, -9, -11, -13, -15,
-    2, 6, 10, 14, 18, 22, 26, 30, -2, -6, -10, -14, -18, -22, -26, -30,
+    0,  1,  2,  3,  4,  5,  6,  7,  0,  -1,  -2,  -3,  -4,  -5,  -6,  -7,
+    1,  3,  5,  7,  9, 11, 13, 15, -1,  -3,  -5,  -7,  -9, -11, -13, -15,
+    2,  6, 10, 14, 18, 22, 26, 30, -2,  -6, -10, -14, -18, -22, -26, -30,
     4, 12, 20, 28, 36, 44, 52, 60, -4, -12, -20, -28, -36, -44, -52, -60
 };
 
 uint8_t adjustMap4[64] = {
-    0, 0, 0, 0, 0, 16, 16, 16,
-    0, 0, 0, 0, 0, 16, 16, 16,
+      0, 0, 0, 0, 0, 16, 16, 16,
+      0, 0, 0, 0, 0, 16, 16, 16,
     240, 0, 0, 0, 0, 16, 16, 16,
     240, 0, 0, 0, 0, 16, 16, 16,
     240, 0, 0, 0, 0, 16, 16, 16,
     240, 0, 0, 0, 0, 16, 16, 16,
-    240, 0, 0, 0, 0, 0, 0, 0,
-    240, 0, 0, 0, 0, 0, 0, 0
+    240, 0, 0, 0, 0,  0,  0,  0,
+    240, 0, 0, 0, 0,  0,  0,  0
 };
 
 int8_t scaleMap26[40] = {
-    0, 1, 2, 3, 0, -1, -2, -3,
-    1, 3, 5, 7, -1, -3, -5, -7,
-    2, 6, 10, 14, -2, -6, -10, -14,
+    0,  1,  2,  3,  0,  -1,  -2,  -3,
+    1,  3,  5,  7, -1,  -3,  -5,  -7,
+    2,  6, 10, 14, -2,  -6, -10, -14,
     4, 12, 20, 28, -4, -12, -20, -28,
     5, 15, 25, 35, -5, -15, -25, -35
 };
 
 uint8_t adjustMap26[40] = {
-    0, 0, 0, 8, 0, 0, 0, 8,
+      0, 0, 0, 8,   0, 0, 0, 8,
     248, 0, 0, 8, 248, 0, 0, 8,
     248, 0, 0, 8, 248, 0, 0, 8,
     248, 0, 0, 8, 248, 0, 0, 8,
@@ -103,19 +136,139 @@ uint8_t adjustMap26[40] = {
 };
 
 int8_t scaleMap2[24] = {
-    0, 1, 0, -1, 1, 3, -1, -3,
-    2, 6, -2, -6, 4, 12, -4, -12,
+    0,  1,  0,  -1, 1,  3,  -1,  -3,
+    2,  6, -2,  -6, 4, 12,  -4, -12,
     8, 24, -8, -24, 6, 48, -16, -48
 };
 
 uint8_t adjustMap2[24] = {
-    0, 4, 0, 4,
-    252, 4, 252, 4, 252, 4, 252, 4,
-    252, 4, 252, 4, 252, 4, 252, 4,
+      0, 4,   0, 4,
+    252, 4, 252, 4,
+    252, 4, 252, 4,
+    252, 4, 252, 4,
+    252, 4, 252, 4,
     252, 0, 252, 0
 };
 
-double low_fir_sb16_coef[3][SB16_NCoef];
+// clang-format off
+/* Upper half only used for ESPCM_3 mode. */
+/* TODO: Extract actual table (or exact ranges + range interpolation algo, whatever it is) from chip, someday, somehow.
+ * This current table is part software reverse engineering, part guesswork/extrapolation.
+ * It's close enough to what's in the chip to produce acceptable results, but not exact.
+ **/
+int8_t espcm_range_map[512] = {
+       -8,  -7,  -6,  -5,  -4,  -3,  -2,  -1,   0,   1,   2,   3,   4,   5,   6,   7,
+      -10,  -8,  -7,  -5,  -4,  -3,  -2,  -1,   0,   2,   3,   4,   5,   6,   8,   9,
+      -12, -11,  -9,  -8,  -6,  -5,  -3,  -2,   0,   2,   3,   5,   6,   8,  10,  11,
+      -14, -12, -11,  -9,  -7,  -5,  -4,  -2,   0,   2,   4,   5,   7,   9,  11,  13,
+      -16, -14, -12, -10,  -8,  -6,  -4,  -2,   0,   2,   4,   6,   8,  10,  12,  14,
+      -21, -18, -16, -13, -11,  -8,  -6,  -3,   0,   2,   5,   7,  10,  12,  15,  18,
+      -27, -24, -21, -17, -14, -11,  -8,  -4,   0,   3,   7,  10,  13,  17,  20,  24,
+      -35, -28, -24, -20, -16, -12,  -8,  -4,   0,   4,   8,  12,  16,  20,  24,  28,
+      -40, -35, -30, -25, -20, -15, -10,  -5,   0,   5,  10,  15,  20,  25,  30,  35,
+      -48, -42, -36, -30, -24, -18, -12,  -6,   0,   6,  12,  18,  24,  30,  36,  43,
+      -56, -49, -42, -35, -28, -21, -14,  -7,   0,   7,  14,  21,  28,  35,  42,  49,
+      -72, -63, -54, -45, -36, -27, -18,  -9,   0,   9,  18,  27,  36,  45,  54,  63,
+      -85, -74, -64, -53, -43, -32, -22, -11,   0,  11,  22,  33,  43,  54,  64,  75,
+     -102, -98, -85, -71, -58, -45, -31, -14,   0,  13,  26,  39,  52,  65,  78,  90,
+     -127,-112, -96, -80, -64, -48, -32, -16,   0,  16,  32,  48,  64,  80,  96, 112,
+     -128,-127,-109, -91, -73, -54, -36, -18,   0,  18,  36,  54,  73,  91, 109, 127,
+       -8,  -7,  -6,  -5,  -4,  -3,  -2,  -1,   0,   1,   2,   3,   4,   5,   6,   7,
+      -10,  -9,  -8,  -6,  -5,  -4,  -3,  -2,  -1,   1,   2,   3,   4,   6,   7,   8,
+      -13, -11,  -9,  -7,  -6,  -5,  -3,  -2,  -1,   2,   3,   5,   6,   7,   9,  10,
+      -15, -13, -12, -10,  -8,  -6,  -5,  -3,  -1,   2,   3,   5,   6,   8,  10,  12,
+      -18, -15, -13, -11,  -9,  -7,  -5,  -3,  -1,   2,   3,   5,   7,   9,  11,  13,
+      -24, -20, -17, -15, -12, -10,  -7,  -5,  -2,   2,   3,   6,   8,  11,  13,  16,
+      -29, -26, -23, -19, -16, -13, -10,  -6,  -2,   2,   5,   8,  11,  15,  18,  22,
+      -34, -30, -26, -22, -18, -14, -10,  -6,  -2,   2,   6,  10,  14,  18,  22,  26,
+      -43, -38, -33, -28, -23, -18, -13,  -8,  -3,   2,   7,  12,  17,  22,  27,  32,
+      -51, -45, -39, -33, -27, -21, -15,  -9,  -3,   3,   9,  15,  21,  27,  33,  39,
+      -60, -53, -46, -39, -32, -25, -18, -11,  -4,   3,  10,  17,  24,  31,  38,  45,
+      -77, -68, -59, -50, -41, -32, -23, -14,  -5,   4,  13,  22,  31,  40,  49,  58,
+      -90, -80, -69, -59, -48, -38, -27, -17,  -6,   5,  16,  27,  38,  48,  59,  69,
+     -112,-104, -91, -78, -65, -52, -38, -23,  -7,   6,  19,  32,  45,  58,  71,  84,
+     -128,-120,-104, -88, -72, -56, -40, -24,  -8,   8,  24,  40,  56,  72,  88, 104,
+     -128,-128,-118,-100, -82, -64, -45, -27,  -9,   9,  27,  45,  63,  82, 100, 118
+};
+
+/* address = table_index(9:8) | dsp->espcm_last_value(7:3) | codeword(2:0)
+ * the value is a base index into espcm_range_map with bits at (8, 3:0),
+ * to be OR'ed with dsp->espcm_range at (7:4)
+ */
+uint16_t espcm3_dpcm_tables[1024] =
+{
+    /* Table 0 */
+     256, 257, 258, 259, 260, 263, 266, 269,   0, 257, 258, 259, 260, 263, 266, 269,
+       0,   1, 258, 259, 260, 263, 266, 269,   1,   2, 259, 260, 261, 263, 266, 269,
+       1,   3, 260, 261, 262, 264, 266, 269,   1,   3,   4, 261, 262, 264, 266, 269,
+       2,   4,   5, 262, 263, 264, 266, 269,   2,   4,   6, 263, 264, 265, 267, 269,
+       2,   4,   6,   7, 264, 265, 267, 269,   2,   5,   7,   8, 265, 266, 267, 269,
+       2,   5,   7,   8,   9, 266, 268, 270,   2,   5,   7,   9,  10, 267, 268, 270,
+       2,   5,   8,  10,  11, 268, 269, 270,   2,   5,   8,  11,  12, 269, 270, 271,
+       2,   5,   8,  11,  12,  13, 270, 271,   2,   5,   8,  11,  12,  13,  14, 271,
+       0, 257, 258, 259, 260, 263, 266, 269,   0,   1, 258, 259, 260, 263, 266, 269,
+       0,   1,   2, 259, 260, 263, 266, 269,   1,   2,   3, 260, 261, 263, 266, 269,
+       1,   3,   4, 261, 262, 264, 266, 269,   1,   3,   5, 262, 263, 264, 266, 269,
+       2,   4,   5,   6, 263, 264, 266, 269,   2,   4,   6,   7, 264, 265, 267, 269,
+       2,   4,   6,   7,   8, 265, 267, 269,   2,   5,   7,   8,   9, 266, 267, 269,
+       2,   5,   7,   9,  10, 267, 268, 270,   2,   5,   7,   9,  10,  11, 268, 270,
+       2,   5,   8,  10,  11,  12, 269, 270,   2,   5,   8,  11,  12,  13, 270, 271,
+       2,   5,   8,  11,  12,  13,  14, 271,   2,   5,   8,  11,  12,  13,  14,  15,
+    /* Table 1 */
+     257, 260, 262, 263, 264, 265, 267, 270, 257, 260, 262, 263, 264, 265, 267, 270,
+       1, 260, 262, 263, 264, 265, 267, 270,   1, 260, 262, 263, 264, 265, 267, 270,
+       1, 260, 262, 263, 264, 265, 267, 270,   1,   4, 262, 263, 264, 265, 267, 270,
+       1,   4, 262, 263, 264, 265, 267, 270,   1,   4,   6, 263, 264, 265, 267, 270,
+       1,   4,   6,   7, 264, 265, 267, 270,   1,   4,   6,   7,   8, 265, 267, 270,
+       1,   4,   6,   7,   8,   9, 267, 270,   1,   4,   6,   7,   8,   9, 267, 270,
+       1,   4,   6,   7,   8,   9,  11, 270,   1,   4,   6,   7,   8,   9,  11, 270,
+       1,   4,   6,   7,   8,   9,  11, 270,   1,   4,   6,   7,   8,   9,  11,  14,
+     257, 260, 262, 263, 264, 265, 267, 270,   1, 260, 262, 263, 264, 265, 267, 270,
+       1, 260, 262, 263, 264, 265, 267, 270,   1, 260, 262, 263, 264, 265, 267, 270,
+       1,   4, 262, 263, 264, 265, 267, 270,   1,   4, 262, 263, 264, 265, 267, 270,
+       1,   4,   6, 263, 264, 265, 267, 270,   1,   4,   6,   7, 264, 265, 267, 270,
+       1,   4,   6,   7,   8, 265, 267, 270,   1,   4,   6,   7,   8,   9, 267, 270,
+       1,   4,   6,   7,   8,   9, 267, 270,   1,   4,   6,   7,   8,   9,  11, 270,
+       1,   4,   6,   7,   8,   9,  11, 270,   1,   4,   6,   7,   8,   9,  11, 270,
+       1,   4,   6,   7,   8,   9,  11,  14,   1,   4,   6,   7,   8,   9,  11,  14,
+    /* Table 2 */
+     256, 257, 258, 259, 260, 262, 265, 268,   0, 257, 258, 259, 260, 262, 265, 268,
+       0,   1, 258, 259, 260, 262, 265, 269,   1,   2, 259, 260, 261, 263, 265, 269,
+       1,   3, 260, 261, 262, 263, 265, 269,   1,   3,   4, 261, 262, 263, 265, 269,
+       1,   3,   5, 262, 263, 264, 266, 269,   1,   4,   5,   6, 263, 264, 266, 269,
+       1,   4,   6,   7, 264, 265, 266, 269,   1,   4,   6,   7,   8, 265, 266, 269,
+       2,   4,   6,   7,   8,   9, 267, 269,   2,   4,   6,   7,   8,   9, 267, 269,
+       2,   5,   7,   8,   9,  10,  11, 270,   2,   5,   7,   8,   9,  10,  11, 270,
+       2,   5,   8,   9,  10,  11,  12, 270,   2,   6,   8,  10,  11,  12,  13,  14,
+     257, 258, 259, 260, 261, 263, 265, 269,   1, 259, 260, 261, 262, 263, 266, 269,
+       1, 260, 261, 262, 263, 264, 266, 269,   1, 260, 261, 262, 263, 264, 266, 269,
+       2,   4, 262, 263, 264, 265, 267, 269,   2,   4, 262, 263, 264, 265, 267, 269,
+       2,   5,   6, 263, 264, 265, 267, 270,   2,   5,   6,   7, 264, 265, 267, 270,
+       2,   5,   7,   8, 265, 266, 267, 270,   2,   5,   7,   8,   9, 266, 268, 270,
+       2,   6,   8,   9,  10, 267, 268, 270,   2,   6,   8,   9,  10,  11, 268, 270,
+       2,   6,   8,  10,  11,  12, 269, 270,   2,   6,   9,  11,  12,  13, 270, 271,
+       3,   6,   9,  11,  12,  13,  14, 271,   3,   6,   9,  11,  12,  13,  14,  15,
+    /* Table 3 */
+     256, 258, 260, 261, 262, 263, 264, 265,   0, 258, 260, 261, 262, 263, 264, 265,
+       1, 259, 260, 261, 262, 263, 264, 266,   1, 259, 260, 261, 262, 263, 264, 266,
+       1,   3, 260, 261, 262, 263, 264, 266,   1,   3,   4, 261, 262, 263, 264, 267,
+       1,   3,   4,   5, 262, 263, 264, 267,   1,   3,   4,   5,   6, 263, 264, 267,
+       1,   3,   5,   6,   7, 264, 265, 268,   1,   3,   5,   6,   7,   8, 265, 268,
+       1,   4,   6,   7,   8,   9, 266, 269,   1,   4,   6,   7,   8,   9,  10, 269,
+       1,   4,   6,   7,   8,   9,  10, 269,   1,   4,   6,   7,   8,   9,  11, 270,
+       1,   4,   6,   7,   8,   9,  11, 270,   1,   4,   6,   7,   8,   9,  11,  14,
+     257, 260, 262, 263, 264, 265, 267, 270,   1, 260, 262, 263, 264, 265, 267, 270,
+       1, 260, 262, 263, 264, 265, 267, 270,   2, 261, 262, 263, 264, 265, 267, 270,
+       2, 261, 262, 263, 264, 265, 267, 270,   2,   5, 262, 263, 264, 265, 267, 270,
+       3,   6, 263, 264, 265, 266, 268, 270,   3,   6,   7, 264, 265, 266, 268, 270,
+       4,   7,   8, 265, 266, 267, 268, 270,   4,   7,   8,   9, 266, 267, 268, 270,
+       4,   7,   8,   9,  10, 267, 268, 270,   5,   7,   8,   9,  10,  11, 268, 270,
+       5,   7,   8,   9,  10,  11,  12, 270,   5,   7,   8,   9,  10,  11,  12, 270,
+       6,   7,   8,   9,  10,  11,  13, 271,   6,   7,   8,   9,  10,  11,  13,  15
+};
+// clang-format on
+
+double low_fir_sb16_coef[5][SB16_NCoef];
 
 #ifdef ENABLE_SB_DSP_LOG
 int sb_dsp_do_log = ENABLE_SB_DSP_LOG;
@@ -135,6 +288,8 @@ sb_dsp_log(const char *fmt, ...)
 #    define sb_dsp_log(fmt, ...)
 #endif
 
+#define ESSreg(reg) (dsp)->ess_regs[reg - 0xA0]
+
 static __inline double
 sinc(double x)
 {
@@ -142,20 +297,18 @@ sinc(double x)
 }
 
 static void
-recalc_sb16_filter(int c, int playback_freq)
+recalc_sb16_filter(const int c, const int playback_freq)
 {
     /* Cutoff frequency = playback / 2 */
-    int    n;
-    double w;
-    double h;
-    double fC = ((double) playback_freq) / (double) FREQ_96000;
-    double gain;
+    int          n;
+    const double fC = ((double) playback_freq) / (double) FREQ_96000;
 
     for (n = 0; n < SB16_NCoef; n++) {
         /* Blackman window */
-        w = 0.42 - (0.5 * cos((2.0 * n * M_PI) / (double) (SB16_NCoef - 1))) + (0.08 * cos((4.0 * n * M_PI) / (double) (SB16_NCoef - 1)));
+        const double w = 0.42 - (0.5 * cos((2.0 * n * M_PI) / (double) (SB16_NCoef - 1))) +
+                     (0.08 * cos((4.0 * n * M_PI) / (double) (SB16_NCoef - 1)));
         /* Sinc filter */
-        h = sinc(2.0 * fC * ((double) n - ((double) (SB16_NCoef - 1) / 2.0)));
+        const double h = sinc(2.0 * fC * ((double) n - ((double) (SB16_NCoef - 1) / 2.0)));
 
         /* Create windowed-sinc filter */
         low_fir_sb16_coef[c][n] = w * h;
@@ -163,7 +316,7 @@ recalc_sb16_filter(int c, int playback_freq)
 
     low_fir_sb16_coef[c][(SB16_NCoef - 1) / 2] = 1.0;
 
-    gain = 0.0;
+    double gain = 0.0;
     for (n = 0; n < SB16_NCoef; n++)
         gain += low_fir_sb16_coef[c][n];
 
@@ -173,7 +326,36 @@ recalc_sb16_filter(int c, int playback_freq)
 }
 
 static void
-sb_irq_update_pic(void *priv, int set)
+recalc_opl_filter(const int playback_freq)
+{
+    /* Cutoff frequency = playback / 2 */
+    int          n;
+    const double fC = ((double) playback_freq) / (double) (FREQ_49716 * 2);
+
+    for (n = 0; n < SB16_NCoef; n++) {
+        /* Blackman window */
+        const double w = 0.42 - (0.5 * cos((2.0 * n * M_PI) / (double) (SB16_NCoef - 1))) +
+                     (0.08 * cos((4.0 * n * M_PI) / (double) (SB16_NCoef - 1)));
+        /* Sinc filter */
+        const double h = sinc(2.0 * fC * ((double) n - ((double) (SB16_NCoef - 1) / 2.0)));
+
+        /* Create windowed-sinc filter */
+        low_fir_sb16_coef[1][n] = w * h;
+    }
+
+    low_fir_sb16_coef[1][(SB16_NCoef - 1) / 2] = 1.0;
+
+    double gain = 0.0;
+    for (n = 0; n < SB16_NCoef; n++)
+        gain += low_fir_sb16_coef[1][n];
+
+    /* Normalise filter, to produce unity gain */
+    for (n = 0; n < SB16_NCoef; n++)
+        low_fir_sb16_coef[1][n] /= gain;
+}
+
+static void
+sb_irq_update_pic(void *priv, const int set)
 {
     const sb_dsp_t *dsp = (sb_dsp_t *) priv;
     if (set)
@@ -206,6 +388,15 @@ sb_update_status(sb_dsp_t *dsp, int bit, int set)
 {
     int masked = 0;
 
+    sb_dsp_log("SBIRQ8=%d, irqnum=%d, bit=%x, set=%x.\n", dsp->sb_irq8, dsp->sb_irqnum, bit, set);
+    if (dsp->sb_irq8 || dsp->sb_irq16)
+        return;
+
+    /* NOTE: not on ES1688 or ES1868 */
+    if (IS_ESS(dsp) && (dsp->sb_subtype != SB_SUBTYPE_ESS_ES1688) && !(ESSreg(0xB1) & 0x10))
+        /* If ESS playback, and IRQ disabled, do not fire. */
+        return;
+
     switch (bit) {
         default:
         case 0:
@@ -222,6 +413,18 @@ sb_update_status(sb_dsp_t *dsp, int bit, int set)
             break;
     }
 
+    /* NOTE: not on ES1688, apparently; investigate on ES1868 */
+    if (IS_ESS(dsp) && (dsp->sb_subtype > SB_SUBTYPE_ESS_ES1688)) {
+        /* TODO: Investigate real hardware for this (the ES1887 datasheet documents this bit somewhat oddly.) */
+        if (dsp->ess_playback_mode && bit <= 1 && set && !masked) {
+            if (!(ESSreg(0xB1) & 0x40)) // if ESS playback, and IRQ disabled, do not fire
+            {
+                return;
+            }
+        }
+    }
+
+    sb_dsp_log("Masked=%02x.\n", masked);
     if (set && !masked)
         dsp->irq_update(dsp->irq_priv, 1);
     else if (!set)
@@ -241,7 +444,7 @@ sb_irqc(sb_dsp_t *dsp, int irq8)
 }
 
 static void
-sb_dsp_irq_update(void *priv, int set)
+sb_dsp_irq_update(void *priv, const int set)
 {
     sb_dsp_t *dsp = (sb_dsp_t *) priv;
 
@@ -261,15 +464,51 @@ sb_dsp_set_mpu(sb_dsp_t *dsp, mpu_t *mpu)
 {
     dsp->mpu = mpu;
 
-    if (mpu != NULL)
+    if (IS_NOT_ESS(dsp) && (mpu != NULL))
         mpu401_irq_attach(mpu, sb_dsp_irq_update, sb_dsp_irq_pending, dsp);
 }
 
+static void
+sb_stop_dma(const sb_dsp_t *dsp)
+{
+    dma_set_drq(dsp->sb_8_dmanum, 0);
+
+    if (dsp->sb_16_dmanum != 0xff) {
+        if (dsp->sb_16_dmanum == 4)
+            dma_set_drq(dsp->sb_8_dmanum, 0);
+        else
+            dma_set_drq(dsp->sb_16_dmanum, 0);
+    }
+
+    if (dsp->sb_16_8_dmanum != 0xff)
+        dma_set_drq(dsp->sb_16_8_dmanum, 0);
+}
+
+static void
+sb_finish_dma(sb_dsp_t *dsp)
+{
+    if (dsp->ess_playback_mode) {
+        ESSreg(0xB8) &= ~0x01;
+        dma_set_drq(dsp->sb_8_dmanum, 0);
+    } else
+        sb_stop_dma(dsp);
+}
+
 void
 sb_dsp_reset(sb_dsp_t *dsp)
 {
     midi_clear_buffer();
 
+    if (dsp->sb_8_enable) {
+        dsp->sb_8_enable = 0;
+        sb_finish_dma(dsp);
+    }
+
+    if (dsp->sb_16_enable) {
+        dsp->sb_16_enable = 0;
+        sb_finish_dma(dsp);
+    }
+
     timer_disable(&dsp->output_timer);
     timer_disable(&dsp->input_timer);
 
@@ -308,7 +547,7 @@ sb_doreset(sb_dsp_t *dsp)
         sb_commands[8] = 1;
         sb_commands[9] = 1;
     } else {
-        if (dsp->sb_type >= SB16)
+        if (dsp->sb_type >= SB16_DSP_404)
             sb_commands[8] = 1;
         else
             sb_commands[8] = -1;
@@ -321,20 +560,23 @@ sb_doreset(sb_dsp_t *dsp)
 
     dsp->sb_asp_regs[5] = 0x01;
     dsp->sb_asp_regs[9] = 0xf8;
+
+    /* Initialize ESS registers */
+    ESSreg(0xA5) = 0xf8;
 }
 
 void
 sb_dsp_speed_changed(sb_dsp_t *dsp)
 {
     if (dsp->sb_timeo < 256)
-        dsp->sblatcho = TIMER_USEC * (256 - dsp->sb_timeo);
+        dsp->sblatcho = (double) (TIMER_USEC * (256 - dsp->sb_timeo));
     else
-        dsp->sblatcho = (uint64_t) (TIMER_USEC * (1000000.0f / (float) (dsp->sb_timeo - 256)));
+        dsp->sblatcho = ((double) TIMER_USEC * (1000000.0 / (double) (dsp->sb_timeo - 256)));
 
     if (dsp->sb_timei < 256)
-        dsp->sblatchi = TIMER_USEC * (256 - dsp->sb_timei);
+        dsp->sblatchi = (double) (TIMER_USEC * (256 - dsp->sb_timei));
     else
-        dsp->sblatchi = (uint64_t) (TIMER_USEC * (1000000.0f / (float) (dsp->sb_timei - 256)));
+        dsp->sblatchi = ((double) TIMER_USEC * (1000000.0 / (double) (dsp->sb_timei - 256)));
 }
 
 void
@@ -344,9 +586,48 @@ sb_add_data(sb_dsp_t *dsp, uint8_t v)
     dsp->sb_read_wp &= 0xff;
 }
 
+static unsigned int
+sb_ess_get_dma_counter(const sb_dsp_t *dsp)
+{
+    unsigned int c = (unsigned int) ESSreg(0xA5) << 8U;
+    c |= (unsigned int) ESSreg(0xA4);
+
+    return c;
+}
+
+static unsigned int
+sb_ess_get_dma_len(const sb_dsp_t *dsp)
+{
+    return 0x10000U - sb_ess_get_dma_counter(dsp);
+}
+
+static void
+sb_resume_dma(const sb_dsp_t *dsp, const int is_8)
+{
+    if IS_ESS(dsp)
+    {
+        dma_set_drq(dsp->sb_8_dmanum, 1);
+        dma_set_drq(dsp->sb_16_8_dmanum, 1);
+    } else if (is_8)
+        dma_set_drq(dsp->sb_8_dmanum, 1);
+    else {
+        if (dsp->sb_16_dmanum != 0xff) {
+            if (dsp->sb_16_dmanum == 4)
+                dma_set_drq(dsp->sb_8_dmanum, 1);
+            else
+                dma_set_drq(dsp->sb_16_dmanum, 1);
+        }
+
+        if (dsp->sb_16_8_dmanum != 0xff)
+            dma_set_drq(dsp->sb_16_8_dmanum, 1);
+    }
+}
+
 void
 sb_start_dma(sb_dsp_t *dsp, int dma8, int autoinit, uint8_t format, int len)
 {
+    sb_stop_dma(dsp);
+
     dsp->sb_pausetime = -1;
 
     if (dma8) {
@@ -355,14 +636,17 @@ sb_start_dma(sb_dsp_t *dsp, int dma8, int autoinit, uint8_t format, int len)
         dsp->sb_8_autoinit                      = autoinit;
         dsp->sb_8_pause                         = 0;
         dsp->sb_8_enable                        = 1;
+        dsp->dma_ff                             = 0;
 
         if (dsp->sb_16_enable && dsp->sb_16_output)
             dsp->sb_16_enable = 0;
         dsp->sb_8_output = 1;
         if (!timer_is_enabled(&dsp->output_timer))
-            timer_set_delay_u64(&dsp->output_timer, dsp->sblatcho);
+            timer_set_delay_u64(&dsp->output_timer, (uint64_t) dsp->sblatcho);
         dsp->sbleftright = dsp->sbleftright_default;
         dsp->sbdacpos    = 0;
+
+        dma_set_drq(dsp->sb_8_dmanum, 1);
     } else {
         dsp->sb_16_length = dsp->sb_16_origlength = len;
         dsp->sb_16_format                         = format;
@@ -373,13 +657,26 @@ sb_start_dma(sb_dsp_t *dsp, int dma8, int autoinit, uint8_t format, int len)
             dsp->sb_8_enable = 0;
         dsp->sb_16_output = 1;
         if (!timer_is_enabled(&dsp->output_timer))
-            timer_set_delay_u64(&dsp->output_timer, dsp->sblatcho);
+            timer_set_delay_u64(&dsp->output_timer, (uint64_t) dsp->sblatcho);
+
+        if (dsp->sb_16_dma_supported) {
+            if (dsp->sb_16_dmanum == 4)
+                dma_set_drq(dsp->sb_8_dmanum, 1);
+            else
+                dma_set_drq(dsp->sb_16_dmanum, 1);
+        } else
+            dma_set_drq(dsp->sb_16_8_dmanum, 1);
     }
+
+    /* This will be set later for ESS playback/record modes. */
+    dsp->ess_playback_mode = 0;
 }
 
 void
 sb_start_dma_i(sb_dsp_t *dsp, int dma8, int autoinit, uint8_t format, int len)
 {
+    sb_stop_dma(dsp);
+
     if (dma8) {
         dsp->sb_8_length = dsp->sb_8_origlength = len;
         dsp->sb_8_format                        = format;
@@ -390,7 +687,9 @@ sb_start_dma_i(sb_dsp_t *dsp, int dma8, int autoinit, uint8_t format, int len)
             dsp->sb_16_enable = 0;
         dsp->sb_8_output = 0;
         if (!timer_is_enabled(&dsp->input_timer))
-            timer_set_delay_u64(&dsp->input_timer, dsp->sblatchi);
+            timer_set_delay_u64(&dsp->input_timer, (uint64_t) dsp->sblatchi);
+
+        dma_set_drq(dsp->sb_8_dmanum, 1);
     } else {
         dsp->sb_16_length = dsp->sb_16_origlength = len;
         dsp->sb_16_format                         = format;
@@ -401,24 +700,103 @@ sb_start_dma_i(sb_dsp_t *dsp, int dma8, int autoinit, uint8_t format, int len)
             dsp->sb_8_enable = 0;
         dsp->sb_16_output = 0;
         if (!timer_is_enabled(&dsp->input_timer))
-            timer_set_delay_u64(&dsp->input_timer, dsp->sblatchi);
+            timer_set_delay_u64(&dsp->input_timer, (uint64_t) dsp->sblatchi);
+
+        if (dsp->sb_16_dma_supported) {
+            if (dsp->sb_16_dmanum == 4)
+                dma_set_drq(dsp->sb_8_dmanum, 1);
+            else
+                dma_set_drq(dsp->sb_16_dmanum, 1);
+        } else
+            dma_set_drq(dsp->sb_16_8_dmanum, 1);
     }
 
     memset(dsp->record_buffer, 0, sizeof(dsp->record_buffer));
 }
 
+void
+sb_start_dma_ess(sb_dsp_t *dsp)
+{
+    uint8_t real_format  = 0;
+    dsp->ess_dma_counter = sb_ess_get_dma_counter(dsp);
+    uint32_t len         = sb_ess_get_dma_len(dsp);
+
+    if (IS_ESS(dsp)) {
+        dma_set_drq(dsp->sb_8_dmanum, 0);
+        dma_set_drq(dsp->sb_16_8_dmanum, 0);
+    }
+    real_format |= !!(ESSreg(0xB7) & 0x20) ? 0x10 : 0;
+    real_format |= !!(ESSreg(0xB7) & 0x8) ? 0x20 : 0;
+    if (!!(ESSreg(0xB8) & 8))
+        sb_start_dma_i(dsp, !(ESSreg(0xB7) & 4), (ESSreg(0xB8) >> 2) & 1, real_format, (int) len);
+    else
+        sb_start_dma(dsp, !(ESSreg(0xB7) & 4), (ESSreg(0xB8) >> 2) & 1, real_format, (int) len);
+    dsp->ess_playback_mode = 1;
+    dma_set_drq(dsp->sb_8_dmanum, 1);
+    dma_set_drq(dsp->sb_16_8_dmanum, 1);
+}
+
+void
+sb_stop_dma_ess(sb_dsp_t *dsp)
+{
+    dsp->sb_8_enable = dsp->sb_16_enable = 0;
+    dma_set_drq(dsp->sb_16_8_dmanum, 0);
+    dma_set_drq(dsp->sb_8_dmanum, 0);
+}
+
+static void
+sb_ess_update_dma_status(sb_dsp_t *dsp)
+{
+    bool dma_en = (ESSreg(0xB8) & 1) ? true : false;
+
+    /* If the DRQ is disabled, do not start. */
+    if (!(ESSreg(0xB2) & 0x40))
+        dma_en = false;
+
+    if (dma_en) {
+        if (!dsp->sb_8_enable && !dsp->sb_16_enable)
+            sb_start_dma_ess(dsp);
+    } else {
+        if (dsp->sb_8_enable || dsp->sb_16_enable)
+            sb_stop_dma_ess(dsp);
+    }
+}
+
 int
 sb_8_read_dma(void *priv)
 {
-    const sb_dsp_t *dsp = (sb_dsp_t *) priv;
+    sb_dsp_t *dsp = (sb_dsp_t *) priv;
+    int ret;
 
-    return dma_channel_read(dsp->sb_8_dmanum);
+    dsp->activity &= 0xdf;
+
+    if (dsp->sb_8_dmanum >= 4) {
+       if (dsp->dma_ff) {
+           uint32_t temp = (dsp->dma_data & 0xff00) >> 8;
+           temp |= (dsp->dma_data & 0xffff0000);
+           ret = (int) temp;
+       } else {
+           dsp->dma_data = dma_channel_read(dsp->sb_8_dmanum);
+
+           if (dsp->dma_data == DMA_NODATA)
+               return DMA_NODATA;
+
+           ret = dsp->dma_data & 0xff;
+       }
+
+       dsp->dma_ff = !dsp->dma_ff;
+    } else
+        ret = dma_channel_read(dsp->sb_8_dmanum);
+
+    return ret;
 }
 
 int
 sb_8_write_dma(void *priv, uint8_t val)
 {
-    const sb_dsp_t *dsp = (sb_dsp_t *) priv;
+    sb_dsp_t *dsp = (sb_dsp_t *) priv;
+
+    dsp->activity &= 0xdf;
 
     return dma_channel_write(dsp->sb_8_dmanum, val) == DMA_NODATA;
 }
@@ -438,32 +816,37 @@ sb_8_write_dma(void *priv, uint8_t val)
 int
 sb_16_read_dma(void *priv)
 {
-    const sb_dsp_t *dsp = (sb_dsp_t *) priv;
-    int temp, ret = 0;
-    int dma_flags, dma_ch = dsp->sb_16_dmanum;
+    sb_dsp_t *dsp = (sb_dsp_t *) priv;
 
-    if (dsp->sb_16_dma_enabled && dsp->sb_16_dma_supported && !dsp->sb_16_dma_translate)
+    int ret;
+    int dma_ch = dsp->sb_16_dmanum;
+
+    dsp->activity &= 0xdf;
+
+    if (dsp->sb_16_dma_enabled && dsp->sb_16_dma_supported && !dsp->sb_16_dma_translate && (dma_ch != 4))
         ret = dma_channel_read(dma_ch);
     else {
         if (dsp->sb_16_dma_enabled) {
             /* High DMA channel enabled, either translation is enabled or
                16-bit transfers are not supported. */
-            if (dsp->sb_16_dma_translate || !dsp->sb_16_dma_supported)
+            if (dsp->sb_16_dma_supported && !dsp->sb_16_dma_translate && (dma_ch == 4))
+                dma_ch = dsp->sb_8_dmanum;
+            else
                 dma_ch = dsp->sb_16_8_dmanum;
         } else
             /* High DMA channel disabled, always use the first 8-bit channel. */
             dma_ch = dsp->sb_8_dmanum;
-        temp = dma_channel_read(dma_ch);
-        ret = temp;
+        int temp = dma_channel_read(dma_ch);
+        ret  = temp;
         if ((temp != DMA_NODATA) && !(temp & DMA_OVER)) {
             temp = dma_channel_read(dma_ch);
             if (temp == DMA_NODATA)
                 ret = DMA_NODATA;
             else {
-                dma_flags = temp & DMA_OVER;
+                const int dma_flags = temp & DMA_OVER;
                 temp &= ~DMA_OVER;
                 ret |= (temp << 8) | dma_flags;
-           }
+            }
         }
     }
 
@@ -473,37 +856,100 @@ sb_16_read_dma(void *priv)
 int
 sb_16_write_dma(void *priv, uint16_t val)
 {
-    const sb_dsp_t *dsp = (sb_dsp_t *) priv;
-    int temp, ret = 0;
+    sb_dsp_t *dsp = (sb_dsp_t *) priv;
     int dma_ch = dsp->sb_16_dmanum;
- 
-    if (dsp->sb_16_dma_enabled && dsp->sb_16_dma_supported && !dsp->sb_16_dma_translate)
+    int ret;
+
+    dsp->activity &= 0xdf;
+
+    if (dsp->sb_16_dma_enabled && dsp->sb_16_dma_supported && !dsp->sb_16_dma_translate && (dma_ch != 4))
         ret = dma_channel_write(dma_ch, val) == DMA_NODATA;
     else {
         if (dsp->sb_16_dma_enabled) {
             /* High DMA channel enabled, either translation is enabled or
                16-bit transfers are not supported. */
-            if (dsp->sb_16_dma_translate || !dsp->sb_16_dma_supported)
+            if (dsp->sb_16_dma_supported && !dsp->sb_16_dma_translate && (dma_ch == 4))
+                dma_ch = dsp->sb_8_dmanum;
+            else
                 dma_ch = dsp->sb_16_8_dmanum;
         } else
             /* High DMA channel disabled, always use the first 8-bit channel. */
             dma_ch = dsp->sb_8_dmanum;
-        temp = dma_channel_write(dma_ch, val & 0xff);
-        ret = temp;
+        int temp = dma_channel_write(dma_ch, val & 0xff);
+        ret  = temp;
         if ((temp != DMA_NODATA) && (temp != DMA_OVER)) {
             temp = dma_channel_write(dma_ch, val >> 8);
-            ret = temp;
+            ret  = temp;
         }
     }
 
     return ret;
 }
 
+void
+sb_ess_update_irq_drq_readback_regs(sb_dsp_t *dsp, bool legacy)
+{
+    sb_t        *ess   = (sb_t *) dsp->parent;
+    ess_mixer_t *mixer = &ess->mixer_ess;
+    uint8_t      t     = 0x00;
+
+    /* IRQ control */
+    if (legacy) {
+        t |= 0x80;
+    }
+    switch (dsp->sb_irqnum) {
+        default:
+            break;
+        case 2:
+        case 9:
+            t |= 0x0;
+            break;
+        case 5:
+            t |= 0x5;
+            break;
+        case 7:
+            t |= 0xA;
+            break;
+        case 10:
+            t |= 0xF;
+            break;
+    }
+    ESSreg(0xB1) = (ESSreg(0xB1) & 0xF0) | t;
+    if ((mixer != NULL) && (ess->mpu != NULL) && (((mixer->regs[0x40] >> 5) & 0x7) == 2))
+        mpu401_setirq(ess->mpu, ess->dsp.sb_irqnum);
+
+    /* DRQ control */
+    t = 0x00;
+    if (legacy) {
+        t |= 0x80;
+    }
+    switch (dsp->sb_8_dmanum) {
+        default:
+            break;
+        case 0:
+            t |= 0x5;
+            break;
+        case 1:
+            t |= 0xA;
+            break;
+        case 3:
+            t |= 0xF;
+            break;
+    }
+    ESSreg(0xB2) = (ESSreg(0xB2) & 0xF0) | t;
+}
+
 void
 sb_dsp_setirq(sb_dsp_t *dsp, int irq)
 {
     sb_dsp_log("IRQ now: %i\n", irq);
     dsp->sb_irqnum = irq;
+
+    if (IS_ESS(dsp)) {
+        sb_ess_update_irq_drq_readback_regs(dsp, true);
+
+        ESSreg(0xB1) = (ESSreg(0xB1) & 0xEF) | 0x10;
+    }
 }
 
 void
@@ -511,6 +957,9 @@ sb_dsp_setdma8(sb_dsp_t *dsp, int dma)
 {
     sb_dsp_log("8-bit DMA now: %i\n", dma);
     dsp->sb_8_dmanum = dma;
+
+    if (IS_ESS(dsp))
+        sb_ess_update_irq_drq_readback_regs(dsp, true);
 }
 
 void
@@ -542,12 +991,237 @@ sb_dsp_setdma16_supported(sb_dsp_t *dsp, int supported)
 }
 
 void
-sb_dsp_setdma16_translate(sb_dsp_t *dsp, int translate)
+sb_dsp_setdma16_translate(sb_dsp_t *dsp, const int translate)
 {
     sb_dsp_log("16-bit to 8-bit translation now: %sabled\n", translate ? "en" : "dis");
     dsp->sb_16_dma_translate = translate;
 }
 
+static void
+sb_ess_update_reg_a2(sb_dsp_t *dsp, const uint8_t val)
+{
+    const double freq  = (7160000.0 / (256.0 - ((double) val))) * 41.0;
+    const int    temp  = (int) freq;
+    ESSreg(0xA2) = val;
+
+    if (dsp->sb_freq != temp)
+        recalc_sb16_filter(0, temp);
+    dsp->sb_freq = temp;
+}
+
+/* TODO: Investigate ESS cards' filtering on real hardware as well.
+    (DOSBox-X did it purely off some laptop's ESS chip, which isn't a good look.) */
+static void
+sb_ess_update_filter_freq(sb_dsp_t *dsp)
+{
+    const double temp = (7160000.0 / (((((double) dsp->sb_freq) / 2.0) * 0.80) * 82.0)) - 256.0;
+
+    if (dsp->sb_freq >= 22050)
+        ESSreg(0xA1) = 256 - (795500UL / dsp->sb_freq);
+    else
+        ESSreg(0xA1) = 128 - (397700UL / dsp->sb_freq);
+
+    sb_ess_update_reg_a2(dsp, (uint8_t) temp);
+}
+
+static uint8_t
+sb_ess_read_reg(const sb_dsp_t *dsp, const uint8_t reg)
+{
+    return ESSreg(reg);
+}
+
+static void
+sb_ess_update_autolen(sb_dsp_t *dsp)
+{
+    dsp->sb_8_autolen = dsp->sb_16_autolen = (int) sb_ess_get_dma_len(dsp);
+}
+
+static void
+sb_ess_write_reg(sb_dsp_t *dsp, const uint8_t reg, uint8_t data)
+{
+    uint8_t chg;
+
+    sb_dsp_log("ESS Write reg=%02x, val=%02x.\n", reg, data);
+
+    switch (reg) {
+        case 0xA1: /* Extended Mode Sample Rate Generator */
+            {
+                ESSreg(reg) = data;
+                if (data & 0x80)
+                    dsp->sb_freq = (int) (795500UL / (256ul - data));
+                else
+                    dsp->sb_freq = (int) (397700UL / (128ul - data));
+                const double temp          = 1000000.0 / dsp->sb_freq;
+                dsp->sblatchi = dsp->sblatcho = ((double) TIMER_USEC * temp);
+
+                dsp->sb_timei = dsp->sb_timeo;
+                break;
+            }
+        case 0xA2: /* Filter divider (effectively, a hardware lowpass filter under S/W control) */
+            sb_ess_update_reg_a2(dsp, data);
+            break;
+
+        case 0xA4: /* DMA Transfer Count Reload (low) */
+        case 0xA5: /* DMA Transfer Count Reload (high) */
+            ESSreg(reg) = data;
+            sb_ess_update_autolen(dsp);
+            if ((dsp->sb_16_length < 0 && !dsp->sb_16_enable) && (dsp->sb_8_length < 0 && !dsp->sb_8_enable))
+                dsp->ess_reload_len = 1;
+            break;
+
+        case 0xA8: /* Analog Control */
+            /* bits 7:5   0                  Reserved. Always write 0
+             * bit  4     1                  Reserved. Always write 1
+             * bit  3     Record monitor     1=Enable record monitor
+             *            enable
+             * bit  2     0                  Reserved. Always write 0
+             * bits 1:0   Stereo/mono select 00=Reserved
+             *                               01=Stereo
+             *                               10=Mono
+             *                               11=Reserved */
+            chg         = ESSreg(reg) ^ data;
+            ESSreg(reg) = data;
+            if (chg & 0x3) {
+                if (dsp->sb_16_enable || dsp->sb_8_enable) {
+                    uint8_t real_format = 0x00;
+                    real_format |= !!(ESSreg(0xB7) & 0x20) ? 0x10 : 0;
+                    real_format |= !!(ESSreg(0xB7) & 0x8) ? 0x20 : 0;
+
+                    if (dsp->sb_16_enable)
+                        dsp->sb_16_format = real_format;
+
+                    if (dsp->sb_8_enable)
+                        dsp->sb_8_format = real_format;
+                }
+            }
+            break;
+
+        case 0xB1:                                              /* Legacy Audio Interrupt Control */
+            ESSreg(reg) = (ESSreg(reg) & 0x0F) + (data & 0xF0); // lower 4 bits not writeable
+            switch (data & 0x0C) {
+                default:
+                    break;
+                case 0x00:
+                    dsp->sb_irqnum = 2;
+                    break;
+                case 0x04:
+                    dsp->sb_irqnum = 5;
+                    break;
+                case 0x08:
+                    dsp->sb_irqnum = 7;
+                    break;
+                case 0x0C:
+                    dsp->sb_irqnum = 10;
+                    break;
+            }
+            sb_dsp_log("Legacy Audio IRQ control=%d.\n", dsp->sb_irqnum);
+            sb_ess_update_irq_drq_readback_regs(dsp, false);
+            break;
+        case 0xB2: /* DRQ Control */
+            chg         = ESSreg(reg) ^ data;
+            ESSreg(reg) = (ESSreg(reg) & 0x0F) + (data & 0xF0); // lower 4 bits not writeable
+            switch (data & 0x0C) {
+                default:
+                    break;
+                case 0x00:
+                    dsp->sb_8_dmanum = -1;
+                    break;
+                case 0x04:
+                    dsp->sb_8_dmanum = 0;
+                    break;
+                case 0x08:
+                    dsp->sb_8_dmanum = 1;
+                    break;
+                case 0x0C:
+                    dsp->sb_8_dmanum = 3;
+                    break;
+            }
+            sb_dsp_log("Legacy Audio DRQ control=%d, chg=%02x.\n", dsp->sb_8_dmanum, chg);
+            sb_ess_update_irq_drq_readback_regs(dsp, false);
+            if (chg & 0x40)
+                sb_ess_update_dma_status(dsp);
+            break;
+        case 0xB5: /* DAC Direct Access Holding (low) */
+        case 0xB6: /* DAC Direct Access Holding (high) */
+            ESSreg(reg) = data;
+            break;
+
+        case 0xB7: /* Audio 1 Control 1 */
+            /* bit  7     Enable FIFO to/from codec
+             * bit  6     Opposite from bit 3               Must be set opposite to bit 3
+             * bit  5     FIFO signed mode                  1=Data is signed twos-complement   0=Data is unsigned
+             * bit  4     Reserved                          Always write 1
+             * bit  3     FIFO stereo mode                  1=Data is stereo
+             * bit  2     FIFO 16-bit mode                  1=Data is 16-bit
+             * bit  1     Reserved                          Always write 0
+             * bit  0     Generate load signal */
+            chg         = ESSreg(reg) ^ data;
+            ESSreg(reg) = data;
+
+            if (chg & 4)
+                sb_ess_update_autolen(dsp);
+
+            if (chg & 0x0C) {
+                if (dsp->sb_16_enable || dsp->sb_8_enable) {
+                    sb_stop_dma_ess(dsp);
+                    sb_start_dma_ess(dsp);
+                }
+            }
+            break;
+
+        case 0xB8: /* Audio 1 Control 2 */
+            /* bits 7:4   reserved
+             * bit  3     CODEC mode         1=first DMA converter in ADC mode
+             *                               0=first DMA converter in DAC mode
+             * bit  2     DMA mode           1=auto-initialize mode
+             *                               0=normal DMA mode
+             * bit  1     DMA read enable    1=first DMA is read (for ADC)
+             *                               0=first DMA is write (for DAC)
+             * bit  0     DMA xfer enable    1=DMA is allowed to proceed */
+            data &= 0xF;
+            chg         = ESSreg(reg) ^ data;
+            ESSreg(reg) = data;
+
+            if (chg & 1) {
+                if (dsp->sb_16_enable || dsp->sb_8_enable) {
+                    if (dsp->sb_16_enable)
+                        dsp->sb_16_length = (int) sb_ess_get_dma_len(dsp);
+                    if (dsp->sb_8_enable)
+                        dsp->sb_8_length = (int) sb_ess_get_dma_len(dsp);
+                } else
+                    dsp->ess_reload_len = 1;
+            }
+
+            if (chg & 0x4) {
+                if (dsp->sb_16_enable) {
+                    dsp->sb_16_autoinit = (ESSreg(0xB8) & 0x4) != 0;
+                }
+                if (dsp->sb_8_enable) {
+                    dsp->sb_8_autoinit = (ESSreg(0xB8) & 0x4) != 0;
+                }
+            }
+
+            if (chg & 0xB) {
+                if (chg & 0xA)
+                    sb_stop_dma_ess(dsp); /* changing capture/playback direction? stop DMA to reinit */
+                sb_ess_update_dma_status(dsp);
+            }
+            break;
+
+        case 0xB9: /* Audio 1 Transfer Type */
+        case 0xBA: /* Left Channel ADC Offset Adjust */
+        case 0xBB: /* Right Channel ADC Offset Adjust */
+        case 0xC3: /* Internal state register */
+        case 0xCF: /* GPO0/1 power management register */
+            ESSreg(reg) = data;
+            break;
+
+        default:
+            sb_dsp_log("UNKNOWN ESS register write reg=%02xh val=%02xh\n", reg, data);
+            break;
+    }
+}
+
 void
 sb_exec_command(sb_dsp_t *dsp)
 {
@@ -558,20 +1232,41 @@ sb_exec_command(sb_dsp_t *dsp)
 
     /* Update 8051 ram with the current DSP command.
        See https://github.com/joncampbell123/dosbox-x/issues/1044 */
-    if (dsp->sb_type >= SB16)
+    if (dsp->sb_type >= SB16_DSP_404) {
         dsp->sb_8051_ram[0x20] = dsp->sb_command;
+    }
+
+    if (IS_ESS(dsp) && dsp->sb_command >= 0xA0 && dsp->sb_command <= 0xCF) {
+        if (dsp->sb_command == 0xC6 || dsp->sb_command == 0xC7) {
+            dsp->ess_extended_mode = !!(dsp->sb_command == 0xC6);
+            return;
+        } else if (dsp->sb_command == 0xC2) {
+            sb_ess_write_reg(dsp, 0xC3, dsp->sb_data[0]);
+        } else if (dsp->sb_command == 0xC3) {
+            sb_add_data(dsp, sb_ess_read_reg(dsp, 0xC3));
+        } else if (dsp->sb_command == 0xCE) {
+            sb_add_data(dsp, sb_ess_read_reg(dsp, 0xCF));
+        } else if (dsp->sb_command == 0xCF) {
+            sb_ess_write_reg(dsp, 0xCF, dsp->sb_data[0]);
+        } else if (dsp->sb_command == 0xC0) {
+            sb_add_data(dsp, sb_ess_read_reg(dsp, dsp->sb_data[0]));
+        } else if (dsp->sb_command < 0xC0 && dsp->ess_extended_mode) {
+            sb_ess_write_reg(dsp, dsp->sb_command, dsp->sb_data[0]);
+        }
+        return;
+    }
 
     switch (dsp->sb_command) {
         case 0x01: /* ???? */
-            if (dsp->sb_type >= SB16)
+            if (dsp->sb_type >= SB16_DSP_404)
                 dsp->asp_data_len = dsp->sb_data[0] + (dsp->sb_data[1] << 8) + 1;
             break;
         case 0x03: /* ASP status */
-            if (dsp->sb_type >= SB16)
+            if (dsp->sb_type >= SB16_DSP_404)
                 sb_add_data(dsp, 0);
             break;
         case 0x04: /* ASP set mode register */
-            if (dsp->sb_type >= SB16) {
+            if (dsp->sb_type >= SB16_DSP_404) {
                 dsp->sb_asp_mode = dsp->sb_data[0];
                 if (dsp->sb_asp_mode & 4)
                     dsp->sb_asp_ram_index = 0;
@@ -579,8 +1274,9 @@ sb_exec_command(sb_dsp_t *dsp)
             } /* else DSP Status (Obsolete) */
             break;
         case 0x05: /* ASP set codec parameter */
-            if (dsp->sb_type >= SB16)
+            if (dsp->sb_type >= SB16_DSP_404) {
                 sb_dsp_log("SB16 ASP unknown codec params %02X, %02X\n", dsp->sb_data[0], dsp->sb_data[1]);
+            }
             break;
         case 0x07:
             break;
@@ -608,9 +1304,9 @@ sb_exec_command(sb_dsp_t *dsp)
                     sb_dsp_log("AZT2316A: UNKNOWN 0x08 COMMAND: %02X\n", dsp->sb_data[0]); /* 0x08 (when shutting down, driver tries to read 1 byte of response), 0x55, 0x0D, 0x08D seen */
                 break;
             }
-            if (dsp->sb_type == SBAWE64) /* AWE64 has no ASP or a socket for it */
+            if (dsp->sb_type == SBAWE64_DSP_416) /* AWE64 has no ASP or a socket for it */
                 sb_add_data(dsp, 0xFF);
-            else if (dsp->sb_type >= SB16)
+            else if (dsp->sb_type >= SB16_DSP_404)
                 sb_add_data(dsp, 0x18);
             break;
         case 0x09: /* AZTECH mode set */
@@ -626,7 +1322,7 @@ sb_exec_command(sb_dsp_t *dsp)
             }
             break;
         case 0x0E: /* ASP set register */
-            if (dsp->sb_type >= SB16) {
+            if (dsp->sb_type >= SB16_DSP_404) {
                 dsp->sb_asp_regs[dsp->sb_data[0]] = dsp->sb_data[1];
 
                 if ((dsp->sb_data[0] == 0x83) && (dsp->sb_asp_mode & 128) && (dsp->sb_asp_mode & 8)) { /* ASP memory write */
@@ -645,7 +1341,7 @@ sb_exec_command(sb_dsp_t *dsp)
             }
             break;
         case 0x0F: /* ASP get register */
-            if (dsp->sb_type >= SB16) {
+            if (dsp->sb_type >= SB16_DSP_404) {
                 if ((dsp->sb_data[0] == 0x83) && (dsp->sb_asp_mode & 128) && (dsp->sb_asp_mode & 8)) { /* ASP memory read */
                     if (dsp->sb_asp_mode & 8)
                         dsp->sb_asp_ram_index = 0;
@@ -666,7 +1362,10 @@ sb_exec_command(sb_dsp_t *dsp)
             break;
         case 0x10: /* 8-bit direct mode */
             sb_dsp_update(dsp);
-            dsp->sbdat = dsp->sbdatl = dsp->sbdatr = (dsp->sb_data[0] ^ 0x80) << 8;
+            dsp->sbdat = dsp->sbdatl = dsp->sbdatr = (int16_t) ((dsp->sb_data[0] ^ 0x80) << 8);
+            // FIXME: What does the ESS AudioDrive do to its filter/sample rate divider registers when emulating this Sound Blaster command?
+            ESSreg(0xA1) = 128 - (397700 / 22050);
+            ESSreg(0xA2) = 256 - (7160000 / (82 * ((4 * 22050) / 10)));
             break;
         case 0x14: /* 8-bit single cycle DMA output */
             sb_start_dma(dsp, 1, 0, 0, dsp->sb_data[0] + (dsp->sb_data[1] << 8));
@@ -679,18 +1378,22 @@ sb_exec_command(sb_dsp_t *dsp)
             sb_start_dma(dsp, 1, 0, ADPCM_2, dsp->sb_data[0] + (dsp->sb_data[1] << 8));
             dsp->sbdat2 = dsp->dma_readb(dsp->dma_priv);
             dsp->sb_8_length--;
-            if (dsp->sb_command == 0x17)
+            dsp->ess_dma_counter++;
+            if (dsp->sb_command == 0x17) {
                 dsp->sb_8_length--;
+                dsp->ess_dma_counter++;
+            }
             break;
         case 0x1C: /* 8-bit autoinit DMA output */
-            if (dsp->sb_type >= SB15)
+            if (dsp->sb_type >= SB_DSP_200)
                 sb_start_dma(dsp, 1, 1, 0, dsp->sb_8_autolen);
             break;
         case 0x1F: /* 2-bit ADPCM autoinit output */
-            if (dsp->sb_type >= SB15) {
+            if (dsp->sb_type >= SB_DSP_200) {
                 sb_start_dma(dsp, 1, 1, ADPCM_2, dsp->sb_data[0] + (dsp->sb_data[1] << 8));
                 dsp->sbdat2 = dsp->dma_readb(dsp->dma_priv);
                 dsp->sb_8_length--;
+                dsp->ess_dma_counter++;
             }
             break;
         case 0x20: /* 8-bit direct input */
@@ -699,10 +1402,10 @@ sb_exec_command(sb_dsp_t *dsp)
                mode does not imply such samplerate. Position is increased in sb_poll_i(). */
             if (!timer_is_enabled(&dsp->input_timer)) {
                 dsp->sb_timei = 256 - 22;
-                dsp->sblatchi = TIMER_USEC * 22;
+                dsp->sblatchi = (double) ((double) TIMER_USEC * 22.0);
                 temp          = 1000000 / 22;
                 dsp->sb_freq  = temp;
-                timer_set_delay_u64(&dsp->input_timer, dsp->sblatchi);
+                timer_set_delay_u64(&dsp->input_timer, (uint64_t) dsp->sblatchi);
             }
             break;
         case 0x24: /* 8-bit single cycle DMA input */
@@ -711,7 +1414,7 @@ sb_exec_command(sb_dsp_t *dsp)
         case 0x28: /* Direct ADC, 8-bit (Burst) */
             break;
         case 0x2C: /* 8-bit autoinit DMA input */
-            if (dsp->sb_type >= SB15)
+            if (dsp->sb_type >= SB_DSP_200)
                 sb_start_dma_i(dsp, 1, 1, 0, dsp->sb_data[0] + (dsp->sb_data[1] << 8));
             break;
         case 0x30: /* MIDI Polling mode input */
@@ -725,11 +1428,10 @@ sb_exec_command(sb_dsp_t *dsp)
             dsp->uart_irq     = 1;
             break;
         case 0x32: /* MIDI Read Timestamp Poll */
-            break;
         case 0x33: /* MIDI Read Timestamp Interrupt */
             break;
         case 0x34: /* MIDI In poll  */
-            if (dsp->sb_type < SB2)
+            if (dsp->sb_type < SB_DSP_200)
                 break;
             sb_dsp_log("MIDI poll in\n");
             dsp->midi_in_poll = 1;
@@ -737,7 +1439,7 @@ sb_exec_command(sb_dsp_t *dsp)
             dsp->uart_irq     = 0;
             break;
         case 0x35: /* MIDI In irq */
-            if (dsp->sb_type < SB2)
+            if (dsp->sb_type < SB_DSP_200)
                 break;
             sb_dsp_log("MIDI irq in\n");
             dsp->midi_in_poll = 0;
@@ -752,36 +1454,83 @@ sb_exec_command(sb_dsp_t *dsp)
             break;
         case 0x40: /* Set time constant */
             dsp->sb_timei = dsp->sb_timeo = dsp->sb_data[0];
-            dsp->sblatcho = dsp->sblatchi = TIMER_USEC * (256 - dsp->sb_data[0]);
+            dsp->sblatcho = dsp->sblatchi = (double) (TIMER_USEC * (256 - dsp->sb_data[0]));
             temp                          = 256 - dsp->sb_data[0];
             temp                          = 1000000 / temp;
-            sb_dsp_log("Sample rate - %ihz (%i)\n", temp, dsp->sblatcho);
-            if ((dsp->sb_freq != temp) && (dsp->sb_type >= SB16))
+            sb_dsp_log("Sample rate - %ihz (%f)\n", temp, dsp->sblatcho);
+            if ((dsp->sb_freq != temp) && (dsp->sb_type >= SB16_DSP_404))
                 recalc_sb16_filter(0, temp);
             dsp->sb_freq = temp;
+            if (IS_ESS(dsp)) {
+                sb_ess_update_filter_freq(dsp);
+            }
             break;
         case 0x41: /* Set output sampling rate */
         case 0x42: /* Set input sampling rate */
-            if (dsp->sb_type >= SB16) {
-                dsp->sblatcho = (uint64_t) (TIMER_USEC * (1000000.0f / (float) (dsp->sb_data[1] + (dsp->sb_data[0] << 8))));
-                sb_dsp_log("Sample rate - %ihz (%i)\n", dsp->sb_data[1] + (dsp->sb_data[0] << 8), dsp->sblatcho);
+            if (dsp->sb_type >= SB16_DSP_404) {
+                dsp->sblatcho = (double) ((double) TIMER_USEC * (1000000.0 / (double) (dsp->sb_data[1] + (dsp->sb_data[0] << 8))));
+                sb_dsp_log("Sample rate - %ihz (%f)\n", dsp->sb_data[1] + (dsp->sb_data[0] << 8), dsp->sblatcho);
                 temp          = dsp->sb_freq;
                 dsp->sb_freq  = dsp->sb_data[1] + (dsp->sb_data[0] << 8);
-                dsp->sb_timeo = 256LL + dsp->sb_freq;
+                dsp->sb_timeo = 256 + dsp->sb_freq;
                 dsp->sblatchi = dsp->sblatcho;
                 dsp->sb_timei = dsp->sb_timeo;
-                if (dsp->sb_freq != temp && dsp->sb_type >= SB16)
+                if (dsp->sb_freq != temp)
                     recalc_sb16_filter(0, dsp->sb_freq);
                 dsp->sb_8051_ram[0x13] = dsp->sb_freq & 0xff;
                 dsp->sb_8051_ram[0x14] = (dsp->sb_freq >> 8) & 0xff;
             }
             break;
         case 0x45: /* Continue Auto-Initialize DMA, 8-bit */
-            break;
         case 0x47: /* Continue Auto-Initialize DMA, 16-bit */
             break;
         case 0x48: /* Set DSP block transfer size */
-            dsp->sb_8_autolen = dsp->sb_data[0] + (dsp->sb_data[1] << 8);
+            if (dsp->sb_type >= SB_DSP_200)
+                dsp->sb_8_autolen = dsp->sb_data[0] + (dsp->sb_data[1] << 8);
+            break;
+        case 0x65: /* 4-bit ESPCM output with reference */
+        case 0x64: /* 4-bit ESPCM output */
+            if (IS_ESS(dsp)) {
+                if (dsp->espcm_mode != ESPCM_4 || (dsp->sb_8_enable && dsp->sb_8_pause)) {
+                    fifo_reset(dsp->espcm_fifo);
+                    dsp->espcm_sample_idx = 0;
+                }
+                dsp->espcm_mode = ESPCM_4;
+                sb_start_dma(dsp, 1, 0, ESPCM_4, dsp->sb_data[0] + (dsp->sb_data[1] << 8));
+            }
+            break;
+        case 0x67: /* 3-bit ESPCM output with reference */
+        case 0x66: /* 3-bit ESPCM output */
+            if (IS_ESS(dsp)) {
+                if (dsp->espcm_mode != ESPCM_3 || (dsp->sb_8_enable && dsp->sb_8_pause)) {
+                    fifo_reset(dsp->espcm_fifo);
+                    dsp->espcm_sample_idx = 0;
+                }
+                dsp->espcm_mode = ESPCM_3;
+                sb_start_dma(dsp, 1, 0, ESPCM_3, dsp->sb_data[0] + (dsp->sb_data[1] << 8));
+            }
+            break;
+        case 0x6D: /* 1-bit ESPCM output with reference */
+        case 0x6C: /* 1-bit ESPCM output */
+            if (IS_ESS(dsp)) {
+                if (dsp->espcm_mode != ESPCM_1 || (dsp->sb_8_enable && dsp->sb_8_pause)) {
+                    fifo_reset(dsp->espcm_fifo);
+                    dsp->espcm_sample_idx = 0;
+                }
+                dsp->espcm_mode = ESPCM_1;
+                sb_start_dma(dsp, 1, 0, ESPCM_1, dsp->sb_data[0] + (dsp->sb_data[1] << 8));
+            }
+            break;
+        case 0x6F: /* 4-bit ESPCM input with reference */
+        case 0x6E: /* 4-bit ESPCM input */
+            if (IS_ESS(dsp)) {
+                if (dsp->espcm_mode != ESPCM_4E || (dsp->sb_8_enable && dsp->sb_8_pause)) {
+                    fifo_reset(dsp->espcm_fifo);
+                    dsp->espcm_sample_idx = 0;
+                }
+                dsp->espcm_mode = ESPCM_4E;
+                sb_start_dma_i(dsp, 1, 0, ESPCM_4E, dsp->sb_data[0] + (dsp->sb_data[1] << 8));
+            }
             break;
         case 0x75: /* 4-bit ADPCM output with reference */
             dsp->sbref  = dsp->dma_readb(dsp->dma_priv);
@@ -791,8 +1540,11 @@ sb_exec_command(sb_dsp_t *dsp)
             sb_start_dma(dsp, 1, 0, ADPCM_4, dsp->sb_data[0] + (dsp->sb_data[1] << 8));
             dsp->sbdat2 = dsp->dma_readb(dsp->dma_priv);
             dsp->sb_8_length--;
-            if (dsp->sb_command == 0x75)
+            dsp->ess_dma_counter++;
+            if (dsp->sb_command == 0x75) {
                 dsp->sb_8_length--;
+                dsp->ess_dma_counter++;
+            }
             break;
         case 0x77: /* 2.6-bit ADPCM output with reference */
             dsp->sbref  = dsp->dma_readb(dsp->dma_priv);
@@ -802,47 +1554,52 @@ sb_exec_command(sb_dsp_t *dsp)
             sb_start_dma(dsp, 1, 0, ADPCM_26, dsp->sb_data[0] + (dsp->sb_data[1] << 8));
             dsp->sbdat2 = dsp->dma_readb(dsp->dma_priv);
             dsp->sb_8_length--;
-            if (dsp->sb_command == 0x77)
+            dsp->ess_dma_counter++;
+            if (dsp->sb_command == 0x77) {
                 dsp->sb_8_length--;
+                dsp->ess_dma_counter++;
+            }
             break;
         case 0x7D: /* 4-bit ADPCM autoinit output */
-            if (dsp->sb_type >= SB15) {
+            if (dsp->sb_type >= SB_DSP_200) {
                 sb_start_dma(dsp, 1, 1, ADPCM_4, dsp->sb_data[0] + (dsp->sb_data[1] << 8));
                 dsp->sbdat2 = dsp->dma_readb(dsp->dma_priv);
                 dsp->sb_8_length--;
+                dsp->ess_dma_counter++;
             }
             break;
         case 0x7F: /* 2.6-bit ADPCM autoinit output */
-            if (dsp->sb_type >= SB15) {
+            if (dsp->sb_type >= SB_DSP_200) {
                 sb_start_dma(dsp, 1, 1, ADPCM_26, dsp->sb_data[0] + (dsp->sb_data[1] << 8));
                 dsp->sbdat2 = dsp->dma_readb(dsp->dma_priv);
                 dsp->sb_8_length--;
+                dsp->ess_dma_counter++;
             }
             break;
         case 0x80: /* Pause DAC */
             dsp->sb_pausetime = dsp->sb_data[0] + (dsp->sb_data[1] << 8);
             if (!timer_is_enabled(&dsp->output_timer))
-                timer_set_delay_u64(&dsp->output_timer, dsp->sblatcho);
+                timer_set_delay_u64(&dsp->output_timer, (uint64_t) trunc(dsp->sblatcho));
             break;
         case 0x90: /* High speed 8-bit autoinit DMA output */
-            if (dsp->sb_type >= SB2)
+            if (dsp->sb_type >= SB_DSP_201) // TODO docs need validated
                 sb_start_dma(dsp, 1, 1, 0, dsp->sb_8_autolen);
             break;
         case 0x91: /* High speed 8-bit single cycle DMA output */
-            if (dsp->sb_type >= SB2)
+            if (dsp->sb_type >= SB_DSP_201) // TODO docs need validated
                 sb_start_dma(dsp, 1, 0, 0, dsp->sb_8_autolen);
             break;
         case 0x98: /* High speed 8-bit autoinit DMA input */
-            if (dsp->sb_type >= SB2)
+            if (dsp->sb_type >= SB_DSP_201) // TODO docs need validated
                 sb_start_dma_i(dsp, 1, 1, 0, dsp->sb_8_autolen);
             break;
         case 0x99: /* High speed 8-bit single cycle DMA input */
-            if (dsp->sb_type >= SB2)
+            if (dsp->sb_type >= SB_DSP_201) // TODO docs need validated
                 sb_start_dma_i(dsp, 1, 0, 0, dsp->sb_8_autolen);
             break;
         case 0xA0: /* Set input mode to mono */
         case 0xA8: /* Set input mode to stereo */
-            if ((dsp->sb_type < SB2) || (dsp->sb_type > SBPRO2))
+            if ((dsp->sb_type < SBPRO_DSP_300) || (dsp->sb_type > SBPRO2_DSP_302))
                 break;
             /* TODO: Implement. 3.xx-only command. */
             break;
@@ -854,7 +1611,7 @@ sb_exec_command(sb_dsp_t *dsp)
         case 0xB5:
         case 0xB6:
         case 0xB7: /* 16-bit DMA output */
-            if (dsp->sb_type >= SB16) {
+            if (dsp->sb_type >= SB16_DSP_404) {
                 sb_start_dma(dsp, 0, dsp->sb_command & 4, dsp->sb_data[0],
                              dsp->sb_data[1] + (dsp->sb_data[2] << 8));
                 dsp->sb_16_autolen = dsp->sb_data[1] + (dsp->sb_data[2] << 8);
@@ -868,7 +1625,7 @@ sb_exec_command(sb_dsp_t *dsp)
         case 0xBD:
         case 0xBE:
         case 0xBF: /* 16-bit DMA input */
-            if (dsp->sb_type >= SB16) {
+            if (dsp->sb_type >= SB16_DSP_404) {
                 sb_start_dma_i(dsp, 0, dsp->sb_command & 4, dsp->sb_data[0],
                                dsp->sb_data[1] + (dsp->sb_data[2] << 8));
                 dsp->sb_16_autolen = dsp->sb_data[1] + (dsp->sb_data[2] << 8);
@@ -882,7 +1639,7 @@ sb_exec_command(sb_dsp_t *dsp)
         case 0xC5:
         case 0xC6:
         case 0xC7: /* 8-bit DMA output */
-            if (dsp->sb_type >= SB16) {
+            if (dsp->sb_type >= SB16_DSP_404) {
                 sb_start_dma(dsp, 1, dsp->sb_command & 4, dsp->sb_data[0],
                              dsp->sb_data[1] + (dsp->sb_data[2] << 8));
                 dsp->sb_8_autolen = dsp->sb_data[1] + (dsp->sb_data[2] << 8);
@@ -896,7 +1653,7 @@ sb_exec_command(sb_dsp_t *dsp)
         case 0xCD:
         case 0xCE:
         case 0xCF: /* 8-bit DMA input */
-            if (dsp->sb_type >= SB16) {
+            if (dsp->sb_type >= SB16_DSP_404) {
                 sb_start_dma_i(dsp, 1, dsp->sb_command & 4, dsp->sb_data[0],
                                dsp->sb_data[1] + (dsp->sb_data[2] << 8));
                 dsp->sb_8_autolen = dsp->sb_data[1] + (dsp->sb_data[2] << 8);
@@ -904,46 +1661,69 @@ sb_exec_command(sb_dsp_t *dsp)
             break;
         case 0xD0: /* Pause 8-bit DMA */
             dsp->sb_8_pause = 1;
+            sb_stop_dma(dsp);
             break;
         case 0xD1: /* Speaker on */
-            if (dsp->sb_type < SB15)
-                dsp->sb_8_pause = 1;
-            else if (dsp->sb_type < SB16)
-                dsp->muted = 0;
+            if (IS_NOT_ESS(dsp)) {
+                if (dsp->sb_type < SB_DSP_200) {
+                    dsp->sb_8_pause = 1;
+                    sb_stop_dma(dsp);
+                } else if (dsp->sb_type < SB16_DSP_404)
+                    dsp->muted = 0;
+            }
             dsp->sb_speaker = 1;
             break;
         case 0xD3: /* Speaker off */
-            if (dsp->sb_type < SB15)
-                dsp->sb_8_pause = 1;
-            else if (dsp->sb_type < SB16)
-                dsp->muted = 1;
+            if (IS_NOT_ESS(dsp)) {
+                if (dsp->sb_type < SB_DSP_201) {
+                    dsp->sb_8_pause = 1;
+                    sb_stop_dma(dsp);
+                } else if (dsp->sb_type < SB16_DSP_404)
+                    dsp->muted = 1;
+            }
             dsp->sb_speaker = 0;
             break;
         case 0xD4: /* Continue 8-bit DMA */
             dsp->sb_8_pause = 0;
+            sb_resume_dma(dsp, 1);
             break;
         case 0xD5: /* Pause 16-bit DMA */
-            if (dsp->sb_type >= SB16)
+            if (dsp->sb_type >= SB16_DSP_404) {
                 dsp->sb_16_pause = 1;
+                sb_stop_dma(dsp);
+            }
             break;
         case 0xD6: /* Continue 16-bit DMA */
-            if (dsp->sb_type >= SB16)
+            if (dsp->sb_type >= SB16_DSP_404) {
                 dsp->sb_16_pause = 0;
+                sb_resume_dma(dsp, 1);
+            }
             break;
         case 0xD8: /* Get speaker status */
-            sb_add_data(dsp, dsp->sb_speaker ? 0xff : 0);
+            if (dsp->sb_type >= SB_DSP_200)
+                sb_add_data(dsp, dsp->sb_speaker ? 0xff : 0);
             break;
         case 0xD9: /* Exit 16-bit auto-init mode */
-            if (dsp->sb_type >= SB16)
+            if (dsp->sb_type >= SB16_DSP_404)
                 dsp->sb_16_autoinit = 0;
             break;
         case 0xDA: /* Exit 8-bit auto-init mode */
-            dsp->sb_8_autoinit = 0;
+            if (dsp->sb_type >= SB_DSP_200)
+                dsp->sb_8_autoinit = 0;
             break;
         case 0xE0: /* DSP identification */
             sb_add_data(dsp, ~dsp->sb_data[0]);
             break;
         case 0xE1: /* Get DSP version */
+            if (IS_ESS(dsp)) {
+                /*
+                   0x03 0x01 (Sound Blaster Pro compatibility) confirmed by both the
+                   ES1888 datasheet and the probing of the real ES688 and ES1688 cards.
+                 */
+                sb_add_data(dsp, 0x3);
+                sb_add_data(dsp, 0x1);
+                break;
+            }
             if (IS_AZTECH(dsp)) {
                 if (dsp->sb_subtype == SB_SUBTYPE_CLONE_AZT2316A_0X11) {
                     sb_add_data(dsp, 0x3);
@@ -964,42 +1744,82 @@ sb_exec_command(sb_dsp_t *dsp)
             }
             dsp->sbe2 += sbe2dat[dsp->sbe2count & 3][8];
             dsp->sbe2count++;
-            dsp->dma_writeb(dsp->dma_priv, dsp->sbe2);
+            if (dsp->dma_writeb(dsp->dma_priv, dsp->sbe2))
+                /* Undocumented behavior: If write to DMA fails, the byte is written
+                   to the CPU instead. The NT 3.1 Sound Blaster Pro driver relies on this. */
+                sb_add_data(dsp, dsp->sbe2);
             break;
         case 0xE3: /* DSP copyright */
-            if (dsp->sb_type >= SB16) {
+            if (dsp->sb_type >= SB16_DSP_404) {
                 c = 0;
                 while (sb16_copyright[c])
                     sb_add_data(dsp, sb16_copyright[c++]);
                 sb_add_data(dsp, 0);
-            }
+            } /* else if (IS_ESS(dsp))
+                sb_add_data(dsp, 0); */
+            /*
+               TODO: What ESS card returns 0x00 here? Probing of the real ES688 and ES1688 cards
+                     revealed that they in fact return nothing on this command.
+             */
             break;
         case 0xE4: /* Write test register */
             dsp->sb_test = dsp->sb_data[0];
             break;
-        case 0xE7: /* ???? */
+        case 0xE7: /* ESS detect/read config on ESS cards */
+            if (IS_ESS(dsp)) {
+                switch (dsp->sb_subtype) {
+                    default:
+                        break;
+                    case SB_SUBTYPE_ESS_ES688:
+                        sb_add_data(dsp, 0x68);
+                        /*
+                           80h:     ESSCFG fails to detect the AudioDrive;
+                           81h-83h: ES??88, Windows 3.1 driver expects MPU-401 and gives a legacy mixer error;
+                           84h:     ES688, Windows 3.1 driver expects MPU-401, returned by DOSBox-X;
+                           85h-87h: ES688, Windows 3.1 driver does not expect MPU-401:
+                                    85h: Returned by MSDOS622's real ESS688,
+                                    86h: Returned by Dizzy's real ES688.
+                           We return 86h if MPU is absent, 84h otherwise, who knows what the actual
+                           PnP ES688 returns here.
+                         */
+                        sb_add_data(dsp, 0x80 | ((dsp->mpu != NULL) ? 0x04 : 0x06));
+                        break;
+                    case SB_SUBTYPE_ESS_ES1688:
+                        sb_add_data(dsp, 0x68);
+                        /*
+                           89h:     ES1688, returned by DOSBox-X, determined via Windows driver
+                                    debugging;
+                           8Bh:     ES1688, returned by both MSDOS622's and Dizzy's real ES1688's.
+                         */
+                        sb_add_data(dsp, 0x80 | 0x0b);
+                        break;
+                }
+            }
             break;
         case 0xE8: /* Read test register */
             sb_add_data(dsp, dsp->sb_test);
             break;
         case 0xF2: /* Trigger 8-bit IRQ */
-            sb_dsp_log("Trigger IRQ\n");
-            sb_irq(dsp, 1);
+            sb_dsp_log("Trigger 8-bit IRQ\n");
+            timer_set_delay_u64(&dsp->irq_timer, (10ULL * TIMER_USEC));
             break;
         case 0xF3: /* Trigger 16-bit IRQ */
-            sb_dsp_log("Trigger IRQ\n");
-            sb_irq(dsp, 0);
+            sb_dsp_log("Trigger 16-bit IRQ\n");
+            if (IS_ESS(dsp))
+                dsp->ess_irq_generic = true;
+            else
+                timer_set_delay_u64(&dsp->irq16_timer, (10ULL * TIMER_USEC));
             break;
         case 0xF8:
-            if (dsp->sb_type < SB16)
+            if (dsp->sb_type < SB16_DSP_404)
                 sb_add_data(dsp, 0);
             break;
         case 0xF9: /* SB16 8051 RAM read */
-            if (dsp->sb_type >= SB16)
+            if (dsp->sb_type >= SB16_DSP_404)
                 sb_add_data(dsp, dsp->sb_8051_ram[dsp->sb_data[0]]);
             break;
         case 0xFA: /* SB16 8051 RAM write */
-            if (dsp->sb_type >= SB16)
+            if (dsp->sb_type >= SB16_DSP_404)
                 dsp->sb_8051_ram[dsp->sb_data[0]] = dsp->sb_data[1];
             break;
         case 0xFF: /* No, that's not how you program auto-init DMA */
@@ -1009,11 +1829,24 @@ sb_exec_command(sb_dsp_t *dsp)
              * http://the.earth.li/~tfm/oldpage/sb_dsp.html
              * http://www.synchrondata.com/pheaven/www/area19.htm
              * http://www.dcee.net/Files/Programm/Sound/
-             *  0E3h           DSP Copyright                                       SBPro2???
-             *  0F0h           Sine Generator                                      SB
-             *  0F1h           DSP Auxiliary Status (Obsolete)                     SB-Pro2
-             *  0F2h           IRQ Request, 8-bit                                  SB
+             * https://github.com/schlae/sb-firmware/blob/master/sbv202.asm
+             *  008h           Halt (Infinate Loop)                                SB2???
+             *  018h           DMA playback with auto init DMA.                    SB2???
+             *  028h           Auto-init direct ADC                                SB2???
+             *  036h           (Timestamp)                                         SB???
+             *  037h           (Timestamp)                                         SB???
+             *  050h           Stops playback of SRAM samples                      SB???
+             *  051h           Plays back samples stored in SRAM.                  SB???
+             *  058h           Load data into SRAM                                 SB???
+             *  059h           Fetches the samples and then immediately plays them back.    SB???
+             *  078h           Auto-init DMA ADPCM                                 SB2???
+             *  07Ah           2.6-bit ADPCM                                       SB???
+             *  0E3h           DSP Copyright                                       SBPro2??? (SBPRO2_DSP_302)
+             *  0F0h           Sine Generator                                      SB        (SB_DSP_105, DSP20x)
+             *  0F1h           DSP Auxiliary Status (Obsolete)                     SB-Pro2   (DSP20x, SBPRO2_DSP_302)
+             *  0F2h           IRQ Request, 8-bit                                  SB        (SB_DSP_105, DSP20x)
              *  0F3h           IRQ Request, 16-bit                                 SB16
+             *  0F4h           Perform ROM checksum                                SB        (SB_DSP_105, DSP20x)
              *  0FBh           DSP Status                                          SB16
              *  0FCh           DSP Auxiliary Status                                SB16
              *  0FDh           DSP Command Status                                  SB16
@@ -1026,35 +1859,50 @@ sb_exec_command(sb_dsp_t *dsp)
 
     /* Update 8051 ram with the last DSP command.
        See https://github.com/joncampbell123/dosbox-x/issues/1044 */
-    if (dsp->sb_type >= SB16)
+    if (dsp->sb_type >= SB16_DSP_404)
         dsp->sb_8051_ram[0x30] = dsp->sb_command;
 }
 
+static void
+sb_do_reset(sb_dsp_t *dsp, const uint8_t v)
+{
+    if (((v & 1) != 0) && (dsp->state != DSP_S_RESET)) {
+        sb_dsp_reset(dsp);
+        dsp->sb_read_rp = dsp->sb_read_wp = 0;
+        dsp->state = DSP_S_RESET;
+    } else if (((v & 1) == 0) && (dsp->state == DSP_S_RESET)) {
+        dsp->state = DSP_S_RESET_WAIT;
+        dsp->sb_read_rp = dsp->sb_read_wp = 0;
+        sb_add_data(dsp, 0xaa);
+    }
+}
+
 void
-sb_write(uint16_t a, uint8_t v, void *priv)
+sb_write(uint16_t addr, uint8_t val, void *priv)
 {
     sb_dsp_t *dsp = (sb_dsp_t *) priv;
 
     /* Sound Blasters prior to Sound Blaster 16 alias the I/O ports. */
-    if (dsp->sb_type < SB16)
-        a &= 0xfffe;
+    if ((dsp->sb_type < SB16_DSP_404) && (IS_NOT_ESS(dsp) || ((addr & 0xF) != 0xE)))
+        addr &= 0xfffe;
 
-    switch (a & 0xF) {
+    sb_dsp_log("[%04X:%08X] DSP: [W] %04X = %02X\n", CS, cpu_state.pc, addr, val);
+
+    switch (addr & 0xF) {
         case 6: /* Reset */
-            if (!dsp->uart_midi) {
-                if (!(v & 1) && (dsp->sbreset & 1)) {
-                    sb_dsp_reset(dsp);
-                    sb_add_data(dsp, 0xAA);
-                }
-                dsp->sbreset = v;
+            sb_do_reset(dsp, val);
+
+            if (!(val & 2) && (dsp->espcm_fifo_reset & 2)) {
+                fifo_reset(dsp->espcm_fifo);
             }
-            dsp->uart_midi    = 0;
-            dsp->uart_irq     = 0;
-            dsp->onebyte_midi = 0;
+            dsp->espcm_fifo_reset = val;
+            dsp->uart_midi        = 0;
+            dsp->uart_irq         = 0;
+            dsp->onebyte_midi     = 0;
             return;
         case 0xC: /* Command/data write */
             if (dsp->uart_midi || dsp->onebyte_midi) {
-                midi_raw_out_byte(v);
+                midi_raw_out_byte(val);
                 dsp->onebyte_midi = 0;
                 return;
             }
@@ -1067,12 +1915,10 @@ sb_write(uint16_t a, uint8_t v, void *priv)
                 return;
             }
             if (dsp->sb_data_stat == -1) {
-                dsp->sb_command = v;
-                if (v == 0x01)
+                dsp->sb_command = val;
+                if (val == 0x01)
                     sb_add_data(dsp, 0);
                 dsp->sb_data_stat++;
-            } else {
-                dsp->sb_data[dsp->sb_data_stat++] = v;
                 if (IS_AZTECH(dsp)) {
                     /* variable length commands */
                     if (dsp->sb_command == 0x08 && dsp->sb_data_stat == 1 && dsp->sb_data[0] == 0x08)
@@ -1080,6 +1926,24 @@ sb_write(uint16_t a, uint8_t v, void *priv)
                     else if (dsp->sb_command == 0x08 && dsp->sb_data_stat == 1 && dsp->sb_data[0] == 0x07)
                         sb_commands[dsp->sb_command] = 2;
                 }
+                if (IS_ESS(dsp) && dsp->sb_command >= 0x64 && dsp->sb_command <= 0x6F) {
+                    sb_commands[dsp->sb_command] = 2;
+                } else if (IS_ESS(dsp) && dsp->sb_command >= 0xA0 && dsp->sb_command <= 0xCF) {
+                    if (dsp->sb_command <= 0xC0
+                        || dsp->sb_command == 0xC2
+                        || dsp->sb_command == 0xCF) {
+                        sb_commands[dsp->sb_command] = 1;
+                    } else if (dsp->sb_command == 0xC3
+                               || dsp->sb_command == 0xC6
+                               || dsp->sb_command == 0xC7
+                               || dsp->sb_command == 0xCE) {
+                        sb_commands[dsp->sb_command] = 0;
+                    } else {
+                        sb_commands[dsp->sb_command] = -1;
+                    }
+                }
+            } else {
+                dsp->sb_data[dsp->sb_data_stat++] = val;
             }
             if (dsp->sb_data_stat == sb_commands[dsp->sb_command] || sb_commands[dsp->sb_command] == -1) {
                 sb_exec_command(dsp);
@@ -1098,68 +1962,128 @@ sb_write(uint16_t a, uint8_t v, void *priv)
 }
 
 uint8_t
-sb_read(uint16_t a, void *priv)
+sb_read(uint16_t addr, void *priv)
 {
     sb_dsp_t *dsp = (sb_dsp_t *) priv;
     uint8_t   ret = 0x00;
 
     /* Sound Blasters prior to Sound Blaster 16 alias the I/O ports. */
-    if (dsp->sb_type < SB16)
-        a &= 0xfffe;
+    if ((dsp->sb_type < SB16_DSP_404) && (IS_NOT_ESS(dsp) || ((addr & 0xF) != 0xE)))
+        /* Exception: ESS AudioDrive does not alias port base+0xf */
+            addr &= 0xfffe;
 
-    switch (a & 0xf) {
+    switch (addr & 0xf) {
+        case 0x6:
+            if (IS_ESS(dsp)) {
+                ret = (dsp->espcm_fifo_reset & 0x03) | 0x08 | (dsp->activity & 0xe0);
+                dsp->activity |= 0xe0;
+            } else
+                ret = 0xff;
+            break;
+        case 0x7:
+        case 0xB:
+            /*
+               These two ports are tested for random noise by OS/2 Warp 4.0, so
+               return 0xff to get through said test.
+             */
+            ret = 0xff;
+            break;
         case 0xA: /* Read data */
-            if (dsp->mpu && dsp->uart_midi) {
+            if (dsp->mpu && dsp->uart_midi)
                 ret = MPU401_ReadData(dsp->mpu);
-            } else {
-                dsp->sbreaddat = dsp->sb_read_data[dsp->sb_read_rp];
+            else {
                 if (dsp->sb_read_rp != dsp->sb_read_wp) {
+                    dsp->sbreaddat = dsp->sb_read_data[dsp->sb_read_rp];
                     dsp->sb_read_rp++;
                     dsp->sb_read_rp &= 0xff;
                 }
-                return dsp->sbreaddat;
+                ret = dsp->sbreaddat;
             }
+            /* Advance the state just in case something reads from here
+               without reading the status first. */
+            if (dsp->state == DSP_S_RESET_WAIT)
+                dsp->state = DSP_S_NORMAL;
             break;
         case 0xC: /* Write data ready */
-            if (dsp->sb_8_enable || dsp->sb_type >= SB16)
-                dsp->busy_count = (dsp->busy_count + 1) & 3;
-            else
-                dsp->busy_count = 0;
-            if (dsp->wb_full || (dsp->busy_count & 2)) {
-                dsp->wb_full = timer_is_enabled(&dsp->wb_timer);
-                if (IS_AZTECH(dsp)) {
-                    sb_dsp_log("SB Write Data Aztech read 0x80\n");
-                    return 0x80;
+            /* Advance the state just in case something reads from here
+               without reading the status first. */
+            if (dsp->state == DSP_S_RESET_WAIT)
+                dsp->state = DSP_S_NORMAL;
+            if ((dsp->state == DSP_S_NORMAL) || IS_ESS(dsp)) {
+                if (dsp->sb_8_enable || dsp->sb_type >= SB16_DSP_404)
+                    dsp->busy_count = (dsp->busy_count + 1) & 3;
+                else
+                    dsp->busy_count = 0;
+                if (IS_ESS(dsp)) {
+                    if (dsp->wb_full || (dsp->busy_count & 2))
+                        dsp->wb_full = timer_is_enabled(&dsp->wb_timer);
+
+                    const uint8_t busy_flag   = dsp->wb_full ? 0x80 : 0x00;
+                    const uint8_t data_rdy    = (dsp->sb_read_rp == dsp->sb_read_wp) ? 0x00 : 0x40;
+                    const uint8_t fifo_full   = 0; /* Unimplemented */
+                    const uint8_t fifo_empty  = 0; /* (this is for the 256-byte extended mode FIFO, */
+                    const uint8_t fifo_half   = 0; /* not the standard 64-byte FIFO) */
+                    const uint8_t irq_generic = dsp->ess_irq_generic ? 0x04 : 0x00;
+                    const uint8_t irq_fifohe  = 0; /* Unimplemented (ditto) */
+                    const uint8_t irq_dmactr  = dsp->ess_irq_dmactr ? 0x01 : 0x00;
+
+                    ret = busy_flag | data_rdy | fifo_full | fifo_empty | fifo_half | irq_generic | irq_fifohe | irq_dmactr;
+                } else if (dsp->wb_full || (dsp->busy_count & 2)) {
+                    dsp->wb_full = timer_is_enabled(&dsp->wb_timer);
+                    if (IS_AZTECH(dsp)) {
+                        sb_dsp_log("SB Write Data Aztech read 0x80\n");
+                        ret = 0x80;
+                    } else {
+                        sb_dsp_log("SB Write Data Creative read 0xff\n");
+                        if ((dsp->sb_type >= SB_DSP_201) && (dsp->sb_type < SB16_DSP_404) && IS_NOT_ESS(dsp))
+                            ret = 0xaa;
+                        else
+                            ret = 0xff;
+                    }
+                } else if (IS_AZTECH(dsp)) {
+                    sb_dsp_log("SB Write Data Aztech read 0x00\n");
+                    ret = 0x00;
                 } else {
-                    sb_dsp_log("SB Write Data Creative read 0xff\n");
-                    return 0xff;
+                    sb_dsp_log("SB Write Data Creative read 0x7f\n");
+                    if ((dsp->sb_type >= SB_DSP_201) && (dsp->sb_type < SB16_DSP_404) && IS_NOT_ESS(dsp))
+                        ret = 0x2a;
+                    else
+                        ret = 0x7f;
                 }
-            }
-            if (IS_AZTECH(dsp)) {
-                sb_dsp_log("SB Write Data Aztech read 0x00\n");
+            } else if (IS_AZTECH(dsp))
                 ret = 0x00;
-            } else {
-                sb_dsp_log("SB Write Data Creative read 0x7f\n");
-                ret = 0x7f;
-            }
+            else
+                ret = 0xff;
             break;
         case 0xE: /* Read data ready */
             dsp->irq_update(dsp->irq_priv, 0);
             dsp->sb_irq8 = dsp->sb_irq16 = 0;
-            /* Only bit 7 is defined but aztech diagnostics fail if the others are set. Keep the original behavior to not interfere with what's already working. */
+            dsp->ess_irq_generic = dsp->ess_irq_dmactr = false;
+            /*
+               Only bit 7 is defined but aztech diagnostics fail if the others are set.
+               Keep the original behavior to not interfere with what's already working.
+             */
             if (IS_AZTECH(dsp)) {
-                sb_dsp_log("SB Read Data Aztech read %02X, Read RP = %d, Read WP = %d\n", (dsp->sb_read_rp == dsp->sb_read_wp) ? 0x00 : 0x80, dsp->sb_read_rp, dsp->sb_read_wp);
+                sb_dsp_log("SB Read Data Aztech read %02X, Read RP = %d, Read WP = %d\n",
+                           (dsp->sb_read_rp == dsp->sb_read_wp) ? 0x00 : 0x80, dsp->sb_read_rp, dsp->sb_read_wp);
                 ret = (dsp->sb_read_rp == dsp->sb_read_wp) ? 0x00 : 0x80;
             } else {
                 sb_dsp_log("SB Read Data Creative read %02X\n", (dsp->sb_read_rp == dsp->sb_read_wp) ? 0x7f : 0xff);
-                ret = (dsp->sb_read_rp == dsp->sb_read_wp) ? 0x7f : 0xff;
+                if ((dsp->sb_type < SB16_DSP_404) && IS_NOT_ESS(dsp))
+                    ret = (dsp->sb_read_rp == dsp->sb_read_wp) ? 0x2a : 0xaa;
+                else
+                    ret = (dsp->sb_read_rp == dsp->sb_read_wp) ? 0x7f : 0xff;
             }
+            if (dsp->state == DSP_S_RESET_WAIT)
+                dsp->state = DSP_S_NORMAL;
             break;
         case 0xF: /* 16-bit ack */
-            dsp->sb_irq16 = 0;
-            if (!dsp->sb_irq8)
-                dsp->irq_update(dsp->irq_priv, 0);
-            sb_dsp_log("SB 16-bit ACK read 0xFF\n");
+            if (IS_NOT_ESS(dsp)) {
+                dsp->sb_irq16 = 0;
+                if (!dsp->sb_irq8)
+                    dsp->irq_update(dsp->irq_priv, 0);
+                sb_dsp_log("SB 16-bit ACK read 0xFF\n");
+            }
             ret = 0xff;
             break;
 
@@ -1167,6 +2091,8 @@ sb_read(uint16_t a, void *priv)
             break;
     }
 
+    sb_dsp_log("[%04X:%08X] DSP: [R] %04X = %02X\n", CS, cpu_state.pc, addr, ret);
+
     return ret;
 }
 
@@ -1189,6 +2115,7 @@ sb_dsp_input_msg(void *priv, uint8_t *msg, uint32_t len)
         for (uint32_t i = 0; i < len; i++)
             sb_add_data(dsp, msg[i]);
         sb_irq(dsp, 1);
+        dsp->ess_irq_generic = true;
     } else if (dsp->midi_in_poll) {
         for (uint32_t i = 0; i < len; i++)
             sb_add_data(dsp, msg[i]);
@@ -1213,7 +2140,7 @@ sb_dsp_input_sysex(void *priv, uint8_t *buffer, uint32_t len, int abort)
     for (uint32_t i = 0; i < len; i++) {
         if (dsp->sb_read_rp == dsp->sb_read_wp) {
             sb_dsp_log("Length sysex SB = %d\n", len - i);
-            return (len - i);
+            return (int) (len - i);
         }
 
         sb_add_data(dsp, buffer[i]);
@@ -1224,17 +2151,41 @@ sb_dsp_input_sysex(void *priv, uint8_t *buffer, uint32_t len, int abort)
     return 0;
 }
 
+void
+sb_dsp_irq_poll(void *priv)
+{
+    sb_dsp_t *dsp = (sb_dsp_t *) priv;
+
+    sb_irq(dsp, 1);
+    dsp->ess_irq_generic = true;
+}
+
+void
+sb_dsp_irq16_poll(void *priv)
+{
+    sb_dsp_t *dsp = (sb_dsp_t *) priv;
+
+    sb_irq(dsp, 0);
+    dsp->ess_irq_generic = true;
+}
+
 void
 sb_dsp_init(sb_dsp_t *dsp, int type, int subtype, void *parent)
 {
     dsp->sb_type    = type;
     dsp->sb_subtype = subtype;
     dsp->parent     = parent;
+    dsp->activity   = 0xe0;
 
     /* Default values. Use sb_dsp_setxxx() methods to change. */
     dsp->sb_irqnum    = 7;
     dsp->sb_8_dmanum  = 1;
-    dsp->sb_16_dmanum = 5;
+    if (type >= SB16_DSP_404)
+        dsp->sb_16_dmanum = 5;
+    else
+        dsp->sb_16_dmanum = 0xff;
+    if ((type >= SB16_DSP_404) || IS_ESS(dsp))
+        dsp->sb_16_8_dmanum = 0x1;
     dsp->mpu          = NULL;
 
     dsp->sbleftright_default = 0;
@@ -1252,12 +2203,38 @@ sb_dsp_init(sb_dsp_t *dsp, int type, int subtype, void *parent)
     timer_add(&dsp->output_timer, pollsb, dsp, 0);
     timer_add(&dsp->input_timer, sb_poll_i, dsp, 0);
     timer_add(&dsp->wb_timer, NULL, dsp, 0);
+    timer_add(&dsp->irq_timer, sb_dsp_irq_poll, dsp, 0);
+    timer_add(&dsp->irq16_timer, sb_dsp_irq16_poll, dsp, 0);
 
-    /* Initialise SB16 filter to same cutoff as 8-bit SBs (3.2 kHz). This will be recalculated when
-       a set frequency command is sent. */
-    recalc_sb16_filter(0, 3200 * 2);
-    recalc_sb16_filter(1, FREQ_44100);
-    recalc_sb16_filter(2, 18939);
+    if (IS_ESS(dsp))
+        /* Initialize ESS filter to 8 kHz. This will be recalculated when a set frequency command is
+           sent. */
+        recalc_sb16_filter(0, 8000 * 2);
+    else {
+        timer_add(&dsp->irq16_timer, sb_dsp_irq16_poll, dsp, 0);
+        /* Initialise SB16 filter to same cutoff as 8-bit SBs (3.2 kHz). This will be recalculated when
+           a set frequency command is sent. */
+        recalc_sb16_filter(0, 3200 * 2);
+    }
+    if (IS_ESS(dsp) || (dsp->sb_type >= SBPRO2_DSP_302)) {
+        /* OPL3 or dual OPL2 is stereo. */
+        if (dsp->sb_has_real_opl)
+            recalc_opl_filter(FREQ_49716 * 2);
+        else
+            recalc_sb16_filter(1, FREQ_48000 * 2);
+    } else {
+        /* OPL2 is mono. */
+        if (dsp->sb_has_real_opl)
+            recalc_opl_filter(FREQ_49716);
+        else
+            recalc_sb16_filter(1, FREQ_48000);
+    }
+    /* CD Audio is stereo. */
+    recalc_sb16_filter(2, FREQ_44100 * 2);
+    /* PC speaker is mono. */
+    recalc_sb16_filter(3, 18939);
+    /* E-MU 8000 is stereo. */
+    recalc_sb16_filter(4, FREQ_44100 * 2);
 
     /* Initialize SB16 8051 RAM and ASP internal RAM */
     memset(dsp->sb_8051_ram, 0x00, sizeof(dsp->sb_8051_ram));
@@ -1266,6 +2243,9 @@ sb_dsp_init(sb_dsp_t *dsp, int type, int subtype, void *parent)
     dsp->sb_8051_ram[0x37] = 0x38;
 
     memset(dsp->sb_asp_ram, 0xff, sizeof(dsp->sb_asp_ram));
+
+    dsp->espcm_fifo = fifo64_init();
+    fifo_set_trigger_len(dsp->espcm_fifo, 1);
 }
 
 void
@@ -1283,6 +2263,12 @@ sb_dsp_setaddr(sb_dsp_t *dsp, uint16_t addr)
     }
 }
 
+void
+sb_dsp_set_real_opl(sb_dsp_t *dsp, uint8_t has_real_opl)
+{
+    dsp->sb_has_real_opl = has_real_opl;
+}
+
 void
 sb_dsp_set_stereo(sb_dsp_t *dsp, int stereo)
 {
@@ -1311,6 +2297,22 @@ sb_dsp_dma_attach(sb_dsp_t *dsp,
     dsp->dma_priv   = priv;
 }
 
+void
+sb_espcm_fifoctl_run(sb_dsp_t *dsp)
+{
+    if (fifo_get_empty(dsp->espcm_fifo) && !dsp->sb_8_pause) {
+        while (!fifo_get_full(dsp->espcm_fifo)) {
+            int32_t val;
+            val = dsp->dma_readb(dsp->dma_priv);
+            dsp->ess_dma_counter++;
+            fifo_write(val & 0xff, dsp->espcm_fifo);
+            if (val & DMA_OVER) {
+                break;
+            }
+        }
+    }
+}
+
 void
 pollsb(void *priv)
 {
@@ -1319,140 +2321,241 @@ pollsb(void *priv)
     int       ref;
     int       data[2];
 
-    timer_advance_u64(&dsp->output_timer, dsp->sblatcho);
-    if (dsp->sb_8_enable && !dsp->sb_8_pause && dsp->sb_pausetime < 0 && dsp->sb_8_output) {
+    timer_advance_u64(&dsp->output_timer, (uint64_t) dsp->sblatcho);
+    if (dsp->sb_8_enable && dsp->sb_pausetime < 0 && dsp->sb_8_output) {
         sb_dsp_update(dsp);
 
+        sb_dsp_log("8-bit format=%02x, pause=%x, length=%d.\n", dsp->sb_8_format, dsp->sb_8_pause, dsp->sb_8_length);
         switch (dsp->sb_8_format) {
             case 0x00: /* Mono unsigned */
-                data[0] = dsp->dma_readb(dsp->dma_priv);
-                /* Needed to prevent clicking in Worms, which programs the DSP to
-                   auto-init DMA but programs the DMA controller to single cycle */
-                if (data[0] == DMA_NODATA)
-                    break;
-                dsp->sbdat = (data[0] ^ 0x80) << 8;
-                if (dsp->stereo) {
-                    sb_dsp_log("pollsb: Mono unsigned, dsp->stereo, %s channel, %04X\n",
-                               dsp->sbleftright ? "left" : "right", dsp->sbdat);
-                    if (dsp->sbleftright)
-                        dsp->sbdatl = dsp->sbdat;
-                    else
-                        dsp->sbdatr = dsp->sbdat;
-                    dsp->sbleftright = !dsp->sbleftright;
-                } else
-                    dsp->sbdatl = dsp->sbdatr = dsp->sbdat;
-                dsp->sb_8_length--;
+                if (!dsp->sb_8_pause) {
+                    data[0] = dsp->dma_readb(dsp->dma_priv);
+                    /* Needed to prevent clicking in Worms, which programs the DSP to
+                    auto-init DMA but programs the DMA controller to single cycle */
+                    if (data[0] == DMA_NODATA)
+                        break;
+                    dsp->sbdat = (int16_t) ((data[0] ^ 0x80) << 8);
+                    if (dsp->stereo) {
+                        sb_dsp_log("pollsb: Mono unsigned, dsp->stereo, %s channel, %04X\n",
+                                   dsp->sbleftright ? "left" : "right", dsp->sbdat);
+                        if (dsp->sbleftright)
+                            dsp->sbdatl = dsp->sbdat;
+                        else
+                            dsp->sbdatr = dsp->sbdat;
+                        dsp->sbleftright = !dsp->sbleftright;
+                    } else
+                        dsp->sbdatl = dsp->sbdatr = dsp->sbdat;
+                    dsp->sb_8_length--;
+                    dsp->ess_dma_counter++;
+                }
                 break;
             case 0x10: /* Mono signed */
-                data[0] = dsp->dma_readb(dsp->dma_priv);
-                if (data[0] == DMA_NODATA)
-                    break;
-                dsp->sbdat = data[0] << 8;
-                if (dsp->stereo) {
-                    sb_dsp_log("pollsb: Mono signed, dsp->stereo, %s channel, %04X\n",
-                               dsp->sbleftright ? "left" : "right", data[0], dsp->sbdat);
-                    if (dsp->sbleftright)
-                        dsp->sbdatl = dsp->sbdat;
-                    else
-                        dsp->sbdatr = dsp->sbdat;
-                    dsp->sbleftright = !dsp->sbleftright;
-                } else
-                    dsp->sbdatl = dsp->sbdatr = dsp->sbdat;
-                dsp->sb_8_length--;
+                if (!dsp->sb_8_pause) {
+                    data[0] = dsp->dma_readb(dsp->dma_priv);
+                    if (data[0] == DMA_NODATA)
+                        break;
+                    dsp->sbdat = (int16_t) (data[0] << 8);
+                    if (dsp->stereo) {
+                        sb_dsp_log("pollsb: Mono signed, dsp->stereo, %s channel, %04X\n",
+                                   dsp->sbleftright ? "left" : "right", data[0], dsp->sbdat);
+                        if (dsp->sbleftright)
+                            dsp->sbdatl = dsp->sbdat;
+                        else
+                            dsp->sbdatr = dsp->sbdat;
+                        dsp->sbleftright = !dsp->sbleftright;
+                    } else
+                        dsp->sbdatl = dsp->sbdatr = dsp->sbdat;
+                    dsp->sb_8_length--;
+                    dsp->ess_dma_counter++;
+                }
                 break;
             case 0x20: /* Stereo unsigned */
-                data[0] = dsp->dma_readb(dsp->dma_priv);
-                data[1] = dsp->dma_readb(dsp->dma_priv);
-                if ((data[0] == DMA_NODATA) || (data[1] == DMA_NODATA))
-                    break;
-                dsp->sbdatl = (data[0] ^ 0x80) << 8;
-                dsp->sbdatr = (data[1] ^ 0x80) << 8;
-                dsp->sb_8_length -= 2;
+                if (!dsp->sb_8_pause) {
+                    data[0] = dsp->dma_readb(dsp->dma_priv);
+                    data[1] = dsp->dma_readb(dsp->dma_priv);
+                    if ((data[0] == DMA_NODATA) || (data[1] == DMA_NODATA))
+                        break;
+                    dsp->sbdatl = (int16_t) ((data[0] ^ 0x80) << 8);
+                    dsp->sbdatr = (int16_t) ((data[1] ^ 0x80) << 8);
+                    dsp->sb_8_length -= 2;
+                    dsp->ess_dma_counter += 2;
+                }
                 break;
             case 0x30: /* Stereo signed */
-                data[0] = dsp->dma_readb(dsp->dma_priv);
-                data[1] = dsp->dma_readb(dsp->dma_priv);
-                if ((data[0] == DMA_NODATA) || (data[1] == DMA_NODATA))
-                    break;
-                dsp->sbdatl = data[0] << 8;
-                dsp->sbdatr = data[1] << 8;
-                dsp->sb_8_length -= 2;
+                if (!dsp->sb_8_pause) {
+                    data[0] = dsp->dma_readb(dsp->dma_priv);
+                    data[1] = dsp->dma_readb(dsp->dma_priv);
+                    if ((data[0] == DMA_NODATA) || (data[1] == DMA_NODATA))
+                        break;
+                    dsp->sbdatl = (int16_t) (data[0] << 8);
+                    dsp->sbdatr = (int16_t) (data[1] << 8);
+                    dsp->sb_8_length -= 2;
+                    dsp->ess_dma_counter += 2;
+                }
                 break;
 
             case ADPCM_4:
-                if (dsp->sbdacpos)
-                    tempi = (dsp->sbdat2 & 0xF) + dsp->sbstep;
-                else
-                    tempi = (dsp->sbdat2 >> 4) + dsp->sbstep;
-                if (tempi < 0)
-                    tempi = 0;
-                if (tempi > 63)
-                    tempi = 63;
-
-                ref = dsp->sbref + scaleMap4[tempi];
-                if (ref > 0xff)
-                    dsp->sbref = 0xff;
-                else if (ref < 0x00)
-                    dsp->sbref = 0x00;
-                else
-                    dsp->sbref = ref;
-
-                dsp->sbstep = (dsp->sbstep + adjustMap4[tempi]) & 0xff;
-                dsp->sbdat  = (dsp->sbref ^ 0x80) << 8;
-
-                dsp->sbdacpos++;
-
-                if (dsp->sbdacpos >= 2) {
-                    dsp->sbdacpos = 0;
-                    dsp->sbdat2   = dsp->dma_readb(dsp->dma_priv);
-                    dsp->sb_8_length--;
-                }
-
-                if (dsp->stereo) {
-                    sb_dsp_log("pollsb: ADPCM 4, dsp->stereo, %s channel, %04X\n",
-                               dsp->sbleftright ? "left" : "right", dsp->sbdat);
-                    if (dsp->sbleftright)
-                        dsp->sbdatl = dsp->sbdat;
+                if (!dsp->sb_8_pause) {
+                    if (dsp->sbdacpos)
+                        tempi = (dsp->sbdat2 & 0xF) + dsp->sbstep;
                     else
-                        dsp->sbdatr = dsp->sbdat;
-                    dsp->sbleftright = !dsp->sbleftright;
-                } else
-                    dsp->sbdatl = dsp->sbdatr = dsp->sbdat;
+                        tempi = (dsp->sbdat2 >> 4) + dsp->sbstep;
+                    if (tempi < 0)
+                        tempi = 0;
+                    if (tempi > 63)
+                        tempi = 63;
+
+                    ref = dsp->sbref + scaleMap4[tempi];
+                    if (ref > 0xff)
+                        dsp->sbref = 0xff;
+                    else if (ref < 0x00)
+                        dsp->sbref = 0x00;
+                    else
+                        dsp->sbref = ref;
+
+                    dsp->sbstep = (int8_t) ((dsp->sbstep + adjustMap4[tempi]) & 0xff);
+                    dsp->sbdat  = (int16_t) ((dsp->sbref ^ 0x80) << 8);
+
+                    dsp->sbdacpos++;
+
+                    if (dsp->sbdacpos >= 2) {
+                        dsp->sbdacpos = 0;
+                        dsp->sbdat2   = dsp->dma_readb(dsp->dma_priv);
+                        dsp->sb_8_length--;
+                        dsp->ess_dma_counter++;
+                    }
+
+                    if (dsp->stereo) {
+                        sb_dsp_log("pollsb: ADPCM 4, dsp->stereo, %s channel, %04X\n",
+                                   dsp->sbleftright ? "left" : "right", dsp->sbdat);
+                        if (dsp->sbleftright)
+                            dsp->sbdatl = dsp->sbdat;
+                        else
+                            dsp->sbdatr = dsp->sbdat;
+                        dsp->sbleftright = !dsp->sbleftright;
+                    } else
+                        dsp->sbdatl = dsp->sbdatr = dsp->sbdat;
+                }
                 break;
 
             case ADPCM_26:
-                if (!dsp->sbdacpos)
-                    tempi = (dsp->sbdat2 >> 5) + dsp->sbstep;
-                else if (dsp->sbdacpos == 1)
-                    tempi = ((dsp->sbdat2 >> 2) & 7) + dsp->sbstep;
-                else
-                    tempi = ((dsp->sbdat2 << 1) & 7) + dsp->sbstep;
+                if (!dsp->sb_8_pause) {
+                    if (!dsp->sbdacpos)
+                        tempi = (dsp->sbdat2 >> 5) + dsp->sbstep;
+                    else if (dsp->sbdacpos == 1)
+                        tempi = ((dsp->sbdat2 >> 2) & 7) + dsp->sbstep;
+                    else
+                        tempi = ((dsp->sbdat2 << 1) & 7) + dsp->sbstep;
 
-                if (tempi < 0)
-                    tempi = 0;
-                if (tempi > 39)
-                    tempi = 39;
+                    if (tempi < 0)
+                        tempi = 0;
+                    if (tempi > 39)
+                        tempi = 39;
 
-                ref = dsp->sbref + scaleMap26[tempi];
-                if (ref > 0xff)
-                    dsp->sbref = 0xff;
-                else if (ref < 0x00)
-                    dsp->sbref = 0x00;
-                else
-                    dsp->sbref = ref;
-                dsp->sbstep = (dsp->sbstep + adjustMap26[tempi]) & 0xff;
+                    ref = dsp->sbref + scaleMap26[tempi];
+                    if (ref > 0xff)
+                        dsp->sbref = 0xff;
+                    else if (ref < 0x00)
+                        dsp->sbref = 0x00;
+                    else
+                        dsp->sbref = ref;
+                    dsp->sbstep = (int8_t) ((dsp->sbstep + adjustMap26[tempi]) & 0xff);
 
-                dsp->sbdat = (dsp->sbref ^ 0x80) << 8;
+                    dsp->sbdat = (int16_t) ((dsp->sbref ^ 0x80) << 8);
 
-                dsp->sbdacpos++;
-                if (dsp->sbdacpos >= 3) {
-                    dsp->sbdacpos = 0;
-                    dsp->sbdat2   = dsp->dma_readb(dsp->dma_priv);
-                    dsp->sb_8_length--;
+                    dsp->sbdacpos++;
+                    if (dsp->sbdacpos >= 3) {
+                        dsp->sbdacpos = 0;
+                        dsp->sbdat2   = dsp->dma_readb(dsp->dma_priv);
+                        dsp->sb_8_length--;
+                        dsp->ess_dma_counter++;
+                    }
+
+                    if (dsp->stereo) {
+                        sb_dsp_log("pollsb: ADPCM 26, dsp->stereo, %s channel, %04X\n",
+                                   dsp->sbleftright ? "left" : "right", dsp->sbdat);
+                        if (dsp->sbleftright)
+                            dsp->sbdatl = dsp->sbdat;
+                        else
+                            dsp->sbdatr = dsp->sbdat;
+                        dsp->sbleftright = !dsp->sbleftright;
+                    } else
+                        dsp->sbdatl = dsp->sbdatr = dsp->sbdat;
                 }
+                break;
 
+            case ADPCM_2:
+                if (!dsp->sb_8_pause) {
+                    tempi = ((dsp->sbdat2 >> ((3 - dsp->sbdacpos) * 2)) & 3) + dsp->sbstep;
+                    if (tempi < 0)
+                        tempi = 0;
+                    if (tempi > 23)
+                        tempi = 23;
+
+                    ref = dsp->sbref + scaleMap2[tempi];
+                    if (ref > 0xff)
+                        dsp->sbref = 0xff;
+                    else if (ref < 0x00)
+                        dsp->sbref = 0x00;
+                    else
+                        dsp->sbref = ref;
+                    dsp->sbstep = (int8_t) ((dsp->sbstep + adjustMap2[tempi]) & 0xff);
+
+                    dsp->sbdat = (int16_t) ((dsp->sbref ^ 0x80) << 8);
+
+                    dsp->sbdacpos++;
+                    if (dsp->sbdacpos >= 4) {
+                        dsp->sbdacpos = 0;
+                        dsp->sbdat2   = dsp->dma_readb(dsp->dma_priv);
+                        dsp->sb_8_length--;
+                        dsp->ess_dma_counter++;
+                    }
+
+                    if (dsp->stereo) {
+                        sb_dsp_log("pollsb: ADPCM 2, dsp->stereo, %s channel, %04X\n",
+                                   dsp->sbleftright ? "left" : "right", dsp->sbdat);
+                        if (dsp->sbleftright)
+                            dsp->sbdatl = dsp->sbdat;
+                        else
+                            dsp->sbdatr = dsp->sbdat;
+                        dsp->sbleftright = !dsp->sbleftright;
+                    } else
+                        dsp->sbdatl = dsp->sbdatr = dsp->sbdat;
+                }
+                break;
+
+            case ESPCM_4:
+                if (dsp->espcm_sample_idx >= 19)
+                    dsp->espcm_sample_idx = 0;
+                if (dsp->espcm_sample_idx == 0) {
+                    sb_espcm_fifoctl_run(dsp);
+                    if (fifo_get_empty(dsp->espcm_fifo))
+                        break;
+                    dsp->espcm_byte_buffer[0] = fifo_read(dsp->espcm_fifo);
+
+                    dsp->espcm_range = dsp->espcm_byte_buffer[0] & 0x0F;
+                    tempi            = dsp->espcm_byte_buffer[0] >> 4;
+                } else if (dsp->espcm_sample_idx & 1) {
+                    sb_espcm_fifoctl_run(dsp);
+                    if (fifo_get_empty(dsp->espcm_fifo))
+                        break;
+                    dsp->espcm_byte_buffer[0] = fifo_read(dsp->espcm_fifo);
+                    dsp->sb_8_length--;
+
+                    tempi = dsp->espcm_byte_buffer[0] & 0x0F;
+                } else
+                    tempi = dsp->espcm_byte_buffer[0] >> 4;
+
+                if (dsp->espcm_sample_idx == 18)
+                    dsp->sb_8_length--;
+
+                dsp->espcm_sample_idx++;
+
+                tempi |= (dsp->espcm_range << 4);
+                data[0]    = (int) espcm_range_map[tempi];
+                dsp->sbdat = (int16_t) (data[0] << 8);
                 if (dsp->stereo) {
-                    sb_dsp_log("pollsb: ADPCM 26, dsp->stereo, %s channel, %04X\n",
+                    sb_dsp_log("pollsb: ESPCM 4, dsp->stereo, %s channel, %04X\n",
                                dsp->sbleftright ? "left" : "right", dsp->sbdat);
                     if (dsp->sbleftright)
                         dsp->sbdatl = dsp->sbdat;
@@ -1463,32 +2566,135 @@ pollsb(void *priv)
                     dsp->sbdatl = dsp->sbdatr = dsp->sbdat;
                 break;
 
-            case ADPCM_2:
-                tempi = ((dsp->sbdat2 >> ((3 - dsp->sbdacpos) * 2)) & 3) + dsp->sbstep;
-                if (tempi < 0)
-                    tempi = 0;
-                if (tempi > 23)
-                    tempi = 23;
+            case ESPCM_3:
+                if (dsp->espcm_sample_idx >= 19)
+                    dsp->espcm_sample_idx = 0;
+                if (dsp->espcm_sample_idx == 0) {
+                    sb_espcm_fifoctl_run(dsp);
+                    if (fifo_get_empty(dsp->espcm_fifo))
+                        break;
+                    dsp->espcm_byte_buffer[0] = fifo_read(dsp->espcm_fifo);
 
-                ref = dsp->sbref + scaleMap2[tempi];
-                if (ref > 0xff)
-                    dsp->sbref = 0xff;
-                else if (ref < 0x00)
-                    dsp->sbref = 0x00;
-                else
-                    dsp->sbref = ref;
-                dsp->sbstep = (dsp->sbstep + adjustMap2[tempi]) & 0xff;
+                    dsp->espcm_range      = dsp->espcm_byte_buffer[0] & 0x0F;
+                    tempi                 = dsp->espcm_byte_buffer[0] >> 4;
+                    dsp->espcm_last_value = tempi;
+                } else if (dsp->espcm_sample_idx == 1) {
+                    for (tempi = 0; tempi < 4; tempi++) {
+                        sb_espcm_fifoctl_run(dsp);
+                        if (fifo_get_empty(dsp->espcm_fifo))
+                            break;
+                        dsp->espcm_byte_buffer[tempi] = fifo_read(dsp->espcm_fifo);
+                        dsp->sb_8_length--;
+                    }
+                    if (tempi < 4)
+                        break;
 
-                dsp->sbdat = (dsp->sbref ^ 0x80) << 8;
+                    dsp->espcm_table_index = dsp->espcm_byte_buffer[0] & 0x03;
 
-                dsp->sbdacpos++;
-                if (dsp->sbdacpos >= 4) {
-                    dsp->sbdacpos = 0;
-                    dsp->sbdat2   = dsp->dma_readb(dsp->dma_priv);
+                    dsp->espcm_code_buffer[0] = (dsp->espcm_byte_buffer[0] >> 2) & 0x07;
+                    dsp->espcm_code_buffer[1] = (dsp->espcm_byte_buffer[0] >> 5) & 0x07;
+                    dsp->espcm_code_buffer[2] = (dsp->espcm_byte_buffer[1]) & 0x07;
+                    dsp->espcm_code_buffer[3] = (dsp->espcm_byte_buffer[1] >> 3) & 0x07;
+                    dsp->espcm_code_buffer[4] = ((dsp->espcm_byte_buffer[1] >> 6) & 0x03) | ((dsp->espcm_byte_buffer[2] & 0x01) << 2);
+                    dsp->espcm_code_buffer[5] = (dsp->espcm_byte_buffer[2] >> 1) & 0x07;
+                    dsp->espcm_code_buffer[6] = (dsp->espcm_byte_buffer[2] >> 4) & 0x07;
+                    dsp->espcm_code_buffer[7] = ((dsp->espcm_byte_buffer[2] >> 7) & 0x01) | ((dsp->espcm_byte_buffer[3] & 0x03) << 1);
+                    dsp->espcm_code_buffer[8] = (dsp->espcm_byte_buffer[3] >> 2) & 0x07;
+                    dsp->espcm_code_buffer[9] = (dsp->espcm_byte_buffer[3] >> 5) & 0x07;
+
+                    tempi                 = (dsp->espcm_table_index << 8) | (dsp->espcm_last_value << 3) | dsp->espcm_code_buffer[0];
+                    tempi                 = espcm3_dpcm_tables[tempi];
+                    dsp->espcm_last_value = tempi;
+                } else if (dsp->espcm_sample_idx == 11) {
+                    for (tempi = 1; tempi < 4; tempi++) {
+                        sb_espcm_fifoctl_run(dsp);
+                        if (fifo_get_empty(dsp->espcm_fifo))
+                            break;
+                        dsp->espcm_byte_buffer[tempi] = fifo_read(dsp->espcm_fifo);
+                        dsp->sb_8_length--;
+                    }
+                    if (tempi < 4)
+                        break;
+
+                    dsp->espcm_code_buffer[0] = (dsp->espcm_byte_buffer[1]) & 0x07;
+                    dsp->espcm_code_buffer[1] = (dsp->espcm_byte_buffer[1] >> 3) & 0x07;
+                    dsp->espcm_code_buffer[2] = ((dsp->espcm_byte_buffer[1] >> 6) & 0x03) | ((dsp->espcm_byte_buffer[2] & 0x01) << 2);
+                    dsp->espcm_code_buffer[3] = (dsp->espcm_byte_buffer[2] >> 1) & 0x07;
+                    dsp->espcm_code_buffer[4] = (dsp->espcm_byte_buffer[2] >> 4) & 0x07;
+                    dsp->espcm_code_buffer[5] = ((dsp->espcm_byte_buffer[2] >> 7) & 0x01) | ((dsp->espcm_byte_buffer[3] & 0x03) << 1);
+                    dsp->espcm_code_buffer[6] = (dsp->espcm_byte_buffer[3] >> 2) & 0x07;
+                    dsp->espcm_code_buffer[7] = (dsp->espcm_byte_buffer[3] >> 5) & 0x07;
+
+                    tempi                 = (dsp->espcm_table_index << 8) | (dsp->espcm_last_value << 3) | dsp->espcm_code_buffer[0];
+                    tempi                 = espcm3_dpcm_tables[tempi];
+                    dsp->espcm_last_value = tempi;
+                } else {
+                    tempi                 = (dsp->espcm_table_index << 8) | (dsp->espcm_last_value << 3) | dsp->espcm_code_buffer[(dsp->espcm_sample_idx - 1) % 10];
+                    tempi                 = espcm3_dpcm_tables[tempi];
+                    dsp->espcm_last_value = tempi;
                 }
 
+                if (dsp->espcm_sample_idx == 18) {
+                    dsp->sb_8_length--;
+                }
+
+                dsp->espcm_sample_idx++;
+
+                tempi |= (dsp->espcm_range << 4);
+                data[0]    = (int) (espcm_range_map[tempi]);
+                dsp->sbdat = (int16_t) (data[0] << 8);
                 if (dsp->stereo) {
-                    sb_dsp_log("pollsb: ADPCM 2, dsp->stereo, %s channel, %04X\n",
+                    sb_dsp_log("pollsb: ESPCM 3, dsp->stereo, %s channel, %04X\n",
+                               dsp->sbleftright ? "left" : "right", dsp->sbdat);
+                    if (dsp->sbleftright)
+                        dsp->sbdatl = dsp->sbdat;
+                    else
+                        dsp->sbdatr = dsp->sbdat;
+                    dsp->sbleftright = !dsp->sbleftright;
+                } else
+                    dsp->sbdatl = dsp->sbdatr = dsp->sbdat;
+                break;
+
+            case ESPCM_1:
+                if (dsp->espcm_sample_idx >= 19)
+                    dsp->espcm_sample_idx = 0;
+                if (dsp->espcm_sample_idx == 0) {
+                    sb_espcm_fifoctl_run(dsp);
+
+                    if (fifo_get_empty(dsp->espcm_fifo))
+                        break;
+
+                    dsp->espcm_byte_buffer[0] = fifo_read(dsp->espcm_fifo);
+
+                    dsp->espcm_range = dsp->espcm_byte_buffer[0] & 0x0F;
+                    dsp->espcm_byte_buffer[0] >>= 5;
+                    tempi = dsp->espcm_byte_buffer[0] & 1 ? 0xC : 0x4;
+                    dsp->espcm_byte_buffer[0] >>= 1;
+                } else if ((dsp->espcm_sample_idx == 3) | (dsp->espcm_sample_idx == 11)) {
+                    sb_espcm_fifoctl_run(dsp);
+                    if (fifo_get_empty(dsp->espcm_fifo)) {
+                        break;
+                    }
+                    dsp->espcm_byte_buffer[0] = fifo_read(dsp->espcm_fifo);
+                    dsp->sb_8_length--;
+
+                    tempi = dsp->espcm_byte_buffer[0] & 1 ? 0xC : 0x4;
+                    dsp->espcm_byte_buffer[0] >>= 1;
+                } else {
+                    tempi = dsp->espcm_byte_buffer[0] & 1 ? 0xC : 0x4;
+                    dsp->espcm_byte_buffer[0] >>= 1;
+                }
+
+                if (dsp->espcm_sample_idx == 18)
+                    dsp->sb_8_length--;
+
+                dsp->espcm_sample_idx++;
+
+                tempi     |= (dsp->espcm_range << 4);
+                data[0]    = (int) espcm_range_map[tempi];
+                dsp->sbdat = (int16_t) (data[0] << 8);
+                if (dsp->stereo) {
+                    sb_dsp_log("pollsb: ESPCM 1, dsp->stereo, %s channel, %04X\n",
                                dsp->sbleftright ? "left" : "right", dsp->sbdat);
                     if (dsp->sbleftright)
                         dsp->sbdatl = dsp->sbdat;
@@ -1503,14 +2709,32 @@ pollsb(void *priv)
                 break;
         }
 
-        if (dsp->sb_8_length < 0) {
+        if (dsp->sb_8_length < 0 && !dsp->ess_playback_mode) {
             if (dsp->sb_8_autoinit)
                 dsp->sb_8_length = dsp->sb_8_origlength = dsp->sb_8_autolen;
             else {
                 dsp->sb_8_enable = 0;
                 timer_disable(&dsp->output_timer);
+                sb_finish_dma(dsp);
             }
             sb_irq(dsp, 1);
+            dsp->ess_irq_generic = true;
+        }
+        if (dsp->ess_dma_counter > 0xffff) {
+            if (dsp->ess_playback_mode) {
+                if (!dsp->sb_8_autoinit) {
+                    dsp->sb_8_enable = 0;
+                    timer_disable(&dsp->output_timer);
+                    sb_finish_dma(dsp);
+                }
+                if (ESSreg(0xB1) & 0x40) {
+                    sb_irq(dsp, 1);
+                    dsp->ess_irq_dmactr = true;
+                }
+            }
+            const uint32_t temp        = dsp->ess_dma_counter & 0xffff;
+            dsp->ess_dma_counter       = sb_ess_get_dma_counter(dsp);
+            dsp->ess_dma_counter      += temp;
         }
     }
     if (dsp->sb_16_enable && !dsp->sb_16_pause && (dsp->sb_pausetime < 0LL) && dsp->sb_16_output) {
@@ -1521,54 +2745,77 @@ pollsb(void *priv)
                 data[0] = dsp->dma_readw(dsp->dma_priv);
                 if (data[0] == DMA_NODATA)
                     break;
-                dsp->sbdatl = dsp->sbdatr = data[0] ^ 0x8000;
+                dsp->sbdatl = dsp->sbdatr = (int16_t) ((data[0] & 0xffff) ^ 0x8000);
                 dsp->sb_16_length--;
+                dsp->ess_dma_counter += 2;
                 break;
             case 0x10: /* Mono signed */
                 data[0] = dsp->dma_readw(dsp->dma_priv);
                 if (data[0] == DMA_NODATA)
                     break;
-                dsp->sbdatl = dsp->sbdatr = data[0];
+                dsp->sbdatl = dsp->sbdatr = (int16_t) (data[0] & 0xffff);
                 dsp->sb_16_length--;
+                dsp->ess_dma_counter += 2;
                 break;
             case 0x20: /* Stereo unsigned */
                 data[0] = dsp->dma_readw(dsp->dma_priv);
                 data[1] = dsp->dma_readw(dsp->dma_priv);
                 if ((data[0] == DMA_NODATA) || (data[1] == DMA_NODATA))
                     break;
-                dsp->sbdatl = data[0] ^ 0x8000;
-                dsp->sbdatr = data[1] ^ 0x8000;
+                dsp->sbdatl = (int16_t) ((data[0] & 0xffff) ^ 0x8000);
+                dsp->sbdatr = (int16_t) ((data[1] & 0xffff) ^ 0x8000);
                 dsp->sb_16_length -= 2;
+                dsp->ess_dma_counter += 4;
                 break;
             case 0x30: /* Stereo signed */
                 data[0] = dsp->dma_readw(dsp->dma_priv);
                 data[1] = dsp->dma_readw(dsp->dma_priv);
                 if ((data[0] == DMA_NODATA) || (data[1] == DMA_NODATA))
                     break;
-                dsp->sbdatl = data[0];
-                dsp->sbdatr = data[1];
+                dsp->sbdatl = (int16_t) (data[0] & 0xffff);
+                dsp->sbdatr = (int16_t) (data[1] & 0xffff);
                 dsp->sb_16_length -= 2;
+                dsp->ess_dma_counter += 4;
                 break;
 
             default:
                 break;
         }
 
-        if (dsp->sb_16_length < 0) {
+        if (dsp->sb_16_length < 0 && !dsp->ess_playback_mode) {
             sb_dsp_log("16DMA over %i\n", dsp->sb_16_autoinit);
             if (dsp->sb_16_autoinit)
                 dsp->sb_16_length = dsp->sb_16_origlength = dsp->sb_16_autolen;
             else {
                 dsp->sb_16_enable = 0;
                 timer_disable(&dsp->output_timer);
+                sb_finish_dma(dsp);
             }
             sb_irq(dsp, 0);
+            dsp->ess_irq_generic = true;
+        }
+        if (dsp->ess_dma_counter > 0xffff) {
+            if (dsp->ess_playback_mode) {
+                if (!dsp->sb_16_autoinit) {
+                    dsp->sb_16_enable = 0;
+                    timer_disable(&dsp->output_timer);
+                    sb_finish_dma(dsp);
+                }
+                if (ESSreg(0xB1) & 0x40) {
+                    sb_irq(dsp, 0);
+                    dsp->ess_irq_dmactr = true;
+                }
+            }
+            const uint32_t temp        = dsp->ess_dma_counter & 0xffff;
+            dsp->ess_dma_counter       = sb_ess_get_dma_counter(dsp);
+            dsp->ess_dma_counter      += temp;
         }
     }
     if (dsp->sb_pausetime > -1) {
         dsp->sb_pausetime--;
         if (dsp->sb_pausetime < 0) {
             sb_irq(dsp, 1);
+            dsp->ess_irq_generic = true;
             if (!dsp->sb_8_enable)
                 timer_disable(&dsp->output_timer);
             sb_dsp_log("SB pause over\n");
@@ -1582,19 +2829,21 @@ sb_poll_i(void *priv)
     sb_dsp_t *dsp       = (sb_dsp_t *) priv;
     int       processed = 0;
 
-    timer_advance_u64(&dsp->input_timer, dsp->sblatchi);
+    timer_advance_u64(&dsp->input_timer, (uint64_t) dsp->sblatchi);
 
     if (dsp->sb_8_enable && !dsp->sb_8_pause && dsp->sb_pausetime < 0 && !dsp->sb_8_output) {
         switch (dsp->sb_8_format) {
             case 0x00: /* Mono unsigned As the manual says, only the left channel is recorded */
                 dsp->dma_writeb(dsp->dma_priv, (dsp->record_buffer[dsp->record_pos_read] >> 8) ^ 0x80);
                 dsp->sb_8_length--;
+                dsp->ess_dma_counter++;
                 dsp->record_pos_read += 2;
                 dsp->record_pos_read &= 0xFFFF;
                 break;
             case 0x10: /* Mono signed As the manual says, only the left channel is recorded */
                 dsp->dma_writeb(dsp->dma_priv, (dsp->record_buffer[dsp->record_pos_read] >> 8));
                 dsp->sb_8_length--;
+                dsp->ess_dma_counter++;
                 dsp->record_pos_read += 2;
                 dsp->record_pos_read &= 0xFFFF;
                 break;
@@ -1602,6 +2851,7 @@ sb_poll_i(void *priv)
                 dsp->dma_writeb(dsp->dma_priv, (dsp->record_buffer[dsp->record_pos_read] >> 8) ^ 0x80);
                 dsp->dma_writeb(dsp->dma_priv, (dsp->record_buffer[dsp->record_pos_read + 1] >> 8) ^ 0x80);
                 dsp->sb_8_length -= 2;
+                dsp->ess_dma_counter += 2;
                 dsp->record_pos_read += 2;
                 dsp->record_pos_read &= 0xFFFF;
                 break;
@@ -1609,22 +2859,112 @@ sb_poll_i(void *priv)
                 dsp->dma_writeb(dsp->dma_priv, (dsp->record_buffer[dsp->record_pos_read] >> 8));
                 dsp->dma_writeb(dsp->dma_priv, (dsp->record_buffer[dsp->record_pos_read + 1] >> 8));
                 dsp->sb_8_length -= 2;
+                dsp->ess_dma_counter += 2;
                 dsp->record_pos_read += 2;
                 dsp->record_pos_read &= 0xFFFF;
                 break;
+            case ESPCM_4E:
+                /*
+                   I assume the real hardware double-buffers the blocks or something like that.
+                   We're not gonna do that here.
+                 */
+                dsp->espcm_sample_buffer[dsp->espcm_sample_idx] = (int8_t) (dsp->record_buffer[dsp->record_pos_read] >> 8);
+                dsp->espcm_sample_idx++;
+                dsp->record_pos_read += 2;
+                dsp->record_pos_read &= 0xFFFF;
+                if (dsp->espcm_sample_idx >= 19) {
+                    int     i, table_addr;
+                    int8_t  min_sample = 127, max_sample = -128, s;
+
+                    for (i = 0; i < 19; i++) {
+                        s = dsp->espcm_sample_buffer[i];
+                        if (s < min_sample)
+                            min_sample = s;
+                        if (s > max_sample)
+                            max_sample = s;
+                    }
+                    if (min_sample < 0) {
+                        if (min_sample == -128)
+                            min_sample = 127;    /* Clip it to make it fit into int8_t. */
+                        else
+                            min_sample = (int8_t) -min_sample;
+                    }
+                    if (max_sample < 0) {
+                        if (max_sample == -128)
+                            max_sample = 127;    /* Clip it to make it fit into int8_t. */
+                        else
+                            max_sample = (int8_t) -max_sample;
+                    }
+                    if (min_sample > max_sample)
+                        max_sample = min_sample;
+
+                    for (table_addr = 15; table_addr < 256; table_addr += 16) {
+                        if (max_sample <= espcm_range_map[table_addr])
+                            break;
+                    }
+                    dsp->espcm_range = table_addr >> 4;
+
+                    for (i = 0; i < 19; i++) {
+                        int last_sigma = 9999;
+                        table_addr = dsp->espcm_range << 4;
+                        s          = dsp->espcm_sample_buffer[i];
+                        for (; (table_addr >> 4) == dsp->espcm_range; table_addr++) {
+                            int sigma = espcm_range_map[table_addr] - s;
+                            if (sigma < 0)
+                                sigma = -sigma;
+                            if (sigma > last_sigma)
+                                break;
+                            last_sigma = sigma;
+                        }
+                        table_addr--;
+                        dsp->espcm_code_buffer[i] = table_addr & 0x0F;
+                    }
+
+                    uint8_t b = dsp->espcm_range | (dsp->espcm_code_buffer[0] << 4);
+                    dsp->dma_writeb(dsp->dma_priv, b);
+                    dsp->sb_8_length--;
+                    dsp->ess_dma_counter++;
+
+                    for (i = 1; i < 10; i++) {
+                        b = dsp->espcm_code_buffer[i * 2 - 1] | (dsp->espcm_code_buffer[i * 2] << 4);
+                        dsp->dma_writeb(dsp->dma_priv, b);
+                        dsp->sb_8_length--;
+                        dsp->ess_dma_counter++;
+                    }
+
+                    dsp->espcm_sample_idx = 0;
+                }
 
             default:
                 break;
         }
 
-        if (dsp->sb_8_length < 0) {
+        if (dsp->sb_8_length < 0 && !dsp->ess_playback_mode) {
             if (dsp->sb_8_autoinit)
                 dsp->sb_8_length = dsp->sb_8_origlength = dsp->sb_8_autolen;
             else {
                 dsp->sb_8_enable = 0;
                 timer_disable(&dsp->input_timer);
+                sb_finish_dma(dsp);
             }
             sb_irq(dsp, 1);
+            dsp->ess_irq_generic = true;
+        }
+        if (dsp->ess_dma_counter > 0xffff) {
+            if (dsp->ess_playback_mode) {
+                if (!dsp->sb_8_autoinit) {
+                    dsp->sb_8_enable = 0;
+                    timer_disable(&dsp->input_timer);
+                    sb_finish_dma(dsp);
+                }
+                if (ESSreg(0xB1) & 0x40) {
+                    sb_irq(dsp, 1);
+                    dsp->ess_irq_dmactr = true;
+                }
+            }
+            uint32_t temp        = dsp->ess_dma_counter & 0xffff;
+            dsp->ess_dma_counter = sb_ess_get_dma_counter(dsp);
+            dsp->ess_dma_counter += temp;
         }
         processed = 1;
     }
@@ -1634,6 +2974,7 @@ sb_poll_i(void *priv)
                 if (dsp->dma_writew(dsp->dma_priv, dsp->record_buffer[dsp->record_pos_read] ^ 0x8000))
                     return;
                 dsp->sb_16_length--;
+                dsp->ess_dma_counter += 2;
                 dsp->record_pos_read += 2;
                 dsp->record_pos_read &= 0xFFFF;
                 break;
@@ -1641,6 +2982,7 @@ sb_poll_i(void *priv)
                 if (dsp->dma_writew(dsp->dma_priv, dsp->record_buffer[dsp->record_pos_read]))
                     return;
                 dsp->sb_16_length--;
+                dsp->ess_dma_counter += 2;
                 dsp->record_pos_read += 2;
                 dsp->record_pos_read &= 0xFFFF;
                 break;
@@ -1649,6 +2991,7 @@ sb_poll_i(void *priv)
                     return;
                 dsp->dma_writew(dsp->dma_priv, dsp->record_buffer[dsp->record_pos_read + 1] ^ 0x8000);
                 dsp->sb_16_length -= 2;
+                dsp->ess_dma_counter += 4;
                 dsp->record_pos_read += 2;
                 dsp->record_pos_read &= 0xFFFF;
                 break;
@@ -1657,6 +3000,7 @@ sb_poll_i(void *priv)
                     return;
                 dsp->dma_writew(dsp->dma_priv, dsp->record_buffer[dsp->record_pos_read + 1]);
                 dsp->sb_16_length -= 2;
+                dsp->ess_dma_counter += 4;
                 dsp->record_pos_read += 2;
                 dsp->record_pos_read &= 0xFFFF;
                 break;
@@ -1665,14 +3009,32 @@ sb_poll_i(void *priv)
                 break;
         }
 
-        if (dsp->sb_16_length < 0) {
+        if (dsp->sb_16_length < 0 && !dsp->ess_playback_mode) {
             if (dsp->sb_16_autoinit)
                 dsp->sb_16_length = dsp->sb_16_origlength = dsp->sb_16_autolen;
             else {
                 dsp->sb_16_enable = 0;
                 timer_disable(&dsp->input_timer);
+                sb_finish_dma(dsp);
             }
             sb_irq(dsp, 0);
+            dsp->ess_irq_generic = true;
+        }
+        if (dsp->ess_dma_counter > 0xffff) {
+            if (dsp->ess_playback_mode) {
+                if (!dsp->sb_16_autoinit) {
+                    dsp->sb_16_enable = 0;
+                    timer_disable(&dsp->input_timer);
+                    sb_finish_dma(dsp);
+                }
+                if (ESSreg(0xB1) & 0x40) {
+                    sb_irq(dsp, 0);
+                    dsp->ess_irq_dmactr = true;
+                }
+            }
+            uint32_t temp        = dsp->ess_dma_counter & 0xffff;
+            dsp->ess_dma_counter = sb_ess_get_dma_counter(dsp);
+            dsp->ess_dma_counter += temp;
         }
         processed = 1;
     }
diff --git a/src/sound/snd_sn76489.c b/src/sound/snd_sn76489.c
index 519219934..569d698d5 100644
--- a/src/sound/snd_sn76489.c
+++ b/src/sound/snd_sn76489.c
@@ -21,7 +21,15 @@ static float volslog[16] = {
     7.51785f, 9.46440f, 11.9194f, 15.0000f
 };
 
-void
+static int
+sn76489_check_tap_2(sn76489_t *sn76489)
+{
+   int ret = ((sn76489->shift >> sn76489->white_noise_tap_2) & 1);
+
+   return (sn76489->type == SN76496) ? ret : !ret;
+}
+
+static void
 sn76489_update(sn76489_t *sn76489)
 {
     for (; sn76489->pos < sound_pos_global; sn76489->pos++) {
@@ -42,24 +50,28 @@ sn76489_update(sn76489_t *sn76489)
         result += (((sn76489->shift & 1) ^ 1) * 127 * volslog[sn76489->vol[0]] * 2);
 
         sn76489->count[0] -= (512 * sn76489->psgconst);
-        while (sn76489->count[0] < 0 && sn76489->latch[0]) {
+        while ((sn76489->count[0] < 0) && sn76489->latch[0]) {
             sn76489->count[0] += (sn76489->latch[0] * 4);
             if (!(sn76489->noise & 4)) {
-                if (sn76489->shift & 1)
-                    sn76489->shift |= 0x8000;
-                sn76489->shift >>= 1;
+                if ((sn76489->shift >> sn76489->white_noise_tap_1) & 1) {
+                    sn76489->shift >>= 1;
+                    sn76489->shift |= sn76489->feedback_mask;
+                } else
+                    sn76489->shift >>= 1;
             } else {
-                if ((sn76489->shift & 1) ^ ((sn76489->shift >> 1) & 1))
-                    sn76489->shift |= 0x8000;
-                sn76489->shift >>= 1;
+                if (((sn76489->shift >> sn76489->white_noise_tap_1) & 1) ^ sn76489_check_tap_2(sn76489)) {
+                    sn76489->shift >>= 1;
+                    sn76489->shift |= sn76489->feedback_mask;
+                } else
+                    sn76489->shift >>= 1;
             }
         }
 
-        sn76489->buffer[sn76489->pos] = result;
+        sn76489->buffer[sn76489->pos] = (sn76489->type == NCR8496) ? -result : result;
     }
 }
 
-void
+static void
 sn76489_get_buffer(int32_t *buffer, int len, void *priv)
 {
     sn76489_t *sn76489 = (sn76489_t *) priv;
@@ -74,7 +86,7 @@ sn76489_get_buffer(int32_t *buffer, int len, void *priv)
     sn76489->pos = 0;
 }
 
-void
+static void
 sn76489_write(UNUSED(uint16_t addr), uint8_t data, void *priv)
 {
     sn76489_t *sn76489 = (sn76489_t *) priv;
@@ -88,7 +100,7 @@ sn76489_write(UNUSED(uint16_t addr), uint8_t data, void *priv)
             case 0:
                 sn76489->freqlo[3] = data & 0xf;
                 sn76489->latch[3]  = (sn76489->freqlo[3] | (sn76489->freqhi[3] << 4)) << 6;
-                if (sn76489->extra_divide)
+                if (!sn76489->extra_divide)
                     sn76489->latch[3] &= 0x3ff;
                 if (!sn76489->latch[3])
                     sn76489->latch[3] = (sn76489->extra_divide ? 2048 : 1024) << 6;
@@ -101,7 +113,7 @@ sn76489_write(UNUSED(uint16_t addr), uint8_t data, void *priv)
             case 0x20:
                 sn76489->freqlo[2] = data & 0xf;
                 sn76489->latch[2]  = (sn76489->freqlo[2] | (sn76489->freqhi[2] << 4)) << 6;
-                if (sn76489->extra_divide)
+                if (!sn76489->extra_divide)
                     sn76489->latch[2] &= 0x3ff;
                 if (!sn76489->latch[2])
                     sn76489->latch[2] = (sn76489->extra_divide ? 2048 : 1024) << 6;
@@ -114,7 +126,7 @@ sn76489_write(UNUSED(uint16_t addr), uint8_t data, void *priv)
             case 0x40:
                 sn76489->freqlo[1] = data & 0xf;
                 sn76489->latch[1]  = (sn76489->freqlo[1] | (sn76489->freqhi[1] << 4)) << 6;
-                if (sn76489->extra_divide)
+                if (!sn76489->extra_divide)
                     sn76489->latch[1] &= 0x3ff;
                 if (!sn76489->latch[1])
                     sn76489->latch[1] = (sn76489->extra_divide ? 2048 : 1024) << 6;
@@ -125,15 +137,13 @@ sn76489_write(UNUSED(uint16_t addr), uint8_t data, void *priv)
                 sn76489->vol[1] = 0xf - data;
                 break;
             case 0x60:
-                if ((data & 4) != (sn76489->noise & 4) || sn76489->type == SN76496)
-                    sn76489->shift = 0x4000;
+                if (((data & 4) != (sn76489->noise & 4)) || (sn76489->type == SN76496))
+                    sn76489->shift = sn76489->feedback_mask;
                 sn76489->noise = data & 0xf;
                 if ((data & 3) == 3)
                     sn76489->latch[0] = sn76489->latch[1];
                 else
                     sn76489->latch[0] = 0x400 << (data & 3);
-                if (sn76489->extra_divide)
-                    sn76489->latch[0] &= 0x3ff;
                 if (!sn76489->latch[0])
                     sn76489->latch[0] = (sn76489->extra_divide ? 2048 : 1024) << 6;
                 break;
@@ -146,20 +156,25 @@ sn76489_write(UNUSED(uint16_t addr), uint8_t data, void *priv)
                 break;
         }
     } else {
+        /* NCR8496 ignores writes to registers 1, 3, 5, 6 and 7 with bit 7 clear. */
+        if ((sn76489->type != SN76496) && ((sn76489->firstdat & 0x10) || ((sn76489->firstdat & 0x70) == 0x60)))
+            return;
+
         if ((sn76489->firstdat & 0x70) == 0x60 && (sn76489->type == SN76496)) {
-            if ((data & 4) != (sn76489->noise & 4) || sn76489->type == SN76496)
-                sn76489->shift = 0x4000;
+            if (sn76489->type == SN76496)
+                sn76489->shift = sn76489->feedback_mask;
             sn76489->noise = data & 0xf;
             if ((data & 3) == 3)
                 sn76489->latch[0] = sn76489->latch[1];
             else
                 sn76489->latch[0] = 0x400 << (data & 3);
             if (!sn76489->latch[0])
-                sn76489->latch[0] = 1024 << 6;
+                sn76489->latch[0] = (sn76489->extra_divide ? 2048 : 1024) << 6;
         } else if ((sn76489->firstdat & 0x70) != 0x60) {
             sn76489->freqhi[sn76489->lasttone] = data & 0x7F;
-            freq                               = sn76489->freqlo[sn76489->lasttone] | (sn76489->freqhi[sn76489->lasttone] << 4);
-            if (sn76489->extra_divide)
+            freq                               = sn76489->freqlo[sn76489->lasttone] |
+                                                 (sn76489->freqhi[sn76489->lasttone] << 4);
+            if (!sn76489->extra_divide)
                 freq &= 0x3ff;
             if (!freq)
                 freq = sn76489->extra_divide ? 2048 : 1024;
@@ -181,6 +196,16 @@ sn76489_init(sn76489_t *sn76489, uint16_t base, uint16_t size, int type, int fre
 {
     sound_add_handler(sn76489_get_buffer, sn76489);
 
+    if (type == SN76496) {
+        sn76489->white_noise_tap_1 = 0;
+        sn76489->white_noise_tap_2 = 1;
+        sn76489->feedback_mask     = 0x4000;
+    } else {
+        sn76489->white_noise_tap_1 = 1;
+        sn76489->white_noise_tap_2 = 5;
+        sn76489->feedback_mask     = 0x8000;
+    }
+
     sn76489->latch[0] = sn76489->latch[1] = sn76489->latch[2] = sn76489->latch[3] = 0x3FF << 6;
     sn76489->vol[0]                                                               = 0;
     sn76489->vol[1] = sn76489->vol[2] = sn76489->vol[3] = 8;
@@ -191,7 +216,7 @@ sn76489_init(sn76489_t *sn76489, uint16_t base, uint16_t size, int type, int fre
     sn76489->count[2] = (rand() & 0x3FF) << 6;
     sn76489->count[3] = (rand() & 0x3FF) << 6;
     sn76489->noise    = 3;
-    sn76489->shift    = 0x4000;
+    sn76489->shift    = sn76489->feedback_mask;
     sn76489->type     = type;
     sn76489->psgconst = (((double) freq / 64.0) / (double) FREQ_48000);
 
@@ -203,8 +228,7 @@ sn76489_init(sn76489_t *sn76489, uint16_t base, uint16_t size, int type, int fre
 void *
 sn76489_device_init(UNUSED(const device_t *info))
 {
-    sn76489_t *sn76489 = malloc(sizeof(sn76489_t));
-    memset(sn76489, 0, sizeof(sn76489_t));
+    sn76489_t *sn76489 = calloc(1, sizeof(sn76489_t));
 
     sn76489_init(sn76489, 0x00c0, 0x0008, SN76496, 3579545);
 
@@ -214,8 +238,7 @@ sn76489_device_init(UNUSED(const device_t *info))
 void *
 ncr8496_device_init(UNUSED(const device_t *info))
 {
-    sn76489_t *sn76489 = malloc(sizeof(sn76489_t));
-    memset(sn76489, 0, sizeof(sn76489_t));
+    sn76489_t *sn76489 = calloc(1, sizeof(sn76489_t));
 
     sn76489_init(sn76489, 0x00c0, 0x0008, NCR8496, 3579545);
 
@@ -225,8 +248,7 @@ ncr8496_device_init(UNUSED(const device_t *info))
 void *
 tndy_device_init(UNUSED(const device_t *info))
 {
-    sn76489_t *sn76489 = malloc(sizeof(sn76489_t));
-    memset(sn76489, 0, sizeof(sn76489_t));
+    sn76489_t *sn76489 = calloc(1, sizeof(sn76489_t));
 
     uint16_t addr = device_get_config_hex16("base");
 
@@ -246,40 +268,23 @@ sn76489_device_close(void *priv)
 static const device_config_t tndy_config[] = {
   // clang-format off
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x0C0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "0x0C0",
-                .value = 0x0C0
-            },
-            {
-                .description = "0x0E0",
-                .value = 0x0E0
-            },
-            {
-                .description = "0x1C0",
-                .value = 0x1C0
-            },
-            {
-                .description = "0x1E0",
-                .value = 0x1E0
-            },
-            {
-                .description = "0x2C0",
-                .value = 0x2C0
-            },
-            {
-                .description = "0x2E0",
-                .value = 0x2E0
-            },
-            { .description = "" }
-        }
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x0C0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x0C0", .value = 0x0C0 },
+            { .description = "0x0E0", .value = 0x0E0 },
+            { .description = "0x1C0", .value = 0x1C0 },
+            { .description = "0x1E0", .value = 0x1E0 },
+            { .description = "0x2C0", .value = 0x2C0 },
+            { .description = "0x2E0", .value = 0x2E0 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -293,7 +298,7 @@ const device_t sn76489_device = {
     .init          = sn76489_device_init,
     .close         = sn76489_device_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -307,7 +312,7 @@ const device_t ncr8496_device = {
     .init          = ncr8496_device_init,
     .close         = sn76489_device_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -321,7 +326,7 @@ const device_t tndy_device = {
     .init          = tndy_device_init,
     .close         = sn76489_device_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = tndy_config
diff --git a/src/sound/snd_speaker.c b/src/sound/snd_speaker.c
index 0537cd09a..063554875 100644
--- a/src/sound/snd_speaker.c
+++ b/src/sound/snd_speaker.c
@@ -56,7 +56,7 @@ speaker_update(void)
     int32_t val;
     double  amplitude;
 
-    amplitude = ((speaker_count / 64.0) * 10240.0) - 5120.0;
+    amplitude = ((speaker_count / 256.0) * 10240.0) - 5120.0;
 
     if (amplitude > 5120.0)
         amplitude = 5120.0;
diff --git a/src/sound/snd_ssi2001.c b/src/sound/snd_ssi2001.c
index 1f3c294ce..b832cb526 100644
--- a/src/sound/snd_ssi2001.c
+++ b/src/sound/snd_ssi2001.c
@@ -21,6 +21,10 @@ typedef struct ssi2001_t {
     int     gameport_enabled;
 } ssi2001_t;
 
+typedef struct entertainer_t {
+    uint8_t regs;
+} entertainer_t;
+
 static void
 ssi2001_update(ssi2001_t *ssi2001)
 {
@@ -66,10 +70,9 @@ ssi2001_write(uint16_t addr, uint8_t val, void *priv)
 void *
 ssi2001_init(UNUSED(const device_t *info))
 {
-    ssi2001_t *ssi2001 = malloc(sizeof(ssi2001_t));
-    memset(ssi2001, 0, sizeof(ssi2001_t));
+    ssi2001_t *ssi2001 = calloc(1, sizeof(ssi2001_t));
 
-    ssi2001->psid = sid_init();
+    ssi2001->psid = sid_init(device_get_config_int("sid_config"),device_get_config_int("sid_adjustment"));
     sid_reset(ssi2001->psid);
     uint16_t addr             = device_get_config_hex16("base");
     ssi2001->gameport_enabled = device_get_config_int("gameport");
@@ -90,52 +93,147 @@ ssi2001_close(void *priv)
     free(ssi2001);
 }
 
+static uint8_t
+entertainer_read(UNUSED(uint16_t addr), UNUSED(void *priv))
+{
+    return 0xa5;
+}
+
+static void
+entertainer_write(UNUSED(uint16_t addr), uint8_t val, void *priv)
+{
+    entertainer_t *entertainer = (entertainer_t *) priv;
+    entertainer->regs = val;
+}
+
+void *
+entertainer_init(UNUSED(const device_t *info))
+{
+    ssi2001_t     *ssi2001     = calloc(1, sizeof(ssi2001_t));
+    entertainer_t *entertainer = calloc(1, sizeof(entertainer_t));
+
+    ssi2001->psid = sid_init(0, 0.5);
+    sid_reset(ssi2001->psid);
+    ssi2001->gameport_enabled = device_get_config_int("gameport");
+    io_sethandler(0x200, 0x0001, entertainer_read, NULL, NULL, entertainer_write, NULL, NULL, entertainer);
+    io_sethandler(0x280, 0x0020, ssi2001_read, NULL, NULL, ssi2001_write, NULL, NULL, ssi2001);
+    if (ssi2001->gameport_enabled)
+        gameport_remap(gameport_add(&gameport_201_device), 0x201);
+    sound_add_handler(ssi2001_get_buffer, ssi2001);
+    return ssi2001;
+}
+
+void
+entertainer_close(void *priv)
+{
+    ssi2001_t *ssi2001 = (ssi2001_t *) priv;
+
+    sid_close(ssi2001->psid);
+
+    free(ssi2001);
+}
+
 static const device_config_t ssi2001_config[] = {
     // clang-format off
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x280,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "0x280",
-                .value = 0x280
-            },
-            {
-                .description = "0x2A0",
-                .value = 0x2A0
-            },
-            {
-                .description = "0x2C0",
-                .value = 0x2C0
-            },
-            {
-                .description = "0x2E0",
-                .value = 0x2E0
-            },
-            { .description = "" }
-        }
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x280,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x280", .value = 0x280 },
+            { .description = "0x2A0", .value = 0x2A0 },
+            { .description = "0x2C0", .value = 0x2C0 },
+            { .description = "0x2E0", .value = 0x2E0 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
-    { "gameport", "Enable Game port", CONFIG_BINARY, "",  1 },
-    { "",         "",                                    -1 }
+    {
+        .name           = "gameport",
+        .description    = "Enable Game port",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "sid_config",
+        .description    = "SID Model",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {             
+		{ .description = "8580", .value = 0x001 },
+        { .description = "6581", .value = 0x000 },
+		{ .description = ""                      }
+		},
+        .bios           = { { 0 } }
+    },
+	{
+        .name           = "sid_adjustment",
+        .description    = "SID Filter Strength",
+        .type           = CONFIG_STRING,
+        .default_string = "0.5",
+		.default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {{"0.5"}},
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
 // clang-format off
 };
 
-const device_t ssi2001_device =
-{
-    .name = "Innovation SSI-2001",
-    .internal_name = "ssi2001",
-    .flags = DEVICE_ISA,
-    .local = 0,
-    .init = ssi2001_init,
-    .close = ssi2001_close,
-    .reset = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw = NULL,
-    .config = ssi2001_config
+static const device_config_t entertainer_config[] = {
+    // clang-format off
+    {
+        .name           = "gameport",
+        .description    = "Enable Game port",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+// clang-format off
+};
+
+const device_t ssi2001_device = {
+    .name          = "Innovation SSI-2001",
+    .internal_name = "ssi2001",
+    .flags         = DEVICE_ISA,
+    .local         = 0,
+    .init          = ssi2001_init,
+    .close         = ssi2001_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ssi2001_config
+};
+
+const device_t entertainer_device = {
+    .name          = "The Entertainer",
+    .internal_name = "Entertainer",
+    .flags         = DEVICE_ISA,
+    .local         = 1,
+    .init          = entertainer_init,
+    .close         = entertainer_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = entertainer_config
 };
diff --git a/src/sound/snd_wss.c b/src/sound/snd_wss.c
index a69d746da..874638a80 100644
--- a/src/sound/snd_wss.c
+++ b/src/sound/snd_wss.c
@@ -80,28 +80,34 @@ static void
 wss_get_buffer(int32_t *buffer, int len, void *priv)
 {
     wss_t *wss = (wss_t *) priv;
-    const int32_t *opl_buf = NULL;
-
-    if (wss->opl_enabled)
-        opl_buf = wss->opl.update(wss->opl.priv);
 
     ad1848_update(&wss->ad1848);
+    for (int c = 0; c < len * 2; c++)
+        buffer[c] += wss->ad1848.buffer[c] / 2;
+
+    wss->ad1848.pos = 0;
+}
+
+static void
+wss_get_music_buffer(int32_t *buffer, int len, void *priv)
+{
+    wss_t *wss = (wss_t *) priv;
+    const int32_t *opl_buf = NULL;
+
+    opl_buf = wss->opl.update(wss->opl.priv);
+
     for (int c = 0; c < len * 2; c++) {
         if (opl_buf)
             buffer[c] += opl_buf[c];
-        buffer[c] += wss->ad1848.buffer[c] / 2;
     }
 
-    if (wss->opl_enabled)
-        wss->opl.reset_buffer(wss->opl.priv);
-    wss->ad1848.pos = 0;
+    wss->opl.reset_buffer(wss->opl.priv);
 }
 
 void *
 wss_init(UNUSED(const device_t *info))
 {
-    wss_t *wss = malloc(sizeof(wss_t));
-    memset(wss, 0, sizeof(wss_t));
+    wss_t *wss = calloc(1, sizeof(wss_t));
 
     uint16_t addr    = device_get_config_hex16("base");
     wss->opl_enabled = device_get_config_int("opl");
@@ -131,6 +137,9 @@ wss_init(UNUSED(const device_t *info))
 
     sound_add_handler(wss_get_buffer, wss);
 
+    if (wss->opl_enabled)
+        music_add_handler(wss_get_music_buffer, wss);
+
     return wss;
 }
 
@@ -199,8 +208,7 @@ ncr_audio_mca_feedb(void *priv)
 void *
 ncr_audio_init(UNUSED(const device_t *info))
 {
-    wss_t *wss = malloc(sizeof(wss_t));
-    memset(wss, 0, sizeof(wss_t));
+    wss_t *wss = calloc(1, sizeof(wss_t));
 
     fm_driver_get(FM_YMF262, &wss->opl);
     ad1848_init(&wss->ad1848, AD1848_TYPE_DEFAULT);
@@ -214,6 +222,9 @@ ncr_audio_init(UNUSED(const device_t *info))
 
     sound_add_handler(wss_get_buffer, wss);
 
+    if (wss->opl_enabled)
+        music_add_handler(wss_get_music_buffer, wss);
+
     return wss;
 }
 
@@ -234,39 +245,32 @@ wss_speed_changed(void *priv)
 static const device_config_t wss_config[] = {
   // clang-format off
     {
-        .name = "base",
-        .description = "Address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x530,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "0x530",
-                .value = 0x530
-            },
-            {
-                .description = "0x604",
-                .value = 0x604
-            },
-            {
-                .description = "0xe80",
-                .value = 0xe80
-            },
-            {
-                .description = "0xf40",
-                .value = 0xf40
-            },
-            { .description = "" }
-        }
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x530,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x530", .value = 0x530 },
+            { .description = "0x604", .value = 0x604 },
+            { .description = "0xe80", .value = 0xe80 },
+            { .description = "0xf40", .value = 0xf40 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "opl",
-        .description = "Enable OPL",
-        .type = CONFIG_BINARY,
-        .default_string = "",
-        .default_int = 1
+        .name           = "opl",
+        .description    = "Enable OPL",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -275,12 +279,12 @@ static const device_config_t wss_config[] = {
 const device_t wss_device = {
     .name          = "Windows Sound System",
     .internal_name = "wss",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0,
     .init          = wss_init,
     .close         = wss_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = wss_speed_changed,
     .force_redraw  = NULL,
     .config        = wss_config
@@ -294,7 +298,7 @@ const device_t ncr_business_audio_device = {
     .init          = ncr_audio_init,
     .close         = wss_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = wss_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/sound/sndio.c b/src/sound/sndio.c
new file mode 100644
index 000000000..2fe1434df
--- /dev/null
+++ b/src/sound/sndio.c
@@ -0,0 +1,140 @@
+/*
+ * 86Box     A hypervisor and IBM PC system emulator that specializes in
+ *           running old operating systems and software designed for IBM
+ *           PC systems and compatibles from 1981 through fairly recent
+ *           system designs based on the PCI bus.
+ *
+ *           This file is part of the 86Box distribution.
+ *
+ *           Interface to sndio
+ *
+ *
+ * Authors:  Nishi
+ *
+ *           Copyright 2025 Nishi.
+ */
+#include <stdint.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+
+#include <sndio.h>
+
+#include <86box/86box.h>
+#include <86box/sound.h>
+#include <86box/plat_unused.h>
+
+#define I_NORMAL 0
+#define I_MUSIC 1
+#define I_WT 2
+#define I_CD 3
+#define I_MIDI 4
+
+static struct sio_hdl* audio[5] = {NULL, NULL, NULL, NULL, NULL};
+static struct sio_par info[5];
+static int freqs[5] = {SOUND_FREQ, MUSIC_FREQ, WT_FREQ, CD_FREQ, 0};
+
+void closeal(void){
+	int i;
+	for(i = 0; i < sizeof(audio) / sizeof(audio[0]); i++){
+		if(audio[i] != NULL){
+			sio_close(audio[i]);
+		}
+		audio[i] = NULL;
+	}
+}
+
+void inital(void){
+	int i;
+	for(i = 0; i < sizeof(audio) / sizeof(audio[0]); i++){
+		audio[i] = sio_open(SIO_DEVANY, SIO_PLAY, 0);
+		if(audio[i] != NULL){
+			int rate;
+			int max_frames;
+			sio_getpar(audio[i], &info[i]);
+			rate = info[i].rate;
+			max_frames = info[i].bufsz;
+			sio_initpar(&info[i]);
+			info[i].sig = 1;
+			info[i].bits = 16;
+			info[i].pchan = 2;
+			info[i].rate = rate;
+			info[i].appbufsz = max_frames;
+			sio_setpar(audio[i], &info[i]);
+			sio_getpar(audio[i], &info[i]);
+			if(!sio_start(audio[i])){
+				sio_close(audio[i]);
+				audio[i] = NULL;
+			}
+		}
+	}
+}
+
+void givealbuffer_common(const void *buf, const uint8_t src, const int size){
+	const int freq = freqs[src];
+	int16_t* output;
+	int output_size;
+	int16_t* conv;
+	int conv_size;
+	int i;
+        double gain;
+	int target_rate;
+	if(audio[src] == NULL) return;
+
+	gain = sound_muted ? 0.0 : pow(10.0, (double) sound_gain / 20.0);
+
+	if(sound_is_float){
+		float* input = (float*)buf;
+		conv_size = sizeof(int16_t) * size;
+		conv = malloc(conv_size);
+		for(i = 0; i < conv_size / sizeof(int16_t); i++){
+			conv[i] = 32767 * input[i];
+		}
+	}else{
+		conv_size = size * sizeof(int16_t);
+		conv = malloc(conv_size);
+		memcpy(conv, buf, conv_size);
+	}
+
+	target_rate = info[src].rate;
+
+	output_size = (double)conv_size * target_rate / freq;
+	output_size -= output_size % 4;
+	output = malloc(output_size);
+	
+	for(i = 0; i < output_size / sizeof(int16_t) / 2; i++){
+		int ind = i * freq / target_rate * 2;
+		output[i * 2 + 0] = conv[ind + 0] * gain;
+		output[i * 2 + 1] = conv[ind + 1] * gain;
+	}
+
+	sio_write(audio[src], output, output_size);
+
+	free(conv);
+	free(output);
+}
+
+void givealbuffer(const void *buf){
+	givealbuffer_common(buf, I_NORMAL, SOUNDBUFLEN << 1);
+}
+
+void givealbuffer_music(const void *buf){
+	givealbuffer_common(buf, I_MUSIC, MUSICBUFLEN << 1);
+}
+
+void givealbuffer_wt(const void *buf){
+	givealbuffer_common(buf, I_WT, WTBUFLEN << 1);
+}
+
+void givealbuffer_cd(const void *buf){
+	givealbuffer_common(buf, I_CD, CD_BUFLEN << 1);
+}
+void givealbuffer_midi(const void *buf, const uint32_t size){
+	givealbuffer_common(buf, I_MIDI, (int) size);
+}
+	
+void al_set_midi(const int freq, UNUSED(const int buf_size)){
+	freqs[I_MIDI] = freq;
+}
diff --git a/src/sound/sound.c b/src/sound/sound.c
index ed7f821e0..c81dc47b0 100644
--- a/src/sound/sound.c
+++ b/src/sound/sound.c
@@ -12,9 +12,11 @@
  *
  * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
  *          Miran Grca, <mgrca8@gmail.com>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
  *
  *          Copyright 2008-2020 Sarah Walker.
- *          Copyright 2016-2020 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
+ *          Copyright 2024-2025 Jasmine Iwanek.
  */
 #include <math.h>
 #include <stdarg.h>
@@ -22,25 +24,20 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wchar.h>
 #define HAVE_STDARG_H
 
 #include <86box/86box.h>
 #include <86box/cdrom.h>
 #include <86box/device.h>
 #include <86box/filters.h>
-#include <86box/hdc_ide.h>
 #include <86box/machine.h>
 #include <86box/midi.h>
 #include <86box/plat.h>
 #include <86box/thread.h>
 #include <86box/snd_ac97.h>
-#include <86box/snd_azt2316a.h>
 #include <86box/timer.h>
 #include <86box/snd_mpu401.h>
 #include <86box/sound.h>
-#include <86box/snd_opl.h>
-#include <86box/snd_sb_dsp.h>
 
 typedef struct {
     const device_t *device;
@@ -53,19 +50,38 @@ typedef struct {
 
 int sound_card_current[SOUND_CARD_MAX] = { 0, 0, 0, 0 };
 int sound_pos_global                   = 0;
+int music_pos_global                   = 0;
+int wavetable_pos_global               = 0;
 int sound_gain                         = 0;
 
 static sound_handler_t sound_handlers[8];
 
+static sound_handler_t music_handlers[8];
+static sound_handler_t wavetable_handlers[8];
+
+static double     cd_audio_volume_lut[256];
+
 static thread_t  *sound_cd_thread_h;
 static event_t   *sound_cd_event;
 static event_t   *sound_cd_start_event;
 static int32_t   *outbuffer;
 static float     *outbuffer_ex;
 static int16_t   *outbuffer_ex_int16;
+static int32_t   *outbuffer_m;
+static float     *outbuffer_m_ex;
+static int16_t   *outbuffer_m_ex_int16;
+static int32_t   *outbuffer_w;
+static float     *outbuffer_w_ex;
+static int16_t   *outbuffer_w_ex_int16;
 static int        sound_handlers_num;
+static int        music_handlers_num;
+static int        wavetable_handlers_num;
 static pc_timer_t sound_poll_timer;
 static uint64_t   sound_poll_latch;
+static pc_timer_t music_poll_timer;
+static uint64_t   music_poll_latch;
+static pc_timer_t wavetable_poll_timer;
+static uint64_t   wavetable_poll_latch;
 
 static int16_t      cd_buffer[CDROM_NUM][CD_BUFLEN * 2];
 static float        cd_out_buffer[CD_BUFLEN * 2];
@@ -82,82 +98,86 @@ static void *filter_cd_audio_p                                          = NULL;
 void (*filter_pc_speaker)(int channel, double *buffer, void *priv) = NULL;
 void *filter_pc_speaker_p                                          = NULL;
 
-static const device_t sound_none_device = {
-    .name          = "None",
-    .internal_name = "none",
-    .flags         = 0,
-    .local         = 0,
-    .init          = NULL,
-    .close         = NULL,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-static const device_t sound_internal_device = {
-    .name          = "Internal",
-    .internal_name = "internal",
-    .flags         = 0,
-    .local         = 0,
-    .init          = NULL,
-    .close         = NULL,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
 static const SOUND_CARD sound_cards[] = {
     // clang-format off
-    { &sound_none_device         },
-    { &sound_internal_device     },
-    { &acermagic_s20_device      },
-    { &mirosound_pcm10_device    },
-    { &adlib_device              },
-    { &adgold_device             },
-    { &azt2316a_device           },
-    { &azt1605_device            },
-    { &cms_device                },
-    { &cs4235_device             },
-    { &cs4236b_device            },
-    { &gus_device                },
-    { &sb_1_device               },
-    { &sb_15_device              },
-    { &sb_2_device               },
-    { &sb_pro_v1_device          },
-    { &sb_pro_v2_device          },
-    { &sb_16_device              },
-    { &sb_16_pnp_device          },
-    { &sb_32_pnp_device          },
-    { &sb_awe32_device           },
-    { &sb_awe32_pnp_device       },
-    { &sb_awe64_value_device     },
-    { &sb_awe64_device           },
-    { &sb_awe64_gold_device      },
-    { &sb_vibra16c_device        },
-    { &sb_vibra16s_device        },
-    { &sb_vibra16xv_device       },
-    { &ssi2001_device            },
-#if defined(DEV_BRANCH) && defined(USE_PAS16)
-    { &pas16_device              },
+    { &device_none                  },
+    { &device_internal              },
+    /* ISA */
+    { &adgold_device                },
+    { &cms_device                   },
+    { &ess_688_device               },
+    { &ess_ess0100_pnp_device       },
+    { &ess_1688_device              },
+    { &ess_ess0102_pnp_device       },
+    { &ess_ess0968_pnp_device       },
+    { &ssi2001_device               },
+    { &mmb_device                   },
+    { &pasplus_device               },
+    { &voicemasterkey_device        },
+    { &soundmasterplus_device       },
+    { &soundman_device              },
+    { &isadacr0_device              },
+    { &isadacr1_device              },
+    { &sb_1_device                  },
+    { &sb_15_device                 },
+    { &sb_2_device                  },
+    { &sb_pro_v1_device             },
+    { &sb_pro_v2_device             },
+    { &entertainer_device           },
+    { &pssj_isa_device              },
+    { &tndy_device                  },
+#ifdef USE_LIBSERIALPORT /*The following devices required LIBSERIALPORT*/
+    { &opl2board_device             },
 #endif
-    { &pssj_isa_device           },
-    { &tndy_device               },
-    { &wss_device                },
-    { &adlib_mca_device          },
-    { &ncr_business_audio_device },
-    { &sb_mcv_device             },
-    { &sb_pro_mcv_device         },
-    { &sb_16_reply_mca_device    },
-    { &cmi8338_device            },
-    { &cmi8738_device            },
-    { &es1371_device             },
-    { &ad1881_device             },
-    { &cs4297a_device            },
-    { NULL                       }
+    /* ISA/Sidecar */
+    { &adlib_device                 },
+    /* ISA16 */
+    { &acermagic_s20_device         },
+    { &azt2316a_device              },
+    { &azt1605_device               },
+    { &sb_goldfinch_device          },
+    { &cs4235_device                },
+    { &cs4236b_device               },
+    { &gus_device                   },
+    { &gus_max_device               },
+    { &mirosound_pcm10_device       },
+    { &pas16_device                 },
+    { &pas16d_device                },
+    { &sb_16_device                 },
+    { &sb_16_pnp_device             },
+    { &sb_16_pnp_ide_device         },
+    { &sb_32_pnp_device             },
+    { &sb_awe32_device              },
+    { &sb_awe32_pnp_device          },
+    { &sb_awe64_value_device        },
+    { &sb_awe64_device              },
+    { &sb_awe64_ide_device          },
+    { &sb_awe64_gold_device         },
+    { &sb_vibra16c_device           },
+    { &sb_vibra16cl_device          },
+    { &sb_vibra16s_device           },
+    { &sb_vibra16xv_device          },
+    { &wss_device                   },
+    /* MCA */
+    { &adlib_mca_device             },
+    { &ess_chipchat_16_mca_device   },
+    { &ncr_business_audio_device    },
+    { &sb_mcv_device                },
+    { &sb_pro_mcv_device            },
+    { &sb_16_reply_mca_device       },
+    { &ess_soundpiper_16_mca_device },
+    { &ess_soundpiper_32_mca_device },
+    /* PCI */
+    { &cmi8338_device               },
+    { &cmi8738_device               },
+    { &es1370_device                },
+    { &es1371_device                },
+    { &es1373_device                },
+    { &ct5880_device                },
+    /* AC97 */
+    { &ad1881_device                },
+    { &cs4297a_device               },
+    { NULL                          }
     // clang-format on
 };
 
@@ -197,7 +217,7 @@ sound_card_getdevice(int card)
 int
 sound_card_has_config(int card)
 {
-    if (!sound_cards[card].device)
+    if (sound_cards[card].device == NULL)
         return 0;
     return device_has_config(sound_cards[card].device) ? 1 : 0;
 }
@@ -225,14 +245,9 @@ sound_card_get_from_internal_name(const char *s)
 void
 sound_card_init(void)
 {
-    if ((sound_card_current[0] > SOUND_INTERNAL) && (sound_cards[sound_card_current[0]].device))
-        device_add(sound_cards[sound_card_current[0]].device);
-    if ((sound_card_current[1] > SOUND_INTERNAL) && (sound_cards[sound_card_current[1]].device))
-        device_add(sound_cards[sound_card_current[1]].device);
-    if ((sound_card_current[2] > SOUND_INTERNAL) && (sound_cards[sound_card_current[2]].device))
-        device_add(sound_cards[sound_card_current[2]].device);
-    if ((sound_card_current[3] > SOUND_INTERNAL) && (sound_cards[sound_card_current[3]].device))
-        device_add(sound_cards[sound_card_current[3]].device);
+    for (uint8_t i = 0; i < SOUND_CARD_MAX; i++)
+        if ((sound_card_current[i] > SOUND_INTERNAL) && (sound_cards[sound_card_current[i]].device))
+            device_add_inst(sound_cards[sound_card_current[i]].device, i + 1);
 }
 
 void
@@ -254,9 +269,7 @@ sound_cd_clean_buffers(void)
 static void
 sound_cd_thread(UNUSED(void *param))
 {
-    uint32_t lba;
-    int      r;
-    int      pre;
+    int      temp_buffer[2];
     int      channel_select[2];
     double   audio_vol_l;
     double   audio_vol_r;
@@ -273,95 +286,92 @@ sound_cd_thread(UNUSED(void *param))
 
         sound_cd_clean_buffers();
 
+        temp_buffer[0] = temp_buffer[1] = 0;
+
         for (uint8_t i = 0; i < CDROM_NUM; i++) {
-            if ((cdrom[i].bus_type == CDROM_BUS_DISABLED) || (cdrom[i].cd_status == CD_STATUS_EMPTY))
+            /* Just in case the thread is in a loop when it gets terminated. */
+            if (!cdaudioon)
+                break;
+
+            if ((cdrom[i].bus_type == CDROM_BUS_DISABLED) ||
+                (cdrom[i].cd_status != CD_STATUS_PLAYING))
                 continue;
-            lba = cdrom[i].seek_pos;
-            r   = cdrom_audio_callback(&(cdrom[i]), cd_buffer[i], CD_BUFLEN * 2);
-            if (!cdrom[i].bus_type || !cdrom[i].sound_on || !r)
-                continue;
-            pre = cdrom_is_pre(&(cdrom[i]), lba);
+            const int ret = cdrom_audio_callback(&(cdrom[i]), cd_buffer[i],
+                                                 CD_BUFLEN * 2);
 
-            if (cdrom[i].get_volume) {
-                audio_vol_l = (float) (cdrom[i].get_volume(cdrom[i].priv, 0));
-                audio_vol_r = (float) (cdrom[i].get_volume(cdrom[i].priv, 1));
-            } else {
-                audio_vol_l = 255.0;
-                audio_vol_r = 255.0;
-            }
-
-            /* Calculate attenuation per the specification. */
-            if (audio_vol_l >= 255.0)
-                audio_vol_l = 1.0;
-            else if (audio_vol_l > 0.0)
-                audio_vol_l = (48.0 + (20.0 * log(audio_vol_l / 256.0))) / 48.0;
-            else
-                audio_vol_l = 0.0;
-
-            if (audio_vol_r >= 255.0)
-                audio_vol_r = 1.0;
-            else if (audio_vol_r > 0.0)
-                audio_vol_r = (48.0 + (20.0 * log(audio_vol_r / 256.0))) / 48.0;
-            else
-                audio_vol_r = 0.0;
-
-            if (cdrom[i].get_channel) {
-                channel_select[0] = cdrom[i].get_channel(cdrom[i].priv, 0);
-                channel_select[1] = cdrom[i].get_channel(cdrom[i].priv, 1);
-            } else {
-                channel_select[0] = 1;
-                channel_select[1] = 2;
-            }
-
-            for (uint16_t c = 0; c < CD_BUFLEN * 2; c += 2) {
-                /*Apply ATAPI channel select*/
-                cd_buffer_temp[0] = cd_buffer_temp[1] = 0.0;
-
-                if ((audio_vol_l != 0.0) && (channel_select[0] != 0)) {
-                    if (channel_select[0] & 1)
-                        cd_buffer_temp[0] += ((double) cd_buffer[i][c]); /* Channel 0 => Port 0 */
-                    if (channel_select[0] & 2)
-                        cd_buffer_temp[0] += ((double) cd_buffer[i][c + 1]); /* Channel 1 => Port 0 */
-
-                    cd_buffer_temp[0] *= audio_vol_l; /* Multiply Port 0 by Port 0 volume */
-
-                    if (pre)
-                        cd_buffer_temp[0] = deemph_iir(0, cd_buffer_temp[0]); /* De-emphasize if necessary */
-                }
-
-                if ((audio_vol_r != 0.0) && (channel_select[1] != 0)) {
-                    if (channel_select[1] & 1)
-                        cd_buffer_temp[1] += ((double) cd_buffer[i][c]); /* Channel 0 => Port 1 */
-                    if (channel_select[1] & 2)
-                        cd_buffer_temp[1] += ((double) cd_buffer[i][c + 1]); /* Channel 1 => Port 1 */
-
-                    cd_buffer_temp[1] *= audio_vol_r; /* Multiply Port 1 by Port 1 volume */
-
-                    if (pre)
-                        cd_buffer_temp[1] = deemph_iir(1, cd_buffer_temp[1]); /* De-emphasize if necessary */
-                }
-
-                /* Apply sound card CD volume and filters */
-                if (filter_cd_audio != NULL) {
-                    filter_cd_audio(0, &(cd_buffer_temp[0]), filter_cd_audio_p);
-                    filter_cd_audio(1, &(cd_buffer_temp[1]), filter_cd_audio_p);
-                }
-
-                if (sound_is_float) {
-                    cd_out_buffer[c] += (float) (cd_buffer_temp[0] / 32768.0);
-                    cd_out_buffer[c + 1] += (float) (cd_buffer_temp[1] / 32768.0);
+            if (ret) {
+                if (cdrom[i].get_volume) {
+                    audio_vol_l = cd_audio_volume_lut[cdrom[i].get_volume(cdrom[i].priv, 0)];
+                    audio_vol_r = cd_audio_volume_lut[cdrom[i].get_volume(cdrom[i].priv, 1)];
                 } else {
-                    if (cd_buffer_temp[0] > 32767)
-                        cd_buffer_temp[0] = 32767;
-                    if (cd_buffer_temp[0] < -32768)
-                        cd_buffer_temp[0] = -32768;
-                    if (cd_buffer_temp[1] > 32767)
-                        cd_buffer_temp[1] = 32767;
-                    if (cd_buffer_temp[1] < -32768)
-                        cd_buffer_temp[1] = -32768;
+                    audio_vol_l = cd_audio_volume_lut[255];
+                    audio_vol_r = cd_audio_volume_lut[255];
+                }
 
-                    cd_out_buffer_int16[c] += (int16_t) cd_buffer_temp[0];
-                    cd_out_buffer_int16[c + 1] += (int16_t) cd_buffer_temp[1];
+                if (cdrom[i].get_channel) {
+                    channel_select[0] = (int) cdrom[i].get_channel(cdrom[i].priv, 0);
+                    channel_select[1] = (int) cdrom[i].get_channel(cdrom[i].priv, 1);
+                } else {
+                    channel_select[0] = 1;
+                    channel_select[1] = 2;
+                }
+
+                // uint16_t *cddab = (uint16_t *) cdrom[i].raw_buffer;
+                for (int c = 0; c < CD_BUFLEN * 2; c += 2) {
+                    /* Apply ATAPI channel select */
+                    cd_buffer_temp[0] = cd_buffer_temp[1] = 0.0;
+
+                    if ((audio_vol_l != 0.0) && (channel_select[0] != 0)) {
+                        if (channel_select[0] & 1)
+                            /* Channel 0 => Port 0 */
+                            cd_buffer_temp[0] += ((double) cd_buffer[i][c]);
+                        if (channel_select[0] & 2)
+                            /* Channel 1 => Port 0 */
+                            cd_buffer_temp[0] += ((double) cd_buffer[i][c + 1]);
+
+                        /* Multiply Port 0 by Port 0 volume */
+                        cd_buffer_temp[0] *= audio_vol_l;
+                    }
+
+                    if ((audio_vol_r != 0.0) && (channel_select[1] != 0)) {
+                        if (channel_select[1] & 1)
+                            /* Channel 0 => Port 1 */
+                            cd_buffer_temp[1] += ((double) cd_buffer[i][c]);
+                        if (channel_select[1] & 2)
+                            /* Channel 1 => Port 1 */
+                            cd_buffer_temp[1] += ((double) cd_buffer[i][c + 1]);
+
+                        /* Multiply Port 1 by Port 1 volume */
+                        cd_buffer_temp[1] *= audio_vol_r;
+                    }
+
+                    /* Apply sound card CD volume and filters */
+                    if (filter_cd_audio != NULL) {
+                        filter_cd_audio(0, &(cd_buffer_temp[0]),
+                                        filter_cd_audio_p);
+                        filter_cd_audio(1, &(cd_buffer_temp[1]),
+                                        filter_cd_audio_p);
+                    }
+
+                    if (sound_is_float) {
+                        cd_out_buffer[c] += (float) (cd_buffer_temp[0] / 32768.0);
+                        cd_out_buffer[c + 1] += (float) (cd_buffer_temp[1] / 32768.0);
+                    } else {
+                        temp_buffer[0] = (int) trunc(cd_buffer_temp[0]);
+                        temp_buffer[1] = (int) trunc(cd_buffer_temp[1]);
+
+                        if (temp_buffer[0] > 32767)
+                            temp_buffer[0] = 32767;
+                        if (temp_buffer[0] < -32768)
+                            temp_buffer[0] = -32768;
+                        if (temp_buffer[1] > 32767)
+                            temp_buffer[1] = 32767;
+                        if (temp_buffer[1] < -32768)
+                            temp_buffer[1] = -32768;
+
+                        cd_out_buffer_int16[c]     += (int16_t) temp_buffer[0];
+                        cd_out_buffer_int16[c + 1] += (int16_t) temp_buffer[1];
+                    }
                 }
             }
         }
@@ -395,6 +405,50 @@ sound_realloc_buffers(void)
     }
 }
 
+static void
+music_realloc_buffers(void)
+{
+    if (outbuffer_m_ex != NULL) {
+        free(outbuffer_m_ex);
+        outbuffer_m_ex = NULL;
+    }
+
+    if (outbuffer_m_ex_int16 != NULL) {
+        free(outbuffer_m_ex_int16);
+        outbuffer_m_ex_int16 = NULL;
+    }
+
+    if (sound_is_float) {
+        outbuffer_m_ex = calloc(MUSICBUFLEN * 2, sizeof(float));
+        memset(outbuffer_m_ex, 0x00, MUSICBUFLEN * 2 * sizeof(float));
+    } else {
+        outbuffer_m_ex_int16 = calloc(MUSICBUFLEN * 2, sizeof(int16_t));
+        memset(outbuffer_m_ex_int16, 0x00, MUSICBUFLEN * 2 * sizeof(int16_t));
+    }
+}
+
+static void
+wavetable_realloc_buffers(void)
+{
+    if (outbuffer_w_ex != NULL) {
+        free(outbuffer_w_ex);
+        outbuffer_w_ex = NULL;
+    }
+
+    if (outbuffer_w_ex_int16 != NULL) {
+        free(outbuffer_w_ex_int16);
+        outbuffer_w_ex_int16 = NULL;
+    }
+
+    if (sound_is_float) {
+        outbuffer_w_ex = calloc(WTBUFLEN * 2, sizeof(float));
+        memset(outbuffer_w_ex, 0x00, WTBUFLEN * 2 * sizeof(float));
+    } else {
+        outbuffer_w_ex_int16 = calloc(WTBUFLEN * 2, sizeof(int16_t));
+        memset(outbuffer_w_ex_int16, 0x00, WTBUFLEN * 2 * sizeof(int16_t));
+    }
+}
+
 void
 sound_init(void)
 {
@@ -403,10 +457,37 @@ sound_init(void)
     outbuffer_ex       = NULL;
     outbuffer_ex_int16 = NULL;
 
+    outbuffer_m_ex       = NULL;
+    outbuffer_m_ex_int16 = NULL;
+
+    outbuffer_w_ex       = NULL;
+    outbuffer_w_ex_int16 = NULL;
+
     outbuffer = NULL;
     outbuffer = calloc(SOUNDBUFLEN * 2, sizeof(int32_t));
     memset(outbuffer, 0x00, SOUNDBUFLEN * 2 * sizeof(int32_t));
 
+    outbuffer_m = NULL;
+    outbuffer_m = calloc(MUSICBUFLEN * 2, sizeof(int32_t));
+    memset(outbuffer_m, 0x00, MUSICBUFLEN * 2 * sizeof(int32_t));
+
+    outbuffer_w = NULL;
+    outbuffer_w = calloc(WTBUFLEN * 2, sizeof(int32_t));
+    memset(outbuffer_w, 0x00, WTBUFLEN * 2 * sizeof(int32_t));
+
+    for (uint16_t i = 0; i < 256; i++) {
+        double di = (double) i;
+
+        if (di >= 255.0)
+            di = 1.0;
+        else if (di > 0.0)
+            di = (48.0 + (20.0 * log(di / 256.0))) / 48.0;
+        else
+            di = 0.0;
+
+        cd_audio_volume_lut[i] = di;
+    }
+
     for (uint8_t i = 0; i < CDROM_NUM; i++) {
         if (cdrom[i].bus_type != CDROM_BUS_DISABLED)
             available_cdrom_drives++;
@@ -438,6 +519,22 @@ sound_add_handler(void (*get_buffer)(int32_t *buffer, int len, void *priv), void
     sound_handlers_num++;
 }
 
+void
+music_add_handler(void (*get_buffer)(int32_t *buffer, int len, void *priv), void *priv)
+{
+    music_handlers[music_handlers_num].get_buffer = get_buffer;
+    music_handlers[music_handlers_num].priv       = priv;
+    music_handlers_num++;
+}
+
+void
+wavetable_add_handler(void (*get_buffer)(int32_t *buffer, int len, void *priv), void *priv)
+{
+    wavetable_handlers[wavetable_handlers_num].get_buffer = get_buffer;
+    wavetable_handlers[wavetable_handlers_num].priv       = priv;
+    wavetable_handlers_num++;
+}
+
 void
 sound_set_cd_audio_filter(void (*filter)(int channel, double *buffer, void *priv), void *priv)
 {
@@ -481,7 +578,7 @@ sound_poll(UNUSED(void *priv))
                 if (outbuffer[c] < -32768)
                     outbuffer[c] = -32768;
 
-                outbuffer_ex_int16[c] = outbuffer[c];
+                outbuffer_ex_int16[c] = (int16_t) outbuffer[c];
             }
         }
 
@@ -502,10 +599,86 @@ sound_poll(UNUSED(void *priv))
     }
 }
 
+void
+music_poll(UNUSED(void *priv))
+{
+    timer_advance_u64(&music_poll_timer, music_poll_latch);
+
+    music_pos_global++;
+    if (music_pos_global == MUSICBUFLEN) {
+        int c;
+
+        memset(outbuffer_m, 0x00, MUSICBUFLEN * 2 * sizeof(int32_t));
+
+        for (c = 0; c < music_handlers_num; c++)
+            music_handlers[c].get_buffer(outbuffer_m, MUSICBUFLEN, music_handlers[c].priv);
+
+        for (c = 0; c < MUSICBUFLEN * 2; c++) {
+            if (sound_is_float)
+                outbuffer_m_ex[c] = ((float) outbuffer_m[c]) / (float) 32768.0;
+            else {
+                if (outbuffer_m[c] > 32767)
+                    outbuffer_m[c] = 32767;
+                if (outbuffer_m[c] < -32768)
+                    outbuffer_m[c] = -32768;
+
+                outbuffer_m_ex_int16[c] = (int16_t) outbuffer_m[c];
+            }
+        }
+
+        if (sound_is_float)
+            givealbuffer_music(outbuffer_m_ex);
+        else
+            givealbuffer_music(outbuffer_m_ex_int16);
+
+        music_pos_global = 0;
+    }
+}
+
+void
+wavetable_poll(UNUSED(void *priv))
+{
+    timer_advance_u64(&wavetable_poll_timer, wavetable_poll_latch);
+
+    wavetable_pos_global++;
+    if (wavetable_pos_global == WTBUFLEN) {
+        int c;
+
+        memset(outbuffer_w, 0x00, WTBUFLEN * 2 * sizeof(int32_t));
+
+        for (c = 0; c < wavetable_handlers_num; c++)
+            wavetable_handlers[c].get_buffer(outbuffer_w, WTBUFLEN, wavetable_handlers[c].priv);
+
+        for (c = 0; c < WTBUFLEN * 2; c++) {
+            if (sound_is_float)
+                outbuffer_w_ex[c] = ((float) outbuffer_w[c]) / (float) 32768.0;
+            else {
+                if (outbuffer_w[c] > 32767)
+                    outbuffer_w[c] = 32767;
+                if (outbuffer_w[c] < -32768)
+                    outbuffer_w[c] = -32768;
+
+                outbuffer_w_ex_int16[c] = (int16_t) outbuffer_w[c];
+            }
+        }
+
+        if (sound_is_float)
+            givealbuffer_wt(outbuffer_w_ex);
+        else
+            givealbuffer_wt(outbuffer_w_ex_int16);
+
+        wavetable_pos_global = 0;
+    }
+}
+
 void
 sound_speed_changed(void)
 {
     sound_poll_latch = (uint64_t) ((double) TIMER_USEC * (1000000.0 / (double) SOUND_FREQ));
+
+    music_poll_latch = (uint64_t) ((double) TIMER_USEC * (1000000.0 / (double) MUSIC_FREQ));
+
+    wavetable_poll_latch = (uint64_t) ((double) TIMER_USEC * (1000000.0 / (double) WT_FREQ));
 }
 
 void
@@ -513,6 +686,10 @@ sound_reset(void)
 {
     sound_realloc_buffers();
 
+    music_realloc_buffers();
+
+    wavetable_realloc_buffers();
+
     midi_out_device_init();
     midi_in_device_init();
 
@@ -523,6 +700,16 @@ sound_reset(void)
     sound_handlers_num = 0;
     memset(sound_handlers, 0x00, 8 * sizeof(sound_handler_t));
 
+    timer_add(&music_poll_timer, music_poll, NULL, 1);
+
+    music_handlers_num = 0;
+    memset(music_handlers, 0x00, 8 * sizeof(sound_handler_t));
+
+    timer_add(&wavetable_poll_timer, wavetable_poll, NULL, 1);
+
+    wavetable_handlers_num = 0;
+    memset(wavetable_handlers, 0x00, 8 * sizeof(sound_handler_t));
+
     filter_cd_audio   = NULL;
     filter_cd_audio_p = NULL;
 
diff --git a/src/sound/xaudio2.c b/src/sound/xaudio2.c
index 0d9e7d909..2aee97efc 100644
--- a/src/sound/xaudio2.c
+++ b/src/sound/xaudio2.c
@@ -51,6 +51,8 @@ static int                     initialized   = 0;
 static IXAudio2               *xaudio2       = NULL;
 static IXAudio2MasteringVoice *mastervoice   = NULL;
 static IXAudio2SourceVoice    *srcvoice      = NULL;
+static IXAudio2SourceVoice    *srcvoicemusic = NULL;
+static IXAudio2SourceVoice    *srcvoicewt    = NULL;
 static IXAudio2SourceVoice    *srcvoicemidi  = NULL;
 static IXAudio2SourceVoice    *srcvoicecd    = NULL;
 
@@ -164,24 +166,38 @@ inital(void)
         return;
     }
 
+    fmt.nSamplesPerSec  = MUSIC_FREQ;
+    fmt.nBlockAlign     = fmt.nChannels * fmt.wBitsPerSample / 8;
+    fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign;
+
+    (void) IXAudio2_CreateSourceVoice(xaudio2, &srcvoicemusic, &fmt, 0, 2.0f, &callbacks, NULL, NULL);
+
+    fmt.nSamplesPerSec  = WT_FREQ;
+    fmt.nBlockAlign     = fmt.nChannels * fmt.wBitsPerSample / 8;
+    fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign;
+
+    (void) IXAudio2_CreateSourceVoice(xaudio2, &srcvoicewt, &fmt, 0, 2.0f, &callbacks, NULL, NULL);
+
     fmt.nSamplesPerSec  = CD_FREQ;
     fmt.nBlockAlign     = fmt.nChannels * fmt.wBitsPerSample / 8;
     fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign;
 
-    IXAudio2_CreateSourceVoice(xaudio2, &srcvoicecd, &fmt, 0, 2.0f, &callbacks, NULL, NULL);
+    (void) IXAudio2_CreateSourceVoice(xaudio2, &srcvoicecd, &fmt, 0, 2.0f, &callbacks, NULL, NULL);
 
-    IXAudio2SourceVoice_SetVolume(srcvoice, 1, XAUDIO2_COMMIT_NOW);
-    IXAudio2SourceVoice_Start(srcvoice, 0, XAUDIO2_COMMIT_NOW);
-    IXAudio2SourceVoice_Start(srcvoicecd, 0, XAUDIO2_COMMIT_NOW);
+    (void) IXAudio2SourceVoice_SetVolume(srcvoice, 1, XAUDIO2_COMMIT_NOW);
+    (void) IXAudio2SourceVoice_Start(srcvoice, 0, XAUDIO2_COMMIT_NOW);
+    (void) IXAudio2SourceVoice_Start(srcvoicecd, 0, XAUDIO2_COMMIT_NOW);
+    (void) IXAudio2SourceVoice_Start(srcvoicemusic, 0, XAUDIO2_COMMIT_NOW);
+    (void) IXAudio2SourceVoice_Start(srcvoicewt, 0, XAUDIO2_COMMIT_NOW);
 
     const char *mdn = midi_out_device_get_internal_name(midi_output_device_current);
 
-    if (strcmp(mdn, "none") && strcmp(mdn, SYSTEM_MIDI_INTERNAL_NAME)) {
+    if ((strcmp(mdn, "none") != 0) && (strcmp(mdn, SYSTEM_MIDI_INTERNAL_NAME) != 0)) {
         fmt.nSamplesPerSec  = midi_freq;
         fmt.nBlockAlign     = fmt.nChannels * fmt.wBitsPerSample / 8;
         fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign;
-        IXAudio2_CreateSourceVoice(xaudio2, &srcvoicemidi, &fmt, 0, 2.0f, &callbacks, NULL, NULL);
-        IXAudio2SourceVoice_Start(srcvoicemidi, 0, XAUDIO2_COMMIT_NOW);
+        (void) IXAudio2_CreateSourceVoice(xaudio2, &srcvoicemidi, &fmt, 0, 2.0f, &callbacks, NULL, NULL);
+        (void) IXAudio2SourceVoice_Start(srcvoicemidi, 0, XAUDIO2_COMMIT_NOW);
     }
 
     initialized = 1;
@@ -194,17 +210,23 @@ closeal(void)
     if (!initialized)
         return;
     initialized = 0;
-    IXAudio2SourceVoice_Stop(srcvoice, 0, XAUDIO2_COMMIT_NOW);
-    IXAudio2SourceVoice_FlushSourceBuffers(srcvoice);
-    IXAudio2SourceVoice_Stop(srcvoicecd, 0, XAUDIO2_COMMIT_NOW);
-    IXAudio2SourceVoice_FlushSourceBuffers(srcvoicecd);
+    (void) IXAudio2SourceVoice_Stop(srcvoice, 0, XAUDIO2_COMMIT_NOW);
+    (void) IXAudio2SourceVoice_FlushSourceBuffers(srcvoice);
+    (void) IXAudio2SourceVoice_Stop(srcvoicemusic, 0, XAUDIO2_COMMIT_NOW);
+    (void) IXAudio2SourceVoice_FlushSourceBuffers(srcvoicemusic);
+    (void) IXAudio2SourceVoice_Stop(srcvoicewt, 0, XAUDIO2_COMMIT_NOW);
+    (void) IXAudio2SourceVoice_FlushSourceBuffers(srcvoicewt);
+    (void) IXAudio2SourceVoice_Stop(srcvoicecd, 0, XAUDIO2_COMMIT_NOW);
+    (void) IXAudio2SourceVoice_FlushSourceBuffers(srcvoicecd);
     if (srcvoicemidi) {
-        IXAudio2SourceVoice_Stop(srcvoicemidi, 0, XAUDIO2_COMMIT_NOW);
-        IXAudio2SourceVoice_FlushSourceBuffers(srcvoicemidi);
+        (void) IXAudio2SourceVoice_Stop(srcvoicemidi, 0, XAUDIO2_COMMIT_NOW);
+        (void) IXAudio2SourceVoice_FlushSourceBuffers(srcvoicemidi);
         IXAudio2SourceVoice_DestroyVoice(srcvoicemidi);
     }
-    IXAudio2SourceVoice_DestroyVoice(srcvoice);
+    IXAudio2SourceVoice_DestroyVoice(srcvoicewt);
     IXAudio2SourceVoice_DestroyVoice(srcvoicecd);
+    IXAudio2SourceVoice_DestroyVoice(srcvoicemusic);
+    IXAudio2SourceVoice_DestroyVoice(srcvoice);
     IXAudio2MasteringVoice_DestroyVoice(mastervoice);
     IXAudio2_Release(xaudio2);
     srcvoice = srcvoicecd = srcvoicemidi = NULL;
@@ -218,12 +240,13 @@ closeal(void)
 }
 
 void
-givealbuffer_common(void *buf, IXAudio2SourceVoice *sourcevoice, size_t buflen)
+givealbuffer_common(const void *buf, IXAudio2SourceVoice *sourcevoice, const size_t buflen)
 {
     if (!initialized)
         return;
 
-    IXAudio2MasteringVoice_SetVolume(mastervoice, pow(10.0, (double) sound_gain / 20.0), XAUDIO2_COMMIT_NOW);
+    (void) IXAudio2MasteringVoice_SetVolume(mastervoice, sound_muted ? 0.0 : pow(10.0, (double) sound_gain / 20.0),
+                                            XAUDIO2_COMMIT_NOW);
     XAUDIO2_BUFFER buffer = { 0 };
     buffer.Flags          = 0;
     if (sound_is_float) {
@@ -240,31 +263,43 @@ givealbuffer_common(void *buf, IXAudio2SourceVoice *sourcevoice, size_t buflen)
     buffer.PlayBegin = buffer.PlayLength = 0;
     buffer.PlayLength                    = buflen >> 1;
     buffer.pContext                      = (void *) buffer.pAudioData;
-    IXAudio2SourceVoice_SubmitSourceBuffer(sourcevoice, &buffer, NULL);
+    (void) IXAudio2SourceVoice_SubmitSourceBuffer(sourcevoice, &buffer, NULL);
 }
 
 void
-givealbuffer(void *buf)
+givealbuffer(const void *buf)
 {
     givealbuffer_common(buf, srcvoice, BUFLEN << 1);
 }
 
 void
-givealbuffer_cd(void *buf)
+givealbuffer_music(const void *buf)
+{
+    givealbuffer_common(buf, srcvoicemusic, MUSICBUFLEN << 1);
+}
+
+void
+givealbuffer_wt(const void *buf)
+{
+    givealbuffer_common(buf, srcvoicewt, WTBUFLEN << 1);
+}
+
+void
+givealbuffer_cd(const void *buf)
 {
     if (srcvoicecd)
         givealbuffer_common(buf, srcvoicecd, CD_BUFLEN << 1);
 }
 
 void
-al_set_midi(int freq, int buf_size)
+al_set_midi(const int freq, const int buf_size)
 {
     midi_freq     = freq;
     midi_buf_size = buf_size;
 
     if (initialized && srcvoicemidi) {
-        IXAudio2SourceVoice_Stop(srcvoicemidi, 0, XAUDIO2_COMMIT_NOW);
-        IXAudio2SourceVoice_FlushSourceBuffers(srcvoicemidi);
+        (void) IXAudio2SourceVoice_Stop(srcvoicemidi, 0, XAUDIO2_COMMIT_NOW);
+        (void) IXAudio2SourceVoice_FlushSourceBuffers(srcvoicemidi);
         IXAudio2SourceVoice_DestroyVoice(srcvoicemidi);
         srcvoicemidi = NULL;
         WAVEFORMATEX fmt;
@@ -280,13 +315,13 @@ al_set_midi(int freq, int buf_size)
         fmt.nBlockAlign     = fmt.nChannels * fmt.wBitsPerSample / 8;
         fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign;
         fmt.cbSize          = 0;
-        IXAudio2_CreateSourceVoice(xaudio2, &srcvoicemidi, &fmt, 0, 2.0f, &callbacks, NULL, NULL);
-        IXAudio2SourceVoice_Start(srcvoicemidi, 0, XAUDIO2_COMMIT_NOW);
+        (void) IXAudio2_CreateSourceVoice(xaudio2, &srcvoicemidi, &fmt, 0, 2.0f, &callbacks, NULL, NULL);
+        (void) IXAudio2SourceVoice_Start(srcvoicemidi, 0, XAUDIO2_COMMIT_NOW);
     }
 }
 
 void
-givealbuffer_midi(void *buf, uint32_t size)
+givealbuffer_midi(const void *buf, const uint32_t size)
 {
     givealbuffer_common(buf, srcvoicemidi, size);
 }
diff --git a/src/sound/ymfm/CMakeLists.txt b/src/sound/ymfm/CMakeLists.txt
index e1ff35369..fcc07093f 100644
--- a/src/sound/ymfm/CMakeLists.txt
+++ b/src/sound/ymfm/CMakeLists.txt
@@ -9,4 +9,14 @@
 #          CMake build script.
 #
 
-add_library(ymfm STATIC ymfm_misc.cpp ymfm_opl.cpp ymfm_opm.cpp ymfm_opn.cpp ymfm_opq.cpp ymfm_opz.cpp ymfm_pcm.cpp ymfm_adpcm.cpp)
\ No newline at end of file
+add_library(ymfm STATIC
+    ymfm_adpcm.cpp
+    ymfm_misc.cpp
+    ymfm_opl.cpp
+    ymfm_opm.cpp
+    ymfm_opn.cpp
+    ymfm_opq.cpp
+    ymfm_opz.cpp
+    ymfm_pcm.cpp
+    ymfm_ssg.cpp
+)
diff --git a/src/sound/ymfm/ymfm.h b/src/sound/ymfm/ymfm.h
index 4f8ba1243..062247a82 100644
--- a/src/sound/ymfm/ymfm.h
+++ b/src/sound/ymfm/ymfm.h
@@ -42,12 +42,11 @@
 #include <cstdio>
 #include <cstring>
 #include <algorithm>
+#include <array>
 #include <memory>
 #include <string>
 #include <vector>
 
-#define SNPRINTF_BUFFER_SIZE_CALC (256 - (end - &buffer[0]))
-
 namespace ymfm
 {
 
@@ -111,17 +110,6 @@ inline int32_t clamp(int32_t value, int32_t minval, int32_t maxval)
 }
 
 
-//-------------------------------------------------
-//  array_size - return the size of an array
-//-------------------------------------------------
-
-template<typename ArrayType, int ArraySize>
-constexpr uint32_t array_size(ArrayType (&array)[ArraySize])
-{
-	return ArraySize;
-}
-
-
 //-------------------------------------------------
 //  count_leading_zeros - return the number of
 //  leading zeros in a 32-bit value; CPU-optimized
@@ -256,7 +244,8 @@ inline int16_t roundtrip_fp(int32_t value)
 
 	// apply the shift back and forth to zero out bits that are lost
 	exponent -= 1;
-	return (value >> exponent) << exponent;
+    int32_t mask = (1 << exponent) - 1;
+	return value & ~mask;
 }
 
 
@@ -352,7 +341,7 @@ public:
 		{
 			// create file
 			char name[20];
-                        snprintf(name, sizeof(name), "wavlog-%02d.wav", m_index);
+			snprintf(&name[0], sizeof(name), "wavlog-%02d.wav", m_index);
 			FILE *out = fopen(name, "wb");
 
 			// make the wav file header
@@ -485,6 +474,8 @@ public:
 class ymfm_engine_callbacks
 {
 public:
+	virtual ~ymfm_engine_callbacks() = default;
+
 	// timer callback; called by the interface when a timer fires
 	virtual void engine_timer_expired(uint32_t tnum) = 0;
 
@@ -506,6 +497,8 @@ class ymfm_interface
 	template<typename RegisterType> friend class fm_engine_base;
 
 public:
+	virtual ~ymfm_interface() = default;
+
 	// the following functions must be implemented by any derived classes; the
 	// default implementations are sufficient for some minimal operation, but will
 	// likely need to be overridden to integrate with the outside world; they are
diff --git a/src/sound/ymfm/ymfm_fm.h b/src/sound/ymfm/ymfm_fm.h
index 81795f8fe..d40409fdd 100644
--- a/src/sound/ymfm/ymfm_fm.h
+++ b/src/sound/ymfm/ymfm_fm.h
@@ -267,7 +267,7 @@ public:
 	// assign operators
 	void assign(uint32_t index, fm_operator<RegisterType> *op)
 	{
-		assert(index < array_size(m_op));
+		assert(index < m_op.size());
 		m_op[index] = op;
 		if (op != nullptr)
 			op->set_choffs(m_choffs);
@@ -330,7 +330,7 @@ private:
 	uint32_t m_choffs;                     // channel offset in registers
 	int16_t m_feedback[2];                 // feedback memory for operator 1
 	mutable int16_t m_feedback_in;         // next input value for op 1 feedback (set in output)
-	fm_operator<RegisterType> *m_op[4];    // up to 4 operators
+	std::array<fm_operator<RegisterType> *, 4> m_op; // up to 4 operators
 	RegisterType &m_regs;                  // direct reference to registers
 	fm_engine_base<RegisterType> &m_owner; // reference to the owning engine
 };
diff --git a/src/sound/ymfm/ymfm_fm.ipp b/src/sound/ymfm/ymfm_fm.ipp
index 55cdd643d..f2ec83945 100644
--- a/src/sound/ymfm/ymfm_fm.ipp
+++ b/src/sound/ymfm/ymfm_fm.ipp
@@ -839,12 +839,12 @@ void fm_channel<RegisterType>::save_restore(ymfm_saved_state &state)
 template<class RegisterType>
 void fm_channel<RegisterType>::keyonoff(uint32_t states, keyon_type type, uint32_t chnum)
 {
-	for (uint32_t opnum = 0; opnum < array_size(m_op); opnum++)
+	for (uint32_t opnum = 0; opnum < m_op.size(); opnum++)
 		if (m_op[opnum] != nullptr)
 			m_op[opnum]->keyonoff(bitfield(states, opnum), type);
 
 	if (debug::LOG_KEYON_EVENTS && ((debug::GLOBAL_FM_CHANNEL_MASK >> chnum) & 1) != 0)
-		for (uint32_t opnum = 0; opnum < array_size(m_op); opnum++)
+		for (uint32_t opnum = 0; opnum < m_op.size(); opnum++)
 			if (m_op[opnum] != nullptr)
 				debug::log_keyon("%c%s\n", bitfield(states, opnum) ? '+' : '-', m_regs.log_keyon(m_choffs, m_op[opnum]->opoffs()).c_str());
 }
@@ -860,7 +860,7 @@ bool fm_channel<RegisterType>::prepare()
 	uint32_t active_mask = 0;
 
 	// prepare all operators and determine if they are active
-	for (uint32_t opnum = 0; opnum < array_size(m_op); opnum++)
+	for (uint32_t opnum = 0; opnum < m_op.size(); opnum++)
 		if (m_op[opnum] != nullptr)
 			if (m_op[opnum]->prepare())
 				active_mask |= 1 << opnum;
@@ -880,7 +880,7 @@ void fm_channel<RegisterType>::clock(uint32_t env_counter, int32_t lfo_raw_pm)
 	m_feedback[0] = m_feedback[1];
 	m_feedback[1] = m_feedback_in;
 
-	for (uint32_t opnum = 0; opnum < array_size(m_op); opnum++)
+	for (uint32_t opnum = 0; opnum < m_op.size(); opnum++)
 		if (m_op[opnum] != nullptr)
 			m_op[opnum]->clock(env_counter, lfo_raw_pm);
 
@@ -888,7 +888,7 @@ void fm_channel<RegisterType>::clock(uint32_t env_counter, int32_t lfo_raw_pm)
 useful temporary code for envelope debugging
 if (m_choffs == 0x101)
 {
-	for (uint32_t opnum = 0; opnum < array_size(m_op); opnum++)
+	for (uint32_t opnum = 0; opnum < m_op.size(); opnum++)
 	{
 		auto &op = *m_op[((opnum & 1) << 1) | ((opnum >> 1) & 1)];
 		printf(" %c%03X%c%c ",
@@ -1518,15 +1518,15 @@ void fm_engine_base<RegisterType>::engine_timer_expired(uint32_t tnum)
 		for (uint32_t chnum = 0; chnum < CHANNELS; chnum++)
 			if (bitfield(RegisterType::CSM_TRIGGER_MASK, chnum))
 			{
-				m_channel[chnum]->keyonoff(1, KEYON_CSM, chnum);
+				m_channel[chnum]->keyonoff(0xf, KEYON_CSM, chnum);
 				m_modified_channels |= 1 << chnum;
 			}
 
-        // Make sure the array does not go out of bounds to keep gcc happy
-        if ((tnum < 2) || (sizeof(m_timer_running) > (2 * sizeof(uint8_t)))) {
-            // reset
-            m_timer_running[tnum] = false;
-        }
+    // Make sure the array does not go out of bounds to keep gcc happy
+    if ((tnum < 2) || (sizeof(m_timer_running) > (2 * sizeof(uint8_t)))) {
+        // reset
+        m_timer_running[tnum] = false;
+    }
 	update_timer(tnum, 1, 0);
 }
 
diff --git a/src/sound/ymfm/ymfm_opl.cpp b/src/sound/ymfm/ymfm_opl.cpp
index bb91c5dc0..8e8025fd9 100644
--- a/src/sound/ymfm/ymfm_opl.cpp
+++ b/src/sound/ymfm/ymfm_opl.cpp
@@ -386,9 +386,9 @@ std::string opl_registers_base<Revision>::log_keyon(uint32_t choffs, uint32_t op
 	uint32_t opnum = (opoffs & 31) - 2 * ((opoffs & 31) / 8) + 18 * bitfield(opoffs, 8);
 
 	char buffer[256];
-	char *end = &buffer[0];
+	int end = 0;
 
-	end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, "%2u.%02u freq=%04X fb=%u alg=%X mul=%X tl=%02X ksr=%u ns=%u ksl=%u adr=%X/%X/%X sl=%X sus=%u",
+	end += snprintf(&buffer[end], sizeof(buffer) - end, "%2u.%02u freq=%04X fb=%u alg=%X mul=%X tl=%02X ksr=%u ns=%u ksl=%u adr=%X/%X/%X sl=%X sus=%u",
 		chnum, opnum,
 		ch_block_freq(choffs),
 		ch_feedback(choffs),
@@ -405,25 +405,25 @@ std::string opl_registers_base<Revision>::log_keyon(uint32_t choffs, uint32_t op
 		op_eg_sustain(opoffs));
 
 	if (OUTPUTS > 1)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " out=%c%c%c%c",
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " out=%c%c%c%c",
 			ch_output_0(choffs) ? 'L' : '-',
 			ch_output_1(choffs) ? 'R' : '-',
 			ch_output_2(choffs) ? '0' : '-',
 			ch_output_3(choffs) ? '1' : '-');
 	if (op_lfo_am_enable(opoffs) != 0)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " am=%u", lfo_am_depth());
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " am=%u", lfo_am_depth());
 	if (op_lfo_pm_enable(opoffs) != 0)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " pm=%u", lfo_pm_depth());
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " pm=%u", lfo_pm_depth());
 	if (waveform_enable() && op_waveform(opoffs) != 0)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " wf=%u", op_waveform(opoffs));
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " wf=%u", op_waveform(opoffs));
 	if (is_rhythm(choffs))
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " rhy=1");
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " rhy=1");
 	if (DYNAMIC_OPS)
 	{
 		operator_mapping map;
 		operator_map(map);
 		if (bitfield(map.chan[chnum], 16, 8) != 0xff)
-			end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " 4op");
+			end += snprintf(&buffer[end], sizeof(buffer) - end, " 4op");
 	}
 
 	return buffer;
@@ -685,9 +685,9 @@ std::string opll_registers::log_keyon(uint32_t choffs, uint32_t opoffs)
 	uint32_t opnum = opoffs;
 
 	char buffer[256];
-	char *end = &buffer[0];
+	int end = 0;
 
-	end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, "%u.%02u freq=%04X inst=%X fb=%u mul=%X",
+	end += snprintf(&buffer[end], sizeof(buffer) - end, "%u.%02u freq=%04X inst=%X fb=%u mul=%X",
 		chnum, opnum,
 		ch_block_freq(choffs),
 		ch_instrument(choffs),
@@ -695,11 +695,11 @@ std::string opll_registers::log_keyon(uint32_t choffs, uint32_t opoffs)
 		op_multiple(opoffs));
 
 	if (bitfield(opoffs, 0) == 1 || (is_rhythm(choffs) && choffs >= 6))
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " vol=%X", op_volume(opoffs));
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " vol=%X", op_volume(opoffs));
 	else
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " tl=%02X", ch_total_level(choffs));
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " tl=%02X", ch_total_level(choffs));
 
-	end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " ksr=%u ksl=%u adr=%X/%X/%X sl=%X sus=%u/%u",
+	end += snprintf(&buffer[end], sizeof(buffer) - end, " ksr=%u ksl=%u adr=%X/%X/%X sl=%X sus=%u/%u",
 		op_ksr(opoffs),
 		op_ksl(opoffs),
 		op_attack_rate(opoffs),
@@ -710,13 +710,13 @@ std::string opll_registers::log_keyon(uint32_t choffs, uint32_t opoffs)
 		ch_sustain(choffs));
 
 	if (op_lfo_am_enable(opoffs))
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " am=1");
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " am=1");
 	if (op_lfo_pm_enable(opoffs))
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " pm=1");
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " pm=1");
 	if (op_waveform(opoffs) != 0)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " wf=1");
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " wf=1");
 	if (is_rhythm(choffs))
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " rhy=1");
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " rhy=1");
 
 	return buffer;
 }
diff --git a/src/sound/ymfm/ymfm_opl.h b/src/sound/ymfm/ymfm_opl.h
index 843e5b274..71b098e97 100644
--- a/src/sound/ymfm/ymfm_opl.h
+++ b/src/sound/ymfm/ymfm_opl.h
@@ -52,7 +52,7 @@ namespace ymfm
 //
 //      System-wide registers:
 //           01 xxxxxxxx Test register
-//              --x----- Enable OPL compatibility mode [OPL2 only] (1 = enable)
+//              --x----- Enable OPL compatibility mode [OPL2 only] (0 = enable)
 //           02 xxxxxxxx Timer A value (4 * OPN)
 //           03 xxxxxxxx Timer B value
 //           04 x------- RST
@@ -243,7 +243,7 @@ public:
 	uint32_t op_decay_rate(uint32_t opoffs) const    { return byte(0x60, 0, 4, opoffs); }
 	uint32_t op_sustain_level(uint32_t opoffs) const { return byte(0x80, 4, 4, opoffs); }
 	uint32_t op_release_rate(uint32_t opoffs) const  { return byte(0x80, 0, 4, opoffs); }
-	uint32_t op_waveform(uint32_t opoffs) const      { return IsOpl2Plus ? byte(0xe0, 0, newflag() ? 3 : 2, opoffs) : 0; }
+	uint32_t op_waveform(uint32_t opoffs) const      { return waveform_enable() ? byte(0xe0, 0, newflag() ? 3 : 2, opoffs) : 0; }
 
 protected:
 	// return a bitfield extracted from a byte
diff --git a/src/sound/ymfm/ymfm_opm.cpp b/src/sound/ymfm/ymfm_opm.cpp
index c72badb57..03f54fb90 100644
--- a/src/sound/ymfm/ymfm_opm.cpp
+++ b/src/sound/ymfm/ymfm_opm.cpp
@@ -60,17 +60,17 @@ opm_registers::opm_registers() :
 	{
 		// waveform 0 is a sawtooth
 		uint8_t am = index ^ 0xff;
-		int8_t pm = int8_t(index);
+		uint8_t pm = index;
 		m_lfo_waveform[0][index] = am | (pm << 8);
 
 		// waveform 1 is a square wave
 		am = bitfield(index, 7) ? 0 : 0xff;
-		pm = int8_t(am ^ 0x80);
+		pm = am ^ 0x80;
 		m_lfo_waveform[1][index] = am | (pm << 8);
 
 		// waveform 2 is a triangle wave
 		am = bitfield(index, 7) ? (index << 1) : ((index ^ 0xff) << 1);
-		pm = int8_t(bitfield(index, 6) ? am : ~am);
+		pm = bitfield(index, 6) ? am : ~am;
 		m_lfo_waveform[2][index] = am | (pm << 8);
 
 		// waveform 3 is noise; it is filled in dynamically
@@ -330,7 +330,7 @@ uint32_t opm_registers::compute_phase_step(uint32_t choffs, uint32_t opoffs, opd
 		if (pm_sensitivity < 6)
 			delta += lfo_raw_pm >> (6 - pm_sensitivity);
 		else
-			delta += lfo_raw_pm << (pm_sensitivity - 5);
+			delta += uint32_t(lfo_raw_pm) << (pm_sensitivity - 5);
 	}
 
 	// apply delta and convert to a frequency number
@@ -354,9 +354,9 @@ std::string opm_registers::log_keyon(uint32_t choffs, uint32_t opoffs)
 	uint32_t opnum = opoffs;
 
 	char buffer[256];
-	char *end = &buffer[0];
+	int end = 0;
 
-	end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, "%u.%02u freq=%04X dt2=%u dt=%u fb=%u alg=%X mul=%X tl=%02X ksr=%u adsr=%02X/%02X/%02X/%X sl=%X out=%c%c",
+	end += snprintf(&buffer[end], sizeof(buffer) - end, "%u.%02u freq=%04X dt2=%u dt=%u fb=%u alg=%X mul=%X tl=%02X ksr=%u adsr=%02X/%02X/%02X/%X sl=%X out=%c%c",
 		chnum, opnum,
 		ch_block_freq(choffs),
 		op_detune2(opoffs),
@@ -376,14 +376,14 @@ std::string opm_registers::log_keyon(uint32_t choffs, uint32_t opoffs)
 
 	bool am = (lfo_am_depth() != 0 && ch_lfo_am_sens(choffs) != 0 && op_lfo_am_enable(opoffs) != 0);
 	if (am)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " am=%u/%02X", ch_lfo_am_sens(choffs), lfo_am_depth());
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " am=%u/%02X", ch_lfo_am_sens(choffs), lfo_am_depth());
 	bool pm = (lfo_pm_depth() != 0 && ch_lfo_pm_sens(choffs) != 0);
 	if (pm)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " pm=%u/%02X", ch_lfo_pm_sens(choffs), lfo_pm_depth());
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " pm=%u/%02X", ch_lfo_pm_sens(choffs), lfo_pm_depth());
 	if (am || pm)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " lfo=%02X/%c", lfo_rate(), "WQTN"[lfo_waveform()]);
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " lfo=%02X/%c", lfo_rate(), "WQTN"[lfo_waveform()]);
 	if (noise_enable() && opoffs == 31)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " noise=1");
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " noise=1");
 
 	return buffer;
 }
diff --git a/src/sound/ymfm/ymfm_opn.cpp b/src/sound/ymfm/ymfm_opn.cpp
index 388162dfe..60469e1c0 100644
--- a/src/sound/ymfm/ymfm_opn.cpp
+++ b/src/sound/ymfm/ymfm_opn.cpp
@@ -155,14 +155,13 @@ bool opn_registers_base<IsOpnA>::write(uint16_t index, uint8_t data, uint32_t &c
 
 		// writes to the upper half just latch (only low 6 bits matter)
 		if (bitfield(index, 2))
-			m_regdata[latchindex] = data | 0x80;
+			m_regdata[latchindex] = data & 0x3f;
 
-		// writes to the lower half only commit if the latch is there
-		else if (bitfield(m_regdata[latchindex], 7))
+		// writes to the lower half also apply said latch
+		else
 		{
 			m_regdata[index] = data;
-			m_regdata[index | 4] = m_regdata[latchindex] & 0x3f;
-			m_regdata[latchindex] = 0;
+			m_regdata[index | 4] = m_regdata[latchindex];
 		}
 		return false;
 	}
@@ -409,9 +408,9 @@ std::string opn_registers_base<IsOpnA>::log_keyon(uint32_t choffs, uint32_t opof
 	}
 
 	char buffer[256];
-	char *end = &buffer[0];
+	int end = 0;
 
-	end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, "%u.%02u freq=%04X dt=%u fb=%u alg=%X mul=%X tl=%02X ksr=%u adsr=%02X/%02X/%02X/%X sl=%X",
+	end += snprintf(&buffer[end], sizeof(buffer) - end, "%u.%02u freq=%04X dt=%u fb=%u alg=%X mul=%X tl=%02X ksr=%u adsr=%02X/%02X/%02X/%X sl=%X",
 		chnum, opnum,
 		block_freq,
 		op_detune(opoffs),
@@ -427,21 +426,21 @@ std::string opn_registers_base<IsOpnA>::log_keyon(uint32_t choffs, uint32_t opof
 		op_sustain_level(opoffs));
 
 	if (OUTPUTS > 1)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " out=%c%c",
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " out=%c%c",
 			ch_output_0(choffs) ? 'L' : '-',
 			ch_output_1(choffs) ? 'R' : '-');
 	if (op_ssg_eg_enable(opoffs))
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " ssg=%X", op_ssg_eg_mode(opoffs));
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " ssg=%X", op_ssg_eg_mode(opoffs));
 	bool am = (op_lfo_am_enable(opoffs) && ch_lfo_am_sens(choffs) != 0);
 	if (am)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " am=%u", ch_lfo_am_sens(choffs));
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " am=%u", ch_lfo_am_sens(choffs));
 	bool pm = (ch_lfo_pm_sens(choffs) != 0);
 	if (pm)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " pm=%u", ch_lfo_pm_sens(choffs));
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " pm=%u", ch_lfo_pm_sens(choffs));
 	if (am || pm)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " lfo=%02X", lfo_rate());
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " lfo=%02X", lfo_rate());
 	if (multi_freq() && choffs == 2)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " multi=1");
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " multi=1");
 
 	return buffer;
 }
diff --git a/src/sound/ymfm/ymfm_opn.h b/src/sound/ymfm/ymfm_opn.h
index bab68ed93..daed8b0bf 100644
--- a/src/sound/ymfm/ymfm_opn.h
+++ b/src/sound/ymfm/ymfm_opn.h
@@ -793,7 +793,7 @@ public:
 	ymf276(ymfm_interface &intf) : ym2612(intf) { }
 
 	// generate one sample of sound
-	void generate(output_data *output, uint32_t numsamples);
+	void generate(output_data *output, uint32_t numsamples = 1);
 };
 
 }
diff --git a/src/sound/ymfm/ymfm_opq.cpp b/src/sound/ymfm/ymfm_opq.cpp
index e6f6fa5ea..78ae16164 100644
--- a/src/sound/ymfm/ymfm_opq.cpp
+++ b/src/sound/ymfm/ymfm_opq.cpp
@@ -339,9 +339,9 @@ std::string opq_registers::log_keyon(uint32_t choffs, uint32_t opoffs)
 	uint32_t opnum = opoffs;
 
 	char buffer[256];
-	char *end = &buffer[0];
+	int end = 0;
 
-	end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, "%u.%02u freq=%04X dt=%+2d fb=%u alg=%X mul=%X tl=%02X ksr=%u adsr=%02X/%02X/%02X/%X sl=%X out=%c%c",
+	end += snprintf(&buffer[end], sizeof(buffer) - end, "%u.%02u freq=%04X dt=%+2d fb=%u alg=%X mul=%X tl=%02X ksr=%u adsr=%02X/%02X/%02X/%X sl=%X out=%c%c",
 		chnum, opnum,
 		(opoffs & 1) ? ch_block_freq_24(choffs) : ch_block_freq_13(choffs),
 		int32_t(op_detune(opoffs)) - 0x20,
@@ -360,14 +360,14 @@ std::string opq_registers::log_keyon(uint32_t choffs, uint32_t opoffs)
 
 	bool am = (lfo_enable() && op_lfo_am_enable(opoffs) && ch_lfo_am_sens(choffs) != 0);
 	if (am)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " am=%u", ch_lfo_am_sens(choffs));
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " am=%u", ch_lfo_am_sens(choffs));
 	bool pm = (lfo_enable() && ch_lfo_pm_sens(choffs) != 0);
 	if (pm)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " pm=%u", ch_lfo_pm_sens(choffs));
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " pm=%u", ch_lfo_pm_sens(choffs));
 	if (am || pm)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " lfo=%02X", lfo_rate());
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " lfo=%02X", lfo_rate());
 	if (ch_reverb(choffs))
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " reverb");
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " reverb");
 
 	return buffer;
 }
diff --git a/src/sound/ymfm/ymfm_opx.h b/src/sound/ymfm/ymfm_opx.h
index 9f9bbdba7..f8ee1c34f 100644
--- a/src/sound/ymfm/ymfm_opx.h
+++ b/src/sound/ymfm/ymfm_opx.h
@@ -105,7 +105,7 @@ public:
 	static constexpr uint8_t STATUS_IRQ = 0;
 
 	// constructor
-	opz_registers();
+	opx_registers();
 
 	// reset to initial state
 	void reset();
@@ -244,17 +244,17 @@ protected:
 //  IMPLEMENTATION CLASSES
 //*********************************************************
 
-// ======================> ym2414
+// ======================> ymf271
 
-class ym2414
+class ymf271
 {
 public:
-	using fm_engine = fm_engine_base<opz_registers>;
+	using fm_engine = fm_engine_base<opx_registers>;
 	static constexpr uint32_t OUTPUTS = fm_engine::OUTPUTS;
 	using output_data = fm_engine::output_data;
 
 	// constructor
-	ym2414(ymfm_interface &intf);
+	ymf271(ymfm_interface &intf);
 
 	// reset
 	void reset();
@@ -287,4 +287,4 @@ protected:
 }
 
 
-#endif // YMFM_OPZ_H
+#endif // YMFM_OPX_H
diff --git a/src/sound/ymfm/ymfm_opz.cpp b/src/sound/ymfm/ymfm_opz.cpp
index a5ec912aa..1178417bb 100644
--- a/src/sound/ymfm/ymfm_opz.cpp
+++ b/src/sound/ymfm/ymfm_opz.cpp
@@ -129,17 +129,17 @@ opz_registers::opz_registers() :
 	{
 		// waveform 0 is a sawtooth
 		uint8_t am = index ^ 0xff;
-		int8_t pm = int8_t(index);
+		uint8_t pm = index;
 		m_lfo_waveform[0][index] = am | (pm << 8);
 
 		// waveform 1 is a square wave
 		am = bitfield(index, 7) ? 0 : 0xff;
-		pm = int8_t(am ^ 0x80);
+		pm = am ^ 0x80;
 		m_lfo_waveform[1][index] = am | (pm << 8);
 
 		// waveform 2 is a triangle wave
 		am = bitfield(index, 7) ? (index << 1) : ((index ^ 0xff) << 1);
-		pm = int8_t(bitfield(index, 6) ? am : ~am);
+		pm = bitfield(index, 6) ? am : ~am;
 		m_lfo_waveform[2][index] = am | (pm << 8);
 
 		// waveform 3 is noise; it is filled in dynamically
@@ -555,16 +555,16 @@ std::string opz_registers::log_keyon(uint32_t choffs, uint32_t opoffs)
 	uint32_t opnum = opoffs;
 
 	char buffer[256];
-	char *end = &buffer[0];
+	int end = 0;
 
-	end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, "%u.%02u", chnum, opnum);
+	end += snprintf(&buffer[end], sizeof(buffer) - end, "%u.%02u", chnum, opnum);
 
 	if (op_fix_mode(opoffs))
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " fixfreq=%X fine=%X shift=%X", op_fix_frequency(opoffs), op_fine(opoffs), op_fix_range(opoffs));
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " fixfreq=%X fine=%X shift=%X", op_fix_frequency(opoffs), op_fine(opoffs), op_fix_range(opoffs));
 	else
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " freq=%04X dt2=%u fine=%X", ch_block_freq(choffs), op_detune2(opoffs), op_fine(opoffs));
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " freq=%04X dt2=%u fine=%X", ch_block_freq(choffs), op_detune2(opoffs), op_fine(opoffs));
 
-	end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " dt=%u fb=%u alg=%X mul=%X tl=%02X ksr=%u adsr=%02X/%02X/%02X/%X sl=%X out=%c%c",
+	end += snprintf(&buffer[end], sizeof(buffer) - end, " dt=%u fb=%u alg=%X mul=%X tl=%02X ksr=%u adsr=%02X/%02X/%02X/%X sl=%X out=%c%c",
 		op_detune(opoffs),
 		ch_feedback(choffs),
 		ch_algorithm(choffs),
@@ -580,32 +580,32 @@ std::string opz_registers::log_keyon(uint32_t choffs, uint32_t opoffs)
 		ch_output_1(choffs) ? 'R' : '-');
 
 	if (op_eg_shift(opoffs) != 0)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " egshift=%u", op_eg_shift(opoffs));
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " egshift=%u", op_eg_shift(opoffs));
 
 	bool am = (lfo_am_depth() != 0 && ch_lfo_am_sens(choffs) != 0 && op_lfo_am_enable(opoffs) != 0);
 	if (am)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " am=%u/%02X", ch_lfo_am_sens(choffs), lfo_am_depth());
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " am=%u/%02X", ch_lfo_am_sens(choffs), lfo_am_depth());
 	bool pm = (lfo_pm_depth() != 0 && ch_lfo_pm_sens(choffs) != 0);
 	if (pm)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " pm=%u/%02X", ch_lfo_pm_sens(choffs), lfo_pm_depth());
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " pm=%u/%02X", ch_lfo_pm_sens(choffs), lfo_pm_depth());
 	if (am || pm)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " lfo=%02X/%c", lfo_rate(), "WQTN"[lfo_waveform()]);
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " lfo=%02X/%c", lfo_rate(), "WQTN"[lfo_waveform()]);
 
 	bool am2 = (lfo2_am_depth() != 0 && ch_lfo2_am_sens(choffs) != 0 && op_lfo_am_enable(opoffs) != 0);
 	if (am2)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " am2=%u/%02X", ch_lfo2_am_sens(choffs), lfo2_am_depth());
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " am2=%u/%02X", ch_lfo2_am_sens(choffs), lfo2_am_depth());
 	bool pm2 = (lfo2_pm_depth() != 0 && ch_lfo2_pm_sens(choffs) != 0);
 	if (pm2)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " pm2=%u/%02X", ch_lfo2_pm_sens(choffs), lfo2_pm_depth());
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " pm2=%u/%02X", ch_lfo2_pm_sens(choffs), lfo2_pm_depth());
 	if (am2 || pm2)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " lfo2=%02X/%c", lfo2_rate(), "WQTN"[lfo2_waveform()]);
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " lfo2=%02X/%c", lfo2_rate(), "WQTN"[lfo2_waveform()]);
 
 	if (op_reverb_rate(opoffs) != 0)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " rev=%u", op_reverb_rate(opoffs));
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " rev=%u", op_reverb_rate(opoffs));
 	if (op_waveform(opoffs) != 0)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " wf=%u", op_waveform(opoffs));
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " wf=%u", op_waveform(opoffs));
 	if (noise_enable() && opoffs == 31)
-		end += snprintf(end, SNPRINTF_BUFFER_SIZE_CALC, " noise=1");
+		end += snprintf(&buffer[end], sizeof(buffer) - end, " noise=1");
 
 	return buffer;
 }
diff --git a/src/sound/ymfm/ymfm_ssg.h b/src/sound/ymfm/ymfm_ssg.h
index 749ad146f..cb7ec9e7c 100644
--- a/src/sound/ymfm/ymfm_ssg.h
+++ b/src/sound/ymfm/ymfm_ssg.h
@@ -49,6 +49,8 @@ namespace ymfm
 class ssg_override
 {
 public:
+	virtual ~ssg_override() = default;
+
 	// reset our status
 	virtual void ssg_reset() = 0;
 
diff --git a/src/timer.c b/src/timer.c
index fa8376bde..03908890f 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -3,7 +3,9 @@
 #include <string.h>
 #include <wchar.h>
 #include <86box/86box.h>
+#include "cpu.h"
 #include <86box/timer.h>
+#include <86box/nv/vid_nv_rivatimer.h>
 
 uint64_t TIMER_USEC;
 uint32_t timer_target;
@@ -30,7 +32,8 @@ timer_enable(pc_timer_t *timer)
         timer_disable(timer);
 
     if (timer->next || timer->prev)
-        fatal("timer_enable - timer->next\n");
+        fatal("timer_disable(): Attempting to enable a non-isolated "
+              "timer incorrectly marked as disabled\n");
 
     /*List currently empty - add to head*/
     if (!timer_head) {
@@ -91,9 +94,11 @@ timer_disable(pc_timer_t *timer)
         return;
 
     if (!timer->next && !timer->prev && timer != timer_head)
-        fatal("timer_disable - !timer->next\n");
+        fatal("timer_disable(): Attempting to disable an isolated "
+              "non-head timer incorrectly marked as enabled\n");
 
     timer->flags &= ~TIMER_ENABLED;
+    timer->in_callback = 0;
 
     if (timer->prev)
         timer->prev->next = timer->next;
@@ -127,11 +132,15 @@ timer_process(void)
 
         if (timer->flags & TIMER_SPLIT)
             timer_advance_ex(timer, 0);   /* We're splitting a > 1 s period into
-                                             multiple <= 1 s periods. */
-        else if (timer->callback != NULL) /* Make sure it's not NULL, so that we can
-                                             have a NULL callback when no operation
-                                             is needed. */
+                                                 multiple <= 1 s periods. */
+        else if (timer->callback != NULL) {
+            /* Make sure it's not NULL, so that we can
+               have a NULL callback when no operation
+               is needed. */
+            timer->in_callback = 1;
             timer->callback(timer->priv);
+            timer->in_callback = 0;
+        }
     }
 
     timer_target = timer_head->ts.ts32.integer;
@@ -163,6 +172,9 @@ timer_init(void)
     timer_target = 0ULL;
     tsc          = 0;
 
+    /* Initialise the CPU-independent timer */
+    rivatimer_init();
+
     timer_inited = 1;
 }
 
@@ -171,10 +183,11 @@ timer_add(pc_timer_t *timer, void (*callback)(void *priv), void *priv, int start
 {
     memset(timer, 0, sizeof(pc_timer_t));
 
-    timer->callback = callback;
-    timer->priv     = priv;
-    timer->flags    = 0;
-    timer->prev = timer->next = NULL;
+    timer->callback    = callback;
+    timer->in_callback = 0;
+    timer->priv        = priv;
+    timer->flags       = 0;
+    timer->prev        = timer->next = NULL;
     if (start_timer)
         timer_set_delay_u64(timer, 0);
 }
@@ -189,6 +202,7 @@ timer_stop(pc_timer_t *timer)
     timer->period = 0.0;
     timer_disable(timer);
     timer->flags &= ~TIMER_SPLIT;
+    timer->in_callback = 0;
 }
 
 static void
@@ -240,7 +254,37 @@ timer_on_auto(pc_timer_t *timer, double period)
         return;
 
     if (period > 0.0)
-        timer_on(timer, period, timer->period <= 0.0);
+        /* If the timer is in the callback, signal that, so that timer_advance_u64()
+           is used instead of timer_set_delay_u64(). */
+        timer_on(timer, period, (timer->period <= 0.0) && !timer->in_callback);
     else
         timer_stop(timer);
 }
+
+void
+timer_set_new_tsc(uint64_t new_tsc)
+{
+    pc_timer_t *timer = NULL;
+    /* Run timers already expired. */
+#ifdef USE_DYNAREC
+    if (cpu_use_dynarec)
+        update_tsc();
+#endif
+
+    if (!timer_head) {
+        tsc = new_tsc;
+        return;
+    }
+
+    timer = timer_head;
+    timer_target = new_tsc + (int32_t)(timer_get_ts_int(timer_head) - (uint32_t)tsc);
+
+    while (timer) {
+        int32_t offset_from_current_tsc = (int32_t)(timer_get_ts_int(timer) - (uint32_t)tsc);
+        timer->ts.ts32.integer = new_tsc + offset_from_current_tsc;
+
+        timer = timer->next;
+    }
+
+    tsc = new_tsc;
+}
diff --git a/src/unix/CMakeLists.txt b/src/unix/CMakeLists.txt
index 43c730315..724ab041f 100644
--- a/src/unix/CMakeLists.txt
+++ b/src/unix/CMakeLists.txt
@@ -10,14 +10,19 @@
 #
 # Authors: Cacodemon345
 #          David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
 #
 #          Copyright 2021      Cacodemon345.
 #          Copyright 2021      David Hrdlička.
 #          Copyright 2021      Andreas J. Reichel.
-#          Copyright 2021-2022 Jasmine Iwanek.
+#          Copyright 2021-2024 Jasmine Iwanek.
 #
 
-add_library(plat OBJECT unix.c unix_serial_passthrough.c)
+add_library(plat OBJECT
+    unix.c
+    unix_serial_passthrough.c
+    unix_netsocket.c
+)
 
 if (NOT CPPTHREADS)
     target_sources(plat PRIVATE unix_thread.c)
@@ -27,7 +32,21 @@ set(THREADS_PREFER_PTHREAD_FLAG TRUE)
 find_package(Threads REQUIRED)
 target_link_libraries(86Box Threads::Threads)
 
-add_library(ui OBJECT unix_sdl.c unix_cdrom.c)
+find_package(SDL2 REQUIRED)
+include_directories(${SDL2_INCLUDE_DIRS})
+if(STATIC_BUILD AND TARGET SDL2::SDL2-static)
+    target_link_libraries(86Box SDL2::SDL2-static)
+elseif(TARGET SDL2::SDL2)
+    target_link_libraries(86Box SDL2::SDL2)
+else()
+    target_link_libraries(86Box ${SDL2_LIBRARIES})
+endif()
+
+add_library(ui OBJECT
+    unix_sdl.c
+    unix_cdrom.c
+    dummy_cdrom_ioctl.c
+)
 target_compile_definitions(ui PUBLIC _FILE_OFFSET_BITS=64)
 target_link_libraries(ui ${CMAKE_DL_LIBS})
 
diff --git a/src/unix/assets/86Box.spec b/src/unix/assets/86Box.spec
index a7e4786be..0e57beb1c 100644
--- a/src/unix/assets/86Box.spec
+++ b/src/unix/assets/86Box.spec
@@ -15,7 +15,7 @@
 %global romver 4.1
 
 Name:		86Box
-Version:	4.1
+Version:	5.1
 Release:	1%{?dist}
 Summary:	Classic PC emulator
 License:	GPLv2+
@@ -121,5 +121,5 @@ popd
 %{_datadir}/%{name}/roms
 
 %changelog
-* Mon Oct 16 2023 Robert de Rooy <robert.de.rooy[AT]gmail.com> 4.1-1
+* Sat Aug 31 Jasmine Iwanek <jriwanek[AT]gmail.com> 5.1-1
 - Bump release
diff --git a/src/unix/assets/net.86box.86Box.metainfo.xml b/src/unix/assets/net.86box.86Box.metainfo.xml
index 9e2c5dc88..455e6841d 100644
--- a/src/unix/assets/net.86box.86Box.metainfo.xml
+++ b/src/unix/assets/net.86box.86Box.metainfo.xml
@@ -4,13 +4,14 @@
     <metadata_license>CC0-1.0</metadata_license>
     <project_license>GPL-2.0-or-later</project_license>
     <name>86Box</name>
+    <developer_name>86Box developers</developer_name>
     <summary>An emulator for classic IBM PC clones</summary>
     <categories>
-      <category>Emulation</category>
+      <category>Emulator</category>
     </categories>
     <launchable type="desktop-id">net.86box.86Box.desktop</launchable>
     <releases>
-      <release version="4.1" date="2023-10-16"/>
+      <release version="5.1" date="2025-08-27"/>
     </releases>
     <content_rating type="oars-1.1" />
     <description>
diff --git a/src/unix/dummy_cdrom_ioctl.c b/src/unix/dummy_cdrom_ioctl.c
new file mode 100644
index 000000000..8dffc6758
--- /dev/null
+++ b/src/unix/dummy_cdrom_ioctl.c
@@ -0,0 +1,244 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Win32 CD-ROM support via IOCTL.
+ *
+ *
+ *
+ * Authors: TheCollector1995, <mariogplayer@gmail.com>,
+ *          Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2023 TheCollector1995.
+ *          Copyright 2023 Miran Grca.
+ */
+#include <inttypes.h>
+#ifdef ENABLE_IOCTL_LOG
+#include <stdarg.h>
+#endif
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/scsi_device.h>
+#include <86box/cdrom.h>
+#include <86box/log.h>
+#include <86box/plat_unused.h>
+#include <86box/plat_cdrom_ioctl.h>
+
+/* The addresses sent from the guest are absolute, ie. a LBA of 0 corresponds to a MSF of 00:00:00. Otherwise, the counter displayed by the guest is wrong:
+   there is a seeming 2 seconds in which audio plays but counter does not move, while a data track before audio jumps to 2 seconds before the actual start
+   of the audio while audio still plays. With an absolute conversion, the counter is fine. */
+#define MSFtoLBA(m, s, f) ((((m * 60) + s) * 75) + f)
+
+typedef struct ioctl_t {
+    cdrom_t                *dev;
+    void                   *log;
+    void                   *handle;
+    char                    path[256];
+} ioctl_t;
+
+#ifdef ENABLE_IOCTL_LOG
+int ioctl_do_log = ENABLE_IOCTL_LOG;
+
+void
+ioctl_log(void *priv, const char *fmt, ...)
+{
+    if (ioctl_do_log) {
+        va_list ap;
+        va_start(ap, fmt);
+        log_out(priv, fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define ioctl_log(priv, fmt, ...)
+#endif
+
+/* Internal functions. */
+static void
+ioctl_close_handle(UNUSED(const ioctl_t *ioctl))
+{
+}
+
+static int
+ioctl_open_handle(UNUSED(ioctl_t *ioctl))
+{
+    return 0;
+}
+
+static void
+ioctl_read_toc(ioctl_t *ioctl)
+{
+}
+
+/* Shared functions. */
+static int
+ioctl_get_track_info(UNUSED(const void *local), UNUSED(const uint32_t track),
+                     UNUSED(int end), UNUSED(track_info_t *ti))
+{
+    return 0;
+}
+
+static void
+ioctl_get_raw_track_info(UNUSED(const void *local), int *num, uint8_t *rti)
+{
+    *num = 1;
+    memset(rti, 0x00, 11);
+}
+
+static int
+ioctl_is_track_pre(const void *local, UNUSED(const uint32_t sector))
+{
+    ioctl_t *ioctl = (ioctl_t *) local;
+
+    ioctl_read_toc(ioctl);
+
+    const int ret = 0;
+
+    ioctl_log("ioctl_is_track_audio(%08X): %i\n", sector, ret);
+
+    return ret;
+}
+
+static int
+ioctl_read_sector(const void *local, UNUSED(uint8_t *buffer), UNUSED(uint32_t const sector))
+{
+    ioctl_t *ioctl = (ioctl_t *) local;
+
+    ioctl_open_handle(ioctl);
+
+    ioctl_close_handle(ioctl);
+
+    ioctl_log("ReadSector sector=%d.\n", sector);
+
+    return 0;
+}
+
+static uint8_t
+ioctl_get_track_type(UNUSED(const void *local), UNUSED(const uint32_t sector))
+{
+    return 0x00;
+}
+
+static uint32_t
+ioctl_get_last_block(const void *local)
+{
+    ioctl_t *ioctl = (ioctl_t *) local;
+
+    ioctl_read_toc(ioctl);
+
+    return 0x00000000;
+}
+
+static int
+ioctl_read_dvd_structure(UNUSED(const void *local), UNUSED(const uint8_t layer), UNUSED(const uint8_t format),
+                         UNUSED(uint8_t *buffer), UNUSED(uint32_t *info))
+{
+    return -0x00052100;
+}
+
+static int
+ioctl_is_dvd(UNUSED(const void *local))
+{
+    return 0;
+}
+
+static int
+ioctl_has_audio(UNUSED(const void *local))
+{
+    return 0;
+}
+
+static int
+ioctl_is_empty(const void *local)
+{
+    return 1;
+}
+
+#if 0
+static int
+ioctl_ext_medium_changed(UNUSED(void *local))
+{
+#if 0
+    ioctl_t *ioctl = (ioctl_t *) local;
+#endif
+    int                  ret   = 0;
+
+    ioctl_log("ioctl_ext_medium_changed(): %i\n", ret);
+
+    return ret;
+}
+#endif
+
+static void
+ioctl_close(void *local)
+{
+    ioctl_t *ioctl = (ioctl_t *) local;
+
+    ioctl_close_handle(ioctl);
+    ioctl->handle = NULL;
+
+    ioctl_log(ioctl->log, "Log closed\n");
+
+    log_close(ioctl->log);
+    ioctl->log = NULL;
+}
+
+static void
+ioctl_load(const void *local)
+{
+    const ioctl_t *ioctl = (const ioctl_t *) local;
+
+    if (ioctl_open_handle((ioctl_t *) ioctl)) {
+        ioctl_close_handle((ioctl_t *) ioctl);
+
+        ioctl_read_toc((ioctl_t *) ioctl);
+    }
+}
+
+static const cdrom_ops_t ioctl_ops = {
+    ioctl_get_track_info,
+    ioctl_get_raw_track_info,
+    ioctl_is_track_pre,
+    ioctl_read_sector,
+    ioctl_get_track_type,
+    ioctl_get_last_block,
+    ioctl_read_dvd_structure,
+    ioctl_is_dvd,
+    ioctl_has_audio,
+    ioctl_is_empty,
+    ioctl_close,
+    ioctl_load
+};
+
+/* Public functions. */
+void *
+ioctl_open(cdrom_t *dev, const char *drv)
+{
+    ioctl_t *ioctl = (ioctl_t *) calloc(1, sizeof(ioctl_t));
+
+    if (ioctl != NULL) {
+        char n[1024]        = { 0 };
+
+        sprintf(n, "CD-ROM %i IOCtl", dev->id + 1);
+        ioctl->log          = log_open(n);
+
+        memset(ioctl->path, 0x00, sizeof(ioctl->path));
+
+        sprintf(ioctl->path, "%s", drv);
+        ioctl_log(ioctl->log, "Path is %s\n", ioctl->path);
+
+        ioctl->dev          = dev;
+
+        dev->ops            = &ioctl_ops;
+    }
+
+    return ioctl;
+}
diff --git a/src/unix/gamemode/gamemode_client.h b/src/unix/gamemode/gamemode_client.h
new file mode 100644
index 000000000..49c34fb9f
--- /dev/null
+++ b/src/unix/gamemode/gamemode_client.h
@@ -0,0 +1,376 @@
+/*
+
+Copyright (c) 2017-2025, Feral Interactive and the GameMode contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+ * Neither the name of Feral Interactive nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+ */
+#ifndef CLIENT_GAMEMODE_H
+#define CLIENT_GAMEMODE_H
+/*
+ * GameMode supports the following client functions
+ * Requests are refcounted in the daemon
+ *
+ * int gamemode_request_start() - Request gamemode starts
+ *   0 if the request was sent successfully
+ *   -1 if the request failed
+ *
+ * int gamemode_request_end() - Request gamemode ends
+ *   0 if the request was sent successfully
+ *   -1 if the request failed
+ *
+ * GAMEMODE_AUTO can be defined to make the above two functions apply during static init and
+ * destruction, as appropriate. In this configuration, errors will be printed to stderr
+ *
+ * int gamemode_query_status() - Query the current status of gamemode
+ *   0 if gamemode is inactive
+ *   1 if gamemode is active
+ *   2 if gamemode is active and this client is registered
+ *   -1 if the query failed
+ *
+ * int gamemode_request_start_for(pid_t pid) - Request gamemode starts for another process
+ *   0 if the request was sent successfully
+ *   -1 if the request failed
+ *   -2 if the request was rejected
+ *
+ * int gamemode_request_end_for(pid_t pid) - Request gamemode ends for another process
+ *   0 if the request was sent successfully
+ *   -1 if the request failed
+ *   -2 if the request was rejected
+ *
+ * int gamemode_query_status_for(pid_t pid) - Query status of gamemode for another process
+ *   0 if gamemode is inactive
+ *   1 if gamemode is active
+ *   2 if gamemode is active and this client is registered
+ *   -1 if the query failed
+ *
+ * const char* gamemode_error_string() - Get an error string
+ *   returns a string describing any of the above errors
+ *
+ * Note: All the above requests can be blocking - dbus requests can and will block while the daemon
+ * handles the request. It is not recommended to make these calls in performance critical code
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+
+#include <dlfcn.h>
+#include <string.h>
+
+#include <assert.h>
+
+#include <sys/types.h>
+
+static char internal_gamemode_client_error_string[512] = { 0 };
+
+/**
+ * Load libgamemode dynamically to dislodge us from most dependencies.
+ * This allows clients to link and/or use this regardless of runtime.
+ * See SDL2 for an example of the reasoning behind this in terms of
+ * dynamic versioning as well.
+ */
+static volatile int internal_libgamemode_loaded = 1;
+
+/* Typedefs for the functions to load */
+typedef int (*api_call_return_int)(void);
+typedef const char *(*api_call_return_cstring)(void);
+typedef int (*api_call_pid_return_int)(pid_t);
+
+/* Storage for functors */
+static api_call_return_int REAL_internal_gamemode_request_start = NULL;
+static api_call_return_int REAL_internal_gamemode_request_end = NULL;
+static api_call_return_int REAL_internal_gamemode_query_status = NULL;
+static api_call_return_cstring REAL_internal_gamemode_error_string = NULL;
+static api_call_pid_return_int REAL_internal_gamemode_request_start_for = NULL;
+static api_call_pid_return_int REAL_internal_gamemode_request_end_for = NULL;
+static api_call_pid_return_int REAL_internal_gamemode_query_status_for = NULL;
+
+/**
+ * Internal helper to perform the symbol binding safely.
+ *
+ * Returns 0 on success and -1 on failure
+ */
+__attribute__((always_inline)) static inline int internal_bind_libgamemode_symbol(
+    void *handle, const char *name, void **out_func, size_t func_size, bool required)
+{
+	void *symbol_lookup = NULL;
+	char *dl_error = NULL;
+
+	/* Safely look up the symbol */
+	symbol_lookup = dlsym(handle, name);
+	dl_error = dlerror();
+	if (required && (dl_error || !symbol_lookup)) {
+		snprintf(internal_gamemode_client_error_string,
+		         sizeof(internal_gamemode_client_error_string),
+		         "dlsym failed - %s",
+		         dl_error);
+		return -1;
+	}
+
+	/* Have the symbol correctly, copy it to make it usable */
+	memcpy(out_func, &symbol_lookup, func_size);
+	return 0;
+}
+
+/**
+ * Loads libgamemode and needed functions
+ *
+ * Returns 0 on success and -1 on failure
+ */
+__attribute__((always_inline)) static inline int internal_load_libgamemode(void)
+{
+	/* We start at 1, 0 is a success and -1 is a fail */
+	if (internal_libgamemode_loaded != 1) {
+		return internal_libgamemode_loaded;
+	}
+
+	/* Anonymous struct type to define our bindings */
+	struct binding {
+		const char *name;
+		void **functor;
+		size_t func_size;
+		bool required;
+	} bindings[] = {
+		{ "real_gamemode_request_start",
+		  (void **)&REAL_internal_gamemode_request_start,
+		  sizeof(REAL_internal_gamemode_request_start),
+		  true },
+		{ "real_gamemode_request_end",
+		  (void **)&REAL_internal_gamemode_request_end,
+		  sizeof(REAL_internal_gamemode_request_end),
+		  true },
+		{ "real_gamemode_query_status",
+		  (void **)&REAL_internal_gamemode_query_status,
+		  sizeof(REAL_internal_gamemode_query_status),
+		  false },
+		{ "real_gamemode_error_string",
+		  (void **)&REAL_internal_gamemode_error_string,
+		  sizeof(REAL_internal_gamemode_error_string),
+		  true },
+		{ "real_gamemode_request_start_for",
+		  (void **)&REAL_internal_gamemode_request_start_for,
+		  sizeof(REAL_internal_gamemode_request_start_for),
+		  false },
+		{ "real_gamemode_request_end_for",
+		  (void **)&REAL_internal_gamemode_request_end_for,
+		  sizeof(REAL_internal_gamemode_request_end_for),
+		  false },
+		{ "real_gamemode_query_status_for",
+		  (void **)&REAL_internal_gamemode_query_status_for,
+		  sizeof(REAL_internal_gamemode_query_status_for),
+		  false },
+	};
+
+	void *libgamemode = NULL;
+
+	/* Try and load libgamemode */
+	libgamemode = dlopen("libgamemode.so.0", RTLD_NOW);
+	if (!libgamemode) {
+		/* Attempt to load unversioned library for compatibility with older
+		 * versions (as of writing, there are no ABI changes between the two -
+		 * this may need to change if ever ABI-breaking changes are made) */
+		libgamemode = dlopen("libgamemode.so", RTLD_NOW);
+		if (!libgamemode) {
+			snprintf(internal_gamemode_client_error_string,
+			         sizeof(internal_gamemode_client_error_string),
+			         "dlopen failed - %s",
+			         dlerror());
+			internal_libgamemode_loaded = -1;
+			return -1;
+		}
+	}
+
+	/* Attempt to bind all symbols */
+	for (size_t i = 0; i < sizeof(bindings) / sizeof(bindings[0]); i++) {
+		struct binding *binder = &bindings[i];
+
+		if (internal_bind_libgamemode_symbol(libgamemode,
+		                                     binder->name,
+		                                     binder->functor,
+		                                     binder->func_size,
+		                                     binder->required)) {
+			internal_libgamemode_loaded = -1;
+			return -1;
+		};
+	}
+
+	/* Success */
+	internal_libgamemode_loaded = 0;
+	return 0;
+}
+
+/**
+ * Redirect to the real libgamemode
+ */
+__attribute__((always_inline)) static inline const char *gamemode_error_string(void)
+{
+	/* If we fail to load the system gamemode, or we have an error string already, return our error
+	 * string instead of diverting to the system version */
+	if (internal_load_libgamemode() < 0 || internal_gamemode_client_error_string[0] != '\0') {
+		return internal_gamemode_client_error_string;
+	}
+
+	/* Assert for static analyser that the function is not NULL */
+	assert(REAL_internal_gamemode_error_string != NULL);
+
+	return REAL_internal_gamemode_error_string();
+}
+
+/**
+ * Redirect to the real libgamemode
+ * Allow automatically requesting game mode
+ * Also prints errors as they happen.
+ */
+#ifdef GAMEMODE_AUTO
+__attribute__((constructor))
+#else
+__attribute__((always_inline)) static inline
+#endif
+int gamemode_request_start(void)
+{
+	/* Need to load gamemode */
+	if (internal_load_libgamemode() < 0) {
+#ifdef GAMEMODE_AUTO
+		fprintf(stderr, "gamemodeauto: %s\n", gamemode_error_string());
+#endif
+		return -1;
+	}
+
+	/* Assert for static analyser that the function is not NULL */
+	assert(REAL_internal_gamemode_request_start != NULL);
+
+	if (REAL_internal_gamemode_request_start() < 0) {
+#ifdef GAMEMODE_AUTO
+		fprintf(stderr, "gamemodeauto: %s\n", gamemode_error_string());
+#endif
+		return -1;
+	}
+
+	return 0;
+}
+
+/* Redirect to the real libgamemode */
+#ifdef GAMEMODE_AUTO
+__attribute__((destructor))
+#else
+__attribute__((always_inline)) static inline
+#endif
+int gamemode_request_end(void)
+{
+	/* Need to load gamemode */
+	if (internal_load_libgamemode() < 0) {
+#ifdef GAMEMODE_AUTO
+		fprintf(stderr, "gamemodeauto: %s\n", gamemode_error_string());
+#endif
+		return -1;
+	}
+
+	/* Assert for static analyser that the function is not NULL */
+	assert(REAL_internal_gamemode_request_end != NULL);
+
+	if (REAL_internal_gamemode_request_end() < 0) {
+#ifdef GAMEMODE_AUTO
+		fprintf(stderr, "gamemodeauto: %s\n", gamemode_error_string());
+#endif
+		return -1;
+	}
+
+	return 0;
+}
+
+/* Redirect to the real libgamemode */
+__attribute__((always_inline)) static inline int gamemode_query_status(void)
+{
+	/* Need to load gamemode */
+	if (internal_load_libgamemode() < 0) {
+		return -1;
+	}
+
+	if (REAL_internal_gamemode_query_status == NULL) {
+		snprintf(internal_gamemode_client_error_string,
+		         sizeof(internal_gamemode_client_error_string),
+		         "gamemode_query_status missing (older host?)");
+		return -1;
+	}
+
+	return REAL_internal_gamemode_query_status();
+}
+
+/* Redirect to the real libgamemode */
+__attribute__((always_inline)) static inline int gamemode_request_start_for(pid_t pid)
+{
+	/* Need to load gamemode */
+	if (internal_load_libgamemode() < 0) {
+		return -1;
+	}
+
+	if (REAL_internal_gamemode_request_start_for == NULL) {
+		snprintf(internal_gamemode_client_error_string,
+		         sizeof(internal_gamemode_client_error_string),
+		         "gamemode_request_start_for missing (older host?)");
+		return -1;
+	}
+
+	return REAL_internal_gamemode_request_start_for(pid);
+}
+
+/* Redirect to the real libgamemode */
+__attribute__((always_inline)) static inline int gamemode_request_end_for(pid_t pid)
+{
+	/* Need to load gamemode */
+	if (internal_load_libgamemode() < 0) {
+		return -1;
+	}
+
+	if (REAL_internal_gamemode_request_end_for == NULL) {
+		snprintf(internal_gamemode_client_error_string,
+		         sizeof(internal_gamemode_client_error_string),
+		         "gamemode_request_end_for missing (older host?)");
+		return -1;
+	}
+
+	return REAL_internal_gamemode_request_end_for(pid);
+}
+
+/* Redirect to the real libgamemode */
+__attribute__((always_inline)) static inline int gamemode_query_status_for(pid_t pid)
+{
+	/* Need to load gamemode */
+	if (internal_load_libgamemode() < 0) {
+		return -1;
+	}
+
+	if (REAL_internal_gamemode_query_status_for == NULL) {
+		snprintf(internal_gamemode_client_error_string,
+		         sizeof(internal_gamemode_client_error_string),
+		         "gamemode_query_status_for missing (older host?)");
+		return -1;
+	}
+
+	return REAL_internal_gamemode_query_status_for(pid);
+}
+
+#endif // CLIENT_GAMEMODE_H
diff --git a/src/unix/unix.c b/src/unix/unix.c
index 4f21ddd53..de35f4e93 100644
--- a/src/unix/unix.c
+++ b/src/unix/unix.c
@@ -2,6 +2,9 @@
 #    define _FILE_OFFSET_BITS   64
 #    define _LARGEFILE64_SOURCE 1
 #endif
+#ifdef __HAIKU__
+#include <OS.h>
+#endif
 #include <SDL.h>
 #include <stdlib.h>
 #include <stdbool.h>
@@ -38,6 +41,7 @@
 #include <86box/device.h>
 #include <86box/gameport.h>
 #include <86box/unix_sdl.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/nvr.h>
 #include <86box/version.h>
@@ -60,17 +64,13 @@ int             fixed_size_x = 640;
 int             fixed_size_y = 480;
 extern int      title_set;
 extern wchar_t  sdl_win_title[512];
-plat_joystick_t plat_joystick_state[MAX_PLAT_JOYSTICKS];
-joystick_t      joystick_state[MAX_JOYSTICKS];
+plat_joystick_state_t plat_joystick_state[MAX_PLAT_JOYSTICKS];
+joystick_state_t      joystick_state[GAMEPORT_MAX][MAX_JOYSTICKS];
 int             joysticks_present;
-int             status_icons_fullscreen = 0; /* unused. */
 SDL_mutex      *blitmtx;
 SDL_threadID    eventthread;
 static int      exit_event         = 0;
 static int      fullscreen_pending = 0;
-uint32_t        lang_id  = 0x0409; // Multilangual UI variables, for now all set to LCID of en-US
-uint32_t        lang_sys = 0x0409; // Multilangual UI variables, for now all set to LCID of en-US
-char            icon_set[256] = "";                  /* name of the iconset to be used */
 
 static const uint16_t sdl_to_xt[0x200] = {
     [SDL_SCANCODE_ESCAPE]       = 0x01,
@@ -208,22 +208,33 @@ dynld_module(const char *name, dllimp_t *table)
     return modhandle;
 }
 
+#define TMPFILE_BUFSIZE 1024  // Assumed max buffer size
 void
 plat_tempfile(char *bufp, char *prefix, char *suffix)
 {
     struct tm     *calendertime;
     struct timeval t;
     time_t         curtime;
+    size_t         used = 0;
 
     if (prefix != NULL)
-        sprintf(bufp, "%s-", prefix);
-    else
-        strcpy(bufp, "");
+        used = snprintf(bufp, TMPFILE_BUFSIZE, "%s-", prefix);
+    else if (TMPFILE_BUFSIZE > 0)
+        bufp[0] = '\0';
+
     gettimeofday(&t, NULL);
     curtime      = time(NULL);
     calendertime = localtime(&curtime);
-    sprintf(&bufp[strlen(bufp)], "%d%02d%02d-%02d%02d%02d-%03ld%s", calendertime->tm_year, calendertime->tm_mon, calendertime->tm_mday, calendertime->tm_hour, calendertime->tm_min, calendertime->tm_sec, t.tv_usec / 1000, suffix);
+
+    if (used < TMPFILE_BUFSIZE) {
+        snprintf(bufp + used, TMPFILE_BUFSIZE - used,
+                 "%d%02d%02d-%02d%02d%02d-%03" PRId32 "%s",
+                 calendertime->tm_year, calendertime->tm_mon, calendertime->tm_mday,
+                 calendertime->tm_hour, calendertime->tm_min, calendertime->tm_sec,
+                 (int32_t)(t.tv_usec / 1000), suffix);
+    }
 }
+#undef TMPFILE_BUFSIZE
 
 int
 plat_getcwd(char *bufp, int max)
@@ -247,38 +258,40 @@ wchar_t *
 plat_get_string(int i)
 {
     switch (i) {
-        case IDS_2077:
+        case STRING_MOUSE_CAPTURE:
             return L"Click to capture mouse";
-        case IDS_2078:
+        case STRING_MOUSE_RELEASE:
             return L"Press CTRL-END to release mouse";
-        case IDS_2079:
+        case STRING_MOUSE_RELEASE_MMB:
             return L"Press CTRL-END or middle button to release mouse";
-        case IDS_2131:
+        case STRING_INVALID_CONFIG:
             return L"Invalid configuration";
-        case IDS_4099:
+        case STRING_NO_ST506_ESDI_CDROM:
             return L"MFM/RLL or ESDI CD-ROM drives never existed";
-        case IDS_2094:
-            return L"Failed to set up PCap";
-        case IDS_2095:
+        case STRING_PCAP_ERROR_NO_DEVICES:
             return L"No PCap devices found";
-        case IDS_2096:
+        case STRING_PCAP_ERROR_INVALID_DEVICE:
             return L"Invalid PCap device";
-        case IDS_2112:
-            return L"Unable to initialize SDL, libsdl2 is required";
-        case IDS_2133:
+        case STRING_GHOSTSCRIPT_ERROR_DESC:
             return L"libgs is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files.";
-        case IDS_2130:
+        case STRING_PCAP_ERROR_DESC:
             return L"Make sure libpcap is installed and that you are on a libpcap-compatible network connection.";
-        case IDS_2115:
+        case STRING_GHOSTSCRIPT_ERROR_TITLE:
             return L"Unable to initialize Ghostscript";
-        case IDS_2063:
+        case STRING_GHOSTPCL_ERROR_TITLE:
+            return L"Unable to initialize GhostPCL";
+        case STRING_GHOSTPCL_ERROR_DESC:
+            return L"libgpcl6 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files.";
+        case STRING_HW_NOT_AVAILABLE_MACHINE:
             return L"Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine.";
-        case IDS_2064:
+        case STRING_HW_NOT_AVAILABLE_VIDEO:
             return L"Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card.";
-        case IDS_2129:
+        case STRING_HW_NOT_AVAILABLE_TITLE:
             return L"Hardware not available";
-        case IDS_2143:
+        case STRING_MONITOR_SLEEP:
             return L"Monitor in sleep mode";
+        case STRING_EDID_TOO_LARGE:
+            return "EDID file \"%ls\" is too large.";
     }
     return L"";
 }
@@ -302,7 +315,7 @@ path_abs(char *path)
 }
 
 void
-path_normalize(char *path)
+path_normalize(UNUSED(char *path))
 {
     /* No-op. */
 }
@@ -410,6 +423,8 @@ plat_mmap(size_t size, uint8_t executable)
 {
 #if defined __APPLE__ && defined MAP_JIT
     void *ret = mmap(0, size, PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0), MAP_ANON | MAP_PRIVATE | (executable ? MAP_JIT : 0), -1, 0);
+#elif defined(PROT_MPROTECT)
+    void *ret = mmap(0, size, PROT_MPROTECT(PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0)), MAP_ANON | MAP_PRIVATE, -1, 0);
 #else
     void *ret = mmap(0, size, PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0), MAP_ANON | MAP_PRIVATE, -1, 0);
 #endif
@@ -451,12 +466,6 @@ plat_get_ticks(void)
     return (uint32_t) (plat_get_ticks_common() / 1000);
 }
 
-uint32_t
-plat_get_micro_ticks(void)
-{
-    return (uint32_t) plat_get_ticks_common();
-}
-
 void
 plat_remove(char *path)
 {
@@ -464,13 +473,19 @@ plat_remove(char *path)
 }
 
 void
-ui_sb_update_icon_state(int tag, int state)
+ui_sb_update_icon_state(UNUSED(int tag), UNUSED(int state))
 {
     /* No-op. */
 }
 
 void
-ui_sb_update_icon(int tag, int active)
+ui_sb_update_icon(UNUSED(int tag), UNUSED(int active))
+{
+    /* No-op. */
+}
+
+void
+ui_sb_update_icon_write(UNUSED(int tag), UNUSED(int active))
 {
     /* No-op. */
 }
@@ -482,7 +497,7 @@ plat_delay_ms(uint32_t count)
 }
 
 void
-ui_sb_update_tip(int arg)
+ui_sb_update_tip(UNUSED(int arg))
 {
     /* No-op. */
 }
@@ -519,8 +534,9 @@ path_get_dirname(char *dest, const char *path)
     *dest = '\0';
 }
 volatile int cpu_thread_run = 1;
+
 void
-ui_sb_set_text_w(wchar_t *wstr)
+ui_sb_set_text_w(UNUSED(wchar_t *wstr))
 {
     /* No-op. */
 }
@@ -538,7 +554,7 @@ strnicmp(const char *s1, const char *s2, size_t n)
 }
 
 void
-main_thread(void *param)
+main_thread(UNUSED(void *param))
 {
     uint32_t old_time;
     uint32_t new_time;
@@ -562,7 +578,7 @@ main_thread(void *param)
         old_time = new_time;
         if (drawits > 0 && !dopause) {
             /* Yes, so do one frame now. */
-            drawits -= 10;
+            drawits -= force_10ms ? 10 : 1;
             if (drawits > 50)
                 drawits = 0;
 
@@ -570,7 +586,7 @@ main_thread(void *param)
             pc_run();
 
             /* Every 200 frames we save the machine status. */
-            if (++frames >= 200 && nvr_dosave) {
+            if (++frames >= (force_10ms ? 200 : 2000) && nvr_dosave) {
                 nvr_save();
                 nvr_dosave = 0;
                 frames     = 0;
@@ -581,9 +597,9 @@ main_thread(void *param)
         /* If needed, handle a screen resize. */
         if (atomic_load(&doresize_monitors[0]) && !video_fullscreen && !is_quit) {
             if (vid_resize & 2)
-                plat_resize(fixed_size_x, fixed_size_y);
+                plat_resize(fixed_size_x, fixed_size_y, 0);
             else
-                plat_resize(scrnsz_x, scrnsz_y);
+                plat_resize(scrnsz_x, scrnsz_y, 0);
             atomic_store(&doresize_monitors[0], 1);
         }
     }
@@ -647,12 +663,12 @@ ui_msgbox_header(int flags, void *header, void *message)
     SDL_MessageBoxData       msgdata;
     SDL_MessageBoxButtonData msgbtn;
 
-    if (!header)
-        header = (void *) ((flags & MBX_ANSI) ? "86Box" : L"86Box");
-    if (header <= (void *) 7168)
-        header = (void *) plat_get_string((uintptr_t) header);
-    if (message <= (void *) 7168)
-        message = (void *) plat_get_string((uintptr_t) message);
+    if (!header) {
+        if (flags & MBX_ANSI)
+            header = (void *) "86Box";
+        else
+            header = (void *) L"86Box";
+    }
 
     msgbtn.buttonid = 1;
     msgbtn.text     = "OK";
@@ -700,7 +716,7 @@ plat_get_exe_name(char *s, int size)
 void
 plat_power_off(void)
 {
-    confirm_exit = 0;
+    confirm_exit_cmdl = 0;
     nvr_save();
     config_save();
 
@@ -712,7 +728,7 @@ plat_power_off(void)
 }
 
 void
-ui_sb_bugui(char *str)
+ui_sb_bugui(UNUSED(char *str))
 {
     /* No-op. */
 }
@@ -731,7 +747,7 @@ int        real_sdl_w;
 int        real_sdl_h;
 
 void
-ui_sb_set_ready(int ready)
+ui_sb_set_ready(UNUSED(int ready))
 {
     /* No-op. */
 }
@@ -780,76 +796,121 @@ plat_pause(int p)
     }
 }
 
+#define TMP_PATH_BUFSIZE 1024
 void
 plat_init_rom_paths(void)
 {
 #ifndef __APPLE__
-    if (getenv("XDG_DATA_HOME")) {
-        char xdg_rom_path[1024] = { 0 };
-
-        strncpy(xdg_rom_path, getenv("XDG_DATA_HOME"), 1024);
-        path_slash(xdg_rom_path);
-        strncat(xdg_rom_path, "86Box/", 1024);
-
-        if (!plat_dir_check(xdg_rom_path))
+    const char *xdg_data_home = getenv("XDG_DATA_HOME");
+    if (xdg_data_home) {
+        char xdg_rom_path[TMP_PATH_BUFSIZE] = {0};
+        size_t used = snprintf(xdg_rom_path, sizeof(xdg_rom_path), "%s/", xdg_data_home);
+        if (used < sizeof(xdg_rom_path))
+            used += snprintf(xdg_rom_path + used, sizeof(xdg_rom_path) - used, "86Box/");
+        if (used < sizeof(xdg_rom_path) && !plat_dir_check(xdg_rom_path))
             plat_dir_create(xdg_rom_path);
-        strcat(xdg_rom_path, "roms/");
-
-        if (!plat_dir_check(xdg_rom_path))
+        if (used < sizeof(xdg_rom_path))
+            used += snprintf(xdg_rom_path + used, sizeof(xdg_rom_path) - used, "roms/");
+        if (used < sizeof(xdg_rom_path) && !plat_dir_check(xdg_rom_path))
             plat_dir_create(xdg_rom_path);
-        rom_add_path(xdg_rom_path);
+        if (used < sizeof(xdg_rom_path))
+            rom_add_path(xdg_rom_path);
     } else {
-        char home_rom_path[1024] = { 0 };
-
-        snprintf(home_rom_path, 1024, "%s/.local/share/86Box/", getenv("HOME") ? getenv("HOME") : getpwuid(getuid())->pw_dir);
-
-        if (!plat_dir_check(home_rom_path))
-            plat_dir_create(home_rom_path);
-        strcat(home_rom_path, "roms/");
-
-        if (!plat_dir_check(home_rom_path))
-            plat_dir_create(home_rom_path);
-        rom_add_path(home_rom_path);
-    }
-    if (getenv("XDG_DATA_DIRS")) {
-        char *xdg_rom_paths      = strdup(getenv("XDG_DATA_DIRS"));
-        char *xdg_rom_paths_orig = xdg_rom_paths;
-        char *cur_xdg_rom_path   = NULL;
-
-        if (xdg_rom_paths) {
-            while (xdg_rom_paths[strlen(xdg_rom_paths) - 1] == ':') {
-                xdg_rom_paths[strlen(xdg_rom_paths) - 1] = '\0';
-            }
-            while ((cur_xdg_rom_path = local_strsep(&xdg_rom_paths, ":")) != NULL) {
-                char real_xdg_rom_path[1024] = { '\0' };
-                strcat(real_xdg_rom_path, cur_xdg_rom_path);
-                path_slash(real_xdg_rom_path);
-                strcat(real_xdg_rom_path, "86Box/roms/");
-                rom_add_path(real_xdg_rom_path);
-            }
+        const char *home = getenv("HOME");
+        if (!home) {
+            struct passwd *pw = getpwuid(getuid());
+            if (pw)
+                home = pw->pw_dir;
+        }
+
+        if (home) {
+            char home_rom_path[TMP_PATH_BUFSIZE] = {0};
+            size_t used = snprintf(home_rom_path, sizeof(home_rom_path),
+                                   "%s/.local/share/86Box/", home);
+            if (used < sizeof(home_rom_path) && !plat_dir_check(home_rom_path))
+                plat_dir_create(home_rom_path);
+            if (used < sizeof(home_rom_path))
+                used += snprintf(home_rom_path + used,
+                                 sizeof(home_rom_path) - used, "roms/");
+            if (used < sizeof(home_rom_path) && !plat_dir_check(home_rom_path))
+                plat_dir_create(home_rom_path);
+            if (used < sizeof(home_rom_path))
+                rom_add_path(home_rom_path);
+        }
+    }
+
+    const char *xdg_data_dirs = getenv("XDG_DATA_DIRS");
+    if (xdg_data_dirs) {
+        char *xdg_rom_paths = strdup(xdg_data_dirs);
+        if (xdg_rom_paths) {
+            // Trim trailing colons
+            size_t len = strlen(xdg_rom_paths);
+            while (len > 0 && xdg_rom_paths[len - 1] == ':')
+                xdg_rom_paths[--len] = '\0';
+
+            char *saveptr = NULL;
+            char *cur_xdg = strtok_r(xdg_rom_paths, ":", &saveptr);
+            while (cur_xdg) {
+                char real_xdg_rom_path[TMP_PATH_BUFSIZE] = {0};
+                size_t used = snprintf(real_xdg_rom_path,
+                                       sizeof(real_xdg_rom_path),
+                                       "%s/86Box/roms/", cur_xdg);
+                if (used < sizeof(real_xdg_rom_path))
+                    rom_add_path(real_xdg_rom_path);
+                cur_xdg = strtok_r(NULL, ":", &saveptr);
+            }
+
+            free(xdg_rom_paths);
         }
-        free(xdg_rom_paths_orig);
     } else {
         rom_add_path("/usr/local/share/86Box/roms/");
         rom_add_path("/usr/share/86Box/roms/");
     }
 #else
-    char  default_rom_path[1024] = { '\0' };
+    char default_rom_path[TMP_PATH_BUFSIZE] = {0};
     getDefaultROMPath(default_rom_path);
     rom_add_path(default_rom_path);
 #endif
 }
+#undef TMP_PATH_BUFSIZE
 
 void
-plat_get_global_config_dir(char *strptr)
+plat_get_global_config_dir(char *outbuf, const size_t len)
 {
-#ifdef __APPLE__
-    char *prefPath = SDL_GetPrefPath(NULL, "net.86Box.86Box");
-#else
-    char *prefPath = SDL_GetPrefPath(NULL, "86Box");
-#endif
-    strncpy(strptr, prefPath, 1024);
-    path_slash(strptr);
+    return plat_get_global_data_dir(outbuf, len);
+}
+
+void
+plat_get_global_data_dir(char *outbuf, const size_t len)
+{
+    if (portable_mode) {
+        strncpy(outbuf, exe_path, len);
+    } else {
+        char *prefPath = SDL_GetPrefPath(NULL, "86Box");
+        strncpy(outbuf, prefPath, len);
+        SDL_free(prefPath);
+    }
+
+    path_slash(outbuf);
+}
+
+void
+plat_get_temp_dir(char *outbuf, uint8_t len)
+{
+    const char *tmpdir = getenv("TMPDIR");
+    if (tmpdir == NULL) {
+        tmpdir = "/tmp";
+    }
+    strncpy(outbuf, tmpdir, len);
+    path_slash(outbuf);
+}
+
+void
+plat_get_vmm_dir(char *outbuf, const size_t len)
+{
+    // Return empty string. SDL 86Box does not have a VM manager
+    if (len > 0)
+        outbuf[0] = 0;
 }
 
 bool
@@ -899,15 +960,20 @@ void (*f_rl_callback_handler_remove)(void) = NULL;
 #    define LIBEDIT_LIBRARY "libedit.so"
 #endif
 
+void ui_sb_update_icon_wp(int tag, int state)
+{
+    /* No-op */
+}
+
 uint32_t
-timer_onesec(uint32_t interval, void *param)
+timer_onesec(uint32_t interval, UNUSED(void *param))
 {
     pc_onesec();
     return interval;
 }
 
 void
-monitor_thread(void *param)
+monitor_thread(UNUSED(void *param))
 {
 #ifndef USE_CLI
     if (isatty(fileno(stdin)) && isatty(fileno(stdout))) {
@@ -952,12 +1018,12 @@ monitor_thread(void *param)
                     printf(
                         "fddload <id> <filename> <wp> - Load floppy disk image into drive <id>.\n"
                         "cdload <id> <filename> - Load CD-ROM image into drive <id>.\n"
-                        "zipload <id> <filename> <wp> - Load ZIP image into ZIP drive <id>.\n"
+                        "rdiskload <id> <filename> <wp> - Load removable disk image into removable disk drive <id>.\n"
                         "cartload <id> <filename> <wp> - Load cartridge image into cartridge drive <id>.\n"
                         "moload <id> <filename> <wp> - Load MO image into MO drive <id>.\n\n"
                         "fddeject <id> - eject disk from floppy drive <id>.\n"
                         "cdeject <id> - eject disc from CD-ROM drive <id>.\n"
-                        "zipeject <id> - eject ZIP image from ZIP drive <id>.\n"
+                        "rdiskeject <id> - eject removable disk image from removable disk drive <id>.\n"
                         "carteject <id> - eject cartridge from drive <id>.\n"
                         "moeject <id> - eject image from MO drive <id>.\n\n"
                         "hardreset - hard reset the emulated system.\n"
@@ -1062,8 +1128,8 @@ monitor_thread(void *param)
                     mo_eject(atoi(xargv[1]));
                 } else if (strncasecmp(xargv[0], "carteject", 8) == 0 && cmdargc >= 2) {
                     cartridge_eject(atoi(xargv[1]));
-                } else if (strncasecmp(xargv[0], "zipeject", 8) == 0 && cmdargc >= 2) {
-                    zip_eject(atoi(xargv[1]));
+                } else if (strncasecmp(xargv[0], "rdiskeject", 8) == 0 && cmdargc >= 2) {
+                    rdisk_eject(atoi(xargv[1]));
                 } else if (strncasecmp(xargv[0], "fddload", 7) == 0 && cmdargc >= 4) {
                     uint8_t id;
                     uint8_t wp;
@@ -1130,7 +1196,7 @@ monitor_thread(void *param)
                         printf("Inserting tape into cartridge holder %hhu: %s\n", id, fn);
                         cartridge_mount(id, fn, wp);
                     }
-                } else if (strncasecmp(xargv[0], "zipload", 7) == 0 && cmdargc >= 4) {
+                } else if (strncasecmp(xargv[0], "rdiskload", 7) == 0 && cmdargc >= 4) {
                     uint8_t id;
                     uint8_t wp;
                     bool    err = false;
@@ -1149,8 +1215,8 @@ monitor_thread(void *param)
                         if (fn[strlen(fn) - 1] == '\''
                             || fn[strlen(fn) - 1] == '"')
                             fn[strlen(fn) - 1] = '\0';
-                        printf("Inserting disk into ZIP drive %c: %s\n", id + 'A', fn);
-                        zip_mount(id, fn, wp);
+                        printf("Inserting disk into removable disk drive %c: %s\n", id + 'A', fn);
+                        rdisk_mount(id, fn, wp);
                     }
                 }
                 free(line);
@@ -1162,7 +1228,7 @@ monitor_thread(void *param)
 #endif
 }
 
-extern int gfxcard[2];
+extern int gfxcard[GFXCARD_MAX];
 int
 main(int argc, char **argv)
 {
@@ -1174,13 +1240,15 @@ main(int argc, char **argv)
     ret = pc_init(argc, argv);
     if (ret == 0)
         return 0;
-    if (!pc_init_modules()) {
+    if (!pc_init_roms()) {
         ui_msgbox_header(MBX_FATAL, L"No ROMs found.", L"86Box could not find any usable ROM images.\n\nPlease download a ROM set and extract it into the \"roms\" directory.");
         SDL_Quit();
         return 6;
     }
+    pc_init_modules();
 
-    gfxcard[1]  = 0;
+    for (uint8_t i = 1; i < GFXCARD_MAX; i++)
+        gfxcard[i]  = 0;
     eventthread = SDL_ThreadID();
     blitmtx     = SDL_CreateMutex();
     if (!blitmtx) {
@@ -1323,9 +1391,6 @@ main(int argc, char **argv)
                     }
             }
         }
-        if (mouse_capture && keyboard_ismsexit()) {
-            plat_mouse_capture(0);
-        }
         if (blitreq) {
             extern void sdl_blit(int x, int y, int w, int h);
             sdl_blit(params.x, params.y, params.w, params.h);
@@ -1356,20 +1421,14 @@ main(int argc, char **argv)
     return 0;
 }
 char *
-plat_vidapi_name(int i)
+plat_vidapi_name(UNUSED(int i))
 {
     return "default";
 }
 
-void
-set_language(uint32_t id)
-{
-    lang_id = id;
-}
-
-/* Sets up the program language before initialization. */
-uint32_t
-plat_language_code(char *langcode)
+/* Converts the language code string to a numeric language ID */
+int
+plat_language_code(UNUSED(char *langcode))
 {
     /* or maybe not */
     return 0;
@@ -1389,20 +1448,28 @@ plat_set_thread_name(void *thread, const char *name)
     if (thread) /* Apple pthread can only set self's name */
         return;
     char truncated[64];
+#elif defined(__NetBSD__)
+    char truncated[64];
+#elif defined(__HAIKU__)
+    char truncated[32];
 #else
     char truncated[16];
 #endif
     strncpy(truncated, name, sizeof(truncated) - 1);
 #ifdef __APPLE__
     pthread_setname_np(truncated);
+#elif defined(__NetBSD__)
+    pthread_setname_np(thread ? *((pthread_t *) thread) : pthread_self(), truncated, "%s");
+#elif defined(__HAIKU__)
+    rename_thread(find_thread(NULL), truncated);
 #else
     pthread_setname_np(thread ? *((pthread_t *) thread) : pthread_self(), truncated);
 #endif
 }
 
-/* Converts back the language code to LCID */
+/* Converts the numeric language ID to a language code string */
 void
-plat_language_code_r(uint32_t lcid, char *outbuf, int len)
+plat_language_code_r(UNUSED(int id), UNUSED(char *outbuf), UNUSED(int len))
 {
     /* or maybe not */
     return;
@@ -1421,7 +1488,7 @@ joystick_close(void)
 }
 
 void
-joystick_process(void)
+joystick_process(uint8_t gp)
 {
     /* No-op. */
 }
@@ -1440,7 +1507,7 @@ endblit(void)
 
 /* API */
 void
-ui_sb_mt32lcd(char *str)
+ui_sb_mt32lcd(UNUSED(char *str))
 {
     /* No-op. */
 }
diff --git a/src/unix/unix_cdrom.c b/src/unix/unix_cdrom.c
index 61813a754..09aaa5092 100644
--- a/src/unix/unix_cdrom.c
+++ b/src/unix/unix_cdrom.c
@@ -6,7 +6,7 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          Handle the platform-side of CDROM/ZIP/MO drives.
+ *          Handle the platform-side of CDROM/RDisk/MO drives.
  *
  *
  *
@@ -32,8 +32,9 @@
 #include <86box/hdd.h>
 #include <86box/scsi_device.h>
 #include <86box/cdrom.h>
+#include <86box/cdrom_image.h>
 #include <86box/mo.h>
-#include <86box/zip.h>
+#include <86box/rdisk.h>
 #include <86box/scsi_disk.h>
 #include <86box/plat.h>
 #include <86box/ui.h>
@@ -69,7 +70,7 @@ cassette_eject(void)
 }
 
 void
-cartridge_mount(uint8_t id, char *fn, uint8_t wp)
+cartridge_mount(uint8_t id, char *fn, UNUSED(uint8_t wp))
 {
     cart_close(id);
     cart_load(id, fn);
@@ -120,11 +121,11 @@ floppy_eject(uint8_t id)
 }
 
 void
-plat_cdrom_ui_update(uint8_t id, uint8_t reload)
+plat_cdrom_ui_update(uint8_t id, UNUSED(uint8_t reload))
 {
     cdrom_t *drv = &cdrom[id];
 
-    if (drv->host_drive == 0) {
+    if (drv->image_path[0] == 0x00) {
         ui_sb_update_icon_state(SB_CDROM | id, 1);
     } else {
         ui_sb_update_icon_state(SB_CDROM | id, 0);
@@ -139,24 +140,21 @@ plat_cdrom_ui_update(uint8_t id, uint8_t reload)
 void
 cdrom_mount(uint8_t id, char *fn)
 {
-    cdrom[id].prev_host_drive = cdrom[id].host_drive;
     strcpy(cdrom[id].prev_image_path, cdrom[id].image_path);
-    if (cdrom[id].ops && cdrom[id].ops->exit)
-        cdrom[id].ops->exit(&(cdrom[id]));
+    if (cdrom[id].ops && cdrom[id].ops->close)
+        cdrom[id].ops->close(cdrom[id].local);
     cdrom[id].ops = NULL;
     memset(cdrom[id].image_path, 0, sizeof(cdrom[id].image_path));
     if ((fn != NULL) && (strlen(fn) >= 1) && (fn[strlen(fn) - 1] == '\\'))
             fn[strlen(fn) - 1] = '/';
-    cdrom_image_open(&(cdrom[id]), fn);
+    image_open(&(cdrom[id]), fn);
     /* Signal media change to the emulated machine. */
     if (cdrom[id].insert)
         cdrom[id].insert(cdrom[id].priv);
-    cdrom[id].host_drive = (strlen(cdrom[id].image_path) == 0) ? 0 : 200;
-    if (cdrom[id].host_drive == 200) {
+    if (cdrom[id].image_path[0] == 0x00)
         ui_sb_update_icon_state(SB_CDROM | id, 0);
-    } else {
+    else
         ui_sb_update_icon_state(SB_CDROM | id, 1);
-    }
 #if 0
     media_menu_update_cdrom(id);
 #endif
@@ -190,8 +188,7 @@ mo_mount(uint8_t id, char *fn, uint8_t wp)
 
     mo_disk_close(dev);
     mo_drives[id].read_only = wp;
-    mo_load(dev, fn);
-    mo_insert(dev);
+    mo_load(dev, fn, 0);
 
     ui_sb_update_icon_state(SB_MO | id, strlen(mo_drives[id].image_path) ? 0 : 1);
 #if 0
@@ -223,59 +220,58 @@ mo_reload(uint8_t id)
 }
 
 void
-zip_eject(uint8_t id)
+rdisk_eject(uint8_t id)
 {
-    zip_t *dev = (zip_t *) zip_drives[id].priv;
+    rdisk_t *dev = (rdisk_t *) rdisk_drives[id].priv;
 
-    zip_disk_close(dev);
-    if (zip_drives[id].bus_type) {
+    rdisk_disk_close(dev);
+    if (rdisk_drives[id].bus_type) {
         /* Signal disk change to the emulated machine. */
-        zip_insert(dev);
+        rdisk_insert(dev);
     }
 
-    ui_sb_update_icon_state(SB_ZIP | id, 1);
+    ui_sb_update_icon_state(SB_RDISK | id, 1);
 #if 0
-    media_menu_update_zip(id);
+    media_menu_update_rdisk(id);
 #endif
-    ui_sb_update_tip(SB_ZIP | id);
+    ui_sb_update_tip(SB_RDISK | id);
     config_save();
 }
 
 void
-zip_mount(uint8_t id, char *fn, uint8_t wp)
+rdisk_mount(uint8_t id, char *fn, uint8_t wp)
 {
-    zip_t *dev = (zip_t *) zip_drives[id].priv;
+    rdisk_t *dev = (rdisk_t *) rdisk_drives[id].priv;
 
-    zip_disk_close(dev);
-    zip_drives[id].read_only = wp;
-    zip_load(dev, fn);
-    zip_insert(dev);
+    rdisk_disk_close(dev);
+    rdisk_drives[id].read_only = wp;
+    rdisk_load(dev, fn, 0);
 
-    ui_sb_update_icon_state(SB_ZIP | id, strlen(zip_drives[id].image_path) ? 0 : 1);
+    ui_sb_update_icon_state(SB_RDISK | id, strlen(rdisk_drives[id].image_path) ? 0 : 1);
 #if 0
-    media_menu_update_zip(id);
+    media_menu_update_rdisk(id);
 #endif
-    ui_sb_update_tip(SB_ZIP | id);
+    ui_sb_update_tip(SB_RDISK | id);
 
     config_save();
 }
 
 void
-zip_reload(uint8_t id)
+rdisk_reload(uint8_t id)
 {
-    zip_t *dev = (zip_t *) zip_drives[id].priv;
+    rdisk_t *dev = (rdisk_t *) rdisk_drives[id].priv;
 
-    zip_disk_reload(dev);
-    if (strlen(zip_drives[id].image_path) == 0) {
-        ui_sb_update_icon_state(SB_ZIP | id, 1);
+    rdisk_disk_reload(dev);
+    if (strlen(rdisk_drives[id].image_path) == 0) {
+        ui_sb_update_icon_state(SB_RDISK | id, 1);
     } else {
-        ui_sb_update_icon_state(SB_ZIP | id, 0);
+        ui_sb_update_icon_state(SB_RDISK | id, 0);
     }
 
 #if 0
-    media_menu_update_zip(id);
+    media_menu_update_rdisk(id);
 #endif
-    ui_sb_update_tip(SB_ZIP | id);
+    ui_sb_update_tip(SB_RDISK | id);
 
     config_save();
 }
diff --git a/src/unix/unix_netsocket.c b/src/unix/unix_netsocket.c
new file mode 100644
index 000000000..850fa3c6c
--- /dev/null
+++ b/src/unix/unix_netsocket.c
@@ -0,0 +1,205 @@
+#define _XOPEN_SOURCE 500
+#include <stdio.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <wchar.h>
+
+#include <86box/86box.h>
+#include <86box/log.h>
+#include <86box/timer.h>
+#include <86box/plat.h>
+#include <86box/device.h>
+#include <86box/plat_netsocket.h>
+#include <86box/ui.h>
+
+#include <arpa/inet.h>
+#include <errno.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <netdb.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <unistd.h>
+
+SOCKET
+plat_netsocket_create(int type)
+{
+    SOCKET fd  = -1;
+    int    yes = 1;
+
+    if (type != NET_SOCKET_TCP)
+        return -1;
+
+    fd = socket(AF_INET, SOCK_STREAM, 0);
+    if (fd == -1)
+        return -1;
+
+    fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK);
+    setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *) &yes, sizeof(yes));
+
+    return fd;
+}
+
+SOCKET
+plat_netsocket_create_server(int type, unsigned short port)
+{
+    struct sockaddr_in sock_addr;
+    SOCKET             fd  = -1;
+    int                yes = 1;
+
+    if (type != NET_SOCKET_TCP)
+        return -1;
+
+    fd = socket(AF_INET, SOCK_STREAM, 0);
+    if (fd == -1)
+        return -1;
+
+    memset(&sock_addr, 0, sizeof(struct sockaddr_in));
+
+    sock_addr.sin_family      = AF_INET;
+    sock_addr.sin_addr.s_addr = INADDR_ANY;
+    sock_addr.sin_port        = htons(port);
+
+    if (bind(fd, (struct sockaddr *) &sock_addr, sizeof(struct sockaddr_in)) == -1) {
+        plat_netsocket_close(fd);
+        return (SOCKET) -1;
+    }
+
+    if (listen(fd, 5) == -1) {
+        plat_netsocket_close(fd);
+        return (SOCKET) -1;
+    }
+
+    fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK);
+    setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *) &yes, sizeof(yes));
+
+    return fd;
+}
+
+void
+plat_netsocket_close(SOCKET socket)
+{
+    close((SOCKET) socket);
+}
+
+SOCKET
+plat_netsocket_accept(SOCKET socket)
+{
+    SOCKET clientsocket = accept(socket, NULL, NULL);
+
+    if (clientsocket == -1)
+        return -1;
+
+    fcntl(clientsocket, F_SETFL, fcntl(clientsocket, F_GETFL, 0) | O_NONBLOCK);
+
+    return clientsocket;
+}
+
+int
+plat_netsocket_connected(SOCKET socket)
+{
+    struct sockaddr addr;
+    socklen_t       len = sizeof(struct sockaddr);
+    fd_set          wrfds;
+    struct timeval  tv;
+    int             res    = -1;
+    int             status = 0;
+    socklen_t       optlen = 4;
+
+    FD_ZERO(&wrfds);
+    FD_SET(socket, &wrfds);
+
+    tv.tv_sec  = 0;
+    tv.tv_usec = 0;
+
+    res = select(socket + 1, NULL, &wrfds, NULL, &tv);
+
+    if (res == -1)
+        return -1;
+
+    if (res == 0 || !(res >= 1 && FD_ISSET(socket, &wrfds)))
+        return 0;
+
+    res = getsockopt(socket, SOL_SOCKET, SO_ERROR, (char *) &status, &optlen);
+
+    if (res == -1)
+        return -1;
+
+    if (status != 0)
+        return -1;
+
+    if (getpeername(socket, &addr, &len) == -1)
+        return -1;
+
+    return 1;
+}
+
+int
+plat_netsocket_connect(SOCKET socket, const char *hostname, unsigned short port)
+{
+    struct sockaddr_in sock_addr;
+    int                res = -1;
+
+    sock_addr.sin_family      = AF_INET;
+    sock_addr.sin_addr.s_addr = inet_addr(hostname);
+    sock_addr.sin_port        = htons(port);
+
+    if (sock_addr.sin_addr.s_addr == ((in_addr_t) -1) || sock_addr.sin_addr.s_addr == 0) {
+        struct hostent *hp;
+
+        hp = gethostbyname(hostname);
+
+        if (hp)
+            memcpy(&sock_addr.sin_addr.s_addr, hp->h_addr_list[0], hp->h_length);
+        else
+            return -1;
+    }
+
+    res = connect(socket, (struct sockaddr *) &sock_addr, sizeof(struct sockaddr_in));
+
+    if (res == -1) {
+        int error = errno;
+
+        if (error == EISCONN || error == EWOULDBLOCK || error == EAGAIN || error == EINPROGRESS)
+            return 0;
+
+        res = -1;
+    }
+    return res;
+}
+
+int
+plat_netsocket_send(SOCKET socket, const unsigned char *data, unsigned int size, int *wouldblock)
+{
+    int res = send(socket, (const char *) data, size, 0);
+
+    if (res == -1) {
+        int error = errno;
+
+        if (wouldblock)
+            *wouldblock = !!(error == EWOULDBLOCK || error == EAGAIN);
+
+        return -1;
+    }
+    return res;
+}
+
+int
+plat_netsocket_receive(SOCKET socket, unsigned char *data, unsigned int size, int *wouldblock)
+{
+    int res = recv(socket, (char *) data, size, 0);
+
+    if (res == -1) {
+        int error = errno;
+
+        if (wouldblock)
+            *wouldblock = !!(error == EWOULDBLOCK || error == EAGAIN);
+
+        return -1;
+    }
+    return res;
+}
diff --git a/src/unix/unix_sdl.c b/src/unix/unix_sdl.c
index 3ba8c1ae0..651822335 100644
--- a/src/unix/unix_sdl.c
+++ b/src/unix/unix_sdl.c
@@ -392,7 +392,7 @@ sdl_reload(void)
 }
 
 int
-plat_vidapi(char *api)
+plat_vidapi(UNUSED(const char *api))
 {
     return 0;
 }
@@ -424,9 +424,9 @@ sdl_init_common(int flags)
     sdl_set_fs(video_fullscreen);
     if (!(video_fullscreen & 1)) {
         if (vid_resize & 2)
-            plat_resize(fixed_size_x, fixed_size_y);
+            plat_resize(fixed_size_x, fixed_size_y, 0);
         else
-            plat_resize(scrnsz_x, scrnsz_y);
+            plat_resize(scrnsz_x, scrnsz_y, 0);
     }
     if ((vid_resize < 2) && window_remember) {
         SDL_SetWindowSize(sdl_win, window_w, window_h);
@@ -479,7 +479,7 @@ plat_mouse_capture(int on)
 }
 
 void
-plat_resize(int w, int h)
+plat_resize(int w, int h, UNUSED(int monitor_index))
 {
     SDL_LockMutex(sdl_mutex);
     resize_w       = w;
@@ -533,19 +533,19 @@ ui_window_title(wchar_t *str)
 }
 
 void
-ui_init_monitor(int monitor_index)
+ui_init_monitor(UNUSED(int monitor_index))
 {
     /* No-op. */
 }
 
 void
-ui_deinit_monitor(int monitor_index)
+ui_deinit_monitor(UNUSED(int monitor_index))
 {
     /* No-op. */
 }
 
 void
-plat_resize_request(int w, int h, int monitor_index)
+plat_resize_request(UNUSED(int w), UNUSED(int h), int monitor_index)
 {
     atomic_store((&doresize_monitors[monitor_index]), 1);
 }
diff --git a/src/unix/unix_serial_passthrough.c b/src/unix/unix_serial_passthrough.c
index d80f8a1e7..fb74f67b3 100644
--- a/src/unix/unix_serial_passthrough.c
+++ b/src/unix/unix_serial_passthrough.c
@@ -13,7 +13,7 @@
  *              Jasmine Iwanek <jasmine@iwanek.co.uk>
  *
  *              Copyright 2021      Andreas J. Reichel.
- *              Copyright 2021-2022 Jasmine Iwanek.
+ *              Copyright 2021-2025 Jasmine Iwanek.
  */
 
 #ifndef __APPLE__
@@ -22,7 +22,11 @@
 #    define _BSD_SOURCE     1
 #endif
 #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-#    define __BSD_VISIBLE   1
+#    define __BSD_VISIBLE 1
+#endif
+#ifdef __NetBSD__
+#    define _NETBSD_VISIBLE 1
+#    define _NETBSD_SOURCE 1
 #endif
 #include <stdio.h>
 #include <fcntl.h>
@@ -32,6 +36,7 @@
 #include <sys/select.h>
 #include <stdint.h>
 #include <sys/select.h>
+#include <sys/ioctl.h>
 
 #include <86box/86box.h>
 #include <86box/log.h>
@@ -44,6 +49,35 @@
 
 #define LOG_PREFIX "serial_passthrough: "
 
+void
+plat_serpt_set_line_state(void *priv)
+{
+    serial_passthrough_t *dev = (serial_passthrough_t *) priv;
+    int setstate = 0, clrstate = 0, curstate = 0;
+    if (dev->mode != SERPT_MODE_HOSTSER)
+        return;
+    
+    if (dev->serial->lcr & (1 << 6)) {
+        tcsendbreak(dev->master_fd, 0);
+    }
+
+    ioctl(dev->master_fd, TIOCMGET, &curstate);
+
+    clrstate |= !(dev->serial->mctrl & 1) ? TIOCM_DTR : 0;
+    clrstate |= !(dev->serial->mctrl & 2) ? TIOCM_RTS : 0;
+
+    setstate |= (dev->serial->mctrl & 1) ? TIOCM_DTR : 0;
+    setstate |= (dev->serial->mctrl & 2) ? TIOCM_RTS : 0;
+
+    ioctl(dev->master_fd, TIOCMBIS, &setstate);
+    ioctl(dev->master_fd, TIOCMBIC, &clrstate);
+
+    serial_set_cts(dev->serial, !!(curstate & TIOCM_CTS));
+    serial_set_dcd(dev->serial, !!(curstate & TIOCM_CAR));
+    serial_set_dsr(dev->serial, !!(curstate & TIOCM_DSR));
+    serial_set_ri(dev->serial, !!(curstate & TIOCM_RI));
+}
+
 int
 plat_serpt_read(void *priv, uint8_t *data)
 {
@@ -53,8 +87,13 @@ plat_serpt_read(void *priv, uint8_t *data)
     fd_set                rdfds;
 
     switch (dev->mode) {
+        case SERPT_MODE_HOSTSER: {
+            if (read(dev->master_fd, data, 1) > 0) {
+                return 1;
+            }
+            return 0;
+        }
         case SERPT_MODE_VCON:
-        case SERPT_MODE_HOSTSER:
             FD_ZERO(&rdfds);
             FD_SET(dev->master_fd, &rdfds);
             tv.tv_sec  = 0;
@@ -112,7 +151,7 @@ plat_serpt_write_vcon(serial_passthrough_t *dev, uint8_t data)
     if (dev->mode == SERPT_MODE_HOSTSER) {
         do {
             res = write(dev->master_fd, &data, 1);
-        } while (res == 0 || (res == -1 && (errno == EAGAIN || res == EWOULDBLOCK)));
+        } while (res == 0 || (res == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)));
     } else
         res = write(dev->master_fd, &data, 1);
 }
@@ -146,8 +185,11 @@ plat_serpt_set_params(void *priv)
         BAUDRATE_RANGE(dev->baudrate, 9600, 19200, B9600);
         BAUDRATE_RANGE(dev->baudrate, 19200, 38400, B19200);
         BAUDRATE_RANGE(dev->baudrate, 38400, 57600, B38400);
+#ifndef __NetBSD__
+	/* nonexistent on NetBSD */
         BAUDRATE_RANGE(dev->baudrate, 57600, 115200, B57600);
         BAUDRATE_RANGE(dev->baudrate, 115200, 0xFFFFFFFF, B115200);
+#endif
 
         term_attr.c_cflag &= ~CSIZE;
         switch (dev->data_bits) {
@@ -182,6 +224,7 @@ plat_serpt_set_params(void *priv)
                 term_attr.c_cflag |= CMSPAR;
 #endif
         }
+        term_attr.c_iflag &= ~(IXON | IXOFF);
         tcsetattr(dev->master_fd, TCSANOW, &term_attr);
 #undef BAUDRATE_RANGE
     }
@@ -303,14 +346,12 @@ plat_serpt_open_device(void *priv)
 
     switch (dev->mode) {
         case SERPT_MODE_VCON:
-            if (!open_pseudo_terminal(dev)) {
+            if (!open_pseudo_terminal(dev))
                 return 1;
-            }
             break;
         case SERPT_MODE_HOSTSER:
-            if (!open_host_serial_port(dev)) {
+            if (!open_host_serial_port(dev))
                 return 1;
-            }
             break;
         default:
             break;
diff --git a/src/usb.c b/src/usb.c
index 6bdc8e6c0..222062f4f 100644
--- a/src/usb.c
+++ b/src/usb.c
@@ -433,7 +433,7 @@ const device_t usb_device = {
     .init          = usb_init,
     .close         = usb_close,
     .reset         = usb_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
new file mode 100644
index 000000000..bcbc7aafd
--- /dev/null
+++ b/src/utils/CMakeLists.txt
@@ -0,0 +1,27 @@
+#
+# 86Box    A hypervisor and IBM PC system emulator that specializes in
+#          running old operating systems and software designed for IBM
+#          PC systems and compatibles from 1981 through fairly recent
+#          system designs based on the PCI bus.
+#
+#          This file is part of the 86Box distribution.
+#
+#          CMake build script.
+#
+# Authors: David Hrdlička, <hrdlickadavid@outlook.com>
+#          Jasmine Iwanek, <jriwanek@gmail.com>
+#
+#          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2024      Jasmine Iwanek.
+#
+
+add_library(utils OBJECT
+    cJSON.c
+    crc.c
+    crc32.c
+    fifo.c
+    fifo8.c
+    ini.c
+    log.c
+    random.c
+)
diff --git a/src/utils/cJSON.c b/src/utils/cJSON.c
new file mode 100644
index 000000000..4e4979e99
--- /dev/null
+++ b/src/utils/cJSON.c
@@ -0,0 +1,3129 @@
+/*
+  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+/* cJSON */
+/* JSON parser in C. */
+
+/* disable warnings about old C89 functions in MSVC */
+#if !defined(_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER)
+#define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+#ifdef __GNUC__
+#pragma GCC visibility push(default)
+#endif
+#if defined(_MSC_VER)
+#pragma warning (push)
+/* disable warning about single line comments in system headers */
+#pragma warning (disable : 4001)
+#endif
+
+#include <string.h>
+#include <stdio.h>
+#include <math.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <ctype.h>
+#include <float.h>
+
+#ifdef ENABLE_LOCALES
+#include <locale.h>
+#endif
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
+#ifdef __GNUC__
+#pragma GCC visibility pop
+#endif
+
+#include "cJSON.h"
+
+/* define our own boolean type */
+#ifdef true
+#undef true
+#endif
+#define true ((cJSON_bool)1)
+
+#ifdef false
+#undef false
+#endif
+#define false ((cJSON_bool)0)
+
+/* define isnan and isinf for ANSI C, if in C99 or above, isnan and isinf has been defined in math.h */
+#ifndef isinf
+#define isinf(d) (isnan((d - d)) && !isnan(d))
+#endif
+#ifndef isnan
+#define isnan(d) (d != d)
+#endif
+
+#ifndef NAN
+#ifdef _WIN32
+#define NAN sqrt(-1.0)
+#else
+#define NAN 0.0/0.0
+#endif
+#endif
+
+typedef struct {
+    const unsigned char *json;
+    size_t position;
+} error;
+static error global_error = { NULL, 0 };
+
+CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void)
+{
+    return (const char*) (global_error.json + global_error.position);
+}
+
+CJSON_PUBLIC(char *) cJSON_GetStringValue(const cJSON * const item)
+{
+    if (!cJSON_IsString(item))
+    {
+        return NULL;
+    }
+
+    return item->valuestring;
+}
+
+CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item)
+{
+    if (!cJSON_IsNumber(item))
+    {
+        return (double) NAN;
+    }
+
+    return item->valuedouble;
+}
+
+/* This is a safeguard to prevent copy-pasters from using incompatible C and header files */
+#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 17)
+    #error cJSON.h and cJSON.c have different versions. Make sure that both have the same.
+#endif
+
+CJSON_PUBLIC(const char*) cJSON_Version(void)
+{
+    static char version[15];
+    sprintf(version, "%i.%i.%i", CJSON_VERSION_MAJOR, CJSON_VERSION_MINOR, CJSON_VERSION_PATCH);
+
+    return version;
+}
+
+/* Case insensitive string comparison, doesn't consider two NULL pointers equal though */
+static int case_insensitive_strcmp(const unsigned char *string1, const unsigned char *string2)
+{
+    if ((string1 == NULL) || (string2 == NULL))
+    {
+        return 1;
+    }
+
+    if (string1 == string2)
+    {
+        return 0;
+    }
+
+    for(; tolower(*string1) == tolower(*string2); (void)string1++, string2++)
+    {
+        if (*string1 == '\0')
+        {
+            return 0;
+        }
+    }
+
+    return tolower(*string1) - tolower(*string2);
+}
+
+typedef struct internal_hooks
+{
+    void *(CJSON_CDECL *allocate)(size_t size);
+    void (CJSON_CDECL *deallocate)(void *pointer);
+    void *(CJSON_CDECL *reallocate)(void *pointer, size_t size);
+} internal_hooks;
+
+#if defined(_MSC_VER)
+/* work around MSVC error C2322: '...' address of dllimport '...' is not static */
+static void * CJSON_CDECL internal_malloc(size_t size)
+{
+    return malloc(size);
+}
+static void CJSON_CDECL internal_free(void *pointer)
+{
+    free(pointer);
+}
+static void * CJSON_CDECL internal_realloc(void *pointer, size_t size)
+{
+    return realloc(pointer, size);
+}
+#else
+#define internal_malloc malloc
+#define internal_free free
+#define internal_realloc realloc
+#endif
+
+/* strlen of character literals resolved at compile time */
+#define static_strlen(string_literal) (sizeof(string_literal) - sizeof(""))
+
+static internal_hooks global_hooks = { internal_malloc, internal_free, internal_realloc };
+
+static unsigned char* cJSON_strdup(const unsigned char* string, const internal_hooks * const hooks)
+{
+    size_t length = 0;
+    unsigned char *copy = NULL;
+
+    if (string == NULL)
+    {
+        return NULL;
+    }
+
+    length = strlen((const char*)string) + sizeof("");
+    copy = (unsigned char*)hooks->allocate(length);
+    if (copy == NULL)
+    {
+        return NULL;
+    }
+    memcpy(copy, string, length);
+
+    return copy;
+}
+
+CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks)
+{
+    if (hooks == NULL)
+    {
+        /* Reset hooks */
+        global_hooks.allocate = malloc;
+        global_hooks.deallocate = free;
+        global_hooks.reallocate = realloc;
+        return;
+    }
+
+    global_hooks.allocate = malloc;
+    if (hooks->malloc_fn != NULL)
+    {
+        global_hooks.allocate = hooks->malloc_fn;
+    }
+
+    global_hooks.deallocate = free;
+    if (hooks->free_fn != NULL)
+    {
+        global_hooks.deallocate = hooks->free_fn;
+    }
+
+    /* use realloc only if both free and malloc are used */
+    global_hooks.reallocate = NULL;
+    if ((global_hooks.allocate == malloc) && (global_hooks.deallocate == free))
+    {
+        global_hooks.reallocate = realloc;
+    }
+}
+
+/* Internal constructor. */
+static cJSON *cJSON_New_Item(const internal_hooks * const hooks)
+{
+    cJSON* node = (cJSON*)hooks->allocate(sizeof(cJSON));
+    if (node)
+    {
+        memset(node, '\0', sizeof(cJSON));
+    }
+
+    return node;
+}
+
+/* Delete a cJSON structure. */
+CJSON_PUBLIC(void) cJSON_Delete(cJSON *item)
+{
+    cJSON *next = NULL;
+    while (item != NULL)
+    {
+        next = item->next;
+        if (!(item->type & cJSON_IsReference) && (item->child != NULL))
+        {
+            cJSON_Delete(item->child);
+        }
+        if (!(item->type & cJSON_IsReference) && (item->valuestring != NULL))
+        {
+            global_hooks.deallocate(item->valuestring);
+        }
+        if (!(item->type & cJSON_StringIsConst) && (item->string != NULL))
+        {
+            global_hooks.deallocate(item->string);
+        }
+        global_hooks.deallocate(item);
+        item = next;
+    }
+}
+
+/* get the decimal point character of the current locale */
+static unsigned char get_decimal_point(void)
+{
+#ifdef ENABLE_LOCALES
+    struct lconv *lconv = localeconv();
+    return (unsigned char) lconv->decimal_point[0];
+#else
+    return '.';
+#endif
+}
+
+typedef struct
+{
+    const unsigned char *content;
+    size_t length;
+    size_t offset;
+    size_t depth; /* How deeply nested (in arrays/objects) is the input at the current offset. */
+    internal_hooks hooks;
+} parse_buffer;
+
+/* check if the given size is left to read in a given parse buffer (starting with 1) */
+#define can_read(buffer, size) ((buffer != NULL) && (((buffer)->offset + size) <= (buffer)->length))
+/* check if the buffer can be accessed at the given index (starting with 0) */
+#define can_access_at_index(buffer, index) ((buffer != NULL) && (((buffer)->offset + index) < (buffer)->length))
+#define cannot_access_at_index(buffer, index) (!can_access_at_index(buffer, index))
+/* get a pointer to the buffer at the position */
+#define buffer_at_offset(buffer) ((buffer)->content + (buffer)->offset)
+
+/* Parse the input text to generate a number, and populate the result into item. */
+static cJSON_bool parse_number(cJSON * const item, parse_buffer * const input_buffer)
+{
+    double number = 0;
+    unsigned char *after_end = NULL;
+    unsigned char number_c_string[64];
+    unsigned char decimal_point = get_decimal_point();
+    size_t i = 0;
+
+    if ((input_buffer == NULL) || (input_buffer->content == NULL))
+    {
+        return false;
+    }
+
+    /* copy the number into a temporary buffer and replace '.' with the decimal point
+     * of the current locale (for strtod)
+     * This also takes care of '\0' not necessarily being available for marking the end of the input */
+    for (i = 0; (i < (sizeof(number_c_string) - 1)) && can_access_at_index(input_buffer, i); i++)
+    {
+        switch (buffer_at_offset(input_buffer)[i])
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            case '+':
+            case '-':
+            case 'e':
+            case 'E':
+                number_c_string[i] = buffer_at_offset(input_buffer)[i];
+                break;
+
+            case '.':
+                number_c_string[i] = decimal_point;
+                break;
+
+            default:
+                goto loop_end;
+        }
+    }
+loop_end:
+    number_c_string[i] = '\0';
+
+    number = strtod((const char*)number_c_string, (char**)&after_end);
+    if (number_c_string == after_end)
+    {
+        return false; /* parse_error */
+    }
+
+    item->valuedouble = number;
+
+    /* use saturation in case of overflow */
+    if (number >= INT_MAX)
+    {
+        item->valueint = INT_MAX;
+    }
+    else if (number <= (double)INT_MIN)
+    {
+        item->valueint = INT_MIN;
+    }
+    else
+    {
+        item->valueint = (int)number;
+    }
+
+    item->type = cJSON_Number;
+
+    input_buffer->offset += (size_t)(after_end - number_c_string);
+    return true;
+}
+
+/* don't ask me, but the original cJSON_SetNumberValue returns an integer or double */
+CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number)
+{
+    if (number >= INT_MAX)
+    {
+        object->valueint = INT_MAX;
+    }
+    else if (number <= (double)INT_MIN)
+    {
+        object->valueint = INT_MIN;
+    }
+    else
+    {
+        object->valueint = (int)number;
+    }
+
+    return object->valuedouble = number;
+}
+
+CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring)
+{
+    char *copy = NULL;
+    /* if object's type is not cJSON_String or is cJSON_IsReference, it should not set valuestring */
+    if ((object == NULL) || !(object->type & cJSON_String) || (object->type & cJSON_IsReference))
+    {
+        return NULL;
+    }
+    /* return NULL if the object is corrupted */
+    if (object->valuestring == NULL)
+    {
+        return NULL;
+    }
+    if (strlen(valuestring) <= strlen(object->valuestring))
+    {
+        strcpy(object->valuestring, valuestring);
+        return object->valuestring;
+    }
+    copy = (char*) cJSON_strdup((const unsigned char*)valuestring, &global_hooks);
+    if (copy == NULL)
+    {
+        return NULL;
+    }
+    if (object->valuestring != NULL)
+    {
+        cJSON_free(object->valuestring);
+    }
+    object->valuestring = copy;
+
+    return copy;
+}
+
+typedef struct
+{
+    unsigned char *buffer;
+    size_t length;
+    size_t offset;
+    size_t depth; /* current nesting depth (for formatted printing) */
+    cJSON_bool noalloc;
+    cJSON_bool format; /* is this print a formatted print */
+    internal_hooks hooks;
+} printbuffer;
+
+/* realloc printbuffer if necessary to have at least "needed" bytes more */
+static unsigned char* ensure(printbuffer * const p, size_t needed)
+{
+    unsigned char *newbuffer = NULL;
+    size_t newsize = 0;
+
+    if ((p == NULL) || (p->buffer == NULL))
+    {
+        return NULL;
+    }
+
+    if ((p->length > 0) && (p->offset >= p->length))
+    {
+        /* make sure that offset is valid */
+        return NULL;
+    }
+
+    if (needed > INT_MAX)
+    {
+        /* sizes bigger than INT_MAX are currently not supported */
+        return NULL;
+    }
+
+    needed += p->offset + 1;
+    if (needed <= p->length)
+    {
+        return p->buffer + p->offset;
+    }
+
+    if (p->noalloc) {
+        return NULL;
+    }
+
+    /* calculate new buffer size */
+    if (needed > (INT_MAX / 2))
+    {
+        /* overflow of int, use INT_MAX if possible */
+        if (needed <= INT_MAX)
+        {
+            newsize = INT_MAX;
+        }
+        else
+        {
+            return NULL;
+        }
+    }
+    else
+    {
+        newsize = needed * 2;
+    }
+
+    if (p->hooks.reallocate != NULL)
+    {
+        /* reallocate with realloc if available */
+        newbuffer = (unsigned char*)p->hooks.reallocate(p->buffer, newsize);
+        if (newbuffer == NULL)
+        {
+            p->hooks.deallocate(p->buffer);
+            p->length = 0;
+            p->buffer = NULL;
+
+            return NULL;
+        }
+    }
+    else
+    {
+        /* otherwise reallocate manually */
+        newbuffer = (unsigned char*)p->hooks.allocate(newsize);
+        if (!newbuffer)
+        {
+            p->hooks.deallocate(p->buffer);
+            p->length = 0;
+            p->buffer = NULL;
+
+            return NULL;
+        }
+
+        memcpy(newbuffer, p->buffer, p->offset + 1);
+        p->hooks.deallocate(p->buffer);
+    }
+    p->length = newsize;
+    p->buffer = newbuffer;
+
+    return newbuffer + p->offset;
+}
+
+/* calculate the new length of the string in a printbuffer and update the offset */
+static void update_offset(printbuffer * const buffer)
+{
+    const unsigned char *buffer_pointer = NULL;
+    if ((buffer == NULL) || (buffer->buffer == NULL))
+    {
+        return;
+    }
+    buffer_pointer = buffer->buffer + buffer->offset;
+
+    buffer->offset += strlen((const char*)buffer_pointer);
+}
+
+/* securely comparison of floating-point variables */
+static cJSON_bool compare_double(double a, double b)
+{
+    double maxVal = fabs(a) > fabs(b) ? fabs(a) : fabs(b);
+    return (fabs(a - b) <= maxVal * DBL_EPSILON);
+}
+
+/* Render the number nicely from the given item into a string. */
+static cJSON_bool print_number(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output_pointer = NULL;
+    double d = item->valuedouble;
+    int length = 0;
+    size_t i = 0;
+    unsigned char number_buffer[26] = {0}; /* temporary buffer to print the number into */
+    unsigned char decimal_point = get_decimal_point();
+    double test = 0.0;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* This checks for NaN and Infinity */
+    if (isnan(d) || isinf(d))
+    {
+        length = sprintf((char*)number_buffer, "null");
+    }
+	else if(d == (double)item->valueint)
+	{
+		length = sprintf((char*)number_buffer, "%d", item->valueint);
+	}
+    else
+    {
+        /* Try 15 decimal places of precision to avoid nonsignificant nonzero digits */
+        length = sprintf((char*)number_buffer, "%1.15g", d);
+
+        /* Check whether the original double can be recovered */
+        if ((sscanf((char*)number_buffer, "%lg", &test) != 1) || !compare_double((double)test, d))
+        {
+            /* If not, print with 17 decimal places of precision */
+            length = sprintf((char*)number_buffer, "%1.17g", d);
+        }
+    }
+
+    /* sprintf failed or buffer overrun occurred */
+    if ((length < 0) || (length > (int)(sizeof(number_buffer) - 1)))
+    {
+        return false;
+    }
+
+    /* reserve appropriate space in the output */
+    output_pointer = ensure(output_buffer, (size_t)length + sizeof(""));
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+
+    /* copy the printed number to the output and replace locale
+     * dependent decimal point with '.' */
+    for (i = 0; i < ((size_t)length); i++)
+    {
+        if (number_buffer[i] == decimal_point)
+        {
+            output_pointer[i] = '.';
+            continue;
+        }
+
+        output_pointer[i] = number_buffer[i];
+    }
+    output_pointer[i] = '\0';
+
+    output_buffer->offset += (size_t)length;
+
+    return true;
+}
+
+/* parse 4 digit hexadecimal number */
+static unsigned parse_hex4(const unsigned char * const input)
+{
+    unsigned int h = 0;
+    size_t i = 0;
+
+    for (i = 0; i < 4; i++)
+    {
+        /* parse digit */
+        if ((input[i] >= '0') && (input[i] <= '9'))
+        {
+            h += (unsigned int) input[i] - '0';
+        }
+        else if ((input[i] >= 'A') && (input[i] <= 'F'))
+        {
+            h += (unsigned int) 10 + input[i] - 'A';
+        }
+        else if ((input[i] >= 'a') && (input[i] <= 'f'))
+        {
+            h += (unsigned int) 10 + input[i] - 'a';
+        }
+        else /* invalid */
+        {
+            return 0;
+        }
+
+        if (i < 3)
+        {
+            /* shift left to make place for the next nibble */
+            h = h << 4;
+        }
+    }
+
+    return h;
+}
+
+/* converts a UTF-16 literal to UTF-8
+ * A literal can be one or two sequences of the form \uXXXX */
+static unsigned char utf16_literal_to_utf8(const unsigned char * const input_pointer, const unsigned char * const input_end, unsigned char **output_pointer)
+{
+    long unsigned int codepoint = 0;
+    unsigned int first_code = 0;
+    const unsigned char *first_sequence = input_pointer;
+    unsigned char utf8_length = 0;
+    unsigned char utf8_position = 0;
+    unsigned char sequence_length = 0;
+    unsigned char first_byte_mark = 0;
+
+    if ((input_end - first_sequence) < 6)
+    {
+        /* input ends unexpectedly */
+        goto fail;
+    }
+
+    /* get the first utf16 sequence */
+    first_code = parse_hex4(first_sequence + 2);
+
+    /* check that the code is valid */
+    if (((first_code >= 0xDC00) && (first_code <= 0xDFFF)))
+    {
+        goto fail;
+    }
+
+    /* UTF16 surrogate pair */
+    if ((first_code >= 0xD800) && (first_code <= 0xDBFF))
+    {
+        const unsigned char *second_sequence = first_sequence + 6;
+        unsigned int second_code = 0;
+        sequence_length = 12; /* \uXXXX\uXXXX */
+
+        if ((input_end - second_sequence) < 6)
+        {
+            /* input ends unexpectedly */
+            goto fail;
+        }
+
+        if ((second_sequence[0] != '\\') || (second_sequence[1] != 'u'))
+        {
+            /* missing second half of the surrogate pair */
+            goto fail;
+        }
+
+        /* get the second utf16 sequence */
+        second_code = parse_hex4(second_sequence + 2);
+        /* check that the code is valid */
+        if ((second_code < 0xDC00) || (second_code > 0xDFFF))
+        {
+            /* invalid second half of the surrogate pair */
+            goto fail;
+        }
+
+
+        /* calculate the unicode codepoint from the surrogate pair */
+        codepoint = 0x10000 + (((first_code & 0x3FF) << 10) | (second_code & 0x3FF));
+    }
+    else
+    {
+        sequence_length = 6; /* \uXXXX */
+        codepoint = first_code;
+    }
+
+    /* encode as UTF-8
+     * takes at maximum 4 bytes to encode:
+     * 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
+    if (codepoint < 0x80)
+    {
+        /* normal ascii, encoding 0xxxxxxx */
+        utf8_length = 1;
+    }
+    else if (codepoint < 0x800)
+    {
+        /* two bytes, encoding 110xxxxx 10xxxxxx */
+        utf8_length = 2;
+        first_byte_mark = 0xC0; /* 11000000 */
+    }
+    else if (codepoint < 0x10000)
+    {
+        /* three bytes, encoding 1110xxxx 10xxxxxx 10xxxxxx */
+        utf8_length = 3;
+        first_byte_mark = 0xE0; /* 11100000 */
+    }
+    else if (codepoint <= 0x10FFFF)
+    {
+        /* four bytes, encoding 1110xxxx 10xxxxxx 10xxxxxx 10xxxxxx */
+        utf8_length = 4;
+        first_byte_mark = 0xF0; /* 11110000 */
+    }
+    else
+    {
+        /* invalid unicode codepoint */
+        goto fail;
+    }
+
+    /* encode as utf8 */
+    for (utf8_position = (unsigned char)(utf8_length - 1); utf8_position > 0; utf8_position--)
+    {
+        /* 10xxxxxx */
+        (*output_pointer)[utf8_position] = (unsigned char)((codepoint | 0x80) & 0xBF);
+        codepoint >>= 6;
+    }
+    /* encode first byte */
+    if (utf8_length > 1)
+    {
+        (*output_pointer)[0] = (unsigned char)((codepoint | first_byte_mark) & 0xFF);
+    }
+    else
+    {
+        (*output_pointer)[0] = (unsigned char)(codepoint & 0x7F);
+    }
+
+    *output_pointer += utf8_length;
+
+    return sequence_length;
+
+fail:
+    return 0;
+}
+
+/* Parse the input text into an unescaped cinput, and populate item. */
+static cJSON_bool parse_string(cJSON * const item, parse_buffer * const input_buffer)
+{
+    const unsigned char *input_pointer = buffer_at_offset(input_buffer) + 1;
+    const unsigned char *input_end = buffer_at_offset(input_buffer) + 1;
+    unsigned char *output_pointer = NULL;
+    unsigned char *output = NULL;
+
+    /* not a string */
+    if (buffer_at_offset(input_buffer)[0] != '\"')
+    {
+        goto fail;
+    }
+
+    {
+        /* calculate approximate size of the output (overestimate) */
+        size_t allocation_length = 0;
+        size_t skipped_bytes = 0;
+        while (((size_t)(input_end - input_buffer->content) < input_buffer->length) && (*input_end != '\"'))
+        {
+            /* is escape sequence */
+            if (input_end[0] == '\\')
+            {
+                if ((size_t)(input_end + 1 - input_buffer->content) >= input_buffer->length)
+                {
+                    /* prevent buffer overflow when last input character is a backslash */
+                    goto fail;
+                }
+                skipped_bytes++;
+                input_end++;
+            }
+            input_end++;
+        }
+        if (((size_t)(input_end - input_buffer->content) >= input_buffer->length) || (*input_end != '\"'))
+        {
+            goto fail; /* string ended unexpectedly */
+        }
+
+        /* This is at most how much we need for the output */
+        allocation_length = (size_t) (input_end - buffer_at_offset(input_buffer)) - skipped_bytes;
+        output = (unsigned char*)input_buffer->hooks.allocate(allocation_length + sizeof(""));
+        if (output == NULL)
+        {
+            goto fail; /* allocation failure */
+        }
+    }
+
+    output_pointer = output;
+    /* loop through the string literal */
+    while (input_pointer < input_end)
+    {
+        if (*input_pointer != '\\')
+        {
+            *output_pointer++ = *input_pointer++;
+        }
+        /* escape sequence */
+        else
+        {
+            unsigned char sequence_length = 2;
+            if ((input_end - input_pointer) < 1)
+            {
+                goto fail;
+            }
+
+            switch (input_pointer[1])
+            {
+                case 'b':
+                    *output_pointer++ = '\b';
+                    break;
+                case 'f':
+                    *output_pointer++ = '\f';
+                    break;
+                case 'n':
+                    *output_pointer++ = '\n';
+                    break;
+                case 'r':
+                    *output_pointer++ = '\r';
+                    break;
+                case 't':
+                    *output_pointer++ = '\t';
+                    break;
+                case '\"':
+                case '\\':
+                case '/':
+                    *output_pointer++ = input_pointer[1];
+                    break;
+
+                /* UTF-16 literal */
+                case 'u':
+                    sequence_length = utf16_literal_to_utf8(input_pointer, input_end, &output_pointer);
+                    if (sequence_length == 0)
+                    {
+                        /* failed to convert UTF16-literal to UTF-8 */
+                        goto fail;
+                    }
+                    break;
+
+                default:
+                    goto fail;
+            }
+            input_pointer += sequence_length;
+        }
+    }
+
+    /* zero terminate the output */
+    *output_pointer = '\0';
+
+    item->type = cJSON_String;
+    item->valuestring = (char*)output;
+
+    input_buffer->offset = (size_t) (input_end - input_buffer->content);
+    input_buffer->offset++;
+
+    return true;
+
+fail:
+    if (output != NULL)
+    {
+        input_buffer->hooks.deallocate(output);
+    }
+
+    if (input_pointer != NULL)
+    {
+        input_buffer->offset = (size_t)(input_pointer - input_buffer->content);
+    }
+
+    return false;
+}
+
+/* Render the cstring provided to an escaped version that can be printed. */
+static cJSON_bool print_string_ptr(const unsigned char * const input, printbuffer * const output_buffer)
+{
+    const unsigned char *input_pointer = NULL;
+    unsigned char *output = NULL;
+    unsigned char *output_pointer = NULL;
+    size_t output_length = 0;
+    /* numbers of additional characters needed for escaping */
+    size_t escape_characters = 0;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* empty string */
+    if (input == NULL)
+    {
+        output = ensure(output_buffer, sizeof("\"\""));
+        if (output == NULL)
+        {
+            return false;
+        }
+        strcpy((char*)output, "\"\"");
+
+        return true;
+    }
+
+    /* set "flag" to 1 if something needs to be escaped */
+    for (input_pointer = input; *input_pointer; input_pointer++)
+    {
+        switch (*input_pointer)
+        {
+            case '\"':
+            case '\\':
+            case '\b':
+            case '\f':
+            case '\n':
+            case '\r':
+            case '\t':
+                /* one character escape sequence */
+                escape_characters++;
+                break;
+            default:
+                if (*input_pointer < 32)
+                {
+                    /* UTF-16 escape sequence uXXXX */
+                    escape_characters += 5;
+                }
+                break;
+        }
+    }
+    output_length = (size_t)(input_pointer - input) + escape_characters;
+
+    output = ensure(output_buffer, output_length + sizeof("\"\""));
+    if (output == NULL)
+    {
+        return false;
+    }
+
+    /* no characters have to be escaped */
+    if (escape_characters == 0)
+    {
+        output[0] = '\"';
+        memcpy(output + 1, input, output_length);
+        output[output_length + 1] = '\"';
+        output[output_length + 2] = '\0';
+
+        return true;
+    }
+
+    output[0] = '\"';
+    output_pointer = output + 1;
+    /* copy the string */
+    for (input_pointer = input; *input_pointer != '\0'; (void)input_pointer++, output_pointer++)
+    {
+        if ((*input_pointer > 31) && (*input_pointer != '\"') && (*input_pointer != '\\'))
+        {
+            /* normal character, copy */
+            *output_pointer = *input_pointer;
+        }
+        else
+        {
+            /* character needs to be escaped */
+            *output_pointer++ = '\\';
+            switch (*input_pointer)
+            {
+                case '\\':
+                    *output_pointer = '\\';
+                    break;
+                case '\"':
+                    *output_pointer = '\"';
+                    break;
+                case '\b':
+                    *output_pointer = 'b';
+                    break;
+                case '\f':
+                    *output_pointer = 'f';
+                    break;
+                case '\n':
+                    *output_pointer = 'n';
+                    break;
+                case '\r':
+                    *output_pointer = 'r';
+                    break;
+                case '\t':
+                    *output_pointer = 't';
+                    break;
+                default:
+                    /* escape and print as unicode codepoint */
+                    sprintf((char*)output_pointer, "u%04x", *input_pointer);
+                    output_pointer += 4;
+                    break;
+            }
+        }
+    }
+    output[output_length + 1] = '\"';
+    output[output_length + 2] = '\0';
+
+    return true;
+}
+
+/* Invoke print_string_ptr (which is useful) on an item. */
+static cJSON_bool print_string(const cJSON * const item, printbuffer * const p)
+{
+    return print_string_ptr((unsigned char*)item->valuestring, p);
+}
+
+/* Predeclare these prototypes. */
+static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer);
+static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer);
+static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer);
+static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer);
+static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer);
+static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer);
+
+/* Utility to jump whitespace and cr/lf */
+static parse_buffer *buffer_skip_whitespace(parse_buffer * const buffer)
+{
+    if ((buffer == NULL) || (buffer->content == NULL))
+    {
+        return NULL;
+    }
+
+    if (cannot_access_at_index(buffer, 0))
+    {
+        return buffer;
+    }
+
+    while (can_access_at_index(buffer, 0) && (buffer_at_offset(buffer)[0] <= 32))
+    {
+       buffer->offset++;
+    }
+
+    if (buffer->offset == buffer->length)
+    {
+        buffer->offset--;
+    }
+
+    return buffer;
+}
+
+/* skip the UTF-8 BOM (byte order mark) if it is at the beginning of a buffer */
+static parse_buffer *skip_utf8_bom(parse_buffer * const buffer)
+{
+    if ((buffer == NULL) || (buffer->content == NULL) || (buffer->offset != 0))
+    {
+        return NULL;
+    }
+
+    if (can_access_at_index(buffer, 4) && (strncmp((const char*)buffer_at_offset(buffer), "\xEF\xBB\xBF", 3) == 0))
+    {
+        buffer->offset += 3;
+    }
+
+    return buffer;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated)
+{
+    size_t buffer_length;
+
+    if (NULL == value)
+    {
+        return NULL;
+    }
+
+    /* Adding null character size due to require_null_terminated. */
+    buffer_length = strlen(value) + sizeof("");
+
+    return cJSON_ParseWithLengthOpts(value, buffer_length, return_parse_end, require_null_terminated);
+}
+
+/* Parse an object - create a new root, and populate. */
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithLengthOpts(const char *value, size_t buffer_length, const char **return_parse_end, cJSON_bool require_null_terminated)
+{
+    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
+    cJSON *item = NULL;
+
+    /* reset error position */
+    global_error.json = NULL;
+    global_error.position = 0;
+
+    if (value == NULL || 0 == buffer_length)
+    {
+        goto fail;
+    }
+
+    buffer.content = (const unsigned char*)value;
+    buffer.length = buffer_length;
+    buffer.offset = 0;
+    buffer.hooks = global_hooks;
+
+    item = cJSON_New_Item(&global_hooks);
+    if (item == NULL) /* memory fail */
+    {
+        goto fail;
+    }
+
+    if (!parse_value(item, buffer_skip_whitespace(skip_utf8_bom(&buffer))))
+    {
+        /* parse failure. ep is set. */
+        goto fail;
+    }
+
+    /* if we require null-terminated JSON without appended garbage, skip and then check for a null terminator */
+    if (require_null_terminated)
+    {
+        buffer_skip_whitespace(&buffer);
+        if ((buffer.offset >= buffer.length) || buffer_at_offset(&buffer)[0] != '\0')
+        {
+            goto fail;
+        }
+    }
+    if (return_parse_end)
+    {
+        *return_parse_end = (const char*)buffer_at_offset(&buffer);
+    }
+
+    return item;
+
+fail:
+    if (item != NULL)
+    {
+        cJSON_Delete(item);
+    }
+
+    if (value != NULL)
+    {
+        error local_error;
+        local_error.json = (const unsigned char*)value;
+        local_error.position = 0;
+
+        if (buffer.offset < buffer.length)
+        {
+            local_error.position = buffer.offset;
+        }
+        else if (buffer.length > 0)
+        {
+            local_error.position = buffer.length - 1;
+        }
+
+        if (return_parse_end != NULL)
+        {
+            *return_parse_end = (const char*)local_error.json + local_error.position;
+        }
+
+        global_error = local_error;
+    }
+
+    return NULL;
+}
+
+/* Default options for cJSON_Parse */
+CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value)
+{
+    return cJSON_ParseWithOpts(value, 0, 0);
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithLength(const char *value, size_t buffer_length)
+{
+    return cJSON_ParseWithLengthOpts(value, buffer_length, 0, 0);
+}
+
+#define cjson_min(a, b) (((a) < (b)) ? (a) : (b))
+
+static unsigned char *print(const cJSON * const item, cJSON_bool format, const internal_hooks * const hooks)
+{
+    static const size_t default_buffer_size = 256;
+    printbuffer buffer[1];
+    unsigned char *printed = NULL;
+
+    memset(buffer, 0, sizeof(buffer));
+
+    /* create buffer */
+    buffer->buffer = (unsigned char*) hooks->allocate(default_buffer_size);
+    buffer->length = default_buffer_size;
+    buffer->format = format;
+    buffer->hooks = *hooks;
+    if (buffer->buffer == NULL)
+    {
+        goto fail;
+    }
+
+    /* print the value */
+    if (!print_value(item, buffer))
+    {
+        goto fail;
+    }
+    update_offset(buffer);
+
+    /* check if reallocate is available */
+    if (hooks->reallocate != NULL)
+    {
+        printed = (unsigned char*) hooks->reallocate(buffer->buffer, buffer->offset + 1);
+        if (printed == NULL) {
+            goto fail;
+        }
+        buffer->buffer = NULL;
+    }
+    else /* otherwise copy the JSON over to a new buffer */
+    {
+        printed = (unsigned char*) hooks->allocate(buffer->offset + 1);
+        if (printed == NULL)
+        {
+            goto fail;
+        }
+        memcpy(printed, buffer->buffer, cjson_min(buffer->length, buffer->offset + 1));
+        printed[buffer->offset] = '\0'; /* just to be sure */
+
+        /* free the buffer */
+        hooks->deallocate(buffer->buffer);
+    }
+
+    return printed;
+
+fail:
+    if (buffer->buffer != NULL)
+    {
+        hooks->deallocate(buffer->buffer);
+    }
+
+    if (printed != NULL)
+    {
+        hooks->deallocate(printed);
+    }
+
+    return NULL;
+}
+
+/* Render a cJSON item/entity/structure to text. */
+CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item)
+{
+    return (char*)print(item, true, &global_hooks);
+}
+
+CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item)
+{
+    return (char*)print(item, false, &global_hooks);
+}
+
+CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt)
+{
+    printbuffer p = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
+
+    if (prebuffer < 0)
+    {
+        return NULL;
+    }
+
+    p.buffer = (unsigned char*)global_hooks.allocate((size_t)prebuffer);
+    if (!p.buffer)
+    {
+        return NULL;
+    }
+
+    p.length = (size_t)prebuffer;
+    p.offset = 0;
+    p.noalloc = false;
+    p.format = fmt;
+    p.hooks = global_hooks;
+
+    if (!print_value(item, &p))
+    {
+        global_hooks.deallocate(p.buffer);
+        return NULL;
+    }
+
+    return (char*)p.buffer;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format)
+{
+    printbuffer p = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
+
+    if ((length < 0) || (buffer == NULL))
+    {
+        return false;
+    }
+
+    p.buffer = (unsigned char*)buffer;
+    p.length = (size_t)length;
+    p.offset = 0;
+    p.noalloc = true;
+    p.format = format;
+    p.hooks = global_hooks;
+
+    return print_value(item, &p);
+}
+
+/* Parser core - when encountering text, process appropriately. */
+static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer)
+{
+    if ((input_buffer == NULL) || (input_buffer->content == NULL))
+    {
+        return false; /* no input */
+    }
+
+    /* parse the different types of values */
+    /* null */
+    if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "null", 4) == 0))
+    {
+        item->type = cJSON_NULL;
+        input_buffer->offset += 4;
+        return true;
+    }
+    /* false */
+    if (can_read(input_buffer, 5) && (strncmp((const char*)buffer_at_offset(input_buffer), "false", 5) == 0))
+    {
+        item->type = cJSON_False;
+        input_buffer->offset += 5;
+        return true;
+    }
+    /* true */
+    if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "true", 4) == 0))
+    {
+        item->type = cJSON_True;
+        item->valueint = 1;
+        input_buffer->offset += 4;
+        return true;
+    }
+    /* string */
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '\"'))
+    {
+        return parse_string(item, input_buffer);
+    }
+    /* number */
+    if (can_access_at_index(input_buffer, 0) && ((buffer_at_offset(input_buffer)[0] == '-') || ((buffer_at_offset(input_buffer)[0] >= '0') && (buffer_at_offset(input_buffer)[0] <= '9'))))
+    {
+        return parse_number(item, input_buffer);
+    }
+    /* array */
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '['))
+    {
+        return parse_array(item, input_buffer);
+    }
+    /* object */
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '{'))
+    {
+        return parse_object(item, input_buffer);
+    }
+
+    return false;
+}
+
+/* Render a value to text. */
+static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output = NULL;
+
+    if ((item == NULL) || (output_buffer == NULL))
+    {
+        return false;
+    }
+
+    switch ((item->type) & 0xFF)
+    {
+        case cJSON_NULL:
+            output = ensure(output_buffer, 5);
+            if (output == NULL)
+            {
+                return false;
+            }
+            strcpy((char*)output, "null");
+            return true;
+
+        case cJSON_False:
+            output = ensure(output_buffer, 6);
+            if (output == NULL)
+            {
+                return false;
+            }
+            strcpy((char*)output, "false");
+            return true;
+
+        case cJSON_True:
+            output = ensure(output_buffer, 5);
+            if (output == NULL)
+            {
+                return false;
+            }
+            strcpy((char*)output, "true");
+            return true;
+
+        case cJSON_Number:
+            return print_number(item, output_buffer);
+
+        case cJSON_Raw:
+        {
+            size_t raw_length = 0;
+            if (item->valuestring == NULL)
+            {
+                return false;
+            }
+
+            raw_length = strlen(item->valuestring) + sizeof("");
+            output = ensure(output_buffer, raw_length);
+            if (output == NULL)
+            {
+                return false;
+            }
+            memcpy(output, item->valuestring, raw_length);
+            return true;
+        }
+
+        case cJSON_String:
+            return print_string(item, output_buffer);
+
+        case cJSON_Array:
+            return print_array(item, output_buffer);
+
+        case cJSON_Object:
+            return print_object(item, output_buffer);
+
+        default:
+            return false;
+    }
+}
+
+/* Build an array from input text. */
+static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer)
+{
+    cJSON *head = NULL; /* head of the linked list */
+    cJSON *current_item = NULL;
+
+    if (input_buffer->depth >= CJSON_NESTING_LIMIT)
+    {
+        return false; /* to deeply nested */
+    }
+    input_buffer->depth++;
+
+    if (buffer_at_offset(input_buffer)[0] != '[')
+    {
+        /* not an array */
+        goto fail;
+    }
+
+    input_buffer->offset++;
+    buffer_skip_whitespace(input_buffer);
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ']'))
+    {
+        /* empty array */
+        goto success;
+    }
+
+    /* check if we skipped to the end of the buffer */
+    if (cannot_access_at_index(input_buffer, 0))
+    {
+        input_buffer->offset--;
+        goto fail;
+    }
+
+    /* step back to character in front of the first element */
+    input_buffer->offset--;
+    /* loop through the comma separated array elements */
+    do
+    {
+        /* allocate next item */
+        cJSON *new_item = cJSON_New_Item(&(input_buffer->hooks));
+        if (new_item == NULL)
+        {
+            goto fail; /* allocation failure */
+        }
+
+        /* attach next item to list */
+        if (head == NULL)
+        {
+            /* start the linked list */
+            current_item = head = new_item;
+        }
+        else
+        {
+            /* add to the end and advance */
+            current_item->next = new_item;
+            new_item->prev = current_item;
+            current_item = new_item;
+        }
+
+        /* parse next value */
+        input_buffer->offset++;
+        buffer_skip_whitespace(input_buffer);
+        if (!parse_value(current_item, input_buffer))
+        {
+            goto fail; /* failed to parse value */
+        }
+        buffer_skip_whitespace(input_buffer);
+    }
+    while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ','));
+
+    if (cannot_access_at_index(input_buffer, 0) || buffer_at_offset(input_buffer)[0] != ']')
+    {
+        goto fail; /* expected end of array */
+    }
+
+success:
+    input_buffer->depth--;
+
+    if (head != NULL) {
+        head->prev = current_item;
+    }
+
+    item->type = cJSON_Array;
+    item->child = head;
+
+    input_buffer->offset++;
+
+    return true;
+
+fail:
+    if (head != NULL)
+    {
+        cJSON_Delete(head);
+    }
+
+    return false;
+}
+
+/* Render an array to text */
+static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output_pointer = NULL;
+    size_t length = 0;
+    cJSON *current_element = item->child;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* Compose the output array. */
+    /* opening square bracket */
+    output_pointer = ensure(output_buffer, 1);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+
+    *output_pointer = '[';
+    output_buffer->offset++;
+    output_buffer->depth++;
+
+    while (current_element != NULL)
+    {
+        if (!print_value(current_element, output_buffer))
+        {
+            return false;
+        }
+        update_offset(output_buffer);
+        if (current_element->next)
+        {
+            length = (size_t) (output_buffer->format ? 2 : 1);
+            output_pointer = ensure(output_buffer, length + 1);
+            if (output_pointer == NULL)
+            {
+                return false;
+            }
+            *output_pointer++ = ',';
+            if(output_buffer->format)
+            {
+                *output_pointer++ = ' ';
+            }
+            *output_pointer = '\0';
+            output_buffer->offset += length;
+        }
+        current_element = current_element->next;
+    }
+
+    output_pointer = ensure(output_buffer, 2);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+    *output_pointer++ = ']';
+    *output_pointer = '\0';
+    output_buffer->depth--;
+
+    return true;
+}
+
+/* Build an object from the text. */
+static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer)
+{
+    cJSON *head = NULL; /* linked list head */
+    cJSON *current_item = NULL;
+
+    if (input_buffer->depth >= CJSON_NESTING_LIMIT)
+    {
+        return false; /* to deeply nested */
+    }
+    input_buffer->depth++;
+
+    if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '{'))
+    {
+        goto fail; /* not an object */
+    }
+
+    input_buffer->offset++;
+    buffer_skip_whitespace(input_buffer);
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '}'))
+    {
+        goto success; /* empty object */
+    }
+
+    /* check if we skipped to the end of the buffer */
+    if (cannot_access_at_index(input_buffer, 0))
+    {
+        input_buffer->offset--;
+        goto fail;
+    }
+
+    /* step back to character in front of the first element */
+    input_buffer->offset--;
+    /* loop through the comma separated array elements */
+    do
+    {
+        /* allocate next item */
+        cJSON *new_item = cJSON_New_Item(&(input_buffer->hooks));
+        if (new_item == NULL)
+        {
+            goto fail; /* allocation failure */
+        }
+
+        /* attach next item to list */
+        if (head == NULL)
+        {
+            /* start the linked list */
+            current_item = head = new_item;
+        }
+        else
+        {
+            /* add to the end and advance */
+            current_item->next = new_item;
+            new_item->prev = current_item;
+            current_item = new_item;
+        }
+
+        /* parse the name of the child */
+        input_buffer->offset++;
+        buffer_skip_whitespace(input_buffer);
+        if (!parse_string(current_item, input_buffer))
+        {
+            goto fail; /* failed to parse name */
+        }
+        buffer_skip_whitespace(input_buffer);
+
+        /* swap valuestring and string, because we parsed the name */
+        current_item->string = current_item->valuestring;
+        current_item->valuestring = NULL;
+
+        if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != ':'))
+        {
+            goto fail; /* invalid object */
+        }
+
+        /* parse the value */
+        input_buffer->offset++;
+        buffer_skip_whitespace(input_buffer);
+        if (!parse_value(current_item, input_buffer))
+        {
+            goto fail; /* failed to parse value */
+        }
+        buffer_skip_whitespace(input_buffer);
+    }
+    while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ','));
+
+    if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '}'))
+    {
+        goto fail; /* expected end of object */
+    }
+
+success:
+    input_buffer->depth--;
+
+    if (head != NULL) {
+        head->prev = current_item;
+    }
+
+    item->type = cJSON_Object;
+    item->child = head;
+
+    input_buffer->offset++;
+    return true;
+
+fail:
+    if (head != NULL)
+    {
+        cJSON_Delete(head);
+    }
+
+    return false;
+}
+
+/* Render an object to text. */
+static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output_pointer = NULL;
+    size_t length = 0;
+    cJSON *current_item = item->child;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* Compose the output: */
+    length = (size_t) (output_buffer->format ? 2 : 1); /* fmt: {\n */
+    output_pointer = ensure(output_buffer, length + 1);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+
+    *output_pointer++ = '{';
+    output_buffer->depth++;
+    if (output_buffer->format)
+    {
+        *output_pointer++ = '\n';
+    }
+    output_buffer->offset += length;
+
+    while (current_item)
+    {
+        if (output_buffer->format)
+        {
+            size_t i;
+            output_pointer = ensure(output_buffer, output_buffer->depth);
+            if (output_pointer == NULL)
+            {
+                return false;
+            }
+            for (i = 0; i < output_buffer->depth; i++)
+            {
+                *output_pointer++ = '\t';
+            }
+            output_buffer->offset += output_buffer->depth;
+        }
+
+        /* print key */
+        if (!print_string_ptr((unsigned char*)current_item->string, output_buffer))
+        {
+            return false;
+        }
+        update_offset(output_buffer);
+
+        length = (size_t) (output_buffer->format ? 2 : 1);
+        output_pointer = ensure(output_buffer, length);
+        if (output_pointer == NULL)
+        {
+            return false;
+        }
+        *output_pointer++ = ':';
+        if (output_buffer->format)
+        {
+            *output_pointer++ = '\t';
+        }
+        output_buffer->offset += length;
+
+        /* print value */
+        if (!print_value(current_item, output_buffer))
+        {
+            return false;
+        }
+        update_offset(output_buffer);
+
+        /* print comma if not last */
+        length = ((size_t)(output_buffer->format ? 1 : 0) + (size_t)(current_item->next ? 1 : 0));
+        output_pointer = ensure(output_buffer, length + 1);
+        if (output_pointer == NULL)
+        {
+            return false;
+        }
+        if (current_item->next)
+        {
+            *output_pointer++ = ',';
+        }
+
+        if (output_buffer->format)
+        {
+            *output_pointer++ = '\n';
+        }
+        *output_pointer = '\0';
+        output_buffer->offset += length;
+
+        current_item = current_item->next;
+    }
+
+    output_pointer = ensure(output_buffer, output_buffer->format ? (output_buffer->depth + 1) : 2);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+    if (output_buffer->format)
+    {
+        size_t i;
+        for (i = 0; i < (output_buffer->depth - 1); i++)
+        {
+            *output_pointer++ = '\t';
+        }
+    }
+    *output_pointer++ = '}';
+    *output_pointer = '\0';
+    output_buffer->depth--;
+
+    return true;
+}
+
+/* Get Array size/item / object item. */
+CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array)
+{
+    cJSON *child = NULL;
+    size_t size = 0;
+
+    if (array == NULL)
+    {
+        return 0;
+    }
+
+    child = array->child;
+
+    while(child != NULL)
+    {
+        size++;
+        child = child->next;
+    }
+
+    /* FIXME: Can overflow here. Cannot be fixed without breaking the API */
+
+    return (int)size;
+}
+
+static cJSON* get_array_item(const cJSON *array, size_t index)
+{
+    cJSON *current_child = NULL;
+
+    if (array == NULL)
+    {
+        return NULL;
+    }
+
+    current_child = array->child;
+    while ((current_child != NULL) && (index > 0))
+    {
+        index--;
+        current_child = current_child->next;
+    }
+
+    return current_child;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index)
+{
+    if (index < 0)
+    {
+        return NULL;
+    }
+
+    return get_array_item(array, (size_t)index);
+}
+
+static cJSON *get_object_item(const cJSON * const object, const char * const name, const cJSON_bool case_sensitive)
+{
+    cJSON *current_element = NULL;
+
+    if ((object == NULL) || (name == NULL))
+    {
+        return NULL;
+    }
+
+    current_element = object->child;
+    if (case_sensitive)
+    {
+        while ((current_element != NULL) && (current_element->string != NULL) && (strcmp(name, current_element->string) != 0))
+        {
+            current_element = current_element->next;
+        }
+    }
+    else
+    {
+        while ((current_element != NULL) && (case_insensitive_strcmp((const unsigned char*)name, (const unsigned char*)(current_element->string)) != 0))
+        {
+            current_element = current_element->next;
+        }
+    }
+
+    if ((current_element == NULL) || (current_element->string == NULL)) {
+        return NULL;
+    }
+
+    return current_element;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string)
+{
+    return get_object_item(object, string, false);
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string)
+{
+    return get_object_item(object, string, true);
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string)
+{
+    return cJSON_GetObjectItem(object, string) ? 1 : 0;
+}
+
+/* Utility for array list handling. */
+static void suffix_object(cJSON *prev, cJSON *item)
+{
+    prev->next = item;
+    item->prev = prev;
+}
+
+/* Utility for handling references. */
+static cJSON *create_reference(const cJSON *item, const internal_hooks * const hooks)
+{
+    cJSON *reference = NULL;
+    if (item == NULL)
+    {
+        return NULL;
+    }
+
+    reference = cJSON_New_Item(hooks);
+    if (reference == NULL)
+    {
+        return NULL;
+    }
+
+    memcpy(reference, item, sizeof(cJSON));
+    reference->string = NULL;
+    reference->type |= cJSON_IsReference;
+    reference->next = reference->prev = NULL;
+    return reference;
+}
+
+static cJSON_bool add_item_to_array(cJSON *array, cJSON *item)
+{
+    cJSON *child = NULL;
+
+    if ((item == NULL) || (array == NULL) || (array == item))
+    {
+        return false;
+    }
+
+    child = array->child;
+    /*
+     * To find the last item in array quickly, we use prev in array
+     */
+    if (child == NULL)
+    {
+        /* list is empty, start new one */
+        array->child = item;
+        item->prev = item;
+        item->next = NULL;
+    }
+    else
+    {
+        /* append to the end */
+        if (child->prev)
+        {
+            suffix_object(child->prev, item);
+            array->child->prev = item;
+        }
+    }
+
+    return true;
+}
+
+/* Add item to array/object. */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToArray(cJSON *array, cJSON *item)
+{
+    return add_item_to_array(array, item);
+}
+
+#if defined(__clang__) || (defined(__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
+    #pragma GCC diagnostic push
+#endif
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wcast-qual"
+#endif
+/* helper function to cast away const */
+static void* cast_away_const(const void* string)
+{
+    return (void*)string;
+}
+#if defined(__clang__) || (defined(__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
+    #pragma GCC diagnostic pop
+#endif
+
+
+static cJSON_bool add_item_to_object(cJSON * const object, const char * const string, cJSON * const item, const internal_hooks * const hooks, const cJSON_bool constant_key)
+{
+    char *new_key = NULL;
+    int new_type = cJSON_Invalid;
+
+    if ((object == NULL) || (string == NULL) || (item == NULL) || (object == item))
+    {
+        return false;
+    }
+
+    if (constant_key)
+    {
+        new_key = (char*)cast_away_const(string);
+        new_type = item->type | cJSON_StringIsConst;
+    }
+    else
+    {
+        new_key = (char*)cJSON_strdup((const unsigned char*)string, hooks);
+        if (new_key == NULL)
+        {
+            return false;
+        }
+
+        new_type = item->type & ~cJSON_StringIsConst;
+    }
+
+    if (!(item->type & cJSON_StringIsConst) && (item->string != NULL))
+    {
+        hooks->deallocate(item->string);
+    }
+
+    item->string = new_key;
+    item->type = new_type;
+
+    return add_item_to_array(object, item);
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item)
+{
+    return add_item_to_object(object, string, item, &global_hooks, false);
+}
+
+/* Add an item to an object with constant string as key */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item)
+{
+    return add_item_to_object(object, string, item, &global_hooks, true);
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item)
+{
+    if (array == NULL)
+    {
+        return false;
+    }
+
+    return add_item_to_array(array, create_reference(item, &global_hooks));
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item)
+{
+    if ((object == NULL) || (string == NULL))
+    {
+        return false;
+    }
+
+    return add_item_to_object(object, string, create_reference(item, &global_hooks), &global_hooks, false);
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name)
+{
+    cJSON *null = cJSON_CreateNull();
+    if (add_item_to_object(object, name, null, &global_hooks, false))
+    {
+        return null;
+    }
+
+    cJSON_Delete(null);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name)
+{
+    cJSON *true_item = cJSON_CreateTrue();
+    if (add_item_to_object(object, name, true_item, &global_hooks, false))
+    {
+        return true_item;
+    }
+
+    cJSON_Delete(true_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name)
+{
+    cJSON *false_item = cJSON_CreateFalse();
+    if (add_item_to_object(object, name, false_item, &global_hooks, false))
+    {
+        return false_item;
+    }
+
+    cJSON_Delete(false_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean)
+{
+    cJSON *bool_item = cJSON_CreateBool(boolean);
+    if (add_item_to_object(object, name, bool_item, &global_hooks, false))
+    {
+        return bool_item;
+    }
+
+    cJSON_Delete(bool_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number)
+{
+    cJSON *number_item = cJSON_CreateNumber(number);
+    if (add_item_to_object(object, name, number_item, &global_hooks, false))
+    {
+        return number_item;
+    }
+
+    cJSON_Delete(number_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string)
+{
+    cJSON *string_item = cJSON_CreateString(string);
+    if (add_item_to_object(object, name, string_item, &global_hooks, false))
+    {
+        return string_item;
+    }
+
+    cJSON_Delete(string_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw)
+{
+    cJSON *raw_item = cJSON_CreateRaw(raw);
+    if (add_item_to_object(object, name, raw_item, &global_hooks, false))
+    {
+        return raw_item;
+    }
+
+    cJSON_Delete(raw_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name)
+{
+    cJSON *object_item = cJSON_CreateObject();
+    if (add_item_to_object(object, name, object_item, &global_hooks, false))
+    {
+        return object_item;
+    }
+
+    cJSON_Delete(object_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name)
+{
+    cJSON *array = cJSON_CreateArray();
+    if (add_item_to_object(object, name, array, &global_hooks, false))
+    {
+        return array;
+    }
+
+    cJSON_Delete(array);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item)
+{
+    if ((parent == NULL) || (item == NULL))
+    {
+        return NULL;
+    }
+
+    if (item != parent->child)
+    {
+        /* not the first element */
+        item->prev->next = item->next;
+    }
+    if (item->next != NULL)
+    {
+        /* not the last element */
+        item->next->prev = item->prev;
+    }
+
+    if (item == parent->child)
+    {
+        /* first element */
+        parent->child = item->next;
+    }
+    else if (item->next == NULL)
+    {
+        /* last element */
+        parent->child->prev = item->prev;
+    }
+
+    /* make sure the detached item doesn't point anywhere anymore */
+    item->prev = NULL;
+    item->next = NULL;
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which)
+{
+    if (which < 0)
+    {
+        return NULL;
+    }
+
+    return cJSON_DetachItemViaPointer(array, get_array_item(array, (size_t)which));
+}
+
+CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which)
+{
+    cJSON_Delete(cJSON_DetachItemFromArray(array, which));
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string)
+{
+    cJSON *to_detach = cJSON_GetObjectItem(object, string);
+
+    return cJSON_DetachItemViaPointer(object, to_detach);
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string)
+{
+    cJSON *to_detach = cJSON_GetObjectItemCaseSensitive(object, string);
+
+    return cJSON_DetachItemViaPointer(object, to_detach);
+}
+
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string)
+{
+    cJSON_Delete(cJSON_DetachItemFromObject(object, string));
+}
+
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string)
+{
+    cJSON_Delete(cJSON_DetachItemFromObjectCaseSensitive(object, string));
+}
+
+/* Replace array/object items with new ones. */
+CJSON_PUBLIC(cJSON_bool) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem)
+{
+    cJSON *after_inserted = NULL;
+
+    if (which < 0 || newitem == NULL)
+    {
+        return false;
+    }
+
+    after_inserted = get_array_item(array, (size_t)which);
+    if (after_inserted == NULL)
+    {
+        return add_item_to_array(array, newitem);
+    }
+
+    if (after_inserted != array->child && after_inserted->prev == NULL) {
+        /* return false if after_inserted is a corrupted array item */
+        return false;
+    }
+
+    newitem->next = after_inserted;
+    newitem->prev = after_inserted->prev;
+    after_inserted->prev = newitem;
+    if (after_inserted == array->child)
+    {
+        array->child = newitem;
+    }
+    else
+    {
+        newitem->prev->next = newitem;
+    }
+    return true;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement)
+{
+    if ((parent == NULL) || (parent->child == NULL) || (replacement == NULL) || (item == NULL))
+    {
+        return false;
+    }
+
+    if (replacement == item)
+    {
+        return true;
+    }
+
+    replacement->next = item->next;
+    replacement->prev = item->prev;
+
+    if (replacement->next != NULL)
+    {
+        replacement->next->prev = replacement;
+    }
+    if (parent->child == item)
+    {
+        if (parent->child->prev == parent->child)
+        {
+            replacement->prev = replacement;
+        }
+        parent->child = replacement;
+    }
+    else
+    {   /*
+         * To find the last item in array quickly, we use prev in array.
+         * We can't modify the last item's next pointer where this item was the parent's child
+         */
+        if (replacement->prev != NULL)
+        {
+            replacement->prev->next = replacement;
+        }
+        if (replacement->next == NULL)
+        {
+            parent->child->prev = replacement;
+        }
+    }
+
+    item->next = NULL;
+    item->prev = NULL;
+    cJSON_Delete(item);
+
+    return true;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem)
+{
+    if (which < 0)
+    {
+        return false;
+    }
+
+    return cJSON_ReplaceItemViaPointer(array, get_array_item(array, (size_t)which), newitem);
+}
+
+static cJSON_bool replace_item_in_object(cJSON *object, const char *string, cJSON *replacement, cJSON_bool case_sensitive)
+{
+    if ((replacement == NULL) || (string == NULL))
+    {
+        return false;
+    }
+
+    /* replace the name in the replacement */
+    if (!(replacement->type & cJSON_StringIsConst) && (replacement->string != NULL))
+    {
+        cJSON_free(replacement->string);
+    }
+    replacement->string = (char*)cJSON_strdup((const unsigned char*)string, &global_hooks);
+    if (replacement->string == NULL)
+    {
+        return false;
+    }
+
+    replacement->type &= ~cJSON_StringIsConst;
+
+    return cJSON_ReplaceItemViaPointer(object, get_object_item(object, string, case_sensitive), replacement);
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObject(cJSON *object, const char *string, cJSON *newitem)
+{
+    return replace_item_in_object(object, string, newitem, false);
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object, const char *string, cJSON *newitem)
+{
+    return replace_item_in_object(object, string, newitem, true);
+}
+
+/* Create basic types: */
+CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_NULL;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_True;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_False;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = boolean ? cJSON_True : cJSON_False;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_Number;
+        item->valuedouble = num;
+
+        /* use saturation in case of overflow */
+        if (num >= INT_MAX)
+        {
+            item->valueint = INT_MAX;
+        }
+        else if (num <= (double)INT_MIN)
+        {
+            item->valueint = INT_MIN;
+        }
+        else
+        {
+            item->valueint = (int)num;
+        }
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_String;
+        item->valuestring = (char*)cJSON_strdup((const unsigned char*)string, &global_hooks);
+        if(!item->valuestring)
+        {
+            cJSON_Delete(item);
+            return NULL;
+        }
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if (item != NULL)
+    {
+        item->type = cJSON_String | cJSON_IsReference;
+        item->valuestring = (char*)cast_away_const(string);
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if (item != NULL) {
+        item->type = cJSON_Object | cJSON_IsReference;
+        item->child = (cJSON*)cast_away_const(child);
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child) {
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if (item != NULL) {
+        item->type = cJSON_Array | cJSON_IsReference;
+        item->child = (cJSON*)cast_away_const(child);
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_Raw;
+        item->valuestring = (char*)cJSON_strdup((const unsigned char*)raw, &global_hooks);
+        if(!item->valuestring)
+        {
+            cJSON_Delete(item);
+            return NULL;
+        }
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type=cJSON_Array;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if (item)
+    {
+        item->type = cJSON_Object;
+    }
+
+    return item;
+}
+
+/* Create Arrays: */
+CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (numbers == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+
+    for(i = 0; a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateNumber(numbers[i]);
+        if (!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p, n);
+        }
+        p = n;
+    }
+
+    if (a && a->child) {
+        a->child->prev = n;
+    }
+
+    return a;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (numbers == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+
+    for(i = 0; a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateNumber((double)numbers[i]);
+        if(!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p, n);
+        }
+        p = n;
+    }
+
+    if (a && a->child) {
+        a->child->prev = n;
+    }
+
+    return a;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (numbers == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+
+    for(i = 0; a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateNumber(numbers[i]);
+        if(!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p, n);
+        }
+        p = n;
+    }
+
+    if (a && a->child) {
+        a->child->prev = n;
+    }
+
+    return a;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char *const *strings, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (strings == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+
+    for (i = 0; a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateString(strings[i]);
+        if(!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p,n);
+        }
+        p = n;
+    }
+
+    if (a && a->child) {
+        a->child->prev = n;
+    }
+
+    return a;
+}
+
+/* Duplication */
+CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse)
+{
+    cJSON *newitem = NULL;
+    cJSON *child = NULL;
+    cJSON *next = NULL;
+    cJSON *newchild = NULL;
+
+    /* Bail on bad ptr */
+    if (!item)
+    {
+        goto fail;
+    }
+    /* Create new item */
+    newitem = cJSON_New_Item(&global_hooks);
+    if (!newitem)
+    {
+        goto fail;
+    }
+    /* Copy over all vars */
+    newitem->type = item->type & (~cJSON_IsReference);
+    newitem->valueint = item->valueint;
+    newitem->valuedouble = item->valuedouble;
+    if (item->valuestring)
+    {
+        newitem->valuestring = (char*)cJSON_strdup((unsigned char*)item->valuestring, &global_hooks);
+        if (!newitem->valuestring)
+        {
+            goto fail;
+        }
+    }
+    if (item->string)
+    {
+        newitem->string = (item->type&cJSON_StringIsConst) ? item->string : (char*)cJSON_strdup((unsigned char*)item->string, &global_hooks);
+        if (!newitem->string)
+        {
+            goto fail;
+        }
+    }
+    /* If non-recursive, then we're done! */
+    if (!recurse)
+    {
+        return newitem;
+    }
+    /* Walk the ->next chain for the child. */
+    child = item->child;
+    while (child != NULL)
+    {
+        newchild = cJSON_Duplicate(child, true); /* Duplicate (with recurse) each item in the ->next chain */
+        if (!newchild)
+        {
+            goto fail;
+        }
+        if (next != NULL)
+        {
+            /* If newitem->child already set, then crosswire ->prev and ->next and move on */
+            next->next = newchild;
+            newchild->prev = next;
+            next = newchild;
+        }
+        else
+        {
+            /* Set newitem->child and move to it */
+            newitem->child = newchild;
+            next = newchild;
+        }
+        child = child->next;
+    }
+    if (newitem && newitem->child)
+    {
+        newitem->child->prev = newchild;
+    }
+
+    return newitem;
+
+fail:
+    if (newitem != NULL)
+    {
+        cJSON_Delete(newitem);
+    }
+
+    return NULL;
+}
+
+static void skip_oneline_comment(char **input)
+{
+    *input += static_strlen("//");
+
+    for (; (*input)[0] != '\0'; ++(*input))
+    {
+        if ((*input)[0] == '\n') {
+            *input += static_strlen("\n");
+            return;
+        }
+    }
+}
+
+static void skip_multiline_comment(char **input)
+{
+    *input += static_strlen("/*");
+
+    for (; (*input)[0] != '\0'; ++(*input))
+    {
+        if (((*input)[0] == '*') && ((*input)[1] == '/'))
+        {
+            *input += static_strlen("*/");
+            return;
+        }
+    }
+}
+
+static void minify_string(char **input, char **output) {
+    (*output)[0] = (*input)[0];
+    *input += static_strlen("\"");
+    *output += static_strlen("\"");
+
+
+    for (; (*input)[0] != '\0'; (void)++(*input), ++(*output)) {
+        (*output)[0] = (*input)[0];
+
+        if ((*input)[0] == '\"') {
+            (*output)[0] = '\"';
+            *input += static_strlen("\"");
+            *output += static_strlen("\"");
+            return;
+        } else if (((*input)[0] == '\\') && ((*input)[1] == '\"')) {
+            (*output)[1] = (*input)[1];
+            *input += static_strlen("\"");
+            *output += static_strlen("\"");
+        }
+    }
+}
+
+CJSON_PUBLIC(void) cJSON_Minify(char *json)
+{
+    char *into = json;
+
+    if (json == NULL)
+    {
+        return;
+    }
+
+    while (json[0] != '\0')
+    {
+        switch (json[0])
+        {
+            case ' ':
+            case '\t':
+            case '\r':
+            case '\n':
+                json++;
+                break;
+
+            case '/':
+                if (json[1] == '/')
+                {
+                    skip_oneline_comment(&json);
+                }
+                else if (json[1] == '*')
+                {
+                    skip_multiline_comment(&json);
+                } else {
+                    json++;
+                }
+                break;
+
+            case '\"':
+                minify_string(&json, (char**)&into);
+                break;
+
+            default:
+                into[0] = json[0];
+                json++;
+                into++;
+        }
+    }
+
+    /* and null-terminate. */
+    *into = '\0';
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Invalid;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_False;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xff) == cJSON_True;
+}
+
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & (cJSON_True | cJSON_False)) != 0;
+}
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_NULL;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Number;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_String;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Array;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Object;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Raw;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive)
+{
+    if ((a == NULL) || (b == NULL) || ((a->type & 0xFF) != (b->type & 0xFF)))
+    {
+        return false;
+    }
+
+    /* check if type is valid */
+    switch (a->type & 0xFF)
+    {
+        case cJSON_False:
+        case cJSON_True:
+        case cJSON_NULL:
+        case cJSON_Number:
+        case cJSON_String:
+        case cJSON_Raw:
+        case cJSON_Array:
+        case cJSON_Object:
+            break;
+
+        default:
+            return false;
+    }
+
+    /* identical objects are equal */
+    if (a == b)
+    {
+        return true;
+    }
+
+    switch (a->type & 0xFF)
+    {
+        /* in these cases and equal type is enough */
+        case cJSON_False:
+        case cJSON_True:
+        case cJSON_NULL:
+            return true;
+
+        case cJSON_Number:
+            if (compare_double(a->valuedouble, b->valuedouble))
+            {
+                return true;
+            }
+            return false;
+
+        case cJSON_String:
+        case cJSON_Raw:
+            if ((a->valuestring == NULL) || (b->valuestring == NULL))
+            {
+                return false;
+            }
+            if (strcmp(a->valuestring, b->valuestring) == 0)
+            {
+                return true;
+            }
+
+            return false;
+
+        case cJSON_Array:
+        {
+            cJSON *a_element = a->child;
+            cJSON *b_element = b->child;
+
+            for (; (a_element != NULL) && (b_element != NULL);)
+            {
+                if (!cJSON_Compare(a_element, b_element, case_sensitive))
+                {
+                    return false;
+                }
+
+                a_element = a_element->next;
+                b_element = b_element->next;
+            }
+
+            /* one of the arrays is longer than the other */
+            if (a_element != b_element) {
+                return false;
+            }
+
+            return true;
+        }
+
+        case cJSON_Object:
+        {
+            cJSON *a_element = NULL;
+            cJSON *b_element = NULL;
+            cJSON_ArrayForEach(a_element, a)
+            {
+                /* TODO This has O(n^2) runtime, which is horrible! */
+                b_element = get_object_item(b, a_element->string, case_sensitive);
+                if (b_element == NULL)
+                {
+                    return false;
+                }
+
+                if (!cJSON_Compare(a_element, b_element, case_sensitive))
+                {
+                    return false;
+                }
+            }
+
+            /* doing this twice, once on a and b to prevent true comparison if a subset of b
+             * TODO: Do this the proper way, this is just a fix for now */
+            cJSON_ArrayForEach(b_element, b)
+            {
+                a_element = get_object_item(a, b_element->string, case_sensitive);
+                if (a_element == NULL)
+                {
+                    return false;
+                }
+
+                if (!cJSON_Compare(b_element, a_element, case_sensitive))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        default:
+            return false;
+    }
+}
+
+CJSON_PUBLIC(void *) cJSON_malloc(size_t size)
+{
+    return global_hooks.allocate(size);
+}
+
+CJSON_PUBLIC(void) cJSON_free(void *object)
+{
+    global_hooks.deallocate(object);
+}
diff --git a/src/utils/crc.c b/src/utils/crc.c
new file mode 100644
index 000000000..096a94c72
--- /dev/null
+++ b/src/utils/crc.c
@@ -0,0 +1,77 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          CRC implementation.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2016-2025 Miran Grca.
+ */
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/timer.h>
+#include <86box/dma.h>
+#include <86box/nvr.h>
+#include <86box/random.h>
+#include <86box/plat.h>
+#include <86box/ui.h>
+#include <86box/crc.h>
+
+#ifdef ENABLE_CRC_LOG
+int d86f_do_log = ENABLE_CRC_LOG;
+
+static void
+crc_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (crc_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define crc_log(fmt, ...)
+#endif
+
+void
+crc16_setup(uint16_t *crc_table, uint16_t poly)
+{
+    int      c = 256;
+    int      bc;
+    uint16_t temp;
+
+    while (c--) {
+        temp = c << 8;
+        bc   = 8;
+
+        while (bc--) {
+            if (temp & 0x8000)
+                temp = (temp << 1) ^ poly;
+            else
+                temp <<= 1;
+
+            crc_table[c] = temp;
+        }
+    }
+}
+
+void
+crc16_calc(uint16_t *crc_table, uint8_t byte, crc_t *crc_var)
+{
+    crc_var->word = (crc_var->word << 8) ^
+                    crc_table[(crc_var->word >> 8) ^ byte];
+}
diff --git a/src/utils/crc32.c b/src/utils/crc32.c
new file mode 100644
index 000000000..6993654ae
--- /dev/null
+++ b/src/utils/crc32.c
@@ -0,0 +1,1016 @@
+/* crc32.c -- compute the CRC-32 of a data stream
+ * Copyright (C) 1995-2022 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * This interleaved implementation of a CRC makes use of pipelined multiple
+ * arithmetic-logic units, commonly found in modern CPU cores. It is due to
+ * Kadatch and Jenkins (2010). See doc/crc-doc.1.0.pdf in this distribution.
+ */
+
+/* @(#) $Id$ */
+
+/*
+  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
+  protection on the static variables used to control the first-use generation
+  of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should
+  first call get_crc_table() to initialize the tables before allowing more than
+  one thread to use crc32().
+
+  MAKECRCH can be #defined to write out crc32.h. A main() routine is also
+  produced, so that this one source file can be compiled to an executable.
+ */
+#include <stdint.h>
+#include <stdlib.h>
+
+#define __USE_LARGEFILE64
+#include <sys/types.h>
+
+#if (defined(__HAIKU__) || defined(__unix__) || defined(__APPLE__)) && !defined(__linux__)
+#    define off64_t  off_t
+#endif
+
+#ifdef MAKECRCH
+#  include <stdio.h>
+#  ifndef DYNAMIC_CRC_TABLE
+#    define DYNAMIC_CRC_TABLE
+#  endif /* !DYNAMIC_CRC_TABLE */
+#endif /* MAKECRCH */
+
+ /*
+  A CRC of a message is computed on N braids of words in the message, where
+  each word consists of W bytes (4 or 8). If N is 3, for example, then three
+  running sparse CRCs are calculated respectively on each braid, at these
+  indices in the array of words: 0, 3, 6, ..., 1, 4, 7, ..., and 2, 5, 8, ...
+  This is done starting at a word boundary, and continues until as many blocks
+  of N * W bytes as are available have been processed. The results are combined
+  into a single CRC at the end. For this code, N must be in the range 1..6 and
+  W must be 4 or 8. The upper limit on N can be increased if desired by adding
+  more #if blocks, extending the patterns apparent in the code. In addition,
+  crc32.h would need to be regenerated, if the maximum N value is increased.
+
+  N and W are chosen empirically by benchmarking the execution time on a given
+  processor. The choices for N and W below were based on testing on Intel Kaby
+  Lake i7, AMD Ryzen 7, ARM Cortex-A57, Sparc64-VII, PowerPC POWER9, and MIPS64
+  Octeon II processors. The Intel, AMD, and ARM processors were all fastest
+  with N=5, W=8. The Sparc, PowerPC, and MIPS64 were all fastest at N=5, W=4.
+  They were all tested with either gcc or clang, all using the -O3 optimization
+  level. Your mileage may vary.
+ */
+
+/* Define N */
+#ifdef Z_TESTN
+#  define N Z_TESTN
+#else
+#  define N 5
+#endif
+#if N < 1 || N > 6
+#  error N must be in 1..6
+#endif
+
+/*
+  crc_t must be at least 32 bits. word_t must be at least as long as
+  crc_t. It is assumed here that word_t is either 32 bits or 64 bits, and
+  that bytes are eight bits.
+ */
+
+/*
+  Define W and the associated word_t type. If W is not defined, then a
+  braided calculation is not used, and the associated tables and code are not
+  compiled.
+ */
+#ifdef CDROM_TESTW
+#  if CDROM_TESTW-1 != -1
+#    define W CDROM_TESTW
+#  endif
+#else
+#  ifdef MAKECRCH
+#    define W 8         /* required for MAKECRCH */
+#  else
+#    if defined(__x86_64__) || defined(__aarch64__)
+#      define W 8
+#    else
+#      define W 4
+#    endif
+#  endif
+#endif
+#ifdef W
+#  if W == 8
+     typedef uint64_t word_t;
+#  else
+#    undef W
+#    define W 4
+     typedef uint32_t word_t;
+#  endif
+#endif
+
+/*
+   #ifdef this out because that code path does not currently produce the
+   correct results.
+ */
+#ifdef USE_ARMCRC32
+/* If available, use the ARM processor CRC32 instruction. */
+#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 8
+#  define ARMCRC32
+#endif
+#endif
+
+#if defined(W) && (!defined(ARMCRC32) || defined(DYNAMIC_CRC_TABLE))
+/*
+   Swap the bytes in a word_t to convert between little and big endian. Any
+   self-respecting compiler will optimize this to a single machine byte-swap
+   instruction, if one is available. This assumes that word_t is either 32 bits
+   or 64 bits.
+ */
+static word_t byte_swap(word_t word) {
+#  if W == 8
+    return
+        (word & 0xff00000000000000) >> 56 |
+        (word & 0xff000000000000) >> 40 |
+        (word & 0xff0000000000) >> 24 |
+        (word & 0xff00000000) >> 8 |
+        (word & 0xff000000) << 8 |
+        (word & 0xff0000) << 24 |
+        (word & 0xff00) << 40 |
+        (word & 0xff) << 56;
+#  else   /* W == 4 */
+    return
+        (word & 0xff000000) >> 24 |
+        (word & 0xff0000) >> 8 |
+        (word & 0xff00) << 8 |
+        (word & 0xff) << 24;
+#  endif
+}
+#endif
+
+#ifdef DYNAMIC_CRC_TABLE
+/* =========================================================================
+ * Table of powers of x for combining CRC-32s, filled in by make_crc_table()
+ * below.
+ */
+   static crc_t x2n_table[32];
+#else
+/* =========================================================================
+ * Tables for byte-wise and braided CRC-32 calculations, and a table of powers
+ * of x for combining CRC-32s, all made by make_crc_table().
+ */
+#  include "crc32.h"
+#endif
+
+/* CRC polynomial. */
+// #define POLY 0xedb88320         /* p(x) reflected, with x^32 implied */
+#define POLY 0xd8018001         /* p(x) reflected, with x^32 implied */
+
+#ifdef DYNAMIC_CRC_TABLE
+/* =========================================================================
+ * Build the tables for byte-wise and braided CRC-32 calculations, and a table
+ * of powers of x for combining CRC-32s.
+ */
+static crc_t crc_table[256];
+#ifdef W
+   static word_t crc_big_table[256];
+   static crc_t crc_braid_table[W][256];
+   static word_t crc_braid_big_table[W][256];
+   static void braid(crc_t [][256], word_t [][256], int, int);
+#endif
+#ifdef MAKECRCH
+   static void write_table(FILE *, const crc_t *, int);
+   static void write_table32hi(FILE *, const word_t *, int);
+   static void write_table64(FILE *, const word_t *, int);
+#endif /* MAKECRCH */
+
+/*
+  Define a once() function depending on the availability of atomics. If this is
+  compiled with DYNAMIC_CRC_TABLE defined, and if CRCs will be computed in
+  multiple threads, and if atomics are not available, then get_crc_table() must
+  be called to initialize the tables and must return before any threads are
+  allowed to compute or combine CRCs.
+ */
+
+/* Definition of once functionality. */
+typedef struct once_s once_t;
+
+/* Check for the availability of atomics. */
+#if defined(__STDC__) && __STDC_VERSION__ >= 201112L && \
+    !defined(__STDC_NO_ATOMICS__)
+
+#include <stdatomic.h>
+
+/* Structure for once(), which must be initialized with ONCE_INIT. */
+struct once_s {
+    atomic_flag begun;
+    atomic_int done;
+};
+#define ONCE_INIT {ATOMIC_FLAG_INIT, 0}
+
+/*
+  Run the provided init() function exactly once, even if multiple threads
+  invoke once() at the same time. The state must be a once_t initialized with
+  ONCE_INIT.
+ */
+static void once(once_t *state, void (*init)(void)) {
+    if (!atomic_load(&state->done)) {
+        if (atomic_flag_test_and_set(&state->begun))
+            while (!atomic_load(&state->done))
+                ;
+        else {
+            init();
+            atomic_store(&state->done, 1);
+        }
+    }
+}
+
+#else   /* no atomics */
+
+/* Structure for once(), which must be initialized with ONCE_INIT. */
+struct once_s {
+    volatile int begun;
+    volatile int done;
+};
+#define ONCE_INIT {0, 0}
+
+/* Test and set. Alas, not atomic, but tries to minimize the period of
+   vulnerability. */
+static int test_and_set(int volatile *flag) {
+    int was;
+
+    was = *flag;
+    *flag = 1;
+    return was;
+}
+
+/* Run the provided init() function once. This is not thread-safe. */
+static void once(once_t *state, void (*init)(void)) {
+    if (!state->done) {
+        if (test_and_set(&state->begun))
+            while (!state->done)
+                ;
+        else {
+            init();
+            state->done = 1;
+        }
+    }
+}
+
+#endif
+
+/* State for once(). */
+static once_t made = ONCE_INIT;
+
+/*
+  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
+  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
+
+  Polynomials over GF(2) are represented in binary, one bit per coefficient,
+  with the lowest powers in the most significant bit. Then adding polynomials
+  is just exclusive-or, and multiplying a polynomial by x is a right shift by
+  one. If we call the above polynomial p, and represent a byte as the
+  polynomial q, also with the lowest power in the most significant bit (so the
+  byte 0xb1 is the polynomial x^7+x^3+x^2+1), then the CRC is (q*x^32) mod p,
+  where a mod b means the remainder after dividing a by b.
+
+  This calculation is done using the shift-register method of multiplying and
+  taking the remainder. The register is initialized to zero, and for each
+  incoming bit, x^32 is added mod p to the register if the bit is a one (where
+  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by x
+  (which is shifting right by one and adding x^32 mod p if the bit shifted out
+  is a one). We start with the highest power (least significant bit) of q and
+  repeat for all eight bits of q.
+
+  The table is simply the CRC of all possible eight bit values. This is all the
+  information needed to generate CRCs on data a byte at a time for all
+  combinations of CRC register values and incoming bytes.
+ */
+
+static void make_crc_table(void) {
+    unsigned i, j, n;
+    crc_t    p;
+
+    /* initialize the CRC of bytes tables */
+    for (i = 0; i < 256; i++) {
+        p = i;
+        for (j = 0; j < 8; j++)
+            p = p & 1 ? (p >> 1) ^ POLY : p >> 1;
+        crc_table[i] = p;
+#ifdef W
+        crc_big_table[i] = byte_swap(p);
+#endif
+    }
+
+    /* initialize the x^2^n mod p(x) table */
+    p = (crc_t) 1 << 30;         /* x^1 */
+    x2n_table[0] = p;
+    for (n = 1; n < 32; n++)
+        x2n_table[n] = p = multmodp(p, p);
+
+#ifdef W
+    /* initialize the braiding tables -- needs x2n_table[] */
+    braid(crc_braid_table, crc_braid_big_table, N, W);
+#endif
+
+#ifdef MAKECRCH
+    {
+        /*
+           The crc32.h header file contains tables for both 32-bit and 64-bit
+           word_t's, and so requires a 64-bit type be available. In that
+           case, word_t must be defined to be 64-bits. This code then also
+           generates and writes out the tables for the case that word_t is
+           32 bits.
+         */
+#if !defined(W) || W != 8
+#  error Need a 64-bit integer type in order to generate crc32.h.
+#endif
+        FILE *out;
+        int k, n;
+        crc_t ltl[8][256];
+        word_t big[8][256];
+
+        out = fopen("crc32.h", "w");
+        if (out == NULL) return;
+
+        /* write out little-endian CRC table to crc32.h */
+        fprintf(out,
+            "/* crc32.h -- tables for rapid CRC calculation\n"
+            " * Generated automatically by crc32.c\n */\n"
+            "\n"
+            "static const crc_t crc_table[] = {\n"
+            "    ");
+        write_table(out, crc_table, 256);
+        fprintf(out,
+            "};\n");
+
+        /* write out big-endian CRC table for 64-bit word_t to crc32.h */
+        fprintf(out,
+            "\n"
+            "#ifdef W\n"
+            "\n"
+            "#if W == 8\n"
+            "\n"
+            "static const word_t crc_big_table[] = {\n"
+            "    ");
+        write_table64(out, crc_big_table, 256);
+        fprintf(out,
+            "};\n");
+
+        /* write out big-endian CRC table for 32-bit word_t to crc32.h */
+        fprintf(out,
+            "\n"
+            "#else /* W == 4 */\n"
+            "\n"
+            "static const word_t crc_big_table[] = {\n"
+            "    ");
+        write_table32hi(out, crc_big_table, 256);
+        fprintf(out,
+            "};\n"
+            "\n"
+            "#endif\n");
+
+        /* write out braid tables for each value of N */
+        for (n = 1; n <= 6; n++) {
+            fprintf(out,
+            "\n"
+            "#if N == %d\n", n);
+
+            /* compute braid tables for this N and 64-bit word_t */
+            braid(ltl, big, n, 8);
+
+            /* write out braid tables for 64-bit word_t to crc32.h */
+            fprintf(out,
+            "\n"
+            "#if W == 8\n"
+            "\n"
+            "static const crc_t crc_braid_table[][256] = {\n");
+            for (k = 0; k < 8; k++) {
+                fprintf(out, "   {");
+                write_table(out, ltl[k], 256);
+                fprintf(out, "}%s", k < 7 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n"
+            "\n"
+            "static const word_t crc_braid_big_table[][256] = {\n");
+            for (k = 0; k < 8; k++) {
+                fprintf(out, "   {");
+                write_table64(out, big[k], 256);
+                fprintf(out, "}%s", k < 7 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n");
+
+            /* compute braid tables for this N and 32-bit word_t */
+            braid(ltl, big, n, 4);
+
+            /* write out braid tables for 32-bit word_t to crc32.h */
+            fprintf(out,
+            "\n"
+            "#else /* W == 4 */\n"
+            "\n"
+            "static const crc_t crc_braid_table[][256] = {\n");
+            for (k = 0; k < 4; k++) {
+                fprintf(out, "   {");
+                write_table(out, ltl[k], 256);
+                fprintf(out, "}%s", k < 3 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n"
+            "\n"
+            "static const word_t crc_braid_big_table[][256] = {\n");
+            for (k = 0; k < 4; k++) {
+                fprintf(out, "   {");
+                write_table32hi(out, big[k], 256);
+                fprintf(out, "}%s", k < 3 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n"
+            "\n"
+            "#endif\n"
+            "\n"
+            "#endif\n");
+        }
+        fprintf(out,
+            "\n"
+            "#endif\n");
+
+        /* write out zeros operator table to crc32.h */
+        fprintf(out,
+            "\n"
+            "static const crc_t x2n_table[] = {\n"
+            "    ");
+        write_table(out, x2n_table, 32);
+        fprintf(out,
+            "};\n");
+        fclose(out);
+    }
+#endif /* MAKECRCH */
+}
+
+#ifdef MAKECRCH
+
+/*
+   Write the 32-bit values in table[0..k-1] to out, five per line in
+   hexadecimal separated by commas.
+ */
+static void write_table(FILE *out, const crc_t *table, int k) {
+    int n;
+
+    for (n = 0; n < k; n++)
+        fprintf(out, "%s0x%08lx%s", n == 0 || n % 5 ? "" : "    ",
+                (unsigned long)(table[n]),
+                n == k - 1 ? "" : (n % 5 == 4 ? ",\n" : ", "));
+}
+
+/*
+   Write the high 32-bits of each value in table[0..k-1] to out, five per line
+   in hexadecimal separated by commas.
+ */
+static void write_table32hi(FILE *out, const word_t *table, int k) {
+    int n;
+
+    for (n = 0; n < k; n++)
+        fprintf(out, "%s0x%08lx%s", n == 0 || n % 5 ? "" : "    ",
+                (unsigned long)(table[n] >> 32),
+                n == k - 1 ? "" : (n % 5 == 4 ? ",\n" : ", "));
+}
+
+/*
+  Write the 64-bit values in table[0..k-1] to out, three per line in
+  hexadecimal separated by commas. This assumes that if there is a 64-bit
+  type, then there is also a long long integer type, and it is at least 64
+  bits. If not, then the type cast and format string can be adjusted
+  accordingly.
+ */
+static void write_table64(FILE *out, const word_t *table, int k) {
+    int n;
+
+    for (n = 0; n < k; n++)
+        fprintf(out, "%s0x%016llx%s", n == 0 || n % 3 ? "" : "    ",
+                (unsigned long long)(table[n]),
+                n == k - 1 ? "" : (n % 3 == 2 ? ",\n" : ", "));
+}
+
+/* Actually do the deed. */
+int main(void) {
+    make_crc_table();
+    return 0;
+}
+
+#endif /* MAKECRCH */
+
+#ifdef W
+/*
+  Generate the little and big-endian braid tables for the given n and word_t
+  size w. Each array must have room for w blocks of 256 elements.
+ */
+static void braid(crc_t ltl[][256], word_t big[][256], int n, int w) {
+    int k;
+    crc_t i, p, q;
+    for (k = 0; k < w; k++) {
+        p = x2nmodp((n * w + 3 - k) << 3, 0);
+        ltl[k][0] = 0;
+        big[w - 1 - k][0] = 0;
+        for (i = 1; i < 256; i++) {
+            ltl[k][i] = q = multmodp(i << 24, p);
+            big[w - 1 - k][i] = byte_swap(q);
+        }
+    }
+}
+#endif
+
+#endif /* DYNAMIC_CRC_TABLE */
+
+/* =========================================================================
+ * Use ARM machine instructions if available. This will compute the CRC about
+ * ten times faster than the braided calculation. This code does not check for
+ * the presence of the CRC instruction at run time. __ARM_FEATURE_CRC32 will
+ * only be defined if the compilation specifies an ARM processor architecture
+ * that has the instructions. For example, compiling with -march=armv8.1-a or
+ * -march=armv8-a+crc, or -march=native if the compile machine has the crc32
+ * instructions.
+ */
+#ifdef ARMCRC32
+
+/*
+  Return a(x) multiplied by b(x) modulo p(x), where p(x) is the CRC polynomial,
+  reflected. For speed, this requires that a not be zero.
+ */
+static crc_t multmodp(crc_t a, crc_t b) {
+    crc_t m, p;
+
+    m = (crc_t)1 << 31;
+    p = 0;
+    for (;;) {
+        if (a & m) {
+            p ^= b;
+            if ((a & (m - 1)) == 0)
+                break;
+        }
+        m >>= 1;
+        b = b & 1 ? (b >> 1) ^ POLY : b >> 1;
+    }
+    return p;
+}
+
+/*
+  Return x^(n * 2^k) modulo p(x). Requires that x2n_table[] has been
+  initialized.
+ */
+static crc_t x2nmodp(off64_t n, unsigned k) {
+    crc_t p;
+
+    p = (crc_t)1 << 31;           /* x^0 == 1 */
+    while (n) {
+        if (n & 1)
+            p = multmodp(x2n_table[k & 31], p);
+        n >>= 1;
+        k++;
+    }
+    return p;
+}
+
+/*
+   Constants empirically determined to maximize speed. These values are from
+   measurements on a Cortex-A57. Your mileage may vary.
+ */
+#define Z_BATCH 3990                /* number of words in a batch */
+#define Z_BATCH_ZEROS 0xa10d3d0c    /* computed from Z_BATCH = 3990 */
+#define Z_BATCH_MIN 800             /* fewest words in a final batch */
+
+uint32_t cdrom_crc32(unsigned long crc, const unsigned char *buf,
+                     size_t len) {
+    crc_t val;
+    word_t crc1, crc2;
+    const word_t *word;
+    word_t val0, val1, val2;
+    size_t last, last2, i;
+    size_t num;
+
+    /* Return initial CRC, if requested. */
+    if (buf == NULL)
+        return 0;
+
+#ifdef DYNAMIC_CRC_TABLE
+    once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+
+    /* Pre-condition the CRC */
+    crc = (~crc) & 0xffffffff;
+
+    /* Compute the CRC up to a word boundary. */
+    while (len && ((size_t) buf & 7) != 0) {
+        len--;
+        val = *buf++;
+        __asm__ volatile("crc32b %w0, %w0, %w1" : "+r"(crc) : "r"(val));
+    }
+
+    /* Prepare to compute the CRC on full 64-bit words word[0..num-1]. */
+    word = (word_t const *)buf;
+    num = len >> 3;
+    len &= 7;
+
+    /* Do three interleaved CRCs to realize the throughput of one crc32x
+       instruction per cycle. Each CRC is calculated on Z_BATCH words. The
+       three CRCs are combined into a single CRC after each set of batches. */
+    while (num >= 3 * Z_BATCH) {
+        crc1 = 0;
+        crc2 = 0;
+        for (i = 0; i < Z_BATCH; i++) {
+            val0 = word[i];
+            val1 = word[i + Z_BATCH];
+            val2 = word[i + 2 * Z_BATCH];
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc) : "r"(val0));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc1) : "r"(val1));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc2) : "r"(val2));
+        }
+        word += 3 * Z_BATCH;
+        num -= 3 * Z_BATCH;
+        crc = multmodp(Z_BATCH_ZEROS, crc) ^ crc1;
+        crc = multmodp(Z_BATCH_ZEROS, crc) ^ crc2;
+    }
+
+    /* Do one last smaller batch with the remaining words, if there are enough
+       to pay for the combination of CRCs. */
+    last = num / 3;
+    if (last >= Z_BATCH_MIN) {
+        last2 = last << 1;
+        crc1 = 0;
+        crc2 = 0;
+        for (i = 0; i < last; i++) {
+            val0 = word[i];
+            val1 = word[i + last];
+            val2 = word[i + last2];
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc) : "r"(val0));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc1) : "r"(val1));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc2) : "r"(val2));
+        }
+        word += 3 * last;
+        num -= 3 * last;
+        val = x2nmodp(last, 6);
+        crc = multmodp(val, crc) ^ crc1;
+        crc = multmodp(val, crc) ^ crc2;
+    }
+
+    /* Compute the CRC on any remaining words. */
+    for (i = 0; i < num; i++) {
+        val0 = word[i];
+        __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc) : "r"(val0));
+    }
+    word += num;
+
+    /* Complete the CRC on any remaining bytes. */
+    buf = (const unsigned char *) word;
+    while (len) {
+        len--;
+        val = *buf++;
+        __asm__ volatile("crc32b %w0, %w0, %w1" : "+r"(crc) : "r"(val));
+    }
+
+    /* Return the CRC, post-conditioned. */
+    return crc ^ 0xffffffff;
+}
+
+#else
+
+#ifdef W
+
+/*
+  Return the CRC of the W bytes in the word_t data, taking the
+  least-significant byte of the word as the first byte of data, without any pre
+  or post conditioning. This is used to combine the CRCs of each braid.
+ */
+static crc_t crc_word(word_t data) {
+    int k;
+    for (k = 0; k < W; k++)
+        data = (data >> 8) ^ crc_table[data & 0xff];
+    return (crc_t) data;
+}
+
+static word_t crc_word_big(word_t data) {
+    int k;
+    for (k = 0; k < W; k++)
+        data = (data << 8) ^
+            crc_big_table[(data >> ((W - 1) << 3)) & 0xff];
+    return data;
+}
+
+#endif
+
+/* ========================================================================= */
+unsigned long cdrom_crc32(unsigned long crc, const unsigned char *buf,
+                          size_t len) {
+    /* Return initial CRC, if requested. */
+    if (buf == NULL)
+        return 0;
+
+#ifdef DYNAMIC_CRC_TABLE
+    once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+
+    /* Pre-condition the CRC */
+    crc = (~crc) & 0xffffffff;
+
+#ifdef W
+
+    /* If provided enough bytes, do a braided CRC calculation. */
+    if (len >= N * W + W - 1) {
+        size_t blks;
+        word_t const *words;
+        unsigned endian;
+        int k;
+
+        /* Compute the CRC up to a word_t boundary. */
+        while (len && ((size_t) buf & (W - 1)) != 0) {
+            len--;
+            crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        }
+
+        /* Compute the CRC on as many N word_t blocks as are available. */
+        blks = len / (N * W);
+        len -= blks * N * W;
+        words = (word_t const *)buf;
+
+        /* Do endian check at execution time instead of compile time, since ARM
+           processors can change the endianness at execution time. If the
+           compiler knows what the endianness will be, it can optimize out the
+           check and the unused branch. */
+        endian = 1;
+        if (*(unsigned char *)&endian) {
+            /* Little endian. */
+
+            crc_t crc0;
+            word_t word0;
+#if N > 1
+            crc_t crc1;
+            word_t word1;
+#if N > 2
+            crc_t crc2;
+            word_t word2;
+#if N > 3
+            crc_t crc3;
+            word_t word3;
+#if N > 4
+            crc_t crc4;
+            word_t word4;
+#if N > 5
+            crc_t crc5;
+            word_t word5;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /* Initialize the CRC for each braid. */
+            crc0 = crc;
+#if N > 1
+            crc1 = 0;
+#if N > 2
+            crc2 = 0;
+#if N > 3
+            crc3 = 0;
+#if N > 4
+            crc4 = 0;
+#if N > 5
+            crc5 = 0;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /*
+              Process the first blks-1 blocks, computing the CRCs on each braid
+              independently.
+             */
+            while (--blks) {
+                /* Load the word for each braid into registers. */
+                word0 = crc0 ^ words[0];
+#if N > 1
+                word1 = crc1 ^ words[1];
+#if N > 2
+                word2 = crc2 ^ words[2];
+#if N > 3
+                word3 = crc3 ^ words[3];
+#if N > 4
+                word4 = crc4 ^ words[4];
+#if N > 5
+                word5 = crc5 ^ words[5];
+#endif
+#endif
+#endif
+#endif
+#endif
+                words += N;
+
+                /* Compute and update the CRC for each word. The loop should
+                   get unrolled. */
+                crc0 = crc_braid_table[0][word0 & 0xff];
+#if N > 1
+                crc1 = crc_braid_table[0][word1 & 0xff];
+#if N > 2
+                crc2 = crc_braid_table[0][word2 & 0xff];
+#if N > 3
+                crc3 = crc_braid_table[0][word3 & 0xff];
+#if N > 4
+                crc4 = crc_braid_table[0][word4 & 0xff];
+#if N > 5
+                crc5 = crc_braid_table[0][word5 & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                for (k = 1; k < W; k++) {
+                    crc0 ^= crc_braid_table[k][(word0 >> (k << 3)) & 0xff];
+#if N > 1
+                    crc1 ^= crc_braid_table[k][(word1 >> (k << 3)) & 0xff];
+#if N > 2
+                    crc2 ^= crc_braid_table[k][(word2 >> (k << 3)) & 0xff];
+#if N > 3
+                    crc3 ^= crc_braid_table[k][(word3 >> (k << 3)) & 0xff];
+#if N > 4
+                    crc4 ^= crc_braid_table[k][(word4 >> (k << 3)) & 0xff];
+#if N > 5
+                    crc5 ^= crc_braid_table[k][(word5 >> (k << 3)) & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                }
+            }
+
+            /*
+              Process the last block, combining the CRCs of the N braids at the
+              same time.
+             */
+            crc = crc_word(crc0 ^ words[0]);
+#if N > 1
+            crc = crc_word(crc1 ^ words[1] ^ crc);
+#if N > 2
+            crc = crc_word(crc2 ^ words[2] ^ crc);
+#if N > 3
+            crc = crc_word(crc3 ^ words[3] ^ crc);
+#if N > 4
+            crc = crc_word(crc4 ^ words[4] ^ crc);
+#if N > 5
+            crc = crc_word(crc5 ^ words[5] ^ crc);
+#endif
+#endif
+#endif
+#endif
+#endif
+            words += N;
+        }
+        else {
+            /* Big endian. */
+
+            word_t crc0, word0, comb;
+#if N > 1
+            word_t crc1, word1;
+#if N > 2
+            word_t crc2, word2;
+#if N > 3
+            word_t crc3, word3;
+#if N > 4
+            word_t crc4, word4;
+#if N > 5
+            word_t crc5, word5;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /* Initialize the CRC for each braid. */
+            crc0 = byte_swap(crc);
+#if N > 1
+            crc1 = 0;
+#if N > 2
+            crc2 = 0;
+#if N > 3
+            crc3 = 0;
+#if N > 4
+            crc4 = 0;
+#if N > 5
+            crc5 = 0;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /*
+              Process the first blks-1 blocks, computing the CRCs on each braid
+              independently.
+             */
+            while (--blks) {
+                /* Load the word for each braid into registers. */
+                word0 = crc0 ^ words[0];
+#if N > 1
+                word1 = crc1 ^ words[1];
+#if N > 2
+                word2 = crc2 ^ words[2];
+#if N > 3
+                word3 = crc3 ^ words[3];
+#if N > 4
+                word4 = crc4 ^ words[4];
+#if N > 5
+                word5 = crc5 ^ words[5];
+#endif
+#endif
+#endif
+#endif
+#endif
+                words += N;
+
+                /* Compute and update the CRC for each word. The loop should
+                   get unrolled. */
+                crc0 = crc_braid_big_table[0][word0 & 0xff];
+#if N > 1
+                crc1 = crc_braid_big_table[0][word1 & 0xff];
+#if N > 2
+                crc2 = crc_braid_big_table[0][word2 & 0xff];
+#if N > 3
+                crc3 = crc_braid_big_table[0][word3 & 0xff];
+#if N > 4
+                crc4 = crc_braid_big_table[0][word4 & 0xff];
+#if N > 5
+                crc5 = crc_braid_big_table[0][word5 & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                for (k = 1; k < W; k++) {
+                    crc0 ^= crc_braid_big_table[k][(word0 >> (k << 3)) & 0xff];
+#if N > 1
+                    crc1 ^= crc_braid_big_table[k][(word1 >> (k << 3)) & 0xff];
+#if N > 2
+                    crc2 ^= crc_braid_big_table[k][(word2 >> (k << 3)) & 0xff];
+#if N > 3
+                    crc3 ^= crc_braid_big_table[k][(word3 >> (k << 3)) & 0xff];
+#if N > 4
+                    crc4 ^= crc_braid_big_table[k][(word4 >> (k << 3)) & 0xff];
+#if N > 5
+                    crc5 ^= crc_braid_big_table[k][(word5 >> (k << 3)) & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                }
+            }
+
+            /*
+              Process the last block, combining the CRCs of the N braids at the
+              same time.
+             */
+            comb = crc_word_big(crc0 ^ words[0]);
+#if N > 1
+            comb = crc_word_big(crc1 ^ words[1] ^ comb);
+#if N > 2
+            comb = crc_word_big(crc2 ^ words[2] ^ comb);
+#if N > 3
+            comb = crc_word_big(crc3 ^ words[3] ^ comb);
+#if N > 4
+            comb = crc_word_big(crc4 ^ words[4] ^ comb);
+#if N > 5
+            comb = crc_word_big(crc5 ^ words[5] ^ comb);
+#endif
+#endif
+#endif
+#endif
+#endif
+            words += N;
+            crc = byte_swap(comb);
+        }
+
+        /*
+          Update the pointer to the remaining bytes to process.
+         */
+        buf = (unsigned char const *)words;
+    }
+
+#endif /* W */
+
+    /* Complete the computation of the CRC on any remaining bytes. */
+    while (len >= 8) {
+        len -= 8;
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+    }
+    while (len) {
+        len--;
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+    }
+
+    /* Return the CRC, post-conditioned. */
+    return crc ^ 0xffffffff;
+}
+
+#endif
diff --git a/src/utils/crc32.h b/src/utils/crc32.h
new file mode 100644
index 000000000..d4bf86c5a
--- /dev/null
+++ b/src/utils/crc32.h
@@ -0,0 +1,9448 @@
+/* crc32.h -- tables for rapid CRC calculation
+ * Generated automatically by crc32.c
+ */
+
+typedef uint32_t crc_t;
+
+static const crc_t crc_table[] = {
+    0x00000000, 0x90910101, 0x91210201, 0x01b00300, 0x92410401,
+    0x02d00500, 0x03600600, 0x93f10701, 0x94810801, 0x04100900,
+    0x05a00a00, 0x95310b01, 0x06c00c00, 0x96510d01, 0x97e10e01,
+    0x07700f00, 0x99011001, 0x09901100, 0x08201200, 0x98b11301,
+    0x0b401400, 0x9bd11501, 0x9a611601, 0x0af01700, 0x0d801800,
+    0x9d111901, 0x9ca11a01, 0x0c301b00, 0x9fc11c01, 0x0f501d00,
+    0x0ee01e00, 0x9e711f01, 0x82012001, 0x12902100, 0x13202200,
+    0x83b12301, 0x10402400, 0x80d12501, 0x81612601, 0x11f02700,
+    0x16802800, 0x86112901, 0x87a12a01, 0x17302b00, 0x84c12c01,
+    0x14502d00, 0x15e02e00, 0x85712f01, 0x1b003000, 0x8b913101,
+    0x8a213201, 0x1ab03300, 0x89413401, 0x19d03500, 0x18603600,
+    0x88f13701, 0x8f813801, 0x1f103900, 0x1ea03a00, 0x8e313b01,
+    0x1dc03c00, 0x8d513d01, 0x8ce13e01, 0x1c703f00, 0xb4014001,
+    0x24904100, 0x25204200, 0xb5b14301, 0x26404400, 0xb6d14501,
+    0xb7614601, 0x27f04700, 0x20804800, 0xb0114901, 0xb1a14a01,
+    0x21304b00, 0xb2c14c01, 0x22504d00, 0x23e04e00, 0xb3714f01,
+    0x2d005000, 0xbd915101, 0xbc215201, 0x2cb05300, 0xbf415401,
+    0x2fd05500, 0x2e605600, 0xbef15701, 0xb9815801, 0x29105900,
+    0x28a05a00, 0xb8315b01, 0x2bc05c00, 0xbb515d01, 0xbae15e01,
+    0x2a705f00, 0x36006000, 0xa6916101, 0xa7216201, 0x37b06300,
+    0xa4416401, 0x34d06500, 0x35606600, 0xa5f16701, 0xa2816801,
+    0x32106900, 0x33a06a00, 0xa3316b01, 0x30c06c00, 0xa0516d01,
+    0xa1e16e01, 0x31706f00, 0xaf017001, 0x3f907100, 0x3e207200,
+    0xaeb17301, 0x3d407400, 0xadd17501, 0xac617601, 0x3cf07700,
+    0x3b807800, 0xab117901, 0xaaa17a01, 0x3a307b00, 0xa9c17c01,
+    0x39507d00, 0x38e07e00, 0xa8717f01, 0xd8018001, 0x48908100,
+    0x49208200, 0xd9b18301, 0x4a408400, 0xdad18501, 0xdb618601,
+    0x4bf08700, 0x4c808800, 0xdc118901, 0xdda18a01, 0x4d308b00,
+    0xdec18c01, 0x4e508d00, 0x4fe08e00, 0xdf718f01, 0x41009000,
+    0xd1919101, 0xd0219201, 0x40b09300, 0xd3419401, 0x43d09500,
+    0x42609600, 0xd2f19701, 0xd5819801, 0x45109900, 0x44a09a00,
+    0xd4319b01, 0x47c09c00, 0xd7519d01, 0xd6e19e01, 0x46709f00,
+    0x5a00a000, 0xca91a101, 0xcb21a201, 0x5bb0a300, 0xc841a401,
+    0x58d0a500, 0x5960a600, 0xc9f1a701, 0xce81a801, 0x5e10a900,
+    0x5fa0aa00, 0xcf31ab01, 0x5cc0ac00, 0xcc51ad01, 0xcde1ae01,
+    0x5d70af00, 0xc301b001, 0x5390b100, 0x5220b200, 0xc2b1b301,
+    0x5140b400, 0xc1d1b501, 0xc061b601, 0x50f0b700, 0x5780b800,
+    0xc711b901, 0xc6a1ba01, 0x5630bb00, 0xc5c1bc01, 0x5550bd00,
+    0x54e0be00, 0xc471bf01, 0x6c00c000, 0xfc91c101, 0xfd21c201,
+    0x6db0c300, 0xfe41c401, 0x6ed0c500, 0x6f60c600, 0xfff1c701,
+    0xf881c801, 0x6810c900, 0x69a0ca00, 0xf931cb01, 0x6ac0cc00,
+    0xfa51cd01, 0xfbe1ce01, 0x6b70cf00, 0xf501d001, 0x6590d100,
+    0x6420d200, 0xf4b1d301, 0x6740d400, 0xf7d1d501, 0xf661d601,
+    0x66f0d700, 0x6180d800, 0xf111d901, 0xf0a1da01, 0x6030db00,
+    0xf3c1dc01, 0x6350dd00, 0x62e0de00, 0xf271df01, 0xee01e001,
+    0x7e90e100, 0x7f20e200, 0xefb1e301, 0x7c40e400, 0xecd1e501,
+    0xed61e601, 0x7df0e700, 0x7a80e800, 0xea11e901, 0xeba1ea01,
+    0x7b30eb00, 0xe8c1ec01, 0x7850ed00, 0x79e0ee00, 0xe971ef01,
+    0x7700f000, 0xe791f101, 0xe621f201, 0x76b0f300, 0xe541f401,
+    0x75d0f500, 0x7460f600, 0xe4f1f701, 0xe381f801, 0x7310f900,
+    0x72a0fa00, 0xe231fb01, 0x71c0fc00, 0xe151fd01, 0xe0e1fe01,
+    0x7070ff00};
+
+#ifdef W
+
+#if W == 8
+
+static const word_t crc_big_table[] = {
+    0x0000000000000000, 0x0101919000000000, 0x0102219100000000,
+    0x0003b00100000000, 0x0104419200000000, 0x0005d00200000000,
+    0x0006600300000000, 0x0107f19300000000, 0x0108819400000000,
+    0x0009100400000000, 0x000aa00500000000, 0x010b319500000000,
+    0x000cc00600000000, 0x010d519600000000, 0x010ee19700000000,
+    0x000f700700000000, 0x0110019900000000, 0x0011900900000000,
+    0x0012200800000000, 0x0113b19800000000, 0x0014400b00000000,
+    0x0115d19b00000000, 0x0116619a00000000, 0x0017f00a00000000,
+    0x0018800d00000000, 0x0119119d00000000, 0x011aa19c00000000,
+    0x001b300c00000000, 0x011cc19f00000000, 0x001d500f00000000,
+    0x001ee00e00000000, 0x011f719e00000000, 0x0120018200000000,
+    0x0021901200000000, 0x0022201300000000, 0x0123b18300000000,
+    0x0024401000000000, 0x0125d18000000000, 0x0126618100000000,
+    0x0027f01100000000, 0x0028801600000000, 0x0129118600000000,
+    0x012aa18700000000, 0x002b301700000000, 0x012cc18400000000,
+    0x002d501400000000, 0x002ee01500000000, 0x012f718500000000,
+    0x0030001b00000000, 0x0131918b00000000, 0x0132218a00000000,
+    0x0033b01a00000000, 0x0134418900000000, 0x0035d01900000000,
+    0x0036601800000000, 0x0137f18800000000, 0x0138818f00000000,
+    0x0039101f00000000, 0x003aa01e00000000, 0x013b318e00000000,
+    0x003cc01d00000000, 0x013d518d00000000, 0x013ee18c00000000,
+    0x003f701c00000000, 0x014001b400000000, 0x0041902400000000,
+    0x0042202500000000, 0x0143b1b500000000, 0x0044402600000000,
+    0x0145d1b600000000, 0x014661b700000000, 0x0047f02700000000,
+    0x0048802000000000, 0x014911b000000000, 0x014aa1b100000000,
+    0x004b302100000000, 0x014cc1b200000000, 0x004d502200000000,
+    0x004ee02300000000, 0x014f71b300000000, 0x0050002d00000000,
+    0x015191bd00000000, 0x015221bc00000000, 0x0053b02c00000000,
+    0x015441bf00000000, 0x0055d02f00000000, 0x0056602e00000000,
+    0x0157f1be00000000, 0x015881b900000000, 0x0059102900000000,
+    0x005aa02800000000, 0x015b31b800000000, 0x005cc02b00000000,
+    0x015d51bb00000000, 0x015ee1ba00000000, 0x005f702a00000000,
+    0x0060003600000000, 0x016191a600000000, 0x016221a700000000,
+    0x0063b03700000000, 0x016441a400000000, 0x0065d03400000000,
+    0x0066603500000000, 0x0167f1a500000000, 0x016881a200000000,
+    0x0069103200000000, 0x006aa03300000000, 0x016b31a300000000,
+    0x006cc03000000000, 0x016d51a000000000, 0x016ee1a100000000,
+    0x006f703100000000, 0x017001af00000000, 0x0071903f00000000,
+    0x0072203e00000000, 0x0173b1ae00000000, 0x0074403d00000000,
+    0x0175d1ad00000000, 0x017661ac00000000, 0x0077f03c00000000,
+    0x0078803b00000000, 0x017911ab00000000, 0x017aa1aa00000000,
+    0x007b303a00000000, 0x017cc1a900000000, 0x007d503900000000,
+    0x007ee03800000000, 0x017f71a800000000, 0x018001d800000000,
+    0x0081904800000000, 0x0082204900000000, 0x0183b1d900000000,
+    0x0084404a00000000, 0x0185d1da00000000, 0x018661db00000000,
+    0x0087f04b00000000, 0x0088804c00000000, 0x018911dc00000000,
+    0x018aa1dd00000000, 0x008b304d00000000, 0x018cc1de00000000,
+    0x008d504e00000000, 0x008ee04f00000000, 0x018f71df00000000,
+    0x0090004100000000, 0x019191d100000000, 0x019221d000000000,
+    0x0093b04000000000, 0x019441d300000000, 0x0095d04300000000,
+    0x0096604200000000, 0x0197f1d200000000, 0x019881d500000000,
+    0x0099104500000000, 0x009aa04400000000, 0x019b31d400000000,
+    0x009cc04700000000, 0x019d51d700000000, 0x019ee1d600000000,
+    0x009f704600000000, 0x00a0005a00000000, 0x01a191ca00000000,
+    0x01a221cb00000000, 0x00a3b05b00000000, 0x01a441c800000000,
+    0x00a5d05800000000, 0x00a6605900000000, 0x01a7f1c900000000,
+    0x01a881ce00000000, 0x00a9105e00000000, 0x00aaa05f00000000,
+    0x01ab31cf00000000, 0x00acc05c00000000, 0x01ad51cc00000000,
+    0x01aee1cd00000000, 0x00af705d00000000, 0x01b001c300000000,
+    0x00b1905300000000, 0x00b2205200000000, 0x01b3b1c200000000,
+    0x00b4405100000000, 0x01b5d1c100000000, 0x01b661c000000000,
+    0x00b7f05000000000, 0x00b8805700000000, 0x01b911c700000000,
+    0x01baa1c600000000, 0x00bb305600000000, 0x01bcc1c500000000,
+    0x00bd505500000000, 0x00bee05400000000, 0x01bf71c400000000,
+    0x00c0006c00000000, 0x01c191fc00000000, 0x01c221fd00000000,
+    0x00c3b06d00000000, 0x01c441fe00000000, 0x00c5d06e00000000,
+    0x00c6606f00000000, 0x01c7f1ff00000000, 0x01c881f800000000,
+    0x00c9106800000000, 0x00caa06900000000, 0x01cb31f900000000,
+    0x00ccc06a00000000, 0x01cd51fa00000000, 0x01cee1fb00000000,
+    0x00cf706b00000000, 0x01d001f500000000, 0x00d1906500000000,
+    0x00d2206400000000, 0x01d3b1f400000000, 0x00d4406700000000,
+    0x01d5d1f700000000, 0x01d661f600000000, 0x00d7f06600000000,
+    0x00d8806100000000, 0x01d911f100000000, 0x01daa1f000000000,
+    0x00db306000000000, 0x01dcc1f300000000, 0x00dd506300000000,
+    0x00dee06200000000, 0x01df71f200000000, 0x01e001ee00000000,
+    0x00e1907e00000000, 0x00e2207f00000000, 0x01e3b1ef00000000,
+    0x00e4407c00000000, 0x01e5d1ec00000000, 0x01e661ed00000000,
+    0x00e7f07d00000000, 0x00e8807a00000000, 0x01e911ea00000000,
+    0x01eaa1eb00000000, 0x00eb307b00000000, 0x01ecc1e800000000,
+    0x00ed507800000000, 0x00eee07900000000, 0x01ef71e900000000,
+    0x00f0007700000000, 0x01f191e700000000, 0x01f221e600000000,
+    0x00f3b07600000000, 0x01f441e500000000, 0x00f5d07500000000,
+    0x00f6607400000000, 0x01f7f1e400000000, 0x01f881e300000000,
+    0x00f9107300000000, 0x00faa07200000000, 0x01fb31e200000000,
+    0x00fcc07100000000, 0x01fd51e100000000, 0x01fee1e000000000,
+    0x00ff707000000000};
+
+#else /* W == 4 */
+
+static const word_t crc_big_table[] = {
+    0x00000000, 0x01019190, 0x01022191, 0x0003b001, 0x01044192,
+    0x0005d002, 0x00066003, 0x0107f193, 0x01088194, 0x00091004,
+    0x000aa005, 0x010b3195, 0x000cc006, 0x010d5196, 0x010ee197,
+    0x000f7007, 0x01100199, 0x00119009, 0x00122008, 0x0113b198,
+    0x0014400b, 0x0115d19b, 0x0116619a, 0x0017f00a, 0x0018800d,
+    0x0119119d, 0x011aa19c, 0x001b300c, 0x011cc19f, 0x001d500f,
+    0x001ee00e, 0x011f719e, 0x01200182, 0x00219012, 0x00222013,
+    0x0123b183, 0x00244010, 0x0125d180, 0x01266181, 0x0027f011,
+    0x00288016, 0x01291186, 0x012aa187, 0x002b3017, 0x012cc184,
+    0x002d5014, 0x002ee015, 0x012f7185, 0x0030001b, 0x0131918b,
+    0x0132218a, 0x0033b01a, 0x01344189, 0x0035d019, 0x00366018,
+    0x0137f188, 0x0138818f, 0x0039101f, 0x003aa01e, 0x013b318e,
+    0x003cc01d, 0x013d518d, 0x013ee18c, 0x003f701c, 0x014001b4,
+    0x00419024, 0x00422025, 0x0143b1b5, 0x00444026, 0x0145d1b6,
+    0x014661b7, 0x0047f027, 0x00488020, 0x014911b0, 0x014aa1b1,
+    0x004b3021, 0x014cc1b2, 0x004d5022, 0x004ee023, 0x014f71b3,
+    0x0050002d, 0x015191bd, 0x015221bc, 0x0053b02c, 0x015441bf,
+    0x0055d02f, 0x0056602e, 0x0157f1be, 0x015881b9, 0x00591029,
+    0x005aa028, 0x015b31b8, 0x005cc02b, 0x015d51bb, 0x015ee1ba,
+    0x005f702a, 0x00600036, 0x016191a6, 0x016221a7, 0x0063b037,
+    0x016441a4, 0x0065d034, 0x00666035, 0x0167f1a5, 0x016881a2,
+    0x00691032, 0x006aa033, 0x016b31a3, 0x006cc030, 0x016d51a0,
+    0x016ee1a1, 0x006f7031, 0x017001af, 0x0071903f, 0x0072203e,
+    0x0173b1ae, 0x0074403d, 0x0175d1ad, 0x017661ac, 0x0077f03c,
+    0x0078803b, 0x017911ab, 0x017aa1aa, 0x007b303a, 0x017cc1a9,
+    0x007d5039, 0x007ee038, 0x017f71a8, 0x018001d8, 0x00819048,
+    0x00822049, 0x0183b1d9, 0x0084404a, 0x0185d1da, 0x018661db,
+    0x0087f04b, 0x0088804c, 0x018911dc, 0x018aa1dd, 0x008b304d,
+    0x018cc1de, 0x008d504e, 0x008ee04f, 0x018f71df, 0x00900041,
+    0x019191d1, 0x019221d0, 0x0093b040, 0x019441d3, 0x0095d043,
+    0x00966042, 0x0197f1d2, 0x019881d5, 0x00991045, 0x009aa044,
+    0x019b31d4, 0x009cc047, 0x019d51d7, 0x019ee1d6, 0x009f7046,
+    0x00a0005a, 0x01a191ca, 0x01a221cb, 0x00a3b05b, 0x01a441c8,
+    0x00a5d058, 0x00a66059, 0x01a7f1c9, 0x01a881ce, 0x00a9105e,
+    0x00aaa05f, 0x01ab31cf, 0x00acc05c, 0x01ad51cc, 0x01aee1cd,
+    0x00af705d, 0x01b001c3, 0x00b19053, 0x00b22052, 0x01b3b1c2,
+    0x00b44051, 0x01b5d1c1, 0x01b661c0, 0x00b7f050, 0x00b88057,
+    0x01b911c7, 0x01baa1c6, 0x00bb3056, 0x01bcc1c5, 0x00bd5055,
+    0x00bee054, 0x01bf71c4, 0x00c0006c, 0x01c191fc, 0x01c221fd,
+    0x00c3b06d, 0x01c441fe, 0x00c5d06e, 0x00c6606f, 0x01c7f1ff,
+    0x01c881f8, 0x00c91068, 0x00caa069, 0x01cb31f9, 0x00ccc06a,
+    0x01cd51fa, 0x01cee1fb, 0x00cf706b, 0x01d001f5, 0x00d19065,
+    0x00d22064, 0x01d3b1f4, 0x00d44067, 0x01d5d1f7, 0x01d661f6,
+    0x00d7f066, 0x00d88061, 0x01d911f1, 0x01daa1f0, 0x00db3060,
+    0x01dcc1f3, 0x00dd5063, 0x00dee062, 0x01df71f2, 0x01e001ee,
+    0x00e1907e, 0x00e2207f, 0x01e3b1ef, 0x00e4407c, 0x01e5d1ec,
+    0x01e661ed, 0x00e7f07d, 0x00e8807a, 0x01e911ea, 0x01eaa1eb,
+    0x00eb307b, 0x01ecc1e8, 0x00ed5078, 0x00eee079, 0x01ef71e9,
+    0x00f00077, 0x01f191e7, 0x01f221e6, 0x00f3b076, 0x01f441e5,
+    0x00f5d075, 0x00f66074, 0x01f7f1e4, 0x01f881e3, 0x00f91073,
+    0x00faa072, 0x01fb31e2, 0x00fcc071, 0x01fd51e1, 0x01fee1e0,
+    0x00ff7070};
+
+#endif
+
+#if N == 1
+
+#if W == 8
+
+static const crc_t crc_braid_table[][256] = {
+   {0x00000000, 0x65904101, 0xcb208202, 0xaeb0c303, 0x26420407,
+    0x43d24506, 0xed628605, 0x88f2c704, 0x4c84080e, 0x2914490f,
+    0x87a48a0c, 0xe234cb0d, 0x6ac60c09, 0x0f564d08, 0xa1e68e0b,
+    0xc476cf0a, 0x9908101c, 0xfc98511d, 0x5228921e, 0x37b8d31f,
+    0xbf4a141b, 0xdada551a, 0x746a9619, 0x11fad718, 0xd58c1812,
+    0xb01c5913, 0x1eac9a10, 0x7b3cdb11, 0xf3ce1c15, 0x965e5d14,
+    0x38ee9e17, 0x5d7edf16, 0x8213203b, 0xe783613a, 0x4933a239,
+    0x2ca3e338, 0xa451243c, 0xc1c1653d, 0x6f71a63e, 0x0ae1e73f,
+    0xce972835, 0xab076934, 0x05b7aa37, 0x6027eb36, 0xe8d52c32,
+    0x8d456d33, 0x23f5ae30, 0x4665ef31, 0x1b1b3027, 0x7e8b7126,
+    0xd03bb225, 0xb5abf324, 0x3d593420, 0x58c97521, 0xf679b622,
+    0x93e9f723, 0x579f3829, 0x320f7928, 0x9cbfba2b, 0xf92ffb2a,
+    0x71dd3c2e, 0x144d7d2f, 0xbafdbe2c, 0xdf6dff2d, 0xb4254075,
+    0xd1b50174, 0x7f05c277, 0x1a958376, 0x92674472, 0xf7f70573,
+    0x5947c670, 0x3cd78771, 0xf8a1487b, 0x9d31097a, 0x3381ca79,
+    0x56118b78, 0xdee34c7c, 0xbb730d7d, 0x15c3ce7e, 0x70538f7f,
+    0x2d2d5069, 0x48bd1168, 0xe60dd26b, 0x839d936a, 0x0b6f546e,
+    0x6eff156f, 0xc04fd66c, 0xa5df976d, 0x61a95867, 0x04391966,
+    0xaa89da65, 0xcf199b64, 0x47eb5c60, 0x227b1d61, 0x8ccbde62,
+    0xe95b9f63, 0x3636604e, 0x53a6214f, 0xfd16e24c, 0x9886a34d,
+    0x10746449, 0x75e42548, 0xdb54e64b, 0xbec4a74a, 0x7ab26840,
+    0x1f222941, 0xb192ea42, 0xd402ab43, 0x5cf06c47, 0x39602d46,
+    0x97d0ee45, 0xf240af44, 0xaf3e7052, 0xcaae3153, 0x641ef250,
+    0x018eb351, 0x897c7455, 0xecec3554, 0x425cf657, 0x27ccb756,
+    0xe3ba785c, 0x862a395d, 0x289afa5e, 0x4d0abb5f, 0xc5f87c5b,
+    0xa0683d5a, 0x0ed8fe59, 0x6b48bf58, 0xd84980e9, 0xbdd9c1e8,
+    0x136902eb, 0x76f943ea, 0xfe0b84ee, 0x9b9bc5ef, 0x352b06ec,
+    0x50bb47ed, 0x94cd88e7, 0xf15dc9e6, 0x5fed0ae5, 0x3a7d4be4,
+    0xb28f8ce0, 0xd71fcde1, 0x79af0ee2, 0x1c3f4fe3, 0x414190f5,
+    0x24d1d1f4, 0x8a6112f7, 0xeff153f6, 0x670394f2, 0x0293d5f3,
+    0xac2316f0, 0xc9b357f1, 0x0dc598fb, 0x6855d9fa, 0xc6e51af9,
+    0xa3755bf8, 0x2b879cfc, 0x4e17ddfd, 0xe0a71efe, 0x85375fff,
+    0x5a5aa0d2, 0x3fcae1d3, 0x917a22d0, 0xf4ea63d1, 0x7c18a4d5,
+    0x1988e5d4, 0xb73826d7, 0xd2a867d6, 0x16dea8dc, 0x734ee9dd,
+    0xddfe2ade, 0xb86e6bdf, 0x309cacdb, 0x550cedda, 0xfbbc2ed9,
+    0x9e2c6fd8, 0xc352b0ce, 0xa6c2f1cf, 0x087232cc, 0x6de273cd,
+    0xe510b4c9, 0x8080f5c8, 0x2e3036cb, 0x4ba077ca, 0x8fd6b8c0,
+    0xea46f9c1, 0x44f63ac2, 0x21667bc3, 0xa994bcc7, 0xcc04fdc6,
+    0x62b43ec5, 0x07247fc4, 0x6c6cc09c, 0x09fc819d, 0xa74c429e,
+    0xc2dc039f, 0x4a2ec49b, 0x2fbe859a, 0x810e4699, 0xe49e0798,
+    0x20e8c892, 0x45788993, 0xebc84a90, 0x8e580b91, 0x06aacc95,
+    0x633a8d94, 0xcd8a4e97, 0xa81a0f96, 0xf564d080, 0x90f49181,
+    0x3e445282, 0x5bd41383, 0xd326d487, 0xb6b69586, 0x18065685,
+    0x7d961784, 0xb9e0d88e, 0xdc70998f, 0x72c05a8c, 0x17501b8d,
+    0x9fa2dc89, 0xfa329d88, 0x54825e8b, 0x31121f8a, 0xee7fe0a7,
+    0x8befa1a6, 0x255f62a5, 0x40cf23a4, 0xc83de4a0, 0xadada5a1,
+    0x031d66a2, 0x668d27a3, 0xa2fbe8a9, 0xc76ba9a8, 0x69db6aab,
+    0x0c4b2baa, 0x84b9ecae, 0xe129adaf, 0x4f996eac, 0x2a092fad,
+    0x7777f0bb, 0x12e7b1ba, 0xbc5772b9, 0xd9c733b8, 0x5135f4bc,
+    0x34a5b5bd, 0x9a1576be, 0xff8537bf, 0x3bf3f8b5, 0x5e63b9b4,
+    0xf0d37ab7, 0x95433bb6, 0x1db1fcb2, 0x7821bdb3, 0xd6917eb0,
+    0xb3013fb1},
+   {0x00000000, 0x009001d1, 0x012003a2, 0x01b00273, 0x02400744,
+    0x02d00695, 0x036004e6, 0x03f00537, 0x04800e88, 0x04100f59,
+    0x05a00d2a, 0x05300cfb, 0x06c009cc, 0x0650081d, 0x07e00a6e,
+    0x07700bbf, 0x09001d10, 0x09901cc1, 0x08201eb2, 0x08b01f63,
+    0x0b401a54, 0x0bd01b85, 0x0a6019f6, 0x0af01827, 0x0d801398,
+    0x0d101249, 0x0ca0103a, 0x0c3011eb, 0x0fc014dc, 0x0f50150d,
+    0x0ee0177e, 0x0e7016af, 0x12003a20, 0x12903bf1, 0x13203982,
+    0x13b03853, 0x10403d64, 0x10d03cb5, 0x11603ec6, 0x11f03f17,
+    0x168034a8, 0x16103579, 0x17a0370a, 0x173036db, 0x14c033ec,
+    0x1450323d, 0x15e0304e, 0x1570319f, 0x1b002730, 0x1b9026e1,
+    0x1a202492, 0x1ab02543, 0x19402074, 0x19d021a5, 0x186023d6,
+    0x18f02207, 0x1f8029b8, 0x1f102869, 0x1ea02a1a, 0x1e302bcb,
+    0x1dc02efc, 0x1d502f2d, 0x1ce02d5e, 0x1c702c8f, 0x24007440,
+    0x24907591, 0x252077e2, 0x25b07633, 0x26407304, 0x26d072d5,
+    0x276070a6, 0x27f07177, 0x20807ac8, 0x20107b19, 0x21a0796a,
+    0x213078bb, 0x22c07d8c, 0x22507c5d, 0x23e07e2e, 0x23707fff,
+    0x2d006950, 0x2d906881, 0x2c206af2, 0x2cb06b23, 0x2f406e14,
+    0x2fd06fc5, 0x2e606db6, 0x2ef06c67, 0x298067d8, 0x29106609,
+    0x28a0647a, 0x283065ab, 0x2bc0609c, 0x2b50614d, 0x2ae0633e,
+    0x2a7062ef, 0x36004e60, 0x36904fb1, 0x37204dc2, 0x37b04c13,
+    0x34404924, 0x34d048f5, 0x35604a86, 0x35f04b57, 0x328040e8,
+    0x32104139, 0x33a0434a, 0x3330429b, 0x30c047ac, 0x3050467d,
+    0x31e0440e, 0x317045df, 0x3f005370, 0x3f9052a1, 0x3e2050d2,
+    0x3eb05103, 0x3d405434, 0x3dd055e5, 0x3c605796, 0x3cf05647,
+    0x3b805df8, 0x3b105c29, 0x3aa05e5a, 0x3a305f8b, 0x39c05abc,
+    0x39505b6d, 0x38e0591e, 0x387058cf, 0x4800e880, 0x4890e951,
+    0x4920eb22, 0x49b0eaf3, 0x4a40efc4, 0x4ad0ee15, 0x4b60ec66,
+    0x4bf0edb7, 0x4c80e608, 0x4c10e7d9, 0x4da0e5aa, 0x4d30e47b,
+    0x4ec0e14c, 0x4e50e09d, 0x4fe0e2ee, 0x4f70e33f, 0x4100f590,
+    0x4190f441, 0x4020f632, 0x40b0f7e3, 0x4340f2d4, 0x43d0f305,
+    0x4260f176, 0x42f0f0a7, 0x4580fb18, 0x4510fac9, 0x44a0f8ba,
+    0x4430f96b, 0x47c0fc5c, 0x4750fd8d, 0x46e0fffe, 0x4670fe2f,
+    0x5a00d2a0, 0x5a90d371, 0x5b20d102, 0x5bb0d0d3, 0x5840d5e4,
+    0x58d0d435, 0x5960d646, 0x59f0d797, 0x5e80dc28, 0x5e10ddf9,
+    0x5fa0df8a, 0x5f30de5b, 0x5cc0db6c, 0x5c50dabd, 0x5de0d8ce,
+    0x5d70d91f, 0x5300cfb0, 0x5390ce61, 0x5220cc12, 0x52b0cdc3,
+    0x5140c8f4, 0x51d0c925, 0x5060cb56, 0x50f0ca87, 0x5780c138,
+    0x5710c0e9, 0x56a0c29a, 0x5630c34b, 0x55c0c67c, 0x5550c7ad,
+    0x54e0c5de, 0x5470c40f, 0x6c009cc0, 0x6c909d11, 0x6d209f62,
+    0x6db09eb3, 0x6e409b84, 0x6ed09a55, 0x6f609826, 0x6ff099f7,
+    0x68809248, 0x68109399, 0x69a091ea, 0x6930903b, 0x6ac0950c,
+    0x6a5094dd, 0x6be096ae, 0x6b70977f, 0x650081d0, 0x65908001,
+    0x64208272, 0x64b083a3, 0x67408694, 0x67d08745, 0x66608536,
+    0x66f084e7, 0x61808f58, 0x61108e89, 0x60a08cfa, 0x60308d2b,
+    0x63c0881c, 0x635089cd, 0x62e08bbe, 0x62708a6f, 0x7e00a6e0,
+    0x7e90a731, 0x7f20a542, 0x7fb0a493, 0x7c40a1a4, 0x7cd0a075,
+    0x7d60a206, 0x7df0a3d7, 0x7a80a868, 0x7a10a9b9, 0x7ba0abca,
+    0x7b30aa1b, 0x78c0af2c, 0x7850aefd, 0x79e0ac8e, 0x7970ad5f,
+    0x7700bbf0, 0x7790ba21, 0x7620b852, 0x76b0b983, 0x7540bcb4,
+    0x75d0bd65, 0x7460bf16, 0x74f0bec7, 0x7380b578, 0x7310b4a9,
+    0x72a0b6da, 0x7230b70b, 0x71c0b23c, 0x7150b3ed, 0x70e0b19e,
+    0x7070b04f},
+   {0x00000000, 0x9001d100, 0x9000a203, 0x00017303, 0x90024405,
+    0x00039505, 0x0002e606, 0x90033706, 0x90078809, 0x00065909,
+    0x00072a0a, 0x9006fb0a, 0x0005cc0c, 0x90041d0c, 0x90056e0f,
+    0x0004bf0f, 0x900c1011, 0x000dc111, 0x000cb212, 0x900d6312,
+    0x000e5414, 0x900f8514, 0x900ef617, 0x000f2717, 0x000b9818,
+    0x900a4918, 0x900b3a1b, 0x000aeb1b, 0x9009dc1d, 0x00080d1d,
+    0x00097e1e, 0x9008af1e, 0x901b2021, 0x001af121, 0x001b8222,
+    0x901a5322, 0x00196424, 0x9018b524, 0x9019c627, 0x00181727,
+    0x001ca828, 0x901d7928, 0x901c0a2b, 0x001ddb2b, 0x901eec2d,
+    0x001f3d2d, 0x001e4e2e, 0x901f9f2e, 0x00173030, 0x9016e130,
+    0x90179233, 0x00164333, 0x90157435, 0x0014a535, 0x0015d636,
+    0x90140736, 0x9010b839, 0x00116939, 0x00101a3a, 0x9011cb3a,
+    0x0012fc3c, 0x90132d3c, 0x90125e3f, 0x00138f3f, 0x90354041,
+    0x00349141, 0x0035e242, 0x90343342, 0x00370444, 0x9036d544,
+    0x9037a647, 0x00367747, 0x0032c848, 0x90331948, 0x90326a4b,
+    0x0033bb4b, 0x90308c4d, 0x00315d4d, 0x00302e4e, 0x9031ff4e,
+    0x00395050, 0x90388150, 0x9039f253, 0x00382353, 0x903b1455,
+    0x003ac555, 0x003bb656, 0x903a6756, 0x903ed859, 0x003f0959,
+    0x003e7a5a, 0x903fab5a, 0x003c9c5c, 0x903d4d5c, 0x903c3e5f,
+    0x003def5f, 0x002e6060, 0x902fb160, 0x902ec263, 0x002f1363,
+    0x902c2465, 0x002df565, 0x002c8666, 0x902d5766, 0x9029e869,
+    0x00283969, 0x00294a6a, 0x90289b6a, 0x002bac6c, 0x902a7d6c,
+    0x902b0e6f, 0x002adf6f, 0x90227071, 0x0023a171, 0x0022d272,
+    0x90230372, 0x00203474, 0x9021e574, 0x90209677, 0x00214777,
+    0x0025f878, 0x90242978, 0x90255a7b, 0x00248b7b, 0x9027bc7d,
+    0x00266d7d, 0x00271e7e, 0x9026cf7e, 0x90698081, 0x00685181,
+    0x00692282, 0x9068f382, 0x006bc484, 0x906a1584, 0x906b6687,
+    0x006ab787, 0x006e0888, 0x906fd988, 0x906eaa8b, 0x006f7b8b,
+    0x906c4c8d, 0x006d9d8d, 0x006cee8e, 0x906d3f8e, 0x00659090,
+    0x90644190, 0x90653293, 0x0064e393, 0x9067d495, 0x00660595,
+    0x00677696, 0x9066a796, 0x90621899, 0x0063c999, 0x0062ba9a,
+    0x90636b9a, 0x00605c9c, 0x90618d9c, 0x9060fe9f, 0x00612f9f,
+    0x0072a0a0, 0x907371a0, 0x907202a3, 0x0073d3a3, 0x9070e4a5,
+    0x007135a5, 0x007046a6, 0x907197a6, 0x907528a9, 0x0074f9a9,
+    0x00758aaa, 0x90745baa, 0x00776cac, 0x9076bdac, 0x9077ceaf,
+    0x00761faf, 0x907eb0b1, 0x007f61b1, 0x007e12b2, 0x907fc3b2,
+    0x007cf4b4, 0x907d25b4, 0x907c56b7, 0x007d87b7, 0x007938b8,
+    0x9078e9b8, 0x90799abb, 0x00784bbb, 0x907b7cbd, 0x007aadbd,
+    0x007bdebe, 0x907a0fbe, 0x005cc0c0, 0x905d11c0, 0x905c62c3,
+    0x005db3c3, 0x905e84c5, 0x005f55c5, 0x005e26c6, 0x905ff7c6,
+    0x905b48c9, 0x005a99c9, 0x005beaca, 0x905a3bca, 0x00590ccc,
+    0x9058ddcc, 0x9059aecf, 0x00587fcf, 0x9050d0d1, 0x005101d1,
+    0x005072d2, 0x9051a3d2, 0x005294d4, 0x905345d4, 0x905236d7,
+    0x0053e7d7, 0x005758d8, 0x905689d8, 0x9057fadb, 0x00562bdb,
+    0x90551cdd, 0x0054cddd, 0x0055bede, 0x90546fde, 0x9047e0e1,
+    0x004631e1, 0x004742e2, 0x904693e2, 0x0045a4e4, 0x904475e4,
+    0x904506e7, 0x0044d7e7, 0x004068e8, 0x9041b9e8, 0x9040caeb,
+    0x00411beb, 0x90422ced, 0x0043fded, 0x00428eee, 0x90435fee,
+    0x004bf0f0, 0x904a21f0, 0x904b52f3, 0x004a83f3, 0x9049b4f5,
+    0x004865f5, 0x004916f6, 0x9048c7f6, 0x904c78f9, 0x004da9f9,
+    0x004cdafa, 0x904d0bfa, 0x004e3cfc, 0x904fedfc, 0x904e9eff,
+    0x004f4fff},
+   {0x00000000, 0x90d00101, 0x91a30201, 0x01730300, 0x93450401,
+    0x03950500, 0x02e60600, 0x92360701, 0x96890801, 0x06590900,
+    0x072a0a00, 0x97fa0b01, 0x05cc0c00, 0x951c0d01, 0x946f0e01,
+    0x04bf0f00, 0x9d111001, 0x0dc11100, 0x0cb21200, 0x9c621301,
+    0x0e541400, 0x9e841501, 0x9ff71601, 0x0f271700, 0x0b981800,
+    0x9b481901, 0x9a3b1a01, 0x0aeb1b00, 0x98dd1c01, 0x080d1d00,
+    0x097e1e00, 0x99ae1f01, 0x8a212001, 0x1af12100, 0x1b822200,
+    0x8b522301, 0x19642400, 0x89b42501, 0x88c72601, 0x18172700,
+    0x1ca82800, 0x8c782901, 0x8d0b2a01, 0x1ddb2b00, 0x8fed2c01,
+    0x1f3d2d00, 0x1e4e2e00, 0x8e9e2f01, 0x17303000, 0x87e03101,
+    0x86933201, 0x16433300, 0x84753401, 0x14a53500, 0x15d63600,
+    0x85063701, 0x81b93801, 0x11693900, 0x101a3a00, 0x80ca3b01,
+    0x12fc3c00, 0x822c3d01, 0x835f3e01, 0x138f3f00, 0xa4414001,
+    0x34914100, 0x35e24200, 0xa5324301, 0x37044400, 0xa7d44501,
+    0xa6a74601, 0x36774700, 0x32c84800, 0xa2184901, 0xa36b4a01,
+    0x33bb4b00, 0xa18d4c01, 0x315d4d00, 0x302e4e00, 0xa0fe4f01,
+    0x39505000, 0xa9805101, 0xa8f35201, 0x38235300, 0xaa155401,
+    0x3ac55500, 0x3bb65600, 0xab665701, 0xafd95801, 0x3f095900,
+    0x3e7a5a00, 0xaeaa5b01, 0x3c9c5c00, 0xac4c5d01, 0xad3f5e01,
+    0x3def5f00, 0x2e606000, 0xbeb06101, 0xbfc36201, 0x2f136300,
+    0xbd256401, 0x2df56500, 0x2c866600, 0xbc566701, 0xb8e96801,
+    0x28396900, 0x294a6a00, 0xb99a6b01, 0x2bac6c00, 0xbb7c6d01,
+    0xba0f6e01, 0x2adf6f00, 0xb3717001, 0x23a17100, 0x22d27200,
+    0xb2027301, 0x20347400, 0xb0e47501, 0xb1977601, 0x21477700,
+    0x25f87800, 0xb5287901, 0xb45b7a01, 0x248b7b00, 0xb6bd7c01,
+    0x266d7d00, 0x271e7e00, 0xb7ce7f01, 0xf8818001, 0x68518100,
+    0x69228200, 0xf9f28301, 0x6bc48400, 0xfb148501, 0xfa678601,
+    0x6ab78700, 0x6e088800, 0xfed88901, 0xffab8a01, 0x6f7b8b00,
+    0xfd4d8c01, 0x6d9d8d00, 0x6cee8e00, 0xfc3e8f01, 0x65909000,
+    0xf5409101, 0xf4339201, 0x64e39300, 0xf6d59401, 0x66059500,
+    0x67769600, 0xf7a69701, 0xf3199801, 0x63c99900, 0x62ba9a00,
+    0xf26a9b01, 0x605c9c00, 0xf08c9d01, 0xf1ff9e01, 0x612f9f00,
+    0x72a0a000, 0xe270a101, 0xe303a201, 0x73d3a300, 0xe1e5a401,
+    0x7135a500, 0x7046a600, 0xe096a701, 0xe429a801, 0x74f9a900,
+    0x758aaa00, 0xe55aab01, 0x776cac00, 0xe7bcad01, 0xe6cfae01,
+    0x761faf00, 0xefb1b001, 0x7f61b100, 0x7e12b200, 0xeec2b301,
+    0x7cf4b400, 0xec24b501, 0xed57b601, 0x7d87b700, 0x7938b800,
+    0xe9e8b901, 0xe89bba01, 0x784bbb00, 0xea7dbc01, 0x7aadbd00,
+    0x7bdebe00, 0xeb0ebf01, 0x5cc0c000, 0xcc10c101, 0xcd63c201,
+    0x5db3c300, 0xcf85c401, 0x5f55c500, 0x5e26c600, 0xcef6c701,
+    0xca49c801, 0x5a99c900, 0x5beaca00, 0xcb3acb01, 0x590ccc00,
+    0xc9dccd01, 0xc8afce01, 0x587fcf00, 0xc1d1d001, 0x5101d100,
+    0x5072d200, 0xc0a2d301, 0x5294d400, 0xc244d501, 0xc337d601,
+    0x53e7d700, 0x5758d800, 0xc788d901, 0xc6fbda01, 0x562bdb00,
+    0xc41ddc01, 0x54cddd00, 0x55bede00, 0xc56edf01, 0xd6e1e001,
+    0x4631e100, 0x4742e200, 0xd792e301, 0x45a4e400, 0xd574e501,
+    0xd407e601, 0x44d7e700, 0x4068e800, 0xd0b8e901, 0xd1cbea01,
+    0x411beb00, 0xd32dec01, 0x43fded00, 0x428eee00, 0xd25eef01,
+    0x4bf0f000, 0xdb20f101, 0xda53f201, 0x4a83f300, 0xd8b5f401,
+    0x4865f500, 0x4916f600, 0xd9c6f701, 0xdd79f801, 0x4da9f900,
+    0x4cdafa00, 0xdc0afb01, 0x4e3cfc00, 0xdeecfd01, 0xdf9ffe01,
+    0x4f4fff00},
+   {0x00000000, 0x41000001, 0x82000002, 0xc3000003, 0xb4030007,
+    0xf5030006, 0x36030005, 0x77030004, 0xd805000d, 0x9905000c,
+    0x5a05000f, 0x1b05000e, 0x6c06000a, 0x2d06000b, 0xee060008,
+    0xaf060009, 0x00090019, 0x41090018, 0x8209001b, 0xc309001a,
+    0xb40a001e, 0xf50a001f, 0x360a001c, 0x770a001d, 0xd80c0014,
+    0x990c0015, 0x5a0c0016, 0x1b0c0017, 0x6c0f0013, 0x2d0f0012,
+    0xee0f0011, 0xaf0f0010, 0x00120032, 0x41120033, 0x82120030,
+    0xc3120031, 0xb4110035, 0xf5110034, 0x36110037, 0x77110036,
+    0xd817003f, 0x9917003e, 0x5a17003d, 0x1b17003c, 0x6c140038,
+    0x2d140039, 0xee14003a, 0xaf14003b, 0x001b002b, 0x411b002a,
+    0x821b0029, 0xc31b0028, 0xb418002c, 0xf518002d, 0x3618002e,
+    0x7718002f, 0xd81e0026, 0x991e0027, 0x5a1e0024, 0x1b1e0025,
+    0x6c1d0021, 0x2d1d0020, 0xee1d0023, 0xaf1d0022, 0x00240064,
+    0x41240065, 0x82240066, 0xc3240067, 0xb4270063, 0xf5270062,
+    0x36270061, 0x77270060, 0xd8210069, 0x99210068, 0x5a21006b,
+    0x1b21006a, 0x6c22006e, 0x2d22006f, 0xee22006c, 0xaf22006d,
+    0x002d007d, 0x412d007c, 0x822d007f, 0xc32d007e, 0xb42e007a,
+    0xf52e007b, 0x362e0078, 0x772e0079, 0xd8280070, 0x99280071,
+    0x5a280072, 0x1b280073, 0x6c2b0077, 0x2d2b0076, 0xee2b0075,
+    0xaf2b0074, 0x00360056, 0x41360057, 0x82360054, 0xc3360055,
+    0xb4350051, 0xf5350050, 0x36350053, 0x77350052, 0xd833005b,
+    0x9933005a, 0x5a330059, 0x1b330058, 0x6c30005c, 0x2d30005d,
+    0xee30005e, 0xaf30005f, 0x003f004f, 0x413f004e, 0x823f004d,
+    0xc33f004c, 0xb43c0048, 0xf53c0049, 0x363c004a, 0x773c004b,
+    0xd83a0042, 0x993a0043, 0x5a3a0040, 0x1b3a0041, 0x6c390045,
+    0x2d390044, 0xee390047, 0xaf390046, 0x004800c8, 0x414800c9,
+    0x824800ca, 0xc34800cb, 0xb44b00cf, 0xf54b00ce, 0x364b00cd,
+    0x774b00cc, 0xd84d00c5, 0x994d00c4, 0x5a4d00c7, 0x1b4d00c6,
+    0x6c4e00c2, 0x2d4e00c3, 0xee4e00c0, 0xaf4e00c1, 0x004100d1,
+    0x414100d0, 0x824100d3, 0xc34100d2, 0xb44200d6, 0xf54200d7,
+    0x364200d4, 0x774200d5, 0xd84400dc, 0x994400dd, 0x5a4400de,
+    0x1b4400df, 0x6c4700db, 0x2d4700da, 0xee4700d9, 0xaf4700d8,
+    0x005a00fa, 0x415a00fb, 0x825a00f8, 0xc35a00f9, 0xb45900fd,
+    0xf55900fc, 0x365900ff, 0x775900fe, 0xd85f00f7, 0x995f00f6,
+    0x5a5f00f5, 0x1b5f00f4, 0x6c5c00f0, 0x2d5c00f1, 0xee5c00f2,
+    0xaf5c00f3, 0x005300e3, 0x415300e2, 0x825300e1, 0xc35300e0,
+    0xb45000e4, 0xf55000e5, 0x365000e6, 0x775000e7, 0xd85600ee,
+    0x995600ef, 0x5a5600ec, 0x1b5600ed, 0x6c5500e9, 0x2d5500e8,
+    0xee5500eb, 0xaf5500ea, 0x006c00ac, 0x416c00ad, 0x826c00ae,
+    0xc36c00af, 0xb46f00ab, 0xf56f00aa, 0x366f00a9, 0x776f00a8,
+    0xd86900a1, 0x996900a0, 0x5a6900a3, 0x1b6900a2, 0x6c6a00a6,
+    0x2d6a00a7, 0xee6a00a4, 0xaf6a00a5, 0x006500b5, 0x416500b4,
+    0x826500b7, 0xc36500b6, 0xb46600b2, 0xf56600b3, 0x366600b0,
+    0x776600b1, 0xd86000b8, 0x996000b9, 0x5a6000ba, 0x1b6000bb,
+    0x6c6300bf, 0x2d6300be, 0xee6300bd, 0xaf6300bc, 0x007e009e,
+    0x417e009f, 0x827e009c, 0xc37e009d, 0xb47d0099, 0xf57d0098,
+    0x367d009b, 0x777d009a, 0xd87b0093, 0x997b0092, 0x5a7b0091,
+    0x1b7b0090, 0x6c780094, 0x2d780095, 0xee780096, 0xaf780097,
+    0x00770087, 0x41770086, 0x82770085, 0xc3770084, 0xb4740080,
+    0xf5740081, 0x36740082, 0x77740083, 0xd872008a, 0x9972008b,
+    0x5a720088, 0x1b720089, 0x6c71008d, 0x2d71008c, 0xee71008f,
+    0xaf71008e},
+   {0x00000000, 0x00900190, 0x01200320, 0x01b002b0, 0x02400640,
+    0x02d007d0, 0x03600560, 0x03f004f0, 0x04800c80, 0x04100d10,
+    0x05a00fa0, 0x05300e30, 0x06c00ac0, 0x06500b50, 0x07e009e0,
+    0x07700870, 0x09001900, 0x09901890, 0x08201a20, 0x08b01bb0,
+    0x0b401f40, 0x0bd01ed0, 0x0a601c60, 0x0af01df0, 0x0d801580,
+    0x0d101410, 0x0ca016a0, 0x0c301730, 0x0fc013c0, 0x0f501250,
+    0x0ee010e0, 0x0e701170, 0x12003200, 0x12903390, 0x13203120,
+    0x13b030b0, 0x10403440, 0x10d035d0, 0x11603760, 0x11f036f0,
+    0x16803e80, 0x16103f10, 0x17a03da0, 0x17303c30, 0x14c038c0,
+    0x14503950, 0x15e03be0, 0x15703a70, 0x1b002b00, 0x1b902a90,
+    0x1a202820, 0x1ab029b0, 0x19402d40, 0x19d02cd0, 0x18602e60,
+    0x18f02ff0, 0x1f802780, 0x1f102610, 0x1ea024a0, 0x1e302530,
+    0x1dc021c0, 0x1d502050, 0x1ce022e0, 0x1c702370, 0x24006400,
+    0x24906590, 0x25206720, 0x25b066b0, 0x26406240, 0x26d063d0,
+    0x27606160, 0x27f060f0, 0x20806880, 0x20106910, 0x21a06ba0,
+    0x21306a30, 0x22c06ec0, 0x22506f50, 0x23e06de0, 0x23706c70,
+    0x2d007d00, 0x2d907c90, 0x2c207e20, 0x2cb07fb0, 0x2f407b40,
+    0x2fd07ad0, 0x2e607860, 0x2ef079f0, 0x29807180, 0x29107010,
+    0x28a072a0, 0x28307330, 0x2bc077c0, 0x2b507650, 0x2ae074e0,
+    0x2a707570, 0x36005600, 0x36905790, 0x37205520, 0x37b054b0,
+    0x34405040, 0x34d051d0, 0x35605360, 0x35f052f0, 0x32805a80,
+    0x32105b10, 0x33a059a0, 0x33305830, 0x30c05cc0, 0x30505d50,
+    0x31e05fe0, 0x31705e70, 0x3f004f00, 0x3f904e90, 0x3e204c20,
+    0x3eb04db0, 0x3d404940, 0x3dd048d0, 0x3c604a60, 0x3cf04bf0,
+    0x3b804380, 0x3b104210, 0x3aa040a0, 0x3a304130, 0x39c045c0,
+    0x39504450, 0x38e046e0, 0x38704770, 0x4800c800, 0x4890c990,
+    0x4920cb20, 0x49b0cab0, 0x4a40ce40, 0x4ad0cfd0, 0x4b60cd60,
+    0x4bf0ccf0, 0x4c80c480, 0x4c10c510, 0x4da0c7a0, 0x4d30c630,
+    0x4ec0c2c0, 0x4e50c350, 0x4fe0c1e0, 0x4f70c070, 0x4100d100,
+    0x4190d090, 0x4020d220, 0x40b0d3b0, 0x4340d740, 0x43d0d6d0,
+    0x4260d460, 0x42f0d5f0, 0x4580dd80, 0x4510dc10, 0x44a0dea0,
+    0x4430df30, 0x47c0dbc0, 0x4750da50, 0x46e0d8e0, 0x4670d970,
+    0x5a00fa00, 0x5a90fb90, 0x5b20f920, 0x5bb0f8b0, 0x5840fc40,
+    0x58d0fdd0, 0x5960ff60, 0x59f0fef0, 0x5e80f680, 0x5e10f710,
+    0x5fa0f5a0, 0x5f30f430, 0x5cc0f0c0, 0x5c50f150, 0x5de0f3e0,
+    0x5d70f270, 0x5300e300, 0x5390e290, 0x5220e020, 0x52b0e1b0,
+    0x5140e540, 0x51d0e4d0, 0x5060e660, 0x50f0e7f0, 0x5780ef80,
+    0x5710ee10, 0x56a0eca0, 0x5630ed30, 0x55c0e9c0, 0x5550e850,
+    0x54e0eae0, 0x5470eb70, 0x6c00ac00, 0x6c90ad90, 0x6d20af20,
+    0x6db0aeb0, 0x6e40aa40, 0x6ed0abd0, 0x6f60a960, 0x6ff0a8f0,
+    0x6880a080, 0x6810a110, 0x69a0a3a0, 0x6930a230, 0x6ac0a6c0,
+    0x6a50a750, 0x6be0a5e0, 0x6b70a470, 0x6500b500, 0x6590b490,
+    0x6420b620, 0x64b0b7b0, 0x6740b340, 0x67d0b2d0, 0x6660b060,
+    0x66f0b1f0, 0x6180b980, 0x6110b810, 0x60a0baa0, 0x6030bb30,
+    0x63c0bfc0, 0x6350be50, 0x62e0bce0, 0x6270bd70, 0x7e009e00,
+    0x7e909f90, 0x7f209d20, 0x7fb09cb0, 0x7c409840, 0x7cd099d0,
+    0x7d609b60, 0x7df09af0, 0x7a809280, 0x7a109310, 0x7ba091a0,
+    0x7b309030, 0x78c094c0, 0x78509550, 0x79e097e0, 0x79709670,
+    0x77008700, 0x77908690, 0x76208420, 0x76b085b0, 0x75408140,
+    0x75d080d0, 0x74608260, 0x74f083f0, 0x73808b80, 0x73108a10,
+    0x72a088a0, 0x72308930, 0x71c08dc0, 0x71508c50, 0x70e08ee0,
+    0x70708f70},
+   {0x00000000, 0x90019000, 0x90002003, 0x0001b003, 0x90034005,
+    0x0002d005, 0x00036006, 0x9002f006, 0x90058009, 0x00041009,
+    0x0005a00a, 0x9004300a, 0x0006c00c, 0x9007500c, 0x9006e00f,
+    0x0007700f, 0x90080011, 0x00099011, 0x00082012, 0x9009b012,
+    0x000b4014, 0x900ad014, 0x900b6017, 0x000af017, 0x000d8018,
+    0x900c1018, 0x900da01b, 0x000c301b, 0x900ec01d, 0x000f501d,
+    0x000ee01e, 0x900f701e, 0x90130021, 0x00129021, 0x00132022,
+    0x9012b022, 0x00104024, 0x9011d024, 0x90106027, 0x0011f027,
+    0x00168028, 0x90171028, 0x9016a02b, 0x0017302b, 0x9015c02d,
+    0x0014502d, 0x0015e02e, 0x9014702e, 0x001b0030, 0x901a9030,
+    0x901b2033, 0x001ab033, 0x90184035, 0x0019d035, 0x00186036,
+    0x9019f036, 0x901e8039, 0x001f1039, 0x001ea03a, 0x901f303a,
+    0x001dc03c, 0x901c503c, 0x901de03f, 0x001c703f, 0x90250041,
+    0x00249041, 0x00252042, 0x9024b042, 0x00264044, 0x9027d044,
+    0x90266047, 0x0027f047, 0x00208048, 0x90211048, 0x9020a04b,
+    0x0021304b, 0x9023c04d, 0x0022504d, 0x0023e04e, 0x9022704e,
+    0x002d0050, 0x902c9050, 0x902d2053, 0x002cb053, 0x902e4055,
+    0x002fd055, 0x002e6056, 0x902ff056, 0x90288059, 0x00291059,
+    0x0028a05a, 0x9029305a, 0x002bc05c, 0x902a505c, 0x902be05f,
+    0x002a705f, 0x00360060, 0x90379060, 0x90362063, 0x0037b063,
+    0x90354065, 0x0034d065, 0x00356066, 0x9034f066, 0x90338069,
+    0x00321069, 0x0033a06a, 0x9032306a, 0x0030c06c, 0x9031506c,
+    0x9030e06f, 0x0031706f, 0x903e0071, 0x003f9071, 0x003e2072,
+    0x903fb072, 0x003d4074, 0x903cd074, 0x903d6077, 0x003cf077,
+    0x003b8078, 0x903a1078, 0x903ba07b, 0x003a307b, 0x9038c07d,
+    0x0039507d, 0x0038e07e, 0x9039707e, 0x90490081, 0x00489081,
+    0x00492082, 0x9048b082, 0x004a4084, 0x904bd084, 0x904a6087,
+    0x004bf087, 0x004c8088, 0x904d1088, 0x904ca08b, 0x004d308b,
+    0x904fc08d, 0x004e508d, 0x004fe08e, 0x904e708e, 0x00410090,
+    0x90409090, 0x90412093, 0x0040b093, 0x90424095, 0x0043d095,
+    0x00426096, 0x9043f096, 0x90448099, 0x00451099, 0x0044a09a,
+    0x9045309a, 0x0047c09c, 0x9046509c, 0x9047e09f, 0x0046709f,
+    0x005a00a0, 0x905b90a0, 0x905a20a3, 0x005bb0a3, 0x905940a5,
+    0x0058d0a5, 0x005960a6, 0x9058f0a6, 0x905f80a9, 0x005e10a9,
+    0x005fa0aa, 0x905e30aa, 0x005cc0ac, 0x905d50ac, 0x905ce0af,
+    0x005d70af, 0x905200b1, 0x005390b1, 0x005220b2, 0x9053b0b2,
+    0x005140b4, 0x9050d0b4, 0x905160b7, 0x0050f0b7, 0x005780b8,
+    0x905610b8, 0x9057a0bb, 0x005630bb, 0x9054c0bd, 0x005550bd,
+    0x0054e0be, 0x905570be, 0x006c00c0, 0x906d90c0, 0x906c20c3,
+    0x006db0c3, 0x906f40c5, 0x006ed0c5, 0x006f60c6, 0x906ef0c6,
+    0x906980c9, 0x006810c9, 0x0069a0ca, 0x906830ca, 0x006ac0cc,
+    0x906b50cc, 0x906ae0cf, 0x006b70cf, 0x906400d1, 0x006590d1,
+    0x006420d2, 0x9065b0d2, 0x006740d4, 0x9066d0d4, 0x906760d7,
+    0x0066f0d7, 0x006180d8, 0x906010d8, 0x9061a0db, 0x006030db,
+    0x9062c0dd, 0x006350dd, 0x0062e0de, 0x906370de, 0x907f00e1,
+    0x007e90e1, 0x007f20e2, 0x907eb0e2, 0x007c40e4, 0x907dd0e4,
+    0x907c60e7, 0x007df0e7, 0x007a80e8, 0x907b10e8, 0x907aa0eb,
+    0x007b30eb, 0x9079c0ed, 0x007850ed, 0x0079e0ee, 0x907870ee,
+    0x007700f0, 0x907690f0, 0x907720f3, 0x0076b0f3, 0x907440f5,
+    0x0075d0f5, 0x007460f6, 0x9075f0f6, 0x907280f9, 0x007310f9,
+    0x0072a0fa, 0x907330fa, 0x0071c0fc, 0x907050fc, 0x9071e0ff,
+    0x007070ff},
+   {0x00000000, 0x90910101, 0x91210201, 0x01b00300, 0x92410401,
+    0x02d00500, 0x03600600, 0x93f10701, 0x94810801, 0x04100900,
+    0x05a00a00, 0x95310b01, 0x06c00c00, 0x96510d01, 0x97e10e01,
+    0x07700f00, 0x99011001, 0x09901100, 0x08201200, 0x98b11301,
+    0x0b401400, 0x9bd11501, 0x9a611601, 0x0af01700, 0x0d801800,
+    0x9d111901, 0x9ca11a01, 0x0c301b00, 0x9fc11c01, 0x0f501d00,
+    0x0ee01e00, 0x9e711f01, 0x82012001, 0x12902100, 0x13202200,
+    0x83b12301, 0x10402400, 0x80d12501, 0x81612601, 0x11f02700,
+    0x16802800, 0x86112901, 0x87a12a01, 0x17302b00, 0x84c12c01,
+    0x14502d00, 0x15e02e00, 0x85712f01, 0x1b003000, 0x8b913101,
+    0x8a213201, 0x1ab03300, 0x89413401, 0x19d03500, 0x18603600,
+    0x88f13701, 0x8f813801, 0x1f103900, 0x1ea03a00, 0x8e313b01,
+    0x1dc03c00, 0x8d513d01, 0x8ce13e01, 0x1c703f00, 0xb4014001,
+    0x24904100, 0x25204200, 0xb5b14301, 0x26404400, 0xb6d14501,
+    0xb7614601, 0x27f04700, 0x20804800, 0xb0114901, 0xb1a14a01,
+    0x21304b00, 0xb2c14c01, 0x22504d00, 0x23e04e00, 0xb3714f01,
+    0x2d005000, 0xbd915101, 0xbc215201, 0x2cb05300, 0xbf415401,
+    0x2fd05500, 0x2e605600, 0xbef15701, 0xb9815801, 0x29105900,
+    0x28a05a00, 0xb8315b01, 0x2bc05c00, 0xbb515d01, 0xbae15e01,
+    0x2a705f00, 0x36006000, 0xa6916101, 0xa7216201, 0x37b06300,
+    0xa4416401, 0x34d06500, 0x35606600, 0xa5f16701, 0xa2816801,
+    0x32106900, 0x33a06a00, 0xa3316b01, 0x30c06c00, 0xa0516d01,
+    0xa1e16e01, 0x31706f00, 0xaf017001, 0x3f907100, 0x3e207200,
+    0xaeb17301, 0x3d407400, 0xadd17501, 0xac617601, 0x3cf07700,
+    0x3b807800, 0xab117901, 0xaaa17a01, 0x3a307b00, 0xa9c17c01,
+    0x39507d00, 0x38e07e00, 0xa8717f01, 0xd8018001, 0x48908100,
+    0x49208200, 0xd9b18301, 0x4a408400, 0xdad18501, 0xdb618601,
+    0x4bf08700, 0x4c808800, 0xdc118901, 0xdda18a01, 0x4d308b00,
+    0xdec18c01, 0x4e508d00, 0x4fe08e00, 0xdf718f01, 0x41009000,
+    0xd1919101, 0xd0219201, 0x40b09300, 0xd3419401, 0x43d09500,
+    0x42609600, 0xd2f19701, 0xd5819801, 0x45109900, 0x44a09a00,
+    0xd4319b01, 0x47c09c00, 0xd7519d01, 0xd6e19e01, 0x46709f00,
+    0x5a00a000, 0xca91a101, 0xcb21a201, 0x5bb0a300, 0xc841a401,
+    0x58d0a500, 0x5960a600, 0xc9f1a701, 0xce81a801, 0x5e10a900,
+    0x5fa0aa00, 0xcf31ab01, 0x5cc0ac00, 0xcc51ad01, 0xcde1ae01,
+    0x5d70af00, 0xc301b001, 0x5390b100, 0x5220b200, 0xc2b1b301,
+    0x5140b400, 0xc1d1b501, 0xc061b601, 0x50f0b700, 0x5780b800,
+    0xc711b901, 0xc6a1ba01, 0x5630bb00, 0xc5c1bc01, 0x5550bd00,
+    0x54e0be00, 0xc471bf01, 0x6c00c000, 0xfc91c101, 0xfd21c201,
+    0x6db0c300, 0xfe41c401, 0x6ed0c500, 0x6f60c600, 0xfff1c701,
+    0xf881c801, 0x6810c900, 0x69a0ca00, 0xf931cb01, 0x6ac0cc00,
+    0xfa51cd01, 0xfbe1ce01, 0x6b70cf00, 0xf501d001, 0x6590d100,
+    0x6420d200, 0xf4b1d301, 0x6740d400, 0xf7d1d501, 0xf661d601,
+    0x66f0d700, 0x6180d800, 0xf111d901, 0xf0a1da01, 0x6030db00,
+    0xf3c1dc01, 0x6350dd00, 0x62e0de00, 0xf271df01, 0xee01e001,
+    0x7e90e100, 0x7f20e200, 0xefb1e301, 0x7c40e400, 0xecd1e501,
+    0xed61e601, 0x7df0e700, 0x7a80e800, 0xea11e901, 0xeba1ea01,
+    0x7b30eb00, 0xe8c1ec01, 0x7850ed00, 0x79e0ee00, 0xe971ef01,
+    0x7700f000, 0xe791f101, 0xe621f201, 0x76b0f300, 0xe541f401,
+    0x75d0f500, 0x7460f600, 0xe4f1f701, 0xe381f801, 0x7310f900,
+    0x72a0fa00, 0xe231fb01, 0x71c0fc00, 0xe151fd01, 0xe0e1fe01,
+    0x7070ff00}};
+
+static const word_t crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x0101919000000000, 0x0102219100000000,
+    0x0003b00100000000, 0x0104419200000000, 0x0005d00200000000,
+    0x0006600300000000, 0x0107f19300000000, 0x0108819400000000,
+    0x0009100400000000, 0x000aa00500000000, 0x010b319500000000,
+    0x000cc00600000000, 0x010d519600000000, 0x010ee19700000000,
+    0x000f700700000000, 0x0110019900000000, 0x0011900900000000,
+    0x0012200800000000, 0x0113b19800000000, 0x0014400b00000000,
+    0x0115d19b00000000, 0x0116619a00000000, 0x0017f00a00000000,
+    0x0018800d00000000, 0x0119119d00000000, 0x011aa19c00000000,
+    0x001b300c00000000, 0x011cc19f00000000, 0x001d500f00000000,
+    0x001ee00e00000000, 0x011f719e00000000, 0x0120018200000000,
+    0x0021901200000000, 0x0022201300000000, 0x0123b18300000000,
+    0x0024401000000000, 0x0125d18000000000, 0x0126618100000000,
+    0x0027f01100000000, 0x0028801600000000, 0x0129118600000000,
+    0x012aa18700000000, 0x002b301700000000, 0x012cc18400000000,
+    0x002d501400000000, 0x002ee01500000000, 0x012f718500000000,
+    0x0030001b00000000, 0x0131918b00000000, 0x0132218a00000000,
+    0x0033b01a00000000, 0x0134418900000000, 0x0035d01900000000,
+    0x0036601800000000, 0x0137f18800000000, 0x0138818f00000000,
+    0x0039101f00000000, 0x003aa01e00000000, 0x013b318e00000000,
+    0x003cc01d00000000, 0x013d518d00000000, 0x013ee18c00000000,
+    0x003f701c00000000, 0x014001b400000000, 0x0041902400000000,
+    0x0042202500000000, 0x0143b1b500000000, 0x0044402600000000,
+    0x0145d1b600000000, 0x014661b700000000, 0x0047f02700000000,
+    0x0048802000000000, 0x014911b000000000, 0x014aa1b100000000,
+    0x004b302100000000, 0x014cc1b200000000, 0x004d502200000000,
+    0x004ee02300000000, 0x014f71b300000000, 0x0050002d00000000,
+    0x015191bd00000000, 0x015221bc00000000, 0x0053b02c00000000,
+    0x015441bf00000000, 0x0055d02f00000000, 0x0056602e00000000,
+    0x0157f1be00000000, 0x015881b900000000, 0x0059102900000000,
+    0x005aa02800000000, 0x015b31b800000000, 0x005cc02b00000000,
+    0x015d51bb00000000, 0x015ee1ba00000000, 0x005f702a00000000,
+    0x0060003600000000, 0x016191a600000000, 0x016221a700000000,
+    0x0063b03700000000, 0x016441a400000000, 0x0065d03400000000,
+    0x0066603500000000, 0x0167f1a500000000, 0x016881a200000000,
+    0x0069103200000000, 0x006aa03300000000, 0x016b31a300000000,
+    0x006cc03000000000, 0x016d51a000000000, 0x016ee1a100000000,
+    0x006f703100000000, 0x017001af00000000, 0x0071903f00000000,
+    0x0072203e00000000, 0x0173b1ae00000000, 0x0074403d00000000,
+    0x0175d1ad00000000, 0x017661ac00000000, 0x0077f03c00000000,
+    0x0078803b00000000, 0x017911ab00000000, 0x017aa1aa00000000,
+    0x007b303a00000000, 0x017cc1a900000000, 0x007d503900000000,
+    0x007ee03800000000, 0x017f71a800000000, 0x018001d800000000,
+    0x0081904800000000, 0x0082204900000000, 0x0183b1d900000000,
+    0x0084404a00000000, 0x0185d1da00000000, 0x018661db00000000,
+    0x0087f04b00000000, 0x0088804c00000000, 0x018911dc00000000,
+    0x018aa1dd00000000, 0x008b304d00000000, 0x018cc1de00000000,
+    0x008d504e00000000, 0x008ee04f00000000, 0x018f71df00000000,
+    0x0090004100000000, 0x019191d100000000, 0x019221d000000000,
+    0x0093b04000000000, 0x019441d300000000, 0x0095d04300000000,
+    0x0096604200000000, 0x0197f1d200000000, 0x019881d500000000,
+    0x0099104500000000, 0x009aa04400000000, 0x019b31d400000000,
+    0x009cc04700000000, 0x019d51d700000000, 0x019ee1d600000000,
+    0x009f704600000000, 0x00a0005a00000000, 0x01a191ca00000000,
+    0x01a221cb00000000, 0x00a3b05b00000000, 0x01a441c800000000,
+    0x00a5d05800000000, 0x00a6605900000000, 0x01a7f1c900000000,
+    0x01a881ce00000000, 0x00a9105e00000000, 0x00aaa05f00000000,
+    0x01ab31cf00000000, 0x00acc05c00000000, 0x01ad51cc00000000,
+    0x01aee1cd00000000, 0x00af705d00000000, 0x01b001c300000000,
+    0x00b1905300000000, 0x00b2205200000000, 0x01b3b1c200000000,
+    0x00b4405100000000, 0x01b5d1c100000000, 0x01b661c000000000,
+    0x00b7f05000000000, 0x00b8805700000000, 0x01b911c700000000,
+    0x01baa1c600000000, 0x00bb305600000000, 0x01bcc1c500000000,
+    0x00bd505500000000, 0x00bee05400000000, 0x01bf71c400000000,
+    0x00c0006c00000000, 0x01c191fc00000000, 0x01c221fd00000000,
+    0x00c3b06d00000000, 0x01c441fe00000000, 0x00c5d06e00000000,
+    0x00c6606f00000000, 0x01c7f1ff00000000, 0x01c881f800000000,
+    0x00c9106800000000, 0x00caa06900000000, 0x01cb31f900000000,
+    0x00ccc06a00000000, 0x01cd51fa00000000, 0x01cee1fb00000000,
+    0x00cf706b00000000, 0x01d001f500000000, 0x00d1906500000000,
+    0x00d2206400000000, 0x01d3b1f400000000, 0x00d4406700000000,
+    0x01d5d1f700000000, 0x01d661f600000000, 0x00d7f06600000000,
+    0x00d8806100000000, 0x01d911f100000000, 0x01daa1f000000000,
+    0x00db306000000000, 0x01dcc1f300000000, 0x00dd506300000000,
+    0x00dee06200000000, 0x01df71f200000000, 0x01e001ee00000000,
+    0x00e1907e00000000, 0x00e2207f00000000, 0x01e3b1ef00000000,
+    0x00e4407c00000000, 0x01e5d1ec00000000, 0x01e661ed00000000,
+    0x00e7f07d00000000, 0x00e8807a00000000, 0x01e911ea00000000,
+    0x01eaa1eb00000000, 0x00eb307b00000000, 0x01ecc1e800000000,
+    0x00ed507800000000, 0x00eee07900000000, 0x01ef71e900000000,
+    0x00f0007700000000, 0x01f191e700000000, 0x01f221e600000000,
+    0x00f3b07600000000, 0x01f441e500000000, 0x00f5d07500000000,
+    0x00f6607400000000, 0x01f7f1e400000000, 0x01f881e300000000,
+    0x00f9107300000000, 0x00faa07200000000, 0x01fb31e200000000,
+    0x00fcc07100000000, 0x01fd51e100000000, 0x01fee1e000000000,
+    0x00ff707000000000},
+   {0x0000000000000000, 0x0090019000000000, 0x0320009000000000,
+    0x03b0010000000000, 0x0540039000000000, 0x05d0020000000000,
+    0x0660030000000000, 0x06f0029000000000, 0x0980059000000000,
+    0x0910040000000000, 0x0aa0050000000000, 0x0a30049000000000,
+    0x0cc0060000000000, 0x0c50079000000000, 0x0fe0069000000000,
+    0x0f70070000000000, 0x1100089000000000, 0x1190090000000000,
+    0x1220080000000000, 0x12b0099000000000, 0x14400b0000000000,
+    0x14d00a9000000000, 0x17600b9000000000, 0x17f00a0000000000,
+    0x18800d0000000000, 0x18100c9000000000, 0x1ba00d9000000000,
+    0x1b300c0000000000, 0x1dc00e9000000000, 0x1d500f0000000000,
+    0x1ee00e0000000000, 0x1e700f9000000000, 0x2100139000000000,
+    0x2190120000000000, 0x2220130000000000, 0x22b0129000000000,
+    0x2440100000000000, 0x24d0119000000000, 0x2760109000000000,
+    0x27f0110000000000, 0x2880160000000000, 0x2810179000000000,
+    0x2ba0169000000000, 0x2b30170000000000, 0x2dc0159000000000,
+    0x2d50140000000000, 0x2ee0150000000000, 0x2e70149000000000,
+    0x30001b0000000000, 0x30901a9000000000, 0x33201b9000000000,
+    0x33b01a0000000000, 0x3540189000000000, 0x35d0190000000000,
+    0x3660180000000000, 0x36f0199000000000, 0x39801e9000000000,
+    0x39101f0000000000, 0x3aa01e0000000000, 0x3a301f9000000000,
+    0x3cc01d0000000000, 0x3c501c9000000000, 0x3fe01d9000000000,
+    0x3f701c0000000000, 0x4100259000000000, 0x4190240000000000,
+    0x4220250000000000, 0x42b0249000000000, 0x4440260000000000,
+    0x44d0279000000000, 0x4760269000000000, 0x47f0270000000000,
+    0x4880200000000000, 0x4810219000000000, 0x4ba0209000000000,
+    0x4b30210000000000, 0x4dc0239000000000, 0x4d50220000000000,
+    0x4ee0230000000000, 0x4e70229000000000, 0x50002d0000000000,
+    0x50902c9000000000, 0x53202d9000000000, 0x53b02c0000000000,
+    0x55402e9000000000, 0x55d02f0000000000, 0x56602e0000000000,
+    0x56f02f9000000000, 0x5980289000000000, 0x5910290000000000,
+    0x5aa0280000000000, 0x5a30299000000000, 0x5cc02b0000000000,
+    0x5c502a9000000000, 0x5fe02b9000000000, 0x5f702a0000000000,
+    0x6000360000000000, 0x6090379000000000, 0x6320369000000000,
+    0x63b0370000000000, 0x6540359000000000, 0x65d0340000000000,
+    0x6660350000000000, 0x66f0349000000000, 0x6980339000000000,
+    0x6910320000000000, 0x6aa0330000000000, 0x6a30329000000000,
+    0x6cc0300000000000, 0x6c50319000000000, 0x6fe0309000000000,
+    0x6f70310000000000, 0x71003e9000000000, 0x71903f0000000000,
+    0x72203e0000000000, 0x72b03f9000000000, 0x74403d0000000000,
+    0x74d03c9000000000, 0x77603d9000000000, 0x77f03c0000000000,
+    0x78803b0000000000, 0x78103a9000000000, 0x7ba03b9000000000,
+    0x7b303a0000000000, 0x7dc0389000000000, 0x7d50390000000000,
+    0x7ee0380000000000, 0x7e70399000000000, 0x8100499000000000,
+    0x8190480000000000, 0x8220490000000000, 0x82b0489000000000,
+    0x84404a0000000000, 0x84d04b9000000000, 0x87604a9000000000,
+    0x87f04b0000000000, 0x88804c0000000000, 0x88104d9000000000,
+    0x8ba04c9000000000, 0x8b304d0000000000, 0x8dc04f9000000000,
+    0x8d504e0000000000, 0x8ee04f0000000000, 0x8e704e9000000000,
+    0x9000410000000000, 0x9090409000000000, 0x9320419000000000,
+    0x93b0400000000000, 0x9540429000000000, 0x95d0430000000000,
+    0x9660420000000000, 0x96f0439000000000, 0x9980449000000000,
+    0x9910450000000000, 0x9aa0440000000000, 0x9a30459000000000,
+    0x9cc0470000000000, 0x9c50469000000000, 0x9fe0479000000000,
+    0x9f70460000000000, 0xa0005a0000000000, 0xa0905b9000000000,
+    0xa3205a9000000000, 0xa3b05b0000000000, 0xa540599000000000,
+    0xa5d0580000000000, 0xa660590000000000, 0xa6f0589000000000,
+    0xa9805f9000000000, 0xa9105e0000000000, 0xaaa05f0000000000,
+    0xaa305e9000000000, 0xacc05c0000000000, 0xac505d9000000000,
+    0xafe05c9000000000, 0xaf705d0000000000, 0xb100529000000000,
+    0xb190530000000000, 0xb220520000000000, 0xb2b0539000000000,
+    0xb440510000000000, 0xb4d0509000000000, 0xb760519000000000,
+    0xb7f0500000000000, 0xb880570000000000, 0xb810569000000000,
+    0xbba0579000000000, 0xbb30560000000000, 0xbdc0549000000000,
+    0xbd50550000000000, 0xbee0540000000000, 0xbe70559000000000,
+    0xc0006c0000000000, 0xc0906d9000000000, 0xc3206c9000000000,
+    0xc3b06d0000000000, 0xc5406f9000000000, 0xc5d06e0000000000,
+    0xc6606f0000000000, 0xc6f06e9000000000, 0xc980699000000000,
+    0xc910680000000000, 0xcaa0690000000000, 0xca30689000000000,
+    0xccc06a0000000000, 0xcc506b9000000000, 0xcfe06a9000000000,
+    0xcf706b0000000000, 0xd100649000000000, 0xd190650000000000,
+    0xd220640000000000, 0xd2b0659000000000, 0xd440670000000000,
+    0xd4d0669000000000, 0xd760679000000000, 0xd7f0660000000000,
+    0xd880610000000000, 0xd810609000000000, 0xdba0619000000000,
+    0xdb30600000000000, 0xddc0629000000000, 0xdd50630000000000,
+    0xdee0620000000000, 0xde70639000000000, 0xe1007f9000000000,
+    0xe1907e0000000000, 0xe2207f0000000000, 0xe2b07e9000000000,
+    0xe4407c0000000000, 0xe4d07d9000000000, 0xe7607c9000000000,
+    0xe7f07d0000000000, 0xe8807a0000000000, 0xe8107b9000000000,
+    0xeba07a9000000000, 0xeb307b0000000000, 0xedc0799000000000,
+    0xed50780000000000, 0xeee0790000000000, 0xee70789000000000,
+    0xf000770000000000, 0xf090769000000000, 0xf320779000000000,
+    0xf3b0760000000000, 0xf540749000000000, 0xf5d0750000000000,
+    0xf660740000000000, 0xf6f0759000000000, 0xf980729000000000,
+    0xf910730000000000, 0xfaa0720000000000, 0xfa30739000000000,
+    0xfcc0710000000000, 0xfc50709000000000, 0xffe0719000000000,
+    0xff70700000000000},
+   {0x0000000000000000, 0x9001900000000000, 0x2003200100000000,
+    0xb002b00100000000, 0x4006400200000000, 0xd007d00200000000,
+    0x6005600300000000, 0xf004f00300000000, 0x800c800400000000,
+    0x100d100400000000, 0xa00fa00500000000, 0x300e300500000000,
+    0xc00ac00600000000, 0x500b500600000000, 0xe009e00700000000,
+    0x7008700700000000, 0x0019000900000000, 0x9018900900000000,
+    0x201a200800000000, 0xb01bb00800000000, 0x401f400b00000000,
+    0xd01ed00b00000000, 0x601c600a00000000, 0xf01df00a00000000,
+    0x8015800d00000000, 0x1014100d00000000, 0xa016a00c00000000,
+    0x3017300c00000000, 0xc013c00f00000000, 0x5012500f00000000,
+    0xe010e00e00000000, 0x7011700e00000000, 0x0032001200000000,
+    0x9033901200000000, 0x2031201300000000, 0xb030b01300000000,
+    0x4034401000000000, 0xd035d01000000000, 0x6037601100000000,
+    0xf036f01100000000, 0x803e801600000000, 0x103f101600000000,
+    0xa03da01700000000, 0x303c301700000000, 0xc038c01400000000,
+    0x5039501400000000, 0xe03be01500000000, 0x703a701500000000,
+    0x002b001b00000000, 0x902a901b00000000, 0x2028201a00000000,
+    0xb029b01a00000000, 0x402d401900000000, 0xd02cd01900000000,
+    0x602e601800000000, 0xf02ff01800000000, 0x8027801f00000000,
+    0x1026101f00000000, 0xa024a01e00000000, 0x3025301e00000000,
+    0xc021c01d00000000, 0x5020501d00000000, 0xe022e01c00000000,
+    0x7023701c00000000, 0x0064002400000000, 0x9065902400000000,
+    0x2067202500000000, 0xb066b02500000000, 0x4062402600000000,
+    0xd063d02600000000, 0x6061602700000000, 0xf060f02700000000,
+    0x8068802000000000, 0x1069102000000000, 0xa06ba02100000000,
+    0x306a302100000000, 0xc06ec02200000000, 0x506f502200000000,
+    0xe06de02300000000, 0x706c702300000000, 0x007d002d00000000,
+    0x907c902d00000000, 0x207e202c00000000, 0xb07fb02c00000000,
+    0x407b402f00000000, 0xd07ad02f00000000, 0x6078602e00000000,
+    0xf079f02e00000000, 0x8071802900000000, 0x1070102900000000,
+    0xa072a02800000000, 0x3073302800000000, 0xc077c02b00000000,
+    0x5076502b00000000, 0xe074e02a00000000, 0x7075702a00000000,
+    0x0056003600000000, 0x9057903600000000, 0x2055203700000000,
+    0xb054b03700000000, 0x4050403400000000, 0xd051d03400000000,
+    0x6053603500000000, 0xf052f03500000000, 0x805a803200000000,
+    0x105b103200000000, 0xa059a03300000000, 0x3058303300000000,
+    0xc05cc03000000000, 0x505d503000000000, 0xe05fe03100000000,
+    0x705e703100000000, 0x004f003f00000000, 0x904e903f00000000,
+    0x204c203e00000000, 0xb04db03e00000000, 0x4049403d00000000,
+    0xd048d03d00000000, 0x604a603c00000000, 0xf04bf03c00000000,
+    0x8043803b00000000, 0x1042103b00000000, 0xa040a03a00000000,
+    0x3041303a00000000, 0xc045c03900000000, 0x5044503900000000,
+    0xe046e03800000000, 0x7047703800000000, 0x00c8004800000000,
+    0x90c9904800000000, 0x20cb204900000000, 0xb0cab04900000000,
+    0x40ce404a00000000, 0xd0cfd04a00000000, 0x60cd604b00000000,
+    0xf0ccf04b00000000, 0x80c4804c00000000, 0x10c5104c00000000,
+    0xa0c7a04d00000000, 0x30c6304d00000000, 0xc0c2c04e00000000,
+    0x50c3504e00000000, 0xe0c1e04f00000000, 0x70c0704f00000000,
+    0x00d1004100000000, 0x90d0904100000000, 0x20d2204000000000,
+    0xb0d3b04000000000, 0x40d7404300000000, 0xd0d6d04300000000,
+    0x60d4604200000000, 0xf0d5f04200000000, 0x80dd804500000000,
+    0x10dc104500000000, 0xa0dea04400000000, 0x30df304400000000,
+    0xc0dbc04700000000, 0x50da504700000000, 0xe0d8e04600000000,
+    0x70d9704600000000, 0x00fa005a00000000, 0x90fb905a00000000,
+    0x20f9205b00000000, 0xb0f8b05b00000000, 0x40fc405800000000,
+    0xd0fdd05800000000, 0x60ff605900000000, 0xf0fef05900000000,
+    0x80f6805e00000000, 0x10f7105e00000000, 0xa0f5a05f00000000,
+    0x30f4305f00000000, 0xc0f0c05c00000000, 0x50f1505c00000000,
+    0xe0f3e05d00000000, 0x70f2705d00000000, 0x00e3005300000000,
+    0x90e2905300000000, 0x20e0205200000000, 0xb0e1b05200000000,
+    0x40e5405100000000, 0xd0e4d05100000000, 0x60e6605000000000,
+    0xf0e7f05000000000, 0x80ef805700000000, 0x10ee105700000000,
+    0xa0eca05600000000, 0x30ed305600000000, 0xc0e9c05500000000,
+    0x50e8505500000000, 0xe0eae05400000000, 0x70eb705400000000,
+    0x00ac006c00000000, 0x90ad906c00000000, 0x20af206d00000000,
+    0xb0aeb06d00000000, 0x40aa406e00000000, 0xd0abd06e00000000,
+    0x60a9606f00000000, 0xf0a8f06f00000000, 0x80a0806800000000,
+    0x10a1106800000000, 0xa0a3a06900000000, 0x30a2306900000000,
+    0xc0a6c06a00000000, 0x50a7506a00000000, 0xe0a5e06b00000000,
+    0x70a4706b00000000, 0x00b5006500000000, 0x90b4906500000000,
+    0x20b6206400000000, 0xb0b7b06400000000, 0x40b3406700000000,
+    0xd0b2d06700000000, 0x60b0606600000000, 0xf0b1f06600000000,
+    0x80b9806100000000, 0x10b8106100000000, 0xa0baa06000000000,
+    0x30bb306000000000, 0xc0bfc06300000000, 0x50be506300000000,
+    0xe0bce06200000000, 0x70bd706200000000, 0x009e007e00000000,
+    0x909f907e00000000, 0x209d207f00000000, 0xb09cb07f00000000,
+    0x4098407c00000000, 0xd099d07c00000000, 0x609b607d00000000,
+    0xf09af07d00000000, 0x8092807a00000000, 0x1093107a00000000,
+    0xa091a07b00000000, 0x3090307b00000000, 0xc094c07800000000,
+    0x5095507800000000, 0xe097e07900000000, 0x7096707900000000,
+    0x0087007700000000, 0x9086907700000000, 0x2084207600000000,
+    0xb085b07600000000, 0x4081407500000000, 0xd080d07500000000,
+    0x6082607400000000, 0xf083f07400000000, 0x808b807300000000,
+    0x108a107300000000, 0xa088a07200000000, 0x3089307200000000,
+    0xc08dc07100000000, 0x508c507100000000, 0xe08ee07000000000,
+    0x708f707000000000},
+   {0x0000000000000000, 0x0100004100000000, 0x0200008200000000,
+    0x030000c300000000, 0x070003b400000000, 0x060003f500000000,
+    0x0500033600000000, 0x0400037700000000, 0x0d0005d800000000,
+    0x0c00059900000000, 0x0f00055a00000000, 0x0e00051b00000000,
+    0x0a00066c00000000, 0x0b00062d00000000, 0x080006ee00000000,
+    0x090006af00000000, 0x1900090000000000, 0x1800094100000000,
+    0x1b00098200000000, 0x1a0009c300000000, 0x1e000ab400000000,
+    0x1f000af500000000, 0x1c000a3600000000, 0x1d000a7700000000,
+    0x14000cd800000000, 0x15000c9900000000, 0x16000c5a00000000,
+    0x17000c1b00000000, 0x13000f6c00000000, 0x12000f2d00000000,
+    0x11000fee00000000, 0x10000faf00000000, 0x3200120000000000,
+    0x3300124100000000, 0x3000128200000000, 0x310012c300000000,
+    0x350011b400000000, 0x340011f500000000, 0x3700113600000000,
+    0x3600117700000000, 0x3f0017d800000000, 0x3e00179900000000,
+    0x3d00175a00000000, 0x3c00171b00000000, 0x3800146c00000000,
+    0x3900142d00000000, 0x3a0014ee00000000, 0x3b0014af00000000,
+    0x2b001b0000000000, 0x2a001b4100000000, 0x29001b8200000000,
+    0x28001bc300000000, 0x2c0018b400000000, 0x2d0018f500000000,
+    0x2e00183600000000, 0x2f00187700000000, 0x26001ed800000000,
+    0x27001e9900000000, 0x24001e5a00000000, 0x25001e1b00000000,
+    0x21001d6c00000000, 0x20001d2d00000000, 0x23001dee00000000,
+    0x22001daf00000000, 0x6400240000000000, 0x6500244100000000,
+    0x6600248200000000, 0x670024c300000000, 0x630027b400000000,
+    0x620027f500000000, 0x6100273600000000, 0x6000277700000000,
+    0x690021d800000000, 0x6800219900000000, 0x6b00215a00000000,
+    0x6a00211b00000000, 0x6e00226c00000000, 0x6f00222d00000000,
+    0x6c0022ee00000000, 0x6d0022af00000000, 0x7d002d0000000000,
+    0x7c002d4100000000, 0x7f002d8200000000, 0x7e002dc300000000,
+    0x7a002eb400000000, 0x7b002ef500000000, 0x78002e3600000000,
+    0x79002e7700000000, 0x700028d800000000, 0x7100289900000000,
+    0x7200285a00000000, 0x7300281b00000000, 0x77002b6c00000000,
+    0x76002b2d00000000, 0x75002bee00000000, 0x74002baf00000000,
+    0x5600360000000000, 0x5700364100000000, 0x5400368200000000,
+    0x550036c300000000, 0x510035b400000000, 0x500035f500000000,
+    0x5300353600000000, 0x5200357700000000, 0x5b0033d800000000,
+    0x5a00339900000000, 0x5900335a00000000, 0x5800331b00000000,
+    0x5c00306c00000000, 0x5d00302d00000000, 0x5e0030ee00000000,
+    0x5f0030af00000000, 0x4f003f0000000000, 0x4e003f4100000000,
+    0x4d003f8200000000, 0x4c003fc300000000, 0x48003cb400000000,
+    0x49003cf500000000, 0x4a003c3600000000, 0x4b003c7700000000,
+    0x42003ad800000000, 0x43003a9900000000, 0x40003a5a00000000,
+    0x41003a1b00000000, 0x4500396c00000000, 0x4400392d00000000,
+    0x470039ee00000000, 0x460039af00000000, 0xc800480000000000,
+    0xc900484100000000, 0xca00488200000000, 0xcb0048c300000000,
+    0xcf004bb400000000, 0xce004bf500000000, 0xcd004b3600000000,
+    0xcc004b7700000000, 0xc5004dd800000000, 0xc4004d9900000000,
+    0xc7004d5a00000000, 0xc6004d1b00000000, 0xc2004e6c00000000,
+    0xc3004e2d00000000, 0xc0004eee00000000, 0xc1004eaf00000000,
+    0xd100410000000000, 0xd000414100000000, 0xd300418200000000,
+    0xd20041c300000000, 0xd60042b400000000, 0xd70042f500000000,
+    0xd400423600000000, 0xd500427700000000, 0xdc0044d800000000,
+    0xdd00449900000000, 0xde00445a00000000, 0xdf00441b00000000,
+    0xdb00476c00000000, 0xda00472d00000000, 0xd90047ee00000000,
+    0xd80047af00000000, 0xfa005a0000000000, 0xfb005a4100000000,
+    0xf8005a8200000000, 0xf9005ac300000000, 0xfd0059b400000000,
+    0xfc0059f500000000, 0xff00593600000000, 0xfe00597700000000,
+    0xf7005fd800000000, 0xf6005f9900000000, 0xf5005f5a00000000,
+    0xf4005f1b00000000, 0xf0005c6c00000000, 0xf1005c2d00000000,
+    0xf2005cee00000000, 0xf3005caf00000000, 0xe300530000000000,
+    0xe200534100000000, 0xe100538200000000, 0xe00053c300000000,
+    0xe40050b400000000, 0xe50050f500000000, 0xe600503600000000,
+    0xe700507700000000, 0xee0056d800000000, 0xef00569900000000,
+    0xec00565a00000000, 0xed00561b00000000, 0xe900556c00000000,
+    0xe800552d00000000, 0xeb0055ee00000000, 0xea0055af00000000,
+    0xac006c0000000000, 0xad006c4100000000, 0xae006c8200000000,
+    0xaf006cc300000000, 0xab006fb400000000, 0xaa006ff500000000,
+    0xa9006f3600000000, 0xa8006f7700000000, 0xa10069d800000000,
+    0xa000699900000000, 0xa300695a00000000, 0xa200691b00000000,
+    0xa6006a6c00000000, 0xa7006a2d00000000, 0xa4006aee00000000,
+    0xa5006aaf00000000, 0xb500650000000000, 0xb400654100000000,
+    0xb700658200000000, 0xb60065c300000000, 0xb20066b400000000,
+    0xb30066f500000000, 0xb000663600000000, 0xb100667700000000,
+    0xb80060d800000000, 0xb900609900000000, 0xba00605a00000000,
+    0xbb00601b00000000, 0xbf00636c00000000, 0xbe00632d00000000,
+    0xbd0063ee00000000, 0xbc0063af00000000, 0x9e007e0000000000,
+    0x9f007e4100000000, 0x9c007e8200000000, 0x9d007ec300000000,
+    0x99007db400000000, 0x98007df500000000, 0x9b007d3600000000,
+    0x9a007d7700000000, 0x93007bd800000000, 0x92007b9900000000,
+    0x91007b5a00000000, 0x90007b1b00000000, 0x9400786c00000000,
+    0x9500782d00000000, 0x960078ee00000000, 0x970078af00000000,
+    0x8700770000000000, 0x8600774100000000, 0x8500778200000000,
+    0x840077c300000000, 0x800074b400000000, 0x810074f500000000,
+    0x8200743600000000, 0x8300747700000000, 0x8a0072d800000000,
+    0x8b00729900000000, 0x8800725a00000000, 0x8900721b00000000,
+    0x8d00716c00000000, 0x8c00712d00000000, 0x8f0071ee00000000,
+    0x8e0071af00000000},
+   {0x0000000000000000, 0x0101d09000000000, 0x0102a39100000000,
+    0x0003730100000000, 0x0104459300000000, 0x0005950300000000,
+    0x0006e60200000000, 0x0107369200000000, 0x0108899600000000,
+    0x0009590600000000, 0x000a2a0700000000, 0x010bfa9700000000,
+    0x000ccc0500000000, 0x010d1c9500000000, 0x010e6f9400000000,
+    0x000fbf0400000000, 0x0110119d00000000, 0x0011c10d00000000,
+    0x0012b20c00000000, 0x0113629c00000000, 0x0014540e00000000,
+    0x0115849e00000000, 0x0116f79f00000000, 0x0017270f00000000,
+    0x0018980b00000000, 0x0119489b00000000, 0x011a3b9a00000000,
+    0x001beb0a00000000, 0x011cdd9800000000, 0x001d0d0800000000,
+    0x001e7e0900000000, 0x011fae9900000000, 0x0120218a00000000,
+    0x0021f11a00000000, 0x0022821b00000000, 0x0123528b00000000,
+    0x0024641900000000, 0x0125b48900000000, 0x0126c78800000000,
+    0x0027171800000000, 0x0028a81c00000000, 0x0129788c00000000,
+    0x012a0b8d00000000, 0x002bdb1d00000000, 0x012ced8f00000000,
+    0x002d3d1f00000000, 0x002e4e1e00000000, 0x012f9e8e00000000,
+    0x0030301700000000, 0x0131e08700000000, 0x0132938600000000,
+    0x0033431600000000, 0x0134758400000000, 0x0035a51400000000,
+    0x0036d61500000000, 0x0137068500000000, 0x0138b98100000000,
+    0x0039691100000000, 0x003a1a1000000000, 0x013bca8000000000,
+    0x003cfc1200000000, 0x013d2c8200000000, 0x013e5f8300000000,
+    0x003f8f1300000000, 0x014041a400000000, 0x0041913400000000,
+    0x0042e23500000000, 0x014332a500000000, 0x0044043700000000,
+    0x0145d4a700000000, 0x0146a7a600000000, 0x0047773600000000,
+    0x0048c83200000000, 0x014918a200000000, 0x014a6ba300000000,
+    0x004bbb3300000000, 0x014c8da100000000, 0x004d5d3100000000,
+    0x004e2e3000000000, 0x014ffea000000000, 0x0050503900000000,
+    0x015180a900000000, 0x0152f3a800000000, 0x0053233800000000,
+    0x015415aa00000000, 0x0055c53a00000000, 0x0056b63b00000000,
+    0x015766ab00000000, 0x0158d9af00000000, 0x0059093f00000000,
+    0x005a7a3e00000000, 0x015baaae00000000, 0x005c9c3c00000000,
+    0x015d4cac00000000, 0x015e3fad00000000, 0x005fef3d00000000,
+    0x0060602e00000000, 0x0161b0be00000000, 0x0162c3bf00000000,
+    0x0063132f00000000, 0x016425bd00000000, 0x0065f52d00000000,
+    0x0066862c00000000, 0x016756bc00000000, 0x0168e9b800000000,
+    0x0069392800000000, 0x006a4a2900000000, 0x016b9ab900000000,
+    0x006cac2b00000000, 0x016d7cbb00000000, 0x016e0fba00000000,
+    0x006fdf2a00000000, 0x017071b300000000, 0x0071a12300000000,
+    0x0072d22200000000, 0x017302b200000000, 0x0074342000000000,
+    0x0175e4b000000000, 0x017697b100000000, 0x0077472100000000,
+    0x0078f82500000000, 0x017928b500000000, 0x017a5bb400000000,
+    0x007b8b2400000000, 0x017cbdb600000000, 0x007d6d2600000000,
+    0x007e1e2700000000, 0x017fceb700000000, 0x018081f800000000,
+    0x0081516800000000, 0x0082226900000000, 0x0183f2f900000000,
+    0x0084c46b00000000, 0x018514fb00000000, 0x018667fa00000000,
+    0x0087b76a00000000, 0x0088086e00000000, 0x0189d8fe00000000,
+    0x018aabff00000000, 0x008b7b6f00000000, 0x018c4dfd00000000,
+    0x008d9d6d00000000, 0x008eee6c00000000, 0x018f3efc00000000,
+    0x0090906500000000, 0x019140f500000000, 0x019233f400000000,
+    0x0093e36400000000, 0x0194d5f600000000, 0x0095056600000000,
+    0x0096766700000000, 0x0197a6f700000000, 0x019819f300000000,
+    0x0099c96300000000, 0x009aba6200000000, 0x019b6af200000000,
+    0x009c5c6000000000, 0x019d8cf000000000, 0x019efff100000000,
+    0x009f2f6100000000, 0x00a0a07200000000, 0x01a170e200000000,
+    0x01a203e300000000, 0x00a3d37300000000, 0x01a4e5e100000000,
+    0x00a5357100000000, 0x00a6467000000000, 0x01a796e000000000,
+    0x01a829e400000000, 0x00a9f97400000000, 0x00aa8a7500000000,
+    0x01ab5ae500000000, 0x00ac6c7700000000, 0x01adbce700000000,
+    0x01aecfe600000000, 0x00af1f7600000000, 0x01b0b1ef00000000,
+    0x00b1617f00000000, 0x00b2127e00000000, 0x01b3c2ee00000000,
+    0x00b4f47c00000000, 0x01b524ec00000000, 0x01b657ed00000000,
+    0x00b7877d00000000, 0x00b8387900000000, 0x01b9e8e900000000,
+    0x01ba9be800000000, 0x00bb4b7800000000, 0x01bc7dea00000000,
+    0x00bdad7a00000000, 0x00bede7b00000000, 0x01bf0eeb00000000,
+    0x00c0c05c00000000, 0x01c110cc00000000, 0x01c263cd00000000,
+    0x00c3b35d00000000, 0x01c485cf00000000, 0x00c5555f00000000,
+    0x00c6265e00000000, 0x01c7f6ce00000000, 0x01c849ca00000000,
+    0x00c9995a00000000, 0x00caea5b00000000, 0x01cb3acb00000000,
+    0x00cc0c5900000000, 0x01cddcc900000000, 0x01ceafc800000000,
+    0x00cf7f5800000000, 0x01d0d1c100000000, 0x00d1015100000000,
+    0x00d2725000000000, 0x01d3a2c000000000, 0x00d4945200000000,
+    0x01d544c200000000, 0x01d637c300000000, 0x00d7e75300000000,
+    0x00d8585700000000, 0x01d988c700000000, 0x01dafbc600000000,
+    0x00db2b5600000000, 0x01dc1dc400000000, 0x00ddcd5400000000,
+    0x00debe5500000000, 0x01df6ec500000000, 0x01e0e1d600000000,
+    0x00e1314600000000, 0x00e2424700000000, 0x01e392d700000000,
+    0x00e4a44500000000, 0x01e574d500000000, 0x01e607d400000000,
+    0x00e7d74400000000, 0x00e8684000000000, 0x01e9b8d000000000,
+    0x01eacbd100000000, 0x00eb1b4100000000, 0x01ec2dd300000000,
+    0x00edfd4300000000, 0x00ee8e4200000000, 0x01ef5ed200000000,
+    0x00f0f04b00000000, 0x01f120db00000000, 0x01f253da00000000,
+    0x00f3834a00000000, 0x01f4b5d800000000, 0x00f5654800000000,
+    0x00f6164900000000, 0x01f7c6d900000000, 0x01f879dd00000000,
+    0x00f9a94d00000000, 0x00fada4c00000000, 0x01fb0adc00000000,
+    0x00fc3c4e00000000, 0x01fdecde00000000, 0x01fe9fdf00000000,
+    0x00ff4f4f00000000},
+   {0x0000000000000000, 0x00d1019000000000, 0x03a2009000000000,
+    0x0373010000000000, 0x0544029000000000, 0x0595030000000000,
+    0x06e6020000000000, 0x0637039000000000, 0x0988079000000000,
+    0x0959060000000000, 0x0a2a070000000000, 0x0afb069000000000,
+    0x0ccc050000000000, 0x0c1d049000000000, 0x0f6e059000000000,
+    0x0fbf040000000000, 0x11100c9000000000, 0x11c10d0000000000,
+    0x12b20c0000000000, 0x12630d9000000000, 0x14540e0000000000,
+    0x14850f9000000000, 0x17f60e9000000000, 0x17270f0000000000,
+    0x18980b0000000000, 0x18490a9000000000, 0x1b3a0b9000000000,
+    0x1beb0a0000000000, 0x1ddc099000000000, 0x1d0d080000000000,
+    0x1e7e090000000000, 0x1eaf089000000000, 0x21201b9000000000,
+    0x21f11a0000000000, 0x22821b0000000000, 0x22531a9000000000,
+    0x2464190000000000, 0x24b5189000000000, 0x27c6199000000000,
+    0x2717180000000000, 0x28a81c0000000000, 0x28791d9000000000,
+    0x2b0a1c9000000000, 0x2bdb1d0000000000, 0x2dec1e9000000000,
+    0x2d3d1f0000000000, 0x2e4e1e0000000000, 0x2e9f1f9000000000,
+    0x3030170000000000, 0x30e1169000000000, 0x3392179000000000,
+    0x3343160000000000, 0x3574159000000000, 0x35a5140000000000,
+    0x36d6150000000000, 0x3607149000000000, 0x39b8109000000000,
+    0x3969110000000000, 0x3a1a100000000000, 0x3acb119000000000,
+    0x3cfc120000000000, 0x3c2d139000000000, 0x3f5e129000000000,
+    0x3f8f130000000000, 0x4140359000000000, 0x4191340000000000,
+    0x42e2350000000000, 0x4233349000000000, 0x4404370000000000,
+    0x44d5369000000000, 0x47a6379000000000, 0x4777360000000000,
+    0x48c8320000000000, 0x4819339000000000, 0x4b6a329000000000,
+    0x4bbb330000000000, 0x4d8c309000000000, 0x4d5d310000000000,
+    0x4e2e300000000000, 0x4eff319000000000, 0x5050390000000000,
+    0x5081389000000000, 0x53f2399000000000, 0x5323380000000000,
+    0x55143b9000000000, 0x55c53a0000000000, 0x56b63b0000000000,
+    0x56673a9000000000, 0x59d83e9000000000, 0x59093f0000000000,
+    0x5a7a3e0000000000, 0x5aab3f9000000000, 0x5c9c3c0000000000,
+    0x5c4d3d9000000000, 0x5f3e3c9000000000, 0x5fef3d0000000000,
+    0x60602e0000000000, 0x60b12f9000000000, 0x63c22e9000000000,
+    0x63132f0000000000, 0x65242c9000000000, 0x65f52d0000000000,
+    0x66862c0000000000, 0x66572d9000000000, 0x69e8299000000000,
+    0x6939280000000000, 0x6a4a290000000000, 0x6a9b289000000000,
+    0x6cac2b0000000000, 0x6c7d2a9000000000, 0x6f0e2b9000000000,
+    0x6fdf2a0000000000, 0x7170229000000000, 0x71a1230000000000,
+    0x72d2220000000000, 0x7203239000000000, 0x7434200000000000,
+    0x74e5219000000000, 0x7796209000000000, 0x7747210000000000,
+    0x78f8250000000000, 0x7829249000000000, 0x7b5a259000000000,
+    0x7b8b240000000000, 0x7dbc279000000000, 0x7d6d260000000000,
+    0x7e1e270000000000, 0x7ecf269000000000, 0x8180699000000000,
+    0x8151680000000000, 0x8222690000000000, 0x82f3689000000000,
+    0x84c46b0000000000, 0x84156a9000000000, 0x87666b9000000000,
+    0x87b76a0000000000, 0x88086e0000000000, 0x88d96f9000000000,
+    0x8baa6e9000000000, 0x8b7b6f0000000000, 0x8d4c6c9000000000,
+    0x8d9d6d0000000000, 0x8eee6c0000000000, 0x8e3f6d9000000000,
+    0x9090650000000000, 0x9041649000000000, 0x9332659000000000,
+    0x93e3640000000000, 0x95d4679000000000, 0x9505660000000000,
+    0x9676670000000000, 0x96a7669000000000, 0x9918629000000000,
+    0x99c9630000000000, 0x9aba620000000000, 0x9a6b639000000000,
+    0x9c5c600000000000, 0x9c8d619000000000, 0x9ffe609000000000,
+    0x9f2f610000000000, 0xa0a0720000000000, 0xa071739000000000,
+    0xa302729000000000, 0xa3d3730000000000, 0xa5e4709000000000,
+    0xa535710000000000, 0xa646700000000000, 0xa697719000000000,
+    0xa928759000000000, 0xa9f9740000000000, 0xaa8a750000000000,
+    0xaa5b749000000000, 0xac6c770000000000, 0xacbd769000000000,
+    0xafce779000000000, 0xaf1f760000000000, 0xb1b07e9000000000,
+    0xb1617f0000000000, 0xb2127e0000000000, 0xb2c37f9000000000,
+    0xb4f47c0000000000, 0xb4257d9000000000, 0xb7567c9000000000,
+    0xb7877d0000000000, 0xb838790000000000, 0xb8e9789000000000,
+    0xbb9a799000000000, 0xbb4b780000000000, 0xbd7c7b9000000000,
+    0xbdad7a0000000000, 0xbede7b0000000000, 0xbe0f7a9000000000,
+    0xc0c05c0000000000, 0xc0115d9000000000, 0xc3625c9000000000,
+    0xc3b35d0000000000, 0xc5845e9000000000, 0xc5555f0000000000,
+    0xc6265e0000000000, 0xc6f75f9000000000, 0xc9485b9000000000,
+    0xc9995a0000000000, 0xcaea5b0000000000, 0xca3b5a9000000000,
+    0xcc0c590000000000, 0xccdd589000000000, 0xcfae599000000000,
+    0xcf7f580000000000, 0xd1d0509000000000, 0xd101510000000000,
+    0xd272500000000000, 0xd2a3519000000000, 0xd494520000000000,
+    0xd445539000000000, 0xd736529000000000, 0xd7e7530000000000,
+    0xd858570000000000, 0xd889569000000000, 0xdbfa579000000000,
+    0xdb2b560000000000, 0xdd1c559000000000, 0xddcd540000000000,
+    0xdebe550000000000, 0xde6f549000000000, 0xe1e0479000000000,
+    0xe131460000000000, 0xe242470000000000, 0xe293469000000000,
+    0xe4a4450000000000, 0xe475449000000000, 0xe706459000000000,
+    0xe7d7440000000000, 0xe868400000000000, 0xe8b9419000000000,
+    0xebca409000000000, 0xeb1b410000000000, 0xed2c429000000000,
+    0xedfd430000000000, 0xee8e420000000000, 0xee5f439000000000,
+    0xf0f04b0000000000, 0xf0214a9000000000, 0xf3524b9000000000,
+    0xf3834a0000000000, 0xf5b4499000000000, 0xf565480000000000,
+    0xf616490000000000, 0xf6c7489000000000, 0xf9784c9000000000,
+    0xf9a94d0000000000, 0xfada4c0000000000, 0xfa0b4d9000000000,
+    0xfc3c4e0000000000, 0xfced4f9000000000, 0xff9e4e9000000000,
+    0xff4f4f0000000000},
+   {0x0000000000000000, 0xd101900000000000, 0xa203200100000000,
+    0x7302b00100000000, 0x4407400200000000, 0x9506d00200000000,
+    0xe604600300000000, 0x3705f00300000000, 0x880e800400000000,
+    0x590f100400000000, 0x2a0da00500000000, 0xfb0c300500000000,
+    0xcc09c00600000000, 0x1d08500600000000, 0x6e0ae00700000000,
+    0xbf0b700700000000, 0x101d000900000000, 0xc11c900900000000,
+    0xb21e200800000000, 0x631fb00800000000, 0x541a400b00000000,
+    0x851bd00b00000000, 0xf619600a00000000, 0x2718f00a00000000,
+    0x9813800d00000000, 0x4912100d00000000, 0x3a10a00c00000000,
+    0xeb11300c00000000, 0xdc14c00f00000000, 0x0d15500f00000000,
+    0x7e17e00e00000000, 0xaf16700e00000000, 0x203a001200000000,
+    0xf13b901200000000, 0x8239201300000000, 0x5338b01300000000,
+    0x643d401000000000, 0xb53cd01000000000, 0xc63e601100000000,
+    0x173ff01100000000, 0xa834801600000000, 0x7935101600000000,
+    0x0a37a01700000000, 0xdb36301700000000, 0xec33c01400000000,
+    0x3d32501400000000, 0x4e30e01500000000, 0x9f31701500000000,
+    0x3027001b00000000, 0xe126901b00000000, 0x9224201a00000000,
+    0x4325b01a00000000, 0x7420401900000000, 0xa521d01900000000,
+    0xd623601800000000, 0x0722f01800000000, 0xb829801f00000000,
+    0x6928101f00000000, 0x1a2aa01e00000000, 0xcb2b301e00000000,
+    0xfc2ec01d00000000, 0x2d2f501d00000000, 0x5e2de01c00000000,
+    0x8f2c701c00000000, 0x4074002400000000, 0x9175902400000000,
+    0xe277202500000000, 0x3376b02500000000, 0x0473402600000000,
+    0xd572d02600000000, 0xa670602700000000, 0x7771f02700000000,
+    0xc87a802000000000, 0x197b102000000000, 0x6a79a02100000000,
+    0xbb78302100000000, 0x8c7dc02200000000, 0x5d7c502200000000,
+    0x2e7ee02300000000, 0xff7f702300000000, 0x5069002d00000000,
+    0x8168902d00000000, 0xf26a202c00000000, 0x236bb02c00000000,
+    0x146e402f00000000, 0xc56fd02f00000000, 0xb66d602e00000000,
+    0x676cf02e00000000, 0xd867802900000000, 0x0966102900000000,
+    0x7a64a02800000000, 0xab65302800000000, 0x9c60c02b00000000,
+    0x4d61502b00000000, 0x3e63e02a00000000, 0xef62702a00000000,
+    0x604e003600000000, 0xb14f903600000000, 0xc24d203700000000,
+    0x134cb03700000000, 0x2449403400000000, 0xf548d03400000000,
+    0x864a603500000000, 0x574bf03500000000, 0xe840803200000000,
+    0x3941103200000000, 0x4a43a03300000000, 0x9b42303300000000,
+    0xac47c03000000000, 0x7d46503000000000, 0x0e44e03100000000,
+    0xdf45703100000000, 0x7053003f00000000, 0xa152903f00000000,
+    0xd250203e00000000, 0x0351b03e00000000, 0x3454403d00000000,
+    0xe555d03d00000000, 0x9657603c00000000, 0x4756f03c00000000,
+    0xf85d803b00000000, 0x295c103b00000000, 0x5a5ea03a00000000,
+    0x8b5f303a00000000, 0xbc5ac03900000000, 0x6d5b503900000000,
+    0x1e59e03800000000, 0xcf58703800000000, 0x80e8004800000000,
+    0x51e9904800000000, 0x22eb204900000000, 0xf3eab04900000000,
+    0xc4ef404a00000000, 0x15eed04a00000000, 0x66ec604b00000000,
+    0xb7edf04b00000000, 0x08e6804c00000000, 0xd9e7104c00000000,
+    0xaae5a04d00000000, 0x7be4304d00000000, 0x4ce1c04e00000000,
+    0x9de0504e00000000, 0xeee2e04f00000000, 0x3fe3704f00000000,
+    0x90f5004100000000, 0x41f4904100000000, 0x32f6204000000000,
+    0xe3f7b04000000000, 0xd4f2404300000000, 0x05f3d04300000000,
+    0x76f1604200000000, 0xa7f0f04200000000, 0x18fb804500000000,
+    0xc9fa104500000000, 0xbaf8a04400000000, 0x6bf9304400000000,
+    0x5cfcc04700000000, 0x8dfd504700000000, 0xfeffe04600000000,
+    0x2ffe704600000000, 0xa0d2005a00000000, 0x71d3905a00000000,
+    0x02d1205b00000000, 0xd3d0b05b00000000, 0xe4d5405800000000,
+    0x35d4d05800000000, 0x46d6605900000000, 0x97d7f05900000000,
+    0x28dc805e00000000, 0xf9dd105e00000000, 0x8adfa05f00000000,
+    0x5bde305f00000000, 0x6cdbc05c00000000, 0xbdda505c00000000,
+    0xced8e05d00000000, 0x1fd9705d00000000, 0xb0cf005300000000,
+    0x61ce905300000000, 0x12cc205200000000, 0xc3cdb05200000000,
+    0xf4c8405100000000, 0x25c9d05100000000, 0x56cb605000000000,
+    0x87caf05000000000, 0x38c1805700000000, 0xe9c0105700000000,
+    0x9ac2a05600000000, 0x4bc3305600000000, 0x7cc6c05500000000,
+    0xadc7505500000000, 0xdec5e05400000000, 0x0fc4705400000000,
+    0xc09c006c00000000, 0x119d906c00000000, 0x629f206d00000000,
+    0xb39eb06d00000000, 0x849b406e00000000, 0x559ad06e00000000,
+    0x2698606f00000000, 0xf799f06f00000000, 0x4892806800000000,
+    0x9993106800000000, 0xea91a06900000000, 0x3b90306900000000,
+    0x0c95c06a00000000, 0xdd94506a00000000, 0xae96e06b00000000,
+    0x7f97706b00000000, 0xd081006500000000, 0x0180906500000000,
+    0x7282206400000000, 0xa383b06400000000, 0x9486406700000000,
+    0x4587d06700000000, 0x3685606600000000, 0xe784f06600000000,
+    0x588f806100000000, 0x898e106100000000, 0xfa8ca06000000000,
+    0x2b8d306000000000, 0x1c88c06300000000, 0xcd89506300000000,
+    0xbe8be06200000000, 0x6f8a706200000000, 0xe0a6007e00000000,
+    0x31a7907e00000000, 0x42a5207f00000000, 0x93a4b07f00000000,
+    0xa4a1407c00000000, 0x75a0d07c00000000, 0x06a2607d00000000,
+    0xd7a3f07d00000000, 0x68a8807a00000000, 0xb9a9107a00000000,
+    0xcaaba07b00000000, 0x1baa307b00000000, 0x2cafc07800000000,
+    0xfdae507800000000, 0x8eace07900000000, 0x5fad707900000000,
+    0xf0bb007700000000, 0x21ba907700000000, 0x52b8207600000000,
+    0x83b9b07600000000, 0xb4bc407500000000, 0x65bdd07500000000,
+    0x16bf607400000000, 0xc7bef07400000000, 0x78b5807300000000,
+    0xa9b4107300000000, 0xdab6a07200000000, 0x0bb7307200000000,
+    0x3cb2c07100000000, 0xedb3507100000000, 0x9eb1e07000000000,
+    0x4fb0707000000000},
+   {0x0000000000000000, 0x0141906500000000, 0x028220cb00000000,
+    0x03c3b0ae00000000, 0x0704422600000000, 0x0645d24300000000,
+    0x058662ed00000000, 0x04c7f28800000000, 0x0e08844c00000000,
+    0x0f49142900000000, 0x0c8aa48700000000, 0x0dcb34e200000000,
+    0x090cc66a00000000, 0x084d560f00000000, 0x0b8ee6a100000000,
+    0x0acf76c400000000, 0x1c10089900000000, 0x1d5198fc00000000,
+    0x1e92285200000000, 0x1fd3b83700000000, 0x1b144abf00000000,
+    0x1a55dada00000000, 0x19966a7400000000, 0x18d7fa1100000000,
+    0x12188cd500000000, 0x13591cb000000000, 0x109aac1e00000000,
+    0x11db3c7b00000000, 0x151ccef300000000, 0x145d5e9600000000,
+    0x179eee3800000000, 0x16df7e5d00000000, 0x3b20138200000000,
+    0x3a6183e700000000, 0x39a2334900000000, 0x38e3a32c00000000,
+    0x3c2451a400000000, 0x3d65c1c100000000, 0x3ea6716f00000000,
+    0x3fe7e10a00000000, 0x352897ce00000000, 0x346907ab00000000,
+    0x37aab70500000000, 0x36eb276000000000, 0x322cd5e800000000,
+    0x336d458d00000000, 0x30aef52300000000, 0x31ef654600000000,
+    0x27301b1b00000000, 0x26718b7e00000000, 0x25b23bd000000000,
+    0x24f3abb500000000, 0x2034593d00000000, 0x2175c95800000000,
+    0x22b679f600000000, 0x23f7e99300000000, 0x29389f5700000000,
+    0x28790f3200000000, 0x2bbabf9c00000000, 0x2afb2ff900000000,
+    0x2e3cdd7100000000, 0x2f7d4d1400000000, 0x2cbefdba00000000,
+    0x2dff6ddf00000000, 0x754025b400000000, 0x7401b5d100000000,
+    0x77c2057f00000000, 0x7683951a00000000, 0x7244679200000000,
+    0x7305f7f700000000, 0x70c6475900000000, 0x7187d73c00000000,
+    0x7b48a1f800000000, 0x7a09319d00000000, 0x79ca813300000000,
+    0x788b115600000000, 0x7c4ce3de00000000, 0x7d0d73bb00000000,
+    0x7ecec31500000000, 0x7f8f537000000000, 0x69502d2d00000000,
+    0x6811bd4800000000, 0x6bd20de600000000, 0x6a939d8300000000,
+    0x6e546f0b00000000, 0x6f15ff6e00000000, 0x6cd64fc000000000,
+    0x6d97dfa500000000, 0x6758a96100000000, 0x6619390400000000,
+    0x65da89aa00000000, 0x649b19cf00000000, 0x605ceb4700000000,
+    0x611d7b2200000000, 0x62decb8c00000000, 0x639f5be900000000,
+    0x4e60363600000000, 0x4f21a65300000000, 0x4ce216fd00000000,
+    0x4da3869800000000, 0x4964741000000000, 0x4825e47500000000,
+    0x4be654db00000000, 0x4aa7c4be00000000, 0x4068b27a00000000,
+    0x4129221f00000000, 0x42ea92b100000000, 0x43ab02d400000000,
+    0x476cf05c00000000, 0x462d603900000000, 0x45eed09700000000,
+    0x44af40f200000000, 0x52703eaf00000000, 0x5331aeca00000000,
+    0x50f21e6400000000, 0x51b38e0100000000, 0x55747c8900000000,
+    0x5435ecec00000000, 0x57f65c4200000000, 0x56b7cc2700000000,
+    0x5c78bae300000000, 0x5d392a8600000000, 0x5efa9a2800000000,
+    0x5fbb0a4d00000000, 0x5b7cf8c500000000, 0x5a3d68a000000000,
+    0x59fed80e00000000, 0x58bf486b00000000, 0xe98049d800000000,
+    0xe8c1d9bd00000000, 0xeb02691300000000, 0xea43f97600000000,
+    0xee840bfe00000000, 0xefc59b9b00000000, 0xec062b3500000000,
+    0xed47bb5000000000, 0xe788cd9400000000, 0xe6c95df100000000,
+    0xe50aed5f00000000, 0xe44b7d3a00000000, 0xe08c8fb200000000,
+    0xe1cd1fd700000000, 0xe20eaf7900000000, 0xe34f3f1c00000000,
+    0xf590414100000000, 0xf4d1d12400000000, 0xf712618a00000000,
+    0xf653f1ef00000000, 0xf294036700000000, 0xf3d5930200000000,
+    0xf01623ac00000000, 0xf157b3c900000000, 0xfb98c50d00000000,
+    0xfad9556800000000, 0xf91ae5c600000000, 0xf85b75a300000000,
+    0xfc9c872b00000000, 0xfddd174e00000000, 0xfe1ea7e000000000,
+    0xff5f378500000000, 0xd2a05a5a00000000, 0xd3e1ca3f00000000,
+    0xd0227a9100000000, 0xd163eaf400000000, 0xd5a4187c00000000,
+    0xd4e5881900000000, 0xd72638b700000000, 0xd667a8d200000000,
+    0xdca8de1600000000, 0xdde94e7300000000, 0xde2afedd00000000,
+    0xdf6b6eb800000000, 0xdbac9c3000000000, 0xdaed0c5500000000,
+    0xd92ebcfb00000000, 0xd86f2c9e00000000, 0xceb052c300000000,
+    0xcff1c2a600000000, 0xcc32720800000000, 0xcd73e26d00000000,
+    0xc9b410e500000000, 0xc8f5808000000000, 0xcb36302e00000000,
+    0xca77a04b00000000, 0xc0b8d68f00000000, 0xc1f946ea00000000,
+    0xc23af64400000000, 0xc37b662100000000, 0xc7bc94a900000000,
+    0xc6fd04cc00000000, 0xc53eb46200000000, 0xc47f240700000000,
+    0x9cc06c6c00000000, 0x9d81fc0900000000, 0x9e424ca700000000,
+    0x9f03dcc200000000, 0x9bc42e4a00000000, 0x9a85be2f00000000,
+    0x99460e8100000000, 0x98079ee400000000, 0x92c8e82000000000,
+    0x9389784500000000, 0x904ac8eb00000000, 0x910b588e00000000,
+    0x95ccaa0600000000, 0x948d3a6300000000, 0x974e8acd00000000,
+    0x960f1aa800000000, 0x80d064f500000000, 0x8191f49000000000,
+    0x8252443e00000000, 0x8313d45b00000000, 0x87d426d300000000,
+    0x8695b6b600000000, 0x8556061800000000, 0x8417967d00000000,
+    0x8ed8e0b900000000, 0x8f9970dc00000000, 0x8c5ac07200000000,
+    0x8d1b501700000000, 0x89dca29f00000000, 0x889d32fa00000000,
+    0x8b5e825400000000, 0x8a1f123100000000, 0xa7e07fee00000000,
+    0xa6a1ef8b00000000, 0xa5625f2500000000, 0xa423cf4000000000,
+    0xa0e43dc800000000, 0xa1a5adad00000000, 0xa2661d0300000000,
+    0xa3278d6600000000, 0xa9e8fba200000000, 0xa8a96bc700000000,
+    0xab6adb6900000000, 0xaa2b4b0c00000000, 0xaeecb98400000000,
+    0xafad29e100000000, 0xac6e994f00000000, 0xad2f092a00000000,
+    0xbbf0777700000000, 0xbab1e71200000000, 0xb97257bc00000000,
+    0xb833c7d900000000, 0xbcf4355100000000, 0xbdb5a53400000000,
+    0xbe76159a00000000, 0xbf3785ff00000000, 0xb5f8f33b00000000,
+    0xb4b9635e00000000, 0xb77ad3f000000000, 0xb63b439500000000,
+    0xb2fcb11d00000000, 0xb3bd217800000000, 0xb07e91d600000000,
+    0xb13f01b300000000}};
+
+#else /* W == 4 */
+
+static const crc_t crc_braid_table[][256] = {
+   {0x00000000, 0x41000001, 0x82000002, 0xc3000003, 0xb4030007,
+    0xf5030006, 0x36030005, 0x77030004, 0xd805000d, 0x9905000c,
+    0x5a05000f, 0x1b05000e, 0x6c06000a, 0x2d06000b, 0xee060008,
+    0xaf060009, 0x00090019, 0x41090018, 0x8209001b, 0xc309001a,
+    0xb40a001e, 0xf50a001f, 0x360a001c, 0x770a001d, 0xd80c0014,
+    0x990c0015, 0x5a0c0016, 0x1b0c0017, 0x6c0f0013, 0x2d0f0012,
+    0xee0f0011, 0xaf0f0010, 0x00120032, 0x41120033, 0x82120030,
+    0xc3120031, 0xb4110035, 0xf5110034, 0x36110037, 0x77110036,
+    0xd817003f, 0x9917003e, 0x5a17003d, 0x1b17003c, 0x6c140038,
+    0x2d140039, 0xee14003a, 0xaf14003b, 0x001b002b, 0x411b002a,
+    0x821b0029, 0xc31b0028, 0xb418002c, 0xf518002d, 0x3618002e,
+    0x7718002f, 0xd81e0026, 0x991e0027, 0x5a1e0024, 0x1b1e0025,
+    0x6c1d0021, 0x2d1d0020, 0xee1d0023, 0xaf1d0022, 0x00240064,
+    0x41240065, 0x82240066, 0xc3240067, 0xb4270063, 0xf5270062,
+    0x36270061, 0x77270060, 0xd8210069, 0x99210068, 0x5a21006b,
+    0x1b21006a, 0x6c22006e, 0x2d22006f, 0xee22006c, 0xaf22006d,
+    0x002d007d, 0x412d007c, 0x822d007f, 0xc32d007e, 0xb42e007a,
+    0xf52e007b, 0x362e0078, 0x772e0079, 0xd8280070, 0x99280071,
+    0x5a280072, 0x1b280073, 0x6c2b0077, 0x2d2b0076, 0xee2b0075,
+    0xaf2b0074, 0x00360056, 0x41360057, 0x82360054, 0xc3360055,
+    0xb4350051, 0xf5350050, 0x36350053, 0x77350052, 0xd833005b,
+    0x9933005a, 0x5a330059, 0x1b330058, 0x6c30005c, 0x2d30005d,
+    0xee30005e, 0xaf30005f, 0x003f004f, 0x413f004e, 0x823f004d,
+    0xc33f004c, 0xb43c0048, 0xf53c0049, 0x363c004a, 0x773c004b,
+    0xd83a0042, 0x993a0043, 0x5a3a0040, 0x1b3a0041, 0x6c390045,
+    0x2d390044, 0xee390047, 0xaf390046, 0x004800c8, 0x414800c9,
+    0x824800ca, 0xc34800cb, 0xb44b00cf, 0xf54b00ce, 0x364b00cd,
+    0x774b00cc, 0xd84d00c5, 0x994d00c4, 0x5a4d00c7, 0x1b4d00c6,
+    0x6c4e00c2, 0x2d4e00c3, 0xee4e00c0, 0xaf4e00c1, 0x004100d1,
+    0x414100d0, 0x824100d3, 0xc34100d2, 0xb44200d6, 0xf54200d7,
+    0x364200d4, 0x774200d5, 0xd84400dc, 0x994400dd, 0x5a4400de,
+    0x1b4400df, 0x6c4700db, 0x2d4700da, 0xee4700d9, 0xaf4700d8,
+    0x005a00fa, 0x415a00fb, 0x825a00f8, 0xc35a00f9, 0xb45900fd,
+    0xf55900fc, 0x365900ff, 0x775900fe, 0xd85f00f7, 0x995f00f6,
+    0x5a5f00f5, 0x1b5f00f4, 0x6c5c00f0, 0x2d5c00f1, 0xee5c00f2,
+    0xaf5c00f3, 0x005300e3, 0x415300e2, 0x825300e1, 0xc35300e0,
+    0xb45000e4, 0xf55000e5, 0x365000e6, 0x775000e7, 0xd85600ee,
+    0x995600ef, 0x5a5600ec, 0x1b5600ed, 0x6c5500e9, 0x2d5500e8,
+    0xee5500eb, 0xaf5500ea, 0x006c00ac, 0x416c00ad, 0x826c00ae,
+    0xc36c00af, 0xb46f00ab, 0xf56f00aa, 0x366f00a9, 0x776f00a8,
+    0xd86900a1, 0x996900a0, 0x5a6900a3, 0x1b6900a2, 0x6c6a00a6,
+    0x2d6a00a7, 0xee6a00a4, 0xaf6a00a5, 0x006500b5, 0x416500b4,
+    0x826500b7, 0xc36500b6, 0xb46600b2, 0xf56600b3, 0x366600b0,
+    0x776600b1, 0xd86000b8, 0x996000b9, 0x5a6000ba, 0x1b6000bb,
+    0x6c6300bf, 0x2d6300be, 0xee6300bd, 0xaf6300bc, 0x007e009e,
+    0x417e009f, 0x827e009c, 0xc37e009d, 0xb47d0099, 0xf57d0098,
+    0x367d009b, 0x777d009a, 0xd87b0093, 0x997b0092, 0x5a7b0091,
+    0x1b7b0090, 0x6c780094, 0x2d780095, 0xee780096, 0xaf780097,
+    0x00770087, 0x41770086, 0x82770085, 0xc3770084, 0xb4740080,
+    0xf5740081, 0x36740082, 0x77740083, 0xd872008a, 0x9972008b,
+    0x5a720088, 0x1b720089, 0x6c71008d, 0x2d71008c, 0xee71008f,
+    0xaf71008e},
+   {0x00000000, 0x00900190, 0x01200320, 0x01b002b0, 0x02400640,
+    0x02d007d0, 0x03600560, 0x03f004f0, 0x04800c80, 0x04100d10,
+    0x05a00fa0, 0x05300e30, 0x06c00ac0, 0x06500b50, 0x07e009e0,
+    0x07700870, 0x09001900, 0x09901890, 0x08201a20, 0x08b01bb0,
+    0x0b401f40, 0x0bd01ed0, 0x0a601c60, 0x0af01df0, 0x0d801580,
+    0x0d101410, 0x0ca016a0, 0x0c301730, 0x0fc013c0, 0x0f501250,
+    0x0ee010e0, 0x0e701170, 0x12003200, 0x12903390, 0x13203120,
+    0x13b030b0, 0x10403440, 0x10d035d0, 0x11603760, 0x11f036f0,
+    0x16803e80, 0x16103f10, 0x17a03da0, 0x17303c30, 0x14c038c0,
+    0x14503950, 0x15e03be0, 0x15703a70, 0x1b002b00, 0x1b902a90,
+    0x1a202820, 0x1ab029b0, 0x19402d40, 0x19d02cd0, 0x18602e60,
+    0x18f02ff0, 0x1f802780, 0x1f102610, 0x1ea024a0, 0x1e302530,
+    0x1dc021c0, 0x1d502050, 0x1ce022e0, 0x1c702370, 0x24006400,
+    0x24906590, 0x25206720, 0x25b066b0, 0x26406240, 0x26d063d0,
+    0x27606160, 0x27f060f0, 0x20806880, 0x20106910, 0x21a06ba0,
+    0x21306a30, 0x22c06ec0, 0x22506f50, 0x23e06de0, 0x23706c70,
+    0x2d007d00, 0x2d907c90, 0x2c207e20, 0x2cb07fb0, 0x2f407b40,
+    0x2fd07ad0, 0x2e607860, 0x2ef079f0, 0x29807180, 0x29107010,
+    0x28a072a0, 0x28307330, 0x2bc077c0, 0x2b507650, 0x2ae074e0,
+    0x2a707570, 0x36005600, 0x36905790, 0x37205520, 0x37b054b0,
+    0x34405040, 0x34d051d0, 0x35605360, 0x35f052f0, 0x32805a80,
+    0x32105b10, 0x33a059a0, 0x33305830, 0x30c05cc0, 0x30505d50,
+    0x31e05fe0, 0x31705e70, 0x3f004f00, 0x3f904e90, 0x3e204c20,
+    0x3eb04db0, 0x3d404940, 0x3dd048d0, 0x3c604a60, 0x3cf04bf0,
+    0x3b804380, 0x3b104210, 0x3aa040a0, 0x3a304130, 0x39c045c0,
+    0x39504450, 0x38e046e0, 0x38704770, 0x4800c800, 0x4890c990,
+    0x4920cb20, 0x49b0cab0, 0x4a40ce40, 0x4ad0cfd0, 0x4b60cd60,
+    0x4bf0ccf0, 0x4c80c480, 0x4c10c510, 0x4da0c7a0, 0x4d30c630,
+    0x4ec0c2c0, 0x4e50c350, 0x4fe0c1e0, 0x4f70c070, 0x4100d100,
+    0x4190d090, 0x4020d220, 0x40b0d3b0, 0x4340d740, 0x43d0d6d0,
+    0x4260d460, 0x42f0d5f0, 0x4580dd80, 0x4510dc10, 0x44a0dea0,
+    0x4430df30, 0x47c0dbc0, 0x4750da50, 0x46e0d8e0, 0x4670d970,
+    0x5a00fa00, 0x5a90fb90, 0x5b20f920, 0x5bb0f8b0, 0x5840fc40,
+    0x58d0fdd0, 0x5960ff60, 0x59f0fef0, 0x5e80f680, 0x5e10f710,
+    0x5fa0f5a0, 0x5f30f430, 0x5cc0f0c0, 0x5c50f150, 0x5de0f3e0,
+    0x5d70f270, 0x5300e300, 0x5390e290, 0x5220e020, 0x52b0e1b0,
+    0x5140e540, 0x51d0e4d0, 0x5060e660, 0x50f0e7f0, 0x5780ef80,
+    0x5710ee10, 0x56a0eca0, 0x5630ed30, 0x55c0e9c0, 0x5550e850,
+    0x54e0eae0, 0x5470eb70, 0x6c00ac00, 0x6c90ad90, 0x6d20af20,
+    0x6db0aeb0, 0x6e40aa40, 0x6ed0abd0, 0x6f60a960, 0x6ff0a8f0,
+    0x6880a080, 0x6810a110, 0x69a0a3a0, 0x6930a230, 0x6ac0a6c0,
+    0x6a50a750, 0x6be0a5e0, 0x6b70a470, 0x6500b500, 0x6590b490,
+    0x6420b620, 0x64b0b7b0, 0x6740b340, 0x67d0b2d0, 0x6660b060,
+    0x66f0b1f0, 0x6180b980, 0x6110b810, 0x60a0baa0, 0x6030bb30,
+    0x63c0bfc0, 0x6350be50, 0x62e0bce0, 0x6270bd70, 0x7e009e00,
+    0x7e909f90, 0x7f209d20, 0x7fb09cb0, 0x7c409840, 0x7cd099d0,
+    0x7d609b60, 0x7df09af0, 0x7a809280, 0x7a109310, 0x7ba091a0,
+    0x7b309030, 0x78c094c0, 0x78509550, 0x79e097e0, 0x79709670,
+    0x77008700, 0x77908690, 0x76208420, 0x76b085b0, 0x75408140,
+    0x75d080d0, 0x74608260, 0x74f083f0, 0x73808b80, 0x73108a10,
+    0x72a088a0, 0x72308930, 0x71c08dc0, 0x71508c50, 0x70e08ee0,
+    0x70708f70},
+   {0x00000000, 0x90019000, 0x90002003, 0x0001b003, 0x90034005,
+    0x0002d005, 0x00036006, 0x9002f006, 0x90058009, 0x00041009,
+    0x0005a00a, 0x9004300a, 0x0006c00c, 0x9007500c, 0x9006e00f,
+    0x0007700f, 0x90080011, 0x00099011, 0x00082012, 0x9009b012,
+    0x000b4014, 0x900ad014, 0x900b6017, 0x000af017, 0x000d8018,
+    0x900c1018, 0x900da01b, 0x000c301b, 0x900ec01d, 0x000f501d,
+    0x000ee01e, 0x900f701e, 0x90130021, 0x00129021, 0x00132022,
+    0x9012b022, 0x00104024, 0x9011d024, 0x90106027, 0x0011f027,
+    0x00168028, 0x90171028, 0x9016a02b, 0x0017302b, 0x9015c02d,
+    0x0014502d, 0x0015e02e, 0x9014702e, 0x001b0030, 0x901a9030,
+    0x901b2033, 0x001ab033, 0x90184035, 0x0019d035, 0x00186036,
+    0x9019f036, 0x901e8039, 0x001f1039, 0x001ea03a, 0x901f303a,
+    0x001dc03c, 0x901c503c, 0x901de03f, 0x001c703f, 0x90250041,
+    0x00249041, 0x00252042, 0x9024b042, 0x00264044, 0x9027d044,
+    0x90266047, 0x0027f047, 0x00208048, 0x90211048, 0x9020a04b,
+    0x0021304b, 0x9023c04d, 0x0022504d, 0x0023e04e, 0x9022704e,
+    0x002d0050, 0x902c9050, 0x902d2053, 0x002cb053, 0x902e4055,
+    0x002fd055, 0x002e6056, 0x902ff056, 0x90288059, 0x00291059,
+    0x0028a05a, 0x9029305a, 0x002bc05c, 0x902a505c, 0x902be05f,
+    0x002a705f, 0x00360060, 0x90379060, 0x90362063, 0x0037b063,
+    0x90354065, 0x0034d065, 0x00356066, 0x9034f066, 0x90338069,
+    0x00321069, 0x0033a06a, 0x9032306a, 0x0030c06c, 0x9031506c,
+    0x9030e06f, 0x0031706f, 0x903e0071, 0x003f9071, 0x003e2072,
+    0x903fb072, 0x003d4074, 0x903cd074, 0x903d6077, 0x003cf077,
+    0x003b8078, 0x903a1078, 0x903ba07b, 0x003a307b, 0x9038c07d,
+    0x0039507d, 0x0038e07e, 0x9039707e, 0x90490081, 0x00489081,
+    0x00492082, 0x9048b082, 0x004a4084, 0x904bd084, 0x904a6087,
+    0x004bf087, 0x004c8088, 0x904d1088, 0x904ca08b, 0x004d308b,
+    0x904fc08d, 0x004e508d, 0x004fe08e, 0x904e708e, 0x00410090,
+    0x90409090, 0x90412093, 0x0040b093, 0x90424095, 0x0043d095,
+    0x00426096, 0x9043f096, 0x90448099, 0x00451099, 0x0044a09a,
+    0x9045309a, 0x0047c09c, 0x9046509c, 0x9047e09f, 0x0046709f,
+    0x005a00a0, 0x905b90a0, 0x905a20a3, 0x005bb0a3, 0x905940a5,
+    0x0058d0a5, 0x005960a6, 0x9058f0a6, 0x905f80a9, 0x005e10a9,
+    0x005fa0aa, 0x905e30aa, 0x005cc0ac, 0x905d50ac, 0x905ce0af,
+    0x005d70af, 0x905200b1, 0x005390b1, 0x005220b2, 0x9053b0b2,
+    0x005140b4, 0x9050d0b4, 0x905160b7, 0x0050f0b7, 0x005780b8,
+    0x905610b8, 0x9057a0bb, 0x005630bb, 0x9054c0bd, 0x005550bd,
+    0x0054e0be, 0x905570be, 0x006c00c0, 0x906d90c0, 0x906c20c3,
+    0x006db0c3, 0x906f40c5, 0x006ed0c5, 0x006f60c6, 0x906ef0c6,
+    0x906980c9, 0x006810c9, 0x0069a0ca, 0x906830ca, 0x006ac0cc,
+    0x906b50cc, 0x906ae0cf, 0x006b70cf, 0x906400d1, 0x006590d1,
+    0x006420d2, 0x9065b0d2, 0x006740d4, 0x9066d0d4, 0x906760d7,
+    0x0066f0d7, 0x006180d8, 0x906010d8, 0x9061a0db, 0x006030db,
+    0x9062c0dd, 0x006350dd, 0x0062e0de, 0x906370de, 0x907f00e1,
+    0x007e90e1, 0x007f20e2, 0x907eb0e2, 0x007c40e4, 0x907dd0e4,
+    0x907c60e7, 0x007df0e7, 0x007a80e8, 0x907b10e8, 0x907aa0eb,
+    0x007b30eb, 0x9079c0ed, 0x007850ed, 0x0079e0ee, 0x907870ee,
+    0x007700f0, 0x907690f0, 0x907720f3, 0x0076b0f3, 0x907440f5,
+    0x0075d0f5, 0x007460f6, 0x9075f0f6, 0x907280f9, 0x007310f9,
+    0x0072a0fa, 0x907330fa, 0x0071c0fc, 0x907050fc, 0x9071e0ff,
+    0x007070ff},
+   {0x00000000, 0x90910101, 0x91210201, 0x01b00300, 0x92410401,
+    0x02d00500, 0x03600600, 0x93f10701, 0x94810801, 0x04100900,
+    0x05a00a00, 0x95310b01, 0x06c00c00, 0x96510d01, 0x97e10e01,
+    0x07700f00, 0x99011001, 0x09901100, 0x08201200, 0x98b11301,
+    0x0b401400, 0x9bd11501, 0x9a611601, 0x0af01700, 0x0d801800,
+    0x9d111901, 0x9ca11a01, 0x0c301b00, 0x9fc11c01, 0x0f501d00,
+    0x0ee01e00, 0x9e711f01, 0x82012001, 0x12902100, 0x13202200,
+    0x83b12301, 0x10402400, 0x80d12501, 0x81612601, 0x11f02700,
+    0x16802800, 0x86112901, 0x87a12a01, 0x17302b00, 0x84c12c01,
+    0x14502d00, 0x15e02e00, 0x85712f01, 0x1b003000, 0x8b913101,
+    0x8a213201, 0x1ab03300, 0x89413401, 0x19d03500, 0x18603600,
+    0x88f13701, 0x8f813801, 0x1f103900, 0x1ea03a00, 0x8e313b01,
+    0x1dc03c00, 0x8d513d01, 0x8ce13e01, 0x1c703f00, 0xb4014001,
+    0x24904100, 0x25204200, 0xb5b14301, 0x26404400, 0xb6d14501,
+    0xb7614601, 0x27f04700, 0x20804800, 0xb0114901, 0xb1a14a01,
+    0x21304b00, 0xb2c14c01, 0x22504d00, 0x23e04e00, 0xb3714f01,
+    0x2d005000, 0xbd915101, 0xbc215201, 0x2cb05300, 0xbf415401,
+    0x2fd05500, 0x2e605600, 0xbef15701, 0xb9815801, 0x29105900,
+    0x28a05a00, 0xb8315b01, 0x2bc05c00, 0xbb515d01, 0xbae15e01,
+    0x2a705f00, 0x36006000, 0xa6916101, 0xa7216201, 0x37b06300,
+    0xa4416401, 0x34d06500, 0x35606600, 0xa5f16701, 0xa2816801,
+    0x32106900, 0x33a06a00, 0xa3316b01, 0x30c06c00, 0xa0516d01,
+    0xa1e16e01, 0x31706f00, 0xaf017001, 0x3f907100, 0x3e207200,
+    0xaeb17301, 0x3d407400, 0xadd17501, 0xac617601, 0x3cf07700,
+    0x3b807800, 0xab117901, 0xaaa17a01, 0x3a307b00, 0xa9c17c01,
+    0x39507d00, 0x38e07e00, 0xa8717f01, 0xd8018001, 0x48908100,
+    0x49208200, 0xd9b18301, 0x4a408400, 0xdad18501, 0xdb618601,
+    0x4bf08700, 0x4c808800, 0xdc118901, 0xdda18a01, 0x4d308b00,
+    0xdec18c01, 0x4e508d00, 0x4fe08e00, 0xdf718f01, 0x41009000,
+    0xd1919101, 0xd0219201, 0x40b09300, 0xd3419401, 0x43d09500,
+    0x42609600, 0xd2f19701, 0xd5819801, 0x45109900, 0x44a09a00,
+    0xd4319b01, 0x47c09c00, 0xd7519d01, 0xd6e19e01, 0x46709f00,
+    0x5a00a000, 0xca91a101, 0xcb21a201, 0x5bb0a300, 0xc841a401,
+    0x58d0a500, 0x5960a600, 0xc9f1a701, 0xce81a801, 0x5e10a900,
+    0x5fa0aa00, 0xcf31ab01, 0x5cc0ac00, 0xcc51ad01, 0xcde1ae01,
+    0x5d70af00, 0xc301b001, 0x5390b100, 0x5220b200, 0xc2b1b301,
+    0x5140b400, 0xc1d1b501, 0xc061b601, 0x50f0b700, 0x5780b800,
+    0xc711b901, 0xc6a1ba01, 0x5630bb00, 0xc5c1bc01, 0x5550bd00,
+    0x54e0be00, 0xc471bf01, 0x6c00c000, 0xfc91c101, 0xfd21c201,
+    0x6db0c300, 0xfe41c401, 0x6ed0c500, 0x6f60c600, 0xfff1c701,
+    0xf881c801, 0x6810c900, 0x69a0ca00, 0xf931cb01, 0x6ac0cc00,
+    0xfa51cd01, 0xfbe1ce01, 0x6b70cf00, 0xf501d001, 0x6590d100,
+    0x6420d200, 0xf4b1d301, 0x6740d400, 0xf7d1d501, 0xf661d601,
+    0x66f0d700, 0x6180d800, 0xf111d901, 0xf0a1da01, 0x6030db00,
+    0xf3c1dc01, 0x6350dd00, 0x62e0de00, 0xf271df01, 0xee01e001,
+    0x7e90e100, 0x7f20e200, 0xefb1e301, 0x7c40e400, 0xecd1e501,
+    0xed61e601, 0x7df0e700, 0x7a80e800, 0xea11e901, 0xeba1ea01,
+    0x7b30eb00, 0xe8c1ec01, 0x7850ed00, 0x79e0ee00, 0xe971ef01,
+    0x7700f000, 0xe791f101, 0xe621f201, 0x76b0f300, 0xe541f401,
+    0x75d0f500, 0x7460f600, 0xe4f1f701, 0xe381f801, 0x7310f900,
+    0x72a0fa00, 0xe231fb01, 0x71c0fc00, 0xe151fd01, 0xe0e1fe01,
+    0x7070ff00}};
+
+static const word_t crc_braid_big_table[][256] = {
+   {0x00000000, 0x01019190, 0x01022191, 0x0003b001, 0x01044192,
+    0x0005d002, 0x00066003, 0x0107f193, 0x01088194, 0x00091004,
+    0x000aa005, 0x010b3195, 0x000cc006, 0x010d5196, 0x010ee197,
+    0x000f7007, 0x01100199, 0x00119009, 0x00122008, 0x0113b198,
+    0x0014400b, 0x0115d19b, 0x0116619a, 0x0017f00a, 0x0018800d,
+    0x0119119d, 0x011aa19c, 0x001b300c, 0x011cc19f, 0x001d500f,
+    0x001ee00e, 0x011f719e, 0x01200182, 0x00219012, 0x00222013,
+    0x0123b183, 0x00244010, 0x0125d180, 0x01266181, 0x0027f011,
+    0x00288016, 0x01291186, 0x012aa187, 0x002b3017, 0x012cc184,
+    0x002d5014, 0x002ee015, 0x012f7185, 0x0030001b, 0x0131918b,
+    0x0132218a, 0x0033b01a, 0x01344189, 0x0035d019, 0x00366018,
+    0x0137f188, 0x0138818f, 0x0039101f, 0x003aa01e, 0x013b318e,
+    0x003cc01d, 0x013d518d, 0x013ee18c, 0x003f701c, 0x014001b4,
+    0x00419024, 0x00422025, 0x0143b1b5, 0x00444026, 0x0145d1b6,
+    0x014661b7, 0x0047f027, 0x00488020, 0x014911b0, 0x014aa1b1,
+    0x004b3021, 0x014cc1b2, 0x004d5022, 0x004ee023, 0x014f71b3,
+    0x0050002d, 0x015191bd, 0x015221bc, 0x0053b02c, 0x015441bf,
+    0x0055d02f, 0x0056602e, 0x0157f1be, 0x015881b9, 0x00591029,
+    0x005aa028, 0x015b31b8, 0x005cc02b, 0x015d51bb, 0x015ee1ba,
+    0x005f702a, 0x00600036, 0x016191a6, 0x016221a7, 0x0063b037,
+    0x016441a4, 0x0065d034, 0x00666035, 0x0167f1a5, 0x016881a2,
+    0x00691032, 0x006aa033, 0x016b31a3, 0x006cc030, 0x016d51a0,
+    0x016ee1a1, 0x006f7031, 0x017001af, 0x0071903f, 0x0072203e,
+    0x0173b1ae, 0x0074403d, 0x0175d1ad, 0x017661ac, 0x0077f03c,
+    0x0078803b, 0x017911ab, 0x017aa1aa, 0x007b303a, 0x017cc1a9,
+    0x007d5039, 0x007ee038, 0x017f71a8, 0x018001d8, 0x00819048,
+    0x00822049, 0x0183b1d9, 0x0084404a, 0x0185d1da, 0x018661db,
+    0x0087f04b, 0x0088804c, 0x018911dc, 0x018aa1dd, 0x008b304d,
+    0x018cc1de, 0x008d504e, 0x008ee04f, 0x018f71df, 0x00900041,
+    0x019191d1, 0x019221d0, 0x0093b040, 0x019441d3, 0x0095d043,
+    0x00966042, 0x0197f1d2, 0x019881d5, 0x00991045, 0x009aa044,
+    0x019b31d4, 0x009cc047, 0x019d51d7, 0x019ee1d6, 0x009f7046,
+    0x00a0005a, 0x01a191ca, 0x01a221cb, 0x00a3b05b, 0x01a441c8,
+    0x00a5d058, 0x00a66059, 0x01a7f1c9, 0x01a881ce, 0x00a9105e,
+    0x00aaa05f, 0x01ab31cf, 0x00acc05c, 0x01ad51cc, 0x01aee1cd,
+    0x00af705d, 0x01b001c3, 0x00b19053, 0x00b22052, 0x01b3b1c2,
+    0x00b44051, 0x01b5d1c1, 0x01b661c0, 0x00b7f050, 0x00b88057,
+    0x01b911c7, 0x01baa1c6, 0x00bb3056, 0x01bcc1c5, 0x00bd5055,
+    0x00bee054, 0x01bf71c4, 0x00c0006c, 0x01c191fc, 0x01c221fd,
+    0x00c3b06d, 0x01c441fe, 0x00c5d06e, 0x00c6606f, 0x01c7f1ff,
+    0x01c881f8, 0x00c91068, 0x00caa069, 0x01cb31f9, 0x00ccc06a,
+    0x01cd51fa, 0x01cee1fb, 0x00cf706b, 0x01d001f5, 0x00d19065,
+    0x00d22064, 0x01d3b1f4, 0x00d44067, 0x01d5d1f7, 0x01d661f6,
+    0x00d7f066, 0x00d88061, 0x01d911f1, 0x01daa1f0, 0x00db3060,
+    0x01dcc1f3, 0x00dd5063, 0x00dee062, 0x01df71f2, 0x01e001ee,
+    0x00e1907e, 0x00e2207f, 0x01e3b1ef, 0x00e4407c, 0x01e5d1ec,
+    0x01e661ed, 0x00e7f07d, 0x00e8807a, 0x01e911ea, 0x01eaa1eb,
+    0x00eb307b, 0x01ecc1e8, 0x00ed5078, 0x00eee079, 0x01ef71e9,
+    0x00f00077, 0x01f191e7, 0x01f221e6, 0x00f3b076, 0x01f441e5,
+    0x00f5d075, 0x00f66074, 0x01f7f1e4, 0x01f881e3, 0x00f91073,
+    0x00faa072, 0x01fb31e2, 0x00fcc071, 0x01fd51e1, 0x01fee1e0,
+    0x00ff7070},
+   {0x00000000, 0x00900190, 0x03200090, 0x03b00100, 0x05400390,
+    0x05d00200, 0x06600300, 0x06f00290, 0x09800590, 0x09100400,
+    0x0aa00500, 0x0a300490, 0x0cc00600, 0x0c500790, 0x0fe00690,
+    0x0f700700, 0x11000890, 0x11900900, 0x12200800, 0x12b00990,
+    0x14400b00, 0x14d00a90, 0x17600b90, 0x17f00a00, 0x18800d00,
+    0x18100c90, 0x1ba00d90, 0x1b300c00, 0x1dc00e90, 0x1d500f00,
+    0x1ee00e00, 0x1e700f90, 0x21001390, 0x21901200, 0x22201300,
+    0x22b01290, 0x24401000, 0x24d01190, 0x27601090, 0x27f01100,
+    0x28801600, 0x28101790, 0x2ba01690, 0x2b301700, 0x2dc01590,
+    0x2d501400, 0x2ee01500, 0x2e701490, 0x30001b00, 0x30901a90,
+    0x33201b90, 0x33b01a00, 0x35401890, 0x35d01900, 0x36601800,
+    0x36f01990, 0x39801e90, 0x39101f00, 0x3aa01e00, 0x3a301f90,
+    0x3cc01d00, 0x3c501c90, 0x3fe01d90, 0x3f701c00, 0x41002590,
+    0x41902400, 0x42202500, 0x42b02490, 0x44402600, 0x44d02790,
+    0x47602690, 0x47f02700, 0x48802000, 0x48102190, 0x4ba02090,
+    0x4b302100, 0x4dc02390, 0x4d502200, 0x4ee02300, 0x4e702290,
+    0x50002d00, 0x50902c90, 0x53202d90, 0x53b02c00, 0x55402e90,
+    0x55d02f00, 0x56602e00, 0x56f02f90, 0x59802890, 0x59102900,
+    0x5aa02800, 0x5a302990, 0x5cc02b00, 0x5c502a90, 0x5fe02b90,
+    0x5f702a00, 0x60003600, 0x60903790, 0x63203690, 0x63b03700,
+    0x65403590, 0x65d03400, 0x66603500, 0x66f03490, 0x69803390,
+    0x69103200, 0x6aa03300, 0x6a303290, 0x6cc03000, 0x6c503190,
+    0x6fe03090, 0x6f703100, 0x71003e90, 0x71903f00, 0x72203e00,
+    0x72b03f90, 0x74403d00, 0x74d03c90, 0x77603d90, 0x77f03c00,
+    0x78803b00, 0x78103a90, 0x7ba03b90, 0x7b303a00, 0x7dc03890,
+    0x7d503900, 0x7ee03800, 0x7e703990, 0x81004990, 0x81904800,
+    0x82204900, 0x82b04890, 0x84404a00, 0x84d04b90, 0x87604a90,
+    0x87f04b00, 0x88804c00, 0x88104d90, 0x8ba04c90, 0x8b304d00,
+    0x8dc04f90, 0x8d504e00, 0x8ee04f00, 0x8e704e90, 0x90004100,
+    0x90904090, 0x93204190, 0x93b04000, 0x95404290, 0x95d04300,
+    0x96604200, 0x96f04390, 0x99804490, 0x99104500, 0x9aa04400,
+    0x9a304590, 0x9cc04700, 0x9c504690, 0x9fe04790, 0x9f704600,
+    0xa0005a00, 0xa0905b90, 0xa3205a90, 0xa3b05b00, 0xa5405990,
+    0xa5d05800, 0xa6605900, 0xa6f05890, 0xa9805f90, 0xa9105e00,
+    0xaaa05f00, 0xaa305e90, 0xacc05c00, 0xac505d90, 0xafe05c90,
+    0xaf705d00, 0xb1005290, 0xb1905300, 0xb2205200, 0xb2b05390,
+    0xb4405100, 0xb4d05090, 0xb7605190, 0xb7f05000, 0xb8805700,
+    0xb8105690, 0xbba05790, 0xbb305600, 0xbdc05490, 0xbd505500,
+    0xbee05400, 0xbe705590, 0xc0006c00, 0xc0906d90, 0xc3206c90,
+    0xc3b06d00, 0xc5406f90, 0xc5d06e00, 0xc6606f00, 0xc6f06e90,
+    0xc9806990, 0xc9106800, 0xcaa06900, 0xca306890, 0xccc06a00,
+    0xcc506b90, 0xcfe06a90, 0xcf706b00, 0xd1006490, 0xd1906500,
+    0xd2206400, 0xd2b06590, 0xd4406700, 0xd4d06690, 0xd7606790,
+    0xd7f06600, 0xd8806100, 0xd8106090, 0xdba06190, 0xdb306000,
+    0xddc06290, 0xdd506300, 0xdee06200, 0xde706390, 0xe1007f90,
+    0xe1907e00, 0xe2207f00, 0xe2b07e90, 0xe4407c00, 0xe4d07d90,
+    0xe7607c90, 0xe7f07d00, 0xe8807a00, 0xe8107b90, 0xeba07a90,
+    0xeb307b00, 0xedc07990, 0xed507800, 0xeee07900, 0xee707890,
+    0xf0007700, 0xf0907690, 0xf3207790, 0xf3b07600, 0xf5407490,
+    0xf5d07500, 0xf6607400, 0xf6f07590, 0xf9807290, 0xf9107300,
+    0xfaa07200, 0xfa307390, 0xfcc07100, 0xfc507090, 0xffe07190,
+    0xff707000},
+   {0x00000000, 0x90019000, 0x20032001, 0xb002b001, 0x40064002,
+    0xd007d002, 0x60056003, 0xf004f003, 0x800c8004, 0x100d1004,
+    0xa00fa005, 0x300e3005, 0xc00ac006, 0x500b5006, 0xe009e007,
+    0x70087007, 0x00190009, 0x90189009, 0x201a2008, 0xb01bb008,
+    0x401f400b, 0xd01ed00b, 0x601c600a, 0xf01df00a, 0x8015800d,
+    0x1014100d, 0xa016a00c, 0x3017300c, 0xc013c00f, 0x5012500f,
+    0xe010e00e, 0x7011700e, 0x00320012, 0x90339012, 0x20312013,
+    0xb030b013, 0x40344010, 0xd035d010, 0x60376011, 0xf036f011,
+    0x803e8016, 0x103f1016, 0xa03da017, 0x303c3017, 0xc038c014,
+    0x50395014, 0xe03be015, 0x703a7015, 0x002b001b, 0x902a901b,
+    0x2028201a, 0xb029b01a, 0x402d4019, 0xd02cd019, 0x602e6018,
+    0xf02ff018, 0x8027801f, 0x1026101f, 0xa024a01e, 0x3025301e,
+    0xc021c01d, 0x5020501d, 0xe022e01c, 0x7023701c, 0x00640024,
+    0x90659024, 0x20672025, 0xb066b025, 0x40624026, 0xd063d026,
+    0x60616027, 0xf060f027, 0x80688020, 0x10691020, 0xa06ba021,
+    0x306a3021, 0xc06ec022, 0x506f5022, 0xe06de023, 0x706c7023,
+    0x007d002d, 0x907c902d, 0x207e202c, 0xb07fb02c, 0x407b402f,
+    0xd07ad02f, 0x6078602e, 0xf079f02e, 0x80718029, 0x10701029,
+    0xa072a028, 0x30733028, 0xc077c02b, 0x5076502b, 0xe074e02a,
+    0x7075702a, 0x00560036, 0x90579036, 0x20552037, 0xb054b037,
+    0x40504034, 0xd051d034, 0x60536035, 0xf052f035, 0x805a8032,
+    0x105b1032, 0xa059a033, 0x30583033, 0xc05cc030, 0x505d5030,
+    0xe05fe031, 0x705e7031, 0x004f003f, 0x904e903f, 0x204c203e,
+    0xb04db03e, 0x4049403d, 0xd048d03d, 0x604a603c, 0xf04bf03c,
+    0x8043803b, 0x1042103b, 0xa040a03a, 0x3041303a, 0xc045c039,
+    0x50445039, 0xe046e038, 0x70477038, 0x00c80048, 0x90c99048,
+    0x20cb2049, 0xb0cab049, 0x40ce404a, 0xd0cfd04a, 0x60cd604b,
+    0xf0ccf04b, 0x80c4804c, 0x10c5104c, 0xa0c7a04d, 0x30c6304d,
+    0xc0c2c04e, 0x50c3504e, 0xe0c1e04f, 0x70c0704f, 0x00d10041,
+    0x90d09041, 0x20d22040, 0xb0d3b040, 0x40d74043, 0xd0d6d043,
+    0x60d46042, 0xf0d5f042, 0x80dd8045, 0x10dc1045, 0xa0dea044,
+    0x30df3044, 0xc0dbc047, 0x50da5047, 0xe0d8e046, 0x70d97046,
+    0x00fa005a, 0x90fb905a, 0x20f9205b, 0xb0f8b05b, 0x40fc4058,
+    0xd0fdd058, 0x60ff6059, 0xf0fef059, 0x80f6805e, 0x10f7105e,
+    0xa0f5a05f, 0x30f4305f, 0xc0f0c05c, 0x50f1505c, 0xe0f3e05d,
+    0x70f2705d, 0x00e30053, 0x90e29053, 0x20e02052, 0xb0e1b052,
+    0x40e54051, 0xd0e4d051, 0x60e66050, 0xf0e7f050, 0x80ef8057,
+    0x10ee1057, 0xa0eca056, 0x30ed3056, 0xc0e9c055, 0x50e85055,
+    0xe0eae054, 0x70eb7054, 0x00ac006c, 0x90ad906c, 0x20af206d,
+    0xb0aeb06d, 0x40aa406e, 0xd0abd06e, 0x60a9606f, 0xf0a8f06f,
+    0x80a08068, 0x10a11068, 0xa0a3a069, 0x30a23069, 0xc0a6c06a,
+    0x50a7506a, 0xe0a5e06b, 0x70a4706b, 0x00b50065, 0x90b49065,
+    0x20b62064, 0xb0b7b064, 0x40b34067, 0xd0b2d067, 0x60b06066,
+    0xf0b1f066, 0x80b98061, 0x10b81061, 0xa0baa060, 0x30bb3060,
+    0xc0bfc063, 0x50be5063, 0xe0bce062, 0x70bd7062, 0x009e007e,
+    0x909f907e, 0x209d207f, 0xb09cb07f, 0x4098407c, 0xd099d07c,
+    0x609b607d, 0xf09af07d, 0x8092807a, 0x1093107a, 0xa091a07b,
+    0x3090307b, 0xc094c078, 0x50955078, 0xe097e079, 0x70967079,
+    0x00870077, 0x90869077, 0x20842076, 0xb085b076, 0x40814075,
+    0xd080d075, 0x60826074, 0xf083f074, 0x808b8073, 0x108a1073,
+    0xa088a072, 0x30893072, 0xc08dc071, 0x508c5071, 0xe08ee070,
+    0x708f7070},
+   {0x00000000, 0x01000041, 0x02000082, 0x030000c3, 0x070003b4,
+    0x060003f5, 0x05000336, 0x04000377, 0x0d0005d8, 0x0c000599,
+    0x0f00055a, 0x0e00051b, 0x0a00066c, 0x0b00062d, 0x080006ee,
+    0x090006af, 0x19000900, 0x18000941, 0x1b000982, 0x1a0009c3,
+    0x1e000ab4, 0x1f000af5, 0x1c000a36, 0x1d000a77, 0x14000cd8,
+    0x15000c99, 0x16000c5a, 0x17000c1b, 0x13000f6c, 0x12000f2d,
+    0x11000fee, 0x10000faf, 0x32001200, 0x33001241, 0x30001282,
+    0x310012c3, 0x350011b4, 0x340011f5, 0x37001136, 0x36001177,
+    0x3f0017d8, 0x3e001799, 0x3d00175a, 0x3c00171b, 0x3800146c,
+    0x3900142d, 0x3a0014ee, 0x3b0014af, 0x2b001b00, 0x2a001b41,
+    0x29001b82, 0x28001bc3, 0x2c0018b4, 0x2d0018f5, 0x2e001836,
+    0x2f001877, 0x26001ed8, 0x27001e99, 0x24001e5a, 0x25001e1b,
+    0x21001d6c, 0x20001d2d, 0x23001dee, 0x22001daf, 0x64002400,
+    0x65002441, 0x66002482, 0x670024c3, 0x630027b4, 0x620027f5,
+    0x61002736, 0x60002777, 0x690021d8, 0x68002199, 0x6b00215a,
+    0x6a00211b, 0x6e00226c, 0x6f00222d, 0x6c0022ee, 0x6d0022af,
+    0x7d002d00, 0x7c002d41, 0x7f002d82, 0x7e002dc3, 0x7a002eb4,
+    0x7b002ef5, 0x78002e36, 0x79002e77, 0x700028d8, 0x71002899,
+    0x7200285a, 0x7300281b, 0x77002b6c, 0x76002b2d, 0x75002bee,
+    0x74002baf, 0x56003600, 0x57003641, 0x54003682, 0x550036c3,
+    0x510035b4, 0x500035f5, 0x53003536, 0x52003577, 0x5b0033d8,
+    0x5a003399, 0x5900335a, 0x5800331b, 0x5c00306c, 0x5d00302d,
+    0x5e0030ee, 0x5f0030af, 0x4f003f00, 0x4e003f41, 0x4d003f82,
+    0x4c003fc3, 0x48003cb4, 0x49003cf5, 0x4a003c36, 0x4b003c77,
+    0x42003ad8, 0x43003a99, 0x40003a5a, 0x41003a1b, 0x4500396c,
+    0x4400392d, 0x470039ee, 0x460039af, 0xc8004800, 0xc9004841,
+    0xca004882, 0xcb0048c3, 0xcf004bb4, 0xce004bf5, 0xcd004b36,
+    0xcc004b77, 0xc5004dd8, 0xc4004d99, 0xc7004d5a, 0xc6004d1b,
+    0xc2004e6c, 0xc3004e2d, 0xc0004eee, 0xc1004eaf, 0xd1004100,
+    0xd0004141, 0xd3004182, 0xd20041c3, 0xd60042b4, 0xd70042f5,
+    0xd4004236, 0xd5004277, 0xdc0044d8, 0xdd004499, 0xde00445a,
+    0xdf00441b, 0xdb00476c, 0xda00472d, 0xd90047ee, 0xd80047af,
+    0xfa005a00, 0xfb005a41, 0xf8005a82, 0xf9005ac3, 0xfd0059b4,
+    0xfc0059f5, 0xff005936, 0xfe005977, 0xf7005fd8, 0xf6005f99,
+    0xf5005f5a, 0xf4005f1b, 0xf0005c6c, 0xf1005c2d, 0xf2005cee,
+    0xf3005caf, 0xe3005300, 0xe2005341, 0xe1005382, 0xe00053c3,
+    0xe40050b4, 0xe50050f5, 0xe6005036, 0xe7005077, 0xee0056d8,
+    0xef005699, 0xec00565a, 0xed00561b, 0xe900556c, 0xe800552d,
+    0xeb0055ee, 0xea0055af, 0xac006c00, 0xad006c41, 0xae006c82,
+    0xaf006cc3, 0xab006fb4, 0xaa006ff5, 0xa9006f36, 0xa8006f77,
+    0xa10069d8, 0xa0006999, 0xa300695a, 0xa200691b, 0xa6006a6c,
+    0xa7006a2d, 0xa4006aee, 0xa5006aaf, 0xb5006500, 0xb4006541,
+    0xb7006582, 0xb60065c3, 0xb20066b4, 0xb30066f5, 0xb0006636,
+    0xb1006677, 0xb80060d8, 0xb9006099, 0xba00605a, 0xbb00601b,
+    0xbf00636c, 0xbe00632d, 0xbd0063ee, 0xbc0063af, 0x9e007e00,
+    0x9f007e41, 0x9c007e82, 0x9d007ec3, 0x99007db4, 0x98007df5,
+    0x9b007d36, 0x9a007d77, 0x93007bd8, 0x92007b99, 0x91007b5a,
+    0x90007b1b, 0x9400786c, 0x9500782d, 0x960078ee, 0x970078af,
+    0x87007700, 0x86007741, 0x85007782, 0x840077c3, 0x800074b4,
+    0x810074f5, 0x82007436, 0x83007477, 0x8a0072d8, 0x8b007299,
+    0x8800725a, 0x8900721b, 0x8d00716c, 0x8c00712d, 0x8f0071ee,
+    0x8e0071af}};
+
+#endif
+
+#endif
+
+#if N == 2
+
+#if W == 8
+
+static const crc_t crc_braid_table[][256] = {
+   {0x00000000, 0x6c90c100, 0xd9218200, 0xb5b14300, 0x02400403,
+    0x6ed0c503, 0xdb618603, 0xb7f14703, 0x04800806, 0x6810c906,
+    0xdda18a06, 0xb1314b06, 0x06c00c05, 0x6a50cd05, 0xdfe18e05,
+    0xb3714f05, 0x0900100c, 0x6590d10c, 0xd021920c, 0xbcb1530c,
+    0x0b40140f, 0x67d0d50f, 0xd261960f, 0xbef1570f, 0x0d80180a,
+    0x6110d90a, 0xd4a19a0a, 0xb8315b0a, 0x0fc01c09, 0x6350dd09,
+    0xd6e19e09, 0xba715f09, 0x12002018, 0x7e90e118, 0xcb21a218,
+    0xa7b16318, 0x1040241b, 0x7cd0e51b, 0xc961a61b, 0xa5f1671b,
+    0x1680281e, 0x7a10e91e, 0xcfa1aa1e, 0xa3316b1e, 0x14c02c1d,
+    0x7850ed1d, 0xcde1ae1d, 0xa1716f1d, 0x1b003014, 0x7790f114,
+    0xc221b214, 0xaeb17314, 0x19403417, 0x75d0f517, 0xc061b617,
+    0xacf17717, 0x1f803812, 0x7310f912, 0xc6a1ba12, 0xaa317b12,
+    0x1dc03c11, 0x7150fd11, 0xc4e1be11, 0xa8717f11, 0x24004030,
+    0x48908130, 0xfd21c230, 0x91b10330, 0x26404433, 0x4ad08533,
+    0xff61c633, 0x93f10733, 0x20804836, 0x4c108936, 0xf9a1ca36,
+    0x95310b36, 0x22c04c35, 0x4e508d35, 0xfbe1ce35, 0x97710f35,
+    0x2d00503c, 0x4190913c, 0xf421d23c, 0x98b1133c, 0x2f40543f,
+    0x43d0953f, 0xf661d63f, 0x9af1173f, 0x2980583a, 0x4510993a,
+    0xf0a1da3a, 0x9c311b3a, 0x2bc05c39, 0x47509d39, 0xf2e1de39,
+    0x9e711f39, 0x36006028, 0x5a90a128, 0xef21e228, 0x83b12328,
+    0x3440642b, 0x58d0a52b, 0xed61e62b, 0x81f1272b, 0x3280682e,
+    0x5e10a92e, 0xeba1ea2e, 0x87312b2e, 0x30c06c2d, 0x5c50ad2d,
+    0xe9e1ee2d, 0x85712f2d, 0x3f007024, 0x5390b124, 0xe621f224,
+    0x8ab13324, 0x3d407427, 0x51d0b527, 0xe461f627, 0x88f13727,
+    0x3b807822, 0x5710b922, 0xe2a1fa22, 0x8e313b22, 0x39c07c21,
+    0x5550bd21, 0xe0e1fe21, 0x8c713f21, 0x48008060, 0x24904160,
+    0x91210260, 0xfdb1c360, 0x4a408463, 0x26d04563, 0x93610663,
+    0xfff1c763, 0x4c808866, 0x20104966, 0x95a10a66, 0xf931cb66,
+    0x4ec08c65, 0x22504d65, 0x97e10e65, 0xfb71cf65, 0x4100906c,
+    0x2d90516c, 0x9821126c, 0xf4b1d36c, 0x4340946f, 0x2fd0556f,
+    0x9a61166f, 0xf6f1d76f, 0x4580986a, 0x2910596a, 0x9ca11a6a,
+    0xf031db6a, 0x47c09c69, 0x2b505d69, 0x9ee11e69, 0xf271df69,
+    0x5a00a078, 0x36906178, 0x83212278, 0xefb1e378, 0x5840a47b,
+    0x34d0657b, 0x8161267b, 0xedf1e77b, 0x5e80a87e, 0x3210697e,
+    0x87a12a7e, 0xeb31eb7e, 0x5cc0ac7d, 0x30506d7d, 0x85e12e7d,
+    0xe971ef7d, 0x5300b074, 0x3f907174, 0x8a213274, 0xe6b1f374,
+    0x5140b477, 0x3dd07577, 0x88613677, 0xe4f1f777, 0x5780b872,
+    0x3b107972, 0x8ea13a72, 0xe231fb72, 0x55c0bc71, 0x39507d71,
+    0x8ce13e71, 0xe071ff71, 0x6c00c050, 0x00900150, 0xb5214250,
+    0xd9b18350, 0x6e40c453, 0x02d00553, 0xb7614653, 0xdbf18753,
+    0x6880c856, 0x04100956, 0xb1a14a56, 0xdd318b56, 0x6ac0cc55,
+    0x06500d55, 0xb3e14e55, 0xdf718f55, 0x6500d05c, 0x0990115c,
+    0xbc21525c, 0xd0b1935c, 0x6740d45f, 0x0bd0155f, 0xbe61565f,
+    0xd2f1975f, 0x6180d85a, 0x0d10195a, 0xb8a15a5a, 0xd4319b5a,
+    0x63c0dc59, 0x0f501d59, 0xbae15e59, 0xd6719f59, 0x7e00e048,
+    0x12902148, 0xa7216248, 0xcbb1a348, 0x7c40e44b, 0x10d0254b,
+    0xa561664b, 0xc9f1a74b, 0x7a80e84e, 0x1610294e, 0xa3a16a4e,
+    0xcf31ab4e, 0x78c0ec4d, 0x14502d4d, 0xa1e16e4d, 0xcd71af4d,
+    0x7700f044, 0x1b903144, 0xae217244, 0xc2b1b344, 0x7540f447,
+    0x19d03547, 0xac617647, 0xc0f1b747, 0x7380f842, 0x1f103942,
+    0xaaa17a42, 0xc631bb42, 0x71c0fc41, 0x1d503d41, 0xa8e17e41,
+    0xc471bf41},
+   {0x00000000, 0x900100c0, 0x90010183, 0x00000143, 0x90010305,
+    0x000003c5, 0x00000286, 0x90010246, 0x90010609, 0x000006c9,
+    0x0000078a, 0x9001074a, 0x0000050c, 0x900105cc, 0x9001048f,
+    0x0000044f, 0x90010c11, 0x00000cd1, 0x00000d92, 0x90010d52,
+    0x00000f14, 0x90010fd4, 0x90010e97, 0x00000e57, 0x00000a18,
+    0x90010ad8, 0x90010b9b, 0x00000b5b, 0x9001091d, 0x000009dd,
+    0x0000089e, 0x9001085e, 0x90011821, 0x000018e1, 0x000019a2,
+    0x90011962, 0x00001b24, 0x90011be4, 0x90011aa7, 0x00001a67,
+    0x00001e28, 0x90011ee8, 0x90011fab, 0x00001f6b, 0x90011d2d,
+    0x00001ded, 0x00001cae, 0x90011c6e, 0x00001430, 0x900114f0,
+    0x900115b3, 0x00001573, 0x90011735, 0x000017f5, 0x000016b6,
+    0x90011676, 0x90011239, 0x000012f9, 0x000013ba, 0x9001137a,
+    0x0000113c, 0x900111fc, 0x900110bf, 0x0000107f, 0x90013041,
+    0x00003081, 0x000031c2, 0x90013102, 0x00003344, 0x90013384,
+    0x900132c7, 0x00003207, 0x00003648, 0x90013688, 0x900137cb,
+    0x0000370b, 0x9001354d, 0x0000358d, 0x000034ce, 0x9001340e,
+    0x00003c50, 0x90013c90, 0x90013dd3, 0x00003d13, 0x90013f55,
+    0x00003f95, 0x00003ed6, 0x90013e16, 0x90013a59, 0x00003a99,
+    0x00003bda, 0x90013b1a, 0x0000395c, 0x9001399c, 0x900138df,
+    0x0000381f, 0x00002860, 0x900128a0, 0x900129e3, 0x00002923,
+    0x90012b65, 0x00002ba5, 0x00002ae6, 0x90012a26, 0x90012e69,
+    0x00002ea9, 0x00002fea, 0x90012f2a, 0x00002d6c, 0x90012dac,
+    0x90012cef, 0x00002c2f, 0x90012471, 0x000024b1, 0x000025f2,
+    0x90012532, 0x00002774, 0x900127b4, 0x900126f7, 0x00002637,
+    0x00002278, 0x900122b8, 0x900123fb, 0x0000233b, 0x9001217d,
+    0x000021bd, 0x000020fe, 0x9001203e, 0x90016081, 0x00006041,
+    0x00006102, 0x900161c2, 0x00006384, 0x90016344, 0x90016207,
+    0x000062c7, 0x00006688, 0x90016648, 0x9001670b, 0x000067cb,
+    0x9001658d, 0x0000654d, 0x0000640e, 0x900164ce, 0x00006c90,
+    0x90016c50, 0x90016d13, 0x00006dd3, 0x90016f95, 0x00006f55,
+    0x00006e16, 0x90016ed6, 0x90016a99, 0x00006a59, 0x00006b1a,
+    0x90016bda, 0x0000699c, 0x9001695c, 0x9001681f, 0x000068df,
+    0x000078a0, 0x90017860, 0x90017923, 0x000079e3, 0x90017ba5,
+    0x00007b65, 0x00007a26, 0x90017ae6, 0x90017ea9, 0x00007e69,
+    0x00007f2a, 0x90017fea, 0x00007dac, 0x90017d6c, 0x90017c2f,
+    0x00007cef, 0x900174b1, 0x00007471, 0x00007532, 0x900175f2,
+    0x000077b4, 0x90017774, 0x90017637, 0x000076f7, 0x000072b8,
+    0x90017278, 0x9001733b, 0x000073fb, 0x900171bd, 0x0000717d,
+    0x0000703e, 0x900170fe, 0x000050c0, 0x90015000, 0x90015143,
+    0x00005183, 0x900153c5, 0x00005305, 0x00005246, 0x90015286,
+    0x900156c9, 0x00005609, 0x0000574a, 0x9001578a, 0x000055cc,
+    0x9001550c, 0x9001544f, 0x0000548f, 0x90015cd1, 0x00005c11,
+    0x00005d52, 0x90015d92, 0x00005fd4, 0x90015f14, 0x90015e57,
+    0x00005e97, 0x00005ad8, 0x90015a18, 0x90015b5b, 0x00005b9b,
+    0x900159dd, 0x0000591d, 0x0000585e, 0x9001589e, 0x900148e1,
+    0x00004821, 0x00004962, 0x900149a2, 0x00004be4, 0x90014b24,
+    0x90014a67, 0x00004aa7, 0x00004ee8, 0x90014e28, 0x90014f6b,
+    0x00004fab, 0x90014ded, 0x00004d2d, 0x00004c6e, 0x90014cae,
+    0x000044f0, 0x90014430, 0x90014573, 0x000045b3, 0x900147f5,
+    0x00004735, 0x00004676, 0x900146b6, 0x900142f9, 0x00004239,
+    0x0000437a, 0x900143ba, 0x000041fc, 0x9001413c, 0x9001407f,
+    0x000040bf},
+   {0x00000000, 0x9001c101, 0x90008201, 0x00014300, 0x90020401,
+    0x0003c500, 0x00028600, 0x90034701, 0x90070801, 0x0006c900,
+    0x00078a00, 0x90064b01, 0x00050c00, 0x9004cd01, 0x90058e01,
+    0x00044f00, 0x900d1001, 0x000cd100, 0x000d9200, 0x900c5301,
+    0x000f1400, 0x900ed501, 0x900f9601, 0x000e5700, 0x000a1800,
+    0x900bd901, 0x900a9a01, 0x000b5b00, 0x90081c01, 0x0009dd00,
+    0x00089e00, 0x90095f01, 0x90192001, 0x0018e100, 0x0019a200,
+    0x90186301, 0x001b2400, 0x901ae501, 0x901ba601, 0x001a6700,
+    0x001e2800, 0x901fe901, 0x901eaa01, 0x001f6b00, 0x901c2c01,
+    0x001ded00, 0x001cae00, 0x901d6f01, 0x00143000, 0x9015f101,
+    0x9014b201, 0x00157300, 0x90163401, 0x0017f500, 0x0016b600,
+    0x90177701, 0x90133801, 0x0012f900, 0x0013ba00, 0x90127b01,
+    0x00113c00, 0x9010fd01, 0x9011be01, 0x00107f00, 0x90314001,
+    0x00308100, 0x0031c200, 0x90300301, 0x00334400, 0x90328501,
+    0x9033c601, 0x00320700, 0x00364800, 0x90378901, 0x9036ca01,
+    0x00370b00, 0x90344c01, 0x00358d00, 0x0034ce00, 0x90350f01,
+    0x003c5000, 0x903d9101, 0x903cd201, 0x003d1300, 0x903e5401,
+    0x003f9500, 0x003ed600, 0x903f1701, 0x903b5801, 0x003a9900,
+    0x003bda00, 0x903a1b01, 0x00395c00, 0x90389d01, 0x9039de01,
+    0x00381f00, 0x00286000, 0x9029a101, 0x9028e201, 0x00292300,
+    0x902a6401, 0x002ba500, 0x002ae600, 0x902b2701, 0x902f6801,
+    0x002ea900, 0x002fea00, 0x902e2b01, 0x002d6c00, 0x902cad01,
+    0x902dee01, 0x002c2f00, 0x90257001, 0x0024b100, 0x0025f200,
+    0x90243301, 0x00277400, 0x9026b501, 0x9027f601, 0x00263700,
+    0x00227800, 0x9023b901, 0x9022fa01, 0x00233b00, 0x90207c01,
+    0x0021bd00, 0x0020fe00, 0x90213f01, 0x90618001, 0x00604100,
+    0x00610200, 0x9060c301, 0x00638400, 0x90624501, 0x90630601,
+    0x0062c700, 0x00668800, 0x90674901, 0x90660a01, 0x0067cb00,
+    0x90648c01, 0x00654d00, 0x00640e00, 0x9065cf01, 0x006c9000,
+    0x906d5101, 0x906c1201, 0x006dd300, 0x906e9401, 0x006f5500,
+    0x006e1600, 0x906fd701, 0x906b9801, 0x006a5900, 0x006b1a00,
+    0x906adb01, 0x00699c00, 0x90685d01, 0x90691e01, 0x0068df00,
+    0x0078a000, 0x90796101, 0x90782201, 0x0079e300, 0x907aa401,
+    0x007b6500, 0x007a2600, 0x907be701, 0x907fa801, 0x007e6900,
+    0x007f2a00, 0x907eeb01, 0x007dac00, 0x907c6d01, 0x907d2e01,
+    0x007cef00, 0x9075b001, 0x00747100, 0x00753200, 0x9074f301,
+    0x0077b400, 0x90767501, 0x90773601, 0x0076f700, 0x0072b800,
+    0x90737901, 0x90723a01, 0x0073fb00, 0x9070bc01, 0x00717d00,
+    0x00703e00, 0x9071ff01, 0x0050c000, 0x90510101, 0x90504201,
+    0x00518300, 0x9052c401, 0x00530500, 0x00524600, 0x90538701,
+    0x9057c801, 0x00560900, 0x00574a00, 0x90568b01, 0x0055cc00,
+    0x90540d01, 0x90554e01, 0x00548f00, 0x905dd001, 0x005c1100,
+    0x005d5200, 0x905c9301, 0x005fd400, 0x905e1501, 0x905f5601,
+    0x005e9700, 0x005ad800, 0x905b1901, 0x905a5a01, 0x005b9b00,
+    0x9058dc01, 0x00591d00, 0x00585e00, 0x90599f01, 0x9049e001,
+    0x00482100, 0x00496200, 0x9048a301, 0x004be400, 0x904a2501,
+    0x904b6601, 0x004aa700, 0x004ee800, 0x904f2901, 0x904e6a01,
+    0x004fab00, 0x904cec01, 0x004d2d00, 0x004c6e00, 0x904daf01,
+    0x0044f000, 0x90453101, 0x90447201, 0x0045b300, 0x9046f401,
+    0x00473500, 0x00467600, 0x9047b701, 0x9043f801, 0x00423900,
+    0x00437a00, 0x9042bb01, 0x0041fc00, 0x90403d01, 0x90417e01,
+    0x0040bf00},
+   {0x00000000, 0x90c00001, 0x91830001, 0x01430000, 0x93050001,
+    0x03c50000, 0x02860000, 0x92460001, 0x96090001, 0x06c90000,
+    0x078a0000, 0x974a0001, 0x050c0000, 0x95cc0001, 0x948f0001,
+    0x044f0000, 0x9c110001, 0x0cd10000, 0x0d920000, 0x9d520001,
+    0x0f140000, 0x9fd40001, 0x9e970001, 0x0e570000, 0x0a180000,
+    0x9ad80001, 0x9b9b0001, 0x0b5b0000, 0x991d0001, 0x09dd0000,
+    0x089e0000, 0x985e0001, 0x88210001, 0x18e10000, 0x19a20000,
+    0x89620001, 0x1b240000, 0x8be40001, 0x8aa70001, 0x1a670000,
+    0x1e280000, 0x8ee80001, 0x8fab0001, 0x1f6b0000, 0x8d2d0001,
+    0x1ded0000, 0x1cae0000, 0x8c6e0001, 0x14300000, 0x84f00001,
+    0x85b30001, 0x15730000, 0x87350001, 0x17f50000, 0x16b60000,
+    0x86760001, 0x82390001, 0x12f90000, 0x13ba0000, 0x837a0001,
+    0x113c0000, 0x81fc0001, 0x80bf0001, 0x107f0000, 0xa0410001,
+    0x30810000, 0x31c20000, 0xa1020001, 0x33440000, 0xa3840001,
+    0xa2c70001, 0x32070000, 0x36480000, 0xa6880001, 0xa7cb0001,
+    0x370b0000, 0xa54d0001, 0x358d0000, 0x34ce0000, 0xa40e0001,
+    0x3c500000, 0xac900001, 0xadd30001, 0x3d130000, 0xaf550001,
+    0x3f950000, 0x3ed60000, 0xae160001, 0xaa590001, 0x3a990000,
+    0x3bda0000, 0xab1a0001, 0x395c0000, 0xa99c0001, 0xa8df0001,
+    0x381f0000, 0x28600000, 0xb8a00001, 0xb9e30001, 0x29230000,
+    0xbb650001, 0x2ba50000, 0x2ae60000, 0xba260001, 0xbe690001,
+    0x2ea90000, 0x2fea0000, 0xbf2a0001, 0x2d6c0000, 0xbdac0001,
+    0xbcef0001, 0x2c2f0000, 0xb4710001, 0x24b10000, 0x25f20000,
+    0xb5320001, 0x27740000, 0xb7b40001, 0xb6f70001, 0x26370000,
+    0x22780000, 0xb2b80001, 0xb3fb0001, 0x233b0000, 0xb17d0001,
+    0x21bd0000, 0x20fe0000, 0xb03e0001, 0xf0810001, 0x60410000,
+    0x61020000, 0xf1c20001, 0x63840000, 0xf3440001, 0xf2070001,
+    0x62c70000, 0x66880000, 0xf6480001, 0xf70b0001, 0x67cb0000,
+    0xf58d0001, 0x654d0000, 0x640e0000, 0xf4ce0001, 0x6c900000,
+    0xfc500001, 0xfd130001, 0x6dd30000, 0xff950001, 0x6f550000,
+    0x6e160000, 0xfed60001, 0xfa990001, 0x6a590000, 0x6b1a0000,
+    0xfbda0001, 0x699c0000, 0xf95c0001, 0xf81f0001, 0x68df0000,
+    0x78a00000, 0xe8600001, 0xe9230001, 0x79e30000, 0xeba50001,
+    0x7b650000, 0x7a260000, 0xeae60001, 0xeea90001, 0x7e690000,
+    0x7f2a0000, 0xefea0001, 0x7dac0000, 0xed6c0001, 0xec2f0001,
+    0x7cef0000, 0xe4b10001, 0x74710000, 0x75320000, 0xe5f20001,
+    0x77b40000, 0xe7740001, 0xe6370001, 0x76f70000, 0x72b80000,
+    0xe2780001, 0xe33b0001, 0x73fb0000, 0xe1bd0001, 0x717d0000,
+    0x703e0000, 0xe0fe0001, 0x50c00000, 0xc0000001, 0xc1430001,
+    0x51830000, 0xc3c50001, 0x53050000, 0x52460000, 0xc2860001,
+    0xc6c90001, 0x56090000, 0x574a0000, 0xc78a0001, 0x55cc0000,
+    0xc50c0001, 0xc44f0001, 0x548f0000, 0xccd10001, 0x5c110000,
+    0x5d520000, 0xcd920001, 0x5fd40000, 0xcf140001, 0xce570001,
+    0x5e970000, 0x5ad80000, 0xca180001, 0xcb5b0001, 0x5b9b0000,
+    0xc9dd0001, 0x591d0000, 0x585e0000, 0xc89e0001, 0xd8e10001,
+    0x48210000, 0x49620000, 0xd9a20001, 0x4be40000, 0xdb240001,
+    0xda670001, 0x4aa70000, 0x4ee80000, 0xde280001, 0xdf6b0001,
+    0x4fab0000, 0xdded0001, 0x4d2d0000, 0x4c6e0000, 0xdcae0001,
+    0x44f00000, 0xd4300001, 0xd5730001, 0x45b30000, 0xd7f50001,
+    0x47350000, 0x46760000, 0xd6b60001, 0xd2f90001, 0x42390000,
+    0x437a0000, 0xd3ba0001, 0x41fc0000, 0xd13c0001, 0xd07f0001,
+    0x40bf0000},
+   {0x00000000, 0x51010001, 0xa2020002, 0xf3030003, 0xf4070007,
+    0xa5060006, 0x56050005, 0x07040004, 0x580d000d, 0x090c000c,
+    0xfa0f000f, 0xab0e000e, 0xac0a000a, 0xfd0b000b, 0x0e080008,
+    0x5f090009, 0xb01a001a, 0xe11b001b, 0x12180018, 0x43190019,
+    0x441d001d, 0x151c001c, 0xe61f001f, 0xb71e001e, 0xe8170017,
+    0xb9160016, 0x4a150015, 0x1b140014, 0x1c100010, 0x4d110011,
+    0xbe120012, 0xef130013, 0xd0370037, 0x81360036, 0x72350035,
+    0x23340034, 0x24300030, 0x75310031, 0x86320032, 0xd7330033,
+    0x883a003a, 0xd93b003b, 0x2a380038, 0x7b390039, 0x7c3d003d,
+    0x2d3c003c, 0xde3f003f, 0x8f3e003e, 0x602d002d, 0x312c002c,
+    0xc22f002f, 0x932e002e, 0x942a002a, 0xc52b002b, 0x36280028,
+    0x67290029, 0x38200020, 0x69210021, 0x9a220022, 0xcb230023,
+    0xcc270027, 0x9d260026, 0x6e250025, 0x3f240024, 0x106d006d,
+    0x416c006c, 0xb26f006f, 0xe36e006e, 0xe46a006a, 0xb56b006b,
+    0x46680068, 0x17690069, 0x48600060, 0x19610061, 0xea620062,
+    0xbb630063, 0xbc670067, 0xed660066, 0x1e650065, 0x4f640064,
+    0xa0770077, 0xf1760076, 0x02750075, 0x53740074, 0x54700070,
+    0x05710071, 0xf6720072, 0xa7730073, 0xf87a007a, 0xa97b007b,
+    0x5a780078, 0x0b790079, 0x0c7d007d, 0x5d7c007c, 0xae7f007f,
+    0xff7e007e, 0xc05a005a, 0x915b005b, 0x62580058, 0x33590059,
+    0x345d005d, 0x655c005c, 0x965f005f, 0xc75e005e, 0x98570057,
+    0xc9560056, 0x3a550055, 0x6b540054, 0x6c500050, 0x3d510051,
+    0xce520052, 0x9f530053, 0x70400040, 0x21410041, 0xd2420042,
+    0x83430043, 0x84470047, 0xd5460046, 0x26450045, 0x77440044,
+    0x284d004d, 0x794c004c, 0x8a4f004f, 0xdb4e004e, 0xdc4a004a,
+    0x8d4b004b, 0x7e480048, 0x2f490049, 0x20da00da, 0x71db00db,
+    0x82d800d8, 0xd3d900d9, 0xd4dd00dd, 0x85dc00dc, 0x76df00df,
+    0x27de00de, 0x78d700d7, 0x29d600d6, 0xdad500d5, 0x8bd400d4,
+    0x8cd000d0, 0xddd100d1, 0x2ed200d2, 0x7fd300d3, 0x90c000c0,
+    0xc1c100c1, 0x32c200c2, 0x63c300c3, 0x64c700c7, 0x35c600c6,
+    0xc6c500c5, 0x97c400c4, 0xc8cd00cd, 0x99cc00cc, 0x6acf00cf,
+    0x3bce00ce, 0x3cca00ca, 0x6dcb00cb, 0x9ec800c8, 0xcfc900c9,
+    0xf0ed00ed, 0xa1ec00ec, 0x52ef00ef, 0x03ee00ee, 0x04ea00ea,
+    0x55eb00eb, 0xa6e800e8, 0xf7e900e9, 0xa8e000e0, 0xf9e100e1,
+    0x0ae200e2, 0x5be300e3, 0x5ce700e7, 0x0de600e6, 0xfee500e5,
+    0xafe400e4, 0x40f700f7, 0x11f600f6, 0xe2f500f5, 0xb3f400f4,
+    0xb4f000f0, 0xe5f100f1, 0x16f200f2, 0x47f300f3, 0x18fa00fa,
+    0x49fb00fb, 0xbaf800f8, 0xebf900f9, 0xecfd00fd, 0xbdfc00fc,
+    0x4eff00ff, 0x1ffe00fe, 0x30b700b7, 0x61b600b6, 0x92b500b5,
+    0xc3b400b4, 0xc4b000b0, 0x95b100b1, 0x66b200b2, 0x37b300b3,
+    0x68ba00ba, 0x39bb00bb, 0xcab800b8, 0x9bb900b9, 0x9cbd00bd,
+    0xcdbc00bc, 0x3ebf00bf, 0x6fbe00be, 0x80ad00ad, 0xd1ac00ac,
+    0x22af00af, 0x73ae00ae, 0x74aa00aa, 0x25ab00ab, 0xd6a800a8,
+    0x87a900a9, 0xd8a000a0, 0x89a100a1, 0x7aa200a2, 0x2ba300a3,
+    0x2ca700a7, 0x7da600a6, 0x8ea500a5, 0xdfa400a4, 0xe0800080,
+    0xb1810081, 0x42820082, 0x13830083, 0x14870087, 0x45860086,
+    0xb6850085, 0xe7840084, 0xb88d008d, 0xe98c008c, 0x1a8f008f,
+    0x4b8e008e, 0x4c8a008a, 0x1d8b008b, 0xee880088, 0xbf890089,
+    0x509a009a, 0x019b009b, 0xf2980098, 0xa3990099, 0xa49d009d,
+    0xf59c009c, 0x069f009f, 0x579e009e, 0x08970097, 0x59960096,
+    0xaa950095, 0xfb940094, 0xfc900090, 0xad910091, 0x5e920092,
+    0x0f930093},
+   {0x00000000, 0x41b401b4, 0x83680368, 0xc2dc02dc, 0xb6d306d3,
+    0xf7670767, 0x35bb05bb, 0x740f040f, 0xdda50da5, 0x9c110c11,
+    0x5ecd0ecd, 0x1f790f79, 0x6b760b76, 0x2ac20ac2, 0xe81e081e,
+    0xa9aa09aa, 0x0b491b49, 0x4afd1afd, 0x88211821, 0xc9951995,
+    0xbd9a1d9a, 0xfc2e1c2e, 0x3ef21ef2, 0x7f461f46, 0xd6ec16ec,
+    0x97581758, 0x55841584, 0x14301430, 0x603f103f, 0x218b118b,
+    0xe3571357, 0xa2e312e3, 0x16923692, 0x57263726, 0x95fa35fa,
+    0xd44e344e, 0xa0413041, 0xe1f531f5, 0x23293329, 0x629d329d,
+    0xcb373b37, 0x8a833a83, 0x485f385f, 0x09eb39eb, 0x7de43de4,
+    0x3c503c50, 0xfe8c3e8c, 0xbf383f38, 0x1ddb2ddb, 0x5c6f2c6f,
+    0x9eb32eb3, 0xdf072f07, 0xab082b08, 0xeabc2abc, 0x28602860,
+    0x69d429d4, 0xc07e207e, 0x81ca21ca, 0x43162316, 0x02a222a2,
+    0x76ad26ad, 0x37192719, 0xf5c525c5, 0xb4712471, 0x2d246d24,
+    0x6c906c90, 0xae4c6e4c, 0xeff86ff8, 0x9bf76bf7, 0xda436a43,
+    0x189f689f, 0x592b692b, 0xf0816081, 0xb1356135, 0x73e963e9,
+    0x325d625d, 0x46526652, 0x07e667e6, 0xc53a653a, 0x848e648e,
+    0x266d766d, 0x67d977d9, 0xa5057505, 0xe4b174b1, 0x90be70be,
+    0xd10a710a, 0x13d673d6, 0x52627262, 0xfbc87bc8, 0xba7c7a7c,
+    0x78a078a0, 0x39147914, 0x4d1b7d1b, 0x0caf7caf, 0xce737e73,
+    0x8fc77fc7, 0x3bb65bb6, 0x7a025a02, 0xb8de58de, 0xf96a596a,
+    0x8d655d65, 0xccd15cd1, 0x0e0d5e0d, 0x4fb95fb9, 0xe6135613,
+    0xa7a757a7, 0x657b557b, 0x24cf54cf, 0x50c050c0, 0x11745174,
+    0xd3a853a8, 0x921c521c, 0x30ff40ff, 0x714b414b, 0xb3974397,
+    0xf2234223, 0x862c462c, 0xc7984798, 0x05444544, 0x44f044f0,
+    0xed5a4d5a, 0xacee4cee, 0x6e324e32, 0x2f864f86, 0x5b894b89,
+    0x1a3d4a3d, 0xd8e148e1, 0x99554955, 0x5a48da48, 0x1bfcdbfc,
+    0xd920d920, 0x9894d894, 0xec9bdc9b, 0xad2fdd2f, 0x6ff3dff3,
+    0x2e47de47, 0x87edd7ed, 0xc659d659, 0x0485d485, 0x4531d531,
+    0x313ed13e, 0x708ad08a, 0xb256d256, 0xf3e2d3e2, 0x5101c101,
+    0x10b5c0b5, 0xd269c269, 0x93ddc3dd, 0xe7d2c7d2, 0xa666c666,
+    0x64bac4ba, 0x250ec50e, 0x8ca4cca4, 0xcd10cd10, 0x0fcccfcc,
+    0x4e78ce78, 0x3a77ca77, 0x7bc3cbc3, 0xb91fc91f, 0xf8abc8ab,
+    0x4cdaecda, 0x0d6eed6e, 0xcfb2efb2, 0x8e06ee06, 0xfa09ea09,
+    0xbbbdebbd, 0x7961e961, 0x38d5e8d5, 0x917fe17f, 0xd0cbe0cb,
+    0x1217e217, 0x53a3e3a3, 0x27ace7ac, 0x6618e618, 0xa4c4e4c4,
+    0xe570e570, 0x4793f793, 0x0627f627, 0xc4fbf4fb, 0x854ff54f,
+    0xf140f140, 0xb0f4f0f4, 0x7228f228, 0x339cf39c, 0x9a36fa36,
+    0xdb82fb82, 0x195ef95e, 0x58eaf8ea, 0x2ce5fce5, 0x6d51fd51,
+    0xaf8dff8d, 0xee39fe39, 0x776cb76c, 0x36d8b6d8, 0xf404b404,
+    0xb5b0b5b0, 0xc1bfb1bf, 0x800bb00b, 0x42d7b2d7, 0x0363b363,
+    0xaac9bac9, 0xeb7dbb7d, 0x29a1b9a1, 0x6815b815, 0x1c1abc1a,
+    0x5daebdae, 0x9f72bf72, 0xdec6bec6, 0x7c25ac25, 0x3d91ad91,
+    0xff4daf4d, 0xbef9aef9, 0xcaf6aaf6, 0x8b42ab42, 0x499ea99e,
+    0x082aa82a, 0xa180a180, 0xe034a034, 0x22e8a2e8, 0x635ca35c,
+    0x1753a753, 0x56e7a6e7, 0x943ba43b, 0xd58fa58f, 0x61fe81fe,
+    0x204a804a, 0xe2968296, 0xa3228322, 0xd72d872d, 0x96998699,
+    0x54458445, 0x15f185f1, 0xbc5b8c5b, 0xfdef8def, 0x3f338f33,
+    0x7e878e87, 0x0a888a88, 0x4b3c8b3c, 0x89e089e0, 0xc8548854,
+    0x6ab79ab7, 0x2b039b03, 0xe9df99df, 0xa86b986b, 0xdc649c64,
+    0x9dd09dd0, 0x5f0c9f0c, 0x1eb89eb8, 0xb7129712, 0xf6a696a6,
+    0x347a947a, 0x75ce95ce, 0x01c191c1, 0x40759075, 0x82a992a9,
+    0xc31d931d},
+   {0x00000000, 0xb491b490, 0xd9206923, 0x6db1ddb3, 0x0243d245,
+    0xb6d266d5, 0xdb63bb66, 0x6ff20ff6, 0x0487a48a, 0xb016101a,
+    0xdda7cda9, 0x69367939, 0x06c476cf, 0xb255c25f, 0xdfe41fec,
+    0x6b75ab7c, 0x090f4914, 0xbd9efd84, 0xd02f2037, 0x64be94a7,
+    0x0b4c9b51, 0xbfdd2fc1, 0xd26cf272, 0x66fd46e2, 0x0d88ed9e,
+    0xb919590e, 0xd4a884bd, 0x6039302d, 0x0fcb3fdb, 0xbb5a8b4b,
+    0xd6eb56f8, 0x627ae268, 0x121e9228, 0xa68f26b8, 0xcb3efb0b,
+    0x7faf4f9b, 0x105d406d, 0xa4ccf4fd, 0xc97d294e, 0x7dec9dde,
+    0x169936a2, 0xa2088232, 0xcfb95f81, 0x7b28eb11, 0x14dae4e7,
+    0xa04b5077, 0xcdfa8dc4, 0x796b3954, 0x1b11db3c, 0xaf806fac,
+    0xc231b21f, 0x76a0068f, 0x19520979, 0xadc3bde9, 0xc072605a,
+    0x74e3d4ca, 0x1f967fb6, 0xab07cb26, 0xc6b61695, 0x7227a205,
+    0x1dd5adf3, 0xa9441963, 0xc4f5c4d0, 0x70647040, 0x243d2450,
+    0x90ac90c0, 0xfd1d4d73, 0x498cf9e3, 0x267ef615, 0x92ef4285,
+    0xff5e9f36, 0x4bcf2ba6, 0x20ba80da, 0x942b344a, 0xf99ae9f9,
+    0x4d0b5d69, 0x22f9529f, 0x9668e60f, 0xfbd93bbc, 0x4f488f2c,
+    0x2d326d44, 0x99a3d9d4, 0xf4120467, 0x4083b0f7, 0x2f71bf01,
+    0x9be00b91, 0xf651d622, 0x42c062b2, 0x29b5c9ce, 0x9d247d5e,
+    0xf095a0ed, 0x4404147d, 0x2bf61b8b, 0x9f67af1b, 0xf2d672a8,
+    0x4647c638, 0x3623b678, 0x82b202e8, 0xef03df5b, 0x5b926bcb,
+    0x3460643d, 0x80f1d0ad, 0xed400d1e, 0x59d1b98e, 0x32a412f2,
+    0x8635a662, 0xeb847bd1, 0x5f15cf41, 0x30e7c0b7, 0x84767427,
+    0xe9c7a994, 0x5d561d04, 0x3f2cff6c, 0x8bbd4bfc, 0xe60c964f,
+    0x529d22df, 0x3d6f2d29, 0x89fe99b9, 0xe44f440a, 0x50def09a,
+    0x3bab5be6, 0x8f3aef76, 0xe28b32c5, 0x561a8655, 0x39e889a3,
+    0x8d793d33, 0xe0c8e080, 0x54595410, 0x487a48a0, 0xfcebfc30,
+    0x915a2183, 0x25cb9513, 0x4a399ae5, 0xfea82e75, 0x9319f3c6,
+    0x27884756, 0x4cfdec2a, 0xf86c58ba, 0x95dd8509, 0x214c3199,
+    0x4ebe3e6f, 0xfa2f8aff, 0x979e574c, 0x230fe3dc, 0x417501b4,
+    0xf5e4b524, 0x98556897, 0x2cc4dc07, 0x4336d3f1, 0xf7a76761,
+    0x9a16bad2, 0x2e870e42, 0x45f2a53e, 0xf16311ae, 0x9cd2cc1d,
+    0x2843788d, 0x47b1777b, 0xf320c3eb, 0x9e911e58, 0x2a00aac8,
+    0x5a64da88, 0xeef56e18, 0x8344b3ab, 0x37d5073b, 0x582708cd,
+    0xecb6bc5d, 0x810761ee, 0x3596d57e, 0x5ee37e02, 0xea72ca92,
+    0x87c31721, 0x3352a3b1, 0x5ca0ac47, 0xe83118d7, 0x8580c564,
+    0x311171f4, 0x536b939c, 0xe7fa270c, 0x8a4bfabf, 0x3eda4e2f,
+    0x512841d9, 0xe5b9f549, 0x880828fa, 0x3c999c6a, 0x57ec3716,
+    0xe37d8386, 0x8ecc5e35, 0x3a5deaa5, 0x55afe553, 0xe13e51c3,
+    0x8c8f8c70, 0x381e38e0, 0x6c476cf0, 0xd8d6d860, 0xb56705d3,
+    0x01f6b143, 0x6e04beb5, 0xda950a25, 0xb724d796, 0x03b56306,
+    0x68c0c87a, 0xdc517cea, 0xb1e0a159, 0x057115c9, 0x6a831a3f,
+    0xde12aeaf, 0xb3a3731c, 0x0732c78c, 0x654825e4, 0xd1d99174,
+    0xbc684cc7, 0x08f9f857, 0x670bf7a1, 0xd39a4331, 0xbe2b9e82,
+    0x0aba2a12, 0x61cf816e, 0xd55e35fe, 0xb8efe84d, 0x0c7e5cdd,
+    0x638c532b, 0xd71de7bb, 0xbaac3a08, 0x0e3d8e98, 0x7e59fed8,
+    0xcac84a48, 0xa77997fb, 0x13e8236b, 0x7c1a2c9d, 0xc88b980d,
+    0xa53a45be, 0x11abf12e, 0x7ade5a52, 0xce4feec2, 0xa3fe3371,
+    0x176f87e1, 0x789d8817, 0xcc0c3c87, 0xa1bde134, 0x152c55a4,
+    0x7756b7cc, 0xc3c7035c, 0xae76deef, 0x1ae76a7f, 0x75156589,
+    0xc184d119, 0xac350caa, 0x18a4b83a, 0x73d11346, 0xc740a7d6,
+    0xaaf17a65, 0x1e60cef5, 0x7192c103, 0xc5037593, 0xa8b2a820,
+    0x1c231cb0},
+   {0x00000000, 0x90f49140, 0x91ea2283, 0x011eb3c3, 0x93d74505,
+    0x0323d445, 0x023d6786, 0x92c9f6c6, 0x97ad8a09, 0x07591b49,
+    0x0647a88a, 0x96b339ca, 0x047acf0c, 0x948e5e4c, 0x9590ed8f,
+    0x05647ccf, 0x9f581411, 0x0fac8551, 0x0eb23692, 0x9e46a7d2,
+    0x0c8f5114, 0x9c7bc054, 0x9d657397, 0x0d91e2d7, 0x08f59e18,
+    0x98010f58, 0x991fbc9b, 0x09eb2ddb, 0x9b22db1d, 0x0bd64a5d,
+    0x0ac8f99e, 0x9a3c68de, 0x8eb32821, 0x1e47b961, 0x1f590aa2,
+    0x8fad9be2, 0x1d646d24, 0x8d90fc64, 0x8c8e4fa7, 0x1c7adee7,
+    0x191ea228, 0x89ea3368, 0x88f480ab, 0x180011eb, 0x8ac9e72d,
+    0x1a3d766d, 0x1b23c5ae, 0x8bd754ee, 0x11eb3c30, 0x811fad70,
+    0x80011eb3, 0x10f58ff3, 0x823c7935, 0x12c8e875, 0x13d65bb6,
+    0x8322caf6, 0x8646b639, 0x16b22779, 0x17ac94ba, 0x875805fa,
+    0x1591f33c, 0x8565627c, 0x847bd1bf, 0x148f40ff, 0xad655041,
+    0x3d91c101, 0x3c8f72c2, 0xac7be382, 0x3eb21544, 0xae468404,
+    0xaf5837c7, 0x3faca687, 0x3ac8da48, 0xaa3c4b08, 0xab22f8cb,
+    0x3bd6698b, 0xa91f9f4d, 0x39eb0e0d, 0x38f5bdce, 0xa8012c8e,
+    0x323d4450, 0xa2c9d510, 0xa3d766d3, 0x3323f793, 0xa1ea0155,
+    0x311e9015, 0x300023d6, 0xa0f4b296, 0xa590ce59, 0x35645f19,
+    0x347aecda, 0xa48e7d9a, 0x36478b5c, 0xa6b31a1c, 0xa7ada9df,
+    0x3759389f, 0x23d67860, 0xb322e920, 0xb23c5ae3, 0x22c8cba3,
+    0xb0013d65, 0x20f5ac25, 0x21eb1fe6, 0xb11f8ea6, 0xb47bf269,
+    0x248f6329, 0x2591d0ea, 0xb56541aa, 0x27acb76c, 0xb758262c,
+    0xb64695ef, 0x26b204af, 0xbc8e6c71, 0x2c7afd31, 0x2d644ef2,
+    0xbd90dfb2, 0x2f592974, 0xbfadb834, 0xbeb30bf7, 0x2e479ab7,
+    0x2b23e678, 0xbbd77738, 0xbac9c4fb, 0x2a3d55bb, 0xb8f4a37d,
+    0x2800323d, 0x291e81fe, 0xb9ea10be, 0xeac9a081, 0x7a3d31c1,
+    0x7b238202, 0xebd71342, 0x791ee584, 0xe9ea74c4, 0xe8f4c707,
+    0x78005647, 0x7d642a88, 0xed90bbc8, 0xec8e080b, 0x7c7a994b,
+    0xeeb36f8d, 0x7e47fecd, 0x7f594d0e, 0xefaddc4e, 0x7591b490,
+    0xe56525d0, 0xe47b9613, 0x748f0753, 0xe646f195, 0x76b260d5,
+    0x77acd316, 0xe7584256, 0xe23c3e99, 0x72c8afd9, 0x73d61c1a,
+    0xe3228d5a, 0x71eb7b9c, 0xe11feadc, 0xe001591f, 0x70f5c85f,
+    0x647a88a0, 0xf48e19e0, 0xf590aa23, 0x65643b63, 0xf7adcda5,
+    0x67595ce5, 0x6647ef26, 0xf6b37e66, 0xf3d702a9, 0x632393e9,
+    0x623d202a, 0xf2c9b16a, 0x600047ac, 0xf0f4d6ec, 0xf1ea652f,
+    0x611ef46f, 0xfb229cb1, 0x6bd60df1, 0x6ac8be32, 0xfa3c2f72,
+    0x68f5d9b4, 0xf80148f4, 0xf91ffb37, 0x69eb6a77, 0x6c8f16b8,
+    0xfc7b87f8, 0xfd65343b, 0x6d91a57b, 0xff5853bd, 0x6facc2fd,
+    0x6eb2713e, 0xfe46e07e, 0x47acf0c0, 0xd7586180, 0xd646d243,
+    0x46b24303, 0xd47bb5c5, 0x448f2485, 0x45919746, 0xd5650606,
+    0xd0017ac9, 0x40f5eb89, 0x41eb584a, 0xd11fc90a, 0x43d63fcc,
+    0xd322ae8c, 0xd23c1d4f, 0x42c88c0f, 0xd8f4e4d1, 0x48007591,
+    0x491ec652, 0xd9ea5712, 0x4b23a1d4, 0xdbd73094, 0xdac98357,
+    0x4a3d1217, 0x4f596ed8, 0xdfadff98, 0xdeb34c5b, 0x4e47dd1b,
+    0xdc8e2bdd, 0x4c7aba9d, 0x4d64095e, 0xdd90981e, 0xc91fd8e1,
+    0x59eb49a1, 0x58f5fa62, 0xc8016b22, 0x5ac89de4, 0xca3c0ca4,
+    0xcb22bf67, 0x5bd62e27, 0x5eb252e8, 0xce46c3a8, 0xcf58706b,
+    0x5face12b, 0xcd6517ed, 0x5d9186ad, 0x5c8f356e, 0xcc7ba42e,
+    0x5647ccf0, 0xc6b35db0, 0xc7adee73, 0x57597f33, 0xc59089f5,
+    0x556418b5, 0x547aab76, 0xc48e3a36, 0xc1ea46f9, 0x511ed7b9,
+    0x5000647a, 0xc0f4f53a, 0x523d03fc, 0xc2c992bc, 0xc3d7217f,
+    0x5323b03f}};
+
+static const word_t crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x4091f49000000000, 0x8322ea9100000000,
+    0xc3b31e0100000000, 0x0545d79300000000, 0x45d4230300000000,
+    0x86673d0200000000, 0xc6f6c99200000000, 0x098aad9700000000,
+    0x491b590700000000, 0x8aa8470600000000, 0xca39b39600000000,
+    0x0ccf7a0400000000, 0x4c5e8e9400000000, 0x8fed909500000000,
+    0xcf7c640500000000, 0x1114589f00000000, 0x5185ac0f00000000,
+    0x9236b20e00000000, 0xd2a7469e00000000, 0x14518f0c00000000,
+    0x54c07b9c00000000, 0x9773659d00000000, 0xd7e2910d00000000,
+    0x189ef50800000000, 0x580f019800000000, 0x9bbc1f9900000000,
+    0xdb2deb0900000000, 0x1ddb229b00000000, 0x5d4ad60b00000000,
+    0x9ef9c80a00000000, 0xde683c9a00000000, 0x2128b38e00000000,
+    0x61b9471e00000000, 0xa20a591f00000000, 0xe29bad8f00000000,
+    0x246d641d00000000, 0x64fc908d00000000, 0xa74f8e8c00000000,
+    0xe7de7a1c00000000, 0x28a21e1900000000, 0x6833ea8900000000,
+    0xab80f48800000000, 0xeb11001800000000, 0x2de7c98a00000000,
+    0x6d763d1a00000000, 0xaec5231b00000000, 0xee54d78b00000000,
+    0x303ceb1100000000, 0x70ad1f8100000000, 0xb31e018000000000,
+    0xf38ff51000000000, 0x35793c8200000000, 0x75e8c81200000000,
+    0xb65bd61300000000, 0xf6ca228300000000, 0x39b6468600000000,
+    0x7927b21600000000, 0xba94ac1700000000, 0xfa05588700000000,
+    0x3cf3911500000000, 0x7c62658500000000, 0xbfd17b8400000000,
+    0xff408f1400000000, 0x415065ad00000000, 0x01c1913d00000000,
+    0xc2728f3c00000000, 0x82e37bac00000000, 0x4415b23e00000000,
+    0x048446ae00000000, 0xc73758af00000000, 0x87a6ac3f00000000,
+    0x48dac83a00000000, 0x084b3caa00000000, 0xcbf822ab00000000,
+    0x8b69d63b00000000, 0x4d9f1fa900000000, 0x0d0eeb3900000000,
+    0xcebdf53800000000, 0x8e2c01a800000000, 0x50443d3200000000,
+    0x10d5c9a200000000, 0xd366d7a300000000, 0x93f7233300000000,
+    0x5501eaa100000000, 0x15901e3100000000, 0xd623003000000000,
+    0x96b2f4a000000000, 0x59ce90a500000000, 0x195f643500000000,
+    0xdaec7a3400000000, 0x9a7d8ea400000000, 0x5c8b473600000000,
+    0x1c1ab3a600000000, 0xdfa9ada700000000, 0x9f38593700000000,
+    0x6078d62300000000, 0x20e922b300000000, 0xe35a3cb200000000,
+    0xa3cbc82200000000, 0x653d01b000000000, 0x25acf52000000000,
+    0xe61feb2100000000, 0xa68e1fb100000000, 0x69f27bb400000000,
+    0x29638f2400000000, 0xead0912500000000, 0xaa4165b500000000,
+    0x6cb7ac2700000000, 0x2c2658b700000000, 0xef9546b600000000,
+    0xaf04b22600000000, 0x716c8ebc00000000, 0x31fd7a2c00000000,
+    0xf24e642d00000000, 0xb2df90bd00000000, 0x7429592f00000000,
+    0x34b8adbf00000000, 0xf70bb3be00000000, 0xb79a472e00000000,
+    0x78e6232b00000000, 0x3877d7bb00000000, 0xfbc4c9ba00000000,
+    0xbb553d2a00000000, 0x7da3f4b800000000, 0x3d32002800000000,
+    0xfe811e2900000000, 0xbe10eab900000000, 0x81a0c9ea00000000,
+    0xc1313d7a00000000, 0x0282237b00000000, 0x4213d7eb00000000,
+    0x84e51e7900000000, 0xc474eae900000000, 0x07c7f4e800000000,
+    0x4756007800000000, 0x882a647d00000000, 0xc8bb90ed00000000,
+    0x0b088eec00000000, 0x4b997a7c00000000, 0x8d6fb3ee00000000,
+    0xcdfe477e00000000, 0x0e4d597f00000000, 0x4edcadef00000000,
+    0x90b4917500000000, 0xd02565e500000000, 0x13967be400000000,
+    0x53078f7400000000, 0x95f146e600000000, 0xd560b27600000000,
+    0x16d3ac7700000000, 0x564258e700000000, 0x993e3ce200000000,
+    0xd9afc87200000000, 0x1a1cd67300000000, 0x5a8d22e300000000,
+    0x9c7beb7100000000, 0xdcea1fe100000000, 0x1f5901e000000000,
+    0x5fc8f57000000000, 0xa0887a6400000000, 0xe0198ef400000000,
+    0x23aa90f500000000, 0x633b646500000000, 0xa5cdadf700000000,
+    0xe55c596700000000, 0x26ef476600000000, 0x667eb3f600000000,
+    0xa902d7f300000000, 0xe993236300000000, 0x2a203d6200000000,
+    0x6ab1c9f200000000, 0xac47006000000000, 0xecd6f4f000000000,
+    0x2f65eaf100000000, 0x6ff41e6100000000, 0xb19c22fb00000000,
+    0xf10dd66b00000000, 0x32bec86a00000000, 0x722f3cfa00000000,
+    0xb4d9f56800000000, 0xf44801f800000000, 0x37fb1ff900000000,
+    0x776aeb6900000000, 0xb8168f6c00000000, 0xf8877bfc00000000,
+    0x3b3465fd00000000, 0x7ba5916d00000000, 0xbd5358ff00000000,
+    0xfdc2ac6f00000000, 0x3e71b26e00000000, 0x7ee046fe00000000,
+    0xc0f0ac4700000000, 0x806158d700000000, 0x43d246d600000000,
+    0x0343b24600000000, 0xc5b57bd400000000, 0x85248f4400000000,
+    0x4697914500000000, 0x060665d500000000, 0xc97a01d000000000,
+    0x89ebf54000000000, 0x4a58eb4100000000, 0x0ac91fd100000000,
+    0xcc3fd64300000000, 0x8cae22d300000000, 0x4f1d3cd200000000,
+    0x0f8cc84200000000, 0xd1e4f4d800000000, 0x9175004800000000,
+    0x52c61e4900000000, 0x1257ead900000000, 0xd4a1234b00000000,
+    0x9430d7db00000000, 0x5783c9da00000000, 0x17123d4a00000000,
+    0xd86e594f00000000, 0x98ffaddf00000000, 0x5b4cb3de00000000,
+    0x1bdd474e00000000, 0xdd2b8edc00000000, 0x9dba7a4c00000000,
+    0x5e09644d00000000, 0x1e9890dd00000000, 0xe1d81fc900000000,
+    0xa149eb5900000000, 0x62faf55800000000, 0x226b01c800000000,
+    0xe49dc85a00000000, 0xa40c3cca00000000, 0x67bf22cb00000000,
+    0x272ed65b00000000, 0xe852b25e00000000, 0xa8c346ce00000000,
+    0x6b7058cf00000000, 0x2be1ac5f00000000, 0xed1765cd00000000,
+    0xad86915d00000000, 0x6e358f5c00000000, 0x2ea47bcc00000000,
+    0xf0cc475600000000, 0xb05db3c600000000, 0x73eeadc700000000,
+    0x337f595700000000, 0xf58990c500000000, 0xb518645500000000,
+    0x76ab7a5400000000, 0x363a8ec400000000, 0xf946eac100000000,
+    0xb9d71e5100000000, 0x7a64005000000000, 0x3af5f4c000000000,
+    0xfc033d5200000000, 0xbc92c9c200000000, 0x7f21d7c300000000,
+    0x3fb0235300000000},
+   {0x0000000000000000, 0x90b491b400000000, 0x236920d900000000,
+    0xb3ddb16d00000000, 0x45d2430200000000, 0xd566d2b600000000,
+    0x66bb63db00000000, 0xf60ff26f00000000, 0x8aa4870400000000,
+    0x1a1016b000000000, 0xa9cda7dd00000000, 0x3979366900000000,
+    0xcf76c40600000000, 0x5fc255b200000000, 0xec1fe4df00000000,
+    0x7cab756b00000000, 0x14490f0900000000, 0x84fd9ebd00000000,
+    0x37202fd000000000, 0xa794be6400000000, 0x519b4c0b00000000,
+    0xc12fddbf00000000, 0x72f26cd200000000, 0xe246fd6600000000,
+    0x9eed880d00000000, 0x0e5919b900000000, 0xbd84a8d400000000,
+    0x2d30396000000000, 0xdb3fcb0f00000000, 0x4b8b5abb00000000,
+    0xf856ebd600000000, 0x68e27a6200000000, 0x28921e1200000000,
+    0xb8268fa600000000, 0x0bfb3ecb00000000, 0x9b4faf7f00000000,
+    0x6d405d1000000000, 0xfdf4cca400000000, 0x4e297dc900000000,
+    0xde9dec7d00000000, 0xa236991600000000, 0x328208a200000000,
+    0x815fb9cf00000000, 0x11eb287b00000000, 0xe7e4da1400000000,
+    0x77504ba000000000, 0xc48dfacd00000000, 0x54396b7900000000,
+    0x3cdb111b00000000, 0xac6f80af00000000, 0x1fb231c200000000,
+    0x8f06a07600000000, 0x7909521900000000, 0xe9bdc3ad00000000,
+    0x5a6072c000000000, 0xcad4e37400000000, 0xb67f961f00000000,
+    0x26cb07ab00000000, 0x9516b6c600000000, 0x05a2277200000000,
+    0xf3add51d00000000, 0x631944a900000000, 0xd0c4f5c400000000,
+    0x4070647000000000, 0x50243d2400000000, 0xc090ac9000000000,
+    0x734d1dfd00000000, 0xe3f98c4900000000, 0x15f67e2600000000,
+    0x8542ef9200000000, 0x369f5eff00000000, 0xa62bcf4b00000000,
+    0xda80ba2000000000, 0x4a342b9400000000, 0xf9e99af900000000,
+    0x695d0b4d00000000, 0x9f52f92200000000, 0x0fe6689600000000,
+    0xbc3bd9fb00000000, 0x2c8f484f00000000, 0x446d322d00000000,
+    0xd4d9a39900000000, 0x670412f400000000, 0xf7b0834000000000,
+    0x01bf712f00000000, 0x910be09b00000000, 0x22d651f600000000,
+    0xb262c04200000000, 0xcec9b52900000000, 0x5e7d249d00000000,
+    0xeda095f000000000, 0x7d14044400000000, 0x8b1bf62b00000000,
+    0x1baf679f00000000, 0xa872d6f200000000, 0x38c6474600000000,
+    0x78b6233600000000, 0xe802b28200000000, 0x5bdf03ef00000000,
+    0xcb6b925b00000000, 0x3d64603400000000, 0xadd0f18000000000,
+    0x1e0d40ed00000000, 0x8eb9d15900000000, 0xf212a43200000000,
+    0x62a6358600000000, 0xd17b84eb00000000, 0x41cf155f00000000,
+    0xb7c0e73000000000, 0x2774768400000000, 0x94a9c7e900000000,
+    0x041d565d00000000, 0x6cff2c3f00000000, 0xfc4bbd8b00000000,
+    0x4f960ce600000000, 0xdf229d5200000000, 0x292d6f3d00000000,
+    0xb999fe8900000000, 0x0a444fe400000000, 0x9af0de5000000000,
+    0xe65bab3b00000000, 0x76ef3a8f00000000, 0xc5328be200000000,
+    0x55861a5600000000, 0xa389e83900000000, 0x333d798d00000000,
+    0x80e0c8e000000000, 0x1054595400000000, 0xa0487a4800000000,
+    0x30fcebfc00000000, 0x83215a9100000000, 0x1395cb2500000000,
+    0xe59a394a00000000, 0x752ea8fe00000000, 0xc6f3199300000000,
+    0x5647882700000000, 0x2aecfd4c00000000, 0xba586cf800000000,
+    0x0985dd9500000000, 0x99314c2100000000, 0x6f3ebe4e00000000,
+    0xff8a2ffa00000000, 0x4c579e9700000000, 0xdce30f2300000000,
+    0xb401754100000000, 0x24b5e4f500000000, 0x9768559800000000,
+    0x07dcc42c00000000, 0xf1d3364300000000, 0x6167a7f700000000,
+    0xd2ba169a00000000, 0x420e872e00000000, 0x3ea5f24500000000,
+    0xae1163f100000000, 0x1dccd29c00000000, 0x8d78432800000000,
+    0x7b77b14700000000, 0xebc320f300000000, 0x581e919e00000000,
+    0xc8aa002a00000000, 0x88da645a00000000, 0x186ef5ee00000000,
+    0xabb3448300000000, 0x3b07d53700000000, 0xcd08275800000000,
+    0x5dbcb6ec00000000, 0xee61078100000000, 0x7ed5963500000000,
+    0x027ee35e00000000, 0x92ca72ea00000000, 0x2117c38700000000,
+    0xb1a3523300000000, 0x47aca05c00000000, 0xd71831e800000000,
+    0x64c5808500000000, 0xf471113100000000, 0x9c936b5300000000,
+    0x0c27fae700000000, 0xbffa4b8a00000000, 0x2f4eda3e00000000,
+    0xd941285100000000, 0x49f5b9e500000000, 0xfa28088800000000,
+    0x6a9c993c00000000, 0x1637ec5700000000, 0x86837de300000000,
+    0x355ecc8e00000000, 0xa5ea5d3a00000000, 0x53e5af5500000000,
+    0xc3513ee100000000, 0x708c8f8c00000000, 0xe0381e3800000000,
+    0xf06c476c00000000, 0x60d8d6d800000000, 0xd30567b500000000,
+    0x43b1f60100000000, 0xb5be046e00000000, 0x250a95da00000000,
+    0x96d724b700000000, 0x0663b50300000000, 0x7ac8c06800000000,
+    0xea7c51dc00000000, 0x59a1e0b100000000, 0xc915710500000000,
+    0x3f1a836a00000000, 0xafae12de00000000, 0x1c73a3b300000000,
+    0x8cc7320700000000, 0xe425486500000000, 0x7491d9d100000000,
+    0xc74c68bc00000000, 0x57f8f90800000000, 0xa1f70b6700000000,
+    0x31439ad300000000, 0x829e2bbe00000000, 0x122aba0a00000000,
+    0x6e81cf6100000000, 0xfe355ed500000000, 0x4de8efb800000000,
+    0xdd5c7e0c00000000, 0x2b538c6300000000, 0xbbe71dd700000000,
+    0x083aacba00000000, 0x988e3d0e00000000, 0xd8fe597e00000000,
+    0x484ac8ca00000000, 0xfb9779a700000000, 0x6b23e81300000000,
+    0x9d2c1a7c00000000, 0x0d988bc800000000, 0xbe453aa500000000,
+    0x2ef1ab1100000000, 0x525ade7a00000000, 0xc2ee4fce00000000,
+    0x7133fea300000000, 0xe1876f1700000000, 0x17889d7800000000,
+    0x873c0ccc00000000, 0x34e1bda100000000, 0xa4552c1500000000,
+    0xccb7567700000000, 0x5c03c7c300000000, 0xefde76ae00000000,
+    0x7f6ae71a00000000, 0x8965157500000000, 0x19d184c100000000,
+    0xaa0c35ac00000000, 0x3ab8a41800000000, 0x4613d17300000000,
+    0xd6a740c700000000, 0x657af1aa00000000, 0xf5ce601e00000000,
+    0x03c1927100000000, 0x937503c500000000, 0x20a8b2a800000000,
+    0xb01c231c00000000},
+   {0x0000000000000000, 0xb401b44100000000, 0x6803688300000000,
+    0xdc02dcc200000000, 0xd306d3b600000000, 0x670767f700000000,
+    0xbb05bb3500000000, 0x0f040f7400000000, 0xa50da5dd00000000,
+    0x110c119c00000000, 0xcd0ecd5e00000000, 0x790f791f00000000,
+    0x760b766b00000000, 0xc20ac22a00000000, 0x1e081ee800000000,
+    0xaa09aaa900000000, 0x491b490b00000000, 0xfd1afd4a00000000,
+    0x2118218800000000, 0x951995c900000000, 0x9a1d9abd00000000,
+    0x2e1c2efc00000000, 0xf21ef23e00000000, 0x461f467f00000000,
+    0xec16ecd600000000, 0x5817589700000000, 0x8415845500000000,
+    0x3014301400000000, 0x3f103f6000000000, 0x8b118b2100000000,
+    0x571357e300000000, 0xe312e3a200000000, 0x9236921600000000,
+    0x2637265700000000, 0xfa35fa9500000000, 0x4e344ed400000000,
+    0x413041a000000000, 0xf531f5e100000000, 0x2933292300000000,
+    0x9d329d6200000000, 0x373b37cb00000000, 0x833a838a00000000,
+    0x5f385f4800000000, 0xeb39eb0900000000, 0xe43de47d00000000,
+    0x503c503c00000000, 0x8c3e8cfe00000000, 0x383f38bf00000000,
+    0xdb2ddb1d00000000, 0x6f2c6f5c00000000, 0xb32eb39e00000000,
+    0x072f07df00000000, 0x082b08ab00000000, 0xbc2abcea00000000,
+    0x6028602800000000, 0xd429d46900000000, 0x7e207ec000000000,
+    0xca21ca8100000000, 0x1623164300000000, 0xa222a20200000000,
+    0xad26ad7600000000, 0x1927193700000000, 0xc525c5f500000000,
+    0x712471b400000000, 0x246d242d00000000, 0x906c906c00000000,
+    0x4c6e4cae00000000, 0xf86ff8ef00000000, 0xf76bf79b00000000,
+    0x436a43da00000000, 0x9f689f1800000000, 0x2b692b5900000000,
+    0x816081f000000000, 0x356135b100000000, 0xe963e97300000000,
+    0x5d625d3200000000, 0x5266524600000000, 0xe667e60700000000,
+    0x3a653ac500000000, 0x8e648e8400000000, 0x6d766d2600000000,
+    0xd977d96700000000, 0x057505a500000000, 0xb174b1e400000000,
+    0xbe70be9000000000, 0x0a710ad100000000, 0xd673d61300000000,
+    0x6272625200000000, 0xc87bc8fb00000000, 0x7c7a7cba00000000,
+    0xa078a07800000000, 0x1479143900000000, 0x1b7d1b4d00000000,
+    0xaf7caf0c00000000, 0x737e73ce00000000, 0xc77fc78f00000000,
+    0xb65bb63b00000000, 0x025a027a00000000, 0xde58deb800000000,
+    0x6a596af900000000, 0x655d658d00000000, 0xd15cd1cc00000000,
+    0x0d5e0d0e00000000, 0xb95fb94f00000000, 0x135613e600000000,
+    0xa757a7a700000000, 0x7b557b6500000000, 0xcf54cf2400000000,
+    0xc050c05000000000, 0x7451741100000000, 0xa853a8d300000000,
+    0x1c521c9200000000, 0xff40ff3000000000, 0x4b414b7100000000,
+    0x974397b300000000, 0x234223f200000000, 0x2c462c8600000000,
+    0x984798c700000000, 0x4445440500000000, 0xf044f04400000000,
+    0x5a4d5aed00000000, 0xee4ceeac00000000, 0x324e326e00000000,
+    0x864f862f00000000, 0x894b895b00000000, 0x3d4a3d1a00000000,
+    0xe148e1d800000000, 0x5549559900000000, 0x48da485a00000000,
+    0xfcdbfc1b00000000, 0x20d920d900000000, 0x94d8949800000000,
+    0x9bdc9bec00000000, 0x2fdd2fad00000000, 0xf3dff36f00000000,
+    0x47de472e00000000, 0xedd7ed8700000000, 0x59d659c600000000,
+    0x85d4850400000000, 0x31d5314500000000, 0x3ed13e3100000000,
+    0x8ad08a7000000000, 0x56d256b200000000, 0xe2d3e2f300000000,
+    0x01c1015100000000, 0xb5c0b51000000000, 0x69c269d200000000,
+    0xddc3dd9300000000, 0xd2c7d2e700000000, 0x66c666a600000000,
+    0xbac4ba6400000000, 0x0ec50e2500000000, 0xa4cca48c00000000,
+    0x10cd10cd00000000, 0xcccfcc0f00000000, 0x78ce784e00000000,
+    0x77ca773a00000000, 0xc3cbc37b00000000, 0x1fc91fb900000000,
+    0xabc8abf800000000, 0xdaecda4c00000000, 0x6eed6e0d00000000,
+    0xb2efb2cf00000000, 0x06ee068e00000000, 0x09ea09fa00000000,
+    0xbdebbdbb00000000, 0x61e9617900000000, 0xd5e8d53800000000,
+    0x7fe17f9100000000, 0xcbe0cbd000000000, 0x17e2171200000000,
+    0xa3e3a35300000000, 0xace7ac2700000000, 0x18e6186600000000,
+    0xc4e4c4a400000000, 0x70e570e500000000, 0x93f7934700000000,
+    0x27f6270600000000, 0xfbf4fbc400000000, 0x4ff54f8500000000,
+    0x40f140f100000000, 0xf4f0f4b000000000, 0x28f2287200000000,
+    0x9cf39c3300000000, 0x36fa369a00000000, 0x82fb82db00000000,
+    0x5ef95e1900000000, 0xeaf8ea5800000000, 0xe5fce52c00000000,
+    0x51fd516d00000000, 0x8dff8daf00000000, 0x39fe39ee00000000,
+    0x6cb76c7700000000, 0xd8b6d83600000000, 0x04b404f400000000,
+    0xb0b5b0b500000000, 0xbfb1bfc100000000, 0x0bb00b8000000000,
+    0xd7b2d74200000000, 0x63b3630300000000, 0xc9bac9aa00000000,
+    0x7dbb7deb00000000, 0xa1b9a12900000000, 0x15b8156800000000,
+    0x1abc1a1c00000000, 0xaebdae5d00000000, 0x72bf729f00000000,
+    0xc6bec6de00000000, 0x25ac257c00000000, 0x91ad913d00000000,
+    0x4daf4dff00000000, 0xf9aef9be00000000, 0xf6aaf6ca00000000,
+    0x42ab428b00000000, 0x9ea99e4900000000, 0x2aa82a0800000000,
+    0x80a180a100000000, 0x34a034e000000000, 0xe8a2e82200000000,
+    0x5ca35c6300000000, 0x53a7531700000000, 0xe7a6e75600000000,
+    0x3ba43b9400000000, 0x8fa58fd500000000, 0xfe81fe6100000000,
+    0x4a804a2000000000, 0x968296e200000000, 0x228322a300000000,
+    0x2d872dd700000000, 0x9986999600000000, 0x4584455400000000,
+    0xf185f11500000000, 0x5b8c5bbc00000000, 0xef8deffd00000000,
+    0x338f333f00000000, 0x878e877e00000000, 0x888a880a00000000,
+    0x3c8b3c4b00000000, 0xe089e08900000000, 0x548854c800000000,
+    0xb79ab76a00000000, 0x039b032b00000000, 0xdf99dfe900000000,
+    0x6b986ba800000000, 0x649c64dc00000000, 0xd09dd09d00000000,
+    0x0c9f0c5f00000000, 0xb89eb81e00000000, 0x129712b700000000,
+    0xa696a6f600000000, 0x7a947a3400000000, 0xce95ce7500000000,
+    0xc191c10100000000, 0x7590754000000000, 0xa992a98200000000,
+    0x1d931dc300000000},
+   {0x0000000000000000, 0x0100015100000000, 0x020002a200000000,
+    0x030003f300000000, 0x070007f400000000, 0x060006a500000000,
+    0x0500055600000000, 0x0400040700000000, 0x0d000d5800000000,
+    0x0c000c0900000000, 0x0f000ffa00000000, 0x0e000eab00000000,
+    0x0a000aac00000000, 0x0b000bfd00000000, 0x0800080e00000000,
+    0x0900095f00000000, 0x1a001ab000000000, 0x1b001be100000000,
+    0x1800181200000000, 0x1900194300000000, 0x1d001d4400000000,
+    0x1c001c1500000000, 0x1f001fe600000000, 0x1e001eb700000000,
+    0x170017e800000000, 0x160016b900000000, 0x1500154a00000000,
+    0x1400141b00000000, 0x1000101c00000000, 0x1100114d00000000,
+    0x120012be00000000, 0x130013ef00000000, 0x370037d000000000,
+    0x3600368100000000, 0x3500357200000000, 0x3400342300000000,
+    0x3000302400000000, 0x3100317500000000, 0x3200328600000000,
+    0x330033d700000000, 0x3a003a8800000000, 0x3b003bd900000000,
+    0x3800382a00000000, 0x3900397b00000000, 0x3d003d7c00000000,
+    0x3c003c2d00000000, 0x3f003fde00000000, 0x3e003e8f00000000,
+    0x2d002d6000000000, 0x2c002c3100000000, 0x2f002fc200000000,
+    0x2e002e9300000000, 0x2a002a9400000000, 0x2b002bc500000000,
+    0x2800283600000000, 0x2900296700000000, 0x2000203800000000,
+    0x2100216900000000, 0x2200229a00000000, 0x230023cb00000000,
+    0x270027cc00000000, 0x2600269d00000000, 0x2500256e00000000,
+    0x2400243f00000000, 0x6d006d1000000000, 0x6c006c4100000000,
+    0x6f006fb200000000, 0x6e006ee300000000, 0x6a006ae400000000,
+    0x6b006bb500000000, 0x6800684600000000, 0x6900691700000000,
+    0x6000604800000000, 0x6100611900000000, 0x620062ea00000000,
+    0x630063bb00000000, 0x670067bc00000000, 0x660066ed00000000,
+    0x6500651e00000000, 0x6400644f00000000, 0x770077a000000000,
+    0x760076f100000000, 0x7500750200000000, 0x7400745300000000,
+    0x7000705400000000, 0x7100710500000000, 0x720072f600000000,
+    0x730073a700000000, 0x7a007af800000000, 0x7b007ba900000000,
+    0x7800785a00000000, 0x7900790b00000000, 0x7d007d0c00000000,
+    0x7c007c5d00000000, 0x7f007fae00000000, 0x7e007eff00000000,
+    0x5a005ac000000000, 0x5b005b9100000000, 0x5800586200000000,
+    0x5900593300000000, 0x5d005d3400000000, 0x5c005c6500000000,
+    0x5f005f9600000000, 0x5e005ec700000000, 0x5700579800000000,
+    0x560056c900000000, 0x5500553a00000000, 0x5400546b00000000,
+    0x5000506c00000000, 0x5100513d00000000, 0x520052ce00000000,
+    0x5300539f00000000, 0x4000407000000000, 0x4100412100000000,
+    0x420042d200000000, 0x4300438300000000, 0x4700478400000000,
+    0x460046d500000000, 0x4500452600000000, 0x4400447700000000,
+    0x4d004d2800000000, 0x4c004c7900000000, 0x4f004f8a00000000,
+    0x4e004edb00000000, 0x4a004adc00000000, 0x4b004b8d00000000,
+    0x4800487e00000000, 0x4900492f00000000, 0xda00da2000000000,
+    0xdb00db7100000000, 0xd800d88200000000, 0xd900d9d300000000,
+    0xdd00ddd400000000, 0xdc00dc8500000000, 0xdf00df7600000000,
+    0xde00de2700000000, 0xd700d77800000000, 0xd600d62900000000,
+    0xd500d5da00000000, 0xd400d48b00000000, 0xd000d08c00000000,
+    0xd100d1dd00000000, 0xd200d22e00000000, 0xd300d37f00000000,
+    0xc000c09000000000, 0xc100c1c100000000, 0xc200c23200000000,
+    0xc300c36300000000, 0xc700c76400000000, 0xc600c63500000000,
+    0xc500c5c600000000, 0xc400c49700000000, 0xcd00cdc800000000,
+    0xcc00cc9900000000, 0xcf00cf6a00000000, 0xce00ce3b00000000,
+    0xca00ca3c00000000, 0xcb00cb6d00000000, 0xc800c89e00000000,
+    0xc900c9cf00000000, 0xed00edf000000000, 0xec00eca100000000,
+    0xef00ef5200000000, 0xee00ee0300000000, 0xea00ea0400000000,
+    0xeb00eb5500000000, 0xe800e8a600000000, 0xe900e9f700000000,
+    0xe000e0a800000000, 0xe100e1f900000000, 0xe200e20a00000000,
+    0xe300e35b00000000, 0xe700e75c00000000, 0xe600e60d00000000,
+    0xe500e5fe00000000, 0xe400e4af00000000, 0xf700f74000000000,
+    0xf600f61100000000, 0xf500f5e200000000, 0xf400f4b300000000,
+    0xf000f0b400000000, 0xf100f1e500000000, 0xf200f21600000000,
+    0xf300f34700000000, 0xfa00fa1800000000, 0xfb00fb4900000000,
+    0xf800f8ba00000000, 0xf900f9eb00000000, 0xfd00fdec00000000,
+    0xfc00fcbd00000000, 0xff00ff4e00000000, 0xfe00fe1f00000000,
+    0xb700b73000000000, 0xb600b66100000000, 0xb500b59200000000,
+    0xb400b4c300000000, 0xb000b0c400000000, 0xb100b19500000000,
+    0xb200b26600000000, 0xb300b33700000000, 0xba00ba6800000000,
+    0xbb00bb3900000000, 0xb800b8ca00000000, 0xb900b99b00000000,
+    0xbd00bd9c00000000, 0xbc00bccd00000000, 0xbf00bf3e00000000,
+    0xbe00be6f00000000, 0xad00ad8000000000, 0xac00acd100000000,
+    0xaf00af2200000000, 0xae00ae7300000000, 0xaa00aa7400000000,
+    0xab00ab2500000000, 0xa800a8d600000000, 0xa900a98700000000,
+    0xa000a0d800000000, 0xa100a18900000000, 0xa200a27a00000000,
+    0xa300a32b00000000, 0xa700a72c00000000, 0xa600a67d00000000,
+    0xa500a58e00000000, 0xa400a4df00000000, 0x800080e000000000,
+    0x810081b100000000, 0x8200824200000000, 0x8300831300000000,
+    0x8700871400000000, 0x8600864500000000, 0x850085b600000000,
+    0x840084e700000000, 0x8d008db800000000, 0x8c008ce900000000,
+    0x8f008f1a00000000, 0x8e008e4b00000000, 0x8a008a4c00000000,
+    0x8b008b1d00000000, 0x880088ee00000000, 0x890089bf00000000,
+    0x9a009a5000000000, 0x9b009b0100000000, 0x980098f200000000,
+    0x990099a300000000, 0x9d009da400000000, 0x9c009cf500000000,
+    0x9f009f0600000000, 0x9e009e5700000000, 0x9700970800000000,
+    0x9600965900000000, 0x950095aa00000000, 0x940094fb00000000,
+    0x900090fc00000000, 0x910091ad00000000, 0x9200925e00000000,
+    0x9300930f00000000},
+   {0x0000000000000000, 0x0100c09000000000, 0x0100839100000000,
+    0x0000430100000000, 0x0100059300000000, 0x0000c50300000000,
+    0x0000860200000000, 0x0100469200000000, 0x0100099600000000,
+    0x0000c90600000000, 0x00008a0700000000, 0x01004a9700000000,
+    0x00000c0500000000, 0x0100cc9500000000, 0x01008f9400000000,
+    0x00004f0400000000, 0x0100119c00000000, 0x0000d10c00000000,
+    0x0000920d00000000, 0x0100529d00000000, 0x0000140f00000000,
+    0x0100d49f00000000, 0x0100979e00000000, 0x0000570e00000000,
+    0x0000180a00000000, 0x0100d89a00000000, 0x01009b9b00000000,
+    0x00005b0b00000000, 0x01001d9900000000, 0x0000dd0900000000,
+    0x00009e0800000000, 0x01005e9800000000, 0x0100218800000000,
+    0x0000e11800000000, 0x0000a21900000000, 0x0100628900000000,
+    0x0000241b00000000, 0x0100e48b00000000, 0x0100a78a00000000,
+    0x0000671a00000000, 0x0000281e00000000, 0x0100e88e00000000,
+    0x0100ab8f00000000, 0x00006b1f00000000, 0x01002d8d00000000,
+    0x0000ed1d00000000, 0x0000ae1c00000000, 0x01006e8c00000000,
+    0x0000301400000000, 0x0100f08400000000, 0x0100b38500000000,
+    0x0000731500000000, 0x0100358700000000, 0x0000f51700000000,
+    0x0000b61600000000, 0x0100768600000000, 0x0100398200000000,
+    0x0000f91200000000, 0x0000ba1300000000, 0x01007a8300000000,
+    0x00003c1100000000, 0x0100fc8100000000, 0x0100bf8000000000,
+    0x00007f1000000000, 0x010041a000000000, 0x0000813000000000,
+    0x0000c23100000000, 0x010002a100000000, 0x0000443300000000,
+    0x010084a300000000, 0x0100c7a200000000, 0x0000073200000000,
+    0x0000483600000000, 0x010088a600000000, 0x0100cba700000000,
+    0x00000b3700000000, 0x01004da500000000, 0x00008d3500000000,
+    0x0000ce3400000000, 0x01000ea400000000, 0x0000503c00000000,
+    0x010090ac00000000, 0x0100d3ad00000000, 0x0000133d00000000,
+    0x010055af00000000, 0x0000953f00000000, 0x0000d63e00000000,
+    0x010016ae00000000, 0x010059aa00000000, 0x0000993a00000000,
+    0x0000da3b00000000, 0x01001aab00000000, 0x00005c3900000000,
+    0x01009ca900000000, 0x0100dfa800000000, 0x00001f3800000000,
+    0x0000602800000000, 0x0100a0b800000000, 0x0100e3b900000000,
+    0x0000232900000000, 0x010065bb00000000, 0x0000a52b00000000,
+    0x0000e62a00000000, 0x010026ba00000000, 0x010069be00000000,
+    0x0000a92e00000000, 0x0000ea2f00000000, 0x01002abf00000000,
+    0x00006c2d00000000, 0x0100acbd00000000, 0x0100efbc00000000,
+    0x00002f2c00000000, 0x010071b400000000, 0x0000b12400000000,
+    0x0000f22500000000, 0x010032b500000000, 0x0000742700000000,
+    0x0100b4b700000000, 0x0100f7b600000000, 0x0000372600000000,
+    0x0000782200000000, 0x0100b8b200000000, 0x0100fbb300000000,
+    0x00003b2300000000, 0x01007db100000000, 0x0000bd2100000000,
+    0x0000fe2000000000, 0x01003eb000000000, 0x010081f000000000,
+    0x0000416000000000, 0x0000026100000000, 0x0100c2f100000000,
+    0x0000846300000000, 0x010044f300000000, 0x010007f200000000,
+    0x0000c76200000000, 0x0000886600000000, 0x010048f600000000,
+    0x01000bf700000000, 0x0000cb6700000000, 0x01008df500000000,
+    0x00004d6500000000, 0x00000e6400000000, 0x0100cef400000000,
+    0x0000906c00000000, 0x010050fc00000000, 0x010013fd00000000,
+    0x0000d36d00000000, 0x010095ff00000000, 0x0000556f00000000,
+    0x0000166e00000000, 0x0100d6fe00000000, 0x010099fa00000000,
+    0x0000596a00000000, 0x00001a6b00000000, 0x0100dafb00000000,
+    0x00009c6900000000, 0x01005cf900000000, 0x01001ff800000000,
+    0x0000df6800000000, 0x0000a07800000000, 0x010060e800000000,
+    0x010023e900000000, 0x0000e37900000000, 0x0100a5eb00000000,
+    0x0000657b00000000, 0x0000267a00000000, 0x0100e6ea00000000,
+    0x0100a9ee00000000, 0x0000697e00000000, 0x00002a7f00000000,
+    0x0100eaef00000000, 0x0000ac7d00000000, 0x01006ced00000000,
+    0x01002fec00000000, 0x0000ef7c00000000, 0x0100b1e400000000,
+    0x0000717400000000, 0x0000327500000000, 0x0100f2e500000000,
+    0x0000b47700000000, 0x010074e700000000, 0x010037e600000000,
+    0x0000f77600000000, 0x0000b87200000000, 0x010078e200000000,
+    0x01003be300000000, 0x0000fb7300000000, 0x0100bde100000000,
+    0x00007d7100000000, 0x00003e7000000000, 0x0100fee000000000,
+    0x0000c05000000000, 0x010000c000000000, 0x010043c100000000,
+    0x0000835100000000, 0x0100c5c300000000, 0x0000055300000000,
+    0x0000465200000000, 0x010086c200000000, 0x0100c9c600000000,
+    0x0000095600000000, 0x00004a5700000000, 0x01008ac700000000,
+    0x0000cc5500000000, 0x01000cc500000000, 0x01004fc400000000,
+    0x00008f5400000000, 0x0100d1cc00000000, 0x0000115c00000000,
+    0x0000525d00000000, 0x010092cd00000000, 0x0000d45f00000000,
+    0x010014cf00000000, 0x010057ce00000000, 0x0000975e00000000,
+    0x0000d85a00000000, 0x010018ca00000000, 0x01005bcb00000000,
+    0x00009b5b00000000, 0x0100ddc900000000, 0x00001d5900000000,
+    0x00005e5800000000, 0x01009ec800000000, 0x0100e1d800000000,
+    0x0000214800000000, 0x0000624900000000, 0x0100a2d900000000,
+    0x0000e44b00000000, 0x010024db00000000, 0x010067da00000000,
+    0x0000a74a00000000, 0x0000e84e00000000, 0x010028de00000000,
+    0x01006bdf00000000, 0x0000ab4f00000000, 0x0100eddd00000000,
+    0x00002d4d00000000, 0x00006e4c00000000, 0x0100aedc00000000,
+    0x0000f04400000000, 0x010030d400000000, 0x010073d500000000,
+    0x0000b34500000000, 0x0100f5d700000000, 0x0000354700000000,
+    0x0000764600000000, 0x0100b6d600000000, 0x0100f9d200000000,
+    0x0000394200000000, 0x00007a4300000000, 0x0100bad300000000,
+    0x0000fc4100000000, 0x01003cd100000000, 0x01007fd000000000,
+    0x0000bf4000000000},
+   {0x0000000000000000, 0x01c1019000000000, 0x0182009000000000,
+    0x0043010000000000, 0x0104029000000000, 0x00c5030000000000,
+    0x0086020000000000, 0x0147039000000000, 0x0108079000000000,
+    0x00c9060000000000, 0x008a070000000000, 0x014b069000000000,
+    0x000c050000000000, 0x01cd049000000000, 0x018e059000000000,
+    0x004f040000000000, 0x01100d9000000000, 0x00d10c0000000000,
+    0x00920d0000000000, 0x01530c9000000000, 0x00140f0000000000,
+    0x01d50e9000000000, 0x01960f9000000000, 0x00570e0000000000,
+    0x00180a0000000000, 0x01d90b9000000000, 0x019a0a9000000000,
+    0x005b0b0000000000, 0x011c089000000000, 0x00dd090000000000,
+    0x009e080000000000, 0x015f099000000000, 0x0120199000000000,
+    0x00e1180000000000, 0x00a2190000000000, 0x0163189000000000,
+    0x00241b0000000000, 0x01e51a9000000000, 0x01a61b9000000000,
+    0x00671a0000000000, 0x00281e0000000000, 0x01e91f9000000000,
+    0x01aa1e9000000000, 0x006b1f0000000000, 0x012c1c9000000000,
+    0x00ed1d0000000000, 0x00ae1c0000000000, 0x016f1d9000000000,
+    0x0030140000000000, 0x01f1159000000000, 0x01b2149000000000,
+    0x0073150000000000, 0x0134169000000000, 0x00f5170000000000,
+    0x00b6160000000000, 0x0177179000000000, 0x0138139000000000,
+    0x00f9120000000000, 0x00ba130000000000, 0x017b129000000000,
+    0x003c110000000000, 0x01fd109000000000, 0x01be119000000000,
+    0x007f100000000000, 0x0140319000000000, 0x0081300000000000,
+    0x00c2310000000000, 0x0103309000000000, 0x0044330000000000,
+    0x0185329000000000, 0x01c6339000000000, 0x0007320000000000,
+    0x0048360000000000, 0x0189379000000000, 0x01ca369000000000,
+    0x000b370000000000, 0x014c349000000000, 0x008d350000000000,
+    0x00ce340000000000, 0x010f359000000000, 0x00503c0000000000,
+    0x01913d9000000000, 0x01d23c9000000000, 0x00133d0000000000,
+    0x01543e9000000000, 0x00953f0000000000, 0x00d63e0000000000,
+    0x01173f9000000000, 0x01583b9000000000, 0x00993a0000000000,
+    0x00da3b0000000000, 0x011b3a9000000000, 0x005c390000000000,
+    0x019d389000000000, 0x01de399000000000, 0x001f380000000000,
+    0x0060280000000000, 0x01a1299000000000, 0x01e2289000000000,
+    0x0023290000000000, 0x01642a9000000000, 0x00a52b0000000000,
+    0x00e62a0000000000, 0x01272b9000000000, 0x01682f9000000000,
+    0x00a92e0000000000, 0x00ea2f0000000000, 0x012b2e9000000000,
+    0x006c2d0000000000, 0x01ad2c9000000000, 0x01ee2d9000000000,
+    0x002f2c0000000000, 0x0170259000000000, 0x00b1240000000000,
+    0x00f2250000000000, 0x0133249000000000, 0x0074270000000000,
+    0x01b5269000000000, 0x01f6279000000000, 0x0037260000000000,
+    0x0078220000000000, 0x01b9239000000000, 0x01fa229000000000,
+    0x003b230000000000, 0x017c209000000000, 0x00bd210000000000,
+    0x00fe200000000000, 0x013f219000000000, 0x0180619000000000,
+    0x0041600000000000, 0x0002610000000000, 0x01c3609000000000,
+    0x0084630000000000, 0x0145629000000000, 0x0106639000000000,
+    0x00c7620000000000, 0x0088660000000000, 0x0149679000000000,
+    0x010a669000000000, 0x00cb670000000000, 0x018c649000000000,
+    0x004d650000000000, 0x000e640000000000, 0x01cf659000000000,
+    0x00906c0000000000, 0x01516d9000000000, 0x01126c9000000000,
+    0x00d36d0000000000, 0x01946e9000000000, 0x00556f0000000000,
+    0x00166e0000000000, 0x01d76f9000000000, 0x01986b9000000000,
+    0x00596a0000000000, 0x001a6b0000000000, 0x01db6a9000000000,
+    0x009c690000000000, 0x015d689000000000, 0x011e699000000000,
+    0x00df680000000000, 0x00a0780000000000, 0x0161799000000000,
+    0x0122789000000000, 0x00e3790000000000, 0x01a47a9000000000,
+    0x00657b0000000000, 0x00267a0000000000, 0x01e77b9000000000,
+    0x01a87f9000000000, 0x00697e0000000000, 0x002a7f0000000000,
+    0x01eb7e9000000000, 0x00ac7d0000000000, 0x016d7c9000000000,
+    0x012e7d9000000000, 0x00ef7c0000000000, 0x01b0759000000000,
+    0x0071740000000000, 0x0032750000000000, 0x01f3749000000000,
+    0x00b4770000000000, 0x0175769000000000, 0x0136779000000000,
+    0x00f7760000000000, 0x00b8720000000000, 0x0179739000000000,
+    0x013a729000000000, 0x00fb730000000000, 0x01bc709000000000,
+    0x007d710000000000, 0x003e700000000000, 0x01ff719000000000,
+    0x00c0500000000000, 0x0101519000000000, 0x0142509000000000,
+    0x0083510000000000, 0x01c4529000000000, 0x0005530000000000,
+    0x0046520000000000, 0x0187539000000000, 0x01c8579000000000,
+    0x0009560000000000, 0x004a570000000000, 0x018b569000000000,
+    0x00cc550000000000, 0x010d549000000000, 0x014e559000000000,
+    0x008f540000000000, 0x01d05d9000000000, 0x00115c0000000000,
+    0x00525d0000000000, 0x01935c9000000000, 0x00d45f0000000000,
+    0x01155e9000000000, 0x01565f9000000000, 0x00975e0000000000,
+    0x00d85a0000000000, 0x01195b9000000000, 0x015a5a9000000000,
+    0x009b5b0000000000, 0x01dc589000000000, 0x001d590000000000,
+    0x005e580000000000, 0x019f599000000000, 0x01e0499000000000,
+    0x0021480000000000, 0x0062490000000000, 0x01a3489000000000,
+    0x00e44b0000000000, 0x01254a9000000000, 0x01664b9000000000,
+    0x00a74a0000000000, 0x00e84e0000000000, 0x01294f9000000000,
+    0x016a4e9000000000, 0x00ab4f0000000000, 0x01ec4c9000000000,
+    0x002d4d0000000000, 0x006e4c0000000000, 0x01af4d9000000000,
+    0x00f0440000000000, 0x0131459000000000, 0x0172449000000000,
+    0x00b3450000000000, 0x01f4469000000000, 0x0035470000000000,
+    0x0076460000000000, 0x01b7479000000000, 0x01f8439000000000,
+    0x0039420000000000, 0x007a430000000000, 0x01bb429000000000,
+    0x00fc410000000000, 0x013d409000000000, 0x017e419000000000,
+    0x00bf400000000000},
+   {0x0000000000000000, 0xc000019000000000, 0x8301019000000000,
+    0x4301000000000000, 0x0503019000000000, 0xc503000000000000,
+    0x8602000000000000, 0x4602019000000000, 0x0906019000000000,
+    0xc906000000000000, 0x8a07000000000000, 0x4a07019000000000,
+    0x0c05000000000000, 0xcc05019000000000, 0x8f04019000000000,
+    0x4f04000000000000, 0x110c019000000000, 0xd10c000000000000,
+    0x920d000000000000, 0x520d019000000000, 0x140f000000000000,
+    0xd40f019000000000, 0x970e019000000000, 0x570e000000000000,
+    0x180a000000000000, 0xd80a019000000000, 0x9b0b019000000000,
+    0x5b0b000000000000, 0x1d09019000000000, 0xdd09000000000000,
+    0x9e08000000000000, 0x5e08019000000000, 0x2118019000000000,
+    0xe118000000000000, 0xa219000000000000, 0x6219019000000000,
+    0x241b000000000000, 0xe41b019000000000, 0xa71a019000000000,
+    0x671a000000000000, 0x281e000000000000, 0xe81e019000000000,
+    0xab1f019000000000, 0x6b1f000000000000, 0x2d1d019000000000,
+    0xed1d000000000000, 0xae1c000000000000, 0x6e1c019000000000,
+    0x3014000000000000, 0xf014019000000000, 0xb315019000000000,
+    0x7315000000000000, 0x3517019000000000, 0xf517000000000000,
+    0xb616000000000000, 0x7616019000000000, 0x3912019000000000,
+    0xf912000000000000, 0xba13000000000000, 0x7a13019000000000,
+    0x3c11000000000000, 0xfc11019000000000, 0xbf10019000000000,
+    0x7f10000000000000, 0x4130019000000000, 0x8130000000000000,
+    0xc231000000000000, 0x0231019000000000, 0x4433000000000000,
+    0x8433019000000000, 0xc732019000000000, 0x0732000000000000,
+    0x4836000000000000, 0x8836019000000000, 0xcb37019000000000,
+    0x0b37000000000000, 0x4d35019000000000, 0x8d35000000000000,
+    0xce34000000000000, 0x0e34019000000000, 0x503c000000000000,
+    0x903c019000000000, 0xd33d019000000000, 0x133d000000000000,
+    0x553f019000000000, 0x953f000000000000, 0xd63e000000000000,
+    0x163e019000000000, 0x593a019000000000, 0x993a000000000000,
+    0xda3b000000000000, 0x1a3b019000000000, 0x5c39000000000000,
+    0x9c39019000000000, 0xdf38019000000000, 0x1f38000000000000,
+    0x6028000000000000, 0xa028019000000000, 0xe329019000000000,
+    0x2329000000000000, 0x652b019000000000, 0xa52b000000000000,
+    0xe62a000000000000, 0x262a019000000000, 0x692e019000000000,
+    0xa92e000000000000, 0xea2f000000000000, 0x2a2f019000000000,
+    0x6c2d000000000000, 0xac2d019000000000, 0xef2c019000000000,
+    0x2f2c000000000000, 0x7124019000000000, 0xb124000000000000,
+    0xf225000000000000, 0x3225019000000000, 0x7427000000000000,
+    0xb427019000000000, 0xf726019000000000, 0x3726000000000000,
+    0x7822000000000000, 0xb822019000000000, 0xfb23019000000000,
+    0x3b23000000000000, 0x7d21019000000000, 0xbd21000000000000,
+    0xfe20000000000000, 0x3e20019000000000, 0x8160019000000000,
+    0x4160000000000000, 0x0261000000000000, 0xc261019000000000,
+    0x8463000000000000, 0x4463019000000000, 0x0762019000000000,
+    0xc762000000000000, 0x8866000000000000, 0x4866019000000000,
+    0x0b67019000000000, 0xcb67000000000000, 0x8d65019000000000,
+    0x4d65000000000000, 0x0e64000000000000, 0xce64019000000000,
+    0x906c000000000000, 0x506c019000000000, 0x136d019000000000,
+    0xd36d000000000000, 0x956f019000000000, 0x556f000000000000,
+    0x166e000000000000, 0xd66e019000000000, 0x996a019000000000,
+    0x596a000000000000, 0x1a6b000000000000, 0xda6b019000000000,
+    0x9c69000000000000, 0x5c69019000000000, 0x1f68019000000000,
+    0xdf68000000000000, 0xa078000000000000, 0x6078019000000000,
+    0x2379019000000000, 0xe379000000000000, 0xa57b019000000000,
+    0x657b000000000000, 0x267a000000000000, 0xe67a019000000000,
+    0xa97e019000000000, 0x697e000000000000, 0x2a7f000000000000,
+    0xea7f019000000000, 0xac7d000000000000, 0x6c7d019000000000,
+    0x2f7c019000000000, 0xef7c000000000000, 0xb174019000000000,
+    0x7174000000000000, 0x3275000000000000, 0xf275019000000000,
+    0xb477000000000000, 0x7477019000000000, 0x3776019000000000,
+    0xf776000000000000, 0xb872000000000000, 0x7872019000000000,
+    0x3b73019000000000, 0xfb73000000000000, 0xbd71019000000000,
+    0x7d71000000000000, 0x3e70000000000000, 0xfe70019000000000,
+    0xc050000000000000, 0x0050019000000000, 0x4351019000000000,
+    0x8351000000000000, 0xc553019000000000, 0x0553000000000000,
+    0x4652000000000000, 0x8652019000000000, 0xc956019000000000,
+    0x0956000000000000, 0x4a57000000000000, 0x8a57019000000000,
+    0xcc55000000000000, 0x0c55019000000000, 0x4f54019000000000,
+    0x8f54000000000000, 0xd15c019000000000, 0x115c000000000000,
+    0x525d000000000000, 0x925d019000000000, 0xd45f000000000000,
+    0x145f019000000000, 0x575e019000000000, 0x975e000000000000,
+    0xd85a000000000000, 0x185a019000000000, 0x5b5b019000000000,
+    0x9b5b000000000000, 0xdd59019000000000, 0x1d59000000000000,
+    0x5e58000000000000, 0x9e58019000000000, 0xe148019000000000,
+    0x2148000000000000, 0x6249000000000000, 0xa249019000000000,
+    0xe44b000000000000, 0x244b019000000000, 0x674a019000000000,
+    0xa74a000000000000, 0xe84e000000000000, 0x284e019000000000,
+    0x6b4f019000000000, 0xab4f000000000000, 0xed4d019000000000,
+    0x2d4d000000000000, 0x6e4c000000000000, 0xae4c019000000000,
+    0xf044000000000000, 0x3044019000000000, 0x7345019000000000,
+    0xb345000000000000, 0xf547019000000000, 0x3547000000000000,
+    0x7646000000000000, 0xb646019000000000, 0xf942019000000000,
+    0x3942000000000000, 0x7a43000000000000, 0xba43019000000000,
+    0xfc41000000000000, 0x3c41019000000000, 0x7f40019000000000,
+    0xbf40000000000000},
+   {0x0000000000000000, 0x00c1906c00000000, 0x008221d900000000,
+    0x0043b1b500000000, 0x0304400200000000, 0x03c5d06e00000000,
+    0x038661db00000000, 0x0347f1b700000000, 0x0608800400000000,
+    0x06c9106800000000, 0x068aa1dd00000000, 0x064b31b100000000,
+    0x050cc00600000000, 0x05cd506a00000000, 0x058ee1df00000000,
+    0x054f71b300000000, 0x0c10000900000000, 0x0cd1906500000000,
+    0x0c9221d000000000, 0x0c53b1bc00000000, 0x0f14400b00000000,
+    0x0fd5d06700000000, 0x0f9661d200000000, 0x0f57f1be00000000,
+    0x0a18800d00000000, 0x0ad9106100000000, 0x0a9aa1d400000000,
+    0x0a5b31b800000000, 0x091cc00f00000000, 0x09dd506300000000,
+    0x099ee1d600000000, 0x095f71ba00000000, 0x1820001200000000,
+    0x18e1907e00000000, 0x18a221cb00000000, 0x1863b1a700000000,
+    0x1b24401000000000, 0x1be5d07c00000000, 0x1ba661c900000000,
+    0x1b67f1a500000000, 0x1e28801600000000, 0x1ee9107a00000000,
+    0x1eaaa1cf00000000, 0x1e6b31a300000000, 0x1d2cc01400000000,
+    0x1ded507800000000, 0x1daee1cd00000000, 0x1d6f71a100000000,
+    0x1430001b00000000, 0x14f1907700000000, 0x14b221c200000000,
+    0x1473b1ae00000000, 0x1734401900000000, 0x17f5d07500000000,
+    0x17b661c000000000, 0x1777f1ac00000000, 0x1238801f00000000,
+    0x12f9107300000000, 0x12baa1c600000000, 0x127b31aa00000000,
+    0x113cc01d00000000, 0x11fd507100000000, 0x11bee1c400000000,
+    0x117f71a800000000, 0x3040002400000000, 0x3081904800000000,
+    0x30c221fd00000000, 0x3003b19100000000, 0x3344402600000000,
+    0x3385d04a00000000, 0x33c661ff00000000, 0x3307f19300000000,
+    0x3648802000000000, 0x3689104c00000000, 0x36caa1f900000000,
+    0x360b319500000000, 0x354cc02200000000, 0x358d504e00000000,
+    0x35cee1fb00000000, 0x350f719700000000, 0x3c50002d00000000,
+    0x3c91904100000000, 0x3cd221f400000000, 0x3c13b19800000000,
+    0x3f54402f00000000, 0x3f95d04300000000, 0x3fd661f600000000,
+    0x3f17f19a00000000, 0x3a58802900000000, 0x3a99104500000000,
+    0x3adaa1f000000000, 0x3a1b319c00000000, 0x395cc02b00000000,
+    0x399d504700000000, 0x39dee1f200000000, 0x391f719e00000000,
+    0x2860003600000000, 0x28a1905a00000000, 0x28e221ef00000000,
+    0x2823b18300000000, 0x2b64403400000000, 0x2ba5d05800000000,
+    0x2be661ed00000000, 0x2b27f18100000000, 0x2e68803200000000,
+    0x2ea9105e00000000, 0x2eeaa1eb00000000, 0x2e2b318700000000,
+    0x2d6cc03000000000, 0x2dad505c00000000, 0x2deee1e900000000,
+    0x2d2f718500000000, 0x2470003f00000000, 0x24b1905300000000,
+    0x24f221e600000000, 0x2433b18a00000000, 0x2774403d00000000,
+    0x27b5d05100000000, 0x27f661e400000000, 0x2737f18800000000,
+    0x2278803b00000000, 0x22b9105700000000, 0x22faa1e200000000,
+    0x223b318e00000000, 0x217cc03900000000, 0x21bd505500000000,
+    0x21fee1e000000000, 0x213f718c00000000, 0x6080004800000000,
+    0x6041902400000000, 0x6002219100000000, 0x60c3b1fd00000000,
+    0x6384404a00000000, 0x6345d02600000000, 0x6306619300000000,
+    0x63c7f1ff00000000, 0x6688804c00000000, 0x6649102000000000,
+    0x660aa19500000000, 0x66cb31f900000000, 0x658cc04e00000000,
+    0x654d502200000000, 0x650ee19700000000, 0x65cf71fb00000000,
+    0x6c90004100000000, 0x6c51902d00000000, 0x6c12219800000000,
+    0x6cd3b1f400000000, 0x6f94404300000000, 0x6f55d02f00000000,
+    0x6f16619a00000000, 0x6fd7f1f600000000, 0x6a98804500000000,
+    0x6a59102900000000, 0x6a1aa19c00000000, 0x6adb31f000000000,
+    0x699cc04700000000, 0x695d502b00000000, 0x691ee19e00000000,
+    0x69df71f200000000, 0x78a0005a00000000, 0x7861903600000000,
+    0x7822218300000000, 0x78e3b1ef00000000, 0x7ba4405800000000,
+    0x7b65d03400000000, 0x7b26618100000000, 0x7be7f1ed00000000,
+    0x7ea8805e00000000, 0x7e69103200000000, 0x7e2aa18700000000,
+    0x7eeb31eb00000000, 0x7dacc05c00000000, 0x7d6d503000000000,
+    0x7d2ee18500000000, 0x7def71e900000000, 0x74b0005300000000,
+    0x7471903f00000000, 0x7432218a00000000, 0x74f3b1e600000000,
+    0x77b4405100000000, 0x7775d03d00000000, 0x7736618800000000,
+    0x77f7f1e400000000, 0x72b8805700000000, 0x7279103b00000000,
+    0x723aa18e00000000, 0x72fb31e200000000, 0x71bcc05500000000,
+    0x717d503900000000, 0x713ee18c00000000, 0x71ff71e000000000,
+    0x50c0006c00000000, 0x5001900000000000, 0x504221b500000000,
+    0x5083b1d900000000, 0x53c4406e00000000, 0x5305d00200000000,
+    0x534661b700000000, 0x5387f1db00000000, 0x56c8806800000000,
+    0x5609100400000000, 0x564aa1b100000000, 0x568b31dd00000000,
+    0x55ccc06a00000000, 0x550d500600000000, 0x554ee1b300000000,
+    0x558f71df00000000, 0x5cd0006500000000, 0x5c11900900000000,
+    0x5c5221bc00000000, 0x5c93b1d000000000, 0x5fd4406700000000,
+    0x5f15d00b00000000, 0x5f5661be00000000, 0x5f97f1d200000000,
+    0x5ad8806100000000, 0x5a19100d00000000, 0x5a5aa1b800000000,
+    0x5a9b31d400000000, 0x59dcc06300000000, 0x591d500f00000000,
+    0x595ee1ba00000000, 0x599f71d600000000, 0x48e0007e00000000,
+    0x4821901200000000, 0x486221a700000000, 0x48a3b1cb00000000,
+    0x4be4407c00000000, 0x4b25d01000000000, 0x4b6661a500000000,
+    0x4ba7f1c900000000, 0x4ee8807a00000000, 0x4e29101600000000,
+    0x4e6aa1a300000000, 0x4eab31cf00000000, 0x4decc07800000000,
+    0x4d2d501400000000, 0x4d6ee1a100000000, 0x4daf71cd00000000,
+    0x44f0007700000000, 0x4431901b00000000, 0x447221ae00000000,
+    0x44b3b1c200000000, 0x47f4407500000000, 0x4735d01900000000,
+    0x477661ac00000000, 0x47b7f1c000000000, 0x42f8807300000000,
+    0x4239101f00000000, 0x427aa1aa00000000, 0x42bb31c600000000,
+    0x41fcc07100000000, 0x413d501d00000000, 0x417ee1a800000000,
+    0x41bf71c400000000}};
+
+#else /* W == 4 */
+
+static const crc_t crc_braid_table[][256] = {
+   {0x00000000, 0x65904101, 0xcb208202, 0xaeb0c303, 0x26420407,
+    0x43d24506, 0xed628605, 0x88f2c704, 0x4c84080e, 0x2914490f,
+    0x87a48a0c, 0xe234cb0d, 0x6ac60c09, 0x0f564d08, 0xa1e68e0b,
+    0xc476cf0a, 0x9908101c, 0xfc98511d, 0x5228921e, 0x37b8d31f,
+    0xbf4a141b, 0xdada551a, 0x746a9619, 0x11fad718, 0xd58c1812,
+    0xb01c5913, 0x1eac9a10, 0x7b3cdb11, 0xf3ce1c15, 0x965e5d14,
+    0x38ee9e17, 0x5d7edf16, 0x8213203b, 0xe783613a, 0x4933a239,
+    0x2ca3e338, 0xa451243c, 0xc1c1653d, 0x6f71a63e, 0x0ae1e73f,
+    0xce972835, 0xab076934, 0x05b7aa37, 0x6027eb36, 0xe8d52c32,
+    0x8d456d33, 0x23f5ae30, 0x4665ef31, 0x1b1b3027, 0x7e8b7126,
+    0xd03bb225, 0xb5abf324, 0x3d593420, 0x58c97521, 0xf679b622,
+    0x93e9f723, 0x579f3829, 0x320f7928, 0x9cbfba2b, 0xf92ffb2a,
+    0x71dd3c2e, 0x144d7d2f, 0xbafdbe2c, 0xdf6dff2d, 0xb4254075,
+    0xd1b50174, 0x7f05c277, 0x1a958376, 0x92674472, 0xf7f70573,
+    0x5947c670, 0x3cd78771, 0xf8a1487b, 0x9d31097a, 0x3381ca79,
+    0x56118b78, 0xdee34c7c, 0xbb730d7d, 0x15c3ce7e, 0x70538f7f,
+    0x2d2d5069, 0x48bd1168, 0xe60dd26b, 0x839d936a, 0x0b6f546e,
+    0x6eff156f, 0xc04fd66c, 0xa5df976d, 0x61a95867, 0x04391966,
+    0xaa89da65, 0xcf199b64, 0x47eb5c60, 0x227b1d61, 0x8ccbde62,
+    0xe95b9f63, 0x3636604e, 0x53a6214f, 0xfd16e24c, 0x9886a34d,
+    0x10746449, 0x75e42548, 0xdb54e64b, 0xbec4a74a, 0x7ab26840,
+    0x1f222941, 0xb192ea42, 0xd402ab43, 0x5cf06c47, 0x39602d46,
+    0x97d0ee45, 0xf240af44, 0xaf3e7052, 0xcaae3153, 0x641ef250,
+    0x018eb351, 0x897c7455, 0xecec3554, 0x425cf657, 0x27ccb756,
+    0xe3ba785c, 0x862a395d, 0x289afa5e, 0x4d0abb5f, 0xc5f87c5b,
+    0xa0683d5a, 0x0ed8fe59, 0x6b48bf58, 0xd84980e9, 0xbdd9c1e8,
+    0x136902eb, 0x76f943ea, 0xfe0b84ee, 0x9b9bc5ef, 0x352b06ec,
+    0x50bb47ed, 0x94cd88e7, 0xf15dc9e6, 0x5fed0ae5, 0x3a7d4be4,
+    0xb28f8ce0, 0xd71fcde1, 0x79af0ee2, 0x1c3f4fe3, 0x414190f5,
+    0x24d1d1f4, 0x8a6112f7, 0xeff153f6, 0x670394f2, 0x0293d5f3,
+    0xac2316f0, 0xc9b357f1, 0x0dc598fb, 0x6855d9fa, 0xc6e51af9,
+    0xa3755bf8, 0x2b879cfc, 0x4e17ddfd, 0xe0a71efe, 0x85375fff,
+    0x5a5aa0d2, 0x3fcae1d3, 0x917a22d0, 0xf4ea63d1, 0x7c18a4d5,
+    0x1988e5d4, 0xb73826d7, 0xd2a867d6, 0x16dea8dc, 0x734ee9dd,
+    0xddfe2ade, 0xb86e6bdf, 0x309cacdb, 0x550cedda, 0xfbbc2ed9,
+    0x9e2c6fd8, 0xc352b0ce, 0xa6c2f1cf, 0x087232cc, 0x6de273cd,
+    0xe510b4c9, 0x8080f5c8, 0x2e3036cb, 0x4ba077ca, 0x8fd6b8c0,
+    0xea46f9c1, 0x44f63ac2, 0x21667bc3, 0xa994bcc7, 0xcc04fdc6,
+    0x62b43ec5, 0x07247fc4, 0x6c6cc09c, 0x09fc819d, 0xa74c429e,
+    0xc2dc039f, 0x4a2ec49b, 0x2fbe859a, 0x810e4699, 0xe49e0798,
+    0x20e8c892, 0x45788993, 0xebc84a90, 0x8e580b91, 0x06aacc95,
+    0x633a8d94, 0xcd8a4e97, 0xa81a0f96, 0xf564d080, 0x90f49181,
+    0x3e445282, 0x5bd41383, 0xd326d487, 0xb6b69586, 0x18065685,
+    0x7d961784, 0xb9e0d88e, 0xdc70998f, 0x72c05a8c, 0x17501b8d,
+    0x9fa2dc89, 0xfa329d88, 0x54825e8b, 0x31121f8a, 0xee7fe0a7,
+    0x8befa1a6, 0x255f62a5, 0x40cf23a4, 0xc83de4a0, 0xadada5a1,
+    0x031d66a2, 0x668d27a3, 0xa2fbe8a9, 0xc76ba9a8, 0x69db6aab,
+    0x0c4b2baa, 0x84b9ecae, 0xe129adaf, 0x4f996eac, 0x2a092fad,
+    0x7777f0bb, 0x12e7b1ba, 0xbc5772b9, 0xd9c733b8, 0x5135f4bc,
+    0x34a5b5bd, 0x9a1576be, 0xff8537bf, 0x3bf3f8b5, 0x5e63b9b4,
+    0xf0d37ab7, 0x95433bb6, 0x1db1fcb2, 0x7821bdb3, 0xd6917eb0,
+    0xb3013fb1},
+   {0x00000000, 0x009001d1, 0x012003a2, 0x01b00273, 0x02400744,
+    0x02d00695, 0x036004e6, 0x03f00537, 0x04800e88, 0x04100f59,
+    0x05a00d2a, 0x05300cfb, 0x06c009cc, 0x0650081d, 0x07e00a6e,
+    0x07700bbf, 0x09001d10, 0x09901cc1, 0x08201eb2, 0x08b01f63,
+    0x0b401a54, 0x0bd01b85, 0x0a6019f6, 0x0af01827, 0x0d801398,
+    0x0d101249, 0x0ca0103a, 0x0c3011eb, 0x0fc014dc, 0x0f50150d,
+    0x0ee0177e, 0x0e7016af, 0x12003a20, 0x12903bf1, 0x13203982,
+    0x13b03853, 0x10403d64, 0x10d03cb5, 0x11603ec6, 0x11f03f17,
+    0x168034a8, 0x16103579, 0x17a0370a, 0x173036db, 0x14c033ec,
+    0x1450323d, 0x15e0304e, 0x1570319f, 0x1b002730, 0x1b9026e1,
+    0x1a202492, 0x1ab02543, 0x19402074, 0x19d021a5, 0x186023d6,
+    0x18f02207, 0x1f8029b8, 0x1f102869, 0x1ea02a1a, 0x1e302bcb,
+    0x1dc02efc, 0x1d502f2d, 0x1ce02d5e, 0x1c702c8f, 0x24007440,
+    0x24907591, 0x252077e2, 0x25b07633, 0x26407304, 0x26d072d5,
+    0x276070a6, 0x27f07177, 0x20807ac8, 0x20107b19, 0x21a0796a,
+    0x213078bb, 0x22c07d8c, 0x22507c5d, 0x23e07e2e, 0x23707fff,
+    0x2d006950, 0x2d906881, 0x2c206af2, 0x2cb06b23, 0x2f406e14,
+    0x2fd06fc5, 0x2e606db6, 0x2ef06c67, 0x298067d8, 0x29106609,
+    0x28a0647a, 0x283065ab, 0x2bc0609c, 0x2b50614d, 0x2ae0633e,
+    0x2a7062ef, 0x36004e60, 0x36904fb1, 0x37204dc2, 0x37b04c13,
+    0x34404924, 0x34d048f5, 0x35604a86, 0x35f04b57, 0x328040e8,
+    0x32104139, 0x33a0434a, 0x3330429b, 0x30c047ac, 0x3050467d,
+    0x31e0440e, 0x317045df, 0x3f005370, 0x3f9052a1, 0x3e2050d2,
+    0x3eb05103, 0x3d405434, 0x3dd055e5, 0x3c605796, 0x3cf05647,
+    0x3b805df8, 0x3b105c29, 0x3aa05e5a, 0x3a305f8b, 0x39c05abc,
+    0x39505b6d, 0x38e0591e, 0x387058cf, 0x4800e880, 0x4890e951,
+    0x4920eb22, 0x49b0eaf3, 0x4a40efc4, 0x4ad0ee15, 0x4b60ec66,
+    0x4bf0edb7, 0x4c80e608, 0x4c10e7d9, 0x4da0e5aa, 0x4d30e47b,
+    0x4ec0e14c, 0x4e50e09d, 0x4fe0e2ee, 0x4f70e33f, 0x4100f590,
+    0x4190f441, 0x4020f632, 0x40b0f7e3, 0x4340f2d4, 0x43d0f305,
+    0x4260f176, 0x42f0f0a7, 0x4580fb18, 0x4510fac9, 0x44a0f8ba,
+    0x4430f96b, 0x47c0fc5c, 0x4750fd8d, 0x46e0fffe, 0x4670fe2f,
+    0x5a00d2a0, 0x5a90d371, 0x5b20d102, 0x5bb0d0d3, 0x5840d5e4,
+    0x58d0d435, 0x5960d646, 0x59f0d797, 0x5e80dc28, 0x5e10ddf9,
+    0x5fa0df8a, 0x5f30de5b, 0x5cc0db6c, 0x5c50dabd, 0x5de0d8ce,
+    0x5d70d91f, 0x5300cfb0, 0x5390ce61, 0x5220cc12, 0x52b0cdc3,
+    0x5140c8f4, 0x51d0c925, 0x5060cb56, 0x50f0ca87, 0x5780c138,
+    0x5710c0e9, 0x56a0c29a, 0x5630c34b, 0x55c0c67c, 0x5550c7ad,
+    0x54e0c5de, 0x5470c40f, 0x6c009cc0, 0x6c909d11, 0x6d209f62,
+    0x6db09eb3, 0x6e409b84, 0x6ed09a55, 0x6f609826, 0x6ff099f7,
+    0x68809248, 0x68109399, 0x69a091ea, 0x6930903b, 0x6ac0950c,
+    0x6a5094dd, 0x6be096ae, 0x6b70977f, 0x650081d0, 0x65908001,
+    0x64208272, 0x64b083a3, 0x67408694, 0x67d08745, 0x66608536,
+    0x66f084e7, 0x61808f58, 0x61108e89, 0x60a08cfa, 0x60308d2b,
+    0x63c0881c, 0x635089cd, 0x62e08bbe, 0x62708a6f, 0x7e00a6e0,
+    0x7e90a731, 0x7f20a542, 0x7fb0a493, 0x7c40a1a4, 0x7cd0a075,
+    0x7d60a206, 0x7df0a3d7, 0x7a80a868, 0x7a10a9b9, 0x7ba0abca,
+    0x7b30aa1b, 0x78c0af2c, 0x7850aefd, 0x79e0ac8e, 0x7970ad5f,
+    0x7700bbf0, 0x7790ba21, 0x7620b852, 0x76b0b983, 0x7540bcb4,
+    0x75d0bd65, 0x7460bf16, 0x74f0bec7, 0x7380b578, 0x7310b4a9,
+    0x72a0b6da, 0x7230b70b, 0x71c0b23c, 0x7150b3ed, 0x70e0b19e,
+    0x7070b04f},
+   {0x00000000, 0x9001d100, 0x9000a203, 0x00017303, 0x90024405,
+    0x00039505, 0x0002e606, 0x90033706, 0x90078809, 0x00065909,
+    0x00072a0a, 0x9006fb0a, 0x0005cc0c, 0x90041d0c, 0x90056e0f,
+    0x0004bf0f, 0x900c1011, 0x000dc111, 0x000cb212, 0x900d6312,
+    0x000e5414, 0x900f8514, 0x900ef617, 0x000f2717, 0x000b9818,
+    0x900a4918, 0x900b3a1b, 0x000aeb1b, 0x9009dc1d, 0x00080d1d,
+    0x00097e1e, 0x9008af1e, 0x901b2021, 0x001af121, 0x001b8222,
+    0x901a5322, 0x00196424, 0x9018b524, 0x9019c627, 0x00181727,
+    0x001ca828, 0x901d7928, 0x901c0a2b, 0x001ddb2b, 0x901eec2d,
+    0x001f3d2d, 0x001e4e2e, 0x901f9f2e, 0x00173030, 0x9016e130,
+    0x90179233, 0x00164333, 0x90157435, 0x0014a535, 0x0015d636,
+    0x90140736, 0x9010b839, 0x00116939, 0x00101a3a, 0x9011cb3a,
+    0x0012fc3c, 0x90132d3c, 0x90125e3f, 0x00138f3f, 0x90354041,
+    0x00349141, 0x0035e242, 0x90343342, 0x00370444, 0x9036d544,
+    0x9037a647, 0x00367747, 0x0032c848, 0x90331948, 0x90326a4b,
+    0x0033bb4b, 0x90308c4d, 0x00315d4d, 0x00302e4e, 0x9031ff4e,
+    0x00395050, 0x90388150, 0x9039f253, 0x00382353, 0x903b1455,
+    0x003ac555, 0x003bb656, 0x903a6756, 0x903ed859, 0x003f0959,
+    0x003e7a5a, 0x903fab5a, 0x003c9c5c, 0x903d4d5c, 0x903c3e5f,
+    0x003def5f, 0x002e6060, 0x902fb160, 0x902ec263, 0x002f1363,
+    0x902c2465, 0x002df565, 0x002c8666, 0x902d5766, 0x9029e869,
+    0x00283969, 0x00294a6a, 0x90289b6a, 0x002bac6c, 0x902a7d6c,
+    0x902b0e6f, 0x002adf6f, 0x90227071, 0x0023a171, 0x0022d272,
+    0x90230372, 0x00203474, 0x9021e574, 0x90209677, 0x00214777,
+    0x0025f878, 0x90242978, 0x90255a7b, 0x00248b7b, 0x9027bc7d,
+    0x00266d7d, 0x00271e7e, 0x9026cf7e, 0x90698081, 0x00685181,
+    0x00692282, 0x9068f382, 0x006bc484, 0x906a1584, 0x906b6687,
+    0x006ab787, 0x006e0888, 0x906fd988, 0x906eaa8b, 0x006f7b8b,
+    0x906c4c8d, 0x006d9d8d, 0x006cee8e, 0x906d3f8e, 0x00659090,
+    0x90644190, 0x90653293, 0x0064e393, 0x9067d495, 0x00660595,
+    0x00677696, 0x9066a796, 0x90621899, 0x0063c999, 0x0062ba9a,
+    0x90636b9a, 0x00605c9c, 0x90618d9c, 0x9060fe9f, 0x00612f9f,
+    0x0072a0a0, 0x907371a0, 0x907202a3, 0x0073d3a3, 0x9070e4a5,
+    0x007135a5, 0x007046a6, 0x907197a6, 0x907528a9, 0x0074f9a9,
+    0x00758aaa, 0x90745baa, 0x00776cac, 0x9076bdac, 0x9077ceaf,
+    0x00761faf, 0x907eb0b1, 0x007f61b1, 0x007e12b2, 0x907fc3b2,
+    0x007cf4b4, 0x907d25b4, 0x907c56b7, 0x007d87b7, 0x007938b8,
+    0x9078e9b8, 0x90799abb, 0x00784bbb, 0x907b7cbd, 0x007aadbd,
+    0x007bdebe, 0x907a0fbe, 0x005cc0c0, 0x905d11c0, 0x905c62c3,
+    0x005db3c3, 0x905e84c5, 0x005f55c5, 0x005e26c6, 0x905ff7c6,
+    0x905b48c9, 0x005a99c9, 0x005beaca, 0x905a3bca, 0x00590ccc,
+    0x9058ddcc, 0x9059aecf, 0x00587fcf, 0x9050d0d1, 0x005101d1,
+    0x005072d2, 0x9051a3d2, 0x005294d4, 0x905345d4, 0x905236d7,
+    0x0053e7d7, 0x005758d8, 0x905689d8, 0x9057fadb, 0x00562bdb,
+    0x90551cdd, 0x0054cddd, 0x0055bede, 0x90546fde, 0x9047e0e1,
+    0x004631e1, 0x004742e2, 0x904693e2, 0x0045a4e4, 0x904475e4,
+    0x904506e7, 0x0044d7e7, 0x004068e8, 0x9041b9e8, 0x9040caeb,
+    0x00411beb, 0x90422ced, 0x0043fded, 0x00428eee, 0x90435fee,
+    0x004bf0f0, 0x904a21f0, 0x904b52f3, 0x004a83f3, 0x9049b4f5,
+    0x004865f5, 0x004916f6, 0x9048c7f6, 0x904c78f9, 0x004da9f9,
+    0x004cdafa, 0x904d0bfa, 0x004e3cfc, 0x904fedfc, 0x904e9eff,
+    0x004f4fff},
+   {0x00000000, 0x90d00101, 0x91a30201, 0x01730300, 0x93450401,
+    0x03950500, 0x02e60600, 0x92360701, 0x96890801, 0x06590900,
+    0x072a0a00, 0x97fa0b01, 0x05cc0c00, 0x951c0d01, 0x946f0e01,
+    0x04bf0f00, 0x9d111001, 0x0dc11100, 0x0cb21200, 0x9c621301,
+    0x0e541400, 0x9e841501, 0x9ff71601, 0x0f271700, 0x0b981800,
+    0x9b481901, 0x9a3b1a01, 0x0aeb1b00, 0x98dd1c01, 0x080d1d00,
+    0x097e1e00, 0x99ae1f01, 0x8a212001, 0x1af12100, 0x1b822200,
+    0x8b522301, 0x19642400, 0x89b42501, 0x88c72601, 0x18172700,
+    0x1ca82800, 0x8c782901, 0x8d0b2a01, 0x1ddb2b00, 0x8fed2c01,
+    0x1f3d2d00, 0x1e4e2e00, 0x8e9e2f01, 0x17303000, 0x87e03101,
+    0x86933201, 0x16433300, 0x84753401, 0x14a53500, 0x15d63600,
+    0x85063701, 0x81b93801, 0x11693900, 0x101a3a00, 0x80ca3b01,
+    0x12fc3c00, 0x822c3d01, 0x835f3e01, 0x138f3f00, 0xa4414001,
+    0x34914100, 0x35e24200, 0xa5324301, 0x37044400, 0xa7d44501,
+    0xa6a74601, 0x36774700, 0x32c84800, 0xa2184901, 0xa36b4a01,
+    0x33bb4b00, 0xa18d4c01, 0x315d4d00, 0x302e4e00, 0xa0fe4f01,
+    0x39505000, 0xa9805101, 0xa8f35201, 0x38235300, 0xaa155401,
+    0x3ac55500, 0x3bb65600, 0xab665701, 0xafd95801, 0x3f095900,
+    0x3e7a5a00, 0xaeaa5b01, 0x3c9c5c00, 0xac4c5d01, 0xad3f5e01,
+    0x3def5f00, 0x2e606000, 0xbeb06101, 0xbfc36201, 0x2f136300,
+    0xbd256401, 0x2df56500, 0x2c866600, 0xbc566701, 0xb8e96801,
+    0x28396900, 0x294a6a00, 0xb99a6b01, 0x2bac6c00, 0xbb7c6d01,
+    0xba0f6e01, 0x2adf6f00, 0xb3717001, 0x23a17100, 0x22d27200,
+    0xb2027301, 0x20347400, 0xb0e47501, 0xb1977601, 0x21477700,
+    0x25f87800, 0xb5287901, 0xb45b7a01, 0x248b7b00, 0xb6bd7c01,
+    0x266d7d00, 0x271e7e00, 0xb7ce7f01, 0xf8818001, 0x68518100,
+    0x69228200, 0xf9f28301, 0x6bc48400, 0xfb148501, 0xfa678601,
+    0x6ab78700, 0x6e088800, 0xfed88901, 0xffab8a01, 0x6f7b8b00,
+    0xfd4d8c01, 0x6d9d8d00, 0x6cee8e00, 0xfc3e8f01, 0x65909000,
+    0xf5409101, 0xf4339201, 0x64e39300, 0xf6d59401, 0x66059500,
+    0x67769600, 0xf7a69701, 0xf3199801, 0x63c99900, 0x62ba9a00,
+    0xf26a9b01, 0x605c9c00, 0xf08c9d01, 0xf1ff9e01, 0x612f9f00,
+    0x72a0a000, 0xe270a101, 0xe303a201, 0x73d3a300, 0xe1e5a401,
+    0x7135a500, 0x7046a600, 0xe096a701, 0xe429a801, 0x74f9a900,
+    0x758aaa00, 0xe55aab01, 0x776cac00, 0xe7bcad01, 0xe6cfae01,
+    0x761faf00, 0xefb1b001, 0x7f61b100, 0x7e12b200, 0xeec2b301,
+    0x7cf4b400, 0xec24b501, 0xed57b601, 0x7d87b700, 0x7938b800,
+    0xe9e8b901, 0xe89bba01, 0x784bbb00, 0xea7dbc01, 0x7aadbd00,
+    0x7bdebe00, 0xeb0ebf01, 0x5cc0c000, 0xcc10c101, 0xcd63c201,
+    0x5db3c300, 0xcf85c401, 0x5f55c500, 0x5e26c600, 0xcef6c701,
+    0xca49c801, 0x5a99c900, 0x5beaca00, 0xcb3acb01, 0x590ccc00,
+    0xc9dccd01, 0xc8afce01, 0x587fcf00, 0xc1d1d001, 0x5101d100,
+    0x5072d200, 0xc0a2d301, 0x5294d400, 0xc244d501, 0xc337d601,
+    0x53e7d700, 0x5758d800, 0xc788d901, 0xc6fbda01, 0x562bdb00,
+    0xc41ddc01, 0x54cddd00, 0x55bede00, 0xc56edf01, 0xd6e1e001,
+    0x4631e100, 0x4742e200, 0xd792e301, 0x45a4e400, 0xd574e501,
+    0xd407e601, 0x44d7e700, 0x4068e800, 0xd0b8e901, 0xd1cbea01,
+    0x411beb00, 0xd32dec01, 0x43fded00, 0x428eee00, 0xd25eef01,
+    0x4bf0f000, 0xdb20f101, 0xda53f201, 0x4a83f300, 0xd8b5f401,
+    0x4865f500, 0x4916f600, 0xd9c6f701, 0xdd79f801, 0x4da9f900,
+    0x4cdafa00, 0xdc0afb01, 0x4e3cfc00, 0xdeecfd01, 0xdf9ffe01,
+    0x4f4fff00}};
+
+static const word_t crc_braid_big_table[][256] = {
+   {0x00000000, 0x0101d090, 0x0102a391, 0x00037301, 0x01044593,
+    0x00059503, 0x0006e602, 0x01073692, 0x01088996, 0x00095906,
+    0x000a2a07, 0x010bfa97, 0x000ccc05, 0x010d1c95, 0x010e6f94,
+    0x000fbf04, 0x0110119d, 0x0011c10d, 0x0012b20c, 0x0113629c,
+    0x0014540e, 0x0115849e, 0x0116f79f, 0x0017270f, 0x0018980b,
+    0x0119489b, 0x011a3b9a, 0x001beb0a, 0x011cdd98, 0x001d0d08,
+    0x001e7e09, 0x011fae99, 0x0120218a, 0x0021f11a, 0x0022821b,
+    0x0123528b, 0x00246419, 0x0125b489, 0x0126c788, 0x00271718,
+    0x0028a81c, 0x0129788c, 0x012a0b8d, 0x002bdb1d, 0x012ced8f,
+    0x002d3d1f, 0x002e4e1e, 0x012f9e8e, 0x00303017, 0x0131e087,
+    0x01329386, 0x00334316, 0x01347584, 0x0035a514, 0x0036d615,
+    0x01370685, 0x0138b981, 0x00396911, 0x003a1a10, 0x013bca80,
+    0x003cfc12, 0x013d2c82, 0x013e5f83, 0x003f8f13, 0x014041a4,
+    0x00419134, 0x0042e235, 0x014332a5, 0x00440437, 0x0145d4a7,
+    0x0146a7a6, 0x00477736, 0x0048c832, 0x014918a2, 0x014a6ba3,
+    0x004bbb33, 0x014c8da1, 0x004d5d31, 0x004e2e30, 0x014ffea0,
+    0x00505039, 0x015180a9, 0x0152f3a8, 0x00532338, 0x015415aa,
+    0x0055c53a, 0x0056b63b, 0x015766ab, 0x0158d9af, 0x0059093f,
+    0x005a7a3e, 0x015baaae, 0x005c9c3c, 0x015d4cac, 0x015e3fad,
+    0x005fef3d, 0x0060602e, 0x0161b0be, 0x0162c3bf, 0x0063132f,
+    0x016425bd, 0x0065f52d, 0x0066862c, 0x016756bc, 0x0168e9b8,
+    0x00693928, 0x006a4a29, 0x016b9ab9, 0x006cac2b, 0x016d7cbb,
+    0x016e0fba, 0x006fdf2a, 0x017071b3, 0x0071a123, 0x0072d222,
+    0x017302b2, 0x00743420, 0x0175e4b0, 0x017697b1, 0x00774721,
+    0x0078f825, 0x017928b5, 0x017a5bb4, 0x007b8b24, 0x017cbdb6,
+    0x007d6d26, 0x007e1e27, 0x017fceb7, 0x018081f8, 0x00815168,
+    0x00822269, 0x0183f2f9, 0x0084c46b, 0x018514fb, 0x018667fa,
+    0x0087b76a, 0x0088086e, 0x0189d8fe, 0x018aabff, 0x008b7b6f,
+    0x018c4dfd, 0x008d9d6d, 0x008eee6c, 0x018f3efc, 0x00909065,
+    0x019140f5, 0x019233f4, 0x0093e364, 0x0194d5f6, 0x00950566,
+    0x00967667, 0x0197a6f7, 0x019819f3, 0x0099c963, 0x009aba62,
+    0x019b6af2, 0x009c5c60, 0x019d8cf0, 0x019efff1, 0x009f2f61,
+    0x00a0a072, 0x01a170e2, 0x01a203e3, 0x00a3d373, 0x01a4e5e1,
+    0x00a53571, 0x00a64670, 0x01a796e0, 0x01a829e4, 0x00a9f974,
+    0x00aa8a75, 0x01ab5ae5, 0x00ac6c77, 0x01adbce7, 0x01aecfe6,
+    0x00af1f76, 0x01b0b1ef, 0x00b1617f, 0x00b2127e, 0x01b3c2ee,
+    0x00b4f47c, 0x01b524ec, 0x01b657ed, 0x00b7877d, 0x00b83879,
+    0x01b9e8e9, 0x01ba9be8, 0x00bb4b78, 0x01bc7dea, 0x00bdad7a,
+    0x00bede7b, 0x01bf0eeb, 0x00c0c05c, 0x01c110cc, 0x01c263cd,
+    0x00c3b35d, 0x01c485cf, 0x00c5555f, 0x00c6265e, 0x01c7f6ce,
+    0x01c849ca, 0x00c9995a, 0x00caea5b, 0x01cb3acb, 0x00cc0c59,
+    0x01cddcc9, 0x01ceafc8, 0x00cf7f58, 0x01d0d1c1, 0x00d10151,
+    0x00d27250, 0x01d3a2c0, 0x00d49452, 0x01d544c2, 0x01d637c3,
+    0x00d7e753, 0x00d85857, 0x01d988c7, 0x01dafbc6, 0x00db2b56,
+    0x01dc1dc4, 0x00ddcd54, 0x00debe55, 0x01df6ec5, 0x01e0e1d6,
+    0x00e13146, 0x00e24247, 0x01e392d7, 0x00e4a445, 0x01e574d5,
+    0x01e607d4, 0x00e7d744, 0x00e86840, 0x01e9b8d0, 0x01eacbd1,
+    0x00eb1b41, 0x01ec2dd3, 0x00edfd43, 0x00ee8e42, 0x01ef5ed2,
+    0x00f0f04b, 0x01f120db, 0x01f253da, 0x00f3834a, 0x01f4b5d8,
+    0x00f56548, 0x00f61649, 0x01f7c6d9, 0x01f879dd, 0x00f9a94d,
+    0x00fada4c, 0x01fb0adc, 0x00fc3c4e, 0x01fdecde, 0x01fe9fdf,
+    0x00ff4f4f},
+   {0x00000000, 0x00d10190, 0x03a20090, 0x03730100, 0x05440290,
+    0x05950300, 0x06e60200, 0x06370390, 0x09880790, 0x09590600,
+    0x0a2a0700, 0x0afb0690, 0x0ccc0500, 0x0c1d0490, 0x0f6e0590,
+    0x0fbf0400, 0x11100c90, 0x11c10d00, 0x12b20c00, 0x12630d90,
+    0x14540e00, 0x14850f90, 0x17f60e90, 0x17270f00, 0x18980b00,
+    0x18490a90, 0x1b3a0b90, 0x1beb0a00, 0x1ddc0990, 0x1d0d0800,
+    0x1e7e0900, 0x1eaf0890, 0x21201b90, 0x21f11a00, 0x22821b00,
+    0x22531a90, 0x24641900, 0x24b51890, 0x27c61990, 0x27171800,
+    0x28a81c00, 0x28791d90, 0x2b0a1c90, 0x2bdb1d00, 0x2dec1e90,
+    0x2d3d1f00, 0x2e4e1e00, 0x2e9f1f90, 0x30301700, 0x30e11690,
+    0x33921790, 0x33431600, 0x35741590, 0x35a51400, 0x36d61500,
+    0x36071490, 0x39b81090, 0x39691100, 0x3a1a1000, 0x3acb1190,
+    0x3cfc1200, 0x3c2d1390, 0x3f5e1290, 0x3f8f1300, 0x41403590,
+    0x41913400, 0x42e23500, 0x42333490, 0x44043700, 0x44d53690,
+    0x47a63790, 0x47773600, 0x48c83200, 0x48193390, 0x4b6a3290,
+    0x4bbb3300, 0x4d8c3090, 0x4d5d3100, 0x4e2e3000, 0x4eff3190,
+    0x50503900, 0x50813890, 0x53f23990, 0x53233800, 0x55143b90,
+    0x55c53a00, 0x56b63b00, 0x56673a90, 0x59d83e90, 0x59093f00,
+    0x5a7a3e00, 0x5aab3f90, 0x5c9c3c00, 0x5c4d3d90, 0x5f3e3c90,
+    0x5fef3d00, 0x60602e00, 0x60b12f90, 0x63c22e90, 0x63132f00,
+    0x65242c90, 0x65f52d00, 0x66862c00, 0x66572d90, 0x69e82990,
+    0x69392800, 0x6a4a2900, 0x6a9b2890, 0x6cac2b00, 0x6c7d2a90,
+    0x6f0e2b90, 0x6fdf2a00, 0x71702290, 0x71a12300, 0x72d22200,
+    0x72032390, 0x74342000, 0x74e52190, 0x77962090, 0x77472100,
+    0x78f82500, 0x78292490, 0x7b5a2590, 0x7b8b2400, 0x7dbc2790,
+    0x7d6d2600, 0x7e1e2700, 0x7ecf2690, 0x81806990, 0x81516800,
+    0x82226900, 0x82f36890, 0x84c46b00, 0x84156a90, 0x87666b90,
+    0x87b76a00, 0x88086e00, 0x88d96f90, 0x8baa6e90, 0x8b7b6f00,
+    0x8d4c6c90, 0x8d9d6d00, 0x8eee6c00, 0x8e3f6d90, 0x90906500,
+    0x90416490, 0x93326590, 0x93e36400, 0x95d46790, 0x95056600,
+    0x96766700, 0x96a76690, 0x99186290, 0x99c96300, 0x9aba6200,
+    0x9a6b6390, 0x9c5c6000, 0x9c8d6190, 0x9ffe6090, 0x9f2f6100,
+    0xa0a07200, 0xa0717390, 0xa3027290, 0xa3d37300, 0xa5e47090,
+    0xa5357100, 0xa6467000, 0xa6977190, 0xa9287590, 0xa9f97400,
+    0xaa8a7500, 0xaa5b7490, 0xac6c7700, 0xacbd7690, 0xafce7790,
+    0xaf1f7600, 0xb1b07e90, 0xb1617f00, 0xb2127e00, 0xb2c37f90,
+    0xb4f47c00, 0xb4257d90, 0xb7567c90, 0xb7877d00, 0xb8387900,
+    0xb8e97890, 0xbb9a7990, 0xbb4b7800, 0xbd7c7b90, 0xbdad7a00,
+    0xbede7b00, 0xbe0f7a90, 0xc0c05c00, 0xc0115d90, 0xc3625c90,
+    0xc3b35d00, 0xc5845e90, 0xc5555f00, 0xc6265e00, 0xc6f75f90,
+    0xc9485b90, 0xc9995a00, 0xcaea5b00, 0xca3b5a90, 0xcc0c5900,
+    0xccdd5890, 0xcfae5990, 0xcf7f5800, 0xd1d05090, 0xd1015100,
+    0xd2725000, 0xd2a35190, 0xd4945200, 0xd4455390, 0xd7365290,
+    0xd7e75300, 0xd8585700, 0xd8895690, 0xdbfa5790, 0xdb2b5600,
+    0xdd1c5590, 0xddcd5400, 0xdebe5500, 0xde6f5490, 0xe1e04790,
+    0xe1314600, 0xe2424700, 0xe2934690, 0xe4a44500, 0xe4754490,
+    0xe7064590, 0xe7d74400, 0xe8684000, 0xe8b94190, 0xebca4090,
+    0xeb1b4100, 0xed2c4290, 0xedfd4300, 0xee8e4200, 0xee5f4390,
+    0xf0f04b00, 0xf0214a90, 0xf3524b90, 0xf3834a00, 0xf5b44990,
+    0xf5654800, 0xf6164900, 0xf6c74890, 0xf9784c90, 0xf9a94d00,
+    0xfada4c00, 0xfa0b4d90, 0xfc3c4e00, 0xfced4f90, 0xff9e4e90,
+    0xff4f4f00},
+   {0x00000000, 0xd1019000, 0xa2032001, 0x7302b001, 0x44074002,
+    0x9506d002, 0xe6046003, 0x3705f003, 0x880e8004, 0x590f1004,
+    0x2a0da005, 0xfb0c3005, 0xcc09c006, 0x1d085006, 0x6e0ae007,
+    0xbf0b7007, 0x101d0009, 0xc11c9009, 0xb21e2008, 0x631fb008,
+    0x541a400b, 0x851bd00b, 0xf619600a, 0x2718f00a, 0x9813800d,
+    0x4912100d, 0x3a10a00c, 0xeb11300c, 0xdc14c00f, 0x0d15500f,
+    0x7e17e00e, 0xaf16700e, 0x203a0012, 0xf13b9012, 0x82392013,
+    0x5338b013, 0x643d4010, 0xb53cd010, 0xc63e6011, 0x173ff011,
+    0xa8348016, 0x79351016, 0x0a37a017, 0xdb363017, 0xec33c014,
+    0x3d325014, 0x4e30e015, 0x9f317015, 0x3027001b, 0xe126901b,
+    0x9224201a, 0x4325b01a, 0x74204019, 0xa521d019, 0xd6236018,
+    0x0722f018, 0xb829801f, 0x6928101f, 0x1a2aa01e, 0xcb2b301e,
+    0xfc2ec01d, 0x2d2f501d, 0x5e2de01c, 0x8f2c701c, 0x40740024,
+    0x91759024, 0xe2772025, 0x3376b025, 0x04734026, 0xd572d026,
+    0xa6706027, 0x7771f027, 0xc87a8020, 0x197b1020, 0x6a79a021,
+    0xbb783021, 0x8c7dc022, 0x5d7c5022, 0x2e7ee023, 0xff7f7023,
+    0x5069002d, 0x8168902d, 0xf26a202c, 0x236bb02c, 0x146e402f,
+    0xc56fd02f, 0xb66d602e, 0x676cf02e, 0xd8678029, 0x09661029,
+    0x7a64a028, 0xab653028, 0x9c60c02b, 0x4d61502b, 0x3e63e02a,
+    0xef62702a, 0x604e0036, 0xb14f9036, 0xc24d2037, 0x134cb037,
+    0x24494034, 0xf548d034, 0x864a6035, 0x574bf035, 0xe8408032,
+    0x39411032, 0x4a43a033, 0x9b423033, 0xac47c030, 0x7d465030,
+    0x0e44e031, 0xdf457031, 0x7053003f, 0xa152903f, 0xd250203e,
+    0x0351b03e, 0x3454403d, 0xe555d03d, 0x9657603c, 0x4756f03c,
+    0xf85d803b, 0x295c103b, 0x5a5ea03a, 0x8b5f303a, 0xbc5ac039,
+    0x6d5b5039, 0x1e59e038, 0xcf587038, 0x80e80048, 0x51e99048,
+    0x22eb2049, 0xf3eab049, 0xc4ef404a, 0x15eed04a, 0x66ec604b,
+    0xb7edf04b, 0x08e6804c, 0xd9e7104c, 0xaae5a04d, 0x7be4304d,
+    0x4ce1c04e, 0x9de0504e, 0xeee2e04f, 0x3fe3704f, 0x90f50041,
+    0x41f49041, 0x32f62040, 0xe3f7b040, 0xd4f24043, 0x05f3d043,
+    0x76f16042, 0xa7f0f042, 0x18fb8045, 0xc9fa1045, 0xbaf8a044,
+    0x6bf93044, 0x5cfcc047, 0x8dfd5047, 0xfeffe046, 0x2ffe7046,
+    0xa0d2005a, 0x71d3905a, 0x02d1205b, 0xd3d0b05b, 0xe4d54058,
+    0x35d4d058, 0x46d66059, 0x97d7f059, 0x28dc805e, 0xf9dd105e,
+    0x8adfa05f, 0x5bde305f, 0x6cdbc05c, 0xbdda505c, 0xced8e05d,
+    0x1fd9705d, 0xb0cf0053, 0x61ce9053, 0x12cc2052, 0xc3cdb052,
+    0xf4c84051, 0x25c9d051, 0x56cb6050, 0x87caf050, 0x38c18057,
+    0xe9c01057, 0x9ac2a056, 0x4bc33056, 0x7cc6c055, 0xadc75055,
+    0xdec5e054, 0x0fc47054, 0xc09c006c, 0x119d906c, 0x629f206d,
+    0xb39eb06d, 0x849b406e, 0x559ad06e, 0x2698606f, 0xf799f06f,
+    0x48928068, 0x99931068, 0xea91a069, 0x3b903069, 0x0c95c06a,
+    0xdd94506a, 0xae96e06b, 0x7f97706b, 0xd0810065, 0x01809065,
+    0x72822064, 0xa383b064, 0x94864067, 0x4587d067, 0x36856066,
+    0xe784f066, 0x588f8061, 0x898e1061, 0xfa8ca060, 0x2b8d3060,
+    0x1c88c063, 0xcd895063, 0xbe8be062, 0x6f8a7062, 0xe0a6007e,
+    0x31a7907e, 0x42a5207f, 0x93a4b07f, 0xa4a1407c, 0x75a0d07c,
+    0x06a2607d, 0xd7a3f07d, 0x68a8807a, 0xb9a9107a, 0xcaaba07b,
+    0x1baa307b, 0x2cafc078, 0xfdae5078, 0x8eace079, 0x5fad7079,
+    0xf0bb0077, 0x21ba9077, 0x52b82076, 0x83b9b076, 0xb4bc4075,
+    0x65bdd075, 0x16bf6074, 0xc7bef074, 0x78b58073, 0xa9b41073,
+    0xdab6a072, 0x0bb73072, 0x3cb2c071, 0xedb35071, 0x9eb1e070,
+    0x4fb07070},
+   {0x00000000, 0x01419065, 0x028220cb, 0x03c3b0ae, 0x07044226,
+    0x0645d243, 0x058662ed, 0x04c7f288, 0x0e08844c, 0x0f491429,
+    0x0c8aa487, 0x0dcb34e2, 0x090cc66a, 0x084d560f, 0x0b8ee6a1,
+    0x0acf76c4, 0x1c100899, 0x1d5198fc, 0x1e922852, 0x1fd3b837,
+    0x1b144abf, 0x1a55dada, 0x19966a74, 0x18d7fa11, 0x12188cd5,
+    0x13591cb0, 0x109aac1e, 0x11db3c7b, 0x151ccef3, 0x145d5e96,
+    0x179eee38, 0x16df7e5d, 0x3b201382, 0x3a6183e7, 0x39a23349,
+    0x38e3a32c, 0x3c2451a4, 0x3d65c1c1, 0x3ea6716f, 0x3fe7e10a,
+    0x352897ce, 0x346907ab, 0x37aab705, 0x36eb2760, 0x322cd5e8,
+    0x336d458d, 0x30aef523, 0x31ef6546, 0x27301b1b, 0x26718b7e,
+    0x25b23bd0, 0x24f3abb5, 0x2034593d, 0x2175c958, 0x22b679f6,
+    0x23f7e993, 0x29389f57, 0x28790f32, 0x2bbabf9c, 0x2afb2ff9,
+    0x2e3cdd71, 0x2f7d4d14, 0x2cbefdba, 0x2dff6ddf, 0x754025b4,
+    0x7401b5d1, 0x77c2057f, 0x7683951a, 0x72446792, 0x7305f7f7,
+    0x70c64759, 0x7187d73c, 0x7b48a1f8, 0x7a09319d, 0x79ca8133,
+    0x788b1156, 0x7c4ce3de, 0x7d0d73bb, 0x7ecec315, 0x7f8f5370,
+    0x69502d2d, 0x6811bd48, 0x6bd20de6, 0x6a939d83, 0x6e546f0b,
+    0x6f15ff6e, 0x6cd64fc0, 0x6d97dfa5, 0x6758a961, 0x66193904,
+    0x65da89aa, 0x649b19cf, 0x605ceb47, 0x611d7b22, 0x62decb8c,
+    0x639f5be9, 0x4e603636, 0x4f21a653, 0x4ce216fd, 0x4da38698,
+    0x49647410, 0x4825e475, 0x4be654db, 0x4aa7c4be, 0x4068b27a,
+    0x4129221f, 0x42ea92b1, 0x43ab02d4, 0x476cf05c, 0x462d6039,
+    0x45eed097, 0x44af40f2, 0x52703eaf, 0x5331aeca, 0x50f21e64,
+    0x51b38e01, 0x55747c89, 0x5435ecec, 0x57f65c42, 0x56b7cc27,
+    0x5c78bae3, 0x5d392a86, 0x5efa9a28, 0x5fbb0a4d, 0x5b7cf8c5,
+    0x5a3d68a0, 0x59fed80e, 0x58bf486b, 0xe98049d8, 0xe8c1d9bd,
+    0xeb026913, 0xea43f976, 0xee840bfe, 0xefc59b9b, 0xec062b35,
+    0xed47bb50, 0xe788cd94, 0xe6c95df1, 0xe50aed5f, 0xe44b7d3a,
+    0xe08c8fb2, 0xe1cd1fd7, 0xe20eaf79, 0xe34f3f1c, 0xf5904141,
+    0xf4d1d124, 0xf712618a, 0xf653f1ef, 0xf2940367, 0xf3d59302,
+    0xf01623ac, 0xf157b3c9, 0xfb98c50d, 0xfad95568, 0xf91ae5c6,
+    0xf85b75a3, 0xfc9c872b, 0xfddd174e, 0xfe1ea7e0, 0xff5f3785,
+    0xd2a05a5a, 0xd3e1ca3f, 0xd0227a91, 0xd163eaf4, 0xd5a4187c,
+    0xd4e58819, 0xd72638b7, 0xd667a8d2, 0xdca8de16, 0xdde94e73,
+    0xde2afedd, 0xdf6b6eb8, 0xdbac9c30, 0xdaed0c55, 0xd92ebcfb,
+    0xd86f2c9e, 0xceb052c3, 0xcff1c2a6, 0xcc327208, 0xcd73e26d,
+    0xc9b410e5, 0xc8f58080, 0xcb36302e, 0xca77a04b, 0xc0b8d68f,
+    0xc1f946ea, 0xc23af644, 0xc37b6621, 0xc7bc94a9, 0xc6fd04cc,
+    0xc53eb462, 0xc47f2407, 0x9cc06c6c, 0x9d81fc09, 0x9e424ca7,
+    0x9f03dcc2, 0x9bc42e4a, 0x9a85be2f, 0x99460e81, 0x98079ee4,
+    0x92c8e820, 0x93897845, 0x904ac8eb, 0x910b588e, 0x95ccaa06,
+    0x948d3a63, 0x974e8acd, 0x960f1aa8, 0x80d064f5, 0x8191f490,
+    0x8252443e, 0x8313d45b, 0x87d426d3, 0x8695b6b6, 0x85560618,
+    0x8417967d, 0x8ed8e0b9, 0x8f9970dc, 0x8c5ac072, 0x8d1b5017,
+    0x89dca29f, 0x889d32fa, 0x8b5e8254, 0x8a1f1231, 0xa7e07fee,
+    0xa6a1ef8b, 0xa5625f25, 0xa423cf40, 0xa0e43dc8, 0xa1a5adad,
+    0xa2661d03, 0xa3278d66, 0xa9e8fba2, 0xa8a96bc7, 0xab6adb69,
+    0xaa2b4b0c, 0xaeecb984, 0xafad29e1, 0xac6e994f, 0xad2f092a,
+    0xbbf07777, 0xbab1e712, 0xb97257bc, 0xb833c7d9, 0xbcf43551,
+    0xbdb5a534, 0xbe76159a, 0xbf3785ff, 0xb5f8f33b, 0xb4b9635e,
+    0xb77ad3f0, 0xb63b4395, 0xb2fcb11d, 0xb3bd2178, 0xb07e91d6,
+    0xb13f01b3}};
+
+#endif
+
+#endif
+
+#if N == 3
+
+#if W == 8
+
+static const crc_t crc_braid_table[][256] = {
+   {0x00000000, 0x47596181, 0x8eb2c302, 0xc9eba283, 0xad668607,
+    0xea3fe786, 0x23d44505, 0x648d2484, 0xeace0c0d, 0xad976d8c,
+    0x647ccf0f, 0x2325ae8e, 0x47a88a0a, 0x00f1eb8b, 0xc91a4908,
+    0x8e432889, 0x659f1819, 0x22c67998, 0xeb2ddb1b, 0xac74ba9a,
+    0xc8f99e1e, 0x8fa0ff9f, 0x464b5d1c, 0x01123c9d, 0x8f511414,
+    0xc8087595, 0x01e3d716, 0x46bab697, 0x22379213, 0x656ef392,
+    0xac855111, 0xebdc3090, 0xcb3e3032, 0x8c6751b3, 0x458cf330,
+    0x02d592b1, 0x6658b635, 0x2101d7b4, 0xe8ea7537, 0xafb314b6,
+    0x21f03c3f, 0x66a95dbe, 0xaf42ff3d, 0xe81b9ebc, 0x8c96ba38,
+    0xcbcfdbb9, 0x0224793a, 0x457d18bb, 0xaea1282b, 0xe9f849aa,
+    0x2013eb29, 0x674a8aa8, 0x03c7ae2c, 0x449ecfad, 0x8d756d2e,
+    0xca2c0caf, 0x446f2426, 0x033645a7, 0xcadde724, 0x8d8486a5,
+    0xe909a221, 0xae50c3a0, 0x67bb6123, 0x20e200a2, 0x267f6067,
+    0x612601e6, 0xa8cda365, 0xef94c2e4, 0x8b19e660, 0xcc4087e1,
+    0x05ab2562, 0x42f244e3, 0xccb16c6a, 0x8be80deb, 0x4203af68,
+    0x055acee9, 0x61d7ea6d, 0x268e8bec, 0xef65296f, 0xa83c48ee,
+    0x43e0787e, 0x04b919ff, 0xcd52bb7c, 0x8a0bdafd, 0xee86fe79,
+    0xa9df9ff8, 0x60343d7b, 0x276d5cfa, 0xa92e7473, 0xee7715f2,
+    0x279cb771, 0x60c5d6f0, 0x0448f274, 0x431193f5, 0x8afa3176,
+    0xcda350f7, 0xed415055, 0xaa1831d4, 0x63f39357, 0x24aaf2d6,
+    0x4027d652, 0x077eb7d3, 0xce951550, 0x89cc74d1, 0x078f5c58,
+    0x40d63dd9, 0x893d9f5a, 0xce64fedb, 0xaae9da5f, 0xedb0bbde,
+    0x245b195d, 0x630278dc, 0x88de484c, 0xcf8729cd, 0x066c8b4e,
+    0x4135eacf, 0x25b8ce4b, 0x62e1afca, 0xab0a0d49, 0xec536cc8,
+    0x62104441, 0x254925c0, 0xeca28743, 0xabfbe6c2, 0xcf76c246,
+    0x882fa3c7, 0x41c40144, 0x069d60c5, 0x4cfec0ce, 0x0ba7a14f,
+    0xc24c03cc, 0x8515624d, 0xe19846c9, 0xa6c12748, 0x6f2a85cb,
+    0x2873e44a, 0xa630ccc3, 0xe169ad42, 0x28820fc1, 0x6fdb6e40,
+    0x0b564ac4, 0x4c0f2b45, 0x85e489c6, 0xc2bde847, 0x2961d8d7,
+    0x6e38b956, 0xa7d31bd5, 0xe08a7a54, 0x84075ed0, 0xc35e3f51,
+    0x0ab59dd2, 0x4decfc53, 0xc3afd4da, 0x84f6b55b, 0x4d1d17d8,
+    0x0a447659, 0x6ec952dd, 0x2990335c, 0xe07b91df, 0xa722f05e,
+    0x87c0f0fc, 0xc099917d, 0x097233fe, 0x4e2b527f, 0x2aa676fb,
+    0x6dff177a, 0xa414b5f9, 0xe34dd478, 0x6d0efcf1, 0x2a579d70,
+    0xe3bc3ff3, 0xa4e55e72, 0xc0687af6, 0x87311b77, 0x4edab9f4,
+    0x0983d875, 0xe25fe8e5, 0xa5068964, 0x6ced2be7, 0x2bb44a66,
+    0x4f396ee2, 0x08600f63, 0xc18bade0, 0x86d2cc61, 0x0891e4e8,
+    0x4fc88569, 0x862327ea, 0xc17a466b, 0xa5f762ef, 0xe2ae036e,
+    0x2b45a1ed, 0x6c1cc06c, 0x6a81a0a9, 0x2dd8c128, 0xe43363ab,
+    0xa36a022a, 0xc7e726ae, 0x80be472f, 0x4955e5ac, 0x0e0c842d,
+    0x804faca4, 0xc716cd25, 0x0efd6fa6, 0x49a40e27, 0x2d292aa3,
+    0x6a704b22, 0xa39be9a1, 0xe4c28820, 0x0f1eb8b0, 0x4847d931,
+    0x81ac7bb2, 0xc6f51a33, 0xa2783eb7, 0xe5215f36, 0x2ccafdb5,
+    0x6b939c34, 0xe5d0b4bd, 0xa289d53c, 0x6b6277bf, 0x2c3b163e,
+    0x48b632ba, 0x0fef533b, 0xc604f1b8, 0x815d9039, 0xa1bf909b,
+    0xe6e6f11a, 0x2f0d5399, 0x68543218, 0x0cd9169c, 0x4b80771d,
+    0x826bd59e, 0xc532b41f, 0x4b719c96, 0x0c28fd17, 0xc5c35f94,
+    0x829a3e15, 0xe6171a91, 0xa14e7b10, 0x68a5d993, 0x2ffcb812,
+    0xc4208882, 0x8379e903, 0x4a924b80, 0x0dcb2a01, 0x69460e85,
+    0x2e1f6f04, 0xe7f4cd87, 0xa0adac06, 0x2eee848f, 0x69b7e50e,
+    0xa05c478d, 0xe705260c, 0x83880288, 0xc4d16309, 0x0d3ac18a,
+    0x4a63a00b},
+   {0x00000000, 0x99fd819c, 0x83f8033b, 0x1a0582a7, 0xb7f30675,
+    0x2e0e87e9, 0x340b054e, 0xadf684d2, 0xdfe50ce9, 0x46188d75,
+    0x5c1d0fd2, 0xc5e08e4e, 0x68160a9c, 0xf1eb8b00, 0xebee09a7,
+    0x7213883b, 0x0fc919d1, 0x9634984d, 0x8c311aea, 0x15cc9b76,
+    0xb83a1fa4, 0x21c79e38, 0x3bc21c9f, 0xa23f9d03, 0xd02c1538,
+    0x49d194a4, 0x53d41603, 0xca29979f, 0x67df134d, 0xfe2292d1,
+    0xe4271076, 0x7dda91ea, 0x1f9233a2, 0x866fb23e, 0x9c6a3099,
+    0x0597b105, 0xa86135d7, 0x319cb44b, 0x2b9936ec, 0xb264b770,
+    0xc0773f4b, 0x598abed7, 0x438f3c70, 0xda72bdec, 0x7784393e,
+    0xee79b8a2, 0xf47c3a05, 0x6d81bb99, 0x105b2a73, 0x89a6abef,
+    0x93a32948, 0x0a5ea8d4, 0xa7a82c06, 0x3e55ad9a, 0x24502f3d,
+    0xbdadaea1, 0xcfbe269a, 0x5643a706, 0x4c4625a1, 0xd5bba43d,
+    0x784d20ef, 0xe1b0a173, 0xfbb523d4, 0x6248a248, 0x3f246744,
+    0xa6d9e6d8, 0xbcdc647f, 0x2521e5e3, 0x88d76131, 0x112ae0ad,
+    0x0b2f620a, 0x92d2e396, 0xe0c16bad, 0x793cea31, 0x63396896,
+    0xfac4e90a, 0x57326dd8, 0xcecfec44, 0xd4ca6ee3, 0x4d37ef7f,
+    0x30ed7e95, 0xa910ff09, 0xb3157dae, 0x2ae8fc32, 0x871e78e0,
+    0x1ee3f97c, 0x04e67bdb, 0x9d1bfa47, 0xef08727c, 0x76f5f3e0,
+    0x6cf07147, 0xf50df0db, 0x58fb7409, 0xc106f595, 0xdb037732,
+    0x42fef6ae, 0x20b654e6, 0xb94bd57a, 0xa34e57dd, 0x3ab3d641,
+    0x97455293, 0x0eb8d30f, 0x14bd51a8, 0x8d40d034, 0xff53580f,
+    0x66aed993, 0x7cab5b34, 0xe556daa8, 0x48a05e7a, 0xd15ddfe6,
+    0xcb585d41, 0x52a5dcdd, 0x2f7f4d37, 0xb682ccab, 0xac874e0c,
+    0x357acf90, 0x988c4b42, 0x0171cade, 0x1b744879, 0x8289c9e5,
+    0xf09a41de, 0x6967c042, 0x736242e5, 0xea9fc379, 0x476947ab,
+    0xde94c637, 0xc4914490, 0x5d6cc50c, 0x7e48ce88, 0xe7b54f14,
+    0xfdb0cdb3, 0x644d4c2f, 0xc9bbc8fd, 0x50464961, 0x4a43cbc6,
+    0xd3be4a5a, 0xa1adc261, 0x385043fd, 0x2255c15a, 0xbba840c6,
+    0x165ec414, 0x8fa34588, 0x95a6c72f, 0x0c5b46b3, 0x7181d759,
+    0xe87c56c5, 0xf279d462, 0x6b8455fe, 0xc672d12c, 0x5f8f50b0,
+    0x458ad217, 0xdc77538b, 0xae64dbb0, 0x37995a2c, 0x2d9cd88b,
+    0xb4615917, 0x1997ddc5, 0x806a5c59, 0x9a6fdefe, 0x03925f62,
+    0x61dafd2a, 0xf8277cb6, 0xe222fe11, 0x7bdf7f8d, 0xd629fb5f,
+    0x4fd47ac3, 0x55d1f864, 0xcc2c79f8, 0xbe3ff1c3, 0x27c2705f,
+    0x3dc7f2f8, 0xa43a7364, 0x09ccf7b6, 0x9031762a, 0x8a34f48d,
+    0x13c97511, 0x6e13e4fb, 0xf7ee6567, 0xedebe7c0, 0x7416665c,
+    0xd9e0e28e, 0x401d6312, 0x5a18e1b5, 0xc3e56029, 0xb1f6e812,
+    0x280b698e, 0x320eeb29, 0xabf36ab5, 0x0605ee67, 0x9ff86ffb,
+    0x85fded5c, 0x1c006cc0, 0x416ca9cc, 0xd8912850, 0xc294aaf7,
+    0x5b692b6b, 0xf69fafb9, 0x6f622e25, 0x7567ac82, 0xec9a2d1e,
+    0x9e89a525, 0x077424b9, 0x1d71a61e, 0x848c2782, 0x297aa350,
+    0xb08722cc, 0xaa82a06b, 0x337f21f7, 0x4ea5b01d, 0xd7583181,
+    0xcd5db326, 0x54a032ba, 0xf956b668, 0x60ab37f4, 0x7aaeb553,
+    0xe35334cf, 0x9140bcf4, 0x08bd3d68, 0x12b8bfcf, 0x8b453e53,
+    0x26b3ba81, 0xbf4e3b1d, 0xa54bb9ba, 0x3cb63826, 0x5efe9a6e,
+    0xc7031bf2, 0xdd069955, 0x44fb18c9, 0xe90d9c1b, 0x70f01d87,
+    0x6af59f20, 0xf3081ebc, 0x811b9687, 0x18e6171b, 0x02e395bc,
+    0x9b1e1420, 0x36e890f2, 0xaf15116e, 0xb51093c9, 0x2ced1255,
+    0x513783bf, 0xc8ca0223, 0xd2cf8084, 0x4b320118, 0xe6c485ca,
+    0x7f390456, 0x653c86f1, 0xfcc1076d, 0x8ed28f56, 0x172f0eca,
+    0x0d2a8c6d, 0x94d70df1, 0x39218923, 0xa0dc08bf, 0xbad98a18,
+    0x23240b84},
+   {0x00000000, 0xfc919d10, 0x49203a23, 0xb5b1a733, 0x92407446,
+    0x6ed1e956, 0xdb604e65, 0x27f1d375, 0x9483e88f, 0x6812759f,
+    0xdda3d2ac, 0x21324fbc, 0x06c39cc9, 0xfa5201d9, 0x4fe3a6ea,
+    0xb3723bfa, 0x9904d11d, 0x65954c0d, 0xd024eb3e, 0x2cb5762e,
+    0x0b44a55b, 0xf7d5384b, 0x42649f78, 0xbef50268, 0x0d873992,
+    0xf116a482, 0x44a703b1, 0xb8369ea1, 0x9fc74dd4, 0x6356d0c4,
+    0xd6e777f7, 0x2a76eae7, 0x820aa239, 0x7e9b3f29, 0xcb2a981a,
+    0x37bb050a, 0x104ad67f, 0xecdb4b6f, 0x596aec5c, 0xa5fb714c,
+    0x16894ab6, 0xea18d7a6, 0x5fa97095, 0xa338ed85, 0x84c93ef0,
+    0x7858a3e0, 0xcde904d3, 0x317899c3, 0x1b0e7324, 0xe79fee34,
+    0x522e4907, 0xaebfd417, 0x894e0762, 0x75df9a72, 0xc06e3d41,
+    0x3cffa051, 0x8f8d9bab, 0x731c06bb, 0xc6ada188, 0x3a3c3c98,
+    0x1dcdefed, 0xe15c72fd, 0x54edd5ce, 0xa87c48de, 0xb4164471,
+    0x4887d961, 0xfd367e52, 0x01a7e342, 0x26563037, 0xdac7ad27,
+    0x6f760a14, 0x93e79704, 0x2095acfe, 0xdc0431ee, 0x69b596dd,
+    0x95240bcd, 0xb2d5d8b8, 0x4e4445a8, 0xfbf5e29b, 0x07647f8b,
+    0x2d12956c, 0xd183087c, 0x6432af4f, 0x98a3325f, 0xbf52e12a,
+    0x43c37c3a, 0xf672db09, 0x0ae34619, 0xb9917de3, 0x4500e0f3,
+    0xf0b147c0, 0x0c20dad0, 0x2bd109a5, 0xd74094b5, 0x62f13386,
+    0x9e60ae96, 0x361ce648, 0xca8d7b58, 0x7f3cdc6b, 0x83ad417b,
+    0xa45c920e, 0x58cd0f1e, 0xed7ca82d, 0x11ed353d, 0xa29f0ec7,
+    0x5e0e93d7, 0xebbf34e4, 0x172ea9f4, 0x30df7a81, 0xcc4ee791,
+    0x79ff40a2, 0x856eddb2, 0xaf183755, 0x5389aa45, 0xe6380d76,
+    0x1aa99066, 0x3d584313, 0xc1c9de03, 0x74787930, 0x88e9e420,
+    0x3b9bdfda, 0xc70a42ca, 0x72bbe5f9, 0x8e2a78e9, 0xa9dbab9c,
+    0x554a368c, 0xe0fb91bf, 0x1c6a0caf, 0xd82f88e1, 0x24be15f1,
+    0x910fb2c2, 0x6d9e2fd2, 0x4a6ffca7, 0xb6fe61b7, 0x034fc684,
+    0xffde5b94, 0x4cac606e, 0xb03dfd7e, 0x058c5a4d, 0xf91dc75d,
+    0xdeec1428, 0x227d8938, 0x97cc2e0b, 0x6b5db31b, 0x412b59fc,
+    0xbdbac4ec, 0x080b63df, 0xf49afecf, 0xd36b2dba, 0x2ffab0aa,
+    0x9a4b1799, 0x66da8a89, 0xd5a8b173, 0x29392c63, 0x9c888b50,
+    0x60191640, 0x47e8c535, 0xbb795825, 0x0ec8ff16, 0xf2596206,
+    0x5a252ad8, 0xa6b4b7c8, 0x130510fb, 0xef948deb, 0xc8655e9e,
+    0x34f4c38e, 0x814564bd, 0x7dd4f9ad, 0xcea6c257, 0x32375f47,
+    0x8786f874, 0x7b176564, 0x5ce6b611, 0xa0772b01, 0x15c68c32,
+    0xe9571122, 0xc321fbc5, 0x3fb066d5, 0x8a01c1e6, 0x76905cf6,
+    0x51618f83, 0xadf01293, 0x1841b5a0, 0xe4d028b0, 0x57a2134a,
+    0xab338e5a, 0x1e822969, 0xe213b479, 0xc5e2670c, 0x3973fa1c,
+    0x8cc25d2f, 0x7053c03f, 0x6c39cc90, 0x90a85180, 0x2519f6b3,
+    0xd9886ba3, 0xfe79b8d6, 0x02e825c6, 0xb75982f5, 0x4bc81fe5,
+    0xf8ba241f, 0x042bb90f, 0xb19a1e3c, 0x4d0b832c, 0x6afa5059,
+    0x966bcd49, 0x23da6a7a, 0xdf4bf76a, 0xf53d1d8d, 0x09ac809d,
+    0xbc1d27ae, 0x408cbabe, 0x677d69cb, 0x9becf4db, 0x2e5d53e8,
+    0xd2cccef8, 0x61bef502, 0x9d2f6812, 0x289ecf21, 0xd40f5231,
+    0xf3fe8144, 0x0f6f1c54, 0xbadebb67, 0x464f2677, 0xee336ea9,
+    0x12a2f3b9, 0xa713548a, 0x5b82c99a, 0x7c731aef, 0x80e287ff,
+    0x355320cc, 0xc9c2bddc, 0x7ab08626, 0x86211b36, 0x3390bc05,
+    0xcf012115, 0xe8f0f260, 0x14616f70, 0xa1d0c843, 0x5d415553,
+    0x7737bfb4, 0x8ba622a4, 0x3e178597, 0xc2861887, 0xe577cbf2,
+    0x19e656e2, 0xac57f1d1, 0x50c66cc1, 0xe3b4573b, 0x1f25ca2b,
+    0xaa946d18, 0x5605f008, 0x71f4237d, 0x8d65be6d, 0x38d4195e,
+    0xc445844e},
+   {0x00000000, 0x005c11c1, 0x00b82382, 0x00e43243, 0x01704704,
+    0x012c56c5, 0x01c86486, 0x01947547, 0x02e08e08, 0x02bc9fc9,
+    0x0258ad8a, 0x0204bc4b, 0x0390c90c, 0x03ccd8cd, 0x0328ea8e,
+    0x0374fb4f, 0x05c11c10, 0x059d0dd1, 0x05793f92, 0x05252e53,
+    0x04b15b14, 0x04ed4ad5, 0x04097896, 0x04556957, 0x07219218,
+    0x077d83d9, 0x0799b19a, 0x07c5a05b, 0x0651d51c, 0x060dc4dd,
+    0x06e9f69e, 0x06b5e75f, 0x0b823820, 0x0bde29e1, 0x0b3a1ba2,
+    0x0b660a63, 0x0af27f24, 0x0aae6ee5, 0x0a4a5ca6, 0x0a164d67,
+    0x0962b628, 0x093ea7e9, 0x09da95aa, 0x0986846b, 0x0812f12c,
+    0x084ee0ed, 0x08aad2ae, 0x08f6c36f, 0x0e432430, 0x0e1f35f1,
+    0x0efb07b2, 0x0ea71673, 0x0f336334, 0x0f6f72f5, 0x0f8b40b6,
+    0x0fd75177, 0x0ca3aa38, 0x0cffbbf9, 0x0c1b89ba, 0x0c47987b,
+    0x0dd3ed3c, 0x0d8ffcfd, 0x0d6bcebe, 0x0d37df7f, 0x17047040,
+    0x17586181, 0x17bc53c2, 0x17e04203, 0x16743744, 0x16282685,
+    0x16cc14c6, 0x16900507, 0x15e4fe48, 0x15b8ef89, 0x155cddca,
+    0x1500cc0b, 0x1494b94c, 0x14c8a88d, 0x142c9ace, 0x14708b0f,
+    0x12c56c50, 0x12997d91, 0x127d4fd2, 0x12215e13, 0x13b52b54,
+    0x13e93a95, 0x130d08d6, 0x13511917, 0x1025e258, 0x1079f399,
+    0x109dc1da, 0x10c1d01b, 0x1155a55c, 0x1109b49d, 0x11ed86de,
+    0x11b1971f, 0x1c864860, 0x1cda59a1, 0x1c3e6be2, 0x1c627a23,
+    0x1df60f64, 0x1daa1ea5, 0x1d4e2ce6, 0x1d123d27, 0x1e66c668,
+    0x1e3ad7a9, 0x1edee5ea, 0x1e82f42b, 0x1f16816c, 0x1f4a90ad,
+    0x1faea2ee, 0x1ff2b32f, 0x19475470, 0x191b45b1, 0x19ff77f2,
+    0x19a36633, 0x18371374, 0x186b02b5, 0x188f30f6, 0x18d32137,
+    0x1ba7da78, 0x1bfbcbb9, 0x1b1ff9fa, 0x1b43e83b, 0x1ad79d7c,
+    0x1a8b8cbd, 0x1a6fbefe, 0x1a33af3f, 0x2e08e080, 0x2e54f141,
+    0x2eb0c302, 0x2eecd2c3, 0x2f78a784, 0x2f24b645, 0x2fc08406,
+    0x2f9c95c7, 0x2ce86e88, 0x2cb47f49, 0x2c504d0a, 0x2c0c5ccb,
+    0x2d98298c, 0x2dc4384d, 0x2d200a0e, 0x2d7c1bcf, 0x2bc9fc90,
+    0x2b95ed51, 0x2b71df12, 0x2b2dced3, 0x2ab9bb94, 0x2ae5aa55,
+    0x2a019816, 0x2a5d89d7, 0x29297298, 0x29756359, 0x2991511a,
+    0x29cd40db, 0x2859359c, 0x2805245d, 0x28e1161e, 0x28bd07df,
+    0x258ad8a0, 0x25d6c961, 0x2532fb22, 0x256eeae3, 0x24fa9fa4,
+    0x24a68e65, 0x2442bc26, 0x241eade7, 0x276a56a8, 0x27364769,
+    0x27d2752a, 0x278e64eb, 0x261a11ac, 0x2646006d, 0x26a2322e,
+    0x26fe23ef, 0x204bc4b0, 0x2017d571, 0x20f3e732, 0x20aff6f3,
+    0x213b83b4, 0x21679275, 0x2183a036, 0x21dfb1f7, 0x22ab4ab8,
+    0x22f75b79, 0x2213693a, 0x224f78fb, 0x23db0dbc, 0x23871c7d,
+    0x23632e3e, 0x233f3fff, 0x390c90c0, 0x39508101, 0x39b4b342,
+    0x39e8a283, 0x387cd7c4, 0x3820c605, 0x38c4f446, 0x3898e587,
+    0x3bec1ec8, 0x3bb00f09, 0x3b543d4a, 0x3b082c8b, 0x3a9c59cc,
+    0x3ac0480d, 0x3a247a4e, 0x3a786b8f, 0x3ccd8cd0, 0x3c919d11,
+    0x3c75af52, 0x3c29be93, 0x3dbdcbd4, 0x3de1da15, 0x3d05e856,
+    0x3d59f997, 0x3e2d02d8, 0x3e711319, 0x3e95215a, 0x3ec9309b,
+    0x3f5d45dc, 0x3f01541d, 0x3fe5665e, 0x3fb9779f, 0x328ea8e0,
+    0x32d2b921, 0x32368b62, 0x326a9aa3, 0x33feefe4, 0x33a2fe25,
+    0x3346cc66, 0x331adda7, 0x306e26e8, 0x30323729, 0x30d6056a,
+    0x308a14ab, 0x311e61ec, 0x3142702d, 0x31a6426e, 0x31fa53af,
+    0x374fb4f0, 0x3713a531, 0x37f79772, 0x37ab86b3, 0x363ff3f4,
+    0x3663e235, 0x3687d076, 0x36dbc1b7, 0x35af3af8, 0x35f32b39,
+    0x3517197a, 0x354b08bb, 0x34df7dfc, 0x34836c3d, 0x34675e7e,
+    0x343b4fbf},
+   {0x00000000, 0x5c11c100, 0xb8238200, 0xe4324300, 0xc0440403,
+    0x9c55c503, 0x78678603, 0x24764703, 0x308b0805, 0x6c9ac905,
+    0x88a88a05, 0xd4b94b05, 0xf0cf0c06, 0xacdecd06, 0x48ec8e06,
+    0x14fd4f06, 0x6116100a, 0x3d07d10a, 0xd935920a, 0x8524530a,
+    0xa1521409, 0xfd43d509, 0x19719609, 0x45605709, 0x519d180f,
+    0x0d8cd90f, 0xe9be9a0f, 0xb5af5b0f, 0x91d91c0c, 0xcdc8dd0c,
+    0x29fa9e0c, 0x75eb5f0c, 0xc22c2014, 0x9e3de114, 0x7a0fa214,
+    0x261e6314, 0x02682417, 0x5e79e517, 0xba4ba617, 0xe65a6717,
+    0xf2a72811, 0xaeb6e911, 0x4a84aa11, 0x16956b11, 0x32e32c12,
+    0x6ef2ed12, 0x8ac0ae12, 0xd6d16f12, 0xa33a301e, 0xff2bf11e,
+    0x1b19b21e, 0x4708731e, 0x637e341d, 0x3f6ff51d, 0xdb5db61d,
+    0x874c771d, 0x93b1381b, 0xcfa0f91b, 0x2b92ba1b, 0x77837b1b,
+    0x53f53c18, 0x0fe4fd18, 0xebd6be18, 0xb7c77f18, 0x345b402b,
+    0x684a812b, 0x8c78c22b, 0xd069032b, 0xf41f4428, 0xa80e8528,
+    0x4c3cc628, 0x102d0728, 0x04d0482e, 0x58c1892e, 0xbcf3ca2e,
+    0xe0e20b2e, 0xc4944c2d, 0x98858d2d, 0x7cb7ce2d, 0x20a60f2d,
+    0x554d5021, 0x095c9121, 0xed6ed221, 0xb17f1321, 0x95095422,
+    0xc9189522, 0x2d2ad622, 0x713b1722, 0x65c65824, 0x39d79924,
+    0xdde5da24, 0x81f41b24, 0xa5825c27, 0xf9939d27, 0x1da1de27,
+    0x41b01f27, 0xf677603f, 0xaa66a13f, 0x4e54e23f, 0x1245233f,
+    0x3633643c, 0x6a22a53c, 0x8e10e63c, 0xd201273c, 0xc6fc683a,
+    0x9aeda93a, 0x7edfea3a, 0x22ce2b3a, 0x06b86c39, 0x5aa9ad39,
+    0xbe9bee39, 0xe28a2f39, 0x97617035, 0xcb70b135, 0x2f42f235,
+    0x73533335, 0x57257436, 0x0b34b536, 0xef06f636, 0xb3173736,
+    0xa7ea7830, 0xfbfbb930, 0x1fc9fa30, 0x43d83b30, 0x67ae7c33,
+    0x3bbfbd33, 0xdf8dfe33, 0x839c3f33, 0x68b68056, 0x34a74156,
+    0xd0950256, 0x8c84c356, 0xa8f28455, 0xf4e34555, 0x10d10655,
+    0x4cc0c755, 0x583d8853, 0x042c4953, 0xe01e0a53, 0xbc0fcb53,
+    0x98798c50, 0xc4684d50, 0x205a0e50, 0x7c4bcf50, 0x09a0905c,
+    0x55b1515c, 0xb183125c, 0xed92d35c, 0xc9e4945f, 0x95f5555f,
+    0x71c7165f, 0x2dd6d75f, 0x392b9859, 0x653a5959, 0x81081a59,
+    0xdd19db59, 0xf96f9c5a, 0xa57e5d5a, 0x414c1e5a, 0x1d5ddf5a,
+    0xaa9aa042, 0xf68b6142, 0x12b92242, 0x4ea8e342, 0x6adea441,
+    0x36cf6541, 0xd2fd2641, 0x8eece741, 0x9a11a847, 0xc6006947,
+    0x22322a47, 0x7e23eb47, 0x5a55ac44, 0x06446d44, 0xe2762e44,
+    0xbe67ef44, 0xcb8cb048, 0x979d7148, 0x73af3248, 0x2fbef348,
+    0x0bc8b44b, 0x57d9754b, 0xb3eb364b, 0xeffaf74b, 0xfb07b84d,
+    0xa716794d, 0x43243a4d, 0x1f35fb4d, 0x3b43bc4e, 0x67527d4e,
+    0x83603e4e, 0xdf71ff4e, 0x5cedc07d, 0x00fc017d, 0xe4ce427d,
+    0xb8df837d, 0x9ca9c47e, 0xc0b8057e, 0x248a467e, 0x789b877e,
+    0x6c66c878, 0x30770978, 0xd4454a78, 0x88548b78, 0xac22cc7b,
+    0xf0330d7b, 0x14014e7b, 0x48108f7b, 0x3dfbd077, 0x61ea1177,
+    0x85d85277, 0xd9c99377, 0xfdbfd474, 0xa1ae1574, 0x459c5674,
+    0x198d9774, 0x0d70d872, 0x51611972, 0xb5535a72, 0xe9429b72,
+    0xcd34dc71, 0x91251d71, 0x75175e71, 0x29069f71, 0x9ec1e069,
+    0xc2d02169, 0x26e26269, 0x7af3a369, 0x5e85e46a, 0x0294256a,
+    0xe6a6666a, 0xbab7a76a, 0xae4ae86c, 0xf25b296c, 0x16696a6c,
+    0x4a78ab6c, 0x6e0eec6f, 0x321f2d6f, 0xd62d6e6f, 0x8a3caf6f,
+    0xffd7f063, 0xa3c63163, 0x47f47263, 0x1be5b363, 0x3f93f460,
+    0x63823560, 0x87b07660, 0xdba1b760, 0xcf5cf866, 0x934d3966,
+    0x777f7a66, 0x2b6ebb66, 0x0f18fc65, 0x53093d65, 0xb73b7e65,
+    0xeb2abf65},
+   {0x00000000, 0xd16d00ac, 0x12d9015b, 0xc3b401f7, 0x25b202b6,
+    0xf4df021a, 0x376b03ed, 0xe6060341, 0x4b64056c, 0x9a0905c0,
+    0x59bd0437, 0x88d0049b, 0x6ed607da, 0xbfbb0776, 0x7c0f0681,
+    0xad62062d, 0x96c80ad8, 0x47a50a74, 0x84110b83, 0x557c0b2f,
+    0xb37a086e, 0x621708c2, 0xa1a30935, 0x70ce0999, 0xddac0fb4,
+    0x0cc10f18, 0xcf750eef, 0x1e180e43, 0xf81e0d02, 0x29730dae,
+    0xeac70c59, 0x3baa0cf5, 0x9d9315b3, 0x4cfe151f, 0x8f4a14e8,
+    0x5e271444, 0xb8211705, 0x694c17a9, 0xaaf8165e, 0x7b9516f2,
+    0xd6f710df, 0x079a1073, 0xc42e1184, 0x15431128, 0xf3451269,
+    0x222812c5, 0xe19c1332, 0x30f1139e, 0x0b5b1f6b, 0xda361fc7,
+    0x19821e30, 0xc8ef1e9c, 0x2ee91ddd, 0xff841d71, 0x3c301c86,
+    0xed5d1c2a, 0x403f1a07, 0x91521aab, 0x52e61b5c, 0x838b1bf0,
+    0x658d18b1, 0xb4e0181d, 0x775419ea, 0xa6391946, 0x8b252b65,
+    0x5a482bc9, 0x99fc2a3e, 0x48912a92, 0xae9729d3, 0x7ffa297f,
+    0xbc4e2888, 0x6d232824, 0xc0412e09, 0x112c2ea5, 0xd2982f52,
+    0x03f52ffe, 0xe5f32cbf, 0x349e2c13, 0xf72a2de4, 0x26472d48,
+    0x1ded21bd, 0xcc802111, 0x0f3420e6, 0xde59204a, 0x385f230b,
+    0xe93223a7, 0x2a862250, 0xfbeb22fc, 0x568924d1, 0x87e4247d,
+    0x4450258a, 0x953d2526, 0x733b2667, 0xa25626cb, 0x61e2273c,
+    0xb08f2790, 0x16b63ed6, 0xc7db3e7a, 0x046f3f8d, 0xd5023f21,
+    0x33043c60, 0xe2693ccc, 0x21dd3d3b, 0xf0b03d97, 0x5dd23bba,
+    0x8cbf3b16, 0x4f0b3ae1, 0x9e663a4d, 0x7860390c, 0xa90d39a0,
+    0x6ab93857, 0xbbd438fb, 0x807e340e, 0x511334a2, 0x92a73555,
+    0x43ca35f9, 0xa5cc36b8, 0x74a13614, 0xb71537e3, 0x6678374f,
+    0xcb1a3162, 0x1a7731ce, 0xd9c33039, 0x08ae3095, 0xeea833d4,
+    0x3fc53378, 0xfc71328f, 0x2d1c3223, 0xa64956c9, 0x77245665,
+    0xb4905792, 0x65fd573e, 0x83fb547f, 0x529654d3, 0x91225524,
+    0x404f5588, 0xed2d53a5, 0x3c405309, 0xfff452fe, 0x2e995252,
+    0xc89f5113, 0x19f251bf, 0xda465048, 0x0b2b50e4, 0x30815c11,
+    0xe1ec5cbd, 0x22585d4a, 0xf3355de6, 0x15335ea7, 0xc45e5e0b,
+    0x07ea5ffc, 0xd6875f50, 0x7be5597d, 0xaa8859d1, 0x693c5826,
+    0xb851588a, 0x5e575bcb, 0x8f3a5b67, 0x4c8e5a90, 0x9de35a3c,
+    0x3bda437a, 0xeab743d6, 0x29034221, 0xf86e428d, 0x1e6841cc,
+    0xcf054160, 0x0cb14097, 0xdddc403b, 0x70be4616, 0xa1d346ba,
+    0x6267474d, 0xb30a47e1, 0x550c44a0, 0x8461440c, 0x47d545fb,
+    0x96b84557, 0xad1249a2, 0x7c7f490e, 0xbfcb48f9, 0x6ea64855,
+    0x88a04b14, 0x59cd4bb8, 0x9a794a4f, 0x4b144ae3, 0xe6764cce,
+    0x371b4c62, 0xf4af4d95, 0x25c24d39, 0xc3c44e78, 0x12a94ed4,
+    0xd11d4f23, 0x00704f8f, 0x2d6c7dac, 0xfc017d00, 0x3fb57cf7,
+    0xeed87c5b, 0x08de7f1a, 0xd9b37fb6, 0x1a077e41, 0xcb6a7eed,
+    0x660878c0, 0xb765786c, 0x74d1799b, 0xa5bc7937, 0x43ba7a76,
+    0x92d77ada, 0x51637b2d, 0x800e7b81, 0xbba47774, 0x6ac977d8,
+    0xa97d762f, 0x78107683, 0x9e1675c2, 0x4f7b756e, 0x8ccf7499,
+    0x5da27435, 0xf0c07218, 0x21ad72b4, 0xe2197343, 0x337473ef,
+    0xd57270ae, 0x041f7002, 0xc7ab71f5, 0x16c67159, 0xb0ff681f,
+    0x619268b3, 0xa2266944, 0x734b69e8, 0x954d6aa9, 0x44206a05,
+    0x87946bf2, 0x56f96b5e, 0xfb9b6d73, 0x2af66ddf, 0xe9426c28,
+    0x382f6c84, 0xde296fc5, 0x0f446f69, 0xccf06e9e, 0x1d9d6e32,
+    0x263762c7, 0xf75a626b, 0x34ee639c, 0xe5836330, 0x03856071,
+    0xd2e860dd, 0x115c612a, 0xc0316186, 0x6d5367ab, 0xbc3e6707,
+    0x7f8a66f0, 0xaee7665c, 0x48e1651d, 0x998c65b1, 0x5a386446,
+    0x8b5564ea},
+   {0x00000000, 0xfc91ad91, 0x49205b21, 0xb5b1f6b0, 0x9240b642,
+    0x6ed11bd3, 0xdb60ed63, 0x27f140f2, 0x94826c87, 0x6813c116,
+    0xdda237a6, 0x21339a37, 0x06c2dac5, 0xfa537754, 0x4fe281e4,
+    0xb3732c75, 0x9907d90d, 0x6596749c, 0xd027822c, 0x2cb62fbd,
+    0x0b476f4f, 0xf7d6c2de, 0x4267346e, 0xbef699ff, 0x0d85b58a,
+    0xf114181b, 0x44a5eeab, 0xb834433a, 0x9fc503c8, 0x6354ae59,
+    0xd6e558e9, 0x2a74f578, 0x820cb219, 0x7e9d1f88, 0xcb2ce938,
+    0x37bd44a9, 0x104c045b, 0xecdda9ca, 0x596c5f7a, 0xa5fdf2eb,
+    0x168ede9e, 0xea1f730f, 0x5fae85bf, 0xa33f282e, 0x84ce68dc,
+    0x785fc54d, 0xcdee33fd, 0x317f9e6c, 0x1b0b6b14, 0xe79ac685,
+    0x522b3035, 0xaeba9da4, 0x894bdd56, 0x75da70c7, 0xc06b8677,
+    0x3cfa2be6, 0x8f890793, 0x7318aa02, 0xc6a95cb2, 0x3a38f123,
+    0x1dc9b1d1, 0xe1581c40, 0x54e9eaf0, 0xa8784761, 0xb41a6431,
+    0x488bc9a0, 0xfd3a3f10, 0x01ab9281, 0x265ad273, 0xdacb7fe2,
+    0x6f7a8952, 0x93eb24c3, 0x209808b6, 0xdc09a527, 0x69b85397,
+    0x9529fe06, 0xb2d8bef4, 0x4e491365, 0xfbf8e5d5, 0x07694844,
+    0x2d1dbd3c, 0xd18c10ad, 0x643de61d, 0x98ac4b8c, 0xbf5d0b7e,
+    0x43cca6ef, 0xf67d505f, 0x0aecfdce, 0xb99fd1bb, 0x450e7c2a,
+    0xf0bf8a9a, 0x0c2e270b, 0x2bdf67f9, 0xd74eca68, 0x62ff3cd8,
+    0x9e6e9149, 0x3616d628, 0xca877bb9, 0x7f368d09, 0x83a72098,
+    0xa456606a, 0x58c7cdfb, 0xed763b4b, 0x11e796da, 0xa294baaf,
+    0x5e05173e, 0xebb4e18e, 0x17254c1f, 0x30d40ced, 0xcc45a17c,
+    0x79f457cc, 0x8565fa5d, 0xaf110f25, 0x5380a2b4, 0xe6315404,
+    0x1aa0f995, 0x3d51b967, 0xc1c014f6, 0x7471e246, 0x88e04fd7,
+    0x3b9363a2, 0xc702ce33, 0x72b33883, 0x8e229512, 0xa9d3d5e0,
+    0x55427871, 0xe0f38ec1, 0x1c622350, 0xd837c861, 0x24a665f0,
+    0x91179340, 0x6d863ed1, 0x4a777e23, 0xb6e6d3b2, 0x03572502,
+    0xffc68893, 0x4cb5a4e6, 0xb0240977, 0x0595ffc7, 0xf9045256,
+    0xdef512a4, 0x2264bf35, 0x97d54985, 0x6b44e414, 0x4130116c,
+    0xbda1bcfd, 0x08104a4d, 0xf481e7dc, 0xd370a72e, 0x2fe10abf,
+    0x9a50fc0f, 0x66c1519e, 0xd5b27deb, 0x2923d07a, 0x9c9226ca,
+    0x60038b5b, 0x47f2cba9, 0xbb636638, 0x0ed29088, 0xf2433d19,
+    0x5a3b7a78, 0xa6aad7e9, 0x131b2159, 0xef8a8cc8, 0xc87bcc3a,
+    0x34ea61ab, 0x815b971b, 0x7dca3a8a, 0xceb916ff, 0x3228bb6e,
+    0x87994dde, 0x7b08e04f, 0x5cf9a0bd, 0xa0680d2c, 0x15d9fb9c,
+    0xe948560d, 0xc33ca375, 0x3fad0ee4, 0x8a1cf854, 0x768d55c5,
+    0x517c1537, 0xadedb8a6, 0x185c4e16, 0xe4cde387, 0x57becff2,
+    0xab2f6263, 0x1e9e94d3, 0xe20f3942, 0xc5fe79b0, 0x396fd421,
+    0x8cde2291, 0x704f8f00, 0x6c2dac50, 0x90bc01c1, 0x250df771,
+    0xd99c5ae0, 0xfe6d1a12, 0x02fcb783, 0xb74d4133, 0x4bdceca2,
+    0xf8afc0d7, 0x043e6d46, 0xb18f9bf6, 0x4d1e3667, 0x6aef7695,
+    0x967edb04, 0x23cf2db4, 0xdf5e8025, 0xf52a755d, 0x09bbd8cc,
+    0xbc0a2e7c, 0x409b83ed, 0x676ac31f, 0x9bfb6e8e, 0x2e4a983e,
+    0xd2db35af, 0x61a819da, 0x9d39b44b, 0x288842fb, 0xd419ef6a,
+    0xf3e8af98, 0x0f790209, 0xbac8f4b9, 0x46595928, 0xee211e49,
+    0x12b0b3d8, 0xa7014568, 0x5b90e8f9, 0x7c61a80b, 0x80f0059a,
+    0x3541f32a, 0xc9d05ebb, 0x7aa372ce, 0x8632df5f, 0x338329ef,
+    0xcf12847e, 0xe8e3c48c, 0x1472691d, 0xa1c39fad, 0x5d52323c,
+    0x7726c744, 0x8bb76ad5, 0x3e069c65, 0xc29731f4, 0xe5667106,
+    0x19f7dc97, 0xac462a27, 0x50d787b6, 0xe3a4abc3, 0x1f350652,
+    0xaa84f0e2, 0x56155d73, 0x71e41d81, 0x8d75b010, 0x38c446a0,
+    0xc455eb31},
+   {0x00000000, 0x006c90c1, 0x00d92182, 0x00b5b143, 0x01b24304,
+    0x01ded3c5, 0x016b6286, 0x0107f247, 0x03648608, 0x030816c9,
+    0x03bda78a, 0x03d1374b, 0x02d6c50c, 0x02ba55cd, 0x020fe48e,
+    0x0263744f, 0x06c90c10, 0x06a59cd1, 0x06102d92, 0x067cbd53,
+    0x077b4f14, 0x0717dfd5, 0x07a26e96, 0x07cefe57, 0x05ad8a18,
+    0x05c11ad9, 0x0574ab9a, 0x05183b5b, 0x041fc91c, 0x047359dd,
+    0x04c6e89e, 0x04aa785f, 0x0d921820, 0x0dfe88e1, 0x0d4b39a2,
+    0x0d27a963, 0x0c205b24, 0x0c4ccbe5, 0x0cf97aa6, 0x0c95ea67,
+    0x0ef69e28, 0x0e9a0ee9, 0x0e2fbfaa, 0x0e432f6b, 0x0f44dd2c,
+    0x0f284ded, 0x0f9dfcae, 0x0ff16c6f, 0x0b5b1430, 0x0b3784f1,
+    0x0b8235b2, 0x0beea573, 0x0ae95734, 0x0a85c7f5, 0x0a3076b6,
+    0x0a5ce677, 0x083f9238, 0x085302f9, 0x08e6b3ba, 0x088a237b,
+    0x098dd13c, 0x09e141fd, 0x0954f0be, 0x0938607f, 0x1b243040,
+    0x1b48a081, 0x1bfd11c2, 0x1b918103, 0x1a967344, 0x1afae385,
+    0x1a4f52c6, 0x1a23c207, 0x1840b648, 0x182c2689, 0x189997ca,
+    0x18f5070b, 0x19f2f54c, 0x199e658d, 0x192bd4ce, 0x1947440f,
+    0x1ded3c50, 0x1d81ac91, 0x1d341dd2, 0x1d588d13, 0x1c5f7f54,
+    0x1c33ef95, 0x1c865ed6, 0x1ceace17, 0x1e89ba58, 0x1ee52a99,
+    0x1e509bda, 0x1e3c0b1b, 0x1f3bf95c, 0x1f57699d, 0x1fe2d8de,
+    0x1f8e481f, 0x16b62860, 0x16dab8a1, 0x166f09e2, 0x16039923,
+    0x17046b64, 0x1768fba5, 0x17dd4ae6, 0x17b1da27, 0x15d2ae68,
+    0x15be3ea9, 0x150b8fea, 0x15671f2b, 0x1460ed6c, 0x140c7dad,
+    0x14b9ccee, 0x14d55c2f, 0x107f2470, 0x1013b4b1, 0x10a605f2,
+    0x10ca9533, 0x11cd6774, 0x11a1f7b5, 0x111446f6, 0x1178d637,
+    0x131ba278, 0x137732b9, 0x13c283fa, 0x13ae133b, 0x12a9e17c,
+    0x12c571bd, 0x1270c0fe, 0x121c503f, 0x36486080, 0x3624f041,
+    0x36914102, 0x36fdd1c3, 0x37fa2384, 0x3796b345, 0x37230206,
+    0x374f92c7, 0x352ce688, 0x35407649, 0x35f5c70a, 0x359957cb,
+    0x349ea58c, 0x34f2354d, 0x3447840e, 0x342b14cf, 0x30816c90,
+    0x30edfc51, 0x30584d12, 0x3034ddd3, 0x31332f94, 0x315fbf55,
+    0x31ea0e16, 0x31869ed7, 0x33e5ea98, 0x33897a59, 0x333ccb1a,
+    0x33505bdb, 0x3257a99c, 0x323b395d, 0x328e881e, 0x32e218df,
+    0x3bda78a0, 0x3bb6e861, 0x3b035922, 0x3b6fc9e3, 0x3a683ba4,
+    0x3a04ab65, 0x3ab11a26, 0x3add8ae7, 0x38befea8, 0x38d26e69,
+    0x3867df2a, 0x380b4feb, 0x390cbdac, 0x39602d6d, 0x39d59c2e,
+    0x39b90cef, 0x3d1374b0, 0x3d7fe471, 0x3dca5532, 0x3da6c5f3,
+    0x3ca137b4, 0x3ccda775, 0x3c781636, 0x3c1486f7, 0x3e77f2b8,
+    0x3e1b6279, 0x3eaed33a, 0x3ec243fb, 0x3fc5b1bc, 0x3fa9217d,
+    0x3f1c903e, 0x3f7000ff, 0x2d6c50c0, 0x2d00c001, 0x2db57142,
+    0x2dd9e183, 0x2cde13c4, 0x2cb28305, 0x2c073246, 0x2c6ba287,
+    0x2e08d6c8, 0x2e644609, 0x2ed1f74a, 0x2ebd678b, 0x2fba95cc,
+    0x2fd6050d, 0x2f63b44e, 0x2f0f248f, 0x2ba55cd0, 0x2bc9cc11,
+    0x2b7c7d52, 0x2b10ed93, 0x2a171fd4, 0x2a7b8f15, 0x2ace3e56,
+    0x2aa2ae97, 0x28c1dad8, 0x28ad4a19, 0x2818fb5a, 0x28746b9b,
+    0x297399dc, 0x291f091d, 0x29aab85e, 0x29c6289f, 0x20fe48e0,
+    0x2092d821, 0x20276962, 0x204bf9a3, 0x214c0be4, 0x21209b25,
+    0x21952a66, 0x21f9baa7, 0x239acee8, 0x23f65e29, 0x2343ef6a,
+    0x232f7fab, 0x22288dec, 0x22441d2d, 0x22f1ac6e, 0x229d3caf,
+    0x263744f0, 0x265bd431, 0x26ee6572, 0x2682f5b3, 0x278507f4,
+    0x27e99735, 0x275c2676, 0x2730b6b7, 0x2553c2f8, 0x253f5239,
+    0x258ae37a, 0x25e673bb, 0x24e181fc, 0x248d113d, 0x2438a07e,
+    0x245430bf}};
+
+static const word_t crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0xc1906c0000000000, 0x8221d90000000000,
+    0x43b1b50000000000, 0x0443b20100000000, 0xc5d3de0100000000,
+    0x86626b0100000000, 0x47f2070100000000, 0x0886640300000000,
+    0xc916080300000000, 0x8aa7bd0300000000, 0x4b37d10300000000,
+    0x0cc5d60200000000, 0xcd55ba0200000000, 0x8ee40f0200000000,
+    0x4f74630200000000, 0x100cc90600000000, 0xd19ca50600000000,
+    0x922d100600000000, 0x53bd7c0600000000, 0x144f7b0700000000,
+    0xd5df170700000000, 0x966ea20700000000, 0x57fece0700000000,
+    0x188aad0500000000, 0xd91ac10500000000, 0x9aab740500000000,
+    0x5b3b180500000000, 0x1cc91f0400000000, 0xdd59730400000000,
+    0x9ee8c60400000000, 0x5f78aa0400000000, 0x2018920d00000000,
+    0xe188fe0d00000000, 0xa2394b0d00000000, 0x63a9270d00000000,
+    0x245b200c00000000, 0xe5cb4c0c00000000, 0xa67af90c00000000,
+    0x67ea950c00000000, 0x289ef60e00000000, 0xe90e9a0e00000000,
+    0xaabf2f0e00000000, 0x6b2f430e00000000, 0x2cdd440f00000000,
+    0xed4d280f00000000, 0xaefc9d0f00000000, 0x6f6cf10f00000000,
+    0x30145b0b00000000, 0xf184370b00000000, 0xb235820b00000000,
+    0x73a5ee0b00000000, 0x3457e90a00000000, 0xf5c7850a00000000,
+    0xb676300a00000000, 0x77e65c0a00000000, 0x38923f0800000000,
+    0xf902530800000000, 0xbab3e60800000000, 0x7b238a0800000000,
+    0x3cd18d0900000000, 0xfd41e10900000000, 0xbef0540900000000,
+    0x7f60380900000000, 0x4030241b00000000, 0x81a0481b00000000,
+    0xc211fd1b00000000, 0x0381911b00000000, 0x4473961a00000000,
+    0x85e3fa1a00000000, 0xc6524f1a00000000, 0x07c2231a00000000,
+    0x48b6401800000000, 0x89262c1800000000, 0xca97991800000000,
+    0x0b07f51800000000, 0x4cf5f21900000000, 0x8d659e1900000000,
+    0xced42b1900000000, 0x0f44471900000000, 0x503ced1d00000000,
+    0x91ac811d00000000, 0xd21d341d00000000, 0x138d581d00000000,
+    0x547f5f1c00000000, 0x95ef331c00000000, 0xd65e861c00000000,
+    0x17ceea1c00000000, 0x58ba891e00000000, 0x992ae51e00000000,
+    0xda9b501e00000000, 0x1b0b3c1e00000000, 0x5cf93b1f00000000,
+    0x9d69571f00000000, 0xded8e21f00000000, 0x1f488e1f00000000,
+    0x6028b61600000000, 0xa1b8da1600000000, 0xe2096f1600000000,
+    0x2399031600000000, 0x646b041700000000, 0xa5fb681700000000,
+    0xe64add1700000000, 0x27dab11700000000, 0x68aed21500000000,
+    0xa93ebe1500000000, 0xea8f0b1500000000, 0x2b1f671500000000,
+    0x6ced601400000000, 0xad7d0c1400000000, 0xeeccb91400000000,
+    0x2f5cd51400000000, 0x70247f1000000000, 0xb1b4131000000000,
+    0xf205a61000000000, 0x3395ca1000000000, 0x7467cd1100000000,
+    0xb5f7a11100000000, 0xf646141100000000, 0x37d6781100000000,
+    0x78a21b1300000000, 0xb932771300000000, 0xfa83c21300000000,
+    0x3b13ae1300000000, 0x7ce1a91200000000, 0xbd71c51200000000,
+    0xfec0701200000000, 0x3f501c1200000000, 0x8060483600000000,
+    0x41f0243600000000, 0x0241913600000000, 0xc3d1fd3600000000,
+    0x8423fa3700000000, 0x45b3963700000000, 0x0602233700000000,
+    0xc7924f3700000000, 0x88e62c3500000000, 0x4976403500000000,
+    0x0ac7f53500000000, 0xcb57993500000000, 0x8ca59e3400000000,
+    0x4d35f23400000000, 0x0e84473400000000, 0xcf142b3400000000,
+    0x906c813000000000, 0x51fced3000000000, 0x124d583000000000,
+    0xd3dd343000000000, 0x942f333100000000, 0x55bf5f3100000000,
+    0x160eea3100000000, 0xd79e863100000000, 0x98eae53300000000,
+    0x597a893300000000, 0x1acb3c3300000000, 0xdb5b503300000000,
+    0x9ca9573200000000, 0x5d393b3200000000, 0x1e888e3200000000,
+    0xdf18e23200000000, 0xa078da3b00000000, 0x61e8b63b00000000,
+    0x2259033b00000000, 0xe3c96f3b00000000, 0xa43b683a00000000,
+    0x65ab043a00000000, 0x261ab13a00000000, 0xe78add3a00000000,
+    0xa8febe3800000000, 0x696ed23800000000, 0x2adf673800000000,
+    0xeb4f0b3800000000, 0xacbd0c3900000000, 0x6d2d603900000000,
+    0x2e9cd53900000000, 0xef0cb93900000000, 0xb074133d00000000,
+    0x71e47f3d00000000, 0x3255ca3d00000000, 0xf3c5a63d00000000,
+    0xb437a13c00000000, 0x75a7cd3c00000000, 0x3616783c00000000,
+    0xf786143c00000000, 0xb8f2773e00000000, 0x79621b3e00000000,
+    0x3ad3ae3e00000000, 0xfb43c23e00000000, 0xbcb1c53f00000000,
+    0x7d21a93f00000000, 0x3e901c3f00000000, 0xff00703f00000000,
+    0xc0506c2d00000000, 0x01c0002d00000000, 0x4271b52d00000000,
+    0x83e1d92d00000000, 0xc413de2c00000000, 0x0583b22c00000000,
+    0x4632072c00000000, 0x87a26b2c00000000, 0xc8d6082e00000000,
+    0x0946642e00000000, 0x4af7d12e00000000, 0x8b67bd2e00000000,
+    0xcc95ba2f00000000, 0x0d05d62f00000000, 0x4eb4632f00000000,
+    0x8f240f2f00000000, 0xd05ca52b00000000, 0x11ccc92b00000000,
+    0x527d7c2b00000000, 0x93ed102b00000000, 0xd41f172a00000000,
+    0x158f7b2a00000000, 0x563ece2a00000000, 0x97aea22a00000000,
+    0xd8dac12800000000, 0x194aad2800000000, 0x5afb182800000000,
+    0x9b6b742800000000, 0xdc99732900000000, 0x1d091f2900000000,
+    0x5eb8aa2900000000, 0x9f28c62900000000, 0xe048fe2000000000,
+    0x21d8922000000000, 0x6269272000000000, 0xa3f94b2000000000,
+    0xe40b4c2100000000, 0x259b202100000000, 0x662a952100000000,
+    0xa7baf92100000000, 0xe8ce9a2300000000, 0x295ef62300000000,
+    0x6aef432300000000, 0xab7f2f2300000000, 0xec8d282200000000,
+    0x2d1d442200000000, 0x6eacf12200000000, 0xaf3c9d2200000000,
+    0xf044372600000000, 0x31d45b2600000000, 0x7265ee2600000000,
+    0xb3f5822600000000, 0xf407852700000000, 0x3597e92700000000,
+    0x76265c2700000000, 0xb7b6302700000000, 0xf8c2532500000000,
+    0x39523f2500000000, 0x7ae38a2500000000, 0xbb73e62500000000,
+    0xfc81e12400000000, 0x3d118d2400000000, 0x7ea0382400000000,
+    0xbf30542400000000},
+   {0x0000000000000000, 0x91ad91fc00000000, 0x215b204900000000,
+    0xb0f6b1b500000000, 0x42b6409200000000, 0xd31bd16e00000000,
+    0x63ed60db00000000, 0xf240f12700000000, 0x876c829400000000,
+    0x16c1136800000000, 0xa637a2dd00000000, 0x379a332100000000,
+    0xc5dac20600000000, 0x547753fa00000000, 0xe481e24f00000000,
+    0x752c73b300000000, 0x0dd9079900000000, 0x9c74966500000000,
+    0x2c8227d000000000, 0xbd2fb62c00000000, 0x4f6f470b00000000,
+    0xdec2d6f700000000, 0x6e34674200000000, 0xff99f6be00000000,
+    0x8ab5850d00000000, 0x1b1814f100000000, 0xabeea54400000000,
+    0x3a4334b800000000, 0xc803c59f00000000, 0x59ae546300000000,
+    0xe958e5d600000000, 0x78f5742a00000000, 0x19b20c8200000000,
+    0x881f9d7e00000000, 0x38e92ccb00000000, 0xa944bd3700000000,
+    0x5b044c1000000000, 0xcaa9ddec00000000, 0x7a5f6c5900000000,
+    0xebf2fda500000000, 0x9ede8e1600000000, 0x0f731fea00000000,
+    0xbf85ae5f00000000, 0x2e283fa300000000, 0xdc68ce8400000000,
+    0x4dc55f7800000000, 0xfd33eecd00000000, 0x6c9e7f3100000000,
+    0x146b0b1b00000000, 0x85c69ae700000000, 0x35302b5200000000,
+    0xa49dbaae00000000, 0x56dd4b8900000000, 0xc770da7500000000,
+    0x77866bc000000000, 0xe62bfa3c00000000, 0x9307898f00000000,
+    0x02aa187300000000, 0xb25ca9c600000000, 0x23f1383a00000000,
+    0xd1b1c91d00000000, 0x401c58e100000000, 0xf0eae95400000000,
+    0x614778a800000000, 0x31641ab400000000, 0xa0c98b4800000000,
+    0x103f3afd00000000, 0x8192ab0100000000, 0x73d25a2600000000,
+    0xe27fcbda00000000, 0x52897a6f00000000, 0xc324eb9300000000,
+    0xb608982000000000, 0x27a509dc00000000, 0x9753b86900000000,
+    0x06fe299500000000, 0xf4bed8b200000000, 0x6513494e00000000,
+    0xd5e5f8fb00000000, 0x4448690700000000, 0x3cbd1d2d00000000,
+    0xad108cd100000000, 0x1de63d6400000000, 0x8c4bac9800000000,
+    0x7e0b5dbf00000000, 0xefa6cc4300000000, 0x5f507df600000000,
+    0xcefdec0a00000000, 0xbbd19fb900000000, 0x2a7c0e4500000000,
+    0x9a8abff000000000, 0x0b272e0c00000000, 0xf967df2b00000000,
+    0x68ca4ed700000000, 0xd83cff6200000000, 0x49916e9e00000000,
+    0x28d6163600000000, 0xb97b87ca00000000, 0x098d367f00000000,
+    0x9820a78300000000, 0x6a6056a400000000, 0xfbcdc75800000000,
+    0x4b3b76ed00000000, 0xda96e71100000000, 0xafba94a200000000,
+    0x3e17055e00000000, 0x8ee1b4eb00000000, 0x1f4c251700000000,
+    0xed0cd43000000000, 0x7ca145cc00000000, 0xcc57f47900000000,
+    0x5dfa658500000000, 0x250f11af00000000, 0xb4a2805300000000,
+    0x045431e600000000, 0x95f9a01a00000000, 0x67b9513d00000000,
+    0xf614c0c100000000, 0x46e2717400000000, 0xd74fe08800000000,
+    0xa263933b00000000, 0x33ce02c700000000, 0x8338b37200000000,
+    0x1295228e00000000, 0xe0d5d3a900000000, 0x7178425500000000,
+    0xc18ef3e000000000, 0x5023621c00000000, 0x61c837d800000000,
+    0xf065a62400000000, 0x4093179100000000, 0xd13e866d00000000,
+    0x237e774a00000000, 0xb2d3e6b600000000, 0x0225570300000000,
+    0x9388c6ff00000000, 0xe6a4b54c00000000, 0x770924b000000000,
+    0xc7ff950500000000, 0x565204f900000000, 0xa412f5de00000000,
+    0x35bf642200000000, 0x8549d59700000000, 0x14e4446b00000000,
+    0x6c11304100000000, 0xfdbca1bd00000000, 0x4d4a100800000000,
+    0xdce781f400000000, 0x2ea770d300000000, 0xbf0ae12f00000000,
+    0x0ffc509a00000000, 0x9e51c16600000000, 0xeb7db2d500000000,
+    0x7ad0232900000000, 0xca26929c00000000, 0x5b8b036000000000,
+    0xa9cbf24700000000, 0x386663bb00000000, 0x8890d20e00000000,
+    0x193d43f200000000, 0x787a3b5a00000000, 0xe9d7aaa600000000,
+    0x59211b1300000000, 0xc88c8aef00000000, 0x3acc7bc800000000,
+    0xab61ea3400000000, 0x1b975b8100000000, 0x8a3aca7d00000000,
+    0xff16b9ce00000000, 0x6ebb283200000000, 0xde4d998700000000,
+    0x4fe0087b00000000, 0xbda0f95c00000000, 0x2c0d68a000000000,
+    0x9cfbd91500000000, 0x0d5648e900000000, 0x75a33cc300000000,
+    0xe40ead3f00000000, 0x54f81c8a00000000, 0xc5558d7600000000,
+    0x37157c5100000000, 0xa6b8edad00000000, 0x164e5c1800000000,
+    0x87e3cde400000000, 0xf2cfbe5700000000, 0x63622fab00000000,
+    0xd3949e1e00000000, 0x42390fe200000000, 0xb079fec500000000,
+    0x21d46f3900000000, 0x9122de8c00000000, 0x008f4f7000000000,
+    0x50ac2d6c00000000, 0xc101bc9000000000, 0x71f70d2500000000,
+    0xe05a9cd900000000, 0x121a6dfe00000000, 0x83b7fc0200000000,
+    0x33414db700000000, 0xa2ecdc4b00000000, 0xd7c0aff800000000,
+    0x466d3e0400000000, 0xf69b8fb100000000, 0x67361e4d00000000,
+    0x9576ef6a00000000, 0x04db7e9600000000, 0xb42dcf2300000000,
+    0x25805edf00000000, 0x5d752af500000000, 0xccd8bb0900000000,
+    0x7c2e0abc00000000, 0xed839b4000000000, 0x1fc36a6700000000,
+    0x8e6efb9b00000000, 0x3e984a2e00000000, 0xaf35dbd200000000,
+    0xda19a86100000000, 0x4bb4399d00000000, 0xfb42882800000000,
+    0x6aef19d400000000, 0x98afe8f300000000, 0x0902790f00000000,
+    0xb9f4c8ba00000000, 0x2859594600000000, 0x491e21ee00000000,
+    0xd8b3b01200000000, 0x684501a700000000, 0xf9e8905b00000000,
+    0x0ba8617c00000000, 0x9a05f08000000000, 0x2af3413500000000,
+    0xbb5ed0c900000000, 0xce72a37a00000000, 0x5fdf328600000000,
+    0xef29833300000000, 0x7e8412cf00000000, 0x8cc4e3e800000000,
+    0x1d69721400000000, 0xad9fc3a100000000, 0x3c32525d00000000,
+    0x44c7267700000000, 0xd56ab78b00000000, 0x659c063e00000000,
+    0xf43197c200000000, 0x067166e500000000, 0x97dcf71900000000,
+    0x272a46ac00000000, 0xb687d75000000000, 0xc3aba4e300000000,
+    0x5206351f00000000, 0xe2f084aa00000000, 0x735d155600000000,
+    0x811de47100000000, 0x10b0758d00000000, 0xa046c43800000000,
+    0x31eb55c400000000},
+   {0x0000000000000000, 0xac006dd100000000, 0x5b01d91200000000,
+    0xf701b4c300000000, 0xb602b22500000000, 0x1a02dff400000000,
+    0xed036b3700000000, 0x410306e600000000, 0x6c05644b00000000,
+    0xc005099a00000000, 0x3704bd5900000000, 0x9b04d08800000000,
+    0xda07d66e00000000, 0x7607bbbf00000000, 0x81060f7c00000000,
+    0x2d0662ad00000000, 0xd80ac89600000000, 0x740aa54700000000,
+    0x830b118400000000, 0x2f0b7c5500000000, 0x6e087ab300000000,
+    0xc208176200000000, 0x3509a3a100000000, 0x9909ce7000000000,
+    0xb40facdd00000000, 0x180fc10c00000000, 0xef0e75cf00000000,
+    0x430e181e00000000, 0x020d1ef800000000, 0xae0d732900000000,
+    0x590cc7ea00000000, 0xf50caa3b00000000, 0xb315939d00000000,
+    0x1f15fe4c00000000, 0xe8144a8f00000000, 0x4414275e00000000,
+    0x051721b800000000, 0xa9174c6900000000, 0x5e16f8aa00000000,
+    0xf216957b00000000, 0xdf10f7d600000000, 0x73109a0700000000,
+    0x84112ec400000000, 0x2811431500000000, 0x691245f300000000,
+    0xc512282200000000, 0x32139ce100000000, 0x9e13f13000000000,
+    0x6b1f5b0b00000000, 0xc71f36da00000000, 0x301e821900000000,
+    0x9c1eefc800000000, 0xdd1de92e00000000, 0x711d84ff00000000,
+    0x861c303c00000000, 0x2a1c5ded00000000, 0x071a3f4000000000,
+    0xab1a529100000000, 0x5c1be65200000000, 0xf01b8b8300000000,
+    0xb1188d6500000000, 0x1d18e0b400000000, 0xea19547700000000,
+    0x461939a600000000, 0x652b258b00000000, 0xc92b485a00000000,
+    0x3e2afc9900000000, 0x922a914800000000, 0xd32997ae00000000,
+    0x7f29fa7f00000000, 0x88284ebc00000000, 0x2428236d00000000,
+    0x092e41c000000000, 0xa52e2c1100000000, 0x522f98d200000000,
+    0xfe2ff50300000000, 0xbf2cf3e500000000, 0x132c9e3400000000,
+    0xe42d2af700000000, 0x482d472600000000, 0xbd21ed1d00000000,
+    0x112180cc00000000, 0xe620340f00000000, 0x4a2059de00000000,
+    0x0b235f3800000000, 0xa72332e900000000, 0x5022862a00000000,
+    0xfc22ebfb00000000, 0xd124895600000000, 0x7d24e48700000000,
+    0x8a25504400000000, 0x26253d9500000000, 0x67263b7300000000,
+    0xcb2656a200000000, 0x3c27e26100000000, 0x90278fb000000000,
+    0xd63eb61600000000, 0x7a3edbc700000000, 0x8d3f6f0400000000,
+    0x213f02d500000000, 0x603c043300000000, 0xcc3c69e200000000,
+    0x3b3ddd2100000000, 0x973db0f000000000, 0xba3bd25d00000000,
+    0x163bbf8c00000000, 0xe13a0b4f00000000, 0x4d3a669e00000000,
+    0x0c39607800000000, 0xa0390da900000000, 0x5738b96a00000000,
+    0xfb38d4bb00000000, 0x0e347e8000000000, 0xa234135100000000,
+    0x5535a79200000000, 0xf935ca4300000000, 0xb836cca500000000,
+    0x1436a17400000000, 0xe33715b700000000, 0x4f37786600000000,
+    0x62311acb00000000, 0xce31771a00000000, 0x3930c3d900000000,
+    0x9530ae0800000000, 0xd433a8ee00000000, 0x7833c53f00000000,
+    0x8f3271fc00000000, 0x23321c2d00000000, 0xc95649a600000000,
+    0x6556247700000000, 0x925790b400000000, 0x3e57fd6500000000,
+    0x7f54fb8300000000, 0xd354965200000000, 0x2455229100000000,
+    0x88554f4000000000, 0xa5532ded00000000, 0x0953403c00000000,
+    0xfe52f4ff00000000, 0x5252992e00000000, 0x13519fc800000000,
+    0xbf51f21900000000, 0x485046da00000000, 0xe4502b0b00000000,
+    0x115c813000000000, 0xbd5cece100000000, 0x4a5d582200000000,
+    0xe65d35f300000000, 0xa75e331500000000, 0x0b5e5ec400000000,
+    0xfc5fea0700000000, 0x505f87d600000000, 0x7d59e57b00000000,
+    0xd15988aa00000000, 0x26583c6900000000, 0x8a5851b800000000,
+    0xcb5b575e00000000, 0x675b3a8f00000000, 0x905a8e4c00000000,
+    0x3c5ae39d00000000, 0x7a43da3b00000000, 0xd643b7ea00000000,
+    0x2142032900000000, 0x8d426ef800000000, 0xcc41681e00000000,
+    0x604105cf00000000, 0x9740b10c00000000, 0x3b40dcdd00000000,
+    0x1646be7000000000, 0xba46d3a100000000, 0x4d47676200000000,
+    0xe1470ab300000000, 0xa0440c5500000000, 0x0c44618400000000,
+    0xfb45d54700000000, 0x5745b89600000000, 0xa24912ad00000000,
+    0x0e497f7c00000000, 0xf948cbbf00000000, 0x5548a66e00000000,
+    0x144ba08800000000, 0xb84bcd5900000000, 0x4f4a799a00000000,
+    0xe34a144b00000000, 0xce4c76e600000000, 0x624c1b3700000000,
+    0x954daff400000000, 0x394dc22500000000, 0x784ec4c300000000,
+    0xd44ea91200000000, 0x234f1dd100000000, 0x8f4f700000000000,
+    0xac7d6c2d00000000, 0x007d01fc00000000, 0xf77cb53f00000000,
+    0x5b7cd8ee00000000, 0x1a7fde0800000000, 0xb67fb3d900000000,
+    0x417e071a00000000, 0xed7e6acb00000000, 0xc078086600000000,
+    0x6c7865b700000000, 0x9b79d17400000000, 0x3779bca500000000,
+    0x767aba4300000000, 0xda7ad79200000000, 0x2d7b635100000000,
+    0x817b0e8000000000, 0x7477a4bb00000000, 0xd877c96a00000000,
+    0x2f767da900000000, 0x8376107800000000, 0xc275169e00000000,
+    0x6e757b4f00000000, 0x9974cf8c00000000, 0x3574a25d00000000,
+    0x1872c0f000000000, 0xb472ad2100000000, 0x437319e200000000,
+    0xef73743300000000, 0xae7072d500000000, 0x02701f0400000000,
+    0xf571abc700000000, 0x5971c61600000000, 0x1f68ffb000000000,
+    0xb368926100000000, 0x446926a200000000, 0xe8694b7300000000,
+    0xa96a4d9500000000, 0x056a204400000000, 0xf26b948700000000,
+    0x5e6bf95600000000, 0x736d9bfb00000000, 0xdf6df62a00000000,
+    0x286c42e900000000, 0x846c2f3800000000, 0xc56f29de00000000,
+    0x696f440f00000000, 0x9e6ef0cc00000000, 0x326e9d1d00000000,
+    0xc762372600000000, 0x6b625af700000000, 0x9c63ee3400000000,
+    0x306383e500000000, 0x7160850300000000, 0xdd60e8d200000000,
+    0x2a615c1100000000, 0x866131c000000000, 0xab67536d00000000,
+    0x07673ebc00000000, 0xf0668a7f00000000, 0x5c66e7ae00000000,
+    0x1d65e14800000000, 0xb1658c9900000000, 0x4664385a00000000,
+    0xea64558b00000000},
+   {0x0000000000000000, 0x00c1115c00000000, 0x008223b800000000,
+    0x004332e400000000, 0x030444c000000000, 0x03c5559c00000000,
+    0x0386677800000000, 0x0347762400000000, 0x05088b3000000000,
+    0x05c99a6c00000000, 0x058aa88800000000, 0x054bb9d400000000,
+    0x060ccff000000000, 0x06cddeac00000000, 0x068eec4800000000,
+    0x064ffd1400000000, 0x0a10166100000000, 0x0ad1073d00000000,
+    0x0a9235d900000000, 0x0a53248500000000, 0x091452a100000000,
+    0x09d543fd00000000, 0x0996711900000000, 0x0957604500000000,
+    0x0f189d5100000000, 0x0fd98c0d00000000, 0x0f9abee900000000,
+    0x0f5bafb500000000, 0x0c1cd99100000000, 0x0cddc8cd00000000,
+    0x0c9efa2900000000, 0x0c5feb7500000000, 0x14202cc200000000,
+    0x14e13d9e00000000, 0x14a20f7a00000000, 0x14631e2600000000,
+    0x1724680200000000, 0x17e5795e00000000, 0x17a64bba00000000,
+    0x17675ae600000000, 0x1128a7f200000000, 0x11e9b6ae00000000,
+    0x11aa844a00000000, 0x116b951600000000, 0x122ce33200000000,
+    0x12edf26e00000000, 0x12aec08a00000000, 0x126fd1d600000000,
+    0x1e303aa300000000, 0x1ef12bff00000000, 0x1eb2191b00000000,
+    0x1e73084700000000, 0x1d347e6300000000, 0x1df56f3f00000000,
+    0x1db65ddb00000000, 0x1d774c8700000000, 0x1b38b19300000000,
+    0x1bf9a0cf00000000, 0x1bba922b00000000, 0x1b7b837700000000,
+    0x183cf55300000000, 0x18fde40f00000000, 0x18bed6eb00000000,
+    0x187fc7b700000000, 0x2b405b3400000000, 0x2b814a6800000000,
+    0x2bc2788c00000000, 0x2b0369d000000000, 0x28441ff400000000,
+    0x28850ea800000000, 0x28c63c4c00000000, 0x28072d1000000000,
+    0x2e48d00400000000, 0x2e89c15800000000, 0x2ecaf3bc00000000,
+    0x2e0be2e000000000, 0x2d4c94c400000000, 0x2d8d859800000000,
+    0x2dceb77c00000000, 0x2d0fa62000000000, 0x21504d5500000000,
+    0x21915c0900000000, 0x21d26eed00000000, 0x21137fb100000000,
+    0x2254099500000000, 0x229518c900000000, 0x22d62a2d00000000,
+    0x22173b7100000000, 0x2458c66500000000, 0x2499d73900000000,
+    0x24dae5dd00000000, 0x241bf48100000000, 0x275c82a500000000,
+    0x279d93f900000000, 0x27dea11d00000000, 0x271fb04100000000,
+    0x3f6077f600000000, 0x3fa166aa00000000, 0x3fe2544e00000000,
+    0x3f23451200000000, 0x3c64333600000000, 0x3ca5226a00000000,
+    0x3ce6108e00000000, 0x3c2701d200000000, 0x3a68fcc600000000,
+    0x3aa9ed9a00000000, 0x3aeadf7e00000000, 0x3a2bce2200000000,
+    0x396cb80600000000, 0x39ada95a00000000, 0x39ee9bbe00000000,
+    0x392f8ae200000000, 0x3570619700000000, 0x35b170cb00000000,
+    0x35f2422f00000000, 0x3533537300000000, 0x3674255700000000,
+    0x36b5340b00000000, 0x36f606ef00000000, 0x363717b300000000,
+    0x3078eaa700000000, 0x30b9fbfb00000000, 0x30fac91f00000000,
+    0x303bd84300000000, 0x337cae6700000000, 0x33bdbf3b00000000,
+    0x33fe8ddf00000000, 0x333f9c8300000000, 0x5680b66800000000,
+    0x5641a73400000000, 0x560295d000000000, 0x56c3848c00000000,
+    0x5584f2a800000000, 0x5545e3f400000000, 0x5506d11000000000,
+    0x55c7c04c00000000, 0x53883d5800000000, 0x53492c0400000000,
+    0x530a1ee000000000, 0x53cb0fbc00000000, 0x508c799800000000,
+    0x504d68c400000000, 0x500e5a2000000000, 0x50cf4b7c00000000,
+    0x5c90a00900000000, 0x5c51b15500000000, 0x5c1283b100000000,
+    0x5cd392ed00000000, 0x5f94e4c900000000, 0x5f55f59500000000,
+    0x5f16c77100000000, 0x5fd7d62d00000000, 0x59982b3900000000,
+    0x59593a6500000000, 0x591a088100000000, 0x59db19dd00000000,
+    0x5a9c6ff900000000, 0x5a5d7ea500000000, 0x5a1e4c4100000000,
+    0x5adf5d1d00000000, 0x42a09aaa00000000, 0x42618bf600000000,
+    0x4222b91200000000, 0x42e3a84e00000000, 0x41a4de6a00000000,
+    0x4165cf3600000000, 0x4126fdd200000000, 0x41e7ec8e00000000,
+    0x47a8119a00000000, 0x476900c600000000, 0x472a322200000000,
+    0x47eb237e00000000, 0x44ac555a00000000, 0x446d440600000000,
+    0x442e76e200000000, 0x44ef67be00000000, 0x48b08ccb00000000,
+    0x48719d9700000000, 0x4832af7300000000, 0x48f3be2f00000000,
+    0x4bb4c80b00000000, 0x4b75d95700000000, 0x4b36ebb300000000,
+    0x4bf7faef00000000, 0x4db807fb00000000, 0x4d7916a700000000,
+    0x4d3a244300000000, 0x4dfb351f00000000, 0x4ebc433b00000000,
+    0x4e7d526700000000, 0x4e3e608300000000, 0x4eff71df00000000,
+    0x7dc0ed5c00000000, 0x7d01fc0000000000, 0x7d42cee400000000,
+    0x7d83dfb800000000, 0x7ec4a99c00000000, 0x7e05b8c000000000,
+    0x7e468a2400000000, 0x7e879b7800000000, 0x78c8666c00000000,
+    0x7809773000000000, 0x784a45d400000000, 0x788b548800000000,
+    0x7bcc22ac00000000, 0x7b0d33f000000000, 0x7b4e011400000000,
+    0x7b8f104800000000, 0x77d0fb3d00000000, 0x7711ea6100000000,
+    0x7752d88500000000, 0x7793c9d900000000, 0x74d4bffd00000000,
+    0x7415aea100000000, 0x74569c4500000000, 0x74978d1900000000,
+    0x72d8700d00000000, 0x7219615100000000, 0x725a53b500000000,
+    0x729b42e900000000, 0x71dc34cd00000000, 0x711d259100000000,
+    0x715e177500000000, 0x719f062900000000, 0x69e0c19e00000000,
+    0x6921d0c200000000, 0x6962e22600000000, 0x69a3f37a00000000,
+    0x6ae4855e00000000, 0x6a25940200000000, 0x6a66a6e600000000,
+    0x6aa7b7ba00000000, 0x6ce84aae00000000, 0x6c295bf200000000,
+    0x6c6a691600000000, 0x6cab784a00000000, 0x6fec0e6e00000000,
+    0x6f2d1f3200000000, 0x6f6e2dd600000000, 0x6faf3c8a00000000,
+    0x63f0d7ff00000000, 0x6331c6a300000000, 0x6372f44700000000,
+    0x63b3e51b00000000, 0x60f4933f00000000, 0x6035826300000000,
+    0x6076b08700000000, 0x60b7a1db00000000, 0x66f85ccf00000000,
+    0x66394d9300000000, 0x667a7f7700000000, 0x66bb6e2b00000000,
+    0x65fc180f00000000, 0x653d095300000000, 0x657e3bb700000000,
+    0x65bf2aeb00000000},
+   {0x0000000000000000, 0xc1115c0000000000, 0x8223b80000000000,
+    0x4332e40000000000, 0x0447700100000000, 0xc5562c0100000000,
+    0x8664c80100000000, 0x4775940100000000, 0x088ee00200000000,
+    0xc99fbc0200000000, 0x8aad580200000000, 0x4bbc040200000000,
+    0x0cc9900300000000, 0xcdd8cc0300000000, 0x8eea280300000000,
+    0x4ffb740300000000, 0x101cc10500000000, 0xd10d9d0500000000,
+    0x923f790500000000, 0x532e250500000000, 0x145bb10400000000,
+    0xd54aed0400000000, 0x9678090400000000, 0x5769550400000000,
+    0x1892210700000000, 0xd9837d0700000000, 0x9ab1990700000000,
+    0x5ba0c50700000000, 0x1cd5510600000000, 0xddc40d0600000000,
+    0x9ef6e90600000000, 0x5fe7b50600000000, 0x2038820b00000000,
+    0xe129de0b00000000, 0xa21b3a0b00000000, 0x630a660b00000000,
+    0x247ff20a00000000, 0xe56eae0a00000000, 0xa65c4a0a00000000,
+    0x674d160a00000000, 0x28b6620900000000, 0xe9a73e0900000000,
+    0xaa95da0900000000, 0x6b84860900000000, 0x2cf1120800000000,
+    0xede04e0800000000, 0xaed2aa0800000000, 0x6fc3f60800000000,
+    0x3024430e00000000, 0xf1351f0e00000000, 0xb207fb0e00000000,
+    0x7316a70e00000000, 0x3463330f00000000, 0xf5726f0f00000000,
+    0xb6408b0f00000000, 0x7751d70f00000000, 0x38aaa30c00000000,
+    0xf9bbff0c00000000, 0xba891b0c00000000, 0x7b98470c00000000,
+    0x3cedd30d00000000, 0xfdfc8f0d00000000, 0xbece6b0d00000000,
+    0x7fdf370d00000000, 0x4070041700000000, 0x8161581700000000,
+    0xc253bc1700000000, 0x0342e01700000000, 0x4437741600000000,
+    0x8526281600000000, 0xc614cc1600000000, 0x0705901600000000,
+    0x48fee41500000000, 0x89efb81500000000, 0xcadd5c1500000000,
+    0x0bcc001500000000, 0x4cb9941400000000, 0x8da8c81400000000,
+    0xce9a2c1400000000, 0x0f8b701400000000, 0x506cc51200000000,
+    0x917d991200000000, 0xd24f7d1200000000, 0x135e211200000000,
+    0x542bb51300000000, 0x953ae91300000000, 0xd6080d1300000000,
+    0x1719511300000000, 0x58e2251000000000, 0x99f3791000000000,
+    0xdac19d1000000000, 0x1bd0c11000000000, 0x5ca5551100000000,
+    0x9db4091100000000, 0xde86ed1100000000, 0x1f97b11100000000,
+    0x6048861c00000000, 0xa159da1c00000000, 0xe26b3e1c00000000,
+    0x237a621c00000000, 0x640ff61d00000000, 0xa51eaa1d00000000,
+    0xe62c4e1d00000000, 0x273d121d00000000, 0x68c6661e00000000,
+    0xa9d73a1e00000000, 0xeae5de1e00000000, 0x2bf4821e00000000,
+    0x6c81161f00000000, 0xad904a1f00000000, 0xeea2ae1f00000000,
+    0x2fb3f21f00000000, 0x7054471900000000, 0xb1451b1900000000,
+    0xf277ff1900000000, 0x3366a31900000000, 0x7413371800000000,
+    0xb5026b1800000000, 0xf6308f1800000000, 0x3721d31800000000,
+    0x78daa71b00000000, 0xb9cbfb1b00000000, 0xfaf91f1b00000000,
+    0x3be8431b00000000, 0x7c9dd71a00000000, 0xbd8c8b1a00000000,
+    0xfebe6f1a00000000, 0x3faf331a00000000, 0x80e0082e00000000,
+    0x41f1542e00000000, 0x02c3b02e00000000, 0xc3d2ec2e00000000,
+    0x84a7782f00000000, 0x45b6242f00000000, 0x0684c02f00000000,
+    0xc7959c2f00000000, 0x886ee82c00000000, 0x497fb42c00000000,
+    0x0a4d502c00000000, 0xcb5c0c2c00000000, 0x8c29982d00000000,
+    0x4d38c42d00000000, 0x0e0a202d00000000, 0xcf1b7c2d00000000,
+    0x90fcc92b00000000, 0x51ed952b00000000, 0x12df712b00000000,
+    0xd3ce2d2b00000000, 0x94bbb92a00000000, 0x55aae52a00000000,
+    0x1698012a00000000, 0xd7895d2a00000000, 0x9872292900000000,
+    0x5963752900000000, 0x1a51912900000000, 0xdb40cd2900000000,
+    0x9c35592800000000, 0x5d24052800000000, 0x1e16e12800000000,
+    0xdf07bd2800000000, 0xa0d88a2500000000, 0x61c9d62500000000,
+    0x22fb322500000000, 0xe3ea6e2500000000, 0xa49ffa2400000000,
+    0x658ea62400000000, 0x26bc422400000000, 0xe7ad1e2400000000,
+    0xa8566a2700000000, 0x6947362700000000, 0x2a75d22700000000,
+    0xeb648e2700000000, 0xac111a2600000000, 0x6d00462600000000,
+    0x2e32a22600000000, 0xef23fe2600000000, 0xb0c44b2000000000,
+    0x71d5172000000000, 0x32e7f32000000000, 0xf3f6af2000000000,
+    0xb4833b2100000000, 0x7592672100000000, 0x36a0832100000000,
+    0xf7b1df2100000000, 0xb84aab2200000000, 0x795bf72200000000,
+    0x3a69132200000000, 0xfb784f2200000000, 0xbc0ddb2300000000,
+    0x7d1c872300000000, 0x3e2e632300000000, 0xff3f3f2300000000,
+    0xc0900c3900000000, 0x0181503900000000, 0x42b3b43900000000,
+    0x83a2e83900000000, 0xc4d77c3800000000, 0x05c6203800000000,
+    0x46f4c43800000000, 0x87e5983800000000, 0xc81eec3b00000000,
+    0x090fb03b00000000, 0x4a3d543b00000000, 0x8b2c083b00000000,
+    0xcc599c3a00000000, 0x0d48c03a00000000, 0x4e7a243a00000000,
+    0x8f6b783a00000000, 0xd08ccd3c00000000, 0x119d913c00000000,
+    0x52af753c00000000, 0x93be293c00000000, 0xd4cbbd3d00000000,
+    0x15dae13d00000000, 0x56e8053d00000000, 0x97f9593d00000000,
+    0xd8022d3e00000000, 0x1913713e00000000, 0x5a21953e00000000,
+    0x9b30c93e00000000, 0xdc455d3f00000000, 0x1d54013f00000000,
+    0x5e66e53f00000000, 0x9f77b93f00000000, 0xe0a88e3200000000,
+    0x21b9d23200000000, 0x628b363200000000, 0xa39a6a3200000000,
+    0xe4effe3300000000, 0x25fea23300000000, 0x66cc463300000000,
+    0xa7dd1a3300000000, 0xe8266e3000000000, 0x2937323000000000,
+    0x6a05d63000000000, 0xab148a3000000000, 0xec611e3100000000,
+    0x2d70423100000000, 0x6e42a63100000000, 0xaf53fa3100000000,
+    0xf0b44f3700000000, 0x31a5133700000000, 0x7297f73700000000,
+    0xb386ab3700000000, 0xf4f33f3600000000, 0x35e2633600000000,
+    0x76d0873600000000, 0xb7c1db3600000000, 0xf83aaf3500000000,
+    0x392bf33500000000, 0x7a19173500000000, 0xbb084b3500000000,
+    0xfc7ddf3400000000, 0x3d6c833400000000, 0x7e5e673400000000,
+    0xbf4f3b3400000000},
+   {0x0000000000000000, 0x109d91fc00000000, 0x233a204900000000,
+    0x33a7b1b500000000, 0x4674409200000000, 0x56e9d16e00000000,
+    0x654e60db00000000, 0x75d3f12700000000, 0x8fe8839400000000,
+    0x9f75126800000000, 0xacd2a3dd00000000, 0xbc4f322100000000,
+    0xc99cc30600000000, 0xd90152fa00000000, 0xeaa6e34f00000000,
+    0xfa3b72b300000000, 0x1dd1049900000000, 0x0d4c956500000000,
+    0x3eeb24d000000000, 0x2e76b52c00000000, 0x5ba5440b00000000,
+    0x4b38d5f700000000, 0x789f644200000000, 0x6802f5be00000000,
+    0x9239870d00000000, 0x82a416f100000000, 0xb103a74400000000,
+    0xa19e36b800000000, 0xd44dc79f00000000, 0xc4d0566300000000,
+    0xf777e7d600000000, 0xe7ea762a00000000, 0x39a20a8200000000,
+    0x293f9b7e00000000, 0x1a982acb00000000, 0x0a05bb3700000000,
+    0x7fd64a1000000000, 0x6f4bdbec00000000, 0x5cec6a5900000000,
+    0x4c71fba500000000, 0xb64a891600000000, 0xa6d718ea00000000,
+    0x9570a95f00000000, 0x85ed38a300000000, 0xf03ec98400000000,
+    0xe0a3587800000000, 0xd304e9cd00000000, 0xc399783100000000,
+    0x24730e1b00000000, 0x34ee9fe700000000, 0x07492e5200000000,
+    0x17d4bfae00000000, 0x62074e8900000000, 0x729adf7500000000,
+    0x413d6ec000000000, 0x51a0ff3c00000000, 0xab9b8d8f00000000,
+    0xbb061c7300000000, 0x88a1adc600000000, 0x983c3c3a00000000,
+    0xedefcd1d00000000, 0xfd725ce100000000, 0xced5ed5400000000,
+    0xde487ca800000000, 0x714416b400000000, 0x61d9874800000000,
+    0x527e36fd00000000, 0x42e3a70100000000, 0x3730562600000000,
+    0x27adc7da00000000, 0x140a766f00000000, 0x0497e79300000000,
+    0xfeac952000000000, 0xee3104dc00000000, 0xdd96b56900000000,
+    0xcd0b249500000000, 0xb8d8d5b200000000, 0xa845444e00000000,
+    0x9be2f5fb00000000, 0x8b7f640700000000, 0x6c95122d00000000,
+    0x7c0883d100000000, 0x4faf326400000000, 0x5f32a39800000000,
+    0x2ae152bf00000000, 0x3a7cc34300000000, 0x09db72f600000000,
+    0x1946e30a00000000, 0xe37d91b900000000, 0xf3e0004500000000,
+    0xc047b1f000000000, 0xd0da200c00000000, 0xa509d12b00000000,
+    0xb59440d700000000, 0x8633f16200000000, 0x96ae609e00000000,
+    0x48e61c3600000000, 0x587b8dca00000000, 0x6bdc3c7f00000000,
+    0x7b41ad8300000000, 0x0e925ca400000000, 0x1e0fcd5800000000,
+    0x2da87ced00000000, 0x3d35ed1100000000, 0xc70e9fa200000000,
+    0xd7930e5e00000000, 0xe434bfeb00000000, 0xf4a92e1700000000,
+    0x817adf3000000000, 0x91e74ecc00000000, 0xa240ff7900000000,
+    0xb2dd6e8500000000, 0x553718af00000000, 0x45aa895300000000,
+    0x760d38e600000000, 0x6690a91a00000000, 0x1343583d00000000,
+    0x03dec9c100000000, 0x3079787400000000, 0x20e4e98800000000,
+    0xdadf9b3b00000000, 0xca420ac700000000, 0xf9e5bb7200000000,
+    0xe9782a8e00000000, 0x9cabdba900000000, 0x8c364a5500000000,
+    0xbf91fbe000000000, 0xaf0c6a1c00000000, 0xe1882fd800000000,
+    0xf115be2400000000, 0xc2b20f9100000000, 0xd22f9e6d00000000,
+    0xa7fc6f4a00000000, 0xb761feb600000000, 0x84c64f0300000000,
+    0x945bdeff00000000, 0x6e60ac4c00000000, 0x7efd3db000000000,
+    0x4d5a8c0500000000, 0x5dc71df900000000, 0x2814ecde00000000,
+    0x38897d2200000000, 0x0b2ecc9700000000, 0x1bb35d6b00000000,
+    0xfc592b4100000000, 0xecc4babd00000000, 0xdf630b0800000000,
+    0xcffe9af400000000, 0xba2d6bd300000000, 0xaab0fa2f00000000,
+    0x99174b9a00000000, 0x898ada6600000000, 0x73b1a8d500000000,
+    0x632c392900000000, 0x508b889c00000000, 0x4016196000000000,
+    0x35c5e84700000000, 0x255879bb00000000, 0x16ffc80e00000000,
+    0x066259f200000000, 0xd82a255a00000000, 0xc8b7b4a600000000,
+    0xfb10051300000000, 0xeb8d94ef00000000, 0x9e5e65c800000000,
+    0x8ec3f43400000000, 0xbd64458100000000, 0xadf9d47d00000000,
+    0x57c2a6ce00000000, 0x475f373200000000, 0x74f8868700000000,
+    0x6465177b00000000, 0x11b6e65c00000000, 0x012b77a000000000,
+    0x328cc61500000000, 0x221157e900000000, 0xc5fb21c300000000,
+    0xd566b03f00000000, 0xe6c1018a00000000, 0xf65c907600000000,
+    0x838f615100000000, 0x9312f0ad00000000, 0xa0b5411800000000,
+    0xb028d0e400000000, 0x4a13a25700000000, 0x5a8e33ab00000000,
+    0x6929821e00000000, 0x79b413e200000000, 0x0c67e2c500000000,
+    0x1cfa733900000000, 0x2f5dc28c00000000, 0x3fc0537000000000,
+    0x90cc396c00000000, 0x8051a89000000000, 0xb3f6192500000000,
+    0xa36b88d900000000, 0xd6b879fe00000000, 0xc625e80200000000,
+    0xf58259b700000000, 0xe51fc84b00000000, 0x1f24baf800000000,
+    0x0fb92b0400000000, 0x3c1e9ab100000000, 0x2c830b4d00000000,
+    0x5950fa6a00000000, 0x49cd6b9600000000, 0x7a6ada2300000000,
+    0x6af74bdf00000000, 0x8d1d3df500000000, 0x9d80ac0900000000,
+    0xae271dbc00000000, 0xbeba8c4000000000, 0xcb697d6700000000,
+    0xdbf4ec9b00000000, 0xe8535d2e00000000, 0xf8ceccd200000000,
+    0x02f5be6100000000, 0x12682f9d00000000, 0x21cf9e2800000000,
+    0x31520fd400000000, 0x4481fef300000000, 0x541c6f0f00000000,
+    0x67bbdeba00000000, 0x77264f4600000000, 0xa96e33ee00000000,
+    0xb9f3a21200000000, 0x8a5413a700000000, 0x9ac9825b00000000,
+    0xef1a737c00000000, 0xff87e28000000000, 0xcc20533500000000,
+    0xdcbdc2c900000000, 0x2686b07a00000000, 0x361b218600000000,
+    0x05bc903300000000, 0x152101cf00000000, 0x60f2f0e800000000,
+    0x706f611400000000, 0x43c8d0a100000000, 0x5355415d00000000,
+    0xb4bf377700000000, 0xa422a68b00000000, 0x9785173e00000000,
+    0x871886c200000000, 0xf2cb77e500000000, 0xe256e61900000000,
+    0xd1f157ac00000000, 0xc16cc65000000000, 0x3b57b4e300000000,
+    0x2bca251f00000000, 0x186d94aa00000000, 0x08f0055600000000,
+    0x7d23f47100000000, 0x6dbe658d00000000, 0x5e19d43800000000,
+    0x4e8445c400000000},
+   {0x0000000000000000, 0x9c81fd9900000000, 0x3b03f88300000000,
+    0xa782051a00000000, 0x7506f3b700000000, 0xe9870e2e00000000,
+    0x4e050b3400000000, 0xd284f6ad00000000, 0xe90ce5df00000000,
+    0x758d184600000000, 0xd20f1d5c00000000, 0x4e8ee0c500000000,
+    0x9c0a166800000000, 0x008bebf100000000, 0xa709eeeb00000000,
+    0x3b88137200000000, 0xd119c90f00000000, 0x4d98349600000000,
+    0xea1a318c00000000, 0x769bcc1500000000, 0xa41f3ab800000000,
+    0x389ec72100000000, 0x9f1cc23b00000000, 0x039d3fa200000000,
+    0x38152cd000000000, 0xa494d14900000000, 0x0316d45300000000,
+    0x9f9729ca00000000, 0x4d13df6700000000, 0xd19222fe00000000,
+    0x761027e400000000, 0xea91da7d00000000, 0xa233921f00000000,
+    0x3eb26f8600000000, 0x99306a9c00000000, 0x05b1970500000000,
+    0xd73561a800000000, 0x4bb49c3100000000, 0xec36992b00000000,
+    0x70b764b200000000, 0x4b3f77c000000000, 0xd7be8a5900000000,
+    0x703c8f4300000000, 0xecbd72da00000000, 0x3e39847700000000,
+    0xa2b879ee00000000, 0x053a7cf400000000, 0x99bb816d00000000,
+    0x732a5b1000000000, 0xefaba68900000000, 0x4829a39300000000,
+    0xd4a85e0a00000000, 0x062ca8a700000000, 0x9aad553e00000000,
+    0x3d2f502400000000, 0xa1aeadbd00000000, 0x9a26becf00000000,
+    0x06a7435600000000, 0xa125464c00000000, 0x3da4bbd500000000,
+    0xef204d7800000000, 0x73a1b0e100000000, 0xd423b5fb00000000,
+    0x48a2486200000000, 0x4467243f00000000, 0xd8e6d9a600000000,
+    0x7f64dcbc00000000, 0xe3e5212500000000, 0x3161d78800000000,
+    0xade02a1100000000, 0x0a622f0b00000000, 0x96e3d29200000000,
+    0xad6bc1e000000000, 0x31ea3c7900000000, 0x9668396300000000,
+    0x0ae9c4fa00000000, 0xd86d325700000000, 0x44eccfce00000000,
+    0xe36ecad400000000, 0x7fef374d00000000, 0x957eed3000000000,
+    0x09ff10a900000000, 0xae7d15b300000000, 0x32fce82a00000000,
+    0xe0781e8700000000, 0x7cf9e31e00000000, 0xdb7be60400000000,
+    0x47fa1b9d00000000, 0x7c7208ef00000000, 0xe0f3f57600000000,
+    0x4771f06c00000000, 0xdbf00df500000000, 0x0974fb5800000000,
+    0x95f506c100000000, 0x327703db00000000, 0xaef6fe4200000000,
+    0xe654b62000000000, 0x7ad54bb900000000, 0xdd574ea300000000,
+    0x41d6b33a00000000, 0x9352459700000000, 0x0fd3b80e00000000,
+    0xa851bd1400000000, 0x34d0408d00000000, 0x0f5853ff00000000,
+    0x93d9ae6600000000, 0x345bab7c00000000, 0xa8da56e500000000,
+    0x7a5ea04800000000, 0xe6df5dd100000000, 0x415d58cb00000000,
+    0xdddca55200000000, 0x374d7f2f00000000, 0xabcc82b600000000,
+    0x0c4e87ac00000000, 0x90cf7a3500000000, 0x424b8c9800000000,
+    0xdeca710100000000, 0x7948741b00000000, 0xe5c9898200000000,
+    0xde419af000000000, 0x42c0676900000000, 0xe542627300000000,
+    0x79c39fea00000000, 0xab47694700000000, 0x37c694de00000000,
+    0x904491c400000000, 0x0cc56c5d00000000, 0x88ce487e00000000,
+    0x144fb5e700000000, 0xb3cdb0fd00000000, 0x2f4c4d6400000000,
+    0xfdc8bbc900000000, 0x6149465000000000, 0xc6cb434a00000000,
+    0x5a4abed300000000, 0x61c2ada100000000, 0xfd43503800000000,
+    0x5ac1552200000000, 0xc640a8bb00000000, 0x14c45e1600000000,
+    0x8845a38f00000000, 0x2fc7a69500000000, 0xb3465b0c00000000,
+    0x59d7817100000000, 0xc5567ce800000000, 0x62d479f200000000,
+    0xfe55846b00000000, 0x2cd172c600000000, 0xb0508f5f00000000,
+    0x17d28a4500000000, 0x8b5377dc00000000, 0xb0db64ae00000000,
+    0x2c5a993700000000, 0x8bd89c2d00000000, 0x175961b400000000,
+    0xc5dd971900000000, 0x595c6a8000000000, 0xfede6f9a00000000,
+    0x625f920300000000, 0x2afdda6100000000, 0xb67c27f800000000,
+    0x11fe22e200000000, 0x8d7fdf7b00000000, 0x5ffb29d600000000,
+    0xc37ad44f00000000, 0x64f8d15500000000, 0xf8792ccc00000000,
+    0xc3f13fbe00000000, 0x5f70c22700000000, 0xf8f2c73d00000000,
+    0x64733aa400000000, 0xb6f7cc0900000000, 0x2a76319000000000,
+    0x8df4348a00000000, 0x1175c91300000000, 0xfbe4136e00000000,
+    0x6765eef700000000, 0xc0e7ebed00000000, 0x5c66167400000000,
+    0x8ee2e0d900000000, 0x12631d4000000000, 0xb5e1185a00000000,
+    0x2960e5c300000000, 0x12e8f6b100000000, 0x8e690b2800000000,
+    0x29eb0e3200000000, 0xb56af3ab00000000, 0x67ee050600000000,
+    0xfb6ff89f00000000, 0x5cedfd8500000000, 0xc06c001c00000000,
+    0xcca96c4100000000, 0x502891d800000000, 0xf7aa94c200000000,
+    0x6b2b695b00000000, 0xb9af9ff600000000, 0x252e626f00000000,
+    0x82ac677500000000, 0x1e2d9aec00000000, 0x25a5899e00000000,
+    0xb924740700000000, 0x1ea6711d00000000, 0x82278c8400000000,
+    0x50a37a2900000000, 0xcc2287b000000000, 0x6ba082aa00000000,
+    0xf7217f3300000000, 0x1db0a54e00000000, 0x813158d700000000,
+    0x26b35dcd00000000, 0xba32a05400000000, 0x68b656f900000000,
+    0xf437ab6000000000, 0x53b5ae7a00000000, 0xcf3453e300000000,
+    0xf4bc409100000000, 0x683dbd0800000000, 0xcfbfb81200000000,
+    0x533e458b00000000, 0x81bab32600000000, 0x1d3b4ebf00000000,
+    0xbab94ba500000000, 0x2638b63c00000000, 0x6e9afe5e00000000,
+    0xf21b03c700000000, 0x559906dd00000000, 0xc918fb4400000000,
+    0x1b9c0de900000000, 0x871df07000000000, 0x209ff56a00000000,
+    0xbc1e08f300000000, 0x87961b8100000000, 0x1b17e61800000000,
+    0xbc95e30200000000, 0x20141e9b00000000, 0xf290e83600000000,
+    0x6e1115af00000000, 0xc99310b500000000, 0x5512ed2c00000000,
+    0xbf83375100000000, 0x2302cac800000000, 0x8480cfd200000000,
+    0x1801324b00000000, 0xca85c4e600000000, 0x5604397f00000000,
+    0xf1863c6500000000, 0x6d07c1fc00000000, 0x568fd28e00000000,
+    0xca0e2f1700000000, 0x6d8c2a0d00000000, 0xf10dd79400000000,
+    0x2389213900000000, 0xbf08dca000000000, 0x188ad9ba00000000,
+    0x840b242300000000},
+   {0x0000000000000000, 0x8161594700000000, 0x02c3b28e00000000,
+    0x83a2ebc900000000, 0x078666ad00000000, 0x86e73fea00000000,
+    0x0545d42300000000, 0x84248d6400000000, 0x0d0cceea00000000,
+    0x8c6d97ad00000000, 0x0fcf7c6400000000, 0x8eae252300000000,
+    0x0a8aa84700000000, 0x8bebf10000000000, 0x08491ac900000000,
+    0x8928438e00000000, 0x19189f6500000000, 0x9879c62200000000,
+    0x1bdb2deb00000000, 0x9aba74ac00000000, 0x1e9ef9c800000000,
+    0x9fffa08f00000000, 0x1c5d4b4600000000, 0x9d3c120100000000,
+    0x1414518f00000000, 0x957508c800000000, 0x16d7e30100000000,
+    0x97b6ba4600000000, 0x1392372200000000, 0x92f36e6500000000,
+    0x115185ac00000000, 0x9030dceb00000000, 0x32303ecb00000000,
+    0xb351678c00000000, 0x30f38c4500000000, 0xb192d50200000000,
+    0x35b6586600000000, 0xb4d7012100000000, 0x3775eae800000000,
+    0xb614b3af00000000, 0x3f3cf02100000000, 0xbe5da96600000000,
+    0x3dff42af00000000, 0xbc9e1be800000000, 0x38ba968c00000000,
+    0xb9dbcfcb00000000, 0x3a79240200000000, 0xbb187d4500000000,
+    0x2b28a1ae00000000, 0xaa49f8e900000000, 0x29eb132000000000,
+    0xa88a4a6700000000, 0x2caec70300000000, 0xadcf9e4400000000,
+    0x2e6d758d00000000, 0xaf0c2cca00000000, 0x26246f4400000000,
+    0xa745360300000000, 0x24e7ddca00000000, 0xa586848d00000000,
+    0x21a209e900000000, 0xa0c350ae00000000, 0x2361bb6700000000,
+    0xa200e22000000000, 0x67607f2600000000, 0xe601266100000000,
+    0x65a3cda800000000, 0xe4c294ef00000000, 0x60e6198b00000000,
+    0xe18740cc00000000, 0x6225ab0500000000, 0xe344f24200000000,
+    0x6a6cb1cc00000000, 0xeb0de88b00000000, 0x68af034200000000,
+    0xe9ce5a0500000000, 0x6dead76100000000, 0xec8b8e2600000000,
+    0x6f2965ef00000000, 0xee483ca800000000, 0x7e78e04300000000,
+    0xff19b90400000000, 0x7cbb52cd00000000, 0xfdda0b8a00000000,
+    0x79fe86ee00000000, 0xf89fdfa900000000, 0x7b3d346000000000,
+    0xfa5c6d2700000000, 0x73742ea900000000, 0xf21577ee00000000,
+    0x71b79c2700000000, 0xf0d6c56000000000, 0x74f2480400000000,
+    0xf593114300000000, 0x7631fa8a00000000, 0xf750a3cd00000000,
+    0x555041ed00000000, 0xd43118aa00000000, 0x5793f36300000000,
+    0xd6f2aa2400000000, 0x52d6274000000000, 0xd3b77e0700000000,
+    0x501595ce00000000, 0xd174cc8900000000, 0x585c8f0700000000,
+    0xd93dd64000000000, 0x5a9f3d8900000000, 0xdbfe64ce00000000,
+    0x5fdae9aa00000000, 0xdebbb0ed00000000, 0x5d195b2400000000,
+    0xdc78026300000000, 0x4c48de8800000000, 0xcd2987cf00000000,
+    0x4e8b6c0600000000, 0xcfea354100000000, 0x4bceb82500000000,
+    0xcaafe16200000000, 0x490d0aab00000000, 0xc86c53ec00000000,
+    0x4144106200000000, 0xc025492500000000, 0x4387a2ec00000000,
+    0xc2e6fbab00000000, 0x46c276cf00000000, 0xc7a32f8800000000,
+    0x4401c44100000000, 0xc5609d0600000000, 0xcec0fe4c00000000,
+    0x4fa1a70b00000000, 0xcc034cc200000000, 0x4d62158500000000,
+    0xc94698e100000000, 0x4827c1a600000000, 0xcb852a6f00000000,
+    0x4ae4732800000000, 0xc3cc30a600000000, 0x42ad69e100000000,
+    0xc10f822800000000, 0x406edb6f00000000, 0xc44a560b00000000,
+    0x452b0f4c00000000, 0xc689e48500000000, 0x47e8bdc200000000,
+    0xd7d8612900000000, 0x56b9386e00000000, 0xd51bd3a700000000,
+    0x547a8ae000000000, 0xd05e078400000000, 0x513f5ec300000000,
+    0xd29db50a00000000, 0x53fcec4d00000000, 0xdad4afc300000000,
+    0x5bb5f68400000000, 0xd8171d4d00000000, 0x5976440a00000000,
+    0xdd52c96e00000000, 0x5c33902900000000, 0xdf917be000000000,
+    0x5ef022a700000000, 0xfcf0c08700000000, 0x7d9199c000000000,
+    0xfe33720900000000, 0x7f522b4e00000000, 0xfb76a62a00000000,
+    0x7a17ff6d00000000, 0xf9b514a400000000, 0x78d44de300000000,
+    0xf1fc0e6d00000000, 0x709d572a00000000, 0xf33fbce300000000,
+    0x725ee5a400000000, 0xf67a68c000000000, 0x771b318700000000,
+    0xf4b9da4e00000000, 0x75d8830900000000, 0xe5e85fe200000000,
+    0x648906a500000000, 0xe72bed6c00000000, 0x664ab42b00000000,
+    0xe26e394f00000000, 0x630f600800000000, 0xe0ad8bc100000000,
+    0x61ccd28600000000, 0xe8e4910800000000, 0x6985c84f00000000,
+    0xea27238600000000, 0x6b467ac100000000, 0xef62f7a500000000,
+    0x6e03aee200000000, 0xeda1452b00000000, 0x6cc01c6c00000000,
+    0xa9a0816a00000000, 0x28c1d82d00000000, 0xab6333e400000000,
+    0x2a026aa300000000, 0xae26e7c700000000, 0x2f47be8000000000,
+    0xace5554900000000, 0x2d840c0e00000000, 0xa4ac4f8000000000,
+    0x25cd16c700000000, 0xa66ffd0e00000000, 0x270ea44900000000,
+    0xa32a292d00000000, 0x224b706a00000000, 0xa1e99ba300000000,
+    0x2088c2e400000000, 0xb0b81e0f00000000, 0x31d9474800000000,
+    0xb27bac8100000000, 0x331af5c600000000, 0xb73e78a200000000,
+    0x365f21e500000000, 0xb5fdca2c00000000, 0x349c936b00000000,
+    0xbdb4d0e500000000, 0x3cd589a200000000, 0xbf77626b00000000,
+    0x3e163b2c00000000, 0xba32b64800000000, 0x3b53ef0f00000000,
+    0xb8f104c600000000, 0x39905d8100000000, 0x9b90bfa100000000,
+    0x1af1e6e600000000, 0x99530d2f00000000, 0x1832546800000000,
+    0x9c16d90c00000000, 0x1d77804b00000000, 0x9ed56b8200000000,
+    0x1fb432c500000000, 0x969c714b00000000, 0x17fd280c00000000,
+    0x945fc3c500000000, 0x153e9a8200000000, 0x911a17e600000000,
+    0x107b4ea100000000, 0x93d9a56800000000, 0x12b8fc2f00000000,
+    0x828820c400000000, 0x03e9798300000000, 0x804b924a00000000,
+    0x012acb0d00000000, 0x850e466900000000, 0x046f1f2e00000000,
+    0x87cdf4e700000000, 0x06acada000000000, 0x8f84ee2e00000000,
+    0x0ee5b76900000000, 0x8d475ca000000000, 0x0c2605e700000000,
+    0x8802888300000000, 0x0963d1c400000000, 0x8ac13a0d00000000,
+    0x0ba0634a00000000}};
+
+#else /* W == 4 */
+
+static const crc_t crc_braid_table[][256] = {
+   {0x00000000, 0x51010001, 0xa2020002, 0xf3030003, 0xf4070007,
+    0xa5060006, 0x56050005, 0x07040004, 0x580d000d, 0x090c000c,
+    0xfa0f000f, 0xab0e000e, 0xac0a000a, 0xfd0b000b, 0x0e080008,
+    0x5f090009, 0xb01a001a, 0xe11b001b, 0x12180018, 0x43190019,
+    0x441d001d, 0x151c001c, 0xe61f001f, 0xb71e001e, 0xe8170017,
+    0xb9160016, 0x4a150015, 0x1b140014, 0x1c100010, 0x4d110011,
+    0xbe120012, 0xef130013, 0xd0370037, 0x81360036, 0x72350035,
+    0x23340034, 0x24300030, 0x75310031, 0x86320032, 0xd7330033,
+    0x883a003a, 0xd93b003b, 0x2a380038, 0x7b390039, 0x7c3d003d,
+    0x2d3c003c, 0xde3f003f, 0x8f3e003e, 0x602d002d, 0x312c002c,
+    0xc22f002f, 0x932e002e, 0x942a002a, 0xc52b002b, 0x36280028,
+    0x67290029, 0x38200020, 0x69210021, 0x9a220022, 0xcb230023,
+    0xcc270027, 0x9d260026, 0x6e250025, 0x3f240024, 0x106d006d,
+    0x416c006c, 0xb26f006f, 0xe36e006e, 0xe46a006a, 0xb56b006b,
+    0x46680068, 0x17690069, 0x48600060, 0x19610061, 0xea620062,
+    0xbb630063, 0xbc670067, 0xed660066, 0x1e650065, 0x4f640064,
+    0xa0770077, 0xf1760076, 0x02750075, 0x53740074, 0x54700070,
+    0x05710071, 0xf6720072, 0xa7730073, 0xf87a007a, 0xa97b007b,
+    0x5a780078, 0x0b790079, 0x0c7d007d, 0x5d7c007c, 0xae7f007f,
+    0xff7e007e, 0xc05a005a, 0x915b005b, 0x62580058, 0x33590059,
+    0x345d005d, 0x655c005c, 0x965f005f, 0xc75e005e, 0x98570057,
+    0xc9560056, 0x3a550055, 0x6b540054, 0x6c500050, 0x3d510051,
+    0xce520052, 0x9f530053, 0x70400040, 0x21410041, 0xd2420042,
+    0x83430043, 0x84470047, 0xd5460046, 0x26450045, 0x77440044,
+    0x284d004d, 0x794c004c, 0x8a4f004f, 0xdb4e004e, 0xdc4a004a,
+    0x8d4b004b, 0x7e480048, 0x2f490049, 0x20da00da, 0x71db00db,
+    0x82d800d8, 0xd3d900d9, 0xd4dd00dd, 0x85dc00dc, 0x76df00df,
+    0x27de00de, 0x78d700d7, 0x29d600d6, 0xdad500d5, 0x8bd400d4,
+    0x8cd000d0, 0xddd100d1, 0x2ed200d2, 0x7fd300d3, 0x90c000c0,
+    0xc1c100c1, 0x32c200c2, 0x63c300c3, 0x64c700c7, 0x35c600c6,
+    0xc6c500c5, 0x97c400c4, 0xc8cd00cd, 0x99cc00cc, 0x6acf00cf,
+    0x3bce00ce, 0x3cca00ca, 0x6dcb00cb, 0x9ec800c8, 0xcfc900c9,
+    0xf0ed00ed, 0xa1ec00ec, 0x52ef00ef, 0x03ee00ee, 0x04ea00ea,
+    0x55eb00eb, 0xa6e800e8, 0xf7e900e9, 0xa8e000e0, 0xf9e100e1,
+    0x0ae200e2, 0x5be300e3, 0x5ce700e7, 0x0de600e6, 0xfee500e5,
+    0xafe400e4, 0x40f700f7, 0x11f600f6, 0xe2f500f5, 0xb3f400f4,
+    0xb4f000f0, 0xe5f100f1, 0x16f200f2, 0x47f300f3, 0x18fa00fa,
+    0x49fb00fb, 0xbaf800f8, 0xebf900f9, 0xecfd00fd, 0xbdfc00fc,
+    0x4eff00ff, 0x1ffe00fe, 0x30b700b7, 0x61b600b6, 0x92b500b5,
+    0xc3b400b4, 0xc4b000b0, 0x95b100b1, 0x66b200b2, 0x37b300b3,
+    0x68ba00ba, 0x39bb00bb, 0xcab800b8, 0x9bb900b9, 0x9cbd00bd,
+    0xcdbc00bc, 0x3ebf00bf, 0x6fbe00be, 0x80ad00ad, 0xd1ac00ac,
+    0x22af00af, 0x73ae00ae, 0x74aa00aa, 0x25ab00ab, 0xd6a800a8,
+    0x87a900a9, 0xd8a000a0, 0x89a100a1, 0x7aa200a2, 0x2ba300a3,
+    0x2ca700a7, 0x7da600a6, 0x8ea500a5, 0xdfa400a4, 0xe0800080,
+    0xb1810081, 0x42820082, 0x13830083, 0x14870087, 0x45860086,
+    0xb6850085, 0xe7840084, 0xb88d008d, 0xe98c008c, 0x1a8f008f,
+    0x4b8e008e, 0x4c8a008a, 0x1d8b008b, 0xee880088, 0xbf890089,
+    0x509a009a, 0x019b009b, 0xf2980098, 0xa3990099, 0xa49d009d,
+    0xf59c009c, 0x069f009f, 0x579e009e, 0x08970097, 0x59960096,
+    0xaa950095, 0xfb940094, 0xfc900090, 0xad910091, 0x5e920092,
+    0x0f930093},
+   {0x00000000, 0x41b401b4, 0x83680368, 0xc2dc02dc, 0xb6d306d3,
+    0xf7670767, 0x35bb05bb, 0x740f040f, 0xdda50da5, 0x9c110c11,
+    0x5ecd0ecd, 0x1f790f79, 0x6b760b76, 0x2ac20ac2, 0xe81e081e,
+    0xa9aa09aa, 0x0b491b49, 0x4afd1afd, 0x88211821, 0xc9951995,
+    0xbd9a1d9a, 0xfc2e1c2e, 0x3ef21ef2, 0x7f461f46, 0xd6ec16ec,
+    0x97581758, 0x55841584, 0x14301430, 0x603f103f, 0x218b118b,
+    0xe3571357, 0xa2e312e3, 0x16923692, 0x57263726, 0x95fa35fa,
+    0xd44e344e, 0xa0413041, 0xe1f531f5, 0x23293329, 0x629d329d,
+    0xcb373b37, 0x8a833a83, 0x485f385f, 0x09eb39eb, 0x7de43de4,
+    0x3c503c50, 0xfe8c3e8c, 0xbf383f38, 0x1ddb2ddb, 0x5c6f2c6f,
+    0x9eb32eb3, 0xdf072f07, 0xab082b08, 0xeabc2abc, 0x28602860,
+    0x69d429d4, 0xc07e207e, 0x81ca21ca, 0x43162316, 0x02a222a2,
+    0x76ad26ad, 0x37192719, 0xf5c525c5, 0xb4712471, 0x2d246d24,
+    0x6c906c90, 0xae4c6e4c, 0xeff86ff8, 0x9bf76bf7, 0xda436a43,
+    0x189f689f, 0x592b692b, 0xf0816081, 0xb1356135, 0x73e963e9,
+    0x325d625d, 0x46526652, 0x07e667e6, 0xc53a653a, 0x848e648e,
+    0x266d766d, 0x67d977d9, 0xa5057505, 0xe4b174b1, 0x90be70be,
+    0xd10a710a, 0x13d673d6, 0x52627262, 0xfbc87bc8, 0xba7c7a7c,
+    0x78a078a0, 0x39147914, 0x4d1b7d1b, 0x0caf7caf, 0xce737e73,
+    0x8fc77fc7, 0x3bb65bb6, 0x7a025a02, 0xb8de58de, 0xf96a596a,
+    0x8d655d65, 0xccd15cd1, 0x0e0d5e0d, 0x4fb95fb9, 0xe6135613,
+    0xa7a757a7, 0x657b557b, 0x24cf54cf, 0x50c050c0, 0x11745174,
+    0xd3a853a8, 0x921c521c, 0x30ff40ff, 0x714b414b, 0xb3974397,
+    0xf2234223, 0x862c462c, 0xc7984798, 0x05444544, 0x44f044f0,
+    0xed5a4d5a, 0xacee4cee, 0x6e324e32, 0x2f864f86, 0x5b894b89,
+    0x1a3d4a3d, 0xd8e148e1, 0x99554955, 0x5a48da48, 0x1bfcdbfc,
+    0xd920d920, 0x9894d894, 0xec9bdc9b, 0xad2fdd2f, 0x6ff3dff3,
+    0x2e47de47, 0x87edd7ed, 0xc659d659, 0x0485d485, 0x4531d531,
+    0x313ed13e, 0x708ad08a, 0xb256d256, 0xf3e2d3e2, 0x5101c101,
+    0x10b5c0b5, 0xd269c269, 0x93ddc3dd, 0xe7d2c7d2, 0xa666c666,
+    0x64bac4ba, 0x250ec50e, 0x8ca4cca4, 0xcd10cd10, 0x0fcccfcc,
+    0x4e78ce78, 0x3a77ca77, 0x7bc3cbc3, 0xb91fc91f, 0xf8abc8ab,
+    0x4cdaecda, 0x0d6eed6e, 0xcfb2efb2, 0x8e06ee06, 0xfa09ea09,
+    0xbbbdebbd, 0x7961e961, 0x38d5e8d5, 0x917fe17f, 0xd0cbe0cb,
+    0x1217e217, 0x53a3e3a3, 0x27ace7ac, 0x6618e618, 0xa4c4e4c4,
+    0xe570e570, 0x4793f793, 0x0627f627, 0xc4fbf4fb, 0x854ff54f,
+    0xf140f140, 0xb0f4f0f4, 0x7228f228, 0x339cf39c, 0x9a36fa36,
+    0xdb82fb82, 0x195ef95e, 0x58eaf8ea, 0x2ce5fce5, 0x6d51fd51,
+    0xaf8dff8d, 0xee39fe39, 0x776cb76c, 0x36d8b6d8, 0xf404b404,
+    0xb5b0b5b0, 0xc1bfb1bf, 0x800bb00b, 0x42d7b2d7, 0x0363b363,
+    0xaac9bac9, 0xeb7dbb7d, 0x29a1b9a1, 0x6815b815, 0x1c1abc1a,
+    0x5daebdae, 0x9f72bf72, 0xdec6bec6, 0x7c25ac25, 0x3d91ad91,
+    0xff4daf4d, 0xbef9aef9, 0xcaf6aaf6, 0x8b42ab42, 0x499ea99e,
+    0x082aa82a, 0xa180a180, 0xe034a034, 0x22e8a2e8, 0x635ca35c,
+    0x1753a753, 0x56e7a6e7, 0x943ba43b, 0xd58fa58f, 0x61fe81fe,
+    0x204a804a, 0xe2968296, 0xa3228322, 0xd72d872d, 0x96998699,
+    0x54458445, 0x15f185f1, 0xbc5b8c5b, 0xfdef8def, 0x3f338f33,
+    0x7e878e87, 0x0a888a88, 0x4b3c8b3c, 0x89e089e0, 0xc8548854,
+    0x6ab79ab7, 0x2b039b03, 0xe9df99df, 0xa86b986b, 0xdc649c64,
+    0x9dd09dd0, 0x5f0c9f0c, 0x1eb89eb8, 0xb7129712, 0xf6a696a6,
+    0x347a947a, 0x75ce95ce, 0x01c191c1, 0x40759075, 0x82a992a9,
+    0xc31d931d},
+   {0x00000000, 0xb491b490, 0xd9206923, 0x6db1ddb3, 0x0243d245,
+    0xb6d266d5, 0xdb63bb66, 0x6ff20ff6, 0x0487a48a, 0xb016101a,
+    0xdda7cda9, 0x69367939, 0x06c476cf, 0xb255c25f, 0xdfe41fec,
+    0x6b75ab7c, 0x090f4914, 0xbd9efd84, 0xd02f2037, 0x64be94a7,
+    0x0b4c9b51, 0xbfdd2fc1, 0xd26cf272, 0x66fd46e2, 0x0d88ed9e,
+    0xb919590e, 0xd4a884bd, 0x6039302d, 0x0fcb3fdb, 0xbb5a8b4b,
+    0xd6eb56f8, 0x627ae268, 0x121e9228, 0xa68f26b8, 0xcb3efb0b,
+    0x7faf4f9b, 0x105d406d, 0xa4ccf4fd, 0xc97d294e, 0x7dec9dde,
+    0x169936a2, 0xa2088232, 0xcfb95f81, 0x7b28eb11, 0x14dae4e7,
+    0xa04b5077, 0xcdfa8dc4, 0x796b3954, 0x1b11db3c, 0xaf806fac,
+    0xc231b21f, 0x76a0068f, 0x19520979, 0xadc3bde9, 0xc072605a,
+    0x74e3d4ca, 0x1f967fb6, 0xab07cb26, 0xc6b61695, 0x7227a205,
+    0x1dd5adf3, 0xa9441963, 0xc4f5c4d0, 0x70647040, 0x243d2450,
+    0x90ac90c0, 0xfd1d4d73, 0x498cf9e3, 0x267ef615, 0x92ef4285,
+    0xff5e9f36, 0x4bcf2ba6, 0x20ba80da, 0x942b344a, 0xf99ae9f9,
+    0x4d0b5d69, 0x22f9529f, 0x9668e60f, 0xfbd93bbc, 0x4f488f2c,
+    0x2d326d44, 0x99a3d9d4, 0xf4120467, 0x4083b0f7, 0x2f71bf01,
+    0x9be00b91, 0xf651d622, 0x42c062b2, 0x29b5c9ce, 0x9d247d5e,
+    0xf095a0ed, 0x4404147d, 0x2bf61b8b, 0x9f67af1b, 0xf2d672a8,
+    0x4647c638, 0x3623b678, 0x82b202e8, 0xef03df5b, 0x5b926bcb,
+    0x3460643d, 0x80f1d0ad, 0xed400d1e, 0x59d1b98e, 0x32a412f2,
+    0x8635a662, 0xeb847bd1, 0x5f15cf41, 0x30e7c0b7, 0x84767427,
+    0xe9c7a994, 0x5d561d04, 0x3f2cff6c, 0x8bbd4bfc, 0xe60c964f,
+    0x529d22df, 0x3d6f2d29, 0x89fe99b9, 0xe44f440a, 0x50def09a,
+    0x3bab5be6, 0x8f3aef76, 0xe28b32c5, 0x561a8655, 0x39e889a3,
+    0x8d793d33, 0xe0c8e080, 0x54595410, 0x487a48a0, 0xfcebfc30,
+    0x915a2183, 0x25cb9513, 0x4a399ae5, 0xfea82e75, 0x9319f3c6,
+    0x27884756, 0x4cfdec2a, 0xf86c58ba, 0x95dd8509, 0x214c3199,
+    0x4ebe3e6f, 0xfa2f8aff, 0x979e574c, 0x230fe3dc, 0x417501b4,
+    0xf5e4b524, 0x98556897, 0x2cc4dc07, 0x4336d3f1, 0xf7a76761,
+    0x9a16bad2, 0x2e870e42, 0x45f2a53e, 0xf16311ae, 0x9cd2cc1d,
+    0x2843788d, 0x47b1777b, 0xf320c3eb, 0x9e911e58, 0x2a00aac8,
+    0x5a64da88, 0xeef56e18, 0x8344b3ab, 0x37d5073b, 0x582708cd,
+    0xecb6bc5d, 0x810761ee, 0x3596d57e, 0x5ee37e02, 0xea72ca92,
+    0x87c31721, 0x3352a3b1, 0x5ca0ac47, 0xe83118d7, 0x8580c564,
+    0x311171f4, 0x536b939c, 0xe7fa270c, 0x8a4bfabf, 0x3eda4e2f,
+    0x512841d9, 0xe5b9f549, 0x880828fa, 0x3c999c6a, 0x57ec3716,
+    0xe37d8386, 0x8ecc5e35, 0x3a5deaa5, 0x55afe553, 0xe13e51c3,
+    0x8c8f8c70, 0x381e38e0, 0x6c476cf0, 0xd8d6d860, 0xb56705d3,
+    0x01f6b143, 0x6e04beb5, 0xda950a25, 0xb724d796, 0x03b56306,
+    0x68c0c87a, 0xdc517cea, 0xb1e0a159, 0x057115c9, 0x6a831a3f,
+    0xde12aeaf, 0xb3a3731c, 0x0732c78c, 0x654825e4, 0xd1d99174,
+    0xbc684cc7, 0x08f9f857, 0x670bf7a1, 0xd39a4331, 0xbe2b9e82,
+    0x0aba2a12, 0x61cf816e, 0xd55e35fe, 0xb8efe84d, 0x0c7e5cdd,
+    0x638c532b, 0xd71de7bb, 0xbaac3a08, 0x0e3d8e98, 0x7e59fed8,
+    0xcac84a48, 0xa77997fb, 0x13e8236b, 0x7c1a2c9d, 0xc88b980d,
+    0xa53a45be, 0x11abf12e, 0x7ade5a52, 0xce4feec2, 0xa3fe3371,
+    0x176f87e1, 0x789d8817, 0xcc0c3c87, 0xa1bde134, 0x152c55a4,
+    0x7756b7cc, 0xc3c7035c, 0xae76deef, 0x1ae76a7f, 0x75156589,
+    0xc184d119, 0xac350caa, 0x18a4b83a, 0x73d11346, 0xc740a7d6,
+    0xaaf17a65, 0x1e60cef5, 0x7192c103, 0xc5037593, 0xa8b2a820,
+    0x1c231cb0},
+   {0x00000000, 0x90f49140, 0x91ea2283, 0x011eb3c3, 0x93d74505,
+    0x0323d445, 0x023d6786, 0x92c9f6c6, 0x97ad8a09, 0x07591b49,
+    0x0647a88a, 0x96b339ca, 0x047acf0c, 0x948e5e4c, 0x9590ed8f,
+    0x05647ccf, 0x9f581411, 0x0fac8551, 0x0eb23692, 0x9e46a7d2,
+    0x0c8f5114, 0x9c7bc054, 0x9d657397, 0x0d91e2d7, 0x08f59e18,
+    0x98010f58, 0x991fbc9b, 0x09eb2ddb, 0x9b22db1d, 0x0bd64a5d,
+    0x0ac8f99e, 0x9a3c68de, 0x8eb32821, 0x1e47b961, 0x1f590aa2,
+    0x8fad9be2, 0x1d646d24, 0x8d90fc64, 0x8c8e4fa7, 0x1c7adee7,
+    0x191ea228, 0x89ea3368, 0x88f480ab, 0x180011eb, 0x8ac9e72d,
+    0x1a3d766d, 0x1b23c5ae, 0x8bd754ee, 0x11eb3c30, 0x811fad70,
+    0x80011eb3, 0x10f58ff3, 0x823c7935, 0x12c8e875, 0x13d65bb6,
+    0x8322caf6, 0x8646b639, 0x16b22779, 0x17ac94ba, 0x875805fa,
+    0x1591f33c, 0x8565627c, 0x847bd1bf, 0x148f40ff, 0xad655041,
+    0x3d91c101, 0x3c8f72c2, 0xac7be382, 0x3eb21544, 0xae468404,
+    0xaf5837c7, 0x3faca687, 0x3ac8da48, 0xaa3c4b08, 0xab22f8cb,
+    0x3bd6698b, 0xa91f9f4d, 0x39eb0e0d, 0x38f5bdce, 0xa8012c8e,
+    0x323d4450, 0xa2c9d510, 0xa3d766d3, 0x3323f793, 0xa1ea0155,
+    0x311e9015, 0x300023d6, 0xa0f4b296, 0xa590ce59, 0x35645f19,
+    0x347aecda, 0xa48e7d9a, 0x36478b5c, 0xa6b31a1c, 0xa7ada9df,
+    0x3759389f, 0x23d67860, 0xb322e920, 0xb23c5ae3, 0x22c8cba3,
+    0xb0013d65, 0x20f5ac25, 0x21eb1fe6, 0xb11f8ea6, 0xb47bf269,
+    0x248f6329, 0x2591d0ea, 0xb56541aa, 0x27acb76c, 0xb758262c,
+    0xb64695ef, 0x26b204af, 0xbc8e6c71, 0x2c7afd31, 0x2d644ef2,
+    0xbd90dfb2, 0x2f592974, 0xbfadb834, 0xbeb30bf7, 0x2e479ab7,
+    0x2b23e678, 0xbbd77738, 0xbac9c4fb, 0x2a3d55bb, 0xb8f4a37d,
+    0x2800323d, 0x291e81fe, 0xb9ea10be, 0xeac9a081, 0x7a3d31c1,
+    0x7b238202, 0xebd71342, 0x791ee584, 0xe9ea74c4, 0xe8f4c707,
+    0x78005647, 0x7d642a88, 0xed90bbc8, 0xec8e080b, 0x7c7a994b,
+    0xeeb36f8d, 0x7e47fecd, 0x7f594d0e, 0xefaddc4e, 0x7591b490,
+    0xe56525d0, 0xe47b9613, 0x748f0753, 0xe646f195, 0x76b260d5,
+    0x77acd316, 0xe7584256, 0xe23c3e99, 0x72c8afd9, 0x73d61c1a,
+    0xe3228d5a, 0x71eb7b9c, 0xe11feadc, 0xe001591f, 0x70f5c85f,
+    0x647a88a0, 0xf48e19e0, 0xf590aa23, 0x65643b63, 0xf7adcda5,
+    0x67595ce5, 0x6647ef26, 0xf6b37e66, 0xf3d702a9, 0x632393e9,
+    0x623d202a, 0xf2c9b16a, 0x600047ac, 0xf0f4d6ec, 0xf1ea652f,
+    0x611ef46f, 0xfb229cb1, 0x6bd60df1, 0x6ac8be32, 0xfa3c2f72,
+    0x68f5d9b4, 0xf80148f4, 0xf91ffb37, 0x69eb6a77, 0x6c8f16b8,
+    0xfc7b87f8, 0xfd65343b, 0x6d91a57b, 0xff5853bd, 0x6facc2fd,
+    0x6eb2713e, 0xfe46e07e, 0x47acf0c0, 0xd7586180, 0xd646d243,
+    0x46b24303, 0xd47bb5c5, 0x448f2485, 0x45919746, 0xd5650606,
+    0xd0017ac9, 0x40f5eb89, 0x41eb584a, 0xd11fc90a, 0x43d63fcc,
+    0xd322ae8c, 0xd23c1d4f, 0x42c88c0f, 0xd8f4e4d1, 0x48007591,
+    0x491ec652, 0xd9ea5712, 0x4b23a1d4, 0xdbd73094, 0xdac98357,
+    0x4a3d1217, 0x4f596ed8, 0xdfadff98, 0xdeb34c5b, 0x4e47dd1b,
+    0xdc8e2bdd, 0x4c7aba9d, 0x4d64095e, 0xdd90981e, 0xc91fd8e1,
+    0x59eb49a1, 0x58f5fa62, 0xc8016b22, 0x5ac89de4, 0xca3c0ca4,
+    0xcb22bf67, 0x5bd62e27, 0x5eb252e8, 0xce46c3a8, 0xcf58706b,
+    0x5face12b, 0xcd6517ed, 0x5d9186ad, 0x5c8f356e, 0xcc7ba42e,
+    0x5647ccf0, 0xc6b35db0, 0xc7adee73, 0x57597f33, 0xc59089f5,
+    0x556418b5, 0x547aab76, 0xc48e3a36, 0xc1ea46f9, 0x511ed7b9,
+    0x5000647a, 0xc0f4f53a, 0x523d03fc, 0xc2c992bc, 0xc3d7217f,
+    0x5323b03f}};
+
+static const word_t crc_braid_big_table[][256] = {
+   {0x00000000, 0x4091f490, 0x8322ea91, 0xc3b31e01, 0x0545d793,
+    0x45d42303, 0x86673d02, 0xc6f6c992, 0x098aad97, 0x491b5907,
+    0x8aa84706, 0xca39b396, 0x0ccf7a04, 0x4c5e8e94, 0x8fed9095,
+    0xcf7c6405, 0x1114589f, 0x5185ac0f, 0x9236b20e, 0xd2a7469e,
+    0x14518f0c, 0x54c07b9c, 0x9773659d, 0xd7e2910d, 0x189ef508,
+    0x580f0198, 0x9bbc1f99, 0xdb2deb09, 0x1ddb229b, 0x5d4ad60b,
+    0x9ef9c80a, 0xde683c9a, 0x2128b38e, 0x61b9471e, 0xa20a591f,
+    0xe29bad8f, 0x246d641d, 0x64fc908d, 0xa74f8e8c, 0xe7de7a1c,
+    0x28a21e19, 0x6833ea89, 0xab80f488, 0xeb110018, 0x2de7c98a,
+    0x6d763d1a, 0xaec5231b, 0xee54d78b, 0x303ceb11, 0x70ad1f81,
+    0xb31e0180, 0xf38ff510, 0x35793c82, 0x75e8c812, 0xb65bd613,
+    0xf6ca2283, 0x39b64686, 0x7927b216, 0xba94ac17, 0xfa055887,
+    0x3cf39115, 0x7c626585, 0xbfd17b84, 0xff408f14, 0x415065ad,
+    0x01c1913d, 0xc2728f3c, 0x82e37bac, 0x4415b23e, 0x048446ae,
+    0xc73758af, 0x87a6ac3f, 0x48dac83a, 0x084b3caa, 0xcbf822ab,
+    0x8b69d63b, 0x4d9f1fa9, 0x0d0eeb39, 0xcebdf538, 0x8e2c01a8,
+    0x50443d32, 0x10d5c9a2, 0xd366d7a3, 0x93f72333, 0x5501eaa1,
+    0x15901e31, 0xd6230030, 0x96b2f4a0, 0x59ce90a5, 0x195f6435,
+    0xdaec7a34, 0x9a7d8ea4, 0x5c8b4736, 0x1c1ab3a6, 0xdfa9ada7,
+    0x9f385937, 0x6078d623, 0x20e922b3, 0xe35a3cb2, 0xa3cbc822,
+    0x653d01b0, 0x25acf520, 0xe61feb21, 0xa68e1fb1, 0x69f27bb4,
+    0x29638f24, 0xead09125, 0xaa4165b5, 0x6cb7ac27, 0x2c2658b7,
+    0xef9546b6, 0xaf04b226, 0x716c8ebc, 0x31fd7a2c, 0xf24e642d,
+    0xb2df90bd, 0x7429592f, 0x34b8adbf, 0xf70bb3be, 0xb79a472e,
+    0x78e6232b, 0x3877d7bb, 0xfbc4c9ba, 0xbb553d2a, 0x7da3f4b8,
+    0x3d320028, 0xfe811e29, 0xbe10eab9, 0x81a0c9ea, 0xc1313d7a,
+    0x0282237b, 0x4213d7eb, 0x84e51e79, 0xc474eae9, 0x07c7f4e8,
+    0x47560078, 0x882a647d, 0xc8bb90ed, 0x0b088eec, 0x4b997a7c,
+    0x8d6fb3ee, 0xcdfe477e, 0x0e4d597f, 0x4edcadef, 0x90b49175,
+    0xd02565e5, 0x13967be4, 0x53078f74, 0x95f146e6, 0xd560b276,
+    0x16d3ac77, 0x564258e7, 0x993e3ce2, 0xd9afc872, 0x1a1cd673,
+    0x5a8d22e3, 0x9c7beb71, 0xdcea1fe1, 0x1f5901e0, 0x5fc8f570,
+    0xa0887a64, 0xe0198ef4, 0x23aa90f5, 0x633b6465, 0xa5cdadf7,
+    0xe55c5967, 0x26ef4766, 0x667eb3f6, 0xa902d7f3, 0xe9932363,
+    0x2a203d62, 0x6ab1c9f2, 0xac470060, 0xecd6f4f0, 0x2f65eaf1,
+    0x6ff41e61, 0xb19c22fb, 0xf10dd66b, 0x32bec86a, 0x722f3cfa,
+    0xb4d9f568, 0xf44801f8, 0x37fb1ff9, 0x776aeb69, 0xb8168f6c,
+    0xf8877bfc, 0x3b3465fd, 0x7ba5916d, 0xbd5358ff, 0xfdc2ac6f,
+    0x3e71b26e, 0x7ee046fe, 0xc0f0ac47, 0x806158d7, 0x43d246d6,
+    0x0343b246, 0xc5b57bd4, 0x85248f44, 0x46979145, 0x060665d5,
+    0xc97a01d0, 0x89ebf540, 0x4a58eb41, 0x0ac91fd1, 0xcc3fd643,
+    0x8cae22d3, 0x4f1d3cd2, 0x0f8cc842, 0xd1e4f4d8, 0x91750048,
+    0x52c61e49, 0x1257ead9, 0xd4a1234b, 0x9430d7db, 0x5783c9da,
+    0x17123d4a, 0xd86e594f, 0x98ffaddf, 0x5b4cb3de, 0x1bdd474e,
+    0xdd2b8edc, 0x9dba7a4c, 0x5e09644d, 0x1e9890dd, 0xe1d81fc9,
+    0xa149eb59, 0x62faf558, 0x226b01c8, 0xe49dc85a, 0xa40c3cca,
+    0x67bf22cb, 0x272ed65b, 0xe852b25e, 0xa8c346ce, 0x6b7058cf,
+    0x2be1ac5f, 0xed1765cd, 0xad86915d, 0x6e358f5c, 0x2ea47bcc,
+    0xf0cc4756, 0xb05db3c6, 0x73eeadc7, 0x337f5957, 0xf58990c5,
+    0xb5186455, 0x76ab7a54, 0x363a8ec4, 0xf946eac1, 0xb9d71e51,
+    0x7a640050, 0x3af5f4c0, 0xfc033d52, 0xbc92c9c2, 0x7f21d7c3,
+    0x3fb02353},
+   {0x00000000, 0x90b491b4, 0x236920d9, 0xb3ddb16d, 0x45d24302,
+    0xd566d2b6, 0x66bb63db, 0xf60ff26f, 0x8aa48704, 0x1a1016b0,
+    0xa9cda7dd, 0x39793669, 0xcf76c406, 0x5fc255b2, 0xec1fe4df,
+    0x7cab756b, 0x14490f09, 0x84fd9ebd, 0x37202fd0, 0xa794be64,
+    0x519b4c0b, 0xc12fddbf, 0x72f26cd2, 0xe246fd66, 0x9eed880d,
+    0x0e5919b9, 0xbd84a8d4, 0x2d303960, 0xdb3fcb0f, 0x4b8b5abb,
+    0xf856ebd6, 0x68e27a62, 0x28921e12, 0xb8268fa6, 0x0bfb3ecb,
+    0x9b4faf7f, 0x6d405d10, 0xfdf4cca4, 0x4e297dc9, 0xde9dec7d,
+    0xa2369916, 0x328208a2, 0x815fb9cf, 0x11eb287b, 0xe7e4da14,
+    0x77504ba0, 0xc48dfacd, 0x54396b79, 0x3cdb111b, 0xac6f80af,
+    0x1fb231c2, 0x8f06a076, 0x79095219, 0xe9bdc3ad, 0x5a6072c0,
+    0xcad4e374, 0xb67f961f, 0x26cb07ab, 0x9516b6c6, 0x05a22772,
+    0xf3add51d, 0x631944a9, 0xd0c4f5c4, 0x40706470, 0x50243d24,
+    0xc090ac90, 0x734d1dfd, 0xe3f98c49, 0x15f67e26, 0x8542ef92,
+    0x369f5eff, 0xa62bcf4b, 0xda80ba20, 0x4a342b94, 0xf9e99af9,
+    0x695d0b4d, 0x9f52f922, 0x0fe66896, 0xbc3bd9fb, 0x2c8f484f,
+    0x446d322d, 0xd4d9a399, 0x670412f4, 0xf7b08340, 0x01bf712f,
+    0x910be09b, 0x22d651f6, 0xb262c042, 0xcec9b529, 0x5e7d249d,
+    0xeda095f0, 0x7d140444, 0x8b1bf62b, 0x1baf679f, 0xa872d6f2,
+    0x38c64746, 0x78b62336, 0xe802b282, 0x5bdf03ef, 0xcb6b925b,
+    0x3d646034, 0xadd0f180, 0x1e0d40ed, 0x8eb9d159, 0xf212a432,
+    0x62a63586, 0xd17b84eb, 0x41cf155f, 0xb7c0e730, 0x27747684,
+    0x94a9c7e9, 0x041d565d, 0x6cff2c3f, 0xfc4bbd8b, 0x4f960ce6,
+    0xdf229d52, 0x292d6f3d, 0xb999fe89, 0x0a444fe4, 0x9af0de50,
+    0xe65bab3b, 0x76ef3a8f, 0xc5328be2, 0x55861a56, 0xa389e839,
+    0x333d798d, 0x80e0c8e0, 0x10545954, 0xa0487a48, 0x30fcebfc,
+    0x83215a91, 0x1395cb25, 0xe59a394a, 0x752ea8fe, 0xc6f31993,
+    0x56478827, 0x2aecfd4c, 0xba586cf8, 0x0985dd95, 0x99314c21,
+    0x6f3ebe4e, 0xff8a2ffa, 0x4c579e97, 0xdce30f23, 0xb4017541,
+    0x24b5e4f5, 0x97685598, 0x07dcc42c, 0xf1d33643, 0x6167a7f7,
+    0xd2ba169a, 0x420e872e, 0x3ea5f245, 0xae1163f1, 0x1dccd29c,
+    0x8d784328, 0x7b77b147, 0xebc320f3, 0x581e919e, 0xc8aa002a,
+    0x88da645a, 0x186ef5ee, 0xabb34483, 0x3b07d537, 0xcd082758,
+    0x5dbcb6ec, 0xee610781, 0x7ed59635, 0x027ee35e, 0x92ca72ea,
+    0x2117c387, 0xb1a35233, 0x47aca05c, 0xd71831e8, 0x64c58085,
+    0xf4711131, 0x9c936b53, 0x0c27fae7, 0xbffa4b8a, 0x2f4eda3e,
+    0xd9412851, 0x49f5b9e5, 0xfa280888, 0x6a9c993c, 0x1637ec57,
+    0x86837de3, 0x355ecc8e, 0xa5ea5d3a, 0x53e5af55, 0xc3513ee1,
+    0x708c8f8c, 0xe0381e38, 0xf06c476c, 0x60d8d6d8, 0xd30567b5,
+    0x43b1f601, 0xb5be046e, 0x250a95da, 0x96d724b7, 0x0663b503,
+    0x7ac8c068, 0xea7c51dc, 0x59a1e0b1, 0xc9157105, 0x3f1a836a,
+    0xafae12de, 0x1c73a3b3, 0x8cc73207, 0xe4254865, 0x7491d9d1,
+    0xc74c68bc, 0x57f8f908, 0xa1f70b67, 0x31439ad3, 0x829e2bbe,
+    0x122aba0a, 0x6e81cf61, 0xfe355ed5, 0x4de8efb8, 0xdd5c7e0c,
+    0x2b538c63, 0xbbe71dd7, 0x083aacba, 0x988e3d0e, 0xd8fe597e,
+    0x484ac8ca, 0xfb9779a7, 0x6b23e813, 0x9d2c1a7c, 0x0d988bc8,
+    0xbe453aa5, 0x2ef1ab11, 0x525ade7a, 0xc2ee4fce, 0x7133fea3,
+    0xe1876f17, 0x17889d78, 0x873c0ccc, 0x34e1bda1, 0xa4552c15,
+    0xccb75677, 0x5c03c7c3, 0xefde76ae, 0x7f6ae71a, 0x89651575,
+    0x19d184c1, 0xaa0c35ac, 0x3ab8a418, 0x4613d173, 0xd6a740c7,
+    0x657af1aa, 0xf5ce601e, 0x03c19271, 0x937503c5, 0x20a8b2a8,
+    0xb01c231c},
+   {0x00000000, 0xb401b441, 0x68036883, 0xdc02dcc2, 0xd306d3b6,
+    0x670767f7, 0xbb05bb35, 0x0f040f74, 0xa50da5dd, 0x110c119c,
+    0xcd0ecd5e, 0x790f791f, 0x760b766b, 0xc20ac22a, 0x1e081ee8,
+    0xaa09aaa9, 0x491b490b, 0xfd1afd4a, 0x21182188, 0x951995c9,
+    0x9a1d9abd, 0x2e1c2efc, 0xf21ef23e, 0x461f467f, 0xec16ecd6,
+    0x58175897, 0x84158455, 0x30143014, 0x3f103f60, 0x8b118b21,
+    0x571357e3, 0xe312e3a2, 0x92369216, 0x26372657, 0xfa35fa95,
+    0x4e344ed4, 0x413041a0, 0xf531f5e1, 0x29332923, 0x9d329d62,
+    0x373b37cb, 0x833a838a, 0x5f385f48, 0xeb39eb09, 0xe43de47d,
+    0x503c503c, 0x8c3e8cfe, 0x383f38bf, 0xdb2ddb1d, 0x6f2c6f5c,
+    0xb32eb39e, 0x072f07df, 0x082b08ab, 0xbc2abcea, 0x60286028,
+    0xd429d469, 0x7e207ec0, 0xca21ca81, 0x16231643, 0xa222a202,
+    0xad26ad76, 0x19271937, 0xc525c5f5, 0x712471b4, 0x246d242d,
+    0x906c906c, 0x4c6e4cae, 0xf86ff8ef, 0xf76bf79b, 0x436a43da,
+    0x9f689f18, 0x2b692b59, 0x816081f0, 0x356135b1, 0xe963e973,
+    0x5d625d32, 0x52665246, 0xe667e607, 0x3a653ac5, 0x8e648e84,
+    0x6d766d26, 0xd977d967, 0x057505a5, 0xb174b1e4, 0xbe70be90,
+    0x0a710ad1, 0xd673d613, 0x62726252, 0xc87bc8fb, 0x7c7a7cba,
+    0xa078a078, 0x14791439, 0x1b7d1b4d, 0xaf7caf0c, 0x737e73ce,
+    0xc77fc78f, 0xb65bb63b, 0x025a027a, 0xde58deb8, 0x6a596af9,
+    0x655d658d, 0xd15cd1cc, 0x0d5e0d0e, 0xb95fb94f, 0x135613e6,
+    0xa757a7a7, 0x7b557b65, 0xcf54cf24, 0xc050c050, 0x74517411,
+    0xa853a8d3, 0x1c521c92, 0xff40ff30, 0x4b414b71, 0x974397b3,
+    0x234223f2, 0x2c462c86, 0x984798c7, 0x44454405, 0xf044f044,
+    0x5a4d5aed, 0xee4ceeac, 0x324e326e, 0x864f862f, 0x894b895b,
+    0x3d4a3d1a, 0xe148e1d8, 0x55495599, 0x48da485a, 0xfcdbfc1b,
+    0x20d920d9, 0x94d89498, 0x9bdc9bec, 0x2fdd2fad, 0xf3dff36f,
+    0x47de472e, 0xedd7ed87, 0x59d659c6, 0x85d48504, 0x31d53145,
+    0x3ed13e31, 0x8ad08a70, 0x56d256b2, 0xe2d3e2f3, 0x01c10151,
+    0xb5c0b510, 0x69c269d2, 0xddc3dd93, 0xd2c7d2e7, 0x66c666a6,
+    0xbac4ba64, 0x0ec50e25, 0xa4cca48c, 0x10cd10cd, 0xcccfcc0f,
+    0x78ce784e, 0x77ca773a, 0xc3cbc37b, 0x1fc91fb9, 0xabc8abf8,
+    0xdaecda4c, 0x6eed6e0d, 0xb2efb2cf, 0x06ee068e, 0x09ea09fa,
+    0xbdebbdbb, 0x61e96179, 0xd5e8d538, 0x7fe17f91, 0xcbe0cbd0,
+    0x17e21712, 0xa3e3a353, 0xace7ac27, 0x18e61866, 0xc4e4c4a4,
+    0x70e570e5, 0x93f79347, 0x27f62706, 0xfbf4fbc4, 0x4ff54f85,
+    0x40f140f1, 0xf4f0f4b0, 0x28f22872, 0x9cf39c33, 0x36fa369a,
+    0x82fb82db, 0x5ef95e19, 0xeaf8ea58, 0xe5fce52c, 0x51fd516d,
+    0x8dff8daf, 0x39fe39ee, 0x6cb76c77, 0xd8b6d836, 0x04b404f4,
+    0xb0b5b0b5, 0xbfb1bfc1, 0x0bb00b80, 0xd7b2d742, 0x63b36303,
+    0xc9bac9aa, 0x7dbb7deb, 0xa1b9a129, 0x15b81568, 0x1abc1a1c,
+    0xaebdae5d, 0x72bf729f, 0xc6bec6de, 0x25ac257c, 0x91ad913d,
+    0x4daf4dff, 0xf9aef9be, 0xf6aaf6ca, 0x42ab428b, 0x9ea99e49,
+    0x2aa82a08, 0x80a180a1, 0x34a034e0, 0xe8a2e822, 0x5ca35c63,
+    0x53a75317, 0xe7a6e756, 0x3ba43b94, 0x8fa58fd5, 0xfe81fe61,
+    0x4a804a20, 0x968296e2, 0x228322a3, 0x2d872dd7, 0x99869996,
+    0x45844554, 0xf185f115, 0x5b8c5bbc, 0xef8deffd, 0x338f333f,
+    0x878e877e, 0x888a880a, 0x3c8b3c4b, 0xe089e089, 0x548854c8,
+    0xb79ab76a, 0x039b032b, 0xdf99dfe9, 0x6b986ba8, 0x649c64dc,
+    0xd09dd09d, 0x0c9f0c5f, 0xb89eb81e, 0x129712b7, 0xa696a6f6,
+    0x7a947a34, 0xce95ce75, 0xc191c101, 0x75907540, 0xa992a982,
+    0x1d931dc3},
+   {0x00000000, 0x01000151, 0x020002a2, 0x030003f3, 0x070007f4,
+    0x060006a5, 0x05000556, 0x04000407, 0x0d000d58, 0x0c000c09,
+    0x0f000ffa, 0x0e000eab, 0x0a000aac, 0x0b000bfd, 0x0800080e,
+    0x0900095f, 0x1a001ab0, 0x1b001be1, 0x18001812, 0x19001943,
+    0x1d001d44, 0x1c001c15, 0x1f001fe6, 0x1e001eb7, 0x170017e8,
+    0x160016b9, 0x1500154a, 0x1400141b, 0x1000101c, 0x1100114d,
+    0x120012be, 0x130013ef, 0x370037d0, 0x36003681, 0x35003572,
+    0x34003423, 0x30003024, 0x31003175, 0x32003286, 0x330033d7,
+    0x3a003a88, 0x3b003bd9, 0x3800382a, 0x3900397b, 0x3d003d7c,
+    0x3c003c2d, 0x3f003fde, 0x3e003e8f, 0x2d002d60, 0x2c002c31,
+    0x2f002fc2, 0x2e002e93, 0x2a002a94, 0x2b002bc5, 0x28002836,
+    0x29002967, 0x20002038, 0x21002169, 0x2200229a, 0x230023cb,
+    0x270027cc, 0x2600269d, 0x2500256e, 0x2400243f, 0x6d006d10,
+    0x6c006c41, 0x6f006fb2, 0x6e006ee3, 0x6a006ae4, 0x6b006bb5,
+    0x68006846, 0x69006917, 0x60006048, 0x61006119, 0x620062ea,
+    0x630063bb, 0x670067bc, 0x660066ed, 0x6500651e, 0x6400644f,
+    0x770077a0, 0x760076f1, 0x75007502, 0x74007453, 0x70007054,
+    0x71007105, 0x720072f6, 0x730073a7, 0x7a007af8, 0x7b007ba9,
+    0x7800785a, 0x7900790b, 0x7d007d0c, 0x7c007c5d, 0x7f007fae,
+    0x7e007eff, 0x5a005ac0, 0x5b005b91, 0x58005862, 0x59005933,
+    0x5d005d34, 0x5c005c65, 0x5f005f96, 0x5e005ec7, 0x57005798,
+    0x560056c9, 0x5500553a, 0x5400546b, 0x5000506c, 0x5100513d,
+    0x520052ce, 0x5300539f, 0x40004070, 0x41004121, 0x420042d2,
+    0x43004383, 0x47004784, 0x460046d5, 0x45004526, 0x44004477,
+    0x4d004d28, 0x4c004c79, 0x4f004f8a, 0x4e004edb, 0x4a004adc,
+    0x4b004b8d, 0x4800487e, 0x4900492f, 0xda00da20, 0xdb00db71,
+    0xd800d882, 0xd900d9d3, 0xdd00ddd4, 0xdc00dc85, 0xdf00df76,
+    0xde00de27, 0xd700d778, 0xd600d629, 0xd500d5da, 0xd400d48b,
+    0xd000d08c, 0xd100d1dd, 0xd200d22e, 0xd300d37f, 0xc000c090,
+    0xc100c1c1, 0xc200c232, 0xc300c363, 0xc700c764, 0xc600c635,
+    0xc500c5c6, 0xc400c497, 0xcd00cdc8, 0xcc00cc99, 0xcf00cf6a,
+    0xce00ce3b, 0xca00ca3c, 0xcb00cb6d, 0xc800c89e, 0xc900c9cf,
+    0xed00edf0, 0xec00eca1, 0xef00ef52, 0xee00ee03, 0xea00ea04,
+    0xeb00eb55, 0xe800e8a6, 0xe900e9f7, 0xe000e0a8, 0xe100e1f9,
+    0xe200e20a, 0xe300e35b, 0xe700e75c, 0xe600e60d, 0xe500e5fe,
+    0xe400e4af, 0xf700f740, 0xf600f611, 0xf500f5e2, 0xf400f4b3,
+    0xf000f0b4, 0xf100f1e5, 0xf200f216, 0xf300f347, 0xfa00fa18,
+    0xfb00fb49, 0xf800f8ba, 0xf900f9eb, 0xfd00fdec, 0xfc00fcbd,
+    0xff00ff4e, 0xfe00fe1f, 0xb700b730, 0xb600b661, 0xb500b592,
+    0xb400b4c3, 0xb000b0c4, 0xb100b195, 0xb200b266, 0xb300b337,
+    0xba00ba68, 0xbb00bb39, 0xb800b8ca, 0xb900b99b, 0xbd00bd9c,
+    0xbc00bccd, 0xbf00bf3e, 0xbe00be6f, 0xad00ad80, 0xac00acd1,
+    0xaf00af22, 0xae00ae73, 0xaa00aa74, 0xab00ab25, 0xa800a8d6,
+    0xa900a987, 0xa000a0d8, 0xa100a189, 0xa200a27a, 0xa300a32b,
+    0xa700a72c, 0xa600a67d, 0xa500a58e, 0xa400a4df, 0x800080e0,
+    0x810081b1, 0x82008242, 0x83008313, 0x87008714, 0x86008645,
+    0x850085b6, 0x840084e7, 0x8d008db8, 0x8c008ce9, 0x8f008f1a,
+    0x8e008e4b, 0x8a008a4c, 0x8b008b1d, 0x880088ee, 0x890089bf,
+    0x9a009a50, 0x9b009b01, 0x980098f2, 0x990099a3, 0x9d009da4,
+    0x9c009cf5, 0x9f009f06, 0x9e009e57, 0x97009708, 0x96009659,
+    0x950095aa, 0x940094fb, 0x900090fc, 0x910091ad, 0x9200925e,
+    0x9300930f}};
+
+#endif
+
+#endif
+
+#if N == 4
+
+#if W == 8
+
+static const crc_t crc_braid_table[][256] = {
+   {0x00000000, 0xbd01c000, 0xca008003, 0x77014003, 0x24020005,
+    0x9903c005, 0xee028006, 0x53034006, 0x4804000a, 0xf505c00a,
+    0x82048009, 0x3f054009, 0x6c06000f, 0xd107c00f, 0xa606800c,
+    0x1b07400c, 0x90080014, 0x2d09c014, 0x5a088017, 0xe7094017,
+    0xb40a0011, 0x090bc011, 0x7e0a8012, 0xc30b4012, 0xd80c001e,
+    0x650dc01e, 0x120c801d, 0xaf0d401d, 0xfc0e001b, 0x410fc01b,
+    0x360e8018, 0x8b0f4018, 0x9013002b, 0x2d12c02b, 0x5a138028,
+    0xe7124028, 0xb411002e, 0x0910c02e, 0x7e11802d, 0xc310402d,
+    0xd8170021, 0x6516c021, 0x12178022, 0xaf164022, 0xfc150024,
+    0x4114c024, 0x36158027, 0x8b144027, 0x001b003f, 0xbd1ac03f,
+    0xca1b803c, 0x771a403c, 0x2419003a, 0x9918c03a, 0xee198039,
+    0x53184039, 0x481f0035, 0xf51ec035, 0x821f8036, 0x3f1e4036,
+    0x6c1d0030, 0xd11cc030, 0xa61d8033, 0x1b1c4033, 0x90250055,
+    0x2d24c055, 0x5a258056, 0xe7244056, 0xb4270050, 0x0926c050,
+    0x7e278053, 0xc3264053, 0xd821005f, 0x6520c05f, 0x1221805c,
+    0xaf20405c, 0xfc23005a, 0x4122c05a, 0x36238059, 0x8b224059,
+    0x002d0041, 0xbd2cc041, 0xca2d8042, 0x772c4042, 0x242f0044,
+    0x992ec044, 0xee2f8047, 0x532e4047, 0x4829004b, 0xf528c04b,
+    0x82298048, 0x3f284048, 0x6c2b004e, 0xd12ac04e, 0xa62b804d,
+    0x1b2a404d, 0x0036007e, 0xbd37c07e, 0xca36807d, 0x7737407d,
+    0x2434007b, 0x9935c07b, 0xee348078, 0x53354078, 0x48320074,
+    0xf533c074, 0x82328077, 0x3f334077, 0x6c300071, 0xd131c071,
+    0xa6308072, 0x1b314072, 0x903e006a, 0x2d3fc06a, 0x5a3e8069,
+    0xe73f4069, 0xb43c006f, 0x093dc06f, 0x7e3c806c, 0xc33d406c,
+    0xd83a0060, 0x653bc060, 0x123a8063, 0xaf3b4063, 0xfc380065,
+    0x4139c065, 0x36388066, 0x8b394066, 0x904900a9, 0x2d48c0a9,
+    0x5a4980aa, 0xe74840aa, 0xb44b00ac, 0x094ac0ac, 0x7e4b80af,
+    0xc34a40af, 0xd84d00a3, 0x654cc0a3, 0x124d80a0, 0xaf4c40a0,
+    0xfc4f00a6, 0x414ec0a6, 0x364f80a5, 0x8b4e40a5, 0x004100bd,
+    0xbd40c0bd, 0xca4180be, 0x774040be, 0x244300b8, 0x9942c0b8,
+    0xee4380bb, 0x534240bb, 0x484500b7, 0xf544c0b7, 0x824580b4,
+    0x3f4440b4, 0x6c4700b2, 0xd146c0b2, 0xa64780b1, 0x1b4640b1,
+    0x005a0082, 0xbd5bc082, 0xca5a8081, 0x775b4081, 0x24580087,
+    0x9959c087, 0xee588084, 0x53594084, 0x485e0088, 0xf55fc088,
+    0x825e808b, 0x3f5f408b, 0x6c5c008d, 0xd15dc08d, 0xa65c808e,
+    0x1b5d408e, 0x90520096, 0x2d53c096, 0x5a528095, 0xe7534095,
+    0xb4500093, 0x0951c093, 0x7e508090, 0xc3514090, 0xd856009c,
+    0x6557c09c, 0x1256809f, 0xaf57409f, 0xfc540099, 0x4155c099,
+    0x3654809a, 0x8b55409a, 0x006c00fc, 0xbd6dc0fc, 0xca6c80ff,
+    0x776d40ff, 0x246e00f9, 0x996fc0f9, 0xee6e80fa, 0x536f40fa,
+    0x486800f6, 0xf569c0f6, 0x826880f5, 0x3f6940f5, 0x6c6a00f3,
+    0xd16bc0f3, 0xa66a80f0, 0x1b6b40f0, 0x906400e8, 0x2d65c0e8,
+    0x5a6480eb, 0xe76540eb, 0xb46600ed, 0x0967c0ed, 0x7e6680ee,
+    0xc36740ee, 0xd86000e2, 0x6561c0e2, 0x126080e1, 0xaf6140e1,
+    0xfc6200e7, 0x4163c0e7, 0x366280e4, 0x8b6340e4, 0x907f00d7,
+    0x2d7ec0d7, 0x5a7f80d4, 0xe77e40d4, 0xb47d00d2, 0x097cc0d2,
+    0x7e7d80d1, 0xc37c40d1, 0xd87b00dd, 0x657ac0dd, 0x127b80de,
+    0xaf7a40de, 0xfc7900d8, 0x4178c0d8, 0x367980db, 0x8b7840db,
+    0x007700c3, 0xbd76c0c3, 0xca7780c0, 0x777640c0, 0x247500c6,
+    0x9974c0c6, 0xee7580c5, 0x537440c5, 0x487300c9, 0xf572c0c9,
+    0x827380ca, 0x3f7240ca, 0x6c7100cc, 0xd170c0cc, 0xa67180cf,
+    0x1b7040cf},
+   {0x00000000, 0x90910151, 0x912102a1, 0x01b003f0, 0x92410541,
+    0x02d00410, 0x036007e0, 0x93f106b1, 0x94810a81, 0x04100bd0,
+    0x05a00820, 0x95310971, 0x06c00fc0, 0x96510e91, 0x97e10d61,
+    0x07700c30, 0x99011501, 0x09901450, 0x082017a0, 0x98b116f1,
+    0x0b401040, 0x9bd11111, 0x9a6112e1, 0x0af013b0, 0x0d801f80,
+    0x9d111ed1, 0x9ca11d21, 0x0c301c70, 0x9fc11ac1, 0x0f501b90,
+    0x0ee01860, 0x9e711931, 0x82012a01, 0x12902b50, 0x132028a0,
+    0x83b129f1, 0x10402f40, 0x80d12e11, 0x81612de1, 0x11f02cb0,
+    0x16802080, 0x861121d1, 0x87a12221, 0x17302370, 0x84c125c1,
+    0x14502490, 0x15e02760, 0x85712631, 0x1b003f00, 0x8b913e51,
+    0x8a213da1, 0x1ab03cf0, 0x89413a41, 0x19d03b10, 0x186038e0,
+    0x88f139b1, 0x8f813581, 0x1f1034d0, 0x1ea03720, 0x8e313671,
+    0x1dc030c0, 0x8d513191, 0x8ce13261, 0x1c703330, 0xb4015401,
+    0x24905550, 0x252056a0, 0xb5b157f1, 0x26405140, 0xb6d15011,
+    0xb76153e1, 0x27f052b0, 0x20805e80, 0xb0115fd1, 0xb1a15c21,
+    0x21305d70, 0xb2c15bc1, 0x22505a90, 0x23e05960, 0xb3715831,
+    0x2d004100, 0xbd914051, 0xbc2143a1, 0x2cb042f0, 0xbf414441,
+    0x2fd04510, 0x2e6046e0, 0xbef147b1, 0xb9814b81, 0x29104ad0,
+    0x28a04920, 0xb8314871, 0x2bc04ec0, 0xbb514f91, 0xbae14c61,
+    0x2a704d30, 0x36007e00, 0xa6917f51, 0xa7217ca1, 0x37b07df0,
+    0xa4417b41, 0x34d07a10, 0x356079e0, 0xa5f178b1, 0xa2817481,
+    0x321075d0, 0x33a07620, 0xa3317771, 0x30c071c0, 0xa0517091,
+    0xa1e17361, 0x31707230, 0xaf016b01, 0x3f906a50, 0x3e2069a0,
+    0xaeb168f1, 0x3d406e40, 0xadd16f11, 0xac616ce1, 0x3cf06db0,
+    0x3b806180, 0xab1160d1, 0xaaa16321, 0x3a306270, 0xa9c164c1,
+    0x39506590, 0x38e06660, 0xa8716731, 0xd801a801, 0x4890a950,
+    0x4920aaa0, 0xd9b1abf1, 0x4a40ad40, 0xdad1ac11, 0xdb61afe1,
+    0x4bf0aeb0, 0x4c80a280, 0xdc11a3d1, 0xdda1a021, 0x4d30a170,
+    0xdec1a7c1, 0x4e50a690, 0x4fe0a560, 0xdf71a431, 0x4100bd00,
+    0xd191bc51, 0xd021bfa1, 0x40b0bef0, 0xd341b841, 0x43d0b910,
+    0x4260bae0, 0xd2f1bbb1, 0xd581b781, 0x4510b6d0, 0x44a0b520,
+    0xd431b471, 0x47c0b2c0, 0xd751b391, 0xd6e1b061, 0x4670b130,
+    0x5a008200, 0xca918351, 0xcb2180a1, 0x5bb081f0, 0xc8418741,
+    0x58d08610, 0x596085e0, 0xc9f184b1, 0xce818881, 0x5e1089d0,
+    0x5fa08a20, 0xcf318b71, 0x5cc08dc0, 0xcc518c91, 0xcde18f61,
+    0x5d708e30, 0xc3019701, 0x53909650, 0x522095a0, 0xc2b194f1,
+    0x51409240, 0xc1d19311, 0xc06190e1, 0x50f091b0, 0x57809d80,
+    0xc7119cd1, 0xc6a19f21, 0x56309e70, 0xc5c198c1, 0x55509990,
+    0x54e09a60, 0xc4719b31, 0x6c00fc00, 0xfc91fd51, 0xfd21fea1,
+    0x6db0fff0, 0xfe41f941, 0x6ed0f810, 0x6f60fbe0, 0xfff1fab1,
+    0xf881f681, 0x6810f7d0, 0x69a0f420, 0xf931f571, 0x6ac0f3c0,
+    0xfa51f291, 0xfbe1f161, 0x6b70f030, 0xf501e901, 0x6590e850,
+    0x6420eba0, 0xf4b1eaf1, 0x6740ec40, 0xf7d1ed11, 0xf661eee1,
+    0x66f0efb0, 0x6180e380, 0xf111e2d1, 0xf0a1e121, 0x6030e070,
+    0xf3c1e6c1, 0x6350e790, 0x62e0e460, 0xf271e531, 0xee01d601,
+    0x7e90d750, 0x7f20d4a0, 0xefb1d5f1, 0x7c40d340, 0xecd1d211,
+    0xed61d1e1, 0x7df0d0b0, 0x7a80dc80, 0xea11ddd1, 0xeba1de21,
+    0x7b30df70, 0xe8c1d9c1, 0x7850d890, 0x79e0db60, 0xe971da31,
+    0x7700c300, 0xe791c251, 0xe621c1a1, 0x76b0c0f0, 0xe541c641,
+    0x75d0c710, 0x7460c4e0, 0xe4f1c5b1, 0xe381c981, 0x7310c8d0,
+    0x72a0cb20, 0xe231ca71, 0x71c0ccc0, 0xe151cd91, 0xe0e1ce61,
+    0x7070cf30},
+   {0x00000000, 0x00005001, 0x0000a002, 0x0000f003, 0x00014004,
+    0x00011005, 0x0001e006, 0x0001b007, 0x00028008, 0x0002d009,
+    0x0002200a, 0x0002700b, 0x0003c00c, 0x0003900d, 0x0003600e,
+    0x0003300f, 0x00050010, 0x00055011, 0x0005a012, 0x0005f013,
+    0x00044014, 0x00041015, 0x0004e016, 0x0004b017, 0x00078018,
+    0x0007d019, 0x0007201a, 0x0007701b, 0x0006c01c, 0x0006901d,
+    0x0006601e, 0x0006301f, 0x000a0020, 0x000a5021, 0x000aa022,
+    0x000af023, 0x000b4024, 0x000b1025, 0x000be026, 0x000bb027,
+    0x00088028, 0x0008d029, 0x0008202a, 0x0008702b, 0x0009c02c,
+    0x0009902d, 0x0009602e, 0x0009302f, 0x000f0030, 0x000f5031,
+    0x000fa032, 0x000ff033, 0x000e4034, 0x000e1035, 0x000ee036,
+    0x000eb037, 0x000d8038, 0x000dd039, 0x000d203a, 0x000d703b,
+    0x000cc03c, 0x000c903d, 0x000c603e, 0x000c303f, 0x00140040,
+    0x00145041, 0x0014a042, 0x0014f043, 0x00154044, 0x00151045,
+    0x0015e046, 0x0015b047, 0x00168048, 0x0016d049, 0x0016204a,
+    0x0016704b, 0x0017c04c, 0x0017904d, 0x0017604e, 0x0017304f,
+    0x00110050, 0x00115051, 0x0011a052, 0x0011f053, 0x00104054,
+    0x00101055, 0x0010e056, 0x0010b057, 0x00138058, 0x0013d059,
+    0x0013205a, 0x0013705b, 0x0012c05c, 0x0012905d, 0x0012605e,
+    0x0012305f, 0x001e0060, 0x001e5061, 0x001ea062, 0x001ef063,
+    0x001f4064, 0x001f1065, 0x001fe066, 0x001fb067, 0x001c8068,
+    0x001cd069, 0x001c206a, 0x001c706b, 0x001dc06c, 0x001d906d,
+    0x001d606e, 0x001d306f, 0x001b0070, 0x001b5071, 0x001ba072,
+    0x001bf073, 0x001a4074, 0x001a1075, 0x001ae076, 0x001ab077,
+    0x00198078, 0x0019d079, 0x0019207a, 0x0019707b, 0x0018c07c,
+    0x0018907d, 0x0018607e, 0x0018307f, 0x00280080, 0x00285081,
+    0x0028a082, 0x0028f083, 0x00294084, 0x00291085, 0x0029e086,
+    0x0029b087, 0x002a8088, 0x002ad089, 0x002a208a, 0x002a708b,
+    0x002bc08c, 0x002b908d, 0x002b608e, 0x002b308f, 0x002d0090,
+    0x002d5091, 0x002da092, 0x002df093, 0x002c4094, 0x002c1095,
+    0x002ce096, 0x002cb097, 0x002f8098, 0x002fd099, 0x002f209a,
+    0x002f709b, 0x002ec09c, 0x002e909d, 0x002e609e, 0x002e309f,
+    0x002200a0, 0x002250a1, 0x0022a0a2, 0x0022f0a3, 0x002340a4,
+    0x002310a5, 0x0023e0a6, 0x0023b0a7, 0x002080a8, 0x0020d0a9,
+    0x002020aa, 0x002070ab, 0x0021c0ac, 0x002190ad, 0x002160ae,
+    0x002130af, 0x002700b0, 0x002750b1, 0x0027a0b2, 0x0027f0b3,
+    0x002640b4, 0x002610b5, 0x0026e0b6, 0x0026b0b7, 0x002580b8,
+    0x0025d0b9, 0x002520ba, 0x002570bb, 0x0024c0bc, 0x002490bd,
+    0x002460be, 0x002430bf, 0x003c00c0, 0x003c50c1, 0x003ca0c2,
+    0x003cf0c3, 0x003d40c4, 0x003d10c5, 0x003de0c6, 0x003db0c7,
+    0x003e80c8, 0x003ed0c9, 0x003e20ca, 0x003e70cb, 0x003fc0cc,
+    0x003f90cd, 0x003f60ce, 0x003f30cf, 0x003900d0, 0x003950d1,
+    0x0039a0d2, 0x0039f0d3, 0x003840d4, 0x003810d5, 0x0038e0d6,
+    0x0038b0d7, 0x003b80d8, 0x003bd0d9, 0x003b20da, 0x003b70db,
+    0x003ac0dc, 0x003a90dd, 0x003a60de, 0x003a30df, 0x003600e0,
+    0x003650e1, 0x0036a0e2, 0x0036f0e3, 0x003740e4, 0x003710e5,
+    0x0037e0e6, 0x0037b0e7, 0x003480e8, 0x0034d0e9, 0x003420ea,
+    0x003470eb, 0x0035c0ec, 0x003590ed, 0x003560ee, 0x003530ef,
+    0x003300f0, 0x003350f1, 0x0033a0f2, 0x0033f0f3, 0x003240f4,
+    0x003210f5, 0x0032e0f6, 0x0032b0f7, 0x003180f8, 0x0031d0f9,
+    0x003120fa, 0x003170fb, 0x0030c0fc, 0x003090fd, 0x003060fe,
+    0x003030ff},
+   {0x00000000, 0x00500100, 0x00a00200, 0x00f00300, 0x01400400,
+    0x01100500, 0x01e00600, 0x01b00700, 0x02800800, 0x02d00900,
+    0x02200a00, 0x02700b00, 0x03c00c00, 0x03900d00, 0x03600e00,
+    0x03300f00, 0x05001000, 0x05501100, 0x05a01200, 0x05f01300,
+    0x04401400, 0x04101500, 0x04e01600, 0x04b01700, 0x07801800,
+    0x07d01900, 0x07201a00, 0x07701b00, 0x06c01c00, 0x06901d00,
+    0x06601e00, 0x06301f00, 0x0a002000, 0x0a502100, 0x0aa02200,
+    0x0af02300, 0x0b402400, 0x0b102500, 0x0be02600, 0x0bb02700,
+    0x08802800, 0x08d02900, 0x08202a00, 0x08702b00, 0x09c02c00,
+    0x09902d00, 0x09602e00, 0x09302f00, 0x0f003000, 0x0f503100,
+    0x0fa03200, 0x0ff03300, 0x0e403400, 0x0e103500, 0x0ee03600,
+    0x0eb03700, 0x0d803800, 0x0dd03900, 0x0d203a00, 0x0d703b00,
+    0x0cc03c00, 0x0c903d00, 0x0c603e00, 0x0c303f00, 0x14004000,
+    0x14504100, 0x14a04200, 0x14f04300, 0x15404400, 0x15104500,
+    0x15e04600, 0x15b04700, 0x16804800, 0x16d04900, 0x16204a00,
+    0x16704b00, 0x17c04c00, 0x17904d00, 0x17604e00, 0x17304f00,
+    0x11005000, 0x11505100, 0x11a05200, 0x11f05300, 0x10405400,
+    0x10105500, 0x10e05600, 0x10b05700, 0x13805800, 0x13d05900,
+    0x13205a00, 0x13705b00, 0x12c05c00, 0x12905d00, 0x12605e00,
+    0x12305f00, 0x1e006000, 0x1e506100, 0x1ea06200, 0x1ef06300,
+    0x1f406400, 0x1f106500, 0x1fe06600, 0x1fb06700, 0x1c806800,
+    0x1cd06900, 0x1c206a00, 0x1c706b00, 0x1dc06c00, 0x1d906d00,
+    0x1d606e00, 0x1d306f00, 0x1b007000, 0x1b507100, 0x1ba07200,
+    0x1bf07300, 0x1a407400, 0x1a107500, 0x1ae07600, 0x1ab07700,
+    0x19807800, 0x19d07900, 0x19207a00, 0x19707b00, 0x18c07c00,
+    0x18907d00, 0x18607e00, 0x18307f00, 0x28008000, 0x28508100,
+    0x28a08200, 0x28f08300, 0x29408400, 0x29108500, 0x29e08600,
+    0x29b08700, 0x2a808800, 0x2ad08900, 0x2a208a00, 0x2a708b00,
+    0x2bc08c00, 0x2b908d00, 0x2b608e00, 0x2b308f00, 0x2d009000,
+    0x2d509100, 0x2da09200, 0x2df09300, 0x2c409400, 0x2c109500,
+    0x2ce09600, 0x2cb09700, 0x2f809800, 0x2fd09900, 0x2f209a00,
+    0x2f709b00, 0x2ec09c00, 0x2e909d00, 0x2e609e00, 0x2e309f00,
+    0x2200a000, 0x2250a100, 0x22a0a200, 0x22f0a300, 0x2340a400,
+    0x2310a500, 0x23e0a600, 0x23b0a700, 0x2080a800, 0x20d0a900,
+    0x2020aa00, 0x2070ab00, 0x21c0ac00, 0x2190ad00, 0x2160ae00,
+    0x2130af00, 0x2700b000, 0x2750b100, 0x27a0b200, 0x27f0b300,
+    0x2640b400, 0x2610b500, 0x26e0b600, 0x26b0b700, 0x2580b800,
+    0x25d0b900, 0x2520ba00, 0x2570bb00, 0x24c0bc00, 0x2490bd00,
+    0x2460be00, 0x2430bf00, 0x3c00c000, 0x3c50c100, 0x3ca0c200,
+    0x3cf0c300, 0x3d40c400, 0x3d10c500, 0x3de0c600, 0x3db0c700,
+    0x3e80c800, 0x3ed0c900, 0x3e20ca00, 0x3e70cb00, 0x3fc0cc00,
+    0x3f90cd00, 0x3f60ce00, 0x3f30cf00, 0x3900d000, 0x3950d100,
+    0x39a0d200, 0x39f0d300, 0x3840d400, 0x3810d500, 0x38e0d600,
+    0x38b0d700, 0x3b80d800, 0x3bd0d900, 0x3b20da00, 0x3b70db00,
+    0x3ac0dc00, 0x3a90dd00, 0x3a60de00, 0x3a30df00, 0x3600e000,
+    0x3650e100, 0x36a0e200, 0x36f0e300, 0x3740e400, 0x3710e500,
+    0x37e0e600, 0x37b0e700, 0x3480e800, 0x34d0e900, 0x3420ea00,
+    0x3470eb00, 0x35c0ec00, 0x3590ed00, 0x3560ee00, 0x3530ef00,
+    0x3300f000, 0x3350f100, 0x33a0f200, 0x33f0f300, 0x3240f400,
+    0x3210f500, 0x32e0f600, 0x32b0f700, 0x3180f800, 0x31d0f900,
+    0x3120fa00, 0x3170fb00, 0x30c0fc00, 0x3090fd00, 0x3060fe00,
+    0x3030ff00},
+   {0x00000000, 0x50010000, 0xa0020000, 0xf0030000, 0xf0070003,
+    0xa0060003, 0x50050003, 0x00040003, 0x500d0005, 0x000c0005,
+    0xf00f0005, 0xa00e0005, 0xa00a0006, 0xf00b0006, 0x00080006,
+    0x50090006, 0xa01a000a, 0xf01b000a, 0x0018000a, 0x5019000a,
+    0x501d0009, 0x001c0009, 0xf01f0009, 0xa01e0009, 0xf017000f,
+    0xa016000f, 0x5015000f, 0x0014000f, 0x0010000c, 0x5011000c,
+    0xa012000c, 0xf013000c, 0xf0370017, 0xa0360017, 0x50350017,
+    0x00340017, 0x00300014, 0x50310014, 0xa0320014, 0xf0330014,
+    0xa03a0012, 0xf03b0012, 0x00380012, 0x50390012, 0x503d0011,
+    0x003c0011, 0xf03f0011, 0xa03e0011, 0x502d001d, 0x002c001d,
+    0xf02f001d, 0xa02e001d, 0xa02a001e, 0xf02b001e, 0x0028001e,
+    0x5029001e, 0x00200018, 0x50210018, 0xa0220018, 0xf0230018,
+    0xf027001b, 0xa026001b, 0x5025001b, 0x0024001b, 0x506d002d,
+    0x006c002d, 0xf06f002d, 0xa06e002d, 0xa06a002e, 0xf06b002e,
+    0x0068002e, 0x5069002e, 0x00600028, 0x50610028, 0xa0620028,
+    0xf0630028, 0xf067002b, 0xa066002b, 0x5065002b, 0x0064002b,
+    0xf0770027, 0xa0760027, 0x50750027, 0x00740027, 0x00700024,
+    0x50710024, 0xa0720024, 0xf0730024, 0xa07a0022, 0xf07b0022,
+    0x00780022, 0x50790022, 0x507d0021, 0x007c0021, 0xf07f0021,
+    0xa07e0021, 0xa05a003a, 0xf05b003a, 0x0058003a, 0x5059003a,
+    0x505d0039, 0x005c0039, 0xf05f0039, 0xa05e0039, 0xf057003f,
+    0xa056003f, 0x5055003f, 0x0054003f, 0x0050003c, 0x5051003c,
+    0xa052003c, 0xf053003c, 0x00400030, 0x50410030, 0xa0420030,
+    0xf0430030, 0xf0470033, 0xa0460033, 0x50450033, 0x00440033,
+    0x504d0035, 0x004c0035, 0xf04f0035, 0xa04e0035, 0xa04a0036,
+    0xf04b0036, 0x00480036, 0x50490036, 0xa0da005a, 0xf0db005a,
+    0x00d8005a, 0x50d9005a, 0x50dd0059, 0x00dc0059, 0xf0df0059,
+    0xa0de0059, 0xf0d7005f, 0xa0d6005f, 0x50d5005f, 0x00d4005f,
+    0x00d0005c, 0x50d1005c, 0xa0d2005c, 0xf0d3005c, 0x00c00050,
+    0x50c10050, 0xa0c20050, 0xf0c30050, 0xf0c70053, 0xa0c60053,
+    0x50c50053, 0x00c40053, 0x50cd0055, 0x00cc0055, 0xf0cf0055,
+    0xa0ce0055, 0xa0ca0056, 0xf0cb0056, 0x00c80056, 0x50c90056,
+    0x50ed004d, 0x00ec004d, 0xf0ef004d, 0xa0ee004d, 0xa0ea004e,
+    0xf0eb004e, 0x00e8004e, 0x50e9004e, 0x00e00048, 0x50e10048,
+    0xa0e20048, 0xf0e30048, 0xf0e7004b, 0xa0e6004b, 0x50e5004b,
+    0x00e4004b, 0xf0f70047, 0xa0f60047, 0x50f50047, 0x00f40047,
+    0x00f00044, 0x50f10044, 0xa0f20044, 0xf0f30044, 0xa0fa0042,
+    0xf0fb0042, 0x00f80042, 0x50f90042, 0x50fd0041, 0x00fc0041,
+    0xf0ff0041, 0xa0fe0041, 0xf0b70077, 0xa0b60077, 0x50b50077,
+    0x00b40077, 0x00b00074, 0x50b10074, 0xa0b20074, 0xf0b30074,
+    0xa0ba0072, 0xf0bb0072, 0x00b80072, 0x50b90072, 0x50bd0071,
+    0x00bc0071, 0xf0bf0071, 0xa0be0071, 0x50ad007d, 0x00ac007d,
+    0xf0af007d, 0xa0ae007d, 0xa0aa007e, 0xf0ab007e, 0x00a8007e,
+    0x50a9007e, 0x00a00078, 0x50a10078, 0xa0a20078, 0xf0a30078,
+    0xf0a7007b, 0xa0a6007b, 0x50a5007b, 0x00a4007b, 0x00800060,
+    0x50810060, 0xa0820060, 0xf0830060, 0xf0870063, 0xa0860063,
+    0x50850063, 0x00840063, 0x508d0065, 0x008c0065, 0xf08f0065,
+    0xa08e0065, 0xa08a0066, 0xf08b0066, 0x00880066, 0x50890066,
+    0xa09a006a, 0xf09b006a, 0x0098006a, 0x5099006a, 0x509d0069,
+    0x009c0069, 0xf09f0069, 0xa09e0069, 0xf097006f, 0xa096006f,
+    0x5095006f, 0x0094006f, 0x0090006c, 0x5091006c, 0xa092006c,
+    0xf093006c},
+   {0x00000000, 0xf1b700b7, 0x536d016d, 0xa2da01da, 0xa6da02da,
+    0x576d026d, 0xf5b703b7, 0x04000300, 0xfdb705b7, 0x0c000500,
+    0xaeda04da, 0x5f6d046d, 0x5b6d076d, 0xaada07da, 0x08000600,
+    0xf9b706b7, 0x4b6d0b6d, 0xbada0bda, 0x18000a00, 0xe9b70ab7,
+    0xedb709b7, 0x1c000900, 0xbeda08da, 0x4f6d086d, 0xb6da0eda,
+    0x476d0e6d, 0xe5b70fb7, 0x14000f00, 0x10000c00, 0xe1b70cb7,
+    0x436d0d6d, 0xb2da0dda, 0x96da16da, 0x676d166d, 0xc5b717b7,
+    0x34001700, 0x30001400, 0xc1b714b7, 0x636d156d, 0x92da15da,
+    0x6b6d136d, 0x9ada13da, 0x38001200, 0xc9b712b7, 0xcdb711b7,
+    0x3c001100, 0x9eda10da, 0x6f6d106d, 0xddb71db7, 0x2c001d00,
+    0x8eda1cda, 0x7f6d1c6d, 0x7b6d1f6d, 0x8ada1fda, 0x28001e00,
+    0xd9b71eb7, 0x20001800, 0xd1b718b7, 0x736d196d, 0x82da19da,
+    0x86da1ada, 0x776d1a6d, 0xd5b71bb7, 0x24001b00, 0x9db72db7,
+    0x6c002d00, 0xceda2cda, 0x3f6d2c6d, 0x3b6d2f6d, 0xcada2fda,
+    0x68002e00, 0x99b72eb7, 0x60002800, 0x91b728b7, 0x336d296d,
+    0xc2da29da, 0xc6da2ada, 0x376d2a6d, 0x95b72bb7, 0x64002b00,
+    0xd6da26da, 0x276d266d, 0x85b727b7, 0x74002700, 0x70002400,
+    0x81b724b7, 0x236d256d, 0xd2da25da, 0x2b6d236d, 0xdada23da,
+    0x78002200, 0x89b722b7, 0x8db721b7, 0x7c002100, 0xdeda20da,
+    0x2f6d206d, 0x0b6d3b6d, 0xfada3bda, 0x58003a00, 0xa9b73ab7,
+    0xadb739b7, 0x5c003900, 0xfeda38da, 0x0f6d386d, 0xf6da3eda,
+    0x076d3e6d, 0xa5b73fb7, 0x54003f00, 0x50003c00, 0xa1b73cb7,
+    0x036d3d6d, 0xf2da3dda, 0x40003000, 0xb1b730b7, 0x136d316d,
+    0xe2da31da, 0xe6da32da, 0x176d326d, 0xb5b733b7, 0x44003300,
+    0xbdb735b7, 0x4c003500, 0xeeda34da, 0x1f6d346d, 0x1b6d376d,
+    0xeada37da, 0x48003600, 0xb9b736b7, 0x8b6d5b6d, 0x7ada5bda,
+    0xd8005a00, 0x29b75ab7, 0x2db759b7, 0xdc005900, 0x7eda58da,
+    0x8f6d586d, 0x76da5eda, 0x876d5e6d, 0x25b75fb7, 0xd4005f00,
+    0xd0005c00, 0x21b75cb7, 0x836d5d6d, 0x72da5dda, 0xc0005000,
+    0x31b750b7, 0x936d516d, 0x62da51da, 0x66da52da, 0x976d526d,
+    0x35b753b7, 0xc4005300, 0x3db755b7, 0xcc005500, 0x6eda54da,
+    0x9f6d546d, 0x9b6d576d, 0x6ada57da, 0xc8005600, 0x39b756b7,
+    0x1db74db7, 0xec004d00, 0x4eda4cda, 0xbf6d4c6d, 0xbb6d4f6d,
+    0x4ada4fda, 0xe8004e00, 0x19b74eb7, 0xe0004800, 0x11b748b7,
+    0xb36d496d, 0x42da49da, 0x46da4ada, 0xb76d4a6d, 0x15b74bb7,
+    0xe4004b00, 0x56da46da, 0xa76d466d, 0x05b747b7, 0xf4004700,
+    0xf0004400, 0x01b744b7, 0xa36d456d, 0x52da45da, 0xab6d436d,
+    0x5ada43da, 0xf8004200, 0x09b742b7, 0x0db741b7, 0xfc004100,
+    0x5eda40da, 0xaf6d406d, 0x16da76da, 0xe76d766d, 0x45b777b7,
+    0xb4007700, 0xb0007400, 0x41b774b7, 0xe36d756d, 0x12da75da,
+    0xeb6d736d, 0x1ada73da, 0xb8007200, 0x49b772b7, 0x4db771b7,
+    0xbc007100, 0x1eda70da, 0xef6d706d, 0x5db77db7, 0xac007d00,
+    0x0eda7cda, 0xff6d7c6d, 0xfb6d7f6d, 0x0ada7fda, 0xa8007e00,
+    0x59b77eb7, 0xa0007800, 0x51b778b7, 0xf36d796d, 0x02da79da,
+    0x06da7ada, 0xf76d7a6d, 0x55b77bb7, 0xa4007b00, 0x80006000,
+    0x71b760b7, 0xd36d616d, 0x22da61da, 0x26da62da, 0xd76d626d,
+    0x75b763b7, 0x84006300, 0x7db765b7, 0x8c006500, 0x2eda64da,
+    0xdf6d646d, 0xdb6d676d, 0x2ada67da, 0x88006600, 0x79b766b7,
+    0xcb6d6b6d, 0x3ada6bda, 0x98006a00, 0x69b76ab7, 0x6db769b7,
+    0x9c006900, 0x3eda68da, 0xcf6d686d, 0x36da6eda, 0xc76d6e6d,
+    0x65b76fb7, 0x94006f00, 0x90006c00, 0x61b76cb7, 0xc36d6d6d,
+    0x32da6dda},
+   {0x00000000, 0xa6d9b6d9, 0xfdb06db1, 0x5b69db68, 0x4b63db61,
+    0xedba6db8, 0xb6d3b6d0, 0x100a0009, 0x96c7b6c2, 0x301e001b,
+    0x6b77db73, 0xcdae6daa, 0xdda46da3, 0x7b7ddb7a, 0x20140012,
+    0x86cdb6cb, 0x9d8c6d87, 0x3b55db5e, 0x603c0036, 0xc6e5b6ef,
+    0xd6efb6e6, 0x7036003f, 0x2b5fdb57, 0x8d866d8e, 0x0b4bdb45,
+    0xad926d9c, 0xf6fbb6f4, 0x5022002d, 0x40280024, 0xe6f1b6fd,
+    0xbd986d95, 0x1b41db4c, 0x8b1bdb0d, 0x2dc26dd4, 0x76abb6bc,
+    0xd0720065, 0xc078006c, 0x66a1b6b5, 0x3dc86ddd, 0x9b11db04,
+    0x1ddc6dcf, 0xbb05db16, 0xe06c007e, 0x46b5b6a7, 0x56bfb6ae,
+    0xf0660077, 0xab0fdb1f, 0x0dd66dc6, 0x1697b68a, 0xb04e0053,
+    0xeb27db3b, 0x4dfe6de2, 0x5df46deb, 0xfb2ddb32, 0xa044005a,
+    0x069db683, 0x80500048, 0x2689b691, 0x7de06df9, 0xdb39db20,
+    0xcb33db29, 0x6dea6df0, 0x3683b698, 0x905a0041, 0xa634b619,
+    0x00ed00c0, 0x5b84dba8, 0xfd5d6d71, 0xed576d78, 0x4b8edba1,
+    0x10e700c9, 0xb63eb610, 0x30f300db, 0x962ab602, 0xcd436d6a,
+    0x6b9adbb3, 0x7b90dbba, 0xdd496d63, 0x8620b60b, 0x20f900d2,
+    0x3bb8db9e, 0x9d616d47, 0xc608b62f, 0x60d100f6, 0x70db00ff,
+    0xd602b626, 0x8d6b6d4e, 0x2bb2db97, 0xad7f6d5c, 0x0ba6db85,
+    0x50cf00ed, 0xf616b634, 0xe61cb63d, 0x40c500e4, 0x1bacdb8c,
+    0xbd756d55, 0x2d2f6d14, 0x8bf6dbcd, 0xd09f00a5, 0x7646b67c,
+    0x664cb675, 0xc09500ac, 0x9bfcdbc4, 0x3d256d1d, 0xbbe8dbd6,
+    0x1d316d0f, 0x4658b667, 0xe08100be, 0xf08b00b7, 0x5652b66e,
+    0x0d3b6d06, 0xabe2dbdf, 0xb0a30093, 0x167ab64a, 0x4d136d22,
+    0xebcadbfb, 0xfbc0dbf2, 0x5d196d2b, 0x0670b643, 0xa0a9009a,
+    0x2664b651, 0x80bd0088, 0xdbd4dbe0, 0x7d0d6d39, 0x6d076d30,
+    0xcbdedbe9, 0x90b70081, 0x366eb658, 0xfc6a6c31, 0x5ab3dae8,
+    0x01da0180, 0xa703b759, 0xb709b750, 0x11d00189, 0x4ab9dae1,
+    0xec606c38, 0x6aaddaf3, 0xcc746c2a, 0x971db742, 0x31c4019b,
+    0x21ce0192, 0x8717b74b, 0xdc7e6c23, 0x7aa7dafa, 0x61e601b6,
+    0xc73fb76f, 0x9c566c07, 0x3a8fdade, 0x2a85dad7, 0x8c5c6c0e,
+    0xd735b766, 0x71ec01bf, 0xf721b774, 0x51f801ad, 0x0a91dac5,
+    0xac486c1c, 0xbc426c15, 0x1a9bdacc, 0x41f201a4, 0xe72bb77d,
+    0x7771b73c, 0xd1a801e5, 0x8ac1da8d, 0x2c186c54, 0x3c126c5d,
+    0x9acbda84, 0xc1a201ec, 0x677bb735, 0xe1b601fe, 0x476fb727,
+    0x1c066c4f, 0xbadfda96, 0xaad5da9f, 0x0c0c6c46, 0x5765b72e,
+    0xf1bc01f7, 0xeafddabb, 0x4c246c62, 0x174db70a, 0xb19401d3,
+    0xa19e01da, 0x0747b703, 0x5c2e6c6b, 0xfaf7dab2, 0x7c3a6c79,
+    0xdae3daa0, 0x818a01c8, 0x2753b711, 0x3759b718, 0x918001c1,
+    0xcae9daa9, 0x6c306c70, 0x5a5eda28, 0xfc876cf1, 0xa7eeb799,
+    0x01370140, 0x113d0149, 0xb7e4b790, 0xec8d6cf8, 0x4a54da21,
+    0xcc996cea, 0x6a40da33, 0x3129015b, 0x97f0b782, 0x87fab78b,
+    0x21230152, 0x7a4ada3a, 0xdc936ce3, 0xc7d2b7af, 0x610b0176,
+    0x3a62da1e, 0x9cbb6cc7, 0x8cb16cce, 0x2a68da17, 0x7101017f,
+    0xd7d8b7a6, 0x5115016d, 0xf7ccb7b4, 0xaca56cdc, 0x0a7cda05,
+    0x1a76da0c, 0xbcaf6cd5, 0xe7c6b7bd, 0x411f0164, 0xd1450125,
+    0x779cb7fc, 0x2cf56c94, 0x8a2cda4d, 0x9a26da44, 0x3cff6c9d,
+    0x6796b7f5, 0xc14f012c, 0x4782b7e7, 0xe15b013e, 0xba32da56,
+    0x1ceb6c8f, 0x0ce16c86, 0xaa38da5f, 0xf1510137, 0x5788b7ee,
+    0x4cc96ca2, 0xea10da7b, 0xb1790113, 0x17a0b7ca, 0x07aab7c3,
+    0xa173011a, 0xfa1ada72, 0x5cc36cab, 0xda0eda60, 0x7cd76cb9,
+    0x27beb7d1, 0x81670108, 0x916d0101, 0x37b4b7d8, 0x6cdd6cb0,
+    0xca04da69},
+   {0x00000000, 0x48d7d861, 0x91afb0c2, 0xd97868a3, 0x935c6187,
+    0xdb8bb9e6, 0x02f3d145, 0x4a240924, 0x96bbc30d, 0xde6c1b6c,
+    0x071473cf, 0x4fc3abae, 0x05e7a28a, 0x4d307aeb, 0x94481248,
+    0xdc9fca29, 0x9d748619, 0xd5a35e78, 0x0cdb36db, 0x440ceeba,
+    0x0e28e79e, 0x46ff3fff, 0x9f87575c, 0xd7508f3d, 0x0bcf4514,
+    0x43189d75, 0x9a60f5d6, 0xd2b72db7, 0x98932493, 0xd044fcf2,
+    0x093c9451, 0x41eb4c30, 0x8aea0c31, 0xc23dd450, 0x1b45bcf3,
+    0x53926492, 0x19b66db6, 0x5161b5d7, 0x8819dd74, 0xc0ce0515,
+    0x1c51cf3c, 0x5486175d, 0x8dfe7ffe, 0xc529a79f, 0x8f0daebb,
+    0xc7da76da, 0x1ea21e79, 0x5675c618, 0x179e8a28, 0x5f495249,
+    0x86313aea, 0xcee6e28b, 0x84c2ebaf, 0xcc1533ce, 0x156d5b6d,
+    0x5dba830c, 0x81254925, 0xc9f29144, 0x108af9e7, 0x585d2186,
+    0x127928a2, 0x5aaef0c3, 0x83d69860, 0xcb014001, 0xa5d71861,
+    0xed00c000, 0x3478a8a3, 0x7caf70c2, 0x368b79e6, 0x7e5ca187,
+    0xa724c924, 0xeff31145, 0x336cdb6c, 0x7bbb030d, 0xa2c36bae,
+    0xea14b3cf, 0xa030baeb, 0xe8e7628a, 0x319f0a29, 0x7948d248,
+    0x38a39e78, 0x70744619, 0xa90c2eba, 0xe1dbf6db, 0xabffffff,
+    0xe328279e, 0x3a504f3d, 0x7287975c, 0xae185d75, 0xe6cf8514,
+    0x3fb7edb7, 0x776035d6, 0x3d443cf2, 0x7593e493, 0xaceb8c30,
+    0xe43c5451, 0x2f3d1450, 0x67eacc31, 0xbe92a492, 0xf6457cf3,
+    0xbc6175d7, 0xf4b6adb6, 0x2dcec515, 0x65191d74, 0xb986d75d,
+    0xf1510f3c, 0x2829679f, 0x60febffe, 0x2adab6da, 0x620d6ebb,
+    0xbb750618, 0xf3a2de79, 0xb2499249, 0xfa9e4a28, 0x23e6228b,
+    0x6b31faea, 0x2115f3ce, 0x69c22baf, 0xb0ba430c, 0xf86d9b6d,
+    0x24f25144, 0x6c258925, 0xb55de186, 0xfd8a39e7, 0xb7ae30c3,
+    0xff79e8a2, 0x26018001, 0x6ed65860, 0xfbad30c1, 0xb37ae8a0,
+    0x6a028003, 0x22d55862, 0x68f15146, 0x20268927, 0xf95ee184,
+    0xb18939e5, 0x6d16f3cc, 0x25c12bad, 0xfcb9430e, 0xb46e9b6f,
+    0xfe4a924b, 0xb69d4a2a, 0x6fe52289, 0x2732fae8, 0x66d9b6d8,
+    0x2e0e6eb9, 0xf776061a, 0xbfa1de7b, 0xf585d75f, 0xbd520f3e,
+    0x642a679d, 0x2cfdbffc, 0xf06275d5, 0xb8b5adb4, 0x61cdc517,
+    0x291a1d76, 0x633e1452, 0x2be9cc33, 0xf291a490, 0xba467cf1,
+    0x71473cf0, 0x3990e491, 0xe0e88c32, 0xa83f5453, 0xe21b5d77,
+    0xaacc8516, 0x73b4edb5, 0x3b6335d4, 0xe7fcfffd, 0xaf2b279c,
+    0x76534f3f, 0x3e84975e, 0x74a09e7a, 0x3c77461b, 0xe50f2eb8,
+    0xadd8f6d9, 0xec33bae9, 0xa4e46288, 0x7d9c0a2b, 0x354bd24a,
+    0x7f6fdb6e, 0x37b8030f, 0xeec06bac, 0xa617b3cd, 0x7a8879e4,
+    0x325fa185, 0xeb27c926, 0xa3f01147, 0xe9d41863, 0xa103c002,
+    0x787ba8a1, 0x30ac70c0, 0x5e7a28a0, 0x16adf0c1, 0xcfd59862,
+    0x87024003, 0xcd264927, 0x85f19146, 0x5c89f9e5, 0x145e2184,
+    0xc8c1ebad, 0x801633cc, 0x596e5b6f, 0x11b9830e, 0x5b9d8a2a,
+    0x134a524b, 0xca323ae8, 0x82e5e289, 0xc30eaeb9, 0x8bd976d8,
+    0x52a11e7b, 0x1a76c61a, 0x5052cf3e, 0x1885175f, 0xc1fd7ffc,
+    0x892aa79d, 0x55b56db4, 0x1d62b5d5, 0xc41add76, 0x8ccd0517,
+    0xc6e90c33, 0x8e3ed452, 0x5746bcf1, 0x1f916490, 0xd4902491,
+    0x9c47fcf0, 0x453f9453, 0x0de84c32, 0x47cc4516, 0x0f1b9d77,
+    0xd663f5d4, 0x9eb42db5, 0x422be79c, 0x0afc3ffd, 0xd384575e,
+    0x9b538f3f, 0xd177861b, 0x99a05e7a, 0x40d836d9, 0x080feeb8,
+    0x49e4a288, 0x01337ae9, 0xd84b124a, 0x909cca2b, 0xdab8c30f,
+    0x926f1b6e, 0x4b1773cd, 0x03c0abac, 0xdf5f6185, 0x9788b9e4,
+    0x4ef0d147, 0x06270926, 0x4c030002, 0x04d4d863, 0xddacb0c0,
+    0x957b68a1}};
+
+static const word_t crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x61d8d74800000000, 0xc2b0af9100000000,
+    0xa36878d900000000, 0x87615c9300000000, 0xe6b98bdb00000000,
+    0x45d1f30200000000, 0x2409244a00000000, 0x0dc3bb9600000000,
+    0x6c1b6cde00000000, 0xcf73140700000000, 0xaeabc34f00000000,
+    0x8aa2e70500000000, 0xeb7a304d00000000, 0x4812489400000000,
+    0x29ca9fdc00000000, 0x1986749d00000000, 0x785ea3d500000000,
+    0xdb36db0c00000000, 0xbaee0c4400000000, 0x9ee7280e00000000,
+    0xff3fff4600000000, 0x5c57879f00000000, 0x3d8f50d700000000,
+    0x1445cf0b00000000, 0x759d184300000000, 0xd6f5609a00000000,
+    0xb72db7d200000000, 0x9324939800000000, 0xf2fc44d000000000,
+    0x51943c0900000000, 0x304ceb4100000000, 0x310cea8a00000000,
+    0x50d43dc200000000, 0xf3bc451b00000000, 0x9264925300000000,
+    0xb66db61900000000, 0xd7b5615100000000, 0x74dd198800000000,
+    0x1505cec000000000, 0x3ccf511c00000000, 0x5d17865400000000,
+    0xfe7ffe8d00000000, 0x9fa729c500000000, 0xbbae0d8f00000000,
+    0xda76dac700000000, 0x791ea21e00000000, 0x18c6755600000000,
+    0x288a9e1700000000, 0x4952495f00000000, 0xea3a318600000000,
+    0x8be2e6ce00000000, 0xafebc28400000000, 0xce3315cc00000000,
+    0x6d5b6d1500000000, 0x0c83ba5d00000000, 0x2549258100000000,
+    0x4491f2c900000000, 0xe7f98a1000000000, 0x86215d5800000000,
+    0xa228791200000000, 0xc3f0ae5a00000000, 0x6098d68300000000,
+    0x014001cb00000000, 0x6118d7a500000000, 0x00c000ed00000000,
+    0xa3a8783400000000, 0xc270af7c00000000, 0xe6798b3600000000,
+    0x87a15c7e00000000, 0x24c924a700000000, 0x4511f3ef00000000,
+    0x6cdb6c3300000000, 0x0d03bb7b00000000, 0xae6bc3a200000000,
+    0xcfb314ea00000000, 0xebba30a000000000, 0x8a62e7e800000000,
+    0x290a9f3100000000, 0x48d2487900000000, 0x789ea33800000000,
+    0x1946747000000000, 0xba2e0ca900000000, 0xdbf6dbe100000000,
+    0xffffffab00000000, 0x9e2728e300000000, 0x3d4f503a00000000,
+    0x5c97877200000000, 0x755d18ae00000000, 0x1485cfe600000000,
+    0xb7edb73f00000000, 0xd635607700000000, 0xf23c443d00000000,
+    0x93e4937500000000, 0x308cebac00000000, 0x51543ce400000000,
+    0x50143d2f00000000, 0x31ccea6700000000, 0x92a492be00000000,
+    0xf37c45f600000000, 0xd77561bc00000000, 0xb6adb6f400000000,
+    0x15c5ce2d00000000, 0x741d196500000000, 0x5dd786b900000000,
+    0x3c0f51f100000000, 0x9f67292800000000, 0xfebffe6000000000,
+    0xdab6da2a00000000, 0xbb6e0d6200000000, 0x180675bb00000000,
+    0x79dea2f300000000, 0x499249b200000000, 0x284a9efa00000000,
+    0x8b22e62300000000, 0xeafa316b00000000, 0xcef3152100000000,
+    0xaf2bc26900000000, 0x0c43bab000000000, 0x6d9b6df800000000,
+    0x4451f22400000000, 0x2589256c00000000, 0x86e15db500000000,
+    0xe7398afd00000000, 0xc330aeb700000000, 0xa2e879ff00000000,
+    0x0180012600000000, 0x6058d66e00000000, 0xc130adfb00000000,
+    0xa0e87ab300000000, 0x0380026a00000000, 0x6258d52200000000,
+    0x4651f16800000000, 0x2789262000000000, 0x84e15ef900000000,
+    0xe53989b100000000, 0xccf3166d00000000, 0xad2bc12500000000,
+    0x0e43b9fc00000000, 0x6f9b6eb400000000, 0x4b924afe00000000,
+    0x2a4a9db600000000, 0x8922e56f00000000, 0xe8fa322700000000,
+    0xd8b6d96600000000, 0xb96e0e2e00000000, 0x1a0676f700000000,
+    0x7bdea1bf00000000, 0x5fd785f500000000, 0x3e0f52bd00000000,
+    0x9d672a6400000000, 0xfcbffd2c00000000, 0xd57562f000000000,
+    0xb4adb5b800000000, 0x17c5cd6100000000, 0x761d1a2900000000,
+    0x52143e6300000000, 0x33cce92b00000000, 0x90a491f200000000,
+    0xf17c46ba00000000, 0xf03c477100000000, 0x91e4903900000000,
+    0x328ce8e000000000, 0x53543fa800000000, 0x775d1be200000000,
+    0x1685ccaa00000000, 0xb5edb47300000000, 0xd435633b00000000,
+    0xfdfffce700000000, 0x9c272baf00000000, 0x3f4f537600000000,
+    0x5e97843e00000000, 0x7a9ea07400000000, 0x1b46773c00000000,
+    0xb82e0fe500000000, 0xd9f6d8ad00000000, 0xe9ba33ec00000000,
+    0x8862e4a400000000, 0x2b0a9c7d00000000, 0x4ad24b3500000000,
+    0x6edb6f7f00000000, 0x0f03b83700000000, 0xac6bc0ee00000000,
+    0xcdb317a600000000, 0xe479887a00000000, 0x85a15f3200000000,
+    0x26c927eb00000000, 0x4711f0a300000000, 0x6318d4e900000000,
+    0x02c003a100000000, 0xa1a87b7800000000, 0xc070ac3000000000,
+    0xa0287a5e00000000, 0xc1f0ad1600000000, 0x6298d5cf00000000,
+    0x0340028700000000, 0x274926cd00000000, 0x4691f18500000000,
+    0xe5f9895c00000000, 0x84215e1400000000, 0xadebc1c800000000,
+    0xcc33168000000000, 0x6f5b6e5900000000, 0x0e83b91100000000,
+    0x2a8a9d5b00000000, 0x4b524a1300000000, 0xe83a32ca00000000,
+    0x89e2e58200000000, 0xb9ae0ec300000000, 0xd876d98b00000000,
+    0x7b1ea15200000000, 0x1ac6761a00000000, 0x3ecf525000000000,
+    0x5f17851800000000, 0xfc7ffdc100000000, 0x9da72a8900000000,
+    0xb46db55500000000, 0xd5b5621d00000000, 0x76dd1ac400000000,
+    0x1705cd8c00000000, 0x330ce9c600000000, 0x52d43e8e00000000,
+    0xf1bc465700000000, 0x9064911f00000000, 0x912490d400000000,
+    0xf0fc479c00000000, 0x53943f4500000000, 0x324ce80d00000000,
+    0x1645cc4700000000, 0x779d1b0f00000000, 0xd4f563d600000000,
+    0xb52db49e00000000, 0x9ce72b4200000000, 0xfd3ffc0a00000000,
+    0x5e5784d300000000, 0x3f8f539b00000000, 0x1b8677d100000000,
+    0x7a5ea09900000000, 0xd936d84000000000, 0xb8ee0f0800000000,
+    0x88a2e44900000000, 0xe97a330100000000, 0x4a124bd800000000,
+    0x2bca9c9000000000, 0x0fc3b8da00000000, 0x6e1b6f9200000000,
+    0xcd73174b00000000, 0xacabc00300000000, 0x85615fdf00000000,
+    0xe4b9889700000000, 0x47d1f04e00000000, 0x2609270600000000,
+    0x0200034c00000000, 0x63d8d40400000000, 0xc0b0acdd00000000,
+    0xa1687b9500000000},
+   {0x0000000000000000, 0xd9b6d9a600000000, 0xb16db0fd00000000,
+    0x68db695b00000000, 0x61db634b00000000, 0xb86dbaed00000000,
+    0xd0b6d3b600000000, 0x09000a1000000000, 0xc2b6c79600000000,
+    0x1b001e3000000000, 0x73db776b00000000, 0xaa6daecd00000000,
+    0xa36da4dd00000000, 0x7adb7d7b00000000, 0x1200142000000000,
+    0xcbb6cd8600000000, 0x876d8c9d00000000, 0x5edb553b00000000,
+    0x36003c6000000000, 0xefb6e5c600000000, 0xe6b6efd600000000,
+    0x3f00367000000000, 0x57db5f2b00000000, 0x8e6d868d00000000,
+    0x45db4b0b00000000, 0x9c6d92ad00000000, 0xf4b6fbf600000000,
+    0x2d00225000000000, 0x2400284000000000, 0xfdb6f1e600000000,
+    0x956d98bd00000000, 0x4cdb411b00000000, 0x0ddb1b8b00000000,
+    0xd46dc22d00000000, 0xbcb6ab7600000000, 0x650072d000000000,
+    0x6c0078c000000000, 0xb5b6a16600000000, 0xdd6dc83d00000000,
+    0x04db119b00000000, 0xcf6ddc1d00000000, 0x16db05bb00000000,
+    0x7e006ce000000000, 0xa7b6b54600000000, 0xaeb6bf5600000000,
+    0x770066f000000000, 0x1fdb0fab00000000, 0xc66dd60d00000000,
+    0x8ab6971600000000, 0x53004eb000000000, 0x3bdb27eb00000000,
+    0xe26dfe4d00000000, 0xeb6df45d00000000, 0x32db2dfb00000000,
+    0x5a0044a000000000, 0x83b69d0600000000, 0x4800508000000000,
+    0x91b6892600000000, 0xf96de07d00000000, 0x20db39db00000000,
+    0x29db33cb00000000, 0xf06dea6d00000000, 0x98b6833600000000,
+    0x41005a9000000000, 0x19b634a600000000, 0xc000ed0000000000,
+    0xa8db845b00000000, 0x716d5dfd00000000, 0x786d57ed00000000,
+    0xa1db8e4b00000000, 0xc900e71000000000, 0x10b63eb600000000,
+    0xdb00f33000000000, 0x02b62a9600000000, 0x6a6d43cd00000000,
+    0xb3db9a6b00000000, 0xbadb907b00000000, 0x636d49dd00000000,
+    0x0bb6208600000000, 0xd200f92000000000, 0x9edbb83b00000000,
+    0x476d619d00000000, 0x2fb608c600000000, 0xf600d16000000000,
+    0xff00db7000000000, 0x26b602d600000000, 0x4e6d6b8d00000000,
+    0x97dbb22b00000000, 0x5c6d7fad00000000, 0x85dba60b00000000,
+    0xed00cf5000000000, 0x34b616f600000000, 0x3db61ce600000000,
+    0xe400c54000000000, 0x8cdbac1b00000000, 0x556d75bd00000000,
+    0x146d2f2d00000000, 0xcddbf68b00000000, 0xa5009fd000000000,
+    0x7cb6467600000000, 0x75b64c6600000000, 0xac0095c000000000,
+    0xc4dbfc9b00000000, 0x1d6d253d00000000, 0xd6dbe8bb00000000,
+    0x0f6d311d00000000, 0x67b6584600000000, 0xbe0081e000000000,
+    0xb7008bf000000000, 0x6eb6525600000000, 0x066d3b0d00000000,
+    0xdfdbe2ab00000000, 0x9300a3b000000000, 0x4ab67a1600000000,
+    0x226d134d00000000, 0xfbdbcaeb00000000, 0xf2dbc0fb00000000,
+    0x2b6d195d00000000, 0x43b6700600000000, 0x9a00a9a000000000,
+    0x51b6642600000000, 0x8800bd8000000000, 0xe0dbd4db00000000,
+    0x396d0d7d00000000, 0x306d076d00000000, 0xe9dbdecb00000000,
+    0x8100b79000000000, 0x58b66e3600000000, 0x316c6afc00000000,
+    0xe8dab35a00000000, 0x8001da0100000000, 0x59b703a700000000,
+    0x50b709b700000000, 0x8901d01100000000, 0xe1dab94a00000000,
+    0x386c60ec00000000, 0xf3daad6a00000000, 0x2a6c74cc00000000,
+    0x42b71d9700000000, 0x9b01c43100000000, 0x9201ce2100000000,
+    0x4bb7178700000000, 0x236c7edc00000000, 0xfadaa77a00000000,
+    0xb601e66100000000, 0x6fb73fc700000000, 0x076c569c00000000,
+    0xdeda8f3a00000000, 0xd7da852a00000000, 0x0e6c5c8c00000000,
+    0x66b735d700000000, 0xbf01ec7100000000, 0x74b721f700000000,
+    0xad01f85100000000, 0xc5da910a00000000, 0x1c6c48ac00000000,
+    0x156c42bc00000000, 0xccda9b1a00000000, 0xa401f24100000000,
+    0x7db72be700000000, 0x3cb7717700000000, 0xe501a8d100000000,
+    0x8ddac18a00000000, 0x546c182c00000000, 0x5d6c123c00000000,
+    0x84dacb9a00000000, 0xec01a2c100000000, 0x35b77b6700000000,
+    0xfe01b6e100000000, 0x27b76f4700000000, 0x4f6c061c00000000,
+    0x96dadfba00000000, 0x9fdad5aa00000000, 0x466c0c0c00000000,
+    0x2eb7655700000000, 0xf701bcf100000000, 0xbbdafdea00000000,
+    0x626c244c00000000, 0x0ab74d1700000000, 0xd30194b100000000,
+    0xda019ea100000000, 0x03b7470700000000, 0x6b6c2e5c00000000,
+    0xb2daf7fa00000000, 0x796c3a7c00000000, 0xa0dae3da00000000,
+    0xc8018a8100000000, 0x11b7532700000000, 0x18b7593700000000,
+    0xc101809100000000, 0xa9dae9ca00000000, 0x706c306c00000000,
+    0x28da5e5a00000000, 0xf16c87fc00000000, 0x99b7eea700000000,
+    0x4001370100000000, 0x49013d1100000000, 0x90b7e4b700000000,
+    0xf86c8dec00000000, 0x21da544a00000000, 0xea6c99cc00000000,
+    0x33da406a00000000, 0x5b01293100000000, 0x82b7f09700000000,
+    0x8bb7fa8700000000, 0x5201232100000000, 0x3ada4a7a00000000,
+    0xe36c93dc00000000, 0xafb7d2c700000000, 0x76010b6100000000,
+    0x1eda623a00000000, 0xc76cbb9c00000000, 0xce6cb18c00000000,
+    0x17da682a00000000, 0x7f01017100000000, 0xa6b7d8d700000000,
+    0x6d01155100000000, 0xb4b7ccf700000000, 0xdc6ca5ac00000000,
+    0x05da7c0a00000000, 0x0cda761a00000000, 0xd56cafbc00000000,
+    0xbdb7c6e700000000, 0x64011f4100000000, 0x250145d100000000,
+    0xfcb79c7700000000, 0x946cf52c00000000, 0x4dda2c8a00000000,
+    0x44da269a00000000, 0x9d6cff3c00000000, 0xf5b7966700000000,
+    0x2c014fc100000000, 0xe7b7824700000000, 0x3e015be100000000,
+    0x56da32ba00000000, 0x8f6ceb1c00000000, 0x866ce10c00000000,
+    0x5fda38aa00000000, 0x370151f100000000, 0xeeb7885700000000,
+    0xa26cc94c00000000, 0x7bda10ea00000000, 0x130179b100000000,
+    0xcab7a01700000000, 0xc3b7aa0700000000, 0x1a0173a100000000,
+    0x72da1afa00000000, 0xab6cc35c00000000, 0x60da0eda00000000,
+    0xb96cd77c00000000, 0xd1b7be2700000000, 0x0801678100000000,
+    0x01016d9100000000, 0xd8b7b43700000000, 0xb06cdd6c00000000,
+    0x69da04ca00000000},
+   {0x0000000000000000, 0xb700b7f100000000, 0x6d016d5300000000,
+    0xda01daa200000000, 0xda02daa600000000, 0x6d026d5700000000,
+    0xb703b7f500000000, 0x0003000400000000, 0xb705b7fd00000000,
+    0x0005000c00000000, 0xda04daae00000000, 0x6d046d5f00000000,
+    0x6d076d5b00000000, 0xda07daaa00000000, 0x0006000800000000,
+    0xb706b7f900000000, 0x6d0b6d4b00000000, 0xda0bdaba00000000,
+    0x000a001800000000, 0xb70ab7e900000000, 0xb709b7ed00000000,
+    0x0009001c00000000, 0xda08dabe00000000, 0x6d086d4f00000000,
+    0xda0edab600000000, 0x6d0e6d4700000000, 0xb70fb7e500000000,
+    0x000f001400000000, 0x000c001000000000, 0xb70cb7e100000000,
+    0x6d0d6d4300000000, 0xda0ddab200000000, 0xda16da9600000000,
+    0x6d166d6700000000, 0xb717b7c500000000, 0x0017003400000000,
+    0x0014003000000000, 0xb714b7c100000000, 0x6d156d6300000000,
+    0xda15da9200000000, 0x6d136d6b00000000, 0xda13da9a00000000,
+    0x0012003800000000, 0xb712b7c900000000, 0xb711b7cd00000000,
+    0x0011003c00000000, 0xda10da9e00000000, 0x6d106d6f00000000,
+    0xb71db7dd00000000, 0x001d002c00000000, 0xda1cda8e00000000,
+    0x6d1c6d7f00000000, 0x6d1f6d7b00000000, 0xda1fda8a00000000,
+    0x001e002800000000, 0xb71eb7d900000000, 0x0018002000000000,
+    0xb718b7d100000000, 0x6d196d7300000000, 0xda19da8200000000,
+    0xda1ada8600000000, 0x6d1a6d7700000000, 0xb71bb7d500000000,
+    0x001b002400000000, 0xb72db79d00000000, 0x002d006c00000000,
+    0xda2cdace00000000, 0x6d2c6d3f00000000, 0x6d2f6d3b00000000,
+    0xda2fdaca00000000, 0x002e006800000000, 0xb72eb79900000000,
+    0x0028006000000000, 0xb728b79100000000, 0x6d296d3300000000,
+    0xda29dac200000000, 0xda2adac600000000, 0x6d2a6d3700000000,
+    0xb72bb79500000000, 0x002b006400000000, 0xda26dad600000000,
+    0x6d266d2700000000, 0xb727b78500000000, 0x0027007400000000,
+    0x0024007000000000, 0xb724b78100000000, 0x6d256d2300000000,
+    0xda25dad200000000, 0x6d236d2b00000000, 0xda23dada00000000,
+    0x0022007800000000, 0xb722b78900000000, 0xb721b78d00000000,
+    0x0021007c00000000, 0xda20dade00000000, 0x6d206d2f00000000,
+    0x6d3b6d0b00000000, 0xda3bdafa00000000, 0x003a005800000000,
+    0xb73ab7a900000000, 0xb739b7ad00000000, 0x0039005c00000000,
+    0xda38dafe00000000, 0x6d386d0f00000000, 0xda3edaf600000000,
+    0x6d3e6d0700000000, 0xb73fb7a500000000, 0x003f005400000000,
+    0x003c005000000000, 0xb73cb7a100000000, 0x6d3d6d0300000000,
+    0xda3ddaf200000000, 0x0030004000000000, 0xb730b7b100000000,
+    0x6d316d1300000000, 0xda31dae200000000, 0xda32dae600000000,
+    0x6d326d1700000000, 0xb733b7b500000000, 0x0033004400000000,
+    0xb735b7bd00000000, 0x0035004c00000000, 0xda34daee00000000,
+    0x6d346d1f00000000, 0x6d376d1b00000000, 0xda37daea00000000,
+    0x0036004800000000, 0xb736b7b900000000, 0x6d5b6d8b00000000,
+    0xda5bda7a00000000, 0x005a00d800000000, 0xb75ab72900000000,
+    0xb759b72d00000000, 0x005900dc00000000, 0xda58da7e00000000,
+    0x6d586d8f00000000, 0xda5eda7600000000, 0x6d5e6d8700000000,
+    0xb75fb72500000000, 0x005f00d400000000, 0x005c00d000000000,
+    0xb75cb72100000000, 0x6d5d6d8300000000, 0xda5dda7200000000,
+    0x005000c000000000, 0xb750b73100000000, 0x6d516d9300000000,
+    0xda51da6200000000, 0xda52da6600000000, 0x6d526d9700000000,
+    0xb753b73500000000, 0x005300c400000000, 0xb755b73d00000000,
+    0x005500cc00000000, 0xda54da6e00000000, 0x6d546d9f00000000,
+    0x6d576d9b00000000, 0xda57da6a00000000, 0x005600c800000000,
+    0xb756b73900000000, 0xb74db71d00000000, 0x004d00ec00000000,
+    0xda4cda4e00000000, 0x6d4c6dbf00000000, 0x6d4f6dbb00000000,
+    0xda4fda4a00000000, 0x004e00e800000000, 0xb74eb71900000000,
+    0x004800e000000000, 0xb748b71100000000, 0x6d496db300000000,
+    0xda49da4200000000, 0xda4ada4600000000, 0x6d4a6db700000000,
+    0xb74bb71500000000, 0x004b00e400000000, 0xda46da5600000000,
+    0x6d466da700000000, 0xb747b70500000000, 0x004700f400000000,
+    0x004400f000000000, 0xb744b70100000000, 0x6d456da300000000,
+    0xda45da5200000000, 0x6d436dab00000000, 0xda43da5a00000000,
+    0x004200f800000000, 0xb742b70900000000, 0xb741b70d00000000,
+    0x004100fc00000000, 0xda40da5e00000000, 0x6d406daf00000000,
+    0xda76da1600000000, 0x6d766de700000000, 0xb777b74500000000,
+    0x007700b400000000, 0x007400b000000000, 0xb774b74100000000,
+    0x6d756de300000000, 0xda75da1200000000, 0x6d736deb00000000,
+    0xda73da1a00000000, 0x007200b800000000, 0xb772b74900000000,
+    0xb771b74d00000000, 0x007100bc00000000, 0xda70da1e00000000,
+    0x6d706def00000000, 0xb77db75d00000000, 0x007d00ac00000000,
+    0xda7cda0e00000000, 0x6d7c6dff00000000, 0x6d7f6dfb00000000,
+    0xda7fda0a00000000, 0x007e00a800000000, 0xb77eb75900000000,
+    0x007800a000000000, 0xb778b75100000000, 0x6d796df300000000,
+    0xda79da0200000000, 0xda7ada0600000000, 0x6d7a6df700000000,
+    0xb77bb75500000000, 0x007b00a400000000, 0x0060008000000000,
+    0xb760b77100000000, 0x6d616dd300000000, 0xda61da2200000000,
+    0xda62da2600000000, 0x6d626dd700000000, 0xb763b77500000000,
+    0x0063008400000000, 0xb765b77d00000000, 0x0065008c00000000,
+    0xda64da2e00000000, 0x6d646ddf00000000, 0x6d676ddb00000000,
+    0xda67da2a00000000, 0x0066008800000000, 0xb766b77900000000,
+    0x6d6b6dcb00000000, 0xda6bda3a00000000, 0x006a009800000000,
+    0xb76ab76900000000, 0xb769b76d00000000, 0x0069009c00000000,
+    0xda68da3e00000000, 0x6d686dcf00000000, 0xda6eda3600000000,
+    0x6d6e6dc700000000, 0xb76fb76500000000, 0x006f009400000000,
+    0x006c009000000000, 0xb76cb76100000000, 0x6d6d6dc300000000,
+    0xda6dda3200000000},
+   {0x0000000000000000, 0x0000015000000000, 0x000002a000000000,
+    0x000003f000000000, 0x030007f000000000, 0x030006a000000000,
+    0x0300055000000000, 0x0300040000000000, 0x05000d5000000000,
+    0x05000c0000000000, 0x05000ff000000000, 0x05000ea000000000,
+    0x06000aa000000000, 0x06000bf000000000, 0x0600080000000000,
+    0x0600095000000000, 0x0a001aa000000000, 0x0a001bf000000000,
+    0x0a00180000000000, 0x0a00195000000000, 0x09001d5000000000,
+    0x09001c0000000000, 0x09001ff000000000, 0x09001ea000000000,
+    0x0f0017f000000000, 0x0f0016a000000000, 0x0f00155000000000,
+    0x0f00140000000000, 0x0c00100000000000, 0x0c00115000000000,
+    0x0c0012a000000000, 0x0c0013f000000000, 0x170037f000000000,
+    0x170036a000000000, 0x1700355000000000, 0x1700340000000000,
+    0x1400300000000000, 0x1400315000000000, 0x140032a000000000,
+    0x140033f000000000, 0x12003aa000000000, 0x12003bf000000000,
+    0x1200380000000000, 0x1200395000000000, 0x11003d5000000000,
+    0x11003c0000000000, 0x11003ff000000000, 0x11003ea000000000,
+    0x1d002d5000000000, 0x1d002c0000000000, 0x1d002ff000000000,
+    0x1d002ea000000000, 0x1e002aa000000000, 0x1e002bf000000000,
+    0x1e00280000000000, 0x1e00295000000000, 0x1800200000000000,
+    0x1800215000000000, 0x180022a000000000, 0x180023f000000000,
+    0x1b0027f000000000, 0x1b0026a000000000, 0x1b00255000000000,
+    0x1b00240000000000, 0x2d006d5000000000, 0x2d006c0000000000,
+    0x2d006ff000000000, 0x2d006ea000000000, 0x2e006aa000000000,
+    0x2e006bf000000000, 0x2e00680000000000, 0x2e00695000000000,
+    0x2800600000000000, 0x2800615000000000, 0x280062a000000000,
+    0x280063f000000000, 0x2b0067f000000000, 0x2b0066a000000000,
+    0x2b00655000000000, 0x2b00640000000000, 0x270077f000000000,
+    0x270076a000000000, 0x2700755000000000, 0x2700740000000000,
+    0x2400700000000000, 0x2400715000000000, 0x240072a000000000,
+    0x240073f000000000, 0x22007aa000000000, 0x22007bf000000000,
+    0x2200780000000000, 0x2200795000000000, 0x21007d5000000000,
+    0x21007c0000000000, 0x21007ff000000000, 0x21007ea000000000,
+    0x3a005aa000000000, 0x3a005bf000000000, 0x3a00580000000000,
+    0x3a00595000000000, 0x39005d5000000000, 0x39005c0000000000,
+    0x39005ff000000000, 0x39005ea000000000, 0x3f0057f000000000,
+    0x3f0056a000000000, 0x3f00555000000000, 0x3f00540000000000,
+    0x3c00500000000000, 0x3c00515000000000, 0x3c0052a000000000,
+    0x3c0053f000000000, 0x3000400000000000, 0x3000415000000000,
+    0x300042a000000000, 0x300043f000000000, 0x330047f000000000,
+    0x330046a000000000, 0x3300455000000000, 0x3300440000000000,
+    0x35004d5000000000, 0x35004c0000000000, 0x35004ff000000000,
+    0x35004ea000000000, 0x36004aa000000000, 0x36004bf000000000,
+    0x3600480000000000, 0x3600495000000000, 0x5a00daa000000000,
+    0x5a00dbf000000000, 0x5a00d80000000000, 0x5a00d95000000000,
+    0x5900dd5000000000, 0x5900dc0000000000, 0x5900dff000000000,
+    0x5900dea000000000, 0x5f00d7f000000000, 0x5f00d6a000000000,
+    0x5f00d55000000000, 0x5f00d40000000000, 0x5c00d00000000000,
+    0x5c00d15000000000, 0x5c00d2a000000000, 0x5c00d3f000000000,
+    0x5000c00000000000, 0x5000c15000000000, 0x5000c2a000000000,
+    0x5000c3f000000000, 0x5300c7f000000000, 0x5300c6a000000000,
+    0x5300c55000000000, 0x5300c40000000000, 0x5500cd5000000000,
+    0x5500cc0000000000, 0x5500cff000000000, 0x5500cea000000000,
+    0x5600caa000000000, 0x5600cbf000000000, 0x5600c80000000000,
+    0x5600c95000000000, 0x4d00ed5000000000, 0x4d00ec0000000000,
+    0x4d00eff000000000, 0x4d00eea000000000, 0x4e00eaa000000000,
+    0x4e00ebf000000000, 0x4e00e80000000000, 0x4e00e95000000000,
+    0x4800e00000000000, 0x4800e15000000000, 0x4800e2a000000000,
+    0x4800e3f000000000, 0x4b00e7f000000000, 0x4b00e6a000000000,
+    0x4b00e55000000000, 0x4b00e40000000000, 0x4700f7f000000000,
+    0x4700f6a000000000, 0x4700f55000000000, 0x4700f40000000000,
+    0x4400f00000000000, 0x4400f15000000000, 0x4400f2a000000000,
+    0x4400f3f000000000, 0x4200faa000000000, 0x4200fbf000000000,
+    0x4200f80000000000, 0x4200f95000000000, 0x4100fd5000000000,
+    0x4100fc0000000000, 0x4100fff000000000, 0x4100fea000000000,
+    0x7700b7f000000000, 0x7700b6a000000000, 0x7700b55000000000,
+    0x7700b40000000000, 0x7400b00000000000, 0x7400b15000000000,
+    0x7400b2a000000000, 0x7400b3f000000000, 0x7200baa000000000,
+    0x7200bbf000000000, 0x7200b80000000000, 0x7200b95000000000,
+    0x7100bd5000000000, 0x7100bc0000000000, 0x7100bff000000000,
+    0x7100bea000000000, 0x7d00ad5000000000, 0x7d00ac0000000000,
+    0x7d00aff000000000, 0x7d00aea000000000, 0x7e00aaa000000000,
+    0x7e00abf000000000, 0x7e00a80000000000, 0x7e00a95000000000,
+    0x7800a00000000000, 0x7800a15000000000, 0x7800a2a000000000,
+    0x7800a3f000000000, 0x7b00a7f000000000, 0x7b00a6a000000000,
+    0x7b00a55000000000, 0x7b00a40000000000, 0x6000800000000000,
+    0x6000815000000000, 0x600082a000000000, 0x600083f000000000,
+    0x630087f000000000, 0x630086a000000000, 0x6300855000000000,
+    0x6300840000000000, 0x65008d5000000000, 0x65008c0000000000,
+    0x65008ff000000000, 0x65008ea000000000, 0x66008aa000000000,
+    0x66008bf000000000, 0x6600880000000000, 0x6600895000000000,
+    0x6a009aa000000000, 0x6a009bf000000000, 0x6a00980000000000,
+    0x6a00995000000000, 0x69009d5000000000, 0x69009c0000000000,
+    0x69009ff000000000, 0x69009ea000000000, 0x6f0097f000000000,
+    0x6f0096a000000000, 0x6f00955000000000, 0x6f00940000000000,
+    0x6c00900000000000, 0x6c00915000000000, 0x6c0092a000000000,
+    0x6c0093f000000000},
+   {0x0000000000000000, 0x0001500000000000, 0x0002a00000000000,
+    0x0003f00000000000, 0x0004400100000000, 0x0005100100000000,
+    0x0006e00100000000, 0x0007b00100000000, 0x0008800200000000,
+    0x0009d00200000000, 0x000a200200000000, 0x000b700200000000,
+    0x000cc00300000000, 0x000d900300000000, 0x000e600300000000,
+    0x000f300300000000, 0x0010000500000000, 0x0011500500000000,
+    0x0012a00500000000, 0x0013f00500000000, 0x0014400400000000,
+    0x0015100400000000, 0x0016e00400000000, 0x0017b00400000000,
+    0x0018800700000000, 0x0019d00700000000, 0x001a200700000000,
+    0x001b700700000000, 0x001cc00600000000, 0x001d900600000000,
+    0x001e600600000000, 0x001f300600000000, 0x0020000a00000000,
+    0x0021500a00000000, 0x0022a00a00000000, 0x0023f00a00000000,
+    0x0024400b00000000, 0x0025100b00000000, 0x0026e00b00000000,
+    0x0027b00b00000000, 0x0028800800000000, 0x0029d00800000000,
+    0x002a200800000000, 0x002b700800000000, 0x002cc00900000000,
+    0x002d900900000000, 0x002e600900000000, 0x002f300900000000,
+    0x0030000f00000000, 0x0031500f00000000, 0x0032a00f00000000,
+    0x0033f00f00000000, 0x0034400e00000000, 0x0035100e00000000,
+    0x0036e00e00000000, 0x0037b00e00000000, 0x0038800d00000000,
+    0x0039d00d00000000, 0x003a200d00000000, 0x003b700d00000000,
+    0x003cc00c00000000, 0x003d900c00000000, 0x003e600c00000000,
+    0x003f300c00000000, 0x0040001400000000, 0x0041501400000000,
+    0x0042a01400000000, 0x0043f01400000000, 0x0044401500000000,
+    0x0045101500000000, 0x0046e01500000000, 0x0047b01500000000,
+    0x0048801600000000, 0x0049d01600000000, 0x004a201600000000,
+    0x004b701600000000, 0x004cc01700000000, 0x004d901700000000,
+    0x004e601700000000, 0x004f301700000000, 0x0050001100000000,
+    0x0051501100000000, 0x0052a01100000000, 0x0053f01100000000,
+    0x0054401000000000, 0x0055101000000000, 0x0056e01000000000,
+    0x0057b01000000000, 0x0058801300000000, 0x0059d01300000000,
+    0x005a201300000000, 0x005b701300000000, 0x005cc01200000000,
+    0x005d901200000000, 0x005e601200000000, 0x005f301200000000,
+    0x0060001e00000000, 0x0061501e00000000, 0x0062a01e00000000,
+    0x0063f01e00000000, 0x0064401f00000000, 0x0065101f00000000,
+    0x0066e01f00000000, 0x0067b01f00000000, 0x0068801c00000000,
+    0x0069d01c00000000, 0x006a201c00000000, 0x006b701c00000000,
+    0x006cc01d00000000, 0x006d901d00000000, 0x006e601d00000000,
+    0x006f301d00000000, 0x0070001b00000000, 0x0071501b00000000,
+    0x0072a01b00000000, 0x0073f01b00000000, 0x0074401a00000000,
+    0x0075101a00000000, 0x0076e01a00000000, 0x0077b01a00000000,
+    0x0078801900000000, 0x0079d01900000000, 0x007a201900000000,
+    0x007b701900000000, 0x007cc01800000000, 0x007d901800000000,
+    0x007e601800000000, 0x007f301800000000, 0x0080002800000000,
+    0x0081502800000000, 0x0082a02800000000, 0x0083f02800000000,
+    0x0084402900000000, 0x0085102900000000, 0x0086e02900000000,
+    0x0087b02900000000, 0x0088802a00000000, 0x0089d02a00000000,
+    0x008a202a00000000, 0x008b702a00000000, 0x008cc02b00000000,
+    0x008d902b00000000, 0x008e602b00000000, 0x008f302b00000000,
+    0x0090002d00000000, 0x0091502d00000000, 0x0092a02d00000000,
+    0x0093f02d00000000, 0x0094402c00000000, 0x0095102c00000000,
+    0x0096e02c00000000, 0x0097b02c00000000, 0x0098802f00000000,
+    0x0099d02f00000000, 0x009a202f00000000, 0x009b702f00000000,
+    0x009cc02e00000000, 0x009d902e00000000, 0x009e602e00000000,
+    0x009f302e00000000, 0x00a0002200000000, 0x00a1502200000000,
+    0x00a2a02200000000, 0x00a3f02200000000, 0x00a4402300000000,
+    0x00a5102300000000, 0x00a6e02300000000, 0x00a7b02300000000,
+    0x00a8802000000000, 0x00a9d02000000000, 0x00aa202000000000,
+    0x00ab702000000000, 0x00acc02100000000, 0x00ad902100000000,
+    0x00ae602100000000, 0x00af302100000000, 0x00b0002700000000,
+    0x00b1502700000000, 0x00b2a02700000000, 0x00b3f02700000000,
+    0x00b4402600000000, 0x00b5102600000000, 0x00b6e02600000000,
+    0x00b7b02600000000, 0x00b8802500000000, 0x00b9d02500000000,
+    0x00ba202500000000, 0x00bb702500000000, 0x00bcc02400000000,
+    0x00bd902400000000, 0x00be602400000000, 0x00bf302400000000,
+    0x00c0003c00000000, 0x00c1503c00000000, 0x00c2a03c00000000,
+    0x00c3f03c00000000, 0x00c4403d00000000, 0x00c5103d00000000,
+    0x00c6e03d00000000, 0x00c7b03d00000000, 0x00c8803e00000000,
+    0x00c9d03e00000000, 0x00ca203e00000000, 0x00cb703e00000000,
+    0x00ccc03f00000000, 0x00cd903f00000000, 0x00ce603f00000000,
+    0x00cf303f00000000, 0x00d0003900000000, 0x00d1503900000000,
+    0x00d2a03900000000, 0x00d3f03900000000, 0x00d4403800000000,
+    0x00d5103800000000, 0x00d6e03800000000, 0x00d7b03800000000,
+    0x00d8803b00000000, 0x00d9d03b00000000, 0x00da203b00000000,
+    0x00db703b00000000, 0x00dcc03a00000000, 0x00dd903a00000000,
+    0x00de603a00000000, 0x00df303a00000000, 0x00e0003600000000,
+    0x00e1503600000000, 0x00e2a03600000000, 0x00e3f03600000000,
+    0x00e4403700000000, 0x00e5103700000000, 0x00e6e03700000000,
+    0x00e7b03700000000, 0x00e8803400000000, 0x00e9d03400000000,
+    0x00ea203400000000, 0x00eb703400000000, 0x00ecc03500000000,
+    0x00ed903500000000, 0x00ee603500000000, 0x00ef303500000000,
+    0x00f0003300000000, 0x00f1503300000000, 0x00f2a03300000000,
+    0x00f3f03300000000, 0x00f4403200000000, 0x00f5103200000000,
+    0x00f6e03200000000, 0x00f7b03200000000, 0x00f8803100000000,
+    0x00f9d03100000000, 0x00fa203100000000, 0x00fb703100000000,
+    0x00fcc03000000000, 0x00fd903000000000, 0x00fe603000000000,
+    0x00ff303000000000},
+   {0x0000000000000000, 0x0150000000000000, 0x02a0000000000000,
+    0x03f0000000000000, 0x0440010000000000, 0x0510010000000000,
+    0x06e0010000000000, 0x07b0010000000000, 0x0880020000000000,
+    0x09d0020000000000, 0x0a20020000000000, 0x0b70020000000000,
+    0x0cc0030000000000, 0x0d90030000000000, 0x0e60030000000000,
+    0x0f30030000000000, 0x1000050000000000, 0x1150050000000000,
+    0x12a0050000000000, 0x13f0050000000000, 0x1440040000000000,
+    0x1510040000000000, 0x16e0040000000000, 0x17b0040000000000,
+    0x1880070000000000, 0x19d0070000000000, 0x1a20070000000000,
+    0x1b70070000000000, 0x1cc0060000000000, 0x1d90060000000000,
+    0x1e60060000000000, 0x1f30060000000000, 0x20000a0000000000,
+    0x21500a0000000000, 0x22a00a0000000000, 0x23f00a0000000000,
+    0x24400b0000000000, 0x25100b0000000000, 0x26e00b0000000000,
+    0x27b00b0000000000, 0x2880080000000000, 0x29d0080000000000,
+    0x2a20080000000000, 0x2b70080000000000, 0x2cc0090000000000,
+    0x2d90090000000000, 0x2e60090000000000, 0x2f30090000000000,
+    0x30000f0000000000, 0x31500f0000000000, 0x32a00f0000000000,
+    0x33f00f0000000000, 0x34400e0000000000, 0x35100e0000000000,
+    0x36e00e0000000000, 0x37b00e0000000000, 0x38800d0000000000,
+    0x39d00d0000000000, 0x3a200d0000000000, 0x3b700d0000000000,
+    0x3cc00c0000000000, 0x3d900c0000000000, 0x3e600c0000000000,
+    0x3f300c0000000000, 0x4000140000000000, 0x4150140000000000,
+    0x42a0140000000000, 0x43f0140000000000, 0x4440150000000000,
+    0x4510150000000000, 0x46e0150000000000, 0x47b0150000000000,
+    0x4880160000000000, 0x49d0160000000000, 0x4a20160000000000,
+    0x4b70160000000000, 0x4cc0170000000000, 0x4d90170000000000,
+    0x4e60170000000000, 0x4f30170000000000, 0x5000110000000000,
+    0x5150110000000000, 0x52a0110000000000, 0x53f0110000000000,
+    0x5440100000000000, 0x5510100000000000, 0x56e0100000000000,
+    0x57b0100000000000, 0x5880130000000000, 0x59d0130000000000,
+    0x5a20130000000000, 0x5b70130000000000, 0x5cc0120000000000,
+    0x5d90120000000000, 0x5e60120000000000, 0x5f30120000000000,
+    0x60001e0000000000, 0x61501e0000000000, 0x62a01e0000000000,
+    0x63f01e0000000000, 0x64401f0000000000, 0x65101f0000000000,
+    0x66e01f0000000000, 0x67b01f0000000000, 0x68801c0000000000,
+    0x69d01c0000000000, 0x6a201c0000000000, 0x6b701c0000000000,
+    0x6cc01d0000000000, 0x6d901d0000000000, 0x6e601d0000000000,
+    0x6f301d0000000000, 0x70001b0000000000, 0x71501b0000000000,
+    0x72a01b0000000000, 0x73f01b0000000000, 0x74401a0000000000,
+    0x75101a0000000000, 0x76e01a0000000000, 0x77b01a0000000000,
+    0x7880190000000000, 0x79d0190000000000, 0x7a20190000000000,
+    0x7b70190000000000, 0x7cc0180000000000, 0x7d90180000000000,
+    0x7e60180000000000, 0x7f30180000000000, 0x8000280000000000,
+    0x8150280000000000, 0x82a0280000000000, 0x83f0280000000000,
+    0x8440290000000000, 0x8510290000000000, 0x86e0290000000000,
+    0x87b0290000000000, 0x88802a0000000000, 0x89d02a0000000000,
+    0x8a202a0000000000, 0x8b702a0000000000, 0x8cc02b0000000000,
+    0x8d902b0000000000, 0x8e602b0000000000, 0x8f302b0000000000,
+    0x90002d0000000000, 0x91502d0000000000, 0x92a02d0000000000,
+    0x93f02d0000000000, 0x94402c0000000000, 0x95102c0000000000,
+    0x96e02c0000000000, 0x97b02c0000000000, 0x98802f0000000000,
+    0x99d02f0000000000, 0x9a202f0000000000, 0x9b702f0000000000,
+    0x9cc02e0000000000, 0x9d902e0000000000, 0x9e602e0000000000,
+    0x9f302e0000000000, 0xa000220000000000, 0xa150220000000000,
+    0xa2a0220000000000, 0xa3f0220000000000, 0xa440230000000000,
+    0xa510230000000000, 0xa6e0230000000000, 0xa7b0230000000000,
+    0xa880200000000000, 0xa9d0200000000000, 0xaa20200000000000,
+    0xab70200000000000, 0xacc0210000000000, 0xad90210000000000,
+    0xae60210000000000, 0xaf30210000000000, 0xb000270000000000,
+    0xb150270000000000, 0xb2a0270000000000, 0xb3f0270000000000,
+    0xb440260000000000, 0xb510260000000000, 0xb6e0260000000000,
+    0xb7b0260000000000, 0xb880250000000000, 0xb9d0250000000000,
+    0xba20250000000000, 0xbb70250000000000, 0xbcc0240000000000,
+    0xbd90240000000000, 0xbe60240000000000, 0xbf30240000000000,
+    0xc0003c0000000000, 0xc1503c0000000000, 0xc2a03c0000000000,
+    0xc3f03c0000000000, 0xc4403d0000000000, 0xc5103d0000000000,
+    0xc6e03d0000000000, 0xc7b03d0000000000, 0xc8803e0000000000,
+    0xc9d03e0000000000, 0xca203e0000000000, 0xcb703e0000000000,
+    0xccc03f0000000000, 0xcd903f0000000000, 0xce603f0000000000,
+    0xcf303f0000000000, 0xd000390000000000, 0xd150390000000000,
+    0xd2a0390000000000, 0xd3f0390000000000, 0xd440380000000000,
+    0xd510380000000000, 0xd6e0380000000000, 0xd7b0380000000000,
+    0xd8803b0000000000, 0xd9d03b0000000000, 0xda203b0000000000,
+    0xdb703b0000000000, 0xdcc03a0000000000, 0xdd903a0000000000,
+    0xde603a0000000000, 0xdf303a0000000000, 0xe000360000000000,
+    0xe150360000000000, 0xe2a0360000000000, 0xe3f0360000000000,
+    0xe440370000000000, 0xe510370000000000, 0xe6e0370000000000,
+    0xe7b0370000000000, 0xe880340000000000, 0xe9d0340000000000,
+    0xea20340000000000, 0xeb70340000000000, 0xecc0350000000000,
+    0xed90350000000000, 0xee60350000000000, 0xef30350000000000,
+    0xf000330000000000, 0xf150330000000000, 0xf2a0330000000000,
+    0xf3f0330000000000, 0xf440320000000000, 0xf510320000000000,
+    0xf6e0320000000000, 0xf7b0320000000000, 0xf880310000000000,
+    0xf9d0310000000000, 0xfa20310000000000, 0xfb70310000000000,
+    0xfcc0300000000000, 0xfd90300000000000, 0xfe60300000000000,
+    0xff30300000000000},
+   {0x0000000000000000, 0x5101919000000000, 0xa102219100000000,
+    0xf003b00100000000, 0x4105419200000000, 0x1004d00200000000,
+    0xe007600300000000, 0xb106f19300000000, 0x810a819400000000,
+    0xd00b100400000000, 0x2008a00500000000, 0x7109319500000000,
+    0xc00fc00600000000, 0x910e519600000000, 0x610de19700000000,
+    0x300c700700000000, 0x0115019900000000, 0x5014900900000000,
+    0xa017200800000000, 0xf116b19800000000, 0x4010400b00000000,
+    0x1111d19b00000000, 0xe112619a00000000, 0xb013f00a00000000,
+    0x801f800d00000000, 0xd11e119d00000000, 0x211da19c00000000,
+    0x701c300c00000000, 0xc11ac19f00000000, 0x901b500f00000000,
+    0x6018e00e00000000, 0x3119719e00000000, 0x012a018200000000,
+    0x502b901200000000, 0xa028201300000000, 0xf129b18300000000,
+    0x402f401000000000, 0x112ed18000000000, 0xe12d618100000000,
+    0xb02cf01100000000, 0x8020801600000000, 0xd121118600000000,
+    0x2122a18700000000, 0x7023301700000000, 0xc125c18400000000,
+    0x9024501400000000, 0x6027e01500000000, 0x3126718500000000,
+    0x003f001b00000000, 0x513e918b00000000, 0xa13d218a00000000,
+    0xf03cb01a00000000, 0x413a418900000000, 0x103bd01900000000,
+    0xe038601800000000, 0xb139f18800000000, 0x8135818f00000000,
+    0xd034101f00000000, 0x2037a01e00000000, 0x7136318e00000000,
+    0xc030c01d00000000, 0x9131518d00000000, 0x6132e18c00000000,
+    0x3033701c00000000, 0x015401b400000000, 0x5055902400000000,
+    0xa056202500000000, 0xf157b1b500000000, 0x4051402600000000,
+    0x1150d1b600000000, 0xe15361b700000000, 0xb052f02700000000,
+    0x805e802000000000, 0xd15f11b000000000, 0x215ca1b100000000,
+    0x705d302100000000, 0xc15bc1b200000000, 0x905a502200000000,
+    0x6059e02300000000, 0x315871b300000000, 0x0041002d00000000,
+    0x514091bd00000000, 0xa14321bc00000000, 0xf042b02c00000000,
+    0x414441bf00000000, 0x1045d02f00000000, 0xe046602e00000000,
+    0xb147f1be00000000, 0x814b81b900000000, 0xd04a102900000000,
+    0x2049a02800000000, 0x714831b800000000, 0xc04ec02b00000000,
+    0x914f51bb00000000, 0x614ce1ba00000000, 0x304d702a00000000,
+    0x007e003600000000, 0x517f91a600000000, 0xa17c21a700000000,
+    0xf07db03700000000, 0x417b41a400000000, 0x107ad03400000000,
+    0xe079603500000000, 0xb178f1a500000000, 0x817481a200000000,
+    0xd075103200000000, 0x2076a03300000000, 0x717731a300000000,
+    0xc071c03000000000, 0x917051a000000000, 0x6173e1a100000000,
+    0x3072703100000000, 0x016b01af00000000, 0x506a903f00000000,
+    0xa069203e00000000, 0xf168b1ae00000000, 0x406e403d00000000,
+    0x116fd1ad00000000, 0xe16c61ac00000000, 0xb06df03c00000000,
+    0x8061803b00000000, 0xd16011ab00000000, 0x2163a1aa00000000,
+    0x7062303a00000000, 0xc164c1a900000000, 0x9065503900000000,
+    0x6066e03800000000, 0x316771a800000000, 0x01a801d800000000,
+    0x50a9904800000000, 0xa0aa204900000000, 0xf1abb1d900000000,
+    0x40ad404a00000000, 0x11acd1da00000000, 0xe1af61db00000000,
+    0xb0aef04b00000000, 0x80a2804c00000000, 0xd1a311dc00000000,
+    0x21a0a1dd00000000, 0x70a1304d00000000, 0xc1a7c1de00000000,
+    0x90a6504e00000000, 0x60a5e04f00000000, 0x31a471df00000000,
+    0x00bd004100000000, 0x51bc91d100000000, 0xa1bf21d000000000,
+    0xf0beb04000000000, 0x41b841d300000000, 0x10b9d04300000000,
+    0xe0ba604200000000, 0xb1bbf1d200000000, 0x81b781d500000000,
+    0xd0b6104500000000, 0x20b5a04400000000, 0x71b431d400000000,
+    0xc0b2c04700000000, 0x91b351d700000000, 0x61b0e1d600000000,
+    0x30b1704600000000, 0x0082005a00000000, 0x518391ca00000000,
+    0xa18021cb00000000, 0xf081b05b00000000, 0x418741c800000000,
+    0x1086d05800000000, 0xe085605900000000, 0xb184f1c900000000,
+    0x818881ce00000000, 0xd089105e00000000, 0x208aa05f00000000,
+    0x718b31cf00000000, 0xc08dc05c00000000, 0x918c51cc00000000,
+    0x618fe1cd00000000, 0x308e705d00000000, 0x019701c300000000,
+    0x5096905300000000, 0xa095205200000000, 0xf194b1c200000000,
+    0x4092405100000000, 0x1193d1c100000000, 0xe19061c000000000,
+    0xb091f05000000000, 0x809d805700000000, 0xd19c11c700000000,
+    0x219fa1c600000000, 0x709e305600000000, 0xc198c1c500000000,
+    0x9099505500000000, 0x609ae05400000000, 0x319b71c400000000,
+    0x00fc006c00000000, 0x51fd91fc00000000, 0xa1fe21fd00000000,
+    0xf0ffb06d00000000, 0x41f941fe00000000, 0x10f8d06e00000000,
+    0xe0fb606f00000000, 0xb1faf1ff00000000, 0x81f681f800000000,
+    0xd0f7106800000000, 0x20f4a06900000000, 0x71f531f900000000,
+    0xc0f3c06a00000000, 0x91f251fa00000000, 0x61f1e1fb00000000,
+    0x30f0706b00000000, 0x01e901f500000000, 0x50e8906500000000,
+    0xa0eb206400000000, 0xf1eab1f400000000, 0x40ec406700000000,
+    0x11edd1f700000000, 0xe1ee61f600000000, 0xb0eff06600000000,
+    0x80e3806100000000, 0xd1e211f100000000, 0x21e1a1f000000000,
+    0x70e0306000000000, 0xc1e6c1f300000000, 0x90e7506300000000,
+    0x60e4e06200000000, 0x31e571f200000000, 0x01d601ee00000000,
+    0x50d7907e00000000, 0xa0d4207f00000000, 0xf1d5b1ef00000000,
+    0x40d3407c00000000, 0x11d2d1ec00000000, 0xe1d161ed00000000,
+    0xb0d0f07d00000000, 0x80dc807a00000000, 0xd1dd11ea00000000,
+    0x21dea1eb00000000, 0x70df307b00000000, 0xc1d9c1e800000000,
+    0x90d8507800000000, 0x60dbe07900000000, 0x31da71e900000000,
+    0x00c3007700000000, 0x51c291e700000000, 0xa1c121e600000000,
+    0xf0c0b07600000000, 0x41c641e500000000, 0x10c7d07500000000,
+    0xe0c4607400000000, 0xb1c5f1e400000000, 0x81c981e300000000,
+    0xd0c8107300000000, 0x20cba07200000000, 0x71ca31e200000000,
+    0xc0ccc07100000000, 0x91cd51e100000000, 0x61cee1e000000000,
+    0x30cf707000000000},
+   {0x0000000000000000, 0x00c001bd00000000, 0x038000ca00000000,
+    0x0340017700000000, 0x0500022400000000, 0x05c0039900000000,
+    0x068002ee00000000, 0x0640035300000000, 0x0a00044800000000,
+    0x0ac005f500000000, 0x0980048200000000, 0x0940053f00000000,
+    0x0f00066c00000000, 0x0fc007d100000000, 0x0c8006a600000000,
+    0x0c40071b00000000, 0x1400089000000000, 0x14c0092d00000000,
+    0x1780085a00000000, 0x174009e700000000, 0x11000ab400000000,
+    0x11c00b0900000000, 0x12800a7e00000000, 0x12400bc300000000,
+    0x1e000cd800000000, 0x1ec00d6500000000, 0x1d800c1200000000,
+    0x1d400daf00000000, 0x1b000efc00000000, 0x1bc00f4100000000,
+    0x18800e3600000000, 0x18400f8b00000000, 0x2b00139000000000,
+    0x2bc0122d00000000, 0x2880135a00000000, 0x284012e700000000,
+    0x2e0011b400000000, 0x2ec0100900000000, 0x2d80117e00000000,
+    0x2d4010c300000000, 0x210017d800000000, 0x21c0166500000000,
+    0x2280171200000000, 0x224016af00000000, 0x240015fc00000000,
+    0x24c0144100000000, 0x2780153600000000, 0x2740148b00000000,
+    0x3f001b0000000000, 0x3fc01abd00000000, 0x3c801bca00000000,
+    0x3c401a7700000000, 0x3a00192400000000, 0x3ac0189900000000,
+    0x398019ee00000000, 0x3940185300000000, 0x35001f4800000000,
+    0x35c01ef500000000, 0x36801f8200000000, 0x36401e3f00000000,
+    0x30001d6c00000000, 0x30c01cd100000000, 0x33801da600000000,
+    0x33401c1b00000000, 0x5500259000000000, 0x55c0242d00000000,
+    0x5680255a00000000, 0x564024e700000000, 0x500027b400000000,
+    0x50c0260900000000, 0x5380277e00000000, 0x534026c300000000,
+    0x5f0021d800000000, 0x5fc0206500000000, 0x5c80211200000000,
+    0x5c4020af00000000, 0x5a0023fc00000000, 0x5ac0224100000000,
+    0x5980233600000000, 0x5940228b00000000, 0x41002d0000000000,
+    0x41c02cbd00000000, 0x42802dca00000000, 0x42402c7700000000,
+    0x44002f2400000000, 0x44c02e9900000000, 0x47802fee00000000,
+    0x47402e5300000000, 0x4b00294800000000, 0x4bc028f500000000,
+    0x4880298200000000, 0x4840283f00000000, 0x4e002b6c00000000,
+    0x4ec02ad100000000, 0x4d802ba600000000, 0x4d402a1b00000000,
+    0x7e00360000000000, 0x7ec037bd00000000, 0x7d8036ca00000000,
+    0x7d40377700000000, 0x7b00342400000000, 0x7bc0359900000000,
+    0x788034ee00000000, 0x7840355300000000, 0x7400324800000000,
+    0x74c033f500000000, 0x7780328200000000, 0x7740333f00000000,
+    0x7100306c00000000, 0x71c031d100000000, 0x728030a600000000,
+    0x7240311b00000000, 0x6a003e9000000000, 0x6ac03f2d00000000,
+    0x69803e5a00000000, 0x69403fe700000000, 0x6f003cb400000000,
+    0x6fc03d0900000000, 0x6c803c7e00000000, 0x6c403dc300000000,
+    0x60003ad800000000, 0x60c03b6500000000, 0x63803a1200000000,
+    0x63403baf00000000, 0x650038fc00000000, 0x65c0394100000000,
+    0x6680383600000000, 0x6640398b00000000, 0xa900499000000000,
+    0xa9c0482d00000000, 0xaa80495a00000000, 0xaa4048e700000000,
+    0xac004bb400000000, 0xacc04a0900000000, 0xaf804b7e00000000,
+    0xaf404ac300000000, 0xa3004dd800000000, 0xa3c04c6500000000,
+    0xa0804d1200000000, 0xa0404caf00000000, 0xa6004ffc00000000,
+    0xa6c04e4100000000, 0xa5804f3600000000, 0xa5404e8b00000000,
+    0xbd00410000000000, 0xbdc040bd00000000, 0xbe8041ca00000000,
+    0xbe40407700000000, 0xb800432400000000, 0xb8c0429900000000,
+    0xbb8043ee00000000, 0xbb40425300000000, 0xb700454800000000,
+    0xb7c044f500000000, 0xb480458200000000, 0xb440443f00000000,
+    0xb200476c00000000, 0xb2c046d100000000, 0xb18047a600000000,
+    0xb140461b00000000, 0x82005a0000000000, 0x82c05bbd00000000,
+    0x81805aca00000000, 0x81405b7700000000, 0x8700582400000000,
+    0x87c0599900000000, 0x848058ee00000000, 0x8440595300000000,
+    0x88005e4800000000, 0x88c05ff500000000, 0x8b805e8200000000,
+    0x8b405f3f00000000, 0x8d005c6c00000000, 0x8dc05dd100000000,
+    0x8e805ca600000000, 0x8e405d1b00000000, 0x9600529000000000,
+    0x96c0532d00000000, 0x9580525a00000000, 0x954053e700000000,
+    0x930050b400000000, 0x93c0510900000000, 0x9080507e00000000,
+    0x904051c300000000, 0x9c0056d800000000, 0x9cc0576500000000,
+    0x9f80561200000000, 0x9f4057af00000000, 0x990054fc00000000,
+    0x99c0554100000000, 0x9a80543600000000, 0x9a40558b00000000,
+    0xfc006c0000000000, 0xfcc06dbd00000000, 0xff806cca00000000,
+    0xff406d7700000000, 0xf9006e2400000000, 0xf9c06f9900000000,
+    0xfa806eee00000000, 0xfa406f5300000000, 0xf600684800000000,
+    0xf6c069f500000000, 0xf580688200000000, 0xf540693f00000000,
+    0xf3006a6c00000000, 0xf3c06bd100000000, 0xf0806aa600000000,
+    0xf0406b1b00000000, 0xe800649000000000, 0xe8c0652d00000000,
+    0xeb80645a00000000, 0xeb4065e700000000, 0xed0066b400000000,
+    0xedc0670900000000, 0xee80667e00000000, 0xee4067c300000000,
+    0xe20060d800000000, 0xe2c0616500000000, 0xe180601200000000,
+    0xe14061af00000000, 0xe70062fc00000000, 0xe7c0634100000000,
+    0xe480623600000000, 0xe440638b00000000, 0xd7007f9000000000,
+    0xd7c07e2d00000000, 0xd4807f5a00000000, 0xd4407ee700000000,
+    0xd2007db400000000, 0xd2c07c0900000000, 0xd1807d7e00000000,
+    0xd1407cc300000000, 0xdd007bd800000000, 0xddc07a6500000000,
+    0xde807b1200000000, 0xde407aaf00000000, 0xd80079fc00000000,
+    0xd8c0784100000000, 0xdb80793600000000, 0xdb40788b00000000,
+    0xc300770000000000, 0xc3c076bd00000000, 0xc08077ca00000000,
+    0xc040767700000000, 0xc600752400000000, 0xc6c0749900000000,
+    0xc58075ee00000000, 0xc540745300000000, 0xc900734800000000,
+    0xc9c072f500000000, 0xca80738200000000, 0xca40723f00000000,
+    0xcc00716c00000000, 0xccc070d100000000, 0xcf8071a600000000,
+    0xcf40701b00000000}};
+
+#else /* W == 4 */
+
+static const crc_t crc_braid_table[][256] = {
+   {0x00000000, 0x6c90c100, 0xd9218200, 0xb5b14300, 0x02400403,
+    0x6ed0c503, 0xdb618603, 0xb7f14703, 0x04800806, 0x6810c906,
+    0xdda18a06, 0xb1314b06, 0x06c00c05, 0x6a50cd05, 0xdfe18e05,
+    0xb3714f05, 0x0900100c, 0x6590d10c, 0xd021920c, 0xbcb1530c,
+    0x0b40140f, 0x67d0d50f, 0xd261960f, 0xbef1570f, 0x0d80180a,
+    0x6110d90a, 0xd4a19a0a, 0xb8315b0a, 0x0fc01c09, 0x6350dd09,
+    0xd6e19e09, 0xba715f09, 0x12002018, 0x7e90e118, 0xcb21a218,
+    0xa7b16318, 0x1040241b, 0x7cd0e51b, 0xc961a61b, 0xa5f1671b,
+    0x1680281e, 0x7a10e91e, 0xcfa1aa1e, 0xa3316b1e, 0x14c02c1d,
+    0x7850ed1d, 0xcde1ae1d, 0xa1716f1d, 0x1b003014, 0x7790f114,
+    0xc221b214, 0xaeb17314, 0x19403417, 0x75d0f517, 0xc061b617,
+    0xacf17717, 0x1f803812, 0x7310f912, 0xc6a1ba12, 0xaa317b12,
+    0x1dc03c11, 0x7150fd11, 0xc4e1be11, 0xa8717f11, 0x24004030,
+    0x48908130, 0xfd21c230, 0x91b10330, 0x26404433, 0x4ad08533,
+    0xff61c633, 0x93f10733, 0x20804836, 0x4c108936, 0xf9a1ca36,
+    0x95310b36, 0x22c04c35, 0x4e508d35, 0xfbe1ce35, 0x97710f35,
+    0x2d00503c, 0x4190913c, 0xf421d23c, 0x98b1133c, 0x2f40543f,
+    0x43d0953f, 0xf661d63f, 0x9af1173f, 0x2980583a, 0x4510993a,
+    0xf0a1da3a, 0x9c311b3a, 0x2bc05c39, 0x47509d39, 0xf2e1de39,
+    0x9e711f39, 0x36006028, 0x5a90a128, 0xef21e228, 0x83b12328,
+    0x3440642b, 0x58d0a52b, 0xed61e62b, 0x81f1272b, 0x3280682e,
+    0x5e10a92e, 0xeba1ea2e, 0x87312b2e, 0x30c06c2d, 0x5c50ad2d,
+    0xe9e1ee2d, 0x85712f2d, 0x3f007024, 0x5390b124, 0xe621f224,
+    0x8ab13324, 0x3d407427, 0x51d0b527, 0xe461f627, 0x88f13727,
+    0x3b807822, 0x5710b922, 0xe2a1fa22, 0x8e313b22, 0x39c07c21,
+    0x5550bd21, 0xe0e1fe21, 0x8c713f21, 0x48008060, 0x24904160,
+    0x91210260, 0xfdb1c360, 0x4a408463, 0x26d04563, 0x93610663,
+    0xfff1c763, 0x4c808866, 0x20104966, 0x95a10a66, 0xf931cb66,
+    0x4ec08c65, 0x22504d65, 0x97e10e65, 0xfb71cf65, 0x4100906c,
+    0x2d90516c, 0x9821126c, 0xf4b1d36c, 0x4340946f, 0x2fd0556f,
+    0x9a61166f, 0xf6f1d76f, 0x4580986a, 0x2910596a, 0x9ca11a6a,
+    0xf031db6a, 0x47c09c69, 0x2b505d69, 0x9ee11e69, 0xf271df69,
+    0x5a00a078, 0x36906178, 0x83212278, 0xefb1e378, 0x5840a47b,
+    0x34d0657b, 0x8161267b, 0xedf1e77b, 0x5e80a87e, 0x3210697e,
+    0x87a12a7e, 0xeb31eb7e, 0x5cc0ac7d, 0x30506d7d, 0x85e12e7d,
+    0xe971ef7d, 0x5300b074, 0x3f907174, 0x8a213274, 0xe6b1f374,
+    0x5140b477, 0x3dd07577, 0x88613677, 0xe4f1f777, 0x5780b872,
+    0x3b107972, 0x8ea13a72, 0xe231fb72, 0x55c0bc71, 0x39507d71,
+    0x8ce13e71, 0xe071ff71, 0x6c00c050, 0x00900150, 0xb5214250,
+    0xd9b18350, 0x6e40c453, 0x02d00553, 0xb7614653, 0xdbf18753,
+    0x6880c856, 0x04100956, 0xb1a14a56, 0xdd318b56, 0x6ac0cc55,
+    0x06500d55, 0xb3e14e55, 0xdf718f55, 0x6500d05c, 0x0990115c,
+    0xbc21525c, 0xd0b1935c, 0x6740d45f, 0x0bd0155f, 0xbe61565f,
+    0xd2f1975f, 0x6180d85a, 0x0d10195a, 0xb8a15a5a, 0xd4319b5a,
+    0x63c0dc59, 0x0f501d59, 0xbae15e59, 0xd6719f59, 0x7e00e048,
+    0x12902148, 0xa7216248, 0xcbb1a348, 0x7c40e44b, 0x10d0254b,
+    0xa561664b, 0xc9f1a74b, 0x7a80e84e, 0x1610294e, 0xa3a16a4e,
+    0xcf31ab4e, 0x78c0ec4d, 0x14502d4d, 0xa1e16e4d, 0xcd71af4d,
+    0x7700f044, 0x1b903144, 0xae217244, 0xc2b1b344, 0x7540f447,
+    0x19d03547, 0xac617647, 0xc0f1b747, 0x7380f842, 0x1f103942,
+    0xaaa17a42, 0xc631bb42, 0x71c0fc41, 0x1d503d41, 0xa8e17e41,
+    0xc471bf41},
+   {0x00000000, 0x900100c0, 0x90010183, 0x00000143, 0x90010305,
+    0x000003c5, 0x00000286, 0x90010246, 0x90010609, 0x000006c9,
+    0x0000078a, 0x9001074a, 0x0000050c, 0x900105cc, 0x9001048f,
+    0x0000044f, 0x90010c11, 0x00000cd1, 0x00000d92, 0x90010d52,
+    0x00000f14, 0x90010fd4, 0x90010e97, 0x00000e57, 0x00000a18,
+    0x90010ad8, 0x90010b9b, 0x00000b5b, 0x9001091d, 0x000009dd,
+    0x0000089e, 0x9001085e, 0x90011821, 0x000018e1, 0x000019a2,
+    0x90011962, 0x00001b24, 0x90011be4, 0x90011aa7, 0x00001a67,
+    0x00001e28, 0x90011ee8, 0x90011fab, 0x00001f6b, 0x90011d2d,
+    0x00001ded, 0x00001cae, 0x90011c6e, 0x00001430, 0x900114f0,
+    0x900115b3, 0x00001573, 0x90011735, 0x000017f5, 0x000016b6,
+    0x90011676, 0x90011239, 0x000012f9, 0x000013ba, 0x9001137a,
+    0x0000113c, 0x900111fc, 0x900110bf, 0x0000107f, 0x90013041,
+    0x00003081, 0x000031c2, 0x90013102, 0x00003344, 0x90013384,
+    0x900132c7, 0x00003207, 0x00003648, 0x90013688, 0x900137cb,
+    0x0000370b, 0x9001354d, 0x0000358d, 0x000034ce, 0x9001340e,
+    0x00003c50, 0x90013c90, 0x90013dd3, 0x00003d13, 0x90013f55,
+    0x00003f95, 0x00003ed6, 0x90013e16, 0x90013a59, 0x00003a99,
+    0x00003bda, 0x90013b1a, 0x0000395c, 0x9001399c, 0x900138df,
+    0x0000381f, 0x00002860, 0x900128a0, 0x900129e3, 0x00002923,
+    0x90012b65, 0x00002ba5, 0x00002ae6, 0x90012a26, 0x90012e69,
+    0x00002ea9, 0x00002fea, 0x90012f2a, 0x00002d6c, 0x90012dac,
+    0x90012cef, 0x00002c2f, 0x90012471, 0x000024b1, 0x000025f2,
+    0x90012532, 0x00002774, 0x900127b4, 0x900126f7, 0x00002637,
+    0x00002278, 0x900122b8, 0x900123fb, 0x0000233b, 0x9001217d,
+    0x000021bd, 0x000020fe, 0x9001203e, 0x90016081, 0x00006041,
+    0x00006102, 0x900161c2, 0x00006384, 0x90016344, 0x90016207,
+    0x000062c7, 0x00006688, 0x90016648, 0x9001670b, 0x000067cb,
+    0x9001658d, 0x0000654d, 0x0000640e, 0x900164ce, 0x00006c90,
+    0x90016c50, 0x90016d13, 0x00006dd3, 0x90016f95, 0x00006f55,
+    0x00006e16, 0x90016ed6, 0x90016a99, 0x00006a59, 0x00006b1a,
+    0x90016bda, 0x0000699c, 0x9001695c, 0x9001681f, 0x000068df,
+    0x000078a0, 0x90017860, 0x90017923, 0x000079e3, 0x90017ba5,
+    0x00007b65, 0x00007a26, 0x90017ae6, 0x90017ea9, 0x00007e69,
+    0x00007f2a, 0x90017fea, 0x00007dac, 0x90017d6c, 0x90017c2f,
+    0x00007cef, 0x900174b1, 0x00007471, 0x00007532, 0x900175f2,
+    0x000077b4, 0x90017774, 0x90017637, 0x000076f7, 0x000072b8,
+    0x90017278, 0x9001733b, 0x000073fb, 0x900171bd, 0x0000717d,
+    0x0000703e, 0x900170fe, 0x000050c0, 0x90015000, 0x90015143,
+    0x00005183, 0x900153c5, 0x00005305, 0x00005246, 0x90015286,
+    0x900156c9, 0x00005609, 0x0000574a, 0x9001578a, 0x000055cc,
+    0x9001550c, 0x9001544f, 0x0000548f, 0x90015cd1, 0x00005c11,
+    0x00005d52, 0x90015d92, 0x00005fd4, 0x90015f14, 0x90015e57,
+    0x00005e97, 0x00005ad8, 0x90015a18, 0x90015b5b, 0x00005b9b,
+    0x900159dd, 0x0000591d, 0x0000585e, 0x9001589e, 0x900148e1,
+    0x00004821, 0x00004962, 0x900149a2, 0x00004be4, 0x90014b24,
+    0x90014a67, 0x00004aa7, 0x00004ee8, 0x90014e28, 0x90014f6b,
+    0x00004fab, 0x90014ded, 0x00004d2d, 0x00004c6e, 0x90014cae,
+    0x000044f0, 0x90014430, 0x90014573, 0x000045b3, 0x900147f5,
+    0x00004735, 0x00004676, 0x900146b6, 0x900142f9, 0x00004239,
+    0x0000437a, 0x900143ba, 0x000041fc, 0x9001413c, 0x9001407f,
+    0x000040bf},
+   {0x00000000, 0x9001c101, 0x90008201, 0x00014300, 0x90020401,
+    0x0003c500, 0x00028600, 0x90034701, 0x90070801, 0x0006c900,
+    0x00078a00, 0x90064b01, 0x00050c00, 0x9004cd01, 0x90058e01,
+    0x00044f00, 0x900d1001, 0x000cd100, 0x000d9200, 0x900c5301,
+    0x000f1400, 0x900ed501, 0x900f9601, 0x000e5700, 0x000a1800,
+    0x900bd901, 0x900a9a01, 0x000b5b00, 0x90081c01, 0x0009dd00,
+    0x00089e00, 0x90095f01, 0x90192001, 0x0018e100, 0x0019a200,
+    0x90186301, 0x001b2400, 0x901ae501, 0x901ba601, 0x001a6700,
+    0x001e2800, 0x901fe901, 0x901eaa01, 0x001f6b00, 0x901c2c01,
+    0x001ded00, 0x001cae00, 0x901d6f01, 0x00143000, 0x9015f101,
+    0x9014b201, 0x00157300, 0x90163401, 0x0017f500, 0x0016b600,
+    0x90177701, 0x90133801, 0x0012f900, 0x0013ba00, 0x90127b01,
+    0x00113c00, 0x9010fd01, 0x9011be01, 0x00107f00, 0x90314001,
+    0x00308100, 0x0031c200, 0x90300301, 0x00334400, 0x90328501,
+    0x9033c601, 0x00320700, 0x00364800, 0x90378901, 0x9036ca01,
+    0x00370b00, 0x90344c01, 0x00358d00, 0x0034ce00, 0x90350f01,
+    0x003c5000, 0x903d9101, 0x903cd201, 0x003d1300, 0x903e5401,
+    0x003f9500, 0x003ed600, 0x903f1701, 0x903b5801, 0x003a9900,
+    0x003bda00, 0x903a1b01, 0x00395c00, 0x90389d01, 0x9039de01,
+    0x00381f00, 0x00286000, 0x9029a101, 0x9028e201, 0x00292300,
+    0x902a6401, 0x002ba500, 0x002ae600, 0x902b2701, 0x902f6801,
+    0x002ea900, 0x002fea00, 0x902e2b01, 0x002d6c00, 0x902cad01,
+    0x902dee01, 0x002c2f00, 0x90257001, 0x0024b100, 0x0025f200,
+    0x90243301, 0x00277400, 0x9026b501, 0x9027f601, 0x00263700,
+    0x00227800, 0x9023b901, 0x9022fa01, 0x00233b00, 0x90207c01,
+    0x0021bd00, 0x0020fe00, 0x90213f01, 0x90618001, 0x00604100,
+    0x00610200, 0x9060c301, 0x00638400, 0x90624501, 0x90630601,
+    0x0062c700, 0x00668800, 0x90674901, 0x90660a01, 0x0067cb00,
+    0x90648c01, 0x00654d00, 0x00640e00, 0x9065cf01, 0x006c9000,
+    0x906d5101, 0x906c1201, 0x006dd300, 0x906e9401, 0x006f5500,
+    0x006e1600, 0x906fd701, 0x906b9801, 0x006a5900, 0x006b1a00,
+    0x906adb01, 0x00699c00, 0x90685d01, 0x90691e01, 0x0068df00,
+    0x0078a000, 0x90796101, 0x90782201, 0x0079e300, 0x907aa401,
+    0x007b6500, 0x007a2600, 0x907be701, 0x907fa801, 0x007e6900,
+    0x007f2a00, 0x907eeb01, 0x007dac00, 0x907c6d01, 0x907d2e01,
+    0x007cef00, 0x9075b001, 0x00747100, 0x00753200, 0x9074f301,
+    0x0077b400, 0x90767501, 0x90773601, 0x0076f700, 0x0072b800,
+    0x90737901, 0x90723a01, 0x0073fb00, 0x9070bc01, 0x00717d00,
+    0x00703e00, 0x9071ff01, 0x0050c000, 0x90510101, 0x90504201,
+    0x00518300, 0x9052c401, 0x00530500, 0x00524600, 0x90538701,
+    0x9057c801, 0x00560900, 0x00574a00, 0x90568b01, 0x0055cc00,
+    0x90540d01, 0x90554e01, 0x00548f00, 0x905dd001, 0x005c1100,
+    0x005d5200, 0x905c9301, 0x005fd400, 0x905e1501, 0x905f5601,
+    0x005e9700, 0x005ad800, 0x905b1901, 0x905a5a01, 0x005b9b00,
+    0x9058dc01, 0x00591d00, 0x00585e00, 0x90599f01, 0x9049e001,
+    0x00482100, 0x00496200, 0x9048a301, 0x004be400, 0x904a2501,
+    0x904b6601, 0x004aa700, 0x004ee800, 0x904f2901, 0x904e6a01,
+    0x004fab00, 0x904cec01, 0x004d2d00, 0x004c6e00, 0x904daf01,
+    0x0044f000, 0x90453101, 0x90447201, 0x0045b300, 0x9046f401,
+    0x00473500, 0x00467600, 0x9047b701, 0x9043f801, 0x00423900,
+    0x00437a00, 0x9042bb01, 0x0041fc00, 0x90403d01, 0x90417e01,
+    0x0040bf00},
+   {0x00000000, 0x90c00001, 0x91830001, 0x01430000, 0x93050001,
+    0x03c50000, 0x02860000, 0x92460001, 0x96090001, 0x06c90000,
+    0x078a0000, 0x974a0001, 0x050c0000, 0x95cc0001, 0x948f0001,
+    0x044f0000, 0x9c110001, 0x0cd10000, 0x0d920000, 0x9d520001,
+    0x0f140000, 0x9fd40001, 0x9e970001, 0x0e570000, 0x0a180000,
+    0x9ad80001, 0x9b9b0001, 0x0b5b0000, 0x991d0001, 0x09dd0000,
+    0x089e0000, 0x985e0001, 0x88210001, 0x18e10000, 0x19a20000,
+    0x89620001, 0x1b240000, 0x8be40001, 0x8aa70001, 0x1a670000,
+    0x1e280000, 0x8ee80001, 0x8fab0001, 0x1f6b0000, 0x8d2d0001,
+    0x1ded0000, 0x1cae0000, 0x8c6e0001, 0x14300000, 0x84f00001,
+    0x85b30001, 0x15730000, 0x87350001, 0x17f50000, 0x16b60000,
+    0x86760001, 0x82390001, 0x12f90000, 0x13ba0000, 0x837a0001,
+    0x113c0000, 0x81fc0001, 0x80bf0001, 0x107f0000, 0xa0410001,
+    0x30810000, 0x31c20000, 0xa1020001, 0x33440000, 0xa3840001,
+    0xa2c70001, 0x32070000, 0x36480000, 0xa6880001, 0xa7cb0001,
+    0x370b0000, 0xa54d0001, 0x358d0000, 0x34ce0000, 0xa40e0001,
+    0x3c500000, 0xac900001, 0xadd30001, 0x3d130000, 0xaf550001,
+    0x3f950000, 0x3ed60000, 0xae160001, 0xaa590001, 0x3a990000,
+    0x3bda0000, 0xab1a0001, 0x395c0000, 0xa99c0001, 0xa8df0001,
+    0x381f0000, 0x28600000, 0xb8a00001, 0xb9e30001, 0x29230000,
+    0xbb650001, 0x2ba50000, 0x2ae60000, 0xba260001, 0xbe690001,
+    0x2ea90000, 0x2fea0000, 0xbf2a0001, 0x2d6c0000, 0xbdac0001,
+    0xbcef0001, 0x2c2f0000, 0xb4710001, 0x24b10000, 0x25f20000,
+    0xb5320001, 0x27740000, 0xb7b40001, 0xb6f70001, 0x26370000,
+    0x22780000, 0xb2b80001, 0xb3fb0001, 0x233b0000, 0xb17d0001,
+    0x21bd0000, 0x20fe0000, 0xb03e0001, 0xf0810001, 0x60410000,
+    0x61020000, 0xf1c20001, 0x63840000, 0xf3440001, 0xf2070001,
+    0x62c70000, 0x66880000, 0xf6480001, 0xf70b0001, 0x67cb0000,
+    0xf58d0001, 0x654d0000, 0x640e0000, 0xf4ce0001, 0x6c900000,
+    0xfc500001, 0xfd130001, 0x6dd30000, 0xff950001, 0x6f550000,
+    0x6e160000, 0xfed60001, 0xfa990001, 0x6a590000, 0x6b1a0000,
+    0xfbda0001, 0x699c0000, 0xf95c0001, 0xf81f0001, 0x68df0000,
+    0x78a00000, 0xe8600001, 0xe9230001, 0x79e30000, 0xeba50001,
+    0x7b650000, 0x7a260000, 0xeae60001, 0xeea90001, 0x7e690000,
+    0x7f2a0000, 0xefea0001, 0x7dac0000, 0xed6c0001, 0xec2f0001,
+    0x7cef0000, 0xe4b10001, 0x74710000, 0x75320000, 0xe5f20001,
+    0x77b40000, 0xe7740001, 0xe6370001, 0x76f70000, 0x72b80000,
+    0xe2780001, 0xe33b0001, 0x73fb0000, 0xe1bd0001, 0x717d0000,
+    0x703e0000, 0xe0fe0001, 0x50c00000, 0xc0000001, 0xc1430001,
+    0x51830000, 0xc3c50001, 0x53050000, 0x52460000, 0xc2860001,
+    0xc6c90001, 0x56090000, 0x574a0000, 0xc78a0001, 0x55cc0000,
+    0xc50c0001, 0xc44f0001, 0x548f0000, 0xccd10001, 0x5c110000,
+    0x5d520000, 0xcd920001, 0x5fd40000, 0xcf140001, 0xce570001,
+    0x5e970000, 0x5ad80000, 0xca180001, 0xcb5b0001, 0x5b9b0000,
+    0xc9dd0001, 0x591d0000, 0x585e0000, 0xc89e0001, 0xd8e10001,
+    0x48210000, 0x49620000, 0xd9a20001, 0x4be40000, 0xdb240001,
+    0xda670001, 0x4aa70000, 0x4ee80000, 0xde280001, 0xdf6b0001,
+    0x4fab0000, 0xdded0001, 0x4d2d0000, 0x4c6e0000, 0xdcae0001,
+    0x44f00000, 0xd4300001, 0xd5730001, 0x45b30000, 0xd7f50001,
+    0x47350000, 0x46760000, 0xd6b60001, 0xd2f90001, 0x42390000,
+    0x437a0000, 0xd3ba0001, 0x41fc0000, 0xd13c0001, 0xd07f0001,
+    0x40bf0000}};
+
+static const word_t crc_braid_big_table[][256] = {
+   {0x00000000, 0x0100c090, 0x01008391, 0x00004301, 0x01000593,
+    0x0000c503, 0x00008602, 0x01004692, 0x01000996, 0x0000c906,
+    0x00008a07, 0x01004a97, 0x00000c05, 0x0100cc95, 0x01008f94,
+    0x00004f04, 0x0100119c, 0x0000d10c, 0x0000920d, 0x0100529d,
+    0x0000140f, 0x0100d49f, 0x0100979e, 0x0000570e, 0x0000180a,
+    0x0100d89a, 0x01009b9b, 0x00005b0b, 0x01001d99, 0x0000dd09,
+    0x00009e08, 0x01005e98, 0x01002188, 0x0000e118, 0x0000a219,
+    0x01006289, 0x0000241b, 0x0100e48b, 0x0100a78a, 0x0000671a,
+    0x0000281e, 0x0100e88e, 0x0100ab8f, 0x00006b1f, 0x01002d8d,
+    0x0000ed1d, 0x0000ae1c, 0x01006e8c, 0x00003014, 0x0100f084,
+    0x0100b385, 0x00007315, 0x01003587, 0x0000f517, 0x0000b616,
+    0x01007686, 0x01003982, 0x0000f912, 0x0000ba13, 0x01007a83,
+    0x00003c11, 0x0100fc81, 0x0100bf80, 0x00007f10, 0x010041a0,
+    0x00008130, 0x0000c231, 0x010002a1, 0x00004433, 0x010084a3,
+    0x0100c7a2, 0x00000732, 0x00004836, 0x010088a6, 0x0100cba7,
+    0x00000b37, 0x01004da5, 0x00008d35, 0x0000ce34, 0x01000ea4,
+    0x0000503c, 0x010090ac, 0x0100d3ad, 0x0000133d, 0x010055af,
+    0x0000953f, 0x0000d63e, 0x010016ae, 0x010059aa, 0x0000993a,
+    0x0000da3b, 0x01001aab, 0x00005c39, 0x01009ca9, 0x0100dfa8,
+    0x00001f38, 0x00006028, 0x0100a0b8, 0x0100e3b9, 0x00002329,
+    0x010065bb, 0x0000a52b, 0x0000e62a, 0x010026ba, 0x010069be,
+    0x0000a92e, 0x0000ea2f, 0x01002abf, 0x00006c2d, 0x0100acbd,
+    0x0100efbc, 0x00002f2c, 0x010071b4, 0x0000b124, 0x0000f225,
+    0x010032b5, 0x00007427, 0x0100b4b7, 0x0100f7b6, 0x00003726,
+    0x00007822, 0x0100b8b2, 0x0100fbb3, 0x00003b23, 0x01007db1,
+    0x0000bd21, 0x0000fe20, 0x01003eb0, 0x010081f0, 0x00004160,
+    0x00000261, 0x0100c2f1, 0x00008463, 0x010044f3, 0x010007f2,
+    0x0000c762, 0x00008866, 0x010048f6, 0x01000bf7, 0x0000cb67,
+    0x01008df5, 0x00004d65, 0x00000e64, 0x0100cef4, 0x0000906c,
+    0x010050fc, 0x010013fd, 0x0000d36d, 0x010095ff, 0x0000556f,
+    0x0000166e, 0x0100d6fe, 0x010099fa, 0x0000596a, 0x00001a6b,
+    0x0100dafb, 0x00009c69, 0x01005cf9, 0x01001ff8, 0x0000df68,
+    0x0000a078, 0x010060e8, 0x010023e9, 0x0000e379, 0x0100a5eb,
+    0x0000657b, 0x0000267a, 0x0100e6ea, 0x0100a9ee, 0x0000697e,
+    0x00002a7f, 0x0100eaef, 0x0000ac7d, 0x01006ced, 0x01002fec,
+    0x0000ef7c, 0x0100b1e4, 0x00007174, 0x00003275, 0x0100f2e5,
+    0x0000b477, 0x010074e7, 0x010037e6, 0x0000f776, 0x0000b872,
+    0x010078e2, 0x01003be3, 0x0000fb73, 0x0100bde1, 0x00007d71,
+    0x00003e70, 0x0100fee0, 0x0000c050, 0x010000c0, 0x010043c1,
+    0x00008351, 0x0100c5c3, 0x00000553, 0x00004652, 0x010086c2,
+    0x0100c9c6, 0x00000956, 0x00004a57, 0x01008ac7, 0x0000cc55,
+    0x01000cc5, 0x01004fc4, 0x00008f54, 0x0100d1cc, 0x0000115c,
+    0x0000525d, 0x010092cd, 0x0000d45f, 0x010014cf, 0x010057ce,
+    0x0000975e, 0x0000d85a, 0x010018ca, 0x01005bcb, 0x00009b5b,
+    0x0100ddc9, 0x00001d59, 0x00005e58, 0x01009ec8, 0x0100e1d8,
+    0x00002148, 0x00006249, 0x0100a2d9, 0x0000e44b, 0x010024db,
+    0x010067da, 0x0000a74a, 0x0000e84e, 0x010028de, 0x01006bdf,
+    0x0000ab4f, 0x0100eddd, 0x00002d4d, 0x00006e4c, 0x0100aedc,
+    0x0000f044, 0x010030d4, 0x010073d5, 0x0000b345, 0x0100f5d7,
+    0x00003547, 0x00007646, 0x0100b6d6, 0x0100f9d2, 0x00003942,
+    0x00007a43, 0x0100bad3, 0x0000fc41, 0x01003cd1, 0x01007fd0,
+    0x0000bf40},
+   {0x00000000, 0x01c10190, 0x01820090, 0x00430100, 0x01040290,
+    0x00c50300, 0x00860200, 0x01470390, 0x01080790, 0x00c90600,
+    0x008a0700, 0x014b0690, 0x000c0500, 0x01cd0490, 0x018e0590,
+    0x004f0400, 0x01100d90, 0x00d10c00, 0x00920d00, 0x01530c90,
+    0x00140f00, 0x01d50e90, 0x01960f90, 0x00570e00, 0x00180a00,
+    0x01d90b90, 0x019a0a90, 0x005b0b00, 0x011c0890, 0x00dd0900,
+    0x009e0800, 0x015f0990, 0x01201990, 0x00e11800, 0x00a21900,
+    0x01631890, 0x00241b00, 0x01e51a90, 0x01a61b90, 0x00671a00,
+    0x00281e00, 0x01e91f90, 0x01aa1e90, 0x006b1f00, 0x012c1c90,
+    0x00ed1d00, 0x00ae1c00, 0x016f1d90, 0x00301400, 0x01f11590,
+    0x01b21490, 0x00731500, 0x01341690, 0x00f51700, 0x00b61600,
+    0x01771790, 0x01381390, 0x00f91200, 0x00ba1300, 0x017b1290,
+    0x003c1100, 0x01fd1090, 0x01be1190, 0x007f1000, 0x01403190,
+    0x00813000, 0x00c23100, 0x01033090, 0x00443300, 0x01853290,
+    0x01c63390, 0x00073200, 0x00483600, 0x01893790, 0x01ca3690,
+    0x000b3700, 0x014c3490, 0x008d3500, 0x00ce3400, 0x010f3590,
+    0x00503c00, 0x01913d90, 0x01d23c90, 0x00133d00, 0x01543e90,
+    0x00953f00, 0x00d63e00, 0x01173f90, 0x01583b90, 0x00993a00,
+    0x00da3b00, 0x011b3a90, 0x005c3900, 0x019d3890, 0x01de3990,
+    0x001f3800, 0x00602800, 0x01a12990, 0x01e22890, 0x00232900,
+    0x01642a90, 0x00a52b00, 0x00e62a00, 0x01272b90, 0x01682f90,
+    0x00a92e00, 0x00ea2f00, 0x012b2e90, 0x006c2d00, 0x01ad2c90,
+    0x01ee2d90, 0x002f2c00, 0x01702590, 0x00b12400, 0x00f22500,
+    0x01332490, 0x00742700, 0x01b52690, 0x01f62790, 0x00372600,
+    0x00782200, 0x01b92390, 0x01fa2290, 0x003b2300, 0x017c2090,
+    0x00bd2100, 0x00fe2000, 0x013f2190, 0x01806190, 0x00416000,
+    0x00026100, 0x01c36090, 0x00846300, 0x01456290, 0x01066390,
+    0x00c76200, 0x00886600, 0x01496790, 0x010a6690, 0x00cb6700,
+    0x018c6490, 0x004d6500, 0x000e6400, 0x01cf6590, 0x00906c00,
+    0x01516d90, 0x01126c90, 0x00d36d00, 0x01946e90, 0x00556f00,
+    0x00166e00, 0x01d76f90, 0x01986b90, 0x00596a00, 0x001a6b00,
+    0x01db6a90, 0x009c6900, 0x015d6890, 0x011e6990, 0x00df6800,
+    0x00a07800, 0x01617990, 0x01227890, 0x00e37900, 0x01a47a90,
+    0x00657b00, 0x00267a00, 0x01e77b90, 0x01a87f90, 0x00697e00,
+    0x002a7f00, 0x01eb7e90, 0x00ac7d00, 0x016d7c90, 0x012e7d90,
+    0x00ef7c00, 0x01b07590, 0x00717400, 0x00327500, 0x01f37490,
+    0x00b47700, 0x01757690, 0x01367790, 0x00f77600, 0x00b87200,
+    0x01797390, 0x013a7290, 0x00fb7300, 0x01bc7090, 0x007d7100,
+    0x003e7000, 0x01ff7190, 0x00c05000, 0x01015190, 0x01425090,
+    0x00835100, 0x01c45290, 0x00055300, 0x00465200, 0x01875390,
+    0x01c85790, 0x00095600, 0x004a5700, 0x018b5690, 0x00cc5500,
+    0x010d5490, 0x014e5590, 0x008f5400, 0x01d05d90, 0x00115c00,
+    0x00525d00, 0x01935c90, 0x00d45f00, 0x01155e90, 0x01565f90,
+    0x00975e00, 0x00d85a00, 0x01195b90, 0x015a5a90, 0x009b5b00,
+    0x01dc5890, 0x001d5900, 0x005e5800, 0x019f5990, 0x01e04990,
+    0x00214800, 0x00624900, 0x01a34890, 0x00e44b00, 0x01254a90,
+    0x01664b90, 0x00a74a00, 0x00e84e00, 0x01294f90, 0x016a4e90,
+    0x00ab4f00, 0x01ec4c90, 0x002d4d00, 0x006e4c00, 0x01af4d90,
+    0x00f04400, 0x01314590, 0x01724490, 0x00b34500, 0x01f44690,
+    0x00354700, 0x00764600, 0x01b74790, 0x01f84390, 0x00394200,
+    0x007a4300, 0x01bb4290, 0x00fc4100, 0x013d4090, 0x017e4190,
+    0x00bf4000},
+   {0x00000000, 0xc0000190, 0x83010190, 0x43010000, 0x05030190,
+    0xc5030000, 0x86020000, 0x46020190, 0x09060190, 0xc9060000,
+    0x8a070000, 0x4a070190, 0x0c050000, 0xcc050190, 0x8f040190,
+    0x4f040000, 0x110c0190, 0xd10c0000, 0x920d0000, 0x520d0190,
+    0x140f0000, 0xd40f0190, 0x970e0190, 0x570e0000, 0x180a0000,
+    0xd80a0190, 0x9b0b0190, 0x5b0b0000, 0x1d090190, 0xdd090000,
+    0x9e080000, 0x5e080190, 0x21180190, 0xe1180000, 0xa2190000,
+    0x62190190, 0x241b0000, 0xe41b0190, 0xa71a0190, 0x671a0000,
+    0x281e0000, 0xe81e0190, 0xab1f0190, 0x6b1f0000, 0x2d1d0190,
+    0xed1d0000, 0xae1c0000, 0x6e1c0190, 0x30140000, 0xf0140190,
+    0xb3150190, 0x73150000, 0x35170190, 0xf5170000, 0xb6160000,
+    0x76160190, 0x39120190, 0xf9120000, 0xba130000, 0x7a130190,
+    0x3c110000, 0xfc110190, 0xbf100190, 0x7f100000, 0x41300190,
+    0x81300000, 0xc2310000, 0x02310190, 0x44330000, 0x84330190,
+    0xc7320190, 0x07320000, 0x48360000, 0x88360190, 0xcb370190,
+    0x0b370000, 0x4d350190, 0x8d350000, 0xce340000, 0x0e340190,
+    0x503c0000, 0x903c0190, 0xd33d0190, 0x133d0000, 0x553f0190,
+    0x953f0000, 0xd63e0000, 0x163e0190, 0x593a0190, 0x993a0000,
+    0xda3b0000, 0x1a3b0190, 0x5c390000, 0x9c390190, 0xdf380190,
+    0x1f380000, 0x60280000, 0xa0280190, 0xe3290190, 0x23290000,
+    0x652b0190, 0xa52b0000, 0xe62a0000, 0x262a0190, 0x692e0190,
+    0xa92e0000, 0xea2f0000, 0x2a2f0190, 0x6c2d0000, 0xac2d0190,
+    0xef2c0190, 0x2f2c0000, 0x71240190, 0xb1240000, 0xf2250000,
+    0x32250190, 0x74270000, 0xb4270190, 0xf7260190, 0x37260000,
+    0x78220000, 0xb8220190, 0xfb230190, 0x3b230000, 0x7d210190,
+    0xbd210000, 0xfe200000, 0x3e200190, 0x81600190, 0x41600000,
+    0x02610000, 0xc2610190, 0x84630000, 0x44630190, 0x07620190,
+    0xc7620000, 0x88660000, 0x48660190, 0x0b670190, 0xcb670000,
+    0x8d650190, 0x4d650000, 0x0e640000, 0xce640190, 0x906c0000,
+    0x506c0190, 0x136d0190, 0xd36d0000, 0x956f0190, 0x556f0000,
+    0x166e0000, 0xd66e0190, 0x996a0190, 0x596a0000, 0x1a6b0000,
+    0xda6b0190, 0x9c690000, 0x5c690190, 0x1f680190, 0xdf680000,
+    0xa0780000, 0x60780190, 0x23790190, 0xe3790000, 0xa57b0190,
+    0x657b0000, 0x267a0000, 0xe67a0190, 0xa97e0190, 0x697e0000,
+    0x2a7f0000, 0xea7f0190, 0xac7d0000, 0x6c7d0190, 0x2f7c0190,
+    0xef7c0000, 0xb1740190, 0x71740000, 0x32750000, 0xf2750190,
+    0xb4770000, 0x74770190, 0x37760190, 0xf7760000, 0xb8720000,
+    0x78720190, 0x3b730190, 0xfb730000, 0xbd710190, 0x7d710000,
+    0x3e700000, 0xfe700190, 0xc0500000, 0x00500190, 0x43510190,
+    0x83510000, 0xc5530190, 0x05530000, 0x46520000, 0x86520190,
+    0xc9560190, 0x09560000, 0x4a570000, 0x8a570190, 0xcc550000,
+    0x0c550190, 0x4f540190, 0x8f540000, 0xd15c0190, 0x115c0000,
+    0x525d0000, 0x925d0190, 0xd45f0000, 0x145f0190, 0x575e0190,
+    0x975e0000, 0xd85a0000, 0x185a0190, 0x5b5b0190, 0x9b5b0000,
+    0xdd590190, 0x1d590000, 0x5e580000, 0x9e580190, 0xe1480190,
+    0x21480000, 0x62490000, 0xa2490190, 0xe44b0000, 0x244b0190,
+    0x674a0190, 0xa74a0000, 0xe84e0000, 0x284e0190, 0x6b4f0190,
+    0xab4f0000, 0xed4d0190, 0x2d4d0000, 0x6e4c0000, 0xae4c0190,
+    0xf0440000, 0x30440190, 0x73450190, 0xb3450000, 0xf5470190,
+    0x35470000, 0x76460000, 0xb6460190, 0xf9420190, 0x39420000,
+    0x7a430000, 0xba430190, 0xfc410000, 0x3c410190, 0x7f400190,
+    0xbf400000},
+   {0x00000000, 0x00c1906c, 0x008221d9, 0x0043b1b5, 0x03044002,
+    0x03c5d06e, 0x038661db, 0x0347f1b7, 0x06088004, 0x06c91068,
+    0x068aa1dd, 0x064b31b1, 0x050cc006, 0x05cd506a, 0x058ee1df,
+    0x054f71b3, 0x0c100009, 0x0cd19065, 0x0c9221d0, 0x0c53b1bc,
+    0x0f14400b, 0x0fd5d067, 0x0f9661d2, 0x0f57f1be, 0x0a18800d,
+    0x0ad91061, 0x0a9aa1d4, 0x0a5b31b8, 0x091cc00f, 0x09dd5063,
+    0x099ee1d6, 0x095f71ba, 0x18200012, 0x18e1907e, 0x18a221cb,
+    0x1863b1a7, 0x1b244010, 0x1be5d07c, 0x1ba661c9, 0x1b67f1a5,
+    0x1e288016, 0x1ee9107a, 0x1eaaa1cf, 0x1e6b31a3, 0x1d2cc014,
+    0x1ded5078, 0x1daee1cd, 0x1d6f71a1, 0x1430001b, 0x14f19077,
+    0x14b221c2, 0x1473b1ae, 0x17344019, 0x17f5d075, 0x17b661c0,
+    0x1777f1ac, 0x1238801f, 0x12f91073, 0x12baa1c6, 0x127b31aa,
+    0x113cc01d, 0x11fd5071, 0x11bee1c4, 0x117f71a8, 0x30400024,
+    0x30819048, 0x30c221fd, 0x3003b191, 0x33444026, 0x3385d04a,
+    0x33c661ff, 0x3307f193, 0x36488020, 0x3689104c, 0x36caa1f9,
+    0x360b3195, 0x354cc022, 0x358d504e, 0x35cee1fb, 0x350f7197,
+    0x3c50002d, 0x3c919041, 0x3cd221f4, 0x3c13b198, 0x3f54402f,
+    0x3f95d043, 0x3fd661f6, 0x3f17f19a, 0x3a588029, 0x3a991045,
+    0x3adaa1f0, 0x3a1b319c, 0x395cc02b, 0x399d5047, 0x39dee1f2,
+    0x391f719e, 0x28600036, 0x28a1905a, 0x28e221ef, 0x2823b183,
+    0x2b644034, 0x2ba5d058, 0x2be661ed, 0x2b27f181, 0x2e688032,
+    0x2ea9105e, 0x2eeaa1eb, 0x2e2b3187, 0x2d6cc030, 0x2dad505c,
+    0x2deee1e9, 0x2d2f7185, 0x2470003f, 0x24b19053, 0x24f221e6,
+    0x2433b18a, 0x2774403d, 0x27b5d051, 0x27f661e4, 0x2737f188,
+    0x2278803b, 0x22b91057, 0x22faa1e2, 0x223b318e, 0x217cc039,
+    0x21bd5055, 0x21fee1e0, 0x213f718c, 0x60800048, 0x60419024,
+    0x60022191, 0x60c3b1fd, 0x6384404a, 0x6345d026, 0x63066193,
+    0x63c7f1ff, 0x6688804c, 0x66491020, 0x660aa195, 0x66cb31f9,
+    0x658cc04e, 0x654d5022, 0x650ee197, 0x65cf71fb, 0x6c900041,
+    0x6c51902d, 0x6c122198, 0x6cd3b1f4, 0x6f944043, 0x6f55d02f,
+    0x6f16619a, 0x6fd7f1f6, 0x6a988045, 0x6a591029, 0x6a1aa19c,
+    0x6adb31f0, 0x699cc047, 0x695d502b, 0x691ee19e, 0x69df71f2,
+    0x78a0005a, 0x78619036, 0x78222183, 0x78e3b1ef, 0x7ba44058,
+    0x7b65d034, 0x7b266181, 0x7be7f1ed, 0x7ea8805e, 0x7e691032,
+    0x7e2aa187, 0x7eeb31eb, 0x7dacc05c, 0x7d6d5030, 0x7d2ee185,
+    0x7def71e9, 0x74b00053, 0x7471903f, 0x7432218a, 0x74f3b1e6,
+    0x77b44051, 0x7775d03d, 0x77366188, 0x77f7f1e4, 0x72b88057,
+    0x7279103b, 0x723aa18e, 0x72fb31e2, 0x71bcc055, 0x717d5039,
+    0x713ee18c, 0x71ff71e0, 0x50c0006c, 0x50019000, 0x504221b5,
+    0x5083b1d9, 0x53c4406e, 0x5305d002, 0x534661b7, 0x5387f1db,
+    0x56c88068, 0x56091004, 0x564aa1b1, 0x568b31dd, 0x55ccc06a,
+    0x550d5006, 0x554ee1b3, 0x558f71df, 0x5cd00065, 0x5c119009,
+    0x5c5221bc, 0x5c93b1d0, 0x5fd44067, 0x5f15d00b, 0x5f5661be,
+    0x5f97f1d2, 0x5ad88061, 0x5a19100d, 0x5a5aa1b8, 0x5a9b31d4,
+    0x59dcc063, 0x591d500f, 0x595ee1ba, 0x599f71d6, 0x48e0007e,
+    0x48219012, 0x486221a7, 0x48a3b1cb, 0x4be4407c, 0x4b25d010,
+    0x4b6661a5, 0x4ba7f1c9, 0x4ee8807a, 0x4e291016, 0x4e6aa1a3,
+    0x4eab31cf, 0x4decc078, 0x4d2d5014, 0x4d6ee1a1, 0x4daf71cd,
+    0x44f00077, 0x4431901b, 0x447221ae, 0x44b3b1c2, 0x47f44075,
+    0x4735d019, 0x477661ac, 0x47b7f1c0, 0x42f88073, 0x4239101f,
+    0x427aa1aa, 0x42bb31c6, 0x41fcc071, 0x413d501d, 0x417ee1a8,
+    0x41bf71c4}};
+
+#endif
+
+#endif
+
+#if N == 5
+
+#if W == 8
+
+static const crc_t crc_braid_table[][256] = {
+   {0x00000000, 0x86acf0c0, 0xbd5ae183, 0x3bf61143, 0xcab6c305,
+    0x4c1a33c5, 0x77ec2286, 0xf140d246, 0x256e8609, 0xa3c276c9,
+    0x9834678a, 0x1e98974a, 0xefd8450c, 0x6974b5cc, 0x5282a48f,
+    0xd42e544f, 0x4add0c12, 0xcc71fcd2, 0xf787ed91, 0x712b1d51,
+    0x806bcf17, 0x06c73fd7, 0x3d312e94, 0xbb9dde54, 0x6fb38a1b,
+    0xe91f7adb, 0xd2e96b98, 0x54459b58, 0xa505491e, 0x23a9b9de,
+    0x185fa89d, 0x9ef3585d, 0x95ba1824, 0x1316e8e4, 0x28e0f9a7,
+    0xae4c0967, 0x5f0cdb21, 0xd9a02be1, 0xe2563aa2, 0x64faca62,
+    0xb0d49e2d, 0x36786eed, 0x0d8e7fae, 0x8b228f6e, 0x7a625d28,
+    0xfcceade8, 0xc738bcab, 0x41944c6b, 0xdf671436, 0x59cbe4f6,
+    0x623df5b5, 0xe4910575, 0x15d1d733, 0x937d27f3, 0xa88b36b0,
+    0x2e27c670, 0xfa09923f, 0x7ca562ff, 0x475373bc, 0xc1ff837c,
+    0x30bf513a, 0xb613a1fa, 0x8de5b0b9, 0x0b494079, 0x9b77304b,
+    0x1ddbc08b, 0x262dd1c8, 0xa0812108, 0x51c1f34e, 0xd76d038e,
+    0xec9b12cd, 0x6a37e20d, 0xbe19b642, 0x38b54682, 0x034357c1,
+    0x85efa701, 0x74af7547, 0xf2038587, 0xc9f594c4, 0x4f596404,
+    0xd1aa3c59, 0x5706cc99, 0x6cf0ddda, 0xea5c2d1a, 0x1b1cff5c,
+    0x9db00f9c, 0xa6461edf, 0x20eaee1f, 0xf4c4ba50, 0x72684a90,
+    0x499e5bd3, 0xcf32ab13, 0x3e727955, 0xb8de8995, 0x832898d6,
+    0x05846816, 0x0ecd286f, 0x8861d8af, 0xb397c9ec, 0x353b392c,
+    0xc47beb6a, 0x42d71baa, 0x79210ae9, 0xff8dfa29, 0x2ba3ae66,
+    0xad0f5ea6, 0x96f94fe5, 0x1055bf25, 0xe1156d63, 0x67b99da3,
+    0x5c4f8ce0, 0xdae37c20, 0x4410247d, 0xc2bcd4bd, 0xf94ac5fe,
+    0x7fe6353e, 0x8ea6e778, 0x080a17b8, 0x33fc06fb, 0xb550f63b,
+    0x617ea274, 0xe7d252b4, 0xdc2443f7, 0x5a88b337, 0xabc86171,
+    0x2d6491b1, 0x169280f2, 0x903e7032, 0x86ed6095, 0x00419055,
+    0x3bb78116, 0xbd1b71d6, 0x4c5ba390, 0xcaf75350, 0xf1014213,
+    0x77adb2d3, 0xa383e69c, 0x252f165c, 0x1ed9071f, 0x9875f7df,
+    0x69352599, 0xef99d559, 0xd46fc41a, 0x52c334da, 0xcc306c87,
+    0x4a9c9c47, 0x716a8d04, 0xf7c67dc4, 0x0686af82, 0x802a5f42,
+    0xbbdc4e01, 0x3d70bec1, 0xe95eea8e, 0x6ff21a4e, 0x54040b0d,
+    0xd2a8fbcd, 0x23e8298b, 0xa544d94b, 0x9eb2c808, 0x181e38c8,
+    0x135778b1, 0x95fb8871, 0xae0d9932, 0x28a169f2, 0xd9e1bbb4,
+    0x5f4d4b74, 0x64bb5a37, 0xe217aaf7, 0x3639feb8, 0xb0950e78,
+    0x8b631f3b, 0x0dcfeffb, 0xfc8f3dbd, 0x7a23cd7d, 0x41d5dc3e,
+    0xc7792cfe, 0x598a74a3, 0xdf268463, 0xe4d09520, 0x627c65e0,
+    0x933cb7a6, 0x15904766, 0x2e665625, 0xa8caa6e5, 0x7ce4f2aa,
+    0xfa48026a, 0xc1be1329, 0x4712e3e9, 0xb65231af, 0x30fec16f,
+    0x0b08d02c, 0x8da420ec, 0x1d9a50de, 0x9b36a01e, 0xa0c0b15d,
+    0x266c419d, 0xd72c93db, 0x5180631b, 0x6a767258, 0xecda8298,
+    0x38f4d6d7, 0xbe582617, 0x85ae3754, 0x0302c794, 0xf24215d2,
+    0x74eee512, 0x4f18f451, 0xc9b40491, 0x57475ccc, 0xd1ebac0c,
+    0xea1dbd4f, 0x6cb14d8f, 0x9df19fc9, 0x1b5d6f09, 0x20ab7e4a,
+    0xa6078e8a, 0x7229dac5, 0xf4852a05, 0xcf733b46, 0x49dfcb86,
+    0xb89f19c0, 0x3e33e900, 0x05c5f843, 0x83690883, 0x882048fa,
+    0x0e8cb83a, 0x357aa979, 0xb3d659b9, 0x42968bff, 0xc43a7b3f,
+    0xffcc6a7c, 0x79609abc, 0xad4ecef3, 0x2be23e33, 0x10142f70,
+    0x96b8dfb0, 0x67f80df6, 0xe154fd36, 0xdaa2ec75, 0x5c0e1cb5,
+    0xc2fd44e8, 0x4451b428, 0x7fa7a56b, 0xf90b55ab, 0x084b87ed,
+    0x8ee7772d, 0xb511666e, 0x33bd96ae, 0xe793c2e1, 0x613f3221,
+    0x5ac92362, 0xdc65d3a2, 0x2d2501e4, 0xab89f124, 0x907fe067,
+    0x16d310a7},
+   {0x00000000, 0xbdd9c129, 0xcbb08251, 0x76694378, 0x276204a1,
+    0x9abbc588, 0xecd286f0, 0x510b47d9, 0x4ec40942, 0xf31dc86b,
+    0x85748b13, 0x38ad4a3a, 0x69a60de3, 0xd47fccca, 0xa2168fb2,
+    0x1fcf4e9b, 0x9d881284, 0x2051d3ad, 0x563890d5, 0xebe151fc,
+    0xbaea1625, 0x0733d70c, 0x715a9474, 0xcc83555d, 0xd34c1bc6,
+    0x6e95daef, 0x18fc9997, 0xa52558be, 0xf42e1f67, 0x49f7de4e,
+    0x3f9e9d36, 0x82475c1f, 0x8b13250b, 0x36cae422, 0x40a3a75a,
+    0xfd7a6673, 0xac7121aa, 0x11a8e083, 0x67c1a3fb, 0xda1862d2,
+    0xc5d72c49, 0x780eed60, 0x0e67ae18, 0xb3be6f31, 0xe2b528e8,
+    0x5f6ce9c1, 0x2905aab9, 0x94dc6b90, 0x169b378f, 0xab42f6a6,
+    0xdd2bb5de, 0x60f274f7, 0x31f9332e, 0x8c20f207, 0xfa49b17f,
+    0x47907056, 0x585f3ecd, 0xe586ffe4, 0x93efbc9c, 0x2e367db5,
+    0x7f3d3a6c, 0xc2e4fb45, 0xb48db83d, 0x09547914, 0xa6254a15,
+    0x1bfc8b3c, 0x6d95c844, 0xd04c096d, 0x81474eb4, 0x3c9e8f9d,
+    0x4af7cce5, 0xf72e0dcc, 0xe8e14357, 0x5538827e, 0x2351c106,
+    0x9e88002f, 0xcf8347f6, 0x725a86df, 0x0433c5a7, 0xb9ea048e,
+    0x3bad5891, 0x867499b8, 0xf01ddac0, 0x4dc41be9, 0x1ccf5c30,
+    0xa1169d19, 0xd77fde61, 0x6aa61f48, 0x756951d3, 0xc8b090fa,
+    0xbed9d382, 0x030012ab, 0x520b5572, 0xefd2945b, 0x99bbd723,
+    0x2462160a, 0x2d366f1e, 0x90efae37, 0xe686ed4f, 0x5b5f2c66,
+    0x0a546bbf, 0xb78daa96, 0xc1e4e9ee, 0x7c3d28c7, 0x63f2665c,
+    0xde2ba775, 0xa842e40d, 0x159b2524, 0x449062fd, 0xf949a3d4,
+    0x8f20e0ac, 0x32f92185, 0xb0be7d9a, 0x0d67bcb3, 0x7b0effcb,
+    0xc6d73ee2, 0x97dc793b, 0x2a05b812, 0x5c6cfb6a, 0xe1b53a43,
+    0xfe7a74d8, 0x43a3b5f1, 0x35caf689, 0x881337a0, 0xd9187079,
+    0x64c1b150, 0x12a8f228, 0xaf713301, 0xfc499429, 0x41905500,
+    0x37f91678, 0x8a20d751, 0xdb2b9088, 0x66f251a1, 0x109b12d9,
+    0xad42d3f0, 0xb28d9d6b, 0x0f545c42, 0x793d1f3a, 0xc4e4de13,
+    0x95ef99ca, 0x283658e3, 0x5e5f1b9b, 0xe386dab2, 0x61c186ad,
+    0xdc184784, 0xaa7104fc, 0x17a8c5d5, 0x46a3820c, 0xfb7a4325,
+    0x8d13005d, 0x30cac174, 0x2f058fef, 0x92dc4ec6, 0xe4b50dbe,
+    0x596ccc97, 0x08678b4e, 0xb5be4a67, 0xc3d7091f, 0x7e0ec836,
+    0x775ab122, 0xca83700b, 0xbcea3373, 0x0133f25a, 0x5038b583,
+    0xede174aa, 0x9b8837d2, 0x2651f6fb, 0x399eb860, 0x84477949,
+    0xf22e3a31, 0x4ff7fb18, 0x1efcbcc1, 0xa3257de8, 0xd54c3e90,
+    0x6895ffb9, 0xead2a3a6, 0x570b628f, 0x216221f7, 0x9cbbe0de,
+    0xcdb0a707, 0x7069662e, 0x06002556, 0xbbd9e47f, 0xa416aae4,
+    0x19cf6bcd, 0x6fa628b5, 0xd27fe99c, 0x8374ae45, 0x3ead6f6c,
+    0x48c42c14, 0xf51ded3d, 0x5a6cde3c, 0xe7b51f15, 0x91dc5c6d,
+    0x2c059d44, 0x7d0eda9d, 0xc0d71bb4, 0xb6be58cc, 0x0b6799e5,
+    0x14a8d77e, 0xa9711657, 0xdf18552f, 0x62c19406, 0x33cad3df,
+    0x8e1312f6, 0xf87a518e, 0x45a390a7, 0xc7e4ccb8, 0x7a3d0d91,
+    0x0c544ee9, 0xb18d8fc0, 0xe086c819, 0x5d5f0930, 0x2b364a48,
+    0x96ef8b61, 0x8920c5fa, 0x34f904d3, 0x429047ab, 0xff498682,
+    0xae42c15b, 0x139b0072, 0x65f2430a, 0xd82b8223, 0xd17ffb37,
+    0x6ca63a1e, 0x1acf7966, 0xa716b84f, 0xf61dff96, 0x4bc43ebf,
+    0x3dad7dc7, 0x8074bcee, 0x9fbbf275, 0x2262335c, 0x540b7024,
+    0xe9d2b10d, 0xb8d9f6d4, 0x050037fd, 0x73697485, 0xceb0b5ac,
+    0x4cf7e9b3, 0xf12e289a, 0x87476be2, 0x3a9eaacb, 0x6b95ed12,
+    0xd64c2c3b, 0xa0256f43, 0x1dfcae6a, 0x0233e0f1, 0xbfea21d8,
+    0xc98362a0, 0x745aa389, 0x2551e450, 0x98882579, 0xeee16601,
+    0x5338a728},
+   {0x00000000, 0x48902851, 0x912050a2, 0xd9b078f3, 0x9243a147,
+    0xdad38916, 0x0363f1e5, 0x4bf3d9b4, 0x9484428d, 0xdc146adc,
+    0x05a4122f, 0x4d343a7e, 0x06c7e3ca, 0x4e57cb9b, 0x97e7b368,
+    0xdf779b39, 0x990b8519, 0xd19bad48, 0x082bd5bb, 0x40bbfdea,
+    0x0b48245e, 0x43d80c0f, 0x9a6874fc, 0xd2f85cad, 0x0d8fc794,
+    0x451fefc5, 0x9caf9736, 0xd43fbf67, 0x9fcc66d3, 0xd75c4e82,
+    0x0eec3671, 0x467c1e20, 0x82140a31, 0xca842260, 0x13345a93,
+    0x5ba472c2, 0x1057ab76, 0x58c78327, 0x8177fbd4, 0xc9e7d385,
+    0x169048bc, 0x5e0060ed, 0x87b0181e, 0xcf20304f, 0x84d3e9fb,
+    0xcc43c1aa, 0x15f3b959, 0x5d639108, 0x1b1f8f28, 0x538fa779,
+    0x8a3fdf8a, 0xc2aff7db, 0x895c2e6f, 0xc1cc063e, 0x187c7ecd,
+    0x50ec569c, 0x8f9bcda5, 0xc70be5f4, 0x1ebb9d07, 0x562bb556,
+    0x1dd86ce2, 0x554844b3, 0x8cf83c40, 0xc4681411, 0xb42b1461,
+    0xfcbb3c30, 0x250b44c3, 0x6d9b6c92, 0x2668b526, 0x6ef89d77,
+    0xb748e584, 0xffd8cdd5, 0x20af56ec, 0x683f7ebd, 0xb18f064e,
+    0xf91f2e1f, 0xb2ecf7ab, 0xfa7cdffa, 0x23cca709, 0x6b5c8f58,
+    0x2d209178, 0x65b0b929, 0xbc00c1da, 0xf490e98b, 0xbf63303f,
+    0xf7f3186e, 0x2e43609d, 0x66d348cc, 0xb9a4d3f5, 0xf134fba4,
+    0x28848357, 0x6014ab06, 0x2be772b2, 0x63775ae3, 0xbac72210,
+    0xf2570a41, 0x363f1e50, 0x7eaf3601, 0xa71f4ef2, 0xef8f66a3,
+    0xa47cbf17, 0xecec9746, 0x355cefb5, 0x7dccc7e4, 0xa2bb5cdd,
+    0xea2b748c, 0x339b0c7f, 0x7b0b242e, 0x30f8fd9a, 0x7868d5cb,
+    0xa1d8ad38, 0xe9488569, 0xaf349b49, 0xe7a4b318, 0x3e14cbeb,
+    0x7684e3ba, 0x3d773a0e, 0x75e7125f, 0xac576aac, 0xe4c742fd,
+    0x3bb0d9c4, 0x7320f195, 0xaa908966, 0xe200a137, 0xa9f37883,
+    0xe16350d2, 0x38d32821, 0x70430070, 0xd85528c1, 0x90c50090,
+    0x49757863, 0x01e55032, 0x4a168986, 0x0286a1d7, 0xdb36d924,
+    0x93a6f175, 0x4cd16a4c, 0x0441421d, 0xddf13aee, 0x956112bf,
+    0xde92cb0b, 0x9602e35a, 0x4fb29ba9, 0x0722b3f8, 0x415eadd8,
+    0x09ce8589, 0xd07efd7a, 0x98eed52b, 0xd31d0c9f, 0x9b8d24ce,
+    0x423d5c3d, 0x0aad746c, 0xd5daef55, 0x9d4ac704, 0x44fabff7,
+    0x0c6a97a6, 0x47994e12, 0x0f096643, 0xd6b91eb0, 0x9e2936e1,
+    0x5a4122f0, 0x12d10aa1, 0xcb617252, 0x83f15a03, 0xc80283b7,
+    0x8092abe6, 0x5922d315, 0x11b2fb44, 0xcec5607d, 0x8655482c,
+    0x5fe530df, 0x1775188e, 0x5c86c13a, 0x1416e96b, 0xcda69198,
+    0x8536b9c9, 0xc34aa7e9, 0x8bda8fb8, 0x526af74b, 0x1afadf1a,
+    0x510906ae, 0x19992eff, 0xc029560c, 0x88b97e5d, 0x57cee564,
+    0x1f5ecd35, 0xc6eeb5c6, 0x8e7e9d97, 0xc58d4423, 0x8d1d6c72,
+    0x54ad1481, 0x1c3d3cd0, 0x6c7e3ca0, 0x24ee14f1, 0xfd5e6c02,
+    0xb5ce4453, 0xfe3d9de7, 0xb6adb5b6, 0x6f1dcd45, 0x278de514,
+    0xf8fa7e2d, 0xb06a567c, 0x69da2e8f, 0x214a06de, 0x6ab9df6a,
+    0x2229f73b, 0xfb998fc8, 0xb309a799, 0xf575b9b9, 0xbde591e8,
+    0x6455e91b, 0x2cc5c14a, 0x673618fe, 0x2fa630af, 0xf616485c,
+    0xbe86600d, 0x61f1fb34, 0x2961d365, 0xf0d1ab96, 0xb84183c7,
+    0xf3b25a73, 0xbb227222, 0x62920ad1, 0x2a022280, 0xee6a3691,
+    0xa6fa1ec0, 0x7f4a6633, 0x37da4e62, 0x7c2997d6, 0x34b9bf87,
+    0xed09c774, 0xa599ef25, 0x7aee741c, 0x327e5c4d, 0xebce24be,
+    0xa35e0cef, 0xe8add55b, 0xa03dfd0a, 0x798d85f9, 0x311dada8,
+    0x7761b388, 0x3ff19bd9, 0xe641e32a, 0xaed1cb7b, 0xe52212cf,
+    0xadb23a9e, 0x7402426d, 0x3c926a3c, 0xe3e5f105, 0xab75d954,
+    0x72c5a1a7, 0x3a5589f6, 0x71a65042, 0x39367813, 0xe08600e0,
+    0xa81628b1},
+   {0x00000000, 0x00a95181, 0x0152a302, 0x01fbf283, 0x02a54604,
+    0x020c1785, 0x03f7e506, 0x035eb487, 0x054a8c08, 0x05e3dd89,
+    0x04182f0a, 0x04b17e8b, 0x07efca0c, 0x07469b8d, 0x06bd690e,
+    0x0614388f, 0x0a951810, 0x0a3c4991, 0x0bc7bb12, 0x0b6eea93,
+    0x08305e14, 0x08990f95, 0x0962fd16, 0x09cbac97, 0x0fdf9418,
+    0x0f76c599, 0x0e8d371a, 0x0e24669b, 0x0d7ad21c, 0x0dd3839d,
+    0x0c28711e, 0x0c81209f, 0x152a3020, 0x158361a1, 0x14789322,
+    0x14d1c2a3, 0x178f7624, 0x172627a5, 0x16ddd526, 0x167484a7,
+    0x1060bc28, 0x10c9eda9, 0x11321f2a, 0x119b4eab, 0x12c5fa2c,
+    0x126cabad, 0x1397592e, 0x133e08af, 0x1fbf2830, 0x1f1679b1,
+    0x1eed8b32, 0x1e44dab3, 0x1d1a6e34, 0x1db33fb5, 0x1c48cd36,
+    0x1ce19cb7, 0x1af5a438, 0x1a5cf5b9, 0x1ba7073a, 0x1b0e56bb,
+    0x1850e23c, 0x18f9b3bd, 0x1902413e, 0x19ab10bf, 0x2a546040,
+    0x2afd31c1, 0x2b06c342, 0x2baf92c3, 0x28f12644, 0x285877c5,
+    0x29a38546, 0x290ad4c7, 0x2f1eec48, 0x2fb7bdc9, 0x2e4c4f4a,
+    0x2ee51ecb, 0x2dbbaa4c, 0x2d12fbcd, 0x2ce9094e, 0x2c4058cf,
+    0x20c17850, 0x206829d1, 0x2193db52, 0x213a8ad3, 0x22643e54,
+    0x22cd6fd5, 0x23369d56, 0x239fccd7, 0x258bf458, 0x2522a5d9,
+    0x24d9575a, 0x247006db, 0x272eb25c, 0x2787e3dd, 0x267c115e,
+    0x26d540df, 0x3f7e5060, 0x3fd701e1, 0x3e2cf362, 0x3e85a2e3,
+    0x3ddb1664, 0x3d7247e5, 0x3c89b566, 0x3c20e4e7, 0x3a34dc68,
+    0x3a9d8de9, 0x3b667f6a, 0x3bcf2eeb, 0x38919a6c, 0x3838cbed,
+    0x39c3396e, 0x396a68ef, 0x35eb4870, 0x354219f1, 0x34b9eb72,
+    0x3410baf3, 0x374e0e74, 0x37e75ff5, 0x361cad76, 0x36b5fcf7,
+    0x30a1c478, 0x300895f9, 0x31f3677a, 0x315a36fb, 0x3204827c,
+    0x32add3fd, 0x3356217e, 0x33ff70ff, 0x54a8c080, 0x54019101,
+    0x55fa6382, 0x55533203, 0x560d8684, 0x56a4d705, 0x575f2586,
+    0x57f67407, 0x51e24c88, 0x514b1d09, 0x50b0ef8a, 0x5019be0b,
+    0x53470a8c, 0x53ee5b0d, 0x5215a98e, 0x52bcf80f, 0x5e3dd890,
+    0x5e948911, 0x5f6f7b92, 0x5fc62a13, 0x5c989e94, 0x5c31cf15,
+    0x5dca3d96, 0x5d636c17, 0x5b775498, 0x5bde0519, 0x5a25f79a,
+    0x5a8ca61b, 0x59d2129c, 0x597b431d, 0x5880b19e, 0x5829e01f,
+    0x4182f0a0, 0x412ba121, 0x40d053a2, 0x40790223, 0x4327b6a4,
+    0x438ee725, 0x427515a6, 0x42dc4427, 0x44c87ca8, 0x44612d29,
+    0x459adfaa, 0x45338e2b, 0x466d3aac, 0x46c46b2d, 0x473f99ae,
+    0x4796c82f, 0x4b17e8b0, 0x4bbeb931, 0x4a454bb2, 0x4aec1a33,
+    0x49b2aeb4, 0x491bff35, 0x48e00db6, 0x48495c37, 0x4e5d64b8,
+    0x4ef43539, 0x4f0fc7ba, 0x4fa6963b, 0x4cf822bc, 0x4c51733d,
+    0x4daa81be, 0x4d03d03f, 0x7efca0c0, 0x7e55f141, 0x7fae03c2,
+    0x7f075243, 0x7c59e6c4, 0x7cf0b745, 0x7d0b45c6, 0x7da21447,
+    0x7bb62cc8, 0x7b1f7d49, 0x7ae48fca, 0x7a4dde4b, 0x79136acc,
+    0x79ba3b4d, 0x7841c9ce, 0x78e8984f, 0x7469b8d0, 0x74c0e951,
+    0x753b1bd2, 0x75924a53, 0x76ccfed4, 0x7665af55, 0x779e5dd6,
+    0x77370c57, 0x712334d8, 0x718a6559, 0x707197da, 0x70d8c65b,
+    0x738672dc, 0x732f235d, 0x72d4d1de, 0x727d805f, 0x6bd690e0,
+    0x6b7fc161, 0x6a8433e2, 0x6a2d6263, 0x6973d6e4, 0x69da8765,
+    0x682175e6, 0x68882467, 0x6e9c1ce8, 0x6e354d69, 0x6fcebfea,
+    0x6f67ee6b, 0x6c395aec, 0x6c900b6d, 0x6d6bf9ee, 0x6dc2a86f,
+    0x614388f0, 0x61ead971, 0x60112bf2, 0x60b87a73, 0x63e6cef4,
+    0x634f9f75, 0x62b46df6, 0x621d3c77, 0x640904f8, 0x64a05579,
+    0x655ba7fa, 0x65f2f67b, 0x66ac42fc, 0x6605137d, 0x67fee1fe,
+    0x6757b07f},
+   {0x00000000, 0xa9518100, 0xe2a00203, 0x4bf18303, 0x75430405,
+    0xdc128505, 0x97e30606, 0x3eb28706, 0xea86080a, 0x43d7890a,
+    0x08260a09, 0xa1778b09, 0x9fc50c0f, 0x36948d0f, 0x7d650e0c,
+    0xd4348f0c, 0x650f1017, 0xcc5e9117, 0x87af1214, 0x2efe9314,
+    0x104c1412, 0xb91d9512, 0xf2ec1611, 0x5bbd9711, 0x8f89181d,
+    0x26d8991d, 0x6d291a1e, 0xc4789b1e, 0xfaca1c18, 0x539b9d18,
+    0x186a1e1b, 0xb13b9f1b, 0xca1e202e, 0x634fa12e, 0x28be222d,
+    0x81efa32d, 0xbf5d242b, 0x160ca52b, 0x5dfd2628, 0xf4aca728,
+    0x20982824, 0x89c9a924, 0xc2382a27, 0x6b69ab27, 0x55db2c21,
+    0xfc8aad21, 0xb77b2e22, 0x1e2aaf22, 0xaf113039, 0x0640b139,
+    0x4db1323a, 0xe4e0b33a, 0xda52343c, 0x7303b53c, 0x38f2363f,
+    0x91a3b73f, 0x45973833, 0xecc6b933, 0xa7373a30, 0x0e66bb30,
+    0x30d43c36, 0x9985bd36, 0xd2743e35, 0x7b25bf35, 0x243f405f,
+    0x8d6ec15f, 0xc69f425c, 0x6fcec35c, 0x517c445a, 0xf82dc55a,
+    0xb3dc4659, 0x1a8dc759, 0xceb94855, 0x67e8c955, 0x2c194a56,
+    0x8548cb56, 0xbbfa4c50, 0x12abcd50, 0x595a4e53, 0xf00bcf53,
+    0x41305048, 0xe861d148, 0xa390524b, 0x0ac1d34b, 0x3473544d,
+    0x9d22d54d, 0xd6d3564e, 0x7f82d74e, 0xabb65842, 0x02e7d942,
+    0x49165a41, 0xe047db41, 0xdef55c47, 0x77a4dd47, 0x3c555e44,
+    0x9504df44, 0xee216071, 0x4770e171, 0x0c816272, 0xa5d0e372,
+    0x9b626474, 0x3233e574, 0x79c26677, 0xd093e777, 0x04a7687b,
+    0xadf6e97b, 0xe6076a78, 0x4f56eb78, 0x71e46c7e, 0xd8b5ed7e,
+    0x93446e7d, 0x3a15ef7d, 0x8b2e7066, 0x227ff166, 0x698e7265,
+    0xc0dff365, 0xfe6d7463, 0x573cf563, 0x1ccd7660, 0xb59cf760,
+    0x61a8786c, 0xc8f9f96c, 0x83087a6f, 0x2a59fb6f, 0x14eb7c69,
+    0xbdbafd69, 0xf64b7e6a, 0x5f1aff6a, 0x487e80be, 0xe12f01be,
+    0xaade82bd, 0x038f03bd, 0x3d3d84bb, 0x946c05bb, 0xdf9d86b8,
+    0x76cc07b8, 0xa2f888b4, 0x0ba909b4, 0x40588ab7, 0xe9090bb7,
+    0xd7bb8cb1, 0x7eea0db1, 0x351b8eb2, 0x9c4a0fb2, 0x2d7190a9,
+    0x842011a9, 0xcfd192aa, 0x668013aa, 0x583294ac, 0xf16315ac,
+    0xba9296af, 0x13c317af, 0xc7f798a3, 0x6ea619a3, 0x25579aa0,
+    0x8c061ba0, 0xb2b49ca6, 0x1be51da6, 0x50149ea5, 0xf9451fa5,
+    0x8260a090, 0x2b312190, 0x60c0a293, 0xc9912393, 0xf723a495,
+    0x5e722595, 0x1583a696, 0xbcd22796, 0x68e6a89a, 0xc1b7299a,
+    0x8a46aa99, 0x23172b99, 0x1da5ac9f, 0xb4f42d9f, 0xff05ae9c,
+    0x56542f9c, 0xe76fb087, 0x4e3e3187, 0x05cfb284, 0xac9e3384,
+    0x922cb482, 0x3b7d3582, 0x708cb681, 0xd9dd3781, 0x0de9b88d,
+    0xa4b8398d, 0xef49ba8e, 0x46183b8e, 0x78aabc88, 0xd1fb3d88,
+    0x9a0abe8b, 0x335b3f8b, 0x6c41c0e1, 0xc51041e1, 0x8ee1c2e2,
+    0x27b043e2, 0x1902c4e4, 0xb05345e4, 0xfba2c6e7, 0x52f347e7,
+    0x86c7c8eb, 0x2f9649eb, 0x6467cae8, 0xcd364be8, 0xf384ccee,
+    0x5ad54dee, 0x1124ceed, 0xb8754fed, 0x094ed0f6, 0xa01f51f6,
+    0xebeed2f5, 0x42bf53f5, 0x7c0dd4f3, 0xd55c55f3, 0x9eadd6f0,
+    0x37fc57f0, 0xe3c8d8fc, 0x4a9959fc, 0x0168daff, 0xa8395bff,
+    0x968bdcf9, 0x3fda5df9, 0x742bdefa, 0xdd7a5ffa, 0xa65fe0cf,
+    0x0f0e61cf, 0x44ffe2cc, 0xedae63cc, 0xd31ce4ca, 0x7a4d65ca,
+    0x31bce6c9, 0x98ed67c9, 0x4cd9e8c5, 0xe58869c5, 0xae79eac6,
+    0x07286bc6, 0x399aecc0, 0x90cb6dc0, 0xdb3aeec3, 0x726b6fc3,
+    0xc350f0d8, 0x6a0171d8, 0x21f0f2db, 0x88a173db, 0xb613f4dd,
+    0x1f4275dd, 0x54b3f6de, 0xfde277de, 0x29d6f8d2, 0x808779d2,
+    0xcb76fad1, 0x62277bd1, 0x5c95fcd7, 0xf5c47dd7, 0xbe35fed4,
+    0x17647fd4},
+   {0x00000000, 0x90fd017c, 0x91f902fb, 0x01040387, 0x93f105f5,
+    0x030c0489, 0x0208070e, 0x92f50672, 0x97e10be9, 0x071c0a95,
+    0x06180912, 0x96e5086e, 0x04100e1c, 0x94ed0f60, 0x95e90ce7,
+    0x05140d9b, 0x9fc117d1, 0x0f3c16ad, 0x0e38152a, 0x9ec51456,
+    0x0c301224, 0x9ccd1358, 0x9dc910df, 0x0d3411a3, 0x08201c38,
+    0x98dd1d44, 0x99d91ec3, 0x09241fbf, 0x9bd119cd, 0x0b2c18b1,
+    0x0a281b36, 0x9ad51a4a, 0x8f812fa1, 0x1f7c2edd, 0x1e782d5a,
+    0x8e852c26, 0x1c702a54, 0x8c8d2b28, 0x8d8928af, 0x1d7429d3,
+    0x18602448, 0x889d2534, 0x899926b3, 0x196427cf, 0x8b9121bd,
+    0x1b6c20c1, 0x1a682346, 0x8a95223a, 0x10403870, 0x80bd390c,
+    0x81b93a8b, 0x11443bf7, 0x83b13d85, 0x134c3cf9, 0x12483f7e,
+    0x82b53e02, 0x87a13399, 0x175c32e5, 0x16583162, 0x86a5301e,
+    0x1450366c, 0x84ad3710, 0x85a93497, 0x155435eb, 0xaf015f41,
+    0x3ffc5e3d, 0x3ef85dba, 0xae055cc6, 0x3cf05ab4, 0xac0d5bc8,
+    0xad09584f, 0x3df45933, 0x38e054a8, 0xa81d55d4, 0xa9195653,
+    0x39e4572f, 0xab11515d, 0x3bec5021, 0x3ae853a6, 0xaa1552da,
+    0x30c04890, 0xa03d49ec, 0xa1394a6b, 0x31c44b17, 0xa3314d65,
+    0x33cc4c19, 0x32c84f9e, 0xa2354ee2, 0xa7214379, 0x37dc4205,
+    0x36d84182, 0xa62540fe, 0x34d0468c, 0xa42d47f0, 0xa5294477,
+    0x35d4450b, 0x208070e0, 0xb07d719c, 0xb179721b, 0x21847367,
+    0xb3717515, 0x238c7469, 0x228877ee, 0xb2757692, 0xb7617b09,
+    0x279c7a75, 0x269879f2, 0xb665788e, 0x24907efc, 0xb46d7f80,
+    0xb5697c07, 0x25947d7b, 0xbf416731, 0x2fbc664d, 0x2eb865ca,
+    0xbe4564b6, 0x2cb062c4, 0xbc4d63b8, 0xbd49603f, 0x2db46143,
+    0x28a06cd8, 0xb85d6da4, 0xb9596e23, 0x29a46f5f, 0xbb51692d,
+    0x2bac6851, 0x2aa86bd6, 0xba556aaa, 0xee01be81, 0x7efcbffd,
+    0x7ff8bc7a, 0xef05bd06, 0x7df0bb74, 0xed0dba08, 0xec09b98f,
+    0x7cf4b8f3, 0x79e0b568, 0xe91db414, 0xe819b793, 0x78e4b6ef,
+    0xea11b09d, 0x7aecb1e1, 0x7be8b266, 0xeb15b31a, 0x71c0a950,
+    0xe13da82c, 0xe039abab, 0x70c4aad7, 0xe231aca5, 0x72ccadd9,
+    0x73c8ae5e, 0xe335af22, 0xe621a2b9, 0x76dca3c5, 0x77d8a042,
+    0xe725a13e, 0x75d0a74c, 0xe52da630, 0xe429a5b7, 0x74d4a4cb,
+    0x61809120, 0xf17d905c, 0xf07993db, 0x608492a7, 0xf27194d5,
+    0x628c95a9, 0x6388962e, 0xf3759752, 0xf6619ac9, 0x669c9bb5,
+    0x67989832, 0xf765994e, 0x65909f3c, 0xf56d9e40, 0xf4699dc7,
+    0x64949cbb, 0xfe4186f1, 0x6ebc878d, 0x6fb8840a, 0xff458576,
+    0x6db08304, 0xfd4d8278, 0xfc4981ff, 0x6cb48083, 0x69a08d18,
+    0xf95d8c64, 0xf8598fe3, 0x68a48e9f, 0xfa5188ed, 0x6aac8991,
+    0x6ba88a16, 0xfb558b6a, 0x4100e1c0, 0xd1fde0bc, 0xd0f9e33b,
+    0x4004e247, 0xd2f1e435, 0x420ce549, 0x4308e6ce, 0xd3f5e7b2,
+    0xd6e1ea29, 0x461ceb55, 0x4718e8d2, 0xd7e5e9ae, 0x4510efdc,
+    0xd5edeea0, 0xd4e9ed27, 0x4414ec5b, 0xdec1f611, 0x4e3cf76d,
+    0x4f38f4ea, 0xdfc5f596, 0x4d30f3e4, 0xddcdf298, 0xdcc9f11f,
+    0x4c34f063, 0x4920fdf8, 0xd9ddfc84, 0xd8d9ff03, 0x4824fe7f,
+    0xdad1f80d, 0x4a2cf971, 0x4b28faf6, 0xdbd5fb8a, 0xce81ce61,
+    0x5e7ccf1d, 0x5f78cc9a, 0xcf85cde6, 0x5d70cb94, 0xcd8dcae8,
+    0xcc89c96f, 0x5c74c813, 0x5960c588, 0xc99dc4f4, 0xc899c773,
+    0x5864c60f, 0xca91c07d, 0x5a6cc101, 0x5b68c286, 0xcb95c3fa,
+    0x5140d9b0, 0xc1bdd8cc, 0xc0b9db4b, 0x5044da37, 0xc2b1dc45,
+    0x524cdd39, 0x5348debe, 0xc3b5dfc2, 0xc6a1d259, 0x565cd325,
+    0x5758d0a2, 0xc7a5d1de, 0x5550d7ac, 0xc5add6d0, 0xc4a9d557,
+    0x5454d42b},
+   {0x00000000, 0x6c007d01, 0xd800fa02, 0xb4008703, 0x0002f407,
+    0x6c028906, 0xd8020e05, 0xb4027304, 0x0005e80e, 0x6c05950f,
+    0xd805120c, 0xb4056f0d, 0x00071c09, 0x6c076108, 0xd807e60b,
+    0xb4079b0a, 0x000bd01c, 0x6c0bad1d, 0xd80b2a1e, 0xb40b571f,
+    0x0009241b, 0x6c09591a, 0xd809de19, 0xb409a318, 0x000e3812,
+    0x6c0e4513, 0xd80ec210, 0xb40ebf11, 0x000ccc15, 0x6c0cb114,
+    0xd80c3617, 0xb40c4b16, 0x0017a038, 0x6c17dd39, 0xd8175a3a,
+    0xb417273b, 0x0015543f, 0x6c15293e, 0xd815ae3d, 0xb415d33c,
+    0x00124836, 0x6c123537, 0xd812b234, 0xb412cf35, 0x0010bc31,
+    0x6c10c130, 0xd8104633, 0xb4103b32, 0x001c7024, 0x6c1c0d25,
+    0xd81c8a26, 0xb41cf727, 0x001e8423, 0x6c1ef922, 0xd81e7e21,
+    0xb41e0320, 0x0019982a, 0x6c19e52b, 0xd8196228, 0xb4191f29,
+    0x001b6c2d, 0x6c1b112c, 0xd81b962f, 0xb41beb2e, 0x002f4070,
+    0x6c2f3d71, 0xd82fba72, 0xb42fc773, 0x002db477, 0x6c2dc976,
+    0xd82d4e75, 0xb42d3374, 0x002aa87e, 0x6c2ad57f, 0xd82a527c,
+    0xb42a2f7d, 0x00285c79, 0x6c282178, 0xd828a67b, 0xb428db7a,
+    0x0024906c, 0x6c24ed6d, 0xd8246a6e, 0xb424176f, 0x0026646b,
+    0x6c26196a, 0xd8269e69, 0xb426e368, 0x00217862, 0x6c210563,
+    0xd8218260, 0xb421ff61, 0x00238c65, 0x6c23f164, 0xd8237667,
+    0xb4230b66, 0x0038e048, 0x6c389d49, 0xd8381a4a, 0xb438674b,
+    0x003a144f, 0x6c3a694e, 0xd83aee4d, 0xb43a934c, 0x003d0846,
+    0x6c3d7547, 0xd83df244, 0xb43d8f45, 0x003ffc41, 0x6c3f8140,
+    0xd83f0643, 0xb43f7b42, 0x00333054, 0x6c334d55, 0xd833ca56,
+    0xb433b757, 0x0031c453, 0x6c31b952, 0xd8313e51, 0xb4314350,
+    0x0036d85a, 0x6c36a55b, 0xd8362258, 0xb4365f59, 0x00342c5d,
+    0x6c34515c, 0xd834d65f, 0xb434ab5e, 0x005e80e0, 0x6c5efde1,
+    0xd85e7ae2, 0xb45e07e3, 0x005c74e7, 0x6c5c09e6, 0xd85c8ee5,
+    0xb45cf3e4, 0x005b68ee, 0x6c5b15ef, 0xd85b92ec, 0xb45befed,
+    0x00599ce9, 0x6c59e1e8, 0xd85966eb, 0xb4591bea, 0x005550fc,
+    0x6c552dfd, 0xd855aafe, 0xb455d7ff, 0x0057a4fb, 0x6c57d9fa,
+    0xd8575ef9, 0xb45723f8, 0x0050b8f2, 0x6c50c5f3, 0xd85042f0,
+    0xb4503ff1, 0x00524cf5, 0x6c5231f4, 0xd852b6f7, 0xb452cbf6,
+    0x004920d8, 0x6c495dd9, 0xd849dada, 0xb449a7db, 0x004bd4df,
+    0x6c4ba9de, 0xd84b2edd, 0xb44b53dc, 0x004cc8d6, 0x6c4cb5d7,
+    0xd84c32d4, 0xb44c4fd5, 0x004e3cd1, 0x6c4e41d0, 0xd84ec6d3,
+    0xb44ebbd2, 0x0042f0c4, 0x6c428dc5, 0xd8420ac6, 0xb44277c7,
+    0x004004c3, 0x6c4079c2, 0xd840fec1, 0xb44083c0, 0x004718ca,
+    0x6c4765cb, 0xd847e2c8, 0xb4479fc9, 0x0045eccd, 0x6c4591cc,
+    0xd84516cf, 0xb4456bce, 0x0071c090, 0x6c71bd91, 0xd8713a92,
+    0xb4714793, 0x00733497, 0x6c734996, 0xd873ce95, 0xb473b394,
+    0x0074289e, 0x6c74559f, 0xd874d29c, 0xb474af9d, 0x0076dc99,
+    0x6c76a198, 0xd876269b, 0xb4765b9a, 0x007a108c, 0x6c7a6d8d,
+    0xd87aea8e, 0xb47a978f, 0x0078e48b, 0x6c78998a, 0xd8781e89,
+    0xb4786388, 0x007ff882, 0x6c7f8583, 0xd87f0280, 0xb47f7f81,
+    0x007d0c85, 0x6c7d7184, 0xd87df687, 0xb47d8b86, 0x006660a8,
+    0x6c661da9, 0xd8669aaa, 0xb466e7ab, 0x006494af, 0x6c64e9ae,
+    0xd8646ead, 0xb46413ac, 0x006388a6, 0x6c63f5a7, 0xd86372a4,
+    0xb4630fa5, 0x00617ca1, 0x6c6101a0, 0xd86186a3, 0xb461fba2,
+    0x006db0b4, 0x6c6dcdb5, 0xd86d4ab6, 0xb46d37b7, 0x006f44b3,
+    0x6c6f39b2, 0xd86fbeb1, 0xb46fc3b0, 0x006858ba, 0x6c6825bb,
+    0xd868a2b8, 0xb468dfb9, 0x006aacbd, 0x6c6ad1bc, 0xd86a56bf,
+    0xb46a2bbe},
+   {0x00000000, 0x00bd01c0, 0x017a0380, 0x01c70240, 0x02f40700,
+    0x024906c0, 0x038e0480, 0x03330540, 0x05e80e00, 0x05550fc0,
+    0x04920d80, 0x042f0c40, 0x071c0900, 0x07a108c0, 0x06660a80,
+    0x06db0b40, 0x0bd01c00, 0x0b6d1dc0, 0x0aaa1f80, 0x0a171e40,
+    0x09241b00, 0x09991ac0, 0x085e1880, 0x08e31940, 0x0e381200,
+    0x0e8513c0, 0x0f421180, 0x0fff1040, 0x0ccc1500, 0x0c7114c0,
+    0x0db61680, 0x0d0b1740, 0x17a03800, 0x171d39c0, 0x16da3b80,
+    0x16673a40, 0x15543f00, 0x15e93ec0, 0x142e3c80, 0x14933d40,
+    0x12483600, 0x12f537c0, 0x13323580, 0x138f3440, 0x10bc3100,
+    0x100130c0, 0x11c63280, 0x117b3340, 0x1c702400, 0x1ccd25c0,
+    0x1d0a2780, 0x1db72640, 0x1e842300, 0x1e3922c0, 0x1ffe2080,
+    0x1f432140, 0x19982a00, 0x19252bc0, 0x18e22980, 0x185f2840,
+    0x1b6c2d00, 0x1bd12cc0, 0x1a162e80, 0x1aab2f40, 0x2f407000,
+    0x2ffd71c0, 0x2e3a7380, 0x2e877240, 0x2db47700, 0x2d0976c0,
+    0x2cce7480, 0x2c737540, 0x2aa87e00, 0x2a157fc0, 0x2bd27d80,
+    0x2b6f7c40, 0x285c7900, 0x28e178c0, 0x29267a80, 0x299b7b40,
+    0x24906c00, 0x242d6dc0, 0x25ea6f80, 0x25576e40, 0x26646b00,
+    0x26d96ac0, 0x271e6880, 0x27a36940, 0x21786200, 0x21c563c0,
+    0x20026180, 0x20bf6040, 0x238c6500, 0x233164c0, 0x22f66680,
+    0x224b6740, 0x38e04800, 0x385d49c0, 0x399a4b80, 0x39274a40,
+    0x3a144f00, 0x3aa94ec0, 0x3b6e4c80, 0x3bd34d40, 0x3d084600,
+    0x3db547c0, 0x3c724580, 0x3ccf4440, 0x3ffc4100, 0x3f4140c0,
+    0x3e864280, 0x3e3b4340, 0x33305400, 0x338d55c0, 0x324a5780,
+    0x32f75640, 0x31c45300, 0x317952c0, 0x30be5080, 0x30035140,
+    0x36d85a00, 0x36655bc0, 0x37a25980, 0x371f5840, 0x342c5d00,
+    0x34915cc0, 0x35565e80, 0x35eb5f40, 0x5e80e000, 0x5e3de1c0,
+    0x5ffae380, 0x5f47e240, 0x5c74e700, 0x5cc9e6c0, 0x5d0ee480,
+    0x5db3e540, 0x5b68ee00, 0x5bd5efc0, 0x5a12ed80, 0x5aafec40,
+    0x599ce900, 0x5921e8c0, 0x58e6ea80, 0x585beb40, 0x5550fc00,
+    0x55edfdc0, 0x542aff80, 0x5497fe40, 0x57a4fb00, 0x5719fac0,
+    0x56def880, 0x5663f940, 0x50b8f200, 0x5005f3c0, 0x51c2f180,
+    0x517ff040, 0x524cf500, 0x52f1f4c0, 0x5336f680, 0x538bf740,
+    0x4920d800, 0x499dd9c0, 0x485adb80, 0x48e7da40, 0x4bd4df00,
+    0x4b69dec0, 0x4aaedc80, 0x4a13dd40, 0x4cc8d600, 0x4c75d7c0,
+    0x4db2d580, 0x4d0fd440, 0x4e3cd100, 0x4e81d0c0, 0x4f46d280,
+    0x4ffbd340, 0x42f0c400, 0x424dc5c0, 0x438ac780, 0x4337c640,
+    0x4004c300, 0x40b9c2c0, 0x417ec080, 0x41c3c140, 0x4718ca00,
+    0x47a5cbc0, 0x4662c980, 0x46dfc840, 0x45eccd00, 0x4551ccc0,
+    0x4496ce80, 0x442bcf40, 0x71c09000, 0x717d91c0, 0x70ba9380,
+    0x70079240, 0x73349700, 0x738996c0, 0x724e9480, 0x72f39540,
+    0x74289e00, 0x74959fc0, 0x75529d80, 0x75ef9c40, 0x76dc9900,
+    0x766198c0, 0x77a69a80, 0x771b9b40, 0x7a108c00, 0x7aad8dc0,
+    0x7b6a8f80, 0x7bd78e40, 0x78e48b00, 0x78598ac0, 0x799e8880,
+    0x79238940, 0x7ff88200, 0x7f4583c0, 0x7e828180, 0x7e3f8040,
+    0x7d0c8500, 0x7db184c0, 0x7c768680, 0x7ccb8740, 0x6660a800,
+    0x66dda9c0, 0x671aab80, 0x67a7aa40, 0x6494af00, 0x6429aec0,
+    0x65eeac80, 0x6553ad40, 0x6388a600, 0x6335a7c0, 0x62f2a580,
+    0x624fa440, 0x617ca100, 0x61c1a0c0, 0x6006a280, 0x60bba340,
+    0x6db0b400, 0x6d0db5c0, 0x6ccab780, 0x6c77b640, 0x6f44b300,
+    0x6ff9b2c0, 0x6e3eb080, 0x6e83b140, 0x6858ba00, 0x68e5bbc0,
+    0x6922b980, 0x699fb840, 0x6aacbd00, 0x6a11bcc0, 0x6bd6be80,
+    0x6b6bbf40}};
+
+static const word_t crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0xc001bd0000000000, 0x80037a0100000000,
+    0x4002c70100000000, 0x0007f40200000000, 0xc006490200000000,
+    0x80048e0300000000, 0x4005330300000000, 0x000ee80500000000,
+    0xc00f550500000000, 0x800d920400000000, 0x400c2f0400000000,
+    0x00091c0700000000, 0xc008a10700000000, 0x800a660600000000,
+    0x400bdb0600000000, 0x001cd00b00000000, 0xc01d6d0b00000000,
+    0x801faa0a00000000, 0x401e170a00000000, 0x001b240900000000,
+    0xc01a990900000000, 0x80185e0800000000, 0x4019e30800000000,
+    0x0012380e00000000, 0xc013850e00000000, 0x8011420f00000000,
+    0x4010ff0f00000000, 0x0015cc0c00000000, 0xc014710c00000000,
+    0x8016b60d00000000, 0x40170b0d00000000, 0x0038a01700000000,
+    0xc0391d1700000000, 0x803bda1600000000, 0x403a671600000000,
+    0x003f541500000000, 0xc03ee91500000000, 0x803c2e1400000000,
+    0x403d931400000000, 0x0036481200000000, 0xc037f51200000000,
+    0x8035321300000000, 0x40348f1300000000, 0x0031bc1000000000,
+    0xc030011000000000, 0x8032c61100000000, 0x40337b1100000000,
+    0x0024701c00000000, 0xc025cd1c00000000, 0x80270a1d00000000,
+    0x4026b71d00000000, 0x0023841e00000000, 0xc022391e00000000,
+    0x8020fe1f00000000, 0x4021431f00000000, 0x002a981900000000,
+    0xc02b251900000000, 0x8029e21800000000, 0x40285f1800000000,
+    0x002d6c1b00000000, 0xc02cd11b00000000, 0x802e161a00000000,
+    0x402fab1a00000000, 0x0070402f00000000, 0xc071fd2f00000000,
+    0x80733a2e00000000, 0x4072872e00000000, 0x0077b42d00000000,
+    0xc076092d00000000, 0x8074ce2c00000000, 0x4075732c00000000,
+    0x007ea82a00000000, 0xc07f152a00000000, 0x807dd22b00000000,
+    0x407c6f2b00000000, 0x00795c2800000000, 0xc078e12800000000,
+    0x807a262900000000, 0x407b9b2900000000, 0x006c902400000000,
+    0xc06d2d2400000000, 0x806fea2500000000, 0x406e572500000000,
+    0x006b642600000000, 0xc06ad92600000000, 0x80681e2700000000,
+    0x4069a32700000000, 0x0062782100000000, 0xc063c52100000000,
+    0x8061022000000000, 0x4060bf2000000000, 0x00658c2300000000,
+    0xc064312300000000, 0x8066f62200000000, 0x40674b2200000000,
+    0x0048e03800000000, 0xc0495d3800000000, 0x804b9a3900000000,
+    0x404a273900000000, 0x004f143a00000000, 0xc04ea93a00000000,
+    0x804c6e3b00000000, 0x404dd33b00000000, 0x0046083d00000000,
+    0xc047b53d00000000, 0x8045723c00000000, 0x4044cf3c00000000,
+    0x0041fc3f00000000, 0xc040413f00000000, 0x8042863e00000000,
+    0x40433b3e00000000, 0x0054303300000000, 0xc0558d3300000000,
+    0x80574a3200000000, 0x4056f73200000000, 0x0053c43100000000,
+    0xc052793100000000, 0x8050be3000000000, 0x4051033000000000,
+    0x005ad83600000000, 0xc05b653600000000, 0x8059a23700000000,
+    0x40581f3700000000, 0x005d2c3400000000, 0xc05c913400000000,
+    0x805e563500000000, 0x405feb3500000000, 0x00e0805e00000000,
+    0xc0e13d5e00000000, 0x80e3fa5f00000000, 0x40e2475f00000000,
+    0x00e7745c00000000, 0xc0e6c95c00000000, 0x80e40e5d00000000,
+    0x40e5b35d00000000, 0x00ee685b00000000, 0xc0efd55b00000000,
+    0x80ed125a00000000, 0x40ecaf5a00000000, 0x00e99c5900000000,
+    0xc0e8215900000000, 0x80eae65800000000, 0x40eb5b5800000000,
+    0x00fc505500000000, 0xc0fded5500000000, 0x80ff2a5400000000,
+    0x40fe975400000000, 0x00fba45700000000, 0xc0fa195700000000,
+    0x80f8de5600000000, 0x40f9635600000000, 0x00f2b85000000000,
+    0xc0f3055000000000, 0x80f1c25100000000, 0x40f07f5100000000,
+    0x00f54c5200000000, 0xc0f4f15200000000, 0x80f6365300000000,
+    0x40f78b5300000000, 0x00d8204900000000, 0xc0d99d4900000000,
+    0x80db5a4800000000, 0x40dae74800000000, 0x00dfd44b00000000,
+    0xc0de694b00000000, 0x80dcae4a00000000, 0x40dd134a00000000,
+    0x00d6c84c00000000, 0xc0d7754c00000000, 0x80d5b24d00000000,
+    0x40d40f4d00000000, 0x00d13c4e00000000, 0xc0d0814e00000000,
+    0x80d2464f00000000, 0x40d3fb4f00000000, 0x00c4f04200000000,
+    0xc0c54d4200000000, 0x80c78a4300000000, 0x40c6374300000000,
+    0x00c3044000000000, 0xc0c2b94000000000, 0x80c07e4100000000,
+    0x40c1c34100000000, 0x00ca184700000000, 0xc0cba54700000000,
+    0x80c9624600000000, 0x40c8df4600000000, 0x00cdec4500000000,
+    0xc0cc514500000000, 0x80ce964400000000, 0x40cf2b4400000000,
+    0x0090c07100000000, 0xc0917d7100000000, 0x8093ba7000000000,
+    0x4092077000000000, 0x0097347300000000, 0xc096897300000000,
+    0x80944e7200000000, 0x4095f37200000000, 0x009e287400000000,
+    0xc09f957400000000, 0x809d527500000000, 0x409cef7500000000,
+    0x0099dc7600000000, 0xc098617600000000, 0x809aa67700000000,
+    0x409b1b7700000000, 0x008c107a00000000, 0xc08dad7a00000000,
+    0x808f6a7b00000000, 0x408ed77b00000000, 0x008be47800000000,
+    0xc08a597800000000, 0x80889e7900000000, 0x4089237900000000,
+    0x0082f87f00000000, 0xc083457f00000000, 0x8081827e00000000,
+    0x40803f7e00000000, 0x00850c7d00000000, 0xc084b17d00000000,
+    0x8086767c00000000, 0x4087cb7c00000000, 0x00a8606600000000,
+    0xc0a9dd6600000000, 0x80ab1a6700000000, 0x40aaa76700000000,
+    0x00af946400000000, 0xc0ae296400000000, 0x80acee6500000000,
+    0x40ad536500000000, 0x00a6886300000000, 0xc0a7356300000000,
+    0x80a5f26200000000, 0x40a44f6200000000, 0x00a17c6100000000,
+    0xc0a0c16100000000, 0x80a2066000000000, 0x40a3bb6000000000,
+    0x00b4b06d00000000, 0xc0b50d6d00000000, 0x80b7ca6c00000000,
+    0x40b6776c00000000, 0x00b3446f00000000, 0xc0b2f96f00000000,
+    0x80b03e6e00000000, 0x40b1836e00000000, 0x00ba586800000000,
+    0xc0bbe56800000000, 0x80b9226900000000, 0x40b89f6900000000,
+    0x00bdac6a00000000, 0xc0bc116a00000000, 0x80bed66b00000000,
+    0x40bf6b6b00000000},
+   {0x0000000000000000, 0x017d006c00000000, 0x02fa00d800000000,
+    0x038700b400000000, 0x07f4020000000000, 0x0689026c00000000,
+    0x050e02d800000000, 0x047302b400000000, 0x0ee8050000000000,
+    0x0f95056c00000000, 0x0c1205d800000000, 0x0d6f05b400000000,
+    0x091c070000000000, 0x0861076c00000000, 0x0be607d800000000,
+    0x0a9b07b400000000, 0x1cd00b0000000000, 0x1dad0b6c00000000,
+    0x1e2a0bd800000000, 0x1f570bb400000000, 0x1b24090000000000,
+    0x1a59096c00000000, 0x19de09d800000000, 0x18a309b400000000,
+    0x12380e0000000000, 0x13450e6c00000000, 0x10c20ed800000000,
+    0x11bf0eb400000000, 0x15cc0c0000000000, 0x14b10c6c00000000,
+    0x17360cd800000000, 0x164b0cb400000000, 0x38a0170000000000,
+    0x39dd176c00000000, 0x3a5a17d800000000, 0x3b2717b400000000,
+    0x3f54150000000000, 0x3e29156c00000000, 0x3dae15d800000000,
+    0x3cd315b400000000, 0x3648120000000000, 0x3735126c00000000,
+    0x34b212d800000000, 0x35cf12b400000000, 0x31bc100000000000,
+    0x30c1106c00000000, 0x334610d800000000, 0x323b10b400000000,
+    0x24701c0000000000, 0x250d1c6c00000000, 0x268a1cd800000000,
+    0x27f71cb400000000, 0x23841e0000000000, 0x22f91e6c00000000,
+    0x217e1ed800000000, 0x20031eb400000000, 0x2a98190000000000,
+    0x2be5196c00000000, 0x286219d800000000, 0x291f19b400000000,
+    0x2d6c1b0000000000, 0x2c111b6c00000000, 0x2f961bd800000000,
+    0x2eeb1bb400000000, 0x70402f0000000000, 0x713d2f6c00000000,
+    0x72ba2fd800000000, 0x73c72fb400000000, 0x77b42d0000000000,
+    0x76c92d6c00000000, 0x754e2dd800000000, 0x74332db400000000,
+    0x7ea82a0000000000, 0x7fd52a6c00000000, 0x7c522ad800000000,
+    0x7d2f2ab400000000, 0x795c280000000000, 0x7821286c00000000,
+    0x7ba628d800000000, 0x7adb28b400000000, 0x6c90240000000000,
+    0x6ded246c00000000, 0x6e6a24d800000000, 0x6f1724b400000000,
+    0x6b64260000000000, 0x6a19266c00000000, 0x699e26d800000000,
+    0x68e326b400000000, 0x6278210000000000, 0x6305216c00000000,
+    0x608221d800000000, 0x61ff21b400000000, 0x658c230000000000,
+    0x64f1236c00000000, 0x677623d800000000, 0x660b23b400000000,
+    0x48e0380000000000, 0x499d386c00000000, 0x4a1a38d800000000,
+    0x4b6738b400000000, 0x4f143a0000000000, 0x4e693a6c00000000,
+    0x4dee3ad800000000, 0x4c933ab400000000, 0x46083d0000000000,
+    0x47753d6c00000000, 0x44f23dd800000000, 0x458f3db400000000,
+    0x41fc3f0000000000, 0x40813f6c00000000, 0x43063fd800000000,
+    0x427b3fb400000000, 0x5430330000000000, 0x554d336c00000000,
+    0x56ca33d800000000, 0x57b733b400000000, 0x53c4310000000000,
+    0x52b9316c00000000, 0x513e31d800000000, 0x504331b400000000,
+    0x5ad8360000000000, 0x5ba5366c00000000, 0x582236d800000000,
+    0x595f36b400000000, 0x5d2c340000000000, 0x5c51346c00000000,
+    0x5fd634d800000000, 0x5eab34b400000000, 0xe0805e0000000000,
+    0xe1fd5e6c00000000, 0xe27a5ed800000000, 0xe3075eb400000000,
+    0xe7745c0000000000, 0xe6095c6c00000000, 0xe58e5cd800000000,
+    0xe4f35cb400000000, 0xee685b0000000000, 0xef155b6c00000000,
+    0xec925bd800000000, 0xedef5bb400000000, 0xe99c590000000000,
+    0xe8e1596c00000000, 0xeb6659d800000000, 0xea1b59b400000000,
+    0xfc50550000000000, 0xfd2d556c00000000, 0xfeaa55d800000000,
+    0xffd755b400000000, 0xfba4570000000000, 0xfad9576c00000000,
+    0xf95e57d800000000, 0xf82357b400000000, 0xf2b8500000000000,
+    0xf3c5506c00000000, 0xf04250d800000000, 0xf13f50b400000000,
+    0xf54c520000000000, 0xf431526c00000000, 0xf7b652d800000000,
+    0xf6cb52b400000000, 0xd820490000000000, 0xd95d496c00000000,
+    0xdada49d800000000, 0xdba749b400000000, 0xdfd44b0000000000,
+    0xdea94b6c00000000, 0xdd2e4bd800000000, 0xdc534bb400000000,
+    0xd6c84c0000000000, 0xd7b54c6c00000000, 0xd4324cd800000000,
+    0xd54f4cb400000000, 0xd13c4e0000000000, 0xd0414e6c00000000,
+    0xd3c64ed800000000, 0xd2bb4eb400000000, 0xc4f0420000000000,
+    0xc58d426c00000000, 0xc60a42d800000000, 0xc77742b400000000,
+    0xc304400000000000, 0xc279406c00000000, 0xc1fe40d800000000,
+    0xc08340b400000000, 0xca18470000000000, 0xcb65476c00000000,
+    0xc8e247d800000000, 0xc99f47b400000000, 0xcdec450000000000,
+    0xcc91456c00000000, 0xcf1645d800000000, 0xce6b45b400000000,
+    0x90c0710000000000, 0x91bd716c00000000, 0x923a71d800000000,
+    0x934771b400000000, 0x9734730000000000, 0x9649736c00000000,
+    0x95ce73d800000000, 0x94b373b400000000, 0x9e28740000000000,
+    0x9f55746c00000000, 0x9cd274d800000000, 0x9daf74b400000000,
+    0x99dc760000000000, 0x98a1766c00000000, 0x9b2676d800000000,
+    0x9a5b76b400000000, 0x8c107a0000000000, 0x8d6d7a6c00000000,
+    0x8eea7ad800000000, 0x8f977ab400000000, 0x8be4780000000000,
+    0x8a99786c00000000, 0x891e78d800000000, 0x886378b400000000,
+    0x82f87f0000000000, 0x83857f6c00000000, 0x80027fd800000000,
+    0x817f7fb400000000, 0x850c7d0000000000, 0x84717d6c00000000,
+    0x87f67dd800000000, 0x868b7db400000000, 0xa860660000000000,
+    0xa91d666c00000000, 0xaa9a66d800000000, 0xabe766b400000000,
+    0xaf94640000000000, 0xaee9646c00000000, 0xad6e64d800000000,
+    0xac1364b400000000, 0xa688630000000000, 0xa7f5636c00000000,
+    0xa47263d800000000, 0xa50f63b400000000, 0xa17c610000000000,
+    0xa001616c00000000, 0xa38661d800000000, 0xa2fb61b400000000,
+    0xb4b06d0000000000, 0xb5cd6d6c00000000, 0xb64a6dd800000000,
+    0xb7376db400000000, 0xb3446f0000000000, 0xb2396f6c00000000,
+    0xb1be6fd800000000, 0xb0c36fb400000000, 0xba58680000000000,
+    0xbb25686c00000000, 0xb8a268d800000000, 0xb9df68b400000000,
+    0xbdac6a0000000000, 0xbcd16a6c00000000, 0xbf566ad800000000,
+    0xbe2b6ab400000000},
+   {0x0000000000000000, 0x7c01fd9000000000, 0xfb02f99100000000,
+    0x8703040100000000, 0xf505f19300000000, 0x89040c0300000000,
+    0x0e07080200000000, 0x7206f59200000000, 0xe90be19700000000,
+    0x950a1c0700000000, 0x1209180600000000, 0x6e08e59600000000,
+    0x1c0e100400000000, 0x600fed9400000000, 0xe70ce99500000000,
+    0x9b0d140500000000, 0xd117c19f00000000, 0xad163c0f00000000,
+    0x2a15380e00000000, 0x5614c59e00000000, 0x2412300c00000000,
+    0x5813cd9c00000000, 0xdf10c99d00000000, 0xa311340d00000000,
+    0x381c200800000000, 0x441ddd9800000000, 0xc31ed99900000000,
+    0xbf1f240900000000, 0xcd19d19b00000000, 0xb1182c0b00000000,
+    0x361b280a00000000, 0x4a1ad59a00000000, 0xa12f818f00000000,
+    0xdd2e7c1f00000000, 0x5a2d781e00000000, 0x262c858e00000000,
+    0x542a701c00000000, 0x282b8d8c00000000, 0xaf28898d00000000,
+    0xd329741d00000000, 0x4824601800000000, 0x34259d8800000000,
+    0xb326998900000000, 0xcf27641900000000, 0xbd21918b00000000,
+    0xc1206c1b00000000, 0x4623681a00000000, 0x3a22958a00000000,
+    0x7038401000000000, 0x0c39bd8000000000, 0x8b3ab98100000000,
+    0xf73b441100000000, 0x853db18300000000, 0xf93c4c1300000000,
+    0x7e3f481200000000, 0x023eb58200000000, 0x9933a18700000000,
+    0xe5325c1700000000, 0x6231581600000000, 0x1e30a58600000000,
+    0x6c36501400000000, 0x1037ad8400000000, 0x9734a98500000000,
+    0xeb35541500000000, 0x415f01af00000000, 0x3d5efc3f00000000,
+    0xba5df83e00000000, 0xc65c05ae00000000, 0xb45af03c00000000,
+    0xc85b0dac00000000, 0x4f5809ad00000000, 0x3359f43d00000000,
+    0xa854e03800000000, 0xd4551da800000000, 0x535619a900000000,
+    0x2f57e43900000000, 0x5d5111ab00000000, 0x2150ec3b00000000,
+    0xa653e83a00000000, 0xda5215aa00000000, 0x9048c03000000000,
+    0xec493da000000000, 0x6b4a39a100000000, 0x174bc43100000000,
+    0x654d31a300000000, 0x194ccc3300000000, 0x9e4fc83200000000,
+    0xe24e35a200000000, 0x794321a700000000, 0x0542dc3700000000,
+    0x8241d83600000000, 0xfe4025a600000000, 0x8c46d03400000000,
+    0xf0472da400000000, 0x774429a500000000, 0x0b45d43500000000,
+    0xe070802000000000, 0x9c717db000000000, 0x1b7279b100000000,
+    0x6773842100000000, 0x157571b300000000, 0x69748c2300000000,
+    0xee77882200000000, 0x927675b200000000, 0x097b61b700000000,
+    0x757a9c2700000000, 0xf279982600000000, 0x8e7865b600000000,
+    0xfc7e902400000000, 0x807f6db400000000, 0x077c69b500000000,
+    0x7b7d942500000000, 0x316741bf00000000, 0x4d66bc2f00000000,
+    0xca65b82e00000000, 0xb66445be00000000, 0xc462b02c00000000,
+    0xb8634dbc00000000, 0x3f6049bd00000000, 0x4361b42d00000000,
+    0xd86ca02800000000, 0xa46d5db800000000, 0x236e59b900000000,
+    0x5f6fa42900000000, 0x2d6951bb00000000, 0x5168ac2b00000000,
+    0xd66ba82a00000000, 0xaa6a55ba00000000, 0x81be01ee00000000,
+    0xfdbffc7e00000000, 0x7abcf87f00000000, 0x06bd05ef00000000,
+    0x74bbf07d00000000, 0x08ba0ded00000000, 0x8fb909ec00000000,
+    0xf3b8f47c00000000, 0x68b5e07900000000, 0x14b41de900000000,
+    0x93b719e800000000, 0xefb6e47800000000, 0x9db011ea00000000,
+    0xe1b1ec7a00000000, 0x66b2e87b00000000, 0x1ab315eb00000000,
+    0x50a9c07100000000, 0x2ca83de100000000, 0xabab39e000000000,
+    0xd7aac47000000000, 0xa5ac31e200000000, 0xd9adcc7200000000,
+    0x5eaec87300000000, 0x22af35e300000000, 0xb9a221e600000000,
+    0xc5a3dc7600000000, 0x42a0d87700000000, 0x3ea125e700000000,
+    0x4ca7d07500000000, 0x30a62de500000000, 0xb7a529e400000000,
+    0xcba4d47400000000, 0x2091806100000000, 0x5c907df100000000,
+    0xdb9379f000000000, 0xa792846000000000, 0xd59471f200000000,
+    0xa9958c6200000000, 0x2e96886300000000, 0x529775f300000000,
+    0xc99a61f600000000, 0xb59b9c6600000000, 0x3298986700000000,
+    0x4e9965f700000000, 0x3c9f906500000000, 0x409e6df500000000,
+    0xc79d69f400000000, 0xbb9c946400000000, 0xf18641fe00000000,
+    0x8d87bc6e00000000, 0x0a84b86f00000000, 0x768545ff00000000,
+    0x0483b06d00000000, 0x78824dfd00000000, 0xff8149fc00000000,
+    0x8380b46c00000000, 0x188da06900000000, 0x648c5df900000000,
+    0xe38f59f800000000, 0x9f8ea46800000000, 0xed8851fa00000000,
+    0x9189ac6a00000000, 0x168aa86b00000000, 0x6a8b55fb00000000,
+    0xc0e1004100000000, 0xbce0fdd100000000, 0x3be3f9d000000000,
+    0x47e2044000000000, 0x35e4f1d200000000, 0x49e50c4200000000,
+    0xcee6084300000000, 0xb2e7f5d300000000, 0x29eae1d600000000,
+    0x55eb1c4600000000, 0xd2e8184700000000, 0xaee9e5d700000000,
+    0xdcef104500000000, 0xa0eeedd500000000, 0x27ede9d400000000,
+    0x5bec144400000000, 0x11f6c1de00000000, 0x6df73c4e00000000,
+    0xeaf4384f00000000, 0x96f5c5df00000000, 0xe4f3304d00000000,
+    0x98f2cddd00000000, 0x1ff1c9dc00000000, 0x63f0344c00000000,
+    0xf8fd204900000000, 0x84fcddd900000000, 0x03ffd9d800000000,
+    0x7ffe244800000000, 0x0df8d1da00000000, 0x71f92c4a00000000,
+    0xf6fa284b00000000, 0x8afbd5db00000000, 0x61ce81ce00000000,
+    0x1dcf7c5e00000000, 0x9acc785f00000000, 0xe6cd85cf00000000,
+    0x94cb705d00000000, 0xe8ca8dcd00000000, 0x6fc989cc00000000,
+    0x13c8745c00000000, 0x88c5605900000000, 0xf4c49dc900000000,
+    0x73c799c800000000, 0x0fc6645800000000, 0x7dc091ca00000000,
+    0x01c16c5a00000000, 0x86c2685b00000000, 0xfac395cb00000000,
+    0xb0d9405100000000, 0xccd8bdc100000000, 0x4bdbb9c000000000,
+    0x37da445000000000, 0x45dcb1c200000000, 0x39dd4c5200000000,
+    0xbede485300000000, 0xc2dfb5c300000000, 0x59d2a1c600000000,
+    0x25d35c5600000000, 0xa2d0585700000000, 0xded1a5c700000000,
+    0xacd7505500000000, 0xd0d6adc500000000, 0x57d5a9c400000000,
+    0x2bd4545400000000},
+   {0x0000000000000000, 0x008151a900000000, 0x0302a0e200000000,
+    0x0383f14b00000000, 0x0504437500000000, 0x058512dc00000000,
+    0x0606e39700000000, 0x0687b23e00000000, 0x0a0886ea00000000,
+    0x0a89d74300000000, 0x090a260800000000, 0x098b77a100000000,
+    0x0f0cc59f00000000, 0x0f8d943600000000, 0x0c0e657d00000000,
+    0x0c8f34d400000000, 0x17100f6500000000, 0x17915ecc00000000,
+    0x1412af8700000000, 0x1493fe2e00000000, 0x12144c1000000000,
+    0x12951db900000000, 0x1116ecf200000000, 0x1197bd5b00000000,
+    0x1d18898f00000000, 0x1d99d82600000000, 0x1e1a296d00000000,
+    0x1e9b78c400000000, 0x181ccafa00000000, 0x189d9b5300000000,
+    0x1b1e6a1800000000, 0x1b9f3bb100000000, 0x2e201eca00000000,
+    0x2ea14f6300000000, 0x2d22be2800000000, 0x2da3ef8100000000,
+    0x2b245dbf00000000, 0x2ba50c1600000000, 0x2826fd5d00000000,
+    0x28a7acf400000000, 0x2428982000000000, 0x24a9c98900000000,
+    0x272a38c200000000, 0x27ab696b00000000, 0x212cdb5500000000,
+    0x21ad8afc00000000, 0x222e7bb700000000, 0x22af2a1e00000000,
+    0x393011af00000000, 0x39b1400600000000, 0x3a32b14d00000000,
+    0x3ab3e0e400000000, 0x3c3452da00000000, 0x3cb5037300000000,
+    0x3f36f23800000000, 0x3fb7a39100000000, 0x3338974500000000,
+    0x33b9c6ec00000000, 0x303a37a700000000, 0x30bb660e00000000,
+    0x363cd43000000000, 0x36bd859900000000, 0x353e74d200000000,
+    0x35bf257b00000000, 0x5f403f2400000000, 0x5fc16e8d00000000,
+    0x5c429fc600000000, 0x5cc3ce6f00000000, 0x5a447c5100000000,
+    0x5ac52df800000000, 0x5946dcb300000000, 0x59c78d1a00000000,
+    0x5548b9ce00000000, 0x55c9e86700000000, 0x564a192c00000000,
+    0x56cb488500000000, 0x504cfabb00000000, 0x50cdab1200000000,
+    0x534e5a5900000000, 0x53cf0bf000000000, 0x4850304100000000,
+    0x48d161e800000000, 0x4b5290a300000000, 0x4bd3c10a00000000,
+    0x4d54733400000000, 0x4dd5229d00000000, 0x4e56d3d600000000,
+    0x4ed7827f00000000, 0x4258b6ab00000000, 0x42d9e70200000000,
+    0x415a164900000000, 0x41db47e000000000, 0x475cf5de00000000,
+    0x47dda47700000000, 0x445e553c00000000, 0x44df049500000000,
+    0x716021ee00000000, 0x71e1704700000000, 0x7262810c00000000,
+    0x72e3d0a500000000, 0x7464629b00000000, 0x74e5333200000000,
+    0x7766c27900000000, 0x77e793d000000000, 0x7b68a70400000000,
+    0x7be9f6ad00000000, 0x786a07e600000000, 0x78eb564f00000000,
+    0x7e6ce47100000000, 0x7eedb5d800000000, 0x7d6e449300000000,
+    0x7def153a00000000, 0x66702e8b00000000, 0x66f17f2200000000,
+    0x65728e6900000000, 0x65f3dfc000000000, 0x63746dfe00000000,
+    0x63f53c5700000000, 0x6076cd1c00000000, 0x60f79cb500000000,
+    0x6c78a86100000000, 0x6cf9f9c800000000, 0x6f7a088300000000,
+    0x6ffb592a00000000, 0x697ceb1400000000, 0x69fdbabd00000000,
+    0x6a7e4bf600000000, 0x6aff1a5f00000000, 0xbe807e4800000000,
+    0xbe012fe100000000, 0xbd82deaa00000000, 0xbd038f0300000000,
+    0xbb843d3d00000000, 0xbb056c9400000000, 0xb8869ddf00000000,
+    0xb807cc7600000000, 0xb488f8a200000000, 0xb409a90b00000000,
+    0xb78a584000000000, 0xb70b09e900000000, 0xb18cbbd700000000,
+    0xb10dea7e00000000, 0xb28e1b3500000000, 0xb20f4a9c00000000,
+    0xa990712d00000000, 0xa911208400000000, 0xaa92d1cf00000000,
+    0xaa13806600000000, 0xac94325800000000, 0xac1563f100000000,
+    0xaf9692ba00000000, 0xaf17c31300000000, 0xa398f7c700000000,
+    0xa319a66e00000000, 0xa09a572500000000, 0xa01b068c00000000,
+    0xa69cb4b200000000, 0xa61de51b00000000, 0xa59e145000000000,
+    0xa51f45f900000000, 0x90a0608200000000, 0x9021312b00000000,
+    0x93a2c06000000000, 0x932391c900000000, 0x95a423f700000000,
+    0x9525725e00000000, 0x96a6831500000000, 0x9627d2bc00000000,
+    0x9aa8e66800000000, 0x9a29b7c100000000, 0x99aa468a00000000,
+    0x992b172300000000, 0x9faca51d00000000, 0x9f2df4b400000000,
+    0x9cae05ff00000000, 0x9c2f545600000000, 0x87b06fe700000000,
+    0x87313e4e00000000, 0x84b2cf0500000000, 0x84339eac00000000,
+    0x82b42c9200000000, 0x82357d3b00000000, 0x81b68c7000000000,
+    0x8137ddd900000000, 0x8db8e90d00000000, 0x8d39b8a400000000,
+    0x8eba49ef00000000, 0x8e3b184600000000, 0x88bcaa7800000000,
+    0x883dfbd100000000, 0x8bbe0a9a00000000, 0x8b3f5b3300000000,
+    0xe1c0416c00000000, 0xe14110c500000000, 0xe2c2e18e00000000,
+    0xe243b02700000000, 0xe4c4021900000000, 0xe44553b000000000,
+    0xe7c6a2fb00000000, 0xe747f35200000000, 0xebc8c78600000000,
+    0xeb49962f00000000, 0xe8ca676400000000, 0xe84b36cd00000000,
+    0xeecc84f300000000, 0xee4dd55a00000000, 0xedce241100000000,
+    0xed4f75b800000000, 0xf6d04e0900000000, 0xf6511fa000000000,
+    0xf5d2eeeb00000000, 0xf553bf4200000000, 0xf3d40d7c00000000,
+    0xf3555cd500000000, 0xf0d6ad9e00000000, 0xf057fc3700000000,
+    0xfcd8c8e300000000, 0xfc59994a00000000, 0xffda680100000000,
+    0xff5b39a800000000, 0xf9dc8b9600000000, 0xf95dda3f00000000,
+    0xfade2b7400000000, 0xfa5f7add00000000, 0xcfe05fa600000000,
+    0xcf610e0f00000000, 0xcce2ff4400000000, 0xcc63aeed00000000,
+    0xcae41cd300000000, 0xca654d7a00000000, 0xc9e6bc3100000000,
+    0xc967ed9800000000, 0xc5e8d94c00000000, 0xc56988e500000000,
+    0xc6ea79ae00000000, 0xc66b280700000000, 0xc0ec9a3900000000,
+    0xc06dcb9000000000, 0xc3ee3adb00000000, 0xc36f6b7200000000,
+    0xd8f050c300000000, 0xd871016a00000000, 0xdbf2f02100000000,
+    0xdb73a18800000000, 0xddf413b600000000, 0xdd75421f00000000,
+    0xdef6b35400000000, 0xde77e2fd00000000, 0xd2f8d62900000000,
+    0xd279878000000000, 0xd1fa76cb00000000, 0xd17b276200000000,
+    0xd7fc955c00000000, 0xd77dc4f500000000, 0xd4fe35be00000000,
+    0xd47f641700000000},
+   {0x0000000000000000, 0x8151a90000000000, 0x02a3520100000000,
+    0x83f2fb0100000000, 0x0446a50200000000, 0x85170c0200000000,
+    0x06e5f70300000000, 0x87b45e0300000000, 0x088c4a0500000000,
+    0x89dde30500000000, 0x0a2f180400000000, 0x8b7eb10400000000,
+    0x0ccaef0700000000, 0x8d9b460700000000, 0x0e69bd0600000000,
+    0x8f38140600000000, 0x1018950a00000000, 0x91493c0a00000000,
+    0x12bbc70b00000000, 0x93ea6e0b00000000, 0x145e300800000000,
+    0x950f990800000000, 0x16fd620900000000, 0x97accb0900000000,
+    0x1894df0f00000000, 0x99c5760f00000000, 0x1a378d0e00000000,
+    0x9b66240e00000000, 0x1cd27a0d00000000, 0x9d83d30d00000000,
+    0x1e71280c00000000, 0x9f20810c00000000, 0x20302a1500000000,
+    0xa161831500000000, 0x2293781400000000, 0xa3c2d11400000000,
+    0x24768f1700000000, 0xa527261700000000, 0x26d5dd1600000000,
+    0xa784741600000000, 0x28bc601000000000, 0xa9edc91000000000,
+    0x2a1f321100000000, 0xab4e9b1100000000, 0x2cfac51200000000,
+    0xadab6c1200000000, 0x2e59971300000000, 0xaf083e1300000000,
+    0x3028bf1f00000000, 0xb179161f00000000, 0x328bed1e00000000,
+    0xb3da441e00000000, 0x346e1a1d00000000, 0xb53fb31d00000000,
+    0x36cd481c00000000, 0xb79ce11c00000000, 0x38a4f51a00000000,
+    0xb9f55c1a00000000, 0x3a07a71b00000000, 0xbb560e1b00000000,
+    0x3ce2501800000000, 0xbdb3f91800000000, 0x3e41021900000000,
+    0xbf10ab1900000000, 0x4060542a00000000, 0xc131fd2a00000000,
+    0x42c3062b00000000, 0xc392af2b00000000, 0x4426f12800000000,
+    0xc577582800000000, 0x4685a32900000000, 0xc7d40a2900000000,
+    0x48ec1e2f00000000, 0xc9bdb72f00000000, 0x4a4f4c2e00000000,
+    0xcb1ee52e00000000, 0x4caabb2d00000000, 0xcdfb122d00000000,
+    0x4e09e92c00000000, 0xcf58402c00000000, 0x5078c12000000000,
+    0xd129682000000000, 0x52db932100000000, 0xd38a3a2100000000,
+    0x543e642200000000, 0xd56fcd2200000000, 0x569d362300000000,
+    0xd7cc9f2300000000, 0x58f48b2500000000, 0xd9a5222500000000,
+    0x5a57d92400000000, 0xdb06702400000000, 0x5cb22e2700000000,
+    0xdde3872700000000, 0x5e117c2600000000, 0xdf40d52600000000,
+    0x60507e3f00000000, 0xe101d73f00000000, 0x62f32c3e00000000,
+    0xe3a2853e00000000, 0x6416db3d00000000, 0xe547723d00000000,
+    0x66b5893c00000000, 0xe7e4203c00000000, 0x68dc343a00000000,
+    0xe98d9d3a00000000, 0x6a7f663b00000000, 0xeb2ecf3b00000000,
+    0x6c9a913800000000, 0xedcb383800000000, 0x6e39c33900000000,
+    0xef686a3900000000, 0x7048eb3500000000, 0xf119423500000000,
+    0x72ebb93400000000, 0xf3ba103400000000, 0x740e4e3700000000,
+    0xf55fe73700000000, 0x76ad1c3600000000, 0xf7fcb53600000000,
+    0x78c4a13000000000, 0xf995083000000000, 0x7a67f33100000000,
+    0xfb365a3100000000, 0x7c82043200000000, 0xfdd3ad3200000000,
+    0x7e21563300000000, 0xff70ff3300000000, 0x80c0a85400000000,
+    0x0191015400000000, 0x8263fa5500000000, 0x0332535500000000,
+    0x84860d5600000000, 0x05d7a45600000000, 0x86255f5700000000,
+    0x0774f65700000000, 0x884ce25100000000, 0x091d4b5100000000,
+    0x8aefb05000000000, 0x0bbe195000000000, 0x8c0a475300000000,
+    0x0d5bee5300000000, 0x8ea9155200000000, 0x0ff8bc5200000000,
+    0x90d83d5e00000000, 0x1189945e00000000, 0x927b6f5f00000000,
+    0x132ac65f00000000, 0x949e985c00000000, 0x15cf315c00000000,
+    0x963dca5d00000000, 0x176c635d00000000, 0x9854775b00000000,
+    0x1905de5b00000000, 0x9af7255a00000000, 0x1ba68c5a00000000,
+    0x9c12d25900000000, 0x1d437b5900000000, 0x9eb1805800000000,
+    0x1fe0295800000000, 0xa0f0824100000000, 0x21a12b4100000000,
+    0xa253d04000000000, 0x2302794000000000, 0xa4b6274300000000,
+    0x25e78e4300000000, 0xa615754200000000, 0x2744dc4200000000,
+    0xa87cc84400000000, 0x292d614400000000, 0xaadf9a4500000000,
+    0x2b8e334500000000, 0xac3a6d4600000000, 0x2d6bc44600000000,
+    0xae993f4700000000, 0x2fc8964700000000, 0xb0e8174b00000000,
+    0x31b9be4b00000000, 0xb24b454a00000000, 0x331aec4a00000000,
+    0xb4aeb24900000000, 0x35ff1b4900000000, 0xb60de04800000000,
+    0x375c494800000000, 0xb8645d4e00000000, 0x3935f44e00000000,
+    0xbac70f4f00000000, 0x3b96a64f00000000, 0xbc22f84c00000000,
+    0x3d73514c00000000, 0xbe81aa4d00000000, 0x3fd0034d00000000,
+    0xc0a0fc7e00000000, 0x41f1557e00000000, 0xc203ae7f00000000,
+    0x4352077f00000000, 0xc4e6597c00000000, 0x45b7f07c00000000,
+    0xc6450b7d00000000, 0x4714a27d00000000, 0xc82cb67b00000000,
+    0x497d1f7b00000000, 0xca8fe47a00000000, 0x4bde4d7a00000000,
+    0xcc6a137900000000, 0x4d3bba7900000000, 0xcec9417800000000,
+    0x4f98e87800000000, 0xd0b8697400000000, 0x51e9c07400000000,
+    0xd21b3b7500000000, 0x534a927500000000, 0xd4fecc7600000000,
+    0x55af657600000000, 0xd65d9e7700000000, 0x570c377700000000,
+    0xd834237100000000, 0x59658a7100000000, 0xda97717000000000,
+    0x5bc6d87000000000, 0xdc72867300000000, 0x5d232f7300000000,
+    0xded1d47200000000, 0x5f807d7200000000, 0xe090d66b00000000,
+    0x61c17f6b00000000, 0xe233846a00000000, 0x63622d6a00000000,
+    0xe4d6736900000000, 0x6587da6900000000, 0xe675216800000000,
+    0x6724886800000000, 0xe81c9c6e00000000, 0x694d356e00000000,
+    0xeabfce6f00000000, 0x6bee676f00000000, 0xec5a396c00000000,
+    0x6d0b906c00000000, 0xeef96b6d00000000, 0x6fa8c26d00000000,
+    0xf088436100000000, 0x71d9ea6100000000, 0xf22b116000000000,
+    0x737ab86000000000, 0xf4cee66300000000, 0x759f4f6300000000,
+    0xf66db46200000000, 0x773c1d6200000000, 0xf804096400000000,
+    0x7955a06400000000, 0xfaa75b6500000000, 0x7bf6f26500000000,
+    0xfc42ac6600000000, 0x7d13056600000000, 0xfee1fe6700000000,
+    0x7fb0576700000000},
+   {0x0000000000000000, 0x5128904800000000, 0xa250209100000000,
+    0xf378b0d900000000, 0x47a1439200000000, 0x1689d3da00000000,
+    0xe5f1630300000000, 0xb4d9f34b00000000, 0x8d42849400000000,
+    0xdc6a14dc00000000, 0x2f12a40500000000, 0x7e3a344d00000000,
+    0xcae3c70600000000, 0x9bcb574e00000000, 0x68b3e79700000000,
+    0x399b77df00000000, 0x19850b9900000000, 0x48ad9bd100000000,
+    0xbbd52b0800000000, 0xeafdbb4000000000, 0x5e24480b00000000,
+    0x0f0cd84300000000, 0xfc74689a00000000, 0xad5cf8d200000000,
+    0x94c78f0d00000000, 0xc5ef1f4500000000, 0x3697af9c00000000,
+    0x67bf3fd400000000, 0xd366cc9f00000000, 0x824e5cd700000000,
+    0x7136ec0e00000000, 0x201e7c4600000000, 0x310a148200000000,
+    0x602284ca00000000, 0x935a341300000000, 0xc272a45b00000000,
+    0x76ab571000000000, 0x2783c75800000000, 0xd4fb778100000000,
+    0x85d3e7c900000000, 0xbc48901600000000, 0xed60005e00000000,
+    0x1e18b08700000000, 0x4f3020cf00000000, 0xfbe9d38400000000,
+    0xaac143cc00000000, 0x59b9f31500000000, 0x0891635d00000000,
+    0x288f1f1b00000000, 0x79a78f5300000000, 0x8adf3f8a00000000,
+    0xdbf7afc200000000, 0x6f2e5c8900000000, 0x3e06ccc100000000,
+    0xcd7e7c1800000000, 0x9c56ec5000000000, 0xa5cd9b8f00000000,
+    0xf4e50bc700000000, 0x079dbb1e00000000, 0x56b52b5600000000,
+    0xe26cd81d00000000, 0xb344485500000000, 0x403cf88c00000000,
+    0x111468c400000000, 0x61142bb400000000, 0x303cbbfc00000000,
+    0xc3440b2500000000, 0x926c9b6d00000000, 0x26b5682600000000,
+    0x779df86e00000000, 0x84e548b700000000, 0xd5cdd8ff00000000,
+    0xec56af2000000000, 0xbd7e3f6800000000, 0x4e068fb100000000,
+    0x1f2e1ff900000000, 0xabf7ecb200000000, 0xfadf7cfa00000000,
+    0x09a7cc2300000000, 0x588f5c6b00000000, 0x7891202d00000000,
+    0x29b9b06500000000, 0xdac100bc00000000, 0x8be990f400000000,
+    0x3f3063bf00000000, 0x6e18f3f700000000, 0x9d60432e00000000,
+    0xcc48d36600000000, 0xf5d3a4b900000000, 0xa4fb34f100000000,
+    0x5783842800000000, 0x06ab146000000000, 0xb272e72b00000000,
+    0xe35a776300000000, 0x1022c7ba00000000, 0x410a57f200000000,
+    0x501e3f3600000000, 0x0136af7e00000000, 0xf24e1fa700000000,
+    0xa3668fef00000000, 0x17bf7ca400000000, 0x4697ecec00000000,
+    0xb5ef5c3500000000, 0xe4c7cc7d00000000, 0xdd5cbba200000000,
+    0x8c742bea00000000, 0x7f0c9b3300000000, 0x2e240b7b00000000,
+    0x9afdf83000000000, 0xcbd5687800000000, 0x38add8a100000000,
+    0x698548e900000000, 0x499b34af00000000, 0x18b3a4e700000000,
+    0xebcb143e00000000, 0xbae3847600000000, 0x0e3a773d00000000,
+    0x5f12e77500000000, 0xac6a57ac00000000, 0xfd42c7e400000000,
+    0xc4d9b03b00000000, 0x95f1207300000000, 0x668990aa00000000,
+    0x37a100e200000000, 0x8378f3a900000000, 0xd25063e100000000,
+    0x2128d33800000000, 0x7000437000000000, 0xc12855d800000000,
+    0x9000c59000000000, 0x6378754900000000, 0x3250e50100000000,
+    0x8689164a00000000, 0xd7a1860200000000, 0x24d936db00000000,
+    0x75f1a69300000000, 0x4c6ad14c00000000, 0x1d42410400000000,
+    0xee3af1dd00000000, 0xbf12619500000000, 0x0bcb92de00000000,
+    0x5ae3029600000000, 0xa99bb24f00000000, 0xf8b3220700000000,
+    0xd8ad5e4100000000, 0x8985ce0900000000, 0x7afd7ed000000000,
+    0x2bd5ee9800000000, 0x9f0c1dd300000000, 0xce248d9b00000000,
+    0x3d5c3d4200000000, 0x6c74ad0a00000000, 0x55efdad500000000,
+    0x04c74a9d00000000, 0xf7bffa4400000000, 0xa6976a0c00000000,
+    0x124e994700000000, 0x4366090f00000000, 0xb01eb9d600000000,
+    0xe136299e00000000, 0xf022415a00000000, 0xa10ad11200000000,
+    0x527261cb00000000, 0x035af18300000000, 0xb78302c800000000,
+    0xe6ab928000000000, 0x15d3225900000000, 0x44fbb21100000000,
+    0x7d60c5ce00000000, 0x2c48558600000000, 0xdf30e55f00000000,
+    0x8e18751700000000, 0x3ac1865c00000000, 0x6be9161400000000,
+    0x9891a6cd00000000, 0xc9b9368500000000, 0xe9a74ac300000000,
+    0xb88fda8b00000000, 0x4bf76a5200000000, 0x1adffa1a00000000,
+    0xae06095100000000, 0xff2e991900000000, 0x0c5629c000000000,
+    0x5d7eb98800000000, 0x64e5ce5700000000, 0x35cd5e1f00000000,
+    0xc6b5eec600000000, 0x979d7e8e00000000, 0x23448dc500000000,
+    0x726c1d8d00000000, 0x8114ad5400000000, 0xd03c3d1c00000000,
+    0xa03c7e6c00000000, 0xf114ee2400000000, 0x026c5efd00000000,
+    0x5344ceb500000000, 0xe79d3dfe00000000, 0xb6b5adb600000000,
+    0x45cd1d6f00000000, 0x14e58d2700000000, 0x2d7efaf800000000,
+    0x7c566ab000000000, 0x8f2eda6900000000, 0xde064a2100000000,
+    0x6adfb96a00000000, 0x3bf7292200000000, 0xc88f99fb00000000,
+    0x99a709b300000000, 0xb9b975f500000000, 0xe891e5bd00000000,
+    0x1be9556400000000, 0x4ac1c52c00000000, 0xfe18366700000000,
+    0xaf30a62f00000000, 0x5c4816f600000000, 0x0d6086be00000000,
+    0x34fbf16100000000, 0x65d3612900000000, 0x96abd1f000000000,
+    0xc78341b800000000, 0x735ab2f300000000, 0x227222bb00000000,
+    0xd10a926200000000, 0x8022022a00000000, 0x91366aee00000000,
+    0xc01efaa600000000, 0x33664a7f00000000, 0x624eda3700000000,
+    0xd697297c00000000, 0x87bfb93400000000, 0x74c709ed00000000,
+    0x25ef99a500000000, 0x1c74ee7a00000000, 0x4d5c7e3200000000,
+    0xbe24ceeb00000000, 0xef0c5ea300000000, 0x5bd5ade800000000,
+    0x0afd3da000000000, 0xf9858d7900000000, 0xa8ad1d3100000000,
+    0x88b3617700000000, 0xd99bf13f00000000, 0x2ae341e600000000,
+    0x7bcbd1ae00000000, 0xcf1222e500000000, 0x9e3ab2ad00000000,
+    0x6d42027400000000, 0x3c6a923c00000000, 0x05f1e5e300000000,
+    0x54d975ab00000000, 0xa7a1c57200000000, 0xf689553a00000000,
+    0x4250a67100000000, 0x1378363900000000, 0xe00086e000000000,
+    0xb12816a800000000},
+   {0x0000000000000000, 0x29c1d9bd00000000, 0x5182b0cb00000000,
+    0x7843697600000000, 0xa104622700000000, 0x88c5bb9a00000000,
+    0xf086d2ec00000000, 0xd9470b5100000000, 0x4209c44e00000000,
+    0x6bc81df300000000, 0x138b748500000000, 0x3a4aad3800000000,
+    0xe30da66900000000, 0xcacc7fd400000000, 0xb28f16a200000000,
+    0x9b4ecf1f00000000, 0x8412889d00000000, 0xadd3512000000000,
+    0xd590385600000000, 0xfc51e1eb00000000, 0x2516eaba00000000,
+    0x0cd7330700000000, 0x74945a7100000000, 0x5d5583cc00000000,
+    0xc61b4cd300000000, 0xefda956e00000000, 0x9799fc1800000000,
+    0xbe5825a500000000, 0x671f2ef400000000, 0x4edef74900000000,
+    0x369d9e3f00000000, 0x1f5c478200000000, 0x0b25138b00000000,
+    0x22e4ca3600000000, 0x5aa7a34000000000, 0x73667afd00000000,
+    0xaa2171ac00000000, 0x83e0a81100000000, 0xfba3c16700000000,
+    0xd26218da00000000, 0x492cd7c500000000, 0x60ed0e7800000000,
+    0x18ae670e00000000, 0x316fbeb300000000, 0xe828b5e200000000,
+    0xc1e96c5f00000000, 0xb9aa052900000000, 0x906bdc9400000000,
+    0x8f379b1600000000, 0xa6f642ab00000000, 0xdeb52bdd00000000,
+    0xf774f26000000000, 0x2e33f93100000000, 0x07f2208c00000000,
+    0x7fb149fa00000000, 0x5670904700000000, 0xcd3e5f5800000000,
+    0xe4ff86e500000000, 0x9cbcef9300000000, 0xb57d362e00000000,
+    0x6c3a3d7f00000000, 0x45fbe4c200000000, 0x3db88db400000000,
+    0x1479540900000000, 0x154a25a600000000, 0x3c8bfc1b00000000,
+    0x44c8956d00000000, 0x6d094cd000000000, 0xb44e478100000000,
+    0x9d8f9e3c00000000, 0xe5ccf74a00000000, 0xcc0d2ef700000000,
+    0x5743e1e800000000, 0x7e82385500000000, 0x06c1512300000000,
+    0x2f00889e00000000, 0xf64783cf00000000, 0xdf865a7200000000,
+    0xa7c5330400000000, 0x8e04eab900000000, 0x9158ad3b00000000,
+    0xb899748600000000, 0xc0da1df000000000, 0xe91bc44d00000000,
+    0x305ccf1c00000000, 0x199d16a100000000, 0x61de7fd700000000,
+    0x481fa66a00000000, 0xd351697500000000, 0xfa90b0c800000000,
+    0x82d3d9be00000000, 0xab12000300000000, 0x72550b5200000000,
+    0x5b94d2ef00000000, 0x23d7bb9900000000, 0x0a16622400000000,
+    0x1e6f362d00000000, 0x37aeef9000000000, 0x4fed86e600000000,
+    0x662c5f5b00000000, 0xbf6b540a00000000, 0x96aa8db700000000,
+    0xeee9e4c100000000, 0xc7283d7c00000000, 0x5c66f26300000000,
+    0x75a72bde00000000, 0x0de442a800000000, 0x24259b1500000000,
+    0xfd62904400000000, 0xd4a349f900000000, 0xace0208f00000000,
+    0x8521f93200000000, 0x9a7dbeb000000000, 0xb3bc670d00000000,
+    0xcbff0e7b00000000, 0xe23ed7c600000000, 0x3b79dc9700000000,
+    0x12b8052a00000000, 0x6afb6c5c00000000, 0x433ab5e100000000,
+    0xd8747afe00000000, 0xf1b5a34300000000, 0x89f6ca3500000000,
+    0xa037138800000000, 0x797018d900000000, 0x50b1c16400000000,
+    0x28f2a81200000000, 0x013371af00000000, 0x299449fc00000000,
+    0x0055904100000000, 0x7816f93700000000, 0x51d7208a00000000,
+    0x88902bdb00000000, 0xa151f26600000000, 0xd9129b1000000000,
+    0xf0d342ad00000000, 0x6b9d8db200000000, 0x425c540f00000000,
+    0x3a1f3d7900000000, 0x13dee4c400000000, 0xca99ef9500000000,
+    0xe358362800000000, 0x9b1b5f5e00000000, 0xb2da86e300000000,
+    0xad86c16100000000, 0x844718dc00000000, 0xfc0471aa00000000,
+    0xd5c5a81700000000, 0x0c82a34600000000, 0x25437afb00000000,
+    0x5d00138d00000000, 0x74c1ca3000000000, 0xef8f052f00000000,
+    0xc64edc9200000000, 0xbe0db5e400000000, 0x97cc6c5900000000,
+    0x4e8b670800000000, 0x674abeb500000000, 0x1f09d7c300000000,
+    0x36c80e7e00000000, 0x22b15a7700000000, 0x0b7083ca00000000,
+    0x7333eabc00000000, 0x5af2330100000000, 0x83b5385000000000,
+    0xaa74e1ed00000000, 0xd237889b00000000, 0xfbf6512600000000,
+    0x60b89e3900000000, 0x4979478400000000, 0x313a2ef200000000,
+    0x18fbf74f00000000, 0xc1bcfc1e00000000, 0xe87d25a300000000,
+    0x903e4cd500000000, 0xb9ff956800000000, 0xa6a3d2ea00000000,
+    0x8f620b5700000000, 0xf721622100000000, 0xdee0bb9c00000000,
+    0x07a7b0cd00000000, 0x2e66697000000000, 0x5625000600000000,
+    0x7fe4d9bb00000000, 0xe4aa16a400000000, 0xcd6bcf1900000000,
+    0xb528a66f00000000, 0x9ce97fd200000000, 0x45ae748300000000,
+    0x6c6fad3e00000000, 0x142cc44800000000, 0x3ded1df500000000,
+    0x3cde6c5a00000000, 0x151fb5e700000000, 0x6d5cdc9100000000,
+    0x449d052c00000000, 0x9dda0e7d00000000, 0xb41bd7c000000000,
+    0xcc58beb600000000, 0xe599670b00000000, 0x7ed7a81400000000,
+    0x571671a900000000, 0x2f5518df00000000, 0x0694c16200000000,
+    0xdfd3ca3300000000, 0xf612138e00000000, 0x8e517af800000000,
+    0xa790a34500000000, 0xb8cce4c700000000, 0x910d3d7a00000000,
+    0xe94e540c00000000, 0xc08f8db100000000, 0x19c886e000000000,
+    0x30095f5d00000000, 0x484a362b00000000, 0x618bef9600000000,
+    0xfac5208900000000, 0xd304f93400000000, 0xab47904200000000,
+    0x828649ff00000000, 0x5bc142ae00000000, 0x72009b1300000000,
+    0x0a43f26500000000, 0x23822bd800000000, 0x37fb7fd100000000,
+    0x1e3aa66c00000000, 0x6679cf1a00000000, 0x4fb816a700000000,
+    0x96ff1df600000000, 0xbf3ec44b00000000, 0xc77dad3d00000000,
+    0xeebc748000000000, 0x75f2bb9f00000000, 0x5c33622200000000,
+    0x24700b5400000000, 0x0db1d2e900000000, 0xd4f6d9b800000000,
+    0xfd37000500000000, 0x8574697300000000, 0xacb5b0ce00000000,
+    0xb3e9f74c00000000, 0x9a282ef100000000, 0xe26b478700000000,
+    0xcbaa9e3a00000000, 0x12ed956b00000000, 0x3b2c4cd600000000,
+    0x436f25a000000000, 0x6aaefc1d00000000, 0xf1e0330200000000,
+    0xd821eabf00000000, 0xa06283c900000000, 0x89a35a7400000000,
+    0x50e4512500000000, 0x7925889800000000, 0x0166e1ee00000000,
+    0x28a7385300000000},
+   {0x0000000000000000, 0xc0f0ac8600000000, 0x83e15abd00000000,
+    0x4311f63b00000000, 0x05c3b6ca00000000, 0xc5331a4c00000000,
+    0x8622ec7700000000, 0x46d240f100000000, 0x09866e2500000000,
+    0xc976c2a300000000, 0x8a67349800000000, 0x4a97981e00000000,
+    0x0c45d8ef00000000, 0xccb5746900000000, 0x8fa4825200000000,
+    0x4f542ed400000000, 0x120cdd4a00000000, 0xd2fc71cc00000000,
+    0x91ed87f700000000, 0x511d2b7100000000, 0x17cf6b8000000000,
+    0xd73fc70600000000, 0x942e313d00000000, 0x54de9dbb00000000,
+    0x1b8ab36f00000000, 0xdb7a1fe900000000, 0x986be9d200000000,
+    0x589b455400000000, 0x1e4905a500000000, 0xdeb9a92300000000,
+    0x9da85f1800000000, 0x5d58f39e00000000, 0x2418ba9500000000,
+    0xe4e8161300000000, 0xa7f9e02800000000, 0x67094cae00000000,
+    0x21db0c5f00000000, 0xe12ba0d900000000, 0xa23a56e200000000,
+    0x62cafa6400000000, 0x2d9ed4b000000000, 0xed6e783600000000,
+    0xae7f8e0d00000000, 0x6e8f228b00000000, 0x285d627a00000000,
+    0xe8adcefc00000000, 0xabbc38c700000000, 0x6b4c944100000000,
+    0x361467df00000000, 0xf6e4cb5900000000, 0xb5f53d6200000000,
+    0x750591e400000000, 0x33d7d11500000000, 0xf3277d9300000000,
+    0xb0368ba800000000, 0x70c6272e00000000, 0x3f9209fa00000000,
+    0xff62a57c00000000, 0xbc73534700000000, 0x7c83ffc100000000,
+    0x3a51bf3000000000, 0xfaa113b600000000, 0xb9b0e58d00000000,
+    0x7940490b00000000, 0x4b30779b00000000, 0x8bc0db1d00000000,
+    0xc8d12d2600000000, 0x082181a000000000, 0x4ef3c15100000000,
+    0x8e036dd700000000, 0xcd129bec00000000, 0x0de2376a00000000,
+    0x42b619be00000000, 0x8246b53800000000, 0xc157430300000000,
+    0x01a7ef8500000000, 0x4775af7400000000, 0x878503f200000000,
+    0xc494f5c900000000, 0x0464594f00000000, 0x593caad100000000,
+    0x99cc065700000000, 0xdaddf06c00000000, 0x1a2d5cea00000000,
+    0x5cff1c1b00000000, 0x9c0fb09d00000000, 0xdf1e46a600000000,
+    0x1feeea2000000000, 0x50bac4f400000000, 0x904a687200000000,
+    0xd35b9e4900000000, 0x13ab32cf00000000, 0x5579723e00000000,
+    0x9589deb800000000, 0xd698288300000000, 0x1668840500000000,
+    0x6f28cd0e00000000, 0xafd8618800000000, 0xecc997b300000000,
+    0x2c393b3500000000, 0x6aeb7bc400000000, 0xaa1bd74200000000,
+    0xe90a217900000000, 0x29fa8dff00000000, 0x66aea32b00000000,
+    0xa65e0fad00000000, 0xe54ff99600000000, 0x25bf551000000000,
+    0x636d15e100000000, 0xa39db96700000000, 0xe08c4f5c00000000,
+    0x207ce3da00000000, 0x7d24104400000000, 0xbdd4bcc200000000,
+    0xfec54af900000000, 0x3e35e67f00000000, 0x78e7a68e00000000,
+    0xb8170a0800000000, 0xfb06fc3300000000, 0x3bf650b500000000,
+    0x74a27e6100000000, 0xb452d2e700000000, 0xf74324dc00000000,
+    0x37b3885a00000000, 0x7161c8ab00000000, 0xb191642d00000000,
+    0xf280921600000000, 0x32703e9000000000, 0x9560ed8600000000,
+    0x5590410000000000, 0x1681b73b00000000, 0xd6711bbd00000000,
+    0x90a35b4c00000000, 0x5053f7ca00000000, 0x134201f100000000,
+    0xd3b2ad7700000000, 0x9ce683a300000000, 0x5c162f2500000000,
+    0x1f07d91e00000000, 0xdff7759800000000, 0x9925356900000000,
+    0x59d599ef00000000, 0x1ac46fd400000000, 0xda34c35200000000,
+    0x876c30cc00000000, 0x479c9c4a00000000, 0x048d6a7100000000,
+    0xc47dc6f700000000, 0x82af860600000000, 0x425f2a8000000000,
+    0x014edcbb00000000, 0xc1be703d00000000, 0x8eea5ee900000000,
+    0x4e1af26f00000000, 0x0d0b045400000000, 0xcdfba8d200000000,
+    0x8b29e82300000000, 0x4bd944a500000000, 0x08c8b29e00000000,
+    0xc8381e1800000000, 0xb178571300000000, 0x7188fb9500000000,
+    0x32990dae00000000, 0xf269a12800000000, 0xb4bbe1d900000000,
+    0x744b4d5f00000000, 0x375abb6400000000, 0xf7aa17e200000000,
+    0xb8fe393600000000, 0x780e95b000000000, 0x3b1f638b00000000,
+    0xfbefcf0d00000000, 0xbd3d8ffc00000000, 0x7dcd237a00000000,
+    0x3edcd54100000000, 0xfe2c79c700000000, 0xa3748a5900000000,
+    0x638426df00000000, 0x2095d0e400000000, 0xe0657c6200000000,
+    0xa6b73c9300000000, 0x6647901500000000, 0x2556662e00000000,
+    0xe5a6caa800000000, 0xaaf2e47c00000000, 0x6a0248fa00000000,
+    0x2913bec100000000, 0xe9e3124700000000, 0xaf3152b600000000,
+    0x6fc1fe3000000000, 0x2cd0080b00000000, 0xec20a48d00000000,
+    0xde509a1d00000000, 0x1ea0369b00000000, 0x5db1c0a000000000,
+    0x9d416c2600000000, 0xdb932cd700000000, 0x1b63805100000000,
+    0x5872766a00000000, 0x9882daec00000000, 0xd7d6f43800000000,
+    0x172658be00000000, 0x5437ae8500000000, 0x94c7020300000000,
+    0xd21542f200000000, 0x12e5ee7400000000, 0x51f4184f00000000,
+    0x9104b4c900000000, 0xcc5c475700000000, 0x0cacebd100000000,
+    0x4fbd1dea00000000, 0x8f4db16c00000000, 0xc99ff19d00000000,
+    0x096f5d1b00000000, 0x4a7eab2000000000, 0x8a8e07a600000000,
+    0xc5da297200000000, 0x052a85f400000000, 0x463b73cf00000000,
+    0x86cbdf4900000000, 0xc0199fb800000000, 0x00e9333e00000000,
+    0x43f8c50500000000, 0x8308698300000000, 0xfa48208800000000,
+    0x3ab88c0e00000000, 0x79a97a3500000000, 0xb959d6b300000000,
+    0xff8b964200000000, 0x3f7b3ac400000000, 0x7c6accff00000000,
+    0xbc9a607900000000, 0xf3ce4ead00000000, 0x333ee22b00000000,
+    0x702f141000000000, 0xb0dfb89600000000, 0xf60df86700000000,
+    0x36fd54e100000000, 0x75eca2da00000000, 0xb51c0e5c00000000,
+    0xe844fdc200000000, 0x28b4514400000000, 0x6ba5a77f00000000,
+    0xab550bf900000000, 0xed874b0800000000, 0x2d77e78e00000000,
+    0x6e6611b500000000, 0xae96bd3300000000, 0xe1c293e700000000,
+    0x21323f6100000000, 0x6223c95a00000000, 0xa2d365dc00000000,
+    0xe401252d00000000, 0x24f189ab00000000, 0x67e07f9000000000,
+    0xa710d31600000000}};
+
+#else /* W == 4 */
+
+static const crc_t crc_braid_table[][256] = {
+   {0x00000000, 0x5c11c100, 0xb8238200, 0xe4324300, 0xc0440403,
+    0x9c55c503, 0x78678603, 0x24764703, 0x308b0805, 0x6c9ac905,
+    0x88a88a05, 0xd4b94b05, 0xf0cf0c06, 0xacdecd06, 0x48ec8e06,
+    0x14fd4f06, 0x6116100a, 0x3d07d10a, 0xd935920a, 0x8524530a,
+    0xa1521409, 0xfd43d509, 0x19719609, 0x45605709, 0x519d180f,
+    0x0d8cd90f, 0xe9be9a0f, 0xb5af5b0f, 0x91d91c0c, 0xcdc8dd0c,
+    0x29fa9e0c, 0x75eb5f0c, 0xc22c2014, 0x9e3de114, 0x7a0fa214,
+    0x261e6314, 0x02682417, 0x5e79e517, 0xba4ba617, 0xe65a6717,
+    0xf2a72811, 0xaeb6e911, 0x4a84aa11, 0x16956b11, 0x32e32c12,
+    0x6ef2ed12, 0x8ac0ae12, 0xd6d16f12, 0xa33a301e, 0xff2bf11e,
+    0x1b19b21e, 0x4708731e, 0x637e341d, 0x3f6ff51d, 0xdb5db61d,
+    0x874c771d, 0x93b1381b, 0xcfa0f91b, 0x2b92ba1b, 0x77837b1b,
+    0x53f53c18, 0x0fe4fd18, 0xebd6be18, 0xb7c77f18, 0x345b402b,
+    0x684a812b, 0x8c78c22b, 0xd069032b, 0xf41f4428, 0xa80e8528,
+    0x4c3cc628, 0x102d0728, 0x04d0482e, 0x58c1892e, 0xbcf3ca2e,
+    0xe0e20b2e, 0xc4944c2d, 0x98858d2d, 0x7cb7ce2d, 0x20a60f2d,
+    0x554d5021, 0x095c9121, 0xed6ed221, 0xb17f1321, 0x95095422,
+    0xc9189522, 0x2d2ad622, 0x713b1722, 0x65c65824, 0x39d79924,
+    0xdde5da24, 0x81f41b24, 0xa5825c27, 0xf9939d27, 0x1da1de27,
+    0x41b01f27, 0xf677603f, 0xaa66a13f, 0x4e54e23f, 0x1245233f,
+    0x3633643c, 0x6a22a53c, 0x8e10e63c, 0xd201273c, 0xc6fc683a,
+    0x9aeda93a, 0x7edfea3a, 0x22ce2b3a, 0x06b86c39, 0x5aa9ad39,
+    0xbe9bee39, 0xe28a2f39, 0x97617035, 0xcb70b135, 0x2f42f235,
+    0x73533335, 0x57257436, 0x0b34b536, 0xef06f636, 0xb3173736,
+    0xa7ea7830, 0xfbfbb930, 0x1fc9fa30, 0x43d83b30, 0x67ae7c33,
+    0x3bbfbd33, 0xdf8dfe33, 0x839c3f33, 0x68b68056, 0x34a74156,
+    0xd0950256, 0x8c84c356, 0xa8f28455, 0xf4e34555, 0x10d10655,
+    0x4cc0c755, 0x583d8853, 0x042c4953, 0xe01e0a53, 0xbc0fcb53,
+    0x98798c50, 0xc4684d50, 0x205a0e50, 0x7c4bcf50, 0x09a0905c,
+    0x55b1515c, 0xb183125c, 0xed92d35c, 0xc9e4945f, 0x95f5555f,
+    0x71c7165f, 0x2dd6d75f, 0x392b9859, 0x653a5959, 0x81081a59,
+    0xdd19db59, 0xf96f9c5a, 0xa57e5d5a, 0x414c1e5a, 0x1d5ddf5a,
+    0xaa9aa042, 0xf68b6142, 0x12b92242, 0x4ea8e342, 0x6adea441,
+    0x36cf6541, 0xd2fd2641, 0x8eece741, 0x9a11a847, 0xc6006947,
+    0x22322a47, 0x7e23eb47, 0x5a55ac44, 0x06446d44, 0xe2762e44,
+    0xbe67ef44, 0xcb8cb048, 0x979d7148, 0x73af3248, 0x2fbef348,
+    0x0bc8b44b, 0x57d9754b, 0xb3eb364b, 0xeffaf74b, 0xfb07b84d,
+    0xa716794d, 0x43243a4d, 0x1f35fb4d, 0x3b43bc4e, 0x67527d4e,
+    0x83603e4e, 0xdf71ff4e, 0x5cedc07d, 0x00fc017d, 0xe4ce427d,
+    0xb8df837d, 0x9ca9c47e, 0xc0b8057e, 0x248a467e, 0x789b877e,
+    0x6c66c878, 0x30770978, 0xd4454a78, 0x88548b78, 0xac22cc7b,
+    0xf0330d7b, 0x14014e7b, 0x48108f7b, 0x3dfbd077, 0x61ea1177,
+    0x85d85277, 0xd9c99377, 0xfdbfd474, 0xa1ae1574, 0x459c5674,
+    0x198d9774, 0x0d70d872, 0x51611972, 0xb5535a72, 0xe9429b72,
+    0xcd34dc71, 0x91251d71, 0x75175e71, 0x29069f71, 0x9ec1e069,
+    0xc2d02169, 0x26e26269, 0x7af3a369, 0x5e85e46a, 0x0294256a,
+    0xe6a6666a, 0xbab7a76a, 0xae4ae86c, 0xf25b296c, 0x16696a6c,
+    0x4a78ab6c, 0x6e0eec6f, 0x321f2d6f, 0xd62d6e6f, 0x8a3caf6f,
+    0xffd7f063, 0xa3c63163, 0x47f47263, 0x1be5b363, 0x3f93f460,
+    0x63823560, 0x87b07660, 0xdba1b760, 0xcf5cf866, 0x934d3966,
+    0x777f7a66, 0x2b6ebb66, 0x0f18fc65, 0x53093d65, 0xb73b7e65,
+    0xeb2abf65},
+   {0x00000000, 0xd16d00ac, 0x12d9015b, 0xc3b401f7, 0x25b202b6,
+    0xf4df021a, 0x376b03ed, 0xe6060341, 0x4b64056c, 0x9a0905c0,
+    0x59bd0437, 0x88d0049b, 0x6ed607da, 0xbfbb0776, 0x7c0f0681,
+    0xad62062d, 0x96c80ad8, 0x47a50a74, 0x84110b83, 0x557c0b2f,
+    0xb37a086e, 0x621708c2, 0xa1a30935, 0x70ce0999, 0xddac0fb4,
+    0x0cc10f18, 0xcf750eef, 0x1e180e43, 0xf81e0d02, 0x29730dae,
+    0xeac70c59, 0x3baa0cf5, 0x9d9315b3, 0x4cfe151f, 0x8f4a14e8,
+    0x5e271444, 0xb8211705, 0x694c17a9, 0xaaf8165e, 0x7b9516f2,
+    0xd6f710df, 0x079a1073, 0xc42e1184, 0x15431128, 0xf3451269,
+    0x222812c5, 0xe19c1332, 0x30f1139e, 0x0b5b1f6b, 0xda361fc7,
+    0x19821e30, 0xc8ef1e9c, 0x2ee91ddd, 0xff841d71, 0x3c301c86,
+    0xed5d1c2a, 0x403f1a07, 0x91521aab, 0x52e61b5c, 0x838b1bf0,
+    0x658d18b1, 0xb4e0181d, 0x775419ea, 0xa6391946, 0x8b252b65,
+    0x5a482bc9, 0x99fc2a3e, 0x48912a92, 0xae9729d3, 0x7ffa297f,
+    0xbc4e2888, 0x6d232824, 0xc0412e09, 0x112c2ea5, 0xd2982f52,
+    0x03f52ffe, 0xe5f32cbf, 0x349e2c13, 0xf72a2de4, 0x26472d48,
+    0x1ded21bd, 0xcc802111, 0x0f3420e6, 0xde59204a, 0x385f230b,
+    0xe93223a7, 0x2a862250, 0xfbeb22fc, 0x568924d1, 0x87e4247d,
+    0x4450258a, 0x953d2526, 0x733b2667, 0xa25626cb, 0x61e2273c,
+    0xb08f2790, 0x16b63ed6, 0xc7db3e7a, 0x046f3f8d, 0xd5023f21,
+    0x33043c60, 0xe2693ccc, 0x21dd3d3b, 0xf0b03d97, 0x5dd23bba,
+    0x8cbf3b16, 0x4f0b3ae1, 0x9e663a4d, 0x7860390c, 0xa90d39a0,
+    0x6ab93857, 0xbbd438fb, 0x807e340e, 0x511334a2, 0x92a73555,
+    0x43ca35f9, 0xa5cc36b8, 0x74a13614, 0xb71537e3, 0x6678374f,
+    0xcb1a3162, 0x1a7731ce, 0xd9c33039, 0x08ae3095, 0xeea833d4,
+    0x3fc53378, 0xfc71328f, 0x2d1c3223, 0xa64956c9, 0x77245665,
+    0xb4905792, 0x65fd573e, 0x83fb547f, 0x529654d3, 0x91225524,
+    0x404f5588, 0xed2d53a5, 0x3c405309, 0xfff452fe, 0x2e995252,
+    0xc89f5113, 0x19f251bf, 0xda465048, 0x0b2b50e4, 0x30815c11,
+    0xe1ec5cbd, 0x22585d4a, 0xf3355de6, 0x15335ea7, 0xc45e5e0b,
+    0x07ea5ffc, 0xd6875f50, 0x7be5597d, 0xaa8859d1, 0x693c5826,
+    0xb851588a, 0x5e575bcb, 0x8f3a5b67, 0x4c8e5a90, 0x9de35a3c,
+    0x3bda437a, 0xeab743d6, 0x29034221, 0xf86e428d, 0x1e6841cc,
+    0xcf054160, 0x0cb14097, 0xdddc403b, 0x70be4616, 0xa1d346ba,
+    0x6267474d, 0xb30a47e1, 0x550c44a0, 0x8461440c, 0x47d545fb,
+    0x96b84557, 0xad1249a2, 0x7c7f490e, 0xbfcb48f9, 0x6ea64855,
+    0x88a04b14, 0x59cd4bb8, 0x9a794a4f, 0x4b144ae3, 0xe6764cce,
+    0x371b4c62, 0xf4af4d95, 0x25c24d39, 0xc3c44e78, 0x12a94ed4,
+    0xd11d4f23, 0x00704f8f, 0x2d6c7dac, 0xfc017d00, 0x3fb57cf7,
+    0xeed87c5b, 0x08de7f1a, 0xd9b37fb6, 0x1a077e41, 0xcb6a7eed,
+    0x660878c0, 0xb765786c, 0x74d1799b, 0xa5bc7937, 0x43ba7a76,
+    0x92d77ada, 0x51637b2d, 0x800e7b81, 0xbba47774, 0x6ac977d8,
+    0xa97d762f, 0x78107683, 0x9e1675c2, 0x4f7b756e, 0x8ccf7499,
+    0x5da27435, 0xf0c07218, 0x21ad72b4, 0xe2197343, 0x337473ef,
+    0xd57270ae, 0x041f7002, 0xc7ab71f5, 0x16c67159, 0xb0ff681f,
+    0x619268b3, 0xa2266944, 0x734b69e8, 0x954d6aa9, 0x44206a05,
+    0x87946bf2, 0x56f96b5e, 0xfb9b6d73, 0x2af66ddf, 0xe9426c28,
+    0x382f6c84, 0xde296fc5, 0x0f446f69, 0xccf06e9e, 0x1d9d6e32,
+    0x263762c7, 0xf75a626b, 0x34ee639c, 0xe5836330, 0x03856071,
+    0xd2e860dd, 0x115c612a, 0xc0316186, 0x6d5367ab, 0xbc3e6707,
+    0x7f8a66f0, 0xaee7665c, 0x48e1651d, 0x998c65b1, 0x5a386446,
+    0x8b5564ea},
+   {0x00000000, 0xfc91ad91, 0x49205b21, 0xb5b1f6b0, 0x9240b642,
+    0x6ed11bd3, 0xdb60ed63, 0x27f140f2, 0x94826c87, 0x6813c116,
+    0xdda237a6, 0x21339a37, 0x06c2dac5, 0xfa537754, 0x4fe281e4,
+    0xb3732c75, 0x9907d90d, 0x6596749c, 0xd027822c, 0x2cb62fbd,
+    0x0b476f4f, 0xf7d6c2de, 0x4267346e, 0xbef699ff, 0x0d85b58a,
+    0xf114181b, 0x44a5eeab, 0xb834433a, 0x9fc503c8, 0x6354ae59,
+    0xd6e558e9, 0x2a74f578, 0x820cb219, 0x7e9d1f88, 0xcb2ce938,
+    0x37bd44a9, 0x104c045b, 0xecdda9ca, 0x596c5f7a, 0xa5fdf2eb,
+    0x168ede9e, 0xea1f730f, 0x5fae85bf, 0xa33f282e, 0x84ce68dc,
+    0x785fc54d, 0xcdee33fd, 0x317f9e6c, 0x1b0b6b14, 0xe79ac685,
+    0x522b3035, 0xaeba9da4, 0x894bdd56, 0x75da70c7, 0xc06b8677,
+    0x3cfa2be6, 0x8f890793, 0x7318aa02, 0xc6a95cb2, 0x3a38f123,
+    0x1dc9b1d1, 0xe1581c40, 0x54e9eaf0, 0xa8784761, 0xb41a6431,
+    0x488bc9a0, 0xfd3a3f10, 0x01ab9281, 0x265ad273, 0xdacb7fe2,
+    0x6f7a8952, 0x93eb24c3, 0x209808b6, 0xdc09a527, 0x69b85397,
+    0x9529fe06, 0xb2d8bef4, 0x4e491365, 0xfbf8e5d5, 0x07694844,
+    0x2d1dbd3c, 0xd18c10ad, 0x643de61d, 0x98ac4b8c, 0xbf5d0b7e,
+    0x43cca6ef, 0xf67d505f, 0x0aecfdce, 0xb99fd1bb, 0x450e7c2a,
+    0xf0bf8a9a, 0x0c2e270b, 0x2bdf67f9, 0xd74eca68, 0x62ff3cd8,
+    0x9e6e9149, 0x3616d628, 0xca877bb9, 0x7f368d09, 0x83a72098,
+    0xa456606a, 0x58c7cdfb, 0xed763b4b, 0x11e796da, 0xa294baaf,
+    0x5e05173e, 0xebb4e18e, 0x17254c1f, 0x30d40ced, 0xcc45a17c,
+    0x79f457cc, 0x8565fa5d, 0xaf110f25, 0x5380a2b4, 0xe6315404,
+    0x1aa0f995, 0x3d51b967, 0xc1c014f6, 0x7471e246, 0x88e04fd7,
+    0x3b9363a2, 0xc702ce33, 0x72b33883, 0x8e229512, 0xa9d3d5e0,
+    0x55427871, 0xe0f38ec1, 0x1c622350, 0xd837c861, 0x24a665f0,
+    0x91179340, 0x6d863ed1, 0x4a777e23, 0xb6e6d3b2, 0x03572502,
+    0xffc68893, 0x4cb5a4e6, 0xb0240977, 0x0595ffc7, 0xf9045256,
+    0xdef512a4, 0x2264bf35, 0x97d54985, 0x6b44e414, 0x4130116c,
+    0xbda1bcfd, 0x08104a4d, 0xf481e7dc, 0xd370a72e, 0x2fe10abf,
+    0x9a50fc0f, 0x66c1519e, 0xd5b27deb, 0x2923d07a, 0x9c9226ca,
+    0x60038b5b, 0x47f2cba9, 0xbb636638, 0x0ed29088, 0xf2433d19,
+    0x5a3b7a78, 0xa6aad7e9, 0x131b2159, 0xef8a8cc8, 0xc87bcc3a,
+    0x34ea61ab, 0x815b971b, 0x7dca3a8a, 0xceb916ff, 0x3228bb6e,
+    0x87994dde, 0x7b08e04f, 0x5cf9a0bd, 0xa0680d2c, 0x15d9fb9c,
+    0xe948560d, 0xc33ca375, 0x3fad0ee4, 0x8a1cf854, 0x768d55c5,
+    0x517c1537, 0xadedb8a6, 0x185c4e16, 0xe4cde387, 0x57becff2,
+    0xab2f6263, 0x1e9e94d3, 0xe20f3942, 0xc5fe79b0, 0x396fd421,
+    0x8cde2291, 0x704f8f00, 0x6c2dac50, 0x90bc01c1, 0x250df771,
+    0xd99c5ae0, 0xfe6d1a12, 0x02fcb783, 0xb74d4133, 0x4bdceca2,
+    0xf8afc0d7, 0x043e6d46, 0xb18f9bf6, 0x4d1e3667, 0x6aef7695,
+    0x967edb04, 0x23cf2db4, 0xdf5e8025, 0xf52a755d, 0x09bbd8cc,
+    0xbc0a2e7c, 0x409b83ed, 0x676ac31f, 0x9bfb6e8e, 0x2e4a983e,
+    0xd2db35af, 0x61a819da, 0x9d39b44b, 0x288842fb, 0xd419ef6a,
+    0xf3e8af98, 0x0f790209, 0xbac8f4b9, 0x46595928, 0xee211e49,
+    0x12b0b3d8, 0xa7014568, 0x5b90e8f9, 0x7c61a80b, 0x80f0059a,
+    0x3541f32a, 0xc9d05ebb, 0x7aa372ce, 0x8632df5f, 0x338329ef,
+    0xcf12847e, 0xe8e3c48c, 0x1472691d, 0xa1c39fad, 0x5d52323c,
+    0x7726c744, 0x8bb76ad5, 0x3e069c65, 0xc29731f4, 0xe5667106,
+    0x19f7dc97, 0xac462a27, 0x50d787b6, 0xe3a4abc3, 0x1f350652,
+    0xaa84f0e2, 0x56155d73, 0x71e41d81, 0x8d75b010, 0x38c446a0,
+    0xc455eb31},
+   {0x00000000, 0x006c90c1, 0x00d92182, 0x00b5b143, 0x01b24304,
+    0x01ded3c5, 0x016b6286, 0x0107f247, 0x03648608, 0x030816c9,
+    0x03bda78a, 0x03d1374b, 0x02d6c50c, 0x02ba55cd, 0x020fe48e,
+    0x0263744f, 0x06c90c10, 0x06a59cd1, 0x06102d92, 0x067cbd53,
+    0x077b4f14, 0x0717dfd5, 0x07a26e96, 0x07cefe57, 0x05ad8a18,
+    0x05c11ad9, 0x0574ab9a, 0x05183b5b, 0x041fc91c, 0x047359dd,
+    0x04c6e89e, 0x04aa785f, 0x0d921820, 0x0dfe88e1, 0x0d4b39a2,
+    0x0d27a963, 0x0c205b24, 0x0c4ccbe5, 0x0cf97aa6, 0x0c95ea67,
+    0x0ef69e28, 0x0e9a0ee9, 0x0e2fbfaa, 0x0e432f6b, 0x0f44dd2c,
+    0x0f284ded, 0x0f9dfcae, 0x0ff16c6f, 0x0b5b1430, 0x0b3784f1,
+    0x0b8235b2, 0x0beea573, 0x0ae95734, 0x0a85c7f5, 0x0a3076b6,
+    0x0a5ce677, 0x083f9238, 0x085302f9, 0x08e6b3ba, 0x088a237b,
+    0x098dd13c, 0x09e141fd, 0x0954f0be, 0x0938607f, 0x1b243040,
+    0x1b48a081, 0x1bfd11c2, 0x1b918103, 0x1a967344, 0x1afae385,
+    0x1a4f52c6, 0x1a23c207, 0x1840b648, 0x182c2689, 0x189997ca,
+    0x18f5070b, 0x19f2f54c, 0x199e658d, 0x192bd4ce, 0x1947440f,
+    0x1ded3c50, 0x1d81ac91, 0x1d341dd2, 0x1d588d13, 0x1c5f7f54,
+    0x1c33ef95, 0x1c865ed6, 0x1ceace17, 0x1e89ba58, 0x1ee52a99,
+    0x1e509bda, 0x1e3c0b1b, 0x1f3bf95c, 0x1f57699d, 0x1fe2d8de,
+    0x1f8e481f, 0x16b62860, 0x16dab8a1, 0x166f09e2, 0x16039923,
+    0x17046b64, 0x1768fba5, 0x17dd4ae6, 0x17b1da27, 0x15d2ae68,
+    0x15be3ea9, 0x150b8fea, 0x15671f2b, 0x1460ed6c, 0x140c7dad,
+    0x14b9ccee, 0x14d55c2f, 0x107f2470, 0x1013b4b1, 0x10a605f2,
+    0x10ca9533, 0x11cd6774, 0x11a1f7b5, 0x111446f6, 0x1178d637,
+    0x131ba278, 0x137732b9, 0x13c283fa, 0x13ae133b, 0x12a9e17c,
+    0x12c571bd, 0x1270c0fe, 0x121c503f, 0x36486080, 0x3624f041,
+    0x36914102, 0x36fdd1c3, 0x37fa2384, 0x3796b345, 0x37230206,
+    0x374f92c7, 0x352ce688, 0x35407649, 0x35f5c70a, 0x359957cb,
+    0x349ea58c, 0x34f2354d, 0x3447840e, 0x342b14cf, 0x30816c90,
+    0x30edfc51, 0x30584d12, 0x3034ddd3, 0x31332f94, 0x315fbf55,
+    0x31ea0e16, 0x31869ed7, 0x33e5ea98, 0x33897a59, 0x333ccb1a,
+    0x33505bdb, 0x3257a99c, 0x323b395d, 0x328e881e, 0x32e218df,
+    0x3bda78a0, 0x3bb6e861, 0x3b035922, 0x3b6fc9e3, 0x3a683ba4,
+    0x3a04ab65, 0x3ab11a26, 0x3add8ae7, 0x38befea8, 0x38d26e69,
+    0x3867df2a, 0x380b4feb, 0x390cbdac, 0x39602d6d, 0x39d59c2e,
+    0x39b90cef, 0x3d1374b0, 0x3d7fe471, 0x3dca5532, 0x3da6c5f3,
+    0x3ca137b4, 0x3ccda775, 0x3c781636, 0x3c1486f7, 0x3e77f2b8,
+    0x3e1b6279, 0x3eaed33a, 0x3ec243fb, 0x3fc5b1bc, 0x3fa9217d,
+    0x3f1c903e, 0x3f7000ff, 0x2d6c50c0, 0x2d00c001, 0x2db57142,
+    0x2dd9e183, 0x2cde13c4, 0x2cb28305, 0x2c073246, 0x2c6ba287,
+    0x2e08d6c8, 0x2e644609, 0x2ed1f74a, 0x2ebd678b, 0x2fba95cc,
+    0x2fd6050d, 0x2f63b44e, 0x2f0f248f, 0x2ba55cd0, 0x2bc9cc11,
+    0x2b7c7d52, 0x2b10ed93, 0x2a171fd4, 0x2a7b8f15, 0x2ace3e56,
+    0x2aa2ae97, 0x28c1dad8, 0x28ad4a19, 0x2818fb5a, 0x28746b9b,
+    0x297399dc, 0x291f091d, 0x29aab85e, 0x29c6289f, 0x20fe48e0,
+    0x2092d821, 0x20276962, 0x204bf9a3, 0x214c0be4, 0x21209b25,
+    0x21952a66, 0x21f9baa7, 0x239acee8, 0x23f65e29, 0x2343ef6a,
+    0x232f7fab, 0x22288dec, 0x22441d2d, 0x22f1ac6e, 0x229d3caf,
+    0x263744f0, 0x265bd431, 0x26ee6572, 0x2682f5b3, 0x278507f4,
+    0x27e99735, 0x275c2676, 0x2730b6b7, 0x2553c2f8, 0x253f5239,
+    0x258ae37a, 0x25e673bb, 0x24e181fc, 0x248d113d, 0x2438a07e,
+    0x245430bf}};
+
+static const word_t crc_braid_big_table[][256] = {
+   {0x00000000, 0xc1906c00, 0x8221d900, 0x43b1b500, 0x0443b201,
+    0xc5d3de01, 0x86626b01, 0x47f20701, 0x08866403, 0xc9160803,
+    0x8aa7bd03, 0x4b37d103, 0x0cc5d602, 0xcd55ba02, 0x8ee40f02,
+    0x4f746302, 0x100cc906, 0xd19ca506, 0x922d1006, 0x53bd7c06,
+    0x144f7b07, 0xd5df1707, 0x966ea207, 0x57fece07, 0x188aad05,
+    0xd91ac105, 0x9aab7405, 0x5b3b1805, 0x1cc91f04, 0xdd597304,
+    0x9ee8c604, 0x5f78aa04, 0x2018920d, 0xe188fe0d, 0xa2394b0d,
+    0x63a9270d, 0x245b200c, 0xe5cb4c0c, 0xa67af90c, 0x67ea950c,
+    0x289ef60e, 0xe90e9a0e, 0xaabf2f0e, 0x6b2f430e, 0x2cdd440f,
+    0xed4d280f, 0xaefc9d0f, 0x6f6cf10f, 0x30145b0b, 0xf184370b,
+    0xb235820b, 0x73a5ee0b, 0x3457e90a, 0xf5c7850a, 0xb676300a,
+    0x77e65c0a, 0x38923f08, 0xf9025308, 0xbab3e608, 0x7b238a08,
+    0x3cd18d09, 0xfd41e109, 0xbef05409, 0x7f603809, 0x4030241b,
+    0x81a0481b, 0xc211fd1b, 0x0381911b, 0x4473961a, 0x85e3fa1a,
+    0xc6524f1a, 0x07c2231a, 0x48b64018, 0x89262c18, 0xca979918,
+    0x0b07f518, 0x4cf5f219, 0x8d659e19, 0xced42b19, 0x0f444719,
+    0x503ced1d, 0x91ac811d, 0xd21d341d, 0x138d581d, 0x547f5f1c,
+    0x95ef331c, 0xd65e861c, 0x17ceea1c, 0x58ba891e, 0x992ae51e,
+    0xda9b501e, 0x1b0b3c1e, 0x5cf93b1f, 0x9d69571f, 0xded8e21f,
+    0x1f488e1f, 0x6028b616, 0xa1b8da16, 0xe2096f16, 0x23990316,
+    0x646b0417, 0xa5fb6817, 0xe64add17, 0x27dab117, 0x68aed215,
+    0xa93ebe15, 0xea8f0b15, 0x2b1f6715, 0x6ced6014, 0xad7d0c14,
+    0xeeccb914, 0x2f5cd514, 0x70247f10, 0xb1b41310, 0xf205a610,
+    0x3395ca10, 0x7467cd11, 0xb5f7a111, 0xf6461411, 0x37d67811,
+    0x78a21b13, 0xb9327713, 0xfa83c213, 0x3b13ae13, 0x7ce1a912,
+    0xbd71c512, 0xfec07012, 0x3f501c12, 0x80604836, 0x41f02436,
+    0x02419136, 0xc3d1fd36, 0x8423fa37, 0x45b39637, 0x06022337,
+    0xc7924f37, 0x88e62c35, 0x49764035, 0x0ac7f535, 0xcb579935,
+    0x8ca59e34, 0x4d35f234, 0x0e844734, 0xcf142b34, 0x906c8130,
+    0x51fced30, 0x124d5830, 0xd3dd3430, 0x942f3331, 0x55bf5f31,
+    0x160eea31, 0xd79e8631, 0x98eae533, 0x597a8933, 0x1acb3c33,
+    0xdb5b5033, 0x9ca95732, 0x5d393b32, 0x1e888e32, 0xdf18e232,
+    0xa078da3b, 0x61e8b63b, 0x2259033b, 0xe3c96f3b, 0xa43b683a,
+    0x65ab043a, 0x261ab13a, 0xe78add3a, 0xa8febe38, 0x696ed238,
+    0x2adf6738, 0xeb4f0b38, 0xacbd0c39, 0x6d2d6039, 0x2e9cd539,
+    0xef0cb939, 0xb074133d, 0x71e47f3d, 0x3255ca3d, 0xf3c5a63d,
+    0xb437a13c, 0x75a7cd3c, 0x3616783c, 0xf786143c, 0xb8f2773e,
+    0x79621b3e, 0x3ad3ae3e, 0xfb43c23e, 0xbcb1c53f, 0x7d21a93f,
+    0x3e901c3f, 0xff00703f, 0xc0506c2d, 0x01c0002d, 0x4271b52d,
+    0x83e1d92d, 0xc413de2c, 0x0583b22c, 0x4632072c, 0x87a26b2c,
+    0xc8d6082e, 0x0946642e, 0x4af7d12e, 0x8b67bd2e, 0xcc95ba2f,
+    0x0d05d62f, 0x4eb4632f, 0x8f240f2f, 0xd05ca52b, 0x11ccc92b,
+    0x527d7c2b, 0x93ed102b, 0xd41f172a, 0x158f7b2a, 0x563ece2a,
+    0x97aea22a, 0xd8dac128, 0x194aad28, 0x5afb1828, 0x9b6b7428,
+    0xdc997329, 0x1d091f29, 0x5eb8aa29, 0x9f28c629, 0xe048fe20,
+    0x21d89220, 0x62692720, 0xa3f94b20, 0xe40b4c21, 0x259b2021,
+    0x662a9521, 0xa7baf921, 0xe8ce9a23, 0x295ef623, 0x6aef4323,
+    0xab7f2f23, 0xec8d2822, 0x2d1d4422, 0x6eacf122, 0xaf3c9d22,
+    0xf0443726, 0x31d45b26, 0x7265ee26, 0xb3f58226, 0xf4078527,
+    0x3597e927, 0x76265c27, 0xb7b63027, 0xf8c25325, 0x39523f25,
+    0x7ae38a25, 0xbb73e625, 0xfc81e124, 0x3d118d24, 0x7ea03824,
+    0xbf305424},
+   {0x00000000, 0x91ad91fc, 0x215b2049, 0xb0f6b1b5, 0x42b64092,
+    0xd31bd16e, 0x63ed60db, 0xf240f127, 0x876c8294, 0x16c11368,
+    0xa637a2dd, 0x379a3321, 0xc5dac206, 0x547753fa, 0xe481e24f,
+    0x752c73b3, 0x0dd90799, 0x9c749665, 0x2c8227d0, 0xbd2fb62c,
+    0x4f6f470b, 0xdec2d6f7, 0x6e346742, 0xff99f6be, 0x8ab5850d,
+    0x1b1814f1, 0xabeea544, 0x3a4334b8, 0xc803c59f, 0x59ae5463,
+    0xe958e5d6, 0x78f5742a, 0x19b20c82, 0x881f9d7e, 0x38e92ccb,
+    0xa944bd37, 0x5b044c10, 0xcaa9ddec, 0x7a5f6c59, 0xebf2fda5,
+    0x9ede8e16, 0x0f731fea, 0xbf85ae5f, 0x2e283fa3, 0xdc68ce84,
+    0x4dc55f78, 0xfd33eecd, 0x6c9e7f31, 0x146b0b1b, 0x85c69ae7,
+    0x35302b52, 0xa49dbaae, 0x56dd4b89, 0xc770da75, 0x77866bc0,
+    0xe62bfa3c, 0x9307898f, 0x02aa1873, 0xb25ca9c6, 0x23f1383a,
+    0xd1b1c91d, 0x401c58e1, 0xf0eae954, 0x614778a8, 0x31641ab4,
+    0xa0c98b48, 0x103f3afd, 0x8192ab01, 0x73d25a26, 0xe27fcbda,
+    0x52897a6f, 0xc324eb93, 0xb6089820, 0x27a509dc, 0x9753b869,
+    0x06fe2995, 0xf4bed8b2, 0x6513494e, 0xd5e5f8fb, 0x44486907,
+    0x3cbd1d2d, 0xad108cd1, 0x1de63d64, 0x8c4bac98, 0x7e0b5dbf,
+    0xefa6cc43, 0x5f507df6, 0xcefdec0a, 0xbbd19fb9, 0x2a7c0e45,
+    0x9a8abff0, 0x0b272e0c, 0xf967df2b, 0x68ca4ed7, 0xd83cff62,
+    0x49916e9e, 0x28d61636, 0xb97b87ca, 0x098d367f, 0x9820a783,
+    0x6a6056a4, 0xfbcdc758, 0x4b3b76ed, 0xda96e711, 0xafba94a2,
+    0x3e17055e, 0x8ee1b4eb, 0x1f4c2517, 0xed0cd430, 0x7ca145cc,
+    0xcc57f479, 0x5dfa6585, 0x250f11af, 0xb4a28053, 0x045431e6,
+    0x95f9a01a, 0x67b9513d, 0xf614c0c1, 0x46e27174, 0xd74fe088,
+    0xa263933b, 0x33ce02c7, 0x8338b372, 0x1295228e, 0xe0d5d3a9,
+    0x71784255, 0xc18ef3e0, 0x5023621c, 0x61c837d8, 0xf065a624,
+    0x40931791, 0xd13e866d, 0x237e774a, 0xb2d3e6b6, 0x02255703,
+    0x9388c6ff, 0xe6a4b54c, 0x770924b0, 0xc7ff9505, 0x565204f9,
+    0xa412f5de, 0x35bf6422, 0x8549d597, 0x14e4446b, 0x6c113041,
+    0xfdbca1bd, 0x4d4a1008, 0xdce781f4, 0x2ea770d3, 0xbf0ae12f,
+    0x0ffc509a, 0x9e51c166, 0xeb7db2d5, 0x7ad02329, 0xca26929c,
+    0x5b8b0360, 0xa9cbf247, 0x386663bb, 0x8890d20e, 0x193d43f2,
+    0x787a3b5a, 0xe9d7aaa6, 0x59211b13, 0xc88c8aef, 0x3acc7bc8,
+    0xab61ea34, 0x1b975b81, 0x8a3aca7d, 0xff16b9ce, 0x6ebb2832,
+    0xde4d9987, 0x4fe0087b, 0xbda0f95c, 0x2c0d68a0, 0x9cfbd915,
+    0x0d5648e9, 0x75a33cc3, 0xe40ead3f, 0x54f81c8a, 0xc5558d76,
+    0x37157c51, 0xa6b8edad, 0x164e5c18, 0x87e3cde4, 0xf2cfbe57,
+    0x63622fab, 0xd3949e1e, 0x42390fe2, 0xb079fec5, 0x21d46f39,
+    0x9122de8c, 0x008f4f70, 0x50ac2d6c, 0xc101bc90, 0x71f70d25,
+    0xe05a9cd9, 0x121a6dfe, 0x83b7fc02, 0x33414db7, 0xa2ecdc4b,
+    0xd7c0aff8, 0x466d3e04, 0xf69b8fb1, 0x67361e4d, 0x9576ef6a,
+    0x04db7e96, 0xb42dcf23, 0x25805edf, 0x5d752af5, 0xccd8bb09,
+    0x7c2e0abc, 0xed839b40, 0x1fc36a67, 0x8e6efb9b, 0x3e984a2e,
+    0xaf35dbd2, 0xda19a861, 0x4bb4399d, 0xfb428828, 0x6aef19d4,
+    0x98afe8f3, 0x0902790f, 0xb9f4c8ba, 0x28595946, 0x491e21ee,
+    0xd8b3b012, 0x684501a7, 0xf9e8905b, 0x0ba8617c, 0x9a05f080,
+    0x2af34135, 0xbb5ed0c9, 0xce72a37a, 0x5fdf3286, 0xef298333,
+    0x7e8412cf, 0x8cc4e3e8, 0x1d697214, 0xad9fc3a1, 0x3c32525d,
+    0x44c72677, 0xd56ab78b, 0x659c063e, 0xf43197c2, 0x067166e5,
+    0x97dcf719, 0x272a46ac, 0xb687d750, 0xc3aba4e3, 0x5206351f,
+    0xe2f084aa, 0x735d1556, 0x811de471, 0x10b0758d, 0xa046c438,
+    0x31eb55c4},
+   {0x00000000, 0xac006dd1, 0x5b01d912, 0xf701b4c3, 0xb602b225,
+    0x1a02dff4, 0xed036b37, 0x410306e6, 0x6c05644b, 0xc005099a,
+    0x3704bd59, 0x9b04d088, 0xda07d66e, 0x7607bbbf, 0x81060f7c,
+    0x2d0662ad, 0xd80ac896, 0x740aa547, 0x830b1184, 0x2f0b7c55,
+    0x6e087ab3, 0xc2081762, 0x3509a3a1, 0x9909ce70, 0xb40facdd,
+    0x180fc10c, 0xef0e75cf, 0x430e181e, 0x020d1ef8, 0xae0d7329,
+    0x590cc7ea, 0xf50caa3b, 0xb315939d, 0x1f15fe4c, 0xe8144a8f,
+    0x4414275e, 0x051721b8, 0xa9174c69, 0x5e16f8aa, 0xf216957b,
+    0xdf10f7d6, 0x73109a07, 0x84112ec4, 0x28114315, 0x691245f3,
+    0xc5122822, 0x32139ce1, 0x9e13f130, 0x6b1f5b0b, 0xc71f36da,
+    0x301e8219, 0x9c1eefc8, 0xdd1de92e, 0x711d84ff, 0x861c303c,
+    0x2a1c5ded, 0x071a3f40, 0xab1a5291, 0x5c1be652, 0xf01b8b83,
+    0xb1188d65, 0x1d18e0b4, 0xea195477, 0x461939a6, 0x652b258b,
+    0xc92b485a, 0x3e2afc99, 0x922a9148, 0xd32997ae, 0x7f29fa7f,
+    0x88284ebc, 0x2428236d, 0x092e41c0, 0xa52e2c11, 0x522f98d2,
+    0xfe2ff503, 0xbf2cf3e5, 0x132c9e34, 0xe42d2af7, 0x482d4726,
+    0xbd21ed1d, 0x112180cc, 0xe620340f, 0x4a2059de, 0x0b235f38,
+    0xa72332e9, 0x5022862a, 0xfc22ebfb, 0xd1248956, 0x7d24e487,
+    0x8a255044, 0x26253d95, 0x67263b73, 0xcb2656a2, 0x3c27e261,
+    0x90278fb0, 0xd63eb616, 0x7a3edbc7, 0x8d3f6f04, 0x213f02d5,
+    0x603c0433, 0xcc3c69e2, 0x3b3ddd21, 0x973db0f0, 0xba3bd25d,
+    0x163bbf8c, 0xe13a0b4f, 0x4d3a669e, 0x0c396078, 0xa0390da9,
+    0x5738b96a, 0xfb38d4bb, 0x0e347e80, 0xa2341351, 0x5535a792,
+    0xf935ca43, 0xb836cca5, 0x1436a174, 0xe33715b7, 0x4f377866,
+    0x62311acb, 0xce31771a, 0x3930c3d9, 0x9530ae08, 0xd433a8ee,
+    0x7833c53f, 0x8f3271fc, 0x23321c2d, 0xc95649a6, 0x65562477,
+    0x925790b4, 0x3e57fd65, 0x7f54fb83, 0xd3549652, 0x24552291,
+    0x88554f40, 0xa5532ded, 0x0953403c, 0xfe52f4ff, 0x5252992e,
+    0x13519fc8, 0xbf51f219, 0x485046da, 0xe4502b0b, 0x115c8130,
+    0xbd5cece1, 0x4a5d5822, 0xe65d35f3, 0xa75e3315, 0x0b5e5ec4,
+    0xfc5fea07, 0x505f87d6, 0x7d59e57b, 0xd15988aa, 0x26583c69,
+    0x8a5851b8, 0xcb5b575e, 0x675b3a8f, 0x905a8e4c, 0x3c5ae39d,
+    0x7a43da3b, 0xd643b7ea, 0x21420329, 0x8d426ef8, 0xcc41681e,
+    0x604105cf, 0x9740b10c, 0x3b40dcdd, 0x1646be70, 0xba46d3a1,
+    0x4d476762, 0xe1470ab3, 0xa0440c55, 0x0c446184, 0xfb45d547,
+    0x5745b896, 0xa24912ad, 0x0e497f7c, 0xf948cbbf, 0x5548a66e,
+    0x144ba088, 0xb84bcd59, 0x4f4a799a, 0xe34a144b, 0xce4c76e6,
+    0x624c1b37, 0x954daff4, 0x394dc225, 0x784ec4c3, 0xd44ea912,
+    0x234f1dd1, 0x8f4f7000, 0xac7d6c2d, 0x007d01fc, 0xf77cb53f,
+    0x5b7cd8ee, 0x1a7fde08, 0xb67fb3d9, 0x417e071a, 0xed7e6acb,
+    0xc0780866, 0x6c7865b7, 0x9b79d174, 0x3779bca5, 0x767aba43,
+    0xda7ad792, 0x2d7b6351, 0x817b0e80, 0x7477a4bb, 0xd877c96a,
+    0x2f767da9, 0x83761078, 0xc275169e, 0x6e757b4f, 0x9974cf8c,
+    0x3574a25d, 0x1872c0f0, 0xb472ad21, 0x437319e2, 0xef737433,
+    0xae7072d5, 0x02701f04, 0xf571abc7, 0x5971c616, 0x1f68ffb0,
+    0xb3689261, 0x446926a2, 0xe8694b73, 0xa96a4d95, 0x056a2044,
+    0xf26b9487, 0x5e6bf956, 0x736d9bfb, 0xdf6df62a, 0x286c42e9,
+    0x846c2f38, 0xc56f29de, 0x696f440f, 0x9e6ef0cc, 0x326e9d1d,
+    0xc7623726, 0x6b625af7, 0x9c63ee34, 0x306383e5, 0x71608503,
+    0xdd60e8d2, 0x2a615c11, 0x866131c0, 0xab67536d, 0x07673ebc,
+    0xf0668a7f, 0x5c66e7ae, 0x1d65e148, 0xb1658c99, 0x4664385a,
+    0xea64558b},
+   {0x00000000, 0x00c1115c, 0x008223b8, 0x004332e4, 0x030444c0,
+    0x03c5559c, 0x03866778, 0x03477624, 0x05088b30, 0x05c99a6c,
+    0x058aa888, 0x054bb9d4, 0x060ccff0, 0x06cddeac, 0x068eec48,
+    0x064ffd14, 0x0a101661, 0x0ad1073d, 0x0a9235d9, 0x0a532485,
+    0x091452a1, 0x09d543fd, 0x09967119, 0x09576045, 0x0f189d51,
+    0x0fd98c0d, 0x0f9abee9, 0x0f5bafb5, 0x0c1cd991, 0x0cddc8cd,
+    0x0c9efa29, 0x0c5feb75, 0x14202cc2, 0x14e13d9e, 0x14a20f7a,
+    0x14631e26, 0x17246802, 0x17e5795e, 0x17a64bba, 0x17675ae6,
+    0x1128a7f2, 0x11e9b6ae, 0x11aa844a, 0x116b9516, 0x122ce332,
+    0x12edf26e, 0x12aec08a, 0x126fd1d6, 0x1e303aa3, 0x1ef12bff,
+    0x1eb2191b, 0x1e730847, 0x1d347e63, 0x1df56f3f, 0x1db65ddb,
+    0x1d774c87, 0x1b38b193, 0x1bf9a0cf, 0x1bba922b, 0x1b7b8377,
+    0x183cf553, 0x18fde40f, 0x18bed6eb, 0x187fc7b7, 0x2b405b34,
+    0x2b814a68, 0x2bc2788c, 0x2b0369d0, 0x28441ff4, 0x28850ea8,
+    0x28c63c4c, 0x28072d10, 0x2e48d004, 0x2e89c158, 0x2ecaf3bc,
+    0x2e0be2e0, 0x2d4c94c4, 0x2d8d8598, 0x2dceb77c, 0x2d0fa620,
+    0x21504d55, 0x21915c09, 0x21d26eed, 0x21137fb1, 0x22540995,
+    0x229518c9, 0x22d62a2d, 0x22173b71, 0x2458c665, 0x2499d739,
+    0x24dae5dd, 0x241bf481, 0x275c82a5, 0x279d93f9, 0x27dea11d,
+    0x271fb041, 0x3f6077f6, 0x3fa166aa, 0x3fe2544e, 0x3f234512,
+    0x3c643336, 0x3ca5226a, 0x3ce6108e, 0x3c2701d2, 0x3a68fcc6,
+    0x3aa9ed9a, 0x3aeadf7e, 0x3a2bce22, 0x396cb806, 0x39ada95a,
+    0x39ee9bbe, 0x392f8ae2, 0x35706197, 0x35b170cb, 0x35f2422f,
+    0x35335373, 0x36742557, 0x36b5340b, 0x36f606ef, 0x363717b3,
+    0x3078eaa7, 0x30b9fbfb, 0x30fac91f, 0x303bd843, 0x337cae67,
+    0x33bdbf3b, 0x33fe8ddf, 0x333f9c83, 0x5680b668, 0x5641a734,
+    0x560295d0, 0x56c3848c, 0x5584f2a8, 0x5545e3f4, 0x5506d110,
+    0x55c7c04c, 0x53883d58, 0x53492c04, 0x530a1ee0, 0x53cb0fbc,
+    0x508c7998, 0x504d68c4, 0x500e5a20, 0x50cf4b7c, 0x5c90a009,
+    0x5c51b155, 0x5c1283b1, 0x5cd392ed, 0x5f94e4c9, 0x5f55f595,
+    0x5f16c771, 0x5fd7d62d, 0x59982b39, 0x59593a65, 0x591a0881,
+    0x59db19dd, 0x5a9c6ff9, 0x5a5d7ea5, 0x5a1e4c41, 0x5adf5d1d,
+    0x42a09aaa, 0x42618bf6, 0x4222b912, 0x42e3a84e, 0x41a4de6a,
+    0x4165cf36, 0x4126fdd2, 0x41e7ec8e, 0x47a8119a, 0x476900c6,
+    0x472a3222, 0x47eb237e, 0x44ac555a, 0x446d4406, 0x442e76e2,
+    0x44ef67be, 0x48b08ccb, 0x48719d97, 0x4832af73, 0x48f3be2f,
+    0x4bb4c80b, 0x4b75d957, 0x4b36ebb3, 0x4bf7faef, 0x4db807fb,
+    0x4d7916a7, 0x4d3a2443, 0x4dfb351f, 0x4ebc433b, 0x4e7d5267,
+    0x4e3e6083, 0x4eff71df, 0x7dc0ed5c, 0x7d01fc00, 0x7d42cee4,
+    0x7d83dfb8, 0x7ec4a99c, 0x7e05b8c0, 0x7e468a24, 0x7e879b78,
+    0x78c8666c, 0x78097730, 0x784a45d4, 0x788b5488, 0x7bcc22ac,
+    0x7b0d33f0, 0x7b4e0114, 0x7b8f1048, 0x77d0fb3d, 0x7711ea61,
+    0x7752d885, 0x7793c9d9, 0x74d4bffd, 0x7415aea1, 0x74569c45,
+    0x74978d19, 0x72d8700d, 0x72196151, 0x725a53b5, 0x729b42e9,
+    0x71dc34cd, 0x711d2591, 0x715e1775, 0x719f0629, 0x69e0c19e,
+    0x6921d0c2, 0x6962e226, 0x69a3f37a, 0x6ae4855e, 0x6a259402,
+    0x6a66a6e6, 0x6aa7b7ba, 0x6ce84aae, 0x6c295bf2, 0x6c6a6916,
+    0x6cab784a, 0x6fec0e6e, 0x6f2d1f32, 0x6f6e2dd6, 0x6faf3c8a,
+    0x63f0d7ff, 0x6331c6a3, 0x6372f447, 0x63b3e51b, 0x60f4933f,
+    0x60358263, 0x6076b087, 0x60b7a1db, 0x66f85ccf, 0x66394d93,
+    0x667a7f77, 0x66bb6e2b, 0x65fc180f, 0x653d0953, 0x657e3bb7,
+    0x65bf2aeb}};
+
+#endif
+
+#endif
+
+#if N == 6
+
+#if W == 8
+
+static const crc_t crc_braid_table[][256] = {
+   {0x00000000, 0xe17c91c1, 0x72fa2381, 0x9386b240, 0xe5f44702,
+    0x0488d6c3, 0x970e6483, 0x7672f542, 0x7beb8e07, 0x9a971fc6,
+    0x0911ad86, 0xe86d3c47, 0x9e1fc905, 0x7f6358c4, 0xece5ea84,
+    0x0d997b45, 0xf7d71c0e, 0x16ab8dcf, 0x852d3f8f, 0x6451ae4e,
+    0x12235b0c, 0xf35fcacd, 0x60d9788d, 0x81a5e94c, 0x8c3c9209,
+    0x6d4003c8, 0xfec6b188, 0x1fba2049, 0x69c8d50b, 0x88b444ca,
+    0x1b32f68a, 0xfa4e674b, 0x5fad381f, 0xbed1a9de, 0x2d571b9e,
+    0xcc2b8a5f, 0xba597f1d, 0x5b25eedc, 0xc8a35c9c, 0x29dfcd5d,
+    0x2446b618, 0xc53a27d9, 0x56bc9599, 0xb7c00458, 0xc1b2f11a,
+    0x20ce60db, 0xb348d29b, 0x5234435a, 0xa87a2411, 0x4906b5d0,
+    0xda800790, 0x3bfc9651, 0x4d8e6313, 0xacf2f2d2, 0x3f744092,
+    0xde08d153, 0xd391aa16, 0x32ed3bd7, 0xa16b8997, 0x40171856,
+    0x3665ed14, 0xd7197cd5, 0x449fce95, 0xa5e35f54, 0xbf5a703e,
+    0x5e26e1ff, 0xcda053bf, 0x2cdcc27e, 0x5aae373c, 0xbbd2a6fd,
+    0x285414bd, 0xc928857c, 0xc4b1fe39, 0x25cd6ff8, 0xb64bddb8,
+    0x57374c79, 0x2145b93b, 0xc03928fa, 0x53bf9aba, 0xb2c30b7b,
+    0x488d6c30, 0xa9f1fdf1, 0x3a774fb1, 0xdb0bde70, 0xad792b32,
+    0x4c05baf3, 0xdf8308b3, 0x3eff9972, 0x3366e237, 0xd21a73f6,
+    0x419cc1b6, 0xa0e05077, 0xd692a535, 0x37ee34f4, 0xa46886b4,
+    0x45141775, 0xe0f74821, 0x018bd9e0, 0x920d6ba0, 0x7371fa61,
+    0x05030f23, 0xe47f9ee2, 0x77f92ca2, 0x9685bd63, 0x9b1cc626,
+    0x7a6057e7, 0xe9e6e5a7, 0x089a7466, 0x7ee88124, 0x9f9410e5,
+    0x0c12a2a5, 0xed6e3364, 0x1720542f, 0xf65cc5ee, 0x65da77ae,
+    0x84a6e66f, 0xf2d4132d, 0x13a882ec, 0x802e30ac, 0x6152a16d,
+    0x6ccbda28, 0x8db74be9, 0x1e31f9a9, 0xff4d6868, 0x893f9d2a,
+    0x68430ceb, 0xfbc5beab, 0x1ab92f6a, 0xceb7e07f, 0x2fcb71be,
+    0xbc4dc3fe, 0x5d31523f, 0x2b43a77d, 0xca3f36bc, 0x59b984fc,
+    0xb8c5153d, 0xb55c6e78, 0x5420ffb9, 0xc7a64df9, 0x26dadc38,
+    0x50a8297a, 0xb1d4b8bb, 0x22520afb, 0xc32e9b3a, 0x3960fc71,
+    0xd81c6db0, 0x4b9adff0, 0xaae64e31, 0xdc94bb73, 0x3de82ab2,
+    0xae6e98f2, 0x4f120933, 0x428b7276, 0xa3f7e3b7, 0x307151f7,
+    0xd10dc036, 0xa77f3574, 0x4603a4b5, 0xd58516f5, 0x34f98734,
+    0x911ad860, 0x706649a1, 0xe3e0fbe1, 0x029c6a20, 0x74ee9f62,
+    0x95920ea3, 0x0614bce3, 0xe7682d22, 0xeaf15667, 0x0b8dc7a6,
+    0x980b75e6, 0x7977e427, 0x0f051165, 0xee7980a4, 0x7dff32e4,
+    0x9c83a325, 0x66cdc46e, 0x87b155af, 0x1437e7ef, 0xf54b762e,
+    0x8339836c, 0x624512ad, 0xf1c3a0ed, 0x10bf312c, 0x1d264a69,
+    0xfc5adba8, 0x6fdc69e8, 0x8ea0f829, 0xf8d20d6b, 0x19ae9caa,
+    0x8a282eea, 0x6b54bf2b, 0x71ed9041, 0x90910180, 0x0317b3c0,
+    0xe26b2201, 0x9419d743, 0x75654682, 0xe6e3f4c2, 0x079f6503,
+    0x0a061e46, 0xeb7a8f87, 0x78fc3dc7, 0x9980ac06, 0xeff25944,
+    0x0e8ec885, 0x9d087ac5, 0x7c74eb04, 0x863a8c4f, 0x67461d8e,
+    0xf4c0afce, 0x15bc3e0f, 0x63cecb4d, 0x82b25a8c, 0x1134e8cc,
+    0xf048790d, 0xfdd10248, 0x1cad9389, 0x8f2b21c9, 0x6e57b008,
+    0x1825454a, 0xf959d48b, 0x6adf66cb, 0x8ba3f70a, 0x2e40a85e,
+    0xcf3c399f, 0x5cba8bdf, 0xbdc61a1e, 0xcbb4ef5c, 0x2ac87e9d,
+    0xb94eccdd, 0x58325d1c, 0x55ab2659, 0xb4d7b798, 0x275105d8,
+    0xc62d9419, 0xb05f615b, 0x5123f09a, 0xc2a542da, 0x23d9d31b,
+    0xd997b450, 0x38eb2591, 0xab6d97d1, 0x4a110610, 0x3c63f352,
+    0xdd1f6293, 0x4e99d0d3, 0xafe54112, 0xa27c3a57, 0x4300ab96,
+    0xd08619d6, 0x31fa8817, 0x47887d55, 0xa6f4ec94, 0x35725ed4,
+    0xd40ecf15},
+   {0x00000000, 0x2d6cc0fd, 0x5ad981fa, 0x77b54107, 0xb5b303f4,
+    0x98dfc309, 0xef6a820e, 0xc20642f3, 0xdb6507eb, 0xf609c716,
+    0x81bc8611, 0xacd046ec, 0x6ed6041f, 0x43bac4e2, 0x340f85e5,
+    0x19634518, 0x06c90fd5, 0x2ba5cf28, 0x5c108e2f, 0x717c4ed2,
+    0xb37a0c21, 0x9e16ccdc, 0xe9a38ddb, 0xc4cf4d26, 0xddac083e,
+    0xf0c0c8c3, 0x877589c4, 0xaa194939, 0x681f0bca, 0x4573cb37,
+    0x32c68a30, 0x1faa4acd, 0x0d921faa, 0x20fedf57, 0x574b9e50,
+    0x7a275ead, 0xb8211c5e, 0x954ddca3, 0xe2f89da4, 0xcf945d59,
+    0xd6f71841, 0xfb9bd8bc, 0x8c2e99bb, 0xa1425946, 0x63441bb5,
+    0x4e28db48, 0x399d9a4f, 0x14f15ab2, 0x0b5b107f, 0x2637d082,
+    0x51829185, 0x7cee5178, 0xbee8138b, 0x9384d376, 0xe4319271,
+    0xc95d528c, 0xd03e1794, 0xfd52d769, 0x8ae7966e, 0xa78b5693,
+    0x658d1460, 0x48e1d49d, 0x3f54959a, 0x12385567, 0x1b243f54,
+    0x3648ffa9, 0x41fdbeae, 0x6c917e53, 0xae973ca0, 0x83fbfc5d,
+    0xf44ebd5a, 0xd9227da7, 0xc04138bf, 0xed2df842, 0x9a98b945,
+    0xb7f479b8, 0x75f23b4b, 0x589efbb6, 0x2f2bbab1, 0x02477a4c,
+    0x1ded3081, 0x3081f07c, 0x4734b17b, 0x6a587186, 0xa85e3375,
+    0x8532f388, 0xf287b28f, 0xdfeb7272, 0xc688376a, 0xebe4f797,
+    0x9c51b690, 0xb13d766d, 0x733b349e, 0x5e57f463, 0x29e2b564,
+    0x048e7599, 0x16b620fe, 0x3bdae003, 0x4c6fa104, 0x610361f9,
+    0xa305230a, 0x8e69e3f7, 0xf9dca2f0, 0xd4b0620d, 0xcdd32715,
+    0xe0bfe7e8, 0x970aa6ef, 0xba666612, 0x786024e1, 0x550ce41c,
+    0x22b9a51b, 0x0fd565e6, 0x107f2f2b, 0x3d13efd6, 0x4aa6aed1,
+    0x67ca6e2c, 0xa5cc2cdf, 0x88a0ec22, 0xff15ad25, 0xd2796dd8,
+    0xcb1a28c0, 0xe676e83d, 0x91c3a93a, 0xbcaf69c7, 0x7ea92b34,
+    0x53c5ebc9, 0x2470aace, 0x091c6a33, 0x36487ea8, 0x1b24be55,
+    0x6c91ff52, 0x41fd3faf, 0x83fb7d5c, 0xae97bda1, 0xd922fca6,
+    0xf44e3c5b, 0xed2d7943, 0xc041b9be, 0xb7f4f8b9, 0x9a983844,
+    0x589e7ab7, 0x75f2ba4a, 0x0247fb4d, 0x2f2b3bb0, 0x3081717d,
+    0x1dedb180, 0x6a58f087, 0x4734307a, 0x85327289, 0xa85eb274,
+    0xdfebf373, 0xf287338e, 0xebe47696, 0xc688b66b, 0xb13df76c,
+    0x9c513791, 0x5e577562, 0x733bb59f, 0x048ef498, 0x29e23465,
+    0x3bda6102, 0x16b6a1ff, 0x6103e0f8, 0x4c6f2005, 0x8e6962f6,
+    0xa305a20b, 0xd4b0e30c, 0xf9dc23f1, 0xe0bf66e9, 0xcdd3a614,
+    0xba66e713, 0x970a27ee, 0x550c651d, 0x7860a5e0, 0x0fd5e4e7,
+    0x22b9241a, 0x3d136ed7, 0x107fae2a, 0x67caef2d, 0x4aa62fd0,
+    0x88a06d23, 0xa5ccadde, 0xd279ecd9, 0xff152c24, 0xe676693c,
+    0xcb1aa9c1, 0xbcafe8c6, 0x91c3283b, 0x53c56ac8, 0x7ea9aa35,
+    0x091ceb32, 0x24702bcf, 0x2d6c41fc, 0x00008101, 0x77b5c006,
+    0x5ad900fb, 0x98df4208, 0xb5b382f5, 0xc206c3f2, 0xef6a030f,
+    0xf6094617, 0xdb6586ea, 0xacd0c7ed, 0x81bc0710, 0x43ba45e3,
+    0x6ed6851e, 0x1963c419, 0x340f04e4, 0x2ba54e29, 0x06c98ed4,
+    0x717ccfd3, 0x5c100f2e, 0x9e164ddd, 0xb37a8d20, 0xc4cfcc27,
+    0xe9a30cda, 0xf0c049c2, 0xddac893f, 0xaa19c838, 0x877508c5,
+    0x45734a36, 0x681f8acb, 0x1faacbcc, 0x32c60b31, 0x20fe5e56,
+    0x0d929eab, 0x7a27dfac, 0x574b1f51, 0x954d5da2, 0xb8219d5f,
+    0xcf94dc58, 0xe2f81ca5, 0xfb9b59bd, 0xd6f79940, 0xa142d847,
+    0x8c2e18ba, 0x4e285a49, 0x63449ab4, 0x14f1dbb3, 0x399d1b4e,
+    0x26375183, 0x0b5b917e, 0x7ceed079, 0x51821084, 0x93845277,
+    0xbee8928a, 0xc95dd38d, 0xe4311370, 0xfd525668, 0xd03e9695,
+    0xa78bd792, 0x8ae7176f, 0x48e1559c, 0x658d9561, 0x1238d466,
+    0x3f54149b},
+   {0x00000000, 0x6c90fd50, 0xd921faa0, 0xb5b107f0, 0x0240f543,
+    0x6ed00813, 0xdb610fe3, 0xb7f1f2b3, 0x0481ea86, 0x681117d6,
+    0xdda01026, 0xb130ed76, 0x06c11fc5, 0x6a51e295, 0xdfe0e565,
+    0xb3701835, 0x0903d50c, 0x6593285c, 0xd0222fac, 0xbcb2d2fc,
+    0x0b43204f, 0x67d3dd1f, 0xd262daef, 0xbef227bf, 0x0d823f8a,
+    0x6112c2da, 0xd4a3c52a, 0xb833387a, 0x0fc2cac9, 0x63523799,
+    0xd6e33069, 0xba73cd39, 0x1207aa18, 0x7e975748, 0xcb2650b8,
+    0xa7b6ade8, 0x10475f5b, 0x7cd7a20b, 0xc966a5fb, 0xa5f658ab,
+    0x1686409e, 0x7a16bdce, 0xcfa7ba3e, 0xa337476e, 0x14c6b5dd,
+    0x7856488d, 0xcde74f7d, 0xa177b22d, 0x1b047f14, 0x77948244,
+    0xc22585b4, 0xaeb578e4, 0x19448a57, 0x75d47707, 0xc06570f7,
+    0xacf58da7, 0x1f859592, 0x731568c2, 0xc6a46f32, 0xaa349262,
+    0x1dc560d1, 0x71559d81, 0xc4e49a71, 0xa8746721, 0x240f5430,
+    0x489fa960, 0xfd2eae90, 0x91be53c0, 0x264fa173, 0x4adf5c23,
+    0xff6e5bd3, 0x93fea683, 0x208ebeb6, 0x4c1e43e6, 0xf9af4416,
+    0x953fb946, 0x22ce4bf5, 0x4e5eb6a5, 0xfbefb155, 0x977f4c05,
+    0x2d0c813c, 0x419c7c6c, 0xf42d7b9c, 0x98bd86cc, 0x2f4c747f,
+    0x43dc892f, 0xf66d8edf, 0x9afd738f, 0x298d6bba, 0x451d96ea,
+    0xf0ac911a, 0x9c3c6c4a, 0x2bcd9ef9, 0x475d63a9, 0xf2ec6459,
+    0x9e7c9909, 0x3608fe28, 0x5a980378, 0xef290488, 0x83b9f9d8,
+    0x34480b6b, 0x58d8f63b, 0xed69f1cb, 0x81f90c9b, 0x328914ae,
+    0x5e19e9fe, 0xeba8ee0e, 0x8738135e, 0x30c9e1ed, 0x5c591cbd,
+    0xe9e81b4d, 0x8578e61d, 0x3f0b2b24, 0x539bd674, 0xe62ad184,
+    0x8aba2cd4, 0x3d4bde67, 0x51db2337, 0xe46a24c7, 0x88fad997,
+    0x3b8ac1a2, 0x571a3cf2, 0xe2ab3b02, 0x8e3bc652, 0x39ca34e1,
+    0x555ac9b1, 0xe0ebce41, 0x8c7b3311, 0x481ea860, 0x248e5530,
+    0x913f52c0, 0xfdafaf90, 0x4a5e5d23, 0x26cea073, 0x937fa783,
+    0xffef5ad3, 0x4c9f42e6, 0x200fbfb6, 0x95beb846, 0xf92e4516,
+    0x4edfb7a5, 0x224f4af5, 0x97fe4d05, 0xfb6eb055, 0x411d7d6c,
+    0x2d8d803c, 0x983c87cc, 0xf4ac7a9c, 0x435d882f, 0x2fcd757f,
+    0x9a7c728f, 0xf6ec8fdf, 0x459c97ea, 0x290c6aba, 0x9cbd6d4a,
+    0xf02d901a, 0x47dc62a9, 0x2b4c9ff9, 0x9efd9809, 0xf26d6559,
+    0x5a190278, 0x3689ff28, 0x8338f8d8, 0xefa80588, 0x5859f73b,
+    0x34c90a6b, 0x81780d9b, 0xede8f0cb, 0x5e98e8fe, 0x320815ae,
+    0x87b9125e, 0xeb29ef0e, 0x5cd81dbd, 0x3048e0ed, 0x85f9e71d,
+    0xe9691a4d, 0x531ad774, 0x3f8a2a24, 0x8a3b2dd4, 0xe6abd084,
+    0x515a2237, 0x3dcadf67, 0x887bd897, 0xe4eb25c7, 0x579b3df2,
+    0x3b0bc0a2, 0x8ebac752, 0xe22a3a02, 0x55dbc8b1, 0x394b35e1,
+    0x8cfa3211, 0xe06acf41, 0x6c11fc50, 0x00810100, 0xb53006f0,
+    0xd9a0fba0, 0x6e510913, 0x02c1f443, 0xb770f3b3, 0xdbe00ee3,
+    0x689016d6, 0x0400eb86, 0xb1b1ec76, 0xdd211126, 0x6ad0e395,
+    0x06401ec5, 0xb3f11935, 0xdf61e465, 0x6512295c, 0x0982d40c,
+    0xbc33d3fc, 0xd0a32eac, 0x6752dc1f, 0x0bc2214f, 0xbe7326bf,
+    0xd2e3dbef, 0x6193c3da, 0x0d033e8a, 0xb8b2397a, 0xd422c42a,
+    0x63d33699, 0x0f43cbc9, 0xbaf2cc39, 0xd6623169, 0x7e165648,
+    0x1286ab18, 0xa737ace8, 0xcba751b8, 0x7c56a30b, 0x10c65e5b,
+    0xa57759ab, 0xc9e7a4fb, 0x7a97bcce, 0x1607419e, 0xa3b6466e,
+    0xcf26bb3e, 0x78d7498d, 0x1447b4dd, 0xa1f6b32d, 0xcd664e7d,
+    0x77158344, 0x1b857e14, 0xae3479e4, 0xc2a484b4, 0x75557607,
+    0x19c58b57, 0xac748ca7, 0xc0e471f7, 0x739469c2, 0x1f049492,
+    0xaab59362, 0xc6256e32, 0x71d49c81, 0x1d4461d1, 0xa8f56621,
+    0xc4659b71},
+   {0x00000000, 0x903d50c0, 0x9079a183, 0x0044f143, 0x90f04305,
+    0x00cd13c5, 0x0089e286, 0x90b4b246, 0x91e38609, 0x01ded6c9,
+    0x019a278a, 0x91a7774a, 0x0113c50c, 0x912e95cc, 0x916a648f,
+    0x0157344f, 0x93c40c11, 0x03f95cd1, 0x03bdad92, 0x9380fd52,
+    0x03344f14, 0x93091fd4, 0x934dee97, 0x0370be57, 0x02278a18,
+    0x921adad8, 0x925e2b9b, 0x02637b5b, 0x92d7c91d, 0x02ea99dd,
+    0x02ae689e, 0x9293385e, 0x978b1821, 0x07b648e1, 0x07f2b9a2,
+    0x97cfe962, 0x077b5b24, 0x97460be4, 0x9702faa7, 0x073faa67,
+    0x06689e28, 0x9655cee8, 0x96113fab, 0x062c6f6b, 0x9698dd2d,
+    0x06a58ded, 0x06e17cae, 0x96dc2c6e, 0x044f1430, 0x947244f0,
+    0x9436b5b3, 0x040be573, 0x94bf5735, 0x048207f5, 0x04c6f6b6,
+    0x94fba676, 0x95ac9239, 0x0591c2f9, 0x05d533ba, 0x95e8637a,
+    0x055cd13c, 0x956181fc, 0x952570bf, 0x0518207f, 0x9f153041,
+    0x0f286081, 0x0f6c91c2, 0x9f51c102, 0x0fe57344, 0x9fd82384,
+    0x9f9cd2c7, 0x0fa18207, 0x0ef6b648, 0x9ecbe688, 0x9e8f17cb,
+    0x0eb2470b, 0x9e06f54d, 0x0e3ba58d, 0x0e7f54ce, 0x9e42040e,
+    0x0cd13c50, 0x9cec6c90, 0x9ca89dd3, 0x0c95cd13, 0x9c217f55,
+    0x0c1c2f95, 0x0c58ded6, 0x9c658e16, 0x9d32ba59, 0x0d0fea99,
+    0x0d4b1bda, 0x9d764b1a, 0x0dc2f95c, 0x9dffa99c, 0x9dbb58df,
+    0x0d86081f, 0x089e2860, 0x98a378a0, 0x98e789e3, 0x08dad923,
+    0x986e6b65, 0x08533ba5, 0x0817cae6, 0x982a9a26, 0x997dae69,
+    0x0940fea9, 0x09040fea, 0x99395f2a, 0x098ded6c, 0x99b0bdac,
+    0x99f44cef, 0x09c91c2f, 0x9b5a2471, 0x0b6774b1, 0x0b2385f2,
+    0x9b1ed532, 0x0baa6774, 0x9b9737b4, 0x9bd3c6f7, 0x0bee9637,
+    0x0ab9a278, 0x9a84f2b8, 0x9ac003fb, 0x0afd533b, 0x9a49e17d,
+    0x0a74b1bd, 0x0a3040fe, 0x9a0d103e, 0x8e296081, 0x1e143041,
+    0x1e50c102, 0x8e6d91c2, 0x1ed92384, 0x8ee47344, 0x8ea08207,
+    0x1e9dd2c7, 0x1fcae688, 0x8ff7b648, 0x8fb3470b, 0x1f8e17cb,
+    0x8f3aa58d, 0x1f07f54d, 0x1f43040e, 0x8f7e54ce, 0x1ded6c90,
+    0x8dd03c50, 0x8d94cd13, 0x1da99dd3, 0x8d1d2f95, 0x1d207f55,
+    0x1d648e16, 0x8d59ded6, 0x8c0eea99, 0x1c33ba59, 0x1c774b1a,
+    0x8c4a1bda, 0x1cfea99c, 0x8cc3f95c, 0x8c87081f, 0x1cba58df,
+    0x19a278a0, 0x899f2860, 0x89dbd923, 0x19e689e3, 0x89523ba5,
+    0x196f6b65, 0x192b9a26, 0x8916cae6, 0x8841fea9, 0x187cae69,
+    0x18385f2a, 0x88050fea, 0x18b1bdac, 0x888ced6c, 0x88c81c2f,
+    0x18f54cef, 0x8a6674b1, 0x1a5b2471, 0x1a1fd532, 0x8a2285f2,
+    0x1a9637b4, 0x8aab6774, 0x8aef9637, 0x1ad2c6f7, 0x1b85f2b8,
+    0x8bb8a278, 0x8bfc533b, 0x1bc103fb, 0x8b75b1bd, 0x1b48e17d,
+    0x1b0c103e, 0x8b3140fe, 0x113c50c0, 0x81010000, 0x8145f143,
+    0x1178a183, 0x81cc13c5, 0x11f14305, 0x11b5b246, 0x8188e286,
+    0x80dfd6c9, 0x10e28609, 0x10a6774a, 0x809b278a, 0x102f95cc,
+    0x8012c50c, 0x8056344f, 0x106b648f, 0x82f85cd1, 0x12c50c11,
+    0x1281fd52, 0x82bcad92, 0x12081fd4, 0x82354f14, 0x8271be57,
+    0x124cee97, 0x131bdad8, 0x83268a18, 0x83627b5b, 0x135f2b9b,
+    0x83eb99dd, 0x13d6c91d, 0x1392385e, 0x83af689e, 0x86b748e1,
+    0x168a1821, 0x16cee962, 0x86f3b9a2, 0x16470be4, 0x867a5b24,
+    0x863eaa67, 0x1603faa7, 0x1754cee8, 0x87699e28, 0x872d6f6b,
+    0x17103fab, 0x87a48ded, 0x1799dd2d, 0x17dd2c6e, 0x87e07cae,
+    0x157344f0, 0x854e1430, 0x850ae573, 0x1537b5b3, 0x858307f5,
+    0x15be5735, 0x15faa676, 0x85c7f6b6, 0x8490c2f9, 0x14ad9239,
+    0x14e9637a, 0x84d433ba, 0x146081fc, 0x845dd13c, 0x8419207f,
+    0x142470bf},
+   {0x00000000, 0xac51c101, 0xe8a08201, 0x44f14300, 0x61420401,
+    0xcd13c500, 0x89e28600, 0x25b34701, 0xc2840802, 0x6ed5c903,
+    0x2a248a03, 0x86754b02, 0xa3c60c03, 0x0f97cd02, 0x4b668e02,
+    0xe7374f03, 0x350b1007, 0x995ad106, 0xddab9206, 0x71fa5307,
+    0x54491406, 0xf818d507, 0xbce99607, 0x10b85706, 0xf78f1805,
+    0x5bded904, 0x1f2f9a04, 0xb37e5b05, 0x96cd1c04, 0x3a9cdd05,
+    0x7e6d9e05, 0xd23c5f04, 0x6a16200e, 0xc647e10f, 0x82b6a20f,
+    0x2ee7630e, 0x0b54240f, 0xa705e50e, 0xe3f4a60e, 0x4fa5670f,
+    0xa892280c, 0x04c3e90d, 0x4032aa0d, 0xec636b0c, 0xc9d02c0d,
+    0x6581ed0c, 0x2170ae0c, 0x8d216f0d, 0x5f1d3009, 0xf34cf108,
+    0xb7bdb208, 0x1bec7309, 0x3e5f3408, 0x920ef509, 0xd6ffb609,
+    0x7aae7708, 0x9d99380b, 0x31c8f90a, 0x7539ba0a, 0xd9687b0b,
+    0xfcdb3c0a, 0x508afd0b, 0x147bbe0b, 0xb82a7f0a, 0xd42c401c,
+    0x787d811d, 0x3c8cc21d, 0x90dd031c, 0xb56e441d, 0x193f851c,
+    0x5dcec61c, 0xf19f071d, 0x16a8481e, 0xbaf9891f, 0xfe08ca1f,
+    0x52590b1e, 0x77ea4c1f, 0xdbbb8d1e, 0x9f4ace1e, 0x331b0f1f,
+    0xe127501b, 0x4d76911a, 0x0987d21a, 0xa5d6131b, 0x8065541a,
+    0x2c34951b, 0x68c5d61b, 0xc494171a, 0x23a35819, 0x8ff29918,
+    0xcb03da18, 0x67521b19, 0x42e15c18, 0xeeb09d19, 0xaa41de19,
+    0x06101f18, 0xbe3a6012, 0x126ba113, 0x569ae213, 0xfacb2312,
+    0xdf786413, 0x7329a512, 0x37d8e612, 0x9b892713, 0x7cbe6810,
+    0xd0efa911, 0x941eea11, 0x384f2b10, 0x1dfc6c11, 0xb1adad10,
+    0xf55cee10, 0x590d2f11, 0x8b317015, 0x2760b114, 0x6391f214,
+    0xcfc03315, 0xea737414, 0x4622b515, 0x02d3f615, 0xae823714,
+    0x49b57817, 0xe5e4b916, 0xa115fa16, 0x0d443b17, 0x28f77c16,
+    0x84a6bd17, 0xc057fe17, 0x6c063f16, 0x185b803b, 0xb40a413a,
+    0xf0fb023a, 0x5caac33b, 0x7919843a, 0xd548453b, 0x91b9063b,
+    0x3de8c73a, 0xdadf8839, 0x768e4938, 0x327f0a38, 0x9e2ecb39,
+    0xbb9d8c38, 0x17cc4d39, 0x533d0e39, 0xff6ccf38, 0x2d50903c,
+    0x8101513d, 0xc5f0123d, 0x69a1d33c, 0x4c12943d, 0xe043553c,
+    0xa4b2163c, 0x08e3d73d, 0xefd4983e, 0x4385593f, 0x07741a3f,
+    0xab25db3e, 0x8e969c3f, 0x22c75d3e, 0x66361e3e, 0xca67df3f,
+    0x724da035, 0xde1c6134, 0x9aed2234, 0x36bce335, 0x130fa434,
+    0xbf5e6535, 0xfbaf2635, 0x57fee734, 0xb0c9a837, 0x1c986936,
+    0x58692a36, 0xf438eb37, 0xd18bac36, 0x7dda6d37, 0x392b2e37,
+    0x957aef36, 0x4746b032, 0xeb177133, 0xafe63233, 0x03b7f332,
+    0x2604b433, 0x8a557532, 0xcea43632, 0x62f5f733, 0x85c2b830,
+    0x29937931, 0x6d623a31, 0xc133fb30, 0xe480bc31, 0x48d17d30,
+    0x0c203e30, 0xa071ff31, 0xcc77c027, 0x60260126, 0x24d74226,
+    0x88868327, 0xad35c426, 0x01640527, 0x45954627, 0xe9c48726,
+    0x0ef3c825, 0xa2a20924, 0xe6534a24, 0x4a028b25, 0x6fb1cc24,
+    0xc3e00d25, 0x87114e25, 0x2b408f24, 0xf97cd020, 0x552d1121,
+    0x11dc5221, 0xbd8d9320, 0x983ed421, 0x346f1520, 0x709e5620,
+    0xdccf9721, 0x3bf8d822, 0x97a91923, 0xd3585a23, 0x7f099b22,
+    0x5abadc23, 0xf6eb1d22, 0xb21a5e22, 0x1e4b9f23, 0xa661e029,
+    0x0a302128, 0x4ec16228, 0xe290a329, 0xc723e428, 0x6b722529,
+    0x2f836629, 0x83d2a728, 0x64e5e82b, 0xc8b4292a, 0x8c456a2a,
+    0x2014ab2b, 0x05a7ec2a, 0xa9f62d2b, 0xed076e2b, 0x4156af2a,
+    0x936af02e, 0x3f3b312f, 0x7bca722f, 0xd79bb32e, 0xf228f42f,
+    0x5e79352e, 0x1a88762e, 0xb6d9b72f, 0x51eef82c, 0xfdbf392d,
+    0xb94e7a2d, 0x151fbb2c, 0x30acfc2d, 0x9cfd3d2c, 0xd80c7e2c,
+    0x745dbf2d},
+   {0x00000000, 0x30b70076, 0x616e00ec, 0x51d9009a, 0xc2dc01d8,
+    0xf26b01ae, 0xa3b20134, 0x93050142, 0x35bb03b3, 0x050c03c5,
+    0x54d5035f, 0x64620329, 0xf767026b, 0xc7d0021d, 0x96090287,
+    0xa6be02f1, 0x6b760766, 0x5bc10710, 0x0a18078a, 0x3aaf07fc,
+    0xa9aa06be, 0x991d06c8, 0xc8c40652, 0xf8730624, 0x5ecd04d5,
+    0x6e7a04a3, 0x3fa30439, 0x0f14044f, 0x9c11050d, 0xaca6057b,
+    0xfd7f05e1, 0xcdc80597, 0xd6ec0ecc, 0xe65b0eba, 0xb7820e20,
+    0x87350e56, 0x14300f14, 0x24870f62, 0x755e0ff8, 0x45e90f8e,
+    0xe3570d7f, 0xd3e00d09, 0x82390d93, 0xb28e0de5, 0x218b0ca7,
+    0x113c0cd1, 0x40e50c4b, 0x70520c3d, 0xbd9a09aa, 0x8d2d09dc,
+    0xdcf40946, 0xec430930, 0x7f460872, 0x4ff10804, 0x1e28089e,
+    0x2e9f08e8, 0x88210a19, 0xb8960a6f, 0xe94f0af5, 0xd9f80a83,
+    0x4afd0bc1, 0x7a4a0bb7, 0x2b930b2d, 0x1b240b5b, 0x1ddb1d9b,
+    0x2d6c1ded, 0x7cb51d77, 0x4c021d01, 0xdf071c43, 0xefb01c35,
+    0xbe691caf, 0x8ede1cd9, 0x28601e28, 0x18d71e5e, 0x490e1ec4,
+    0x79b91eb2, 0xeabc1ff0, 0xda0b1f86, 0x8bd21f1c, 0xbb651f6a,
+    0x76ad1afd, 0x461a1a8b, 0x17c31a11, 0x27741a67, 0xb4711b25,
+    0x84c61b53, 0xd51f1bc9, 0xe5a81bbf, 0x4316194e, 0x73a11938,
+    0x227819a2, 0x12cf19d4, 0x81ca1896, 0xb17d18e0, 0xe0a4187a,
+    0xd013180c, 0xcb371357, 0xfb801321, 0xaa5913bb, 0x9aee13cd,
+    0x09eb128f, 0x395c12f9, 0x68851263, 0x58321215, 0xfe8c10e4,
+    0xce3b1092, 0x9fe21008, 0xaf55107e, 0x3c50113c, 0x0ce7114a,
+    0x5d3e11d0, 0x6d8911a6, 0xa0411431, 0x90f61447, 0xc12f14dd,
+    0xf19814ab, 0x629d15e9, 0x522a159f, 0x03f31505, 0x33441573,
+    0x95fa1782, 0xa54d17f4, 0xf494176e, 0xc4231718, 0x5726165a,
+    0x6791162c, 0x364816b6, 0x06ff16c0, 0x3bb63b36, 0x0b013b40,
+    0x5ad83bda, 0x6a6f3bac, 0xf96a3aee, 0xc9dd3a98, 0x98043a02,
+    0xa8b33a74, 0x0e0d3885, 0x3eba38f3, 0x6f633869, 0x5fd4381f,
+    0xccd1395d, 0xfc66392b, 0xadbf39b1, 0x9d0839c7, 0x50c03c50,
+    0x60773c26, 0x31ae3cbc, 0x01193cca, 0x921c3d88, 0xa2ab3dfe,
+    0xf3723d64, 0xc3c53d12, 0x657b3fe3, 0x55cc3f95, 0x04153f0f,
+    0x34a23f79, 0xa7a73e3b, 0x97103e4d, 0xc6c93ed7, 0xf67e3ea1,
+    0xed5a35fa, 0xdded358c, 0x8c343516, 0xbc833560, 0x2f863422,
+    0x1f313454, 0x4ee834ce, 0x7e5f34b8, 0xd8e13649, 0xe856363f,
+    0xb98f36a5, 0x893836d3, 0x1a3d3791, 0x2a8a37e7, 0x7b53377d,
+    0x4be4370b, 0x862c329c, 0xb69b32ea, 0xe7423270, 0xd7f53206,
+    0x44f03344, 0x74473332, 0x259e33a8, 0x152933de, 0xb397312f,
+    0x83203159, 0xd2f931c3, 0xe24e31b5, 0x714b30f7, 0x41fc3081,
+    0x1025301b, 0x2092306d, 0x266d26ad, 0x16da26db, 0x47032641,
+    0x77b42637, 0xe4b12775, 0xd4062703, 0x85df2799, 0xb56827ef,
+    0x13d6251e, 0x23612568, 0x72b825f2, 0x420f2584, 0xd10a24c6,
+    0xe1bd24b0, 0xb064242a, 0x80d3245c, 0x4d1b21cb, 0x7dac21bd,
+    0x2c752127, 0x1cc22151, 0x8fc72013, 0xbf702065, 0xeea920ff,
+    0xde1e2089, 0x78a02278, 0x4817220e, 0x19ce2294, 0x297922e2,
+    0xba7c23a0, 0x8acb23d6, 0xdb12234c, 0xeba5233a, 0xf0812861,
+    0xc0362817, 0x91ef288d, 0xa15828fb, 0x325d29b9, 0x02ea29cf,
+    0x53332955, 0x63842923, 0xc53a2bd2, 0xf58d2ba4, 0xa4542b3e,
+    0x94e32b48, 0x07e62a0a, 0x37512a7c, 0x66882ae6, 0x563f2a90,
+    0x9bf72f07, 0xab402f71, 0xfa992feb, 0xca2e2f9d, 0x592b2edf,
+    0x699c2ea9, 0x38452e33, 0x08f22e45, 0xae4c2cb4, 0x9efb2cc2,
+    0xcf222c58, 0xff952c2e, 0x6c902d6c, 0x5c272d1a, 0x0dfe2d80,
+    0x3d492df6},
+   {0x00000000, 0x776c766c, 0xeed8ecd8, 0x99b49ab4, 0x6db2d9b3,
+    0x1adeafdf, 0x836a356b, 0xf4064307, 0xdb65b366, 0xac09c50a,
+    0x35bd5fbe, 0x42d129d2, 0xb6d76ad5, 0xc1bb1cb9, 0x580f860d,
+    0x2f63f061, 0x06c866cf, 0x71a410a3, 0xe8108a17, 0x9f7cfc7b,
+    0x6b7abf7c, 0x1c16c910, 0x85a253a4, 0xf2ce25c8, 0xddadd5a9,
+    0xaac1a3c5, 0x33753971, 0x44194f1d, 0xb01f0c1a, 0xc7737a76,
+    0x5ec7e0c2, 0x29ab96ae, 0x0d90cd9e, 0x7afcbbf2, 0xe3482146,
+    0x9424572a, 0x6022142d, 0x174e6241, 0x8efaf8f5, 0xf9968e99,
+    0xd6f57ef8, 0xa1990894, 0x382d9220, 0x4f41e44c, 0xbb47a74b,
+    0xcc2bd127, 0x559f4b93, 0x22f33dff, 0x0b58ab51, 0x7c34dd3d,
+    0xe5804789, 0x92ec31e5, 0x66ea72e2, 0x1186048e, 0x88329e3a,
+    0xff5ee856, 0xd03d1837, 0xa7516e5b, 0x3ee5f4ef, 0x49898283,
+    0xbd8fc184, 0xcae3b7e8, 0x53572d5c, 0x243b5b30, 0x1b219b3c,
+    0x6c4ded50, 0xf5f977e4, 0x82950188, 0x7693428f, 0x01ff34e3,
+    0x984bae57, 0xef27d83b, 0xc044285a, 0xb7285e36, 0x2e9cc482,
+    0x59f0b2ee, 0xadf6f1e9, 0xda9a8785, 0x432e1d31, 0x34426b5d,
+    0x1de9fdf3, 0x6a858b9f, 0xf331112b, 0x845d6747, 0x705b2440,
+    0x0737522c, 0x9e83c898, 0xe9efbef4, 0xc68c4e95, 0xb1e038f9,
+    0x2854a24d, 0x5f38d421, 0xab3e9726, 0xdc52e14a, 0x45e67bfe,
+    0x328a0d92, 0x16b156a2, 0x61dd20ce, 0xf869ba7a, 0x8f05cc16,
+    0x7b038f11, 0x0c6ff97d, 0x95db63c9, 0xe2b715a5, 0xcdd4e5c4,
+    0xbab893a8, 0x230c091c, 0x54607f70, 0xa0663c77, 0xd70a4a1b,
+    0x4ebed0af, 0x39d2a6c3, 0x1079306d, 0x67154601, 0xfea1dcb5,
+    0x89cdaad9, 0x7dcbe9de, 0x0aa79fb2, 0x93130506, 0xe47f736a,
+    0xcb1c830b, 0xbc70f567, 0x25c46fd3, 0x52a819bf, 0xa6ae5ab8,
+    0xd1c22cd4, 0x4876b660, 0x3f1ac00c, 0x36433678, 0x412f4014,
+    0xd89bdaa0, 0xaff7accc, 0x5bf1efcb, 0x2c9d99a7, 0xb5290313,
+    0xc245757f, 0xed26851e, 0x9a4af372, 0x03fe69c6, 0x74921faa,
+    0x80945cad, 0xf7f82ac1, 0x6e4cb075, 0x1920c619, 0x308b50b7,
+    0x47e726db, 0xde53bc6f, 0xa93fca03, 0x5d398904, 0x2a55ff68,
+    0xb3e165dc, 0xc48d13b0, 0xebeee3d1, 0x9c8295bd, 0x05360f09,
+    0x725a7965, 0x865c3a62, 0xf1304c0e, 0x6884d6ba, 0x1fe8a0d6,
+    0x3bd3fbe6, 0x4cbf8d8a, 0xd50b173e, 0xa2676152, 0x56612255,
+    0x210d5439, 0xb8b9ce8d, 0xcfd5b8e1, 0xe0b64880, 0x97da3eec,
+    0x0e6ea458, 0x7902d234, 0x8d049133, 0xfa68e75f, 0x63dc7deb,
+    0x14b00b87, 0x3d1b9d29, 0x4a77eb45, 0xd3c371f1, 0xa4af079d,
+    0x50a9449a, 0x27c532f6, 0xbe71a842, 0xc91dde2e, 0xe67e2e4f,
+    0x91125823, 0x08a6c297, 0x7fcab4fb, 0x8bccf7fc, 0xfca08190,
+    0x65141b24, 0x12786d48, 0x2d62ad44, 0x5a0edb28, 0xc3ba419c,
+    0xb4d637f0, 0x40d074f7, 0x37bc029b, 0xae08982f, 0xd964ee43,
+    0xf6071e22, 0x816b684e, 0x18dff2fa, 0x6fb38496, 0x9bb5c791,
+    0xecd9b1fd, 0x756d2b49, 0x02015d25, 0x2baacb8b, 0x5cc6bde7,
+    0xc5722753, 0xb21e513f, 0x46181238, 0x31746454, 0xa8c0fee0,
+    0xdfac888c, 0xf0cf78ed, 0x87a30e81, 0x1e179435, 0x697be259,
+    0x9d7da15e, 0xea11d732, 0x73a54d86, 0x04c93bea, 0x20f260da,
+    0x579e16b6, 0xce2a8c02, 0xb946fa6e, 0x4d40b969, 0x3a2ccf05,
+    0xa39855b1, 0xd4f423dd, 0xfb97d3bc, 0x8cfba5d0, 0x154f3f64,
+    0x62234908, 0x96250a0f, 0xe1497c63, 0x78fde6d7, 0x0f9190bb,
+    0x263a0615, 0x51567079, 0xc8e2eacd, 0xbf8e9ca1, 0x4b88dfa6,
+    0x3ce4a9ca, 0xa550337e, 0xd23c4512, 0xfd5fb573, 0x8a33c31f,
+    0x138759ab, 0x64eb2fc7, 0x90ed6cc0, 0xe7811aac, 0x7e358018,
+    0x0959f674},
+   {0x00000000, 0x6c866cf0, 0xd90cd9e0, 0xb58ab510, 0x021ab3c3,
+    0x6e9cdf33, 0xdb166a23, 0xb79006d3, 0x04356786, 0x68b30b76,
+    0xdd39be66, 0xb1bfd296, 0x062fd445, 0x6aa9b8b5, 0xdf230da5,
+    0xb3a56155, 0x086acf0c, 0x64eca3fc, 0xd16616ec, 0xbde07a1c,
+    0x0a707ccf, 0x66f6103f, 0xd37ca52f, 0xbffac9df, 0x0c5fa88a,
+    0x60d9c47a, 0xd553716a, 0xb9d51d9a, 0x0e451b49, 0x62c377b9,
+    0xd749c2a9, 0xbbcfae59, 0x10d59e18, 0x7c53f2e8, 0xc9d947f8,
+    0xa55f2b08, 0x12cf2ddb, 0x7e49412b, 0xcbc3f43b, 0xa74598cb,
+    0x14e0f99e, 0x7866956e, 0xcdec207e, 0xa16a4c8e, 0x16fa4a5d,
+    0x7a7c26ad, 0xcff693bd, 0xa370ff4d, 0x18bf5114, 0x74393de4,
+    0xc1b388f4, 0xad35e404, 0x1aa5e2d7, 0x76238e27, 0xc3a93b37,
+    0xaf2f57c7, 0x1c8a3692, 0x700c5a62, 0xc586ef72, 0xa9008382,
+    0x1e908551, 0x7216e9a1, 0xc79c5cb1, 0xab1a3041, 0x21ab3c30,
+    0x4d2d50c0, 0xf8a7e5d0, 0x94218920, 0x23b18ff3, 0x4f37e303,
+    0xfabd5613, 0x963b3ae3, 0x259e5bb6, 0x49183746, 0xfc928256,
+    0x9014eea6, 0x2784e875, 0x4b028485, 0xfe883195, 0x920e5d65,
+    0x29c1f33c, 0x45479fcc, 0xf0cd2adc, 0x9c4b462c, 0x2bdb40ff,
+    0x475d2c0f, 0xf2d7991f, 0x9e51f5ef, 0x2df494ba, 0x4172f84a,
+    0xf4f84d5a, 0x987e21aa, 0x2fee2779, 0x43684b89, 0xf6e2fe99,
+    0x9a649269, 0x317ea228, 0x5df8ced8, 0xe8727bc8, 0x84f41738,
+    0x336411eb, 0x5fe27d1b, 0xea68c80b, 0x86eea4fb, 0x354bc5ae,
+    0x59cda95e, 0xec471c4e, 0x80c170be, 0x3751766d, 0x5bd71a9d,
+    0xee5daf8d, 0x82dbc37d, 0x39146d24, 0x559201d4, 0xe018b4c4,
+    0x8c9ed834, 0x3b0edee7, 0x5788b217, 0xe2020707, 0x8e846bf7,
+    0x3d210aa2, 0x51a76652, 0xe42dd342, 0x88abbfb2, 0x3f3bb961,
+    0x53bdd591, 0xe6376081, 0x8ab10c71, 0x43567860, 0x2fd01490,
+    0x9a5aa180, 0xf6dccd70, 0x414ccba3, 0x2dcaa753, 0x98401243,
+    0xf4c67eb3, 0x47631fe6, 0x2be57316, 0x9e6fc606, 0xf2e9aaf6,
+    0x4579ac25, 0x29ffc0d5, 0x9c7575c5, 0xf0f31935, 0x4b3cb76c,
+    0x27badb9c, 0x92306e8c, 0xfeb6027c, 0x492604af, 0x25a0685f,
+    0x902add4f, 0xfcacb1bf, 0x4f09d0ea, 0x238fbc1a, 0x9605090a,
+    0xfa8365fa, 0x4d136329, 0x21950fd9, 0x941fbac9, 0xf899d639,
+    0x5383e678, 0x3f058a88, 0x8a8f3f98, 0xe6095368, 0x519955bb,
+    0x3d1f394b, 0x88958c5b, 0xe413e0ab, 0x57b681fe, 0x3b30ed0e,
+    0x8eba581e, 0xe23c34ee, 0x55ac323d, 0x392a5ecd, 0x8ca0ebdd,
+    0xe026872d, 0x5be92974, 0x376f4584, 0x82e5f094, 0xee639c64,
+    0x59f39ab7, 0x3575f647, 0x80ff4357, 0xec792fa7, 0x5fdc4ef2,
+    0x335a2202, 0x86d09712, 0xea56fbe2, 0x5dc6fd31, 0x314091c1,
+    0x84ca24d1, 0xe84c4821, 0x62fd4450, 0x0e7b28a0, 0xbbf19db0,
+    0xd777f140, 0x60e7f793, 0x0c619b63, 0xb9eb2e73, 0xd56d4283,
+    0x66c823d6, 0x0a4e4f26, 0xbfc4fa36, 0xd34296c6, 0x64d29015,
+    0x0854fce5, 0xbdde49f5, 0xd1582505, 0x6a978b5c, 0x0611e7ac,
+    0xb39b52bc, 0xdf1d3e4c, 0x688d389f, 0x040b546f, 0xb181e17f,
+    0xdd078d8f, 0x6ea2ecda, 0x0224802a, 0xb7ae353a, 0xdb2859ca,
+    0x6cb85f19, 0x003e33e9, 0xb5b486f9, 0xd932ea09, 0x7228da48,
+    0x1eaeb6b8, 0xab2403a8, 0xc7a26f58, 0x7032698b, 0x1cb4057b,
+    0xa93eb06b, 0xc5b8dc9b, 0x761dbdce, 0x1a9bd13e, 0xaf11642e,
+    0xc39708de, 0x74070e0d, 0x188162fd, 0xad0bd7ed, 0xc18dbb1d,
+    0x7a421544, 0x16c479b4, 0xa34ecca4, 0xcfc8a054, 0x7858a687,
+    0x14deca77, 0xa1547f67, 0xcdd21397, 0x7e7772c2, 0x12f11e32,
+    0xa77bab22, 0xcbfdc7d2, 0x7c6dc101, 0x10ebadf1, 0xa56118e1,
+    0xc9e77411}};
+
+static const word_t crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0xf06c866c00000000, 0xe0d90cd900000000,
+    0x10b58ab500000000, 0xc3b31a0200000000, 0x33df9c6e00000000,
+    0x236a16db00000000, 0xd30690b700000000, 0x8667350400000000,
+    0x760bb36800000000, 0x66be39dd00000000, 0x96d2bfb100000000,
+    0x45d42f0600000000, 0xb5b8a96a00000000, 0xa50d23df00000000,
+    0x5561a5b300000000, 0x0ccf6a0800000000, 0xfca3ec6400000000,
+    0xec1666d100000000, 0x1c7ae0bd00000000, 0xcf7c700a00000000,
+    0x3f10f66600000000, 0x2fa57cd300000000, 0xdfc9fabf00000000,
+    0x8aa85f0c00000000, 0x7ac4d96000000000, 0x6a7153d500000000,
+    0x9a1dd5b900000000, 0x491b450e00000000, 0xb977c36200000000,
+    0xa9c249d700000000, 0x59aecfbb00000000, 0x189ed51000000000,
+    0xe8f2537c00000000, 0xf847d9c900000000, 0x082b5fa500000000,
+    0xdb2dcf1200000000, 0x2b41497e00000000, 0x3bf4c3cb00000000,
+    0xcb9845a700000000, 0x9ef9e01400000000, 0x6e95667800000000,
+    0x7e20eccd00000000, 0x8e4c6aa100000000, 0x5d4afa1600000000,
+    0xad267c7a00000000, 0xbd93f6cf00000000, 0x4dff70a300000000,
+    0x1451bf1800000000, 0xe43d397400000000, 0xf488b3c100000000,
+    0x04e435ad00000000, 0xd7e2a51a00000000, 0x278e237600000000,
+    0x373ba9c300000000, 0xc7572faf00000000, 0x92368a1c00000000,
+    0x625a0c7000000000, 0x72ef86c500000000, 0x828300a900000000,
+    0x5185901e00000000, 0xa1e9167200000000, 0xb15c9cc700000000,
+    0x41301aab00000000, 0x303cab2100000000, 0xc0502d4d00000000,
+    0xd0e5a7f800000000, 0x2089219400000000, 0xf38fb12300000000,
+    0x03e3374f00000000, 0x1356bdfa00000000, 0xe33a3b9600000000,
+    0xb65b9e2500000000, 0x4637184900000000, 0x568292fc00000000,
+    0xa6ee149000000000, 0x75e8842700000000, 0x8584024b00000000,
+    0x953188fe00000000, 0x655d0e9200000000, 0x3cf3c12900000000,
+    0xcc9f474500000000, 0xdc2acdf000000000, 0x2c464b9c00000000,
+    0xff40db2b00000000, 0x0f2c5d4700000000, 0x1f99d7f200000000,
+    0xeff5519e00000000, 0xba94f42d00000000, 0x4af8724100000000,
+    0x5a4df8f400000000, 0xaa217e9800000000, 0x7927ee2f00000000,
+    0x894b684300000000, 0x99fee2f600000000, 0x6992649a00000000,
+    0x28a27e3100000000, 0xd8cef85d00000000, 0xc87b72e800000000,
+    0x3817f48400000000, 0xeb11643300000000, 0x1b7de25f00000000,
+    0x0bc868ea00000000, 0xfba4ee8600000000, 0xaec54b3500000000,
+    0x5ea9cd5900000000, 0x4e1c47ec00000000, 0xbe70c18000000000,
+    0x6d76513700000000, 0x9d1ad75b00000000, 0x8daf5dee00000000,
+    0x7dc3db8200000000, 0x246d143900000000, 0xd401925500000000,
+    0xc4b418e000000000, 0x34d89e8c00000000, 0xe7de0e3b00000000,
+    0x17b2885700000000, 0x070702e200000000, 0xf76b848e00000000,
+    0xa20a213d00000000, 0x5266a75100000000, 0x42d32de400000000,
+    0xb2bfab8800000000, 0x61b93b3f00000000, 0x91d5bd5300000000,
+    0x816037e600000000, 0x710cb18a00000000, 0x6078564300000000,
+    0x9014d02f00000000, 0x80a15a9a00000000, 0x70cddcf600000000,
+    0xa3cb4c4100000000, 0x53a7ca2d00000000, 0x4312409800000000,
+    0xb37ec6f400000000, 0xe61f634700000000, 0x1673e52b00000000,
+    0x06c66f9e00000000, 0xf6aae9f200000000, 0x25ac794500000000,
+    0xd5c0ff2900000000, 0xc575759c00000000, 0x3519f3f000000000,
+    0x6cb73c4b00000000, 0x9cdbba2700000000, 0x8c6e309200000000,
+    0x7c02b6fe00000000, 0xaf04264900000000, 0x5f68a02500000000,
+    0x4fdd2a9000000000, 0xbfb1acfc00000000, 0xead0094f00000000,
+    0x1abc8f2300000000, 0x0a09059600000000, 0xfa6583fa00000000,
+    0x2963134d00000000, 0xd90f952100000000, 0xc9ba1f9400000000,
+    0x39d699f800000000, 0x78e6835300000000, 0x888a053f00000000,
+    0x983f8f8a00000000, 0x685309e600000000, 0xbb55995100000000,
+    0x4b391f3d00000000, 0x5b8c958800000000, 0xabe013e400000000,
+    0xfe81b65700000000, 0x0eed303b00000000, 0x1e58ba8e00000000,
+    0xee343ce200000000, 0x3d32ac5500000000, 0xcd5e2a3900000000,
+    0xddeba08c00000000, 0x2d8726e000000000, 0x7429e95b00000000,
+    0x84456f3700000000, 0x94f0e58200000000, 0x649c63ee00000000,
+    0xb79af35900000000, 0x47f6753500000000, 0x5743ff8000000000,
+    0xa72f79ec00000000, 0xf24edc5f00000000, 0x02225a3300000000,
+    0x1297d08600000000, 0xe2fb56ea00000000, 0x31fdc65d00000000,
+    0xc191403100000000, 0xd124ca8400000000, 0x21484ce800000000,
+    0x5044fd6200000000, 0xa0287b0e00000000, 0xb09df1bb00000000,
+    0x40f177d700000000, 0x93f7e76000000000, 0x639b610c00000000,
+    0x732eebb900000000, 0x83426dd500000000, 0xd623c86600000000,
+    0x264f4e0a00000000, 0x36fac4bf00000000, 0xc69642d300000000,
+    0x1590d26400000000, 0xe5fc540800000000, 0xf549debd00000000,
+    0x052558d100000000, 0x5c8b976a00000000, 0xace7110600000000,
+    0xbc529bb300000000, 0x4c3e1ddf00000000, 0x9f388d6800000000,
+    0x6f540b0400000000, 0x7fe181b100000000, 0x8f8d07dd00000000,
+    0xdaeca26e00000000, 0x2a80240200000000, 0x3a35aeb700000000,
+    0xca5928db00000000, 0x195fb86c00000000, 0xe9333e0000000000,
+    0xf986b4b500000000, 0x09ea32d900000000, 0x48da287200000000,
+    0xb8b6ae1e00000000, 0xa80324ab00000000, 0x586fa2c700000000,
+    0x8b69327000000000, 0x7b05b41c00000000, 0x6bb03ea900000000,
+    0x9bdcb8c500000000, 0xcebd1d7600000000, 0x3ed19b1a00000000,
+    0x2e6411af00000000, 0xde0897c300000000, 0x0d0e077400000000,
+    0xfd62811800000000, 0xedd70bad00000000, 0x1dbb8dc100000000,
+    0x4415427a00000000, 0xb479c41600000000, 0xa4cc4ea300000000,
+    0x54a0c8cf00000000, 0x87a6587800000000, 0x77cade1400000000,
+    0x677f54a100000000, 0x9713d2cd00000000, 0xc272777e00000000,
+    0x321ef11200000000, 0x22ab7ba700000000, 0xd2c7fdcb00000000,
+    0x01c16d7c00000000, 0xf1adeb1000000000, 0xe11861a500000000,
+    0x1174e7c900000000},
+   {0x0000000000000000, 0x6c766c7700000000, 0xd8ecd8ee00000000,
+    0xb49ab49900000000, 0xb3d9b26d00000000, 0xdfafde1a00000000,
+    0x6b356a8300000000, 0x074306f400000000, 0x66b365db00000000,
+    0x0ac509ac00000000, 0xbe5fbd3500000000, 0xd229d14200000000,
+    0xd56ad7b600000000, 0xb91cbbc100000000, 0x0d860f5800000000,
+    0x61f0632f00000000, 0xcf66c80600000000, 0xa310a47100000000,
+    0x178a10e800000000, 0x7bfc7c9f00000000, 0x7cbf7a6b00000000,
+    0x10c9161c00000000, 0xa453a28500000000, 0xc825cef200000000,
+    0xa9d5addd00000000, 0xc5a3c1aa00000000, 0x7139753300000000,
+    0x1d4f194400000000, 0x1a0c1fb000000000, 0x767a73c700000000,
+    0xc2e0c75e00000000, 0xae96ab2900000000, 0x9ecd900d00000000,
+    0xf2bbfc7a00000000, 0x462148e300000000, 0x2a57249400000000,
+    0x2d14226000000000, 0x41624e1700000000, 0xf5f8fa8e00000000,
+    0x998e96f900000000, 0xf87ef5d600000000, 0x940899a100000000,
+    0x20922d3800000000, 0x4ce4414f00000000, 0x4ba747bb00000000,
+    0x27d12bcc00000000, 0x934b9f5500000000, 0xff3df32200000000,
+    0x51ab580b00000000, 0x3ddd347c00000000, 0x894780e500000000,
+    0xe531ec9200000000, 0xe272ea6600000000, 0x8e04861100000000,
+    0x3a9e328800000000, 0x56e85eff00000000, 0x37183dd000000000,
+    0x5b6e51a700000000, 0xeff4e53e00000000, 0x8382894900000000,
+    0x84c18fbd00000000, 0xe8b7e3ca00000000, 0x5c2d575300000000,
+    0x305b3b2400000000, 0x3c9b211b00000000, 0x50ed4d6c00000000,
+    0xe477f9f500000000, 0x8801958200000000, 0x8f42937600000000,
+    0xe334ff0100000000, 0x57ae4b9800000000, 0x3bd827ef00000000,
+    0x5a2844c000000000, 0x365e28b700000000, 0x82c49c2e00000000,
+    0xeeb2f05900000000, 0xe9f1f6ad00000000, 0x85879ada00000000,
+    0x311d2e4300000000, 0x5d6b423400000000, 0xf3fde91d00000000,
+    0x9f8b856a00000000, 0x2b1131f300000000, 0x47675d8400000000,
+    0x40245b7000000000, 0x2c52370700000000, 0x98c8839e00000000,
+    0xf4beefe900000000, 0x954e8cc600000000, 0xf938e0b100000000,
+    0x4da2542800000000, 0x21d4385f00000000, 0x26973eab00000000,
+    0x4ae152dc00000000, 0xfe7be64500000000, 0x920d8a3200000000,
+    0xa256b11600000000, 0xce20dd6100000000, 0x7aba69f800000000,
+    0x16cc058f00000000, 0x118f037b00000000, 0x7df96f0c00000000,
+    0xc963db9500000000, 0xa515b7e200000000, 0xc4e5d4cd00000000,
+    0xa893b8ba00000000, 0x1c090c2300000000, 0x707f605400000000,
+    0x773c66a000000000, 0x1b4a0ad700000000, 0xafd0be4e00000000,
+    0xc3a6d23900000000, 0x6d30791000000000, 0x0146156700000000,
+    0xb5dca1fe00000000, 0xd9aacd8900000000, 0xdee9cb7d00000000,
+    0xb29fa70a00000000, 0x0605139300000000, 0x6a737fe400000000,
+    0x0b831ccb00000000, 0x67f570bc00000000, 0xd36fc42500000000,
+    0xbf19a85200000000, 0xb85aaea600000000, 0xd42cc2d100000000,
+    0x60b6764800000000, 0x0cc01a3f00000000, 0x7836433600000000,
+    0x14402f4100000000, 0xa0da9bd800000000, 0xccacf7af00000000,
+    0xcbeff15b00000000, 0xa7999d2c00000000, 0x130329b500000000,
+    0x7f7545c200000000, 0x1e8526ed00000000, 0x72f34a9a00000000,
+    0xc669fe0300000000, 0xaa1f927400000000, 0xad5c948000000000,
+    0xc12af8f700000000, 0x75b04c6e00000000, 0x19c6201900000000,
+    0xb7508b3000000000, 0xdb26e74700000000, 0x6fbc53de00000000,
+    0x03ca3fa900000000, 0x0489395d00000000, 0x68ff552a00000000,
+    0xdc65e1b300000000, 0xb0138dc400000000, 0xd1e3eeeb00000000,
+    0xbd95829c00000000, 0x090f360500000000, 0x65795a7200000000,
+    0x623a5c8600000000, 0x0e4c30f100000000, 0xbad6846800000000,
+    0xd6a0e81f00000000, 0xe6fbd33b00000000, 0x8a8dbf4c00000000,
+    0x3e170bd500000000, 0x526167a200000000, 0x5522615600000000,
+    0x39540d2100000000, 0x8dceb9b800000000, 0xe1b8d5cf00000000,
+    0x8048b6e000000000, 0xec3eda9700000000, 0x58a46e0e00000000,
+    0x34d2027900000000, 0x3391048d00000000, 0x5fe768fa00000000,
+    0xeb7ddc6300000000, 0x870bb01400000000, 0x299d1b3d00000000,
+    0x45eb774a00000000, 0xf171c3d300000000, 0x9d07afa400000000,
+    0x9a44a95000000000, 0xf632c52700000000, 0x42a871be00000000,
+    0x2ede1dc900000000, 0x4f2e7ee600000000, 0x2358129100000000,
+    0x97c2a60800000000, 0xfbb4ca7f00000000, 0xfcf7cc8b00000000,
+    0x9081a0fc00000000, 0x241b146500000000, 0x486d781200000000,
+    0x44ad622d00000000, 0x28db0e5a00000000, 0x9c41bac300000000,
+    0xf037d6b400000000, 0xf774d04000000000, 0x9b02bc3700000000,
+    0x2f9808ae00000000, 0x43ee64d900000000, 0x221e07f600000000,
+    0x4e686b8100000000, 0xfaf2df1800000000, 0x9684b36f00000000,
+    0x91c7b59b00000000, 0xfdb1d9ec00000000, 0x492b6d7500000000,
+    0x255d010200000000, 0x8bcbaa2b00000000, 0xe7bdc65c00000000,
+    0x532772c500000000, 0x3f511eb200000000, 0x3812184600000000,
+    0x5464743100000000, 0xe0fec0a800000000, 0x8c88acdf00000000,
+    0xed78cff000000000, 0x810ea38700000000, 0x3594171e00000000,
+    0x59e27b6900000000, 0x5ea17d9d00000000, 0x32d711ea00000000,
+    0x864da57300000000, 0xea3bc90400000000, 0xda60f22000000000,
+    0xb6169e5700000000, 0x028c2ace00000000, 0x6efa46b900000000,
+    0x69b9404d00000000, 0x05cf2c3a00000000, 0xb15598a300000000,
+    0xdd23f4d400000000, 0xbcd397fb00000000, 0xd0a5fb8c00000000,
+    0x643f4f1500000000, 0x0849236200000000, 0x0f0a259600000000,
+    0x637c49e100000000, 0xd7e6fd7800000000, 0xbb90910f00000000,
+    0x15063a2600000000, 0x7970565100000000, 0xcdeae2c800000000,
+    0xa19c8ebf00000000, 0xa6df884b00000000, 0xcaa9e43c00000000,
+    0x7e3350a500000000, 0x12453cd200000000, 0x73b55ffd00000000,
+    0x1fc3338a00000000, 0xab59871300000000, 0xc72feb6400000000,
+    0xc06ced9000000000, 0xac1a81e700000000, 0x1880357e00000000,
+    0x74f6590900000000},
+   {0x0000000000000000, 0x7600b73000000000, 0xec006e6100000000,
+    0x9a00d95100000000, 0xd801dcc200000000, 0xae016bf200000000,
+    0x3401b2a300000000, 0x4201059300000000, 0xb303bb3500000000,
+    0xc5030c0500000000, 0x5f03d55400000000, 0x2903626400000000,
+    0x6b0267f700000000, 0x1d02d0c700000000, 0x8702099600000000,
+    0xf102bea600000000, 0x6607766b00000000, 0x1007c15b00000000,
+    0x8a07180a00000000, 0xfc07af3a00000000, 0xbe06aaa900000000,
+    0xc8061d9900000000, 0x5206c4c800000000, 0x240673f800000000,
+    0xd504cd5e00000000, 0xa3047a6e00000000, 0x3904a33f00000000,
+    0x4f04140f00000000, 0x0d05119c00000000, 0x7b05a6ac00000000,
+    0xe1057ffd00000000, 0x9705c8cd00000000, 0xcc0eecd600000000,
+    0xba0e5be600000000, 0x200e82b700000000, 0x560e358700000000,
+    0x140f301400000000, 0x620f872400000000, 0xf80f5e7500000000,
+    0x8e0fe94500000000, 0x7f0d57e300000000, 0x090de0d300000000,
+    0x930d398200000000, 0xe50d8eb200000000, 0xa70c8b2100000000,
+    0xd10c3c1100000000, 0x4b0ce54000000000, 0x3d0c527000000000,
+    0xaa099abd00000000, 0xdc092d8d00000000, 0x4609f4dc00000000,
+    0x300943ec00000000, 0x7208467f00000000, 0x0408f14f00000000,
+    0x9e08281e00000000, 0xe8089f2e00000000, 0x190a218800000000,
+    0x6f0a96b800000000, 0xf50a4fe900000000, 0x830af8d900000000,
+    0xc10bfd4a00000000, 0xb70b4a7a00000000, 0x2d0b932b00000000,
+    0x5b0b241b00000000, 0x9b1ddb1d00000000, 0xed1d6c2d00000000,
+    0x771db57c00000000, 0x011d024c00000000, 0x431c07df00000000,
+    0x351cb0ef00000000, 0xaf1c69be00000000, 0xd91cde8e00000000,
+    0x281e602800000000, 0x5e1ed71800000000, 0xc41e0e4900000000,
+    0xb21eb97900000000, 0xf01fbcea00000000, 0x861f0bda00000000,
+    0x1c1fd28b00000000, 0x6a1f65bb00000000, 0xfd1aad7600000000,
+    0x8b1a1a4600000000, 0x111ac31700000000, 0x671a742700000000,
+    0x251b71b400000000, 0x531bc68400000000, 0xc91b1fd500000000,
+    0xbf1ba8e500000000, 0x4e19164300000000, 0x3819a17300000000,
+    0xa219782200000000, 0xd419cf1200000000, 0x9618ca8100000000,
+    0xe0187db100000000, 0x7a18a4e000000000, 0x0c1813d000000000,
+    0x571337cb00000000, 0x211380fb00000000, 0xbb1359aa00000000,
+    0xcd13ee9a00000000, 0x8f12eb0900000000, 0xf9125c3900000000,
+    0x6312856800000000, 0x1512325800000000, 0xe4108cfe00000000,
+    0x92103bce00000000, 0x0810e29f00000000, 0x7e1055af00000000,
+    0x3c11503c00000000, 0x4a11e70c00000000, 0xd0113e5d00000000,
+    0xa611896d00000000, 0x311441a000000000, 0x4714f69000000000,
+    0xdd142fc100000000, 0xab1498f100000000, 0xe9159d6200000000,
+    0x9f152a5200000000, 0x0515f30300000000, 0x7315443300000000,
+    0x8217fa9500000000, 0xf4174da500000000, 0x6e1794f400000000,
+    0x181723c400000000, 0x5a16265700000000, 0x2c16916700000000,
+    0xb616483600000000, 0xc016ff0600000000, 0x363bb63b00000000,
+    0x403b010b00000000, 0xda3bd85a00000000, 0xac3b6f6a00000000,
+    0xee3a6af900000000, 0x983addc900000000, 0x023a049800000000,
+    0x743ab3a800000000, 0x85380d0e00000000, 0xf338ba3e00000000,
+    0x6938636f00000000, 0x1f38d45f00000000, 0x5d39d1cc00000000,
+    0x2b3966fc00000000, 0xb139bfad00000000, 0xc739089d00000000,
+    0x503cc05000000000, 0x263c776000000000, 0xbc3cae3100000000,
+    0xca3c190100000000, 0x883d1c9200000000, 0xfe3daba200000000,
+    0x643d72f300000000, 0x123dc5c300000000, 0xe33f7b6500000000,
+    0x953fcc5500000000, 0x0f3f150400000000, 0x793fa23400000000,
+    0x3b3ea7a700000000, 0x4d3e109700000000, 0xd73ec9c600000000,
+    0xa13e7ef600000000, 0xfa355aed00000000, 0x8c35eddd00000000,
+    0x1635348c00000000, 0x603583bc00000000, 0x2234862f00000000,
+    0x5434311f00000000, 0xce34e84e00000000, 0xb8345f7e00000000,
+    0x4936e1d800000000, 0x3f3656e800000000, 0xa5368fb900000000,
+    0xd336388900000000, 0x91373d1a00000000, 0xe7378a2a00000000,
+    0x7d37537b00000000, 0x0b37e44b00000000, 0x9c322c8600000000,
+    0xea329bb600000000, 0x703242e700000000, 0x0632f5d700000000,
+    0x4433f04400000000, 0x3233477400000000, 0xa8339e2500000000,
+    0xde33291500000000, 0x2f3197b300000000, 0x5931208300000000,
+    0xc331f9d200000000, 0xb5314ee200000000, 0xf7304b7100000000,
+    0x8130fc4100000000, 0x1b30251000000000, 0x6d30922000000000,
+    0xad266d2600000000, 0xdb26da1600000000, 0x4126034700000000,
+    0x3726b47700000000, 0x7527b1e400000000, 0x032706d400000000,
+    0x9927df8500000000, 0xef2768b500000000, 0x1e25d61300000000,
+    0x6825612300000000, 0xf225b87200000000, 0x84250f4200000000,
+    0xc6240ad100000000, 0xb024bde100000000, 0x2a2464b000000000,
+    0x5c24d38000000000, 0xcb211b4d00000000, 0xbd21ac7d00000000,
+    0x2721752c00000000, 0x5121c21c00000000, 0x1320c78f00000000,
+    0x652070bf00000000, 0xff20a9ee00000000, 0x89201ede00000000,
+    0x7822a07800000000, 0x0e22174800000000, 0x9422ce1900000000,
+    0xe222792900000000, 0xa0237cba00000000, 0xd623cb8a00000000,
+    0x4c2312db00000000, 0x3a23a5eb00000000, 0x612881f000000000,
+    0x172836c000000000, 0x8d28ef9100000000, 0xfb2858a100000000,
+    0xb9295d3200000000, 0xcf29ea0200000000, 0x5529335300000000,
+    0x2329846300000000, 0xd22b3ac500000000, 0xa42b8df500000000,
+    0x3e2b54a400000000, 0x482be39400000000, 0x0a2ae60700000000,
+    0x7c2a513700000000, 0xe62a886600000000, 0x902a3f5600000000,
+    0x072ff79b00000000, 0x712f40ab00000000, 0xeb2f99fa00000000,
+    0x9d2f2eca00000000, 0xdf2e2b5900000000, 0xa92e9c6900000000,
+    0x332e453800000000, 0x452ef20800000000, 0xb42c4cae00000000,
+    0xc22cfb9e00000000, 0x582c22cf00000000, 0x2e2c95ff00000000,
+    0x6c2d906c00000000, 0x1a2d275c00000000, 0x802dfe0d00000000,
+    0xf62d493d00000000},
+   {0x0000000000000000, 0x01c151ac00000000, 0x0182a0e800000000,
+    0x0043f14400000000, 0x0104426100000000, 0x00c513cd00000000,
+    0x0086e28900000000, 0x0147b32500000000, 0x020884c200000000,
+    0x03c9d56e00000000, 0x038a242a00000000, 0x024b758600000000,
+    0x030cc6a300000000, 0x02cd970f00000000, 0x028e664b00000000,
+    0x034f37e700000000, 0x07100b3500000000, 0x06d15a9900000000,
+    0x0692abdd00000000, 0x0753fa7100000000, 0x0614495400000000,
+    0x07d518f800000000, 0x0796e9bc00000000, 0x0657b81000000000,
+    0x05188ff700000000, 0x04d9de5b00000000, 0x049a2f1f00000000,
+    0x055b7eb300000000, 0x041ccd9600000000, 0x05dd9c3a00000000,
+    0x059e6d7e00000000, 0x045f3cd200000000, 0x0e20166a00000000,
+    0x0fe147c600000000, 0x0fa2b68200000000, 0x0e63e72e00000000,
+    0x0f24540b00000000, 0x0ee505a700000000, 0x0ea6f4e300000000,
+    0x0f67a54f00000000, 0x0c2892a800000000, 0x0de9c30400000000,
+    0x0daa324000000000, 0x0c6b63ec00000000, 0x0d2cd0c900000000,
+    0x0ced816500000000, 0x0cae702100000000, 0x0d6f218d00000000,
+    0x09301d5f00000000, 0x08f14cf300000000, 0x08b2bdb700000000,
+    0x0973ec1b00000000, 0x08345f3e00000000, 0x09f50e9200000000,
+    0x09b6ffd600000000, 0x0877ae7a00000000, 0x0b38999d00000000,
+    0x0af9c83100000000, 0x0aba397500000000, 0x0b7b68d900000000,
+    0x0a3cdbfc00000000, 0x0bfd8a5000000000, 0x0bbe7b1400000000,
+    0x0a7f2ab800000000, 0x1c402cd400000000, 0x1d817d7800000000,
+    0x1dc28c3c00000000, 0x1c03dd9000000000, 0x1d446eb500000000,
+    0x1c853f1900000000, 0x1cc6ce5d00000000, 0x1d079ff100000000,
+    0x1e48a81600000000, 0x1f89f9ba00000000, 0x1fca08fe00000000,
+    0x1e0b595200000000, 0x1f4cea7700000000, 0x1e8dbbdb00000000,
+    0x1ece4a9f00000000, 0x1f0f1b3300000000, 0x1b5027e100000000,
+    0x1a91764d00000000, 0x1ad2870900000000, 0x1b13d6a500000000,
+    0x1a54658000000000, 0x1b95342c00000000, 0x1bd6c56800000000,
+    0x1a1794c400000000, 0x1958a32300000000, 0x1899f28f00000000,
+    0x18da03cb00000000, 0x191b526700000000, 0x185ce14200000000,
+    0x199db0ee00000000, 0x19de41aa00000000, 0x181f100600000000,
+    0x12603abe00000000, 0x13a16b1200000000, 0x13e29a5600000000,
+    0x1223cbfa00000000, 0x136478df00000000, 0x12a5297300000000,
+    0x12e6d83700000000, 0x1327899b00000000, 0x1068be7c00000000,
+    0x11a9efd000000000, 0x11ea1e9400000000, 0x102b4f3800000000,
+    0x116cfc1d00000000, 0x10adadb100000000, 0x10ee5cf500000000,
+    0x112f0d5900000000, 0x1570318b00000000, 0x14b1602700000000,
+    0x14f2916300000000, 0x1533c0cf00000000, 0x147473ea00000000,
+    0x15b5224600000000, 0x15f6d30200000000, 0x143782ae00000000,
+    0x1778b54900000000, 0x16b9e4e500000000, 0x16fa15a100000000,
+    0x173b440d00000000, 0x167cf72800000000, 0x17bda68400000000,
+    0x17fe57c000000000, 0x163f066c00000000, 0x3b805b1800000000,
+    0x3a410ab400000000, 0x3a02fbf000000000, 0x3bc3aa5c00000000,
+    0x3a84197900000000, 0x3b4548d500000000, 0x3b06b99100000000,
+    0x3ac7e83d00000000, 0x3988dfda00000000, 0x38498e7600000000,
+    0x380a7f3200000000, 0x39cb2e9e00000000, 0x388c9dbb00000000,
+    0x394dcc1700000000, 0x390e3d5300000000, 0x38cf6cff00000000,
+    0x3c90502d00000000, 0x3d51018100000000, 0x3d12f0c500000000,
+    0x3cd3a16900000000, 0x3d94124c00000000, 0x3c5543e000000000,
+    0x3c16b2a400000000, 0x3dd7e30800000000, 0x3e98d4ef00000000,
+    0x3f59854300000000, 0x3f1a740700000000, 0x3edb25ab00000000,
+    0x3f9c968e00000000, 0x3e5dc72200000000, 0x3e1e366600000000,
+    0x3fdf67ca00000000, 0x35a04d7200000000, 0x34611cde00000000,
+    0x3422ed9a00000000, 0x35e3bc3600000000, 0x34a40f1300000000,
+    0x35655ebf00000000, 0x3526affb00000000, 0x34e7fe5700000000,
+    0x37a8c9b000000000, 0x3669981c00000000, 0x362a695800000000,
+    0x37eb38f400000000, 0x36ac8bd100000000, 0x376dda7d00000000,
+    0x372e2b3900000000, 0x36ef7a9500000000, 0x32b0464700000000,
+    0x337117eb00000000, 0x3332e6af00000000, 0x32f3b70300000000,
+    0x33b4042600000000, 0x3275558a00000000, 0x3236a4ce00000000,
+    0x33f7f56200000000, 0x30b8c28500000000, 0x3179932900000000,
+    0x313a626d00000000, 0x30fb33c100000000, 0x31bc80e400000000,
+    0x307dd14800000000, 0x303e200c00000000, 0x31ff71a000000000,
+    0x27c077cc00000000, 0x2601266000000000, 0x2642d72400000000,
+    0x2783868800000000, 0x26c435ad00000000, 0x2705640100000000,
+    0x2746954500000000, 0x2687c4e900000000, 0x25c8f30e00000000,
+    0x2409a2a200000000, 0x244a53e600000000, 0x258b024a00000000,
+    0x24ccb16f00000000, 0x250de0c300000000, 0x254e118700000000,
+    0x248f402b00000000, 0x20d07cf900000000, 0x21112d5500000000,
+    0x2152dc1100000000, 0x20938dbd00000000, 0x21d43e9800000000,
+    0x20156f3400000000, 0x20569e7000000000, 0x2197cfdc00000000,
+    0x22d8f83b00000000, 0x2319a99700000000, 0x235a58d300000000,
+    0x229b097f00000000, 0x23dcba5a00000000, 0x221debf600000000,
+    0x225e1ab200000000, 0x239f4b1e00000000, 0x29e061a600000000,
+    0x2821300a00000000, 0x2862c14e00000000, 0x29a390e200000000,
+    0x28e423c700000000, 0x2925726b00000000, 0x2966832f00000000,
+    0x28a7d28300000000, 0x2be8e56400000000, 0x2a29b4c800000000,
+    0x2a6a458c00000000, 0x2bab142000000000, 0x2aeca70500000000,
+    0x2b2df6a900000000, 0x2b6e07ed00000000, 0x2aaf564100000000,
+    0x2ef06a9300000000, 0x2f313b3f00000000, 0x2f72ca7b00000000,
+    0x2eb39bd700000000, 0x2ff428f200000000, 0x2e35795e00000000,
+    0x2e76881a00000000, 0x2fb7d9b600000000, 0x2cf8ee5100000000,
+    0x2d39bffd00000000, 0x2d7a4eb900000000, 0x2cbb1f1500000000,
+    0x2dfcac3000000000, 0x2c3dfd9c00000000, 0x2c7e0cd800000000,
+    0x2dbf5d7400000000},
+   {0x0000000000000000, 0xc0503d9000000000, 0x83a1799000000000,
+    0x43f1440000000000, 0x0543f09000000000, 0xc513cd0000000000,
+    0x86e2890000000000, 0x46b2b49000000000, 0x0986e39100000000,
+    0xc9d6de0100000000, 0x8a279a0100000000, 0x4a77a79100000000,
+    0x0cc5130100000000, 0xcc952e9100000000, 0x8f646a9100000000,
+    0x4f34570100000000, 0x110cc49300000000, 0xd15cf90300000000,
+    0x92adbd0300000000, 0x52fd809300000000, 0x144f340300000000,
+    0xd41f099300000000, 0x97ee4d9300000000, 0x57be700300000000,
+    0x188a270200000000, 0xd8da1a9200000000, 0x9b2b5e9200000000,
+    0x5b7b630200000000, 0x1dc9d79200000000, 0xdd99ea0200000000,
+    0x9e68ae0200000000, 0x5e38939200000000, 0x21188b9700000000,
+    0xe148b60700000000, 0xa2b9f20700000000, 0x62e9cf9700000000,
+    0x245b7b0700000000, 0xe40b469700000000, 0xa7fa029700000000,
+    0x67aa3f0700000000, 0x289e680600000000, 0xe8ce559600000000,
+    0xab3f119600000000, 0x6b6f2c0600000000, 0x2ddd989600000000,
+    0xed8da50600000000, 0xae7ce10600000000, 0x6e2cdc9600000000,
+    0x30144f0400000000, 0xf044729400000000, 0xb3b5369400000000,
+    0x73e50b0400000000, 0x3557bf9400000000, 0xf507820400000000,
+    0xb6f6c60400000000, 0x76a6fb9400000000, 0x3992ac9500000000,
+    0xf9c2910500000000, 0xba33d50500000000, 0x7a63e89500000000,
+    0x3cd15c0500000000, 0xfc81619500000000, 0xbf70259500000000,
+    0x7f20180500000000, 0x4130159f00000000, 0x8160280f00000000,
+    0xc2916c0f00000000, 0x02c1519f00000000, 0x4473e50f00000000,
+    0x8423d89f00000000, 0xc7d29c9f00000000, 0x0782a10f00000000,
+    0x48b6f60e00000000, 0x88e6cb9e00000000, 0xcb178f9e00000000,
+    0x0b47b20e00000000, 0x4df5069e00000000, 0x8da53b0e00000000,
+    0xce547f0e00000000, 0x0e04429e00000000, 0x503cd10c00000000,
+    0x906cec9c00000000, 0xd39da89c00000000, 0x13cd950c00000000,
+    0x557f219c00000000, 0x952f1c0c00000000, 0xd6de580c00000000,
+    0x168e659c00000000, 0x59ba329d00000000, 0x99ea0f0d00000000,
+    0xda1b4b0d00000000, 0x1a4b769d00000000, 0x5cf9c20d00000000,
+    0x9ca9ff9d00000000, 0xdf58bb9d00000000, 0x1f08860d00000000,
+    0x60289e0800000000, 0xa078a39800000000, 0xe389e79800000000,
+    0x23d9da0800000000, 0x656b6e9800000000, 0xa53b530800000000,
+    0xe6ca170800000000, 0x269a2a9800000000, 0x69ae7d9900000000,
+    0xa9fe400900000000, 0xea0f040900000000, 0x2a5f399900000000,
+    0x6ced8d0900000000, 0xacbdb09900000000, 0xef4cf49900000000,
+    0x2f1cc90900000000, 0x71245a9b00000000, 0xb174670b00000000,
+    0xf285230b00000000, 0x32d51e9b00000000, 0x7467aa0b00000000,
+    0xb437979b00000000, 0xf7c6d39b00000000, 0x3796ee0b00000000,
+    0x78a2b90a00000000, 0xb8f2849a00000000, 0xfb03c09a00000000,
+    0x3b53fd0a00000000, 0x7de1499a00000000, 0xbdb1740a00000000,
+    0xfe40300a00000000, 0x3e100d9a00000000, 0x8160298e00000000,
+    0x4130141e00000000, 0x02c1501e00000000, 0xc2916d8e00000000,
+    0x8423d91e00000000, 0x4473e48e00000000, 0x0782a08e00000000,
+    0xc7d29d1e00000000, 0x88e6ca1f00000000, 0x48b6f78f00000000,
+    0x0b47b38f00000000, 0xcb178e1f00000000, 0x8da53a8f00000000,
+    0x4df5071f00000000, 0x0e04431f00000000, 0xce547e8f00000000,
+    0x906ced1d00000000, 0x503cd08d00000000, 0x13cd948d00000000,
+    0xd39da91d00000000, 0x952f1d8d00000000, 0x557f201d00000000,
+    0x168e641d00000000, 0xd6de598d00000000, 0x99ea0e8c00000000,
+    0x59ba331c00000000, 0x1a4b771c00000000, 0xda1b4a8c00000000,
+    0x9ca9fe1c00000000, 0x5cf9c38c00000000, 0x1f08878c00000000,
+    0xdf58ba1c00000000, 0xa078a21900000000, 0x60289f8900000000,
+    0x23d9db8900000000, 0xe389e61900000000, 0xa53b528900000000,
+    0x656b6f1900000000, 0x269a2b1900000000, 0xe6ca168900000000,
+    0xa9fe418800000000, 0x69ae7c1800000000, 0x2a5f381800000000,
+    0xea0f058800000000, 0xacbdb11800000000, 0x6ced8c8800000000,
+    0x2f1cc88800000000, 0xef4cf51800000000, 0xb174668a00000000,
+    0x71245b1a00000000, 0x32d51f1a00000000, 0xf285228a00000000,
+    0xb437961a00000000, 0x7467ab8a00000000, 0x3796ef8a00000000,
+    0xf7c6d21a00000000, 0xb8f2851b00000000, 0x78a2b88b00000000,
+    0x3b53fc8b00000000, 0xfb03c11b00000000, 0xbdb1758b00000000,
+    0x7de1481b00000000, 0x3e100c1b00000000, 0xfe40318b00000000,
+    0xc0503c1100000000, 0x0000018100000000, 0x43f1458100000000,
+    0x83a1781100000000, 0xc513cc8100000000, 0x0543f11100000000,
+    0x46b2b51100000000, 0x86e2888100000000, 0xc9d6df8000000000,
+    0x0986e21000000000, 0x4a77a61000000000, 0x8a279b8000000000,
+    0xcc952f1000000000, 0x0cc5128000000000, 0x4f34568000000000,
+    0x8f646b1000000000, 0xd15cf88200000000, 0x110cc51200000000,
+    0x52fd811200000000, 0x92adbc8200000000, 0xd41f081200000000,
+    0x144f358200000000, 0x57be718200000000, 0x97ee4c1200000000,
+    0xd8da1b1300000000, 0x188a268300000000, 0x5b7b628300000000,
+    0x9b2b5f1300000000, 0xdd99eb8300000000, 0x1dc9d61300000000,
+    0x5e38921300000000, 0x9e68af8300000000, 0xe148b78600000000,
+    0x21188a1600000000, 0x62e9ce1600000000, 0xa2b9f38600000000,
+    0xe40b471600000000, 0x245b7a8600000000, 0x67aa3e8600000000,
+    0xa7fa031600000000, 0xe8ce541700000000, 0x289e698700000000,
+    0x6b6f2d8700000000, 0xab3f101700000000, 0xed8da48700000000,
+    0x2ddd991700000000, 0x6e2cdd1700000000, 0xae7ce08700000000,
+    0xf044731500000000, 0x30144e8500000000, 0x73e50a8500000000,
+    0xb3b5371500000000, 0xf507838500000000, 0x3557be1500000000,
+    0x76a6fa1500000000, 0xb6f6c78500000000, 0xf9c2908400000000,
+    0x3992ad1400000000, 0x7a63e91400000000, 0xba33d48400000000,
+    0xfc81601400000000, 0x3cd15d8400000000, 0x7f20198400000000,
+    0xbf70241400000000},
+   {0x0000000000000000, 0x50fd906c00000000, 0xa0fa21d900000000,
+    0xf007b1b500000000, 0x43f5400200000000, 0x1308d06e00000000,
+    0xe30f61db00000000, 0xb3f2f1b700000000, 0x86ea810400000000,
+    0xd617116800000000, 0x2610a0dd00000000, 0x76ed30b100000000,
+    0xc51fc10600000000, 0x95e2516a00000000, 0x65e5e0df00000000,
+    0x351870b300000000, 0x0cd5030900000000, 0x5c28936500000000,
+    0xac2f22d000000000, 0xfcd2b2bc00000000, 0x4f20430b00000000,
+    0x1fddd36700000000, 0xefda62d200000000, 0xbf27f2be00000000,
+    0x8a3f820d00000000, 0xdac2126100000000, 0x2ac5a3d400000000,
+    0x7a3833b800000000, 0xc9cac20f00000000, 0x9937526300000000,
+    0x6930e3d600000000, 0x39cd73ba00000000, 0x18aa071200000000,
+    0x4857977e00000000, 0xb85026cb00000000, 0xe8adb6a700000000,
+    0x5b5f471000000000, 0x0ba2d77c00000000, 0xfba566c900000000,
+    0xab58f6a500000000, 0x9e40861600000000, 0xcebd167a00000000,
+    0x3ebaa7cf00000000, 0x6e4737a300000000, 0xddb5c61400000000,
+    0x8d48567800000000, 0x7d4fe7cd00000000, 0x2db277a100000000,
+    0x147f041b00000000, 0x4482947700000000, 0xb48525c200000000,
+    0xe478b5ae00000000, 0x578a441900000000, 0x0777d47500000000,
+    0xf77065c000000000, 0xa78df5ac00000000, 0x9295851f00000000,
+    0xc268157300000000, 0x326fa4c600000000, 0x629234aa00000000,
+    0xd160c51d00000000, 0x819d557100000000, 0x719ae4c400000000,
+    0x216774a800000000, 0x30540f2400000000, 0x60a99f4800000000,
+    0x90ae2efd00000000, 0xc053be9100000000, 0x73a14f2600000000,
+    0x235cdf4a00000000, 0xd35b6eff00000000, 0x83a6fe9300000000,
+    0xb6be8e2000000000, 0xe6431e4c00000000, 0x1644aff900000000,
+    0x46b93f9500000000, 0xf54bce2200000000, 0xa5b65e4e00000000,
+    0x55b1effb00000000, 0x054c7f9700000000, 0x3c810c2d00000000,
+    0x6c7c9c4100000000, 0x9c7b2df400000000, 0xcc86bd9800000000,
+    0x7f744c2f00000000, 0x2f89dc4300000000, 0xdf8e6df600000000,
+    0x8f73fd9a00000000, 0xba6b8d2900000000, 0xea961d4500000000,
+    0x1a91acf000000000, 0x4a6c3c9c00000000, 0xf99ecd2b00000000,
+    0xa9635d4700000000, 0x5964ecf200000000, 0x09997c9e00000000,
+    0x28fe083600000000, 0x7803985a00000000, 0x880429ef00000000,
+    0xd8f9b98300000000, 0x6b0b483400000000, 0x3bf6d85800000000,
+    0xcbf169ed00000000, 0x9b0cf98100000000, 0xae14893200000000,
+    0xfee9195e00000000, 0x0eeea8eb00000000, 0x5e13388700000000,
+    0xede1c93000000000, 0xbd1c595c00000000, 0x4d1be8e900000000,
+    0x1de6788500000000, 0x242b0b3f00000000, 0x74d69b5300000000,
+    0x84d12ae600000000, 0xd42cba8a00000000, 0x67de4b3d00000000,
+    0x3723db5100000000, 0xc7246ae400000000, 0x97d9fa8800000000,
+    0xa2c18a3b00000000, 0xf23c1a5700000000, 0x023babe200000000,
+    0x52c63b8e00000000, 0xe134ca3900000000, 0xb1c95a5500000000,
+    0x41ceebe000000000, 0x11337b8c00000000, 0x60a81e4800000000,
+    0x30558e2400000000, 0xc0523f9100000000, 0x90afaffd00000000,
+    0x235d5e4a00000000, 0x73a0ce2600000000, 0x83a77f9300000000,
+    0xd35aefff00000000, 0xe6429f4c00000000, 0xb6bf0f2000000000,
+    0x46b8be9500000000, 0x16452ef900000000, 0xa5b7df4e00000000,
+    0xf54a4f2200000000, 0x054dfe9700000000, 0x55b06efb00000000,
+    0x6c7d1d4100000000, 0x3c808d2d00000000, 0xcc873c9800000000,
+    0x9c7aacf400000000, 0x2f885d4300000000, 0x7f75cd2f00000000,
+    0x8f727c9a00000000, 0xdf8fecf600000000, 0xea979c4500000000,
+    0xba6a0c2900000000, 0x4a6dbd9c00000000, 0x1a902df000000000,
+    0xa962dc4700000000, 0xf99f4c2b00000000, 0x0998fd9e00000000,
+    0x59656df200000000, 0x7802195a00000000, 0x28ff893600000000,
+    0xd8f8388300000000, 0x8805a8ef00000000, 0x3bf7595800000000,
+    0x6b0ac93400000000, 0x9b0d788100000000, 0xcbf0e8ed00000000,
+    0xfee8985e00000000, 0xae15083200000000, 0x5e12b98700000000,
+    0x0eef29eb00000000, 0xbd1dd85c00000000, 0xede0483000000000,
+    0x1de7f98500000000, 0x4d1a69e900000000, 0x74d71a5300000000,
+    0x242a8a3f00000000, 0xd42d3b8a00000000, 0x84d0abe600000000,
+    0x37225a5100000000, 0x67dfca3d00000000, 0x97d87b8800000000,
+    0xc725ebe400000000, 0xf23d9b5700000000, 0xa2c00b3b00000000,
+    0x52c7ba8e00000000, 0x023a2ae200000000, 0xb1c8db5500000000,
+    0xe1354b3900000000, 0x1132fa8c00000000, 0x41cf6ae000000000,
+    0x50fc116c00000000, 0x0001810000000000, 0xf00630b500000000,
+    0xa0fba0d900000000, 0x1309516e00000000, 0x43f4c10200000000,
+    0xb3f370b700000000, 0xe30ee0db00000000, 0xd616906800000000,
+    0x86eb000400000000, 0x76ecb1b100000000, 0x261121dd00000000,
+    0x95e3d06a00000000, 0xc51e400600000000, 0x3519f1b300000000,
+    0x65e461df00000000, 0x5c29126500000000, 0x0cd4820900000000,
+    0xfcd333bc00000000, 0xac2ea3d000000000, 0x1fdc526700000000,
+    0x4f21c20b00000000, 0xbf2673be00000000, 0xefdbe3d200000000,
+    0xdac3936100000000, 0x8a3e030d00000000, 0x7a39b2b800000000,
+    0x2ac422d400000000, 0x9936d36300000000, 0xc9cb430f00000000,
+    0x39ccf2ba00000000, 0x693162d600000000, 0x4856167e00000000,
+    0x18ab861200000000, 0xe8ac37a700000000, 0xb851a7cb00000000,
+    0x0ba3567c00000000, 0x5b5ec61000000000, 0xab5977a500000000,
+    0xfba4e7c900000000, 0xcebc977a00000000, 0x9e41071600000000,
+    0x6e46b6a300000000, 0x3ebb26cf00000000, 0x8d49d77800000000,
+    0xddb4471400000000, 0x2db3f6a100000000, 0x7d4e66cd00000000,
+    0x4483157700000000, 0x147e851b00000000, 0xe47934ae00000000,
+    0xb484a4c200000000, 0x0776557500000000, 0x578bc51900000000,
+    0xa78c74ac00000000, 0xf771e4c000000000, 0xc269947300000000,
+    0x9294041f00000000, 0x6293b5aa00000000, 0x326e25c600000000,
+    0x819cd47100000000, 0xd161441d00000000, 0x2166f5a800000000,
+    0x719b65c400000000},
+   {0x0000000000000000, 0xfdc06c2d00000000, 0xfa81d95a00000000,
+    0x0741b57700000000, 0xf403b3b500000000, 0x09c3df9800000000,
+    0x0e826aef00000000, 0xf34206c200000000, 0xeb0765db00000000,
+    0x16c709f600000000, 0x1186bc8100000000, 0xec46d0ac00000000,
+    0x1f04d66e00000000, 0xe2c4ba4300000000, 0xe5850f3400000000,
+    0x1845631900000000, 0xd50fc90600000000, 0x28cfa52b00000000,
+    0x2f8e105c00000000, 0xd24e7c7100000000, 0x210c7ab300000000,
+    0xdccc169e00000000, 0xdb8da3e900000000, 0x264dcfc400000000,
+    0x3e08acdd00000000, 0xc3c8c0f000000000, 0xc489758700000000,
+    0x394919aa00000000, 0xca0b1f6800000000, 0x37cb734500000000,
+    0x308ac63200000000, 0xcd4aaa1f00000000, 0xaa1f920d00000000,
+    0x57dffe2000000000, 0x509e4b5700000000, 0xad5e277a00000000,
+    0x5e1c21b800000000, 0xa3dc4d9500000000, 0xa49df8e200000000,
+    0x595d94cf00000000, 0x4118f7d600000000, 0xbcd89bfb00000000,
+    0xbb992e8c00000000, 0x465942a100000000, 0xb51b446300000000,
+    0x48db284e00000000, 0x4f9a9d3900000000, 0xb25af11400000000,
+    0x7f105b0b00000000, 0x82d0372600000000, 0x8591825100000000,
+    0x7851ee7c00000000, 0x8b13e8be00000000, 0x76d3849300000000,
+    0x719231e400000000, 0x8c525dc900000000, 0x94173ed000000000,
+    0x69d752fd00000000, 0x6e96e78a00000000, 0x93568ba700000000,
+    0x60148d6500000000, 0x9dd4e14800000000, 0x9a95543f00000000,
+    0x6755381200000000, 0x543f241b00000000, 0xa9ff483600000000,
+    0xaebefd4100000000, 0x537e916c00000000, 0xa03c97ae00000000,
+    0x5dfcfb8300000000, 0x5abd4ef400000000, 0xa77d22d900000000,
+    0xbf3841c000000000, 0x42f82ded00000000, 0x45b9989a00000000,
+    0xb879f4b700000000, 0x4b3bf27500000000, 0xb6fb9e5800000000,
+    0xb1ba2b2f00000000, 0x4c7a470200000000, 0x8130ed1d00000000,
+    0x7cf0813000000000, 0x7bb1344700000000, 0x8671586a00000000,
+    0x75335ea800000000, 0x88f3328500000000, 0x8fb287f200000000,
+    0x7272ebdf00000000, 0x6a3788c600000000, 0x97f7e4eb00000000,
+    0x90b6519c00000000, 0x6d763db100000000, 0x9e343b7300000000,
+    0x63f4575e00000000, 0x64b5e22900000000, 0x99758e0400000000,
+    0xfe20b61600000000, 0x03e0da3b00000000, 0x04a16f4c00000000,
+    0xf961036100000000, 0x0a2305a300000000, 0xf7e3698e00000000,
+    0xf0a2dcf900000000, 0x0d62b0d400000000, 0x1527d3cd00000000,
+    0xe8e7bfe000000000, 0xefa60a9700000000, 0x126666ba00000000,
+    0xe124607800000000, 0x1ce40c5500000000, 0x1ba5b92200000000,
+    0xe665d50f00000000, 0x2b2f7f1000000000, 0xd6ef133d00000000,
+    0xd1aea64a00000000, 0x2c6eca6700000000, 0xdf2ccca500000000,
+    0x22eca08800000000, 0x25ad15ff00000000, 0xd86d79d200000000,
+    0xc0281acb00000000, 0x3de876e600000000, 0x3aa9c39100000000,
+    0xc769afbc00000000, 0x342ba97e00000000, 0xc9ebc55300000000,
+    0xceaa702400000000, 0x336a1c0900000000, 0xa87e483600000000,
+    0x55be241b00000000, 0x52ff916c00000000, 0xaf3ffd4100000000,
+    0x5c7dfb8300000000, 0xa1bd97ae00000000, 0xa6fc22d900000000,
+    0x5b3c4ef400000000, 0x43792ded00000000, 0xbeb941c000000000,
+    0xb9f8f4b700000000, 0x4438989a00000000, 0xb77a9e5800000000,
+    0x4abaf27500000000, 0x4dfb470200000000, 0xb03b2b2f00000000,
+    0x7d71813000000000, 0x80b1ed1d00000000, 0x87f0586a00000000,
+    0x7a30344700000000, 0x8972328500000000, 0x74b25ea800000000,
+    0x73f3ebdf00000000, 0x8e3387f200000000, 0x9676e4eb00000000,
+    0x6bb688c600000000, 0x6cf73db100000000, 0x9137519c00000000,
+    0x6275575e00000000, 0x9fb53b7300000000, 0x98f48e0400000000,
+    0x6534e22900000000, 0x0261da3b00000000, 0xffa1b61600000000,
+    0xf8e0036100000000, 0x05206f4c00000000, 0xf662698e00000000,
+    0x0ba205a300000000, 0x0ce3b0d400000000, 0xf123dcf900000000,
+    0xe966bfe000000000, 0x14a6d3cd00000000, 0x13e766ba00000000,
+    0xee270a9700000000, 0x1d650c5500000000, 0xe0a5607800000000,
+    0xe7e4d50f00000000, 0x1a24b92200000000, 0xd76e133d00000000,
+    0x2aae7f1000000000, 0x2defca6700000000, 0xd02fa64a00000000,
+    0x236da08800000000, 0xdeadcca500000000, 0xd9ec79d200000000,
+    0x242c15ff00000000, 0x3c6976e600000000, 0xc1a91acb00000000,
+    0xc6e8afbc00000000, 0x3b28c39100000000, 0xc86ac55300000000,
+    0x35aaa97e00000000, 0x32eb1c0900000000, 0xcf2b702400000000,
+    0xfc416c2d00000000, 0x0181000000000000, 0x06c0b57700000000,
+    0xfb00d95a00000000, 0x0842df9800000000, 0xf582b3b500000000,
+    0xf2c306c200000000, 0x0f036aef00000000, 0x174609f600000000,
+    0xea8665db00000000, 0xedc7d0ac00000000, 0x1007bc8100000000,
+    0xe345ba4300000000, 0x1e85d66e00000000, 0x19c4631900000000,
+    0xe4040f3400000000, 0x294ea52b00000000, 0xd48ec90600000000,
+    0xd3cf7c7100000000, 0x2e0f105c00000000, 0xdd4d169e00000000,
+    0x208d7ab300000000, 0x27cccfc400000000, 0xda0ca3e900000000,
+    0xc249c0f000000000, 0x3f89acdd00000000, 0x38c819aa00000000,
+    0xc508758700000000, 0x364a734500000000, 0xcb8a1f6800000000,
+    0xcccbaa1f00000000, 0x310bc63200000000, 0x565efe2000000000,
+    0xab9e920d00000000, 0xacdf277a00000000, 0x511f4b5700000000,
+    0xa25d4d9500000000, 0x5f9d21b800000000, 0x58dc94cf00000000,
+    0xa51cf8e200000000, 0xbd599bfb00000000, 0x4099f7d600000000,
+    0x47d842a100000000, 0xba182e8c00000000, 0x495a284e00000000,
+    0xb49a446300000000, 0xb3dbf11400000000, 0x4e1b9d3900000000,
+    0x8351372600000000, 0x7e915b0b00000000, 0x79d0ee7c00000000,
+    0x8410825100000000, 0x7752849300000000, 0x8a92e8be00000000,
+    0x8dd35dc900000000, 0x701331e400000000, 0x685652fd00000000,
+    0x95963ed000000000, 0x92d78ba700000000, 0x6f17e78a00000000,
+    0x9c55e14800000000, 0x61958d6500000000, 0x66d4381200000000,
+    0x9b14543f00000000},
+   {0x0000000000000000, 0xc1917ce100000000, 0x8123fa7200000000,
+    0x40b2869300000000, 0x0247f4e500000000, 0xc3d6880400000000,
+    0x83640e9700000000, 0x42f5727600000000, 0x078eeb7b00000000,
+    0xc61f979a00000000, 0x86ad110900000000, 0x473c6de800000000,
+    0x05c91f9e00000000, 0xc458637f00000000, 0x84eae5ec00000000,
+    0x457b990d00000000, 0x0e1cd7f700000000, 0xcf8dab1600000000,
+    0x8f3f2d8500000000, 0x4eae516400000000, 0x0c5b231200000000,
+    0xcdca5ff300000000, 0x8d78d96000000000, 0x4ce9a58100000000,
+    0x09923c8c00000000, 0xc803406d00000000, 0x88b1c6fe00000000,
+    0x4920ba1f00000000, 0x0bd5c86900000000, 0xca44b48800000000,
+    0x8af6321b00000000, 0x4b674efa00000000, 0x1f38ad5f00000000,
+    0xdea9d1be00000000, 0x9e1b572d00000000, 0x5f8a2bcc00000000,
+    0x1d7f59ba00000000, 0xdcee255b00000000, 0x9c5ca3c800000000,
+    0x5dcddf2900000000, 0x18b6462400000000, 0xd9273ac500000000,
+    0x9995bc5600000000, 0x5804c0b700000000, 0x1af1b2c100000000,
+    0xdb60ce2000000000, 0x9bd248b300000000, 0x5a43345200000000,
+    0x11247aa800000000, 0xd0b5064900000000, 0x900780da00000000,
+    0x5196fc3b00000000, 0x13638e4d00000000, 0xd2f2f2ac00000000,
+    0x9240743f00000000, 0x53d108de00000000, 0x16aa91d300000000,
+    0xd73bed3200000000, 0x97896ba100000000, 0x5618174000000000,
+    0x14ed653600000000, 0xd57c19d700000000, 0x95ce9f4400000000,
+    0x545fe3a500000000, 0x3e705abf00000000, 0xffe1265e00000000,
+    0xbf53a0cd00000000, 0x7ec2dc2c00000000, 0x3c37ae5a00000000,
+    0xfda6d2bb00000000, 0xbd14542800000000, 0x7c8528c900000000,
+    0x39feb1c400000000, 0xf86fcd2500000000, 0xb8dd4bb600000000,
+    0x794c375700000000, 0x3bb9452100000000, 0xfa2839c000000000,
+    0xba9abf5300000000, 0x7b0bc3b200000000, 0x306c8d4800000000,
+    0xf1fdf1a900000000, 0xb14f773a00000000, 0x70de0bdb00000000,
+    0x322b79ad00000000, 0xf3ba054c00000000, 0xb30883df00000000,
+    0x7299ff3e00000000, 0x37e2663300000000, 0xf6731ad200000000,
+    0xb6c19c4100000000, 0x7750e0a000000000, 0x35a592d600000000,
+    0xf434ee3700000000, 0xb48668a400000000, 0x7517144500000000,
+    0x2148f7e000000000, 0xe0d98b0100000000, 0xa06b0d9200000000,
+    0x61fa717300000000, 0x230f030500000000, 0xe29e7fe400000000,
+    0xa22cf97700000000, 0x63bd859600000000, 0x26c61c9b00000000,
+    0xe757607a00000000, 0xa7e5e6e900000000, 0x66749a0800000000,
+    0x2481e87e00000000, 0xe510949f00000000, 0xa5a2120c00000000,
+    0x64336eed00000000, 0x2f54201700000000, 0xeec55cf600000000,
+    0xae77da6500000000, 0x6fe6a68400000000, 0x2d13d4f200000000,
+    0xec82a81300000000, 0xac302e8000000000, 0x6da1526100000000,
+    0x28dacb6c00000000, 0xe94bb78d00000000, 0xa9f9311e00000000,
+    0x68684dff00000000, 0x2a9d3f8900000000, 0xeb0c436800000000,
+    0xabbec5fb00000000, 0x6a2fb91a00000000, 0x7fe0b7ce00000000,
+    0xbe71cb2f00000000, 0xfec34dbc00000000, 0x3f52315d00000000,
+    0x7da7432b00000000, 0xbc363fca00000000, 0xfc84b95900000000,
+    0x3d15c5b800000000, 0x786e5cb500000000, 0xb9ff205400000000,
+    0xf94da6c700000000, 0x38dcda2600000000, 0x7a29a85000000000,
+    0xbbb8d4b100000000, 0xfb0a522200000000, 0x3a9b2ec300000000,
+    0x71fc603900000000, 0xb06d1cd800000000, 0xf0df9a4b00000000,
+    0x314ee6aa00000000, 0x73bb94dc00000000, 0xb22ae83d00000000,
+    0xf2986eae00000000, 0x3309124f00000000, 0x76728b4200000000,
+    0xb7e3f7a300000000, 0xf751713000000000, 0x36c00dd100000000,
+    0x74357fa700000000, 0xb5a4034600000000, 0xf51685d500000000,
+    0x3487f93400000000, 0x60d81a9100000000, 0xa149667000000000,
+    0xe1fbe0e300000000, 0x206a9c0200000000, 0x629fee7400000000,
+    0xa30e929500000000, 0xe3bc140600000000, 0x222d68e700000000,
+    0x6756f1ea00000000, 0xa6c78d0b00000000, 0xe6750b9800000000,
+    0x27e4777900000000, 0x6511050f00000000, 0xa48079ee00000000,
+    0xe432ff7d00000000, 0x25a3839c00000000, 0x6ec4cd6600000000,
+    0xaf55b18700000000, 0xefe7371400000000, 0x2e764bf500000000,
+    0x6c83398300000000, 0xad12456200000000, 0xeda0c3f100000000,
+    0x2c31bf1000000000, 0x694a261d00000000, 0xa8db5afc00000000,
+    0xe869dc6f00000000, 0x29f8a08e00000000, 0x6b0dd2f800000000,
+    0xaa9cae1900000000, 0xea2e288a00000000, 0x2bbf546b00000000,
+    0x4190ed7100000000, 0x8001919000000000, 0xc0b3170300000000,
+    0x01226be200000000, 0x43d7199400000000, 0x8246657500000000,
+    0xc2f4e3e600000000, 0x03659f0700000000, 0x461e060a00000000,
+    0x878f7aeb00000000, 0xc73dfc7800000000, 0x06ac809900000000,
+    0x4459f2ef00000000, 0x85c88e0e00000000, 0xc57a089d00000000,
+    0x04eb747c00000000, 0x4f8c3a8600000000, 0x8e1d466700000000,
+    0xceafc0f400000000, 0x0f3ebc1500000000, 0x4dcbce6300000000,
+    0x8c5ab28200000000, 0xcce8341100000000, 0x0d7948f000000000,
+    0x4802d1fd00000000, 0x8993ad1c00000000, 0xc9212b8f00000000,
+    0x08b0576e00000000, 0x4a45251800000000, 0x8bd459f900000000,
+    0xcb66df6a00000000, 0x0af7a38b00000000, 0x5ea8402e00000000,
+    0x9f393ccf00000000, 0xdf8bba5c00000000, 0x1e1ac6bd00000000,
+    0x5cefb4cb00000000, 0x9d7ec82a00000000, 0xddcc4eb900000000,
+    0x1c5d325800000000, 0x5926ab5500000000, 0x98b7d7b400000000,
+    0xd805512700000000, 0x19942dc600000000, 0x5b615fb000000000,
+    0x9af0235100000000, 0xda42a5c200000000, 0x1bd3d92300000000,
+    0x50b497d900000000, 0x9125eb3800000000, 0xd1976dab00000000,
+    0x1006114a00000000, 0x52f3633c00000000, 0x93621fdd00000000,
+    0xd3d0994e00000000, 0x1241e5af00000000, 0x573a7ca200000000,
+    0x96ab004300000000, 0xd61986d000000000, 0x1788fa3100000000,
+    0x557d884700000000, 0x94ecf4a600000000, 0xd45e723500000000,
+    0x15cf0ed400000000}};
+
+#else /* W == 4 */
+
+static const crc_t crc_braid_table[][256] = {
+   {0x00000000, 0x47596181, 0x8eb2c302, 0xc9eba283, 0xad668607,
+    0xea3fe786, 0x23d44505, 0x648d2484, 0xeace0c0d, 0xad976d8c,
+    0x647ccf0f, 0x2325ae8e, 0x47a88a0a, 0x00f1eb8b, 0xc91a4908,
+    0x8e432889, 0x659f1819, 0x22c67998, 0xeb2ddb1b, 0xac74ba9a,
+    0xc8f99e1e, 0x8fa0ff9f, 0x464b5d1c, 0x01123c9d, 0x8f511414,
+    0xc8087595, 0x01e3d716, 0x46bab697, 0x22379213, 0x656ef392,
+    0xac855111, 0xebdc3090, 0xcb3e3032, 0x8c6751b3, 0x458cf330,
+    0x02d592b1, 0x6658b635, 0x2101d7b4, 0xe8ea7537, 0xafb314b6,
+    0x21f03c3f, 0x66a95dbe, 0xaf42ff3d, 0xe81b9ebc, 0x8c96ba38,
+    0xcbcfdbb9, 0x0224793a, 0x457d18bb, 0xaea1282b, 0xe9f849aa,
+    0x2013eb29, 0x674a8aa8, 0x03c7ae2c, 0x449ecfad, 0x8d756d2e,
+    0xca2c0caf, 0x446f2426, 0x033645a7, 0xcadde724, 0x8d8486a5,
+    0xe909a221, 0xae50c3a0, 0x67bb6123, 0x20e200a2, 0x267f6067,
+    0x612601e6, 0xa8cda365, 0xef94c2e4, 0x8b19e660, 0xcc4087e1,
+    0x05ab2562, 0x42f244e3, 0xccb16c6a, 0x8be80deb, 0x4203af68,
+    0x055acee9, 0x61d7ea6d, 0x268e8bec, 0xef65296f, 0xa83c48ee,
+    0x43e0787e, 0x04b919ff, 0xcd52bb7c, 0x8a0bdafd, 0xee86fe79,
+    0xa9df9ff8, 0x60343d7b, 0x276d5cfa, 0xa92e7473, 0xee7715f2,
+    0x279cb771, 0x60c5d6f0, 0x0448f274, 0x431193f5, 0x8afa3176,
+    0xcda350f7, 0xed415055, 0xaa1831d4, 0x63f39357, 0x24aaf2d6,
+    0x4027d652, 0x077eb7d3, 0xce951550, 0x89cc74d1, 0x078f5c58,
+    0x40d63dd9, 0x893d9f5a, 0xce64fedb, 0xaae9da5f, 0xedb0bbde,
+    0x245b195d, 0x630278dc, 0x88de484c, 0xcf8729cd, 0x066c8b4e,
+    0x4135eacf, 0x25b8ce4b, 0x62e1afca, 0xab0a0d49, 0xec536cc8,
+    0x62104441, 0x254925c0, 0xeca28743, 0xabfbe6c2, 0xcf76c246,
+    0x882fa3c7, 0x41c40144, 0x069d60c5, 0x4cfec0ce, 0x0ba7a14f,
+    0xc24c03cc, 0x8515624d, 0xe19846c9, 0xa6c12748, 0x6f2a85cb,
+    0x2873e44a, 0xa630ccc3, 0xe169ad42, 0x28820fc1, 0x6fdb6e40,
+    0x0b564ac4, 0x4c0f2b45, 0x85e489c6, 0xc2bde847, 0x2961d8d7,
+    0x6e38b956, 0xa7d31bd5, 0xe08a7a54, 0x84075ed0, 0xc35e3f51,
+    0x0ab59dd2, 0x4decfc53, 0xc3afd4da, 0x84f6b55b, 0x4d1d17d8,
+    0x0a447659, 0x6ec952dd, 0x2990335c, 0xe07b91df, 0xa722f05e,
+    0x87c0f0fc, 0xc099917d, 0x097233fe, 0x4e2b527f, 0x2aa676fb,
+    0x6dff177a, 0xa414b5f9, 0xe34dd478, 0x6d0efcf1, 0x2a579d70,
+    0xe3bc3ff3, 0xa4e55e72, 0xc0687af6, 0x87311b77, 0x4edab9f4,
+    0x0983d875, 0xe25fe8e5, 0xa5068964, 0x6ced2be7, 0x2bb44a66,
+    0x4f396ee2, 0x08600f63, 0xc18bade0, 0x86d2cc61, 0x0891e4e8,
+    0x4fc88569, 0x862327ea, 0xc17a466b, 0xa5f762ef, 0xe2ae036e,
+    0x2b45a1ed, 0x6c1cc06c, 0x6a81a0a9, 0x2dd8c128, 0xe43363ab,
+    0xa36a022a, 0xc7e726ae, 0x80be472f, 0x4955e5ac, 0x0e0c842d,
+    0x804faca4, 0xc716cd25, 0x0efd6fa6, 0x49a40e27, 0x2d292aa3,
+    0x6a704b22, 0xa39be9a1, 0xe4c28820, 0x0f1eb8b0, 0x4847d931,
+    0x81ac7bb2, 0xc6f51a33, 0xa2783eb7, 0xe5215f36, 0x2ccafdb5,
+    0x6b939c34, 0xe5d0b4bd, 0xa289d53c, 0x6b6277bf, 0x2c3b163e,
+    0x48b632ba, 0x0fef533b, 0xc604f1b8, 0x815d9039, 0xa1bf909b,
+    0xe6e6f11a, 0x2f0d5399, 0x68543218, 0x0cd9169c, 0x4b80771d,
+    0x826bd59e, 0xc532b41f, 0x4b719c96, 0x0c28fd17, 0xc5c35f94,
+    0x829a3e15, 0xe6171a91, 0xa14e7b10, 0x68a5d993, 0x2ffcb812,
+    0xc4208882, 0x8379e903, 0x4a924b80, 0x0dcb2a01, 0x69460e85,
+    0x2e1f6f04, 0xe7f4cd87, 0xa0adac06, 0x2eee848f, 0x69b7e50e,
+    0xa05c478d, 0xe705260c, 0x83880288, 0xc4d16309, 0x0d3ac18a,
+    0x4a63a00b},
+   {0x00000000, 0x99fd819c, 0x83f8033b, 0x1a0582a7, 0xb7f30675,
+    0x2e0e87e9, 0x340b054e, 0xadf684d2, 0xdfe50ce9, 0x46188d75,
+    0x5c1d0fd2, 0xc5e08e4e, 0x68160a9c, 0xf1eb8b00, 0xebee09a7,
+    0x7213883b, 0x0fc919d1, 0x9634984d, 0x8c311aea, 0x15cc9b76,
+    0xb83a1fa4, 0x21c79e38, 0x3bc21c9f, 0xa23f9d03, 0xd02c1538,
+    0x49d194a4, 0x53d41603, 0xca29979f, 0x67df134d, 0xfe2292d1,
+    0xe4271076, 0x7dda91ea, 0x1f9233a2, 0x866fb23e, 0x9c6a3099,
+    0x0597b105, 0xa86135d7, 0x319cb44b, 0x2b9936ec, 0xb264b770,
+    0xc0773f4b, 0x598abed7, 0x438f3c70, 0xda72bdec, 0x7784393e,
+    0xee79b8a2, 0xf47c3a05, 0x6d81bb99, 0x105b2a73, 0x89a6abef,
+    0x93a32948, 0x0a5ea8d4, 0xa7a82c06, 0x3e55ad9a, 0x24502f3d,
+    0xbdadaea1, 0xcfbe269a, 0x5643a706, 0x4c4625a1, 0xd5bba43d,
+    0x784d20ef, 0xe1b0a173, 0xfbb523d4, 0x6248a248, 0x3f246744,
+    0xa6d9e6d8, 0xbcdc647f, 0x2521e5e3, 0x88d76131, 0x112ae0ad,
+    0x0b2f620a, 0x92d2e396, 0xe0c16bad, 0x793cea31, 0x63396896,
+    0xfac4e90a, 0x57326dd8, 0xcecfec44, 0xd4ca6ee3, 0x4d37ef7f,
+    0x30ed7e95, 0xa910ff09, 0xb3157dae, 0x2ae8fc32, 0x871e78e0,
+    0x1ee3f97c, 0x04e67bdb, 0x9d1bfa47, 0xef08727c, 0x76f5f3e0,
+    0x6cf07147, 0xf50df0db, 0x58fb7409, 0xc106f595, 0xdb037732,
+    0x42fef6ae, 0x20b654e6, 0xb94bd57a, 0xa34e57dd, 0x3ab3d641,
+    0x97455293, 0x0eb8d30f, 0x14bd51a8, 0x8d40d034, 0xff53580f,
+    0x66aed993, 0x7cab5b34, 0xe556daa8, 0x48a05e7a, 0xd15ddfe6,
+    0xcb585d41, 0x52a5dcdd, 0x2f7f4d37, 0xb682ccab, 0xac874e0c,
+    0x357acf90, 0x988c4b42, 0x0171cade, 0x1b744879, 0x8289c9e5,
+    0xf09a41de, 0x6967c042, 0x736242e5, 0xea9fc379, 0x476947ab,
+    0xde94c637, 0xc4914490, 0x5d6cc50c, 0x7e48ce88, 0xe7b54f14,
+    0xfdb0cdb3, 0x644d4c2f, 0xc9bbc8fd, 0x50464961, 0x4a43cbc6,
+    0xd3be4a5a, 0xa1adc261, 0x385043fd, 0x2255c15a, 0xbba840c6,
+    0x165ec414, 0x8fa34588, 0x95a6c72f, 0x0c5b46b3, 0x7181d759,
+    0xe87c56c5, 0xf279d462, 0x6b8455fe, 0xc672d12c, 0x5f8f50b0,
+    0x458ad217, 0xdc77538b, 0xae64dbb0, 0x37995a2c, 0x2d9cd88b,
+    0xb4615917, 0x1997ddc5, 0x806a5c59, 0x9a6fdefe, 0x03925f62,
+    0x61dafd2a, 0xf8277cb6, 0xe222fe11, 0x7bdf7f8d, 0xd629fb5f,
+    0x4fd47ac3, 0x55d1f864, 0xcc2c79f8, 0xbe3ff1c3, 0x27c2705f,
+    0x3dc7f2f8, 0xa43a7364, 0x09ccf7b6, 0x9031762a, 0x8a34f48d,
+    0x13c97511, 0x6e13e4fb, 0xf7ee6567, 0xedebe7c0, 0x7416665c,
+    0xd9e0e28e, 0x401d6312, 0x5a18e1b5, 0xc3e56029, 0xb1f6e812,
+    0x280b698e, 0x320eeb29, 0xabf36ab5, 0x0605ee67, 0x9ff86ffb,
+    0x85fded5c, 0x1c006cc0, 0x416ca9cc, 0xd8912850, 0xc294aaf7,
+    0x5b692b6b, 0xf69fafb9, 0x6f622e25, 0x7567ac82, 0xec9a2d1e,
+    0x9e89a525, 0x077424b9, 0x1d71a61e, 0x848c2782, 0x297aa350,
+    0xb08722cc, 0xaa82a06b, 0x337f21f7, 0x4ea5b01d, 0xd7583181,
+    0xcd5db326, 0x54a032ba, 0xf956b668, 0x60ab37f4, 0x7aaeb553,
+    0xe35334cf, 0x9140bcf4, 0x08bd3d68, 0x12b8bfcf, 0x8b453e53,
+    0x26b3ba81, 0xbf4e3b1d, 0xa54bb9ba, 0x3cb63826, 0x5efe9a6e,
+    0xc7031bf2, 0xdd069955, 0x44fb18c9, 0xe90d9c1b, 0x70f01d87,
+    0x6af59f20, 0xf3081ebc, 0x811b9687, 0x18e6171b, 0x02e395bc,
+    0x9b1e1420, 0x36e890f2, 0xaf15116e, 0xb51093c9, 0x2ced1255,
+    0x513783bf, 0xc8ca0223, 0xd2cf8084, 0x4b320118, 0xe6c485ca,
+    0x7f390456, 0x653c86f1, 0xfcc1076d, 0x8ed28f56, 0x172f0eca,
+    0x0d2a8c6d, 0x94d70df1, 0x39218923, 0xa0dc08bf, 0xbad98a18,
+    0x23240b84},
+   {0x00000000, 0xfc919d10, 0x49203a23, 0xb5b1a733, 0x92407446,
+    0x6ed1e956, 0xdb604e65, 0x27f1d375, 0x9483e88f, 0x6812759f,
+    0xdda3d2ac, 0x21324fbc, 0x06c39cc9, 0xfa5201d9, 0x4fe3a6ea,
+    0xb3723bfa, 0x9904d11d, 0x65954c0d, 0xd024eb3e, 0x2cb5762e,
+    0x0b44a55b, 0xf7d5384b, 0x42649f78, 0xbef50268, 0x0d873992,
+    0xf116a482, 0x44a703b1, 0xb8369ea1, 0x9fc74dd4, 0x6356d0c4,
+    0xd6e777f7, 0x2a76eae7, 0x820aa239, 0x7e9b3f29, 0xcb2a981a,
+    0x37bb050a, 0x104ad67f, 0xecdb4b6f, 0x596aec5c, 0xa5fb714c,
+    0x16894ab6, 0xea18d7a6, 0x5fa97095, 0xa338ed85, 0x84c93ef0,
+    0x7858a3e0, 0xcde904d3, 0x317899c3, 0x1b0e7324, 0xe79fee34,
+    0x522e4907, 0xaebfd417, 0x894e0762, 0x75df9a72, 0xc06e3d41,
+    0x3cffa051, 0x8f8d9bab, 0x731c06bb, 0xc6ada188, 0x3a3c3c98,
+    0x1dcdefed, 0xe15c72fd, 0x54edd5ce, 0xa87c48de, 0xb4164471,
+    0x4887d961, 0xfd367e52, 0x01a7e342, 0x26563037, 0xdac7ad27,
+    0x6f760a14, 0x93e79704, 0x2095acfe, 0xdc0431ee, 0x69b596dd,
+    0x95240bcd, 0xb2d5d8b8, 0x4e4445a8, 0xfbf5e29b, 0x07647f8b,
+    0x2d12956c, 0xd183087c, 0x6432af4f, 0x98a3325f, 0xbf52e12a,
+    0x43c37c3a, 0xf672db09, 0x0ae34619, 0xb9917de3, 0x4500e0f3,
+    0xf0b147c0, 0x0c20dad0, 0x2bd109a5, 0xd74094b5, 0x62f13386,
+    0x9e60ae96, 0x361ce648, 0xca8d7b58, 0x7f3cdc6b, 0x83ad417b,
+    0xa45c920e, 0x58cd0f1e, 0xed7ca82d, 0x11ed353d, 0xa29f0ec7,
+    0x5e0e93d7, 0xebbf34e4, 0x172ea9f4, 0x30df7a81, 0xcc4ee791,
+    0x79ff40a2, 0x856eddb2, 0xaf183755, 0x5389aa45, 0xe6380d76,
+    0x1aa99066, 0x3d584313, 0xc1c9de03, 0x74787930, 0x88e9e420,
+    0x3b9bdfda, 0xc70a42ca, 0x72bbe5f9, 0x8e2a78e9, 0xa9dbab9c,
+    0x554a368c, 0xe0fb91bf, 0x1c6a0caf, 0xd82f88e1, 0x24be15f1,
+    0x910fb2c2, 0x6d9e2fd2, 0x4a6ffca7, 0xb6fe61b7, 0x034fc684,
+    0xffde5b94, 0x4cac606e, 0xb03dfd7e, 0x058c5a4d, 0xf91dc75d,
+    0xdeec1428, 0x227d8938, 0x97cc2e0b, 0x6b5db31b, 0x412b59fc,
+    0xbdbac4ec, 0x080b63df, 0xf49afecf, 0xd36b2dba, 0x2ffab0aa,
+    0x9a4b1799, 0x66da8a89, 0xd5a8b173, 0x29392c63, 0x9c888b50,
+    0x60191640, 0x47e8c535, 0xbb795825, 0x0ec8ff16, 0xf2596206,
+    0x5a252ad8, 0xa6b4b7c8, 0x130510fb, 0xef948deb, 0xc8655e9e,
+    0x34f4c38e, 0x814564bd, 0x7dd4f9ad, 0xcea6c257, 0x32375f47,
+    0x8786f874, 0x7b176564, 0x5ce6b611, 0xa0772b01, 0x15c68c32,
+    0xe9571122, 0xc321fbc5, 0x3fb066d5, 0x8a01c1e6, 0x76905cf6,
+    0x51618f83, 0xadf01293, 0x1841b5a0, 0xe4d028b0, 0x57a2134a,
+    0xab338e5a, 0x1e822969, 0xe213b479, 0xc5e2670c, 0x3973fa1c,
+    0x8cc25d2f, 0x7053c03f, 0x6c39cc90, 0x90a85180, 0x2519f6b3,
+    0xd9886ba3, 0xfe79b8d6, 0x02e825c6, 0xb75982f5, 0x4bc81fe5,
+    0xf8ba241f, 0x042bb90f, 0xb19a1e3c, 0x4d0b832c, 0x6afa5059,
+    0x966bcd49, 0x23da6a7a, 0xdf4bf76a, 0xf53d1d8d, 0x09ac809d,
+    0xbc1d27ae, 0x408cbabe, 0x677d69cb, 0x9becf4db, 0x2e5d53e8,
+    0xd2cccef8, 0x61bef502, 0x9d2f6812, 0x289ecf21, 0xd40f5231,
+    0xf3fe8144, 0x0f6f1c54, 0xbadebb67, 0x464f2677, 0xee336ea9,
+    0x12a2f3b9, 0xa713548a, 0x5b82c99a, 0x7c731aef, 0x80e287ff,
+    0x355320cc, 0xc9c2bddc, 0x7ab08626, 0x86211b36, 0x3390bc05,
+    0xcf012115, 0xe8f0f260, 0x14616f70, 0xa1d0c843, 0x5d415553,
+    0x7737bfb4, 0x8ba622a4, 0x3e178597, 0xc2861887, 0xe577cbf2,
+    0x19e656e2, 0xac57f1d1, 0x50c66cc1, 0xe3b4573b, 0x1f25ca2b,
+    0xaa946d18, 0x5605f008, 0x71f4237d, 0x8d65be6d, 0x38d4195e,
+    0xc445844e},
+   {0x00000000, 0x005c11c1, 0x00b82382, 0x00e43243, 0x01704704,
+    0x012c56c5, 0x01c86486, 0x01947547, 0x02e08e08, 0x02bc9fc9,
+    0x0258ad8a, 0x0204bc4b, 0x0390c90c, 0x03ccd8cd, 0x0328ea8e,
+    0x0374fb4f, 0x05c11c10, 0x059d0dd1, 0x05793f92, 0x05252e53,
+    0x04b15b14, 0x04ed4ad5, 0x04097896, 0x04556957, 0x07219218,
+    0x077d83d9, 0x0799b19a, 0x07c5a05b, 0x0651d51c, 0x060dc4dd,
+    0x06e9f69e, 0x06b5e75f, 0x0b823820, 0x0bde29e1, 0x0b3a1ba2,
+    0x0b660a63, 0x0af27f24, 0x0aae6ee5, 0x0a4a5ca6, 0x0a164d67,
+    0x0962b628, 0x093ea7e9, 0x09da95aa, 0x0986846b, 0x0812f12c,
+    0x084ee0ed, 0x08aad2ae, 0x08f6c36f, 0x0e432430, 0x0e1f35f1,
+    0x0efb07b2, 0x0ea71673, 0x0f336334, 0x0f6f72f5, 0x0f8b40b6,
+    0x0fd75177, 0x0ca3aa38, 0x0cffbbf9, 0x0c1b89ba, 0x0c47987b,
+    0x0dd3ed3c, 0x0d8ffcfd, 0x0d6bcebe, 0x0d37df7f, 0x17047040,
+    0x17586181, 0x17bc53c2, 0x17e04203, 0x16743744, 0x16282685,
+    0x16cc14c6, 0x16900507, 0x15e4fe48, 0x15b8ef89, 0x155cddca,
+    0x1500cc0b, 0x1494b94c, 0x14c8a88d, 0x142c9ace, 0x14708b0f,
+    0x12c56c50, 0x12997d91, 0x127d4fd2, 0x12215e13, 0x13b52b54,
+    0x13e93a95, 0x130d08d6, 0x13511917, 0x1025e258, 0x1079f399,
+    0x109dc1da, 0x10c1d01b, 0x1155a55c, 0x1109b49d, 0x11ed86de,
+    0x11b1971f, 0x1c864860, 0x1cda59a1, 0x1c3e6be2, 0x1c627a23,
+    0x1df60f64, 0x1daa1ea5, 0x1d4e2ce6, 0x1d123d27, 0x1e66c668,
+    0x1e3ad7a9, 0x1edee5ea, 0x1e82f42b, 0x1f16816c, 0x1f4a90ad,
+    0x1faea2ee, 0x1ff2b32f, 0x19475470, 0x191b45b1, 0x19ff77f2,
+    0x19a36633, 0x18371374, 0x186b02b5, 0x188f30f6, 0x18d32137,
+    0x1ba7da78, 0x1bfbcbb9, 0x1b1ff9fa, 0x1b43e83b, 0x1ad79d7c,
+    0x1a8b8cbd, 0x1a6fbefe, 0x1a33af3f, 0x2e08e080, 0x2e54f141,
+    0x2eb0c302, 0x2eecd2c3, 0x2f78a784, 0x2f24b645, 0x2fc08406,
+    0x2f9c95c7, 0x2ce86e88, 0x2cb47f49, 0x2c504d0a, 0x2c0c5ccb,
+    0x2d98298c, 0x2dc4384d, 0x2d200a0e, 0x2d7c1bcf, 0x2bc9fc90,
+    0x2b95ed51, 0x2b71df12, 0x2b2dced3, 0x2ab9bb94, 0x2ae5aa55,
+    0x2a019816, 0x2a5d89d7, 0x29297298, 0x29756359, 0x2991511a,
+    0x29cd40db, 0x2859359c, 0x2805245d, 0x28e1161e, 0x28bd07df,
+    0x258ad8a0, 0x25d6c961, 0x2532fb22, 0x256eeae3, 0x24fa9fa4,
+    0x24a68e65, 0x2442bc26, 0x241eade7, 0x276a56a8, 0x27364769,
+    0x27d2752a, 0x278e64eb, 0x261a11ac, 0x2646006d, 0x26a2322e,
+    0x26fe23ef, 0x204bc4b0, 0x2017d571, 0x20f3e732, 0x20aff6f3,
+    0x213b83b4, 0x21679275, 0x2183a036, 0x21dfb1f7, 0x22ab4ab8,
+    0x22f75b79, 0x2213693a, 0x224f78fb, 0x23db0dbc, 0x23871c7d,
+    0x23632e3e, 0x233f3fff, 0x390c90c0, 0x39508101, 0x39b4b342,
+    0x39e8a283, 0x387cd7c4, 0x3820c605, 0x38c4f446, 0x3898e587,
+    0x3bec1ec8, 0x3bb00f09, 0x3b543d4a, 0x3b082c8b, 0x3a9c59cc,
+    0x3ac0480d, 0x3a247a4e, 0x3a786b8f, 0x3ccd8cd0, 0x3c919d11,
+    0x3c75af52, 0x3c29be93, 0x3dbdcbd4, 0x3de1da15, 0x3d05e856,
+    0x3d59f997, 0x3e2d02d8, 0x3e711319, 0x3e95215a, 0x3ec9309b,
+    0x3f5d45dc, 0x3f01541d, 0x3fe5665e, 0x3fb9779f, 0x328ea8e0,
+    0x32d2b921, 0x32368b62, 0x326a9aa3, 0x33feefe4, 0x33a2fe25,
+    0x3346cc66, 0x331adda7, 0x306e26e8, 0x30323729, 0x30d6056a,
+    0x308a14ab, 0x311e61ec, 0x3142702d, 0x31a6426e, 0x31fa53af,
+    0x374fb4f0, 0x3713a531, 0x37f79772, 0x37ab86b3, 0x363ff3f4,
+    0x3663e235, 0x3687d076, 0x36dbc1b7, 0x35af3af8, 0x35f32b39,
+    0x3517197a, 0x354b08bb, 0x34df7dfc, 0x34836c3d, 0x34675e7e,
+    0x343b4fbf}};
+
+static const word_t crc_braid_big_table[][256] = {
+   {0x00000000, 0xc1115c00, 0x8223b800, 0x4332e400, 0x04477001,
+    0xc5562c01, 0x8664c801, 0x47759401, 0x088ee002, 0xc99fbc02,
+    0x8aad5802, 0x4bbc0402, 0x0cc99003, 0xcdd8cc03, 0x8eea2803,
+    0x4ffb7403, 0x101cc105, 0xd10d9d05, 0x923f7905, 0x532e2505,
+    0x145bb104, 0xd54aed04, 0x96780904, 0x57695504, 0x18922107,
+    0xd9837d07, 0x9ab19907, 0x5ba0c507, 0x1cd55106, 0xddc40d06,
+    0x9ef6e906, 0x5fe7b506, 0x2038820b, 0xe129de0b, 0xa21b3a0b,
+    0x630a660b, 0x247ff20a, 0xe56eae0a, 0xa65c4a0a, 0x674d160a,
+    0x28b66209, 0xe9a73e09, 0xaa95da09, 0x6b848609, 0x2cf11208,
+    0xede04e08, 0xaed2aa08, 0x6fc3f608, 0x3024430e, 0xf1351f0e,
+    0xb207fb0e, 0x7316a70e, 0x3463330f, 0xf5726f0f, 0xb6408b0f,
+    0x7751d70f, 0x38aaa30c, 0xf9bbff0c, 0xba891b0c, 0x7b98470c,
+    0x3cedd30d, 0xfdfc8f0d, 0xbece6b0d, 0x7fdf370d, 0x40700417,
+    0x81615817, 0xc253bc17, 0x0342e017, 0x44377416, 0x85262816,
+    0xc614cc16, 0x07059016, 0x48fee415, 0x89efb815, 0xcadd5c15,
+    0x0bcc0015, 0x4cb99414, 0x8da8c814, 0xce9a2c14, 0x0f8b7014,
+    0x506cc512, 0x917d9912, 0xd24f7d12, 0x135e2112, 0x542bb513,
+    0x953ae913, 0xd6080d13, 0x17195113, 0x58e22510, 0x99f37910,
+    0xdac19d10, 0x1bd0c110, 0x5ca55511, 0x9db40911, 0xde86ed11,
+    0x1f97b111, 0x6048861c, 0xa159da1c, 0xe26b3e1c, 0x237a621c,
+    0x640ff61d, 0xa51eaa1d, 0xe62c4e1d, 0x273d121d, 0x68c6661e,
+    0xa9d73a1e, 0xeae5de1e, 0x2bf4821e, 0x6c81161f, 0xad904a1f,
+    0xeea2ae1f, 0x2fb3f21f, 0x70544719, 0xb1451b19, 0xf277ff19,
+    0x3366a319, 0x74133718, 0xb5026b18, 0xf6308f18, 0x3721d318,
+    0x78daa71b, 0xb9cbfb1b, 0xfaf91f1b, 0x3be8431b, 0x7c9dd71a,
+    0xbd8c8b1a, 0xfebe6f1a, 0x3faf331a, 0x80e0082e, 0x41f1542e,
+    0x02c3b02e, 0xc3d2ec2e, 0x84a7782f, 0x45b6242f, 0x0684c02f,
+    0xc7959c2f, 0x886ee82c, 0x497fb42c, 0x0a4d502c, 0xcb5c0c2c,
+    0x8c29982d, 0x4d38c42d, 0x0e0a202d, 0xcf1b7c2d, 0x90fcc92b,
+    0x51ed952b, 0x12df712b, 0xd3ce2d2b, 0x94bbb92a, 0x55aae52a,
+    0x1698012a, 0xd7895d2a, 0x98722929, 0x59637529, 0x1a519129,
+    0xdb40cd29, 0x9c355928, 0x5d240528, 0x1e16e128, 0xdf07bd28,
+    0xa0d88a25, 0x61c9d625, 0x22fb3225, 0xe3ea6e25, 0xa49ffa24,
+    0x658ea624, 0x26bc4224, 0xe7ad1e24, 0xa8566a27, 0x69473627,
+    0x2a75d227, 0xeb648e27, 0xac111a26, 0x6d004626, 0x2e32a226,
+    0xef23fe26, 0xb0c44b20, 0x71d51720, 0x32e7f320, 0xf3f6af20,
+    0xb4833b21, 0x75926721, 0x36a08321, 0xf7b1df21, 0xb84aab22,
+    0x795bf722, 0x3a691322, 0xfb784f22, 0xbc0ddb23, 0x7d1c8723,
+    0x3e2e6323, 0xff3f3f23, 0xc0900c39, 0x01815039, 0x42b3b439,
+    0x83a2e839, 0xc4d77c38, 0x05c62038, 0x46f4c438, 0x87e59838,
+    0xc81eec3b, 0x090fb03b, 0x4a3d543b, 0x8b2c083b, 0xcc599c3a,
+    0x0d48c03a, 0x4e7a243a, 0x8f6b783a, 0xd08ccd3c, 0x119d913c,
+    0x52af753c, 0x93be293c, 0xd4cbbd3d, 0x15dae13d, 0x56e8053d,
+    0x97f9593d, 0xd8022d3e, 0x1913713e, 0x5a21953e, 0x9b30c93e,
+    0xdc455d3f, 0x1d54013f, 0x5e66e53f, 0x9f77b93f, 0xe0a88e32,
+    0x21b9d232, 0x628b3632, 0xa39a6a32, 0xe4effe33, 0x25fea233,
+    0x66cc4633, 0xa7dd1a33, 0xe8266e30, 0x29373230, 0x6a05d630,
+    0xab148a30, 0xec611e31, 0x2d704231, 0x6e42a631, 0xaf53fa31,
+    0xf0b44f37, 0x31a51337, 0x7297f737, 0xb386ab37, 0xf4f33f36,
+    0x35e26336, 0x76d08736, 0xb7c1db36, 0xf83aaf35, 0x392bf335,
+    0x7a191735, 0xbb084b35, 0xfc7ddf34, 0x3d6c8334, 0x7e5e6734,
+    0xbf4f3b34},
+   {0x00000000, 0x109d91fc, 0x233a2049, 0x33a7b1b5, 0x46744092,
+    0x56e9d16e, 0x654e60db, 0x75d3f127, 0x8fe88394, 0x9f751268,
+    0xacd2a3dd, 0xbc4f3221, 0xc99cc306, 0xd90152fa, 0xeaa6e34f,
+    0xfa3b72b3, 0x1dd10499, 0x0d4c9565, 0x3eeb24d0, 0x2e76b52c,
+    0x5ba5440b, 0x4b38d5f7, 0x789f6442, 0x6802f5be, 0x9239870d,
+    0x82a416f1, 0xb103a744, 0xa19e36b8, 0xd44dc79f, 0xc4d05663,
+    0xf777e7d6, 0xe7ea762a, 0x39a20a82, 0x293f9b7e, 0x1a982acb,
+    0x0a05bb37, 0x7fd64a10, 0x6f4bdbec, 0x5cec6a59, 0x4c71fba5,
+    0xb64a8916, 0xa6d718ea, 0x9570a95f, 0x85ed38a3, 0xf03ec984,
+    0xe0a35878, 0xd304e9cd, 0xc3997831, 0x24730e1b, 0x34ee9fe7,
+    0x07492e52, 0x17d4bfae, 0x62074e89, 0x729adf75, 0x413d6ec0,
+    0x51a0ff3c, 0xab9b8d8f, 0xbb061c73, 0x88a1adc6, 0x983c3c3a,
+    0xedefcd1d, 0xfd725ce1, 0xced5ed54, 0xde487ca8, 0x714416b4,
+    0x61d98748, 0x527e36fd, 0x42e3a701, 0x37305626, 0x27adc7da,
+    0x140a766f, 0x0497e793, 0xfeac9520, 0xee3104dc, 0xdd96b569,
+    0xcd0b2495, 0xb8d8d5b2, 0xa845444e, 0x9be2f5fb, 0x8b7f6407,
+    0x6c95122d, 0x7c0883d1, 0x4faf3264, 0x5f32a398, 0x2ae152bf,
+    0x3a7cc343, 0x09db72f6, 0x1946e30a, 0xe37d91b9, 0xf3e00045,
+    0xc047b1f0, 0xd0da200c, 0xa509d12b, 0xb59440d7, 0x8633f162,
+    0x96ae609e, 0x48e61c36, 0x587b8dca, 0x6bdc3c7f, 0x7b41ad83,
+    0x0e925ca4, 0x1e0fcd58, 0x2da87ced, 0x3d35ed11, 0xc70e9fa2,
+    0xd7930e5e, 0xe434bfeb, 0xf4a92e17, 0x817adf30, 0x91e74ecc,
+    0xa240ff79, 0xb2dd6e85, 0x553718af, 0x45aa8953, 0x760d38e6,
+    0x6690a91a, 0x1343583d, 0x03dec9c1, 0x30797874, 0x20e4e988,
+    0xdadf9b3b, 0xca420ac7, 0xf9e5bb72, 0xe9782a8e, 0x9cabdba9,
+    0x8c364a55, 0xbf91fbe0, 0xaf0c6a1c, 0xe1882fd8, 0xf115be24,
+    0xc2b20f91, 0xd22f9e6d, 0xa7fc6f4a, 0xb761feb6, 0x84c64f03,
+    0x945bdeff, 0x6e60ac4c, 0x7efd3db0, 0x4d5a8c05, 0x5dc71df9,
+    0x2814ecde, 0x38897d22, 0x0b2ecc97, 0x1bb35d6b, 0xfc592b41,
+    0xecc4babd, 0xdf630b08, 0xcffe9af4, 0xba2d6bd3, 0xaab0fa2f,
+    0x99174b9a, 0x898ada66, 0x73b1a8d5, 0x632c3929, 0x508b889c,
+    0x40161960, 0x35c5e847, 0x255879bb, 0x16ffc80e, 0x066259f2,
+    0xd82a255a, 0xc8b7b4a6, 0xfb100513, 0xeb8d94ef, 0x9e5e65c8,
+    0x8ec3f434, 0xbd644581, 0xadf9d47d, 0x57c2a6ce, 0x475f3732,
+    0x74f88687, 0x6465177b, 0x11b6e65c, 0x012b77a0, 0x328cc615,
+    0x221157e9, 0xc5fb21c3, 0xd566b03f, 0xe6c1018a, 0xf65c9076,
+    0x838f6151, 0x9312f0ad, 0xa0b54118, 0xb028d0e4, 0x4a13a257,
+    0x5a8e33ab, 0x6929821e, 0x79b413e2, 0x0c67e2c5, 0x1cfa7339,
+    0x2f5dc28c, 0x3fc05370, 0x90cc396c, 0x8051a890, 0xb3f61925,
+    0xa36b88d9, 0xd6b879fe, 0xc625e802, 0xf58259b7, 0xe51fc84b,
+    0x1f24baf8, 0x0fb92b04, 0x3c1e9ab1, 0x2c830b4d, 0x5950fa6a,
+    0x49cd6b96, 0x7a6ada23, 0x6af74bdf, 0x8d1d3df5, 0x9d80ac09,
+    0xae271dbc, 0xbeba8c40, 0xcb697d67, 0xdbf4ec9b, 0xe8535d2e,
+    0xf8ceccd2, 0x02f5be61, 0x12682f9d, 0x21cf9e28, 0x31520fd4,
+    0x4481fef3, 0x541c6f0f, 0x67bbdeba, 0x77264f46, 0xa96e33ee,
+    0xb9f3a212, 0x8a5413a7, 0x9ac9825b, 0xef1a737c, 0xff87e280,
+    0xcc205335, 0xdcbdc2c9, 0x2686b07a, 0x361b2186, 0x05bc9033,
+    0x152101cf, 0x60f2f0e8, 0x706f6114, 0x43c8d0a1, 0x5355415d,
+    0xb4bf3777, 0xa422a68b, 0x9785173e, 0x871886c2, 0xf2cb77e5,
+    0xe256e619, 0xd1f157ac, 0xc16cc650, 0x3b57b4e3, 0x2bca251f,
+    0x186d94aa, 0x08f00556, 0x7d23f471, 0x6dbe658d, 0x5e19d438,
+    0x4e8445c4},
+   {0x00000000, 0x9c81fd99, 0x3b03f883, 0xa782051a, 0x7506f3b7,
+    0xe9870e2e, 0x4e050b34, 0xd284f6ad, 0xe90ce5df, 0x758d1846,
+    0xd20f1d5c, 0x4e8ee0c5, 0x9c0a1668, 0x008bebf1, 0xa709eeeb,
+    0x3b881372, 0xd119c90f, 0x4d983496, 0xea1a318c, 0x769bcc15,
+    0xa41f3ab8, 0x389ec721, 0x9f1cc23b, 0x039d3fa2, 0x38152cd0,
+    0xa494d149, 0x0316d453, 0x9f9729ca, 0x4d13df67, 0xd19222fe,
+    0x761027e4, 0xea91da7d, 0xa233921f, 0x3eb26f86, 0x99306a9c,
+    0x05b19705, 0xd73561a8, 0x4bb49c31, 0xec36992b, 0x70b764b2,
+    0x4b3f77c0, 0xd7be8a59, 0x703c8f43, 0xecbd72da, 0x3e398477,
+    0xa2b879ee, 0x053a7cf4, 0x99bb816d, 0x732a5b10, 0xefaba689,
+    0x4829a393, 0xd4a85e0a, 0x062ca8a7, 0x9aad553e, 0x3d2f5024,
+    0xa1aeadbd, 0x9a26becf, 0x06a74356, 0xa125464c, 0x3da4bbd5,
+    0xef204d78, 0x73a1b0e1, 0xd423b5fb, 0x48a24862, 0x4467243f,
+    0xd8e6d9a6, 0x7f64dcbc, 0xe3e52125, 0x3161d788, 0xade02a11,
+    0x0a622f0b, 0x96e3d292, 0xad6bc1e0, 0x31ea3c79, 0x96683963,
+    0x0ae9c4fa, 0xd86d3257, 0x44eccfce, 0xe36ecad4, 0x7fef374d,
+    0x957eed30, 0x09ff10a9, 0xae7d15b3, 0x32fce82a, 0xe0781e87,
+    0x7cf9e31e, 0xdb7be604, 0x47fa1b9d, 0x7c7208ef, 0xe0f3f576,
+    0x4771f06c, 0xdbf00df5, 0x0974fb58, 0x95f506c1, 0x327703db,
+    0xaef6fe42, 0xe654b620, 0x7ad54bb9, 0xdd574ea3, 0x41d6b33a,
+    0x93524597, 0x0fd3b80e, 0xa851bd14, 0x34d0408d, 0x0f5853ff,
+    0x93d9ae66, 0x345bab7c, 0xa8da56e5, 0x7a5ea048, 0xe6df5dd1,
+    0x415d58cb, 0xdddca552, 0x374d7f2f, 0xabcc82b6, 0x0c4e87ac,
+    0x90cf7a35, 0x424b8c98, 0xdeca7101, 0x7948741b, 0xe5c98982,
+    0xde419af0, 0x42c06769, 0xe5426273, 0x79c39fea, 0xab476947,
+    0x37c694de, 0x904491c4, 0x0cc56c5d, 0x88ce487e, 0x144fb5e7,
+    0xb3cdb0fd, 0x2f4c4d64, 0xfdc8bbc9, 0x61494650, 0xc6cb434a,
+    0x5a4abed3, 0x61c2ada1, 0xfd435038, 0x5ac15522, 0xc640a8bb,
+    0x14c45e16, 0x8845a38f, 0x2fc7a695, 0xb3465b0c, 0x59d78171,
+    0xc5567ce8, 0x62d479f2, 0xfe55846b, 0x2cd172c6, 0xb0508f5f,
+    0x17d28a45, 0x8b5377dc, 0xb0db64ae, 0x2c5a9937, 0x8bd89c2d,
+    0x175961b4, 0xc5dd9719, 0x595c6a80, 0xfede6f9a, 0x625f9203,
+    0x2afdda61, 0xb67c27f8, 0x11fe22e2, 0x8d7fdf7b, 0x5ffb29d6,
+    0xc37ad44f, 0x64f8d155, 0xf8792ccc, 0xc3f13fbe, 0x5f70c227,
+    0xf8f2c73d, 0x64733aa4, 0xb6f7cc09, 0x2a763190, 0x8df4348a,
+    0x1175c913, 0xfbe4136e, 0x6765eef7, 0xc0e7ebed, 0x5c661674,
+    0x8ee2e0d9, 0x12631d40, 0xb5e1185a, 0x2960e5c3, 0x12e8f6b1,
+    0x8e690b28, 0x29eb0e32, 0xb56af3ab, 0x67ee0506, 0xfb6ff89f,
+    0x5cedfd85, 0xc06c001c, 0xcca96c41, 0x502891d8, 0xf7aa94c2,
+    0x6b2b695b, 0xb9af9ff6, 0x252e626f, 0x82ac6775, 0x1e2d9aec,
+    0x25a5899e, 0xb9247407, 0x1ea6711d, 0x82278c84, 0x50a37a29,
+    0xcc2287b0, 0x6ba082aa, 0xf7217f33, 0x1db0a54e, 0x813158d7,
+    0x26b35dcd, 0xba32a054, 0x68b656f9, 0xf437ab60, 0x53b5ae7a,
+    0xcf3453e3, 0xf4bc4091, 0x683dbd08, 0xcfbfb812, 0x533e458b,
+    0x81bab326, 0x1d3b4ebf, 0xbab94ba5, 0x2638b63c, 0x6e9afe5e,
+    0xf21b03c7, 0x559906dd, 0xc918fb44, 0x1b9c0de9, 0x871df070,
+    0x209ff56a, 0xbc1e08f3, 0x87961b81, 0x1b17e618, 0xbc95e302,
+    0x20141e9b, 0xf290e836, 0x6e1115af, 0xc99310b5, 0x5512ed2c,
+    0xbf833751, 0x2302cac8, 0x8480cfd2, 0x1801324b, 0xca85c4e6,
+    0x5604397f, 0xf1863c65, 0x6d07c1fc, 0x568fd28e, 0xca0e2f17,
+    0x6d8c2a0d, 0xf10dd794, 0x23892139, 0xbf08dca0, 0x188ad9ba,
+    0x840b2423},
+   {0x00000000, 0x81615947, 0x02c3b28e, 0x83a2ebc9, 0x078666ad,
+    0x86e73fea, 0x0545d423, 0x84248d64, 0x0d0cceea, 0x8c6d97ad,
+    0x0fcf7c64, 0x8eae2523, 0x0a8aa847, 0x8bebf100, 0x08491ac9,
+    0x8928438e, 0x19189f65, 0x9879c622, 0x1bdb2deb, 0x9aba74ac,
+    0x1e9ef9c8, 0x9fffa08f, 0x1c5d4b46, 0x9d3c1201, 0x1414518f,
+    0x957508c8, 0x16d7e301, 0x97b6ba46, 0x13923722, 0x92f36e65,
+    0x115185ac, 0x9030dceb, 0x32303ecb, 0xb351678c, 0x30f38c45,
+    0xb192d502, 0x35b65866, 0xb4d70121, 0x3775eae8, 0xb614b3af,
+    0x3f3cf021, 0xbe5da966, 0x3dff42af, 0xbc9e1be8, 0x38ba968c,
+    0xb9dbcfcb, 0x3a792402, 0xbb187d45, 0x2b28a1ae, 0xaa49f8e9,
+    0x29eb1320, 0xa88a4a67, 0x2caec703, 0xadcf9e44, 0x2e6d758d,
+    0xaf0c2cca, 0x26246f44, 0xa7453603, 0x24e7ddca, 0xa586848d,
+    0x21a209e9, 0xa0c350ae, 0x2361bb67, 0xa200e220, 0x67607f26,
+    0xe6012661, 0x65a3cda8, 0xe4c294ef, 0x60e6198b, 0xe18740cc,
+    0x6225ab05, 0xe344f242, 0x6a6cb1cc, 0xeb0de88b, 0x68af0342,
+    0xe9ce5a05, 0x6dead761, 0xec8b8e26, 0x6f2965ef, 0xee483ca8,
+    0x7e78e043, 0xff19b904, 0x7cbb52cd, 0xfdda0b8a, 0x79fe86ee,
+    0xf89fdfa9, 0x7b3d3460, 0xfa5c6d27, 0x73742ea9, 0xf21577ee,
+    0x71b79c27, 0xf0d6c560, 0x74f24804, 0xf5931143, 0x7631fa8a,
+    0xf750a3cd, 0x555041ed, 0xd43118aa, 0x5793f363, 0xd6f2aa24,
+    0x52d62740, 0xd3b77e07, 0x501595ce, 0xd174cc89, 0x585c8f07,
+    0xd93dd640, 0x5a9f3d89, 0xdbfe64ce, 0x5fdae9aa, 0xdebbb0ed,
+    0x5d195b24, 0xdc780263, 0x4c48de88, 0xcd2987cf, 0x4e8b6c06,
+    0xcfea3541, 0x4bceb825, 0xcaafe162, 0x490d0aab, 0xc86c53ec,
+    0x41441062, 0xc0254925, 0x4387a2ec, 0xc2e6fbab, 0x46c276cf,
+    0xc7a32f88, 0x4401c441, 0xc5609d06, 0xcec0fe4c, 0x4fa1a70b,
+    0xcc034cc2, 0x4d621585, 0xc94698e1, 0x4827c1a6, 0xcb852a6f,
+    0x4ae47328, 0xc3cc30a6, 0x42ad69e1, 0xc10f8228, 0x406edb6f,
+    0xc44a560b, 0x452b0f4c, 0xc689e485, 0x47e8bdc2, 0xd7d86129,
+    0x56b9386e, 0xd51bd3a7, 0x547a8ae0, 0xd05e0784, 0x513f5ec3,
+    0xd29db50a, 0x53fcec4d, 0xdad4afc3, 0x5bb5f684, 0xd8171d4d,
+    0x5976440a, 0xdd52c96e, 0x5c339029, 0xdf917be0, 0x5ef022a7,
+    0xfcf0c087, 0x7d9199c0, 0xfe337209, 0x7f522b4e, 0xfb76a62a,
+    0x7a17ff6d, 0xf9b514a4, 0x78d44de3, 0xf1fc0e6d, 0x709d572a,
+    0xf33fbce3, 0x725ee5a4, 0xf67a68c0, 0x771b3187, 0xf4b9da4e,
+    0x75d88309, 0xe5e85fe2, 0x648906a5, 0xe72bed6c, 0x664ab42b,
+    0xe26e394f, 0x630f6008, 0xe0ad8bc1, 0x61ccd286, 0xe8e49108,
+    0x6985c84f, 0xea272386, 0x6b467ac1, 0xef62f7a5, 0x6e03aee2,
+    0xeda1452b, 0x6cc01c6c, 0xa9a0816a, 0x28c1d82d, 0xab6333e4,
+    0x2a026aa3, 0xae26e7c7, 0x2f47be80, 0xace55549, 0x2d840c0e,
+    0xa4ac4f80, 0x25cd16c7, 0xa66ffd0e, 0x270ea449, 0xa32a292d,
+    0x224b706a, 0xa1e99ba3, 0x2088c2e4, 0xb0b81e0f, 0x31d94748,
+    0xb27bac81, 0x331af5c6, 0xb73e78a2, 0x365f21e5, 0xb5fdca2c,
+    0x349c936b, 0xbdb4d0e5, 0x3cd589a2, 0xbf77626b, 0x3e163b2c,
+    0xba32b648, 0x3b53ef0f, 0xb8f104c6, 0x39905d81, 0x9b90bfa1,
+    0x1af1e6e6, 0x99530d2f, 0x18325468, 0x9c16d90c, 0x1d77804b,
+    0x9ed56b82, 0x1fb432c5, 0x969c714b, 0x17fd280c, 0x945fc3c5,
+    0x153e9a82, 0x911a17e6, 0x107b4ea1, 0x93d9a568, 0x12b8fc2f,
+    0x828820c4, 0x03e97983, 0x804b924a, 0x012acb0d, 0x850e4669,
+    0x046f1f2e, 0x87cdf4e7, 0x06acada0, 0x8f84ee2e, 0x0ee5b769,
+    0x8d475ca0, 0x0c2605e7, 0x88028883, 0x0963d1c4, 0x8ac13a0d,
+    0x0ba0634a}};
+
+#endif
+
+#endif
+
+#endif
+
+static const crc_t x2n_table[] = {
+    0x40000000, 0x20000000, 0x08000000, 0x00800000, 0x00008000,
+    0xd8018001, 0xf8818001, 0xf0810001, 0x28008000, 0xd0818001,
+    0xf8010001, 0x28800000, 0x08808000, 0xd8810001, 0x20808000,
+    0xd0010001, 0x20000000, 0x08000000, 0x00800000, 0x00008000,
+    0xd8018001, 0xf8818001, 0xf0810001, 0x28008000, 0xd0818001,
+    0xf8010001, 0x28800000, 0x08808000, 0xd8810001, 0x20808000,
+    0xd0010001, 0x20000000};
diff --git a/src/fifo.c b/src/utils/fifo.c
similarity index 78%
rename from src/fifo.c
rename to src/utils/fifo.c
index 72084e11b..8afb5640f 100644
--- a/src/fifo.c
+++ b/src/utils/fifo.c
@@ -10,7 +10,7 @@
  *
  * Authors: Miran Grca, <mgrca8@gmail.com>
  *
- *          Copyright 2023 Miran Grca.
+ *          Copyright 2023-2025 Miran Grca.
  */
 #include <stdarg.h>
 #include <stdint.h>
@@ -72,7 +72,32 @@ fifo_write(uint8_t val, void *priv)
         fifo->overrun = 1;
     else {
         fifo->buf[fifo->end] = val;
-        fifo->end            = (fifo->end + 1) & 0x0f;
+        fifo->end            = (fifo->end + 1) % fifo->len;
+
+        if (fifo->end == fifo->start)
+            fifo->full = 1;
+
+        fifo->empty = 0;
+
+        if (fifo_get_count(fifo) >= fifo->trigger_len)
+            fifo->ready = 1;
+    }
+}
+
+void
+fifo_write_tagged(uint8_t tag, uint8_t val, void *priv)
+{
+    fifo_t *fifo = (fifo_t *) priv;
+
+    fifo->d_full  = fifo->d_empty = 0;
+    fifo->d_ready = fifo->d_overrun = 0;
+
+    if (fifo->full)
+        fifo->overrun = 1;
+    else {
+        fifo->buf[fifo->end] = val;
+        fifo->tag[fifo->end] = tag;
+        fifo->end            = (fifo->end + 1) % fifo->len;
 
         if (fifo->end == fifo->start)
             fifo->full = 1;
@@ -99,7 +124,46 @@ fifo_write_evt(uint8_t val, void *priv)
             fifo->d_overrun_evt(fifo->priv);
     } else {
         fifo->buf[fifo->end] = val;
-        fifo->end            = (fifo->end + 1) & 0x0f;
+        fifo->end            = (fifo->end + 1) % fifo->len;
+
+        if (fifo->end == fifo->start) {
+            fifo->d_full = (fifo->full != 1);
+            fifo->full   = 1;
+            if (fifo->d_full && (fifo->d_full_evt != NULL))
+                fifo->d_full_evt(fifo->priv);
+        }
+
+        fifo->d_empty = (fifo->empty != 0);
+        fifo->empty = 0;
+        if (fifo->d_empty && (fifo->d_empty_evt != NULL))
+            fifo->d_empty_evt(fifo->priv);
+
+        if (fifo_get_count(fifo) >= fifo->trigger_len) {
+            fifo->d_ready = (fifo->ready != 1);
+            fifo->ready   = 1;
+            if (fifo->d_ready && (fifo->d_ready_evt != NULL))
+                fifo->d_ready_evt(fifo->priv);
+        }
+    }
+}
+
+void
+fifo_write_evt_tagged(uint8_t tag, uint8_t val, void *priv)
+{
+    fifo_t *fifo = (fifo_t *) priv;
+
+    fifo->d_full  = fifo->d_empty = 0;
+    fifo->d_ready = fifo->d_overrun = 0;
+
+    if (fifo->full) {
+        fifo->d_overrun = (fifo->overrun != 1);
+        fifo->overrun   = 1;
+        if (fifo->d_overrun && (fifo->d_overrun_evt != NULL))
+            fifo->d_overrun_evt(fifo->priv);
+    } else {
+        fifo->buf[fifo->end] = val;
+        fifo->tag[fifo->end] = tag;
+        fifo->end            = (fifo->end + 1) % fifo->len;
 
         if (fifo->end == fifo->start) {
             fifo->d_full = (fifo->full != 1);
@@ -131,7 +195,7 @@ fifo_read(void *priv)
 
     if (!fifo->empty) {
         ret         = fifo->buf[fifo->start];
-        fifo->start = (fifo->start + 1) & 0x0f;
+        fifo->start = (fifo->start + 1) % fifo->len;
 
         fifo->full = 0;
 
@@ -148,6 +212,35 @@ fifo_read(void *priv)
     return ret;
 }
 
+uint8_t
+fifo_read_tagged(uint8_t *tag, void *priv)
+{
+    fifo_t *fifo = (fifo_t *) priv;
+    uint8_t ret  = 0x00;
+    int     count;
+
+    if (!fifo->empty) {
+        ret         = fifo->buf[fifo->start];
+        *tag        = fifo->tag[fifo->start];
+
+        fifo->start = (fifo->start + 1) % fifo->len;
+
+        fifo->full = 0;
+
+        count = fifo_get_count(fifo);
+
+        if (count < fifo->trigger_len) {
+            fifo->ready = 0;
+
+            if (count == 0)
+                fifo->empty = 1;
+        }
+    } else
+        *tag        = 0x00;
+
+    return ret;
+}
+
 uint8_t
 fifo_read_evt(void *priv)
 {
@@ -160,7 +253,7 @@ fifo_read_evt(void *priv)
 
     if (!fifo->empty) {
         ret         = fifo->buf[fifo->start];
-        fifo->start = (fifo->start + 1) & 0x0f;
+        fifo->start = (fifo->start + 1) % fifo->len;
 
         fifo->d_full = (fifo->full != 0);
         fifo->full   = 0;
@@ -187,6 +280,48 @@ fifo_read_evt(void *priv)
     return ret;
 }
 
+uint8_t
+fifo_read_evt_tagged(uint8_t *tag, void *priv)
+{
+    fifo_t *fifo = (fifo_t *) priv;
+    uint8_t ret = 0x00;
+    int     count;
+
+    fifo->d_full = fifo->d_empty = 0;
+    fifo->d_ready = 0;
+
+    if (!fifo->empty) {
+        ret         = fifo->buf[fifo->start];
+        *tag        = fifo->tag[fifo->start];
+
+        fifo->start = (fifo->start + 1) % fifo->len;
+
+        fifo->d_full = (fifo->full != 0);
+        fifo->full   = 0;
+        if (fifo->d_full && (fifo->d_full_evt != NULL))
+            fifo->d_full_evt(fifo->priv);
+
+        count = fifo_get_count(fifo);
+
+        if (count < fifo->trigger_len) {
+            fifo->d_ready = (fifo->ready != 0);
+            fifo->ready   = 0;
+            if (fifo->d_ready && (fifo->d_ready_evt != NULL))
+                fifo->d_ready_evt(fifo->priv);
+
+            if (count == 0) {
+                fifo->d_empty = (fifo->empty != 1);
+                fifo->empty   = 1;
+                if (fifo->d_empty && (fifo->d_empty_evt != NULL))
+                    fifo->d_empty_evt(fifo->priv);
+            }
+        }
+    } else
+        *tag        = 0x00;
+
+    return ret;
+}
+
 void
 fifo_clear_overrun(void *priv)
 {
diff --git a/src/fifo8.c b/src/utils/fifo8.c
similarity index 58%
rename from src/fifo8.c
rename to src/utils/fifo8.c
index feef0deb2..9c73b4e82 100644
--- a/src/fifo8.c
+++ b/src/utils/fifo8.c
@@ -21,14 +21,19 @@
 #include <86box/86box.h>
 #include <86box/fifo8.h>
 
+void
+fifo8_reset(Fifo8 *fifo)
+{
+    fifo->num  = 0;
+    fifo->head = 0;
+}
+
 void
 fifo8_create(Fifo8 *fifo, uint32_t capacity)
 {
-    fifo->data = (uint8_t *) malloc(capacity);
-    memset(fifo->data, 0, capacity);
+    fifo->data = (uint8_t *) calloc(1, capacity);
     fifo->capacity = capacity;
-    fifo->head     = 0;
-    fifo->num      = 0;
+    fifo8_reset(fifo);
 }
 
 void
@@ -54,7 +59,7 @@ fifo8_push_all(Fifo8 *fifo, const uint8_t *data, uint32_t num)
     uint32_t start;
     uint32_t avail;
 
-    assert(fifo->num + num <= fifo->capacity);
+    assert((fifo->num + num) <= fifo->capacity);
 
     start = (fifo->head + fifo->num) % fifo->capacity;
 
@@ -81,25 +86,72 @@ fifo8_pop(Fifo8 *fifo)
     return ret;
 }
 
-const uint8_t *
-fifo8_pop_buf(Fifo8 *fifo, uint32_t max, uint32_t *num)
+static const uint8_t
+*fifo8_peekpop_buf(Fifo8 *fifo, uint32_t max, uint32_t *numptr, int do_pop)
 {
-    const uint8_t *ret;
+    uint8_t *ret;
+    uint32_t num;
+
+    assert((max > 0) && (max <= fifo->num));
+    num = MIN(fifo->capacity - fifo->head, max);
+    ret = &fifo->data[fifo->head];
+
+    if (do_pop) {
+        fifo->head += num;
+        fifo->head %= fifo->capacity;
+        fifo->num -= num;
+    }
+    if (numptr)
+        *numptr = num;
 
-    assert(max > 0 && max <= fifo->num);
-    *num = MIN(fifo->capacity - fifo->head, max);
-    ret  = &fifo->data[fifo->head];
-    fifo->head += *num;
-    fifo->head %= fifo->capacity;
-    fifo->num -= *num;
     return ret;
 }
 
-void
-fifo8_reset(Fifo8 *fifo)
+const uint8_t
+*fifo8_peek_bufptr(Fifo8 *fifo, uint32_t max, uint32_t *numptr)
 {
-    fifo->num  = 0;
-    fifo->head = 0;
+    return fifo8_peekpop_buf(fifo, max, numptr, 0);
+}
+
+const uint8_t
+*fifo8_pop_bufptr(Fifo8 *fifo, uint32_t max, uint32_t *numptr)
+{
+    return fifo8_peekpop_buf(fifo, max, numptr, 1);
+}
+
+uint32_t
+fifo8_pop_buf(Fifo8 *fifo, uint8_t *dest, uint32_t destlen)
+{
+    const uint8_t *buf;
+    uint32_t n1, n2 = 0;
+    uint32_t len;
+
+    if (destlen == 0)
+        return 0;
+
+    len = destlen;
+    buf = fifo8_pop_bufptr(fifo, len, &n1);
+    if (dest)
+        memcpy(dest, buf, n1);
+
+    /* Add FIFO wraparound if needed */
+    len -= n1;
+    len = MIN(len, fifo8_num_used(fifo));
+    if (len) {
+        buf = fifo8_pop_bufptr(fifo, len, &n2);
+        if (dest) {
+            memcpy(&dest[n1], buf, n2);
+        }
+    }
+
+    return n1 + n2;
+}
+
+void
+fifo8_drop(Fifo8 *fifo, uint32_t len)
+{
+    len -= fifo8_pop_buf(fifo, NULL, len);
+    assert(len == 0);
 }
 
 int
diff --git a/src/ini.c b/src/utils/ini.c
similarity index 76%
rename from src/ini.c
rename to src/utils/ini.c
index a792d356b..47e792594 100644
--- a/src/ini.c
+++ b/src/utils/ini.c
@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
+#include <wctype.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/ini.h>
@@ -157,6 +158,22 @@ find_entry(section_t *section, const char *name)
     return (NULL);
 }
 
+int
+ini_has_entry(ini_section_t self, const char *name)
+{
+    section_t     *section = (section_t *) self;
+    const entry_t *entry;
+
+    if (section == NULL)
+        return 0;
+
+    entry = find_entry(section, name);
+    if (entry == NULL)
+        return 0;
+    
+    return 1;
+}
+
 static int
 entries_num(section_t *section)
 {
@@ -181,7 +198,45 @@ delete_section_if_empty(list_t *head, section_t *section)
     if (section == NULL)
         return;
 
-    if (entries_num(section) == 0) {
+    int     n = entries_num(section);
+
+    if (n > 0) {
+        int      i      = 0;
+        entry_t *i_ent = (entry_t *) section->entry_head.next;
+
+        while (i_ent != NULL) {
+            int      i_nlen = strlen(i_ent->name);
+            entry_t* i_next = (entry_t *) i_ent->list.next;
+
+            if (i_nlen > 0) {
+                int      j      = 0;
+                entry_t *j_ent = (entry_t *) section->entry_head.next;
+
+                while (j_ent != NULL) {
+                    int      j_nlen = strlen(j_ent->name);
+                    entry_t* j_next = (entry_t *) j_ent->list.next;
+                    if (j_nlen > 0) {
+                        if ((j != i) && (strcmp(j_ent->name, i_ent->name) > 0)) {
+                            entry_t t_ent = { 0 };
+                            memcpy(&t_ent, j_ent, sizeof(entry_t));
+                            /* J: Contents of I, list of J */
+                            memcpy(j_ent->name, i_ent->name, sizeof(entry_t) - sizeof(i_ent->list));
+                            /* I: Contents of J, list of I */
+                            memcpy(i_ent->name, t_ent.name, sizeof(entry_t) - sizeof(i_ent->list));
+                        }
+
+                        j++;
+                    }
+
+                    j_ent = (entry_t *) j_next;
+                }
+
+                i++;
+            }
+
+            i_ent = (entry_t *) i_next;
+        }
+    } else {
         list_delete(&section->list, head);
         free(section);
     }
@@ -199,9 +254,8 @@ ini_delete_section_if_empty(ini_t ini, ini_section_t section)
 static section_t *
 create_section(list_t *head, const char *name)
 {
-    section_t *ns = malloc(sizeof(section_t));
+    section_t *ns = calloc(1, sizeof(section_t));
 
-    memset(ns, 0x00, sizeof(section_t));
     memcpy(ns->name, name, strlen(name) + 1);
     list_add(&ns->list, head);
 
@@ -224,9 +278,8 @@ ini_find_or_create_section(ini_t ini, const char *name)
 static entry_t *
 create_entry(section_t *section, const char *name)
 {
-    entry_t *ne = malloc(sizeof(entry_t));
+    entry_t *ne = calloc(1, sizeof(entry_t));
 
-    memset(ne, 0x00, sizeof(entry_t));
     memcpy(ne->name, name, strlen(name) + 1);
     list_add(&ne->list, &section->entry_head);
 
@@ -263,7 +316,7 @@ ini_close(ini_t ini)
     free(list);
 }
 
-static int
+int
 ini_detect_bom(const char *fn)
 {
     FILE         *fp;
@@ -335,11 +388,8 @@ ini_read(const char *fn)
     if (fp == NULL)
         return NULL;
 
-    head = malloc(sizeof(list_t));
-    memset(head, 0x00, sizeof(list_t));
-
-    sec = malloc(sizeof(section_t));
-    memset(sec, 0x00, sizeof(section_t));
+    head = calloc(1, sizeof(list_t));
+    sec = calloc(1, sizeof(section_t));
 
     list_add(&sec->list, head);
     if (bom)
@@ -420,7 +470,7 @@ ini_read(const char *fn)
         d = c;
 
         /* Allocate a new variable entry.. */
-        ne = malloc(sizeof(entry_t));
+        ne = calloc(1, sizeof(entry_t));
         memset(ne, 0x00, sizeof(entry_t));
         memcpy(ne->name, ename, 128);
         wcsncpy(ne->wdata, &buff[d], sizeof_w(ne->wdata) - 1);
@@ -496,6 +546,103 @@ ini_write(ini_t ini, const char *fn)
     (void) fclose(fp);
 }
 
+/* Wide-character version of "trim" */
+wchar_t *
+trim_w(wchar_t *str)
+{
+    size_t  len     = 0;
+    wchar_t *frontp = str;
+    wchar_t *endp   = NULL;
+
+    if (str == NULL) {
+        return NULL;
+    }
+    if (str[0] == L'\0') {
+        return str;
+    }
+
+    len  = wcslen(str);
+    endp = str + len;
+
+    /* Move the front and back pointers to address the first non-whitespace
+     * characters from each end.
+     */
+    while (iswspace((wint_t) *frontp)) {
+        ++frontp;
+    }
+    if (endp != frontp) {
+        while (iswspace((wint_t) *(--endp)) && endp != frontp) { }
+    }
+
+    if (frontp != str && endp == frontp)
+        *str = L'\0';
+    else if ((str + len - 1) != endp)
+        *(endp + 1) = L'\0';
+
+    /* Shift the string so that it starts at str so that if it's dynamically
+     * allocated, we can still free it on the returned pointer.  Note the reuse
+     * of endp to mean the front of the string buffer now.
+     */
+    endp = str;
+    if (frontp != str) {
+        while (*frontp) {
+            *endp++ = *frontp++;
+        }
+        *endp = L'\0';
+    }
+
+    return str;
+}
+
+extern char* trim(char* str);
+
+void
+ini_strip_quotes(ini_t ini)
+{
+    list_t    *list = (list_t *) ini;
+    section_t *sec;
+
+    sec = (section_t *) list->next;
+
+    while (sec != NULL) {
+        entry_t *ent;
+
+        ent = (entry_t *) sec->entry_head.next;
+        while (ent != NULL) {
+            if (ent->name[0] != '\0') {
+                int trailing_hash = strcspn(ent->data, "#");
+                int trailing_quote;
+                ent->wdata[trailing_hash] = 0;
+                ent->data[trailing_hash] = 0;
+                if (ent->wdata[0] == L'\"') {
+                    memmove(ent->wdata, &ent->wdata[1], sizeof(ent->wdata) - sizeof(wchar_t));
+                }
+                if (ent->wdata[wcslen(ent->wdata) - 1] == L'\"') {
+                    ent->wdata[wcslen(ent->wdata) - 1] = 0;
+                }
+
+                if (ent->data[0] == '\"') {
+                    memmove(ent->data, &ent->data[1], sizeof(ent->data) - sizeof(char));
+                }
+                if (ent->data[strlen(ent->data) - 1] == '\"') {
+                    ent->data[strlen(ent->data) - 1] = 0;
+                }
+
+                trailing_quote = strcspn(ent->data, "\"");
+                ent->wdata[trailing_quote] = 0;
+                ent->data[trailing_quote] = 0;
+                
+                trim_w(ent->wdata);
+                trim(ent->data);
+            }
+
+            ent = (entry_t *) ent->list.next;
+        }
+
+        sec = (section_t *) sec->list.next;
+    }
+}
+
 ini_t
 ini_new(void)
 {
@@ -546,7 +693,7 @@ ini_section_get_int(ini_section_t self, const char *name, int def)
 {
     section_t     *section = (section_t *) self;
     const entry_t *entry;
-    int            value;
+    int            value = 0;
 
     if (section == NULL)
         return def;
@@ -555,6 +702,11 @@ ini_section_get_int(ini_section_t self, const char *name, int def)
     if (entry == NULL)
         return def;
 
+    if (stricmp(entry->data, "true") == 0)
+        return 1;
+    if (stricmp(entry->data, "false") == 0)
+        return 0;
+
     sscanf(entry->data, "%i", &value);
 
     return value;
@@ -565,7 +717,7 @@ ini_section_get_uint(ini_section_t self, const char *name, uint32_t def)
 {
     section_t     *section = (section_t *) self;
     const entry_t *entry;
-    uint32_t       value;
+    uint32_t       value = 0;
 
     if (section == NULL)
         return def;
@@ -585,7 +737,7 @@ ini_section_get_float(ini_section_t self, const char *name, float def)
 {
     section_t     *section = (section_t *) self;
     const entry_t *entry;
-    float         value;
+    float         value = 0;
 
     if (section == NULL)
         return def;
@@ -604,8 +756,9 @@ double
 ini_section_get_double(ini_section_t self, const char *name, double def)
 {
     section_t     *section = (section_t *) self;
-    const entry_t *entry;
-    double         value;
+    entry_t *entry;
+    double   value = 0;
+    int      res = 0;
 
     if (section == NULL)
         return def;
@@ -614,7 +767,36 @@ ini_section_get_double(ini_section_t self, const char *name, double def)
     if (entry == NULL)
         return def;
 
-    sscanf(entry->data, "%lg", &value);
+    res = sscanf(entry->data, "%lg", &value);
+    if (res == EOF || res <= 0) {
+        int i = 0;
+        for (i = 0; i < strlen(entry->data); i++) {
+            if (entry->data[i] == ',') {
+                entry->data[i] = '.';
+                entry->wdata[i] = L'.';
+            }
+        }
+        (void)sscanf(entry->data, "%lg", &value);
+    }
+
+    return value;
+}
+
+int
+ini_section_get_hex12(ini_section_t self, const char *name, int def)
+{
+    section_t     *section = (section_t *) self;
+    const entry_t *entry;
+    unsigned int   value = 0;
+
+    if (section == NULL)
+        return def;
+
+    entry = find_entry(section, name);
+    if (entry == NULL)
+        return def;
+
+    sscanf(entry->data, "%03X", &value);
 
     return value;
 }
@@ -624,7 +806,7 @@ ini_section_get_hex16(ini_section_t self, const char *name, int def)
 {
     section_t     *section = (section_t *) self;
     const entry_t *entry;
-    unsigned int   value;
+    unsigned int   value = 0;
 
     if (section == NULL)
         return def;
@@ -643,7 +825,7 @@ ini_section_get_hex20(ini_section_t self, const char *name, int def)
 {
     section_t     *section = (section_t *) self;
     const entry_t *entry;
-    unsigned int   value;
+    unsigned int   value = 0;
 
     if (section == NULL)
         return def;
@@ -780,6 +962,23 @@ ini_section_set_double(ini_section_t self, const char *name, double val)
     mbstowcs(ent->wdata, ent->data, 512);
 }
 
+void
+ini_section_set_hex12(ini_section_t self, const char *name, int val)
+{
+    section_t *section = (section_t *) self;
+    entry_t   *ent;
+
+    if (section == NULL)
+        return;
+
+    ent = find_entry(section, name);
+    if (ent == NULL)
+        ent = create_entry(section, name);
+
+    sprintf(ent->data, "%03X", val);
+    mbstowcs(ent->wdata, ent->data, sizeof_w(ent->wdata));
+}
+
 void
 ini_section_set_hex16(ini_section_t self, const char *name, int val)
 {
diff --git a/src/utils/log.c b/src/utils/log.c
new file mode 100644
index 000000000..f0eb6aa3c
--- /dev/null
+++ b/src/utils/log.c
@@ -0,0 +1,365 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          New logging system handler.
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          Fred N. van Kempen, <decwiz@yahoo.com>
+ *          Connor Hyde, <mario64crashed@gmail.com, nomorestarfrost@gmail.com>
+ * 
+ *          Copyright 2021-25 Miran Grca.
+ *          Copyright 2021-25 Fred N. van Kempen.
+ *          Copyright 2025 Connor Hyde.
+ */
+#include <inttypes.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <wchar.h>
+
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/config.h>
+#include <86box/mem.h>
+#include "cpu.h"
+#include <86box/plat.h>
+#include <86box/version.h>
+#include <86box/log.h>
+
+typedef struct log_t {
+    char     buff[LOG_SIZE_BUFFER];
+    char     dev_name[1024];
+    int      seen;
+    int      suppr_seen;
+    /* Cyclical log buffer. */
+    char   **cyclic_buff;
+    int32_t  cyclic_last_line;
+    int32_t  log_cycles;
+} log_t;
+
+/* File to log output to. */
+extern FILE *stdlog;
+/* Functions only used in this translation unit. */
+void log_ensure_stdlog_open(void);
+
+void
+log_set_dev_name(void *priv, char *dev_name)
+{
+    log_t *log = (log_t *) priv;
+
+    memcpy(log->dev_name, dev_name, strlen(dev_name) + 1);
+}
+
+static void
+log_copy(log_t *log, char *dest, const char *src, size_t dest_size)
+{
+    memset(dest, 0x00, dest_size * sizeof(char));
+
+    if ((log != NULL) && strcmp(log->dev_name, "")) {
+        strcat(dest, log->dev_name);
+        strcat(dest, ": ");
+    }
+
+    strcat(dest, src);
+}
+
+#ifndef RELEASE_BUILD
+void 
+log_ensure_stdlog_open(void)
+{
+    if (stdlog == NULL) {
+        if (log_path[0] != '\0') {
+            stdlog = plat_fopen(log_path, "w");
+            if (stdlog == NULL)
+                stdlog = stdout;
+        } else
+            stdlog = stdout;
+    }
+}
+
+void
+log_set_suppr_seen(void *priv, int suppr_seen)
+{
+    log_t *log = (log_t *) priv;
+
+    log->suppr_seen = suppr_seen;
+}
+
+/*
+   Log something to the logfile or stdout.
+
+   To avoid excessively-large logfiles because some
+   module repeatedly logs, we keep track of what is
+   being logged, and catch repeating entries.
+ */
+void
+log_out(void *priv, const char *fmt, va_list ap)
+{
+    log_t *log = (log_t *) priv;
+    char   temp[LOG_SIZE_BUFFER];
+
+    if (log == NULL)
+        pclog("WARNING: Logging called with a NULL log pointer\n");
+    else if (fmt == NULL)
+        pclog("WARNING: Logging called with a NULL format pointer\n");
+    else if (fmt[0] != '\0') {
+        log_ensure_stdlog_open();
+
+        vsnprintf(temp, sizeof(temp), fmt, ap);
+
+        if (log->suppr_seen && !strcmp(log->buff, temp))
+            log->seen++;
+        else {
+            if (log->suppr_seen && log->seen) {
+                fprintf(stdlog, "*** %d repeats ***\n", log->seen);
+            }
+            log->seen = 0;
+
+            strncpy(log->buff, temp, sizeof(log->buff) - 1);
+            log->buff[sizeof(log->buff) - 1] = '\0';
+
+            fprintf(stdlog, "%s", temp);
+        }
+
+        fflush(stdlog);
+    }
+}
+
+/*
+   Starfrost, 7-8 January 2025:
+
+   For RIVA 128 emulation I needed a way to suppress logging if a repeated
+   pattern of the same set of lines were found. 
+
+   Implements a version of the Rabin-Karp algorithm:
+   https://en.wikipedia.org/wiki/Rabin%E2%80%93Karp_algorithm .
+*/
+void 
+log_out_cyclic(void* priv, const char* fmt, va_list ap)
+{
+    /* Get our new logging system instance. */
+    log_t* log = (log_t*) priv;
+
+    /* Does the log actually exist? */
+    if (log == NULL)
+        pclog("WARNING: Cyclical logging called with a NULL log pointer\n");
+    else if (log->cyclic_buff == NULL)
+        pclog("WARNING: Cyclical logging called with a non-cyclic log\n");
+    else if (fmt == NULL)
+        pclog("WARNING: Cyclical logging called with a NULL format pointer\n");
+    /* Is the string empty? */
+    else if (fmt[0] != '\0') {
+        /* Ensure stdlog is open. */
+        log_ensure_stdlog_open();
+
+        char temp[LOG_SIZE_BUFFER] = {0};
+
+        log->cyclic_last_line %= LOG_SIZE_BUFFER_CYCLIC_LINES;
+
+        vsprintf(temp, fmt, ap);
+
+        log_copy(log, log->cyclic_buff[log->cyclic_last_line], temp,
+                 LOG_SIZE_BUFFER);
+
+        uint32_t hashes[LOG_SIZE_BUFFER_CYCLIC_LINES] = {0};
+
+        /* Random numbers. */
+        uint32_t base = 257;
+        uint32_t mod = 1000000007;
+
+        uint32_t repeat_order = 0;
+        bool is_cycle = false;
+
+        /* Compute the set of hashes for the current log buffer. */
+        for (int32_t log_line = 0; log_line < LOG_SIZE_BUFFER_CYCLIC_LINES;
+             log_line++) {
+            if (log->cyclic_buff[log_line][0] == '\0')
+                continue;    /* Skip. */
+
+            for (int32_t log_line_char = 0; log_line_char < LOG_SIZE_BUFFER;
+                log_line_char++)
+                hashes[log_line] = hashes[log_line] * base +
+                    log->cyclic_buff[log_line][log_line_char] % mod;
+        }
+
+        /*
+           Now see if there are real cycles.
+           We implement a minimum repeat size.
+         */
+        for (int32_t check_size = LOG_MINIMUM_REPEAT_ORDER;
+             check_size < LOG_SIZE_BUFFER_CYCLIC_LINES / 2; check_size++) {
+            /*
+               TODO: Log what we need for cycle 1.
+               TODO: Command line option that lets us turn off this behaviour.
+             */
+            for (int32_t log_line_to_check = 0; log_line_to_check < check_size;
+                 log_line_to_check++) {
+                if (hashes[log_line_to_check] ==
+                    hashes[(log_line_to_check + check_size) %
+                    LOG_SIZE_BUFFER_CYCLIC_LINES]) {
+                    repeat_order = check_size;
+                    break;
+                }
+            }
+
+            is_cycle = (repeat_order != 0);
+
+            /* If there still is a cycle, break. */
+            if (is_cycle)
+                break;
+            
+        }
+
+        if (is_cycle) {
+            if (log->cyclic_last_line % repeat_order == 0) {
+                log->log_cycles++;
+
+                if (log->log_cycles == 1) {
+                    /* 
+                       'Replay' the last few log entries so they actually
+                       show up.
+
+                       TODO: Is this right?
+                     */
+
+                    for (uint32_t index = log->cyclic_last_line - 1;
+                         index > (log->cyclic_last_line - repeat_order);
+                         index--) {
+                        /* *Very important* to prevent out of bounds index. */
+                        uint32_t real_index = index %
+                                              LOG_SIZE_BUFFER_CYCLIC_LINES;
+                        log_copy(log, temp, log->cyclic_buff[real_index],
+                                 LOG_SIZE_BUFFER);
+
+                        fprintf(stdlog, "%s", log->cyclic_buff[real_index]);
+                    }
+
+                    /* Restore the original line. */
+                    log_copy(log, temp,
+                             log->cyclic_buff[log->cyclic_last_line],
+                             LOG_SIZE_BUFFER);
+
+                    /* Allow normal logging. */
+                    fprintf(stdlog, "%s", temp);
+                }
+
+                if (log->log_cycles > 1 && log->log_cycles < 100)
+                    fprintf(stdlog, "***** Cyclical Log Repeat of Order %d "
+                            "#%d *****\n", repeat_order, log->log_cycles);
+                else if (log->log_cycles == 100)
+                    fprintf(stdlog, "Logged the same cycle 100 times... "
+                            "Silence until something interesting happens\n");
+            }
+        } else {
+            log->log_cycles = 0;
+            fprintf(stdlog, "%s", temp);
+        }
+
+        log->cyclic_last_line++;
+    }
+}
+#endif
+
+void
+log_fatal(void *priv, const char *fmt, ...)
+{
+    log_t  *log = (log_t *) priv;
+    char    temp[LOG_SIZE_BUFFER];
+    char    fmt2[LOG_SIZE_BUFFER];
+    va_list ap;
+
+    if (log == NULL)
+        return;
+
+    if (log->cyclic_buff != NULL) {
+        for (int i = 0; i < LOG_SIZE_BUFFER_CYCLIC_LINES; i++)
+            if (log->cyclic_buff[i] != NULL)
+                free(log->cyclic_buff[i]);
+        free(log->cyclic_buff);
+    }
+
+    log_copy(log, fmt2, fmt, LOG_SIZE_BUFFER);
+    va_start(ap, fmt);
+    vsprintf(temp, fmt2, ap);
+    va_end(ap);
+    fatal("%s", temp);
+    exit(-1);
+}
+
+void
+log_warning(void *priv, const char *fmt, ...)
+{
+    log_t  *log = (log_t *) priv;
+    char    temp[LOG_SIZE_BUFFER];
+    char    fmt2[LOG_SIZE_BUFFER];
+    va_list ap;
+
+    if (log == NULL)
+        return;
+
+    if (log->cyclic_buff != NULL) {
+        for (int i = 0; i < LOG_SIZE_BUFFER_CYCLIC_LINES; i++)
+            if (log->cyclic_buff[i] != NULL)
+                free(log->cyclic_buff[i]);
+        free(log->cyclic_buff);
+    }
+
+    log_copy(log, fmt2, fmt, LOG_SIZE_BUFFER);
+    va_start(ap, fmt);
+    vsprintf(temp, fmt2, ap);
+    va_end(ap);
+    warning("%s", temp);
+}
+
+static void *
+log_open_common(const char *dev_name, const int cyclic)
+{
+    log_t *log = calloc(1, sizeof(log_t));
+
+    memcpy(log->dev_name, dev_name, strlen(dev_name) + 1);
+    log->suppr_seen = 1;
+    log->cyclic_last_line = 0;
+    log->log_cycles = 0;
+
+    if (cyclic) {
+        log->cyclic_buff = calloc(LOG_SIZE_BUFFER_CYCLIC_LINES,
+                                  sizeof(char *));
+        for (int i = 0; i < LOG_SIZE_BUFFER_CYCLIC_LINES; i++)
+            log->cyclic_buff[i] = calloc(LOG_SIZE_BUFFER, sizeof(char));
+    }
+
+    return (void *) log;
+}
+
+void *
+log_open(const char *dev_name)
+{
+    return log_open_common(dev_name, 0);
+}
+
+/*
+   This is so that not all logs get the 32k cyclical buffer
+   they may not need.
+ */
+void *
+log_open_cyclic(const char *dev_name)
+{
+    return log_open_common(dev_name, 1);
+}
+
+void
+log_close(void *priv)
+{
+    log_t *log = (log_t *) priv;
+
+    free(log);
+}
diff --git a/src/random.c b/src/utils/random.c
similarity index 100%
rename from src/random.c
rename to src/utils/random.c
diff --git a/src/video/CMakeLists.txt b/src/video/CMakeLists.txt
index 638837757..98a9cb385 100644
--- a/src/video/CMakeLists.txt
+++ b/src/video/CMakeLists.txt
@@ -11,35 +11,165 @@
 # Authors: David Hrdlička, <hrdlickadavid@outlook.com>
 #
 #          Copyright 2020-2021 David Hrdlička.
+#          Copyright 2025 starfrost
 #
 
-add_library(vid OBJECT agpgart.c video.c vid_table.c vid_cga.c vid_cga_comp.c
-    vid_compaq_cga.c vid_mda.c vid_hercules.c vid_herculesplus.c
-    vid_incolor.c vid_colorplus.c vid_genius.c vid_pgc.c vid_im1024.c
-    vid_sigma.c vid_wy700.c vid_ega.c vid_ega_render.c vid_svga.c vid_8514a.c
-    vid_svga_render.c vid_ddc.c vid_vga.c vid_ati_eeprom.c vid_ati18800.c
-    vid_ati28800.c vid_ati_mach8.c vid_ati_mach64.c vid_ati68875_ramdac.c
-    vid_ati68860_ramdac.c vid_bt48x_ramdac.c
-    vid_av9194.c vid_icd2061.c vid_ics2494.c vid_ics2595.c vid_cl54xx.c
-    vid_et3000.c vid_et4000.c vid_sc1148x_ramdac.c vid_sc1502x_ramdac.c
-    vid_et4000w32.c vid_stg_ramdac.c vid_ht216.c vid_oak_oti.c vid_paradise.c
-    vid_rtg310x.c vid_f82c425.c vid_ti_cf62011.c vid_tvga.c vid_tgui9440.c
-    vid_tkd8001_ramdac.c vid_att20c49x_ramdac.c vid_s3.c vid_s3_virge.c
-    vid_ibm_rgb528_ramdac.c vid_sdac_ramdac.c vid_ogc.c vid_mga.c vid_nga.c
-    vid_tvp3026_ramdac.c vid_att2xc498_ramdac.c vid_xga.c)
+add_library(vid OBJECT
 
-if(VGAWONDER)
-    target_compile_definitions(vid PRIVATE USE_VGAWONDER)
+    # Video Core
+    agpgart.c
+    video.c
+    vid_table.c
+
+    # RAMDAC (Should this be its own library?)
+    ramdac/vid_ramdac_ati68860.c
+    ramdac/vid_ramdac_ati68875.c 
+    ramdac/vid_ramdac_att20c49x.c
+    ramdac/vid_ramdac_att2xc498.c
+    ramdac/vid_ramdac_bt48x.c 
+    ramdac/vid_ramdac_bt481.c 
+    ramdac/vid_ramdac_ibm_rgb528.c
+    ramdac/vid_ramdac_sc1148x.c 
+    ramdac/vid_ramdac_sc1502x.c 
+    ramdac/vid_ramdac_sdac.c 
+    ramdac/vid_ramdac_stg1702.c 
+    ramdac/vid_ramdac_tkd8001.c 
+    ramdac/vid_ramdac_tvp3026.c 
+
+    # Clock generator chips 
+    clockgen/vid_clockgen_av9194.c 
+    clockgen/vid_clockgen_icd2061.c
+    clockgen/vid_clockgen_ics2494.c 
+    clockgen/vid_clockgen_ics2595.c
+
+    # DDC / monitor identification stuff
+    vid_ddc.c
+    vid_ddc_edid_custom.c
+
+    # CARDS start here
+
+    # CGA / Super CGA
+    vid_cga.c
+    vid_cga_comp.c
+    vid_cga_compaq.c 
+    vid_cga_compaq_plasma.c
+    vid_cga_colorplus.c
+    vid_cga_ncr.c
+    vid_cga_olivetti.c
+    vid_cga_quadcolor.c
+    vid_cga_toshiba_t1000.c
+    vid_cga_toshiba_t3100e.c
+    vid_cga_v6355.c
+
+    # PCJr/Tandy
+    vid_pcjr.c
+    vid_tandy.c
+    vid_mda.c
+
+    # Hercules
+    vid_hercules.c
+    vid_hercules_plus.c
+    vid_hercules_incolor.c
+
+    # Other early CGA-era cards
+    vid_genius.c
+    vid_sigma.c
+
+    # PGC / IM1024 / WY700 high-resolution
+    vid_pgc.c
+    vid_im1024.c
+    vid_wy700.c
+
+    # EGA
+    vid_ega.c
+    vid_ega_render.c
+    vid_jega.c
+
+    # (Real IBM) VGA 
+    vid_vga.c
+
+    # Super VGA core
+    vid_svga.c
+    vid_svga_render.c
+
+    # 8514/A, XGA and derivatives
+    vid_8514a.c
+    vid_xga.c
+    vid_ps55da2.c
+
+    # ATI Technologies
+    vid_ati_eeprom.c
+    vid_ati18800.c
+    vid_ati28800.c
+    vid_ati_mach8.c
+    vid_ati_mach64.c
+
+    # Chips & Technologies
+    vid_chips_69000.c
+
+    # Cirrus Logic
+    vid_cl54xx.c
+
+    # Tseng Labs
+    vid_et3000.c
+    vid_et4000.c
+    vid_et4000w32.c
+
+    # Headland
+    vid_ht216.c
+    vid_oak_oti.c
+
+    # Paradise
+    vid_paradise.c
+    vid_rtg310x.c
+    vid_f82c425.c
+    vid_ti_cf62011.c
+
+    # Trident
+    vid_tvga.c 
+    vid_tgui9440.c
+
+    # S3 Graphics
+    vid_s3.c 
+    vid_s3_virge.c
+
+    # Matrox
+    vid_mga.c
+
+    # NVidia (pending)
+    nv/nv_rivatimer.c
+
+    # Generic
+    vid_bochs_vbe.c
+
+)
+
+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+    target_include_directories(vid PRIVATE /usr/local/include)
+endif()
+
+if(G100)
+    target_compile_definitions(vid PRIVATE USE_G100)
 endif()
 
 if(XL24)
     target_compile_definitions(vid PRIVATE USE_XL24)
 endif()
 
-add_library(voodoo OBJECT vid_voodoo.c vid_voodoo_banshee.c
-    vid_voodoo_banshee_blitter.c vid_voodoo_blitter.c vid_voodoo_display.c
-    vid_voodoo_fb.c vid_voodoo_fifo.c vid_voodoo_reg.c vid_voodoo_render.c
-    vid_voodoo_setup.c vid_voodoo_texture.c)
+# 3Dfx Voodoo
+add_library(voodoo OBJECT
+    vid_voodoo.c
+    vid_voodoo_banshee.c
+    vid_voodoo_banshee_blitter.c
+    vid_voodoo_blitter.c
+    vid_voodoo_display.c
+    vid_voodoo_fb.c
+    vid_voodoo_fifo.c
+    vid_voodoo_reg.c
+    vid_voodoo_render.c
+    vid_voodoo_setup.c
+    vid_voodoo_texture.c
+)
 
 if(NOT MSVC AND (ARCH STREQUAL "i386" OR ARCH STREQUAL "x86_64"))
     target_compile_options(voodoo PRIVATE "-msse2")
diff --git a/src/video/agpgart.c b/src/video/agpgart.c
index b8ae2bdc8..bf1976b73 100644
--- a/src/video/agpgart.c
+++ b/src/video/agpgart.c
@@ -167,7 +167,7 @@ const device_t agpgart_device = {
     .init          = agpgart_init,
     .close         = agpgart_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/vid_av9194.c b/src/video/clockgen/vid_clockgen_av9194.c
similarity index 98%
rename from src/video/vid_av9194.c
rename to src/video/clockgen/vid_clockgen_av9194.c
index e7cf75dee..951f3519c 100644
--- a/src/video/vid_av9194.c
+++ b/src/video/clockgen/vid_clockgen_av9194.c
@@ -103,7 +103,7 @@ const device_t av9194_device = {
     .init          = av9194_init,
     .close         = NULL,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/vid_icd2061.c b/src/video/clockgen/vid_clockgen_icd2061.c
similarity index 91%
rename from src/video/vid_icd2061.c
rename to src/video/clockgen/vid_clockgen_icd2061.c
index 4c23d6ec5..f1925e769 100644
--- a/src/video/vid_icd2061.c
+++ b/src/video/clockgen/vid_clockgen_icd2061.c
@@ -29,10 +29,15 @@
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/device.h>
+#include <86box/mem.h>
+#include <86box/timer.h>
+#include <86box/video.h>
+#include <86box/vid_svga.h>
 #include <86box/plat_unused.h>
 
 typedef struct icd2061_t {
-    float freq[3];
+    float    freq[3];
+    float    ref_clock;
 
     int      count;
     int      bit_count;
@@ -121,7 +126,7 @@ icd2061_write(void *priv, int val)
                     q  = qa + 2;                             /* Q  (ICD2061) / M  (ICS9161) */
                     ps = (icd2061->ctrl & (1 << a)) ? 4 : 2; /* Prescale */
 
-                    icd2061->freq[a] = ((float) (p_ * ps) / (float) (q * m)) * 14318184.0f;
+                    icd2061->freq[a] = ((float) (p_ * ps) / (float) (q * m)) * icd2061->ref_clock;
 
                     icd2061_log("P = %02X, M = %01X, Q = %02X, freq[%i] = %f\n", p_, m, q, a, icd2061->freq[a]);
                 } else if (a == 6) {
@@ -149,12 +154,24 @@ icd2061_getclock(int clock, void *priv)
     return icd2061->freq[clock];
 }
 
+void
+icd2061_set_ref_clock(void *priv, svga_t *svga, float ref_clock)
+{
+    icd2061_t *icd2061 = (icd2061_t *) priv;
+
+    if (icd2061)
+        icd2061->ref_clock = ref_clock;
+
+    svga_recalctimings(svga);
+}
+
 static void *
 icd2061_init(UNUSED(const device_t *info))
 {
     icd2061_t *icd2061 = (icd2061_t *) malloc(sizeof(icd2061_t));
     memset(icd2061, 0, sizeof(icd2061_t));
 
+    icd2061->ref_clock = 14318184.0f;
     icd2061->freq[0] = 25175000.0;
     icd2061->freq[1] = 28322000.0;
     icd2061->freq[2] = 28322000.0;
@@ -179,7 +196,7 @@ const device_t icd2061_device = {
     .init          = icd2061_init,
     .close         = icd2061_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -193,7 +210,7 @@ const device_t ics9161_device = {
     .init          = icd2061_init,
     .close         = icd2061_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/clockgen/vid_clockgen_ics2494.c b/src/video/clockgen/vid_clockgen_ics2494.c
new file mode 100644
index 000000000..33a74fe62
--- /dev/null
+++ b/src/video/clockgen/vid_clockgen_ics2494.c
@@ -0,0 +1,426 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          ICS2494 clock generator emulation.
+ *
+ *          Used by the AMI S3 924.
+ *
+ *
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2020 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+
+typedef struct ics2494_t {
+    float freq[16];
+} ics2494_t;
+
+#ifdef ENABLE_ICS2494_LOG
+int ics2494_do_log = ENABLE_ICS2494_LOG;
+
+static void
+ics2494_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (ics2494_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define ics2494_log(fmt, ...)
+#endif
+
+/* Two consecutive byte-writes are NOT allowed.  Furthermore an index
+ * written to 0x01CE is only usable ONCE!  Note also that the setting of ATI
+ * extended registers (especially those with clock selection bits) should be
+ * bracketed by a sequencer reset.
+ *
+ * Boards prior to V5 use 4 crystals.  Boards V5 and later use a clock
+ * generator chip.  V3 and V4 boards differ when it comes to choosing clock
+ * frequencies.
+ *
+ * VGA Wonder V3/V4 Board Clock Frequencies
+ * R E G I S T E R S
+ * 1CE(*)    3C2     3C2    Frequency
+ * B2h/BEh
+ * Bit 6/4  Bit 3   Bit 2   (MHz)
+ * ------- ------- -------  -------
+ *    0       0       0     50.175
+ *    0       0       1     56.644
+ *    0       1       0     Spare 1
+ *    0       1       1     44.900
+ *    1       0       0     44.900
+ *    1       0       1     50.175
+ *    1       1       0     Spare 2
+ *    1       1       1     36.000
+ *
+ * (*):  V3 uses index B2h, bit 6;  V4 uses index BEh, bit 4
+ *
+ * V5, PLUS, XL and XL24 usually have an ATI 18810 clock generator chip, but
+ * some have an ATI 18811-0, and it's quite conceivable that some exist with
+ * ATI 18811-1's or ATI 18811-2's.  Mach32 boards are known to use any one of
+ * these clock generators.  The possibilities for Mach64 boards also include
+ * two different flavours of the newer 18818 chips.  I have yet to figure out
+ * how BIOS initialization sets up the board for a particular set of
+ * frequencies.  Mach32 and Mach64 boards also use a different dot clock
+ * ordering.  ATI says there is no reliable way for the driver to determine
+ * which clock generator is on the board (their BIOS's are tailored to the
+ * board).
+ *
+ * VGA Wonder V5/PLUS/XL/XL24 Board Clock Frequencies
+ * R E G I S T E R S
+ *   1CE     1CE     3C2     3C2    Frequency
+ *   B9h     BEh                     (MHz)   18811-0  18811-1
+ *  Bit 1   Bit 4   Bit 3   Bit 2    18810   18812-0  18811-2  18818-?  18818-?
+ * ------- ------- ------- -------  -------  -------  -------  -------  -------
+ *    0       0       0       0      30.240   30.240  135.000     (*3)     (*3)
+ *    0       0       0       1      32.000   32.000   32.000  110.000  110.000
+ *    0       0       1       0      37.500  110.000  110.000  126.000  126.000
+ *    0       0       1       1      39.000   80.000   80.000  135.000  135.000
+ *    0       1       0       0      42.954   42.954  100.000   50.350   25.175
+ *    0       1       0       1      48.771   48.771  126.000   56.644   28.322
+ *    0       1       1       0        (*1)   92.400   92.400   63.000   31.500
+ *    0       1       1       1      36.000   36.000   36.000   72.000   36.000
+ *    1       0       0       0      40.000   39.910   39.910     (*3)     (*3)
+ *    1       0       0       1      56.644   44.900   44.900   80.000   80.000
+ *    1       0       1       0      75.000   75.000   75.000   75.000   75.000
+ *    1       0       1       1      65.000   65.000   65.000   65.000   65.000
+ *    1       1       0       0      50.350   50.350   50.350   40.000   40.000
+ *    1       1       0       1      56.640   56.640   56.640   44.900   44.900
+ *    1       1       1       0        (*2)     (*3)     (*3)   49.500   49.500
+ *    1       1       1       1      44.900   44.900   44.900   50.000   50.000
+ *
+ * (*1) External 0 (supposedly 16.657 Mhz)
+ * (*2) External 1 (supposedly 28.322 MHz)
+ * (*3) This setting doesn't seem to generate anything
+ *
+ * Mach32 and Mach64 Board Clock Frequencies
+ * R E G I S T E R S
+ *   1CE     1CE     3C2     3C2    Frequency
+ *   B9h     BEh                     (MHz)   18811-0  18811-1
+ *  Bit 1   Bit 4   Bit 3   Bit 2    18810   18812-0  18811-2  18818-?  18818-?
+ * ------- ------- ------- -------  -------  -------  -------  -------  -------
+ *    0       0       0       0      42.954   42.954  100.000   50.350   25.175
+ *    0       0       0       1      48.771   48.771  126.000   56.644   28.322
+ *    0       0       1       0        (*1)   92.400   92.400   63.000   31.500
+ *    0       0       1       1      36.000   36.000   36.000   72.000   36.000
+ *    0       1       0       0      30.240   30.240  135.000     (*3)     (*3)
+ *    0       1       0       1      32.000   32.000   32.000  110.000  110.000
+ *    0       1       1       0      37.500  110.000  110.000  126.000  126.000
+ *    0       1       1       1      39.000   80.000   80.000  135.000  135.000
+ *    1       0       0       0      50.350   50.350   50.350   40.000   40.000
+ *    1       0       0       1      56.640   56.640   56.640   44.900   44.900
+ *    1       0       1       0        (*2)     (*3)     (*3)   49.500   49.500
+ *    1       0       1       1      44.900   44.900   44.900   50.000   50.000
+ *    1       1       0       0      40.000   39.910   39.910     (*3)     (*3)
+ *    1       1       0       1      56.644   44.900   44.900   80.000   80.000
+ *    1       1       1       0      75.000   75.000   75.000   75.000   75.000
+ *    1       1       1       1      65.000   65.000   65.000   65.000   65.000
+ *
+ * (*1) External 0 (supposedly 16.657 Mhz)
+ * (*2) External 1 (supposedly 28.322 MHz)
+ * (*3) This setting doesn't seem to generate anything
+ *
+ * Note that, to reduce confusion, this driver masks out the different clock
+ * ordering.
+ *
+ * For all boards, these frequencies can be divided by 1, 2, 3 or 4.
+ *
+ *      Register 1CE, index B8h
+ *       Bit 7    Bit 6
+ *      -------  -------
+ *         0        0           Divide by 1
+ *         0        1           Divide by 2
+ *         1        0           Divide by 3
+ *         1        1           Divide by 4
+ *
+ * There is some question as to whether or not bit 1 of index 0xB9 can
+ * be used for clock selection on a V4 board.  This driver makes it
+ * available only if the "undocumented_clocks" option (itself
+ * undocumented :-)) is specified in XF86Config.
+ *
+ * Also it appears that bit 0 of index 0xB9 can also be used for clock
+ * selection on some boards.  It is also only available under XF86Config
+ * option "undocumented_clocks".
+ */
+
+float
+ics2494_getclock(int clock, void *priv)
+{
+    const ics2494_t *ics2494 = (ics2494_t *) priv;
+
+    if (clock > 15)
+        clock = 15;
+
+    return ics2494->freq[clock];
+}
+
+static void *
+ics2494_init(const device_t *info)
+{
+    ics2494_t *ics2494 = (ics2494_t *) malloc(sizeof(ics2494_t));
+    memset(ics2494, 0, sizeof(ics2494_t));
+
+    switch (info->local) {
+        case 0:
+            /* ATI 18810 for ATI 28800 */
+            ics2494->freq[0] = 30240000.0;
+            ics2494->freq[1] = 32000000.0;
+            ics2494->freq[2] = 37500000.0;
+            ics2494->freq[3] = 39000000.0;
+            ics2494->freq[4] = 42954000.0;
+            ics2494->freq[5] = 48771000.0;
+            ics2494->freq[6] = 0.0;
+            ics2494->freq[7] = 36000000.0;
+            ics2494->freq[8] = 40000000.0;
+            ics2494->freq[9] = 56644000.0;
+            ics2494->freq[10] = 75000000.0;
+            ics2494->freq[11] = 65000000.0;
+            ics2494->freq[12] = 50350000.0;
+            ics2494->freq[13] = 56640000.0;
+            ics2494->freq[14] = 0.0;
+            ics2494->freq[15] = 44900000.0;
+            break;
+        case 1:
+            /* ATI 18811-0/ATI 18812-0 for ATI 28800 */
+            ics2494->freq[0] = 42950000.0;
+            ics2494->freq[1] = 48770000.0;
+            ics2494->freq[2] = 92400000.0;
+            ics2494->freq[3] = 36000000.0;
+            ics2494->freq[4] = 50350000.0;
+            ics2494->freq[5] = 56640000.0;
+            ics2494->freq[7] = 44900000.0;
+            ics2494->freq[8] = 30240000.0;
+            ics2494->freq[9] = 32000000.0;
+            ics2494->freq[10] = 110000000.0;
+            ics2494->freq[11] = 80000000.0;
+            ics2494->freq[12] = 39910000.0;
+            ics2494->freq[13] = 44900000.0;
+            ics2494->freq[14] = 75000000.0;
+            ics2494->freq[15] = 65000000.0;
+            break;
+        case 2:
+            /* ATI 18811-1/ATI 18811-2 for ATI 28800 */
+            ics2494->freq[0] = 100000000.0;
+            ics2494->freq[1] = 126000000.0;
+            ics2494->freq[2] = 92400000.0;
+            ics2494->freq[3] = 36000000.0;
+            ics2494->freq[4] = 50350000.0;
+            ics2494->freq[5] = 56640000.0;
+            ics2494->freq[7] = 44900000.0;
+            ics2494->freq[8] = 135000000.0;
+            ics2494->freq[9] = 32000000.0;
+            ics2494->freq[10] = 110000000.0;
+            ics2494->freq[11] = 80000000.0;
+            ics2494->freq[12] = 39910000.0;
+            ics2494->freq[13] = 44900000.0;
+            ics2494->freq[14] = 75000000.0;
+            ics2494->freq[15] = 65000000.0;
+            break;
+        case 100:
+            /* ATI 18810 for ATI Mach32 */
+            ics2494->freq[0] = 42954000.0;
+            ics2494->freq[1] = 48771000.0;
+            ics2494->freq[2] = 0.0;
+            ics2494->freq[3] = 36000000.0;
+            ics2494->freq[4] = 30240000.0;
+            ics2494->freq[5] = 32000000.0;
+            ics2494->freq[6] = 37500000.0;
+            ics2494->freq[7] = 39000000.0;
+            ics2494->freq[8] = 50350000.0;
+            ics2494->freq[9] = 56640000.0;
+            ics2494->freq[10] = 0.0;
+            ics2494->freq[11] = 44900000.0;
+            ics2494->freq[12] = 40000000.0;
+            ics2494->freq[13] = 56644000.0;
+            ics2494->freq[14] = 75000000.0;
+            ics2494->freq[15] = 65000000.0;
+            break;
+        case 101:
+            /* ATI 18811-0/ATI 18812-0 for ATI Mach32 */
+            ics2494->freq[0] = 42954000.0;
+            ics2494->freq[1] = 48771000.0;
+            ics2494->freq[2] = 92400000.0;
+            ics2494->freq[3] = 36000000.0;
+            ics2494->freq[4] = 30240000.0;
+            ics2494->freq[5] = 32000000.0;
+            ics2494->freq[6] = 110000000.0;
+            ics2494->freq[7] = 80000000.0;
+            ics2494->freq[8] = 50350000.0;
+            ics2494->freq[9] = 56640000.0;
+            ics2494->freq[10] = 0.0;
+            ics2494->freq[11] = 44900000.0;
+            ics2494->freq[12] = 39910000.0;
+            ics2494->freq[13] = 44900000.0;
+            ics2494->freq[14] = 75000000.0;
+            ics2494->freq[15] = 65000000.0;
+            break;
+        case 102:
+            /* ATI 18811-1/ATI 18811-2 for ATI Mach32 */
+            ics2494->freq[0] = 100000000.0;
+            ics2494->freq[1] = 126000000.0;
+            ics2494->freq[2] = 92400000.0;
+            ics2494->freq[3] = 36000000.0;
+            ics2494->freq[4] = 50350000.0;
+            ics2494->freq[5] = 56640000.0;
+            ics2494->freq[7] = 44900000.0;
+            ics2494->freq[8] = 135000000.0;
+            ics2494->freq[9] = 32000000.0;
+            ics2494->freq[10] = 110000000.0;
+            ics2494->freq[11] = 80000000.0;
+            ics2494->freq[12] = 39910000.0;
+            ics2494->freq[13] = 44900000.0;
+            ics2494->freq[14] = 75000000.0;
+            ics2494->freq[15] = 65000000.0;
+            break;
+        case 305:
+            /* ICS2494A(N)-205 for S3 86C924 */
+            ics2494->freq[0x0] = 25175000.0;
+            ics2494->freq[0x1] = 28322000.0;
+            ics2494->freq[0x2] = 40000000.0;
+            ics2494->freq[0x3] = 0.0;
+            ics2494->freq[0x4] = 50000000.0;
+            ics2494->freq[0x5] = 77000000.0;
+            ics2494->freq[0x6] = 36000000.0;
+            ics2494->freq[0x7] = 44889000.0;
+            ics2494->freq[0x8] = 130000000.0;
+            ics2494->freq[0x9] = 120000000.0;
+            ics2494->freq[0xa] = 80000000.0;
+            ics2494->freq[0xb] = 31500000.0;
+            ics2494->freq[0xc] = 110000000.0;
+            ics2494->freq[0xd] = 65000000.0;
+            ics2494->freq[0xe] = 75000000.0;
+            ics2494->freq[0xf] = 94500000.0;
+            break;
+
+        default:
+            break;
+    }
+
+    return ics2494;
+}
+
+static void
+ics2494_close(void *priv)
+{
+    ics2494_t *ics2494 = (ics2494_t *) priv;
+
+    if (ics2494)
+        free(ics2494);
+}
+
+const device_t ics2494an_305_device = {
+    .name          = "ICS2494AN-305 Clock Generator",
+    .internal_name = "ics2494an_305",
+    .flags         = 0,
+    .local         = 305,
+    .init          = ics2494_init,
+    .close         = ics2494_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ati18810_28800_device = {
+    .name          = "ATI 18810 (ATI 28800) Clock Generator",
+    .internal_name = "ati18810_28800",
+    .flags         = 0,
+    .local         = 0,
+    .init          = ics2494_init,
+    .close         = ics2494_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ati18811_0_28800_device = {
+    .name          = "ATI 18811-0 (ATI 28800) Clock Generator",
+    .internal_name = "ati18811_0_28800",
+    .flags         = 0,
+    .local         = 1,
+    .init          = ics2494_init,
+    .close         = ics2494_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ati18811_1_28800_device = {
+    .name          = "ATI 18811-1 (ATI 28800) Clock Generator",
+    .internal_name = "ati18811_1_28800",
+    .flags         = 0,
+    .local         = 2,
+    .init          = ics2494_init,
+    .close         = ics2494_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ati18810_mach32_device = {
+    .name          = "ATI 18810 (ATI Mach32) Clock Generator",
+    .internal_name = "ati18810_mach32",
+    .flags         = 0,
+    .local         = 100,
+    .init          = ics2494_init,
+    .close         = ics2494_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ati18811_0_mach32_device = {
+    .name          = "ATI 18811-0 (ATI Mach32) Clock Generator",
+    .internal_name = "ati18811_0_mach32",
+    .flags         = 0,
+    .local         = 101,
+    .init          = ics2494_init,
+    .close         = ics2494_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t ati18811_1_mach32_device = {
+    .name          = "ATI 18811-1 (ATI Mach32) Clock Generator",
+    .internal_name = "ati18811_1_mach32",
+    .flags         = 0,
+    .local         = 102,
+    .init          = ics2494_init,
+    .close         = ics2494_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/video/vid_ics2595.c b/src/video/clockgen/vid_clockgen_ics2595.c
similarity index 99%
rename from src/video/vid_ics2595.c
rename to src/video/clockgen/vid_clockgen_ics2595.c
index ecb414f2b..b5da3d7e2 100644
--- a/src/video/vid_ics2595.c
+++ b/src/video/clockgen/vid_clockgen_ics2595.c
@@ -129,7 +129,7 @@ const device_t ics2595_device = {
     .init          = ics2595_init,
     .close         = ics2595_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/nv/nv_rivatimer.c b/src/video/nv/nv_rivatimer.c
new file mode 100644
index 000000000..12d40c026
--- /dev/null
+++ b/src/video/nv/nv_rivatimer.c
@@ -0,0 +1,274 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Fast, high-frequency, CPU-independent timer.
+ *
+ *
+ *
+ * Authors: Connor Hyde, <mario64crashed@gmail.com> I need a better email address ;^)
+ *
+ *          Copyright 2024-2025 starfrost
+ */
+
+/* See vid_nv_rivatimer.h comments for rationale behind not using the regular timer system 
+
+Notes applicable to this file:
+Since Windows XP, QueryPerformanceCounter and QueryPerformanceFrequency cannot fail so they are not checked.
+
+*/
+
+#include <86box/nv/vid_nv_rivatimer.h>
+
+#ifdef _WIN32
+LARGE_INTEGER performance_frequency;
+#endif
+
+rivatimer_t* rivatimer_head;        // The head of the rivatimer list. 
+rivatimer_t* rivatimer_tail;        // The tail of the rivatimer list.
+
+/* Functions only used in this translation unit */
+bool rivatimer_really_exists(rivatimer_t* rivatimer);   // Determine if a rivatimer really exists in the linked list.
+
+void rivatimer_init(void)
+{
+    // Destroy all the rivatimers.
+    rivatimer_t* rivatimer_ptr = rivatimer_head;
+
+    if (!rivatimer_ptr)
+        return;
+
+    while (rivatimer_ptr)
+    {
+        // since we are destroing it
+        rivatimer_t* old_next = rivatimer_ptr->next;
+        rivatimer_destroy(rivatimer_ptr);
+        
+        rivatimer_ptr = old_next;
+    }
+        
+
+    #ifdef _WIN32
+    // Query the performance frequency.
+    QueryPerformanceFrequency(&performance_frequency);
+    #endif
+}
+
+// Creates a rivatimer.
+rivatimer_t* rivatimer_create(double period, void (*callback)(double real_time))
+{
+    rivatimer_t* new_rivatimer = NULL;
+
+    // See i
+    if (period <= 0 
+    || !callback)
+    {
+        fatal("Invalid rivatimer_create call: period <= 0 or no callback");
+    }
+
+    // If there are no rivatimers, create one
+    if (!rivatimer_head)
+    {
+        rivatimer_head = calloc(1, sizeof(rivatimer_t));
+        rivatimer_head->prev = NULL; // indicate this is the first in the list even if we don't strictly need to
+        rivatimer_tail = rivatimer_head; 
+        new_rivatimer = rivatimer_head;
+    }
+    else // Otherwise add a new one to the list
+    {
+        rivatimer_tail->next = calloc(1, sizeof(rivatimer_t));
+        rivatimer_tail = rivatimer_tail->next;
+        new_rivatimer = rivatimer_tail;
+    }
+    
+    // sanity check
+    if (new_rivatimer)
+    {
+        new_rivatimer->running = false;
+        new_rivatimer->period = period;
+        new_rivatimer->next = NULL; // indicate this is the last in the list
+        new_rivatimer->callback = callback;
+    }
+
+    return new_rivatimer;
+}
+
+// Determines if a rivatimer really exists.
+bool rivatimer_really_exists(rivatimer_t* rivatimer)
+{
+    rivatimer_t* current = rivatimer_head;
+
+    if (!current)
+        return false;
+
+    while (current)
+    {
+        if (current == rivatimer)
+            return true;
+
+        current = current->next;
+    }
+
+    return false;
+}
+
+// Destroy a rivatimer.
+void rivatimer_destroy(rivatimer_t* rivatimer_ptr)
+{
+    if (!rivatimer_really_exists(rivatimer_ptr))
+        fatal("rivatimer_destroy: The timer was already destroyed, or never existed in the first place.");
+    
+    // Case: We are destroying the head
+    if (rivatimer_ptr == rivatimer_head)
+    {
+        // This is the only rivatimer
+        if (rivatimer_ptr->next == NULL)
+        {
+            rivatimer_head = NULL;
+            rivatimer_tail = NULL;
+        }
+        // This is not the only rivatimer
+        else 
+        {
+            rivatimer_head = rivatimer_ptr->next;
+            rivatimer_head->prev = NULL; 
+            // This is the only rivatimer and now there is only one
+            if (!rivatimer_head->next)
+                rivatimer_tail = rivatimer_head;
+        }
+    }
+    // Case: We are destroying the tail
+    else if (rivatimer_ptr == rivatimer_tail)
+    {
+        // We already covered the case where there is only one item above
+        rivatimer_tail = rivatimer_ptr->prev;
+        rivatimer_tail->next = NULL;
+    }
+    // Case: This is not the first or last rivatimer, so we don't need to set the head or tail
+    else
+    {
+        // Fix the break in the chain that this 
+        if (rivatimer_ptr->next)
+            rivatimer_ptr->prev->next = rivatimer_ptr->next;
+        if (rivatimer_ptr->prev)
+            rivatimer_ptr->next->prev = rivatimer_ptr->prev;
+    }
+
+    free(rivatimer_ptr);
+    rivatimer_ptr = NULL; //explicitly set to null
+}
+
+void rivatimer_update_all(void)
+{
+    rivatimer_t* rivatimer_ptr = rivatimer_head;
+
+    if (!rivatimer_ptr)
+        return;
+
+    while (rivatimer_ptr)
+    {
+        // if it's not running skip it
+        if (!rivatimer_ptr->running)
+        {
+            rivatimer_ptr = rivatimer_ptr->next;
+            continue;
+        }
+
+        #ifdef _WIN32
+            LARGE_INTEGER current_time;
+
+            QueryPerformanceCounter(&current_time);
+
+            double microseconds = ((double)current_time.QuadPart / 1000000.0) - (rivatimer_ptr->starting_time.QuadPart / 1000000.0);
+        #else
+            struct timespec current_time; 
+
+            clock_gettime(CLOCK_REALTIME, &current_time);
+
+            double microseconds = ((double)current_time.tv_sec * 1000000.0) + ((double)current_time.tv_nsec / 1000.0);
+        #endif
+
+        rivatimer_ptr->time += microseconds; 
+
+        // Reset the current time so we can actually restart
+        #ifdef _WIN32
+            QueryPerformanceCounter(&rivatimer_ptr->starting_time);
+        #else
+            clock_gettime(CLOCK_REALTIME, &rivatimer_ptr->starting_time);
+        #endif 
+
+        // Time to fire
+        if (microseconds > rivatimer_ptr->period)
+        {
+            if (!rivatimer_ptr->callback)
+            {
+                pclog("Eh? No callback in RivaTimer?");
+                continue;
+            }
+                    
+            rivatimer_ptr->callback(microseconds);
+        }
+
+        rivatimer_ptr = rivatimer_ptr->next;
+    }
+
+}
+
+void rivatimer_start(rivatimer_t* rivatimer_ptr)
+{
+    if (!rivatimer_really_exists(rivatimer_ptr))
+        fatal("rivatimer_start: The timer has been destroyed, or never existed in the first place.");
+
+    if (rivatimer_ptr->period <= 0)
+        fatal("rivatimer_start: Zero period!");
+
+    rivatimer_ptr->running = true;
+
+    // Start off so rivatimer_update_all can actually update.
+    #ifdef _WIN32
+        QueryPerformanceCounter(&rivatimer_ptr->starting_time);
+    #else
+        clock_gettime(CLOCK_REALTIME, &rivatimer_ptr->starting_time);
+    #endif 
+}
+
+void rivatimer_stop(rivatimer_t* rivatimer_ptr)
+{
+    if (!rivatimer_really_exists(rivatimer_ptr))
+        fatal("rivatimer_stop: The timer has been destroyed, or never existed in the first place.");
+
+    rivatimer_ptr->running = false;
+    rivatimer_ptr->time = 0;
+}
+
+// Get the current time value of a rivatimer
+double rivatimer_get_time(rivatimer_t* rivatimer_ptr)
+{
+    if (!rivatimer_really_exists(rivatimer_ptr))
+        fatal("rivatimer_get_time: The timer has been destroyed, or never existed in the first place.");
+
+    return rivatimer_ptr->time;
+}
+
+void rivatimer_set_callback(rivatimer_t* rivatimer_ptr, void (*callback)(double real_time))
+{
+    if (!rivatimer_really_exists(rivatimer_ptr))
+        fatal("rivatimer_set_callback: The timer has been destroyed, or never existed in the first place.");
+
+    if (!callback)
+        fatal("rivatimer_set_callback: No callback!");
+
+    rivatimer_ptr->callback = callback;
+}
+
+void rivatimer_set_period(rivatimer_t* rivatimer_ptr, double period)
+{
+    if (!rivatimer_really_exists(rivatimer_ptr))
+       fatal("rivatimer_set_period: The timer has been destroyed, or never existed in the first place.");
+
+    rivatimer_ptr->period = period;
+}
\ No newline at end of file
diff --git a/src/video/vid_ati68860_ramdac.c b/src/video/ramdac/vid_ramdac_ati68860.c
similarity index 78%
rename from src/video/vid_ati68860_ramdac.c
rename to src/video/ramdac/vid_ramdac_ati68860.c
index ac2a0f7cb..4411f2ee2 100644
--- a/src/video/vid_ati68860_ramdac.c
+++ b/src/video/ramdac/vid_ramdac_ati68860.c
@@ -67,23 +67,22 @@ typedef struct ati68860_ramdac_t {
 } ati68860_ramdac_t;
 
 void
-ati68860_ramdac_out(uint16_t addr, uint8_t val, void *priv, svga_t *svga)
+ati68860_ramdac_out(uint16_t addr, uint8_t val, int is_8514, void *priv, svga_t *svga)
 {
     ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) priv;
-    const ibm8514_t   *dev    = (ibm8514_t *) svga->dev8514;
 
     switch (addr) {
         case 0:
-            svga_out((dev && (dev->on[0] || dev->on[1])) ? 0x2ec : 0x3c8, val, svga);
+            svga_out(is_8514 ? 0x2ec : 0x3c8, val, svga);
             break;
         case 1:
-            svga_out((dev && (dev->on[0] || dev->on[1])) ? 0x2ed : 0x3c9, val, svga);
+            svga_out(is_8514 ? 0x2ed : 0x3c9, val, svga);
             break;
         case 2:
-            svga_out((dev && (dev->on[0] || dev->on[1])) ? 0x2ea : 0x3c6, val, svga);
+            svga_out(is_8514 ? 0x2ea : 0x3c6, val, svga);
             break;
         case 3:
-            svga_out((dev && (dev->on[0] || dev->on[1])) ? 0x2eb : 0x3c7, val, svga);
+            svga_out(is_8514 ? 0x2eb : 0x3c7, val, svga);
             break;
         default:
             ramdac->regs[addr & 0xf] = val;
@@ -173,24 +172,23 @@ ati68860_ramdac_out(uint16_t addr, uint8_t val, void *priv, svga_t *svga)
 }
 
 uint8_t
-ati68860_ramdac_in(uint16_t addr, void *priv, svga_t *svga)
+ati68860_ramdac_in(uint16_t addr, int is_8514, void *priv, svga_t *svga)
 {
     const ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) priv;
-    const ibm8514_t         *dev    = (ibm8514_t *) svga->dev8514;
     uint8_t                  temp   = 0;
 
     switch (addr) {
         case 0:
-            temp = svga_in((dev && (dev->on[0] || dev->on[1])) ? 0x2ec : 0x3c8, svga);
+            temp = svga_in(is_8514 ? 0x2ec : 0x3c8, svga);
             break;
         case 1:
-            temp = svga_in((dev && (dev->on[0] || dev->on[1])) ? 0x2ed : 0x3c9, svga);
+            temp = svga_in(is_8514 ? 0x2ed : 0x3c9, svga);
             break;
         case 2:
-            temp = svga_in((dev && (dev->on[0] || dev->on[1])) ? 0x2ea : 0x3c6, svga);
+            temp = svga_in(is_8514 ? 0x2ea : 0x3c6, svga);
             break;
         case 3:
-            temp = svga_in((dev && (dev->on[0] || dev->on[1])) ? 0x2eb : 0x3c7, svga);
+            temp = svga_in(is_8514 ? 0x2eb : 0x3c7, svga);
             break;
         case 4:
         case 8:
@@ -263,38 +261,57 @@ void
 ati68860_hwcursor_draw(svga_t *svga, int displine)
 {
     const ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) svga->ramdac;
+    int                      comb;
     int                      offset;
-    uint8_t                  dat;
+    int                      x_pos;
+    int                      y_pos;
+    int                      shift = 0;
+    uint16_t                 dat;
     uint32_t                 col0 = ramdac->pallook[0];
     uint32_t                 col1 = ramdac->pallook[1];
+    uint32_t                *p;
 
-    offset = svga->dac_hwcursor_latch.xoff;
-    for (uint32_t x = 0; x < 64 - svga->dac_hwcursor_latch.xoff; x += 4) {
-        dat = svga->vram[svga->dac_hwcursor_latch.addr + (offset >> 2)];
-        if (!(dat & 2))
-            buffer32->line[displine][svga->dac_hwcursor_latch.x + x + svga->x_add] = (dat & 1) ? col1 : col0;
-        else if ((dat & 3) == 3)
-            buffer32->line[displine][svga->dac_hwcursor_latch.x + x + svga->x_add] ^= 0xFFFFFF;
-        dat >>= 2;
-        if (!(dat & 2))
-            buffer32->line[displine][svga->dac_hwcursor_latch.x + x + svga->x_add + 1] = (dat & 1) ? col1 : col0;
-        else if ((dat & 3) == 3)
-            buffer32->line[displine][svga->dac_hwcursor_latch.x + x + svga->x_add + 1] ^= 0xFFFFFF;
-        dat >>= 2;
-        if (!(dat & 2))
-            buffer32->line[displine][svga->dac_hwcursor_latch.x + x + svga->x_add + 2] = (dat & 1) ? col1 : col0;
-        else if ((dat & 3) == 3)
-            buffer32->line[displine][svga->dac_hwcursor_latch.x + x + svga->x_add + 2] ^= 0xFFFFFF;
-        dat >>= 2;
-        if (!(dat & 2))
-            buffer32->line[displine][svga->dac_hwcursor_latch.x + x + svga->x_add + 3] = (dat & 1) ? col1 : col0;
-        else if ((dat & 3) == 3)
-            buffer32->line[displine][svga->dac_hwcursor_latch.x + x + svga->x_add + 3] ^= 0xFFFFFF;
-        dat >>= 2;
-        offset += 4;
+    offset = svga->dac_hwcursor_latch.x - svga->dac_hwcursor_latch.xoff;
+    if (svga->packed_4bpp)
+        shift = 1;
+
+    for (int x = 0; x < svga->dac_hwcursor_latch.cur_xsize; x += (8 >> shift)) {
+        if (shift) {
+            dat = svga->vram[(svga->dac_hwcursor_latch.addr) & svga->vram_mask] & 0x0f;
+            dat |= (svga->vram[(svga->dac_hwcursor_latch.addr + 1) & svga->vram_mask] << 4);
+            dat |= (svga->vram[(svga->dac_hwcursor_latch.addr + 2) & svga->vram_mask] << 8);
+            dat |= (svga->vram[(svga->dac_hwcursor_latch.addr + 3) & svga->vram_mask] << 12);
+        } else {
+            dat = svga->vram[svga->dac_hwcursor_latch.addr & svga->vram_mask];
+            dat |= (svga->vram[(svga->dac_hwcursor_latch.addr + 1) & svga->vram_mask] << 8);
+        }
+        for (int xx = 0; xx < (8 >> shift); xx++) {
+            comb = (dat >> (xx << 1)) & 0x03;
+
+            y_pos = displine;
+            x_pos = offset + svga->x_add;
+            p     = buffer32->line[y_pos];
+
+            if (offset >= svga->dac_hwcursor_latch.x) {
+                switch (comb) {
+                    case 0:
+                        p[x_pos] = col0;
+                        break;
+                    case 1:
+                        p[x_pos] = col1;
+                        break;
+                    case 3:
+                        p[x_pos] ^= 0xffffff;
+                        break;
+
+                    default:
+                        break;
+                }
+            }
+            offset++;
+        }
+        svga->dac_hwcursor_latch.addr += 2;
     }
-
-    svga->dac_hwcursor_latch.addr += 16;
 }
 
 static void
@@ -314,7 +331,7 @@ const device_t ati68860_ramdac_device = {
     .init          = ati68860_ramdac_init,
     .close         = ati68860_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/vid_ati68875_ramdac.c b/src/video/ramdac/vid_ramdac_ati68875.c
similarity index 83%
rename from src/video/vid_ati68875_ramdac.c
rename to src/video/ramdac/vid_ramdac_ati68875.c
index 447a8eca8..4de0ed3d9 100644
--- a/src/video/vid_ati68875_ramdac.c
+++ b/src/video/ramdac/vid_ramdac_ati68875.c
@@ -38,7 +38,7 @@ typedef struct ati68875_ramdac_t {
 } ati68875_ramdac_t;
 
 void
-ati68875_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, void *priv, svga_t *svga)
+ati68875_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, int is_8514, void *priv, svga_t *svga)
 {
     ati68875_ramdac_t *ramdac = (ati68875_ramdac_t *) priv;
     uint8_t rs = (addr & 0x03);
@@ -48,10 +48,16 @@ ati68875_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, void *priv, sv
 
     switch (rs) {
         case 0x00: /* Palette Write Index Register (RS value = 0000) */
+            svga_out(is_8514 ? 0x2ec : 0x3c8, val, svga);
+            break;
         case 0x01: /* Palette Data Register (RS value = 0001) */
+            svga_out(is_8514 ? 0x2ed : 0x3c9, val, svga);
+            break;
         case 0x02: /* Pixel Read Mask Register (RS value = 0010) */
-        case 0x03:
-            svga_out(addr, val, svga);
+            svga_out(is_8514 ? 0x2ea : 0x3c6, val, svga);
+            break;
+        case 0x03: /* Palette Read Index Register (RS value = 0011) */
+            svga_out(is_8514 ? 0x2eb : 0x3c7, val, svga);
             break;
         case 0x08: /* General Control Register (RS value = 1000) */
             ramdac->gen_cntl = val;
@@ -83,7 +89,7 @@ ati68875_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, void *priv, sv
 }
 
 uint8_t
-ati68875_ramdac_in(uint16_t addr, int rs2, int rs3, void *priv, svga_t *svga)
+ati68875_ramdac_in(uint16_t addr, int rs2, int rs3, int is_8514, void *priv, svga_t *svga)
 {
     const ati68875_ramdac_t *ramdac = (ati68875_ramdac_t *) priv;
     uint8_t                  rs = (addr & 0x03);
@@ -94,10 +100,16 @@ ati68875_ramdac_in(uint16_t addr, int rs2, int rs3, void *priv, svga_t *svga)
 
     switch (rs) {
         case 0x00: /* Palette Write Index Register (RS value = 0000) */
+            temp = svga_in(is_8514 ? 0x2ec : 0x3c8, svga);
+            break;
         case 0x01: /* Palette Data Register (RS value = 0001) */
+            temp = svga_in(is_8514 ? 0x2ed : 0x3c9, svga);
+            break;
         case 0x02: /* Pixel Read Mask Register (RS value = 0010) */
-        case 0x03:
-            temp = svga_in(addr, svga);
+            temp = svga_in(is_8514 ? 0x2ea : 0x3c6, svga);
+            break;
+        case 0x03: /* Palette Read Index Register (RS value = 0011) */
+            temp = svga_in(is_8514 ? 0x2eb : 0x3c7, svga);
             break;
         case 0x08: /* General Control Register (RS value = 1000) */
             temp = ramdac->gen_cntl;
@@ -160,7 +172,7 @@ const device_t ati68875_ramdac_device = {
     .init          = ati68875_ramdac_init,
     .close         = ati68875_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/vid_att20c49x_ramdac.c b/src/video/ramdac/vid_ramdac_att20c49x.c
similarity index 98%
rename from src/video/vid_att20c49x_ramdac.c
rename to src/video/ramdac/vid_ramdac_att20c49x.c
index f13740d34..7815f79be 100644
--- a/src/video/vid_att20c49x_ramdac.c
+++ b/src/video/ramdac/vid_ramdac_att20c49x.c
@@ -182,7 +182,7 @@ const device_t att490_ramdac_device = {
     .init          = att49x_ramdac_init,
     .close         = att49x_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -196,7 +196,7 @@ const device_t att491_ramdac_device = {
     .init          = att49x_ramdac_init,
     .close         = att49x_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -210,7 +210,7 @@ const device_t att492_ramdac_device = {
     .init          = att49x_ramdac_init,
     .close         = att49x_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/vid_att2xc498_ramdac.c b/src/video/ramdac/vid_ramdac_att2xc498.c
similarity index 99%
rename from src/video/vid_att2xc498_ramdac.c
rename to src/video/ramdac/vid_ramdac_att2xc498.c
index 47eebccae..f52b1432f 100644
--- a/src/video/vid_att2xc498_ramdac.c
+++ b/src/video/ramdac/vid_ramdac_att2xc498.c
@@ -183,7 +183,7 @@ const device_t att498_ramdac_device = {
     .init          = att498_ramdac_init,
     .close         = att498_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/ramdac/vid_ramdac_bt481.c b/src/video/ramdac/vid_ramdac_bt481.c
new file mode 100644
index 000000000..1b81e2dc7
--- /dev/null
+++ b/src/video/ramdac/vid_ramdac_bt481.c
@@ -0,0 +1,161 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Emulation of the Brooktree BT481 true colour RAMDAC
+ *          family.
+ *
+ *
+ *
+ * Authors: TheCollector1995.
+ *
+ *          Copyright 2024 TheCollector1995.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
+#include <86box/timer.h>
+#include <86box/video.h>
+#include <86box/vid_svga.h>
+#include <86box/plat_unused.h>
+
+typedef struct bt481_ramdac_t {
+    int     state;
+    uint8_t cmd;
+} bt481_ramdac_t;
+
+static void
+bt481_ramdac_command(uint8_t val, void *priv, svga_t *svga)
+{
+    bt481_ramdac_t *ramdac  = (bt481_ramdac_t *) priv;
+    ramdac->cmd             = val;
+    pclog("RAMDAC CMD=%02x.\n", val);
+    switch ((ramdac->cmd >> 4) & 0x0f) {
+        default:
+        case 0x00:
+            svga->bpp = 8;
+            break;
+        case 0x08:
+        case 0x0a:
+            svga->bpp = 15;
+            break;
+        case 0x09:
+        case 0x0c:
+            svga->bpp = 16;
+            break;
+        case 0x0e:
+        case 0x0f:
+            svga->bpp = 24;
+            break;
+    }
+    svga_recalctimings(svga);
+}
+
+void
+bt481_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *priv, svga_t *svga)
+{
+    bt481_ramdac_t *ramdac = (bt481_ramdac_t *) priv;
+    uint8_t             rs = (addr & 0x03) | ((!!rs2) << 2);
+
+    switch (rs) {
+        case 0x00:
+        case 0x01:
+        case 0x03:
+        case 0x04:
+        case 0x05:
+        case 0x07:
+            svga_out(addr, val, svga);
+            ramdac->state = 0;
+            break;
+        case 0x02:
+            pclog("RAMDAC Write State=%x.\n", ramdac->state);
+            switch (ramdac->state) {
+                case 4:
+                    bt481_ramdac_command(val, ramdac, svga);
+                    break;
+                default:
+                    svga_out(addr, val, svga);
+                    break;
+            }
+            break;
+        case 0x06:
+            bt481_ramdac_command(val, ramdac, svga);
+            ramdac->state = 0;
+            break;
+
+        default:
+            break;
+    }
+}
+
+uint8_t
+bt481_ramdac_in(uint16_t addr, int rs2, void *priv, svga_t *svga)
+{
+    bt481_ramdac_t * ramdac = (bt481_ramdac_t *) priv;
+    uint8_t          temp   = 0xff;
+    uint8_t          rs     = (addr & 0x03) | ((!!rs2) << 2);
+
+    switch (rs) {
+        case 0x02:
+        case 0x06:
+            switch (ramdac->state) {
+                case 4:
+                    temp = ramdac->cmd;
+                    break;
+                default:
+                    temp = svga_in(addr, svga);
+                    ramdac->state++;
+                    break;
+            }
+            break;
+
+        default:
+            temp          = svga_in(addr, svga);
+            ramdac->state = 0;
+            break;
+    }
+
+    pclog("RAMDAC IN=%02x, ret=%02x.\n", rs, temp);
+    return temp;
+}
+
+static void *
+bt481_ramdac_init(UNUSED(const device_t *info))
+{
+    bt481_ramdac_t *ramdac = (bt481_ramdac_t *) malloc(sizeof(bt481_ramdac_t));
+    memset(ramdac, 0, sizeof(bt481_ramdac_t));
+
+    return ramdac;
+}
+
+static void
+bt481_ramdac_close(void *priv)
+{
+    bt481_ramdac_t *ramdac = (bt481_ramdac_t *) priv;
+
+    if (ramdac)
+        free(ramdac);
+}
+
+const device_t bt481_ramdac_device = {
+    .name          = "Brooktree Bt481 RAMDAC",
+    .internal_name = "bt481_ramdac",
+    .flags         = 0,
+    .local         = 0,
+    .init          = bt481_ramdac_init,
+    .close         = bt481_ramdac_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/video/vid_bt48x_ramdac.c b/src/video/ramdac/vid_ramdac_bt48x.c
similarity index 98%
rename from src/video/vid_bt48x_ramdac.c
rename to src/video/ramdac/vid_ramdac_bt48x.c
index 91ddce956..64112e089 100644
--- a/src/video/vid_bt48x_ramdac.c
+++ b/src/video/ramdac/vid_ramdac_bt48x.c
@@ -365,8 +365,11 @@ bt48x_recalctimings(void *priv, svga_t *svga)
     const bt48x_ramdac_t *ramdac = (bt48x_ramdac_t *) priv;
 
     svga->interlace = ramdac->cmd_r2 & 0x08;
-    if (ramdac->cmd_r3 & 0x08)
-        svga->hdisp *= 2; /* x2 clock multiplier */
+    if (ramdac->cmd_r3 & 0x08) {
+        svga->hdisp <<= 1; /* x2 clock multiplier */
+        svga->dots_per_clock <<= 1;
+        svga->clock *= 2.0;
+    }
 }
 
 void
@@ -420,7 +423,7 @@ bt48x_hwcursor_draw(svga_t *svga, int displine)
             comb = (b0 | (b1 << 1));
 
             y_pos = displine;
-            x_pos = offset + svga->x_add;
+            x_pos = (offset + svga->x_add) & 2047;
             p     = buffer32->line[y_pos];
 
             if (offset >= svga->dac_hwcursor_latch.x) {
@@ -538,7 +541,7 @@ const device_t bt484_ramdac_device = {
     .init          = bt48x_ramdac_init,
     .close         = bt48x_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -552,7 +555,7 @@ const device_t att20c504_ramdac_device = {
     .init          = bt48x_ramdac_init,
     .close         = bt48x_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -566,7 +569,7 @@ const device_t bt485_ramdac_device = {
     .init          = bt48x_ramdac_init,
     .close         = bt48x_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -580,7 +583,7 @@ const device_t att20c505_ramdac_device = {
     .init          = bt48x_ramdac_init,
     .close         = bt48x_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -594,7 +597,7 @@ const device_t bt485a_ramdac_device = {
     .init          = bt48x_ramdac_init,
     .close         = bt48x_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/vid_ibm_rgb528_ramdac.c b/src/video/ramdac/vid_ramdac_ibm_rgb528.c
similarity index 81%
rename from src/video/vid_ibm_rgb528_ramdac.c
rename to src/video/ramdac/vid_ramdac_ibm_rgb528.c
index 1b19a3a0f..2f1d57240 100644
--- a/src/video/vid_ibm_rgb528_ramdac.c
+++ b/src/video/ramdac/vid_ramdac_ibm_rgb528.c
@@ -83,6 +83,12 @@ typedef struct ibm_rgb528_ramdac_t {
     uint8_t              cursor_array;
     uint8_t              cursor_hotspot_x;
     uint8_t              cursor_hotspot_y;
+    uint8_t              misc_clock;
+    uint8_t              pix_f_ref_div;
+    uint8_t              pix_f[16];
+    uint8_t              pix_n[8];
+    uint8_t              pix_m[8];
+    float                ref_clock;
 } ibm_rgb528_ramdac_t;
 
 void
@@ -104,7 +110,7 @@ ibm_rgb528_render_4bpp(svga_t *svga)
     if ((svga->displine + svga->y_add) < 0)
         return;
 
-    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->changedvram[(svga->ma >> 12) + 2] || svga->fullchange) {
+    if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->changedvram[(svga->memaddr >> 12) + 2] || svga->fullchange) {
         p = &buffer32->line[svga->displine + svga->y_add][svga->x_add];
 
         if (svga->firstline_draw == 2000)
@@ -114,8 +120,8 @@ ibm_rgb528_render_4bpp(svga_t *svga)
         for (int x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
             if (vram_size == 3) {
                 if (!(x & 31)) {
-                    dat64  = *(uint64_t *) (&svga->vram[svga->ma]);
-                    dat642 = *(uint64_t *) (&svga->vram[svga->ma + 8]);
+                    dat64  = *(uint64_t *) (&svga->vram[svga->memaddr]);
+                    dat642 = *(uint64_t *) (&svga->vram[svga->memaddr + 8]);
                     if (swap_word) {
                         dat64  = (dat64 << 32ULL) | (dat64 >> 32ULL);
                         dat642 = (dat642 << 32ULL) | (dat642 >> 32ULL);
@@ -127,7 +133,7 @@ ibm_rgb528_render_4bpp(svga_t *svga)
                     dat = (((x & 16) ? dat642 : dat64) >> (((x & 15) << 2) ^ 4)) & 0xf;
             } else if (vram_size == 1) {
                 if (!(x & 15)) {
-                    dat64 = *(uint64_t *) (&svga->vram[svga->ma]);
+                    dat64 = *(uint64_t *) (&svga->vram[svga->memaddr]);
                     if (swap_word)
                         dat64 = (dat64 << 32ULL) | (dat64 >> 32ULL);
                 }
@@ -137,7 +143,7 @@ ibm_rgb528_render_4bpp(svga_t *svga)
                     dat = (dat64 >> (((x & 15) << 2) ^ 4)) & 0xf;
             } else {
                 if (!(x & 7))
-                    dat32 = *(uint32_t *) (&svga->vram[svga->ma]);
+                    dat32 = *(uint32_t *) (&svga->vram[svga->memaddr]);
                 if (swap_nib)
                     dat = (dat32 >> ((x & 7) << 2)) & 0xf;
                 else
@@ -156,11 +162,11 @@ ibm_rgb528_render_4bpp(svga_t *svga)
                 p[x] = dat_out.pixel & 0xffffff;
 
             if ((vram_size == 3) && ((x & 31) == 31))
-                svga->ma = (svga->ma + 16) & svga->vram_display_mask;
+                svga->memaddr = (svga->memaddr + 16) & svga->vram_display_mask;
             if ((vram_size == 1) && ((x & 15) == 15))
-                svga->ma = (svga->ma + 8) & svga->vram_display_mask;
+                svga->memaddr = (svga->memaddr + 8) & svga->vram_display_mask;
             else if ((!vram_size) && ((x & 7) == 7))
-                svga->ma = (svga->ma + 4) & svga->vram_display_mask;
+                svga->memaddr = (svga->memaddr + 4) & svga->vram_display_mask;
         }
     }
 }
@@ -182,7 +188,7 @@ ibm_rgb528_render_8bpp(svga_t *svga)
     if ((svga->displine + svga->y_add) < 0)
         return;
 
-    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->changedvram[(svga->ma >> 12) + 2] || svga->fullchange) {
+    if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->changedvram[(svga->memaddr >> 12) + 2] || svga->fullchange) {
         p = &buffer32->line[svga->displine + svga->y_add][svga->x_add];
 
         if (svga->firstline_draw == 2000)
@@ -192,8 +198,8 @@ ibm_rgb528_render_8bpp(svga_t *svga)
         for (int x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
             if (vram_size == 3) {
                 if (!(x & 15)) {
-                    dat64  = *(uint64_t *) (&svga->vram[svga->ma]);
-                    dat642 = *(uint64_t *) (&svga->vram[svga->ma + 8]);
+                    dat64  = *(uint64_t *) (&svga->vram[svga->memaddr]);
+                    dat642 = *(uint64_t *) (&svga->vram[svga->memaddr + 8]);
                     if (swap_word) {
                         dat64  = (dat64 << 32ULL) | (dat64 >> 32ULL);
                         dat642 = (dat642 << 32ULL) | (dat642 >> 32ULL);
@@ -202,14 +208,14 @@ ibm_rgb528_render_8bpp(svga_t *svga)
                 dat = (((x & 8) ? dat642 : dat64) >> ((x & 7) << 3)) & 0xff;
             } else if (vram_size == 1) {
                 if (!(x & 7)) {
-                    dat64 = *(uint64_t *) (&svga->vram[svga->ma]);
+                    dat64 = *(uint64_t *) (&svga->vram[svga->memaddr]);
                     if (swap_word)
                         dat64 = (dat64 << 32ULL) | (dat64 >> 32ULL);
                 }
                 dat = (dat64 >> ((x & 7) << 3)) & 0xff;
             } else {
                 if (!(x & 3))
-                    dat32 = *(uint32_t *) (&svga->vram[svga->ma]);
+                    dat32 = *(uint32_t *) (&svga->vram[svga->memaddr]);
                 dat = (dat32 >> ((x & 3) << 3)) & 0xff;
             }
             if (b8_dcol == 0x00) {
@@ -225,11 +231,11 @@ ibm_rgb528_render_8bpp(svga_t *svga)
                 p[x] = dat_out.pixel & 0xffffff;
 
             if ((vram_size == 3) && ((x & 15) == 15))
-                svga->ma = (svga->ma + 16) & svga->vram_display_mask;
+                svga->memaddr = (svga->memaddr + 16) & svga->vram_display_mask;
             else if ((vram_size == 1) && ((x & 7) == 7))
-                svga->ma = (svga->ma + 8) & svga->vram_display_mask;
+                svga->memaddr = (svga->memaddr + 8) & svga->vram_display_mask;
             else if ((!vram_size) && ((x & 3) == 3))
-                svga->ma = (svga->ma + 4) & svga->vram_display_mask;
+                svga->memaddr = (svga->memaddr + 4) & svga->vram_display_mask;
         }
     }
 }
@@ -262,7 +268,7 @@ ibm_rgb528_render_15_16bpp(svga_t *svga)
     if (b555_565 && (b16_dcol != 0x01))
         partition &= 0xc0;
 
-    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->changedvram[(svga->ma >> 12) + 2] || svga->fullchange) {
+    if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->changedvram[(svga->memaddr >> 12) + 2] || svga->fullchange) {
         p = &buffer32->line[svga->displine + svga->y_add][svga->x_add];
 
         if (svga->firstline_draw == 2000)
@@ -272,8 +278,8 @@ ibm_rgb528_render_15_16bpp(svga_t *svga)
         for (int x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
             if (vram_size == 2) {
                 if (!(x & 7)) {
-                    dat64  = *(uint64_t *) (&svga->vram[svga->ma]);
-                    dat642 = *(uint64_t *) (&svga->vram[svga->ma + 8]);
+                    dat64  = *(uint64_t *) (&svga->vram[svga->memaddr]);
+                    dat642 = *(uint64_t *) (&svga->vram[svga->memaddr + 8]);
                     if (swap_word) {
                         dat64  = (dat64 << 32ULL) | (dat64 >> 32ULL);
                         dat642 = (dat64 << 32ULL) | (dat642 >> 32ULL);
@@ -282,14 +288,14 @@ ibm_rgb528_render_15_16bpp(svga_t *svga)
                 dat = (((x & 4) ? dat642 : dat64) >> ((x & 3) << 4)) & 0xffff;
             } else if (vram_size == 1) {
                 if (!(x & 3)) {
-                    dat64 = *(uint64_t *) (&svga->vram[svga->ma]);
+                    dat64 = *(uint64_t *) (&svga->vram[svga->memaddr]);
                     if (swap_word)
                         dat64 = (dat64 << 32ULL) | (dat64 >> 32ULL);
                 }
                 dat = (dat64 >> ((x & 3) << 4)) & 0xffff;
             } else {
                 if (!(x & 1))
-                    dat32 = *(uint32_t *) (&svga->vram[svga->ma]);
+                    dat32 = *(uint32_t *) (&svga->vram[svga->memaddr]);
                 dat = (dat32 >> ((x & 1) << 4)) & 0xffff;
             }
             dat_ex = (ibm_rgb528_pixel16_t *) &dat;
@@ -350,11 +356,11 @@ ibm_rgb528_render_15_16bpp(svga_t *svga)
                 p[x] = dat_out.pixel & 0xffffff;
 
             if ((vram_size == 3) && ((x & 7) == 7))
-                svga->ma = (svga->ma + 16) & svga->vram_display_mask;
+                svga->memaddr = (svga->memaddr + 16) & svga->vram_display_mask;
             else if ((vram_size == 1) && ((x & 3) == 3))
-                svga->ma = (svga->ma + 8) & svga->vram_display_mask;
+                svga->memaddr = (svga->memaddr + 8) & svga->vram_display_mask;
             else if (!vram_size && ((x & 1) == 1))
-                svga->ma = (svga->ma + 4) & svga->vram_display_mask;
+                svga->memaddr = (svga->memaddr + 4) & svga->vram_display_mask;
         }
     }
 }
@@ -378,7 +384,7 @@ ibm_rgb528_render_24bpp(svga_t *svga)
     if ((svga->displine + svga->y_add) < 0)
         return;
 
-    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->changedvram[(svga->ma >> 12) + 2] || svga->fullchange) {
+    if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->changedvram[(svga->memaddr >> 12) + 2] || svga->fullchange) {
         p = &buffer32->line[svga->displine + svga->y_add][svga->x_add];
 
         if (svga->firstline_draw == 2000)
@@ -389,12 +395,12 @@ ibm_rgb528_render_24bpp(svga_t *svga)
             dat_ex = (ibm_rgb528_pixel32_t *) &dat;
             if (vram_size == 3) {
                 if ((x & 15) == 0) {
-                    dat64[0] = *(uint64_t *) (&svga->vram[svga->ma & svga->vram_display_mask]);
-                    dat64[1] = *(uint64_t *) (&svga->vram[(svga->ma + 8) & svga->vram_display_mask]);
-                    dat64[2] = *(uint64_t *) (&svga->vram[(svga->ma + 16) & svga->vram_display_mask]);
-                    dat64[3] = *(uint64_t *) (&svga->vram[(svga->ma + 24) & svga->vram_display_mask]);
-                    dat64[4] = *(uint64_t *) (&svga->vram[(svga->ma + 32) & svga->vram_display_mask]);
-                    dat64[5] = *(uint64_t *) (&svga->vram[(svga->ma + 40) & svga->vram_display_mask]);
+                    dat64[0] = *(uint64_t *) (&svga->vram[svga->memaddr & svga->vram_display_mask]);
+                    dat64[1] = *(uint64_t *) (&svga->vram[(svga->memaddr + 8) & svga->vram_display_mask]);
+                    dat64[2] = *(uint64_t *) (&svga->vram[(svga->memaddr + 16) & svga->vram_display_mask]);
+                    dat64[3] = *(uint64_t *) (&svga->vram[(svga->memaddr + 24) & svga->vram_display_mask]);
+                    dat64[4] = *(uint64_t *) (&svga->vram[(svga->memaddr + 32) & svga->vram_display_mask]);
+                    dat64[5] = *(uint64_t *) (&svga->vram[(svga->memaddr + 40) & svga->vram_display_mask]);
                     if (swap_word) {
                         dat64[0] = (dat64[0] << 32ULL) | (dat64[0] >> 32ULL);
                         dat64[1] = (dat64[1] << 32ULL) | (dat64[1] >> 32ULL);
@@ -407,9 +413,9 @@ ibm_rgb528_render_24bpp(svga_t *svga)
                 dat_ex = (ibm_rgb528_pixel32_t *) &(dat8[(x & 15) * 3]);
             } else if (vram_size == 1) {
                 if ((x & 7) == 0) {
-                    dat64[0] = *(uint64_t *) (&svga->vram[svga->ma & svga->vram_display_mask]);
-                    dat64[1] = *(uint64_t *) (&svga->vram[(svga->ma + 8) & svga->vram_display_mask]);
-                    dat64[2] = *(uint64_t *) (&svga->vram[(svga->ma + 16) & svga->vram_display_mask]);
+                    dat64[0] = *(uint64_t *) (&svga->vram[svga->memaddr & svga->vram_display_mask]);
+                    dat64[1] = *(uint64_t *) (&svga->vram[(svga->memaddr + 8) & svga->vram_display_mask]);
+                    dat64[2] = *(uint64_t *) (&svga->vram[(svga->memaddr + 16) & svga->vram_display_mask]);
                     if (swap_word) {
                         dat64[0] = (dat64[0] << 32ULL) | (dat64[0] >> 32ULL);
                         dat64[1] = (dat64[1] << 32ULL) | (dat64[1] >> 32ULL);
@@ -441,9 +447,9 @@ ibm_rgb528_render_24bpp(svga_t *svga)
                 p[x] = dat_ex->pixel & 0xffffff;
 
             if ((vram_size == 3) && ((x & 15) == 15))
-                svga->ma = (svga->ma + 48) & svga->vram_display_mask;
+                svga->memaddr = (svga->memaddr + 48) & svga->vram_display_mask;
             else if ((vram_size == 1) && ((x & 7) == 7))
-                svga->ma = (svga->ma + 24) & svga->vram_display_mask;
+                svga->memaddr = (svga->memaddr + 24) & svga->vram_display_mask;
         }
     }
 }
@@ -468,7 +474,7 @@ ibm_rgb528_render_32bpp(svga_t *svga)
     if ((svga->displine + svga->y_add) < 0)
         return;
 
-    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->changedvram[(svga->ma >> 12) + 2] || svga->fullchange) {
+    if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->changedvram[(svga->memaddr >> 12) + 2] || svga->fullchange) {
         p = &buffer32->line[svga->displine + svga->y_add][svga->x_add];
 
         if (svga->firstline_draw == 2000)
@@ -478,8 +484,8 @@ ibm_rgb528_render_32bpp(svga_t *svga)
         for (int x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
             if (vram_size == 3) {
                 if (!(x & 3)) {
-                    dat64  = *(uint64_t *) (&svga->vram[svga->ma]);
-                    dat642 = *(uint64_t *) (&svga->vram[svga->ma + 8]);
+                    dat64  = *(uint64_t *) (&svga->vram[svga->memaddr]);
+                    dat642 = *(uint64_t *) (&svga->vram[svga->memaddr + 8]);
                     if (swap_word) {
                         dat64  = (dat64 << 32ULL) | (dat64 >> 32ULL);
                         dat642 = (dat642 << 32ULL) | (dat642 >> 32ULL);
@@ -488,13 +494,13 @@ ibm_rgb528_render_32bpp(svga_t *svga)
                 dat = (((x & 2) ? dat642 : dat64) >> ((x & 1ULL) << 5ULL)) & 0xffffffff;
             } else if (vram_size == 1) {
                 if (!(x & 1)) {
-                    dat64 = *(uint64_t *) (&svga->vram[svga->ma]);
+                    dat64 = *(uint64_t *) (&svga->vram[svga->memaddr]);
                     if (swap_word)
                         dat64 = (dat64 << 32ULL) | (dat64 >> 32ULL);
                 }
                 dat = (dat64 >> ((x & 1ULL) << 5ULL)) & 0xffffffff;
             } else
-                dat = *(uint32_t *) (&svga->vram[svga->ma]);
+                dat = *(uint32_t *) (&svga->vram[svga->memaddr]);
             dat_ex = (ibm_rgb528_pixel32_t *) &dat;
             if (swaprb) {
                 temp      = dat_ex->r;
@@ -520,11 +526,11 @@ ibm_rgb528_render_32bpp(svga_t *svga)
                 p[x] = dat_ex->pixel & 0xffffff;
 
             if ((vram_size == 3) && ((x & 3) == 3))
-                svga->ma = (svga->ma + 16) & svga->vram_display_mask;
+                svga->memaddr = (svga->memaddr + 16) & svga->vram_display_mask;
             else if ((vram_size == 1) && ((x & 1) == 1))
-                svga->ma = (svga->ma + 8) & svga->vram_display_mask;
+                svga->memaddr = (svga->memaddr + 8) & svga->vram_display_mask;
             else if (!vram_size)
-                svga->ma = (svga->ma + 4) & svga->vram_display_mask;
+                svga->memaddr = (svga->memaddr + 4) & svga->vram_display_mask;
         }
     }
 }
@@ -606,11 +612,62 @@ ibm_rgb528_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *priv, svga_t *s
         case 0x06:
             if ((ramdac->index < 0x0100) || (ramdac->index > 0x04ff) || ramdac->cursor_array)
                 ramdac->indexed_data[ramdac->index] = val;
+
             switch (ramdac->index) {
                 case 0x00a:
                 case 0x00c:
                     ibm_rgb528_set_bpp(ramdac, svga);
                     break;
+                case 0x014:
+                    ramdac->pix_f_ref_div = val;
+                    break;
+                case 0x020:
+                case 0x022:
+                case 0x024:
+                case 0x026:
+                case 0x028:
+                case 0x02a:
+                case 0x02c:
+                case 0x02e:
+                    if (ramdac->indexed_data[0x0002] & 0x01) {
+                        switch (ramdac->indexed_data[0x0010] & 0x07) {
+                            case 0x00:
+                            case 0x02:
+                                ramdac->pix_f[ramdac->index - 0x0020] = val;
+                                break;
+                            case 0x01:
+                            case 0x03:
+                                ramdac->pix_m[(ramdac->index - 0x0020) >> 1] = val;
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    break;
+                case 0x021:
+                case 0x023:
+                case 0x025:
+                case 0x027:
+                case 0x029:
+                case 0x02b:
+                case 0x02d:
+                case 0x02f:
+                    if (ramdac->indexed_data[0x0002] & 0x01) {
+                        switch (ramdac->indexed_data[0x010] & 0x07) {
+                            case 0x00:
+                            case 0x02:
+                                ramdac->pix_f[ramdac->index - 0x0020] = val;
+                                break;
+                            case 0x01:
+                            case 0x03:
+                                ramdac->pix_n[(ramdac->index - 0x0020) >> 1] = val;
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    break;
+
                 case 0x030:
                     switch (val & 0xc0) {
                         case 0x00:
@@ -722,7 +779,7 @@ ibm_rgb528_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *priv, svga_t *s
             if (ramdac->indx_cntl) {
                 if (ramdac->index == 0x00ff)
                     ramdac->cursor_array = 0;
-                ramdac->index = (ramdac->index + 1) & 0x07ff;
+                ramdac->index++;
             }
             break;
         case 0x07:
@@ -794,7 +851,7 @@ ibm_rgb528_ramdac_in(uint16_t addr, int rs2, void *priv, svga_t *svga)
             if (ramdac->indx_cntl) {
                 if (ramdac->index == 0x00ff)
                     ramdac->cursor_array = 0;
-                ramdac->index = (ramdac->index + 1) & 0x07ff;
+                ramdac->index++;
             }
             break;
         case 0x07:
@@ -846,6 +903,55 @@ ibm_rgb528_recalctimings(void *priv, svga_t *svga)
     }
 }
 
+float
+ibm_rgb528_getclock(int clock, void *priv)
+{
+    const ibm_rgb528_ramdac_t *ramdac          = (ibm_rgb528_ramdac_t *) priv;
+    int                        pll_vco_div_cnt;
+    int                        pll_df;
+    int                        pll_ref_div_cnt;
+    int                        ddot_divs[8]    = { 1, 2, 4, 8, 16, 1, 1, 1 };
+    int                        ddot_div        = ddot_divs[(ramdac->indexed_data[0x0002] >> 1) & 0x07];
+    float                      f_pll;
+
+    clock                                     &= 0x03;
+
+    if (ramdac->indexed_data[0x0002] & 0x01) {
+        switch (ramdac->indexed_data[0x0010] & 0x07) {
+            case 0x00:
+            default:
+                pll_vco_div_cnt = ramdac->pix_f[clock] & 0x3f;
+                pll_df = 8 >> (ramdac->pix_f[clock] >> 6);
+                pll_ref_div_cnt = ramdac->pix_f_ref_div & 0x1f;
+                break;
+            case 0x01:
+                pll_vco_div_cnt = ramdac->pix_m[clock] & 0x3f;
+                pll_df = 8 >> (ramdac->pix_m[clock] >> 6);
+                pll_ref_div_cnt = ramdac->pix_n[clock] & 0x1f;
+                break;
+            case 0x02:
+                pll_vco_div_cnt = ramdac->pix_f[ramdac->indexed_data[0x0011] & 0x0f] & 0x3f;
+                pll_df = 8 >> (ramdac->pix_f[ramdac->indexed_data[0x0011] & 0x0f] >> 6);
+                pll_ref_div_cnt = ramdac->pix_f_ref_div & 0x1f;
+                break;
+            case 0x03:
+                pll_vco_div_cnt = ramdac->pix_m[ramdac->indexed_data[0x0011] & 0x07] & 0x3f;
+                pll_df = 8 >> (ramdac->pix_m[ramdac->indexed_data[0x0011] & 0x07] >> 6);
+                pll_ref_div_cnt = ramdac->pix_n[ramdac->indexed_data[0x0011] & 0x07] & 0x1f;
+                break;
+        }
+    } else {
+        pll_vco_div_cnt = ramdac->indexed_data[0x0016] & 0x3f;
+        pll_df = 8 >> (ramdac->indexed_data[0x0016] >> 6);
+        pll_ref_div_cnt = ramdac->indexed_data[0x0015] & 0x1f;
+    }
+
+    f_pll = ramdac->ref_clock * (float) (pll_vco_div_cnt + 65) / (float) (pll_ref_div_cnt * pll_df);
+    f_pll /= (float) ddot_div;
+
+    return f_pll;
+}
+
 void
 ibm_rgb528_hwcursor_draw(svga_t *svga, int displine)
 {
@@ -950,17 +1056,38 @@ ibm_rgb528_hwcursor_draw(svga_t *svga, int displine)
         svga->dac_hwcursor_latch.addr += pitch;
 }
 
+void
+ibm_rgb528_ramdac_set_ref_clock(void *priv, svga_t *svga, float ref_clock)
+{
+    ibm_rgb528_ramdac_t *ramdac = (ibm_rgb528_ramdac_t *) priv;
+
+    if (ramdac)
+        ramdac->ref_clock = ref_clock;
+
+    svga_recalctimings(svga);
+}
+
 void *
 ibm_rgb528_ramdac_init(UNUSED(const device_t *info))
 {
     ibm_rgb528_ramdac_t *ramdac = (ibm_rgb528_ramdac_t *) malloc(sizeof(ibm_rgb528_ramdac_t));
     memset(ramdac, 0, sizeof(ibm_rgb528_ramdac_t));
 
-    ramdac->smlc_part = 0x0100;
+    ramdac->smlc_part            = 0x0100;
+    ramdac->ref_clock            = 14318184.0f;
 
     ramdac->indexed_data[0x0008] = 0x0001;
+    ramdac->indexed_data[0x0014] = 0x0005;
     ramdac->indexed_data[0x0015] = 0x0008;
     ramdac->indexed_data[0x0016] = 0x0041;
+    ramdac->indexed_data[0x0020] = 0x0005;
+    ramdac->indexed_data[0x0021] = 0x000e;
+
+    ramdac->pix_f_ref_div = 0x0005;
+    ramdac->pix_f[0] = 0x0005;
+    ramdac->pix_f[1] = 0x000e;
+    ramdac->pix_m[0] = 0x0005;
+    ramdac->pix_n[0] = 0x000e;
 
     return ramdac;
 }
@@ -982,7 +1109,7 @@ const device_t ibm_rgb528_ramdac_device = {
     .init          = ibm_rgb528_ramdac_init,
     .close         = ibm_rgb528_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/vid_sc1148x_ramdac.c b/src/video/ramdac/vid_ramdac_sc1148x.c
similarity index 98%
rename from src/video/vid_sc1148x_ramdac.c
rename to src/video/ramdac/vid_ramdac_sc1148x.c
index 24ca4aeec..0ebcb49b6 100644
--- a/src/video/vid_sc1148x_ramdac.c
+++ b/src/video/ramdac/vid_ramdac_sc1148x.c
@@ -156,7 +156,7 @@ const device_t sc11483_ramdac_device = {
     .init          = sc1148x_ramdac_init,
     .close         = sc1148x_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -170,7 +170,7 @@ const device_t sc11487_ramdac_device = {
     .init          = sc1148x_ramdac_init,
     .close         = sc1148x_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -184,7 +184,7 @@ const device_t sc11484_nors2_ramdac_device = {
     .init          = sc1148x_ramdac_init,
     .close         = sc1148x_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -198,7 +198,7 @@ const device_t sc11486_ramdac_device = {
     .init          = sc1148x_ramdac_init,
     .close         = sc1148x_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/ramdac/vid_ramdac_sc1502x.c b/src/video/ramdac/vid_ramdac_sc1502x.c
new file mode 100644
index 000000000..4fc603ee9
--- /dev/null
+++ b/src/video/ramdac/vid_ramdac_sc1502x.c
@@ -0,0 +1,367 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Emulation of a Sierra SC1502X RAMDAC.
+ *
+ *          Used by the TLIVESA1 driver for ET4000.
+ *
+ *
+ *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2008-2018 Sarah Walker.
+ *          Copyright 2016-2018 Miran Grca.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
+#include <86box/timer.h>
+#include <86box/video.h>
+#include <86box/vid_svga.h>
+#include <86box/plat_unused.h>
+
+typedef struct sc1502x_ramdac_t {
+    int     state;
+    int     use_rs2;
+    uint8_t ctrl;
+    uint8_t idx;
+    uint8_t regs[256];
+    uint32_t pixel_mask;
+} sc1502x_ramdac_t;
+
+static void
+sc1502x_ramdac_bpp(sc1502x_ramdac_t *ramdac, svga_t *svga)
+{
+    int oldbpp = svga->bpp;
+    if (ramdac->ctrl & 0x80) {
+        if (ramdac->ctrl & 0x40) {
+            svga->bpp = 16;
+        } else
+            svga->bpp = 15;
+    } else {
+        if (ramdac->ctrl & 0x40) {
+            if (ramdac->regs[0x10] & 0x01)
+                svga->bpp = 32;
+            else if (ramdac->ctrl & 0x20)
+                svga->bpp = 24;
+            else
+                svga->bpp = 32;
+        } else
+            svga->bpp = 8;
+    }
+    if (oldbpp != svga->bpp)
+        svga_recalctimings(svga);
+}
+
+void
+sc1502x_ramdac_out(uint16_t addr, uint8_t val, void *priv, svga_t *svga)
+{
+    sc1502x_ramdac_t *ramdac = (sc1502x_ramdac_t *) priv;
+
+    switch (addr) {
+        case 0x3C6:
+            if ((ramdac->state == 4) || (ramdac->ctrl & 0x10)) {
+                ramdac->state = 0;
+                ramdac->ctrl = val;
+                if (val != 0xff)
+                    sc1502x_ramdac_bpp(ramdac, svga);
+                return;
+            }
+            ramdac->state = 0;
+            svga_out(addr, val, svga);
+            break;
+        case 0x3C7:
+            if (ramdac->ctrl & 0x10)
+                ramdac->idx = val;
+            else
+                svga_out(addr, val, svga);
+
+            ramdac->state = 0;
+            break;
+        case 0x3C8:
+            if (ramdac->ctrl & 0x10) {
+                switch (ramdac->idx) {
+                    case 8:
+                        ramdac->regs[8] = val;
+                        svga->ramdac_type = (val & 0x01) ? RAMDAC_8BIT : RAMDAC_6BIT;
+                        break;
+                    case 0x0d:
+                        ramdac->pixel_mask = val & svga->dac_mask;
+                        break;
+                    case 0x0e:
+                        ramdac->pixel_mask |= ((val & svga->dac_mask) << 8);
+                        break;
+                    case 0x0f:
+                        ramdac->pixel_mask |= ((val & svga->dac_mask) << 16);
+                        break;
+                    case 0x10:
+                        ramdac->regs[0x10] = val;
+                        sc1502x_ramdac_bpp(ramdac, svga);
+                        break;
+                    default:
+                        ramdac->regs[ramdac->idx] = val;
+                        break;
+                }
+            } else
+                svga_out(addr, val, svga);
+
+            ramdac->state = 0;
+            break;
+        case 0x3C9:
+            ramdac->state = 0;
+            svga_out(addr, val, svga);
+            break;
+
+        default:
+            break;
+    }
+}
+
+void
+sc1502x_rs2_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *priv, svga_t *svga)
+{
+    sc1502x_ramdac_t *ramdac = (sc1502x_ramdac_t *) priv;
+    uint8_t rs = (addr & 0x03);
+    rs |= ((!!rs2) << 2);
+
+    switch (rs) {
+        case 0x00:
+            if (ramdac->ctrl & 0x10) {
+                switch (ramdac->idx) {
+                    case 8:
+                        ramdac->regs[8] = val;
+                        svga->ramdac_type = (val & 0x01) ? RAMDAC_8BIT : RAMDAC_6BIT;
+                        break;
+                    case 0x0d:
+                        ramdac->pixel_mask = val & svga->dac_mask;
+                        break;
+                    case 0x0e:
+                        ramdac->pixel_mask |= ((val & svga->dac_mask) << 8);
+                        break;
+                    case 0x0f:
+                        ramdac->pixel_mask |= ((val & svga->dac_mask) << 16);
+                        break;
+                    case 0x10:
+                        ramdac->regs[0x10] = val;
+                        sc1502x_ramdac_bpp(ramdac, svga);
+                        break;
+                    default:
+                        ramdac->regs[ramdac->idx] = val;
+                        break;
+                }
+            } else
+                svga_out(addr, val, svga);
+            break;
+        case 0x01:
+            svga_out(addr, val, svga);
+            break;
+        case 0x02:
+            if (ramdac->ctrl & 0x10) {
+                ramdac->ctrl = val;
+                if (val != 0xff)
+                    sc1502x_ramdac_bpp(ramdac, svga);
+            } else
+                svga_out(addr, val, svga);
+            break;
+        case 0x03:
+            if (ramdac->ctrl & 0x10)
+                ramdac->idx = val;
+            else
+                svga_out(addr, val, svga);
+            break;
+        case 0x04:
+        case 0x05:
+        case 0x07:
+            svga_out(addr, val, svga);
+            break;
+        case 0x06:
+            ramdac->ctrl = val;
+            if (val != 0xff)
+                sc1502x_ramdac_bpp(ramdac, svga);
+            break;
+
+        default:
+            svga_out(addr, val, svga);
+            break;
+    }
+}
+
+uint8_t
+sc1502x_ramdac_in(uint16_t addr, void *priv, svga_t *svga)
+{
+    sc1502x_ramdac_t *ramdac = (sc1502x_ramdac_t *) priv;
+    uint8_t           temp   = svga_in(addr, svga);
+
+    switch (addr) {
+        case 0x3C6:
+            if (ramdac->state == 4) {
+                temp = ramdac->ctrl;
+                break;
+            }
+            ramdac->state++;
+            break;
+        case 0x3C7:
+            ramdac->state = 0;
+            break;
+        case 0x3C8:
+            if (ramdac->ctrl & 0x10) {
+                switch (ramdac->idx) {
+                    case 9:
+                        temp = 0x53;
+                        break;
+                    case 0x0a:
+                        temp = 0x3a;
+                        break;
+                    case 0x0b:
+                        temp = 0xb1;
+                        break;
+                    case 0x0c:
+                        temp = 0x41;
+                        break;
+                    case 0x0d:
+                        temp = ramdac->pixel_mask & 0xff;
+                        break;
+                    case 0x0e:
+                        temp = ramdac->pixel_mask >> 8;
+                        break;
+                    case 0x0f:
+                        temp = ramdac->pixel_mask >> 16;
+                        break;
+                    default:
+                        temp = ramdac->regs[ramdac->idx];
+                        break;
+                }
+            }
+            ramdac->state = 0;
+            break;
+        case 0x3C9:
+            if (ramdac->ctrl & 0x10)
+                temp = ramdac->idx;
+
+            ramdac->state = 0;
+            break;
+
+        default:
+            break;
+    }
+
+    return temp;
+}
+
+uint8_t
+sc1502x_rs2_ramdac_in(uint16_t addr, int rs2, void *priv, svga_t *svga)
+{
+    sc1502x_ramdac_t *ramdac = (sc1502x_ramdac_t *) priv;
+    uint8_t rs = (addr & 0x03);
+    uint8_t temp = svga_in(addr, svga);
+    rs |= ((!!rs2) << 2);
+
+    switch (rs) {
+        case 0x00:
+            if (ramdac->ctrl & 0x10) {
+                switch (ramdac->idx) {
+                    case 9:
+                        temp = 0x53;
+                        break;
+                    case 0x0a:
+                        temp = 0x3a;
+                        break;
+                    case 0x0b:
+                        temp = 0xb1;
+                        break;
+                    case 0x0c:
+                        temp = 0x41;
+                        break;
+                    case 0x0d:
+                        temp = ramdac->pixel_mask & 0xff;
+                        break;
+                    case 0x0e:
+                        temp = ramdac->pixel_mask >> 8;
+                        break;
+                    case 0x0f:
+                        temp = ramdac->pixel_mask >> 16;
+                        break;
+                    default:
+                        temp = ramdac->regs[ramdac->idx];
+                        break;
+                }
+            }
+            break;
+        case 0x01:
+            if (ramdac->ctrl & 0x10)
+                temp = ramdac->idx;
+            break;
+        case 0x02:
+            if (ramdac->ctrl & 0x10)
+                temp = ramdac->ctrl;
+            break;
+        case 0x06:
+            temp = ramdac->ctrl;
+            break;
+
+        default:
+            break;
+    }
+
+    return temp;
+}
+
+static void *
+sc1502x_ramdac_init(const device_t *info)
+{
+    sc1502x_ramdac_t *ramdac = (sc1502x_ramdac_t *) malloc(sizeof(sc1502x_ramdac_t));
+    memset(ramdac, 0, sizeof(sc1502x_ramdac_t));
+
+    ramdac->ctrl = 0;
+    ramdac->pixel_mask = 0xffffff;
+
+    return ramdac;
+}
+
+static void
+sc1502x_ramdac_close(void *priv)
+{
+    sc1502x_ramdac_t *ramdac = (sc1502x_ramdac_t *) priv;
+
+    if (ramdac)
+        free(ramdac);
+}
+
+const device_t sc1502x_ramdac_device = {
+    .name          = "Sierra SC1502x RAMDAC",
+    .internal_name = "sc1502x_ramdac",
+    .flags         = 0,
+    .local         = 0,
+    .init          = sc1502x_ramdac_init,
+    .close         = sc1502x_ramdac_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t sc1502x_rs2_ramdac_device = {
+    .name          = "Sierra SC1502x RAMDAC with RS2",
+    .internal_name = "sc1502x_rs2_ramdac",
+    .flags         = 0,
+    .local         = 1,
+    .init          = sc1502x_ramdac_init,
+    .close         = sc1502x_ramdac_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/video/vid_sdac_ramdac.c b/src/video/ramdac/vid_ramdac_sdac.c
similarity index 98%
rename from src/video/vid_sdac_ramdac.c
rename to src/video/ramdac/vid_ramdac_sdac.c
index 83796506e..4e6deacdc 100644
--- a/src/video/vid_sdac_ramdac.c
+++ b/src/video/ramdac/vid_ramdac_sdac.c
@@ -313,7 +313,7 @@ const device_t gendac_ramdac_device = {
     .init          = sdac_ramdac_init,
     .close         = sdac_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -327,7 +327,7 @@ const device_t tseng_ics5301_ramdac_device = {
     .init          = sdac_ramdac_init,
     .close         = sdac_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -341,7 +341,7 @@ const device_t tseng_ics5341_ramdac_device = {
     .init          = sdac_ramdac_init,
     .close         = sdac_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -355,7 +355,7 @@ const device_t sdac_ramdac_device = {
     .init          = sdac_ramdac_init,
     .close         = sdac_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/vid_stg_ramdac.c b/src/video/ramdac/vid_ramdac_stg1702.c
similarity index 99%
rename from src/video/vid_stg_ramdac.c
rename to src/video/ramdac/vid_ramdac_stg1702.c
index 187139b3b..85d492ce7 100644
--- a/src/video/vid_stg_ramdac.c
+++ b/src/video/ramdac/vid_ramdac_stg1702.c
@@ -263,7 +263,7 @@ const device_t stg_ramdac_device = {
     .init          = stg_ramdac_init,
     .close         = stg_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/vid_tkd8001_ramdac.c b/src/video/ramdac/vid_ramdac_tkd8001.c
similarity index 99%
rename from src/video/vid_tkd8001_ramdac.c
rename to src/video/ramdac/vid_ramdac_tkd8001.c
index 4108b9a4e..c8ad1c421 100644
--- a/src/video/vid_tkd8001_ramdac.c
+++ b/src/video/ramdac/vid_ramdac_tkd8001.c
@@ -129,7 +129,7 @@ const device_t tkd8001_ramdac_device = {
     .init          = tkd8001_ramdac_init,
     .close         = tkd8001_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/vid_tvp3026_ramdac.c b/src/video/ramdac/vid_ramdac_tvp3026.c
similarity index 93%
rename from src/video/vid_tvp3026_ramdac.c
rename to src/video/ramdac/vid_ramdac_tvp3026.c
index 4b63892de..bd5a83fd0 100644
--- a/src/video/vid_tvp3026_ramdac.c
+++ b/src/video/ramdac/vid_ramdac_tvp3026.c
@@ -65,7 +65,7 @@ typedef struct tvp3026_ramdac_t {
 static void
 tvp3026_set_bpp(tvp3026_ramdac_t *ramdac, svga_t *svga)
 {
-    if ((ramdac->true_color & 0x80) == 0x80) {
+    if (ramdac->true_color & 0x80) {
         if (ramdac->mcr & 0x08)
             svga->bpp = 8;
         else
@@ -514,67 +514,15 @@ tvp3026_recalctimings(void *priv, svga_t *svga)
 {
     const tvp3026_ramdac_t *ramdac = (tvp3026_ramdac_t *) priv;
 
-    svga->interlace = (ramdac->ccr & 0x40);
+    svga->interlace = !!(ramdac->ccr & 0x40);
     /* TODO: Figure out gamma correction for 15/16 bpp color. */
-    svga->lut_map = !!(svga->bpp >= 15 && (ramdac->true_color & 0xf0) != 0x00);
+    svga->lut_map = !!((svga->bpp >= 15 && (svga->bpp != 24)) && (ramdac->true_color & 0xf0) != 0x00);
 
-    switch (ramdac->mcr) {
-        case 0x41:
-        case 0x4a:
-        case 0x61:
+    if (!(ramdac->clock_sel & 0x70)) {
+        if (ramdac->mcr != 0x98) {
             svga->hdisp <<= 1;
             svga->dots_per_clock <<= 1;
-            break;
-        case 0x42:
-        case 0x4b:
-        case 0x62:
-            svga->hdisp <<= 2;
-            svga->dots_per_clock <<= 2;
-            break;
-        case 0x43:
-        case 0x4c:
-        case 0x63:
-            svga->hdisp <<= 3;
-            svga->dots_per_clock <<= 3;
-            break;
-        case 0x44:
-        case 0x64:
-            svga->hdisp <<= 4;
-            svga->dots_per_clock <<= 4;
-            break;
-        case 0x5b:
-            switch (ramdac->true_color) {
-                case 0x16:
-                case 0x17:
-                    svga->hdisp = (svga->hdisp << 2) / 3;
-                    svga->dots_per_clock = (svga->dots_per_clock << 2) / 3;
-                    break;
-                case 0x1e:
-                case 0x1f:
-                    svga->hdisp = (svga->hdisp * 5) >> 2;
-                    svga->dots_per_clock = (svga->dots_per_clock * 5) >> 2;
-                    break;
-            }
-            break;
-        case 0x5c:
-            switch (ramdac->true_color) {
-                case 0x06:
-                case 0x07:
-                    svga->hdisp <<= 1;
-                    svga->dots_per_clock <<= 1;
-                    break;
-                case 0x16:
-                case 0x17:
-                    svga->hdisp = (svga->hdisp << 3) / 3;
-                    svga->dots_per_clock = (svga->dots_per_clock << 3) / 3;
-                    break;
-                case 0x1e:
-                case 0x1f:
-                    svga->hdisp = (svga->hdisp * 5) >> 1;
-                    svga->dots_per_clock = (svga->dots_per_clock * 5) >> 1;
-                    break;
-            }
-            break;
+        }
     }
 }
 
@@ -649,7 +597,7 @@ tvp3026_hwcursor_draw(svga_t *svga, int displine)
             comb = (b0 | (b1 << 1));
 
             y_pos = displine;
-            x_pos = offset + svga->x_add;
+            x_pos = (offset + svga->x_add) & 2047;
             p     = svga->monitor->target_buffer->line[y_pos];
 
             if (offset >= svga->dac_hwcursor_latch.x) {
@@ -785,7 +733,7 @@ const device_t tvp3026_ramdac_device = {
     .init          = tvp3026_ramdac_init,
     .close         = tvp3026_ramdac_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/vid_8514a.c b/src/video/vid_8514a.c
index 3505d1e0b..32a402ec5 100644
--- a/src/video/vid_8514a.c
+++ b/src/video/vid_8514a.c
@@ -15,6 +15,7 @@
  *
  *          Copyright 2022-2024 TheCollector1995.
  */
+#include <inttypes.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -32,9 +33,9 @@
 #include <86box/mca.h>
 #include <86box/rom.h>
 #include <86box/plat.h>
-#include <86box/thread.h>
 #include <86box/video.h>
 #include <86box/vid_8514a.h>
+#include <86box/vid_8514a_device.h>
 #include <86box/vid_xga.h>
 #include <86box/vid_svga.h>
 #include <86box/vid_svga_render.h>
@@ -42,10 +43,12 @@
 #include <86box/vid_ati_mach8.h>
 #include "cpu.h"
 
-#ifdef ATI_8514_ULTRA
-#define BIOS_MACH8_ROM_PATH  "roms/video/mach8/11301113140.BIN"
+#ifdef CLAMP
+#    undef CLAMP
 #endif
 
+#define BIOS_MACH8_ROM_PATH  "roms/video/mach8/11301113140_ROM.BIN"
+
 static void     ibm8514_accel_outb(uint16_t port, uint8_t val, void *priv);
 static void     ibm8514_accel_outw(uint16_t port, uint16_t val, void *priv);
 static uint8_t  ibm8514_accel_inb(uint16_t port, void *priv);
@@ -69,14 +72,25 @@ ibm8514_log(const char *fmt, ...)
 #    define ibm8514_log(fmt, ...)
 #endif
 
-#define WRITE8(addr, var, val)                        \
-    switch ((addr) & 1) {                             \
-        case 0:                                       \
-            var = (var & 0xff00) | (val);             \
-            break;                                    \
-        case 1:                                       \
-            var = (var & 0x00ff) | ((val) << 8);      \
-            break;                                    \
+static int16_t
+CLAMP(int16_t in, int16_t min, int16_t max)
+{
+    if (in < min)
+        return min;
+    if (in > max)
+        return max;
+
+    return in;
+}
+
+#define WRITE8(addr, var, val)                   \
+    switch ((addr) & 1) {                        \
+        case 0:                                  \
+            var = (var & 0xff00) | (val);        \
+            break;                               \
+        case 1:                                  \
+            var = (var & 0x00ff) | ((val) << 8); \
+            break;                               \
     }
 
 #define READ8(addr, var)                \
@@ -90,131 +104,129 @@ ibm8514_log(const char *fmt, ...)
     }
 
 
-#define READ_PIXTRANS_WORD(cx, n)                                                                    \
-    if ((cmd <= 1) || (cmd == 5)) {                                                                    \
+#define READ_PIXTRANS_WORD(cx, n)                                                                   \
+    if ((cmd <= 1) || (cmd == 5)) {                                                                 \
         temp = dev->vram[((dev->accel.cy * dev->pitch) + (cx) + (n)) & dev->vram_mask];             \
         temp |= (dev->vram[((dev->accel.cy * dev->pitch) + (cx) + (n + 1)) & dev->vram_mask] << 8); \
-    } else {                                                                                         \
-        temp = dev->vram[(dev->accel.dest + (cx) + (n)) & dev->vram_mask];                           \
-        temp |= (dev->vram[(dev->accel.dest + (cx) + (n + 1)) & dev->vram_mask] << 8);               \
-    }
+    } else {                                                                                        \
+        temp = dev->vram[(dev->accel.dest + (cx) + (n)) & dev->vram_mask];                          \
+        temp |= (dev->vram[(dev->accel.dest + (cx) + (n + 1)) & dev->vram_mask] << 8);              \
+    }                                                                                               \
 
-#define READ(addr, dat) \
-    if (dev->bpp) { \
+#define READ(addr, dat)                               \
+    if (dev->bpp)                                     \
         dat = vram_w[(addr) & (dev->vram_mask >> 1)]; \
-    } else { \
+    else                                              \
         dat = (dev->vram[(addr) & (dev->vram_mask)]); \
+
+#define READ_HIGH(addr, dat)                            \
+    dat |= (dev->vram[(addr) & (dev->vram_mask)] << 8);
+
+#define MIX(mixmode, dest_dat, src_dat)                                                               \
+    {                                                                                                 \
+        switch ((mixmode) ? dev->accel.frgd_mix : dev->accel.bkgd_mix) {                              \
+            case 0x00:                                                                                \
+                dest_dat = ~dest_dat;                                                                 \
+                break;                                                                                \
+            case 0x01:                                                                                \
+                dest_dat = 0;                                                                         \
+                break;                                                                                \
+            case 0x02:                                                                                \
+                dest_dat = ~0;                                                                        \
+                break;                                                                                \
+            case 0x03:                                                                                \
+                dest_dat = dest_dat;                                                                  \
+                break;                                                                                \
+            case 0x04:                                                                                \
+                dest_dat = ~src_dat;                                                                  \
+                break;                                                                                \
+            case 0x05:                                                                                \
+                dest_dat = src_dat ^ dest_dat;                                                        \
+                break;                                                                                \
+            case 0x06:                                                                                \
+                dest_dat = ~(src_dat ^ dest_dat);                                                     \
+                break;                                                                                \
+            case 0x07:                                                                                \
+                dest_dat = src_dat;                                                                   \
+                break;                                                                                \
+            case 0x08:                                                                                \
+                dest_dat = ~(src_dat & dest_dat);                                                     \
+                break;                                                                                \
+            case 0x09:                                                                                \
+            case 0x11:                                                                                \
+                dest_dat = ~src_dat | dest_dat;                                                       \
+                break;                                                                                \
+            case 0x0a:                                                                                \
+            case 0x12:                                                                                \
+                dest_dat = src_dat | ~dest_dat;                                                       \
+                break;                                                                                \
+            case 0x0b:                                                                                \
+            case 0x13:                                                                                \
+                dest_dat = src_dat | dest_dat;                                                        \
+                break;                                                                                \
+            case 0x0c:                                                                                \
+                dest_dat = src_dat & dest_dat;                                                        \
+                break;                                                                                \
+            case 0x0d:                                                                                \
+                dest_dat = src_dat & ~dest_dat;                                                       \
+                break;                                                                                \
+            case 0x0e:                                                                                \
+                dest_dat = ~src_dat & dest_dat;                                                       \
+                break;                                                                                \
+            case 0x0f:                                                                                \
+                dest_dat = ~(src_dat | dest_dat);                                                     \
+                break;                                                                                \
+            case 0x10:                                                                                \
+                dest_dat = MIN(src_dat, dest_dat);                                                    \
+                break;                                                                                \
+            case 0x14:                                                                                \
+                dest_dat = MAX(src_dat, dest_dat);                                                    \
+                break;                                                                                \
+            case 0x15:                                                                                \
+                dest_dat = (src_dat | ~dest_dat) >> 1;                                                \
+                break;                                                                                \
+            case 0x16:                                                                                \
+                dest_dat = (~src_dat | dest_dat) >> 1;                                                \
+                break;                                                                                \
+            case 0x17:                                                                                \
+                dest_dat = (src_dat | dest_dat) >> 1;                                                 \
+                break;                                                                                \
+            case 0x18:                                                                                \
+            case 0x19:                                                                                \
+                dest_dat = MAX(0, ~src_dat | dest_dat);                                               \
+                break;                                                                                \
+            case 0x1a:                                                                                \
+                dest_dat = MAX(0, src_dat | ~dest_dat);                                               \
+                break;                                                                                \
+            case 0x1b:                                                                                \
+                if (dev->bpp)                                                                         \
+                    dest_dat = MIN(0xffff, src_dat | dest_dat);                                       \
+                else                                                                                  \
+                    dest_dat = MIN(0xff, src_dat | dest_dat);                                         \
+                break;                                                                                \
+            case 0x1c:                                                                                \
+            case 0x1d:                                                                                \
+                dest_dat = MAX(0, ~src_dat | dest_dat) >> 1;                                          \
+                break;                                                                                \
+            case 0x1e:                                                                                \
+                dest_dat = MAX(0, src_dat | ~dest_dat) >> 1;                                          \
+                break;                                                                                \
+            case 0x1f:                                                                                \
+                if (dev->bpp)                                                                         \
+                    dest_dat = (0xffff < (src_dat | dest_dat)) ? 0xffff : ((src_dat | dest_dat) >> 1); \
+                else                                                                                  \
+                    dest_dat = (0xff < (src_dat | dest_dat)) ? 0xff : ((src_dat | dest_dat) >> 1);    \
+                break;                                                                                \
+        }                                                                                             \
     }
 
-#define MIX(mixmode, dest_dat, src_dat)                                                       \
-    {                                                                                         \
-        switch ((mixmode) ? (dev->accel.frgd_mix & 0x1f) : (dev->accel.bkgd_mix & 0x1f)) {    \
-            case 0x00:                                                                        \
-                dest_dat = ~dest_dat;                                                         \
-                break;                                                                        \
-            case 0x01:                                                                        \
-                dest_dat = 0;                                                                 \
-                break;                                                                        \
-            case 0x02:                                                                        \
-                dest_dat = ~0;                                                                \
-                break;                                                                        \
-            case 0x03:                                                                        \
-                dest_dat = dest_dat;                                                          \
-                break;                                                                        \
-            case 0x04:                                                                        \
-                dest_dat = ~src_dat;                                                          \
-                break;                                                                        \
-            case 0x05:                                                                        \
-                dest_dat = src_dat ^ dest_dat;                                                \
-                break;                                                                        \
-            case 0x06:                                                                        \
-                dest_dat = ~(src_dat ^ dest_dat);                                             \
-                break;                                                                        \
-            case 0x07:                                                                        \
-                dest_dat = src_dat;                                                           \
-                break;                                                                        \
-            case 0x08:                                                                        \
-                dest_dat = ~(src_dat & dest_dat);                                             \
-                break;                                                                        \
-            case 0x09:                                                                        \
-                dest_dat = ~src_dat | dest_dat;                                               \
-                break;                                                                        \
-            case 0x0a:                                                                        \
-                dest_dat = src_dat | ~dest_dat;                                               \
-                break;                                                                        \
-            case 0x0b:                                                                        \
-                dest_dat = src_dat | dest_dat;                                                \
-                break;                                                                        \
-            case 0x0c:                                                                        \
-                dest_dat = src_dat & dest_dat;                                                \
-                break;                                                                        \
-            case 0x0d:                                                                        \
-                dest_dat = src_dat & ~dest_dat;                                               \
-                break;                                                                        \
-            case 0x0e:                                                                        \
-                dest_dat = ~src_dat & dest_dat;                                               \
-                break;                                                                        \
-            case 0x0f:                                                                        \
-                dest_dat = ~(src_dat | dest_dat);                                             \
-                break;                                                                        \
-            case 0x10:                                                                        \
-                dest_dat = MIN(src_dat, dest_dat);                                            \
-                break;                                                                        \
-            case 0x11:                                                                        \
-                dest_dat = dest_dat - src_dat;                                                \
-                break;                                                                        \
-            case 0x12:                                                                        \
-                dest_dat = src_dat - dest_dat;                                                \
-                break;                                                                        \
-            case 0x13:                                                                        \
-                dest_dat = src_dat + dest_dat;                                                \
-                break;                                                                        \
-            case 0x14:                                                                        \
-                dest_dat = MAX(src_dat, dest_dat);                                            \
-                break;                                                                        \
-            case 0x15:                                                                        \
-                dest_dat = (dest_dat - src_dat) >> 1;                                         \
-                break;                                                                        \
-            case 0x16:                                                                        \
-                dest_dat = (src_dat - dest_dat) >> 1;                                         \
-                break;                                                                        \
-            case 0x17:                                                                        \
-                dest_dat = (dest_dat + src_dat) >> 1;                                         \
-                break;                                                                        \
-            case 0x18:                                                                        \
-                dest_dat = MAX(0, (dest_dat - src_dat));                                      \
-                break;                                                                        \
-            case 0x19:                                                                        \
-                dest_dat = MAX(0, (dest_dat - src_dat));                                      \
-                break;                                                                        \
-            case 0x1a:                                                                        \
-                dest_dat = MAX(0, (src_dat - dest_dat));                                      \
-                break;                                                                        \
-            case 0x1b:                                                                        \
-                dest_dat = MIN(~0, (dest_dat + src_dat));                                     \
-                break;                                                                        \
-            case 0x1c:                                                                        \
-                dest_dat = MAX(0, (dest_dat - src_dat)) / 2;                                  \
-                break;                                                                        \
-            case 0x1d:                                                                        \
-                dest_dat = MAX(0, (dest_dat - src_dat)) / 2;                                  \
-                break;                                                                        \
-            case 0x1e:                                                                        \
-                dest_dat = MAX(0, (src_dat - dest_dat)) / 2;                                  \
-                break;                                                                        \
-            case 0x1f:                                                                        \
-                dest_dat = (~0 < (src_dat + dest_dat)) ? ~0 : ((src_dat + dest_dat) >> 1); 	  \
-                break;                                                                        \
-        }                                                                                     \
-    }
-
-#define WRITE(addr, dat)                                         \
-    if (dev->bpp) { \
-        vram_w[((addr)) & (dev->vram_mask >> 1)]                    = dat; \
-        dev->changedvram[(((addr)) & (dev->vram_mask >> 1)) >> 11] = changeframecount; \
-    } else { \
-        dev->vram[((addr)) & (dev->vram_mask)]                = dat; \
-        dev->changedvram[(((addr)) & (dev->vram_mask)) >> 12] = changeframecount; \
+#define WRITE(addr, dat)                                                               \
+    if (dev->bpp) {                                                                    \
+        vram_w[((addr)) & (dev->vram_mask >> 1)]                    = dat;             \
+        dev->changedvram[(((addr)) & (dev->vram_mask >> 1)) >> 11] = svga->monitor->mon_changeframecount; \
+    } else {                                                                           \
+        dev->vram[((addr)) & (dev->vram_mask)]                = dat;                   \
+        dev->changedvram[(((addr)) & (dev->vram_mask)) >> 12] = svga->monitor->mon_changeframecount;      \
     }
 
 int ibm8514_active = 0;
@@ -224,7 +236,7 @@ ibm8514_cpu_src(svga_t *svga)
 {
     const ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (!(dev->accel.cmd & 0x100))
+    if (dev->accel.cmd_back)
         return 0;
 
     if (dev->accel.cmd & 1)
@@ -238,7 +250,7 @@ ibm8514_cpu_dest(svga_t *svga)
 {
     const ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (!(dev->accel.cmd & 0x100))
+    if (dev->accel.cmd_back)
         return 0;
 
     if (dev->accel.cmd & 1)
@@ -256,13 +268,12 @@ ibm8514_accel_out_pixtrans(svga_t *svga, UNUSED(uint16_t port), uint32_t val, in
     uint32_t   monoxfer  = 0xffffffff;
     int        pixcnt    = 0;
     int        pixcntl   = (dev->accel.multifunc[0x0a] >> 6) & 3;
-    int        frgd_mix  = (dev->accel.frgd_mix >> 5) & 3;
-    int        bkgd_mix  = (dev->accel.bkgd_mix >> 5) & 3;
+    int        frgd_mix  = dev->accel.frgd_sel;
+    int        bkgd_mix  = dev->accel.bkgd_sel;
     int        cmd       = dev->accel.cmd >> 13;
-    int        and3      = dev->accel.cur_x & 3;
 
-    if (dev->accel.cmd & 0x100) {
-        if (len != 1) {
+    if (!dev->accel.cmd_back) {
+        if (len == 2) {
             /*Bus size*/
             if (dev->accel.cmd & 0x200) /*16-bit*/
                 pixcnt = 16;
@@ -271,360 +282,286 @@ ibm8514_accel_out_pixtrans(svga_t *svga, UNUSED(uint16_t port), uint32_t val, in
 
             /*Pixel transfer data mode, can't be the same as Foreground/Background CPU data*/
             if (pixcntl == 2) {
-                if ((frgd_mix == 2) || (bkgd_mix == 2)) {
+                if ((frgd_mix == 2) || (bkgd_mix == 2))
                     pixelxfer = val;
-                } else {
-                    if (dev->accel.cmd & 2) {
+                else {
+                    if (dev->accel.cmd & 0x02) {
                         if (pixcnt == 16) {
                             if ((cmd >= 2) && (dev->accel.cmd & 0x1000))
                                 val = (val >> 8) | (val << 8);
                         }
-                        if (and3 == 3) {
-                            if (dev->accel.cmd & 0x1000)
-                                goto regular_nibble;
-                            if (val & 0x02)
-                                nibble |= 0x10;
-                            if (val & 0x04)
-                                nibble |= 0x08;
-                            if (val & 0x08)
-                                nibble |= 0x04;
-                            if (val & 0x10)
-                                nibble |= 0x02;
-                            if (val & 0x200)
-                                nibble |= 0x01;
-                            if (val & 0x400)
-                                nibble |= 0x80;
-                            if (val & 0x800)
-                                nibble |= 0x40;
-                            if (val & 0x1000)
-                                nibble |= 0x20;
-                        } else if (and3 == 2) {
-                            if (dev->accel.cmd & 0x1000)
-                                goto regular_nibble;
-                            if (val & 0x02)
-                                nibble |= 0x20;
-                            if (val & 0x04)
-                                nibble |= 0x10;
-                            if (val & 0x08)
-                                nibble |= 0x08;
-                            if (val & 0x10)
-                                nibble |= 0x04;
-                            if (val & 0x200)
-                                nibble |= 0x02;
-                            if (val & 0x400)
-                                nibble |= 0x01;
-                            if (val & 0x800)
-                                nibble |= 0x80;
-                            if (val & 0x1000)
-                                nibble |= 0x40;
-                        } else if (and3 == 1) {
-                            if (dev->accel.cmd & 0x1000)
-                                goto regular_nibble;
-                            if (val & 0x02)
-                                nibble |= 0x40;
-                            if (val & 0x04)
-                                nibble |= 0x20;
-                            if (val & 0x08)
-                                nibble |= 0x10;
-                            if (val & 0x10)
-                                nibble |= 0x08;
-                            if (val & 0x200)
-                                nibble |= 0x04;
-                            if (val & 0x400)
-                                nibble |= 0x02;
-                            if (val & 0x800)
-                                nibble |= 0x01;
-                            if (val & 0x1000)
-                                nibble |= 0x80;
-                        } else {
-regular_nibble:
-                            if (val & 0x02)
-                                nibble |= 0x80;
-                            if (val & 0x04)
-                                nibble |= 0x40;
-                            if (val & 0x08)
-                                nibble |= 0x20;
-                            if (val & 0x10)
-                                nibble |= 0x10;
-                            if (val & 0x200)
-                                nibble |= 0x08;
-                            if (val & 0x400)
-                                nibble |= 0x04;
-                            if (val & 0x800)
-                                nibble |= 0x02;
-                            if (val & 0x1000)
-                                nibble |= 0x01;
-                        }
-
-                        if ((and3 == 0) || (dev->accel.cmd & 0x1000) || ((dev->accel.cmd & 8) && ibm8514_cpu_src(svga))) {
-                            if ((dev->accel.cmd & 8) && ibm8514_cpu_src(svga)) {
+                        if ((cmd <= 2) || (cmd == 4) || (cmd == 6)) {
+                            if ((dev->accel.cmd & 0x08) && (cmd >= 2))
                                 monoxfer = val;
-                            } else
-                                monoxfer = nibble;
-                            ibm8514_accel_start(pixcnt, 1, monoxfer, pixelxfer, svga, len);
-                            if (dev->accel.nibbleset != NULL) {
-                                free(dev->accel.nibbleset);
-                                dev->accel.nibbleset = NULL;
-                            }
-                            if (dev->accel.writemono != NULL) {
-                                free(dev->accel.writemono);
-                                dev->accel.writemono = NULL;
-                            }
-                            return;
-                        }
-
-                        dev->accel.writemono[dev->accel.x_count] = nibble;
-                        if (val & 0x1c00) {
-                            if (and3 == 1) {
+                            else {
+                                if (val & 0x02)
+                                    nibble |= 0x80;
+                                if (val & 0x04)
+                                    nibble |= 0x40;
+                                if (val & 0x08)
+                                    nibble |= 0x20;
+                                if (val & 0x10)
+                                    nibble |= 0x10;
+                                if (val & 0x200)
+                                    nibble |= 0x08;
+                                if (val & 0x400)
+                                    nibble |= 0x04;
+                                if (val & 0x800)
+                                    nibble |= 0x02;
                                 if (val & 0x1000)
-                                    dev->accel.nibbleset[dev->accel.x_count] = 0x80;
-                                else
-                                    dev->accel.nibbleset[dev->accel.x_count] = 0;
-                            } else if (and3 == 2) {
-                                if (val & 0x1000) {
-                                    if (val & 0x800)
-                                        dev->accel.nibbleset[dev->accel.x_count] = 0xc0;
-                                    else
-                                        dev->accel.nibbleset[dev->accel.x_count] = 0x40;
-                                } else if (val & 0x800) {
-                                    if (val & 0x1000)
-                                        dev->accel.nibbleset[dev->accel.x_count] = 0xc0;
-                                    else
-                                        dev->accel.nibbleset[dev->accel.x_count] = 0x80;
-                                } else
-                                    dev->accel.nibbleset[dev->accel.x_count] = 0;
-                            } else if (and3 == 3) {
-                                if (val & 0x1000) {
-                                    if (val & 0x800) {
-                                        if (val & 0x400)
-                                            dev->accel.nibbleset[dev->accel.x_count] = 0xe0;
-                                        else
-                                            dev->accel.nibbleset[dev->accel.x_count] = 0x60;
-                                    } else if (val & 0x400) {
-                                        if (val & 0x800)
-                                            dev->accel.nibbleset[dev->accel.x_count] = 0xe0;
-                                        else
-                                            dev->accel.nibbleset[dev->accel.x_count] = 0xa0;
-                                    } else
-                                        dev->accel.nibbleset[dev->accel.x_count] = 0x20;
-                                } else if (val & 0x800) {
-                                    if (val & 0x400) {
-                                        if (val & 0x1000)
-                                            dev->accel.nibbleset[dev->accel.x_count] = 0xe0;
-                                        else
-                                            dev->accel.nibbleset[dev->accel.x_count] = 0xc0;
-                                    } else if (val & 0x1000) {
-                                        if (val & 0x400)
-                                            dev->accel.nibbleset[dev->accel.x_count] = 0xe0;
-                                        else
-                                            dev->accel.nibbleset[dev->accel.x_count] = 0x60;
-                                    } else
-                                        dev->accel.nibbleset[dev->accel.x_count] = 0x40;
-                                } else if (val & 0x400) {
-                                    if (val & 0x800) {
-                                        if (val & 0x1000)
-                                            dev->accel.nibbleset[dev->accel.x_count] = 0xe0;
-                                        else
-                                            dev->accel.nibbleset[dev->accel.x_count] = 0xc0;
-                                    } else if (val & 0x1000) {
-                                        if (val & 0x800)
-                                            dev->accel.nibbleset[dev->accel.x_count] = 0xe0;
-                                        else
-                                            dev->accel.nibbleset[dev->accel.x_count] = 0xa0;
-                                    } else
-                                        dev->accel.nibbleset[dev->accel.x_count] = 0x80;
-                                } else
-                                    dev->accel.nibbleset[dev->accel.x_count] = 0;
+                                    nibble |= 0x01;
+
+                                monoxfer = nibble;
                             }
                         } else
-                            dev->accel.nibbleset[dev->accel.x_count] = 0;
-
-                        dev->accel.x_count++;
-                        if (dev->accel.x_count == dev->accel.sys_cnt) {
-                            for (int i = 0; i < dev->accel.x_count; i++) {
-                                dev->accel.writemono[i] &= ~dev->accel.nibbleset[i];
-                                dev->accel.writemono[i] |= dev->accel.nibbleset[i + 1];
-                                ibm8514_accel_start(pixcnt, 1, dev->accel.writemono[i], pixelxfer, svga, len);
-                            }
-
-                            dev->accel.x_count = 0;
-                            if (dev->accel.nibbleset != NULL) {
-                                free(dev->accel.nibbleset);
-                                dev->accel.nibbleset = NULL;
-                            }
-                            if (dev->accel.writemono != NULL) {
-                                free(dev->accel.writemono);
-                                dev->accel.writemono = NULL;
-                            }
-                        }
-                        return;
-                    }
-                    monoxfer = val;
+                            monoxfer = val;
+                    } else
+                        monoxfer = val;
                 }
-            } else {
+            } else
                 pixelxfer = val;
-            }
-            ibm8514_accel_start(pixcnt, 1, monoxfer, pixelxfer, svga, len);
+
+            if (dev->accel.input)
+                ibm8514_accel_start(pixcnt >> 1, 1, monoxfer & 0xff, pixelxfer & 0xff, svga, len);
+            else
+                ibm8514_accel_start(pixcnt, 1, monoxfer & 0xffff, pixelxfer & 0xffff, svga, len);
         }
     }
 }
 
-static void
+void
 ibm8514_accel_out_fifo(svga_t *svga, uint16_t port, uint32_t val, int len)
 {
     ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (port != 0x9ae8 && port != 0xe2e8)
-        ibm8514_log("Port OUT FIFO=%04x, val=%04x, len=%d.\n", port, val, len);
+    if (dev == NULL)
+        return;
+
+    if (port & 0x8000) {
+        if ((port != 0xe2e8) && (port != 0xe2e9) && (port != 0xe6e8) && (port != 0xe6e9)) {
+            if (port & 0x4000)
+                port &= ~0x4000;
+        }
+    }
 
     switch (port) {
-        case 0x82e8:
-        case 0xc2e8:
-            if (len == 1)
-                dev->accel.cur_y = (dev->accel.cur_y & 0x700) | val;
-            else
-                dev->accel.cur_y = val & 0x7ff;
+        case 0x2e8:
+            WRITE8(port, dev->htotal, val);
+            ibm8514_log("IBM 8514/A compatible: (0x%04x): htotal=0x%02x.\n", port, val);
+            svga_recalctimings(svga);
             break;
-        case 0x82e9:
-        case 0xc2e9:
-            if (len == 1)
-                dev->accel.cur_y = (dev->accel.cur_y & 0xff) | ((val & 0x07) << 8);
+
+        case 0x6e8:
+            /*In preparation to switch from VGA to 8514/A mode*/
+            WRITE8(port, dev->hdisped, val);
+            ibm8514_log("[%04X:%08X]: IBM 8514/A: (0x%04x): hdisp=0x%02x.\n", CS, cpu_state.pc, port, val);
+            svga_recalctimings(svga);
+            break;
+
+        case 0x6e9:
+            WRITE8(port - 1, dev->htotal, val);
+            ibm8514_log("IBM 8514/A compatible: (0x%04x): htotal=0x%02x.\n", port, val);
+            svga_recalctimings(svga);
+            break;
+
+        case 0xae8:
+            WRITE8(port, dev->hsync_start, val);
+            ibm8514_log("IBM 8514/A compatible: (0x%04x): val=0x%02x, hsync_start=%d.\n", port, val, (val + 1) << 3);
+            svga_recalctimings(svga);
+            break;
+
+        case 0xee8:
+            WRITE8(port, dev->hsync_width, val);
+            ibm8514_log("IBM 8514/A compatible: (0x%04x): val=0x%02x, hsync_width=%d, hsyncpol=%02x.\n", port, val & 0x1f, ((val & 0x1f) + 1) << 3, val & 0x20);
+            svga_recalctimings(svga);
+            break;
+
+        case 0x12e8:
+            /*In preparation to switch from VGA to 8514/A mode*/
+            if (len == 2) {
+                dev->v_total_reg = val;
+                dev->v_total_reg &= 0x1fff;
+                ibm8514_log("IBM 8514/A compatible: (0x%04x): vtotal=0x%02x.\n", port, val);
+                svga_recalctimings(svga);
+            } else {
+                WRITE8(port, dev->v_total_reg, val);
+            }
+            break;
+        case 0x12e9:
+            /*In preparation to switch from VGA to 8514/A mode*/
+            if (len == 1) {
+                WRITE8(port, dev->v_total_reg, val >> 8);
+                dev->v_total_reg &= 0x1fff;
+                ibm8514_log("IBM 8514/A compatible: (0x%04x): vtotal=0x%02x.\n", port, val);
+                svga_recalctimings(svga);
+            }
+            break;
+
+        case 0x16e8:
+            /*In preparation to switch from VGA to 8514/A mode*/
+            if (len == 2) {
+                dev->v_disp = val;
+                dev->v_disp &= 0x1fff;
+                ibm8514_log("IBM 8514/A: V_DISP write 16E8 = %d\n", dev->v_disp);
+                ibm8514_log("IBM 8514/A: (0x%04x): vdisp=0x%02x.\n", port, val);
+                svga_recalctimings(svga);
+            } else {
+                WRITE8(port, dev->v_disp, val);
+            }
+            break;
+        case 0x16e9:
+            /*In preparation to switch from VGA to 8514/A mode*/
+            if (len == 1) {
+                WRITE8(port, dev->v_disp, val >> 8);
+                dev->v_disp &= 0x1fff;
+                ibm8514_log("IBM 8514/A: V_DISP write 16E8 = %d\n", dev->v_disp);
+                ibm8514_log("IBM 8514/A: (0x%04x): vdisp=0x%02x.\n", port, val);
+                svga_recalctimings(svga);
+            }
+            break;
+
+        case 0x1ae8:
+            /*In preparation to switch from VGA to 8514/A mode*/
+            if (len == 2) {
+                dev->v_sync_start = val;
+                dev->v_sync_start &= 0x1fff;
+                ibm8514_log("IBM 8514/A compatible: V_SYNCSTART write 1AE8 = %d\n", dev->v_syncstart);
+                ibm8514_log("IBM 8514/A compatible: (0x%04x): vsyncstart=0x%02x.\n", port, val);
+                svga_recalctimings(svga);
+            } else {
+                WRITE8(port, dev->v_sync_start, val);
+            }
+            break;
+        case 0x1ae9:
+            /*In preparation to switch from VGA to 8514/A mode*/
+            if (len == 1) {
+                WRITE8(port, dev->v_sync_start, val >> 8);
+                dev->v_sync_start &= 0x1fff;
+                dev->v_syncstart = dev->v_sync_start + 1;
+                if (dev->interlace)
+                    dev->v_syncstart >>= 1;
+
+                ibm8514_log("IBM 8514/A compatible: V_SYNCSTART write 1AE8 = %d\n", dev->v_syncstart);
+                ibm8514_log("IBM 8514/A compatible: (0x%04x): vsyncstart=0x%02x.\n", port, val);
+                svga_recalctimings(svga);
+            }
+            break;
+
+        case 0x22e8:
+            dev->disp_cntl = val;
+            dev->interlace = !!(dev->disp_cntl & 0x10);
+            ibm8514_log("IBM 8514/A compatible: DISP_CNTL write %04x=%02x, interlace=%d.\n", port, dev->disp_cntl, dev->interlace);
+            svga_recalctimings(svga);
+            break;
+
+        case 0x1ee8:
+        case 0x1ee9:
+            ibm8514_log("IBM 8514/A compatible: V_SYNC_WID write 1EE8 = %02x\n", val);
+            ibm8514_log("IBM 8514/A compatible: (0x%04x): vsyncwidth=0x%02x.\n", port, val);
+            svga_recalctimings(svga);
+            break;
+
+        case 0x42e8:
+            ibm8514_log("VBLANK status=%02x, val=%02x.\n", dev->subsys_stat, val);
+            if (len == 2) {
+                dev->subsys_cntl = val;
+                dev->subsys_stat &= ~val;
+                if ((val & 0xc000) == 0x8000) {
+                    dev->force_busy = 0;
+                    dev->force_busy2 = 0;
+                }
+            } else {
+                WRITE8(port, dev->subsys_cntl, val);
+                dev->subsys_stat &= ~val;
+            }
+            break;
+        case 0x42e9:
+            if (len == 1) {
+                WRITE8(port, dev->subsys_cntl, val);
+                if ((val & 0xc0) == 0x80) {
+                    dev->force_busy = 0;
+                    dev->force_busy2 = 0;
+                }
+            }
+            break;
+
+        case 0x4ae8:
+            WRITE8(port, dev->accel.advfunc_cntl, val);
+            dev->on = dev->accel.advfunc_cntl & 0x01;
+            ibm8514_log("[%04X:%08X]: IBM 8514/A: (0x%04x): ON=%d, shadow crt=%x, hdisp=%d, vdisp=%d.\n", CS, cpu_state.pc, port, dev->on, dev->accel.advfunc_cntl & 0x04, dev->hdisp, dev->vdisp);
+            ibm8514_log("IBM mode set %s resolution.\n", (dev->accel.advfunc_cntl & 0x04) ? "2: 1024x768" : "1: 640x480");
+            svga_recalctimings(svga);
+            break;
+
+        case 0x82e8:
+            if (len == 2)
+                dev->accel.cur_y = val & 0x7ff;
             break;
 
         case 0x86e8:
-        case 0xc6e8:
-            if (len == 1)
-                dev->accel.cur_x = (dev->accel.cur_x & 0x700) | val;
-            else
+            if (len == 2)
                 dev->accel.cur_x = val & 0x7ff;
             break;
-        case 0x86e9:
-        case 0xc6e9:
-            if (len == 1)
-                dev->accel.cur_x = (dev->accel.cur_x & 0xff) | ((val & 0x07) << 8);
-            break;
 
         case 0x8ae8:
-        case 0xcae8:
-            if (len == 1)
-                dev->accel.desty_axstp = (dev->accel.desty_axstp & 0x3f00) | val;
-            else {
-                dev->accel.desty       = val & 0x07ff;
+            if (len == 2) {
+                dev->accel.desty       = val & 0x7ff;
                 dev->accel.desty_axstp = val & 0x3fff;
                 if (val & 0x2000)
                     dev->accel.desty_axstp |= ~0x1fff;
             }
             break;
-        case 0x8ae9:
-        case 0xcae9:
-            if (len == 1) {
-                dev->accel.desty_axstp = (dev->accel.desty_axstp & 0xff) | ((val & 0x3f) << 8);
-                if (val & 0x20)
-                    dev->accel.desty_axstp |= ~0x1fff;
-            }
-            break;
 
         case 0x8ee8:
-        case 0xcee8:
-            if (len == 1)
-                dev->accel.destx_distp = (dev->accel.destx_distp & 0x3f00) | val;
-            else {
-                dev->accel.destx       = val & 0x07ff;
+            if (len == 2) {
+                dev->accel.destx       = val & 0x7ff;
                 dev->accel.destx_distp = val & 0x3fff;
                 if (val & 0x2000)
                     dev->accel.destx_distp |= ~0x1fff;
             }
             break;
-        case 0x8ee9:
-        case 0xcee9:
-            if (len == 1) {
-                dev->accel.destx_distp = (dev->accel.destx_distp & 0xff) | ((val & 0x3f) << 8);
-                if (val & 0x20)
-                    dev->accel.destx_distp |= ~0x1fff;
-            }
-            break;
 
         case 0x92e8:
-            if (len != 1)
+            if (len == 2) {
                 dev->test = val;
-            fallthrough;
-        case 0xd2e8:
-            if (len == 1)
-                dev->accel.err_term = (dev->accel.err_term & 0x3f00) | val;
-            else {
                 dev->accel.err_term = val & 0x3fff;
                 if (val & 0x2000)
                     dev->accel.err_term |= ~0x1fff;
             }
             break;
-        case 0x92e9:
-        case 0xd2e9:
-            if (len == 1) {
-                dev->accel.err_term = (dev->accel.err_term & 0xff) | ((val & 0x3f) << 8);
-                if (val & 0x20)
-                    dev->accel.err_term |= ~0x1fff;
-            }
-            break;
 
         case 0x96e8:
-        case 0xd6e8:
-            if (len == 1)
-                dev->accel.maj_axis_pcnt = (dev->accel.maj_axis_pcnt & 0x700) | val;
-            else {
+            if (len == 2) {
                 dev->accel.maj_axis_pcnt = val & 0x7ff;
                 dev->accel.maj_axis_pcnt_no_limit = val;
             }
             break;
-        case 0x96e9:
-        case 0xd6e9:
-            if (len == 1) {
-                dev->accel.maj_axis_pcnt = (dev->accel.maj_axis_pcnt & 0xff) | ((val & 0x07) << 8);
-            }
-            break;
 
         case 0x9ae8:
-        case 0xdae8:
             dev->accel.ssv_state = 0;
-            if (len == 1)
-                dev->accel.cmd = (dev->accel.cmd & 0xff00) | val;
-            else {
+            if (len == 2) {
                 dev->data_available  = 0;
                 dev->data_available2 = 0;
                 dev->accel.cmd       = val;
-                if (port == 0xdae8) {
-                    if (dev->accel.cmd & 0x100)
-                        dev->accel.cmd_back = 0;
-                }
-                ibm8514_log("8514/A CMD=%04x.\n", dev->accel.cmd);
-                ibm8514_accel_start(-1, 0, -1, 0, svga, len);
-            }
-            break;
-        case 0x9ae9:
-        case 0xdae9:
-            if (len == 1) {
-                dev->data_available  = 0;
-                dev->data_available2 = 0;
-                dev->accel.cmd       = (dev->accel.cmd & 0xff) | (val << 8);
-                if (port == 0xdae9) {
-                    if (dev->accel.cmd & 0x100)
-                        dev->accel.cmd_back = 0;
-                }
+                dev->accel.cmd_back  = 1;
+                if (dev->accel.cmd & 0x100)
+                    dev->accel.cmd_back = 0;
+
+                ibm8514_log("8514/A CMD=%04x, frgd color=%04x, frgdmix=%02x, pixcntl=%02x.\n", dev->accel.cmd, dev->accel.frgd_color, dev->accel.frgd_mix, dev->accel.multifunc[0x0a]);
                 ibm8514_accel_start(-1, 0, -1, 0, svga, len);
             }
             break;
 
         case 0x9ee8:
-        case 0xdee8:
             dev->accel.ssv_state = 1;
-            if (len == 1)
-                dev->accel.short_stroke = (dev->accel.short_stroke & 0xff00) | val;
-            else {
+            if (len == 2) {
                 dev->accel.short_stroke = val;
-                dev->accel.cx           = dev->accel.cur_x;
-                dev->accel.cy           = dev->accel.cur_y;
+
+                dev->accel.cx = dev->accel.cur_x;
                 if (dev->accel.cur_x >= 0x600)
                     dev->accel.cx |= ~0x5ff;
 
+                dev->accel.cy = dev->accel.cur_y;
                 if (dev->accel.cur_y >= 0x600)
                     dev->accel.cy |= ~0x5ff;
 
@@ -637,170 +574,91 @@ ibm8514_accel_out_fifo(svga_t *svga, uint16_t port, uint32_t val, int len)
                 }
             }
             break;
-        case 0x9ee9:
-        case 0xdee9:
-            dev->accel.ssv_state = 1;
-            if (len == 1) {
-                dev->accel.short_stroke = (dev->accel.short_stroke & 0xff) | (val << 8);
-                dev->accel.cx           = dev->accel.cur_x;
-                dev->accel.cy           = dev->accel.cur_y;
-                if (dev->accel.cur_x >= 0x600)
-                    dev->accel.cx |= ~0x5ff;
-
-                if (dev->accel.cur_y >= 0x600)
-                    dev->accel.cy |= ~0x5ff;
-                if (dev->accel.cmd & 0x1000) {
-                    ibm8514_short_stroke_start(-1, 0, -1, 0, svga, dev->accel.short_stroke & 0xff, len);
-                    ibm8514_short_stroke_start(-1, 0, -1, 0, svga, dev->accel.short_stroke >> 8, len);
-                } else {
-                    ibm8514_short_stroke_start(-1, 0, -1, 0, svga, dev->accel.short_stroke >> 8, len);
-                    ibm8514_short_stroke_start(-1, 0, -1, 0, svga, dev->accel.short_stroke & 0xff, len);
-                }
-            }
-            break;
 
         case 0xa2e8:
         case 0xe2e8:
             if (port == 0xe2e8) {
-                if (dev->accel.cmd_back) {
-                    if (len == 1)
-                        dev->accel.bkgd_color = (dev->accel.bkgd_color & 0x00ff) | val;
-                    else
+                if (len == 2) {
+                    if (dev->accel.cmd_back)
                         dev->accel.bkgd_color = val;
-                } else {
-                    if (ibm8514_cpu_dest(svga))
-                        break;
-                    ibm8514_accel_out_pixtrans(svga, port, val, len);
+                    else {
+                        if (ibm8514_cpu_dest(svga))
+                            break;
+                        ibm8514_accel_out_pixtrans(svga, port, val, len);
+                    }
                 }
             } else {
-                if (len == 1)
-                    dev->accel.bkgd_color = (dev->accel.bkgd_color & 0x00ff) | val;
-                else
+                if (len == 2)
                     dev->accel.bkgd_color = val;
             }
             break;
-        case 0xa2e9:
-        case 0xe2e9:
-            if (len == 1)
-                dev->accel.bkgd_color = (dev->accel.bkgd_color & 0xff00) | (val << 8);
-            break;
 
         case 0xa6e8:
         case 0xe6e8:
             if (port == 0xe6e8) {
-                if (dev->accel.cmd_back) {
-                    if (len == 1)
-                        dev->accel.frgd_color = (dev->accel.frgd_color & 0x00ff) | val;
-                    else
+                if (len == 2) {
+                    if (dev->accel.cmd_back)
                         dev->accel.frgd_color = val;
-                } else {
-                    if (ibm8514_cpu_dest(svga))
-                        break;
-                    ibm8514_accel_out_pixtrans(svga, port, val, len);
+                    else {
+                        if (ibm8514_cpu_dest(svga))
+                            break;
+                        ibm8514_accel_out_pixtrans(svga, port, val, len);
+                    }
                 }
             } else {
-                if (len == 1)
-                    dev->accel.frgd_color = (dev->accel.frgd_color & 0x00ff) | val;
-                else
+                if (len == 2)
                     dev->accel.frgd_color = val;
             }
             break;
-        case 0xa6e9:
-        case 0xe6e9:
-            if (len == 1)
-                dev->accel.frgd_color = (dev->accel.frgd_color & 0xff00) | (val << 8);
-            break;
 
         case 0xaae8:
-        case 0xeae8:
-            if (len == 1)
-                dev->accel.wrt_mask = (dev->accel.wrt_mask & 0x00ff) | val;
-            else
+            if (len == 2)
                 dev->accel.wrt_mask = val;
             break;
-        case 0xaae9:
-        case 0xeae9:
-            if (len == 1)
-                dev->accel.wrt_mask = (dev->accel.wrt_mask & 0xff00) | (val << 8);
-            break;
 
         case 0xaee8:
-        case 0xeee8:
-            if (len == 1)
-                dev->accel.rd_mask = (dev->accel.rd_mask & 0x00ff) | val;
-            else
+            if (len == 2)
                 dev->accel.rd_mask = val;
             break;
-        case 0xaee9:
-        case 0xeee9:
-            if (len == 1)
-                dev->accel.rd_mask = (dev->accel.rd_mask & 0xff00) | (val << 8);
-            break;
 
         case 0xb2e8:
-        case 0xf2e8:
-            if (len == 1)
-                dev->accel.color_cmp = (dev->accel.color_cmp & 0x00ff) | val;
-            else
+            if (len == 2)
                 dev->accel.color_cmp = val;
             break;
-        case 0xb2e9:
-        case 0xf2e9:
-            if (len == 1)
-                dev->accel.color_cmp = (dev->accel.color_cmp & 0xff00) | (val << 8);
-            break;
 
         case 0xb6e8:
-        case 0xf6e8:
-            dev->accel.bkgd_mix = val & 0xff;
+            dev->accel.bkgd_mix = val & 0x1f;
+            dev->accel.bkgd_sel = (val >> 5) & 3;
+            ibm8514_log("Background Mix reg=%02x.\n", val);
             break;
 
         case 0xbae8:
-        case 0xfae8:
-            dev->accel.frgd_mix = val & 0xff;
+            dev->accel.frgd_mix = val & 0x1f;
+            dev->accel.frgd_sel = (val >> 5) & 3;
+            ibm8514_log("Foreground Mix reg=%02x.\n", val);
             break;
 
         case 0xbee8:
-        case 0xfee8:
-            if (len == 1)
-                dev->accel.multifunc_cntl = (dev->accel.multifunc_cntl & 0xff00) | val;
-            else {
+            if (len == 2) {
                 dev->accel.multifunc_cntl                             = val;
                 dev->accel.multifunc[dev->accel.multifunc_cntl >> 12] = dev->accel.multifunc_cntl & 0xfff;
-                if ((dev->accel.multifunc_cntl >> 12) == 1)
-                    dev->accel.clip_top = val & 0x7ff;
 
-                if ((dev->accel.multifunc_cntl >> 12) == 2)
-                    dev->accel.clip_left = val & 0x7ff;
+                if ((dev->accel.multifunc_cntl >> 12) == 1) {
+                    dev->accel.clip_top = dev->accel.multifunc[1] & 0x3ff;
+                    if (dev->accel.multifunc[1] & 0x400)
+                        dev->accel.clip_top |= ~0x3ff;
+                }
 
+                if ((dev->accel.multifunc_cntl >> 12) == 2) {
+                    dev->accel.clip_left = dev->accel.multifunc[2] & 0x3ff;
+                    if (dev->accel.multifunc[2] & 0x400)
+                        dev->accel.clip_left |= ~0x3ff;
+                }
                 if ((dev->accel.multifunc_cntl >> 12) == 3)
-                    dev->accel.multifunc[3] = val & 0x7ff;
+                    dev->accel.clip_bottom = dev->accel.multifunc[3] & 0x7ff;
 
                 if ((dev->accel.multifunc_cntl >> 12) == 4)
-                    dev->accel.multifunc[4] = val & 0x7ff;
-
-                ibm8514_log("CLIPBOTTOM=%d, CLIPRIGHT=%d, bpp=%d, pitch=%d.\n", dev->accel.multifunc[3], dev->accel.multifunc[4], dev->accel_bpp, dev->pitch);
-                if (port == 0xfee8)
-                    dev->accel.cmd_back = 1;
-                else
-                    dev->accel.cmd_back = 0;
-            }
-            break;
-        case 0xbee9:
-        case 0xfee9:
-            if (len == 1) {
-                dev->accel.multifunc_cntl                             = (dev->accel.multifunc_cntl & 0xff) | (val << 8);
-                dev->accel.multifunc[dev->accel.multifunc_cntl >> 12] = dev->accel.multifunc_cntl & 0xfff;
-                if ((dev->accel.multifunc_cntl >> 12) == 1)
-                    dev->accel.clip_top = dev->accel.multifunc_cntl & 0x7ff;
-
-                if ((dev->accel.multifunc_cntl >> 12) == 2)
-                    dev->accel.clip_left = dev->accel.multifunc_cntl & 0x7ff;
-
-                if (port == 0xfee9)
-                    dev->accel.cmd_back = 1;
-                else
-                    dev->accel.cmd_back = 0;
+                    dev->accel.clip_right = dev->accel.multifunc[4] & 0x7ff;
             }
             break;
 
@@ -883,136 +741,23 @@ ibm8514_io_set(svga_t *svga)
     io_sethandler(0xfee8, 0x0002, ibm8514_accel_inb, ibm8514_accel_inw, NULL, ibm8514_accel_outb, ibm8514_accel_outw, NULL, svga);
 }
 
-static void
+void
 ibm8514_accel_out(uint16_t port, uint32_t val, svga_t *svga, int len)
 {
     ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
-    uint8_t    old = 0;
 
-    if (port & 0x8000)
-        ibm8514_accel_out_fifo(svga, port, val, len);
-    else {
-        switch (port) {
-            case 0x2e8:
-            case 0x2e9:
-                WRITE8(port, dev->htotal, val);
-                break;
+    if (dev == NULL)
+        return;
 
-            case 0x6e8:
-            case 0x6e9:
-                if (!(port & 1)) {
-                    if (((dev->disp_cntl & 0x60) == 0x20) || (((dev->disp_cntl & 0x60) == 0x40) && !(dev->accel.advfunc_cntl & 0x04))) {
-                        dev->hdisped = val;
-                        dev->hdisp = (dev->hdisped + 1) << 3;
-                    }
-                }
-                ibm8514_log("IBM 8514/A: H_DISP write 06E8 = %d, advfunc=%x.\n", dev->hdisp, dev->accel.advfunc_cntl & 4);
-                break;
-
-            case 0xae8:
-            case 0xae9:
-                if (!(port & 1)) {
-                    if (((dev->disp_cntl & 0x60) == 0x20) || (((dev->disp_cntl & 0x60) == 0x40) && !(dev->accel.advfunc_cntl & 0x04))) {
-                        dev->hsync_start = val;
-                        dev->hblankstart = (dev->hsync_start & 0x07) + 1;
-                    }
-                }
-                ibm8514_log("IBM 8514/A: H_SYNC_STRT write 0AE8 = %d\n", val + 1);
-                break;
-
-            case 0xee8:
-            case 0xee9:
-                if (!(port & 1)) {
-                    if (((dev->disp_cntl & 0x60) == 0x20) || (((dev->disp_cntl & 0x60) == 0x40) && !(dev->accel.advfunc_cntl & 0x04))) {
-                        dev->hsync_width = val;
-                        dev->hblank_end_val = (dev->hblankstart + (dev->hsync_width & 0x1f) - 1) & 0x3f;
-                    }
-                }
-                ibm8514_log("IBM 8514/A: H_SYNC_WID write 0EE8 = %d\n", val + 1);
-                break;
-
-            case 0x12e8:
-            case 0x12e9:
-                if (((dev->disp_cntl & 0x60) == 0x20) || (((dev->disp_cntl & 0x60) == 0x40) && !(dev->accel.advfunc_cntl & 0x04))) {
-                    WRITE8(port, dev->v_total_reg, val);
-                    dev->v_total_reg &= 0x1fff;
-                    dev->vtotal = dev->v_total_reg;
-                    dev->vtotal++;
-                }
-                break;
-
-            case 0x16e8:
-            case 0x16e9:
-                if (((dev->disp_cntl & 0x60) == 0x20) || (((dev->disp_cntl & 0x60) == 0x40) && !(dev->accel.advfunc_cntl & 0x04))) {
-                    WRITE8(port, dev->v_disp, val);
-                    dev->v_disp &= 0x1fff;
-                    dev->vdisp = dev->v_disp;
-                    dev->vdisp >>= 1;
-                    dev->vdisp++;
-                }
-                ibm8514_log("IBM 8514/A: V_DISP write 16E8 = %d\n", dev->vdisp);
-                break;
-
-            case 0x1ae8:
-            case 0x1ae9:
-                if (((dev->disp_cntl & 0x60) == 0x20) || (((dev->disp_cntl & 0x60) == 0x40) && !(dev->accel.advfunc_cntl & 0x04))) {
-                    WRITE8(port, dev->v_sync_start, val);
-                    dev->v_sync_start &= 0x1fff;
-                    dev->vsyncstart = dev->v_sync_start;
-                    dev->vsyncstart++;
-                }
-                break;
-
-            case 0x1ee8:
-            case 0x1ee9:
-                ibm8514_log("IBM 8514/A: V_SYNC_WID write 1EE8 = %02x\n", val);
-                break;
-
-            case 0x22e8:
-                dev->disp_cntl = val & 0x7e;
-                dev->interlace = !!(val & 0x10);
-                ibm8514_log("IBM 8514/A: DISP_CNTL write 22E8 = %02x, interlace = %d\n", dev->disp_cntl, dev->interlace);
-                break;
-
-            case 0x42e8:
-                old = dev->subsys_stat;
-                if (val & 1)
-                    dev->subsys_stat &= ~1;
-                if (val & 2)
-                    dev->subsys_stat &= ~2;
-                if (val & 4)
-                    dev->subsys_stat &= ~4;
-                if (val & 8)
-                    dev->subsys_stat &= ~8;
-                break;
-            case 0x42e9:
-                old = dev->subsys_cntl;
-                dev->subsys_cntl = val;
-                if ((old ^ val) & 1)
-                    dev->subsys_stat |= 1;
-                if ((old ^ val) & 2)
-                    dev->subsys_stat |= 2;
-                if ((old ^ val) & 4)
-                    dev->subsys_stat |= 4;
-                if ((old ^ val) & 8)
-                    dev->subsys_stat |= 8;
-                break;
-
-            case 0x4ae8:
-            case 0x4ae9:
-                WRITE8(port, dev->accel.advfunc_cntl, val);
-                dev->on[port & 1] = dev->accel.advfunc_cntl & 0x01;
-                vga_on = !dev->on[port & 1];
-                dev->vendor_mode[port & 1] = 0;
-                ibm8514_log("IBM 8514/A: (0x%04x): ON=%d, shadow crt=%x.\n", port, dev->on[port & 1], dev->accel.advfunc_cntl & 4);
-                svga_recalctimings(svga);
-                break;
-
-
-            default:
-                break;
+    if (port & 0x8000) {
+        if (dev->accel.cmd_back) {
+            dev->fifo_idx++;
+            if (dev->fifo_idx > 8)
+                dev->fifo_idx = 8;
         }
     }
+
+    ibm8514_accel_out_fifo(svga, port, val, len);
 }
 
 static void
@@ -1031,26 +776,156 @@ ibm8514_accel_outw(uint16_t port, uint16_t val, void *priv)
     ibm8514_accel_out(port, val, svga, 2);
 }
 
-static uint32_t
-ibm8514_accel_in(uint16_t port, svga_t *svga, int len)
+uint16_t
+ibm8514_accel_in_fifo(svga_t *svga, uint16_t port, int len)
 {
-    ibm8514_t *dev  = (ibm8514_t *) svga->dev8514;
-    uint32_t   temp = 0;
-    int        cmd;
-    int        vpos      = 0;
-    int        vblankend = svga->vblankstart + svga->crtc[0x16];
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+    uint16_t temp = 0;
+    int      cmd  = 0;
+
+    if (dev == NULL)
+        return 0xffff;
+
+    switch (port) {
+        case 0x82e8:
+            if (len == 2)
+                temp = dev->accel.cur_y;
+            break;
+
+        case 0x86e8:
+            if (len == 2)
+                temp = dev->accel.cur_x;
+            break;
+
+        case 0x92e8:
+            if (len == 2)
+                temp = dev->test;
+            break;
+
+        case 0x96e8:
+            if (len == 2)
+                temp = dev->accel.maj_axis_pcnt;
+            break;
+
+        case 0x9ae8:
+            if (len == 2) {
+                if (dev->fifo_idx <= 8) {
+                    for (int i = 1; i <= dev->fifo_idx; i++)
+                        temp |= (1 << (7 - (i - 1)));
+                } else
+                    temp = 0x00ff;
+
+                if (dev->fifo_idx > 0)
+                    dev->fifo_idx--;
+
+                if (dev->force_busy) {
+                    temp |= 0x0200; /*Hardware busy*/
+                    switch (dev->accel.cmd >> 13) {
+                        case 2:
+                        case 3:
+                        case 4:
+                        case 6:
+                            if (dev->accel.sy < 0)
+                                dev->force_busy = 0;
+                            break;
+                        default:
+                            if (!dev->accel.sy)
+                                dev->force_busy = 0;
+                            break;
+                    }
+                }
+
+                if (dev->data_available) {
+                    temp |= 0x0100; /*Read Data available*/
+                    switch (dev->accel.cmd >> 13) {
+                        case 2:
+                        case 3:
+                        case 4:
+                        case 6:
+                            if (dev->accel.sy < 0)
+                                dev->data_available = 0;
+                            break;
+                        default:
+                            if (!dev->accel.sy)
+                                dev->data_available = 0;
+                            break;
+                    }
+                }
+            }
+            break;
+        case 0x9ae9:
+            if (len == 1) {
+                dev->fifo_idx = 0;
+
+                if (dev->force_busy2)
+                    temp |= 0x02; /*Hardware busy*/
+
+                dev->force_busy2 = 0;
+
+                if (dev->data_available2) {
+                    temp |= 0x01; /*Read Data available*/
+                    switch (dev->accel.cmd >> 13) {
+                        case 2:
+                        case 3:
+                        case 4:
+                        case 6:
+                            if (dev->accel.sy < 0)
+                                dev->data_available2 = 0;
+                            break;
+                        default:
+                            if (!dev->accel.sy)
+                                dev->data_available2 = 0;
+                            break;
+                    }
+                }
+            }
+            break;
+
+        case 0xe2e8:
+        case 0xe6e8:
+            if (ibm8514_cpu_dest(svga)) {
+                if (len == 2) {
+                    cmd = (dev->accel.cmd >> 13);
+                    READ_PIXTRANS_WORD(dev->accel.cx, 0);
+                    if (dev->accel.input) {
+                        ibm8514_accel_out_pixtrans(svga, port, temp & 0xff, len);
+                        if (dev->accel.odd_in) { /*WORDs on odd destination scan lengths.*/
+                            dev->accel.odd_in = 0;
+                            temp &= ~0xff00;
+                            READ_HIGH(dev->accel.dest + dev->accel.cx, temp);
+                        }
+                        ibm8514_accel_out_pixtrans(svga, port, (temp >> 8) & 0xff, len);
+                    } else
+                        ibm8514_accel_out_pixtrans(svga, port, temp, len);
+                }
+            }
+            break;
+
+        default:
+            break;
+    }
+    return temp;
+}
+
+uint8_t
+ibm8514_accel_in(uint16_t port, svga_t *svga)
+{
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+    uint8_t   temp = 0;
+    int16_t clip_t = dev->accel.clip_top;
+    int16_t clip_l = dev->accel.clip_left;
+    uint16_t clip_b_ibm = dev->accel.clip_bottom;
+    uint16_t clip_r_ibm = dev->accel.clip_right;
+    int cmd = dev->accel.cmd >> 13;
 
     switch (port) {
         case 0x2e8:
-            vpos = dev->vc & 0x7ff;
-            if (vblankend > dev->v_total) {
-                vblankend -= dev->v_total;
-                if ((vpos >= svga->vblankstart) || (vpos <= vblankend))
-                    temp |= 2;
-            } else {
-                 if ((vpos >= svga->vblankstart) && (vpos <= vblankend))
-                    temp |= 2;
+            if (dev->vc == dev->v_syncstart) {
+                if (dev->accel.advfunc_cntl & 0x04)
+                    temp |= 0x02;
             }
+
+            ibm8514_log("Read: Display Status1=%02x.\n", temp);
             break;
 
         case 0x6e8:
@@ -1062,107 +937,50 @@ ibm8514_accel_in(uint16_t port, svga_t *svga, int len)
             break;
 
         case 0x26e8:
-            if (len == 1)
-                temp = dev->htotal & 0xff;
-            else
-                temp = dev->htotal;
-            break;
         case 0x26e9:
-            if (len == 1)
-                temp = dev->htotal >> 8;
+            READ8(port, dev->htotal);
             break;
 
         case 0x2ee8:
             temp = dev->subsys_cntl;
             break;
+        case 0x2ee9:
+            temp = 0xff;
+            break;
 
         case 0x42e8:
-            cmd  = dev->accel.cmd >> 13;
-            vpos = dev->vc & 0x7ff;
-            if (vblankend > dev->v_total) {
-                vblankend -= dev->v_total;
-                if (vpos >= svga->vblankstart || vpos <= vblankend)
-                    dev->subsys_stat |= 1;
-            } else {
-                 if (vpos >= svga->vblankstart && vpos <= vblankend)
-                    dev->subsys_stat |= 1;
-            }
-            if (len != 1) {
-                temp = dev->subsys_stat | 0xa0 | 0x8000;
-            } else
-                temp = dev->subsys_stat | 0xa0;
-            break;
-
         case 0x42e9:
-            if (len == 1)
-                temp |= 0x80;
-            break;
+            if (!(port & 1)) {
+                if ((dev->subsys_cntl & INT_VSY) && !(dev->subsys_stat & INT_VSY) && (dev->vc == dev->dispend))
+                    temp |= INT_VSY;
 
-        case 0x82e8:
-        case 0xc2e8:
-            if (len != 1)
-                temp = dev->accel.cur_y;
-            break;
-
-        case 0x86e8:
-        case 0xc6e8:
-            if (len != 1)
-                temp = dev->accel.cur_x;
-            break;
-
-        case 0x92e8:
-            if (len != 1)
-                temp = dev->test;
-            break;
-
-        case 0x9ae8:
-        case 0xdae8:
-            if (len != 1) {
-                if (dev->force_busy)
-                    temp |= 0x200; /*Hardware busy*/
-                dev->force_busy = 0;
-                if (dev->data_available) {
-                    temp |= 0x100; /*Read Data available*/
-                    dev->data_available = 0;
-                }
-            }
-            break;
-        case 0x9ae9:
-        case 0xdae9:
-            if (len == 1) {
-                if (dev->force_busy2)
-                    temp |= 2; /*Hardware busy*/
-                dev->force_busy2 = 0;
-                if (dev->data_available2) {
-                    temp |= 1; /*Read Data available*/
-                    dev->data_available2 = 0;
-                }
-            }
-            break;
-
-        case 0xe2e8:
-        case 0xe6e8:
-            if (ibm8514_cpu_dest(svga)) {
-                if (len == 1) {
-                    ; // READ_PIXTRANS_BYTE_IO(0)
+                if (cmd == 6) {
+                    if ((dev->subsys_cntl & INT_GE_BSY) &&
+                        !(dev->subsys_stat & INT_GE_BSY) &&
+                        (dev->accel.dx >= clip_l) &&
+                        (dev->accel.dx <= clip_r_ibm) &&
+                        (dev->accel.dy >= clip_t) &&
+                        (dev->accel.dy <= clip_b_ibm))
+                        temp |= INT_GE_BSY;
                 } else {
-                    cmd = (dev->accel.cmd >> 13);
-                    READ_PIXTRANS_WORD(dev->accel.cx, 0)
-                    if (dev->accel.input && !dev->accel.odd_in && !dev->accel.sx) {
-                        temp &= ~0xff00;
-                        temp |= (dev->vram[(dev->accel.newdest_in + dev->accel.cur_x) & dev->vram_mask] << 8);
-                    }
+                    if ((dev->subsys_cntl & INT_GE_BSY) &&
+                        !(dev->subsys_stat & INT_GE_BSY) &&
+                        (dev->accel.cx >= clip_l) &&
+                        (dev->accel.cx <= clip_r_ibm) &&
+                        (dev->accel.cy >= clip_t) &&
+                        (dev->accel.cy <= clip_b_ibm))
+                        temp |= INT_GE_BSY;
                 }
-                ibm8514_accel_out_pixtrans(svga, port, temp, len);
-            }
-            break;
-        case 0xe2e9:
-        case 0xe6e9:
-            if (ibm8514_cpu_dest(svga)) {
-                if (len == 1) {
-                    ; // READ_PIXTRANS_BYTE_IO(1)
-                    ibm8514_accel_out_pixtrans(svga, port, temp, len);
+
+                if (!dev->fifo_idx && !dev->on) {
+                    dev->force_busy = 0;
+                    dev->force_busy2 = 0;
+                    dev->data_available = 0;
+                    dev->data_available2 = 0;
+                    temp |= INT_FIFO_EMP;
                 }
+                temp |= (dev->subsys_stat | (dev->vram_512k_8514 ? 0x00 : 0x80));
+                temp |= 0x20;
             }
             break;
 
@@ -1176,16 +994,29 @@ static uint8_t
 ibm8514_accel_inb(uint16_t port, void *priv)
 {
     svga_t *svga = (svga_t *) priv;
+    uint8_t temp;
 
-    return ibm8514_accel_in(port, svga, 1);
+    if (port & 0x8000)
+        temp = ibm8514_accel_in_fifo(svga, port, 1);
+    else
+        temp = ibm8514_accel_in(port, svga);
+
+    return temp;
 }
 
 static uint16_t
 ibm8514_accel_inw(uint16_t port, void *priv)
 {
     svga_t *svga = (svga_t *) priv;
+    uint16_t temp;
 
-    return ibm8514_accel_in(port, svga, 2);
+    if (port & 0x8000)
+        temp = ibm8514_accel_in_fifo(svga, port, 2);
+    else {
+        temp = ibm8514_accel_in(port, svga);
+        temp |= (ibm8514_accel_in(port + 1, svga) << 8);
+    }
+    return temp;
 }
 
 void
@@ -1197,8 +1028,13 @@ ibm8514_short_stroke_start(int count, int cpu_input, uint32_t mix_dat, uint32_t
         dev->accel.ssv_len  = ssv & 0x0f;
         dev->accel.ssv_dir  = ssv & 0xe0;
         dev->accel.ssv_draw = ssv & 0x10;
+        dev->accel.ssv_len_back = dev->accel.ssv_len;
 
         if (ibm8514_cpu_src(svga)) {
+            dev->force_busy = 1;
+            dev->force_busy2 = 1;
+            dev->data_available  = 0;
+            dev->data_available2 = 0;
             return; /*Wait for data from CPU*/
         }
     }
@@ -1216,8 +1052,10 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
     uint16_t   old_dest_dat;
     int        frgd_mix;
     int        bkgd_mix;
-    uint16_t   clip_b          = dev->accel.multifunc[3];
-    uint16_t   clip_r          = dev->accel.multifunc[4];
+    int16_t    clip_t          = dev->accel.clip_top;
+    int16_t    clip_l          = dev->accel.clip_left;
+    uint16_t   clip_b          = dev->accel.clip_bottom;
+    uint16_t   clip_r          = dev->accel.clip_right;
     int        pixcntl         = (dev->accel.multifunc[0x0a] >> 6) & 3;
     uint16_t   mix_mask        = dev->bpp ? 0x8000 : 0x80;
     uint16_t   compare         = dev->accel.color_cmp;
@@ -1230,6 +1068,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
     uint16_t   bkgd_color      = dev->accel.bkgd_color;
     uint32_t   old_mix_dat;
     int        and3            = dev->accel.cur_x & 3;
+    int        poly_src;
 
     if (!dev->bpp) {
         compare &= 0xff;
@@ -1240,20 +1079,15 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
         rd_mask_polygon &= 0xff;
     }
 
-    if (dev->accel.cmd & 0x100) {
-        dev->force_busy  = 1;
-        dev->force_busy2 = 1;
-    }
-
-    frgd_mix = (dev->accel.frgd_mix >> 5) & 3;
-    bkgd_mix = (dev->accel.bkgd_mix >> 5) & 3;
+    frgd_mix = dev->accel.frgd_sel;
+    bkgd_mix = dev->accel.bkgd_sel;
 
     if (cpu_input) {
-        if ((dev->accel.cmd & 2) || (pixcntl == 2)) {
+        if ((dev->accel.cmd & 0x02) || (pixcntl == 2)) {
             if ((frgd_mix == 2) || (bkgd_mix == 2))
                 count >>= 3;
             else if (pixcntl == 2) {
-                if (dev->accel.cmd & 2)
+                if (dev->accel.cmd & 0x02)
                     count >>= 1;
                 else
                     count >>= 3;
@@ -1345,6 +1179,9 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
 
     old_mix_dat = mix_dat;
 
+    if (cmd != 0)
+        ibm8514_log("CMD=%d, full=%04x, pixcntl=%d, filling=%02x, ssvdraw=%02x.\n", cmd, dev->accel.cmd, pixcntl, dev->accel.multifunc[0x0a] & 0x06, dev->accel.ssv_draw);
+
     /*Bit 4 of the Command register is the draw yes bit, which enables writing to memory/reading from memory when enabled.
       When this bit is disabled, no writing to memory/reading from memory is allowed. (This bit is almost meaningless on
       the NOP command)*/
@@ -1353,9 +1190,13 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
             if (dev->accel.ssv_state == 0)
                 break;
 
-            if (dev->accel.cmd & 8) {
+            if (dev->accel.cmd & 0x08) {
                 while (count-- && dev->accel.ssv_len >= 0) {
-                    if (dev->accel.cx >= dev->accel.clip_left && dev->accel.cx <= clip_r && dev->accel.cy >= dev->accel.clip_top && dev->accel.cy <= clip_b) {
+                    if ((dev->accel.cx >= clip_l) &&
+                        (dev->accel.cx <= clip_r) &&
+                        (dev->accel.cy >= clip_t) &&
+                        (dev->accel.cy <= clip_b)) {
+                        dev->subsys_stat |= INT_GE_BSY;
                         switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                             case 0:
                                 src_dat = bkgd_color;
@@ -1373,17 +1214,24 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                             default:
                                 break;
                         }
+
                         READ((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
 
-                        if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
+                        if ((compare_mode == 0) ||
+                            ((compare_mode == 0x10) && (dest_dat >= compare)) ||
+                            ((compare_mode == 0x18) && (dest_dat < compare)) ||
+                            ((compare_mode == 0x20) && (dest_dat != compare)) ||
+                            ((compare_mode == 0x28) && (dest_dat == compare)) ||
+                            ((compare_mode == 0x30) && (dest_dat <= compare)) ||
+                            ((compare_mode == 0x38) && (dest_dat > compare))) {
                             old_dest_dat = dest_dat;
                             MIX(mix_dat & mix_mask, dest_dat, src_dat);
                             dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
 
                             if (dev->accel.ssv_draw) {
-                                if ((dev->accel.cmd & 4) && dev->accel.ssv_len) {
+                                if ((dev->accel.cmd & 0x04) && dev->accel.ssv_len) {
                                     WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                } else if (!(dev->accel.cmd & 4)) {
+                                } else if (!(dev->accel.cmd & 0x04)) {
                                     WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
                                 }
                             }
@@ -1397,8 +1245,15 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                     else
                         cpu_dat >>= 8;
 
-                    if (!dev->accel.ssv_len)
+                    if (!dev->accel.ssv_len) {
+                        if (cpu_input) {
+                            dev->force_busy = 0;
+                            dev->force_busy2 = 0;
+                        }
+                        dev->fifo_idx = 0;
+                        dev->accel.cmd_back = 1;
                         break;
+                    }
 
                     switch (dev->accel.ssv_dir & 0xe0) {
                         case 0x00:
@@ -1438,8 +1293,11 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                 }
             } else {
                 while (count-- && (dev->accel.ssv_len >= 0)) {
-                    if ((dev->accel.cx >= dev->accel.clip_left) && (dev->accel.cx <= clip_r) &&
-                        (dev->accel.cy >= dev->accel.clip_top) && (dev->accel.cy <= clip_b)) {
+                    if ((dev->accel.cx >= clip_l) &&
+                        (dev->accel.cx <= clip_r) &&
+                        (dev->accel.cy >= clip_t) &&
+                        (dev->accel.cy <= clip_b)) {
+                        dev->subsys_stat |= INT_GE_BSY;
                         switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                             case 0:
                                 src_dat = bkgd_color;
@@ -1460,15 +1318,21 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
 
                         READ((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
 
-                        if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
+                        if ((compare_mode == 0) ||
+                            ((compare_mode == 0x10) && (dest_dat >= compare)) ||
+                            ((compare_mode == 0x18) && (dest_dat < compare)) ||
+                            ((compare_mode == 0x20) && (dest_dat != compare)) ||
+                            ((compare_mode == 0x28) && (dest_dat == compare)) ||
+                            ((compare_mode == 0x30) && (dest_dat <= compare)) ||
+                            ((compare_mode == 0x38) && (dest_dat > compare))) {
                             old_dest_dat = dest_dat;
                             MIX(mix_dat & mix_mask, dest_dat, src_dat);
                             dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
 
                             if (dev->accel.ssv_draw) {
-                                if ((dev->accel.cmd & 4) && dev->accel.ssv_len) {
+                                if ((dev->accel.cmd & 0x04) && dev->accel.ssv_len) {
                                     WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                } else if (!(dev->accel.cmd & 4)) {
+                                } else if (!(dev->accel.cmd & 0x04)) {
                                     WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
                                 }
                             }
@@ -1482,73 +1346,44 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                     else
                         cpu_dat >>= 8;
 
-                    if (!dev->accel.ssv_len)
-                        break;
-
-                    if (dev->accel.err_term >= dev->accel.maj_axis_pcnt) {
-                        dev->accel.err_term += dev->accel.destx_distp;
-                        /*Step minor axis*/
-                        switch (dev->accel.cmd & 0xe0) {
-                            case 0x00:
-                                dev->accel.cy--;
-                                break;
-                            case 0x20:
-                                dev->accel.cy--;
-                                break;
-                            case 0x40:
-                                dev->accel.cx--;
-                                break;
-                            case 0x60:
-                                dev->accel.cx++;
-                                break;
-                            case 0x80:
-                                dev->accel.cy++;
-                                break;
-                            case 0xa0:
-                                dev->accel.cy++;
-                                break;
-                            case 0xc0:
-                                dev->accel.cx--;
-                                break;
-                            case 0xe0:
-                                dev->accel.cx++;
-                                break;
-
-                            default:
-                                break;
+                    if (!dev->accel.ssv_len) {
+                        if (cpu_input) {
+                            dev->force_busy = 0;
+                            dev->force_busy2 = 0;
                         }
-                    } else
-                        dev->accel.err_term += dev->accel.desty_axstp;
+                        dev->fifo_idx = 0;
+                        dev->accel.cmd_back = 1;
+                        break;
+                    }
 
-                    /*Step major axis*/
-                    switch (dev->accel.cmd & 0xe0) {
-                        case 0x00:
-                            dev->accel.cx--;
-                            break;
-                        case 0x20:
-                            dev->accel.cx++;
-                            break;
-                        case 0x40:
-                            dev->accel.cy--;
-                            break;
-                        case 0x60:
-                            dev->accel.cy--;
-                            break;
-                        case 0x80:
-                            dev->accel.cx--;
-                            break;
-                        case 0xa0:
-                            dev->accel.cx++;
-                            break;
-                        case 0xc0:
+                    if (dev->accel.cmd & 0x40) {
+                        if (dev->accel.cmd & 0x80)
                             dev->accel.cy++;
-                            break;
-                        case 0xe0:
-                            dev->accel.cy++;
-                            break;
+                        else
+                            dev->accel.cy--;
 
-                        default:
-                            break;
+                        if (dev->accel.err_term >= dev->accel.ssv_len_back) {
+                            dev->accel.err_term += dev->accel.destx_distp;
+                            if (dev->accel.cmd & 0x20)
+                                dev->accel.cx++;
+                            else
+                                dev->accel.cx--;
+                        } else
+                            dev->accel.err_term += dev->accel.desty_axstp;
+                    } else {
+                        if (dev->accel.cmd & 0x20)
+                            dev->accel.cx++;
+                        else
+                            dev->accel.cx--;
+
+                        if (dev->accel.err_term >= dev->accel.ssv_len_back) {
+                            dev->accel.err_term += dev->accel.destx_distp;
+                            if (dev->accel.cmd & 0x80)
+                                dev->accel.cy++;
+                            else
+                                dev->accel.cy--;
+                        } else
+                            dev->accel.err_term += dev->accel.desty_axstp;
                     }
 
                     dev->accel.ssv_len--;
@@ -1560,65 +1395,54 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
 
         case 1: /*Draw line*/
             if (!cpu_input) {
-                dev->accel.xx_count = 0;
-                dev->accel.cx       = dev->accel.cur_x;
-                dev->accel.cy       = dev->accel.cur_y;
+                dev->accel.output = 0;
+                dev->accel.x_count = 0;
 
+                dev->accel.cx = dev->accel.cur_x;
                 if (dev->accel.cur_x >= 0x600)
                     dev->accel.cx |= ~0x5ff;
 
+                dev->accel.cy = dev->accel.cur_y;
                 if (dev->accel.cur_y >= 0x600)
                     dev->accel.cy |= ~0x5ff;
 
                 dev->accel.sy = dev->accel.maj_axis_pcnt;
 
-                ibm8514_log("Line Draw 8514/A, frgdmix=%d, bkgdmix=%d, c(%d,%d), pixcntl=%d, sy=%d, polyfill=%x, selfrmix=%02x, selbkmix=%02x, bkgdcol=%02x, frgdcol=%02x, clipt=%d, clipb=%d.\n", frgd_mix, bkgd_mix, dev->accel.cx, dev->accel.cy, pixcntl, dev->accel.sy, dev->accel.multifunc[0x0a] & 6, dev->accel.frgd_mix & 0x1f, dev->accel.bkgd_mix & 0x1f, bkgd_color, frgd_color, dev->accel.clip_top, clip_b);
+                ibm8514_log("Line Draw 8514/A CMD=%04x, frgdmix=%d, bkgdmix=%d, c(%d,%d), pixcntl=%d, sy=%d, polyfill=%x, selfrmix=%02x, selbkmix=%02x, bkgdcol=%02x, frgdcol=%02x, clipt=%d, clipb=%d.\n", dev->accel.cmd, frgd_mix, bkgd_mix, dev->accel.cx, dev->accel.cy, pixcntl, dev->accel.sy, dev->accel.multifunc[0x0a] & 6, dev->accel.frgd_mix & 0x1f, dev->accel.bkgd_mix & 0x1f, bkgd_color, frgd_color, dev->accel.clip_top, clip_b);
                 if (ibm8514_cpu_src(svga)) {
-                    if (dev->accel.cmd & 2) {
-                        if (dev->accel.cmd & 8) {
-                            if (and3 == 1) {
-                                dev->accel.sy += 4;
-                                if (dev->accel.cmd & 0x20)
-                                    dev->accel.cx += 4;
-                                else
-                                    dev->accel.cx -= 4;
-                            } else if (and3 == 2) {
-                                dev->accel.sy += 5;
-                                if (dev->accel.cmd & 0x20)
-                                    dev->accel.cx += 5;
-                                else
-                                    dev->accel.cx -= 5;
-                            } else if (and3 == 3) {
-                                dev->accel.sy += 6;
-                                if (dev->accel.cmd & 0x20)
-                                    dev->accel.cx += 6;
-                                else
-                                    dev->accel.cx -= 6;
-                            } else {
-                                dev->accel.sy += 3;
-                                if (dev->accel.cmd & 0x20)
-                                    dev->accel.cx += 3;
-                                else
-                                    dev->accel.cx -= 3;
-                            }
+                    if (dev->accel.cmd & 0x02) {
+                        if (!(dev->accel.cmd & 0x1000)) {
+                            if (dev->accel.cmd & 0x08)
+                                dev->accel.output = 1;
                         }
                     }
+                    dev->force_busy = 1;
+                    dev->force_busy2 = 1;
                     dev->data_available  = 0;
                     dev->data_available2 = 0;
                     return; /*Wait for data from CPU*/
                 } else if (ibm8514_cpu_dest(svga)) {
+                    dev->force_busy = 1;
+                    dev->force_busy2 = 1;
                     dev->data_available  = 1;
                     dev->data_available2 = 1;
                     return;
                 }
             }
 
-            if (dev->accel.cmd & 8) { /*Vector Line*/
-                if (ibm8514_cpu_dest(svga) && cpu_input && (dev->accel.cmd & 2))
+            if (dev->accel.cmd & 0x08) { /*Vector Line*/
+                if (ibm8514_cpu_dest(svga) && cpu_input && (dev->accel.cmd & 0x02))
                     count >>= 1;
-                dev->accel.xx_count++;
+
+                if (dev->accel.cmd & 0x02)
+                    ibm8514_log("Line Draw Vector Single pixtrans=%04x, count=%d.\n", mix_dat, count);
+
                 while (count-- && (dev->accel.sy >= 0)) {
-                    if (dev->accel.cx >= dev->accel.clip_left && dev->accel.cx <= clip_r && dev->accel.cy >= dev->accel.clip_top && dev->accel.cy <= clip_b) {
+                    if ((dev->accel.cx >= clip_l) &&
+                        (dev->accel.cx <= clip_r) &&
+                        (dev->accel.cy >= clip_t) &&
+                        (dev->accel.cy <= clip_b)) {
+                        dev->subsys_stat |= INT_GE_BSY;
                         if (ibm8514_cpu_dest(svga) && (pixcntl == 0)) {
                             mix_dat = mix_mask; /* Mix data = forced to foreground register. */
                         } else if (ibm8514_cpu_dest(svga) && (pixcntl == 3)) {
@@ -1633,94 +1457,72 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                             if (pixcntl == 3)
                                 src_dat = ((src_dat & rd_mask) == rd_mask);
                         } else {
-                            switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
-                                case 0:
-                                    src_dat = bkgd_color;
-                                    break;
-                                case 1:
-                                    src_dat = frgd_color;
-                                    break;
-                                case 2:
-                                    src_dat = cpu_dat;
-                                    break;
-                                case 3:
-                                    src_dat = 0;
-                                    break;
+                            if (dev->accel.output) {
+                                switch ((mix_dat & 0x01) ? frgd_mix : bkgd_mix) {
+                                    case 0:
+                                        src_dat = bkgd_color;
+                                        break;
+                                    case 1:
+                                        src_dat = frgd_color;
+                                        break;
+                                    case 2:
+                                        src_dat = cpu_dat;
+                                        break;
+                                    case 3:
+                                        src_dat = 0;
+                                        break;
 
-                                default:
-                                    break;
+                                    default:
+                                        break;
+                                }
+                            } else {
+                                switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
+                                    case 0:
+                                        src_dat = bkgd_color;
+                                        break;
+                                    case 1:
+                                        src_dat = frgd_color;
+                                        break;
+                                    case 2:
+                                        src_dat = cpu_dat;
+                                        break;
+                                    case 3:
+                                        src_dat = 0;
+                                        break;
+
+                                    default:
+                                        break;
+                                }
                             }
                         }
 
                         READ((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
 
-                        if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
+                        if ((compare_mode == 0) ||
+                            ((compare_mode == 0x10) && (dest_dat >= compare)) ||
+                            ((compare_mode == 0x18) && (dest_dat < compare)) ||
+                            ((compare_mode == 0x20) && (dest_dat != compare)) ||
+                            ((compare_mode == 0x28) && (dest_dat == compare)) ||
+                            ((compare_mode == 0x30) && (dest_dat <= compare)) ||
+                            ((compare_mode == 0x38) && (dest_dat > compare))) {
                             old_dest_dat = dest_dat;
-                            MIX(mix_dat & mix_mask, dest_dat, src_dat);
+                            if (dev->accel.output) {
+                                MIX(mix_dat & 0x01, dest_dat, src_dat);
+                            } else {
+                                MIX(mix_dat & mix_mask, dest_dat, src_dat);
+                            }
                             dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                            if ((dev->accel.cmd & 2) && ibm8514_cpu_src(svga)) {
-                                if (and3 == 1) {
-                                    if (dev->accel.xx_count >= 2) {
-                                        if ((dev->accel.cmd & 4) && dev->accel.sy) {
-                                            WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                        } else if (!(dev->accel.cmd & 4)) {
-                                            WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                        }
-                                    }
-                                } else if (and3 == 2) {
-                                    if (dev->accel.xx_count == 2) {
-                                        if (count <= 2) {
-                                            if ((dev->accel.cmd & 4) && dev->accel.sy) {
-                                                WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                            } else if (!(dev->accel.cmd & 4)) {
-                                                WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                            }
-                                        }
-                                    } else if (dev->accel.xx_count >= 3) {
-                                        if ((dev->accel.cmd & 4) && dev->accel.sy) {
-                                            WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                        } else if (!(dev->accel.cmd & 4)) {
-                                            WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                        }
-                                    }
-                                } else if (and3 == 3) {
-                                    if (dev->accel.xx_count == 2) {
-                                        if (count <= 1) {
-                                            if ((dev->accel.cmd & 4) && dev->accel.sy) {
-                                                WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                            } else if (!(dev->accel.cmd & 4)) {
-                                                WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                            }
-                                        }
-                                    } else if (dev->accel.xx_count >= 3) {
-                                        if ((dev->accel.cmd & 4) && dev->accel.sy) {
-                                            WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                        } else if (!(dev->accel.cmd & 4)) {
-                                            WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                        }
-                                    }
-                                } else {
-                                    if (dev->accel.xx_count == 1) {
-                                        if (!count) {
-                                            if ((dev->accel.cmd & 4) && dev->accel.sy) {
-                                                WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                            } else if (!(dev->accel.cmd & 4)) {
-                                                WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                            }
-                                        }
-                                    } else if (dev->accel.xx_count >= 2) {
-                                        if ((dev->accel.cmd & 4) && dev->accel.sy) {
-                                            WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                        } else if (!(dev->accel.cmd & 4)) {
-                                            WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                        }
-                                    }
+                            if ((dev->accel.cmd & 0x02) && ibm8514_cpu_src(svga)) {
+                                if ((dev->accel.cmd & 0x04) && dev->accel.sy) {
+                                    WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
+                                } else if (!(dev->accel.cmd & 0x04)) {
+                                    WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
                                 }
                             } else {
                                 if (ibm8514_cpu_src(svga) || !cpu_input) {
-                                    if ((dev->accel.cmd & 4) && dev->accel.sy) {
+                                    if ((dev->accel.cmd & 0x04) && dev->accel.sy) {
                                         WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                    } else if (!(dev->accel.cmd & 4)) {
+                                    } else if (!(dev->accel.cmd & 0x04)) {
                                         WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
                                     }
                                 }
@@ -1728,17 +1530,32 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                         }
                     }
 
-                    mix_dat <<= 1;
-                    mix_dat |= 1;
+                    if (!dev->accel.sy) {
+                        if (cpu_input) {
+                            dev->force_busy = 0;
+                            dev->force_busy2 = 0;
+                        }
+                        dev->fifo_idx = 0;
+                        dev->accel.cmd_back = 1;
+                        if (!cpu_input) {
+                            dev->accel.cur_x = dev->accel.cx;
+                            dev->accel.cur_y = dev->accel.cy;
+                        }
+                        break;
+                    }
+
+                    if (dev->accel.output)
+                        mix_dat >>= 1;
+                    else {
+                        mix_dat <<= 1;
+                        mix_dat |= 1;
+                    }
+
                     if (dev->bpp)
                         cpu_dat >>= 16;
                     else
                         cpu_dat >>= 8;
 
-                    if (dev->accel.sy == 0) {
-                        break;
-                    }
-
                     switch (dev->accel.cmd & 0xe0) {
                         case 0x00:
                             dev->accel.cx++;
@@ -1775,21 +1592,25 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
 
                     dev->accel.sy--;
                 }
-                dev->accel.cur_x = dev->accel.cx;
-                dev->accel.cur_y = dev->accel.cy;
-            } else { /*Bresenham*/
+                dev->accel.x_count = 0;
+                dev->accel.output = 0;
+            } else { /*Bresenham Line*/
                 if (pixcntl == 1) {
                     dev->accel.temp_cnt = 8;
                     while (count-- && (dev->accel.sy >= 0)) {
-                        if (dev->accel.temp_cnt == 0) {
+                        if (!dev->accel.temp_cnt) {
                             dev->accel.temp_cnt = 8;
-                            mix_dat             = old_mix_dat;
+                            mix_dat = old_mix_dat;
                         }
-                        if (dev->accel.cx >= dev->accel.clip_left && dev->accel.cx <= clip_r && dev->accel.cy >= dev->accel.clip_top && dev->accel.cy <= clip_b) {
+                        if ((dev->accel.cx >= clip_l) &&
+                            (dev->accel.cx <= clip_r) &&
+                            (dev->accel.cy >= clip_t) &&
+                            (dev->accel.cy <= clip_b)) {
+                            dev->subsys_stat |= INT_GE_BSY;
                             if (ibm8514_cpu_dest(svga)) {
                                 READ((dev->accel.cy * dev->pitch) + dev->accel.cx, src_dat);
                             } else
-                                switch ((mix_dat & 1) ? frgd_mix : bkgd_mix) {
+                                switch ((mix_dat & 0x01) ? frgd_mix : bkgd_mix) {
                                     case 0:
                                         src_dat = bkgd_color;
                                         break;
@@ -1809,13 +1630,19 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
 
                             READ((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
 
-                            if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
+                            if ((compare_mode == 0) ||
+                                ((compare_mode == 0x10) && (dest_dat >= compare)) ||
+                                ((compare_mode == 0x18) && (dest_dat < compare)) ||
+                                ((compare_mode == 0x20) && (dest_dat != compare)) ||
+                                ((compare_mode == 0x28) && (dest_dat == compare)) ||
+                                ((compare_mode == 0x30) && (dest_dat <= compare)) ||
+                                ((compare_mode == 0x38) && (dest_dat > compare))) {
                                 old_dest_dat = dest_dat;
-                                MIX(mix_dat & 1, dest_dat, src_dat);
+                                MIX(mix_dat & 0x01, dest_dat, src_dat);
                                 dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                if ((dev->accel.cmd & 4) && dev->accel.sy) {
+                                if ((dev->accel.cmd & 0x04) && dev->accel.sy) {
                                     WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                } else if (!(dev->accel.cmd & 4)) {
+                                } else if (!(dev->accel.cmd & 0x04)) {
                                     WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
                                 }
                             }
@@ -1828,7 +1655,13 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                         else
                             cpu_dat >>= 8;
 
-                        if (dev->accel.sy == 0) {
+                        if (!dev->accel.sy) {
+                            if (cpu_input) {
+                                dev->force_busy = 0;
+                                dev->force_busy2 = 0;
+                            }
+                            dev->fifo_idx = 0;
+                            dev->accel.cmd_back = 1;
                             break;
                         }
 
@@ -1838,7 +1671,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                             else
                                 dev->accel.cy--;
 
-                            if (dev->accel.err_term >= 0) {
+                            if (dev->accel.err_term >= dev->accel.maj_axis_pcnt) {
                                 dev->accel.err_term += dev->accel.destx_distp;
                                 if (dev->accel.cmd & 0x20)
                                     dev->accel.cx++;
@@ -1852,7 +1685,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                             else
                                 dev->accel.cx--;
 
-                            if (dev->accel.err_term >= 0) {
+                            if (dev->accel.err_term >= dev->accel.maj_axis_pcnt) {
                                 dev->accel.err_term += dev->accel.destx_distp;
                                 if (dev->accel.cmd & 0x80)
                                     dev->accel.cy++;
@@ -1866,7 +1699,11 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                     }
                 } else {
                     while (count-- && (dev->accel.sy >= 0)) {
-                        if ((dev->accel.cx) >= dev->accel.clip_left && (dev->accel.cx) <= clip_r && (dev->accel.cy) >= dev->accel.clip_top && (dev->accel.cy) <= clip_b) {
+                        if ((dev->accel.cx >= clip_l) &&
+                            (dev->accel.cx <= clip_r) &&
+                            (dev->accel.cy >= clip_t) &&
+                            (dev->accel.cy <= clip_b)) {
+                            dev->subsys_stat |= INT_GE_BSY;
                             if (ibm8514_cpu_dest(svga) && (pixcntl == 0)) {
                                 mix_dat = mix_mask; /* Mix data = forced to foreground register. */
                             } else if (ibm8514_cpu_dest(svga) && (pixcntl == 3)) {
@@ -1901,13 +1738,19 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
 
                             READ((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
 
-                            if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
+                            if ((compare_mode == 0) ||
+                                ((compare_mode == 0x10) && (dest_dat >= compare)) ||
+                                ((compare_mode == 0x18) && (dest_dat < compare)) ||
+                                ((compare_mode == 0x20) && (dest_dat != compare)) ||
+                                ((compare_mode == 0x28) && (dest_dat == compare)) ||
+                                ((compare_mode == 0x30) && (dest_dat <= compare)) ||
+                                ((compare_mode == 0x38) && (dest_dat > compare))) {
                                 old_dest_dat = dest_dat;
                                 MIX(mix_dat & mix_mask, dest_dat, src_dat);
                                 dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                if ((dev->accel.cmd & 4) && dev->accel.sy) {
+                                if ((dev->accel.cmd & 0x04) && dev->accel.sy) {
                                     WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                } else if (!(dev->accel.cmd & 4)) {
+                                } else if (!(dev->accel.cmd & 0x04)) {
                                     WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
                                 }
                             }
@@ -1920,8 +1763,19 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                         else
                             cpu_dat >>= 8;
 
-                        if (dev->accel.sy == 0)
+                        if (!dev->accel.sy) {
+                            if (cpu_input) {
+                                dev->force_busy = 0;
+                                dev->force_busy2 = 0;
+                            }
+                            dev->fifo_idx = 0;
+                            dev->accel.cmd_back = 1;
+                            if (!cpu_input) {
+                                dev->accel.cur_x = dev->accel.cx;
+                                dev->accel.cur_y = dev->accel.cy;
+                            }
                             break;
+                        }
 
                         if (dev->accel.cmd & 0x40) {
                             if (dev->accel.cmd & 0x80)
@@ -1929,7 +1783,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                             else
                                 dev->accel.cy--;
 
-                            if (dev->accel.err_term >= 0) {
+                            if (dev->accel.err_term >= dev->accel.maj_axis_pcnt) {
                                 dev->accel.err_term += dev->accel.destx_distp;
                                 if (dev->accel.cmd & 0x20)
                                     dev->accel.cx++;
@@ -1943,7 +1797,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                             else
                                 dev->accel.cx--;
 
-                            if (dev->accel.err_term >= 0) {
+                            if (dev->accel.err_term >= dev->accel.maj_axis_pcnt) {
                                 dev->accel.err_term += dev->accel.destx_distp;
                                 if (dev->accel.cmd & 0x80)
                                     dev->accel.cy++;
@@ -1956,8 +1810,6 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
                         dev->accel.sy--;
                     }
                 }
-                dev->accel.cur_x = dev->accel.cx;
-                dev->accel.cur_y = dev->accel.cy;
             }
             break;
 
@@ -1965,115 +1817,96 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
         case 3: /*Rectangle fill (Y direction)*/
         case 4: /*Rectangle fill (Y direction using nibbles)*/
             if (!cpu_input) {
-                dev->accel.x_count     = 0;
-                dev->accel.xx_count    = 0;
-                dev->accel.odd_out     = 0;
-                dev->accel.odd_in      = 0;
-                dev->accel.input       = 0;
-                dev->accel.output      = 0;
-                dev->accel.newdest_out = 0;
-                dev->accel.newdest_in  = 0;
-
-                dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
-                dev->accel.sy = dev->accel.multifunc[0] & 0x7ff;
+                dev->accel.x_count = 0;
+                dev->accel.output = 0;
+                dev->accel.input = 0;
+                dev->accel.input2 = 0;
+                dev->accel.odd_in = 0;
 
                 dev->accel.cx = dev->accel.cur_x;
                 if (dev->accel.cur_x >= 0x600)
                     dev->accel.cx |= ~0x5ff;
+
                 dev->accel.cy = dev->accel.cur_y;
                 if (dev->accel.cur_y >= 0x600)
                     dev->accel.cy |= ~0x5ff;
 
-                if (((dev->local & 0xff) >= 0x02) && dev->accel.ge_offset && ((dev->accel_bpp == 24) || (dev->accel_bpp == 8)))
-                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                else
-                    dev->accel.dest = dev->accel.cy * dev->pitch;
+                dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
+                dev->accel.sy = dev->accel.multifunc[0] & 0x7ff;
+
+                dev->accel.dest = dev->accel.ge_offset + (dev->accel.cy * dev->pitch);
 
                 if (cmd == 4)
-                    dev->accel.cmd |= 2;
+                    dev->accel.cmd |= 0x02;
                 else if (cmd == 3)
-                    dev->accel.cmd &= ~2;
+                    dev->accel.cmd &= ~0x02;
 
                 if (ibm8514_cpu_src(svga)) {
-                    if (dev->accel.cmd & 2) {
+                    if (dev->accel.cmd & 0x02) {
                         if (!(dev->accel.cmd & 0x1000)) {
-                            if (!(dev->accel.cmd & 8)) {
-                                dev->accel.sx += and3;
-                                dev->accel.nibbleset = (uint8_t *) calloc(1, (dev->accel.sx >> 3) + 1);
-                                dev->accel.writemono = (uint8_t *) calloc(1, (dev->accel.sx >> 3) + 1);
-                                dev->accel.sys_cnt   = (dev->accel.sx >> 3) + 1;
+                            if (dev->accel.cmd & 0x08) {
+                                dev->accel.x_count = dev->accel.cx - (and3 + 3);
+                                dev->accel.sx += (and3 + 3);
                             } else {
-                                if (and3 == 1) {
-                                    dev->accel.sx += 4;
+                                dev->accel.x_count = dev->accel.cx;
+                                if (and3) {
                                     if (dev->accel.cmd & 0x20)
-                                        dev->accel.cx += 4;
+                                        dev->accel.x_count -= and3;
                                     else
-                                        dev->accel.cx -= 4;
-                                } else if (and3 == 2) {
-                                    dev->accel.sx += 5;
-                                    if (dev->accel.cmd & 0x20)
-                                        dev->accel.cx += 5;
-                                    else
-                                        dev->accel.cx -= 5;
-                                } else if (and3 == 3) {
-                                    dev->accel.sx += 6;
-                                    if (dev->accel.cmd & 0x20)
-                                        dev->accel.cx += 6;
-                                    else
-                                        dev->accel.cx -= 6;
-                                } else {
-                                    dev->accel.sx += 3;
-                                    if (dev->accel.cmd & 0x20)
-                                        dev->accel.cx += 3;
-                                    else
-                                        dev->accel.cx -= 3;
+                                        dev->accel.x_count += and3;
+
+                                    dev->accel.sx += 8;
                                 }
                             }
                         }
                     } else {
-                        if (!(dev->accel.cmd & 0x40) && (frgd_mix == 2) && (bkgd_mix == 2) && (pixcntl == 0) && (cmd == 2)) {
-                            if (!(dev->accel.sx & 1)) {
-                                dev->accel.output = 1;
-                                if (((dev->local & 0xff) >= 0x02) && dev->accel.ge_offset && ((dev->accel_bpp == 24) || (dev->accel_bpp == 8)))
-                                    dev->accel.newdest_out = (dev->accel.ge_offset << 2) + ((dev->accel.cy + 1) * dev->pitch);
-                                else
-                                    dev->accel.newdest_out = (dev->accel.cy + 1) * dev->pitch;
+                        if (dev->accel.cmd & 0x1000) {
+                            if (dev->accel.cmd & 0x200) {
+                                if (dev->accel.cmd & 0x04) {
+                                    dev->accel.output = 1;
+                                    dev->accel.sx -= 2;
+                                }
                             }
                         }
                     }
+                    dev->force_busy = 1;
+                    dev->force_busy2 = 1;
                     dev->data_available  = 0;
                     dev->data_available2 = 0;
                     return; /*Wait for data from CPU*/
                 } else if (ibm8514_cpu_dest(svga)) {
-                    if (!(dev->accel.cmd & 2) && (frgd_mix == 2) && (pixcntl == 0) && (cmd == 2)) {
-                        if (!(dev->accel.sx & 1)) {
-                            dev->accel.input      = 1;
-                            if (((dev->local & 0xff) >= 0x02) && dev->accel.ge_offset && ((dev->accel_bpp == 24) || (dev->accel_bpp == 8)))
-                                dev->accel.newdest_in = (dev->accel.ge_offset << 2) + ((dev->accel.cy + 1) * dev->pitch);
-                            else
-                                dev->accel.newdest_in = (dev->accel.cy + 1) * dev->pitch;
-                        }
-                    } else if (dev->accel.cmd & 2) {
-                        if (dev->accel.cmd & 8) {
-                            dev->accel.sx += and3;
-                            dev->accel.nibbleset = (uint8_t *) calloc(1, (dev->accel.sx >> 3) + 1);
-                            dev->accel.writemono = (uint8_t *) calloc(1, (dev->accel.sx >> 3) + 1);
-                            dev->accel.sys_cnt   = (dev->accel.sx >> 3) + 1;
+                    if (!(dev->accel.cmd & 0x02)) {
+                        if (dev->accel.cmd & 0x1000) {
+                            if (dev->accel.cmd & 0x200) {
+                                if (!(dev->accel.sx & 1) && !(dev->accel.cmd & 0x04)) {
+                                    dev->accel.input = 1;
+                                } else if (dev->accel.cmd & 0x04) {
+                                    dev->accel.input2 = 1;
+                                    dev->accel.sx -= 2;
+                                }
+                            }
                         }
                     }
+                    ibm8514_log("INPUT=%d.\n", dev->accel.input);
+                    dev->force_busy = 1;
+                    dev->force_busy2 = 1;
                     dev->data_available  = 1;
                     dev->data_available2 = 1;
                     return; /*Wait for data from CPU*/
                 }
             }
 
-            if (dev->accel.cmd & 2) {
+            ibm8514_log("Rectangle %d: full=%04x, odd=%d, c(%d,%d), frgdmix=%d, bkgdmix=%d, xcount=%d, and3=%d, len(%d,%d), CURX=%d, Width=%d, pixcntl=%d, mix_dat=%08x, count=%d, cpu_data=%08x, cpu_input=%d.\n", cmd, dev->accel.cmd, dev->accel.input, dev->accel.cx, dev->accel.cy, frgd_mix, bkgd_mix, dev->accel.x_count, and3, dev->accel.sx, dev->accel.sy, dev->accel.cur_x, dev->accel.maj_axis_pcnt, pixcntl, mix_dat, count, cpu_dat, cpu_input);
+
+            if (dev->accel.cmd & 0x08) { /*Vectored Rectangle*/
                 if (cpu_input) {
-rect_fill_pix:
-                    if ((dev->accel.cmd & 8) && ibm8514_cpu_src(svga)) {
-                        dev->accel.xx_count++;
+                    if (ibm8514_cpu_src(svga)) {
                         while (count-- && (dev->accel.sy >= 0)) {
-                            if (dev->accel.cx >= dev->accel.clip_left && dev->accel.cx <= clip_r && dev->accel.cy >= dev->accel.clip_top && dev->accel.cy <= clip_b) {
+                            if ((dev->accel.cx >= clip_l) &&
+                                (dev->accel.cx <= clip_r) &&
+                                (dev->accel.cy >= clip_t) &&
+                                (dev->accel.cy <= clip_b)) {
+                                dev->subsys_stat |= INT_GE_BSY;
                                 switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                                     case 0:
                                         src_dat = bkgd_color;
@@ -2094,77 +1927,27 @@ rect_fill_pix:
 
                                 READ(dev->accel.dest + dev->accel.cx, dest_dat);
 
-                                if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
+                                if ((compare_mode == 0) ||
+                                    ((compare_mode == 0x10) && (dest_dat >= compare)) ||
+                                    ((compare_mode == 0x18) && (dest_dat < compare)) ||
+                                    ((compare_mode == 0x20) && (dest_dat != compare)) ||
+                                    ((compare_mode == 0x28) && (dest_dat == compare)) ||
+                                    ((compare_mode == 0x30) && (dest_dat <= compare)) ||
+                                    ((compare_mode == 0x38) && (dest_dat > compare))) {
                                     old_dest_dat = dest_dat;
                                     MIX(mix_dat & mix_mask, dest_dat, src_dat);
                                     dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                    if (and3 == 1) {
-                                        if (dev->accel.xx_count >= 2) {
-                                            if ((dev->accel.cmd & 4) && dev->accel.sx) {
-                                                WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                            } else if (!(dev->accel.cmd & 4)) {
-                                                WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                            }
-                                        }
-                                    } else if (and3 == 2) {
-                                        if (dev->accel.xx_count == 2) {
-                                            if (count <= 2) {
-                                                if ((dev->accel.cmd & 4) && dev->accel.sx) {
-                                                    WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                                } else if (!(dev->accel.cmd & 4)) {
-                                                    WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                                }
-                                            }
-                                        } else if (dev->accel.xx_count >= 3) {
-                                            if ((dev->accel.cmd & 4) && dev->accel.sx) {
-                                                WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                            } else if (!(dev->accel.cmd & 4)) {
-                                                WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                            }
-                                        }
-                                    } else if (and3 == 3) {
-                                        if (dev->accel.xx_count == 2) {
-                                            if (count <= 1) {
-                                                if ((dev->accel.cmd & 4) && dev->accel.sx) {
-                                                    WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                                } else if (!(dev->accel.cmd & 4)) {
-                                                    WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                                }
-                                            }
-                                        } else if (dev->accel.xx_count >= 3) {
-                                            if ((dev->accel.cmd & 4) && dev->accel.sx) {
-                                                WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                            } else if (!(dev->accel.cmd & 4)) {
-                                                WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                            }
-                                        }
-                                    } else {
-                                        if (dev->accel.xx_count == 1) {
-                                            if (!count) {
-                                                if ((dev->accel.cmd & 4) && dev->accel.sx) {
-                                                    WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                                } else if (!(dev->accel.cmd & 4)) {
-                                                    WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                                }
-                                            }
-                                        } else if (dev->accel.xx_count >= 2) {
-                                            if ((dev->accel.cmd & 4) && dev->accel.sx) {
-                                                WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                            } else if (!(dev->accel.cmd & 4)) {
-                                                WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                            }
-                                        }
+                                    if ((dev->accel.cmd & 0x02) && (dev->accel.x_count != dev->accel.cx))
+                                        goto skip_vector_rect_write;
+
+                                    if ((dev->accel.cmd & 0x04) && dev->accel.sx) {
+                                        WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
+                                    } else if (!(dev->accel.cmd & 0x04)) {
+                                        WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
                                     }
                                 }
                             }
 
-                            mix_dat <<= 1;
-                            mix_dat |= 1;
-                            if (dev->bpp)
-                                cpu_dat >>= 16;
-                            else
-                                cpu_dat >>= 8;
-
                             switch (dev->accel.cmd & 0xe0) {
                                 case 0x00:
                                     dev->accel.cx++;
@@ -2189,17 +1972,42 @@ rect_fill_pix:
                                     break;
                             }
 
+skip_vector_rect_write:
+                            switch (dev->accel.cmd & 0xe0) {
+                                case 0x00:
+                                    dev->accel.x_count++;
+                                    break;
+                                case 0x20:
+                                    dev->accel.x_count++;
+                                    break;
+                                case 0x60:
+                                    dev->accel.x_count--;
+                                    break;
+                                case 0x80:
+                                    dev->accel.x_count--;
+                                    break;
+                                case 0xa0:
+                                    dev->accel.x_count--;
+                                    break;
+                                case 0xe0:
+                                    dev->accel.x_count++;
+                                    break;
+
+                                default:
+                                    break;
+                            }
+
+                            if (dev->bpp)
+                                cpu_dat >>= 16;
+                            else
+                                cpu_dat >>= 8;
+
+                            mix_dat <<= 1;
+                            mix_dat |= 1;
+
                             dev->accel.sx--;
                             if (dev->accel.sx < 0) {
                                 dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
-                                if (and3 == 1)
-                                    dev->accel.sx += 4;
-                                else if (and3 == 2)
-                                    dev->accel.sx += 5;
-                                else if (and3 == 3)
-                                    dev->accel.sx += 6;
-                                else
-                                    dev->accel.sx += 3;
 
                                 if (dev->accel.cmd & 0x20)
                                     dev->accel.cx -= (dev->accel.sx + 1);
@@ -2230,34 +2038,66 @@ rect_fill_pix:
                                         break;
                                 }
 
-                                if (((dev->local & 0xff) >= 0x02) && dev->accel.ge_offset && ((dev->accel_bpp == 24) || (dev->accel_bpp == 8)))
-                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                else
-                                    dev->accel.dest = dev->accel.cy * dev->pitch;
+                                dev->accel.dest = dev->accel.ge_offset + (dev->accel.cy * dev->pitch);
 
                                 dev->accel.sy--;
+                                dev->accel.x_count = 0;
+
+                                if (dev->accel.sy < 0) {
+                                    dev->force_busy = 0;
+                                    dev->force_busy2 = 0;
+                                    dev->fifo_idx = 0;
+                                    dev->accel.cmd_back = 1;
+                                }
                                 return;
                             }
                         }
-                        break;
-                    }
-                    if (count < 8) {
-                        while (count-- && (dev->accel.sy >= 0)) {
-                            if (dev->accel.cx >= dev->accel.clip_left && dev->accel.cx <= clip_r && dev->accel.cy >= dev->accel.clip_top && dev->accel.cy <= clip_b) {
-                                if (ibm8514_cpu_dest(svga) && (pixcntl == 0)) {
-                                    mix_dat = mix_mask; /* Mix data = forced to foreground register. */
-                                } else if (ibm8514_cpu_dest(svga) && (pixcntl == 3)) {
-                                    /* Mix data = current video memory value. */
-                                    READ(dev->accel.dest + dev->accel.cx, mix_dat);
-                                    mix_dat = ((mix_dat & rd_mask) == rd_mask);
-                                    mix_dat = mix_dat ? mix_mask : 0;
-                                }
+                    } else
+                        ibm8514_log("Vectored Rectangle with destination reads (TODO).\n");
+                } else
+                    ibm8514_log("Vectored Rectangle with normal processing (TODO).\n");
+            } else { /*Normal Rectangle*/
+                if (cpu_input) {
+                    ibm8514_log("Normal Pixel Rectangle Fill Transfer SY=%d.\n", dev->accel.sy);
+                    while (count-- && (dev->accel.sy >= 0)) {
+                        if ((dev->accel.cx >= clip_l) &&
+                            (dev->accel.cx <= clip_r) &&
+                            (dev->accel.cy >= clip_t) &&
+                            (dev->accel.cy <= clip_b)) {
+                            dev->subsys_stat |= INT_GE_BSY;
+                            if (ibm8514_cpu_dest(svga) && (pixcntl == 0)) {
+                                mix_dat = mix_mask; /* Mix data = forced to foreground register. */
+                            } else if (ibm8514_cpu_dest(svga) && (pixcntl == 3)) {
+                                /* Mix data = current video memory value. */
+                                READ(dev->accel.dest + dev->accel.cx, mix_dat);
+                                mix_dat = ((mix_dat & rd_mask) == rd_mask);
+                                mix_dat = mix_dat ? mix_mask : 0;
+                            }
 
-                                if (ibm8514_cpu_dest(svga)) {
-                                    READ(dev->accel.dest + dev->accel.cx, src_dat);
-                                    if (pixcntl == 3)
-                                        src_dat = ((src_dat & rd_mask) == rd_mask);
-                                } else
+                            if (ibm8514_cpu_dest(svga)) {
+                                READ(dev->accel.dest + dev->accel.cx, src_dat);
+                                if (pixcntl == 3)
+                                    src_dat = ((src_dat & rd_mask) == rd_mask);
+                            } else {
+                                if (dev->accel.cmd & 0x02) {
+                                    switch ((mix_dat & 0x01) ? frgd_mix : bkgd_mix) {
+                                        case 0:
+                                            src_dat = bkgd_color;
+                                            break;
+                                        case 1:
+                                            src_dat = frgd_color;
+                                            break;
+                                        case 2:
+                                            src_dat = cpu_dat;
+                                            break;
+                                        case 3:
+                                            src_dat = 0;
+                                            break;
+
+                                        default:
+                                            break;
+                                    }
+                                } else {
                                     switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                                         case 0:
                                             src_dat = bkgd_color;
@@ -2275,417 +2115,117 @@ rect_fill_pix:
                                         default:
                                             break;
                                     }
+                                }
+                            }
 
-                                READ(dev->accel.dest + dev->accel.cx, dest_dat);
+                            READ(dev->accel.dest + dev->accel.cx, dest_dat);
+
+                            if ((compare_mode == 0) ||
+                                ((compare_mode == 0x10) && (dest_dat >= compare)) ||
+                                ((compare_mode == 0x18) && (dest_dat < compare)) ||
+                                ((compare_mode == 0x20) && (dest_dat != compare)) ||
+                                ((compare_mode == 0x28) && (dest_dat == compare)) ||
+                                ((compare_mode == 0x30) && (dest_dat <= compare)) ||
+                                ((compare_mode == 0x38) && (dest_dat > compare))) {
+                                old_dest_dat = dest_dat;
+                                if (dev->accel.cmd & 0x02) {
+                                    MIX(mix_dat & 0x01, dest_dat, src_dat);
+                                    if ((dev->accel.x_count != dev->accel.cx) && !(dev->accel.cmd & 0x1000) && and3)
+                                        goto skip_nibble_rect_write;
 
-                                if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
-                                    old_dest_dat = dest_dat;
-                                    MIX(mix_dat & mix_mask, dest_dat, src_dat);
                                     dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                    WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                }
-                            }
-
-                            mix_dat <<= 1;
-                            mix_dat |= 1;
-                            if (dev->bpp)
-                                cpu_dat >>= 16;
-                            else
-                                cpu_dat >>= 8;
-
-                            if (dev->accel.cmd & 0x20)
-                                dev->accel.cx++;
-                            else
-                                dev->accel.cx--;
-
-                            dev->accel.sx--;
-                            if (dev->accel.sx < 0) {
-                                dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
-
-                                if (dev->accel.cmd & 2) {
-                                    dev->accel.sx += (dev->accel.cur_x & 3);
-                                }
-
-                                if (dev->accel.cmd & 0x20) {
-                                    dev->accel.cx -= (dev->accel.sx) + 1;
-                                } else
-                                    dev->accel.cx += (dev->accel.sx) + 1;
-
-                                if (dev->accel.cmd & 0x80)
-                                    dev->accel.cy++;
-                                else
-                                    dev->accel.cy--;
-
-                                if (((dev->local & 0xff) >= 0x02) && dev->accel.ge_offset && ((dev->accel_bpp == 24) || (dev->accel_bpp == 8)))
-                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                else
-                                    dev->accel.dest = dev->accel.cy * dev->pitch;
-
-                                dev->accel.sy--;
-                                return;
-                            }
-                        }
-                    } else {
-                        while (count-- && (dev->accel.sy >= 0)) {
-                            if (dev->accel.cx >= dev->accel.clip_left && dev->accel.cx <= clip_r && dev->accel.cy >= dev->accel.clip_top && dev->accel.cy <= clip_b) {
-                                if (ibm8514_cpu_dest(svga) && (pixcntl == 0)) {
-                                    mix_dat = 1; /* Mix data = forced to foreground register. */
-                                } else if (ibm8514_cpu_dest(svga) && (pixcntl == 3)) {
-                                    /* Mix data = current video memory value. */
-                                    READ(dev->accel.dest + dev->accel.cx, mix_dat);
-                                    mix_dat = ((mix_dat & rd_mask) == rd_mask);
-                                    mix_dat = mix_dat ? 1 : 0;
-                                }
-
-                                if (ibm8514_cpu_dest(svga)) {
-                                    READ(dev->accel.dest + dev->accel.cx, src_dat);
-                                    if (pixcntl == 3)
-                                        src_dat = ((src_dat & rd_mask) == rd_mask);
-                                } else {
-                                    switch ((mix_dat & 1) ? frgd_mix : bkgd_mix) {
-                                        case 0:
-                                            src_dat = bkgd_color;
-                                            break;
-                                        case 1:
-                                            src_dat = frgd_color;
-                                            break;
-                                        case 2:
-                                            src_dat = cpu_dat;
-                                            break;
-                                        case 3:
-                                            src_dat = 0;
-                                            break;
-
-                                        default:
-                                            break;
-                                    }
-                                }
-
-                                READ(dev->accel.dest + dev->accel.cx, dest_dat);
-
-                                if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
-                                    old_dest_dat = dest_dat;
-                                    MIX(mix_dat & 1, dest_dat, src_dat);
-                                    dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                    WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                }
-                            }
-                            mix_dat >>= 1;
-                            if (dev->bpp)
-                                cpu_dat >>= 16;
-                            else
-                                cpu_dat >>= 8;
-
-                            if (dev->accel.cmd & 0x20)
-                                dev->accel.cx++;
-                            else
-                                dev->accel.cx--;
-
-                            dev->accel.sx--;
-                            if (dev->accel.sx < 0) {
-                                dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
-
-                                if (dev->accel.cmd & 2) {
-                                    if (!(dev->accel.cmd & 0x1000))
-                                        dev->accel.sx += (dev->accel.cur_x & 3);
-                                }
-
-                                if (dev->accel.cmd & 0x20) {
-                                    dev->accel.cx -= (dev->accel.sx) + 1;
-                                } else
-                                    dev->accel.cx += (dev->accel.sx) + 1;
-
-                                if (dev->accel.cmd & 2) {
-                                    if (dev->accel.cmd & 0x1000) {
-                                        dev->accel.cx = dev->accel.cur_x;
-                                        if (dev->accel.cur_x >= 0x600)
-                                            dev->accel.cx |= ~0x5ff;
-                                    }
-                                }
-
-                                if (dev->accel.cmd & 0x80)
-                                    dev->accel.cy++;
-                                else
-                                    dev->accel.cy--;
-
-                                if (((dev->local & 0xff) >= 0x02) && dev->accel.ge_offset && ((dev->accel_bpp == 24) || (dev->accel_bpp == 8)))
-                                    dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                else
-                                    dev->accel.dest = dev->accel.cy * dev->pitch;
-
-                                dev->accel.sy--;
-                                return;
-                            }
-                        }
-                    }
-                } else {
-                    goto rect_fill;
-                }
-            } else {
-                if (cpu_input) {
-                    if (pixcntl == 2) {
-                        goto rect_fill_pix;
-                    } else {
-                        if (dev->accel.input && !dev->accel.output) {
-                            while (count-- && (dev->accel.sy >= 0)) {
-                                if (dev->accel.cx >= dev->accel.clip_left && dev->accel.cx <= clip_r && dev->accel.cy >= dev->accel.clip_top && dev->accel.cy <= clip_b) {
-                                    mix_dat = mix_mask; /* Mix data = forced to foreground register. */
-                                    if (!dev->accel.odd_in && !dev->accel.sx) {
-                                        READ(dev->accel.newdest_in + dev->accel.cur_x, src_dat);
-                                        READ(dev->accel.newdest_in + dev->accel.cur_x, dest_dat);
-                                    } else {
-                                        READ(dev->accel.dest + dev->accel.cx, src_dat);
-                                        READ(dev->accel.dest + dev->accel.cx, dest_dat);
-                                    }
-                                    if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
-                                        old_dest_dat = dest_dat;
-                                        MIX(mix_dat & mix_mask, dest_dat, src_dat);
-                                        dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                        if (!dev->accel.odd_in && !dev->accel.sx) {
-                                            WRITE(dev->accel.newdest_in + dev->accel.cur_x, dest_dat);
-                                        } else {
-                                            WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                        }
-                                    }
-                                }
-                                mix_dat <<= 1;
-                                mix_dat |= 1;
-
-                                if (dev->accel.cmd & 0x20)
-                                    dev->accel.cx++;
-                                else
-                                    dev->accel.cx--;
-
-                                dev->accel.sx--;
-                                if (dev->accel.odd_in) {
-                                    if (dev->accel.sx < 0) {
-                                        dev->accel.sx     = dev->accel.maj_axis_pcnt & 0x7ff;
-                                        dev->accel.odd_in = 0;
-                                        dev->accel.cx     = dev->accel.cur_x;
-                                        if (dev->accel.cmd & 0x80)
-                                            dev->accel.cy++;
-                                        else
-                                            dev->accel.cy--;
-
-                                        if (((dev->local & 0xff) >= 0x02) && dev->accel.ge_offset && ((dev->accel_bpp == 24) || (dev->accel_bpp == 8))) {
-                                            dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                            dev->accel.newdest_in = (dev->accel.ge_offset << 2) + ((dev->accel.cy + 1) * dev->pitch);
-                                        } else {
-                                            dev->accel.dest       = dev->accel.cy * dev->pitch;
-                                            dev->accel.newdest_in = (dev->accel.cy + 1) * dev->pitch;
-                                        }
-                                        dev->accel.sy--;
-                                        return;
+                                    if ((dev->accel.cmd & 0x04) && dev->accel.sx) {
+                                        WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
+                                    } else if (!(dev->accel.cmd & 0x04)) {
+                                        WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
                                     }
                                 } else {
-                                    if (dev->accel.sx < 0) {
-                                        dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
-                                        dev->accel.sx--;
-                                        dev->accel.cx     = dev->accel.cur_x;
-                                        dev->accel.odd_in = 1;
-                                        if (dev->accel.cmd & 0x20)
-                                            dev->accel.cx++;
-                                        else
-                                            dev->accel.cx--;
-                                        if (dev->accel.cmd & 0x80)
-                                            dev->accel.cy++;
-                                        else
-                                            dev->accel.cy--;
-
-                                        if (((dev->local & 0xff) >= 0x02) && dev->accel.ge_offset && ((dev->accel_bpp == 24) || (dev->accel_bpp == 8))) {
-                                            dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                            dev->accel.newdest_in = (dev->accel.ge_offset << 2) + ((dev->accel.cy + 1) * dev->pitch);
-                                        } else {
-                                            dev->accel.dest       = dev->accel.cy * dev->pitch;
-                                            dev->accel.newdest_in = (dev->accel.cy + 1) * dev->pitch;
-                                        }
-                                        dev->accel.sy--;
-                                        return;
-                                    }
-                                }
-                            }
-                        } else if (dev->accel.output && !dev->accel.input) {
-                            while (count-- && (dev->accel.sy >= 0)) {
-                                if (dev->accel.cx >= dev->accel.clip_left && dev->accel.cx <= clip_r && dev->accel.cy >= dev->accel.clip_top && dev->accel.cy <= clip_b) {
-                                    src_dat = cpu_dat;
-                                    if (!dev->accel.odd_out && !dev->accel.sx) {
-                                        READ(dev->accel.newdest_out + dev->accel.cur_x, dest_dat);
-                                    } else {
-                                        READ(dev->accel.dest + dev->accel.cx, dest_dat);
-                                    }
-
-                                    if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
-                                        old_dest_dat = dest_dat;
-                                        MIX(mix_dat & mix_mask, dest_dat, src_dat);
-                                        dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                        if (!dev->accel.odd_out && !dev->accel.sx) {
-                                            WRITE(dev->accel.newdest_out + dev->accel.cur_x, dest_dat);
-                                        } else {
-                                            WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                        }
-                                    }
-                                }
-                                mix_dat <<= 1;
-                                mix_dat |= 1;
-                                if (dev->bpp)
-                                    cpu_dat >>= 16;
-                                else
-                                    cpu_dat >>= 8;
-
-                                if (dev->accel.cmd & 0x20)
-                                    dev->accel.cx++;
-                                else
-                                    dev->accel.cx--;
-
-                                dev->accel.sx--;
-                                if (dev->accel.odd_out) {
-                                    if (dev->accel.sx < 0) {
-                                        dev->accel.sx      = dev->accel.maj_axis_pcnt & 0x7ff;
-                                        dev->accel.odd_out = 0;
-                                        dev->accel.cx      = dev->accel.cur_x;
-                                        if (dev->accel.cmd & 0x80)
-                                            dev->accel.cy++;
-                                        else
-                                            dev->accel.cy--;
-
-                                        if (((dev->local & 0xff) >= 0x02) && dev->accel.ge_offset && ((dev->accel_bpp == 24) || (dev->accel_bpp == 8))) {
-                                            dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                            dev->accel.newdest_out = (dev->accel.ge_offset << 2) + ((dev->accel.cy + 1) * dev->pitch);
-                                        } else {
-                                            dev->accel.dest        = dev->accel.cy * dev->pitch;
-                                            dev->accel.newdest_out = (dev->accel.cy + 1) * dev->pitch;
-                                        }
-                                        dev->accel.sy--;
-                                        return;
-                                    }
-                                } else {
-                                    if (dev->accel.sx < 0) {
-                                        dev->accel.sx      = dev->accel.maj_axis_pcnt & 0x7ff;
-                                        dev->accel.odd_out = 1;
-                                        dev->accel.sx--;
-                                        dev->accel.cx = dev->accel.cur_x;
-                                        if (dev->accel.cmd & 0x20)
-                                            dev->accel.cx++;
-                                        else
-                                            dev->accel.cx--;
-                                        if (dev->accel.cmd & 0x80)
-                                            dev->accel.cy++;
-                                        else
-                                            dev->accel.cy--;
-
-                                        if (((dev->local & 0xff) >= 0x02) && dev->accel.ge_offset && ((dev->accel_bpp == 24) || (dev->accel_bpp == 8))) {
-                                            dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                            dev->accel.newdest_out = (dev->accel.ge_offset << 2) + ((dev->accel.cy + 1) * dev->pitch);
-                                        } else {
-                                            dev->accel.dest        = dev->accel.cy * dev->pitch;
-                                            dev->accel.newdest_out = (dev->accel.cy + 1) * dev->pitch;
-                                        }
-                                        dev->accel.sy--;
-                                        return;
-                                    }
-                                }
-                            }
-                        } else {
-                            while (count-- && (dev->accel.sy >= 0)) {
-                                if (dev->accel.cx >= dev->accel.clip_left && dev->accel.cx <= clip_r && dev->accel.cy >= dev->accel.clip_top && dev->accel.cy <= clip_b) {
-                                    if (ibm8514_cpu_dest(svga) && (pixcntl == 0)) {
-                                        mix_dat = mix_mask; /* Mix data = forced to foreground register. */
-                                    } else if (ibm8514_cpu_dest(svga) && (pixcntl == 3)) {
-                                        /* Mix data = current video memory value. */
-                                        READ(dev->accel.dest + dev->accel.cx, mix_dat);
-                                        mix_dat = ((mix_dat & rd_mask) == rd_mask);
-                                        mix_dat = mix_dat ? mix_mask : 0;
-                                    }
-
-                                    if (ibm8514_cpu_dest(svga)) {
-                                        READ(dev->accel.dest + dev->accel.cx, src_dat);
+                                    if (ibm8514_cpu_dest(svga) && (cmd == 2)) {
                                         if (pixcntl == 3) {
-                                            src_dat = ((src_dat & rd_mask) == rd_mask);
-                                        }
-                                    } else
-                                        switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
-                                            case 0:
-                                                src_dat = bkgd_color;
-                                                break;
-                                            case 1:
-                                                src_dat = frgd_color;
-                                                break;
-                                            case 2:
-                                                src_dat = cpu_dat;
-                                                break;
-                                            case 3:
-                                                src_dat = 0;
-                                                break;
-
-                                            default:
-                                                break;
-                                        }
-
-                                    READ(dev->accel.dest + dev->accel.cx, dest_dat);
-
-                                    if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
-                                        old_dest_dat = dest_dat;
-                                        if (ibm8514_cpu_dest(svga)) {
-                                            if (pixcntl == 3) {
-                                                MIX(mix_dat & mix_mask, dest_dat, src_dat);
-                                            }
-                                        } else {
                                             MIX(mix_dat & mix_mask, dest_dat, src_dat);
                                         }
-                                        dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
+                                    } else {
+                                        MIX(mix_dat & mix_mask, dest_dat, src_dat);
+                                    }
+                                    dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
+                                    if ((dev->accel.cmd & 0x04) && dev->accel.sx) {
+                                        WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
+                                    } else if (!(dev->accel.cmd & 0x04)) {
                                         WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
                                     }
                                 }
-
-                                mix_dat <<= 1;
-                                mix_dat |= 1;
-                                if (dev->bpp)
-                                    cpu_dat >>= 16;
-                                else
-                                    cpu_dat >>= 8;
-
-                                if (dev->accel.cmd & 0x20)
-                                    dev->accel.cx++;
-                                else
-                                    dev->accel.cx--;
-
-                                dev->accel.sx--;
-                                if (dev->accel.sx < 0) {
-                                    dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
-
-                                    if (dev->accel.cmd & 0x20) {
-                                        dev->accel.cx -= (dev->accel.sx) + 1;
-                                    } else
-                                        dev->accel.cx += (dev->accel.sx) + 1;
-
-                                    if (dev->accel.cmd & 0x80)
-                                        dev->accel.cy++;
-                                    else
-                                        dev->accel.cy--;
-
-                                    if (((dev->local & 0xff) >= 0x02) && dev->accel.ge_offset && ((dev->accel_bpp == 24) || (dev->accel_bpp == 8)))
-                                        dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                    else
-                                        dev->accel.dest = dev->accel.cy * dev->pitch;
-
-                                    dev->accel.sy--;
-                                    return;
-                                }
                             }
                         }
+                        if (dev->accel.cmd & 0x20)
+                            dev->accel.cx++;
+                        else
+                            dev->accel.cx--;
+
+skip_nibble_rect_write:
+                        if (dev->accel.cmd & 0x20)
+                            dev->accel.x_count++;
+                        else
+                            dev->accel.x_count--;
+
+                        if (dev->accel.cmd & 0x02)
+                            mix_dat >>= 1;
+                        else {
+                            mix_dat <<= 1;
+                            mix_dat |= 1;
+                        }
+
+                        if (dev->bpp)
+                            cpu_dat >>= 16;
+                        else
+                            cpu_dat >>= 8;
+
+                        dev->accel.sx--;
+                        if (dev->accel.sx < 0) {
+                            dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
+                            if (dev->accel.input)
+                                dev->accel.odd_in = 1;
+                            if (dev->accel.output || dev->accel.input2)
+                                dev->accel.sx -= 2;
+
+                            if (dev->accel.cmd & 0x20)
+                                dev->accel.cx -= (dev->accel.sx + 1);
+                            else
+                                dev->accel.cx += (dev->accel.sx + 1);
+
+                            if (dev->accel.cmd & 0x80)
+                                dev->accel.cy++;
+                            else
+                                dev->accel.cy--;
+
+                            dev->accel.dest = dev->accel.ge_offset + (dev->accel.cy * dev->pitch);
+
+                            dev->accel.sy--;
+                            dev->accel.x_count = 0;
+
+                            if (dev->accel.sy < 0) {
+                                dev->fifo_idx = 0;
+                                dev->accel.cmd_back = 1;
+                            }
+                            dev->force_busy = 0;
+                            dev->force_busy2 = 0;
+                            return;
+                        }
                     }
                 } else {
-rect_fill:
                     if (pixcntl == 1) {
                         if (dev->accel.cmd & 0x40) {
-                            count               = dev->accel.maj_axis_pcnt + 1;
+                            count = (dev->accel.maj_axis_pcnt & 0x7ff) + 1;
                             dev->accel.temp_cnt = 8;
                             while (count-- && dev->accel.sy >= 0) {
-                                if (dev->accel.temp_cnt == 0) {
+                                if (!dev->accel.temp_cnt) {
                                     mix_dat >>= 8;
                                     dev->accel.temp_cnt = 8;
                                 }
-                                if (dev->accel.cx >= dev->accel.clip_left && dev->accel.cx <= clip_r && dev->accel.cy >= dev->accel.clip_top && dev->accel.cy <= clip_b) {
+                                if ((dev->accel.cx >= clip_l) &&
+                                    (dev->accel.cx <= clip_r) &&
+                                    (dev->accel.cy >= clip_t) &&
+                                    (dev->accel.cy <= clip_b)) {
+                                    dev->subsys_stat |= INT_GE_BSY;
                                     switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                                         case 0:
                                             src_dat = bkgd_color;
@@ -2694,8 +2234,6 @@ rect_fill:
                                             src_dat = frgd_color;
                                             break;
                                         case 2:
-                                            src_dat = 0;
-                                            break;
                                         case 3:
                                             src_dat = 0;
                                             break;
@@ -2706,11 +2244,16 @@ rect_fill:
 
                                     READ(dev->accel.dest + dev->accel.cx, dest_dat);
 
-                                    if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
+                                    if ((compare_mode == 0) ||
+                                        ((compare_mode == 0x10) && (dest_dat >= compare)) ||
+                                        ((compare_mode == 0x18) && (dest_dat < compare)) ||
+                                        ((compare_mode == 0x20) && (dest_dat != compare)) ||
+                                        ((compare_mode == 0x28) && (dest_dat == compare)) ||
+                                        ((compare_mode == 0x30) && (dest_dat <= compare)) ||
+                                        ((compare_mode == 0x38) && (dest_dat > compare))) {
                                         old_dest_dat = dest_dat;
                                         MIX(mix_dat & mix_mask, dest_dat, src_dat);
                                         dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-
                                         WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
                                     }
                                 }
@@ -2731,36 +2274,39 @@ rect_fill:
                                     dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
 
                                     if (dev->accel.cmd & 0x20) {
-                                        dev->accel.cx -= (dev->accel.sx) + 1;
+                                        dev->accel.cx -= (dev->accel.sx + 1);
                                     } else
-                                        dev->accel.cx += (dev->accel.sx) + 1;
+                                        dev->accel.cx += (dev->accel.sx + 1);
 
                                     if (dev->accel.cmd & 0x80)
                                         dev->accel.cy++;
                                     else
                                         dev->accel.cy--;
 
-                                    if (((dev->local & 0xff) >= 0x02) && dev->accel.ge_offset && ((dev->accel_bpp == 24) || (dev->accel_bpp == 8)))
-                                        dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                    else
-                                        dev->accel.dest = dev->accel.cy * dev->pitch;
+                                    dev->accel.dest = dev->accel.ge_offset + (dev->accel.cy * dev->pitch);
 
                                     dev->accel.sy--;
 
-                                    dev->accel.cur_x = dev->accel.cx;
-                                    dev->accel.cur_y = dev->accel.cy;
+                                    if (dev->accel.sy < 0) {
+                                        dev->fifo_idx = 0;
+                                        dev->accel.cmd_back = 1;
+                                    }
                                     return;
                                 }
                             }
                         } else {
                             dev->accel.temp_cnt = 8;
-                            while (count-- && dev->accel.sy >= 0) {
+                            while (count-- && (dev->accel.sy >= 0)) {
                                 if (!dev->accel.temp_cnt) {
                                     dev->accel.temp_cnt = 8;
-                                    mix_dat             = old_mix_dat;
+                                    mix_dat = old_mix_dat;
                                 }
-                                if (dev->accel.cx >= dev->accel.clip_left && dev->accel.cx <= clip_r && dev->accel.cy >= dev->accel.clip_top && dev->accel.cy <= clip_b) {
-                                    switch ((mix_dat & 1) ? frgd_mix : bkgd_mix) {
+                                if ((dev->accel.cx >= clip_l) &&
+                                    (dev->accel.cx <= clip_r) &&
+                                    (dev->accel.cy >= clip_t) &&
+                                    (dev->accel.cy <= clip_b)) {
+                                    dev->subsys_stat |= INT_GE_BSY;
+                                    switch ((mix_dat & 0x01) ? frgd_mix : bkgd_mix) {
                                         case 0:
                                             src_dat = bkgd_color;
                                             break;
@@ -2768,8 +2314,6 @@ rect_fill:
                                             src_dat = frgd_color;
                                             break;
                                         case 2:
-                                            src_dat = 0;
-                                            break;
                                         case 3:
                                             src_dat = 0;
                                             break;
@@ -2780,11 +2324,16 @@ rect_fill:
 
                                     READ(dev->accel.dest + dev->accel.cx, dest_dat);
 
-                                    if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
+                                    if ((compare_mode == 0) ||
+                                        ((compare_mode == 0x10) && (dest_dat >= compare)) ||
+                                        ((compare_mode == 0x18) && (dest_dat < compare)) ||
+                                        ((compare_mode == 0x20) && (dest_dat != compare)) ||
+                                        ((compare_mode == 0x28) && (dest_dat == compare)) ||
+                                        ((compare_mode == 0x30) && (dest_dat <= compare)) ||
+                                        ((compare_mode == 0x38) && (dest_dat > compare))) {
                                         old_dest_dat = dest_dat;
-                                        MIX(mix_dat & 1, dest_dat, src_dat);
+                                        MIX(mix_dat & 0x01, dest_dat, src_dat);
                                         dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-
                                         WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
                                     }
                                 }
@@ -2802,167 +2351,217 @@ rect_fill:
                                     dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
 
                                     if (dev->accel.cmd & 0x20) {
-                                        dev->accel.cx -= (dev->accel.sx) + 1;
+                                        dev->accel.cx -= (dev->accel.sx + 1);
                                     } else
-                                        dev->accel.cx += (dev->accel.sx) + 1;
+                                        dev->accel.cx += (dev->accel.sx + 1);
 
                                     if (dev->accel.cmd & 0x80)
                                         dev->accel.cy++;
                                     else
                                         dev->accel.cy--;
 
-                                    if (((dev->local & 0xff) >= 0x02) && dev->accel.ge_offset && ((dev->accel_bpp == 24) || (dev->accel_bpp == 8)))
-                                        dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                    else
-                                        dev->accel.dest = dev->accel.cy * dev->pitch;
+                                    dev->accel.dest = dev->accel.ge_offset + (dev->accel.cy * dev->pitch);
 
                                     dev->accel.sy--;
 
                                     if (dev->accel.sy < 0) {
-                                        dev->accel.cur_x = dev->accel.cx;
-                                        dev->accel.cur_y = dev->accel.cy;
+                                        if (cmd != 4) {
+                                            dev->accel.cur_x = dev->accel.cx;
+                                            dev->accel.cur_y = dev->accel.cy;
+                                        }
+                                        dev->fifo_idx = 0;
+                                        dev->accel.cmd_back = 1;
                                         return;
                                     }
                                 }
                             }
                         }
-                    } else {
-                        if ((dev->accel.multifunc[0x0a] & 6) == 4) {
-                            while (count-- && (dev->accel.sy >= 0)) {
-                                if (dev->accel.cx >= dev->accel.clip_left && dev->accel.cx <= clip_r && dev->accel.cy >= dev->accel.clip_top && dev->accel.cy <= clip_b) {
-                                    READ(dev->accel.dest + dev->accel.cx, mix_dat);
-                                    if ((mix_dat & rd_mask_polygon) == rd_mask_polygon)
-                                        dev->accel.fill_state = !dev->accel.fill_state;
+                    } else if ((dev->accel.multifunc[0x0a] & 0x06) == 0x04) { /*Polygon Draw Type A*/
+                        ibm8514_log("Polygon Draw Type A: Clipping: L=%d, R=%d, T=%d, B=%d, C(%d,%d), sx=%d, sy=%d.\n", clip_l, clip_r, clip_t, clip_b, dev->accel.cx, dev->accel.cy, dev->accel.sx, dev->accel.sy);
+                        while (count-- && (dev->accel.sy >= 0)) {
+                            if ((dev->accel.cx >= clip_l) &&
+                                (dev->accel.cx <= clip_r) &&
+                                (dev->accel.cy >= clip_t) &&
+                                (dev->accel.cy <= clip_b)) {
+                                dev->subsys_stat |= INT_GE_BSY;
+                                switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
+                                    case 0:
+                                        src_dat = bkgd_color;
+                                        break;
+                                    case 1:
+                                        src_dat = frgd_color;
+                                        break;
+                                    case 2:
+                                    case 3:
+                                        src_dat = 0;
+                                        break;
 
-                                    READ(dev->accel.dest + dev->accel.cx, dest_dat);
-                                    old_dest_dat = dest_dat;
-                                    if (dev->accel.fill_state) {
-                                        if (!(rd_mask_polygon & 1) && (wrt_mask & 1)) {
-                                            MIX(mix_dat ^ rd_mask_polygon, dest_dat, mix_dat);
-                                            ibm8514_log("Filling c(%d,%d) without bit 0 of rdmask=%02x, wrtmask=%02x, mixdat=%02x, dest=%02x, old=%02x.\n", dev->accel.cx, dev->accel.cy, rd_mask_polygon, wrt_mask, mix_dat, dest_dat, old_dest_dat);
-                                            dest_dat &= ~rd_mask_polygon;
-                                        } else if ((rd_mask_polygon & 1) && (wrt_mask & 1)) {
-                                            ibm8514_log("Filling c(%d,%d) with bit 0 of rdmask=%02x, wrtmask=%02x.\n", dev->accel.cx, dev->accel.cy, rd_mask_polygon, wrt_mask);
-                                            dest_dat &= ~(rd_mask_polygon & wrt_mask);
+                                    default:
+                                        break;
+                                }
+
+                                READ(dev->accel.dest + dev->accel.cx, poly_src);
+                                if ((poly_src & rd_mask_polygon) == rd_mask_polygon)
+                                    dev->accel.fill_state ^= 1;
+
+                                READ(dev->accel.dest + dev->accel.cx, dest_dat);
+
+                                old_dest_dat = dest_dat;
+                                if (dev->accel.fill_state) {
+                                    if (rd_mask_polygon & 0x01) {
+                                        if (wrt_mask & 0x01) {
+                                            dest_dat &= ~(rd_mask_polygon & wrt_mask); /*Fill State On, Write Mask 1, Read Mask 1.*/
+                                            dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
                                         }
                                     } else {
-                                        if (!(rd_mask_polygon & 1) && (wrt_mask & 1))
-                                            dest_dat &= ~rd_mask_polygon;
-                                        else if ((rd_mask_polygon & 1) && (wrt_mask & 1))
-                                            dest_dat &= ~(rd_mask_polygon & wrt_mask);
+                                        if (wrt_mask & 0x01) {
+                                            MIX(mix_dat & mix_mask, dest_dat, src_dat);
+                                            dest_dat &= ~rd_mask_polygon; /*Fill State On, Write Mask 1, Read Mask 0.*/
+                                            dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
+                                        }
                                     }
+                                } else {
+                                    if (rd_mask_polygon & 0x01) {
+                                        if (wrt_mask & 0x01) {
+                                            dest_dat &= ~(rd_mask_polygon & wrt_mask); /*Fill State Off, Write Mask 1, Read Mask 1.*/
+                                            dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
+                                        }
+                                    } else {
+                                        if (wrt_mask & 0x01) {
+                                            dest_dat &= ~rd_mask_polygon; /*Fill State Off, Write Mask 1, Read Mask 0.*/
+                                            dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
+                                        }
+                                    }
+                                }
 
+                                if ((compare_mode == 0) ||
+                                    ((compare_mode == 0x10) && (dest_dat >= compare)) ||
+                                    ((compare_mode == 0x18) && (dest_dat < compare)) ||
+                                    ((compare_mode == 0x20) && (dest_dat != compare)) ||
+                                    ((compare_mode == 0x28) && (dest_dat == compare)) ||
+                                    ((compare_mode == 0x30) && (dest_dat <= compare)) ||
+                                    ((compare_mode == 0x38) && (dest_dat > compare))) {
+                                    ibm8514_log("Results c(%d,%d):rdmask=%02x, wrtmask=%02x, mix=%02x, destdat=%02x, nowrite=%d.\n", dev->accel.cx, dev->accel.cy, rd_mask_polygon, wrt_mask, mix_dat, dest_dat, dev->accel.cx_back);
+                                    WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
+                                }
+                            } else
+                                ibm8514_log("Out of bounds DrawA C(%d,%d).\n", dev->accel.cx, dev->accel.cy);
+
+                            mix_dat <<= 1;
+                            mix_dat |= 1;
+
+                            if (dev->accel.cmd & 0x20)
+                                dev->accel.cx++;
+                            else
+                                dev->accel.cx--;
+
+                            dev->accel.sx--;
+                            if (dev->accel.sx < 0) {
+                                dev->accel.fill_state = 0;
+                                dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
+
+                                if (dev->accel.cmd & 0x20)
+                                    dev->accel.cx -= (dev->accel.sx + 1);
+                                else
+                                    dev->accel.cx += (dev->accel.sx + 1);
+
+                                if (dev->accel.cmd & 0x80)
+                                    dev->accel.cy++;
+                                else
+                                    dev->accel.cy--;
+
+                                dev->accel.dest = dev->accel.ge_offset + (dev->accel.cy * dev->pitch);
+
+                                dev->accel.sy--;
+
+                                if (dev->accel.sy < 0) {
+                                    ibm8514_log(".\n");
+                                    dev->fifo_idx = 0;
+                                    dev->accel.cur_x = dev->accel.cx;
+                                    dev->accel.cur_y = dev->accel.cy;
+                                    dev->accel.cmd_back = 1;
+                                    return;
+                                }
+                            }
+                        }
+                    } else {
+                        ibm8514_log("Polygon Draw Type=%02x, CX=%d, CY=%d, SY=%d, CL=%d, CR=%d, frgdmix=%d, bkgdmix=%d, cmpmode=%02x, pitch=%d.\n", dev->accel.multifunc[0x0a] & 0x06, dev->accel.cx, dev->accel.cy, dev->accel.sy, clip_l, clip_r, frgd_mix, bkgd_mix, compare_mode, dev->pitch);
+                        while (count-- && (dev->accel.sy >= 0)) {
+                            if ((dev->accel.cx >= clip_l) &&
+                                (dev->accel.cx <= clip_r) &&
+                                (dev->accel.cy >= clip_t) &&
+                                (dev->accel.cy <= clip_b)) {
+                                dev->subsys_stat |= INT_GE_BSY;
+                                switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
+                                    case 0:
+                                        src_dat = bkgd_color;
+                                        break;
+                                    case 1:
+                                        src_dat = frgd_color;
+                                        break;
+                                    case 2:
+                                    case 3:
+                                        src_dat = 0;
+                                        break;
+
+                                    default:
+                                        break;
+                                }
+
+                                READ(dev->accel.dest + dev->accel.cx, dest_dat);
+
+                                if ((compare_mode == 0) ||
+                                    ((compare_mode == 0x10) && (dest_dat >= compare)) ||
+                                    ((compare_mode == 0x18) && (dest_dat < compare)) ||
+                                    ((compare_mode == 0x20) && (dest_dat != compare)) ||
+                                    ((compare_mode == 0x28) && (dest_dat == compare)) ||
+                                    ((compare_mode == 0x30) && (dest_dat <= compare)) ||
+                                    ((compare_mode == 0x38) && (dest_dat > compare))) {
+                                    old_dest_dat = dest_dat;
+                                    MIX(mix_dat & mix_mask, dest_dat, src_dat);
                                     dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
 
-                                    if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
-                                        ibm8514_log("Results c(%d,%d):rdmask=%02x, wrtmask=%02x, mix=%02x, destdat=%02x, nowrite=%d.\n", dev->accel.cx, dev->accel.cy, rd_mask_polygon, wrt_mask, mix_dat, dest_dat, dev->accel.cx_back);
+                                    if (dev->accel.cmd & 0x10) {
                                         WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
                                     }
                                 }
+                            } else
+                                ibm8514_log("Outside clipping.\n");
+
+                            mix_dat <<= 1;
+                            mix_dat |= 1;
+
+                            if (dev->accel.cmd & 0x20)
+                                dev->accel.cx++;
+                            else
+                                dev->accel.cx--;
+
+                            dev->accel.sx--;
+                            if (dev->accel.sx < 0) {
+                                dev->accel.fill_state = 0;
+                                dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
 
                                 if (dev->accel.cmd & 0x20)
-                                    dev->accel.cx++;
+                                    dev->accel.cx -= (dev->accel.sx + 1);
                                 else
-                                    dev->accel.cx--;
+                                    dev->accel.cx += (dev->accel.sx + 1);
 
-                                dev->accel.sx--;
-                                if (dev->accel.sx < 0) {
-                                    dev->accel.fill_state = 0;
-                                    dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
-
-                                    if (dev->accel.cmd & 0x20)
-                                        dev->accel.cx -= (dev->accel.sx) + 1;
-                                    else
-                                        dev->accel.cx += (dev->accel.sx) + 1;
-
-                                    if (dev->accel.cmd & 0x80)
-                                        dev->accel.cy++;
-                                    else
-                                        dev->accel.cy--;
-
-                                    dev->accel.dest = dev->accel.cy * dev->pitch;
-
-                                    dev->accel.sy--;
-
-                                    if (dev->accel.sy < 0) {
-                                        ibm8514_log(".\n");
-                                        return;
-                                    }
-                                }
-                            }
-                        } else {
-                            ibm8514_log("Rectangle Fill Normal CMD=%04x, CURRENT(%d,%d), sx=%d, FR(%02x), linedraw=%d.\n", dev->accel.cmd, dev->accel.cx, dev->accel.cy, dev->accel.sx, frgd_color, dev->accel.linedraw);
-                            while (count-- && dev->accel.sy >= 0) {
-                                if (dev->accel.cx >= dev->accel.clip_left && dev->accel.cx <= clip_r && dev->accel.cy >= dev->accel.clip_top && dev->accel.cy <= clip_b) {
-                                    switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
-                                        case 0:
-                                            src_dat = bkgd_color;
-                                            if (!bkgd_mix && (dev->accel.cmd & 0x40) && ((dev->accel.frgd_mix & 0x1f) == 7) && ((dev->accel.bkgd_mix & 0x1f) == 3) && !dev->bpp && (bkgd_color == 0x00)) /*For some reason, the September 1992 Mach8/32 drivers for Win3.x don't set the background colors properly.*/
-                                                src_dat = frgd_color;
-                                            break;
-                                        case 1:
-                                            src_dat = frgd_color;
-                                            break;
-                                        case 2:
-                                            src_dat = 0;
-                                            break;
-                                        case 3:
-                                            src_dat = 0;
-                                            break;
-
-                                        default:
-                                            break;
-                                    }
-
-
-                                    READ(dev->accel.dest + dev->accel.cx, dest_dat);
-
-                                    if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
-                                        old_dest_dat = dest_dat;
-                                        MIX(mix_dat & mix_mask, dest_dat, src_dat);
-                                        dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-
-                                        if (dev->accel.cmd & 0x10) {
-                                            WRITE(dev->accel.dest + dev->accel.cx, dest_dat);
-                                        }
-                                    }
-                                }
-
-                                mix_dat <<= 1;
-                                mix_dat |= 1;
-
-                                if (dev->accel.cmd & 0x20)
-                                    dev->accel.cx++;
+                                if (dev->accel.cmd & 0x80)
+                                    dev->accel.cy++;
                                 else
-                                    dev->accel.cx--;
+                                    dev->accel.cy--;
 
-                                dev->accel.sx--;
-                                if (dev->accel.sx < 0) {
-                                    dev->accel.fill_state = 0;
-                                    dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
+                                dev->accel.dest = dev->accel.ge_offset + (dev->accel.cy * dev->pitch);
 
-                                    if (dev->accel.cmd & 0x20)
-                                        dev->accel.cx -= (dev->accel.sx) + 1;
-                                    else
-                                        dev->accel.cx += (dev->accel.sx) + 1;
-
-                                    if (dev->accel.cmd & 0x80)
-                                        dev->accel.cy++;
-                                    else
-                                        dev->accel.cy--;
-
-                                    if (((dev->local & 0xff) >= 0x02) && dev->accel.ge_offset && ((dev->accel_bpp == 24) || (dev->accel_bpp == 8)))
-                                        dev->accel.dest = (dev->accel.ge_offset << 2) + (dev->accel.cy * dev->pitch);
-                                    else
-                                        dev->accel.dest = dev->accel.cy * dev->pitch;
-
-                                    dev->accel.sy--;
-
-                                    if (dev->accel.sy < 0) {
+                                dev->accel.sy--;
+                                if (dev->accel.sy < 0) {
+                                    if (cmd != 4) {
                                         dev->accel.cur_x = dev->accel.cx;
                                         dev->accel.cur_y = dev->accel.cy;
-                                        return;
                                     }
+                                    dev->fifo_idx = 0;
+                                    dev->accel.cmd_back = 1;
+                                    return;
                                 }
                             }
                         }
@@ -2973,43 +2572,47 @@ rect_fill:
 
         case 5: /*Draw Polygon Boundary Line*/ {
             if (!cpu_input) {
+                dev->accel.sy = dev->accel.maj_axis_pcnt_no_limit;
+
                 dev->accel.cx = dev->accel.cur_x;
                 if (dev->accel.cur_x >= 0x600)
                     dev->accel.cx |= ~0x5ff;
+
                 dev->accel.cy = dev->accel.cur_y;
                 if (dev->accel.cur_y >= 0x600)
                     dev->accel.cy |= ~0x5ff;
 
-                dev->accel.sy = dev->accel.maj_axis_pcnt_no_limit;
-
                 if (dev->accel.cmd & 0x80)
                     dev->accel.oldcy = dev->accel.cy + 1;
                 else
                     dev->accel.oldcy = dev->accel.cy - 1;
 
-                dev->accel.oldcx = 0;
-
-                ibm8514_log("Polygon Boundary activated=%04x, len=%d, cur(%d,%d), frgdmix=%02x, err=%d, clipping: l=%d, r=%d, t=%d, b=%d, pixcntl=%02x.\n", dev->accel.cmd, dev->accel.sy, dev->accel.cur_x_nolimit, dev->accel.cy, dev->accel.frgd_mix & 0x1f, dev->accel.err_term, dev->accel.clip_left, clip_r, dev->accel.clip_top, clip_b, compare_mode, dev->accel.multifunc[0x0a]);
+                ibm8514_log("Polygon Boundary activated=%04x, len=%d, cur(%d,%d), frgdmix=%02x, err=%d, clipping: l=%d, r=%d, t=%d, b=%d, pixcntl=%02x.\n", dev->accel.cmd, dev->accel.sy, dev->accel.cx, dev->accel.cy, dev->accel.frgd_mix & 0x1f, dev->accel.err_term, clip_l, clip_r, clip_t, clip_b, dev->accel.multifunc[0x0a]);
 
                 if (ibm8514_cpu_src(svga)) {
+                    dev->force_busy = 1;
+                    dev->force_busy2 = 1;
                     dev->data_available  = 0;
                     dev->data_available2 = 0;
                     return; /*Wait for data from CPU*/
                 } else if (ibm8514_cpu_dest(svga)) {
+                    dev->force_busy = 1;
+                    dev->force_busy2 = 1;
                     dev->data_available  = 1;
                     dev->data_available2 = 1;
                     return;
                 }
             }
 
-            if (dev->accel.cmd & 8) {
+            if (dev->accel.cmd & 0x08) { /*Vectored Boundary Line*/
                 while (count-- && (dev->accel.sy >= 0)) {
-                    if (dev->accel.cx < 0)
-                        dev->accel.cx = 0;
-                    if (dev->accel.cy < 0)
-                        dev->accel.cy = 0;
+                    dev->accel.cx = CLAMP(dev->accel.cx, clip_l, clip_r);
 
-                    if (dev->accel.cx >= dev->accel.clip_left && dev->accel.cx <= clip_r && dev->accel.cy >= dev->accel.clip_top && dev->accel.cy <= clip_b) {
+                    if ((dev->accel.cx >= clip_l) &&
+                        (dev->accel.cx <= clip_r) &&
+                        (dev->accel.cy >= clip_t) &&
+                        (dev->accel.cy <= clip_b)) {
+                        dev->subsys_stat |= INT_GE_BSY;
                         switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                             case 0:
                                 src_dat = bkgd_color;
@@ -3031,16 +2634,22 @@ rect_fill:
 
                         READ((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
 
-                        if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
+                        if ((compare_mode == 0) ||
+                            ((compare_mode == 0x10) && (dest_dat >= compare)) ||
+                            ((compare_mode == 0x18) && (dest_dat < compare)) ||
+                            ((compare_mode == 0x20) && (dest_dat != compare)) ||
+                            ((compare_mode == 0x28) && (dest_dat == compare)) ||
+                            ((compare_mode == 0x30) && (dest_dat <= compare)) ||
+                            ((compare_mode == 0x38) && (dest_dat > compare))) {
                             old_dest_dat = dest_dat;
                             MIX(mix_dat & mix_mask, dest_dat, src_dat);
                             dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
                             if (dev->accel.cmd & 0x10) {
-                                if (dev->accel.sy && (dev->accel.cmd & 4)) {
+                                if (dev->accel.sy && (dev->accel.cmd & 0x04)) {
                                     if (dev->accel.oldcy != dev->accel.cy) {
                                         WRITE((dev->accel.cy * dev->pitch) + (dev->accel.cx), dest_dat);
                                     }
-                                } else if (!(dev->accel.cmd & 4)) {
+                                } else if (!(dev->accel.cmd & 0x04)) {
                                     if (dev->accel.oldcy != dev->accel.cy) {
                                         WRITE((dev->accel.cy * dev->pitch) + (dev->accel.cx), dest_dat);
                                     }
@@ -3056,8 +2665,15 @@ rect_fill:
                     else
                         cpu_dat >>= 8;
 
-                    if (!dev->accel.sy)
+                    if (!dev->accel.sy) {
+                        if (cpu_input) {
+                            dev->force_busy = 0;
+                            dev->force_busy2 = 0;
+                        }
+                        dev->fifo_idx = 0;
+                        dev->accel.cmd_back = 1;
                         break;
+                    }
 
                     switch (dev->accel.cmd & 0xe0) {
                         case 0x00:
@@ -3101,14 +2717,15 @@ rect_fill:
 
                     dev->accel.sy--;
                 }
-            } else {
+            } else { /*Vectored Bresenham*/
                 while (count-- && (dev->accel.sy >= 0)) {
-                    if (dev->accel.cx < 0)
-                        dev->accel.cx = 0;
-                    if (dev->accel.cy < 0)
-                        dev->accel.cy = 0;
+                    dev->accel.cx = CLAMP(dev->accel.cx, clip_l, clip_r);
 
-                    if (dev->accel.cx >= dev->accel.clip_left && dev->accel.cx <= clip_r && dev->accel.cy >= dev->accel.clip_top && dev->accel.cy <= clip_b) {
+                    if ((dev->accel.cx >= clip_l) &&
+                        (dev->accel.cx <= clip_r) &&
+                        (dev->accel.cy >= clip_t) &&
+                        (dev->accel.cy <= clip_b)) {
+                        dev->subsys_stat |= INT_GE_BSY;
                         switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                             case 0:
                                 src_dat = bkgd_color;
@@ -3129,19 +2746,21 @@ rect_fill:
 
                         READ((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
 
-                        if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
+                        if ((compare_mode == 0) ||
+                            ((compare_mode == 0x10) && (dest_dat >= compare)) ||
+                            ((compare_mode == 0x18) && (dest_dat < compare)) ||
+                            ((compare_mode == 0x20) && (dest_dat != compare)) ||
+                            ((compare_mode == 0x28) && (dest_dat == compare)) ||
+                            ((compare_mode == 0x30) && (dest_dat <= compare)) ||
+                            ((compare_mode == 0x38) && (dest_dat > compare))) {
                             old_dest_dat = dest_dat;
                             MIX(mix_dat & mix_mask, dest_dat, src_dat);
                             dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
 
                             if ((dev->accel.cmd & 0x14) == 0x14) {
                                 if (dev->accel.sy) {
-                                    if (dev->accel.cmd & 0x40) {
+                                    if (dev->accel.oldcy != dev->accel.cy) {
                                         WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                    } else {
-                                        if (dev->accel.oldcy != dev->accel.cy) {
-                                            WRITE((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
-                                        }
                                     }
                                 }
                             }
@@ -3155,16 +2774,24 @@ rect_fill:
                     else
                         cpu_dat >>= 8;
 
-                    if (!dev->accel.sy)
+                    if (!dev->accel.sy) {
+                        if (cpu_input) {
+                            dev->force_busy = 0;
+                            dev->force_busy2 = 0;
+                        }
+                        dev->fifo_idx = 0;
+                        dev->accel.cmd_back = 1;
                         break;
+                    }
 
                     if (dev->accel.cmd & 0x40) {
+                        dev->accel.oldcy = dev->accel.cy;
                         if (dev->accel.cmd & 0x80)
                             dev->accel.cy++;
                         else
                             dev->accel.cy--;
 
-                        if (dev->accel.err_term >= 0) {
+                        if (dev->accel.err_term >= dev->accel.maj_axis_pcnt_no_limit) {
                             dev->accel.err_term += dev->accel.destx_distp;
                             if (dev->accel.cmd & 0x20)
                                 dev->accel.cx++;
@@ -3179,7 +2806,7 @@ rect_fill:
                             dev->accel.cx--;
 
                         dev->accel.oldcy = dev->accel.cy;
-                        if (dev->accel.err_term >= 0) {
+                        if (dev->accel.err_term >= dev->accel.maj_axis_pcnt_no_limit) {
                             dev->accel.err_term += dev->accel.destx_distp;
                             if (dev->accel.cmd & 0x80)
                                 dev->accel.cy++;
@@ -3199,537 +2826,439 @@ rect_fill:
             if (!cpu_input) /*!cpu_input is trigger to start operation*/
             {
                 dev->accel.x_count = 0;
-                dev->accel.output  = 0;
-
-                dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
-                dev->accel.sy = dev->accel.multifunc[0] & 0x7ff;
 
                 dev->accel.dx = dev->accel.destx;
-                dev->accel.dy = dev->accel.desty;
-
                 if (dev->accel.destx >= 0x600)
                     dev->accel.dx |= ~0x5ff;
+
+                dev->accel.dy = dev->accel.desty;
                 if (dev->accel.desty >= 0x600)
                     dev->accel.dy |= ~0x5ff;
 
                 dev->accel.cx = dev->accel.cur_x;
-                dev->accel.cy = dev->accel.cur_y;
-
                 if (dev->accel.cur_x >= 0x600)
                     dev->accel.cx |= ~0x5ff;
+
+                dev->accel.cy = dev->accel.cur_y;
                 if (dev->accel.cur_y >= 0x600)
                     dev->accel.cy |= ~0x5ff;
 
-                dev->accel.src  = dev->accel.cy * dev->pitch;
-                dev->accel.dest = dev->accel.dy * dev->pitch;
+                dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
+                dev->accel.sy = dev->accel.multifunc[0] & 0x7ff;
+
+                dev->accel.src  = dev->accel.ge_offset + (dev->accel.cy * dev->pitch);
+                dev->accel.dest = dev->accel.ge_offset + (dev->accel.dy * dev->pitch);
                 dev->accel.fill_state = 0;
 
                 if (ibm8514_cpu_src(svga)) {
-                    if (dev->accel.cmd & 2) {
+                    if (dev->accel.cmd & 0x02) {
                         if (!(dev->accel.cmd & 0x1000)) {
-                            dev->accel.sx += (dev->accel.cur_x & 3);
-                            dev->accel.nibbleset = (uint8_t *) calloc(1, (dev->accel.sx >> 3) + 1);
-                            dev->accel.writemono = (uint8_t *) calloc(1, (dev->accel.sx >> 3) + 1);
-                            dev->accel.sys_cnt   = (dev->accel.sx >> 3) + 1;
+                            dev->accel.x_count = dev->accel.cx;
+                            if (and3) {
+                                if (dev->accel.cmd & 0x20)
+                                    dev->accel.x_count -= and3;
+                                else
+                                    dev->accel.x_count += and3;
+
+                                dev->accel.sx += 8;
+                            }
                         }
                     }
+                    dev->force_busy = 1;
+                    dev->force_busy2 = 1;
                     dev->data_available  = 0;
                     dev->data_available2 = 0;
                     return; /*Wait for data from CPU*/
                 } else if (ibm8514_cpu_dest(svga)) {
+                    dev->force_busy = 1;
+                    dev->force_busy2 = 1;
                     dev->data_available  = 1;
                     dev->data_available2 = 1;
                     return; /*Wait for data from CPU*/
-                }
+                } else
+                    ibm8514_log("BitBLT normal: Parameters: DX=%d, DY=%d, CX=%d, CY=%d, dstwidth=%d, dstheight=%d, clipl=%d, clipr=%d, clipt=%d, clipb=%d.\n", dev->accel.dx, dev->accel.dy, dev->accel.cx, dev->accel.cy, dev->accel.sx, dev->accel.sy, clip_l, clip_r, clip_t, clip_b);
             }
 
-            if (dev->accel.cmd & 2) {
-                if (cpu_input) {
-bitblt_pix:
-                    if (count < 8) {
-                        while (count-- && (dev->accel.sy >= 0)) {
-                            if (dev->accel.dx >= dev->accel.clip_left && dev->accel.dx <= clip_r && dev->accel.dy >= dev->accel.clip_top && dev->accel.dy <= clip_b) {
-                                if (pixcntl == 3) {
-                                    if (!(dev->accel.cmd & 0x10) && ((frgd_mix != 3) || (bkgd_mix != 3))) {
-                                        READ(dev->accel.src + dev->accel.cx, mix_dat);
-                                        mix_dat = ((mix_dat & rd_mask) == rd_mask);
-                                        mix_dat = mix_dat ? mix_mask : 0;
-                                    } else if (dev->accel.cmd & 0x10) {
-                                        READ(dev->accel.src + dev->accel.cx, mix_dat);
-                                        mix_dat = ((mix_dat & rd_mask) == rd_mask);
-                                        mix_dat = mix_dat ? mix_mask : 0;
-                                    }
-                                }
-                                switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
-                                    case 0:
-                                        src_dat = bkgd_color;
-                                        break;
-                                    case 1:
-                                        src_dat = frgd_color;
-                                        break;
-                                    case 2:
-                                        src_dat = cpu_dat;
-                                        break;
-                                    case 3:
-                                        READ(dev->accel.src + dev->accel.cx, src_dat);
-                                        if (pixcntl == 3) {
-                                            if (dev->accel.cmd & 0x10) {
-                                                src_dat = ((src_dat & rd_mask) == rd_mask);
-                                            }
-                                        }
-                                        break;
-
-                                    default:
-                                        break;
-                                }
-
-                                READ(dev->accel.dest + dev->accel.dx, dest_dat);
-
-                                if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
-                                    old_dest_dat = dest_dat;
-
-                                    MIX(mix_dat & mix_mask, dest_dat, src_dat);
-                                    dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                    WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
-                                }
-                            }
-
-                            mix_dat <<= 1;
-                            mix_dat |= 1;
-                            if (dev->bpp)
-                                cpu_dat >>= 16;
-                            else
-                                cpu_dat >>= 8;
-
-                            if (dev->accel.cmd & 0x20) {
-                                dev->accel.dx++;
-                                dev->accel.cx++;
-                            } else {
-                                dev->accel.dx--;
-                                dev->accel.cx--;
-                            }
-
-                            dev->accel.sx--;
-                            if (dev->accel.sx < 0) {
-                                dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
-
-                                if (dev->accel.cmd & 2) {
-                                    dev->accel.sx += (dev->accel.cur_x & 3);
-                                }
-
-                                if (dev->accel.cmd & 0x20) {
-                                    dev->accel.dx -= (dev->accel.sx) + 1;
-                                    dev->accel.cx -= (dev->accel.sx) + 1;
-                                } else {
-                                    dev->accel.dx += (dev->accel.sx) + 1;
-                                    dev->accel.cx += (dev->accel.sx) + 1;
-                                }
-
-                                if (dev->accel.cmd & 0x80) {
-                                    dev->accel.dy++;
-                                    dev->accel.cy++;
-                                } else {
-                                    dev->accel.dy--;
-                                    dev->accel.cy--;
-                                }
-
-                                dev->accel.src  = dev->accel.cy * dev->pitch;
-                                dev->accel.dest = dev->accel.dy * dev->pitch;
-                                dev->accel.sy--;
-                                return;
+            if (cpu_input) {
+                while (count-- && (dev->accel.sy >= 0)) {
+                    if ((dev->accel.dx >= clip_l) &&
+                        (dev->accel.dx <= clip_r) &&
+                        (dev->accel.dy >= clip_t) &&
+                        (dev->accel.dy <= clip_b)) {
+                        if (pixcntl == 3) {
+                            if (!(dev->accel.cmd & 0x10) && ((frgd_mix != 3) || (bkgd_mix != 3))) {
+                                READ(dev->accel.src + dev->accel.cx, mix_dat);
+                                mix_dat = ((mix_dat & rd_mask) == rd_mask);
+                                if (dev->accel.cmd & 0x02)
+                                    mix_dat = mix_dat ? 0x01 : 0x00;
+                                else
+                                    mix_dat = mix_dat ? mix_mask : 0x00;
+                            } else if (dev->accel.cmd & 0x10) {
+                                READ(dev->accel.src + dev->accel.cx, mix_dat);
+                                mix_dat = ((mix_dat & rd_mask) == rd_mask);
+                                if (dev->accel.cmd & 0x02)
+                                    mix_dat = mix_dat ? 0x01 : 0x00;
+                                else
+                                    mix_dat = mix_dat ? mix_mask : 0x00;
                             }
                         }
-                    } else {
-                        while (count-- && (dev->accel.sy >= 0)) {
-                            if (dev->accel.dx >= dev->accel.clip_left && dev->accel.dx <= clip_r && dev->accel.dy >= dev->accel.clip_top && dev->accel.dy <= clip_b) {
-                                if (pixcntl == 3) {
-                                    if (!(dev->accel.cmd & 0x10) && ((frgd_mix != 3) || (bkgd_mix != 3))) {
-                                        READ(dev->accel.src + dev->accel.cx, mix_dat);
-                                        mix_dat = ((mix_dat & rd_mask) == rd_mask);
-                                        mix_dat = mix_dat ? 1 : 0;
-                                    } else if (dev->accel.cmd & 0x10) {
-                                        READ(dev->accel.src + dev->accel.cx, mix_dat);
-                                        mix_dat = ((mix_dat & rd_mask) == rd_mask);
-                                        mix_dat = mix_dat ? 1 : 0;
+                        if (dev->accel.cmd & 0x02) {
+                            switch ((mix_dat & 0x01) ? frgd_mix : bkgd_mix) {
+                                case 0:
+                                    src_dat = bkgd_color;
+                                    break;
+                                case 1:
+                                    src_dat = frgd_color;
+                                    break;
+                                case 2:
+                                    src_dat = cpu_dat;
+                                    break;
+                                case 3:
+                                    READ(dev->accel.src + dev->accel.cx, src_dat);
+                                    if (pixcntl == 3) {
+                                        if (dev->accel.cmd & 0x10)
+                                            src_dat = ((src_dat & rd_mask) == rd_mask);
                                     }
-                                }
-                                switch ((mix_dat & 1) ? frgd_mix : bkgd_mix) {
-                                    case 0:
-                                        src_dat = bkgd_color;
-                                        break;
-                                    case 1:
-                                        src_dat = frgd_color;
-                                        break;
-                                    case 2:
-                                        src_dat = cpu_dat;
-                                        break;
-                                    case 3:
-                                        READ(dev->accel.src + dev->accel.cx, src_dat);
-                                        if (pixcntl == 3) {
-                                            if (dev->accel.cmd & 0x10) {
-                                                src_dat = ((src_dat & rd_mask) == rd_mask);
-                                            }
-                                        }
-                                        break;
+                                    break;
 
-                                    default:
-                                        break;
-                                }
-
-                                READ(dev->accel.dest + dev->accel.dx, dest_dat);
-
-                                if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
-                                    old_dest_dat = dest_dat;
-                                    MIX(mix_dat & 1, dest_dat, src_dat);
-                                    dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                    WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
-                                }
-                            }
-                            mix_dat >>= 1;
-                            if (dev->bpp)
-                                cpu_dat >>= 16;
-                            else
-                                cpu_dat >>= 8;
-
-                            if (dev->accel.cmd & 0x20) {
-                                dev->accel.dx++;
-                                dev->accel.cx++;
-                            } else {
-                                dev->accel.dx--;
-                                dev->accel.cx--;
-                            }
-
-                            dev->accel.sx--;
-                            if (dev->accel.sx < 0) {
-                                dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
-
-                                if (dev->accel.cmd & 2) {
-                                    if (!(dev->accel.cmd & 0x1000))
-                                        dev->accel.sx += (dev->accel.cur_x & 3);
-                                }
-
-                                if (dev->accel.cmd & 0x20) {
-                                    dev->accel.dx -= (dev->accel.sx) + 1;
-                                    dev->accel.cx -= (dev->accel.sx) + 1;
-                                } else {
-                                    dev->accel.dx += (dev->accel.sx) + 1;
-                                    dev->accel.cx += (dev->accel.sx) + 1;
-                                }
-
-                                if (dev->accel.cmd & 2) {
-                                    if (dev->accel.cmd & 0x1000) {
-                                        dev->accel.cx = dev->accel.cur_x;
-                                        if (dev->accel.cur_x >= 0x600)
-                                            dev->accel.cx |= ~0x5ff;
-                                        dev->accel.dx = dev->accel.destx;
-                                        if (dev->accel.destx >= 0x600)
-                                            dev->accel.dx |= ~0x5ff;
-                                    }
-                                }
-
-                                if (dev->accel.cmd & 0x80) {
-                                    dev->accel.dy++;
-                                    dev->accel.cy++;
-                                } else {
-                                    dev->accel.dy--;
-                                    dev->accel.cy--;
-                                }
-
-                                dev->accel.dest = dev->accel.dy * dev->pitch;
-                                dev->accel.src  = dev->accel.cy * dev->pitch;
-                                dev->accel.sy--;
-                                return;
-                            }
-                        }
-                    }
-                } else {
-                    goto bitblt;
-                }
-            } else {
-                if (cpu_input) {
-                    if (pixcntl == 2) {
-                        goto bitblt_pix;
-                    } else {
-                        while (count-- && (dev->accel.sy >= 0)) {
-                            if (dev->accel.dx >= dev->accel.clip_left && dev->accel.dx <= clip_r && dev->accel.dy >= dev->accel.clip_top && dev->accel.dy <= clip_b) {
-
-                                if (pixcntl == 3) {
-                                    if (!(dev->accel.cmd & 0x10) && ((frgd_mix != 3) || (bkgd_mix != 3))) {
-                                        READ(dev->accel.src + dev->accel.cx, mix_dat);
-                                        mix_dat = ((mix_dat & rd_mask) == rd_mask);
-                                        mix_dat = mix_dat ? mix_mask : 0;
-                                    } else if (dev->accel.cmd & 0x10) {
-                                        READ(dev->accel.src + dev->accel.cx, mix_dat);
-                                        mix_dat = ((mix_dat & rd_mask) == rd_mask);
-                                        mix_dat = mix_dat ? mix_mask : 0;
-                                    }
-                                }
-                                switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
-                                    case 0:
-                                        src_dat = bkgd_color;
-                                        break;
-                                    case 1:
-                                        src_dat = frgd_color;
-                                        break;
-                                    case 2:
-                                        src_dat = cpu_dat;
-                                        break;
-                                    case 3:
-                                        READ(dev->accel.src + dev->accel.cx, src_dat);
-                                        if (pixcntl == 3) {
-                                            if (dev->accel.cmd & 0x10) {
-                                                src_dat = ((src_dat & rd_mask) == rd_mask);
-                                            }
-                                        }
-                                        break;
-
-                                    default:
-                                        break;
-                                }
-
-                                READ(dev->accel.dest + dev->accel.dx, dest_dat);
-
-                                if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
-                                    old_dest_dat = dest_dat;
-                                    MIX(mix_dat & mix_mask, dest_dat, src_dat);
-                                    dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                    WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
-                                }
-                            }
-                            mix_dat <<= 1;
-                            mix_dat |= 1;
-                            if (dev->bpp)
-                                cpu_dat >>= 16;
-                            else
-                                cpu_dat >>= 8;
-
-                            if (dev->accel.cmd & 0x20) {
-                                dev->accel.dx++;
-                                dev->accel.cx++;
-                            } else {
-                                dev->accel.dx--;
-                                dev->accel.cx--;
-                            }
-
-                            dev->accel.sx--;
-                            if (dev->accel.sx < 0) {
-                                dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
-
-                                if (dev->accel.cmd & 0x20) {
-                                    dev->accel.dx -= (dev->accel.sx) + 1;
-                                    dev->accel.cx -= (dev->accel.sx) + 1;
-                                } else {
-                                    dev->accel.dx += (dev->accel.sx) + 1;
-                                    dev->accel.cx += (dev->accel.sx) + 1;
-                                }
-
-                                if (dev->accel.cmd & 0x80) {
-                                    dev->accel.dy++;
-                                    dev->accel.cy++;
-                                } else {
-                                    dev->accel.dy--;
-                                    dev->accel.cy--;
-                                }
-
-                                dev->accel.dest = dev->accel.dy * dev->pitch;
-                                dev->accel.src  = dev->accel.cy * dev->pitch;
-                                dev->accel.sy--;
-                                return;
-                            }
-                        }
-                    }
-                } else {
-bitblt:
-                    if (pixcntl == 1) {
-                        if (dev->accel.cmd & 0x40) {
-                            count               = dev->accel.maj_axis_pcnt + 1;
-                            dev->accel.temp_cnt = 8;
-                            while (count-- && dev->accel.sy >= 0) {
-                                if (!dev->accel.temp_cnt) {
-                                    mix_dat >>= 8;
-                                    dev->accel.temp_cnt = 8;
-                                }
-                                if (dev->accel.dx >= dev->accel.clip_left && dev->accel.dx <= clip_r && dev->accel.dy >= dev->accel.clip_top && dev->accel.dy <= clip_b) {
-                                    switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
-                                        case 0:
-                                            src_dat = bkgd_color;
-                                            break;
-                                        case 1:
-                                            src_dat = frgd_color;
-                                            break;
-                                        case 2:
-                                            src_dat = 0;
-                                            break;
-                                        case 3:
-                                            READ(dev->accel.src + dev->accel.cx, src_dat);
-                                            break;
-
-                                        default:
-                                            break;
-                                    }
-
-                                    READ(dev->accel.dest + dev->accel.dx, dest_dat);
-
-                                    if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
-                                        old_dest_dat = dest_dat;
-                                        MIX(mix_dat & mix_mask, dest_dat, src_dat);
-                                        dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-
-                                        WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
-                                    }
-                                }
-
-                                if (dev->accel.temp_cnt > 0) {
-                                    dev->accel.temp_cnt--;
-                                    mix_dat <<= 1;
-                                    mix_dat |= 1;
-                                }
-
-                                if (dev->accel.cmd & 0x20) {
-                                    dev->accel.dx++;
-                                    dev->accel.cx++;
-                                } else {
-                                    dev->accel.dx--;
-                                    dev->accel.cx--;
-                                }
-
-                                dev->accel.sx--;
-                                if (dev->accel.sx < 0) {
-                                    dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
-
-                                    if (dev->accel.cmd & 0x20) {
-                                        dev->accel.dx -= (dev->accel.sx) + 1;
-                                        dev->accel.cx -= (dev->accel.sx) + 1;
-                                    } else {
-                                        dev->accel.dx += (dev->accel.sx) + 1;
-                                        dev->accel.cx += (dev->accel.sx) + 1;
-                                    }
-
-                                    if (dev->accel.cmd & 0x80) {
-                                        dev->accel.dy++;
-                                        dev->accel.cy++;
-                                    } else {
-                                        dev->accel.dy--;
-                                        dev->accel.cy--;
-                                    }
-
-                                    dev->accel.dest = dev->accel.dy * dev->pitch;
-                                    dev->accel.src  = dev->accel.cy * dev->pitch;
-                                    dev->accel.sy--;
-                                    return;
-                                }
+                                default:
+                                    break;
                             }
                         } else {
-                            dev->accel.temp_cnt = 8;
-                            while (count-- && dev->accel.sy >= 0) {
-                                if (!dev->accel.temp_cnt) {
-                                    dev->accel.temp_cnt = 8;
-                                    mix_dat             = old_mix_dat;
-                                }
-                                if (dev->accel.dx >= dev->accel.clip_left && dev->accel.dx <= clip_r && dev->accel.dy >= dev->accel.clip_top && dev->accel.dy <= clip_b) {
-                                    switch ((mix_dat & 1) ? frgd_mix : bkgd_mix) {
-                                        case 0:
-                                            src_dat = bkgd_color;
-                                            break;
-                                        case 1:
-                                            src_dat = frgd_color;
-                                            break;
-                                        case 2:
-                                            src_dat = 0;
-                                            break;
-                                        case 3:
-                                            READ(dev->accel.src + dev->accel.cx, src_dat);
-                                            break;
-
-                                        default:
-                                            break;
+                            switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
+                                case 0:
+                                    src_dat = bkgd_color;
+                                    break;
+                                case 1:
+                                    src_dat = frgd_color;
+                                    break;
+                                case 2:
+                                    src_dat = cpu_dat;
+                                    break;
+                                case 3:
+                                    READ(dev->accel.src + dev->accel.cx, src_dat);
+                                    if (pixcntl == 3) {
+                                        if (dev->accel.cmd & 0x10)
+                                            src_dat = ((src_dat & rd_mask) == rd_mask);
                                     }
+                                    break;
 
-                                    READ(dev->accel.dest + dev->accel.dx, dest_dat);
+                                default:
+                                    break;
+                            }
+                        }
 
-                                    if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
-                                        old_dest_dat = dest_dat;
-                                        MIX(mix_dat & 1, dest_dat, src_dat);
-                                        dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
+                        READ(dev->accel.dest + dev->accel.dx, dest_dat);
 
-                                        WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
-                                    }
+                        if ((compare_mode == 0) ||
+                            ((compare_mode == 0x10) && (dest_dat >= compare)) ||
+                            ((compare_mode == 0x18) && (dest_dat < compare)) ||
+                            ((compare_mode == 0x20) && (dest_dat != compare)) ||
+                            ((compare_mode == 0x28) && (dest_dat == compare)) ||
+                            ((compare_mode == 0x30) && (dest_dat <= compare)) ||
+                            ((compare_mode == 0x38) && (dest_dat > compare))) {
+                            old_dest_dat = dest_dat;
+                            if (dev->accel.cmd & 0x02) {
+                                MIX(mix_dat & 0x01, dest_dat, src_dat);
+                                if ((dev->accel.x_count != dev->accel.cx) && !(dev->accel.cmd & 0x1000) && and3)
+                                    goto skip_nibble_bitblt_write;
+
+                                dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
+                                WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
+                            } else {
+                                MIX(mix_dat & mix_mask, dest_dat, src_dat);
+                                dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
+                                WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
+                            }
+                        }
+                    }
+
+                    if (dev->accel.cmd & 0x20) {
+                        dev->accel.dx++;
+                        dev->accel.cx++;
+                    } else {
+                        dev->accel.dx--;
+                        dev->accel.cx--;
+                    }
+
+skip_nibble_bitblt_write:
+                    if (dev->accel.cmd & 0x20)
+                        dev->accel.x_count++;
+                    else
+                        dev->accel.x_count--;
+
+                    if (dev->accel.cmd & 0x02)
+                        mix_dat >>= 1;
+                    else {
+                        mix_dat <<= 1;
+                        mix_dat |= 1;
+                    }
+
+                    if (dev->bpp)
+                        cpu_dat >>= 16;
+                    else
+                        cpu_dat >>= 8;
+
+                    dev->accel.sx--;
+                    if (dev->accel.sx < 0) {
+                        dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
+
+                        if (dev->accel.cmd & 0x20) {
+                            dev->accel.dx -= (dev->accel.sx + 1);
+                            dev->accel.cx -= (dev->accel.sx + 1);
+                        } else {
+                            dev->accel.dx += (dev->accel.sx + 1);
+                            dev->accel.cx += (dev->accel.sx + 1);
+                        }
+
+                        if (dev->accel.cmd & 0x80) {
+                            dev->accel.dy++;
+                            dev->accel.cy++;
+                        } else {
+                            dev->accel.dy--;
+                            dev->accel.cy--;
+                        }
+
+                        dev->accel.src  = dev->accel.ge_offset + (dev->accel.cy * dev->pitch);
+                        dev->accel.dest = dev->accel.ge_offset + (dev->accel.dy * dev->pitch);
+
+                        dev->accel.sy--;
+                        dev->accel.x_count = 0;
+
+                        if (dev->accel.sy < 0) {
+                            dev->accel.cmd_back = 1;
+                            dev->force_busy = 0;
+                            dev->force_busy2 = 0;
+                            dev->fifo_idx = 0;
+                        }
+                        return;
+                    }
+                }
+            } else {
+                if (pixcntl == 1) {
+                    if (dev->accel.cmd & 0x40) {
+                        count = (dev->accel.maj_axis_pcnt & 0x7ff) + 1;
+                        dev->accel.temp_cnt = 8;
+                        while (count-- && (dev->accel.sy >= 0)) {
+                            if (!dev->accel.temp_cnt) {
+                                mix_dat >>= 8;
+                                dev->accel.temp_cnt = 8;
+                            }
+                            if ((dev->accel.dx >= clip_l) &&
+                                (dev->accel.dx <= clip_r) &&
+                                (dev->accel.dy >= clip_t) &&
+                                (dev->accel.dy <= clip_b)) {
+                                switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
+                                    case 0:
+                                        src_dat = bkgd_color;
+                                        break;
+                                    case 1:
+                                        src_dat = frgd_color;
+                                        break;
+                                    case 2:
+                                        src_dat = 0;
+                                        break;
+                                    case 3:
+                                        READ(dev->accel.src + dev->accel.cx, src_dat);
+                                        break;
+
+                                    default:
+                                        break;
                                 }
+
+                                READ(dev->accel.dest + dev->accel.dx, dest_dat);
+
+                                if ((compare_mode == 0) ||
+                                    ((compare_mode == 0x10) && (dest_dat >= compare)) ||
+                                    ((compare_mode == 0x18) && (dest_dat < compare)) ||
+                                    ((compare_mode == 0x20) && (dest_dat != compare)) ||
+                                    ((compare_mode == 0x28) && (dest_dat == compare)) ||
+                                    ((compare_mode == 0x30) && (dest_dat <= compare)) ||
+                                    ((compare_mode == 0x38) && (dest_dat > compare))) {
+                                    old_dest_dat = dest_dat;
+                                    MIX(mix_dat & mix_mask, dest_dat, src_dat);
+                                    dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
+                                    WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
+                                }
+                            }
+
+                            if (dev->accel.temp_cnt > 0) {
                                 dev->accel.temp_cnt--;
-                                mix_dat >>= 1;
+                                mix_dat <<= 1;
+                                mix_dat |= 1;
+                            }
+
+                            if (dev->accel.cmd & 0x20) {
+                                dev->accel.dx++;
+                                dev->accel.cx++;
+                            } else {
+                                dev->accel.dx--;
+                                dev->accel.cx--;
+                            }
+
+                            dev->accel.sx--;
+                            if (dev->accel.sx < 0) {
+                                dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
 
                                 if (dev->accel.cmd & 0x20) {
-                                    dev->accel.dx++;
-                                    dev->accel.cx++;
+                                    dev->accel.dx -= (dev->accel.sx + 1);
+                                    dev->accel.cx -= (dev->accel.sx + 1);
                                 } else {
-                                    dev->accel.dx--;
-                                    dev->accel.cx--;
+                                    dev->accel.dx += (dev->accel.sx + 1);
+                                    dev->accel.cx += (dev->accel.sx + 1);
                                 }
 
-                                dev->accel.sx--;
-                                if (dev->accel.sx < 0) {
-                                    dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
-
-                                    if (dev->accel.cmd & 0x20) {
-                                        dev->accel.dx -= (dev->accel.sx) + 1;
-                                        dev->accel.cx -= (dev->accel.sx) + 1;
-                                    } else {
-                                        dev->accel.dx += (dev->accel.sx) + 1;
-                                        dev->accel.cx += (dev->accel.sx) + 1;
-                                    }
-
-                                    if (dev->accel.cmd & 0x80) {
-                                        dev->accel.dy++;
-                                        dev->accel.cy++;
-                                    } else {
-                                        dev->accel.dy--;
-                                        dev->accel.cy--;
-                                    }
-
-                                    dev->accel.dest = dev->accel.dy * dev->pitch;
-                                    dev->accel.src  = dev->accel.cy * dev->pitch;
-                                    dev->accel.sy--;
-
-                                    if (dev->accel.sy < 0) {
-                                        return;
-                                    }
+                                if (dev->accel.cmd & 0x80) {
+                                    dev->accel.dy++;
+                                    dev->accel.cy++;
+                                } else {
+                                    dev->accel.dy--;
+                                    dev->accel.cy--;
                                 }
+
+                                dev->accel.src  = dev->accel.ge_offset + (dev->accel.cy * dev->pitch);
+                                dev->accel.dest = dev->accel.ge_offset + (dev->accel.dy * dev->pitch);
+
+                                dev->accel.sy--;
+
+                                if (dev->accel.sy < 0) {
+                                    dev->accel.cmd_back = 1;
+                                    dev->fifo_idx = 0;
+                                }
+                                return;
                             }
                         }
                     } else {
-                        if ((dev->accel_bpp == 24) && ((dev->local & 0xff) >= 0x02) && (dev->accel.cmd == 0xc2b5)) {
-                            int64_t cx;
-                            int64_t dx;
+                        dev->accel.temp_cnt = 8;
+                        while (count-- && (dev->accel.sy >= 0)) {
+                            if (!dev->accel.temp_cnt) {
+                                dev->accel.temp_cnt = 8;
+                                mix_dat = old_mix_dat;
+                            }
+                            if ((dev->accel.dx >= clip_l) &&
+                                (dev->accel.dx <= clip_r) &&
+                                (dev->accel.dy >= clip_t) &&
+                                (dev->accel.dy <= clip_b)) {
+                                switch ((mix_dat & 0x01) ? frgd_mix : bkgd_mix) {
+                                    case 0:
+                                        src_dat = bkgd_color;
+                                        break;
+                                    case 1:
+                                        src_dat = frgd_color;
+                                        break;
+                                    case 2:
+                                        src_dat = 0;
+                                        break;
+                                    case 3:
+                                        READ(dev->accel.src + dev->accel.cx, src_dat);
+                                        break;
 
-                            cx = (int64_t) dev->accel.cx;
-                            dx = (int64_t) dev->accel.dx;
-
-                            while (1) {
-                                if ((dx >= (((int64_t)dev->accel.clip_left) * 3)) && (dx <= (((uint64_t)clip_r) * 3)) &&
-                                    (dev->accel.dy >= (dev->accel.clip_top << 1)) && (dev->accel.dy <= (clip_b << 1))) {
-
-                                    READ(dev->accel.src + (dev->accel.ge_offset << 2) + cx, src_dat);
-                                    READ(dev->accel.dest + (dev->accel.ge_offset << 2) + dx, dest_dat);
-
-                                    dest_dat = (src_dat & wrt_mask) | (dest_dat & ~wrt_mask);
-
-                                    WRITE(dev->accel.dest + (dev->accel.ge_offset << 2) + dx, dest_dat);
+                                    default:
+                                        break;
                                 }
 
-                                cx++;
-                                dx++;
+                                READ(dev->accel.dest + dev->accel.dx, dest_dat);
 
-                                dev->accel.sx--;
-                                if (dev->accel.sx < 0)
-                                    return;
+                                if ((compare_mode == 0) ||
+                                    ((compare_mode == 0x10) && (dest_dat >= compare)) ||
+                                    ((compare_mode == 0x18) && (dest_dat < compare)) ||
+                                    ((compare_mode == 0x20) && (dest_dat != compare)) ||
+                                    ((compare_mode == 0x28) && (dest_dat == compare)) ||
+                                    ((compare_mode == 0x30) && (dest_dat <= compare)) ||
+                                    ((compare_mode == 0x38) && (dest_dat > compare))) {
+                                    old_dest_dat = dest_dat;
+                                    MIX(mix_dat & 0x01, dest_dat, src_dat);
+                                    dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
+                                    WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
+                                }
                             }
-                            return;
-                        }
 
-                        ibm8514_log("BitBLT 8514/A=%04x, selfrmix=%d, selbkmix=%d, d(%d,%d), c(%d,%d), pixcntl=%d, sy=%d, frgdmix=%02x, bkgdmix=%02x, rdmask=%02x, wrtmask=%02x, linedraw=%d.\n", dev->accel.cmd, frgd_mix, bkgd_mix, dev->accel.dx, dev->accel.dy, dev->accel.cx, dev->accel.cy, pixcntl, dev->accel.sy, dev->accel.frgd_mix & 0x1f, dev->accel.bkgd_mix & 0x1f, dev->accel.rd_mask, wrt_mask, dev->accel.linedraw);
+                            dev->accel.temp_cnt--;
+                            mix_dat >>= 1;
+
+                            if (dev->accel.cmd & 0x20) {
+                                dev->accel.dx++;
+                                dev->accel.cx++;
+                            } else {
+                                dev->accel.dx--;
+                                dev->accel.cx--;
+                            }
+
+                            dev->accel.sx--;
+                            if (dev->accel.sx < 0) {
+                                dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
+
+                                if (dev->accel.cmd & 0x20) {
+                                    dev->accel.dx -= (dev->accel.sx + 1);
+                                    dev->accel.cx -= (dev->accel.sx + 1);
+                                } else {
+                                    dev->accel.dx += (dev->accel.sx + 1);
+                                    dev->accel.cx += (dev->accel.sx + 1);
+                                }
+
+                                if (dev->accel.cmd & 0x80) {
+                                    dev->accel.dy++;
+                                    dev->accel.cy++;
+                                } else {
+                                    dev->accel.dy--;
+                                    dev->accel.cy--;
+                                }
+
+                                dev->accel.src  = dev->accel.ge_offset + (dev->accel.cy * dev->pitch);
+                                dev->accel.dest = dev->accel.ge_offset + (dev->accel.dy * dev->pitch);
+
+                                dev->accel.sy--;
+
+                                if (dev->accel.sy < 0) {
+                                    dev->accel.destx = dev->accel.dx;
+                                    dev->accel.desty = dev->accel.dy;
+                                    dev->fifo_idx = 0;
+                                    dev->accel.cmd_back = 1;
+                                    return;
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    if ((dev->accel_bpp == 24) && (dev->accel.cmd == 0xc2b5)) {
+                        int64_t cx;
+                        int64_t dx;
+
+                        cx = (int64_t) dev->accel.cx;
+                        dx = (int64_t) dev->accel.dx;
+
+                        dev->accel.src  = dev->accel.src_ge_offset + (dev->accel.cy * dev->accel.src_pitch);
+                        dev->accel.dest = dev->accel.dst_ge_offset + (dev->accel.dy * dev->accel.dst_pitch);
+
+                        while (1) {
+                            if ((dx >= (((int64_t)clip_l) * 3)) &&
+                                (dx <= (((uint64_t)clip_r) * 3)) &&
+                                (dev->accel.dy >= (clip_t << 1)) &&
+                                (dev->accel.dy <= (clip_b << 1))) {
+                                READ(dev->accel.src + cx, src_dat);
+                                READ(dev->accel.dest + dx, dest_dat);
+                                old_dest_dat = dest_dat;
+                                MIX(mix_dat & mix_mask, dest_dat, src_dat);
+                                dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
+                                WRITE(dev->accel.dest + dx, dest_dat);
+                            }
+
+                            cx++;
+                            dx++;
+
+                            dev->accel.sx--;
+                            if (dev->accel.sx < 0) {
+                                dev->fifo_idx = 0;
+                                dev->accel.cmd_back = 1;
+                                return;
+                            }
+                        }
+                    } else {
                         while (count-- && dev->accel.sy >= 0) {
-                            if ((dev->accel.dx >= dev->accel.clip_left) && (dev->accel.dx <= clip_r) &&
-                                (dev->accel.dy >= dev->accel.clip_top) && (dev->accel.dy <= clip_b)) {
+                            if ((dev->accel.dx >= clip_l) &&
+                                (dev->accel.dx <= clip_r) &&
+                                (dev->accel.dy >= clip_t) &&
+                                (dev->accel.dy <= clip_b)) {
                                 if (pixcntl == 3) {
                                     if (!(dev->accel.cmd & 0x10) && ((frgd_mix != 3) || (bkgd_mix != 3))) {
                                         READ(dev->accel.src + dev->accel.cx, mix_dat);
@@ -3754,9 +3283,8 @@ bitblt:
                                     case 3:
                                         READ(dev->accel.src + dev->accel.cx, src_dat);
                                         if (pixcntl == 3) {
-                                            if ((dev->accel.cmd & 0x10) && !(dev->accel.cmd & 0x40)) {
+                                            if ((dev->accel.cmd & 0x10) && !(dev->accel.cmd & 0x40))
                                                 src_dat = ((src_dat & rd_mask) == rd_mask);
-                                            }
                                         }
                                         break;
 
@@ -3766,19 +3294,21 @@ bitblt:
 
                                 READ(dev->accel.dest + dev->accel.dx, dest_dat);
 
-                                if ((compare_mode == 0) || ((compare_mode == 0x10) && (dest_dat >= compare)) || ((compare_mode == 0x18) && (dest_dat < compare)) || ((compare_mode == 0x20) && (dest_dat != compare)) || ((compare_mode == 0x28) && (dest_dat == compare)) || ((compare_mode == 0x30) && (dest_dat <= compare)) || ((compare_mode == 0x38) && (dest_dat > compare))) {
+                                if ((compare_mode == 0) ||
+                                    ((compare_mode == 0x10) && (dest_dat >= compare)) ||
+                                    ((compare_mode == 0x18) && (dest_dat < compare)) ||
+                                    ((compare_mode == 0x20) && (dest_dat != compare)) ||
+                                    ((compare_mode == 0x28) && (dest_dat == compare)) ||
+                                    ((compare_mode == 0x30) && (dest_dat <= compare)) ||
+                                    ((compare_mode == 0x38) && (dest_dat > compare))) {
                                     old_dest_dat = dest_dat;
                                     MIX(mix_dat & mix_mask, dest_dat, src_dat);
                                     dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
-                                    if (dev->accel.cmd & 4) {
-                                        if (dev->accel.sx > 0) {
-                                            WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
-                                        }
-                                    } else {
-                                        WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
-                                    }
+                                    WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
+                                    ibm8514_log("BitBLT DX=%d, DY=%d, data=%02x, old=%02x, src=%02x, frmix=%02x, bkmix=%02x, pixcntl=%d.\n", dev->accel.dx, dev->accel.dy, dest_dat, old_dest_dat, src_dat, dev->accel.frgd_mix & 0x1f, dev->accel.bkgd_mix & 0x1f, pixcntl);
                                 }
                             }
+
                             mix_dat <<= 1;
                             mix_dat |= 1;
 
@@ -3795,15 +3325,13 @@ bitblt:
                                 dev->accel.fill_state = 0;
                                 dev->accel.sx = dev->accel.maj_axis_pcnt & 0x7ff;
 
-                                dev->accel.dx = dev->accel.destx;
-
-                                if (dev->accel.destx >= 0x600)
-                                    dev->accel.dx |= ~0x5ff;
-
-                                dev->accel.cx = dev->accel.cur_x;
-
-                                if (dev->accel.cur_x >= 0x600)
-                                    dev->accel.cx |= ~0x5ff;
+                                if (dev->accel.cmd & 0x20) {
+                                    dev->accel.dx -= (dev->accel.sx + 1);
+                                    dev->accel.cx -= (dev->accel.sx + 1);
+                                } else {
+                                    dev->accel.dx += (dev->accel.sx + 1);
+                                    dev->accel.cx += (dev->accel.sx + 1);
+                                }
 
                                 if (dev->accel.cmd & 0x80) {
                                     dev->accel.dy++;
@@ -3813,12 +3341,18 @@ bitblt:
                                     dev->accel.cy--;
                                 }
 
-                                dev->accel.dest = dev->accel.dy * dev->pitch;
-                                dev->accel.src  = dev->accel.cy * dev->pitch;
+                                dev->accel.src  = dev->accel.ge_offset + (dev->accel.cy * dev->pitch);
+                                dev->accel.dest = dev->accel.ge_offset + (dev->accel.dy * dev->pitch);
+
                                 dev->accel.sy--;
 
-                                if (dev->accel.sy < 0)
+                                if (dev->accel.sy < 0) {
+                                    dev->accel.destx = dev->accel.dx;
+                                    dev->accel.desty = dev->accel.dy;
+                                    dev->fifo_idx = 0;
+                                    dev->accel.cmd_back = 1;
                                     return;
+                                }
                             }
                         }
                     }
@@ -3843,7 +3377,7 @@ ibm8514_render_blank(svga_t *svga)
         dev->firstline_draw = dev->displine;
     dev->lastline_draw = dev->displine;
 
-    uint32_t *line_ptr   = &svga->monitor->target_buffer->line[dev->displine + svga->y_add][svga->x_add];
+    uint32_t *line_ptr   = &buffer32->line[dev->displine + svga->y_add][svga->x_add];
     uint32_t  line_width = (uint32_t)(dev->h_disp) * sizeof(uint32_t);
 
     if (dev->h_disp > 0)
@@ -3860,7 +3394,7 @@ ibm8514_render_8bpp(svga_t *svga)
     if ((dev->displine + svga->y_add) < 0)
         return;
 
-    if (dev->changedvram[dev->ma >> 12] || dev->changedvram[(dev->ma >> 12) + 1] || svga->fullchange) {
+    if (dev->changedvram[dev->memaddr >> 12] || dev->changedvram[(dev->memaddr >> 12) + 1] || svga->fullchange) {
         p = &buffer32->line[dev->displine + svga->y_add][svga->x_add];
 
         if (dev->firstline_draw == 2000)
@@ -3868,22 +3402,22 @@ ibm8514_render_8bpp(svga_t *svga)
         dev->lastline_draw = dev->displine;
 
         for (int x = 0; x <= dev->h_disp; x += 8) {
-            dat  = *(uint32_t *) (&dev->vram[dev->ma & dev->vram_mask]);
-            p[0] = dev->pallook[dat & 0xff];
-            p[1] = dev->pallook[(dat >> 8) & 0xff];
-            p[2] = dev->pallook[(dat >> 16) & 0xff];
-            p[3] = dev->pallook[(dat >> 24) & 0xff];
+            dat  = *(uint32_t *) (&dev->vram[dev->memaddr & dev->vram_mask]);
+            p[0] = dev->pallook[dat & dev->dac_mask & 0xff];
+            p[1] = dev->pallook[(dat >> 8) & dev->dac_mask & 0xff];
+            p[2] = dev->pallook[(dat >> 16) & dev->dac_mask & 0xff];
+            p[3] = dev->pallook[(dat >> 24) & dev->dac_mask & 0xff];
 
-            dat  = *(uint32_t *) (&dev->vram[(dev->ma + 4) & dev->vram_mask]);
-            p[4] = dev->pallook[dat & 0xff];
-            p[5] = dev->pallook[(dat >> 8) & 0xff];
-            p[6] = dev->pallook[(dat >> 16) & 0xff];
-            p[7] = dev->pallook[(dat >> 24) & 0xff];
+            dat  = *(uint32_t *) (&dev->vram[(dev->memaddr + 4) & dev->vram_mask]);
+            p[4] = dev->pallook[dat & dev->dac_mask & 0xff];
+            p[5] = dev->pallook[(dat >> 8) & dev->dac_mask & 0xff];
+            p[6] = dev->pallook[(dat >> 16) & dev->dac_mask & 0xff];
+            p[7] = dev->pallook[(dat >> 24) & dev->dac_mask & 0xff];
 
-            dev->ma += 8;
+            dev->memaddr += 8;
             p += 8;
         }
-        dev->ma &= dev->vram_mask;
+        dev->memaddr &= dev->vram_mask;
     }
 }
 
@@ -3895,11 +3429,10 @@ ibm8514_render_15bpp(svga_t *svga)
     uint32_t  *p;
     uint32_t   dat;
 
-    if ((dev->displine + svga->y_add) < 0) {
+    if ((dev->displine + svga->y_add) < 0)
         return;
-    }
 
-    if (dev->changedvram[dev->ma >> 12] || dev->changedvram[(dev->ma >> 12) + 1] || svga->fullchange) {
+    if (dev->changedvram[dev->memaddr >> 12] || dev->changedvram[(dev->memaddr >> 12) + 1] || svga->fullchange) {
         p = &buffer32->line[dev->displine + svga->y_add][svga->x_add];
 
         if (dev->firstline_draw == 2000)
@@ -3907,24 +3440,24 @@ ibm8514_render_15bpp(svga_t *svga)
         dev->lastline_draw = dev->displine;
 
         for (x = 0; x <= dev->h_disp; x += 8) {
-            dat      = *(uint32_t *) (&dev->vram[(dev->ma + (x << 1)) & dev->vram_mask]);
+            dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + (x << 1)) & dev->vram_mask]);
             p[x]     = video_15to32[dat & 0xffff];
             p[x + 1] = video_15to32[dat >> 16];
 
-            dat      = *(uint32_t *) (&dev->vram[(dev->ma + (x << 1) + 4) & dev->vram_mask]);
+            dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + (x << 1) + 4) & dev->vram_mask]);
             p[x + 2] = video_15to32[dat & 0xffff];
             p[x + 3] = video_15to32[dat >> 16];
 
-            dat      = *(uint32_t *) (&dev->vram[(dev->ma + (x << 1) + 8) & dev->vram_mask]);
+            dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + (x << 1) + 8) & dev->vram_mask]);
             p[x + 4] = video_15to32[dat & 0xffff];
             p[x + 5] = video_15to32[dat >> 16];
 
-            dat      = *(uint32_t *) (&dev->vram[(dev->ma + (x << 1) + 12) & dev->vram_mask]);
+            dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + (x << 1) + 12) & dev->vram_mask]);
             p[x + 6] = video_15to32[dat & 0xffff];
             p[x + 7] = video_15to32[dat >> 16];
         }
-        dev->ma += (x << 1);
-        dev->ma &= dev->vram_mask;
+        dev->memaddr += (x << 1);
+        dev->memaddr &= dev->vram_mask;
     }
 }
 
@@ -3936,11 +3469,10 @@ ibm8514_render_16bpp(svga_t *svga)
     uint32_t  *p;
     uint32_t   dat;
 
-    if ((dev->displine + svga->y_add) < 0) {
+    if ((dev->displine + svga->y_add) < 0)
         return;
-    }
 
-    if (dev->changedvram[dev->ma >> 12] || dev->changedvram[(dev->ma >> 12) + 1] || svga->fullchange) {
+    if (dev->changedvram[dev->memaddr >> 12] || dev->changedvram[(dev->memaddr >> 12) + 1] || svga->fullchange) {
         p = &buffer32->line[dev->displine + svga->y_add][svga->x_add];
 
         if (dev->firstline_draw == 2000)
@@ -3948,24 +3480,24 @@ ibm8514_render_16bpp(svga_t *svga)
         dev->lastline_draw = dev->displine;
 
         for (x = 0; x <= dev->h_disp; x += 8) {
-            dat      = *(uint32_t *) (&dev->vram[(dev->ma + (x << 1)) & dev->vram_mask]);
+            dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + (x << 1)) & dev->vram_mask]);
             p[x]     = video_16to32[dat & 0xffff];
             p[x + 1] = video_16to32[dat >> 16];
 
-            dat      = *(uint32_t *) (&dev->vram[(dev->ma + (x << 1) + 4) & dev->vram_mask]);
+            dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + (x << 1) + 4) & dev->vram_mask]);
             p[x + 2] = video_16to32[dat & 0xffff];
             p[x + 3] = video_16to32[dat >> 16];
 
-            dat      = *(uint32_t *) (&dev->vram[(dev->ma + (x << 1) + 8) & dev->vram_mask]);
+            dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + (x << 1) + 8) & dev->vram_mask]);
             p[x + 4] = video_16to32[dat & 0xffff];
             p[x + 5] = video_16to32[dat >> 16];
 
-            dat      = *(uint32_t *) (&dev->vram[(dev->ma + (x << 1) + 12) & dev->vram_mask]);
+            dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + (x << 1) + 12) & dev->vram_mask]);
             p[x + 6] = video_16to32[dat & 0xffff];
             p[x + 7] = video_16to32[dat >> 16];
         }
-        dev->ma += (x << 1);
-        dev->ma &= dev->vram_mask;
+        dev->memaddr += (x << 1);
+        dev->memaddr &= dev->vram_mask;
     }
 }
 
@@ -3979,7 +3511,7 @@ ibm8514_render_24bpp(svga_t *svga)
     if ((dev->displine + svga->y_add) < 0)
         return;
 
-    if (dev->changedvram[dev->ma >> 12] || dev->changedvram[(dev->ma >> 12) + 1] || svga->fullchange) {
+    if (dev->changedvram[dev->memaddr >> 12] || dev->changedvram[(dev->memaddr >> 12) + 1] || svga->fullchange) {
         p = &buffer32->line[dev->displine + svga->y_add][svga->x_add];
 
         if (dev->firstline_draw == 2000)
@@ -3987,21 +3519,21 @@ ibm8514_render_24bpp(svga_t *svga)
         dev->lastline_draw = dev->displine;
 
         for (int x = 0; x <= dev->h_disp; x += 4) {
-            dat  = *(uint32_t *) (&dev->vram[dev->ma & dev->vram_mask]);
+            dat  = *(uint32_t *) (&dev->vram[dev->memaddr & dev->vram_mask]);
             p[x] = dat & 0xffffff;
 
-            dat      = *(uint32_t *) (&dev->vram[(dev->ma + 3) & dev->vram_mask]);
+            dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + 3) & dev->vram_mask]);
             p[x + 1] = dat & 0xffffff;
 
-            dat      = *(uint32_t *) (&dev->vram[(dev->ma + 6) & dev->vram_mask]);
+            dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + 6) & dev->vram_mask]);
             p[x + 2] = dat & 0xffffff;
 
-            dat      = *(uint32_t *) (&dev->vram[(dev->ma + 9) & dev->vram_mask]);
+            dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + 9) & dev->vram_mask]);
             p[x + 3] = dat & 0xffffff;
 
-            dev->ma += 12;
+            dev->memaddr += 12;
         }
-        dev->ma &= dev->vram_mask;
+        dev->memaddr &= dev->vram_mask;
     }
 }
 
@@ -4015,7 +3547,7 @@ ibm8514_render_BGR(svga_t *svga)
     if ((dev->displine + svga->y_add) < 0)
         return;
 
-    if (dev->changedvram[dev->ma >> 12] || dev->changedvram[(dev->ma >> 12) + 1] || svga->fullchange) {
+    if (dev->changedvram[dev->memaddr >> 12] || dev->changedvram[(dev->memaddr >> 12) + 1] || svga->fullchange) {
         p = &buffer32->line[dev->displine + svga->y_add][svga->x_add];
 
         if (dev->firstline_draw == 2000)
@@ -4023,21 +3555,21 @@ ibm8514_render_BGR(svga_t *svga)
         dev->lastline_draw = dev->displine;
 
         for (int x = 0; x <= dev->h_disp; x += 4) {
-            dat  = *(uint32_t *) (&dev->vram[dev->ma & dev->vram_mask]);
+            dat  = *(uint32_t *) (&dev->vram[dev->memaddr & dev->vram_mask]);
             p[x] = ((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16);
 
-            dat      = *(uint32_t *) (&dev->vram[(dev->ma + 3) & dev->vram_mask]);
+            dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + 3) & dev->vram_mask]);
             p[x + 1] = ((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16);
 
-            dat      = *(uint32_t *) (&dev->vram[(dev->ma + 6) & dev->vram_mask]);
+            dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + 6) & dev->vram_mask]);
             p[x + 2] = ((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16);
 
-            dat      = *(uint32_t *) (&dev->vram[(dev->ma + 9) & dev->vram_mask]);
+            dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + 9) & dev->vram_mask]);
             p[x + 3] = ((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16);
 
-            dev->ma += 12;
+            dev->memaddr += 12;
         }
-        dev->ma &= dev->vram_mask;
+        dev->memaddr &= dev->vram_mask;
     }
 }
 
@@ -4052,7 +3584,7 @@ ibm8514_render_ABGR8888(svga_t *svga)
     if ((dev->displine + svga->y_add) < 0)
         return;
 
-    if (dev->changedvram[dev->ma >> 12] || dev->changedvram[(dev->ma >> 12) + 1] || svga->fullchange) {
+    if (dev->changedvram[dev->memaddr >> 12] || dev->changedvram[(dev->memaddr >> 12) + 1] || svga->fullchange) {
         p = &buffer32->line[dev->displine + svga->y_add][svga->x_add];
 
         if (dev->firstline_draw == 2000)
@@ -4060,11 +3592,11 @@ ibm8514_render_ABGR8888(svga_t *svga)
         dev->lastline_draw = dev->displine;
 
         for (x = 0; x <= dev->h_disp; x++) {
-            dat  = *(uint32_t *) (&dev->vram[(dev->ma + (x << 2)) & dev->vram_mask]);
+            dat  = *(uint32_t *) (&dev->vram[(dev->memaddr + (x << 2)) & dev->vram_mask]);
             *p++ = ((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16);
         }
-        dev->ma += (x * 4);
-        dev->ma &= dev->vram_mask;
+        dev->memaddr += (x * 4);
+        dev->memaddr &= dev->vram_mask;
     }
 }
 
@@ -4079,7 +3611,7 @@ ibm8514_render_32bpp(svga_t *svga)
     if ((dev->displine + svga->y_add) < 0)
         return;
 
-    if (dev->changedvram[dev->ma >> 12] || dev->changedvram[(dev->ma >> 12) + 1] || dev->changedvram[(dev->ma >> 12) + 2] || svga->fullchange) {
+    if (dev->changedvram[dev->memaddr >> 12] || dev->changedvram[(dev->memaddr >> 12) + 1] || dev->changedvram[(dev->memaddr >> 12) + 2] || svga->fullchange) {
         p = &buffer32->line[dev->displine + svga->y_add][svga->x_add];
 
         if (dev->firstline_draw == 2000)
@@ -4087,11 +3619,11 @@ ibm8514_render_32bpp(svga_t *svga)
         dev->lastline_draw = dev->displine;
 
         for (x = 0; x <= dev->h_disp; x++) {
-            dat  = *(uint32_t *) (&dev->vram[(dev->ma + (x << 2)) & dev->vram_mask]);
+            dat  = *(uint32_t *) (&dev->vram[(dev->memaddr + (x << 2)) & dev->vram_mask]);
             p[x] = dat & 0xffffff;
         }
-        dev->ma += (x * 4);
-        dev->ma &= dev->vram_mask;
+        dev->memaddr += (x * 4);
+        dev->memaddr &= dev->vram_mask;
     }
 }
 
@@ -4124,6 +3656,12 @@ ibm8514_render_overscan_right(ibm8514_t *dev, svga_t *svga)
         buffer32->line[dev->displine + svga->y_add][svga->x_add + dev->h_disp + i] = svga->overscan_color;
 }
 
+void
+ibm8514_set_poll(svga_t *svga)
+{
+    timer_set_callback(&svga->timer, ibm8514_poll);
+}
+
 void
 ibm8514_poll(void *priv)
 {
@@ -4133,28 +3671,28 @@ ibm8514_poll(void *priv)
     int      wx;
     int      wy;
 
-    ibm8514_log("IBM 8514/A poll.\n");
-    if (dev->on[0] || dev->on[1]) {
+    ibm8514_log("IBM 8514/A poll=%x offtime=%" PRIu64 ", ontime=%" PRIu64 ".\n", dev->on, dev->dispofftime, dev->dispontime);
+    if (dev->on) {
         ibm8514_log("ON!\n");
         if (!dev->linepos) {
-            if ((dev->displine == dev->hwcursor_latch.y) && dev->hwcursor_latch.ena) {
+            if ((dev->displine == ((dev->hwcursor_latch.y < 0) ? 0 : dev->hwcursor_latch.y)) && dev->hwcursor_latch.ena) {
                 dev->hwcursor_on      = dev->hwcursor_latch.cur_ysize - dev->hwcursor_latch.yoff;
                 dev->hwcursor_oddeven = 0;
             }
 
-            if ((dev->displine == (dev->hwcursor_latch.y + 1)) && dev->hwcursor_latch.ena && dev->interlace) {
+            if ((dev->displine == (((dev->hwcursor_latch.y < 0) ? 0 : dev->hwcursor_latch.y) + 1)) && dev->hwcursor_latch.ena && dev->interlace) {
                 dev->hwcursor_on      = dev->hwcursor_latch.cur_ysize - (dev->hwcursor_latch.yoff + 1);
                 dev->hwcursor_oddeven = 1;
             }
 
-            timer_advance_u64(&svga->timer8514, dev->dispofftime);
+            timer_advance_u64(&svga->timer, dev->dispofftime);
             svga->cgastat |= 1;
             dev->linepos = 1;
 
             if (dev->dispon) {
                 dev->hdisp_on = 1;
 
-                dev->ma &= dev->vram_mask;
+                dev->memaddr &= dev->vram_mask;
 
                 if (dev->firstline == 2000) {
                     dev->firstline = dev->displine;
@@ -4162,18 +3700,18 @@ ibm8514_poll(void *priv)
                 }
 
                 if (dev->hwcursor_on)
-                    dev->changedvram[dev->ma >> 12] = dev->changedvram[(dev->ma >> 12) + 1] = dev->interlace ? 3 : 2;
+                    dev->changedvram[dev->memaddr >> 12] = dev->changedvram[(dev->memaddr >> 12) + 1] = dev->interlace ? 3 : 2;
 
                 svga->render8514(svga);
 
-                svga->x_add = (overscan_x >> 1);
+                svga->x_add = svga->left_overscan;
                 ibm8514_render_overscan_left(dev, svga);
                 ibm8514_render_overscan_right(dev, svga);
-                svga->x_add = (overscan_x >> 1);
+                svga->x_add = svga->left_overscan;
 
                 if (dev->hwcursor_on) {
                     if (svga->hwcursor_draw)
-                        svga->hwcursor_draw(svga, dev->displine + svga->y_add);
+                        svga->hwcursor_draw(svga, (dev->displine + svga->y_add + ((dev->hwcursor_latch.y >= 0) ? 0 : dev->hwcursor_latch.y)) & 2047);
                     dev->hwcursor_on--;
                     if (dev->hwcursor_on && dev->interlace)
                         dev->hwcursor_on--;
@@ -4189,35 +3727,37 @@ ibm8514_poll(void *priv)
             if ((svga->cgastat & 8) && ((dev->displine & 0x0f) == (svga->crtc[0x11] & 0x0f)) && svga->vslines)
                 svga->cgastat &= ~8;
             svga->vslines++;
-            if (dev->displine > 1500)
+            if (dev->displine > 2000)
                 dev->displine = 0;
         } else {
-            timer_advance_u64(&svga->timer8514, dev->dispontime);
+            timer_advance_u64(&svga->timer, dev->dispontime);
             if (dev->dispon)
                 svga->cgastat &= ~1;
             dev->hdisp_on = 0;
 
             dev->linepos = 0;
             if (dev->dispon) {
-                if (dev->sc == dev->rowcount) {
-                    dev->sc = 0;
-                    dev->maback += (dev->rowoffset << 3);
+                if (dev->scanline == dev->rowcount) {
+                    dev->scanline = 0;
+                    dev->memaddr_backup += (dev->rowoffset << 3);
                     if (dev->interlace)
-                        dev->maback += (dev->rowoffset << 3);
+                        dev->memaddr_backup += (dev->rowoffset << 3);
 
-                    dev->maback &= dev->vram_mask;
-                    dev->ma = dev->maback;
+                    dev->memaddr_backup &= dev->vram_mask;
+                    dev->memaddr = dev->memaddr_backup;
                 } else {
-                    dev->sc++;
-                    dev->sc &= 0x1f;
-                    dev->ma = dev->maback;
+                    dev->scanline++;
+                    dev->scanline &= 0x1f;
+                    dev->memaddr = dev->memaddr_backup;
                 }
             }
 
             dev->vc++;
-            dev->vc &= 0x7ff;
+            dev->vc &= 0xfff;
 
             if (dev->vc == dev->dispend) {
+                dev->vblank_start(svga);
+                ibm8514_log("VBLANK irq.\n");
                 dev->dispon = 0;
 
                 for (x = 0; x < ((dev->vram_mask + 1) >> 12); x++) {
@@ -4254,20 +3794,20 @@ ibm8514_poll(void *priv)
                 svga->vslines    = 0;
 
                 if (dev->interlace && dev->oddeven)
-                    dev->ma = dev->maback = (dev->rowoffset << 1);
+                    dev->memaddr = dev->memaddr_backup = (dev->rowoffset << 1);
                 else
-                    dev->ma = dev->maback = 0;
+                    dev->memaddr = dev->memaddr_backup = 0;
 
-                dev->ma     = (dev->ma << 2);
-                dev->maback = (dev->maback << 2);
+                dev->memaddr     = (dev->memaddr << 2);
+                dev->memaddr_backup = (dev->memaddr_backup << 2);
             }
             if (dev->vc == dev->v_total) {
                 dev->vc       = 0;
-                dev->sc       = 0;
+                dev->scanline       = (svga->crtc[0x8] & 0x1f);
                 dev->dispon   = 1;
                 dev->displine = (dev->interlace && dev->oddeven) ? 1 : 0;
 
-                svga->x_add = (overscan_x >> 1);
+                svga->x_add = svga->left_overscan;
 
                 dev->hwcursor_on    = 0;
                 dev->hwcursor_latch = dev->hwcursor;
@@ -4282,53 +3822,67 @@ ibm8514_recalctimings(svga_t *svga)
     ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
     svga->render8514 = ibm8514_render_blank;
-#ifdef ATI_8514_ULTRA
     if (dev->extensions) {
         if (svga->ext8514 != NULL)
             ati8514_recalctimings(svga);
-    } else
-#endif
-    {
-        if (dev->on[0] || dev->on[1]) {
-            dev->h_disp                     = dev->hdisp;
-            dev->h_total                    = dev->htotal + 1;
-            dev->h_blankstart               = dev->hblankstart;
-            dev->h_blank_end_val            = dev->hblank_end_val;
-            dev->v_total                    = dev->vtotal;
-            dev->v_syncstart                = dev->vsyncstart;
-            dev->dispend                    = dev->vdisp;
-            dev->rowcount                   = !!(dev->disp_cntl & 0x08);
+    } else {
+        if (dev->on) {
+            dev->hdisp = (dev->hdisped + 1) << 3;
+            dev->h_total = dev->htotal + 1;
 
-            if (dev->dispend == 766)
+            if (dev->h_total == 1) /*Default to 1024x768 87hz 8514/A htotal timings if it goes to 0.*/
+                dev->h_total = 0x9e;
+
+            dev->vdisp = (dev->v_disp + 1) >> 1;
+            if ((dev->vdisp == 478) || (dev->vdisp == 766))
+                dev->vdisp += 2;
+
+            dev->v_total = dev->v_total_reg + 1;
+            if (dev->v_total == 1)
+                dev->v_total = 0x0669;
+            if (dev->interlace)
+                dev->v_total >>= 1;
+
+            dev->v_syncstart = dev->v_sync_start + 1;
+            if (dev->v_syncstart == 1)
+                dev->v_syncstart = 0x0601;
+            if (dev->interlace)
+                dev->v_syncstart >>= 1;
+
+            dev->rowcount = !!(dev->disp_cntl & 0x08);
+
+            if ((dev->hdisp != 640) && (dev->hdisp != 1024)) {
+                if (dev->accel.advfunc_cntl & 0x04) {
+                    dev->hdisp = 1024;
+                    dev->vdisp = 768;
+                } else {
+                    dev->hdisp = 640;
+                    dev->vdisp = 480;
+                }
+            }
+
+            dev->h_disp = dev->hdisp;
+            dev->dispend = dev->vdisp;
+            dev->h_disp_time = dev->hdisp >> 3;
+
+            if (dev->accel.advfunc_cntl & 0x04)
+                svga->clock_8514 = (cpuclock * (double) (1ULL << 32)) / 44900000.0;
+            else
+                svga->clock_8514 = (cpuclock * (double) (1ULL << 32)) / 25175000.0;
+
+            if ((dev->dispend == 478) || (dev->dispend == 766))
                 dev->dispend += 2;
 
-            if (dev->accel.advfunc_cntl & 4) {
-                dev->pitch = 1024;
-                if (!dev->h_disp) {
-                    dev->h_disp = 1024;
-                    dev->dispend = 768;
-                }
-                svga->clock8514 = (cpuclock * (double) (1ULL << 32)) / 44900000.0;
-            } else {
-                dev->pitch = 640;
-                if (!dev->h_disp) {
-                    dev->h_disp = 640;
-                    dev->dispend = 480;
-                }
-                svga->clock8514 = (cpuclock * (double) (1ULL << 32)) / 25175000.0;
-            }
-
-            if (dev->interlace) {
+            if (dev->interlace)
                 dev->dispend >>= 1;
-                dev->v_syncstart >>= 2;
-                dev->v_total >>= 2;
-            } else {
-                dev->v_syncstart >>= 1;
-                dev->v_total >>= 1;
-            }
 
+            dev->pitch = 1024;
             dev->rowoffset = 0x80;
-            svga->map8 = dev->pallook;
+            if (dev->vram_512k_8514) {
+                if (dev->h_disp == 640)
+                    dev->pitch = 640;
+            }
+            dev->accel_bpp = 8;
             svga->render8514 = ibm8514_render_8bpp;
             ibm8514_log("BPP=%d, Pitch = %d, rowoffset = %d, crtc13 = %02x, highres bit = %02x, has_vga? = %d.\n", dev->bpp, dev->pitch, dev->rowoffset, svga->crtc[0x13], dev->accel.advfunc_cntl & 4, !ibm8514_standalone_enabled);
         }
@@ -4375,15 +3929,32 @@ ibm8514_mca_reset(void *priv)
     ibm8514_t       *dev  = (ibm8514_t *) svga->dev8514;
 
     ibm8514_log("MCA reset.\n");
-    dev->on[0] = 0;
-    dev->on[1] = 0;
-    vga_on = 1;
-    ibm8514_mca_write(0x102, 0, svga);
+    dev->on = 0;
+    if (dev->extensions == ATI)
+        ati8514_mca_write(0x102, 0, svga);
+    else
+        ibm8514_mca_write(0x102, 0, svga);
+
+    svga_set_poll(svga);
+}
+
+static void
+ibm8514_vblank_start(void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+
+    dev->subsys_stat |= INT_VSY;
 }
 
 static void *
 ibm8514_init(const device_t *info)
 {
+    FILE    *fp;
+    uint8_t *rom_load = NULL;
+    uint32_t bios_addr = 0;
+    uint16_t bios_rom_eeprom = 0x0000;
+
     if (svga_get_pri() == NULL)
         return NULL;
 
@@ -4393,68 +3964,81 @@ ibm8514_init(const device_t *info)
     svga->dev8514    = dev;
     svga->ext8514    = NULL;
 
-    dev->vram_size   = 1024 << 10;
+    dev->vram_amount = device_get_config_int("memory");
+    dev->vram_512k_8514 = dev->vram_amount == 512;
+    dev->vram_size   = dev->vram_amount << 10;
     dev->vram        = calloc(dev->vram_size, 1);
-    dev->changedvram = calloc(dev->vram_size >> 12, 1);
+    dev->changedvram = calloc((dev->vram_size >> 12) + 1, 1);
     dev->vram_mask   = dev->vram_size - 1;
     dev->map8        = dev->pallook;
     dev->local       = 0;
+    dev->accel_bpp   = 8;
+    dev->on          = 0;
 
     dev->type     = info->flags;
     dev->bpp      = 0;
 
-#ifdef ATI_8514_ULTRA
     dev->extensions = device_get_config_int("extensions");
+    bios_addr = device_get_config_hex20("bios_addr");
+    if (dev->type & DEVICE_MCA)
+        bios_addr = 0xc6800;
 
     switch (dev->extensions) {
-        case 1:
+        case ATI:
             if (rom_present(BIOS_MACH8_ROM_PATH)) {
-                mach = (mach_t *) calloc(1, sizeof(mach_t));
+                mach_t * mach = (mach_t *) calloc(1, sizeof(mach_t));
                 svga->ext8514 = mach;
-                ati8514_init(svga, svga->ext8514, svga->dev8514);
+                fp = rom_fopen(BIOS_MACH8_ROM_PATH, "rb");
+                if (bios_addr & 0x800)
+                    (void) fseek(fp, 0x000, SEEK_SET);
+                else
+                    (void) fseek(fp, 0x800, SEEK_SET);
 
+                rom_load = malloc(0x2000);
+                (void) !fread(rom_load, 0x2000, 1, fp);
+                (void) fclose(fp);
+                memset(&dev->bios_rom, 0x00, sizeof(rom_t));
+
+                dev->bios_rom.rom = rom_load;
+                dev->bios_rom.mask = 0x1fff;
+                mem_mapping_add(&dev->bios_rom.mapping, bios_addr, 0x2000,
+                                ati8514_rom_readb, ati8514_rom_readw, NULL,
+                                NULL, NULL, NULL,
+                                dev->bios_rom.rom, MEM_MAPPING_EXTERNAL | MEM_MAPPING_ROM_WS, dev);
+                ati8514_init(svga, svga->ext8514, svga->dev8514);
                 if (dev->type & DEVICE_MCA) {
-                    rom_init(&dev->bios_rom,
-                            BIOS_MACH8_ROM_PATH,
-                            0xc6800, 0x1000, 0x0fff,
-                            0x0800, MEM_MAPPING_EXTERNAL);
-                    mem_mapping_disable(&dev->bios_rom.mapping);
+                    dev->accel.scratch0 = (((bios_addr >> 7) - 0x1000) >> 4);
+                    dev->accel.scratch0 |= ((dev->accel.scratch0 + 0x01) << 8);
+                    bios_rom_eeprom = dev->accel.scratch0;
                     dev->pos_regs[0] = 0x88;
                     dev->pos_regs[1] = 0x80;
+                    mach->eeprom.data[1] = bios_rom_eeprom;
                     mca_add(ati8514_mca_read, ati8514_mca_write, ibm8514_mca_feedb, ibm8514_mca_reset, svga);
-                    ati_eeprom_load(&mach->eeprom, "ati8514_mca.nvr", 0);
+                    ati_eeprom_load_mach8(&mach->eeprom, "ati8514_mca.nvr", 1);
+                    mem_mapping_disable(&dev->bios_rom.mapping);
                 } else {
-                    rom_init(&dev->bios_rom,
-                            BIOS_MACH8_ROM_PATH,
-                            0xd0000, 0x1000, 0x0fff,
-                            0x0800, MEM_MAPPING_EXTERNAL);
-                    ati_eeprom_load(&mach->eeprom, "ati8514.nvr", 0);
+                    dev->accel.scratch0 = ((bios_addr >> 7) - 0x1000) >> 4;
+                    dev->accel.scratch0 |= ((dev->accel.scratch0 + 0x01) << 8);
+                    ati_eeprom_load_mach8(&mach->eeprom, "ati8514.nvr", 0);
                 }
                 break;
             }
-            fallthrough;
 
+            fallthrough;
         default:
+            dev->extensions = 0;
             ibm8514_io_set(svga);
+            dev->accel.cmd_back = 1;
 
             if (dev->type & DEVICE_MCA) {
                 dev->pos_regs[0] = 0x7f;
                 dev->pos_regs[1] = 0xef;
                 mca_add(ibm8514_mca_read, ibm8514_mca_write, ibm8514_mca_feedb, ibm8514_mca_reset, svga);
             }
+
+            dev->vblank_start = ibm8514_vblank_start;
             break;
     }
-#else
-    ibm8514_io_set(svga);
-
-    if (dev->type & DEVICE_MCA) {
-        dev->pos_regs[0] = 0x7f;
-        dev->pos_regs[1] = 0xef;
-        mca_add(ibm8514_mca_read, ibm8514_mca_write, ibm8514_mca_feedb, ibm8514_mca_reset, svga);
-    }
-#endif
-
-    timer_add(&svga->timer8514, ibm8514_poll, svga, 0);
 
     return svga;
 }
@@ -4464,13 +4048,10 @@ ibm8514_close(void *priv)
 {
     svga_t    *svga = (svga_t *) priv;
     ibm8514_t *dev  = (ibm8514_t *) svga->dev8514;
-
-#ifdef ATI_8514_ULTRA
     mach_t    *mach = (mach_t *) svga->ext8514;
 
     if (mach)
         free(mach);
-#endif
 
     if (dev) {
         free(dev->vram);
@@ -4493,67 +4074,144 @@ ibm8514_force_redraw(void *priv)
 {
     svga_t *svga = (svga_t *) priv;
 
-    svga->fullchange = changeframecount;
+    svga->fullchange = svga->monitor->mon_changeframecount;
 }
 
-#ifdef ATI_8514_ULTRA
 // clang-format off
-static const device_config_t ext8514_config[] = {
+static const device_config_t isa_ext8514_config[] = {
     {
-        .name = "extensions",
-        .description = "Vendor",
-        .type = CONFIG_SELECTION,
-        .default_int = 0,
-        .selection = {
-            {
-                .description = "IBM",
-                .value = 0
-            },
-            {
-                .description = "ATI",
-                .value = 1
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1024,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "512 KB", .value =  512 },
+            { .description = "1 MB",   .value = 1024 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .type = CONFIG_END
-    }
+        .name           = "extensions",
+        .description    = "Vendor",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = IBM,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IBM", .value = IBM },
+            { .description = "ATI", .value = ATI },
+            { .description = ""                }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xc8800,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "C800h", .value = 0xc8000 },
+            { .description = "C880h", .value = 0xc8800 },
+            { .description = "CA00h", .value = 0xca000 },
+            { .description = "CA80h", .value = 0xca800 },
+            { .description = "CC00h", .value = 0xcc000 },
+            { .description = "CC80h", .value = 0xcc800 },
+            { .description = "CE00h", .value = 0xce000 },
+            { .description = "CE80h", .value = 0xce800 },
+            { .description = "D000h", .value = 0xd0000 },
+            { .description = "D080h", .value = 0xd0800 },
+            { .description = "D200h", .value = 0xd2000 },
+            { .description = "D280h", .value = 0xd2800 },
+            { .description = "D400h", .value = 0xd4000 },
+            { .description = "D480h", .value = 0xd4800 },
+            { .description = "D600h", .value = 0xd6000 },
+            { .description = "D680h", .value = 0xd6800 },
+            { .description = "D800h", .value = 0xd8000 },
+            { .description = "D880h", .value = 0xd8800 },
+            { .description = "DA00h", .value = 0xda000 },
+            { .description = "DA80h", .value = 0xda800 },
+            { .description = "DC00h", .value = 0xdc000 },
+            { .description = "DC80h", .value = 0xdc800 },
+            { .description = "DE00h", .value = 0xde000 },
+            { .description = ""                        }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+// clang-format off
+static const device_config_t mca_ext8514_config[] = {
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1024,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "512 KB", .value =  512 },
+            { .description = "1 MB",   .value = 1024 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "extensions",
+        .description    = "Vendor",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = IBM,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "IBM", .value = IBM },
+            { .description = "ATI", .value = ATI },
+            { .description = ""                }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
 };
-#endif
 
 // clang-format off
 const device_t gen8514_isa_device = {
-    .name = "Generic 8514/A clone (ISA)",
+    .name          = "IBM 8514/A clone (ISA)",
     .internal_name = "8514_isa",
-    .flags = DEVICE_AT | DEVICE_ISA,
-    .local = 0,
-    .init = ibm8514_init,
-    .close = ibm8514_close,
-    .reset = NULL,
-    { .available = NULL },
+    .flags         = DEVICE_ISA16,
+    .local         = IBM_8514A_TYPE,
+    .init          = ibm8514_init,
+    .close         = ibm8514_close,
+    .reset         = NULL,
+    .available     = NULL,
     .speed_changed = ibm8514_speed_changed,
-    .force_redraw = ibm8514_force_redraw,
-    .config = NULL
+    .force_redraw  = ibm8514_force_redraw,
+    .config        = isa_ext8514_config
 };
 
 const device_t ibm8514_mca_device = {
-    .name = "IBM 8514/A (MCA)",
+    .name          = "IBM 8514/A (MCA)",
     .internal_name = "8514_mca",
-    .flags = DEVICE_MCA,
-    .local = 0,
-    .init = ibm8514_init,
-    .close = ibm8514_close,
-    .reset = NULL,
-    { .available = NULL },
+    .flags         = DEVICE_MCA,
+    .local         = IBM_8514A_TYPE,
+    .init          = ibm8514_init,
+    .close         = ibm8514_close,
+    .reset         = NULL,
+    .available     = NULL,
     .speed_changed = ibm8514_speed_changed,
-    .force_redraw = ibm8514_force_redraw,
-    .config = NULL
+    .force_redraw  = ibm8514_force_redraw,
+    .config        = mca_ext8514_config
 };
 
-
 void
 ibm8514_device_add(void)
 {
diff --git a/src/video/vid_ati18800.c b/src/video/vid_ati18800.c
index b54f6b89e..11124a35b 100644
--- a/src/video/vid_ati18800.c
+++ b/src/video/vid_ati18800.c
@@ -32,21 +32,14 @@
 #include <86box/vid_svga.h>
 #include <86box/vid_svga_render.h>
 
-#if defined(DEV_BRANCH) && defined(USE_VGAWONDER)
-#    define BIOS_ROM_PATH_WONDER "roms/video/ati18800/VGA_Wonder_V3-1.02.bin"
-#endif
+#define BIOS_ROM_PATH_WONDER         "roms/video/ati18800/VGA_Wonder_V3-1.02.bin"
 #define BIOS_ROM_PATH_VGA88          "roms/video/ati18800/vga88.bin"
 #define BIOS_ROM_PATH_EDGE16         "roms/video/ati18800/vgaedge16.vbi"
 
 enum {
-#if defined(DEV_BRANCH) && defined(USE_VGAWONDER)
     ATI18800_WONDER = 0,
     ATI18800_VGA88,
     ATI18800_EDGE16
-#else
-    ATI18800_VGA88 = 0,
-    ATI18800_EDGE16
-#endif
 };
 
 typedef struct ati18800_t {
@@ -116,7 +109,7 @@ ati18800_out(uint16_t addr, uint8_t val, void *priv)
                 if (svga->crtcreg < 0xe || svga->crtcreg > 0x10) {
                     if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
                     } else {
                         svga->fullchange = changeframecount;
                         svga_recalctimings(svga);
@@ -230,7 +223,7 @@ ati18800_recalctimings(svga_t *svga)
                             else {
                                 svga->render = svga_render_8bpp_highres;
                                 if (!svga->packed_4bpp) {
-                                    svga->ma_latch <<= 1;
+                                    svga->memaddr_latch <<= 1;
                                     svga->rowoffset <<= 1;
                                 }
                             }
@@ -257,11 +250,10 @@ ati18800_init(const device_t *info)
 
     switch (info->local) {
         default:
-#if defined(DEV_BRANCH) && defined(USE_VGAWONDER)
         case ATI18800_WONDER:
             rom_init(&ati18800->bios_rom, BIOS_ROM_PATH_WONDER, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
+            ati18800->memory = device_get_config_int("memory");
             break;
-#endif
         case ATI18800_VGA88:
             rom_init(&ati18800->bios_rom, BIOS_ROM_PATH_VGA88, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
             ati18800->memory = 256;
@@ -277,7 +269,7 @@ ati18800_init(const device_t *info)
               ati18800_in, ati18800_out,
               NULL,
               NULL);
-    ati18800->svga.clock_gen = device_add(&ati18810_device);
+    ati18800->svga.clock_gen = device_add(&ati18810_28800_device);
     ati18800->svga.getclock  = ics2494_getclock;
 
     io_sethandler(0x01ce, 0x0002, ati18800_in, NULL, NULL, ati18800_out, NULL, NULL, ati18800);
@@ -291,13 +283,11 @@ ati18800_init(const device_t *info)
     return ati18800;
 }
 
-#if defined(DEV_BRANCH) && defined(USE_VGAWONDER)
 static int
 ati18800_wonder_available(void)
 {
     return rom_present(BIOS_ROM_PATH_WONDER);
 }
-#endif
 
 static int
 ati18800_vga88_available(void)
@@ -337,7 +327,25 @@ ati18800_force_redraw(void *priv)
     ati18800->svga.fullchange = changeframecount;
 }
 
-#if defined(DEV_BRANCH) && defined(USE_VGAWONDER)
+static const device_config_t ati18800_wonder_config[] = {
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection = {
+            { .description = "256 KB", .value = 256 },
+            { .description = "512 KB", .value = 512 },
+            { .description = ""                     }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
 const device_t ati18800_wonder_device = {
     .name          = "ATI-18800",
     .internal_name = "ati18800w",
@@ -346,12 +354,11 @@ const device_t ati18800_wonder_device = {
     .init          = ati18800_init,
     .close         = ati18800_close,
     .reset         = NULL,
-    { .available = ati18800_wonder_available },
+    .available     = ati18800_wonder_available,
     .speed_changed = ati18800_speed_changed,
     .force_redraw  = ati18800_force_redraw,
-    .config        = NULL
+    .config        = ati18800_wonder_config
 };
-#endif
 
 const device_t ati18800_vga88_device = {
     .name          = "ATI 18800-1",
@@ -361,7 +368,7 @@ const device_t ati18800_vga88_device = {
     .init          = ati18800_init,
     .close         = ati18800_close,
     .reset         = NULL,
-    { .available = ati18800_vga88_available },
+    .available     = ati18800_vga88_available,
     .speed_changed = ati18800_speed_changed,
     .force_redraw  = ati18800_force_redraw,
     .config        = NULL
@@ -375,7 +382,7 @@ const device_t ati18800_device = {
     .init          = ati18800_init,
     .close         = ati18800_close,
     .reset         = NULL,
-    { .available = ati18800_available },
+    .available     = ati18800_available,
     .speed_changed = ati18800_speed_changed,
     .force_redraw  = ati18800_force_redraw,
     .config        = NULL
diff --git a/src/video/vid_ati28800.c b/src/video/vid_ati28800.c
index be9654aca..205d934ee 100644
--- a/src/video/vid_ati28800.c
+++ b/src/video/vid_ati28800.c
@@ -36,10 +36,11 @@
 #include <86box/vid_svga.h>
 #include <86box/vid_svga_render.h>
 
-#define VGAWONDERXL 1
-#if defined(DEV_BRANCH) && defined(USE_XL24)
-#    define VGAWONDERXL24 2
-#endif
+#define VGAWONDERXL               1
+#define VGAWONDERXLPLUS           2
+#ifdef USE_XL24
+#    define VGAWONDERXL24         3
+#endif /* USE_XL24 */
 
 #define BIOS_ATIKOR_PATH         "roms/video/ati28800/atikorvga.bin"
 #define BIOS_ATIKOR_4620P_PATH_L "roms/machines/spc4620p/31005h.u8"
@@ -52,13 +53,14 @@
 #define BIOS_VGAXL_EVEN_PATH     "roms/video/ati28800/xleven.bin"
 #define BIOS_VGAXL_ODD_PATH      "roms/video/ati28800/xlodd.bin"
 
-#if defined(DEV_BRANCH) && defined(USE_XL24)
+#ifdef USE_XL24
 #    define BIOS_XL24_EVEN_PATH "roms/video/ati28800/112-14318-102.bin"
 #    define BIOS_XL24_ODD_PATH  "roms/video/ati28800/112-14319-102.bin"
-#endif
+#endif /* USE_XL24 */
 
-#define BIOS_ROM_PATH       "roms/video/ati28800/bios.bin"
-#define BIOS_VGAXL_ROM_PATH "roms/video/ati28800/ATI_VGAWonder_XL.bin"
+#define BIOS_ROM_PATH            "roms/video/ati28800/bios.bin"
+#define BIOS_VGAXL_ROM_PATH      "roms/video/ati28800/ATI_VGAWonder_XL.bin"
+#define BIOS_VGAXL_PLUS_ROM_PATH "roms/video/ati28800/VGAWonder1024D_XL_Plus_VGABIOS_U19.BIN"
 
 typedef struct ati28800_t {
     svga_t       svga;
@@ -183,7 +185,7 @@ ati28800_out(uint16_t addr, uint8_t val, void *priv)
         case 0x3C7:
         case 0x3C8:
         case 0x3C9:
-            if (ati28800->type == 1)
+            if ((ati28800->type == VGAWONDERXL) || (ati28800->type == VGAWONDERXLPLUS))
                 sc1148x_ramdac_out(addr, 0, val, svga->ramdac, svga);
             else
                 svga_out(addr, val, svga);
@@ -204,7 +206,7 @@ ati28800_out(uint16_t addr, uint8_t val, void *priv)
                 if (svga->crtcreg < 0xe || svga->crtcreg > 0x10) {
                     if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
                     } else {
                         svga->fullchange = changeframecount;
                         svga_recalctimings(svga);
@@ -339,7 +341,7 @@ ati28800_in(uint16_t addr, void *priv)
         case 0x3C7:
         case 0x3C8:
         case 0x3C9:
-            if (ati28800->type == 1)
+            if ((ati28800->type == VGAWONDERXL) || (ati28800->type == VGAWONDERXLPLUS))
                 return sc1148x_ramdac_in(addr, 0, svga->ramdac, svga);
             return svga_in(addr, svga);
 
@@ -405,19 +407,29 @@ static void
 ati28800_recalctimings(svga_t *svga)
 {
     ati28800_t       *ati28800 = (ati28800_t *) svga->priv;
-    int               clock_sel;
+    int               clock_sel = 0x00;
 
     if (ati28800->regs[0xad] & 0x08)
-        svga->hblankstart    = ((ati28800->regs[0x0d] >> 2) << 8) + svga->crtc[2] + 1;
+        svga->hblankstart    = ((ati28800->regs[0x0d] >> 2) << 8) + svga->crtc[2];
 
-    clock_sel = ((svga->miscout >> 2) & 3) | ((ati28800->regs[0xbe] & 0x10) >> 1) |
-                ((ati28800->regs[0xb9] & 2) << 1);
+    if (svga->miscout & 0x04)
+        clock_sel |= 0x01;
+    if (svga->miscout & 0x08)
+        clock_sel |= 0x02;
+    if (ati28800->regs[0xb9] & 0x02)
+        clock_sel |= 0x04;
+    if (ati28800->regs[0xbe] & 0x10)
+        clock_sel |= 0x08;
+
+    svga->interlace = !!(ati28800->regs[0xbe] & 0x02);
+    if (svga->interlace)
+        svga->dispend >>= 1;
 
     if (ati28800->regs[0xa3] & 0x10)
-        svga->ma_latch |= 0x10000;
+        svga->memaddr_latch |= 0x10000;
 
     if (ati28800->regs[0xb0] & 0x40)
-        svga->ma_latch |= 0x20000;
+        svga->memaddr_latch |= 0x20000;
 
     if (ati28800->regs[0xb8] & 0x40)
         svga->clock *= 2;
@@ -450,9 +462,25 @@ ati28800_recalctimings(svga_t *svga)
     } else
         svga->ati_4color = 0;
 
-    if (!svga->scrblank && (svga->crtc[0x17] & 0x80) && svga->attr_palette_enable) {
+    if (!svga->scrblank && svga->attr_palette_enable) {
+        svga->clock = (cpuclock * (double) (1ULL << 32)) / svga->getclock(clock_sel ^ 0x08, svga->clock_gen);
+
+        switch ((ati28800->regs[0xb8] >> 6) & 3) {
+            case 0:
+            default:
+                break;
+            case 1:
+                svga->clock *= 2.0;
+                break;
+            case 2:
+                svga->clock *= 3.0;
+                break;
+            case 3:
+                svga->clock *= 4.0;
+                break;
+        }
+
          if ((svga->gdcreg[6] & 1) || (svga->attrregs[0x10] & 1)) {
-            svga->clock = (cpuclock * (double) (1ULL << 32)) / svga->getclock(clock_sel, svga->clock_gen);
             ati28800_log("SEQREG1 bit 3=%x. gdcreg5 bits 5-6=%02x, 4bit pel=%02x, "
                          "planar 16color=%02x, apa mode=%02x, attregs10 bit 7=%02x.\n",
                          svga->seqregs[1] & 8, svga->gdcreg[5] & 0x60,
@@ -481,7 +509,7 @@ ati28800_recalctimings(svga_t *svga)
                             else {
                                 svga->render = svga_render_8bpp_highres;
                                 if (!svga->packed_4bpp) {
-                                    svga->ma_latch <<= 1;
+                                    svga->memaddr_latch <<= 1;
                                     svga->rowoffset <<= 1;
                                 }
                             }
@@ -492,10 +520,9 @@ ati28800_recalctimings(svga_t *svga)
                             else {
                                 svga->render = svga_render_15bpp_highres;
                                 svga->hdisp >>= 1;
-                                svga->hblankstart = ((svga->hblankstart - 1) >> 1) + 1;
-                                svga->hblank_end_val >>= 1;
+                                svga->dots_per_clock >>= 1;
                                 svga->rowoffset <<= 1;
-                                svga->ma_latch <<= 1;
+                                svga->memaddr_latch <<= 1;
                             }
                             break;
                         default:
@@ -567,7 +594,7 @@ ati28800k_init(const device_t *info)
               ati28800k_in, ati28800k_out,
               NULL,
               NULL);
-    ati28800->svga.clock_gen = device_add(&ati18810_device);
+    ati28800->svga.clock_gen = device_add(&ati18811_1_28800_device);
     ati28800->svga.getclock  = ics2494_getclock;
 
     io_sethandler(0x01ce, 0x0002, ati28800k_in, NULL, NULL, ati28800k_out, NULL, NULL, ati28800);
@@ -610,7 +637,17 @@ ati28800_init(const device_t *info)
             ati28800->svga.ramdac = device_add(&sc11486_ramdac_device);
             break;
 
-#if defined(DEV_BRANCH) && defined(USE_XL24)
+        case VGAWONDERXLPLUS:
+            ati28800->id = 6;
+            rom_init(&ati28800->bios_rom,
+                     BIOS_VGAXL_PLUS_ROM_PATH,
+                     0xc0000, 0x8000, 0x7fff,
+                     0, MEM_MAPPING_EXTERNAL);
+            ati28800->svga.ramdac = device_add(&sc11483_ramdac_device);
+            ati28800->memory = 1024;
+            break;
+
+#ifdef USE_XL24
         case VGAWONDERXL24:
             ati28800->id = 6;
             rom_init_interleaved(&ati28800->bios_rom,
@@ -619,7 +656,7 @@ ati28800_init(const device_t *info)
                                  0xc0000, 0x10000, 0xffff,
                                  0, MEM_MAPPING_EXTERNAL);
             break;
-#endif
+#endif /* USE_XL24 */
 
         default:
             ati28800->id = 5;
@@ -635,7 +672,7 @@ ati28800_init(const device_t *info)
               ati28800_in, ati28800_out,
               NULL,
               NULL);
-    ati28800->svga.clock_gen = device_add(&ati18810_device);
+    ati28800->svga.clock_gen = device_add(&ati18811_1_28800_device);
     ati28800->svga.getclock  = ics2494_getclock;
 
     io_sethandler(0x01ce, 2,
@@ -654,11 +691,15 @@ ati28800_init(const device_t *info)
             ati_eeprom_load(&ati28800->eeprom, "ati28800xl.nvr", 0);
             break;
 
-#if defined(DEV_BRANCH) && defined(USE_XL24)
+        case VGAWONDERXLPLUS:
+            ati_eeprom_load(&ati28800->eeprom, "ati28800_wonder1024d_xl_plus.nvr", 0);
+            break;
+
+#ifdef USE_XL24
         case VGAWONDERXL24:
             ati_eeprom_load(&ati28800->eeprom, "ati28800xl24.nvr", 0);
             break;
-#endif
+#endif /* USE_XL24 */
 
         default:
             ati_eeprom_load(&ati28800->eeprom, "ati28800.nvr", 0);
@@ -686,13 +727,19 @@ compaq_ati28800_available(void)
     return (rom_present(BIOS_VGAXL_ROM_PATH));
 }
 
-#if defined(DEV_BRANCH) && defined(USE_XL24)
+static int
+ati28800_wonder1024d_xl_plus_available(void)
+{
+    return (rom_present(BIOS_VGAXL_PLUS_ROM_PATH));
+}
+
+#ifdef USE_XL24
 static int
 ati28800_wonderxl24_available(void)
 {
     return (rom_present(BIOS_XL24_EVEN_PATH) && rom_present(BIOS_XL24_ODD_PATH));
 }
-#endif
+#endif /* USE_XL24 */
 
 static void
 ati28800_close(void *priv)
@@ -723,63 +770,45 @@ ati28800_force_redraw(void *priv)
 // clang-format off
 static const device_config_t ati28800_config[] = {
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 512,
-        .selection = {
-            {
-                .description = "256 kB",
-                .value = 256
-            },
-            {
-                .description = "512 kB",
-                .value = 512
-            },
-            {
-                .description = "1 MB",
-                .value = 1024
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "256 KB", .value =  256 },
+            { .description = "512 KB", .value =  512 },
+            { .description = "1 MB",   .value = 1024 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
-#if defined(DEV_BRANCH) && defined(USE_XL24)
+#ifdef USE_XL24
 static const device_config_t ati28800_wonderxl_config[] = {
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 512,
-        .selection = {
-            {
-                .description = "256 kB",
-                .value = 256
-            },
-            {
-                .description = "512 kB",
-                .value = 512
-            },
-            {
-                .description = "1 MB",
-                .value = 1024
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "256 KB", .value =  256 },
+            { .description = "512 KB", .value =  512 },
+            { .description = "1 MB",   .value = 1024 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
-#endif
+#endif /* USE_XL24 */
 // clang-format on
 
 const device_t ati28800_device = {
@@ -790,7 +819,7 @@ const device_t ati28800_device = {
     .init          = ati28800_init,
     .close         = ati28800_close,
     .reset         = NULL,
-    { .available = ati28800_available },
+    .available     = ati28800_available,
     .speed_changed = ati28800_speed_changed,
     .force_redraw  = ati28800_force_redraw,
     .config        = ati28800_config
@@ -804,7 +833,7 @@ const device_t ati28800k_device = {
     .init          = ati28800k_init,
     .close         = ati28800_close,
     .reset         = NULL,
-    { .available = ati28800k_available },
+    .available     = ati28800k_available,
     .speed_changed = ati28800_speed_changed,
     .force_redraw  = ati28800_force_redraw,
     .config        = ati28800_config
@@ -818,7 +847,7 @@ const device_t ati28800k_spc4620p_device = {
     .init          = ati28800k_init,
     .close         = ati28800_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = ati28800_speed_changed,
     .force_redraw  = ati28800_force_redraw,
     .config        = NULL
@@ -832,7 +861,7 @@ const device_t ati28800k_spc6033p_device = {
     .init          = ati28800k_init,
     .close         = ati28800_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = ati28800_speed_changed,
     .force_redraw  = ati28800_force_redraw,
     .config        = NULL
@@ -846,13 +875,27 @@ const device_t compaq_ati28800_device = {
     .init          = ati28800_init,
     .close         = ati28800_close,
     .reset         = NULL,
-    { .available = compaq_ati28800_available },
+    .available     = compaq_ati28800_available,
     .speed_changed = ati28800_speed_changed,
     .force_redraw  = ati28800_force_redraw,
     .config        = ati28800_config
 };
 
-#if defined(DEV_BRANCH) && defined(USE_XL24)
+const device_t ati28800_wonder1024d_xl_plus_device = {
+    .name          = "ATI 28800-6 (ATI VGA Wonder 1024D XL Plus)",
+    .internal_name = "ati28800_wonder1024d_xl_plus",
+    .flags         = DEVICE_ISA,
+    .local         = VGAWONDERXLPLUS,
+    .init          = ati28800_init,
+    .close         = ati28800_close,
+    .reset         = NULL,
+    .available     = ati28800_wonder1024d_xl_plus_available,
+    .speed_changed = ati28800_speed_changed,
+    .force_redraw  = ati28800_force_redraw,
+    .config        = NULL
+};
+
+#ifdef USE_XL24
 const device_t ati28800_wonderxl24_device = {
     .name          = "ATI-28800 (VGA Wonder XL24)",
     .internal_name = "ati28800w",
@@ -861,9 +904,9 @@ const device_t ati28800_wonderxl24_device = {
     .init          = ati28800_init,
     .close         = ati28800_close,
     .reset         = NULL,
-    { .available = ati28800_wonderxl24_available },
+    .available     = ati28800_wonderxl24_available,
     .speed_changed = ati28800_speed_changed,
     .force_redraw  = ati28800_force_redraw,
     .config        = ati28800_wonderxl_config
 };
-#endif
+#endif /* USE_XL24 */
diff --git a/src/video/vid_ati_eeprom.c b/src/video/vid_ati_eeprom.c
index 054d83d36..a057f1f39 100644
--- a/src/video/vid_ati_eeprom.c
+++ b/src/video/vid_ati_eeprom.c
@@ -43,11 +43,12 @@ ati_eeprom_load(ati_eeprom_t *eeprom, char *fn, int type)
     }
     if (fread(eeprom->data, 1, size, fp) != size)
         memset(eeprom->data, 0, size);
+
     fclose(fp);
 }
 
 void
-ati_eeprom_load_mach8(ati_eeprom_t *eeprom, char *fn)
+ati_eeprom_load_mach8(ati_eeprom_t *eeprom, char *fn, int mca)
 {
     FILE *fp;
     int   size;
@@ -55,14 +56,43 @@ ati_eeprom_load_mach8(ati_eeprom_t *eeprom, char *fn)
     strncpy(eeprom->fn, fn, sizeof(eeprom->fn) - 1);
     fp   = nvr_fopen(eeprom->fn, "rb");
     size = 128;
-    if (!fp) { /*The ATI Graphics Ultra bios expects an immediate write to nvram if none is present at boot time otherwise
+    if (!fp) {
+        if (mca) {
+            (void) fseek(fp, 2L, SEEK_SET);
+            memset(eeprom->data + 2, 0xff, size - 2);
+            fp = nvr_fopen(eeprom->fn, "wb");
+            fwrite(eeprom->data, 1, size, fp);
+            fclose(fp);
+        } else
+            memset(eeprom->data, 0xff, size);
+        return;
+    }
+    if (fread(eeprom->data, 1, size, fp) != size)
+        memset(eeprom->data, 0, size);
+
+    fclose(fp);
+}
+
+void
+ati_eeprom_load_mach8_vga(ati_eeprom_t *eeprom, char *fn)
+{
+    FILE *fp;
+    int   size;
+    eeprom->type = 0;
+    strncpy(eeprom->fn, fn, sizeof(eeprom->fn) - 1);
+    fp   = nvr_fopen(eeprom->fn, "rb");
+    size = 128;
+    if (!fp) { /*The ATI Graphics Ultra bios expects a fresh nvram zero'ed at boot time otherwise
             it would hang the machine.*/
         memset(eeprom->data, 0, size);
         fp = nvr_fopen(eeprom->fn, "wb");
         fwrite(eeprom->data, 1, size, fp);
+        fclose(fp);
+        return;
     }
     if (fread(eeprom->data, 1, size, fp) != size)
         memset(eeprom->data, 0, size);
+
     fclose(fp);
 }
 
@@ -79,9 +109,9 @@ ati_eeprom_save(ati_eeprom_t *eeprom)
 void
 ati_eeprom_write(ati_eeprom_t *eeprom, int ena, int clk, int dat)
 {
-    if (!ena) {
+    if (!ena)
         eeprom->out = 1;
-    }
+
     if (clk && !eeprom->oldclk) {
         if (ena && !eeprom->oldena) {
             eeprom->state  = EEPROM_WAIT;
diff --git a/src/video/vid_ati_mach64.c b/src/video/vid_ati_mach64.c
index cdd906067..324023db1 100644
--- a/src/video/vid_ati_mach64.c
+++ b/src/video/vid_ati_mach64.c
@@ -28,6 +28,7 @@
 #include <86box/device.h>
 #include <86box/io.h>
 #include <86box/mem.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/pci.h>
 #include <86box/rom.h>
@@ -36,6 +37,7 @@
 #include <86box/video.h>
 #include <86box/i2c.h>
 #include <86box/vid_ddc.h>
+#include <86box/vid_xga.h>
 #include <86box/vid_svga.h>
 #include <86box/vid_svga_render.h>
 #include <86box/vid_ati_eeprom.h>
@@ -93,6 +95,7 @@ typedef struct mach64_t {
 
     int type;
     int pci;
+    int vlb;
 
     uint8_t pci_slot;
     uint8_t irq_state;
@@ -248,12 +251,12 @@ typedef struct mach64_t {
     fifo_entry_t fifo[FIFO_SIZE];
     atomic_int   fifo_read_idx;
     atomic_int   fifo_write_idx;
+    atomic_int   blitter_busy;
 
     thread_t *fifo_thread;
     event_t  *wake_fifo_thread;
     event_t  *fifo_not_full_event;
 
-    int      blitter_busy;
     uint64_t blitter_time;
     uint64_t status_time;
 
@@ -333,7 +336,8 @@ enum {
 enum {
     SRC_PATT_EN     = 1,
     SRC_PATT_ROT_EN = 2,
-    SRC_LINEAR_EN   = 4
+    SRC_LINEAR_EN   = 4,
+    SRC_BYTE_ALIGN  = 8
 };
 
 enum {
@@ -422,7 +426,7 @@ mach64_out(uint16_t addr, uint8_t val, void *priv)
         case 0x3C8:
         case 0x3C9:
             if (mach64->type == MACH64_GX)
-                ati68860_ramdac_out((addr & 3) | ((mach64->dac_cntl & 3) << 2), val, svga->ramdac, svga);
+                ati68860_ramdac_out((addr & 3) | ((mach64->dac_cntl & 3) << 2), val, 0, svga->ramdac, svga);
             else
                 svga_out(addr, val, svga);
             return;
@@ -454,7 +458,7 @@ mach64_out(uint16_t addr, uint8_t val, void *priv)
                 if (svga->crtcreg < 0xe || svga->crtcreg > 0x10) {
                     if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
                     } else {
                         svga->fullchange = svga->monitor->mon_changeframecount;
                         svga_recalctimings(svga);
@@ -489,7 +493,7 @@ mach64_in(uint16_t addr, void *priv)
         case 0x3C8:
         case 0x3C9:
             if (mach64->type == MACH64_GX)
-                return ati68860_ramdac_in((addr & 3) | ((mach64->dac_cntl & 3) << 2), svga->ramdac, svga);
+                return ati68860_ramdac_in((addr & 3) | ((mach64->dac_cntl & 3) << 2), 0, svga->ramdac, svga);
             return svga_in(addr, svga);
 
         case 0x3D4:
@@ -516,20 +520,24 @@ mach64_recalctimings(svga_t *svga)
         svga->htotal     = (mach64->crtc_h_total_disp & 255) + 1;
         svga->hdisp_time = svga->hdisp = ((mach64->crtc_h_total_disp >> 16) & 255) + 1;
         svga->hblankstart              = (mach64->crtc_h_sync_strt_wid & 255) +
-                                         ((mach64->crtc_h_sync_strt_wid >> 8) & 7) + 1;
+                                         ((mach64->crtc_h_sync_strt_wid >> 8) & 7);
         svga->hblank_end_val           = (svga->hblankstart +
                                          ((mach64->crtc_h_sync_strt_wid >> 16) & 31) - 1) & 63;
         svga->vsyncstart               = (mach64->crtc_v_sync_strt_wid & 2047) + 1;
         svga->rowoffset                = (mach64->crtc_off_pitch >> 22);
         svga->clock                    = (cpuclock * (double) (1ULL << 32)) / ics2595_getclock(svga->clock_gen);
-        svga->ma_latch                 = (mach64->crtc_off_pitch & 0x1fffff) * 2;
+        svga->memaddr_latch            = (mach64->crtc_off_pitch & 0x1fffff) * 2;
         svga->linedbl = svga->rowcount = 0;
         svga->split                    = 0xffffff;
         svga->vblankstart              = svga->dispend;
         svga->rowcount                 = mach64->crtc_gen_cntl & 1;
         svga->rowoffset <<= 1;
+
         if (mach64->type == MACH64_GX)
             ati68860_ramdac_set_render(svga->ramdac, svga);
+
+        svga->packed_4bpp = !!(((mach64->crtc_gen_cntl >> 8) & 7) == BPP_4);
+
         switch ((mach64->crtc_gen_cntl >> 8) & 7) {
             case BPP_4:
                 if (mach64->type != MACH64_GX)
@@ -538,7 +546,7 @@ mach64_recalctimings(svga_t *svga)
                 break;
             case BPP_8:
                 if (mach64->type != MACH64_GX)
-                    svga->render = svga_render_8bpp_highres;
+                    svga->render = svga_render_8bpp_clone_highres;
                 svga->hdisp <<= 3;
                 svga->rowoffset >>= 1;
                 break;
@@ -570,14 +578,16 @@ mach64_recalctimings(svga_t *svga)
         }
 
         svga->vram_display_mask = mach64->vram_mask;
-    } else
+    } else {
         svga->vram_display_mask = (mach64->regs[0x36] & 0x01) ? mach64->vram_mask : 0x3ffff;
+    }
 }
 
 void
 mach64_updatemapping(mach64_t *mach64)
 {
     svga_t *svga = &mach64->svga;
+    xga_t *xga   = (xga_t *) svga->xga;
 
     if (mach64->pci && !(mach64->pci_regs[PCI_REG_COMMAND] & PCI_COMMAND_MEM)) {
         mach64_log("Update mapping - PCI disabled\n");
@@ -603,6 +613,8 @@ mach64_updatemapping(mach64_t *mach64)
             mem_mapping_set_p(&svga->mapping, mach64);
             mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
             svga->banked_mask = 0xffff;
+            if (xga_active && (svga->xga != NULL))
+                xga->on = 0;
             break;
         case 0x8: /*32k at B0000*/
             mem_mapping_set_handler(&svga->mapping, svga_read, svga_readw, svga_readl, svga_write, svga_writew, svga_writel);
@@ -621,11 +633,11 @@ mach64_updatemapping(mach64_t *mach64)
             break;
     }
 
-    mach64_log("Mach64 linear aperture = %08x.\n", mach64->linear_base);
     if (mach64->linear_base) {
         if (mach64->type == MACH64_GX) {
             if ((mach64->config_cntl & 3) == 2) {
                 /*8 MB aperture*/
+                mach64_log("Mach64 linear aperture=%08x, cfgcntl=%x, mapping=%x, VGAAP=%x.\n", mach64->linear_base + ((8 << 20) - 0x4000), mach64->config_cntl & 3, svga->gdcreg[6] & 0xc, mach64->config_cntl & 4);
                 mem_mapping_set_addr(&mach64->linear_mapping, mach64->linear_base, (8 << 20) - 0x4000);
                 mem_mapping_set_addr(&mach64->mmio_linear_mapping, mach64->linear_base + ((8 << 20) - 0x4000), 0x4000);
             } else {
@@ -649,9 +661,8 @@ mach64_updatemapping(mach64_t *mach64)
 static void
 mach64_update_irqs(mach64_t *mach64)
 {
-    if (!mach64->pci) {
+    if (!mach64->pci)
         return;
-    }
 
     if ((mach64->crtc_int_cntl & 0xaa0024) & ((mach64->crtc_int_cntl << 1) & 0xaa0024))
         pci_set_irq(mach64->pci_slot, PCI_INTA, &mach64->irq_state);
@@ -659,7 +670,6 @@ mach64_update_irqs(mach64_t *mach64)
         pci_clear_irq(mach64->pci_slot, PCI_INTA, &mach64->irq_state);
 }
 
-#if 0
 static __inline void
 wake_fifo_thread(mach64_t *mach64)
 {
@@ -674,7 +684,6 @@ mach64_wait_fifo_idle(mach64_t *mach64)
         thread_wait_event(mach64->fifo_not_full_event, 1);
     }
 }
-#endif
 
 #define READ8(addr, var)                \
     switch ((addr) &3) {                \
@@ -1174,7 +1183,6 @@ mach64_accel_write_fifo_l(mach64_t *mach64, uint32_t addr, uint32_t val)
     }
 }
 
-#if 0
 static void
 fifo_thread(void *param)
 {
@@ -1222,11 +1230,53 @@ static void
 mach64_queue(mach64_t *mach64, uint32_t addr, uint32_t val, uint32_t type)
 {
     fifo_entry_t *fifo = &mach64->fifo[mach64->fifo_write_idx & FIFO_MASK];
+    int limit = 0;
 
-    if (FIFO_FULL) {
-        thread_reset_event(mach64->fifo_not_full_event);
+    switch (type) {
+        case FIFO_WRITE_BYTE:
+            switch (addr & 0x3ff) {
+                case 0x11b:
+                    limit = 1;
+                    break;
+                default:
+                    break;
+            }
+            break;
+        case FIFO_WRITE_WORD:
+            switch (addr & 0x3fe) {
+                case 0x11a:
+                    limit = 1;
+                    break;
+                default:
+                    break;
+            }
+            break;
+        case FIFO_WRITE_DWORD:
+            switch (addr & 0x3fc) {
+                case 0x118:
+                    limit = 1;
+                    break;
+                default:
+                    break;
+            }
+            break;
+        default:
+            break;
+    }
+
+    if (limit) {
+        if (FIFO_ENTRIES >= 16) {
+            thread_reset_event(mach64->fifo_not_full_event);
+            if (FIFO_ENTRIES >= 16) {
+                thread_wait_event(mach64->fifo_not_full_event, -1); /*Wait for room in ringbuffer*/
+            }
+        }
+    } else {
         if (FIFO_FULL) {
-            thread_wait_event(mach64->fifo_not_full_event, -1); /*Wait for room in ringbuffer*/
+            thread_reset_event(mach64->fifo_not_full_event);
+            if (FIFO_FULL) {
+                thread_wait_event(mach64->fifo_not_full_event, -1); /*Wait for room in ringbuffer*/
+            }
         }
     }
 
@@ -1238,11 +1288,18 @@ mach64_queue(mach64_t *mach64, uint32_t addr, uint32_t val, uint32_t type)
     if (FIFO_ENTRIES > 0xe000 || FIFO_ENTRIES < 8)
         wake_fifo_thread(mach64);
 }
-#endif
 
 void
 mach64_start_fill(mach64_t *mach64)
 {
+    mach64->accel.dst_pix_width  = mach64->dp_pix_width & 7;
+    mach64->accel.src_pix_width  = (mach64->dp_pix_width >> 8) & 7;
+    mach64->accel.host_pix_width = (mach64->dp_pix_width >> 16) & 7;
+
+    mach64->accel.dst_size  = mach64_width[mach64->accel.dst_pix_width];
+    mach64->accel.src_size  = mach64_width[mach64->accel.src_pix_width];
+    mach64->accel.host_size = mach64_width[mach64->accel.host_pix_width];
+
     mach64->accel.dst_x = 0;
     mach64->accel.dst_y = 0;
 
@@ -1256,7 +1313,8 @@ mach64_start_fill(mach64_t *mach64)
     mach64->accel.dst_width  = (mach64->dst_height_width >> 16) & 0x1fff;
     mach64->accel.dst_height = mach64->dst_height_width & 0x1fff;
 
-    if (((mach64->dp_src >> 16) & 7) == MONO_SRC_BLITSRC) {
+    if ((((mach64->dp_src >> 16) & 7) == MONO_SRC_BLITSRC) &&
+        ((mach64->src_cntl & (SRC_LINEAR_EN | SRC_BYTE_ALIGN)) == (SRC_LINEAR_EN | SRC_BYTE_ALIGN))) {
         if (mach64->accel.dst_width & 7)
             mach64->accel.dst_width = (mach64->accel.dst_width & ~7) + 8;
     }
@@ -1308,14 +1366,6 @@ mach64_start_fill(mach64_t *mach64)
     mach64->accel.source_fg  = (mach64->dp_src >> 8) & 7;
     mach64->accel.source_mix = (mach64->dp_src >> 16) & 7;
 
-    mach64->accel.dst_pix_width  = mach64->dp_pix_width & 7;
-    mach64->accel.src_pix_width  = (mach64->dp_pix_width >> 8) & 7;
-    mach64->accel.host_pix_width = (mach64->dp_pix_width >> 16) & 7;
-
-    mach64->accel.dst_size  = mach64_width[mach64->accel.dst_pix_width];
-    mach64->accel.src_size  = mach64_width[mach64->accel.src_pix_width];
-    mach64->accel.host_size = mach64_width[mach64->accel.host_pix_width];
-
     if (mach64->accel.src_size == WIDTH_1BIT)
         mach64->accel.src_offset <<= 3;
     else
@@ -1469,16 +1519,16 @@ mach64_start_line(mach64_t *mach64)
     mach64->accel.op = OP_LINE;
 }
 
-#define READ(addr, dat, width)                                                    \
-    if (width == 0)                                                               \
-        dat = svga->vram[((addr)) & mach64->vram_mask];                           \
-    else if (width == 1)                                                          \
-        dat = *(uint16_t *) &svga->vram[((addr) << 1) & mach64->vram_mask];       \
-    else if (width == 2)                                                          \
-        dat = *(uint32_t *) &svga->vram[((addr) << 2) & mach64->vram_mask];       \
-    else if (mach64->dp_pix_width & DP_BYTE_PIX_ORDER)                            \
-        dat = (svga->vram[((addr) >> 3) & mach64->vram_mask] >> ((addr) &7)) & 1; \
-    else                                                                          \
+#define READ(addr, dat, width)                                                         \
+    if (width == 0)                                                                    \
+        dat = svga->vram[((addr)) & mach64->vram_mask];                                \
+    else if (width == 1)                                                               \
+        dat = *(uint16_t *) &svga->vram[((addr) << 1) & mach64->vram_mask];            \
+    else if (width == 2)                                                               \
+        dat = *(uint32_t *) &svga->vram[((addr) << 2) & mach64->vram_mask];            \
+    else if (mach64->dp_pix_width & DP_BYTE_PIX_ORDER)                                 \
+        dat = (svga->vram[((addr) >> 3) & mach64->vram_mask] >> ((addr) &7)) & 1;      \
+    else                                                                               \
         dat = (svga->vram[((addr) >> 3) & mach64->vram_mask] >> (7 - ((addr) &7))) & 1;
 
 #define MIX                                                      \
@@ -1536,29 +1586,29 @@ mach64_start_line(mach64_t *mach64)
             break;                                               \
     }
 
-#define WRITE(addr, width)                                                                  \
-    if (width == 0) {                                                                       \
-        svga->vram[(addr) &mach64->vram_mask]                = dest_dat;                    \
-        svga->changedvram[((addr) &mach64->vram_mask) >> 12] = svga->monitor->mon_changeframecount;            \
-    } else if (width == 1) {                                                                \
-        *(uint16_t *) &svga->vram[((addr) << 1) & mach64->vram_mask] = dest_dat;            \
-        svga->changedvram[(((addr) << 1) & mach64->vram_mask) >> 12] = svga->monitor->mon_changeframecount;    \
-    } else if (width == 2) {                                                                \
-        *(uint32_t *) &svga->vram[((addr) << 2) & mach64->vram_mask] = dest_dat;            \
-        svga->changedvram[(((addr) << 2) & mach64->vram_mask) >> 12] = svga->monitor->mon_changeframecount;    \
-    } else {                                                                                \
-        if (dest_dat & 1) {                                                                 \
-            if (mach64->dp_pix_width & DP_BYTE_PIX_ORDER)                                   \
-                svga->vram[((addr) >> 3) & mach64->vram_mask] |= 1 << ((addr) &7);          \
-            else                                                                            \
-                svga->vram[((addr) >> 3) & mach64->vram_mask] |= 1 << (7 - ((addr) &7));    \
-        } else {                                                                            \
-            if (mach64->dp_pix_width & DP_BYTE_PIX_ORDER)                                   \
-                svga->vram[((addr) >> 3) & mach64->vram_mask] &= ~(1 << ((addr) &7));       \
-            else                                                                            \
-                svga->vram[((addr) >> 3) & mach64->vram_mask] &= ~(1 << (7 - ((addr) &7))); \
-        }                                                                                   \
-        svga->changedvram[(((addr) >> 3) & mach64->vram_mask) >> 12] = svga->monitor->mon_changeframecount;    \
+#define WRITE(addr, width)                                                                                  \
+    if (width == 0) {                                                                                       \
+        svga->vram[(addr) &mach64->vram_mask]                = dest_dat;                                    \
+        svga->changedvram[((addr) &mach64->vram_mask) >> 12] = svga->monitor->mon_changeframecount;         \
+    } else if (width == 1) {                                                                                \
+        *(uint16_t *) &svga->vram[((addr) << 1) & mach64->vram_mask] = dest_dat;                            \
+        svga->changedvram[(((addr) << 1) & mach64->vram_mask) >> 12] = svga->monitor->mon_changeframecount; \
+    } else if (width == 2) {                                                                                \
+        *(uint32_t *) &svga->vram[((addr) << 2) & mach64->vram_mask] = dest_dat;                            \
+        svga->changedvram[(((addr) << 2) & mach64->vram_mask) >> 12] = svga->monitor->mon_changeframecount; \
+    } else {                                                                                                \
+        if (dest_dat & 1) {                                                                                 \
+            if (mach64->dp_pix_width & DP_BYTE_PIX_ORDER)                                                   \
+                svga->vram[((addr) >> 3) & mach64->vram_mask] |= 1 << ((addr) &7);                          \
+            else                                                                                            \
+                svga->vram[((addr) >> 3) & mach64->vram_mask] |= 1 << (7 - ((addr) &7));                    \
+        } else {                                                                                            \
+            if (mach64->dp_pix_width & DP_BYTE_PIX_ORDER)                                                   \
+                svga->vram[((addr) >> 3) & mach64->vram_mask] &= ~(1 << ((addr) &7));                       \
+            else                                                                                            \
+                svga->vram[((addr) >> 3) & mach64->vram_mask] &= ~(1 << (7 - ((addr) &7)));                 \
+        }                                                                                                   \
+        svga->changedvram[(((addr) >> 3) & mach64->vram_mask) >> 12] = svga->monitor->mon_changeframecount; \
     }
 
 void
@@ -1630,7 +1680,7 @@ mach64_blit(uint32_t cpu_dat, int count, mach64_t *mach64)
                     case MONO_SRC_PAT:
                         if (mach64->dst_cntl & DST_24_ROT_EN) {
                             if (!mach64->accel.xx_count)
-                                mix = mach64->accel.pattern[dst_y & 7][dst_x & 7];
+                                mix = mach64->accel.pattern[dst_y & 7][(dst_x / 3) & 7];
                         } else
                             mix = mach64->accel.pattern[dst_y & 7][dst_x & 7];
                         break;
@@ -1824,6 +1874,7 @@ mach64_blit(uint32_t cpu_dat, int count, mach64_t *mach64)
                                 cpu_dat >>= (count & 7);
                             else
                                 cpu_dat <<= (count & 7);
+
                             count &= ~7;
                         }
                     }
@@ -2269,6 +2320,7 @@ uint8_t
 mach64_ext_readb(uint32_t addr, void *priv)
 {
     mach64_t *mach64 = (mach64_t *) priv;
+    svga_t   *svga   = &mach64->svga;
 
     uint8_t ret = 0xff;
     if (!(addr & 0x400)) {
@@ -2344,7 +2396,7 @@ mach64_ext_readb(uint32_t addr, void *priv)
                 ret = 0xff;
                 break;
         }
-    } else
+    } else {
         switch (addr & 0x3ff) {
             case 0x00:
             case 0x01:
@@ -2482,9 +2534,23 @@ mach64_ext_readb(uint32_t addr, void *priv)
             case 0xc2:
             case 0xc3:
                 if (mach64->type == MACH64_GX)
-                    ret = ati68860_ramdac_in((addr & 3) | ((mach64->dac_cntl & 3) << 2), mach64->svga.ramdac, &mach64->svga);
-                else
-                    ret = ati68860_ramdac_in(addr & 3, mach64->svga.ramdac, &mach64->svga);
+                    ret = ati68860_ramdac_in((addr & 3) | ((mach64->dac_cntl & 3) << 2), 0, mach64->svga.ramdac, &mach64->svga);
+                else {
+                    switch (addr & 3) {
+                        case 0:
+                            ret = svga_in(0x3c8, svga);
+                            break;
+                        case 1:
+                            ret = svga_in(0x3c9, svga);
+                            break;
+                        case 2:
+                            ret = svga_in(0x3c6, svga);
+                            break;
+                        case 3:
+                            ret = svga_in(0x3c7, svga);
+                            break;
+                    }
+                }
                 break;
             case 0xc4:
             case 0xc5:
@@ -2538,26 +2604,26 @@ mach64_ext_readb(uint32_t addr, void *priv)
             case 0x101:
             case 0x102:
             case 0x103:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->dst_off_pitch);
                 break;
             case 0x104:
             case 0x105:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->dst_y_x);
                 break;
             case 0x108:
             case 0x109:
             case 0x11c:
             case 0x11d:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr + 2, mach64->dst_y_x);
                 break;
             case 0x10c:
             case 0x10d:
             case 0x10e:
             case 0x10f:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->dst_y_x);
                 break;
             case 0x110:
@@ -2572,7 +2638,7 @@ mach64_ext_readb(uint32_t addr, void *priv)
             case 0x11b:
             case 0x11e:
             case 0x11f:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->dst_height_width);
                 break;
 
@@ -2580,28 +2646,28 @@ mach64_ext_readb(uint32_t addr, void *priv)
             case 0x121:
             case 0x122:
             case 0x123:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->dst_bres_lnth);
                 break;
             case 0x124:
             case 0x125:
             case 0x126:
             case 0x127:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->dst_bres_err);
                 break;
             case 0x128:
             case 0x129:
             case 0x12a:
             case 0x12b:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->dst_bres_inc);
                 break;
             case 0x12c:
             case 0x12d:
             case 0x12e:
             case 0x12f:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->dst_bres_dec);
                 break;
 
@@ -2609,7 +2675,7 @@ mach64_ext_readb(uint32_t addr, void *priv)
             case 0x131:
             case 0x132:
             case 0x133:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->dst_cntl);
                 break;
 
@@ -2617,75 +2683,75 @@ mach64_ext_readb(uint32_t addr, void *priv)
             case 0x181:
             case 0x182:
             case 0x183:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->src_off_pitch);
                 break;
             case 0x184:
             case 0x185:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->src_y_x);
                 break;
             case 0x188:
             case 0x189:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr + 2, mach64->src_y_x);
                 break;
             case 0x18c:
             case 0x18d:
             case 0x18e:
             case 0x18f:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->src_y_x);
                 break;
             case 0x190:
             case 0x191:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr + 2, mach64->src_height1_width1);
                 break;
             case 0x194:
             case 0x195:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->src_height1_width1);
                 break;
             case 0x198:
             case 0x199:
             case 0x19a:
             case 0x19b:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->src_height1_width1);
                 break;
             case 0x19c:
             case 0x19d:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->src_y_x_start);
                 break;
             case 0x1a0:
             case 0x1a1:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr + 2, mach64->src_y_x_start);
                 break;
             case 0x1a4:
             case 0x1a5:
             case 0x1a6:
             case 0x1a7:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->src_y_x_start);
                 break;
             case 0x1a8:
             case 0x1a9:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr + 2, mach64->src_height2_width2);
                 break;
             case 0x1ac:
             case 0x1ad:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->src_height2_width2);
                 break;
             case 0x1b0:
             case 0x1b1:
             case 0x1b2:
             case 0x1b3:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->src_height2_width2);
                 break;
 
@@ -2693,7 +2759,7 @@ mach64_ext_readb(uint32_t addr, void *priv)
             case 0x1b5:
             case 0x1b6:
             case 0x1b7:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->src_cntl);
                 break;
 
@@ -2701,7 +2767,7 @@ mach64_ext_readb(uint32_t addr, void *priv)
             case 0x241:
             case 0x242:
             case 0x243:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->host_cntl);
                 break;
 
@@ -2709,14 +2775,14 @@ mach64_ext_readb(uint32_t addr, void *priv)
             case 0x281:
             case 0x282:
             case 0x283:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->pat_reg0);
                 break;
             case 0x284:
             case 0x285:
             case 0x286:
             case 0x287:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->pat_reg1);
                 break;
 
@@ -2724,7 +2790,7 @@ mach64_ext_readb(uint32_t addr, void *priv)
             case 0x289:
             case 0x28a:
             case 0x28b:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->pat_cntl);
                 break;
 
@@ -2732,7 +2798,7 @@ mach64_ext_readb(uint32_t addr, void *priv)
             case 0x2a1:
             case 0x2a8:
             case 0x2a9:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->sc_left_right);
                 break;
             case 0x2a4:
@@ -2741,7 +2807,7 @@ mach64_ext_readb(uint32_t addr, void *priv)
                 fallthrough;
             case 0x2aa:
             case 0x2ab:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->sc_left_right);
                 break;
 
@@ -2749,7 +2815,7 @@ mach64_ext_readb(uint32_t addr, void *priv)
             case 0x2ad:
             case 0x2b4:
             case 0x2b5:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->sc_top_bottom);
                 break;
             case 0x2b0:
@@ -2758,7 +2824,7 @@ mach64_ext_readb(uint32_t addr, void *priv)
                 fallthrough;
             case 0x2b6:
             case 0x2b7:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->sc_top_bottom);
                 break;
 
@@ -2766,14 +2832,14 @@ mach64_ext_readb(uint32_t addr, void *priv)
             case 0x2c1:
             case 0x2c2:
             case 0x2c3:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->dp_bkgd_clr);
                 break;
             case 0x2c4:
             case 0x2c5:
             case 0x2c6:
             case 0x2c7:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->dp_frgd_clr);
                 break;
 
@@ -2781,7 +2847,7 @@ mach64_ext_readb(uint32_t addr, void *priv)
             case 0x2c9:
             case 0x2ca:
             case 0x2cb:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->write_mask);
                 break;
 
@@ -2789,7 +2855,7 @@ mach64_ext_readb(uint32_t addr, void *priv)
             case 0x2cd:
             case 0x2ce:
             case 0x2cf:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->chain_mask);
                 break;
 
@@ -2797,21 +2863,21 @@ mach64_ext_readb(uint32_t addr, void *priv)
             case 0x2d1:
             case 0x2d2:
             case 0x2d3:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->dp_pix_width);
                 break;
             case 0x2d4:
             case 0x2d5:
             case 0x2d6:
             case 0x2d7:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->dp_mix);
                 break;
             case 0x2d8:
             case 0x2d9:
             case 0x2da:
             case 0x2db:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->dp_src);
                 break;
 
@@ -2819,59 +2885,68 @@ mach64_ext_readb(uint32_t addr, void *priv)
             case 0x301:
             case 0x302:
             case 0x303:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->clr_cmp_clr);
                 break;
             case 0x304:
             case 0x305:
             case 0x306:
             case 0x307:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->clr_cmp_mask);
                 break;
             case 0x308:
             case 0x309:
             case 0x30a:
             case 0x30b:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->clr_cmp_cntl);
                 break;
 
             case 0x310:
             case 0x311:
+                if (!mach64->blitter_busy)
+                    wake_fifo_thread(mach64);
+
                 ret = 0;
+                if (FIFO_FULL)
+                    ret = 0xff;
                 break;
 
             case 0x320:
             case 0x321:
             case 0x322:
             case 0x323:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->context_mask);
                 break;
 
             case 0x330:
             case 0x331:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr, mach64->dst_cntl);
                 break;
             case 0x332:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr - 2, mach64->src_cntl);
                 break;
             case 0x333:
-                //mach64_wait_fifo_idle(mach64);
+                mach64_wait_fifo_idle(mach64);
                 READ8(addr - 3, mach64->pat_cntl);
                 break;
 
             case 0x338:
-                ret = 0;
+                if (!mach64->blitter_busy)
+                    wake_fifo_thread(mach64);
+
+                ret = FIFO_EMPTY ? 0 : 1;
                 break;
 
             default:
                 ret = 0;
                 break;
         }
+    }
     if ((addr & 0x3fc) != 0x018)
         mach64_log("mach64_ext_readb : addr %08X ret %02X\n", addr, ret);
     return ret;
@@ -2883,7 +2958,7 @@ mach64_ext_readw(uint32_t addr, void *priv)
     uint16_t  ret;
 
     if (!(addr & 0x400)) {
-        mach64_log("nmach64_ext_readw: addr=%04x\n", addr);
+        mach64_log("mach64_ext_readw: addr=%04x\n", addr);
         ret = 0xffff;
     } else
         switch (addr & 0x3ff) {
@@ -2912,7 +2987,7 @@ mach64_ext_readl(uint32_t addr, void *priv)
     uint32_t        ret;
 
     if (!(addr & 0x400)) {
-        mach64_log("nmach64_ext_readl: addr=%04x\n", addr);
+        mach64_log("mach64_ext_readl: addr=%04x\n", addr);
         ret = 0xffffffff;
     } else
         switch (addr & 0x3ff) {
@@ -3047,10 +3122,11 @@ mach64_ext_writeb(uint32_t addr, uint8_t val, void *priv)
                 break;
         }
 
-        mach64_log("nmach64_ext_writeb: addr=%04x val=%02x\n", addr, val);
+        mach64_log("mach64_ext_writeb: addr=%04x val=%02x\n", addr, val);
     } else if (addr & 0x300) {
-        mach64_accel_write_fifo(mach64, addr & 0x3ff, val);
-    } else
+        mach64_queue(mach64, addr & 0x3ff, val, FIFO_WRITE_BYTE);
+    } else {
+        mach64_log("mach64_ext_writeb: addr=%04x val=%02x\n", addr & 0x3ff, val);
         switch (addr & 0x3ff) {
             case 0x00:
             case 0x01:
@@ -3139,39 +3215,48 @@ mach64_ext_writeb(uint32_t addr, uint8_t val, void *priv)
             case 0x62:
             case 0x63:
                 WRITE8(addr, mach64->cur_clr0, val);
-                if (mach64->type == MACH64_VT2)
-                    ati68860_ramdac_set_pallook(mach64->svga.ramdac, 0, makecol32((mach64->cur_clr0 >> 24) & 0xff, (mach64->cur_clr0 >> 16) & 0xff, (mach64->cur_clr0 >> 8) & 0xff));
                 break;
             case 0x64:
             case 0x65:
             case 0x66:
             case 0x67:
                 WRITE8(addr, mach64->cur_clr1, val);
-                if (mach64->type == MACH64_VT2)
-                    ati68860_ramdac_set_pallook(mach64->svga.ramdac, 1, makecol32((mach64->cur_clr1 >> 24) & 0xff, (mach64->cur_clr1 >> 16) & 0xff, (mach64->cur_clr1 >> 8) & 0xff));
                 break;
             case 0x68:
             case 0x69:
             case 0x6a:
             case 0x6b:
                 WRITE8(addr, mach64->cur_offset, val);
-                svga->dac_hwcursor.addr = (mach64->cur_offset & 0xfffff) * 8;
+                if (mach64->type == MACH64_GX)
+                    svga->dac_hwcursor.addr = (mach64->cur_offset & 0xfffff) << 3;
+                else
+                    svga->hwcursor.addr = (mach64->cur_offset & 0xfffff) << 3;
                 break;
             case 0x6c:
             case 0x6d:
             case 0x6e:
             case 0x6f:
                 WRITE8(addr, mach64->cur_horz_vert_posn, val);
-                svga->dac_hwcursor.x = mach64->cur_horz_vert_posn & 0x7ff;
-                svga->dac_hwcursor.y = (mach64->cur_horz_vert_posn >> 16) & 0x7ff;
+                if (mach64->type == MACH64_GX) {
+                    svga->dac_hwcursor.x = mach64->cur_horz_vert_posn & 0x7ff;
+                    svga->dac_hwcursor.y = (mach64->cur_horz_vert_posn >> 16) & 0x7ff;
+                } else {
+                    svga->hwcursor.x = mach64->cur_horz_vert_posn & 0x7ff;
+                    svga->hwcursor.y = (mach64->cur_horz_vert_posn >> 16) & 0x7ff;
+                }
                 break;
             case 0x70:
             case 0x71:
             case 0x72:
             case 0x73:
                 WRITE8(addr, mach64->cur_horz_vert_off, val);
-                svga->dac_hwcursor.xoff = mach64->cur_horz_vert_off & 0x3f;
-                svga->dac_hwcursor.yoff = (mach64->cur_horz_vert_off >> 16) & 0x3f;
+                if (mach64->type == MACH64_GX) {
+                    svga->dac_hwcursor.xoff = mach64->cur_horz_vert_off & 0x3f;
+                    svga->dac_hwcursor.yoff = (mach64->cur_horz_vert_off >> 16) & 0x3f;
+                } else {
+                    svga->hwcursor.xoff = mach64->cur_horz_vert_off & 0x3f;
+                    svga->hwcursor.yoff = (mach64->cur_horz_vert_off >> 16) & 0x3f;
+                }
                 break;
 
             case 0x80:
@@ -3232,17 +3317,35 @@ mach64_ext_writeb(uint32_t addr, uint8_t val, void *priv)
             case 0xc2:
             case 0xc3:
                 if (mach64->type == MACH64_GX)
-                    ati68860_ramdac_out((addr & 3) | ((mach64->dac_cntl & 3) << 2), val, mach64->svga.ramdac, &mach64->svga);
-                else
-                    ati68860_ramdac_out(addr & 3, val, mach64->svga.ramdac, &mach64->svga);
+                    ati68860_ramdac_out((addr & 3) | ((mach64->dac_cntl & 3) << 2), val, 0, svga->ramdac, svga);
+                else {
+                    switch (addr & 3) {
+                        case 0:
+                            svga_out(0x3c8, val, svga);
+                            break;
+                        case 1:
+                            svga_out(0x3c9, val, svga);
+                            break;
+                        case 2:
+                            svga_out(0x3c6, val, svga);
+                            break;
+                        case 3:
+                            svga_out(0x3c7, val, svga);
+                            break;
+                    }
+                }
                 break;
             case 0xc4:
             case 0xc5:
             case 0xc6:
             case 0xc7:
                 WRITE8(addr, mach64->dac_cntl, val);
-                svga_set_ramdac_type(svga, (mach64->dac_cntl & 0x100) ? RAMDAC_8BIT : RAMDAC_6BIT);
-                ati68860_set_ramdac_type(mach64->svga.ramdac, (mach64->dac_cntl & 0x100) ? RAMDAC_8BIT : RAMDAC_6BIT);
+                mach64_log("Ext RAMDAC TYPE write=%x, bit set=%03x.\n", addr & 0x3ff, mach64->dac_cntl & 0x100);
+                if ((addr & 3) >= 1) {
+                    svga_set_ramdac_type(svga, !!(mach64->dac_cntl & 0x100));
+                    if (mach64->type == MACH64_GX)
+                        ati68860_set_ramdac_type(svga->ramdac, !!(mach64->dac_cntl & 0x100));
+                }
                 i2c_gpio_set(mach64->i2c, !(mach64->dac_cntl & 0x20000000) || (mach64->dac_cntl & 0x04000000), !(mach64->dac_cntl & 0x10000000) || (mach64->dac_cntl & 0x02000000));
                 break;
 
@@ -3253,7 +3356,10 @@ mach64_ext_writeb(uint32_t addr, uint8_t val, void *priv)
                 WRITE8(addr, mach64->gen_test_cntl, val);
                 ati_eeprom_write(&mach64->eeprom, mach64->gen_test_cntl & 0x10, mach64->gen_test_cntl & 2, mach64->gen_test_cntl & 1);
                 mach64->gen_test_cntl  = (mach64->gen_test_cntl & ~8) | (ati_eeprom_read(&mach64->eeprom) ? 8 : 0);
-                svga->dac_hwcursor.ena = mach64->gen_test_cntl & 0x80;
+                if (mach64->type == MACH64_GX)
+                    svga->dac_hwcursor.ena = !!(mach64->gen_test_cntl & 0x80);
+                else
+                    svga->hwcursor.ena = !!(mach64->gen_test_cntl & 0x80);
                 break;
 
             case 0xdc:
@@ -3275,7 +3381,9 @@ mach64_ext_writeb(uint32_t addr, uint8_t val, void *priv)
             default:
                 break;
         }
+    }
 }
+
 void
 mach64_ext_writew(uint32_t addr, uint16_t val, void *priv)
 {
@@ -3287,14 +3395,11 @@ mach64_ext_writew(uint32_t addr, uint16_t val, void *priv)
         mach64_ext_writeb(addr, val, priv);
         mach64_ext_writeb(addr + 1, val >> 8, priv);
     } else if (addr & 0x300) {
-        mach64_accel_write_fifo_w(mach64, addr & 0x3fe, val);
-    } else
-        switch (addr & 0x3fe) {
-            default:
-                mach64_ext_writeb(addr, val, priv);
-                mach64_ext_writeb(addr + 1, val >> 8, priv);
-                break;
-        }
+        mach64_queue(mach64, addr & 0x3fe, val, FIFO_WRITE_WORD);
+    } else {
+        mach64_ext_writeb(addr, val, priv);
+        mach64_ext_writeb(addr + 1, val >> 8, priv);
+    }
 }
 void
 mach64_ext_writel(uint32_t addr, uint32_t val, void *priv)
@@ -3308,20 +3413,18 @@ mach64_ext_writel(uint32_t addr, uint32_t val, void *priv)
         mach64_ext_writew(addr, val, priv);
         mach64_ext_writew(addr + 2, val >> 16, priv);
     } else if (addr & 0x300) {
-        mach64_accel_write_fifo_l(mach64, addr & 0x3fc, val);
-    } else
-        switch (addr & 0x3fc) {
-            default:
-                mach64_ext_writew(addr, val, priv);
-                mach64_ext_writew(addr + 2, val >> 16, priv);
-                break;
-        }
+        mach64_queue(mach64, addr & 0x3fc, val, FIFO_WRITE_DWORD);
+    } else {
+        mach64_ext_writew(addr, val, priv);
+        mach64_ext_writew(addr + 2, val >> 16, priv);
+    }
 }
 
 uint8_t
 mach64_ext_inb(uint16_t port, void *priv)
 {
     mach64_t *mach64 = (mach64_t *) priv;
+    svga_t   *svga   = &mach64->svga;
     uint8_t   ret    = 0xff;
 
     switch (port) {
@@ -3335,6 +3438,12 @@ mach64_ext_inb(uint16_t port, void *priv)
         case 0x7eef:
             ret = mach64_ext_readb(0x400 | 0x00 | (port & 3), priv);
             break;
+        case 0x06ec:
+        case 0x06ed:
+        case 0x06ee:
+        case 0x06ef:
+            ret = mach64_ext_readb(0x400 | 0x04 | (port & 3), priv);
+            break;
         case 0x0aec:
         case 0x0aed:
         case 0x0aee:
@@ -3469,9 +3578,23 @@ mach64_ext_inb(uint16_t port, void *priv)
         case 0x5eee:
         case 0x5eef:
             if (mach64->type == MACH64_GX)
-                ret = ati68860_ramdac_in((port & 3) | ((mach64->dac_cntl & 3) << 2), mach64->svga.ramdac, &mach64->svga);
-            else
-                ret = ati68860_ramdac_in(port & 3, mach64->svga.ramdac, &mach64->svga);
+                ret = ati68860_ramdac_in((port & 3) | ((mach64->dac_cntl & 3) << 2), 0, mach64->svga.ramdac, &mach64->svga);
+            else {
+                switch (port & 3) {
+                    case 0:
+                        ret = svga_in(0x3c8, svga);
+                        break;
+                    case 1:
+                        ret = svga_in(0x3c9, svga);
+                        break;
+                    case 2:
+                        ret = svga_in(0x3c6, svga);
+                        break;
+                    case 3:
+                        ret = svga_in(0x3c7, svga);
+                        break;
+                }
+            }
             break;
 
         case 0x62ec:
@@ -3521,12 +3644,10 @@ uint16_t
 mach64_ext_inw(uint16_t port, void *priv)
 {
     uint16_t ret;
-    switch (port) {
-        default:
-            ret = mach64_ext_inb(port, priv);
-            ret |= (mach64_ext_inb(port + 1, priv) << 8);
-            break;
-    }
+
+    ret = mach64_ext_inb(port, priv);
+    ret |= (mach64_ext_inb(port + 1, priv) << 8);
+
     mach64_log("mach64_ext_inw : port %04X ret %04X\n", port, ret);
     return ret;
 }
@@ -3534,6 +3655,7 @@ uint32_t
 mach64_ext_inl(uint16_t port, void *priv)
 {
     uint32_t ret;
+
     switch (port) {
         case 0x56ec:
             ret = mach64_ext_readl(0x400 | 0xb4, priv);
@@ -3555,6 +3677,7 @@ void
 mach64_ext_outb(uint16_t port, uint8_t val, void *priv)
 {
     mach64_t *mach64 = (mach64_t *) priv;
+    svga_t *svga = &mach64->svga;
 
     mach64_log("mach64_ext_outb : port %04X val %02X\n", port, val);
     switch (port) {
@@ -3568,6 +3691,12 @@ mach64_ext_outb(uint16_t port, uint8_t val, void *priv)
         case 0x7eef:
             mach64_ext_writeb(0x400 | 0x00 | (port & 3), val, priv);
             break;
+        case 0x06ec:
+        case 0x06ed:
+        case 0x06ee:
+        case 0x06ef:
+            mach64_ext_writeb(0x400 | 0x04 | (port & 3), val, priv);
+            break;
         case 0x0aec:
         case 0x0aed:
         case 0x0aee:
@@ -3695,9 +3824,23 @@ mach64_ext_outb(uint16_t port, uint8_t val, void *priv)
         case 0x5eee:
         case 0x5eef:
             if (mach64->type == MACH64_GX)
-                ati68860_ramdac_out((port & 3) | ((mach64->dac_cntl & 3) << 2), val, mach64->svga.ramdac, &mach64->svga);
-            else
-                ati68860_ramdac_out(port & 3, val, mach64->svga.ramdac, &mach64->svga);
+                ati68860_ramdac_out((port & 3) | ((mach64->dac_cntl & 3) << 2), val, 0, svga->ramdac, svga);
+            else {
+                switch (port & 3) {
+                    case 0:
+                        svga_out(0x3c8, val, svga);
+                        break;
+                    case 1:
+                        svga_out(0x3c9, val, svga);
+                        break;
+                    case 2:
+                        svga_out(0x3c6, val, svga);
+                        break;
+                    case 3:
+                        svga_out(0x3c7, val, svga);
+                        break;
+                }
+            }
             break;
 
         case 0x62ec:
@@ -3719,6 +3862,9 @@ mach64_ext_outb(uint16_t port, uint8_t val, void *priv)
         case 0x6aee:
         case 0x6aef:
             WRITE8(port, mach64->config_cntl, val);
+            if (mach64->vlb)
+                mach64->linear_base = (mach64->config_cntl & 0x3ff0) << 18;
+
             mach64_updatemapping(mach64);
             break;
 
@@ -3730,23 +3876,15 @@ void
 mach64_ext_outw(uint16_t port, uint16_t val, void *priv)
 {
     mach64_log("mach64_ext_outw : port %04X val %04X\n", port, val);
-    switch (port) {
-        default:
-            mach64_ext_outb(port, val, priv);
-            mach64_ext_outb(port + 1, val >> 8, priv);
-            break;
-    }
+    mach64_ext_outb(port, val, priv);
+    mach64_ext_outb(port + 1, val >> 8, priv);
 }
 void
 mach64_ext_outl(uint16_t port, uint32_t val, void *priv)
 {
     mach64_log("mach64_ext_outl : port %04X val %08X\n", port, val);
-    switch (port) {
-        default:
-            mach64_ext_outw(port, val, priv);
-            mach64_ext_outw(port + 2, val >> 16, priv);
-            break;
-    }
+    mach64_ext_outw(port, val, priv);
+    mach64_ext_outw(port + 2, val >> 16, priv);
 }
 
 static uint8_t
@@ -3818,8 +3956,7 @@ mach64_writew(uint32_t addr, uint16_t val, void *priv)
 {
     mach64_t *mach64 = (mach64_t *) priv;
     svga_t   *svga   = &mach64->svga;
-
-    addr = (addr & 0x7fff) + mach64->bank_w[(addr >> 15) & 1];
+    addr             = (addr & 0x7fff) + mach64->bank_w[(addr >> 15) & 1];
     svga_writew_linear(addr, val, svga);
 }
 void
@@ -3827,8 +3964,7 @@ mach64_writel(uint32_t addr, uint32_t val, void *priv)
 {
     mach64_t *mach64 = (mach64_t *) priv;
     svga_t   *svga   = &mach64->svga;
-
-    addr = (addr & 0x7fff) + mach64->bank_w[(addr >> 15) & 1];
+    addr             = (addr & 0x7fff) + mach64->bank_w[(addr >> 15) & 1];
     svga_writel_linear(addr, val, svga);
 }
 
@@ -3847,18 +3983,77 @@ mach64_readw(uint32_t addr, void *priv)
 {
     mach64_t *mach64 = (mach64_t *) priv;
     svga_t   *svga   = &mach64->svga;
-
+    uint16_t  ret;
     addr = (addr & 0x7fff) + mach64->bank_r[(addr >> 15) & 1];
-    return svga_readw_linear(addr, svga);
+    ret  = svga_readw_linear(addr, svga);
+    return ret;
 }
 uint32_t
 mach64_readl(uint32_t addr, void *priv)
 {
     mach64_t *mach64 = (mach64_t *) priv;
     svga_t   *svga   = &mach64->svga;
-
+    uint32_t  ret;
     addr = (addr & 0x7fff) + mach64->bank_r[(addr >> 15) & 1];
-    return svga_readl_linear(addr, svga);
+    ret  = svga_readl_linear(addr, svga);
+    return ret;
+}
+
+void
+mach64_int_hwcursor_draw(svga_t *svga, int displine)
+{
+    const mach64_t          *mach64 = (mach64_t *) svga->priv;
+    int                      comb;
+    int                      offset;
+    int                      x_pos;
+    int                      y_pos;
+    int                      shift = 0;
+    uint16_t                 dat;
+    uint32_t                 col0 = makecol32((mach64->cur_clr0 >> 24) & 0xff, (mach64->cur_clr0 >> 16) & 0xff, (mach64->cur_clr0 >> 8) & 0xff);
+    uint32_t                 col1 = makecol32((mach64->cur_clr1 >> 24) & 0xff, (mach64->cur_clr1 >> 16) & 0xff, (mach64->cur_clr1 >> 8) & 0xff);
+    uint32_t                *p;
+
+    offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff;
+    if (svga->packed_4bpp)
+        shift = 1;
+
+    for (int x = 0; x < svga->hwcursor_latch.cur_xsize; x += (8 >> shift)) {
+        if (shift) {
+            dat = svga->vram[(svga->hwcursor_latch.addr) & svga->vram_mask] & 0x0f;
+            dat |= (svga->vram[(svga->hwcursor_latch.addr + 1) & svga->vram_mask] << 4);
+            dat |= (svga->vram[(svga->hwcursor_latch.addr + 2) & svga->vram_mask] << 8);
+            dat |= (svga->vram[(svga->hwcursor_latch.addr + 3) & svga->vram_mask] << 12);
+        } else {
+            dat = svga->vram[svga->hwcursor_latch.addr & svga->vram_mask];
+            dat |= (svga->vram[(svga->hwcursor_latch.addr + 1) & svga->vram_mask] << 8);
+        }
+        for (int xx = 0; xx < (8 >> shift); xx++) {
+            comb = (dat >> (xx << 1)) & 0x03;
+
+            y_pos = displine;
+            x_pos = offset + svga->x_add;
+            p     = buffer32->line[y_pos];
+
+            if (offset >= svga->hwcursor_latch.x) {
+                switch (comb) {
+                    case 0:
+                        p[x_pos] = col0;
+                        break;
+                    case 1:
+                        p[x_pos] = col1;
+                        break;
+                    case 3:
+                        p[x_pos] ^= 0xffffff;
+                        break;
+
+                    default:
+                        break;
+                }
+            }
+            offset++;
+        }
+        svga->hwcursor_latch.addr += 2;
+    }
 }
 
 #define CLAMP(x)                      \
@@ -4202,16 +4397,34 @@ mach64_io_remove(mach64_t *mach64)
 static void
 mach64_io_set(mach64_t *mach64)
 {
+    uint16_t io_base = 0x02ec;
+
     mach64_io_remove(mach64);
 
+    switch (mach64->io_base) {
+        default:
+        case 0:
+            io_base = 0x02ec;
+            break;
+        case 1:
+            io_base = 0x01cc;
+            break;
+        case 2:
+            io_base = 0x01c8;
+            break;
+        case 3:
+            fatal("Attempting to use the reserved value for I/O Base\n");
+            return;
+    }
+
     io_sethandler(0x03c0, 0x0020, mach64_in, NULL, NULL, mach64_out, NULL, NULL, mach64);
 
     if (!mach64->use_block_decoded_io) {
         for (uint8_t c = 0; c < 8; c++) {
-            io_sethandler((c * 0x1000) + 0x2ec, 0x0004, mach64_ext_inb, mach64_ext_inw, mach64_ext_inl, mach64_ext_outb, mach64_ext_outw, mach64_ext_outl, mach64);
-            io_sethandler((c * 0x1000) + 0x6ec, 0x0004, mach64_ext_inb, mach64_ext_inw, mach64_ext_inl, mach64_ext_outb, mach64_ext_outw, mach64_ext_outl, mach64);
-            io_sethandler((c * 0x1000) + 0xaec, 0x0004, mach64_ext_inb, mach64_ext_inw, mach64_ext_inl, mach64_ext_outb, mach64_ext_outw, mach64_ext_outl, mach64);
-            io_sethandler((c * 0x1000) + 0xeec, 0x0004, mach64_ext_inb, mach64_ext_inw, mach64_ext_inl, mach64_ext_outb, mach64_ext_outw, mach64_ext_outl, mach64);
+            io_sethandler((c * 0x1000) + 0x0000 + io_base, 0x0004, mach64_ext_inb, mach64_ext_inw, mach64_ext_inl, mach64_ext_outb, mach64_ext_outw, mach64_ext_outl, mach64);
+            io_sethandler((c * 0x1000) + 0x0400 + io_base, 0x0004, mach64_ext_inb, mach64_ext_inw, mach64_ext_inl, mach64_ext_outb, mach64_ext_outw, mach64_ext_outl, mach64);
+            io_sethandler((c * 0x1000) + 0x0800 + io_base, 0x0004, mach64_ext_inb, mach64_ext_inw, mach64_ext_inl, mach64_ext_outb, mach64_ext_outw, mach64_ext_outl, mach64);
+            io_sethandler((c * 0x1000) + 0x0c00 + io_base, 0x0004, mach64_ext_inb, mach64_ext_inw, mach64_ext_inl, mach64_ext_outb, mach64_ext_outw, mach64_ext_outl, mach64);
         }
     }
 
@@ -4221,6 +4434,93 @@ mach64_io_set(mach64_t *mach64)
         io_sethandler(mach64->block_decoded_io, 0x0400, mach64_block_inb, mach64_block_inw, mach64_block_inl, mach64_block_outb, mach64_block_outw, mach64_block_outl, mach64);
 }
 
+static uint8_t
+mach64_read_linear(uint32_t addr, void *priv)
+{
+    const svga_t *svga = (svga_t *) priv;
+
+    cycles -= svga->monitor->mon_video_timing_read_b;
+
+    addr &= svga->decode_mask;
+    if (addr >= svga->vram_max)
+        return 0xff;
+
+    return svga->vram[addr & svga->vram_mask];
+}
+
+static uint16_t
+mach64_readw_linear(uint32_t addr, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+
+    cycles -= svga->monitor->mon_video_timing_read_w;
+
+    addr &= svga->decode_mask;
+    if (addr >= svga->vram_max)
+        return 0xffff;
+
+    return *(uint16_t *) &svga->vram[addr & svga->vram_mask];
+}
+
+static uint32_t
+mach64_readl_linear(uint32_t addr, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+
+    cycles -= svga->monitor->mon_video_timing_read_l;
+
+    addr &= svga->decode_mask;
+    if (addr >= svga->vram_max)
+        return 0xffffffff;
+
+    return *(uint32_t *) &svga->vram[addr & svga->vram_mask];
+}
+
+static void
+mach64_write_linear(uint32_t addr, uint8_t val, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+
+    cycles -= svga->monitor->mon_video_timing_write_b;
+
+    addr &= svga->decode_mask;
+    if (addr >= svga->vram_max)
+        return;
+    addr &= svga->vram_mask;
+    svga->changedvram[addr >> 12] = svga->monitor->mon_changeframecount;
+    svga->vram[addr]              = val;
+}
+
+static void
+mach64_writew_linear(uint32_t addr, uint16_t val, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+
+    cycles -= svga->monitor->mon_video_timing_write_w;
+
+    addr &= svga->decode_mask;
+    if (addr >= svga->vram_max)
+        return;
+    addr &= svga->vram_mask;
+    svga->changedvram[addr >> 12]   = svga->monitor->mon_changeframecount;
+    *(uint16_t *) &svga->vram[addr] = val;
+}
+
+static void
+mach64_writel_linear(uint32_t addr, uint32_t val, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+
+    cycles -= svga->monitor->mon_video_timing_write_l;
+
+    addr &= svga->decode_mask;
+    if (addr >= svga->vram_max)
+        return;
+    addr &= svga->vram_mask;
+    svga->changedvram[addr >> 12]   = svga->monitor->mon_changeframecount;
+    *(uint32_t *) &svga->vram[addr] = val;
+}
+
 uint8_t
 mach64_pci_read(UNUSED(int func), int addr, void *priv)
 {
@@ -4364,9 +4664,9 @@ mach64_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
         case 0x33:
             mach64->pci_regs[addr] = val;
             if (mach64->pci_regs[0x30] & 0x01) {
-                uint32_t addr = (mach64->pci_regs[0x32] << 16) | (mach64->pci_regs[0x33] << 24);
-                mach64_log("Mach64 bios_rom enabled at %08x\n", addr);
-                mem_mapping_set_addr(&mach64->bios_rom.mapping, addr, 0x8000);
+                uint32_t biosaddr = (mach64->pci_regs[0x32] << 16) | (mach64->pci_regs[0x33] << 24);
+                mach64_log("Mach64 bios_rom enabled at %08x\n", biosaddr);
+                mem_mapping_set_addr(&mach64->bios_rom.mapping, biosaddr, 0x8000);
             } else {
                 mach64_log("Mach64 bios_rom disabled\n");
                 mem_mapping_disable(&mach64->bios_rom.mapping);
@@ -4401,17 +4701,24 @@ mach64_common_init(const device_t *info)
 
     svga = &mach64->svga;
 
+    mach64->type = info->local & 0xff;
     mach64->vram_size = device_get_config_int("memory");
     mach64->vram_mask = (mach64->vram_size << 20) - 1;
 
-    svga_init(info, svga, mach64, mach64->vram_size << 20,
-              mach64_recalctimings,
-              mach64_in, mach64_out,
-              NULL,
-              mach64_overlay_draw);
-    svga->dac_hwcursor.cur_ysize = 64;
+    if (mach64->type > MACH64_GX)
+        svga_init(info, svga, mach64, mach64->vram_size << 20,
+                  mach64_recalctimings,
+                  mach64_in, mach64_out,
+                  mach64_int_hwcursor_draw,
+                  mach64_overlay_draw);
+    else
+        svga_init(info, svga, mach64, mach64->vram_size << 20,
+                  mach64_recalctimings,
+                  mach64_in, mach64_out,
+                  NULL,
+                  mach64_overlay_draw);
 
-    mem_mapping_add(&mach64->linear_mapping, 0, 0, svga_read_linear, svga_readw_linear, svga_readl_linear, svga_write_linear, svga_writew_linear, svga_writel_linear, NULL, MEM_MAPPING_EXTERNAL, svga);
+    mem_mapping_add(&mach64->linear_mapping, 0, 0, mach64_read_linear, mach64_readw_linear, mach64_readl_linear, mach64_write_linear, mach64_writew_linear, mach64_writel_linear, NULL, MEM_MAPPING_EXTERNAL, svga);
     mem_mapping_add(&mach64->mmio_linear_mapping, 0, 0, mach64_ext_readb, mach64_ext_readw, mach64_ext_readl, mach64_ext_writeb, mach64_ext_writew, mach64_ext_writel, NULL, MEM_MAPPING_EXTERNAL, mach64);
     mem_mapping_add(&mach64->mmio_linear_mapping_2, 0, 0, mach64_ext_readb, mach64_ext_readw, mach64_ext_readl, mach64_ext_writeb, mach64_ext_writew, mach64_ext_writel, NULL, MEM_MAPPING_EXTERNAL, mach64);
     mem_mapping_add(&mach64->mmio_mapping, 0xbc000, 0x04000, mach64_ext_readb, mach64_ext_readw, mach64_ext_readl, mach64_ext_writeb, mach64_ext_writew, mach64_ext_writel, NULL, MEM_MAPPING_EXTERNAL, mach64);
@@ -4427,13 +4734,15 @@ mach64_common_init(const device_t *info)
     mach64->pci_regs[0x32]            = 0x0c;
     mach64->pci_regs[0x33]            = 0x00;
 
-    svga->ramdac            = device_add(&ati68860_ramdac_device);
-    svga->dac_hwcursor_draw = ati68860_hwcursor_draw;
-
     svga->clock_gen = device_add(&ics2595_device);
 
     mach64->dst_cntl = 3;
 
+    mach64->thread_run = 1;
+    mach64->wake_fifo_thread = thread_create_event();
+    mach64->fifo_not_full_event = thread_create_event();
+    mach64->fifo_thread = thread_create(fifo_thread, mach64);
+
     mach64->i2c = i2c_gpio_init("ddc_ati_mach64");
     mach64->ddc = ddc_init(i2c_gpio_get_bus(mach64->i2c));
 
@@ -4444,38 +4753,41 @@ static void *
 mach64gx_init(const device_t *info)
 {
     mach64_t *mach64 = mach64_common_init(info);
+    svga_t   *svga   = &mach64->svga;
 
-    if (info->flags & DEVICE_ISA)
+    svga->ramdac            = device_add(&ati68860_ramdac_device);
+    svga->dac_hwcursor_draw = ati68860_hwcursor_draw;
+
+    svga->dac_hwcursor.cur_ysize = 64;
+    svga->dac_hwcursor.cur_xsize = 64;
+
+    if (info->flags & DEVICE_ISA16)
         video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_mach64_isa);
     else if (info->flags & DEVICE_PCI)
         video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_mach64_pci);
     else
         video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_mach64_vlb);
 
-    mach64->type           = MACH64_GX;
     mach64->pci            = !!(info->flags & DEVICE_PCI);
+    mach64->vlb            = !!(info->flags & DEVICE_VLB);
     mach64->pci_id         = 'X' | ('G' << 8);
     mach64->config_chip_id = 0x000000d7;
     mach64->dac_cntl       = 5 << 16;             /*ATI 68860 RAMDAC*/
-    mach64->config_stat0   = (5 << 9) | (3 << 3); /*ATI-68860, 256Kx16 DRAM*/
-    if (info->flags & DEVICE_PCI)
-        mach64->config_stat0 |= 0; /*PCI, 256Kx16 DRAM*/
-    else if (info->flags & DEVICE_VLB)
-        mach64->config_stat0 |= 1; /*VLB, 256Kx16 DRAM*/
-    else if (info->flags & DEVICE_ISA)
-        mach64->config_stat0 |= 7; /*ISA 16-bit, 256k16 DRAM*/
-
-    ati_eeprom_load(&mach64->eeprom, "mach64.nvr", 1);
-
-    if (info->flags & DEVICE_PCI)
+    mach64->config_stat0   = (5 << 9) | (3 << 3); /*ATI 68860, 256Kx16 DRAM*/
+    if (info->flags & DEVICE_PCI) {
+        mach64->config_stat0 |= 7; /*PCI, 256Kx16 DRAM*/
+        ati_eeprom_load(&mach64->eeprom, "mach64_pci.nvr", 1);
         rom_init(&mach64->bios_rom, BIOS_ROM_PATH, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
-    else if (info->flags & DEVICE_VLB)
-        rom_init(&mach64->bios_rom, BIOS_VLB_ROM_PATH, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
-    else if (info->flags & DEVICE_ISA)
-        rom_init(&mach64->bios_rom, BIOS_ISA_ROM_PATH, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
-
-    if (info->flags & DEVICE_PCI)
         mem_mapping_disable(&mach64->bios_rom.mapping);
+    } else if (info->flags & DEVICE_VLB) {
+        mach64->config_stat0 |= 6; /*VLB, 256Kx16 DRAM*/
+        ati_eeprom_load(&mach64->eeprom, "mach64_vlb.nvr", 1);
+        rom_init(&mach64->bios_rom, BIOS_VLB_ROM_PATH, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
+    } else if (info->flags & DEVICE_ISA16) {
+        mach64->config_stat0 |= 0; /*ISA 16-bit, 256k16 DRAM*/
+        ati_eeprom_load(&mach64->eeprom, "mach64.nvr", 1);
+        rom_init(&mach64->bios_rom, BIOS_ISA_ROM_PATH, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
+    }
 
     return mach64;
 }
@@ -4485,10 +4797,15 @@ mach64vt2_init(const device_t *info)
     mach64_t *mach64 = mach64_common_init(info);
     svga_t   *svga   = &mach64->svga;
 
+    svga->dac_hwcursor_draw = NULL;
+
+    svga->hwcursor.cur_ysize = 64;
+    svga->hwcursor.cur_xsize = 64;
+
     video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_mach64_pci);
 
-    mach64->type                 = MACH64_VT2;
     mach64->pci                  = 1;
+    mach64->vlb                  = 0;
     mach64->pci_id               = 0x5654;
     mach64->config_chip_id       = 0x40005654;
     mach64->dac_cntl             = 1 << 16; /*Internal 24-bit DAC*/
@@ -4532,6 +4849,12 @@ mach64_close(void *priv)
 {
     mach64_t *mach64 = (mach64_t *) priv;
 
+    mach64->thread_run = 0;
+    thread_set_event(mach64->wake_fifo_thread);
+    thread_wait(mach64->fifo_thread);
+    thread_destroy_event(mach64->fifo_not_full_event);
+    thread_destroy_event(mach64->wake_fifo_thread);
+
     svga_close(&mach64->svga);
 
     ddc_close(mach64->ddc);
@@ -4559,68 +4882,53 @@ mach64_force_redraw(void *priv)
 // clang-format off
 static const device_config_t mach64gx_config[] = {
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 4,
-        .selection = {
-            {
-                .description = "1 MB",
-                .value = 1
-            },
-            {
-                .description = "2 MB",
-                .value = 2
-            },
-            {
-                .description = "4 MB",
-                .value = 4
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 4,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "1 MB", .value = 1 },
+            { .description = "2 MB", .value = 2 },
+            { .description = "4 MB", .value = 4 },
+            { .description = ""                 }
+        },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t mach64vt2_config[] = {
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 4,
-        .selection = {
-            {
-                .description = "2 MB",
-                .value = 2
-            },
-            {
-                .description = "4 MB",
-                .value = 4
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 4,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "2 MB", .value = 2 },
+            { .description = "4 MB", .value = 4 },
+            { .description = ""                 }
+        },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 // clang-format on
 
 const device_t mach64gx_isa_device = {
     .name          = "ATI Mach64GX ISA",
     .internal_name = "mach64gx_isa",
-    .flags         = DEVICE_AT | DEVICE_ISA,
-    .local         = 0,
+    .flags         = DEVICE_ISA16,
+    .local         = MACH64_GX,
     .init          = mach64gx_init,
     .close         = mach64_close,
     .reset         = NULL,
-    { .available = mach64gx_isa_available },
+    .available     = mach64gx_isa_available,
     .speed_changed = mach64_speed_changed,
     .force_redraw  = mach64_force_redraw,
     .config        = mach64gx_config
@@ -4630,11 +4938,11 @@ const device_t mach64gx_vlb_device = {
     .name          = "ATI Mach64GX VLB",
     .internal_name = "mach64gx_vlb",
     .flags         = DEVICE_VLB,
-    .local         = 0,
+    .local         = MACH64_GX,
     .init          = mach64gx_init,
     .close         = mach64_close,
     .reset         = NULL,
-    { .available = mach64gx_vlb_available },
+    .available     = mach64gx_vlb_available,
     .speed_changed = mach64_speed_changed,
     .force_redraw  = mach64_force_redraw,
     .config        = mach64gx_config
@@ -4644,11 +4952,11 @@ const device_t mach64gx_pci_device = {
     .name          = "ATI Mach64GX PCI",
     .internal_name = "mach64gx_pci",
     .flags         = DEVICE_PCI,
-    .local         = 0,
+    .local         = MACH64_GX,
     .init          = mach64gx_init,
     .close         = mach64_close,
     .reset         = NULL,
-    { .available = mach64gx_available },
+    .available     = mach64gx_available,
     .speed_changed = mach64_speed_changed,
     .force_redraw  = mach64_force_redraw,
     .config        = mach64gx_config
@@ -4658,11 +4966,11 @@ const device_t mach64vt2_device = {
     .name          = "ATI Mach64VT2",
     .internal_name = "mach64vt2",
     .flags         = DEVICE_PCI,
-    .local         = 0,
+    .local         = MACH64_VT2,
     .init          = mach64vt2_init,
     .close         = mach64_close,
     .reset         = NULL,
-    { .available = mach64vt2_available },
+    .available     = mach64vt2_available,
     .speed_changed = mach64_speed_changed,
     .force_redraw  = mach64_force_redraw,
     .config        = mach64vt2_config
diff --git a/src/video/vid_ati_mach8.c b/src/video/vid_ati_mach8.c
index 5628e149a..24293ab1d 100644
--- a/src/video/vid_ati_mach8.c
+++ b/src/video/vid_ati_mach8.c
@@ -15,6 +15,7 @@
  *
  *          Copyright 2022-2024 TheCollector1995.
  */
+#include <inttypes.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -27,6 +28,7 @@
 #include <86box/device.h>
 #include <86box/io.h>
 #include <86box/mem.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/mca.h>
 #include <86box/pci.h>
@@ -37,6 +39,7 @@
 #include <86box/i2c.h>
 #include <86box/vid_ddc.h>
 #include <86box/vid_8514a.h>
+#include <86box/vid_xga.h>
 #include <86box/vid_svga.h>
 #include <86box/vid_svga_render.h>
 #include <86box/vid_ati_eeprom.h>
@@ -48,28 +51,31 @@
 #define BIOS_MACH32_MCA_ROM_PATH "roms/video/mach32/MACH32MCA_Olivetti.BIN"
 #define BIOS_MACH32_PCI_ROM_PATH "roms/video/mach32/intelopt_00000.rom"
 
-static video_timings_t timing_gfxultra_isa = { .type = VIDEO_ISA, .write_b = 3, .write_w = 3, .write_l = 6, .read_b = 5, .read_w = 5, .read_l = 10 };
-static video_timings_t timing_mach32_vlb   = { .type = VIDEO_BUS, .write_b = 2, .write_w = 2, .write_l = 1, .read_b = 20, .read_w = 20, .read_l = 21 };
-static video_timings_t timing_mach32_mca   = { .type = VIDEO_MCA, .write_b = 4, .write_w = 5, .write_l = 10, .read_b = 5, .read_w = 5, .read_l = 10 };
-static video_timings_t timing_mach32_pci   = { .type = VIDEO_PCI, .write_b = 2, .write_w = 2, .write_l = 1, .read_b = 20, .read_w = 20, .read_l = 21 };
+static video_timings_t timing_gfxultra_isa = { .type = VIDEO_ISA, .write_b = 3, .write_w = 3, .write_l =  6, .read_b =  5, .read_w =  5, .read_l = 10 };
+static video_timings_t timing_mach32_vlb   = { .type = VIDEO_BUS, .write_b = 2, .write_w = 2, .write_l =  1, .read_b = 20, .read_w = 20, .read_l = 21 };
+static video_timings_t timing_mach32_mca   = { .type = VIDEO_MCA, .write_b = 4, .write_w = 5, .write_l = 10, .read_b =  5, .read_w =  5, .read_l = 10 };
+static video_timings_t timing_mach32_pci   = { .type = VIDEO_PCI, .write_b = 2, .write_w = 2, .write_l =  1, .read_b = 20, .read_w = 20, .read_l = 21 };
 
 static void     mach_accel_outb(uint16_t port, uint8_t val, void *priv);
 static void     mach_accel_outw(uint16_t port, uint16_t val, void *priv);
+static void     mach_accel_outl(uint16_t port, uint32_t val, void *priv);
 static uint8_t  mach_accel_inb(uint16_t port, void *priv);
 static uint16_t mach_accel_inw(uint16_t port, void *priv);
-static uint8_t  mach_in(uint16_t addr, void *priv);
+static uint32_t mach_accel_inl(uint16_t port, void *priv);
 
-#ifdef ATI_8514_ULTRA
 static void     ati8514_accel_outb(uint16_t port, uint8_t val, void *priv);
 static void     ati8514_accel_outw(uint16_t port, uint16_t val, void *priv);
 static void     ati8514_accel_outl(uint16_t port, uint32_t val, void *priv);
 static uint8_t  ati8514_accel_inb(uint16_t port, void *priv);
 static uint16_t ati8514_accel_inw(uint16_t port, void *priv);
 static uint32_t ati8514_accel_inl(uint16_t port, void *priv);
-#endif
-
 
+static void mach_set_resolution(mach_t *mach, svga_t *svga);
 static void mach32_updatemapping(mach_t *mach, svga_t *svga);
+static __inline void mach32_writew_linear(uint32_t addr, uint16_t val, mach_t *mach);
+static __inline void mach32_write_common(uint32_t addr, uint8_t val, int linear, mach_t *mach, svga_t *svga);
+
+static mach_t *reset_state = NULL;
 
 #ifdef ENABLE_MACH_LOG
 int mach_do_log = ENABLE_MACH_LOG;
@@ -89,14 +95,14 @@ mach_log(const char *fmt, ...)
 #    define mach_log(fmt, ...)
 #endif
 
-#define WRITE8(addr, var, val)                        \
-    switch ((addr) & 1) {                             \
-        case 0:                                       \
-            var = (var & 0xff00) | (val);             \
-            break;                                    \
-        case 1:                                       \
-            var = (var & 0x00ff) | ((val) << 8);      \
-            break;                                    \
+#define WRITE8(addr, var, val)                   \
+    switch ((addr) & 1) {                        \
+        case 0:                                  \
+            var = (var & 0xff00) | (val);        \
+            break;                               \
+        case 1:                                  \
+            var = (var & 0x00ff) | ((val) << 8); \
+            break;                               \
     }
 
 #define READ8(addr, var)                \
@@ -111,162 +117,160 @@ mach_log(const char *fmt, ...)
 
 #define READ_PIXTRANS_BYTE_IO(cx, n) \
     if ((mach->accel.cmd_type == 2) || (mach->accel.cmd_type == 5)) { \
-        if (dev->bpp) { \
-            if (n == 0) \
+        if (dev->bpp) {                                                                                             \
+            if (n == 0)                                                                                             \
                 mach->accel.pix_trans[(n)] = vram_w[(dev->accel.dest + (cx) + (n)) & (dev->vram_mask >> 1)] & 0xff; \
-            else \
-                mach->accel.pix_trans[(n)] = vram_w[(dev->accel.dest + (cx) + (n)) & (dev->vram_mask >> 1)] >> 8; \
-        } else { \
-            mach->accel.pix_trans[(n)] = dev->vram[(dev->accel.dest + (cx) + (n)) & dev->vram_mask]; \
-        } \
+            else                                                                                                    \
+                mach->accel.pix_trans[(n)] = vram_w[(dev->accel.dest + (cx) + (n)) & (dev->vram_mask >> 1)] >> 8;   \
+        } else                                                                                                      \
+            mach->accel.pix_trans[(n)] = dev->vram[(dev->accel.dest + (cx) + (n)) & dev->vram_mask];                \
     }
 
-#define READ_PIXTRANS_WORD(cx, n)                                                                    \
-    if ((cmd == 0) || (cmd == 1) || (cmd == 5) || (mach->accel.cmd_type == -1)) { \
-        if (dev->bpp) \
-            temp = vram_w[((dev->accel.cy * dev->pitch) + (cx) + (n)) & (dev->vram_mask >> 1)];             \
-        else { \
-            temp = dev->vram[((dev->accel.cy * dev->pitch) + (cx) + (n)) & dev->vram_mask];             \
-            temp |= (dev->vram[((dev->accel.cy * dev->pitch) + (cx) + (n + 1)) & dev->vram_mask] << 8); \
-        } \
-    } else if ((mach->accel.cmd_type == 2) || (mach->accel.cmd_type == 5)) { \
-        if (dev->bpp) \
-            temp = vram_w[((dev->accel.dest) + (cx) + (n)) & (dev->vram_mask >> 1)];                           \
-        else { \
-            temp = dev->vram[((dev->accel.dest) + (cx) + (n)) & dev->vram_mask];                           \
-            temp |= (dev->vram[((dev->accel.dest) + (cx) + (n + 1)) & dev->vram_mask] << 8);               \
-        } \
-    } else if ((mach->accel.cmd_type == 3) || (mach->accel.cmd_type == 4)) { \
-        if (dev->bpp) \
-            temp = vram_w[((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (cx) + (n)) & (dev->vram_mask >> 1)]; \
-        else { \
-            temp = dev->vram[((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (cx) + (n)) & dev->vram_mask]; \
-            temp |= (dev->vram[((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (cx) + (n + 1)) & dev->vram_mask] << 8); \
-        } \
+#define READ_PIXTRANS_WORD(cx, n)                                                                                                          \
+    if ((cmd == 0) || (cmd == 1) || (cmd == 5) || ((mach->accel.cmd_type == -1) && (cmd != 2))) {                                                          \
+        if (dev->bpp)                                                                                                                      \
+            temp = vram_w[((dev->accel.cy * dev->pitch) + (cx) + (n)) & (dev->vram_mask >> 1)];                                            \
+        else {                                                                                                                             \
+            temp = dev->vram[((dev->accel.cy * dev->pitch) + (cx) + (n)) & dev->vram_mask];                                                \
+            temp |= (dev->vram[((dev->accel.cy * dev->pitch) + (cx) + (n + 1)) & dev->vram_mask] << 8);                                    \
+        }                                                                                                                                  \
+    } else if (((cmd == 2) && (mach->accel.cmd_type == -1)) || (mach->accel.cmd_type == 2) || (mach->accel.cmd_type == 5)) {                                                               \
+        if (dev->bpp)                                                                                                                      \
+            temp = vram_w[((dev->accel.dest) + (cx) + (n)) & (dev->vram_mask >> 1)];                                                       \
+        else {                                                                                                                             \
+            temp = dev->vram[((dev->accel.dest) + (cx) + (n)) & dev->vram_mask];                                                           \
+            temp |= (dev->vram[((dev->accel.dest) + (cx) + (n + 1)) & dev->vram_mask] << 8);                                               \
+        }                                                                                                                                  \
+    } else if ((mach->accel.cmd_type == 3) || (mach->accel.cmd_type == 4)) {                                                               \
+        if (dev->bpp)                                                                                                                      \
+            temp = vram_w[(mach->accel.dst_ge_offset + ((dev->accel.cy) * (mach->accel.dst_pitch)) + (cx) + (n)) & (dev->vram_mask >> 1)];         \
+        else {                                                                                                                             \
+            temp = dev->vram[(mach->accel.dst_ge_offset + ((dev->accel.cy) * (mach->accel.dst_pitch)) + (cx) + (n)) & dev->vram_mask];             \
+            temp |= (dev->vram[(mach->accel.dst_ge_offset + ((dev->accel.cy) * (mach->accel.dst_pitch)) + (cx) + (n + 1)) & dev->vram_mask] << 8); \
+        }                                                                                                                                  \
     }
 
-#define READ(addr, dat) \
-        if (dev->bpp) \
-            dat = vram_w[(addr) & (dev->vram_mask >> 1)]; \
-        else \
-            dat = dev->vram[(addr) & (dev->vram_mask)];
+#define READ(addr, dat)                               \
+    if (dev->bpp)                                     \
+        dat = vram_w[(addr) & (dev->vram_mask >> 1)]; \
+    else                                              \
+        dat = (dev->vram[(addr) & (dev->vram_mask)]);
 
-#define MIX(mixmode, dest_dat, src_dat)                                                       \
-    {                                                                                         \
-        switch ((mixmode) ? (dev->accel.frgd_mix & 0x1f) : (dev->accel.bkgd_mix & 0x1f)) {    \
-            case 0x00:                                                                        \
-                dest_dat = ~dest_dat;                                                         \
-                break;                                                                        \
-            case 0x01:                                                                        \
-                dest_dat = 0;                                                                 \
-                break;                                                                        \
-            case 0x02:                                                                        \
-                dest_dat = ~0;                                                                \
-                break;                                                                        \
-            case 0x03:                                                                        \
-                dest_dat = dest_dat;                                                          \
-                break;                                                                        \
-            case 0x04:                                                                        \
-                dest_dat = ~src_dat;                                                          \
-                break;                                                                        \
-            case 0x05:                                                                        \
-                dest_dat = src_dat ^ dest_dat;                                                \
-                break;                                                                        \
-            case 0x06:                                                                        \
-                dest_dat = ~(src_dat ^ dest_dat);                                             \
-                break;                                                                        \
-            case 0x07:                                                                        \
-                dest_dat = src_dat;                                                           \
-                break;                                                                        \
-            case 0x08:                                                                        \
-                dest_dat = ~(src_dat & dest_dat);                                             \
-                break;                                                                        \
-            case 0x09:                                                                        \
-                dest_dat = ~src_dat | dest_dat;                                               \
-                break;                                                                        \
-            case 0x0a:                                                                        \
-                dest_dat = src_dat | ~dest_dat;                                               \
-                break;                                                                        \
-            case 0x0b:                                                                        \
-                dest_dat = src_dat | dest_dat;                                                \
-                break;                                                                        \
-            case 0x0c:                                                                        \
-                dest_dat = src_dat & dest_dat;                                                \
-                break;                                                                        \
-            case 0x0d:                                                                        \
-                dest_dat = src_dat & ~dest_dat;                                               \
-                break;                                                                        \
-            case 0x0e:                                                                        \
-                dest_dat = ~src_dat & dest_dat;                                               \
-                break;                                                                        \
-            case 0x0f:                                                                        \
-                dest_dat = ~(src_dat | dest_dat);                                             \
-                break;                                                                        \
-            case 0x10:                                                                        \
-                dest_dat = MIN(src_dat, dest_dat);                                            \
-                break;                                                                        \
-            case 0x11:                                                                        \
-                dest_dat = dest_dat - src_dat;                                                \
-                break;                                                                        \
-            case 0x12:                                                                        \
-                dest_dat = src_dat - dest_dat;                                                \
-                break;                                                                        \
-            case 0x13:                                                                        \
-                dest_dat = src_dat + dest_dat;                                                \
-                break;                                                                        \
-            case 0x14:                                                                        \
-                dest_dat = MAX(src_dat, dest_dat);                                            \
-                break;                                                                        \
-            case 0x15:                                                                        \
-                dest_dat = (dest_dat - src_dat) / 2;                                          \
-                break;                                                                        \
-            case 0x16:                                                                        \
-                dest_dat = (src_dat - dest_dat) / 2;                                          \
-                break;                                                                        \
-            case 0x17:                                                                        \
-                dest_dat = (dest_dat + src_dat) / 2;                                          \
-                break;                                                                        \
-            case 0x18:                                                                        \
-                dest_dat = MAX(0, (dest_dat - src_dat));                                      \
-                break;                                                                        \
-            case 0x19:                                                                        \
-                dest_dat = MAX(0, (dest_dat - src_dat));                                      \
-                break;                                                                        \
-            case 0x1a:                                                                        \
-                dest_dat = MAX(0, (src_dat - dest_dat));                                      \
-                break;                                                                        \
-            case 0x1b:                                                                        \
-                dest_dat = MIN(0xff, (dest_dat + src_dat));                                   \
-                break;                                                                        \
-            case 0x1c:                                                                        \
-                dest_dat = MAX(0, (dest_dat - src_dat)) / 2;                                  \
-                break;                                                                        \
-            case 0x1d:                                                                        \
-                dest_dat = MAX(0, (dest_dat - src_dat)) / 2;                                  \
-                break;                                                                        \
-            case 0x1e:                                                                        \
-                dest_dat = MAX(0, (src_dat - dest_dat)) / 2;                                  \
-                break;                                                                        \
-            case 0x1f:                                                                        \
-                dest_dat = (0xff < (src_dat + dest_dat)) ? 0xff : ((src_dat + dest_dat) / 2); \
-                break;                                                                        \
-        }                                                                                     \
+#define READ_HIGH(addr, dat)                            \
+    dat |= (dev->vram[(addr) & (dev->vram_mask)] << 8);
+
+#define MIX(mixmode, dest_dat, src_dat)                                                               \
+    {                                                                                                 \
+        switch ((mixmode) ? dev->accel.frgd_mix : dev->accel.bkgd_mix) {                              \
+            case 0x00:                                                                                \
+                dest_dat = ~dest_dat;                                                                 \
+                break;                                                                                \
+            case 0x01:                                                                                \
+                dest_dat = 0;                                                                         \
+                break;                                                                                \
+            case 0x02:                                                                                \
+                dest_dat = ~0;                                                                        \
+                break;                                                                                \
+            case 0x03:                                                                                \
+                dest_dat = dest_dat;                                                                  \
+                break;                                                                                \
+            case 0x04:                                                                                \
+                dest_dat = ~src_dat;                                                                  \
+                break;                                                                                \
+            case 0x05:                                                                                \
+                dest_dat = src_dat ^ dest_dat;                                                        \
+                break;                                                                                \
+            case 0x06:                                                                                \
+                dest_dat = ~(src_dat ^ dest_dat);                                                     \
+                break;                                                                                \
+            case 0x07:                                                                                \
+                dest_dat = src_dat;                                                                   \
+                break;                                                                                \
+            case 0x08:                                                                                \
+                dest_dat = ~(src_dat & dest_dat);                                                     \
+                break;                                                                                \
+            case 0x09:                                                                                \
+            case 0x11:                                                                                \
+                dest_dat = ~src_dat | dest_dat;                                                       \
+                break;                                                                                \
+            case 0x0a:                                                                                \
+            case 0x12:                                                                                \
+                dest_dat = src_dat | ~dest_dat;                                                       \
+                break;                                                                                \
+            case 0x0b:                                                                                \
+            case 0x13:                                                                                \
+                dest_dat = src_dat | dest_dat;                                                        \
+                break;                                                                                \
+            case 0x0c:                                                                                \
+                dest_dat = src_dat & dest_dat;                                                        \
+                break;                                                                                \
+            case 0x0d:                                                                                \
+                dest_dat = src_dat & ~dest_dat;                                                       \
+                break;                                                                                \
+            case 0x0e:                                                                                \
+                dest_dat = ~src_dat & dest_dat;                                                       \
+                break;                                                                                \
+            case 0x0f:                                                                                \
+                dest_dat = ~(src_dat | dest_dat);                                                     \
+                break;                                                                                \
+            case 0x10:                                                                                \
+                dest_dat = MIN(src_dat, dest_dat);                                                    \
+                break;                                                                                \
+            case 0x14:                                                                                \
+                dest_dat = MAX(src_dat, dest_dat);                                                    \
+                break;                                                                                \
+            case 0x15:                                                                                \
+                dest_dat = (src_dat | ~dest_dat) >> 1;                                                \
+                break;                                                                                \
+            case 0x16:                                                                                \
+                dest_dat = (~src_dat | dest_dat) >> 1;                                                \
+                break;                                                                                \
+            case 0x17:                                                                                \
+                dest_dat = (src_dat | dest_dat) >> 1;                                                 \
+                break;                                                                                \
+            case 0x18:                                                                                \
+            case 0x19:                                                                                \
+                dest_dat = MAX(0, ~src_dat | dest_dat);                                               \
+                break;                                                                                \
+            case 0x1a:                                                                                \
+                dest_dat = MAX(0, src_dat | ~dest_dat);                                               \
+                break;                                                                                \
+            case 0x1b:                                                                                \
+                if (dev->bpp)                                                                         \
+                    dest_dat = MIN(0xffff, src_dat | dest_dat);                                       \
+                else                                                                                  \
+                    dest_dat = MIN(0xff, src_dat | dest_dat);                                         \
+                break;                                                                                \
+            case 0x1c:                                                                                \
+            case 0x1d:                                                                                \
+                dest_dat = MAX(0, ~src_dat | dest_dat) >> 1;                                          \
+                break;                                                                                \
+            case 0x1e:                                                                                \
+                dest_dat = MAX(0, src_dat | ~dest_dat) >> 1;                                          \
+                break;                                                                                \
+            case 0x1f:                                                                                \
+                if (dev->bpp)                                                                         \
+                    dest_dat = (0xffff < (src_dat | dest_dat)) ? 0xffff : ((src_dat | dest_dat) >> 1); \
+                else                                                                                  \
+                    dest_dat = (0xff < (src_dat | dest_dat)) ? 0xff : ((src_dat | dest_dat) >> 1);    \
+                break;                                                                                \
+        }                                                                                             \
     }
 
 
-#define WRITE(addr, dat)                                         \
-    if (dev->bpp) { \
-        vram_w[((addr)) & (dev->vram_mask >> 1)]                = dat; \
-        dev->changedvram[(((addr)) & (dev->vram_mask >> 1)) >> 11] = changeframecount; \
-    } else { \
-        dev->vram[((addr)) & (dev->vram_mask)]                = dat; \
-        dev->changedvram[(((addr)) & (dev->vram_mask)) >> 12] = changeframecount; \
+#define WRITE(addr, dat)                                                               \
+    if (dev->bpp) {                                                                    \
+        vram_w[((addr)) & (dev->vram_mask >> 1)]                    = dat;             \
+        dev->changedvram[(((addr)) & (dev->vram_mask >> 1)) >> 11] = svga->monitor->mon_changeframecount; \
+    } else {                                                                           \
+        dev->vram[((addr)) & (dev->vram_mask)]                = dat;                   \
+        dev->changedvram[(((addr)) & (dev->vram_mask)) >> 12] = svga->monitor->mon_changeframecount;      \
     }
 
 static int
 mach_pixel_write(mach_t *mach)
 {
-    if (mach->accel.dp_config & 1)
+    if (mach->accel.dp_config & 0x01)
         return 1;
 
     return 0;
@@ -275,20 +279,22 @@ mach_pixel_write(mach_t *mach)
 static int
 mach_pixel_read(mach_t *mach)
 {
-    if (mach->accel.dp_config & 1)
+    if (mach->accel.dp_config & 0x01)
         return 0;
 
     return 1;
 }
 
 static void
-mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint32_t cpu_dat, mach_t *mach, ibm8514_t *dev)
+mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint32_t cpu_dat, UNUSED(svga_t *svga), mach_t *mach, ibm8514_t *dev)
 {
     int           compare_mode;
     uint16_t      poly_src     = 0;
     uint16_t      rd_mask      = dev->accel.rd_mask;
     uint16_t      wrt_mask     = dev->accel.wrt_mask;
     uint16_t      dest_cmp_clr = dev->accel.color_cmp;
+    uint16_t      frgd_color   = dev->accel.frgd_color;
+    uint16_t      bkgd_color   = dev->accel.bkgd_color;
     int           frgd_sel;
     int           bkgd_sel;
     int           mono_src;
@@ -298,16 +304,23 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
     uint16_t      old_dest_dat;
     uint16_t     *vram_w    = (uint16_t *) dev->vram;
     uint16_t      mix       = 0;
-    int16_t       clip_l    = dev->accel.clip_left & 0x7ff;
-    int16_t       clip_t    = dev->accel.clip_top & 0x7ff;
-    int16_t       clip_r    = dev->accel.multifunc[4] & 0x7ff;
-    int16_t       clip_b    = dev->accel.multifunc[3] & 0x7ff;
     uint32_t      mono_dat0 = 0;
     uint32_t      mono_dat1 = 0;
+    int16_t       clip_t    = dev->accel.clip_top;
+    int16_t       clip_l    = dev->accel.clip_left;
+    int16_t       clip_b    = dev->accel.clip_bottom;
+    int16_t       clip_r    = dev->accel.clip_right;
+
+    if (clip_l < 0)
+        clip_l = 0;
+    if (clip_t < 0)
+        clip_t = 0;
 
     if (!dev->bpp) {
         rd_mask &= 0xff;
         dest_cmp_clr &= 0xff;
+        frgd_color &= 0xff;
+        bkgd_color &= 0xff;
     }
 
     compare_mode = (mach->accel.dest_cmp_fn >> 3) & 7;
@@ -315,26 +328,14 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
     bkgd_sel     = (mach->accel.dp_config >> 7) & 3;
     mono_src     = (mach->accel.dp_config >> 5) & 3;
 
-    mach->accel.ge_offset = (mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16));
-
-    if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach)) {
-        mach->force_busy  = 1;
-        dev->force_busy   = 1;
-        dev->force_busy2  = 1;
-    }
-
     if (cpu_input) {
         if (dev->bpp) {
-            if ((mach->accel.dp_config & 0x200) && (count == 2)) {
+            if ((mach->accel.dp_config & 0x200) && (count == 2))
                 count >>= 1;
-            }
         }
     }
 
-    if ((dev->accel_bpp == 8) || (dev->accel_bpp == 15) || (dev->accel_bpp == 16) || (dev->accel_bpp == 24)) {
-        if (cpu_input && (cmd_type == 2))
-            mach_log("RdMask=%04x, DPCONFIG=%04x, Clipping: l=%d, r=%d, t=%d, b=%d, LineDrawOpt=%04x, BPP=%d, CMDType = %d, offs=%08x, cnt = %d, input = %d, mono_src = %d, frgdsel = %d, d(%d,%d), dstxend = %d, pitch = %d, extcrt = %d, rw = %x, monpattern = %x.\n", rd_mask, mach->accel.dp_config, clip_l, clip_r, clip_t, clip_b, mach->accel.linedraw_opt, dev->accel_bpp, cmd_type, mach->accel.ge_offset, count, cpu_input, mono_src, frgd_sel, dev->accel.cur_x, dev->accel.cur_y, mach->accel.dest_x_end, dev->ext_pitch, dev->ext_crt_pitch, mach->accel.dp_config & 1, mach->accel.mono_pattern_enable);
-    }
+    mach_log("cmd_type = %i, frgd_sel = %i, bkgd_sel = %i, mono_src = %i, dpconfig = %04x, cur_x = %d, cur_y = %d, cl = %d, cr = %d, ct = %d, cb = %d, accel_bpp = %d, pitch = %d, hicolbpp = %d, pattlen = %d.\n", cmd_type, frgd_sel, bkgd_sel, mono_src, mach->accel.dp_config, dev->accel.cur_x, dev->accel.cur_y, clip_l, clip_r, clip_t, clip_b, dev->accel_bpp, dev->pitch, dev->bpp, mach->accel.patt_len);
 
     switch (cmd_type) {
         case 1: /*Extended Raw Linedraw from bres_count register (0x96ee)*/
@@ -342,6 +343,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                 dev->accel.dx = dev->accel.cur_x;
                 if (dev->accel.cur_x >= 0x600)
                     dev->accel.dx |= ~0x5ff;
+
                 dev->accel.dy = dev->accel.cur_y;
                 if (dev->accel.cur_y >= 0x600)
                     dev->accel.dy |= ~0x5ff;
@@ -349,6 +351,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                 dev->accel.cx = dev->accel.destx_distp;
                 if (dev->accel.destx_distp >= 0x600)
                     dev->accel.cx |= ~0x5ff;
+
                 dev->accel.cy = dev->accel.desty_axstp;
                 if (dev->accel.desty_axstp >= 0x600)
                     dev->accel.cy |= ~0x5ff;
@@ -357,19 +360,27 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                 dev->accel.sx         = 0;
                 mach->accel.poly_fill = 0;
 
-                mach->accel.color_pattern_idx = ((dev->accel.cx + (dev->accel.cy << 3)) & mach->accel.patt_len);
-
                 mach->accel.stepx = (mach->accel.linedraw_opt & 0x20) ? 1 : -1;
                 mach->accel.stepy = (mach->accel.linedraw_opt & 0x80) ? 1 : -1;
 
-                mach_log("Extended bresenham, CUR(%d,%d), DEST(%d,%d), width = %d, options = %04x, dpconfig = %04x, opt_ena = %03x.\n", dev->accel.dx, dev->accel.dy, dev->accel.cx, dev->accel.cy, mach->accel.width, mach->accel.linedraw_opt, mach->accel.dp_config, mach->accel.max_waitstates & 0x100);
+                mach_log("Extended bresenham, CUR(%d,%d), DEST(%d,%d), width = %d, options = %04x, dpconfig = %04x, opt_ena = %03x.\n",
+                         dev->accel.dx, dev->accel.dy, dev->accel.cx, dev->accel.cy, mach->accel.width, mach->accel.linedraw_opt,
+                         mach->accel.dp_config, mach->accel.max_waitstates & 0x100);
 
-                if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach)) {
+                if (!dev->accel.cmd_back) {
                     if (mach_pixel_write(mach)) {
+                        mach_log("Extended Bresenham Write pixtrans.\n");
+                        dev->force_busy = 1;
+                        dev->force_busy2 = 1;
+                        mach->force_busy = 1;
                         dev->data_available  = 0;
                         dev->data_available2 = 0;
                         return;
                     } else if (mach_pixel_read(mach)) {
+                        mach_log("Extended Bresenham Read pixtrans.\n");
+                        dev->force_busy = 1;
+                        dev->force_busy2 = 1;
+                        mach->force_busy = 1;
                         dev->data_available  = 1;
                         dev->data_available2 = 1;
                         return;
@@ -377,19 +388,9 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                 }
             }
 
-            if (frgd_sel == 5) {
-                for (int x = 0; x <= mach->accel.patt_len; x++) {
-                    mach->accel.color_pattern[x] = mach->accel.patt_data[x & mach->accel.patt_len];
-                }
-
-                /*The destination coordinates should match the pattern index.*/
-                if (mach->accel.color_pattern_idx != mach->accel.patt_idx)
-                    mach->accel.color_pattern_idx = mach->accel.patt_idx;
-            }
-
             if (mono_src == 1) {
-                count               = mach->accel.width;
-                mix_dat             = mach->accel.patt_data[0x10];
+                count = mach->accel.width;
+                mix_dat = mach->accel.mono_pattern_normal[0];
                 dev->accel.temp_cnt = 8;
             }
 
@@ -404,7 +405,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                                 dev->accel.temp_cnt = 8;
                                 mix_dat >>= 8;
                             }
-                            mix = (mix_dat & 0x80);
+                            mix = !!(mix_dat & 0x80);
                             dev->accel.temp_cnt--;
                             mix_dat <<= 1;
                             mix_dat |= 1;
@@ -415,21 +416,17 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                                 mix_dat <<= 1;
                             } else {
                                 if (mach->accel.dp_config & 0x200) {
-                                    mix = mix_dat & 1;
+                                    mix = mix_dat & 0x01;
                                     mix_dat >>= 1;
                                 } else {
-                                    mix = mix_dat & 0x80;
+                                    mix = !!(mix_dat & 0x80);
                                     mix_dat <<= 1;
                                     mix_dat |= 1;
                                 }
                             }
                             break;
                         case 3:
-                            if (dev->bpp) {
-                                READ((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), mix);
-                            } else {
-                                READ((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), mix);
-                            }
+                            READ(mach->accel.src_ge_offset + (dev->accel.cy * mach->accel.src_pitch) + dev->accel.cx, mix);
                             mix = (mix & rd_mask) == rd_mask;
                             break;
 
@@ -437,13 +434,17 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                             break;
                     }
 
-                    if (((dev->accel.dx) >= clip_l) && ((dev->accel.dx) <= clip_r) && ((dev->accel.dy) >= clip_t) && ((dev->accel.dy) <= clip_b)) {
+                    if ((dev->accel.dx >= clip_l) &&
+                        (dev->accel.dx <= clip_r) &&
+                        (dev->accel.dy >= clip_t) &&
+                        (dev->accel.dy <= clip_b)) {
+                        dev->subsys_stat |= INT_GE_BSY;
                         switch (mix ? frgd_sel : bkgd_sel) {
                             case 0:
-                                src_dat = dev->accel.bkgd_color;
+                                src_dat = bkgd_color;
                                 break;
                             case 1:
-                                src_dat = dev->accel.frgd_color;
+                                src_dat = frgd_color;
                                 break;
                             case 2:
                                 src_dat = cpu_dat;
@@ -452,21 +453,16 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                                 if (mach_pixel_read(mach))
                                     src_dat = cpu_dat;
                                 else {
-                                    if (dev->bpp) {
-                                        READ((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), src_dat);
-                                    } else {
-                                        READ((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), src_dat);
-                                    }
-                                    if (mono_src == 3) {
+                                    READ(mach->accel.src_ge_offset + (dev->accel.cy * mach->accel.src_pitch) + dev->accel.cx, src_dat);
+                                    if (mono_src == 3)
                                         src_dat = (src_dat & rd_mask) == rd_mask;
-                                    }
                                 }
                                 break;
                             case 5:
-                                if (mix) {
-                                    src_dat = mach->accel.color_pattern[((dev->accel.dx) + ((dev->accel.dy) << 3)) & mach->accel.patt_len];
-                                } else
-                                    src_dat = 0;
+                                if (dev->bpp)
+                                    src_dat = mach->accel.color_pattern_hicol[mach->accel.color_pattern_idx];
+                                else
+                                    src_dat = mach->accel.color_pattern[mach->accel.color_pattern_idx];
                                 break;
 
                             default:
@@ -474,22 +470,14 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                         }
 
                         if (mach->accel.linedraw_opt & 0x02) {
-                            if (dev->bpp) {
-                                READ((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), poly_src);
-                            } else {
-                                READ((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), poly_src);
-                            }
+                            READ(mach->accel.src_ge_offset + (dev->accel.cy * mach->accel.src_pitch) + dev->accel.cx, poly_src);
                             poly_src = ((poly_src & rd_mask) == rd_mask);
                             if (poly_src)
                                 mach->accel.poly_fill = !mach->accel.poly_fill;
                         }
 
                         if (mach->accel.poly_fill || !(mach->accel.linedraw_opt & 0x02)) {
-                            if (dev->bpp) {
-                                READ((mach->accel.ge_offset << 1) + ((dev->accel.dy) * (dev->pitch)) + (dev->accel.dx), dest_dat);
-                            } else {
-                                READ((mach->accel.ge_offset << 2) + ((dev->accel.dy) * (dev->pitch)) + (dev->accel.dx), dest_dat);
-                            }
+                            READ(mach->accel.dst_ge_offset + (dev->accel.dy * mach->accel.dst_pitch) + dev->accel.dx, dest_dat);
 
                             switch (compare_mode) {
                                 case 1:
@@ -529,33 +517,45 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                             if (mach->accel.dp_config & 0x10) {
                                 if (mach->accel.linedraw_opt & 0x04) {
                                     if (((mono_src != 1) && (dev->accel.sx < mach->accel.width)) || ((mono_src == 1) && count)) {
-                                        if (dev->bpp) {
-                                            WRITE((mach->accel.ge_offset << 1) + ((dev->accel.dy) * (dev->pitch)) + (dev->accel.dx), dest_dat);
-                                        } else {
-                                            WRITE((mach->accel.ge_offset << 2) + ((dev->accel.dy) * (dev->pitch)) + (dev->accel.dx), dest_dat);
-                                        }
+                                        WRITE(mach->accel.dst_ge_offset + (dev->accel.dy * mach->accel.dst_pitch) + dev->accel.dx, dest_dat);
                                     }
                                 } else {
-                                    if (dev->bpp) {
-                                        WRITE((mach->accel.ge_offset << 1) + ((dev->accel.dy) * (dev->pitch)) + (dev->accel.dx), dest_dat);
-                                    } else {
-                                        WRITE((mach->accel.ge_offset << 2) + ((dev->accel.dy) * (dev->pitch)) + (dev->accel.dx), dest_dat);
-                                    }
+                                    WRITE(mach->accel.dst_ge_offset + (dev->accel.dy * mach->accel.dst_pitch) + dev->accel.dx, dest_dat);
                                 }
                             }
                         }
                     }
 
-                    if ((mono_src == 1) && !count)
+                    if ((mono_src == 1) && !count) {
+                        if (cpu_input) {
+                            mach->force_busy  = 0;
+                            dev->force_busy   = 0;
+                            dev->force_busy2  = 0;
+                        }
+                        dev->fifo_idx = 0;
+                        dev->accel.cmd_back = 1;
                         break;
-                    else if ((mono_src != 1) && (dev->accel.sx >= mach->accel.width))
+                    } else if ((mono_src != 1) && (dev->accel.sx >= mach->accel.width)) {
+                        if (cpu_input) {
+                            mach->force_busy  = 0;
+                            dev->force_busy   = 0;
+                            dev->force_busy2  = 0;
+                        }
+                        dev->fifo_idx = 0;
+                        dev->accel.cmd_back = 1;
                         break;
+                    }
 
                     if (dev->bpp)
                         cpu_dat >>= 16;
                     else
                         cpu_dat >>= 8;
 
+                    mach->accel.color_pattern_idx++;
+
+                    if (mach->accel.color_pattern_idx > mach->accel.patt_len)
+                        mach->accel.color_pattern_idx = 0;
+
                     switch (mach->accel.linedraw_opt & 0xe0) {
                         case 0x00:
                             dev->accel.cx++;
@@ -636,11 +636,7 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                             }
                             break;
                         case 3:
-                            if (dev->bpp) {
-                                READ((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), mix);
-                            } else {
-                                READ((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), mix);
-                            }
+                            READ(mach->accel.src_ge_offset + (dev->accel.cy * mach->accel.src_pitch) + dev->accel.cx, mix);
                             mix = (mix & rd_mask) == rd_mask;
                             break;
 
@@ -648,13 +644,17 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                             break;
                     }
 
-                    if (((dev->accel.dx) >= clip_l) && ((dev->accel.dx) <= clip_r) && ((dev->accel.dy) >= clip_t) && ((dev->accel.dy) <= clip_b)) {
+                    if ((dev->accel.dx >= clip_l) &&
+                        (dev->accel.dx <= clip_r) &&
+                        (dev->accel.dy >= clip_t) &&
+                        (dev->accel.dy <= clip_b)) {
+                        dev->subsys_stat |= INT_GE_BSY;
                         switch (mix ? frgd_sel : bkgd_sel) {
                             case 0:
-                                src_dat = dev->accel.bkgd_color;
+                                src_dat = bkgd_color;
                                 break;
                             case 1:
-                                src_dat = dev->accel.frgd_color;
+                                src_dat = frgd_color;
                                 break;
                             case 2:
                                 src_dat = cpu_dat;
@@ -663,21 +663,17 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                                 if (mach_pixel_read(mach))
                                     src_dat = cpu_dat;
                                 else {
-                                    if (dev->bpp) {
-                                        READ((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), src_dat);
-                                    } else {
-                                        READ((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), src_dat);
-                                    }
+                                    READ(mach->accel.src_ge_offset + (dev->accel.cy * mach->accel.src_pitch) + dev->accel.cx, src_dat);
                                     if (mono_src == 3) {
                                         src_dat = (src_dat & rd_mask) == rd_mask;
                                     }
                                 }
                                 break;
                             case 5:
-                                if (mix) {
-                                    src_dat = mach->accel.color_pattern[((dev->accel.dx) + ((dev->accel.dy) << 3)) & mach->accel.patt_len];
-                                } else
-                                    src_dat = 0;
+                                if (dev->bpp)
+                                    src_dat = mach->accel.color_pattern_hicol[mach->accel.color_pattern_idx];
+                                else
+                                    src_dat = mach->accel.color_pattern[mach->accel.color_pattern_idx];
                                 break;
 
                             default:
@@ -685,22 +681,14 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                         }
 
                         if (mach->accel.linedraw_opt & 0x02) {
-                            if (dev->bpp) {
-                                READ((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), poly_src);
-                            } else {
-                                READ((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), poly_src);
-                            }
+                            READ(mach->accel.src_ge_offset + (dev->accel.cy * mach->accel.src_pitch) + dev->accel.cx, poly_src);
                             poly_src = ((poly_src & rd_mask) == rd_mask);
                             if (poly_src)
                                 mach->accel.poly_fill = !mach->accel.poly_fill;
                         }
 
                         if (mach->accel.poly_fill || !(mach->accel.linedraw_opt & 0x02)) {
-                            if (dev->bpp) {
-                                READ((mach->accel.ge_offset << 1) + ((dev->accel.dy) * (dev->pitch)) + (dev->accel.dx), dest_dat);
-                            } else {
-                                READ((mach->accel.ge_offset << 2) + ((dev->accel.dy) * (dev->pitch)) + (dev->accel.dx), dest_dat);
-                            }
+                            READ(mach->accel.dst_ge_offset + (dev->accel.dy * mach->accel.dst_pitch) + dev->accel.dx, dest_dat);
 
                             switch (compare_mode) {
                                 case 1:
@@ -740,33 +728,45 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                             if (mach->accel.dp_config & 0x10) {
                                 if (mach->accel.linedraw_opt & 0x04) {
                                     if (((mono_src != 1) && (dev->accel.sx < mach->accel.width)) || ((mono_src == 1) && count)) {
-                                        if (dev->bpp) {
-                                            WRITE((mach->accel.ge_offset << 1) + ((dev->accel.dy) * (dev->pitch)) + (dev->accel.dx), dest_dat);
-                                        } else {
-                                            WRITE((mach->accel.ge_offset << 2) + ((dev->accel.dy) * (dev->pitch)) + (dev->accel.dx), dest_dat);
-                                        }
+                                        WRITE(mach->accel.dst_ge_offset + (dev->accel.dy * mach->accel.dst_pitch) + dev->accel.dx, dest_dat);
                                     }
                                 } else {
-                                    if (dev->bpp) {
-                                        WRITE((mach->accel.ge_offset << 1) + ((dev->accel.dy) * (dev->pitch)) + (dev->accel.dx), dest_dat);
-                                    } else {
-                                        WRITE((mach->accel.ge_offset << 2) + ((dev->accel.dy) * (dev->pitch)) + (dev->accel.dx), dest_dat);
-                                    }
+                                    WRITE(mach->accel.dst_ge_offset + (dev->accel.dy * mach->accel.dst_pitch) + dev->accel.dx, dest_dat);
                                 }
                             }
                         }
                     }
 
-                    if ((mono_src == 1) && !count)
+                    if ((mono_src == 1) && !count) {
+                        if (cpu_input) {
+                            dev->force_busy = 0;
+                            dev->force_busy2 = 0;
+                            mach->force_busy = 0;
+                        }
+                        dev->fifo_idx = 0;
+                        dev->accel.cmd_back = 1;
                         break;
-                    else if ((mono_src != 1) && (dev->accel.sx >= mach->accel.width))
+                    } else if ((mono_src != 1) && (dev->accel.sx >= mach->accel.width)) {
+                        if (cpu_input) {
+                            dev->force_busy = 0;
+                            dev->force_busy2 = 0;
+                            mach->force_busy = 0;
+                        }
+                        dev->fifo_idx = 0;
+                        dev->accel.cmd_back = 1;
                         break;
+                    }
 
                     if (dev->bpp)
                         cpu_dat >>= 16;
                     else
                         cpu_dat >>= 8;
 
+                    mach->accel.color_pattern_idx++;
+
+                    if (mach->accel.color_pattern_idx > mach->accel.patt_len)
+                        mach->accel.color_pattern_idx = 0;
+
                     if (mach->accel.linedraw_opt & 0x40) {
                         dev->accel.dy += mach->accel.stepy;
                         if ((frgd_sel == 3) || (bkgd_sel == 3))
@@ -816,16 +816,11 @@ mach_accel_start(int cmd_type, int cpu_input, int count, uint32_t mix_dat, uint3
                 if (dev->accel.cur_y >= 0x600)
                     dev->accel.dy |= ~0x5ff;
 
-                if (mach->accel.dp_config == 0x5211) {
-                    if (mach->accel.dest_x_end == 1024) {
-                        goto skip_dx;
-                    }
-                }
                 /*Destination Width*/
-                if (mach->accel.dest_x_start != dev->accel.dx)
-                    mach->accel.dest_x_start = dev->accel.dx;
+                mach->accel.dx_first_row_start = dev->accel.cur_x;
+                if (dev->accel.cur_x >= 0x600)
+                    mach->accel.dx_first_row_start |= ~0x5ff;
 
-skip_dx:
                 mach->accel.dx_start = mach->accel.dest_x_start;
                 if (mach->accel.dest_x_start >= 0x600)
                     mach->accel.dx_start |= ~0x5ff;
@@ -840,28 +835,19 @@ skip_dx:
                 } else if (mach->accel.dx_end < mach->accel.dx_start) {
                     mach->accel.width = (mach->accel.dx_start - mach->accel.dx_end);
                     mach->accel.stepx = -1;
-                    if (dev->accel.dx > 0)
-                        dev->accel.dx--;
-                    mach_log("BitBLT: Dst Negative X, dxstart = %d, end = %d, width = %d, dx = %d, dpconfig = %04x.\n", mach->accel.dest_x_start, mach->accel.dest_x_end, mach->accel.width, dev->accel.dx, mach->accel.dp_config);
                 } else {
                     mach->accel.stepx = 1;
                     mach->accel.width = 0;
-                    mach_log("BitBLT: Dst Indeterminate X, dpconfig = %04x, destxend = %d, destxstart = %d.\n", mach->accel.dp_config, mach->accel.dest_x_end, mach->accel.dest_x_start);
                 }
 
-                dev->accel.sx                 = 0;
-                mach->accel.poly_fill         = 0;
-                mach->accel.color_pattern_idx = ((dev->accel.dx + (dev->accel.dy << 3)) & mach->accel.patt_len);
-                if ((dev->accel_bpp == 24) && (mono_src != 1)) {
-                    if (mach->accel.color_pattern_idx == mach->accel.patt_len)
-                        mach->accel.color_pattern_idx = mach->accel.patt_data_idx;
-                } else if ((dev->accel_bpp == 24) && (frgd_sel == 5) && (mono_src == 1) && (mach->accel.patt_len_reg & 0x4000))
-                    mach->accel.color_pattern_idx = 0;
+                dev->accel.sx = 0;
+                mach->accel.poly_fill = 0;
 
                 /*Height*/
                 mach->accel.dy_start = dev->accel.cur_y;
                 if (dev->accel.cur_y >= 0x600)
                     mach->accel.dy_start |= ~0x5ff;
+
                 mach->accel.dy_end = mach->accel.dest_y_end;
                 if (mach->accel.dest_y_end >= 0x600)
                     mach->accel.dy_end |= ~0x5ff;
@@ -877,14 +863,31 @@ skip_dx:
                     mach->accel.stepy  = 1;
                 }
 
+                if (mach->accel.dp_config == 0x4011)
+                    mach->accel.height++;
+
+                if (mach->accel.height == 1) {
+                    if (mach->accel.dx_end > mach->accel.dx_first_row_start) {
+                        mach->accel.width = (mach->accel.dx_end - mach->accel.dx_first_row_start);
+                        mach->accel.stepx = 1;
+                    } else if (mach->accel.dx_end < mach->accel.dx_first_row_start) {
+                        mach->accel.width = (mach->accel.dx_first_row_start - mach->accel.dx_end);
+                        mach->accel.stepx = -1;
+                    } else {
+                        mach->accel.stepx = 1;
+                        mach->accel.width = 0;
+                    }
+                }
+
+                if (mach->accel.stepx == -1) {
+                    if (dev->accel.dx > 0)
+                        dev->accel.dx--;
+                }
+
                 dev->accel.sy = 0;
-                if (dev->bpp)
-                    dev->accel.dest = (mach->accel.ge_offset << 1) + (dev->accel.dy * (dev->pitch));
-                else
-                    dev->accel.dest = (mach->accel.ge_offset << 2) + (dev->accel.dy * (dev->pitch));
+                dev->accel.dest = mach->accel.dst_ge_offset + (dev->accel.dy * mach->accel.dst_pitch);
 
                 mach->accel.src_stepx = 0;
-
                 /*Source Width*/
                 dev->accel.cx = mach->accel.src_x;
                 if (mach->accel.src_x >= 0x600)
@@ -905,40 +908,44 @@ skip_dx:
                 if (mach->accel.sx_end > mach->accel.sx_start) {
                     mach->accel.src_width = (mach->accel.sx_end - mach->accel.sx_start);
                     mach->accel.src_stepx = 1;
-                    mach_log("BitBLT: Src Positive X: wh(%d,%d), srcwidth = %d, coordinates: %d,%d px, start: %d, end: %d px, stepx = %d, dpconfig = %04x, oddwidth = %d.\n", mach->accel.width, mach->accel.height, mach->accel.src_width, dev->accel.cx, dev->accel.cy, mach->accel.src_x_start, mach->accel.src_x_end, mach->accel.src_stepx, mach->accel.dp_config, mach->accel.src_width & 1);
+                    mach_log("BitBLT: Src Positive X: wh(%d,%d), srcwidth = %d, coordinates: %d,%d px, start: %d, end: %d px, stepx = %d, dpconfig = %04x, oddwidth = %d.\n",
+                             mach->accel.width, mach->accel.height, mach->accel.src_width, dev->accel.cx, dev->accel.cy, mach->accel.src_x_start, mach->accel.src_x_end,
+                             mach->accel.src_stepx, mach->accel.dp_config, mach->accel.src_width & 1);
                 } else if (mach->accel.sx_end < mach->accel.sx_start) {
                     mach->accel.src_width = (mach->accel.sx_start - mach->accel.sx_end);
                     mach->accel.src_stepx = -1;
                     if (dev->accel.cx > 0)
                         dev->accel.cx--;
-                    mach_log("BitBLT: Src Negative X: width = %d, coordinates: %d,%d px, end: %d px, stepx = %d, dpconfig = %04x, oddwidth = %d.\n", mach->accel.src_width, dev->accel.cx, dev->accel.cy, mach->accel.src_x_end, mach->accel.src_stepx, mach->accel.dp_config, mach->accel.src_width & 1);
+                    mach_log("BitBLT: Src Negative X: width = %d, coordinates: %d,%d px, end: %d px, stepx = %d, dpconfig = %04x, oddwidth = %d.\n",
+                    mach->accel.src_width, dev->accel.cx, dev->accel.cy, mach->accel.src_x_end, mach->accel.src_stepx, mach->accel.dp_config
+                    mach->accel.src_width & 1);
                 } else {
                     mach->accel.src_stepx = 1;
                     mach->accel.src_width = 0;
-                    mach_log("BitBLT: Src Indeterminate X: width = %d, coordinates: %d,%d px, end: %d px, stepx = %d, dpconfig = %04x, oddwidth = %d.\n", mach->accel.src_width, dev->accel.cx, dev->accel.cy, mach->accel.src_x_end, mach->accel.src_stepx, mach->accel.dp_config, mach->accel.src_width & 1);
+                    mach_log("BitBLT: Src Indeterminate X: width = %d, coordinates: %d,%d px, end: %d px, stepx = %d, dpconfig = %04x, oddwidth = %d.\n",
+                             mach->accel.src_width, dev->accel.cx, dev->accel.cy, mach->accel.src_x_end, mach->accel.src_stepx,
+                             mach->accel.dp_config, mach->accel.src_width & 1);
                 }
                 mach->accel.sx = 0;
-                if (dev->bpp)
-                    dev->accel.src = (mach->accel.ge_offset << 1) + (dev->accel.cy * (dev->pitch));
+                if (mach->accel.patt_data_idx < 0x10)
+                    mach->accel.color_pattern_idx = mach->accel.patt_idx;
                 else
-                    dev->accel.src = (mach->accel.ge_offset << 2) + (dev->accel.cy * (dev->pitch));
+                    mach->accel.color_pattern_idx = 0;
 
-                if ((dev->accel_bpp == 24) && (frgd_sel == 5))
-                    mach_log("BitBLT=%04x, WH(%d,%d), SRCWidth=%d, c(%d,%d), s(%d,%d).\n", mach->accel.dp_config, mach->accel.width, mach->accel.height, mach->accel.src_width, dev->accel.dx, dev->accel.dy, dev->accel.cx, dev->accel.cy);
-                else if (mach->accel.dp_config & 0x02)
-                    mach_log("BitBLT=%04x, Pitch=%d, C(%d,%d), D(%d,%d), SRCWidth=%d, SRCXStep=%d, WH(%d,%d), clipt=%d, clipb=%d, geoffset=%08x.\n", mach->accel.dp_config, dev->ext_pitch, mach->accel.src_x, mach->accel.src_y, dev->accel.cur_x, dev->accel.cur_y, mach->accel.src_width, mach->accel.src_stepx, mach->accel.width, mach->accel.height, clip_t, clip_b, (mach->accel.ge_offset << 2));
+                dev->accel.src = mach->accel.src_ge_offset + (dev->accel.cy * mach->accel.src_pitch);
 
                 if (mono_src == 1) {
-                    if ((mach->accel.mono_pattern_enable) && !(mach->accel.patt_len_reg & 0x4000)) {
-                        mono_dat0 = mach->accel.patt_data[0x10];
-                        mono_dat0 |= (mach->accel.patt_data[0x11] << 8);
-                        mono_dat0 |= (mach->accel.patt_data[0x12] << 16);
-                        mono_dat0 |= (mach->accel.patt_data[0x13] << 24);
-                        mono_dat1 = mach->accel.patt_data[0x14];
-                        mono_dat1 |= (mach->accel.patt_data[0x15] << 8);
-                        mono_dat1 |= (mach->accel.patt_data[0x16] << 16);
-                        mono_dat1 |= (mach->accel.patt_data[0x17] << 24);
+                    if (mach->accel.mono_pattern_enable || mach->accel.block_write_mono_pattern_enable) {
+                        mono_dat0 = mach->accel.mono_pattern_normal[0];
+                        mono_dat0 |= (mach->accel.mono_pattern_normal[1] << 8);
+                        mono_dat0 |= (mach->accel.mono_pattern_normal[2] << 16);
+                        mono_dat0 |= (mach->accel.mono_pattern_normal[3] << 24);
+                        mono_dat1 = mach->accel.mono_pattern_normal[4];
+                        mono_dat1 |= (mach->accel.mono_pattern_normal[5] << 8);
+                        mono_dat1 |= (mach->accel.mono_pattern_normal[6] << 16);
+                        mono_dat1 |= (mach->accel.mono_pattern_normal[7] << 24);
 
+                        mach_log("MonoData0=%x, MonoData1=%x, enable mono pattern=%x, dpconfig=%04x.\n", mono_dat0, mono_dat1, mach->accel.mono_pattern_enable, mach->accel.dp_config);
                         for (uint8_t y = 0; y < 8; y++) {
                             for (uint8_t x = 0; x < 8; x++) {
                                 uint32_t temp                      = (y & 4) ? mono_dat1 : mono_dat0;
@@ -948,12 +955,20 @@ skip_dx:
                     }
                 }
 
-                if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach)) {
+                if (!dev->accel.cmd_back) {
                     if (mach_pixel_write(mach)) {
+                        mach_log("Non-Conforming BitBLT Write pixtrans.\n");
+                        dev->force_busy = 1;
+                        dev->force_busy2 = 1;
+                        mach->force_busy = 1;
                         dev->data_available  = 0;
                         dev->data_available2 = 0;
                         return;
                     } else if (mach_pixel_read(mach)) {
+                        mach_log("Non-Conforming BitBLT Read pixtrans.\n");
+                        dev->force_busy = 1;
+                        dev->force_busy2 = 1;
+                        mach->force_busy = 1;
                         dev->data_available  = 1;
                         dev->data_available2 = 1;
                         return;
@@ -962,89 +977,87 @@ skip_dx:
             }
 
             if (mono_src == 1) {
-                if (!mach->accel.mono_pattern_enable && !(mach->accel.patt_len_reg & 0x4000)) {
-                    count               = mach->accel.width;
-                    mix_dat             = mach->accel.patt_data[0x10] ^ ((mach->accel.patt_idx & 1) ? 0xff : 0);
-                    dev->accel.temp_cnt = 8;
-                }
-            }
-
-            if (frgd_sel == 5) {
-                if (dev->bpp) {
-                    for (int x = 0; x <= mach->accel.patt_len; x += 2) {
-                        mach->accel.color_pattern_word[x + (mach->accel.color_pattern_idx & 1)] = (mach->accel.patt_data[x & mach->accel.patt_len] & 0xff);
-                        mach->accel.color_pattern_word[x + (mach->accel.color_pattern_idx & 1)] |= (mach->accel.patt_data[(x + 1) & mach->accel.patt_len] << 8);
-                    }
-                } else {
-                    if ((dev->accel_bpp == 24) && (mach->accel.patt_len < 3)) {
-                        for (int x = 0; x <= mach->accel.patt_len; x++) {
-                            mach->accel.color_pattern[x] = mach->accel.patt_data[x];
-                            mach_log("BITBLT: Color Pattern 24bpp[%d]=%02x, dataidx=%d, pattlen=%d.\n", x, mach->accel.color_pattern[x], mach->accel.patt_data_idx, mach->accel.patt_len);
-                        }
-                    } else {
-                        for (int x = 0; x <= mach->accel.patt_len; x++) {
-                            mach->accel.color_pattern[x] = mach->accel.patt_data[x & mach->accel.patt_len];
-                        }
+                if (!mach->accel.mono_pattern_enable && !mach->accel.block_write_mono_pattern_enable) {
+                    if (((dev->accel_bpp == 24) && (frgd_sel != 5)) || (dev->accel_bpp != 24)) {
+                        mix_dat = mach->accel.mono_pattern_normal[0] ^ ((mach->accel.patt_idx & 0x01) ? 0xff : 0);
+                        dev->accel.temp_cnt = 8;
                     }
                 }
-
-                /*The destination coordinates should match the pattern index.*/
-                if (mach->accel.color_pattern_idx != mach->accel.patt_idx)
-                    mach->accel.color_pattern_idx = mach->accel.patt_idx;
             }
 
             if (mach->accel.dy_end == mach->accel.dy_start) {
                 mach_log("No DEST.\n");
+                if (cpu_input) {
+                    dev->force_busy = 0;
+                    dev->force_busy2 = 0;
+                    mach->force_busy = 0;
+                }
+                dev->fifo_idx = 0;
+                dev->accel.cmd_back = 1;
                 return;
             }
 
             if ((mono_src == 3) || (bkgd_sel == 3) || (frgd_sel == 3)) {
                 if (mach->accel.sx_end == mach->accel.sx_start) {
+                    if (cpu_input) {
+                        dev->force_busy = 0;
+                        dev->force_busy2 = 0;
+                        mach->force_busy = 0;
+                    }
                     mach_log("No SRC.\n");
+                    dev->fifo_idx = 0;
+                    dev->accel.cmd_back = 1;
                     return;
                 }
             }
 
             if (cpu_input) {
                 if (mach->accel.dp_config == 0x3251) {
-                    if (dev->accel.sy == mach->accel.height)
+                    mach_log("DPCONFIG 3251: monosrc=%d, frgdsel=%d, bkgdsel=%d, pitch=%d.\n",
+                             mono_src, frgd_sel, bkgd_sel, dev->pitch);
+                    if (dev->accel.sy == mach->accel.height) {
+                        mach_log("No Blit on DPCONFIG=3251.\n");
+                        dev->force_busy = 0;
+                        dev->force_busy2 = 0;
+                        mach->force_busy = 0;
+                        dev->fifo_idx = 0;
+                        dev->accel.cmd_back = 1;
                         return;
+                    }
                 }
             }
 
             while (count--) {
                 switch (mono_src) {
                     case 0:
-                        mix = 1;
+                        mix = 0x01;
                         break;
                     case 1:
-                        if (mach->accel.mono_pattern_enable)
+                        if (mach->accel.mono_pattern_enable || mach->accel.block_write_mono_pattern_enable)
                             mix = mach->accel.mono_pattern[dev->accel.dy & 7][dev->accel.dx & 7];
+                        else if ((dev->accel_bpp == 24) && (frgd_sel == 5))
+                            mix = 0x01;
                         else {
-                            if ((dev->accel_bpp == 24) && (frgd_sel == 5) && (mach->accel.patt_len_reg & 0x4000))
-                                mix = 1;
-                            else {
-                                if (!dev->accel.temp_cnt) {
-                                    dev->accel.temp_cnt = 8;
-                                    mix_dat >>= 8;
-                                }
-                                mix = (mix_dat & 0x80);
-                                dev->accel.temp_cnt--;
-                                mix_dat <<= 1;
-                                mix_dat |= 1;
+                            if (!dev->accel.temp_cnt) {
+                                dev->accel.temp_cnt = 8;
+                                mix_dat >>= 8;
                             }
+                            mix = !!(mix_dat & 0x80);
+                            dev->accel.temp_cnt--;
+                            mix_dat <<= 1;
+                            mix_dat |= 1;
                         }
                         break;
                     case 2:
-                        if (mach->accel.dp_config & 0x1000) {
+                        if ((mach->accel.dp_config & 0x1000) || (mach->accel.dp_config & 0x04)) {
                             mix = mix_dat >> 0x1f;
                             mix_dat <<= 1;
                         } else {
                             if (mach->accel.dp_config & 0x200) {
-                                mix = mix_dat & 1;
+                                mix = mix_dat & 0x01;
                                 mix_dat >>= 1;
                             } else {
-                                mix = mix_dat & 0x80;
+                                mix = !!(mix_dat & 0x80);
                                 mix_dat <<= 1;
                                 mix_dat |= 1;
                             }
@@ -1059,21 +1072,25 @@ skip_dx:
                         break;
                 }
 
-                if (((dev->accel.dx) >= clip_l) && ((dev->accel.dx) <= clip_r) && ((dev->accel.dy) >= clip_t) && ((dev->accel.dy) <= clip_b)) {
-                    if ((mach->accel.dp_config & 0x02) || (mach->accel.linedraw_opt & 0x02)) {
+                if ((dev->accel.dx >= clip_l) &&
+                    (dev->accel.dx <= clip_r) &&
+                    (dev->accel.dy >= clip_t) &&
+                    (dev->accel.dy <= clip_b)) {
+                    dev->subsys_stat |= INT_GE_BSY;
+                    if (mach->accel.dp_config & 0x02) {
                         READ(dev->accel.src + dev->accel.cx, poly_src);
                         poly_src = ((poly_src & rd_mask) == rd_mask);
                         if (poly_src)
                             mach->accel.poly_fill ^= 1;
                     }
 
-                    if (mach->accel.poly_fill || !(mach->accel.dp_config & 0x02) || !(mach->accel.linedraw_opt & 0x02)) {
+                    if (mach->accel.poly_fill || !(mach->accel.dp_config & 0x02)) {
                         switch (mix ? frgd_sel : bkgd_sel) {
                             case 0:
-                                src_dat = dev->accel.bkgd_color;
+                                src_dat = bkgd_color;
                                 break;
                             case 1:
-                                src_dat = dev->accel.frgd_color;
+                                src_dat = frgd_color;
                                 break;
                             case 2:
                                 src_dat = cpu_dat;
@@ -1088,22 +1105,19 @@ skip_dx:
                                 }
                                 break;
                             case 5:
-                                if (mix) {
-                                    if (dev->bpp)
-                                        src_dat = mach->accel.color_pattern_word[mach->accel.color_pattern_idx];
-                                    else
-                                        src_dat = mach->accel.color_pattern[mach->accel.color_pattern_idx];
-                                } else
-                                    src_dat = 0;
+                                if (dev->bpp)
+                                    src_dat = mach->accel.color_pattern_hicol[mach->accel.color_pattern_idx];
+                                else
+                                    src_dat = mach->accel.color_pattern[mach->accel.color_pattern_idx];
                                 break;
 
                             default:
                                 break;
                         }
 
-                        if ((dev->accel_bpp == 24) && (mono_src == 1) && (frgd_sel == 5) && (mach->accel.patt_len_reg & 0x4000)) {
+                        if ((dev->accel_bpp == 24) && (mono_src == 1) && (frgd_sel == 5) && !mach->accel.mono_pattern_enable) {
                             if (dev->accel.sy & 1) {
-                                READ(dev->accel.dest + dev->accel.dx - dev->ext_pitch, dest_dat);
+                                READ(dev->accel.dest + dev->accel.dx - mach->accel.dst_pitch, dest_dat);
                             } else {
                                 READ(dev->accel.dest + dev->accel.dx, dest_dat);
                             }
@@ -1147,9 +1161,9 @@ skip_dx:
                         }
 
                         if (mach->accel.dp_config & 0x10) {
-                            if ((dev->accel_bpp == 24) && (mono_src == 1) && (frgd_sel == 5) && (mach->accel.patt_len_reg & 0x4000)) {
+                            if ((dev->accel_bpp == 24) && (mono_src == 1) && (frgd_sel == 5) && !mach->accel.mono_pattern_enable) {
                                 if (dev->accel.sy & 1) {
-                                    WRITE(dev->accel.dest + dev->accel.dx - dev->ext_pitch, dest_dat);
+                                    WRITE(dev->accel.dest + dev->accel.dx - mach->accel.dst_pitch, dest_dat);
                                 } else {
                                     WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
                                 }
@@ -1165,6 +1179,12 @@ skip_dx:
                 else
                     cpu_dat >>= 8;
 
+                if (mach->accel.dp_config == 0x2071)
+                    mach_log("FontBlit: SX=%d, C(%d,%d), SRCWidth=%d, frgdmix=%d, bkgdmix=%d, rdmask=%04x, D(%d,%d), geoffset=%x, addr=%08x, 8bppdata=%02x, 16bppdata=%04x, vgabase=%06x.\n",
+                             mach->accel.sx, dev->accel.cx, dev->accel.cy, mach->accel.src_width, dev->accel.frgd_mix & 0x1f,
+                             dev->accel.bkgd_mix & 0x1f, rd_mask, dev->accel.dx, dev->accel.dy, dev->accel.ge_offset,
+                             (dev->accel.src + dev->accel.cx) & dev->vram_mask, dev->vram[(dev->accel.src + dev->accel.cx) & dev->vram_mask], vram_w[(dev->accel.src + dev->accel.cx) & (dev->vram_mask >> 1)], svga->mapping.base);
+
                 if ((mono_src == 3) || (frgd_sel == 3) || (bkgd_sel == 3) || (mach->accel.dp_config & 0x02)) {
                     dev->accel.cx += mach->accel.src_stepx;
                     mach->accel.sx++;
@@ -1176,39 +1196,21 @@ skip_dx:
                             dev->accel.cx -= mach->accel.src_width;
 
                         dev->accel.cy += (mach->accel.src_y_dir ? 1 : -1);
-                        if (dev->bpp)
-                            dev->accel.src = (mach->accel.ge_offset << 1) + (dev->accel.cy * (dev->pitch));
-                        else
-                            dev->accel.src = (mach->accel.ge_offset << 2) + (dev->accel.cy * (dev->pitch));
+                        dev->accel.src = mach->accel.src_ge_offset + (dev->accel.cy * mach->accel.src_pitch);
                     }
                 }
 
-                dev->accel.dx += mach->accel.stepx;
+                mach->accel.color_pattern_idx++;
 
-                if ((dev->accel_bpp == 8) || ((dev->accel_bpp == 24) && (mach->accel.patt_len >= 3) && (mono_src != 1)))
-                    mach->accel.color_pattern_idx = (mach->accel.color_pattern_idx + mach->accel.stepx) & mach->accel.patt_len;
-
-                if ((dev->accel_bpp == 24) && (mach->accel.color_pattern_idx == mach->accel.patt_len) && (mach->accel.patt_len >= 3) && (mono_src != 1)) {
-                    mach->accel.color_pattern_idx = mach->accel.patt_data_idx;
-                } else if ((dev->accel_bpp == 24) && (mach->accel.patt_len < 3)) {
-                    if (mach->accel.patt_len == 2) {
-                        mach->accel.color_pattern_idx++;
-                        if (mach->accel.color_pattern_idx == 3)
-                            mach->accel.color_pattern_idx = 0;
-                    } else
-                        mach->accel.color_pattern_idx = (mach->accel.color_pattern_idx + mach->accel.stepx) & mach->accel.patt_len;
-
-                } else if ((dev->accel_bpp == 24) && (mach->accel.patt_len_reg & 0x4000) && (frgd_sel == 5)) {
-                    mach->accel.color_pattern_idx++;
-                    if (mach->accel.color_pattern_idx == 3)
+                if ((mono_src == 1) && !mach->accel.mono_pattern_enable && !mach->accel.block_write_mono_pattern_enable && (frgd_sel == 5) && (dev->accel_bpp == 24)) {
+                    if (mach->accel.color_pattern_idx > 2)
+                        mach->accel.color_pattern_idx = 0;
+                } else {
+                    if (mach->accel.color_pattern_idx > mach->accel.patt_len)
                         mach->accel.color_pattern_idx = 0;
                 }
 
-                if (dev->bpp) {
-                    mach->accel.color_pattern_idx = (mach->accel.color_pattern_idx + mach->accel.stepx) & mach->accel.patt_len;
-                    mach->accel.color_pattern_idx = (mach->accel.color_pattern_idx + mach->accel.stepx) & mach->accel.patt_len;
-                }
-
+                dev->accel.dx += mach->accel.stepx;
                 dev->accel.sx++;
                 if ((dev->accel.sx >= mach->accel.width) || (dev->accel.dx >= 0x600)) {
                     dev->accel.sx         = 0;
@@ -1221,27 +1223,19 @@ skip_dx:
                     dev->accel.sy++;
 
                     mach->accel.poly_fill = 0;
-                    if (dev->bpp)
-                        dev->accel.dest = (mach->accel.ge_offset << 1) + (dev->accel.dy * (dev->pitch));
-                    else
-                        dev->accel.dest = (mach->accel.ge_offset << 2) + (dev->accel.dy * (dev->pitch));
+                    dev->accel.dest = mach->accel.dst_ge_offset + (dev->accel.dy * mach->accel.dst_pitch);
 
-                    if ((mono_src == 1) && (dev->accel_bpp == 24) && (frgd_sel == 5))
-                        mach->accel.color_pattern_idx = 0;
-                    else
-                        mach->accel.color_pattern_idx = ((dev->accel.dx + (dev->accel.dy << 3)) & mach->accel.patt_len);
-
-                    if ((dev->accel_bpp == 24) && (mach->accel.color_pattern_idx == mach->accel.patt_len) && (mono_src != 1))
-                        mach->accel.color_pattern_idx = 0;
-                    if ((mono_src == 1) && !mach->accel.mono_pattern_enable && !(mach->accel.patt_len_reg & 0x4000)) {
-                        dev->accel.cur_x = dev->accel.dx;
-                        dev->accel.cur_y = dev->accel.dy;
-                        return;
-                    }
                     if (dev->accel.sy >= mach->accel.height) {
-                        if ((mono_src == 2) || (mono_src == 3) || (frgd_sel == 3) || (bkgd_sel == 3) || (mach->accel.dp_config & 0x02) || (mach->accel.linedraw_opt & 0x02))
+                        if (cpu_input) {
+                            dev->force_busy = 0;
+                            dev->force_busy2 = 0;
+                            mach->force_busy = 0;
+                        }
+                        dev->fifo_idx = 0;
+                        dev->accel.cmd_back = 1;
+                        if ((mono_src == 2) || (mono_src == 3) || (frgd_sel == 3) || (bkgd_sel == 3) || (mach->accel.dp_config & 0x02))
                             return;
-                        if ((mono_src == 1) && (frgd_sel == 5) && (dev->accel_bpp == 24) && (mach->accel.patt_len_reg & 0x4000))
+                        if ((mono_src == 1) && (frgd_sel == 5) && (dev->accel_bpp == 24))
                             return;
                         dev->accel.cur_x = dev->accel.dx;
                         dev->accel.cur_y = dev->accel.dy;
@@ -1274,14 +1268,24 @@ skip_dx:
 
                 dev->accel.sx = 0;
 
-                mach_log("Linedraw: c(%d,%d), d(%d,%d), cend(%d,%d), bounds: l=%d, r=%d, t=%d, b=%d.\n", dev->accel.cur_x, dev->accel.cur_y, dev->accel.dx, dev->accel.dy, mach->accel.cx_end_line, mach->accel.cy_end_line, mach->accel.bleft, mach->accel.bright, mach->accel.btop, mach->accel.bbottom);
+                mach_log("Linedraw: c(%d,%d), d(%d,%d), cend(%d,%d), bounds: l=%d, r=%d, t=%d, b=%d.\n",
+                         dev->accel.cur_x, dev->accel.cur_y, dev->accel.dx, dev->accel.dy, mach->accel.cx_end_line,
+                         mach->accel.cy_end_line, mach->accel.bleft, mach->accel.bright, mach->accel.btop, mach->accel.bbottom);
 
-                if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach)) {
+                if (!dev->accel.cmd_back) {
                     if (mach_pixel_write(mach)) {
+                        mach_log("Direct Linedraw Write pixtrans.\n");
+                        dev->force_busy = 1;
+                        dev->force_busy2 = 1;
+                        mach->force_busy = 1;
                         dev->data_available  = 0;
                         dev->data_available2 = 0;
                         return;
                     } else if (mach_pixel_read(mach)) {
+                        mach_log("Direct Linedraw Read pixtrans.\n");
+                        dev->force_busy = 1;
+                        dev->force_busy2 = 1;
+                        mach->force_busy = 1;
                         dev->data_available  = 1;
                         dev->data_available2 = 1;
                         return;
@@ -1289,18 +1293,12 @@ skip_dx:
                 }
             }
 
-            if (frgd_sel == 5) {
-                for (int x = 0; x <= mach->accel.patt_len; x++) {
-                    mach->accel.color_pattern[x] = mach->accel.patt_data[x & mach->accel.patt_len];
-                }
-            }
-
             if (mono_src == 1) {
-                mix_dat             = mach->accel.patt_data[0x10];
+                mix_dat = mach->accel.mono_pattern_normal[0];
                 dev->accel.temp_cnt = 8;
             }
 
-            count             = (dev->accel.dx > dev->accel.dy) ? (dev->accel.dx >> 1) : (dev->accel.dy >> 1);
+            count = (dev->accel.dx > dev->accel.dy) ? (dev->accel.dx >> 1) : (dev->accel.dy >> 1);
             mach->accel.width = count;
 
             if (dev->accel.dx > dev->accel.dy) {
@@ -1316,14 +1314,18 @@ skip_dx:
                         mix_dat <<= 1;
                         mix_dat |= 1;
 
-                        if ((dev->accel.cx >= clip_l) && (dev->accel.cx <= clip_r) && (dev->accel.cy >= clip_t) && (dev->accel.cy <= clip_b)) {
+                        if ((dev->accel.cx >= clip_l) &&
+                            (dev->accel.cx <= clip_r) &&
+                            (dev->accel.cy >= clip_t) &&
+                            (dev->accel.cy <= clip_b)) {
+                            dev->subsys_stat |= INT_GE_BSY;
                             mach->accel.clip_overrun = 0;
                             switch (mix ? frgd_sel : bkgd_sel) {
                                 case 0:
-                                    src_dat = dev->accel.bkgd_color;
+                                    src_dat = bkgd_color;
                                     break;
                                 case 1:
-                                    src_dat = dev->accel.frgd_color;
+                                    src_dat = frgd_color;
                                     break;
                                 case 2:
                                     src_dat = cpu_dat;
@@ -1335,21 +1337,17 @@ skip_dx:
                                         src_dat = 0;
                                     break;
                                 case 5:
-                                    if (mix)
-                                        src_dat = mach->accel.color_pattern[((dev->accel.cx) + ((dev->accel.cy) << 3)) & mach->accel.patt_len];
+                                    if (dev->bpp)
+                                        src_dat = mach->accel.color_pattern_hicol[mach->accel.color_pattern_idx];
                                     else
-                                        src_dat = 0;
+                                        src_dat = mach->accel.color_pattern[mach->accel.color_pattern_idx];
                                     break;
 
                                 default:
                                     break;
                             }
 
-                            if (dev->bpp) {
-                                READ((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                            } else {
-                                READ((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                            }
+                            READ(mach->accel.dst_ge_offset + (dev->accel.cy * mach->accel.dst_pitch) + dev->accel.cx, dest_dat);
 
                             switch (compare_mode) {
                                 case 1:
@@ -1385,32 +1383,33 @@ skip_dx:
                                     dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
                                 }
                             }
-                            if (mach->accel.linedraw_opt & 0x04) {
-                                if (count) {
-                                    if (dev->bpp) {
-                                        WRITE((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                                    } else {
-                                        WRITE((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                                    }
-                                }
-                            } else {
-                                if (dev->bpp) {
-                                    WRITE((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                                } else {
-                                    WRITE((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                                }
+                            if ((mach->accel.dp_config & 0x10) && (cmd_type == 3)) {
+                                WRITE(mach->accel.dst_ge_offset + (dev->accel.cy * mach->accel.dst_pitch) + dev->accel.cx, dest_dat);
                             }
                         } else
                             mach->accel.clip_overrun = ((mach->accel.clip_overrun + 1) & 0x0f);
 
-                        if (!count)
+                        if (!count) {
+                            if (cpu_input) {
+                                dev->force_busy = 0;
+                                dev->force_busy2 = 0;
+                                mach->force_busy = 0;
+                            }
+                            dev->fifo_idx = 0;
+                            dev->accel.cmd_back = 1;
                             break;
+                        }
 
                         if (dev->bpp)
                             cpu_dat >>= 16;
                         else
                             cpu_dat >>= 8;
 
+                        mach->accel.color_pattern_idx++;
+
+                        if (mach->accel.color_pattern_idx > mach->accel.patt_len)
+                            mach->accel.color_pattern_idx = 0;
+
                         if (mach->accel.err >= 0) {
                             dev->accel.cy += mach->accel.stepy;
                             mach->accel.err -= dev->accel.dx;
@@ -1445,20 +1444,24 @@ skip_dx:
                                 break;
                         }
 
-                        if ((dev->accel.cx >= clip_l) && (dev->accel.cx <= clip_r) && (dev->accel.cy >= clip_t) && (dev->accel.cy <= clip_b)) {
+                        if ((dev->accel.cx >= clip_l) &&
+                            (dev->accel.cx <= clip_r) &&
+                            (dev->accel.cy >= clip_t) &&
+                            (dev->accel.cy <= clip_b)) {
+                            dev->subsys_stat |= INT_GE_BSY;
                             mach->accel.clip_overrun = 0;
                             if (mach->accel.linedraw_opt & 0x02) {
-                                READ((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), poly_src);
+                                READ(mach->accel.src_ge_offset + (dev->accel.cy * mach->accel.src_pitch) + dev->accel.cx, poly_src);
                                 if (poly_src)
-                                    mach->accel.poly_fill = !mach->accel.poly_fill;
+                                    mach->accel.poly_fill ^= 1;
                             }
 
                             switch (mix ? frgd_sel : bkgd_sel) {
                                 case 0:
-                                    src_dat = dev->accel.bkgd_color;
+                                    src_dat = bkgd_color;
                                     break;
                                 case 1:
-                                    src_dat = dev->accel.frgd_color;
+                                    src_dat = frgd_color;
                                     break;
                                 case 2:
                                     src_dat = cpu_dat;
@@ -1471,21 +1474,17 @@ skip_dx:
                                     }
                                     break;
                                 case 5:
-                                    if (mix) {
-                                        src_dat = mach->accel.color_pattern[((dev->accel.cx) + ((dev->accel.cy) << 3)) & mach->accel.patt_len];
-                                    } else
-                                        src_dat = 0;
+                                    if (dev->bpp)
+                                        src_dat = mach->accel.color_pattern_hicol[mach->accel.color_pattern_idx];
+                                    else
+                                        src_dat = mach->accel.color_pattern[mach->accel.color_pattern_idx];
                                     break;
 
                                 default:
                                     break;
                             }
 
-                            if (dev->bpp) {
-                                READ((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                            } else {
-                                READ((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                            }
+                            READ(mach->accel.dst_ge_offset + (dev->accel.cy * mach->accel.dst_pitch) + dev->accel.cx, dest_dat);
 
                             switch (compare_mode) {
                                 case 1:
@@ -1527,31 +1526,36 @@ skip_dx:
                             if ((mach->accel.dp_config & 0x10) && (cmd_type == 3)) {
                                 if (mach->accel.linedraw_opt & 0x04) {
                                     if (dev->accel.sx < mach->accel.width) {
-                                        if (dev->bpp) {
-                                            WRITE((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                                        } else {
-                                            WRITE((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                                        }
+                                        WRITE(mach->accel.dst_ge_offset + (dev->accel.cy * mach->accel.dst_pitch) + dev->accel.cx, dest_dat);
                                     }
                                 } else {
-                                    if (dev->bpp) {
-                                        WRITE((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                                    } else {
-                                        WRITE((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                                    }
+                                    WRITE(mach->accel.dst_ge_offset + (dev->accel.cy * mach->accel.dst_pitch) + dev->accel.cx, dest_dat);
                                 }
                             }
                         } else
                             mach->accel.clip_overrun = ((mach->accel.clip_overrun + 1) & 0x0f);
 
-                        if (dev->accel.sx >= mach->accel.width)
+                        if (dev->accel.sx >= mach->accel.width) {
+                            if (cpu_input) {
+                                dev->force_busy = 0;
+                                dev->force_busy2 = 0;
+                                mach->force_busy = 0;
+                            }
+                            dev->fifo_idx = 0;
+                            dev->accel.cmd_back = 1;
                             break;
+                        }
 
                         if (dev->bpp)
                             cpu_dat >>= 16;
                         else
                             cpu_dat >>= 8;
 
+                        mach->accel.color_pattern_idx++;
+
+                        if (mach->accel.color_pattern_idx > mach->accel.patt_len)
+                            mach->accel.color_pattern_idx = 0;
+
                         if (mach->accel.err >= 0) {
                             dev->accel.cy += mach->accel.stepy;
                             mach->accel.err -= dev->accel.dx;
@@ -1575,14 +1579,18 @@ skip_dx:
                         mix_dat <<= 1;
                         mix_dat |= 1;
 
-                        if ((dev->accel.cx >= clip_l) && (dev->accel.cx <= clip_r) && (dev->accel.cy >= clip_t) && (dev->accel.cy <= clip_b)) {
+                        if ((dev->accel.cx >= clip_l) &&
+                            (dev->accel.cx <= clip_r) &&
+                            (dev->accel.cy >= clip_t) &&
+                            (dev->accel.cy <= clip_b)) {
+                            dev->subsys_stat |= INT_GE_BSY;
                             mach->accel.clip_overrun = 0;
                             switch (mix ? frgd_sel : bkgd_sel) {
                                 case 0:
-                                    src_dat = dev->accel.bkgd_color;
+                                    src_dat = bkgd_color;
                                     break;
                                 case 1:
-                                    src_dat = dev->accel.frgd_color;
+                                    src_dat = frgd_color;
                                     break;
                                 case 2:
                                     src_dat = cpu_dat;
@@ -1595,21 +1603,18 @@ skip_dx:
                                     }
                                     break;
                                 case 5:
-                                    if (mix) {
-                                        src_dat = mach->accel.color_pattern[((dev->accel.cx) + ((dev->accel.cy) << 3)) & mach->accel.patt_len];
-                                    } else
-                                        src_dat = 0;
+                                    if (dev->bpp)
+                                        src_dat = mach->accel.color_pattern_hicol[mach->accel.color_pattern_idx];
+                                    else
+                                        src_dat = mach->accel.color_pattern[mach->accel.color_pattern_idx];
                                     break;
 
                                 default:
                                     break;
                             }
 
-                            if (dev->bpp) {
-                                READ((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                            } else {
-                                READ((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                            }
+                            READ(mach->accel.dst_ge_offset + (dev->accel.cy * mach->accel.dst_pitch) + dev->accel.cx, dest_dat);
+
                             switch (compare_mode) {
                                 case 1:
                                     compare = 1;
@@ -1646,33 +1651,32 @@ skip_dx:
                             }
 
                             if ((mach->accel.dp_config & 0x10) && (cmd_type == 3)) {
-                               if (mach->accel.linedraw_opt & 0x04) {
-                                    if (count) {
-                                        if (dev->bpp) {
-                                            WRITE((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                                        } else {
-                                            WRITE((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                                        }
-                                    }
-                                } else {
-                                    if (dev->bpp) {
-                                        WRITE((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                                    } else {
-                                        WRITE((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                                    }
-                                }
+                                WRITE(mach->accel.dst_ge_offset + (dev->accel.cy * mach->accel.dst_pitch) + dev->accel.cx, dest_dat);
                             }
                         } else
                             mach->accel.clip_overrun = ((mach->accel.clip_overrun + 1) & 0x0f);
 
-                        if (!count)
+                        if (!count) {
+                            if (cpu_input) {
+                                dev->force_busy = 0;
+                                dev->force_busy2 = 0;
+                                mach->force_busy = 0;
+                            }
+                            dev->fifo_idx = 0;
+                            dev->accel.cmd_back = 1;
                             break;
+                        }
 
                         if (dev->bpp)
                             cpu_dat >>= 16;
                         else
                             cpu_dat >>= 8;
 
+                        mach->accel.color_pattern_idx++;
+
+                        if (mach->accel.color_pattern_idx > mach->accel.patt_len)
+                            mach->accel.color_pattern_idx = 0;
+
                         if (mach->accel.err >= 0) {
                             dev->accel.cx += mach->accel.stepx;
                             mach->accel.err -= dev->accel.dy;
@@ -1707,15 +1711,18 @@ skip_dx:
                                 break;
                         }
 
-                        if ((dev->accel.cx >= clip_l) && (dev->accel.cx <= clip_r) && (dev->accel.cy >= clip_t) && (dev->accel.cy <= clip_b)) {
+                        if ((dev->accel.cx >= clip_l) &&
+                            (dev->accel.cx <= clip_r) &&
+                            (dev->accel.cy >= clip_t) &&
+                            (dev->accel.cy <= clip_b)) {
+                            dev->subsys_stat |= INT_GE_BSY;
                             mach->accel.clip_overrun = 0;
-
                             switch (mix ? frgd_sel : bkgd_sel) {
                                 case 0:
-                                    src_dat = dev->accel.bkgd_color;
+                                    src_dat = bkgd_color;
                                     break;
                                 case 1:
-                                    src_dat = dev->accel.frgd_color;
+                                    src_dat = frgd_color;
                                     break;
                                 case 2:
                                     src_dat = cpu_dat;
@@ -1728,21 +1735,17 @@ skip_dx:
                                     }
                                     break;
                                 case 5:
-                                    if (mix) {
-                                        src_dat = mach->accel.color_pattern[((dev->accel.cx) + ((dev->accel.cy) << 3)) & mach->accel.patt_len];
-                                    } else
-                                        src_dat = 0;
+                                    if (dev->bpp)
+                                        src_dat = mach->accel.color_pattern_hicol[mach->accel.color_pattern_idx];
+                                    else
+                                        src_dat = mach->accel.color_pattern[mach->accel.color_pattern_idx];
                                     break;
 
                                 default:
                                     break;
                             }
 
-                            if (dev->bpp) {
-                                READ((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                            } else {
-                                READ((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                            }
+                            READ(mach->accel.dst_ge_offset + (dev->accel.cy * mach->accel.dst_pitch) + dev->accel.cx, dest_dat);
 
                             switch (compare_mode) {
                                 case 1:
@@ -1782,31 +1785,36 @@ skip_dx:
                             if ((mach->accel.dp_config & 0x10) && (cmd_type == 3)) {
                                 if (mach->accel.linedraw_opt & 0x04) {
                                     if (dev->accel.sx < mach->accel.width) {
-                                        if (dev->bpp) {
-                                            WRITE((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                                        } else {
-                                            WRITE((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                                        }
+                                        WRITE(mach->accel.dst_ge_offset + (dev->accel.cy * mach->accel.dst_pitch) + dev->accel.cx, dest_dat);
                                     }
                                 } else {
-                                    if (dev->bpp) {
-                                        WRITE((mach->accel.ge_offset << 1) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                                    } else {
-                                        WRITE((mach->accel.ge_offset << 2) + ((dev->accel.cy) * (dev->pitch)) + (dev->accel.cx), dest_dat);
-                                    }
+                                    WRITE(mach->accel.dst_ge_offset + (dev->accel.cy * mach->accel.dst_pitch) + dev->accel.cx, dest_dat);
                                 }
                             }
                         } else
                             mach->accel.clip_overrun = ((mach->accel.clip_overrun + 1) & 0x0f);
 
-                        if (dev->accel.sx >= mach->accel.width)
+                        if (dev->accel.sx >= mach->accel.width) {
+                            if (cpu_input) {
+                                dev->force_busy = 0;
+                                dev->force_busy2 = 0;
+                                mach->force_busy = 0;
+                            }
+                            dev->fifo_idx = 0;
+                            dev->accel.cmd_back = 1;
                             break;
+                        }
 
                         if (dev->bpp)
                             cpu_dat >>= 16;
                         else
                             cpu_dat >>= 8;
 
+                        mach->accel.color_pattern_idx++;
+
+                        if (mach->accel.color_pattern_idx > mach->accel.patt_len)
+                            mach->accel.color_pattern_idx = 0;
+
                         if (mach->accel.err >= 0) {
                             dev->accel.cx += mach->accel.stepx;
                             mach->accel.err -= dev->accel.dy;
@@ -1821,8 +1829,9 @@ skip_dx:
             mach->accel.poly_fill = 0;
             mach->accel.line_array[(cmd_type == 4) ? 4 : 0] = dev->accel.cx;
             mach->accel.line_array[(cmd_type == 4) ? 5 : 1] = dev->accel.cy;
-            dev->accel.cur_x                                = mach->accel.line_array[(cmd_type == 4) ? 4 : 0];
-            dev->accel.cur_y                                = mach->accel.line_array[(cmd_type == 4) ? 5 : 1];
+            dev->accel.cur_x = dev->accel.cx;
+            dev->accel.cur_y = dev->accel.cy;
+            mach_log("Done: %i, %i\n", dev->accel.cur_x, dev->accel.cur_y);
             break;
 
         case 5: /*Horizontal Raster Draw from scan_to_x register (0xcaee)*/
@@ -1859,8 +1868,6 @@ skip_dx:
                 }
 
                 dev->accel.sx = 0;
-                if ((dev->accel_bpp == 24) && (mach->accel.patt_len < 0x17))
-                    mach->accel.color_pattern_idx = 0;
 
                 /*Step Y*/
                 mach->accel.dy_start = dev->accel.cur_y;
@@ -1871,18 +1878,17 @@ skip_dx:
                     mach->accel.dy_end |= ~0x5ff;
 
                 if (mach->accel.dy_end > mach->accel.dy_start) {
+                    dev->accel.sy = (mach->accel.dy_end - mach->accel.dy_start);
                     mach->accel.stepy = 1;
                 } else if (mach->accel.dy_end < mach->accel.dy_start) {
+                    dev->accel.sy = (mach->accel.dy_start - mach->accel.dy_end);
                     mach->accel.stepy = -1;
                 } else {
                     mach->accel.stepy = 0;
+                    dev->accel.sy = 0;
                 }
 
-                if (dev->bpp)
-                    dev->accel.dest = (mach->accel.ge_offset << 1) + (dev->accel.dy * (dev->pitch));
-                else
-                    dev->accel.dest = (mach->accel.ge_offset << 2) + (dev->accel.dy * (dev->pitch));
-
+                dev->accel.dest = mach->accel.dst_ge_offset + (dev->accel.dy * mach->accel.dst_pitch);
                 mach->accel.src_stepx = 0;
 
                 /*Source Width*/
@@ -1915,34 +1921,25 @@ skip_dx:
                 }
 
                 mach->accel.sx = 0;
-                if (dev->bpp)
-                    dev->accel.src = (mach->accel.ge_offset << 1) + (dev->accel.cy * (dev->pitch));
-                else
-                    dev->accel.src = (mach->accel.ge_offset << 2) + (dev->accel.cy * (dev->pitch));
+                dev->accel.src = mach->accel.src_ge_offset + (dev->accel.cy * mach->accel.src_pitch);
 
-                if ((dev->accel_bpp == 24) && (frgd_sel == 5)) {
-                    if (mach->accel.patt_len == 0x17)
-                        mach->accel.color_pattern_idx = 0;
-                    dev->accel.x1 = dev->accel.dx + mach->accel.width;
-                    if (dev->accel.x1 == dev->pitch) {
-                        dev->accel.x2 = mach->accel.width & 1;
-                    } else if ((dev->accel.x1 == mach->accel.width) && (dev->accel.dy & 1) && !dev->accel.y1 && dev->accel.x2) {
-                        if (mach->accel.patt_len == 0x17)
-                            mach->accel.color_pattern_idx = 3;
-                        dev->accel.x3 = 1;
-                    } else
-                        dev->accel.x3 = 0;
-                } else
-                    mach_log("ScanToX=%04x, Pitch=%d, C(%d,%d), SRCWidth=%d, WH(%d,%d), geoffset=%08x.\n", mach->accel.dp_config, dev->ext_pitch, dev->accel.cx, dev->accel.cy, mach->accel.src_width, mach->accel.width, mach->accel.height, (mach->accel.ge_offset << 1));
+                mach_log("ScanToX: Parameters=%04x: xbit=%d, ybit=%d, widthbit=%d, DX=%d, DY=%d, CX=%d, CY=%d, dstwidth=%d, srcwidth=%d, height=%d, frmix=%02x, colpatidx=%d, srcpitch=%d, dstpitch=%d, scantox=%d.\n",
+                      mach->accel.dp_config, dev->accel.dx & 1, dev->accel.dy & 1, mach->accel.width & 1, dev->accel.dx, dev->accel.dy, dev->accel.cx, dev->accel.cy, mach->accel.width, mach->accel.src_width, dev->accel.sy, dev->accel.frgd_mix & 0x1f, mach->accel.color_pattern_idx, mach->accel.src_pitch, mach->accel.dst_pitch, mach->accel.scan_to_x);
 
-                dev->accel.y1 = 0;
-
-                if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach)) {
+                if (!dev->accel.cmd_back) {
                     if (mach_pixel_write(mach)) {
+                        mach_log("Scan To X Write pixtrans.\n");
+                        dev->force_busy = 1;
+                        dev->force_busy2 = 1;
+                        mach->force_busy = 1;
                         dev->data_available  = 0;
                         dev->data_available2 = 0;
                         return;
                     } else if (mach_pixel_read(mach)) {
+                        mach_log("Scan To X Read pixtrans.\n");
+                        dev->force_busy = 1;
+                        dev->force_busy2 = 1;
+                        mach->force_busy = 1;
                         dev->data_available  = 1;
                         dev->data_available2 = 1;
                         return;
@@ -1950,30 +1947,114 @@ skip_dx:
                 }
             }
 
-            if (mono_src == 1) {
-                count               = mach->accel.width;
-                mix_dat             = mach->accel.patt_data[0x10];
-                dev->accel.temp_cnt = 8;
-            }
+            if ((dev->accel_bpp == 24) && (mach->accel.dp_config == 0x6211)) {
+                int64_t cx;
+                int64_t cy;
 
-            if (frgd_sel == 5) {
-                if (dev->accel_bpp != 24) {
-                    for (int x = 0; x <= mach->accel.patt_len; x++) {
-                        mach->accel.color_pattern[x] = mach->accel.patt_data[x & mach->accel.patt_len];
+                cx = mach->accel.src_x_scan;
+                cy = mach->accel.src_y_scan;
+
+                if (mach->accel.src_stepx == -1) {
+                    if (cx > 0)
+                        cx--;
+                }
+
+                dev->accel.src = mach->accel.src_ge_offset + (cy * mach->accel.src_pitch);
+
+                while (1) {
+                    mix = 1;
+
+                    if ((dev->accel.dx >= clip_l) &&
+                        (dev->accel.dx <= clip_r) &&
+                        (dev->accel.dy >= clip_t) &&
+                        (dev->accel.dy <= clip_b)) {
+                        dev->subsys_stat |= INT_GE_BSY;
+                        READ(dev->accel.src + cx, src_dat);
+                        READ(dev->accel.dest + dev->accel.dx, dest_dat);
+
+                        switch (compare_mode) {
+                            case 1:
+                                compare = 1;
+                                break;
+                            case 2:
+                                compare = (dest_dat >= dest_cmp_clr) ? 0 : 1;
+                                break;
+                            case 3:
+                                compare = (dest_dat < dest_cmp_clr) ? 0 : 1;
+                                break;
+                            case 4:
+                                compare = (dest_dat != dest_cmp_clr) ? 0 : 1;
+                                break;
+                            case 5:
+                                compare = (dest_dat == dest_cmp_clr) ? 0 : 1;
+                                break;
+                            case 6:
+                                compare = (dest_dat <= dest_cmp_clr) ? 0 : 1;
+                                break;
+                            case 7:
+                                compare = (dest_dat > dest_cmp_clr) ? 0 : 1;
+                                break;
+
+                            default:
+                                break;
+                        }
+
+                        if (!compare) {
+                            old_dest_dat = dest_dat;
+                            MIX(mix, dest_dat, src_dat);
+                            dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);
+                        }
+
+                        WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
                     }
-                } else {
-                    if (mach->accel.patt_len == 0x17) {
-                        for (int x = 0; x <= mach->accel.patt_len; x++) {
-                            mach->accel.color_pattern_full[x] = mach->accel.patt_data[x];
-                            mach_log("ScanToX: Color Pattern 24bpp[%d]=%02x, dataidx=%d, pattlen=%d.\n", x, mach->accel.color_pattern_full[x], mach->accel.patt_data_idx, mach->accel.patt_len);
+
+                    cx += mach->accel.src_stepx;
+                    mach->accel.sx++;
+                    if (mach->accel.sx >= mach->accel.src_width) {
+                        mach->accel.sx = 0;
+                        cx = mach->accel.src_x_scan;
+                        if (mach->accel.src_stepx == -1) {
+                            if (cx > 0)
+                                cx--;
                         }
-                    } else {
-                        for (int x = 0; x <= mach->accel.patt_len; x++) {
-                            mach->accel.color_pattern[x] = mach->accel.patt_data[x];
-                            mach_log("ScanToX: Color Pattern 24bpp[%d]=%02x, dataidx=%d, pattlen=%d.\n", x, mach->accel.color_pattern[x], mach->accel.patt_data_idx, mach->accel.patt_len);
+
+                        cy += (mach->accel.src_y_dir ? 1 : -1);
+                        dev->accel.src = mach->accel.src_ge_offset + (cy * mach->accel.src_pitch);
+                    }
+
+                    dev->accel.dx += mach->accel.stepx;
+                    dev->accel.sx++;
+                    if (dev->accel.sx >= mach->accel.width) {
+                        dev->accel.sx = 0;
+                        dev->accel.dy += mach->accel.stepy;
+                        dev->accel.dest = mach->accel.dst_ge_offset + (dev->accel.dy * mach->accel.dst_pitch);
+
+                        if (mach->accel.line_idx == 2) {
+                            mach->accel.line_array[0] = dev->accel.dx;
+                            mach->accel.line_array[4] = dev->accel.dx;
                         }
+                        if (dev->accel.sy >= 0)
+                            dev->accel.sy--;
+
+                        dev->fifo_idx = 0;
+                        dev->force_busy = 0;
+                        dev->force_busy2 = 0;
+                        mach->force_busy = 0;
+                        dev->accel.cmd_back = 1;
+                        dev->accel.cur_x = dev->accel.dx;
+                        dev->accel.cur_y = dev->accel.dy;
+                        mach->accel.src_x_scan = cx;
+                        mach->accel.src_y_scan = cy;
+                        return;
                     }
                 }
+                return;
+            }
+
+            if (mono_src == 1) {
+                count               = mach->accel.width;
+                mix_dat             = mach->accel.mono_pattern_normal[0];
+                dev->accel.temp_cnt = 8;
             }
 
             while (count--) {
@@ -2007,7 +2088,7 @@ skip_dx:
                         }
                         break;
                     case 3:
-                        READ(dev->accel.src + (dev->accel.cx), mix);
+                        READ(dev->accel.src + dev->accel.cx, mix);
                         mix = (mix & rd_mask) == rd_mask;
                         break;
 
@@ -2015,13 +2096,17 @@ skip_dx:
                         break;
                 }
 
-                if (((dev->accel.dx) >= clip_l) && ((dev->accel.dx) <= clip_r) && ((dev->accel.dy) >= clip_t) && ((dev->accel.dy) <= clip_b)) {
+                if ((dev->accel.dx >= clip_l) &&
+                    (dev->accel.dx <= clip_r) &&
+                    (dev->accel.dy >= clip_t) &&
+                    (dev->accel.dy <= clip_b)) {
+                    dev->subsys_stat |= INT_GE_BSY;
                     switch (mix ? frgd_sel : bkgd_sel) {
                         case 0:
-                            src_dat = dev->accel.bkgd_color;
+                            src_dat = bkgd_color;
                             break;
                         case 1:
-                            src_dat = dev->accel.frgd_color;
+                            src_dat = frgd_color;
                             break;
                         case 2:
                             src_dat = cpu_dat;
@@ -2036,16 +2121,10 @@ skip_dx:
                             }
                             break;
                         case 5:
-                            if (mix) {
-                                if (dev->accel_bpp == 24) {
-                                    if (mach->accel.patt_len == 0x17)
-                                        src_dat = mach->accel.color_pattern_full[mach->accel.color_pattern_idx];
-                                    else
-                                        src_dat = mach->accel.color_pattern[mach->accel.color_pattern_idx];
-                                } else
-                                    src_dat = mach->accel.color_pattern[(dev->accel.dx + (dev->accel.dy << 3)) & mach->accel.patt_len];
-                            } else
-                                src_dat = 0;
+                            if (dev->bpp)
+                                src_dat = mach->accel.color_pattern_hicol[mach->accel.color_pattern_idx];
+                            else
+                                src_dat = mach->accel.color_pattern[mach->accel.color_pattern_idx];
                             break;
 
                         default:
@@ -2090,7 +2169,7 @@ skip_dx:
                     }
 
                     if (mach->accel.dp_config & 0x10) {
-                        WRITE(dev->accel.dest + (dev->accel.dx), dest_dat);
+                        WRITE(dev->accel.dest + dev->accel.dx, dest_dat);
                     }
                 }
 
@@ -2103,46 +2182,39 @@ skip_dx:
                 mach->accel.sx++;
                 if (mach->accel.sx >= mach->accel.src_width) {
                     mach->accel.sx = 0;
-                    if (mach->accel.src_stepx == -1) {
+                    if (mach->accel.src_stepx == -1)
                         dev->accel.cx += mach->accel.src_width;
-                    } else
-                        dev->accel.cx -= mach->accel.src_width;
-                    dev->accel.cy += (mach->accel.src_y_dir ? 1 : -1);
-                    if (dev->bpp)
-                        dev->accel.src = (mach->accel.ge_offset << 1) + (dev->accel.cy * (dev->pitch));
                     else
-                        dev->accel.src = (mach->accel.ge_offset << 2) + (dev->accel.cy * (dev->pitch));
+                        dev->accel.cx -= mach->accel.src_width;
+
+                    dev->accel.cy += (mach->accel.src_y_dir ? 1 : -1);
+                    dev->accel.src = mach->accel.src_ge_offset + (dev->accel.cy * mach->accel.src_pitch);
                 }
 
-                dev->accel.dx += mach->accel.stepx;
-                if ((dev->accel_bpp == 24) && (mach->accel.patt_len == 0x17)) {
-                    mach->accel.color_pattern_idx++;
-                    if (dev->accel.x3) {
-                        if (mach->accel.color_pattern_idx == 9)
-                            mach->accel.color_pattern_idx = 3;
-                    } else {
-                        if (mach->accel.color_pattern_idx == 6)
-                            mach->accel.color_pattern_idx = 0;
-                    }
-                } else if ((dev->accel_bpp == 24) && (mach->accel.patt_len < 3)) {
-                    mach->accel.color_pattern_idx++;
-                    if (mach->accel.color_pattern_idx == 3)
-                        mach->accel.color_pattern_idx = 0;
-                } else
-                    mach->accel.color_pattern_idx = (mach->accel.color_pattern_idx + mach->accel.stepx) & mach->accel.patt_len;
+                mach->accel.color_pattern_idx++;
 
+                if (mach->accel.color_pattern_idx > mach->accel.patt_len)
+                    mach->accel.color_pattern_idx = 0;
+
+                dev->accel.dx += mach->accel.stepx;
                 dev->accel.sx++;
                 if (dev->accel.sx >= mach->accel.width) {
                     dev->accel.sx = 0;
                     dev->accel.dy += mach->accel.stepy;
-                    if (dev->bpp)
-                        dev->accel.dest = (mach->accel.ge_offset << 1) + (dev->accel.dy * (dev->pitch));
-                    else
-                        dev->accel.dest = (mach->accel.ge_offset << 2) + (dev->accel.dy * (dev->pitch));
+                    dev->accel.dest = mach->accel.dst_ge_offset + (dev->accel.dy * mach->accel.dst_pitch);
+
                     if (mach->accel.line_idx == 2) {
                         mach->accel.line_array[0] = dev->accel.dx;
                         mach->accel.line_array[4] = dev->accel.dx;
                     }
+                    if (dev->accel.sy >= 0)
+                        dev->accel.sy--;
+
+                    dev->fifo_idx = 0;
+                    dev->force_busy = 0;
+                    dev->force_busy2 = 0;
+                    mach->force_busy = 0;
+                    dev->accel.cmd_back = 1;
                     return;
                 }
             }
@@ -2154,42 +2226,49 @@ skip_dx:
 }
 
 static void
-mach_accel_out_pixtrans(mach_t *mach, ibm8514_t *dev, uint16_t val)
+mach_accel_out_pixtrans(svga_t *svga, mach_t *mach, ibm8514_t *dev, uint16_t val)
 {
     int frgd_sel;
     int bkgd_sel;
     int mono_src;
+    int swap = 0;
 
     frgd_sel = (mach->accel.dp_config >> 13) & 7;
     bkgd_sel = (mach->accel.dp_config >> 7) & 3;
     mono_src = (mach->accel.dp_config >> 5) & 3;
 
-    if ((mach->accel.dp_config & 4) && (mach->accel.cmd_type != 5)) {
+    if ((mach->accel.dp_config & 0x04) && (mach->accel.cmd_type != 5)) {
+        mach_log("Read Host Monochrome Data.\n");
         val = (val >> 8) | (val << 8);
+        swap = 1;
     }
 
     switch (mach->accel.dp_config & 0x200) {
         case 0x000: /*8-bit size*/
             if (mono_src == 2) {
                 if ((frgd_sel != 2) && (bkgd_sel != 2)) {
-                    if (mach->accel.dp_config & 0x1000)
+                    if ((mach->accel.dp_config & 0x1000) && !swap) {
+                        mach_log("8-bit bus size swap.\n");
                         val = (val >> 8) | (val << 8);
-                    mach_accel_start(mach->accel.cmd_type, 1, 8, val | (val << 16), 0, mach, dev);
+                    }
+                    mach_accel_start(mach->accel.cmd_type, 1, 8, val | (val << 16), 0, svga, mach, dev);
                 } else
-                    mach_accel_start(mach->accel.cmd_type, 1, 1, -1, val | (val << 16), mach, dev);
+                    mach_accel_start(mach->accel.cmd_type, 1, 1, -1, val | (val << 16), svga, mach, dev);
             } else
-                mach_accel_start(mach->accel.cmd_type, 1, 1, -1, val | (val << 16), mach, dev);
+                mach_accel_start(mach->accel.cmd_type, 1, 1, -1, val | (val << 16), svga, mach, dev);
             break;
         case 0x200: /*16-bit size*/
             if (mono_src == 2) {
                 if ((frgd_sel != 2) && (bkgd_sel != 2)) {
-                    if (mach->accel.dp_config & 0x1000)
+                    if (((mach->accel.dp_config & 0x1000) && !swap) || (!(mach->accel.dp_config & 0x1000) && swap)) {
+                        mach_log("16-bit bus size swap.\n");
                         val = (val >> 8) | (val << 8);
-                    mach_accel_start(mach->accel.cmd_type, 1, 16, val | (val << 16), 0, mach, dev);
+                    }
+                    mach_accel_start(mach->accel.cmd_type, 1, 16, val | (val << 16), 0, svga, mach, dev);
                 } else
-                    mach_accel_start(mach->accel.cmd_type, 1, 2, -1, val | (val << 16), mach, dev);
+                    mach_accel_start(mach->accel.cmd_type, 1, 2, -1, val | (val << 16), svga, mach, dev);
             } else
-                mach_accel_start(mach->accel.cmd_type, 1, 2, -1, val | (val << 16), mach, dev);
+                mach_accel_start(mach->accel.cmd_type, 1, 2, -1, val | (val << 16), svga, mach, dev);
             break;
 
         default:
@@ -2202,7 +2281,7 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
 {
     mach_t          *mach = (mach_t *) priv;
     svga_t          *svga = &mach->svga;
-    const ibm8514_t *dev  = (ibm8514_t *) svga->dev8514;
+    ibm8514_t       *dev  = (ibm8514_t *) svga->dev8514;
     uint8_t          old;
     uint8_t          rs2;
     uint8_t          rs3;
@@ -2210,6 +2289,14 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
     if (((addr & 0xFFF0) == 0x3D0 || (addr & 0xFFF0) == 0x3B0) && !(svga->miscout & 1))
         addr ^= 0x60;
 
+    if ((addr >= 0x3c6) && (addr <= 0x3c9)) {
+        mach_log("VGA DAC write regs=%03x, on=%d, display control=%02x, on1=%x, clocksel=%02x.\n",
+                 addr, dev->on, dev->disp_cntl & 0x60, dev->accel.advfunc_cntl & 0x01, mach->accel.clock_sel & 0x01);
+    } else if ((addr >= 0x2ea) && (addr <= 0x2ed)) {
+        mach_log("8514/A DAC write regs=%03x, on=%d, display control=%02x, on1=%x, clocksel=%02x.\n",
+                 addr, dev->on, dev->disp_cntl & 0x60, dev->accel.advfunc_cntl & 0x01, mach->accel.clock_sel & 0x01);
+    }
+
     switch (addr) {
         case 0x1ce:
             mach->index = val;
@@ -2217,25 +2304,50 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
         case 0x1cf:
             old                     = mach->regs[mach->index];
             mach->regs[mach->index] = val;
-            mach_log("ATI VGA write reg=0x%02X, val=0x%02X\n", mach->index, val);
+            mach_log("ATI VGA write reg=%02x, val=%02x, old=%02x.\n", mach->index, val, old);
             switch (mach->index) {
                 case 0xa3:
-                    if ((old ^ val) & 0x10)
+                    if ((old ^ val) & 0x10) {
+                        mach_log("ATI A3 bit 7.\n");
                         svga_recalctimings(svga);
+                    }
                     break;
                 case 0xa7:
-                    if ((old ^ val) & 0x80)
+                    if ((old ^ val) & 0x80) {
+                        mach_log("ATI A7 bit 7.\n");
                         svga_recalctimings(svga);
+                    }
                     break;
                 case 0xad:
-                    if ((dev->local & 0xff) >= 0x02) {
-                        if ((old ^ val) & 0x0c)
+                    if (ATI_MACH32) {
+                        if ((old ^ val) & 0x0c) {
+                            mach_log("ATI AD bits 2-3.\n");
                             svga_recalctimings(svga);
+                        }
                     }
                     break;
                 case 0xb0:
-                    if ((old ^ val) & 0x60)
-                        svga_recalctimings(svga);
+                    if ((old ^ val) & 0x60) {
+                        if (dev->_8514crt) {
+                            if (!(mach->accel.clock_sel & 0x01)) {
+                                if ((val & 0x20) && !(old & 0x20)) {
+                                    dev->on = 1;
+                                    dev->vendor_mode = !!(ATI_MACH32);
+                                    mach_set_resolution(mach, svga);
+                                    mach32_updatemapping(mach, svga);
+                                } else if (!(val & 0x20) && (old & 0x20)) {
+                                    dev->on = 0;
+                                    dev->vendor_mode = 0;
+                                    mach_set_resolution(mach, svga);
+                                    mach32_updatemapping(mach, svga);
+                                }
+                            }
+                        } else
+                            svga_recalctimings(svga);
+
+                        mach_log("ATI B0 bits 5-6: old=%02x, val=%02x, on=%d, bpp=%d, hires=%x, vgahires=%02x, base=%05x.\n",
+                              old & 0x60, val & 0x60, dev->on, dev->accel_bpp, dev->accel.advfunc_cntl & 0x04, svga->gdcreg[5] & 0x60, svga->mapping.base);
+                    }
                     break;
                 case 0xae:
                 case 0xb2:
@@ -2244,53 +2356,58 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
                     if (mach->regs[0xbe] & 0x08) { /* Read/write bank mode */
                         mach->bank_r = (((mach->regs[0xb2] & 1) << 3) | ((mach->regs[0xb2] & 0xe0) >> 5));
                         mach->bank_w = ((mach->regs[0xb2] & 0x1e) >> 1);
-                        if ((dev->local & 0xff) >= 0x02) {
+                        if (ATI_MACH32) {
                             mach->bank_r |= ((mach->regs[0xae] & 0x0c) << 2);
                             mach->bank_w |= ((mach->regs[0xae] & 3) << 4);
                         }
-                        if (dev->on[0] || dev->on[1])
-                            mach_log("Separate B2Bank = %02x, AEbank = %02x.\n", mach->regs[0xb2], mach->regs[0xae]);
+                        mach_log("Separate B2Bank = %02x, AEbank = %02x.\n", mach->regs[0xb2], mach->regs[0xae]);
                     } else { /* Single bank mode */
                         mach->bank_w = ((mach->regs[0xb2] & 0x1e) >> 1);
-                        if ((dev->local & 0xff) >= 0x02) {
+                        if (ATI_MACH32)
                             mach->bank_w |= ((mach->regs[0xae] & 3) << 4);
-                        }
+
                         mach->bank_r = mach->bank_w;
-                        if (dev->on[0] || dev->on[1])
-                            mach_log("Single B2Bank = %02x, AEbank = %02x.\n", mach->regs[0xb2], mach->regs[0xae]);
+                        mach_log("Single B2Bank = %02x, AEbank = %02x.\n", mach->regs[0xb2], mach->regs[0xae]);
                     }
                     svga->read_bank  = mach->bank_r << 16;
                     svga->write_bank = mach->bank_w << 16;
 
                     if (mach->index == 0xbe) {
-                        if ((old ^ val) & 0x10)
+                        if ((old ^ val) & 0x10) {
+                            mach_log("ATI BE bit 4.\n");
                             svga_recalctimings(svga);
+                        }
                     }
                     break;
                 case 0xbd:
-                    if ((old ^ val) & 4) {
+                    if ((old ^ val) & 0x04)
                         mach32_updatemapping(mach, svga);
-                    }
                     break;
                 case 0xb3:
-                    ati_eeprom_write(&mach->eeprom, val & 8, val & 2, val & 1);
+                    ati_eeprom_write(&mach->eeprom, val & 0x08, val & 0x02, val & 0x01);
                     break;
                 case 0xb6:
-                    if ((old ^ val) & 0x10)
+                    if ((old ^ val) & 0x10) {
+                        mach_log("ATI B6 bit 4.\n");
                         svga_recalctimings(svga);
+                    }
                     break;
                 case 0xb8:
-                    if ((dev->local & 0xff) >= 0x02) {
-                        if ((old ^ val) & 0x40)
+                    if (ATI_MACH32) {
+                        if ((old ^ val) & 0x40) {
+                            mach_log("ATI B8 bit 6.\n");
                             svga_recalctimings(svga);
+                        }
                     } else {
                         if ((old ^ val) & 0xc0)
                             svga_recalctimings(svga);
                     }
                     break;
                 case 0xb9:
-                    if ((old ^ val) & 2)
+                    if ((old ^ val) & 0x02) {
+                        mach_log("ATI B9 bit 1.\n");
                         svga_recalctimings(svga);
+                    }
                     break;
 
                 default:
@@ -2304,40 +2421,105 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
         case 0x2ed:
             rs2 = !!(mach->accel.ext_ge_config & 0x1000);
             rs3 = !!(mach->accel.ext_ge_config & 0x2000);
-            if ((dev->local & 0xff) >= 0x02) {
-                if (mach->pci_bus && !mach->ramdac_type)
-                    ati68860_ramdac_out((addr & 3) | (rs2 << 2) | (rs3 << 3), val, svga->ramdac, svga);
+            mach_log("8514/A Extended mode=%02x.\n", mach->regs[0xb0] & 0x20);
+            if (ATI_MACH32) {
+                if (mach->pci_bus && (mach->ramdac_type == ATI_68860))
+                    ati68860_ramdac_out((addr & 0x03) | (rs2 << 2) | (rs3 << 3), val, 1, svga->ramdac, svga);
                 else
-                    ati68875_ramdac_out(addr, rs2, rs3, val, svga->ramdac, svga);
+                    ati68875_ramdac_out(addr, rs2, rs3, val, 1, svga->ramdac, svga);
             } else
                 svga_out(addr, val, svga);
             return;
 
+        case 0x3C2:
+            if (mach->regs[0xb8] & 0x08)
+                return;
+            break;
+
         case 0x3C6:
         case 0x3C7:
         case 0x3C8:
         case 0x3C9:
             rs2 = !!(mach->regs[0xa0] & 0x20);
             rs3 = !!(mach->regs[0xa0] & 0x40);
-            if ((dev->local & 0xff) >= 0x02) {
-                if (mach->pci_bus && !mach->ramdac_type)
-                    ati68860_ramdac_out((addr & 3) | (rs2 << 2) | (rs3 << 3), val, svga->ramdac, svga);
+            mach_log("VGA Extended mode=%02x.\n", mach->regs[0xb0] & 0x20);
+            if (ATI_MACH32) {
+                if (mach->pci_bus && (mach->ramdac_type == ATI_68860))
+                    ati68860_ramdac_out((addr & 0x03) | (rs2 << 2) | (rs3 << 3), val, 0, svga->ramdac, svga);
                 else
-                    ati68875_ramdac_out(addr, rs2, rs3, val, svga->ramdac, svga);
+                    ati68875_ramdac_out(addr, rs2, rs3, val, 0, svga->ramdac, svga);
             } else
                 svga_out(addr, val, svga);
             return;
 
+        case 0x3CF:
+            if (svga->gdcaddr == 6) {
+                uint8_t old_val = svga->gdcreg[6];
+                svga->gdcreg[6] = val;
+                if ((svga->gdcreg[6] & 0xc) != (old_val & 0xc)) {
+                    mach_log("GDCREG6=%02x.\n", svga->gdcreg[6] & 0xc);
+                    mach32_updatemapping(mach, svga);
+                }
+                return;
+            }
+            break;
+
         case 0x3D4:
             svga->crtcreg = val & 0x3f;
             return;
         case 0x3D5:
             if (svga->crtcreg & 0x20)
                 return;
-            if ((svga->crtcreg < 7) && (svga->crtc[0x11] & 0x80) && !(mach->regs[0xb4] & 0x80))
+            if ((svga->crtcreg < 7) && ((svga->crtc[0x11] & 0x80) || (mach->regs[0xb4] & 0x40)) && !(mach->regs[0xb4] & 0x80))
                 return;
-            if ((svga->crtcreg == 7) && (svga->crtc[0x11] & 0x80) && !(mach->regs[0xb4] & 0x80))
+            if ((svga->crtcreg == 7) && ((svga->crtc[0x11] & 0x80) || (mach->regs[0xb4] & 0x40)) && !(mach->regs[0xb4] & 0x80))
                 val = (svga->crtc[7] & ~0x10) | (val & 0x10);
+            if (mach->regs[0xb8] & 0x04) {
+                if ((svga->crtcreg < 0x0a) || (svga->crtcreg > 0x0d))
+                    return;
+            }
+            if (mach->regs[0xb4] & 0x04) {
+                if (svga->crtcreg == 9) {
+                    if (val & 0x8f)
+                        return;
+                }
+            }
+            if (mach->regs[0xb4] & 0x08) {
+                if (svga->crtcreg == 6)
+                    return;
+                if (svga->crtcreg == 7) {
+                    if (val & 0xaf)
+                        return;
+                }
+                if (svga->crtcreg == 9) {
+                    if (val & 0x20)
+                        return;
+                }
+                if (svga->crtcreg == 0x11) {
+                    if (val & 0x0f)
+                        return;
+                }
+                if ((svga->crtcreg == 0x10) ||
+                    (svga->crtcreg == 0x12) ||
+                    (svga->crtcreg == 0x15) ||
+                    (svga->crtcreg == 0x16))
+                    return;
+            }
+            if (mach->regs[0xb4] & 0x10) {
+                if ((svga->crtcreg == 0x0a) ||
+                    (svga->crtcreg == 0x0b))
+                    return;
+            }
+            if (mach->regs[0xb4] & 0x20) {
+                if (svga->crtcreg == 8) {
+                    if (val & 0x7f)
+                        return;
+                }
+                if (svga->crtcreg == 0x14) {
+                    if (val & 0x1f)
+                        return;
+                }
+            }
 
             old                       = svga->crtc[svga->crtcreg];
             svga->crtc[svga->crtcreg] = val;
@@ -2345,9 +2527,9 @@ mach_out(uint16_t addr, uint8_t val, void *priv)
                 if (svga->crtcreg < 0xe || svga->crtcreg > 0x10) {
                     if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
                     } else {
-                        svga->fullchange = changeframecount;
+                        svga->fullchange = svga->monitor->mon_changeframecount;
                         svga_recalctimings(svga);
                     }
                 }
@@ -2365,7 +2547,7 @@ mach_in(uint16_t addr, void *priv)
 {
     mach_t          *mach = (mach_t *) priv;
     svga_t          *svga = &mach->svga;
-    const ibm8514_t *dev  = (ibm8514_t *) svga->dev8514;
+    ibm8514_t       *dev  = (ibm8514_t *) svga->dev8514;
     uint8_t          temp = 0xff;
     uint8_t          rs2;
     uint8_t          rs3;
@@ -2373,6 +2555,12 @@ mach_in(uint16_t addr, void *priv)
     if (((addr & 0xFFF0) == 0x3D0 || (addr & 0xFFF0) == 0x3B0) && !(svga->miscout & 1))
         addr ^= 0x60;
 
+    if ((addr >= 0x3c6) && (addr <= 0x3c9) && dev->on) {
+        addr -= 0xdc;
+        mach_log("VGA DAC read regs=%03x.\n", addr);
+    } else if ((addr >= 0x2ea) && (addr <= 0x2ed))
+        mach_log("8514/A DAC read regs=%03x.\n", addr);
+
     switch (addr) {
         case 0x1ce:
             temp = mach->index;
@@ -2388,19 +2576,25 @@ mach_in(uint16_t addr, void *priv)
                 case 0xa9:
                     temp = svga->vc & 0xff;
                     break;
+                case 0xaa:
+                    if (ATI_GRAPHICS_ULTRA)
+                        temp = 0x06;
+                    else
+                        temp = 0x00;
+                    break;
                 case 0xb0:
                     temp = mach->regs[0xb0] | 0x80;
                     temp &= ~0x18;
-                    if ((dev->local & 0xff) >= 0x02) { /*Mach32 VGA 1MB memory*/
+                    if (ATI_MACH32) { /*Mach32 VGA 1MB memory*/
                         temp |= 0x08;
                     } else { /*ATI 28800 VGA 512kB memory*/
                         temp |= 0x10;
                     }
                     break;
                 case 0xb7:
-                    temp = mach->regs[0xb7] & ~8;
+                    temp = mach->regs[0xb7] & ~0x08;
                     if (ati_eeprom_read(&mach->eeprom))
-                        temp |= 8;
+                        temp |= 0x08;
                     break;
 
                 case 0xbd:
@@ -2411,6 +2605,7 @@ mach_in(uint16_t addr, void *priv)
                     temp = mach->regs[mach->index];
                     break;
             }
+            mach_log("ATI VGA read reg=%02x, val=%02x.\n", mach->index, temp);
             break;
 
         case 0x2ea:
@@ -2419,26 +2614,11 @@ mach_in(uint16_t addr, void *priv)
         case 0x2ed:
             rs2 = !!(mach->accel.ext_ge_config & 0x1000);
             rs3 = !!(mach->accel.ext_ge_config & 0x2000);
-            if ((dev->local & 0xff) >= 0x02) {
-                if (mach->pci_bus && !mach->ramdac_type)
-                    temp = ati68860_ramdac_in((addr & 3) | (rs2 << 2) | (rs3 << 3), svga->ramdac, svga);
+            if (ATI_MACH32) {
+                if (mach->pci_bus && (mach->ramdac_type == ATI_68860))
+                    temp = ati68860_ramdac_in((addr & 3) | (rs2 << 2) | (rs3 << 3), 1, svga->ramdac, svga);
                 else
-                    temp = ati68875_ramdac_in(addr, rs2, rs3, svga->ramdac, svga);
-            } else
-                temp = svga_in(addr, svga);
-            break;
-
-        case 0x3C6:
-        case 0x3C7:
-        case 0x3C8:
-        case 0x3C9:
-            rs2 = !!(mach->regs[0xa0] & 0x20);
-            rs3 = !!(mach->regs[0xa0] & 0x40);
-            if ((dev->local & 0xff) >= 0x02) {
-                if (mach->pci_bus && !mach->ramdac_type)
-                    temp = ati68860_ramdac_in((addr & 3) | (rs2 << 2) | (rs3 << 3), svga->ramdac, svga);
-                else
-                    temp = ati68875_ramdac_in(addr, rs2, rs3, svga->ramdac, svga);
+                    temp = ati68875_ramdac_in(addr, rs2, rs3, 1, svga->ramdac, svga);
             } else
                 temp = svga_in(addr, svga);
             break;
@@ -2460,121 +2640,465 @@ mach_in(uint16_t addr, void *priv)
     return temp;
 }
 
-
-#ifdef ATI_8514_ULTRA
-static void
+void
 ati8514_out(uint16_t addr, uint8_t val, void *priv)
 {
-    mach_log("ADDON OUT addr=%03x, val=%02x.\n", addr, val);
+    mach_log("[%04X:%08X]: ADDON OUT addr=%03x, val=%02x.\n", CS, cpu_state.pc, addr, val);
+
     svga_out(addr, val, priv);
 }
 
-static uint8_t
+uint8_t
 ati8514_in(uint16_t addr, void *priv)
 {
     uint8_t temp = 0xff;
 
     temp = svga_in(addr, priv);
 
-    mach_log("ADDON IN addr=%03x, temp=%02x.\n", addr, temp);
+    mach_log("[%04X:%08X]: ADDON IN addr=%03x, temp=%02x.\n", CS, cpu_state.pc, addr, temp);
     return temp;
 }
 
+static void
+ati_render_24bpp(svga_t *svga)
+{
+    mach_t    *mach = (mach_t *) svga->priv;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+    uint32_t *p;
+    uint32_t  dat;
+
+    if ((dev->displine + svga->y_add) < 0)
+        return;
+
+    if (dev->changedvram[dev->memaddr >> 12] || dev->changedvram[(dev->memaddr >> 12) + 1] || svga->fullchange) {
+        p = &buffer32->line[dev->displine + svga->y_add][svga->x_add];
+
+        if (dev->firstline_draw == 2000)
+            dev->firstline_draw = dev->displine;
+        dev->lastline_draw = dev->displine;
+
+        if (mach->accel.ext_ge_config & 0x400) { /*BGR, Blue-(23:16), Green-(15:8), Red-(7:0)*/
+            for (int x = 0; x <= dev->h_disp; x += 4) {
+                dat  = *(uint32_t *) (&dev->vram[dev->memaddr & dev->vram_mask]);
+                p[x] = ((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16);
+
+                dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + 3) & dev->vram_mask]);
+                p[x + 1] = ((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16);
+
+                dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + 6) & dev->vram_mask]);
+                p[x + 2] = ((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16);
+
+                dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + 9) & dev->vram_mask]);
+                p[x + 3] = ((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16);
+
+                dev->memaddr += 12;
+            }
+        } else { /*RGB, Red-(23:16), Green-(15:8), Blue-(7:0)*/
+            for (int x = 0; x <= dev->h_disp; x += 4) {
+                dat  = *(uint32_t *) (&dev->vram[dev->memaddr & dev->vram_mask]);
+                p[x] = dat & 0xffffff;
+
+                dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + 3) & dev->vram_mask]);
+                p[x + 1] = dat & 0xffffff;
+
+                dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + 6) & dev->vram_mask]);
+                p[x + 2] = dat & 0xffffff;
+
+                dat      = *(uint32_t *) (&dev->vram[(dev->memaddr + 9) & dev->vram_mask]);
+                p[x + 3] = dat & 0xffffff;
+
+                dev->memaddr += 12;
+            }
+        }
+        dev->memaddr &= dev->vram_mask;
+    }
+}
+
+static void
+ati_render_32bpp(svga_t *svga)
+{
+    mach_t    *mach = (mach_t *) svga->priv;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+    int        x;
+    uint32_t  *p;
+    uint32_t   dat;
+
+    if ((dev->displine + svga->y_add) < 0)
+        return;
+
+    if (dev->changedvram[dev->memaddr >> 12] || dev->changedvram[(dev->memaddr >> 12) + 1] || dev->changedvram[(dev->memaddr >> 12) + 2] || svga->fullchange) {
+        p = &buffer32->line[dev->displine + svga->y_add][svga->x_add];
+
+        if (dev->firstline_draw == 2000)
+            dev->firstline_draw = dev->displine;
+        dev->lastline_draw = dev->displine;
+
+        if (mach->accel.ext_ge_config & 0x400) { /*BGR, Blue-(23:16), Green-(15:8), Red-(7:0)*/
+            for (x = 0; x <= dev->h_disp; x++) {
+                dat  = *(uint32_t *) (&dev->vram[(dev->memaddr + (x << 2)) & dev->vram_mask]);
+                *p++ = ((dat & 0x00ff0000) >> 16) | (dat & 0x0000ff00) | ((dat & 0x000000ff) << 16);
+            }
+        } else { /*RGB, Red-(31:24), Green-(23:16), Blue-(15:8)*/
+            for (x = 0; x <= dev->h_disp; x++) {
+                dat  = *(uint32_t *) (&dev->vram[(dev->memaddr + (x << 2)) & dev->vram_mask]);
+                *p++ = ((dat & 0xffffff00) >> 8);
+            }
+        }
+        dev->memaddr += (x * 4);
+        dev->memaddr &= dev->vram_mask;
+    }
+}
+
+/*The situation is the following:
+  When ATI (0x4aee) mode is selected, allow complete auto-detection.
+  When 8514/A (0x4ae8) mode is selected, allow detection based on the shadow register sets.
+*/
+static void
+mach_set_resolution(mach_t *mach, svga_t *svga)
+{
+    ibm8514_t    *dev = (ibm8514_t *) svga->dev8514;
+
+    dev->h_total = (dev->htotal + 1);
+    if (dev->h_total == 8) /*Default to 1024x768 87hz 8514/A htotal timings if it goes to 0.*/
+        dev->h_total = 0x9e;
+
+    dev->hdisp = (dev->hdisped + 1) << 3;
+
+    dev->vdisp = (dev->v_disp + 1) >> 1;
+    if ((dev->vdisp == 478) || (dev->vdisp == 598) || (dev->vdisp == 766) || (dev->vdisp == 898) || (dev->vdisp == 1022))
+        dev->vdisp += 2;
+
+    dev->v_total = dev->v_total_reg + 1;
+    if (dev->v_total == 1)
+        dev->v_total = 0x0669;
+
+    dev->v_syncstart = dev->v_sync_start + 1;
+    if (dev->v_syncstart == 1)
+        dev->v_syncstart = 0x0601;
+
+    mach->accel.clock_sel_mode = 0;
+    mach_log("ATI Mode: set=%02x, dispcntl=%02x, h_total=%d, hdisp=%d, vdisp=%d, v_total=%04x, v_syncstart=%04x, hsync_start=%d, hsync_width=%d, clocksel=%02x, advancedcntl=%02x.\n", mach->shadow_set & 0x03, dev->disp_cntl, dev->h_total, dev->hdisp, dev->vdisp, dev->v_total, dev->v_syncstart, dev->hsync_start, dev->hsync_width, mach->accel.clock_sel & 0xff, dev->accel.advfunc_cntl & 0x05);
+    if ((dev->disp_cntl_2 >> 5) == 1) { /*Enable the 8514/A subsystem and set modes according to the shadow sets if needed.*/
+        switch (mach->shadow_set & 0x03) {
+            case 0x01:
+                if (!(dev->accel.advfunc_cntl & 0x04)) {
+                    dev->hdisp = 640;
+                    dev->vdisp = 480;
+                    if (ATI_8514A_ULTRA) {
+                        dev->h_total = (mach->eeprom.data[0x11] & 0xff) + 1;
+                        dev->v_total = mach->eeprom.data[0x0d] + 1;
+                        dev->v_syncstart = mach->eeprom.data[9] + 1;
+                        mach->accel.clock_sel_mode = (mach->eeprom.data[4] & 0xff) << 2;
+                    } else {
+                        mach_log("Mach: EEPROM 640x480: %04x.\n", mach->eeprom.data[7]);
+                        switch (mach->eeprom.data[7] & 0xff) {
+                            case 0x00: /*640x480 60Hz Non-interlaced*/
+                            default:
+                                dev->h_total = 0x64;
+                                dev->v_total = 0x0419;
+                                dev->v_syncstart = 0x03d7;
+                                mach->accel.clock_sel_mode = 0x50;
+                                break;
+                            case 0x01: /*640x480 72Hz Non-interlaced*/
+                                dev->h_total = 0x6a;
+                                dev->v_total = 0x040c;
+                                dev->v_syncstart = 0x03d1;
+                                mach->accel.clock_sel_mode = 0x24;
+                                break;
+                            case 0x03: /*640x480 72Hz Non-interlaced Alt*/
+                                dev->h_total = 0x71;
+                                dev->v_total = 0x04ca;
+                                dev->v_syncstart = 0x0422;
+                                mach->accel.clock_sel_mode = 0x6c;
+                                break;
+                        }
+                    }
+                }
+                break;
+            case 0x02:
+                if (dev->accel.advfunc_cntl & 0x04) {
+                    dev->hdisp = 1024;
+                    dev->vdisp = 768;
+                    if (ATI_8514A_ULTRA) {
+                        dev->h_total = ((mach->eeprom.data[0x11] >> 8) & 0xff) + 1;
+                        dev->v_total = mach->eeprom.data[0x0c] + 1;
+                        dev->v_syncstart = mach->eeprom.data[8] + 1;
+                        mach->accel.clock_sel_mode = ((mach->eeprom.data[4] >> 8) & 0xff) << 2;
+                    } else {
+                        mach_log("Mach: EEPROM 1024x768: %04x.\n", mach->eeprom.data[9]);
+                        switch (mach->eeprom.data[9] & 0xff) {
+                            case 0x00: /*1024x768 76Hz Non-interlaced*/
+                                dev->h_total = 0xa3;
+                                dev->v_total = 0x064b;
+                                dev->v_syncstart = 0x060c;
+                                mach->accel.clock_sel_mode = 0x2c;
+                                break;
+
+                            case 0x01: /*1024x768 87Hz Interlaced*/
+                            default:
+                                dev->h_total = 0x9e;
+                                dev->v_total = 0x0669;
+                                dev->v_syncstart = 0x0601;
+                                mach->accel.clock_sel_mode = 0x1c;
+                                break;
+                            case 0x02: /*1024x768 60Hz Non-interlaced*/
+                                dev->h_total = 0xa8;
+                                dev->v_total = 0x064a;
+                                dev->v_syncstart = 0x0603;
+                                mach->accel.clock_sel_mode = 0x3c;
+                                break;
+                            case 0x04: /*1024x768 70Hz Non-interlaced*/
+                                dev->h_total = 0xa6;
+                                dev->v_total = 0x064a;
+                                dev->v_syncstart = 0x0603;
+                                mach->accel.clock_sel_mode = 0x38;
+                                break;
+                            case 0x08: /*1024x768 72Hz Non-interlaced*/
+                                dev->h_total = 0xa1;
+                                dev->v_total = 0x064a;
+                                dev->v_syncstart = 0x0603;
+                                mach->accel.clock_sel_mode = 0x38;
+                                break;
+                            case 0x82: /*1024x768 66Hz Non-interlaced*/
+                                dev->h_total = 0xac;
+                                dev->v_total = 0x065c;
+                                dev->v_syncstart = 0x060b;
+                                mach->accel.clock_sel_mode = 0x38;
+                                break;
+                        }
+                    }
+                }
+                break;
+
+            default:
+                break;
+        }
+        svga_recalctimings(svga);
+    } else if ((dev->disp_cntl_2 >> 5) == 2) { /*Reset 8514/A to defaults if needed.*/
+        if (dev->accel.advfunc_cntl & 0x04) {
+            if (dev->hdisp == 640) {
+                dev->hdisp = 1024;
+                dev->vdisp = 768;
+                if (ATI_8514A_ULTRA) {
+                    dev->h_total = ((mach->eeprom.data[0x11] >> 8) & 0xff) + 1;
+                    dev->v_total = mach->eeprom.data[0x0c] + 1;
+                    dev->v_syncstart = mach->eeprom.data[8] + 1;
+                    mach->accel.clock_sel_mode = ((mach->eeprom.data[4] >> 8) & 0xff) << 2;
+                } else {
+                    mach_log("Mach Reset: EEPROM 1024x768: %04x.\n", mach->eeprom.data[9]);
+                    switch (mach->eeprom.data[9] & 0xff) {
+                        case 0x00: /*1024x768 76Hz Non-interlaced*/
+                            dev->h_total = 0xa3;
+                            dev->v_total = 0x064b;
+                            dev->v_syncstart = 0x060c;
+                            mach->accel.clock_sel_mode = 0x2c;
+                            break;
+                        case 0x01: /*1024x768 87Hz Interlaced*/
+                        default:
+                            dev->h_total = 0x9e;
+                            dev->v_total = 0x0669;
+                            dev->v_syncstart = 0x0601;
+                            mach->accel.clock_sel_mode = 0x1c;
+                            break;
+                        case 0x02: /*1024x768 60Hz Non-interlaced*/
+                            dev->h_total = 0xa8;
+                            dev->v_total = 0x064a;
+                            dev->v_syncstart = 0x0603;
+                            mach->accel.clock_sel_mode = 0x3c;
+                            break;
+                        case 0x04: /*1024x768 70Hz Non-interlaced*/
+                            dev->h_total = 0xa6;
+                            dev->v_total = 0x064a;
+                            dev->v_syncstart = 0x0603;
+                            mach->accel.clock_sel_mode = 0x38;
+                            break;
+                        case 0x08: /*1024x768 72Hz Non-interlaced*/
+                            dev->h_total = 0xa1;
+                            dev->v_total = 0x064a;
+                            dev->v_syncstart = 0x0603;
+                            mach->accel.clock_sel_mode = 0x38;
+                            break;
+                        case 0x82: /*1024x768 66Hz Non-interlaced*/
+                            dev->h_total = 0xac;
+                            dev->v_total = 0x065c;
+                            dev->v_syncstart = 0x060b;
+                            mach->accel.clock_sel_mode = 0x38;
+                            break;
+                    }
+                }
+                svga_recalctimings(svga);
+            }
+        } else {
+            if (dev->hdisp == 1024) {
+                dev->hdisp = 640;
+                dev->vdisp = 480;
+                if (ATI_8514A_ULTRA) {
+                    dev->h_total = (mach->eeprom.data[0x11] & 0xff) + 1;
+                    dev->v_total = mach->eeprom.data[0x0d] + 1;
+                    dev->v_syncstart = mach->eeprom.data[9] + 1;
+                    mach->accel.clock_sel_mode = (mach->eeprom.data[4] & 0xff) << 2;
+                } else {
+                    mach_log("Mach: EEPROM 640x480: %04x.\n", mach->eeprom.data[7]);
+                    switch (mach->eeprom.data[7] & 0xff) {
+                        case 0x00: /*640x480 60Hz Non-interlaced*/
+                        default:
+                            dev->h_total = 0x64;
+                            dev->v_total = 0x0419;
+                            dev->v_syncstart = 0x03d7;
+                            mach->accel.clock_sel_mode = 0x50;
+                            break;
+                        case 0x01: /*640x480 72Hz Non-interlaced*/
+                            dev->h_total = 0x6a;
+                            dev->v_total = 0x040c;
+                            dev->v_syncstart = 0x03d1;
+                            mach->accel.clock_sel_mode = 0x24;
+                            break;
+                        case 0x03: /*640x480 72Hz Non-interlaced Alt*/
+                            dev->h_total = 0x71;
+                            dev->v_total = 0x04ca;
+                            dev->v_syncstart = 0x0422;
+                            mach->accel.clock_sel_mode = 0x6c;
+                            break;
+                    }
+                }
+                svga_recalctimings(svga);
+            }
+        }
+    } else /*No change (type 0) or reset type 3.*/
+        svga_recalctimings(svga);
+}
+
 void
 ati8514_recalctimings(svga_t *svga)
 {
-    const mach_t *mach = (mach_t *) svga->ext8514;
+    mach_t       *mach = (mach_t *) svga->ext8514;
     ibm8514_t    *dev  = (ibm8514_t *) svga->dev8514;
+    int           _8514_modes = 0;
 
-    mach_log("ON0=%d, ON1=%d, vgahdisp=%d.\n", dev->on[0], dev->on[1], svga->hdisp);
-    if (dev->on[0] || dev->on[1]) {
-        dev->h_disp                     = dev->hdisp;
-        dev->h_total                    = dev->htotal + 1;
-        dev->h_blankstart               = dev->hblankstart;
-        dev->h_blank_end_val            = dev->hblank_end_val;
-        dev->v_total                    = dev->vtotal;
-        dev->v_syncstart                = dev->vsyncstart;
+    mach_log("ON=%d, vgahdisp=%d.\n", dev->on, svga->hdisp);
+    if (dev->on) {
+        dev->interlace                  = !!(dev->disp_cntl & 0x10);
+        dev->pitch                      = dev->ext_pitch;
+        dev->rowoffset                  = dev->ext_crt_pitch;
         dev->rowcount                   = !!(dev->disp_cntl & 0x08);
-        dev->dispend                    = dev->vdisp;
+        dev->accel.ge_offset            = (mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16)) << 2;
+        mach->accel.crt_offset          = (mach->accel.crt_offset_lo | (mach->accel.crt_offset_hi << 16)) << 2;
 
-        if (dev->dispend == 766)
-            dev->dispend += 2;
-
-        if (dev->dispend == 598)
-            dev->dispend += 2;
-
-        if (dev->accel.advfunc_cntl & 4) {
-            if (dev->h_disp != 800) {
-                dev->h_disp = 1024;
-                dev->dispend = 768;
-            }
-            svga->clock = (cpuclock * (double) (1ULL << 32)) / 44900000.0;
-        } else {
-            svga->clock = (cpuclock * (double) (1ULL << 32)) / 25175000.0;
+        switch (mach->accel.clock_sel_mode) {
+            case 0x1c:
+                dev->interlace = 1;
+                _8514_modes = 1;
+                break;
+            case 0x24:
+            case 0x2c:
+            case 0x38:
+            case 0x3c:
+            case 0x50:
+            case 0x6c:
+                dev->interlace = 0;
+                _8514_modes = 2;
+                break;
+            default:
+                break;
         }
 
-        if (dev->interlace) {
+        if (_8514_modes)
+            dev->ven_clock = mach->accel.clock_sel_mode & 0x7c;
+        else
+            dev->ven_clock = mach->accel.clock_sel & 0x7c;
+
+        dev->accel.ge_offset           -= mach->accel.crt_offset;
+
+        mach_log("HDISP=%d, VDISP=%d, shadowset=%x, 8514/A mode=%x, clocksel=%02x.\n",
+                 dev->hdisp, dev->vdisp, mach->shadow_set & 0x03, dev->accel.advfunc_cntl & 0x05, mach->accel.clock_sel & 0x01);
+
+        mach->accel.src_pitch = dev->pitch;
+        mach->accel.dst_pitch = dev->pitch;
+        mach->accel.src_ge_offset = (mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16)) << 2;
+        mach->accel.dst_ge_offset = (mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16)) << 2;
+        mach->accel.src_ge_offset -= mach->accel.crt_offset;
+        mach->accel.dst_ge_offset -= mach->accel.crt_offset;
+
+        mach_log("8514/A ON, pitch=%d, GE offset=%08x.\n", ((mach->accel.ge_pitch & 0xff) << 3), dev->accel.ge_offset);
+
+        dev->h_disp = dev->hdisp;
+        dev->dispend = dev->vdisp;
+        if (dev->dispend == 600)
+            dev->h_disp = 800;
+        else if (dev->h_disp == 640)
+            dev->dispend = 480;
+
+        dev->h_disp_time = dev->h_disp >> 3;
+
+        svga->clock_8514 = (cpuclock * (double) (1ULL << 32)) / svga->getclock8514((dev->ven_clock >> 2) & 0x0f, svga->clock_gen8514) / 2.0;
+        if (dev->ven_clock & 0x40)
+            svga->clock_8514 *= 2.0;
+
+        if (dev->interlace)
             dev->dispend >>= 1;
-            dev->v_syncstart >>= 2;
-            dev->v_total >>= 2;
-        } else {
-            dev->v_syncstart >>= 1;
-            dev->v_total >>= 1;
-        }
 
-        dev->pitch = dev->ext_pitch;
-        dev->rowoffset = dev->ext_crt_pitch;
-        mach_log("cntl=%d, hv(%d,%d), pitch=%d, rowoffset=%d, advfunc_cntl=%x, shadow=%x.\n", dev->accel.advfunc_cntl & 4, dev->h_disp, dev->dispend, dev->pitch, dev->rowoffset, dev->accel.advfunc_cntl & 4, mach->shadow_set & 3);
-        svga->map8 = dev->pallook;
-        svga->render8514 = ibm8514_render_8bpp;
-    } else {
-        if (!(svga->gdcreg[6] & 1) && !(svga->attrregs[0x10] & 1)) { /*Text mode*/
-            if (svga->seqregs[1] & 8) {                              /*40 column*/
-                svga->render = svga_render_text_40;
-            } else {
-                svga->render = svga_render_text_80;
-            }
+        mach_log("cntl=%d, hv(%d,%d), pitch=%d, rowoffset=%d, gextconfig=%03x, shadow=%x interlace=%d.\n",
+                 dev->accel.advfunc_cntl & 0x04, dev->h_disp, dev->dispend, dev->pitch, dev->rowoffset,
+                 mach->accel.ext_ge_config & 0xcec0, mach->shadow_set & 3, dev->interlace);
+        if (dev->vram_512k_8514) {
+            if (dev->h_disp == 640)
+                dev->pitch = 640;
+            else
+                dev->pitch = 1024;
         }
-    }
+        dev->accel_bpp = 8;
+        svga->render8514 = ibm8514_render_8bpp;
+
+    } else
+        dev->mode = VGA_MODE;
 }
-#endif
 
 static void
 mach_recalctimings(svga_t *svga)
 {
     mach_t       *mach = (mach_t *) svga->priv;
     ibm8514_t    *dev  = (ibm8514_t *) svga->dev8514;
-    int           clock_sel;
+    int           clock_sel = 0x00;
+    int           _8514_modes = 0;
 
     if (mach->regs[0xad] & 0x08)
-        svga->hblankstart    = ((mach->regs[0x0d] >> 2) << 8) + svga->crtc[2] + 1;
+        svga->hblankstart    = ((mach->regs[0x0d] >> 2) << 8) + svga->crtc[2];
 
-    clock_sel = ((svga->miscout >> 2) & 3) | ((mach->regs[0xbe] & 0x10) >> 1) | ((mach->regs[0xb9] & 2) << 1);
+    if (svga->miscout & 0x04)
+        clock_sel |= 0x01;
+    if (svga->miscout & 0x08)
+        clock_sel |= 0x02;
+    if (mach->regs[0xb9] & 0x02)
+        clock_sel |= 0x04;
+    if (mach->regs[0xbe] & 0x10)
+        clock_sel |= 0x08;
 
-    if ((dev->local & 0xff) >= 0x02) {
+    svga->interlace = !!(mach->regs[0xbe] & 0x02);
+    if (svga->interlace)
+        svga->dispend >>= 1;
+
+    if (ATI_MACH32) {
         if (mach->regs[0xad] & 0x04)
-            svga->ma_latch |= 0x40000;
+            svga->memaddr_latch |= 0x40000;
 
         if (mach->regs[0xad] & 0x08)
-            svga->ma_latch |= 0x80000;
+            svga->memaddr_latch |= 0x80000;
     }
 
     if (mach->regs[0xa3] & 0x10)
-        svga->ma_latch |= 0x10000;
+        svga->memaddr_latch |= 0x10000;
 
     if (mach->regs[0xb0] & 0x40)
-        svga->ma_latch |= 0x20000;
+        svga->memaddr_latch |= 0x20000;
 
     if ((mach->regs[0xb6] & 0x18) >= 0x10) {
         svga->hdisp <<= 1;
         svga->htotal <<= 1;
         svga->dots_per_clock <<= 1;
         svga->rowoffset <<= 1;
-        svga->gdcreg[5] &= ~0x40;
     }
 
     if (mach->regs[0xb0] & 0x20) {
-        svga->gdcreg[5] |= 0x40;
         if ((mach->regs[0xb6] & 0x18) >= 0x10)
             svga->packed_4bpp = 1;
         else
@@ -2582,8 +3106,8 @@ mach_recalctimings(svga_t *svga)
     } else
         svga->packed_4bpp = 0;
 
-    if ((dev->local & 0xff) < 0x02) {
-        if ((mach->regs[0xb6] & 0x18) == 8) {
+    if (!ATI_MACH32) {
+        if ((mach->regs[0xb6] & 0x18) == 0x08) {
             svga->hdisp <<= 1;
             svga->htotal <<= 1;
             svga->dots_per_clock <<= 1;
@@ -2592,69 +3116,166 @@ mach_recalctimings(svga_t *svga)
             svga->ati_4color = 0;
     }
 
-    svga->render8514 = ibm8514_render_blank;
-    mach_log("ON[0]=%d, ON[1]=%d, exton[0]=%d, exton[1]=%d, vendormode0=%d, vendormode1=%d.\n", dev->on[0], dev->on[1], mach->ext_on[0], mach->ext_on[1], dev->vendor_mode[0], dev->vendor_mode[1]);
-    if (dev->on[0] || dev->on[1]) {
-        mach_log("8514/A ON.\n");
-        dev->h_disp                     = dev->hdisp;
-        dev->h_total                    = dev->htotal + 1;
-        dev->h_blankstart               = dev->hblankstart;
-        dev->h_blank_end_val            = dev->hblank_end_val;
-        dev->v_total                    = dev->vtotal;
-        dev->v_syncstart                = dev->vsyncstart;
-        dev->dispend                    = dev->vdisp;
+    mach_log("ON=%d, override=%d, gelo=%04x, gehi=%04x, crtlo=%04x, crthi=%04x, vgahdisp=%d.\n", dev->on, svga->override, mach->accel.ge_offset_lo, mach->accel.ge_offset_hi, mach->accel.crt_offset_lo, mach->accel.crt_offset_hi, svga->hdisp);
+
+    if (dev->on) {
+        dev->memaddr_latch              = 0; /*(mach->accel.crt_offset_lo | (mach->accel.crt_offset_hi << 16)) << 2;*/
+        dev->interlace                  = !!(dev->disp_cntl & 0x10);
+        dev->pitch                      = dev->ext_pitch;
+        dev->rowoffset                  = dev->ext_crt_pitch;
         dev->rowcount                   = !!(dev->disp_cntl & 0x08);
+        dev->accel.ge_offset            = (mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16));
+        mach->accel.crt_offset          = (mach->accel.crt_offset_lo | (mach->accel.crt_offset_hi << 16));
 
-        if (dev->dispend == 766)
-            dev->dispend += 2;
+        switch (mach->accel.clock_sel_mode) {
+            case 0x1c:
+                dev->interlace = 1;
+                _8514_modes = 1;
+                break;
+            case 0x24:
+            case 0x2c:
+            case 0x38:
+            case 0x3c:
+            case 0x50:
+            case 0x6c:
+                dev->interlace = 0;
+                _8514_modes = 2;
+                break;
+            default:
+                break;
+        }
 
-        if (dev->dispend == 598)
-            dev->dispend += 2;
+        if (_8514_modes)
+            dev->ven_clock = mach->accel.clock_sel_mode & 0x7c;
+        else
+            dev->ven_clock = mach->accel.clock_sel & 0x7c;
 
-        if (dev->dispend == 478)
-            dev->dispend += 2;
+        if (ATI_MACH32) {
+            mach_log("Mach32: Clock=%02x, double=%02x, h_total=%02x.\n", (dev->ven_clock >> 2) & 0x0f, dev->ven_clock & 0x40, dev->h_total);
+            svga->clock_8514 = (cpuclock * (double) (1ULL << 32)) / svga->getclock8514((dev->ven_clock >> 2) & 0x0f, svga->clock_gen8514) / 2.0;
+        } else {
+            mach_log("Mach8: Clock=%02x, double=%02x, h_total=%02x, selmode=%02x.\n", (dev->ven_clock >> 2) & 0x0f, dev->ven_clock & 0x40, dev->h_total, mach->accel.clock_sel_mode);
+            svga->clock_8514 = (cpuclock * (double) (1ULL << 32)) / svga->getclock8514((dev->ven_clock >> 2) & 0x0f, svga->clock_gen8514) / 2.0;
+            if ((((dev->ven_clock >> 2) & 0x0f) == 0x09) && (dev->h_total == 0x6b))
+                svga->clock_8514 /= 2.0;
+        }
+        if (dev->ven_clock & 0x40)
+            svga->clock_8514 *= 2.0;
 
-        if ((dev->local & 0xff) >= 0x02) {
-            if ((dev->accel.advfunc_cntl ^ dev->modechange) & 0x04) {
-                if ((mach->shadow_set ^ mach->compat_mode) & 0x03)
-                    svga->clock8514 = (cpuclock * (double) (1ULL << 32)) / svga->getclock((mach->accel.clock_sel >> 2) & 0x0f, svga->clock_gen);
-                else
-                    svga->clock8514 = (cpuclock * (double) (1ULL << 32)) / 44900000.0;
-            } else {
-                if ((mach->shadow_set ^ mach->compat_mode) & 0x03)
-                    svga->clock8514 = (cpuclock * (double) (1ULL << 32)) / svga->getclock((mach->accel.clock_sel >> 2) & 0x0f, svga->clock_gen);
-                else
-                    svga->clock8514 = (cpuclock * (double) (1ULL << 32)) / 25175000.0;
+        if (dev->bpp) {
+            dev->accel.ge_offset <<= 1;
+            mach->accel.crt_offset <<= 1;
+        } else {
+            dev->accel.ge_offset <<= 2;
+            mach->accel.crt_offset <<= 2;
+        }
+
+        if (ATI_MACH32 && !dev->vram_512k_8514 && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+            dev->accel.ge_offset <<= 1;
+            mach->accel.crt_offset <<= 1;
+        }
+
+        dev->accel.ge_offset           -= mach->accel.crt_offset;
+
+        mach_log("RowCount=%x, rowoffset=%x, pitch=%d, geoffset=%x, crtoffset=%x.\n", dev->rowcount, dev->rowoffset, dev->pitch, dev->accel.ge_offset, mach->accel.crt_offset);
+        mach_log("HDISP=%d, VDISP=%d, shadowset=%x, 8514/A mode=%x, clocksel=%02x, interlace=%x.\n",
+                 dev->hdisp, dev->vdisp, mach->shadow_set & 0x03, dev->accel.advfunc_cntl & 0x04,
+                 mach->accel.clock_sel & 0xfe, dev->interlace);
+
+        dev->h_disp = dev->hdisp;
+        dev->dispend = dev->vdisp;
+        if (dev->dispend == 959) { /*FIXME: vertical resolution mess on EEPROM tests on Mach8*/
+            dev->dispend++;
+            dev->dispend >>= 1;
+        } else if (dev->dispend == 600)
+            dev->h_disp = 800;
+        else if (dev->h_disp == 640)
+            dev->dispend = 480;
+
+        dev->h_disp_time = dev->h_disp >> 3;
+
+        mach_log("8514/A modes=%d, clocksel=%02x, clkselmode=%02x, divide reg ibm=%02x, divide reg vga=%02x, vgainterlace=%x, interlace=%x, htotal=%02x.\n", _8514_modes, mach->accel.clock_sel & 0xfe, mach->accel.clock_sel_mode & 0xfe, mach->accel.clock_sel & 0x40, mach->regs[0xb8] & 0x40, svga->interlace, dev->interlace, dev->htotal);
+
+        if (dev->interlace)
+            dev->dispend >>= 1;
+
+        if (ATI_MACH32) {
+            switch ((mach->shadow_set >> 8) & 0x03) {
+                case 0x00:
+                    mach->accel.src_pitch = dev->pitch;
+                    mach->accel.dst_pitch = dev->pitch;
+                    mach->accel.src_ge_offset = (mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16));
+                    mach->accel.dst_ge_offset = (mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16));
+                    if (dev->bpp) {
+                        mach->accel.src_ge_offset <<= 1;
+                        mach->accel.dst_ge_offset <<= 1;
+                    } else {
+                        mach->accel.src_ge_offset <<= 2;
+                        mach->accel.dst_ge_offset <<= 2;
+                    }
+                    if (!dev->vram_512k_8514 && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+                        mach->accel.src_ge_offset <<= 1;
+                        mach->accel.dst_ge_offset <<= 1;
+                    }
+                    mach->accel.src_ge_offset -= mach->accel.crt_offset;
+                    mach->accel.dst_ge_offset -= mach->accel.crt_offset;
+                    dev->accel.src_pitch = mach->accel.src_pitch;
+                    dev->accel.dst_pitch = mach->accel.dst_pitch;
+                    dev->accel.src_ge_offset = mach->accel.src_ge_offset;
+                    dev->accel.dst_ge_offset = mach->accel.dst_ge_offset;
+                    break;
+                case 0x01:
+                    mach->accel.dst_pitch = dev->pitch;
+                    mach->accel.dst_ge_offset = (mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16));
+                    if (dev->bpp)
+                        mach->accel.dst_ge_offset <<= 1;
+                    else
+                        mach->accel.dst_ge_offset <<= 2;
+
+                    if (!dev->vram_512k_8514 && ((mach->accel.ext_ge_config & 0x30) == 0x00))
+                        mach->accel.dst_ge_offset <<= 1;
+
+                    mach->accel.dst_ge_offset -= mach->accel.crt_offset;
+                    dev->accel.dst_pitch = mach->accel.dst_pitch;
+                    dev->accel.dst_ge_offset = mach->accel.dst_ge_offset;
+                    break;
+                case 0x02:
+                    mach->accel.src_pitch = dev->pitch;
+                    mach->accel.src_ge_offset = (mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16));
+                    if (dev->bpp)
+                        mach->accel.src_ge_offset <<= 1;
+                    else
+                        mach->accel.src_ge_offset <<= 2;
+
+                    if (!dev->vram_512k_8514 && ((mach->accel.ext_ge_config & 0x30) == 0x00))
+                        mach->accel.src_ge_offset <<= 1;
+
+                    mach->accel.src_ge_offset -= mach->accel.crt_offset;
+                    dev->accel.src_pitch = mach->accel.src_pitch;
+                    dev->accel.src_ge_offset = mach->accel.src_ge_offset;
+                    break;
+                default:
+                    break;
             }
-
-            if (dev->interlace) {
-                dev->dispend >>= 1;
-                dev->v_syncstart >>= 2;
-                dev->v_total >>= 2;
-            } else {
-                dev->v_syncstart >>= 1;
-                dev->v_total >>= 1;
-            }
-
-            dev->pitch = dev->ext_pitch;
-            dev->rowoffset = dev->ext_crt_pitch;
+            mach_log("cntl=%d, clksel=%x, hv(%d,%d), pitch=%d, rowoffset=%d, gextconfig=%03x, shadow=%x interlace=%d, vgahdisp=%d.\n",
+                     dev->accel.advfunc_cntl & 0x04, mach->accel.clock_sel & 0x01, dev->h_disp, dev->dispend, dev->pitch, dev->rowoffset,
+                     mach->accel.ext_ge_config & 0xcec0, mach->shadow_set & 3, dev->interlace, svga->hdisp);
+            mach_log("EXTGECONFIG bits 11-15=%04x.\n", mach->accel.ext_ge_config & 0x8800);
             if ((mach->accel.ext_ge_config & 0x800) || (!(mach->accel.ext_ge_config & 0x8000) && !(mach->accel.ext_ge_config & 0x800))) {
-                if ((mach->accel.ext_ge_config & 0x30) == 0x20) {
-                    if ((mach->accel.ext_ge_config & 0xc0) == 0x40)
-                        dev->accel_bpp = 16;
-                    else
-                        dev->accel_bpp = 15;
-                } else if ((mach->accel.ext_ge_config & 0x30) == 0x30) {
-                    if (mach->accel.ext_ge_config & 0x200)
-                        dev->accel_bpp = 32;
-                    else
-                        dev->accel_bpp = 24;
-                } else
-                    dev->accel_bpp = 8;
+                mach_log("hv=%d,%d, pitch=%d, rowoffset=%d, gextconfig=%03x, bpp=%d, shadow=%x, vgahdisp=%d.\n",
+                         dev->h_disp, dev->dispend, dev->pitch, dev->ext_crt_pitch, mach->accel.ext_ge_config & 0xcec0,
+                         dev->accel_bpp, mach->shadow_set & 0x03, svga->hdisp);
 
-                mach_log("hv(%d,%d), pitch=%d, rowoffset=%d, gextconfig=%03x, bpp=%d, shadow=%x, vgahdisp=%d.\n", dev->h_disp, dev->dispend, dev->pitch, dev->ext_crt_pitch, mach->accel.ext_ge_config & 0xcec0, dev->accel_bpp, mach->shadow_set & 3, svga->hdisp);
                 switch (dev->accel_bpp) {
                     case 8:
+                        if ((mach->accel.ext_ge_config & 0x30) == 0x00) {
+                            if (dev->vram_512k_8514) {
+                                if (dev->h_disp == 640)
+                                    dev->pitch = 640;
+                                else
+                                    dev->pitch = 1024;
+                            }
+                        }
                         svga->render8514 = ibm8514_render_8bpp;
                         break;
                     case 15:
@@ -2665,118 +3286,80 @@ mach_recalctimings(svga_t *svga)
                         break;
                     case 24:
                         mach_log("GEConfig24bpp: %03x.\n", mach->accel.ext_ge_config & 0x600);
-                        if (mach->accel.ext_ge_config & 0x400)
-                            svga->render8514 = ibm8514_render_BGR;
-                        else
-                            svga->render8514 = ibm8514_render_24bpp;
+                        svga->render8514 = ati_render_24bpp;
                         break;
                     case 32:
                         mach_log("GEConfig32bpp: %03x.\n", mach->accel.ext_ge_config & 0x600);
-                        if (mach->accel.ext_ge_config & 0x400)
-                            svga->render8514 = ibm8514_render_ABGR8888;
-                        else
-                            svga->render8514 = ibm8514_render_32bpp;
+                        svga->render8514 = ati_render_32bpp;
                         break;
 
                     default:
                         break;
                 }
             }
-            switch (mach->regs[0xb8] & 0xc0) {
-                case 0x40:
-                    svga->clock8514 *= 2;
-                    break;
-                case 0x80:
-                    svga->clock8514 *= 3;
-                    break;
-                case 0xc0:
-                    svga->clock8514 *= 4;
-                    break;
+        } else {
+            mach->accel.src_pitch = dev->pitch;
+            mach->accel.dst_pitch = dev->pitch;
+            mach->accel.src_ge_offset = (mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16));
+            mach->accel.dst_ge_offset = (mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16));
+            mach->accel.src_ge_offset <<= 2;
+            mach->accel.dst_ge_offset <<= 2;
+            mach->accel.src_ge_offset -= mach->accel.crt_offset;
+            mach->accel.dst_ge_offset -= mach->accel.crt_offset;
 
+            mach_log("cntl=%d, clksel=%x, hv(%d,%d), pitch=%d, rowoffset=%d, gextconfig=%03x, shadow=%x interlace=%d, vgahdisp=%d.\n",
+                     dev->accel.advfunc_cntl & 0x04, mach->accel.clock_sel & 0x01, dev->h_disp, dev->dispend, dev->pitch, dev->rowoffset,
+                     mach->accel.ext_ge_config & 0xcec0, mach->shadow_set & 0x03, dev->interlace, svga->hdisp);
+            if (dev->vram_512k_8514) {
+                if (dev->h_disp == 640)
+                    dev->pitch = 640;
+                else
+                    dev->pitch = 1024;
+            }
+            dev->accel_bpp = 8;
+            svga->render8514 = ibm8514_render_8bpp;
+        }
+    } else {
+        dev->mode = VGA_MODE;
+        if (!svga->scrblank && svga->attr_palette_enable) {
+            mach_log("GDCREG5=%02x, ATTR10=%02x, ATI B0 bit 5=%02x, ON=%d.\n",
+                     svga->gdcreg[5] & 0x60, svga->attrregs[0x10] & 0x40, mach->regs[0xb0] & 0x20, dev->on);
+            if (ATI_MACH32)
+                svga->clock = (cpuclock * (double) (1ULL << 32)) / svga->getclock(clock_sel, svga->clock_gen);
+            else
+                svga->clock = (cpuclock * (double) (1ULL << 32)) / svga->getclock(clock_sel ^ 0x08, svga->clock_gen);
+
+            switch ((mach->regs[0xb8] >> 6) & 3) {
+                case 0:
                 default:
                     break;
+                case 1:
+                    svga->clock *= 2.0;
+                    break;
+                case 2:
+                    svga->clock *= 3.0;
+                    break;
+                case 3:
+                    svga->clock *= 4.0;
+                    break;
             }
-        } else {
-            if ((dev->accel.advfunc_cntl ^ dev->modechange) & 0x04) {
-                if ((mach->shadow_set ^ mach->compat_mode) & 0x03)
-                    svga->clock8514 = (cpuclock * (double) (1ULL << 32)) / svga->getclock((mach->accel.clock_sel >> 2) & 0x0f, svga->clock_gen);
-                else
-                    svga->clock8514 = (cpuclock * (double) (1ULL << 32)) / 44900000.0;
-            } else {
-                if ((mach->shadow_set ^ mach->compat_mode) & 0x03)
-                    svga->clock8514 = (cpuclock * (double) (1ULL << 32)) / svga->getclock((mach->accel.clock_sel >> 2) & 0x0f, svga->clock_gen);
-                else
-                    svga->clock8514 = (cpuclock * (double) (1ULL << 32)) / 25175000.0;
 
-                if (((mach->shadow_set & 0x03) != 0x02) || !(dev->accel.advfunc_cntl & 0x04)) { /*Shadow set of 2 and bit 2 of port 0x4ae8 mean 1024x768+*/
-                    if (!(mach->accel.clock_sel & 0x01)) {
-                        dev->h_disp = 640;
-                        dev->dispend = 480;
+            mach_log("VGA clock sel=%02x, divide reg=%02x, miscout bits2-3=%x, machregbe bit4=%02x, machregb9 bit1=%02x, charwidth=%d, htotal=%02x, hdisptime=%02x, seqregs1 bit 3=%02x.\n", clock_sel, (mach->regs[0xb8] >> 6) & 3, svga->miscout & 0x0c, mach->regs[0xbe] & 0x10, mach->regs[0xb9] & 0x02, svga->char_width, svga->htotal, svga->hdisp_time, svga->seqregs[1] & 8);
+            if ((svga->gdcreg[6] & 0x01) || (svga->attrregs[0x10] & 0x01)) {
+                if ((svga->gdcreg[5] & 0x40) || (svga->attrregs[0x10] & 0x40) || (mach->regs[0xb0] & 0x20)) {
+                    svga->map8 = svga->pallook;
+                    mach_log("Lowres=%x, seqreg[1]bit3=%x.\n", svga->lowres, svga->seqregs[1] & 8);
+                    if (svga->lowres)
+                        svga->render = svga_render_8bpp_lowres;
+                    else {
+                        svga->render = svga_render_8bpp_highres;
+                        if (!svga->packed_4bpp) {
+                            svga->memaddr_latch <<= 1;
+                            svga->rowoffset <<= 1;
+                        }
                     }
                 }
             }
-
-            if (dev->interlace) {
-                dev->dispend >>= 1;
-                dev->v_syncstart >>= 2;
-                dev->v_total >>= 2;
-            } else {
-                dev->v_syncstart >>= 1;
-                dev->v_total >>= 1;
-            }
-
-            dev->pitch = dev->ext_pitch;
-            dev->rowoffset = dev->ext_crt_pitch;
-            mach_log("cntl=%d, hv(%d,%d), pitch=%d, rowoffset=%d, gextconfig=%03x, shadow=%x interlace=%d.\n", dev->accel.advfunc_cntl & 4, dev->h_disp, dev->dispend, dev->pitch, dev->rowoffset, mach->accel.ext_ge_config & 0xcec0, mach->shadow_set & 3, dev->interlace);
-            svga->map8 = dev->pallook;
-            svga->render8514 = ibm8514_render_8bpp;
-            if (mach->regs[0xb8] & 0x40)
-                svga->clock8514 *= 2;
-        }
-    }
-
-    if (!svga->scrblank && (svga->crtc[0x17] & 0x80) && svga->attr_palette_enable) {
-        if (((svga->gdcreg[6] & 1) || (svga->attrregs[0x10] & 1))) {
-            mach_log("VGA clock=%02x.\n", mach->regs[0xa7] & 0x80);
-            svga->clock = (cpuclock * (double) (1ULL << 32)) / svga->getclock(clock_sel, svga->clock_gen);
-            if (mach->regs[0xa7] & 0x80)
-                svga->clock *= 3;
-            switch (svga->gdcreg[5] & 0x60) {
-                case 0x00:
-                    if (svga->seqregs[1] & 8) /*Low res (320)*/
-                        svga->render = svga_render_4bpp_lowres;
-                    else
-                        svga->render = svga_render_4bpp_highres;
-                    break;
-                case 0x20:                    /*4 colours*/
-                    if (svga->seqregs[1] & 8) /*Low res (320)*/
-                        svga->render = svga_render_2bpp_lowres;
-                    else
-                        svga->render = svga_render_2bpp_highres;
-                    break;
-                case 0x40:
-                case 0x60: /*256+ colours*/
-                    switch (svga->bpp) {
-                        default:
-                        case 8:
-                            svga->map8 = svga->pallook;
-                            mach_log("Lowres=%x, seqreg[1]bit3=%x.\n", svga->lowres, svga->seqregs[1] & 8);
-                            if (svga->lowres)
-                                svga->render = svga_render_8bpp_lowres;
-                            else {
-                                svga->render = svga_render_8bpp_highres;
-                                if (!svga->packed_4bpp) {
-                                    svga->ma_latch <<= 1;
-                                    svga->rowoffset <<= 1;
-                                }
-                            }
-                            break;
-                    }
-                    break;
-
-                default:
-                    break;
-            }
         }
     }
 }
@@ -2788,544 +3371,914 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
     int bkgd_sel;
     int mono_src;
 
+    if (port & 0x8000) {
+        if ((port & 0x06) != 0x06) {
+            if ((port != 0xe2e8) && (port != 0xe2e9) && (port != 0xe6e8) && (port != 0xe6e9)) {
+                if (port & 0x4000)
+                    port &= ~0x4000;
+            }
+        }
+    }
+
     mach_log("[%04X:%08X]: Port FIFO OUT=%04x, val=%04x, len=%d.\n", CS, cpu_state.pc, port, val, len);
 
     switch (port) {
-        case 0x82e8:
-        case 0xc2e8:
-        case 0xf6ee:
-            if (len == 1)
-                dev->accel.cur_y = (dev->accel.cur_y & 0x700) | val;
-            else
-                dev->accel.cur_y = val & 0x7ff;
+        case 0x2e8:
+            mach_log("HTOTAL=%04x, len=%d, set=%x, ATI mode bit=%x.\n", val, len, mach->shadow_set & 0x03, mach->accel.clock_sel & 0x01);
+            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                if (!(mach->shadow_cntl & 0x04))
+                    dev->htotal = val;
+            }
+            svga_recalctimings(svga);
             break;
-        case 0x82e9:
-        case 0xc2e9:
-        case 0xf6ef:
-            if (len == 1)
-                dev->accel.cur_y = (dev->accel.cur_y & 0xff) | ((val & 0x07) << 8);
+
+        case 0xae8:
+            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                if (!(mach->shadow_cntl & 0x04)) {
+                    WRITE8(port, dev->hsync_start, val);
+                }
+            }
+            svga_recalctimings(svga);
+            break;
+
+        case 0xee8:
+            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                if (!(mach->shadow_cntl & 0x04)) {
+                    WRITE8(port, dev->hsync_width, val);
+                }
+            }
+            svga_recalctimings(svga);
+            break;
+
+        case 0x6e8:
+            if (len == 2) {
+                mach_log("HDISP and HTOTAL=%04x, len=%d, set=%x, ATI mode bit=%x.\n", val, len, mach->shadow_set & 0x03, mach->accel.clock_sel & 0x01);
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if ((!(mach->shadow_cntl & 0x04)) && ((val >> 8) & 0xff))
+                        dev->htotal = (val >> 8) & 0xff;
+
+                    if (!(mach->shadow_cntl & 0x08)) {
+                        if ((dev->htotal || (mach->accel.clock_sel & 0x01)) && (val & 0xff)) {
+                            WRITE8(port, dev->hdisped, val);
+                        }
+                    }
+                }
+            } else {
+                mach_log("HDISP and HTOTAL=%02x, len=%d, set=%x, ATI mode bit=%x.\n", val, len, mach->shadow_set & 0x03, mach->accel.clock_sel & 0x01);
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x08)) {
+                        if ((dev->htotal || (mach->accel.clock_sel & 0x01)) && (val & 0xff)) {
+                            WRITE8(port, dev->hdisped, val);
+                        }
+                    }
+                }
+            }
+            mach_log("[%04X:%08X]: ATI 8514/A: (0x%04x): hdisp=0x%02x, shadowcntl=%02x, shadowset=%02x.\n",
+                    CS, cpu_state.pc, port, val, mach->shadow_cntl & 0x08, mach->shadow_set & 0x03);
+            svga_recalctimings(svga);
+            break;
+
+        case 0x6e9:
+            if (len == 1) {
+                mach_log("HDISP and HTOTAL+1=%02x, len=%d, set=%x, ATI mode bit=%x.\n", val, len, mach->shadow_set & 0x03, mach->accel.clock_sel & 0x01);
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x04) && val) {
+                        dev->htotal = val;
+                    }
+                }
+            }
+            svga_recalctimings(svga);
+            break;
+
+        case 0x12e8:
+            if (len == 2) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x10) && val) {
+                        dev->v_total_reg = val;
+                        dev->v_total_reg &= 0x1fff;
+                    }
+                }
+            } else {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x10)) {
+                        WRITE8(port, dev->v_total_reg, val);
+                        dev->v_total_reg &= 0x1fff;
+                    }
+                }
+            }
+            mach_log("[%04X:%08X]: ATI 8514/A: (0x%04x): hdisp=0x%02x.\n", CS, cpu_state.pc, port, val);
+            svga_recalctimings(svga);
+            break;
+
+        case 0x12e9:
+            if (len == 1) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
+                    if (!(mach->shadow_cntl & 0x10)) { /*For 8514/A mode, take the shadow sets into account.*/
+                        WRITE8(port, dev->v_total_reg, val >> 8);
+                        dev->v_total_reg &= 0x1fff;
+                    }
+                }
+                mach_log("[%04X:%08X]: ATI 8514/A: (0x%04x): hdisp=0x%02x.\n", CS, cpu_state.pc, port, val);
+            }
+            svga_recalctimings(svga);
+            break;
+
+        case 0x16e8:
+            if (len == 2) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x20) && val) {
+                        dev->v_disp = val;
+                        dev->v_disp &= 0x1fff;
+                    }
+                }
+                mach_log("ATI 8514/A: V_DISP write 16E8=%d, vdisp2=%d.\n", dev->v_disp, dev->v_disp2);
+                mach_log("ATI 8514/A: (0x%04x): vdisp=0x%02x.\n", port, val);
+            } else {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x20)) {
+                        WRITE8(port, dev->v_disp, val);
+                        dev->v_disp &= 0x1fff;
+                    }
+                }
+            }
+            svga_recalctimings(svga);
+            break;
+        case 0x16e9:
+            if (len == 1) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x20)) {
+                        WRITE8(port, dev->v_disp, val >> 8);
+                        dev->v_disp &= 0x1fff;
+                    }
+                }
+                mach_log("ATI 8514/A: V_DISP write 16E8=%d, vdisp2=%d.\n", dev->v_disp, dev->v_disp2);
+                mach_log("ATI 8514/A: (0x%04x): vdisp=0x%02x.\n", port, val);
+            }
+            svga_recalctimings(svga);
+            break;
+
+        case 0x1ae8:
+            if (len == 2) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x10) && val) {
+                        dev->v_sync_start = val;
+                        dev->v_sync_start &= 0x1fff;
+                    }
+                }
+                mach_log("ATI 8514/A: V_SYNCSTART write 1AE8 = %d\n", dev->v_syncstart);
+                mach_log("ATI 8514/A: (0x%04x): vsyncstart=0x%02x.\n", port, val);
+            } else {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x10)) {
+                        WRITE8(port, dev->v_sync_start, val);
+                        dev->v_sync_start &= 0x1fff;
+                    }
+                }
+            }
+            svga_recalctimings(svga);
+            break;
+        case 0x1ae9:
+            if (len == 1) {
+                if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) { /*For 8514/A mode, take the shadow sets into account.*/
+                    if (!(mach->shadow_cntl & 0x10)) {
+                        WRITE8(port, dev->v_sync_start, val >> 8);
+                        dev->v_sync_start &= 0x1fff;
+                    }
+                }
+                mach_log("ATI 8514/A: V_SYNCSTART write 1AE8 = %d\n", dev->v_syncstart);
+                mach_log("ATI 8514/A: (0x%04x): vsyncstart=0x%02x.\n", port, val);
+            }
+            svga_recalctimings(svga);
+            break;
+
+        case 0x1ee8:
+        case 0x1ee9:
+            svga_recalctimings(svga);
+            break;
+
+        case 0x22e8:
+            if ((mach->accel.clock_sel & 0x01) || (!(mach->accel.clock_sel & 0x01) && (mach->shadow_set & 0x03))) {
+                if ((mach->shadow_cntl & 0x03) == 0x00)
+                    dev->disp_cntl = val;
+            }
+
+            if (((mach->shadow_cntl & 0x03) == 0x00) || !dev->local)
+                dev->disp_cntl_2 = val;
+
+            mach_log("ATI 8514/A: DISP_CNTL write %04x=%02x, written=%02x, interlace=%02x, shadowset=%02x, shadowcntl=%02x.\n",
+                     port, val & 0x70, dev->disp_cntl & 0x70, dev->disp_cntl & 0x10, mach->shadow_set & 0x03, mach->shadow_cntl & 0x03);
+            svga_recalctimings(svga);
+            break;
+
+        case 0x42e8:
+        case 0x42e9:
+            mach_log("VBLANK status=%02x, val=%02x.\n", dev->subsys_stat, val);
+            if (len == 2)
+                dev->subsys_cntl = val;
+            else {
+                WRITE8(port, dev->subsys_cntl, val);
+            }
+            dev->subsys_stat &= ~val;
+            if ((dev->subsys_cntl & 0xc000) == 0x8000) {
+                mach->force_busy = 0;
+                dev->force_busy = 0;
+                dev->force_busy2 = 0;
+            }
+            break;
+
+        case 0x46e8:
+        case 0x46e9:
+            mach_log("0x%04x write: VGA subsystem enable add-on=%02x.\n", port, val);
+            break;
+
+        case 0x4ae8:
+        case 0x4ae9:
+            WRITE8(port, dev->accel.advfunc_cntl, val);
+            if (len == 2) {
+                WRITE8(port + 1, dev->accel.advfunc_cntl, val >> 8);
+            }
+            dev->on = dev->accel.advfunc_cntl & 0x01;
+            dev->vendor_mode = 0;
+            if (dev->_8514crt) {
+                if (mach->regs[0xb0] & 0x20) {
+                    dev->on = 1;
+                    dev->vendor_mode = !!(ATI_MACH32);
+                }
+            }
+
+            dev->mode = IBM_MODE;
+            mach_log("[%04X:%08X]: ATI 8514/A: (0x%04x): ON=%d, valxor=%x, shadow crt=%x, hdisp=%d, vdisp=%d, extmode=%02x, accelbpp=%d, crt=%d, crtres=%d.\n",
+                     CS, cpu_state.pc, port, val & 0x01, dev->on, dev->accel.advfunc_cntl & 0x04, dev->hdisp, dev->vdisp, mach->regs[0xb0] & 0x20, dev->accel_bpp, dev->_8514crt, mach->crt_resolution);
+
+            if (ATI_MACH32) {
+                mach_set_resolution(mach, svga);
+                mach32_updatemapping(mach, svga);
+            } else {
+                dev->ext_pitch = 1024;
+                dev->ext_crt_pitch = 128;
+                mach_set_resolution(mach, svga);
+            }
+            mach_log("Vendor IBM mode set %s resolution.\n", (dev->accel.advfunc_cntl & 0x04) ? "2: 1024x768" : "1: 640x480");
+            break;
+
+        case 0x82e8:
+            ibm8514_accel_out_fifo(svga, port, val, len);
+            mach_log("DSTY=%04x, len=%d.\n", val & 0x07ff, len);
             break;
 
         case 0x86e8:
-        case 0xc6e8:
-            if (len == 1)
-                dev->accel.cur_x = (dev->accel.cur_x & 0x700) | val;
-            else
-                dev->accel.cur_x = val & 0x7ff;
-            break;
-        case 0x86e9:
-        case 0xc6e9:
-            if (len == 1) {
-                dev->accel.cur_x = (dev->accel.cur_x & 0xff) | ((val & 0x07) << 8);
-            }
+            ibm8514_accel_out_fifo(svga, port, val, len);
+            mach_log("DSTX=%04x, len=%d.\n", val & 0x07ff, len);
             break;
 
         case 0x8ae8:
-        case 0xcae8:
-            if (len == 1)
-                dev->accel.desty_axstp = (dev->accel.desty_axstp & 0x3f00) | val;
-            else {
-                mach->accel.src_y      = val;
-                dev->accel.desty       = val & 0x07ff;
-                dev->accel.desty_axstp = val & 0x3fff;
-                if (val & 0x2000)
-                    dev->accel.desty_axstp |= ~0x1fff;
-            }
-            break;
-        case 0x8ae9:
-        case 0xcae9:
-            if (len == 1) {
-                dev->accel.desty_axstp = (dev->accel.desty_axstp & 0xff) | ((val & 0x3f) << 8);
-                if (val & 0x20)
-                    dev->accel.desty_axstp |= ~0x1fff;
+            ibm8514_accel_out_fifo(svga, port, val, len);
+            mach_log("SRCY=%04x, len=%d.\n", val & 0x07ff, len);
+            if (len == 2) {
+                mach->accel.src_y = val & 0x07ff;
+                mach->accel.src_y_scan = ((int64_t)(val & 0x07ff));
             }
             break;
 
         case 0x8ee8:
-        case 0xcee8:
-            if (len == 1)
-                dev->accel.destx_distp = (dev->accel.destx_distp & 0x3f00) | val;
-            else {
-                mach->accel.src_x      = val;
-                dev->accel.destx       = val & 0x07ff;
-                dev->accel.destx_distp = val & 0x3fff;
-                if (val & 0x2000)
-                    dev->accel.destx_distp |= ~0x1fff;
-            }
-            break;
-        case 0x8ee9:
-        case 0xcee9:
-            if (len == 1) {
-                dev->accel.destx_distp = (dev->accel.destx_distp & 0xff) | ((val & 0x3f) << 8);
-                if (val & 0x20)
-                    dev->accel.destx_distp |= ~0x1fff;
+            ibm8514_accel_out_fifo(svga, port, val, len);
+            mach_log("SRCX=%04x, len=%d.\n", val & 0x07ff, len);
+            if (len == 2) {
+                mach->accel.src_x = val & 0x07ff;
+                mach->accel.src_x_scan = ((int64_t)(val & 0x07ff));
             }
             break;
 
         case 0x92e8:
-            if (len != 1)
-                dev->test = val;
-            fallthrough;
-
-        case 0xd2e8:
-            if (len == 1)
-                dev->accel.err_term = (dev->accel.err_term & 0x3f00) | val;
-            else {
-                dev->accel.err_term = val & 0x3fff;
-                if (val & 0x2000)
-                    dev->accel.err_term |= ~0x1fff;
-            }
-            break;
-        case 0x92e9:
-        case 0xd2e9:
-            if (len == 1) {
-                dev->accel.err_term = (dev->accel.err_term & 0xff) | ((val & 0x3f) << 8);
-                if (val & 0x20)
-                    dev->accel.err_term |= ~0x1fff;
-            }
+            ibm8514_accel_out_fifo(svga, port, val, len);
             break;
 
         case 0x96e8:
-        case 0xd6e8:
-            if (len == 1)
-                dev->accel.maj_axis_pcnt = (dev->accel.maj_axis_pcnt & 0x0700) | val;
-            else {
-                mach->accel.test         = val & 0x1fff;
-                dev->accel.maj_axis_pcnt = val & 0x07ff;
-                dev->accel.maj_axis_pcnt_no_limit = val;
-            }
-            break;
-        case 0x96e9:
-        case 0xd6e9:
-            if (len == 1) {
-                dev->accel.maj_axis_pcnt = (dev->accel.maj_axis_pcnt & 0xff) | ((val & 0x07) << 8);
-            }
+            ibm8514_accel_out_fifo(svga, port, val, len);
+            if (len == 2)
+                mach->accel.test = val & 0x1fff;
             break;
 
         case 0x9ae8:
-        case 0xdae8:
-            dev->accel.ssv_state = 0;
-            if (len == 1)
-                dev->accel.cmd = (dev->accel.cmd & 0xff00) | val;
-            else {
-                dev->data_available  = 0;
-                dev->data_available2 = 0;
-                dev->accel.cmd       = val;
-                mach_log("CMD8514=%04x, len=%d, pixcntl=%02x.\n", val, len, dev->accel.multifunc[0x0a]);
-                mach->accel.cmd_type = -1;
-                if (port == 0xdae8) {
-                    if (dev->accel.cmd & 0x100)
-                        dev->accel.cmd_back = 0;
-                }
-                ibm8514_accel_start(-1, 0, -1, 0, svga, len);
-            }
-            break;
-        case 0x9ae9:
-        case 0xdae9:
-            if (len == 1) {
-                dev->data_available  = 0;
-                dev->data_available2 = 0;
-                dev->accel.cmd       = (dev->accel.cmd & 0xff) | (val << 8);
-                mach->accel.cmd_type = -1;
-                if (port == 0xdae9) {
-                    if (dev->accel.cmd & 0x100)
-                        dev->accel.cmd_back = 0;
-                }
-                ibm8514_accel_start(-1, 0, -1, 0, svga, len);
-            }
+            mach->accel.cmd_type = -1;
+            ibm8514_accel_out_fifo(svga, port, val, len);
             break;
 
         case 0x9ee8:
-        case 0xdee8:
-            dev->accel.ssv_state = 1;
-            if (len == 1)
-                dev->accel.short_stroke = (dev->accel.short_stroke & 0xff00) | val;
-            else {
-                dev->accel.short_stroke = val;
-                dev->accel.cx           = dev->accel.cur_x;
-                dev->accel.cy           = dev->accel.cur_y;
-
-                if (dev->accel.cur_x >= 0x600) {
-                    dev->accel.cx |= ~0x5ff;
-                }
-                if (dev->accel.cur_y >= 0x600) {
-                    dev->accel.cy |= ~0x5ff;
-                }
-
-                if (dev->accel.cmd & 0x1000) {
-                    ibm8514_short_stroke_start(-1, 0, -1, 0, svga, dev->accel.short_stroke & 0xff, len);
-                    ibm8514_short_stroke_start(-1, 0, -1, 0, svga, dev->accel.short_stroke >> 8, len);
-                } else {
-                    ibm8514_short_stroke_start(-1, 0, -1, 0, svga, dev->accel.short_stroke >> 8, len);
-                    ibm8514_short_stroke_start(-1, 0, -1, 0, svga, dev->accel.short_stroke & 0xff, len);
-                }
-            }
-            break;
-        case 0x9ee9:
-        case 0xdee9:
-            if (len == 1) {
-                dev->accel.short_stroke = (dev->accel.short_stroke & 0xff) | (val << 8);
-                dev->accel.cx           = dev->accel.cur_x;
-                dev->accel.cy           = dev->accel.cur_y;
-
-                if (dev->accel.cur_x >= 0x600) {
-                    dev->accel.cx |= ~0x5ff;
-                }
-                if (dev->accel.cur_y >= 0x600) {
-                    dev->accel.cy |= ~0x5ff;
-                }
-
-                if (dev->accel.cmd & 0x1000) {
-                    ibm8514_short_stroke_start(-1, 0, -1, 0, svga, dev->accel.short_stroke & 0xff, len);
-                    ibm8514_short_stroke_start(-1, 0, -1, 0, svga, dev->accel.short_stroke >> 8, len);
-                } else {
-                    ibm8514_short_stroke_start(-1, 0, -1, 0, svga, dev->accel.short_stroke >> 8, len);
-                    ibm8514_short_stroke_start(-1, 0, -1, 0, svga, dev->accel.short_stroke & 0xff, len);
-                }
-            }
+            ibm8514_accel_out_fifo(svga, port, val, len);
             break;
 
         case 0xa2e8:
         case 0xe2e8:
             if (port == 0xe2e8) {
-                if (dev->accel.cmd_back) {
-                    if (len == 1)
-                        dev->accel.bkgd_color = (dev->accel.bkgd_color & 0x00ff) | val;
-                    else
-                        dev->accel.bkgd_color = val;
-                } else {
-                    if (len == 1) {
+                mach_log("%04X: Background Color=%04x, pix=%d, len=%d.\n", port, val, dev->accel.cmd_back, len);
+                if (len == 2) {
+                    if (!dev->accel.cmd_back) {
                         if (mach->accel.cmd_type >= 0) {
                             if (mach_pixel_read(mach))
                                 break;
-                            mach->accel.pix_trans[1] = val;
-                        }
-                    } else {
-                        if (mach->accel.cmd_type >= 0) {
-                            if (mach_pixel_read(mach))
-                                break;
-                            mach_accel_out_pixtrans(mach, dev, val);
+
+                            mach_log("ATI transfer.\n");
+                            mach_accel_out_pixtrans(svga, mach, dev, val);
                         } else {
                             if (ibm8514_cpu_dest(svga))
                                 break;
+
+                            mach_log("IBM transfer.\n");
                             ibm8514_accel_out_pixtrans(svga, port, val, len);
                         }
+                    } else {
+                        dev->accel.bkgd_color = val;
+                        mach_log("%04X: CMDBack BKGDCOLOR, sy=%d, height=%d, cmdtype=%d, val=%04x.\n", port, dev->accel.sy, mach->accel.height, mach->accel.cmd_type, val);
                     }
-                }
-            } else {
-                if (len == 1)
-                    dev->accel.bkgd_color = (dev->accel.bkgd_color & 0x00ff) | val;
-                else
-                    dev->accel.bkgd_color = val;
-            }
-            break;
-        case 0xa2e9:
-        case 0xe2e9:
-            if (port == 0xe2e9) {
-                if (dev->accel.cmd_back) {
-                    if (len == 1)
-                        dev->accel.bkgd_color = (dev->accel.bkgd_color & 0xff00) | (val << 8);
                 } else {
-                    if (len == 1) {
+                    if (!dev->accel.cmd_back) {
                         if (mach->accel.cmd_type >= 0) {
                             if (mach_pixel_read(mach))
                                 break;
-                            mach->accel.pix_trans[0] = val;
-                            frgd_sel                 = (mach->accel.dp_config >> 13) & 7;
-                            bkgd_sel                 = (mach->accel.dp_config >> 7) & 3;
-                            mono_src                 = (mach->accel.dp_config >> 5) & 3;
 
-                            switch (mach->accel.dp_config & 0x200) {
-                                case 0x000: /*8-bit size*/
-                                    if (mono_src == 2) {
-                                        if ((frgd_sel != 2) && (bkgd_sel != 2)) {
-                                            mach_accel_start(mach->accel.cmd_type, 1, 8, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), 0, mach, dev);
-                                        } else
-                                            mach_accel_start(mach->accel.cmd_type, 1, 1, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), mach, dev);
-                                    } else
-                                        mach_accel_start(mach->accel.cmd_type, 1, 1, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), mach, dev);
-                                    break;
-                                case 0x200: /*16-bit size*/
-                                    if (mono_src == 2) {
-                                        if ((frgd_sel != 2) && (bkgd_sel != 2)) {
-                                            if (mach->accel.dp_config & 0x1000)
-                                                mach_accel_start(mach->accel.cmd_type, 1, 16, mach->accel.pix_trans[1] | (mach->accel.pix_trans[0] << 8), 0, mach, dev);
-                                            else
-                                                mach_accel_start(mach->accel.cmd_type, 1, 16, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), 0, mach, dev);
-                                        } else
-                                            mach_accel_start(mach->accel.cmd_type, 1, 2, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), mach, dev);
-                                    } else
-                                        mach_accel_start(mach->accel.cmd_type, 1, 2, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), mach, dev);
-                                    break;
-
-                                default:
-                                    break;
-                            }
+                            mach->accel.pix_trans[1] = val;
                         }
                     }
                 }
             } else {
-                if (len == 1)
-                    dev->accel.bkgd_color = (dev->accel.bkgd_color & 0xff00) | (val << 8);
+                if (len == 2)
+                    dev->accel.bkgd_color = val;
+
+                mach_log("%04X: Background Color=%04x.\n", port, val);
             }
             break;
 
         case 0xa6e8:
         case 0xe6e8:
             if (port == 0xe6e8) {
-                if (dev->accel.cmd_back) {
-                    if (len == 1)
-                        dev->accel.frgd_color = (dev->accel.frgd_color & 0x00ff) | val;
-                    else
-                        dev->accel.frgd_color = val;
-                } else {
-                    if (len == 1) {
+                mach_log("%04X: Foreground Color=%04x, pix=%d, len=%d.\n", port, val, dev->accel.cmd_back, len);
+                if (len == 2) {
+                    if (!dev->accel.cmd_back) {
                         if (mach->accel.cmd_type >= 0) {
                             if (mach_pixel_read(mach))
                                 break;
-                            mach->accel.pix_trans[1] = val;
-                        }
-                    } else {
-                        if (mach->accel.cmd_type >= 0) {
-                            if (mach_pixel_read(mach))
-                                break;
-                            mach_accel_out_pixtrans(mach, dev, val);
+
+                            mach_log("ATI transfer.\n");
+                            mach_accel_out_pixtrans(svga, mach, dev, val);
                         } else {
                             if (ibm8514_cpu_dest(svga))
                                 break;
+
+                            mach_log("IBM transfer.\n");
                             ibm8514_accel_out_pixtrans(svga, port, val, len);
                         }
-                    }
-                }
-            } else {
-                if (len == 1)
-                    dev->accel.frgd_color = (dev->accel.frgd_color & 0x00ff) | val;
-                else
-                    dev->accel.frgd_color = val;
-            }
-            break;
-        case 0xa6e9:
-        case 0xe6e9:
-            if (port == 0xe6e9) {
-                if (dev->accel.cmd_back) {
-                    if (len == 1)
-                        dev->accel.frgd_color = (dev->accel.frgd_color & 0xff00) | (val << 8);
+                    } else
+                        dev->accel.frgd_color = val;
                 } else {
-                    if (len == 1) {
+                    if (!dev->accel.cmd_back) {
                         if (mach->accel.cmd_type >= 0) {
                             if (mach_pixel_read(mach))
                                 break;
-                            mach->accel.pix_trans[0] = val;
-                            frgd_sel                 = (mach->accel.dp_config >> 13) & 7;
-                            bkgd_sel                 = (mach->accel.dp_config >> 7) & 3;
-                            mono_src                 = (mach->accel.dp_config >> 5) & 3;
 
-                            switch (mach->accel.dp_config & 0x200) {
-                                case 0x000: /*8-bit size*/
-                                    if (mono_src == 2) {
-                                        if ((frgd_sel != 2) && (bkgd_sel != 2)) {
-                                            mach_accel_start(mach->accel.cmd_type, 1, 8, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), 0, mach, dev);
-                                        } else
-                                            mach_accel_start(mach->accel.cmd_type, 1, 1, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), mach, dev);
-                                    } else
-                                        mach_accel_start(mach->accel.cmd_type, 1, 1, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), mach, dev);
-                                    break;
-                                case 0x200: /*16-bit size*/
-                                    if (mono_src == 2) {
-                                        if ((frgd_sel != 2) && (bkgd_sel != 2)) {
-                                            if (mach->accel.dp_config & 0x1000)
-                                                mach_accel_start(mach->accel.cmd_type, 1, 16, mach->accel.pix_trans[1] | (mach->accel.pix_trans[0] << 8), 0, mach, dev);
-                                            else
-                                                mach_accel_start(mach->accel.cmd_type, 1, 16, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), 0, mach, dev);
-                                        } else
-                                            mach_accel_start(mach->accel.cmd_type, 1, 2, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), mach, dev);
-                                    } else
-                                        mach_accel_start(mach->accel.cmd_type, 1, 2, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), mach, dev);
-                                    break;
-
-                                default:
-                                    break;
-                            }
+                            mach->accel.pix_trans[1] = val;
                         }
                     }
                 }
             } else {
-                if (len == 1)
-                    dev->accel.frgd_color = (dev->accel.frgd_color & 0xff00) | (val << 8);
+                if (len == 2)
+                    dev->accel.frgd_color = val;
+
+                mach_log("%04X: Foreground Color=%04x.\n", port, val);
             }
             break;
 
+        case 0xe2e9:
+        case 0xe6e9:
+            mach_log("Write PORT=%04x, 8514/A=%x, val0=%02x, sy=%d, len=%d, dx=%d, dy=%d.\n", port, dev->accel.cmd_back, val, dev->accel.sy, len, dev->accel.dx, dev->accel.dy);
+            if (len == 1) {
+                if (!dev->accel.cmd_back) {
+                    if (mach->accel.cmd_type >= 0) {
+                        if (mach_pixel_read(mach))
+                            break;
+
+                        mach->accel.pix_trans[0] = val;
+                        frgd_sel = (mach->accel.dp_config >> 13) & 7;
+                        bkgd_sel = (mach->accel.dp_config >> 7) & 3;
+                        mono_src = (mach->accel.dp_config >> 5) & 3;
+
+                        switch (mach->accel.dp_config & 0x200) {
+                            case 0x000: /*8-bit size*/
+                                if (mono_src == 2) {
+                                    if ((frgd_sel != 2) && (bkgd_sel != 2)) {
+                                        mach_accel_start(mach->accel.cmd_type, 1, 8, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), 0, svga, mach, dev);
+                                    } else
+                                        mach_accel_start(mach->accel.cmd_type, 1, 1, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), svga, mach, dev);
+                                } else
+                                    mach_accel_start(mach->accel.cmd_type, 1, 1, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), svga, mach, dev);
+                                break;
+                            case 0x200: /*16-bit size*/
+                                if (mono_src == 2) {
+                                    if ((frgd_sel != 2) && (bkgd_sel != 2)) {
+                                        if (mach->accel.dp_config & 0x1000)
+                                            mach_accel_start(mach->accel.cmd_type, 1, 16, mach->accel.pix_trans[1] | (mach->accel.pix_trans[0] << 8), 0, svga, mach, dev);
+                                        else
+                                            mach_accel_start(mach->accel.cmd_type, 1, 16, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), 0, svga, mach, dev);
+                                    } else
+                                        mach_accel_start(mach->accel.cmd_type, 1, 2, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), svga, mach, dev);
+                                } else
+                                    mach_accel_start(mach->accel.cmd_type, 1, 2, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), svga, mach, dev);
+                                break;
+
+                            default:
+                                break;
+                        }
+                    }
+                }
+            }
+            mach_log("Write Port=%04x, Busy=%02x.\n", port, dev->force_busy2);
+            break;
+
         case 0xaae8:
-        case 0xeae8:
-            if (len == 1)
-                dev->accel.wrt_mask = (dev->accel.wrt_mask & 0x00ff) | val;
-            else {
-                dev->accel.wrt_mask = val;
-                mach_log("WrtMask=%04x.\n", val);
-            }
-            break;
-        case 0xaae9:
-        case 0xeae9:
-            if (len == 1)
-                dev->accel.wrt_mask = (dev->accel.wrt_mask & 0xff00) | (val << 8);
-            break;
-
+            if (len == 2)
+                mach->accel.dst_clr_cmp_mask = val;
+            fallthrough;
         case 0xaee8:
-        case 0xeee8:
-            if (len == 1)
-                dev->accel.rd_mask = (dev->accel.rd_mask & 0x00ff) | val;
-            else {
-                dev->accel.rd_mask = val;
-                mach_log("ReadMask=%04x.\n", val);
-            }
-            break;
-        case 0xaee9:
-        case 0xeee9:
-            if (len == 1)
-                dev->accel.rd_mask = (dev->accel.rd_mask & 0xff00) | (val << 8);
-            break;
-
         case 0xb2e8:
-        case 0xf2e8:
-            if (len == 1)
-                dev->accel.color_cmp = (dev->accel.color_cmp & 0x00ff) | val;
-            else
-                dev->accel.color_cmp = val;
-            break;
-        case 0xb2e9:
-        case 0xf2e9:
-            if (len == 1)
-                dev->accel.color_cmp = (dev->accel.color_cmp & 0xff00) | (val << 8);
-            break;
-
         case 0xb6e8:
-        case 0xf6e8:
-            dev->accel.bkgd_mix = val & 0xff;
-            break;
-
         case 0xbae8:
-        case 0xfae8:
-            dev->accel.frgd_mix = val & 0xff;
+            ibm8514_accel_out_fifo(svga, port, val, len);
             break;
 
         case 0xbee8:
-        case 0xfee8:
-            if (len == 1)
-                dev->accel.multifunc_cntl = (dev->accel.multifunc_cntl & 0xff00) | val;
-            else {
-                dev->accel.multifunc_cntl                             = val;
-                dev->accel.multifunc[dev->accel.multifunc_cntl >> 12] = dev->accel.multifunc_cntl & 0xfff;
-                if ((dev->accel.multifunc_cntl >> 12) == 1)
-                    dev->accel.clip_top = val & 0x7ff;
-
-                if ((dev->accel.multifunc_cntl >> 12) == 2)
-                    dev->accel.clip_left = val & 0x7ff;
-
-                if ((dev->accel.multifunc_cntl >> 12) == 3)
-                    dev->accel.multifunc[3] = val & 0x7ff;
-
-                if ((dev->accel.multifunc_cntl >> 12) == 4)
-                    dev->accel.multifunc[4] = val & 0x7ff;
-
-                mach_log("CLIPBOTTOM=%d, CLIPRIGHT=%d, bpp=%d, pitch=%d.\n", dev->accel.multifunc[3], dev->accel.multifunc[4], dev->accel_bpp, dev->pitch);
+            ibm8514_accel_out_fifo(svga, port, val, len);
+            if (len == 2) {
                 if ((dev->accel.multifunc_cntl >> 12) == 5) {
-                    if ((dev->local & 0xff) < 0x02)
+                    if (!ATI_MACH32) {
+                        dev->ext_pitch = 1024;
                         dev->ext_crt_pitch = 128;
+                        svga_recalctimings(svga);
+                    }
                 }
-                if (port == 0xfee8)
-                    dev->accel.cmd_back = 1;
-                else
-                    dev->accel.cmd_back = 0;
-            }
-            break;
-        case 0xbee9:
-        case 0xfee9:
-            if (len == 1) {
-                dev->accel.multifunc_cntl                             = (dev->accel.multifunc_cntl & 0xff) | (val << 8);
-                dev->accel.multifunc[dev->accel.multifunc_cntl >> 12] = dev->accel.multifunc_cntl & 0xfff;
-                if ((dev->accel.multifunc_cntl >> 12) == 1)
-                    dev->accel.clip_top = dev->accel.multifunc_cntl & 0x7ff;
-
-                if ((dev->accel.multifunc_cntl >> 12) == 2)
-                    dev->accel.clip_left = dev->accel.multifunc_cntl & 0x7ff;
-
-                if ((dev->accel.multifunc_cntl >> 12) == 5) {
-                    if ((dev->local & 0xff) < 0x02)
-                        dev->ext_crt_pitch = 128;
-                }
-                if (port == 0xfee9)
-                    dev->accel.cmd_back = 1;
-                else
-                    dev->accel.cmd_back = 0;
             }
             break;
 
             /*ATI Mach8/32 specific registers*/
+        case 0x2ee:
+        case 0x2ef:
+            if (len == 2) {
+                mach->overscan_col_8 = val & 0xff;
+                mach->overscan_b_col_24 = (val >> 8) & 0xff;
+            } else {
+                if (port & 1)
+                    mach->overscan_b_col_24 = val;
+                else
+                    mach->overscan_col_8 = val;
+            }
+            svga_recalctimings(svga);
+            break;
+        case 0x6ee:
+        case 0x6ef:
+            if (len == 2) {
+                mach->overscan_g_col_24 = val & 0xff;
+                mach->overscan_r_col_24 = (val >> 8) & 0xff;
+            } else {
+                if (port & 1)
+                    mach->overscan_r_col_24 = val;
+                else
+                    mach->overscan_g_col_24 = val;
+            }
+            svga_recalctimings(svga);
+            break;
+
+        case 0xaee:
+        case 0xaef:
+            WRITE8(port, mach->cursor_offset_lo_reg, val);
+            if (len == 2) {
+                WRITE8(port + 1, mach->cursor_offset_lo_reg, val >> 8);
+            }
+            mach->cursor_offset_lo = mach->cursor_offset_lo_reg;
+            dev->hwcursor.addr = ((mach->cursor_offset_lo | (mach->cursor_offset_hi << 16)) << 2);
+            if (!dev->vram_512k_8514 && ((mach->accel.ext_ge_config & 0x30) == 0x00))
+                dev->hwcursor.addr <<= 1;
+            break;
+
+        case 0xeee:
+        case 0xeef:
+            WRITE8(port, mach->cursor_offset_hi_reg, val);
+            if (len == 2) {
+                WRITE8(port + 1, mach->cursor_offset_hi_reg, val >> 8);
+            }
+            dev->hwcursor.ena = !!(mach->cursor_offset_hi_reg & 0x8000);
+            mach->cursor_offset_hi = mach->cursor_offset_hi_reg & 0x0f;
+            dev->hwcursor.addr = ((mach->cursor_offset_lo | (mach->cursor_offset_hi << 16)) << 2);
+            if (!dev->vram_512k_8514 && ((mach->accel.ext_ge_config & 0x30) == 0x00))
+                dev->hwcursor.addr <<= 1;
+            break;
+
+        case 0x12ee:
+        case 0x12ef:
+            WRITE8(port, mach->cursor_x, val);
+            if (len == 2) {
+                WRITE8(port + 1, mach->cursor_x, val >> 8);
+            }
+            dev->hwcursor.x = mach->cursor_x & 0x7ff;
+            break;
+
+        case 0x16ee:
+        case 0x16ef:
+            WRITE8(port, mach->cursor_y, val);
+            if (len == 2) {
+                WRITE8(port + 1, mach->cursor_y, val >> 8);
+            }
+            dev->hwcursor.y = mach->cursor_y & 0xfff;
+            break;
+
+        case 0x1aee:
+        case 0x1aef:
+            WRITE8(port, mach->cursor_col_b, val);
+            if (len == 2) {
+                WRITE8(port + 1, mach->cursor_col_b, val >> 8);
+            }
+            mach->cursor_col_0 = mach->cursor_col_b & 0xff;
+            mach->cursor_col_1 = (mach->cursor_col_b >> 8) & 0xff;
+            mach_log("ATI 8514/A: (0x%04x) Cursor Color B, val=0x%02x, len=%d, extended 8514/A mode bpp=%d.\n", port, val, len, dev->accel_bpp);
+            break;
+
+        case 0x1eee:
+        case 0x1eef:
+            WRITE8(port, mach->cursor_vh_offset, val);
+            if (len == 2) {
+                WRITE8(port + 1, mach->cursor_vh_offset, val >> 8);
+            }
+            dev->hwcursor.xoff = mach->cursor_vh_offset & 0x3f;
+            dev->hwcursor.yoff = (mach->cursor_vh_offset >> 8) & 0x3f;
+            break;
+
+        case 0x22ee:
+            if (mach->pci_bus) {
+                mach->pci_cntl_reg = val;
+                mach_log("PCI Control Reg=%02x.\n", val);
+                mach32_updatemapping(mach, svga);
+            }
+            break;
+
+        case 0x26ee:
+        case 0x26ef:
+            WRITE8(port, mach->accel.crt_pitch, val);
+            if (len == 2) {
+                WRITE8(port + 1, mach->accel.crt_pitch, val >> 8);
+            }
+
+            dev->ext_crt_pitch = mach->accel.crt_pitch & 0xff;
+
+            if (dev->accel_bpp > 8) {
+                if (dev->accel_bpp == 24) {
+                    dev->ext_crt_pitch *= 3;
+                } else if (dev->accel_bpp == 32)
+                    dev->ext_crt_pitch <<= 2;
+                else
+                    dev->ext_crt_pitch <<= 1;
+            }
+
+            if (len == 2) {
+                dev->_8514crt = 0;
+                if (!(dev->accel.advfunc_cntl & 0x01) && ATI_MACH32) {
+                    dev->on = 1;
+                    dev->vendor_mode = 1;
+                }
+            } else
+                dev->_8514crt = 1;
+
+            if (dev->mode != VGA_MODE)
+                mach_set_resolution(mach, svga);
+            else
+                svga_recalctimings(svga);
+
+            if (ATI_GRAPHICS_ULTRA || ATI_MACH32)
+                mach32_updatemapping(mach, svga);
+
+            mach_log("ATI 8514/A: (0x%04x) CRT Pitch, val=0x%02x, crtpitch=%x, len=%d, extended 8514/A mode bpp=%d, enable_on=%d.\n", port, val, dev->ext_crt_pitch, len, dev->accel_bpp, dev->on);
+            break;
+
+        case 0x2aee:
+        case 0x2aef:
+            if (len == 2)
+                mach->accel.crt_offset_lo = val;
+            else {
+                WRITE8(port, mach->accel.crt_offset_lo, val);
+            }
+            mach_log("ATI 8514/A: (0x%04x) CRT Offset Low val=0x%02x, len=%d.\n", port, val, len);
+            break;
+
+        case 0x2eee:
+        case 0x2eef:
+            mach->accel.crt_offset_hi = val & 0x0f;
+            mach_log("ATI 8514/A: (0x%04x) CRT Offset High val=0x%02x, len=%d.\n", port, val, len);
+            break;
+
+        case 0x32ee:
+        case 0x32ef:
+            if (len == 2)
+                mach->local_cntl = val;
+            else {
+                WRITE8(port, mach->local_cntl, val);
+            }
+            if (ATI_GRAPHICS_ULTRA || ATI_MACH32)
+                mach32_updatemapping(mach, svga);
+            break;
+
+        case 0x36ee:
+        case 0x36ef:
+            if (len == 2) {
+                if (ATI_MACH32)
+                    mach->misc = val;
+            } else {
+                if (ATI_MACH32)
+                    WRITE8(port, mach->misc, val);
+            }
+            mach->misc &= 0xfff0;
+            break;
+
+        case 0x3aee:
+        case 0x3aef:
+            if (len == 2)
+                mach->cursor_col_0_rg = val;
+            else {
+                WRITE8(port, mach->cursor_col_0_rg, val);
+            }
+            mach->ext_cur_col_0_g = mach->cursor_col_0_rg & 0xff;
+            mach->ext_cur_col_0_r = (mach->cursor_col_0_rg >> 8) & 0xff;
+            mach_log("ATI 8514/A: (0x%04x) Cursor Color 0 RG, val=0x%02x, len=%d, extended 8514/A mode bpp=%d.\n", port, val, len, dev->accel_bpp);
+            break;
+
+        case 0x3eee:
+        case 0x3eef:
+            if (len == 2)
+                mach->cursor_col_1_rg = val;
+            else {
+                WRITE8(port, mach->cursor_col_1_rg, val);
+            }
+            mach->ext_cur_col_1_g = mach->cursor_col_1_rg & 0xff;
+            mach->ext_cur_col_1_r = (mach->cursor_col_1_rg >> 8) & 0xff;
+            mach_log("ATI 8514/A: (0x%04x) Cursor Color 1 RG, val=0x%02x, len=%d, extended 8514/A mode bpp=%d.\n", port, val, len, dev->accel_bpp);
+            break;
+
+        case 0x42ee:
+        case 0x42ef:
+            if (len == 2)
+                mach->accel.test2 = val;
+            else {
+                WRITE8(port, mach->accel.test2, val);
+            }
+            mach_log("ATI 8514/A: (0x%04x) MEM_BNDRY val=%04x, memory part=%06x, gdcreg6=%02x.\n", port, val, (mach->accel.test2 & 0x0f) << 18, svga->gdcreg[6] & 0x0c);
+            mach32_updatemapping(mach, svga);
+            break;
+
+        case 0x46ee:
+        case 0x46ef:
+            if (len == 2)
+                mach->shadow_cntl = val;
+            else {
+                WRITE8(port, mach->shadow_cntl, val);
+            }
+            mach_log("ATI 8514/A: (0x%04x) val=%02x.\n", port, val);
+            break;
+
+        case 0x4aee:
+        case 0x4aef:
+            WRITE8(port, mach->accel.clock_sel, val);
+            if (len == 2) {
+                WRITE8(port + 1, mach->accel.clock_sel, val >> 8);
+            }
+            if (!(dev->accel.advfunc_cntl & 0x01))
+                dev->on = mach->accel.clock_sel & 0x01;
+
+            dev->vendor_mode = 1;
+            dev->mode = ATI_MODE;
+
+            mach_log("[%04X:%08X]: ATI 8514/A: (0x%04x): ON=%d, val=%04x, xor=%d, hdisp=%d, vdisp=%d, accelbpp=%d.\n",
+                     CS, cpu_state.pc, port, mach->accel.clock_sel & 0x01, val, dev->on, dev->hdisp, dev->vdisp, dev->accel_bpp);
+            mach_log("Vendor ATI mode set %s resolution.\n",
+                     (dev->accel.advfunc_cntl & 0x04) ? "2: 1024x768" : "1: 640x480");
+
+            mach_set_resolution(mach, svga);
+            if (ATI_GRAPHICS_ULTRA || ATI_MACH32)
+                mach32_updatemapping(mach, svga);
+            break;
+
+        case 0x52ee:
+        case 0x52ef:
+            mach_log("ATI 8514/A: (0x%04x) ScratchPad0 val=%04x.\n", port, val);
+            if (len == 2)
+                dev->accel.scratch0 = val;
+            else {
+                WRITE8(port, dev->accel.scratch0, val);
+            }
+            break;
+
+        case 0x56ee:
+        case 0x56ef:
+            mach_log("ATI 8514/A: (0x%04x) ScratchPad1 val=%04x.\n", port, val);
+            if (len == 2)
+                dev->accel.scratch1 = val;
+            else {
+                WRITE8(port, dev->accel.scratch1, val);
+            }
+            break;
+
+        case 0x5aee:
+        case 0x5aef:
+            WRITE8(port, mach->shadow_set, val);
+            if (len == 2) {
+                WRITE8(port + 1, mach->shadow_set, val >> 8);
+            }
+            mach_log("ATI 8514/A: (0x%04x) val=0x%02x, len=%d.\n", port, val, len);
+            if ((mach->shadow_set & 0x03) == 0x00)
+                mach_log("Primary CRT register set.\n");
+            else if ((mach->shadow_set & 0x03) == 0x01)
+                mach_log("CRT Shadow Set 1: 640x480.\n");
+            else if ((mach->shadow_set & 0x03) == 0x02)
+                mach_log("CRT Shadow Set 2: 1024x768.\n");
+            break;
+
+        case 0x5eee:
+        case 0x5eef:
+            if (len == 2)
+                mach->memory_aperture = val;
+            else {
+                WRITE8(port, mach->memory_aperture, val);
+            }
+            mach_log("Memory Aperture = %04x.\n", mach->memory_aperture);
+            if (!mach->pci_bus)
+                mach->linear_base = (mach->memory_aperture & 0xff00) << 12;
+
+            if (ATI_GRAPHICS_ULTRA || ATI_MACH32)
+                mach32_updatemapping(mach, svga);
+            break;
+
+        case 0x6aee:
+        case 0x6aef:
+            if (len == 2)
+                mach->accel.max_waitstates = val;
+            else {
+                WRITE8(port, mach->accel.max_waitstates, val);
+            }
+            mach_log("ATI 8514/A: (0x%04x) val=0x%02x, len=%d.\n", port, val, len);
+            break;
+
+        case 0x6eee:
+        case 0x6eef:
+            if (len == 2)
+                mach->accel.ge_offset_lo = val;
+            else {
+                WRITE8(port, mach->accel.ge_offset_lo, val);
+            }
+            mach_log("ATI 8514/A: (0x%04x) GE Offset Low val=0x%02x, geoffset=%04x, len=%d.\n", port, val, dev->accel.ge_offset, len);
+            svga_recalctimings(svga);
+            break;
+
+        case 0x72ee:
+        case 0x72ef:
+            if (len == 2)
+                mach->accel.ge_offset_hi = val;
+            else {
+                WRITE8(port, mach->accel.ge_offset_hi, val);
+            }
+            mach_log("ATI 8514/A: (0x%04x) GE Offset High val=0x%02x, geoffset=%04x, len=%d.\n", port, val, dev->accel.ge_offset, len);
+            svga_recalctimings(svga);
+            break;
+
+        case 0x76ee:
+        case 0x76ef:
+            if (len == 2)
+                mach->accel.ge_pitch = val;
+            else {
+                WRITE8(port, mach->accel.ge_pitch, val);
+            }
+            dev->ext_pitch = ((mach->accel.ge_pitch & 0xff) << 3);
+            mach_log("ATI 8514/A: (0x%04x) GE Pitch val=0x%02x.\n", port, val);
+            svga_recalctimings(svga);
+            break;
+
+        case 0x7aee:
+        case 0x7aef:
+            WRITE8(port, mach->accel.ext_ge_config, val);
+            if (len == 2) {
+                WRITE8(port + 1, mach->accel.ext_ge_config, val >> 8);
+            }
+
+            if (ATI_MACH32) {
+                if (mach->accel.crt_pitch & 0xff)
+                    dev->ext_crt_pitch = mach->accel.crt_pitch & 0xff;
+
+                switch (mach->accel.ext_ge_config & 0x30) {
+                    case 0x00:
+                    case 0x10:
+                        dev->bpp = 0;
+                        dev->accel_bpp = 8;
+                        break;
+                    case 0x20:
+                        dev->bpp = 1;
+                        dev->ext_crt_pitch <<= 1;
+                        switch (mach->accel.ext_ge_config & 0xc0) {
+                            case 0x00:
+                                dev->accel_bpp = 15;
+                                break;
+                            case 0x40:
+                                dev->accel_bpp = 16;
+                                break;
+                            default: /*TODO: 655RGB and 664RGB*/
+                                break;
+                        }
+                        break;
+                    case 0x30:
+                        dev->bpp = 0;
+                        if (mach->accel.ext_ge_config & 0x200) {
+                            dev->ext_crt_pitch <<= 2;
+                            dev->accel_bpp = 32;
+                        } else {
+                            dev->ext_crt_pitch *= 3;
+                            dev->accel_bpp = 24;
+                        }
+                        break;
+
+                    default:
+                        break;
+                }
+                svga_set_ramdac_type(svga, !!(mach->accel.ext_ge_config & 0x4000));
+                mach_log("ATI 8514/A: (0x%04x) Extended Configuration=%04x, val=%04x.\n", port, mach->accel.ext_ge_config, val);
+                if (dev->mode != VGA_MODE)
+                    mach_set_resolution(mach, svga);
+                else
+                    svga_recalctimings(svga);
+
+                mach32_updatemapping(mach, svga);
+            } else {
+                if (mach->accel.ext_ge_config & 0x80)
+                    ati_eeprom_write(&mach->eeprom, !!(mach->accel.ext_ge_config & 0x04), !!(mach->accel.ext_ge_config & 0x02), !!(mach->accel.ext_ge_config & 0x01));
+            }
+            break;
+
+        case 0x7eee:
+        case 0x7eef:
+            if (len == 2)
+                mach->accel.eeprom_control = val;
+            else {
+                WRITE8(port, mach->accel.eeprom_control, val);
+            }
+            mach_log("%04X write val=%04x, actual=%04x, len=%d.\n", port, mach->accel.eeprom_control, val, len);
+            break;
+
         case 0x82ee:
-            mach->accel.patt_data_idx = val & 0x1f;
-            mach_log("Pattern Data Index = %d.\n", val & 0x1f);
+            mach->accel.patt_data_idx_reg = val & 0x1f;
+            mach->accel.patt_data_idx = mach->accel.patt_data_idx_reg;
+
+            mach_log("Write Port 82ee: Pattern Data Index=%d, idx for color=%d.\n", val & 0x1f, mach->accel.color_pattern_idx);
+
+            if (mach->accel.patt_data_idx_reg < 0x10)
+                mach->accel.color_pattern_idx = mach->accel.patt_idx;
+            else
+                mach->accel.color_pattern_idx = 0;
             break;
 
         case 0x8eee:
-            if (len == 1) {
-                mach->accel.patt_data[mach->accel.patt_data_idx] = val;
-            } else {
-                mach->accel.patt_data[mach->accel.patt_data_idx]     = val & 0xff;
-                mach->accel.patt_data[mach->accel.patt_data_idx + 1] = (val >> 8) & 0xff;
-                if (mach->accel.mono_pattern_enable)
-                    mach->accel.patt_data_idx = (mach->accel.patt_data_idx + 2) & 0x17;
-                else {
-                    frgd_sel = (mach->accel.dp_config >> 13) & 7;
-                    mono_src = (mach->accel.dp_config >> 5) & 3;
-                    if ((dev->accel_bpp == 24) && (mach->accel.patt_len == 0x17) && (frgd_sel == 5)) {
-                        mach->accel.patt_data_idx += 2;
-                        dev->accel.y1 = 1;
+            if (len == 2) {
+                if (mach->accel.patt_data_idx_reg < 0x10) {
+                    if (dev->bpp) {
+                        mach->accel.color_pattern_hicol[mach->accel.patt_data_idx] = val;
+                        mach_log("Write Port 8eee: Color Pattern Word Data[%d]=%04x.\n", mach->accel.patt_data_idx, val);
+                        mach->accel.patt_data_idx++;
                     } else {
-                        if (dev->accel_bpp == 24)
-                            mach->accel.patt_data_idx += 2;
-                        else
-                            mach->accel.patt_data_idx = (mach->accel.patt_data_idx + 2) & mach->accel.patt_len;
-                    }
-                    mach_log("ExtCONFIG = %04x, Pattern Mono = %04x, selidx = %d, dataidx = %d, bit 0 = %02x len = %d.\n", mach->accel.ext_ge_config, val, mach->accel.patt_idx, mach->accel.patt_data_idx, val & 1, mach->accel.patt_len);
-                }
-            }
-            break;
-        case 0x8eef:
-            if (len == 1) {
-                mach->accel.patt_data[mach->accel.patt_data_idx + 1] = val;
-                if (mach->accel.mono_pattern_enable)
-                    mach->accel.patt_data_idx = (mach->accel.patt_data_idx + 2) & 7;
-                else {
-                    frgd_sel = (mach->accel.dp_config >> 13) & 7;
-                    if ((dev->accel_bpp == 24) && (mach->accel.patt_len == 0x17) && (frgd_sel == 5)) {
+                        mach->accel.color_pattern[mach->accel.patt_data_idx] = val & 0xff;
+                        mach->accel.color_pattern[mach->accel.patt_data_idx + 1] = (val >> 8) & 0xff;
+                        mach_log("Write Port 8eee: Color Pattern Word Data[%d]=%04x.\n", mach->accel.patt_data_idx, val);
                         mach->accel.patt_data_idx += 2;
-                        dev->accel.y1 = 1;
-                    } else
-                        mach->accel.patt_data_idx = (mach->accel.patt_data_idx + 2) & mach->accel.patt_len;
+                    }
+                } else {
+                    mach->accel.mono_pattern_normal[mach->accel.patt_data_idx - 0x10] = val & 0xff;
+                    mach->accel.mono_pattern_normal[(mach->accel.patt_data_idx + 1) - 0x10] = (val >> 8) & 0xff;
+                    mach_log("Write Port 8eee: Mono Pattern Word Data[%d]=%04x.\n", mach->accel.patt_data_idx - 0x10, val);
+                    mach->accel.patt_data_idx += 2;
                 }
             }
             break;
 
-        case 0x96ee:
-            if (len == 1)
-                mach->accel.bres_count = (mach->accel.bres_count & 0x700) | val;
-            else {
-                mach->accel.bres_count = val & 0x7ff;
-                mach_log("BresenhamDraw = %04x.\n", mach->accel.dp_config);
-                dev->data_available  = 0;
-                dev->data_available2 = 0;
-                mach->accel.cmd_type = 1;
-                mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, mach, dev);
-            }
+        case 0x92ee:
+            mach_log("Write port 92ee, malatch=%08x.\n", svga->memaddr_latch);
             break;
-        case 0x96ef:
-            if (len == 1) {
-                mach->accel.bres_count = (mach->accel.bres_count & 0xff) | ((val & 0x07) << 8);
-                mach_log("96EE (2) line draw.\n");
-                dev->data_available  = 0;
+
+        case 0x96ee:
+            if (len == 2) {
+                mach->accel.bres_count = val & 0x7ff;
+                mach_log("BresenhamDraw=%04x.\n", mach->accel.dp_config);
+                dev->data_available = 0;
                 dev->data_available2 = 0;
                 mach->accel.cmd_type = 1;
-                mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, mach, dev);
+                frgd_sel = (mach->accel.dp_config >> 13) & 7;
+                bkgd_sel = (mach->accel.dp_config >> 7) & 3;
+                mono_src = (mach->accel.dp_config >> 5) & 3;
+
+                dev->accel.cmd_back = 1;
+                if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach))
+                    dev->accel.cmd_back = 0;
+
+                mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, svga, mach, dev);
             }
             break;
 
@@ -3334,15 +4287,13 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             break;
 
         case 0xa2ee:
-            mach_log("Line OPT = %04x\n", val);
-            if (len == 1)
-                mach->accel.linedraw_opt = (mach->accel.linedraw_opt & 0xff00) | val;
-            else {
+            mach_log("Line OPT=%04x.\n", val);
+            if (len == 2) {
                 mach->accel.linedraw_opt = val;
-                mach->accel.bbottom = dev->accel.multifunc[3] & 0x7ff;
-                mach->accel.btop = dev->accel.clip_top & 0x7ff;
-                mach->accel.bleft = dev->accel.clip_left & 0x7ff;
-                mach->accel.bright = dev->accel.multifunc[4] & 0x7ff;
+                mach->accel.bbottom = dev->accel.clip_bottom;
+                mach->accel.btop = dev->accel.clip_top;
+                mach->accel.bleft = dev->accel.clip_left;
+                mach->accel.bright = dev->accel.clip_right;
                 if (mach->accel.linedraw_opt & 0x100) {
                     mach->accel.bbottom = 2047;
                     mach->accel.btop = 0;
@@ -3351,90 +4302,60 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                 }
             }
             break;
-        case 0xa2ef:
-            if (len == 1) {
-                mach->accel.linedraw_opt = (mach->accel.linedraw_opt & 0x00ff) | (val << 8);
-            }
-            break;
 
         case 0xa6ee:
-            if (len == 1)
-                mach->accel.dest_x_start = (mach->accel.dest_x_start & 0x700) | val;
-            else
+            if (len == 2)
                 mach->accel.dest_x_start = val & 0x7ff;
             break;
-        case 0xa6ef:
-            if (len == 1)
-                mach->accel.dest_x_start = (mach->accel.dest_x_start & 0x0ff) | ((val & 0x07) << 8);
-            break;
 
         case 0xaaee:
-            if (len == 1)
-                mach->accel.dest_x_end = (mach->accel.dest_x_end & 0x700) | val;
-            else {
+            if (len == 2)
                 mach->accel.dest_x_end = val & 0x7ff;
-            }
-            break;
-        case 0xaaef:
-            if (len == 1)
-                mach->accel.dest_x_end = (mach->accel.dest_x_end & 0x0ff) | ((val & 0x07) << 8);
             break;
 
         case 0xaeee:
-            if (len == 1)
-                mach->accel.dest_y_end = (mach->accel.dest_y_end & 0x700) | val;
-            else {
+            if (len == 2) {
                 mach->accel.dest_y_end = val & 0x7ff;
                 if ((val + 1) == 0x10000) {
-                    mach_log("Dest_Y_end overflow val = %04x\n", val);
+                    mach_log("Dest_Y_end overflow val=%04x, DPCONFIG=%04x\n", val, mach->accel.dp_config);
                     mach->accel.dest_y_end = 0;
                 }
                 dev->data_available  = 0;
                 dev->data_available2 = 0;
-                mach_log("BitBLT = %04x.\n", mach->accel.dp_config);
+                mach_log("BitBLT=%04x, pattidx=%d.\n", mach->accel.dp_config, mach->accel.patt_idx);
+                mach_log(".\n");
                 mach->accel.cmd_type = 2; /*Non-conforming BitBLT from dest_y_end register (0xaeee)*/
-                mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, mach, dev);
-            }
-            break;
-        case 0xaeef:
-            if (len == 1) {
-                mach->accel.dest_y_end = (mach->accel.dest_y_end & 0x0ff) | ((val & 0x07) << 8);
-                dev->data_available    = 0;
-                dev->data_available2   = 0;
-                mach->accel.cmd_type   = 2; /*Non-conforming BitBLT from dest_y_end register (0xaeee)*/
-                mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, mach, dev);
+
+                frgd_sel = (mach->accel.dp_config >> 13) & 7;
+                bkgd_sel = (mach->accel.dp_config >> 7) & 3;
+                mono_src = (mach->accel.dp_config >> 5) & 3;
+
+                dev->accel.cmd_back = 1;
+                if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach))
+                    dev->accel.cmd_back = 0;
+
+                mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, svga, mach, dev);
             }
             break;
 
         case 0xb2ee:
-            if (len == 1)
-                mach->accel.src_x_start = (mach->accel.src_x_start & 0x700) | val;
-            else
+            if (len == 2)
                 mach->accel.src_x_start = val & 0x7ff;
             break;
-        case 0xb2ef:
-            if (len == 1)
-                mach->accel.src_x_start = (mach->accel.src_x_start & 0x0ff) | ((val & 0x07) << 8);
-            break;
 
         case 0xb6ee:
-            dev->accel.bkgd_mix = val & 0xff;
+            dev->accel.bkgd_mix = val & 0x1f;
+            dev->accel.bkgd_sel = (mach->accel.dp_config >> 7) & 3;
             break;
 
         case 0xbaee:
-            dev->accel.frgd_mix = val & 0xff;
+            dev->accel.frgd_mix = val & 0x1f;
+            dev->accel.frgd_sel = (mach->accel.dp_config >> 13) & 3;
             break;
 
         case 0xbeee:
-            if (len == 1)
-                mach->accel.src_x_end = (mach->accel.src_x_end & 0x700) | val;
-            else {
+            if (len == 2)
                 mach->accel.src_x_end = val & 0x7ff;
-            }
-            break;
-        case 0xbeef:
-            if (len == 1)
-                mach->accel.src_x_end = (mach->accel.src_x_end & 0x0ff) | ((val & 0x07) << 8);
             break;
 
         case 0xc2ee:
@@ -3442,14 +4363,21 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             break;
 
         case 0xc6ee:
-            mach->accel.cmd_type = 0;
-            mach_log("TODO: Short Stroke.\n");
+            if (len == 2) {
+                mach->accel.cmd_type = 0;
+                mach_log("TODO: Short Stroke.\n");
+                frgd_sel = (mach->accel.dp_config >> 13) & 7;
+                bkgd_sel = (mach->accel.dp_config >> 7) & 3;
+                mono_src = (mach->accel.dp_config >> 5) & 3;
+
+                dev->accel.cmd_back = 1;
+                if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach))
+                    dev->accel.cmd_back = 0;
+            }
             break;
 
         case 0xcaee:
-            if (len == 1)
-                mach->accel.scan_to_x = (mach->accel.scan_to_x & 0x700) | val;
-            else {
+            if (len == 2) {
                 mach->accel.scan_to_x = (val & 0x7ff);
                 if ((val + 1) == 0x10000) {
                     mach_log("Scan_to_X overflow val = %04x\n", val);
@@ -3458,142 +4386,127 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
                 dev->data_available  = 0;
                 dev->data_available2 = 0;
                 mach->accel.cmd_type = 5; /*Horizontal Raster Draw from scan_to_x register (0xcaee)*/
-                mach_log("ScanToX = %04x.\n", mach->accel.dp_config);
-                mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, mach, dev);
-            }
-            break;
-        case 0xcaef:
-            if (len == 1) {
-                mach->accel.scan_to_x = (mach->accel.scan_to_x & 0x0ff) | ((val & 0x07) << 8);
-                dev->data_available   = 0;
-                dev->data_available2  = 0;
-                mach->accel.cmd_type  = 5; /*Horizontal Raster Draw from scan_to_x register (0xcaee)*/
-                mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, mach, dev);
+                mach_log("ScanToX len=%d.\n", val);
+                mach_log(".\n");
+
+                frgd_sel = (mach->accel.dp_config >> 13) & 7;
+                bkgd_sel = (mach->accel.dp_config >> 7) & 3;
+                mono_src = (mach->accel.dp_config >> 5) & 3;
+
+                dev->accel.cmd_back = 1;
+                if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach))
+                    dev->accel.cmd_back = 0;
+
+                mach_log("ScanToX=%04x, mono_src=%d, bkgd_sel=%d, frgd_sel=%d, pixread=%x.\n", mach->accel.dp_config, mono_src, bkgd_sel, frgd_sel, mach_pixel_read(mach));
+                mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, svga, mach, dev);
             }
             break;
 
         case 0xceee:
-            mach_log("CEEE write val = %04x.\n", val);
-            if (len == 1)
-                mach->accel.dp_config = (mach->accel.dp_config & 0xff00) | val;
-            else {
+            mach_log("Data Path Configuration (%04x) write val=%04x, len=%d.\n", port, val, len);
+            if (len == 2) {
                 dev->data_available  = 0;
                 dev->data_available2 = 0;
                 mach->accel.dp_config = val;
             }
             break;
-        case 0xceef:
-            if (len == 1) {
-                mach->accel.dp_config = (mach->accel.dp_config & 0x00ff) | (val << 8);
-            }
-            break;
 
         case 0xd2ee:
             mach->accel.patt_len = val & 0x1f;
-            mach_log("Pattern Length = %d, val = %04x.\n", val & 0x1f, val);
+            mach_log("Write Port d2ee: Pattern Length=%d, val=%04x.\n", val & 0x1f, val);
             mach->accel.mono_pattern_enable = !!(val & 0x80);
-            if (len != 1) {
+            if (len == 2) {
+                mach->accel.block_write_mono_pattern_enable = !!(val & 0x8000);
                 mach->accel.patt_len_reg = val;
-            } else {
-                mach->accel.patt_len_reg = (mach->accel.patt_len_reg & 0xff00) | val;
             }
             break;
-        case 0xd2ef:
-            if (len == 1)
-                mach->accel.patt_len_reg = (mach->accel.patt_len_reg & 0x00ff) | (val << 8);
-            break;
 
         case 0xd6ee:
             mach->accel.patt_idx = val & 0x1f;
-            mach_log("Pattern Index = %d, val = %02x.\n", val & 0x1f, val);
+            frgd_sel = (mach->accel.dp_config >> 13) & 7;
+
+            if ((frgd_sel == 5) && (dev->accel_bpp >= 24) && (mach->accel.patt_len == 0x17))
+                mach->accel.color_pattern_idx = 0;
+
+            mach_log("Write Port d6ee: Pattern Index=%d.\n", val & 0x1f);
             break;
 
         case 0xdaee:
-            mach_log("DAEE (extclipl) write val = %d\n", val);
-            if (len == 1)
-                dev->accel.clip_left = (dev->accel.clip_left & 0x700) | val;
-            else {
-                dev->accel.clip_left = val & 0x7ff;
+            if (len == 2) {
+                dev->accel.multifunc[2] = val & 0x7ff;
+                dev->accel.clip_left = dev->accel.multifunc[2];
+                if (val & 0x800)
+                    dev->accel.clip_left |= ~0x7ff;
             }
-            break;
-        case 0xdaef:
-            if (len == 1)
-                dev->accel.clip_left = (dev->accel.clip_left & 0x0ff) | ((val & 0x07) << 8);
+            mach_log("DAEE (extclipl) write val=%d, left=%d.\n", val, dev->accel.clip_left);
             break;
 
         case 0xdeee:
-            mach_log("DEEE (extclipt) write val = %d\n", val);
-            if (len == 1)
-                dev->accel.clip_top = (dev->accel.clip_top & 0x700) | val;
-            else {
-                dev->accel.clip_top = val & 0x7ff;
+            if (len == 2) {
+                dev->accel.multifunc[1] = val & 0x7ff;
+                dev->accel.clip_top = dev->accel.multifunc[1];
+                if (val & 0x800) {
+                    dev->accel.clip_top |= ~0x7ff;
+                }
             }
-            break;
-        case 0xdeef:
-            if (len == 1)
-                dev->accel.clip_top = (dev->accel.clip_top & 0x0ff) | ((val & 0x07) << 8);
+            mach_log("DEEE (extclipt) write val = %d\n", val);
             break;
 
         case 0xe2ee:
-            mach_log("E2EE (extclipr) write val = %d\n", val);
-            if (len == 1)
-                dev->accel.multifunc[4] = (dev->accel.multifunc[4] & 0x700) | val;
-            else {
+            if (len == 2) {
                 dev->accel.multifunc[4] = val & 0x7ff;
+                dev->accel.clip_right = dev->accel.multifunc[4];
+                if (val & 0x800)
+                    dev->accel.clip_right |= ~0x7ff;
             }
-            break;
-        case 0xe2ef:
-            if (len == 1)
-                dev->accel.multifunc[4] = (dev->accel.multifunc[4] & 0x0ff) | ((val & 0x07) << 8);
+            mach_log("E2EE (extclipr) write val = %d\n", val);
             break;
 
         case 0xe6ee:
-            mach_log("E6EE (extclipb) write val = %d\n", val);
-            if (len == 1)
-                dev->accel.multifunc[3] = (dev->accel.multifunc[3] & 0x700) | val;
-            else {
+            if (len == 2) {
                 dev->accel.multifunc[3] = val & 0x7ff;
+                dev->accel.clip_bottom = dev->accel.multifunc[3];
+                if (val & 0x800)
+                    dev->accel.clip_bottom |= ~0x7ff;
             }
-            break;
-        case 0xe6ef:
-            if (len == 1)
-                dev->accel.multifunc[3] = (dev->accel.multifunc[3] & 0x0ff) | ((val & 0x07) << 8);
+            mach_log("E6EE (extclipb) write val = %d\n", val);
             break;
 
         case 0xeeee:
-            if (len == 1)
-                mach->accel.dest_cmp_fn = (mach->accel.dest_cmp_fn & 0xff00) | val;
-            else
+            mach_log("EEEE val=%04x, len=%d.\n", val, len);
+            if (len == 2)
                 mach->accel.dest_cmp_fn = val;
             break;
-        case 0xeeef:
-            if (len == 1)
-                mach->accel.dest_cmp_fn = (mach->accel.dest_cmp_fn & 0x00ff) | (val << 8);
-            break;
 
         case 0xf2ee:
-            mach_log("F2EE.\n");
-            if (len == 1)
-                mach->accel.dst_clr_cmp_mask = (mach->accel.dst_clr_cmp_mask & 0xff00) | val;
-            else
+            mach_log("F2EE val=%04x, len=%d.\n", val, len);
+            if (len == 2)
                 mach->accel.dst_clr_cmp_mask = val;
             break;
-        case 0xf2ef:
-            if (len == 1)
-                mach->accel.dst_clr_cmp_mask = (mach->accel.dst_clr_cmp_mask & 0x00ff) | (val << 8);
-            break;
 
         case 0xfeee:
-            mach_log("LineDraw = %04x.\n", mach->accel.dp_config);
-            if (len != 1) {
+            if (len == 2) {
                 mach->accel.line_array[mach->accel.line_idx] = val;
+                mach_log("mach->accel.line_array[%02X] = %04X\n", mach->accel.line_idx, val);
                 dev->accel.cur_x                             = mach->accel.line_array[(mach->accel.line_idx == 4) ? 4 : 0];
                 dev->accel.cur_y                             = mach->accel.line_array[(mach->accel.line_idx == 5) ? 5 : 1];
                 mach->accel.cx_end_line                      = mach->accel.line_array[2];
                 mach->accel.cy_end_line                      = mach->accel.line_array[3];
                 if ((mach->accel.line_idx == 3) || (mach->accel.line_idx == 5)) {
                     mach->accel.cmd_type = (mach->accel.line_idx == 5) ? 4 : 3;
-                    mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, mach, dev);
+                    frgd_sel = (mach->accel.dp_config >> 13) & 7;
+                    bkgd_sel = (mach->accel.dp_config >> 7) & 3;
+                    mono_src = (mach->accel.dp_config >> 5) & 3;
+
+                    dev->accel.cmd_back = 1;
+                    if ((mono_src == 2) || (bkgd_sel == 2) || (frgd_sel == 2) || mach_pixel_read(mach))
+                        dev->accel.cmd_back = 0;
+
+                    if ((mach->accel.cmd_type == 3) && !dev->accel.cmd_back && (mach->accel.dp_config == 0x0000)) /*Avoid a hang with a dummy command.*/
+                        dev->accel.cmd_back = 1;
+
+                    mach_log("LineDraw type=%x, dpconfig=%04x.\n", mach->accel.cmd_type, mach->accel.dp_config);
+                    mach_accel_start(mach->accel.cmd_type, 0, -1, -1, 0, svga, mach, dev);
                     mach->accel.line_idx = (mach->accel.line_idx == 5) ? 4 : 2;
                     break;
                 }
@@ -3602,396 +4515,16 @@ mach_accel_out_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, u
             break;
 
         default:
+            mach_log("Unknown or reserved write to %04x, val=%04x, len=%d, latch=%08x.\n", port, val, len, svga->memaddr_latch);
             break;
     }
 }
 
-static void
-mach_accel_out_call(uint16_t port, uint8_t val, mach_t *mach, svga_t *svga, ibm8514_t *dev)
-{
-    uint8_t    old = 0;
-
-    if (port != 0x7aee && port != 0x7aef && port != 0x42e8 && port != 0x42e9 && port != 0x46e8 && port != 0x46e9)
-        mach_log("[%04X:%08X]: Port CALL OUT=%04x, val=%02x.\n", CS, cpu_state.pc, port, val);
-
-    switch (port) {
-        case 0x2e8:
-        case 0x2e9:
-            WRITE8(port, dev->htotal, val);
-            break;
-
-        case 0x6e8:
-        case 0x6e9:
-            if (!(port & 1)) {
-                if (((dev->disp_cntl & 0x60) == 0x20) || (((dev->disp_cntl & 0x60) == 0x40) && !(dev->accel.advfunc_cntl & 0x04)) || (mach->accel.clock_sel & 0x01)) {
-                    dev->hdisped = val;
-                    dev->hdisp = (dev->hdisped + 1) << 3;
-                }
-            }
-            mach_log("[%04X:%08X]: ATI 8514/A: H_DISP write 06E8 = %d, actual val=%d, set lock=%x, shadow set=%x, advfunc=%x, dispcntl=%02x.\n", CS, cpu_state.pc, dev->hdisp, ((val + 1) << 3), mach->shadow_cntl, mach->shadow_set, dev->accel.advfunc_cntl & 4, dev->disp_cntl & 0x60);
-            break;
-
-        case 0xae8:
-        case 0xae9:
-            if (!(port & 1)) {
-                if (((dev->disp_cntl & 0x60) == 0x20) || (((dev->disp_cntl & 0x60) == 0x40) && !(dev->accel.advfunc_cntl & 0x04)) || (mach->accel.clock_sel & 0x01)) {
-                    dev->hsync_start = val;
-                    dev->hblankstart = (dev->hsync_start & 0x07) + 1;
-                }
-            }
-            mach_log("ATI 8514/A: H_SYNC_STRT write 0AE8 = %d\n", val + 1);
-            break;
-
-        case 0xee8:
-        case 0xee9:
-            if (!(port & 1)) {
-                if (((dev->disp_cntl & 0x60) == 0x20) || (((dev->disp_cntl & 0x60) == 0x40) && !(dev->accel.advfunc_cntl & 0x04)) || (mach->accel.clock_sel & 0x01)) {
-                    dev->hsync_width = val;
-                    dev->hblank_end_val = (dev->hblankstart + (dev->hsync_width & 0x1f) - 1) & 0x3f;
-                }
-            }
-            mach_log("ATI 8514/A: H_SYNC_WID write 0EE8 = %d\n", val + 1);
-            break;
-
-        case 0x12e8:
-        case 0x12e9:
-            if (((dev->disp_cntl & 0x60) == 0x20) || (((dev->disp_cntl & 0x60) == 0x40) && !(dev->accel.advfunc_cntl & 0x04)) || (mach->accel.clock_sel & 0x01)) {
-                WRITE8(port, dev->v_total_reg, val);
-                dev->v_total_reg &= 0x1fff;
-                dev->vtotal = dev->v_total_reg;
-                dev->vtotal++;
-            }
-            break;
-
-        case 0x16e8:
-        case 0x16e9:
-            if (((dev->disp_cntl & 0x60) == 0x20) || (((dev->disp_cntl & 0x60) == 0x40) && !(dev->accel.advfunc_cntl & 0x04)) || (mach->accel.clock_sel & 0x01)) {
-                WRITE8(port, dev->v_disp, val);
-                dev->v_disp &= 0x1fff;
-                dev->vdisp = dev->v_disp;
-                dev->vdisp >>= 1;
-                dev->vdisp++;
-            }
-            dev->modechange = dev->accel.advfunc_cntl & 0x04;
-            mach->compat_mode = mach->shadow_set & 0x03;
-            mach_log("ATI 8514/A: V_DISP write 16E8 = %d\n", dev->vdisp);
-            break;
-
-        case 0x1ae8:
-        case 0x1ae9:
-            if (((dev->disp_cntl & 0x60) == 0x20) || (((dev->disp_cntl & 0x60) == 0x40) && !(dev->accel.advfunc_cntl & 0x04)) || (mach->accel.clock_sel & 0x01)) {
-                WRITE8(port, dev->v_sync_start, val);
-                dev->v_sync_start &= 0x1fff;
-                dev->vsyncstart = dev->v_sync_start;
-                dev->vsyncstart++;
-            }
-            break;
-
-        case 0x1ee8:
-        case 0x1ee9:
-            mach_log("ATI 8514/A: V_SYNC_WID write 1EE8 = %02x\n", val);
-            break;
-
-        case 0x22e8:
-            dev->disp_cntl = val;
-            dev->interlace = !!(val & 0x10);
-            mach_log("ATI 8514/A: DISP_CNTL write 22E8 = %02x, interlace = %d\n", dev->disp_cntl, dev->interlace);
-            break;
-
-        case 0x42e8:
-            old = dev->subsys_stat;
-            if (val & 1)
-                dev->subsys_stat &= ~1;
-            if (val & 2)
-                dev->subsys_stat &= ~2;
-            if (val & 4)
-                dev->subsys_stat &= ~4;
-            if (val & 8)
-                dev->subsys_stat &= ~8;
-            break;
-        case 0x42e9:
-            old = dev->subsys_cntl;
-            dev->subsys_cntl = val;
-            if ((old ^ val) & 1)
-                dev->subsys_stat |= 1;
-            if ((old ^ val) & 2)
-                dev->subsys_stat |= 2;
-            if ((old ^ val) & 4)
-                dev->subsys_stat |= 4;
-            if ((old ^ val) & 8)
-                dev->subsys_stat |= 8;
-            break;
-
-        case 0x4ae8:
-        case 0x4ae9:
-            WRITE8(port, dev->accel.advfunc_cntl, val);
-            dev->on[port & 1] = dev->accel.advfunc_cntl & 0x01;
-            if ((dev->local & 0xff) < 0x02)
-                dev->ext_crt_pitch = 128;
-
-            vga_on = !dev->on[port & 1];
-            mach->ext_on[port & 1] = dev->on[port & 1];
-            mach32_updatemapping(mach, svga);
-            dev->vendor_mode[port & 1] = 0;
-            mach_log("ATI 8514/A: (0x%04x): ON=%d, shadow crt=%x.\n", port, dev->on[port & 1], dev->accel.advfunc_cntl & 4);
-            svga_recalctimings(svga);
-            break;
-
-        /*ATI Mach8/32 specific registers*/
-        case 0x2ee:
-            mach_log("2EE write val = %02x.\n", val);
-            break;
-        case 0x2ef:
-            mach_log("2EF write val = %02x.\n", val);
-            break;
-
-        case 0x6ee:
-            mach_log("6EE write val = %02x.\n", val);
-            break;
-        case 0x6ef:
-            mach_log("6EF write val = %02x.\n", val);
-            break;
-
-        case 0xaee:
-        case 0xaef:
-            WRITE8(port, mach->cursor_offset_lo_reg, val);
-            mach->cursor_offset_lo = mach->cursor_offset_lo_reg;
-            break;
-
-        case 0xeee:
-        case 0xeef:
-            WRITE8(port, mach->cursor_offset_hi_reg, val);
-            mach->cursor_offset_hi = mach->cursor_offset_hi_reg & 0x0f;
-            dev->hwcursor.addr = (mach->cursor_offset_lo | (mach->cursor_offset_hi << 16)) << 2;
-            dev->hwcursor.ena = !!(mach->cursor_offset_hi_reg & 0x8000);
-            break;
-
-        case 0x12ee:
-        case 0x12ef:
-            WRITE8(port, mach->cursor_x, val);
-            dev->hwcursor.x = mach->cursor_x & 0x7ff;
-            break;
-
-        case 0x16ee:
-        case 0x16ef:
-            WRITE8(port, mach->cursor_y, val);
-            dev->hwcursor.y = mach->cursor_y & 0xfff;
-            break;
-
-        case 0x1aee:
-        case 0x1aef:
-            WRITE8(port, mach->cursor_col_b, val);
-            mach->cursor_col_0 = mach->cursor_col_b & 0xff;
-            mach->cursor_col_1 = (mach->cursor_col_b >> 8) & 0xff;
-            break;
-
-        case 0x1eee:
-        case 0x1eef:
-            WRITE8(port, mach->cursor_vh_offset, val);
-            dev->hwcursor.xoff = mach->cursor_vh_offset & 0x3f;
-            dev->hwcursor.yoff = (mach->cursor_vh_offset >> 8) & 0x3f;
-            break;
-
-        case 0x22ee:
-            if (mach->pci_bus) {
-                mach->pci_cntl_reg = val;
-                mach32_updatemapping(mach, svga);
-            }
-            break;
-
-        case 0x26ee:
-        case 0x26ef:
-            WRITE8(port, mach->accel.crt_pitch, val);
-            dev->ext_crt_pitch = mach->accel.crt_pitch & 0xff;
-            if (dev->accel_bpp > 8) {
-                if (dev->accel_bpp == 24)
-                    dev->ext_crt_pitch *= 3;
-                else if (dev->accel_bpp == 32)
-                    dev->ext_crt_pitch <<= 2;
-                else
-                    dev->ext_crt_pitch <<= 1;
-            }
-            mach_log("ATI 8514/A: (0x%04x) val = %04x.\n", port, val);
-            svga_recalctimings(svga);
-            break;
-
-        case 0x32ee:
-        case 0x32ef:
-            WRITE8(port, mach->local_cntl, val);
-            mach32_updatemapping(mach, svga);
-            break;
-
-        case 0x36ee:
-        case 0x36ef:
-            mach_log("ATI 8514/A: (0x%04x) val = %04x.\n", port, val);
-            WRITE8(port, mach->misc, val);
-            mach->misc &= 0xfff0;
-            break;
-
-        case 0x3aee:
-        case 0x3aef:
-            WRITE8(port, mach->cursor_col_0_rg, val);
-            mach->ext_cur_col_0_g = mach->cursor_col_0_rg & 0xff;
-            mach->ext_cur_col_0_r = (mach->cursor_col_0_rg >> 8) & 0xff;
-            break;
-
-        case 0x3eee:
-        case 0x3eef:
-            WRITE8(port, mach->cursor_col_1_rg, val);
-            mach->ext_cur_col_1_g = mach->cursor_col_1_rg & 0xff;
-            mach->ext_cur_col_1_r = (mach->cursor_col_1_rg >> 8) & 0xff;
-            break;
-
-        case 0x42ee:
-        case 0x42ef:
-            mach_log("ATI 8514/A: (0x%04x) val = %04x.\n", port, val);
-            WRITE8(port, mach->accel.test2, val);
-            break;
-
-        case 0x46ee:
-        case 0x46ef:
-            mach_log("ATI 8514/A: (0x%04x) val = %04x.\n", port, val);
-            WRITE8(port, mach->shadow_cntl, val);
-            break;
-
-        case 0x4aee:
-        case 0x4aef:
-            WRITE8(port, mach->accel.clock_sel, val);
-            dev->on[port & 1] = mach->accel.clock_sel & 0x01;
-            mach_log("ATI 8514/A: (0x%04x): ON=%d.\n", port, dev->on[port & 1]);
-            mach->ext_on[port & 1] = dev->on[port & 1];
-            vga_on = !dev->on[port & 1];
-            dev->vendor_mode[port & 1] = 1;
-            svga_recalctimings(svga);
-            break;
-
-        case 0x52ee:
-        case 0x52ef:
-            mach_log("ATI 8514/A: (0x%04x) val = %04x.\n", port, val);
-            WRITE8(port, mach->accel.scratch0, val);
-            break;
-
-        case 0x56ee:
-        case 0x56ef:
-            mach_log("ATI 8514/A: (0x%04x) val = %04x.\n", port, val);
-            WRITE8(port, mach->accel.scratch1, val);
-            break;
-
-        case 0x5aee:
-        case 0x5aef:
-            if (!(mach->shadow_cntl & 0x3f)) {
-                WRITE8(port, mach->shadow_set, val);
-                mach_log("ATI 8514/A: (0x%04x) val = %04x.\n", port, val);
-            }
-            break;
-
-        case 0x5eee:
-        case 0x5eef:
-            WRITE8(port, mach->memory_aperture, val);
-            mach_log("Memory Aperture = %04x.\n", mach->memory_aperture);
-            if (!mach->pci_bus)
-                mach->linear_base = (mach->memory_aperture & 0xff00) << 12;
-
-            mach32_updatemapping(mach, svga);
-            break;
-
-        case 0x62ee:
-            mach_log("62EE write val = %04x, len = %d.\n", val, len);
-            break;
-
-        case 0x66ee:
-            mach_log("66EE write val = %04x, len = %d.\n", val, len);
-            break;
-
-        case 0x6aee:
-        case 0x6aef:
-            WRITE8(port, mach->accel.max_waitstates, val);
-            break;
-
-        case 0x6eee:
-        case 0x6eef:
-            WRITE8(port, mach->accel.ge_offset_lo, val);
-            dev->accel.ge_offset = mach->accel.ge_offset_lo;
-            break;
-
-        case 0x72ee:
-        case 0x72ef:
-            WRITE8(port, mach->accel.ge_offset_hi, val);
-            dev->accel.ge_offset = mach->accel.ge_offset_lo | (mach->accel.ge_offset_hi << 16);
-            break;
-
-        case 0x76ee:
-        case 0x76ef:
-            WRITE8(port, mach->accel.ge_pitch, val);
-            dev->ext_pitch = ((mach->accel.ge_pitch & 0xff) << 3);
-            mach_log("ATI 8514/A: (0x%04x) val = %04x, extpitch = %d.\n", port, val, dev->ext_pitch);
-            svga_recalctimings(svga);
-            break;
-
-        case 0x7aee:
-        case 0x7aef:
-            WRITE8(port, mach->accel.ext_ge_config, val);
-            if ((dev->local & 0xff) >= 0x02) {
-                if (mach->accel.crt_pitch & 0xff)
-                    dev->ext_crt_pitch = mach->accel.crt_pitch & 0xff;
-                switch (mach->accel.ext_ge_config & 0x30) {
-                    case 0:
-                    case 0x10:
-                        dev->bpp = 0;
-                        break;
-                    case 0x20:
-                        dev->bpp = 1;
-                        dev->ext_crt_pitch <<= 1;
-                        break;
-                    case 0x30:
-                        dev->bpp = 0;
-                        if (mach->accel.ext_ge_config & 0x200)
-                            dev->ext_crt_pitch <<= 2;
-                        else
-                            dev->ext_crt_pitch *= 3;
-                        break;
-
-                    default:
-                        break;
-                }
-                svga_set_ramdac_type(svga, !!(mach->accel.ext_ge_config & 0x4000));
-                dev->vendor_mode[port & 1] = 1;
-                mach32_updatemapping(mach, svga);
-                mach_log("ATI 8514/A: (0x%04x) val = %02x.\n", port, val);
-                svga_recalctimings(svga);
-            } else {
-                if (mach->accel.ext_ge_config & 0x8080)
-                    ati_eeprom_write(&mach->eeprom, mach->accel.ext_ge_config & 0x4040, mach->accel.ext_ge_config & 0x2020, mach->accel.ext_ge_config & 0x1010);
-            }
-            break;
-
-        case 0x7eee:
-        case 0x7eef:
-            WRITE8(port, mach->accel.eeprom_control, val);
-            ati_eeprom_write(&mach->eeprom, mach->accel.eeprom_control & 8, mach->accel.eeprom_control & 2, mach->accel.eeprom_control & 1);
-            mach_log("ATI 8514/A: (0x%04x) val = %04x.\n", port, val);
-            break;
-
-        default:
-            break;
-    }
-}
-
-static void
-mach_accel_out(uint16_t port, uint8_t val, mach_t *mach)
-{
-    svga_t    *svga = &mach->svga;
-
-    mach_log("[%04X:%08X]: Port NORMAL OUT=%04x, val=%04x.\n", CS, cpu_state.pc, port, val);
-
-    mach_accel_out_call(port, val, mach, svga, (ibm8514_t *) svga->dev8514);
-}
-
 static uint16_t
 mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, int len)
 {
     const uint16_t *vram_w = (uint16_t *) dev->vram;
-    uint16_t        temp = 0;
+    uint16_t        temp = 0x0000;
     int             cmd;
     int             frgd_sel;
     int             bkgd_sel;
@@ -3999,35 +4532,83 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
 
     switch (port) {
         case 0x82e8:
-        case 0xc2e8:
-            if (len != 1)
-                temp = dev->accel.cur_y;
+            if ((mach->accel.cmd_type == 3) || (mach->accel.cmd_type == 4))
+                temp = mach->accel.cy_end_line;
+            else
+                temp = ibm8514_accel_in_fifo(svga, port, len);
             break;
 
         case 0x86e8:
-        case 0xc6e8:
-            if (len != 1)
-                temp = dev->accel.cur_x;
+            if ((mach->accel.cmd_type == 3) || (mach->accel.cmd_type == 4))
+                temp = mach->accel.cx_end_line;
+            else
+                temp = ibm8514_accel_in_fifo(svga, port, len);
             break;
 
         case 0x92e8:
-            if (len != 1)
-                temp = dev->test;
-            break;
-
         case 0x96e8:
-            if (len != 1)
-                temp = dev->accel.maj_axis_pcnt;
+        case 0xc2e8:
+        case 0xc6e8:
+            temp = ibm8514_accel_in_fifo(svga, port, len);
             break;
 
         case 0x9ae8:
         case 0xdae8:
-            if (len != 1) {
-                if (dev->force_busy)
-                    temp |= 0x200; /*Hardware busy*/
-                dev->force_busy = 0;
+            if (len == 2) {
+                if (dev->fifo_idx <= 8) {
+                    for (int i = 1; i <= dev->fifo_idx; i++)
+                        temp |= (1 << (7 - (i - 1)));
+                } else
+                    temp = 0x00ff;
+
+                if (dev->fifo_idx > 0)
+                    dev->fifo_idx--;
+
+                if (dev->force_busy) {
+                    temp |= 0x0200; /*Hardware busy*/
+                    if (mach->accel.cmd_type >= 0) {
+                        frgd_sel = (mach->accel.dp_config >> 13) & 7;
+                        bkgd_sel = (mach->accel.dp_config >> 7) & 3;
+                        mono_src = (mach->accel.dp_config >> 5) & 3;
+                        switch (mach->accel.cmd_type) {
+                            case 2:
+                                if (dev->accel.sy >= mach->accel.height)
+                                    dev->force_busy = 0;
+                                else if ((mono_src == 2) || (frgd_sel == 2) || (bkgd_sel == 2))
+                                    dev->force_busy = 0;
+                                else if (!dev->accel.cmd_back)
+                                    dev->force_busy = 0;
+
+                                mach_log("2Force Busy=%d, frgdsel=%d, bkgdsel=%d, monosrc=%d, read=%d, dpconfig=%04x, back=%d.\n", dev->force_busy, frgd_sel, bkgd_sel, mono_src, mach_pixel_read(mach), mach->accel.dp_config, dev->accel.cmd_back);
+                                break;
+                            case 5:
+                                if (dev->accel.sx >= mach->accel.width)
+                                    dev->force_busy = 0;
+                                break;
+                            default:
+                                if (dev->accel.sy < 0)
+                                    dev->force_busy = 0;
+                                break;
+                        }
+                    } else {
+                        switch (dev->accel.cmd >> 13) {
+                            case 2:
+                            case 3:
+                            case 4:
+                            case 6:
+                                if (dev->accel.sy < 0)
+                                    dev->force_busy = 0;
+                                break;
+                            default:
+                                if (!dev->accel.sy)
+                                    dev->force_busy = 0;
+                                break;
+                        }
+                    }
+                }
+
                 if (dev->data_available) {
-                    temp |= 0x100; /*Read Data available*/
+                    temp |= 0x0100; /*Read Data available*/
                     if (mach->accel.cmd_type >= 0) {
                         switch (mach->accel.cmd_type) {
                             case 2:
@@ -4044,8 +4625,19 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
                                 break;
                         }
                     } else {
-                        if (dev->accel.sy < 0)
-                            dev->data_available = 0;
+                        switch (dev->accel.cmd >> 13) {
+                            case 2:
+                            case 3:
+                            case 4:
+                            case 6:
+                                if (dev->accel.sy < 0)
+                                    dev->data_available = 0;
+                                break;
+                            default:
+                                if (!dev->accel.sy)
+                                    dev->data_available = 0;
+                                break;
+                        }
                     }
                 }
             }
@@ -4054,11 +4646,15 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
         case 0x9ae9:
         case 0xdae9:
             if (len == 1) {
+                dev->fifo_idx = 0;
+
                 if (dev->force_busy2)
-                    temp |= 2; /*Hardware busy*/
+                    temp |= 0x02; /*Hardware busy*/
+
                 dev->force_busy2 = 0;
+
                 if (dev->data_available2) {
-                    temp |= 1; /*Read Data available*/
+                    temp |= 0x01; /*Read Data available*/
                     if (mach->accel.cmd_type >= 0) {
                         switch (mach->accel.cmd_type) {
                             case 2:
@@ -4075,8 +4671,19 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
                                 break;
                         }
                     } else {
-                        if (dev->accel.sy < 0)
-                            dev->data_available2 = 0;
+                        switch (dev->accel.cmd >> 13) {
+                            case 2:
+                            case 3:
+                            case 4:
+                            case 6:
+                                if (dev->accel.sy < 0)
+                                    dev->data_available2 = 0;
+                                break;
+                            default:
+                                if (!dev->accel.sy)
+                                    dev->data_available2 = 0;
+                                break;
+                        }
                     }
                 }
             }
@@ -4092,29 +4699,34 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
                         READ_PIXTRANS_BYTE_IO(dev->accel.dx, 1)
                         temp = mach->accel.pix_trans[1];
                     } else {
-                        if (mach->accel.cmd_type == 3) {
+                        if ((mach->accel.cmd_type == 3) || (mach->accel.cmd_type == 4)) {
                             READ_PIXTRANS_WORD(dev->accel.cx, 0)
                         } else {
                             READ_PIXTRANS_WORD(dev->accel.dx, 0)
                         }
-                        mach_accel_out_pixtrans(mach, dev, temp);
+                        mach_accel_out_pixtrans(svga, mach, dev, temp);
                     }
                 }
             } else {
                 if (ibm8514_cpu_dest(svga)) {
                     cmd = (dev->accel.cmd >> 13);
-                    if (len != 1) {
+                    if (len == 2) {
                         READ_PIXTRANS_WORD(dev->accel.cx, 0)
-                        if (dev->accel.input && !dev->accel.odd_in && !dev->accel.sx) {
-                            temp &= ~0xff00;
-                            temp |= (dev->vram[(dev->accel.newdest_in + dev->accel.cur_x) & dev->vram_mask] << 8);
-                        }
-                        if (dev->subsys_stat & 1) {
+                        if (dev->subsys_stat & INT_VSY) {
                             dev->force_busy = 1;
                             dev->data_available = 1;
                         }
+                        if (dev->accel.input) {
+                            ibm8514_accel_out_pixtrans(svga, port, temp & 0xff, len);
+                            if (dev->accel.odd_in) { /*WORDs on odd destination scan lengths.*/
+                                dev->accel.odd_in = 0;
+                                temp &= ~0xff00;
+                                READ_HIGH(dev->accel.dest + dev->accel.cx, temp);
+                            }
+                            ibm8514_accel_out_pixtrans(svga, port, (temp >> 8) & 0xff, len);
+                        } else
+                            ibm8514_accel_out_pixtrans(svga, port, temp, len);
                     }
-                    ibm8514_accel_out_pixtrans(svga, port, temp, len);
                 }
             }
             break;
@@ -4136,23 +4748,23 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
                             case 0x000: /*8-bit size*/
                                 if (mono_src == 2) {
                                     if ((frgd_sel != 2) && (bkgd_sel != 2)) {
-                                        mach_accel_start(mach->accel.cmd_type, 1, 8, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), 0, mach, dev);
+                                        mach_accel_start(mach->accel.cmd_type, 1, 8, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), 0, svga, mach, dev);
                                     } else
-                                        mach_accel_start(mach->accel.cmd_type, 1, 1, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), mach, dev);
+                                        mach_accel_start(mach->accel.cmd_type, 1, 1, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), svga, mach, dev);
                                 } else
-                                    mach_accel_start(mach->accel.cmd_type, 1, 1, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), mach, dev);
+                                    mach_accel_start(mach->accel.cmd_type, 1, 1, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), svga, mach, dev);
                                 break;
                             case 0x200: /*16-bit size*/
                                 if (mono_src == 2) {
                                     if ((frgd_sel != 2) && (bkgd_sel != 2)) {
                                         if (mach->accel.dp_config & 0x1000)
-                                            mach_accel_start(mach->accel.cmd_type, 1, 16, mach->accel.pix_trans[1] | (mach->accel.pix_trans[0] << 8), 0, mach, dev);
+                                            mach_accel_start(mach->accel.cmd_type, 1, 16, mach->accel.pix_trans[1] | (mach->accel.pix_trans[0] << 8), 0, svga, mach, dev);
                                         else
-                                            mach_accel_start(mach->accel.cmd_type, 1, 16, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), 0, mach, dev);
+                                            mach_accel_start(mach->accel.cmd_type, 1, 16, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), 0, svga, mach, dev);
                                     } else
-                                        mach_accel_start(mach->accel.cmd_type, 1, 2, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), mach, dev);
+                                        mach_accel_start(mach->accel.cmd_type, 1, 2, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), svga, mach, dev);
                                 } else
-                                    mach_accel_start(mach->accel.cmd_type, 1, 2, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), mach, dev);
+                                    mach_accel_start(mach->accel.cmd_type, 1, 2, -1, mach->accel.pix_trans[0] | (mach->accel.pix_trans[1] << 8), svga, mach, dev);
                                 break;
 
                             default:
@@ -4163,47 +4775,9 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
             }
             break;
 
-        case 0xbee8:
-        case 0xfee8:
-            if (len != 1) {
-                mach_log("Multifunc_cntl = %d.\n", dev->accel.multifunc_cntl >> 12);
-                switch ((dev->accel.multifunc_cntl >> 12) & 0x0f) {
-                    case 0:
-                        temp = dev->accel.multifunc[0];
-                        break;
-                    case 1:
-                        temp = dev->accel.clip_top;
-                        break;
-                    case 2:
-                        temp = dev->accel.clip_left;
-                        break;
-                    case 3:
-                        temp = dev->accel.multifunc[3];
-                        break;
-                    case 4:
-                        temp = dev->accel.multifunc[4];
-                        break;
-                    case 5:
-                        temp = dev->accel.multifunc[5];
-                        break;
-                    case 8:
-                        temp = dev->accel.multifunc[8];
-                        break;
-                    case 9:
-                        temp = dev->accel.multifunc[9];
-                        break;
-                    case 0x0a:
-                        temp = dev->accel.multifunc[0x0a];
-                        break;
-
-                    default:
-                        break;
-                }
-            }
-            break;
-
         case 0x82ee:
-            temp = mach->accel.patt_data_idx;
+            if (len == 2)
+                temp = mach->accel.patt_data_idx;
             break;
 
         case 0x86ee:
@@ -4212,10 +4786,10 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
             break;
 
         case 0x8eee:
-            if (len == 1)
-                temp = mach->accel.ext_ge_config & 0xff;
-            else
+            if (len == 2)
                 temp = mach->accel.ext_ge_config;
+            else
+                temp = mach->accel.ext_ge_config & 0xff;
 
             mach_log("ExtGE Read = %04x, len=%d.\n", temp, len);
             break;
@@ -4225,10 +4799,10 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
             break;
 
         case 0x92ee:
-            if (len == 1)
-                temp = mach->accel.eeprom_control & 0xff;
-            else
+            if (len == 2)
                 temp = mach->accel.eeprom_control;
+            else
+                temp = mach->accel.eeprom_control & 0xff;
 
             mach_log("EEPROM cntl read=%04x, len=%d.\n", temp, len);
             break;
@@ -4240,24 +4814,34 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
             break;
 
         case 0x96ee:
-            if (len == 1)
-                temp = dev->accel.maj_axis_pcnt & 0xff;
-            else {
-                temp = dev->accel.maj_axis_pcnt;
-                if ((mach->accel.test == 0x1555) || (mach->accel.test == 0x0aaa))
-                    temp = mach->accel.test;
-            }
+            if (len == 2)
+                temp = mach->accel.test;
+            else
+                temp = mach->accel.test & 0xff;
             break;
         case 0x96ef:
             if (len == 1)
-                temp = dev->accel.maj_axis_pcnt >> 8;
+                temp = mach->accel.test >> 8;
+            break;
+
+        case 0x9aee:
+            if (len == 2) {
+                if (dev->fifo_idx <= 16) {
+                    for (int i = 1; i <= dev->fifo_idx; i++)
+                        temp |= (1 << (15 - (i - 1)));
+                } else
+                    temp = 0xffff;
+
+                if (dev->fifo_idx > 0)
+                    dev->fifo_idx--;
+            }
             break;
 
         case 0xa2ee:
-            if (len == 1)
-                temp = mach->accel.linedraw_opt & 0xff;
-            else
+            if (len == 2)
                 temp = mach->accel.linedraw_opt;
+            else
+                temp = mach->accel.linedraw_opt & 0xff;
             break;
         case 0xa2ef:
             if (len == 1)
@@ -4265,12 +4849,13 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
             break;
 
         case 0xb2ee:
-            if (len == 1)
-                temp = dev->hdisped;
-            else {
+            if (len == 2) {
                 temp = dev->hdisped & 0xff;
                 temp |= (dev->htotal << 8);
+            } else {
+                temp = dev->hdisped;
             }
+            mach_log("B2EE read=%02x.\n", temp & 0xff);
             break;
         case 0xb2ef:
             if (len == 1)
@@ -4286,25 +4871,21 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
             break;
 
         case 0xc2ee:
-            if (len == 1)
-                temp = dev->vtotal & 0xff;
-            else {
-                temp = dev->vtotal;
-                mach_log("VTOTAL read=%d.\n", temp);
-            }
+            if (len == 2)
+                temp = dev->v_total_reg;
+            else
+                temp = dev->v_total_reg & 0xff;
             break;
         case 0xc2ef:
             if (len == 1)
-                temp = dev->vtotal >> 8;
+                temp = dev->v_total_reg >> 8;
             break;
 
         case 0xc6ee:
-            if (len == 1)
-                temp = dev->v_disp & 0xff;
-            else {
+            if (len == 2)
                 temp = dev->v_disp;
-                mach_log("VDISP read=%d.\n", temp);
-            }
+            else
+                temp = dev->v_disp & 0xff;
             break;
         case 0xc6ef:
             if (len == 1)
@@ -4312,10 +4893,10 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
             break;
 
         case 0xcaee:
-            if (len == 1)
-                temp = dev->v_sync_start & 0xff;
-            else
+            if (len == 2)
                 temp = dev->v_sync_start;
+            else
+                temp = dev->v_sync_start & 0xff;
             break;
         case 0xcaef:
             if (len == 1)
@@ -4323,61 +4904,75 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
             break;
 
         case 0xceee:
-            if (len == 1)
-                temp = dev->vc & 0xff;
-            else
+            mach_log("CEEE read=%d.\n", len);
+            if (len == 2)
                 temp = dev->vc & 0x7ff;
+            else
+                temp = dev->vc & 0xff;
             break;
         case 0xceef:
+            mach_log("CEEF read=%d.\n", len);
             if (len == 1)
-                temp = (dev->vc >> 8) & 7;
+                temp = (dev->vc >> 8) & 0x07;
             break;
 
         case 0xdaee:
-            if (len != 1) {
-                temp = mach->accel.src_x;
-                if ((dev->local & 0xff) >= 0x02)
-                    temp &= 0x7ff;
-            } else
-                temp = mach->accel.src_x & 0xff;
+            if (len == 2) {
+                if (ATI_MACH32)
+                    temp = mach->accel.src_x;
+            } else {
+                if (ATI_MACH32)
+                    temp = mach->accel.src_x & 0xff;
+            }
             break;
         case 0xdaef:
-            if (len == 1)
-                temp = mach->accel.src_x >> 8;
+            if (len == 1) {
+                if (ATI_MACH32)
+                    temp = mach->accel.src_x >> 8;
+            }
             break;
 
         case 0xdeee:
-            if (len != 1) {
-                temp = mach->accel.src_y;
-                if ((dev->local & 0xff) >= 0x02)
-                    temp &= 0x7ff;
-            } else
-                temp = mach->accel.src_y & 0xff;
+            if (len == 2) {
+                if (ATI_MACH32)
+                    temp = mach->accel.src_y;
+            } else {
+                if (ATI_MACH32)
+                    temp = mach->accel.src_y & 0xff;
+            }
             break;
         case 0xdeef:
-            if (len == 1)
-                temp = mach->accel.src_y >> 8;
+            if (len == 1) {
+                if (ATI_MACH32)
+                    temp = mach->accel.src_y >> 8;
+            }
             break;
 
         case 0xfaee:
-            if (len != 1) {
-                if (mach->pci_bus)
-                    temp = 0x0017;
-                else
-                    temp = 0x22f7;
+            if (len == 2) {
+                if (ATI_MACH32) {
+                    if (mach->pci_bus)
+                        temp = 0x0017;
+                    else
+                        temp = 0x22f7;
+                }
             } else {
-                if (mach->pci_bus)
-                    temp = 0x17;
-                else
-                    temp = 0xf7;
+                if (ATI_MACH32) {
+                    if (mach->pci_bus)
+                        temp = 0x17;
+                    else
+                        temp = 0xf7;
+                }
             }
             break;
         case 0xfaef:
             if (len == 1) {
-                if (mach->pci_bus)
-                    temp = 0x00;
-                else
-                    temp = 0x22;
+                if (ATI_MACH32) {
+                    if (mach->pci_bus)
+                        temp = 0x00;
+                    else
+                        temp = 0x22;
+                }
             }
             break;
 
@@ -4393,65 +4988,97 @@ mach_accel_in_fifo(mach_t *mach, svga_t *svga, ibm8514_t *dev, uint16_t port, in
 static uint8_t
 mach_accel_in_call(uint16_t port, mach_t *mach, svga_t *svga, ibm8514_t *dev)
 {
-    uint8_t         temp      = 0;
-    uint16_t        vpos      = 0;
-    uint16_t        vblankend = svga->vblankstart + svga->crtc[0x16];
+    uint8_t temp = 0;
+    uint8_t fifo_test_tag[16] = { 0x7c, 0x64, 0x60, 0x5c, 0x58, 0x54, 0x50, 0x68, 0x38, 0x24, 0x10, 0x0c, 0x08, 0x04, 0x00, 0x4c};
+    int16_t clip_t = dev->accel.clip_top;
+    int16_t clip_l = dev->accel.clip_left;
+    int16_t clip_b = dev->accel.clip_bottom;
+    int16_t clip_r = dev->accel.clip_right;
+    uint16_t clip_b_ibm = dev->accel.clip_bottom;
+    uint16_t clip_r_ibm = dev->accel.clip_right;
+    int cmd = dev->accel.cmd >> 13;
 
     switch (port) {
         case 0x2e8:
-            vpos = dev->vc & 0x7ff;
-            if (vblankend > dev->v_total) {
-                vblankend -= dev->v_total;
-                if ((vpos >= svga->vblankstart) || (vpos <= vblankend))
-                    temp |= 2;
-            } else {
-                 if ((vpos >= svga->vblankstart) && (vpos <= vblankend))
-                    temp |= 2;
-            }
-            break;
-
+        case 0x2e9:
         case 0x6e8:
-            temp = dev->hdisped;
-            break;
-
         case 0x22e8:
-            temp = dev->disp_cntl;
-            break;
-
         case 0x26e8:
         case 0x26e9:
-            READ8(port, dev->htotal);
-            break;
-
         case 0x2ee8:
-            temp = dev->subsys_cntl;
-            break;
         case 0x2ee9:
-            temp = 0xff;
+            temp = ibm8514_accel_in(port, svga);
             break;
 
         case 0x42e8:
         case 0x42e9:
-            vpos = dev->vc & 0x7ff;
-            if (vblankend > dev->v_total) {
-                vblankend -= dev->v_total;
-                if ((vpos >= svga->vblankstart) || (vpos <= vblankend))
-                    dev->subsys_stat |= 1;
-            } else {
-                 if ((vpos >= svga->vblankstart) && (vpos <= vblankend))
-                    dev->subsys_stat |= 1;
-            }
+            if (!(port & 1)) {
+                if ((dev->subsys_cntl & INT_VSY) && !(dev->subsys_stat & INT_VSY) && (dev->vc == dev->dispend))
+                    temp |= INT_VSY;
 
-            if (port & 1)
-                temp = 0x80;
-            else {
-                temp = dev->subsys_stat | 0x80;
+                if (mach->accel.cmd_type == -1) {
+                    if (cmd == 6) {
+                        if ((dev->subsys_cntl & INT_GE_BSY) &&
+                            !(dev->subsys_stat & INT_GE_BSY) &&
+                            (dev->accel.dx >= clip_l) &&
+                            (dev->accel.dx <= clip_r_ibm) &&
+                            (dev->accel.dy >= clip_t) &&
+                            (dev->accel.dy <= clip_b_ibm))
+                            temp |= INT_GE_BSY;
+                    } else {
+                        if ((dev->subsys_cntl & INT_GE_BSY) &&
+                            !(dev->subsys_stat & INT_GE_BSY) &&
+                            (dev->accel.cx >= clip_l) &&
+                            (dev->accel.cx <= clip_r_ibm) &&
+                            (dev->accel.cy >= clip_t) &&
+                            (dev->accel.cy <= clip_b_ibm))
+                            temp |= INT_GE_BSY;
+                    }
+                } else {
+                    switch (mach->accel.cmd_type) {
+                        case 2:
+                        case 5:
+                            if ((dev->subsys_cntl & INT_GE_BSY) &&
+                                !(dev->subsys_stat & INT_GE_BSY) &&
+                                (dev->accel.dx >= clip_l) &&
+                                (dev->accel.dx <= clip_r) &&
+                                (dev->accel.dy >= clip_t) &&
+                                (dev->accel.dy <= clip_b))
+                                temp |= INT_GE_BSY;
+                            break;
+                        case 1:
+                        case 3:
+                        case 4:
+                            if ((dev->subsys_cntl & INT_GE_BSY) &&
+                                !(dev->subsys_stat & INT_GE_BSY) &&
+                                (dev->accel.cx >= clip_l) &&
+                                (dev->accel.cx <= clip_r) &&
+                                (dev->accel.cy >= clip_t) &&
+                                (dev->accel.cy <= clip_b))
+                                temp |= INT_GE_BSY;
+                            break;
+                        default:
+                            break;
+                    }
+                }
+
+                if (!dev->fifo_idx && !dev->on) {
+                    dev->force_busy = 0;
+                    dev->force_busy2 = 0;
+                    mach->force_busy = 0;
+                    dev->data_available = 0;
+                    dev->data_available2 = 0;
+                    temp |= INT_FIFO_EMP;
+                    mach_log("Fifo Empty.\n");
+                }
+                temp |= (dev->subsys_stat | (dev->vram_512k_8514 ? 0x00 : 0x80));
                 if (mach->accel.ext_ge_config & 0x08)
                     temp |= ((mach->accel.ext_ge_config & 0x07) << 4);
                 else
                     temp |= 0x20;
+
+                mach_log("0x%04x read: Subsystem Status=%02x, monitoralias=%02x.\n", port, temp, mach->accel.ext_ge_config & 0x07);
             }
-            mach_log("Subsystem Status=%04x, 4ae8 shadow set=%02x.\n", temp, dev->accel.advfunc_cntl & 4);
             break;
 
             /*ATI Mach8/32 specific registers*/
@@ -4465,6 +5092,19 @@ mach_accel_in_call(uint16_t port, mach_t *mach, svga_t *svga, ibm8514_t *dev)
             READ8(port, mach->config2);
             break;
 
+        case 0x1aee:
+            if (dev->fifo_idx > 0)
+                dev->fifo_idx--;
+            if (mach->fifo_test_idx > 0)
+                mach->fifo_test_idx--;
+            fallthrough;
+        case 0x1aef:
+            mach_log("FIFO Test IDX=%d, Data=%04x.\n", mach->fifo_test_idx, mach->fifo_test_data[mach->fifo_test_idx]);
+            READ8(port, mach->fifo_test_data[mach->fifo_test_idx]);
+            if (!mach->fifo_test_idx && ((mach->accel.dp_config == 0xaaaa) || (mach->accel.dp_config == 0x5555)))
+                mach->accel.dp_config = 0x2011;
+            break;
+
         case 0x22ee:
             if (mach->pci_bus)
                 temp = mach->pci_cntl_reg;
@@ -4477,29 +5117,36 @@ mach_accel_in_call(uint16_t port, mach_t *mach, svga_t *svga, ibm8514_t *dev)
 
         case 0x36ee:
         case 0x36ef:
-            READ8(port, mach->misc);
-
-            if (!(port & 1)) {
-                temp &= ~0x0c;
-                switch (mach->memory) {
-                    case 1024:
-                        temp |= 0x04;
-                        break;
-                    case 2048:
-                        temp |= 0x08;
-                        break;
-                    case 4096:
-                        temp |= 0x0c;
-                        break;
-
-                    default:
-                        if ((dev->local & 0xff) < 0x02)
+            if (ATI_MACH32) {
+                READ8(port, mach->misc);
+                if (!(port & 1)) {
+                    temp &= ~0x0c;
+                    switch (dev->vram_amount) {
+                        case 1024:
                             temp |= 0x04;
-                        break;
+                            break;
+                        case 2048:
+                            temp |= 0x08;
+                            break;
+                        case 4096:
+                            temp |= 0x0c;
+                            break;
+
+                        default:
+                            break;
+                    }
                 }
             }
             break;
 
+        case 0x3aee:
+        case 0x3aef:
+            if (port & 1)
+                temp = 0x01;
+            else
+                temp = fifo_test_tag[dev->fifo_idx];
+            break;
+
         case 0x42ee:
         case 0x42ef:
             READ8(port, mach->accel.test2);
@@ -4517,29 +5164,16 @@ mach_accel_in_call(uint16_t port, mach_t *mach, svga_t *svga, ibm8514_t *dev)
 
         case 0x52ee:
         case 0x52ef:
-            READ8(port, mach->accel.scratch0);
-#ifdef ATI_8514_ULTRA
-            if (mach->mca_bus) {
-                if (!(port & 1)) {
-                    if (svga->ext8514 != NULL)
-                        temp = dev->pos_regs[4];
-                } else {
-                    if (svga->ext8514 != NULL)
-                        temp = dev->pos_regs[5];
-                }
-            } else {
-                if (!(port & 1)) {
-                    if (svga->ext8514 != NULL) {
-                        temp = 0x20 | 0x80;
-                    }
-                }
-            }
-#endif
+            READ8(port, dev->accel.scratch0);
+            mach_log("ScratchPad0=%x.\n", dev->accel.scratch0);
+            if (dev->accel.scratch0 == 0x1234)
+                temp = 0x0000;
             break;
 
         case 0x56ee:
         case 0x56ef:
-            READ8(port, mach->accel.scratch1);
+            READ8(port, dev->accel.scratch1);
+            mach_log("ScratchPad1=%x.\n", dev->accel.scratch1);
             break;
 
         case 0x5eee:
@@ -4559,8 +5193,10 @@ mach_accel_in_call(uint16_t port, mach_t *mach, svga_t *svga, ibm8514_t *dev)
                 temp |= 0x20;
 
             mach->force_busy = 0;
+
             if (ati_eeprom_read(&mach->eeprom))
                 temp |= 0x40;
+
             mach_log("Mach busy temp=%02x.\n", temp);
             break;
 
@@ -4592,31 +5228,30 @@ mach_accel_in_call(uint16_t port, mach_t *mach, svga_t *svga, ibm8514_t *dev)
         default:
             break;
     }
-    if (port != 0x62ee && port != 0x62ef && port != 0x42e8 && port != 0x42e9)
-        mach_log("[%04X:%08X]: Port NORMAL IN=%04x, temp=%04x.\n", CS, cpu_state.pc, port, temp);
+    mach_log("[%04X:%08X]: Port NORMAL IN=%04x, temp=%04x.\n", CS, cpu_state.pc, port, temp);
 
     return temp;
 }
 
-#ifdef ATI_8514_ULTRA
-static void
-ati8514_accel_out(uint16_t port, uint8_t val, svga_t *svga)
-{
-    mach_log("[%04X:%08X]: Port NORMAL OUT=%04x, val=%04x.\n", CS, cpu_state.pc, port, val);
-
-    mach_accel_out_call(port, val, (mach_t *)svga->ext8514, svga, (ibm8514_t *) svga->dev8514);
-}
-
 static void
 ati8514_accel_outb(uint16_t port, uint8_t val, void *priv)
 {
     svga_t *svga = (svga_t *)priv;
     mach_t *mach = (mach_t *)svga->ext8514;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (port & 0x8000)
-        mach_accel_out_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port, val, 1);
-    else
-        ati8514_accel_out(port, val, svga);
+    if (port & 0x8000) { /*Command FIFO*/
+        if (dev->accel.cmd_back) {
+            mach->fifo_test_data[dev->fifo_idx] = val;
+            dev->fifo_idx++;
+            if (dev->fifo_idx > 16)
+                dev->fifo_idx = 16;
+
+            mach->fifo_test_idx = dev->fifo_idx;
+        }
+    }
+    dev->accel_out_fifo(svga, port, val, 1);
+    mach_log("%04X:%08X: OUTB port=%04x, val=%02x, fifo idx=%d.\n", CS, cpu_state.pc, port, val, dev->fifo_idx);
 }
 
 static void
@@ -4624,13 +5259,23 @@ ati8514_accel_outw(uint16_t port, uint16_t val, void *priv)
 {
     svga_t *svga = (svga_t *)priv;
     mach_t *mach = (mach_t *)svga->ext8514;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (port & 0x8000)
-        mach_accel_out_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port, val, 2);
-    else {
-        ati8514_accel_out(port, val, svga);
-        ati8514_accel_out(port + 1, (val >> 8), svga);
+    if (port == 0xf6ee)
+        port = 0x82e8;
+
+    if (port & 0x8000) { /*Command FIFO*/
+        if (dev->accel.cmd_back) {
+            mach->fifo_test_data[dev->fifo_idx] = val;
+            dev->fifo_idx++;
+            if (dev->fifo_idx > 16)
+                dev->fifo_idx = 16;
+
+            mach->fifo_test_idx = dev->fifo_idx;
+        }
     }
+    dev->accel_out_fifo(svga, port, val, 2);
+    mach_log("%04X:%08X: OUTW port=%04x, val=%04x, fifo idx=%d.\n", CS, cpu_state.pc, port, val, dev->fifo_idx);
 }
 
 static void
@@ -4638,29 +5283,44 @@ ati8514_accel_outl(uint16_t port, uint32_t val, void *priv)
 {
     svga_t *svga = (svga_t *)priv;
     mach_t *mach = (mach_t *)svga->ext8514;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (port & 0x8000) {
-        mach_accel_out_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port, val & 0xffff, 2);
-        mach_accel_out_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port + 2, val >> 16, 2);
-    } else {
-        ati8514_accel_out(port, val, svga);
-        ati8514_accel_out(port + 1, (val >> 8), svga);
-        ati8514_accel_out(port + 2, (val >> 16), svga);
-        ati8514_accel_out(port + 3, (val >> 24), svga);
+    if (port == 0xf6ee)
+        port = 0x82e8;
+
+    if (port & 0x8000) { /*Command FIFO*/
+        if (dev->accel.cmd_back) {
+            mach->fifo_test_data[dev->fifo_idx] = val;
+            dev->fifo_idx++;
+            if (dev->fifo_idx > 16)
+                dev->fifo_idx = 16;
+
+            mach->fifo_test_idx = dev->fifo_idx;
+        }
     }
+    dev->accel_out_fifo(svga, port, val, 2);
+    mach_log("OUTL port=%04x, val=%08x, fifo idx=%d.\n", port, val, dev->fifo_idx);
 }
-#endif
 
 static void
 mach_accel_outb(uint16_t port, uint8_t val, void *priv)
 {
     mach_t *mach = (mach_t *) priv;
     svga_t *svga = &mach->svga;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (port & 0x8000)
-        mach_accel_out_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port, val, 1);
-    else
-        mach_accel_out(port, val, mach);
+    if (port & 0x8000) { /*Command FIFO*/
+        if (dev->accel.cmd_back) {
+            mach->fifo_test_data[dev->fifo_idx] = val;
+            dev->fifo_idx++;
+            if (dev->fifo_idx > 16)
+                dev->fifo_idx = 16;
+
+            mach->fifo_test_idx = dev->fifo_idx;
+        }
+    }
+    dev->accel_out_fifo(mach, port, val, 1);
+    mach_log("%04X:%08X: OUTB port=%04x, val=%02x, fifo idx=%d.\n", CS, cpu_state.pc, port, val, dev->fifo_idx);
 }
 
 static void
@@ -4668,13 +5328,23 @@ mach_accel_outw(uint16_t port, uint16_t val, void *priv)
 {
     mach_t *mach = (mach_t *) priv;
     svga_t *svga = &mach->svga;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (port & 0x8000)
-        mach_accel_out_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port, val, 2);
-    else {
-        mach_accel_out(port, val, mach);
-        mach_accel_out(port + 1, (val >> 8), mach);
+    if (port == 0xf6ee)
+        port = 0x82e8;
+
+    if (port & 0x8000) { /*Command FIFO*/
+        if (dev->accel.cmd_back) {
+            mach->fifo_test_data[dev->fifo_idx] = val;
+            dev->fifo_idx++;
+            if (dev->fifo_idx > 16)
+                dev->fifo_idx = 16;
+
+            mach->fifo_test_idx = dev->fifo_idx;
+        }
     }
+    dev->accel_out_fifo(mach, port, val, 2);
+    mach_log("%04X:%08X: OUTW port=%04x, val=%04x, fifo idx=%d.\n", CS, cpu_state.pc, port, val, dev->fifo_idx);
 }
 
 static void
@@ -4682,19 +5352,25 @@ mach_accel_outl(uint16_t port, uint32_t val, void *priv)
 {
     mach_t *mach = (mach_t *) priv;
     svga_t *svga = &mach->svga;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
 
-    if (port & 0x8000) {
-        mach_accel_out_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port, val & 0xffff, 2);
-        mach_accel_out_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port + 2, val >> 16, 2);
-    } else {
-        mach_accel_out(port, val, mach);
-        mach_accel_out(port + 1, (val >> 8), mach);
-        mach_accel_out(port + 2, (val >> 16), mach);
-        mach_accel_out(port + 3, (val >> 24), mach);
+    if (port == 0xf6ee)
+        port = 0x82e8;
+
+    if (port & 0x8000) { /*Command FIFO*/
+        if (dev->accel.cmd_back) {
+            mach->fifo_test_data[dev->fifo_idx] = val;
+            dev->fifo_idx++;
+            if (dev->fifo_idx > 16)
+                dev->fifo_idx = 16;
+
+            mach->fifo_test_idx = dev->fifo_idx;
+        }
     }
+    dev->accel_out_fifo(mach, port, val, 2);
+    mach_log("OUTL port=%04x, val=%08x, fifo idx=%d.\n", port, val, dev->fifo_idx);
 }
 
-#ifdef ATI_8514_ULTRA
 static uint8_t
 ati8514_accel_in(uint16_t port, svga_t *svga)
 {
@@ -4713,6 +5389,7 @@ ati8514_accel_inb(uint16_t port, void *priv)
     else
         temp = ati8514_accel_in(port, svga);
 
+    mach_log("%04X:%08X: INB port=%04x, temp=%02x.\n", CS, cpu_state.pc, port, temp);
     return temp;
 }
 
@@ -4729,6 +5406,8 @@ ati8514_accel_inw(uint16_t port, void *priv)
         temp = ati8514_accel_in(port, svga);
         temp |= (ati8514_accel_in(port + 1, svga) << 8);
     }
+
+    mach_log("%04X:%08X: INW port=%04x, temp=%04x.\n", CS, cpu_state.pc, port, temp);
     return temp;
 }
 
@@ -4739,18 +5418,14 @@ ati8514_accel_inl(uint16_t port, void *priv)
     mach_t *mach = (mach_t *)svga->ext8514;
     uint32_t temp;
 
-    if (port & 0x8000) {
+    if (port & 0x8000)
         temp = mach_accel_in_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port, 2);
-        temp = (mach_accel_in_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port + 2, 2) << 16);
-    } else {
+    else {
         temp = ati8514_accel_in(port, svga);
         temp |= (ati8514_accel_in(port + 1, svga) << 8);
-        temp |= (ati8514_accel_in(port + 2, svga) << 16);
-        temp |= (ati8514_accel_in(port + 3, svga) << 24);
     }
     return temp;
 }
-#endif
 
 static uint8_t
 mach_accel_in(uint16_t port, mach_t *mach)
@@ -4771,6 +5446,7 @@ mach_accel_inb(uint16_t port, void *priv)
     else
         temp = mach_accel_in(port, mach);
 
+    mach_log("%04X:%08X: INB port=%04x, temp=%02x.\n", CS, cpu_state.pc, port, temp);
     return temp;
 }
 
@@ -4787,6 +5463,8 @@ mach_accel_inw(uint16_t port, void *priv)
         temp = mach_accel_in(port, mach);
         temp |= (mach_accel_in(port + 1, mach) << 8);
     }
+
+    mach_log("%04X:%08X: INW port=%04x, temp=%04x.\n", CS, cpu_state.pc, port, temp);
     return temp;
 }
 
@@ -4797,92 +5475,68 @@ mach_accel_inl(uint16_t port, void *priv)
     svga_t *svga = &mach->svga;
     uint32_t temp;
 
-    if (port & 0x8000) {
+    if (port & 0x8000)
         temp = mach_accel_in_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port, 2);
-        temp = (mach_accel_in_fifo(mach, svga, (ibm8514_t *) svga->dev8514, port + 2, 2) << 16);
-    } else {
+    else {
         temp = mach_accel_in(port, mach);
         temp |= (mach_accel_in(port + 1, mach) << 8);
-        temp |= (mach_accel_in(port + 2, mach) << 16);
-        temp |= (mach_accel_in(port + 3, mach) << 24);
     }
     return temp;
 }
 
-static uint32_t
-mach32_decode_addr(svga_t *svga, uint32_t addr, int write)
-{
-    int memory_map_mode = (svga->gdcreg[6] >> 2) & 3;
-
-    addr &= 0x1ffff;
-
-    switch (memory_map_mode) {
-        case 0:
-            break;
-        case 1:
-            if (addr >= 0x10000)
-                return 0xffffffff;
-            break;
-        case 2:
-            addr -= 0x10000;
-            if (addr >= 0x8000)
-                return 0xffffffff;
-            break;
-        default:
-        case 3:
-            addr -= 0x18000;
-            if (addr >= 0x8000)
-                return 0xffffffff;
-            break;
-    }
-
-    if (memory_map_mode <= 1) {
-        if (write)
-            addr = (addr & svga->banked_mask) + svga->write_bank;
-        else
-            addr = (addr & svga->banked_mask) + svga->read_bank;
-    }
-
-    return addr;
-}
-
 static __inline void
-mach32_write_common(uint32_t addr, uint8_t val, int linear, mach_t *mach)
+mach32_write_common(uint32_t addr, uint8_t val, int linear, mach_t *mach, svga_t *svga)
 {
-    svga_t *svga = &mach->svga;
     ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
     int     writemask2 = svga->writemask;
     int     reset_wm   = 0;
-    latch_t vall;
+    latch8514_t vall;
     uint8_t wm = svga->writemask;
-    uint8_t count;
     uint8_t i;
 
     cycles -= svga->monitor->mon_video_timing_write_b;
 
-    if (!linear) {
-        addr = mach32_decode_addr(svga, addr, 1);
-        if (addr == 0xffffffff)
-            return;
+    if (linear) {
+        if (!dev->vram_512k_8514 && ((mach->accel.ext_ge_config & 0x30) == 0x00))
+            addr <<= 1;
+
+        addr &= dev->vram_mask;
+        dev->changedvram[addr >> 12] = svga->monitor->mon_changeframecount;
+        if (!dev->vram_512k_8514 && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+            switch (addr & 0x06) {
+                case 0x00:
+                case 0x06:
+                    dev->vram[addr] = val & 0x0f;
+                    dev->vram[addr + 1] = (val >> 4) & 0x0f;
+                    break;
+                case 0x02:
+                    dev->vram[addr + 2] = val & 0x0f;
+                    dev->vram[addr + 3] = (val >> 4) & 0x0f;
+                    break;
+                case 0x04:
+                    dev->vram[addr - 2] = val & 0x0f;
+                    dev->vram[addr - 1] = (val >> 4) & 0x0f;
+                    break;
+                default:
+                    break;
+            }
+        } else
+            dev->vram[addr] = val;
+
+        return;
     }
 
     if (!(svga->gdcreg[6] & 1))
         svga->fullchange = 2;
 
-    mach_log("WriteCommon chain4 = %x.\n", svga->chain4);
-    if (((svga->chain4 && (svga->packed_chain4 || svga->force_old_addr)) || svga->fb_only) && (svga->writemode < 4)) {
+    if (svga->chain4) {
         writemask2 = 1 << (addr & 3);
         addr &= ~3;
-    } else if (svga->chain4 && (svga->writemode < 4)) {
-        writemask2 = 1 << (addr & 3);
-        if (!linear)
-            addr &= ~3;
-
-        addr = ((addr & 0xfffc) << 2) | ((addr & 0x30000) >> 14) | (addr & ~0x3ffff);
     } else if (svga->chain2_write) {
         writemask2 &= ~0xa;
         if (addr & 1)
             writemask2 <<= 1;
+
         addr &= ~1;
         addr &= dev->vram_mask;
     } else {
@@ -4892,26 +5546,25 @@ mach32_write_common(uint32_t addr, uint8_t val, int linear, mach_t *mach)
     }
     addr &= svga->decode_mask;
 
-    if (addr >= dev->vram_size)
+    if (addr >= dev->vram_size) {
+        mach_log("WriteOver! %x.\n", addr);
         return;
+    }
 
     addr &= dev->vram_mask;
-
     dev->changedvram[addr >> 12] = svga->monitor->mon_changeframecount;
 
-    count = 4;
-
     switch (svga->writemode) {
         case 0:
             val = ((val >> (svga->gdcreg[3] & 7)) | (val << (8 - (svga->gdcreg[3] & 7))));
             if ((svga->gdcreg[8] == 0xff) && !(svga->gdcreg[3] & 0x18) && (!svga->gdcreg[1] || svga->set_reset_disabled)) {
-                for (i = 0; i < count; i++) {
+                for (i = 0; i < 4; i++) {
                     if (writemask2 & (1 << i))
                         dev->vram[addr | i] = val;
                 }
                 return;
             } else {
-                for (i = 0; i < count; i++) {
+                for (i = 0; i < 4; i++) {
                     if (svga->gdcreg[1] & (1 << i))
                         vall.b[i] = !!(svga->gdcreg[0] & (1 << i)) * 0xff;
                     else
@@ -4920,19 +5573,19 @@ mach32_write_common(uint32_t addr, uint8_t val, int linear, mach_t *mach)
             }
             break;
         case 1:
-            for (i = 0; i < count; i++) {
+            for (i = 0; i < 4; i++) {
                 if (writemask2 & (1 << i))
-                    dev->vram[addr | i] = svga->latch.b[i];
+                    dev->vram[addr | i] = dev->latch.b[i];
             }
             return;
         case 2:
-            for (i = 0; i < count; i++)
+            for (i = 0; i < 4; i++)
                 vall.b[i] = !!(val & (1 << i)) * 0xff;
 
             if (!(svga->gdcreg[3] & 0x18) && (!svga->gdcreg[1] || svga->set_reset_disabled)) {
-                for (i = 0; i < count; i++) {
+                for (i = 0; i < 4; i++) {
                     if (writemask2 & (1 << i))
-                        dev->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) | (svga->latch.b[i] & ~svga->gdcreg[8]);
+                        dev->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) | (dev->latch.b[i] & ~svga->gdcreg[8]);
                 }
                 return;
             }
@@ -4942,7 +5595,7 @@ mach32_write_common(uint32_t addr, uint8_t val, int linear, mach_t *mach)
             wm  = svga->gdcreg[8];
             svga->gdcreg[8] &= val;
 
-            for (i = 0; i < count; i++)
+            for (i = 0; i < 4; i++)
                 vall.b[i] = !!(svga->gdcreg[0] & (1 << i)) * 0xff;
 
             reset_wm = 1;
@@ -4953,27 +5606,27 @@ mach32_write_common(uint32_t addr, uint8_t val, int linear, mach_t *mach)
 
     switch (svga->gdcreg[3] & 0x18) {
         case 0x00: /* Set */
-            for (i = 0; i < count; i++) {
+            for (i = 0; i < 4; i++) {
                 if (writemask2 & (1 << i))
-                    dev->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) | (svga->latch.b[i] & ~svga->gdcreg[8]);
+                    dev->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) | (dev->latch.b[i] & ~svga->gdcreg[8]);
             }
             break;
         case 0x08: /* AND */
-            for (i = 0; i < count; i++) {
+            for (i = 0; i < 4; i++) {
                 if (writemask2 & (1 << i))
-                    dev->vram[addr | i] = (vall.b[i] | ~svga->gdcreg[8]) & svga->latch.b[i];
+                    dev->vram[addr | i] = (vall.b[i] | ~svga->gdcreg[8]) & dev->latch.b[i];
             }
             break;
         case 0x10: /* OR */
-            for (i = 0; i < count; i++) {
+            for (i = 0; i < 4; i++) {
                 if (writemask2 & (1 << i))
-                    dev->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) | svga->latch.b[i];
+                    dev->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) | dev->latch.b[i];
             }
             break;
         case 0x18: /* XOR */
-            for (i = 0; i < count; i++) {
+            for (i = 0; i < 4; i++) {
                 if (writemask2 & (1 << i))
-                    dev->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) ^ svga->latch.b[i];
+                    dev->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) ^ dev->latch.b[i];
             }
             break;
 
@@ -4989,44 +5642,421 @@ static void
 mach32_write(uint32_t addr, uint8_t val, void *priv)
 {
     mach_t *mach = (mach_t *) priv;
-    mach32_write_common(addr, val, 0, mach);
+    svga_t *svga = &mach->svga;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+
+    xga_write_test(addr, val, svga);
+    addr = (addr & svga->banked_mask) + svga->write_bank;
+
+    if (mach->accel.test2 & 0x10) {
+        if (addr < ((mach->accel.test2 & 0x0f) << 18))
+            return;
+    }
+
+    if ((ATI_MACH32 && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+        addr <<= 1;
+        switch (addr & 0x06) {
+            case 0x00:
+            case 0x06:
+                mach32_write_common(addr, val & 0x0f, 0, mach, svga);
+                mach32_write_common(addr + 1, (val >> 4) & 0x0f, 0, mach, svga);
+                break;
+            case 0x02:
+                mach32_write_common(addr + 2, val & 0x0f, 0, mach, svga);
+                mach32_write_common(addr + 3, (val >> 4) & 0x0f, 0, mach, svga);
+                break;
+            case 0x04:
+                mach32_write_common(addr - 2, val & 0x0f, 0, mach, svga);
+                mach32_write_common(addr - 1, (val >> 4) & 0x0f, 0, mach, svga);
+                break;
+            default:
+                break;
+        }
+    } else
+        mach32_write_common(addr, val, 0, mach, svga);
+
+    mach_log("Writeb banked=%08x.\n", addr);
 }
 
 static void
 mach32_writew(uint32_t addr, uint16_t val, void *priv)
 {
     mach_t *mach = (mach_t *) priv;
-    mach32_write_common(addr, val & 0xff, 0, mach);
-    mach32_write_common(addr + 1, val >> 8, 0, mach);
+    svga_t *svga = &mach->svga;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+
+    xga_write_test(addr, val, svga);
+    addr = (addr & svga->banked_mask) + svga->write_bank;
+
+    if (mach->accel.test2 & 0x10) {
+        if (addr < ((mach->accel.test2 & 0x0f) << 18))
+            return;
+    }
+
+    if ((ATI_MACH32 && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+        addr <<= 1;
+        if (addr & 0x04) {
+            mach32_write_common(addr - 2, val & 0x0f, 0, mach, svga);
+            mach32_write_common(addr - 1, (val >> 4) & 0x0f, 0, mach, svga);
+            mach32_write_common(addr + 2, (val >> 8) & 0x0f, 0, mach, svga);
+            mach32_write_common(addr + 3, (val >> 12) & 0x0f, 0, mach, svga);
+        } else {
+            mach32_write_common(addr, val & 0x0f, 0, mach, svga);
+            mach32_write_common(addr + 1, (val >> 4) & 0x0f, 0, mach, svga);
+            mach32_write_common(addr + 4, (val >> 8) & 0x0f, 0, mach, svga);
+            mach32_write_common(addr + 5, (val >> 12) & 0x0f, 0, mach, svga);
+        }
+    } else {
+        mach32_write_common(addr, val & 0xff, 0, mach, svga);
+        mach32_write_common(addr + 1, val >> 8, 0, mach, svga);
+    }
+    mach_log("Writew banked=%08x.\n", addr);
 }
 
 static void
 mach32_writel(uint32_t addr, uint32_t val, void *priv)
 {
     mach_t *mach = (mach_t *) priv;
-    mach32_write_common(addr, val & 0xff, 0, mach);
-    mach32_write_common(addr + 1, val >> 8, 0, mach);
-    mach32_write_common(addr + 2, val >> 16, 0, mach);
-    mach32_write_common(addr + 3, val >> 24, 0, mach);
+    svga_t *svga = &mach->svga;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+
+    xga_write_test(addr, val, svga);
+    addr = (addr & svga->banked_mask) + svga->write_bank;
+
+    if (mach->accel.test2 & 0x10) {
+        if (addr < ((mach->accel.test2 & 0x0f) << 18))
+            return;
+    }
+
+    if ((ATI_MACH32 && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+        addr <<= 1;
+        mach32_write_common(addr, val & 0x0f, 0, mach, svga);
+        mach32_write_common(addr + 1, (val >> 4) & 0x0f, 0, mach, svga);
+        mach32_write_common(addr + 4, (val >> 8) & 0x0f, 0, mach, svga);
+        mach32_write_common(addr + 5, (val >> 12) & 0x0f, 0, mach, svga);
+        mach32_write_common(addr + 2, (val >> 16) & 0x0f, 0, mach, svga);
+        mach32_write_common(addr + 3, (val >> 20) & 0x0f, 0, mach, svga);
+        mach32_write_common(addr + 6, (val >> 24) & 0x0f, 0, mach, svga);
+        mach32_write_common(addr + 7, (val >> 28) & 0x0f, 0, mach, svga);
+    } else {
+        mach32_write_common(addr, val & 0xff, 0, mach, svga);
+        mach32_write_common(addr + 1, val >> 8, 0, mach, svga);
+        mach32_write_common(addr + 2, val >> 16, 0, mach, svga);
+        mach32_write_common(addr + 3, val >> 24, 0, mach, svga);
+    }
+
+    mach_log("Writel banked=%08x.\n", addr);
+}
+
+static __inline void
+mach32_svga_write(uint32_t addr, uint8_t val, void *priv)
+{
+    svga_t *svga       = (svga_t *) priv;
+    mach_t *mach       = (mach_t *) svga->priv;
+    int     writemask2 = svga->writemask;
+    int     reset_wm   = 0;
+    latch_t vall;
+    uint8_t wm         = svga->writemask;
+    uint8_t count;
+    uint8_t i;
+
+    cycles -= svga->monitor->mon_video_timing_write_b;
+
+    xga_write_test(addr, val, svga);
+    addr = svga_decode_addr(svga, addr, 1);
+
+    if (addr == 0xffffffff) {
+        mach_log("WriteCommon Over.\n");
+        return;
+    }
+
+    if (mach->accel.test2 & 0x10) {
+        if (addr >= ((mach->accel.test2 & 0x0f) << 18))
+            return;
+    }
+
+    if (!(svga->gdcreg[6] & 1))
+        svga->fullchange = 2;
+
+    if (((svga->chain4 && (svga->packed_chain4 || svga->force_old_addr)) || svga->fb_only) && (svga->writemode < 4)) {
+        writemask2 = 1 << (addr & 3);
+        addr &= ~3;
+    } else if (svga->chain4 && (svga->writemode < 4)) {
+        writemask2 = 1 << (addr & 3);
+        addr = ((addr & 0xfffc) << 2) | ((addr & 0x30000) >> 14) | (addr & ~0x3ffff);
+    } else if (svga->chain2_write) {
+        writemask2 &= ~0xa;
+        if (addr & 1)
+            writemask2 <<= 1;
+        addr &= ~1;
+        addr <<= 2;
+    } else
+        addr <<= 2;
+
+    addr &= svga->decode_mask;
+
+    if (addr >= svga->vram_max) {
+        mach_log("WriteBankedOver=%08x, val=%02x.\n", addr & svga->vram_mask, val);
+        return;
+    }
+
+    addr &= svga->vram_mask;
+    svga->changedvram[addr >> 12] = svga->monitor->mon_changeframecount;
+
+    count = 4;
+
+    switch (svga->writemode) {
+        case 0:
+            val = ((val >> (svga->gdcreg[3] & 7)) | (val << (8 - (svga->gdcreg[3] & 7))));
+            if ((svga->gdcreg[8] == 0xff) && !(svga->gdcreg[3] & 0x18) && (!svga->gdcreg[1] || svga->set_reset_disabled)) {
+                for (i = 0; i < count; i++) {
+                    if (writemask2 & (1 << i))
+                        svga->vram[addr | i] = val;
+                }
+                return;
+            } else {
+                for (i = 0; i < count; i++) {
+                    if (svga->gdcreg[1] & (1 << i))
+                        vall.b[i] = !!(svga->gdcreg[0] & (1 << i)) * 0xff;
+                    else
+                        vall.b[i] = val;
+                }
+            }
+            break;
+        case 1:
+            for (i = 0; i < count; i++) {
+                if (writemask2 & (1 << i))
+                    svga->vram[addr | i] = svga->latch.b[i];
+            }
+            return;
+        case 2:
+            for (i = 0; i < count; i++)
+                vall.b[i] = !!(val & (1 << i)) * 0xff;
+
+            if (!(svga->gdcreg[3] & 0x18) && (!svga->gdcreg[1] || svga->set_reset_disabled)) {
+                for (i = 0; i < count; i++) {
+                    if (writemask2 & (1 << i))
+                        svga->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) | (svga->latch.b[i] & ~svga->gdcreg[8]);
+                }
+                return;
+            }
+            break;
+        case 3:
+            val = ((val >> (svga->gdcreg[3] & 7)) | (val << (8 - (svga->gdcreg[3] & 7))));
+            wm  = svga->gdcreg[8];
+            svga->gdcreg[8] &= val;
+
+            for (i = 0; i < count; i++)
+                vall.b[i] = !!(svga->gdcreg[0] & (1 << i)) * 0xff;
+
+            reset_wm = 1;
+            break;
+        default:
+            return;
+    }
+
+    switch (svga->gdcreg[3] & 0x18) {
+        case 0x00: /* Set */
+            for (i = 0; i < count; i++) {
+                if (writemask2 & (1 << i))
+                    svga->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) | (svga->latch.b[i] & ~svga->gdcreg[8]);
+            }
+            break;
+        case 0x08: /* AND */
+            for (i = 0; i < count; i++) {
+                if (writemask2 & (1 << i))
+                    svga->vram[addr | i] = (vall.b[i] | ~svga->gdcreg[8]) & svga->latch.b[i];
+            }
+            break;
+        case 0x10: /* OR */
+            for (i = 0; i < count; i++) {
+                if (writemask2 & (1 << i))
+                    svga->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) | svga->latch.b[i];
+            }
+            break;
+        case 0x18: /* XOR */
+            for (i = 0; i < count; i++) {
+                if (writemask2 & (1 << i))
+                    svga->vram[addr | i] = (vall.b[i] & svga->gdcreg[8]) ^ svga->latch.b[i];
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    if (reset_wm)
+        svga->gdcreg[8] = wm;
+}
+
+static __inline void
+mach32_svga_writew(uint32_t addr, uint16_t val, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    mach_t *mach = (mach_t *) svga->priv;
+
+    if (!svga->fast) {
+        mach32_svga_write(addr, val, priv);
+        mach32_svga_write(addr + 1, val >> 8, priv);
+        return;
+    }
+
+    cycles -= svga->monitor->mon_video_timing_write_w;
+
+    xga_write_test(addr, val & 0xff, svga);
+    xga_write_test(addr + 1, val >> 8, svga);
+    addr = svga_decode_addr(svga, addr, 1);
+
+    if (addr == 0xffffffff)
+        return;
+
+    if (mach->accel.test2 & 0x10) {
+        if (addr >= ((mach->accel.test2 & 0x0f) << 18))
+            return;
+    }
+
+    addr &= svga->decode_mask;
+    if (addr >= svga->vram_max)
+        return;
+    addr &= svga->vram_mask;
+
+    svga->changedvram[addr >> 12]   = svga->monitor->mon_changeframecount;
+    *(uint16_t *) &svga->vram[addr] = val;
+}
+
+static __inline void
+mach32_svga_writel(uint32_t addr, uint32_t val, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    mach_t *mach = (mach_t *) svga->priv;
+
+    if (!svga->fast) {
+        mach32_svga_write(addr, val, priv);
+        mach32_svga_write(addr + 1, val >> 8, priv);
+        mach32_svga_write(addr + 2, val >> 16, priv);
+        mach32_svga_write(addr + 3, val >> 24, priv);
+        return;
+    }
+
+    cycles -= svga->monitor->mon_video_timing_write_l;
+
+    xga_write_test(addr, val & 0xff, svga);
+    xga_write_test(addr + 1, (val >> 8) & 0xff, svga);
+    xga_write_test(addr + 2, (val >> 16) & 0xff, svga);
+    xga_write_test(addr + 3, (val >> 24) & 0xff, svga);
+    addr = svga_decode_addr(svga, addr, 1);
+
+    if (addr == 0xffffffff)
+        return;
+
+    if (mach->accel.test2 & 0x10) {
+        if (addr >= ((mach->accel.test2 & 0x0f) << 18))
+            return;
+    }
+
+    addr &= svga->decode_mask;
+    if (addr >= svga->vram_max)
+        return;
+
+    addr &= svga->vram_mask;
+
+    svga->changedvram[addr >> 12]   = svga->monitor->mon_changeframecount;
+    *(uint32_t *) &svga->vram[addr] = val;
+}
+
+static __inline void
+mach32_writew_linear(uint32_t addr, uint16_t val, mach_t *mach)
+{
+    svga_t *svga = &mach->svga;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+
+    cycles -= svga->monitor->mon_video_timing_write_w;
+    if (!dev->vram_512k_8514 && ((mach->accel.ext_ge_config & 0x30) == 0x00))
+        addr <<= 1;
+
+    addr &= dev->vram_mask;
+    dev->changedvram[addr >> 12] = svga->monitor->mon_changeframecount;
+    if (!dev->vram_512k_8514 && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+        if (addr & 0x04) {
+            dev->vram[addr - 2] = val & 0x0f;
+            dev->vram[addr - 1] = (val >> 4) & 0x0f;
+            dev->vram[addr + 2] = (val >> 8) & 0x0f;
+            dev->vram[addr + 3] = (val >> 12) & 0x0f;
+        } else {
+            dev->vram[addr] = val & 0x0f;
+            dev->vram[addr + 1] = (val >> 4) & 0x0f;
+            dev->vram[addr + 4] = (val >> 8) & 0x0f;
+            dev->vram[addr + 5] = (val >> 12) & 0x0f;
+        }
+    } else
+        *(uint16_t *) &dev->vram[addr] = val;
+}
+
+static __inline void
+mach32_writel_linear(uint32_t addr, uint32_t val, mach_t *mach)
+{
+    svga_t *svga = &mach->svga;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+
+    cycles -= svga->monitor->mon_video_timing_write_l;
+
+    if (!dev->vram_512k_8514 && ((mach->accel.ext_ge_config & 0x30) == 0x00))
+        addr <<= 1;
+
+    addr &= dev->vram_mask;
+    dev->changedvram[addr >> 12] = svga->monitor->mon_changeframecount;
+    if (!dev->vram_512k_8514 && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+        dev->vram[addr] = val & 0x0f;
+        dev->vram[addr + 1] = (val >> 4) & 0x0f;
+        dev->vram[addr + 4] = (val >> 8) & 0x0f;
+        dev->vram[addr + 5] = (val >> 12) & 0x0f;
+        dev->vram[addr + 2] = (val >> 16) & 0x0f;
+        dev->vram[addr + 3] = (val >> 20) & 0x0f;
+        dev->vram[addr + 6] = (val >> 24) & 0x0f;
+        dev->vram[addr + 7] = (val >> 28) & 0x0f;
+    } else
+        *(uint32_t *) &dev->vram[addr] = val;
 }
 
 static __inline uint8_t
-mach32_read_common(uint32_t addr, int linear, mach_t *mach)
+mach32_read_common(uint32_t addr, int linear, mach_t *mach, svga_t *svga)
 {
-    svga_t          *svga       = &mach->svga;
-    const ibm8514_t *dev        = (ibm8514_t *) svga->dev8514;
+    ibm8514_t       *dev        = (ibm8514_t *) svga->dev8514;
     uint32_t         latch_addr = 0;
     int              readplane  = svga->readplane;
     uint8_t          count;
     uint8_t          temp;
-    uint8_t          ret;
+    uint8_t          ret = 0x00;
 
     cycles -= svga->monitor->mon_video_timing_read_b;
 
-    if (!linear) {
-        addr = mach32_decode_addr(svga, addr, 0);
-        if (addr == 0xffffffff)
-            return 0xff;
+    if (linear) {
+        if (!dev->vram_512k_8514 && ((mach->accel.ext_ge_config & 0x30) == 0x00))
+            addr <<= 1;
+
+        addr &= dev->vram_mask;
+        if (!dev->vram_512k_8514 && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+            switch ((addr & 0x06) >> 1) {
+                case 0x00:
+                case 0x03:
+                    ret = dev->vram[addr] & 0x0f;
+                    ret |= (dev->vram[addr + 1] << 4);
+                    break;
+                case 0x01:
+                    ret = dev->vram[addr + 2] & 0x0f;
+                    ret |= (dev->vram[addr + 3] << 4);
+                    break;
+                case 0x02:
+                    ret = dev->vram[addr - 2] & 0x0f;
+                    ret |= (dev->vram[addr - 1] << 4);
+                    break;
+                default:
+                    break;
+            }
+        } else
+            ret = dev->vram[addr];
+
+        return ret;
     }
 
     count = 2;
@@ -5034,29 +6064,31 @@ mach32_read_common(uint32_t addr, int linear, mach_t *mach)
     latch_addr = (addr << count) & svga->decode_mask;
     count      = (1 << count);
 
-    mach_log("ReadCommon chain4 = %x.\n", svga->chain4);
-    if ((svga->chain4 && (svga->packed_chain4 || svga->force_old_addr)) || svga->fb_only) {
+    if (svga->chain4) {
         addr &= svga->decode_mask;
-        if (addr >= dev->vram_size)
+        if (addr >= dev->vram_size) {
+            mach_log("ReadOver! (chain4) %x.\n", addr);
             return 0xff;
+        }
         latch_addr = (addr & dev->vram_mask) & ~3;
         for (uint8_t i = 0; i < count; i++)
-            svga->latch.b[i] = dev->vram[latch_addr | i];
+            dev->latch.b[i] = dev->vram[latch_addr | i];
         return dev->vram[addr & dev->vram_mask];
-    } else if (svga->chain4 && !svga->force_old_addr) {
-        readplane = addr & 3;
-        addr      = ((addr & 0xfffc) << 2) | ((addr & 0x30000) >> 14) | (addr & ~0x3ffff);
     } else if (svga->chain2_read) {
         readplane = (readplane & 2) | (addr & 1);
         addr &= ~1;
         addr &= dev->vram_mask;
     } else {
         addr &= svga->decode_mask;
-        if (addr >= dev->vram_size)
+        if (addr >= dev->vram_size) {
+            mach_log("ReadOver! (normal) %x.\n", addr);
             return 0xff;
+        }
         latch_addr = (addr & dev->vram_mask) & ~3;
         for (uint8_t i = 0; i < count; i++)
-            svga->latch.b[i] = dev->vram[latch_addr | i];
+            dev->latch.b[i] = dev->vram[latch_addr | i];
+
+        mach_log("Read (normal) addr=%06x, ret=%02x.\n", addr, dev->vram[addr & dev->vram_mask]);
         return dev->vram[addr & dev->vram_mask];
     }
 
@@ -5064,17 +6096,20 @@ mach32_read_common(uint32_t addr, int linear, mach_t *mach)
 
     /* standard VGA latched access */
     if (latch_addr >= dev->vram_size) {
+        mach_log("Over VRAM Latch addr=%x.\n", latch_addr);
         for (uint8_t i = 0; i < count; i++)
-            svga->latch.b[i] = 0xff;
+            dev->latch.b[i] = 0xff;
     } else {
         latch_addr &= dev->vram_mask;
 
         for (uint8_t i = 0; i < count; i++)
-            svga->latch.b[i] = dev->vram[latch_addr | i];
+            dev->latch.b[i] = dev->vram[latch_addr | i];
     }
 
-    if (addr >= dev->vram_size)
+    if (addr >= dev->vram_size) {
+        mach_log("ReadOver! (chain2) %x.\n", addr);
         return 0xff;
+    }
 
     addr &= dev->vram_mask;
 
@@ -5085,7 +6120,7 @@ mach32_read_common(uint32_t addr, int linear, mach_t *mach)
             for (uint8_t plane = 0; plane < count; plane++) {
                 if (svga->colournocare & (1 << plane)) {
                     /* If we care about a plane, and the pixel has a mismatch on it, clear its bit. */
-                    if (((svga->latch.b[plane] >> pixel) & 1) != ((svga->colourcompare >> plane) & 1))
+                    if (((dev->latch.b[plane] >> pixel) & 1) != ((svga->colourcompare >> plane) & 1))
                         temp &= ~(1 << pixel);
                 }
             }
@@ -5095,6 +6130,7 @@ mach32_read_common(uint32_t addr, int linear, mach_t *mach)
     } else
         ret = dev->vram[addr | readplane];
 
+    mach_log("ReadMode=%02x, addr=%06x, ret=%02x.\n", svga->readmode, addr, ret);
     return ret;
 }
 
@@ -5102,9 +6138,36 @@ static uint8_t
 mach32_read(uint32_t addr, void *priv)
 {
     mach_t *mach = (mach_t *) priv;
-    uint8_t          ret;
+    svga_t *svga = &mach->svga;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+    uint8_t ret = 0x00;
 
-    ret  = mach32_read_common(addr, 0, mach);
+    (void) xga_read_test(addr, svga);
+    addr = (addr & svga->banked_mask) + svga->read_bank;
+
+    if ((ATI_MACH32 && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+        addr <<= 1;
+        switch ((addr & 0x06) >> 1) {
+            case 0x00:
+            case 0x03:
+                ret = mach32_read_common(addr, 0, mach, svga) & 0x0f;
+                ret |= (mach32_read_common(addr + 1, 0, mach, svga) << 4);
+                break;
+            case 0x01:
+                ret = mach32_read_common(addr + 2, 0, mach, svga) & 0x0f;
+                ret |= (mach32_read_common(addr + 3, 0, mach, svga) << 4);
+                break;
+            case 0x02:
+                ret = mach32_read_common(addr - 2, 0, mach, svga) & 0x0f;
+                ret |= (mach32_read_common(addr - 1, 0, mach, svga) << 4);
+                break;
+            default:
+                break;
+        }
+    } else
+        ret = mach32_read_common(addr, 0, mach, svga);
+
+    mach_log("Readb banked=%08x.\n", addr);
     return ret;
 }
 
@@ -5112,10 +6175,31 @@ static uint16_t
 mach32_readw(uint32_t addr, void *priv)
 {
     mach_t *mach = (mach_t *) priv;
-    uint16_t         ret;
+    svga_t *svga = &mach->svga;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+    uint16_t ret;
 
-    ret  = mach32_read_common(addr, 0, mach);
-    ret  |= (mach32_read_common(addr + 1, 0, mach) << 8);
+    (void) xga_read_test(addr, svga);
+    addr = (addr & svga->banked_mask) + svga->read_bank;
+
+    if ((ATI_MACH32 && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+        addr <<= 1;
+        if (addr & 0x04) {
+            ret = mach32_read_common(addr - 2, 0, mach, svga) & 0x0f;
+            ret |= (mach32_read_common(addr - 1, 0, mach, svga) << 4);
+            ret |= (mach32_read_common(addr + 2, 0, mach, svga) << 8);
+            ret |= (mach32_read_common(addr + 3, 0, mach, svga) << 12);
+        } else {
+            ret = mach32_read_common(addr, 0, mach, svga) & 0x0f;
+            ret |= (mach32_read_common(addr + 1, 0, mach, svga) << 4);
+            ret |= (mach32_read_common(addr + 4, 0, mach, svga) << 8);
+            ret |= (mach32_read_common(addr + 5, 0, mach, svga) << 12);
+        }
+    } else {
+        ret = mach32_read_common(addr, 0, mach, svga);
+        ret |= (mach32_read_common(addr + 1, 0, mach, svga) << 8);
+    }
+    mach_log("Readw banked=%08x.\n", addr);
     return ret;
 }
 
@@ -5123,12 +6207,83 @@ static uint32_t
 mach32_readl(uint32_t addr, void *priv)
 {
     mach_t *mach = (mach_t *) priv;
+    svga_t *svga = &mach->svga;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+    uint32_t ret;
+
+    (void) xga_read_test(addr, svga);
+    addr = (addr & svga->banked_mask) + svga->read_bank;
+
+    if ((ATI_MACH32 && !dev->vram_512k_8514) && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+        addr <<= 1;
+        ret = mach32_read_common(addr, 0, mach, svga) & 0x0f;
+        ret |= (mach32_read_common(addr + 1, 0, mach, svga) << 4);
+        ret |= (mach32_read_common(addr + 4, 0, mach, svga) << 8);
+        ret |= (mach32_read_common(addr + 5, 0, mach, svga) << 12);
+        ret |= (mach32_read_common(addr + 2, 0, mach, svga) << 16);
+        ret |= (mach32_read_common(addr + 3, 0, mach, svga) << 20);
+        ret |= (mach32_read_common(addr + 6, 0, mach, svga) << 24);
+        ret |= (mach32_read_common(addr + 7, 0, mach, svga) << 28);
+    } else {
+        ret = mach32_read_common(addr, 0, mach, svga);
+        ret |= (mach32_read_common(addr + 1, 0, mach, svga) << 8);
+        ret |= (mach32_read_common(addr + 2, 0, mach, svga) << 16);
+        ret |= (mach32_read_common(addr + 3, 0, mach, svga) << 24);
+    }
+    mach_log("Readl banked=%08x.\n", addr);
+    return ret;
+}
+
+static __inline uint16_t
+mach32_readw_linear(uint32_t addr, mach_t *mach)
+{
+    svga_t          *svga       = &mach->svga;
+    ibm8514_t       *dev        = (ibm8514_t *) svga->dev8514;
+    uint16_t         ret;
+
+    cycles -= svga->monitor->mon_video_timing_read_w;
+    if (!dev->vram_512k_8514 && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+        addr <<= 1;
+        addr &= dev->vram_mask;
+        if (addr & 0x04) {
+            ret = dev->vram[addr - 2] & 0x0f;
+            ret |= (dev->vram[addr - 1] << 4);
+            ret |= (dev->vram[addr + 2] << 8);
+            ret |= (dev->vram[addr + 3] << 12);
+        } else {
+            ret = dev->vram[addr] & 0x0f;
+            ret |= (dev->vram[addr + 1] << 4);
+            ret |= (dev->vram[addr + 4] << 8);
+            ret |= (dev->vram[addr + 5] << 12);
+        }
+    } else
+        ret = *(uint16_t *) &dev->vram[addr & dev->vram_mask];
+
+    return ret;
+}
+
+static __inline uint32_t
+mach32_readl_linear(uint32_t addr, mach_t *mach)
+{
+    svga_t          *svga       = &mach->svga;
+    ibm8514_t       *dev        = (ibm8514_t *) svga->dev8514;
     uint32_t         ret;
 
-    ret  = mach32_read_common(addr, 0, mach);
-    ret  |= (mach32_read_common(addr + 1, 0, mach) << 8);
-    ret  |= (mach32_read_common(addr + 2, 0, mach) << 16);
-    ret  |= (mach32_read_common(addr + 3, 0, mach) << 24);
+    cycles -= svga->monitor->mon_video_timing_read_l;
+    if (!dev->vram_512k_8514 && ((mach->accel.ext_ge_config & 0x30) == 0x00)) {
+        addr <<= 1;
+        addr &= dev->vram_mask;
+        ret = dev->vram[addr] & 0x0f;
+        ret |= (dev->vram[addr + 1] << 4);
+        ret |= (dev->vram[addr + 4] << 8);
+        ret |= (dev->vram[addr + 5] << 12);
+        ret |= (dev->vram[addr + 2] << 16);
+        ret |= (dev->vram[addr + 3] << 20);
+        ret |= (dev->vram[addr + 6] << 24);
+        ret |= (dev->vram[addr + 7] << 28);
+    } else
+        ret = *(uint32_t *) &dev->vram[addr & dev->vram_mask];
+
     return ret;
 }
 
@@ -5139,20 +6294,25 @@ mach32_ap_writeb(uint32_t addr, uint8_t val, void *priv)
     svga_t          *svga  = &mach->svga;
     const ibm8514_t *dev   = (ibm8514_t *) svga->dev8514;
     uint8_t port_dword     = addr & 0xfc;
+    uint16_t actual_port   = 0x02e8 + (addr & 1) + (port_dword << 8);
+    uint16_t actual_port_ext = 0x02ee + (addr & 1) + (port_dword << 8);
 
     if (((mach->local_cntl & 0x20) || (mach->pci_cntl_reg & 0x80)) &&
-        ((addr >= ((mach->ap_size << 20) - 0x200)) && (addr < (mach->ap_size << 20)))) {
+        (((addr - mach->linear_base) >= ((mach->ap_size << 20) - 0x200)) && ((addr - mach->linear_base) < (mach->ap_size << 20))) &&
+        (svga->mapping.base == 0xa0000)) {
         if (addr & 0x100) {
-            mach_log("Port WORDB Write=%04x.\n", 0x02ee + (port_dword << 8));
-            mach_accel_outb(0x02ee + (addr & 1) + (port_dword << 8), val, mach);
+            mach_log("Port WORDB Write=%04x.\n", actual_port_ext);
+            mach_accel_outb(actual_port_ext, val, mach);
         } else {
-            mach_log("Port WORDB Write=%04x.\n", 0x02e8 + (port_dword << 8));
-            mach_accel_outb(0x02e8 + (addr & 1) + (port_dword << 8), val, mach);
+            mach_log("Port WORDB Write=%04x.\n", actual_port);
+            mach_accel_outb(actual_port, val, mach);
         }
     } else {
-        mach_log("Linear WORDB Write=%08x, val=%02x.\n", addr, val);
-        if (dev->on[0] || dev->on[1])
-            mach32_write_common(addr, val, 1, mach);
+        mach_log("Linear WORDB Write=%08x, val=%02x, ON=%x, dpconfig=%04x, apsize=%08x, addr=%08x.\n",
+            addr - mach->linear_base, val, dev->on, mach->accel.dp_config, mach->ap_size << 20, addr);
+
+        if (dev->on)
+            mach32_write_common(addr, val, 1, mach, svga);
         else
             svga_write_linear(addr, val, svga);
     }
@@ -5165,22 +6325,26 @@ mach32_ap_writew(uint32_t addr, uint16_t val, void *priv)
     svga_t          *svga  = &mach->svga;
     const ibm8514_t *dev   = (ibm8514_t *) svga->dev8514;
     uint8_t port_dword     = addr & 0xfc;
+    uint16_t actual_port   = 0x02e8 + (port_dword << 8);
+    uint16_t actual_port_ext = 0x02ee + (port_dword << 8);
 
     if (((mach->local_cntl & 0x20) || (mach->pci_cntl_reg & 0x80)) &&
-        ((addr >= ((mach->ap_size << 20) - 0x200)) && (addr < (mach->ap_size << 20)))) {
+        (((addr - mach->linear_base) >= ((mach->ap_size << 20) - 0x200)) && ((addr - mach->linear_base) < (mach->ap_size << 20))) &&
+        (svga->mapping.base == 0xa0000)) {
         if (addr & 0x100) {
-            mach_log("Port WORDW Write=%04x.\n", 0x02ee + (port_dword << 8));
-            mach_accel_outw(0x02ee + (port_dword << 8), val, mach);
+            mach_log("Port WORDW Write=%04x, localcntl=%02x, pcicntl=%02x, actual addr=%08x, val=%04x.\n", actual_port_ext, mach->local_cntl & 0x20, mach->pci_cntl_reg & 0x80, addr, val);
+            mach_accel_outw(actual_port_ext, val, mach);
         } else {
-            mach_log("Port WORDW Write=%04x.\n", 0x02e8 + (port_dword << 8));
-            mach_accel_outw(0x02e8 + (port_dword << 8), val, mach);
+            mach_log("Port WORDW Write=%04x, localcntl=%02x, pcicntl=%02x, actual addr=%08x, val=%04x.\n", actual_port, mach->local_cntl & 0x20, mach->pci_cntl_reg & 0x80, addr, val);
+            mach_accel_outw(actual_port, val, mach);
         }
     } else {
-        mach_log("Linear WORDW Write=%08x, val=%04x.\n", addr, val);
-        if (dev->on[0] || dev->on[1]) {
-            mach32_write_common(addr, val & 0xff, 1, mach);
-            mach32_write_common(addr + 1, val >> 8, 1, mach);
-        } else
+        mach_log("Linear WORDW Write=%08x, val=%04x, ON=%x, dpconfig=%04x, apsize=%08x, addr=%08x.\n",
+            addr - mach->linear_base, val, dev->on, mach->accel.dp_config, mach->ap_size << 20, addr);
+
+        if (dev->on)
+            mach32_writew_linear(addr, val, mach);
+        else
             svga_writew_linear(addr, val, svga);
     }
 }
@@ -5192,26 +6356,26 @@ mach32_ap_writel(uint32_t addr, uint32_t val, void *priv)
     svga_t          *svga  = &mach->svga;
     const ibm8514_t *dev   = (ibm8514_t *) svga->dev8514;
     uint8_t port_dword     = addr & 0xfc;
+    uint16_t actual_port   = 0x02e8 + (port_dword << 8);
+    uint16_t actual_port_ext = 0x02ee + (port_dword << 8);
 
     if (((mach->local_cntl & 0x20) || (mach->pci_cntl_reg & 0x80)) &&
-        ((addr >= ((mach->ap_size << 20) - 0x200)) && (addr < (mach->ap_size << 20)))) {
+        (((addr - mach->linear_base) >= ((mach->ap_size << 20) - 0x200)) && ((addr - mach->linear_base) < (mach->ap_size << 20))) &&
+        (svga->mapping.base == 0xa0000)) {
         if (addr & 0x100) {
-            mach_log("Port WORDL Write=%04x.\n", 0x02ee + (port_dword << 8));
-            mach_accel_outw(0x02ee + (port_dword << 8), val & 0xffff, mach);
-            mach_accel_outw(0x02ee + (port_dword << 8) + 4, val >> 16, mach);
+            mach_log("Port WORDL Write=%04x, localcntl=%02x, pcicntl=%02x.\n", actual_port_ext, mach->local_cntl & 0x20, mach->pci_cntl_reg & 0x80);
+            mach_accel_outl(actual_port_ext, val, mach);
         } else {
-            mach_log("Port WORDL Write=%04x.\n", 0x02e8 + (port_dword << 8));
-            mach_accel_outw(0x02e8 + (port_dword << 8), val & 0xffff, mach);
-            mach_accel_outw(0x02e8 + (port_dword << 8) + 4, val >> 16, mach);
+            mach_log("Port WORDL Write=%04x, localcntl=%02x, pcicntl=%02x.\n", actual_port, mach->local_cntl & 0x20, mach->pci_cntl_reg & 0x80);
+            mach_accel_outl(actual_port, val, mach);
         }
     } else {
-        mach_log("Linear WORDL Write=%08x, val=%08x.\n", addr, val);
-        if (dev->on[0] || dev->on[1]) {
-            mach32_write_common(addr, val & 0xff, 1, mach);
-            mach32_write_common(addr + 1, val >> 8, 1, mach);
-            mach32_write_common(addr + 2, val >> 16, 1, mach);
-            mach32_write_common(addr + 3, val >> 24, 1, mach);
-        } else
+        mach_log("Linear WORDL Write=%08x, val=%08x, ON=%x, dpconfig=%04x, apsize=%08x, addr=%08x.\n",
+            addr - mach->linear_base, val, dev->on, mach->accel.dp_config, mach->ap_size << 20, addr);
+
+        if (dev->on)
+            mach32_writel_linear(addr, val, mach);
+        else
             svga_writel_linear(addr, val, svga);
     }
 }
@@ -5224,16 +6388,19 @@ mach32_ap_readb(uint32_t addr, void *priv)
     const ibm8514_t *dev   = (ibm8514_t *) svga->dev8514;
     uint8_t temp;
     uint8_t port_dword     = addr & 0xfc;
+    uint16_t actual_port   = 0x02e8 + (addr & 1) + (port_dword << 8);
+    uint16_t actual_port_ext = 0x02ee + (addr & 1) + (port_dword << 8);
 
     if (((mach->local_cntl & 0x20) || (mach->pci_cntl_reg & 0x80)) &&
-        ((addr >= ((mach->ap_size << 20) - 0x200)) && (addr < (mach->ap_size << 20)))) {
+        (((addr - mach->linear_base) >= ((mach->ap_size << 20) - 0x200)) && ((addr - mach->linear_base) < (mach->ap_size << 20))) &&
+        (svga->mapping.base == 0xa0000)) {
         if (addr & 0x100)
-            temp = mach_accel_inb(0x02ee + (addr & 1) + (port_dword << 8), mach);
+            temp = mach_accel_inb(actual_port_ext, mach);
         else
-            temp = mach_accel_inb(0x02e8 + (addr & 1) + (port_dword << 8), mach);
+            temp = mach_accel_inb(actual_port, mach);
     } else {
-        if (dev->on[0] || dev->on[1])
-            temp = mach32_read_common(addr, 1, mach);
+        if (dev->on)
+            temp = mach32_read_common(addr, 1, mach, svga);
         else
             temp = svga_read_linear(addr, svga);
 
@@ -5251,18 +6418,23 @@ mach32_ap_readw(uint32_t addr, void *priv)
     const ibm8514_t *dev   = (ibm8514_t *) svga->dev8514;
     uint16_t temp;
     uint8_t port_dword     = addr & 0xfc;
+    uint16_t actual_port   = 0x02e8 + (port_dword << 8);
+    uint16_t actual_port_ext = 0x02ee + (port_dword << 8);
 
     if (((mach->local_cntl & 0x20) || (mach->pci_cntl_reg & 0x80)) &&
-        ((addr >= ((mach->ap_size << 20) - 0x200)) && (addr < (mach->ap_size << 20)))) {
-        if (addr & 0x100)
-            temp = mach_accel_inw(0x02ee + (port_dword << 8), mach);
-        else
-            temp = mach_accel_inw(0x02e8 + (port_dword << 8), mach);
+        (((addr - mach->linear_base) >= ((mach->ap_size << 20) - 0x200)) && ((addr - mach->linear_base) < (mach->ap_size << 20))) &&
+        (svga->mapping.base == 0xa0000)) {
+        if (addr & 0x100) {
+            temp = mach_accel_inw(actual_port_ext, mach);
+            mach_log("Port WORDW Read=%04x.\n", actual_port_ext);
+        } else {
+            temp = mach_accel_inw(actual_port, mach);
+            mach_log("Port WORDW Read=%04x.\n", actual_port);
+        }
     } else {
-        if (dev->on[0] || dev->on[1]) {
-            temp  = mach32_read_common(addr, 1, mach);
-            temp  |= (mach32_read_common(addr + 1, 1, mach) << 8);
-        } else
+        if (dev->on)
+            temp = mach32_readw_linear(addr, mach);
+        else
             temp = svga_readw_linear(addr, svga);
 
         mach_log("Linear WORDW Read=%08x, ret=%04x.\n", addr, temp);
@@ -5279,26 +6451,26 @@ mach32_ap_readl(uint32_t addr, void *priv)
     const ibm8514_t *dev   = (ibm8514_t *) svga->dev8514;
     uint32_t temp;
     uint8_t port_dword     = addr & 0xfc;
+    uint16_t actual_port   = 0x02e8 + (port_dword << 8);
+    uint16_t actual_port_ext = 0x02ee + (port_dword << 8);
 
     if (((mach->local_cntl & 0x20) || (mach->pci_cntl_reg & 0x80)) &&
-        ((addr >= ((mach->ap_size << 20) - 0x200)) && (addr < (mach->ap_size << 20)))) {
+        (((addr - mach->linear_base) >= ((mach->ap_size << 20) - 0x200)) && ((addr - mach->linear_base) < (mach->ap_size << 20))) &&
+        (svga->mapping.base == 0xa0000)) {
         if (addr & 0x100) {
-            temp = mach_accel_inw(0x02ee + (port_dword << 8), mach);
-            temp |= (mach_accel_inw(0x02ee + (port_dword << 8) + 4, mach) << 8);
+            temp = mach_accel_inl(actual_port_ext, mach);
+            mach_log("Port WORDL Read=%04x.\n", actual_port_ext);
         } else {
-            temp = mach_accel_inw(0x02e8 + (port_dword << 8), mach);
-            temp |= (mach_accel_inw(0x02e8 + (port_dword << 8) + 4, mach) << 8);
+            temp = mach_accel_inl(actual_port, mach);
+            mach_log("Port WORDL Read=%04x.\n", actual_port);
         }
     } else {
-        if (dev->on[0] || dev->on[1]) {
-            temp  = mach32_read_common(addr, 1, mach);
-            temp  |= (mach32_read_common(addr + 1, 1, mach) << 8);
-            temp  |= (mach32_read_common(addr + 2, 1, mach) << 16);
-            temp  |= (mach32_read_common(addr + 3, 1, mach) << 24);
-        } else
+        if (dev->on)
+            temp = mach32_readl_linear(addr, mach);
+        else
             temp = svga_readl_linear(addr, svga);
 
-        mach_log("Linear WORDL Read=%08x, ret=%08x, ON0=%d, ON1=%d.\n", addr, temp, dev->on[0], dev->on[1]);
+        mach_log("Linear WORDL Read=%08x, ret=%08x, ON%d.\n", addr, temp, dev->on);
     }
 
     return temp;
@@ -5308,14 +6480,16 @@ static void
 mach32_updatemapping(mach_t *mach, svga_t *svga)
 {
     ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+    xga_t     *xga = (xga_t *) svga->xga;
 
     if (mach->pci_bus && (!(mach->pci_regs[PCI_REG_COMMAND] & PCI_COMMAND_MEM))) {
+        mach_log("No Mapping.\n");
         mem_mapping_disable(&svga->mapping);
         mem_mapping_disable(&mach->mmio_linear_mapping);
         return;
     }
 
-    if (mach->regs[0xbd] & 4) {
+    if (mach->regs[0xbd] & 0x04) {
         mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x20000);
         svga->banked_mask = 0xffff;
     } else {
@@ -5327,6 +6501,11 @@ mach32_updatemapping(mach_t *mach, svga_t *svga)
             case 0x4: /*64k at A0000*/
                 mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
                 svga->banked_mask = 0xffff;
+                if (xga_active && (svga->xga != NULL)) {
+                    xga->on = 0;
+                    mem_mapping_set_handler(&svga->mapping, svga_read, svga_readw, svga_readl, svga_write, svga_writew, svga_writel);
+                    mem_mapping_set_p(&svga->mapping, svga);
+                }
                 break;
             case 0x8: /*32k at B0000*/
                 mem_mapping_set_addr(&svga->mapping, 0xb0000, 0x08000);
@@ -5342,27 +6521,37 @@ mach32_updatemapping(mach_t *mach, svga_t *svga)
         }
     }
 
-    mach_log("Linear base = %08x, aperture = %04x, localcntl = %02x svgagdc = %x.\n", mach->linear_base, mach->memory_aperture, mach->local_cntl, svga->gdcreg[6] & 0x0c);
+    mach_log("Linear base=%08x, aperture=%04x, localcntl=%02x, svgagdc=%x.\n",
+             mach->linear_base, mach->memory_aperture, mach->local_cntl, svga->gdcreg[6] & 0x0c);
     if (mach->linear_base) {
         if (((mach->memory_aperture & 3) == 1) && !mach->pci_bus) {
             /*1 MB aperture*/
             mach->ap_size = 1;
+            mach_log("Linear Enabled APSIZE=1.\n");
             mem_mapping_set_addr(&mach->mmio_linear_mapping, mach->linear_base, mach->ap_size << 20);
         } else {
             /*4 MB aperture*/
             mach->ap_size = 4;
+            mach_log("Linear Enabled APSIZE=4.\n");
             mem_mapping_set_addr(&mach->mmio_linear_mapping, mach->linear_base, mach->ap_size << 20);
         }
     } else {
         mach->ap_size = 4;
+        mach_log("Linear Disabled APSIZE=4.\n");
         mem_mapping_disable(&mach->mmio_linear_mapping);
     }
-    if (((dev->local & 0xff) >= 0x02) && (dev->on[0] || dev->on[1]) && (mach->ext_on[0] || mach->ext_on[1]) && (dev->vendor_mode[0] || dev->vendor_mode[1])) {
-        mach_log("ExtON.\n");
-        mem_mapping_set_handler(&svga->mapping, mach32_read, mach32_readw, mach32_readl, mach32_write, mach32_writew, mach32_writel);
-        mem_mapping_set_p(&svga->mapping, mach);
+
+    if (ATI_MACH32) {
+        if (dev->on && dev->vendor_mode) {
+            mach_log("Mach32 banked mapping.\n");
+            mem_mapping_set_handler(&svga->mapping, mach32_read, mach32_readw, mach32_readl, mach32_write, mach32_writew, mach32_writel);
+            mem_mapping_set_p(&svga->mapping, mach);
+        } else {
+            mach_log("IBM compatible banked mapping.\n");
+            mem_mapping_set_handler(&svga->mapping, svga_read, svga_readw, svga_readl, mach32_svga_write, mach32_svga_writew, mach32_svga_writel);
+            mem_mapping_set_p(&svga->mapping, svga);
+        }
     } else {
-        mach_log("ExtOFF.\n");
         mem_mapping_set_handler(&svga->mapping, svga_read, svga_readw, svga_readl, svga_write, svga_writew, svga_writel);
         mem_mapping_set_p(&svga->mapping, svga);
     }
@@ -5375,19 +6564,25 @@ mach32_hwcursor_draw(svga_t *svga, int displine)
     ibm8514_t    *dev    = (ibm8514_t *) svga->dev8514;
     uint16_t      dat;
     int           comb;
-    int           offset = dev->hwcursor_latch.x - dev->hwcursor_latch.xoff;
+    int           offset;
     uint32_t      color0;
     uint32_t      color1;
     uint32_t      *p;
     int           x_pos;
     int           y_pos;
+    int           shift = 0;
 
-    mach_log("BPP=%d.\n", dev->accel_bpp);
+    offset = dev->hwcursor_latch.x - dev->hwcursor_latch.xoff;
+    if (!dev->vram_512k_8514 && ((mach->accel.ext_ge_config & 0x30) == 0x00))
+        shift = 1;
+
+    mach_log("BPP=%d, displine=%d.\n", dev->accel_bpp, displine);
     switch (dev->accel_bpp) {
         default:
         case 8:
             color0 = dev->pallook[mach->cursor_col_0];
             color1 = dev->pallook[mach->cursor_col_1];
+            mach_log("4/8BPP: Color0=%08x, Color1=%08x, interlace=%x, oddeven=%d.\n", color0, color1, dev->interlace, dev->hwcursor_oddeven);
             break;
         case 15:
             color0 = video_15to32[((mach->ext_cur_col_0_r << 16) | (mach->ext_cur_col_0_g << 8) | mach->cursor_col_0) & 0xffff];
@@ -5401,15 +6596,26 @@ mach32_hwcursor_draw(svga_t *svga, int displine)
         case 32:
             color0 = ((mach->ext_cur_col_0_r << 16) | (mach->ext_cur_col_0_g << 8) | mach->cursor_col_0);
             color1 = ((mach->ext_cur_col_1_r << 16) | (mach->ext_cur_col_1_g << 8) | mach->cursor_col_1);
+            mach_log("24/32BPP: Color0=%08x, Color1=%08x.\n", color0, color1);
             break;
     }
 
     if (dev->interlace && dev->hwcursor_oddeven)
-        dev->hwcursor_latch.addr += 16;
+        dev->hwcursor_latch.addr += (16 >> shift);
 
-    for (int x = 0; x < 64; x += 8) {
-        dat = dev->vram[dev->hwcursor_latch.addr & dev->vram_mask] | (dev->vram[(dev->hwcursor_latch.addr + 1) & dev->vram_mask] << 8);
-        for (int xx = 0; xx < 8; xx++) {
+    for (int x = 0; x < 64; x += (8 >> shift)) {
+        if (shift) {
+            dat = dev->vram[(dev->hwcursor_latch.addr) & dev->vram_mask] & 0x0f;
+            dat |= (dev->vram[(dev->hwcursor_latch.addr + 1) & dev->vram_mask] << 4);
+            dat |= (dev->vram[(dev->hwcursor_latch.addr + 2) & dev->vram_mask] << 8);
+            dat |= (dev->vram[(dev->hwcursor_latch.addr + 3) & dev->vram_mask] << 12);
+            mach_log("4bpp Data=%04x.\n", dat);
+        } else {
+            dat = dev->vram[dev->hwcursor_latch.addr & dev->vram_mask];
+            dat |= (dev->vram[(dev->hwcursor_latch.addr + 1) & dev->vram_mask] << 8);
+            mach_log("8bppplus Data=%04x.\n", dat);
+        }
+        for (int xx = 0; xx < (8 >> shift); xx++) {
             comb = (dat >> (xx << 1)) & 0x03;
 
             y_pos = displine;
@@ -5437,11 +6643,11 @@ mach32_hwcursor_draw(svga_t *svga, int displine)
         }
         dev->hwcursor_latch.addr += 2;
     }
+
     if (dev->interlace && !dev->hwcursor_oddeven)
-        dev->hwcursor_latch.addr += 16;
+        dev->hwcursor_latch.addr += (16 >> shift);
 }
 
-#ifdef ATI_8514_ULTRA
 static void
 ati8514_io_set(svga_t *svga)
 {
@@ -5529,6 +6735,7 @@ ati8514_io_set(svga_t *svga)
     io_sethandler(0x7eee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0x82ee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0x86ee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
+    io_sethandler(0x8aee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0x8eee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0x92ee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0x96ee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
@@ -5551,12 +6758,131 @@ ati8514_io_set(svga_t *svga)
     io_sethandler(0xdeee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0xe2ee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0xe6ee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
+    io_sethandler(0xeaee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0xeeee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0xf2ee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0xf6ee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
+    io_sethandler(0xfaee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
     io_sethandler(0xfeee, 0x0002, ati8514_accel_inb, ati8514_accel_inw, ati8514_accel_inl, ati8514_accel_outb, ati8514_accel_outw, ati8514_accel_outl, svga);
 }
-#endif
+
+static void
+mach_io_remove(mach_t *mach)
+{
+    io_removehandler(0x2e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x6e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xae8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xee8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x12e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x16e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x1ae8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x1ee8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x22e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x26e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x2ee8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x42e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x4ae8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x52e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x56e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x5ae8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x5ee8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x82e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x86e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x8ae8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x8ee8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x92e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x96e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x9ae8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x9ee8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xa2e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xa6e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xaae8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xaee8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xb2e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xb6e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xbae8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xbee8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xe2e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+
+    io_removehandler(0xc2e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xc6e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xcae8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xcee8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xd2e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xd6e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xdae8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xdee8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xe6e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xeae8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xeee8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xf2e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xf6e8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xfae8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xfee8, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+
+    io_removehandler(0x02ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x06ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x0aee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x0eee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x12ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x16ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x1aee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x1eee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x22ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x26ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x2aee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x2eee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x32ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x36ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x3aee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x3eee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x42ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x46ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x4aee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x52ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x56ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x5aee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x5eee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x62ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x66ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x6aee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x6eee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x72ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x76ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x7aee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x7eee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x82ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x86ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x8aee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x8eee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x92ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x96ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0x9aee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xa2ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xa6ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xaaee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xaeee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xb2ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xb6ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xbaee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xbeee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xc2ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xc6ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xcaee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xceee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xd2ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xd6ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xdaee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xdeee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xe2ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xe6ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xeaee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xeeee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xf2ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xf6ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xfaee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_removehandler(0xfeee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+}
 
 static void
 mach_io_set(mach_t *mach)
@@ -5645,6 +6971,7 @@ mach_io_set(mach_t *mach)
     io_sethandler(0x7eee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0x82ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0x86ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_sethandler(0x8aee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0x8eee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0x92ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0x96ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
@@ -5667,9 +6994,11 @@ mach_io_set(mach_t *mach)
     io_sethandler(0xdeee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0xe2ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0xe6ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_sethandler(0xeaee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0xeeee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0xf2ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0xf6ee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
+    io_sethandler(0xfaee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
     io_sethandler(0xfeee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
 }
 
@@ -5691,7 +7020,8 @@ mach_mca_write(int port, uint8_t val, void *priv)
         return;
 
     mach->pos_regs[port & 7] = val;
-    mach_log("[%04X]: MCA write port = %x, val = %02x, biosaddr = %05x.\n", CS, port & 7, mach->pos_regs[port & 7], (((mach->pos_regs[3] & 0x3e) << 0x0c) >> 1) + 0xc0000);
+    mach_log("[%04X]: MCA write port = %x, val = %02x, biosaddr = %05x.\n",
+             CS, port & 7, mach->pos_regs[port & 7], (((mach->pos_regs[3] & 0x3e) << 0x0c) >> 1) + 0xc0000);
     mem_mapping_disable(&mach->bios_rom.mapping);
     mem_mapping_disable(&mach->bios_rom2.mapping);
     if (mach->pos_regs[2] & 0x01) {
@@ -5716,16 +7046,12 @@ mach_mca_reset(void *priv)
     svga_t    *svga = &mach->svga;
     ibm8514_t *dev  = (ibm8514_t *) svga->dev8514;
 
-    mem_mapping_disable(&mach->bios_rom.mapping);
-    mem_mapping_disable(&mach->bios_rom2.mapping);
     mach_log("MCA reset.\n");
-    dev->on[0] = 0;
-    dev->on[1] = 0;
-    vga_on = 1;
+    dev->on = 0;
     mach_mca_write(0x102, 0, mach);
+    svga_set_poll(svga);
 }
 
-#ifdef ATI_8514_ULTRA
 uint8_t
 ati8514_mca_read(int port, void *priv)
 {
@@ -5745,13 +7071,19 @@ ati8514_mca_write(int port, uint8_t val, void *priv)
         return;
 
     dev->pos_regs[port & 7] = val;
-    mach_log("[%04X]: MCA write port = %x, val = %02x, biosaddr = %05x.\n", CS, port & 7, dev->pos_regs[port & 7], (((dev->pos_regs[3] & 0x3e) << 0x0c) >> 1) + 0xc0000);
+    mach_log("[%04X]: MCA write port = %x, val = %02x, biosaddr = %05x.\n",
+             CS, port & 7, dev->pos_regs[port & 7], (((dev->pos_regs[3] & 0x3e) << 0x0c) >> 1) + 0xc0000);
     mem_mapping_disable(&dev->bios_rom.mapping);
 
     if (dev->pos_regs[2] & 0x01)
         mem_mapping_enable(&dev->bios_rom.mapping);
 }
-#endif
+
+void
+ati8514_pos_write(uint16_t port, uint8_t val, void *priv)
+{
+    ati8514_mca_write(port, val, priv);
+}
 
 static uint8_t
 mach32_pci_read(UNUSED(int func), int addr, void *priv)
@@ -5843,13 +7175,21 @@ mach32_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
         case PCI_REG_COMMAND:
             mach->pci_regs[PCI_REG_COMMAND] = val & 0x27;
             if (val & PCI_COMMAND_IO) {
+                mach_log("Remove and set handlers.\n");
+                io_removehandler(0x01ce, 2,  mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
                 io_removehandler(0x02ea, 4,  mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
                 io_removehandler(0x03c0, 32, mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
+                mach_io_remove(mach);
+                io_sethandler(0x01ce, 2,  mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
                 io_sethandler(0x02ea, 4,  mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
                 io_sethandler(0x03c0, 32, mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
+                mach_io_set(mach);
             } else {
+                mach_log("Remove handlers.\n");
+                io_removehandler(0x01ce, 2,  mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
                 io_removehandler(0x02ea, 4,  mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
                 io_removehandler(0x03c0, 32, mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
+                mach_io_remove(mach);
             }
             mach32_updatemapping(mach, &mach->svga);
             break;
@@ -5886,6 +7226,131 @@ mach32_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
     }
 }
 
+static void
+mach_vblank_start(mach_t *mach, svga_t *svga)
+{
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+
+    dev->subsys_stat |= INT_VSY;
+}
+
+static void
+mach_combo_vblank_start(void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    mach_t *mach = (mach_t *) svga->priv;
+
+    mach_vblank_start(mach, svga);
+}
+
+static void
+ati8514_vblank_start(void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    mach_t *mach = (mach_t *) svga->ext8514;
+
+    mach_vblank_start(mach, svga);
+}
+
+static void
+mach_combo_accel_out_fifo(void *priv, uint16_t port, uint16_t val, int len)
+{
+    mach_t *mach = (mach_t *) priv;
+    svga_t *svga = &mach->svga;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+
+    mach_log("Accel OUT Combo=%04x, val=%04x, len=%d.\n", port, val, len);
+    mach_accel_out_fifo(mach, svga, dev, port, val, len);
+}
+
+static void
+ati8514_accel_out_fifo(void *priv, uint16_t port, uint16_t val, int len)
+{
+    svga_t *svga = (svga_t *) priv;
+    mach_t *mach = (mach_t *) svga->ext8514;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+
+    mach_accel_out_fifo(mach, svga, dev, port, val, len);
+}
+
+static void
+mach_disable_handlers(mach_t *mach)
+{
+    if (mach->pci_bus) {
+        io_removehandler(0x01ce, 2,  mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
+        io_removehandler(0x02ea, 4,  mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
+        io_removehandler(0x03c0, 32, mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
+        mach_io_remove(mach);
+    }
+
+    mem_mapping_disable(&mach->mmio_linear_mapping);
+    mem_mapping_disable(&mach->svga.mapping);
+    if (mach->pci_bus && mach->has_bios)
+        mem_mapping_disable(&mach->bios_rom.mapping);
+
+    /* Save all the mappings and the timers because they are part of linked lists. */
+    reset_state->mmio_linear_mapping = mach->mmio_linear_mapping;
+    reset_state->svga.mapping        = mach->svga.mapping;
+    reset_state->bios_rom.mapping    = mach->bios_rom.mapping;
+
+    reset_state->svga.timer          = mach->svga.timer;
+}
+
+static void
+mach_reset(void *priv)
+{
+    mach_t *mach = (mach_t *) priv;
+    svga_t *svga = &mach->svga;
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+
+    if (reset_state != NULL) {
+        dev->on = 0;
+        dev->vendor_mode = 0;
+        dev->_8514on = 0;
+        dev->_8514crt = 0;
+        mach_disable_handlers(mach);
+        mach->force_busy      = 0;
+        dev->force_busy       = 0;
+        dev->force_busy2      = 0;
+        if (mach->pci_bus)
+            reset_state->pci_slot = mach->pci_slot;
+
+        *mach = *reset_state;
+    }
+}
+
+uint8_t
+ati8514_rom_readb(uint32_t addr, void *priv)
+{
+    const ibm8514_t *dev = (ibm8514_t *) priv;
+    const rom_t  *rom = &dev->bios_rom;
+    uint8_t ret;
+
+    mach_log("ROM1RB=%05x, ", addr);
+
+    addr &= 0x1fff;
+    ret = rom->rom[addr];
+
+    mach_log("ReadBAddr1=%03x, ret=%02x.\n", addr, ret);
+    return (ret);
+}
+
+uint16_t
+ati8514_rom_readw(uint32_t addr, void *priv)
+{
+    const ibm8514_t *dev = (ibm8514_t *) priv;
+    const rom_t  *rom = &dev->bios_rom;
+    uint16_t ret;
+
+    mach_log("ROM1RW=%05x, ", addr);
+
+    addr &= 0x1fff;
+    ret = (*(uint16_t *) &(rom->rom[addr]));
+
+    mach_log("ReadWAddr1=%03x, ret=%04x.\n", addr, ret);
+    return (ret);
+}
+
 static void *
 mach8_init(const device_t *info)
 {
@@ -5894,6 +7359,7 @@ mach8_init(const device_t *info)
     ibm8514_t *dev;
 
     mach             = calloc(1, sizeof(mach_t));
+    reset_state      = calloc(1, sizeof(mach_t));
 
     svga             = &mach->svga;
     dev              = (ibm8514_t *) calloc(1, sizeof(ibm8514_t));
@@ -5906,10 +7372,11 @@ mach8_init(const device_t *info)
     dev->type        = info->flags;
     dev->local       = info->local & 0xff;
     mach->has_bios   = !(info->local & 0xff00);
-    mach->memory     = device_get_config_int("memory");
-    mach->ramdac_type = mach->pci_bus ? device_get_config_int("ramdac") : 1;
+    mach->ramdac_type = mach->pci_bus ? device_get_config_int("ramdac") : ATI_68875;
+    dev->vram_amount = device_get_config_int("memory");
+    dev->vram_512k_8514 = dev->vram_amount == 512;
 
-    if ((dev->local & 0xff) >= 0x02) {
+    if (ATI_MACH32) {
         if (mach->pci_bus) {
             if (mach->has_bios) {
                 rom_init(&mach->bios_rom,
@@ -5944,19 +7411,19 @@ mach8_init(const device_t *info)
                  0xc0000, 0x8000, 0x7fff,
                  0, MEM_MAPPING_EXTERNAL);
 
-    if ((dev->local & 0xff) >= 0x02) {
-        svga_init(info, svga, mach, mach->memory << 10, /*default: 2MB for Mach32*/
+    if (ATI_MACH32) {
+        svga_init(info, svga, mach, dev->vram_amount << 10, /*default: 2MB for Mach32*/
                       mach_recalctimings,
                       mach_in, mach_out,
                       mach32_hwcursor_draw,
                       NULL);
-        dev->vram_size   = mach->memory << 10;
+        dev->vram_size   = dev->vram_amount << 10;
         dev->vram        = calloc(dev->vram_size, 1);
-        dev->changedvram = calloc(dev->vram_size >> 12, 1);
+        dev->changedvram = calloc((dev->vram_size >> 12) + 1, 1);
         dev->vram_mask   = dev->vram_size - 1;
         dev->hwcursor.cur_ysize = 64;
         mach->config1 = 0x20;
-        if (mach->pci_bus && !mach->ramdac_type)
+        if (mach->pci_bus && (mach->ramdac_type == ATI_68860))
             svga->ramdac = device_add(&ati68860_ramdac_device);
         else
             svga->ramdac = device_add(&ati68875_ramdac_device);
@@ -5967,7 +7434,7 @@ mach8_init(const device_t *info)
             else
                 mach->config1 |= 0x0c;
             mach->config1 |= 0x0400;
-            svga->clock_gen = device_add(&ati18811_0_device);
+            svga->clock_gen = device_add(&ati18811_1_mach32_device);
         } else if (mach->mca_bus) {
             video_inform(VIDEO_FLAG_TYPE_8514, &timing_mach32_mca);
             if (is286 && !is386)
@@ -5975,43 +7442,50 @@ mach8_init(const device_t *info)
             else
                 mach->config1 |= 0x06;
             mach->config1 |= 0x0400;
-            svga->clock_gen = device_add(&ati18811_1_device);
+            svga->clock_gen = device_add(&ati18811_1_mach32_device);
         } else if (mach->pci_bus) {
             video_inform(VIDEO_FLAG_TYPE_8514, &timing_mach32_pci);
             mach->config1 |= 0x0e;
-            if (mach->ramdac_type)
-                mach->config1 |= 0x0400;
-            else
+            if (mach->ramdac_type == ATI_68860)
                 mach->config1 |= 0x0a00;
+            else
+                mach->config1 |= 0x0400;
             mach->config2 |= 0x2000;
-            svga->clock_gen = device_add(&ati18811_0_device);
+            svga->clock_gen = device_add(&ati18811_1_mach32_device);
         } else {
             video_inform(VIDEO_FLAG_TYPE_8514, &timing_gfxultra_isa);
             mach->config1 |= 0x0400;
-            svga->clock_gen = device_add(&ati18811_0_device);
+            svga->clock_gen = device_add(&ati18811_1_mach32_device);
         }
         mem_mapping_add(&mach->mmio_linear_mapping, 0, 0, mach32_ap_readb, mach32_ap_readw, mach32_ap_readl, mach32_ap_writeb, mach32_ap_writew, mach32_ap_writel, NULL, MEM_MAPPING_EXTERNAL, mach);
         mem_mapping_disable(&mach->mmio_linear_mapping);
+
+        mem_mapping_set_handler(&svga->mapping, svga_read, svga_readw, svga_readl, mach32_svga_write, mach32_svga_writew, mach32_svga_writel);
     } else {
         svga_init(info, svga, mach, (512 << 10), /*default: 512kB VGA for 28800-6 + 1MB for Mach8*/
                       mach_recalctimings,
                       mach_in, mach_out,
                       NULL,
                       NULL);
-        dev->vram_size   = (1024 << 10);
+        dev->vram_size   = (dev->vram_amount << 10);
         dev->vram        = calloc(dev->vram_size, 1);
-        dev->changedvram = calloc(dev->vram_size >> 12, 1);
+        dev->changedvram = calloc((dev->vram_size >> 12) + 1, 1);
         dev->vram_mask   = dev->vram_size - 1;
         video_inform(VIDEO_FLAG_TYPE_8514, &timing_gfxultra_isa);
-        mach->config1 = 0x01 | 0x02 | 0x20 | 0x08 | 0x80;
-        mach->config2 = 0x02;
-        svga->clock_gen = device_add(&ati18810_device);
-    }
-    dev->bpp = 0;
-    svga->getclock  = ics2494_getclock;
+        mach->config1 = 0x01 | 0x08 | 0x80;
+        if (dev->vram_amount >= 1024)
+            mach->config1 |= 0x20;
 
-    dev->on[0] = 0;
-    dev->on[1] = 0;
+        mach->config2 = 0x02;
+        svga->clock_gen = device_add(&ati18811_1_mach32_device);
+    }
+    dev->bpp            = 0;
+    svga->getclock      = ics2494_getclock;
+    svga->clock_gen8514 = svga->clock_gen;
+    svga->getclock8514  = svga->getclock;
+
+    dev->on = 0;
+    dev->pitch = 1024;
     dev->ext_pitch = 1024;
     dev->ext_crt_pitch = 0x80;
     dev->accel_bpp = 8;
@@ -6024,13 +7498,15 @@ mach8_init(const device_t *info)
     io_sethandler(0x03c0, 32, mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
     io_sethandler(0x02ea, 4,  mach_in, NULL, NULL, mach_out, NULL, NULL, mach);
     mach_io_set(mach);
+    mach->accel.cmd_type = -2;
+    dev->accel.cmd_back = 1;
+    dev->mode = IBM_MODE;
 
-    if ((dev->local & 0xff) >= 0x02) {
+    if (ATI_MACH32) {
         svga->decode_mask     = (4 << 20) - 1;
         mach->cursor_col_1    = 0xff;
         mach->ext_cur_col_1_r = 0xff;
         mach->ext_cur_col_1_g = 0xff;
-        io_sethandler(0xfaee, 0x0002, mach_accel_inb, mach_accel_inw, mach_accel_inl, mach_accel_outb, mach_accel_outw, mach_accel_outl, mach);
         if (mach->vlb_bus)
             ati_eeprom_load(&mach->eeprom, "mach32_vlb.nvr", 1);
         else if (mach->mca_bus) {
@@ -6048,48 +7524,66 @@ mach8_init(const device_t *info)
             } else
                 pci_add_card(PCI_ADD_VIDEO, mach32_pci_read, mach32_pci_write, mach, &mach->pci_slot);
 
-            mach->pci_regs[PCI_REG_COMMAND] = 0x83;
+            mach->pci_regs[PCI_REG_COMMAND] = 0x87;
             mach->pci_regs[0x30]            = 0x00;
             mach->pci_regs[0x32]            = 0x0c;
             mach->pci_regs[0x33]            = 0x00;
         } else
             ati_eeprom_load(&mach->eeprom, "mach32.nvr", 1);
     } else
-        ati_eeprom_load_mach8(&mach->eeprom, "mach8.nvr");
+        ati_eeprom_load_mach8_vga(&mach->eeprom, "mach8.nvr");
 
-    timer_add(&svga->timer8514, ibm8514_poll, svga, 0);
+    dev->accel_out_fifo       = mach_combo_accel_out_fifo;
+    dev->vblank_start         = mach_combo_vblank_start;
+
+    *reset_state = *mach;
 
     return mach;
 }
 
-#ifdef ATI_8514_ULTRA
 void
 ati8514_init(svga_t *svga, void *ext8514, void *dev8514)
 {
-    mach_t *mach = (mach_t *)ext8514;
-    ibm8514_t *dev = (ibm8514_t *)dev8514;
+    mach_t *mach = (mach_t *) ext8514;
+    ibm8514_t *dev = (ibm8514_t *) dev8514;
 
-    dev->on[0] = 0;
-    dev->on[1] = 0;
+    /*Init as 1024x768 87hz interlaced first, per 8514/A.*/
+    dev->on = 0;
+    dev->pitch = 1024;
     dev->ext_pitch = 1024;
     dev->ext_crt_pitch = 0x80;
     dev->accel_bpp = 8;
     dev->rowoffset = 0x80;
-    dev->hdisp = 1024;
-    dev->vdisp = 768;
+    dev->hdisped = 0x7f;
+    dev->v_disp = 0x05ff;
+    dev->htotal = 0x9d;
+    dev->v_total_reg = 0x0668;
+    dev->v_sync_start = 0x0600;
+    dev->disp_cntl = 0x33;
+    mach->accel.clock_sel = 0x1c;
+    dev->accel.cmd_back = 1;
+    dev->mode = IBM_MODE;
 
     io_sethandler(0x02ea, 4, ati8514_in, NULL, NULL, ati8514_out, NULL, NULL, svga);
     ati8514_io_set(svga);
+    mach->accel.cmd_type = -2;
     mach->mca_bus = !!(dev->type & DEVICE_MCA);
 
+    mach->config1 = 0x08 | 0x80;
+
     if (mach->mca_bus)
-        mach->config1 = 0x02 | 0x04 | 0x08 | 0x20 | 0x80;
-    else
-        mach->config1 = 0x02 | 0x08 | 0x20 | 0x80;
+        mach->config1 |= 0x04;
+
+    if (dev->vram_amount >= 1024)
+        mach->config1 |= 0x20;
 
     mach->config2 = 0x01 | 0x02;
+
+    dev->accel_out_fifo       = ati8514_accel_out_fifo;
+    dev->vblank_start         = ati8514_vblank_start;
+    svga->clock_gen8514       = device_add(&ati18811_1_mach32_device);
+    svga->getclock8514        = ics2494_getclock;
 }
-#endif
 
 static int
 mach8_vga_available(void)
@@ -6136,6 +7630,10 @@ mach_close(void *priv)
     }
 
     svga_close(svga);
+
+    free(reset_state);
+    reset_state = NULL;
+
     free(mach);
 }
 
@@ -6158,173 +7656,163 @@ mach_force_redraw(void *priv)
 }
 
 // clang-format off
+static const device_config_t mach8_config[] = {
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1024,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "512 KB", .value =  512 },
+            { .description = "1 MB",   .value = 1024 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
 static const device_config_t mach32_config[] = {
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 2048,
-        .selection = {
-            {
-                .description = "512 KB",
-                .value = 512
-            },
-            {
-                .description = "1 MB",
-                .value = 1024
-            },
-            {
-                .description = "2 MB",
-                .value = 2048
-            },
-            {
-                .description = "4 MB",
-                .value = 4096
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2048,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "512 KB", .value =  512 },
+            { .description = "1 MB",   .value = 1024 },
+            { .description = "2 MB",   .value = 2048 },
+            { .description = "4 MB",   .value = 4096 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
-// clang-format off
 static const device_config_t mach32_pci_config[] = {
     {
-        .name = "ramdac",
-        .description = "RAMDAC type",
-        .type = CONFIG_SELECTION,
-        .default_int = 0,
-        .selection = {
-            {
-                .description = "ATI 68860",
-                .value = 0
-            },
-            {
-                .description = "ATI 68875",
-                .value = 1
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "ramdac",
+        .description    = "RAMDAC type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = ATI_68860,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "ATI 68860", .value = ATI_68860 },
+            { .description = "ATI 68875", .value = ATI_68875 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 2048,
-        .selection = {
-            {
-                .description = "512 KB",
-                .value = 512
-            },
-            {
-                .description = "1 MB",
-                .value = 1024
-            },
-            {
-                .description = "2 MB",
-                .value = 2048
-            },
-            {
-                .description = "4 MB",
-                .value = 4096
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2048,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "512 KB", .value =  512 },
+            { .description = "1 MB",   .value = 1024 },
+            { .description = "2 MB",   .value = 2048 },
+            { .description = "4 MB",   .value = 4096 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
+// clang-format on
 
 const device_t mach8_vga_isa_device = {
-    .name = "ATI Mach8 (ATI Graphics Ultra) (ISA)",
+    .name          = "ATI Mach8 (ATI Graphics Ultra) (ISA)",
     .internal_name = "mach8_vga_isa",
-    .flags = DEVICE_ISA,
-    .local = 1,
-    .init = mach8_init,
-    .close = mach_close,
-    .reset = NULL,
-    { .available = mach8_vga_available },
+    .flags         = DEVICE_ISA,
+    .local         = ATI_38800_TYPE,
+    .init          = mach8_init,
+    .close         = mach_close,
+    .reset         = mach_reset,
+    .available     = mach8_vga_available,
     .speed_changed = mach_speed_changed,
-    .force_redraw = mach_force_redraw,
-    .config = NULL
+    .force_redraw  = mach_force_redraw,
+    .config        = mach8_config
 };
 
 const device_t mach32_isa_device = {
-    .name = "ATI Mach32 (ISA)",
+    .name          = "ATI Mach32 (ISA)",
     .internal_name = "mach32_isa",
-    .flags = DEVICE_ISA,
-    .local = 2,
-    .init = mach8_init,
-    .close = mach_close,
-    .reset = NULL,
-    { .available = mach32_isa_available },
+    .flags         = DEVICE_ISA,
+    .local         = ATI_68800_TYPE,
+    .init          = mach8_init,
+    .close         = mach_close,
+    .reset         = mach_reset,
+    .available     = mach32_isa_available,
     .speed_changed = mach_speed_changed,
-    .force_redraw = mach_force_redraw,
-    .config = mach32_config
+    .force_redraw  = mach_force_redraw,
+    .config        = mach32_config
 };
 
 const device_t mach32_vlb_device = {
-    .name = "ATI Mach32 (VLB)",
+    .name          = "ATI Mach32 (VLB)",
     .internal_name = "mach32_vlb",
-    .flags = DEVICE_VLB,
-    .local = 2,
-    .init = mach8_init,
-    .close = mach_close,
-    .reset = NULL,
-    { .available = mach32_vlb_available },
+    .flags         = DEVICE_VLB,
+    .local         = ATI_68800_TYPE,
+    .init          = mach8_init,
+    .close         = mach_close,
+    .reset         = mach_reset,
+    .available     = mach32_vlb_available,
     .speed_changed = mach_speed_changed,
-    .force_redraw = mach_force_redraw,
-    .config = mach32_config
+    .force_redraw  = mach_force_redraw,
+    .config        = mach32_config
 };
 
 const device_t mach32_mca_device = {
-    .name = "ATI Mach32 (MCA)",
+    .name          = "ATI Mach32 (MCA)",
     .internal_name = "mach32_mca",
-    .flags = DEVICE_MCA,
-    .local = 2,
-    .init = mach8_init,
-    .close = mach_close,
-    .reset = NULL,
-    { .available = mach32_mca_available },
+    .flags         = DEVICE_MCA,
+    .local         = ATI_68800_TYPE,
+    .init          = mach8_init,
+    .close         = mach_close,
+    .reset         = mach_reset,
+    .available     = mach32_mca_available,
     .speed_changed = mach_speed_changed,
-    .force_redraw = mach_force_redraw,
-    .config = mach32_config
+    .force_redraw  = mach_force_redraw,
+    .config        = mach32_config
 };
 
 const device_t mach32_pci_device = {
-    .name = "ATI Mach32 (PCI)",
+    .name          = "ATI Mach32 (PCI)",
     .internal_name = "mach32_pci",
-    .flags = DEVICE_PCI,
-    .local = 2,
-    .init = mach8_init,
-    .close = mach_close,
-    .reset = NULL,
-    { .available = mach32_pci_available },
+    .flags         = DEVICE_PCI,
+    .local         = ATI_68800_TYPE,
+    .init          = mach8_init,
+    .close         = mach_close,
+    .reset         = mach_reset,
+    .available     = mach32_pci_available,
     .speed_changed = mach_speed_changed,
-    .force_redraw = mach_force_redraw,
-    .config = mach32_pci_config
+    .force_redraw  = mach_force_redraw,
+    .config        = mach32_pci_config
 };
 
 const device_t mach32_onboard_pci_device = {
-    .name = "ATI Mach32 (PCI) On-Board",
+    .name          = "ATI Mach32 (PCI) On-Board",
     .internal_name = "mach32_pci_onboard",
-    .flags = DEVICE_PCI,
-    .local = 2 | 0x100,
-    .init = mach8_init,
-    .close = mach_close,
-    .reset = NULL,
-    { .available = NULL },
+    .flags         = DEVICE_PCI,
+    .local         = ATI_68800_TYPE | 0x100,
+    .init          = mach8_init,
+    .close         = mach_close,
+    .reset         = mach_reset,
+    .available     = NULL,
     .speed_changed = mach_speed_changed,
-    .force_redraw = mach_force_redraw,
-    .config = mach32_pci_config
+    .force_redraw  = mach_force_redraw,
+    .config        = mach32_pci_config
 };
-
diff --git a/src/video/vid_bochs_vbe.c b/src/video/vid_bochs_vbe.c
new file mode 100644
index 000000000..0ea268ef7
--- /dev/null
+++ b/src/video/vid_bochs_vbe.c
@@ -0,0 +1,966 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Bochs VBE SVGA emulation.
+ *
+ *          Uses code from libxcvt to calculate CRTC timings.
+ *
+ * Authors: Cacodemon345
+ *          The Bochs Project
+ *          Fabrice Bellard
+ *          The libxcvt authors
+ *
+ *          Copyright 2024 Cacodemon345
+ *          Copyright 2003 Fabrice Bellard
+ *          Copyright 2002-2024 The Bochs Project
+ *          Copyright 2002-2003 Mike Nordell
+ *          Copyright 2000-2021 The libxcvt authors
+ *
+ *          See https://gitlab.freedesktop.org/xorg/lib/libxcvt/-/blob/master/COPYING for libxcvt license details
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/io.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/device.h>
+#include <86box/timer.h>
+#include <86box/video.h>
+#include <86box/vid_svga.h>
+#include <86box/vid_svga_render.h>
+#include <86box/pci.h>
+#include <86box/i2c.h>
+#include <86box/vid_ddc.h>
+
+#define VBE_DISPI_BANK_SIZE_KB           64
+#define VBE_DISPI_BANK_GRANULARITY_KB    32
+
+#define VBE_DISPI_MAX_XRES               1920
+#define VBE_DISPI_MAX_YRES               1600
+
+#define VBE_DISPI_IOPORT_INDEX           0x01CE
+#define VBE_DISPI_IOPORT_DATA            0x01CF
+
+#define VBE_DISPI_INDEX_ID               0x0
+#define VBE_DISPI_INDEX_XRES             0x1
+#define VBE_DISPI_INDEX_YRES             0x2
+#define VBE_DISPI_INDEX_BPP              0x3
+#define VBE_DISPI_INDEX_ENABLE           0x4
+#define VBE_DISPI_INDEX_BANK             0x5
+#define VBE_DISPI_INDEX_VIRT_WIDTH       0x6
+#define VBE_DISPI_INDEX_VIRT_HEIGHT      0x7
+#define VBE_DISPI_INDEX_X_OFFSET         0x8
+#define VBE_DISPI_INDEX_Y_OFFSET         0x9
+#define VBE_DISPI_INDEX_VIDEO_MEMORY_64K 0xa
+#define VBE_DISPI_INDEX_DDC              0xb
+
+#define VBE_DISPI_ID0                    0xB0C0
+#define VBE_DISPI_ID1                    0xB0C1
+#define VBE_DISPI_ID2                    0xB0C2
+#define VBE_DISPI_ID3                    0xB0C3
+#define VBE_DISPI_ID4                    0xB0C4
+#define VBE_DISPI_ID5                    0xB0C5
+
+#define VBE_DISPI_DISABLED               0x00
+#define VBE_DISPI_ENABLED                0x01
+#define VBE_DISPI_GETCAPS                0x02
+#define VBE_DISPI_BANK_GRANULARITY_32K   0x10
+#define VBE_DISPI_8BIT_DAC               0x20
+#define VBE_DISPI_LFB_ENABLED            0x40
+#define VBE_DISPI_NOCLEARMEM             0x80
+
+#define VBE_DISPI_BANK_WR                0x4000
+#define VBE_DISPI_BANK_RD                0x8000
+#define VBE_DISPI_BANK_RW                0xc000
+
+
+typedef struct vbe_mode_info_t {
+    uint32_t                hdisplay;
+    uint32_t                vdisplay;
+    float                   vrefresh;
+    float                   hsync;
+    uint64_t                dot_clock;
+    uint16_t                hsync_start;
+    uint16_t                hsync_end;
+    uint16_t                htotal;
+    uint16_t                vsync_start;
+    uint16_t                vsync_end;
+    uint16_t                vtotal;
+} vbe_mode_info_t;
+
+static video_timings_t timing_bochs  = { .type = VIDEO_PCI, .write_b = 2, .write_w = 2, .write_l = 1, .read_b = 20, .read_w = 20, .read_l = 21 };
+
+typedef struct bochs_vbe_t {
+    svga_t        svga;
+
+    uint8_t       pci_conf_status;
+    uint8_t       pci_rom_enable;
+    uint8_t       pci_line_interrupt;
+    uint8_t       slot;
+
+    uint8_t       pci_regs[256];
+
+    uint16_t      vbe_index;
+    uint16_t      bank_gran;
+    uint16_t      rom_addr;
+    uint16_t      id5_val;
+
+    uint16_t      vbe_regs[16];
+
+    uint32_t      vram_size;
+
+    rom_t         bios_rom;
+
+    mem_mapping_t linear_mapping;
+    mem_mapping_t linear_mapping_2;
+    uint32_t      ma_latch_old;
+
+    void *        i2c;
+    void *        ddc;
+} bochs_vbe_t;
+
+static bochs_vbe_t *reset_state = NULL;
+
+static void
+gen_mode_info(int hdisplay, int vdisplay, float vrefresh, vbe_mode_info_t* mode_info)
+{
+    int   vsync;
+    int   vsync_and_back_porch;
+
+    mode_info->hdisplay = hdisplay;
+    mode_info->vdisplay = vdisplay;
+    mode_info->vrefresh = vrefresh;
+
+    /* 1) top/bottom margin size (% of height) - default: 1.8 */
+#define CVT_MARGIN_PERCENTAGE 1.8
+
+    /* 2) character cell horizontal granularity (pixels) - default 8 */
+#define CVT_H_GRANULARITY 8
+
+    /* 4) Minimum vertical front porch (lines) - default 3 */
+#define CVT_MIN_V_PORCH_RND 3
+
+    /* 4) Minimum number of vertical back porch lines - default 6 */
+#define CVT_MIN_V_BPORCH 6
+
+    /* Pixel Clock step (kHz) */
+#define CVT_CLOCK_STEP 250
+
+    /* CVT default is 60.0Hz */
+    if (!mode_info->vrefresh)
+        mode_info->vrefresh = 60.0;
+
+    /* 1. Required field rate */
+    const float vfield_rate = mode_info->vrefresh;
+
+    /* 2. Horizontal pixels */
+    const int hdisplay_rnd  = mode_info->hdisplay - (mode_info->hdisplay % CVT_H_GRANULARITY);
+
+    /* 3. Determine left and right borders */
+    const int   hmargin     = 0;
+
+    /* 4. Find total active pixels */
+    mode_info->hdisplay     = hdisplay_rnd + (2 * hmargin);
+
+    /* 5. Find number of lines per field */
+    const int vdisplay_rnd  = mode_info->vdisplay;
+
+    /* 6. Find top and bottom margins */
+    const  int   vmargin    = 0;
+
+    mode_info->vdisplay     = mode_info->vdisplay + 2 * vmargin;
+
+    /* 7. interlace */
+    /* Please rename this */
+    const float interlace   = 0.0;
+
+    /* Determine vsync Width from aspect ratio */
+    if (!(mode_info->vdisplay % 3) && ((mode_info->vdisplay * 4 / 3) == mode_info->hdisplay))
+        vsync = 4;
+    else if (!(mode_info->vdisplay % 9) &&
+             ((mode_info->vdisplay * 16 / 9) == mode_info->hdisplay))
+        vsync = 5;
+    else if (!(mode_info->vdisplay % 10) &&
+             ((mode_info->vdisplay * 16 / 10) == mode_info->hdisplay))
+        vsync = 6;
+    else if (!(mode_info->vdisplay % 4) &&
+             ((mode_info->vdisplay * 5 / 4) == mode_info->hdisplay))
+        vsync = 7;
+    else if (!(mode_info->vdisplay % 9) &&
+             ((mode_info->vdisplay * 15 / 9) == mode_info->hdisplay))
+        vsync = 7;
+    else    /* Custom */
+        vsync = 10;
+
+    /* Simplified GTF calculation. */
+
+    /* 4) Minimum time of vertical sync + back porch interval (µs)
+     * default 550.0 */
+#define CVT_MIN_VSYNC_BP 550.0
+
+    /* 3) Nominal HSync width (% of line period) - default 8 */
+#define CVT_HSYNC_PERCENTAGE 8
+
+    /* 8. Estimated Horizontal period */
+    const float hperiod = ((float) (1000000.0 / vfield_rate - CVT_MIN_VSYNC_BP)) /
+                          (vdisplay_rnd + 2 * vmargin + CVT_MIN_V_PORCH_RND + interlace);
+
+    /* 9. Find number of lines in sync + backporch */
+    if (((int) (CVT_MIN_VSYNC_BP / hperiod) + 1) < (vsync + CVT_MIN_V_BPORCH))
+        vsync_and_back_porch = vsync + CVT_MIN_V_BPORCH;
+    else
+        vsync_and_back_porch = (int) (CVT_MIN_VSYNC_BP / hperiod) + 1;
+
+    /* 10. Find number of lines in back porch */
+
+    /* 11. Find total number of lines in vertical field */
+    mode_info->vtotal = vdisplay_rnd + (2 * vmargin) + vsync_and_back_porch + interlace +
+                        CVT_MIN_V_PORCH_RND;
+
+    /* 5) Definition of Horizontal blanking time limitation */
+    /* Gradient (%/kHz) - default 600 */
+#define CVT_M_FACTOR 600
+
+    /* Offset (%) - default 40 */
+#define CVT_C_FACTOR 40
+
+    /* Blanking time scaling factor - default 128 */
+#define CVT_K_FACTOR 128
+
+    /* Scaling factor weighting - default 20 */
+#define CVT_J_FACTOR 20
+
+#define CVT_M_PRIME CVT_M_FACTOR * CVT_K_FACTOR / 256
+#define CVT_C_PRIME (CVT_C_FACTOR - CVT_J_FACTOR) * CVT_K_FACTOR / 256 + \
+        CVT_J_FACTOR
+
+    /* 12. Find ideal blanking duty cycle from formula */
+    float hblank_percentage = CVT_C_PRIME - CVT_M_PRIME * hperiod / 1000.0;
+
+        /* 13. Blanking time */
+    if (hblank_percentage < 20)
+        hblank_percentage = 20;
+
+    int hblank = mode_info->hdisplay * hblank_percentage / (100.0 - hblank_percentage);
+    hblank -= hblank % (2 * CVT_H_GRANULARITY);
+
+    /* 14. Find total number of pixels in a line. */
+    mode_info->htotal = mode_info->hdisplay + hblank;
+
+    /* Fill in HSync values */
+    mode_info->hsync_end = mode_info->hdisplay + hblank / 2;
+
+    int hsync_w = (mode_info->htotal * CVT_HSYNC_PERCENTAGE) / 100;
+    hsync_w -= hsync_w % CVT_H_GRANULARITY;
+    mode_info->hsync_start = mode_info->hsync_end - hsync_w;
+
+    /* Fill in vsync values */
+    mode_info->vsync_start = mode_info->vdisplay + CVT_MIN_V_PORCH_RND;
+    mode_info->vsync_end = mode_info->vsync_start + vsync;
+
+    /* 15/13. Find pixel clock frequency (kHz for xf86) */
+    mode_info->dot_clock = mode_info->htotal * 1000.0 / hperiod;
+    mode_info->dot_clock -= mode_info->dot_clock % CVT_CLOCK_STEP;
+
+    /* 16/14. Find actual Horizontal Frequency (kHz) */
+    mode_info->hsync = ((float) mode_info->dot_clock) / ((float) mode_info->htotal);
+
+    /* 17/15. Find actual Field rate */
+    mode_info->vrefresh = (1000.0 * ((float) mode_info->dot_clock)) /
+                          ((float) (mode_info->htotal * mode_info->vtotal));
+
+    /* 18/16. Find actual vertical frame frequency */
+    /* ignore - we don't do interlace here */
+}
+
+void
+bochs_vbe_recalctimings(svga_t* svga)
+{
+    bochs_vbe_t *dev  = (bochs_vbe_t *) svga->priv;
+
+    if (dev->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED) {
+        vbe_mode_info_t mode = { 0 };
+        svga->bpp = dev->vbe_regs[VBE_DISPI_INDEX_BPP];
+        dev->vbe_regs[VBE_DISPI_INDEX_XRES] &= ~7;
+        if (dev->vbe_regs[VBE_DISPI_INDEX_XRES] == 0) {
+            dev->vbe_regs[VBE_DISPI_INDEX_XRES] = 8;
+        }
+        if (dev->vbe_regs[VBE_DISPI_INDEX_VIRT_WIDTH] > VBE_DISPI_MAX_XRES)
+            dev->vbe_regs[VBE_DISPI_INDEX_VIRT_WIDTH] = VBE_DISPI_MAX_XRES;
+        if (dev->vbe_regs[VBE_DISPI_INDEX_VIRT_WIDTH] < dev->vbe_regs[VBE_DISPI_INDEX_XRES])
+            dev->vbe_regs[VBE_DISPI_INDEX_VIRT_WIDTH] = dev->vbe_regs[VBE_DISPI_INDEX_XRES];
+        if (dev->vbe_regs[VBE_DISPI_INDEX_X_OFFSET] > VBE_DISPI_MAX_XRES)
+            dev->vbe_regs[VBE_DISPI_INDEX_X_OFFSET] = VBE_DISPI_MAX_XRES;
+        if (dev->vbe_regs[VBE_DISPI_INDEX_Y_OFFSET] > VBE_DISPI_MAX_YRES)
+            dev->vbe_regs[VBE_DISPI_INDEX_Y_OFFSET] = VBE_DISPI_MAX_YRES;
+
+        if (dev->vbe_regs[VBE_DISPI_INDEX_YRES] == 0)
+            dev->vbe_regs[VBE_DISPI_INDEX_YRES] = 1;
+        if (dev->vbe_regs[VBE_DISPI_INDEX_YRES] > VBE_DISPI_MAX_YRES)
+            dev->vbe_regs[VBE_DISPI_INDEX_YRES] = VBE_DISPI_MAX_YRES;
+        gen_mode_info(dev->vbe_regs[VBE_DISPI_INDEX_XRES],
+                      dev->vbe_regs[VBE_DISPI_INDEX_YRES], 72.f, &mode);
+        svga->char_width = 1;
+        svga->dots_per_clock = 1;
+        svga->clock = (cpuclock * (double) (1ULL << 32)) / (mode.dot_clock * 1000.);
+        svga->dispend = mode.vdisplay;
+        svga->hdisp = mode.hdisplay;
+        svga->vsyncstart = mode.vsync_start;
+        svga->vtotal = mode.vtotal;
+        svga->htotal = mode.htotal;
+        svga->hblankstart = mode.hdisplay;
+        svga->hblankend = mode.hdisplay + (mode.htotal - mode.hdisplay - 1);
+        svga->vblankstart = svga->dispend; /* no vertical overscan. */
+        svga->rowcount = 0;
+        svga->hoverride = 1;
+        if (dev->vbe_regs[VBE_DISPI_INDEX_BPP] != 4) {
+            svga->fb_only = 1;
+            svga->adv_flags |= FLAG_NO_SHIFT3;
+        } else {
+            svga->fb_only = 0;
+            svga->adv_flags &= ~FLAG_NO_SHIFT3;
+        }
+
+        svga->bpp = dev->vbe_regs[VBE_DISPI_INDEX_BPP];
+
+        if (svga->bpp == 4) {
+            svga->rowoffset = (dev->vbe_regs[VBE_DISPI_INDEX_VIRT_WIDTH] / 2) >> 3;
+            svga->memaddr_latch  = (dev->vbe_regs[VBE_DISPI_INDEX_Y_OFFSET] * svga->rowoffset) +
+                              (dev->vbe_regs[VBE_DISPI_INDEX_X_OFFSET] >> 3);
+
+            svga->fullchange = 3;
+        } else {
+            svga->rowoffset = dev->vbe_regs[VBE_DISPI_INDEX_VIRT_WIDTH] * ((svga->bpp == 15) ? 2 : (svga->bpp / 8));
+            svga->memaddr_latch = (dev->vbe_regs[VBE_DISPI_INDEX_Y_OFFSET] * svga->rowoffset) +
+                             (dev->vbe_regs[VBE_DISPI_INDEX_X_OFFSET] * ((svga->bpp == 15) ? 2 : (svga->bpp / 8)));
+            svga->fullchange = 3;
+        }
+
+        if (svga->bpp == 4)
+            dev->vbe_regs[VBE_DISPI_INDEX_VIRT_HEIGHT] = (svga->vram_max * 2) / dev->vbe_regs[VBE_DISPI_INDEX_VIRT_WIDTH];
+        else
+            dev->vbe_regs[VBE_DISPI_INDEX_VIRT_HEIGHT] = (svga->vram_max / ((svga->bpp == 15) ? 2 : (svga->bpp / 8))) / dev->vbe_regs[VBE_DISPI_INDEX_VIRT_WIDTH];
+        svga->split = 0xffffff;
+
+        switch (svga->bpp) {
+            case 4:
+                svga->render = svga_render_4bpp_highres;
+                break;
+            default:
+            case 8:
+                svga->render = svga_render_8bpp_clone_highres;
+                break;
+            case 15:
+                svga->render = svga_render_15bpp_highres;
+                break;
+            case 16:
+                svga->render = svga_render_16bpp_highres;
+                break;
+            case 24:
+                svga->render = svga_render_24bpp_highres;
+               break;
+            case 32:
+                svga->render = svga_render_32bpp_highres;
+                break;
+        }
+    } else {
+        svga->fb_only = 0;
+        svga->packed_4bpp = 0;
+        svga->adv_flags &= ~FLAG_NO_SHIFT3;
+        svga->hoverride = 0;
+    }
+}
+
+uint16_t
+bochs_vbe_inw(const uint16_t addr, void *priv)
+{
+    const bochs_vbe_t *dev          = (bochs_vbe_t *) priv;
+    const bool         vbe_get_caps = !!(dev->vbe_regs[VBE_DISPI_INDEX_ENABLE] &
+                                         VBE_DISPI_GETCAPS);
+    uint16_t           ret;
+
+    if (addr == 0x1ce)
+        ret = dev->vbe_index;
+    else  switch (dev->vbe_index) {
+        default:
+            ret = dev->vbe_regs[dev->vbe_index];
+            break;
+        case VBE_DISPI_INDEX_XRES:
+            ret = vbe_get_caps ? VBE_DISPI_MAX_XRES : dev->vbe_regs[dev->vbe_index];
+            break;
+        case VBE_DISPI_INDEX_YRES:
+            ret = vbe_get_caps ? VBE_DISPI_MAX_YRES : dev->vbe_regs[dev->vbe_index];
+            break;
+        case VBE_DISPI_INDEX_BPP:
+            ret = vbe_get_caps ? 32 : dev->vbe_regs[dev->vbe_index];
+            break;
+        case VBE_DISPI_INDEX_VIDEO_MEMORY_64K:
+            ret = dev->vram_size >> 16;
+            break;
+        case VBE_DISPI_INDEX_BANK:
+            ret = vbe_get_caps ? (VBE_DISPI_BANK_GRANULARITY_32K << 8) :
+                                 dev->vbe_regs[dev->vbe_index];
+            break;
+        case VBE_DISPI_INDEX_DDC:
+            if (dev->vbe_regs[dev->vbe_index] & (1 << 7)) {
+                ret = dev->vbe_regs[dev->vbe_index] & ((1 << 7) | 0x3);
+                if ((ret & 0x01) && i2c_gpio_get_scl(dev->i2c))
+                    ret |= 0x04;
+                if ((ret & 0x02) && i2c_gpio_get_sda(dev->i2c))
+                    ret |= 0x08;
+            } else
+                ret = 0x000f;
+            break;
+    }
+
+    return ret;
+}
+
+uint32_t
+bochs_vbe_inl(const uint16_t addr, void *priv)
+{
+    const bochs_vbe_t *dev          = (bochs_vbe_t *) priv;
+    uint32_t           ret;
+
+    if (addr == 0x1ce)
+        ret = dev->vbe_index;
+    else
+        ret = dev->vram_size;
+
+    return ret;
+}
+
+void
+bochs_vbe_outw(const uint16_t addr, const uint16_t val, void *priv)
+{
+    bochs_vbe_t  *dev  = (bochs_vbe_t *) priv;
+
+    if (addr == 0x1ce)
+        dev->vbe_index = val;
+    else if ((addr == 0x1cf) || (addr == 0x1d0))  switch (dev->vbe_index) {
+        default:
+            break;
+        case VBE_DISPI_INDEX_ID:
+            if ((val == VBE_DISPI_ID0) || (val == VBE_DISPI_ID1) ||
+                (val == VBE_DISPI_ID2) || (val == VBE_DISPI_ID3) ||
+                (val == VBE_DISPI_ID4))
+                dev->vbe_regs[dev->vbe_index] = val;
+            else if (val == VBE_DISPI_ID5)
+                dev->vbe_regs[dev->vbe_index] = dev->id5_val;
+            break;
+        case VBE_DISPI_INDEX_XRES:
+        case VBE_DISPI_INDEX_YRES:
+        case VBE_DISPI_INDEX_BPP:
+        case VBE_DISPI_INDEX_VIRT_WIDTH:
+        case VBE_DISPI_INDEX_X_OFFSET:
+        case VBE_DISPI_INDEX_Y_OFFSET:
+            dev->vbe_regs[dev->vbe_index] = val;
+            if (dev->vbe_index == VBE_DISPI_INDEX_X_OFFSET || dev->vbe_index == VBE_DISPI_INDEX_Y_OFFSET) {
+                svga_t *svga = &dev->svga;
+                if (svga->bpp == 4) {
+                    svga->rowoffset = (dev->vbe_regs[VBE_DISPI_INDEX_VIRT_WIDTH] / 2) >> 3;
+                    svga->memaddr_latch  = (dev->vbe_regs[VBE_DISPI_INDEX_Y_OFFSET] * svga->rowoffset) +
+                                    (dev->vbe_regs[VBE_DISPI_INDEX_X_OFFSET] >> 3);
+                } else {
+                    svga->rowoffset = dev->vbe_regs[VBE_DISPI_INDEX_VIRT_WIDTH] * ((svga->bpp == 15) ? 2 : (svga->bpp / 8));
+                    svga->memaddr_latch = (dev->vbe_regs[VBE_DISPI_INDEX_Y_OFFSET] * svga->rowoffset) +
+                                    (dev->vbe_regs[VBE_DISPI_INDEX_X_OFFSET] * ((svga->bpp == 15) ? 2 : (svga->bpp / 8)));
+                }
+
+                svga->fullchange = 3;
+            }
+            else
+                svga_recalctimings(&dev->svga);
+            break;
+
+        case VBE_DISPI_INDEX_BANK:
+            if (val & VBE_DISPI_BANK_RD)
+                dev->svga.read_bank = (val & 0x1ff) * (dev->bank_gran << 10);
+            if (val & VBE_DISPI_BANK_WR)
+                dev->svga.write_bank = (val & 0x1ff) * (dev->bank_gran << 10);
+            break;
+
+        case VBE_DISPI_INDEX_DDC:
+            if (val & (1 << 7)) {
+                i2c_gpio_set(dev->i2c, !!(val & 1), !!(val & 2));
+                dev->vbe_regs[dev->vbe_index] = val;
+            } else
+                dev->vbe_regs[dev->vbe_index] &= ~(1 << 7);
+            break;
+
+        case VBE_DISPI_INDEX_ENABLE: {
+            uint32_t new_bank_gran;
+            dev->vbe_regs[dev->vbe_index] = val;
+            if ((val & VBE_DISPI_ENABLED) &&
+                !(dev->vbe_regs[VBE_DISPI_ENABLED] & VBE_DISPI_ENABLED)) {
+                dev->vbe_regs[dev->vbe_index] = val;
+                dev->vbe_regs[VBE_DISPI_INDEX_X_OFFSET] = 0;
+                dev->vbe_regs[VBE_DISPI_INDEX_Y_OFFSET] = 0;
+                dev->vbe_regs[VBE_DISPI_INDEX_VIRT_WIDTH] = 0;
+                svga_recalctimings(&dev->svga);
+                if (!(val & VBE_DISPI_NOCLEARMEM)) {
+                    memset(dev->svga.vram, 0,
+                           (size_t) dev->vbe_regs[VBE_DISPI_INDEX_YRES] * dev->svga.rowoffset);
+                }
+            } else
+                dev->svga.read_bank = dev->svga.write_bank = 0;
+            if ((val & VBE_DISPI_BANK_GRANULARITY_32K) != 0)
+                new_bank_gran = 32;
+            else
+                new_bank_gran = 64;
+            if (dev->bank_gran != new_bank_gran) {
+                dev->bank_gran = new_bank_gran;
+                dev->svga.read_bank = dev->svga.write_bank = 0;
+            }
+            if (val & VBE_DISPI_8BIT_DAC)
+                dev->svga.adv_flags &= ~FLAG_RAMDAC_SHIFT;
+            else
+                dev->svga.adv_flags |= FLAG_RAMDAC_SHIFT;
+            dev->vbe_regs[dev->vbe_index] &= ~VBE_DISPI_NOCLEARMEM;
+        }
+    }
+}
+
+void
+bochs_vbe_outl(const uint16_t addr, const uint32_t val, void *priv)
+{
+    bochs_vbe_outw(addr, val & 0xffff, priv);
+    bochs_vbe_outw(addr + 2, val >> 16, priv);
+}
+
+void
+bochs_vbe_out(uint16_t addr, uint8_t val, void *priv)
+{
+    bochs_vbe_t *dev  = (bochs_vbe_t *) priv;
+    svga_t *     svga = &dev->svga;
+    uint8_t      old;
+
+    if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
+        addr ^= 0x60;
+
+    switch (addr) {
+        case VBE_DISPI_IOPORT_INDEX:
+            dev->vbe_index = val;
+            return;
+        case VBE_DISPI_IOPORT_DATA:
+            bochs_vbe_outw(0x1cf, val | (bochs_vbe_inw(0x1cf, dev) & 0xFF00), dev);
+            return;
+        case VBE_DISPI_IOPORT_DATA + 1:
+            bochs_vbe_outw(0x1cf, (val << 8) | (bochs_vbe_inw(0x1cf, dev) & 0xFF), dev);
+            return;
+        case 0x3D4:
+            svga->crtcreg = val & 0x3f;
+            return;
+        case 0x3D5:
+            if (svga->crtcreg & 0x20)
+                return;
+            if ((svga->crtcreg < 7) && (svga->crtc[0x11] & 0x80))
+                return;
+            if ((svga->crtcreg == 7) && (svga->crtc[0x11] & 0x80))
+                val = (svga->crtc[7] & ~0x10) | (val & 0x10);
+            old                       = svga->crtc[svga->crtcreg];
+            svga->crtc[svga->crtcreg] = val;
+            if (old != val) {
+                if (svga->crtcreg < 0xe || svga->crtcreg > 0x10) {
+                    if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
+                        svga->fullchange = 3;
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                    } else {
+                        svga->fullchange = changeframecount;
+                        svga_recalctimings(svga);
+                    }
+                }
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    svga_out(addr, val, svga);
+}
+
+uint8_t
+bochs_vbe_in(uint16_t addr, void *priv)
+{
+    bochs_vbe_t *dev  = (bochs_vbe_t *) priv;
+    svga_t *     svga = &dev->svga;
+    uint8_t      ret;
+
+    if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
+        addr ^= 0x60;
+
+    switch (addr) {
+        default:
+            ret = svga_in(addr, svga);
+            break;
+        case VBE_DISPI_IOPORT_INDEX:
+            ret = dev->vbe_index;
+            break;
+        case VBE_DISPI_IOPORT_DATA:
+            ret = bochs_vbe_inw(0x1cf, dev);
+            break;
+        case VBE_DISPI_IOPORT_DATA + 1:
+            ret = bochs_vbe_inw(0x1cf, dev) >> 8;
+            break;
+        case 0x3D4:
+            ret = svga->crtcreg;
+            break;
+        case 0x3D5:
+            if (svga->crtcreg & 0x20)
+                ret = 0xff;
+            else
+                ret = svga->crtc[svga->crtcreg];
+            break;
+    }
+
+    return ret;
+}
+
+static uint8_t
+bochs_vbe_pci_read(const int func, const int addr, void *priv)
+{
+    const bochs_vbe_t *dev = (bochs_vbe_t *) priv;
+    uint8_t            ret = 0x00;
+
+    if (func == 0x00)  switch (addr) {
+        default:
+            break;
+        case 0x00:
+            ret = (dev->id5_val == VBE_DISPI_ID5) ? 0x34 : 0xee;
+            break;
+        case 0x01:
+            ret = (dev->id5_val == VBE_DISPI_ID5) ? 0x12 : 0x80;
+            break;
+        case 0x02:
+            ret = (dev->id5_val == VBE_DISPI_ID5) ? 0x11 : 0xef;
+            break;
+        case 0x03:
+            ret = (dev->id5_val == VBE_DISPI_ID5) ? 0x11 : 0xbe;
+            break;
+        case 0x04:
+            ret = (dev->pci_conf_status & 0b11100011) | 0x80;
+            break;
+        case 0x06:
+            ret = 0x80;
+            break;
+        case 0x07:
+            ret = 0x02;
+            break;
+        case 0x0b:
+            ret = 0x03;
+            break;
+        case 0x13:
+            ret = dev->pci_regs[addr];
+            break;
+        case 0x17:
+            ret = (dev->pci_regs[0x13] != 0x00) ? 0xe0 : 0x00;
+            break;
+        case 0x30:
+            ret = dev->pci_rom_enable & 0x01;
+            break;
+        case 0x32:
+            ret = dev->rom_addr & 0xfc;
+            break;
+        case 0x33:
+            ret = (dev->rom_addr & 0xff00) >> 8;
+            break;
+        case 0x3c:
+            ret = dev->pci_line_interrupt;
+            break;
+        case 0x3d:
+            ret = 0x01;
+            break;
+    } else
+        ret = 0xff;
+
+    return ret;
+}
+
+static void
+bochs_vbe_disable_handlers(bochs_vbe_t *dev)
+{
+    io_removehandler(0x03c0, 0x0020, bochs_vbe_in, NULL, NULL,
+                     bochs_vbe_out, NULL, NULL, dev);
+    io_removehandler(0x01ce, 0x0003, bochs_vbe_in, bochs_vbe_inw,
+                     bochs_vbe_inl, bochs_vbe_out, bochs_vbe_outw, bochs_vbe_outl, dev);
+
+    mem_mapping_disable(&dev->linear_mapping_2);
+    mem_mapping_disable(&dev->linear_mapping);
+    mem_mapping_disable(&dev->svga.mapping);
+    mem_mapping_disable(&dev->bios_rom.mapping);
+
+    /* Save all the mappings and the timers because they are part of linked lists. */
+    reset_state->linear_mapping_2 = dev->linear_mapping_2;
+    reset_state->linear_mapping   = dev->linear_mapping;
+    reset_state->svga.mapping     = dev->svga.mapping;
+    reset_state->bios_rom.mapping = dev->bios_rom.mapping;
+
+    reset_state->svga.timer       = dev->svga.timer;
+    reset_state->svga.timer_8514  = dev->svga.timer_8514;
+}
+
+static void
+bochs_vbe_pci_write(const int func, const int addr, const uint8_t val, void *priv)
+{
+    bochs_vbe_t *dev = (bochs_vbe_t *) priv;
+
+    if (func == 0x00)  switch (addr) {
+        default:
+            break;
+        case 0x04:
+            dev->pci_conf_status = val;
+            io_removehandler(0x03c0, 0x0020, bochs_vbe_in, NULL, NULL,
+                             bochs_vbe_out, NULL, NULL, dev);
+            io_removehandler(0x01ce, 0x0003, bochs_vbe_in, bochs_vbe_inw,
+                             bochs_vbe_inl, bochs_vbe_out, bochs_vbe_outw, bochs_vbe_outl, dev);
+            mem_mapping_disable(&dev->linear_mapping_2);
+            mem_mapping_disable(&dev->linear_mapping);
+            mem_mapping_disable(&dev->svga.mapping);
+            mem_mapping_disable(&dev->bios_rom.mapping);
+            if (dev->pci_conf_status & PCI_COMMAND_IO) {
+                io_sethandler(0x03c0, 0x0020, bochs_vbe_in, NULL, NULL,
+                              bochs_vbe_out, NULL, NULL, dev);
+                io_sethandler(0x01ce, 0x0003, bochs_vbe_in, bochs_vbe_inw, bochs_vbe_inl,
+                              bochs_vbe_out, bochs_vbe_outw, bochs_vbe_outl, dev);
+            }
+            if (dev->pci_conf_status & PCI_COMMAND_MEM) {
+                mem_mapping_enable(&dev->svga.mapping);
+                if ((dev->pci_regs[0x13] != 0x00) && (dev->pci_regs[0x13] != 0xff)) {
+                    mem_mapping_enable(&dev->linear_mapping);
+                    if (dev->pci_regs[0x13] != 0xe0)
+                        mem_mapping_enable(&dev->linear_mapping_2);
+                }
+                if (dev->pci_rom_enable && (dev->rom_addr != 0x0000) && (dev->rom_addr < 0xfff8))
+                    mem_mapping_set_addr(&dev->bios_rom.mapping, dev->rom_addr << 16, 0x10000);
+            }
+            break;
+        case 0x13:
+            dev->pci_regs[addr] = val;
+
+            mem_mapping_disable(&dev->linear_mapping_2);
+            mem_mapping_disable(&dev->linear_mapping);
+
+            if ((dev->pci_conf_status & PCI_COMMAND_MEM) && (val != 0x00) && (val != 0xff)) {
+                mem_mapping_set_addr(&dev->linear_mapping, val << 24, 0x01000000);
+                if (val != 0xe0)
+                    mem_mapping_set_addr(&dev->linear_mapping_2, 0xe0000000, 0x01000000);
+            }
+            break;
+        case 0x3c:
+            dev->pci_line_interrupt = val;
+            break;
+        case 0x30:
+            dev->pci_rom_enable = val & 0x01;
+            mem_mapping_disable(&dev->bios_rom.mapping);
+            if (dev->pci_rom_enable && (dev->pci_conf_status & PCI_COMMAND_MEM) &&
+                (dev->rom_addr != 0x0000) && (dev->rom_addr < 0xfff8)) {
+                mem_mapping_set_addr(&dev->bios_rom.mapping, dev->rom_addr << 16, 0x10000);
+            }
+            break;
+        case 0x32:
+            dev->rom_addr = (dev->rom_addr & 0xff00) | (val & 0xfc);
+            mem_mapping_disable(&dev->bios_rom.mapping);
+            if (dev->pci_rom_enable && (dev->pci_conf_status & PCI_COMMAND_MEM) &&
+                (dev->rom_addr != 0x0000) && (dev->rom_addr < 0xfff8)) {
+                mem_mapping_set_addr(&dev->bios_rom.mapping, dev->rom_addr << 16, 0x10000);
+            }
+            break;
+         case 0x33:
+            dev->rom_addr = (dev->rom_addr & 0x00ff) | (val << 8);
+            mem_mapping_disable(&dev->bios_rom.mapping);
+            if (dev->pci_rom_enable && (dev->pci_conf_status & PCI_COMMAND_MEM) &&
+                (dev->rom_addr != 0x0000) && (dev->rom_addr < 0xfff8)) {
+                mem_mapping_set_addr(&dev->bios_rom.mapping, dev->rom_addr << 16, 0x10000);
+            }
+            break;
+    }
+}
+
+static void
+bochs_vbe_reset(void *priv)
+{
+    bochs_vbe_t *dev = (bochs_vbe_t *) priv;
+
+    if (reset_state != NULL) {
+        bochs_vbe_disable_handlers(dev);
+        reset_state->slot = dev->slot;
+
+        *dev = *reset_state;
+    }
+}
+
+static void *
+bochs_vbe_init(const device_t *info)
+{
+    bochs_vbe_t *dev = calloc(1, sizeof(bochs_vbe_t));
+    reset_state = calloc(1, sizeof(bochs_vbe_t));
+
+    dev->id5_val = device_get_config_int("revision");
+    dev->vram_size = device_get_config_int("memory") * (1 << 20);
+
+    rom_init(&dev->bios_rom, "roms/video/bochs/VGABIOS-lgpl-latest.bin",
+             0xc0000, 0x8000, 0x7fff, 0x0000,
+             MEM_MAPPING_EXTERNAL);
+
+    if (dev->id5_val == VBE_DISPI_ID4) {
+        /* Patch the BIOS to match the PCI ID. */
+        dev->bios_rom.rom[0x010c] = 0xee;
+        dev->bios_rom.rom[0x7fff] -= (0xee - 0x34);
+
+        dev->bios_rom.rom[0x010d] = 0x80;
+        dev->bios_rom.rom[0x7fff] -= (0x80 - 0x12);
+
+        dev->bios_rom.rom[0x010e] = 0xef;
+        dev->bios_rom.rom[0x7fff] -= (0xef - 0x11);
+
+        dev->bios_rom.rom[0x010f] = 0xbe;
+        dev->bios_rom.rom[0x7fff] -= (0xbe - 0x11);
+    }
+
+    video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_bochs);
+
+    svga_init(info, &dev->svga, dev, dev->vram_size,
+              bochs_vbe_recalctimings,
+              bochs_vbe_in, bochs_vbe_out,
+              NULL,
+              NULL);
+
+    mem_mapping_add(&dev->linear_mapping, 0, 0,
+                    svga_readb_linear, svga_readw_linear, svga_readl_linear,
+                    svga_writeb_linear, svga_writew_linear, svga_writel_linear,
+                    NULL, MEM_MAPPING_EXTERNAL, &dev->svga);
+    /* Hack: If the mapping gets mapped anywhere other than at 0xe0000000,
+             enable this second copy of it at 0xe0000000 so michaln's driver works. */
+    mem_mapping_add(&dev->linear_mapping_2, 0, 0,
+                    svga_readb_linear, svga_readw_linear, svga_readl_linear,
+                    svga_writeb_linear, svga_writew_linear, svga_writel_linear,
+                    NULL, MEM_MAPPING_EXTERNAL, &dev->svga);
+
+    mem_mapping_disable(&dev->bios_rom.mapping);
+
+    mem_mapping_disable(&dev->svga.mapping);
+
+    mem_mapping_disable(&dev->linear_mapping);
+    mem_mapping_disable(&dev->linear_mapping_2);
+
+    dev->svga.bpp     = 8;
+    dev->svga.miscout = 1;
+
+    dev->bank_gran    = 64;
+
+    svga_set_ramdac_type(&dev->svga, RAMDAC_8BIT);
+
+    dev->svga.adv_flags |= FLAG_RAMDAC_SHIFT;
+    dev->svga.decode_mask = 0xffffff;
+
+    dev->i2c = i2c_gpio_init("ddc_bochs");
+    dev->ddc = ddc_init(i2c_gpio_get_bus(dev->i2c));
+    dev->svga.packed_chain4 = 1;
+
+    pci_add_card(PCI_ADD_NORMAL, bochs_vbe_pci_read, bochs_vbe_pci_write, dev, &dev->slot);
+
+    *reset_state = *dev;
+
+    return dev;
+}
+
+static int
+bochs_vbe_available(void)
+{
+    return rom_present("roms/video/bochs/VGABIOS-lgpl-latest.bin");
+}
+
+void
+bochs_vbe_close(void *priv)
+{
+    bochs_vbe_t *dev = (bochs_vbe_t *) priv;
+
+    ddc_close(dev->ddc);
+    i2c_gpio_close(dev->i2c);
+
+    svga_close(&dev->svga);
+
+    free(reset_state);
+    reset_state = NULL;
+
+    free(dev);
+}
+
+void
+bochs_vbe_speed_changed(void *priv)
+{
+    bochs_vbe_t *bochs_vbe = (bochs_vbe_t *) priv;
+
+    svga_recalctimings(&bochs_vbe->svga);
+}
+
+void
+bochs_vbe_force_redraw(void *priv)
+{
+    bochs_vbe_t *bochs_vbe = (bochs_vbe_t *) priv;
+
+    bochs_vbe->svga.fullchange = changeframecount;
+}
+
+static const device_config_t bochs_vbe_config[] = {
+    // clang-format off
+    {
+        .name           = "revision",
+        .description    = "Revision",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = VBE_DISPI_ID5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "VirtualBox",   .value = VBE_DISPI_ID4 },
+            { .description = "Bochs latest", .value = VBE_DISPI_ID5 },
+            { .description = ""                                     }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 16,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description =  "4 MB", .value =  4 },
+            { .description =  "8 MB", .value =  8 },
+            { .description = "16 MB", .value = 16 },
+            { .description = ""                   }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t bochs_svga_device = {
+    .name          = "Bochs SVGA",
+    .internal_name = "bochs_svga",
+    .flags         = DEVICE_PCI,
+    .local         = 0,
+    .init          = bochs_vbe_init,
+    .close         = bochs_vbe_close,
+    .reset         = bochs_vbe_reset,
+    .available     = bochs_vbe_available,
+    .speed_changed = bochs_vbe_speed_changed,
+    .force_redraw  = bochs_vbe_force_redraw,
+    .config        = bochs_vbe_config
+};
diff --git a/src/video/vid_cga.c b/src/video/vid_cga.c
index 2ea07c346..3bedf53a4 100644
--- a/src/video/vid_cga.c
+++ b/src/video/vid_cga.c
@@ -8,15 +8,13 @@
  *
  *          Emulation of the old and new IBM CGA graphics cards.
  *
- *
- *
  * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
  *          Miran Grca, <mgrca8@gmail.com>
  *          W. M. Martinez, <anikom15@outlook.com>
  *
  *          Copyright 2008-2019 Sarah Walker.
  *          Copyright 2016-2019 Miran Grca.
- *          Copyright 2023 W. M. Martinez
+ *          Copyright 2023      W. M. Martinez
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -48,8 +46,10 @@
 #define DOUBLE_INTERPOLATE_SRGB   2
 #define DOUBLE_INTERPOLATE_LINEAR 3
 
-typedef union
-{
+#define DEVICE_VRAM      0x4000
+#define DEVICE_VRAM_MASK 0x3fff
+
+typedef union {
     uint32_t color;
     struct {
         uint8_t b;
@@ -70,6 +70,15 @@ static video_timings_t timing_cga = { .type = VIDEO_ISA, .write_b = 8, .write_w
 
 void cga_recalctimings(cga_t *cga);
 
+static void
+cga_update_latch(cga_t *cga)
+{
+    uint32_t lp_latch = cga->displine * cga->crtc[CGA_CRTC_HDISP];
+
+    cga->crtc[CGA_CRTC_LIGHT_PEN_ADDR_HIGH] = (lp_latch >> 8) & 0x3f;
+    cga->crtc[CGA_CRTC_LIGHT_PEN_ADDR_LOW] = lp_latch & 0xff;
+}
+
 void
 cga_out(uint16_t addr, uint8_t val, void *priv)
 {
@@ -80,20 +89,22 @@ cga_out(uint16_t addr, uint8_t val, void *priv)
         addr = (addr & 0xff9) | 0x004;
 
     switch (addr) {
-        case 0x3D4:
+        case CGA_REGISTER_CRTC_INDEX:
             cga->crtcreg = val & 31;
             return;
-        case 0x3D5:
+        case CGA_REGISTER_CRTC_DATA:
             old                     = cga->crtc[cga->crtcreg];
             cga->crtc[cga->crtcreg] = val & crtcmask[cga->crtcreg];
             if (old != val) {
-                if ((cga->crtcreg < 0xe) || (cga->crtcreg > 0x10)) {
+                // Recalc the timings if we are writing any invalid CRTC register or a valid CRTC register 
+                // except the CURSOR and LIGHT PEN registers
+                if ((cga->crtcreg < 0xe) || (cga->crtcreg > 0x11)) {
                     cga->fullchange = changeframecount;
                     cga_recalctimings(cga);
                 }
             }
             return;
-        case 0x3D8:
+        case CGA_REGISTER_MODE_CONTROL:
             old          = cga->cgamode;
             cga->cgamode = val;
 
@@ -104,13 +115,24 @@ cga_out(uint16_t addr, uint8_t val, void *priv)
                 cga_recalctimings(cga);
             }
             return;
-        case 0x3D9:
+        case CGA_REGISTER_COLOR_SELECT:
             old         = cga->cgacol;
             cga->cgacol = val;
             if (old ^ val)
                 cga_recalctimings(cga);
             return;
 
+        case CGA_REGISTER_CLEAR_LIGHT_PEN_LATCH:
+            if (cga->lp_strobe == 1)
+                cga->lp_strobe = 0;
+            return;
+        case CGA_REGISTER_SET_LIGHT_PEN_LATCH:
+            if (cga->lp_strobe == 0) {
+                cga->lp_strobe = 1;
+                cga_update_latch(cga);
+            }
+            return;
+
         default:
             break;
     }
@@ -119,23 +141,32 @@ cga_out(uint16_t addr, uint8_t val, void *priv)
 uint8_t
 cga_in(uint16_t addr, void *priv)
 {
-    const cga_t *cga = (cga_t *) priv;
-
+    cga_t  *cga = (cga_t *) priv;
     uint8_t ret = 0xff;
 
     if ((addr >= 0x3d0) && (addr <= 0x3d7))
         addr = (addr & 0xff9) | 0x004;
 
     switch (addr) {
-        case 0x3D4:
+        case CGA_REGISTER_CRTC_INDEX:
             ret = cga->crtcreg;
             break;
-        case 0x3D5:
+        case CGA_REGISTER_CRTC_DATA:
             ret = cga->crtc[cga->crtcreg];
             break;
-        case 0x3DA:
+        case CGA_REGISTER_STATUS:
             ret = cga->cgastat;
             break;
+        case CGA_REGISTER_CLEAR_LIGHT_PEN_LATCH:
+            if (cga->lp_strobe == 1)
+                cga->lp_strobe = 0;
+            break;
+        case CGA_REGISTER_SET_LIGHT_PEN_LATCH:
+            if (cga->lp_strobe == 0) {
+                cga->lp_strobe = 1;
+                cga_update_latch(cga);
+            }
+            break;
 
         default:
             break;
@@ -175,11 +206,11 @@ cga_write(uint32_t addr, uint8_t val, void *priv)
 {
     cga_t *cga = (cga_t *) priv;
 
-    cga->vram[addr & 0x3fff] = val;
+    cga->vram[addr & DEVICE_VRAM_MASK] = val;
     if (cga->snow_enabled) {
         int offset                  = ((timer_get_remaining_u64(&cga->timer) / CGACONST) * 2) & 0xfc;
-        cga->charbuffer[offset]     = cga->vram[addr & 0x3fff];
-        cga->charbuffer[offset | 1] = cga->vram[addr & 0x3fff];
+        cga->charbuffer[offset]     = cga->vram[addr & DEVICE_VRAM_MASK];
+        cga->charbuffer[offset | 1] = cga->vram[addr & DEVICE_VRAM_MASK];
     }
     cga_waitstates(cga);
 }
@@ -192,10 +223,10 @@ cga_read(uint32_t addr, void *priv)
     cga_waitstates(cga);
     if (cga->snow_enabled) {
         int offset                  = ((timer_get_remaining_u64(&cga->timer) / CGACONST) * 2) & 0xfc;
-        cga->charbuffer[offset]     = cga->vram[addr & 0x3fff];
-        cga->charbuffer[offset | 1] = cga->vram[addr & 0x3fff];
+        cga->charbuffer[offset]     = cga->vram[addr & DEVICE_VRAM_MASK];
+        cga->charbuffer[offset | 1] = cga->vram[addr & DEVICE_VRAM_MASK];
     }
-    return cga->vram[addr & 0x3fff];
+    return cga->vram[addr & DEVICE_VRAM_MASK];
 }
 
 void
@@ -205,12 +236,12 @@ cga_recalctimings(cga_t *cga)
     double _dispontime;
     double _dispofftime;
 
-    if (cga->cgamode & 1) {
-        disptime    = (double) (cga->crtc[0] + 1);
-        _dispontime = (double) cga->crtc[1];
+    if (cga->cgamode & CGA_MODE_FLAG_HIGHRES) {
+        disptime    = (double) (cga->crtc[CGA_CRTC_HTOTAL] + 1);
+        _dispontime = (double) cga->crtc[CGA_CRTC_HDISP];
     } else {
-        disptime    = (double) ((cga->crtc[0] + 1) << 1);
-        _dispontime = (double) (cga->crtc[1] << 1);
+        disptime    = (double) ((cga->crtc[CGA_CRTC_HTOTAL] + 1) << 1);
+        _dispontime = (double) (cga->crtc[CGA_CRTC_HDISP] << 1);
     }
     _dispofftime     = disptime - _dispontime;
     _dispontime      = _dispontime * CGACONST;
@@ -222,95 +253,97 @@ cga_recalctimings(cga_t *cga)
 static void
 cga_render(cga_t *cga, int line)
 {
-    uint16_t ca  = (cga->crtc[15] | (cga->crtc[14] << 8)) & 0x3fff;
+    uint16_t cursoraddr  = (cga->crtc[CGA_CRTC_CURSOR_ADDR_LOW] | (cga->crtc[CGA_CRTC_CURSOR_ADDR_HIGH] << 8)) & DEVICE_VRAM_MASK;
     int      drawcursor;
     int      x;
-    int      c;
+    int      column;
     uint8_t  chr;
     uint8_t  attr;
     uint16_t dat;
     int      cols[4];
     int      col;
 
-    if ((cga->cgamode & 0x12) == 0x12) {
-        for (c = 0; c < 8; ++c) {
-            buffer32->line[line][c] = 0;
-            if (cga->cgamode & 1)
-                buffer32->line[line][c + (cga->crtc[1] << 3) + 8] = 0;
+    int32_t  highres_graphics_flag = (CGA_MODE_FLAG_HIGHRES_GRAPHICS | CGA_MODE_FLAG_GRAPHICS);
+
+    if (((cga->cgamode & highres_graphics_flag) == highres_graphics_flag)) {
+        for (column = 0; column < 8; ++column) {
+            buffer32->line[line][column] = 0;
+            if (cga->cgamode & CGA_MODE_FLAG_HIGHRES)
+                buffer32->line[line][column + (cga->crtc[CGA_CRTC_HDISP] << 3) + 8] = 0;
             else
-                buffer32->line[line][c + (cga->crtc[1] << 4) + 8] = 0;
+                buffer32->line[line][column + (cga->crtc[CGA_CRTC_HDISP] << 4) + 8] = 0;
         }
     } else {
-        for (c = 0; c < 8; ++c) {
-            buffer32->line[line][c] = (cga->cgacol & 15) + 16;
-            if (cga->cgamode & 1)
-                buffer32->line[line][c + (cga->crtc[1] << 3) + 8] = (cga->cgacol & 15) + 16;
+        for (column = 0; column < 8; ++column) {
+            buffer32->line[line][column] = (cga->cgacol & 15) + 16;
+            if (cga->cgamode & CGA_MODE_FLAG_HIGHRES)
+                buffer32->line[line][column + (cga->crtc[CGA_CRTC_HDISP] << 3) + 8] = (cga->cgacol & 15) + 16;
             else
-                buffer32->line[line][c + (cga->crtc[1] << 4) + 8] = (cga->cgacol & 15) + 16;
+                buffer32->line[line][column + (cga->crtc[CGA_CRTC_HDISP] << 4) + 8] = (cga->cgacol & 15) + 16;
         }
     }
-    if (cga->cgamode & 1) {
-        for (x = 0; x < cga->crtc[1]; x++) {
-            if (cga->cgamode & 8) {
+    if (cga->cgamode & CGA_MODE_FLAG_HIGHRES) { /* 80-column text */
+        for (x = 0; x < cga->crtc[CGA_CRTC_HDISP]; x++) {
+            if (cga->cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) {
                 chr  = cga->charbuffer[x << 1];
                 attr = cga->charbuffer[(x << 1) + 1];
             } else
                 chr = attr = 0;
-            drawcursor = ((cga->ma == ca) && cga->con && cga->cursoron);
+            drawcursor = ((cga->memaddr == cursoraddr) && cga->cursorvisible && cga->cursoron);
             cols[1]    = (attr & 15) + 16;
-            if (cga->cgamode & 0x20) {
+            if (cga->cgamode & CGA_MODE_FLAG_BLINK) {
                 cols[0] = ((attr >> 4) & 7) + 16;
                 if ((cga->cgablink & 8) && (attr & 0x80) && !cga->drawcursor)
                     cols[1] = cols[0];
             } else
                 cols[0] = (attr >> 4) + 16;
             if (drawcursor) {
-                for (c = 0; c < 8; c++) {
-                    buffer32->line[line][(x << 3) + c + 8]
-                        = cols[(fontdat[chr + cga->fontbase][cga->sc & 7] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
+                for (column = 0; column < 8; column++) {
+                    buffer32->line[line][(x << 3) + column + 8]
+                        = cols[(fontdat[chr + cga->fontbase][cga->scanline & 7] & (1 << (column ^ 7))) ? 1 : 0] ^ 15;
                 }
             } else {
-                for (c = 0; c < 8; c++) {
-                    buffer32->line[line][(x << 3) + c + 8]
-                        = cols[(fontdat[chr + cga->fontbase][cga->sc & 7] & (1 << (c ^ 7))) ? 1 : 0];
+                for (column = 0; column < 8; column++) {
+                    buffer32->line[line][(x << 3) + column + 8]
+                        = cols[(fontdat[chr + cga->fontbase][cga->scanline & 7] & (1 << (column ^ 7))) ? 1 : 0];
                 }
             }
-            cga->ma++;
+            cga->memaddr++;
         }
-    } else if (!(cga->cgamode & 2)) {
-        for (x = 0; x < cga->crtc[1]; x++) {
-            if (cga->cgamode & 8) {
-                chr  = cga->vram[(cga->ma << 1) & 0x3fff];
-                attr = cga->vram[((cga->ma << 1) + 1) & 0x3fff];
+    } else if (!(cga->cgamode & CGA_MODE_FLAG_GRAPHICS)) {
+        for (x = 0; x < cga->crtc[CGA_CRTC_HDISP]; x++) {
+            if (cga->cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) {
+                chr  = cga->vram[(cga->memaddr << 1) & DEVICE_VRAM_MASK];
+                attr = cga->vram[((cga->memaddr << 1) + 1) & DEVICE_VRAM_MASK];
             } else
                 chr = attr = 0;
-            drawcursor = ((cga->ma == ca) && cga->con && cga->cursoron);
+            drawcursor = ((cga->memaddr == cursoraddr) && cga->cursorvisible && cga->cursoron);
             cols[1]    = (attr & 15) + 16;
-            if (cga->cgamode & 0x20) {
+            if (cga->cgamode & CGA_MODE_FLAG_BLINK) {
                 cols[0] = ((attr >> 4) & 7) + 16;
                 if ((cga->cgablink & 8) && (attr & 0x80))
                     cols[1] = cols[0];
             } else
                 cols[0] = (attr >> 4) + 16;
-            cga->ma++;
+            cga->memaddr++;
             if (drawcursor) {
-                for (c = 0; c < 8; c++) {
-                    buffer32->line[line][(x << 4) + (c << 1) + 8]
-                        = buffer32->line[line][(x << 4) + (c << 1) + 9]
-                        = cols[(fontdat[chr + cga->fontbase][cga->sc & 7] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
+                for (column = 0; column < 8; column++) {
+                    buffer32->line[line][(x << 4) + (column << 1) + 8]
+                        = buffer32->line[line][(x << 4) + (column << 1) + 9]
+                        = cols[(fontdat[chr + cga->fontbase][cga->scanline & 7] & (1 << (column ^ 7))) ? 1 : 0] ^ 15;
                 }
             } else {
-                for (c = 0; c < 8; c++) {
-                    buffer32->line[line][(x << 4) + (c << 1) + 8]
-                        = buffer32->line[line][(x << 4) + (c << 1) + 9] 
-                        = cols[(fontdat[chr + cga->fontbase][cga->sc & 7] & (1 << (c ^ 7))) ? 1 : 0];
+                for (column = 0; column < 8; column++) {
+                    buffer32->line[line][(x << 4) + (column << 1) + 8]
+                        = buffer32->line[line][(x << 4) + (column << 1) + 9] 
+                        = cols[(fontdat[chr + cga->fontbase][cga->scanline & 7] & (1 << (column ^ 7))) ? 1 : 0];
                 }
             }
         }
-    } else if (!(cga->cgamode & 16)) {
+    } else if (!(cga->cgamode & CGA_MODE_FLAG_HIGHRES_GRAPHICS)) { /* not hi-res (but graphics) => 4-color mode */
         cols[0] = (cga->cgacol & 15) | 16;
         col     = (cga->cgacol & 16) ? 24 : 16;
-        if (cga->cgamode & 4) {
+        if (cga->cgamode & CGA_MODE_FLAG_BW) {
             cols[1] = col | 3; /* Cyan */
             cols[2] = col | 4; /* Red */
             cols[3] = col | 7; /* White */
@@ -323,32 +356,32 @@ cga_render(cga_t *cga, int line)
             cols[2] = col | 4; /* Red */
             cols[3] = col | 6; /* Yellow */
         }
-        for (x = 0; x < cga->crtc[1]; x++) {
-            if (cga->cgamode & 8)
-                dat = (cga->vram[((cga->ma << 1) & 0x1fff) + ((cga->sc & 1) * 0x2000)] << 8) |
-                      cga->vram[((cga->ma << 1) & 0x1fff) + ((cga->sc & 1) * 0x2000) + 1];
+        for (x = 0; x < cga->crtc[CGA_CRTC_HDISP]; x++) {
+            if (cga->cgamode & CGA_MODE_FLAG_VIDEO_ENABLE)
+                dat = (cga->vram[((cga->memaddr << 1) & 0x1fff) + ((cga->scanline & 1) * 0x2000)] << 8) |
+                      cga->vram[((cga->memaddr << 1) & 0x1fff) + ((cga->scanline & 1) * 0x2000) + 1];
             else
                 dat = 0;
-            cga->ma++;
-            for (c = 0; c < 8; c++) {
-                buffer32->line[line][(x << 4) + (c << 1) + 8]
-                    = buffer32->line[line][(x << 4) + (c << 1) + 9]
+            cga->memaddr++;
+            for (column = 0; column < 8; column++) {
+                buffer32->line[line][(x << 4) + (column << 1) + 8]
+                    = buffer32->line[line][(x << 4) + (column << 1) + 9]
                     = cols[dat >> 14];
                 dat <<= 2;
             }
         }
-    } else {
+    } else { /* 2-color hi-res graphics mode */
         cols[0] = 0;
         cols[1] = (cga->cgacol & 15) + 16;
-        for (x = 0; x < cga->crtc[1]; x++) {
-            if (cga->cgamode & 8)
-                dat = (cga->vram[((cga->ma << 1) & 0x1fff) + ((cga->sc & 1) * 0x2000)] << 8) |
-                      cga->vram[((cga->ma << 1) & 0x1fff) + ((cga->sc & 1) * 0x2000) + 1];
+        for (x = 0; x < cga->crtc[CGA_CRTC_HDISP]; x++) {
+            if (cga->cgamode & CGA_MODE_FLAG_VIDEO_ENABLE)
+                dat = (cga->vram[((cga->memaddr << 1) & 0x1fff) + ((cga->scanline & 1) * 0x2000)] << 8) |
+                      cga->vram[((cga->memaddr << 1) & 0x1fff) + ((cga->scanline & 1) * 0x2000) + 1];
             else
                 dat = 0;
-            cga->ma++;
-            for (c = 0; c < 16; c++) {
-                buffer32->line[line][(x << 4) + c + 8] = cols[dat >> 15];
+            cga->memaddr++;
+            for (column = 0; column < 16; column++) {
+                buffer32->line[line][(x << 4) + column + 8] = cols[dat >> 15];
                 dat <<= 1;
             }
         }
@@ -358,12 +391,14 @@ cga_render(cga_t *cga, int line)
 static void
 cga_render_blank(cga_t *cga, int line)
 {
-    int col = ((cga->cgamode & 0x12) == 0x12) ? 0 : (cga->cgacol & 15) + 16;
+    int32_t  highres_graphics_flag = (CGA_MODE_FLAG_HIGHRES_GRAPHICS | CGA_MODE_FLAG_GRAPHICS);
 
-    if (cga->cgamode & 1)
-        hline(buffer32, 0, line, (cga->crtc[1] << 3) + 16, col);
+    int col = ((cga->cgamode & highres_graphics_flag) == highres_graphics_flag) ? 0 : (cga->cgacol & 15) + 16;
+
+    if (cga->cgamode & CGA_MODE_FLAG_HIGHRES)
+        hline(buffer32, 0, line, (cga->crtc[CGA_CRTC_HDISP] << 3) + 16, col);
     else
-        hline(buffer32, 0, line, (cga->crtc[1] << 4) + 16, col);
+        hline(buffer32, 0, line, (cga->crtc[CGA_CRTC_HDISP] << 4) + 16, col);
 }
 
 static void
@@ -371,14 +406,15 @@ cga_render_process(cga_t *cga, int line)
 {
     int      x;
     uint8_t  border;
+    int32_t  highres_graphics_flag = (CGA_MODE_FLAG_HIGHRES_GRAPHICS | CGA_MODE_FLAG_GRAPHICS);
 
-    if (cga->cgamode & 1)
-        x = (cga->crtc[1] << 3) + 16;
+    if (cga->cgamode & CGA_MODE_FLAG_HIGHRES)
+        x = (cga->crtc[CGA_CRTC_HDISP] << 3) + 16;
     else
-        x = (cga->crtc[1] << 4) + 16;
+        x = (cga->crtc[CGA_CRTC_HDISP] << 4) + 16;
 
     if (cga->composite) {
-        border = ((cga->cgamode & 0x12) == 0x12) ? 0 : (cga->cgacol & 15);
+        border = ((cga->cgamode & highres_graphics_flag) == highres_graphics_flag) ? 0 : (cga->cgacol & 15);
 
         Composite_Process(cga->cgamode, border, x >> 2, buffer32->line[line]);
     } else
@@ -412,16 +448,16 @@ cga_interpolate_linear(uint8_t co1, uint8_t co2, double fraction)
     r2 = pow((r1 >= 0.0) ? r1 : -r1, 1.0 / 2.19921875);
     if (r1 <= 0.0)
         r2 = -r2;
-    ret = (uint8_t) (r2 * 255.0);
+    ret = (uint8_t) round(r2 * 255.0);
 
     return ret;
 }
 
 static color_t
-cga_interpolate_lookup(cga_t *cga, color_t color1, color_t color2, double fraction)
+cga_interpolate_lookup(color_t color1, color_t color2, int double_type)
 {
     color_t ret;
-    uint8_t dt = cga->double_type - DOUBLE_INTERPOLATE_SRGB;
+    uint8_t dt = double_type - DOUBLE_INTERPOLATE_SRGB;
 
     ret.a = 0x00;
     ret.r = interp_lut[dt][color1.r][color2.r];
@@ -432,10 +468,8 @@ cga_interpolate_lookup(cga_t *cga, color_t color1, color_t color2, double fracti
 }
 
 static void
-cga_interpolate(cga_t *cga, int x, int y, int w, int h)
+cga_interpolate(int x, int y, int w, int h, int double_type)
 {
-    double quotient = 0.5;
-
     for (int i = y; i < (y + h); i++) {
         if (i & 1)  for (int j = x; j < (x + w); j++) {
             int prev = i - 1;
@@ -460,30 +494,63 @@ cga_interpolate(cga_t *cga, int x, int y, int w, int h)
             else
                 next_color.color = 0x00000000;
 
-            interim_1 = cga_interpolate_lookup(cga, prev_color, black, quotient);
-            interim_2 = cga_interpolate_lookup(cga, black, next_color, quotient);
-            final = cga_interpolate_lookup(cga, interim_1, interim_2, quotient);
+            interim_1 = cga_interpolate_lookup(prev_color, black, double_type);
+            interim_2 = cga_interpolate_lookup(black, next_color, double_type);
+            final     = cga_interpolate_lookup(interim_1, interim_2, double_type);
 
             buffer32->line[i][j] = final.color;
         }
     }
 }
 
-static void
-cga_blit_memtoscreen(cga_t *cga, int x, int y, int w, int h)
+void
+cga_interpolate_init(void)
 {
-    if (cga->double_type > DOUBLE_SIMPLE)
-        cga_interpolate(cga, x, y, w, h);
+    for (uint16_t i = 0; i < 256; i++) {
+        for (uint16_t j = 0; j < 256; j++) {
+            interp_lut[0][i][j] = cga_interpolate_srgb(i, j, 0.5);
+            interp_lut[1][i][j] = cga_interpolate_linear(i, j, 0.5);
+        }
+    }
+}
+
+void
+cga_blit_memtoscreen(int x, int y, int w, int h, int double_type)
+{
+    if (double_type > DOUBLE_SIMPLE)
+        cga_interpolate(x, y, w, h, double_type);
 
     video_blit_memtoscreen(x, y, w, h);
 }
 
+void
+cga_do_blit(int vid_xsize, int firstline, int lastline, int double_type)
+{
+    if (double_type > DOUBLE_NONE) {
+        if (enable_overscan)
+            cga_blit_memtoscreen(0, (firstline - 4) << 1,
+                                 vid_xsize, ((lastline - firstline) << 1) + 16,
+                                 double_type);
+        else
+            cga_blit_memtoscreen(8, firstline << 1,
+                                 vid_xsize, (lastline - firstline) << 1,
+                                 double_type);
+    } else {
+        if (enable_overscan)
+            video_blit_memtoscreen(0, firstline - 4,
+                                   vid_xsize, (lastline - firstline) + 8);
+        else
+            video_blit_memtoscreen(8, firstline,
+                                   vid_xsize, lastline - firstline);
+    }
+}
+
 void
 cga_poll(void *priv)
 {
     cga_t   *cga = (cga_t *) priv;
     int      x;
-    int      oldsc;
+    int      scanline_old;
     int      oldvc;
     int      xs_temp;
     int      ys_temp;
@@ -493,9 +560,9 @@ cga_poll(void *priv)
         timer_advance_u64(&cga->timer, cga->dispofftime);
         cga->cgastat |= 1;
         cga->linepos = 1;
-        oldsc        = cga->sc;
-        if ((cga->crtc[8] & 3) == 3)
-            cga->sc = ((cga->sc << 1) + cga->oddeven) & 7;
+        scanline_old        = cga->scanline;
+        if ((cga->crtc[CGA_CRTC_INTERLACE] & 3) == 3)
+            cga->scanline = ((cga->scanline << 1) + cga->oddeven) & 7;
         if (cga->cgadispon) {
             if (cga->displine < cga->firstline) {
                 cga->firstline = cga->displine;
@@ -511,25 +578,23 @@ cga_poll(void *priv)
                     cga_render(cga, cga->displine);
                     break;
                 case DOUBLE_SIMPLE:
-                    old_ma = cga->ma;
+                    old_ma = cga->memaddr;
                     cga_render(cga, cga->displine << 1);
-                    cga->ma = old_ma;
+                    cga->memaddr = old_ma;
                     cga_render(cga, (cga->displine << 1) + 1);
                     break;
             }
-        } else {
-            switch (cga->double_type) {
-                default:
-                    cga_render_blank(cga, cga->displine << 1);
-                    break;
-                case DOUBLE_NONE:
-                    cga_render_blank(cga, cga->displine);
-                    break;
-                case DOUBLE_SIMPLE:
-                    cga_render_blank(cga, cga->displine << 1);
-                    cga_render_blank(cga, (cga->displine << 1) + 1);
-                    break;
-            }
+        } else  switch (cga->double_type) {
+            default:
+                cga_render_blank(cga, cga->displine << 1);
+                break;
+            case DOUBLE_NONE:
+                cga_render_blank(cga, cga->displine);
+                break;
+            case DOUBLE_SIMPLE:
+                cga_render_blank(cga, cga->displine << 1);
+                cga_render_blank(cga, (cga->displine << 1) + 1);
+                break;
         }
 
         switch (cga->double_type) {
@@ -542,8 +607,8 @@ cga_poll(void *priv)
                 break;
         }
 
-        cga->sc = oldsc;
-        if (cga->vc == cga->crtc[7] && !cga->sc)
+        cga->scanline = scanline_old;
+        if (cga->vc == cga->crtc[CGA_CRTC_VSYNC] && !cga->scanline)
             cga->cgastat |= 8;
         cga->displine++;
         if (cga->displine >= 360)
@@ -556,41 +621,41 @@ cga_poll(void *priv)
             if (!cga->vsynctime)
                 cga->cgastat &= ~8;
         }
-        if (cga->sc == (cga->crtc[11] & 31) || ((cga->crtc[8] & 3) == 3 &&
-            cga->sc == ((cga->crtc[11] & 31) >> 1))) {
-            cga->con  = 0;
-            cga->coff = 1;
+        if (cga->scanline == (cga->crtc[CGA_CRTC_CURSOR_END] & 31) || ((cga->crtc[CGA_CRTC_INTERLACE] & 3) == 3 &&
+            cga->scanline == ((cga->crtc[CGA_CRTC_CURSOR_END] & 31) >> 1))) {
+            cga->cursorvisible  = 0;
         }
-        if ((cga->crtc[8] & 3) == 3 && cga->sc == (cga->crtc[9] >> 1))
-            cga->maback = cga->ma;
+        if ((cga->crtc[CGA_CRTC_INTERLACE] & 3) == 3 && cga->scanline == (cga->crtc[CGA_CRTC_MAX_SCANLINE_ADDR] >> 1))
+            cga->memaddr_backup = cga->memaddr;
         if (cga->vadj) {
-            cga->sc++;
-            cga->sc &= 31;
-            cga->ma = cga->maback;
+            cga->scanline++;
+            cga->scanline &= 31;
+            cga->memaddr = cga->memaddr_backup;
             cga->vadj--;
             if (!cga->vadj) {
                 cga->cgadispon = 1;
-                cga->ma = cga->maback = (cga->crtc[13] | (cga->crtc[12] << 8)) & 0x3fff;
-                cga->sc               = 0;
+                cga->memaddr = cga->memaddr_backup = (cga->crtc[CGA_CRTC_START_ADDR_LOW] | (cga->crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & DEVICE_VRAM_MASK;
+                cga->scanline               = 0;
             }
-        } else if (cga->sc == cga->crtc[9]) {
-            cga->maback = cga->ma;
-            cga->sc     = 0;
+        } else if (cga->scanline == cga->crtc[CGA_CRTC_MAX_SCANLINE_ADDR]) {
+            cga->memaddr_backup = cga->memaddr;
+            cga->scanline     = 0;
             oldvc       = cga->vc;
             cga->vc++;
             cga->vc &= 127;
 
-            if (cga->vc == cga->crtc[6])
+            if (cga->vc == cga->crtc[CGA_CRTC_VDISP])
                 cga->cgadispon = 0;
 
-            if (oldvc == cga->crtc[4]) {
+            if (oldvc == cga->crtc[CGA_CRTC_VTOTAL]) {
                 cga->vc   = 0;
-                cga->vadj = cga->crtc[5];
+                cga->vadj = cga->crtc[CGA_CRTC_VTOTAL_ADJUST];
                 if (!cga->vadj) {
                     cga->cgadispon = 1;
-                    cga->ma = cga->maback = (cga->crtc[13] | (cga->crtc[12] << 8)) & 0x3fff;
+                    cga->memaddr = cga->memaddr_backup = (cga->crtc[CGA_CRTC_START_ADDR_LOW] | (cga->crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & DEVICE_VRAM_MASK;
                 }
-                switch (cga->crtc[10] & 0x60) {
+                
+                switch (cga->crtc[CGA_CRTC_CURSOR_START] & 0x60) {
                     case 0x20:
                         cga->cursoron = 0;
                         break;
@@ -603,21 +668,19 @@ cga_poll(void *priv)
                 }
             }
 
-            if (cga->vc == cga->crtc[7]) {
+            if (cga->vc == cga->crtc[CGA_CRTC_VSYNC]) {
                 cga->cgadispon = 0;
                 cga->displine  = 0;
                 cga->vsynctime = 16;
-                if (cga->crtc[7]) {
-                    if (cga->cgamode & 1)
-                        x = (cga->crtc[1] << 3) + 16;
+                if (cga->crtc[CGA_CRTC_VSYNC]) {
+                    if (cga->cgamode & CGA_MODE_FLAG_HIGHRES)
+                        x = (cga->crtc[CGA_CRTC_HDISP] << 3) + 16;
                     else
-                        x = (cga->crtc[1] << 4) + 16;
+                        x = (cga->crtc[CGA_CRTC_HDISP] << 4) + 16;
                     cga->lastline++;
 
                     xs_temp = x;
-                    ys_temp = cga->lastline - cga->firstline;
-                    if (cga->double_type > DOUBLE_NONE)
-                        ys_temp <<= 1;
+                    ys_temp = (cga->lastline - cga->firstline) << 1;
 
                     if ((xs_temp > 0) && (ys_temp > 0)) {
                         if (xs_temp < 64)
@@ -627,49 +690,32 @@ cga_poll(void *priv)
                         if (!enable_overscan)
                             xs_temp -= 16;
 
-                        if ((cga->cgamode & 8) && ((xs_temp != xsize) ||
+                        if ((cga->cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) && ((xs_temp != xsize) ||
                             (ys_temp != ysize) || video_force_resize_get())) {
                             xsize = xs_temp;
                             ysize = ys_temp;
-                            if (cga->double_type > DOUBLE_NONE)
-                                set_screen_size(xsize, ysize + (enable_overscan ? 16 : 0));
-                            else
-                                set_screen_size(xsize, ysize + (enable_overscan ? 8 : 0));
+                            set_screen_size(xsize, ysize + (enable_overscan ? 16 : 0));
 
                             if (video_force_resize_get())
                                 video_force_resize_set(0);
                         }
 
-                        if (cga->double_type > DOUBLE_NONE) {
-                            if (enable_overscan)
-                                cga_blit_memtoscreen(cga, 0, (cga->firstline - 4) << 1,
-                                                     xsize, ((cga->lastline - cga->firstline) << 1) + 16);
-                            else
-                                cga_blit_memtoscreen(cga, 8, cga->firstline << 1,
-                                                     xsize, (cga->lastline - cga->firstline) << 1);
-                        } else {
-                            if (enable_overscan)
-                                video_blit_memtoscreen(0, cga->firstline - 4,
-                                                       xsize, (cga->lastline - cga->firstline) + 8);
-                            else
-                                video_blit_memtoscreen(8, cga->firstline,
-                                                       xsize, cga->lastline - cga->firstline);
-                        }
+                        cga_do_blit(xsize, cga->firstline, cga->lastline, cga->double_type);
                     }
 
                     frames++;
 
                     video_res_x = xsize;
                     video_res_y = ysize;
-                    if (cga->cgamode & 1) {
+                    if (cga->cgamode & CGA_MODE_FLAG_HIGHRES) {
                         video_res_x /= 8;
-                        video_res_y /= cga->crtc[9] + 1;
+                        video_res_y /= cga->crtc[CGA_CRTC_MAX_SCANLINE_ADDR] + 1;
                         video_bpp = 0;
-                    } else if (!(cga->cgamode & 2)) {
+                    } else if (!(cga->cgamode & CGA_MODE_FLAG_GRAPHICS)) {
                         video_res_x /= 16;
-                        video_res_y /= cga->crtc[9] + 1;
+                        video_res_y /= cga->crtc[CGA_CRTC_MAX_SCANLINE_ADDR] + 1;
                         video_bpp = 0;
-                    } else if (!(cga->cgamode & 16)) {
+                    } else if (!(cga->cgamode & CGA_MODE_FLAG_HIGHRES_GRAPHICS)) {
                         video_res_x /= 2;
                         video_bpp = 2;
                     } else
@@ -681,18 +727,18 @@ cga_poll(void *priv)
                 cga->oddeven ^= 1;
             }
         } else {
-            cga->sc++;
-            cga->sc &= 31;
-            cga->ma = cga->maback;
+            cga->scanline++;
+            cga->scanline &= 31;
+            cga->memaddr = cga->memaddr_backup;
         }
         if (cga->cgadispon)
             cga->cgastat &= ~1;
-        if (cga->sc == (cga->crtc[10] & 31) || ((cga->crtc[8] & 3) == 3 &&
-            cga->sc == ((cga->crtc[10] & 31) >> 1)))
-            cga->con = 1;
-        if (cga->cgadispon && (cga->cgamode & 1)) {
-            for (x = 0; x < (cga->crtc[1] << 1); x++)
-                cga->charbuffer[x] = cga->vram[((cga->ma << 1) + x) & 0x3fff];
+        if (cga->scanline == (cga->crtc[CGA_CRTC_CURSOR_START] & 31) || ((cga->crtc[CGA_CRTC_INTERLACE] & 3) == 3 &&
+            cga->scanline == ((cga->crtc[CGA_CRTC_CURSOR_START] & 31) >> 1)))
+            cga->cursorvisible = 1;
+        if (cga->cgadispon && (cga->cgamode & CGA_MODE_FLAG_HIGHRES)) {
+            for (x = 0; x < (cga->crtc[CGA_CRTC_HDISP] << 1); x++)
+                cga->charbuffer[x] = cga->vram[((cga->memaddr << 1) + x) & DEVICE_VRAM_MASK];
         }
     }
 }
@@ -708,9 +754,8 @@ void *
 cga_standalone_init(UNUSED(const device_t *info))
 {
     int    display_type;
-    cga_t *cga = malloc(sizeof(cga_t));
+    cga_t *cga = calloc(1, sizeof(cga_t));
 
-    memset(cga, 0, sizeof(cga_t));
     video_inform(VIDEO_FLAG_TYPE_CGA, &timing_cga);
 
     display_type      = device_get_config_int("display_type");
@@ -718,7 +763,7 @@ cga_standalone_init(UNUSED(const device_t *info))
     cga->revision     = device_get_config_int("composite_type");
     cga->snow_enabled = device_get_config_int("snow_enabled");
 
-    cga->vram = malloc(0x4000);
+    cga->vram = malloc(DEVICE_VRAM);
 
     cga_comp_init(cga->revision);
     timer_add(&cga->timer, cga_poll, cga, 1);
@@ -733,14 +778,22 @@ cga_standalone_init(UNUSED(const device_t *info))
     update_cga16_color(cga->cgamode);
 
     cga->double_type = device_get_config_int("double_type");
+    cga_interpolate_init();
 
-    for (uint16_t i = 0; i < 256; i++) {
-        for (uint16_t j = 0; j < 256; j++) {
-            interp_lut[0][i][j] = cga_interpolate_srgb(i, j, 0.5);
-            interp_lut[1][i][j] = cga_interpolate_linear(i, j, 0.5);
-        }
+    switch(device_get_config_int("font")) {
+        case 0:
+            loadfont(FONT_IBM_MDA_437_PATH, 0);
+            break;
+        case 1:
+            loadfont(FONT_IBM_MDA_437_NORDIC_PATH, 0);
+            break;
+        case 4:
+            loadfont(FONT_TULIP_DGA_PATH, 0);
+            break;
     }
 
+    monitors[monitor_index_global].mon_composite = !!cga->composite;
+
     return cga;
 }
 
@@ -779,114 +832,99 @@ cga_speed_changed(void *priv)
 // clang-format off
 const device_config_t cga_config[] = {
     {
-        .name = "display_type",
-        .description = "Display type",
-        .type = CONFIG_SELECTION,
-        .default_int = CGA_RGB,
-        .selection = {
-            {
-                .description = "RGB",
-                .value = CGA_RGB
-            },
-            {
-                .description = "Composite",
-                .value = CGA_COMPOSITE
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "display_type",
+        .description    = "Display type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = CGA_RGB,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "RGB",       .value = CGA_RGB       },
+            { .description = "Composite", .value = CGA_COMPOSITE },
+            { .description = ""                                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "composite_type",
-        .description = "Composite type",
-        .type = CONFIG_SELECTION,
-        .default_int = COMPOSITE_OLD,
-        .selection = {
-            {
-                .description = "Old",
-                .value = COMPOSITE_OLD
-            },
-            {
-                .description = "New",
-                .value = COMPOSITE_NEW
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "composite_type",
+        .description    = "Composite type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = COMPOSITE_OLD,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Old", .value = COMPOSITE_OLD },
+            { .description = "New", .value = COMPOSITE_NEW },
+            { .description = ""                            }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "rgb_type",
-        .description = "RGB type",
-        .type = CONFIG_SELECTION,
-        .default_int = 5,
-        .selection = {
-            {
-                .description = "Color (generic)",
-                .value = 0
-            },
-            {
-                .description = "Green Monochrome",
-                .value = 1
-            },
-            {
-                .description = "Amber Monochrome",
-                .value = 2
-            },
-            {
-                .description = "Gray Monochrome",
-                .value = 3
-            },
-            {
-                .description = "Color (no brown)",
-                .value = 4
-            },
-            {
-                .description = "Color (IBM 5153)",
-                .value = 5
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "rgb_type",
+        .description    = "RGB type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Color (generic)",  .value = 0 },
+            { .description = "Green Monochrome", .value = 1 },
+            { .description = "Amber Monochrome", .value = 2 },
+            { .description = "Gray Monochrome",  .value = 3 },
+            { .description = "Color (no brown)", .value = 4 },
+            { .description = "Color (IBM 5153)", .value = 5 },
+            { .description = ""                             }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "double_type",
-        .description = "Line doubling type",
-        .type = CONFIG_SELECTION,
-        .default_int = DOUBLE_NONE,
-        .selection = {
-            {
-                .description = "None",
-                .value = DOUBLE_NONE
-            },
-            {
-                .description = "Simple doubling",
-                .value = DOUBLE_SIMPLE
-            },
-            {
-                .description = "sRGB interpolation",
-                .value = DOUBLE_INTERPOLATE_SRGB
-            },
-            {
-                .description = "Linear interpolation",
-                .value = DOUBLE_INTERPOLATE_LINEAR
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "double_type",
+        .description    = "Line doubling type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = DOUBLE_NONE,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",                 .value = DOUBLE_NONE               },
+            { .description = "Simple doubling",      .value = DOUBLE_SIMPLE             },
+            { .description = "sRGB interpolation",   .value = DOUBLE_INTERPOLATE_SRGB   },
+            { .description = "Linear interpolation", .value = DOUBLE_INTERPOLATE_LINEAR },
+            { .description = ""                                                         }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "snow_enabled",
-        .description = "Snow emulation",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "font",
+        .description    = "Font",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "US (CP 437)",                 .value = 0 },
+            { .description = "IBM Nordic (CP 437-Nordic)",  .value = 1 },
+            { .description = "Tulip DGA",                   .value = 4 },
+            { .description = ""                                        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .type = CONFIG_END
-    }
+        .name           = "snow_enabled",
+        .description    = "Snow emulation",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 // clang-format on
 
@@ -898,7 +936,7 @@ const device_t cga_device = {
     .init          = cga_standalone_init,
     .close         = cga_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = cga_speed_changed,
     .force_redraw  = NULL,
     .config        = cga_config
@@ -912,7 +950,7 @@ const device_t cga_pravetz_device = {
     .init          = cga_pravetz_init,
     .close         = cga_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = cga_speed_changed,
     .force_redraw  = NULL,
     .config        = cga_config
diff --git a/src/video/vid_colorplus.c b/src/video/vid_cga_colorplus.c
similarity index 61%
rename from src/video/vid_colorplus.c
rename to src/video/vid_cga_colorplus.c
index dcc72a76b..15d53d543 100644
--- a/src/video/vid_colorplus.c
+++ b/src/video/vid_cga_colorplus.c
@@ -14,7 +14,7 @@
  *          Miran Grca, <mgrca8@gmail.com>
  *
  *          Copyright 2008-2018 Sarah Walker.
- *          Copyright 2016-2018 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -26,10 +26,10 @@
 #include "cpu.h"
 #include <86box/io.h>
 #include <86box/timer.h>
+#include <86box/device.h>
 #include <86box/lpt.h>
 #include <86box/pit.h>
 #include <86box/mem.h>
-#include <86box/device.h>
 #include <86box/video.h>
 #include <86box/vid_cga.h>
 #include <86box/vid_colorplus.h>
@@ -37,19 +37,19 @@
 #include <86box/plat_unused.h>
 
 /* Bits in the colorplus control register: */
-#define COLORPLUS_PLANE_SWAP   0x40 /* Swap planes at 0000h and 4000h */
-#define COLORPLUS_640x200_MODE 0x20 /* 640x200x4 mode active */
-#define COLORPLUS_320x200_MODE 0x10 /* 320x200x16 mode active */
-#define COLORPLUS_EITHER_MODE  0x30 /* Either mode active */
+#define COLORPLUS_PLANE_SWAP    0x40 /* Swap planes at 0000h and 4000h */
+#define COLORPLUS_640x200_MODE  0x20 /* 640x200x4 mode active */
+#define COLORPLUS_320x200_MODE  0x10 /* 320x200x16 mode active */
+#define COLORPLUS_EITHER_MODE   0x30 /* Either mode active */
 
-/* Bits in the CGA graphics mode register */
-#define CGA_GRAPHICS_MODE 0x02 /* CGA graphics mode selected? */
+#define CGA_RGB                 0
+#define CGA_COMPOSITE           1
 
-#define CGA_RGB           0
-#define CGA_COMPOSITE     1
+#define COMPOSITE_OLD           0
+#define COMPOSITE_NEW           1
 
-#define COMPOSITE_OLD     0
-#define COMPOSITE_NEW     1
+// Plantronics specific registers
+#define COLORPLUS_CONTROL      0x3DD
 
 video_timings_t timing_colorplus = { .type = VIDEO_ISA, .write_b = 8, .write_w = 16, .write_l = 32, .read_b = 8, .read_w = 16, .read_l = 32 };
 
@@ -60,7 +60,7 @@ colorplus_out(uint16_t addr, uint8_t val, void *priv)
 {
     colorplus_t *colorplus = (colorplus_t *) priv;
 
-    if (addr == 0x3DD) {
+    if (addr == COLORPLUS_CONTROL) {
         colorplus->control = val & 0x70;
     } else {
         cga_out(addr, val, &colorplus->cga);
@@ -80,7 +80,7 @@ colorplus_write(uint32_t addr, uint8_t val, void *priv)
 {
     colorplus_t *colorplus = (colorplus_t *) priv;
 
-    if ((colorplus->control & COLORPLUS_PLANE_SWAP) && (colorplus->control & COLORPLUS_EITHER_MODE) && (colorplus->cga.cgamode & CGA_GRAPHICS_MODE)) {
+    if ((colorplus->control & COLORPLUS_PLANE_SWAP) && (colorplus->control & COLORPLUS_EITHER_MODE) && (colorplus->cga.cgamode & CGA_MODE_FLAG_GRAPHICS)) {
         addr ^= 0x4000;
     } else if (!(colorplus->control & COLORPLUS_EITHER_MODE)) {
         addr &= 0x3FFF;
@@ -99,7 +99,7 @@ colorplus_read(uint32_t addr, void *priv)
 {
     colorplus_t *colorplus = (colorplus_t *) priv;
 
-    if ((colorplus->control & COLORPLUS_PLANE_SWAP) && (colorplus->control & COLORPLUS_EITHER_MODE) && (colorplus->cga.cgamode & CGA_GRAPHICS_MODE)) {
+    if ((colorplus->control & COLORPLUS_PLANE_SWAP) && (colorplus->control & COLORPLUS_EITHER_MODE) && (colorplus->cga.cgamode & CGA_MODE_FLAG_GRAPHICS)) {
         addr ^= 0x4000;
     } else if (!(colorplus->control & COLORPLUS_EITHER_MODE)) {
         addr &= 0x3FFF;
@@ -130,7 +130,7 @@ colorplus_poll(void *priv)
     uint16_t         dat1;
     int              cols[4];
     int              col;
-    int              oldsc;
+    int              scanline_old;
     static const int cols16[16] = { 0x10, 0x12, 0x14, 0x16,
                                     0x18, 0x1A, 0x1C, 0x1E,
                                     0x11, 0x13, 0x15, 0x17,
@@ -140,7 +140,7 @@ colorplus_poll(void *priv)
 
     /* If one of the extra modes is not selected, drop down to the CGA
      * drawing code. */
-    if (!((colorplus->control & COLORPLUS_EITHER_MODE) && (colorplus->cga.cgamode & CGA_GRAPHICS_MODE))) {
+    if (!((colorplus->control & COLORPLUS_EITHER_MODE) && (colorplus->cga.cgamode & CGA_MODE_FLAG_GRAPHICS))) {
         cga_poll(&colorplus->cga);
         return;
     }
@@ -149,9 +149,9 @@ colorplus_poll(void *priv)
         timer_advance_u64(&colorplus->cga.timer, colorplus->cga.dispofftime);
         colorplus->cga.cgastat |= 1;
         colorplus->cga.linepos = 1;
-        oldsc                  = colorplus->cga.sc;
-        if ((colorplus->cga.crtc[8] & 3) == 3)
-            colorplus->cga.sc = ((colorplus->cga.sc << 1) + colorplus->cga.oddeven) & 7;
+        scanline_old                  = colorplus->cga.scanline;
+        if ((colorplus->cga.crtc[CGA_CRTC_INTERLACE] & 3) == 3)
+            colorplus->cga.scanline = ((colorplus->cga.scanline << 1) + colorplus->cga.oddeven) & 7;
         if (colorplus->cga.cgadispon) {
             if (colorplus->cga.displine < colorplus->cga.firstline) {
                 colorplus->cga.firstline = colorplus->cga.displine;
@@ -160,13 +160,13 @@ colorplus_poll(void *priv)
             colorplus->cga.lastline = colorplus->cga.displine;
             /* Left / right border */
             for (c = 0; c < 8; c++) {
-                buffer32->line[colorplus->cga.displine][c] = buffer32->line[colorplus->cga.displine][c + (colorplus->cga.crtc[1] << 4) + 8] = (colorplus->cga.cgacol & 15) + 16;
+                buffer32->line[colorplus->cga.displine][c] = buffer32->line[colorplus->cga.displine][c + (colorplus->cga.crtc[CGA_CRTC_HDISP] << 4) + 8] = (colorplus->cga.cgacol & 15) + 16;
             }
             if (colorplus->control & COLORPLUS_320x200_MODE) {
-                for (x = 0; x < colorplus->cga.crtc[1]; x++) {
-                    dat0 = (plane0[((colorplus->cga.ma << 1) & 0x1fff) + ((colorplus->cga.sc & 1) * 0x2000)] << 8) | plane0[((colorplus->cga.ma << 1) & 0x1fff) + ((colorplus->cga.sc & 1) * 0x2000) + 1];
-                    dat1 = (plane1[((colorplus->cga.ma << 1) & 0x1fff) + ((colorplus->cga.sc & 1) * 0x2000)] << 8) | plane1[((colorplus->cga.ma << 1) & 0x1fff) + ((colorplus->cga.sc & 1) * 0x2000) + 1];
-                    colorplus->cga.ma++;
+                for (x = 0; x < colorplus->cga.crtc[CGA_CRTC_HDISP]; x++) {
+                    dat0 = (plane0[((colorplus->cga.memaddr << 1) & 0x1fff) + ((colorplus->cga.scanline & 1) * 0x2000)] << 8) | plane0[((colorplus->cga.memaddr << 1) & 0x1fff) + ((colorplus->cga.scanline & 1) * 0x2000) + 1];
+                    dat1 = (plane1[((colorplus->cga.memaddr << 1) & 0x1fff) + ((colorplus->cga.scanline & 1) * 0x2000)] << 8) | plane1[((colorplus->cga.memaddr << 1) & 0x1fff) + ((colorplus->cga.scanline & 1) * 0x2000) + 1];
+                    colorplus->cga.memaddr++;
                     for (c = 0; c < 8; c++) {
                         buffer32->line[colorplus->cga.displine][(x << 4) + (c << 1) + 8] = buffer32->line[colorplus->cga.displine][(x << 4) + (c << 1) + 1 + 8] = cols16[(dat0 >> 14) | ((dat1 >> 14) << 2)];
                         dat0 <<= 2;
@@ -176,7 +176,7 @@ colorplus_poll(void *priv)
             } else if (colorplus->control & COLORPLUS_640x200_MODE) {
                 cols[0] = (colorplus->cga.cgacol & 15) | 16;
                 col     = (colorplus->cga.cgacol & 16) ? 24 : 16;
-                if (colorplus->cga.cgamode & 4) {
+                if (colorplus->cga.cgamode & CGA_MODE_FLAG_BW) {
                     cols[1] = col | 3;
                     cols[2] = col | 4;
                     cols[3] = col | 7;
@@ -189,10 +189,10 @@ colorplus_poll(void *priv)
                     cols[2] = col | 4;
                     cols[3] = col | 6;
                 }
-                for (x = 0; x < colorplus->cga.crtc[1]; x++) {
-                    dat0 = (plane0[((colorplus->cga.ma << 1) & 0x1fff) + ((colorplus->cga.sc & 1) * 0x2000)] << 8) | plane0[((colorplus->cga.ma << 1) & 0x1fff) + ((colorplus->cga.sc & 1) * 0x2000) + 1];
-                    dat1 = (plane1[((colorplus->cga.ma << 1) & 0x1fff) + ((colorplus->cga.sc & 1) * 0x2000)] << 8) | plane1[((colorplus->cga.ma << 1) & 0x1fff) + ((colorplus->cga.sc & 1) * 0x2000) + 1];
-                    colorplus->cga.ma++;
+                for (x = 0; x < colorplus->cga.crtc[CGA_CRTC_HDISP]; x++) {
+                    dat0 = (plane0[((colorplus->cga.memaddr << 1) & 0x1fff) + ((colorplus->cga.scanline & 1) * 0x2000)] << 8) | plane0[((colorplus->cga.memaddr << 1) & 0x1fff) + ((colorplus->cga.scanline & 1) * 0x2000) + 1];
+                    dat1 = (plane1[((colorplus->cga.memaddr << 1) & 0x1fff) + ((colorplus->cga.scanline & 1) * 0x2000)] << 8) | plane1[((colorplus->cga.memaddr << 1) & 0x1fff) + ((colorplus->cga.scanline & 1) * 0x2000) + 1];
+                    colorplus->cga.memaddr++;
                     for (c = 0; c < 16; c++) {
                         buffer32->line[colorplus->cga.displine][(x << 4) + c + 8] = cols[(dat0 >> 15) | ((dat1 >> 15) << 1)];
                         dat0 <<= 1;
@@ -203,18 +203,18 @@ colorplus_poll(void *priv)
         } else /* Top / bottom border */
         {
             cols[0] = (colorplus->cga.cgacol & 15) + 16;
-            hline(buffer32, 0, colorplus->cga.displine, (colorplus->cga.crtc[1] << 4) + 16, cols[0]);
+            hline(buffer32, 0, colorplus->cga.displine, (colorplus->cga.crtc[CGA_CRTC_HDISP] << 4) + 16, cols[0]);
         }
 
-        x = (colorplus->cga.crtc[1] << 4) + 16;
+        x = (colorplus->cga.crtc[CGA_CRTC_HDISP] << 4) + 16;
 
         if (colorplus->cga.composite)
             Composite_Process(colorplus->cga.cgamode, 0, x >> 2, buffer32->line[colorplus->cga.displine]);
         else
             video_process_8(x, colorplus->cga.displine);
 
-        colorplus->cga.sc = oldsc;
-        if (colorplus->cga.vc == colorplus->cga.crtc[7] && !colorplus->cga.sc)
+        colorplus->cga.scanline = scanline_old;
+        if (colorplus->cga.vc == colorplus->cga.crtc[CGA_CRTC_VSYNC] && !colorplus->cga.scanline)
             colorplus->cga.cgastat |= 8;
         colorplus->cga.displine++;
         if (colorplus->cga.displine >= 360)
@@ -227,54 +227,54 @@ colorplus_poll(void *priv)
             if (!colorplus->cga.vsynctime)
                 colorplus->cga.cgastat &= ~8;
         }
-        if (colorplus->cga.sc == (colorplus->cga.crtc[11] & 31) || ((colorplus->cga.crtc[8] & 3) == 3 && colorplus->cga.sc == ((colorplus->cga.crtc[11] & 31) >> 1))) {
-            colorplus->cga.con  = 0;
-            colorplus->cga.coff = 1;
+        if (colorplus->cga.scanline == (colorplus->cga.crtc[CGA_CRTC_CURSOR_END] & 31) 
+        || ((colorplus->cga.crtc[CGA_CRTC_INTERLACE] & 3) == 3 && colorplus->cga.scanline == ((colorplus->cga.crtc[CGA_CRTC_CURSOR_END] & 31) >> 1))) {
+            colorplus->cga.cursorvisible  = 0;
         }
-        if ((colorplus->cga.crtc[8] & 3) == 3 && colorplus->cga.sc == (colorplus->cga.crtc[9] >> 1))
-            colorplus->cga.maback = colorplus->cga.ma;
+        if ((colorplus->cga.crtc[CGA_CRTC_INTERLACE] & 3) == 3 && colorplus->cga.scanline == (colorplus->cga.crtc[CGA_CRTC_MAX_SCANLINE_ADDR] >> 1))
+            colorplus->cga.memaddr_backup = colorplus->cga.memaddr;
         if (colorplus->cga.vadj) {
-            colorplus->cga.sc++;
-            colorplus->cga.sc &= 31;
-            colorplus->cga.ma = colorplus->cga.maback;
+            colorplus->cga.scanline++;
+            colorplus->cga.scanline &= 31;
+            colorplus->cga.memaddr = colorplus->cga.memaddr_backup;
             colorplus->cga.vadj--;
             if (!colorplus->cga.vadj) {
                 colorplus->cga.cgadispon = 1;
-                colorplus->cga.ma = colorplus->cga.maback = (colorplus->cga.crtc[13] | (colorplus->cga.crtc[12] << 8)) & 0x3fff;
-                colorplus->cga.sc                         = 0;
+                colorplus->cga.memaddr = colorplus->cga.memaddr_backup = (colorplus->cga.crtc[CGA_CRTC_START_ADDR_LOW] | (colorplus->cga.crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x3fff;
+                colorplus->cga.scanline                         = 0;
             }
-        } else if (colorplus->cga.sc == colorplus->cga.crtc[9]) {
-            colorplus->cga.maback = colorplus->cga.ma;
-            colorplus->cga.sc     = 0;
+        } else if (colorplus->cga.scanline == colorplus->cga.crtc[CGA_CRTC_MAX_SCANLINE_ADDR]) {
+            colorplus->cga.memaddr_backup = colorplus->cga.memaddr;
+            colorplus->cga.scanline     = 0;
             oldvc                 = colorplus->cga.vc;
             colorplus->cga.vc++;
             colorplus->cga.vc &= 127;
 
-            if (colorplus->cga.vc == colorplus->cga.crtc[6])
+            if (colorplus->cga.vc == colorplus->cga.crtc[CGA_CRTC_VDISP])
                 colorplus->cga.cgadispon = 0;
 
-            if (oldvc == colorplus->cga.crtc[4]) {
+            if (oldvc == colorplus->cga.crtc[CGA_CRTC_VTOTAL]) {
                 colorplus->cga.vc   = 0;
-                colorplus->cga.vadj = colorplus->cga.crtc[5];
+                colorplus->cga.vadj = colorplus->cga.crtc[CGA_CRTC_VTOTAL_ADJUST];
                 if (!colorplus->cga.vadj)
                     colorplus->cga.cgadispon = 1;
                 if (!colorplus->cga.vadj)
-                    colorplus->cga.ma = colorplus->cga.maback = (colorplus->cga.crtc[13] | (colorplus->cga.crtc[12] << 8)) & 0x3fff;
-                if ((colorplus->cga.crtc[10] & 0x60) == 0x20)
+                    colorplus->cga.memaddr = colorplus->cga.memaddr_backup = (colorplus->cga.crtc[CGA_CRTC_START_ADDR_LOW] | (colorplus->cga.crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x3fff;
+                if ((colorplus->cga.crtc[CGA_CRTC_CURSOR_START] & 0x60) == 0x20)
                     colorplus->cga.cursoron = 0;
                 else
                     colorplus->cga.cursoron = colorplus->cga.cgablink & 8;
             }
 
-            if (colorplus->cga.vc == colorplus->cga.crtc[7]) {
+            if (colorplus->cga.vc == colorplus->cga.crtc[CGA_CRTC_VSYNC]) {
                 colorplus->cga.cgadispon = 0;
                 colorplus->cga.displine  = 0;
                 colorplus->cga.vsynctime = 16;
-                if (colorplus->cga.crtc[7]) {
-                    if (colorplus->cga.cgamode & 1)
-                        x = (colorplus->cga.crtc[1] << 3) + 16;
+                if (colorplus->cga.crtc[CGA_CRTC_VSYNC]) {
+                    if (colorplus->cga.cgamode & CGA_MODE_FLAG_HIGHRES)
+                        x = (colorplus->cga.crtc[CGA_CRTC_HDISP] << 3) + 16;
                     else
-                        x = (colorplus->cga.crtc[1] << 4) + 16;
+                        x = (colorplus->cga.crtc[CGA_CRTC_HDISP] << 4) + 16;
                     colorplus->cga.lastline++;
                     if (x != xsize || (colorplus->cga.lastline - colorplus->cga.firstline) != ysize) {
                         xsize = x;
@@ -291,15 +291,15 @@ colorplus_poll(void *priv)
 
                     video_res_x = xsize - 16;
                     video_res_y = ysize;
-                    if (colorplus->cga.cgamode & 1) {
+                    if (colorplus->cga.cgamode & CGA_MODE_FLAG_HIGHRES) {
                         video_res_x /= 8;
-                        video_res_y /= colorplus->cga.crtc[9] + 1;
+                        video_res_y /= colorplus->cga.crtc[CGA_CRTC_MAX_SCANLINE_ADDR] + 1;
                         video_bpp = 0;
-                    } else if (!(colorplus->cga.cgamode & 2)) {
+                    } else if (!(colorplus->cga.cgamode & CGA_MODE_FLAG_GRAPHICS)) {
                         video_res_x /= 16;
-                        video_res_y /= colorplus->cga.crtc[9] + 1;
+                        video_res_y /= colorplus->cga.crtc[CGA_CRTC_MAX_SCANLINE_ADDR] + 1;
                         video_bpp = 0;
-                    } else if (!(colorplus->cga.cgamode & 16)) {
+                    } else if (!(colorplus->cga.cgamode & CGA_MODE_FLAG_HIGHRES_GRAPHICS)) {
                         video_res_x /= 2;
                         video_bpp = 2;
                     } else {
@@ -312,17 +312,17 @@ colorplus_poll(void *priv)
                 colorplus->cga.oddeven ^= 1;
             }
         } else {
-            colorplus->cga.sc++;
-            colorplus->cga.sc &= 31;
-            colorplus->cga.ma = colorplus->cga.maback;
+            colorplus->cga.scanline++;
+            colorplus->cga.scanline &= 31;
+            colorplus->cga.memaddr = colorplus->cga.memaddr_backup;
         }
         if (colorplus->cga.cgadispon)
             colorplus->cga.cgastat &= ~1;
-        if (colorplus->cga.sc == (colorplus->cga.crtc[10] & 31) || ((colorplus->cga.crtc[8] & 3) == 3 && colorplus->cga.sc == ((colorplus->cga.crtc[10] & 31) >> 1)))
-            colorplus->cga.con = 1;
-        if (colorplus->cga.cgadispon && (colorplus->cga.cgamode & 1)) {
-            for (x = 0; x < (colorplus->cga.crtc[1] << 1); x++)
-                colorplus->cga.charbuffer[x] = colorplus->cga.vram[((colorplus->cga.ma << 1) + x) & 0x3fff];
+        if (colorplus->cga.scanline == (colorplus->cga.crtc[CGA_CRTC_CURSOR_START] & 31) || ((colorplus->cga.crtc[CGA_CRTC_INTERLACE] & 3) == 3 && colorplus->cga.scanline == ((colorplus->cga.crtc[CGA_CRTC_CURSOR_START] & 31) >> 1)))
+            colorplus->cga.cursorvisible = 1;
+        if (colorplus->cga.cgadispon && (colorplus->cga.cgamode & CGA_MODE_FLAG_HIGHRES)) {
+            for (x = 0; x < (colorplus->cga.crtc[CGA_CRTC_HDISP] << 1); x++)
+                colorplus->cga.charbuffer[x] = colorplus->cga.vram[((colorplus->cga.memaddr << 1) + x) & 0x3fff];
         }
     }
 }
@@ -357,7 +357,11 @@ colorplus_standalone_init(UNUSED(const device_t *info))
     mem_mapping_add(&colorplus->cga.mapping, 0xb8000, 0x08000, colorplus_read, NULL, NULL, colorplus_write, NULL, NULL, NULL, MEM_MAPPING_EXTERNAL, colorplus);
     io_sethandler(0x03d0, 0x0010, colorplus_in, NULL, NULL, colorplus_out, NULL, NULL, colorplus);
 
-    lpt3_init(0x3BC);
+    colorplus->lpt = device_add_inst(&lpt_port_device, 1);
+    lpt_port_setup(colorplus->lpt, LPT_MDA_ADDR);
+    lpt_set_3bc_used(1);
+
+    monitors[monitor_index_global].mon_composite = colorplus->cga.composite;
 
     return colorplus;
 }
@@ -382,52 +386,47 @@ colorplus_speed_changed(void *priv)
 static const device_config_t colorplus_config[] = {
   // clang-format off
     {
-        .name = "display_type",
-        .description = "Display type",
-        .type = CONFIG_SELECTION,
-        .default_int = CGA_RGB,
-        .selection = {
-            {
-                .description = "RGB",
-                .value = CGA_RGB
-            },
-            {
-                .description = "Composite",
-                .value = CGA_COMPOSITE
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "display_type",
+        .description    = "Display type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = CGA_RGB,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "RGB",       .value = CGA_RGB       },
+            { .description = "Composite", .value = CGA_COMPOSITE },
+            { .description = ""                                  }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "composite_type",
-        .description = "Composite type",
-        .type = CONFIG_SELECTION,
-        .default_int = COMPOSITE_OLD,
-        .selection = {
-            {
-                .description = "Old",
-                .value = COMPOSITE_OLD
-            },
-            {
-                .description = "New",
-                .value = COMPOSITE_NEW
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "composite_type",
+        .description    = "Composite type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = COMPOSITE_OLD,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Old", .value = COMPOSITE_OLD },
+            { .description = "New", .value = COMPOSITE_NEW },
+            { .description = ""                            }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "snow_enabled",
-        .description = "Snow emulation",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "snow_enabled",
+        .description    = "Snow emulation",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
@@ -439,7 +438,7 @@ const device_t colorplus_device = {
     .init          = colorplus_standalone_init,
     .close         = colorplus_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = colorplus_speed_changed,
     .force_redraw  = NULL,
     .config        = colorplus_config
diff --git a/src/video/vid_cga_comp.c b/src/video/vid_cga_comp.c
index d580f0c06..a316f79fb 100644
--- a/src/video/vid_cga_comp.c
+++ b/src/video/vid_cga_comp.c
@@ -28,9 +28,12 @@
 #include <86box/mem.h>
 #include <86box/vid_cga.h>
 #include <86box/vid_cga_comp.h>
+#include <86box/thread.h>
 
 int CGA_Composite_Table[1024];
 
+static mutex_t* cga_comp_mutex = NULL;
+
 static double brightness = 0;
 static double contrast   = 100;
 static double saturation = 100;
@@ -44,22 +47,22 @@ static const double tau = 6.28318531; /* == 2*pi */
 
 static unsigned char chroma_multiplexer[256] = {
     // clang-format off
-      2,  2,  2,  2, 114,174,  4,  3,   2,  1,133,135,   2,113,150,  4,
-    133,  2,  1, 99, 151,152,  2,  1,   3,  2, 96,136, 151,152,151,152,
-      2, 56, 62,  4, 111,250,118,  4,   0, 51,207,137,   1,171,209,  5,
-    140, 50, 54,100, 133,202, 57,  4,   2, 50,153,149, 128,198,198,135,
-     32,  1, 36, 81, 147,158,  1, 42,  33,  1,210,254,  34,109,169, 77,
-    177,  2,  0,165, 189,154,  3, 44,  33,  0, 91,197, 178,142,144,192,
-      4,  2, 61, 67, 117,151,112, 83,   4,  0,249,255,   3,107,249,117,
-    147,  1, 50,162, 143,141, 52, 54,   3,  0,145,206, 124,123,192,193,
-     72, 78,  2,  0, 159,208,  4,  0,  53, 58,164,159,  37,159,171,  1,
-    248,117,  4, 98, 212,218,  5,  2,  54, 59, 93,121, 176,181,134,130,
-      1, 61, 31,  0, 160,255, 34,  1,   1, 58,197,166,   0,177,194,  2,
-    162,111, 34, 96, 205,253, 32,  1,   1, 57,123,125, 119,188,150,112,
-     78,  4,  0, 75, 166,180, 20, 38,  78,  1,143,246,  42,113,156, 37,
-    252,  4,  1,188, 175,129,  1, 37, 118,  4, 88,249, 202,150,145,200,
-     61, 59, 60, 60, 228,252,117, 77,  60, 58,248,251,  81,212,254,107,
-    198, 59, 58,169, 250,251, 81, 80, 100, 58,154,250, 251,252,252,252
+      2,   2,  2,   2, 114, 174,   4,  3,   2,  1, 133, 135,   2, 113, 150,   4,
+    133,   2,  1,  99, 151, 152,   2,  1,   3,  2,  96, 136, 151, 152, 151, 152,
+      2,  56, 62,   4, 111, 250, 118,  4,   0, 51, 207, 137,   1, 171, 209,   5,
+    140,  50, 54, 100, 133, 202,  57,  4,   2, 50, 153, 149, 128, 198, 198, 135,
+     32,   1, 36,  81, 147, 158,   1, 42,  33,  1, 210, 254,  34, 109, 169,  77,
+    177,   2,  0, 165, 189, 154,   3, 44,  33,  0,  91, 197, 178, 142, 144, 192,
+      4,   2, 61,  67, 117, 151, 112, 83,   4,  0, 249, 255,   3, 107, 249, 117,
+    147,   1, 50, 162, 143, 141,  52, 54,   3,  0, 145, 206, 124, 123, 192, 193,
+     72,  78,  2,   0, 159, 208,   4,  0,  53, 58, 164, 159,  37, 159, 171,   1,
+    248, 117,  4,  98, 212, 218,   5,  2,  54, 59,  93, 121, 176, 181, 134, 130,
+      1,  61, 31,   0, 160, 255,  34,  1,   1, 58, 197, 166,   0, 177, 194,   2,
+    162, 111, 34,  96, 205, 253,  32,  1,   1, 57, 123, 125, 119, 188, 150, 112,
+     78,   4,  0,  75, 166, 180,  20, 38,  78,  1, 143, 246,  42, 113, 156,  37,
+    252,   4,  1, 188, 175, 129,   1, 37, 118,  4,  88, 249, 202, 150, 145, 200,
+     61,  59, 60,  60, 228, 252, 117, 77,  60, 58, 248, 251,  81, 212, 254, 107,
+    198,  59, 58, 169, 250, 251,  81, 80, 100, 58, 154, 250, 251, 252, 252, 252
     // clang-format on
 };
 
@@ -69,23 +72,30 @@ static double intensity[4] = {
 
 #define NEW_CGA(c, i, r, g, b) (((c) / 0.72) * 0.29 + ((i) / 0.28) * 0.32 + ((r) / 0.28) * 0.1 + ((g) / 0.28) * 0.22 + ((b) / 0.28) * 0.07)
 
-double mode_brightness;
-double mode_contrast;
-double mode_hue;
-double min_v;
-double max_v;
+volatile double mode_brightness;
+volatile double mode_contrast;
+volatile double mode_hue;
+volatile double min_v;
+volatile double max_v;
 
-double video_ri;
-double video_rq;
-double video_gi;
-double video_gq;
-double video_bi;
-double video_bq;
-int    video_sharpness;
-int    tandy_mode_control = 0;
+volatile double video_ri;
+volatile double video_rq;
+volatile double video_gi;
+volatile double video_gq;
+volatile double video_bi;
+volatile double video_bq;
+volatile int    video_sharpness;
 
 static bool new_cga = 0;
 
+static uint8_t current_cgamode = 0;
+
+int vid_cga_comp_brightness = 0;
+int vid_cga_comp_sharpness = 0;
+int vid_cga_comp_hue = 0;
+int vid_cga_comp_saturation = 100;
+int vid_cga_comp_contrast = 100;
+
 void
 update_cga16_color(uint8_t cgamode)
 {
@@ -109,6 +119,14 @@ update_cga16_color(uint8_t cgamode)
     static const double bi = -1.1069;
     static const double bq = 1.7046;
 
+    if (!cga_comp_mutex)
+        cga_comp_mutex = thread_create_mutex();
+
+    if (is_cpu_thread)
+        thread_wait_mutex(cga_comp_mutex);
+
+    current_cgamode = cgamode;
+
     if (!new_cga) {
         min_v = chroma_multiplexer[0] + intensity[0];
         max_v = chroma_multiplexer[255] + intensity[3];
@@ -135,7 +153,7 @@ update_cga16_color(uint8_t cgamode)
         int left  = (x >> 6) & 15;
         int rc    = right;
         int lc    = left;
-        if ((cgamode & 4) != 0) {
+        if ((cgamode & CGA_MODE_FLAG_BW) != 0) {
             rc = (right & 8) | ((right & 7) != 0 ? 7 : 0);
             lc = (left & 8) | ((left & 7) != 0 ? 7 : 0);
         }
@@ -170,6 +188,9 @@ update_cga16_color(uint8_t cgamode)
     video_bi        = (int) (bi * iq_adjust_i + bq * iq_adjust_q);
     video_bq        = (int) (-bi * iq_adjust_q + bq * iq_adjust_i);
     video_sharpness = (int) (sharpness * 256 / 100);
+
+    if (is_cpu_thread)
+        thread_release_mutex(cga_comp_mutex);
 }
 
 static uint8_t
@@ -240,7 +261,7 @@ Composite_Process(uint8_t cgamode, uint8_t border, uint32_t blocks /*, bool doub
     for (uint8_t x = 0; x < 5; ++x)
         OUT(b[x & 3]);
 
-    if ((cgamode & 4) != 0) {
+    if ((cgamode & CGA_MODE_FLAG_BW) != 0) {
         /* Decode */
         i    = temp + 5;
         srgb = TempLine;
@@ -369,17 +390,41 @@ DecreaseSharpness(uint8_t cgamode)
     update_cga16_color(cgamode);
 }
 
+void
+cga_comp_reload(int new_brightness, int new_saturation, int new_sharpness, int new_hue, int new_contrast)
+{
+    if (!cga_comp_mutex)
+        cga_comp_mutex = thread_create_mutex();
+
+    if (!is_cpu_thread)
+        thread_wait_mutex(cga_comp_mutex);
+
+    brightness = new_brightness;
+    contrast   = new_contrast;
+    saturation = new_saturation;
+    sharpness  = new_sharpness;
+    hue_offset = new_hue;
+
+    update_cga16_color(current_cgamode);
+
+    if (!is_cpu_thread)
+        thread_release_mutex(cga_comp_mutex);
+}
+
 void
 cga_comp_init(int revision)
 {
+    if (!cga_comp_mutex)
+        cga_comp_mutex = thread_create_mutex();
+
     new_cga = revision;
 
     /* Making sure this gets reset after reset. */
-    brightness = 0;
-    contrast   = 100;
-    saturation = 100;
-    sharpness  = 0;
-    hue_offset = 0;
+    brightness = vid_cga_comp_brightness;
+    contrast   = vid_cga_comp_contrast;
+    saturation = vid_cga_comp_saturation;
+    sharpness  = vid_cga_comp_sharpness;
+    hue_offset = vid_cga_comp_hue;
 
     update_cga16_color(0);
 }
diff --git a/src/video/vid_cga_compaq.c b/src/video/vid_cga_compaq.c
new file mode 100644
index 000000000..81b063248
--- /dev/null
+++ b/src/video/vid_cga_compaq.c
@@ -0,0 +1,513 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Emulation of the Compaq CGA graphics cards.
+ *
+ *
+ *
+ * Authors: John Elliott, <jce@seasip.info>
+ *          Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2016-2019 John Elliott.
+ *          Copyright 2008-2019 Sarah Walker.
+ *          Copyright 2016-2019 Miran Grca.
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <math.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/pit.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/device.h>
+#include <86box/video.h>
+#include <86box/vid_cga.h>
+#include <86box/vid_cga_comp.h>
+
+#define CGA_RGB       0
+#define CGA_COMPOSITE 1
+
+static uint32_t vflags;
+static uint8_t  mdaattr[256][2][2];
+
+#ifdef ENABLE_COMPAQ_CGA_LOG
+int compaq_cga_do_log = ENABLE_COMPAQ_CGA_LOG;
+
+static void
+compaq_cga_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (compaq_cga_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define compaq_cga_log(fmt, ...)
+#endif
+
+static void
+compaq_cga_recalctimings(cga_t *dev)
+{
+    double _dispontime;
+    double _dispofftime;
+    double disptime;
+    disptime = dev->crtc[CGA_CRTC_HTOTAL] + 1;
+
+    _dispontime  = dev->crtc[CGA_CRTC_HDISP];
+    _dispofftime = disptime - _dispontime;
+    _dispontime *= MDACONST;
+    _dispofftime *= MDACONST;
+    dev->dispontime  = (uint64_t) (_dispontime);
+    dev->dispofftime = (uint64_t) (_dispofftime);
+}
+
+static void
+compaq_cga_poll(void *priv)
+{
+    cga_t        *dev  = (cga_t *) priv;
+    uint16_t      cursoraddr   = (dev->crtc[CGA_CRTC_CURSOR_ADDR_LOW] | (dev->crtc[CGA_CRTC_CURSOR_ADDR_HIGH] << 8)) & 0x3fff;
+    int           drawcursor;
+    int           x;
+    int           c;
+    int           xs_temp;
+    int           ys_temp;
+    int           oldvc;
+    uint8_t       chr;
+    uint8_t       attr;
+    uint8_t       border;
+    uint8_t       cols[4];
+    int           scanline_old;
+    int           underline = 0;
+    int           blink     = 0;
+
+    int32_t  highres_graphics_flag = (CGA_MODE_FLAG_HIGHRES_GRAPHICS | CGA_MODE_FLAG_GRAPHICS);
+
+    /* If in graphics mode or character height is not 13, behave as CGA */
+    if ((dev->cgamode & highres_graphics_flag) || (dev->crtc[CGA_CRTC_MAX_SCANLINE_ADDR] != 13)) {
+        overscan_x = overscan_y = 16;
+        cga_poll(dev);
+        return;
+    } else
+        overscan_x = overscan_y = 0;
+
+    /* We are in Compaq 350-line CGA territory */
+    if (!dev->linepos) {
+        timer_advance_u64(&dev->timer, dev->dispofftime);
+        dev->cgastat |= 1;
+        dev->linepos  = 1;
+        scanline_old         = dev->scanline;
+        if ((dev->crtc[CGA_CRTC_INTERLACE] & 3) == 3)
+            dev->scanline = ((dev->scanline << 1) + dev->oddeven) & 7;
+        if (dev->cgadispon) {
+            if (dev->displine < dev->firstline) {
+                dev->firstline = dev->displine;
+                video_wait_for_buffer();
+                compaq_cga_log("Firstline %i\n", dev->firstline);
+            }
+            dev->lastline = dev->displine;
+
+            cols[0] = (dev->cgacol & 15) + 16;
+
+            for (c = 0; c < 8; c++) {
+                buffer32->line[dev->displine][c] = cols[0];
+                if (dev->cgamode & CGA_MODE_FLAG_HIGHRES)
+                    buffer32->line[dev->displine][c + (dev->crtc[CGA_CRTC_HDISP] << 3) + 8] = cols[0];
+                else
+                    buffer32->line[dev->displine][c + (dev->crtc[CGA_CRTC_HDISP] << 4) + 8] = cols[0];
+            }
+
+            if (dev->cgamode & CGA_MODE_FLAG_HIGHRES) {
+                for (x = 0; x < dev->crtc[CGA_CRTC_HDISP]; x++) {
+                    chr        = dev->charbuffer[x << 1];
+                    attr       = dev->charbuffer[(x << 1) + 1];
+                    drawcursor = ((dev->memaddr == cursoraddr) && dev->cursorvisible && dev->cursoron);
+
+                    if (vflags) {
+                        underline = 0;
+                        blink     = ((dev->cgablink & 8) && (dev->cgamode & CGA_MODE_FLAG_BLINK) && (attr & 0x80) && !drawcursor);
+                    }
+
+                    if (vflags && (dev->cgamode & 0x80)) {
+                        cols[0] = mdaattr[attr][blink][0];
+                        cols[1] = mdaattr[attr][blink][1];
+
+                        if ((dev->scanline == 12) && ((attr & 7) == 1))
+                            underline = 1;
+                    } else if (dev->cgamode & CGA_MODE_FLAG_BLINK) {
+                        cols[1] = (attr & 15) + 16;
+                        cols[0] = ((attr >> 4) & 7) + 16;
+
+                        if (vflags) {
+                            if (blink)
+                                cols[1] = cols[0];
+                        } else {
+                            if ((dev->cgablink & 8) && (attr & 0x80) && !dev->drawcursor)
+                                cols[1] = cols[0];
+                        }
+                    } else {
+                        cols[1] = (attr & 15) + 16;
+                        cols[0] = (attr >> 4) + 16;
+                    }
+
+                    if (vflags && underline) {
+                        for (c = 0; c < 8; c++)
+                            buffer32->line[dev->displine][(x << 3) + c + 8] = mdaattr[attr][blink][1];
+                    } else if (drawcursor) {
+                        for (c = 0; c < 8; c++)
+                            buffer32->line[dev->displine][(x << 3) + c + 8] =
+                                cols[(fontdatm[chr + dev->fontbase][dev->scanline & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
+                    } else {
+                        for (c = 0; c < 8; c++)
+                            buffer32->line[dev->displine][(x << 3) + c + 8] =
+                                cols[(fontdatm[chr + dev->fontbase][dev->scanline & 15] & (1 << (c ^ 7))) ? 1 : 0];
+                    }
+                    dev->memaddr++;
+                }
+            } else {
+                for (x = 0; x < dev->crtc[CGA_CRTC_HDISP]; x++) {
+                    chr        = dev->vram[(dev->memaddr << 1) & 0x3fff];
+                    attr       = dev->vram[((dev->memaddr << 1) + 1) & 0x3fff];
+                    drawcursor = ((dev->memaddr == cursoraddr) && dev->cursorvisible && dev->cursoron);
+
+                    if (vflags) {
+                        underline = 0;
+                        blink     = ((dev->cgablink & 8) && (dev->cgamode & CGA_MODE_FLAG_BLINK) && (attr & 0x80) && !drawcursor);
+                    }
+
+                    if (vflags && (dev->cgamode & 0x80)) {
+                        cols[0] = mdaattr[attr][blink][0];
+                        cols[1] = mdaattr[attr][blink][1];
+                        if (dev->scanline == 12 && (attr & 7) == 1)
+                            underline = 1;
+                    } else if (dev->cgamode & CGA_MODE_FLAG_BLINK) {
+                        cols[1] = (attr & 15) + 16;
+                        cols[0] = ((attr >> 4) & 7) + 16;
+
+                        if (vflags) {
+                            if (blink)
+                                cols[1] = cols[0];
+                        } else {
+                            if ((dev->cgablink & 8) && (attr & 0x80) && !dev->drawcursor)
+                                cols[1] = cols[0];
+                        }
+                    } else {
+                        cols[1] = (attr & 15) + 16;
+                        cols[0] = (attr >> 4) + 16;
+                    }
+                    dev->memaddr++;
+
+                    if (vflags && underline) {
+                        for (c = 0; c < 8; c++)
+                            buffer32->line[dev->displine][(x << 4) + (c << 1) + 8] =
+                                buffer32->line[dev->displine][(x << 4) + (c << 1) + 9] = mdaattr[attr][blink][1];
+                    } else if (drawcursor) {
+                        for (c = 0; c < 8; c++)
+                            buffer32->line[dev->displine][(x << 4) + (c << 1) + 8] =
+                                buffer32->line[dev->displine][(x << 4) + (c << 1) + 1 + 8] =
+                                cols[(fontdatm[chr + dev->fontbase][dev->scanline & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
+                    } else {
+                        for (c = 0; c < 8; c++)
+                            buffer32->line[dev->displine][(x << 4) + (c << 1) + 8] =
+                                buffer32->line[dev->displine][(x << 4) + (c << 1) + 1 + 8] =
+                                cols[(fontdatm[chr + dev->fontbase][dev->scanline & 15] & (1 << (c ^ 7))) ? 1 : 0];
+                    }
+                }
+            }
+        } else {
+            cols[0] = (dev->cgacol & 15) + 16;
+
+            if (dev->cgamode & CGA_MODE_FLAG_HIGHRES)
+                hline(buffer32, 0, dev->displine, (dev->crtc[CGA_CRTC_HDISP] << 3) + 16, cols[0]);
+            else
+                hline(buffer32, 0, dev->displine, (dev->crtc[CGA_CRTC_HDISP] << 4) + 16, cols[0]);
+        }
+
+        if (dev->cgamode & CGA_MODE_FLAG_HIGHRES)
+            x = (dev->crtc[CGA_CRTC_HDISP] << 3) + 16;
+        else
+            x = (dev->crtc[CGA_CRTC_HDISP] << 4) + 16;
+
+        if (dev->composite) {
+            if (dev->cgamode & CGA_MODE_FLAG_HIGHRES_GRAPHICS)
+                border = 0x00;
+            else
+                border = dev->cgacol & 0x0f;
+
+            if (vflags)
+                Composite_Process(dev->cgamode & 0x7f, border, x >> 2, buffer32->line[dev->displine]);
+            else
+                Composite_Process(dev->cgamode, border, x >> 2, buffer32->line[dev->displine]);
+        } else
+            video_process_8(x, dev->displine);
+
+        dev->scanline = scanline_old;
+        if (dev->vc == dev->crtc[CGA_CRTC_VSYNC] && !dev->scanline)
+            dev->cgastat |= 8;
+        dev->displine++;
+        if (dev->displine >= 500)
+            dev->displine = 0;
+    } else {
+        timer_advance_u64(&dev->timer, dev->dispontime);
+        dev->linepos = 0;
+        if (dev->vsynctime) {
+            dev->vsynctime--;
+            if (!dev->vsynctime)
+                dev->cgastat &= ~8;
+        }
+
+        if (dev->scanline == (dev->crtc[11] & 31) || ((dev->crtc[8] & 3) == 3 && dev->scanline == ((dev->crtc[11] & 31) >> 1))) {
+            dev->cursorvisible  = 0;
+        }
+        if ((dev->crtc[8] & 3) == 3 && dev->scanline == (dev->crtc[9] >> 1))
+            dev->memaddr_backup = dev->memaddr;
+        if (dev->vadj) {
+            dev->scanline++;
+            dev->scanline &= 31;
+            dev->memaddr = dev->memaddr_backup;
+            dev->vadj--;
+            if (!dev->vadj) {
+                dev->cgadispon = 1;
+                dev->memaddr = dev->memaddr_backup = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
+                dev->scanline                    = 0;
+            }
+        } else if (dev->scanline == dev->crtc[9]) {
+            dev->memaddr_backup = dev->memaddr;
+            dev->scanline     = 0;
+            oldvc            = dev->vc;
+            dev->vc++;
+            dev->vc &= 127;
+
+            if (dev->vc == dev->crtc[6])
+                dev->cgadispon = 0;
+
+            if (oldvc == dev->crtc[4]) {
+                dev->vc   = 0;
+                dev->vadj = dev->crtc[5];
+
+                if (!dev->vadj)
+                    dev->cgadispon = 1;
+
+                if (!dev->vadj)
+                    dev->memaddr = dev->memaddr_backup = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
+
+                if ((dev->crtc[10] & 0x60) == 0x20)
+                    dev->cursoron = 0;
+                else
+                    dev->cursoron = dev->cgablink & 8;
+            }
+
+            if (dev->vc == dev->crtc[7]) {
+                dev->cgadispon = 0;
+                dev->displine  = 0;
+                dev->vsynctime = 16;
+
+                if (dev->crtc[7]) {
+                    compaq_cga_log("Lastline %i Firstline %i  %i\n", dev->lastline,
+                                   dev->firstline, dev->lastline - dev->firstline);
+
+                    if (dev->cgamode & CGA_MODE_FLAG_HIGHRES)
+                        x = (dev->crtc[CGA_CRTC_HDISP] << 3) + 16;
+                    else
+                        x = (dev->crtc[CGA_CRTC_HDISP] << 4) + 16;
+
+                    dev->lastline++;
+
+                    xs_temp = x;
+                    ys_temp = (dev->lastline - dev->firstline);
+
+                    if ((xs_temp > 0) && (ys_temp > 0)) {
+                        if (xs_temp < 64)
+                            xs_temp = 656;
+                        if (ys_temp < 32)
+                            ys_temp = 400;
+                        if (!enable_overscan)
+                            xs_temp -= 16;
+
+                        if ((dev->cgamode & 8) && ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get())) {
+                            xsize = xs_temp;
+                            ysize = ys_temp;
+                            set_screen_size(xsize, ysize + (enable_overscan ? 16 : 0));
+
+                            if (video_force_resize_get())
+                                video_force_resize_set(0);
+                        }
+
+                        if (enable_overscan)
+                            video_blit_memtoscreen(0, dev->firstline - 8, xsize, (dev->lastline - dev->firstline) + 16);
+                        else
+                            video_blit_memtoscreen(8, dev->firstline, xsize, dev->lastline - dev->firstline);
+                    }
+
+                    frames++;
+
+                    video_res_x = xsize;
+                    if (enable_overscan)
+                        xsize -= 16;
+                    video_res_y = ysize;
+                    if (dev->cgamode & CGA_MODE_FLAG_HIGHRES) {
+                        video_res_x /= 8;
+                        video_res_y /= dev->crtc[9] + 1;
+                        video_bpp = 0;
+                    } else if (!(dev->cgamode & 2)) {
+                        video_res_x /= 16;
+                        video_res_y /= dev->crtc[9] + 1;
+                        video_bpp = 0;
+                    } else if (!(dev->cgamode & 16)) {
+                        video_res_x /= 2;
+                        video_bpp = 2;
+                    } else
+                        video_bpp = 1;
+                }
+
+                dev->firstline = 1000;
+                dev->lastline  = 0;
+                dev->cgablink++;
+                dev->oddeven ^= 1;
+            }
+        } else {
+            dev->scanline++;
+            dev->scanline &= 31;
+            dev->memaddr = dev->memaddr_backup;
+        }
+
+        if (dev->cgadispon)
+            dev->cgastat &= ~1;
+
+        if (dev->scanline == (dev->crtc[10] & 31) || ((dev->crtc[8] & 3) == 3 && dev->scanline == ((dev->crtc[10] & 31) >> 1)))
+            dev->cursorvisible = 1;
+
+        if (dev->cgadispon && (dev->cgamode & CGA_MODE_FLAG_HIGHRES)) {
+            for (x = 0; x < (dev->crtc[CGA_CRTC_HDISP] << 1); x++)
+                dev->charbuffer[x] = dev->vram[((dev->memaddr << 1) + x) & 0x3fff];
+        }
+    }
+}
+
+static void *
+compaq_cga_init(const device_t *info)
+{
+    int    display_type;
+    cga_t *dev          = calloc(1, sizeof(cga_t));
+
+    display_type        = device_get_config_int("display_type");
+    dev->composite      = (display_type != CGA_RGB);
+    dev->revision       = device_get_config_int("composite_type");
+    dev->snow_enabled   = device_get_config_int("snow_enabled");
+
+    dev->vram           = malloc(0x4000);
+
+    cga_comp_init(dev->revision);
+    timer_add(&dev->timer, compaq_cga_poll, dev, 1);
+    mem_mapping_add(&dev->mapping, 0xb8000, 0x08000,
+                    cga_read, NULL, NULL,
+                    cga_write, NULL, NULL,
+                    NULL, MEM_MAPPING_EXTERNAL, dev);
+    io_sethandler(0x03d0, 0x0010,
+                  cga_in, NULL, NULL,
+                  cga_out, NULL, NULL,
+                  dev);
+
+    if (info->local) {
+        for (uint16_t c = 0; c < 256; c++) {
+            mdaattr[c][0][0] = mdaattr[c][1][0] = mdaattr[c][1][1] = 16;
+            if (c & 8)
+                mdaattr[c][0][1] = 15 + 16;
+            else
+                mdaattr[c][0][1] = 7 + 16;
+        }
+
+        mdaattr[0x70][0][1] = 16;
+        mdaattr[0x70][0][0] = mdaattr[0x70][1][0] = mdaattr[0x70][1][1] = 16 + 15;
+        mdaattr[0xF0][0][1]                                             = 16;
+        mdaattr[0xF0][0][0] = mdaattr[0xF0][1][0] = mdaattr[0xF0][1][1] = 16 + 15;
+        mdaattr[0x78][0][1]                                             = 16 + 7;
+        mdaattr[0x78][0][0] = mdaattr[0x78][1][0] = mdaattr[0x78][1][1] = 16 + 15;
+        mdaattr[0xF8][0][1]                                             = 16 + 7;
+        mdaattr[0xF8][0][0] = mdaattr[0xF8][1][0] = mdaattr[0xF8][1][1] = 16 + 15;
+        mdaattr[0x00][0][1] = mdaattr[0x00][1][1] = 16;
+        mdaattr[0x08][0][1] = mdaattr[0x08][1][1] = 16;
+        mdaattr[0x80][0][1] = mdaattr[0x80][1][1] = 16;
+        mdaattr[0x88][0][1] = mdaattr[0x88][1][1] = 16;
+    }
+
+    vflags = info->local;
+
+    overscan_x = overscan_y = 16;
+
+    dev->rgb_type = device_get_config_int("rgb_type");
+    cga_palette   = (dev->rgb_type << 1);
+    cgapal_rebuild();
+
+    dev->crtc[9] = 13;
+
+    monitors[monitor_index_global].mon_composite = !!dev->composite;
+
+    return dev;
+}
+
+static void
+compaq_cga_close(void *priv)
+{
+    cga_t *dev = (cga_t *) priv;
+
+    free(dev->vram);
+    free(dev);
+}
+
+static void
+compaq_cga_speed_changed(void *priv)
+{
+    cga_t *dev = (cga_t *) priv;
+
+    if (dev->crtc[9] == 13) /* Character height */
+        compaq_cga_recalctimings(dev);
+    else
+        cga_recalctimings(dev);
+}
+
+extern const device_config_t cga_config[];
+
+const device_t compaq_cga_device = {
+    .name          = "Compaq CGA",
+    .internal_name = "compaq_cga",
+    .flags         = DEVICE_ISA,
+    .local         = 0,
+    .init          = compaq_cga_init,
+    .close         = compaq_cga_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = compaq_cga_speed_changed,
+    .force_redraw  = NULL,
+    .config        = cga_config
+};
+
+const device_t compaq_cga_2_device = {
+    .name          = "Compaq CGA 2",
+    .internal_name = "compaq_cga_2",
+    .flags         = DEVICE_ISA,
+    .local         = 1,
+    .init          = compaq_cga_init,
+    .close         = compaq_cga_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = compaq_cga_speed_changed,
+    .force_redraw  = NULL,
+    .config        = cga_config
+};
diff --git a/src/video/vid_cga_compaq_plasma.c b/src/video/vid_cga_compaq_plasma.c
new file mode 100644
index 000000000..b281cf93f
--- /dev/null
+++ b/src/video/vid_cga_compaq_plasma.c
@@ -0,0 +1,843 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Emulation of the plasma displays on early Compaq Portables and laptops.
+ *
+ *
+ *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2008-2020 Sarah Walker.
+ *          Copyright 2016-2020 Miran Grca.
+ *          Copyright 2025 starfrost
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <math.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/pit.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/device.h>
+#include <86box/video.h>
+#include <86box/vid_cga.h>
+#include <86box/vid_cga_comp.h>
+#include <86box/plat_unused.h>
+
+static video_timings_t timing_compaq_plasma = { .type = VIDEO_ISA, .write_b = 8, .write_w = 16, .write_l = 32, .read_b = 8, .read_w = 16, .read_l = 32 };
+
+#define CGA_RGB       0
+#define CGA_COMPOSITE 1
+
+/*Very rough estimate*/
+#define VID_CLOCK (double) (651 * 416 * 60)
+
+/* Mapping of attributes to colours */
+static uint32_t amber;
+static uint32_t black;
+static uint32_t blinkcols[256][2];
+static uint32_t normcols[256][2];
+
+/* Video options set by the motherboard; they will be picked up by the card
+ * on the next poll.
+ *
+ * Bit  3:   Disable built-in video (for add-on card)
+ * Bit  2:   Thin font
+ * Bits 0,1: Font set (not currently implemented)
+ */
+static int8_t cpq_st_display_internal = -1;
+
+static uint8_t mdaattr[256][2][2];
+
+static void
+compaq_plasma_display_set(uint8_t internal)
+{
+    cpq_st_display_internal = internal;
+}
+
+typedef struct compaq_plasma_t {
+    cga_t         cga;
+    mem_mapping_t font_ram_mapping;
+    uint8_t      *font_ram;
+    uint8_t       port_13c6;
+    uint8_t       port_23c6;
+    uint8_t       port_27c6;
+    uint8_t       internal_monitor;
+} compaq_plasma_t;
+
+
+static void compaq_plasma_recalcattrs(compaq_plasma_t *self);
+
+static void
+compaq_plasma_recalctimings(compaq_plasma_t *self)
+{
+    double _dispontime;
+    double _dispofftime;
+    double disptime;
+
+    if (!self->internal_monitor && !(self->port_23c6 & 0x01)) {
+        cga_recalctimings(&self->cga);
+        return;
+    }
+
+    disptime = 651;
+    _dispontime = 640;
+    _dispofftime = disptime - _dispontime;
+    self->cga.dispontime  = (uint64_t) (_dispontime * (cpuclock / VID_CLOCK) * (double) (1ULL << 32));
+    self->cga.dispofftime = (uint64_t) (_dispofftime * (cpuclock / VID_CLOCK) * (double) (1ULL << 32));
+}
+
+static void
+compaq_plasma_waitstates(UNUSED(void *priv))
+{
+    int ws_array[16] = { 3, 4, 5, 6, 7, 8, 4, 5, 6, 7, 8, 4, 5, 6, 7, 8 };
+    int ws;
+
+    ws = ws_array[cycles & 0xf];
+    sub_cycles(ws);
+}
+
+static void
+compaq_plasma_write(uint32_t addr, uint8_t val, void *priv)
+{
+    compaq_plasma_t *self = (compaq_plasma_t *) priv;
+
+    if (self->port_23c6 & 0x08)
+        self->font_ram[addr & 0x1fff] = val;
+    else
+        self->cga.vram[addr & 0x7fff] = val;
+
+    compaq_plasma_waitstates(&self->cga);
+}
+static uint8_t
+compaq_plasma_read(uint32_t addr, void *priv)
+{
+    compaq_plasma_t *self = (compaq_plasma_t *) priv;
+    uint8_t          ret;
+
+    compaq_plasma_waitstates(&self->cga);
+
+    if (self->port_23c6 & 0x08)
+        ret = (self->font_ram[addr & 0x1fff]);
+    else
+        ret = (self->cga.vram[addr & 0x7fff]);
+
+    return ret;
+}
+
+static void
+compaq_plasma_out(uint16_t addr, uint8_t val, void *priv)
+{
+    compaq_plasma_t *self = (compaq_plasma_t *) priv;
+
+    switch (addr) {
+        /* Emulated CRTC, register select */
+        case 0x3d0:
+        case 0x3d2:
+        case 0x3d4:
+        case 0x3d6:
+            cga_out(addr, val, &self->cga);
+            break;
+
+        /* Emulated CRTC, value */
+        case 0x3d1:
+        case 0x3d3:
+        case 0x3d5:
+        case 0x3d7:
+            cga_out(addr, val, &self->cga);
+            compaq_plasma_recalctimings(self);
+            break;
+        case 0x3d8:
+        case 0x3d9:
+            cga_out(addr, val, &self->cga);
+            break;
+
+        case 0x13c6:
+            self->port_13c6 = val;
+            compaq_plasma_display_set((self->port_13c6 & 0x08) ? 1 : 0);
+            /*
+               For bits 2-0, John gives 0 = CGA, 1 = EGA, 3 = MDA;
+               Another source (Ralf Brown?) gives 4 = CGA, 5 = EGA, 7 = MDA;
+               This leads me to believe bit 2 is not relevant to the mode.
+             */
+            if ((val & 0x07) == 0x03)
+                mem_mapping_set_addr(&self->cga.mapping, 0xb0000, 0x08000);
+            else
+                mem_mapping_set_addr(&self->cga.mapping, 0xb8000, 0x08000);
+            break;
+
+        case 0x23c6:
+            self->port_23c6 = val;
+            break;
+
+        case 0x27c6:
+            self->port_27c6 = val;
+            break;
+
+        default:
+            break;
+    }
+}
+
+static uint8_t
+compaq_plasma_in(uint16_t addr, void *priv)
+{
+    compaq_plasma_t *self = (compaq_plasma_t *) priv;
+    uint8_t          ret  = 0xff;
+
+    switch (addr) {
+        case 0x3d4:
+        case 0x3da:
+        case 0x3db:
+        case 0x3dc:
+            ret = cga_in(addr, &self->cga);
+            break;
+
+        case 0x3d1:
+        case 0x3d3:
+        case 0x3d5:
+        case 0x3d7:
+            ret = cga_in(addr, &self->cga);
+            break;
+
+        case 0x3d8:
+            ret = self->cga.cgamode;
+            break;
+
+        case 0x13c6:
+            ret = self->port_13c6;
+            break;
+
+        case 0x17c6:
+            ret = 0xe6;
+            break;
+
+        case 0x1bc6:
+            ret = 0x40;
+            break;
+
+        case 0x23c6:
+            ret = self->port_23c6;
+            break;
+
+        case 0x27c6:
+            ret = self->port_27c6 & 0x3f;
+            break;
+
+        default:
+            break;
+    }
+
+    return ret;
+}
+
+static void
+compaq_plasma_poll(void *priv)
+{
+    compaq_plasma_t *self = (compaq_plasma_t *) priv;
+    uint8_t  chr;
+    uint8_t  attr;
+    uint8_t  scanline;
+    uint16_t memaddr  = (self->cga.crtc[CGA_CRTC_START_ADDR_LOW] | (self->cga.crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x7fff;
+    uint16_t cursoraddr  = (self->cga.crtc[CGA_CRTC_CURSOR_ADDR_LOW] | (self->cga.crtc[CGA_CRTC_CURSOR_ADDR_HIGH] << 8)) & 0x7fff;
+    uint16_t addr;
+    int      drawcursor;
+    int      cursorline;
+    int      blink     = 0;
+    int      underline = 0;
+    int      cursorvisible = 0;
+    int      cursorinvisible = 0;
+    int      c;
+    int      x;
+    uint32_t ink = 0;
+    uint32_t fg = (self->cga.cgacol & 0x0f) ? amber : black;
+    uint32_t bg = black;
+    uint32_t black_half = black;
+    uint32_t amber_half = amber;
+    uint32_t cols[2];
+    uint8_t  dat;
+    uint8_t  pattern;
+    uint32_t ink0 = 0;
+    uint32_t ink1 = 0;
+
+    /* Switch between internal plasma and external CRT display. */
+    if ((cpq_st_display_internal != -1) && (cpq_st_display_internal != self->internal_monitor)) {
+        self->internal_monitor = cpq_st_display_internal;
+        compaq_plasma_recalctimings(self);
+    }
+
+    /* graphic mode and not mode 40h */
+    if (!self->internal_monitor && !(self->port_23c6 & 0x01)) {
+        /* standard cga mode */
+        cga_poll(&self->cga);
+        return;
+    } else {
+        /* mode 40h or text mode */
+        if (!self->cga.linepos) {
+            timer_advance_u64(&self->cga.timer, self->cga.dispofftime);
+            self->cga.cgastat |= 1;
+            self->cga.linepos = 1;
+            if (self->cga.cgadispon) {
+                if (self->cga.displine == 0)
+                    video_wait_for_buffer();
+
+                /* 80-col */
+                if (self->cga.cgamode & 0x01) {
+                    scanline = self->cga.displine & 0x0f;
+                    addr = ((memaddr & ~1) + (self->cga.displine >> 4) * 80) << 1;
+                    memaddr += (self->cga.displine >> 4) * 80;
+
+                    if ((self->cga.crtc[CGA_CRTC_CURSOR_START] & 0x60) == 0x20)
+                        cursorline = 0;
+                    else {
+                        if ((self->cga.crtc[CGA_CRTC_CURSOR_START] & 0x0f) > 0x07)
+                            cursorvisible = (self->cga.crtc[CGA_CRTC_CURSOR_START] & 0x0f) + 1;
+                        else
+                            cursorvisible = ((self->cga.crtc[CGA_CRTC_CURSOR_START] & 0x0f) << 1);
+
+                        if ((self->cga.crtc[CGA_CRTC_CURSOR_END] & 0x0f) > 0x07)
+                            cursorinvisible = (self->cga.crtc[CGA_CRTC_CURSOR_END] & 0x0f) + 2;
+                        else
+                            cursorinvisible = ((self->cga.crtc[CGA_CRTC_CURSOR_END] & 0x0f) << 1);
+
+                        cursorline = (cursorvisible <= scanline) && (cursorinvisible >= scanline);
+                    }
+
+                    /* for each text column */
+                    for (x = 0; x < 80; x++) {
+                        /* video output enabled */
+                        if (self->cga.cgamode & 0x08) {
+                            /* character */
+                            chr = self->cga.vram[(addr + (x << 1)) & 0x7fff];
+                            /* text attributes */
+                            attr = self->cga.vram[(addr + ((x << 1) + 1)) & 0x7fff];
+                        } else {
+                            chr = 0x00;
+                            attr = 0x00;
+                        }
+
+                        uint8_t hi_bit = attr & 0x08;
+                        /* check if cursor has to be drawn */
+                        drawcursor = ((memaddr == cursoraddr) && cursorline && (self->cga.cgamode & 0x08) && (self->cga.cgablink & 0x10));
+                        /* check if character underline mode should be set */
+                        underline = ((attr & 0x07) == 0x01);
+                        underline = underline || (((self->port_23c6 >> 5) == 1) && hi_bit);
+                        if (underline) {
+                            /* set forecolor to white */
+                            attr = attr | 0x7;
+                        }
+                        blink = 0;
+                        /* set foreground */
+                        cols[1] = blinkcols[attr][1];
+                        /* blink active */
+                        if (self->cga.cgamode & CGA_MODE_FLAG_BLINK) {
+                            cols[0] = blinkcols[attr][0];
+                            /* attribute 7 active and not cursor */
+                            if ((self->cga.cgablink & 0x08) && (attr & 0x80) && !drawcursor) {
+                                /* set blinking */
+                                cols[1] = cols[0];
+                                blink   = 1;
+                            }
+                        } else {
+                            /* Set intensity bit */
+                            cols[1] = normcols[attr][1];
+                            cols[0] = normcols[attr][0];
+                        }
+
+                        /* character address */
+                        uint16_t chr_addr = ((chr * 16) + scanline) & 0x0fff;
+                        if (((self->port_23c6 >> 5) == 3) && hi_bit)
+                            chr_addr |= 0x1000;
+
+                        /* character underline active and 7th row of pixels in character height being drawn */
+                        if (underline) {
+                            /* for each pixel in character width */
+                            for (c = 0; c < 8; c++)
+                                buffer32->line[self->cga.displine][(x << 3) + c] = mdaattr[attr][blink][1];
+                        } else if (drawcursor) {
+                            for (c = 0; c < 8; c++)
+                                buffer32->line[self->cga.displine][(x << 3) + c] = cols[(self->font_ram[chr_addr] & (1 << (c ^ 7))) ? 1 : 0] ^ (amber ^ black);
+                        } else {
+                            for (c = 0; c < 8; c++)
+                                buffer32->line[self->cga.displine][(x << 3) + c] = cols[(self->font_ram[chr_addr] & (1 << (c ^ 7))) ? 1 : 0];
+                        }
+
+                        if (hi_bit) {
+                            if ((self->port_23c6 >> 5) == 4) {
+                                uint8_t b = (cols[1] & 0xff) >> 1;
+                                uint8_t g = ((cols[1] >> 8) & 0xff) >> 1;
+                                uint8_t r = ((cols[1] >> 16) & 0xff) >> 1;
+                                cols[1] = b | (g << 8) | (r << 16);
+                                b = (cols[0] & 0xff) >> 1;
+                                g = ((cols[0] >> 8) & 0xff) >> 1;
+                                r = ((cols[0] >> 16) & 0xff) >> 1;
+                                cols[0] = b | (g << 8) | (r << 16);
+                                if (drawcursor) {
+                                    black_half = black;
+                                    amber_half = amber;
+                                    uint8_t bB = (black & 0xff) >> 1;
+                                    uint8_t gB = ((black >> 8) & 0xff) >> 1;
+                                    uint8_t rB = ((black >> 16) & 0xff) >> 1;
+                                    black_half = bB | (gB << 8) | (rB << 16);
+                                    uint8_t bA = (amber & 0xff) >> 1;
+                                    uint8_t gA = ((amber >> 8) & 0xff) >> 1;
+                                    uint8_t rA = ((amber >> 16) & 0xff) >> 1;
+                                    amber_half = bA | (gA << 8) | (rA << 16);
+                                    for (c = 0; c < 8; c++)
+                                        buffer32->line[self->cga.displine][(x << 3) + c] = cols[(self->font_ram[chr_addr] & (1 << (c ^ 7))) ? 1 : 0] ^ (amber_half ^ black_half);
+                                } else {
+                                    for (c = 0; c < 8; c++)
+                                        buffer32->line[self->cga.displine][(x << 3) + c] = cols[(self->font_ram[chr_addr] & (1 << (c ^ 7))) ? 1 : 0];
+                                }
+                            } else if ((self->port_23c6 >> 5) == 2) {
+                                if (drawcursor) {
+                                    for (c = 0; c < 8; c++)
+                                        buffer32->line[self->cga.displine][(x << 3) + c] = cols[(self->font_ram[chr_addr] & (1 << (c ^ 7))) ? 0 : 1] ^ (amber ^ black);
+                                } else {
+                                    for (c = 0; c < 8; c++)
+                                        buffer32->line[self->cga.displine][(x << 3) + c] = cols[(self->font_ram[chr_addr] & (1 << (c ^ 7))) ? 0 : 1];
+                                }
+                            }
+                        }
+                        memaddr++;
+                    }
+                }
+                /* 40-col */
+                else if (!(self->cga.cgamode & 0x02)) {
+                    scanline = self->cga.displine & 0x0f;
+                    addr = ((memaddr & ~1) + (self->cga.displine >> 4) * 40) << 1;
+                    memaddr += (self->cga.displine >> 4) * 40;
+
+                    if ((self->cga.crtc[CGA_CRTC_CURSOR_START] & 0x60) == 0x20)
+                        cursorline = 0;
+                    else {
+                        if ((self->cga.crtc[CGA_CRTC_CURSOR_START] & 0x0f) > 0x07)
+                            cursorvisible = (self->cga.crtc[CGA_CRTC_CURSOR_START] & 0x0f) + 1;
+                        else
+                            cursorvisible = ((self->cga.crtc[CGA_CRTC_CURSOR_START] & 0x0f) << 1);
+
+                        if ((self->cga.crtc[CGA_CRTC_CURSOR_END] & 0x0f) > 0x07)
+                            cursorinvisible = (self->cga.crtc[CGA_CRTC_CURSOR_END] & 0x0f) + 2;
+                        else
+                            cursorinvisible = ((self->cga.crtc[CGA_CRTC_CURSOR_END] & 0x0f) << 1);
+
+                        cursorline = (cursorvisible <= scanline) && (cursorinvisible >= scanline);
+                    }
+
+                    for (x = 0; x < 40; x++) {
+                        /* video output enabled */
+                        if (self->cga.cgamode & 0x08) {
+                            /* character */
+                            chr = self->cga.vram[(addr + (x << 1)) & 0x7fff];
+                            /* text attributes */
+                            attr = self->cga.vram[(addr + ((x << 1) + 1)) & 0x7fff];
+                        } else {
+                            chr = 0x00;
+                            attr = 0x00;
+                        }
+
+                        uint8_t hi_bit = attr & 0x08;
+                        /* check if cursor has to be drawn */
+                        drawcursor = ((memaddr == cursoraddr) && cursorline && (self->cga.cgamode & 0x08) && (self->cga.cgablink & 0x10));
+                        /* check if character underline mode should be set */
+                        underline = ((attr & 0x07) == 0x01);
+                        underline = underline || (((self->port_23c6 >> 5) == 1) && hi_bit);
+                        if (underline) {
+                            /* set forecolor to white */
+                            attr = attr | 0x7;
+                        }
+                        blink = 0;
+                        /* set foreground */
+                        cols[1] = blinkcols[attr][1];
+                        /* blink active */
+                        if (self->cga.cgamode & CGA_MODE_FLAG_BLINK) {
+                            cols[0] = blinkcols[attr][0];
+                            /* attribute 7 active and not cursor */
+                            if ((self->cga.cgablink & 0x08) && (attr & 0x80) && !drawcursor) {
+                                /* set blinking */
+                                cols[1] = cols[0];
+                                blink   = 1;
+                            }
+                        } else {
+                            /* Set intensity bit */
+                            cols[1] = normcols[attr][1];
+                            cols[0] = normcols[attr][0];
+                        }
+
+                        /* character address */
+                        uint16_t chr_addr = ((chr * 16) + scanline) & 0x0fff;
+                        if (((self->port_23c6 >> 5) == 3) && hi_bit)
+                            chr_addr |= 0x1000;
+
+                        /* character underline active and 7th row of pixels in character height being drawn */
+                        if (underline && (scanline == 7)) {
+                            /* for each pixel in character width */
+                            for (c = 0; c < 8; c++)
+                                buffer32->line[self->cga.displine][(x << 4) + (c << 1)] = buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 1] = mdaattr[attr][blink][1];
+                        } else if (drawcursor) {
+                            for (c = 0; c < 8; c++)
+                                buffer32->line[self->cga.displine][(x << 4) + (c << 1)] = buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 1] = cols[(self->font_ram[chr_addr] & (1 << (c ^ 7))) ? 1 : 0] ^ (amber ^ black);
+                        } else {
+                            for (c = 0; c < 8; c++)
+                                buffer32->line[self->cga.displine][(x << 4) + (c << 1)] = buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 1] = cols[(self->font_ram[chr_addr] & (1 << (c ^ 7))) ? 1 : 0];
+                        }
+
+                        if (hi_bit) {
+                            if ((self->port_23c6 >> 5) == 4) {
+                                uint8_t b = (cols[1] & 0xff) >> 1;
+                                uint8_t g = ((cols[1] >> 8) & 0xff) >> 1;
+                                uint8_t r = ((cols[1] >> 16) & 0xff) >> 1;
+                                cols[1] = b | (g << 8) | (r << 16);
+                                b = (cols[0] & 0xff) >> 1;
+                                g = ((cols[0] >> 8) & 0xff) >> 1;
+                                r = ((cols[0] >> 16) & 0xff) >> 1;
+                                cols[0] = b | (g << 8) | (r << 16);
+                                if (drawcursor) {
+                                    black_half = black;
+                                    amber_half = amber;
+                                    uint8_t bB = (black & 0xff) >> 1;
+                                    uint8_t gB = ((black >> 8) & 0xff) >> 1;
+                                    uint8_t rB = ((black >> 16) & 0xff) >> 1;
+                                    black_half = bB | (gB << 8) | (rB << 16);
+                                    uint8_t bA = (amber & 0xff) >> 1;
+                                    uint8_t gA = ((amber >> 8) & 0xff) >> 1;
+                                    uint8_t rA = ((amber >> 16) & 0xff) >> 1;
+                                    amber_half = bA | (gA << 8) | (rA << 16);
+                                    for (c = 0; c < 8; c++)
+                                        buffer32->line[self->cga.displine][(x << 4) + (c << 1)] = buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 1] = cols[(self->font_ram[chr_addr] & (1 << (c ^ 7))) ? 1 : 0] ^ (amber_half ^ black_half);
+                                } else {
+                                    for (c = 0; c < 8; c++)
+                                        buffer32->line[self->cga.displine][(x << 4) + (c << 1)] = buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 1] = cols[(self->font_ram[chr_addr] & (1 << (c ^ 7))) ? 1 : 0];
+                                }
+                            } else if ((self->port_23c6 >> 5) == 2) {
+                                if (drawcursor) {
+                                    for (c = 0; c < 8; c++)
+                                        buffer32->line[self->cga.displine][(x << 4) + (c << 1)] = buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 1] = cols[(self->font_ram[chr_addr] & (1 << (c ^ 7))) ? 0 : 1] ^ (amber ^ black);
+                                } else {
+                                    for (c = 0; c < 8; c++)
+                                        buffer32->line[self->cga.displine][(x << 4) + (c << 1)] = buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 1] = cols[(self->font_ram[chr_addr] & (1 << (c ^ 7))) ? 0 : 1];
+                                }
+                            }
+                        }
+                        memaddr++;
+                    }
+                } else {
+                    if (self->cga.cgamode & CGA_MODE_FLAG_HIGHRES_GRAPHICS) {
+                        /* 640x400 mode */
+                        if (self->port_23c6 & 0x01) /* 640*400 */ {
+                            addr = ((self->cga.displine) & 1) * 0x2000 + ((self->cga.displine >> 1) & 1) * 0x4000 + (self->cga.displine >> 2) * 80 + ((memaddr & ~1) << 1);
+                        } else {
+                            addr = ((self->cga.displine >> 1) & 1) * 0x2000 + (self->cga.displine >> 2) * 80 + ((memaddr & ~1) << 1);
+                        }
+                        for (uint8_t x = 0; x < 80; x++) {
+                            dat = self->cga.vram[addr & 0x7fff];
+                            addr++;
+
+                            for (uint8_t c = 0; c < 8; c++) {
+                                ink = (dat & 0x80) ? fg : bg;
+                                if (!(self->cga.cgamode & 0x08))
+                                    ink = black;
+                                buffer32->line[self->cga.displine][(x << 3) + c] = ink;
+                                dat <<= 1;
+                            }
+                        }
+                    } else {
+                        addr = ((self->cga.displine >> 1) & 1) * 0x2000 + (self->cga.displine >> 2) * 80 + ((memaddr & ~1) << 1);
+                        for (uint8_t x = 0; x < 80; x++) {
+                            dat = self->cga.vram[addr & 0x7fff];
+                            addr++;
+
+                            for (uint8_t c = 0; c < 4; c++) {
+                                pattern = (dat & 0xC0) >> 6;
+                                if (!(self->cga.cgamode & 0x08))
+                                    pattern = 0;
+
+                                switch (pattern & 3) {
+                                    case 0:
+                                        ink0 = ink1 = black;
+                                        break;
+                                    case 1:
+                                        if (self->cga.displine & 0x01) {
+                                            ink0 = black;
+                                            ink1 = black;
+                                        } else {
+                                            ink0 = amber;
+                                            ink1 = black;
+                                        }
+                                        break;
+                                    case 2:
+                                        if (self->cga.displine & 0x01) {
+                                            ink0 = black;
+                                            ink1 = amber;
+                                        } else {
+                                            ink0 = amber;
+                                            ink1 = black;
+                                        }
+                                        break;
+                                    case 3:
+                                        ink0 = ink1 = amber;
+                                        break;
+
+                                    default:
+                                        break;
+                                }
+                                buffer32->line[self->cga.displine][(x << 3) + (c << 1)]     = ink0;
+                                buffer32->line[self->cga.displine][(x << 3) + (c << 1) + 1] = ink1;
+                                dat <<= 2;
+                            }
+                        }
+                    }
+                }
+            }
+            self->cga.displine++;
+            /* Hardcode a fixed refresh rate and VSYNC timing */
+            if (self->cga.displine == 400) { /* Start of VSYNC */
+                self->cga.cgastat |= 8;
+                self->cga.cgadispon = 0;
+            }
+            if (self->cga.displine == 416) { /* End of VSYNC */
+                self->cga.displine = 0;
+                self->cga.cgastat &= ~8;
+                self->cga.cgadispon = 1;
+            }
+        } else {
+            timer_advance_u64(&self->cga.timer, self->cga.dispontime);
+            if (self->cga.cgadispon)
+                self->cga.cgastat &= ~1;
+
+            self->cga.linepos = 0;
+
+            if (self->cga.displine == 400) {
+                xsize = 640;
+                ysize = 400;
+
+                if ((self->cga.cgamode & 0x08) || video_force_resize_get()) {
+                    set_screen_size(xsize, ysize);
+
+                    if (video_force_resize_get())
+                        video_force_resize_set(0);
+                }
+                /* Plasma specific */
+                video_blit_memtoscreen(0, 0, xsize, ysize);
+                frames++;
+
+                /* Fixed 640x400 resolution */
+                video_res_x = 640;
+                video_res_y = 400;
+
+                if (self->cga.cgamode & 0x02) {
+                    if (self->cga.cgamode & CGA_MODE_FLAG_HIGHRES_GRAPHICS)
+                        video_bpp = 1;
+                    else
+                        video_bpp = 2;
+                } else
+                    video_bpp = 0;
+
+                self->cga.cgablink++;
+            }
+        }
+    }
+}
+
+static void
+compaq_plasma_mdaattr_rebuild(void)
+{
+    for (uint16_t c = 0; c < 256; c++) {
+        mdaattr[c][0][0] = mdaattr[c][1][0] = mdaattr[c][1][1] = 16;
+        if (c & 8)
+            mdaattr[c][0][1] = 15 + 16;
+        else
+            mdaattr[c][0][1] = 7 + 16;
+    }
+
+    mdaattr[0x70][0][1] = 16;
+    mdaattr[0x70][0][0] = mdaattr[0x70][1][0] = mdaattr[0x70][1][1] = 16 + 15;
+    mdaattr[0xF0][0][1]                                             = 16;
+    mdaattr[0xF0][0][0] = mdaattr[0xF0][1][0] = mdaattr[0xF0][1][1] = 16 + 15;
+    mdaattr[0x78][0][1]                                             = 16 + 7;
+    mdaattr[0x78][0][0] = mdaattr[0x78][1][0] = mdaattr[0x78][1][1] = 16 + 15;
+    mdaattr[0xF8][0][1]                                             = 16 + 7;
+    mdaattr[0xF8][0][0] = mdaattr[0xF8][1][0] = mdaattr[0xF8][1][1] = 16 + 15;
+    mdaattr[0x00][0][1] = mdaattr[0x00][1][1] = 16;
+    mdaattr[0x08][0][1] = mdaattr[0x08][1][1] = 16;
+    mdaattr[0x80][0][1] = mdaattr[0x80][1][1] = 16;
+    mdaattr[0x88][0][1] = mdaattr[0x88][1][1] = 16;
+}
+
+static void
+compaq_plasma_recalcattrs(compaq_plasma_t *self)
+{
+    int n;
+
+    /* val behaves as follows:
+     *     Bit 0: Attributes 01-06, 08-0E are inverse video
+     *     Bit 1: Attributes 01-06, 08-0E are bold
+     *     Bit 2: Attributes 11-16, 18-1F, 21-26, 28-2F ... F1-F6, F8-FF
+     *            are inverse video
+     *     Bit 3: Attributes 11-16, 18-1F, 21-26, 28-2F ... F1-F6, F8-FF
+     *            are bold */
+
+    /* Set up colours */
+    amber = makecol(0xff, 0x7d, 0x00);
+    black = makecol(0x64, 0x19, 0x00);
+
+    /* Initialize the attribute mapping. Start by defaulting everything
+     * to black on amber, and with bold set by bit 3 */
+    for (n = 0; n < 256; n++) {
+        blinkcols[n][0] = normcols[n][0] = amber;
+        blinkcols[n][1] = normcols[n][1] = black;
+    }
+
+    /* Colours 0x11-0xFF are controlled by bits 2 and 3 of the
+     * passed value. Exclude x0 and x8, which are always black on
+     * amber. */
+    for (n = 0x11; n <= 0xFF; n++) {
+        if ((n & 7) == 0)
+            continue;
+        blinkcols[n][0] = normcols[n][0] = black;
+        blinkcols[n][1] = normcols[n][1] = amber;
+    }
+    /* Set up the 01-0E range, controlled by bits 0 and 1 of the
+     * passed value. When blinking is enabled this also affects 81-8E. */
+    for (n = 0x01; n <= 0x0E; n++) {
+        if (n == 7)
+            continue;
+        blinkcols[n][0] = normcols[n][0] = black;
+        blinkcols[n][1] = normcols[n][1] = amber;
+        blinkcols[n + 128][0]            = black;
+        blinkcols[n + 128][1]            = amber;
+    }
+    /* Colours 07 and 0F are always amber on black. If blinking is
+     * enabled so are 87 and 8F. */
+    for (n = 0x07; n <= 0x0F; n += 8) {
+        blinkcols[n][0] = normcols[n][0] = black;
+        blinkcols[n][1] = normcols[n][1] = amber;
+        blinkcols[n + 128][0]            = black;
+        blinkcols[n + 128][1]            = amber;
+    }
+    /* When not blinking, colours 81-8F are always amber on black. */
+    for (n = 0x81; n <= 0x8F; n++) {
+        normcols[n][0] = black;
+        normcols[n][1] = amber;
+    }
+
+    /* Finally do the ones which are solid black. These differ between
+     * the normal and blinking mappings */
+    for (n = 0; n <= 0xFF; n += 0x11)
+        normcols[n][0] = normcols[n][1] = black;
+
+    /* In the blinking range, 00 11 22 .. 77 and 80 91 A2 .. F7 are black */
+    for (n = 0; n <= 0x77; n += 0x11) {
+        blinkcols[n][0] = blinkcols[n][1] = black;
+        blinkcols[n + 128][0] = blinkcols[n + 128][1] = black;
+    }
+}
+
+static void *
+compaq_plasma_init(UNUSED(const device_t *info))
+{
+    compaq_plasma_t *self = calloc(1, sizeof(compaq_plasma_t));
+
+    cga_init(&self->cga);
+    video_inform(VIDEO_FLAG_TYPE_CGA, &timing_compaq_plasma);
+
+    self->cga.composite = 0;
+    self->cga.revision  = 0;
+
+    self->cga.vram             = malloc(0x8000);
+    self->internal_monitor = 1;
+    self->font_ram             = malloc(0x2000);
+
+    cga_comp_init(self->cga.revision);
+    timer_set_callback(&self->cga.timer, compaq_plasma_poll);
+    timer_set_p(&self->cga.timer, self);
+
+    mem_mapping_add(&self->cga.mapping, 0xb8000, 0x08000,
+                    compaq_plasma_read, NULL, NULL,
+                    compaq_plasma_write, NULL, NULL,
+                    NULL, MEM_MAPPING_EXTERNAL, self);
+    for (int i = 1; i <= 2; i++) {
+        io_sethandler(0x03c6 + (i << 12), 0x0001, compaq_plasma_in, NULL, NULL, compaq_plasma_out, NULL, NULL, self);
+        io_sethandler(0x07c6 + (i << 12), 0x0001, compaq_plasma_in, NULL, NULL, compaq_plasma_out, NULL, NULL, self);
+        io_sethandler(0x0bc6 + (i << 12), 0x0001, compaq_plasma_in, NULL, NULL, compaq_plasma_out, NULL, NULL, self);
+    }
+    io_sethandler(0x03d0, 0x0010, compaq_plasma_in, NULL, NULL, compaq_plasma_out, NULL, NULL, self);
+
+    overscan_x = overscan_y = 16;
+    compaq_plasma_recalcattrs(self);
+
+    self->cga.rgb_type = device_get_config_int("rgb_type");
+    cga_palette        = (self->cga.rgb_type << 1);
+    cgapal_rebuild();
+    compaq_plasma_mdaattr_rebuild();
+
+    return self;
+}
+
+static void
+compaq_plasma_close(void *priv)
+{
+    compaq_plasma_t *self = (compaq_plasma_t *) priv;
+
+    free(self->cga.vram);
+    free(self->font_ram);
+    free(self);
+}
+
+static void
+compaq_plasma_speed_changed(void *priv)
+{
+    compaq_plasma_t *self = (compaq_plasma_t *) priv;
+
+    compaq_plasma_recalctimings(self);
+}
+
+const device_config_t compaq_plasma_config[] = {
+  // clang-format off
+    {
+        .name = "rgb_type",
+        .description = "RGB type",
+        .type = CONFIG_SELECTION,
+        .default_string = "",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "Color",            .value = 0 },
+            { .description = "Green Monochrome", .value = 1 },
+            { .description = "Amber Monochrome", .value = 2 },
+            { .description = "Gray Monochrome",  .value = 3 },
+            { .description = ""                             }
+        }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
+const device_t compaq_plasma_device = {
+    .name          = "Compaq Plasma",
+    .internal_name = "compaq_plasma",
+    .flags         = 0,
+    .local         = 0,
+    .init          = compaq_plasma_init,
+    .close         = compaq_plasma_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = compaq_plasma_speed_changed,
+    .force_redraw  = NULL,
+    .config        = compaq_plasma_config
+};
diff --git a/src/video/vid_nga.c b/src/video/vid_cga_ncr.c
similarity index 67%
rename from src/video/vid_nga.c
rename to src/video/vid_cga_ncr.c
index 32c103a8b..eb4474a40 100644
--- a/src/video/vid_nga.c
+++ b/src/video/vid_cga_ncr.c
@@ -30,6 +30,7 @@
 #include <86box/io.h>
 #include <86box/video.h>
 #include <86box/86box.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/mem.h>
 #include <86box/pit.h>
@@ -55,12 +56,12 @@ nga_recalctimings(nga_t *nga)
     double _dispofftime;
     double disptime;
 
-    if (nga->cga.cgamode & 1) {
-        disptime    = nga->cga.crtc[0] + 1;
-        _dispontime = nga->cga.crtc[1];
+    if (nga->cga.cgamode & CGA_MODE_FLAG_HIGHRES) {
+        disptime    = nga->cga.crtc[CGA_CRTC_HTOTAL] + 1;
+        _dispontime = nga->cga.crtc[CGA_CRTC_HDISP];
     } else {
-        disptime    = (nga->cga.crtc[0] + 1) << 1;
-        _dispontime = nga->cga.crtc[1] << 1;
+        disptime    = (nga->cga.crtc[CGA_CRTC_HTOTAL] + 1) << 1;
+        _dispontime = nga->cga.crtc[CGA_CRTC_HDISP] << 1;
     }
 
     _dispofftime = disptime - _dispontime;
@@ -147,7 +148,7 @@ nga_poll(void *priv)
 {
     nga_t *nga = (nga_t *) priv;
     /* set cursor position in memory */
-    uint16_t ca = (nga->cga.crtc[15] | (nga->cga.crtc[14] << 8)) & 0x3fff;
+    uint16_t cursoraddr = (nga->cga.crtc[CGA_CRTC_CURSOR_ADDR_LOW] | (nga->cga.crtc[CGA_CRTC_CURSOR_ADDR_HIGH] << 8)) & 0x3fff;
     int      drawcursor;
     int      x;
     int      c;
@@ -160,10 +161,10 @@ nga_poll(void *priv)
     uint16_t dat2;
     int      cols[4];
     int      col;
-    int      oldsc;
+    int      scanline_old;
 
     /* graphic mode and not high-res modes */
-    if ((nga->cga.cgamode & 2) && !(nga->cga.cgamode & 0x40)) {
+    if ((nga->cga.cgamode & CGA_MODE_FLAG_GRAPHICS) && !(nga->cga.cgamode & 0x40)) {
         /* standard cga mode */
         cga_poll(&nga->cga);
         return;
@@ -173,10 +174,10 @@ nga_poll(void *priv)
             timer_advance_u64(&nga->cga.timer, nga->cga.dispofftime);
             nga->cga.cgastat |= 1;
             nga->cga.linepos = 1;
-            oldsc            = nga->cga.sc;
+            scanline_old            = nga->cga.scanline;
             /* if interlaced */
-            if ((nga->cga.crtc[8] & 3) == 3)
-                nga->cga.sc = ((nga->cga.sc << 1) + nga->cga.oddeven) & 7;
+            if ((nga->cga.crtc[CGA_CRTC_INTERLACE] & 3) == 3)
+                nga->cga.scanline = ((nga->cga.scanline << 1) + nga->cga.oddeven) & 7;
             if (nga->cga.cgadispon) {
                 if (nga->cga.displine < nga->cga.firstline) {
                     nga->cga.firstline = nga->cga.displine;
@@ -184,11 +185,11 @@ nga_poll(void *priv)
                 }
                 nga->cga.lastline = nga->cga.displine;
                 /* 80-col */
-                if ((nga->cga.cgamode & 1) && !(nga->cga.cgamode & 2)) {
+                if ((nga->cga.cgamode & CGA_MODE_FLAG_HIGHRES) && !(nga->cga.cgamode & CGA_MODE_FLAG_GRAPHICS)) {
                     /* for each text column */
-                    for (x = 0; x < nga->cga.crtc[1]; x++) {
+                    for (x = 0; x < nga->cga.crtc[CGA_CRTC_HDISP]; x++) {
                         /* video output enabled */
-                        if (nga->cga.cgamode & 8) {
+                        if (nga->cga.cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) {
                             /* character */
                             chr = nga->cga.charbuffer[x << 1];
                             /* text attributes */
@@ -196,11 +197,11 @@ nga_poll(void *priv)
                         } else
                             chr = attr = 0;
                         /* check if cursor has to be drawn */
-                        drawcursor = ((nga->cga.ma == ca) && nga->cga.con && nga->cga.cursoron);
+                        drawcursor = ((nga->cga.memaddr == cursoraddr) && nga->cga.cursorvisible && nga->cga.cursoron);
                         /* set foreground */
                         cols[1] = (attr & 15) + 16;
                         /* blink active */
-                        if (nga->cga.cgamode & 0x20) {
+                        if (nga->cga.cgamode & CGA_MODE_FLAG_BLINK) {
                             cols[0] = ((attr >> 4) & 7) + 16;
                             /* attribute 7 active and not cursor */
                             if ((nga->cga.cgablink & 8) && (attr & 0x80) && !nga->cga.drawcursor) {
@@ -213,30 +214,30 @@ nga_poll(void *priv)
                         }
                         if (drawcursor) {
                             for (c = 0; c < 8; c++)
-                                buffer32->line[nga->cga.displine][(x << 3) + c + 8] = cols[(fontdatm[chr][((nga->cga.sc & 7) << 1) | nga->lineff] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
+                                buffer32->line[nga->cga.displine][(x << 3) + c + 8] = cols[(fontdatm[chr][((nga->cga.scanline & 7) << 1) | nga->lineff] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
                         } else {
                             for (c = 0; c < 8; c++)
-                                buffer32->line[nga->cga.displine][(x << 3) + c + 8] = cols[(fontdatm[chr][((nga->cga.sc & 7) << 1) | nga->lineff] & (1 << (c ^ 7))) ? 1 : 0];
+                                buffer32->line[nga->cga.displine][(x << 3) + c + 8] = cols[(fontdatm[chr][((nga->cga.scanline & 7) << 1) | nga->lineff] & (1 << (c ^ 7))) ? 1 : 0];
                         }
 
-                        nga->cga.ma++;
+                        nga->cga.memaddr++;
                     }
                 }
                 /* 40-col */
-                else if (!(nga->cga.cgamode & 2)) {
+                else if (!(nga->cga.cgamode & CGA_MODE_FLAG_GRAPHICS)) {
                     /* for each text column */
-                    for (x = 0; x < nga->cga.crtc[1]; x++) {
-                        if (nga->cga.cgamode & 8) {
-                            chr  = nga->cga.vram[((nga->cga.ma << 1) & 0x3fff) + nga->base];
-                            attr = nga->cga.vram[(((nga->cga.ma << 1) + 1) & 0x3fff) + nga->base];
+                    for (x = 0; x < nga->cga.crtc[CGA_CRTC_HDISP]; x++) {
+                        if (nga->cga.cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) {
+                            chr  = nga->cga.vram[((nga->cga.memaddr << 1) & 0x3fff) + nga->base];
+                            attr = nga->cga.vram[(((nga->cga.memaddr << 1) + 1) & 0x3fff) + nga->base];
                         } else {
                             chr = attr = 0;
                         }
-                        drawcursor = ((nga->cga.ma == ca) && nga->cga.con && nga->cga.cursoron);
+                        drawcursor = ((nga->cga.memaddr == cursoraddr) && nga->cga.cursorvisible && nga->cga.cursoron);
                         /* set foreground */
                         cols[1] = (attr & 15) + 16;
                         /* blink active */
-                        if (nga->cga.cgamode & 0x20) {
+                        if (nga->cga.cgamode & CGA_MODE_FLAG_BLINK) {
                             cols[0] = ((attr >> 4) & 7) + 16;
                             if ((nga->cga.cgablink & 8) && (attr & 0x80) && !nga->cga.drawcursor) {
                                 /* set blinking */
@@ -249,19 +250,19 @@ nga_poll(void *priv)
 
                         if (drawcursor) {
                             for (c = 0; c < 8; c++)
-                                buffer32->line[nga->cga.displine][(x << 4) + (c << 1) + 8] = buffer32->line[nga->cga.displine][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr][((nga->cga.sc & 7) << 1) | nga->lineff] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
+                                buffer32->line[nga->cga.displine][(x << 4) + (c << 1) + 8] = buffer32->line[nga->cga.displine][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr][((nga->cga.scanline & 7) << 1) | nga->lineff] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
                         } else {
                             for (c = 0; c < 8; c++)
-                                buffer32->line[nga->cga.displine][(x << 4) + (c << 1) + 8] = buffer32->line[nga->cga.displine][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr][((nga->cga.sc & 7) << 1) | nga->lineff] & (1 << (c ^ 7))) ? 1 : 0];
+                                buffer32->line[nga->cga.displine][(x << 4) + (c << 1) + 8] = buffer32->line[nga->cga.displine][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr][((nga->cga.scanline & 7) << 1) | nga->lineff] & (1 << (c ^ 7))) ? 1 : 0];
                         }
 
-                        nga->cga.ma++;
+                        nga->cga.memaddr++;
                     }
                 } else {
                     /* high res modes */
                     if (nga->cga.cgamode & 0x40) {
                         /* 640x400x2 mode */
-                        if (nga->cga.cgamode & 0x4 || nga->cga.cgamode & 0x10) {
+                        if (nga->cga.cgamode & 0x4 || nga->cga.cgamode & CGA_MODE_FLAG_HIGHRES_GRAPHICS) {
                             /*
                              * Scanlines are read in the following order:
                              * 0b8000-0b9f3f even scans (0,4,...)
@@ -269,14 +270,14 @@ nga_poll(void *priv)
                              * 0bc000-0bdf3f even scans (1,5,...)
                              * 0be000-0bff3f odd scans (3,7,...)
                              */
-                            dat2    = ((nga->cga.sc & 1) * 0x2000) | (nga->lineff * 0x4000);
+                            dat2    = ((nga->cga.scanline & 1) * 0x2000) | (nga->lineff * 0x4000);
                             cols[0] = 0;
                             cols[1] = 15 + 16;
                             /* 640x400x4 mode */
                         } else {
                             cols[0] = (nga->cga.cgacol & 15) | 16;
                             col     = (nga->cga.cgacol & 16) ? 24 : 16;
-                            if (nga->cga.cgamode & 4) {
+                            if (nga->cga.cgamode & CGA_MODE_FLAG_BW) {
                                 cols[1] = col | 3; /* Cyan */
                                 cols[2] = col | 4; /* Red */
                                 cols[3] = col | 7; /* White */
@@ -296,22 +297,22 @@ nga_poll(void *priv)
                              * 0a8000-0abf3f even scans (2,6,...)
                              * 0ac000-0aff3f odd scans (3,7,...)
                              */
-                            dat2 = (nga->cga.sc & 1) * 0x4000;
+                            dat2 = (nga->cga.scanline & 1) * 0x4000;
                         }
                     } else {
-                        dat2    = (nga->cga.sc & 1) * 0x2000;
+                        dat2    = (nga->cga.scanline & 1) * 0x2000;
                         cols[0] = 0;
                         cols[1] = (nga->cga.cgacol & 15) + 16;
                     }
 
                     /* for each text column */
-                    for (x = 0; x < nga->cga.crtc[1]; x++) {
+                    for (x = 0; x < nga->cga.crtc[CGA_CRTC_HDISP]; x++) {
                         /* video out */
-                        if (nga->cga.cgamode & 8) {
+                        if (nga->cga.cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) {
                             /* 640x400x2 */
-                            if (nga->cga.cgamode & 0x4 || nga->cga.cgamode & 0x10) {
+                            if (nga->cga.cgamode & 0x4 || nga->cga.cgamode & CGA_MODE_FLAG_HIGHRES_GRAPHICS) {
                                 /* read two bytes at a time */
-                                dat = (nga->cga.vram[((nga->cga.ma << 1) & 0x1fff) + dat2] << 8) | nga->cga.vram[((nga->cga.ma << 1) & 0x1fff) + dat2 + 1];
+                                dat = (nga->cga.vram[((nga->cga.memaddr << 1) & 0x1fff) + dat2] << 8) | nga->cga.vram[((nga->cga.memaddr << 1) & 0x1fff) + dat2 + 1];
                                 /* each pixel is represented by one bit, so draw 16 pixels at a time */
                                 /* crtc[1] is 40 column, so 40x16=640 pixels */
                                 for (c = 0; c < 16; c++) {
@@ -321,13 +322,13 @@ nga_poll(void *priv)
                                 /* 640x400x4 */
                             } else {
                                 /* lines 2,3,6,7,etc. */
-                                if (nga->cga.sc & 2)
+                                if (nga->cga.scanline & 2)
                                     /* read two bytes at a time */
-                                    dat = (nga->vram_64k[((nga->cga.ma << 1) & 0x7fff) + dat2] << 8) | nga->vram_64k[((nga->cga.ma << 1) & 0x7fff) + dat2 + 1];
+                                    dat = (nga->vram_64k[((nga->cga.memaddr << 1) & 0x7fff) + dat2] << 8) | nga->vram_64k[((nga->cga.memaddr << 1) & 0x7fff) + dat2 + 1];
                                 /* lines 0,1,4,5,etc. */
                                 else
                                     /* read two bytes at a time */
-                                    dat = (nga->cga.vram[((nga->cga.ma << 1) & 0x7fff) + dat2] << 8) | nga->cga.vram[((nga->cga.ma << 1) & 0x7fff) + dat2 + 1];
+                                    dat = (nga->cga.vram[((nga->cga.memaddr << 1) & 0x7fff) + dat2] << 8) | nga->cga.vram[((nga->cga.memaddr << 1) & 0x7fff) + dat2 + 1];
                                 /* each pixel is represented by two bits, so draw 8 pixels at a time */
                                 /* crtc[1] is 80 column, so 80x8=640 pixels */
                                 for (c = 0; c < 8; c++) {
@@ -338,7 +339,7 @@ nga_poll(void *priv)
                         } else {
                             dat = 0;
                         }
-                        nga->cga.ma++;
+                        nga->cga.memaddr++;
                     }
                 }
             } else {
@@ -346,26 +347,26 @@ nga_poll(void *priv)
                 /* nga specific */
                 cols[0] = ((nga->cga.cgamode & 0x12) == 0x12) ? 0 : (nga->cga.cgacol & 15) + 16;
                 /* 80-col */
-                if (nga->cga.cgamode & 1) {
-                    hline(buffer32, 0, (nga->cga.displine << 1), ((nga->cga.crtc[1] << 3) + 16) << 2, cols[0]);
-                    hline(buffer32, 0, (nga->cga.displine << 1) + 1, ((nga->cga.crtc[1] << 3) + 16) << 2, cols[0]);
+                if (nga->cga.cgamode & CGA_MODE_FLAG_HIGHRES) {
+                    hline(buffer32, 0, (nga->cga.displine << 1), ((nga->cga.crtc[CGA_CRTC_HDISP] << 3) + 16) << 2, cols[0]);
+                    hline(buffer32, 0, (nga->cga.displine << 1) + 1, ((nga->cga.crtc[CGA_CRTC_HDISP] << 3) + 16) << 2, cols[0]);
                 } else {
-                    hline(buffer32, 0, (nga->cga.displine << 1), ((nga->cga.crtc[1] << 4) + 16) << 2, cols[0]);
-                    hline(buffer32, 0, (nga->cga.displine << 1) + 1, ((nga->cga.crtc[1] << 4) + 16) << 2, cols[0]);
+                    hline(buffer32, 0, (nga->cga.displine << 1), ((nga->cga.crtc[CGA_CRTC_HDISP] << 4) + 16) << 2, cols[0]);
+                    hline(buffer32, 0, (nga->cga.displine << 1) + 1, ((nga->cga.crtc[CGA_CRTC_HDISP] << 4) + 16) << 2, cols[0]);
                 }
             }
 
-            if (nga->cga.cgamode & 1)
+            if (nga->cga.cgamode & CGA_MODE_FLAG_HIGHRES)
                 /* set screen width */
-                x = (nga->cga.crtc[1] << 3) + 16;
+                x = (nga->cga.crtc[CGA_CRTC_HDISP] << 3) + 16;
             else
-                x = (nga->cga.crtc[1] << 4) + 16;
+                x = (nga->cga.crtc[CGA_CRTC_HDISP] << 4) + 16;
 
             video_process_8(x, nga->cga.displine);
 
-            nga->cga.sc = oldsc;
+            nga->cga.scanline = scanline_old;
             /* vertical sync */
-            if (nga->cga.vc == nga->cga.crtc[7] && !nga->cga.sc)
+            if (nga->cga.vc == nga->cga.crtc[CGA_CRTC_VSYNC] && !nga->cga.scanline)
                 nga->cga.cgastat |= 8;
             nga->cga.displine++;
             if (nga->cga.displine >= 720)
@@ -379,8 +380,8 @@ nga_poll(void *priv)
             nga->lineff ^= 1;
 
             /* text mode or 640x400x2 */
-            if (nga->lineff && !((nga->cga.cgamode & 1) && (nga->cga.cgamode & 0x40))) {
-                nga->cga.ma = nga->cga.maback;
+            if (nga->lineff && !((nga->cga.cgamode & CGA_MODE_FLAG_HIGHRES) && (nga->cga.cgamode & 0x40))) {
+                nga->cga.memaddr = nga->cga.memaddr_backup;
                 /* 640x400x4 */
             } else {
                 if (nga->cga.vsynctime) {
@@ -389,50 +390,49 @@ nga_poll(void *priv)
                         nga->cga.cgastat &= ~8;
                 }
                 /* cursor stop scanline */
-                if (nga->cga.sc == (nga->cga.crtc[11] & 31) || ((nga->cga.crtc[8] & 3) == 3 && nga->cga.sc == ((nga->cga.crtc[11] & 31) >> 1))) {
-                    nga->cga.con  = 0;
-                    nga->cga.coff = 1;
+                if (nga->cga.scanline == (nga->cga.crtc[CGA_CRTC_CURSOR_END] & 31) || ((nga->cga.crtc[CGA_CRTC_INTERLACE] & 3) == 3 && nga->cga.scanline == ((nga->cga.crtc[CGA_CRTC_CURSOR_END] & 31) >> 1))) {
+                    nga->cga.cursorvisible  = 0;
                 }
                 /* interlaced and max scanline per char reached */
-                if ((nga->cga.crtc[8] & 3) == 3 && nga->cga.sc == (nga->cga.crtc[9] >> 1))
-                    nga->cga.maback = nga->cga.ma;
+                if ((nga->cga.crtc[CGA_CRTC_INTERLACE] & 3) == 3 && nga->cga.scanline == (nga->cga.crtc[CGA_CRTC_MAX_SCANLINE_ADDR] >> 1))
+                    nga->cga.memaddr_backup = nga->cga.memaddr;
 
                 if (nga->cga.vadj) {
-                    nga->cga.sc++;
-                    nga->cga.sc &= 31;
-                    nga->cga.ma = nga->cga.maback;
+                    nga->cga.scanline++;
+                    nga->cga.scanline &= 31;
+                    nga->cga.memaddr = nga->cga.memaddr_backup;
                     nga->cga.vadj--;
                     if (!nga->cga.vadj) {
                         nga->cga.cgadispon = 1;
                         /* change start of displayed page (crtc 12-13) */
-                        nga->cga.ma = nga->cga.maback = (nga->cga.crtc[13] | (nga->cga.crtc[12] << 8)) & 0x7fff;
-                        nga->cga.sc                   = 0;
+                        nga->cga.memaddr = nga->cga.memaddr_backup = (nga->cga.crtc[CGA_CRTC_START_ADDR_LOW] | (nga->cga.crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x7fff;
+                        nga->cga.scanline                   = 0;
                     }
                     /* nga specific */
                     /* end of character line reached */
-                } else if (nga->cga.sc == nga->cga.crtc[9] || ((nga->cga.crtc[8] & 3) == 3 && nga->cga.sc == (nga->cga.crtc[9] >> 1))) {
-                    nga->cga.maback = nga->cga.ma;
-                    nga->cga.sc     = 0;
+                } else if (nga->cga.scanline == nga->cga.crtc[CGA_CRTC_MAX_SCANLINE_ADDR] || ((nga->cga.crtc[CGA_CRTC_INTERLACE] & 3) == 3 && nga->cga.scanline == (nga->cga.crtc[CGA_CRTC_MAX_SCANLINE_ADDR] >> 1))) {
+                    nga->cga.memaddr_backup = nga->cga.memaddr;
+                    nga->cga.scanline     = 0;
                     oldvc           = nga->cga.vc;
                     nga->cga.vc++;
                     nga->cga.vc &= 127;
 
                     /* lines of character displayed */
-                    if (nga->cga.vc == nga->cga.crtc[6])
+                    if (nga->cga.vc == nga->cga.crtc[CGA_CRTC_VDISP])
                         nga->cga.cgadispon = 0;
 
                     /* total vertical lines */
-                    if (oldvc == nga->cga.crtc[4]) {
+                    if (oldvc == nga->cga.crtc[CGA_CRTC_VTOTAL]) {
                         nga->cga.vc = 0;
                         /* adjust vertical lines */
-                        nga->cga.vadj = nga->cga.crtc[5];
+                        nga->cga.vadj = nga->cga.crtc[CGA_CRTC_VTOTAL_ADJUST];
                         if (!nga->cga.vadj) {
                             nga->cga.cgadispon = 1;
                             /* change start of displayed page (crtc 12-13) */
-                            nga->cga.ma = nga->cga.maback = (nga->cga.crtc[13] | (nga->cga.crtc[12] << 8)) & 0x7fff;
+                            nga->cga.memaddr = nga->cga.memaddr_backup = (nga->cga.crtc[CGA_CRTC_START_ADDR_LOW] | (nga->cga.crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x7fff;
                         }
                         /* cursor start */
-                        switch (nga->cga.crtc[10] & 0x60) {
+                        switch (nga->cga.crtc[CGA_CRTC_CURSOR_START] & 0x60) {
                             case 0x20:
                                 nga->cga.cursoron = 0;
                                 break;
@@ -445,18 +445,18 @@ nga_poll(void *priv)
                         }
                     }
                     /* vertical line position */
-                    if (nga->cga.vc == nga->cga.crtc[7]) {
+                    if (nga->cga.vc == nga->cga.crtc[CGA_CRTC_VSYNC]) {
                         nga->cga.cgadispon = 0;
                         nga->cga.displine  = 0;
                         /* nga specific */
                         nga->cga.vsynctime = 16;
                         /* vsync pos */
-                        if (nga->cga.crtc[7]) {
-                            if (nga->cga.cgamode & 1)
+                        if (nga->cga.crtc[CGA_CRTC_VSYNC]) {
+                            if (nga->cga.cgamode & CGA_MODE_FLAG_HIGHRES)
                                 /* set screen width */
-                                x = (nga->cga.crtc[1] << 3) + 16;
+                                x = (nga->cga.crtc[CGA_CRTC_HDISP] << 3) + 16;
                             else
-                                x = (nga->cga.crtc[1] << 4) + 16;
+                                x = (nga->cga.crtc[CGA_CRTC_HDISP] << 4) + 16;
                             nga->cga.lastline++;
 
                             xs_temp = x;
@@ -471,7 +471,7 @@ nga_poll(void *priv)
                                 if (!enable_overscan)
                                     xs_temp -= 16;
 
-                                if ((nga->cga.cgamode & 8) && ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get())) {
+                                if ((nga->cga.cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) && ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get())) {
                                     xsize = xs_temp;
                                     ysize = ys_temp;
                                     set_screen_size(xsize, ysize + (enable_overscan ? 16 : 0));
@@ -493,14 +493,14 @@ nga_poll(void *priv)
                             video_res_x = xsize;
                             video_res_y = ysize;
                             /* 80-col */
-                            if ((nga->cga.cgamode & 1) && !(nga->cga.cgamode & 0x40)) {
+                            if ((nga->cga.cgamode & CGA_MODE_FLAG_HIGHRES) && !(nga->cga.cgamode & 0x40)) {
                                 video_res_x /= 8;
-                                video_res_y /= (nga->cga.crtc[9] + 1) * 2;
+                                video_res_y /= (nga->cga.crtc[CGA_CRTC_MAX_SCANLINE_ADDR] + 1) * 2;
                                 video_bpp = 0;
                                 /* 40-col */
-                            } else if (!(nga->cga.cgamode & 2)) {
+                            } else if (!(nga->cga.cgamode & CGA_MODE_FLAG_GRAPHICS)) {
                                 video_res_x /= 16;
-                                video_res_y /= (nga->cga.crtc[9] + 1) * 2;
+                                video_res_y /= (nga->cga.crtc[CGA_CRTC_MAX_SCANLINE_ADDR] + 1) * 2;
                                 video_bpp = 0;
                             } else if (nga->cga.cgamode & 0x40) {
                                 video_res_x /= 8;
@@ -514,23 +514,23 @@ nga_poll(void *priv)
                         nga->cga.oddeven ^= 1;
                     }
                 } else {
-                    nga->cga.sc++;
-                    nga->cga.sc &= 31;
-                    nga->cga.ma = nga->cga.maback;
+                    nga->cga.scanline++;
+                    nga->cga.scanline &= 31;
+                    nga->cga.memaddr = nga->cga.memaddr_backup;
                 }
 
                 if (nga->cga.cgadispon)
                     nga->cga.cgastat &= ~1;
 
                 /* enable cursor if its scanline was reached */
-                if (nga->cga.sc == (nga->cga.crtc[10] & 31) || ((nga->cga.crtc[8] & 3) == 3 && nga->cga.sc == ((nga->cga.crtc[10] & 31) >> 1)))
-                    nga->cga.con = 1;
+                if (nga->cga.scanline == (nga->cga.crtc[CGA_CRTC_CURSOR_START] & 31) || ((nga->cga.crtc[CGA_CRTC_INTERLACE] & 3) == 3 && nga->cga.scanline == ((nga->cga.crtc[CGA_CRTC_CURSOR_START] & 31) >> 1)))
+                    nga->cga.cursorvisible = 1;
             }
             /* 80-columns */
-            if (nga->cga.cgadispon && (nga->cga.cgamode & 1)) {
+            if (nga->cga.cgadispon && (nga->cga.cgamode & CGA_MODE_FLAG_HIGHRES)) {
                 /* for each character per line */
-                for (x = 0; x < (nga->cga.crtc[1] << 1); x++)
-                    nga->cga.charbuffer[x] = nga->cga.vram[(((nga->cga.ma << 1) + x) & 0x3fff) + nga->base];
+                for (x = 0; x < (nga->cga.crtc[CGA_CRTC_HDISP] << 1); x++)
+                    nga->cga.charbuffer[x] = nga->cga.vram[(((nga->cga.memaddr << 1) + x) & 0x3fff) + nga->base];
             }
         }
     }
@@ -600,91 +600,67 @@ nga_init(UNUSED(const device_t *info))
 const device_config_t nga_config[] = {
   // clang-format off
     {
-        .name = "rgb_type",
-        .description = "RGB type",
-        .type = CONFIG_SELECTION,
-        .default_int = 0,
-        .selection = {
-            {
-                .description = "Color",
-                .value = 0
-            },
-            {
-                .description = "Green Monochrome",
-                .value = 1
-            },
-            {
-                .description = "Amber Monochrome",
-                .value = 2
-            },
-            {
-                .description = "Gray Monochrome",
-                .value = 3
-            },
-            {
-                .description = "Color (no brown)",
-                .value = 4
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "rgb_type",
+        .description    = "RGB type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Color",            .value = 0 },
+            { .description = "Green Monochrome", .value = 1 },
+            { .description = "Amber Monochrome", .value = 2 },
+            { .description = "Gray Monochrome",  .value = 3 },
+            { .description = "Color (no brown)", .value = 4 },
+            { .description = ""                             }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "snow_enabled",
-        .description = "Snow emulation",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "snow_enabled",
+        .description    = "Snow emulation",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 64,
-        .selection = {
-            {
-                .description = "32 KB",
-                .value = 32
-            },
-            {
-                .description = "64 KB",
-                .value = 64
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 64,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "32 KB", .value = 32 },
+            { .description = "64 KB", .value = 64 },
+            { .description = ""                   }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "charset",
-        .description = "Character set",
-        .type = CONFIG_SELECTION,
-        .default_int = 0,
-        .selection = {
-            {
-                .description = "U.S. English",
-                .value = 0
-            },
-            {
-                .description = "Scandinavian",
-                .value = 1
-            },
-            {
-                .description = "Other languages",
-                .value = 2
-            },
-            {
-                .description = "E.F. Hutton",
-                .value = 3
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "charset",
+        .description    = "Character set",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "U.S. English",    .value = 0 },
+            { .description = "Scandinavian",    .value = 1 },
+            { .description = "Other languages", .value = 2 },
+            { .description = "E.F. Hutton",     .value = 3 },
+            { .description = ""                            }
+        },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
@@ -696,7 +672,7 @@ const device_t nga_device = {
     .init          = nga_init,
     .close         = nga_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = nga_speed_changed,
     .force_redraw  = NULL,
     .config        = nga_config
diff --git a/src/video/vid_ogc.c b/src/video/vid_cga_olivetti.c
similarity index 70%
rename from src/video/vid_ogc.c
rename to src/video/vid_cga_olivetti.c
index c3073898d..147529f6e 100644
--- a/src/video/vid_ogc.c
+++ b/src/video/vid_cga_olivetti.c
@@ -31,12 +31,14 @@
 #include <86box/io.h>
 #include <86box/video.h>
 #include <86box/86box.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/mem.h>
 #include <86box/pit.h>
 #include <86box/rom.h>
 #include <86box/device.h>
 #include <86box/vid_cga.h>
+extern const device_config_t cga_config[]; /* defined in vid_cga.c */
 #include <86box/vid_ogc.h>
 #include <86box/vid_cga_comp.h>
 #include <86box/plat_unused.h>
@@ -64,12 +66,12 @@ ogc_recalctimings(ogc_t *ogc)
     double _dispofftime;
     double disptime;
 
-    if (ogc->cga.cgamode & 1) {
-        disptime    = ogc->cga.crtc[0] + 1;
-        _dispontime = ogc->cga.crtc[1];
+    if (ogc->cga.cgamode & CGA_MODE_FLAG_HIGHRES) {
+        disptime    = ogc->cga.crtc[CGA_CRTC_HTOTAL] + 1;
+        _dispontime = ogc->cga.crtc[CGA_CRTC_HDISP];
     } else {
-        disptime    = (ogc->cga.crtc[0] + 1) << 1;
-        _dispontime = ogc->cga.crtc[1] << 1;
+        disptime    = (ogc->cga.crtc[CGA_CRTC_HTOTAL] + 1) << 1;
+        _dispontime = ogc->cga.crtc[CGA_CRTC_HDISP] << 1;
     }
 
     _dispofftime = disptime - _dispontime;
@@ -97,11 +99,14 @@ ogc_out(uint16_t addr, uint8_t val, void *priv)
             cga_out(addr, val, &ogc->cga);
             break;
 
+        case 0x3db:
         case 0x3de:
-            /* set control register */
-            ogc->ctrl_3de = val;
-            /* select 1st or 2nd 16k vram block to be used */
-            ogc->base = (val & 0x08) ? 0x4000 : 0;
+            if (addr == ogc->ctrl_addr) {
+                /* set control register */
+                ogc->ctrl_3de = val;
+                /* select 1st or 2nd 16k vram block to be used */
+                ogc->base = (val & 0x08) ? 0x4000 : 0;
+            }
             break;
 
         default:
@@ -197,7 +202,7 @@ void
 ogc_poll(void *priv)
 {
     ogc_t   *ogc = (ogc_t *) priv;
-    uint16_t ca  = (ogc->cga.crtc[15] | (ogc->cga.crtc[14] << 8)) & 0x3fff;
+    uint16_t cursoraddr  = (ogc->cga.crtc[CGA_CRTC_CURSOR_ADDR_LOW] | (ogc->cga.crtc[CGA_CRTC_CURSOR_ADDR_HIGH] << 8)) & 0x3fff;
     int      drawcursor;
     int      x;
     int      c;
@@ -209,14 +214,14 @@ ogc_poll(void *priv)
     uint16_t dat;
     uint16_t dat2;
     int      cols[4];
-    int      oldsc;
+    int      scanline_old;
     int      blink     = 0;
     int      underline = 0;
 
-    // composito colore appare blu scuro
+    // Composite color appears dark blue
 
     /* graphic mode and not mode 40h */
-    if (!(ogc->ctrl_3de & 0x1 || !(ogc->cga.cgamode & 2))) {
+    if (!(ogc->ctrl_3de & 0x1 || !(ogc->cga.cgamode & CGA_MODE_FLAG_GRAPHICS))) {
         /* standard cga mode */
         cga_poll(&ogc->cga);
         return;
@@ -226,9 +231,9 @@ ogc_poll(void *priv)
             timer_advance_u64(&ogc->cga.timer, ogc->cga.dispofftime);
             ogc->cga.cgastat |= 1;
             ogc->cga.linepos = 1;
-            oldsc            = ogc->cga.sc;
-            if ((ogc->cga.crtc[8] & 3) == 3)
-                ogc->cga.sc = ((ogc->cga.sc << 1) + ogc->cga.oddeven) & 7;
+            scanline_old            = ogc->cga.scanline;
+            if ((ogc->cga.crtc[CGA_CRTC_INTERLACE] & 3) == 3)
+                ogc->cga.scanline = ((ogc->cga.scanline << 1) + ogc->cga.oddeven) & 7;
             if (ogc->cga.cgadispon) {
                 if (ogc->cga.displine < ogc->cga.firstline) {
                     ogc->cga.firstline = ogc->cga.displine;
@@ -236,11 +241,11 @@ ogc_poll(void *priv)
                 }
                 ogc->cga.lastline = ogc->cga.displine;
                 /* 80-col */
-                if (ogc->cga.cgamode & 1) {
+                if (ogc->cga.cgamode & CGA_MODE_FLAG_HIGHRES) {
                     /* for each text column */
-                    for (x = 0; x < ogc->cga.crtc[1]; x++) {
+                    for (x = 0; x < ogc->cga.crtc[CGA_CRTC_HDISP]; x++) {
                         /* video output enabled */
-                        if (ogc->cga.cgamode & 8) {
+                        if (ogc->cga.cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) {
                             /* character */
                             chr = ogc->cga.charbuffer[x << 1];
                             /* text attributes */
@@ -248,7 +253,7 @@ ogc_poll(void *priv)
                         } else
                             chr = attr = 0;
                         /* check if cursor has to be drawn */
-                        drawcursor = ((ogc->cga.ma == ca) && ogc->cga.con && ogc->cga.cursoron);
+                        drawcursor = ((ogc->cga.memaddr == cursoraddr) && ogc->cga.cursorvisible && ogc->cga.cursoron);
                         /* check if character underline mode should be set */
                         underline = ((ogc->ctrl_3de & 0x40) && (attr & 0x1) && !(attr & 0x6));
                         if (underline) {
@@ -259,7 +264,7 @@ ogc_poll(void *priv)
                         /* set foreground */
                         cols[1] = (attr & 15) + 16;
                         /* blink active */
-                        if (ogc->cga.cgamode & 0x20) {
+                        if (ogc->cga.cgamode & CGA_MODE_FLAG_BLINK) {
                             cols[0] = ((attr >> 4) & 7) + 16;
                             /* attribute 7 active and not cursor */
                             if ((ogc->cga.cgablink & 8) && (attr & 0x80) && !ogc->cga.drawcursor) {
@@ -273,31 +278,31 @@ ogc_poll(void *priv)
                             blink   = (attr & 0x80) * 8 + 7 + 16;
                         }
                         /* character underline active and 7th row of pixels in character height being drawn */
-                        if (underline && (ogc->cga.sc == 7)) {
+                        if (underline && (ogc->cga.scanline == 7)) {
                             /* for each pixel in character width */
                             for (c = 0; c < 8; c++)
                                 buffer32->line[ogc->cga.displine][(x << 3) + c + 8] = mdaattr[attr][blink][1];
                         } else if (drawcursor) {
                             for (c = 0; c < 8; c++)
-                                buffer32->line[ogc->cga.displine][(x << 3) + c + 8] = cols[(fontdatm[chr][((ogc->cga.sc & 7) << 1) | ogc->lineff] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
+                                buffer32->line[ogc->cga.displine][(x << 3) + c + 8] = cols[(fontdatm[chr][((ogc->cga.scanline & 7) << 1) | ogc->lineff] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
                         } else {
                             for (c = 0; c < 8; c++)
-                                buffer32->line[ogc->cga.displine][(x << 3) + c + 8] = cols[(fontdatm[chr][((ogc->cga.sc & 7) << 1) | ogc->lineff] & (1 << (c ^ 7))) ? 1 : 0];
+                                buffer32->line[ogc->cga.displine][(x << 3) + c + 8] = cols[(fontdatm[chr][((ogc->cga.scanline & 7) << 1) | ogc->lineff] & (1 << (c ^ 7))) ? 1 : 0];
                         }
 
-                        ogc->cga.ma++;
+                        ogc->cga.memaddr++;
                     }
                 }
                 /* 40-col */
-                else if (!(ogc->cga.cgamode & 2)) {
-                    for (x = 0; x < ogc->cga.crtc[1]; x++) {
-                        if (ogc->cga.cgamode & 8) {
-                            chr  = ogc->cga.vram[((ogc->cga.ma << 1) & 0x3fff) + ogc->base];
-                            attr = ogc->cga.vram[(((ogc->cga.ma << 1) + 1) & 0x3fff) + ogc->base];
+                else if (!(ogc->cga.cgamode & CGA_MODE_FLAG_GRAPHICS)) {
+                    for (x = 0; x < ogc->cga.crtc[CGA_CRTC_HDISP]; x++) {
+                        if (ogc->cga.cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) {
+                            chr  = ogc->cga.vram[((ogc->cga.memaddr << 1) & 0x3fff) + ogc->base];
+                            attr = ogc->cga.vram[(((ogc->cga.memaddr << 1) + 1) & 0x3fff) + ogc->base];
                         } else {
                             chr = attr = 0;
                         }
-                        drawcursor = ((ogc->cga.ma == ca) && ogc->cga.con && ogc->cga.cursoron);
+                        drawcursor = ((ogc->cga.memaddr == cursoraddr) && ogc->cga.cursorvisible && ogc->cga.cursoron);
                         /* check if character underline mode should be set */
                         underline = ((ogc->ctrl_3de & 0x40) && (attr & 0x1) && !(attr & 0x6));
                         if (underline) {
@@ -308,7 +313,7 @@ ogc_poll(void *priv)
                         /* set foreground */
                         cols[1] = (attr & 15) + 16;
                         /* blink active */
-                        if (ogc->cga.cgamode & 0x20) {
+                        if (ogc->cga.cgamode & CGA_MODE_FLAG_BLINK) {
                             cols[0] = ((attr >> 4) & 7) + 16;
                             if ((ogc->cga.cgablink & 8) && (attr & 0x80) && !ogc->cga.drawcursor) {
                                 /* set blinking */
@@ -322,40 +327,40 @@ ogc_poll(void *priv)
                         }
 
                         /* character underline active and 7th row of pixels in character height being drawn */
-                        if (underline && (ogc->cga.sc == 7)) {
+                        if (underline && (ogc->cga.scanline == 7)) {
                             /* for each pixel in character width */
                             for (c = 0; c < 8; c++)
                                 buffer32->line[ogc->cga.displine][(x << 4) + (c << 1) + 8] = buffer32->line[ogc->cga.displine][(x << 4) + (c << 1) + 1 + 8] = mdaattr[attr][blink][1];
                         } else if (drawcursor) {
                             for (c = 0; c < 8; c++)
-                                buffer32->line[ogc->cga.displine][(x << 4) + (c << 1) + 8] = buffer32->line[ogc->cga.displine][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr][((ogc->cga.sc & 7) << 1) | ogc->lineff] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
+                                buffer32->line[ogc->cga.displine][(x << 4) + (c << 1) + 8] = buffer32->line[ogc->cga.displine][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr][((ogc->cga.scanline & 7) << 1) | ogc->lineff] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
                         } else {
                             for (c = 0; c < 8; c++)
-                                buffer32->line[ogc->cga.displine][(x << 4) + (c << 1) + 8] = buffer32->line[ogc->cga.displine][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr][((ogc->cga.sc & 7) << 1) | ogc->lineff] & (1 << (c ^ 7))) ? 1 : 0];
+                                buffer32->line[ogc->cga.displine][(x << 4) + (c << 1) + 8] = buffer32->line[ogc->cga.displine][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr][((ogc->cga.scanline & 7) << 1) | ogc->lineff] & (1 << (c ^ 7))) ? 1 : 0];
                         }
 
-                        ogc->cga.ma++;
+                        ogc->cga.memaddr++;
                     }
                 } else {
                     /* 640x400 mode */
                     if (ogc->ctrl_3de & 1) {
-                        dat2    = ((ogc->cga.sc & 1) * 0x4000) | (ogc->lineff * 0x2000);
+                        dat2    = ((ogc->cga.scanline & 1) * 0x4000) | (ogc->lineff * 0x2000);
                         cols[0] = 0;
                         cols[1] = 15 + 16;
                     } else {
-                        dat2    = (ogc->cga.sc & 1) * 0x2000;
+                        dat2    = (ogc->cga.scanline & 1) * 0x2000;
                         cols[0] = 0;
                         cols[1] = (ogc->cga.cgacol & 15) + 16;
                     }
 
-                    for (x = 0; x < ogc->cga.crtc[1]; x++) {
+                    for (x = 0; x < ogc->cga.crtc[CGA_CRTC_HDISP]; x++) {
                         /* video out */
-                        if (ogc->cga.cgamode & 8) {
-                            dat = (ogc->cga.vram[((ogc->cga.ma << 1) & 0x1fff) + dat2] << 8) | ogc->cga.vram[((ogc->cga.ma << 1) & 0x1fff) + dat2 + 1];
+                        if (ogc->cga.cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) {
+                            dat = (ogc->cga.vram[((ogc->cga.memaddr << 1) & 0x1fff) + dat2] << 8) | ogc->cga.vram[((ogc->cga.memaddr << 1) & 0x1fff) + dat2 + 1];
                         } else {
                             dat = 0;
                         }
-                        ogc->cga.ma++;
+                        ogc->cga.memaddr++;
 
                         for (c = 0; c < 16; c++) {
                             buffer32->line[ogc->cga.displine][(x << 4) + c + 8] = cols[dat >> 15];
@@ -366,22 +371,22 @@ ogc_poll(void *priv)
             } else {
                 /* ogc specific */
                 cols[0] = ((ogc->cga.cgamode & 0x12) == 0x12) ? 0 : (ogc->cga.cgacol & 15) + 16;
-                if (ogc->cga.cgamode & 1)
-                    hline(buffer32, 0, ogc->cga.displine, ((ogc->cga.crtc[1] << 3) + 16) << 2, cols[0]);
+                if (ogc->cga.cgamode & CGA_MODE_FLAG_HIGHRES)
+                    hline(buffer32, 0, ogc->cga.displine, ((ogc->cga.crtc[CGA_CRTC_HDISP] << 3) + 16) << 2, cols[0]);
                 else
-                    hline(buffer32, 0, ogc->cga.displine, ((ogc->cga.crtc[1] << 4) + 16) << 2, cols[0]);
+                    hline(buffer32, 0, ogc->cga.displine, ((ogc->cga.crtc[CGA_CRTC_HDISP] << 4) + 16) << 2, cols[0]);
             }
 
             /* 80 columns */
-            if (ogc->cga.cgamode & 1)
-                x = (ogc->cga.crtc[1] << 3) + 16;
+            if (ogc->cga.cgamode & CGA_MODE_FLAG_HIGHRES)
+                x = (ogc->cga.crtc[CGA_CRTC_HDISP] << 3) + 16;
             else
-                x = (ogc->cga.crtc[1] << 4) + 16;
+                x = (ogc->cga.crtc[CGA_CRTC_HDISP] << 4) + 16;
 
             video_process_8(x, ogc->cga.displine);
 
-            ogc->cga.sc = oldsc;
-            if (ogc->cga.vc == ogc->cga.crtc[7] && !ogc->cga.sc)
+            ogc->cga.scanline = scanline_old;
+            if (ogc->cga.vc == ogc->cga.crtc[CGA_CRTC_VSYNC] && !ogc->cga.scanline)
                 ogc->cga.cgastat |= 8;
             ogc->cga.displine++;
             if (ogc->cga.displine >= 720)
@@ -394,48 +399,47 @@ ogc_poll(void *priv)
             /* ogc specific */
             ogc->lineff ^= 1;
             if (ogc->lineff) {
-                ogc->cga.ma = ogc->cga.maback;
+                ogc->cga.memaddr = ogc->cga.memaddr_backup;
             } else {
                 if (ogc->cga.vsynctime) {
                     ogc->cga.vsynctime--;
                     if (!ogc->cga.vsynctime)
                         ogc->cga.cgastat &= ~8;
                 }
-                if (ogc->cga.sc == (ogc->cga.crtc[11] & 31) || ((ogc->cga.crtc[8] & 3) == 3 && ogc->cga.sc == ((ogc->cga.crtc[11] & 31) >> 1))) {
-                    ogc->cga.con  = 0;
-                    ogc->cga.coff = 1;
+                if (ogc->cga.scanline == (ogc->cga.crtc[CGA_CRTC_CURSOR_END] & 31) || ((ogc->cga.crtc[CGA_CRTC_INTERLACE] & 3) == 3 && ogc->cga.scanline == ((ogc->cga.crtc[CGA_CRTC_CURSOR_END] & 31) >> 1))) {
+                    ogc->cga.cursorvisible  = 0;
                 }
-                if ((ogc->cga.crtc[8] & 3) == 3 && ogc->cga.sc == (ogc->cga.crtc[9] >> 1))
-                    ogc->cga.maback = ogc->cga.ma;
+                if ((ogc->cga.crtc[CGA_CRTC_INTERLACE] & 3) == 3 && ogc->cga.scanline == (ogc->cga.crtc[CGA_CRTC_MAX_SCANLINE_ADDR] >> 1))
+                    ogc->cga.memaddr_backup = ogc->cga.memaddr;
                 if (ogc->cga.vadj) {
-                    ogc->cga.sc++;
-                    ogc->cga.sc &= 31;
-                    ogc->cga.ma = ogc->cga.maback;
+                    ogc->cga.scanline++;
+                    ogc->cga.scanline &= 31;
+                    ogc->cga.memaddr = ogc->cga.memaddr_backup;
                     ogc->cga.vadj--;
                     if (!ogc->cga.vadj) {
                         ogc->cga.cgadispon = 1;
-                        ogc->cga.ma = ogc->cga.maback = (ogc->cga.crtc[13] | (ogc->cga.crtc[12] << 8)) & 0x3fff;
-                        ogc->cga.sc                   = 0;
+                        ogc->cga.memaddr = ogc->cga.memaddr_backup = (ogc->cga.crtc[CGA_CRTC_START_ADDR_LOW] | (ogc->cga.crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x3fff;
+                        ogc->cga.scanline                   = 0;
                     }
-                    // potrebbe dare problemi con composito
-                } else if (ogc->cga.sc == ogc->cga.crtc[9] || ((ogc->cga.crtc[8] & 3) == 3 && ogc->cga.sc == (ogc->cga.crtc[9] >> 1))) {
-                    ogc->cga.maback = ogc->cga.ma;
-                    ogc->cga.sc     = 0;
+                    // may cause problems with composite 
+                } else if (ogc->cga.scanline == ogc->cga.crtc[CGA_CRTC_MAX_SCANLINE_ADDR] || ((ogc->cga.crtc[CGA_CRTC_INTERLACE] & 3) == 3 && ogc->cga.scanline == (ogc->cga.crtc[CGA_CRTC_MAX_SCANLINE_ADDR] >> 1))) {
+                    ogc->cga.memaddr_backup = ogc->cga.memaddr;
+                    ogc->cga.scanline     = 0;
                     oldvc           = ogc->cga.vc;
                     ogc->cga.vc++;
                     ogc->cga.vc &= 127;
 
-                    if (ogc->cga.vc == ogc->cga.crtc[6])
+                    if (ogc->cga.vc == ogc->cga.crtc[CGA_CRTC_VDISP])
                         ogc->cga.cgadispon = 0;
 
-                    if (oldvc == ogc->cga.crtc[4]) {
+                    if (oldvc == ogc->cga.crtc[CGA_CRTC_VTOTAL]) {
                         ogc->cga.vc   = 0;
-                        ogc->cga.vadj = ogc->cga.crtc[5];
+                        ogc->cga.vadj = ogc->cga.crtc[CGA_CRTC_VTOTAL_ADJUST];
                         if (!ogc->cga.vadj) {
                             ogc->cga.cgadispon = 1;
-                            ogc->cga.ma = ogc->cga.maback = (ogc->cga.crtc[13] | (ogc->cga.crtc[12] << 8)) & 0x3fff;
+                            ogc->cga.memaddr = ogc->cga.memaddr_backup = (ogc->cga.crtc[CGA_CRTC_START_ADDR_LOW] | (ogc->cga.crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x3fff;
                         }
-                        switch (ogc->cga.crtc[10] & 0x60) {
+                        switch (ogc->cga.crtc[CGA_CRTC_CURSOR_START] & 0x60) {
                             case 0x20:
                                 ogc->cga.cursoron = 0;
                                 break;
@@ -447,16 +451,16 @@ ogc_poll(void *priv)
                                 break;
                         }
                     }
-                    if (ogc->cga.vc == ogc->cga.crtc[7]) {
+                    if (ogc->cga.vc == ogc->cga.crtc[CGA_CRTC_VSYNC]) {
                         ogc->cga.cgadispon = 0;
                         ogc->cga.displine  = 0;
                         /* ogc specific */
-                        ogc->cga.vsynctime = (ogc->cga.crtc[3] >> 4) + 1;
-                        if (ogc->cga.crtc[7]) {
-                            if (ogc->cga.cgamode & 1)
-                                x = (ogc->cga.crtc[1] << 3) + 16;
+                        ogc->cga.vsynctime = (ogc->cga.crtc[CGA_CRTC_HSYNC_WIDTH] >> 4) + 1;
+                        if (ogc->cga.crtc[CGA_CRTC_VSYNC]) {
+                            if (ogc->cga.cgamode & CGA_MODE_FLAG_HIGHRES)
+                                x = (ogc->cga.crtc[CGA_CRTC_HDISP] << 3) + 16;
                             else
-                                x = (ogc->cga.crtc[1] << 4) + 16;
+                                x = (ogc->cga.crtc[CGA_CRTC_HDISP] << 4) + 16;
                             ogc->cga.lastline++;
 
                             xs_temp = x;
@@ -471,7 +475,7 @@ ogc_poll(void *priv)
                                 if (!enable_overscan)
                                     xs_temp -= 16;
 
-                                if ((ogc->cga.cgamode & 8) && ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get())) {
+                                if ((ogc->cga.cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) && ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get())) {
                                     xsize = xs_temp;
                                     ysize = ys_temp;
                                     set_screen_size(xsize, ysize + (enable_overscan ? 16 : 0));
@@ -493,14 +497,14 @@ ogc_poll(void *priv)
                             video_res_x = xsize;
                             video_res_y = ysize;
                             /* 80-col */
-                            if (ogc->cga.cgamode & 1) {
+                            if (ogc->cga.cgamode & CGA_MODE_FLAG_HIGHRES) {
                                 video_res_x /= 8;
-                                video_res_y /= (ogc->cga.crtc[9] + 1) * 2;
+                                video_res_y /= (ogc->cga.crtc[CGA_CRTC_MAX_SCANLINE_ADDR] + 1) * 2;
                                 video_bpp = 0;
                                 /* 40-col */
-                            } else if (!(ogc->cga.cgamode & 2)) {
+                            } else if (!(ogc->cga.cgamode & CGA_MODE_FLAG_GRAPHICS)) {
                                 video_res_x /= 16;
-                                video_res_y /= (ogc->cga.crtc[9] + 1) * 2;
+                                video_res_y /= (ogc->cga.crtc[CGA_CRTC_MAX_SCANLINE_ADDR] + 1) * 2;
                                 video_bpp = 0;
                             } else if (!(ogc->ctrl_3de & 1)) {
                                 video_res_y /= 2;
@@ -513,21 +517,21 @@ ogc_poll(void *priv)
                         ogc->cga.oddeven ^= 1;
                     }
                 } else {
-                    ogc->cga.sc++;
-                    ogc->cga.sc &= 31;
-                    ogc->cga.ma = ogc->cga.maback;
+                    ogc->cga.scanline++;
+                    ogc->cga.scanline &= 31;
+                    ogc->cga.memaddr = ogc->cga.memaddr_backup;
                 }
 
                 if (ogc->cga.cgadispon)
                     ogc->cga.cgastat &= ~1;
 
-                if (ogc->cga.sc == (ogc->cga.crtc[10] & 31) || ((ogc->cga.crtc[8] & 3) == 3 && ogc->cga.sc == ((ogc->cga.crtc[10] & 31) >> 1)))
-                    ogc->cga.con = 1;
+                if (ogc->cga.scanline == (ogc->cga.crtc[CGA_CRTC_CURSOR_START] & 31) || ((ogc->cga.crtc[CGA_CRTC_INTERLACE] & 3) == 3 && ogc->cga.scanline == ((ogc->cga.crtc[CGA_CRTC_CURSOR_START] & 31) >> 1)))
+                    ogc->cga.cursorvisible = 1;
             }
             /* 80-columns */
-            if (ogc->cga.cgadispon && (ogc->cga.cgamode & 1)) {
-                for (x = 0; x < (ogc->cga.crtc[1] << 1); x++)
-                    ogc->cga.charbuffer[x] = ogc->cga.vram[(((ogc->cga.ma << 1) + x) & 0x3fff) + ogc->base];
+            if (ogc->cga.cgadispon && (ogc->cga.cgamode & CGA_MODE_FLAG_HIGHRES)) {
+                for (x = 0; x < (ogc->cga.crtc[CGA_CRTC_HDISP] << 1); x++)
+                    ogc->cga.charbuffer[x] = ogc->cga.vram[(((ogc->cga.memaddr << 1) + x) & 0x3fff) + ogc->base];
             }
         }
     }
@@ -622,6 +626,8 @@ ogc_init(UNUSED(const device_t *info))
     else
         ogc->mono_display = 1;
 
+    ogc->ctrl_addr = 0x3de;
+
     return ogc;
 }
 
@@ -629,41 +635,34 @@ const device_config_t ogc_m24_config[] = {
   // clang-format off
     {
         /* Olivetti / ATT compatible displays */
-        .name = "rgb_type",
-        .description = "RGB type",
-        .type = CONFIG_SELECTION,
-        .default_int = CGA_RGB,
-        .selection = {
-            {
-                .description = "Color",
-                .value = 0
-            },
-            {
-                .description = "Green Monochrome",
-                .value = 1
-            },
-            {
-                .description = "Amber Monochrome",
-                .value = 2
-            },
-            {
-                .description = "Gray Monochrome",
-                .value = 3
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "rgb_type",
+        .description    = "RGB type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = CGA_RGB,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Color",            .value = 0 },
+            { .description = "Green Monochrome", .value = 1 },
+            { .description = "Amber Monochrome", .value = 2 },
+            { .description = "Gray Monochrome",  .value = 3 },
+            { .description = ""                             }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "snow_enabled",
-        .description = "Snow emulation",
-        .type = CONFIG_BINARY,
-        .default_int = 1,
+        .name           = "snow_enabled",
+        .description    = "Snow emulation",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
@@ -675,7 +674,7 @@ const device_t ogc_m24_device = {
     .init          = ogc_init,
     .close         = ogc_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = ogc_speed_changed,
     .force_redraw  = NULL,
     .config        = ogc_m24_config
@@ -689,7 +688,7 @@ const device_t ogc_device = {
     .init          = ogc_init,
     .close         = ogc_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = ogc_speed_changed,
     .force_redraw  = NULL,
     .config        = cga_config
diff --git a/src/video/vid_cga_quadcolor.c b/src/video/vid_cga_quadcolor.c
new file mode 100644
index 000000000..4159dc2c1
--- /dev/null
+++ b/src/video/vid_cga_quadcolor.c
@@ -0,0 +1,997 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Quadram Quadcolor I / I+II emulation
+ *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *          W. M. Martinez, <anikom15@outlook.com>
+ *          Benedikt Freisen, <https://pcem-emulator.co.uk/>
+ *          Jasmine Iwanek, <jriwanek@gmail.com>
+ *
+ *          Copyright 2008-2019 Sarah Walker.
+ *          Copyright 2016-2019 Miran Grca.
+ *          Copyright 2023      W. M. Martinez
+ *          Copyright 2024      Benedikt Freisen.
+ *          Copyright 2025      Jasmine Iwanek.
+ */
+
+/* This has been derived from CGA emulation */
+/* omissions: simulated snow (Quadcolor has dual-ported RAM), single and dual 8x16 font configuration */
+/* additions: ports 0x3dd and 0x3de, 2nd char set, 2nd VRAM bank, hi-res bg color, Quadcolor II memory and mode */
+/* assumptions: MA line 12 XORed with Bank Select, hi-res bg is also border color, QC2 mode has simple address counter */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <math.h>
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/pit.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/device.h>
+#include <86box/video.h>
+#include <86box/vid_cga.h>
+#include <86box/vid_quadcolor.h>
+#include <86box/vid_cga_comp.h>
+#include <86box/plat_unused.h>
+
+#define CGA_RGB       0
+#define CGA_COMPOSITE 1
+
+#define COMPOSITE_OLD 0
+#define COMPOSITE_NEW 1
+
+#define DOUBLE_NONE               0
+#define DOUBLE_SIMPLE             1
+#define DOUBLE_INTERPOLATE_SRGB   2
+#define DOUBLE_INTERPOLATE_LINEAR 3
+
+#define DEVICE_VRAM      0x8000
+#define DEVICE_VRAM_MASK 0x7fff
+
+typedef union {
+    uint32_t color;
+    struct {
+        uint8_t b;
+        uint8_t g;
+        uint8_t r;
+        uint8_t a;
+    };
+} color_t;
+
+static uint8_t crtcmask[32] = {
+    0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x7f, 0x7f, 0xf3, 0x1f, 0x7f, 0x1f, 0x3f, 0xff, 0x3f, 0xff,
+    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static uint8_t interp_lut[2][256][256];
+
+static video_timings_t timing_quadcolor = { .type = VIDEO_ISA, .write_b = 8, .write_w = 16, .write_l = 32, .read_b = 8, .read_w = 16, .read_l = 32 };
+
+void quadcolor_recalctimings(quadcolor_t *quadcolor);
+
+static void
+quadcolor_update_latch(quadcolor_t *quadcolor)
+{
+    uint32_t lp_latch = quadcolor->displine * quadcolor->crtc[CGA_CRTC_HDISP];
+
+    quadcolor->crtc[CGA_CRTC_LIGHT_PEN_ADDR_HIGH] = (lp_latch >> 8) & 0x3f;
+    quadcolor->crtc[CGA_CRTC_LIGHT_PEN_ADDR_LOW] = lp_latch & 0xff;
+}
+
+void
+quadcolor_out(uint16_t addr, uint8_t val, void *priv)
+{
+    quadcolor_t  *quadcolor = (quadcolor_t *) priv;
+    uint8_t old;
+
+    if ((addr >= 0x3d0) && (addr <= 0x3d7))
+        addr = (addr & 0xff9) | 0x004;
+
+    switch (addr) {
+        case CGA_REGISTER_CRTC_INDEX:
+            quadcolor->crtcreg = val & 31;
+            return;
+        case CGA_REGISTER_CRTC_DATA:
+            old                     = quadcolor->crtc[quadcolor->crtcreg];
+            quadcolor->crtc[quadcolor->crtcreg] = val & crtcmask[quadcolor->crtcreg];
+            if (old != val) {
+                // Recalc the timings if we are writing any invalid CRTC register or a valid CRTC register 
+                // except the CURSOR and LIGHT PEN registers
+                if ((quadcolor->crtcreg < 0xe) || (quadcolor->crtcreg > 0x11)) {
+                    quadcolor->fullchange = changeframecount;
+                    quadcolor_recalctimings(quadcolor);
+                }
+            }
+            return;
+        case CGA_REGISTER_MODE_CONTROL:
+            old                = quadcolor->cgamode;
+            quadcolor->cgamode = val;
+
+            if (old ^ val) {
+                if ((old ^ val) & 0x07)
+                    update_cga16_color(val);
+
+                quadcolor_recalctimings(quadcolor);
+            }
+            return;
+        case CGA_REGISTER_COLOR_SELECT:
+            old         = quadcolor->cgacol;
+            quadcolor->cgacol = val;
+            if (old ^ val)
+                quadcolor_recalctimings(quadcolor);
+            return;
+
+        case CGA_REGISTER_CLEAR_LIGHT_PEN_LATCH:
+            if (quadcolor->lp_strobe == 1)
+                quadcolor->lp_strobe = 0;
+            return;
+        case CGA_REGISTER_SET_LIGHT_PEN_LATCH:
+            if (quadcolor->lp_strobe == 0) {
+                quadcolor->lp_strobe = 1;
+                quadcolor_update_latch(quadcolor);
+            }
+            return;
+
+        case 0x3dd:
+            quadcolor->quadcolor_ctrl = val & 0x3f;
+            /* helper variable that can be XORed onto the VRAM address to select the page to display */
+            quadcolor->page_offset = (val & 0x10) << 8;
+            /* in dual 8x8 font configuration, use fontbase 256 if "Character Set Select" bit is set */
+            if (quadcolor->has_2nd_charset)
+                quadcolor->fontbase = (val & 0x20) << 3;
+            return;
+        case 0x3de:
+            /* NOTE: the polarity of this register is the opposite of what the manual says */
+            if (quadcolor->has_quadcolor_2)
+                /*
+                   NOTE: PC Paintbrush writes FF and then gets stuck if it doesn't get enabled,
+                         and then it expects to disable it with 0x00. The only way to square this
+                         with the inverted polarity note above is if that was a value other than
+                         0x00 with bit 4 clear.
+                 */
+                quadcolor->quadcolor_2_oe = ((!(val & 0x10)) || (val == 0xff)) && (val != 0x00);
+            return;
+
+        default:
+            break;
+    }
+}
+
+uint8_t
+quadcolor_in(uint16_t addr, void *priv)
+{
+    quadcolor_t  *quadcolor = (quadcolor_t *) priv;
+    uint8_t ret = 0xff;
+
+    if ((addr >= 0x3d0) && (addr <= 0x3d7))
+        addr = (addr & 0xff9) | 0x004;
+
+    switch (addr) {
+        case CGA_REGISTER_CRTC_INDEX:
+            ret = quadcolor->crtcreg;
+            break;
+        case CGA_REGISTER_CRTC_DATA:
+            ret = quadcolor->crtc[quadcolor->crtcreg];
+            break;
+        case CGA_REGISTER_STATUS:
+            ret = quadcolor->cgastat;
+            break;
+        case CGA_REGISTER_CLEAR_LIGHT_PEN_LATCH:
+            if (quadcolor->lp_strobe == 1)
+                quadcolor->lp_strobe = 0;
+            break;
+        case CGA_REGISTER_SET_LIGHT_PEN_LATCH:
+            if (quadcolor->lp_strobe == 0) {
+                quadcolor->lp_strobe = 1;
+                quadcolor_update_latch(quadcolor);
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    return ret;
+}
+
+void
+quadcolor_waitstates(UNUSED(void *priv))
+{
+    int ws_array[16] = { 3, 4, 5, 6, 7, 8, 4, 5, 6, 7, 8, 4, 5, 6, 7, 8 };
+    int ws;
+
+    ws = ws_array[cycles & 0xf];
+    cycles -= ws;
+}
+
+void
+quadcolor_write(uint32_t addr, uint8_t val, void *priv)
+{
+    quadcolor_t *quadcolor = (quadcolor_t *) priv;
+
+    quadcolor->vram[addr & DEVICE_VRAM_MASK] = val;
+    quadcolor_waitstates(quadcolor);
+}
+
+uint8_t
+quadcolor_read(uint32_t addr, void *priv)
+{
+    quadcolor_t *quadcolor = (quadcolor_t *) priv;
+
+    quadcolor_waitstates(quadcolor);
+    return quadcolor->vram[addr & DEVICE_VRAM_MASK];
+}
+
+void
+quadcolor_2_write(uint32_t addr, uint8_t val, void *priv)
+{
+        quadcolor_t *quadcolor = (quadcolor_t *) priv;
+        quadcolor->vram_2[addr & 0xffff] = val;
+}
+
+uint8_t
+quadcolor_2_read(uint32_t addr, void *priv)
+{
+        quadcolor_t *quadcolor = (quadcolor_t *) priv;
+        return quadcolor->vram_2[addr & 0xffff];
+}
+
+void
+quadcolor_recalctimings(quadcolor_t *quadcolor)
+{
+    double disptime;
+    double _dispontime;
+    double _dispofftime;
+
+    if (quadcolor->cgamode & CGA_MODE_FLAG_HIGHRES) {
+        disptime    = (double) (quadcolor->crtc[CGA_CRTC_HTOTAL] + 1);
+        _dispontime = (double) quadcolor->crtc[CGA_CRTC_HDISP];
+    } else {
+        disptime    = (double) ((quadcolor->crtc[CGA_CRTC_HTOTAL] + 1) << 1);
+        _dispontime = (double) (quadcolor->crtc[CGA_CRTC_HDISP] << 1);
+    }
+    _dispofftime     = disptime - _dispontime;
+    _dispontime      = _dispontime * CGACONST;
+    _dispofftime     = _dispofftime * CGACONST;
+    quadcolor->dispontime  = (uint64_t) (_dispontime);
+    quadcolor->dispofftime = (uint64_t) (_dispofftime);
+}
+
+static inline uint8_t
+get_next_qc2_pixel(quadcolor_t *quadcolor)
+{
+    uint8_t mask = quadcolor->qc2mask;
+    quadcolor->qc2mask = ~quadcolor->qc2mask;
+    uint8_t pixel = (quadcolor->vram_2[quadcolor->qc2idx] & mask) >> (quadcolor->qc2mask & 4);
+
+    quadcolor->qc2idx += quadcolor->qc2mask >> 7;
+
+    return quadcolor->quadcolor_2_oe ? pixel : 0;
+}
+
+static void
+quadcolor_render(quadcolor_t *quadcolor, int line)
+{
+    uint16_t cursoraddr  = (quadcolor->crtc[CGA_CRTC_CURSOR_ADDR_LOW] | (quadcolor->crtc[CGA_CRTC_CURSOR_ADDR_HIGH] << 8)) & DEVICE_VRAM_MASK;
+    int      drawcursor;
+    int      x;
+    int      column;
+    uint8_t  chr;
+    uint8_t  attr;
+    uint16_t dat;
+    int      cols[4];
+    int      col;
+
+    int32_t  highres_graphics_flag = (CGA_MODE_FLAG_HIGHRES_GRAPHICS | CGA_MODE_FLAG_GRAPHICS);
+
+    cols[0] = ((quadcolor->cgamode & highres_graphics_flag) == highres_graphics_flag) ? (quadcolor->quadcolor_ctrl & 15) :
+                                                                                        (quadcolor->cgacol & 15);
+
+    for (column = 0; column < 8; ++column) {
+        buffer32->line[line][column] = cols[0];
+        if (quadcolor->cgamode & CGA_MODE_FLAG_HIGHRES)
+            buffer32->line[line][column + (quadcolor->crtc[CGA_CRTC_HDISP] << 3) + 8] = cols[0];
+        else
+            buffer32->line[line][column + (quadcolor->crtc[CGA_CRTC_HDISP] << 4) + 8] = cols[0];
+    }
+    if (quadcolor->cgamode & CGA_MODE_FLAG_HIGHRES) { /* 80-column text */
+        for (x = 0; x < quadcolor->crtc[CGA_CRTC_HDISP]; x++) {
+            if (quadcolor->cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) {
+                chr  = quadcolor->charbuffer[x << 1];
+                attr = quadcolor->charbuffer[(x << 1) + 1];
+            } else
+                chr = attr = 0;
+            drawcursor = ((quadcolor->memaddr == cursoraddr) && quadcolor->cursorvisible && quadcolor->cursoron);
+            cols[1]    = (attr & 15) + 16;
+            if (quadcolor->cgamode & CGA_MODE_FLAG_BLINK) {
+                cols[0] = ((attr >> 4) & 7) + 16;
+                if ((quadcolor->cgablink & 8) && (attr & 0x80) && !quadcolor->drawcursor)
+                    cols[1] = cols[0];
+            } else
+                cols[0] = (attr >> 4) + 16;
+            uint8_t charline = quadcolor->scanline & 7;
+            if (drawcursor) {
+                for (column = 0; column < 8; column++) {
+                    dat = (cols[(fontdat[chr + quadcolor->fontbase][charline] & (1 << (column ^ 7))) ? 1 : 0] ^ 15);
+                    buffer32->line[line][(x << 3) + column + 8] =
+                        dat | get_next_qc2_pixel(quadcolor);
+                }
+            } else {
+                for (column = 0; column < 8; column++) {
+                    dat = cols[(fontdat[chr + quadcolor->fontbase][charline] & (1 << (column ^ 7))) ? 1 : 0];
+                    buffer32->line[line][(x << 3) + column + 8] =
+                        dat | get_next_qc2_pixel(quadcolor);
+                }
+            }
+            quadcolor->memaddr++;
+        }
+    } else if (!(quadcolor->cgamode & CGA_MODE_FLAG_GRAPHICS)) {
+        /* Not graphics (nor 80-column text) => 40-column text. */
+        for (x = 0; x < quadcolor->crtc[CGA_CRTC_HDISP]; x++) {
+            if (quadcolor->cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) {
+                chr  = quadcolor->vram[(quadcolor->page_offset ^ (quadcolor->memaddr << 1)) & DEVICE_VRAM_MASK];
+                attr = quadcolor->vram[(quadcolor->page_offset ^ ((quadcolor->memaddr << 1) + 1)) & DEVICE_VRAM_MASK];
+            } else
+                chr = attr = 0;
+            drawcursor = ((quadcolor->memaddr == cursoraddr) && quadcolor->cursorvisible && quadcolor->cursoron);
+            cols[1]    = (attr & 15) + 16;
+            if (quadcolor->cgamode & CGA_MODE_FLAG_BLINK) {
+                cols[0] = ((attr >> 4) & 7) + 16;
+                if ((quadcolor->cgablink & 8) && (attr & 0x80))
+                    cols[1] = cols[0];
+            } else
+                cols[0] = (attr >> 4) + 16;
+            quadcolor->memaddr++;
+            uint8_t charline = quadcolor->scanline & 7;
+            if (drawcursor) {
+                for (column = 0; column < 8; column++) {
+                    dat = (cols[(fontdat[chr + quadcolor->fontbase][charline] & (1 << (column ^ 7))) ? 1 : 0] ^ 15);
+                    buffer32->line[line][(x << 4) + (column << 1) + 8] =
+                        dat | get_next_qc2_pixel(quadcolor);
+                    buffer32->line[line][(x << 4) + (column << 1) + 9] =
+                        dat | get_next_qc2_pixel(quadcolor);
+                }
+            } else {
+                for (column = 0; column < 8; column++) {
+                    dat = cols[(fontdat[chr + quadcolor->fontbase][charline] & (1 << (column ^ 7))) ? 1 : 0];
+                    buffer32->line[line][(x << 4) + (column << 1) + 8] =
+                        dat | get_next_qc2_pixel(quadcolor);
+                    buffer32->line[line][(x << 4) + (column << 1) + 9] =
+                        dat | get_next_qc2_pixel(quadcolor);
+                }
+            }
+        }
+    } else if (!(quadcolor->cgamode & CGA_MODE_FLAG_HIGHRES_GRAPHICS)) {
+        /* Not hi-res (but graphics) => 4-color mode. */
+        cols[0] = (quadcolor->cgacol & 15) | 16;
+        col     = (quadcolor->cgacol & 16) ? 24 : 16;
+        if (quadcolor->cgamode & CGA_MODE_FLAG_BW) {
+            cols[1] = col | 3; /* Cyan */
+            cols[2] = col | 4; /* Red */
+            cols[3] = col | 7; /* White */
+        } else if (quadcolor->cgacol & 32) {
+            cols[1] = col | 3; /* Cyan */
+            cols[2] = col | 5; /* Magenta */
+            cols[3] = col | 7; /* White */
+        } else {
+            cols[1] = col | 2; /* Green */
+            cols[2] = col | 4; /* Red */
+            cols[3] = col | 6; /* Yellow */
+        }
+        for (x = 0; x < quadcolor->crtc[CGA_CRTC_HDISP]; x++) {
+            if (quadcolor->cgamode & CGA_MODE_FLAG_VIDEO_ENABLE)
+                dat = (quadcolor->vram[quadcolor->page_offset ^ (((quadcolor->memaddr << 1) & 0x1fff) +
+                      ((quadcolor->scanline & 1) * 0x2000))] << 8) |
+                      quadcolor->vram[quadcolor->page_offset ^ (((quadcolor->memaddr << 1) & 0x1fff) +
+                      ((quadcolor->scanline & 1) * 0x2000) + 1)];
+            else
+                dat = 0;
+            quadcolor->memaddr++;
+            for (column = 0; column < 8; column++) {
+                buffer32->line[line][(x << 4) + (column << 1) + 8] = cols[dat >> 14] | get_next_qc2_pixel(quadcolor);
+                buffer32->line[line][(x << 4) + (column << 1) + 9] = cols[dat >> 14] | get_next_qc2_pixel(quadcolor);
+                dat <<= 2;
+            }
+        }
+    } else {
+        /* 2-color hi-res graphics mode. */
+        /* Background color (Quadcolor-specific). */
+        cols[0] = quadcolor->quadcolor_ctrl & 15;
+        cols[1] = (quadcolor->cgacol & 15) + 16;
+        for (x = 0; x < quadcolor->crtc[CGA_CRTC_HDISP]; x++) {
+            if (quadcolor->cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) /* video enabled */
+                dat = (quadcolor->vram[quadcolor->page_offset ^ (((quadcolor->memaddr << 1) & 0x1fff) +
+                      ((quadcolor->scanline & 1) * 0x2000))] << 8) |
+                      quadcolor->vram[quadcolor->page_offset ^ (((quadcolor->memaddr << 1) & 0x1fff) +
+                     ((quadcolor->scanline & 1) * 0x2000) + 1)];
+            else
+                /* TODO: Is Quadcolor bg color actually relevant, here? Probably. See QC2 manual p.46 1. */
+                dat = quadcolor->quadcolor_ctrl & 15;
+            quadcolor->memaddr++;
+            for (column = 0; column < 16; column++) {
+                buffer32->line[line][(x << 4) + column + 8] = cols[dat >> 15] | get_next_qc2_pixel(quadcolor);
+                dat <<= 1;
+            }
+        }
+    }
+}
+
+static void
+quadcolor_render_blank(quadcolor_t *quadcolor, int line)
+{
+    int32_t  highres_graphics_flag = (CGA_MODE_FLAG_HIGHRES_GRAPHICS | CGA_MODE_FLAG_GRAPHICS);
+
+    /* `+ 16` isn't in PCem's version */
+    int col = ((quadcolor->cgamode & highres_graphics_flag) == highres_graphics_flag) ? (quadcolor->quadcolor_ctrl & 15) + 16 : (quadcolor->cgacol & 15) + 16;  /* TODO: Is Quadcolor bg color actually relevant, here? */
+
+    if (quadcolor->cgamode & CGA_MODE_FLAG_HIGHRES)
+        hline(buffer32, 0, line, (quadcolor->crtc[CGA_CRTC_HDISP] << 3) + 16, col);
+    else
+        hline(buffer32, 0, line, (quadcolor->crtc[CGA_CRTC_HDISP] << 4) + 16, col);
+}
+
+static void
+quadcolor_render_process(quadcolor_t *quadcolor, int line)
+{
+    int      x;
+    uint8_t  border;
+    int32_t  highres_graphics_flag = (CGA_MODE_FLAG_HIGHRES_GRAPHICS | CGA_MODE_FLAG_GRAPHICS);
+
+    if (quadcolor->cgamode & CGA_MODE_FLAG_HIGHRES)
+        x = (quadcolor->crtc[CGA_CRTC_HDISP] << 3) + 16;
+    else
+        x = (quadcolor->crtc[CGA_CRTC_HDISP] << 4) + 16;
+
+    if (quadcolor->composite) {
+        border = ((quadcolor->cgamode & highres_graphics_flag) == highres_graphics_flag) ? 0 : (quadcolor->cgacol & 15);
+
+        Composite_Process(quadcolor->cgamode, border, x >> 2, buffer32->line[line]);
+    } else
+        video_process_8(x, line);
+}
+
+static uint8_t
+quadcolor_interpolate_srgb(uint8_t co1, uint8_t co2, double fraction)
+{
+    uint8_t ret = ((co2 - co1) * fraction + co1);
+
+    return ret;
+}
+
+static uint8_t
+quadcolor_interpolate_linear(uint8_t co1, uint8_t co2, double fraction)
+{
+    double c1, c2;
+    double r1, r2;
+    uint8_t ret;
+
+    c1 = ((double) co1) / 255.0;
+    c1 = pow((co1 >= 0) ? c1 : -c1, 2.19921875);
+    if (co1 <= 0)
+        c1 = -c1;
+    c2 = ((double) co2) / 255.0;
+    c2 = pow((co2 >= 0) ? c2 : -c2, 2.19921875);
+    if (co2 <= 0)
+        c2 = -c2;
+    r1 = ((c2 - c1) * fraction + c1);
+    r2 = pow((r1 >= 0.0) ? r1 : -r1, 1.0 / 2.19921875);
+    if (r1 <= 0.0)
+        r2 = -r2;
+    ret = (uint8_t) round(r2 * 255.0);
+
+    return ret;
+}
+
+static color_t
+quadcolor_interpolate_lookup(quadcolor_t *quadcolor, color_t color1, color_t color2, UNUSED(double fraction))
+{
+    color_t ret;
+    uint8_t dt = quadcolor->double_type - DOUBLE_INTERPOLATE_SRGB;
+
+    ret.a = 0x00;
+    ret.r = interp_lut[dt][color1.r][color2.r];
+    ret.g = interp_lut[dt][color1.g][color2.g];
+    ret.b = interp_lut[dt][color1.b][color2.b];
+
+    return ret;
+}
+
+static void
+quadcolor_interpolate(quadcolor_t *quadcolor, int x, int y, int w, int h)
+{
+    double quotient = 0.5;
+
+    for (int i = y; i < (y + h); i++) {
+        if (i & 1)  for (int j = x; j < (x + w); j++) {
+            int prev = i - 1;
+            int next = i + 1;
+            color_t prev_color, next_color;
+            color_t black;
+            color_t interim_1, interim_2;
+            color_t final;
+
+            if (i < 0)
+                continue;
+
+            black.color = 0x00000000;
+
+            if ((prev >= 0) && (prev < (y + h)))
+                prev_color.color = buffer32->line[prev][j];
+            else
+                prev_color.color = 0x00000000;
+
+            if ((next >= 0) && (next < (y + h)))
+                next_color.color = buffer32->line[next][j];
+            else
+                next_color.color = 0x00000000;
+
+            interim_1 = quadcolor_interpolate_lookup(quadcolor, prev_color, black, quotient);
+            interim_2 = quadcolor_interpolate_lookup(quadcolor, black, next_color, quotient);
+            final     = quadcolor_interpolate_lookup(quadcolor, interim_1, interim_2, quotient);
+
+            buffer32->line[i][j] = final.color;
+        }
+    }
+}
+
+static void
+quadcolor_blit_memtoscreen(quadcolor_t *quadcolor, int x, int y, int w, int h)
+{
+    if (quadcolor->double_type > DOUBLE_SIMPLE)
+        quadcolor_interpolate(quadcolor, x, y, w, h);
+
+    video_blit_memtoscreen(x, y, w, h);
+}
+
+void
+quadcolor_poll(void *priv)
+{
+    quadcolor_t   *quadcolor = (quadcolor_t *) priv;
+    int      x;
+    int      scanline_old;
+    int      oldvc;
+    int      xs_temp;
+    int      ys_temp;
+    int      old_ma;
+
+    if (!quadcolor->linepos) {
+        timer_advance_u64(&quadcolor->timer, quadcolor->dispofftime);
+        quadcolor->cgastat |= 1;
+        quadcolor->linepos = 1;
+        scanline_old        = quadcolor->scanline;
+        if ((quadcolor->crtc[CGA_CRTC_INTERLACE] & 3) == 3)
+            quadcolor->scanline = ((quadcolor->scanline << 1) + quadcolor->oddeven) & 7;
+        if (quadcolor->cgadispon) {
+            if (quadcolor->displine < quadcolor->firstline) {
+                quadcolor->firstline = quadcolor->displine;
+                video_wait_for_buffer();
+            }
+            quadcolor->lastline = quadcolor->displine;
+            switch (quadcolor->double_type) {
+                default:
+                    quadcolor_render(quadcolor, quadcolor->displine << 1);
+                    quadcolor_render_blank(quadcolor, (quadcolor->displine << 1) + 1);
+                    break;
+                case DOUBLE_NONE:
+                    quadcolor_render(quadcolor, quadcolor->displine);
+                    break;
+                case DOUBLE_SIMPLE:
+                    old_ma = quadcolor->memaddr;
+                    quadcolor_render(quadcolor, quadcolor->displine << 1);
+                    quadcolor->memaddr = old_ma;
+                    quadcolor_render(quadcolor, (quadcolor->displine << 1) + 1);
+                    break;
+            }
+        } else {
+            switch (quadcolor->double_type) {
+                default:
+                    quadcolor_render_blank(quadcolor, quadcolor->displine << 1);
+                    break;
+                case DOUBLE_NONE:
+                    quadcolor_render_blank(quadcolor, quadcolor->displine);
+                    break;
+                case DOUBLE_SIMPLE:
+                    quadcolor_render_blank(quadcolor, quadcolor->displine << 1);
+                    quadcolor_render_blank(quadcolor, (quadcolor->displine << 1) + 1);
+                    break;
+            }
+        }
+
+        switch (quadcolor->double_type) {
+            default:
+                quadcolor_render_process(quadcolor, quadcolor->displine << 1);
+                quadcolor_render_process(quadcolor, (quadcolor->displine << 1) + 1);
+                break;
+            case DOUBLE_NONE:
+                quadcolor_render_process(quadcolor, quadcolor->displine);
+                break;
+        }
+
+        quadcolor->scanline = scanline_old;
+        if (quadcolor->vc == quadcolor->crtc[CGA_CRTC_VSYNC] && !quadcolor->scanline)
+            quadcolor->cgastat |= 8;
+        quadcolor->displine++;
+        if (quadcolor->displine >= 360)
+            quadcolor->displine = 0;
+    } else {
+        timer_advance_u64(&quadcolor->timer, quadcolor->dispontime);
+        quadcolor->linepos = 0;
+        if (quadcolor->vsynctime) {
+            quadcolor->vsynctime--;
+            if (!quadcolor->vsynctime)
+                quadcolor->cgastat &= ~8;
+            quadcolor->qc2idx = 0;
+            quadcolor->qc2mask = 0xf0;
+        }
+        if (quadcolor->scanline == (quadcolor->crtc[CGA_CRTC_CURSOR_END] & 31) || ((quadcolor->crtc[CGA_CRTC_INTERLACE] & 3) == 3 &&
+            quadcolor->scanline == ((quadcolor->crtc[CGA_CRTC_CURSOR_END] & 31) >> 1))) {
+            quadcolor->cursorvisible  = 0;
+        }
+        if ((quadcolor->crtc[CGA_CRTC_INTERLACE] & 3) == 3 && quadcolor->scanline == (quadcolor->crtc[CGA_CRTC_MAX_SCANLINE_ADDR] >> 1))
+            quadcolor->memaddr_backup = quadcolor->memaddr;
+        if (quadcolor->vadj) {
+            quadcolor->scanline++;
+            quadcolor->scanline &= 31;
+            quadcolor->memaddr = quadcolor->memaddr_backup;
+            quadcolor->vadj--;
+            if (!quadcolor->vadj) {
+                quadcolor->cgadispon = 1;
+                quadcolor->memaddr = quadcolor->memaddr_backup = (quadcolor->crtc[CGA_CRTC_START_ADDR_LOW] | (quadcolor->crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & DEVICE_VRAM_MASK;
+                quadcolor->scanline               = 0;
+            }
+        } else if (quadcolor->scanline == quadcolor->crtc[CGA_CRTC_MAX_SCANLINE_ADDR]) {
+            quadcolor->memaddr_backup = quadcolor->memaddr;
+            quadcolor->scanline     = 0;
+            oldvc       = quadcolor->vc;
+            quadcolor->vc++;
+            quadcolor->vc &= 127;
+
+            if (quadcolor->vc == quadcolor->crtc[CGA_CRTC_VDISP])
+                quadcolor->cgadispon = 0;
+
+            if (oldvc == quadcolor->crtc[CGA_CRTC_VTOTAL]) {
+                quadcolor->vc   = 0;
+                quadcolor->vadj = quadcolor->crtc[CGA_CRTC_VTOTAL_ADJUST];
+                if (!quadcolor->vadj) {
+                    quadcolor->cgadispon = 1;
+                    quadcolor->memaddr = quadcolor->memaddr_backup = (quadcolor->crtc[CGA_CRTC_START_ADDR_LOW] | (quadcolor->crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & DEVICE_VRAM_MASK;
+                }
+                
+                switch (quadcolor->crtc[CGA_CRTC_CURSOR_START] & 0x60) {
+                    case 0x20:
+                        quadcolor->cursoron = 0;
+                        break;
+                    case 0x60:
+                        quadcolor->cursoron = quadcolor->cgablink & 0x10;
+                        break;
+                    default:
+                        quadcolor->cursoron = quadcolor->cgablink & 0x08;
+                        break;
+                }
+            }
+
+            if (quadcolor->vc == quadcolor->crtc[CGA_CRTC_VSYNC]) {
+                quadcolor->cgadispon = 0;
+                quadcolor->displine  = 0;
+                quadcolor->vsynctime = 16;
+                if (quadcolor->crtc[CGA_CRTC_VSYNC]) {
+                    if (quadcolor->cgamode & CGA_MODE_FLAG_HIGHRES)
+                        x = (quadcolor->crtc[CGA_CRTC_HDISP] << 3) + 16;
+                    else
+                        x = (quadcolor->crtc[CGA_CRTC_HDISP] << 4) + 16;
+                    quadcolor->lastline++;
+
+                    xs_temp = x;
+                    ys_temp = quadcolor->lastline - quadcolor->firstline;
+                    if (quadcolor->double_type > DOUBLE_NONE)
+                        ys_temp <<= 1;
+
+                    if ((xs_temp > 0) && (ys_temp > 0)) {
+                        if (xs_temp < 64)
+                            xs_temp = 656;
+                        if (ys_temp < 32)
+                            ys_temp = 200;
+                        if (!enable_overscan)
+                            xs_temp -= 16;
+
+                        if ((quadcolor->cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) && ((xs_temp != xsize) ||
+                            (ys_temp != ysize) || video_force_resize_get())) {
+                            xsize = xs_temp;
+                            ysize = ys_temp;
+                            if (quadcolor->double_type > DOUBLE_NONE)
+                                set_screen_size(xsize, ysize + (enable_overscan ? 16 : 0));
+                            else
+                                set_screen_size(xsize, ysize + (enable_overscan ? 8 : 0));
+
+                            if (video_force_resize_get())
+                                video_force_resize_set(0);
+                        }
+
+                        if (quadcolor->double_type > DOUBLE_NONE) {
+                            if (enable_overscan)
+                                quadcolor_blit_memtoscreen(quadcolor, 0, (quadcolor->firstline - 4) << 1,
+                                                     xsize, ((quadcolor->lastline - quadcolor->firstline) << 1) + 16);
+                            else
+                                quadcolor_blit_memtoscreen(quadcolor, 8, quadcolor->firstline << 1,
+                                                     xsize, (quadcolor->lastline - quadcolor->firstline) << 1);
+                        } else {
+                            if (enable_overscan)
+                                video_blit_memtoscreen(0, quadcolor->firstline - 4,
+                                                       xsize, (quadcolor->lastline - quadcolor->firstline) + 8);
+                            else
+                                video_blit_memtoscreen(8, quadcolor->firstline,
+                                                       xsize, quadcolor->lastline - quadcolor->firstline);
+                        }
+                    }
+
+                    frames++;
+
+                    video_res_x = xsize;
+                    video_res_y = ysize;
+                    if (quadcolor->cgamode & CGA_MODE_FLAG_HIGHRES) {
+                        video_res_x /= 8;
+                        video_res_y /= quadcolor->crtc[CGA_CRTC_MAX_SCANLINE_ADDR] + 1;
+                        video_bpp = 0;
+                    } else if (!(quadcolor->cgamode & CGA_MODE_FLAG_GRAPHICS)) {
+                        video_res_x /= 16;
+                        video_res_y /= quadcolor->crtc[CGA_CRTC_MAX_SCANLINE_ADDR] + 1;
+                        video_bpp = 0;
+                    } else if (!(quadcolor->cgamode & CGA_MODE_FLAG_HIGHRES_GRAPHICS)) {
+                        video_res_x /= 2;
+                        video_bpp = 2;
+                    } else
+                        video_bpp = 1;
+                }
+                quadcolor->firstline = 1000;
+                quadcolor->lastline  = 0;
+                quadcolor->cgablink++;
+                quadcolor->oddeven ^= 1;
+            }
+        } else {
+            quadcolor->scanline++;
+            quadcolor->scanline &= 31;
+            quadcolor->memaddr = quadcolor->memaddr_backup;
+        }
+        if (quadcolor->cgadispon)
+            quadcolor->cgastat &= ~1;
+        if (quadcolor->scanline == (quadcolor->crtc[CGA_CRTC_CURSOR_START] & 31) || ((quadcolor->crtc[CGA_CRTC_INTERLACE] & 3) == 3 &&
+            quadcolor->scanline == ((quadcolor->crtc[CGA_CRTC_CURSOR_START] & 31) >> 1)))
+            quadcolor->cursorvisible = 1;
+        if (quadcolor->cgadispon && (quadcolor->cgamode & CGA_MODE_FLAG_HIGHRES)) {
+            for (x = 0; x < (quadcolor->crtc[CGA_CRTC_HDISP] << 1); x++)
+                quadcolor->charbuffer[x] = quadcolor->vram[(quadcolor->page_offset ^ ((quadcolor->memaddr << 1) + x)) & DEVICE_VRAM_MASK];
+        }
+    }
+}
+
+void
+quadcolor_init(quadcolor_t *quadcolor)
+{
+    timer_add(&quadcolor->timer, quadcolor_poll, quadcolor, 1);
+    quadcolor->composite = 0;
+}
+
+void *
+quadcolor_standalone_init(UNUSED(const device_t *info))
+{
+    int    display_type;
+    quadcolor_t *quadcolor = calloc(1, sizeof(quadcolor_t));
+
+    video_inform(VIDEO_FLAG_TYPE_CGA, &timing_quadcolor);
+
+    display_type               = device_get_config_int("display_type");
+    quadcolor->composite       = (display_type != CGA_RGB);
+    quadcolor->revision        = device_get_config_int("composite_type");
+    quadcolor->has_2nd_charset = device_get_config_int("has_2nd_charset");
+    quadcolor->has_quadcolor_2 = device_get_config_int("has_quadcolor_2");
+
+    quadcolor->vram   = malloc(DEVICE_VRAM);
+    quadcolor->vram_2 = malloc(0x10000);
+
+    cga_comp_init(quadcolor->revision);
+    timer_add(&quadcolor->timer, quadcolor_poll, quadcolor, 1);
+    mem_mapping_add(&quadcolor->mapping, 0xb8000, 0x08000, quadcolor_read, NULL, NULL, quadcolor_write, NULL, NULL, NULL /*quadcolor->vram*/, MEM_MAPPING_EXTERNAL, quadcolor);
+    /* add mapping for vram_2 at 0xd0000, mirrored at 0xe0000 */
+    if (quadcolor->has_quadcolor_2)
+        mem_mapping_add(&quadcolor->mapping_2, 0xd0000, 0x20000, quadcolor_2_read, NULL, NULL, quadcolor_2_write, NULL, NULL, NULL, MEM_MAPPING_EXTERNAL,
+                        quadcolor);
+
+    io_sethandler(0x03d0, 0x0010, quadcolor_in, NULL, NULL, quadcolor_out, NULL, NULL, quadcolor);
+
+    overscan_x = overscan_y = 16;
+
+    quadcolor->rgb_type = device_get_config_int("rgb_type");
+    cga_palette   = (quadcolor->rgb_type << 1);
+    cgapal_rebuild();
+    update_cga16_color(quadcolor->cgamode);
+
+    quadcolor->double_type = device_get_config_int("double_type");
+
+    for (uint16_t i = 0; i < 256; i++) {
+        for (uint16_t j = 0; j < 256; j++) {
+            interp_lut[0][i][j] = quadcolor_interpolate_srgb(i, j, 0.5);
+            interp_lut[1][i][j] = quadcolor_interpolate_linear(i, j, 0.5);
+        }
+    }
+
+    switch(device_get_config_int("font")) {
+        case 0:
+            loadfont(FONT_IBM_MDA_437_PATH, 0);
+            break;
+        case 1:
+            loadfont(FONT_IBM_MDA_437_NORDIC_PATH, 0);
+            break;
+        case 4:
+            loadfont(FONT_TULIP_DGA_PATH, 0);
+            break;
+    }
+
+    monitors[monitor_index_global].mon_composite = !!quadcolor->composite;
+
+    return quadcolor;
+}
+
+void
+quadcolor_close(void *priv)
+{
+    quadcolor_t *quadcolor = (quadcolor_t *) priv;
+
+    free(quadcolor->vram);
+    free(quadcolor->vram_2);
+    free(quadcolor);
+}
+
+void
+quadcolor_speed_changed(void *priv)
+{
+    quadcolor_t *quadcolor = (quadcolor_t *) priv;
+
+    quadcolor_recalctimings(quadcolor);
+}
+
+// clang-format off
+const device_config_t quadcolor_config[] = {
+    {
+        .name           = "display_type",
+        .description    = "Display type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = CGA_RGB,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "RGB",       .value = CGA_RGB       },
+            { .description = "Composite", .value = CGA_COMPOSITE },
+            { .description = ""                                  }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "composite_type",
+        .description    = "Composite type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = COMPOSITE_OLD,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Old", .value = COMPOSITE_OLD },
+            { .description = "New", .value = COMPOSITE_NEW },
+            { .description = ""                            }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "rgb_type",
+        .description    = "RGB type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Color (generic)",  .value = 0 },
+            { .description = "Green Monochrome", .value = 1 },
+            { .description = "Amber Monochrome", .value = 2 },
+            { .description = "Gray Monochrome",  .value = 3 },
+            { .description = "Color (no brown)", .value = 4 },
+            { .description = "Color (IBM 5153)", .value = 5 },
+            { .description = ""                             }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "double_type",
+        .description    = "Line doubling type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = DOUBLE_NONE,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",                 .value = DOUBLE_NONE               },
+            { .description = "Simple doubling",      .value = DOUBLE_SIMPLE             },
+            { .description = "sRGB interpolation",   .value = DOUBLE_INTERPOLATE_SRGB   },
+            { .description = "Linear interpolation", .value = DOUBLE_INTERPOLATE_LINEAR },
+            { .description = ""                                                         }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "font",
+        .description    = "Font",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "US (CP 437)",                 .value = 0 },
+            { .description = "IBM Nordic (CP 437-Nordic)",  .value = 1 },
+            { .description = "Tulip DGA",                   .value = 4 },
+            { .description = ""                                        }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "has_2nd_charset",
+        .description    = "Has secondary 8x8 character set",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "has_quadcolor_2",
+        .description    = "Has Quadcolor II daughter board",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "contrast",
+        .description    = "Alternate monochrome contrast",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+// clang-format on
+
+const device_t quadcolor_device = {
+    .name          = "Quadram Quadcolor I / I+II",
+    .internal_name = "quadcolor",
+    .flags         = DEVICE_ISA,
+    .local         = 0,
+    .init          = quadcolor_standalone_init,
+    .close         = quadcolor_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = quadcolor_speed_changed,
+    .force_redraw  = NULL,
+    .config        = quadcolor_config
+};
diff --git a/src/machine/m_xt_t1000_vid.c b/src/video/vid_cga_toshiba_t1000.c
similarity index 87%
rename from src/machine/m_xt_t1000_vid.c
rename to src/video/vid_cga_toshiba_t1000.c
index 4ec13b5c4..2fd382272 100644
--- a/src/machine/m_xt_t1000_vid.c
+++ b/src/video/vid_cga_toshiba_t1000.c
@@ -245,25 +245,25 @@ t1000_text_row80(t1000_t *t1000)
     int      bold;
     int      blink;
     uint16_t addr;
-    uint8_t  sc;
-    uint16_t ma = (t1000->cga.crtc[13] | (t1000->cga.crtc[12] << 8)) & 0x3fff;
-    uint16_t ca = (t1000->cga.crtc[15] | (t1000->cga.crtc[14] << 8)) & 0x3fff;
+    uint8_t  scanline;
+    uint16_t memaddr = (t1000->cga.crtc[CGA_CRTC_START_ADDR_LOW] | (t1000->cga.crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x3fff;
+    uint16_t cursoraddr = (t1000->cga.crtc[CGA_CRTC_CURSOR_ADDR_LOW] | (t1000->cga.crtc[CGA_CRTC_CURSOR_ADDR_HIGH] << 8)) & 0x3fff;
 
-    sc   = (t1000->displine) & 7;
-    addr = ((ma & ~1) + (t1000->displine >> 3) * 80) * 2;
-    ma += (t1000->displine >> 3) * 80;
+    scanline   = (t1000->displine) & 7;
+    addr = ((memaddr & ~1) + (t1000->displine >> 3) * 80) * 2;
+    memaddr += (t1000->displine >> 3) * 80;
 
-    if ((t1000->cga.crtc[10] & 0x60) == 0x20) {
+    if ((t1000->cga.crtc[CGA_CRTC_CURSOR_START] & 0x60) == 0x20) {
         cursorline = 0;
     } else {
-        cursorline = ((t1000->cga.crtc[10] & 0x0F) <= sc) && ((t1000->cga.crtc[11] & 0x0F) >= sc);
+        cursorline = ((t1000->cga.crtc[CGA_CRTC_CURSOR_START] & 0x0F) <= scanline) && ((t1000->cga.crtc[CGA_CRTC_CURSOR_END] & 0x0F) >= scanline);
     }
     for (uint8_t x = 0; x < 80; x++) {
         chr        = t1000->vram[(addr + 2 * x) & 0x3FFF];
         attr       = t1000->vram[(addr + 2 * x + 1) & 0x3FFF];
-        drawcursor = ((ma == ca) && cursorline && (t1000->cga.cgamode & 8) && (t1000->cga.cgablink & 16));
+        drawcursor = ((memaddr == cursoraddr) && cursorline && (t1000->cga.cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) && (t1000->cga.cgablink & 16));
 
-        blink = ((t1000->cga.cgablink & 16) && (t1000->cga.cgamode & 0x20) && (attr & 0x80) && !drawcursor);
+        blink = ((t1000->cga.cgablink & 16) && (t1000->cga.cgamode & CGA_MODE_FLAG_BLINK) && (attr & 0x80) && !drawcursor);
 
         if (t1000->video_options & 1)
             bold = boldcols[attr] ? chr : chr + 256;
@@ -272,7 +272,7 @@ t1000_text_row80(t1000_t *t1000)
         if (t1000->video_options & 2)
             bold += 512;
 
-        if (t1000->cga.cgamode & 0x20) /* Blink */
+        if (t1000->cga.cgamode & CGA_MODE_FLAG_BLINK) /* Blink */
         {
             cols[1] = blinkcols[attr][1];
             cols[0] = blinkcols[attr][0];
@@ -284,13 +284,13 @@ t1000_text_row80(t1000_t *t1000)
         }
         if (drawcursor) {
             for (uint8_t c = 0; c < 8; c++) {
-                (buffer32->line[t1000->displine])[(x << 3) + c] = cols[(fontdat[bold][sc] & (1 << (c ^ 7))) ? 1 : 0] ^ (blue ^ grey);
+                (buffer32->line[t1000->displine])[(x << 3) + c] = cols[(fontdat[bold][scanline] & (1 << (c ^ 7))) ? 1 : 0] ^ (blue ^ grey);
             }
         } else {
             for (uint8_t c = 0; c < 8; c++)
-                (buffer32->line[t1000->displine])[(x << 3) + c] = cols[(fontdat[bold][sc] & (1 << (c ^ 7))) ? 1 : 0];
+                (buffer32->line[t1000->displine])[(x << 3) + c] = cols[(fontdat[bold][scanline] & (1 << (c ^ 7))) ? 1 : 0];
         }
-        ++ma;
+        ++memaddr;
     }
 }
 
@@ -306,25 +306,25 @@ t1000_text_row40(t1000_t *t1000)
     int      bold;
     int      blink;
     uint16_t addr;
-    uint8_t  sc;
-    uint16_t ma = (t1000->cga.crtc[13] | (t1000->cga.crtc[12] << 8)) & 0x3fff;
-    uint16_t ca = (t1000->cga.crtc[15] | (t1000->cga.crtc[14] << 8)) & 0x3fff;
+    uint8_t  scanline;
+    uint16_t memaddr = (t1000->cga.crtc[CGA_CRTC_START_ADDR_LOW] | (t1000->cga.crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x3fff;
+    uint16_t cursoraddr = (t1000->cga.crtc[CGA_CRTC_CURSOR_ADDR_LOW] | (t1000->cga.crtc[CGA_CRTC_CURSOR_ADDR_HIGH] << 8)) & 0x3fff;
 
-    sc   = (t1000->displine) & 7;
-    addr = ((ma & ~1) + (t1000->displine >> 3) * 40) * 2;
-    ma += (t1000->displine >> 3) * 40;
+    scanline   = (t1000->displine) & 7;
+    addr = ((memaddr & ~1) + (t1000->displine >> 3) * 40) * 2;
+    memaddr += (t1000->displine >> 3) * 40;
 
-    if ((t1000->cga.crtc[10] & 0x60) == 0x20) {
+    if ((t1000->cga.crtc[CGA_CRTC_CURSOR_START] & 0x60) == 0x20) {
         cursorline = 0;
     } else {
-        cursorline = ((t1000->cga.crtc[10] & 0x0F) <= sc) && ((t1000->cga.crtc[11] & 0x0F) >= sc);
+        cursorline = ((t1000->cga.crtc[CGA_CRTC_CURSOR_START] & 0x0F) <= scanline) && ((t1000->cga.crtc[CGA_CRTC_CURSOR_END] & 0x0F) >= scanline);
     }
     for (uint8_t x = 0; x < 40; x++) {
         chr        = t1000->vram[(addr + 2 * x) & 0x3FFF];
         attr       = t1000->vram[(addr + 2 * x + 1) & 0x3FFF];
-        drawcursor = ((ma == ca) && cursorline && (t1000->cga.cgamode & 8) && (t1000->cga.cgablink & 16));
+        drawcursor = ((memaddr == cursoraddr) && cursorline && (t1000->cga.cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) && (t1000->cga.cgablink & 16));
 
-        blink = ((t1000->cga.cgablink & 16) && (t1000->cga.cgamode & 0x20) && (attr & 0x80) && !drawcursor);
+        blink = ((t1000->cga.cgablink & 16) && (t1000->cga.cgamode & CGA_MODE_FLAG_BLINK) && (attr & 0x80) && !drawcursor);
 
         if (t1000->video_options & 1)
             bold = boldcols[attr] ? chr : chr + 256;
@@ -333,7 +333,7 @@ t1000_text_row40(t1000_t *t1000)
         if (t1000->video_options & 2)
             bold += 512;
 
-        if (t1000->cga.cgamode & 0x20) /* Blink */
+        if (t1000->cga.cgamode & CGA_MODE_FLAG_BLINK) /* Blink */
         {
             cols[1] = blinkcols[attr][1];
             cols[0] = blinkcols[attr][0];
@@ -345,14 +345,14 @@ t1000_text_row40(t1000_t *t1000)
         }
         if (drawcursor) {
             for (uint8_t c = 0; c < 8; c++) {
-                (buffer32->line[t1000->displine])[(x << 4) + c * 2] = (buffer32->line[t1000->displine])[(x << 4) + c * 2 + 1] = cols[(fontdat[bold][sc] & (1 << (c ^ 7))) ? 1 : 0] ^ (blue ^ grey);
+                (buffer32->line[t1000->displine])[(x << 4) + c * 2] = (buffer32->line[t1000->displine])[(x << 4) + c * 2 + 1] = cols[(fontdat[bold][scanline] & (1 << (c ^ 7))) ? 1 : 0] ^ (blue ^ grey);
             }
         } else {
             for (uint8_t c = 0; c < 8; c++) {
-                (buffer32->line[t1000->displine])[(x << 4) + c * 2] = (buffer32->line[t1000->displine])[(x << 4) + c * 2 + 1] = cols[(fontdat[bold][sc] & (1 << (c ^ 7))) ? 1 : 0];
+                (buffer32->line[t1000->displine])[(x << 4) + c * 2] = (buffer32->line[t1000->displine])[(x << 4) + c * 2 + 1] = cols[(fontdat[bold][scanline] & (1 << (c ^ 7))) ? 1 : 0];
             }
         }
-        ++ma;
+        ++memaddr;
     }
 }
 
@@ -366,9 +366,9 @@ t1000_cgaline6(t1000_t *t1000)
     uint32_t fg = (t1000->cga.cgacol & 0x0F) ? blue : grey;
     uint32_t bg = grey;
 
-    uint16_t ma = (t1000->cga.crtc[13] | (t1000->cga.crtc[12] << 8)) & 0x3fff;
+    uint16_t memaddr = (t1000->cga.crtc[CGA_CRTC_START_ADDR_LOW] | (t1000->cga.crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x3fff;
 
-    addr = ((t1000->displine) & 1) * 0x2000 + (t1000->displine >> 1) * 80 + ((ma & ~1) << 1);
+    addr = ((t1000->displine) & 1) * 0x2000 + (t1000->displine >> 1) * 80 + ((memaddr & ~1) << 1);
 
     for (uint8_t x = 0; x < 80; x++) {
         dat = t1000->vram[addr & 0x3FFF];
@@ -376,7 +376,7 @@ t1000_cgaline6(t1000_t *t1000)
 
         for (uint8_t c = 0; c < 8; c++) {
             ink = (dat & 0x80) ? fg : bg;
-            if (!(t1000->cga.cgamode & 8))
+            if (!(t1000->cga.cgamode & CGA_MODE_FLAG_VIDEO_ENABLE))
                 ink = grey;
             (buffer32->line[t1000->displine])[x * 8 + c] = ink;
             dat                                                       = dat << 1;
@@ -395,8 +395,8 @@ t1000_cgaline4(t1000_t *t1000)
     uint32_t ink1;
     uint16_t addr;
 
-    uint16_t ma = (t1000->cga.crtc[13] | (t1000->cga.crtc[12] << 8)) & 0x3fff;
-    addr        = ((t1000->displine) & 1) * 0x2000 + (t1000->displine >> 1) * 80 + ((ma & ~1) << 1);
+    uint16_t memaddr = (t1000->cga.crtc[CGA_CRTC_START_ADDR_LOW] | (t1000->cga.crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x3fff;
+    addr        = ((t1000->displine) & 1) * 0x2000 + (t1000->displine >> 1) * 80 + ((memaddr & ~1) << 1);
 
     for (uint8_t x = 0; x < 80; x++) {
         dat = t1000->vram[addr & 0x3FFF];
@@ -404,7 +404,7 @@ t1000_cgaline4(t1000_t *t1000)
 
         for (uint8_t c = 0; c < 4; c++) {
             pattern = (dat & 0xC0) >> 6;
-            if (!(t1000->cga.cgamode & 8))
+            if (!(t1000->cga.cgamode & CGA_MODE_FLAG_VIDEO_ENABLE))
                 pattern = 0;
 
             switch (pattern & 3) {
@@ -479,7 +479,7 @@ t1000_poll(void *priv)
 
             /* Graphics */
             if (t1000->cga.cgamode & 0x02) {
-                if (t1000->cga.cgamode & 0x10)
+                if (t1000->cga.cgamode & CGA_MODE_FLAG_HIGHRES_GRAPHICS)
                     t1000_cgaline6(t1000);
                 else
                     t1000_cgaline4(t1000);
@@ -532,7 +532,7 @@ t1000_poll(void *priv)
             video_res_y = T1000_YSIZE;
 
             if (t1000->cga.cgamode & 0x02) {
-                if (t1000->cga.cgamode & 0x10)
+                if (t1000->cga.cgamode & CGA_MODE_FLAG_HIGHRES_GRAPHICS)
                     video_bpp = 1;
                 else
                     video_bpp = 2;
@@ -651,8 +651,7 @@ t1000_recalcattrs(t1000_t *t1000)
 static void *
 t1000_init(UNUSED(const device_t *info))
 {
-    t1000_t *t1000 = malloc(sizeof(t1000_t));
-    memset(t1000, 0, sizeof(t1000_t));
+    t1000_t *t1000 = calloc(1, sizeof(t1000_t));
     loadfont("roms/machines/t1000/t1000font.bin", 8);
     cga_init(&t1000->cga);
     video_inform(VIDEO_FLAG_TYPE_CGA, &timing_t1000);
@@ -741,7 +740,7 @@ const device_t t1000_video_device = {
     .init          = t1000_init,
     .close         = t1000_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = t1000_speed_changed,
     .force_redraw  = NULL,
     .config        = t1000_config
@@ -755,7 +754,7 @@ const device_t t1200_video_device = {
     .init          = t1000_init,
     .close         = t1000_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = t1000_speed_changed,
     .force_redraw  = NULL,
     .config        = t1000_config
diff --git a/src/machine/m_at_t3100e_vid.c b/src/video/vid_cga_toshiba_t3100e.c
similarity index 84%
rename from src/machine/m_at_t3100e_vid.c
rename to src/video/vid_cga_toshiba_t3100e.c
index 50c9ec05a..e3eb673c8 100644
--- a/src/machine/m_at_t3100e_vid.c
+++ b/src/video/vid_cga_toshiba_t3100e.c
@@ -169,8 +169,8 @@ t3100e_out(uint16_t addr, uint8_t val, void *priv)
             t3100e_recalctimings(t3100e);
             return;
 
-        case 0x3D8: /* CGA control register */
-        case 0x3D9: /* CGA colour register */
+        case CGA_REGISTER_MODE_CONTROL: /* CGA control register */
+        case CGA_REGISTER_COLOR_SELECT: /* CGA colour register */
             cga_out(addr, val, &t3100e->cga);
             return;
 
@@ -254,25 +254,25 @@ t3100e_text_row80(t3100e_t *t3100e)
     int      bold;
     int      blink;
     uint16_t addr;
-    uint8_t  sc;
-    uint16_t ma = (t3100e->cga.crtc[13] | (t3100e->cga.crtc[12] << 8)) & 0x7fff;
-    uint16_t ca = (t3100e->cga.crtc[15] | (t3100e->cga.crtc[14] << 8)) & 0x7fff;
+    uint8_t  scanline;
+    uint16_t memaddr = (t3100e->cga.crtc[CGA_CRTC_START_ADDR_LOW] | (t3100e->cga.crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x7fff;
+    uint16_t cursoraddr = (t3100e->cga.crtc[CGA_CRTC_CURSOR_ADDR_LOW] | (t3100e->cga.crtc[CGA_CRTC_CURSOR_ADDR_HIGH] << 8)) & 0x7fff;
 
-    sc   = (t3100e->displine) & 15;
-    addr = ((ma & ~1) + (t3100e->displine >> 4) * 80) * 2;
-    ma += (t3100e->displine >> 4) * 80;
+    scanline   = (t3100e->displine) & 15;
+    addr = ((memaddr & ~1) + (t3100e->displine >> 4) * 80) * 2;
+    memaddr += (t3100e->displine >> 4) * 80;
 
-    if ((t3100e->cga.crtc[10] & 0x60) == 0x20) {
+    if ((t3100e->cga.crtc[CGA_CRTC_CURSOR_START] & 0x60) == 0x20) {
         cursorline = 0;
     } else {
-        cursorline = ((t3100e->cga.crtc[10] & 0x0F) * 2 <= sc) && ((t3100e->cga.crtc[11] & 0x0F) * 2 >= sc);
+        cursorline = ((t3100e->cga.crtc[CGA_CRTC_CURSOR_START] & 0x0F) * 2 <= scanline) && ((t3100e->cga.crtc[CGA_CRTC_CURSOR_END] & 0x0F) * 2 >= scanline);
     }
     for (uint8_t x = 0; x < 80; x++) {
         chr        = t3100e->vram[(addr + 2 * x) & 0x7FFF];
         attr       = t3100e->vram[(addr + 2 * x + 1) & 0x7FFF];
-        drawcursor = ((ma == ca) && cursorline && (t3100e->cga.cgamode & 8) && (t3100e->cga.cgablink & 16));
+        drawcursor = ((memaddr == cursoraddr) && cursorline && (t3100e->cga.cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) && (t3100e->cga.cgablink & 16));
 
-        blink = ((t3100e->cga.cgablink & 16) && (t3100e->cga.cgamode & 0x20) && (attr & 0x80) && !drawcursor);
+        blink = ((t3100e->cga.cgablink & 16) && (t3100e->cga.cgamode & CGA_MODE_FLAG_BLINK) && (attr & 0x80) && !drawcursor);
 
         if (t3100e->video_options & 4)
             bold = boldcols[attr] ? chr + 256 : chr;
@@ -280,7 +280,7 @@ t3100e_text_row80(t3100e_t *t3100e)
             bold = boldcols[attr] ? chr : chr + 256;
         bold += 512 * (t3100e->video_options & 3);
 
-        if (t3100e->cga.cgamode & 0x20) /* Blink */
+        if (t3100e->cga.cgamode & CGA_MODE_FLAG_BLINK) /* Blink */
         {
             cols[1] = blinkcols[attr][1];
             cols[0] = blinkcols[attr][0];
@@ -292,13 +292,13 @@ t3100e_text_row80(t3100e_t *t3100e)
         }
         if (drawcursor) {
             for (uint8_t c = 0; c < 8; c++) {
-                (buffer32->line[t3100e->displine])[(x << 3) + c] = cols[(fontdatm[bold][sc] & (1 << (c ^ 7))) ? 1 : 0] ^ (amber ^ black);
+                (buffer32->line[t3100e->displine])[(x << 3) + c] = cols[(fontdatm[bold][scanline] & (1 << (c ^ 7))) ? 1 : 0] ^ (amber ^ black);
             }
         } else {
             for (uint8_t c = 0; c < 8; c++)
-                (buffer32->line[t3100e->displine])[(x << 3) + c] = cols[(fontdatm[bold][sc] & (1 << (c ^ 7))) ? 1 : 0];
+                (buffer32->line[t3100e->displine])[(x << 3) + c] = cols[(fontdatm[bold][scanline] & (1 << (c ^ 7))) ? 1 : 0];
         }
-        ++ma;
+        ++memaddr;
     }
 }
 
@@ -315,25 +315,25 @@ t3100e_text_row40(t3100e_t *t3100e)
     int      bold;
     int      blink;
     uint16_t addr;
-    uint8_t  sc;
-    uint16_t ma = (t3100e->cga.crtc[13] | (t3100e->cga.crtc[12] << 8)) & 0x7fff;
-    uint16_t ca = (t3100e->cga.crtc[15] | (t3100e->cga.crtc[14] << 8)) & 0x7fff;
+    uint8_t  scanline;
+    uint16_t memaddr = (t3100e->cga.crtc[CGA_CRTC_START_ADDR_LOW] | (t3100e->cga.crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x7fff;
+    uint16_t cursoraddr = (t3100e->cga.crtc[CGA_CRTC_CURSOR_ADDR_LOW] | (t3100e->cga.crtc[CGA_CRTC_CURSOR_ADDR_HIGH] << 8)) & 0x7fff;
 
-    sc   = (t3100e->displine) & 15;
-    addr = ((ma & ~1) + (t3100e->displine >> 4) * 40) * 2;
-    ma += (t3100e->displine >> 4) * 40;
+    scanline   = (t3100e->displine) & 15;
+    addr = ((memaddr & ~1) + (t3100e->displine >> 4) * 40) * 2;
+    memaddr += (t3100e->displine >> 4) * 40;
 
-    if ((t3100e->cga.crtc[10] & 0x60) == 0x20) {
+    if ((t3100e->cga.crtc[CGA_CRTC_CURSOR_START] & 0x60) == 0x20) {
         cursorline = 0;
     } else {
-        cursorline = ((t3100e->cga.crtc[10] & 0x0F) * 2 <= sc) && ((t3100e->cga.crtc[11] & 0x0F) * 2 >= sc);
+        cursorline = ((t3100e->cga.crtc[CGA_CRTC_CURSOR_START] & 0x0F) * 2 <= scanline) && ((t3100e->cga.crtc[CGA_CRTC_CURSOR_END] & 0x0F) * 2 >= scanline);
     }
     for (uint8_t x = 0; x < 40; x++) {
         chr        = t3100e->vram[(addr + 2 * x) & 0x7FFF];
         attr       = t3100e->vram[(addr + 2 * x + 1) & 0x7FFF];
-        drawcursor = ((ma == ca) && cursorline && (t3100e->cga.cgamode & 8) && (t3100e->cga.cgablink & 16));
+        drawcursor = ((memaddr == cursoraddr) && cursorline && (t3100e->cga.cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) && (t3100e->cga.cgablink & 16));
 
-        blink = ((t3100e->cga.cgablink & 16) && (t3100e->cga.cgamode & 0x20) && (attr & 0x80) && !drawcursor);
+        blink = ((t3100e->cga.cgablink & 16) && (t3100e->cga.cgamode & CGA_MODE_FLAG_BLINK) && (attr & 0x80) && !drawcursor);
 
         if (t3100e->video_options & 4)
             bold = boldcols[attr] ? chr + 256 : chr;
@@ -341,7 +341,7 @@ t3100e_text_row40(t3100e_t *t3100e)
             bold = boldcols[attr] ? chr : chr + 256;
         bold += 512 * (t3100e->video_options & 3);
 
-        if (t3100e->cga.cgamode & 0x20) /* Blink */
+        if (t3100e->cga.cgamode & CGA_MODE_FLAG_BLINK) /* Blink */
         {
             cols[1] = blinkcols[attr][1];
             cols[0] = blinkcols[attr][0];
@@ -353,14 +353,14 @@ t3100e_text_row40(t3100e_t *t3100e)
         }
         if (drawcursor) {
             for (c = 0; c < 8; c++) {
-                (buffer32->line[t3100e->displine])[(x << 4) + c * 2] = (buffer32->line[t3100e->displine])[(x << 4) + c * 2 + 1] = cols[(fontdatm[bold][sc] & (1 << (c ^ 7))) ? 1 : 0] ^ (amber ^ black);
+                (buffer32->line[t3100e->displine])[(x << 4) + c * 2] = (buffer32->line[t3100e->displine])[(x << 4) + c * 2 + 1] = cols[(fontdatm[bold][scanline] & (1 << (c ^ 7))) ? 1 : 0] ^ (amber ^ black);
             }
         } else {
             for (c = 0; c < 8; c++) {
-                (buffer32->line[t3100e->displine])[(x << 4) + c * 2] = (buffer32->line[t3100e->displine])[(x << 4) + c * 2 + 1] = cols[(fontdatm[bold][sc] & (1 << (c ^ 7))) ? 1 : 0];
+                (buffer32->line[t3100e->displine])[(x << 4) + c * 2] = (buffer32->line[t3100e->displine])[(x << 4) + c * 2 + 1] = cols[(fontdatm[bold][scanline] & (1 << (c ^ 7))) ? 1 : 0];
             }
         }
-        ++ma;
+        ++memaddr;
     }
 }
 
@@ -374,13 +374,13 @@ t3100e_cgaline6(t3100e_t *t3100e)
     uint32_t fg = (t3100e->cga.cgacol & 0x0F) ? amber : black;
     uint32_t bg = black;
 
-    uint16_t ma = (t3100e->cga.crtc[13] | (t3100e->cga.crtc[12] << 8)) & 0x7fff;
+    uint16_t memaddr = (t3100e->cga.crtc[CGA_CRTC_START_ADDR_LOW] | (t3100e->cga.crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x7fff;
 
-    if (t3100e->cga.crtc[9] == 3) /* 640*400 */
+    if (t3100e->cga.crtc[CGA_CRTC_MAX_SCANLINE_ADDR] == 3) /* 640*400 */
     {
-        addr = ((t3100e->displine) & 1) * 0x2000 + ((t3100e->displine >> 1) & 1) * 0x4000 + (t3100e->displine >> 2) * 80 + ((ma & ~1) << 1);
+        addr = ((t3100e->displine) & 1) * 0x2000 + ((t3100e->displine >> 1) & 1) * 0x4000 + (t3100e->displine >> 2) * 80 + ((memaddr & ~1) << 1);
     } else {
-        addr = ((t3100e->displine >> 1) & 1) * 0x2000 + (t3100e->displine >> 2) * 80 + ((ma & ~1) << 1);
+        addr = ((t3100e->displine >> 1) & 1) * 0x2000 + (t3100e->displine >> 2) * 80 + ((memaddr & ~1) << 1);
     }
     for (uint8_t x = 0; x < 80; x++) {
         dat = t3100e->vram[addr & 0x7FFF];
@@ -388,7 +388,7 @@ t3100e_cgaline6(t3100e_t *t3100e)
 
         for (uint8_t c = 0; c < 8; c++) {
             ink = (dat & 0x80) ? fg : bg;
-            if (!(t3100e->cga.cgamode & 8))
+            if (!(t3100e->cga.cgamode & CGA_MODE_FLAG_VIDEO_ENABLE))
                 ink = black;
             (buffer32->line[t3100e->displine])[x * 8 + c] = ink;
             dat                                           = dat << 1;
@@ -407,13 +407,13 @@ t3100e_cgaline4(t3100e_t *t3100e)
     uint32_t ink1 = 0;
     uint16_t addr;
 
-    uint16_t ma = (t3100e->cga.crtc[13] | (t3100e->cga.crtc[12] << 8)) & 0x7fff;
-    if (t3100e->cga.crtc[9] == 3) /* 320*400 undocumented */
+    uint16_t memaddr = (t3100e->cga.crtc[CGA_CRTC_START_ADDR_LOW] | (t3100e->cga.crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x7fff;
+    if (t3100e->cga.crtc[CGA_CRTC_MAX_SCANLINE_ADDR] == 3) /* 320*400 undocumented */
     {
-        addr = ((t3100e->displine) & 1) * 0x2000 + ((t3100e->displine >> 1) & 1) * 0x4000 + (t3100e->displine >> 2) * 80 + ((ma & ~1) << 1);
+        addr = ((t3100e->displine) & 1) * 0x2000 + ((t3100e->displine >> 1) & 1) * 0x4000 + (t3100e->displine >> 2) * 80 + ((memaddr & ~1) << 1);
     } else /* 320*200 */
     {
-        addr = ((t3100e->displine >> 1) & 1) * 0x2000 + (t3100e->displine >> 2) * 80 + ((ma & ~1) << 1);
+        addr = ((t3100e->displine >> 1) & 1) * 0x2000 + (t3100e->displine >> 2) * 80 + ((memaddr & ~1) << 1);
     }
     for (uint8_t x = 0; x < 80; x++) {
         dat = t3100e->vram[addr & 0x7FFF];
@@ -421,7 +421,7 @@ t3100e_cgaline4(t3100e_t *t3100e)
 
         for (uint8_t c = 0; c < 4; c++) {
             pattern = (dat & 0xC0) >> 6;
-            if (!(t3100e->cga.cgamode & 8))
+            if (!(t3100e->cga.cgamode & CGA_MODE_FLAG_VIDEO_ENABLE))
                 pattern = 0;
 
             switch (pattern & 3) {
@@ -497,12 +497,12 @@ t3100e_poll(void *priv)
             }
 
             /* Graphics */
-            if (t3100e->cga.cgamode & 0x02) {
-                if (t3100e->cga.cgamode & 0x10)
+            if (t3100e->cga.cgamode & CGA_MODE_FLAG_GRAPHICS) {
+                if (t3100e->cga.cgamode & CGA_MODE_FLAG_HIGHRES_GRAPHICS)
                     t3100e_cgaline6(t3100e);
                 else
                     t3100e_cgaline4(t3100e);
-            } else if (t3100e->cga.cgamode & 0x01) /* High-res text */
+            } else if (t3100e->cga.cgamode & CGA_MODE_FLAG_HIGHRES) /* High-res text */
             {
                 t3100e_text_row80(t3100e);
             } else {
@@ -550,8 +550,8 @@ t3100e_poll(void *priv)
             video_res_x = T3100E_XSIZE;
             video_res_y = T3100E_YSIZE;
 
-            if (t3100e->cga.cgamode & 0x02) {
-                if (t3100e->cga.cgamode & 0x10)
+            if (t3100e->cga.cgamode & CGA_MODE_FLAG_GRAPHICS) {
+                if (t3100e->cga.cgamode & CGA_MODE_FLAG_HIGHRES_GRAPHICS)
                     video_bpp = 1;
                 else
                     video_bpp = 2;
@@ -655,8 +655,7 @@ t3100e_recalcattrs(t3100e_t *t3100e)
 void *
 t3100e_init(UNUSED(const device_t *info))
 {
-    t3100e_t *t3100e = malloc(sizeof(t3100e_t));
-    memset(t3100e, 0, sizeof(t3100e_t));
+    t3100e_t *t3100e = calloc(1, sizeof(t3100e_t));
     loadfont("roms/machines/t3100e/t3100e_font.bin", 5);
     cga_init(&t3100e->cga);
     video_inform(VIDEO_FLAG_TYPE_CGA, &timing_t3100e);
@@ -711,7 +710,7 @@ const device_t t3100e_device = {
     .init          = t3100e_init,
     .close         = t3100e_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = t3100e_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/vid_cga_v6355.c b/src/video/vid_cga_v6355.c
new file mode 100644
index 000000000..1ddc1f2cd
--- /dev/null
+++ b/src/video/vid_cga_v6355.c
@@ -0,0 +1,1058 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Emulation of the Yamaha V6355 graphics card.
+ *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          John Elliott, <jce@seasip.info>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *          W. M. Martinez, <anikom15@outlook.com>
+ *
+ *          Copyright 2008-2025 Sarah Walker.
+ *          Copyright 2025 John Elliott.
+ *          Copyright 2016-2025 Miran Grca.
+ *          Copyright 2023-2025 W. M. Martinez
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <math.h>
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/pit.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/device.h>
+#include <86box/video.h>
+#include <86box/vid_v6355.h>
+#include <86box/vid_cga.h>
+#include <86box/vid_cga_comp.h>
+#include <86box/plat_unused.h>
+
+/* Emulation of the Yamaha V6355 chipset. This is a CGA clone that was 
+ * probably designed primarily for laptops, where the primary display was
+ * a fixed-resolution LCD panel and there was the option of connecting to
+ * an external CGA monitor or PAL/SECAM television.
+ *
+ * Consequently, unlike a real CGA, it doesn't implement the first ten 6845
+ * registers; instead, a small number of fixed resolutions can be selected
+ * using the V6355's own registers at 0x3DD / 0x3DF. Width is either 512 or 640
+ * pixels; height is 64, 192, 200 or 204 pixels.
+ *
+ * Other features include:
+ * - MDA attribute support
+ * - Palette support - mapping from RGBI colour to 9-bit rrrgggbbb colours 
+ *  (when output is to composite)
+ * - Hardware mouse pointer support
+ *
+ * Outline of the V6355's extra registers, accessed through ports 0x3DD (index)
+ * and 0x3DE (data):
+ *
+ * 0x00-0x1F: Mouse pointer AND mask
+ * 0x20-0x3F: Mouse pointer XOR mask
+ * 0x40-0x5F: Palette for composite output. 0r,gb,0r,gb,0r,gb etc.
+ * 0x60-0x61: Mouse pointer X (big-endian, in 320x200 coordinates)
+ * 0x62:      Not used (would be high byte of mouse pointer Y)
+ * 0x63:      Mouse pointer Y
+ * 0x64:      Mouse pointer visibility & vertical adjustment
+ * 0x65:      Screen height & width, display type, RAM type
+ * 0x66:      LCD adjust, MDA attribute emulation
+ * 0x67:      Horizontal adjustment, other configuration
+ * 0x68:      Mouse pointer colour
+ * 0x69:      Control data register (not well documented)
+ *
+ * Currently unimplemented:
+ * > Display type (PAL/SECAM @50Hz vs NTSC @60Hz)
+ * > MDA monitor support
+ * > LCD panel support 
+ * > Horizontal / vertical position adjustments
+ * > 160x200x16 and 640x200x16 video modes. Documentation suggests that these 
+ *   should be selected by setting bit 6 of the CGA control register, but 
+ *   that doesn't work on my real hardware, so I can't test and therefore
+ *   can't replicate
+ * > Palette support on composite output. Composite_Process() does not 
+ *   appear to have any support for an arbitrary palette.
+ */
+
+#define V6355_RGB                 0
+#define V6355_COMPOSITE           1
+#define V6355_TRUECOLOR           2
+
+#define COMPOSITE_OLD             0
+#define COMPOSITE_NEW             1
+
+#define DOUBLE_NONE               0
+#define DOUBLE_SIMPLE             1
+#define DOUBLE_INTERPOLATE_SRGB   2
+#define DOUBLE_INTERPOLATE_LINEAR 3
+
+#define DEVICE_VRAM      0x4000
+#define DEVICE_VRAM_MASK 0x3fff
+
+typedef union {
+    uint32_t color;
+    struct {
+        uint8_t b;
+        uint8_t g;
+        uint8_t r;
+        uint8_t a;
+    };
+} color_t;
+
+static uint8_t crtcmask[32] = {
+    0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x7f, 0x7f, 0xf3, 0x1f, 0x7f, 0x1f, 0x3f, 0xff, 0x3f, 0xff,
+    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static video_timings_t timing_v6355 = { .type = VIDEO_ISA, .write_b = 8, .write_w = 16, .write_l = 32, .read_b = 8, .read_w = 16, .read_l = 32 };
+
+static uint8_t mdamap[256][2][2];
+
+/* Default values for palette registers */
+static uint8_t defpalette[32] = {
+    0x00, 0x00,     /* Black */
+    0x00, 0x04,     /* Blue */
+    0x00, 0x40,     /* Green */
+    0x00, 0x44,     /* Cyan */
+    0x04, 0x00,     /* Red */
+    0x04, 0x04,     /* Magenta */
+    0x04, 0x40,     /* Yellow */
+    0x04, 0x44,     /* Light grey */
+    0x01, 0x11,     /* Dark grey */
+    0x00, 0x06,     /* Bright blue */
+    0x00, 0x60,     /* Bright green */
+    0x00, 0x66,     /* Bright cyan */
+    0x06, 0x00,     /* Bright red */
+    0x06, 0x06,     /* Bright magenta */
+    0x06, 0x60,     /* Bright yellow */
+    0x07, 0x77,     /* Bright white */
+};
+
+static void v6355_recalctimings(v6355_t *v6355);
+
+static void
+v6355_out(uint16_t addr, uint8_t val, void *priv)
+{
+    v6355_t *v6355 = (v6355_t *) priv;
+    uint8_t  old;
+
+    switch (addr) {
+        case 0x3d0:
+        case 0x3d2:
+        case 0x3d4:
+        case 0x3d6:
+            v6355->crtcreg = val & 31;
+            break;
+        case 0x3d1:
+        case 0x3d3:
+        case 0x3d5:
+        case 0x3d7:
+            old = v6355->crtc[v6355->crtcreg];
+            v6355->crtc[v6355->crtcreg] = val & crtcmask[v6355->crtcreg];
+            if (old != val) {
+                if (v6355->crtcreg < 0xe || v6355->crtcreg > 0x10)
+                    v6355_recalctimings(v6355);
+            }
+            break;
+        case 0x3d8:
+            if (((v6355->cgamode ^ val) & 5) != 0) {
+                v6355->cgamode = val;
+                update_cga16_color(v6355->cgamode);
+            }
+            v6355->cgamode = val;
+            break;
+        case 0x3d9:
+            v6355->cgacol = val;
+            break;
+        case 0x3dd:
+            v6355->v6355reg = val;
+            break;
+        case 0x3de:
+            v6355->v6355data[v6355->v6355reg] = val;
+
+            /* Writes in the 0x40-0x5F range update the palette */
+            if (v6355->v6355reg >= 0x40 && v6355->v6355reg < 0x60) {
+                int r = (v6355->v6355data[v6355->v6355reg & 0xFE]) & 7;
+                int g = (v6355->v6355data[v6355->v6355reg | 0x01] >> 4) & 7;
+                int b = (v6355->v6355data[v6355->v6355reg | 0x01]) & 7;
+                v6355->v6355pal[(v6355->v6355reg - 0x40) / 2] = 
+                    makecol(r * 0xFF / 7, g * 0xFF / 7, b * 0xFF / 7);
+            }
+
+            /* Register autoincrements after a write. */
+            v6355->v6355reg = (v6355->v6355reg + 1) % sizeof(v6355->v6355data);
+            break;
+        case 0x3df:
+            /* Supposedly used for memory paging in 16-colour mode, but
+             * I've found no documentation to explain how */
+            break;
+    }
+}
+
+static uint8_t
+v6355_in(uint16_t addr, void *priv)
+{
+    v6355_t *v6355 = (v6355_t *) priv;
+    uint8_t  ret   = 0xff;
+
+    switch (addr) {
+        case 0x3d4:
+            ret = v6355->crtcreg;
+            break;
+        case 0x3d5:
+            ret = v6355->crtc[v6355->crtcreg];
+            break;
+        case 0x3da:
+            ret = v6355->cgastat;
+            break;
+    }
+
+    return ret;
+}
+
+static void
+v6355_write(uint32_t addr, uint8_t val, void *priv)
+{
+    v6355_t *v6355 = (v6355_t *) priv;
+
+    v6355->vram[addr & 0x3fff] = val;
+
+    cycles -= 4;
+}
+
+static uint8_t
+v6355_read(uint32_t addr, void *priv)
+{
+    v6355_t *v6355 = (v6355_t *) priv;
+
+    cycles -= 4;
+
+    return v6355->vram[addr & 0x3fff];
+}
+
+/* Get width of display area (always 512px or 640px) */
+static uint32_t
+v6355_width(v6355_t *v6355)
+{
+    return (v6355->v6355data[0x65] & 4) ? 512 : 640;
+}
+
+/* Get height of display area (192px, 200px, 204px or 64px) */
+static uint32_t
+v6355_height(v6355_t *v6355)
+{
+    static const unsigned heights[4] = { 192, 200, 204, 64 };
+
+    return heights[v6355->v6355data[0x65] & 3];
+}
+
+/* Timings on a V6355 are largely fixed */
+static void
+v6355_recalctimings(v6355_t *v6355) 
+{
+    double   disptime;
+    double   _dispontime, _dispofftime;
+#ifndef USE_CGA_TIMINGS
+    double   crtcconst = (cpuclock / 21477270.0 * (double) (1ULL << 32)) * 8.0;
+#endif
+
+    uint32_t w = v6355_width(v6355);
+
+    disptime = w + 33;
+    _dispontime = w;
+    _dispofftime = disptime - _dispontime;
+#ifdef USE_CGA_TIMINGS
+    _dispontime *= CGACONST;
+    _dispofftime *= CGACONST;
+#else
+    _dispontime *= crtcconst;
+    _dispofftime *= crtcconst;
+#endif
+    v6355->dispontime = (uint64_t)_dispontime;
+    v6355->dispofftime = (uint64_t)_dispofftime;
+}
+
+/* Overlay the pointer on a line of the display. pixel[] is an array of 640
+ * IBGR values containing the pixels to draw onto */
+static void
+v6355_pointer(v6355_t *v6355, uint8_t *pixel)
+{
+    int c, pxc;
+    int y = v6355->displine - v6355->firstline;
+
+    /* The pointer coordinates are on a 336x216 grid, with (16,16) being
+     * the top left-hand corner of the visible area */
+    int     pointer_x = (v6355->v6355data[0x60] << 8) | (v6355->v6355data[0x61]);
+    int     pointer_y = v6355->v6355data[0x63];
+    uint8_t mc;
+    uint8_t mand;
+    uint8_t mxor;
+    uint8_t mflags;
+
+    /* Mouse drawing options */
+    mflags = v6355->v6355data[0x64];
+
+    /* If the pointer is blinking and not currently shown, don't draw it */
+    if ((v6355->cgablink & 8) && (mflags & 1))
+        return;
+
+    /* If this line doesn't intersect the pointer, nothing to do */
+    if ((y < (pointer_y - 16)) || (y >= pointer_y))
+        return;
+
+    y -= (pointer_y - 16);
+
+    /* Get mouse AND and XOR masks */
+    mand = v6355->v6355data[0x68] & 0x0F;
+    mxor = (v6355->v6355data[0x68] >> 4) & 0x0F;
+
+    /* Draw up to 16 double-width pixels */
+    for (c = 0; c < 32; c++) {
+        mc = 0x80 >> ((c & 0x0E) >> 1);
+        pxc = c + 2 * (pointer_x - 16);
+
+        if (pxc < 0 || pxc >= 640)
+            /* X clipping */
+            continue;
+
+        if (mflags & 2) {
+            /* Apply AND mask? */
+            if (v6355->v6355data[y * 2 + c / 16] & mc)
+                pixel[pxc] &= mand;
+        }
+
+        if (mflags & 4) {
+            /* Apply XOR mask? */
+            if (v6355->v6355data[y * 2 + c / 16 + 32] & mc)
+                pixel[pxc] ^= mxor;
+        }
+    }	
+}
+
+/* Convert attribute byte to CGA colours */
+static void
+v6355_map_attrs(v6355_t *v6355, uint8_t chr, uint8_t attr, uint8_t *cols)
+{
+    if (v6355->v6355data[0x66] & 0x40) {	
+        /* MDA-style attributes */
+        int blink = (v6355->cgamode & 0x20) && (v6355->cgablink & 8) && (attr & 0x80);
+
+        cols[1] = mdamap[attr][blink][1];
+        cols[0] = mdamap[attr][blink][0];
+    } else {
+        /* CGA attributes (blinking enabled) */
+        if (v6355->cgamode & 0x20) {
+            cols[1] = attr & 15;
+            cols[0] = (attr >> 4) & 7;
+            if ((v6355->cgablink & 8) && (attr & 0x80) && !v6355->drawcursor)
+                cols[1] = cols[0];
+        } else {
+            /* CGA attributes (blinking disabled) */
+            cols[1] = attr & 15;
+            cols[0] = attr >> 4;
+        }
+    }
+}
+
+/* Render a line as 640 pixels in 80-column text mode */
+static void
+v6355_line_text80(v6355_t *v6355, uint8_t *pixel, uint16_t ca)
+{
+    int32_t  x, c;
+    uint8_t  chr, attr;
+    uint32_t w = v6355_width(v6355) / 8;
+    uint8_t  cols[2];
+
+    for (x = 0; x < w; x++) {
+        if (v6355->cgamode & 8) {
+            chr  = v6355->charbuffer[x << 1];
+            attr = v6355->charbuffer[(x << 1) + 1];
+        } else
+            chr  = attr = 0;
+
+        v6355_map_attrs(v6355, chr, attr, cols);
+
+        for (c = 0; c < 8; c++) {
+            uint8_t data = fontdat[chr + v6355->fontbase][v6355->sc & 7];
+
+            /* Underline attribute if enabled */
+            if ((v6355->v6355data[0x66] & 0x80) && ((attr & 7) == 1) && ((v6355->sc & 7) == 7))
+                data = 0xff;
+
+            pixel[(x << 3) + c] = cols[(data & (1 << (c ^ 7))) ? 1 : 0];
+        }
+    }
+}
+
+/* Render a line as 640 pixels in 40-column text mode */
+static void
+v6355_line_text40(v6355_t *v6355, uint8_t *pixel, uint16_t ca)
+{
+    int32_t  x, c;
+    uint8_t  chr, attr;
+    uint32_t w = v6355_width(v6355) / 16;
+    uint8_t  cols[2];
+
+    for (x = 0; x < w; x++) {
+        if (v6355->cgamode & 8) {
+            chr  = v6355->vram[((v6355->ma + x) << 1) & 0x3fff];
+            attr = v6355->vram[(((v6355->ma + x) << 1) + 1) & 0x3fff];
+        } else
+            chr = attr = 0;
+
+        v6355_map_attrs(v6355, chr, attr, cols);
+
+        for (c = 0; c < 8; c++) {
+            uint8_t data = fontdat[chr + v6355->fontbase][v6355->sc & 7];
+
+            /* Underline attribute if enabled */
+            if ((v6355->v6355data[0x66] & 0x80) && ((attr & 7) == 1) && ((v6355->sc & 7) == 7))
+                data = 0xff;
+
+            pixel[(x << 4) + (c << 1)] = pixel[(x << 4) + (c << 1) + 1] = 
+                cols[(data & (1 << (c ^ 7))) ? 1 : 0];
+        }
+    }
+}
+
+/* Render a line as 640 pixels in 320-pixel graphics mode */
+static void
+v6355_line_graphics320(v6355_t *v6355, uint8_t *pixel)
+{
+    int32_t  x;
+    int32_t  c;
+    uint8_t  cols[4];
+    uint8_t  intensity;
+    uint16_t dat;
+    uint32_t width = v6355_width(v6355) / 16;
+
+    cols[0] = v6355->cgacol & 15;
+
+    intensity = (v6355->cgacol & 16) ? 8 : 0;
+
+    if (v6355->cgamode & 4) {
+        cols[1] = intensity | 3;
+        cols[2] = intensity | 4;
+        cols[3] = intensity | 7;
+    } else if (v6355->cgacol & 32) {
+        cols[1] = intensity | 3;
+        cols[2] = intensity | 5;
+        cols[3] = intensity | 7;
+    } else {
+        cols[1] = intensity | 2;
+        cols[2] = intensity | 4;
+        cols[3] = intensity | 6;
+    }
+
+    for (x = 0; x < width; x++) {
+        if (v6355->cgamode & 8)
+            dat = (v6355->vram[((v6355->ma << 1) & 0x1fff) + ((v6355->sc & 1) * 0x2000)] << 8) | 
+                   v6355->vram[((v6355->ma << 1) & 0x1fff) + ((v6355->sc & 1) * 0x2000) + 1];
+        else 
+            dat = 0;
+
+        v6355->ma++;
+
+        for (c = 0; c < 8; c++) {
+            pixel[(x << 4) + (c << 1)] = pixel[(x << 4) + (c << 1) + 1] = cols[dat >> 14];
+            dat <<= 2;
+        }	
+    }
+}
+
+/* Render a line as 640 pixels in 640-pixel graphics mode */
+static void
+v6355_line_graphics640(v6355_t *v6355, uint8_t *pixel)
+{
+    int32_t x;
+    int32_t c;
+    uint8_t cols[2];
+    uint16_t dat;
+    uint32_t width = v6355_width(v6355) / 16;
+
+    cols[0] = 0;
+    cols[1] = v6355->cgacol & 15;
+
+    for (x = 0; x < width; x++) {
+        if (v6355->cgamode & 8) 
+            dat = (v6355->vram[((v6355->ma << 1) & 0x1fff) + ((v6355->sc & 1) * 0x2000)] << 8) | 
+                   v6355->vram[((v6355->ma << 1) & 0x1fff) + ((v6355->sc & 1) * 0x2000) + 1];
+        else
+            dat = 0;
+
+        v6355->ma++;
+
+        for (c = 0; c < 16; c++) {
+            pixel[(x << 4) + c] = cols[dat >> 15];
+            dat <<= 1;
+        }
+    }
+}
+
+static void
+v6355_render(v6355_t *v6355, int line)
+{
+    uint16_t ca = (v6355->crtc[15] | (v6355->crtc[14] << 8)) & 0x3fff;
+    int      width = v6355_width(v6355);
+    int      c;
+    int      x;
+    int      drawcursor;
+    uint32_t cols[4];
+    uint8_t  pixel[640];
+
+    /* Draw border */
+    cols[0] = ((v6355->cgamode & 0x12) == 0x12) ? 0 : (v6355->cgacol & 15);
+
+    for (c = 0; c < 8; c++) {
+        ((uint32_t *) buffer32->line[line])[c] = cols[0];
+        ((uint32_t *) buffer32->line[line])[c + width + 8] = cols[0];
+    }
+
+    /* Render screen data. */
+    if (v6355->cgamode & 1) {
+        /* High-res text */
+        v6355_line_text80(v6355, pixel, ca);
+        v6355_pointer(v6355, pixel);
+
+        for (x = 0; x < (width / 8); x++) {
+            drawcursor = ((v6355->ma == ca) && v6355->con && v6355->cursoron);
+            if (drawcursor) {
+                for (c = 0; c < 8; c++)
+                   ((uint32_t *) buffer32->line[line])[(x << 3) + c + 8] = pixel[(x << 3) + c] ^ 0xffffff;
+            } else {
+                for (c = 0; c < 8; c++)
+                   ((uint32_t *)buffer32->line[line])[(x << 3) + c + 8] = pixel[(x << 3) + c];
+            }
+
+            v6355->ma++;
+        }
+    } else if (!(v6355->cgamode & 2)) {
+        /* Low-res text */
+        v6355_line_text40(v6355, pixel, ca);
+        v6355_pointer(v6355, pixel);
+
+        for (x = 0; x < (width / 16); x++) {
+            drawcursor = ((v6355->ma == ca) && v6355->con && v6355->cursoron);
+            if (drawcursor) {
+                for (c = 0; c < 16; c++)
+                    ((uint32_t *) buffer32->line[line])[(x << 4) + c + 8] = pixel[(x << 4) + c] ^ 0xffffff;
+            } else {
+                for (c = 0; c < 16; c++)
+                    ((uint32_t *)buffer32->line[line])[(x << 4) + c + 8] = pixel[(x << 4) + c];
+            }
+
+            v6355->ma++;
+        }
+    } else if (!(v6355->cgamode & 16)) {
+        /* Low-res graphics 
+         * XXX There should be a branch for 160x200x16 graphics somewhere around here */
+        v6355_line_graphics320(v6355, pixel);
+        v6355_pointer(v6355, pixel);
+
+        for (x = 0; x < (width / 16); x++) {
+            for (c = 0; c < 16; c++)
+            ((uint32_t *) buffer32->line[line])[(x << 4) + c + 8] = pixel[(x << 4) + c];
+        }
+    } else {
+        /* High-res graphics 
+         * XXX There should be a branch for 640x200x16 graphics somewhere around here */
+        v6355_line_graphics640(v6355, pixel);
+        v6355_pointer(v6355, pixel);
+
+        for (x = 0; x < (width / 16); x++) {
+            for (c = 0; c < 16; c++)
+            ((uint32_t *) buffer32->line[line])[(x << 4) + c + 8] = pixel[(x << 4) + c];
+        }
+    }
+}
+
+static void
+v6355_render_blank(v6355_t *v6355, int line)
+{
+    int      width = v6355_width(v6355);
+    uint32_t cols[4];
+
+    cols[0] = ((v6355->cgamode & 0x12) == 0x12) ? 0 : (v6355->cgacol & 15);
+    hline(buffer32, 0, line, width + 16, cols[0]);
+}
+
+static void
+v6355_render_process(v6355_t *v6355, int line)
+{
+    int      c;
+    uint8_t  border;
+    int      width = v6355_width(v6355);
+    int      x     = width + 16;
+
+    /* Now render the 640 pixels to the display buffer */
+    switch (v6355->display_type) {
+        /* XXX V6355_COMPOSITE can't use the V6355's palette registers */
+        case V6355_COMPOSITE:
+            for (c = 0; c < x; c++)
+                buffer32->line[line][c] = ((uint32_t *) buffer32->line[line])[c] & 0xf;
+
+            border = ((v6355->cgamode & 0x12) == 0x12) ? 0 : (v6355->cgacol & 15);
+
+            Composite_Process(v6355->cgamode, border, (width + 16) >> 2, buffer32->line[line]);
+            break;
+        case V6355_TRUECOLOR:
+            /* V6355_TRUECOLOR is a fictitious display that behaves like RGB except it
+             * takes account of the V6355's palette registers */
+            for (c = 0; c < x; c++)
+                ((uint32_t *) buffer32->line[line])[c] = v6355->v6355pal[((uint32_t *) buffer32->line[line])[c] & 0xf];
+            break;
+        default:
+            video_process_8(width + 16, line);
+            break;
+    }
+}
+
+static void
+v6355_poll(void *priv)
+{
+    v6355_t *v6355 = (v6355_t *) priv;
+    int      x;
+    int      oldvc;
+    int      oldsc;
+    int      xs_temp;
+    int      ys_temp;
+    int      old_ma;
+
+    int      width = v6355_width(v6355);
+    int      height = v6355_height(v6355);
+
+    /* Simulated CRTC height registers */
+    int crtc4, crtc5, crtc6, crtc7, crtc8, crtc9;
+
+    if (!(v6355->cgamode & 2)) {
+        /* Text mode values */
+        crtc4 = (height + 54) / 8;
+        crtc5 = 6;
+        crtc6 = height / 8;
+        crtc7 = (height + 24) / 8;
+        crtc8 = 2;
+        crtc9 = 7;
+    } else {
+        /* Graphics mode values */
+        crtc4 = (height + 54) / 2;
+        crtc5 = 6;
+        crtc6 = height / 2;
+        crtc7 = (height + 24) / 2;
+        crtc8 = 2;
+        crtc9 = 1;
+    }
+
+    if (!v6355->linepos) {
+        timer_advance_u64(&v6355->timer, v6355->dispofftime);
+
+        v6355->cgastat |= 1;
+        v6355->linepos = 1;
+
+        oldsc = v6355->sc;
+
+        if ((crtc8 & 3) == 3)
+            v6355->sc = ((v6355->sc << 1) + v6355->oddeven) & 7;
+
+        if (v6355->cgadispon) {
+            if (v6355->displine < v6355->firstline) {
+                v6355->firstline = v6355->displine;
+                video_wait_for_buffer();
+            }
+
+            v6355->lastline = v6355->displine;
+
+            switch (v6355->double_type) {
+                default:
+                    v6355_render(v6355, v6355->displine << 1);
+                    v6355_render_blank(v6355, (v6355->displine << 1) + 1);
+                    break;
+                case DOUBLE_NONE:
+                    v6355_render(v6355, v6355->displine);
+                    break;
+                case DOUBLE_SIMPLE:
+                    old_ma = v6355->ma;
+                    v6355_render(v6355, v6355->displine << 1);
+                    v6355->ma = old_ma;
+                    v6355_render(v6355, (v6355->displine << 1) + 1);
+                    break;
+            }
+       } else  switch (v6355->double_type) {
+            default:
+                v6355_render_blank(v6355, v6355->displine << 1);
+                break;
+            case DOUBLE_NONE:
+                v6355_render_blank(v6355, v6355->displine);
+                break;
+            case DOUBLE_SIMPLE:
+                v6355_render_blank(v6355, v6355->displine << 1);
+                v6355_render_blank(v6355, (v6355->displine << 1) + 1);
+                break;
+        }
+
+        switch (v6355->double_type) {
+            default:
+                v6355_render_process(v6355, v6355->displine << 1);
+                v6355_render_process(v6355, (v6355->displine << 1) + 1);
+                break;
+            case DOUBLE_NONE:
+                v6355_render_process(v6355, v6355->displine);
+                break;
+        }
+
+        v6355->sc = oldsc;
+
+        if (v6355->vc == crtc7 && !v6355->sc)
+            v6355->cgastat |= 8;
+
+        v6355->displine++;
+
+        if (v6355->displine >= 360)
+            v6355->displine = 0;
+    } else {
+        timer_advance_u64(&v6355->timer, v6355->dispontime);
+
+        v6355->linepos = 0;
+
+        if (v6355->vsynctime) {
+            v6355->vsynctime--;
+
+            if (!v6355->vsynctime)
+                v6355->cgastat &= ~8;
+        }
+
+        if (v6355->sc == (v6355->crtc[11] & 31) || ((crtc8 & 3) == 3 && v6355->sc == ((v6355->crtc[11] & 31) >> 1))) {
+            v6355->con = 0;
+            v6355->coff = 1;
+        }
+
+        if ((crtc8 & 3) == 3 && v6355->sc == (crtc9 >> 1))
+            v6355->maback = v6355->ma;
+
+        if (v6355->vadj) {
+            v6355->sc++;
+            v6355->sc &= 31;
+            v6355->ma = v6355->maback;
+            v6355->vadj--;
+
+            if (!v6355->vadj) {
+                v6355->cgadispon = 1;
+                v6355->ma = v6355->maback = (v6355->crtc[13] | (v6355->crtc[12] << 8)) & 0x3fff;
+                v6355->sc = 0;
+            }
+        } else if (v6355->sc == crtc9) {
+            v6355->maback = v6355->ma;
+            v6355->sc = 0;
+            oldvc = v6355->vc;
+            v6355->vc++;
+            v6355->vc &= 127;
+
+            if (v6355->vc == crtc6)
+                v6355->cgadispon = 0;
+
+            if (oldvc == crtc4) {
+                v6355->vc = 0;
+                v6355->vadj = crtc5;
+
+                if (!v6355->vadj)
+                    v6355->cgadispon = 1;
+
+                if (!v6355->vadj)
+                    v6355->ma = v6355->maback = (v6355->crtc[13] | (v6355->crtc[12] << 8)) & 0x3fff;
+
+                if ((v6355->crtc[10] & 0x60) == 0x20)
+                    v6355->cursoron = 0;
+                else
+                    v6355->cursoron = v6355->cgablink & 8;
+            }
+
+            if (v6355->vc == crtc7) {
+                v6355->cgadispon = 0;
+                v6355->displine = 0;
+                v6355->vsynctime = 16;
+                if (crtc7) {
+                    x = width + 16;
+                    v6355->lastline++;
+
+                    xs_temp = x;
+                    ys_temp = (v6355->lastline - v6355->firstline) << 1;
+
+                    if ((xs_temp > 0) && (ys_temp > 0)) {
+                        if (xs_temp < 64)
+                            xs_temp = 656;
+                        if (ys_temp < 32)
+                            ys_temp = 200;
+                        if (!enable_overscan)
+                            xs_temp -= 16;
+
+                        if (((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get())) {
+                            xsize = xs_temp;
+                            ysize = ys_temp;
+                            set_screen_size(xsize, ysize + (enable_overscan ? 16 : 0));
+
+                            if (video_force_resize_get())
+                                video_force_resize_set(0);
+                        }
+
+                        cga_do_blit(xsize, v6355->firstline, v6355->lastline, v6355->double_type);
+                    }
+
+                    frames++;
+
+                    video_res_x = xsize - 16;
+                    video_res_y = ysize;
+                    if (v6355->cgamode & 1) {
+                        video_res_x /= 8;
+                        video_res_y /= crtc9 + 1;
+                        video_bpp = 0;
+                    } else if (!(v6355->cgamode & 2)) {
+                        video_res_x /= 16;
+                        video_res_y /= crtc9 + 1;
+                        video_bpp = 0;
+                    } else if (!(v6355->cgamode & 16)) {
+                        video_res_x /= 2;
+                        video_bpp = 2;
+                    } else
+                        video_bpp = 1;
+                }
+
+                v6355->firstline = 1000;
+                v6355->lastline = 0;
+                v6355->cgablink++;
+                v6355->oddeven ^= 1;
+            }
+        } else {
+            v6355->sc++;
+            v6355->sc &= 31;
+            v6355->ma = v6355->maback;
+        }
+
+        if (v6355->cgadispon)
+            v6355->cgastat &= ~1;
+
+        if ((v6355->sc == (v6355->crtc[10] & 31) || ((crtc8 & 3) == 3 && v6355->sc == ((v6355->crtc[10] & 31) >> 1))))
+            v6355->con = 1;
+
+        if (v6355->cgadispon && (v6355->cgamode & 1)) {
+            for (x = 0; x < ((width / 8) * 2); x++)
+                 v6355->charbuffer[x] = v6355->vram[(((v6355->ma << 1) + x) & 0x3fff)];
+        }
+    }
+}
+
+static void *
+v6355_standalone_init(const device_t *info) {
+    int      n;
+    int      c;
+    v6355_t *v6355 = calloc(1, sizeof(v6355_t));
+
+    video_inform(VIDEO_FLAG_TYPE_CGA, &timing_v6355);
+
+    v6355->display_type = device_get_config_int("display_type");
+
+    overscan_x = overscan_y = 16;
+
+    /* Initialise the palette registers to default values */
+    memcpy(v6355->v6355data + 0x40, defpalette, 0x20);
+
+    for (n = 0; n < 16; n++) {
+        int r = (v6355->v6355data[0x40 + 2 * n]) & 7;
+        int g = (v6355->v6355data[0x41 + 2 * n] >> 4) & 7;
+        int b = (v6355->v6355data[0x41 + 2 * n]) & 7;
+
+        v6355->v6355pal[n] =  makecol((r * 0xff) / 7, (g * 0xff) / 7, (b * 0xff) / 7);
+    }
+
+    /* Default to 200 lines */
+    v6355->v6355data[0x65] = 0x01;
+
+    /* Set up CGA -> MDA attribute mapping */
+    for (c = 0; c < 256; c++) {
+        mdamap[c][0][0] = mdamap[c][1][0] = mdamap[c][1][1] = 0;
+
+        if (c & 8)
+            mdamap[c][0][1] = 0xf;
+        else
+            mdamap[c][0][1] = 0x7;
+    }
+
+    mdamap[0x70][0][1] = 0;
+    mdamap[0x70][0][0] = mdamap[0x70][1][0] = mdamap[0x70][1][1] = 0xf;
+    mdamap[0xF0][0][1] = 0;
+    mdamap[0xF0][0][0] = mdamap[0xF0][1][0] = mdamap[0xF0][1][1] = 0xf;
+    mdamap[0x78][0][1] = 7;
+    mdamap[0x78][0][0] = mdamap[0x78][1][0] = mdamap[0x78][1][1] = 0xf;
+    mdamap[0xF8][0][1] = 7;
+    mdamap[0xF8][0][0] = mdamap[0xF8][1][0] = mdamap[0xF8][1][1] = 0xf;
+    mdamap[0x00][0][1] = mdamap[0x00][1][1] = 0;
+    mdamap[0x08][0][1] = mdamap[0x08][1][1] = 0;
+    mdamap[0x80][0][1] = mdamap[0x80][1][1] = 0;
+    mdamap[0x88][0][1] = mdamap[0x88][1][1] = 0;
+
+    v6355->display_type = device_get_config_int("display_type");
+    v6355->revision = device_get_config_int("composite_type");
+
+    v6355->vram = malloc(0x4000);
+
+    cga_comp_init(v6355->revision);
+
+    timer_add(&v6355->timer, v6355_poll, v6355, 1);
+
+    mem_mapping_add(&v6355->mapping, 0xb8000, 0x08000,
+                    v6355_read, NULL, NULL, v6355_write, NULL, NULL, NULL,
+                    MEM_MAPPING_EXTERNAL, v6355);
+
+    io_sethandler(0x03d0, 0x0010,
+                  v6355_in, NULL, NULL, v6355_out, NULL, NULL,
+                  v6355);
+
+    v6355->rgb_type = device_get_config_int("rgb_type");
+    cga_palette     = (v6355->rgb_type << 1);
+    cgapal_rebuild();
+    update_cga16_color(v6355->cgamode);
+
+    v6355->double_type = device_get_config_int("double_type");
+    cga_interpolate_init();
+
+    switch(device_get_config_int("font")) {
+        case 0:
+            loadfont(FONT_IBM_MDA_437_PATH, 0);
+            break;
+        case 1:
+            loadfont(FONT_IBM_MDA_437_NORDIC_PATH, 0);
+            break;
+        case 4:
+            loadfont(FONT_TULIP_DGA_PATH, 0);
+            break;
+    }
+
+    monitors[monitor_index_global].mon_composite = (v6355->display_type == V6355_COMPOSITE);
+
+    return v6355;
+}
+
+static void
+v6355_close(void *priv) {
+    v6355_t *v6355 = (v6355_t *) priv;
+
+    free(v6355->vram);
+    free(v6355);
+}
+
+static void
+v6355_speed_changed(void *priv) {
+    v6355_t *v6355 = (v6355_t *) priv;
+
+    v6355_recalctimings(v6355);
+}
+
+// clang-format off
+const device_config_t v6355_config[] = {
+    {
+        .name           = "display_type",
+        .description    = "Display type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = V6355_RGB,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "RGB",        .value = V6355_RGB       },
+            { .description = "Composite",  .value = V6355_COMPOSITE },
+            { .description = "True color", .value = V6355_TRUECOLOR },
+            { .description = ""                                     }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "composite_type",
+        .description    = "Composite type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = COMPOSITE_OLD,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Old", .value = COMPOSITE_OLD },
+            { .description = "New", .value = COMPOSITE_NEW },
+            { .description = ""                            }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "rgb_type",
+        .description    = "RGB type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 5,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Color (generic)",  .value = 0 },
+            { .description = "Green Monochrome", .value = 1 },
+            { .description = "Amber Monochrome", .value = 2 },
+            { .description = "Gray Monochrome",  .value = 3 },
+            { .description = "Color (no brown)", .value = 4 },
+            { .description = "Color (IBM 5153)", .value = 5 },
+            { .description = ""                             }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "double_type",
+        .description    = "Line doubling type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = DOUBLE_NONE,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",                 .value = DOUBLE_NONE               },
+            { .description = "Simple doubling",      .value = DOUBLE_SIMPLE             },
+            { .description = "sRGB interpolation",   .value = DOUBLE_INTERPOLATE_SRGB   },
+            { .description = "Linear interpolation", .value = DOUBLE_INTERPOLATE_LINEAR },
+            { .description = ""                                                         }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "font",
+        .description    = "Font",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "US (CP 437)",                 .value = 0 },
+            { .description = "IBM Nordic (CP 437-Nordic)",  .value = 1 },
+            { .description = "Tulip DGA",                   .value = 4 },
+            { .description = ""                                        }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+// clang-format on
+
+const device_t v6355d_device = {
+    .name          = "Yamaha V6355D",
+    .internal_name = "v6355d",
+    .flags         = DEVICE_ISA,
+    .local         = 0,
+    .init          = v6355_standalone_init,
+    .close         = v6355_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = v6355_speed_changed,
+    .force_redraw  = NULL,
+    .config        = v6355_config
+};
diff --git a/src/video/vid_chips_69000.c b/src/video/vid_chips_69000.c
new file mode 100644
index 000000000..c63bfc70a
--- /dev/null
+++ b/src/video/vid_chips_69000.c
@@ -0,0 +1,2945 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          C&T 69000 emulation.
+ *
+ *
+ *
+ * Authors: Cacodemon345
+ *
+ *          Copyright 2023-2024 Cacodemon345
+ */
+#include <stdio.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <time.h>
+#include <stdatomic.h>
+#include <86box/86box.h>
+#include <86box/io.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/device.h>
+#include "cpu.h"
+#include <86box/timer.h>
+#include <86box/video.h>
+#include <86box/vid_svga.h>
+#include <86box/vid_svga_render.h>
+#include <86box/pci.h>
+#include <86box/thread.h>
+#include <86box/i2c.h>
+#include <86box/vid_ddc.h>
+#include <86box/plat_unused.h>
+#include <86box/bswap.h>
+#include <assert.h>
+
+#pragma pack(push, 1)
+typedef struct chips_69000_bitblt_t
+{
+    /* BR00 - Source and Destination Span Register. */
+    uint16_t source_span;
+    uint16_t destination_span;
+
+    /* BR01 - Pattern/Source Expansion Background Color & Transparency Key Register. */
+    uint32_t pattern_source_key_bg;
+
+    /* BR02 - Pattern/Source Expansion Foreground Color Register. */
+    uint32_t pattern_source_key_fg;
+
+    /* BR03 - Monochrome Source Control Register. */
+    uint8_t monochrome_source_left_clip;
+    uint8_t monochrome_source_right_clip;
+    uint8_t monochrome_source_initial_discard;
+    uint8_t monochrome_source_alignment : 3;
+    uint8_t monochrome_source_expansion_color_reg_select : 1;
+    uint8_t dummy_8 : 4;
+
+    /* BR04 - BitBLT Control Register. */
+    uint32_t bitblt_control;
+
+    /* BR05 - Pattern Address Register. */
+    uint32_t pat_addr;
+
+    /* BR06 - Source Address Register. */
+    uint32_t source_addr;
+
+    /* BR07 - Destination Address Register. */
+    uint32_t destination_addr;
+
+    /* BR08 - Destination Width & Height Register. */
+    uint16_t destination_width;
+    uint16_t destination_height;
+
+    /* BR09 - Source Expansion Background Color & Transparency Key Register. */
+    uint32_t source_key_bg;
+
+    /* BR0A - Source Expansion Foreground Color Register. */
+    uint32_t source_key_fg;
+} chips_69000_bitblt_t;
+#pragma pack(pop)
+
+typedef struct chips_69000_t {
+    svga_t        svga;
+    uint8_t       pci_conf_status;
+    uint8_t       slot, irq_state;
+    uint8_t       pci_line_interrupt;
+    uint8_t       pci_rom_enable;
+    uint8_t       read_write_bank;
+    bool          engine_active;
+    bool          quit;
+    thread_t     *accel_thread;
+    event_t      *fifo_event, *fifo_data_event;
+    pc_timer_t    decrement_timer;
+    uint16_t      rom_addr;
+    mem_mapping_t linear_mapping;
+    uint8_t       on_board;
+
+    rgb_t cursor_palette[8];
+    uint32_t cursor_pallook[8];
+
+    uint8_t mm_regs[256], mm_index;
+    uint8_t flat_panel_regs[256], flat_panel_index;
+    uint8_t ext_regs[256], ext_index;
+    uint8_t pci_regs[256];
+
+    union {
+        uint32_t mem_regs[4];
+        uint16_t mem_regs_w[4 * 2];
+        uint8_t mem_regs_b[4 * 4];
+    };
+    union {
+        uint32_t bitblt_regs[11];
+        uint16_t bitblt_regs_w[11 * 2];
+        uint8_t bitblt_regs_b[11 * 4];
+        struct chips_69000_bitblt_t bitblt;
+    };
+
+    struct
+    {
+        struct chips_69000_bitblt_t bitblt;
+
+        uint32_t actual_source_height;
+        uint32_t actual_destination_height;
+
+        uint32_t actual_destination_width;
+
+        uint32_t count_x, count_y;
+        int x, y;
+        int x_dir, y_dir;
+
+        uint8_t bytes_per_pixel;
+
+        /* Byte counter for BitBLT port writes. */
+        uint8_t bytes_written;
+        uint8_t bytes_skip;
+        uint32_t mono_bytes_pitch;
+        uint8_t mono_bits_skip_left;
+        uint32_t bytes_counter;
+        uint32_t bytes_in_line_written;
+        uint8_t bytes_port[256];
+    } bitblt_running;
+
+    union {
+        uint16_t subsys_vid;
+        uint8_t subsys_vid_b[2];
+    };
+
+    union {
+        uint16_t subsys_pid;
+        uint8_t subsys_pid_b[2];
+    };
+
+    rom_t bios_rom;
+
+    void *i2c, *ddc;
+
+    uint8_t st01;
+} chips_69000_t;
+
+static chips_69000_t *reset_state = NULL;
+
+/* TODO: Probe timings on real hardware. */
+static video_timings_t timing_chips = { .type = VIDEO_PCI, .write_b = 2, .write_w = 2, .write_l = 1, .read_b = 10, .read_w = 10, .read_l = 10 };
+
+uint8_t chips_69000_readb_linear(uint32_t addr, void *priv);
+uint16_t chips_69000_readw_linear(uint32_t addr, void *priv);
+uint32_t chips_69000_readl_linear(uint32_t addr, void *priv);
+void chips_69000_writeb_linear(uint32_t addr, uint8_t val, void *priv);
+void chips_69000_writew_linear(uint32_t addr, uint16_t val, void *priv);
+void chips_69000_writel_linear(uint32_t addr, uint32_t val, void *priv);
+
+/* Multimedia handling. */
+uint8_t
+chips_69000_read_multimedia(chips_69000_t* chips)
+{
+    switch (chips->mm_index) {
+        case 0:
+            /* Report no playback/capture capability. */
+            return 0;
+        default:
+            return chips->mm_regs[chips->mm_index];
+    }
+    return chips->mm_regs[chips->mm_index];
+}
+
+/* Multimedia (write) handling. */
+void
+chips_69000_write_multimedia(chips_69000_t* chips, uint8_t val)
+{
+    switch (chips->mm_index) {
+        case 0:
+            return;
+        default:
+            chips->mm_regs[chips->mm_index] = val;
+            break;
+    }
+    chips->mm_regs[chips->mm_index] = val;
+}
+
+/* Flat panel handling. */
+uint8_t
+chips_69000_read_flat_panel(chips_69000_t* chips)
+{
+    switch (chips->flat_panel_index) {
+        case 0:
+            return 1;
+        default:
+            return chips->flat_panel_regs[chips->flat_panel_index];
+    }
+    return chips->flat_panel_regs[chips->flat_panel_index];
+}
+
+/* Flat panel (write) handling. */
+void
+chips_69000_write_flat_panel(chips_69000_t* chips, uint8_t val)
+{
+    switch (chips->flat_panel_index) {
+        case 0:
+            return;
+        case 1:
+        case 0x20 ... 0x33:
+        case 0x35:
+        case 0x36:
+            chips->flat_panel_regs[chips->flat_panel_index] = val;
+            svga_recalctimings(&chips->svga);
+            return;
+        default:
+            chips->flat_panel_regs[chips->flat_panel_index] = val;
+            break;
+    }
+    chips->flat_panel_regs[chips->flat_panel_index] = val;
+}
+
+void
+chips_69000_interrupt(chips_69000_t* chips)
+{
+    pci_irq(chips->slot, PCI_INTA, 0, !!(chips->mem_regs[0] & chips->mem_regs[1] & 0x80004040), &chips->irq_state);
+}
+
+void
+chips_69000_bitblt_interrupt(chips_69000_t* chips)
+{
+    chips->engine_active = 0;
+    chips->mem_regs[1] |= 1 << 31;
+
+    chips_69000_interrupt(chips);
+}
+
+#define ROPMIX(R, D, P, S, out)                    \
+    {                                              \
+        switch (R) {                               \
+            case 0x00:                             \
+                out = 0;                           \
+                break;                             \
+            case 0x01:                             \
+                out = ~(D | (P | S));              \
+                break;                             \
+            case 0x02:                             \
+                out = D & ~(P | S);                \
+                break;                             \
+            case 0x03:                             \
+                out = ~(P | S);                    \
+                break;                             \
+            case 0x04:                             \
+                out = S & ~(D | P);                \
+                break;                             \
+            case 0x05:                             \
+                out = ~(D | P);                    \
+                break;                             \
+            case 0x06:                             \
+                out = ~(P | ~(D ^ S));             \
+                break;                             \
+            case 0x07:                             \
+                out = ~(P | (D & S));              \
+                break;                             \
+            case 0x08:                             \
+                out = S & (D & ~P);                \
+                break;                             \
+            case 0x09:                             \
+                out = ~(P | (D ^ S));              \
+                break;                             \
+            case 0x0a:                             \
+                out = D & ~P;                      \
+                break;                             \
+            case 0x0b:                             \
+                out = ~(P | (S & ~D));             \
+                break;                             \
+            case 0x0c:                             \
+                out = S & ~P;                      \
+                break;                             \
+            case 0x0d:                             \
+                out = ~(P | (D & ~S));             \
+                break;                             \
+            case 0x0e:                             \
+                out = ~(P | ~(D | S));             \
+                break;                             \
+            case 0x0f:                             \
+                out = ~P;                          \
+                break;                             \
+            case 0x10:                             \
+                out = P & ~(D | S);                \
+                break;                             \
+            case 0x11:                             \
+                out = ~(D | S);                    \
+                break;                             \
+            case 0x12:                             \
+                out = ~(S | ~(D ^ P));             \
+                break;                             \
+            case 0x13:                             \
+                out = ~(S | (D & P));              \
+                break;                             \
+            case 0x14:                             \
+                out = ~(D | ~(P ^ S));             \
+                break;                             \
+            case 0x15:                             \
+                out = ~(D | (P & S));              \
+                break;                             \
+            case 0x16:                             \
+                out = P ^ (S ^ (D & ~(P & S)));    \
+                break;                             \
+            case 0x17:                             \
+                out = ~(S ^ ((S ^ P) & (D ^ S)));  \
+                break;                             \
+            case 0x18:                             \
+                out = (S ^ P) & (P ^ D);           \
+                break;                             \
+            case 0x19:                             \
+                out = ~(S ^ (D & ~(P & S)));       \
+                break;                             \
+            case 0x1a:                             \
+                out = P ^ (D | (S & P));           \
+                break;                             \
+            case 0x1b:                             \
+                out = ~(S ^ (D & (P ^ S)));        \
+                break;                             \
+            case 0x1c:                             \
+                out = P ^ (S | (D & P));           \
+                break;                             \
+            case 0x1d:                             \
+                out = ~(D ^ (S & (P ^ D)));        \
+                break;                             \
+            case 0x1e:                             \
+                out = P ^ (D | S);                 \
+                break;                             \
+            case 0x1f:                             \
+                out = ~(P & (D | S));              \
+                break;                             \
+            case 0x20:                             \
+                out = D & (P & ~S);                \
+                break;                             \
+            case 0x21:                             \
+                out = ~(S | (D ^ P));              \
+                break;                             \
+            case 0x22:                             \
+                out = D & ~S;                      \
+                break;                             \
+            case 0x23:                             \
+                out = ~(S | (P & ~D));             \
+                break;                             \
+            case 0x24:                             \
+                out = (S ^ P) & (D ^ S);           \
+                break;                             \
+            case 0x25:                             \
+                out = ~(P ^ (D & ~(S & P)));       \
+                break;                             \
+            case 0x26:                             \
+                out = S ^ (D | (P & S));           \
+                break;                             \
+            case 0x27:                             \
+                out = S ^ (D | ~(P ^ S));          \
+                break;                             \
+            case 0x28:                             \
+                out = D & (P ^ S);                 \
+                break;                             \
+            case 0x29:                             \
+                out = ~(P ^ (S ^ (D | (P & S))));  \
+                break;                             \
+            case 0x2a:                             \
+                out = D & ~(P & S);                \
+                break;                             \
+            case 0x2b:                             \
+                out = ~(S ^ ((S ^ P) & (P ^ D)));  \
+                break;                             \
+            case 0x2c:                             \
+                out = S ^ (P & (D | S));           \
+                break;                             \
+            case 0x2d:                             \
+                out = P ^ (S | ~D);                \
+                break;                             \
+            case 0x2e:                             \
+                out = P ^ (S | (D ^ P));           \
+                break;                             \
+            case 0x2f:                             \
+                out = ~(P & (S | ~D));             \
+                break;                             \
+            case 0x30:                             \
+                out = P & ~S;                      \
+                break;                             \
+            case 0x31:                             \
+                out = ~(S | (D & ~P));             \
+                break;                             \
+            case 0x32:                             \
+                out = S ^ (D | (P | S));           \
+                break;                             \
+            case 0x33:                             \
+                out = ~S;                          \
+                break;                             \
+            case 0x34:                             \
+                out = S ^ (P | (D & S));           \
+                break;                             \
+            case 0x35:                             \
+                out = S ^ (P | ~(D ^ S));          \
+                break;                             \
+            case 0x36:                             \
+                out = S ^ (D | P);                 \
+                break;                             \
+            case 0x37:                             \
+                out = ~(S & (D | P));              \
+                break;                             \
+            case 0x38:                             \
+                out = P ^ (S & (D | P));           \
+                break;                             \
+            case 0x39:                             \
+                out = S ^ (P | ~D);                \
+                break;                             \
+            case 0x3a:                             \
+                out = S ^ (P | (D ^ S));           \
+                break;                             \
+            case 0x3b:                             \
+                out = ~(S & (P | ~D));             \
+                break;                             \
+            case 0x3c:                             \
+                out = P ^ S;                       \
+                break;                             \
+            case 0x3d:                             \
+                out = S ^ (P | ~(D | S));          \
+                break;                             \
+            case 0x3e:                             \
+                out = S ^ (P | (D & ~S));          \
+                break;                             \
+            case 0x3f:                             \
+                out = ~(P & S);                    \
+                break;                             \
+            case 0x40:                             \
+                out = P & (S & ~D);                \
+                break;                             \
+            case 0x41:                             \
+                out = ~(D | (P ^ S));              \
+                break;                             \
+            case 0x42:                             \
+                out = (S ^ D) & (P ^ D);           \
+                break;                             \
+            case 0x43:                             \
+                out = ~(S ^ (P & ~(D & S)));       \
+                break;                             \
+            case 0x44:                             \
+                out = S & ~D;                      \
+                break;                             \
+            case 0x45:                             \
+                out = ~(D | (P & ~S));             \
+                break;                             \
+            case 0x46:                             \
+                out = D ^ (S | (P & D));           \
+                break;                             \
+            case 0x47:                             \
+                out = ~(P ^ (S & (D ^ P)));        \
+                break;                             \
+            case 0x48:                             \
+                out = S & (D ^ P);                 \
+                break;                             \
+            case 0x49:                             \
+                out = ~(P ^ (D ^ (S | (P & D))));  \
+                break;                             \
+            case 0x4a:                             \
+                out = D ^ (P & (S | D));           \
+                break;                             \
+            case 0x4b:                             \
+                out = P ^ (D | ~S);                \
+                break;                             \
+            case 0x4c:                             \
+                out = S & ~(D & P);                \
+                break;                             \
+            case 0x4d:                             \
+                out = ~(S ^ ((S ^ P) | (D ^ S)));  \
+                break;                             \
+            case 0x4e:                             \
+                out = P ^ (D | (S ^ P));           \
+                break;                             \
+            case 0x4f:                             \
+                out = ~(P & (D | ~S));             \
+                break;                             \
+            case 0x50:                             \
+                out = P & ~D;                      \
+                break;                             \
+            case 0x51:                             \
+                out = ~(D | (S & ~P));             \
+                break;                             \
+            case 0x52:                             \
+                out = D ^ (P | (S & D));           \
+                break;                             \
+            case 0x53:                             \
+                out = ~(S ^ (P & (D ^ S)));        \
+                break;                             \
+            case 0x54:                             \
+                out = ~(D | ~(P | S));             \
+                break;                             \
+            case 0x55:                             \
+                out = ~D;                          \
+                break;                             \
+            case 0x56:                             \
+                out = D ^ (P | S);                 \
+                break;                             \
+            case 0x57:                             \
+                out = ~(D & (P | S));              \
+                break;                             \
+            case 0x58:                             \
+                out = P ^ (D & (S | P));           \
+                break;                             \
+            case 0x59:                             \
+                out = D ^ (P | ~S);                \
+                break;                             \
+            case 0x5a:                             \
+                out = D ^ P;                       \
+                break;                             \
+            case 0x5b:                             \
+                out = D ^ (P | ~(S | D));          \
+                break;                             \
+            case 0x5c:                             \
+                out = D ^ (P | (S ^ D));           \
+                break;                             \
+            case 0x5d:                             \
+                out = ~(D & (P | ~S));             \
+                break;                             \
+            case 0x5e:                             \
+                out = D ^ (P | (S & ~D));          \
+                break;                             \
+            case 0x5f:                             \
+                out = ~(D & P);                    \
+                break;                             \
+            case 0x60:                             \
+                out = P & (D ^ S);                 \
+                break;                             \
+            case 0x61:                             \
+                out = ~(D ^ (S ^ (P | (D & S))));  \
+                break;                             \
+            case 0x62:                             \
+                out = D ^ (S & (P | D));           \
+                break;                             \
+            case 0x63:                             \
+                out = S ^ (D | ~P);                \
+                break;                             \
+            case 0x64:                             \
+                out = S ^ (D & (P | S));           \
+                break;                             \
+            case 0x65:                             \
+                out = D ^ (S | ~P);                \
+                break;                             \
+            case 0x66:                             \
+                out = D ^ S;                       \
+                break;                             \
+            case 0x67:                             \
+                out = S ^ (D | ~(P | S));          \
+                break;                             \
+            case 0x68:                             \
+                out = ~(D ^ (S ^ (P | ~(D | S)))); \
+                break;                             \
+            case 0x69:                             \
+                out = ~(P ^ (D ^ S));              \
+                break;                             \
+            case 0x6a:                             \
+                out = D ^ (P & S);                 \
+                break;                             \
+            case 0x6b:                             \
+                out = ~(P ^ (S ^ (D & (P | S))));  \
+                break;                             \
+            case 0x6c:                             \
+                out = S ^ (D & P);                 \
+                break;                             \
+            case 0x6d:                             \
+                out = ~(P ^ (D ^ (S & (P | D))));  \
+                break;                             \
+            case 0x6e:                             \
+                out = S ^ (D & (P | ~S));          \
+                break;                             \
+            case 0x6f:                             \
+                out = ~(P & ~(D ^ S));             \
+                break;                             \
+            case 0x70:                             \
+                out = P & ~(D & S);                \
+                break;                             \
+            case 0x71:                             \
+                out = ~(S ^ ((S ^ D) & (P ^ D)));  \
+                break;                             \
+            case 0x72:                             \
+                out = S ^ (D | (P ^ S));           \
+                break;                             \
+            case 0x73:                             \
+                out = ~(S & (D | ~P));             \
+                break;                             \
+            case 0x74:                             \
+                out = D ^ (S | (P ^ D));           \
+                break;                             \
+            case 0x75:                             \
+                out = ~(D & (S | ~P));             \
+                break;                             \
+            case 0x76:                             \
+                out = S ^ (D | (P & ~S));          \
+                break;                             \
+            case 0x77:                             \
+                out = ~(D & S);                    \
+                break;                             \
+            case 0x78:                             \
+                out = P ^ (D & S);                 \
+                break;                             \
+            case 0x79:                             \
+                out = ~(D ^ (S ^ (P & (D | S))));  \
+                break;                             \
+            case 0x7a:                             \
+                out = D ^ (P & (S | ~D));          \
+                break;                             \
+            case 0x7b:                             \
+                out = ~(S & ~(D ^ P));             \
+                break;                             \
+            case 0x7c:                             \
+                out = S ^ (P & (D | ~S));          \
+                break;                             \
+            case 0x7d:                             \
+                out = ~(D & ~(P ^ S));             \
+                break;                             \
+            case 0x7e:                             \
+                out = (S ^ P) | (D ^ S);           \
+                break;                             \
+            case 0x7f:                             \
+                out = ~(D & (P & S));              \
+                break;                             \
+            case 0x80:                             \
+                out = D & (P & S);                 \
+                break;                             \
+            case 0x81:                             \
+                out = ~((S ^ P) | (D ^ S));        \
+                break;                             \
+            case 0x82:                             \
+                out = D & ~(P ^ S);                \
+                break;                             \
+            case 0x83:                             \
+                out = ~(S ^ (P & (D | ~S)));       \
+                break;                             \
+            case 0x84:                             \
+                out = S & ~(D ^ P);                \
+                break;                             \
+            case 0x85:                             \
+                out = ~(P ^ (D & (S | ~P)));       \
+                break;                             \
+            case 0x86:                             \
+                out = D ^ (S ^ (P & (D | S)));     \
+                break;                             \
+            case 0x87:                             \
+                out = ~(P ^ (D & S));              \
+                break;                             \
+            case 0x88:                             \
+                out = D & S;                       \
+                break;                             \
+            case 0x89:                             \
+                out = ~(S ^ (D | (P & ~S)));       \
+                break;                             \
+            case 0x8a:                             \
+                out = D & (S | ~P);                \
+                break;                             \
+            case 0x8b:                             \
+                out = ~(D ^ (S | (P ^ D)));        \
+                break;                             \
+            case 0x8c:                             \
+                out = S & (D | ~P);                \
+                break;                             \
+            case 0x8d:                             \
+                out = ~(S ^ (D | (P ^ S)));        \
+                break;                             \
+            case 0x8e:                             \
+                out = S ^ ((S ^ D) & (P ^ D));     \
+                break;                             \
+            case 0x8f:                             \
+                out = ~(P & ~(D & S));             \
+                break;                             \
+            case 0x90:                             \
+                out = P & ~(D ^ S);                \
+                break;                             \
+            case 0x91:                             \
+                out = ~(S ^ (D & (P | ~S)));       \
+                break;                             \
+            case 0x92:                             \
+                out = D ^ (P ^ (S & (D | P)));     \
+                break;                             \
+            case 0x93:                             \
+                out = ~(S ^ (P & D));              \
+                break;                             \
+            case 0x94:                             \
+                out = P ^ (S ^ (D & (P | S)));     \
+                break;                             \
+            case 0x95:                             \
+                out = ~(D ^ (P & S));              \
+                break;                             \
+            case 0x96:                             \
+                out = D ^ (P ^ S);                 \
+                break;                             \
+            case 0x97:                             \
+                out = P ^ (S ^ (D | ~(P | S)));    \
+                break;                             \
+            case 0x98:                             \
+                out = ~(S ^ (D | ~(P | S)));       \
+                break;                             \
+            case 0x99:                             \
+                out = ~(D ^ S);                    \
+                break;                             \
+            case 0x9a:                             \
+                out = D ^ (P & ~S);                \
+                break;                             \
+            case 0x9b:                             \
+                out = ~(S ^ (D & (P | S)));        \
+                break;                             \
+            case 0x9c:                             \
+                out = S ^ (P & ~D);                \
+                break;                             \
+            case 0x9d:                             \
+                out = ~(D ^ (S & (P | D)));        \
+                break;                             \
+            case 0x9e:                             \
+                out = D ^ (S ^ (P | (D & S)));     \
+                break;                             \
+            case 0x9f:                             \
+                out = ~(P & (D ^ S));              \
+                break;                             \
+            case 0xa0:                             \
+                out = D & P;                       \
+                break;                             \
+            case 0xa1:                             \
+                out = ~(P ^ (D | (S & ~P)));       \
+                break;                             \
+            case 0xa2:                             \
+                out = D & (P | ~S);                \
+                break;                             \
+            case 0xa3:                             \
+                out = ~(D ^ (P | (S ^ D)));        \
+                break;                             \
+            case 0xa4:                             \
+                out = ~(P ^ (D | ~(S | P)));       \
+                break;                             \
+            case 0xa5:                             \
+                out = ~(P ^ D);                    \
+                break;                             \
+            case 0xa6:                             \
+                out = D ^ (S & ~P);                \
+                break;                             \
+            case 0xa7:                             \
+                out = ~(P ^ (D & (S | P)));        \
+                break;                             \
+            case 0xa8:                             \
+                out = D & (P | S);                 \
+                break;                             \
+            case 0xa9:                             \
+                out = ~(D ^ (P | S));              \
+                break;                             \
+            case 0xaa:                             \
+                out = D;                           \
+                break;                             \
+            case 0xab:                             \
+                out = D | ~(P | S);                \
+                break;                             \
+            case 0xac:                             \
+                out = S ^ (P & (D ^ S));           \
+                break;                             \
+            case 0xad:                             \
+                out = ~(D ^ (P | (S & D)));        \
+                break;                             \
+            case 0xae:                             \
+                out = D | (S & ~P);                \
+                break;                             \
+            case 0xaf:                             \
+                out = D | ~P;                      \
+                break;                             \
+            case 0xb0:                             \
+                out = P & (D | ~S);                \
+                break;                             \
+            case 0xb1:                             \
+                out = ~(P ^ (D | (S ^ P)));        \
+                break;                             \
+            case 0xb2:                             \
+                out = S ^ ((S ^ P) | (D ^ S));     \
+                break;                             \
+            case 0xb3:                             \
+                out = ~(S & ~(D & P));             \
+                break;                             \
+            case 0xb4:                             \
+                out = P ^ (S & ~D);                \
+                break;                             \
+            case 0xb5:                             \
+                out = ~(D ^ (P & (S | D)));        \
+                break;                             \
+            case 0xb6:                             \
+                out = D ^ (P ^ (S | (D & P)));     \
+                break;                             \
+            case 0xb7:                             \
+                out = ~(S & (D ^ P));              \
+                break;                             \
+            case 0xb8:                             \
+                out = P ^ (S & (D ^ P));           \
+                break;                             \
+            case 0xb9:                             \
+                out = ~(D ^ (S | (P & D)));        \
+                break;                             \
+            case 0xba:                             \
+                out = D | (P & ~S);                \
+                break;                             \
+            case 0xbb:                             \
+                out = D | ~S;                      \
+                break;                             \
+            case 0xbc:                             \
+                out = S ^ (P & ~(D & S));          \
+                break;                             \
+            case 0xbd:                             \
+                out = ~((S ^ D) & (P ^ D));        \
+                break;                             \
+            case 0xbe:                             \
+                out = D | (P ^ S);                 \
+                break;                             \
+            case 0xbf:                             \
+                out = D | ~(P & S);                \
+                break;                             \
+            case 0xc0:                             \
+                out = P & S;                       \
+                break;                             \
+            case 0xc1:                             \
+                out = ~(S ^ (P | (D & ~S)));       \
+                break;                             \
+            case 0xc2:                             \
+                out = ~(S ^ (P | ~(D | S)));       \
+                break;                             \
+            case 0xc3:                             \
+                out = ~(P ^ S);                    \
+                break;                             \
+            case 0xc4:                             \
+                out = S & (P | ~D);                \
+                break;                             \
+            case 0xc5:                             \
+                out = ~(S ^ (P | (D ^ S)));        \
+                break;                             \
+            case 0xc6:                             \
+                out = S ^ (D & ~P);                \
+                break;                             \
+            case 0xc7:                             \
+                out = ~(P ^ (S & (D | P)));        \
+                break;                             \
+            case 0xc8:                             \
+                out = S & (D | P);                 \
+                break;                             \
+            case 0xc9:                             \
+                out = ~(S ^ (P | D));              \
+                break;                             \
+            case 0xca:                             \
+                out = D ^ (P & (S ^ D));           \
+                break;                             \
+            case 0xcb:                             \
+                out = ~(S ^ (P | (D & S)));        \
+                break;                             \
+            case 0xcc:                             \
+                out = S;                           \
+                break;                             \
+            case 0xcd:                             \
+                out = S | ~(D | P);                \
+                break;                             \
+            case 0xce:                             \
+                out = S | (D & ~P);                \
+                break;                             \
+            case 0xcf:                             \
+                out = S | ~P;                      \
+                break;                             \
+            case 0xd0:                             \
+                out = P & (S | ~D);                \
+                break;                             \
+            case 0xd1:                             \
+                out = ~(P ^ (S | (D ^ P)));        \
+                break;                             \
+            case 0xd2:                             \
+                out = P ^ (D & ~S);                \
+                break;                             \
+            case 0xd3:                             \
+                out = ~(S ^ (P & (D | S)));        \
+                break;                             \
+            case 0xd4:                             \
+                out = S ^ ((S ^ P) & (P ^ D));     \
+                break;                             \
+            case 0xd5:                             \
+                out = ~(D & ~(P & S));             \
+                break;                             \
+            case 0xd6:                             \
+                out = P ^ (S ^ (D | (P & S)));     \
+                break;                             \
+            case 0xd7:                             \
+                out = ~(D & (P ^ S));              \
+                break;                             \
+            case 0xd8:                             \
+                out = P ^ (D & (S ^ P));           \
+                break;                             \
+            case 0xd9:                             \
+                out = ~(S ^ (D | (P & S)));        \
+                break;                             \
+            case 0xda:                             \
+                out = D ^ (P & ~(S & D));          \
+                break;                             \
+            case 0xdb:                             \
+                out = ~((S ^ P) & (D ^ S));        \
+                break;                             \
+            case 0xdc:                             \
+                out = S | (P & ~D);                \
+                break;                             \
+            case 0xdd:                             \
+                out = S | ~D;                      \
+                break;                             \
+            case 0xde:                             \
+                out = S | (D ^ P);                 \
+                break;                             \
+            case 0xdf:                             \
+                out = S | ~(D & P);                \
+                break;                             \
+            case 0xe0:                             \
+                out = P & (D | S);                 \
+                break;                             \
+            case 0xe1:                             \
+                out = ~(P ^ (D | S));              \
+                break;                             \
+            case 0xe2:                             \
+                out = D ^ (S & (P ^ D));           \
+                break;                             \
+            case 0xe3:                             \
+                out = ~(P ^ (S | (D & P)));        \
+                break;                             \
+            case 0xe4:                             \
+                out = S ^ (D & (P ^ S));           \
+                break;                             \
+            case 0xe5:                             \
+                out = ~(P ^ (D | (S & P)));        \
+                break;                             \
+            case 0xe6:                             \
+                out = S ^ (D & ~(P & S));          \
+                break;                             \
+            case 0xe7:                             \
+                out = ~((S ^ P) & (P ^ D));        \
+                break;                             \
+            case 0xe8:                             \
+                out = S ^ ((S ^ P) & (D ^ S));     \
+                break;                             \
+            case 0xe9:                             \
+                out = ~(D ^ (S ^ (P & ~(D & S)))); \
+                break;                             \
+            case 0xea:                             \
+                out = D | (P & S);                 \
+                break;                             \
+            case 0xeb:                             \
+                out = D | ~(P ^ S);                \
+                break;                             \
+            case 0xec:                             \
+                out = S | (D & P);                 \
+                break;                             \
+            case 0xed:                             \
+                out = S | ~(D ^ P);                \
+                break;                             \
+            case 0xee:                             \
+                out = D | S;                       \
+                break;                             \
+            case 0xef:                             \
+                out = S | (D | ~P);                \
+                break;                             \
+            case 0xf0:                             \
+                out = P;                           \
+                break;                             \
+            case 0xf1:                             \
+                out = P | ~(D | S);                \
+                break;                             \
+            case 0xf2:                             \
+                out = P | (D & ~S);                \
+                break;                             \
+            case 0xf3:                             \
+                out = P | ~S;                      \
+                break;                             \
+            case 0xf4:                             \
+                out = P | (S & ~D);                \
+                break;                             \
+            case 0xf5:                             \
+                out = P | ~D;                      \
+                break;                             \
+            case 0xf6:                             \
+                out = P | (D ^ S);                 \
+                break;                             \
+            case 0xf7:                             \
+                out = P | ~(D & S);                \
+                break;                             \
+            case 0xf8:                             \
+                out = P | (D & S);                 \
+                break;                             \
+            case 0xf9:                             \
+                out = P | ~(D ^ S);                \
+                break;                             \
+            case 0xfa:                             \
+                out = D | P;                       \
+                break;                             \
+            case 0xfb:                             \
+                out = D | (P | ~S);                \
+                break;                             \
+            case 0xfc:                             \
+                out = P | S;                       \
+                break;                             \
+            case 0xfd:                             \
+                out = P | (S | ~D);                \
+                break;                             \
+            case 0xfe:                             \
+                out = D | (P | S);                 \
+                break;                             \
+            case 0xff:                             \
+                out = ~0;                          \
+                break;                             \
+        }                                          \
+    }
+
+void
+chips_69000_do_rop_8bpp_patterned(uint8_t *dst, uint8_t pattern, uint8_t src, uint8_t rop)
+{
+    ROPMIX(rop, *dst, pattern, src, *dst);
+}
+
+void
+chips_69000_do_rop_16bpp_patterned(uint16_t *dst, uint16_t pattern, uint16_t src, uint8_t rop)
+{
+    ROPMIX(rop, *dst, pattern, src, *dst);
+}
+
+void
+chips_69000_do_rop_24bpp_patterned(uint32_t *dst, uint32_t pattern, uint32_t src, uint8_t rop)
+{
+    uint32_t orig_dst = *dst & 0xFF000000;
+
+    ROPMIX(rop, *dst, pattern, src, *dst);
+
+    *dst &= 0xFFFFFF;
+    *dst |= orig_dst;
+}
+
+void
+chips_69000_recalctimings(svga_t *svga)
+{
+    chips_69000_t *chips = (chips_69000_t *) svga->priv;
+
+    svga->clock = (cpuclock * (double) (1ULL << 32)) / svga->getclock((svga->miscout >> 2) & 3, svga->priv);
+
+    if (chips->ext_regs[0x81] & 0x10) {
+        svga->htotal -= 5;
+    }
+
+    if (((chips->ext_regs[0x61] & 0x8) && !(chips->ext_regs[0x61] & 0x4))
+        || ((chips->ext_regs[0x61] & 0x2) && !(chips->ext_regs[0x61] & 0x1))) {
+        svga->dpms = 1;
+    } else
+        svga->dpms = 0;
+
+    if (chips->ext_regs[0x09] & 0x1) {
+        svga->vtotal -= 2;
+        svga->vtotal &= 0xFF;
+        svga->vtotal |= (svga->crtc[0x30] & 0xF) << 8;
+        svga->vtotal += 2;
+
+        svga->dispend--;
+        svga->dispend &= 0xFF;
+        svga->dispend |= (svga->crtc[0x31] & 0xF) << 8;
+        svga->dispend++;
+
+        svga->vsyncstart--;
+        svga->vsyncstart &= 0xFF;
+        svga->vsyncstart |= (svga->crtc[0x32] & 0xF) << 8;
+        svga->vsyncstart++;
+
+        svga->vblankstart--;
+        svga->vblankstart &= 0xFF;
+        svga->vblankstart |= (svga->crtc[0x33] & 0xF) << 8;
+        svga->vblankstart++;
+
+        if (!(chips->ext_regs[0x81] & 0x10))
+            svga->htotal -= 5;
+
+        svga->htotal |= (svga->crtc[0x38] & 0x1) << 8;
+
+        if (!(chips->ext_regs[0x81] & 0x10))
+            svga->htotal += 5;
+
+        svga->hblank_end_val = ((svga->crtc[3] & 0x1f) | ((svga->crtc[5] & 0x80) ? 0x20 : 0x00)) | (svga->crtc[0x3c] & 0b11000000);
+        svga->hblank_end_mask = 0xff;
+
+        svga->memaddr_latch |= (svga->crtc[0x40] & 0xF) << 16;
+        svga->rowoffset |= (svga->crtc[0x41] & 0xF) << 8;
+
+        svga->interlace = !!(svga->crtc[0x70] & 0x80);
+        if (svga->interlace)
+            svga->dispend >>= 1;
+
+        switch (chips->ext_regs[0x81] & 0xF) {
+            default:
+                svga->bpp = 8;
+                break;
+            case 0b0010:
+                svga->bpp = 8;
+                svga->render = svga_render_8bpp_highres;
+                break;
+
+            case 0b0100:
+                svga->bpp = 15;
+                svga->render = svga_render_15bpp_highres;
+                break;
+            case 0b0101:
+                svga->bpp = 16;
+                svga->render = svga_render_16bpp_highres;
+                break;
+            case 0b0110:
+                svga->bpp = 24;
+                svga->render = svga_render_24bpp_highres;
+                break;
+            case 0b0111:
+                svga->bpp = 32;
+                svga->render = svga_render_32bpp_highres;
+                break;
+        }
+#if 1
+        if (chips->flat_panel_regs[0x01] & 0x2) {
+            /* TODO: Fix horizontal parameter calculations. */
+            if (svga->hdisp > (((chips->flat_panel_regs[0x20] | ((chips->flat_panel_regs[0x25] & 0xF) << 8)) + 1) << 3)) {
+                svga->hdisp = ((chips->flat_panel_regs[0x20] | ((chips->flat_panel_regs[0x25] & 0xF) << 8)) + 1) << 3;
+                //svga->htotal = ((chips->flat_panel_regs[0x23] | ((chips->flat_panel_regs[0x26] & 0xF) << 8)) + 5) << 3;
+                //svga->hblank_end_val = svga->htotal - 1;
+                svga->hoverride = 1;
+            } else
+                svga->hoverride = 0;
+
+            if (svga->dispend > (((chips->flat_panel_regs[0x30] | ((chips->flat_panel_regs[0x35] & 0xF) << 8)) + 1))) {
+                svga->dispend = svga->vsyncstart = svga->vblankstart = ((chips->flat_panel_regs[0x30] | ((chips->flat_panel_regs[0x35] & 0xF) << 8)) + 1);
+                if (svga->interlace)
+                    svga->dispend >>= 1;
+            }
+            //svga->hdisp = ((chips->flat_panel_regs[0x20] | ((chips->flat_panel_regs[0x25] & 0xF) << 8)) + 1) << 3;
+            //svga->htotal = ((chips->flat_panel_regs[0x23] | ((chips->flat_panel_regs[0x26] & 0xF) << 8)) + 5) << 3;
+            //svga->hblank_end_val = svga->htotal - 1;
+            //svga->dispend = svga->vsyncstart = svga->vblankstart = ((chips->flat_panel_regs[0x30] | ((chips->flat_panel_regs[0x35] & 0xF) << 8)) + 1);
+            //svga->vsyncstart = ((chips->flat_panel_regs[0x31] | ((chips->flat_panel_regs[0x35] & 0xF0) << 4)) + 1);
+            //svga->vtotal = ((chips->flat_panel_regs[0x33] | ((chips->flat_panel_regs[0x36] & 0xF) << 8)) + 2);
+            svga->clock = (cpuclock * (double) (1ULL << 32)) / svga->getclock((chips->flat_panel_regs[0x03] >> 2) & 3, svga->priv);
+        } else {
+            svga->hoverride = 0;
+        }
+#endif
+    } else {
+        svga->bpp = 8;
+        svga->hoverride = 0;
+    }
+}
+
+void
+chips_69000_decrement_timer(void* p)
+{
+    chips_69000_t *chips = (chips_69000_t*)p;
+
+    chips->ext_regs[0xD2]--;
+    timer_on_auto(&chips->decrement_timer, 1000000. / 2000.);
+}
+
+void
+chips_69000_recalc_banking(chips_69000_t *chips)
+{
+    svga_t* svga = &chips->svga;
+    chips->svga.read_bank = chips->svga.write_bank = 0;
+
+    svga->chain2_write = !(svga->seqregs[0x4] & 4);
+    svga->chain4       = (svga->seqregs[0x4] & 8) || (chips->ext_regs[0xA] & 0x4);
+    svga->fast         = (svga->gdcreg[8] == 0xff && !(svga->gdcreg[3] & 0x18) && !svga->gdcreg[1]) && ((svga->chain4 && (svga->packed_chain4 || svga->force_old_addr)) || svga->fb_only) && !(svga->adv_flags & FLAG_ADDR_BY8);
+
+    if (chips->ext_regs[0xA] & 1) {
+        chips->svga.read_bank = chips->svga.write_bank = 0x10000 * (chips->ext_regs[0xE] & 0x7f);
+    }
+
+    /*if (chips->ext_regs[0x40] & 2) {
+        svga->decode_mask = (1 << 18) - 1;
+    } else {
+        svga->decode_mask = (1 << 21) - 1;
+    }*/
+}
+
+void
+chips_69000_process_pixel(chips_69000_t* chips, uint32_t pixel)
+{
+    uint32_t pattern_fg = chips->bitblt_running.bitblt.pattern_source_key_fg;
+    uint32_t pattern_bg = chips->bitblt_running.bitblt.pattern_source_key_bg;
+    uint8_t pattern_data = 0;
+    uint32_t pattern_pixel = 0;
+    uint32_t dest_pixel = 0;
+    uint32_t dest_addr = chips->bitblt_running.bitblt.destination_addr + (chips->bitblt_running.y * chips->bitblt_running.bitblt.destination_span) + (chips->bitblt_running.x * chips->bitblt_running.bytes_per_pixel);
+    uint8_t vert_pat_alignment = (chips->bitblt_running.bitblt.bitblt_control >> 20) & 7;
+    uint8_t orig_dest_addr_bit = chips->bitblt_running.bitblt.destination_addr & 1;
+
+    switch (chips->bitblt_running.bytes_per_pixel) {
+        case 1: /* 8 bits-per-pixel. */
+            {
+                dest_pixel = chips_69000_readb_linear(dest_addr, chips);
+                break;
+            }
+        case 2: /* 16 bits-per-pixel. */
+            {
+                dest_pixel = chips_69000_readb_linear(dest_addr, chips);
+                dest_pixel |= chips_69000_readb_linear(dest_addr + 1, chips) << 8;
+                break;
+            }
+        case 3: /* 24 bits-per-pixel. */
+            {
+                dest_pixel = chips_69000_readb_linear(dest_addr, chips);
+                dest_pixel |= chips_69000_readb_linear(dest_addr + 1, chips) << 8;
+                dest_pixel |= chips_69000_readb_linear(dest_addr + 2, chips) << 16;
+                break;
+            }
+    }
+
+    if (chips->bitblt_running.bytes_per_pixel == 2) {
+        chips->bitblt_running.bitblt.destination_addr >>= 1;
+    }
+    if (chips->bitblt_running.bitblt.bitblt_control & (1 << 18)) {
+        uint8_t is_true = 0;
+        if (chips->bitblt_running.bitblt.bitblt_control & (1 << 19))
+            pattern_data = 0;
+        else
+            pattern_data = chips_69000_readb_linear(chips->bitblt_running.bitblt.pat_addr + ((vert_pat_alignment + (chips->bitblt_running.y & 7)) & 7), chips);
+
+        is_true = !!(pattern_data & (1 << (7 - ((chips->bitblt_running.bitblt.destination_addr + chips->bitblt_running.x) & 7))));
+
+        if (!is_true && (chips->bitblt_running.bitblt.bitblt_control & (1 << 17))) {
+            if (chips->bitblt_running.bytes_per_pixel == 2) {
+                chips->bitblt_running.bitblt.destination_addr <<= 1;
+                chips->bitblt_running.bitblt.destination_addr |= orig_dest_addr_bit;
+            }
+            return;
+        }
+
+        pattern_pixel = is_true ? pattern_fg : pattern_bg;
+
+        pattern_pixel &= (1 << (8 * (chips->bitblt_running.bytes_per_pixel))) - 1;
+    } else {
+        if (chips->bitblt_running.bytes_per_pixel == 1) {
+            pattern_pixel = chips_69000_readb_linear(chips->bitblt_running.bitblt.pat_addr
+                                                        + 8 * ((vert_pat_alignment + chips->bitblt_running.y) & 7)
+                                                        + (((chips->bitblt_running.bitblt.destination_addr & 7) + chips->bitblt_running.x) & 7), chips);
+        }
+        if (chips->bitblt_running.bytes_per_pixel == 2) {
+            pattern_pixel = chips_69000_readb_linear(chips->bitblt_running.bitblt.pat_addr
+                                                        + (2 * 8 * ((vert_pat_alignment + chips->bitblt_running.y) & 7))
+                                                        + (2 * (((chips->bitblt_running.bitblt.destination_addr & 7) + chips->bitblt_running.x) & 7)), chips);
+
+            pattern_pixel |= chips_69000_readb_linear(chips->bitblt_running.bitblt.pat_addr
+                                                        + (2 * 8 * ((vert_pat_alignment + chips->bitblt_running.y) & 7))
+                                                        + (2 * (((chips->bitblt_running.bitblt.destination_addr & 7) + chips->bitblt_running.x) & 7)) + 1, chips) << 8;
+        }
+        if (chips->bitblt_running.bytes_per_pixel == 3) {
+            pattern_pixel = chips_69000_readb_linear(chips->bitblt_running.bitblt.pat_addr
+                                                        + (4 * 8 * ((vert_pat_alignment + chips->bitblt_running.y) & 7))
+                                                        + (3 * ((((chips->bitblt_running.bitblt.destination_addr / 3) & 7) + chips->bitblt_running.x) & 7)), chips);
+
+            pattern_pixel |= chips_69000_readb_linear(chips->bitblt_running.bitblt.pat_addr
+                                                        + (4 * 8 * ((vert_pat_alignment + chips->bitblt_running.y) & 7))
+                                                        + (3 * ((((chips->bitblt_running.bitblt.destination_addr / 3) & 7) + chips->bitblt_running.x) & 7)) + 1, chips) << 8;
+
+            pattern_pixel |= chips_69000_readb_linear(chips->bitblt_running.bitblt.pat_addr
+                                                        + (4 * 8 * ((vert_pat_alignment + chips->bitblt_running.y) & 7))
+                                                        + (3 * ((((chips->bitblt_running.bitblt.destination_addr / 3) & 7) + chips->bitblt_running.x) & 7)) + 2, chips) << 16;
+        }
+    }
+    if (chips->bitblt_running.bytes_per_pixel == 2) {
+        chips->bitblt_running.bitblt.destination_addr <<= 1;
+        chips->bitblt_running.bitblt.destination_addr |= orig_dest_addr_bit;
+    }
+
+    if (chips->bitblt_running.bitblt.bitblt_control & (1 << 14)) {
+        switch ((chips->bitblt_running.bitblt.bitblt_control >> 15) & 3) {
+            case 1:
+            case 3:
+            {
+                uint32_t color_key = (chips->bitblt_running.bitblt.monochrome_source_expansion_color_reg_select)
+                ? chips->bitblt_running.bitblt.source_key_bg
+                : chips->bitblt_running.bitblt.pattern_source_key_bg;
+                color_key &= (1 << (8 * (chips->bitblt_running.bytes_per_pixel))) - 1;
+
+                if (!!(color_key == dest_pixel) == !(chips->bitblt_running.bitblt.bitblt_control & (1 << 16))) {
+                    return;
+                }
+
+                break;
+            }
+        }
+    }
+
+    switch (chips->bitblt_running.bytes_per_pixel) {
+        case 1: /* 8 bits-per-pixel. */
+            {
+                chips_69000_do_rop_8bpp_patterned((uint8_t*)&dest_pixel, pattern_pixel, pixel, chips->bitblt_running.bitblt.bitblt_control & 0xFF);
+                break;
+            }
+        case 2: /* 16 bits-per-pixel. */
+            {
+                chips_69000_do_rop_16bpp_patterned((uint16_t*)&dest_pixel, pattern_pixel, pixel, chips->bitblt_running.bitblt.bitblt_control & 0xFF);
+                break;
+            }
+        case 3: /* 24 bits-per-pixel. */
+            {
+                chips_69000_do_rop_24bpp_patterned((uint32_t*)&dest_pixel, pattern_pixel, pixel, chips->bitblt_running.bitblt.bitblt_control & 0xFF);
+                break;
+            }
+    }
+
+    if (chips->bitblt_running.bitblt.bitblt_control & (1 << 14)) {
+        switch ((chips->bitblt_running.bitblt.bitblt_control >> 15) & 3) {
+            case 0:
+            case 2:
+            {
+                uint32_t color_key = (chips->bitblt_running.bitblt.monochrome_source_expansion_color_reg_select)
+                ? chips->bitblt_running.bitblt.source_key_bg
+                : chips->bitblt_running.bitblt.pattern_source_key_bg;
+                color_key &= (1 << (8 * (chips->bitblt_running.bytes_per_pixel))) - 1;
+                dest_pixel &= (1 << (8 * (chips->bitblt_running.bytes_per_pixel))) - 1;
+
+                if (!!(color_key == dest_pixel) == !(chips->bitblt_running.bitblt.bitblt_control & (1 << 16))) {
+                    return;
+                }
+
+                break;
+            }
+        }
+    }
+
+    switch (chips->bitblt_running.bytes_per_pixel) {
+        case 1: /* 8 bits-per-pixel. */
+            {
+                chips_69000_writeb_linear(dest_addr, dest_pixel & 0xFF, chips);
+                break;
+            }
+        case 2: /* 16 bits-per-pixel. */
+            {
+                chips_69000_writeb_linear(dest_addr, dest_pixel & 0xFF, chips);
+                chips_69000_writeb_linear(dest_addr + 1, (dest_pixel >> 8) & 0xFF, chips);
+                break;
+            }
+        case 3: /* 24 bits-per-pixel. */
+            {
+                chips_69000_writeb_linear(dest_addr, dest_pixel & 0xFF, chips);
+                chips_69000_writeb_linear(dest_addr + 1, (dest_pixel >> 8) & 0xFF, chips);
+                chips_69000_writeb_linear(dest_addr + 2, (dest_pixel >> 16) & 0xFF, chips);
+                break;
+            }
+    }
+}
+
+void
+chips_69000_process_mono_bit(chips_69000_t* chips, uint8_t val)
+{
+    uint32_t pixel = 0x0;
+    uint8_t is_true = !!val;
+    uint32_t source_fg = chips->bitblt_running.bitblt.pattern_source_key_fg;
+    uint32_t source_bg = chips->bitblt_running.bitblt.pattern_source_key_bg;
+
+    if (!chips->engine_active)
+        return;
+
+    if (chips->bitblt_running.bitblt.monochrome_source_expansion_color_reg_select) {
+        source_fg = chips->bitblt_running.bitblt.source_key_fg;
+        source_bg = chips->bitblt_running.bitblt.source_key_bg;
+    }
+
+    if (chips->bitblt_running.bitblt.monochrome_source_initial_discard) {
+        chips->bitblt_running.bitblt.monochrome_source_initial_discard--;
+        return;
+    }
+
+    if (chips->bitblt_running.mono_bits_skip_left) {
+        chips->bitblt_running.mono_bits_skip_left--;
+        return;
+    }
+
+    if (!is_true && (chips->bitblt_running.bitblt.bitblt_control & (1 << 13))) {
+        goto advance;
+    }
+    pixel = is_true ? source_fg : source_bg;
+    pixel &= (1 << (8 * (chips->bitblt_running.bytes_per_pixel))) - 1;
+
+    chips_69000_process_pixel(chips, pixel);
+
+advance:
+    chips->bitblt_running.x += chips->bitblt_running.x_dir;
+    chips->bitblt_running.count_x += 1;
+    if (chips->bitblt_running.count_x >= chips->bitblt_running.actual_destination_width) {
+        chips->bitblt_running.count_y += 1;
+        chips->bitblt_running.y += chips->bitblt_running.y_dir * 1;
+        chips->bitblt_running.count_x = 0;
+        chips->bitblt_running.x = 0;
+        chips->bitblt_running.mono_bits_skip_left = chips->bitblt_running.bitblt.monochrome_source_left_clip;
+        if (chips->bitblt_running.count_y >= (chips->bitblt_running.actual_destination_height))
+            chips_69000_bitblt_interrupt(chips);
+    }
+}
+
+void chips_69000_bitblt_write(chips_69000_t* chips, uint8_t data);
+
+void
+chips_69000_setup_bitblt(chips_69000_t* chips)
+{
+    chips->engine_active = 1;
+
+    memset(&chips->bitblt_running, 0, sizeof(chips->bitblt_running));
+    chips->bitblt_running.bitblt = chips->bitblt;
+    chips->bitblt_running.actual_source_height = chips->bitblt.destination_height;
+    chips->bitblt_running.actual_destination_height = chips->bitblt.destination_height;
+    chips->bitblt_running.count_x = chips->bitblt_running.count_y = 0;
+    chips->bitblt_running.bytes_written = 0;
+    chips->bitblt_running.bytes_counter = 0;
+    chips->bitblt_running.bytes_in_line_written = 0;
+    chips->bitblt_running.bytes_skip = 0;
+    chips->bitblt_running.mono_bytes_pitch = 0;
+    chips->bitblt_running.mono_bits_skip_left = 0;
+    int orig_cycles = cycles;
+
+    if (chips->bitblt.bitblt_control & (1 << 23)) {
+        chips->bitblt_running.bytes_per_pixel = 1 + ((chips->bitblt.bitblt_control >> 24) & 3);
+    } else {
+        chips->bitblt_running.bytes_per_pixel = 1 + ((chips->ext_regs[0x20] >> 4) & 3);
+    }
+
+    chips->bitblt_running.actual_destination_width = chips->bitblt_running.bitblt.destination_width / chips->bitblt_running.bytes_per_pixel;
+
+    chips->bitblt_running.x = 0;
+    chips->bitblt_running.y = 0;
+
+    switch ((chips->bitblt_running.bitblt.bitblt_control >> 8) & 3) {
+        case 0:
+            chips->bitblt_running.x_dir = 1;
+            chips->bitblt_running.y_dir = 1;
+            break;
+        case 1:
+            chips->bitblt_running.x_dir = -1;
+            chips->bitblt_running.y_dir = 1;
+            if (!(chips->bitblt_running.bitblt.bitblt_control & (1 << 10)))
+                chips->bitblt_running.bitblt.source_addr -= (chips->bitblt_running.bytes_per_pixel - 1);
+            chips->bitblt_running.bitblt.destination_addr -= (chips->bitblt_running.bytes_per_pixel - 1);
+            break;
+        case 2:
+            chips->bitblt_running.x_dir = 1;
+            chips->bitblt_running.y_dir = -1;
+            break;
+        case 3:
+            chips->bitblt_running.x_dir = -1;
+            chips->bitblt_running.y_dir = -1;
+            if (!(chips->bitblt_running.bitblt.bitblt_control & (1 << 10)))
+                chips->bitblt_running.bitblt.source_addr -= (chips->bitblt_running.bytes_per_pixel - 1);
+            chips->bitblt_running.bitblt.destination_addr -= (chips->bitblt_running.bytes_per_pixel - 1);
+            break;
+    }
+
+    /* Drawing is pointless if monochrome pattern is enabled, monochrome write-masking is enabled and solid pattern is enabled. */
+    if ((chips->bitblt_running.bitblt.bitblt_control & (1 << 17))
+    && (chips->bitblt_running.bitblt.bitblt_control & (1 << 18))
+    && (chips->bitblt_running.bitblt.bitblt_control & (1 << 19))) {
+        chips_69000_bitblt_interrupt(chips);
+        return;
+    }
+
+#if 0
+    if (chips->bitblt_running.bitblt.bitblt_control & (1 << 12)) {
+        pclog("C&T: Monochrome blit (monochrome_source_alignment = %d, "
+        "monochrome left clip = %d, "
+        "monochrome right clip = %d, "
+        "monochrome initial discard = %d, "
+        "destination_width = %d, destination_height = %d)\n", chips->bitblt_running.bitblt.monochrome_source_alignment,
+        chips->bitblt_running.bitblt.monochrome_source_left_clip,
+        chips->bitblt_running.bitblt.monochrome_source_right_clip,
+        chips->bitblt_running.bitblt.monochrome_source_initial_discard,
+        chips->bitblt_running.bitblt.destination_width,
+        chips->bitblt_running.bitblt.destination_height);
+    }
+#endif
+
+    if (chips->bitblt_running.bitblt.bitblt_control & (1 << 10)) {
+        chips->bitblt_running.bitblt.source_addr &= 7;
+        if (!(chips->bitblt_running.bitblt.bitblt_control & (1 << 12))) {
+            /* Yes, the NT 4.0 and Linux drivers will send this many amount of bytes to the video adapter on quadword-boundary-crossing image blits.
+               This weird calculation is intended and deliberate.
+            */
+            if ((chips->bitblt_running.bitblt.source_addr + (chips->bitblt_running.bitblt.destination_width)) > ((chips->bitblt_running.bitblt.destination_width + 7) & ~7))
+                chips->bitblt_running.bytes_skip = 8 + (((chips->bitblt_running.bitblt.destination_width + 7) & ~7) - chips->bitblt_running.bitblt.destination_width);
+        } else {
+            chips->bitblt_running.mono_bits_skip_left = chips->bitblt_running.bitblt.monochrome_source_left_clip;
+
+            if (chips->bitblt_running.bitblt.monochrome_source_alignment == 5)
+                chips->bitblt_running.bitblt.monochrome_source_alignment = 0;
+
+            if (chips->bitblt_running.bitblt.monochrome_source_alignment == 0) {
+                chips->bitblt_running.mono_bytes_pitch = ((chips->bitblt_running.actual_destination_width + chips->bitblt_running.bitblt.monochrome_source_left_clip + 63) & ~63) / 8;
+            }
+        }
+
+        return;
+    }
+
+    if (chips->bitblt_running.bitblt.bitblt_control & (1 << 12)) {
+        uint32_t source_addr = chips->bitblt_running.bitblt.source_addr;
+
+        while (chips->engine_active) {
+            switch (chips->bitblt_running.bitblt.monochrome_source_alignment) {
+                case 0: /* Source-span aligned. */
+                    {
+                        /* Note: This value means quadword-alignment when BitBLT port is the source. */
+                        /* TODO: This is handled purely on a best case basis. */
+                        uint32_t orig_count_y = chips->bitblt_running.count_y;
+                        uint32_t orig_source_addr = chips->bitblt_running.bitblt.source_addr;
+                        while (orig_count_y == chips->bitblt_running.count_y) {
+                            int i = 0;
+                            uint8_t data = chips_69000_readb_linear(orig_source_addr, chips);
+                            orig_source_addr++;
+                            for (i = 0; i < 8; i++) {
+                                chips_69000_process_mono_bit(chips, !!(data & (1 << (7 - i))));
+                                if (orig_count_y != chips->bitblt_running.count_y) {
+                                    break;
+                                }
+                            }
+                            if ((source_addr + chips->bitblt_running.bitblt.source_span) == orig_source_addr)
+                                break;
+                        }
+
+                        source_addr = chips->bitblt_running.bitblt.source_addr + chips->bitblt_running.bitblt.source_span;
+                        chips->bitblt_running.bitblt.source_addr = source_addr;
+                        break;
+                    }
+                case 1: /* Bit-aligned */
+                case 2: /* Byte-aligned */
+                    {
+                        uint32_t data = chips_69000_readb_linear(source_addr, chips);
+                        chips_69000_bitblt_write(chips, data & 0xFF);
+                        source_addr += 1;
+                        break;
+                    }
+                case 3: /* Word-aligned*/
+                    {
+                        uint32_t data = chips_69000_readw_linear(source_addr, chips);
+                        chips_69000_bitblt_write(chips, data & 0xFF);
+                        chips_69000_bitblt_write(chips, (data >> 8) & 0xFF);
+                        source_addr += 2;
+                        break;
+                    }
+                case 4: /* Doubleword-aligned*/
+                    {
+                        uint32_t data = chips_69000_readl_linear(source_addr, chips);
+                        chips_69000_bitblt_write(chips, data & 0xFF);
+                        chips_69000_bitblt_write(chips, (data >> 8) & 0xFF);
+                        chips_69000_bitblt_write(chips, (data >> 16) & 0xFF);
+                        chips_69000_bitblt_write(chips, (data >> 24) & 0xFF);
+                        source_addr += 4;
+                        break;
+                    }
+                case 5: /* Quadword-aligned*/
+                    {
+                        uint64_t data = (uint64_t)chips_69000_readl_linear(source_addr, chips) | ((uint64_t)chips_69000_readl_linear(source_addr + 4, chips) << 32ull);
+                        chips_69000_bitblt_write(chips, data & 0xFF);
+                        chips_69000_bitblt_write(chips, (data >> 8) & 0xFF);
+                        chips_69000_bitblt_write(chips, (data >> 16) & 0xFF);
+                        chips_69000_bitblt_write(chips, (data >> 24) & 0xFF);
+                        chips_69000_bitblt_write(chips, (data >> 32ull) & 0xFF);
+                        chips_69000_bitblt_write(chips, (data >> 40ull) & 0xFF);
+                        chips_69000_bitblt_write(chips, (data >> 48ull) & 0xFF);
+                        chips_69000_bitblt_write(chips, (data >> 56ull) & 0xFF);
+                        source_addr += 8;
+                        break;
+                    }
+            }
+        }
+        return;
+    }
+
+    do {
+        do {
+            uint32_t pixel = 0;
+            uint32_t source_addr = chips->bitblt_running.bitblt.source_addr + (chips->bitblt_running.y * chips->bitblt.source_span) + (chips->bitblt_running.x * chips->bitblt_running.bytes_per_pixel);
+
+            switch (chips->bitblt_running.bytes_per_pixel) {
+                case 1: /* 8 bits-per-pixel. */
+                    {
+                        pixel = chips_69000_readb_linear(source_addr, chips);
+                        break;
+                    }
+                case 2: /* 16 bits-per-pixel. */
+                    {
+                        pixel = chips_69000_readb_linear(source_addr, chips);
+                        pixel |= chips_69000_readb_linear(source_addr + 1, chips) << 8;
+                        break;
+                    }
+                case 3: /* 24 bits-per-pixel. */
+                    {
+                        pixel = chips_69000_readb_linear(source_addr, chips);
+                        pixel |= chips_69000_readb_linear(source_addr + 1, chips) << 8;
+                        pixel |= chips_69000_readb_linear(source_addr + 2, chips) << 16;
+                        break;
+                    }
+            }
+
+            chips_69000_process_pixel(chips, pixel);
+
+            chips->bitblt_running.x += chips->bitblt_running.x_dir;
+        } while ((++chips->bitblt_running.count_x) < chips->bitblt_running.actual_destination_width);
+
+        chips->bitblt_running.y += chips->bitblt_running.y_dir;
+        chips->bitblt_running.count_x = 0;
+        chips->bitblt_running.x = 0;
+    } while ((++chips->bitblt_running.count_y) < chips->bitblt_running.actual_destination_height);
+    cycles = orig_cycles;
+    chips_69000_bitblt_interrupt(chips);
+}
+
+void
+chips_69000_bitblt_write(chips_69000_t* chips, uint8_t data) {
+
+    if (!chips->engine_active) {
+        return;
+    }
+
+    if (chips->bitblt_running.bitblt.bitblt_control & (1 << 12)) {
+        int orig_cycles = cycles;
+        chips->bitblt_running.bytes_port[chips->bitblt_running.bytes_written++] = data;
+        if (chips->bitblt_running.bitblt.monochrome_source_alignment == 1) {
+            uint8_t val = chips->bitblt_running.bytes_port[0];
+            int i = 0;
+            chips->bitblt_running.bytes_written = 0;
+            for (i = 0; i < 8; i++) {
+                chips_69000_process_mono_bit(chips, !!(val & (1 << (7 - i))));
+            }
+        } else if (chips->bitblt_running.bitblt.monochrome_source_alignment == 0 && chips->bitblt_running.mono_bytes_pitch && chips->bitblt_running.mono_bytes_pitch == chips->bitblt_running.bytes_written) {
+            int orig_count_y = chips->bitblt_running.count_y;
+            int i = 0, j = 0;
+            chips->bitblt_running.bytes_written = 0;
+
+            for (j = 0; j < chips->bitblt_running.mono_bytes_pitch; j++) {
+                for (i = 0; i < 8; i++) {
+                    chips_69000_process_mono_bit(chips, !!(chips->bitblt_running.bytes_port[j] & (1 << (7 - i))));
+                    if (orig_count_y != chips->bitblt_running.count_y) {
+                        cycles = orig_cycles;
+                        return;
+                    }
+                }
+            }
+        }
+        else if ((chips->bitblt_running.bitblt.monochrome_source_alignment == 0 && !chips->bitblt_running.mono_bytes_pitch)
+        || chips->bitblt_running.bitblt.monochrome_source_alignment == 2) {
+            int orig_count_y = chips->bitblt_running.count_y;
+            int i = 0;
+            uint8_t val = chips->bitblt_running.bytes_port[0];
+            chips->bitblt_running.bytes_written = 0;
+
+            for (i = 0; i < 8; i++) {
+                chips_69000_process_mono_bit(chips, !!(val & (1 << (7 - i))));
+                if (orig_count_y != chips->bitblt_running.count_y && chips->bitblt_running.bitblt.monochrome_source_alignment != 1) {
+                    cycles = orig_cycles;
+                    return;
+                }
+            }
+        } else if (chips->bitblt_running.bitblt.monochrome_source_alignment == 3
+        && chips->bitblt_running.bytes_written == 2) {
+            int orig_count_y = chips->bitblt_running.count_y;
+            int i = 0;
+            uint16_t val = (chips->bitblt_running.bytes_port[1]) | (chips->bitblt_running.bytes_port[0] << 8);
+            chips->bitblt_running.bytes_written = 0;
+
+            for (i = 0; i < 16; i++) {
+                chips_69000_process_mono_bit(chips, !!(val & (1 << (15 - i))));
+                if (orig_count_y != chips->bitblt_running.count_y) {
+                    cycles = orig_cycles;
+                    return;
+                }
+            }
+        } else if (chips->bitblt_running.bitblt.monochrome_source_alignment == 4
+        && chips->bitblt_running.bytes_written == 4) {
+            int orig_count_y = chips->bitblt_running.count_y;
+            int i = 0;
+            uint32_t val = chips->bitblt_running.bytes_port[3] | (chips->bitblt_running.bytes_port[2] << 8) | (chips->bitblt_running.bytes_port[1] << 16) | (chips->bitblt_running.bytes_port[0] << 24);
+            chips->bitblt_running.bytes_written = 0;
+
+            for (i = 0; i < 32; i++) {
+                chips_69000_process_mono_bit(chips, !!(val & (1 << (31 - i))));
+                if (orig_count_y != chips->bitblt_running.count_y) {
+                    cycles = orig_cycles;
+                    return;
+                }
+            }
+        } else if (chips->bitblt_running.bitblt.monochrome_source_alignment == 5 && chips->bitblt_running.bytes_written == 8) {
+            int orig_count_y = chips->bitblt_running.count_y;
+            int i = 0;
+            uint64_t val = 0;
+
+            val |= chips->bitblt_running.bytes_port[7];
+            val |= chips->bitblt_running.bytes_port[6] << 8;
+            val |= chips->bitblt_running.bytes_port[5] << 16;
+            val |= chips->bitblt_running.bytes_port[4] << 24;
+            val |= (uint64_t)chips->bitblt_running.bytes_port[3] << 32ULL;
+            val |= (uint64_t)chips->bitblt_running.bytes_port[2] << 40ULL;
+            val |= (uint64_t)chips->bitblt_running.bytes_port[1] << 48ULL;
+            val |= (uint64_t)chips->bitblt_running.bytes_port[0] << 56ULL;
+
+            chips->bitblt_running.bytes_written = 0;
+
+            for (i = 0; i < 64; i++) {
+                chips_69000_process_mono_bit(chips, !!(val & (1 << (63 - i))));
+                if (orig_count_y != chips->bitblt_running.count_y) {
+                    cycles = orig_cycles;
+                    return;
+                }
+            }
+        }
+        cycles = orig_cycles;
+        return;
+    }
+
+    chips->bitblt_running.bytes_counter++;
+    if (chips->bitblt_running.bytes_counter <= (chips->bitblt_running.bitblt.source_addr)) {
+        return;
+    }
+    chips->bitblt_running.bytes_port[chips->bitblt_running.bytes_written++] = data;
+    if (chips->bitblt_running.bytes_written == chips->bitblt_running.bytes_per_pixel) {
+        int orig_cycles = cycles;
+        uint32_t source_pixel = chips->bitblt_running.bytes_port[0];
+        chips->bitblt_running.bytes_written = 0;
+        if (chips->bitblt_running.bytes_per_pixel >= 2)
+            source_pixel |= (chips->bitblt_running.bytes_port[1] << 8);
+        if (chips->bitblt_running.bytes_per_pixel >= 3)
+            source_pixel |= (chips->bitblt_running.bytes_port[2] << 16);
+
+        chips->bitblt_running.bytes_in_line_written += chips->bitblt_running.bytes_per_pixel;
+
+        chips_69000_process_pixel(chips, source_pixel);
+        cycles = orig_cycles;
+        chips->bitblt_running.x += chips->bitblt_running.x_dir;
+
+        if (chips->bitblt_running.bytes_in_line_written >= chips->bitblt_running.bitblt.destination_width) {
+            if (chips->bitblt_running.bytes_skip) {
+                chips->bitblt_running.bitblt.source_addr = chips->bitblt_running.bytes_skip;
+            }
+            else if (chips->bitblt_running.bitblt.destination_width & 7)
+                chips->bitblt_running.bitblt.source_addr = 8 - ((chips->bitblt_running.bitblt.destination_width) & 7);
+            else
+                chips->bitblt_running.bitblt.source_addr = 0;
+
+            chips->bitblt_running.y += chips->bitblt_running.y_dir;
+            chips->bitblt_running.count_y++;
+            chips->bitblt_running.bytes_counter = 0;
+            chips->bitblt_running.bytes_in_line_written = 0;
+
+            chips->bitblt_running.count_x = 0;
+            chips->bitblt_running.x = 0;
+
+            if (chips->bitblt_running.count_y >= chips->bitblt_running.actual_destination_height) {
+                chips_69000_bitblt_interrupt(chips);
+                return;
+            }
+        }
+    }
+}
+
+uint8_t
+chips_69000_read_ext_reg(chips_69000_t* chips)
+{
+    uint8_t index = chips->ext_index;
+    uint8_t val = chips->ext_regs[index];
+    switch (index) {
+        case 0x00:
+            val = 0x2C;
+            break;
+        case 0x01:
+            val = 0x10;
+            break;
+        case 0x02:
+            val = 0xC0;
+            break;
+        case 0x03:
+            val = 0x00;
+            break;
+        case 0x04:
+            val = 0x62;
+            break;
+        case 0x05:
+            val = 0x00;
+            break;
+        case 0x06:
+            val = chips->linear_mapping.base >> 24;
+            break;
+        case 0x08:
+            val = 0x02;
+            break;
+        case 0x0A:
+            val = chips->ext_regs[index] & 0x37;
+            break;
+        case 0x20:
+            val &= ~1;
+            val |= !!chips->engine_active;
+            /* TODO: Handle BitBLT reset, if required. */
+            break;
+        case 0x63:
+            {
+                val = chips->ext_regs[index];
+                if (!(chips->ext_regs[0x62] & 0x8))
+                    val = (val & ~8) | (i2c_gpio_get_scl(chips->i2c) << 3);
+
+                if (!(chips->ext_regs[0x62] & 0x4))
+                    val = (val & ~4) | (i2c_gpio_get_sda(chips->i2c) << 2);
+
+                break;
+            }
+        case 0x70:
+            val = 0x3;
+            break;
+        case 0x71:
+            val = 0b01101000;
+            break;
+        case 0xD0:
+            val |= 1;
+            break;
+    }
+    return val;
+}
+
+void
+chips_69000_write_ext_reg(chips_69000_t* chips, uint8_t val)
+{
+    switch (chips->ext_index) {
+        case 0xA:
+            chips->ext_regs[chips->ext_index] = val & 0x37;
+            chips_69000_recalc_banking(chips);
+            break;
+        case 0xB:
+            chips->ext_regs[chips->ext_index] = val & 0xD;
+            break;
+        case 0xE:
+            chips->ext_regs[chips->ext_index] = val & 0x7f;
+            chips_69000_recalc_banking(chips);
+            break;
+        case 0x9:
+            chips->ext_regs[chips->ext_index] = val & 0x3;
+            svga_recalctimings(&chips->svga);
+            break;
+        case 0x40:
+            chips->ext_regs[chips->ext_index] = val & 0x3;
+            chips_69000_recalc_banking(chips);
+            svga_recalctimings(&chips->svga);
+            break;
+        case 0x60:
+            chips->ext_regs[chips->ext_index] = val & 0x43;
+            break;
+        case 0x20:
+            chips->ext_regs[chips->ext_index] = val & 0x3f;
+            break;
+        case 0x61:
+            chips->ext_regs[chips->ext_index] = val & 0x7f;
+            svga_recalctimings(&chips->svga);
+            break;
+        case 0x62:
+            chips->ext_regs[chips->ext_index] = val & 0x9C;
+            break;
+        case 0x63:
+            {
+                uint8_t scl = 0, sda = 0;
+                if (chips->ext_regs[0x62] & 0x8)
+                    scl = !!(val & 8);
+                else
+                    scl = i2c_gpio_get_scl(chips->i2c);
+
+                if (chips->ext_regs[0x62] & 0x4)
+                    sda = !!(val & 4);
+                else
+                    scl = i2c_gpio_get_sda(chips->i2c);
+
+                i2c_gpio_set(chips->i2c, scl, sda);
+
+                chips->ext_regs[chips->ext_index] = val & 0x9F;
+                break;
+            }
+        case 0x67:
+            chips->ext_regs[chips->ext_index] = val & 0x2;
+            break;
+        case 0x80:
+            chips->ext_regs[chips->ext_index] = val & 0xBF;
+            svga_set_ramdac_type(&chips->svga, (val & 0x80) ? RAMDAC_8BIT : RAMDAC_6BIT);
+            break;
+        case 0x81:
+            chips->ext_regs[chips->ext_index] = val & 0x1f;
+            svga_recalctimings(&chips->svga);
+            break;
+        case 0x82:
+            chips->ext_regs[chips->ext_index] = val & 0xf;
+            chips->svga.lut_map = !!(val & 0x8);
+            break;
+        case 0xA0:
+            chips->ext_regs[chips->ext_index] = val;
+            chips->svga.hwcursor.ena = ((val & 7) == 0b101) || ((val & 7) == 0b1);
+            chips->svga.hwcursor.cur_xsize = chips->svga.hwcursor.cur_ysize = ((val & 7) == 0b1) ? 32 : 64;
+            break;
+        case 0xA2:
+            chips->ext_regs[chips->ext_index] = val;
+            chips->svga.hwcursor.addr = (val << 8) | ((chips->ext_regs[0xA3] & 0x3F) << 16);
+            break;
+        case 0xA3:
+            chips->ext_regs[chips->ext_index] = val;
+            chips->svga.hwcursor.addr = ((chips->ext_regs[0xA2]) << 8) | ((val & 0x3F) << 16);
+            break;
+        case 0xA4:
+            chips->ext_regs[chips->ext_index] = val;
+            chips->svga.hwcursor.x = val | (chips->ext_regs[0xA5] & 7) << 8;
+            if (chips->ext_regs[0xA5] & 0x80)
+                chips->svga.hwcursor.x = -chips->svga.hwcursor.x;
+            break;
+        case 0xA5:
+            chips->ext_regs[chips->ext_index] = val;
+            chips->svga.hwcursor.x = chips->ext_regs[0xA4] | (val & 7) << 8;
+            if (chips->ext_regs[0xA5] & 0x80)
+                chips->svga.hwcursor.x = -chips->svga.hwcursor.x;
+            break;
+        case 0xA6:
+            chips->ext_regs[chips->ext_index] = val;
+            chips->svga.hwcursor.y = val | (chips->ext_regs[0xA7] & 7) << 8;
+            if (chips->ext_regs[0xA7] & 0x80) {
+                chips->svga.hwcursor.y = -chips->svga.hwcursor.y;
+            }
+            break;
+        case 0xA7:
+            chips->ext_regs[chips->ext_index] = val;
+            chips->svga.hwcursor.y = chips->ext_regs[0xA6] | (val & 7) << 8;
+            if (chips->ext_regs[0xA7] & 0x80) {
+                chips->svga.hwcursor.y = -chips->svga.hwcursor.y;
+            }
+            break;
+        case 0xC8:
+        case 0xC9:
+        case 0xCB:
+            chips->ext_regs[chips->ext_index] = val;
+            svga_recalctimings(&chips->svga);
+            break;
+        case 0xD2:
+            break;
+        default:
+            chips->ext_regs[chips->ext_index] = val;
+            break;
+    }
+}
+
+void
+chips_69000_out(uint16_t addr, uint8_t val, void *priv)
+{
+    chips_69000_t  *chips  = (chips_69000_t *) priv;
+    svga_t *svga = &chips->svga;
+    uint8_t old, index;
+
+    if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
+        addr ^= 0x60;
+
+    switch (addr) {
+        case 0x3c0:
+            if (!(chips->ext_regs[0x09] & 0x02))
+                break;
+            svga->attraddr = val & 31;
+            if ((val & 0x20) != svga->attr_palette_enable) {
+                svga->fullchange          = 3;
+                svga->attr_palette_enable = val & 0x20;
+                svga_recalctimings(svga);
+            }
+            return;
+        case 0x3c1:
+            if ((chips->ext_regs[0x09] & 0x02))
+            {
+                svga->attrff = 1;
+                svga_out(addr, val, svga);
+                svga->attrff = 0;
+                return;
+            }
+            break;
+        case 0x3c9:
+            if (!(chips->ext_regs[0x80] & 0x01))
+                break;
+            if (svga->adv_flags & FLAG_RAMDAC_SHIFT)
+                val <<= 2;
+            svga->fullchange = svga->monitor->mon_changeframecount;
+            switch (svga->dac_pos) {
+                case 0:
+                    svga->dac_r = val;
+                    svga->dac_pos++;
+                    break;
+                case 1:
+                    svga->dac_g = val;
+                    svga->dac_pos++;
+                    break;
+                case 2:
+                    index                 = svga->dac_addr & 7;
+                    chips->cursor_palette[index].r = svga->dac_r;
+                    chips->cursor_palette[index].g = svga->dac_g;
+                    chips->cursor_palette[index].b = val;
+                    if (svga->ramdac_type == RAMDAC_8BIT)
+                        chips->cursor_pallook[index] = makecol32(chips->cursor_palette[index].r, chips->cursor_palette[index].g, chips->cursor_palette[index].b);
+                    else
+                        chips->cursor_pallook[index] = makecol32(video_6to8[chips->cursor_palette[index].r & 0x3f], video_6to8[chips->cursor_palette[index].g & 0x3f], video_6to8[chips->cursor_palette[index].b & 0x3f]);
+                    svga->dac_pos  = 0;
+                    svga->dac_addr = (svga->dac_addr + 1) & 255;
+                    break;
+            }
+            return;
+        case 0x3c5:
+            svga_out(addr, val, svga);
+            chips_69000_recalc_banking(chips);
+            return;
+        case 0x3D0:
+            chips->flat_panel_index = val;
+            return;
+        case 0x3D1:
+            return chips_69000_write_flat_panel(chips, val);
+        case 0x3D2:
+            chips->mm_index = val;
+            return;
+        case 0x3D3:
+            return chips_69000_write_multimedia(chips, val);
+        case 0x3D4:
+            svga->crtcreg = val & 0xff;
+            return;
+        case 0x3D5:
+            if ((svga->crtcreg < 7) && (svga->crtc[0x11] & 0x80))
+                return;
+            if ((svga->crtcreg == 7) && (svga->crtc[0x11] & 0x80))
+                val = (svga->crtc[7] & ~0x10) | (val & 0x10);
+            old                       = svga->crtc[svga->crtcreg];
+            svga->crtc[svga->crtcreg] = val;
+            if (old != val) {
+                if (svga->crtcreg < 0xe || svga->crtcreg > 0x10) {
+                    if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
+                        svga->fullchange = 3;
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                    } else {
+                        svga->fullchange = changeframecount;
+                        svga_recalctimings(svga);
+                    }
+                }
+            }
+            break;
+        case 0x3B6:
+        case 0x3D6:
+            chips->ext_index = val;
+            return;
+        case 0x3B7:
+        case 0x3D7:
+            return chips_69000_write_ext_reg(chips, val);
+
+    }
+    svga_out(addr, val, svga);
+}
+
+uint8_t
+chips_69000_in(uint16_t addr, void *priv)
+{
+    chips_69000_t  *chips  = (chips_69000_t *) priv;
+    svga_t *svga = &chips->svga;
+    uint8_t temp = 0, index;
+
+    if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
+        addr ^= 0x60;
+
+    switch (addr) {
+        case 0x3C5:
+            return svga->seqregs[svga->seqaddr];
+        case 0x3c9:
+            if (!(chips->ext_regs[0x80] & 0x01)) {
+                temp = svga_in(addr, svga);
+                break;
+            }
+            index = (svga->dac_addr - 1) & 7;
+            switch (svga->dac_pos) {
+                case 0:
+                    svga->dac_pos++;
+                    if (svga->ramdac_type == RAMDAC_8BIT)
+                        temp = chips->cursor_palette[index].r;
+                    else
+                        temp = chips->cursor_palette[index].r & 0x3f;
+                    break;
+                case 1:
+                    svga->dac_pos++;
+                    if (svga->ramdac_type == RAMDAC_8BIT)
+                        temp = chips->cursor_palette[index].g;
+                    else
+                        temp = chips->cursor_palette[index].g & 0x3f;
+                    break;
+                case 2:
+                    svga->dac_pos  = 0;
+                    svga->dac_addr = (svga->dac_addr + 1) & 255;
+                    if (svga->ramdac_type == RAMDAC_8BIT)
+                        temp = chips->cursor_palette[index].b;
+                    else
+                        temp = chips->cursor_palette[index].b & 0x3f;
+                    break;
+            }
+            if (svga->adv_flags & FLAG_RAMDAC_SHIFT)
+                temp >>= 2;
+            break;
+        case 0x3D0:
+            return chips->flat_panel_index;
+        case 0x3D1:
+            return chips_69000_read_flat_panel(chips);
+        case 0x3D2:
+            return chips->mm_index;
+        case 0x3D3:
+            return chips_69000_read_multimedia(chips);
+        case 0x3D4:
+            temp = svga->crtcreg;
+            break;
+        case 0x3D5:
+            if (svga->crtcreg & 0x20)
+                temp = 0xff;
+            else
+                temp = svga->crtc[svga->crtcreg];
+            break;
+        case 0x3B6:
+        case 0x3D6:
+            temp = chips->ext_index;
+            break;
+        case 0x3B7:
+        case 0x3D7:
+            temp = chips_69000_read_ext_reg(chips);
+            break;
+        default:
+            temp = svga_in(addr, svga);
+            break;
+    }
+    return temp;
+}
+
+static uint8_t
+chips_69000_pci_read(UNUSED(int func), int addr, void *priv)
+{
+    chips_69000_t *chips = (chips_69000_t *) priv;
+    uint8_t        ret   = 0x00;
+
+    switch (addr) {
+        case 0x00:
+            ret = 0x2c;
+            break;
+        case 0x01:
+            ret = 0x10;
+            break;
+        case 0x02:
+            ret = 0xc0;
+            break;
+        case 0x03:
+            ret = 0x00;
+            break;
+
+        case 0x04:
+            ret = (chips->pci_conf_status & 0x73) | 0x80;
+            break;
+        case 0x05:
+            ret = chips->pci_regs[addr] & 0x01;
+            break;
+        case 0x06:
+            ret = 0x80;
+            break;
+        case 0x07:
+            ret = chips->pci_regs[addr] | 0x02;
+            break;
+
+        case 0x0b:
+            ret = 0x03;
+            break;
+
+        case 0x13:
+            ret = chips->linear_mapping.base >> 24;
+            break;
+
+        case 0x2c ... 0x2d:
+        case 0x6c ... 0x6d:
+            ret = chips->subsys_vid_b[addr & 1];
+            break;
+        case 0x2e ... 0x2f:
+        case 0x6e ... 0x6f:
+            ret = chips->subsys_pid_b[addr & 1];
+            break;
+
+        case 0x30:
+            ret = chips->pci_rom_enable & 0x1;
+            break;
+        case 0x32:
+            ret = chips->rom_addr & 0xff;
+            break;
+        case 0x33:
+            ret = (chips->rom_addr & 0xff00) >> 8;
+            break;
+
+        case 0x3c:
+            ret = chips->pci_line_interrupt;
+            break;
+        case 0x3d:
+            ret = 0x01;
+            break;
+
+        default:
+            break;
+    }
+
+    return ret;
+}
+
+static void
+chips_69000_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
+{
+    chips_69000_t *chips = (chips_69000_t *) priv;
+
+    switch (addr) {
+        case 0x04:
+            chips->pci_conf_status = val;
+            io_removehandler(0x03c0, 0x0020, chips_69000_in, NULL, NULL, chips_69000_out, NULL, NULL, chips);
+            mem_mapping_disable(&chips->linear_mapping);
+            mem_mapping_disable(&chips->svga.mapping);
+            if (!chips->on_board)
+                mem_mapping_disable(&chips->bios_rom.mapping);
+            if (val & PCI_COMMAND_IO)
+                io_sethandler(0x03c0, 0x0020, chips_69000_in, NULL, NULL, chips_69000_out, NULL, NULL, chips);
+            if (val & PCI_COMMAND_MEM) {
+                if (!chips->on_board && (chips->pci_rom_enable & 1))
+                    mem_mapping_set_addr(&chips->bios_rom.mapping, chips->rom_addr << 16, 0x10000);
+                mem_mapping_enable(&chips->svga.mapping);
+                if (chips->linear_mapping.base > 0x00000000)
+                    mem_mapping_set_addr(&chips->linear_mapping, chips->linear_mapping.base, (1 << 24));
+            }
+            break;
+        case 0x05:
+            chips->pci_regs[addr] = val & 0x01;
+            break;
+        case 0x07:
+            chips->pci_regs[addr] &= ~(val & 0xc8);
+            break;
+
+        case 0x13:
+            mem_mapping_disable(&chips->linear_mapping);
+            chips->linear_mapping.base = val << 24;
+            if ((chips->pci_conf_status & PCI_COMMAND_MEM) &&
+                (chips->linear_mapping.base > 0x00000000))
+                mem_mapping_set_addr(&chips->linear_mapping, chips->linear_mapping.base, (1 << 24));
+            break;
+
+        case 0x30:
+            if (!chips->on_board) {
+                chips->pci_rom_enable = val & 0x1;
+                mem_mapping_disable(&chips->bios_rom.mapping);
+                if ((chips->pci_conf_status & PCI_COMMAND_MEM) &&
+                    (chips->pci_rom_enable & 1))
+                    mem_mapping_set_addr(&chips->bios_rom.mapping, chips->rom_addr << 16, 0x10000);
+            }
+            break;
+        case 0x32:
+            if (!chips->on_board) {
+                chips->rom_addr &= ~0xff;
+                chips->rom_addr |= val & 0xfc;
+                if ((chips->pci_conf_status & PCI_COMMAND_MEM) &&
+                    (chips->pci_rom_enable & 1))
+                    mem_mapping_set_addr(&chips->bios_rom.mapping, chips->rom_addr << 16, 0x10000);
+            }
+            break;
+        case 0x33:
+            if (!chips->on_board) {
+                chips->rom_addr &= ~0xff00;
+                chips->rom_addr |= (val << 8);
+                if ((chips->pci_conf_status & PCI_COMMAND_MEM) &&
+                    (chips->pci_rom_enable & 1))
+                    mem_mapping_set_addr(&chips->bios_rom.mapping, chips->rom_addr << 16, 0x10000);
+            }
+            break;
+
+        case 0x3c:
+            chips->pci_line_interrupt = val;
+            break;
+
+        case 0x6c ... 0x6d:
+            chips->subsys_vid_b[addr & 1] = val;
+            break;
+        case 0x6e ... 0x6f:
+            chips->subsys_pid_b[addr & 1] = val;
+            break;
+    }
+}
+
+uint8_t
+chips_69000_readb_mmio(uint32_t addr, chips_69000_t* chips)
+{
+    addr &= 0xFFF;
+    switch (addr & 0xFFF) {
+        case 0x00 ... 0x2B:
+            if (addr == 0x13) {
+                return (chips->bitblt_regs_b[addr & 0xFF] & 0x7F) | (chips->engine_active ? 0x80 : 0x00);
+            }
+            return chips->bitblt_regs_b[addr & 0xFF];
+        case 0x3b:
+            return (chips->engine_active ? 0x80 : 0x00);
+        case 0x38:
+            return 0x7F;
+        case 0x600 ... 0x60F:
+            return chips->mem_regs_b[addr & 0xF];
+        case 0x768:
+            return chips_69000_in(0x3b4, chips);
+        case 0x769:
+            return chips_69000_in(0x3b5, chips);
+        case 0x774:
+            return chips_69000_in(0x3ba, chips);
+        case 0x780:
+            return chips_69000_in(0x3c0, chips);
+        case 0x781:
+            return chips_69000_in(0x3c1, chips);
+        case 0x784:
+            return chips_69000_in(0x3c2, chips);
+        case 0x788:
+            return chips_69000_in(0x3c4, chips);
+        case 0x789:
+            return chips_69000_in(0x3c5, chips);
+        case 0x78C:
+            return chips_69000_in(0x3c6, chips);
+        case 0x78D:
+            return chips_69000_in(0x3c7, chips);
+        case 0x790:
+            return chips_69000_in(0x3c8, chips);
+        case 0x791:
+            return chips_69000_in(0x3c9, chips);
+        case 0x794:
+            return chips_69000_in(0x3ca, chips);
+        case 0x798:
+            return chips_69000_in(0x3cc, chips);
+        case 0x79C:
+            return chips_69000_in(0x3ce, chips);
+        case 0x79D:
+            return chips_69000_in(0x3cf, chips);
+        case 0x7A0:
+            return chips_69000_in(0x3d0, chips);
+        case 0x7A1:
+            return chips_69000_in(0x3d1, chips);
+        case 0x7A4:
+            return chips_69000_in(0x3d2, chips);
+        case 0x7A5:
+            return chips_69000_in(0x3d3, chips);
+        case 0x7A8:
+            return chips_69000_in(0x3d4, chips);
+        case 0x7A9:
+            return chips_69000_in(0x3d5, chips);
+        case 0x7AC:
+            return chips_69000_in(0x3d6, chips);
+        case 0x7AD:
+            return chips_69000_in(0x3d7, chips);
+        case 0x7B4:
+            return chips_69000_in(0x3da, chips);
+    }
+    return 0x00;
+}
+
+uint16_t
+chips_69000_readw_mmio(uint32_t addr, chips_69000_t* chips)
+{
+    addr &= 0xFFF;
+    switch (addr & 0xFFF) {
+        default:
+            return chips_69000_readb_mmio(addr, chips) | (chips_69000_readb_mmio(addr + 1, chips) << 8);
+    }
+    return 0xFFFF;
+}
+
+uint32_t
+chips_69000_readl_mmio(uint32_t addr, chips_69000_t* chips)
+{
+    addr &= 0xFFF;
+    switch (addr & 0xFFF) {
+        default:
+            return chips_69000_readw_mmio(addr, chips) | (chips_69000_readw_mmio(addr + 2, chips) << 16);
+    }
+    return 0xFFFFFFFF;
+}
+
+void
+chips_69000_writeb_mmio(uint32_t addr, uint8_t val, chips_69000_t* chips)
+{
+    //pclog("C&T Write 0x%X, val = 0x%02X\n", addr, val);
+    if (addr & 0x10000) {
+        chips_69000_bitblt_write(chips, val);
+        return;
+    }
+    addr &= 0xFFF;
+    switch (addr & 0xFFF) {
+        case 0x00 ... 0x2B:
+            if (addr <= 0x3) {
+                //pclog("[%04X:%08X] C&T Write span 0x%X, val = 0x%02X\n", CS, cpu_state.pc, addr, val);
+            }
+            chips->bitblt_regs_b[addr & 0xFF] = val;
+            if ((addr & 0xFFF) == 0x023 && chips->bitblt_regs[0x8] != 0) {
+                chips_69000_setup_bitblt(chips);
+            }
+            break;
+        default:
+            pclog("C&T Write (unknown) 0x%X, val = 0x%02X\n", addr, val);
+            break;
+        case 0x600 ... 0x60F:
+            switch (addr & 0xFFF)
+            {
+                case 0x600 ... 0x603:
+                {
+                    chips->mem_regs_b[addr & 0xF] = val;
+                    chips->mem_regs[(addr >> 2) & 0x3] &= 0x80004040;
+                    if (addr == 0x601 || addr == 0x603)
+                        chips_69000_interrupt(chips);
+                    break;
+                }
+
+                case 0x604 ... 0x607:
+                {
+                    chips->mem_regs_b[addr & 0xF] &= ~val;
+                    chips->mem_regs[(addr >> 2) & 0x3] &= 0x80004040;
+                    if (addr == 0x605 || addr == 0x607)
+                        chips_69000_interrupt(chips);
+                    break;
+                }
+
+                case 0x60c ... 0x60f:
+                {
+                    chips->mem_regs_b[addr & 0xF] = val;
+                    break;
+                }
+
+            }
+            chips->mem_regs_b[addr & 0xF] = val;
+            break;
+        case 0x768:
+            chips_69000_out(0x3b4, val, chips); break;
+        case 0x769:
+            chips_69000_out(0x3b5, val, chips); break;
+        case 0x774:
+            chips_69000_out(0x3ba, val, chips); break;
+        case 0x780:
+            chips_69000_out(0x3c0, val, chips); break;
+        case 0x781:
+            chips_69000_out(0x3c1, val, chips); break;
+        case 0x784:
+            chips_69000_out(0x3c2, val, chips); break;
+        case 0x788:
+            chips_69000_out(0x3c4, val, chips); break;
+        case 0x789:
+            chips_69000_out(0x3c5, val, chips); break;
+        case 0x78C:
+            chips_69000_out(0x3c6, val, chips); break;
+        case 0x78D:
+            chips_69000_out(0x3c7, val, chips); break;
+        case 0x790:
+            chips_69000_out(0x3c8, val, chips); break;
+        case 0x791:
+            chips_69000_out(0x3c9, val, chips); break;
+        case 0x794:
+            chips_69000_out(0x3ca, val, chips); break;
+        case 0x798:
+            chips_69000_out(0x3cc, val, chips); break;
+        case 0x79C:
+            chips_69000_out(0x3ce, val, chips); break;
+        case 0x79D:
+            chips_69000_out(0x3cf, val, chips); break;
+        case 0x7A0:
+            chips_69000_out(0x3d0, val, chips); break;
+        case 0x7A1:
+            chips_69000_out(0x3d1, val, chips); break;
+        case 0x7A4:
+            chips_69000_out(0x3d2, val, chips); break;
+        case 0x7A5:
+            chips_69000_out(0x3d3, val, chips); break;
+        case 0x7A8:
+            chips_69000_out(0x3d4, val, chips); break;
+        case 0x7A9:
+            chips_69000_out(0x3d5, val, chips); break;
+        case 0x7AC:
+            chips_69000_out(0x3d6, val, chips); break;
+        case 0x7AD:
+            chips_69000_out(0x3d7, val, chips); break;
+        case 0x7B4:
+            chips_69000_out(0x3da, val, chips); break;
+    }
+}
+
+void
+chips_69000_writew_mmio(uint32_t addr, uint16_t val, chips_69000_t* chips)
+{
+    if (addr & 0x10000) {
+        if ((chips->bitblt_running.bitblt.bitblt_control & (1 << 12))) {
+            //pclog("BitBLT mono 0x%04X\n", val);
+        }
+        chips_69000_bitblt_write(chips, val & 0xFF);
+        chips_69000_bitblt_write(chips, (val >> 8) & 0xFF);
+        return;
+    }
+    addr &= 0xFFF;
+    switch (addr & 0xFFF) {
+        default:
+            chips_69000_writeb_mmio(addr, val, chips);
+            chips_69000_writeb_mmio(addr + 1, val >> 8, chips);
+            break;
+    }
+}
+
+void
+chips_69000_writel_mmio(uint32_t addr, uint32_t val, chips_69000_t* chips)
+{
+    if (addr & 0x10000) {
+        if ((chips->bitblt_running.bitblt.bitblt_control & (1 << 12))) {
+            //pclog("BitBLT mono 0x%08X\n", val);
+        }
+        chips_69000_bitblt_write(chips, val & 0xFF);
+        chips_69000_bitblt_write(chips, (val >> 8) & 0xFF);
+        chips_69000_bitblt_write(chips, (val >> 16) & 0xFF);
+        chips_69000_bitblt_write(chips, (val >> 24) & 0xFF);
+        return;
+    }
+    addr &= 0xFFF;
+    switch (addr & 0xFFF) {
+        default:
+            chips_69000_writew_mmio(addr, val, chips);
+            chips_69000_writew_mmio(addr + 2, val >> 16, chips);
+            break;
+    }
+}
+
+uint8_t
+chips_69000_readb_linear(uint32_t addr, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    chips_69000_t  *chips  = (chips_69000_t *) svga->priv;
+
+    if (addr & 0x400000)
+        return chips_69000_readb_mmio(addr, chips);
+
+    return svga_readb_linear(addr & 0x1FFFFF, priv);
+}
+
+uint16_t
+chips_69000_readw_linear(uint32_t addr, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    chips_69000_t  *chips  = (chips_69000_t *) svga->priv;
+
+    if (addr & 0x800000) {
+        if (addr & 0x400000)
+            return bswap16(chips_69000_readw_mmio(addr, chips));
+
+        return bswap16(svga_readw_linear(addr & 0x1FFFFF, priv));
+    }
+
+    if (addr & 0x400000)
+        return chips_69000_readw_mmio(addr, chips);
+
+    return svga_readw_linear(addr & 0x1FFFFF, priv);
+}
+
+uint32_t
+chips_69000_readl_linear(uint32_t addr, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    chips_69000_t  *chips  = (chips_69000_t *) svga->priv;
+
+    if (addr & 0x800000) {
+        if (addr & 0x400000)
+            return bswap32(chips_69000_readl_mmio(addr, chips));
+
+        return bswap32(svga_readl_linear(addr & 0x1FFFFF, priv));
+    }
+
+    if (addr & 0x400000)
+        return chips_69000_readl_mmio(addr, chips);
+
+    return svga_readl_linear(addr & 0x1FFFFF, priv);
+}
+
+void
+chips_69000_writeb_linear(uint32_t addr, uint8_t val, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    chips_69000_t  *chips  = (chips_69000_t *) svga->priv;
+
+    if (addr & 0x400000)
+        return chips_69000_writeb_mmio(addr, val, chips);
+
+    svga_writeb_linear(addr & 0x1FFFFF, val, priv);
+}
+
+void
+chips_69000_writew_linear(uint32_t addr, uint16_t val, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    chips_69000_t  *chips  = (chips_69000_t *) svga->priv;
+
+    if (addr & 0x800000)
+        val = bswap16(val);
+
+    if (addr & 0x400000)
+        return chips_69000_writew_mmio(addr, val, chips);
+
+    svga_writew_linear(addr & 0x1FFFFF, val, priv);
+}
+
+void
+chips_69000_writel_linear(uint32_t addr, uint32_t val, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    chips_69000_t  *chips  = (chips_69000_t *) svga->priv;
+
+    if (addr & 0x800000)
+        val = bswap32(val);
+
+    if (addr & 0x400000)
+        return chips_69000_writel_mmio(addr, val, chips);
+
+    svga_writel_linear(addr & 0x1FFFFF, val, priv);
+}
+
+void
+chips_69000_vblank_start(svga_t *svga)
+{
+    chips_69000_t  *chips  = (chips_69000_t *) svga->priv;
+    chips->mem_regs[1] |= 1 << 14;
+    chips->svga.crtc[0x40] &= ~0x80;
+
+    chips_69000_interrupt(chips);
+}
+
+static void
+chips_69000_hwcursor_draw_64x64(svga_t *svga, int displine)
+{
+    chips_69000_t    *chips  = (chips_69000_t *) svga->priv;
+    uint64_t          dat[2];
+    int               offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff;
+
+    if (svga->interlace && svga->hwcursor_oddeven)
+        svga->hwcursor_latch.addr += 16;
+
+    dat[1] = bswap64(*(uint64_t *) (&svga->vram[svga->hwcursor_latch.addr]));
+    dat[0] = bswap64(*(uint64_t *) (&svga->vram[svga->hwcursor_latch.addr + 8]));
+    svga->hwcursor_latch.addr += 16;
+
+    for (uint8_t x = 0; x < 64; x++) {
+        if (!(dat[1] & (1ULL << 63)))
+            svga->monitor->target_buffer->line[displine][(offset + svga->x_add) & 2047] = (dat[0] & (1ULL << 63)) ? svga_lookup_lut_ram(svga, chips->cursor_pallook[5]) : svga_lookup_lut_ram(svga, chips->cursor_pallook[4]);
+        else if (dat[0] & (1ULL << 63))
+            svga->monitor->target_buffer->line[displine][(offset + svga->x_add) & 2047] ^= 0xffffff;
+
+        offset++;
+        dat[0] <<= 1;
+        dat[1] <<= 1;
+    }
+
+    if (svga->interlace && !svga->hwcursor_oddeven)
+        svga->hwcursor_latch.addr += 16;
+}
+
+static void
+chips_69000_hwcursor_draw(svga_t *svga, int displine)
+{
+    chips_69000_t    *chips  = (chips_69000_t *) svga->priv;
+    uint64_t          dat[2];
+    int               offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff;
+
+    if ((chips->ext_regs[0xa0] & 7) == 0b101)
+        return chips_69000_hwcursor_draw_64x64(svga, displine);
+
+    if (svga->interlace) {
+        dat[1] = bswap64(*(uint64_t *) (&svga->vram[svga->hwcursor_latch.addr]));
+        dat[0] = bswap64(*(uint64_t *) (&svga->vram[svga->hwcursor_latch.addr + 8]));
+        svga->hwcursor_latch.addr += 16;
+        if (svga->hwcursor_oddeven) {
+            dat[1] <<= 32ULL;
+            dat[0] <<= 32ULL;
+        }
+        for (uint8_t x = 0; x < 32; x++) {
+            if (!(dat[1] & (1ULL << 63)))
+                svga->monitor->target_buffer->line[displine & 2047][(offset + svga->x_add) & 2047] = (dat[0] & (1ULL << 63)) ? svga_lookup_lut_ram(svga, chips->cursor_pallook[5]) : svga_lookup_lut_ram(svga, chips->cursor_pallook[4]);
+            else if (dat[0] & (1ULL << 63))
+                svga->monitor->target_buffer->line[displine & 2047][(offset + svga->x_add) & 2047] ^= 0xffffff;
+
+            offset++;
+            dat[0] <<= 1;
+            dat[1] <<= 1;
+        }
+        return;
+    }
+
+    if ((svga->hwcursor_on & 1)) {
+        dat[1] = bswap64(*(uint64_t *) (&svga->vram[svga->hwcursor_latch.addr - 16]));
+        dat[0] = bswap64(*(uint64_t *) (&svga->vram[(svga->hwcursor_latch.addr - 16) + 8]));
+        dat[1] <<= 32ULL;
+        dat[0] <<= 32ULL;
+    }
+    else {
+        dat[1] = bswap64(*(uint64_t *) (&svga->vram[svga->hwcursor_latch.addr]));
+        dat[0] = bswap64(*(uint64_t *) (&svga->vram[svga->hwcursor_latch.addr + 8]));
+        svga->hwcursor_latch.addr += 16;
+    }
+
+    for (uint8_t x = 0; x < 32; x++) {
+        if (!(dat[1] & (1ULL << 63)))
+            svga->monitor->target_buffer->line[displine & 2047][(offset + svga->x_add) & 2047] = (dat[0] & (1ULL << 63)) ? svga_lookup_lut_ram(svga, chips->cursor_pallook[5]) : svga_lookup_lut_ram(svga, chips->cursor_pallook[4]);
+        else if (dat[0] & (1ULL << 63))
+            svga->monitor->target_buffer->line[displine & 2047][(offset + svga->x_add) & 2047] ^= 0xffffff;
+
+        offset++;
+        dat[0] <<= 1;
+        dat[1] <<= 1;
+    }
+}
+
+static float
+chips_69000_getclock(int clock, void *priv)
+{
+    const chips_69000_t *chips = (chips_69000_t *) priv;
+
+    if (clock == 0)
+        return 25175000.0;
+    if (clock == 1)
+        return 28322000.0;
+
+    int m  = chips->ext_regs[0xc8];
+    int n  = chips->ext_regs[0xc9];
+    int pl = ((chips->ext_regs[0xcb] >> 4) & 7);
+
+    float fvco = 14318181.0 * ((float)(m + 2) / (float)(n + 2));
+    if (!(chips->ext_regs[0xcb] & 4))
+        fvco *= 4.0;
+    float fo   = fvco / (float)(1 << pl);
+
+    return fo;
+}
+
+uint32_t
+chips_69000_conv_16to32(svga_t* svga, uint16_t color, uint8_t bpp)
+{
+    uint32_t ret = 0x00000000;
+
+    if (svga->lut_map) {
+        if (bpp == 15) {
+            uint8_t b = getcolr(svga->pallook[(color & 0x1f) << 3]);
+            uint8_t g = getcolg(svga->pallook[(color & 0x3e0) >> 2]);
+            uint8_t r = getcolb(svga->pallook[(color & 0x7c00) >> 7]);
+            ret = (video_15to32[color] & 0xFF000000) | makecol(r, g, b);
+        } else {
+            uint8_t b = getcolr(svga->pallook[(color & 0x1f) << 3]);
+            uint8_t g = getcolg(svga->pallook[(color & 0x7e0) >> 3]);
+            uint8_t r = getcolb(svga->pallook[(color & 0xf800) >> 8]);
+            ret = (video_16to32[color] & 0xFF000000) | makecol(r, g, b);
+        }
+    } else
+        ret = (bpp == 15) ? video_15to32[color] : video_16to32[color];
+
+    return ret;
+}
+
+static int
+chips_69000_line_compare(svga_t* svga)
+{
+    const chips_69000_t *chips = (chips_69000_t *) svga->priv;
+    if (chips->ext_regs[0x81] & 0xF) {
+        return 0;
+    }
+
+    return 1;
+}
+
+static void
+chips_69000_disable_handlers(chips_69000_t *chips)
+{
+    io_removehandler(0x03c0, 0x0020, chips_69000_in, NULL, NULL, chips_69000_out, NULL, NULL, chips);
+
+    mem_mapping_disable(&chips->linear_mapping);
+    mem_mapping_disable(&chips->svga.mapping);
+    if (!chips->on_board)
+        mem_mapping_disable(&chips->bios_rom.mapping);
+
+    chips->linear_mapping.base = 0;
+
+    /* Save all the mappings and the timers because they are part of linked lists. */
+    reset_state->linear_mapping   = chips->linear_mapping;
+    reset_state->svga.mapping     = chips->svga.mapping;
+    reset_state->bios_rom.mapping = chips->bios_rom.mapping;
+
+    reset_state->decrement_timer  = chips->decrement_timer;
+    reset_state->svga.timer       = chips->svga.timer;
+    reset_state->svga.timer_8514  = chips->svga.timer_8514;
+    reset_state->svga.timer_xga   = chips->svga.timer_xga;
+}
+
+static void
+chips_69000_reset(void *priv)
+{
+    chips_69000_t *chips = (chips_69000_t *) priv;
+
+    if (reset_state != NULL) {
+        chips_69000_disable_handlers(chips);
+        reset_state->slot = chips->slot;
+
+        *chips = *reset_state;
+    }
+}
+
+static void *
+chips_69000_init(const device_t *info)
+{
+    chips_69000_t *chips = calloc(1, sizeof(chips_69000_t));
+    reset_state = calloc(1, sizeof(chips_69000_t));
+
+    /* Appears to have an odd VBIOS size. */
+    if (!info->local) {
+        rom_init(&chips->bios_rom, "roms/video/chips/69000.ROM", 0xc0000, 0x10000, 0xffff, 0x0000, MEM_MAPPING_EXTERNAL);
+        mem_mapping_disable(&chips->bios_rom.mapping);
+    }
+
+    video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_chips);
+
+    svga_init(info, &chips->svga, chips, 1 << 21, /*2048kb*/
+              chips_69000_recalctimings,
+              chips_69000_in, chips_69000_out,
+              chips_69000_hwcursor_draw,
+              NULL);
+
+    io_sethandler(0x03c0, 0x0020, chips_69000_in, NULL, NULL, chips_69000_out, NULL, NULL, chips);
+
+    pci_add_card(info->local ? PCI_ADD_VIDEO : PCI_ADD_NORMAL, chips_69000_pci_read, chips_69000_pci_write, chips, &chips->slot);
+
+    chips->svga.bpp              = 8;
+    chips->svga.miscout          = 1;
+    chips->svga.vsync_callback   = chips_69000_vblank_start;
+    chips->svga.getclock         = chips_69000_getclock;
+    chips->svga.conv_16to32      = chips_69000_conv_16to32;
+    chips->svga.line_compare     = chips_69000_line_compare;
+
+    mem_mapping_add(&chips->linear_mapping, 0, 0, chips_69000_readb_linear, chips_69000_readw_linear, chips_69000_readl_linear, chips_69000_writeb_linear, chips_69000_writew_linear, chips_69000_writel_linear, NULL, MEM_MAPPING_EXTERNAL, chips);
+
+    chips->quit            = 0;
+    chips->engine_active   = 0;
+    chips->on_board        = !!(info->local);
+
+    chips->svga.packed_chain4 = 1;
+
+    timer_add(&chips->decrement_timer, chips_69000_decrement_timer, chips, 0);
+    timer_on_auto(&chips->decrement_timer, 1000000. / 2000.);
+
+    chips->i2c = i2c_gpio_init("ddc_chips_69000");
+    chips->ddc = ddc_init(i2c_gpio_get_bus(chips->i2c));
+
+    chips->flat_panel_regs[0x01] = 1;
+
+    chips->pci_conf_status = 0x00;
+    chips->pci_rom_enable  = 0x00;
+    chips->rom_addr        = 0x0000;
+    chips->subsys_vid      = 0x102c;
+    chips->subsys_pid      = 0x00c0;
+
+    io_removehandler(0x03c0, 0x0020, chips_69000_in, NULL, NULL, chips_69000_out, NULL, NULL, chips);
+    mem_mapping_disable(&chips->linear_mapping);
+    mem_mapping_disable(&chips->svga.mapping);
+    if (!chips->on_board)
+        mem_mapping_disable(&chips->bios_rom.mapping);
+
+    *reset_state = *chips;
+
+    return chips;
+}
+
+static int
+chips_69000_available(void)
+{
+    return rom_present("roms/video/chips/69000.ROM");
+}
+
+void
+chips_69000_close(void *priv)
+{
+    chips_69000_t *chips = (chips_69000_t *) priv;
+
+    chips->quit = 1;
+//    thread_set_event(chips->fifo_event);
+ //   thread_wait(chips->accel_thread);
+    ddc_close(chips->ddc);
+    i2c_gpio_close(chips->i2c);
+    svga_close(&chips->svga);
+
+    free(reset_state);
+    reset_state = NULL;
+
+    free(chips);
+}
+
+void
+chips_69000_speed_changed(void *priv)
+{
+    chips_69000_t *chips = (chips_69000_t *) priv;
+
+    svga_recalctimings(&chips->svga);
+}
+
+void
+chips_69000_force_redraw(void *priv)
+{
+    chips_69000_t *chips = (chips_69000_t *) priv;
+
+    chips->svga.fullchange = chips->svga.monitor->mon_changeframecount;
+}
+
+const device_t chips_69000_device = {
+    .name          = "Chips & Technologies B69000",
+    .internal_name = "chips_69000",
+    .flags         = DEVICE_PCI,
+    .local         = 0,
+    .init          = chips_69000_init,
+    .close         = chips_69000_close,
+    .reset         = chips_69000_reset,
+    .available     = chips_69000_available,
+    .speed_changed = chips_69000_speed_changed,
+    .force_redraw  = chips_69000_force_redraw,
+    .config        = NULL
+};
+
+const device_t chips_69000_onboard_device = {
+    .name          = "Chips & Technologies B69000 On-Board",
+    .internal_name = "chips_69000_onboard",
+    .flags         = DEVICE_PCI,
+    .local         = 1,
+    .init          = chips_69000_init,
+    .close         = chips_69000_close,
+    .reset         = chips_69000_reset,
+    .available     = chips_69000_available,
+    .speed_changed = chips_69000_speed_changed,
+    .force_redraw  = chips_69000_force_redraw,
+    .config        = NULL
+};
diff --git a/src/video/vid_cl54xx.c b/src/video/vid_cl54xx.c
index 49899b7b4..0a43ab4ce 100644
--- a/src/video/vid_cl54xx.c
+++ b/src/video/vid_cl54xx.c
@@ -33,16 +33,19 @@
 #include <86box/pci.h>
 #include <86box/rom.h>
 #include <86box/device.h>
+#include <86box/machine.h>
 #include <86box/timer.h>
 #include <86box/video.h>
 #include <86box/i2c.h>
 #include <86box/vid_ddc.h>
+#include <86box/vid_xga.h>
 #include <86box/vid_svga.h>
 #include <86box/vid_svga_render.h>
 #include <86box/plat_fallthrough.h>
 #include <86box/plat_unused.h>
 
 #define BIOS_GD5401_PATH                "roms/video/cirruslogic/avga1.rom"
+#define BIOS_GD5401_ONBOARD_PATH        "roms/machines/drsm35286/qpaw01-6658237d5e3c2611427518.bin"
 #define BIOS_GD5402_PATH                "roms/video/cirruslogic/avga2.rom"
 #define BIOS_GD5402_ONBOARD_PATH        "roms/machines/cmdsl386sx25/c000.rom"
 #define BIOS_GD5420_PATH                "roms/video/cirruslogic/5420.vbi"
@@ -248,6 +251,7 @@ typedef struct gd54xx_t {
     uint8_t status;
     uint8_t extensions;
     uint8_t crtcreg_mask;
+    uint8_t aperture_mask;
 
     uint8_t fc; /* Feature Connector */
 
@@ -258,6 +262,8 @@ typedef struct gd54xx_t {
 
     uint8_t pos_regs[8];
 
+    uint32_t vlb_lfb_base;
+
     uint32_t lfb_base;
     uint32_t vgablt_base;
 
@@ -270,9 +276,15 @@ typedef struct gd54xx_t {
     void *ddc;
 } gd54xx_t;
 
-static video_timings_t timing_gd54xx_isa = { .type = VIDEO_ISA, .write_b = 3, .write_w = 3, .write_l = 6, .read_b = 8, .read_w = 8, .read_l = 12 };
-static video_timings_t timing_gd54xx_vlb = { .type = VIDEO_BUS, .write_b = 4, .write_w = 4, .write_l = 8, .read_b = 10, .read_w = 10, .read_l = 20 };
-static video_timings_t timing_gd54xx_pci = { .type = VIDEO_PCI, .write_b = 4, .write_w = 4, .write_l = 8, .read_b = 10, .read_w = 10, .read_l = 20 };
+static video_timings_t timing_gd54xx_isa = { .type = VIDEO_ISA,
+                                             .write_b = 3, .write_w = 3, .write_l = 6,
+                                             .read_b = 8, .read_w = 8, .read_l = 12 };
+static video_timings_t timing_gd54xx_vlb = { .type = VIDEO_BUS,
+                                             .write_b = 4, .write_w = 4, .write_l = 8,
+                                             .read_b = 10, .read_w = 10, .read_l = 20 };
+static video_timings_t timing_gd54xx_pci = { .type = VIDEO_PCI, .write_b = 4,
+                                             .write_w = 4, .write_l = 8, .read_b = 10,
+                                             .read_w = 10, .read_l = 20 };
 
 static void
 gd543x_mmio_write(uint32_t addr, uint8_t val, void *priv);
@@ -511,7 +523,8 @@ gd54xx_interrupt_enabled(gd54xx_t *gd54xx)
 static int
 gd54xx_vga_vsync_enabled(gd54xx_t *gd54xx)
 {
-    if (!(gd54xx->svga.crtc[0x11] & 0x20) && (gd54xx->svga.crtc[0x11] & 0x10) && gd54xx_interrupt_enabled(gd54xx))
+    if (!(gd54xx->svga.crtc[0x11] & 0x20) && (gd54xx->svga.crtc[0x11] & 0x10) &&
+        gd54xx_interrupt_enabled(gd54xx))
         return 1;
     return 0;
 }
@@ -563,7 +576,7 @@ gd54xx_overlay_draw(svga_t *svga, int displine)
     uint8_t        *src         = &svga->vram[(svga->overlay_latch.addr << shift) & svga->vram_mask];
     int             bpp         = svga->bpp;
     int             bytesperpix = (bpp + 7) / 8;
-    uint8_t        *src2        = &svga->vram[(svga->ma - (svga->hdisp * bytesperpix)) & svga->vram_display_mask];
+    uint8_t        *src2        = &svga->vram[(svga->memaddr - (svga->hdisp * bytesperpix)) & svga->vram_display_mask];
     int             occl;
     int             ckval;
 
@@ -572,7 +585,8 @@ gd54xx_overlay_draw(svga_t *svga, int displine)
 
     OVERLAY_SAMPLE();
 
-    for (int x = 0; (x < gd54xx->overlay.region2size) && ((x + gd54xx->overlay.region1size) < svga->hdisp); x++) {
+    for (int x = 0; (x < gd54xx->overlay.region2size) &&
+                    ((x + gd54xx->overlay.region1size) < svga->hdisp); x++) {
         if (gd54xx->overlay.occlusion) {
             occl  = 1;
             ckval = gd54xx->overlay.ck;
@@ -614,8 +628,10 @@ gd54xx_update_overlay(gd54xx_t *gd54xx)
     int     bpp  = svga->bpp;
 
     svga->overlay.cur_ysize     = gd54xx->overlay.wve - gd54xx->overlay.wvs + 1;
-    gd54xx->overlay.region1size = 32 * gd54xx->overlay.r1sz / bpp + (gd54xx->overlay.r1adjust * 8 / bpp);
-    gd54xx->overlay.region2size = 32 * gd54xx->overlay.r2sz / bpp + (gd54xx->overlay.r2adjust * 8 / bpp);
+    gd54xx->overlay.region1size = 32 * gd54xx->overlay.r1sz / bpp +
+                                  (gd54xx->overlay.r1adjust * 8 / bpp);
+    gd54xx->overlay.region2size = 32 * gd54xx->overlay.r2sz / bpp +
+                                  (gd54xx->overlay.r2adjust * 8 / bpp);
 
     gd54xx->overlay.occlusion = (svga->crtc[0x3e] & 0x80) != 0 && svga->bpp <= 16;
 
@@ -623,7 +639,8 @@ gd54xx_update_overlay(gd54xx_t *gd54xx)
     if (gd54xx->overlay.colorkeymode == 0)
         gd54xx->overlay.ck = gd54xx->overlay.colorkeycompare;
     else if (gd54xx->overlay.colorkeymode == 1)
-        gd54xx->overlay.ck = gd54xx->overlay.colorkeycompare | (gd54xx->overlay.colorkeycomparemask << 8);
+        gd54xx->overlay.ck = gd54xx->overlay.colorkeycompare |
+        (gd54xx->overlay.colorkeycomparemask << 8);
     else
         gd54xx->overlay.occlusion = 0;
 }
@@ -632,7 +649,8 @@ gd54xx_update_overlay(gd54xx_t *gd54xx)
 static int
 gd54xx_has_transp(svga_t *svga, int mask)
 {
-    if (((svga->crtc[0x27] == CIRRUS_ID_CLGD5446) || (svga->crtc[0x27] == CIRRUS_ID_CLGD5480)) && !mask)
+    if (((svga->crtc[0x27] == CIRRUS_ID_CLGD5446) || (svga->crtc[0x27] == CIRRUS_ID_CLGD5480)) &&
+        !mask)
         return 1; /* 5446 and 5480 have mask but not transparency. */
     if ((svga->crtc[0x27] == CIRRUS_ID_CLGD5426) || (svga->crtc[0x27] == CIRRUS_ID_CLGD5428))
         return 1; /* 5426 and 5428 have both. */
@@ -698,12 +716,17 @@ gd54xx_out(uint16_t addr, uint8_t val, void *priv)
                 if (svga->attraddr == 0x10 || svga->attraddr == 0x14 || svga->attraddr < 0x10) {
                     for (uint8_t c = 0; c < 16; c++) {
                         if (svga->attrregs[0x10] & 0x80)
-                            svga->egapal[c] = (svga->attrregs[c] & 0xf) | ((svga->attrregs[0x14] & 0xf) << 4);
+                            svga->egapal[c] = (svga->attrregs[c] & 0xf) |
+                                              ((svga->attrregs[0x14] & 0xf) << 4);
                         else
-                            svga->egapal[c] = (svga->attrregs[c] & 0x3f) | ((svga->attrregs[0x14] & 0xc) << 4);
+                            svga->egapal[c] = (svga->attrregs[c] & 0x3f) |
+                                              ((svga->attrregs[0x14] & 0xc) << 4);
                     }
                 }
-                /* Recalculate timings on change of attribute register 0x11 (overscan border color) too. */
+                /*
+                   Recalculate timings on change of attribute register
+                   0x11 (overscan border color) too.
+                 */
                 if (svga->attraddr == 0x10) {
                     if (o != val)
                         svga_recalctimings(svga);
@@ -793,20 +816,28 @@ gd54xx_out(uint16_t addr, uint8_t val, void *priv)
                         svga_recalctimings(svga);
                         svga->hwcursor.ena = val & CIRRUS_CURSOR_SHOW;
                         if (svga->crtc[0x27] >= CIRRUS_ID_CLGD5422)
-                            svga->hwcursor.cur_xsize = svga->hwcursor.cur_ysize = ((val & CIRRUS_CURSOR_LARGE) && (svga->crtc[0x27] >= CIRRUS_ID_CLGD5422)) ? 64 : 32;
+                            svga->hwcursor.cur_xsize = svga->hwcursor.cur_ysize =
+                                ((svga->crtc[0x27] >= CIRRUS_ID_CLGD5422) &&
+                                 (val & CIRRUS_CURSOR_LARGE)) ? 64 : 32;
                         else
                             svga->hwcursor.cur_xsize = 32;
 
-                        if ((svga->seqregs[0x12] & CIRRUS_CURSOR_LARGE) && (svga->crtc[0x27] >= CIRRUS_ID_CLGD5422))
-                            svga->hwcursor.addr = ((gd54xx->vram_size - 0x4000) + ((svga->seqregs[0x13] & 0x3c) * 256));
+                        if ((svga->crtc[0x27] >= CIRRUS_ID_CLGD5422) &&
+                            (svga->seqregs[0x12] & CIRRUS_CURSOR_LARGE))
+                            svga->hwcursor.addr = ((gd54xx->vram_size - 0x4000) +
+                                                  ((svga->seqregs[0x13] & 0x3c) * 256));
                         else
-                            svga->hwcursor.addr = ((gd54xx->vram_size - 0x4000) + ((svga->seqregs[0x13] & 0x3f) * 256));
+                            svga->hwcursor.addr = ((gd54xx->vram_size - 0x4000) +
+                                                  ((svga->seqregs[0x13] & 0x3f) * 256));
                         break;
                     case 0x13:
-                        if ((svga->seqregs[0x12] & CIRRUS_CURSOR_LARGE) && (svga->crtc[0x27] >= CIRRUS_ID_CLGD5422))
-                            svga->hwcursor.addr = ((gd54xx->vram_size - 0x4000) + ((val & 0x3c) * 256));
+                        if ((svga->crtc[0x27] >= CIRRUS_ID_CLGD5422) &&
+                            (svga->seqregs[0x12] & CIRRUS_CURSOR_LARGE))
+                            svga->hwcursor.addr = ((gd54xx->vram_size - 0x4000) +
+                                                  ((val & 0x3c) * 256));
                         else
-                            svga->hwcursor.addr = ((gd54xx->vram_size - 0x4000) + ((val & 0x3f) * 256));
+                            svga->hwcursor.addr = ((gd54xx->vram_size - 0x4000) +
+                                                  ((val & 0x3f) * 256));
                         break;
                     case 0x07:
                         svga->packed_chain4 = svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA;
@@ -816,7 +847,7 @@ gd54xx_out(uint16_t addr, uint8_t val, void *priv)
                             svga->seqregs[svga->seqaddr] &= 0x0f;
                         if (svga->crtc[0x27] >= CIRRUS_ID_CLGD5429)
                             svga->set_reset_disabled = svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA;
-                        gd54xx_recalc_banking(gd54xx);
+
                         gd54xx_set_svga_fast(gd54xx);
                         svga_recalctimings(svga);
                         break;
@@ -868,7 +899,9 @@ gd54xx_out(uint16_t addr, uint8_t val, void *priv)
                         gd54xx->extpal[index].r   = svga->dac_r;
                         gd54xx->extpal[index].g   = svga->dac_g;
                         gd54xx->extpal[index].b   = val;
-                        gd54xx->extpallook[index] = makecol32(video_6to8[gd54xx->extpal[index].r & 0x3f], video_6to8[gd54xx->extpal[index].g & 0x3f], video_6to8[gd54xx->extpal[index].b & 0x3f]);
+                        gd54xx->extpallook[index] = makecol32(video_6to8[gd54xx->extpal[index].r & 0x3f],
+                                                              video_6to8[gd54xx->extpal[index].g & 0x3f],
+                                                              video_6to8[gd54xx->extpal[index].b & 0x3f]);
                         if (svga->ext_overscan && (index == 2)) {
                             o32                  = svga->overscan_color;
                             svga->overscan_color = gd54xx->extpallook[2];
@@ -879,7 +912,9 @@ gd54xx_out(uint16_t addr, uint8_t val, void *priv)
                         svga->vgapal[index].r = svga->dac_r;
                         svga->vgapal[index].g = svga->dac_g;
                         svga->vgapal[index].b = val;
-                        svga->pallook[index]  = makecol32(video_6to8[svga->vgapal[index].r & 0x3f], video_6to8[svga->vgapal[index].g & 0x3f], video_6to8[svga->vgapal[index].b & 0x3f]);
+                        svga->pallook[index]  = makecol32(video_6to8[svga->vgapal[index].r & 0x3f],
+                                                          video_6to8[svga->vgapal[index].g & 0x3f],
+                                                          video_6to8[svga->vgapal[index].b & 0x3f]);
                     }
                     svga->dac_addr = (svga->dac_addr + 1) & 255;
                     svga->dac_pos  = 0;
@@ -894,7 +929,8 @@ gd54xx_out(uint16_t addr, uint8_t val, void *priv)
             svga->gdcaddr = val /* & 0x3f*/;
             return;
         case 0x3cf:
-            if ((svga->gdcaddr > 0x1f) && ((svga->crtc[0x27] <= CIRRUS_ID_CLGD5422) || (svga->crtc[0x27] == CIRRUS_ID_CLGD5424)))
+            if (((svga->crtc[0x27] <= CIRRUS_ID_CLGD5422) || (svga->crtc[0x27] == CIRRUS_ID_CLGD5424)) &&
+                (svga->gdcaddr > 0x1f))
                 return;
 
             o = svga->gdcreg[svga->gdcaddr];
@@ -940,7 +976,8 @@ gd54xx_out(uint16_t addr, uint8_t val, void *priv)
 
                 gd54xx_set_svga_fast(gd54xx);
 
-                if (((svga->gdcaddr == 5) && ((val ^ o) & 0x70)) || ((svga->gdcaddr == 6) && ((val ^ o) & 1)))
+                if (((svga->gdcaddr == 5) && ((val ^ o) & 0x70)) ||
+                    ((svga->gdcaddr == 6) && ((val ^ o) & 1)))
                     svga_recalctimings(svga);
             } else {
                 switch (svga->gdcaddr) {
@@ -1101,7 +1138,10 @@ gd54xx_out(uint16_t addr, uint8_t val, void *priv)
             svga->crtcreg = val & gd54xx->crtcreg_mask;
             return;
         case 0x3d5:
-            if (((svga->crtcreg == 0x19) || (svga->crtcreg == 0x1a) || (svga->crtcreg == 0x1b) || (svga->crtcreg == 0x1d) || (svga->crtcreg == 0x25) || (svga->crtcreg == 0x27)) && !gd54xx->unlocked)
+            if (!gd54xx->unlocked &&
+                ((svga->crtcreg == 0x19) || (svga->crtcreg == 0x1a) ||
+                 (svga->crtcreg == 0x1b) || (svga->crtcreg == 0x1d) ||
+                 (svga->crtcreg == 0x25) || (svga->crtcreg == 0x27)))
                 return;
             if ((svga->crtcreg == 0x25) || (svga->crtcreg == 0x27))
                 return;
@@ -1216,7 +1256,8 @@ gd54xx_out(uint16_t addr, uint8_t val, void *priv)
                 if (svga->crtcreg < 0xe || svga->crtcreg > 0x10) {
                     if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) +
+                                           ((svga->crtc[8] & 0x60) >> 5);
                     } else {
                         svga->fullchange = changeframecount;
                         svga_recalctimings(svga);
@@ -1282,7 +1323,8 @@ gd54xx_in(uint16_t addr, void *priv)
                                 ret |= 0x80;
                         }
                         break;
-                    case 0x0a: /*Scratch Pad 1 (Memory size for 5402/542x)*/
+                    case 0x0a:
+                        /* Scratch Pad 1 (Memory size for 5402/542x) */
                         ret = svga->seqregs[0x0a] & ~0x1a;
                         if (svga->crtc[0x27] == CIRRUS_ID_CLGD5402) {
                             ret |= 0x01; /*512K of memory*/
@@ -1309,17 +1351,21 @@ gd54xx_in(uint16_t addr, void *priv)
                     case 0x0e:
                         ret = gd54xx->vclk_n[svga->seqaddr - 0x0b];
                         break;
-                    case 0x0f: /*DRAM control*/
+                    case 0x0f: /* DRAM control */
                         ret = svga->seqregs[0x0f] & ~0x98;
                         switch (gd54xx->vram_size >> 10) {
                             case 512:
-                                ret |= 0x08; /*16-bit DRAM data bus width*/
+                                ret |= 0x08; /* 16-bit DRAM data bus width */
                                 break;
                             case 1024:
-                                ret |= 0x10; /*32-bit DRAM data bus width for 1M of memory*/
+                                ret |= 0x10; /* 32-bit DRAM data bus width for 1M of memory */
                                 break;
                             case 2048:
-                                ret |= (gd54xx_is_5434(svga)) ? 0x98 : 0x18; /*32-bit (Pre-5434)/64-bit (5434 and up) DRAM data bus width for 2M of memory*/
+                                /*
+                                   32-bit (Pre-5434)/64-bit (5434 and up) DRAM data bus width
+                                   for 2M of memory
+                                 */
+                                ret |= 0x18;
                                 break;
                             case 4096:
                                 ret |= 0x98; /*64-bit (5434 and up) DRAM data bus width for 4M of memory*/
@@ -1351,7 +1397,8 @@ gd54xx_in(uint16_t addr, void *priv)
                     case 0x17:
                         ret = svga->seqregs[0x17] & ~(7 << 3);
                         if (svga->crtc[0x27] <= CIRRUS_ID_CLGD5429) {
-                            if ((svga->crtc[0x27] == CIRRUS_ID_CLGD5428) || (svga->crtc[0x27] == CIRRUS_ID_CLGD5426)) {
+                            if ((svga->crtc[0x27] == CIRRUS_ID_CLGD5428) ||
+                                (svga->crtc[0x27] == CIRRUS_ID_CLGD5426)) {
                                 if (gd54xx->vlb)
                                     ret |= (CL_GD5428_SYSTEM_BUS_VESA << 3);
                                 else if (gd54xx->mca)
@@ -1452,7 +1499,9 @@ gd54xx_in(uint16_t addr, void *priv)
             if (svga->gdcaddr >= 0x10) {
                 if ((svga->gdcaddr > 8) && !gd54xx->unlocked)
                     ret = 0xff;
-                else if ((svga->gdcaddr > 0x1f) && ((svga->crtc[0x27] <= CIRRUS_ID_CLGD5422) || (svga->crtc[0x27] == CIRRUS_ID_CLGD5424)))
+                else if (((svga->crtc[0x27] <= CIRRUS_ID_CLGD5422) ||
+                          (svga->crtc[0x27] == CIRRUS_ID_CLGD5424)) &&
+                         (svga->gdcaddr > 0x1f))
                     ret = 0xff;
                 else
                     switch (svga->gdcaddr) {
@@ -1582,7 +1631,10 @@ gd54xx_in(uint16_t addr, void *priv)
             break;
         case 0x3d5:
             ret = svga->crtc[svga->crtcreg];
-            if (((svga->crtcreg == 0x19) || (svga->crtcreg == 0x1a) || (svga->crtcreg == 0x1b) || (svga->crtcreg == 0x1d) || (svga->crtcreg == 0x25) || (svga->crtcreg == 0x27)) && !gd54xx->unlocked)
+            if (((svga->crtcreg == 0x19) || (svga->crtcreg == 0x1a) ||
+                (svga->crtcreg == 0x1b) || (svga->crtcreg == 0x1d) ||
+                (svga->crtcreg == 0x25) || (svga->crtcreg == 0x27)) &&
+                !gd54xx->unlocked)
                 ret = 0xff;
             else
                 switch (svga->crtcreg) {
@@ -1600,7 +1652,8 @@ gd54xx_in(uint16_t addr, void *priv)
                         ret = svga->crtc[0x27]; /*GD542x/GD543x*/
                         break;
                     case 0x28: /*Class ID*/
-                        if ((svga->crtc[0x27] == CIRRUS_ID_CLGD5430) || (svga->crtc[0x27] == CIRRUS_ID_CLGD5440))
+                        if ((svga->crtc[0x27] == CIRRUS_ID_CLGD5430) ||
+                            (svga->crtc[0x27] == CIRRUS_ID_CLGD5440))
                             ret = 0xff; /*Standard CL-GD5430/40*/
                         break;
 
@@ -1629,30 +1682,33 @@ gd54xx_recalc_banking(gd54xx_t *gd54xx)
         else
             svga->extra_banks[1] = svga->extra_banks[0] + 0x8000;
     } else {
-        if ((svga->gdcreg[0x0b] & CIRRUS_BANKING_GRANULARITY_16K) && (svga->crtc[0x27] >= CIRRUS_ID_CLGD5426) && (svga->crtc[0x27] != CIRRUS_ID_CLGD5424))
+        if ((svga->crtc[0x27] >= CIRRUS_ID_CLGD5426) && (svga->crtc[0x27] != CIRRUS_ID_CLGD5424) &&
+            (svga->gdcreg[0x0b] & CIRRUS_BANKING_GRANULARITY_16K))
             svga->extra_banks[0] = svga->gdcreg[0x09] << 14;
         else
             svga->extra_banks[0] = svga->gdcreg[0x09] << 12;
 
         if (svga->gdcreg[0x0b] & CIRRUS_BANKING_DUAL) {
-            if ((svga->gdcreg[0x0b] & CIRRUS_BANKING_GRANULARITY_16K) && (svga->crtc[0x27] >= CIRRUS_ID_CLGD5426) && (svga->crtc[0x27] != CIRRUS_ID_CLGD5424))
+            if ((svga->crtc[0x27] >= CIRRUS_ID_CLGD5426) && (svga->crtc[0x27] != CIRRUS_ID_CLGD5424) &&
+                (svga->gdcreg[0x0b] & CIRRUS_BANKING_GRANULARITY_16K))
                 svga->extra_banks[1] = svga->gdcreg[0x0a] << 14;
             else
                 svga->extra_banks[1] = svga->gdcreg[0x0a] << 12;
         } else
             svga->extra_banks[1] = svga->extra_banks[0] + 0x8000;
     }
-
-    svga->write_bank = svga->read_bank = svga->extra_banks[0];
 }
 
 static void
 gd543x_recalc_mapping(gd54xx_t *gd54xx)
 {
     svga_t  *svga = &gd54xx->svga;
+    xga_t   *xga  = (xga_t *) svga->xga;
     uint32_t base;
     uint32_t size;
 
+    gd54xx->aperture_mask = 0x00;
+
     if (gd54xx->pci && (!(gd54xx->pci_regs[PCI_REG_COMMAND] & PCI_COMMAND_MEM))) {
         mem_mapping_disable(&svga->mapping);
         mem_mapping_disable(&gd54xx->linear_mapping);
@@ -1662,7 +1718,8 @@ gd543x_recalc_mapping(gd54xx_t *gd54xx)
 
     gd54xx->mmio_vram_overlap = 0;
 
-    if (!gd54xx_is_5422(svga) || !(svga->seqregs[0x07] & 0xf0) || !(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA)) {
+    if (!gd54xx_is_5422(svga) || !(svga->seqregs[0x07] & 0xf0) ||
+        !(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA)) {
         mem_mapping_disable(&gd54xx->linear_mapping);
         mem_mapping_disable(&gd54xx->aperture2_mapping);
         switch (svga->gdcreg[6] & 0x0c) {
@@ -1673,6 +1730,10 @@ gd543x_recalc_mapping(gd54xx_t *gd54xx)
             case 0x4: /*64k at A0000*/
                 mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
                 svga->banked_mask = 0xffff;
+                if (xga_active && (svga->xga != NULL)) {
+                    xga->on = 0;
+                    mem_mapping_set_handler(&svga->mapping, svga->read, svga->readw, svga->readl, svga->write, svga->writew, svga->writel);
+                }
                 break;
             case 0x8: /*32k at B0000*/
                 mem_mapping_set_addr(&svga->mapping, 0xb0000, 0x08000);
@@ -1688,7 +1749,8 @@ gd543x_recalc_mapping(gd54xx_t *gd54xx)
                 break;
         }
 
-        if ((svga->seqregs[0x17] & CIRRUS_MMIO_ENABLE) && (svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA) && (svga->crtc[0x27] >= CIRRUS_ID_CLGD5429)) {
+        if ((svga->crtc[0x27] >= CIRRUS_ID_CLGD5429) && (svga->seqregs[0x17] & CIRRUS_MMIO_ENABLE) &&
+            (svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA)) {
             if (gd54xx->mmio_vram_overlap) {
                 mem_mapping_disable(&svga->mapping);
                 mem_mapping_set_addr(&gd54xx->mmio_mapping, 0xb8000, 0x08000);
@@ -1697,7 +1759,8 @@ gd543x_recalc_mapping(gd54xx_t *gd54xx)
         } else
             mem_mapping_disable(&gd54xx->mmio_mapping);
     } else {
-        if ((svga->crtc[0x27] <= CIRRUS_ID_CLGD5429) || (!gd54xx->pci && !gd54xx->vlb)) {
+        if ((svga->crtc[0x27] <= CIRRUS_ID_CLGD5429) ||
+            (!gd54xx->pci && !gd54xx->vlb)) {
             if (svga->gdcreg[0x0b] & CIRRUS_BANKING_GRANULARITY_16K) {
                 base = (svga->seqregs[0x07] & 0xf0) << 16;
                 size = 1 * 1024 * 1024;
@@ -1717,26 +1780,38 @@ gd543x_recalc_mapping(gd54xx_t *gd54xx)
             else
                 size = 4 * 1024 * 1024;
         } else { /*VLB/ISA/MCA*/
-            base = 128 * 1024 * 1024;
+            if (gd54xx->vlb_lfb_base != 0x00000000)
+                base = gd54xx->vlb_lfb_base;
+            else
+                base = 128 * 1024 * 1024;
             if (svga->crtc[0x27] >= CIRRUS_ID_CLGD5436)
                 size = 16 * 1024 * 1024;
             else
                 size = 4 * 1024 * 1024;
         }
 
+        if (size >= (16 * 1024 * 1024))
+            gd54xx->aperture_mask = 0x03;
+
         mem_mapping_disable(&svga->mapping);
         mem_mapping_set_addr(&gd54xx->linear_mapping, base, size);
-        if ((svga->seqregs[0x17] & CIRRUS_MMIO_ENABLE) && (svga->crtc[0x27] >= CIRRUS_ID_CLGD5429)) {
+        if ((svga->seqregs[0x17] & CIRRUS_MMIO_ENABLE) &&
+            (svga->crtc[0x27] >= CIRRUS_ID_CLGD5429)) {
             if (svga->seqregs[0x17] & CIRRUS_MMIO_USE_PCIADDR)
-                mem_mapping_disable(&gd54xx->mmio_mapping); /* MMIO is handled in the linear read/write functions */
+                /* MMIO is handled in the linear read/write functions */
+                mem_mapping_disable(&gd54xx->mmio_mapping);
             else
                 mem_mapping_set_addr(&gd54xx->mmio_mapping, 0xb8000, 0x00100);
         } else
             mem_mapping_disable(&gd54xx->mmio_mapping);
 
-        if ((svga->crtc[0x27] >= CIRRUS_ID_CLGD5436) && (gd54xx->blt.status & CIRRUS_BLT_APERTURE2) && ((gd54xx->blt.mode & (CIRRUS_BLTMODE_COLOREXPAND | CIRRUS_BLTMODE_MEMSYSSRC)) == (CIRRUS_BLTMODE_COLOREXPAND | CIRRUS_BLTMODE_MEMSYSSRC))) {
+        if ((svga->crtc[0x27] >= CIRRUS_ID_CLGD5436) &&
+            (gd54xx->blt.status & CIRRUS_BLT_APERTURE2) &&
+            ((gd54xx->blt.mode & (CIRRUS_BLTMODE_COLOREXPAND | CIRRUS_BLTMODE_MEMSYSSRC)) ==
+             (CIRRUS_BLTMODE_COLOREXPAND | CIRRUS_BLTMODE_MEMSYSSRC))) {
             if (svga->crtc[0x27] == CIRRUS_ID_CLGD5480)
-                mem_mapping_set_addr(&gd54xx->aperture2_mapping, gd54xx->lfb_base + 16777216, 16777216);
+                mem_mapping_set_addr(&gd54xx->aperture2_mapping,
+                                     gd54xx->lfb_base + 16777216, 16777216);
             else
                 mem_mapping_set_addr(&gd54xx->aperture2_mapping, 0xbc000, 0x04000);
         } else
@@ -1752,21 +1827,25 @@ gd54xx_recalctimings(svga_t *svga)
     uint8_t         rdmask;
     uint8_t         linedbl = svga->dispend * 9 / 10 >= svga->hdisp;
 
-    svga->hblankstart = svga->crtc[2] + 1;
+    svga->hblankstart = svga->crtc[2];
 
     if (svga->crtc[0x1b] & ((svga->crtc[0x27] >= CIRRUS_ID_CLGD5424) ? 0xa0 : 0x20)) {
-        /* Special blanking mode: the blank start and end become components of the window generator,
-           and the actual blanking comes from the display enable signal. */
-        /* This means blanking during overscan, we already calculate it that way, so just use the
-           same calculation and force otvercan to 0. */
+        /*
+           Special blanking mode: the blank start and end become components
+           of the window generator, and the actual blanking comes from the
+           display enable signal.
+
+           This means blanking during overscan, we already calculate it that
+           way, so just use the same calculation and force otvercan to 0.
+         */
         svga->hblank_end_val = (svga->crtc[3] & 0x1f) | ((svga->crtc[5] & 0x80) ? 0x20 : 0x00) |
                                (((svga->crtc[0x1a] >> 4) & 3) << 6);
 
-        svga->hblank_end_mask = 0x0000007f;
+        svga->hblank_end_mask = 0x000000ff;
 
         if (svga->crtc[0x1b] & 0x20) {
-            svga->hblankstart = svga->crtc[1] + ((svga->crtc[3] >> 5) & 3) + 1;
-            svga->hblank_end_val = ((svga->crtc[3] >> 5) & 3);
+            svga->hblankstart = svga->crtc[1]/* + ((svga->crtc[3] >> 5) & 3) + 1*/;
+            svga->hblank_end_val = svga->htotal - 1 /* + ((svga->crtc[3] >> 5) & 3)*/;
 
             /* In this mode, the dots per clock are always 8 or 16, never 9 or 18. */
 	    if (!svga->scrblank && svga->attr_palette_enable)
@@ -1802,7 +1881,7 @@ gd54xx_recalctimings(svga_t *svga)
     } else if (svga->gdcreg[5] & 0x40)
         svga->render = svga_render_8bpp_lowres;
 
-    svga->ma_latch |= ((svga->crtc[0x1b] & 0x01) << 16) | ((svga->crtc[0x1b] & 0xc) << 15);
+    svga->memaddr_latch |= ((svga->crtc[0x1b] & 0x01) << 16) | ((svga->crtc[0x1b] & 0xc) << 15);
 
     svga->bpp = 8;
 
@@ -1896,7 +1975,8 @@ gd54xx_recalctimings(svga_t *svga)
                             break;
 
                         case CIRRUS_SR7_BPP_16:
-                            if ((svga->crtc[0x27] >= CIRRUS_ID_CLGD5428) || (svga->crtc[0x27] == CIRRUS_ID_CLGD5426)) {
+                            if ((svga->crtc[0x27] >= CIRRUS_ID_CLGD5428) ||
+                                (svga->crtc[0x27] == CIRRUS_ID_CLGD5426)) {
                                 svga->bpp = 16;
                                 if (linedbl)
                                     svga->render = svga_render_16bpp_lowres;
@@ -1948,7 +2028,8 @@ gd54xx_recalctimings(svga_t *svga)
     clocksel = (svga->miscout >> 2) & 3;
 
     if (!gd54xx->vclk_n[clocksel] || !gd54xx->vclk_d[clocksel])
-        svga->clock = (cpuclock * (float) (1ULL << 32)) / ((svga->miscout & 0xc) ? 28322000.0 : 25175000.0);
+        svga->clock = (cpuclock * (float) (1ULL << 32)) /
+                      ((svga->miscout & 0xc) ? 28322000.0 : 25175000.0);
     else {
         int     n    = gd54xx->vclk_n[clocksel] & 0x7f;
         int     d    = (gd54xx->vclk_d[clocksel] & 0x3e) >> 1;
@@ -1977,11 +2058,16 @@ gd54xx_recalctimings(svga_t *svga)
         svga->htotal += ((svga->crtc[0x1c] >> 3) & 0x07);
 
     if (!(svga->gdcreg[6] & 1) && !(svga->attrregs[0x10] & 1)) { /*Text mode*/
-        if (svga->seqregs[1] & 8) {
+        if (svga->seqregs[1] & 8)
             svga->render = svga_render_text_40;
-        } else
+        else
             svga->render = svga_render_text_80;
     }
+
+    if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA)) {
+        svga->extra_banks[0] = 0;
+        svga->extra_banks[1] = 0x8000;
+    }
 }
 
 static void
@@ -2108,10 +2194,10 @@ gd54xx_rop(gd54xx_t *gd54xx, uint8_t *res, uint8_t *dst, const uint8_t *src)
 }
 
 static uint8_t
-gd54xx_get_aperture(uint32_t addr)
+gd54xx_get_aperture(gd54xx_t *gd54xx, uint32_t addr)
 {
     uint32_t ap = addr >> 22;
-    return (uint8_t) (ap & 0x03);
+    return (uint8_t) (ap & gd54xx->aperture_mask);
 }
 
 static uint32_t
@@ -2184,41 +2270,42 @@ gd54xx_mem_sys_src_write(gd54xx_t *gd54xx, uint8_t val, uint8_t ap)
 static void
 gd54xx_write(uint32_t addr, uint8_t val, void *priv)
 {
-    gd54xx_t *gd54xx = (gd54xx_t *) priv;
-    svga_t   *svga   = &gd54xx->svga;
+    svga_t   *svga   = (svga_t *) priv;
+    gd54xx_t *gd54xx = (gd54xx_t *) svga->local;
 
-    if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
+    if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest &&
+        !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
         gd54xx_mem_sys_src_write(gd54xx, val, 0);
         return;
     }
 
-    if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA) || !(svga->gdcreg[5] & 0x40)) {
-        svga_write(addr, val, svga);
-        return;
-    }
+    xga_write_test(addr, val, svga);
 
+    addr &= svga->banked_mask;
     addr = (addr & 0x7fff) + svga->extra_banks[(addr >> 15) & 1];
-
     svga_write_linear(addr, val, svga);
 }
 
 static void
 gd54xx_writew(uint32_t addr, uint16_t val, void *priv)
 {
-    gd54xx_t *gd54xx = (gd54xx_t *) priv;
-    svga_t   *svga   = &gd54xx->svga;
+    svga_t   *svga   = (svga_t *) priv;
+    gd54xx_t *gd54xx = (gd54xx_t *) svga->local;
 
-    if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
-        gd54xx_write(addr, val, gd54xx);
-        gd54xx_write(addr + 1, val >> 8, gd54xx);
+    if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest &&
+        !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
+        if ((gd54xx->blt.mode & CIRRUS_BLTMODE_COLOREXPAND) && (gd54xx->blt.modeext & CIRRUS_BLTMODEEXT_DWORDGRANULARITY))
+            val = (val >> 8) | (val << 8);
+
+        gd54xx_write(addr, val, svga);
+        gd54xx_write(addr + 1, val >> 8, svga);
         return;
     }
 
-    if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA) || !(svga->gdcreg[5] & 0x40)) {
-        svga_writew(addr, val, svga);
-        return;
-    }
+    xga_write_test(addr, val, svga);
+    xga_write_test(addr + 1, val >> 8, svga);
 
+    addr &= svga->banked_mask;
     addr = (addr & 0x7fff) + svga->extra_banks[(addr >> 15) & 1];
 
     if (svga->writemode < 4)
@@ -2232,22 +2319,27 @@ gd54xx_writew(uint32_t addr, uint16_t val, void *priv)
 static void
 gd54xx_writel(uint32_t addr, uint32_t val, void *priv)
 {
-    gd54xx_t *gd54xx = (gd54xx_t *) priv;
-    svga_t   *svga   = &gd54xx->svga;
+    svga_t   *svga   = (svga_t *) priv;
+    gd54xx_t *gd54xx = (gd54xx_t *) svga->local;
 
-    if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
-        gd54xx_write(addr, val, gd54xx);
-        gd54xx_write(addr + 1, val >> 8, gd54xx);
-        gd54xx_write(addr + 2, val >> 16, gd54xx);
-        gd54xx_write(addr + 3, val >> 24, gd54xx);
+    if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest &&
+        !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
+        if ((gd54xx->blt.mode & CIRRUS_BLTMODE_COLOREXPAND) && (gd54xx->blt.modeext & CIRRUS_BLTMODEEXT_DWORDGRANULARITY))
+            val = ((val & 0xff000000) >> 24) | ((val & 0x00ff0000) >> 8) | ((val & 0x0000ff00) << 8) | ((val & 0x000000ff) << 24);
+
+        gd54xx_write(addr, val, svga);
+        gd54xx_write(addr + 1, val >> 8, svga);
+        gd54xx_write(addr + 2, val >> 16, svga);
+        gd54xx_write(addr + 3, val >> 24, svga);
         return;
     }
 
-    if ((svga->seqregs[0x07] & 0x01) == 0) {
-        svga_writel(addr, val, svga);
-        return;
-    }
+    xga_write_test(addr, val, svga);
+    xga_write_test(addr + 1, val >> 8, svga);
+    xga_write_test(addr + 2, val >> 16, svga);
+    xga_write_test(addr + 3, val >> 24, svga);
 
+    addr &= svga->banked_mask;
     addr = (addr & 0x7fff) + svga->extra_banks[(addr >> 15) & 1];
 
     if (svga->writemode < 4)
@@ -2296,8 +2388,10 @@ gd54xx_write_modes45(svga_t *svga, uint8_t val, uint32_t addr)
                 for (i = 0; i < 8; i++) {
                     j = (0x80 >> i);
                     if (svga->seqregs[2] & j) {
-                        svga->vram[addr + (i << 1)]     = (val & j) ? svga->gdcreg[1] : svga->gdcreg[0];
-                        svga->vram[addr + (i << 1) + 1] = (val & j) ? svga->gdcreg[0x11] : svga->gdcreg[0x10];
+                        svga->vram[addr + (i << 1)]     = (val & j) ?
+                                                              svga->gdcreg[1] : svga->gdcreg[0];
+                        svga->vram[addr + (i << 1) + 1] = (val & j) ?
+                                                              svga->gdcreg[0x11] : svga->gdcreg[0x10];
                     }
                 }
             } else {
@@ -2342,19 +2436,24 @@ gd54xx_readb_linear(uint32_t addr, void *priv)
     gd54xx_t *gd54xx = (gd54xx_t *) priv;
     svga_t   *svga   = &gd54xx->svga;
 
-    uint8_t ap = gd54xx_get_aperture(addr);
+    uint8_t ap = gd54xx_get_aperture(gd54xx, addr);
     addr &= 0x003fffff; /* 4 MB mask */
 
     if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA))
         return svga_read_linear(addr, svga);
 
     if ((addr >= (svga->vram_max - 256)) && (addr < svga->vram_max)) {
-        if ((svga->seqregs[0x17] & CIRRUS_MMIO_ENABLE) && (svga->seqregs[0x17] & CIRRUS_MMIO_USE_PCIADDR))
+        if ((svga->seqregs[0x17] & CIRRUS_MMIO_ENABLE) &&
+            (svga->seqregs[0x17] & CIRRUS_MMIO_USE_PCIADDR))
             return gd543x_mmio_read(addr & 0x000000ff, gd54xx);
     }
 
-    /* Do mem sys dest reads here if the blitter is neither paused, nor is there a second aperture. */
-    if (gd54xx->countminusone && gd54xx->blt.ms_is_dest && !gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED))
+    /*
+       Do mem sys dest reads here if the blitter is neither paused,
+       nor is there a second aperture.
+     */
+    if (gd54xx->countminusone && gd54xx->blt.ms_is_dest &&
+        !gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED))
         return gd54xx_mem_sys_dest_read(gd54xx, ap);
 
     switch (ap) {
@@ -2383,7 +2482,7 @@ gd54xx_readw_linear(uint32_t addr, void *priv)
     svga_t   *svga     = &gd54xx->svga;
     uint32_t  old_addr = addr;
 
-    uint8_t  ap = gd54xx_get_aperture(addr);
+    uint8_t  ap = gd54xx_get_aperture(gd54xx, addr);
     uint16_t temp;
 
     addr &= 0x003fffff; /* 4 MB mask */
@@ -2398,8 +2497,12 @@ gd54xx_readw_linear(uint32_t addr, void *priv)
         }
     }
 
-    /* Do mem sys dest reads here if the blitter is neither paused, nor is there a second aperture. */
-    if (gd54xx->countminusone && gd54xx->blt.ms_is_dest && !gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
+    /*
+       Do mem sys dest reads here if the blitter is neither paused,
+       nor is there a second aperture.
+     */
+    if (gd54xx->countminusone && gd54xx->blt.ms_is_dest &&
+        !gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
         temp = gd54xx_readb_linear(old_addr, priv);
         temp |= gd54xx_readb_linear(old_addr + 1, priv) << 8;
         return temp;
@@ -2433,7 +2536,7 @@ gd54xx_readl_linear(uint32_t addr, void *priv)
     svga_t   *svga     = &gd54xx->svga;
     uint32_t  old_addr = addr;
 
-    uint8_t  ap = gd54xx_get_aperture(addr);
+    uint8_t  ap = gd54xx_get_aperture(gd54xx, addr);
     uint32_t temp;
 
     addr &= 0x003fffff; /* 4 MB mask */
@@ -2448,8 +2551,12 @@ gd54xx_readl_linear(uint32_t addr, void *priv)
         }
     }
 
-    /* Do mem sys dest reads here if the blitter is neither paused, nor is there a second aperture. */
-    if (gd54xx->countminusone && gd54xx->blt.ms_is_dest && !gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
+    /*
+       Do mem sys dest reads here if the blitter is neither paused,
+       nor is there a second aperture.
+     */
+    if (gd54xx->countminusone && gd54xx->blt.ms_is_dest &&
+        !gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
         temp = gd54xx_readb_linear(old_addr, priv);
         temp |= gd54xx_readb_linear(old_addr + 1, priv) << 8;
         temp |= gd54xx_readb_linear(old_addr + 2, priv) << 16;
@@ -2490,7 +2597,7 @@ static uint8_t
 gd5436_aperture2_readb(UNUSED(uint32_t addr), void *priv)
 {
     gd54xx_t *gd54xx = (gd54xx_t *) priv;
-    uint8_t  ap = gd54xx_get_aperture(addr);
+    uint8_t  ap = gd54xx_get_aperture(gd54xx, addr);
 
     if (gd54xx->countminusone && gd54xx->blt.ms_is_dest &&
         gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED))
@@ -2537,7 +2644,7 @@ static void
 gd5436_aperture2_writeb(UNUSED(uint32_t addr), uint8_t val, void *priv)
 {
     gd54xx_t *gd54xx = (gd54xx_t *) priv;
-    uint8_t  ap = gd54xx_get_aperture(addr);
+    uint8_t  ap = gd54xx_get_aperture(gd54xx, addr);
 
     if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest &&
         gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED))
@@ -2576,7 +2683,7 @@ gd54xx_writeb_linear(uint32_t addr, uint8_t val, void *priv)
     gd54xx_t *gd54xx = (gd54xx_t *) priv;
     svga_t   *svga   = &gd54xx->svga;
 
-    uint8_t ap       = gd54xx_get_aperture(addr);
+    uint8_t ap       = gd54xx_get_aperture(gd54xx, addr);
 
     if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA)) {
         svga_write_linear(addr, val, svga);
@@ -2586,14 +2693,19 @@ gd54xx_writeb_linear(uint32_t addr, uint8_t val, void *priv)
     addr &= 0x003fffff; /* 4 MB mask */
 
     if ((addr >= (svga->vram_max - 256)) && (addr < svga->vram_max)) {
-        if ((svga->seqregs[0x17] & CIRRUS_MMIO_ENABLE) && (svga->seqregs[0x17] & CIRRUS_MMIO_USE_PCIADDR)) {
+        if ((svga->seqregs[0x17] & CIRRUS_MMIO_ENABLE) &&
+            (svga->seqregs[0x17] & CIRRUS_MMIO_USE_PCIADDR)) {
             gd543x_mmio_write(addr & 0x000000ff, val, gd54xx);
             return;
         }
     }
 
-    /* Do mem sys src writes here if the blitter is neither paused, nor is there a second aperture. */
-    if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest && !gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
+    /*
+       Do mem sys src writes here if the blitter is neither paused,
+       nor is there a second aperture.
+     */
+    if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest &&
+        !gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
         gd54xx_mem_sys_src_write(gd54xx, val, ap);
         return;
     }
@@ -2623,7 +2735,7 @@ gd54xx_writew_linear(uint32_t addr, uint16_t val, void *priv)
     gd54xx_t *gd54xx   = (gd54xx_t *) priv;
     svga_t   *svga     = &gd54xx->svga;
     uint32_t  old_addr = addr;
-    uint8_t ap         = gd54xx_get_aperture(addr);
+    uint8_t ap         = gd54xx_get_aperture(gd54xx, addr);
 
     if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA)) {
         svga_writew_linear(addr, val, svga);
@@ -2633,14 +2745,19 @@ gd54xx_writew_linear(uint32_t addr, uint16_t val, void *priv)
     addr &= 0x003fffff; /* 4 MB mask */
 
     if ((addr >= (svga->vram_max - 256)) && (addr < svga->vram_max)) {
-        if ((svga->seqregs[0x17] & CIRRUS_MMIO_ENABLE) && (svga->seqregs[0x17] & CIRRUS_MMIO_USE_PCIADDR)) {
+        if ((svga->seqregs[0x17] & CIRRUS_MMIO_ENABLE) &&
+            (svga->seqregs[0x17] & CIRRUS_MMIO_USE_PCIADDR)) {
             gd543x_mmio_writew(addr & 0x000000ff, val, gd54xx);
             return;
         }
     }
 
-    /* Do mem sys src writes here if the blitter is neither paused, nor is there a second aperture. */
-    if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest && !gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
+    /*
+       Do mem sys src writes here if the blitter is neither paused,
+       nor is there a second aperture.
+     */
+    if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest &&
+        !gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
         gd54xx_writeb_linear(old_addr, val, gd54xx);
         gd54xx_writeb_linear(old_addr + 1, val >> 8, gd54xx);
         return;
@@ -2690,7 +2807,7 @@ gd54xx_writel_linear(uint32_t addr, uint32_t val, void *priv)
     gd54xx_t *gd54xx   = (gd54xx_t *) priv;
     svga_t   *svga     = &gd54xx->svga;
     uint32_t  old_addr = addr;
-    uint8_t ap         = gd54xx_get_aperture(addr);
+    uint8_t ap         = gd54xx_get_aperture(gd54xx, addr);
 
     if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA)) {
         svga_writel_linear(addr, val, svga);
@@ -2700,14 +2817,19 @@ gd54xx_writel_linear(uint32_t addr, uint32_t val, void *priv)
     addr &= 0x003fffff; /* 4 MB mask */
 
     if ((addr >= (svga->vram_max - 256)) && (addr < svga->vram_max)) {
-        if ((svga->seqregs[0x17] & CIRRUS_MMIO_ENABLE) && (svga->seqregs[0x17] & CIRRUS_MMIO_USE_PCIADDR)) {
+        if ((svga->seqregs[0x17] & CIRRUS_MMIO_ENABLE) &&
+            (svga->seqregs[0x17] & CIRRUS_MMIO_USE_PCIADDR)) {
             gd543x_mmio_writel(addr & 0x000000ff, val, gd54xx);
             return;
         }
     }
 
-    /* Do mem sys src writes here if the blitter is neither paused, nor is there a second aperture. */
-    if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest && !gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
+    /*
+       Do mem sys src writes here if the blitter is neither paused,
+       nor is there a second aperture.
+     */
+    if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest &&
+        !gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
         gd54xx_writeb_linear(old_addr, val, gd54xx);
         gd54xx_writeb_linear(old_addr + 1, val >> 8, gd54xx);
         gd54xx_writeb_linear(old_addr + 2, val >> 16, gd54xx);
@@ -2766,15 +2888,16 @@ gd54xx_writel_linear(uint32_t addr, uint32_t val, void *priv)
 static uint8_t
 gd54xx_read(uint32_t addr, void *priv)
 {
-    gd54xx_t *gd54xx = (gd54xx_t *) priv;
-    svga_t   *svga   = &gd54xx->svga;
+    svga_t   *svga   = (svga_t *) priv;
+    gd54xx_t *gd54xx = (gd54xx_t *) svga->local;
 
-    if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA) || !(svga->gdcreg[5] & 0x40))
-        return svga_read(addr, svga);
-
-    if (gd54xx->countminusone && gd54xx->blt.ms_is_dest && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED))
+    if (gd54xx->countminusone && gd54xx->blt.ms_is_dest &&
+        !(gd54xx->blt.status & CIRRUS_BLT_PAUSED))
         return gd54xx_mem_sys_dest_read(gd54xx, 0);
 
+    (void) xga_read_test(addr, svga);
+
+    addr &= svga->banked_mask;
     addr = (addr & 0x7fff) + svga->extra_banks[(addr >> 15) & 1];
     return svga_read_linear(addr, svga);
 }
@@ -2782,19 +2905,21 @@ gd54xx_read(uint32_t addr, void *priv)
 static uint16_t
 gd54xx_readw(uint32_t addr, void *priv)
 {
-    gd54xx_t *gd54xx = (gd54xx_t *) priv;
-    svga_t   *svga   = &gd54xx->svga;
+    svga_t   *svga   = (svga_t *) priv;
+    gd54xx_t *gd54xx = (gd54xx_t *) svga->local;
     uint16_t  ret;
 
-    if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA) || !(svga->gdcreg[5] & 0x40))
-        return svga_readw(addr, svga);
-
-    if (gd54xx->countminusone && gd54xx->blt.ms_is_dest && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
-        ret = gd54xx_read(addr, priv);
-        ret |= gd54xx_read(addr + 1, priv) << 8;
+    if (gd54xx->countminusone && gd54xx->blt.ms_is_dest &&
+        !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
+        ret = gd54xx_read(addr, svga);
+        ret |= gd54xx_read(addr + 1, svga) << 8;
         return ret;
     }
 
+    (void) xga_read_test(addr, svga);
+    (void) xga_read_test(addr + 1, svga);
+
+    addr &= svga->banked_mask;
     addr = (addr & 0x7fff) + svga->extra_banks[(addr >> 15) & 1];
     return svga_readw_linear(addr, svga);
 }
@@ -2802,21 +2927,25 @@ gd54xx_readw(uint32_t addr, void *priv)
 static uint32_t
 gd54xx_readl(uint32_t addr, void *priv)
 {
-    gd54xx_t *gd54xx = (gd54xx_t *) priv;
-    svga_t   *svga   = &gd54xx->svga;
+    svga_t   *svga   = (svga_t *) priv;
+    gd54xx_t *gd54xx = (gd54xx_t *) svga->local;
     uint32_t  ret;
 
-    if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA) || !(svga->gdcreg[5] & 0x40))
-        return svga_readl(addr, svga);
-
-    if (gd54xx->countminusone && gd54xx->blt.ms_is_dest && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
-        ret = gd54xx_read(addr, priv);
-        ret |= gd54xx_read(addr + 1, priv) << 8;
-        ret |= gd54xx_read(addr + 2, priv) << 16;
-        ret |= gd54xx_read(addr + 3, priv) << 24;
+    if (gd54xx->countminusone && gd54xx->blt.ms_is_dest &&
+        !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
+        ret = gd54xx_read(addr, svga);
+        ret |= gd54xx_read(addr + 1, svga) << 8;
+        ret |= gd54xx_read(addr + 2, svga) << 16;
+        ret |= gd54xx_read(addr + 3, svga) << 24;
         return ret;
     }
 
+    (void) xga_read_test(addr, svga);
+    (void) xga_read_test(addr + 1, svga);
+    (void) xga_read_test(addr + 2, svga);
+    (void) xga_read_test(addr + 3, svga);
+
+    addr &= svga->banked_mask;
     addr = (addr & 0x7fff) + svga->extra_banks[(addr >> 15) & 1];
     return svga_readl_linear(addr, svga);
 }
@@ -2929,7 +3058,9 @@ gd543x_mmio_write(uint32_t addr, uint8_t val, void *priv)
                 else
                     gd54xx->blt.dst_addr &= 0x1fffff;
 
-                if ((svga->crtc[0x27] >= CIRRUS_ID_CLGD5436) && (gd54xx->blt.status & CIRRUS_BLT_AUTOSTART) && !(gd54xx->blt.status & CIRRUS_BLT_BUSY)) {
+                if ((svga->crtc[0x27] >= CIRRUS_ID_CLGD5436) &&
+                    (gd54xx->blt.status & CIRRUS_BLT_AUTOSTART) &&
+                    !(gd54xx->blt.status & CIRRUS_BLT_BUSY)) {
                     gd54xx->blt.status |= CIRRUS_BLT_BUSY;
                     gd54xx_start_blit(0, 0xffffffff, gd54xx, svga);
                 }
@@ -2996,7 +3127,7 @@ gd543x_mmio_write(uint32_t addr, uint8_t val, void *priv)
                 break;
         }
     } else if (gd54xx->mmio_vram_overlap)
-        gd54xx_write(addr, val, gd54xx);
+        gd54xx_write(addr, val, svga);
 }
 
 static void
@@ -3005,7 +3136,8 @@ gd543x_mmio_writeb(uint32_t addr, uint8_t val, void *priv)
     gd54xx_t *gd54xx = (gd54xx_t *) priv;
     svga_t   *svga   = &gd54xx->svga;
 
-    if (!gd543x_do_mmio(svga, addr) && !gd54xx->blt.ms_is_dest && gd54xx->countminusone && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
+    if (!gd543x_do_mmio(svga, addr) && !gd54xx->blt.ms_is_dest && gd54xx->countminusone &&
+        !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
         gd54xx_mem_sys_src_write(gd54xx, val, 0);
         return;
     }
@@ -3023,12 +3155,13 @@ gd543x_mmio_writew(uint32_t addr, uint16_t val, void *priv)
         gd543x_mmio_write(addr, val & 0xff, gd54xx);
         gd543x_mmio_write(addr + 1, val >> 8, gd54xx);
     } else if (gd54xx->mmio_vram_overlap) {
-        if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
+        if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest &&
+            !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
             gd543x_mmio_write(addr, val & 0xff, gd54xx);
             gd543x_mmio_write(addr + 1, val >> 8, gd54xx);
         } else {
-            gd54xx_write(addr, val, gd54xx);
-            gd54xx_write(addr + 1, val >> 8, gd54xx);
+            gd54xx_write(addr, val, svga);
+            gd54xx_write(addr + 1, val >> 8, svga);
         }
     }
 }
@@ -3045,16 +3178,17 @@ gd543x_mmio_writel(uint32_t addr, uint32_t val, void *priv)
         gd543x_mmio_write(addr + 2, val >> 16, gd54xx);
         gd543x_mmio_write(addr + 3, val >> 24, gd54xx);
     } else if (gd54xx->mmio_vram_overlap) {
-        if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
+        if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest &&
+            !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
             gd543x_mmio_write(addr, val & 0xff, gd54xx);
             gd543x_mmio_write(addr + 1, val >> 8, gd54xx);
             gd543x_mmio_write(addr + 2, val >> 16, gd54xx);
             gd543x_mmio_write(addr + 3, val >> 24, gd54xx);
         } else {
-            gd54xx_write(addr, val, gd54xx);
-            gd54xx_write(addr + 1, val >> 8, gd54xx);
-            gd54xx_write(addr + 2, val >> 16, gd54xx);
-            gd54xx_write(addr + 3, val >> 24, gd54xx);
+            gd54xx_write(addr, val, svga);
+            gd54xx_write(addr + 1, val >> 8, svga);
+            gd54xx_write(addr + 2, val >> 16, svga);
+            gd54xx_write(addr + 3, val >> 24, svga);
         }
     }
 }
@@ -3193,10 +3327,10 @@ gd543x_mmio_read(uint32_t addr, void *priv)
                 break;
         }
     } else if (gd54xx->mmio_vram_overlap)
-        ret = gd54xx_read(addr, gd54xx);
-    else if (gd54xx->countminusone && gd54xx->blt.ms_is_dest && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
+        ret = gd54xx_read(addr, svga);
+    else if (gd54xx->countminusone && gd54xx->blt.ms_is_dest &&
+             !(gd54xx->blt.status & CIRRUS_BLT_PAUSED))
         ret = gd54xx_mem_sys_dest_read(gd54xx, 0);
-    }
 
     return ret;
 }
@@ -3211,8 +3345,9 @@ gd543x_mmio_readw(uint32_t addr, void *priv)
     if (gd543x_do_mmio(svga, addr))
         ret = gd543x_mmio_read(addr, gd54xx) | (gd543x_mmio_read(addr + 1, gd54xx) << 8);
     else if (gd54xx->mmio_vram_overlap)
-        ret = gd54xx_read(addr, gd54xx) | (gd54xx_read(addr + 1, gd54xx) << 8);
-    else if (gd54xx->countminusone && gd54xx->blt.ms_is_dest && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
+        ret = gd54xx_read(addr, svga) | (gd54xx_read(addr + 1, svga) << 8);
+    else if (gd54xx->countminusone && gd54xx->blt.ms_is_dest &&
+             !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
         ret = gd543x_mmio_read(addr, priv);
         ret |= gd543x_mmio_read(addr + 1, priv) << 8;
         return ret;
@@ -3229,10 +3364,14 @@ gd543x_mmio_readl(uint32_t addr, void *priv)
     uint32_t  ret    = 0xffffffff;
 
     if (gd543x_do_mmio(svga, addr))
-        ret = gd543x_mmio_read(addr, gd54xx) | (gd543x_mmio_read(addr + 1, gd54xx) << 8) | (gd543x_mmio_read(addr + 2, gd54xx) << 16) | (gd543x_mmio_read(addr + 3, gd54xx) << 24);
+        ret = gd543x_mmio_read(addr, gd54xx) | (gd543x_mmio_read(addr + 1, gd54xx) << 8) |
+              (gd543x_mmio_read(addr + 2, gd54xx) << 16) |
+              (gd543x_mmio_read(addr + 3, gd54xx) << 24);
     else if (gd54xx->mmio_vram_overlap)
-        ret = gd54xx_read(addr, gd54xx) | (gd54xx_read(addr + 1, gd54xx) << 8) | (gd54xx_read(addr + 2, gd54xx) << 16) | (gd54xx_read(addr + 3, gd54xx) << 24);
-    else if (gd54xx->countminusone && gd54xx->blt.ms_is_dest && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
+        ret = gd54xx_read(addr, svga) | (gd54xx_read(addr + 1, svga) << 8) |
+              (gd54xx_read(addr + 2, gd54xx) << 16) | (gd54xx_read(addr + 3, gd54xx) << 24);
+    else if (gd54xx->countminusone && gd54xx->blt.ms_is_dest &&
+             !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
         ret = gd543x_mmio_read(addr, priv);
         ret |= gd543x_mmio_read(addr + 1, priv) << 8;
         ret |= gd543x_mmio_read(addr + 2, priv) << 16;
@@ -3374,20 +3513,25 @@ gd54xx_blit(gd54xx_t *gd54xx, uint8_t mask, uint8_t *dst, uint8_t target, int sk
     int is_transp;
     int is_bgonly;
 
-    /* skip indicates whether or not it is a pixel to be skipped (used for left skip);
+    /*
+       skip indicates whether or not it is a pixel to be skipped (used for left skip);
        mask indicates transparency or not (only when transparent comparison is enabled):
-        color expand: direct pattern bit; 1 = write, 0 = do not write
-                      (the other way around in inverse mode);
-        normal 8-bpp or 16-bpp: does not match transparent color = write,
-                                matches transparent color = do not write */
+           color expand: direct pattern bit; 1 = write, 0 = do not write
+                         (the other way around in inverse mode);
+       normal 8-bpp or 16-bpp: does not match transparent color = write,
+                               matches transparent color = do not write
+     */
 
     /* Make sure to always ignore transparency and skip in case of mem sys dest. */
-    is_transp = (gd54xx->blt.mode & CIRRUS_BLTMODE_MEMSYSDEST) ? 0 : (gd54xx->blt.mode & CIRRUS_BLTMODE_TRANSPARENTCOMP);
-    is_bgonly = (gd54xx->blt.mode & CIRRUS_BLTMODE_MEMSYSDEST) ? 0 : (gd54xx->blt.modeext & CIRRUS_BLTMODEEXT_BACKGROUNDONLY);
+    is_transp = (gd54xx->blt.mode & CIRRUS_BLTMODE_MEMSYSDEST) ?
+                    0 : (gd54xx->blt.mode & CIRRUS_BLTMODE_TRANSPARENTCOMP);
+    is_bgonly = (gd54xx->blt.mode & CIRRUS_BLTMODE_MEMSYSDEST) ?
+                    0 : (gd54xx->blt.modeext & CIRRUS_BLTMODEEXT_BACKGROUNDONLY);
     skip      = (gd54xx->blt.mode & CIRRUS_BLTMODE_MEMSYSDEST) ? 0 : skip;
 
     if (is_transp) {
-        if ((gd54xx->blt.mode & CIRRUS_BLTMODE_COLOREXPAND) && (gd54xx->blt.modeext & CIRRUS_BLTMODEEXT_COLOREXPINV))
+        if ((gd54xx->blt.mode & CIRRUS_BLTMODE_COLOREXPAND) &&
+            (gd54xx->blt.modeext & CIRRUS_BLTMODEEXT_COLOREXPINV))
             mask = !mask;
 
         /* If mask is 1 and it is not a pixel to be skipped, write it. */
@@ -3526,9 +3670,9 @@ gd54xx_mem_sys_src(gd54xx_t *gd54xx, uint32_t cpu_dat, uint32_t count)
         gd54xx->countminusone                      = 1;
         gd54xx->blt.sys_src32                      = 0x00000000;
         gd54xx->blt.sys_cnt                        = 0;
-        return;
     } else if (gd54xx->countminusone) {
-        if (!(gd54xx->blt.mode & CIRRUS_BLTMODE_COLOREXPAND) || (gd54xx->blt.modeext & CIRRUS_BLTMODEEXT_DWORDGRANULARITY)) {
+        if (!(gd54xx->blt.mode & CIRRUS_BLTMODE_COLOREXPAND) ||
+            (gd54xx->blt.modeext & CIRRUS_BLTMODEEXT_DWORDGRANULARITY)) {
             if (!gd54xx->blt.xx_count && !gd54xx->blt.x_count)
                 byte_pos = (((gd54xx->blt.mask >> 5) & 3) << 3);
             else
@@ -3552,7 +3696,8 @@ gd54xx_mem_sys_src(gd54xx_t *gd54xx, uint32_t cpu_dat, uint32_t count)
             target = *dst;
             gd54xx_rop(gd54xx, &target, &target, &exp);
             if ((gd54xx->blt.pixel_width == 3) && (gd54xx->blt.mode & CIRRUS_BLTMODE_COLOREXPAND))
-                gd54xx_blit(gd54xx, bitmask, dst, target, ((gd54xx->blt.x_count + gd54xx->blt.xx_count) < gd54xx->blt.pattern_x));
+                gd54xx_blit(gd54xx, bitmask, dst, target,
+                            ((gd54xx->blt.x_count + gd54xx->blt.xx_count) < gd54xx->blt.pattern_x));
             else
                 gd54xx_blit(gd54xx, bitmask, dst, target, (gd54xx->blt.x_count < gd54xx->blt.pattern_x));
 
@@ -3580,13 +3725,14 @@ gd54xx_mem_sys_src(gd54xx_t *gd54xx, uint32_t cpu_dat, uint32_t count)
                 if (!gd54xx->blt.x_count) {
                     gd54xx->blt.y_count = (gd54xx->blt.y_count + 1) % (gd54xx->blt.height + 1);
                     if (gd54xx->blt.y_count)
-                        gd54xx->blt.dst_addr_backup = gd54xx->blt.dst_addr + (gd54xx->blt.dst_pitch * gd54xx->blt.y_count * gd54xx->blt.dir);
-                    else {
+                        gd54xx->blt.dst_addr_backup = gd54xx->blt.dst_addr +
+                                                      (gd54xx->blt.dst_pitch * gd54xx->blt.y_count *
+                                                       gd54xx->blt.dir);
+                    else
                         /* If we're here, the blit is over, reset. */
                         gd54xx_reset_blit(gd54xx);
-                    }
                     /* Stop blitting and request new data if end of line reached. */
-                    return;
+                    break;
                 }
             }
         }
@@ -3637,12 +3783,15 @@ gd54xx_normal_blit(uint32_t count, gd54xx_t *gd54xx, svga_t *svga)
             mask = !mask;
 
         /* This handles 8bpp and 16bpp non-color-expanding transparent comparisons. */
-        if ((gd54xx->blt.mode & CIRRUS_BLTMODE_TRANSPARENTCOMP) && !(gd54xx->blt.mode & CIRRUS_BLTMODE_COLOREXPAND) && ((gd54xx->blt.mode & CIRRUS_BLTMODE_PIXELWIDTHMASK) <= CIRRUS_BLTMODE_PIXELWIDTH16) && (src != ((gd54xx->blt.trans_mask >> (shift << 3)) & 0xff)))
+        if ((gd54xx->blt.mode & CIRRUS_BLTMODE_TRANSPARENTCOMP) &&
+            !(gd54xx->blt.mode & CIRRUS_BLTMODE_COLOREXPAND) &&
+            ((gd54xx->blt.mode & CIRRUS_BLTMODE_PIXELWIDTHMASK) <= CIRRUS_BLTMODE_PIXELWIDTH16) &&
+            (src != ((gd54xx->blt.trans_mask >> (shift << 3)) & 0xff)))
             mask = 0;
 
-        if (((gd54xx->blt.width - width) >= gd54xx->blt.pattern_x) && !((gd54xx->blt.mode & CIRRUS_BLTMODE_TRANSPARENTCOMP) && !mask)) {
+        if (((gd54xx->blt.width - width) >= gd54xx->blt.pattern_x) &&
+            !((gd54xx->blt.mode & CIRRUS_BLTMODE_TRANSPARENTCOMP) && !mask))
             svga->vram[dst_addr & gd54xx->vram_mask] = dst;
-        }
 
         dst_addr += gd54xx->blt.dir;
         gd54xx->blt.x_count++;
@@ -3656,14 +3805,16 @@ gd54xx_normal_blit(uint32_t count, gd54xx_t *gd54xx, svga_t *svga)
         width--;
         if (width == 0xffff) {
             width    = gd54xx->blt.width;
-            dst_addr = gd54xx->blt.dst_addr_backup = gd54xx->blt.dst_addr_backup + (gd54xx->blt.dst_pitch * gd54xx->blt.dir);
+            dst_addr = gd54xx->blt.dst_addr_backup = gd54xx->blt.dst_addr_backup +
+                                                     (gd54xx->blt.dst_pitch * gd54xx->blt.dir);
             gd54xx->blt.y_count                    = (gd54xx->blt.y_count + gd54xx->blt.dir) & 7;
 
             if (gd54xx->blt.mode & CIRRUS_BLTMODE_COLOREXPAND) {
                 if (gd54xx->blt.x_count != 0)
                     src_addr++;
             } else
-                src_addr = gd54xx->blt.src_addr_backup = gd54xx->blt.src_addr_backup + (gd54xx->blt.src_pitch * gd54xx->blt.dir);
+                src_addr = gd54xx->blt.src_addr_backup = gd54xx->blt.src_addr_backup +
+                                                         (gd54xx->blt.src_pitch * gd54xx->blt.dir);
 
             dst_addr &= gd54xx->vram_mask;
             gd54xx->blt.dst_addr_backup &= gd54xx->vram_mask;
@@ -3674,8 +3825,7 @@ gd54xx_normal_blit(uint32_t count, gd54xx_t *gd54xx, svga_t *svga)
 
             gd54xx->blt.height_internal--;
             if (gd54xx->blt.height_internal == 0xffff) {
-                gd54xx_reset_blit(gd54xx);
-                return;
+                break;
             }
         }
     }
@@ -3709,7 +3859,8 @@ gd54xx_mem_sys_dest(uint32_t count, gd54xx_t *gd54xx, svga_t *svga)
         gd54xx->blt.msd_buf_pos = 0;
 
         while (gd54xx->blt.msd_buf_pos < 32) {
-            gd54xx->blt.msd_buf[gd54xx->blt.msd_buf_pos & 0x1f] = svga->vram[gd54xx->blt.src_addr_backup & gd54xx->vram_mask];
+            gd54xx->blt.msd_buf[gd54xx->blt.msd_buf_pos & 0x1f] = svga->vram[gd54xx->blt.src_addr_backup &
+                                                                  gd54xx->vram_mask];
             gd54xx->blt.src_addr_backup += gd54xx->blt.dir;
             gd54xx->blt.msd_buf_pos++;
 
@@ -3719,17 +3870,21 @@ gd54xx_mem_sys_dest(uint32_t count, gd54xx_t *gd54xx, svga_t *svga)
                 gd54xx->blt.y_count = (gd54xx->blt.y_count + 1) % (gd54xx->blt.height + 1);
 
                 if (gd54xx->blt.y_count)
-                    gd54xx->blt.src_addr_backup = gd54xx->blt.src_addr + (gd54xx->blt.src_pitch * gd54xx->blt.y_count * gd54xx->blt.dir);
+                    gd54xx->blt.src_addr_backup = gd54xx->blt.src_addr +
+                                                  (gd54xx->blt.src_pitch * gd54xx->blt.y_count * gd54xx->blt.dir);
                 else
                     gd54xx->countminusone = 2; /* Signal end of blit. */
                 /* End of line reached, stop and notify regardless of how much we already transferred. */
-                goto request_more_data;
+                break;
             }
         }
 
-        /* End of while. */
-request_more_data:
-        /* If the byte count we have blitted are not divisible by 4, round them up. */
+        /*
+           End of while.
+
+           If the byte count we have blitted are not divisible by 4,
+           round them up.
+         */
         if (gd54xx->blt.msd_buf_pos & 3)
             gd54xx->blt.msd_buf_cnt = (gd54xx->blt.msd_buf_pos & ~3) + 4;
         else
@@ -3742,7 +3897,9 @@ request_more_data:
 static void
 gd54xx_start_blit(uint32_t cpu_dat, uint32_t count, gd54xx_t *gd54xx, svga_t *svga)
 {
-    if ((gd54xx->blt.mode & CIRRUS_BLTMODE_BACKWARDS) && !(gd54xx->blt.mode & (CIRRUS_BLTMODE_PATTERNCOPY | CIRRUS_BLTMODE_COLOREXPAND)) && !(gd54xx->blt.mode & CIRRUS_BLTMODE_TRANSPARENTCOMP))
+    if ((gd54xx->blt.mode & CIRRUS_BLTMODE_BACKWARDS) &&
+        !(gd54xx->blt.mode & (CIRRUS_BLTMODE_PATTERNCOPY | CIRRUS_BLTMODE_COLOREXPAND)) &&
+        !(gd54xx->blt.mode & CIRRUS_BLTMODE_TRANSPARENTCOMP))
         gd54xx->blt.dir = -1;
     else
         gd54xx->blt.dir = 1;
@@ -3753,7 +3910,8 @@ gd54xx_start_blit(uint32_t cpu_dat, uint32_t count, gd54xx_t *gd54xx, svga_t *sv
         if (gd54xx->blt.pixel_width == 3)
             gd54xx->blt.pattern_x = gd54xx->blt.mask & 0x1f; /* (Mask & 0x1f) bytes. */
         else
-            gd54xx->blt.pattern_x = (gd54xx->blt.mask & 0x07) * gd54xx->blt.pixel_width; /* (Mask & 0x07) pixels. */
+            /* (Mask & 0x07) pixels. */
+            gd54xx->blt.pattern_x = (gd54xx->blt.mask & 0x07) * gd54xx->blt.pixel_width;
     } else
         gd54xx->blt.pattern_x = 0; /* No skip in normal blit mode. */
 
@@ -3793,7 +3951,8 @@ cl_pci_read(UNUSED(int func), int addr, void *priv)
                 break;
 
             case PCI_REG_COMMAND:
-                ret = gd54xx->pci_regs[PCI_REG_COMMAND]; /*Respond to IO and memory accesses*/
+                /* Respond to IO and memory accesses */
+                ret = gd54xx->pci_regs[PCI_REG_COMMAND];
                 break;
 
             case 0x07:
@@ -3842,6 +4001,16 @@ cl_pci_read(UNUSED(int func), int addr, void *priv)
                 ret = (svga->crtc[0x27] == CIRRUS_ID_CLGD5480) ? ((gd54xx->vgablt_base >> 24) & 0xff) : 0x00;
                 break;
 
+            case 0x2c:
+                ret = (svga->crtc[0x27] == CIRRUS_ID_CLGD5480) ? gd54xx->bios_rom.rom[0x7ffc] : 0x00;
+                break;
+            case 0x2d:
+                ret = (svga->crtc[0x27] == CIRRUS_ID_CLGD5480) ? gd54xx->bios_rom.rom[0x7ffd] : 0x00;
+                break;
+            case 0x2e:
+                ret = (svga->crtc[0x27] == CIRRUS_ID_CLGD5480) ? gd54xx->bios_rom.rom[0x7ffe] : 0x00;
+                break;
+
             case 0x30:
                 ret = (gd54xx->pci_regs[0x30] & 0x01); /*BIOS ROM address*/
                 break;
@@ -3897,8 +4066,10 @@ cl_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
             break;
 
         case 0x13:
-            /* 5480, like 5446 rev. B, has a 32 MB aperture, with the second set used for
-               BitBLT transfers. */
+            /*
+               5480, like 5446 rev. B, has a 32 MB aperture, with the second set used for
+               BitBLT transfers.
+             */
             if (svga->crtc[0x27] == CIRRUS_ID_CLGD5480)
                 val &= 0xfe;
             gd54xx->lfb_base = val << 24;
@@ -3916,7 +4087,8 @@ cl_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
                 val &= 0xf0;
             gd54xx->vgablt_base |= (val << byte);
             mem_mapping_disable(&gd54xx->vgablt_mapping);
-            if ((gd54xx->pci_regs[PCI_REG_COMMAND] & PCI_COMMAND_MEM) && (gd54xx->vgablt_base != 0x00000000) && (gd54xx->vgablt_base < 0xfff00000))
+            if ((gd54xx->pci_regs[PCI_REG_COMMAND] & PCI_COMMAND_MEM) &&
+                (gd54xx->vgablt_base != 0x00000000) && (gd54xx->vgablt_base < 0xfff00000))
                 mem_mapping_set_addr(&gd54xx->vgablt_mapping, gd54xx->vgablt_base, 0x1000);
             break;
 
@@ -3994,7 +4166,6 @@ gd54xx_reset(void *priv)
 
     memset(gd54xx->pci_regs, 0x00, 256);
 
-    mem_mapping_set_p(&svga->mapping, gd54xx);
     mem_mapping_disable(&gd54xx->mmio_mapping);
     mem_mapping_disable(&gd54xx->linear_mapping);
     mem_mapping_disable(&gd54xx->aperture2_mapping);
@@ -4045,7 +4216,7 @@ gd54xx_reset(void *priv)
 static void *
 gd54xx_init(const device_t *info)
 {
-    gd54xx_t   *gd54xx = malloc(sizeof(gd54xx_t));
+    gd54xx_t   *gd54xx = calloc(1, sizeof(gd54xx_t));
     svga_t     *svga   = &gd54xx->svga;
     int         id     = info->local & 0xff;
     int         vram;
@@ -4053,8 +4224,6 @@ gd54xx_init(const device_t *info)
     const char *romfn1 = NULL;
     const char *romfn2 = NULL;
 
-    memset(gd54xx, 0, sizeof(gd54xx_t));
-
     gd54xx->pci   = !!(info->flags & DEVICE_PCI);
     gd54xx->vlb   = !!(info->flags & DEVICE_VLB);
     gd54xx->mca   = !!(info->flags & DEVICE_MCA);
@@ -4065,10 +4234,19 @@ gd54xx_init(const device_t *info)
 
     gd54xx->id = id;
 
+    if (gd54xx->vlb && ((gd54xx->id == CIRRUS_ID_CLGD5430) ||
+                        (gd54xx->id == CIRRUS_ID_CLGD5434) ||
+                        (gd54xx->id == CIRRUS_ID_CLGD5434_4) ||
+                        (gd54xx->id == CIRRUS_ID_CLGD5440)))
+        gd54xx->vlb_lfb_base = device_get_config_int("lfb_base") << 20;
+
     switch (id) {
         case CIRRUS_ID_CLGD5401:
-            romfn = BIOS_GD5401_PATH;
-            break;
+        if (info->local & 0x100)
+                romfn = BIOS_GD5401_ONBOARD_PATH;
+            else
+				romfn = BIOS_GD5401_PATH;
+			break;
 
         case CIRRUS_ID_CLGD5402:
             if (info->local & 0x200)
@@ -4078,14 +4256,23 @@ gd54xx_init(const device_t *info)
             break;
 
         case CIRRUS_ID_CLGD5420:
-            romfn = BIOS_GD5420_PATH;
+            if (info->local & 0x200)
+                romfn = NULL;
+            else
+                romfn = BIOS_GD5420_PATH;
             break;
 
         case CIRRUS_ID_CLGD5422:
-        case CIRRUS_ID_CLGD5424:
             romfn = BIOS_GD5422_PATH;
             break;
 
+        case CIRRUS_ID_CLGD5424:
+            if (info->local & 0x200)
+                romfn = /*NULL*/ "roms/machines/advantage40xxd/AST101.09A";
+            else
+                romfn = BIOS_GD5422_PATH;
+            break;
+
         case CIRRUS_ID_CLGD5426:
             if (info->local & 0x200)
                 romfn = NULL;
@@ -4104,7 +4291,10 @@ gd54xx_init(const device_t *info)
             break;
 
         case CIRRUS_ID_CLGD5428:
-            if (info->local & 0x100)
+            if (info->local & 0x200) {
+                romfn            = NULL;
+                gd54xx->has_bios = 0;
+            } else if (info->local & 0x100)
                 if (gd54xx->vlb)
                     romfn = BIOS_GD5428_DIAMOND_B1_VLB_PATH;
                 else {
@@ -4148,7 +4338,12 @@ gd54xx_init(const device_t *info)
             break;
 
         case CIRRUS_ID_CLGD5436:
-            romfn = BIOS_GD5436_PATH;
+            if ((info->local & 0x200) &&
+                !strstr(machine_get_internal_name(), "sb486pv")) {
+                romfn            = NULL;
+                gd54xx->has_bios = 0;
+            } else
+                romfn = BIOS_GD5436_PATH;
             break;
 
         case CIRRUS_ID_CLGD5430:
@@ -4219,7 +4414,7 @@ gd54xx_init(const device_t *info)
         rom_init_interleaved(&gd54xx->bios_rom, BIOS_GD5428_BOCA_ISA_PATH_1, BIOS_GD5428_BOCA_ISA_PATH_2, 0xc0000,
                              0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
 
-    if (info->flags & DEVICE_ISA)
+    if ((info->flags & DEVICE_ISA) || (info->flags & DEVICE_ISA16))
         video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_gd54xx_isa);
     else if (info->flags & DEVICE_PCI)
         video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_gd54xx_pci);
@@ -4240,8 +4435,15 @@ gd54xx_init(const device_t *info)
     if ((vram == 1) || (vram >= 256 && vram <= 1024))
         svga->decode_mask = gd54xx->vram_mask;
 
+    svga->read = gd54xx_read;
+    svga->readw = gd54xx_readw;
+    svga->write = gd54xx_write;
+    svga->writew = gd54xx_writew;
     if (gd54xx->bit32) {
-        mem_mapping_set_handler(&svga->mapping, gd54xx_read, gd54xx_readw, gd54xx_readl, gd54xx_write, gd54xx_writew, gd54xx_writel);
+        svga->readl = gd54xx_readl;
+        svga->writel = gd54xx_writel;
+        mem_mapping_set_handler(&svga->mapping, gd54xx_read, gd54xx_readw, gd54xx_readl,
+                                gd54xx_write, gd54xx_writew, gd54xx_writel);
         mem_mapping_add(&gd54xx->mmio_mapping, 0, 0,
                         gd543x_mmio_read, gd543x_mmio_readw, gd543x_mmio_readl,
                         gd543x_mmio_writeb, gd543x_mmio_writew, gd543x_mmio_writel,
@@ -4259,7 +4461,10 @@ gd54xx_init(const device_t *info)
                         gd5480_vgablt_write, gd5480_vgablt_writew, gd5480_vgablt_writel,
                         NULL, MEM_MAPPING_EXTERNAL, gd54xx);
     } else {
-        mem_mapping_set_handler(&svga->mapping, gd54xx_read, gd54xx_readw, NULL, gd54xx_write, gd54xx_writew, NULL);
+        svga->readl = NULL;
+        svga->writel = NULL;
+        mem_mapping_set_handler(&svga->mapping, gd54xx_read, gd54xx_readw, NULL,
+                                gd54xx_write, gd54xx_writew, NULL);
         mem_mapping_add(&gd54xx->mmio_mapping, 0, 0,
                         gd543x_mmio_read, gd543x_mmio_readw, NULL,
                         gd543x_mmio_writeb, gd543x_mmio_writew, NULL,
@@ -4279,15 +4484,17 @@ gd54xx_init(const device_t *info)
     }
     io_sethandler(0x03c0, 0x0020, gd54xx_in, NULL, NULL, gd54xx_out, NULL, NULL, gd54xx);
 
-    if (gd54xx->pci && id >= CIRRUS_ID_CLGD5430) {
-        if (romfn == NULL)
+    if (gd54xx->pci && (id >= CIRRUS_ID_CLGD5430)) {
+        if (info->local & 0x200)
             pci_add_card(PCI_ADD_VIDEO, cl_pci_read, cl_pci_write, gd54xx, &gd54xx->pci_slot);
         else
             pci_add_card(PCI_ADD_NORMAL, cl_pci_read, cl_pci_write, gd54xx, &gd54xx->pci_slot);
         mem_mapping_disable(&gd54xx->bios_rom.mapping);
     }
 
-    mem_mapping_set_p(&svga->mapping, gd54xx);
+    if ((id <= CIRRUS_ID_CLGD5429) || (!gd54xx->pci && !gd54xx->vlb))
+        mem_mapping_set_base_ignore(&gd54xx->linear_mapping, 0xff000000);
+
     mem_mapping_disable(&gd54xx->mmio_mapping);
     mem_mapping_disable(&gd54xx->linear_mapping);
     mem_mapping_disable(&gd54xx->aperture2_mapping);
@@ -4350,6 +4557,8 @@ gd54xx_init(const device_t *info)
 
     gd54xx->overlay.colorkeycompare = 0xff;
 
+    svga->local = gd54xx;
+
     return gd54xx;
 }
 
@@ -4525,218 +4734,209 @@ gd54xx_force_redraw(void *priv)
 // clang-format off
 static const device_config_t gd542x_config[] = {
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "512 KB",
-                .value = 512
-            },
-            {
-                .description = "1 MB",
-                .value = 1024
-            },
-            {
-                .description = ""
-            }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "512 KB", .value =  512 },
+            { .description = "1 MB",   .value = 1024 },
+            { .description = ""                      }
         },
-        .default_int = 512
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t gd5426_config[] = {
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "512 KB",
-                .value = 512
-            },
-            {
-                .description = "1 MB",
-                .value = 1024
-            },
-            {
-                .description = "2 MB",
-                .value = 2048
-            },
-            {
-                .description = ""
-            }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2048,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "512 KB", .value =  512 },
+            { .description = "1 MB",   .value = 1024 },
+            { .description = "2 MB",   .value = 2048 },
+            { .description = ""                      }
         },
-        .default_int = 2048
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
-};
-
-static const device_config_t gd5428_onboard_config[] = {
-    {
-        .name = "memory",
-        .description = "Onboard memory size",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "512 KB",
-                .value = 512
-            },
-            {
-                .description = "1 MB",
-                .value = 1024
-            },
-            {
-                .description = "2 MB",
-                .value = 2048
-            },
-            {
-                .description = ""
-            }
-        },
-        .default_int = 2048
-    },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t gd5429_config[] = {
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "1 MB",
-                .value = 1
-            },
-            {
-                .description = "2 MB",
-                .value = 2
-            },
-            {
-                .description = ""
-            }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "1 MB", .value = 1 },
+            { .description = "2 MB", .value = 2 },
+            { .description = ""                 }
         },
-        .default_int = 2
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t gd5430_vlb_config[] = {
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "1 MB", .value = 1 },
+            { .description = "2 MB", .value = 2 },
+            { .description = ""                 }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .type = CONFIG_END
-    }
+        .name           = "lfb_base",
+        .description    = "Linear framebuffer base",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2048,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "32 MB", .value = 32 },
+            { .description = "64 MB", .value = 64 },
+            { .description = "2048 MB", .value = 2048 },
+            { .description = ""                 }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t gd5440_onboard_config[] = {
     {
-        .name = "memory",
-        .description = "Onboard memory size",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "1 MB",
-                .value = 1
-            },
-            {
-                .description = "2 MB",
-                .value = 2
-            },
-            {
-                .description = ""
-            }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "1 MB", .value = 1 },
+            { .description = "2 MB", .value = 2 },
+            { .description = ""                 }
         },
-        .default_int = 2
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t gd5434_config[] = {
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "1 MB",
-                .value = 1
-            },
-            {
-                .description = "2 MB",
-                .value = 2
-            },
-            {
-                .description = "4 MB",
-                .value = 4
-            },
-            {
-                .description = ""
-            }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 4,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "1 MB", .value = 1 },
+            { .description = "2 MB", .value = 2 },
+            { .description = "4 MB", .value = 4 },
+            { .description = ""                 }
         },
-        .default_int = 4
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t gd5434_vlb_config[] = {
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 4,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "1 MB", .value = 1 },
+            { .description = "2 MB", .value = 2 },
+            { .description = "4 MB", .value = 4 },
+            { .description = ""                 }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .type = CONFIG_END
-    }
+        .name           = "lfb_base",
+        .description    = "Linear framebuffer base",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2048,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "32 MB", .value = 32 },
+            { .description = "64 MB", .value = 64 },
+            { .description = "2048 MB", .value = 2048 },
+            { .description = ""                 }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t gd5434_onboard_config[] = {
     {
-        .name = "memory",
-        .description = "Onboard memory size",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "1 MB",
-                .value = 1
-            },
-            {
-                .description = "2 MB",
-                .value = 2
-            },
-            {
-                .description = "4 MB",
-                .value = 4
-            },
-            {
-                .description = ""
-            }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 4,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "1 MB", .value = 1 },
+            { .description = "2 MB", .value = 2 },
+            { .description = "4 MB", .value = 4 },
+            { .description = ""                 }
         },
-        .default_int = 4
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t gd5480_config[] = {
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "2 MB",
-                .value = 2
-            },
-            {
-                .description = "4 MB",
-                .value = 4
-            },
-            {
-                .description = ""
-            }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 4,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "2 MB", .value = 2 },
+            { .description = "4 MB", .value = 4 },
+            { .description = ""                 }
         },
-        .default_int = 4
+        .bios           = { { 0 } }
     },
-    {
-        .type = -1
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 // clang-format on
 
@@ -4748,7 +4948,21 @@ const device_t gd5401_isa_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5401_available },
+    .available     = gd5401_available,
+    .speed_changed = gd54xx_speed_changed,
+    .force_redraw  = gd54xx_force_redraw,
+    .config        = NULL,
+};
+
+const device_t gd5401_onboard_device = {
+    .name          = "Cirrus Logic GD5401 (ISA) (ACUMOS AVGA1) (On-Board)",
+    .internal_name = "cl_gd5402_onboard",
+    .flags         = DEVICE_ISA16,
+    .local         = CIRRUS_ID_CLGD5401 | 0x100,
+    .init          = gd54xx_init,
+    .close         = gd54xx_close,
+    .reset         = gd54xx_reset,
+    .available     = NULL,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = NULL,
@@ -4762,7 +4976,7 @@ const device_t gd5402_isa_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5402_available },
+    .available     = gd5402_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = NULL,
@@ -4771,12 +4985,12 @@ const device_t gd5402_isa_device = {
 const device_t gd5402_onboard_device = {
     .name          = "Cirrus Logic GD5402 (ISA) (ACUMOS AVGA2) (On-Board)",
     .internal_name = "cl_gd5402_onboard",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = CIRRUS_ID_CLGD5402 | 0x200,
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = NULL,
@@ -4785,12 +4999,26 @@ const device_t gd5402_onboard_device = {
 const device_t gd5420_isa_device = {
     .name          = "Cirrus Logic GD5420 (ISA)",
     .internal_name = "cl_gd5420_isa",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = CIRRUS_ID_CLGD5420,
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5420_available },
+    .available     = gd5420_available,
+    .speed_changed = gd54xx_speed_changed,
+    .force_redraw  = gd54xx_force_redraw,
+    .config        = gd542x_config,
+};
+
+const device_t gd5420_onboard_device = {
+    .name          = "Cirrus Logic GD5420 (ISA) (On-Board)",
+    .internal_name = "cl_gd5420_onboard",
+    .flags         = DEVICE_ISA16,
+    .local         = CIRRUS_ID_CLGD5420 | 0x200,
+    .init          = gd54xx_init,
+    .close         = gd54xx_close,
+    .reset         = gd54xx_reset,
+    .available     = NULL,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd542x_config,
@@ -4799,12 +5027,12 @@ const device_t gd5420_isa_device = {
 const device_t gd5422_isa_device = {
     .name          = "Cirrus Logic GD5422 (ISA)",
     .internal_name = "cl_gd5422_isa",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = CIRRUS_ID_CLGD5422,
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5422_available }, /* Common BIOS between 5422 and 5424 */
+    .available     = gd5422_available, /* Common BIOS between 5422 and 5424 */
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd542x_config,
@@ -4818,7 +5046,21 @@ const device_t gd5424_vlb_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5422_available }, /* Common BIOS between 5422 and 5424 */
+    .available     = gd5422_available, /* Common BIOS between 5422 and 5424 */
+    .speed_changed = gd54xx_speed_changed,
+    .force_redraw  = gd54xx_force_redraw,
+    .config        = gd542x_config,
+};
+
+const device_t gd5424_onboard_device = {
+    .name          = "Cirrus Logic GD5424 (VLB) (On-Board)",
+    .internal_name = "cl_gd5424_onboard",
+    .flags         = DEVICE_VLB,
+    .local         = CIRRUS_ID_CLGD5424 | 0x200,
+    .init          = gd54xx_init,
+    .close         = gd54xx_close,
+    .reset         = gd54xx_reset,
+    .available     = NULL,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd542x_config,
@@ -4827,12 +5069,12 @@ const device_t gd5424_vlb_device = {
 const device_t gd5426_isa_device = {
     .name          = "Cirrus Logic GD5426 (ISA)",
     .internal_name = "cl_gd5426_isa",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = CIRRUS_ID_CLGD5426,
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5428_isa_available },
+    .available     = gd5428_isa_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5426_config
@@ -4842,12 +5084,12 @@ const device_t gd5426_isa_device = {
 const device_t gd5426_diamond_speedstar_pro_a1_isa_device = {
     .name          = "Cirrus Logic GD5426 (ISA) (Diamond SpeedStar Pro Rev. A1)",
     .internal_name = "cl_gd5426_diamond_a1_isa",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = CIRRUS_ID_CLGD5426 | 0x100,
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5426_diamond_a1_available },
+    .available     = gd5426_diamond_a1_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5426_config
@@ -4861,7 +5103,7 @@ const device_t gd5426_vlb_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5428_available },
+    .available     = gd5428_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5426_config
@@ -4875,7 +5117,7 @@ const device_t gd5426_onboard_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = NULL
@@ -4884,12 +5126,12 @@ const device_t gd5426_onboard_device = {
 const device_t gd5428_isa_device = {
     .name          = "Cirrus Logic GD5428 (ISA)",
     .internal_name = "cl_gd5428_isa",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = CIRRUS_ID_CLGD5428,
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5428_isa_available },
+    .available     = gd5428_isa_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5426_config
@@ -4903,7 +5145,7 @@ const device_t gd5428_vlb_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5428_available },
+    .available     = gd5428_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5426_config
@@ -4918,7 +5160,7 @@ const device_t gd5428_diamond_speedstar_pro_b1_vlb_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5428_diamond_b1_available },
+    .available     = gd5428_diamond_b1_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5426_config
@@ -4927,12 +5169,12 @@ const device_t gd5428_diamond_speedstar_pro_b1_vlb_device = {
 const device_t gd5428_boca_isa_device = {
     .name          = "Cirrus Logic GD5428 (ISA) (BOCA Research 4610)",
     .internal_name = "cl_gd5428_boca_isa",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = CIRRUS_ID_CLGD5428 | 0x100,
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5428_boca_isa_available },
+    .available     = gd5428_boca_isa_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5426_config
@@ -4946,7 +5188,7 @@ const device_t gd5428_mca_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5428_mca_available },
+    .available     = gd5428_mca_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = NULL
@@ -4960,7 +5202,7 @@ const device_t gd5426_mca_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5426_mca_available },
+    .available     = gd5426_mca_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5426_config
@@ -4969,15 +5211,15 @@ const device_t gd5426_mca_device = {
 const device_t gd5428_onboard_device = {
     .name          = "Cirrus Logic GD5428 (ISA) (On-Board)",
     .internal_name = "cl_gd5428_onboard",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = CIRRUS_ID_CLGD5428,
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5428_isa_available },
+    .available     = gd5428_isa_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
-    .config        = gd5428_onboard_config
+    .config        = gd5426_config
 };
 
 const device_t gd5428_vlb_onboard_device = {
@@ -4988,21 +5230,35 @@ const device_t gd5428_vlb_onboard_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
-    .config        = gd5428_onboard_config
+    .config        = gd5426_config
+};
+
+const device_t gd5428_onboard_vlb_device = {
+    .name          = "Cirrus Logic GD5428 (VLB) (On-Board) (Dell)",
+    .internal_name = "cl_gd5428_onboard_vlb",
+    .flags         = DEVICE_VLB,
+    .local         = CIRRUS_ID_CLGD5428 | 0x200,
+    .init          = gd54xx_init,
+    .close         = gd54xx_close,
+    .reset         = gd54xx_reset,
+    .available     = NULL,
+    .speed_changed = gd54xx_speed_changed,
+    .force_redraw  = gd54xx_force_redraw,
+    .config        = gd542x_config
 };
 
 const device_t gd5429_isa_device = {
     .name          = "Cirrus Logic GD5429 (ISA)",
     .internal_name = "cl_gd5429_isa",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = CIRRUS_ID_CLGD5429,
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5429_available },
+    .available     = gd5429_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5429_config
@@ -5016,7 +5272,7 @@ const device_t gd5429_vlb_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5429_available },
+    .available     = gd5429_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5429_config
@@ -5031,10 +5287,10 @@ const device_t gd5430_diamond_speedstar_pro_se_a8_vlb_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5430_diamond_a8_available },
+    .available     = gd5430_diamond_a8_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
-    .config        = gd5429_config
+    .config        = gd5430_vlb_config
 };
 
 const device_t gd5430_vlb_device = {
@@ -5045,10 +5301,10 @@ const device_t gd5430_vlb_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5430_orchid_vlb_available },
+    .available     = gd5430_orchid_vlb_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
-    .config        = gd5429_config
+    .config        = gd5430_vlb_config
 };
 
 const device_t gd5430_onboard_vlb_device = {
@@ -5059,10 +5315,10 @@ const device_t gd5430_onboard_vlb_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
-    .config        = gd5429_config
+    .config        = gd5430_vlb_config
 };
 
 const device_t gd5430_pci_device = {
@@ -5073,7 +5329,7 @@ const device_t gd5430_pci_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5430_available },
+    .available     = gd5430_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5429_config
@@ -5087,7 +5343,7 @@ const device_t gd5430_onboard_pci_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5429_config
@@ -5096,12 +5352,12 @@ const device_t gd5430_onboard_pci_device = {
 const device_t gd5434_isa_device = {
     .name          = "Cirrus Logic GD5434 (ISA)",
     .internal_name = "cl_gd5434_isa",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = CIRRUS_ID_CLGD5434,
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5434_isa_available },
+    .available     = gd5434_isa_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5434_config
@@ -5111,12 +5367,12 @@ const device_t gd5434_isa_device = {
 const device_t gd5434_diamond_speedstar_64_a3_isa_device = {
     .name          = "Cirrus Logic GD5434 (ISA) (Diamond SpeedStar 64 Rev. A3)",
     .internal_name = "cl_gd5434_diamond_a3_isa",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = CIRRUS_ID_CLGD5434 | 0x100,
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5434_diamond_a3_available },
+    .available     = gd5434_diamond_a3_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5429_config
@@ -5130,7 +5386,7 @@ const device_t gd5434_onboard_pci_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5434_onboard_config
@@ -5144,10 +5400,10 @@ const device_t gd5434_vlb_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5430_orchid_vlb_available },
+    .available     = gd5430_orchid_vlb_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
-    .config        = gd5434_config
+    .config        = gd5434_vlb_config
 };
 
 const device_t gd5434_pci_device = {
@@ -5158,7 +5414,21 @@ const device_t gd5434_pci_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5434_available },
+    .available     = gd5434_available,
+    .speed_changed = gd54xx_speed_changed,
+    .force_redraw  = gd54xx_force_redraw,
+    .config        = gd5434_config
+};
+
+const device_t gd5436_onboard_pci_device = {
+    .name          = "Cirrus Logic GD5436 (PCI) (On-Board)",
+    .internal_name = "cl_gd5436_onboard_pci",
+    .flags         = DEVICE_PCI,
+    .local         = CIRRUS_ID_CLGD5436 | 0x200,
+    .init          = gd54xx_init,
+    .close         = gd54xx_close,
+    .reset         = gd54xx_reset,
+    .available     = NULL,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5434_config
@@ -5172,7 +5442,7 @@ const device_t gd5436_pci_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5436_available },
+    .available     = gd5436_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5434_config
@@ -5186,7 +5456,7 @@ const device_t gd5440_onboard_pci_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5440_onboard_config
@@ -5200,7 +5470,7 @@ const device_t gd5440_pci_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5440_available },
+    .available     = gd5440_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5429_config
@@ -5214,7 +5484,7 @@ const device_t gd5446_pci_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5446_available },
+    .available     = gd5446_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5434_config
@@ -5228,7 +5498,7 @@ const device_t gd5446_stb_pci_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5446_stb_available },
+    .available     = gd5446_stb_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5434_config
@@ -5242,7 +5512,7 @@ const device_t gd5480_pci_device = {
     .init          = gd54xx_init,
     .close         = gd54xx_close,
     .reset         = gd54xx_reset,
-    { .available = gd5480_available },
+    .available     = gd5480_available,
     .speed_changed = gd54xx_speed_changed,
     .force_redraw  = gd54xx_force_redraw,
     .config        = gd5480_config
diff --git a/src/video/vid_compaq_cga.c b/src/video/vid_compaq_cga.c
deleted file mode 100644
index 430c7a64d..000000000
--- a/src/video/vid_compaq_cga.c
+++ /dev/null
@@ -1,502 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Emulation of the Compaq CGA graphics cards.
- *
- *
- *
- * Authors: John Elliott, <jce@seasip.info>
- *          Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
- *
- *          Copyright 2016-2019 John Elliott.
- *          Copyright 2008-2019 Sarah Walker.
- *          Copyright 2016-2019 Miran Grca.
- */
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <math.h>
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include "cpu.h"
-#include <86box/io.h>
-#include <86box/timer.h>
-#include <86box/pit.h>
-#include <86box/mem.h>
-#include <86box/rom.h>
-#include <86box/device.h>
-#include <86box/video.h>
-#include <86box/vid_cga.h>
-#include <86box/vid_cga_comp.h>
-
-#define CGA_RGB       0
-#define CGA_COMPOSITE 1
-
-static uint32_t vflags;
-static uint8_t  mdaattr[256][2][2];
-
-typedef struct compaq_cga_t {
-    cga_t cga;
-} compaq_cga_t;
-
-#ifdef ENABLE_COMPAQ_CGA_LOG
-int compaq_cga_do_log = ENABLE_COMPAQ_CGA_LOG;
-
-static void
-compaq_cga_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (compaq_cga_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define compaq_cga_log(fmt, ...)
-#endif
-
-void
-compaq_cga_recalctimings(compaq_cga_t *self)
-{
-    double _dispontime;
-    double _dispofftime;
-    double disptime;
-    disptime = self->cga.crtc[0] + 1;
-
-    _dispontime  = self->cga.crtc[1];
-    _dispofftime = disptime - _dispontime;
-    _dispontime *= MDACONST;
-    _dispofftime *= MDACONST;
-    self->cga.dispontime  = (uint64_t) (_dispontime);
-    self->cga.dispofftime = (uint64_t) (_dispofftime);
-}
-
-void
-compaq_cga_poll(void *priv)
-{
-    compaq_cga_t *self = (compaq_cga_t *) priv;
-    uint16_t      ca   = (self->cga.crtc[15] | (self->cga.crtc[14] << 8)) & 0x3fff;
-    int           drawcursor;
-    int           x;
-    int           c;
-    int           xs_temp;
-    int           ys_temp;
-    int           oldvc;
-    uint8_t       chr;
-    uint8_t       attr;
-    uint8_t       border;
-    uint8_t       cols[4];
-    int           oldsc;
-    int           underline = 0;
-    int           blink     = 0;
-
-    /* If in graphics mode or character height is not 13, behave as CGA */
-    if ((self->cga.cgamode & 0x12) || (self->cga.crtc[9] != 13)) {
-        overscan_x = overscan_y = 16;
-        cga_poll(&self->cga);
-        return;
-    } else
-        overscan_x = overscan_y = 0;
-
-    /* We are in Compaq 350-line CGA territory */
-    if (!self->cga.linepos) {
-        timer_advance_u64(&self->cga.timer, self->cga.dispofftime);
-        self->cga.cgastat |= 1;
-        self->cga.linepos = 1;
-        oldsc             = self->cga.sc;
-        if ((self->cga.crtc[8] & 3) == 3)
-            self->cga.sc = ((self->cga.sc << 1) + self->cga.oddeven) & 7;
-        if (self->cga.cgadispon) {
-            if (self->cga.displine < self->cga.firstline) {
-                self->cga.firstline = self->cga.displine;
-                video_wait_for_buffer();
-                compaq_cga_log("Firstline %i\n", self->cga.firstline);
-            }
-            self->cga.lastline = self->cga.displine;
-
-            cols[0] = (self->cga.cgacol & 15) + 16;
-
-            for (c = 0; c < 8; c++) {
-                buffer32->line[self->cga.displine][c] = cols[0];
-                if (self->cga.cgamode & 1)
-                    buffer32->line[self->cga.displine][c + (self->cga.crtc[1] << 3) + 8] = cols[0];
-                else
-                    buffer32->line[self->cga.displine][c + (self->cga.crtc[1] << 4) + 8] = cols[0];
-            }
-
-            if (self->cga.cgamode & 1) {
-                for (x = 0; x < self->cga.crtc[1]; x++) {
-                    chr        = self->cga.charbuffer[x << 1];
-                    attr       = self->cga.charbuffer[(x << 1) + 1];
-                    drawcursor = ((self->cga.ma == ca) && self->cga.con && self->cga.cursoron);
-
-                    if (vflags) {
-                        underline = 0;
-                        blink     = ((self->cga.cgablink & 8) && (self->cga.cgamode & 0x20) && (attr & 0x80) && !drawcursor);
-                    }
-
-                    if (vflags && (self->cga.cgamode & 0x80)) {
-                        cols[0] = mdaattr[attr][blink][0];
-                        cols[1] = mdaattr[attr][blink][1];
-
-                        if ((self->cga.sc == 12) && ((attr & 7) == 1))
-                            underline = 1;
-                    } else if (self->cga.cgamode & 0x20) {
-                        cols[1] = (attr & 15) + 16;
-                        cols[0] = ((attr >> 4) & 7) + 16;
-
-                        if (vflags) {
-                            if (blink)
-                                cols[1] = cols[0];
-                        } else {
-                            if ((self->cga.cgablink & 8) && (attr & 0x80) && !self->cga.drawcursor)
-                                cols[1] = cols[0];
-                        }
-                    } else {
-                        cols[1] = (attr & 15) + 16;
-                        cols[0] = (attr >> 4) + 16;
-                    }
-
-                    if (vflags && underline) {
-                        for (c = 0; c < 8; c++)
-                            buffer32->line[self->cga.displine][(x << 3) + c + 8] = mdaattr[attr][blink][1];
-                    } else if (drawcursor) {
-                        for (c = 0; c < 8; c++)
-                            buffer32->line[self->cga.displine][(x << 3) + c + 8] = cols[(fontdatm[chr + self->cga.fontbase][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
-                    } else {
-                        for (c = 0; c < 8; c++)
-                            buffer32->line[self->cga.displine][(x << 3) + c + 8] = cols[(fontdatm[chr + self->cga.fontbase][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0];
-                    }
-                    self->cga.ma++;
-                }
-            } else {
-                for (x = 0; x < self->cga.crtc[1]; x++) {
-                    chr        = self->cga.vram[(self->cga.ma << 1) & 0x3fff];
-                    attr       = self->cga.vram[((self->cga.ma << 1) + 1) & 0x3fff];
-                    drawcursor = ((self->cga.ma == ca) && self->cga.con && self->cga.cursoron);
-
-                    if (vflags) {
-                        underline = 0;
-                        blink     = ((self->cga.cgablink & 8) && (self->cga.cgamode & 0x20) && (attr & 0x80) && !drawcursor);
-                    }
-
-                    if (vflags && (self->cga.cgamode & 0x80)) {
-                        cols[0] = mdaattr[attr][blink][0];
-                        cols[1] = mdaattr[attr][blink][1];
-                        if (self->cga.sc == 12 && (attr & 7) == 1)
-                            underline = 1;
-                    } else if (self->cga.cgamode & 0x20) {
-                        cols[1] = (attr & 15) + 16;
-                        cols[0] = ((attr >> 4) & 7) + 16;
-
-                        if (vflags) {
-                            if (blink)
-                                cols[1] = cols[0];
-                        } else {
-                            if ((self->cga.cgablink & 8) && (attr & 0x80) && !self->cga.drawcursor)
-                                cols[1] = cols[0];
-                        }
-                    } else {
-                        cols[1] = (attr & 15) + 16;
-                        cols[0] = (attr >> 4) + 16;
-                    }
-                    self->cga.ma++;
-
-                    if (vflags && underline) {
-                        for (c = 0; c < 8; c++)
-                            buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 8] = buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 9] = mdaattr[attr][blink][1];
-                    } else if (drawcursor) {
-                        for (c = 0; c < 8; c++)
-                            buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 8] = buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr + self->cga.fontbase][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
-                    } else {
-                        for (c = 0; c < 8; c++)
-                            buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 8] = buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr + self->cga.fontbase][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0];
-                    }
-                }
-            }
-        } else {
-            cols[0] = (self->cga.cgacol & 15) + 16;
-
-            if (self->cga.cgamode & 1)
-                hline(buffer32, 0, self->cga.displine, (self->cga.crtc[1] << 3) + 16, cols[0]);
-            else
-                hline(buffer32, 0, self->cga.displine, (self->cga.crtc[1] << 4) + 16, cols[0]);
-        }
-
-        if (self->cga.cgamode & 1)
-            x = (self->cga.crtc[1] << 3) + 16;
-        else
-            x = (self->cga.crtc[1] << 4) + 16;
-
-        if (self->cga.composite) {
-            if (self->cga.cgamode & 0x10)
-                border = 0x00;
-            else
-                border = self->cga.cgacol & 0x0f;
-
-            if (vflags)
-                Composite_Process(self->cga.cgamode & 0x7f, border, x >> 2, buffer32->line[self->cga.displine]);
-            else
-                Composite_Process(self->cga.cgamode, border, x >> 2, buffer32->line[self->cga.displine]);
-        } else
-            video_process_8(x, self->cga.displine);
-
-        self->cga.sc = oldsc;
-        if (self->cga.vc == self->cga.crtc[7] && !self->cga.sc)
-            self->cga.cgastat |= 8;
-        self->cga.displine++;
-        if (self->cga.displine >= 500)
-            self->cga.displine = 0;
-    } else {
-        timer_advance_u64(&self->cga.timer, self->cga.dispontime);
-        self->cga.linepos = 0;
-        if (self->cga.vsynctime) {
-            self->cga.vsynctime--;
-            if (!self->cga.vsynctime)
-                self->cga.cgastat &= ~8;
-        }
-
-        if (self->cga.sc == (self->cga.crtc[11] & 31) || ((self->cga.crtc[8] & 3) == 3 && self->cga.sc == ((self->cga.crtc[11] & 31) >> 1))) {
-            self->cga.con  = 0;
-            self->cga.coff = 1;
-        }
-        if ((self->cga.crtc[8] & 3) == 3 && self->cga.sc == (self->cga.crtc[9] >> 1))
-            self->cga.maback = self->cga.ma;
-        if (self->cga.vadj) {
-            self->cga.sc++;
-            self->cga.sc &= 31;
-            self->cga.ma = self->cga.maback;
-            self->cga.vadj--;
-            if (!self->cga.vadj) {
-                self->cga.cgadispon = 1;
-                self->cga.ma = self->cga.maback = (self->cga.crtc[13] | (self->cga.crtc[12] << 8)) & 0x3fff;
-                self->cga.sc                    = 0;
-            }
-        } else if (self->cga.sc == self->cga.crtc[9]) {
-            self->cga.maback = self->cga.ma;
-            self->cga.sc     = 0;
-            oldvc            = self->cga.vc;
-            self->cga.vc++;
-            self->cga.vc &= 127;
-
-            if (self->cga.vc == self->cga.crtc[6])
-                self->cga.cgadispon = 0;
-
-            if (oldvc == self->cga.crtc[4]) {
-                self->cga.vc   = 0;
-                self->cga.vadj = self->cga.crtc[5];
-
-                if (!self->cga.vadj)
-                    self->cga.cgadispon = 1;
-
-                if (!self->cga.vadj)
-                    self->cga.ma = self->cga.maback = (self->cga.crtc[13] | (self->cga.crtc[12] << 8)) & 0x3fff;
-
-                if ((self->cga.crtc[10] & 0x60) == 0x20)
-                    self->cga.cursoron = 0;
-                else
-                    self->cga.cursoron = self->cga.cgablink & 8;
-            }
-
-            if (self->cga.vc == self->cga.crtc[7]) {
-                self->cga.cgadispon = 0;
-                self->cga.displine  = 0;
-                self->cga.vsynctime = 16;
-
-                if (self->cga.crtc[7]) {
-                    compaq_cga_log("Lastline %i Firstline %i  %i\n", self->cga.lastline,
-                                   self->cga.firstline, self->cga.lastline - self->cga.firstline);
-
-                    if (self->cga.cgamode & 1)
-                        x = (self->cga.crtc[1] << 3) + 16;
-                    else
-                        x = (self->cga.crtc[1] << 4) + 16;
-
-                    self->cga.lastline++;
-
-                    xs_temp = x;
-                    ys_temp = (self->cga.lastline - self->cga.firstline);
-
-                    if ((xs_temp > 0) && (ys_temp > 0)) {
-                        if (xs_temp < 64)
-                            xs_temp = 656;
-                        if (ys_temp < 32)
-                            ys_temp = 400;
-                        if (!enable_overscan)
-                            xs_temp -= 16;
-
-                        if ((self->cga.cgamode & 8) && ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get())) {
-                            xsize = xs_temp;
-                            ysize = ys_temp;
-                            set_screen_size(xsize, ysize + (enable_overscan ? 16 : 0));
-
-                            if (video_force_resize_get())
-                                video_force_resize_set(0);
-                        }
-
-                        if (enable_overscan)
-                            video_blit_memtoscreen(0, self->cga.firstline - 8, xsize, (self->cga.lastline - self->cga.firstline) + 16);
-                        else
-                            video_blit_memtoscreen(8, self->cga.firstline, xsize, self->cga.lastline - self->cga.firstline);
-                    }
-
-                    frames++;
-
-                    video_res_x = xsize;
-                    if (enable_overscan)
-                        xsize -= 16;
-                    video_res_y = ysize;
-                    if (self->cga.cgamode & 1) {
-                        video_res_x /= 8;
-                        video_res_y /= self->cga.crtc[9] + 1;
-                        video_bpp = 0;
-                    } else if (!(self->cga.cgamode & 2)) {
-                        video_res_x /= 16;
-                        video_res_y /= self->cga.crtc[9] + 1;
-                        video_bpp = 0;
-                    } else if (!(self->cga.cgamode & 16)) {
-                        video_res_x /= 2;
-                        video_bpp = 2;
-                    } else
-                        video_bpp = 1;
-                }
-
-                self->cga.firstline = 1000;
-                self->cga.lastline  = 0;
-                self->cga.cgablink++;
-                self->cga.oddeven ^= 1;
-            }
-        } else {
-            self->cga.sc++;
-            self->cga.sc &= 31;
-            self->cga.ma = self->cga.maback;
-        }
-
-        if (self->cga.cgadispon)
-            self->cga.cgastat &= ~1;
-
-        if (self->cga.sc == (self->cga.crtc[10] & 31) || ((self->cga.crtc[8] & 3) == 3 && self->cga.sc == ((self->cga.crtc[10] & 31) >> 1)))
-            self->cga.con = 1;
-
-        if (self->cga.cgadispon && (self->cga.cgamode & 1)) {
-            for (x = 0; x < (self->cga.crtc[1] << 1); x++)
-                self->cga.charbuffer[x] = self->cga.vram[((self->cga.ma << 1) + x) & 0x3fff];
-        }
-    }
-}
-
-void *
-compaq_cga_init(const device_t *info)
-{
-    int           display_type;
-    compaq_cga_t *self = malloc(sizeof(compaq_cga_t));
-    memset(self, 0, sizeof(compaq_cga_t));
-
-    display_type           = device_get_config_int("display_type");
-    self->cga.composite    = (display_type != CGA_RGB);
-    self->cga.revision     = device_get_config_int("composite_type");
-    self->cga.snow_enabled = device_get_config_int("snow_enabled");
-
-    self->cga.vram = malloc(0x4000);
-
-    cga_comp_init(self->cga.revision);
-    timer_add(&self->cga.timer, compaq_cga_poll, self, 1);
-    mem_mapping_add(&self->cga.mapping, 0xb8000, 0x08000, cga_read, NULL, NULL, cga_write, NULL, NULL, NULL /*self->cga.vram*/, MEM_MAPPING_EXTERNAL, self);
-    io_sethandler(0x03d0, 0x0010, cga_in, NULL, NULL, cga_out, NULL, NULL, self);
-
-    if (info->local) {
-        for (uint16_t c = 0; c < 256; c++) {
-            mdaattr[c][0][0] = mdaattr[c][1][0] = mdaattr[c][1][1] = 16;
-            if (c & 8)
-                mdaattr[c][0][1] = 15 + 16;
-            else
-                mdaattr[c][0][1] = 7 + 16;
-        }
-
-        mdaattr[0x70][0][1] = 16;
-        mdaattr[0x70][0][0] = mdaattr[0x70][1][0] = mdaattr[0x70][1][1] = 16 + 15;
-        mdaattr[0xF0][0][1]                                             = 16;
-        mdaattr[0xF0][0][0] = mdaattr[0xF0][1][0] = mdaattr[0xF0][1][1] = 16 + 15;
-        mdaattr[0x78][0][1]                                             = 16 + 7;
-        mdaattr[0x78][0][0] = mdaattr[0x78][1][0] = mdaattr[0x78][1][1] = 16 + 15;
-        mdaattr[0xF8][0][1]                                             = 16 + 7;
-        mdaattr[0xF8][0][0] = mdaattr[0xF8][1][0] = mdaattr[0xF8][1][1] = 16 + 15;
-        mdaattr[0x00][0][1] = mdaattr[0x00][1][1] = 16;
-        mdaattr[0x08][0][1] = mdaattr[0x08][1][1] = 16;
-        mdaattr[0x80][0][1] = mdaattr[0x80][1][1] = 16;
-        mdaattr[0x88][0][1] = mdaattr[0x88][1][1] = 16;
-    }
-
-    vflags = info->local;
-
-    overscan_x = overscan_y = 16;
-
-    self->cga.rgb_type = device_get_config_int("rgb_type");
-    cga_palette        = (self->cga.rgb_type << 1);
-    cgapal_rebuild();
-
-    self->cga.crtc[9] = 13;
-
-    return self;
-}
-
-void
-compaq_cga_close(void *priv)
-{
-    compaq_cga_t *self = (compaq_cga_t *) priv;
-
-    free(self->cga.vram);
-    free(self);
-}
-
-void
-compaq_cga_speed_changed(void *priv)
-{
-    compaq_cga_t *self = (compaq_cga_t *) priv;
-
-    if (self->cga.crtc[9] == 13) /* Character height */
-        compaq_cga_recalctimings(self);
-    else
-        cga_recalctimings(&self->cga);
-}
-
-extern const device_config_t cga_config[];
-
-const device_t compaq_cga_device = {
-    .name          = "Compaq CGA",
-    .internal_name = "compaq_cga",
-    .flags         = DEVICE_ISA,
-    .local         = 0,
-    .init          = compaq_cga_init,
-    .close         = compaq_cga_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = compaq_cga_speed_changed,
-    .force_redraw  = NULL,
-    .config        = cga_config
-};
-
-const device_t compaq_cga_2_device = {
-    .name          = "Compaq CGA 2",
-    .internal_name = "compaq_cga_2",
-    .flags         = DEVICE_ISA,
-    .local         = 1,
-    .init          = compaq_cga_init,
-    .close         = compaq_cga_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = compaq_cga_speed_changed,
-    .force_redraw  = NULL,
-    .config        = cga_config
-};
diff --git a/src/video/vid_ddc.c b/src/video/vid_ddc.c
index 387edaeb8..ba6ac2a6d 100644
--- a/src/video/vid_ddc.c
+++ b/src/video/vid_ddc.c
@@ -23,6 +23,9 @@
 #include <math.h>
 #include <86box/86box.h>
 #include <86box/i2c.h>
+#include <86box/vid_ddc.h>
+#include <86box/plat.h>
+#include <86box/ui.h>
 
 #define PIXEL_MM(px) (((px) * 25.4) / 96.0)
 #define STANDARD_TIMING(slot, width, aspect_ratio, refresh)                             \
@@ -126,8 +129,8 @@ typedef struct {
     uint8_t padding[15], checksum2;
 } edid_t;
 
-void *
-ddc_init(void *i2c)
+size_t
+ddc_create_default_edid(uint8_t **out)
 {
     edid_t *edid = malloc(sizeof(edid_t));
     memset(edid, 0, sizeof(edid_t));
@@ -138,12 +141,12 @@ ddc_init(void *i2c)
 
     memset(&edid->magic[1], 0xff, sizeof(edid->magic) - 2);
 
-    edid->mfg[0]       = 0x09; /* manufacturer "BOX" (apparently unassigned by UEFI) */
+    edid->mfg[0]       = 0x09; /* manufacturer "BOX" (currently unassigned by UEFI) */
     edid->mfg[1]       = 0xf8;
     edid->mfg_week     = 48;
     edid->mfg_year     = 2020 - 1990;
     edid->edid_version = 0x01;
-    edid->edid_rev     = 0x04; /* EDID 1.4, required for Xorg on Linux to use the preferred mode timing */
+    edid->edid_rev     = 0x04; /* EDID 1.4, required for Xorg on newer Linux to use the preferred mode timing instead of maxing out */
 
     edid->input_params = 0x0e; /* analog input; separate sync; composite sync; sync on green */
     edid->horiz_size   = round(horiz_mm / 10.0);
@@ -169,7 +172,7 @@ ddc_init(void *i2c)
     STANDARD_TIMING(standard_timings[2], 1366, STD_ASPECT_16_9, 60);  /* 1360x768 (closest to 1366x768) */
     STANDARD_TIMING(standard_timings[3], 1440, STD_ASPECT_16_10, 60); /* 1440x900 */
     STANDARD_TIMING(standard_timings[4], 1600, STD_ASPECT_16_9, 60);  /* 1600x900 */
-    STANDARD_TIMING(standard_timings[5], 1680, STD_ASPECT_16_10, 60); /* 1680x1050 */
+    STANDARD_TIMING(standard_timings[5], 1600, STD_ASPECT_4_3, 60);   /* 1600x1200 */
     STANDARD_TIMING(standard_timings[6], 1920, STD_ASPECT_16_9, 60);  /* 1920x1080 */
     STANDARD_TIMING(standard_timings[7], 2048, STD_ASPECT_4_3, 60);   /* 2048x1536 */
 
@@ -207,24 +210,94 @@ ddc_init(void *i2c)
     /* Detailed timing for 1366x768 */
     DETAILED_TIMING(ext_detailed_timings[0], 85500, 1366, 768, 426, 30, 70, 143, 3, 3);
 
-    /* High refresh rate timings (VGA is limited to 85 Hz) */
+    /* High refresh rate timings (within the standard 85 Hz VGA limit) */
     edid->ext_descriptors[1].tag = 0xfa; /* standard timing identifiers */
 #define ext_standard_timings0 ext_descriptors[1].ext_standard_timings.timings
-    STANDARD_TIMING(ext_standard_timings0[0], 640, STD_ASPECT_4_3, 90);  /* 640x480 @ 90 Hz */
-    STANDARD_TIMING(ext_standard_timings0[1], 640, STD_ASPECT_4_3, 120); /* 640x480 @ 120 Hz */
-    STANDARD_TIMING(ext_standard_timings0[2], 800, STD_ASPECT_4_3, 90);  /* 800x600 @ 90 Hz */
-    STANDARD_TIMING(ext_standard_timings0[3], 800, STD_ASPECT_4_3, 120); /* 800x600 @ 120 Hz */
-    STANDARD_TIMING(ext_standard_timings0[4], 1024, STD_ASPECT_4_3, 90); /* 1024x768 @ 90 Hz */
-    STANDARD_TIMING(ext_standard_timings0[5], 1280, STD_ASPECT_5_4, 90); /* 1280x1024 @ 90 Hz */
+    STANDARD_TIMING(ext_standard_timings0[0], 640, STD_ASPECT_4_3, 85);    /* 640x480 @ 85 Hz */
+    STANDARD_TIMING(ext_standard_timings0[1], 800, STD_ASPECT_4_3, 85);    /* 800x600 @ 85 Hz */
+    STANDARD_TIMING(ext_standard_timings0[2], 1024, STD_ASPECT_4_3, 85);   /* 1024x768 @ 85 Hz */
+    STANDARD_TIMING(ext_standard_timings0[3], 1280, STD_ASPECT_5_4, 85);   /* 1280x1024 @ 85 Hz */
+    STANDARD_TIMING(ext_standard_timings0[4], 1600, STD_ASPECT_4_3, 85);   /* 1600x1200 @ 85 Hz */
+    STANDARD_TIMING(ext_standard_timings0[5], 1680, STD_ASPECT_16_10, 60); /* 1680x1050 @ 60 Hz (previously in standard timings) */
     edid->ext_descriptors[1].ext_standard_timings.padding = 0x0a;
 
     for (uint8_t c = 128; c < 255; c++)
         edid->checksum2 += edid_bytes[c];
     edid->checksum2 = 256 - edid->checksum2;
 
-    return i2c_eeprom_init(i2c, 0x50, edid_bytes, sizeof(edid_t), 0);
+    if (out) {
+        *out = edid_bytes;
+    }
+
+    return sizeof(edid_t);
 }
 
+void *
+ddc_init_with_custom_edid(char *edid_path, void *i2c)
+{
+    uint8_t buffer[384] = { 0 };
+    size_t  size        = ddc_load_edid(edid_path, buffer, sizeof(buffer));
+
+    if (size > 256) {
+        wchar_t errmsg[2048] = { 0 };
+        wchar_t path[2048]   = { 0 };
+
+#ifdef _WIN32
+        mbstoc16s(path, monitor_edid_path, sizeof_w(path));
+#else
+        mbstowcs(path, monitor_edid_path, sizeof_w(path));
+#endif
+        swprintf(errmsg, sizeof_w(errmsg), plat_get_string(STRING_EDID_TOO_LARGE), path);
+        ui_msgbox_header(MBX_ERROR, L"EDID", errmsg);
+
+        return NULL;
+    } else if (size == 0) {
+        return NULL;
+    } else if (size < 128) {
+        size = 128;
+    } else if (size < 256) {
+        size = 256;
+    }
+
+    int checksum = 0;
+    for (int i = 0; i < 127; i++) {
+        checksum += buffer[i];
+    }
+
+    buffer[127] = 256 - checksum;
+
+    if (size == 256) {
+        checksum = 0;
+
+        for (int i = 128; i < 255; i++) {
+            checksum += buffer[i];
+        }
+        buffer[255] = 256 - checksum;
+    }
+
+    uint8_t *edid_bytes = malloc(size);
+    memcpy(edid_bytes, buffer, size);
+
+    return i2c_eeprom_init(i2c, 0x50, edid_bytes, size, 0);
+}
+
+void *
+ddc_init(void *i2c)
+{
+    if (monitor_edid && monitor_edid_path[0]) {
+        void *ret = ddc_init_with_custom_edid(monitor_edid_path, i2c);
+
+        if (ret) {
+            return ret;
+        }
+    }
+
+    uint8_t *edid_bytes;
+    size_t   edid_size = ddc_create_default_edid(&edid_bytes);
+    return i2c_eeprom_init(i2c, 0x50, edid_bytes, edid_size, 0);
+}
+
+
 void
 ddc_close(void *eeprom)
 {
diff --git a/src/video/vid_ddc_edid_custom.c b/src/video/vid_ddc_edid_custom.c
new file mode 100644
index 000000000..2febde67e
--- /dev/null
+++ b/src/video/vid_ddc_edid_custom.c
@@ -0,0 +1,137 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Custom monitor EDID file loader.
+ *
+ *
+ *
+ * Authors: Cacodemon345,
+ *          David Hrdlička, <hrdlickadavid@outlook.com>
+ *
+ *          Copyright 2025 Cacodemon.
+ *          Copyright 2025 David Hrdlička.
+ */
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define EDID_BLOCK_SIZE 128
+#define EDID_HEADER 0x00FFFFFFFFFFFF00
+#define EDID_DECODE_HEADER "edid-decode (hex):"
+
+static size_t
+read_block(FILE *fp, uint8_t *buf)
+{
+    char    temp[64];
+    size_t  read = 0;
+
+    for (int i = 0; i < 8; i++) {
+        if (!fgets(temp, sizeof(temp), fp)) {
+            return 0;
+        }
+
+        char *tok = strtok(temp, " \t\r\n");
+
+        for (int j = 0; j < 16; j++) {
+            if (!tok) {
+                return 0;
+            }
+
+            buf[read++] = strtoul(tok, NULL, 16);
+            tok         = strtok(NULL, " \t\r\n");
+        }
+    }
+
+    return read;
+}
+
+size_t
+ddc_load_edid(char *path, uint8_t *buf, size_t size)
+{
+    FILE   *fp   = fopen(path, "rb");
+    size_t  offset = 0;
+    char    temp[64];
+    long    pos;
+
+    if (!fp) {
+        return 0;
+    }
+
+    // Check the beginning of the file for the EDID header.
+    uint64_t header;
+    fread(&header, sizeof(header), 1, fp);
+
+    if (header == EDID_HEADER) {
+        // Binary format. Read as is
+        fseek(fp, 0, SEEK_SET);
+        offset = fread(buf, 1, size, fp);
+
+        fclose(fp);
+        return offset;
+    }
+
+    // Reopen in text mode.
+    fclose(fp);
+    fp = fopen(path, "rt");
+
+    if (!fp) {
+        return 0;
+    }
+
+#ifdef _WIN32
+    // Disable buffering on Windows because of a UCRT bug.
+    // https://developercommunity.visualstudio.com/t/fseek-ftell-fail-in-text-mode-for-unix-style-text/425878
+    setvbuf(fp, NULL, _IONBF, 0);
+#endif
+
+    // Skip the UTF-8 BOM, if any.
+    if (fread(temp, 1, 3, fp) != 3) {
+        fclose(fp);
+        return 0;
+    };
+
+    if ((uint8_t) temp[0] != 0xEF || (uint8_t) temp[1] != 0xBB || (uint8_t) temp[2] != 0xBF) {
+        rewind(fp);
+    }
+
+    // Find the `edid-decode (hex):` header.
+    do {
+        if (!fgets(temp, sizeof(temp), fp)) {
+            fclose(fp);
+            return 0;
+        }
+    } while (strncmp(temp, EDID_DECODE_HEADER, sizeof(EDID_DECODE_HEADER) - 1));
+
+    while (offset + EDID_BLOCK_SIZE <= size) {
+        // Skip any whitespace before the next block.
+        do {
+            pos = ftell(fp);
+            if (!fgets(temp, sizeof(temp), fp)) {
+                fclose(fp);
+                return offset;
+            }
+        } while (strspn(temp, " \t\r\n") == strlen(temp));
+
+        fseek(fp, pos, SEEK_SET);
+
+        // Read the block.
+        size_t block = read_block(fp, buf + offset);
+
+        if (block != EDID_BLOCK_SIZE) {
+            break;
+        }
+
+        offset += block;
+    }
+
+    fclose(fp);
+    return offset;
+}
diff --git a/src/video/vid_ega.c b/src/video/vid_ega.c
index 8f995117c..e96bd827c 100644
--- a/src/video/vid_ega.c
+++ b/src/video/vid_ega.c
@@ -45,20 +45,12 @@ void ega_doblit(int wx, int wy, ega_t *ega);
 #define BIOS_ISKRA_PATH  "roms/video/ega/143-02.bin", "roms/video/ega/143-03.bin"
 #define BIOS_TSENG_PATH  "roms/video/ega/EGA ET2000.BIN"
 
-enum {
-    EGA_IBM = 0,
-    EGA_COMPAQ,
-    EGA_SUPEREGA,
-    EGA_ATI800P,
-    EGA_ISKRA,
-    EGA_TSENG
-};
-
 static video_timings_t timing_ega = { .type = VIDEO_ISA, .write_b = 8, .write_w = 16, .write_l = 32, .read_b = 8, .read_w = 16, .read_l = 32 };
 static uint8_t         ega_rotate[8][256];
-static uint32_t        pallook16[256];
-static uint32_t        pallook64[256];
-static int             ega_type           = 0;
+static int             active             = 0;
+uint32_t               pallook16[256];
+uint32_t               pallook64[256];
+static int             ega_type           = EGA_TYPE_IBM;
 static int             old_overscan_color = 0;
 
 /* 3C2 controls default mode on EGA. On VGA, it determines monitor type (mono or colour):
@@ -75,8 +67,12 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
     ega_t  *ega = (ega_t *) priv;
     uint8_t o;
     uint8_t old;
+    int     type     = ega_type;
+    int     atype    = ega->actual_type;
+    uint8_t gdcmask  = (ega_type == EGA_SUPEREGA) ? 0xff : 0x0f;
+    uint8_t crtcmask = (atype == EGA_SUPEREGA) ? 0xff : 0x1f;
 
-    if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(ega->miscout & 1))
+    if (((((addr & 0xfff0) == 0x3d0) || ((addr & 0xfff0) == 0x2d0)) || (((addr & 0xfff0) == 0x3b0) || ((addr & 0xfff0) == 0x2b0))) && !(ega->miscout & 1))
         addr ^= 0x60;
 
     switch (addr) {
@@ -98,8 +94,12 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
             }
             break;
 
+        case 0x2c0:
         case 0x3c0:
+        case 0x2c1:
         case 0x3c1:
+            if (atype == EGA_SUPEREGA)
+                val &= 0x7f; /* Bit 7 indicates the flipflop status (read only) */
             if (!ega->attrff) {
                 ega->attraddr = val & 31;
                 if ((val & 0x20) != ega->attr_palette_enable) {
@@ -110,16 +110,21 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
             } else {
                 if ((ega->attraddr == 0x13) && (ega->attrregs[0x13] != val))
                     ega->fullchange = changeframecount;
-                o                                 = ega->attrregs[ega->attraddr & 31];
-                ega->attrregs[ega->attraddr & 31] = val;
+                uint8_t aidx        = ega->attraddr & 31;
+                o                   = ega->attrregs[aidx];
+                ega->attrregs[aidx] = val;
                 if (ega->attraddr < 16)
                     ega->fullchange = changeframecount;
-                if (ega->attraddr == 0x10 || ega->attraddr == 0x14 || ega->attraddr < 0x10) {
+                int is_attr14 = ega->chipset && (ega->attraddr == 0x14);
+                if ((ega->attraddr == 0x10) || is_attr14 || (ega->attraddr < 0x10)) {
                     for (uint8_t c = 0; c < 16; c++) {
-                        if (ega->attrregs[0x10] & 0x80)
-                            ega->egapal[c] = (ega->attrregs[c] & 0xf) | ((ega->attrregs[0x14] & 0xf) << 4);
-                        else
-                            ega->egapal[c] = (ega->attrregs[c] & 0x3f) | ((ega->attrregs[0x14] & 0xc) << 4);
+                        if (ega->chipset) {
+                            if (ega->attrregs[0x10] & 0x80)
+                                ega->egapal[c] = (ega->attrregs[c] & 0xf) | ((ega->attrregs[0x14] & 0xf) << 4);
+                            else
+                                ega->egapal[c] = (ega->attrregs[c] & 0x3f) | ((ega->attrregs[0x14] & 0xc) << 4);
+                        } else
+                            ega->egapal[c] = ega->attrregs[c] & 0x3f;
                     }
                     ega->fullchange = changeframecount;
                 }
@@ -137,22 +142,54 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
             }
             ega->attrff ^= 1;
             break;
+        case 0x2c2:
         case 0x3c2:
             o                   = ega->miscout;
             egaswitchread       = (val & 0xc) >> 2;
             ega->vres           = !(val & 0x80);
             ega->pallook        = ega->vres ? pallook16 : pallook64;
             ega->vidclock       = val & 4;
+            pclog("clock = %01X\n", (val & 0x0c) >> 2);
             ega->miscout        = val;
-            ega->overscan_color = ega->vres ? pallook16[ega->attrregs[0x11] & 0x0f] : pallook64[ega->attrregs[0x11] & 0x3f];
-            io_removehandler(0x03a0, 0x0020, ega_in, NULL, NULL, ega_out, NULL, NULL, ega);
-            if (!(val & 1))
-                io_sethandler(0x03a0, 0x0020, ega_in, NULL, NULL, ega_out, NULL, NULL, ega);
+            ega->overscan_color = ega->vres ? pallook16[ega->attrregs[0x11] & 0x0f] :
+                                              pallook64[ega->attrregs[0x11] & 0x3f];
+
+            uint16_t base_addr = 0x03a0;
+#ifdef EGA_ALT_ADDR_SUPPORT
+            if (ega->alt_addr == 1)
+                base_addr = 0x02a0;
+#endif
+            if (ega->priv_parent == NULL) {
+                io_removehandler(base_addr, 0x0020, ega_in, NULL, NULL, ega_out, NULL, NULL, ega);
+                if (!(val & 1))
+                    io_sethandler(base_addr, 0x0020, ega_in, NULL, NULL, ega_out, NULL, NULL, ega);
+            }
             ega_recalctimings(ega);
+            if ((type == EGA_TYPE_COMPAQ) && !(val & 0x02))
+                mem_mapping_disable(&ega->mapping);
+            else switch (ega->gdcreg[6] & 0xc) {
+                case 0x0: /*128k at A0000*/
+                    mem_mapping_set_addr(&ega->mapping, 0xa0000, 0x20000);
+                    break;
+                case 0x4: /*64k at A0000*/
+                    mem_mapping_set_addr(&ega->mapping, 0xa0000, 0x10000);
+                    break;
+                case 0x8: /*32k at B0000*/
+                    mem_mapping_set_addr(&ega->mapping, 0xb0000, 0x08000);
+                    break;
+                case 0xC: /*32k at B8000*/
+                    mem_mapping_set_addr(&ega->mapping, 0xb8000, 0x08000);
+                    break;
+
+                default:
+                    break;
+            }
             break;
+        case 0x2c4:
         case 0x3c4:
             ega->seqaddr = val;
             break;
+        case 0x2c5:
         case 0x3c5:
             o                                = ega->seqregs[ega->seqaddr & 0xf];
             ega->seqregs[ega->seqaddr & 0xf] = val;
@@ -179,16 +216,20 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
                     break;
             }
             break;
+        case 0x2c6:
         case 0x3c6:
-            if (ega_type == 2)
+            if (type == EGA_TYPE_COMPAQ)
                 ega->ctl_mode = val;
             break;
+        case 0x2ce:
         case 0x3ce:
             ega->gdcaddr = val;
             break;
-        case 0x3cf:
-            ega->gdcreg[ega->gdcaddr & 15] = val;
-            switch (ega->gdcaddr & 15) {
+        case 0x2cf:
+        case 0x3cf: {
+            uint8_t reg = ega->gdcaddr & gdcmask;
+            ega->gdcreg[reg] = val;
+            switch (reg) {
                 case 2:
                     ega->colourcompare = val;
                     break;
@@ -201,7 +242,9 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
                     ega->chain2_read = val & 0x10;
                     break;
                 case 6:
-                    switch (val & 0xc) {
+                    if ((type == EGA_TYPE_COMPAQ) && !(ega->miscout & 0x02))
+                        mem_mapping_disable(&ega->mapping);
+                    else switch (val & 0xc) {
                         case 0x0: /*128k at A0000*/
                             mem_mapping_set_addr(&ega->mapping, 0xa0000, 0x20000);
                             break;
@@ -223,37 +266,58 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
                     ega->colournocare = val;
                     break;
 
+                case 0xf8:
+                    ega->la = val;
+                    break;
+                case 0xf9:
+                    ega->lb = val;
+                    break;
+                case 0xfa:
+                    ega->lc = val;
+                    break;
+                case 0xfb:
+                    ega->ld = val;
+                    break;
+
                 default:
                     break;
             }
             break;
+        }
+        case 0x2d0:
         case 0x3d0:
+        case 0x2d4:
         case 0x3d4:
-            if (ega->chipset)
-                ega->crtcreg = val & 0x3f;
-            else
-                ega->crtcreg = val & 0x1f;
+            ega->crtcreg = ega->chipset ? (val & 0x3f) : val;
             return;
+        case 0x2d1:
         case 0x3d1:
-        case 0x3d5:
+        case 0x2d5:
+        case 0x3d5: {
+            int idx = ega->crtcreg;
+
             if (ega->chipset) {
-                if ((ega->crtcreg < 7) && (ega->crtc[0x11] & 0x80) && !(ega->regs[0xb4] & 0x80))
+                if ((idx < 7) && (ega->crtc[0x11] & 0x80) && !(ega->regs[0xb4] & 0x80))
                     return;
-                if ((ega->crtcreg == 7) && (ega->crtc[0x11] & 0x80) && !(ega->regs[0xb4] & 0x80))
+                if ((idx == 7) && (ega->crtc[0x11] & 0x80) && !(ega->regs[0xb4] & 0x80))
                     val = (ega->crtc[7] & ~0x10) | (val & 0x10);
             } else {
-                if ((ega->crtcreg < 7) && (ega->crtc[0x11] & 0x80))
+                idx &= crtcmask;
+                if ((idx >= 0x19) && (idx <= 0xf6))
                     return;
-                if ((ega->crtcreg == 7) && (ega->crtc[0x11] & 0x80))
+                if ((idx < 7) && (ega->crtc[0x11] & 0x80))
+                    return;
+                if ((idx == 7) && (ega->crtc[0x11] & 0x80))
                     val = (ega->crtc[7] & ~0x10) | (val & 0x10);
             }
-            old                     = ega->crtc[ega->crtcreg];
-            ega->crtc[ega->crtcreg] = val;
+            old            = ega->crtc[idx];
+            ega->crtc[idx] = val;
             if (old != val) {
-                if (ega->crtcreg < 0xe || ega->crtcreg > 0x10) {
-                    if ((ega->crtcreg == 0xc) || (ega->crtcreg == 0xd)) {
+                if ((idx < 0xe) || (idx > 0x10)) {
+                    if ((idx == 0xc) || (idx == 0xd)) {
                         ega->fullchange = 3;
-                        ega->ma_latch   = ((ega->crtc[0xc] << 8) | ega->crtc[0xd]) + ((ega->crtc[8] & 0x60) >> 5);
+                        ega->memaddr_latch   = ((ega->crtc[0xc] << 8) | ega->crtc[0xd]) +
+                                          ((ega->crtc[8] & 0x60) >> 5);
                     } else {
                         ega->fullchange = changeframecount;
                         ega_recalctimings(ega);
@@ -262,6 +326,8 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
             }
             break;
 
+        }
+
         default:
             break;
     }
@@ -270,10 +336,14 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
 uint8_t
 ega_in(uint16_t addr, void *priv)
 {
-    ega_t  *ega = (ega_t *) priv;
-    uint8_t ret = 0xff;
+    ega_t  *ega      = (ega_t *) priv;
+    uint8_t ret      = 0xff;
+    int     type     = ega_type;
+    int     atype    = ega->actual_type;
+    uint8_t gdcmask  = (atype == EGA_SUPEREGA) ? 0xff : 0x0f;
+    uint8_t crtcmask = (atype == EGA_SUPEREGA) ? 0xff : 0x1f;
 
-    if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(ega->miscout & 1))
+    if (((((addr & 0xfff0) == 0x3d0) || ((addr & 0xfff0) == 0x2d0)) || (((addr & 0xfff0) == 0x3b0) || ((addr & 0xfff0) == 0x2b0))) && !(ega->miscout & 1))
         addr ^= 0x60;
 
     switch (addr) {
@@ -294,53 +364,114 @@ ega_in(uint16_t addr, void *priv)
             }
             break;
 
+        case 0x2c0:
         case 0x3c0:
-            if (ega_type == 1)
-                ret = ega->attraddr | ega->attr_palette_enable;
-            break;
+        case 0x2c1:
         case 0x3c1:
-            if (ega_type == 1)
-                ret = ega->attrregs[ega->attraddr];
+            if (type == EGA_TYPE_OTHER) {
+                int data = (atype == EGA_SUPEREGA) ? (ega->attrff & 1) : (addr & 1);
+                if (data)
+                    ret = ega->attrregs[ega->attraddr];
+                else
+                    ret = ega->attraddr | ega->attr_palette_enable;
+                if (atype == EGA_SUPEREGA)
+                    /* Bit 7 indicates the flipflop status (read only) */
+                    ret = (ret & 0x3f) | (ega->attrff ? 0x80 : 0x00);
+            }
             break;
+        case 0x2c2:
         case 0x3c2:
             ret = (egaswitches & (8 >> egaswitchread)) ? 0x10 : 0x00;
             break;
+        case 0x2c4:
         case 0x3c4:
-            if (ega_type == 1)
-                ret = ega->seqaddr;
+            if (type == EGA_TYPE_OTHER) {
+                if (atype == EGA_SUPEREGA)
+                    ret = 0x1f | ((ega->miscout & 0x01) << 5);
+                else
+                    ret = ega->seqaddr;
+            }
             break;
+        case 0x2c5:
         case 0x3c5:
-            if (ega_type == 1)
-                ret = ega->seqregs[ega->seqaddr & 0xf];
+            if (type == EGA_TYPE_OTHER) {
+                uint8_t idx = ega->seqaddr & 0xf;
+                if (idx > 0x04)
+                    ret = ega->chipset ? ega->seqregs[idx] : 0xff;
+                else
+                    ret = ega->seqregs[idx];
+            }
             break;
+        case 0x2c6:
         case 0x3c6:
-            if (ega_type == 2)
+            if (type == EGA_TYPE_COMPAQ)
                 ret = ega->ctl_mode;
             break;
+        case 0x2c8:
         case 0x3c8:
-            if (ega_type == 1)
+            if (type == EGA_TYPE_OTHER)
                 ret = 2;
             break;
+        case 0x2cc:
         case 0x3cc:
-            if (ega_type == 1)
+            if (type == EGA_TYPE_OTHER)
                 ret = ega->miscout;
             break;
+        case 0x2ce:
         case 0x3ce:
-            if (ega_type == 1)
+            if (type == EGA_TYPE_OTHER) {
                 ret = ega->gdcaddr;
+                if (atype == EGA_SUPEREGA) {
+                    ret = (ret & 0x0f) | 0xe0;
+                    if ((ega->gdcaddr & 0xe0) == 0xe0)
+                        ret |= 0x10;
+                }
+            }
             break;
+        case 0x2cf:
         case 0x3cf:
-            if (ega_type == 1)
-                ret = ega->gdcreg[ega->gdcaddr & 0xf];
+            if (type == EGA_TYPE_OTHER) {
+                uint8_t gidx = ega->gdcaddr & gdcmask;
+                switch (gidx) {
+                    default:
+                        ret = ega->gdcreg[gidx];
+                        break;
+                    case 0x09 ... 0xf7:
+                        ret = ega->chipset ? ega->gdcreg[gidx] : 0xff;
+                        break;
+                    case 0xf8:
+                        ret = ega->la;
+                        break;
+                    case 0xf9:
+                        ret = ega->lb;
+                        break;
+                    case 0xfa:
+                        ret = ega->lc;
+                        break;
+                    case 0xfb:
+                        ret = ega->ld;
+                        break;
+                }
+            }
             break;
+        case 0x2d0:
         case 0x3d0:
+        case 0x2d4:
         case 0x3d4:
-            if (ega_type == 1)
+            if (type == EGA_TYPE_OTHER) {
                 ret = ega->crtcreg;
+                if (atype == EGA_SUPEREGA) {
+                    ret = (ret & 0x1f) | 0xc0;
+                    if ((ega->crtcreg & 0xc0) == 0xc0)
+                        ret |= 0x20;
+                }
+            }
             break;
+        case 0x2d1:
         case 0x3d1:
+        case 0x2d5:
         case 0x3d5:
-            switch (ega->crtcreg) {
+            switch (ega->crtcreg & crtcmask) {
                 case 0xc:
                 case 0xd:
                 case 0xe:
@@ -349,29 +480,35 @@ ega_in(uint16_t addr, void *priv)
                     break;
 
                 case 0x10:
-                    if (ega_type == 1)
+                    if (type == EGA_TYPE_OTHER)
                         ret = ega->crtc[ega->crtcreg];
                     else
                         ret = ega->light_pen >> 8;
                     break;
 
                 case 0x11:
-                    if (ega_type == 1)
+                    if (type == EGA_TYPE_OTHER)
                         ret = ega->crtc[ega->crtcreg];
                     else
                         ret = ega->light_pen & 0xff;
                     break;
 
+                case 0x19 ... 0xf6:
+                    if (type == EGA_TYPE_OTHER)
+                        ret = ega->chipset ? ega->crtc[ega->crtcreg] : 0xff;
+                    break;
+
                 default:
-                    if (ega_type == 1)
+                    if (type == EGA_TYPE_OTHER)
                         ret = ega->crtc[ega->crtcreg];
                     break;
             }
             break;
+        case 0x2da:
         case 0x3da:
             ega->attrff = 0;
-            if (ega_type == 2) {
-                ret = ega->stat & 0xcf;
+            if (type == EGA_TYPE_COMPAQ) {
+                ret = ega->status & 0xcf;
                 switch ((ega->attrregs[0x12] >> 4) & 0x03) {
                     case 0x00:
                         /* 00 = Pri. Red (5), Pri. Blue (4) */
@@ -392,12 +529,12 @@ ega_in(uint16_t addr, void *priv)
                         break;
                 }
             } else {
-                ega->stat ^= 0x30; /* Fools IBM EGA video BIOS self-test. */
-                ret = ega->stat;
+                ega->status ^= 0x30; /* Fools IBM EGA video BIOS self-test. */
+                ret = ega->status;
             }
             break;
         case 0x7c6:
-            ret = 0xfd;        /* EGA mode supported. */
+            ret = 0xfd; /* EGA mode supported. */
             break;
         case 0xbc6:
             /* 0000 = None;
@@ -428,6 +565,7 @@ ega_recalctimings(ega_t *ega)
     double _dispofftime;
     double disptime;
     double crtcconst;
+    double mdiv = (ega->seqregs[1] & 1) ? 8.0 : 9.0;
 
     ega->vtotal     = ega->crtc[6];
     ega->dispend    = ega->crtc[0x12];
@@ -436,19 +574,19 @@ ega_recalctimings(ega_t *ega)
 
     if (ega->crtc[7] & 1)
         ega->vtotal |= 0x100;
-    if (ega->crtc[7] & 32)
+    if ((ega->actual_type != EGA_SUPEREGA) && (ega->crtc[7] & 32))
         ega->vtotal |= 0x200;
     ega->vtotal += 2;
 
     if (ega->crtc[7] & 2)
         ega->dispend |= 0x100;
-    if (ega->crtc[7] & 64)
+    if ((ega->actual_type != EGA_SUPEREGA) && (ega->crtc[7] & 64))
         ega->dispend |= 0x200;
     ega->dispend++;
 
     if (ega->crtc[7] & 4)
         ega->vsyncstart |= 0x100;
-    if (ega->crtc[7] & 128)
+    if ((ega->actual_type != EGA_SUPEREGA) && (ega->crtc[7] & 128))
         ega->vsyncstart |= 0x200;
     ega->vsyncstart++;
 
@@ -466,7 +604,22 @@ ega_recalctimings(ega_t *ega)
     ega->linedbl  = ega->crtc[9] & 0x80;
     ega->rowcount = ega->crtc[9] & 0x1f;
 
-    if (ega_type == 2) {
+    if (ega->actual_type == EGA_SUPEREGA) {
+        switch ((ega->miscout >> 2) & 0x03) {
+            case 0x00:
+                crtcconst = (cpuclock / 16257000.0 * (double) (1ULL << 32));
+                break;
+            case 0x01:
+                crtcconst = (cpuclock / (157500000.0 / 11.0) * (double) (1ULL << 32));
+                break;
+            default:
+            case 0x02: case 0x03:
+                crtcconst = (cpuclock / 25110000.0 * (double) (1ULL << 32));
+                break;
+        }
+
+        crtcconst *= mdiv;
+    } else if (ega_type == EGA_TYPE_COMPAQ) {
         color = (ega->miscout & 1);
         clksel = ((ega->miscout & 0xc) >> 2);
 
@@ -481,10 +634,7 @@ ega_recalctimings(ega_t *ega)
             else
                 crtcconst = (cpuclock / 16872000.0 * (double) (1ULL << 32));
         }
-        if (!(ega->seqregs[1] & 1))
-            crtcconst *= 9.0;
-        else
-            crtcconst *= 8.0;
+        crtcconst *= mdiv;
     } else if (ega->eeprom) {
         clksel = ((ega->miscout & 0xc) >> 2) | ((ega->regs[0xbe] & 0x10) ? 4 : 0);
 
@@ -506,24 +656,19 @@ ega_recalctimings(ega_t *ega)
                 crtcconst = (cpuclock / 36000000.0 * (double) (1ULL << 32));
                 break;
         }
-        if (!(ega->seqregs[1] & 1))
-            crtcconst *= 9.0;
-        else
-            crtcconst *= 8.0;
+        crtcconst *= mdiv;
     } else {
         if (ega->vidclock)
-            crtcconst = (ega->seqregs[1] & 1) ? MDACONST : (MDACONST * (9.0 / 8.0));
+            crtcconst = (cpuclock / 16257000.0 * (double) (1ULL << 32));
         else
-            crtcconst = (ega->seqregs[1] & 1) ? CGACONST : (CGACONST * (9.0 / 8.0));
+            crtcconst = (cpuclock / (157500000.0 / 11.0) * (double) (1ULL << 32));
+        crtcconst *= mdiv;
     }
-    if (!(ega->seqregs[1] & 1))
-        ega->dot_clock = crtcconst / 9.0;
-    else
-        ega->dot_clock = crtcconst / 8.0;
+    ega->dot_clock = crtcconst / mdiv;
 
     ega->interlace = 0;
 
-    ega->ma_latch = (ega->crtc[0xc] << 8) | ega->crtc[0xd];
+    ega->memaddr_latch = (ega->crtc[0xc] << 8) | ega->crtc[0xd];
 
     ega->render = ega_render_blank;
     if (!ega->scrblank && ega->attr_palette_enable) {
@@ -532,17 +677,16 @@ ega_recalctimings(ega_t *ega)
                 ega->hdisp *= (ega->seqregs[1] & 1) ? 16 : 18;
             else
                 ega->hdisp *= (ega->seqregs[1] & 1) ? 8 : 9;
-            ega->render    = ega_render_text;
-            ega->hdisp_old = ega->hdisp;
+            ega->render = ega_render_text;
         } else {
             ega->hdisp *= (ega->seqregs[1] & 8) ? 16 : 8;
-            ega->render    = ega_render_graphics;
-            ega->hdisp_old = ega->hdisp;
+            ega->render = ega_render_graphics;
         }
+        ega->hdisp_old = ega->hdisp;
     }
 
     if (ega->chipset) {
-        if (ega->hdisp > 640) {
+        if (ega->hdisp >= 800) {
             ega->dispend <<= 1;
             ega->vtotal <<= 1;
             ega->split <<= 1;
@@ -570,11 +714,16 @@ ega_recalctimings(ega_t *ega)
         ega->y_add >>= 1;
 
     if (ega->seqregs[1] & 8) {
-        disptime    = (double) ((ega->crtc[0] + 2) << 1);
-        _dispontime = (double) ((ega->crtc[1] + 1) << 1);
+        disptime     = (double) ((ega->crtc[0] + 2) << 1);
+        _dispontime  = (double) ((ega->crtc[1] + 1) << 1);
     } else {
-        disptime    = (double) (ega->crtc[0] + 2);
-        _dispontime = (double) (ega->crtc[1] + 1);
+        disptime     = (double) (ega->crtc[0] + 2);
+        _dispontime  = (double) (ega->crtc[1] + 1);
+    }
+    if ((ega->actual_type == EGA_SUPEREGA) && (ega->crtc[0x17] & 0x10) &&
+        (ega->crtc[0xf9] & 0x01)) {
+        disptime    *= 2.0;
+        _dispontime *= 2.0;
     }
     _dispofftime = disptime - _dispontime;
     _dispontime *= crtcconst;
@@ -587,9 +736,16 @@ ega_recalctimings(ega_t *ega)
     if (ega->dispofftime < TIMER_USEC)
         ega->dispofftime = TIMER_USEC;
 
-    ega->dot_time  = (uint64_t) (ega->dot_clock);
-    if (ega->dot_time < TIMER_USEC)
-        ega->dot_time = TIMER_USEC;
+    if (ega_type == EGA_TYPE_COMPAQ) {
+        ega->dot_time  = (uint64_t) (ega->dot_clock);
+        if (ega->dot_time < TIMER_USEC)
+            ega->dot_time = TIMER_USEC;
+        timer_disable(&ega->dot_timer);
+        timer_set_delay_u64(&ega->dot_timer, ega->dot_time);
+        ega->cca = 0;
+        active   = 1;
+        ega->dot = 0;
+    }
 
     ega_recalc_remap_func(ega);
 }
@@ -599,31 +755,30 @@ ega_recalctimings(ega_t *ega)
 void
 ega_dot_poll(void *priv)
 {
-    ega_t   *ega = (ega_t *) priv;
-    static uint8_t chr;
-    static uint8_t attr;
-    const bool doublewidth   = ((ega->seqregs[1] & 8) != 0);
-    const bool attrblink     = ((ega->attrregs[0x10] & 8) != 0);
-    const bool attrlinechars = (ega->attrregs[0x10] & 4);
-    const bool crtcreset     = ((ega->crtc[0x17] & 0x80) == 0);
-    const bool seq9dot       = ((ega->seqregs[1] & 1) == 0);
-    const bool blinked       = ega->blink & 0x10;
-    const int  dwshift       = doublewidth ? 1 : 0;
-    const int  dotwidth      = 1 << dwshift;
-    const int  charwidth     = dotwidth * (seq9dot ? 9 : 8);
-    const int  cursoron      = (ega->sc == (ega->crtc[10] & 31));
-    const int  cursoraddr    = (ega->crtc[0xe] << 8) | ega->crtc[0xf];
-    uint32_t addr;
-    int drawcursor;
-    uint32_t charaddr;
-    static int fg;
-    static int bg;
-    static uint32_t dat;
-    static int disptime;
-    static int _dispontime;
-    static int _dispofftime;
-    static int cclock = 0;
-    static int active = 0;
+    ega_t          *ega           = (ega_t *) priv;
+    static uint8_t  chr;
+    static uint8_t  attr;
+    const bool      doublewidth   = ((ega->seqregs[1] & 8) != 0);
+    const bool      attrblink     = ((ega->attrregs[0x10] & 8) != 0);
+    const bool      attrlinechars = (ega->attrregs[0x10] & 4);
+    const bool      crtcreset     = ((ega->crtc[0x17] & 0x80) == 0);
+    const bool      seq9dot       = ((ega->seqregs[1] & 1) == 0);
+    const bool      blinked       = ega->blink & 0x10;
+    const int       dwshift       = doublewidth ? 1 : 0;
+    const int       dotwidth      = 1 << dwshift;
+    const int       charwidth     = dotwidth * (seq9dot ? 9 : 8);
+    const int       cursoron      = (ega->scanline == (ega->crtc[10] & 31));
+    const int       cursoraddr    = (ega->crtc[0xe] << 8) | ega->crtc[0xf];
+    uint32_t        addr;
+    int             drawcursor;
+    uint32_t        charaddr;
+    static int      fg            = 0;
+    static int      bg            = 0;
+    static uint32_t dat           = 0x00000000;
+    static int      cclock        = 0;
+    static int      disptime;
+    static int      _dispontime;
+    static int      _dispofftime;
 
     if (ega->seqregs[1] & 8) {
         disptime    = ((ega->crtc[0] + 2) << 1);
@@ -656,7 +811,7 @@ ega_dot_poll(void *priv)
     else
         charaddr = ega->charseta + (chr * 0x80);
 
-    dat = ega->vram[charaddr + (ega->sc << 2)];
+    dat = ega->vram[charaddr + (ega->scanline << 2)];
     dat <<= 1;
     if ((chr & ~0x1F) == 0xC0 && attrlinechars)
         dat |= (dat >> 1) & 1;
@@ -695,30 +850,28 @@ void
 ega_poll(void *priv)
 {
     ega_t   *ega = (ega_t *) priv;
-    int      x, y;
     int      old_ma;
     int      wx = 640;
     int      wy = 350;
-    uint32_t blink_delay;
 
     if (!ega->linepos) {
         timer_advance_u64(&ega->timer, ega->dispofftime);
-        ega->stat |= 1;
+        ega->status |= 1;
         ega->linepos = 1;
 
         if (ega->dispon) {
             ega->hdisp_on = 1;
 
-            ega->ma &= ega->vrammask;
+            ega->memaddr &= ega->vrammask;
             if (ega->firstline == 2000) {
                 ega->firstline = ega->displine;
                 video_wait_for_buffer();
             }
 
-            old_ma = ega->ma;
+            old_ma = ega->memaddr;
             ega->displine *= ega->vres + 1;
             ega->y_add *= ega->vres + 1;
-            for (y = 0; y <= ega->vres; y++) {
+            for (int y = 0; y <= ega->vres; y++) {
                 /* Render scanline */
                 ega->render(ega);
 
@@ -729,7 +882,7 @@ ega_poll(void *priv)
                 ega->x_add = (overscan_x >> 1) - ega->scrollcache;
 
                 if (y != ega->vres) {
-                    ega->ma = old_ma;
+                    ega->memaddr = old_ma;
                     ega->displine++;
                 }
             }
@@ -743,11 +896,11 @@ ega_poll(void *priv)
         ega->displine++;
         if (ega->interlace)
             ega->displine++;
-        if ((ega->stat & 8) && ((ega->displine & 15) == (ega->crtc[0x11] & 15)) && ega->vslines)
-            ega->stat &= ~8;
+        if ((ega->status & 8) && ((ega->displine & 15) == (ega->crtc[0x11] & 15)) && ega->vslines)
+            ega->status &= ~8;
         ega->vslines++;
         if (ega->chipset) {
-            if (ega->hdisp > 640) {
+            if (ega->hdisp >= 800) {
                 if (ega->displine > 2000)
                     ega->displine = 0;
             } else {
@@ -762,40 +915,43 @@ ega_poll(void *priv)
         timer_advance_u64(&ega->timer, ega->dispontime);
 
         if (ega->dispon)
-            ega->stat &= ~1;
+            ega->status &= ~1;
         ega->hdisp_on = 0;
 
         ega->linepos = 0;
-        if ((ega->sc == (ega->crtc[11] & 31)) || (ega->sc == ega->rowcount))
-            ega->con = 0;
+        if ((ega->scanline == (ega->crtc[11] & 31)) || (ega->scanline == ega->rowcount))
+            ega->cursorvisible = 0;
         if (ega->dispon) {
             /* TODO: Verify real hardware behaviour for out-of-range fine vertical scroll */
             if (ega->linedbl && !ega->linecountff) {
                 ega->linecountff = 1;
-                ega->ma          = ega->maback;
-                ega->cca          = ega->maback;
+                ega->memaddr          = ega->memaddr_backup;
+                ega->cca          = ega->memaddr_backup;
             }
-            if (ega->sc == (ega->crtc[9] & 31)) {
+            if (ega->scanline == (ega->crtc[9] & 31)) {
                 ega->linecountff = 0;
-                ega->sc          = 0;
+                ega->scanline          = 0;
 
-                ega->maback += (ega->rowoffset << 3);
+                ega->memaddr_backup += (ega->rowoffset << 3);
                 if (ega->interlace)
-                    ega->maback += (ega->rowoffset << 3);
-                ega->maback &= ega->vrammask;
-                ega->ma = ega->maback;
-                ega->cca = ega->maback;
+                    ega->memaddr_backup += (ega->rowoffset << 3);
+                ega->memaddr_backup &= ega->vrammask;
+                ega->memaddr = ega->memaddr_backup;
+                ega->cca = ega->memaddr_backup;
             } else {
                 ega->linecountff = 0;
-                ega->sc++;
-                ega->sc &= 31;
-                ega->ma = ega->maback;
-                ega->cca = ega->maback;
+                ega->scanline++;
+                ega->scanline &= 31;
+                ega->memaddr = ega->memaddr_backup;
+                ega->cca = ega->memaddr_backup;
             }
         }
-        ega->vc++;
+        ega->real_vc++;
+        if ((ega->actual_type != EGA_SUPEREGA) || !(ega->crtc[0xf9] & 0x02) ||
+            !(ega->real_vc & 1))
+            ega->vc++;
         if (ega->chipset) {
-            if (ega->hdisp > 640)
+            if (ega->hdisp >= 800)
                 ega->vc &= 1023;
             else
                 ega->vc &= 511;
@@ -804,17 +960,17 @@ ega_poll(void *priv)
         if (ega->vc == ega->split) {
             // TODO: Implement the hardware bug where the first scanline is drawn twice when the split happens
             if (ega->interlace && ega->oddeven)
-                ega->ma = ega->maback = ega->rowoffset << 1;
+                ega->memaddr = ega->memaddr_backup = ega->rowoffset << 1;
             else
-                ega->ma = ega->maback = 0;
-            ega->ma <<= 2;
-            ega->cca = ega->ma;
-            ega->maback <<= 2;
-            ega->sc = 0;
+                ega->memaddr = ega->memaddr_backup = 0;
+            ega->memaddr <<= 2;
+            ega->cca = ega->memaddr;
+            ega->memaddr_backup <<= 2;
+            ega->scanline = 0;
         }
         if (ega->vc == ega->dispend) {
             ega->dispon = 0;
-            blink_delay = (ega->crtc[11] & 0x60) >> 5;
+            uint32_t blink_delay = (ega->crtc[11] & 0x60) >> 5;
             if (ega->crtc[10] & 0x20)
                 ega->cursoron = 0;
             else if (blink_delay == 2)
@@ -831,24 +987,28 @@ ega_poll(void *priv)
         }
         if (ega->vc == ega->vsyncstart) {
             ega->dispon = 0;
-            ega->stat |= 8;
+            ega->status |= 8;
 #if 0
             picint(1 << 2);
 #endif
-            x = ega->hdisp;
+//            x = ega->hdisp;
 
             if (ega->interlace && !ega->oddeven)
                 ega->lastline++;
             if (ega->interlace && ega->oddeven)
                 ega->firstline--;
 
-            wx = x;
+            wx = ega->hdisp;
 
             if (ega->vres) {
                 wy = (ega->lastline - ega->firstline) << 1;
+                if ((ega->actual_type == EGA_SUPEREGA) && (ega->crtc[0xf9] & 0x02))
+                    wy >>= 1;
                 ega_doblit(wx, wy, ega);
             } else {
                 wy = ega->lastline - ega->firstline;
+                if ((ega->actual_type == EGA_SUPEREGA) && (ega->crtc[0xf9] & 0x02))
+                    wy >>= 1;
                 ega_doblit(wx, wy, ega);
             }
 
@@ -866,19 +1026,19 @@ ega_poll(void *priv)
             ega->vslines     = 0;
 
             if (ega->interlace && ega->oddeven)
-                ega->ma = ega->maback = ega->ma_latch + (ega->rowoffset << 1);
+                ega->memaddr = ega->memaddr_backup = ega->memaddr_latch + (ega->rowoffset << 1);
             else
-                ega->ma = ega->maback = ega->ma_latch;
-            ega->ca = (ega->crtc[0xe] << 8) | ega->crtc[0xf];
+                ega->memaddr = ega->memaddr_backup = ega->memaddr_latch;
+            ega->cursoraddr = (ega->crtc[0xe] << 8) | ega->crtc[0xf];
 
-            ega->ma <<= 2;
-            ega->maback <<= 2;
-            ega->ca <<= 2;
-            ega->cca = ega->ma;
+            ega->memaddr <<= 2;
+            ega->memaddr_backup <<= 2;
+            ega->cursoraddr <<= 2;
+            ega->cca = ega->memaddr;
         }
         if (ega->vc == ega->vtotal) {
             ega->vc       = 0;
-            ega->sc       = (ega->crtc[0x8] & 0x1f);
+            ega->scanline       = (ega->crtc[0x8] & 0x1f);
             ega->dispon   = 1;
             ega->displine = (ega->interlace && ega->oddeven) ? 1 : 0;
 
@@ -895,8 +1055,8 @@ ega_poll(void *priv)
 
             ega->linecountff = 0;
         }
-        if (ega->sc == (ega->crtc[10] & 31))
-            ega->con = 1;
+        if (ega->scanline == (ega->crtc[10] & 31))
+            ega->cursorvisible = 1;
     }
 }
 
@@ -909,9 +1069,6 @@ ega_doblit(int wx, int wy, ega_t *ega)
     int       y_start = enable_overscan ? 0 : (unscaled_overscan_y >> 1);
     int       x_start = enable_overscan ? 0 : (overscan_x >> 1);
     int       bottom  = (unscaled_overscan_y >> 1);
-    uint32_t *p;
-    int       i;
-    int       j;
     int       xs_temp;
     int       ys_temp;
 
@@ -958,17 +1115,17 @@ ega_doblit(int wx, int wy, ega_t *ega)
 
     if ((wx >= 160) && ((wy + 1) >= 120)) {
         /* Draw (overscan_size - scroll size) lines of overscan on top and bottom. */
-        for (i = 0; i < ega->y_add; i++) {
-            p = &buffer32->line[i & 0x7ff][0];
+        for (int i = 0; i < ega->y_add; i++) {
+            uint32_t *p = &buffer32->line[i & 0x7ff][0];
 
-            for (j = 0; j < (xsize + x_add); j++)
+            for (int j = 0; j < (xsize + x_add); j++)
                 p[j] = ega->overscan_color;
         }
 
-        for (i = 0; i < bottom; i++) {
-            p = &buffer32->line[(ysize + ega->y_add + i) & 0x7ff][0];
+        for (int i = 0; i < bottom; i++) {
+            uint32_t *p = &buffer32->line[(ysize + ega->y_add + i) & 0x7ff][0];
 
-            for (j = 0; j < (xsize + x_add); j++)
+            for (int j = 0; j < (xsize + x_add); j++)
                 p[j] = ega->overscan_color;
         }
     }
@@ -992,12 +1149,11 @@ ega_remap_cpu_addr(uint32_t inaddr, ega_t *ega)
     // bit 2: 1 = 128K mapping, 0 = other mapping (from memory decode PROM)
     a0mux = 0;
 
-    if (ega->gdcreg[6] & 2) {
+    if (ega->gdcreg[6] & 2)
         a0mux |= 2;
-    }
-    if (ega->vram_limit <= 64 * 1024) {
+
+    if (ega->vram_limit <= 64 * 1024)
         a0mux |= 1;
-    }
 
     switch (ega->gdcreg[6] & 0xC) {
         case 0x0: // 128K A000
@@ -1064,11 +1220,8 @@ ega_write(uint32_t addr, uint8_t val, void *priv)
 
     cycles -= video_timing_write_b;
 
-    if (ega->chain2_write) {
-        writemask2 &= ~0xa;
-        if (addr & 1)
-            writemask2 <<= 1;
-    }
+    if (ega->chain2_write)
+        writemask2 &= 0x5 << (addr & 1);
 
     addr = ega_remap_cpu_addr(addr, ega);
 
@@ -1248,9 +1401,8 @@ ega_read(uint32_t addr, void *priv)
 
     cycles -= video_timing_read_b;
 
-    if (ega->chain2_read) {
+    if (ega->chain2_read)
         readplane = (readplane & 2) | (addr & 1);
-    }
 
     addr = ega_remap_cpu_addr(addr, ega);
 
@@ -1278,29 +1430,29 @@ ega_read(uint32_t addr, void *priv)
         temp4 &= (ega->colournocare & 8) ? 0xff : 0;
         return ~(temp | temp2 | temp3 | temp4);
     }
+
+    if ((ega_type == EGA_TYPE_COMPAQ) && (ega->gdcreg[4] & 0x04))
+        return 0xff;
+
     return ega->vram[addr | readplane];
 }
 
 void
 ega_init(ega_t *ega, int monitor_type, int is_mono)
 {
-    int c;
-    int d;
-    int e;
-
     ega->vram     = malloc(0x40000);
     ega->vrammask = 0x3ffff;
 
-    for (c = 0; c < 256; c++) {
-        e = c;
-        for (d = 0; d < 8; d++) {
+    for (uint16_t c = 0; c < 256; c++) {
+        int e = c;
+        for (uint8_t d = 0; d < 8; d++) {
             ega_rotate[d][c] = e;
             e                = (e >> 1) | ((e & 1) ? 0x80 : 0);
         }
     }
 
     if (is_mono) {
-        for (c = 0; c < 256; c++) {
+        for (uint16_t c = 0; c < 256; c++) {
             if (((c >> 3) & 3) == 0)
                 pallook64[c] = pallook16[c] = makecol32(0, 0, 0);
             else
@@ -1357,9 +1509,14 @@ ega_init(ega_t *ega, int monitor_type, int is_mono)
                 }
         }
 
-        io_sethandler(0x03a0, 0x0020, ega_in, NULL, NULL, ega_out, NULL, NULL, ega);
+        uint16_t base_addr = 0x03a0;
+#ifdef EGA_ALT_ADDR_SUPPORT
+        if (ega->alt_addr == 1)
+            base_addr = 0x02a0;
+#endif
+        io_sethandler(base_addr, 0x0020, ega_in, NULL, NULL, ega_out, NULL, NULL, ega);
     } else {
-        for (c = 0; c < 256; c++) {
+        for (uint16_t c = 0; c < 256; c++) {
             pallook64[c] = makecol32(((c >> 2) & 1) * 0xaa, ((c >> 1) & 1) * 0xaa, (c & 1) * 0xaa);
             pallook64[c] += makecol32(((c >> 5) & 1) * 0x55, ((c >> 4) & 1) * 0x55, ((c >> 3) & 1) * 0x55);
             pallook16[c] = makecol32(((c >> 2) & 1) * 0xaa, ((c >> 1) & 1) * 0xaa, (c & 1) * 0xaa);
@@ -1373,6 +1530,26 @@ ega_init(ega_t *ega, int monitor_type, int is_mono)
 
     ega->pallook = pallook16;
 
+    for (uint16_t c = 0; c < 256; c++) {
+        ega->mda_attr_to_color_table[c][0][0] = ega->mda_attr_to_color_table[c][1][0] = ega->mda_attr_to_color_table[c][1][1] = 16;
+        if (c & 8)
+            ega->mda_attr_to_color_table[c][0][1] = 15 + 16;
+        else
+            ega->mda_attr_to_color_table[c][0][1] = 7 + 16;
+    }
+    ega->mda_attr_to_color_table[0x70][0][1] = 16;
+    ega->mda_attr_to_color_table[0x70][0][0] = ega->mda_attr_to_color_table[0x70][1][0] = ega->mda_attr_to_color_table[0x70][1][1] = 16 + 15;
+    ega->mda_attr_to_color_table[0xF0][0][1]                                                       = 16;
+    ega->mda_attr_to_color_table[0xF0][0][0] = ega->mda_attr_to_color_table[0xF0][1][0] = ega->mda_attr_to_color_table[0xF0][1][1] = 16 + 15;
+    ega->mda_attr_to_color_table[0x78][0][1]                                                       = 16 + 7;
+    ega->mda_attr_to_color_table[0x78][0][0] = ega->mda_attr_to_color_table[0x78][1][0] = ega->mda_attr_to_color_table[0x78][1][1] = 16 + 15;
+    ega->mda_attr_to_color_table[0xF8][0][1]                                                       = 16 + 7;
+    ega->mda_attr_to_color_table[0xF8][0][0] = ega->mda_attr_to_color_table[0xF8][1][0] = ega->mda_attr_to_color_table[0xF8][1][1] = 16 + 15;
+    ega->mda_attr_to_color_table[0x00][0][1] = ega->mda_attr_to_color_table[0x00][1][1] = 16;
+    ega->mda_attr_to_color_table[0x08][0][1] = ega->mda_attr_to_color_table[0x08][1][1] = 16;
+    ega->mda_attr_to_color_table[0x80][0][1] = ega->mda_attr_to_color_table[0x80][1][1] = 16;
+    ega->mda_attr_to_color_table[0x88][0][1] = ega->mda_attr_to_color_table[0x88][1][1] = 16;
+
     egaswitches = monitor_type & 0xf;
 
     ega->vram_limit = 256 * 1024;
@@ -1391,19 +1568,43 @@ ega_init(ega_t *ega, int monitor_type, int is_mono)
     ega->crtc[0] = 63;
     ega->crtc[6] = 255;
 
+    ega->render_override = NULL;
+
     timer_add(&ega->timer, ega_poll, ega, 1);
-    if (ega_type == 2)
+    if (ega_type == EGA_TYPE_COMPAQ)
         timer_add(&ega->dot_timer, ega_dot_poll, ega, 1);
 }
 
+void
+ega_set_type(void *priv, uint32_t local)
+{
+    ega_t *ega = (ega_t *) priv;
+
+    if ((local == EGA_IBM) || (local == EGA_ISKRA) || (local == EGA_TSENG))
+        ega_type = EGA_TYPE_IBM;
+    else if (local == EGA_COMPAQ)
+        ega_type = EGA_TYPE_COMPAQ;
+    else
+        ega_type = EGA_TYPE_OTHER;
+
+    ega->actual_type = local;
+    ega->chipset = 0;
+
+    switch (local) {
+        default:
+            break;
+        case EGA_ATI800P:
+            ega->chipset = 1;
+            break;
+    }
+}
+
 static void *
 ega_standalone_init(const device_t *info)
 {
-    ega_t *ega = malloc(sizeof(ega_t));
+    ega_t *ega = calloc(1, sizeof(ega_t));
     int    monitor_type;
 
-    memset(ega, 0x00, sizeof(ega_t));
-
     video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_ega);
 
     overscan_x = 16;
@@ -1412,11 +1613,11 @@ ega_standalone_init(const device_t *info)
     ega->y_add = 14;
 
     if ((info->local == EGA_IBM) || (info->local == EGA_ISKRA) || (info->local == EGA_TSENG))
-        ega_type = 0;
+        ega_type = EGA_TYPE_IBM;
     else if (info->local == EGA_COMPAQ)
-        ega_type = 2;
+        ega_type = EGA_TYPE_COMPAQ;
     else
-        ega_type = 1;
+        ega_type = EGA_TYPE_OTHER;
 
     ega->actual_type = info->local;
     ega->chipset = 0;
@@ -1459,19 +1660,28 @@ ega_standalone_init(const device_t *info)
         }
     }
 
-    monitor_type = device_get_config_int("monitor_type");
+    monitor_type = ega->chipset ? 0x09 : device_get_config_int("monitor_type");
     ega_init(ega, monitor_type, (monitor_type & 0x0F) == 0x0B);
 
     ega->vram_limit = device_get_config_int("memory") * 1024;
     ega->vrammask   = ega->vram_limit - 1;
 
     mem_mapping_add(&ega->mapping, 0xa0000, 0x20000, ega_read, NULL, NULL, ega_write, NULL, NULL, NULL, MEM_MAPPING_EXTERNAL, ega);
-    io_sethandler(0x03c0, 0x0020, ega_in, NULL, NULL, ega_out, NULL, NULL, ega);
+    if (ega_type == EGA_TYPE_COMPAQ)
+        mem_mapping_disable(&ega->mapping);
+    uint16_t addr = 0x03c0;
+#ifdef EGA_ALT_ADDR_SUPPORT
+    if (ega_type == EGA_TYPE_IBM) {
+        addr = device_get_config_hex16("base");
+        if (addr == 0x02c0)
+            ega->alt_addr = 1;
+    }
+#endif
+    io_sethandler(addr, 0x0020, ega_in, NULL, NULL, ega_out, NULL, NULL, ega);
 
     if (ega->chipset) {
         io_sethandler(0x01ce, 0x0002, ega_in, NULL, NULL, ega_out, NULL, NULL, ega);
-        ega->eeprom = malloc(sizeof(ati_eeprom_t));
-        memset(ega->eeprom, 0, sizeof(ati_eeprom_t));
+        ega->eeprom = calloc(1, sizeof(ati_eeprom_t));
         ati_eeprom_load((ati_eeprom_t *) ega->eeprom, "egawonder800p.nvr", 0);
     } else if (info->local == EGA_COMPAQ) {
         io_sethandler(0x0084, 0x0001, ega_in, NULL, NULL, ega_out, NULL, NULL, ega);
@@ -1547,77 +1757,129 @@ ega_speed_changed(void *priv)
 
    0 = Switch closed (ON);
    1 = Switch open   (OFF). */
+static const device_config_t ega_ibm_config[] = {
+  // clang-format off
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 256,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description =  "32 KB", .value =  32 },
+            { .description =  "64 KB", .value =  64 },
+            { .description = "128 KB", .value = 128 },
+            { .description = "256 KB", .value = 256 },
+            { .description = ""                     }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "monitor_type",
+        .description    = "Monitor type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 9,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Monochrome (5151/MDA) (white)",             .value = 0x0B | (DISPLAY_WHITE << 4) },
+            { .description = "Monochrome (5151/MDA) (green)",             .value = 0x0B | (DISPLAY_GREEN << 4) },
+            { .description = "Monochrome (5151/MDA) (amber)",             .value = 0x0B | (DISPLAY_AMBER << 4) },
+            { .description = "Color 40x25 (5153/CGA)",                    .value = 0x06                        },
+            { .description = "Color 80x25 (5153/CGA)",                    .value = 0x07                        },
+            { .description = "Enhanced Color - Normal Mode (5154/ECD)",   .value = 0x08                        },
+            { .description = "Enhanced Color - Enhanced Mode (5154/ECD)", .value = 0x09                        },
+            { .description = ""                                                                                }
+        },
+        .bios           = { { 0 } }
+    },
+#ifdef EGA_ALT_ADDR_SUPPORT
+    {
+        .name           = "base",
+        .description    = "Address",
+        .type           = CONFIG_HEX16,
+        .default_string = NULL,
+        .default_int    = 0x03c0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "0x3C0", .value = 0x03c0 },
+            { .description = "0x2C0", .value = 0x02c0 },
+            { .description = ""                       }
+        },
+        .bios           = { { 0 } }
+    },
+#endif
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
 static const device_config_t ega_config[] = {
   // clang-format off
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 256,
-        .selection = {
-            {
-                .description = "32 kB",
-                .value = 32
-            },
-            {
-                .description = "64 kB",
-                .value = 64
-            },
-            {
-                .description = "128 kB",
-                .value = 128
-            },
-            {
-                .description = "256 kB",
-                .value = 256
-            },
-            {
-                .description = ""
-            }
-        }
-    },
-    {
-        .name = "monitor_type",
-        .description = "Monitor type",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "Monochrome (5151/MDA) (white)",
-                .value = 0x0B | (DISPLAY_WHITE << 4)
-            },
-            {
-                .description = "Monochrome (5151/MDA) (green)",
-                .value = 0x0B | (DISPLAY_GREEN << 4)
-            },
-            {
-                .description = "Monochrome (5151/MDA) (amber)",
-                .value = 0x0B | (DISPLAY_AMBER << 4)
-            },
-            {
-                .description = "Color 40x25 (5153/CGA)",
-                .value = 0x06
-            },
-            {
-                .description = "Color 80x25 (5153/CGA)",
-                .value = 0x07
-            },
-            {
-                .description = "Enhanced Color - Normal Mode (5154/ECD)",
-                .value = 0x08
-            },
-            {
-                .description = "Enhanced Color - Enhanced Mode (5154/ECD)",
-                .value = 0x09
-            },
-            {
-                .description = ""
-            }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 256,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description =  "32 KB", .value =  32 },
+            { .description =  "64 KB", .value =  64 },
+            { .description = "128 KB", .value = 128 },
+            { .description = "256 KB", .value = 256 },
+            { .description = ""                     }
         },
-        .default_int = 9
+        .bios           = { { 0 } }
     },
     {
-        .type = CONFIG_END
-    }
+        .name           = "monitor_type",
+        .description    = "Monitor type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 9,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Monochrome (5151/MDA) (white)",             .value = 0x0B | (DISPLAY_WHITE << 4) },
+            { .description = "Monochrome (5151/MDA) (green)",             .value = 0x0B | (DISPLAY_GREEN << 4) },
+            { .description = "Monochrome (5151/MDA) (amber)",             .value = 0x0B | (DISPLAY_AMBER << 4) },
+            { .description = "Color 40x25 (5153/CGA)",                    .value = 0x06                        },
+            { .description = "Color 80x25 (5153/CGA)",                    .value = 0x07                        },
+            { .description = "Enhanced Color - Normal Mode (5154/ECD)",   .value = 0x08                        },
+            { .description = "Enhanced Color - Enhanced Mode (5154/ECD)", .value = 0x09                        },
+            { .description = ""                                                                                }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
+static const device_config_t atiega800p_config[] = {
+  // clang-format off
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 256,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description =  "32 KB", .value =  32 },
+            { .description =  "64 KB", .value =  64 },
+            { .description = "128 KB", .value = 128 },
+            { .description = "256 KB", .value = 256 },
+            { .description = ""                     }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
@@ -1629,10 +1891,10 @@ const device_t ega_device = {
     .init          = ega_standalone_init,
     .close         = ega_close,
     .reset         = NULL,
-    { .available = ega_standalone_available },
+    .available     = ega_standalone_available,
     .speed_changed = ega_speed_changed,
     .force_redraw  = NULL,
-    .config        = ega_config
+    .config        = ega_ibm_config
 };
 
 const device_t cpqega_device = {
@@ -1643,21 +1905,21 @@ const device_t cpqega_device = {
     .init          = ega_standalone_init,
     .close         = ega_close,
     .reset         = NULL,
-    { .available = cpqega_standalone_available },
+    .available     = cpqega_standalone_available,
     .speed_changed = ega_speed_changed,
     .force_redraw  = NULL,
     .config        = ega_config
 };
 
 const device_t sega_device = {
-    .name          = "SuperEGA",
+    .name          = "Chips & Technologies SuperEGA",
     .internal_name = "superega",
     .flags         = DEVICE_ISA,
     .local         = EGA_SUPEREGA,
     .init          = ega_standalone_init,
     .close         = ega_close,
     .reset         = NULL,
-    { .available = sega_standalone_available },
+    .available     = sega_standalone_available,
     .speed_changed = ega_speed_changed,
     .force_redraw  = NULL,
     .config        = ega_config
@@ -1671,10 +1933,10 @@ const device_t atiega800p_device = {
     .init          = ega_standalone_init,
     .close         = ega_close,
     .reset         = NULL,
-    { .available = atiega800p_standalone_available },
+    .available     = atiega800p_standalone_available,
     .speed_changed = ega_speed_changed,
     .force_redraw  = NULL,
-    .config        = ega_config
+    .config        = atiega800p_config
 };
 
 const device_t iskra_ega_device = {
@@ -1685,7 +1947,7 @@ const device_t iskra_ega_device = {
     .init          = ega_standalone_init,
     .close         = ega_close,
     .reset         = NULL,
-    { .available = iskra_ega_standalone_available },
+    .available     = iskra_ega_standalone_available,
     .speed_changed = ega_speed_changed,
     .force_redraw  = NULL,
     .config        = ega_config
@@ -1699,7 +1961,7 @@ const device_t et2000_device = {
     .init          = ega_standalone_init,
     .close         = ega_close,
     .reset         = NULL,
-    { .available = et2000_standalone_available },
+    .available     = et2000_standalone_available,
     .speed_changed = ega_speed_changed,
     .force_redraw  = NULL,
     .config        = ega_config
diff --git a/src/video/vid_ega_render.c b/src/video/vid_ega_render.c
index 0cb1216ad..c1c44dfdb 100644
--- a/src/video/vid_ega_render.c
+++ b/src/video/vid_ega_render.c
@@ -107,6 +107,11 @@ ega_render_overscan_right(ega_t *ega)
 void
 ega_render_text(ega_t *ega)
 {
+    if (ega->render_override) {
+        ega->render_override(ega->priv_parent);
+        return;
+    }
+
     if ((ega->displine + ega->y_add) < 0)
         return;
 
@@ -118,6 +123,7 @@ ega_render_text(ega_t *ega)
         const bool doublewidth   = ((ega->seqregs[1] & 8) != 0);
         const bool attrblink     = ((ega->attrregs[0x10] & 8) != 0);
         const bool attrlinechars = (ega->attrregs[0x10] & 4);
+        const bool monoattrs     = (ega->attrregs[0x10] & 2);
         const bool crtcreset     = ((ega->crtc[0x17] & 0x80) == 0);
         const bool seq9dot       = ((ega->seqregs[1] & 1) == 0);
         const int  dwshift       = doublewidth ? 1 : 0;
@@ -135,9 +141,9 @@ ega_render_text(ega_t *ega)
         }
 
         for (int x = 0; x < (ega->hdisp + ega->scrollcache); x += charwidth) {
-            uint32_t addr = ega->remap_func(ega, ega->ma) & ega->vrammask;
+            uint32_t addr = ega->remap_func(ega, ega->memaddr) & ega->vrammask;
 
-            int drawcursor = ((ega->ma == ega->ca) && ega->con && ega->cursoron);
+            int drawcursor = ((ega->memaddr == ega->cursoraddr) && ega->cursorvisible && ega->cursoron);
 
             uint32_t chr;
             uint32_t attr;
@@ -169,18 +175,30 @@ ega_render_text(ega_t *ega)
                 }
             }
 
-            uint32_t dat = ega->vram[charaddr + (ega->sc << 2)];
+            uint32_t dat = ega->vram[charaddr + (ega->scanline << 2)];
             dat <<= 1;
-            if ((chr & ~0x1F) == 0xC0 && attrlinechars)
+            if (((chr & ~0x1f) == 0xc0) && attrlinechars)
                 dat |= (dat >> 1) & 1;
 
-            for (int xx = 0; xx < charwidth; xx++)
-                p[xx] = (dat & (0x100 >> (xx >> dwshift))) ? fg : bg;
+            for (int xx = 0; xx < charwidth; xx++) {
+                if (monoattrs) {
+                    int bit   = (dat & (0x100 >> (xx >> dwshift))) ? 1 : 0;
+                    int blink = (!drawcursor && (attr & 0x80) && attrblink && blinked);
+                    if ((ega->scanline == ega->crtc[0x14]) && ((attr & 7) == 1))
+                        p[xx] = ega->mda_attr_to_color_table[attr][blink][1];
+                    else
+                        p[xx] = ega->mda_attr_to_color_table[attr][blink][bit];
+                    if (drawcursor)
+                        p[xx] ^= ega->mda_attr_to_color_table[attr][0][1];
+                    p[xx] = ega->pallook[ega->egapal[p[xx] & 0x0f]];
+                } else
+                    p[xx] = (dat & (0x100 >> (xx >> dwshift))) ? fg : bg;
+            }
 
-            ega->ma += 4;
+            ega->memaddr += 4;
             p += charwidth;
         }
-        ega->ma &= 0x3ffff;
+        ega->memaddr &= 0x3ffff;
     }
 }
 
@@ -201,7 +219,8 @@ ega_render_graphics(ega_t *ega)
     const bool    crtcreset   = ((ega->crtc[0x17] & 0x80) == 0);
     const bool    seq9dot       = ((ega->seqregs[1] & 1) == 0);
     const bool    seqoddeven  = ((ega->seqregs[1] & 4) != 0);
-    const uint8_t blinkmask   = (attrblink && blinked ? 0x8 : 0x0);
+    const uint8_t blinkmask   = (attrblink ? 0x8 : 0x0);
+    const uint8_t blinkval    = (attrblink && blinked ? 0x8 : 0x0);
     uint32_t     *p           = &buffer32->line[ega->displine + ega->y_add][ega->x_add];
     const int     dwshift     = doublewidth ? 1 : 0;
     const int     dotwidth    = 1 << dwshift;
@@ -217,7 +236,7 @@ ega_render_graphics(ega_t *ega)
     }
 
     for (int x = 0; x <= (ega->hdisp + ega->scrollcache); x += charwidth) {
-        uint32_t addr = ega->remap_func(ega, ega->ma) & ega->vrammask;
+        uint32_t addr = ega->remap_func(ega, ega->memaddr) & ega->vrammask;
 
         uint8_t edat[4];
         if (seqoddeven) {
@@ -228,12 +247,12 @@ ega_render_graphics(ega_t *ega)
             edat[3]    = ega->vram[(addr | 3) ^ secondcclk];
             secondcclk = (secondcclk + 1) & 1;
             if (secondcclk == 0)
-                ega->ma += 4;
+                ega->memaddr += 4;
         } else {
             *(uint32_t *) (&edat[0]) = *(uint32_t *) (&ega->vram[addr]);
-            ega->ma += 4;
+            ega->memaddr += 4;
         }
-        ega->ma &= 0x3ffff;
+        ega->memaddr &= 0x3ffff;
 
         if (cga2bpp) {
             // Remap CGA 2bpp-chunky data into fully planar data
@@ -254,8 +273,14 @@ ega_render_graphics(ega_t *ega)
                 uint8_t   dat     = (edatlookup[(edat[0] >> inshift) & 3][(edat[1] >> inshift) & 3])
                     | (edatlookup[(edat[2] >> inshift) & 3][(edat[3] >> inshift) & 3] << 2);
                 // FIXME: Confirm blink behaviour is actually XOR on real hardware
-                uint32_t p0 = ega->pallook[ega->egapal[((dat >> 4) & ega->plane_mask) ^ blinkmask]];
-                uint32_t p1 = ega->pallook[ega->egapal[(dat & ega->plane_mask) ^ blinkmask]];
+                uint32_t c0 = (dat >> 4) & 0xF;
+                uint32_t c1 = dat & 0xF;
+                c0 = ((c0 & ega->plane_mask & ~blinkmask) |
+                     ((c0 | ~ega->plane_mask) & blinkmask & blinkval)) ^ blinkmask;
+                c1 = ((c1 & ega->plane_mask & ~blinkmask) |
+                     ((c1 | ~ega->plane_mask) & blinkmask & blinkval)) ^ blinkmask;
+                uint32_t p0 = ega->pallook[ega->egapal[c0]];
+                uint32_t p1 = ega->pallook[ega->egapal[c1]];
                 for (int subx = 0; subx < dotwidth; subx++)
                     p[outoffs + subx] = p0;
                 for (int subx = 0; subx < dotwidth; subx++)
diff --git a/src/video/vid_et3000.c b/src/video/vid_et3000.c
index 97da08822..a75a63829 100644
--- a/src/video/vid_et3000.c
+++ b/src/video/vid_et3000.c
@@ -424,7 +424,7 @@ et3000_out(uint16_t addr, uint8_t val, void *priv)
 static void
 et3000_recalctimings(svga_t *svga)
 {
-    svga->ma_latch |= (svga->crtc[0x23] & 2) << 15;
+    svga->memaddr_latch |= (svga->crtc[0x23] & 2) << 15;
     if (svga->crtc[0x25] & 1)
         svga->vblankstart |= 0x400;
     if (svga->crtc[0x25] & 2)
@@ -439,7 +439,7 @@ et3000_recalctimings(svga_t *svga)
     svga->interlace = !!(svga->crtc[0x25] & 0x80);
 
     if (svga->attrregs[0x16] & 0x10) {
-        svga->ma_latch <<= (1 << 0);
+        svga->memaddr_latch <<= (1 << 0);
         svga->rowoffset <<= (1 << 0);
         switch (svga->gdcreg[5] & 0x60) {
             case 0x00:
@@ -476,6 +476,20 @@ et3000_recalctimings(svga_t *svga)
             svga->clock = (cpuclock * (double) (1ULL << 32)) / 36000000.0;
             break;
     }
+
+    if (svga->render == svga_render_4bpp_highres)
+        svga->render = svga_render_4bpp_tseng_highres;
+}
+
+static int
+et3000_line_compare(svga_t* svga)
+{
+    if (svga->split > svga->vsyncstart) {
+        /* Don't do line compare if we're already in vertical retrace. */
+        /* This makes picture bouncing effect work on Copper demo. */
+        return 0;
+    }
+    return 1;
 }
 
 static void *
@@ -511,6 +525,7 @@ et3000_init(const device_t *info)
     dev->svga.miscout = 1;
 
     dev->svga.packed_chain4 = 1;
+    dev->svga.line_compare  = et3000_line_compare;
 
     return dev;
 }
@@ -548,19 +563,24 @@ et3000_available(void)
 }
 
 static const device_config_t et3000_config[] = {
-    { .name        = "memory",
-     .description = "Memory size",
-     .type        = CONFIG_SELECTION,
-     .default_int = 512,
-     .selection   = {
-          { .description = "256 KB",
-              .value       = 256 },
-          { .description = "512 KB",
-              .value       = 512 },
-          { .description = "1 MB",
-              .value       = 1024 },
-          { .description = "" } } },
-    { .type = CONFIG_END }
+  // clang-format off
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "256 KB", .value = 256 },
+            { .description = "512 KB", .value = 512 },
+            { .description = ""                     }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
 };
 
 const device_t et3000_isa_device = {
@@ -571,7 +591,7 @@ const device_t et3000_isa_device = {
     .init          = et3000_init,
     .close         = et3000_close,
     .reset         = NULL,
-    { .available = et3000_available },
+    .available     = et3000_available,
     .speed_changed = et3000_speed_changed,
     .force_redraw  = et3000_force_redraw,
     .config        = et3000_config
diff --git a/src/video/vid_et4000.c b/src/video/vid_et4000.c
index 6d52fc91b..b19aad20a 100644
--- a/src/video/vid_et4000.c
+++ b/src/video/vid_et4000.c
@@ -63,7 +63,9 @@
 #define ET4000_TYPE_KASAN    5 /* Kasan ET4000 */
 
 #define BIOS_ROM_PATH          "roms/video/et4000/ET4000.BIN"
+#define V8_06_BIOS_ROM_PATH    "roms/video/et4000/ET4000_V8_06.BIN"
 #define TC6058AF_BIOS_ROM_PATH "roms/video/et4000/Tseng_Labs_VGA-4000_BIOS_V1.1.bin"
+#define V1_21_BIOS_ROM_PATH    "roms/video/et4000/Tseng_Labs_VGA-4000_BIOS_V1.21.bin"
 #define KOREAN_BIOS_ROM_PATH   "roms/video/et4000/tgkorvga.bin"
 #define KOREAN_FONT_ROM_PATH   "roms/video/et4000/tg_ksc5601.rom"
 #define KASAN_BIOS_ROM_PATH    "roms/video/et4000/et4000_kasan16.bin"
@@ -80,8 +82,8 @@ typedef struct {
     rom_t bios_rom;
 
     uint8_t  banking;
-    uint32_t vram_size,
-        vram_mask;
+    uint32_t vram_size;
+    uint32_t vram_mask;
 
     uint8_t  port_22cb_val;
     uint8_t  port_32cb_val;
@@ -123,15 +125,6 @@ et4000_in(uint16_t addr, void *priv)
         addr ^= 0x60;
 
     switch (addr) {
-        case 0x3c2:
-            if (dev->type == ET4000_TYPE_MCA) {
-                if ((svga->vgapal[0].r + svga->vgapal[0].g + svga->vgapal[0].b) >= 0x4e)
-                    return 0;
-                else
-                    return 0x10;
-            }
-            break;
-
         case 0x3c5:
             if ((svga->seqaddr & 0xf) == 7)
                 return svga->seqregs[svga->seqaddr & 0xf] | 4;
@@ -143,6 +136,7 @@ et4000_in(uint16_t addr, void *priv)
         case 0x3c9:
             if (dev->type >= ET4000_TYPE_ISA)
                 return sc1502x_ramdac_in(addr, svga->ramdac, svga);
+            break;
 
         case 0x3cd: /*Banking*/
             return dev->banking;
@@ -384,7 +378,7 @@ et4000_out(uint16_t addr, uint8_t val, void *priv)
                 if (svga->crtcreg < 0xe || svga->crtcreg > 0x10) {
                     if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
                     } else {
                         svga->fullchange = changeframecount;
                         svga_recalctimings(svga);
@@ -648,24 +642,26 @@ et4000_recalctimings(svga_t *svga)
 {
     const et4000_t *dev = (et4000_t *) svga->priv;
 
-    svga->ma_latch |= (svga->crtc[0x33] & 3) << 16;
+    svga->memaddr_latch |= (svga->crtc[0x33] & 3) << 16;
 
-    svga->hblankstart    = (((svga->crtc[0x3f] & 0x10) >> 4) << 8) + svga->crtc[2] + 1;
+    svga->hblankstart = (((svga->crtc[0x3f] & 0x4) >> 2) << 8) + svga->crtc[2];
+
+    svga->ps_bit_bug = (dev->type == ET4000_TYPE_TC6058AF) && svga->lowres && ((svga->gdcreg[5] & 0x60) >= 0x40);
 
     if (svga->crtc[0x35] & 1)
-        svga->vblankstart += 0x400;
+        svga->vblankstart |= 0x400;
     if (svga->crtc[0x35] & 2)
-        svga->vtotal += 0x400;
+        svga->vtotal |= 0x400;
     if (svga->crtc[0x35] & 4)
-        svga->dispend += 0x400;
+        svga->dispend |= 0x400;
     if (svga->crtc[0x35] & 8)
-        svga->vsyncstart += 0x400;
+        svga->vsyncstart |= 0x400;
     if (svga->crtc[0x35] & 0x10)
-        svga->split += 0x400;
-    if (!svga->rowoffset)
+        svga->split |= 0x400;
+    if (!svga->rowoffset && !svga->ps_bit_bug)
         svga->rowoffset = 0x100;
     if (svga->crtc[0x3f] & 1)
-        svga->htotal += 256;
+        svga->htotal |= 0x100;
     if (svga->attrregs[0x16] & 0x20) {
         svga->hdisp <<= 1;
         svga->dots_per_clock <<= 1;
@@ -690,14 +686,12 @@ et4000_recalctimings(svga_t *svga)
         case 15:
         case 16:
             svga->hdisp /= 2;
-            svga->hblankstart /= 2;
-            svga->hblank_end_val /= 2;
+            svga->dots_per_clock /= 2;
             break;
 
         case 24:
             svga->hdisp /= 3;
-            svga->hblankstart /= 3;
-            svga->hblank_end_val /= 3;
+            svga->dots_per_clock /= 3;
             break;
 
         default:
@@ -707,7 +701,7 @@ et4000_recalctimings(svga_t *svga)
     if (dev->type == ET4000_TYPE_KOREAN || dev->type == ET4000_TYPE_TRIGEM || dev->type == ET4000_TYPE_KASAN) {
         if ((svga->render == svga_render_text_80) && ((svga->crtc[0x37] & 0x0A) == 0x0A)) {
             if (dev->port_32cb_val & 0x80) {
-                svga->ma_latch -= 2;
+                svga->memaddr_latch -= 2;
                 svga->ca_adj = -2;
             }
             if ((dev->port_32cb_val & 0xB4) == ((svga->crtc[0x37] & 3) == 2 ? 0xB4 : 0xB0)) {
@@ -725,14 +719,18 @@ et4000_recalctimings(svga_t *svga)
     }
 
     if ((svga->seqregs[0x0e] & 0x02) && ((svga->gdcreg[5] & 0x60) >= 0x40) && svga->lowres) {
-        svga->ma_latch <<= 1;
+        svga->memaddr_latch <<= 1;
         svga->rowoffset <<= 1;
         svga->render = svga_render_8bpp_highres;
     }
 
+    if (svga->render == svga_render_4bpp_highres)
+        svga->render = svga_render_4bpp_tseng_highres;
+
     if (dev->type == ET4000_TYPE_TC6058AF) {
         if (svga->render == svga_render_8bpp_lowres)
             svga->render = svga_render_8bpp_tseng_lowres;
+
         else if (svga->render == svga_render_8bpp_highres)
             svga->render = svga_render_8bpp_tseng_highres;
     }
@@ -747,7 +745,7 @@ et4000_kasan_recalctimings(svga_t *svga)
 
     if (svga->render == svga_render_text_80 && (et4000->kasan_cfg_regs[0] & 8)) {
         svga->hdisp             += svga->dots_per_clock;
-        svga->ma_latch          -= 5;
+        svga->memaddr_latch          -= 4;
         svga->ca_adj             = (et4000->kasan_cfg_regs[0] >> 6) - 3;
         svga->ksc5601_sbyte_mask = (et4000->kasan_cfg_regs[0] & 4) << 5;
         if ((et4000->kasan_cfg_regs[0] & 0x23) == 0x20 && (et4000->kasan_cfg_regs[4] & 0x80) && ((svga->crtc[0x37] & 0x0B) == 0x0A))
@@ -774,17 +772,33 @@ et4000_mca_write(int port, uint8_t val, void *priv)
 
     /* Save the MCA register value. */
     et4000->pos_regs[port & 7] = val;
+    mem_mapping_disable(&et4000->bios_rom.mapping);
+    if (et4000->pos_regs[2] & 1)
+        mem_mapping_enable(&et4000->bios_rom.mapping);
 }
 
 static uint8_t
 et4000_mca_feedb(UNUSED(void *priv))
 {
+    et4000_t *et4000 = (et4000_t *) priv;
+    return et4000->pos_regs[2] & 1;
+}
+
+static int
+et4000_line_compare(svga_t* svga)
+{
+    if (svga->split > svga->vsyncstart) {
+        /* Don't do line compare if we're already in vertical retrace. */
+        /* This makes picture bouncing effect work on Copper demo. */
+        return 0;
+    }
     return 1;
 }
 
 static void *
 et4000_init(const device_t *info)
 {
+    const char *bios_ver = NULL;
     const char *fn;
     et4000_t   *dev;
     int         i;
@@ -805,8 +819,8 @@ et4000_init(const device_t *info)
                       NULL, NULL);
             io_sethandler(0x03c0, 32,
                           et4000_in, NULL, NULL, et4000_out, NULL, NULL, dev);
-            if (dev->type == ET4000_TYPE_TC6058AF)
-                fn = TC6058AF_BIOS_ROM_PATH;
+            bios_ver      = (char *) device_get_config_bios("bios_ver");
+            fn            = (char *) device_get_bios_file(info, bios_ver, 0);
             break;
 
         case ET4000_TYPE_MCA: /* MCA ET4000AX */
@@ -889,10 +903,18 @@ et4000_init(const device_t *info)
     if (dev->type >= ET4000_TYPE_ISA)
         dev->svga.ramdac = device_add(&sc1502x_ramdac_device);
 
+    if (dev->type == ET4000_TYPE_TC6058AF)
+        dev->svga.adv_flags |= FLAG_PRECISETIME;
+
     dev->vram_mask = dev->vram_size - 1;
 
+    dev->svga.line_compare = et4000_line_compare;
+
     rom_init(&dev->bios_rom, fn,
-             0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
+        0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
+
+    if (dev->type == ET4000_TYPE_MCA)
+        mem_mapping_disable(&dev->bios_rom.mapping);
 
     dev->svga.translate_address = get_et4000_addr;
 
@@ -927,12 +949,6 @@ et4000_force_redraw(void *priv)
     dev->svga.fullchange = changeframecount;
 }
 
-static int
-et4000_tc6058af_available(void)
-{
-    return rom_present(TC6058AF_BIOS_ROM_PATH);
-}
-
 static int
 et4000_available(void)
 {
@@ -954,58 +970,128 @@ et4000_kasan_available(void)
 static const device_config_t et4000_tc6058af_config[] = {
   // clang-format off
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 512,
-        .selection = {
+        .name           = "bios_ver",
+        .description    = "BIOS Revision",
+        .type           = CONFIG_BIOS,
+        .default_string = "v1_10",
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = {
             {
-                .description = "256 KB",
-                .value = 256
+                .name          = "Version 1.10",
+                .internal_name = "v1_10",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 32768,
+                .files         = { TC6058AF_BIOS_ROM_PATH, "" }
             },
             {
-                .description = "512 KB",
-                .value = 512
+                .name          = "Version 1.21",
+                .internal_name = "v1_21",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 32768,
+                .files         = { V1_21_BIOS_ROM_PATH, "" }
             },
-            {
-                .description = ""
-            }
+            { .files_no = 0 }
         }
     },
     {
-        .type = CONFIG_END
-    }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "256 KB", .value =  256 },
+            { .description = "512 KB", .value =  512 },
+            { .description = "1 MB",   .value = 1024 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
 // clang-format on
 };
 
+static const device_config_t et4000_bios_config[] = {
+  // clang-format off
+    {
+        .name           = "bios_ver",
+        .description    = "BIOS Revision",
+        .type           = CONFIG_BIOS,
+        .default_string = "v8_01",
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = {
+            {
+                .name          = "Version 8.01",
+                .internal_name = "v8_01",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 32768,
+                .files         = { BIOS_ROM_PATH, "" }
+            },
+            {
+                .name          = "Version 8.06",
+                .internal_name = "v8_06",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 32768,
+                .files         = { V8_06_BIOS_ROM_PATH, "" }
+            },
+            { .files_no = 0 }
+        }
+    },
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1024,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "256 KB", .value =  256 },
+            { .description = "512 KB", .value =  512 },
+            { .description = "1 MB",   .value = 1024 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
 static const device_config_t et4000_config[] = {
   // clang-format off
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 1024,
-        .selection = {
-            {
-                .description = "256 KB",
-                .value = 256
-            },
-            {
-                .description = "512 KB",
-                .value = 512
-            },
-            {
-                .description = "1 MB",
-                .value = 1024
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1024,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "256 KB", .value =  256 },
+            { .description = "512 KB", .value =  512 },
+            { .description = "1 MB",   .value = 1024 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
@@ -1013,11 +1099,11 @@ const device_t et4000_tc6058af_isa_device = {
     .name          = "Tseng Labs ET4000AX (TC6058AF) (ISA)",
     .internal_name = "et4000ax_tc6058af",
     .flags         = DEVICE_ISA,
-    .local         = 0,
+    .local         = ET4000_TYPE_TC6058AF,
     .init          = et4000_init,
     .close         = et4000_close,
     .reset         = NULL,
-    { .available = et4000_tc6058af_available },
+    .available     = NULL,
     .speed_changed = et4000_speed_changed,
     .force_redraw  = et4000_force_redraw,
     .config        = et4000_tc6058af_config
@@ -1031,10 +1117,10 @@ const device_t et4000_isa_device = {
     .init          = et4000_init,
     .close         = et4000_close,
     .reset         = NULL,
-    { .available = et4000_available },
+    .available     = NULL,
     .speed_changed = et4000_speed_changed,
     .force_redraw  = et4000_force_redraw,
-    .config        = et4000_config
+    .config        = et4000_bios_config
 };
 
 const device_t et4000_mca_device = {
@@ -1045,7 +1131,7 @@ const device_t et4000_mca_device = {
     .init          = et4000_init,
     .close         = et4000_close,
     .reset         = NULL,
-    { .available = et4000_available },
+    .available     = et4000_available,
     .speed_changed = et4000_speed_changed,
     .force_redraw  = et4000_force_redraw,
     .config        = et4000_config
@@ -1059,7 +1145,7 @@ const device_t et4000k_isa_device = {
     .init          = et4000_init,
     .close         = et4000_close,
     .reset         = NULL,
-    { .available = et4000k_available },
+    .available     = et4000k_available,
     .speed_changed = et4000_speed_changed,
     .force_redraw  = et4000_force_redraw,
     .config        = et4000_config
@@ -1073,7 +1159,7 @@ const device_t et4000k_tg286_isa_device = {
     .init          = et4000_init,
     .close         = et4000_close,
     .reset         = NULL,
-    { .available = et4000k_available },
+    .available     = et4000k_available,
     .speed_changed = et4000_speed_changed,
     .force_redraw  = et4000_force_redraw,
     .config        = et4000_config
@@ -1087,7 +1173,7 @@ const device_t et4000_kasan_isa_device = {
     .init          = et4000_init,
     .close         = et4000_close,
     .reset         = NULL,
-    { .available = et4000_kasan_available },
+    .available     = et4000_kasan_available,
     .speed_changed = et4000_speed_changed,
     .force_redraw  = et4000_force_redraw,
     .config        = et4000_config
diff --git a/src/video/vid_et4000w32.c b/src/video/vid_et4000w32.c
index 259fefffb..c1021e905 100644
--- a/src/video/vid_et4000w32.c
+++ b/src/video/vid_et4000w32.c
@@ -42,7 +42,7 @@
 #define BIOS_ROM_PATH_W32                      "roms/video/et4000w32/ET4000W32VLB_bios_MX27C512.BIN"
 #define BIOS_ROM_PATH_W32I_ISA                 "roms/video/et4000w32/ET4KW32I.VBI"
 #define BIOS_ROM_PATH_W32I_VLB                 "roms/video/et4000w32/tseng.u41.bin"
-#define BIOS_ROM_PATH_W32P_VIDEOMAGIC_REVB_VLB "roms/video/et4000w32/VideoMagic-BioS-HXIRTW32PWSRL.BIN"
+#define BIOS_ROM_PATH_W32P_VIDEOMAGIC_REVB_VLB "roms/video/et4000w32/VideoMagic-BioS-HXIRTW32PWSRL.bin"
 #define BIOS_ROM_PATH_W32P                     "roms/video/et4000w32/ET4K_W32.BIN"
 #define BIOS_ROM_PATH_W32P_REVC                "roms/video/et4000w32/et4000w32pcardex.BIN"
 
@@ -238,7 +238,7 @@ et4000w32p_out(uint16_t addr, uint8_t val, void *priv)
                 if (svga->crtcreg < 0xe || svga->crtcreg > 0x10) {
                     if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
                     } else {
                         svga->fullchange = changeframecount;
                         svga_recalctimings(svga);
@@ -366,7 +366,8 @@ et4000w32p_in(uint16_t addr, void *priv)
             }
             return svga->crtc[svga->crtcreg];
 
-        case 0x3da:
+        case 0x3da: {
+            uint8_t ret = 0xff;
             svga->attrff = 0;
 
             /*Bit 1 of the Input Status Register is required by the OS/2 and NT ET4000W32/I drivers to be set otherwise
@@ -375,7 +376,18 @@ et4000w32p_in(uint16_t addr, void *priv)
                 svga->cgastat &= ~0x32;
             else
                 svga->cgastat ^= 0x32;
-            return svga->cgastat;
+
+            ret = svga->cgastat;
+
+            if ((svga->fcr & 0x08) && svga->dispon)
+                ret |= 0x08;
+
+            if (ret & 0x08)
+                ret &= 0x7f;
+            else
+                ret |= 0x80;
+            return ret;
+        }
 
         case 0x210a:
         case 0x211a:
@@ -430,24 +442,24 @@ et4000w32p_recalctimings(svga_t *svga)
 {
     et4000w32p_t *et4000 = (et4000w32p_t *) svga->priv;
 
-    svga->ma_latch |= (svga->crtc[0x33] & 0x7) << 16;
+    svga->memaddr_latch |= (svga->crtc[0x33] & 0x7) << 16;
 
-    svga->hblankstart    = (((svga->crtc[0x3f] & 0x10) >> 4) << 8) + svga->crtc[2] + 1;
+    svga->hblankstart    = (((svga->crtc[0x3f] & 0x4) >> 2) << 8) + svga->crtc[2];
 
     if (svga->crtc[0x35] & 0x01)
-        svga->vblankstart += 0x400;
+        svga->vblankstart |= 0x400;
     if (svga->crtc[0x35] & 0x02)
-        svga->vtotal += 0x400;
+        svga->vtotal |= 0x400;
     if (svga->crtc[0x35] & 0x04)
-        svga->dispend += 0x400;
+        svga->dispend |= 0x400;
     if (svga->crtc[0x35] & 0x08)
-        svga->vsyncstart += 0x400;
+        svga->vsyncstart |= 0x400;
     if (svga->crtc[0x35] & 0x10)
-        svga->split += 0x400;
+        svga->split |= 0x400;
     if (svga->crtc[0x3F] & 0x80)
-        svga->rowoffset += 0x100;
+        svga->rowoffset |= 0x100;
     if (svga->crtc[0x3F] & 0x01)
-        svga->htotal += 256;
+        svga->htotal |= 0x100;
     if (svga->attrregs[0x16] & 0x20) {
         svga->hdisp <<= 1;
         svga->dots_per_clock <<= 1;
@@ -455,19 +467,19 @@ et4000w32p_recalctimings(svga_t *svga)
 
     svga->clock = (cpuclock * (double) (1ULL << 32)) / svga->getclock((svga->miscout >> 2) & 3, svga->clock_gen);
 
-    if (et4000->type != ET4000W32P_DIAMOND) {
+    if (et4000->type != ET4000W32P_DIAMOND && et4000->type != ET4000W32P_VIDEOMAGIC_REVB && et4000->type != ET4000W32P_CARDEX && et4000->type != ET4000W32P) {
         if ((svga->gdcreg[6] & 1) || (svga->attrregs[0x10] & 1)) {
             if (svga->gdcreg[5] & 0x40) {
                 switch (svga->bpp) {
                     case 8:
-                        svga->clock /= 2;
+                        svga->clock *= 2;
                         break;
                     case 15:
                     case 16:
-                        svga->clock /= 3;
+                        svga->clock *= 3;
                         break;
                     case 24:
-                        svga->clock /= 4;
+                        svga->clock *= 4;
                         break;
 
                     default:
@@ -535,9 +547,6 @@ et4000w32p_recalctimings(svga_t *svga)
         } else {
             switch (svga->gdcreg[5] & 0x60) {
                 case 0x00:
-                    if (et4000->rev == 5)
-                        svga->ma_latch++;
-
                     if (svga->seqregs[1] & 8) /* Low res (320) */
                         svga->render = svga_render_4bpp_lowres;
                     else
@@ -603,6 +612,9 @@ et4000w32p_recalctimings(svga_t *svga)
             }
         }
     }
+
+    if (svga->render == svga_render_4bpp_highres)
+        svga->render = svga_render_4bpp_tseng_highres;
 }
 
 void
@@ -2946,39 +2958,33 @@ et4000w32p_force_redraw(void *priv)
 static const device_config_t et4000w32p_config[] = {
   // clang-format off
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 2,
-        .selection = {
-            {
-                .description = "1 MB",
-                .value = 1
-            },
-            {
-                .description = "2 MB",
-                .value = 2
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "1 MB", .value = 1 },
+            { .description = "2 MB", .value = 2 },
+            { .description = ""                 }
+        },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
 const device_t et4000w32_device = {
     .name          = "Tseng Labs ET4000/w32 ISA",
     .internal_name = "et4000w32",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = ET4000W32,
     .init          = et4000w32p_init,
     .close         = et4000w32p_close,
     .reset         = NULL,
-    { .available = et4000w32_available },
+    .available     = et4000w32_available,
     .speed_changed = et4000w32p_speed_changed,
     .force_redraw  = et4000w32p_force_redraw,
     .config        = NULL
@@ -2987,12 +2993,12 @@ const device_t et4000w32_device = {
 const device_t et4000w32_onboard_device = {
     .name          = "Tseng Labs ET4000/w32 (ISA) (On-Board)",
     .internal_name = "et4000w32_onboard",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = ET4000W32,
     .init          = et4000w32p_init,
     .close         = et4000w32p_close,
     .reset         = NULL,
-    { .available = et4000w32_available },
+    .available     = et4000w32_available,
     .speed_changed = et4000w32p_speed_changed,
     .force_redraw  = et4000w32p_force_redraw,
     .config        = NULL
@@ -3001,12 +3007,12 @@ const device_t et4000w32_onboard_device = {
 const device_t et4000w32i_isa_device = {
     .name          = "Tseng Labs ET4000/w32i Rev. B ISA",
     .internal_name = "et4000w32i",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = ET4000W32I,
     .init          = et4000w32p_init,
     .close         = et4000w32p_close,
     .reset         = NULL,
-    { .available = et4000w32i_isa_available },
+    .available     = et4000w32i_isa_available,
     .speed_changed = et4000w32p_speed_changed,
     .force_redraw  = et4000w32p_force_redraw,
     .config        = NULL
@@ -3020,7 +3026,7 @@ const device_t et4000w32i_vlb_device = {
     .init          = et4000w32p_init,
     .close         = et4000w32p_close,
     .reset         = NULL,
-    { .available = et4000w32i_vlb_available },
+    .available     = et4000w32i_vlb_available,
     .speed_changed = et4000w32p_speed_changed,
     .force_redraw  = et4000w32p_force_redraw,
     .config        = et4000w32p_config
@@ -3034,7 +3040,7 @@ const device_t et4000w32p_videomagic_revb_vlb_device = {
     .init          = et4000w32p_init,
     .close         = et4000w32p_close,
     .reset         = NULL,
-    { .available = et4000w32p_videomagic_revb_vlb_available },
+    .available     = et4000w32p_videomagic_revb_vlb_available,
     .speed_changed = et4000w32p_speed_changed,
     .force_redraw  = et4000w32p_force_redraw,
     .config        = et4000w32p_config
@@ -3048,7 +3054,7 @@ const device_t et4000w32p_videomagic_revb_pci_device = {
     .init          = et4000w32p_init,
     .close         = et4000w32p_close,
     .reset         = NULL,
-    { .available = et4000w32p_videomagic_revb_vlb_available },
+    .available     = et4000w32p_videomagic_revb_vlb_available,
     .speed_changed = et4000w32p_speed_changed,
     .force_redraw  = et4000w32p_force_redraw,
     .config        = et4000w32p_config
@@ -3062,7 +3068,7 @@ const device_t et4000w32p_revc_vlb_device = {
     .init          = et4000w32p_init,
     .close         = et4000w32p_close,
     .reset         = NULL,
-    { .available = et4000w32p_revc_available },
+    .available     = et4000w32p_revc_available,
     .speed_changed = et4000w32p_speed_changed,
     .force_redraw  = et4000w32p_force_redraw,
     .config        = et4000w32p_config
@@ -3076,7 +3082,7 @@ const device_t et4000w32p_revc_pci_device = {
     .init          = et4000w32p_init,
     .close         = et4000w32p_close,
     .reset         = NULL,
-    { .available = et4000w32p_revc_available },
+    .available     = et4000w32p_revc_available,
     .speed_changed = et4000w32p_speed_changed,
     .force_redraw  = et4000w32p_force_redraw,
     .config        = et4000w32p_config
@@ -3090,7 +3096,7 @@ const device_t et4000w32p_noncardex_vlb_device = {
     .init          = et4000w32p_init,
     .close         = et4000w32p_close,
     .reset         = NULL,
-    { .available = et4000w32p_noncardex_available },
+    .available     = et4000w32p_noncardex_available,
     .speed_changed = et4000w32p_speed_changed,
     .force_redraw  = et4000w32p_force_redraw,
     .config        = et4000w32p_config
@@ -3104,7 +3110,7 @@ const device_t et4000w32p_noncardex_pci_device = {
     .init          = et4000w32p_init,
     .close         = et4000w32p_close,
     .reset         = NULL,
-    { .available = et4000w32p_noncardex_available },
+    .available     = et4000w32p_noncardex_available,
     .speed_changed = et4000w32p_speed_changed,
     .force_redraw  = et4000w32p_force_redraw,
     .config        = et4000w32p_config
@@ -3118,7 +3124,7 @@ const device_t et4000w32p_cardex_vlb_device = {
     .init          = et4000w32p_init,
     .close         = et4000w32p_close,
     .reset         = NULL,
-    { .available = et4000w32p_cardex_available },
+    .available     = et4000w32p_cardex_available,
     .speed_changed = et4000w32p_speed_changed,
     .force_redraw  = et4000w32p_force_redraw,
     .config        = et4000w32p_config
@@ -3132,7 +3138,7 @@ const device_t et4000w32p_cardex_pci_device = {
     .init          = et4000w32p_init,
     .close         = et4000w32p_close,
     .reset         = NULL,
-    { .available = et4000w32p_cardex_available },
+    .available     = et4000w32p_cardex_available,
     .speed_changed = et4000w32p_speed_changed,
     .force_redraw  = et4000w32p_force_redraw,
     .config        = et4000w32p_config
@@ -3146,7 +3152,7 @@ const device_t et4000w32p_vlb_device = {
     .init          = et4000w32p_init,
     .close         = et4000w32p_close,
     .reset         = NULL,
-    { .available = et4000w32p_available },
+    .available     = et4000w32p_available,
     .speed_changed = et4000w32p_speed_changed,
     .force_redraw  = et4000w32p_force_redraw,
     .config        = et4000w32p_config
@@ -3160,7 +3166,7 @@ const device_t et4000w32p_pci_device = {
     .init          = et4000w32p_init,
     .close         = et4000w32p_close,
     .reset         = NULL,
-    { .available = et4000w32p_available },
+    .available     = et4000w32p_available,
     .speed_changed = et4000w32p_speed_changed,
     .force_redraw  = et4000w32p_force_redraw,
     .config        = et4000w32p_config
diff --git a/src/video/vid_f82c425.c b/src/video/vid_f82c425.c
index 772926e1e..078e0f3df 100644
--- a/src/video/vid_f82c425.c
+++ b/src/video/vid_f82c425.c
@@ -361,28 +361,28 @@ f82c425_text_row(f82c425_t *f82c425)
     int      cursorline;
     int      blink;
     uint16_t addr;
-    uint8_t  sc;
-    uint16_t ma      = (f82c425->cga.crtc[0x0d] | (f82c425->cga.crtc[0x0c] << 8)) & 0x3fff;
-    uint16_t ca      = (f82c425->cga.crtc[0x0f] | (f82c425->cga.crtc[0x0e] << 8)) & 0x3fff;
-    uint8_t  sl      = f82c425->cga.crtc[9] + 1;
-    int      columns = f82c425->cga.crtc[1];
+    uint8_t  scanline;
+    uint16_t memaddr      = (f82c425->cga.crtc[CGA_CRTC_START_ADDR_LOW] | (f82c425->cga.crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x3fff;
+    uint16_t cursoraddr      = (f82c425->cga.crtc[0x0f] | (f82c425->cga.crtc[0x0e] << 8)) & 0x3fff;
+    uint8_t  sl      = f82c425->cga.crtc[CGA_CRTC_MAX_SCANLINE_ADDR] + 1;
+    int      columns = f82c425->cga.crtc[CGA_CRTC_HDISP];
 
-    sc   = (f82c425->displine) & 7;
-    addr = ((ma & ~1) + (f82c425->displine >> 3) * columns) * 2;
-    ma += (f82c425->displine >> 3) * columns;
+    scanline   = (f82c425->displine) & 7;
+    addr = ((memaddr & ~1) + (f82c425->displine >> 3) * columns) * 2;
+    memaddr += (f82c425->displine >> 3) * columns;
 
-    if ((f82c425->cga.crtc[0x0a] & 0x60) == 0x20) {
+    if ((f82c425->cga.crtc[CGA_CRTC_CURSOR_START] & 0x60) == 0x20) {
         cursorline = 0;
     } else {
-        cursorline = ((f82c425->cga.crtc[0x0a] & 0x0F) <= sc) && ((f82c425->cga.crtc[0x0b] & 0x0F) >= sc);
+        cursorline = ((f82c425->cga.crtc[CGA_CRTC_CURSOR_START] & 0x0F) <= scanline) && ((f82c425->cga.crtc[CGA_CRTC_CURSOR_END] & 0x0F) >= scanline);
     }
 
     for (int x = 0; x < columns; x++) {
         chr        = f82c425->vram[(addr + 2 * x) & 0x3FFF];
         attr       = f82c425->vram[(addr + 2 * x + 1) & 0x3FFF];
-        drawcursor = ((ma == ca) && cursorline && (f82c425->cga.cgamode & 0x8) && (f82c425->cga.cgablink & 0x10));
+        drawcursor = ((memaddr == cursoraddr) && cursorline && (f82c425->cga.cgamode & CGA_MODE_FLAG_VIDEO_ENABLE) && (f82c425->cga.cgablink & 0x10));
 
-        blink = ((f82c425->cga.cgablink & 0x10) && (f82c425->cga.cgamode & 0x20) && (attr & 0x80) && !drawcursor);
+        blink = ((f82c425->cga.cgablink & 0x10) && (f82c425->cga.cgamode & CGA_MODE_FLAG_BLINK) && (attr & 0x80) && !drawcursor);
 
         if (drawcursor) {
             colors[0] = smartmap[~attr & 0xff][0];
@@ -398,16 +398,16 @@ f82c425_text_row(f82c425_t *f82c425)
         if (f82c425->cga.cgamode & 0x01) {
             /* High resolution (80 cols) */
             for (c = 0; c < sl; c++) {
-                (buffer32->line[f82c425->displine])[(x << 3) + c] = colors[(fontdat[chr][sc] & (1 << (c ^ 7))) ? 1 : 0];
+                (buffer32->line[f82c425->displine])[(x << 3) + c] = colors[(fontdat[chr][scanline] & (1 << (c ^ 7))) ? 1 : 0];
             }
         } else {
             /* Low resolution (40 columns, stretch pixels horizontally) */
             for (c = 0; c < sl; c++) {
-                (buffer32->line[f82c425->displine])[(x << 4) + c * 2] = (buffer32->line[f82c425->displine])[(x << 4) + c * 2 + 1] = colors[(fontdat[chr][sc] & (1 << (c ^ 7))) ? 1 : 0];
+                (buffer32->line[f82c425->displine])[(x << 4) + c * 2] = (buffer32->line[f82c425->displine])[(x << 4) + c * 2 + 1] = colors[(fontdat[chr][scanline] & (1 << (c ^ 7))) ? 1 : 0];
             }
         }
 
-        ++ma;
+        ++memaddr;
     }
 }
 
@@ -418,9 +418,9 @@ f82c425_cgaline6(f82c425_t *f82c425)
     uint8_t  dat;
     uint16_t addr;
 
-    uint16_t ma = (f82c425->cga.crtc[0x0d] | (f82c425->cga.crtc[0x0c] << 8)) & 0x3fff;
+    uint16_t memaddr = (f82c425->cga.crtc[CGA_CRTC_START_ADDR_LOW] | (f82c425->cga.crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x3fff;
 
-    addr = ((f82c425->displine) & 1) * 0x2000 + (f82c425->displine >> 1) * 80 + ((ma & ~1) << 1);
+    addr = ((f82c425->displine) & 1) * 0x2000 + (f82c425->displine >> 1) * 80 + ((memaddr & ~1) << 1);
 
     for (uint8_t x  = 0; x < 80; x++) {
         dat = f82c425->vram[addr & 0x3FFF];
@@ -442,8 +442,8 @@ f82c425_cgaline4(f82c425_t *f82c425)
     uint8_t  pattern;
     uint16_t addr;
 
-    uint16_t ma = (f82c425->cga.crtc[0x0d] | (f82c425->cga.crtc[0x0c] << 8)) & 0x3fff;
-    addr        = ((f82c425->displine) & 1) * 0x2000 + (f82c425->displine >> 1) * 80 + ((ma & ~1) << 1);
+    uint16_t memaddr = (f82c425->cga.crtc[CGA_CRTC_START_ADDR_LOW] | (f82c425->cga.crtc[CGA_CRTC_START_ADDR_HIGH] << 8)) & 0x3fff;
+    addr        = ((f82c425->displine) & 1) * 0x2000 + (f82c425->displine >> 1) * 80 + ((memaddr & ~1) << 1);
 
     for (uint8_t x = 0; x < 80; x++) {
         dat = f82c425->vram[addr & 0x3FFF];
@@ -526,7 +526,7 @@ f82c425_poll(void *priv)
             f82c425->displine = 0;
             f82c425->cga.cgastat &= ~8;
             f82c425->dispon = 1;
-        } else if (f82c425->displine == (f82c425->cga.crtc[9] + 1) * f82c425->cga.crtc[6]) {
+        } else if (f82c425->displine == (f82c425->cga.crtc[CGA_CRTC_MAX_SCANLINE_ADDR] + 1) * f82c425->cga.crtc[CGA_CRTC_VDISP]) {
             /* Start of VSYNC */
             f82c425->cga.cgastat |= 8;
             f82c425->dispon = 0;
@@ -631,7 +631,7 @@ const device_t f82c425_video_device = {
     .init          = f82c425_init,
     .close         = f82c425_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = f82c425_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/vid_genius.c b/src/video/vid_genius.c
index 4ae8e6fd1..366fa25e1 100644
--- a/src/video/vid_genius.c
+++ b/src/video/vid_genius.c
@@ -387,7 +387,7 @@ genius_textline(genius_t *genius, uint8_t background, int mda, int cols80)
     int            cw = 9;  /* Each character is 9 pixels wide */
     uint8_t        chr;
     uint8_t        attr;
-    uint8_t        sc;
+    uint8_t        scanline;
     uint8_t        ctrl;
     const uint8_t *crtc;
     uint8_t        bitmap[2];
@@ -398,8 +398,8 @@ genius_textline(genius_t *genius, uint8_t background, int mda, int cols80)
     int            drawcursor;
     int            cursorline;
     uint16_t       addr;
-    uint16_t       ma       = (genius->mda_crtc[13] | (genius->mda_crtc[12] << 8)) & 0x3fff;
-    uint16_t       ca       = (genius->mda_crtc[15] | (genius->mda_crtc[14] << 8)) & 0x3fff;
+    uint16_t       memaddr       = (genius->mda_crtc[13] | (genius->mda_crtc[12] << 8)) & 0x3fff;
+    uint16_t       cursoraddr       = (genius->mda_crtc[15] | (genius->mda_crtc[14] << 8)) & 0x3fff;
     const uint8_t *framebuf = genius->vram + 0x10000;
     uint32_t       col;
     uint32_t       dl = genius->displine;
@@ -416,14 +416,14 @@ genius_textline(genius_t *genius, uint8_t background, int mda, int cols80)
 #if 0
     if (genius->genius_charh & 0x10) {
         row = ((dl >> 1) / charh);
-        sc  = ((dl >> 1) % charh);
+        scanline  = ((dl >> 1) % charh);
     } else {
         row = (dl / charh);
-        sc  = (dl % charh);
+        scanline  = (dl % charh);
     }
 #else
         row = (dl / charh);
-        sc  = (dl % charh);
+        scanline  = (dl % charh);
 #endif
     } else {
         if ((genius->displine < 512) || (genius->displine >= 912))
@@ -439,23 +439,23 @@ genius_textline(genius_t *genius, uint8_t background, int mda, int cols80)
         charh = crtc[9] + 1;
 
         row = ((dl >> 1) / charh);
-        sc  = ((dl >> 1) % charh);
+        scanline  = ((dl >> 1) % charh);
     }
 
-    ma = (crtc[13] | (crtc[12] << 8)) & 0x3fff;
-    ca = (crtc[15] | (crtc[14] << 8)) & 0x3fff;
+    memaddr = (crtc[13] | (crtc[12] << 8)) & 0x3fff;
+    cursoraddr = (crtc[15] | (crtc[14] << 8)) & 0x3fff;
 
-    addr = ((ma & ~1) + row * w) * 2;
+    addr = ((memaddr & ~1) + row * w) * 2;
 
     if (!mda)
         dl += 512;
 
-    ma += (row * w);
+    memaddr += (row * w);
 
     if ((crtc[10] & 0x60) == 0x20)
         cursorline = 0;
     else
-        cursorline = ((crtc[10] & 0x1F) <= sc) && ((crtc[11] & 0x1F) >= sc);
+        cursorline = ((crtc[10] & 0x1F) <= scanline) && ((crtc[11] & 0x1F) >= scanline);
 
     for (int x = 0; x < w; x++) {
 #if 0
@@ -467,7 +467,7 @@ genius_textline(genius_t *genius, uint8_t background, int mda, int cols80)
         chr  = framebuf[(addr + 2 * x) & 0x3FFF];
         attr = framebuf[(addr + 2 * x + 1) & 0x3FFF];
 
-        drawcursor = ((ma == ca) && cursorline && genius->enabled && (ctrl & 8));
+        drawcursor = ((memaddr == cursoraddr) && cursorline && genius->enabled && (ctrl & 8));
 
         switch (crtc[10] & 0x60) {
             case 0x00:
@@ -487,7 +487,7 @@ genius_textline(genius_t *genius, uint8_t background, int mda, int cols80)
             attr &= 0x7F;
 
         /* MDA underline */
-        if (mda && (sc == charh) && ((attr & 7) == 1)) {
+        if (mda && (scanline == charh) && ((attr & 7) == 1)) {
             col = mdaattr[attr][blink][1];
 
             if (genius->genius_control & 0x20)
@@ -504,9 +504,9 @@ genius_textline(genius_t *genius, uint8_t background, int mda, int cols80)
             }
         } else { /* Draw 8 pixels of character */
             if (mda)
-                bitmap[0] = fontdat8x12[chr][sc];
+                bitmap[0] = fontdat8x12[chr][scanline];
             else
-                bitmap[0] = fontdat[chr][sc];
+                bitmap[0] = fontdat[chr][scanline];
 
             for (c = 0; c < 8; c++) {
                 col = mdaattr[attr][blink][(bitmap[0] & (1 << (c ^ 7))) ? 1 : 0];
@@ -563,7 +563,7 @@ genius_textline(genius_t *genius, uint8_t background, int mda, int cols80)
                     }
                 }
             }
-            ++ma;
+            ++memaddr;
         }
     }
 }
@@ -826,7 +826,7 @@ const device_t genius_device = {
     .init          = genius_init,
     .close         = genius_close,
     .reset         = NULL,
-    { .available = genius_available },
+    .available     = genius_available,
     .speed_changed = genius_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/vid_hercules.c b/src/video/vid_hercules.c
index 2a725488d..15b9e69cd 100644
--- a/src/video/vid_hercules.c
+++ b/src/video/vid_hercules.c
@@ -14,7 +14,7 @@
  *          Miran Grca, <mgrca8@gmail.com>
  *
  *          Copyright 2008-2019 Sarah Walker.
- *          Copyright 2016-2019 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -27,9 +27,9 @@
 #include <86box/rom.h>
 #include <86box/io.h>
 #include <86box/timer.h>
+#include <86box/device.h>
 #include <86box/lpt.h>
 #include <86box/pit.h>
-#include <86box/device.h>
 #include <86box/video.h>
 #include <86box/vid_hercules.h>
 #include <86box/plat_unused.h>
@@ -168,9 +168,9 @@ hercules_in(uint16_t addr, void *priv)
         case 0x03b5:
         case 0x03b7:
             if (dev->crtcreg == 0x0c)
-                ret = (dev->ma >> 8) & 0x3f;
+                ret = (dev->memaddr >> 8) & 0x3f;
             else if (dev->crtcreg == 0x0d)
-                ret = dev->ma & 0xff;
+                ret = dev->memaddr & 0xff;
             else
                 ret = dev->crtc[dev->crtcreg];
             break;
@@ -178,8 +178,8 @@ hercules_in(uint16_t addr, void *priv)
         case 0x03ba:
             ret = 0x70; /* Hercules ident */
             ret |= (dev->lp_ff ? 2 : 0);
-            ret |= (dev->stat & 0x01);
-            if (dev->stat & 0x08)
+            ret |= (dev->status & 0x01);
+            if (dev->status & 0x08)
                 ret |= 0x80;
             if ((ret & 0x81) == 0x80)
                 ret |= 0x08;
@@ -281,10 +281,10 @@ hercules_poll(void *priv)
     hercules_t *dev = (hercules_t *) priv;
     uint8_t     chr;
     uint8_t     attr;
-    uint16_t    ca;
+    uint16_t    cursoraddr;
     uint16_t    dat;
     uint16_t    pa;
-    int         oldsc;
+    int         scanline_old;
     int         blink;
     int         x;
     int         xx;
@@ -296,16 +296,16 @@ hercules_poll(void *priv)
     uint32_t   *p;
 
     VIDEO_MONITOR_PROLOGUE()
-    ca = (dev->crtc[15] | (dev->crtc[14] << 8)) & 0x3fff;
+    cursoraddr = (dev->crtc[15] | (dev->crtc[14] << 8)) & 0x3fff;
 
     if (!dev->linepos) {
         timer_advance_u64(&dev->timer, dev->dispofftime);
-        dev->stat |= 1;
+        dev->status |= 1;
         dev->linepos = 1;
-        oldsc        = dev->sc;
+        scanline_old        = dev->scanline;
 
         if ((dev->crtc[8] & 3) == 3)
-            dev->sc = (dev->sc << 1) & 7;
+            dev->scanline = (dev->scanline << 1) & 7;
 
         if (dev->dispon) {
             if (dev->displine < dev->firstline) {
@@ -317,16 +317,16 @@ hercules_poll(void *priv)
             hercules_render_overscan_left(dev);
 
             if (dev->ctrl & 0x02) {
-                ca = (dev->sc & 3) * 0x2000;
+                cursoraddr = (dev->scanline & 3) * 0x2000;
                 if (dev->ctrl & 0x80)
-                    ca += 0x8000;
+                    cursoraddr += 0x8000;
 
                 for (x = 0; x < dev->crtc[1]; x++) {
                     if (dev->ctrl & 8)
-                        dat = (dev->vram[((dev->ma << 1) & 0x1fff) + ca] << 8) | dev->vram[((dev->ma << 1) & 0x1fff) + ca + 1];
+                        dat = (dev->vram[((dev->memaddr << 1) & 0x1fff) + cursoraddr] << 8) | dev->vram[((dev->memaddr << 1) & 0x1fff) + cursoraddr + 1];
                     else
                         dat = 0;
-                    dev->ma++;
+                    dev->memaddr++;
                     for (c = 0; c < 16; c++)
                         buffer32->line[dev->displine + 14][(x << 4) + c + 8] = (dat & (32768 >> c)) ? 7 : 0;
                     for (c = 0; c < 16; c += 8)
@@ -341,25 +341,25 @@ hercules_poll(void *priv)
                         attr = dev->charbuffer[(x << 1) + 1];
                     } else
                         chr = attr = 0;
-                    drawcursor = ((dev->ma == ca) && dev->con && dev->cursoron);
+                    drawcursor = ((dev->memaddr == cursoraddr) && dev->cursorvisible && dev->cursoron);
                     blink      = ((dev->blink & 16) && (dev->ctrl & 0x20) && (attr & 0x80) && !drawcursor);
 
-                    if (dev->sc == 12 && ((attr & 7) == 1)) {
+                    if (dev->scanline == 12 && ((attr & 7) == 1)) {
                         for (c = 0; c < 9; c++)
                             buffer32->line[dev->displine + 14][(x * 9) + c + 8] = dev->cols[attr][blink][1];
                     } else {
                         for (c = 0; c < 8; c++)
-                            buffer32->line[dev->displine + 14][(x * 9) + c + 8] = dev->cols[attr][blink][(fontdatm[chr][dev->sc] & (1 << (c ^ 7))) ? 1 : 0];
+                            buffer32->line[dev->displine + 14][(x * 9) + c + 8] = dev->cols[attr][blink][(fontdatm[chr][dev->scanline] & (1 << (c ^ 7))) ? 1 : 0];
 
                         if ((chr & ~0x1f) == 0xc0)
-                            buffer32->line[dev->displine + 14][(x * 9) + 8 + 8] = dev->cols[attr][blink][fontdatm[chr][dev->sc] & 1];
+                            buffer32->line[dev->displine + 14][(x * 9) + 8 + 8] = dev->cols[attr][blink][fontdatm[chr][dev->scanline] & 1];
                         else
                             buffer32->line[dev->displine + 14][(x * 9) + 8 + 8] = dev->cols[attr][blink][0];
                     }
                     if (dev->ctrl2 & 0x01)
-                        dev->ma = (dev->ma + 1) & 0x3fff;
+                        dev->memaddr = (dev->memaddr + 1) & 0x3fff;
                     else
-                        dev->ma = (dev->ma + 1) & 0x7ff;
+                        dev->memaddr = (dev->memaddr + 1) & 0x7ff;
 
                     if (drawcursor) {
                         for (c = 0; c < 9; c++)
@@ -377,10 +377,10 @@ hercules_poll(void *priv)
 
             video_process_8(x + 16, dev->displine + 14);
         }
-        dev->sc = oldsc;
+        dev->scanline = scanline_old;
 
-        if (dev->vc == dev->crtc[7] && !dev->sc)
-            dev->stat |= 8;
+        if (dev->vc == dev->crtc[7] && !dev->scanline)
+            dev->status |= 8;
         dev->displine++;
         if (dev->displine >= 500)
             dev->displine = 0;
@@ -388,33 +388,32 @@ hercules_poll(void *priv)
         timer_advance_u64(&dev->timer, dev->dispontime);
 
         if (dev->dispon)
-            dev->stat &= ~1;
+            dev->status &= ~1;
 
         dev->linepos = 0;
         if (dev->vsynctime) {
             dev->vsynctime--;
             if (!dev->vsynctime)
-                dev->stat &= ~8;
+                dev->status &= ~8;
         }
 
-        if (dev->sc == (dev->crtc[11] & 31) || ((dev->crtc[8] & 3) == 3 && dev->sc == ((dev->crtc[11] & 31) >> 1))) {
-            dev->con  = 0;
-            dev->coff = 1;
+        if (dev->scanline == (dev->crtc[11] & 31) || ((dev->crtc[8] & 3) == 3 && dev->scanline == ((dev->crtc[11] & 31) >> 1))) {
+            dev->cursorvisible  = 0;
         }
 
         if (dev->vadj) {
-            dev->sc++;
-            dev->sc &= 31;
-            dev->ma = dev->maback;
+            dev->scanline++;
+            dev->scanline &= 31;
+            dev->memaddr = dev->memaddr_backup;
             dev->vadj--;
             if (!dev->vadj) {
                 dev->dispon = 1;
-                dev->ma = dev->maback = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
-                dev->sc               = 0;
+                dev->memaddr = dev->memaddr_backup = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
+                dev->scanline               = 0;
             }
-        } else if (((dev->crtc[8] & 3) != 3 && dev->sc == dev->crtc[9]) || ((dev->crtc[8] & 3) == 3 && dev->sc == (dev->crtc[9] >> 1))) {
-            dev->maback = dev->ma;
-            dev->sc     = 0;
+        } else if (((dev->crtc[8] & 3) != 3 && dev->scanline == dev->crtc[9]) || ((dev->crtc[8] & 3) == 3 && dev->scanline == (dev->crtc[9] >> 1))) {
+            dev->memaddr_backup = dev->memaddr;
+            dev->scanline     = 0;
             oldvc       = dev->vc;
             dev->vc++;
             dev->vc &= 127;
@@ -427,7 +426,7 @@ hercules_poll(void *priv)
                 dev->vadj = dev->crtc[5];
                 if (!dev->vadj) {
                     dev->dispon = 1;
-                    dev->ma = dev->maback = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
+                    dev->memaddr = dev->memaddr_backup = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
                 }
                 switch (dev->crtc[10] & 0x60) {
                     case 0x20:
@@ -512,17 +511,17 @@ hercules_poll(void *priv)
                 dev->blink++;
             }
         } else {
-            dev->sc++;
-            dev->sc &= 31;
-            dev->ma = dev->maback;
+            dev->scanline++;
+            dev->scanline &= 31;
+            dev->memaddr = dev->memaddr_backup;
         }
 
-        if (dev->sc == (dev->crtc[10] & 31) || ((dev->crtc[8] & 3) == 3 && dev->sc == ((dev->crtc[10] & 31) >> 1)))
-            dev->con = 1;
+        if (dev->scanline == (dev->crtc[10] & 31) || ((dev->crtc[8] & 3) == 3 && dev->scanline == ((dev->crtc[10] & 31) >> 1)))
+            dev->cursorvisible = 1;
         if (dev->dispon && !(dev->ctrl & 0x02)) {
             for (x = 0; x < (dev->crtc[1] << 1); x++) {
                 pa                 = (dev->ctrl & 0x80) ? ((x & 1) ? 0x0000 : 0x8000) : 0x0000;
-                dev->charbuffer[x] = dev->vram[(((dev->ma << 1) + x) & 0x3fff) + pa];
+                dev->charbuffer[x] = dev->vram[(((dev->memaddr << 1) + x) & 0x3fff) + pa];
             }
         }
     }
@@ -543,14 +542,36 @@ hercules_init(UNUSED(const device_t *info))
 
     dev->vram = (uint8_t *) malloc(0x10000);
 
+    switch(device_get_config_int("font")) {
+        case 0:
+            loadfont(FONT_IBM_MDA_437_PATH, 0);
+            break;
+        case 1:
+            loadfont(FONT_IBM_MDA_437_NORDIC_PATH, 0);
+            break;
+        case 2:
+            loadfont(FONT_KAM_PATH, 0);
+            break;
+        case 3:
+            loadfont(FONT_KAMCL16_PATH, 0);
+            break;
+        case 4:
+            loadfont(FONT_TULIP_DGA_PATH, 0);
+            break;
+    }
+
     timer_add(&dev->timer, hercules_poll, dev, 1);
 
     mem_mapping_add(&dev->mapping, 0xb0000, 0x08000,
-                    hercules_read, NULL, NULL, hercules_write, NULL, NULL,
-                    NULL /*dev->vram*/, MEM_MAPPING_EXTERNAL, dev);
+                    hercules_read, NULL, NULL,
+                    hercules_write, NULL, NULL,
+                    NULL /*dev->vram*/, MEM_MAPPING_EXTERNAL,
+                    dev);
 
-    io_sethandler(0x03b0, 16,
-                  hercules_in, NULL, NULL, hercules_out, NULL, NULL, dev);
+    io_sethandler(0x03b0, 0x0010,
+                  hercules_in, NULL, NULL,
+                  hercules_out, NULL, NULL,
+                  dev);
 
     for (uint16_t c = 0; c < 256; c++) {
         dev->cols[c][0][0] = dev->cols[c][1][0] = dev->cols[c][1][1] = 16;
@@ -585,7 +606,9 @@ hercules_init(UNUSED(const device_t *info))
     video_inform(VIDEO_FLAG_TYPE_MDA, &timing_hercules);
 
     /* Force the LPT3 port to be enabled. */
-    lpt3_init(0x3BC);
+    dev->lpt = device_add_inst(&lpt_port_device, 1);
+    lpt_port_setup(dev->lpt, LPT_MDA_ADDR);
+    lpt_set_3bc_used(1);
 
     return dev;
 }
@@ -615,41 +638,52 @@ speed_changed(void *priv)
 static const device_config_t hercules_config[] = {
   // clang-format off
     {
-        .name = "rgb_type",
-        .description = "Display type",
-        .type = CONFIG_SELECTION,
-        .default_int = 0,
-        .selection = {
-            {
-                .description = "Default",
-                .value = 0
-            },
-            {
-                .description = "Green",
-                .value = 1
-            },
-            {
-                .description = "Amber",
-                .value = 2
-            },
-            {
-                .description = "Gray",
-                .value = 3
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "rgb_type",
+        .description    = "Display type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Default", .value = 0 },
+            { .description = "Green",   .value = 1 },
+            { .description = "Amber",   .value = 2 },
+            { .description = "Gray",    .value = 3 },
+            { .description = ""                    }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "blend",
-        .description = "Blend",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "font",
+        .description    = "Font",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "US (CP 437)",                 .value = 0 },
+            { .description = "IBM Nordic (CP 437-Nordic)",  .value = 1 },
+            { .description = "Czech Kamenicky (CP 895) #1", .value = 2 },
+            { .description = "Czech Kamenicky (CP 895) #2", .value = 3 },
+            { .description = "Tulip DGA",                   .value = 4 },
+            { .description = ""                                        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .type = CONFIG_END
-    }
+        .name           = "blend",
+        .description    = "Blend",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
@@ -661,7 +695,7 @@ const device_t hercules_device = {
     .init          = hercules_init,
     .close         = hercules_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = speed_changed,
     .force_redraw  = NULL,
     .config        = hercules_config
diff --git a/src/video/vid_incolor.c b/src/video/vid_hercules_incolor.c
similarity index 87%
rename from src/video/vid_incolor.c
rename to src/video/vid_hercules_incolor.c
index e3f37ec65..6e3b6a6d2 100644
--- a/src/video/vid_incolor.c
+++ b/src/video/vid_hercules_incolor.c
@@ -14,7 +14,7 @@
  *          Miran Grca, <mgrca8@gmail.com>
  *
  *          Copyright 2008-2018 Sarah Walker.
- *          Copyright 2016-2018 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -24,11 +24,11 @@
 #include <86box/86box.h>
 #include <86box/io.h>
 #include <86box/timer.h>
+#include <86box/device.h>
 #include <86box/lpt.h>
 #include <86box/pit.h>
 #include <86box/mem.h>
 #include <86box/rom.h>
-#include <86box/device.h>
 #include <86box/video.h>
 #include <86box/plat_unused.h>
 
@@ -157,7 +157,7 @@ typedef struct {
     uint8_t crtc[32];
     int     crtcreg;
 
-    uint8_t ctrl, ctrl2, stat;
+    uint8_t ctrl, ctrl2, status;
 
     uint64_t   dispontime, dispofftime;
     pc_timer_t timer;
@@ -165,9 +165,9 @@ typedef struct {
     int firstline, lastline;
 
     int      linepos, displine;
-    int      vc, sc;
-    uint16_t ma, maback;
-    int      con, coff, cursoron;
+    int      vc, scanline;
+    uint16_t memaddr, memaddr_backup;
+    int      cursorvisible, cursoron;
     int      dispon, blink;
     int      vsynctime;
     int      vadj;
@@ -179,6 +179,8 @@ typedef struct {
     uint32_t rgb[64];
 
     uint8_t *vram;
+
+    lpt_t   *lpt;
 } incolor_t;
 
 static video_timings_t timing_incolor = { .type = VIDEO_ISA, .write_b = 8, .write_w = 16, .write_l = 32, .read_b = 8, .read_w = 16, .read_l = 32 };
@@ -285,7 +287,7 @@ incolor_in(uint16_t port, void *priv)
 
         case 0x3ba:
             /* 0x50: InColor card identity */
-            ret = (dev->stat & 0xf) | ((dev->stat & 8) << 4) | 0x50;
+            ret = (dev->status & 0xf) | ((dev->status & 8) << 4) | 0x50;
             break;
 
         default:
@@ -483,11 +485,11 @@ draw_char_rom(incolor_t *dev, int x, uint8_t chr, uint8_t attr)
         elg = ((chr >= 0xc0) && (chr <= 0xdf));
     }
 
-    fnt = &(fontdatm[chr][dev->sc]);
+    fnt = &(fontdatm[chr][dev->scanline]);
 
     if (blk) {
         val = 0x000; /* Blinking, draw all background */
-    } else if (dev->sc == ull) {
+    } else if (dev->scanline == ull) {
         val = 0x1ff; /* Underscore, draw all foreground */
     } else {
         val = fnt[0] << 1;
@@ -559,12 +561,12 @@ draw_char_ram4(incolor_t *dev, int x, uint8_t chr, uint8_t attr)
     } else {
         elg = ((chr >= 0xc0) && (chr <= 0xdf));
     }
-    fnt = dev->vram + 0x4000 + 16 * chr + dev->sc;
+    fnt = dev->vram + 0x4000 + 16 * chr + dev->scanline;
 
     if (blk) {
         /* Blinking, draw all background */
         val[0] = val[1] = val[2] = val[3] = 0x000;
-    } else if (dev->sc == ull) {
+    } else if (dev->scanline == ull) {
         /* Underscore, draw all foreground */
         val[0] = val[1] = val[2] = val[3] = 0x1ff;
     } else {
@@ -685,12 +687,12 @@ draw_char_ram48(incolor_t *dev, int x, uint8_t chr, uint8_t attr)
     } else {
         elg = ((chr >= 0xc0) && (chr <= 0xdf));
     }
-    fnt = dev->vram + 0x4000 + 16 * chr + 4096 * font + dev->sc;
+    fnt = dev->vram + 0x4000 + 16 * chr + 4096 * font + dev->scanline;
 
     if (blk) {
         /* Blinking, draw all background */
         val[0] = val[1] = val[2] = val[3] = 0x000;
-    } else if (dev->sc == ull) {
+    } else if (dev->scanline == ull) {
         /* Underscore, draw all foreground */
         val[0] = val[1] = val[2] = val[3] = 0x1ff;
     } else {
@@ -716,9 +718,9 @@ draw_char_ram48(incolor_t *dev, int x, uint8_t chr, uint8_t attr)
         /* Generate pixel colour */
         cfg   = 0;
         pmask = 1;
-        if (dev->sc == oll) {
+        if (dev->scanline == oll) {
             cfg = olc ^ ibg; /* Strikethrough */
-        } else if (dev->sc == ull) {
+        } else if (dev->scanline == ull) {
             cfg = ulc ^ ibg; /* Underline */
         } else {
             for (uint8_t plane = 0; plane < 4; plane++, pmask = pmask << 1) {
@@ -746,7 +748,7 @@ draw_char_ram48(incolor_t *dev, int x, uint8_t chr, uint8_t attr)
 }
 
 static void
-text_line(incolor_t *dev, uint16_t ca)
+text_line(incolor_t *dev, uint16_t cursoraddr)
 {
     int      drawcursor;
     uint8_t  chr;
@@ -755,12 +757,12 @@ text_line(incolor_t *dev, uint16_t ca)
 
     for (uint8_t x = 0; x < dev->crtc[1]; x++) {
         if (dev->ctrl & 8) {
-            chr  = dev->vram[(dev->ma << 1) & 0x3fff];
-            attr = dev->vram[((dev->ma << 1) + 1) & 0x3fff];
+            chr  = dev->vram[(dev->memaddr << 1) & 0x3fff];
+            attr = dev->vram[((dev->memaddr << 1) + 1) & 0x3fff];
         } else
             chr = attr = 0;
 
-        drawcursor = ((dev->ma == ca) && dev->con && dev->cursoron);
+        drawcursor = ((dev->memaddr == cursoraddr) && dev->cursorvisible && dev->cursoron);
 
         switch (dev->crtc[INCOLOR_CRTC_XMODE] & 5) {
             case 0:
@@ -779,7 +781,7 @@ text_line(incolor_t *dev, uint16_t ca)
             default:
                 break;
         }
-        ++dev->ma;
+        ++dev->memaddr;
 
         if (drawcursor) {
             int     cw  = INCOLOR_CW;
@@ -808,29 +810,29 @@ static void
 graphics_line(incolor_t *dev)
 {
     uint8_t  mask;
-    uint16_t ca;
+    uint16_t cursoraddr;
     int      plane;
     int      col;
     uint8_t  ink;
     uint16_t val[4];
 
     /* Graphics mode. */
-    ca = (dev->sc & 3) * 0x2000;
+    cursoraddr = (dev->scanline & 3) * 0x2000;
     if ((dev->ctrl & INCOLOR_CTRL_PAGE1) && (dev->ctrl2 & INCOLOR_CTRL2_PAGE1))
-        ca += 0x8000;
+        cursoraddr += 0x8000;
 
     for (uint8_t x = 0; x < dev->crtc[1]; x++) {
         mask = dev->crtc[INCOLOR_CRTC_MASK]; /* Planes to display */
         for (plane = 0; plane < 4; plane++, mask = mask >> 1) {
             if (dev->ctrl & 8) {
                 if (mask & 1)
-                    val[plane] = (dev->vram[((dev->ma << 1) & 0x1fff) + ca + 0x10000 * plane] << 8) | dev->vram[((dev->ma << 1) & 0x1fff) + ca + 0x10000 * plane + 1];
+                    val[plane] = (dev->vram[((dev->memaddr << 1) & 0x1fff) + cursoraddr + 0x10000 * plane] << 8) | dev->vram[((dev->memaddr << 1) & 0x1fff) + cursoraddr + 0x10000 * plane + 1];
                 else
                     val[plane] = 0;
             } else
                 val[plane] = 0;
         }
-        dev->ma++;
+        dev->memaddr++;
 
         for (uint8_t c = 0; c < 16; c++) {
             ink = 0;
@@ -855,19 +857,19 @@ static void
 incolor_poll(void *priv)
 {
     incolor_t *dev = (incolor_t *) priv;
-    uint16_t   ca  = (dev->crtc[15] | (dev->crtc[14] << 8)) & 0x3fff;
+    uint16_t   cursoraddr  = (dev->crtc[15] | (dev->crtc[14] << 8)) & 0x3fff;
     int        x;
     int        oldvc;
-    int        oldsc;
+    int        scanline_old;
     int        cw      = INCOLOR_CW;
 
     if (!dev->linepos) {
         timer_advance_u64(&dev->timer, dev->dispofftime);
-        dev->stat |= 1;
+        dev->status |= 1;
         dev->linepos = 1;
-        oldsc        = dev->sc;
+        scanline_old        = dev->scanline;
         if ((dev->crtc[8] & 3) == 3)
-            dev->sc = (dev->sc << 1) & 7;
+            dev->scanline = (dev->scanline << 1) & 7;
 
         if (dev->dispon) {
             if (dev->displine < dev->firstline) {
@@ -878,44 +880,43 @@ incolor_poll(void *priv)
             if ((dev->ctrl & INCOLOR_CTRL_GRAPH) && (dev->ctrl2 & INCOLOR_CTRL2_GRAPH))
                 graphics_line(dev);
             else
-                text_line(dev, ca);
+                text_line(dev, cursoraddr);
         }
-        dev->sc = oldsc;
-        if (dev->vc == dev->crtc[7] && !dev->sc)
-            dev->stat |= 8;
+        dev->scanline = scanline_old;
+        if (dev->vc == dev->crtc[7] && !dev->scanline)
+            dev->status |= 8;
         dev->displine++;
         if (dev->displine >= 500)
             dev->displine = 0;
     } else {
         timer_advance_u64(&dev->timer, dev->dispontime);
         if (dev->dispon)
-            dev->stat &= ~1;
+            dev->status &= ~1;
         dev->linepos = 0;
         if (dev->vsynctime) {
             dev->vsynctime--;
             if (!dev->vsynctime)
-                dev->stat &= ~8;
+                dev->status &= ~8;
         }
 
-        if (dev->sc == (dev->crtc[11] & 31) || ((dev->crtc[8] & 3) == 3 && dev->sc == ((dev->crtc[11] & 31) >> 1))) {
-            dev->con  = 0;
-            dev->coff = 1;
+        if (dev->scanline == (dev->crtc[11] & 31) || ((dev->crtc[8] & 3) == 3 && dev->scanline == ((dev->crtc[11] & 31) >> 1))) {
+            dev->cursorvisible  = 0;
         }
 
         if (dev->vadj) {
-            dev->sc++;
-            dev->sc &= 31;
-            dev->ma = dev->maback;
+            dev->scanline++;
+            dev->scanline &= 31;
+            dev->memaddr = dev->memaddr_backup;
             dev->vadj--;
             if (!dev->vadj) {
                 dev->dispon = 1;
-                dev->ma = dev->maback = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
-                dev->sc               = 0;
+                dev->memaddr = dev->memaddr_backup = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
+                dev->scanline = 0;
             }
-        } else if (dev->sc == dev->crtc[9] || ((dev->crtc[8] & 3) == 3 && dev->sc == (dev->crtc[9] >> 1))) {
-            dev->maback = dev->ma;
-            dev->sc     = 0;
-            oldvc       = dev->vc;
+        } else if (dev->scanline == dev->crtc[9] || ((dev->crtc[8] & 3) == 3 && dev->scanline == (dev->crtc[9] >> 1))) {
+            dev->memaddr_backup = dev->memaddr;
+            dev->scanline = 0;
+            oldvc = dev->vc;
             dev->vc++;
             dev->vc &= 127;
             if (dev->vc == dev->crtc[6])
@@ -926,7 +927,7 @@ incolor_poll(void *priv)
                 if (!dev->vadj)
                     dev->dispon = 1;
                 if (!dev->vadj)
-                    dev->ma = dev->maback = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
+                    dev->memaddr = dev->memaddr_backup = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
                 if ((dev->crtc[10] & 0x60) == 0x20)
                     dev->cursoron = 0;
                 else
@@ -972,13 +973,13 @@ incolor_poll(void *priv)
                 dev->blink++;
             }
         } else {
-            dev->sc++;
-            dev->sc &= 31;
-            dev->ma = dev->maback;
+            dev->scanline++;
+            dev->scanline &= 31;
+            dev->memaddr = dev->memaddr_backup;
         }
 
-        if (dev->sc == (dev->crtc[10] & 31) || ((dev->crtc[8] & 3) == 3 && dev->sc == ((dev->crtc[10] & 31) >> 1)))
-            dev->con = 1;
+        if (dev->scanline == (dev->crtc[10] & 31) || ((dev->crtc[8] & 3) == 3 && dev->scanline == ((dev->crtc[10] & 31) >> 1)))
+            dev->cursorvisible = 1;
     }
 }
 
@@ -993,6 +994,24 @@ incolor_init(UNUSED(const device_t *info))
 
     dev->vram = (uint8_t *) malloc(0x40000); /* 4 planes of 64k */
 
+    switch(device_get_config_int("font")) {
+        case 0:
+            loadfont(FONT_IBM_MDA_437_PATH, 0);
+            break;
+        case 1:
+            loadfont(FONT_IBM_MDA_437_NORDIC_PATH, 0);
+            break;
+        case 2:
+            loadfont(FONT_KAM_PATH, 0);
+            break;
+        case 3:
+            loadfont(FONT_KAMCL16_PATH, 0);
+            break;
+        case 4:
+            loadfont(FONT_TULIP_DGA_PATH, 0);
+            break;
+    }
+
     timer_add(&dev->timer, incolor_poll, dev, 1);
 
     mem_mapping_add(&dev->mapping, 0xb0000, 0x08000,
@@ -1018,7 +1037,9 @@ incolor_init(UNUSED(const device_t *info))
     video_inform(VIDEO_FLAG_TYPE_MDA, &timing_incolor);
 
     /* Force the LPT3 port to be enabled. */
-    lpt3_init(0x3BC);
+    dev->lpt = device_add_inst(&lpt_port_device, 1);
+    lpt_port_setup(dev->lpt, LPT_MDA_ADDR);
+    lpt_set_3bc_used(1);
 
     return dev;
 }
@@ -1045,6 +1066,30 @@ speed_changed(void *priv)
     recalc_timings(dev);
 }
 
+static const device_config_t incolor_config[] = {
+  // clang-format off
+    {
+        .name           = "font",
+        .description    = "Font",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "US (CP 437)",                 .value = 0 },
+            { .description = "IBM Nordic (CP 437-Nordic)",  .value = 1 },
+            { .description = "Czech Kamenicky (CP 895) #1", .value = 2 },
+            { .description = "Czech Kamenicky (CP 895) #2", .value = 3 },
+            { .description = "Tulip DGA",                   .value = 4 },
+            { .description = ""                                        }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
 const device_t incolor_device = {
     .name          = "Hercules InColor",
     .internal_name = "incolor",
@@ -1053,8 +1098,8 @@ const device_t incolor_device = {
     .init          = incolor_init,
     .close         = incolor_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = speed_changed,
     .force_redraw  = NULL,
-    .config        = NULL
+    .config        = incolor_config
 };
diff --git a/src/video/vid_herculesplus.c b/src/video/vid_hercules_plus.c
similarity index 78%
rename from src/video/vid_herculesplus.c
rename to src/video/vid_hercules_plus.c
index 429632f19..c6b442ce0 100644
--- a/src/video/vid_herculesplus.c
+++ b/src/video/vid_hercules_plus.c
@@ -14,7 +14,7 @@
  *          Miran Grca, <mgrca8@gmail.com>
  *
  *          Copyright 2008-2018 Sarah Walker.
- *          Copyright 2016-2018 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -23,12 +23,12 @@
 #include <wchar.h>
 #include <86box/86box.h>
 #include <86box/io.h>
-#include <86box/lpt.h>
 #include <86box/timer.h>
+#include <86box/device.h>
+#include <86box/lpt.h>
 #include <86box/pit.h>
 #include <86box/mem.h>
 #include <86box/rom.h>
-#include <86box/device.h>
 #include <86box/video.h>
 #include <86box/plat_unused.h>
 
@@ -67,7 +67,7 @@ typedef struct {
     uint8_t crtc[32];
     int     crtcreg;
 
-    uint8_t ctrl, ctrl2, stat;
+    uint8_t ctrl, ctrl2, status;
 
     uint64_t   dispontime, dispofftime;
     pc_timer_t timer;
@@ -75,9 +75,9 @@ typedef struct {
     int firstline, lastline;
 
     int      linepos, displine;
-    int      vc, sc;
-    uint16_t ma, maback;
-    int      con, coff, cursoron;
+    int      vc, scanline;
+    uint16_t memaddr, memaddr_backup;
+    int      cursorvisible, cursoron;
     int      dispon, blink;
     int      vsynctime;
     int      vadj;
@@ -86,6 +86,8 @@ typedef struct {
     int cols[256][2][2];
 
     uint8_t *vram;
+
+    lpt_t   *lpt;
 } herculesplus_t;
 
 #define VIDEO_MONITOR_PROLOGUE()                        \
@@ -194,7 +196,7 @@ herculesplus_in(uint16_t port, void *priv)
 
         case 0x3ba:
             /* 0x10: Hercules Plus card identity */
-            ret = (dev->stat & 0xf) | ((dev->stat & 8) << 4) | 0x10;
+            ret = (dev->status & 0xf) | ((dev->status & 8) << 4) | 0x10;
             break;
 
         default:
@@ -260,11 +262,11 @@ draw_char_rom(herculesplus_t *dev, int x, uint8_t chr, uint8_t attr)
     else
         elg = ((chr >= 0xc0) && (chr <= 0xdf));
 
-    fnt = &(fontdatm[chr][dev->sc]);
+    fnt = &(fontdatm[chr][dev->scanline]);
 
     if (blk) {
         val = 0x000; /* Blinking, draw all background */
-    } else if (dev->sc == ull) {
+    } else if (dev->scanline == ull) {
         val = 0x1ff; /* Underscore, draw all foreground */
     } else {
         val = fnt[0] << 1;
@@ -319,11 +321,11 @@ draw_char_ram4(herculesplus_t *dev, int x, uint8_t chr, uint8_t attr)
     else
         elg = ((chr >= 0xc0) && (chr <= 0xdf));
 
-    fnt = dev->vram + 0x4000 + 16 * chr + dev->sc;
+    fnt = dev->vram + 0x4000 + 16 * chr + dev->scanline;
 
     if (blk) {
         val = 0x000; /* Blinking, draw all background */
-    } else if (dev->sc == ull) {
+    } else if (dev->scanline == ull) {
         val = 0x1ff; /* Underscore, draw all foreground */
     } else {
         val = fnt[0] << 1;
@@ -384,11 +386,11 @@ draw_char_ram48(herculesplus_t *dev, int x, uint8_t chr, uint8_t attr)
     else
         elg = ((chr >= 0xc0) && (chr <= 0xdf));
 
-    fnt = dev->vram + 0x4000 + 16 * chr + 4096 * font + dev->sc;
+    fnt = dev->vram + 0x4000 + 16 * chr + 4096 * font + dev->scanline;
 
     if (blk) {
         val = 0x000; /* Blinking, draw all background */
-    } else if (dev->sc == ull) {
+    } else if (dev->scanline == ull) {
         val = 0x1ff; /* Underscore, draw all foreground */
     } else {
         val = fnt[0] << 1;
@@ -404,7 +406,7 @@ draw_char_ram48(herculesplus_t *dev, int x, uint8_t chr, uint8_t attr)
 }
 
 static void
-text_line(herculesplus_t *dev, uint16_t ca)
+text_line(herculesplus_t *dev, uint16_t cursoraddr)
 {
     int      drawcursor;
     uint8_t  chr;
@@ -413,12 +415,12 @@ text_line(herculesplus_t *dev, uint16_t ca)
 
     for (uint8_t x = 0; x < dev->crtc[1]; x++) {
         if (dev->ctrl & 8) {
-            chr  = dev->vram[(dev->ma << 1) & 0x3fff];
-            attr = dev->vram[((dev->ma << 1) + 1) & 0x3fff];
+            chr  = dev->vram[(dev->memaddr << 1) & 0x3fff];
+            attr = dev->vram[((dev->memaddr << 1) + 1) & 0x3fff];
         } else
             chr = attr = 0;
 
-        drawcursor = ((dev->ma == ca) && dev->con && dev->cursoron);
+        drawcursor = ((dev->memaddr == cursoraddr) && dev->cursorvisible && dev->cursoron);
 
         switch (dev->crtc[HERCULESPLUS_CRTC_XMODE] & 5) {
             case 0:
@@ -437,7 +439,7 @@ text_line(herculesplus_t *dev, uint16_t ca)
             default:
                 break;
         }
-        ++dev->ma;
+        ++dev->memaddr;
 
         if (drawcursor) {
             int cw = HERCULESPLUS_CW;
@@ -452,24 +454,24 @@ text_line(herculesplus_t *dev, uint16_t ca)
 static void
 graphics_line(herculesplus_t *dev)
 {
-    uint16_t ca;
+    uint16_t cursoraddr;
     int      c;
     int      plane = 0;
     uint16_t val;
 
     /* Graphics mode. */
-    ca = (dev->sc & 3) * 0x2000;
+    cursoraddr = (dev->scanline & 3) * 0x2000;
     if ((dev->ctrl & HERCULESPLUS_CTRL_PAGE1) && (dev->ctrl2 & HERCULESPLUS_CTRL2_PAGE1))
-        ca += 0x8000;
+        cursoraddr += 0x8000;
 
     for (uint8_t x = 0; x < dev->crtc[1]; x++) {
         if (dev->ctrl & 8)
-            val = (dev->vram[((dev->ma << 1) & 0x1fff) + ca + 0x10000 * plane] << 8)
-                | dev->vram[((dev->ma << 1) & 0x1fff) + ca + 0x10000 * plane + 1];
+            val = (dev->vram[((dev->memaddr << 1) & 0x1fff) + cursoraddr + 0x10000 * plane] << 8)
+                | dev->vram[((dev->memaddr << 1) & 0x1fff) + cursoraddr + 0x10000 * plane + 1];
         else
             val = 0;
 
-        dev->ma++;
+        dev->memaddr++;
         for (c = 0; c < 16; c++) {
             buffer32->line[dev->displine][(x << 4) + c] = (val & 0x8000) ? 7 : 0;
 
@@ -485,20 +487,20 @@ static void
 herculesplus_poll(void *priv)
 {
     herculesplus_t *dev = (herculesplus_t *) priv;
-    uint16_t        ca  = (dev->crtc[15] | (dev->crtc[14] << 8)) & 0x3fff;
+    uint16_t        cursoraddr  = (dev->crtc[15] | (dev->crtc[14] << 8)) & 0x3fff;
     int             x;
     int             oldvc;
-    int             oldsc;
+    int             scanline_old;
     int             cw = HERCULESPLUS_CW;
 
     VIDEO_MONITOR_PROLOGUE();
     if (!dev->linepos) {
         timer_advance_u64(&dev->timer, dev->dispofftime);
-        dev->stat |= 1;
+        dev->status |= 1;
         dev->linepos = 1;
-        oldsc        = dev->sc;
+        scanline_old        = dev->scanline;
         if ((dev->crtc[8] & 3) == 3)
-            dev->sc = (dev->sc << 1) & 7;
+            dev->scanline = (dev->scanline << 1) & 7;
         if (dev->dispon) {
             if (dev->displine < dev->firstline) {
                 dev->firstline = dev->displine;
@@ -508,7 +510,7 @@ herculesplus_poll(void *priv)
             if ((dev->ctrl & HERCULESPLUS_CTRL_GRAPH) && (dev->ctrl2 & HERCULESPLUS_CTRL2_GRAPH))
                 graphics_line(dev);
             else
-                text_line(dev, ca);
+                text_line(dev, cursoraddr);
 
             if ((dev->ctrl & HERCULESPLUS_CTRL_GRAPH) && (dev->ctrl2 & HERCULESPLUS_CTRL2_GRAPH))
                 x = dev->crtc[1] << 4;
@@ -517,40 +519,39 @@ herculesplus_poll(void *priv)
 
             video_process_8(x, dev->displine);
         }
-        dev->sc = oldsc;
-        if (dev->vc == dev->crtc[7] && !dev->sc)
-            dev->stat |= 8;
+        dev->scanline = scanline_old;
+        if (dev->vc == dev->crtc[7] && !dev->scanline)
+            dev->status |= 8;
         dev->displine++;
         if (dev->displine >= 500)
             dev->displine = 0;
     } else {
         timer_advance_u64(&dev->timer, dev->dispontime);
         if (dev->dispon)
-            dev->stat &= ~1;
+            dev->status &= ~1;
         dev->linepos = 0;
         if (dev->vsynctime) {
             dev->vsynctime--;
             if (!dev->vsynctime)
-                dev->stat &= ~8;
+                dev->status &= ~8;
         }
 
-        if (dev->sc == (dev->crtc[11] & 31) || ((dev->crtc[8] & 3) == 3 && dev->sc == ((dev->crtc[11] & 31) >> 1))) {
-            dev->con  = 0;
-            dev->coff = 1;
+        if (dev->scanline == (dev->crtc[11] & 31) || ((dev->crtc[8] & 3) == 3 && dev->scanline == ((dev->crtc[11] & 31) >> 1))) {
+            dev->cursorvisible  = 0;
         }
         if (dev->vadj) {
-            dev->sc++;
-            dev->sc &= 31;
-            dev->ma = dev->maback;
+            dev->scanline++;
+            dev->scanline &= 31;
+            dev->memaddr = dev->memaddr_backup;
             dev->vadj--;
             if (!dev->vadj) {
                 dev->dispon = 1;
-                dev->ma = dev->maback = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
-                dev->sc               = 0;
+                dev->memaddr = dev->memaddr_backup = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
+                dev->scanline               = 0;
             }
-        } else if (dev->sc == dev->crtc[9] || ((dev->crtc[8] & 3) == 3 && dev->sc == (dev->crtc[9] >> 1))) {
-            dev->maback = dev->ma;
-            dev->sc     = 0;
+        } else if (dev->scanline == dev->crtc[9] || ((dev->crtc[8] & 3) == 3 && dev->scanline == (dev->crtc[9] >> 1))) {
+            dev->memaddr_backup = dev->memaddr;
+            dev->scanline     = 0;
             oldvc       = dev->vc;
             dev->vc++;
             dev->vc &= 127;
@@ -562,7 +563,7 @@ herculesplus_poll(void *priv)
                 if (!dev->vadj)
                     dev->dispon = 1;
                 if (!dev->vadj)
-                    dev->ma = dev->maback = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
+                    dev->memaddr = dev->memaddr_backup = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
                 if ((dev->crtc[10] & 0x60) == 0x20)
                     dev->cursoron = 0;
                 else
@@ -607,13 +608,13 @@ herculesplus_poll(void *priv)
                 dev->blink++;
             }
         } else {
-            dev->sc++;
-            dev->sc &= 31;
-            dev->ma = dev->maback;
+            dev->scanline++;
+            dev->scanline &= 31;
+            dev->memaddr = dev->memaddr_backup;
         }
 
-        if (dev->sc == (dev->crtc[10] & 31) || ((dev->crtc[8] & 3) == 3 && dev->sc == ((dev->crtc[10] & 31) >> 1)))
-            dev->con = 1;
+        if (dev->scanline == (dev->crtc[10] & 31) || ((dev->crtc[8] & 3) == 3 && dev->scanline == ((dev->crtc[10] & 31) >> 1)))
+            dev->cursorvisible = 1;
     }
 
     VIDEO_MONITOR_EPILOGUE();
@@ -630,6 +631,24 @@ herculesplus_init(UNUSED(const device_t *info))
     dev->vram          = (uint8_t *) malloc(0x10000); /* 64k VRAM */
     dev->monitor_index = monitor_index_global;
 
+    switch(device_get_config_int("font")) {
+        case 0:
+            loadfont(FONT_IBM_MDA_437_PATH, 0);
+            break;
+        case 1:
+            loadfont(FONT_IBM_MDA_437_NORDIC_PATH, 0);
+            break;
+        case 2:
+            loadfont(FONT_KAM_PATH, 0);
+            break;
+        case 3:
+            loadfont(FONT_KAMCL16_PATH, 0);
+            break;
+        case 4:
+            loadfont(FONT_TULIP_DGA_PATH, 0);
+            break;
+    }
+
     timer_add(&dev->timer, herculesplus_poll, dev, 1);
 
     mem_mapping_add(&dev->mapping, 0xb0000, 0x08000,
@@ -670,7 +689,9 @@ herculesplus_init(UNUSED(const device_t *info))
     video_inform(VIDEO_FLAG_TYPE_MDA, &timing_herculesplus);
 
     /* Force the LPT3 port to be enabled. */
-    lpt3_init(0x3BC);
+    dev->lpt = device_add_inst(&lpt_port_device, 1);
+    lpt_port_setup(dev->lpt, LPT_MDA_ADDR);
+    lpt_set_3bc_used(1);
 
     return dev;
 }
@@ -700,41 +721,52 @@ speed_changed(void *priv)
 static const device_config_t herculesplus_config[] = {
   // clang-format off
     {
-        .name = "rgb_type",
-        .description = "Display type",
-        .type = CONFIG_SELECTION,
-        .default_int = 0,
-        .selection = {
-            {
-                .description = "Default",
-                .value = 0
-            },
-            {
-                .description = "Green",
-                .value = 1
-            },
-            {
-                .description = "Amber",
-                .value = 2
-            },
-            {
-                .description = "Gray",
-                .value = 3
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "rgb_type",
+        .description    = "Display type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Default", .value = 0 },
+            { .description = "Green",   .value = 1 },
+            { .description = "Amber",   .value = 2 },
+            { .description = "Gray",    .value = 3 },
+            { .description = ""                    }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "blend",
-        .description = "Blend",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "font",
+        .description    = "Font",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "US (CP 437)",                 .value = 0 },
+            { .description = "IBM Nordic (CP 437-Nordic)",  .value = 1 },
+            { .description = "Czech Kamenicky (CP 895) #1", .value = 2 },
+            { .description = "Czech Kamenicky (CP 895) #2", .value = 3 },
+            { .description = "Tulip DGA",                   .value = 4 },
+            { .description = ""                                        }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .type = CONFIG_END
-    }
+        .name           = "blend",
+        .description    = "Blend",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
@@ -746,7 +778,7 @@ const device_t herculesplus_device = {
     .init          = herculesplus_init,
     .close         = herculesplus_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = speed_changed,
     .force_redraw  = NULL,
     .config        = herculesplus_config
diff --git a/src/video/vid_ht216.c b/src/video/vid_ht216.c
index 35d335ed2..3ba814870 100644
--- a/src/video/vid_ht216.c
+++ b/src/video/vid_ht216.c
@@ -33,8 +33,12 @@
 #include <86box/rom.h>
 #include <86box/device.h>
 #include <86box/video.h>
+#include <86box/vid_8514a.h>
+#include <86box/vid_xga.h>
 #include <86box/vid_svga.h>
 #include <86box/vid_svga_render.h>
+#include <86box/vid_ati_eeprom.h>
+#include <86box/vid_ati_mach8.h>
 #include <86box/plat_fallthrough.h>
 #include <86box/plat_unused.h>
 
@@ -313,7 +317,8 @@ ht216_out(uint16_t addr, uint8_t val, void *priv)
                         break;
 
                     case 0xca:
-                        svga_recalctimings(svga);
+                        if (ht216->id == 0x7861)
+                            svga_recalctimings(svga);
                         break;
 
                     case 0xc9:
@@ -423,9 +428,8 @@ ht216_out(uint16_t addr, uint8_t val, void *priv)
                     svga->banked_mask = 0xffff;
             }
 
-            if (svga->gdcaddr <= 8) {
+            if (svga->gdcaddr <= 8)
                 svga->fast = (svga->gdcreg[8] == 0xff && !(svga->gdcreg[3] & 0x18) && !svga->gdcreg[1]) && svga->chain4 && svga->packed_chain4;
-            }
             break;
 
         case 0x3D4:
@@ -444,7 +448,7 @@ ht216_out(uint16_t addr, uint8_t val, void *priv)
                 if (svga->crtcreg < 0xe || svga->crtcreg > 0x10) {
                     if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
                     } else {
                         svga->fullchange = changeframecount;
                         svga_recalctimings(svga);
@@ -481,12 +485,14 @@ ht216_in(uint16_t addr, void *priv)
     if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
         addr ^= 0x60;
 
-    if ((ht216->id == 0x7152) && ht216->isabus) {
-        if (addr == 0x105)
-            return ht216->extensions;
-    }
-
     switch (addr) {
+        case 0x105:
+            if (ht216->isabus && (ht216->id == 0x7152)) {
+                ret &= ~0x03;
+                return ret;
+            }
+            break;
+
         case 0x3c4:
             return svga->seqaddr;
 
@@ -621,9 +627,21 @@ ht216_remap(ht216_t *ht216)
 void
 ht216_recalctimings(svga_t *svga)
 {
-    ht216_t *ht216        = (ht216_t *) svga->priv;
+    ht216_t   *ht216      = (ht216_t *) svga->priv;
+    ibm8514_t *dev        = (ibm8514_t *) svga->dev8514;
+    mach_t    *mach       = (mach_t *) svga->ext8514;
     int      high_res_256 = 0;
 
+
+    if (ht216->id == 0x7861) {
+        if (ht216->ht_regs[0xe0] & 0x20) {
+            if (ht216->ht_regs[0xca] & 0x01)
+                svga->htotal |= 0x200;
+            if (ht216->ht_regs[0xca] & 0x04)
+                svga->hblankstart |= 0x200;
+        }
+    }
+
     switch ((((((svga->miscout >> 2) & 3) || ((ht216->ht_regs[0xa4] >> 2) & 3)) | ((ht216->ht_regs[0xa4] >> 2) & 4)) || ((ht216->ht_regs[0xf8] >> 5) & 0x0f)) | ((ht216->ht_regs[0xf8] << 1) & 8)) {
         case 0:
         case 1:
@@ -642,23 +660,32 @@ ht216_recalctimings(svga_t *svga)
             break;
     }
 
-    svga->ma_latch |= ((ht216->ht_regs[0xf6] & 0x30) << 12);
+    svga->memaddr_latch |= ((ht216->ht_regs[0xf6] & 0x30) << 12);
 
-    svga->interlace = ht216->ht_regs[0xe0] & 1;
+    if (ht216->ht_regs[0xf6] & 0x80)
+        svga->memaddr_latch = ((ht216->ht_regs[0xf6] & 0x30) << 12);
+
+    svga->interlace = ht216->ht_regs[0xe0] & 0x01;
 
     if (svga->interlace)
-        high_res_256 = (svga->htotal * 8) > (svga->vtotal * 4);
+        high_res_256 = (svga->htotal << 3) > (svga->vtotal << 2);
     else
-        high_res_256 = (svga->htotal * 8) > (svga->vtotal * 2);
+        high_res_256 = (svga->htotal << 3) > (svga->vtotal << 1);
 
     ht216->adjust_cursor = 0;
 
     if (!svga->scrblank && svga->attr_palette_enable) {
         if (!(svga->gdcreg[6] & 1) && !(svga->attrregs[0x10] & 1)) { /*Text mode*/
-            if (svga->seqregs[1] & 8) /*40 column*/ {
+            if (svga->seqregs[1] & 8) /*40 column*/
                 svga->render = svga_render_text_40;
-            } else {
+            else
                 svga->render = svga_render_text_80;
+
+            if (ibm8514_active && (svga->dev8514 != NULL)) {
+                if (svga->ext8514 != NULL) {
+                    if (!(dev->accel.advfunc_cntl & 0x01) && !(mach->accel.clock_sel & 0x01)) /*FIXME: Possibly a BIOS bug within the V7 chips when it's used with a 8514/A card?*/
+                        dev->on &= ~0x01;
+                }
             }
         } else {
             if (svga->crtc[0x17] == 0xeb) {
@@ -671,12 +698,16 @@ ht216_recalctimings(svga_t *svga)
                 if (((ht216->ht_regs[0xc8] & HT_REG_C8_E256) || (svga->gdcreg[5] & 0x40)) && (!svga->lowres || (ht216->ht_regs[0xf6] & 0x80))) {
                     if (high_res_256) {
                         svga->hdisp >>= 1;
+                        svga->dots_per_clock >>= 1;
+                        svga->clock /= 2;
                         ht216->adjust_cursor = 1;
                     }
                     svga->render = svga_render_8bpp_highres;
                 } else if (svga->lowres) {
                     if (high_res_256) {
                         svga->hdisp >>= 1;
+                        svga->dots_per_clock >>= 1;
+                        svga->clock /= 2;
                         ht216->adjust_cursor = 1;
                         svga->render         = svga_render_8bpp_highres;
                     } else {
@@ -699,6 +730,8 @@ ht216_recalctimings(svga_t *svga)
             } else if (svga->bpp == 15) {
                 svga->rowoffset <<= 1;
                 svga->hdisp >>= 1;
+                svga->dots_per_clock >>= 1;
+                svga->clock /= 2;
                 if ((svga->crtc[0x17] & 0x60) == 0x20) /*Would result in a garbled screen with trailing cursor glitches*/
                     svga->crtc[0x17] |= 0x40;
                 svga->render = svga_render_15bpp_highres;
@@ -706,15 +739,10 @@ ht216_recalctimings(svga_t *svga)
         }
     }
 
-    svga->ma_latch |= ((ht216->ht_regs[0xf6] & 0x30) << 14);
-
     if (svga->crtc[0x17] == 0xeb) /*Looks like 1024x768 mono mode expects 512K of video memory*/
         svga->vram_display_mask = 0x7ffff;
     else
         svga->vram_display_mask = (ht216->ht_regs[0xf6] & 0x40) ? ht216->vram_mask : 0x3ffff;
-
-    if (ht216->ht_regs[0xe0] & 0x20)
-        svga->hblankstart    = ((ht216->ht_regs[0xca] >> 2) << 8) + svga->crtc[4] + 1;
 }
 
 static void
@@ -737,9 +765,9 @@ ht216_hwcursor_draw(svga_t *svga, int displine)
 
     for (int x = 0; x < width; x++) {
         if (!(dat[0] & 0x80000000))
-            (buffer32->line[displine])[svga->x_add + offset + x] = 0;
+            svga->monitor->target_buffer->line[displine][svga->x_add + offset + x] = 0;
         if (dat[1] & 0x80000000)
-            (buffer32->line[displine])[svga->x_add + offset + x] ^= 0xffffff;
+            svga->monitor->target_buffer->line[displine][svga->x_add + offset + x] ^= 0xffffff;
 
         dat[0] <<= shift;
         dat[1] <<= shift;
@@ -1206,6 +1234,8 @@ ht216_write(uint32_t addr, uint8_t val, void *priv)
     svga_t  *svga      = &ht216->svga;
     uint32_t prev_addr = addr;
 
+    xga_write_test(addr, val, svga);
+
     addr &= svga->banked_mask;
     addr = (addr & 0x7fff) + ht216->write_banks[(addr >> 15) & 1];
 
@@ -1227,6 +1257,9 @@ ht216_writew(uint32_t addr, uint16_t val, void *priv)
     svga_t  *svga      = &ht216->svga;
     uint32_t prev_addr = addr;
 
+    xga_write_test(addr, val, svga);
+    xga_write_test(addr + 1, val >> 8, svga);
+
     addr &= svga->banked_mask;
     addr = (addr & 0x7fff) + ht216->write_banks[(addr >> 15) & 1];
 
@@ -1250,6 +1283,11 @@ ht216_writel(uint32_t addr, uint32_t val, void *priv)
     svga_t  *svga      = &ht216->svga;
     uint32_t prev_addr = addr;
 
+    xga_write_test(addr, val, svga);
+    xga_write_test(addr + 1, val >> 8, svga);
+    xga_write_test(addr + 2, val >> 16, svga);
+    xga_write_test(addr + 3, val >> 24, svga);
+
     addr &= svga->banked_mask;
     addr = (addr & 0x7fff) + ht216->write_banks[(addr >> 15) & 1];
 
@@ -1411,9 +1449,11 @@ static uint8_t
 ht216_read(uint32_t addr, void *priv)
 {
     ht216_t      *ht216     = (ht216_t *) priv;
-    const svga_t *svga      = &ht216->svga;
+    svga_t       *svga      = &ht216->svga;
     uint32_t      prev_addr = addr;
 
+    (void) xga_read_test(addr, svga);
+
     addr &= svga->banked_mask;
     addr = (addr & 0x7fff) + ht216->read_banks[(addr >> 15) & 1];
 
@@ -1530,12 +1570,13 @@ ht216_init(const device_t *info, uint32_t mem_size, int has_rom)
             }
             break;
         case 4:
-            if ((info->local == 0x7152) && (info->flags & DEVICE_ISA))
-                ht216->extensions = device_get_config_int("extensions");
-            else if ((info->local == 0x7152) && (info->flags & DEVICE_MCA)) {
-                ht216->pos_regs[0] = 0xb7;
-                ht216->pos_regs[1] = 0x80;
-                mca_add(radius_mca_read, radius_mca_write, radius_mca_feedb, NULL, ht216);
+            if (info->local == 0x7152) {
+                if (info->flags & DEVICE_MCA) {
+                    ht216->pos_regs[0] = 0xb7;
+                    ht216->pos_regs[1] = 0x80;
+                    mca_add(radius_mca_read, radius_mca_write, radius_mca_feedb, NULL, ht216);
+                } else
+                    io_sethandler(0x0105, 0x0001, ht216_in, NULL, NULL, NULL, NULL, NULL, ht216);
             }
             rom_init(&ht216->bios_rom, BIOS_RADIUS_SVGA_MULTIVIEW_PATH, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
             break;
@@ -1551,10 +1592,17 @@ ht216_init(const device_t *info, uint32_t mem_size, int has_rom)
     if (has_rom == 4)
         svga->ramdac = device_add(&sc11484_nors2_ramdac_device);
 
+    svga->read = ht216_read;
+    svga->readw = NULL;
+    svga->readl = NULL;
+    svga->write = ht216_write;
+    svga->writew = ht216_writew;
     if ((info->flags & DEVICE_VLB) || (info->flags & DEVICE_MCA)) {
+        svga->writel = ht216_writel;
         mem_mapping_set_handler(&svga->mapping, ht216_read, NULL, NULL, ht216_write, ht216_writew, ht216_writel);
         mem_mapping_add(&ht216->linear_mapping, 0, 0, ht216_read_linear, NULL, NULL, ht216_write_linear, ht216_writew_linear, ht216_writel_linear, NULL, MEM_MAPPING_EXTERNAL, svga);
     } else {
+        svga->writel = NULL;
         mem_mapping_set_handler(&svga->mapping, ht216_read, NULL, NULL, ht216_write, ht216_writew, NULL);
         mem_mapping_add(&ht216->linear_mapping, 0, 0, ht216_read_linear, NULL, NULL, ht216_write_linear, ht216_writew_linear, NULL, NULL, MEM_MAPPING_EXTERNAL, svga);
     }
@@ -1562,7 +1610,7 @@ ht216_init(const device_t *info, uint32_t mem_size, int has_rom)
     mem_mapping_disable(&ht216->linear_mapping);
 
     ht216->id     = info->local;
-    ht216->isabus = (info->flags & DEVICE_ISA);
+    ht216->isabus = (info->flags & DEVICE_ISA) || (info->flags & DEVICE_ISA16);
     ht216->mca    = (info->flags & DEVICE_MCA);
 
     io_sethandler(0x03c0, 0x0020, ht216_in, NULL, NULL, ht216_out, NULL, NULL, ht216);
@@ -1676,77 +1724,45 @@ ht216_force_redraw(void *priv)
     ht216->svga.fullchange = changeframecount;
 }
 
+// clang-format off
 static const device_config_t v7_vga_1024i_config[] = {
-    { .name        = "memory",
-     .description = "Memory size",
-     .type        = CONFIG_SELECTION,
-     .default_int = 512,
-     .selection   = {
-          { .description = "256 kB",
-              .value       = 256 },
-          { .description = "512 kB",
-              .value       = 512 },
-          { .description = "" } } },
-    { .type = CONFIG_END }
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "256 KB", .value = 256 },
+            { .description = "512 KB", .value = 512 },
+            { .description = ""                     }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
-// clang-format off
 static const device_config_t ht216_32_standalone_config[] = {
     {
-        .name = "monitor_type",
-        .description = "Monitor type",
-        .type = CONFIG_SELECTION,
-        .default_int = 0x18,
-        .selection = {
-            {
-                .description = "Mono Interlaced",
-                .value = 0x00
-            },
-            {
-                .description = "Mono Non-Interlaced",
-                .value = 0x08
-            },
-            {
-                .description = "Color Interlaced",
-                .value = 0x10
-            },
-            {
-                .description = "Color Non-Interlaced",
-                .value = 0x18
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "monitor_type",
+        .description    = "Monitor type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0x18,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Mono Interlaced",      .value = 0x00 },
+            { .description = "Mono Non-Interlaced",  .value = 0x08 },
+            { .description = "Color Interlaced",     .value = 0x10 },
+            { .description = "Color Non-Interlaced", .value = 0x18 },
+            { .description = ""                                    }
+        },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
-};
-
-static const device_config_t radius_svga_multiview_config[] = {
-    {
-        .name = "extensions",
-        .description = "Extensions",
-        .type = CONFIG_SELECTION,
-        .default_int = 0x00,
-        .selection = {
-            {
-                .description = "Extensions Enabled",
-                .value = 0x00
-            },
-            {
-                .description = "Extensions Disabled",
-                .value = 0x02
-            },
-            {
-                .description = ""
-            }
-        }
-    },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 // clang-format on
 
@@ -1758,7 +1774,7 @@ const device_t g2_gc205_device = {
     .init          = g2_gc205_init,
     .close         = ht216_close,
     .reset         = NULL,
-    { .available = g2_gc205_available },
+    .available     = g2_gc205_available,
     .speed_changed = ht216_speed_changed,
     .force_redraw  = ht216_force_redraw,
     .config        = NULL
@@ -1772,7 +1788,7 @@ const device_t v7_vga_1024i_device = {
     .init          = v7_vga_1024i_init,
     .close         = ht216_close,
     .reset         = NULL,
-    { .available = v7_vga_1024i_available },
+    .available     = v7_vga_1024i_available,
     .speed_changed = ht216_speed_changed,
     .force_redraw  = ht216_force_redraw,
     .config        = v7_vga_1024i_config
@@ -1786,7 +1802,7 @@ const device_t ht216_32_pb410a_device = {
     .init          = ht216_pb410a_init,
     .close         = ht216_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = ht216_speed_changed,
     .force_redraw  = ht216_force_redraw,
     .config        = NULL
@@ -1800,7 +1816,7 @@ const device_t ht216_32_standalone_device = {
     .init          = ht216_standalone_init,
     .close         = ht216_close,
     .reset         = NULL,
-    { .available = ht216_standalone_available },
+    .available     = ht216_standalone_available,
     .speed_changed = ht216_speed_changed,
     .force_redraw  = ht216_force_redraw,
     .config        = ht216_32_standalone_config
@@ -1809,15 +1825,15 @@ const device_t ht216_32_standalone_device = {
 const device_t radius_svga_multiview_isa_device = {
     .name          = "Radius SVGA Multiview ISA (HT209)",
     .internal_name = "radius_isa",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0x7152, /*HT209*/
     .init          = radius_svga_multiview_init,
     .close         = ht216_close,
     .reset         = NULL,
-    { .available = radius_svga_multiview_available },
+    .available     = radius_svga_multiview_available,
     .speed_changed = ht216_speed_changed,
     .force_redraw  = ht216_force_redraw,
-    .config        = radius_svga_multiview_config
+    .config        = NULL
 };
 
 const device_t radius_svga_multiview_mca_device = {
@@ -1828,7 +1844,7 @@ const device_t radius_svga_multiview_mca_device = {
     .init          = radius_svga_multiview_init,
     .close         = ht216_close,
     .reset         = NULL,
-    { .available = radius_svga_multiview_available },
+    .available     = radius_svga_multiview_available,
     .speed_changed = ht216_speed_changed,
     .force_redraw  = ht216_force_redraw,
     .config        = NULL
diff --git a/src/video/vid_ics2494.c b/src/video/vid_ics2494.c
deleted file mode 100644
index 309d07966..000000000
--- a/src/video/vid_ics2494.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          ICS2494 clock generator emulation.
- *
- *          Used by the AMI S3 924.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *
- *          Copyright 2020 Miran Grca.
- */
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include <86box/device.h>
-
-typedef struct ics2494_t {
-    float freq[16];
-} ics2494_t;
-
-#ifdef ENABLE_ICS2494_LOG
-int ics2494_do_log = ENABLE_ICS2494_LOG;
-
-static void
-ics2494_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (ics2494_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define ics2494_log(fmt, ...)
-#endif
-
-float
-ics2494_getclock(int clock, void *priv)
-{
-    const ics2494_t *ics2494 = (ics2494_t *) priv;
-
-    if (clock > 15)
-        clock = 15;
-
-    return ics2494->freq[clock];
-}
-
-static void *
-ics2494_init(const device_t *info)
-{
-    ics2494_t *ics2494 = (ics2494_t *) malloc(sizeof(ics2494_t));
-    memset(ics2494, 0, sizeof(ics2494_t));
-
-    switch (info->local) {
-        case 10:
-            /* ATI 18810 for ATI 28800 */
-            ics2494->freq[0x0] = 30240000.0;
-            ics2494->freq[0x1] = 32000000.0;
-            ics2494->freq[0x2] = 37500000.0;
-            ics2494->freq[0x3] = 39000000.0;
-            ics2494->freq[0x4] = 42954000.0;
-            ics2494->freq[0x5] = 48771000.0;
-            ics2494->freq[0x6] = 16657000.0;
-            ics2494->freq[0x7] = 36000000.0;
-            ics2494->freq[0x8] = 40000000.0;
-            ics2494->freq[0x9] = 56644000.0;
-            ics2494->freq[0xa] = 75000000.0;
-            ics2494->freq[0xb] = 65000000.0;
-            ics2494->freq[0xc] = 50350000.0;
-            ics2494->freq[0xd] = 56640000.0;
-            ics2494->freq[0xe] = 28322000.0;
-            ics2494->freq[0xf] = 44900000.0;
-            break;
-        case 110:
-            /* ATI 18811-0 for ATI Mach32 */
-            ics2494->freq[0x0] = 30240000.0;
-            ics2494->freq[0x1] = 32000000.0;
-            ics2494->freq[0x2] = 110000000.0;
-            ics2494->freq[0x3] = 80000000.0;
-            ics2494->freq[0x4] = 42954000.0;
-            ics2494->freq[0x5] = 48771000.0;
-            ics2494->freq[0x6] = 92400000.0;
-            ics2494->freq[0x7] = 36000000.0;
-            ics2494->freq[0x8] = 39910000.0;
-            ics2494->freq[0x9] = 44900000.0;
-            ics2494->freq[0xa] = 75000000.0;
-            ics2494->freq[0xb] = 65000000.0;
-            ics2494->freq[0xc] = 50350000.0;
-            ics2494->freq[0xd] = 56640000.0;
-            ics2494->freq[0xe] = 0.0;
-            ics2494->freq[0xf] = 44900000.0;
-            break;
-        case 111:
-            /* ATI 18811-1 for ATI Mach32 MCA */
-            ics2494->freq[0x0] = 135000000.0;
-            ics2494->freq[0x1] = 32000000.0;
-            ics2494->freq[0x2] = 110000000.0;
-            ics2494->freq[0x3] = 80000000.0;
-            ics2494->freq[0x4] = 100000000.0;
-            ics2494->freq[0x5] = 126000000.0;
-            ics2494->freq[0x6] = 92400000.0;
-            ics2494->freq[0x7] = 36000000.0;
-            ics2494->freq[0x8] = 39910000.0;
-            ics2494->freq[0x9] = 44900000.0;
-            ics2494->freq[0xa] = 75000000.0;
-            ics2494->freq[0xb] = 65000000.0;
-            ics2494->freq[0xc] = 50350000.0;
-            ics2494->freq[0xd] = 56640000.0;
-            ics2494->freq[0xe] = 0.0;
-            ics2494->freq[0xf] = 44900000.0;
-            break;
-        case 305:
-            /* ICS2494A(N)-205 for S3 86C924 */
-            ics2494->freq[0x0] = 25175000.0;
-            ics2494->freq[0x1] = 28322000.0;
-            ics2494->freq[0x2] = 40000000.0;
-            ics2494->freq[0x3] = 0.0;
-            ics2494->freq[0x4] = 50000000.0;
-            ics2494->freq[0x5] = 77000000.0;
-            ics2494->freq[0x6] = 36000000.0;
-            ics2494->freq[0x7] = 44889000.0;
-            ics2494->freq[0x8] = 130000000.0;
-            ics2494->freq[0x9] = 120000000.0;
-            ics2494->freq[0xa] = 80000000.0;
-            ics2494->freq[0xb] = 31500000.0;
-            ics2494->freq[0xc] = 110000000.0;
-            ics2494->freq[0xd] = 65000000.0;
-            ics2494->freq[0xe] = 75000000.0;
-            ics2494->freq[0xf] = 94500000.0;
-            break;
-
-        default:
-            break;
-    }
-
-    return ics2494;
-}
-
-static void
-ics2494_close(void *priv)
-{
-    ics2494_t *ics2494 = (ics2494_t *) priv;
-
-    if (ics2494)
-        free(ics2494);
-}
-
-const device_t ics2494an_305_device = {
-    .name          = "ICS2494AN-305 Clock Generator",
-    .internal_name = "ics2494an_305",
-    .flags         = 0,
-    .local         = 305,
-    .init          = ics2494_init,
-    .close         = ics2494_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t ati18810_device = {
-    .name          = "ATI 18810 Clock Generator",
-    .internal_name = "ati18810",
-    .flags         = 0,
-    .local         = 10,
-    .init          = ics2494_init,
-    .close         = ics2494_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t ati18811_0_device = {
-    .name          = "ATI 18811-0 Clock Generator",
-    .internal_name = "ati18811_0",
-    .flags         = 0,
-    .local         = 110,
-    .init          = ics2494_init,
-    .close         = ics2494_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
-const device_t ati18811_1_device = {
-    .name          = "ATI 18811-1 Clock Generator",
-    .internal_name = "ati18811_1",
-    .flags         = 0,
-    .local         = 111,
-    .init          = ics2494_init,
-    .close         = ics2494_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
diff --git a/src/video/vid_im1024.c b/src/video/vid_im1024.c
index c7602ffd0..a77ad09c3 100644
--- a/src/video/vid_im1024.c
+++ b/src/video/vid_im1024.c
@@ -1090,7 +1090,7 @@ const device_t im1024_device = {
     .init          = im1024_init,
     .close         = im1024_close,
     .reset         = NULL,
-    { .available = im1024_available },
+    .available     = im1024_available,
     .speed_changed = im1024_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/vid_jega.c b/src/video/vid_jega.c
new file mode 100644
index 000000000..d3c806708
--- /dev/null
+++ b/src/video/vid_jega.c
@@ -0,0 +1,1056 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Emulation of the JEGA (Japanese EGA), a part of the AX architecture.
+ *
+ *          It's an extension of the SuperEGA. Superimposing text (AX-2) is not available.
+ *
+ * Authors: Akamaki
+ *
+ *          Copyright 2025 Akamaki
+ */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/plat.h>
+#include <86box/plat_fallthrough.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/device.h>
+#include <86box/video.h>
+#include <86box/vid_ega.h>
+#include <86box/vid_svga.h>
+#include <86box/vid_vga.h>
+
+/* JEGA internal registers */
+#define RPESL 0x09 /* End Scan Line */
+#define RCCSL 0x0A /* Cursor Start Line */
+#define RCCEL 0x0B /* Cursor End Line */
+#define RCCLH 0x0E /* Cursor Location High */
+#define RCCLL 0x0F /* Cursor Location Low */
+#define RPULP 0x14 /* Under Line Position */
+/* + 0xB8 - 0x20 */
+#define RMOD1 0x21 /* Display out, EGA through, Superimpose, Sync with EGA, Master EGA, Slave EGA, n/a, Test */
+#define RMOD2 0x22 /* 1st Attr, 2nd Attr, Blink/Int, n/a, Font access mode (b3-2), Font map sel (b1-0)*/
+#define RDAGS 0x23 /* ANK Group Select */
+#define RDFFB 0x24 /* Font Access First Byte */
+#define RDFSB 0x25 /* Font Access Second Byte */
+#define RDFAP 0x26 /* Font Access Pattern */
+#define RSTAT 0x27 /* Font Status Register */
+/* + 0xD0 - 0x20 */
+#define RPSSU 0x29 /* Start Scan Upper */
+#define RPSSL 0x2A /* Start Scan Lower */
+#define RPSSC 0x2B /* Start Scan Count */
+#define RPPAJ 0x2C /* Phase Adjust Count */
+#define RCMOD 0x2D /* Cursor Mode */
+#define RCSKW 0x2E /* Cursor Skew Control */
+#define ROMSL 0x2F /* ? */
+#define RINVALID_INDEX 0x30
+
+#define JEGA_PATH_BIOS     "roms/video/jega/JEGABIOS.BIN"
+#define JEGA_PATH_FONTDBCS "roms/video/jega/JPNZN16X.FNT"
+#define IF386_PATH_VBIOS   "roms/machines/if386sx/OKI_IF386SX_VBIOS.bin"
+#define JVGA_PATH_BIOS     "roms/video/jega/OKI_JVGT(AXVGAH)_BIOS_011993.BIN"
+#define JVGA_PATH_FONTDBCS "roms/video/jega/JWPCE.FNT"
+#define SBCS19_FILESIZE    (256 * 19 * 2) /* 8 x 19 x 256 chr x 2 pages */
+#define DBCS16_CHARS       0x2c10
+#define DBCS16_FILESIZE    (DBCS16_CHARS * 16 * 2)
+
+#define INVALIDACCESS8     0xffu
+#define INVALIDACCESS16    0xffffu
+#define INVALIDACCESS32    0xffffffffu
+
+#ifndef RELEASE_BUILD
+// #    define ENABLE_JEGA_LOG 1
+#endif
+
+#ifdef ENABLE_JEGA_LOG
+int jega_do_log = ENABLE_JEGA_LOG;
+
+static void
+jega_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (jega_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define jega_log(fmt, ...)
+#endif
+
+static video_timings_t timing_ega = { .type = VIDEO_ISA, .write_b = 8, .write_w = 16, .write_l = 32, .read_b = 8, .read_w = 16, .read_l = 32 };
+
+typedef struct jega_t {
+    rom_t     bios_rom;
+    ega_t     ega;
+    vga_t     vga;
+    uint8_t   regs_index; /* 3D4/3D5 index B9-BF, D9-DF */
+    uint8_t   regs[0x31];
+    uint8_t   egapal[16];
+    uint8_t   attrregs[32];
+    uint8_t   attraddr;
+    uint8_t   attrff;
+    uint8_t   attr_palette_enable;
+    uint32_t *pallook;
+    int       is_vga;
+    int       cursorvisible;
+    int       cursoron;
+    int       cursorblink_disable;
+    int       cursoraddr;
+    int       font_index;
+    int       sbcsbank_inv;
+    int       attr3_sbcsbank;
+    int       start_scan_lower;
+    int       start_scan_upper;
+    int       start_scan_count;
+    uint8_t  *vram;
+    uint8_t   jfont_sbcs_19[SBCS19_FILESIZE]; /* 8 x 19 font */
+    uint8_t   jfont_dbcs_16[DBCS16_FILESIZE]; /* 16 x 16 font. Use dbcs_read/write to access it. */
+} jega_t;
+
+static void jega_recalctimings(void *priv);
+
+#define FONTX_LEN_ID 6
+#define FONTX_LEN_FN 8
+
+typedef struct {
+    char    id[FONTX_LEN_ID];
+    char    name[FONTX_LEN_FN];
+    uint8_t width;
+    uint8_t height;
+    uint8_t type;
+} fontx_h;
+
+typedef struct {
+    uint16_t start;
+    uint16_t end;
+} fontx_tbl;
+
+extern uint32_t pallook16[256];
+extern uint32_t pallook64[256];
+static bool     is_SJIS_1(uint8_t chr) { return (chr >= 0x81 && chr <= 0x9f) || (chr >= 0xe0 && chr <= 0xfc); }
+static bool     is_SJIS_2(uint8_t chr) { return (chr >= 0x40 && chr <= 0x7e) || (chr >= 0x80 && chr <= 0xfc); }
+
+static uint8_t jega_in(uint16_t addr, void *priv);
+
+static uint16_t
+SJIS_to_SEQ(uint16_t sjis)
+{
+    uint32_t chr1 = (sjis >> 8) & 0xff;
+    uint32_t chr2 = sjis & 0xff;
+
+    if (!is_SJIS_1(chr1) || !is_SJIS_2(chr2))
+        return INVALIDACCESS16;
+
+    chr1 -= 0x81;
+
+    if (chr1 > 0x5e)
+        chr1 -= 0x40;
+
+    chr2 -= 0x40;
+
+    if (chr2 > 0x3f)
+        chr2--;
+
+    chr1 *= 0xbc;
+
+    return (chr1 + chr2);
+}
+
+static uint8_t
+dbcs_read(uint16_t sjis, int index, void *priv) {
+    jega_t *jega = (jega_t *) priv;
+    int     seq  = SJIS_to_SEQ(sjis);
+    if ((seq >= DBCS16_CHARS) || (index >= 32))
+        return INVALIDACCESS8;
+    return jega->jfont_dbcs_16[seq * 32 + index];
+}
+
+static void
+dbcs_write(uint16_t sjis, int index, uint8_t val, void *priv) {
+    jega_t *jega = (jega_t *) priv;
+    int     seq  = SJIS_to_SEQ(sjis);
+    if ((seq >= DBCS16_CHARS) || (index >= 32))
+        return;
+    jega->jfont_dbcs_16[seq * 32 + index] = val;
+}
+
+/* Display Adapter Mode 3 Drawing */
+void
+jega_render_text(void *priv)
+{
+    jega_t   *jega           = (jega_t *) priv;
+#ifdef USE_DOUBLE_WIDTH_AND_LINE_CHARS
+    uint8_t  *seqregs        = jega->is_vga ? jega->vga.svga.seqregs :
+                                              jega->ega.seqregs;
+    uint8_t  *attrregs       = jega->is_vga ? jega->vga.svga.attrregs :
+                                              jega->ega.attrregs;
+#endif
+    uint8_t  *crtc           = jega->is_vga ? jega->vga.svga.crtc :
+                                              jega->ega.crtc;
+    uint8_t  *vram           = jega->is_vga ? jega->vga.svga.vram :
+                                              jega->ega.vram;
+    int      *firstline_draw = jega->is_vga ? &jega->vga.svga.firstline_draw :
+                                              &jega->ega.firstline_draw;
+    int      *lastline_draw  = jega->is_vga ? &jega->vga.svga.lastline_draw :
+                                              &jega->ega.lastline_draw;
+    int      *displine       = jega->is_vga ? &jega->vga.svga.displine :
+                                              &jega->ega.displine;
+    int      *fullchange     = jega->is_vga ? &jega->vga.svga.fullchange :
+                                              &jega->ega.fullchange;
+    int      *blink          = jega->is_vga ? &jega->vga.svga.blink :
+                                              &jega->ega.blink;
+    int      *x_add          = jega->is_vga ? &jega->vga.svga.x_add :
+                                              &jega->ega.x_add;
+    int      *y_add          = jega->is_vga ? &jega->vga.svga.y_add :
+                                              &jega->ega.y_add;
+    int      *sc             = jega->is_vga ? &jega->vga.svga.scanline :
+                                              &jega->ega.scanline;
+    int      *hdisp          = jega->is_vga ? &jega->vga.svga.hdisp :
+                                              &jega->ega.hdisp;
+    int      *scrollcache    = jega->is_vga ? &jega->vga.svga.scrollcache :
+                                              &jega->ega.scrollcache;
+    uint32_t *memaddr        = jega->is_vga ? &jega->vga.svga.memaddr :
+                                              &jega->ega.memaddr;
+    uint8_t   mask           = jega->is_vga ? jega->vga.svga.dac_mask : 0xff;
+
+    if (*firstline_draw == 2000)
+        *firstline_draw = *displine;
+    *lastline_draw = *displine;
+
+    if (*fullchange) {
+#ifdef USE_DOUBLE_WIDTH_AND_LINE_CHARS
+        const bool doublewidth   = ((seqregs[1] & 8) != 0);
+        const bool attrlinechars = (attrregs[0x10] & 4);
+#endif
+        const bool attrblink     = ((jega->regs[RMOD2] & 0x20) == 0); /* JEGA specific */
+        const bool crtcreset     = ((crtc[0x17] & 0x80) == 0) || ((jega->regs[RMOD1] & 0x80) == 0);
+        const int  charwidth     = 8;
+        const bool blinked       = *blink & 0x10;
+        uint32_t  *p             = &buffer32->line[*displine + *y_add][*x_add];
+        bool       chr_wide      = false;
+        int        sc_wide       = *sc - jega->start_scan_count;
+        const bool cursoron      = (blinked || jega->cursorblink_disable) &&
+                                   (*sc >= jega->regs[RCCSL]) && (*sc <= jega->regs[RCCEL]);
+        uint32_t   attr_basic    = 0;
+        uint32_t   chr_first;
+        int        fg            = 0;
+        int        bg            = 0;
+
+        for (int x = 0; x < (*hdisp + *scrollcache); x += charwidth) {
+            uint32_t addr = 0;
+
+            if (jega->is_vga) {
+                if (!jega->vga.svga.force_old_addr)
+                    addr = jega->vga.svga.remap_func(&jega->vga.svga, jega->vga.svga.memaddr) &
+                                                     jega->vga.svga.vram_display_mask;
+            } else
+                addr = jega->ega.remap_func(&jega->ega, *memaddr) & jega->ega.vrammask;
+
+            int drawcursor = ((*memaddr == jega->cursoraddr) && cursoron);
+
+            uint32_t chr;
+            uint32_t attr;
+            if (!crtcreset) {
+                chr  = vram[addr];
+                attr = vram[addr + 1];
+            } else
+                chr = attr = 0;
+            if (chr_wide) {
+                uint8_t attr_ext = 0;
+                /* the code may be in DBCS */
+                if (jega->regs[RMOD2] & 0x40) {
+                    /* Parse JEGA extended attribute */
+                    /* Bold | 2x width | 2x height | U/L select | R/L select | - | - | - */
+                    attr_ext = attr;
+                    if ((attr_ext & 0x30) == 0x30)
+                        sc_wide = *sc - jega->start_scan_lower; /* Set top padding of lower 2x character */
+                    else if ((attr_ext & 0x30) == 0x20)
+                        sc_wide = *sc - jega->start_scan_upper; /* Set top padding of upper 2x character */
+                    else
+                        sc_wide = *sc - jega->start_scan_count;
+                }
+                if (is_SJIS_2(chr) && sc_wide >= 0 && sc_wide < 16 && *sc <= jega->regs[RPESL]) {
+                    chr_first <<= 8;
+                    chr |= chr_first;
+                    /* Vertical wide font (Extended Attribute) */
+                    if (attr_ext & 0x20) {
+                        if (attr_ext & 0x10)
+                            sc_wide = (sc_wide >> 1) + 8;
+                        else
+                            sc_wide = sc_wide >> 1;
+                    }
+                    /* Horizontal wide font (Extended Attribute) */
+                    if (attr_ext & 0x40) {
+                        uint32_t dat = dbcs_read(chr, sc_wide, jega);
+                        if (!(attr_ext & 0x08)) { /* right half of character */
+                            dat = dbcs_read(chr, sc_wide + 16, jega);
+                        }
+                        for (int xx = 0; xx < charwidth; xx++) {
+                            p[xx * 2]     = (dat & (0x80 >> xx)) ? fg : bg;
+                            p[xx * 2 + 1] = (dat & (0x80 >> xx)) ? fg : bg;
+                        }
+                    } else {
+                        uint32_t dat = dbcs_read(chr, sc_wide, jega);
+                        dat <<= 8;
+                        dat |= dbcs_read(chr, sc_wide + 16, jega);
+                        /* Bold (Extended Attribute) */
+                        if (attr_ext &= 0x80) {
+                            uint32_t dat2 = dat;
+                            dat2 >>= 1;
+                            dat |= dat2;
+                        }
+                        for (int xx = 0; xx < charwidth * 2; xx++)
+                            p[xx] = (dat & (0x8000 >> xx)) ? fg : bg;
+                    }
+                } else {
+                    /* invalid DBCS code or line space then put blank */
+                    for (int xx = 0; xx < charwidth * 2; xx++)
+                        p[xx] = bg;
+                }
+                if (attr_basic & 0x20) { /* vertical line */
+                    p[0] = fg;
+                }
+                if ((*sc == jega->regs[RPULP]) && (attr_basic & 0x10)) { /* underline */
+                    for (int xx = 0; xx < charwidth * 2; xx++)
+                        p[xx] = fg;
+                }
+                chr_wide = false;
+                p += (charwidth * 2);
+            } else {
+                /* SBCS or invalid second byte of DBCS */
+                if (jega->regs[RMOD2] & 0x80) {
+                    /* Parse attribute as JEGA */
+                    /* Blink | Reverse | V line | U line | (Bit 3-0 is the same as EGA) */
+                    /* The background color is always black (transparent in AX-2) */
+                    if (drawcursor || attr & 0x40) {
+                        bg = jega->pallook[jega->egapal[attr & 0x0f]];
+                        fg = 0;
+                    } else {
+                        fg = jega->pallook[jega->egapal[attr & 0x0f]];
+                        bg = 0;
+                        if (attr & 0x80) {
+                            bg = 0;
+                            if (blinked)
+                                fg = bg;
+                        }
+                    }
+                    attr_basic = attr;
+                } else {
+                    /* Parse attribute as EGA */
+                    /* BInt/Blink | BR | BG | BB | Int/Group | R | G | B */
+                    if (drawcursor) {
+                        bg = jega->pallook[jega->egapal[attr & 0x0f] & mask];
+                        fg = jega->pallook[jega->egapal[attr >> 4] & mask];
+                    } else {
+                        fg = jega->pallook[jega->egapal[attr & 0x0f] & mask];
+                        bg = jega->pallook[jega->egapal[attr >> 4] & mask];
+                        if ((attr & 0x80) && attrblink) {
+                            bg = jega->pallook[jega->egapal[(attr >> 4) & 7] & mask];
+                            if (blinked)
+                                fg = bg;
+                        }
+                    }
+                    attr_basic = 0;
+                }
+
+                if (is_SJIS_1(chr)) {
+                    /* the char code maybe in DBCS */
+                    chr_first = chr;
+                    chr_wide  = true;
+                } else {
+                    /* the char code is in SBCS */
+                    uint32_t charaddr = chr;
+                    // if (jega->attr3_sbcsbank && (attr & 8))
+                    //     charaddr |= 0x100;
+                    // if (jega->sbcsbank_inv)
+                    //     charaddr ^= 0x100;
+                    charaddr *= 19;
+
+                    uint32_t dat = jega->jfont_sbcs_19[charaddr + *sc];
+                    for (int xx = 0; xx < charwidth; xx++)
+                        p[xx] = (dat & (0x80 >> xx)) ? fg : bg;
+
+                    if (attr_basic & 0x20) /* vertical line */
+                        p[0] = fg;
+
+                    if ((*sc == jega->regs[RPULP]) && (attr_basic & 0x10)) { /* underline */
+                        for (int xx = 0; xx < charwidth; xx++)
+                            p[xx] = fg;
+                    }
+                    p += charwidth;
+                }
+            }
+            *memaddr += 4;
+        }
+        *memaddr &= 0x3ffff;
+    }
+}
+
+static void
+jega_out(uint16_t addr, uint8_t val, void *priv)
+{
+    jega_t   *jega         = (jega_t *) priv;
+    uint8_t   pal4to16[16] = { 0, 7, 0x38, 0x3f, 0, 3, 4, 0x3f, 0, 2, 4, 0x3e, 0, 3, 5, 0x3f };
+    uint16_t  chr;
+
+    // jega_log("JEGA Out %04X %02X(%d) %04X:%04X\n", addr, val, val, cs >> 4, cpu_state.pc);
+
+    switch (addr) {
+        case 0x3c0:
+        case 0x3c1:
+        jega_log("Palette %02X %02X(%d) %04X:%04X\n", jega->attraddr, val, val, cs >> 4, cpu_state.pc);
+            /* Palette (write only) */
+            if (!jega->attrff) {
+                jega->attraddr = val & 31;
+                if ((val & 0x20) != jega->attr_palette_enable) {
+                    if (jega->is_vga)
+                        jega->vga.svga.fullchange = 3;
+                    else
+                        jega->ega.fullchange      = 3;
+                    jega->attr_palette_enable = val & 0x20;
+                    jega_recalctimings(jega);
+                }
+            } else {
+                jega->attrregs[jega->attraddr & 31] = val;
+                int is_attr14 = jega->is_vga ? (jega->attraddr == 0x14) : 0;
+                if (is_attr14 || (jega->attraddr < 0x10)) {
+                    for (uint8_t c = 0; c < 16; c++) {
+                        if (jega->is_vga) {
+                            if (jega->attrregs[0x10] & 0x80)
+                                jega->egapal[c] = (jega->attrregs[c] & 0xf) | ((jega->attrregs[0x14] & 0xf) << 4);
+                            else if (jega->vga.svga.ati_4color)
+                                jega->egapal[c] = pal4to16[(c & 0x03) | ((val >> 2) & 0xc)];
+                            else
+                                jega->egapal[c] = (jega->attrregs[c] & 0x3f) | ((jega->attrregs[0x14] & 0xc) << 4);
+                        } else
+                            jega->egapal[c] = jega->attrregs[c] & 0x3f;
+                    }
+                    if (jega->is_vga)
+                        jega->vga.svga.fullchange = changeframecount;
+                    else
+                        jega->ega.fullchange = changeframecount;
+                }
+            }
+            jega->attrff ^= 1;
+            break;
+        case 0x3c2:
+            if (jega->regs[RMOD1] & 0x0c) {
+                io_removehandler(0x03a0, 0x0020, jega_in, NULL, NULL, jega_out, NULL, NULL, jega);
+                if (!(val & 1))
+                    io_sethandler(0x03a0, 0x0020, jega_in, NULL, NULL, jega_out, NULL, NULL, jega);
+            }
+            break;
+        case 0x3b4:
+        case 0x3d4:
+            /* Index 0x00-0x1F (write only), 0xB8-0xDF (write and read) */
+            if (val >= 0xB8 && val <= 0xBF)
+                jega->regs_index = val - 0xB8 + 0x20;
+            else if (val >= 0xD8 && val <= 0xDF)
+                jega->regs_index = val - 0xD0 + 0x20;
+            else if (val <= 0x1F)
+                jega->regs_index = val;
+            else
+                jega->regs_index = RINVALID_INDEX;
+            break;
+        case 0x3b5:
+        case 0x3d5:
+            /* Data */
+            if (jega->regs_index != RINVALID_INDEX) {
+                if ((jega->regs_index < 7) && (jega->regs[0x11] & 0x80))
+                    return;
+                if ((jega->regs_index == 7) && (jega->regs[0x11] & 0x80))
+                    val = (jega->regs[7] & ~0x10) | (val & 0x10);
+                /*
+                   Do not allow cursor updates if neither master nor slave is
+                   active - the AX Windows 3.0 386 Enhanced Mode DOS grabber
+                   relies on this for the cursor position to behave correctly.
+                 */
+                if ((jega->regs_index >= 0x0e) && (jega->regs_index <= 0x0f) && !(jega->regs[RMOD1] & 0x0c))
+                    return;
+                jega->regs[jega->regs_index] = val;
+                jega_log("JEGA Out %04X(%02X) %02Xh(%d) %04X:%04X\n", addr, jega->regs_index, val, val, cs >> 4, cpu_state.pc);
+                switch (jega->regs_index) {
+                    case RMOD1:
+                        /* if the value is changed */
+                        /*
+                           Do not allow override toggling unless it's on master and
+                           only override the text renderer - the AX Windows 3.0 386
+                           Enhanced Mode DOS grabber relies on this for the grabbing
+                           to behave correctly.
+                         */
+                        if (val & 0x08) {
+                            if (jega->is_vga) {
+                                if (val & 0x40)
+                                    jega->vga.svga.render_override = NULL;
+                                else
+                                    jega->vga.svga.render_override = jega_render_text;
+                            } else {
+                                if (val & 0x40)
+                                    jega->ega.render_override = NULL;
+                                else
+                                    jega->ega.render_override = jega_render_text;
+                            }
+                        }
+                        break;
+                    case RDAGS:
+                        switch (val & 0x03) {
+                            case 0x00:
+                                jega->attr3_sbcsbank = false;
+                                jega->sbcsbank_inv   = false;
+                                break;
+                            case 0x01:
+                                jega->attr3_sbcsbank = true;
+                                jega->sbcsbank_inv   = false;
+                                break;
+                            case 0x02:
+                                jega->attr3_sbcsbank = true;
+                                jega->sbcsbank_inv   = true;
+                                break;
+                            case 0x03:
+                                jega->attr3_sbcsbank = false;
+                                jega->sbcsbank_inv   = true;
+                                break;
+                        }
+                        break;
+                    case RCCLH:
+                    case RCCLL:
+                        jega->cursoraddr = jega->regs[RCCLH] << 10 | jega->regs[RCCLL] << 2;
+                        break;
+                    case RCMOD:
+                        jega->cursoron = (val & 0x80);
+                        jega->cursorblink_disable = (~val & 0x20);
+                        break;
+                    case RDFFB:
+                    case RDFSB:
+                        /* reset the line number */
+                        jega->font_index = 0;
+                        break;
+                    case RPSSC:
+                        if (val <= 17)
+                            jega->start_scan_count = val + 1;
+                        else
+                            jega->start_scan_count = (val - 32) + 1;
+                        break;
+                    case RPSSL:
+                        jega->start_scan_lower = val - 15;
+                        break;
+                    case RPSSU:
+                        if (val <= 33)
+                            jega->start_scan_upper = val + 4;
+                        else
+                            jega->start_scan_upper = (val - 64) + 4;
+                        break;
+                    case RDFAP:
+                        chr = jega->regs[RDFFB];
+                        if (is_SJIS_1(chr) && chr >= 0xf0 && chr <= 0xf3) {
+                            chr <<= 8;
+                            chr |= jega->regs[RDFSB];
+                            if (jega->font_index < 32)
+                                dbcs_write(chr, jega->font_index, val, jega);
+                        } else {
+                            if (jega->font_index <19)
+                                jega->jfont_sbcs_19[chr * 19 + jega->font_index] = val;
+                        }
+                        jega_log("JEGA Font W %X %d %02Xh(%d) %04X:%04X\n", chr, jega->font_index, val, val, cs >> 4, cpu_state.pc);
+                        jega->font_index++;
+                        break;
+                }
+            }
+            break;
+        default:
+            break;
+    }
+
+    /* Accessing to Slave EGA is redirected to Master in AX-1. */
+    if (jega->regs[RMOD1] & 0x0c) {
+        if (jega->is_vga)
+            vga_out(addr, val, &jega->vga);
+        else
+            ega_out(addr, val, &jega->ega);
+    }
+}
+
+static uint8_t
+jega_in(uint16_t addr, void *priv)
+{
+    jega_t *jega = (jega_t *) priv;
+    uint8_t ret  = INVALIDACCESS8;
+    uint16_t chr;
+
+    switch (addr) {
+        case 0x3b5:
+        case 0x3d5:
+            if (jega->regs_index >= 0x20 && jega->regs_index <= 0x2F) {
+                switch (jega->regs_index) {
+                    case RDFAP:
+                        chr = jega->regs[RDFFB];
+                        /* DBCS or SBCS */
+                        if (is_SJIS_1(chr)) {
+                            chr <<= 8;
+                            chr |= jega->regs[RDFSB];
+                            if (jega->font_index < 32)
+                                ret = dbcs_read(chr, jega->font_index, jega);
+                        } else {
+                            if (jega->font_index < 19)
+                                ret = jega->jfont_sbcs_19[chr * 19 + jega->font_index];
+                        }
+                        jega_log("JEGA Font R %X %d %02Xh(%d) %04X:%04X\n", chr, jega->font_index, ret, ret, cs >> 4, cpu_state.pc);
+                        jega->font_index++;
+                        break;
+                    case RSTAT:
+                        ret = 0x03;
+                        break;
+                    default:
+                        ret = jega->regs[jega->regs_index];
+                        break;
+                }
+                jega_log("JEGA In %04X(%02X) %02X %04X:%04X\n", addr, jega->regs_index, ret, cs >> 4, cpu_state.pc);
+            } else if (jega->regs[RMOD1] & 0x0c) {
+                /* Accessing to Slave EGA is redirected to Master in AX-1. */
+                if (jega->is_vga)
+                    ret = vga_in(addr, &jega->vga);
+                else
+                    ret = ega_in(addr, &jega->ega);
+            }
+            break;
+        case 0x3ba:
+        case 0x3da:
+            jega->attrff = 0;
+            fallthrough;
+        default:
+            /* Accessing to Slave is redirected to Master in AX-1. */
+            if (jega->regs[RMOD1] & 0x0c) {
+                if (jega->is_vga)
+                    ret = vga_in(addr, &jega->vga);
+                else
+                    ret = ega_in(addr, &jega->ega);
+            }
+            break;
+    }
+    // jega_log("JEGA In %04X(%02X) %02X %04X:%04X\n", addr, jega->regs_index, ret, cs >> 4, cpu_state.pc);
+    return ret;
+}
+
+static int
+getfontx2header(FILE *fp, fontx_h *header)
+{
+    (void) !fread(header->id, FONTX_LEN_ID, 1, fp);
+    if (strncmp(header->id, "FONTX2", FONTX_LEN_ID) != 0)
+        return 1;
+
+    (void) !fread(header->name, FONTX_LEN_FN, 1, fp);
+    header->width  = (uint8_t) getc(fp);
+    header->height = (uint8_t) getc(fp);
+    header->type   = (uint8_t) getc(fp);
+    return 0;
+}
+
+static uint16_t
+chrtosht(FILE *fp)
+{
+    uint16_t i = (uint16_t) getc(fp);
+    uint16_t j = (uint16_t) getc(fp) << 8;
+    return (i | j);
+}
+
+static void
+readfontxtbl(fontx_tbl *table, int size, FILE *fp)
+{
+    while (size > 0) {
+        table->start = chrtosht(fp);
+        table->end   = chrtosht(fp);
+        ++table;
+        --size;
+    }
+}
+
+static int
+LoadFontxFile(const char *fn, void *priv)
+{
+    fontx_h    fhead;
+    fontx_tbl *ftbl;
+    uint16_t   code;
+    uint16_t   scode;
+    uint8_t    size;
+    uint8_t    buf;
+    jega_t    *jega = (jega_t *) priv;
+    FILE      *fp   = rom_fopen(fn, "rb");
+    jega_log("JEGA: Loading font\n");
+    if (fp == NULL) {
+        jega_log("JEGA: font file '%s' not found.\n", fn);
+        return 0;
+    }
+    if (getfontx2header(fp, &fhead) != 0) {
+        fclose(fp);
+        jega_log("JEGA: FONTX2 header is incorrect.\n");
+        return 1;
+    }
+    /* DBCS or SBCS */
+    if (fhead.type == 1) {
+        if (fhead.width == 16 && fhead.height == 16) {
+            size = getc(fp);
+            ftbl = (fontx_tbl *) calloc(size, sizeof(fontx_tbl));
+            readfontxtbl(ftbl, size, fp);
+            for (int i = 0; i < size; i++) {
+                for (code = ftbl[i].start; code <= ftbl[i].end; code++) {
+                    scode = SJIS_to_SEQ(code);
+                    if (scode != INVALIDACCESS16) {
+                        for (uint8_t line = 0; line < 16; line++) {
+                            (void) !fread(&buf, sizeof(uint8_t), 1, fp);
+                            jega->jfont_dbcs_16[(int) (scode * 32) + line] = buf;
+                            (void) !fread(&buf, sizeof(uint8_t), 1, fp);
+                            jega->jfont_dbcs_16[(int) (scode * 32) + line + 16] = buf;
+                        }
+                    } else {
+                        fseek(fp, 32, SEEK_CUR);
+                    }
+                }
+            }
+        } else {
+            fclose(fp);
+            jega_log("JEGA: Width or height of DBCS font doesn't match.\n");
+            return 1;
+        }
+    } else {
+        if (fhead.width == 8 && fhead.height == 19)
+            (void) !fread(jega->jfont_sbcs_19, sizeof(uint8_t), SBCS19_FILESIZE, fp);
+        else {
+            fclose(fp);
+            jega_log("JEGA: Width or height of SBCS font doesn't match.\n");
+            return 1;
+        }
+    }
+    fclose(fp);
+    return 0;
+}
+
+static void
+jega_commoninit(const device_t *info, void *priv, int vga)
+{
+    jega_t *jega = (jega_t *) priv;
+    jega->is_vga = vga;
+    if (vga) {
+        video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_vga);
+        svga_init(info, &jega->vga.svga, &jega->vga, 1 << 18, /*256kb*/
+                  NULL,
+                  jega_in, jega_out,
+                  NULL,
+                  NULL);
+
+        jega->vga.svga.bpp     = 8;
+        jega->vga.svga.miscout = 1;
+
+        jega->vga.svga.vga_enabled = 0;
+        jega->vga.svga.priv_parent = jega;
+        jega->pallook = jega->vga.svga.pallook;
+        io_sethandler(0x03c0, 0x0020, jega_in, NULL, NULL, jega_out, NULL, NULL, jega);
+    } else {
+        for (uint16_t c = 0; c < 256; c++) {
+            pallook64[c] = makecol32(((c >> 2) & 1) * 0xaa, ((c >> 1) & 1) * 0xaa, (c & 1) * 0xaa);
+            pallook64[c] += makecol32(((c >> 5) & 1) * 0x55, ((c >> 4) & 1) * 0x55, ((c >> 3) & 1) * 0x55);
+        }
+        video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_ega);
+        jega->pallook = pallook64;
+        ega_init(&jega->ega, 9, 0);
+        ega_set_type(&jega->ega, EGA_SUPEREGA);
+        jega->ega.priv_parent = jega;
+        mem_mapping_add(&jega->ega.mapping, 0xa0000, 0x20000,
+                        ega_read, NULL, NULL, ega_write, NULL, NULL,
+                        NULL, MEM_MAPPING_EXTERNAL, &jega->ega);
+        /* I/O 3DD and 3DE are used by Oki if386 */
+        io_sethandler(0x03c0, 0x001c, jega_in, NULL, NULL, jega_out, NULL, NULL, jega);
+    }
+    /* I/O 3DD and 3DE are used by Oki if386 */
+    // io_sethandler(0x03b0, 0x002c, jega_in, NULL, NULL, jega_out, NULL, NULL, jega);
+    jega->regs[RMOD1] = 0x48;
+}
+
+static void *
+jega_standalone_init(const device_t *info)
+{
+    jega_t *jega = calloc(1, sizeof(jega_t));
+
+    rom_init(&jega->bios_rom, JEGA_PATH_BIOS, 0xc0000, 0x8000, 0x7fff, 0, 0);
+    memset(&jega->jfont_dbcs_16, 0, DBCS16_FILESIZE);
+    LoadFontxFile(JEGA_PATH_FONTDBCS, jega);
+
+    jega_commoninit(info, jega, 0);
+
+    return jega;
+}
+
+static void *
+jvga_standalone_init(const device_t *info)
+{
+    jega_t *jega = calloc(1, sizeof(jega_t));
+
+    rom_init(&jega->bios_rom, JVGA_PATH_BIOS, 0xc0000, 0x8000, 0x7fff, 0, 0);
+    memset(&jega->jfont_dbcs_16, 0, DBCS16_FILESIZE);
+    LoadFontxFile(JVGA_PATH_FONTDBCS, jega);
+
+    jega_commoninit(info, jega, 1);
+
+    return jega;
+}
+
+static void
+jega_close(void *priv)
+{
+    jega_t *jega = (jega_t *) priv;
+#ifdef ENABLE_JEGA_LOG
+    FILE *fp;
+#if 0
+    fp = fopen("jega_font16.dmp", "wb");
+    if (fp != NULL) {
+        fwrite(jega->jfont_dbcs_16, DBCS16_FILESIZE, 1, fp);
+        fclose(f);
+    }
+    fp = fopen("jega_font19.dmp", "wb");
+    if (fp != NULL) {
+        fwrite(jega->jfont_sbcs_19, SBCS19_FILESIZE, 1, fp);
+        fclose(fp);
+    }
+#endif
+    f = fopen("jega_regs.txt", "wb");
+    if (f != NULL) {
+        for (uint8_t i = 0; i < 49; i++)
+            fprintf(fp, "Regs %02X: %4X\n", i, jega->regs[i]);
+        for (uint8_t i = 0; i < 32; i++)
+            fprintf(fp, "Attr %02X: %4X\n", i, jega->attrregs[i]);
+        for (uint8_t i = 0; i < 16; i++)
+            fprintf(fp, "JEGAPal %02X: %4X\n", i, jega->egapal[i]);
+        for (uint8_t i = 0; i < 16; i++)
+            fprintf(fp, "EGAPal %02X: %4X\n", i, jega->ega.egapal[i]);
+        for (uint8_t i = 0; i < 64; i++)
+        fprintf(fp, "RealPal %02X: %4X\n", i, jega->pallook[i]);
+        fclose(fp);
+    }
+#if 0
+    fp = fopen("ega_vram.dmp", "wb");
+    if (fp != NULL) {
+        fwrite(jega->ega.vram, 256 * 1024, 1, fp);
+        fclose(fp);
+    }
+#endif
+    fp = fopen("ram_bda.dmp", "wb");
+    if (fp != NULL) {
+        fwrite(&ram[0x0], 0x500, 1, fp);
+        fclose(fp);
+    }
+    pclog("jeclosed %04X:%04X DS %04X\n", cs >> 4, cpu_state.pc, DS);
+#endif
+
+    if (jega->is_vga)
+        svga_close(&jega->vga.svga);
+    else {
+        if (jega->ega.eeprom)
+            free(jega->ega.eeprom);
+        free(jega->ega.vram);
+    }
+
+    free(jega);
+}
+
+static void
+jega_recalctimings(void *priv)
+{
+    jega_t *jega = (jega_t *) priv;
+
+    if (jega->is_vga)
+        svga_recalctimings(&jega->vga.svga);
+    else
+        ega_recalctimings(&jega->ega);
+}
+
+static void
+jega_speed_changed(void *priv)
+{
+    jega_t *jega = (jega_t *) priv;
+
+    jega_recalctimings(jega);
+}
+
+static int
+jega_standalone_available(void)
+{
+    return (rom_present(JEGA_PATH_BIOS) && rom_present(JEGA_PATH_FONTDBCS));
+}
+
+const device_t jega_device = {
+    .name          = "JEGA",
+    .internal_name = "jega",
+    .flags         = DEVICE_ISA,
+    .local         = 0,
+    .init          = jega_standalone_init,
+    .close         = jega_close,
+    .reset         = NULL,
+    .available     = jega_standalone_available,
+    .speed_changed = jega_speed_changed,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+const device_t jvga_device = {
+    .name          = "OKI VGA/H-2 (JVGA/H)",
+    .internal_name = "jvga",
+    .flags         = DEVICE_ISA16,
+    .local         = 0,
+    .init          = jvga_standalone_init,
+    .close         = jega_close,
+    .reset         = NULL,
+    .available     = jega_standalone_available,
+    .speed_changed = jega_speed_changed,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
+static uint8_t p65idx = 0;
+// static uint8_t p3de_idx = 0;
+static uint8_t p65[6];
+// static uint8_t p3de[0x30];
+
+
+static uint8_t
+if386_p6x_read(uint16_t port, void *priv)
+{
+    uint8_t ret = INVALIDACCESS8;
+    if (port == 0x63) {
+        ret = p65idx;
+    } else if (port == 0x65) {
+        ret = p65[p65idx];
+    }
+    // pclog("p%x_r: [%04x:%04x] [%02x]%02x\n", port, cs >> 4, cpu_state.pc , p65idx, ret);
+    return ret;
+}
+
+/*
+    OKi if386AX/SX Power management and Miscellaneous
+    I/O 63h: Index 0-5, I/O 65h: Data
+    Index 2: 
+        Bit 3: Caps Lock enabled
+        Bit 2: Num Lock enabled
+        Bit 1: Scrl Lock enabled
+        Bit 0: Kana Lock enabled
+    Index 3
+        Bit 2: External monitor output enabled
+        Bit 1: Floppy drive 1 active
+        Bit 0: Floppy drive 0 active
+    Index 5
+        Bit 8: ? (1=Disabled, 0=Enabled)
+        Bit 7: Screen Off? (enabled by Ctrl + Alt + [1] and disabled by any key)
+        Bit 4: Shutdown? (caused by POST rebooting and POWER OFF command in DOS 3.21)
+        Bit 3: ?
+*/
+static uint32_t lcd_cols[8] = { 0x001024, 0x747d8a, 0x8c96a4, 0xa0abbb,
+                                0xb1bece, 0xc0cee0, 0xceddf0, 0xdbebff };
+static void
+if386_p6x_write(uint16_t port, uint8_t val, void *priv)
+{
+    jega_t *jega = (jega_t *) priv;
+    // pclog("p%x_w: [%04x:%04x] val=%02x\n", port, cs >> 4, cpu_state.pc, val);
+    if (port == 0x63 && val < 6)
+        p65idx = val;
+    if (port == 0x65) {
+        // pclog("p65_w: [%04x:%04x] idx=%02x, val=%02x\n", cs >> 4, cpu_state.pc, p65idx, val);
+        p65[p65idx] = val;
+        if (p65idx == 0x03) {
+            if (val & 0x04) { /* Color monitor */
+                for (uint16_t c = 0; c < 256; c++) {
+                    pallook64[c] = makecol32(((c >> 2) & 1) * 0xaa, ((c >> 1) & 1) * 0xaa, (c & 1) * 0xaa);
+                    pallook64[c] += makecol32(((c >> 5) & 1) * 0x55, ((c >> 4) & 1) * 0x55, ((c >> 3) & 1) * 0x55);
+                    pallook16[c] = makecol32(((c >> 2) & 1) * 0xaa, ((c >> 1) & 1) * 0xaa, (c & 1) * 0xaa);
+                    pallook16[c] += makecol32(((c >> 4) & 1) * 0x55, ((c >> 4) & 1) * 0x55, ((c >> 4) & 1) * 0x55);
+                    if ((c & 0x17) == 6)
+                        pallook16[c] = makecol32(0xaa, 0x55, 0);
+                }
+            } else { /* Monochrome LCD */
+                for (uint16_t c = 0; c < 256; c++) {
+                    int cval = 0;
+#ifdef SIMPLE_BW
+                    if (c & 0x0f)
+                        cval = ((c & 0x0e) * 0x10) + 0x1f;
+                    pallook64[c] = makecol32(cval, cval, cval);
+                    pallook16[c] = makecol32(cval, cval, cval);
+#else
+                    if (c & 0x3f) {
+                        cval = (c & 0x10) >> 2;
+                        cval |= (c & 0x06) >> 1;
+                    }
+                    pallook64[c] = lcd_cols[cval];
+                    cval = 0;
+                    if (c & 0x0f)
+                        cval = (c & 0x0e) >> 1;
+                    pallook16[c] = lcd_cols[cval];
+#endif
+                }
+            }
+            jega_recalctimings(jega);
+        } else if (p65idx == 0x05) {
+            if (val & 0x10) {
+                /* Power off (instead this call hardware reset here) */
+                device_reset_all(DEVICE_ALL);
+                resetx86();
+            }
+        }
+    }
+    return;
+}
+
+static void *
+if386jega_init(const device_t *info)
+{
+    jega_t *jega = calloc(1, sizeof(jega_t));
+
+    rom_init(&jega->bios_rom, IF386_PATH_VBIOS, 0xc0000, 0x8000, 0x7fff, 0, 0);
+    memset(&jega->jfont_dbcs_16, 0, DBCS16_FILESIZE);
+    LoadFontxFile(JEGA_PATH_FONTDBCS, jega);
+
+    jega_commoninit(info, jega, 0);
+
+    io_sethandler(0x0063, 1, if386_p6x_read, NULL, NULL, if386_p6x_write, NULL, NULL, jega);
+    io_sethandler(0x0065, 1, if386_p6x_read, NULL, NULL, if386_p6x_write, NULL, NULL, jega);
+    // io_sethandler(0x03dd, 2, if386_p6x_read, NULL, NULL, if386_p6x_write, NULL, NULL, jega);
+
+    return jega;
+}
+
+static int
+if386jega_available(void)
+{
+    return (rom_present(IF386_PATH_VBIOS) && rom_present(JEGA_PATH_FONTDBCS));
+}
+
+const device_t if386jega_device = {
+    .name          = "JEGA (if386AX)",
+    .internal_name = "if386jega",
+    .flags         = DEVICE_ISA,
+    .local         = 0,
+    .init          = if386jega_init,
+    .close         = jega_close,
+    .reset         = NULL,
+    .available     = if386jega_available,
+    .speed_changed = jega_speed_changed,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
diff --git a/src/video/vid_mda.c b/src/video/vid_mda.c
index 702fb7e32..184ad7fdd 100644
--- a/src/video/vid_mda.c
+++ b/src/video/vid_mda.c
@@ -6,16 +6,19 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          MDA emulation.
+ *          IBM Monochrome Display and Printer Adapter emulation.
  *
  *
  *
  * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
  *          Miran Grca, <mgrca8@gmail.com>
+ *          Connor Hyde, <mario64crashed@gmail.com>
  *
  *          Copyright 2008-2019 Sarah Walker.
- *          Copyright 2016-2019 Miran Grca.
+ *          Copyright 2016-2025 Miran Grca.
+ *          Copyright 2025 starfrost / Connor Hyde
  */
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
@@ -24,16 +27,26 @@
 #include <86box/86box.h>
 #include <86box/io.h>
 #include <86box/timer.h>
+#include <86box/device.h>
 #include <86box/lpt.h>
 #include <86box/pit.h>
 #include <86box/mem.h>
 #include <86box/rom.h>
-#include <86box/device.h>
 #include <86box/video.h>
 #include <86box/vid_mda.h>
 #include <86box/plat_unused.h>
 
-static int mdacols[256][2][2];
+// Enumerates MDA monitor types
+enum mda_monitor_type_e {
+    MDA_MONITOR_TYPE_DEFAULT = 0, // Default MDA monitor type.
+    MDA_MONITOR_TYPE_GREEN   = 1, // Green phosphor
+    MDA_MONITOR_TYPE_AMBER   = 2, // Amber phosphor
+    MDA_MONITOR_TYPE_GRAY    = 3, // Gray phosphor
+    MDA_MONITOR_TYPE_RGBI    = 4, // RGBI colour monitor with modified rev1 or rev0 MDA card for colour support
+} mda_monitor_type;
+
+// [attr][blink][fg]
+static int mda_attr_to_color_table[256][2][2];
 
 static video_timings_t timing_mda = { .type = VIDEO_ISA, .write_b = 8, .write_w = 16, .write_l = 32, .read_b = 8, .read_w = 16, .read_l = 32 };
 
@@ -44,32 +57,31 @@ mda_out(uint16_t addr, uint8_t val, void *priv)
 {
     mda_t *mda = (mda_t *) priv;
 
-    switch (addr) {
-        case 0x3b0:
-        case 0x3b2:
-        case 0x3b4:
-        case 0x3b6:
-            mda->crtcreg = val & 31;
-            return;
-        case 0x3b1:
-        case 0x3b3:
-        case 0x3b5:
-        case 0x3b7:
-            mda->crtc[mda->crtcreg] = val;
-            if (mda->crtc[10] == 6 && mda->crtc[11] == 7) /*Fix for Generic Turbo XT BIOS, which sets up cursor registers wrong*/
-            {
-                mda->crtc[10] = 0xb;
-                mda->crtc[11] = 0xc;
-            }
-            mda_recalctimings(mda);
-            return;
-        case 0x3b8:
-            mda->ctrl = val;
-            return;
+    if (addr < MDA_REGISTER_START
+        || addr > MDA_REGISTER_CRT_STATUS) // Maintain old behaviour for printer registers, just in case
+        return;
 
+    switch (addr) {
+        case MDA_REGISTER_MODE_CONTROL:
+            mda->mode = val;
+            return;
         default:
             break;
     }
+
+    // addr & 1 == 1 = MDA_REGISTER_CRTC_DATA
+    // otherwise       MDA_REGISTER_CRTC_INDEX
+    if (addr & 1) {
+        mda->crtc[mda->crtcreg] = val;
+        if (mda->crtc[MDA_CRTC_CURSOR_START] == 6
+            && mda->crtc[MDA_CRTC_CURSOR_END] == 7) /*Fix for Generic Turbo XT BIOS, which sets up cursor registers wrong*/
+        {
+            mda->crtc[MDA_CRTC_CURSOR_START] = 0xb;
+            mda->crtc[MDA_CRTC_CURSOR_END]   = 0xc;
+        }
+        mda_recalctimings(mda);
+    } else
+        mda->crtcreg = val & 31;
 }
 
 uint8_t
@@ -78,23 +90,23 @@ mda_in(uint16_t addr, void *priv)
     const mda_t *mda = (mda_t *) priv;
 
     switch (addr) {
-        case 0x3b0:
-        case 0x3b2:
-        case 0x3b4:
-        case 0x3b6:
-            return mda->crtcreg;
-        case 0x3b1:
-        case 0x3b3:
-        case 0x3b5:
-        case 0x3b7:
-            return mda->crtc[mda->crtcreg];
-        case 0x3ba:
-            return mda->stat | 0xF0;
-
+        case MDA_REGISTER_CRT_STATUS:
+            return mda->status | 0xF0;
         default:
+            if (addr < MDA_REGISTER_START
+                || addr > MDA_REGISTER_CRT_STATUS) // Maintain old behaviour for printer registers, just in case
+                return 0xFF;
+
+            // MDA_REGISTER_CRTC_DATA
+            if (addr & 1)
+                return mda->crtc[mda->crtcreg];
+            else
+                return mda->crtcreg;
+
             break;
     }
-    return 0xff;
+
+    return 0xFF;
 }
 
 void
@@ -118,8 +130,8 @@ mda_recalctimings(mda_t *mda)
     double _dispontime;
     double _dispofftime;
     double disptime;
-    disptime     = mda->crtc[0] + 1;
-    _dispontime  = mda->crtc[1];
+    disptime     = (mda->crtc[MDA_CRTC_HTOTAL] + 1);
+    _dispontime  = (mda->crtc[MDA_CRTC_HDISP]);
     _dispofftime = disptime - _dispontime;
     _dispontime *= MDACONST;
     _dispofftime *= MDACONST;
@@ -130,59 +142,141 @@ mda_recalctimings(mda_t *mda)
 void
 mda_poll(void *priv)
 {
-    mda_t   *mda = (mda_t *) priv;
-    uint16_t ca  = (mda->crtc[15] | (mda->crtc[14] << 8)) & 0x3fff;
-    int      drawcursor;
-    int      x;
-    int      c;
-    int      oldvc;
+    mda_t   *mda        = (mda_t *) priv;
+    uint16_t cursoraddr = (mda->crtc[MDA_CRTC_CURSOR_ADDR_LOW] | (mda->crtc[MDA_CRTC_CURSOR_ADDR_HIGH] << 8)) & 0x3fff;
+    bool     drawcursor;
+    int32_t  oldvc;
     uint8_t  chr;
     uint8_t  attr;
-    int      oldsc;
-    int      blink;
+    int32_t  scanline_old;
+    int32_t  blink;
 
     VIDEO_MONITOR_PROLOGUE()
+
     if (!mda->linepos) {
         timer_advance_u64(&mda->timer, mda->dispofftime);
-        mda->stat |= 1;
+        mda->status |= 1;
         mda->linepos = 1;
-        oldsc        = mda->sc;
-        if ((mda->crtc[8] & 3) == 3)
-            mda->sc = (mda->sc << 1) & 7;
+        scanline_old = mda->scanline;
+        if ((mda->crtc[MDA_CRTC_INTERLACE] & 3) == 3)
+            mda->scanline = (mda->scanline << 1) & 7;
+
         if (mda->dispon) {
             if (mda->displine < mda->firstline) {
                 mda->firstline = mda->displine;
                 video_wait_for_buffer();
             }
             mda->lastline = mda->displine;
-            for (x = 0; x < mda->crtc[1]; x++) {
-                chr        = mda->vram[(mda->ma << 1) & 0xfff];
-                attr       = mda->vram[((mda->ma << 1) + 1) & 0xfff];
-                drawcursor = ((mda->ma == ca) && mda->con && mda->cursoron);
-                blink      = ((mda->blink & 16) && (mda->ctrl & 0x20) && (attr & 0x80) && !drawcursor);
-                if (mda->sc == 12 && ((attr & 7) == 1)) {
-                    for (c = 0; c < 9; c++)
-                        buffer32->line[mda->displine][(x * 9) + c] = mdacols[attr][blink][1];
-                } else {
-                    for (c = 0; c < 8; c++)
-                        buffer32->line[mda->displine][(x * 9) + c] = mdacols[attr][blink][(fontdatm[chr + mda->fontbase][mda->sc] & (1 << (c ^ 7))) ? 1 : 0];
-                    if ((chr & ~0x1f) == 0xc0)
-                        buffer32->line[mda->displine][(x * 9) + 8] = mdacols[attr][blink][fontdatm[chr + mda->fontbase][mda->sc] & 1];
-                    else
-                        buffer32->line[mda->displine][(x * 9) + 8] = mdacols[attr][blink][0];
+
+            for (uint32_t x = 0; x < mda->crtc[MDA_CRTC_HDISP]; x++) {
+                chr        = mda->vram[(mda->memaddr << 1) & 0xfff];
+                attr       = mda->vram[((mda->memaddr << 1) + 1) & 0xfff];
+                drawcursor = ((mda->memaddr == cursoraddr) && mda->cursorvisible && mda->cursoron);
+                blink      = ((mda->blink & 16) && (mda->mode & MDA_MODE_BLINK) && (attr & 0x80) && !drawcursor);
+
+                // Colours that will be used
+                int32_t color_bg = 0, color_fg = 0;
+
+                // If we are using an RGBI monitor allow colour
+                if (mda->monitor_type == MDA_MONITOR_TYPE_RGBI
+                    && !(mda->mode & MDA_MODE_BW)) {
+                    color_bg = (attr >> 4) & 0x0F;
+                    color_fg = (attr & 0x0F);
+
+                    // turn off bright bg colours in blink mode
+                    if ((mda->mode & MDA_MODE_BLINK)
+                        && (color_bg & 0x8))
+                        color_bg &= ~(0x8);
+
+                    // black-on-non black or white colours forced to white
+                    // grey-on-colours forced to bright white
+
+                    bool special_treatment = (color_bg != 0 && color_bg != 7);
+
+                    if (color_fg == MDA_COLOR_GREY
+                        && special_treatment)
+                        color_fg = MDA_COLOR_BRIGHT_WHITE;
+
+                    if (color_fg == 0
+                        && special_treatment)
+                        color_fg = MDA_COLOR_GREY;
+
+                    // gray is black
+                    if (color_fg == MDA_COLOR_GREY
+                        && (color_bg == MDA_COLOR_GREY || color_bg == MDA_COLOR_BLACK))
+                        color_fg = MDA_COLOR_BLACK;
                 }
-                mda->ma++;
+
+                if (mda->scanline == 12
+                    && ((attr & 7) == 1)) { // underline
+                    for (uint32_t column = 0; column < 9; column++) {
+                        if (mda->monitor_type == MDA_MONITOR_TYPE_RGBI
+                            && !(mda->mode & MDA_MODE_BW)) {
+                            buffer32->line[mda->displine][(x * 9) + column] = CGAPAL_CGA_START + color_fg;
+                        } else
+                            buffer32->line[mda->displine][(x * 9) + column] = mda_attr_to_color_table[attr][blink][1];
+                    }
+                } else { // character
+                    for (uint32_t column = 0; column < 8; column++) {
+                        // bg=0, fg=1
+                        bool is_fg = (fontdatm[chr + mda->fontbase][mda->scanline] & (1 << (column ^ 7))) ? 1 : 0;
+
+                        uint32_t font_char = mda_attr_to_color_table[attr][blink][is_fg];
+
+                        if (mda->monitor_type == MDA_MONITOR_TYPE_RGBI
+                            && !(mda->mode & MDA_MODE_BW)) {
+                            if (!is_fg)
+                                font_char = CGAPAL_CGA_START + color_bg;
+                            else
+                                font_char = CGAPAL_CGA_START + color_fg;
+                        }
+
+                        buffer32->line[mda->displine][(x * 9) + column] = font_char;
+                    }
+
+                    // these characters (C0-DF) have their background extended to their 9th column
+                    if ((chr & ~0x1f) == 0xc0) {
+                        bool     is_fg        = fontdatm[chr + mda->fontbase][mda->scanline] & 1;
+                        uint32_t final_result = mda_attr_to_color_table[attr][blink][is_fg];
+
+                        if (mda->monitor_type == MDA_MONITOR_TYPE_RGBI
+                            && !(mda->mode & MDA_MODE_BW)) {
+                            if (!is_fg)
+                                final_result = CGAPAL_CGA_START + color_bg;
+                            else
+                                final_result = CGAPAL_CGA_START + color_fg;
+                        }
+
+                        buffer32->line[mda->displine][(x * 9) + 8] = final_result;
+
+                    } else {
+                        if (mda->monitor_type == MDA_MONITOR_TYPE_RGBI
+                            && !(mda->mode & MDA_MODE_BW)) {
+                            buffer32->line[mda->displine][(x * 9) + 8] = CGAPAL_CGA_START + color_bg;
+
+                        } else
+                            buffer32->line[mda->displine][(x * 9) + 8] = mda_attr_to_color_table[attr][blink][0];
+                    }
+                }
+
+                mda->memaddr++;
+
                 if (drawcursor) {
-                    for (c = 0; c < 9; c++)
-                        buffer32->line[mda->displine][(x * 9) + c] ^= mdacols[attr][0][1];
+                    for (uint32_t column = 0; column < 9; column++) {
+                        if (mda->monitor_type == MDA_MONITOR_TYPE_RGBI
+                            && !(mda->mode & MDA_MODE_BW)) {
+                            buffer32->line[mda->displine][(x * 9) + column] ^= CGAPAL_CGA_START + color_fg;
+                        } else
+                            buffer32->line[mda->displine][(x * 9) + column] ^= mda_attr_to_color_table[attr][0][1];
+                    }
                 }
             }
 
-            video_process_8(mda->crtc[1] * 9, mda->displine);
+            video_process_8(mda->crtc[MDA_CRTC_HDISP] * 9, mda->displine);
         }
-        mda->sc = oldsc;
-        if (mda->vc == mda->crtc[7] && !mda->sc) {
-            mda->stat |= 8;
+        mda->scanline = scanline_old;
+        if (mda->vc == mda->crtc[MDA_CRTC_VSYNC] && !mda->scanline) {
+            mda->status |= 8;
         }
         mda->displine++;
         if (mda->displine >= 500)
@@ -190,54 +284,60 @@ mda_poll(void *priv)
     } else {
         timer_advance_u64(&mda->timer, mda->dispontime);
         if (mda->dispon)
-            mda->stat &= ~1;
+            mda->status &= ~1;
         mda->linepos = 0;
+
         if (mda->vsynctime) {
             mda->vsynctime--;
             if (!mda->vsynctime) {
-                mda->stat &= ~8;
+                mda->status &= ~8;
             }
         }
-        if (mda->sc == (mda->crtc[11] & 31) || ((mda->crtc[8] & 3) == 3 && mda->sc == ((mda->crtc[11] & 31) >> 1))) {
-            mda->con  = 0;
-            mda->coff = 1;
+        if (mda->scanline == (mda->crtc[MDA_CRTC_CURSOR_END] & 31)
+            || ((mda->crtc[MDA_CRTC_INTERLACE] & 3) == 3
+                && mda->scanline == ((mda->crtc[MDA_CRTC_CURSOR_END] & 31) >> 1))) {
+            mda->cursorvisible = 0;
         }
+
         if (mda->vadj) {
-            mda->sc++;
-            mda->sc &= 31;
-            mda->ma = mda->maback;
+            mda->scanline++;
+            mda->scanline &= 31;
+            mda->memaddr = mda->memaddr_backup;
             mda->vadj--;
             if (!mda->vadj) {
-                mda->dispon = 1;
-                mda->ma = mda->maback = (mda->crtc[13] | (mda->crtc[12] << 8)) & 0x3fff;
-                mda->sc               = 0;
+                mda->dispon  = 1;
+                mda->memaddr = mda->memaddr_backup = (mda->crtc[MDA_CRTC_START_ADDR_LOW] | (mda->crtc[MDA_CRTC_START_ADDR_HIGH] << 8)) & 0x3fff;
+                mda->scanline                      = 0;
             }
-        } else if (mda->sc == mda->crtc[9] || ((mda->crtc[8] & 3) == 3 && mda->sc == (mda->crtc[9] >> 1))) {
-            mda->maback = mda->ma;
-            mda->sc     = 0;
-            oldvc       = mda->vc;
+        } else if (mda->scanline == mda->crtc[MDA_CRTC_MAX_SCANLINE_ADDR]
+                   || ((mda->crtc[MDA_CRTC_INTERLACE] & 3) == 3
+                       && mda->scanline == (mda->crtc[MDA_CRTC_MAX_SCANLINE_ADDR] >> 1))) {
+            mda->memaddr_backup = mda->memaddr;
+            mda->scanline       = 0;
+            oldvc               = mda->vc;
             mda->vc++;
             mda->vc &= 127;
-            if (mda->vc == mda->crtc[6])
+            if (mda->vc == mda->crtc[MDA_CRTC_VDISP])
                 mda->dispon = 0;
-            if (oldvc == mda->crtc[4]) {
+            if (oldvc == mda->crtc[MDA_CRTC_VTOTAL]) {
                 mda->vc   = 0;
-                mda->vadj = mda->crtc[5];
+                mda->vadj = mda->crtc[MDA_CRTC_VTOTAL_ADJUST];
                 if (!mda->vadj)
                     mda->dispon = 1;
                 if (!mda->vadj)
-                    mda->ma = mda->maback = (mda->crtc[13] | (mda->crtc[12] << 8)) & 0x3fff;
-                if ((mda->crtc[10] & 0x60) == 0x20)
+                    mda->memaddr = mda->memaddr_backup = (mda->crtc[MDA_CRTC_START_ADDR_LOW] | (mda->crtc[MDA_CRTC_START_ADDR_HIGH] << 8)) & 0x3fff;
+                if ((mda->crtc[MDA_CRTC_CURSOR_START] & 0x60) == 0x20)
                     mda->cursoron = 0;
                 else
                     mda->cursoron = mda->blink & 16;
             }
-            if (mda->vc == mda->crtc[7]) {
+
+            if (mda->vc == mda->crtc[MDA_CRTC_VSYNC]) {
                 mda->dispon    = 0;
                 mda->displine  = 0;
                 mda->vsynctime = 16;
-                if (mda->crtc[7]) {
-                    x = mda->crtc[1] * 9;
+                if (mda->crtc[MDA_CRTC_VSYNC]) {
+                    uint32_t x = mda->crtc[MDA_CRTC_HDISP] * 9;
                     mda->lastline++;
                     if ((x != xsize) || ((mda->lastline - mda->firstline) != ysize) || video_force_resize_get()) {
                         xsize = x;
@@ -253,8 +353,8 @@ mda_poll(void *priv)
                     }
                     video_blit_memtoscreen(0, mda->firstline, xsize, ysize);
                     frames++;
-                    video_res_x = mda->crtc[1];
-                    video_res_y = mda->crtc[6];
+                    video_res_x = mda->crtc[MDA_CRTC_HDISP];
+                    video_res_y = mda->crtc[MDA_CRTC_VDISP];
                     video_bpp   = 0;
                 }
                 mda->firstline = 1000;
@@ -262,12 +362,15 @@ mda_poll(void *priv)
                 mda->blink++;
             }
         } else {
-            mda->sc++;
-            mda->sc &= 31;
-            mda->ma = mda->maback;
+            mda->scanline++;
+            mda->scanline &= 31;
+            mda->memaddr = mda->memaddr_backup;
         }
-        if (mda->sc == (mda->crtc[10] & 31) || ((mda->crtc[8] & 3) == 3 && mda->sc == ((mda->crtc[10] & 31) >> 1))) {
-            mda->con = 1;
+
+        if (mda->scanline == (mda->crtc[MDA_CRTC_CURSOR_START] & 31)
+            || ((mda->crtc[MDA_CRTC_INTERLACE] & 3) == 3
+                && mda->scanline == ((mda->crtc[MDA_CRTC_CURSOR_START] & 31) >> 1))) {
+            mda->cursorvisible = 1;
         }
     }
     VIDEO_MONITOR_EPILOGUE();
@@ -276,30 +379,32 @@ mda_poll(void *priv)
 void
 mda_init(mda_t *mda)
 {
-    for (uint16_t c = 0; c < 256; c++) {
-        mdacols[c][0][0] = mdacols[c][1][0] = mdacols[c][1][1] = 16;
-        if (c & 8)
-            mdacols[c][0][1] = 15 + 16;
+
+    for (uint16_t attr = 0; attr < 256; attr++) {
+        mda_attr_to_color_table[attr][0][0] = mda_attr_to_color_table[attr][1][0] = mda_attr_to_color_table[attr][1][1] = 16;
+        if (attr & 8)
+            mda_attr_to_color_table[attr][0][1] = 15 + 16;
         else
-            mdacols[c][0][1] = 7 + 16;
+            mda_attr_to_color_table[attr][0][1] = 7 + 16;
     }
-    mdacols[0x70][0][1] = 16;
-    mdacols[0x70][0][0] = mdacols[0x70][1][0] = mdacols[0x70][1][1] = 16 + 15;
-    mdacols[0xF0][0][1]                                             = 16;
-    mdacols[0xF0][0][0] = mdacols[0xF0][1][0] = mdacols[0xF0][1][1] = 16 + 15;
-    mdacols[0x78][0][1]                                             = 16 + 7;
-    mdacols[0x78][0][0] = mdacols[0x78][1][0] = mdacols[0x78][1][1] = 16 + 15;
-    mdacols[0xF8][0][1]                                             = 16 + 7;
-    mdacols[0xF8][0][0] = mdacols[0xF8][1][0] = mdacols[0xF8][1][1] = 16 + 15;
-    mdacols[0x00][0][1] = mdacols[0x00][1][1] = 16;
-    mdacols[0x08][0][1] = mdacols[0x08][1][1] = 16;
-    mdacols[0x80][0][1] = mdacols[0x80][1][1] = 16;
-    mdacols[0x88][0][1] = mdacols[0x88][1][1] = 16;
+    mda_attr_to_color_table[0x70][0][1] = 16;
+    mda_attr_to_color_table[0x70][0][0] = mda_attr_to_color_table[0x70][1][0] = mda_attr_to_color_table[0x70][1][1] = CGAPAL_CGA_START + 15;
+    mda_attr_to_color_table[0xF0][0][1]                                                                             = 16;
+    mda_attr_to_color_table[0xF0][0][0] = mda_attr_to_color_table[0xF0][1][0] = mda_attr_to_color_table[0xF0][1][1] = CGAPAL_CGA_START + 15;
+    mda_attr_to_color_table[0x78][0][1]                                                                             = CGAPAL_CGA_START + 7;
+    mda_attr_to_color_table[0x78][0][0] = mda_attr_to_color_table[0x78][1][0] = mda_attr_to_color_table[0x78][1][1] = CGAPAL_CGA_START + 15;
+    mda_attr_to_color_table[0xF8][0][1]                                                                             = CGAPAL_CGA_START + 7;
+    mda_attr_to_color_table[0xF8][0][0] = mda_attr_to_color_table[0xF8][1][0] = mda_attr_to_color_table[0xF8][1][1] = CGAPAL_CGA_START + 15;
+    mda_attr_to_color_table[0x00][0][1] = mda_attr_to_color_table[0x00][1][1] = 16;
+    mda_attr_to_color_table[0x08][0][1] = mda_attr_to_color_table[0x08][1][1] = 16;
+    mda_attr_to_color_table[0x80][0][1] = mda_attr_to_color_table[0x80][1][1] = 16;
+    mda_attr_to_color_table[0x88][0][1] = mda_attr_to_color_table[0x88][1][1] = 16;
 
     overscan_x = overscan_y = 0;
     mda->monitor_index      = monitor_index_global;
 
-    cga_palette = device_get_config_int("rgb_type") << 1;
+    mda->monitor_type = device_get_config_int("rgb_type");
+    cga_palette       = mda->monitor_type << 1;
     if (cga_palette > 6) {
         cga_palette = 0;
     }
@@ -317,12 +422,40 @@ mda_standalone_init(UNUSED(const device_t *info))
 
     mda->vram = malloc(0x1000);
 
-    mem_mapping_add(&mda->mapping, 0xb0000, 0x08000, mda_read, NULL, NULL, mda_write, NULL, NULL, NULL, MEM_MAPPING_EXTERNAL, mda);
-    io_sethandler(0x03b0, 0x0010, mda_in, NULL, NULL, mda_out, NULL, NULL, mda);
+    switch (device_get_config_int("font")) {
+        case 0:
+            loadfont(FONT_IBM_MDA_437_PATH, 0);
+            break;
+        case 1:
+            loadfont(FONT_IBM_MDA_437_NORDIC_PATH, 0);
+            break;
+        case 2:
+            loadfont(FONT_KAM_PATH, 0);
+            break;
+        case 3:
+            loadfont(FONT_KAMCL16_PATH, 0);
+            break;
+        case 4:
+            loadfont(FONT_TULIP_DGA_PATH, 0);
+            break;
+    }
+
+    mem_mapping_add(&mda->mapping, 0xb0000, 0x08000,
+                    mda_read, NULL, NULL,
+                    mda_write, NULL, NULL,
+                    NULL, MEM_MAPPING_EXTERNAL,
+                    mda);
+
+    io_sethandler(0x03b0, 0x0010,
+                  mda_in, NULL, NULL,
+                  mda_out, NULL, NULL,
+                  mda);
 
     mda_init(mda);
 
-    lpt3_init(0x3BC);
+    mda->lpt = device_add_inst(&lpt_port_device, 1);
+    lpt_port_setup(mda->lpt, LPT_MDA_ADDR);
+    lpt_set_3bc_used(1);
 
     return mda;
 }
@@ -330,7 +463,7 @@ mda_standalone_init(UNUSED(const device_t *info))
 void
 mda_setcol(int chr, int blink, int fg, uint8_t cga_ink)
 {
-    mdacols[chr][blink][fg] = 16 + cga_ink;
+    mda_attr_to_color_table[chr][blink][fg] = CGAPAL_CGA_START + cga_ink;
 }
 
 void
@@ -351,38 +484,47 @@ mda_speed_changed(void *priv)
 }
 
 static const device_config_t mda_config[] = {
-  // clang-format off
+    // clang-format off
     {
-        .name = "rgb_type",
-        .description = "Display type",
-        .type = CONFIG_SELECTION,
-        .default_int = 0,
-        .selection = {
-            {
-                .description = "Default",
-                .value = 0
-            },
-            {
-                .description = "Green",
-                .value = 1
-            },
-            {
-                .description = "Amber",
-                .value = 2
-            },
-            {
-                .description = "Gray",
-                .value = 3
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "rgb_type",
+        .description    = "Display type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = 
+        {
+            { .description = "Default", .value = MDA_MONITOR_TYPE_DEFAULT },
+            { .description = "Green", .value = MDA_MONITOR_TYPE_GREEN },
+            { .description = "Amber", .value = MDA_MONITOR_TYPE_AMBER },
+            { .description = "Gray",  .value = MDA_MONITOR_TYPE_GRAY  },
+            { .description = "Generic RGBI color monitor",  .value = MDA_MONITOR_TYPE_RGBI },
+            { .description = "" }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .type = CONFIG_END
-    }
-  // clang-format on
+        .name           = "font",
+        .description    = "Font",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      =
+        {
+            { .description = "US (CP 437)", .value = 0 },
+            { .description = "IBM Nordic (CP 437-Nordic)",  .value = 1 },
+            { .description = "Czech Kamenicky (CP 895) #1", .value = 2 },
+            { .description = "Czech Kamenicky (CP 895) #2", .value = 3 },
+            { .description = "Tulip DGA",                   .value = 4 },
+            { .description = "" }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
 };
 
 const device_t mda_device = {
@@ -393,8 +535,9 @@ const device_t mda_device = {
     .init          = mda_standalone_init,
     .close         = mda_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = mda_speed_changed,
     .force_redraw  = NULL,
     .config        = mda_config
 };
+
diff --git a/src/video/vid_mga.c b/src/video/vid_mga.c
index 088085355..7fdc04e9e 100644
--- a/src/video/vid_mga.c
+++ b/src/video/vid_mga.c
@@ -23,6 +23,7 @@
 #include <stdatomic.h>
 #include <86box/86box.h>
 #include <86box/io.h>
+#include "cpu.h"
 #include <86box/timer.h>
 #include <86box/mem.h>
 #include <86box/pci.h>
@@ -34,6 +35,7 @@
 #include <86box/video.h>
 #include <86box/i2c.h>
 #include <86box/vid_ddc.h>
+#include <86box/vid_xga.h>
 #include <86box/vid_svga.h>
 #include <86box/vid_svga_render.h>
 
@@ -315,6 +317,7 @@
 #define DWGCTRL_TRANS_MASK            (0xf << DWGCTRL_TRANS_SHIFT)
 #define DWGCTRL_BLTMOD_MASK           (0xf << 25)
 #define DWGCTRL_BLTMOD_BMONOLEF       (0x0 << 25)
+#define DWGCTRL_BLTMOD_BPLAN          (0x1 << 25)
 #define DWGCTRL_BLTMOD_BFCOL          (0x2 << 25)
 #define DWGCTRL_BLTMOD_BU32BGR        (0x3 << 25)
 #define DWGCTRL_BLTMOD_BMONOWF        (0x4 << 25)
@@ -336,7 +339,7 @@
 #define MACCESS_NODITHER              (1 << 30)
 #define MACCESS_DIT555                (1 << 31)
 
-#define PITCH_MASK                    0x7e0
+#define PITCH_MASK                    0xfe0
 #define PITCH_YLIN                    (1 << 15)
 
 #define SGN_SDYDXL                    (1 << 0)
@@ -421,13 +424,12 @@ enum {
 };
 
 enum {
-    DMA_STATE_IDLE = 0,
-    DMA_STATE_PRI,
-    DMA_STATE_SEC
+    MGA_DMA_STATE_IDLE = 0,
+    MGA_DMA_STATE_PRI,
+    MGA_DMA_STATE_SEC
 };
 
-typedef struct
-{
+typedef struct {
     uint32_t addr_type;
     uint32_t val;
 } fifo_entry_t;
@@ -483,14 +485,12 @@ typedef struct mystique_t {
 
     event_t *wake_fifo_thread, *fifo_not_full_event;
 
-    struct
-    {
+    struct {
         int m, n, p, s;
     } xpixpll[3];
 
-    struct
-    {
-        uint8_t funcnt, stylelen,
+    struct {
+        uint8_t funcnt : 7, stylelen,
             dmamod;
 
         int16_t fxleft, fxright,
@@ -504,7 +504,7 @@ typedef struct mystique_t {
             ta_key, ta_mask, lastpix_r, lastpix_g,
             lastpix_b, highv_line, beta, dither, err, k1, k2;
 
-        int pattern[8][16];
+        bool pattern[8][16];
 
         uint32_t dwgctrl, dwgctrl_running, bcol, fcol,
             pitch, plnwt, ybot, ydstorg,
@@ -520,27 +520,23 @@ typedef struct mystique_t {
 
         uint64_t extended_dr[4];
 
-        struct
-        {
+        struct {
             int sdydxl, scanleft, sdxl, sdy,
                 sdxr;
         } sgn;
     } dwgreg;
 
-    struct
-    {
+    struct {
         uint8_t r, g, b;
     } lut[256];
 
-    struct
-    {
+    struct {
         uint16_t pos_x, pos_y,
             addr;
         uint32_t col[3];
     } cursor;
 
-    struct
-    {
+    struct {
         atomic_int pri_state, sec_state, iload_state, state;
 
         atomic_uint primaddress, primend, secaddress, secend,
@@ -741,7 +737,7 @@ mystique_out(uint16_t addr, uint8_t val, void *priv)
                 if ((svga->crtcreg & 0x3f) < 0xE || (svga->crtcreg & 0x3f) > 0x10) {
                     if (((svga->crtcreg & 0x3f) == 0xc) || ((svga->crtcreg & 0x3f) == 0xd)) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
                     } else {
                         svga->fullchange = changeframecount;
                         svga_recalctimings(svga);
@@ -773,28 +769,28 @@ mystique_out(uint16_t addr, uint8_t val, void *priv)
                 if (!(mystique->type >= MGA_2164W))
                     svga->rowoffset <<= 1;
 
-                svga->ma_latch      = ((mystique->crtcext_regs[0] & CRTCX_R0_STARTADD_MASK) << 16) |
+                svga->memaddr_latch      = ((mystique->crtcext_regs[0] & CRTCX_R0_STARTADD_MASK) << 16) |
                                       (svga->crtc[0xc] << 8) | svga->crtc[0xd];
                 if ((mystique->pci_regs[0x41] & (OPTION_INTERLEAVE >> 8))) {
                     svga->rowoffset <<= 1;
-                    svga->ma_latch <<= 1;
+                    svga->memaddr_latch <<= 1;
                 }
 
                 if (!(mystique->type >= MGA_2164W))
-                    svga->ma_latch <<= 1;
+                    svga->memaddr_latch <<= 1;
 
-                if (svga->ma_latch != mystique->ma_latch_old) {
+                if (svga->memaddr_latch != mystique->ma_latch_old) {
                     if (svga->interlace && svga->oddeven)
-                        svga->maback = (svga->maback - (mystique->ma_latch_old << 2)) +
-                                       (svga->ma_latch << 2) + (svga->rowoffset << 1);
+                        svga->memaddr_backup = (svga->memaddr_backup - (mystique->ma_latch_old << 2)) +
+                                       (svga->memaddr_latch << 2) + (svga->rowoffset << 1);
                     else
-                        svga->maback = (svga->maback - (mystique->ma_latch_old << 2)) +
-                                       (svga->ma_latch << 2);
-                    mystique->ma_latch_old = svga->ma_latch;
+                        svga->memaddr_backup = (svga->memaddr_backup - (mystique->ma_latch_old << 2)) +
+                                       (svga->memaddr_latch << 2);
+                    mystique->ma_latch_old = svga->memaddr_latch;
                 }
             }
 
-           if (mystique->crtcext_idx == 4) {
+            if (mystique->crtcext_idx == 4) {
                 if (svga->gdcreg[6] & 0xc) {
                     /*64k banks*/
                     if (mystique->type >= MGA_2164W) {
@@ -815,6 +811,10 @@ mystique_out(uint16_t addr, uint8_t val, void *priv)
                     }
                 }
             }
+            if (!((mystique->type >= MGA_1064SG) && (mystique->crtcext_idx == 0) &&
+                (mystique->crtcext_regs[3] & CRTCX_R3_MGAMODE)))
+                svga_recalctimings(svga);
+
             break;
 
         default:
@@ -896,9 +896,9 @@ mystique_vblank_start(svga_t *svga)
     mystique_t *mystique = (mystique_t *) svga->priv;
 
     if (mystique->crtcext_regs[3] & CRTCX_R3_MGAMODE) {
-        svga->ma_latch      = ((mystique->crtcext_regs[0] & CRTCX_R0_STARTADD_MASK) << 16) | (svga->crtc[0xc] << 8) | svga->crtc[0xd];
+        svga->memaddr_latch      = ((mystique->crtcext_regs[0] & CRTCX_R0_STARTADD_MASK) << 16) | (svga->crtc[0xc] << 8) | svga->crtc[0xd];
         if (mystique->pci_regs[0x41] & (OPTION_INTERLEAVE >> 8))
-            svga->ma_latch <<= 1;
+            svga->memaddr_latch <<= 1;
     }
 }
 
@@ -944,7 +944,7 @@ mystique_recalctimings(svga_t *svga)
     if (mystique->crtcext_regs[1] & CRTCX_R1_HTOTAL8)
         svga->htotal |= 0x100;
 
-    svga->hblankstart    = (((mystique->crtcext_regs[1] & 0x02) >> 2) << 8) + svga->crtc[2] + 1;
+    svga->hblankstart    = (((mystique->crtcext_regs[1] & 0x02) >> 2) << 8) + svga->crtc[2];
 
     if (mystique->crtcext_regs[2] & CRTCX_R2_VTOTAL10)
         svga->vtotal |= 0x400;
@@ -985,29 +985,29 @@ mystique_recalctimings(svga_t *svga)
             svga->lut_map = !!(mystique->xmiscctrl & XMISCCTRL_RAMCS);
 
         if (mystique->type >= MGA_1064SG)
-            svga->ma_latch = ((mystique->crtcext_regs[0] & CRTCX_R0_STARTADD_MASK) << 16) | (svga->crtc[0xc] << 8) | svga->crtc[0xd];
+            svga->memaddr_latch = ((mystique->crtcext_regs[0] & CRTCX_R0_STARTADD_MASK) << 16) | (svga->crtc[0xc] << 8) | svga->crtc[0xd];
 
         if ((mystique->pci_regs[0x41] & (OPTION_INTERLEAVE >> 8))) {
             svga->rowoffset <<= 1;
             if (mystique->type >= MGA_1064SG)
-                svga->ma_latch <<= 1;
+                svga->memaddr_latch <<= 1;
         }
 
         if (mystique->type >= MGA_1064SG) {
             /*Mystique and later, unlike most SVGA cards, allows display start to take
               effect mid-screen*/
             if (!(mystique->type >= MGA_2164W))
-                svga->ma_latch <<= 1;
-            /* Only change maback so the new display start will take effect on the next
+                svga->memaddr_latch <<= 1;
+            /* Only change memaddr_backup so the new display start will take effect on the next
                horizontal retrace. */
-            if (svga->ma_latch != mystique->ma_latch_old) {
+            if (svga->memaddr_latch != mystique->ma_latch_old) {
                 if (svga->interlace && svga->oddeven)
-                    svga->maback = (svga->maback - (mystique->ma_latch_old << 2)) +
-                                   (svga->ma_latch << 2) + (svga->rowoffset << 1);
+                    svga->memaddr_backup = (svga->memaddr_backup - (mystique->ma_latch_old << 2)) +
+                                   (svga->memaddr_latch << 2) + (svga->rowoffset << 1);
                 else
-                    svga->maback = (svga->maback - (mystique->ma_latch_old << 2)) +
-                                   (svga->ma_latch << 2);
-                mystique->ma_latch_old = svga->ma_latch;
+                    svga->memaddr_backup = (svga->memaddr_backup - (mystique->ma_latch_old << 2)) +
+                                   (svga->memaddr_latch << 2);
+                mystique->ma_latch_old = svga->memaddr_latch;
             }
 
             if (!(mystique->type >= MGA_2164W))
@@ -1043,6 +1043,9 @@ mystique_recalctimings(svga_t *svga)
                 }
             } else {
                 switch (svga->bpp) {
+                    case 4:
+                        svga->render = svga_render_4bpp_highres;
+                        break;
                     case 8:
                         svga->render = svga_render_8bpp_highres;
                         break;
@@ -1062,6 +1065,9 @@ mystique_recalctimings(svga_t *svga)
             }
         } else {
             switch (svga->bpp) {
+                case 4:
+                    svga->render = svga_render_4bpp_highres;
+                    break;
                 case 8:
                     svga->render = svga_render_8bpp_highres;
                     break;
@@ -1105,6 +1111,7 @@ static void
 mystique_recalc_mapping(mystique_t *mystique)
 {
     svga_t *svga = &mystique->svga;
+    xga_t  *xga  = (xga_t *) svga->xga;
 
     io_removehandler(0x03c0, 0x0020, mystique_in, NULL, NULL, mystique_out, NULL, NULL, mystique);
     if ((mystique->pci_regs[PCI_REG_COMMAND] & PCI_COMMAND_IO) && (mystique->pci_regs[0x41] & 1))
@@ -1137,11 +1144,15 @@ mystique_recalc_mapping(mystique_t *mystique)
         switch (svga->gdcreg[6] & 0x0C) {
             case 0x0: /*128k at A0000*/
                 mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x20000);
-                svga->banked_mask = 0x1ffff;
+                svga->banked_mask = 0xffff;
                 break;
             case 0x4: /*64k at A0000*/
                 mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
                 svga->banked_mask = 0xffff;
+                if (xga_active && (svga->xga != NULL)) {
+                    xga->on = 0;
+                    mem_mapping_set_handler(&svga->mapping, svga->read, svga->readw, svga->readl, svga->write, svga->writew, svga->writel);
+                }
                 break;
             case 0x8: /*32k at B0000*/
                 mem_mapping_set_addr(&svga->mapping, 0xb0000, 0x08000);
@@ -1557,14 +1568,14 @@ mystique_ctrl_read_b(uint32_t addr, void *priv)
         switch (addr & 0x3fff) {
             case REG_FIFOSTATUS:
                 fifocount = FIFO_SIZE - FIFO_ENTRIES;
-                if (fifocount > 64)
-                    fifocount = 64;
+                if (fifocount > (mystique->type <= MGA_1064SG ? 32 : 64))
+                    fifocount = (mystique->type <= MGA_1064SG ? 32 : 64);
                 ret = fifocount;
                 break;
             case REG_FIFOSTATUS + 1:
                 if (FIFO_EMPTY)
                     ret |= 2;
-                else if (FIFO_ENTRIES >= 64)
+                else if (FIFO_ENTRIES >= (mystique->type <= MGA_1064SG ? 32 : 64))
                     ret |= 1;
                 break;
             case REG_FIFOSTATUS + 2:
@@ -1578,6 +1589,10 @@ mystique_ctrl_read_b(uint32_t addr, void *priv)
                     ret |= REG_STATUS_VSYNCSTS;
                 if (ret & 1)
                     mystique->softrap_status_read = 1;
+                if (mystique->softrap_status_read == 0 && !(ret & 1)) {
+                    mystique->softrap_status_read = 1;
+                    ret |= 1;
+                }
                 break;
             case REG_STATUS + 1:
                 ret = (mystique->status >> 8) & 0xff;
@@ -1585,7 +1600,7 @@ mystique_ctrl_read_b(uint32_t addr, void *priv)
             case REG_STATUS + 2:
                 ret = (mystique->status >> 16) & 0xff;
                 if (mystique->busy || ((mystique->blitter_submit_refcount + mystique->blitter_submit_dma_refcount) != mystique->blitter_complete_refcount) || !FIFO_EMPTY
-                || mystique->dma.state != DMA_STATE_IDLE || mystique->softrap_pending || mystique->endprdmasts_pending)
+                || mystique->dma.state != MGA_DMA_STATE_IDLE || mystique->softrap_pending || mystique->endprdmasts_pending)
                     ret |= (STATUS_DWGENGSTS >> 16);
                 break;
             case REG_STATUS + 3:
@@ -2164,7 +2179,7 @@ mystique_ctrl_write_b(uint32_t addr, uint8_t val, void *priv)
 
         case REG_OPMODE:
             thread_wait_mutex(mystique->dma.lock);
-            mystique->dma.state = DMA_STATE_IDLE; /* Interrupt DMA. */
+            mystique->dma.state = MGA_DMA_STATE_IDLE; /* Interrupt DMA. */
             thread_release_mutex(mystique->dma.lock);
             mystique->dmamod = (val >> 2) & 3;
             mystique_queue(mystique, addr & 0x3fff, val, FIFO_WRITE_CTRL_BYTE);
@@ -2185,10 +2200,10 @@ mystique_ctrl_write_b(uint32_t addr, uint8_t val, void *priv)
             thread_wait_mutex(mystique->dma.lock);
             WRITE8(addr, mystique->dma.primaddress, val);
             mystique->dma.pri_state = 0;
-            if (mystique->dma.state == DMA_STATE_IDLE && !(mystique->softrap_pending || mystique->endprdmasts_pending || !mystique->softrap_status_read)) {
+            if (mystique->dma.state == MGA_DMA_STATE_IDLE && !(mystique->softrap_pending || mystique->endprdmasts_pending || !mystique->softrap_status_read)) {
                 mystique->dma.words_expected = 0;
             }
-            mystique->dma.state = DMA_STATE_IDLE;
+            mystique->dma.state = MGA_DMA_STATE_IDLE;
             thread_release_mutex(mystique->dma.lock);
             break;
 
@@ -2225,7 +2240,7 @@ mystique_ctrl_write_b(uint32_t addr, uint8_t val, void *priv)
             thread_wait_mutex(mystique->dma.lock);
             mystique->dma.pri_state               = 0;
             mystique->dma.sec_state               = 0;
-            mystique->dma.state                   = DMA_STATE_IDLE;
+            mystique->dma.state                   = MGA_DMA_STATE_IDLE;
             mystique->dma.words_expected          = 0;
             thread_release_mutex(mystique->dma.lock);
             break;
@@ -2584,12 +2599,12 @@ mystique_accel_ctrl_write_l(uint32_t addr, uint32_t val, void *priv)
 
         case REG_SECEND:
             mystique->dma.secend = val;
-            if (mystique->dma.state != DMA_STATE_SEC && (mystique->dma.secaddress & DMA_ADDR_MASK) != (mystique->dma.secend & DMA_ADDR_MASK))
-                mystique->dma.state = DMA_STATE_SEC;
+            if (mystique->dma.state != MGA_DMA_STATE_SEC && (mystique->dma.secaddress & DMA_ADDR_MASK) != (mystique->dma.secend & DMA_ADDR_MASK))
+                mystique->dma.state = MGA_DMA_STATE_SEC;
             break;
 
         case REG_SOFTRAP:
-            mystique->dma.state           = DMA_STATE_IDLE;
+            mystique->dma.state           = MGA_DMA_STATE_IDLE;
             mystique->dma.pri_state       = 0;
             mystique->dma.words_expected  = 0;
             mystique->endprdmasts_pending = 1;
@@ -2668,11 +2683,11 @@ mystique_ctrl_write_l(uint32_t addr, uint32_t val, void *priv)
             thread_wait_mutex(mystique->dma.lock);
             mystique->dma.primend = val;
             //pclog("PRIMADDRESS = 0x%08X, PRIMEND = 0x%08X\n", mystique->dma.primaddress, mystique->dma.primend);
-            if (mystique->dma.state == DMA_STATE_IDLE && (mystique->dma.primaddress & DMA_ADDR_MASK) != (mystique->dma.primend & DMA_ADDR_MASK)) {
+            if (mystique->dma.state == MGA_DMA_STATE_IDLE && (mystique->dma.primaddress & DMA_ADDR_MASK) != (mystique->dma.primend & DMA_ADDR_MASK)) {
                 mystique->endprdmasts_pending = 0;
                 mystique->status &= ~STATUS_ENDPRDMASTS;
 
-                mystique->dma.state     = DMA_STATE_PRI;
+                mystique->dma.state     = MGA_DMA_STATE_PRI;
                 //mystique->dma.pri_state = 0;
                 wake_fifo_thread(mystique);
             }
@@ -2684,7 +2699,7 @@ mystique_ctrl_write_l(uint32_t addr, uint32_t val, void *priv)
             {
                 mystique->dma.primaddress = mystique->dma.primend;
                 mystique->endprdmasts_pending = 1;
-                mystique->dma.state = DMA_STATE_IDLE;
+                mystique->dma.state = MGA_DMA_STATE_IDLE;
             }
             thread_release_mutex(mystique->dma.lock);
             break;
@@ -2810,15 +2825,16 @@ static uint8_t
 mystique_readb_linear(uint32_t addr, void *priv)
 {
     const svga_t *svga = (svga_t *) priv;
-    mystique_t *mystique = (mystique_t *) svga->priv;
-
-    if (mystique->type < MGA_1064SG) {
-        if (!svga->fast)
-            return svga_read_linear(addr, priv);
-    }
 
     cycles -= svga->monitor->mon_video_timing_read_b;
 
+    if (!svga->fast) {
+        if (svga->chain2_read) {
+            addr &= ~1;
+            addr <<= 2;
+        }
+    }
+
     addr &= svga->decode_mask;
     if (addr >= svga->vram_max)
         return 0xff;
@@ -2858,17 +2874,16 @@ static void
 mystique_writeb_linear(uint32_t addr, uint8_t val, void *priv)
 {
     svga_t *svga = (svga_t *) priv;
-    mystique_t *mystique = (mystique_t *) svga->priv;
-
-    if (mystique->type < MGA_1064SG) {
-        if (!svga->fast) {
-            svga_write_linear(addr, val, priv);
-            return;
-        }
-    }
 
     cycles -= svga->monitor->mon_video_timing_write_b;
 
+    if (!svga->fast) {
+        if (svga->chain2_write) {
+            addr &= ~1;
+            addr <<= 2;
+        }
+    }
+
     addr &= svga->decode_mask;
     if (addr >= svga->vram_max)
         return;
@@ -2920,7 +2935,7 @@ run_dma(mystique_t *mystique)
         return;
     }
 
-    if (mystique->dma.state == DMA_STATE_IDLE) {
+    if (mystique->dma.state == MGA_DMA_STATE_IDLE) {
         if (!(mystique->status & STATUS_ENDPRDMASTS))
         {
             /* Force this to appear. */
@@ -2930,14 +2945,14 @@ run_dma(mystique_t *mystique)
         return;
     }
 
-    while (words_transferred < DMA_MAX_WORDS && mystique->dma.state != DMA_STATE_IDLE) {
+    while (words_transferred < DMA_MAX_WORDS && mystique->dma.state != MGA_DMA_STATE_IDLE) {
         switch (atomic_load(&mystique->dma.state)) {
-            case DMA_STATE_PRI:
+            case MGA_DMA_STATE_PRI:
                 switch (mystique->dma.primaddress & DMA_MODE_MASK) {
                     case DMA_MODE_REG:
                         if ((mystique->dma.primaddress & DMA_ADDR_MASK) == (mystique->dma.primend & DMA_ADDR_MASK)) {
                             mystique->endprdmasts_pending = 1;
-                            mystique->dma.state           = DMA_STATE_IDLE;
+                            mystique->dma.state           = MGA_DMA_STATE_IDLE;
                             break;
                         }
                         if (mystique->dma.pri_state == 0 && !mystique->dma.words_expected) {
@@ -2950,7 +2965,7 @@ run_dma(mystique_t *mystique)
 
                         if ((mystique->dma.primaddress & DMA_ADDR_MASK) == (mystique->dma.primend & DMA_ADDR_MASK)) {
                             mystique->endprdmasts_pending = 1;
-                            mystique->dma.state           = DMA_STATE_IDLE;
+                            mystique->dma.state           = MGA_DMA_STATE_IDLE;
                             break;
                         }
 
@@ -2985,31 +3000,31 @@ run_dma(mystique_t *mystique)
                         mystique->dma.pri_header >>= 8;
                         mystique->dma.pri_state = (mystique->dma.pri_state + 1) & 3;
 
-                        if (mystique->dma.state == DMA_STATE_SEC) {
+                        if (mystique->dma.state == MGA_DMA_STATE_SEC) {
                             mystique->dma.sec_state = 0;
                         }
                         else if ((mystique->dma.primaddress & DMA_ADDR_MASK) == (mystique->dma.primend & DMA_ADDR_MASK)) {
                             mystique->endprdmasts_pending = 1;
-                            mystique->dma.state           = DMA_STATE_IDLE;
+                            mystique->dma.state           = MGA_DMA_STATE_IDLE;
                         }
                         break;
 
                     default:
-                        fatal("DMA_STATE_PRI: mode %i\n", mystique->dma.primaddress & DMA_MODE_MASK);
+                        fatal("MGA_DMA_STATE_PRI: mode %i\n", mystique->dma.primaddress & DMA_MODE_MASK);
                 }
                 break;
 
-            case DMA_STATE_SEC:
+            case MGA_DMA_STATE_SEC:
                 switch (mystique->dma.secaddress & DMA_MODE_MASK) {
                     case DMA_MODE_REG:
                         if ((mystique->dma.secaddress & DMA_ADDR_MASK) >= (mystique->dma.secend & DMA_ADDR_MASK)) {
                             if ((mystique->dma.primaddress & DMA_ADDR_MASK) == (mystique->dma.primend & DMA_ADDR_MASK)) {
                                 mystique->endprdmasts_pending = 1;
-                                mystique->dma.state           = DMA_STATE_IDLE;
+                                mystique->dma.state           = MGA_DMA_STATE_IDLE;
                                 mystique->dma.pri_state       = 0;
                                 mystique->dma.words_expected  = 0;
                             } else {
-                                mystique->dma.state = DMA_STATE_PRI;
+                                mystique->dma.state = MGA_DMA_STATE_PRI;
                                 mystique->dma.words_expected = 0;
                                 mystique->dma.pri_state = 0;
                             }
@@ -3024,11 +3039,11 @@ run_dma(mystique_t *mystique)
                         if ((mystique->dma.secaddress & DMA_ADDR_MASK) >= (mystique->dma.secend & DMA_ADDR_MASK)) {
                             if ((mystique->dma.primaddress & DMA_ADDR_MASK) == (mystique->dma.primend & DMA_ADDR_MASK)) {
                                 mystique->endprdmasts_pending = 1;
-                                mystique->dma.state           = DMA_STATE_IDLE;
+                                mystique->dma.state           = MGA_DMA_STATE_IDLE;
                                 mystique->dma.pri_state       = 0;
                                 mystique->dma.words_expected  = 0;
                             } else {
-                                mystique->dma.state = DMA_STATE_PRI;
+                                mystique->dma.state = MGA_DMA_STATE_PRI;
                                 mystique->dma.words_expected = 0;
                                 mystique->dma.pri_state = 0;
                             }
@@ -3058,11 +3073,11 @@ run_dma(mystique_t *mystique)
                         if ((mystique->dma.secaddress & DMA_ADDR_MASK) >= (mystique->dma.secend & DMA_ADDR_MASK)) {
                             if ((mystique->dma.primaddress & DMA_ADDR_MASK) == (mystique->dma.primend & DMA_ADDR_MASK)) {
                                 mystique->endprdmasts_pending = 1;
-                                mystique->dma.state           = DMA_STATE_IDLE;
+                                mystique->dma.state           = MGA_DMA_STATE_IDLE;
                                 mystique->dma.pri_state       = 0;
                                 mystique->dma.words_expected  = 0;
                             } else {
-                                mystique->dma.state = DMA_STATE_PRI;
+                                mystique->dma.state = MGA_DMA_STATE_PRI;
                                 mystique->dma.words_expected = 0;
                                 mystique->dma.pri_state = 0;
                             }
@@ -3075,11 +3090,11 @@ run_dma(mystique_t *mystique)
                             if ((mystique->dma.secaddress & DMA_ADDR_MASK) >= (mystique->dma.secend & DMA_ADDR_MASK)) {
                                 if ((mystique->dma.primaddress & DMA_ADDR_MASK) == (mystique->dma.primend & DMA_ADDR_MASK)) {
                                     mystique->endprdmasts_pending = 1;
-                                    mystique->dma.state           = DMA_STATE_IDLE;
+                                    mystique->dma.state           = MGA_DMA_STATE_IDLE;
                                     mystique->dma.words_expected = 0;
                                     mystique->dma.pri_state = 0;
                                 } else {
-                                    mystique->dma.state = DMA_STATE_PRI;
+                                    mystique->dma.state = MGA_DMA_STATE_PRI;
                                     mystique->dma.words_expected = 0;
                                     mystique->dma.pri_state = 0;
                                 }
@@ -3095,11 +3110,11 @@ run_dma(mystique_t *mystique)
                             if ((mystique->dma.secaddress & DMA_ADDR_MASK) >= (mystique->dma.secend & DMA_ADDR_MASK)) {
                                 if ((mystique->dma.primaddress & DMA_ADDR_MASK) == (mystique->dma.primend & DMA_ADDR_MASK)) {
                                     mystique->endprdmasts_pending = 1;
-                                    mystique->dma.state           = DMA_STATE_IDLE;
+                                    mystique->dma.state           = MGA_DMA_STATE_IDLE;
                                     mystique->dma.words_expected = 0;
                                     mystique->dma.pri_state = 0;
                                 } else {
-                                    mystique->dma.state = DMA_STATE_PRI;
+                                    mystique->dma.state = MGA_DMA_STATE_PRI;
                                     mystique->dma.words_expected = 0;
                                     mystique->dma.pri_state = 0;
                                 }
@@ -3108,7 +3123,7 @@ run_dma(mystique_t *mystique)
                         break;
 
                     default:
-                        fatal("DMA_STATE_SEC: mode %i\n", mystique->dma.secaddress & DMA_MODE_MASK);
+                        fatal("MGA_DMA_STATE_SEC: mode %i\n", mystique->dma.secaddress & DMA_MODE_MASK);
                 }
                 break;
 
@@ -3130,7 +3145,7 @@ fifo_thread(void *priv)
         thread_wait_event(mystique->wake_fifo_thread, -1);
         thread_reset_event(mystique->wake_fifo_thread);
 
-        while (!FIFO_EMPTY || mystique->dma.state != DMA_STATE_IDLE) {
+        while (!FIFO_EMPTY || mystique->dma.state != MGA_DMA_STATE_IDLE) {
             int words_transferred = 0;
 
             while (!FIFO_EMPTY && words_transferred < 100) {
@@ -3577,6 +3592,12 @@ blit_fbitblt(mystique_t *mystique)
     mystique->blitter_complete_refcount++;
 }
 
+static uint8_t
+dither_24_to_8(int r, int g, int b)
+{
+    return ((b >> 6) & 3) | (((g >> 5) & 7) << 2) | (((r >> 5) & 7) << 5);
+}
+
 static void
 blit_iload_iload(mystique_t *mystique, uint32_t data, int size)
 {
@@ -3809,6 +3830,26 @@ blit_iload_iload(mystique_t *mystique, uint32_t data, int size)
                     while (size >= 24) {
                         if (mystique->dwgreg.xdst >= mystique->dwgreg.cxleft && mystique->dwgreg.xdst <= mystique->dwgreg.cxright && mystique->dwgreg.ydst_lin >= mystique->dwgreg.ytop && mystique->dwgreg.ydst_lin <= mystique->dwgreg.ybot) {
                             switch (mystique->maccess_running & MACCESS_PWIDTH_MASK) {
+                                case MACCESS_PWIDTH_16:
+                                {
+                                    dst = ((uint16_t *) svga->vram)[(mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask_w];
+
+                                    dst = bitop(dither(mystique, (data64 >> 16) & 0xFF, (data64 >> 8) & 0xFF, data64 & 0xFF, mystique->dwgreg.xdst & 1, mystique->dwgreg.selline & 1), dst, mystique->dwgreg.dwgctrl_running);
+
+                                    ((uint16_t *) svga->vram)[(mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask_w] = dst;
+                                    svga->changedvram[((mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask_w) >> 11] = changeframecount;
+                                    break;
+                                }
+                                case MACCESS_PWIDTH_8:
+                                {
+                                    dst = ((uint8_t *) svga->vram)[(mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask];
+
+                                    dst = bitop(dither_24_to_8((data64 >> 16) & 0xFF, (data64 >> 8) & 0xFF, data64 & 0xFF), dst, mystique->dwgreg.dwgctrl_running);
+
+                                    ((uint8_t *) svga->vram)[(mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask] = dst;
+                                    svga->changedvram[((mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask) >> 12] = changeframecount;
+                                    break;
+                                }
                                 case MACCESS_PWIDTH_32:
                                     dst = ((uint32_t *) svga->vram)[(mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask_l];
 
@@ -3852,11 +3893,36 @@ blit_iload_iload(mystique_t *mystique, uint32_t data, int size)
                         int draw = (!transc || (data & bltcmsk) != bltckey) && trans[mystique->dwgreg.xdst & 3];
 
                         if (mystique->dwgreg.xdst >= mystique->dwgreg.cxleft && mystique->dwgreg.xdst <= mystique->dwgreg.cxright && mystique->dwgreg.ydst_lin >= mystique->dwgreg.ytop && mystique->dwgreg.ydst_lin <= mystique->dwgreg.ybot && draw) {
-                            dst = ((uint32_t *) svga->vram)[(mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask_l];
+                            switch (mystique->maccess_running & MACCESS_PWIDTH_MASK) {
+                                case MACCESS_PWIDTH_16:
+                                {
+                                    dst = ((uint16_t *) svga->vram)[(mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask_w];
 
-                            dst                                                                                                    = bitop(data, dst, mystique->dwgreg.dwgctrl_running);
-                            ((uint32_t *) svga->vram)[(mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask_l] = dst;
-                            svga->changedvram[((mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask_l) >> 10] = changeframecount;
+                                    dst = bitop(dither(mystique, (data64 >> 16) & 0xFF, (data64 >> 8) & 0xFF, data64 & 0xFF, mystique->dwgreg.xdst & 1, mystique->dwgreg.selline & 1), dst, mystique->dwgreg.dwgctrl_running);
+
+                                    ((uint16_t *) svga->vram)[(mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask_w] = dst;
+                                    svga->changedvram[((mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask_w) >> 11] = changeframecount;
+                                    break;
+                                }
+                                case MACCESS_PWIDTH_8:
+                                {
+                                    dst = ((uint8_t *) svga->vram)[(mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask];
+
+                                    dst = bitop(dither_24_to_8((data64 >> 16) & 0xFF, (data64 >> 8) & 0xFF, data64 & 0xFF), dst, mystique->dwgreg.dwgctrl_running);
+
+                                    ((uint8_t *) svga->vram)[(mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask] = dst;
+                                    svga->changedvram[((mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask) >> 12] = changeframecount;
+                                    break;
+                                }
+                                default: {
+                                    dst = ((uint32_t *) svga->vram)[(mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask_l];
+
+                                    dst                                                                                                    = bitop(data, dst, mystique->dwgreg.dwgctrl_running);
+                                    ((uint32_t *) svga->vram)[(mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask_l] = dst;
+                                    svga->changedvram[((mystique->dwgreg.ydst_lin + mystique->dwgreg.xdst) & mystique->vram_mask_l) >> 10] = changeframecount;
+                                    break;
+                                }
+                            }
                         }
 
                         size = 0;
@@ -4316,15 +4382,20 @@ blit_line(mystique_t *mystique, int closed, int autoline)
     uint32_t old_dst;
     int      x = mystique->dwgreg.xdst;
     int      z_write;
+    int      pattern_x, pattern_y;
+    bool     transc = !!(mystique->dwgreg.dwgctrl_running & DWGCTRL_TRANSC);
 
     switch (mystique->dwgreg.dwgctrl_running & DWGCTRL_ATYPE_MASK) {
         case DWGCTRL_ATYPE_RSTR:
         case DWGCTRL_ATYPE_RPL:
             while (mystique->dwgreg.length >= 0) {
                 if (x >= mystique->dwgreg.cxleft && x <= mystique->dwgreg.cxright && mystique->dwgreg.ydst_lin >= mystique->dwgreg.ytop && mystique->dwgreg.ydst_lin <= mystique->dwgreg.ybot) {
+                    pattern_y = ((mystique->dwgreg.funcnt % (mystique->dwgreg.stylelen + 1)) >> 4) & 0x7;
+                    pattern_x = (mystique->dwgreg.funcnt % (mystique->dwgreg.stylelen + 1)) & 0xf;
+                    if (!transc || (transc && (mystique->dwgreg.pattern[pattern_y][pattern_x])))
                     switch (mystique->maccess_running & MACCESS_PWIDTH_MASK) {
                         case MACCESS_PWIDTH_8:
-                            src = mystique->dwgreg.fcol;
+                            src = mystique->dwgreg.pattern[pattern_y][pattern_x] ? mystique->dwgreg.fcol : mystique->dwgreg.bcol;
                             dst = svga->vram[(mystique->dwgreg.ydst_lin + x) & mystique->vram_mask];
 
                             dst                                                                              = bitop(src, dst, mystique->dwgreg.dwgctrl_running);
@@ -4341,7 +4412,7 @@ blit_line(mystique_t *mystique, int closed, int autoline)
                             break;
 
                         case MACCESS_PWIDTH_16:
-                            src = mystique->dwgreg.fcol;
+                            src = mystique->dwgreg.pattern[pattern_y][pattern_x] ? mystique->dwgreg.fcol : mystique->dwgreg.bcol;
                             dst = ((uint16_t *) svga->vram)[(mystique->dwgreg.ydst_lin + x) & mystique->vram_mask_w];
 
                             dst                                                                                = bitop(src, dst, mystique->dwgreg.dwgctrl_running);
@@ -4358,7 +4429,7 @@ blit_line(mystique_t *mystique, int closed, int autoline)
                             break;
 
                         case MACCESS_PWIDTH_24:
-                            src = mystique->dwgreg.fcol;
+                            src = mystique->dwgreg.pattern[pattern_y][pattern_x] ? mystique->dwgreg.fcol : mystique->dwgreg.bcol;
                             old_dst = *(uint32_t *) &svga->vram[((mystique->dwgreg.ydst_lin + x) * 3) & mystique->vram_mask];
 
                             dst                                                                                    = bitop(src, old_dst, mystique->dwgreg.dwgctrl_running);
@@ -4375,7 +4446,7 @@ blit_line(mystique_t *mystique, int closed, int autoline)
                             break;
 
                         case MACCESS_PWIDTH_32:
-                            src = mystique->dwgreg.fcol;
+                            src = mystique->dwgreg.pattern[pattern_y][pattern_x] ? mystique->dwgreg.fcol : mystique->dwgreg.bcol;
                             dst = ((uint32_t *) svga->vram)[(mystique->dwgreg.ydst_lin + x) & mystique->vram_mask_l];
 
                             dst                                                                                = bitop(src, dst, mystique->dwgreg.dwgctrl_running);
@@ -4418,6 +4489,7 @@ blit_line(mystique_t *mystique, int closed, int autoline)
                     mystique->dwgreg.err += mystique->dwgreg.k1;
 
                 mystique->dwgreg.length--;
+                mystique->dwgreg.funcnt--;
             }
             break;
 
@@ -4451,6 +4523,19 @@ blit_line(mystique_t *mystique, int closed, int autoline)
                         int b = 0;
 
                         switch (mystique->maccess_running & MACCESS_PWIDTH_MASK) {
+                            case MACCESS_PWIDTH_8:
+                                if (!(mystique->dwgreg.dr[4] & (1 << 23)))
+                                    r = (mystique->dwgreg.dr[4] >> 20) & 0x7;
+                                if (!(mystique->dwgreg.dr[8] & (1 << 23)))
+                                    g = (mystique->dwgreg.dr[8] >> 20) & 0x7;
+                                if (!(mystique->dwgreg.dr[12] & (1 << 23)))
+                                    b = (mystique->dwgreg.dr[12] >> 21) & 0x3;
+                                dst = (r << 5) | (g << 2) | b;
+
+                                ((uint8_t *) svga->vram)[(mystique->dwgreg.ydst_lin + x) & mystique->vram_mask] = dst;
+                                svga->changedvram[((mystique->dwgreg.ydst_lin + x) & mystique->vram_mask) >> 12] = changeframecount;
+                                break;
+
                             case MACCESS_PWIDTH_16:
                                 if (!(mystique->dwgreg.dr[4] & (1 << 23)))
                                     r = (mystique->dwgreg.dr[4] >> 18) & 0x1f;
@@ -4464,6 +4549,33 @@ blit_line(mystique_t *mystique, int closed, int autoline)
                                 svga->changedvram[((mystique->dwgreg.ydst_lin + x) & mystique->vram_mask_w) >> 11] = changeframecount;
                                 break;
 
+                            case MACCESS_PWIDTH_24:
+                                old_dst = *(uint32_t *) &svga->vram[((mystique->dwgreg.ydst_lin + x) * 3) & mystique->vram_mask];
+                                if (!(mystique->dwgreg.dr[4] & (1 << 23)))
+                                    r = (mystique->dwgreg.dr[4] >> 15) & 0xff;
+                                if (!(mystique->dwgreg.dr[8] & (1 << 23)))
+                                    g = (mystique->dwgreg.dr[8] >> 15) & 0xff;
+                                if (!(mystique->dwgreg.dr[12] & (1 << 23)))
+                                    b = (mystique->dwgreg.dr[12] >> 15) & 0xff;
+                                dst = (r << 16) | (g << 8) | b;
+
+                                ((uint32_t *) svga->vram)[((mystique->dwgreg.ydst_lin + x) * 3) & mystique->vram_mask] = dst | (old_dst & 0xFF000000);
+                                svga->changedvram[(((mystique->dwgreg.ydst_lin + x) * 3) & mystique->vram_mask) >> 12] = changeframecount;
+                                break;
+
+                            case MACCESS_PWIDTH_32:
+                                if (!(mystique->dwgreg.dr[4] & (1 << 23)))
+                                    r = (mystique->dwgreg.dr[4] >> 15) & 0xff;
+                                if (!(mystique->dwgreg.dr[8] & (1 << 23)))
+                                    g = (mystique->dwgreg.dr[8] >> 15) & 0xff;
+                                if (!(mystique->dwgreg.dr[12] & (1 << 23)))
+                                    b = (mystique->dwgreg.dr[12] >> 15) & 0xff;
+                                dst = (r << 16) | (g << 8) | b;
+
+                                ((uint32_t *) svga->vram)[(mystique->dwgreg.ydst_lin + x) & mystique->vram_mask_l] = dst;
+                                svga->changedvram[((mystique->dwgreg.ydst_lin + x) & mystique->vram_mask_l) >> 10] = changeframecount;
+                                break;
+
                             default:
                                 fatal("LINE I/ZI PWIDTH %x %08x\n", mystique->maccess_running & MACCESS_PWIDTH_MASK, mystique->dwgreg.dwgctrl_running);
                         }
@@ -4578,6 +4690,7 @@ blit_trap(mystique_t *mystique)
     int       err_l = (int32_t)mystique->dwgreg.ar[1];
     int       err_r = (int32_t)mystique->dwgreg.ar[4];
     const int trans_sel = (mystique->dwgreg.dwgctrl_running & DWGCTRL_TRANS_MASK) >> DWGCTRL_TRANS_SHIFT;
+    bool transc = !!(mystique->dwgreg.dwgctrl_running & DWGCTRL_TRANSC);
 
     switch (mystique->dwgreg.dwgctrl_running & DWGCTRL_ATYPE_MASK) {
         case DWGCTRL_ATYPE_BLK:
@@ -4600,6 +4713,7 @@ blit_trap(mystique_t *mystique)
                         int      pattern = mystique->dwgreg.pattern[yoff][xoff];
                         uint32_t dst;
 
+                        if (!transc || (transc && pattern))
                         switch (mystique->maccess_running & MACCESS_PWIDTH_MASK) {
                             case MACCESS_PWIDTH_8:
                                 svga->vram[(mystique->dwgreg.ydst_lin + x_l) & mystique->vram_mask]                = (pattern ? mystique->dwgreg.fcol : mystique->dwgreg.bcol) & 0xff;
@@ -4671,6 +4785,7 @@ blit_trap(mystique_t *mystique)
                         uint32_t dst;
                         uint32_t old_dst;
 
+                        if (!transc || (transc && pattern))
                         switch (mystique->maccess_running & MACCESS_PWIDTH_MASK) {
                             case MACCESS_PWIDTH_8:
                                 dst = svga->vram[(mystique->dwgreg.ydst_lin + x_l) & mystique->vram_mask];
@@ -5005,8 +5120,8 @@ texture_read(mystique_t *mystique, int *tex_r, int *tex_g, int *tex_b, int *atra
 
         s = (int32_t) mystique->dwgreg.tmr[6] >> s_shift;
         t = (int32_t) mystique->dwgreg.tmr[7] >> t_shift;
-        s_frac = (((int32_t) mystique->dwgreg.tmr[6] >> s_shift) & ((1 << s_shift) - 1)) / (double)(1 << s_shift);
-        t_frac = (((int32_t) mystique->dwgreg.tmr[7] >> t_shift) & ((1 << t_shift) - 1)) / (double)(1 << t_shift);
+        s_frac = (((int32_t) mystique->dwgreg.tmr[6]) & ((1 << s_shift) - 1)) / (double)(1 << s_shift);
+        t_frac = (((int32_t) mystique->dwgreg.tmr[7]) & ((1 << t_shift) - 1)) / (double)(1 << t_shift);
     } else {
         const int s_shift = (20 + 16) - (mystique->dwgreg.texwidth & TEXWIDTH_TW_MASK);
         const int t_shift = (20 + 16) - (mystique->dwgreg.texheight & TEXHEIGHT_TH_MASK);
@@ -5015,7 +5130,7 @@ texture_read(mystique_t *mystique, int *tex_r, int *tex_g, int *tex_b, int *atra
         s = ((int64_t) (int32_t) mystique->dwgreg.tmr[6] * q) >> s_shift;
         t = ((int64_t) (int32_t) mystique->dwgreg.tmr[7] * q) >> t_shift;
         s_frac = (((int64_t) (int32_t) mystique->dwgreg.tmr[6] * q) & ((1 << s_shift) - 1)) / (double)(1 << s_shift);
-        t_frac = (((int64_t) (int32_t) mystique->dwgreg.tmr[6] * q) & ((1 << t_shift) - 1)) / (double)(1 << t_shift);
+        t_frac = (((int64_t) (int32_t) mystique->dwgreg.tmr[7] * q) & ((1 << t_shift) - 1)) / (double)(1 << t_shift);
     }
 
     if (mystique->dwgreg.texctl & TEXCTL_CLAMPU) {
@@ -5227,6 +5342,15 @@ blit_texture_trap(mystique_t *mystique)
                                     }
                                     break;
 
+                                case (TEXCTL_STRANS | TEXCTL_ITRANS | TEXCTL_DECALCKEY):
+                                    if (!ctransp)
+                                        goto skip_pixel;
+
+                                    tex_r = i_r;
+                                    tex_g = i_g;
+                                    tex_b = i_b;
+                                    break;
+
                                 default:
                                     fatal("Bad TEXCTL %08x %08x\n", mystique->dwgreg.texctl, mystique->dwgreg.texctl & (TEXCTL_TMODULATE | TEXCTL_STRANS | TEXCTL_ITRANS | TEXCTL_DECALCKEY));
                             }
@@ -5366,6 +5490,19 @@ blit_bitblt(mystique_t *mystique)
     int16_t   x_start   = mystique->dwgreg.sgn.scanleft ? mystique->dwgreg.fxright : mystique->dwgreg.fxleft;
     int16_t   x_end     = mystique->dwgreg.sgn.scanleft ? mystique->dwgreg.fxleft : mystique->dwgreg.fxright;
     const int trans_sel = (mystique->dwgreg.dwgctrl_running & DWGCTRL_TRANS_MASK) >> DWGCTRL_TRANS_SHIFT;
+    uint32_t  bltckey   = mystique->dwgreg.fcol;
+    uint32_t  bltcmsk   = mystique->dwgreg.bcol;
+
+    switch (mystique->maccess_running & MACCESS_PWIDTH_MASK) {
+        case MACCESS_PWIDTH_8:
+            bltckey &= 0xff;
+            bltcmsk &= 0xff;
+            break;
+        case MACCESS_PWIDTH_16:
+            bltckey &= 0xffff;
+            bltcmsk &= 0xffff;
+            break;
+    }
 
     switch (mystique->dwgreg.dwgctrl_running & DWGCTRL_ATYPE_MASK) {
         case DWGCTRL_ATYPE_BLK:
@@ -5430,6 +5567,7 @@ blit_bitblt(mystique_t *mystique)
                                 mystique->dwgreg.ar[0] += mystique->dwgreg.ar[5];
                                 mystique->dwgreg.ar[3] += mystique->dwgreg.ar[5];
                                 src_addr = mystique->dwgreg.ar[3];
+                                break;
                             } else
                                 src_addr += x_dir;
 
@@ -5477,6 +5615,92 @@ blit_bitblt(mystique_t *mystique)
             }
         case DWGCTRL_ATYPE_RSTR:
             switch (mystique->dwgreg.dwgctrl_running & DWGCTRL_BLTMOD_MASK) {
+                /* TODO: This isn't exactly perfect. */
+                case DWGCTRL_BLTMOD_BPLAN:
+                    if (mystique->dwgreg.dwgctrl_running & DWGCTRL_PATTERN)
+                        fatal("BITBLT RPL/RSTR BPLAN with pattern\n");
+
+                    src_addr = mystique->dwgreg.ar[3];
+
+                    for (y = 0; y < mystique->dwgreg.length; y++) {
+                        uint8_t const *const trans = &trans_masks[trans_sel][(mystique->dwgreg.selline & 3) * 4];
+                        int16_t              x     = x_start;
+
+                        while (1) {
+                            uint32_t byte_addr = src_addr & mystique->vram_mask;
+
+                            if (x >= mystique->dwgreg.cxleft && x <= mystique->dwgreg.cxright && mystique->dwgreg.ydst_lin >= mystique->dwgreg.ytop && mystique->dwgreg.ydst_lin <= mystique->dwgreg.ybot && ((svga->vram[byte_addr] & 1) || !(mystique->dwgreg.dwgctrl_running & DWGCTRL_TRANSC)) && trans[x & 3]) {
+                                uint32_t src = (svga->vram[byte_addr] & 1) ? mystique->dwgreg.fcol : mystique->dwgreg.bcol;
+                                uint32_t dst;
+                                uint32_t old_dst;
+
+                                switch (mystique->maccess_running & MACCESS_PWIDTH_MASK) {
+                                    case MACCESS_PWIDTH_8:
+                                        dst = svga->vram[(mystique->dwgreg.ydst_lin + x) & mystique->vram_mask];
+
+                                        dst = bitop(src, dst, mystique->dwgreg.dwgctrl_running);
+
+                                        svga->vram[(mystique->dwgreg.ydst_lin + x) & mystique->vram_mask]                = dst;
+                                        svga->changedvram[((mystique->dwgreg.ydst_lin + x) & mystique->vram_mask) >> 12] = changeframecount;
+                                        break;
+
+                                    case MACCESS_PWIDTH_16:
+                                        dst = ((uint16_t *) svga->vram)[(mystique->dwgreg.ydst_lin + x) & mystique->vram_mask_w];
+
+                                        dst = bitop(src, dst, mystique->dwgreg.dwgctrl_running);
+
+                                        ((uint16_t *) svga->vram)[(mystique->dwgreg.ydst_lin + x) & mystique->vram_mask_w] = dst;
+                                        svga->changedvram[((mystique->dwgreg.ydst_lin + x) & mystique->vram_mask_w) >> 11] = changeframecount;
+                                        break;
+
+                                    case MACCESS_PWIDTH_24:
+                                        old_dst = *(uint32_t *) &svga->vram[((mystique->dwgreg.ydst_lin + x) * 3) & mystique->vram_mask];
+
+                                        dst = bitop(src, old_dst, mystique->dwgreg.dwgctrl_running); // & DWGCTRL_BOP_MASK
+
+                                        *(uint32_t *) &svga->vram[((mystique->dwgreg.ydst_lin + x) * 3) & mystique->vram_mask] = (dst & 0xffffff) | (old_dst & 0xff000000);
+                                        svga->changedvram[(((mystique->dwgreg.ydst_lin + x) * 3) & mystique->vram_mask) >> 12] = changeframecount;
+                                        break;
+
+                                    case MACCESS_PWIDTH_32:
+                                        dst = ((uint32_t *) svga->vram)[(mystique->dwgreg.ydst_lin + x) & mystique->vram_mask_l];
+
+                                        dst = bitop(src, dst, mystique->dwgreg.dwgctrl_running);
+
+                                        ((uint32_t *) svga->vram)[(mystique->dwgreg.ydst_lin + x) & mystique->vram_mask_l] = dst;
+                                        svga->changedvram[((mystique->dwgreg.ydst_lin + x) & mystique->vram_mask_l) >> 10] = changeframecount;
+                                        break;
+
+                                    default:
+                                        fatal("BITBLT RPL BPLAN PWIDTH %x %08x\n", mystique->maccess_running & MACCESS_PWIDTH_MASK, mystique->dwgreg.dwgctrl_running);
+                                }
+                            }
+
+                            if (src_addr == mystique->dwgreg.ar[0]) {
+                                mystique->dwgreg.ar[0] += mystique->dwgreg.ar[5];
+                                mystique->dwgreg.ar[3] += mystique->dwgreg.ar[5];
+                                src_addr = mystique->dwgreg.ar[3];
+                                break;
+                            } else
+                                src_addr += x_dir;
+
+                            if (x != x_end)  {
+                                if ((x > x_end) && (x_dir == 1))
+                                    x--;
+                                else if ((x < x_end) && (x_dir == -1))
+                                    x++;
+                                else
+                                    x += x_dir;
+                            } else
+                                break;
+                        }
+
+                        if (mystique->dwgreg.sgn.sdy)
+                            mystique->dwgreg.ydst_lin -= (mystique->dwgreg.pitch & PITCH_MASK);
+                        else
+                            mystique->dwgreg.ydst_lin += (mystique->dwgreg.pitch & PITCH_MASK);
+                    }
+                    break;
                 case DWGCTRL_BLTMOD_BMONOLEF:
                 case DWGCTRL_BLTMOD_BMONOWF:
                     if (mystique->dwgreg.dwgctrl_running & DWGCTRL_PATTERN)
@@ -5543,6 +5767,7 @@ blit_bitblt(mystique_t *mystique)
                                 mystique->dwgreg.ar[0] += mystique->dwgreg.ar[5];
                                 mystique->dwgreg.ar[3] += mystique->dwgreg.ar[5];
                                 src_addr = mystique->dwgreg.ar[3];
+                                break;
                             } else
                                 src_addr += x_dir;
 
@@ -5583,6 +5808,8 @@ blit_bitblt(mystique_t *mystique)
                                     case MACCESS_PWIDTH_8:
                                         src = svga->vram[src_addr & mystique->vram_mask];
                                         dst = svga->vram[(mystique->dwgreg.ydst_lin + x) & mystique->vram_mask];
+                                        if (!((!(mystique->dwgreg.dwgctrl_running & DWGCTRL_TRANSC) || (src & bltcmsk) != bltckey)))
+                                            break;
 
                                         dst = bitop(src, dst, mystique->dwgreg.dwgctrl_running);
 
@@ -5593,6 +5820,8 @@ blit_bitblt(mystique_t *mystique)
                                     case MACCESS_PWIDTH_16:
                                         src = ((uint16_t *) svga->vram)[src_addr & mystique->vram_mask_w];
                                         dst = ((uint16_t *) svga->vram)[(mystique->dwgreg.ydst_lin + x) & mystique->vram_mask_w];
+                                        if (!((!(mystique->dwgreg.dwgctrl_running & DWGCTRL_TRANSC) || (src & bltcmsk) != bltckey)))
+                                            break;
 
                                         dst = bitop(src, dst, mystique->dwgreg.dwgctrl_running);
 
@@ -5603,6 +5832,8 @@ blit_bitblt(mystique_t *mystique)
                                     case MACCESS_PWIDTH_24:
                                         src     = *(uint32_t *) &svga->vram[(src_addr * 3) & mystique->vram_mask];
                                         old_dst = *(uint32_t *) &svga->vram[((mystique->dwgreg.ydst_lin + x) * 3) & mystique->vram_mask];
+                                        if (!((!(mystique->dwgreg.dwgctrl_running & DWGCTRL_TRANSC) || (src & bltcmsk) != bltckey)))
+                                            break;
 
                                         dst = bitop(src, old_dst, mystique->dwgreg.dwgctrl_running);
 
@@ -5613,6 +5844,8 @@ blit_bitblt(mystique_t *mystique)
                                     case MACCESS_PWIDTH_32:
                                         src = ((uint32_t *) svga->vram)[src_addr & mystique->vram_mask_l];
                                         dst = ((uint32_t *) svga->vram)[(mystique->dwgreg.ydst_lin + x) & mystique->vram_mask_l];
+                                        if (!((!(mystique->dwgreg.dwgctrl_running & DWGCTRL_TRANSC) || (src & bltcmsk) != bltckey)))
+                                            break;
 
                                         dst = bitop(src, dst, mystique->dwgreg.dwgctrl_running);
 
@@ -5631,6 +5864,7 @@ blit_bitblt(mystique_t *mystique)
                                 mystique->dwgreg.ar[0] += mystique->dwgreg.ar[5];
                                 mystique->dwgreg.ar[3] += mystique->dwgreg.ar[5];
                                 src_addr = mystique->dwgreg.ar[3];
+                                break;
                             } else
                                 src_addr += x_dir;
 
@@ -5825,9 +6059,14 @@ blit_iload_highv(mystique_t *mystique)
 static void
 mystique_start_blit(mystique_t *mystique)
 {
+    svga_t *svga = &mystique->svga;
     uint64_t start_time = plat_timer_read();
     uint64_t end_time;
 
+    /*Make sure we don't get any artifacts.*/
+    svga->chain2_write = 0;
+    svga->chain2_read = 0;
+
     mystique->dwgreg.dwgctrl_running = mystique->dwgreg.dwgctrl;
     mystique->maccess_running        = mystique->maccess;
 
@@ -5914,9 +6153,20 @@ mystique_hwcursor_draw(svga_t *svga, int displine)
         case XCURCTRL_CURMODE_XGA:
             for (uint8_t x = 0; x < 64; x++) {
                 if (!(dat[1] & (1ULL << 63)))
-                    svga->monitor->target_buffer->line[displine][offset + svga->x_add] = (dat[0] & (1ULL << 63)) ? svga_lookup_lut_ram(svga, mystique->cursor.col[1]) : svga_lookup_lut_ram(svga, mystique->cursor.col[0]);
+                    svga->monitor->target_buffer->line[displine][(offset + svga->x_add) & 2047] = (dat[0] & (1ULL << 63)) ? svga_lookup_lut_ram(svga, mystique->cursor.col[1]) : svga_lookup_lut_ram(svga, mystique->cursor.col[0]);
                 else if (dat[0] & (1ULL << 63))
-                    svga->monitor->target_buffer->line[displine][offset + svga->x_add] ^= 0xffffff;
+                    svga->monitor->target_buffer->line[displine][(offset + svga->x_add) & 2047] ^= 0xffffff;
+
+                offset++;
+                dat[0] <<= 1;
+                dat[1] <<= 1;
+            }
+            break;
+
+        case XCURCTRL_CURMODE_XWIN:
+            for (uint8_t x = 0; x < 64; x++) {
+                if ((dat[1] & (1ULL << 63)))
+                    svga->monitor->target_buffer->line[displine][(offset + svga->x_add) & 2047] = (dat[0] & (1ULL << 63)) ? (mystique->cursor.col[1]) : (mystique->cursor.col[0]);
 
                 offset++;
                 dat[0] <<= 1;
@@ -5933,7 +6183,7 @@ mystique_hwcursor_draw(svga_t *svga, int displine)
 }
 
 static uint8_t
-mystique_tvp3026_gpio_read(uint8_t cntl, void *priv)
+mystique_tvp3026_gpio_read(UNUSED(uint8_t cntl), void *priv)
 {
     mystique_t *mystique = (mystique_t *) priv;
 
@@ -5959,15 +6209,6 @@ mystique_pci_read(UNUSED(int func), int addr, void *priv)
     mystique_t *mystique = (mystique_t *) priv;
     uint8_t     ret      = 0x00;
 
-    if (mystique->type >= MGA_1164SG)
-    {
-        /* Mystique 220, Millennium II and later Matrox cards swap MGABASE1 and 2. */
-        if (addr >= 0x10 && addr <= 0x13)
-            addr += 0x4;
-        else if (addr >= 0x14 && addr <= 0x17)
-            addr -= 0x4;
-    }
-
     if ((addr >= 0x30) && (addr <= 0x33) && !(mystique->pci_regs[0x43] & 0x40))
         ret = 0x00;
     else
@@ -6022,25 +6263,46 @@ mystique_pci_read(UNUSED(int func), int addr, void *priv)
 
             case 0x10:
                 ret = 0x00;
-                break; /*Control aperture*/
+                break; /*Control aperture for Millennium and Mystique, LFB for Mystique 220 and later*/
             case 0x11:
-                ret = (mystique->ctrl_base >> 8) & 0xc0;
+                if (mystique->type >= MGA_1164SG)
+                    ret = 0x00;
+                else
+                    ret = (mystique->ctrl_base >> 8) & 0xc0;
                 break;
             case 0x12:
-                ret = mystique->ctrl_base >> 16;
+                if (mystique->type >= MGA_1164SG)
+                    ret = (mystique->type >= MGA_2164W) ? 0x00 : ((mystique->lfb_base >> 16) & 0x80);
+                else
+                    ret = mystique->ctrl_base >> 16;
                 break;
             case 0x13:
-                ret = mystique->ctrl_base >> 24;
+                if (mystique->type >= MGA_1164SG)
+                    ret = mystique->lfb_base >> 24;
+                else
+                    ret = mystique->ctrl_base >> 24;
                 break;
 
             case 0x14:
                 ret = 0x00;
-                break; /*Linear frame buffer*/
+                break; /*LFB for Millennium and Mystique, Control aperture for Mystique 220 and later*/
+            case 0x15:
+                if (mystique->type >= MGA_1164SG)
+                    ret = (mystique->ctrl_base >> 8) & 0xc0;
+                else
+                    ret = 0x00;
+                break;
             case 0x16:
-                ret = (mystique->type >= MGA_2164W) ? 0x00 : ((mystique->lfb_base >> 16) & 0x80);
+                if (mystique->type >= MGA_1164SG)
+                    ret = mystique->ctrl_base >> 16;
+                else
+                    ret = (mystique->lfb_base >> 16) & 0x80;
                 break;
             case 0x17:
-                ret = mystique->lfb_base >> 24;
+                if (mystique->type >= MGA_1164SG)
+                    ret = mystique->ctrl_base >> 24;
+                else
+                    ret = mystique->lfb_base >> 24;
                 break;
 
             case 0x18:
@@ -6080,7 +6342,7 @@ mystique_pci_read(UNUSED(int func), int addr, void *priv)
                 break;
 
             case 0x34:
-                ret = mystique->type == MGA_G100 ? 0xdc : 0x00;
+                ret = (mystique->type == MGA_G100) ? 0xdc : 0x00;
                 break;
 
             case 0x3c:
@@ -6183,15 +6445,6 @@ mystique_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
 {
     mystique_t *mystique = (mystique_t *) priv;
 
-    if (mystique->type >= MGA_1164SG)
-    {
-        /* Mystique 220, Millennium II and later Matrox cards swap MGABASE1 and 2. */
-        if (addr >= 0x10 && addr <= 0x13)
-            addr += 0x4;
-        else if (addr >= 0x14 && addr <= 0x17)
-            addr -= 0x4;
-    }
-
     switch (addr) {
         case PCI_REG_COMMAND:
             mystique->pci_regs[PCI_REG_COMMAND] = (val & 0x27) | 0x80;
@@ -6207,27 +6460,61 @@ mystique_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
             break;
 
         case 0x11:
-            mystique->ctrl_base = (mystique->ctrl_base & 0xffff0000) | ((val & 0xc0) << 8);
-            mystique_recalc_mapping(mystique);
+            if (mystique->type >= MGA_1164SG)
+                break;
+            else {
+                mystique->ctrl_base = (mystique->ctrl_base & 0xffff0000) | ((val & 0xc0) << 8);
+                mystique_recalc_mapping(mystique);
+            }
             break;
         case 0x12:
-            mystique->ctrl_base = (mystique->ctrl_base & 0xff00c000) | (val << 16);
-            mystique_recalc_mapping(mystique);
+            if (mystique->type >= MGA_1164SG) {
+                if (mystique->type >= MGA_2164W)
+                    break;
+                mystique->lfb_base = (mystique->lfb_base & 0xff000000) | ((val & 0x80) << 16);
+                mystique_recalc_mapping(mystique);
+            } else {
+                mystique->ctrl_base = (mystique->ctrl_base & 0xff00c000) | (val << 16);
+                mystique_recalc_mapping(mystique);
+            }
             break;
         case 0x13:
-            mystique->ctrl_base = (mystique->ctrl_base & 0x00ffc000) | (val << 24);
-            mystique_recalc_mapping(mystique);
+            if (mystique->type >= MGA_1164SG) {
+                if (mystique->type >= MGA_2164W)
+                    mystique->lfb_base = val << 24;
+                else
+                    mystique->lfb_base = (mystique->lfb_base & 0x00800000) | (val << 24);
+
+                mystique_recalc_mapping(mystique);
+            } else {
+                mystique->ctrl_base = (mystique->ctrl_base & 0x00ffc000) | (val << 24);
+                mystique_recalc_mapping(mystique);
+            }
             break;
 
+        case 0x15:
+            if (mystique->type >= MGA_1164SG) {
+                mystique->ctrl_base = (mystique->ctrl_base & 0xffff0000) | ((val & 0xc0) << 8);
+                mystique_recalc_mapping(mystique);
+            }
+            break;
         case 0x16:
-            if (mystique->type >= MGA_2164W)
-                break;
-            mystique->lfb_base = (mystique->lfb_base & 0xff000000) | ((val & 0x80) << 16);
-            mystique_recalc_mapping(mystique);
+            if (mystique->type >= MGA_1164SG) {
+                mystique->ctrl_base = (mystique->ctrl_base & 0xff00c000) | (val << 16);
+                mystique_recalc_mapping(mystique);
+            } else {
+                mystique->lfb_base = (mystique->lfb_base & 0xff000000) | ((val & 0x80) << 16);
+                mystique_recalc_mapping(mystique);
+            }
             break;
         case 0x17:
-            mystique->lfb_base = (mystique->lfb_base & ((mystique->type >= MGA_2164W) ? 0x00000000 : 0x00800000)) | (val << 24);
-            mystique_recalc_mapping(mystique);
+            if (mystique->type >= MGA_1164SG) {
+                mystique->ctrl_base = (mystique->ctrl_base & 0x00ffc000) | (val << 24);
+                mystique_recalc_mapping(mystique);
+            } else {
+                mystique->lfb_base = (mystique->lfb_base & 0x00800000) | (val << 24);
+                mystique_recalc_mapping(mystique);
+            }
             break;
 
         case 0x1a:
@@ -6247,9 +6534,10 @@ mystique_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
             mystique->pci_regs[addr] = val;
             if (addr == 0x30)
                 mystique->pci_regs[addr] &= 1;
+
             if (mystique->pci_regs[0x30] & 0x01) {
-                uint32_t addr = (mystique->pci_regs[0x32] << 16) | (mystique->pci_regs[0x33] << 24);
-                mem_mapping_set_addr(&mystique->bios_rom.mapping, addr, (mystique->type == MGA_G100) ? 0x10000 : 0x8000);
+                uint32_t biosaddr = (mystique->pci_regs[0x32] << 16) | (mystique->pci_regs[0x33] << 24);
+                mem_mapping_set_addr(&mystique->bios_rom.mapping, biosaddr, (mystique->type == MGA_G100) ? 0x10000 : 0x8000);
             } else
                 mem_mapping_disable(&mystique->bios_rom.mapping);
             return;
@@ -6259,26 +6547,24 @@ mystique_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
             return;
 
         case 0x40:
-            mystique->pci_regs[addr] = val & 0x3f;
+            mystique->pci_regs[0x40] = val & 0x3f;
             break;
         case 0x41:
-            mystique->pci_regs[addr] = val;
+            mystique->pci_regs[0x41] = val;
             break;
         case 0x42:
-            mystique->pci_regs[addr] = val & 0x1f;
+            mystique->pci_regs[0x42] = val & 0x1f;
             break;
         case 0x43:
-            mystique->pci_regs[addr] = val;
-            if (addr == 0x43) {
-                if (val & 0x40) {
-                    if (mystique->pci_regs[0x30] & 0x01) {
-                        uint32_t addr = (mystique->pci_regs[0x32] << 16) | (mystique->pci_regs[0x33] << 24);
-                        mem_mapping_set_addr(&mystique->bios_rom.mapping, addr, (mystique->type == MGA_G100) ? 0x10000 : 0x8000);
-                    } else
-                        mem_mapping_disable(&mystique->bios_rom.mapping);
+            mystique->pci_regs[0x43] = val;
+            if (val & 0x40) {
+                if (mystique->pci_regs[0x30] & 0x01) {
+                    uint32_t biosaddr = (mystique->pci_regs[0x32] << 16) | (mystique->pci_regs[0x33] << 24);
+                    mem_mapping_set_addr(&mystique->bios_rom.mapping, biosaddr, (mystique->type == MGA_G100) ? 0x10000 : 0x8000);
                 } else
-                    mem_mapping_set_addr(&mystique->bios_rom.mapping, 0x000c0000, (mystique->type == MGA_G100) ? 0x10000 : 0x8000);
-            }
+                    mem_mapping_disable(&mystique->bios_rom.mapping);
+            } else
+                mem_mapping_set_addr(&mystique->bios_rom.mapping, 0x000c0000, (mystique->type == MGA_G100) ? 0x10000 : 0x8000);
             break;
 
         case 0x4c:
@@ -6306,17 +6592,17 @@ mystique_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
             mystique_ctrl_write_b(addr, val, mystique);
             break;
 
-            case 0xf8:
-                mystique->pci_regs[0xf8] = val & 0x7;
-                break;
+        case 0xf8:
+            mystique->pci_regs[0xf8] = val & 0x7;
+            break;
 
-            case 0xf9:
-                mystique->pci_regs[0xf9] = val & 0x3;
-                break;
+        case 0xf9:
+            mystique->pci_regs[0xf9] = val & 0x3;
+            break;
 
-            case 0xfb:
-                mystique->pci_regs[0xfb] = val;
-                break;
+        case 0xfb:
+            mystique->pci_regs[0xfb] = val;
+            break;
 
         default:
             break;
@@ -6401,8 +6687,9 @@ mystique_init(const device_t *info)
         mystique->svga.clock_gen         = mystique->svga.ramdac;
         mystique->svga.getclock          = tvp3026_getclock;
         mystique->svga.conv_16to32       = tvp3026_conv_16to32;
-        if (mystique->vram_size >= 16)
-            mystique->svga.decode_mask = mystique->svga.vram_mask;
+        if (mystique->type == MGA_2164W)
+            mystique->svga.decode_mask = 0xffffff;
+
         tvp3026_gpio(mystique_tvp3026_gpio_read, mystique_tvp3026_gpio_write, mystique, mystique->svga.ramdac);
     } else {
         video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_matrox_mystique);
@@ -6413,8 +6700,8 @@ mystique_init(const device_t *info)
                   NULL);
         mystique->svga.clock_gen = mystique;
         mystique->svga.getclock  = mystique_getclock;
-        if (mystique->vram_size >= 16)
-            mystique->svga.decode_mask = mystique->svga.vram_mask;
+        if (mystique->type == MGA_G100)
+            mystique->svga.decode_mask = 0xffffff;
     }
 
     io_sethandler(0x03c0, 0x0020, mystique_in, NULL, NULL, mystique_out, NULL, NULL, mystique);
@@ -6547,11 +6834,13 @@ millennium_ii_available(void)
     return rom_present(ROM_MILLENNIUM_II);
 }
 
+#ifdef USE_G100
 static int
 matrox_g100_available(void)
 {
     return rom_present(ROM_G100);
 }
+#endif
 
 static void
 mystique_speed_changed(void *priv)
@@ -6572,64 +6861,44 @@ mystique_force_redraw(void *priv)
 static const device_config_t mystique_config[] = {
   // clang-format off
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .selection =
-        {
-            {
-                .description = "2 MB",
-                .value = 2
-            },
-            {
-                .description = "4 MB",
-                .value = 4
-            },
-            {
-                .description = "8 MB",
-                .value = 8
-            },
-            {
-                .description = ""
-            }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 8,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "2 MB", .value = 2 },
+            { .description = "4 MB", .value = 4 },
+            { .description = "8 MB", .value = 8 },
+            { .description = ""                 }
         },
-        .default_int = 8
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
 static const device_config_t millennium_ii_config[] = {
   // clang-format off
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .selection =
-        {
-            {
-                .description = "4 MB",
-                .value = 4
-            },
-            {
-                .description = "8 MB",
-                .value = 8
-            },
-            {
-                .description = "16 MB",
-                .value = 16
-            },
-            {
-                .description = ""
-            }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 8,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description =  "4 MB", .value =  4 },
+            { .description =  "8 MB", .value =  8 },
+            { .description = "16 MB", .value = 16 },
+            { .description = ""                   }
         },
-        .default_int = 8
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
@@ -6641,7 +6910,7 @@ const device_t millennium_device = {
     .init          = mystique_init,
     .close         = mystique_close,
     .reset         = NULL,
-    { .available = millennium_available },
+    .available     = millennium_available,
     .speed_changed = mystique_speed_changed,
     .force_redraw  = mystique_force_redraw,
     .config        = mystique_config
@@ -6655,7 +6924,7 @@ const device_t mystique_device = {
     .init          = mystique_init,
     .close         = mystique_close,
     .reset         = NULL,
-    { .available = mystique_available },
+    .available     = mystique_available,
     .speed_changed = mystique_speed_changed,
     .force_redraw  = mystique_force_redraw,
     .config        = mystique_config
@@ -6669,7 +6938,7 @@ const device_t mystique_220_device = {
     .init          = mystique_init,
     .close         = mystique_close,
     .reset         = NULL,
-    { .available = mystique_220_available },
+    .available     = mystique_220_available,
     .speed_changed = mystique_speed_changed,
     .force_redraw  = mystique_force_redraw,
     .config        = mystique_config
@@ -6683,12 +6952,13 @@ const device_t millennium_ii_device = {
     .init          = mystique_init,
     .close         = mystique_close,
     .reset         = NULL,
-    { .available = millennium_ii_available },
+    .available     = millennium_ii_available,
     .speed_changed = mystique_speed_changed,
     .force_redraw  = mystique_force_redraw,
     .config        = millennium_ii_config
 };
 
+#ifdef USE_G100
 const device_t productiva_g100_device = {
     .name          = "Matrox Productiva G100",
     .internal_name = "productiva_g100",
@@ -6697,8 +6967,9 @@ const device_t productiva_g100_device = {
     .init          = mystique_init,
     .close         = mystique_close,
     .reset         = NULL,
-    { .available = matrox_g100_available },
+    .available     = matrox_g100_available,
     .speed_changed = mystique_speed_changed,
     .force_redraw  = mystique_force_redraw,
     .config        = millennium_ii_config
 };
+#endif
diff --git a/src/video/vid_oak_oti.c b/src/video/vid_oak_oti.c
index f5bc449e6..4ea0b21e4 100644
--- a/src/video/vid_oak_oti.c
+++ b/src/video/vid_oak_oti.c
@@ -30,19 +30,25 @@
 #include <86box/vid_svga.h>
 #include <86box/vid_svga_render.h>
 #include <86box/plat_unused.h>
+#include "cpu.h"
 
 #define BIOS_037C_PATH        "roms/video/oti/bios.bin"
 #define BIOS_067_AMA932J_PATH "roms/machines/ama932j/OTI067.BIN"
 #define BIOS_067_M300_08_PATH "roms/machines/m30008/EVC_BIOS.ROM"
 #define BIOS_067_M300_15_PATH "roms/machines/m30015/EVC_BIOS.ROM"
 #define BIOS_077_PATH         "roms/video/oti/oti077.vbi"
+#define BIOS_077_ACER100T_PATH "roms/machines/acer100t/oti077_acer100t.BIN"
+#define BIOS_077_PCS44C_PATH  "roms/machines/pcs44c/V032004G.25"
 
 enum {
-    OTI_037C        = 0,
-    OTI_067         = 2,
-    OTI_067_AMA932J = 3,
-    OTI_067_M300    = 4,
-    OTI_077         = 5
+    OTI_037C         = 0,
+    OTI_037_PBL300SX = 1,
+    OTI_067          = 2,
+    OTI_067_AMA932J  = 3,
+    OTI_067_M300     = 4,
+    OTI_077          = 5,
+    OTI_077_ACER100T = 6,
+    OTI_077_PCS44C   = 7
 };
 
 typedef struct {
@@ -51,6 +57,7 @@ typedef struct {
     rom_t bios_rom;
 
     int     index;
+    int     en_map;
     uint8_t regs[32];
 
     uint8_t chip_id;
@@ -73,16 +80,23 @@ oti_out(uint16_t addr, uint8_t val, void *priv)
     uint8_t idx;
     uint8_t enable;
 
-    if (!oti->chip_id && !(oti->enable_register & 1) && (addr != 0x3C3))
+    if (!oti->chip_id && !(oti->enable_register & 1) && (addr != 0x3c3))
         return;
 
-    if ((((addr & 0xFFF0) == 0x3D0 || (addr & 0xFFF0) == 0x3B0) && addr < 0x3de) && !(svga->miscout & 1))
+    if (((((addr & 0xfff0) == 0x3d0) || ((addr & 0xfff0) == 0x3b0)) && (addr < 0x3de)) &&
+        !(svga->miscout & 1))
         addr ^= 0x60;
 
     switch (addr) {
-        case 0x3C3:
+        case 0x3c3:
             if (!oti->chip_id) {
                 oti->enable_register = val & 1;
+                if ((val & 0x01) && oti->en_map)
+                    mem_mapping_enable(&svga->mapping);
+                else if (!(val & 0x01)) {
+                    oti->en_map = svga->mapping.enable;
+                    mem_mapping_disable(&svga->mapping);
+                }
                 return;
             }
             svga_out(addr, val, svga);
@@ -92,20 +106,21 @@ oti_out(uint16_t addr, uint8_t val, void *priv)
         case 0x3c7:
         case 0x3c8:
         case 0x3c9:
-            if (oti->chip_id == OTI_077)
+            if ((oti->chip_id == OTI_077) || (oti->chip_id == OTI_077_ACER100T) ||
+                (oti->chip_id == OTI_077_PCS44C))
                 sc1148x_ramdac_out(addr, 0, val, svga->ramdac, svga);
             else
                 svga_out(addr, val, svga);
             return;
 
-        case 0x3D4:
+        case 0x3d4:
             if (oti->chip_id)
                 svga->crtcreg = val & 0x3f;
             else
                 svga->crtcreg = val; /* FIXME: The BIOS wants to set the test bit? */
             return;
 
-        case 0x3D5:
+        case 0x3d5:
             if (oti->chip_id && (svga->crtcreg & 0x20))
                 return;
             idx = svga->crtcreg;
@@ -121,7 +136,8 @@ oti_out(uint16_t addr, uint8_t val, void *priv)
                 if ((idx < 0x0e) || (idx > 0x10)) {
                     if (idx == 0x0c || idx == 0x0d) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) +
+                                                ((svga->crtc[8] & 0x60) >> 5);
                     } else {
                         svga->fullchange = changeframecount;
                         svga_recalctimings(svga);
@@ -130,14 +146,14 @@ oti_out(uint16_t addr, uint8_t val, void *priv)
             }
             break;
 
-        case 0x3DE:
+        case 0x3de:
             if (oti->chip_id)
                 oti->index = val & 0x1f;
             else
                 oti->index = val;
             return;
 
-        case 0x3DF:
+        case 0x3df:
             idx = oti->index;
             if (!oti->chip_id)
                 idx &= 0x1f;
@@ -153,7 +169,8 @@ oti_out(uint16_t addr, uint8_t val, void *priv)
                             mem_mapping_disable(&svga->mapping);
                         else
                             mem_mapping_enable(&svga->mapping);
-                    } else if (oti->chip_id == OTI_077) {
+                    } else if ((oti->chip_id == OTI_077) || (oti->chip_id == OTI_077_ACER100T) ||
+                               (oti->chip_id == OTI_077_PCS44C)) {
                         svga->vram_display_mask = (val & 0x0c) ? oti->vram_mask : 0x3ffff;
 
                         switch ((val & 0xc0) >> 6) {
@@ -220,14 +237,14 @@ oti_in(uint16_t addr, void *priv)
         addr ^= 0x60;
 
     switch (addr) {
-        case 0x3C2:
+        case 0x3c2:
             if ((svga->vgapal[0].r + svga->vgapal[0].g + svga->vgapal[0].b) >= 0x50)
                 temp = 0;
             else
                 temp = 0x10;
             break;
 
-        case 0x3C3:
+        case 0x3c3:
             if (oti->chip_id)
                 temp = svga_in(addr, svga);
             else
@@ -238,18 +255,22 @@ oti_in(uint16_t addr, void *priv)
         case 0x3c7:
         case 0x3c8:
         case 0x3c9:
-            if (oti->chip_id == OTI_077)
-                return sc1148x_ramdac_in(addr, 0, svga->ramdac, svga);
-            return svga_in(addr, svga);
+            if ((oti->chip_id == OTI_077) || (oti->chip_id == OTI_077_ACER100T) ||
+                (oti->chip_id == OTI_077_PCS44C))
+                temp = sc1148x_ramdac_in(addr, 0, svga->ramdac, svga);
+            else
+                temp = svga_in(addr, svga);
+            break;
 
         case 0x3CF:
-            return svga->gdcreg[svga->gdcaddr & 0xf];
+            temp = svga->gdcreg[svga->gdcaddr & 0xf];
+            break;
 
-        case 0x3D4:
+        case 0x3d4:
             temp = svga->crtcreg;
             break;
 
-        case 0x3D5:
+        case 0x3d5:
             if (oti->chip_id) {
                 if (svga->crtcreg & 0x20)
                     temp = 0xff;
@@ -259,17 +280,19 @@ oti_in(uint16_t addr, void *priv)
                 temp = svga->crtc[svga->crtcreg & 0x1f];
             break;
 
-        case 0x3DA:
+        case 0x3da:
             if (oti->chip_id) {
                 temp = svga_in(addr, svga);
                 break;
             }
 
             svga->attrff = 0;
-            /*The OTI-037C BIOS waits for bits 0 and 3 in 0x3da to go low, then reads 0x3da again
-              and expects the diagnostic bits to equal the current border colour. As I understand
-              it, the 0x3da active enable status does not include the border time, so this may be
-              an area where OTI-037C is not entirely VGA compatible.*/
+            /*
+               The OTI-037C BIOS waits for bits 0 and 3 in 0x3da to go low, then reads 0x3da again
+               and expects the diagnostic bits to equal the current border colour. As I understand
+               it, the 0x3da active enable status does not include the border time, so this may be
+               an area where OTI-037C is not entirely VGA compatible.
+             */
             svga->cgastat &= ~0x30;
             /* copy color diagnostic info from the overscan color register */
             switch (svga->attrregs[0x12] & 0x30) {
@@ -304,13 +327,15 @@ oti_in(uint16_t addr, void *priv)
             temp = svga->cgastat;
             break;
 
-        case 0x3DE:
+        case 0x3de:
             temp = oti->index;
-            if (oti->chip_id)
+            if (oti->chip_id > 5)
+                temp |= (5 << 5);
+            else if (oti->chip_id)
                 temp |= (oti->chip_id << 5);
             break;
 
-        case 0x3DF:
+        case 0x3df:
             idx = oti->index;
             if (!oti->chip_id)
                 idx &= 0x1f;
@@ -390,9 +415,9 @@ oti_recalctimings(svga_t *svga)
 
     if (oti->chip_id > 0) {
         if (oti->regs[0x14] & 0x08)
-            svga->ma_latch |= 0x10000;
+            svga->memaddr_latch |= 0x10000;
         if (oti->regs[0x16] & 0x08)
-            svga->ma_latch |= 0x20000;
+            svga->memaddr_latch |= 0x20000;
 
         if (oti->regs[0x14] & 0x01)
             svga->vtotal += 0x400;
@@ -438,6 +463,13 @@ oti_init(const device_t *info)
 #endif
             break;
 
+        case OTI_037_PBL300SX:
+            romfn          = NULL;
+            oti->chip_id   = 0;
+            oti->vram_size = 256;
+            oti->regs[0]   = 0x08; /* FIXME: The BIOS wants to read this at index 0? This index is undocumented. */
+            break;
+
         case OTI_067_AMA932J:
             romfn          = BIOS_067_AMA932J_PATH;
             oti->chip_id   = 2;
@@ -464,24 +496,43 @@ oti_init(const device_t *info)
             oti->pos       = 0x08; /* Tell the BIOS the I/O ports are already enabled to avoid a double I/O handler mess. */
             io_sethandler(0x46e8, 1, oti_pos_in, NULL, NULL, oti_pos_out, NULL, NULL, oti);
             break;
+        case OTI_077_ACER100T:
+            romfn          = BIOS_077_ACER100T_PATH;
+            oti->vram_size = device_get_config_int("memory");
+            oti->pos = 0x08; /* Tell the BIOS the I/O ports are already enabled to avoid a double I/O handler mess. */
+            io_sethandler(0x46e8, 1, oti_pos_in, NULL, NULL, oti_pos_out, NULL, NULL, oti);
+            break;
+        case OTI_077_PCS44C:
+            romfn          = BIOS_077_PCS44C_PATH;
+            oti->vram_size = device_get_config_int("memory");
+            oti->pos = 0x08; /* Tell the BIOS the I/O ports are already enabled to avoid a double I/O handler mess. */
+            io_sethandler(0x46e8, 1, oti_pos_in, NULL, NULL, oti_pos_out, NULL, NULL, oti);
+            break;
 
         default:
             break;
     }
 
-    if (romfn != NULL) {
+    if (romfn != NULL)
         rom_init(&oti->bios_rom, romfn,
                  0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
-    }
 
     oti->vram_mask = (oti->vram_size << 10) - 1;
 
-    video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_oti);
+    if (oti->chip_id == OTI_077_ACER100T) {
+        /*
+           josephillips: Required to show all BIOS 
+           information on Acer 100T only
+        */
+        video_inform(0x1, &timing_oti);   
+    } else
+        video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_oti);
 
     svga_init(info, &oti->svga, oti, oti->vram_size << 10,
               oti_recalctimings, oti_in, oti_out, NULL, NULL);
 
-    if (oti->chip_id == OTI_077)
+    if ((oti->chip_id == OTI_077) || (oti->chip_id == OTI_077_ACER100T) ||
+        (oti->chip_id == OTI_077_PCS44C))
         oti->svga.ramdac = device_add(&sc11487_ramdac_device); /*Actually a 82c487, probably a clone.*/
 
     io_sethandler(0x03c0, 32,
@@ -489,7 +540,7 @@ oti_init(const device_t *info)
 
     oti->svga.miscout       = 1;
     oti->svga.packed_chain4 = 1;
-
+    
     return oti;
 }
 
@@ -531,6 +582,18 @@ oti067_ama932j_available(void)
     return (rom_present(BIOS_067_AMA932J_PATH));
 }
 
+static int
+oti077_acer100t_available(void)
+{
+    return (rom_present(BIOS_077_ACER100T_PATH));
+}
+
+static int
+oti077_pcs44c_available(void)
+{
+    return (rom_present(BIOS_077_PCS44C_PATH));
+}
+
 static int
 oti067_077_available(void)
 {
@@ -549,81 +612,80 @@ oti067_m300_available(void)
 // clang-format off
 static const device_config_t oti067_config[] = {
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 512,
-        .selection = {
-            {
-                .description = "256 kB",
-                .value = 256
-            },
-            {
-                .description = "512 kB",
-                .value = 512
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "256 KB", .value = 256 },
+            { .description = "512 KB", .value = 512 },
+            { .description = ""                     }
+        },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t oti067_ama932j_config[] = {
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 256,
-        .selection = {
-            {
-                .description = "256 kB",
-                .value = 256
-            },
-            {
-                .description = "512 kB",
-                .value = 512
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 256,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "256 KB", .value = 256 },
+            { .description = "512 KB", .value = 512 },
+            { .description = ""                     }
+        },
+        .bios           = { { 0 } }
     },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t oti077_acer100t_config[] = {
     {
-        .type = CONFIG_END
-    }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "256 KB", .value =  256 },
+            { .description = "512 KB", .value =  512 },
+            { .description = "1 MB",   .value = 1024 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t oti077_config[] = {
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 1024,
-        .selection = {
-            {
-                .description = "256 kB",
-                .value = 256
-            },
-            {
-                .description = "512 kB",
-                .value = 512
-            },
-            {
-                .description = "1 MB",
-                .value = 1024
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1024,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "256 KB", .value =  256 },
+            { .description = "512 KB", .value =  512 },
+            { .description = "1 MB",   .value = 1024 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 // clang-format on
 
@@ -635,7 +697,21 @@ const device_t oti037c_device = {
     .init          = oti_init,
     .close         = oti_close,
     .reset         = NULL,
-    { .available = oti037c_available },
+    .available     = oti037c_available,
+    .speed_changed = oti_speed_changed,
+    .force_redraw  = oti_force_redraw,
+    .config        = NULL
+};
+
+const device_t oti037_pbl300sx_device = {
+    .name          = "Oak OTI-037 (Packard Bell Legend 300SX)",
+    .internal_name = "oti037_pbl300sx",
+    .flags         = DEVICE_ISA,
+    .local         = 1,
+    .init          = oti_init,
+    .close         = oti_close,
+    .reset         = NULL,
+    .available     = NULL,
     .speed_changed = oti_speed_changed,
     .force_redraw  = oti_force_redraw,
     .config        = NULL
@@ -649,21 +725,7 @@ const device_t oti067_device = {
     .init          = oti_init,
     .close         = oti_close,
     .reset         = NULL,
-    { .available = oti067_077_available },
-    .speed_changed = oti_speed_changed,
-    .force_redraw  = oti_force_redraw,
-    .config        = oti067_config
-};
-
-const device_t oti067_m300_device = {
-    .name          = "Oak OTI-067 (Olivetti M300-08/15)",
-    .internal_name = "oti067_m300",
-    .flags         = DEVICE_ISA,
-    .local         = 4,
-    .init          = oti_init,
-    .close         = oti_close,
-    .reset         = NULL,
-    { .available = oti067_m300_available },
+    .available     = oti067_077_available,
     .speed_changed = oti_speed_changed,
     .force_redraw  = oti_force_redraw,
     .config        = oti067_config
@@ -677,12 +739,26 @@ const device_t oti067_ama932j_device = {
     .init          = oti_init,
     .close         = oti_close,
     .reset         = NULL,
-    { .available = oti067_ama932j_available },
+    .available     = oti067_ama932j_available,
     .speed_changed = oti_speed_changed,
     .force_redraw  = oti_force_redraw,
     .config        = oti067_ama932j_config
 };
 
+const device_t oti067_m300_device = {
+    .name          = "Oak OTI-067 (Olivetti M300-08/15)",
+    .internal_name = "oti067_m300",
+    .flags         = DEVICE_ISA,
+    .local         = 4,
+    .init          = oti_init,
+    .close         = oti_close,
+    .reset         = NULL,
+    .available     = oti067_m300_available,
+    .speed_changed = oti_speed_changed,
+    .force_redraw  = oti_force_redraw,
+    .config        = oti067_config
+};
+
 const device_t oti077_device = {
     .name          = "Oak OTI-077",
     .internal_name = "oti077",
@@ -691,8 +767,35 @@ const device_t oti077_device = {
     .init          = oti_init,
     .close         = oti_close,
     .reset         = NULL,
-    { .available = oti067_077_available },
+    .available     = oti067_077_available,
     .speed_changed = oti_speed_changed,
     .force_redraw  = oti_force_redraw,
     .config        = oti077_config
 };
+
+const device_t oti077_acer100t_device = {
+    .name          = "Oak OTI-077 (Acer 100T)",
+    .internal_name = "oti077_acer100t",
+    .flags         = DEVICE_ISA,
+    .local         = 6,
+    .init          = oti_init,
+    .close         = oti_close,
+    .reset         = NULL,
+    .available     = oti077_acer100t_available,
+    .speed_changed = oti_speed_changed,
+    .force_redraw  = oti_force_redraw,
+    .config        = oti077_acer100t_config
+};
+const device_t oti077_pcs44c_device = {
+    .name          = "Oak OTI-077 (Olivetti PCS 44/C)",
+    .internal_name = "oti077_pcs44c",
+    .flags         = DEVICE_ISA,
+    .local         = 7,
+    .init          = oti_init,
+    .close         = oti_close,
+    .reset         = NULL,
+    .available     = oti077_pcs44c_available,
+    .speed_changed = oti_speed_changed,
+    .force_redraw  = oti_force_redraw,
+    .config        = oti077_acer100t_config
+};
diff --git a/src/video/vid_paradise.c b/src/video/vid_paradise.c
index 30666e82c..ff1013232 100644
--- a/src/video/vid_paradise.c
+++ b/src/video/vid_paradise.c
@@ -30,16 +30,23 @@
 #include <86box/rom.h>
 #include <86box/device.h>
 #include <86box/video.h>
+#include <86box/vid_xga.h>
 #include <86box/vid_svga.h>
 #include <86box/vid_svga_render.h>
 
+#define VAR_BYTE_MODE      (0 << 0)
+#define VAR_WORD_MODE_MA13 (1 << 0)
+#define VAR_WORD_MODE_MA15 (2 << 0)
+#define VAR_DWORD_MODE     (3 << 0)
+#define VAR_MODE_MASK      (3 << 0)
+#define VAR_ROW0_MA13      (1 << 2)
+#define VAR_ROW1_MA14      (1 << 3)
+
 typedef struct paradise_t {
     svga_t svga;
 
     rom_t bios_rom;
 
-    uint8_t bank_mask;
-
     enum {
         PVGA1A = 0,
         WD90C11,
@@ -47,11 +54,11 @@ typedef struct paradise_t {
     } type;
 
     uint32_t vram_mask;
+    uint32_t memory;
 
     uint32_t read_bank[4], write_bank[4];
 
     int interlace;
-    int check;
 
     struct {
         uint8_t reg_block_ptr;
@@ -70,7 +77,7 @@ typedef struct paradise_t {
 } paradise_t;
 
 static video_timings_t timing_paradise_pvga1a = { .type = VIDEO_ISA, .write_b = 6, .write_w = 8, .write_l = 16, .read_b = 6, .read_w = 8, .read_l = 16 };
-static video_timings_t timing_paradise_wd90c  = { .type = VIDEO_ISA, .write_b = 3, .write_w = 3, .write_l = 6, .read_b = 5, .read_w = 5, .read_l = 10 };
+static video_timings_t timing_paradise_wd90c  = { .type = VIDEO_ISA, .write_b = 3, .write_w = 3, .write_l =  6, .read_b = 5, .read_w = 5, .read_l = 10 };
 
 void paradise_remap(paradise_t *paradise);
 
@@ -79,7 +86,7 @@ paradise_in(uint16_t addr, void *priv)
 {
     paradise_t *paradise = (paradise_t *) priv;
     svga_t     *svga     = &paradise->svga;
-    uint8_t     temp     = 0;
+    uint8_t     max_sr   = (paradise->type >= WD90C30) ? 0x15 : 0x12;
 
     if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
         addr ^= 0x60;
@@ -89,7 +96,7 @@ paradise_in(uint16_t addr, void *priv)
             if (svga->seqaddr > 7) {
                 if (paradise->type < WD90C11 || svga->seqregs[6] != 0x48)
                     return 0xff;
-                if (svga->seqaddr > 0x12)
+                if (svga->seqaddr > max_sr)
                     return 0xff;
                 return svga->seqregs[svga->seqaddr & 0x1f];
             }
@@ -109,16 +116,6 @@ paradise_in(uint16_t addr, void *priv)
                     return 0xff;
             }
             switch (svga->gdcaddr) {
-                case 0x0b:
-                    temp = svga->gdcreg[0x0b];
-                    if (paradise->type == WD90C30) {
-                        if (paradise->vram_mask == ((512 << 10) - 1)) {
-                            temp &= ~0x40;
-                            temp |= 0xc0;
-                        }
-                    }
-                    return temp;
-
                 case 0x0f:
                     return (svga->gdcreg[0x0f] & 0x17) | 0x80;
 
@@ -147,13 +144,9 @@ paradise_out(uint16_t addr, uint8_t val, void *priv)
 {
     paradise_t *paradise = (paradise_t *) priv;
     svga_t     *svga     = &paradise->svga;
+    xga_t      *xga      = (xga_t *) svga->xga;
     uint8_t     old;
 
-    if (paradise->vram_mask <= ((512 << 10) - 1))
-        paradise->bank_mask = 0x7f;
-    else
-        paradise->bank_mask = 0xff;
-
     if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
         addr ^= 0x60;
 
@@ -186,24 +179,27 @@ paradise_out(uint16_t addr, uint8_t val, void *priv)
                     return;
             }
 
-            old = svga->gdcreg[svga->gdcaddr];
             switch (svga->gdcaddr) {
                 case 6:
-                    if (old ^ (val & 0x0c)) {
+                    if ((svga->gdcreg[6] & 0x0c) != (val & 0xc)) {
                         switch (val & 0x0c) {
-                            case 0x00: /*128k at A0000*/
+                            case 0x0: /*128k at A0000*/
                                 mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x20000);
                                 svga->banked_mask = 0xffff;
                                 break;
-                            case 0x04: /*64k at A0000*/
+                            case 0x4: /*64k at A0000*/
                                 mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
                                 svga->banked_mask = 0xffff;
+                                if (xga_active && (svga->xga != NULL)) {
+                                    xga->on = 0;
+                                    mem_mapping_set_handler(&svga->mapping, svga->read, svga->readw, svga->readl, svga->write, svga->writew, svga->writel);
+                                }
                                 break;
-                            case 0x08: /*32k at B0000*/
+                            case 0x8: /*32k at B0000*/
                                 mem_mapping_set_addr(&svga->mapping, 0xb0000, 0x08000);
                                 svga->banked_mask = 0x7fff;
                                 break;
-                            case 0x0c: /*32k at B8000*/
+                            case 0xC: /*32k at B8000*/
                                 mem_mapping_set_addr(&svga->mapping, 0xb8000, 0x08000);
                                 svga->banked_mask = 0x7fff;
                                 break;
@@ -211,18 +207,40 @@ paradise_out(uint16_t addr, uint8_t val, void *priv)
                             default:
                                 break;
                         }
-                        svga->gdcreg[6] = val;
-                        paradise_remap(paradise);
                     }
+                    svga->gdcreg[6] = val;
+                    paradise_remap(paradise);
                     return;
 
                 case 9:
                 case 0x0a:
-                    svga->gdcreg[svga->gdcaddr] = val & paradise->bank_mask;
+                    svga->gdcreg[svga->gdcaddr] = val;
                     paradise_remap(paradise);
                     return;
                 case 0x0b:
                     svga->gdcreg[0x0b] = val;
+                    svga->gdcreg[0x0b] &= ~0xc0;
+                    if (paradise->memory == 1024)
+                        svga->gdcreg[0x0b] |= 0xc0;
+                    else if (paradise->memory == 512)
+                        svga->gdcreg[0x0b] |= 0x80;
+                    else
+                        svga->gdcreg[0x0b] |= 0x40;
+
+                    if (svga->crtc[0x2f] & 0x02)
+                        svga->decode_mask = 0x3ffff;
+                    else  switch (svga->gdcreg[0x0b] & 0xc0) {
+                        case 0x00: case 0x40:
+                            svga->decode_mask = 0x3ffff;
+                            break;
+                        case 0x80:
+                            svga->decode_mask = 0x7ffff;
+                            break;
+                        case 0xc0:
+                            svga->decode_mask = 0xfffff;
+                            break;
+                    }
+
                     paradise_remap(paradise);
                     return;
                 case 0x0e:
@@ -254,9 +272,24 @@ paradise_out(uint16_t addr, uint8_t val, void *priv)
 
             if (old != val) {
                 if (svga->crtcreg < 0xe || svga->crtcreg > 0x10) {
+                    if (svga->crtcreg == 0x2f) {
+                        if (svga->crtc[0x2f] & 0x02)
+                            svga->decode_mask = 0x3ffff;
+                        else  switch (svga->gdcreg[0x0b] & 0xc0) {
+                            case 0x00: case 0x40:
+                                svga->decode_mask = 0x3ffff;
+                                break;
+                            case 0x80:
+                                svga->decode_mask = 0x7ffff;
+                                break;
+                            case 0xc0:
+                                svga->decode_mask = 0xfffff;
+                                break;
+                        }
+                    }
                     if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
                     } else {
                         svga->fullchange = changeframecount;
                         svga_recalctimings(svga);
@@ -277,45 +310,187 @@ paradise_remap(paradise_t *paradise)
 {
     svga_t *svga    = &paradise->svga;
 
-    paradise->check = 0;
-
     if (svga->seqregs[0x11] & 0x80) {
-        paradise->read_bank[0] = paradise->read_bank[2] = svga->gdcreg[9] << 12;
-        paradise->read_bank[1] = paradise->read_bank[3] = (svga->gdcreg[9] << 12) + ((svga->gdcreg[6] & 0x08) ? 0 : 0x8000);
-        paradise->write_bank[0] = paradise->write_bank[2] = svga->gdcreg[0x0a] << 12;
-        paradise->write_bank[1] = paradise->write_bank[3] = (svga->gdcreg[0x0a] << 12) + ((svga->gdcreg[6] & 0x08) ? 0 : 0x8000);
-    } else if (svga->gdcreg[0x0b] & 0x08) {
-        if (svga->gdcreg[6] & 0x0c) {
-            paradise->read_bank[0] = paradise->read_bank[2] = svga->gdcreg[0x0a] << 12;
-            paradise->write_bank[0] = paradise->write_bank[2] = svga->gdcreg[0x0a] << 12;
-            paradise->read_bank[1] = paradise->read_bank[3] = (svga->gdcreg[9] << 12) + ((svga->gdcreg[6] & 0x08) ? 0 : 0x8000);
-            paradise->write_bank[1] = paradise->write_bank[3] = (svga->gdcreg[9] << 12) + ((svga->gdcreg[6] & 0x08) ? 0 : 0x8000);
+        paradise->read_bank[0] = svga->gdcreg[9] << 12;
+        paradise->read_bank[1] = paradise->read_bank[0] + 0x8000;
+
+        paradise->write_bank[0] = svga->gdcreg[0x0a] << 12;
+        paradise->write_bank[1] = paradise->write_bank[0] + 0x8000;
+
+        if ((svga->gdcreg[6] & 0x0c) == 0x00) {
+            paradise->read_bank[2] = paradise->read_bank[1] + 0x8000;
+            paradise->read_bank[3] = paradise->read_bank[2] + 0x8000;
+
+            paradise->write_bank[2] = paradise->write_bank[1] + 0x8000;
+            paradise->write_bank[3] = paradise->write_bank[2] + 0x8000;
         } else {
-            paradise->read_bank[0] = paradise->write_bank[0] = svga->gdcreg[0x0a] << 12;
-            paradise->read_bank[1] = paradise->write_bank[1] = (svga->gdcreg[0xa] << 12) + ((svga->gdcreg[6] & 0x08) ? 0 : 0x8000);
-            paradise->read_bank[2] = paradise->write_bank[2] = svga->gdcreg[9] << 12;
-            paradise->read_bank[3] = paradise->write_bank[3] = (svga->gdcreg[9] << 12) + ((svga->gdcreg[6] & 0x08) ? 0 : 0x8000);
+            if (svga->gdcreg[6] & 0x08) {
+                paradise->read_bank[1] = paradise->read_bank[0];
+
+                paradise->write_bank[1] = paradise->write_bank[0];
+            }
+
+            paradise->read_bank[2] = paradise->read_bank[0];
+            paradise->read_bank[3] = paradise->read_bank[1];
+
+            paradise->write_bank[2] = paradise->write_bank[0];
+            paradise->write_bank[3] = paradise->write_bank[1];
         }
+    } else if (svga->gdcreg[0x0b] & 0x08) {
+        if ((svga->gdcreg[6] & 0x0c) == 0x00) {
+            paradise->read_bank[0] = svga->gdcreg[0x0a] << 12;
+            paradise->read_bank[1] = paradise->read_bank[0] + 0x8000;
+            paradise->read_bank[2] = svga->gdcreg[9] << 12;
+            paradise->read_bank[3] = paradise->read_bank[2] + 0x8000;
+
+            paradise->write_bank[0] = svga->gdcreg[0x0a] << 12;
+            paradise->write_bank[1] = paradise->write_bank[0] + 0x8000;
+            paradise->write_bank[2] = svga->gdcreg[9] << 12;
+            paradise->write_bank[3] = paradise->write_bank[2] + 0x8000;
+       } else if ((svga->gdcreg[6] & 0x0c) == 0x04) {
+            paradise->read_bank[0] = svga->gdcreg[0x0a] << 12;
+            paradise->read_bank[1] = (svga->gdcreg[9] << 12) + 0x8000;
+            paradise->read_bank[2] = paradise->read_bank[0];
+            paradise->read_bank[3] = paradise->read_bank[1];
+
+            paradise->write_bank[0] = svga->gdcreg[0x0a] << 12;
+            paradise->write_bank[1] = (svga->gdcreg[9] << 12) + 0x8000;
+            paradise->write_bank[2] = paradise->write_bank[0];
+            paradise->write_bank[3] = paradise->write_bank[1];
+       } else {
+            paradise->read_bank[0] = svga->gdcreg[0x0a] << 12;
+            paradise->read_bank[1] = paradise->read_bank[0];
+            paradise->read_bank[2] = paradise->read_bank[0];
+            paradise->read_bank[3] = paradise->read_bank[0];
+
+            paradise->write_bank[0] = svga->gdcreg[0x0a] << 12;
+            paradise->write_bank[1] = paradise->write_bank[0];
+            paradise->write_bank[2] = paradise->write_bank[0];
+            paradise->write_bank[3] = paradise->write_bank[0];
+       }
     } else {
-        paradise->read_bank[0] = paradise->read_bank[2] = svga->gdcreg[9] << 12;
-        paradise->read_bank[1] = paradise->read_bank[3] = (svga->gdcreg[9] << 12) + ((svga->gdcreg[6] & 0x08) ? 0 : 0x8000);
-        paradise->write_bank[0] = paradise->write_bank[2] = svga->gdcreg[9] << 12;
-        paradise->write_bank[1] = paradise->write_bank[3] = (svga->gdcreg[9] << 12) + ((svga->gdcreg[6] & 0x08) ? 0 : 0x8000);
-    }
+        paradise->read_bank[0] = svga->gdcreg[9] << 12;
+        paradise->read_bank[1] = paradise->read_bank[0] + 0x8000;
 
-    if (((svga->gdcreg[0x0b] & 0xc0) == 0xc0) && !svga->chain4 && (svga->crtc[0x14] & 0x40) && ((svga->gdcreg[6] >> 2) & 3) == 1)
-        paradise->check = 1;
+        paradise->write_bank[0] = svga->gdcreg[9] << 12;
+        paradise->write_bank[1] = paradise->write_bank[0] + 0x8000;
 
-    if (paradise->bank_mask == 0x7f) {
+        if ((svga->gdcreg[6] & 0x0c) == 0x00) {
+            paradise->read_bank[2] = paradise->read_bank[1] + 0x8000;
+            paradise->read_bank[3] = paradise->read_bank[2] + 0x8000;
+
+            paradise->write_bank[2] = paradise->write_bank[1] + 0x8000;
+            paradise->write_bank[3] = paradise->write_bank[2] + 0x8000;
+        } else {
+            if (svga->gdcreg[6] & 0x08) {
+                paradise->read_bank[1] = paradise->read_bank[0];
+
+                paradise->write_bank[1] = paradise->write_bank[0];
+            }
+
+            paradise->read_bank[2] = paradise->read_bank[0];
+            paradise->read_bank[3] = paradise->read_bank[1];
+
+            paradise->write_bank[2] = paradise->write_bank[0];
+            paradise->write_bank[3] = paradise->write_bank[1];
+        }
+   }
+
+    /* There are separate drivers for 1M and 512K/256K versions of the PVGA chips. */
+    if ((svga->gdcreg[0x0b] & 0xc0) < 0xc0) {
         paradise->read_bank[1] &= 0x7ffff;
         paradise->write_bank[1] &= 0x7ffff;
+    } else {
+        paradise->read_bank[1] &= 0xfffff;
+        paradise->write_bank[1] &= 0xfffff;
     }
 }
 
+void
+paradise_render_4bpp_word_highres(svga_t *svga)
+{
+    int       x;
+    int       oddeven;
+    uint32_t  addr;
+    uint32_t *p;
+    uint8_t   edat[4];
+    uint8_t   dat;
+    uint32_t  changed_addr;
+
+    if ((svga->displine + svga->y_add) < 0)
+        return;
+
+    changed_addr = ((svga->memaddr & 0x3fffc) << 1);
+
+    if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
+        p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
+
+        if (svga->firstline_draw == 2000)
+            svga->firstline_draw = svga->displine;
+        svga->lastline_draw = svga->displine;
+
+        for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
+            addr    = ((svga->memaddr & 0x3fffc) << 1);
+            oddeven = 0;
+
+            oddeven = (svga->memaddr & 2) ? 1 : 0;
+            *(uint32_t *) (&edat[0]) = *(uint32_t *) (&svga->vram[addr | oddeven]) & 0x00ff00ff;
+            svga->memaddr = (svga->memaddr + 2) & svga->vram_mask;
+
+            dat  = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
+            p[0] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+            p[1] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+            dat  = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] |
+                   (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
+            p[2] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+            p[3] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+            dat  = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] |
+                   (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
+            p[4] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+            p[5] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+            dat  = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
+            p[6] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+            p[7] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+
+            p += 8;
+        }
+    }
+}
+
+static int
+paradise_mode_is_word(svga_t *svga)
+{
+    int func_nr;
+
+    if (svga->fb_only)
+        func_nr = 0;
+    else {
+        if (svga->force_dword_mode)
+            func_nr = VAR_DWORD_MODE;
+        else if (svga->crtc[0x14] & 0x40)
+            func_nr = svga->packed_chain4 ? VAR_BYTE_MODE : VAR_DWORD_MODE;
+        else if (svga->crtc[0x17] & 0x40)
+            func_nr = VAR_BYTE_MODE;
+        else if (svga->crtc[0x17] & 0x20)
+            func_nr = VAR_WORD_MODE_MA15;
+        else
+            func_nr = VAR_WORD_MODE_MA13;
+
+        if (!(svga->crtc[0x17] & 0x01))
+            func_nr |= VAR_ROW0_MA13;
+        if (!(svga->crtc[0x17] & 0x02))
+            func_nr |= VAR_ROW1_MA14;
+    }
+
+    return (func_nr == 2);
+}
+
 void
 paradise_recalctimings(svga_t *svga)
 {
-    const paradise_t *paradise = (paradise_t *) svga->priv;
+    paradise_t *paradise = (paradise_t *) svga->priv;
+
+    svga->lowres = !(svga->gdcreg[0x0e] & 0x01);
 
     if (paradise->type == WD90C30) {
         if (svga->crtc[0x3e] & 0x01)
@@ -328,45 +503,98 @@ paradise_recalctimings(svga_t *svga)
             svga->vblankstart |= 0x400;
         if (svga->crtc[0x3e] & 0x10)
             svga->split |= 0x400;
-
-        svga->interlace = !!(svga->crtc[0x2d] & 0x20);
-
-        if (!svga->interlace && !(svga->gdcreg[0x0e] & 0x01) && (svga->hdisp >= 1024) && ((svga->gdcreg[5] & 0x60) == 0) && (svga->miscout >= 0x27) && (svga->miscout <= 0x2f) && ((svga->gdcreg[6] & 1) || (svga->attrregs[0x10] & 1))) { /*Horrible tweak to re-enable the interlace after returning to
-                                                                                                                                                                                                                                                             a windowed DOS box in Win3.x*/
-            svga->interlace = 1;
-        }
     }
 
+    if (paradise->type >= WD90C11)
+        svga->interlace = !!(svga->crtc[0x2d] & 0x20);
+
     if (paradise->type < WD90C30) {
         if ((svga->gdcreg[6] & 1) || (svga->attrregs[0x10] & 1)) {
-            if ((svga->bpp >= 8) && (svga->gdcreg[0x0e] & 0x01)) {
+            if ((svga->bpp >= 8) && !svga->lowres) {
                 svga->render = svga_render_8bpp_highres;
+                if (paradise->type < WD90C11)
+                    svga->vram_display_mask = (svga->crtc[0x2f] & 0x02) ? 0x3ffff : paradise->vram_mask;
             }
         }
+        if (paradise->type >= WD90C11)  switch (svga->crtc[0x2f] & 0x60) {
+            case 0x60: case 0x40:
+                svga->vram_display_mask = 0x3ffff;
+                break;
+            case 0x20:
+                svga->vram_display_mask = 0x7ffff;
+                break;
+            case 0x00:
+                svga->vram_display_mask = 0xfffff;
+                break;
+        }
     } else {
         if ((svga->gdcreg[6] & 1) || (svga->attrregs[0x10] & 1)) {
-            if ((svga->bpp >= 8) && (svga->gdcreg[0x0e] & 0x01)) {
+            if ((svga->bpp >= 8) && !svga->lowres) {
                 if (svga->bpp == 16) {
                     svga->render = svga_render_16bpp_highres;
                     svga->hdisp >>= 1;
                     if (svga->hdisp == 788)
                         svga->hdisp += 12;
-                    if (svga->hdisp == 800)
-                        svga->ma_latch -= 3;
                 } else if (svga->bpp == 15) {
                     svga->render = svga_render_15bpp_highres;
                     svga->hdisp >>= 1;
                     if (svga->hdisp == 788)
                         svga->hdisp += 12;
-                    if (svga->hdisp == 800)
-                        svga->ma_latch -= 3;
-                } else {
+                } else
                     svga->render = svga_render_8bpp_highres;
-                }
-            }
+
+                svga->vram_display_mask = (svga->crtc[0x2f] & 0x02) ? 0x3ffff : paradise->vram_mask;
+            } else if ((svga->bpp <= 8) && svga->lowres && !svga->interlace && (svga->hdisp >= 1024) &&
+                       (svga->miscout >= 0x27) && (svga->miscout <= 0x2f))
+                svga->interlace = 1; /*Horrible tweak to re-enable the interlace after returning to
+                                       a windowed DOS box in Win3.x*/
         }
     }
-    svga->vram_display_mask = (svga->crtc[0x2f] & 0x02) ? 0x3ffff : paradise->vram_mask;
+
+    /*
+       Yes, this is basically hack but I'm going to look at a proper rewrite in
+       86Box 6.0.
+     */
+    if ((paradise->type == WD90C11) && (svga->hdisp == 1024) &&
+        (svga->render == svga_render_4bpp_highres) && paradise_mode_is_word(svga))
+        svga->render = paradise_render_4bpp_word_highres;
+}
+
+uint32_t
+paradise_decode_addr(paradise_t *paradise, uint32_t addr, int write)
+{
+    svga_t   *svga            = &paradise->svga;
+    int       memory_map_mode = (svga->gdcreg[6] >> 2) & 3;
+
+    addr &= 0x1ffff;
+
+    switch (memory_map_mode) {
+        case 0:
+            break;
+        case 1:
+            if (addr >= 0x10000)
+                return 0xffffffff;
+            break;
+        case 2:
+            addr -= 0x10000;
+            if (addr >= 0x8000)
+                return 0xffffffff;
+            break;
+        default:
+        case 3:
+            addr -= 0x18000;
+            if (addr >= 0x8000)
+                return 0xffffffff;
+            break;
+    }
+
+    if (write)
+        addr = (addr & 0x7fff) + paradise->write_bank[(addr >> 15) & 3];
+    else
+        addr = (addr & 0x7fff) + paradise->read_bank[(addr >> 15) & 3];
+
+
+    return addr;
 }
 
 static void
@@ -377,51 +605,33 @@ paradise_write(uint32_t addr, uint8_t val, void *priv)
     uint32_t    prev_addr;
     uint32_t    prev_addr2;
 
-    if (!(svga->gdcreg[5] & 0x40)) {
-        svga_write(addr, val, svga);
+    addr = paradise_decode_addr(paradise, addr, 1);
+    if (addr == 0xffffffff)
         return;
-    }
-
-    addr = (addr & 0x7fff) + paradise->write_bank[(addr >> 15) & 3];
 
     /*Could be done in a better way but it works.*/
-    if (svga->gdcreg[0x0e] & 0x01) {
-        if (paradise->check) {
+    if (!svga->lowres || (svga->attrregs[0x10] & 0x40)) {
+        if (((svga->gdcreg[6] & 0x0c) == 0x04) && (svga->crtc[0x14] & 0x40) && ((svga->gdcreg[0x0b] & 0xc0) == 0xc0) && !svga->chain4) {
             prev_addr  = addr & 3;
             prev_addr2 = addr & 0xfffc;
-            if ((addr & 3) == 3) {
-                if ((addr & 0x30000) == 0x20000)
+            if (prev_addr == 3) {
+                if ((addr & 0x30000) != 0x30000)
                     addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x10000)
+            } else if (prev_addr == 2) {
+                if ((addr & 0x30000) != 0x20000)
                     addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x00000)
+            } else if (prev_addr == 1) {
+                if ((addr & 0x30000) != 0x10000)
                     addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-            } else if ((addr & 3) == 2) {
-                if ((addr & 0x30000) == 0x30000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x10000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x00000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-            } else if ((addr & 3) == 1) {
-                if ((addr & 0x30000) == 0x30000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x20000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x00000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-            } else if ((addr & 3) == 0) {
-                if ((addr & 0x30000) == 0x30000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x20000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x10000)
+            } else {
+                if (addr & 0x30000)
                     addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
             }
         }
     }
     svga_write_linear(addr, val, svga);
 }
+
 static void
 paradise_writew(uint32_t addr, uint16_t val, void *priv)
 {
@@ -430,45 +640,26 @@ paradise_writew(uint32_t addr, uint16_t val, void *priv)
     uint32_t    prev_addr;
     uint32_t    prev_addr2;
 
-    if (!(svga->gdcreg[5] & 0x40)) {
-        svga_writew(addr, val, svga);
+    addr = paradise_decode_addr(paradise, addr, 1);
+    if (addr == 0xffffffff)
         return;
-    }
-
-    addr = (addr & 0x7fff) + paradise->write_bank[(addr >> 15) & 3];
 
     /*Could be done in a better way but it works.*/
-    if (svga->gdcreg[0x0e] & 0x01) {
-        if (paradise->check) {
+    if (!svga->lowres || (svga->attrregs[0x10] & 0x40)) {
+        if (((svga->gdcreg[6] & 0x0c) == 0x04) && (svga->crtc[0x14] & 0x40) && ((svga->gdcreg[0x0b] & 0xc0) == 0xc0) && !svga->chain4) {
             prev_addr  = addr & 3;
             prev_addr2 = addr & 0xfffc;
-            if ((addr & 3) == 3) {
-                if ((addr & 0x30000) == 0x20000)
+            if (prev_addr == 3) {
+                if ((addr & 0x30000) != 0x30000)
                     addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x10000)
+            } else if (prev_addr == 2) {
+                if ((addr & 0x30000) != 0x20000)
                     addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x00000)
+            } else if (prev_addr == 1) {
+                if ((addr & 0x30000) != 0x10000)
                     addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-            } else if ((addr & 3) == 2) {
-                if ((addr & 0x30000) == 0x30000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x10000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x00000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-            } else if ((addr & 3) == 1) {
-                if ((addr & 0x30000) == 0x30000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x20000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x00000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-            } else if ((addr & 3) == 0) {
-                if ((addr & 0x30000) == 0x30000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x20000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x10000)
+            } else {
+                if (addr & 0x30000)
                     addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
             }
         }
@@ -484,50 +675,33 @@ paradise_read(uint32_t addr, void *priv)
     uint32_t    prev_addr;
     uint32_t    prev_addr2;
 
-    if (!(svga->gdcreg[5] & 0x40)) {
-        return svga_read(addr, svga);
-    }
-
-    addr = (addr & 0x7fff) + paradise->read_bank[(addr >> 15) & 3];
+    addr = paradise_decode_addr(paradise, addr, 0);
+    if (addr == 0xffffffff)
+        return 0xff;
 
     /*Could be done in a better way but it works.*/
-    if (svga->gdcreg[0x0e] & 0x01) {
-        if (paradise->check) {
+    if (!svga->lowres || (svga->attrregs[0x10] & 0x40)) {
+        if (((svga->gdcreg[6] & 0x0c) == 0x04) && (svga->crtc[0x14] & 0x40) && ((svga->gdcreg[0x0b] & 0xc0) == 0xc0) && !svga->chain4) {
             prev_addr  = addr & 3;
             prev_addr2 = addr & 0xfffc;
-            if ((addr & 3) == 3) {
-                if ((addr & 0x30000) == 0x20000)
+            if (prev_addr == 3) {
+                if ((addr & 0x30000) != 0x30000)
                     addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x10000)
+            } else if (prev_addr == 2) {
+                if ((addr & 0x30000) != 0x20000)
                     addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x00000)
+            } else if (prev_addr == 1) {
+                if ((addr & 0x30000) != 0x10000)
                     addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-            } else if ((addr & 3) == 2) {
-                if ((addr & 0x30000) == 0x30000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x10000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x00000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-            } else if ((addr & 3) == 1) {
-                if ((addr & 0x30000) == 0x30000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x20000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x00000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-            } else if ((addr & 3) == 0) {
-                if ((addr & 0x30000) == 0x30000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x20000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x10000)
+            } else {
+                if (addr & 0x30000)
                     addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
             }
         }
     }
     return svga_read_linear(addr, svga);
 }
+
 static uint16_t
 paradise_readw(uint32_t addr, void *priv)
 {
@@ -536,44 +710,26 @@ paradise_readw(uint32_t addr, void *priv)
     uint32_t    prev_addr;
     uint32_t    prev_addr2;
 
-    if (!(svga->gdcreg[5] & 0x40)) {
-        return svga_readw(addr, svga);
-    }
-
-    addr = (addr & 0x7fff) + paradise->read_bank[(addr >> 15) & 3];
+    addr = paradise_decode_addr(paradise, addr, 0);
+    if (addr == 0xffffffff)
+        return 0xffff;
 
     /*Could be done in a better way but it works.*/
-    if (svga->gdcreg[0x0e] & 0x01) {
-        if (paradise->check) {
+    if (!svga->lowres || (svga->attrregs[0x10] & 0x40)) {
+        if (((svga->gdcreg[6] & 0x0c) == 0x04) && (svga->crtc[0x14] & 0x40) && ((svga->gdcreg[0x0b] & 0xc0) == 0xc0) && !svga->chain4) {
             prev_addr  = addr & 3;
             prev_addr2 = addr & 0xfffc;
-            if ((addr & 3) == 3) {
-                if ((addr & 0x30000) == 0x20000)
+            if (prev_addr == 3) {
+                if ((addr & 0x30000) != 0x30000)
                     addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x10000)
+            } else if (prev_addr == 2) {
+                if ((addr & 0x30000) != 0x20000)
                     addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x00000)
+            } else if (prev_addr == 1) {
+                if ((addr & 0x30000) != 0x10000)
                     addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-            } else if ((addr & 3) == 2) {
-                if ((addr & 0x30000) == 0x30000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x10000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x00000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-            } else if ((addr & 3) == 1) {
-                if ((addr & 0x30000) == 0x30000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x20000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x00000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-            } else if ((addr & 3) == 0) {
-                if ((addr & 0x30000) == 0x30000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x20000)
-                    addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
-                else if ((addr & 0x30000) == 0x10000)
+            } else {
+                if (addr & 0x30000)
                     addr = (addr >> 16) | (prev_addr << 16) | prev_addr2;
             }
         }
@@ -582,7 +738,7 @@ paradise_readw(uint32_t addr, void *priv)
 }
 
 void *
-paradise_init(const device_t *info, uint32_t memsize)
+paradise_init(const device_t *info, uint32_t memory)
 {
     paradise_t *paradise = malloc(sizeof(paradise_t));
     svga_t     *svga     = &paradise->svga;
@@ -593,33 +749,35 @@ paradise_init(const device_t *info, uint32_t memsize)
     else
         video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_paradise_wd90c);
 
+    paradise->memory = memory;
+
     switch (info->local) {
         case PVGA1A:
-            svga_init(info, svga, paradise, memsize, /*256kb*/
+            svga_init(info, svga, paradise, (memory << 10), /*256kb default*/
                       paradise_recalctimings,
                       paradise_in, paradise_out,
                       NULL,
                       NULL);
-            paradise->vram_mask = memsize - 1;
-            svga->decode_mask   = memsize - 1;
+            paradise->vram_mask = (memory << 10) - 1;
+            svga->decode_mask   = (memory << 10) - 1;
             break;
         case WD90C11:
-            svga_init(info, svga, paradise, 1 << 19, /*512kb*/
+            svga_init(info, svga, paradise, (memory << 10), /*512kb default*/
                       paradise_recalctimings,
                       paradise_in, paradise_out,
                       NULL,
                       NULL);
-            paradise->vram_mask = (1 << 19) - 1;
-            svga->decode_mask   = (1 << 19) - 1;
+            paradise->vram_mask = (memory << 10) - 1;
+            svga->decode_mask   = (memory << 10) - 1;
             break;
         case WD90C30:
-            svga_init(info, svga, paradise, memsize,
+            svga_init(info, svga, paradise, (memory << 10),
                       paradise_recalctimings,
                       paradise_in, paradise_out,
                       NULL,
                       NULL);
-            paradise->vram_mask = memsize - 1;
-            svga->decode_mask   = memsize - 1;
+            paradise->vram_mask = (memory << 10) - 1;
+            svga->decode_mask   = (memory << 10) - 1;
             svga->ramdac        = device_add(&sc11487_ramdac_device); /*Actually a Winbond W82c487-80, probably a clone.*/
             break;
 
@@ -627,6 +785,12 @@ paradise_init(const device_t *info, uint32_t memsize)
             break;
     }
 
+    svga->read = paradise_read;
+    svga->readw = paradise_readw;
+    svga->readl = NULL;
+    svga->write = paradise_write;
+    svga->writew = paradise_writew;
+    svga->writel = NULL;
     mem_mapping_set_handler(&svga->mapping, paradise_read, paradise_readw, NULL, paradise_write, paradise_writew, NULL);
     mem_mapping_set_p(&svga->mapping, paradise);
 
@@ -658,13 +822,15 @@ paradise_init(const device_t *info, uint32_t memsize)
 
     paradise->type = info->local;
 
+    svga->hoverride = 1;
+
     return paradise;
 }
 
 static void *
 paradise_pvga1a_ncr3302_init(const device_t *info)
 {
-    paradise_t *paradise = paradise_init(info, 1 << 18);
+    paradise_t *paradise = paradise_init(info, 256);
 
     if (paradise)
         rom_init(&paradise->bios_rom, "roms/machines/3302/c000-wd_1987-1989-740011-003058-019c.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
@@ -675,7 +841,7 @@ paradise_pvga1a_ncr3302_init(const device_t *info)
 static void *
 paradise_pvga1a_pc2086_init(const device_t *info)
 {
-    paradise_t *paradise = paradise_init(info, 1 << 18);
+    paradise_t *paradise = paradise_init(info, 256);
 
     if (paradise)
         rom_init(&paradise->bios_rom, "roms/machines/pc2086/40186.ic171", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
@@ -686,7 +852,7 @@ paradise_pvga1a_pc2086_init(const device_t *info)
 static void *
 paradise_pvga1a_pc3086_init(const device_t *info)
 {
-    paradise_t *paradise = paradise_init(info, 1 << 18);
+    paradise_t *paradise = paradise_init(info, 256);
 
     if (paradise)
         rom_init(&paradise->bios_rom, "roms/machines/pc3086/c000.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
@@ -698,12 +864,9 @@ static void *
 paradise_pvga1a_standalone_init(const device_t *info)
 {
     paradise_t *paradise;
-    uint32_t    memory = 512;
+    uint32_t memsize = device_get_config_int("memory");
 
-    memory = device_get_config_int("memory");
-    memory <<= 10;
-
-    paradise = paradise_init(info, memory);
+    paradise = paradise_init(info, memsize);
 
     if (paradise)
         rom_init(&paradise->bios_rom, "roms/video/pvga1a/BIOS.BIN", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
@@ -720,7 +883,7 @@ paradise_pvga1a_standalone_available(void)
 static void *
 paradise_wd90c11_megapc_init(const device_t *info)
 {
-    paradise_t *paradise = paradise_init(info, 0);
+    paradise_t *paradise = paradise_init(info, 512);
 
     if (paradise)
         rom_init_interleaved(&paradise->bios_rom,
@@ -734,7 +897,7 @@ paradise_wd90c11_megapc_init(const device_t *info)
 static void *
 paradise_wd90c11_standalone_init(const device_t *info)
 {
-    paradise_t *paradise = paradise_init(info, 0);
+    paradise_t *paradise = paradise_init(info, 512);
 
     if (paradise)
         rom_init(&paradise->bios_rom, "roms/video/wd90c11/WD90C11.VBI", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
@@ -752,12 +915,9 @@ static void *
 paradise_wd90c30_standalone_init(const device_t *info)
 {
     paradise_t *paradise;
-    uint32_t    memory = 512;
+    uint32_t memsize = device_get_config_int("memory");
 
-    memory = device_get_config_int("memory");
-    memory <<= 10;
-
-    paradise = paradise_init(info, memory);
+    paradise = paradise_init(info, memsize);
 
     if (paradise)
         rom_init(&paradise->bios_rom, "roms/video/wd90c30/90C30-LR.VBI", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
@@ -805,7 +965,7 @@ const device_t paradise_pvga1a_pc2086_device = {
     .init          = paradise_pvga1a_pc2086_init,
     .close         = paradise_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = paradise_speed_changed,
     .force_redraw  = paradise_force_redraw,
     .config        = NULL
@@ -819,7 +979,7 @@ const device_t paradise_pvga1a_pc3086_device = {
     .init          = paradise_pvga1a_pc3086_init,
     .close         = paradise_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = paradise_speed_changed,
     .force_redraw  = paradise_force_redraw,
     .config        = NULL
@@ -828,27 +988,21 @@ const device_t paradise_pvga1a_pc3086_device = {
 static const device_config_t paradise_pvga1a_config[] = {
   // clang-format off
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 512,
-        .selection = {
-            {
-                .description = "256 kB",
-                .value = 256
-            },
-            {
-                .description = "512 kB",
-                .value = 512
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "256 KB", .value = 256 },
+            { .description = "512 KB", .value = 512 },
+            { .description = ""                     }
+        },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
@@ -860,7 +1014,7 @@ const device_t paradise_pvga1a_ncr3302_device = {
     .init          = paradise_pvga1a_ncr3302_init,
     .close         = paradise_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = paradise_speed_changed,
     .force_redraw  = paradise_force_redraw,
     .config        = paradise_pvga1a_config
@@ -874,7 +1028,7 @@ const device_t paradise_pvga1a_device = {
     .init          = paradise_pvga1a_standalone_init,
     .close         = paradise_close,
     .reset         = NULL,
-    { .available = paradise_pvga1a_standalone_available },
+    .available     = paradise_pvga1a_standalone_available,
     .speed_changed = paradise_speed_changed,
     .force_redraw  = paradise_force_redraw,
     .config        = paradise_pvga1a_config
@@ -888,7 +1042,7 @@ const device_t paradise_wd90c11_megapc_device = {
     .init          = paradise_wd90c11_megapc_init,
     .close         = paradise_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = paradise_speed_changed,
     .force_redraw  = paradise_force_redraw,
     .config        = NULL
@@ -902,7 +1056,7 @@ const device_t paradise_wd90c11_device = {
     .init          = paradise_wd90c11_standalone_init,
     .close         = paradise_close,
     .reset         = NULL,
-    { .available = paradise_wd90c11_standalone_available },
+    .available     = paradise_wd90c11_standalone_available,
     .speed_changed = paradise_speed_changed,
     .force_redraw  = paradise_force_redraw,
     .config        = NULL
@@ -911,27 +1065,22 @@ const device_t paradise_wd90c11_device = {
 static const device_config_t paradise_wd90c30_config[] = {
   // clang-format off
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 1024,
-        .selection = {
-            {
-                .description = "512 kB",
-                .value = 512
-            },
-            {
-                .description = "1 MB",
-                .value = 1024
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1024,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "256 KB", .value =  256 },
+            { .description = "512 KB", .value =  512 },
+            { .description = "1 MB",   .value = 1024 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
@@ -943,7 +1092,7 @@ const device_t paradise_wd90c30_device = {
     .init          = paradise_wd90c30_standalone_init,
     .close         = paradise_close,
     .reset         = NULL,
-    { .available = paradise_wd90c30_standalone_available },
+    .available     = paradise_wd90c30_standalone_available,
     .speed_changed = paradise_speed_changed,
     .force_redraw  = paradise_force_redraw,
     .config        = paradise_wd90c30_config
diff --git a/src/video/vid_pcjr.c b/src/video/vid_pcjr.c
new file mode 100644
index 000000000..fd8ef515b
--- /dev/null
+++ b/src/video/vid_pcjr.c
@@ -0,0 +1,760 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          IBM PCjr video subsystem emulation
+ *
+ *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *          Connor Hyde / starfrost <mario64crashed@gmail.com> 
+ *
+ *          Copyright 2008-2019 Sarah Walker.
+ *          Copyright 2016-2019 Miran Grca.
+ *          Copyright 2017-2019 Fred N. van Kempen.
+ *          Copyright 2025 starfrost
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/io.h>
+#include <86box/timer.h>
+#include <86box/mem.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/rom.h>
+#include <86box/device.h>
+#include <86box/video.h>
+#include <86box/vid_cga.h>
+#include <86box/vid_cga_comp.h>
+#include <86box/plat_unused.h>
+#include "cpu.h"
+
+#include <86box/m_pcjr.h>
+
+static video_timings_t timing_dram = { VIDEO_BUS, 0, 0, 0, 0, 0, 0 }; /*No additional waitstates*/
+
+static uint8_t crtcmask[32] = {
+    0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x7f, 0x7f,
+    0xf3, 0x1f, 0x7f, 0x1f, 0x3f, 0xff, 0x3f, 0xff,
+    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static void
+recalc_address(pcjr_t *pcjr)
+{
+    uint8_t masked_memctrl = pcjr->memctrl;
+
+    /* According to the Technical Reference, bits 2 and 5 are
+       ignored if there is only 64k of RAM and there are only
+       4 pages. */
+    if (mem_size < 128)
+        masked_memctrl &= ~0x24;
+
+    if ((pcjr->memctrl & 0xc0) == 0xc0) {
+        pcjr->vram  = &ram[(masked_memctrl & 0x06) << 14];
+        pcjr->b8000 = &ram[(masked_memctrl & 0x30) << 11];
+    } else {
+        pcjr->vram  = &ram[(masked_memctrl & 0x07) << 14];
+        pcjr->b8000 = &ram[(masked_memctrl & 0x38) << 11];
+    }
+}
+
+void
+pcjr_recalc_timings(pcjr_t *pcjr)
+{
+    double _dispontime;
+    double _dispofftime;
+    double disptime;
+
+    if (pcjr->array[0] & 1) {
+        disptime    = pcjr->crtc[0] + 1;
+        _dispontime = pcjr->crtc[1];
+    } else {
+        disptime    = (pcjr->crtc[0] + 1) << 1;
+        _dispontime = pcjr->crtc[1] << 1;
+    }
+
+    _dispofftime = disptime - _dispontime;
+    _dispontime *= CGACONST;
+    _dispofftime *= CGACONST;
+    pcjr->dispontime  = (uint64_t) (_dispontime);
+    pcjr->dispofftime = (uint64_t) (_dispofftime);
+}
+
+static int
+vid_get_h_overscan_size(pcjr_t *pcjr)
+{
+    int ret;
+
+    if (pcjr->array[0] & 1)
+        ret = 128;
+    else
+        ret = 256;
+
+    return ret;
+}
+
+static void
+vid_out(uint16_t addr, uint8_t val, void *priv)
+{
+    pcjr_t *pcjr = (pcjr_t *) priv;
+    uint8_t old;
+
+    switch (addr) {
+        case 0x3d0:
+        case 0x3d2:
+        case 0x3d4:
+        case 0x3d6:
+            pcjr->crtcreg = val & 0x1f;
+            return;
+
+        case 0x3d1:
+        case 0x3d3:
+        case 0x3d5:
+        case 0x3d7:
+            old                       = pcjr->crtc[pcjr->crtcreg];
+            pcjr->crtc[pcjr->crtcreg] = val & crtcmask[pcjr->crtcreg];
+            if (pcjr->crtcreg == 2)
+                overscan_x = vid_get_h_overscan_size(pcjr);
+            if (old != val) {
+                if (pcjr->crtcreg < 0xe || pcjr->crtcreg > 0x10) {
+                    pcjr->fullchange = changeframecount;
+                    pcjr_recalc_timings(pcjr);
+                }
+            }
+            return;
+
+        case 0x3da:
+            if (!pcjr->array_ff)
+                pcjr->array_index = val & 0x1f;
+            else {
+                if (pcjr->array_index & 0x10)
+                    val &= 0x0f;
+                pcjr->array[pcjr->array_index & 0x1f] = val;
+                if (!(pcjr->array_index & 0x1f))
+                    update_cga16_color(val);
+            }
+            pcjr->array_ff = !pcjr->array_ff;
+            break;
+
+        case 0x3df:
+            pcjr->memctrl   = val;
+            pcjr->pa        = val; /* The PCjr BIOS expects the value written to 3DF to
+                                      then be readable from port 60, others it errors out
+                                      with only 64k RAM set (but somehow, still works with
+                                      128k or more RAM). */
+            pcjr->addr_mode = val >> 6;
+            recalc_address(pcjr);
+            break;
+
+        default:
+            break;
+    }
+}
+
+static uint8_t
+vid_in(uint16_t addr, void *priv)
+{
+    pcjr_t *pcjr = (pcjr_t *) priv;
+    uint8_t ret  = 0xff;
+
+    switch (addr) {
+        case 0x3d0:
+        case 0x3d2:
+        case 0x3d4:
+        case 0x3d6:
+            ret = pcjr->crtcreg;
+            break;
+
+        case 0x3d1:
+        case 0x3d3:
+        case 0x3d5:
+        case 0x3d7:
+            ret = pcjr->crtc[pcjr->crtcreg];
+            break;
+
+        case 0x3da:
+            pcjr->array_ff = 0;
+            pcjr->status ^= 0x10;
+            ret = pcjr->status;
+            break;
+
+        default:
+            break;
+    }
+
+    return ret;
+}
+
+void
+pcjr_waitstates(UNUSED(void *priv))
+{
+    int ws_array[16] = { 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5 };
+    int ws;
+
+    ws = ws_array[cycles & 0xf];
+    cycles -= ws;
+}
+
+static void
+vid_write(uint32_t addr, uint8_t val, void *priv)
+{
+    pcjr_t *pcjr = (pcjr_t *) priv;
+
+    if (pcjr->memctrl == -1)
+        return;
+
+    pcjr_waitstates(NULL);
+
+    pcjr->b8000[addr & 0x3fff] = val;
+}
+
+static uint8_t
+vid_read(uint32_t addr, void *priv)
+{
+    const pcjr_t *pcjr = (pcjr_t *) priv;
+
+    if (pcjr->memctrl == -1)
+        return 0xff;
+
+    pcjr_waitstates(NULL);
+
+    return (pcjr->b8000[addr & 0x3fff]);
+}
+
+static int
+vid_get_h_overscan_delta(pcjr_t *pcjr)
+{
+    int def;
+    int coef;
+    int ret;
+
+    switch ((pcjr->array[0] & 0x13) | ((pcjr->array[3] & 0x08) << 5)) {
+        case 0x13: /*320x200x16*/
+            def = 0x56;
+            coef = 8;
+            break;
+        case 0x12: /*160x200x16*/
+            def = 0x2c; /* I'm going to assume a datasheet erratum here. */
+            coef = 16;
+            break;
+        case 0x03: /*640x200x4*/
+            def = 0x56;
+            coef = 8;
+            break;
+        case 0x01: /*80 column text*/
+            def = 0x5a;
+            coef = 8;
+            break;
+        case 0x00: /*40 column text*/
+        default:
+            def = 0x2c;
+            coef = 16;
+            break;
+        case 0x02: /*320x200x4*/
+            def = 0x2b;
+            coef = 16;
+            break;
+        case 0x102: /*640x200x2*/
+            def = 0x2b;
+            coef = 16;
+            break;
+    }
+
+    ret = pcjr->crtc[0x02] - def;
+
+    if (ret < -8)
+        ret = -8;
+
+    if (ret > 8)
+        ret = 8;
+
+    return ret * coef;
+}
+
+static void
+vid_blit_v_overscan(pcjr_t *pcjr)
+{
+    int      cols = (pcjr->array[2] & 0xf) + 16;
+    int      y0   = pcjr->firstline;
+    int      y    = pcjr->lastline + 8;
+    int      h    = 8;
+    int      ho_s = vid_get_h_overscan_size(pcjr);
+    int      i;
+    int      x;
+
+    if (pcjr->double_type > DOUBLE_NONE) {
+        y0 <<= 1;
+        y <<= 1;
+
+        h <<= 1;
+    }
+
+    if (pcjr->array[0] & 1)
+        x = (pcjr->crtc[1] << 3) + ho_s;
+    else
+        x = (pcjr->crtc[1] << 4) + ho_s;
+
+    for (i = 0; i < h; i++) {
+        hline(buffer32, 0, y0 + i, x, cols);
+        hline(buffer32, 0, y + i, x, cols);
+
+        if (pcjr->composite) {
+            Composite_Process(pcjr->array[0], 0, x >> 2, buffer32->line[y0 + i]);
+            Composite_Process(pcjr->array[0], 0, x >> 2, buffer32->line[y + i]);
+        } else {
+            video_process_8(x, y0 + i);
+            video_process_8(x, y + i);
+        }
+    }
+}
+
+static void
+vid_render(pcjr_t *pcjr, int line, int ho_s, int ho_d)
+{
+    uint16_t cursoraddr   = (pcjr->crtc[15] | (pcjr->crtc[14] << 8)) & 0x3fff;
+    int      drawcursor;
+    uint8_t  chr;
+    uint8_t  attr;
+    uint16_t dat;
+    int      cols[4];
+    uint16_t offset       = 0;
+    uint16_t mask         = 0x1fff;
+    int      x;
+
+    cols[0]        = (pcjr->array[2] & 0xf) + 16;
+
+    if (pcjr->array[0] & 1)
+        hline(buffer32, 0, line, (pcjr->crtc[1] << 3) + ho_s, cols[0]);
+    else
+        hline(buffer32, 0, line, (pcjr->crtc[1] << 4) + ho_s, cols[0]);
+
+    switch (pcjr->addr_mode) {
+        case 0: /*Alpha*/
+            offset = 0;
+            mask   = 0x3fff;
+            break;
+        case 1: /*Low resolution graphics*/
+            offset = (pcjr->scanline & 1) * 0x2000;
+            break;
+        case 3: /*High resolution graphics*/
+            offset = (pcjr->scanline & 3) * 0x2000;
+            break;
+        default:
+            break;
+    }
+    switch ((pcjr->array[0] & 0x13) | ((pcjr->array[3] & 0x08) << 5)) {
+        case 0x13: /*320x200x16*/
+            for (x = 0; x < pcjr->crtc[1]; x++) {
+                int ef_x = (x << 3) + ho_d;
+                dat = (pcjr->vram[((pcjr->memaddr << 1) & mask) + offset] << 8) |
+                      pcjr->vram[((pcjr->memaddr << 1) & mask) + offset + 1];
+                pcjr->memaddr++;
+                buffer32->line[line][ef_x] = buffer32->line[line][ef_x + 1] =
+                    pcjr->array[((dat >> 12) & pcjr->array[1] & 0x0f) + 16] + 16;
+                buffer32->line[line][ef_x + 2] = buffer32->line[line][ef_x + 3] =
+                    pcjr->array[((dat >> 8) & pcjr->array[1] & 0x0f) + 16] + 16;
+                buffer32->line[line][ef_x + 4] = buffer32->line[line][ef_x + 5] =
+                    pcjr->array[((dat >> 4) & pcjr->array[1] & 0x0f) + 16] + 16;
+                buffer32->line[line][ef_x + 6] = buffer32->line[line][ef_x + 7] =
+                    pcjr->array[(dat & pcjr->array[1] & 0x0f) + 16] + 16;
+            }
+            break;
+        case 0x12: /*160x200x16*/
+            for (x = 0; x < pcjr->crtc[1]; x++) {
+                int ef_x = (x << 4) + ho_d;
+                dat = (pcjr->vram[((pcjr->memaddr << 1) & mask) + offset] << 8) |
+                      pcjr->vram[((pcjr->memaddr << 1) & mask) + offset + 1];
+                pcjr->memaddr++;
+                buffer32->line[line][ef_x] = buffer32->line[line][ef_x + 1] =
+                buffer32->line[line][ef_x + 2] = buffer32->line[line][ef_x + 3] =
+                    pcjr->array[((dat >> 12) & pcjr->array[1] & 0x0f) + 16] + 16;
+                buffer32->line[line][ef_x + 4] = buffer32->line[line][ef_x + 5] =
+                    buffer32->line[line][ef_x + 6] = buffer32->line[line][ef_x + 7] =
+                    pcjr->array[((dat >> 8) & pcjr->array[1] & 0x0f) + 16] + 16;
+                buffer32->line[line][ef_x + 8] = buffer32->line[line][ef_x + 9] =
+                buffer32->line[line][ef_x + 10] = buffer32->line[line][ef_x + 11] =
+                    pcjr->array[((dat >> 4) & pcjr->array[1] & 0x0f) + 16] + 16;
+                buffer32->line[line][ef_x + 12] = buffer32->line[line][ef_x + 13] =
+                buffer32->line[line][ef_x + 14] = buffer32->line[line][ef_x + 15] =
+                    pcjr->array[(dat & pcjr->array[1] & 0x0f) + 16] + 16;
+            }
+            break;
+        case 0x03: /*640x200x4*/
+            for (x = 0; x < pcjr->crtc[1]; x++) {
+                int ef_x = (x << 3) + ho_d;
+                dat = (pcjr->vram[((pcjr->memaddr << 1) & mask) + offset + 1] << 8) |
+                      pcjr->vram[((pcjr->memaddr << 1) & mask) + offset];
+                pcjr->memaddr++;
+                for (uint8_t c = 0; c < 8; c++) {
+                    chr = (dat >> 7) & 1;
+                    chr |= ((dat >> 14) & 2);
+                    buffer32->line[line][ef_x + c] = pcjr->array[(chr & pcjr->array[1] & 0x0f) + 16] + 16;
+                    dat <<= 1;
+                }
+            }
+            break;
+        case 0x01: /*80 column text*/
+            for (x = 0; x < pcjr->crtc[1]; x++) {
+                int ef_x = (x << 3) + ho_d;
+                chr        = pcjr->vram[((pcjr->memaddr << 1) & mask) + offset];
+                attr       = pcjr->vram[((pcjr->memaddr << 1) & mask) + offset + 1];
+                drawcursor = ((pcjr->memaddr == cursoraddr) && pcjr->cursorvisible && pcjr->cursoron);
+                if (pcjr->array[3] & 4) {
+                    cols[1] = pcjr->array[((attr & 15) & pcjr->array[1] & 0x0f) + 16] + 16;
+                    cols[0] = pcjr->array[(((attr >> 4) & 7) & pcjr->array[1] & 0x0f) + 16] + 16;
+                    if ((pcjr->blink & 16) && (attr & 0x80) && !drawcursor)
+                        cols[1] = cols[0];
+                } else {
+                    cols[1] = pcjr->array[((attr & 15) & pcjr->array[1] & 0x0f) + 16] + 16;
+                    cols[0] = pcjr->array[((attr >> 4) & pcjr->array[1] & 0x0f) + 16] + 16;
+                }
+                if (pcjr->scanline & 8)
+                    for (uint8_t c = 0; c < 8; c++)
+                        buffer32->line[line][ef_x + c] = cols[0];
+                    else for (uint8_t c = 0; c < 8; c++)
+                        buffer32->line[line][ef_x + c] = cols[(fontdat[chr][pcjr->scanline & 7] & (1 << (c ^ 7))) ? 1 : 0];
+                if (drawcursor)  for (uint8_t c = 0; c < 8; c++)
+                    buffer32->line[line][ef_x + c] ^= 15;
+                pcjr->memaddr++;
+            }
+            break;
+        case 0x00: /*40 column text*/
+            for (x = 0; x < pcjr->crtc[1]; x++) {
+                int ef_x = (x << 4) + ho_d;
+                chr        = pcjr->vram[((pcjr->memaddr << 1) & mask) + offset];
+                attr       = pcjr->vram[((pcjr->memaddr << 1) & mask) + offset + 1];
+                drawcursor = ((pcjr->memaddr == cursoraddr) && pcjr->cursorvisible && pcjr->cursoron);
+                if (pcjr->array[3] & 4) {
+                    cols[1] = pcjr->array[((attr & 15) & pcjr->array[1] & 0x0f) + 16] + 16;
+                    cols[0] = pcjr->array[(((attr >> 4) & 7) & pcjr->array[1] & 0x0f) + 16] + 16;
+                    if ((pcjr->blink & 16) && (attr & 0x80) && !drawcursor)
+                        cols[1] = cols[0];
+                } else {
+                    cols[1] = pcjr->array[((attr & 15) & pcjr->array[1] & 0x0f) + 16] + 16;
+                    cols[0] = pcjr->array[((attr >> 4) & pcjr->array[1] & 0x0f) + 16] + 16;
+                }
+                pcjr->memaddr++;
+                if (pcjr->scanline & 8)
+                    for (uint8_t c = 0; c < 8; c++)
+                        buffer32->line[line][ef_x + (c << 1)] =
+                        buffer32->line[line][ef_x + (c << 1) + 1] = cols[0];
+                else
+                    for (uint8_t c = 0; c < 8; c++)
+                        buffer32->line[line][ef_x + (c << 1)] =
+                        buffer32->line[line][ef_x + (c << 1) + 1] = cols[(fontdat[chr][pcjr->scanline & 7] & (1 << (c ^ 7))) ? 1 : 0];
+                if (drawcursor)  for (uint8_t c = 0; c < 16; c++)
+                    buffer32->line[line][ef_x + c] ^= 15;
+            }
+            break;
+        case 0x02: /*320x200x4*/
+            cols[0] = pcjr->array[0 + 16] + 16;
+            cols[1] = pcjr->array[1 + 16] + 16;
+            cols[2] = pcjr->array[2 + 16] + 16;
+            cols[3] = pcjr->array[3 + 16] + 16;
+            for (x = 0; x < pcjr->crtc[1]; x++) {
+                int ef_x = (x << 4) + ho_d;
+                dat = (pcjr->vram[((pcjr->memaddr << 1) & mask) + offset] << 8) |
+                      pcjr->vram[((pcjr->memaddr << 1) & mask) + offset + 1];
+                pcjr->memaddr++;
+                for (uint8_t c = 0; c < 8; c++)
+                    buffer32->line[line][ef_x + (c << 1)] = buffer32->line[line][ef_x + (c << 1) + 1] = dat <<= 2;
+            }
+            break;
+        case 0x102: /*640x200x2*/
+            cols[0] = pcjr->array[0 + 16] + 16;
+            cols[1] = pcjr->array[1 + 16] + 16;
+            for (x = 0; x < pcjr->crtc[1]; x++) {
+                int ef_x = (x << 4) + ho_d;
+                dat = (pcjr->vram[((pcjr->memaddr << 1) & mask) + offset] << 8) |
+                      pcjr->vram[((pcjr->memaddr << 1) & mask) + offset + 1];
+                pcjr->memaddr++;
+                for (uint8_t c = 0; c < 16; c++) {
+                    buffer32->line[line][ef_x + c] = cols[dat >> 15];
+                    dat <<= 1;
+                }
+            }
+            break;
+
+        default:
+            break;
+    }
+}
+
+static void
+vid_render_blank(pcjr_t *pcjr, int line, int ho_s)
+{
+    if (pcjr->array[3] & 4) {
+        if (pcjr->array[0] & 1)
+            hline(buffer32, 0, line, (pcjr->crtc[1] << 3) + ho_s, (pcjr->array[2] & 0xf) + 16);
+        else
+            hline(buffer32, 0, line, (pcjr->crtc[1] << 4) + ho_s, (pcjr->array[2] & 0xf) + 16);
+    } else {
+        if (pcjr->array[0] & 1)
+            hline(buffer32, 0, line, (pcjr->crtc[1] << 3) + ho_s, pcjr->array[0 + 16] + 16);
+        else
+            hline(buffer32, 0, line, (pcjr->crtc[1] << 4) + ho_s, pcjr->array[0 + 16] + 16);
+    }
+}
+
+static void
+vid_render_process(pcjr_t *pcjr, int line, int ho_s)
+{
+    int x;
+
+    if (pcjr->array[0] & 1)
+        x = (pcjr->crtc[1] << 3) + ho_s;
+    else
+        x = (pcjr->crtc[1] << 4) + ho_s;
+
+    if (pcjr->composite)
+        Composite_Process(pcjr->array[0], 0, x >> 2, buffer32->line[line]);
+    else
+        video_process_8(x, line);
+}
+
+static void
+vid_poll(void *priv)
+{
+    pcjr_t  *pcjr = (pcjr_t *) priv;
+    int      x;
+    int      xs_temp;
+    int      ys_temp;
+    int      oldvc;
+    int      scanline_old;
+    int      l = pcjr->displine + 8;
+    int      ho_s = vid_get_h_overscan_size(pcjr);
+    int      ho_d = vid_get_h_overscan_delta(pcjr) + (ho_s / 2);
+    int      old_ma;
+
+    if (!pcjr->linepos) {
+        timer_advance_u64(&pcjr->timer, pcjr->dispofftime);
+        pcjr->status &= ~1;
+        pcjr->linepos = 1;
+        scanline_old         = pcjr->scanline;
+        if ((pcjr->crtc[8] & 3) == 3)
+            pcjr->scanline = (pcjr->scanline << 1) & 7;
+        if (pcjr->dispon) {
+            if (pcjr->displine < pcjr->firstline) {
+                pcjr->firstline = pcjr->displine;
+                video_wait_for_buffer();
+            }
+            pcjr->lastline = pcjr->displine;
+            switch (pcjr->double_type) {
+                default:
+                    vid_render(pcjr, l << 1, ho_s, ho_d);
+                    vid_render_blank(pcjr, (l << 1) + 1, ho_s);
+                    break;
+                case DOUBLE_NONE:
+                    vid_render(pcjr, l, ho_s, ho_d);
+                    break;
+                case DOUBLE_SIMPLE:
+                    old_ma = pcjr->memaddr;
+                    vid_render(pcjr, l << 1, ho_s, ho_d);
+                    pcjr->memaddr = old_ma;
+                    vid_render(pcjr, (l << 1) + 1, ho_s, ho_d);
+                    break;
+            }
+        } else  switch (pcjr->double_type) {
+            default:
+                vid_render_blank(pcjr, l << 1, ho_s);
+                break;
+            case DOUBLE_NONE:
+                vid_render_blank(pcjr, l, ho_s);
+                break;
+            case DOUBLE_SIMPLE:
+                vid_render_blank(pcjr, l << 1, ho_s);
+                vid_render_blank(pcjr, (l << 1) + 1, ho_s);
+                break;
+        }
+
+        switch (pcjr->double_type) {
+            default:
+                vid_render_process(pcjr, l << 1, ho_s);
+                vid_render_process(pcjr, (l << 1) + 1, ho_s);
+                break;
+            case DOUBLE_NONE:
+                vid_render_process(pcjr, l, ho_s);
+                break;
+        }
+
+        pcjr->scanline = scanline_old;
+        if (pcjr->vc == pcjr->crtc[7] && !pcjr->scanline) {
+            pcjr->status |= 8;
+        }
+        pcjr->displine++;
+        if (pcjr->displine >= 360)
+            pcjr->displine = 0;
+    } else {
+        timer_advance_u64(&pcjr->timer, pcjr->dispontime);
+        if (pcjr->dispon)
+            pcjr->status |= 1;
+        pcjr->linepos = 0;
+        if (pcjr->vsynctime) {
+            pcjr->vsynctime--;
+            if (!pcjr->vsynctime) {
+                pcjr->status &= ~8;
+            }
+        }
+        if (pcjr->scanline == (pcjr->crtc[11] & 31) || ((pcjr->crtc[8] & 3) == 3 && pcjr->scanline == ((pcjr->crtc[11] & 31) >> 1))) {
+            pcjr->cursorvisible  = 0;
+        }
+        if (pcjr->vadj) {
+            pcjr->scanline++;
+            pcjr->scanline &= 31;
+            pcjr->memaddr = pcjr->memaddr_backup;
+            pcjr->vadj--;
+            if (!pcjr->vadj) {
+                pcjr->dispon = 1;
+                pcjr->memaddr = pcjr->memaddr_backup = (pcjr->crtc[13] | (pcjr->crtc[12] << 8)) & 0x3fff;
+                pcjr->scanline                = 0;
+            }
+        } else if (pcjr->scanline == pcjr->crtc[9] || ((pcjr->crtc[8] & 3) == 3 && pcjr->scanline == (pcjr->crtc[9] >> 1))) {
+            pcjr->memaddr_backup = pcjr->memaddr;
+            pcjr->scanline     = 0;
+            oldvc        = pcjr->vc;
+            pcjr->vc++;
+            pcjr->vc &= 127;
+            if (pcjr->vc == pcjr->crtc[6])
+                pcjr->dispon = 0;
+            if (oldvc == pcjr->crtc[4]) {
+                pcjr->vc   = 0;
+                pcjr->vadj = pcjr->crtc[5];
+                if (!pcjr->vadj)
+                    pcjr->dispon = 1;
+                if (!pcjr->vadj)
+                    pcjr->memaddr = pcjr->memaddr_backup = (pcjr->crtc[13] | (pcjr->crtc[12] << 8)) & 0x3fff;
+                if ((pcjr->crtc[10] & 0x60) == 0x20)
+                    pcjr->cursoron = 0;
+                else
+                    pcjr->cursoron = pcjr->blink & 16;
+            }
+            if (pcjr->vc == pcjr->crtc[7]) {
+                pcjr->dispon    = 0;
+                pcjr->displine  = 0;
+                pcjr->vsynctime = 16;
+                picint(1 << 5);
+                if (pcjr->crtc[7]) {
+                    if (pcjr->array[0] & 1)
+                        x = (pcjr->crtc[1] << 3) + ho_s;
+                    else
+                        x = (pcjr->crtc[1] << 4) + ho_s;
+                    pcjr->lastline++;
+
+                    xs_temp = x;
+                    ys_temp = (pcjr->lastline - pcjr->firstline) << 1;
+
+                    if ((xs_temp > 0) && (ys_temp > 0)) {
+                        int actual_ys = ys_temp;
+
+                        if (xs_temp < 64)
+                            xs_temp = 656;
+                        if (ys_temp < 32)
+                            ys_temp = 400;
+                        if (!enable_overscan)
+                            xs_temp -= ho_s;
+
+                        if ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get()) {
+                            xsize = xs_temp;
+                            ysize = ys_temp;
+
+                            set_screen_size(xsize, ysize + (enable_overscan ? 32 : 0));
+
+                            if (video_force_resize_get())
+                                video_force_resize_set(0);
+                        }
+
+                        vid_blit_v_overscan(pcjr);
+
+                        if (pcjr->double_type > DOUBLE_NONE) {
+                            if (enable_overscan) {
+                                cga_blit_memtoscreen(0, pcjr->firstline << 1,
+                                                     xsize, actual_ys + 32,
+                                                     pcjr->double_type);
+                            } else if (pcjr->apply_hd) {
+                                cga_blit_memtoscreen(ho_s / 2, (pcjr->firstline << 1) + 16,
+                                                     xsize, actual_ys,
+                                                     pcjr->double_type);
+                            } else {
+                                cga_blit_memtoscreen(ho_d, (pcjr->firstline << 1) + 16,
+                                                     xsize, actual_ys,
+                                                     pcjr->double_type);
+                            }
+                        } else {
+                            if (enable_overscan) {
+                                video_blit_memtoscreen(0, pcjr->firstline,
+                                                       xsize, (actual_ys >> 1) + 16);
+                            } else if (pcjr->apply_hd) {
+                                video_blit_memtoscreen(ho_s / 2, pcjr->firstline + 8,
+                                                       xsize, actual_ys >> 1);
+                            } else {
+                                video_blit_memtoscreen(ho_d, pcjr->firstline + 8,
+                                                       xsize, actual_ys >> 1);
+                            }
+                        }
+                    }
+
+                    frames++;
+                    video_res_x = xsize;
+                    video_res_y = ysize;
+                }
+                pcjr->firstline = 1000;
+                pcjr->lastline  = 0;
+                pcjr->blink++;
+            }
+        } else {
+            pcjr->scanline++;
+            pcjr->scanline &= 31;
+            pcjr->memaddr = pcjr->memaddr_backup;
+        }
+        if (pcjr->scanline == (pcjr->crtc[10] & 31) || ((pcjr->crtc[8] & 3) == 3 && pcjr->scanline == ((pcjr->crtc[10] & 31) >> 1)))
+            pcjr->cursorvisible = 1;
+    }
+}
+
+
+void
+pcjr_vid_init(pcjr_t *pcjr)
+{
+    int     display_type;
+
+    video_inform(VIDEO_FLAG_TYPE_CGA, &timing_dram);
+
+    pcjr->memctrl   = -1;
+    if (mem_size < 128)
+        pcjr->memctrl &= ~0x24;
+
+    display_type    = device_get_config_int("display_type");
+    pcjr->composite = (display_type == PCJR_COMPOSITE);
+    pcjr->apply_hd  = device_get_config_int("apply_hd");
+    overscan_x = 256;
+    overscan_y = 32;
+
+    mem_mapping_add(&pcjr->mapping, 0xb8000, 0x08000,
+                    vid_read, NULL, NULL,
+                    vid_write, NULL, NULL, NULL, 0, pcjr);
+    io_sethandler(0x03d0, 16,
+                  vid_in, NULL, NULL, vid_out, NULL, NULL, pcjr);
+    timer_add(&pcjr->timer, vid_poll, pcjr, 1);
+
+    if (pcjr->composite)
+        cga_palette = 0;
+    else
+        cga_palette = (display_type << 1);
+    cgapal_rebuild();
+
+    pcjr->double_type = device_get_config_int("double_type");
+    cga_interpolate_init();
+
+    monitors[monitor_index_global].mon_composite = !!pcjr->composite;
+}
diff --git a/src/video/vid_pgc.c b/src/video/vid_pgc.c
index 354c7e265..63126955c 100644
--- a/src/video/vid_pgc.c
+++ b/src/video/vid_pgc.c
@@ -2342,23 +2342,23 @@ pgc_cga_text(pgc_t *dev, int w)
     int            drawcursor = 0;
     uint32_t       cols[2];
     int            pitch = (dev->mapram[0x3e9] + 1) * 2;
-    uint16_t       sc    = (dev->displine & 0x0f) % pitch;
-    uint16_t       ma    = (dev->mapram[0x3ed] | (dev->mapram[0x3ec] << 8)) & 0x3fff;
-    uint16_t       ca    = (dev->mapram[0x3ef] | (dev->mapram[0x3ee] << 8)) & 0x3fff;
+    uint16_t       scanline    = (dev->displine & 0x0f) % pitch;
+    uint16_t       memaddr    = (dev->mapram[0x3ed] | (dev->mapram[0x3ec] << 8)) & 0x3fff;
+    uint16_t       cursoraddr    = (dev->mapram[0x3ef] | (dev->mapram[0x3ee] << 8)) & 0x3fff;
     const uint8_t *addr;
     uint32_t       val;
     int            cw = (w == 80) ? 8 : 16;
 
-    addr = &dev->cga_vram[((ma + ((dev->displine / pitch) * w)) * 2) & 0x3ffe];
-    ma += (dev->displine / pitch) * w;
+    addr = &dev->cga_vram[((memaddr + ((dev->displine / pitch) * w)) * 2) & 0x3ffe];
+    memaddr += (dev->displine / pitch) * w;
 
     for (int x = 0; x < w; x++) {
         chr  = *addr++;
         attr = *addr++;
 
         /* Cursor enabled? */
-        if (ma == ca && (dev->cgablink & 8) && (dev->mapram[0x3ea] & 0x60) != 0x20) {
-            drawcursor = ((dev->mapram[0x3ea] & 0x1f) <= (sc >> 1)) && ((dev->mapram[0x3eb] & 0x1f) >= (sc >> 1));
+        if (memaddr == cursoraddr && (dev->cgablink & 8) && (dev->mapram[0x3ea] & 0x60) != 0x20) {
+            drawcursor = ((dev->mapram[0x3ea] & 0x1f) <= (scanline >> 1)) && ((dev->mapram[0x3eb] & 0x1f) >= (scanline >> 1));
         } else
             drawcursor = 0;
 
@@ -2374,9 +2374,9 @@ pgc_cga_text(pgc_t *dev, int w)
 
         for (int c = 0; c < cw; c++) {
             if (drawcursor)
-                val = cols[(fontdatm[chr + dev->fontbase][sc] & (1 << (c ^ 7))) ? 1 : 0] ^ 0x0f;
+                val = cols[(fontdatm[chr + dev->fontbase][scanline] & (1 << (c ^ 7))) ? 1 : 0] ^ 0x0f;
             else
-                val = cols[(fontdatm[chr + dev->fontbase][sc] & (1 << (c ^ 7))) ? 1 : 0];
+                val = cols[(fontdatm[chr + dev->fontbase][scanline] & (1 << (c ^ 7))) ? 1 : 0];
             if (cw == 8) /* 80x25 CGA text screen. */
                 buffer32->line[dev->displine][(x * cw) + c] = val;
             else { /* 40x25 CGA text screen. */
@@ -2385,7 +2385,7 @@ pgc_cga_text(pgc_t *dev, int w)
             }
         }
 
-        ma++;
+        memaddr++;
     }
 }
 
@@ -2395,7 +2395,7 @@ pgc_cga_gfx40(pgc_t *dev)
 {
     uint32_t       cols[4];
     int            col;
-    uint16_t       ma = (dev->mapram[0x3ed] | (dev->mapram[0x3ec] << 8)) & 0x3fff;
+    uint16_t       memaddr = (dev->mapram[0x3ed] | (dev->mapram[0x3ec] << 8)) & 0x3fff;
     const uint8_t *addr;
     uint16_t       dat;
 
@@ -2422,9 +2422,9 @@ pgc_cga_gfx40(pgc_t *dev)
     }
 
     for (uint8_t x = 0; x < 40; x++) {
-        addr = &dev->cga_vram[(ma + 2 * x + 80 * (dev->displine >> 2) + 0x2000 * ((dev->displine >> 1) & 1)) & 0x3fff];
+        addr = &dev->cga_vram[(memaddr + 2 * x + 80 * (dev->displine >> 2) + 0x2000 * ((dev->displine >> 1) & 1)) & 0x3fff];
         dat  = (addr[0] << 8) | addr[1];
-        dev->ma++;
+        dev->memaddr++;
         for (uint8_t c = 0; c < 8; c++) {
             buffer32->line[dev->displine][(x << 4) + (c << 1)] = buffer32->line[dev->displine][(x << 4) + (c << 1) + 1] = cols[dat >> 14];
             dat <<= 2;
@@ -2437,7 +2437,7 @@ void
 pgc_cga_gfx80(pgc_t *dev)
 {
     uint32_t       cols[2];
-    uint16_t       ma = (dev->mapram[0x3ed] | (dev->mapram[0x3ec] << 8)) & 0x3fff;
+    uint16_t       memaddr = (dev->mapram[0x3ed] | (dev->mapram[0x3ec] << 8)) & 0x3fff;
     const uint8_t *addr;
     uint16_t       dat;
 
@@ -2445,9 +2445,9 @@ pgc_cga_gfx80(pgc_t *dev)
     cols[1] = (dev->mapram[0x3d9] & 15) + 16;
 
     for (uint8_t x = 0; x < 40; x++) {
-        addr = &dev->cga_vram[(ma + 2 * x + 80 * (dev->displine >> 2) + 0x2000 * ((dev->displine >> 1) & 1)) & 0x3fff];
+        addr = &dev->cga_vram[(memaddr + 2 * x + 80 * (dev->displine >> 2) + 0x2000 * ((dev->displine >> 1) & 1)) & 0x3fff];
         dat  = (addr[0] << 8) | addr[1];
-        dev->ma++;
+        dev->memaddr++;
         for (uint8_t c = 0; c < 16; c++) {
             buffer32->line[dev->displine][(x << 4) + c] = cols[dat >> 15];
             dat <<= 1;
@@ -2743,7 +2743,7 @@ const device_t pgc_device = {
     .init          = pgc_standalone_init,
     .close         = pgc_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = pgc_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/vid_ps55da2.c b/src/video/vid_ps55da2.c
new file mode 100644
index 000000000..938e4bf6b
--- /dev/null
+++ b/src/video/vid_ps55da2.c
@@ -0,0 +1,3508 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          IBM PS/55 Display Adapter II (and its successors) emulation.
+ * 
+ *   Notes: There are some known issues that should be corrected.
+ *            - Incorrect foreground text color appears on an active window in OS/2 J1.3. 
+ *            - Glitches some part of graphics on the Control Panel in OS/2 J2.1 beta. 
+ * 
+ *          The code should be tested with following cases.
+ *            - Execute MODE 0, 1, 3 and 4 commands in DOS K3.3 to test various video modes.
+ *            - Run SAMPLE program with the BASIC interpreter in DOS K3.3.
+ *            - Run DOS J4.0 install program to test video mode 03.
+ *            - Run Win 3.1 (IBM-J OEM) and OS/2 J1.3 with 16 and 256 color driver to test BilBlt operations.
+ *
+ * Authors: Akamaki.
+ *
+ *          Copyright 2024-2025 Akamaki.
+ */
+
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/machine.h>
+#include <86box/mem.h>
+#include <86box/timer.h>
+#include <86box/mca.h>
+#include <86box/rom.h>
+#include <86box/plat.h>
+#include <86box/video.h>
+#include <86box/vid_ps55da2.h>
+#include <86box/vid_svga.h>
+#include <86box/vid_svga_render.h>
+#include "cpu.h"
+
+#define DA2_FONTROM_PATH_JPAN    "roms/video/da2/94X1320.BIN"
+#define DA2_FONTROM_PATH_HANT    "roms/video/da2/23F2698.BIN"
+#define DA2_FONTROM_SIZE         (1536 * 1024)
+#define DA2_FONTROM_BASESBCS     0x98000
+#define DA2_GAIJIRAM_SBCS        0x34000
+#define DA2_GAIJIRAM_SBEX        0x3c000
+#define DA2_VM03_BASECHR         0x18000
+#define DA2_VM03_BASEEXATTR      0x10000
+#define DA2_INVALIDACCESS8       0xffu
+#define DA2_INVALIDACCESS16      0xffffu
+#define DA2_INVALIDACCESS32      0xffffffffu
+#define DA2_MASK_MMIO            0x1ffff
+#define DA2_SIZE_VRAM            (1024 * 1024) /* 0x100000 */
+#define DA2_SIZE_CRAM            (4 * 1024)    /* 0x1000 */
+#define DA2_SIZE_GAIJIRAM        (256 * 1024)  /* 0x40000 */
+#define DA2_MASK_A000            0x1ffff       /* 0x1FFFF */
+#define DA2_MASK_CRAM            0xfff         /* 0xFFF */
+#define DA2_MASK_GAIJIRAM        0x3ffff       /* 0x3FFFF */
+#define DA2_MASK_VRAM            0xfffff       /* 0xFFFFF */
+#define DA2_MASK_VRAMPLANE       0x1ffff       /* 0x1FFFF */
+#define DA2_PIXELCLOCK           29000000.0    /* 58 MHz interlaced */
+#define DA2_BLT_MEMSIZE          0x10
+#define DA2_BLT_REGSIZE          0x40
+#define DA2_DEBUG_BLTLOG_SIZE    (DA2_BLT_REGSIZE + 1)
+#define DA2_DEBUG_BLTLOG_MAX     (256 * 1024)
+#define DA2_DEBUG_BLT_NEVERUSED  0xfefefefe
+#define DA2_DEBUG_BLT_USEDRESET  0xfefefe
+#define DA2_DCONFIG_CHARSET_JPAN 0 /* for Code page 932 Japanese */
+// #define DA2_DCONFIG_CHARSET_HANG 1 /* for Code page 934 Hangul */
+// #define DA2_DCONFIG_CHARSET_HANS 2 /* for Code page 936 Simplified Chinese */
+/* These ROMs are currently not found.
+   At least, IBM-J released a Korean and PRC version of PS/55 for each market. */
+#define DA2_DCONFIG_CHARSET_HANT  3 /* for Code page 938 Traditional Chinese */
+#define DA2_DCONFIG_MONTYPE_COLOR 0x0A
+#define DA2_DCONFIG_MONTYPE_8515  0x0B
+#define DA2_DCONFIG_MONTYPE_MONO  0x09
+
+#define DA2_BLT_CIDLE             0
+#define DA2_BLT_CFILLRECT         1
+#define DA2_BLT_CFILLTILE         2
+#define DA2_BLT_CCOPYF            3
+#define DA2_BLT_CCOPYR            4
+#define DA2_BLT_CPUTCHAR          5
+#define DA2_BLT_CLINE             6
+#define DA2_BLT_CDONE             7
+#define DA2_BLT_CLOAD             8
+/* POS ID = 0xeffe : Display Adapter II, III, V  */
+#define DA2_POSID_H 0xef
+#define DA2_POSID_L 0xfe
+/*
+     [Identification]
+    POS ID	SYS ID
+    EFFFh	*		Display Adapter (PS/55 Model 5571-S0A) [Toledo]
+    E013h	*		Layout Display Terminal (PS/55-5571 RPQ model) [LDT]
+    EFFEh	*		Display Adapter II (I/O 3E0:0A = xx0x xxxx) [Atlas]
+    |-		FFF2h	Display Adapter B2 (I/O 3E0:0A = xx1x xxxx) (PS/55 Model 5530Z-SX)
+    |-		FDFEh	Display Adapter B2 (I/O 3E0:0A = xx1x xxxx) (PS/55 Model 5550-V2)
+    |-		*		Display Adapter III,V (I/O 3E0:0A = xx1x xxxx)
+    ECECh	FF4Fh	Display Adapter B1 (PS/55 Model 5531Z-SX) [Atlas-KENT]
+    |-		*		Display Adapter IV
+    ECCEh	*		Display Adapter IV
+    901Fh	*		Display Adapter A2
+    901Dh	*		Display Adapter A1 [Atlas II]
+    901Eh	*		Plasma Display Adapter
+    EFD8h	*		Display Adapter/J [Atlas-SP2]
+
+     [Japanese DOS and Display Adapter compatibility]
+    |            |                             | 5605JBK | 5605PAA | 5605PCA | 5605PDE | 5605PAW | 5605PXB |
+    | POS ID     | Adapter Name                | K3.31   | J4.05   | J4.08   | J1.33   | 3.02    | 2.0     |
+    |------------|-----------------------------|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|
+    | EFFFh      | Display Adapter             |    X    |         |         |         |         |         |
+    | FFEDh      | ? [Atlas EVT]               |    X    |         |         |         |         |         |
+    | FFFDh      | ? [LDT EVT]                 |    X    |         |         |         |         |         |
+    | EFFEh      | Display Adapter II,III,V,B2 |    X    |    X    |    X    |    X    |    X    |    X    |
+    | E013h      | ? [LDT]                     |    X    |    X    |    X    |    X    |         |    X    |
+    | ECCEh      | Display Adapter IV          |         |    X    |    X    |    X    |         |    X    |
+    | ECECh      | Display Adapter IV,B1       |         |    X    |    X    |    X    |    X    |    X    |
+    | 9000-901Fh | Display Adapter A1,A2       |         |    X    |    X    |         |    X    |    X    |
+    | EFD8h      | Display Adapter /J          |         |         |    X    |    X    |    X    |    X    |
+
+     - 5605JBK : Japanese DOS K3.3, K3.4 (for PS/55 model 55xx-S, T, V, Z)
+     - 5605PAA : DOS J4.0
+     - 5605PCA : DOS J4.0 (with MKK)
+     - 5605PDE : OS/2 Extended Edition J1.3
+     - 5605PAW : Japanese Microsoft Windows 3.0 (IBMJ OEM)
+     - 5605PXB : DOS/V Extension V2.0
+    */
+/* IO 3E0/3E1:0Ah Hardware Configuration Value L (imported from OS/2 DDK) */
+#define OldLSI 0x20 /* 1 = DA-2, 0 = DA-3 */
+// #define  Mon_ID3   0x10
+#define FontCard  0x08 /* ? */
+#define Page_One  0x06 /*  80000h 110b */
+#define Page_Two  0x05 /* 100000h 101b */
+#define Page_Four 0x03 /* 200000h 011b */
+/* Page Number Mask : Memory Size? = (110b and 111b): vram size is 512k (256 color mode unsupported). */
+
+/* IO 3E0/3E1:0Bh Hardware Configuration Value H (imported from OS/2 DDK) */
+#define AddPage 0x08 /* ? */
+// #define  Mon_ID2   0x04
+// #define  Mon_ID1   0x02
+// #define  Mon_ID0   0x01
+
+/* Monitor ID (imported from OS/2 DDK 1.2)
+#define  StarbuckC     0x0A  // 1 010b IBM 8514, 9518 color 1040x768
+#define  StarbuckM     0x09  // 1 001b IBM 8507, 8604 grayscale
+#define  Lark_B        0x02  // 0 010b IBM 9517       color 1040x768 but 4bpp
+#define  Dallas        0x0B  // 1 011b IBM 8515, 9515 color 1040x740 another palette
+*/
+
+/* DA2 Registers (imported from OS/2 DDK) */
+#define AC_REG                  0x3EE
+#define AC_DMAE                 0x80
+#define AC_FONT_SEL             0x40
+#define FONT_BANK               0x3EF
+#define LS_INDEX                0x3E0
+#define LS_DATA                 0x3E1
+#define LS_RESET                0x00
+#define LS_MODE                 0x02
+#define LS_STATUS               0x03 /* added */
+#define LS_MMIO                 0x08 /* added */
+#define LS_CONFIG1              0x0a
+#define LS_CONFIG2              0x0b /* added */
+#define LF_INDEX                0x3e2
+#define LF_DATA                 0x3e3
+#define LF_MMIO_SEL             0x08 /* added */
+#define LF_MMIO_09              0x09 /* added */
+#define LF_MMIO_ADDR            0x0A /* added */
+#define LF_MMIO_MODE            0x0B /* added */
+#define LF_PD_RESET             0x18 /* added */
+#define LC_INDEX                0x3E4
+#define LC_DATA                 0x3E5
+#define LC_HORIZONTAL_TOTAL     0x00
+#define LC_H_DISPLAY_ENABLE_END 0x01
+#define LC_START_H_BLANKING     0x02
+#define LC_END_H_BLANKING       0x03
+#define LC_START_HSYNC_PULSE    0x04
+#define LC_END_HSYNC_PULSE      0x05
+#define LC_VERTICAL_TOTALJ      0x06
+#define LC_CRTC_OVERFLOW        0x07
+#define LC_PRESET_ROW_SCANJ     0x08
+#define LC_MAXIMUM_SCAN_LINE    0x09
+#define LC_CURSOR_ROW_START     0x0A
+#define LC_CURSOR_ROW_END       0x0B
+#define LC_START_ADDRESS_HIGH   0x0C
+#define LC_START_ADDRESS_LOW    0x0D
+#define LC_CURSOR_LOC_HIGH      0x0E
+#define LC_ROW_CURSOR_LOC       0x0E
+#define LC_CURSOR_LOC_LOWJ      0x0F
+#define LC_COLUMN_CURSOR_LOC    0x0F
+#define LC_VERTICAL_SYNC_START  0x10
+#define LC_LIGHT_PEN_HIGH       0x10
+#define LC_VERTICAL_SYNC_END    0x11
+#define LC_LIGHT_PEN_LOW        0x11
+#define LC_V_DISPLAY_ENABLE_END 0x12
+#define LC_OFFSET               0x13
+#define LC_UNDERLINE_LOCATION   0x14
+#define LC_START_VERTICAL_BLANK 0x15
+#define LC_END_VERTICAL_BLANK   0x16
+#define LC_LC_MODE_CONTROL      0x17
+#define LC_LINE_COMPAREJ        0x18
+#define LC_START_H_DISPLAY_ENAB 0x19
+#define LC_START_V_DISPLAY_ENAB 0x1A
+#define LC_VIEWPORT_COMMAND     0x1B
+#define LC_VIEWPORT_SELECT      0x1C
+#define LC_VIEWPORT_PRIORITY    0x1D
+#define LC_COMMAND              0x1E
+#define LC_COMPATIBILITY        0x1F
+#define LC_VIEWPORT_NUMBER      0x1F
+#define LV_PORT                 0x3E8
+#define LV_PALETTE_0            0x00
+#define LV_MODE_CONTROL         0x10
+#define LV_OVERSCAN_COLOR       0x11
+#define LV_COLOR_PLANE_ENAB     0x12
+#define LV_PANNING              0x13
+#define LV_VIEWPORT1_BG         0x14
+#define LV_VIEWPORT2_BG         0x15
+#define LV_VIEWPORT3_BG         0x16
+#define LV_BLINK_COLOR          0x17
+#define LV_BLINK_CODE           0x18
+#define LV_GR_CURSOR_ROTATION   0x19
+#define LV_GR_CURSOR_COLOR      0x1A
+#define LV_GR_CURSOR_CONTROL    0x1B
+#define LV_COMMAND              0x1C
+#define LV_VP_BORDER_LINE       0x1D
+#define LV_SYNC_POLARITY        0x1F
+#define LV_CURSOR_CODE_0        0x20
+#define LV_GRID_COLOR_0         0x34
+#define LV_GRID_COLOR_1         0x35
+#define LV_GRID_COLOR_2         0x36
+#define LV_GRID_COLOR_3         0x37
+#define LV_ATTRIBUTE_CNTL       0x38
+#define LV_CURSOR_COLOR         0x3A
+#define LV_CURSOR_CONTROL       0x3B
+#define LV_RAS_STATUS_VIDEO     0x3C
+#define LV_PAS_STATUS_CNTRL     0x3D
+#define LV_IDENTIFICATION       0x3E
+#define LV_OUTPUT               0x3E
+#define LV_COMPATIBILITY        0x3F
+#define LG_INDEX                0x3EA
+#define LG_DATA                 0x3EB
+#define LG_SET_RESETJ           0x00
+#define LG_ENABLE_SRJ           0x01
+#define LG_COLOR_COMPAREJ       0x02
+#define LG_DATA_ROTATION        0x03
+#define LG_READ_MAP_SELECT      0x04
+#define LG_MODE                 0x05
+#define LG_COMPLEMENT           0x06
+#define LG_COLOR_DONT_CARE      0x07
+#define LG_BIT_MASK_LOW         0x08
+#define LG_BIT_MASK_HIGH        0x09
+#define LG_MAP_MASKJ            0x0A
+#define LG_COMMAND              0x0B
+#define LG_SET_RESET_2          0x10
+
+#ifndef RELEASE_BUILD
+// #define ENABLE_DA2_LOG 1
+#endif
+
+#ifdef ENABLE_DA2_LOG
+#    define ENABLE_DA2_DEBUGIO 1
+#    define ENABLE_DA2_DEBUGBLT 1
+// #    define ENABLE_DA2_DEBUGVRAM 1
+// #    define ENABLE_DA2_DEBUGFULLSCREEN 1
+// #    define ENABLE_DA2_DEBUGMONWAIT 1
+int da2_do_log = ENABLE_DA2_LOG;
+
+static void
+da2_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (da2_do_log) {
+        va_start(ap, fmt);
+        pclog_ex(fmt, ap);
+        va_end(ap);
+    }
+}
+#else
+#    define da2_log(fmt, ...)
+#endif
+#ifdef ENABLE_DA2_DEBUGIO
+#    define da2_iolog da2_log
+#else
+#    define da2_iolog(fmt, ...)
+#endif
+#ifdef ENABLE_DA2_DEBUGBLT
+#    define da2_bltlog da2_log
+#    define ENABLE_DA2_DEBUGBLT_DETAIL 1
+#    ifdef ENABLE_DA2_DEBUGBLT_DETAIL
+#        define da2_bltreglog da2_log
+#    else
+#        define da2_bltreglog(fmt, ...)
+#    endif
+#else
+#    define da2_bltlog(fmt, ...)
+#    define da2_bltreglog(fmt, ...)
+#endif
+
+typedef struct da2_t {
+    mem_mapping_t cmapping;
+
+    uint8_t  ioctl[16];
+    uint8_t  fctl[32];
+    uint16_t crtc[32];
+    uint16_t crtc_vpreg[128];
+    uint8_t  crtc_vpsel;
+    uint8_t  gdcreg[64];
+    uint8_t  reg3ee[16];
+    int      gdcaddr;
+    uint8_t  attrc[0x40];
+    int      attraddr, attrff;
+    int      attr_palette_enable;
+    int      outflipflop;
+    int      inflipflop;
+    int      iolatch;
+
+    int ioctladdr;
+    int fctladdr;
+    int crtcaddr;
+
+    uint32_t gdcla[8];
+    uint32_t gdcinput[8];
+    uint32_t gdcsrc[8];
+
+    uint8_t dac_mask, dac_status;
+    int     dac_read, dac_write, dac_pos;
+    int     dac_r, dac_g;
+
+    uint8_t cgastat;
+
+    uint8_t plane_mask;
+
+    int      writemode, readplane;
+    uint8_t  planemask;
+
+    uint8_t  egapal[16];
+    uint32_t pallook[512];
+    PALETTE  vgapal;
+
+    int      vtotal, dispend, vsyncstart, split, vblankstart;
+    int      hdisp, htotal, hdisp_time, rowoffset;
+    int      lowres;
+    int      rowcount;
+    double   clock;
+    uint32_t memaddr_latch, ca_adj;
+
+    uint64_t   dispontime, dispofftime;
+    pc_timer_t timer;
+    uint64_t   da2const;
+
+    int dispon;
+    int hdisp_on;
+
+    uint32_t memaddr, memaddr_backup, cursoraddr;
+    int      vc;
+    int      scanline;
+    int      linepos, vslines, linecountff;
+    int      cursorvisible, cursoron, blink, blinkconf;
+    int      scrollcache;
+    int      char_width;
+
+    int firstline, lastline;
+    int firstline_draw, lastline_draw;
+    int displine;
+
+    /* Attribute Buffer E0000-E0FFFh (4 KB) */
+    uint8_t *cram;
+    /* APA Buffer A0000-BFFFFh (128 KB) */
+    uint8_t *vram;
+    uint8_t *changedvram;
+    uint32_t vram_display_mask;
+
+    int fullchange;
+
+    void (*render)(struct da2_t *da2);
+
+    /*If set then another device is driving the monitor output and the SVGA
+      card should not attempt to display anything */
+    int override;
+
+    struct {
+        int           enable;
+        mem_mapping_t mapping;
+        uint8_t       ram[DA2_SIZE_GAIJIRAM];
+        uint8_t      *font;
+        int           charset;
+    } mmio;
+
+    struct {
+        int        bitshift_destr;
+        int        raster_op;
+        uint8_t    payload[DA2_BLT_MEMSIZE];
+        int        payload_addr;
+        int        payload_opsize;
+        int32_t    reg[DA2_BLT_REGSIZE]; // must be signed int
+#ifdef ENABLE_DA2_DEBUGBLT
+        int32_t   *debug_reg;            // for debug
+        int        debug_reg_ip;         // for debug
+        int        debug_exesteps;
+#endif
+        pc_timer_t timer;
+        int64_t    timerspeed;
+        int        exec;
+        int        indata;
+        int32_t    destaddr;
+        int32_t    srcaddr;
+        int16_t    size_x;
+        int16_t    tile_w;
+        int16_t    size_y;
+        int16_t    dest_x;
+        int16_t    dest_y;
+        int16_t    destpitch;
+        int16_t    srcpitch;
+        int32_t    fcolor;
+        int32_t    maskl, maskr;
+        int32_t    count;
+        int32_t    d;
+        int8_t     destoption;
+        int        octdir;
+        int        x, y, wx1, wx2, wy1, wy2;
+    } bitblt;
+
+#ifdef ENABLE_DA2_DEBUGVRAM
+    FILE    *mmdbg_fp;
+    FILE    *mmrdbg_fp;
+    uint32_t mmdbg_vidaddr;
+    uint32_t mmrdbg_vidaddr;
+#endif
+
+    uint8_t    pos_regs[8];
+    svga_t    *mb_vga;
+    uint8_t    monitorid;
+    pc_timer_t timer_vidupd;
+
+    int old_pos2;
+} da2_t;
+
+static void     da2_recalctimings(da2_t *da2);
+static void     da2_mmio_gc_writeW(uint32_t addr, uint16_t val, void *p);
+static void     da2_bitblt_exec(void *p);
+static void     da2_updatevidselector(da2_t *da2);
+static void     da2_reset_ioctl(da2_t *da2);
+static void     da2_reset(void *priv);
+static uint16_t da2_rightrotate(uint16_t data, uint8_t count);
+
+typedef union {
+    uint32_t d;
+    uint8_t  b[4];
+} vidseq32;
+
+typedef struct {
+    uint32_t p8[8];
+} pixel32;
+
+/* safety read for internal functions */
+static uint32_t
+da2_vram_r(uint32_t addr, da2_t *da2)
+{
+    if (addr & ~DA2_MASK_VRAM)
+        return DA2_INVALIDACCESS32;
+    return da2->vram[addr];
+}
+/* safety write for internal functions */
+static void
+da2_vram_w(uint32_t addr, uint8_t val, da2_t *da2)
+{
+    if (addr & ~DA2_MASK_VRAM)
+        return;
+    da2->vram[addr] = val;
+    return;
+}
+
+/*
+Param   Desc
+01      Color
+03      Bit Shift
+04      Select plane?
+05      Direction (1000h or 1100h) + Command? (40 or 48)
+08      Mask Left
+09      Mask Right
+0A      Plane Mask?
+0B      ROP
+            2000 NOT Source
+            200  Source / Pattern
+            20   NOT Dest
+            10   NOT Pattern
+            8    ?
+            0-3  Bit op (0 None, 1 AND, 2 OR, 3 XOR)
+0D
+20      Exec (1) or Exec without reset regs? (21h)
+21      Dest Pitch
+22      Src Pitch
+23      Tile W
+28      Tile H
+29      Dest Addr
+2A      Src Addr
+2B      Tile Addr
+2D      Octant for line drawing
+2F      Dest Write Option
+32      wx1, Dest X
+33      wx2, Size W
+34      wy1, Dest Y
+35      wy2, Size H
+*/
+/* write pixel data with rop (Note: bitmask must be in big endian) */
+static void
+da2_WritePlaneDataWithBitmask(uint32_t destaddr, const uint16_t mask, pixel32 *srcpx, da2_t *da2)
+{
+    uint32_t writepx[8];
+    destaddr &= 0xfffffffe; /* align to word address to work bit shift correctly */
+    // da2_log("DA2_WPDWB addr %x mask %x rop %x shift %d\n", destaddr, mask, da2->bitblt.raster_op, da2->bitblt.bitshift_destr);
+    da2->changedvram[(DA2_MASK_VRAMPLANE & destaddr) >> 9]       = changeframecount;
+    destaddr <<= 3;
+    /* read destination data with big endian order */
+    for (uint8_t i = 0; i < 8; i++)
+        writepx[i] = da2_vram_r((destaddr + 24) | i, da2)
+            | (da2_vram_r((destaddr + 16) | i, da2) << 8)
+            | (da2_vram_r((destaddr + 8) | i, da2) << 16)
+            | (da2_vram_r((destaddr + 0) | i, da2) << 24);
+
+    vidseq32 mask32in;
+    mask32in.d = (uint32_t) mask;
+    vidseq32 mask32;
+    mask32.b[3] = mask32in.b[0];
+    mask32.b[2] = mask32in.b[1];
+    mask32.d &= 0xffff0000;
+    for (uint8_t i = 0; i < 8; i++) {
+        if (da2->bitblt.bitshift_destr > 0)
+            srcpx->p8[i] <<= 16 - da2->bitblt.bitshift_destr;
+// #ifdef ENABLE_DA2_DEBUGBLT
+//         if (i == 0) {
+//             pclog("writeplane: src %08X mask %08X dest %08X\n", srcpx->p8[i], mask32.d, writepx[i]);
+//         }
+// #endif
+        if (da2->bitblt.raster_op & 0x2010) /* NOT Src or NOT Pattern */
+            srcpx->p8[i] = ~srcpx->p8[i] & mask32.d;
+        if (da2->bitblt.raster_op & 0x20) /* Dest NOT */
+            writepx[i] = (~writepx[i] & mask32.d) | (writepx[i] & ~mask32.d);
+        switch (da2->bitblt.raster_op & 0x03) {
+            case 0x00: /* None */
+                writepx[i] &= ~mask32.d;
+                writepx[i] |= srcpx->p8[i] & mask32.d;
+                break;
+            case 0x01: /* AND */
+                writepx[i] &= srcpx->p8[i] | ~mask32.d;
+                break;
+            case 0x02: /* OR */
+                writepx[i] |= srcpx->p8[i] & mask32.d;
+                break;
+            case 0x03: /* XOR */
+                writepx[i] ^= srcpx->p8[i] & mask32.d;
+                break;
+        }
+    }
+    for (uint8_t i = 0; i < 8; i++) {
+        da2_vram_w(destaddr | i, (writepx[i] >> 24) & 0xff, da2);
+        da2_vram_w((destaddr + 8) | i, (writepx[i] >> 16) & 0xff, da2);
+    }
+}
+
+static void
+da2_DrawColorWithBitmask(uint32_t destaddr, uint8_t color, uint16_t mask, da2_t *da2)
+{
+    pixel32 srcpx;
+    /* fill data with input color */
+    for (uint8_t i = 0; i < 8; i++)
+        srcpx.p8[i] = (color & (1 << i)) ? 0xffffffff : 0; /* read in word */
+
+    da2_WritePlaneDataWithBitmask(destaddr, mask, &srcpx, da2);
+}
+static void
+da2_CopyPlaneDataWithBitmask(uint32_t srcaddr, uint32_t destaddr, uint16_t mask, da2_t *da2)
+{
+    pixel32 srcpx;
+    srcaddr &= 0xfffffffe;
+    srcaddr <<= 3;
+    for (uint8_t i = 0; i < 8; i++)
+        srcpx.p8[i] = da2_vram_r((srcaddr + 24) | i, da2)
+            | (da2_vram_r((srcaddr + 16) | i, da2) << 8)
+            | (da2_vram_r((srcaddr + 8) | i, da2) << 16)
+            | (da2_vram_r((srcaddr + 0) | i, da2) << 24);
+
+    da2_WritePlaneDataWithBitmask(destaddr, mask, &srcpx, da2);
+}
+/* get font data for bitblt operation */
+static uint32_t
+getRAMFont(int32_t code, int line, int x, void *priv)
+{
+    da2_t   *da2   = (da2_t *) priv;
+    uint32_t font  = 0;
+#ifdef RESERVED_FOR_FUTURE_USE
+    int      fline = line - 2; /* Start line of drawing character (line >= 1 AND line < 24 + 1 ) */
+#endif
+    if (code < 0x100) {        /* SBCS 13x29 */
+        code *= 0x40;
+        code += DA2_GAIJIRAM_SBCS + (line * 2) + x;
+        font = da2->mmio.ram[code];
+        font <<= 8;
+        font |= da2->mmio.ram[code + 1];
+        font <<= 16;
+    } else if ((code >= 0xb000) && (code <= 0xb75f)) { /* DBCS 26x29  */
+        /* convert code->address in gaiji memory */
+        code -= 0xb000;
+        code = (code * 0x80) + (line * 4) + x;
+        font = da2->mmio.ram[code];
+        font <<= 8;
+        font |= da2->mmio.ram[code + 1];
+        font <<= 8;
+        font |= da2->mmio.ram[code + 2];
+        font <<= 8;
+        font |= da2->mmio.ram[code + 3];
+    } else
+        font = 0;
+    return font;
+}
+#ifdef RESERVED_FOR_FUTURE_USE
+/* Reverse the bit order of attribute code IBGR to IRGB(used in Mode 3 and Cursor Color) */
+static int8_t
+IBGRtoIRGB(uint8_t attr)
+{
+    attr = ((attr & 0x01) << 6) | ((attr & 0x02) << 4) | ((attr & 0x04) << 2) | ((attr & 0x08) << 4);
+    return attr >>= 4;
+}
+#endif
+static void
+da2_PutcharWithBitmask(uint32_t codeIBMJ, int width, uint16_t attr, int line, uint32_t destaddr, uint16_t maskl, uint16_t maskr, da2_t *da2)
+{
+    pixel32 srcpx;
+    uint8_t fg = (~attr >> 8) & 0x0f;
+    uint8_t bg = (~attr >> 12) & 0x0f;
+    uint32_t font = getRAMFont(codeIBMJ, line, 0, da2);
+    uint32_t fontinv;
+    if (width <= 2) {
+        fontinv = ~font;
+        for (uint8_t i = 0; i < 8; i++) {
+            srcpx.p8[i] = (fg & (1 << i)) ? font >> 16 : 0;
+            srcpx.p8[i] |= (bg & (1 << i)) ? fontinv >> 16 : 0;
+        }
+        da2_WritePlaneDataWithBitmask(destaddr, maskl, &srcpx, da2);
+        for (uint8_t i = 0; i < 8; i++) {
+            srcpx.p8[i] = (fg & (1 << i)) ? font : 0;
+            srcpx.p8[i] |= (bg & (1 << i)) ? fontinv : 0;
+        }
+        da2_WritePlaneDataWithBitmask(destaddr + 2, maskr, &srcpx, da2);
+    } else {
+        font = (font & 0xfff80000) | ((font & 0x0000ffff) << 3);
+        fontinv = ~font;
+        for (uint8_t i = 0; i < 8; i++) {
+            srcpx.p8[i] = (fg & (1 << i)) ? font >> 16 : 0;
+            srcpx.p8[i] |= (bg & (1 << i)) ? fontinv >> 16 : 0;
+        }
+        da2_WritePlaneDataWithBitmask(destaddr, maskl, &srcpx, da2);
+        for (uint8_t i = 0; i < 8; i++) {
+            srcpx.p8[i] = (fg & (1 << i)) ? font : 0;
+            srcpx.p8[i] |= (bg & (1 << i)) ? fontinv : 0;
+        }
+        if (da2->bitblt.destoption & 0x20) {
+            da2_WritePlaneDataWithBitmask(destaddr + 2,  maskr, &srcpx, da2);
+        } else {
+            da2_WritePlaneDataWithBitmask(destaddr + 2, 0xffff, &srcpx, da2);
+            for (uint8_t i = 0; i < 8; i++) {
+                srcpx.p8[i] = (fg & (1 << i)) ? font << 16 : 0;
+                srcpx.p8[i] |= (bg & (1 << i)) ? fontinv << 16 : 0;
+            }
+            da2_WritePlaneDataWithBitmask(destaddr + 4, maskr, &srcpx, da2);
+        }
+    }
+}
+#ifdef ENABLE_DA2_DEBUGBLT
+static uint8_t
+pixel1tohex(uint32_t addr, int index, da2_t *da2)
+{
+    uint8_t pixeldata = 0;
+    for (uint8_t i = 0; i < 8; j++) {
+        if (da2_vram_r(((addr << 3) | i) & (1 << (7 - index)), da2))
+            pixeldata++;
+    }
+    return pixeldata;
+}
+static void
+print_pixelbyte(uint32_t addr, da2_t *da2)
+{
+    for (uint8_t i = 0; i < 8; i++) {
+        pclog("%X", pixel1tohex(addr, i, da2));
+    }
+}
+static void
+print_bytetobin(uint8_t b)
+{
+    for (uint8_t i = 0; i < 8; i++) {
+        if (b & 0x80)
+            pclog("1");
+        else
+            pclog("0");
+        b <<= 1;
+    }
+}
+/* Convert internal char code to Shift JIS code */
+static int
+isKanji1(uint8_t chr)
+{
+    return (chr >= 0x81 && chr <= 0x9f) || (chr >= 0xe0 && chr <= 0xfc);
+}
+static int
+isKanji2(uint8_t chr)
+{
+    return (chr >= 0x40 && chr <= 0x7e) || (chr >= 0x80 && chr <= 0xfc);
+}
+static uint16_t
+IBMJtoSJIS(uint16_t knj)
+{
+    if (knj < 0x100)
+        return 0xffff;
+    knj -= 0x100;
+    if (knj <= 0x1f7d)
+        ; /* do nothing */
+    else if (knj >= 0xb700 && knj <= 0xb75f)
+        knj -= 0x90ec;
+    else if (knj >= 0xb3f0 && knj <= 0xb67f)
+        knj -= 0x906c;
+    else if (knj >= 0x8000 && knj <= 0x8183)
+        knj -= 0x5524;
+    else
+        return 0xffff;
+    uint32_t knj1 = knj / 0xBC;
+    uint32_t knj2 = knj - (knj1 * 0xBC);
+    knj1 += 0x81;
+    if (knj1 > 0x9F)
+        knj1 += 0x40;
+    knj2 += 0x40;
+    if (knj2 > 0x7E)
+        knj2++;
+    // if (!isKanji1(knj1)) return 0xffff;
+    // if (!isKanji2(knj2)) return 0xffff;
+    knj = knj1 << 8;
+    knj |= knj2;
+    return knj;
+}
+#endif
+
+static void
+da2_bitblt_parse(da2_t *da2)
+{
+    uint32_t value32;
+    uint64_t value64;
+    switch (da2->bitblt.payload[0]) {
+        case 0x88:
+        case 0x89:
+        case 0x95:
+            value32 = da2->bitblt.payload[3];
+            value32 <<= 8;
+            value32 |= da2->bitblt.payload[2];
+            da2_bltreglog("[%02x] %02x: %04x (%d)\n", da2->bitblt.payload[0], da2->bitblt.payload[1], value32, value32);
+            da2->bitblt.reg[da2->bitblt.payload[1]] = value32;
+            break;
+        case 0x91:
+            value32 = da2->bitblt.payload[5];
+            value32 <<= 8;
+            value32 |= da2->bitblt.payload[4];
+            value32 <<= 8;
+            value32 |= da2->bitblt.payload[3];
+            value32 <<= 8;
+            value32 |= da2->bitblt.payload[2];
+            da2_bltreglog("[%02x] %02x: %08x (%d)\n", da2->bitblt.payload[0], da2->bitblt.payload[1], value32, value32);
+            da2->bitblt.reg[da2->bitblt.payload[1]] = value32;
+            break;
+        case 0x99:
+            value64 = da2->bitblt.payload[7];
+            value64 <<= 8;
+            value64 = da2->bitblt.payload[6];
+            value64 <<= 8;
+            value64 = da2->bitblt.payload[5];
+            value64 <<= 8;
+            value64 |= da2->bitblt.payload[4];
+            value64 <<= 8;
+            value64 |= da2->bitblt.payload[3];
+            value64 <<= 8;
+            value64 |= da2->bitblt.payload[2];
+            da2_bltreglog("[%02x] %02x: %02x %02x %02x %02x %02x %02x\n", da2->bitblt.payload[0], da2->bitblt.payload[1], da2->bitblt.payload[2], da2->bitblt.payload[3],
+                          da2->bitblt.payload[4], da2->bitblt.payload[5], da2->bitblt.payload[6], da2->bitblt.payload[7]);
+            da2->bitblt.reg[da2->bitblt.payload[1]] = value64;
+            break;
+        case 0xa1:
+            value64 = da2->bitblt.payload[9];
+            value64 <<= 8;
+            value64 |= da2->bitblt.payload[8];
+            value64 <<= 8;
+            value64 |= da2->bitblt.payload[7];
+            value64 <<= 8;
+            value64 |= da2->bitblt.payload[6];
+            value64 <<= 8;
+            value64 |= da2->bitblt.payload[5];
+            value64 <<= 8;
+            value64 |= da2->bitblt.payload[4];
+            value64 <<= 8;
+            value64 |= da2->bitblt.payload[3];
+            value64 <<= 8;
+            value64 |= da2->bitblt.payload[2];
+            da2_bltreglog("[%02x] %02x: %02x %02x %02x %02x %02x %02x %02x %02x\n", da2->bitblt.payload[0], da2->bitblt.payload[1], da2->bitblt.payload[2], da2->bitblt.payload[3],
+                          da2->bitblt.payload[4], da2->bitblt.payload[5], da2->bitblt.payload[6], da2->bitblt.payload[7], da2->bitblt.payload[8], da2->bitblt.payload[9]);
+            da2->bitblt.reg[da2->bitblt.payload[1]] = value64;
+            break;
+        case 0x00: /* Win 3.0 Clock writes invalid zero data. */
+            break;
+        default:
+            da2_log("bltload: Unknown PreOP!\n");
+            break;
+    }
+    if (da2->bitblt.reg[0x20] & 0x01) { /* Execute Bitblt immediately (for OS/2 J1.3) */
+        da2->bitblt.exec = DA2_BLT_CLOAD;
+        da2_bitblt_exec(da2);
+    }
+    /* clear payload memory */
+    memset(da2->bitblt.payload, 0x00, DA2_BLT_MEMSIZE);
+    da2->bitblt.payload_addr = 0;
+    da2->bitblt.indata       = 0;
+}
+
+static void
+da2_bitblt_load(da2_t *da2)
+{
+    da2->bitblt.reg[0x20] = 0; /* need to stop execution */
+#ifdef ENABLE_DA2_DEBUGBLT
+    for (int i = 0; i < DA2_DEBUG_BLTLOG_SIZE; i++) {
+        da2->bitblt.debug_reg[DA2_DEBUG_BLTLOG_SIZE * da2->bitblt.debug_reg_ip + i] = da2->bitblt.reg[i];
+    }
+    da2->bitblt.debug_reg[DA2_DEBUG_BLTLOG_SIZE * (da2->bitblt.debug_reg_ip + 1) - 1] = 0;
+    da2->bitblt.debug_reg_ip++;
+    if ((DA2_DEBUG_BLTLOG_SIZE * da2->bitblt.debug_reg_ip) >= DA2_DEBUG_BLTLOG_MAX)
+        da2->bitblt.debug_reg_ip = 0;
+    da2->bitblt.debug_exesteps = 0;
+#endif
+    da2->bitblt.bitshift_destr = ((da2->bitblt.reg[0x03] >> 4) & 0x0f); /* set bit shift */
+    da2->bitblt.raster_op      = da2->bitblt.reg[0x0b];
+    da2->bitblt.destaddr       = da2->bitblt.reg[0x29];
+    da2->bitblt.size_x         = da2->bitblt.reg[0x33];
+    da2->bitblt.size_y         = da2->bitblt.reg[0x35];
+    da2->bitblt.destpitch      = da2->bitblt.reg[0x21];
+    da2->bitblt.srcpitch       = da2->bitblt.reg[0x22];
+    /*
+        DOS/V Extension 1040x725 some DBCS uses 0xB0 others 0x90
+    */
+    da2->bitblt.destoption = da2->bitblt.reg[0x2F];
+    if (da2->bitblt.destoption & 0x10) { /* destaddr -= 2, length += 1; */
+        da2->bitblt.destaddr -= 2;
+        da2->bitblt.size_x += 1;
+        da2->bitblt.destpitch -= 2;
+        da2->bitblt.srcpitch -= 2;
+    }
+    da2->bitblt.fcolor = da2->bitblt.reg[0x0];
+    da2->bitblt.maskl  = da2->bitblt.reg[0x8];
+    da2->bitblt.maskr  = da2->bitblt.reg[0x9];
+    da2->bitblt.x      = 0;
+    da2->bitblt.y      = 0;
+    da2->bitblt.exec   = DA2_BLT_CDONE;
+
+    /* Put DBCS char used by OS/2 and DOS/V Extension */
+    if (!(da2->bitblt.reg[0xb] & 0x08)) {
+        da2->bitblt.exec    = DA2_BLT_CPUTCHAR;
+        da2->bitblt.fcolor  = da2->bitblt.reg[0x1];
+        da2->bitblt.srcaddr = da2->bitblt.reg[0x12];
+        da2->bitblt.destaddr += 2;
+#ifdef ENABLE_DA2_DEBUGBLT
+        uint8_t sjis_h = IBMJtoSJIS(da2->bitblt.reg[0x12]) >> 8;
+        uint8_t sjis_l = IBMJtoSJIS(da2->bitblt.reg[0x12]) & 0xff;
+        if (da2->bitblt.reg[0x12] < 0x100) {
+            sjis_h = 0x20;
+            sjis_l = da2->bitblt.reg[0x12];
+        } else {
+            if (!(isKanji1(sjis_h)))
+                sjis_h = 0x3f;
+            if (!(isKanji2(sjis_l)))
+                sjis_l = 0x3f;
+        }
+        da2_log("put char src=%x, dest=%x, x=%d, y=%d, w=%d, h=%d, c=%c%c\n",
+                da2->bitblt.srcaddr, da2->bitblt.destaddr,
+                da2->bitblt.reg[0x29] % (da2->rowoffset * 2), da2->bitblt.reg[0x29] / (da2->rowoffset * 2),
+                da2->bitblt.size_x, da2->bitblt.size_y, sjis_h, sjis_l);
+#else
+        da2_log("put char src=%x, dest=%x, x=%d, y=%d, w=%d, h=%d\n",
+                da2->bitblt.srcaddr, da2->bitblt.destaddr,
+                da2->bitblt.reg[0x29] % (da2->rowoffset * 2), da2->bitblt.reg[0x29] / (da2->rowoffset * 2),
+                da2->bitblt.size_x, da2->bitblt.size_y);
+#endif
+
+    /* Draw a line */
+    } else if (da2->bitblt.reg[0x5] == 0x43) {
+        da2->bitblt.exec           = DA2_BLT_CLINE;
+        da2->bitblt.dest_x         = (da2->bitblt.reg[0x32] & 0xffff);
+        da2->bitblt.dest_y         = (da2->bitblt.reg[0x34] & 0xffff);
+        da2->bitblt.wx1            = (da2->bitblt.reg[0x32]) >> 16;
+        da2->bitblt.wx2            = (da2->bitblt.reg[0x33]) >> 16;
+        da2->bitblt.wy1            = (da2->bitblt.reg[0x34]) >> 16;
+        da2->bitblt.wy2            = (da2->bitblt.reg[0x35]) >> 16;
+        da2->bitblt.size_x         = abs((int16_t) (da2->bitblt.reg[0x33] & 0xffff) - da2->bitblt.dest_x);
+        da2->bitblt.size_y         = abs((int16_t) (da2->bitblt.reg[0x35] & 0xffff) - da2->bitblt.dest_y);
+        da2->bitblt.count          = 0;
+        da2->bitblt.octdir         = da2->bitblt.reg[0x2D];
+        da2->bitblt.bitshift_destr = 0;
+        if (da2->bitblt.octdir & 0x04) /* dX > dY */
+            da2->bitblt.d = 2 * da2->bitblt.size_y - da2->bitblt.size_x;
+        else
+            da2->bitblt.d = 2 * da2->bitblt.size_x - da2->bitblt.size_y;
+        da2->bitblt.x = da2->bitblt.dest_x;
+        da2->bitblt.y = da2->bitblt.dest_y;
+        da2_log("drawline x=%d, y=%d, dx=%d, dy=%d, oct=%dn",
+                da2->bitblt.dest_x, da2->bitblt.dest_y,
+                da2->bitblt.size_x, da2->bitblt.size_y, da2->bitblt.octdir);
+        da2_log("         x1=%d, x2=%d, y1=%d, y2=%d\n",
+                da2->bitblt.reg[0x32] & 0x7ff, da2->bitblt.reg[0x33] & 0x7ff,
+                da2->bitblt.reg[0x34] & 0x7ff, da2->bitblt.reg[0x35] & 0x7ff);
+        da2_log("        ux1=%d,ux2=%d,uy1=%d,uy2=%d\n",
+                (da2->bitblt.reg[0x32] >> 16) & 0x7ff, (da2->bitblt.reg[0x33] >> 16) & 0x7ff,
+                (da2->bitblt.reg[0x34] >> 16) & 0x7ff, (da2->bitblt.reg[0x35] >> 16) & 0x7ff);
+
+    /* Fill a rectangle (or draw a horizontal / vertical line) */
+    } else if ((da2->bitblt.reg[0x5] & 0xfff0) == 0x40 && da2->bitblt.reg[0x3D] == 0) {
+        da2_log("fillrect x=%d, y=%d, w=%d, h=%d, c=%d, 2f=%x, rowcount=%x\n",
+                da2->bitblt.reg[0x29] % (da2->rowoffset * 2), da2->bitblt.reg[0x29] / (da2->rowoffset * 2),
+                da2->bitblt.size_x, da2->bitblt.size_y, da2->bitblt.reg[0x0], da2->bitblt.reg[0x2F], da2->rowoffset * 2);
+        da2->bitblt.exec = DA2_BLT_CFILLRECT;
+        da2->bitblt.destaddr += 2;
+
+    /* Tiling a rectangle ??(transfer tile data multiple times) os/2 only */
+    } else if ((da2->bitblt.reg[0x5] & 0xfff0) == 0x0040 && da2->bitblt.reg[0x3D] == 0x40) {
+        da2->bitblt.exec = DA2_BLT_CFILLTILE;
+        da2->bitblt.destaddr += 2;
+        da2->bitblt.srcaddr = da2->bitblt.reg[0x2B];
+        da2->bitblt.tile_w  = da2->bitblt.reg[0x28];
+        da2_log("copy tile src=%x, dest=%x, x1=%d, y1=%d, x2=%d, y2=%d, w=%d, h=%d\n",
+                da2->bitblt.srcaddr, da2->bitblt.destaddr,
+                da2->bitblt.reg[0x2B] % (da2->rowoffset * 2), da2->bitblt.reg[0x2B] / (da2->rowoffset * 2),
+                da2->bitblt.reg[0x29] % (da2->rowoffset * 2), da2->bitblt.reg[0x29] / (da2->rowoffset * 2),
+                da2->bitblt.size_x, da2->bitblt.size_y);
+
+    /* Tiling a rectangle (transfer tile data multiple times) */
+    } else if ((da2->bitblt.reg[0x5] & 0xfff0) == 0x1040 && da2->bitblt.reg[0x3D] == 0x40) {
+        da2->bitblt.exec = DA2_BLT_CFILLTILE;
+        da2->bitblt.destaddr += 2;
+        da2->bitblt.srcaddr = da2->bitblt.reg[0x2B];
+        da2->bitblt.tile_w  = da2->bitblt.reg[0x28];
+        da2_log("copy tile src=%x, dest=%x, x1=%d, y1=%d, x2=%d, y2=%d, w=%d, h=%d\n",
+                da2->bitblt.srcaddr, da2->bitblt.destaddr,
+                da2->bitblt.reg[0x2B] % (da2->rowoffset * 2), da2->bitblt.reg[0x2B] / (da2->rowoffset * 2),
+                da2->bitblt.reg[0x29] % (da2->rowoffset * 2), da2->bitblt.reg[0x29] / (da2->rowoffset * 2),
+                da2->bitblt.size_x, da2->bitblt.size_y);
+
+    /* Block copy */
+    } else if ((da2->bitblt.reg[0x5] & 0xfff0) == 0x1040 && da2->bitblt.reg[0x3D] == 0x00) {
+        da2->bitblt.exec    = DA2_BLT_CCOPYF;
+        da2->bitblt.srcaddr = da2->bitblt.reg[0x2A];
+        da2->bitblt.destaddr += 2;
+        da2_log("copy block src=%x, dest=%x, x1=%d, y1=%d, x2=%d, y2=%d, w=%d, h=%d\n",
+                da2->bitblt.srcaddr, da2->bitblt.destaddr,
+                da2->bitblt.reg[0x2A] % (da2->rowoffset * 2), da2->bitblt.reg[0x2A] / (da2->rowoffset * 2),
+                da2->bitblt.reg[0x29] % (da2->rowoffset * 2), da2->bitblt.reg[0x29] / (da2->rowoffset * 2),
+                da2->bitblt.size_x, da2->bitblt.size_y);
+
+    /* Block copy but reversed direction */
+    } else if ((da2->bitblt.reg[0x5] & 0xfff0) == 0x1140 && da2->bitblt.reg[0x3D] == 0x00) {
+        da2->bitblt.exec    = DA2_BLT_CCOPYR;
+        da2->bitblt.srcaddr = da2->bitblt.reg[0x2A];
+        da2->bitblt.destaddr -= 2;
+        da2->bitblt.srcaddr -= 2;
+        da2_log("copy blockR src=%x, dest=%x, x1=%d, y1=%d, x2=%d, y2=%d, w=%d, h=%d\n",
+                da2->bitblt.srcaddr, da2->bitblt.destaddr,
+                da2->bitblt.reg[0x2A] % (da2->rowoffset * 2), da2->bitblt.reg[0x2A] / (da2->rowoffset * 2),
+                da2->bitblt.reg[0x29] % (da2->rowoffset * 2), da2->bitblt.reg[0x29] / (da2->rowoffset * 2),
+                da2->bitblt.size_x, da2->bitblt.size_y);
+    }
+}
+static void
+da2_bitblt_exec(void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+    // timer_set_delay_u64(&da2->bitblt.timer, da2->bitblt.timerspeed);
+#ifdef ENABLE_DA2_DEBUGBLT_DETAIL
+    if (!(da2->bitblt.debug_exesteps & 0xff))
+        da2_log("bitblt_exec: %d %d\n", da2->bitblt.exec, da2->bitblt.debug_exesteps);
+    da2->bitblt.debug_exesteps++;
+#else
+    da2_log("bltload_exec: %x, CS:PC=%4x:%4x\n", da2->bitblt.exec, CS, cpu_state.pc);
+#endif
+    switch (da2->bitblt.exec) {
+        case DA2_BLT_CIDLE:
+            // timer_disable(&da2->bitblt.timer);
+            break;
+        case DA2_BLT_CLOAD:
+            da2_bitblt_load(da2);
+            // da2->bitblt.indata = 0;
+            break;
+        case DA2_BLT_CLINE:
+            {
+                /* Draw a dot */
+                da2_bltlog("point: %d %d %d %d %d\n", da2->bitblt.x, da2->bitblt.y, da2->bitblt.d, da2->bitblt.x, da2->bitblt.y);
+                int destaddr  = da2->bitblt.y * (da2->rowoffset * 2) + da2->bitblt.x / 8;
+                int pixelmask = da2->bitblt.x % 16;
+                if (pixelmask >= 8)
+                    pixelmask = (0x8000 >> (pixelmask - 8));
+                else
+                    pixelmask = (0x80 >> pixelmask);
+
+                /* check the current position is inside the window */
+                if (da2->bitblt.x < da2->bitblt.wx1 || da2->bitblt.x > da2->bitblt.wx2
+                    || da2->bitblt.y < da2->bitblt.wy1 || da2->bitblt.y > da2->bitblt.wy2)
+                    ;
+                else
+                    da2_DrawColorWithBitmask(destaddr, da2->bitblt.fcolor, pixelmask, da2);
+                da2->bitblt.count++;
+
+                /* calculate the next position with Bresenham's line algorithm */
+                if (da2->bitblt.octdir & 0x04) { /* dX > dY */
+                    if (da2->bitblt.octdir & 0x02) {
+                        da2->bitblt.x++;
+                    } else {
+                        da2->bitblt.x--;
+                    }
+                    if (da2->bitblt.d >= 0) {
+                        da2->bitblt.d -= (2 * da2->bitblt.size_x);
+                        if (da2->bitblt.octdir & 0x01) {
+                            da2->bitblt.y++;
+                        } else {
+                            da2->bitblt.y--;
+                        }
+                    }
+                    da2->bitblt.d += (2 * da2->bitblt.size_y);
+                    if (da2->bitblt.count >= da2->bitblt.size_x)
+                        da2->bitblt.exec = DA2_BLT_CDONE;
+                } else {
+                    if (da2->bitblt.octdir & 0x01) {
+                        da2->bitblt.y++;
+                    } else {
+                        da2->bitblt.y--;
+                    }
+                    if (da2->bitblt.d >= 0) {
+                        da2->bitblt.d -= (2 * da2->bitblt.size_y);
+                        if (da2->bitblt.octdir & 0x02) {
+                            da2->bitblt.x++;
+                        } else {
+                            da2->bitblt.x--;
+                        }
+                    }
+                    da2->bitblt.d += (2 * da2->bitblt.size_x);
+                    if (da2->bitblt.count >= da2->bitblt.size_y)
+                        da2->bitblt.exec = DA2_BLT_CDONE;
+                }
+                break;
+            }
+        case DA2_BLT_CFILLRECT:
+            // da2_log("%x %x %x\n", da2->bitblt.destaddr, da2->bitblt.x, da2->bitblt.y);
+            if (da2->bitblt.x >= da2->bitblt.size_x - 1) {
+                da2_DrawColorWithBitmask(da2->bitblt.destaddr, da2->bitblt.fcolor, da2->bitblt.maskr, da2);
+                if (da2->bitblt.y >= da2->bitblt.size_y - 1) {
+                    da2->bitblt.exec = DA2_BLT_CDONE;
+                }
+                da2->bitblt.x = 0;
+                da2->bitblt.y++;
+                da2->bitblt.destaddr += da2->bitblt.destpitch + 2;
+            } else if (da2->bitblt.x == 0) {
+                da2_DrawColorWithBitmask(da2->bitblt.destaddr, da2->bitblt.fcolor, da2->bitblt.maskl, da2);
+                da2->bitblt.x++;
+            } else {
+                da2_DrawColorWithBitmask(da2->bitblt.destaddr, da2->bitblt.fcolor, 0xffff, da2);
+                da2->bitblt.x++;
+            }
+            da2->bitblt.destaddr += 2;
+            break;
+        case DA2_BLT_CFILLTILE:
+            {
+                int32_t tileaddr = da2->bitblt.srcaddr + (da2->bitblt.y % da2->bitblt.tile_w) * 2;
+                if (da2->bitblt.x >= da2->bitblt.size_x - 1) {
+                    da2_CopyPlaneDataWithBitmask(tileaddr, da2->bitblt.destaddr, da2->bitblt.maskr, da2);
+                    if (da2->bitblt.y >= da2->bitblt.size_y - 1) {
+                        da2->bitblt.exec = DA2_BLT_CDONE;
+                    }
+                    da2->bitblt.x = 0;
+                    da2->bitblt.y++;
+                    da2->bitblt.destaddr += da2->bitblt.destpitch + 2;
+                } else if (da2->bitblt.x == 0) {
+                    da2_CopyPlaneDataWithBitmask(tileaddr, da2->bitblt.destaddr, da2->bitblt.maskl, da2);
+                    da2->bitblt.x++;
+                } else {
+                    da2_CopyPlaneDataWithBitmask(tileaddr, da2->bitblt.destaddr, 0xffff, da2);
+                    da2->bitblt.x++;
+                }
+                da2->bitblt.destaddr += 2;
+                break;
+            }
+        case DA2_BLT_CCOPYF:
+            if (da2->bitblt.x >= da2->bitblt.size_x - 1) {
+                da2_CopyPlaneDataWithBitmask(da2->bitblt.srcaddr, da2->bitblt.destaddr, da2->bitblt.maskr, da2);
+                if (da2->bitblt.y >= da2->bitblt.size_y - 1) {
+                    da2->bitblt.exec = DA2_BLT_CDONE;
+                }
+                da2->bitblt.x = 0;
+                da2->bitblt.y++;
+                da2->bitblt.destaddr += da2->bitblt.destpitch + 2;
+                da2->bitblt.srcaddr += da2->bitblt.srcpitch + 2;
+            } else if (da2->bitblt.x == 0) {
+                da2_CopyPlaneDataWithBitmask(da2->bitblt.srcaddr, da2->bitblt.destaddr, da2->bitblt.maskl, da2);
+                da2->bitblt.x++;
+            } else {
+                da2_CopyPlaneDataWithBitmask(da2->bitblt.srcaddr, da2->bitblt.destaddr, 0xffff, da2);
+                da2->bitblt.x++;
+            }
+            da2->bitblt.destaddr += 2;
+            da2->bitblt.srcaddr += 2;
+            break;
+        case DA2_BLT_CCOPYR:
+            if (da2->bitblt.x >= da2->bitblt.size_x - 1) {
+                da2_CopyPlaneDataWithBitmask(da2->bitblt.srcaddr, da2->bitblt.destaddr, da2->bitblt.maskr, da2);
+                if (da2->bitblt.y >= da2->bitblt.size_y - 1) {
+                    da2->bitblt.exec = DA2_BLT_CDONE;
+                }
+                da2->bitblt.x = 0;
+                da2->bitblt.y++;
+                da2->bitblt.destaddr -= da2->bitblt.destpitch;
+                da2->bitblt.srcaddr -= da2->bitblt.srcpitch;
+                da2->bitblt.destaddr -= 2;
+                da2->bitblt.srcaddr -= 2;
+            } else if (da2->bitblt.x == 0) {
+                da2_CopyPlaneDataWithBitmask(da2->bitblt.srcaddr, da2->bitblt.destaddr, da2->bitblt.maskl, da2);
+                da2->bitblt.x++;
+            } else {
+                da2_CopyPlaneDataWithBitmask(da2->bitblt.srcaddr, da2->bitblt.destaddr, 0xffff, da2);
+                da2->bitblt.x++;
+            }
+            da2->bitblt.destaddr -= 2;
+            da2->bitblt.srcaddr -= 2;
+            break;
+        case DA2_BLT_CPUTCHAR: /* used in OS/2 J1.3 wo ROM patch. TODO: still not work */
+            // pclog("scr %x dest %x x %x y %x\n", da2->bitblt.srcaddr, da2->bitblt.destaddr, da2->bitblt.x, da2->bitblt.y);
+            if (da2->bitblt.y >= da2->bitblt.size_y) {
+                da2->bitblt.exec = DA2_BLT_CDONE;
+            } else {
+                da2_PutcharWithBitmask(da2->bitblt.srcaddr, da2->bitblt.size_x, da2->bitblt.fcolor, da2->bitblt.y, da2->bitblt.destaddr, da2->bitblt.maskl, da2->bitblt.maskr, da2);
+            }
+            da2->bitblt.y++;
+            da2->bitblt.destaddr += da2->bitblt.size_x * 2 + da2->bitblt.destpitch + 2;
+            break;
+        case DA2_BLT_CDONE:
+            // if (!(da2->bitblt.reg[0x20] & 0x20)) {
+            //     /* initialize regs and set magic value for debug dump */
+            //     for (int i = 0; i < DA2_BLT_REGSIZE; i++) {
+            //         if (da2->bitblt.reg[i] != DA2_DEBUG_BLT_NEVERUSED)
+            //             da2->bitblt.reg[i] = DA2_DEBUG_BLT_USEDRESET;
+            //     }
+            // } else /* without init regs */
+            // if (da2->bitblt.indata)
+            //     da2->bitblt.exec = DA2_BLT_CLOAD;
+            // else
+            da2->bitblt.exec = DA2_BLT_CIDLE;
+            break;
+    }
+}
+static void
+da2_bitblt_dopayload(void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+    timer_set_delay_u64(&da2->bitblt.timer, da2->bitblt.timerspeed);
+    /* do async operation but it causes the scrolling text glitch in OS/2 J1.3 Command Prompt (TODO) */
+    if (da2->bitblt.exec != DA2_BLT_CIDLE) {
+        while (da2->bitblt.exec != DA2_BLT_CIDLE) /* this disables async operation */
+            da2_bitblt_exec(da2);
+    } else if ((da2->bitblt.reg[0x20] & 0x01) && (da2->bitblt.exec == DA2_BLT_CIDLE)) {
+        da2->bitblt.exec = DA2_BLT_CLOAD;
+        da2_bitblt_exec(da2);
+    } else {
+        // timer_disable(&da2->bitblt.timer);
+    }
+}
+static void
+da2_bitblt_addpayload(uint8_t val, void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+    da2->bitblt.indata = 1;
+    if (da2->bitblt.payload_addr >= DA2_BLT_MEMSIZE)
+        da2_log("da2_mmio_write payload overflow! addr %x, val %x\n", da2->bitblt.payload_addr, val);
+    else {
+        if (da2->bitblt.payload_addr == 0) {
+            da2->bitblt.payload[da2->bitblt.payload_addr] = val;
+            da2->bitblt.payload_addr++;
+            switch (val) {
+                case 0x88:
+                case 0x89:
+                case 0x95:
+                    da2->bitblt.payload_opsize = 3;
+                    break;
+                case 0x91:
+                    da2->bitblt.payload_opsize = 5;
+                    break;
+                case 0x99:
+                    da2->bitblt.payload_opsize = 7;
+                    break;
+                case 0xa1:
+                    da2->bitblt.payload_opsize = 9;
+                    break;
+                default:
+                    da2_log("addpayload: Unknown PreOP! %x\n", val);
+                    da2->bitblt.payload_addr = 0; /* ignore input */
+                    break;
+            }
+        } else if (da2->bitblt.payload_addr < da2->bitblt.payload_opsize) {
+            da2->bitblt.payload[da2->bitblt.payload_addr] = val;
+            da2->bitblt.payload_addr++;
+        } else if (da2->bitblt.payload_addr == da2->bitblt.payload_opsize) {
+            da2->bitblt.payload[da2->bitblt.payload_addr] = val;
+            da2->bitblt.payload_opsize = 0; /* reset */
+            da2_bitblt_parse(da2);
+        }
+    }
+}
+
+static void
+da2_out(uint16_t addr, uint16_t val, void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+    int    oldval;
+    /*
+    3E0 3E1     Sequencer Registers (undoc)
+    3E2 3E3     Font Registers (undoc)
+    3E4 3E5     CRT Control Registers (undoc)
+    3E8 3E9     Attribute Controller Registers (undoc)
+    3EA 3EB 3EC Graphics Contoller Registers
+    */
+    switch (addr) {
+        case 0x3c6: /* PEL Mask */
+            da2->dac_mask = val;
+            break;
+        case 0x3C7: /* Read Address */
+            da2->dac_read = val;
+            da2->dac_pos  = 0;
+            break;
+        case 0x3C8: /* Write Address */
+            da2->dac_write = val;
+            da2->dac_read  = val - 1;
+            da2->dac_pos   = 0;
+            break;
+        case 0x3C9: /* Data */
+            // da2_iolog("DA2 Out addr %03X idx %d:%d val %02X %04X:%04X esdi %04X:%04X\n", addr, da2->dac_write, da2->dac_pos, val, cs >> 4, cpu_state.pc, ES, DI);
+            da2->dac_status = 0;
+            da2->fullchange = changeframecount;
+            switch (da2->dac_pos) {
+                case 0:
+                    da2->dac_r = val;
+                    da2->dac_pos++;
+                    break;
+                case 1:
+                    da2->dac_g = val;
+                    da2->dac_pos++;
+                    break;
+                case 2:
+                    da2->vgapal[da2->dac_write].r = da2->dac_r;
+                    da2->vgapal[da2->dac_write].g = da2->dac_g;
+                    da2->vgapal[da2->dac_write].b = val;
+                    // if (da2->ramdac_type == RAMDAC_8BIT)
+                    //     da2->pallook[da2->dac_write] = makecol32(da2->vgapal[da2->dac_write].r, da2->vgapal[da2->dac_write].g, da2->vgapal[da2->dac_write].b);
+                    // else
+                    da2->pallook[da2->dac_write] = makecol32((da2->vgapal[da2->dac_write].r & 0x3f) * 4, (da2->vgapal[da2->dac_write].g & 0x3f) * 4, (da2->vgapal[da2->dac_write].b & 0x3f) * 4);
+                    da2->dac_pos                 = 0;
+                    da2->dac_write               = (da2->dac_write + 1) & 255;
+                    break;
+            }
+            break;
+        case LS_INDEX:
+            da2->ioctladdr = val;
+            break;
+        case LS_DATA:
+            // da2_iolog("DA2 Out addr %03X idx %02X val %02X %04X:%04X\n", addr, da2->ioctladdr, val, cs >> 4, cpu_state.pc);
+            if (da2->ioctladdr > 0xf)
+                return;
+            if (da2->ioctl[da2->ioctladdr & 15] != val)
+                da2_iolog("ioctl changed %x: %x -> %x  %04X:%04X\n", da2->ioctladdr & 15, da2->ioctl[da2->ioctladdr & 15], val, cs >> 4, cpu_state.pc);
+            oldval                     = da2->ioctl[da2->ioctladdr];
+            da2->ioctl[da2->ioctladdr] = val;
+            if (oldval != val) {
+                if (da2->ioctladdr == LS_RESET && val & 0x01) /* Reset register */
+                    da2_reset_ioctl(da2);
+                else if (da2->ioctladdr == LS_MODE && ((oldval ^ val) & 0x03)) { /* Mode register */
+                    da2->fullchange = changeframecount;
+                    da2_recalctimings(da2);
+                    da2_updatevidselector(da2);
+                }
+            }
+            break;
+        case LF_INDEX:
+            da2->fctladdr = val;
+            break;
+        case LF_DATA:
+            // da2_iolog("DA2 Out addr %03X idx %02X val %02X %04X:%04X\n", addr, da2->fctladdr, val, cs >> 4, cpu_state.pc);
+            if (da2->fctladdr > 0x1f)
+                return;
+            if (da2->fctl[da2->fctladdr & 0x1f] != val)
+                da2_iolog("fctl changed %x: %x -> %x  %04X:%04X\n", da2->fctladdr & 0x1f, da2->fctl[da2->fctladdr & 0x1f], val, cs >> 4, cpu_state.pc);
+            oldval                   = da2->fctl[da2->fctladdr];
+            da2->fctl[da2->fctladdr] = val;
+            if (da2->fctladdr == 0 && oldval != val) {
+                da2_iolog("DA2 Out FCTL addr %03X idx %02X val %02X %04X:%04X\n", addr, da2->fctladdr, val, cs >> 4, cpu_state.pc);
+            } else if ((da2->fctladdr == LF_PD_RESET) && ((val & 0x7) == 7)) {
+                /* Reset Bitblt busy */
+                da2->bitblt.indata = 0;
+                da2->bitblt.exec = DA2_BLT_CIDLE;
+            }
+            break;
+        case LC_INDEX:
+            da2->crtcaddr = val;
+            break;
+        case LC_DATA:
+            if (da2->crtcaddr > 0x1f)
+                return;
+            if (!(da2->crtcaddr == LC_CURSOR_LOC_HIGH || da2->crtcaddr == LC_CURSOR_LOC_LOWJ))
+                da2_iolog("DA2 Out addr %03X idx %02X val %02X %04X:%04X\n", addr, da2->crtcaddr, val, cs >> 4, cpu_state.pc);
+            if (!(da2->crtc[da2->crtcaddr] ^ val))
+                return;
+            switch (da2->crtcaddr) {
+                case LC_CRTC_OVERFLOW:
+                    // return;
+                    break;
+                case LC_MAXIMUM_SCAN_LINE:
+                    if (!(da2->ioctl[LS_MODE] & 0x01)) /* 16 or 256 color graphics mode */
+                        val = 0;
+                    break;
+                case LC_VERTICAL_TOTALJ:      /* Vertical Total */
+                case LC_VERTICAL_SYNC_START:  /* Vertical Retrace Start Register */
+                case LC_V_DISPLAY_ENABLE_END: /* Vertical Display End Register */
+                case LC_START_VERTICAL_BLANK: /* Start Vertical Blank Register */
+#ifdef ENABLE_DA2_DEBUGFULLSCREEN
+                    val = 0x400; /* for debugging bitblt in Win 3.x */
+#endif
+                    break;
+            }
+            da2->crtc[da2->crtcaddr] = val;
+            switch (da2->crtcaddr) {
+                // case LC_START_ADDRESS_HIGH:
+                // case LC_START_ADDRESS_LOW:
+                /* The DOS J4.0 MODE 4 command and OS/2 driver write 0xFF00.
+                   OS/2 DOS MODE 1 setup reads this to set the base line, but it causes the screen glitch. */
+                    // outb(0x680, da2->crtc[LC_START_ADDRESS_LOW]);
+                    // outb(0x680, da2->crtc[LC_START_ADDRESS_HIGH]);
+                // break;
+                case LC_VIEWPORT_SELECT:
+                    /* backup some current crtc regs */
+                    for (int i = LC_START_ADDRESS_HIGH; i <= LC_START_ADDRESS_LOW; i++) {
+                        da2->crtc_vpreg[(da2->crtc_vpsel * 0x20) + i] = da2->crtc[i];
+                    }
+                    da2->crtc_vpsel = (val >> 6) & 3;
+                    /* restore crtc regs */
+                    for (int i = LC_START_ADDRESS_HIGH; i <= LC_START_ADDRESS_LOW; i++) {
+                        da2->crtc[i] = da2->crtc_vpreg[(da2->crtc_vpsel * 0x20) + i];
+                    }
+                    break;
+                default:
+                    break;
+            }
+            switch (da2->crtcaddr) {
+                case LC_H_DISPLAY_ENABLE_END:
+                case LC_VERTICAL_TOTALJ:
+                case LC_MAXIMUM_SCAN_LINE:
+                case LC_START_ADDRESS_HIGH:
+                case LC_START_ADDRESS_LOW:
+                case LC_VERTICAL_SYNC_START:
+                case LC_V_DISPLAY_ENABLE_END:
+                case LC_START_VERTICAL_BLANK:
+                case LC_LINE_COMPAREJ:
+                case LC_START_H_DISPLAY_ENAB:
+                case LC_START_V_DISPLAY_ENAB:
+                case LC_VIEWPORT_SELECT:
+                case LC_VIEWPORT_PRIORITY:
+                    da2->fullchange = changeframecount;
+                    da2_recalctimings(da2);
+                    break;
+                default:
+                    break;
+            }
+            break;
+        case LV_PORT:
+            // da2_iolog("DA2 Out addr %03X val %02X ff %d %04X:%04X\n", addr, val, da2->attrff,cs >> 4, cpu_state.pc);
+            if (!da2->attrff) {
+                da2->attraddr = val & 0x3f;
+                if ((val & 0x20) != (da2->attr_palette_enable & 0x20)) {
+                    da2->fullchange          = 3;
+                    da2->attr_palette_enable = val & 0x20;
+                    da2_recalctimings(da2);
+                }
+                // da2_iolog("set attraddr: %X\n", da2->attraddr);
+            } else {
+                if ((da2->attraddr == LV_PANNING) && (da2->attrc[LV_PANNING] != val))
+                    da2->fullchange = changeframecount;
+                if (da2->attrc[da2->attraddr & 0x3f] != val)
+                    da2_iolog("attr changed %x: %x -> %x\n", da2->attraddr & 0x3f, da2->attrc[da2->attraddr & 0x3f], val);
+                da2->attrc[da2->attraddr & 0x3f] = val;
+                // da2_iolog("set attrc %x: %x\n", da2->attraddr & 31, val);
+                if (da2->attraddr < 16)
+                    da2->fullchange = changeframecount;
+                if (da2->attraddr == LV_MODE_CONTROL || da2->attraddr < 0x10) {
+                    for (uint8_t c = 0; c < 16; c++) {
+                        // if (da2->attrc[LV_MODE_CONTROL] & 0x80) da2->egapal[c] = (da2->attrc[c] & 0xf) | ((da2->attrc[0x14] & 0xf) << 4);
+                        // else                             da2->egapal[c] = (da2->attrc[c] & 0x3f) | ((da2->attrc[0x14] & 0xc) << 4);
+                        if (da2->attrc[LV_MODE_CONTROL] & 0x80)
+                            da2->egapal[c] = da2->attrc[c] & 0xf;
+                        else
+                            da2->egapal[c] = da2->attrc[c] & 0x3f;
+                    }
+                }
+                switch (da2->attraddr) {
+                    case LV_COLOR_PLANE_ENAB:
+                        if ((val & 0xff) != da2->plane_mask)
+                            da2->fullchange = changeframecount;
+                        da2->plane_mask = val & 0xff;
+                        break;
+                    case LV_CURSOR_CONTROL:
+                        switch (val & 0x18) {
+                            case 0x08: /* fast blink */
+                                da2->blinkconf = 0x10;
+                                break;
+                            case 0x18: /* slow blink */
+                                da2->blinkconf = 0x20;
+                                break;
+                            default: /* no blink */
+                                da2->blinkconf = 0xff;
+                                break;
+                        }
+                        break;
+                    case LV_MODE_CONTROL:
+                    case LV_ATTRIBUTE_CNTL:
+                    case LV_COMPATIBILITY:
+                        da2_recalctimings(da2);
+                        break;
+                    default:
+                        break;
+                }
+            }
+            da2->attrff ^= 1;
+            break;
+        case 0x3E9:
+            /* VZ Editor's CURSOR.COM writes data via this port */
+            da2->attrc[da2->attraddr & 0x3f] = val;
+            break;
+        case LG_INDEX:
+            da2_iolog("DA2 Out addr %03X val %02X\n", addr, val);
+            da2->gdcaddr = val;
+            break;
+        case LG_DATA:
+        // if(da2->gdcaddr != 8 && da2->gdcaddr != 9) da2_iolog("DA2 GCOut idx %X val %02X %04X:%04X esdi %04X:%04X\n", da2->gdcaddr, val, cs >> 4, cpu_state.pc, ES, DI);
+            da2_iolog("DA2 Out addr %03X idx %02X val %02X\n", addr, da2->gdcaddr, val);
+            da2->gdcreg[da2->gdcaddr & 0x0f] = val & 0xff;
+            switch (da2->gdcaddr & 0x1f) {
+                case LG_READ_MAP_SELECT:
+                    da2->readplane = val & 0x7;
+                    break;
+                case LG_MODE:
+                    da2->writemode = val & 3;
+                     /* Resettting masks here gliches chart drawing in IBM Multitool Chart K3.1 */
+                    // da2->gdcreg[LG_BIT_MASK_LOW] = 0xff;
+                    // da2->gdcreg[LG_BIT_MASK_HIGH] = 0xff;
+                    // da2->planemask = 0xff;
+                    // da2->gdcreg[LG_MAP_MASKJ] = 0xff;
+                    break;
+                case LG_MAP_MASKJ:
+                    da2->planemask = val & 0xff;
+                    break;
+                case LG_COMMAND:
+                    break;
+                case LG_SET_RESET_2:
+                    da2_iolog("!!!DA2 GC Out addr %03X idx 10 val %02X\n", addr, val);
+                    return;
+            }
+            break;
+        // case 0x3ed: /* used by Windows 3.1 display driver */
+        //     da2->gdcreg[5] = val & 0xff;
+        //     break;
+        default:
+            da2_iolog("DA2? Out addr %03X val %02X\n", addr, val);
+            break;
+    }
+}
+
+static uint16_t
+da2_in(uint16_t addr, void *priv)
+{
+    da2_t   *da2  = (da2_t *) priv;
+    uint16_t temp = 0xff;
+
+    switch (addr) {
+        case 0x3c3:
+            temp = 0;
+            break;
+        case 0x3c6:
+            temp = da2->dac_mask;
+            break;
+        case 0x3c7:
+            temp = da2->dac_status;
+            break;
+        case 0x3c8:
+            temp = da2->dac_write;
+            break;
+        case 0x3c9:
+            da2->dac_status = 3;
+            switch (da2->dac_pos) {
+                case 0:
+                    da2->dac_pos++;
+                    temp = da2->vgapal[da2->dac_read].r & 0x3f;
+                    break;
+                case 1:
+                    da2->dac_pos++;
+                    temp = da2->vgapal[da2->dac_read].g & 0x3f;
+                    break;
+                case 2:
+                    da2->dac_pos  = 0;
+                    da2->dac_read = (da2->dac_read + 1) & 255;
+                    temp          = da2->vgapal[(da2->dac_read - 1) & 255].b & 0x3f;
+                    break;
+            }
+            break;
+        case LS_INDEX:
+            temp = da2->ioctladdr;
+            break;
+        case LS_DATA:
+            // da2->ioctl[3] = 0x80; /* 3E1h:3 bit 7 color monitor, bit 3 busy(GC) bit 0 busy (IO?) */
+            if (da2->ioctladdr > 0xf)
+                return DA2_INVALIDACCESS16;
+            temp = da2->ioctl[da2->ioctladdr];
+            if (da2->ioctladdr == LS_STATUS) {             /* Status register */
+                if (da2->attrc[LV_COMPATIBILITY] & 0x08) { /* for detecting monitor type and cable wiring */
+                    if (da2->monitorid == DA2_DCONFIG_MONTYPE_MONO) {
+                        /* grayscale monitor */
+                        if ((da2->vgapal[0].r >= 10) || (da2->vgapal[0].g >= 40) || (da2->vgapal[0].b >= 10))
+                            temp &= 0x7F; /* Inactive when the RGB output voltage is high (or the cable is not connected to a color monitor). */
+                        else
+                            temp |= 0x80; /* Active when the RGB output voltage is low and the cable is connected to a color monitor.
+                                             If the cable or the monitor is wrong, it becomes inactive. */
+                    } else {
+                        /* color monitor */
+                        if ((da2->vgapal[0].r + da2->vgapal[0].g + da2->vgapal[0].b) >= 80)
+                            temp &= 0x7F;
+                        else
+                            temp |= 0x80;
+                    }
+                } else {
+                    temp |= 0x80;
+                }
+                temp &= 0xf6;           /* clear busy bit */
+                // if (da2->bitblt.indata) /* for OS/2 J1.3 command prompt scrolling  */
+                //     da2_bitblt_dopayload(da2);
+                if (da2->bitblt.exec != DA2_BLT_CIDLE) {
+                    temp |= 0x09; /* wait (bit 3 + bit 0) ? need verify */
+                }
+                // if (da2->bitblt.indata) temp |= 0x08;
+#ifdef ENABLE_DA2_DEBUGMONWAIT
+                da2_iolog("DA2 In %04X(%02X) %04X %04X:%04X\n", addr, da2->ioctladdr, temp, cs >> 4, cpu_state.pc);
+#endif
+            }
+            break;
+        case LF_INDEX:
+            temp = da2->fctladdr;
+            break;
+        case LF_DATA:
+            if (da2->fctladdr > 0x1f)
+                return DA2_INVALIDACCESS16;
+            temp = da2->fctl[da2->fctladdr];
+            break;
+        case LC_INDEX:
+            temp = da2->crtcaddr;
+            break;
+        case LC_DATA:
+            if (da2->crtcaddr > 0x1f)
+                return DA2_INVALIDACCESS16;
+            temp = da2->crtc[da2->crtcaddr];
+            break;
+        case LV_PORT:
+            temp = da2->attraddr | da2->attr_palette_enable;
+            break;
+        case 0x3E9:
+            if (da2->attraddr == LV_RAS_STATUS_VIDEO) /* this maybe equivalent to 3ba / 3da ISR1 */
+            {
+                if (da2->cgastat & 0x01)
+                    da2->cgastat &= ~0x30;
+                else
+                    da2->cgastat ^= 0x30; /* toggle */
+                if (da2->cgastat & 0x08)
+                    da2->cgastat &= ~0x08;
+                else
+                    da2->cgastat ^= 0x08; /* toggle */
+                temp = da2->cgastat;
+            } else
+                temp = da2->attrc[da2->attraddr];
+            // da2_iolog("DA2 In %04X(%02X) %04X %04X:%04X\n", addr, da2->attraddr, temp, cs >> 4, cpu_state.pc);
+            da2->attrff = 0; /* reset flipflop (VGA does not reset flipflop) */
+            break;
+        case LG_INDEX:
+            temp = da2->gdcaddr;
+            break;
+        case LG_DATA:
+            temp = da2->gdcreg[da2->gdcaddr & 0x1f];
+            // da2_iolog("DA2 In %04X(%02X) %04X %04X:%04X\n", addr, da2->gdcaddr, temp, cs >> 4, cpu_state.pc);
+            break;
+    }
+    // da2_iolog("DA2 In %04X %04X %04X:%04X\n", addr, temp, cs >> 4, cpu_state.pc);
+    return temp;
+}
+/*
+ * Write I/O
+ * out b(idx), out b(data), out b(data)
+ * out b(idx), out w(data)
+ * out b(idx), out w(data), out b(data)
+ *             out w(idx)
+ * Read I/O
+ * out b(idx), in b(data)
+ * out b(idx), in b, in b(data)
+ * out b(idx), in w(data)
+ */
+static void
+da2_outb(uint16_t addr, uint8_t val, void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+    da2_iolog("DA2 Outb addr %03X val %02X %04X:%04X es:di=%x:%x ds:si=%x:%x\n", addr, val, cs >> 4, cpu_state.pc, ES, DI, DS, SI);
+    da2->inflipflop = 0;
+    switch (addr) {
+        case LS_DATA:
+        case LF_DATA:
+        case LC_DATA:
+        case LG_DATA:
+            if (da2->outflipflop) {
+                /* out b(idx), out b(data), out b(data) */
+                da2->iolatch |= (uint16_t) val << 8;
+                da2->outflipflop = 0;
+            } else { //
+                da2->iolatch     = val;
+                da2->outflipflop = 1;
+            }
+            break;
+        case LS_INDEX:
+        case LF_INDEX:
+        case LC_INDEX:
+        case LG_INDEX:
+        default:
+            da2->iolatch     = val;
+            da2->outflipflop = 0;
+            break;
+    }
+    da2_out(addr, da2->iolatch, da2);
+}
+void
+da2_outw(uint16_t addr, uint16_t val, void *priv)
+{
+    da2_iolog("DA2 Outw addr %03X val %04X\n", addr, val);
+    da2_t *da2      = (da2_t *) priv;
+    da2->inflipflop = 0;
+    switch (addr) {
+        case LS_INDEX:
+        case LF_INDEX:
+        case LC_INDEX:
+        case LG_INDEX:
+            da2_out(addr, val & 0xff, da2);
+            da2->iolatch = val >> 8;
+            da2_out(addr + 1, da2->iolatch, da2);
+            da2->outflipflop = 1;
+            break;
+        case LV_PORT:
+            da2->attrff = 0;
+            da2_out(addr, val & 0xff, da2);
+            da2_out(addr, val >> 8, da2);
+            da2->outflipflop = 0;
+            break;
+        case 0x3EC:
+            // da2_iolog("DA2 Outw addr %03X val %04X %04X:%04X\n", addr, val, cs >> 4, cpu_state.pc);
+            da2_out(LG_DATA, val >> 8, da2);
+            /* reset masks for compatibility with Win 3.1 solitaire */
+            if (da2->gdcaddr == LG_MODE) {
+                da2->gdcreg[LG_BIT_MASK_LOW]  = 0xff;
+                da2->gdcreg[LG_BIT_MASK_HIGH] = 0xff;
+                da2->planemask                = 0xff;
+                da2->gdcreg[LG_MAP_MASKJ]     = 0xff;
+            }
+            break;
+        case 0x3ED:
+            da2->gdcaddr = LG_MODE;
+            da2_out(LG_DATA, val, da2);
+            break;
+        case LS_DATA:
+        case LF_DATA:
+        case LC_DATA:
+        case LG_DATA:
+        default:
+            da2_out(addr, val, da2);
+            da2->outflipflop = 0;
+            break;
+        case AC_REG:
+            /* no register is revealed */
+            da2_iolog("DA2 Outw addr %03X val %04X %04X:%04X\n", addr, val, cs >> 4, cpu_state.pc);
+            da2->reg3ee[val & 0x0f] = val >> 8;
+            break;
+    }
+}
+static uint8_t
+da2_inb(uint16_t addr, void *priv)
+{
+    uint8_t temp;
+    da2_t  *da2      = (da2_t *) priv;
+    da2->outflipflop = 0;
+    switch (addr) {
+        case LC_DATA:
+            if (da2->inflipflop) {
+                /* out b(idx), in b(low data), in b(high data) */
+                temp            = da2->iolatch >> 8;
+                da2->inflipflop = 0;
+            } else { //
+                da2->iolatch    = da2_in(addr, da2);
+                temp            = da2->iolatch & 0xff;
+                da2->inflipflop = 1;
+            }
+            break;
+        case LS_INDEX:
+        case LF_INDEX:
+        case LC_INDEX:
+        case LG_INDEX:
+        case LS_DATA:
+        case LF_DATA:
+        case LG_DATA:
+        default:
+            temp            = da2_in(addr, da2) & 0xff;
+            da2->inflipflop = 0;
+            break;
+    }
+    // da2_iolog("DA2 Inb %04X %02X %04X:%04X\n", addr, temp, cs >> 4, cpu_state.pc);
+    return temp;
+}
+static uint16_t
+da2_inw(uint16_t addr, void *priv)
+{
+    uint16_t temp;
+    da2_t *da2       = (da2_t *) priv;
+    da2->inflipflop  = 0;
+    da2->outflipflop = 0;
+    temp = da2_in(addr, da2);
+    da2_iolog("DA2 Inw addr %03X val %04X\n", addr, temp);
+    return temp;
+}
+/* IO 03DAh : Input Status Register 2 for DOSSHELL used by DOS J4.0 */
+static uint8_t
+da2_in_ISR(uint16_t addr, void *priv)
+{
+    da2_t  *da2  = (da2_t *) priv;
+    uint8_t temp = 0;
+    if (addr == 0x3da) {
+        if (da2->cgastat & 0x01)
+            da2->cgastat &= ~0x30;
+        else
+            da2->cgastat ^= 0x30;
+        temp = da2->cgastat;
+    }
+    // da2_iolog("DA2D In %04X %04X %04X:%04X\n", addr, temp, cs >> 4, cpu_state.pc);
+    return temp;
+}
+
+static void
+da2_out_ISR(uint16_t addr, uint8_t val, void *priv)
+{
+    // da2_t* da2 = (da2_t*) priv;
+    da2_iolog("DA2D Out %04X %04X %04X:%04X\n", addr, val, cs >> 4, cpu_state.pc);
+}
+
+/*
+The IBM 5550 character mode addresses video memory between E0000h and E0FFFh.
+ [Character drawing]
+ SBCS:
+   1 2   ...       13
+ 1  |   H.Grid
+    |----------------
+ 2  |    Space
+ 3 V|
+   .|
+   G|  Font Pattern
+   r| (12x24 pixels)
+   i|
+   d|
+26  |________________
+27       Space
+     ----------------
+28     Underscore    ]
+     ---------------- >Cursor Position
+29                   ]
+
+ DBCS:
+   1 2   ...    13 1 2  ...  12 13
+ 1  |   H.Grid    |   H.Grid   |
+   -|--------------------------|-
+ 2  |    Space    |    Space   |
+   -|--------------------------|-
+ 3 V|             |            |S
+   .|             |            |p
+   G|        Font Pattern      |a
+   r|       (24x24 pixels)     |c
+   i|             |            |e
+   d|             |            |
+26  |_____________|____________|
+27  |    Space    |    Space
+   ------------------------------
+28  |  Underscore |  Underscore  ]
+   ------------------------------ >Cursor Position
+29  |             |              ]
+
+ [Attributes]
+ Video mode 08h:
+  7      6      5      4      3      2      1      0
+  Blink |Under |HGrid |VGrid |Bright|Revers|FntSet|DBCS/SBCS|
+
+ Video mode 0Eh:
+  -Blue |-Green|HGrid |VGrid |-Red  |Revers|FntSet|DBCS/SBCS|
+
+ Bit 1 switches the font bank to the Extended SBCS. DOS K3.x loads APL characters from $SYSEX24.FNT into it.
+ DOS Bunsho Program transfers 1/2 and 1/4 fonts fron the font ROM to the Extended SBCS.
+ This bit is not used for DBCS, but some apps set it as that column is right half of DBCS.
+
+[Font ROM Map (DA2, Japanese)]
+The Font ROM can be accessed via 128 KB memory window located at A0000-BFFFFh.
+
+ Bank 0
+ 4800-  *
+ Bank 1, 2, 3
+   *  -  *
+ Bank 4
+   *  -0DB6Fh ( 4800-8DB6Fh) : JIS X 0208 DBCS (24 x 24) (IBMJ code: 100-1F7Dh)
+ 10000-16D1Fh (90000-96D1Fh) : IBM Extended Characters (IBMJ code: 2ADC-2C5Fh)
+ 18000-1BFCFh (98000-9BFCFh) : JIS X 0201 SBCS (13 x 30)
+ 1C000-1FFFFh (9C000-9FFFFh) : Codepage 437 characters (13 x 30)
+ Bank 5
+ 00000-0C68Fh (A0000-AC68Fh) : Gaiji used by DOS Bunsho
+ 10000-13FFFh (B0000-B3FFFh) : Extended SBCS (13 x 30)
+ 14000-1477Fh (B4000-B477Fh) : Half-width box drawing characters used by DOS Bunsho
+ 16000-17FFFh (B6000-B7FFFh) : Codepage 850 characters (13 x 30)
+ 18000-1A3FFh (B8000-BA3FFh) : CAD control icons and box drawing characters (32 x 32)
+
+ Some models have the signature 80h, 01h placed at Bank 0:1AFFEh. It disables Bitblt text drawing in OS/2 J1.3.
+
+[Font ROM Map (DA3, Traditional Chinese)]
+ Bank 0 - 11 : Valid Font ROM data
+ Bank 12 : Alias of bank 11 (At least, DOS T5.0 uses this on purpose to obtain the SBCS font.)
+ Bank 13 : Filled by 0xFFh
+
+[Gaiji RAM Map (DA2)]
+ Bank 0 00000-1FFFFh placed between A0000h-BFFFFh
+ 00000-1F7FFh(A0000-BF7FFh): Gaiji Non-resident (Kuten 103-114 ku,IBM: 2674-2ADBh) 1008 chs 128 bytes
+ 1F800-1FFFFh(BF800-BFFFFh): Gaiji Resident (SJIS: F040-F04Fh, IBM: 2384-2393h) 16 chs
+
+ Bank 1 20000-3FFFFh placed between A0000h-BFFFFh
+ 20000-33FFFh(A0000-B3FFFh): Gaiji Resident (SJIS: F050-F39Ch, IBM: 2394-2613h) 640 chs
+ 34000-37FFFh(B4000-B7FFFh): Basic SBCS(00-FFh, ATTR bit 1 = off)
+ 38000-3AFFFh(B8000-BAFFFh): Gaiji Resident (SJIS: F39D-F3FCh, IBM: 2614-2673h) 96 chs
+ 3C000-3FFFFh(BC000-BFFFFh): Extended SBCS(00-FFh, ATTR bit 1 = on)
+
+[IBMJ code to Gaiji address conv tbl from DOS K3.3]
+ A     B     C
+ 2ADC, 2C5F, +5524  --> 8000
+ 2614, 2673, +90EC  --> B700
+ 2384, 2613, +906C  --> B3F0
+ 0682, 1F7D, +0000
+
+ 8000 - 8183h 184h(388 characters) IBM Extended Characters
+ B3F0 - B75Fh 370h(880 characters) User-defined Characters
+*/
+
+/* Get character line pattern from jfont rom or gaiji volatile memory */
+static uint32_t
+getfont_ps55dbcs(int32_t code, int32_t line, void *priv)
+{
+    da2_t   *da2   = (da2_t *) priv;
+    uint32_t font  = 0;
+    int32_t  fline = line - 2; /* Start line of drawing character (line >= 1 AND line < 24 + 1 ) */
+    if (code >= 0x8000 && code <= 0x8183)
+        code -= 0x6000; /* shift for IBM extended characters (I don't know how the real card works.) */
+    if (code < DA2_FONTROM_SIZE / 72 && fline >= 0 && fline < 24) {
+        font = da2->mmio.font[code * 72 + fline * 3];             /* 0000 0000 0000 0000 0000 0000 1111 1111 */
+        font <<= 8;                                               /* 0000 0000 0000 0000 1111 1111 0000 0000 */
+        font |= da2->mmio.font[code * 72 + fline * 3 + 1] & 0xf0; /* 0000 0000 0000 0000 1111 1111 2222 0000 */
+        font <<= 3;                                               /* 0000 0000 0000 0111 1111 1222 2000 0000 */
+        font |= da2->mmio.font[code * 72 + fline * 3 + 1] & 0x0f; /* 0000 0000 0000 0111 1111 1222 2000 2222 */
+        font <<= 8;                                               /* 0000 0111 1111 1222 2000 2222 0000 0000 */
+        font |= da2->mmio.font[code * 72 + fline * 3 + 2];        /* 0000 0111 1111 1222 2000 2222 3333 3333 */
+        font <<= 4;                                               /* 0111 1111 1222 2000 2222 3333 3333 0000 */
+        /* font >>= 1;//put blank at column 1 (and 26) */
+    } else if (code >= 0xb000 && code <= 0xb75f) {
+        /* convert code->address in gaiji memory */
+        code -= 0xb000;
+        code *= 0x80;
+        // code += 0xf800;
+        font = da2->mmio.ram[code + line * 4];
+        font <<= 8;
+        font |= da2->mmio.ram[code + line * 4 + 1];
+        font <<= 8;
+        font |= da2->mmio.ram[code + line * 4 + 2];
+        font <<= 8;
+        font |= da2->mmio.ram[code + line * 4 + 3];
+    } else if (code > DA2_FONTROM_SIZE)
+        font = 0xffffffff;
+    else
+        font = 0;
+    return font;
+}
+
+/* Reverse the bit order of attribute code IRGB to BGRI(used in Mode 3 and Cursor Color) */
+static int8_t
+IRGBtoBGRI(uint8_t attr)
+{
+    attr = ((attr & 0x01) << 7) | ((attr & 0x02) << 5) | ((attr & 0x04) << 3) | ((attr & 0x08) << 1);
+    return attr >>= 4;
+}
+/* Get the foreground color from the attribute byte */
+static uint8_t
+getPS55ForeColor(uint8_t attr, da2_t *da2)
+{
+    uint8_t foreground = ~attr & 0x08; /* 0000 1000 */
+    foreground <<= 2;                  /* 0010 0000 */
+    foreground |= ~attr & 0xc0;        /*  1110 0000 */
+    foreground >>= 4;                  /* 0000 1110 */
+    if (da2->attrc[LV_PAS_STATUS_CNTRL] & 0x40)
+        foreground |= 0x01; /* bright color palette */
+    return foreground;
+}
+
+static void
+da2_render_blank(da2_t *da2)
+{
+    int x, xx;
+    int cwidth;
+    if (da2->ioctl[LS_MODE] & 0x01) cwidth = 13; /* in character mode */
+    else cwidth = 16;
+
+    if (da2->firstline_draw == 2000)
+        da2->firstline_draw = da2->displine;
+    da2->lastline_draw = da2->displine;
+
+    for (x = 0; x < da2->hdisp; x++) {
+        for (xx = 0; xx < cwidth; xx++)
+            ((uint32_t *) buffer32->line[da2->displine])[(x * cwidth) + xx + 32] = 0;
+    }
+}
+/* Display Adapter Mode 8, E Drawing */
+static void
+da2_render_text(da2_t *da2)
+{
+    if (da2->firstline_draw == 2000)
+        da2->firstline_draw = da2->displine;
+    da2->lastline_draw = da2->displine;
+
+    if (da2->fullchange) {
+        int       offset = (8 - da2->scrollcache) + 24;
+        uint32_t *p      = &((uint32_t *) buffer32->line[da2->displine])[offset];
+        int       x;
+        int       drawcursor;
+        uint8_t   chr, attr;
+        int       fg, bg;
+        uint32_t  chr_dbcs;
+        int       chr_wide = 0;
+        int       colormode = ((da2->attrc[LV_PAS_STATUS_CNTRL] & 0x80) == 0x80);
+        // da2_log("\nda2ma: %x, da2sc: %x\n", da2->memaddr, da2->scanline);
+        for (x = 0; x < da2->hdisp; x += 13) {
+            chr  = da2->cram[(da2->memaddr) & DA2_MASK_CRAM];
+            attr = da2->cram[(da2->memaddr + 1) & DA2_MASK_CRAM];
+            // if(chr!=0x20) da2_log("chr: %x, attr: %x    ", chr, attr);
+            if (colormode) /* IO 3E8h, Index 1Dh */
+            {                                           /* --Parse attribute byte in color mode-- */
+                bg = 0;                                 /* bg color is always black (the only way to change background color is programming PAL) */
+                fg = getPS55ForeColor(attr, da2);
+                if (attr & 0x04) { /* reverse 0000 0100 */
+                    bg = fg;
+                    fg = 0;
+                }
+            } else { /* --Parse attribute byte in monochrome mode-- */
+                if (attr & 0x08)
+                    fg = 3; /* Highlight 0000 1000 */
+                else
+                    fg = 2;
+                bg = 0;              /* Background is always color #0 (default is black) */
+                if (!(~attr & 0xCC)) /* Invisible 11xx 11xx -> 00xx 00xx  */
+                {
+                    fg = bg;
+                    attr &= 0x33; /* disable blinkking, underscore, highlight and reverse */
+                }
+                if (attr & 0x04) { /* reverse 0000 0100 */
+                    bg = fg;
+                    fg = 0;
+                }
+                /* Blinking 1000 0000 */
+                fg = ((da2->blink & 0x20) || (!(attr & 0x80))) ? fg : bg;
+                // if(chr!=0x20) da2_log("chr: %x, %x, %x, %x, %x    ", chr, attr, fg, da2->egapal[fg], da2->pallook[da2->egapal[fg]]);
+            }
+            /* Draw character */
+            for (uint32_t n = 0; n < 13; n++)
+                p[n] = da2->pallook[da2->egapal[bg]]; /* draw blank */
+            /*  SBCS or DBCS left half */
+            if (chr_wide == 0) {
+                if (attr & 0x01)
+                    chr_wide = 1;
+                // chr_wide = 0;
+                /* Stay drawing If the char code is DBCS and not at last column. */
+                if (chr_wide) {
+                    /* Get high DBCS code from the next video address */
+                    chr_dbcs = da2->cram[(da2->memaddr + 2) & DA2_MASK_CRAM];
+                    chr_dbcs <<= 8;
+                    chr_dbcs |= chr;
+                    /* Get the font pattern */
+                    uint32_t font = getfont_ps55dbcs(chr_dbcs, da2->scanline, da2);
+                    /* Draw 13 dots */
+                    for (uint32_t n = 0; n < 13; n++) {
+                        p[n] = da2->pallook[da2->egapal[(font & 0x80000000) ? fg : bg]];
+                        font <<= 1;
+                    }
+                } else {
+                    /* the char code is SBCS (ANK) */
+                    uint32_t fontbase;
+                    if (attr & 0x02) /* second map of SBCS font */
+                        fontbase = DA2_GAIJIRAM_SBEX;
+                    else
+                        fontbase = DA2_GAIJIRAM_SBCS;
+                    uint16_t font = da2->mmio.ram[fontbase + chr * 0x40 + da2->scanline * 2]; /* w13xh29 font */
+                    font <<= 8;
+                    font |= da2->mmio.ram[fontbase + chr * 0x40 + da2->scanline * 2 + 1]; /* w13xh29 font */
+                    // if(chr!=0x20) da2_log("memaddr: %x, scanline: %x, chr: %x, font: %x    ", da2->memaddr, da2->scanline, chr, font);
+                    /* Draw 13 dots */
+                    for (uint32_t n = 0; n < 13; n++) {
+                        p[n] = da2->pallook[da2->egapal[(font & 0x8000) ? fg : bg]];
+                        font <<= 1;
+                    }
+                }
+            }
+            /* right half of DBCS */
+            else {
+                uint32_t font = getfont_ps55dbcs(chr_dbcs, da2->scanline, da2);
+                /* Draw 13 dots */
+                for (uint32_t n = 0; n < 13; n++) {
+                    p[n] = da2->pallook[da2->egapal[(font & 0x8000) ? fg : bg]];
+                    font <<= 1;
+                }
+                chr_wide = 0;
+            }
+            /* Line 28 (Underscore) Note: Draw this first to display blink + vertical + underline correctly. */
+            if (da2->scanline == da2->crtc[LC_UNDERLINE_LOCATION] && attr & 0x40 && !colormode) { /* Underscore only in monochrome mode */
+                for (uint32_t n = 0; n < 13; n++)
+                    p[n] = da2->pallook[da2->egapal[fg]]; /* under line (white) */
+            }
+            /* Column 1 (Vertical Line) */
+            if (attr & 0x10) {
+                p[0] = da2->pallook[da2->egapal[(colormode) ? IRGBtoBGRI(da2->attrc[LV_GRID_COLOR_0]) : 2]]; /* vertical line (white) */
+            }
+            if (da2->scanline == 0 && attr & 0x20 && ~da2->attrc[LV_PAS_STATUS_CNTRL]) { /* HGrid */
+                for (uint32_t n = 0; n < 13; n++)
+                    p[n] = da2->pallook[da2->egapal[(colormode) ? IRGBtoBGRI(da2->attrc[LV_GRID_COLOR_0]) : 2]]; /* horizontal line (white) */
+            }
+            /* Drawing text cursor */
+            drawcursor = ((da2->memaddr == da2->cursoraddr) && da2->cursorvisible && da2->cursoron);
+            if (drawcursor && da2->scanline >= da2->crtc[LC_CURSOR_ROW_START] && da2->scanline <= da2->crtc[LC_CURSOR_ROW_END]) {
+                int cursorwidth = (da2->crtc[LC_COMPATIBILITY] & 0x20 ? 26 : 13);
+                int cursorcolor = (colormode) ? IRGBtoBGRI(da2->attrc[LV_CURSOR_COLOR]) : 2; /* Choose color 2 if mode 8 */
+                fg              = (colormode) ? getPS55ForeColor(attr, da2) : ((attr & 0x08) ? 3 : 2);
+                bg              = 0;
+                if (attr & 0x04) { /* Color 0 if reverse */
+                    bg = fg;
+                    fg = 0;
+                }
+                for (uint32_t n = 0; n < cursorwidth; n++)
+                    if (p[n] == da2->pallook[da2->egapal[cursorcolor]] || da2->egapal[bg] == da2->egapal[cursorcolor])
+                        p[n] = (p[n] == da2->pallook[da2->egapal[bg]]) ? da2->pallook[da2->egapal[fg]] : da2->pallook[da2->egapal[bg]];
+                    else
+                        p[n] = (p[n] == da2->pallook[da2->egapal[bg]]) ? da2->pallook[da2->egapal[cursorcolor]] : p[n];
+            }
+            da2->memaddr += 2;
+            p += 13;
+        }
+        // da2->memaddr &= DA2_MASK_CRAM;
+        // da2->writelines++;
+    }
+}
+
+/* Display Adapter Mode 3 Drawing */
+static void
+da2_render_textm3(da2_t *da2)
+{
+    if (da2->firstline_draw == 2000)
+        da2->firstline_draw = da2->displine;
+    da2->lastline_draw = da2->displine;
+
+    if (da2->fullchange) {
+        int       offset = (8 - da2->scrollcache) + 24;
+        uint32_t *p      = &((uint32_t *) buffer32->line[da2->displine])[offset];
+        int       x;
+        int       drawcursor;
+        uint8_t   chr, attr, extattr;
+        int       fg, bg;
+        uint32_t  chr_dbcs;
+        int       chr_wide = 0;
+        // da2_log("\nda2ma: %x, da2sc: %x\n", da2->memaddr, da2->scanline);
+        for (x = 0; x < da2->hdisp; x += 13) {
+            chr     = da2_vram_r(DA2_VM03_BASECHR + da2->memaddr, da2);
+            attr    = da2_vram_r(DA2_VM03_BASECHR + da2->memaddr + 1, da2);
+            extattr = da2_vram_r(DA2_VM03_BASEEXATTR + da2->memaddr + 1, da2);
+            // if(chr!=0x20) da2_log("addr: %x, chr: %x, attr: %x    ", (DA2_VM03_BASECHR + da2->memaddr << 1) & da2->vram_mask, chr, attr);
+            bg = attr >> 4;
+            // if (da2->blink) bg &= ~0x8;
+            // fg = (da2->blink || (!(attr & 0x80))) ? (attr & 0xf) : bg;
+            fg = attr & 0xf;
+            fg = IRGBtoBGRI(fg);
+            bg = IRGBtoBGRI(bg);
+            /* Draw character */
+            for (uint32_t n = 0; n < 13; n++)
+                p[n] = da2->pallook[da2->egapal[bg]]; /* draw blank */
+            /* BCS or DBCS left half */
+            if (chr_wide == 0) {
+                if (extattr & 0x01)
+                    chr_wide = 1;
+                /* Stay drawing if the char code is DBCS and not at last column. */
+                if (chr_wide) {
+                    /* Get high DBCS code from the next video address */
+                    chr_dbcs = da2_vram_r(DA2_VM03_BASECHR + da2->memaddr + 2, da2);
+                    chr_dbcs <<= 8;
+                    chr_dbcs |= chr;
+                    /* Get the font pattern */
+                    uint32_t font = getfont_ps55dbcs(chr_dbcs, da2->scanline, da2);
+                    /* Draw 13 dots */
+                    for (uint32_t n = 0; n < 13; n++) {
+                        p[n] = da2->pallook[da2->egapal[(font & 0x80000000) ? fg : bg]];
+                        font <<= 1;
+                    }
+                } else {
+                    /* the char code is SBCS (ANK) */
+                    uint32_t fontbase;
+                    if (extattr & 0x80) /* second map of SBCS font */
+                        fontbase = DA2_GAIJIRAM_SBEX;
+                    else
+                        fontbase = DA2_GAIJIRAM_SBCS;
+                    uint16_t font = da2->mmio.ram[fontbase+ chr * 0x40 + da2->scanline * 2]; /* w13xh29 font */
+                    font <<= 8;
+                    font |= da2->mmio.ram[fontbase + chr * 0x40 + da2->scanline * 2 + 1]; /* w13xh29 font */
+                    // if(chr!=0x20) da2_log("memaddr: %x, scanline: %x, chr: %x, font: %x    ", da2->memaddr, da2->scanline, chr, font);
+                    for (uint32_t n = 0; n < 13; n++) {
+                        p[n] = da2->pallook[da2->egapal[(font & 0x8000) ? fg : bg]];
+                        font <<= 1;
+                    }
+                }
+            }
+            /* right half of DBCS */
+            else {
+                uint32_t font = getfont_ps55dbcs(chr_dbcs, da2->scanline, da2);
+                /* Draw 13 dots */
+                for (uint32_t n = 0; n < 13; n++) {
+                    p[n] = da2->pallook[da2->egapal[(font & 0x8000) ? fg : bg]];
+                    font <<= 1;
+                }
+                chr_wide = 0;
+            }
+            drawcursor = ((da2->memaddr == da2->cursoraddr) && da2->cursorvisible && da2->cursoron);
+            if (drawcursor && da2->scanline >= da2->crtc[LC_CURSOR_ROW_START] && da2->scanline <= da2->crtc[LC_CURSOR_ROW_END]) {
+                // int cursorwidth = (da2->crtc[0x1f] & 0x20 ? 26 : 13);
+                // int cursorcolor = (colormode) ? IRGBtoBGRI(da2->attrc[0x1a]) : 2;/* Choose color 2 if mode 8 */
+                // fg = (colormode) ? getPS55ForeColor(attr, da2) : (attr & 0x08) ? 3 : 2;
+                // bg = 0;
+                // if (attr & 0x04) {/* Color 0 if reverse */
+                //     bg = fg;
+                //     fg = 0;
+                // }
+                for (uint32_t n = 0; n < 13; n++)
+                    p[n] = da2->pallook[da2->egapal[fg]];
+            }
+            da2->memaddr += 2;
+            p += 13;
+        }
+        // da2->memaddr &= DA2_MASK_CRAM;
+        // da2->writelines++;
+    }
+}
+
+static void
+da2_render_color_4bpp(da2_t *da2)
+{
+    int changed_offset = da2->memaddr >> 9;
+    // da2_log("memaddr %x cf %x\n", da2->memaddr, changed_offset);
+    da2->plane_mask &= 0x0f; /*safety */
+
+    if (da2->changedvram[changed_offset] || da2->changedvram[changed_offset + 1] || da2->fullchange) {
+        int       x;
+        int       offset = (8 - da2->scrollcache) + 24;
+        uint32_t *p      = &((uint32_t *) buffer32->line[da2->displine])[offset];
+
+        if (da2->firstline_draw == 2000)
+            da2->firstline_draw = da2->displine;
+        da2->lastline_draw = da2->displine;
+        // da2_log("d %X\n", da2->memaddr);
+
+        for (x = 0; x <= da2->hdisp; x += 8) /* hdisp = 1024 */
+        {
+            uint8_t edat[8];
+            uint8_t dat;
+
+            /* get 8 pixels from vram */
+            da2->memaddr &= da2->vram_display_mask;
+            *(uint32_t *) (&edat[0]) = *(uint32_t *) (&da2->vram[da2->memaddr << 3]);
+            da2->memaddr += 1;
+
+            dat  = ((edat[0] >> 7) & (1 << 0)) | ((edat[1] >> 6) & (1 << 1)) | ((edat[2] >> 5) & (1 << 2)) | ((edat[3] >> 4) & (1 << 3));
+            p[0] = da2->pallook[da2->egapal[dat & da2->plane_mask]];
+            dat  = ((edat[0] >> 6) & (1 << 0)) | ((edat[1] >> 5) & (1 << 1)) | ((edat[2] >> 4) & (1 << 2)) | ((edat[3] >> 3) & (1 << 3));
+            p[1] = da2->pallook[da2->egapal[dat & da2->plane_mask]];
+            dat  = ((edat[0] >> 5) & (1 << 0)) | ((edat[1] >> 4) & (1 << 1)) | ((edat[2] >> 3) & (1 << 2)) | ((edat[3] >> 2) & (1 << 3));
+            p[2] = da2->pallook[da2->egapal[dat & da2->plane_mask]];
+            dat  = ((edat[0] >> 4) & (1 << 0)) | ((edat[1] >> 3) & (1 << 1)) | ((edat[2] >> 2) & (1 << 2)) | ((edat[3] >> 1) & (1 << 3));
+            p[3] = da2->pallook[da2->egapal[dat & da2->plane_mask]];
+            dat  = ((edat[0] >> 3) & (1 << 0)) | ((edat[1] >> 2) & (1 << 1)) | ((edat[2] >> 1) & (1 << 2)) | ((edat[3] >> 0) & (1 << 3));
+            p[4] = da2->pallook[da2->egapal[dat & da2->plane_mask]];
+            dat  = ((edat[0] >> 2) & (1 << 0)) | ((edat[1] >> 1) & (1 << 1)) | ((edat[2] >> 0) & (1 << 2)) | ((edat[3] << 1) & (1 << 3));
+            p[5] = da2->pallook[da2->egapal[dat & da2->plane_mask]];
+            dat  = ((edat[0] >> 1) & (1 << 0)) | ((edat[1] >> 0) & (1 << 1)) | ((edat[2] << 1) & (1 << 2)) | ((edat[3] << 2) & (1 << 3));
+            p[6] = da2->pallook[da2->egapal[dat & da2->plane_mask]];
+            dat  = ((edat[0] >> 0) & (1 << 0)) | ((edat[1] << 1) & (1 << 1)) | ((edat[2] << 2) & (1 << 2)) | ((edat[3] << 3) & (1 << 3));
+            p[7] = da2->pallook[da2->egapal[dat & da2->plane_mask]];
+            p += 8;
+        }
+        // da2->writelines++;
+    }
+}
+
+static void
+da2_render_color_8bpp(da2_t *da2)
+{
+    int changed_offset = da2->memaddr >> 9;
+    // da2_log("memaddr %x cf %x\n", da2->memaddr, changed_offset);
+
+    if (da2->changedvram[changed_offset] || da2->changedvram[changed_offset + 1] || da2->fullchange) {
+        int       x;
+        int       offset = (8 - da2->scrollcache) + 24;
+        uint32_t *p      = &((uint32_t *) buffer32->line[da2->displine])[offset];
+
+        if (da2->firstline_draw == 2000)
+            da2->firstline_draw = da2->displine;
+        da2->lastline_draw = da2->displine;
+        // da2_log("d %X\n", da2->memaddr);
+
+        for (x = 0; x <= da2->hdisp; x += 8) /* hdisp = 1024 */
+        {
+            uint8_t edat[8];
+            uint8_t dat;
+
+            /* get 8 pixels from vram */
+            da2->memaddr &= da2->vram_display_mask;
+            *(uint32_t *) (&edat[0]) = *(uint32_t *) (&da2->vram[da2->memaddr << 3]);
+            *(uint32_t *) (&edat[4]) = *(uint32_t *) (&da2->vram[(da2->memaddr << 3) + 4]);
+            da2->memaddr += 1;
+
+            dat  = ((edat[0] >> 7) & (1 << 0)) | ((edat[1] >> 6) & (1 << 1)) | ((edat[2] >> 5) & (1 << 2)) | ((edat[3] >> 4) & (1 << 3)) | ((edat[4] >> 3) & (1 << 4)) | ((edat[5] >> 2) & (1 << 5)) | ((edat[6] >> 1) & (1 << 6)) | ((edat[7] >> 0) & (1 << 7));
+            p[0] = da2->pallook[dat];
+            dat  = ((edat[0] >> 6) & (1 << 0)) | ((edat[1] >> 5) & (1 << 1)) | ((edat[2] >> 4) & (1 << 2)) | ((edat[3] >> 3) & (1 << 3)) | ((edat[4] >> 2) & (1 << 4)) | ((edat[5] >> 1) & (1 << 5)) | ((edat[6] >> 0) & (1 << 6)) | ((edat[7] << 1) & (1 << 7));
+            p[1] = da2->pallook[dat];
+            dat  = ((edat[0] >> 5) & (1 << 0)) | ((edat[1] >> 4) & (1 << 1)) | ((edat[2] >> 3) & (1 << 2)) | ((edat[3] >> 2) & (1 << 3)) | ((edat[4] >> 1) & (1 << 4)) | ((edat[5] >> 0) & (1 << 5)) | ((edat[6] << 1) & (1 << 6)) | ((edat[7] << 2) & (1 << 7));
+            p[2] = da2->pallook[dat];
+            dat  = ((edat[0] >> 4) & (1 << 0)) | ((edat[1] >> 3) & (1 << 1)) | ((edat[2] >> 2) & (1 << 2)) | ((edat[3] >> 1) & (1 << 3)) | ((edat[4] >> 0) & (1 << 4)) | ((edat[5] << 1) & (1 << 5)) | ((edat[6] << 2) & (1 << 6)) | ((edat[7] << 3) & (1 << 7));
+            p[3] = da2->pallook[dat];
+            dat  = ((edat[0] >> 3) & (1 << 0)) | ((edat[1] >> 2) & (1 << 1)) | ((edat[2] >> 1) & (1 << 2)) | ((edat[3] >> 0) & (1 << 3)) | ((edat[4] << 1) & (1 << 4)) | ((edat[5] << 2) & (1 << 5)) | ((edat[6] << 3) & (1 << 6)) | ((edat[7] << 4) & (1 << 7));
+            p[4] = da2->pallook[dat];
+            dat  = ((edat[0] >> 2) & (1 << 0)) | ((edat[1] >> 1) & (1 << 1)) | ((edat[2] >> 0) & (1 << 2)) | ((edat[3] << 1) & (1 << 3)) | ((edat[4] << 2) & (1 << 4)) | ((edat[5] << 3) & (1 << 5)) | ((edat[6] << 4) & (1 << 6)) | ((edat[7] << 5) & (1 << 7));
+            p[5] = da2->pallook[dat];
+            dat  = ((edat[0] >> 1) & (1 << 0)) | ((edat[1] >> 0) & (1 << 1)) | ((edat[2] << 1) & (1 << 2)) | ((edat[3] << 2) & (1 << 3)) | ((edat[4] << 3) & (1 << 4)) | ((edat[5] << 4) & (1 << 5)) | ((edat[6] << 5) & (1 << 6)) | ((edat[7] << 6) & (1 << 7));
+            p[6] = da2->pallook[dat];
+            dat  = ((edat[0] >> 0) & (1 << 0)) | ((edat[1] << 1) & (1 << 1)) | ((edat[2] << 2) & (1 << 2)) | ((edat[3] << 3) & (1 << 3)) | ((edat[4] << 4) & (1 << 4)) | ((edat[5] << 5) & (1 << 5)) | ((edat[6] << 6) & (1 << 6)) | ((edat[7] << 7) & (1 << 7));
+            p[7] = da2->pallook[dat];
+            p += 8;
+        }
+        // da2->writelines++;
+    }
+}
+
+static void
+da2_updatevidselector_tick(void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+    if (da2->ioctl[LS_MODE] & 0x02) {
+        /* VGA passthrough mode */
+        da2->override = 1;
+        timer_disable(&da2->timer);
+        svga_set_override(da2->mb_vga, 0);
+        da2_log("DA2 selector: VGA\n");
+    } else {
+        svga_set_override(da2->mb_vga, 1);
+        timer_enable(&da2->timer);
+        da2->override = 0;
+        da2_log("DA2 selector: DA2\n");
+    }
+}
+
+static void
+da2_updatevidselector(da2_t *da2)
+{
+    timer_set_delay_u64(&da2->timer_vidupd, 100000ull * TIMER_USEC);
+}
+
+/*
+    INT 10h video modes supported in DOS J4.0 (The DA-2 doesn't have a video BIOS on its card.)
+    Mode        Type    Colors  Text    Base Address    PELs        Render
+    3           A/N/K   16      80 x 25 B0000h/B8000h   1040 x 754  textm3
+    8           A/N/K   2       80 x 25 E0000h          1040 x 725  text
+    Ah          APA     1       78 x 25 A0000h          1024 x 768  color_4bpp
+    Dh          APA     16      78 x 25 A0000h          1024 x 768  color_4bpp
+    Eh          A/N/K   16      80 x 25 E0000h          1040 x 725  text
+    Fh          APA     256     NA      A0000h          1024 x 768  color_8bpp
+    45h(undoc)  APA     16      NA      A0000h          1040 x 768  color_4bpp
+    46h(undoc)  APA     16      ?       A0000h          1040 x 768  color_4bpp
+*/
+static void
+da2_recalctimings(da2_t *da2)
+{
+    double crtcconst;
+    double _dispontime, _dispofftime, disptime;
+    
+    da2->vtotal      = da2->crtc[LC_VERTICAL_TOTALJ] & 0xfff;
+    da2->dispend     = da2->crtc[LC_V_DISPLAY_ENABLE_END] & 0xfff;
+    da2->vsyncstart  = da2->crtc[LC_VERTICAL_SYNC_START] & 0xfff;
+    da2->split       = da2->crtc[LC_LINE_COMPAREJ] & 0xfff;
+    da2->split -= 1;
+    da2->vblankstart = da2->crtc[LC_START_VERTICAL_BLANK] & 0xfff;
+    da2->hdisp       = da2->crtc[LC_H_DISPLAY_ENABLE_END];
+
+    /* In the video mode 3, you'll see a blank below the screen. It's NOT a bug. */
+    da2->hdisp -= da2->crtc[LC_START_H_DISPLAY_ENAB];
+    da2->dispend -= da2->crtc[LC_START_V_DISPLAY_ENAB];
+    da2->dispend += 1;
+
+    da2->htotal = da2->crtc[LC_HORIZONTAL_TOTAL];
+    da2->htotal += 1;
+
+    da2->rowoffset = da2->crtc[LC_OFFSET]; /* number of bytes in a scanline */
+
+    da2->clock = da2->da2const;
+
+    if (da2->vtotal == 0)
+        da2->vtotal = da2->vsyncstart = da2->vblankstart = 256;
+    if (da2->htotal == 0)
+        da2->htotal = da2->dispend = da2->hdisp = 64;
+    if (da2->rowoffset == 0)
+        da2->rowoffset = 64 * 2; /* To avoid causing a DBZ error */
+    if (da2->split == 0) /* To avoid a glitch in MODE 1 of OS/2 J1.3 DOSBox. */
+        da2->memaddr_latch = 0;
+    else
+        da2->memaddr_latch = ((da2->crtc[LC_START_ADDRESS_HIGH] & 0x3ff) << 8) | da2->crtc[LC_START_ADDRESS_LOW];
+
+    da2->ca_adj = 0;
+    da2->rowcount = da2->crtc[LC_MAXIMUM_SCAN_LINE];
+    da2->hdisp_time = da2->hdisp;
+    da2->render     = da2_render_blank;
+    /* determine display mode */
+    // if (da2->attr_palette_enable && (da2->attrc[0x1f] & 0x08))
+    /* if output disabled or VGA passthrough */
+    if (da2->ioctl[LS_MODE] & 0x02 || !(da2->attrc[LV_COMPATIBILITY] & 0x08)) {
+        da2->render = da2_render_blank;
+        // return;
+    /* 16 color graphics mode */
+    } else if (!(da2->ioctl[LS_MODE] & 0x01)) {
+        da2->hdisp *= 16;
+        da2->char_width = 13;
+        if (da2->crtc[LC_VIEWPORT_PRIORITY] & 0x80) {
+            da2_log("Set videomode to PS/55 8 bpp graphics.\n");
+            da2->render            = da2_render_color_8bpp;
+            da2->vram_display_mask = DA2_MASK_A000;
+        } else { /* PS/55 8-color */
+            da2_log("Set videomode to PS/55 4 bpp graphics.\n");
+            da2->render            = da2_render_color_4bpp;
+            da2->vram_display_mask = DA2_MASK_A000;
+        }
+    } else {
+        /* text mode */
+        if (da2->attrc[LV_ATTRIBUTE_CNTL] & 1) {
+            da2_log("Set videomode to PS/55 Mode 03 text.\n");
+            da2->render            = da2_render_textm3;
+            da2->vram_display_mask = DA2_MASK_CRAM;
+        } else { /* PS/55 text(color/mono) */
+            da2_log("Set videomode to PS/55 Mode 8/E text.\n");
+            da2->render            = da2_render_text;
+            da2->vram_display_mask = DA2_MASK_CRAM;
+        }
+        da2->hdisp *= 13;
+        da2->char_width = 13;
+    }
+
+    if (da2->vblankstart < da2->dispend)
+        da2->dispend = da2->vblankstart;
+
+    crtcconst = da2->clock * da2->char_width;
+
+    disptime    = da2->htotal;
+    _dispontime = da2->hdisp_time;
+
+    da2_log("Disptime %f dispontime %f hdisp %i\n", disptime, _dispontime, da2->hdisp);
+
+    _dispofftime = disptime - _dispontime;
+    _dispontime *= crtcconst;
+    _dispofftime *= crtcconst;
+
+    da2->dispontime  = (uint64_t) _dispontime;
+    da2->dispofftime = (uint64_t) _dispofftime;
+    if (da2->dispontime < TIMER_USEC)
+        da2->dispontime = TIMER_USEC;
+    if (da2->dispofftime < TIMER_USEC)
+        da2->dispofftime = TIMER_USEC;
+    da2_log("da2 horiz total %i display end %i vidclock %f\n", da2->crtc[0], da2->crtc[1], da2->clock);
+    da2_log("da2 vert total %i display end %i max row %i vsync %i\n",da2->vtotal,da2->dispend,(da2->crtc[9]&31)+1,da2->vsyncstart);
+    da2_log("da2 dispon %lu dispoff %lu on(us) %f off(us) %f\n",da2->dispontime, da2->dispofftime, (double)da2->dispontime / (double)cpuclock /  (double) (1ULL << 32) * 1000000.0, (double)da2->dispofftime / (double)cpuclock /  (double) (1ULL << 32) * 1000000.0);
+    da2_log("da2 linecompare %d\n", da2->split);
+}
+
+static void
+da2_mapping_update(da2_t *da2)
+{
+    /* Has the CardEnable bit been changed? */
+    if (!((da2->pos_regs[2] ^ da2->old_pos2) & 1))
+        return;
+    da2->old_pos2 = da2->pos_regs[2];
+    // da2_recalc_mapping(da2);
+    if (da2->pos_regs[2] & 0x01) {
+        da2_log("DA2 enable registers\n");
+        for (uint8_t i = 0; i < 8; i++)
+            da2_log("DA2 POS[%d]: %x\n", i, da2->pos_regs[i]);
+        io_sethandler(0x03c0, 0x000a, da2_inb, da2_inw, NULL, da2_outb, da2_outw, NULL, da2);
+        io_sethandler(0x03e0, 0x0010, da2_inb, da2_inw, NULL, da2_outb, da2_outw, NULL, da2);
+        io_sethandler(0x03d0, 0x000b, da2_in_ISR, NULL, NULL, da2_out_ISR, NULL, NULL, da2);
+        mem_mapping_enable(&da2->cmapping);
+        mem_mapping_enable(&da2->mmio.mapping);
+        timer_enable(&da2->bitblt.timer);
+    } else {
+        da2_log("DA2 disable registers\n");
+        timer_disable(&da2->bitblt.timer);
+        mem_mapping_disable(&da2->cmapping);
+        mem_mapping_disable(&da2->mmio.mapping);
+        io_removehandler(0x03c0, 0x000a, da2_inb, da2_inw, NULL, da2_outb, da2_outw, NULL, da2);
+        io_removehandler(0x03e0, 0x0010, da2_inb, da2_inw, NULL, da2_outb, da2_outw, NULL, da2);
+        io_removehandler(0x03d0, 0x000b, da2_in_ISR, NULL, NULL, da2_out_ISR, NULL, NULL, da2);
+    }
+}
+
+static uint8_t
+da2_mca_read(int port, void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+    return da2->pos_regs[port & 7];
+}
+
+static void
+da2_mca_write(int port, uint8_t val, void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+
+    da2_log("da2_mca_write: port=%04x val=%02x\n", port, val);
+
+    if (port < 0x102)
+        return;
+    da2->pos_regs[port & 7] = val;
+
+    da2_mapping_update(da2);
+}
+
+static uint8_t
+da2_mca_feedb(void *priv)
+{
+    const da2_t *da2 = (da2_t *) priv;
+
+    return da2->pos_regs[2] & 0x01;
+}
+
+static void
+da2_mca_reset(void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+    da2_log("da2_mca_reset called.\n");
+    da2_reset(da2);
+    da2_mca_write(0x102, 0, da2);
+}
+
+/* ROP gdcinput and gdcsrc, and write the result with bitmask at addr (byte) */
+static void
+da2_gdcropB(uint32_t addr,uint8_t bitmask, da2_t *da2)
+{
+    for (uint8_t i = 0; i < 8; i++) {
+        if (da2->planemask & (1 << i)) {
+            // da2_log("da2_gdcropB o%x a%x d%x p%d m%x\n", da2->gdcreg[LG_COMMAND] & 0x03, addr, da2->gdcinput[i], i, bitmask);
+            switch (da2->gdcreg[LG_COMMAND] & 0x03) {
+                case 0: /*Set*/
+                    // da2->vram[addr | i] = (da2->gdcinput[i] & bitmask) | (da2->gdcsrc[i] & ~bitmask);
+                    // da2->vram[addr | i] = (da2->gdcinput[i] & bitmask) | (da2->vram[addr | i] & ~bitmask);
+                    da2_vram_w(addr | i, (da2->gdcinput[i] & bitmask) | (da2->vram[addr | i] & ~bitmask), da2);
+                    break;
+                case 1: /*AND*/
+                    // da2->vram[addr | i] = (da2->gdcinput[i] | ~bitmask) & da2->gdcsrc[i];
+                    da2_vram_w(addr | i, ((da2->gdcinput[i] & da2->gdcsrc[i]) & bitmask) | (da2->vram[addr | i] & ~bitmask), da2);
+                    break;
+                case 2: /*OR*/
+                    // da2->vram[addr | i] = (da2->gdcinput[i] & bitmask) | da2->gdcsrc[i];
+                    da2_vram_w(addr | i,  ((da2->gdcinput[i] | da2->gdcsrc[i]) & bitmask) | (da2->vram[addr | i] & ~bitmask), da2);
+                    break;
+                case 3: /*XOR*/
+                    // da2->vram[addr | i] = (da2->gdcinput[i] & bitmask) ^ da2->gdcsrc[i];
+                    da2_vram_w(addr | i,  ((da2->gdcinput[i] ^ da2->gdcsrc[i]) & bitmask) | (da2->vram[addr | i] & ~bitmask), da2);
+                    break;
+            }
+        }
+    }
+}
+/* ROP gdcinput and gdcsrc, and write the result with bitmask at addr (word) */
+static void
+da2_gdcropW(uint32_t addr, uint16_t bitmask, da2_t *da2)
+{
+    if((addr & 8) && !(da2->gdcreg[LG_COMMAND] & 0x08)) bitmask = da2_rightrotate(bitmask, 8);
+    // if((addr & 8)) bitmask = da2_rightrotate(bitmask, 8);
+    uint8_t bitmask_l = bitmask & 0xff;
+    uint8_t bitmask_h = bitmask >> 8;
+    for (uint8_t i = 0; i < 8; i++) {
+        if (da2->planemask & (1 << i)) {
+            // da2_log("da2_gdcropW m%x a%x d%x i%d ml%x mh%x\n", da2->gdcreg[LG_COMMAND] & 0x03, addr, da2->gdcinput[i], i, da2->gdcreg[LG_BIT_MASK_LOW], da2->gdcreg[LG_BIT_MASK_HIGH]);
+            switch (da2->gdcreg[LG_COMMAND] & 0x03) {
+                case 0: /*Set*/
+                    // da2->vram[addr | i]       = (da2->gdcinput[i] & bitmask_l) | (da2->gdcsrc[i] & ~bitmask_l);
+                    // da2->vram[(addr + 8) | i] = ((da2->gdcinput[i] >> 8) & bitmask_h) | ((da2->gdcsrc[i] >> 8) & ~bitmask_h);
+                    da2_vram_w(addr | i, (da2->gdcinput[i] & bitmask_l) | (da2->vram[addr | i] & ~bitmask_l), da2);
+                    da2_vram_w((addr + 8) | i, ((da2->gdcinput[i] >> 8) & bitmask_h)
+                        | (da2->vram[(addr + 8) | i] & ~bitmask_h), da2);
+                    break;
+                case 1: /*AND*/
+                    // da2->vram[addr | i]       = (da2->gdcinput[i] | ~bitmask_l) & da2->gdcsrc[i];
+                    // da2->vram[(addr + 8) | i] = ((da2->gdcinput[i] >> 8) | ~bitmask_h) & (da2->gdcsrc[i] >> 8);
+                    da2_vram_w(addr | i, ((da2->gdcinput[i] & da2->gdcsrc[i]) & bitmask_l) | (da2->vram[addr | i] & ~bitmask_l), da2);
+                    da2_vram_w((addr + 8) | i, (((da2->gdcinput[i] >> 8) & (da2->gdcsrc[i] >> 8)) & bitmask_h)
+                        | (da2->vram[(addr + 8) | i] & ~bitmask_h), da2);
+                    break;
+                case 2: /*OR*/
+                    // da2->vram[addr | i]       = (da2->gdcinput[i] & bitmask_l) | da2->gdcsrc[i];
+                    // da2->vram[(addr + 8) | i] = ((da2->gdcinput[i] >> 8) & bitmask_h) | (da2->gdcsrc[i] >> 8);
+                    da2_vram_w(addr | i, ((da2->gdcinput[i] | da2->gdcsrc[i]) & bitmask_l) | (da2->vram[addr | i] & ~bitmask_l), da2);
+                    da2_vram_w((addr + 8) | i, (((da2->gdcinput[i] >> 8) | (da2->gdcsrc[i] >> 8)) & bitmask_h)
+                        | (da2->vram[(addr + 8) | i] & ~bitmask_h), da2);
+                    break;
+                case 3: /*XOR*/
+                    // da2->vram[addr | i]       = (da2->gdcinput[i] & bitmask_l) ^ da2->gdcsrc[i];
+                    // da2->vram[(addr + 8) | i] = ((da2->gdcinput[i] >> 8) & bitmask_h) ^ (da2->gdcsrc[i] >> 8);
+                    da2_vram_w(addr | i, ((da2->gdcinput[i] ^ da2->gdcsrc[i]) & bitmask_l) | (da2->vram[addr | i] & ~bitmask_l), da2);
+                    da2_vram_w((addr + 8) | i, (((da2->gdcinput[i] >> 8) ^ (da2->gdcsrc[i] >> 8)) & bitmask_h)
+                        | (da2->vram[(addr + 8) | i] & ~bitmask_h), da2);
+                    break;
+            }
+        }
+    }
+}
+
+static uint8_t
+da2_mmio_read(uint32_t addr, void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+    uint32_t index = 0;
+    addr &= DA2_MASK_MMIO;
+    if (da2->ioctl[LS_MMIO] & 0x10) {
+        if (da2->fctl[LF_MMIO_SEL] == 0x80)
+            /* linear access */
+            addr |= ((uint32_t) da2->fctl[LF_MMIO_ADDR] << 17);
+        else {
+            /* 64k bank switch access */
+            index = da2->fctl[LF_MMIO_MODE] & 0x0f;
+            index <<= 8;
+            index |= da2->fctl[LF_MMIO_ADDR];
+        }
+        // da2_log("PS55_MemHnd: Read from mem %x, bank %x, addr %x\n", da2->fctl[LF_MMIO_MODE], da2->fctl[LF_MMIO_ADDR], addr);
+        switch (da2->fctl[LF_MMIO_MODE] & 0xf0) {
+            case 0xb0:                     /* Gaiji RAM */
+                addr += index * 0x80;
+                addr &= DA2_MASK_GAIJIRAM; /* safety access */
+                // da2_log("PS55_MemHnd_G: Read from mem %x, bank %x, chr %x (%x), val %x\n", da2->fctl[LF_MMIO_MODE], da2->fctl[LF_MMIO_ADDR], addr / 128, addr, da2->mmio.font[addr]);
+                return da2->mmio.ram[addr];
+                break;
+            case 0x10: /* Font ROM */
+                if (da2->mmio.charset == DA2_DCONFIG_CHARSET_HANT) {
+                    if (addr >= 0x1a0000)
+                        return DA2_INVALIDACCESS8;
+                    if (addr >= 0x180000)
+                        addr -= 0x40000; /* The bank 12 (180000h-19ffffh) is beyond the available ROM address range,
+                                              but the Chinese font sub card actually has this alias, and is used by DOS T5.0. */
+                }
+                if (addr >= DA2_FONTROM_SIZE)
+                    return DA2_INVALIDACCESS8;
+                // da2_log("PS55_MemHnd: Read from mem %x, bank %x, chr %x (%x), val %x\n", da2->fctl[LF_MMIO_MODE], da2->fctl[LF_MMIO_ADDR], addr / 72, addr, da2->mmio.font[addr]);
+                return da2->mmio.font[addr];
+                break;
+            case 0x00: /* SBCS in Gaiji RAM (used in the downward writing mode of DOS/V Extension) */
+                addr += DA2_GAIJIRAM_SBCS + index * 0x40;
+                addr &= DA2_MASK_GAIJIRAM;
+                return da2->mmio.ram[addr];
+                break;
+            default:
+                da2_log("PS55_MemHnd: Invalid read mem %x, bank %x, chr %x (%x), val %x\n", da2->fctl[LF_MMIO_MODE], da2->fctl[LF_MMIO_ADDR], addr / 72, addr, da2->mmio.font[addr]);
+                return DA2_INVALIDACCESS8; /* invalid memory access */
+                break;
+        }
+    } else if (!(da2->ioctl[LS_MODE] & 1)) { /* 16 or 256 color mode */
+        cycles -= video_timing_read_b;
+        for (uint8_t i = 0; i < 8; i++)
+            da2->gdcla[i] = da2->vram[(addr << 3) | i]; /* read in byte */
+#ifdef ENABLE_DA2_DEBUGVRAM
+        da2_log("da2_Rb: %05x=%02x\n", addr, da2->gdcla[da2->readplane]);
+#endif
+        if (da2->gdcreg[LG_MODE] & 0x08) { /* compare data across planes if the read mode bit (3EB 05, bit 3) is 1 */
+            uint8_t ret = 0;
+            for (uint8_t i = 0; i < 8; i++) {
+                if (~da2->gdcreg[LG_COLOR_DONT_CARE] & (1 << i)) /* color don't care register */
+                    ret |= da2->gdcla[i] ^ ((da2->gdcreg[LG_COLOR_COMPAREJ] & (1 << i)) ? 0xff : 0);
+            }
+            return ~ret;
+        } else
+            return da2->gdcla[da2->readplane];
+    } else { /* text mode 3 */
+        cycles -= video_timing_read_b;
+        return da2->vram[addr];
+    }
+}
+static uint16_t
+da2_mmio_readw(uint32_t addr, void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+    // da2_log("da2_readW: %x %x %x %x %x\n", da2->ioctl[LS_MMIO], da2->fctl[LF_MMIO_SEL], da2->fctl[LF_MMIO_MODE], da2->fctl[LF_MMIO_ADDR], addr);
+    // da2_log("da2_readW: %x %x %x %x %x CS:PC=%4x:%4x\n", da2->ioctl[LS_MMIO], da2->fctl[LF_MMIO_SEL], da2->fctl[LF_MMIO_MODE], da2->fctl[LF_MMIO_ADDR], addr, CS, cpu_state.pc);
+
+    if (da2->ioctl[LS_MMIO] & 0x10) {
+        return (uint16_t) da2_mmio_read(addr, da2) | (uint16_t) (da2_mmio_read(addr + 1, da2) << 8);
+    } else if (!(da2->ioctl[LS_MODE] & 1)) {/* 16 color or 256 color mode */
+        cycles -= video_timing_read_w;
+        addr &= DA2_MASK_MMIO;
+        for (uint8_t i = 0; i < 8; i++)
+            da2->gdcla[i] = (uint16_t) (da2->vram[(addr << 3) | i]) | ((uint16_t) (da2->vram[((addr << 3) + 8) | i]) << 8); /* read vram into latch */
+
+#ifdef ENABLE_DA2_DEBUGVRAM
+        ////debug
+        // if (((int)addr - (int)da2->mmrdbg_vidaddr) > 2 || (((int)da2->mmrdbg_vidaddr - (int)addr) > 2) || da2->mmrdbg_vidaddr == addr)
+        //{
+        //     fprintf(da2->mmrdbg_fp, "\nR %x ", addr);
+        //     for (uint8_t i = 0; i <= 0xb; i++)
+        //         fprintf(da2->mmrdbg_fp, "%02x ", da2->gdcreg[i]);
+        // }
+        // for (uint8_t i = 0; i < 16; i++)
+        //{
+        //     int pixeldata = 0;
+        //     if (da2->gdcla[da2->readplane] & (1 << (15 - i))) pixeldata = 1;
+        //     fprintf(da2->mmrdbg_fp, "%X", pixeldata);
+        // }
+        // da2->mmrdbg_vidaddr = addr;
+#endif
+
+        if (da2->gdcreg[LG_MODE] & 0x08) { /* compare data across planes if the read mode bit (3EB 05, bit 3) is 1 */
+            uint16_t ret = 0;
+
+            for (uint8_t i = 0; i < 8; i++) {
+                if (~da2->gdcreg[LG_COLOR_DONT_CARE] & (1 << i)) /* color don't care register */
+                    ret |= da2->gdcla[i] ^ ((da2->gdcreg[LG_COLOR_COMPAREJ] & (1 << i)) ? 0xffff : 0);
+            }
+            return ~ret;
+        } else {
+#ifdef ENABLE_DA2_DEBUGVRAM
+            da2_log("da2_Rw: %05x(%d) = %04x\n", addr, da2->readplane, da2->gdcla[da2->readplane]);
+#endif
+            return da2->gdcla[da2->readplane];
+        }
+    } else {
+        return (uint16_t) da2_mmio_read(addr, da2) | (uint16_t) (da2_mmio_read(addr + 1, da2) << 8);
+    }
+}
+static void
+da2_mmio_write(uint32_t addr, uint8_t val, void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+    uint32_t index = 0;
+    // da2_log("da2_mmio_write %x %x\n", addr, val);
+    // if ((addr & ~DA2_MASK_MMIO) != 0xA0000)
+    //     return;
+    addr &= DA2_MASK_MMIO;
+
+    if (da2->ioctl[LS_MMIO] == 0x1f) {/* write bitblt fifo data */
+        da2_bitblt_addpayload(val, da2);
+    }
+    else if (da2->ioctl[LS_MMIO] & 0x10) { /* access to gaiji ram */
+        // if(da2->ioctl[LS_MMIO] == 0x1f) da2_log("mw mem %x, addr %x, val %x, ESDI %x:%x DSSI %x:%x\n", da2->fctl[LF_MMIO_MODE], addr, val, ES, DI, DS, SI);
+        /* Gaiji RAM */
+        if (da2->fctl[LF_MMIO_SEL] == 0x80)
+            addr |= ((uint32_t) da2->fctl[LF_MMIO_ADDR] << 17); /* xxxy yyyy yyyy yyyy yyyy */
+        else { 
+            index = da2->fctl[LF_MMIO_MODE] & 0x0f;
+            index <<= 8;
+            index |= da2->fctl[LF_MMIO_ADDR];
+        // da2_log("da2_mmio_w io %x, sl %x, 09 %x, ad %x, mm %x, addr %x, val %x\n", da2->ioctl[LS_MMIO],da2->fctl[LF_MMIO_SEL], 
+        // da2->fctl[LF_MMIO_09],da2->fctl[LF_MMIO_ADDR], da2->fctl[LF_MMIO_MODE], addr, val);
+        }
+        switch (da2->fctl[LF_MMIO_MODE] & 0xf0) {
+            case 0xb0: /* Gaiji RAM 1011 0000 */
+                addr += index * 0x80;
+                da2->mmio.ram[addr & DA2_MASK_GAIJIRAM] = val;
+                break;
+            case 0x10: /* Font ROM  0001 0000 */
+                /* Read-Only */
+                break;
+            case 0x00: /* SBCS in Gaiji RAM (used by DOS/V Extension DSPXDA2 driver) */
+                addr += index * 0x40;
+                da2->mmio.ram[(DA2_GAIJIRAM_SBCS + addr) & DA2_MASK_GAIJIRAM] = val;
+                // da2_log("da2_mmio_write %x %x %04X:%04X\n", addr, val, CS, cpu_state.pc);
+                break;
+            default:
+                da2_log("da2_mmio_write failed io %x, mm %x, addr %x, val %x\n", da2->ioctl[LS_MMIO] ,da2->fctl[LF_MMIO_MODE], addr, val);
+                break;
+        }
+    } else if (!(da2->ioctl[LS_MODE] & 1)) { /* 16 color or 256 color mode */
+        uint8_t bitmask;
+        /* Align bitmask with even address */
+        /* With byte align: Win 3.1 (Window) - ok, Solitaire 3.1 - ok, A-Train IV (splash): bad,  OS/2 J2.0(cmd) - ok */
+        // if ((addr & 1)  && !(da2->gdcreg[LG_COMMAND] & 0x08)) bitmask = da2->gdcreg[LG_BIT_MASK_HIGH];
+        /* Without byte align: Win 3.1 (Window) - bad, Solitaire 3.1 - ok, A-Train IV (splash): ok,  OS/2 J2.0(cmd) - ok */
+        /* With byte align: Win 3.1 (Window) - ok, Solitaire 3.1 - ok, A-Train IV (splash): ok, OS/2 J2.0(cmd) - ok */
+        if ((addr & 1)) bitmask = da2->gdcreg[LG_BIT_MASK_HIGH];
+        else  
+        /* No align: Win 3.1 (Window Title) - ok, Solitaire 3.1 - ok, A-Train IV (splash): bad,  OS/2 J2.0(cmd) - bad */
+            bitmask = da2->gdcreg[LG_BIT_MASK_LOW];
+        
+#ifdef ENABLE_DA2_DEBUGVRAM
+        // da2_log("da2_wB %x %02x\n", addr, val);
+        da2_log("da2_wB %x %d %d %02x\n", addr,
+            addr % (da2->rowoffset * 2) * 8, addr / (da2->rowoffset * 2), val);
+        // if (!(da2->gdcreg[LG_COMMAND] & 0x08))
+        //{
+        if (((int) addr - (int) da2->mmdbg_vidaddr) > 2 || (((int) da2->mmdbg_vidaddr - (int) addr) > 2) || da2->mmdbg_vidaddr == addr) {
+            fprintf(da2->mmdbg_fp, "\nB %x %02x ", addr, val);
+            for (uint8_t i = 0; i <= 0xb; i++)
+                fprintf(da2->mmdbg_fp, "%02x ", da2->gdcreg[i]);
+        }
+        for (uint8_t i = 0; i < 8; i++) {
+            int pixeldata = 0;
+            if (val & (1 << (7 - i)))
+                pixeldata = (da2->planemask & 0xf);
+            fprintf(da2->mmdbg_fp, "%X", pixeldata);
+        }
+        da2->mmdbg_vidaddr = addr;
+        //}
+#endif
+        cycles -= video_timing_write_b;
+        da2->changedvram[addr >> 9] = changeframecount;/* 0x1FFFF -> 0x1F */
+        addr <<= 3;
+
+        for (uint8_t i = 0; i < 8; i++)
+            da2->gdcsrc[i] = da2->gdcla[i]; /* use latch */
+
+        // da2_log("da2_Wb m%02x r%02x %05x:%02x %x:%x\n", da2->gdcreg[0x5], da2->gdcreg[LG_COMMAND], addr >> 3, val, cs >> 4, cpu_state.pc);
+        // da2_log("da2_Wb m%02x r%02x %05x:%02x=%02x%02x%02x%02x->", da2->gdcreg[0x5], da2->gdcreg[LG_COMMAND], addr >> 3, val, da2->vram[addr + 0], da2->vram[addr + 1], da2->vram[addr + 2], da2->vram[addr + 3]);
+
+        if (!(da2->gdcreg[LG_COMMAND] & 0x08)) {
+            for (uint8_t i = 0; i < 8; i++)
+                if (da2->gdcreg[LG_ENABLE_SRJ] & (1 << i))
+                    da2->gdcinput[i] = (da2->gdcreg[LG_SET_RESETJ] & (1 << i)) ? 0xff : 0;
+                else if (da2->gdcreg[LG_SET_RESETJ] & (1 << i))
+                    da2->gdcinput[i] = ~val;
+                else
+                    da2->gdcinput[i] = val;
+            da2_gdcropB(addr, bitmask, da2);
+            return;
+        }
+
+        switch (da2->writemode) {
+            case 2: /* equiv to vga write mode 1 */
+                for (uint8_t i = 0; i < 8; i++)
+                    if (da2->planemask & (1 << i))
+                        da2_vram_w(addr | i, da2->gdcsrc[i], da2);
+                break;
+            case 0:/* equiv to vga write mode 0 */
+                if (da2->gdcreg[LG_DATA_ROTATION] & 7)
+                    val = svga_rotate[da2->gdcreg[LG_DATA_ROTATION] & 7][val];
+                if (bitmask == 0xff && !(da2->gdcreg[LG_COMMAND] & 0x03) && (!da2->gdcreg[LG_ENABLE_SRJ])) {
+                    for (uint8_t i = 0; i < 8; i++)
+                        if (da2->planemask & (1 << i))
+                            da2_vram_w(addr | i, val, da2);
+                } else {
+                    for (uint8_t i = 0; i < 8; i++)
+                        if (da2->gdcreg[LG_ENABLE_SRJ] & (1 << i))
+                            da2->gdcinput[i] = (da2->gdcreg[LG_SET_RESETJ] & (1 << i)) ? 0xff : 0;
+                        else
+                            da2->gdcinput[i] = val;
+                    da2_gdcropB(addr, bitmask, da2);
+                }
+                break;
+            case 1:/* equiv to vga write mode 2 */
+                    for (uint8_t i = 0; i < 8; i++)
+                        da2->gdcinput[i] = ((val & (1 << i)) ? 0xff : 0);
+                    da2_gdcropB(addr, bitmask, da2);
+                break;
+            case 3:/* equiv to vga write mode 3 */
+                if (da2->gdcreg[LG_DATA_ROTATION] & 7)
+                    val = svga_rotate[da2->gdcreg[LG_DATA_ROTATION] & 7][val];
+                bitmask &= val;
+
+                for (uint8_t i = 0; i < 8; i++)
+                        da2->gdcinput[i] = (da2->gdcreg[LG_SET_RESETJ] & (1 << i)) ? 0xff : 0;
+                da2_gdcropB(addr, bitmask, da2);
+                break;
+        }
+    } else { /*  mode 3h text */
+        cycles -= video_timing_write_b;
+        da2_vram_w(addr, val, da2);
+        da2->fullchange = 2;
+    }
+}
+static uint16_t
+da2_rightrotate(uint16_t data, uint8_t count)
+{
+    return (data >> count) | (data << (sizeof(data) * 8 - count));
+}
+static void
+da2_mmio_gc_writeW(uint32_t addr, uint16_t val, void *priv)
+{
+    da2_t   *da2     = (da2_t *) priv;
+    uint16_t bitmask;
+    addr &= DA2_MASK_MMIO;
+    bitmask = da2->gdcreg[LG_BIT_MASK_HIGH];
+    bitmask <<= 8;
+    bitmask |= (uint16_t) da2->gdcreg[LG_BIT_MASK_LOW];
+#ifdef ENABLE_DA2_DEBUGVRAM
+    da2_log("da2_wW %x %d %d %02x\n", addr,
+    addr % (da2->rowoffset * 2) * 8, addr / (da2->rowoffset * 2), val);
+
+    if (((int) addr - (int) da2->mmdbg_vidaddr) > 2 || (((int) da2->mmdbg_vidaddr - (int) addr) > 2) || da2->mmdbg_vidaddr == addr) {
+        fprintf(da2->mmdbg_fp, "\nW %x %x ", addr, val);
+        for (uint8_t i = 0; i <= 0xb; i++)
+            fprintf(da2->mmdbg_fp, "%02x ", da2->gdcreg[i]);
+    }
+    for (uint8_t i = 0; i < 16; i++) {
+        int pixeldata = 0;
+        if (val & (1 << (15 - i)))
+            pixeldata = (da2->planemask & 0xf);
+        fprintf(da2->mmdbg_fp, "%X", pixeldata);
+    }
+    da2->mmdbg_vidaddr = addr;
+#endif
+    cycles -= video_timing_write_w;
+
+    // da2_log("da2_gcW m%d a%x d%x\n", da2->writemode, addr, val);
+    // da2_log("da2_gcW %05X %02X %04X:%04X esdi %04X:%04X dssi %04X:%04X\n", addr, val, cs >> 4, cpu_state.pc, ES, DI, DS, SI);
+
+    da2->changedvram[addr >> 9]       = changeframecount;
+    addr <<= 3;
+
+    for (uint8_t i = 0; i < 8; i++)
+        da2->gdcsrc[i] = da2->gdcla[i]; /* use latch */
+
+    if (!(da2->gdcreg[LG_COMMAND] & 0x08)) {
+        for (uint8_t i = 0; i < 8; i++)
+            if (da2->gdcreg[LG_ENABLE_SRJ] & (1 << i))
+                da2->gdcinput[i] = (da2->gdcreg[LG_SET_RESETJ] & (1 << i)) ? 0xffff : 0;
+            else if (da2->gdcreg[LG_SET_RESETJ] & (1 << i))
+                da2->gdcinput[i] = ~val;
+            else
+                da2->gdcinput[i] = val;
+        da2_gdcropW(addr, bitmask, da2);
+        return;
+    }
+    // da2_log("da2_Ww m%02x r%02x %05x:%04x=%02x%02x%02x%02x,%02x%02x%02x%02x->", da2->gdcreg[0x5], da2->gdcreg[LG_COMMAND], addr >> 3, val, da2->vram[addr + 0], da2->vram[addr + 1], da2->vram[addr + 2], da2->vram[addr + 3]
+    //     , da2->vram[addr + 8], da2->vram[addr + 9], da2->vram[addr + 10], da2->vram[addr + 11]);
+    switch (da2->writemode) {
+        case 2:
+            for (uint8_t i = 0; i < 8; i++)
+                if (da2->planemask & (1 << i)) {
+                    da2_vram_w(addr | i, da2->gdcsrc[i] & 0xff, da2);
+                    da2_vram_w((addr + 8) | i, da2->gdcsrc[i] >> 8, da2);
+                }
+            break;
+        case 0:
+            if (da2->gdcreg[LG_DATA_ROTATION] & 15)
+                val = da2_rightrotate(val, da2->gdcreg[LG_DATA_ROTATION] & 15);
+            if (bitmask == 0xffff && !(da2->gdcreg[LG_COMMAND] & 0x03) && (!da2->gdcreg[LG_ENABLE_SRJ])) {
+                for (uint8_t i = 0; i < 8; i++)
+                    if (da2->planemask & (1 << i)) {
+                        da2_vram_w(addr | i, val & 0xff, da2);
+                        da2_vram_w((addr + 8) | i, val >> 8, da2);
+                    }
+            } else {
+                for (uint8_t i = 0; i < 8; i++)
+                    if (da2->gdcreg[LG_ENABLE_SRJ] & (1 << i))
+                        da2->gdcinput[i] = (da2->gdcreg[LG_SET_RESETJ] & (1 << i)) ? 0xffff : 0;
+                    else
+                        da2->gdcinput[i] = val;
+                da2_gdcropW(addr, bitmask, da2);
+                // da2_log("- %02X %02X %02X %02X   %08X\n",vram[addr],vram[addr|0x1],vram[addr|0x2],vram[addr|0x3],addr);
+            }
+            break;
+        case 1:
+            for (uint8_t i = 0; i < 8; i++)
+                da2->gdcinput[i] = ((val & (1 << i)) ? 0xffff : 0);
+            da2_gdcropW(addr, bitmask, da2);
+            break;
+        case 3:
+            if (da2->gdcreg[LG_DATA_ROTATION] & 15)
+                val = da2_rightrotate(val, da2->gdcreg[LG_DATA_ROTATION] & 15);
+            bitmask &= val;
+
+            for (uint8_t i = 0; i < 8; i++)
+                    da2->gdcinput[i] = (da2->gdcreg[LG_SET_RESETJ] & (1 << i)) ? 0xffff : 0;
+            da2_gdcropW(addr, bitmask, da2);
+            break;
+    }
+    // da2_log("%02x%02x%02x%02x,%02x%02x%02x%02x\n", da2->vram[addr + 0], da2->vram[addr + 1], da2->vram[addr + 2], da2->vram[addr + 3]
+    //     , da2->vram[addr + 8], da2->vram[addr + 9], da2->vram[addr + 10], da2->vram[addr + 11]);
+}
+static void
+da2_mmio_writew(uint32_t addr, uint16_t val, void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+    // if (da2->bitblt.exec != DA2_BLT_CIDLE) /* Bitblt is in operation. */
+    //     return;
+    // if ((addr & ~0x1ffff) != 0xA0000) return;
+    if (da2->ioctl[LS_MMIO] & 0x10) {
+#ifdef ENABLE_DA2_DEBUGVRAM
+        da2_log("da2_mmio_writeW %x %x %x %x %x %x\n", da2->ioctl[LS_MMIO], da2->fctl[LF_MMIO_SEL], da2->fctl[LF_MMIO_MODE], da2->fctl[LF_MMIO_ADDR], addr, val);
+#endif
+        da2_mmio_write(addr, val & 0xff, da2);
+        da2_mmio_write(addr + 1, val >> 8, da2);
+    } else if (!(da2->ioctl[LS_MODE] & 1)) { /* 16 color or 256 color mode */
+#ifdef ENABLE_DA2_DEBUGVRAM
+        da2_log("da2_mmio_writeGW %x %x %x %x %x %x\n", da2->ioctl[LS_MMIO], da2->fctl[LF_MMIO_SEL], da2->fctl[LF_MMIO_MODE], da2->fctl[LF_MMIO_ADDR], addr, val);
+#endif
+        da2_mmio_gc_writeW(addr, val, da2);
+    } else { /* mode 3h text */
+#ifdef ENABLE_DA2_DEBUGVRAM
+        // if (addr & 0xff00 == 0) da2_log("da2_mmio_write %x %x %04X:%04X\n", addr, val, CS, cpu_state.pc);
+        da2_log("da2_mmio_write3W %x %x %x %x %x %x\n", da2->ioctl[LS_MMIO], da2->fctl[LF_MMIO_SEL], da2->fctl[LF_MMIO_MODE], da2->fctl[LF_MMIO_ADDR], addr, val);
+#endif
+        da2_mmio_write(addr, val & 0xff, da2);
+        da2_mmio_write(addr + 1, val >> 8, da2);
+    }
+}
+
+static void
+da2_code_write(uint32_t addr, uint8_t val, void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+    // if ((addr & ~0xfff) != 0xE0000) return;
+    addr &= DA2_MASK_CRAM;
+    da2->cram[addr] = val;
+    da2->fullchange = 2;
+}
+static void
+da2_code_writeb(uint32_t addr, uint8_t val, void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+    // da2_log("DA2_code_writeb: Write to %x, val %x\n", addr, val);
+    cycles -= video_timing_write_b;
+    da2_code_write(addr, val, da2);
+}
+static void
+da2_code_writew(uint32_t addr, uint16_t val, void *priv)
+{
+    // da2_log("DA2_code_writ   ew: Write to %x, val %x\n", addr, val);
+    da2_t *da2 = (da2_t *) priv;
+    cycles -= video_timing_write_w;
+    da2_code_write(addr, val & 0xff, da2);
+    da2_code_write(addr + 1, val >> 8, da2);
+}
+
+static uint8_t
+da2_code_read(uint32_t addr, void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+    // if ((addr & ~DA2_MASK_CRAM) != 0xE0000)
+    //     return DA2_INVALIDACCESS8;
+    addr &= DA2_MASK_CRAM;
+    return da2->cram[addr];
+}
+static uint8_t
+da2_code_readb(uint32_t addr, void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+    cycles -= video_timing_read_b;
+    return da2_code_read(addr, da2);
+}
+static uint16_t
+da2_code_readw(uint32_t addr, void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+    cycles -= video_timing_read_w;
+    return da2_code_read(addr, da2) | (da2_code_read(addr + 1, da2) << 8);
+}
+
+static void
+da2_doblit(int y1, int y2, int wx, int wy, da2_t *da2)
+{
+    if (wx != xsize || wy != ysize) {
+        xsize = wx;
+        ysize = wy;
+        set_screen_size(xsize, ysize);
+
+        if (video_force_resize_get())
+            video_force_resize_set(0);
+    }
+    video_blit_memtoscreen(32, 0, xsize, ysize);
+    frames++;
+
+    video_res_x = wx;
+    video_res_y = wy;
+    video_bpp   = 8;
+}
+
+static void
+da2_poll(void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+    int    x;
+
+    if (!da2->linepos) {
+        timer_advance_u64(&da2->timer, da2->dispofftime);
+        // if (output) printf("Display off %f\n",vidtime);
+        da2->cgastat |= 1;
+        da2->linepos = 1;
+
+        if (da2->dispon) {
+            da2->hdisp_on = 1;
+
+            da2->memaddr &= da2->vram_display_mask;
+            if (da2->firstline == 2000) {
+                da2->firstline = da2->displine;
+                video_wait_for_buffer();
+            }
+
+            if (!da2->override)
+                da2->render(da2);
+
+            if (da2->lastline < da2->displine)
+                da2->lastline = da2->displine;
+        }
+
+        // da2_log("%03i %06X %06X\n", da2->displine, da2->memaddr,da2->vram_display_mask);
+        da2->displine++;
+        if ((da2->cgastat & 8) && ((da2->displine & 0xf) == (da2->crtc[LC_VERTICAL_SYNC_END] & 0xf)) && da2->vslines) {
+            // da2_log("Vsync off at line %i\n",displine);
+            da2->cgastat &= ~8;
+        }
+        da2->vslines++;
+        if (da2->displine > 1200)
+            da2->displine = 0;
+        // da2_log("Col is %08X %08X %08X   %i %i  %08X\n",((uint32_t *)buffer32->line[displine])[320],((uint32_t *)buffer32->line[displine])[321],((uint32_t *)buffer32->line[displine])[322],
+        // displine, vc, memaddr);
+    } else {
+        // da2_log("VC %i memaddr %05X\n", da2->vc, da2->memaddr);
+        timer_advance_u64(&da2->timer, da2->dispontime);
+
+        if (da2->dispon)
+            da2->cgastat &= ~1;
+        da2->hdisp_on = 0;
+
+        da2->linepos = 0;
+        if (da2->scanline == (da2->crtc[LC_CURSOR_ROW_END] & 31))
+            da2->cursorvisible = 0;
+        if (da2->dispon) {
+            if (da2->scanline == da2->rowcount) {
+                da2->linecountff = 0;
+                da2->scanline          = 0;
+
+                da2->memaddr_backup += (da2->rowoffset << 1); /*   color = 0x50(80), mono = 0x40(64) */
+                da2->memaddr_backup &= da2->vram_display_mask;
+                da2->memaddr = da2->memaddr_backup;
+            } else {
+                da2->scanline++;
+                da2->scanline &= 31;
+                da2->memaddr = da2->memaddr_backup;
+            }
+        }
+
+        da2->vc++;
+        da2->vc &= 2047;
+
+        if (da2->vc == da2->split) {
+            // da2->memaddr = da2->memaddr_backup = da2->hblank_sub;
+            da2->memaddr = da2->memaddr_backup = 0;
+            da2->scanline = 0;
+            // da2->displine    = 0;
+        }
+
+        if (da2->vc == da2->dispend) {
+            da2->dispon = 0;
+            // if (da2->crtc[10] & 0x20) da2->cursoron = 0;
+            // else da2->cursoron = da2->blink & 16;
+            if (da2->ioctl[LS_MODE] & 1) {                /* in text mode */
+                if (da2->attrc[LV_CURSOR_CONTROL] & 0x01) /* cursor blinking */
+                {
+                    da2->cursoron = (da2->blink | 1) & da2->blinkconf;
+                } else {
+                    da2->cursoron = 0;
+                }
+                if (!(da2->blink & (0x10 - 1))) /* force redrawing for cursor and blink attribute */
+                    da2->fullchange = 2;
+            }
+            da2->blink++;
+
+            for (x = 0; x <= (DA2_MASK_VRAMPLANE >> 9); x++) {
+                if (da2->changedvram[x])
+                    da2->changedvram[x]--;
+            }
+            // memset(changedvram,0,2048);  del
+            if (da2->fullchange) {
+                da2->fullchange--;
+            }
+        }
+        if (da2->vc == da2->vsyncstart) {
+            int wx, wy;
+            // da2_log("VC vsync  %i %i\n", da2->firstline_draw, da2->lastline_draw);
+            da2->dispon = 0;
+            da2->cgastat |= 8;
+            x = da2->hdisp;
+
+            wx = x;
+            wy = da2->lastline - da2->firstline;
+
+            da2_doblit(da2->firstline_draw, da2->lastline_draw + 1, wx, wy, da2);
+
+            da2->firstline = 2000;
+            da2->lastline  = 0;
+
+            da2->firstline_draw = 2000;
+            da2->lastline_draw  = 0;
+
+            changeframecount = 2;
+            da2->vslines     = 0;
+
+            da2->memaddr
+                = da2->memaddr_backup = da2->memaddr_latch << 1;
+            da2->cursoraddr           = ((da2->crtc[LC_CURSOR_LOC_HIGH] << 8) | da2->crtc[LC_CURSOR_LOC_LOWJ]) + da2->ca_adj;
+            da2->cursoraddr <<= 1;
+
+            // da2_log("Addr %08X vson %03X vsoff %01X\n",da2->memaddr,da2->vsyncstart,da2->crtc[0x11]&0xF);
+        }
+        if (da2->vc == da2->vtotal) {
+            // da2_log("VC vtotal\n");
+            // printf("Frame over at line %i %i  %i %i\n",displine,vc,da2_vsyncstart,da2_dispend);
+            da2->vc          = 0;
+            da2->scanline          = da2->crtc[LC_PRESET_ROW_SCANJ] & 0x1f;
+            da2->dispon      = 1;
+            da2->displine    = 0;
+            da2->scrollcache = da2->attrc[LV_PANNING] & 7;
+        }
+        if (da2->scanline == (da2->crtc[LC_CURSOR_ROW_START] & 31))
+            da2->cursorvisible = 1;
+    }
+}
+
+static void
+da2_loadfont(char *fname, void *priv)
+{
+    da2_t  *da2 = (da2_t *) priv;
+    uint8_t buf;
+    uint64_t fsize;
+    if (!fname)
+        return;
+    if (*fname == '\0')
+        return;
+    FILE *mfile = rom_fopen(fname, "rb");
+    if (!mfile) {
+        // da2_log("MSG: Can't open binary ROM font file: %s\n", fname);
+        return;
+    }
+    fseek(mfile, 0, SEEK_END);
+    fsize = ftell(mfile); /* get filesize */
+    fseek(mfile, 0, SEEK_SET);
+    if (fsize > DA2_FONTROM_SIZE) {
+        fsize = DA2_FONTROM_SIZE; /* truncate read data */
+        // da2_log("MSG: The binary ROM font is truncated: %s\n", fname);
+        // fclose(mfile);
+        // return 1;
+    }
+    uint32_t j = 0;
+    while (ftell(mfile) < fsize) {
+        (void) !fread(&buf, sizeof(uint8_t), 1, mfile);
+        da2->mmio.font[j] = buf;
+        j++;
+    }
+    fclose(mfile);
+    return;
+}
+
+/* 12-bit DAC color palette for IBMJ Display Adapter with color monitor */
+static uint8_t ps55_palette_color[64][3] = {
+    { 0x00, 0x00, 0x00 },    { 0x00, 0x00, 0x2A },    { 0x00, 0x2A, 0x00 },    { 0x00, 0x2A, 0x2A },
+    { 0x2A, 0x00, 0x00 },    { 0x2A, 0x00, 0x2A },    { 0x2A, 0x2A, 0x00 },    { 0x2A, 0x2A, 0x2A },
+    { 0x00, 0x00, 0x15 },    { 0x00, 0x00, 0x3F },    { 0x00, 0x2A, 0x15 },    { 0x00, 0x2A, 0x3F },
+    { 0x2A, 0x00, 0x15 },    { 0x2A, 0x00, 0x3F },    { 0x2A, 0x2A, 0x15 },    { 0x2A, 0x2A, 0x3F },
+    { 0x00, 0x15, 0x00 },    { 0x00, 0x15, 0x2A },    { 0x00, 0x3F, 0x00 },    { 0x00, 0x3F, 0x2A },
+    { 0x2A, 0x15, 0x00 },    { 0x2A, 0x15, 0x2A },    { 0x2A, 0x3F, 0x00 },    { 0x2A, 0x3F, 0x2A },
+    { 0x00, 0x15, 0x15 },    { 0x00, 0x15, 0x3F },    { 0x00, 0x3F, 0x15 },    { 0x00, 0x3F, 0x3F },
+    { 0x2A, 0x15, 0x15 },    { 0x2A, 0x15, 0x3F },    { 0x2A, 0x3F, 0x15 },    { 0x2A, 0x3F, 0x3F },
+    { 0x15, 0x00, 0x00 },    { 0x15, 0x00, 0x2A },    { 0x15, 0x2A, 0x00 },    { 0x15, 0x2A, 0x2A },
+    { 0x3F, 0x00, 0x00 },    { 0x3F, 0x00, 0x2A },    { 0x3F, 0x2A, 0x00 },    { 0x3F, 0x2A, 0x2A },
+    { 0x15, 0x00, 0x15 },    { 0x15, 0x00, 0x3F },    { 0x15, 0x2A, 0x15 },    { 0x15, 0x2A, 0x3F },
+    { 0x3F, 0x00, 0x15 },    { 0x3F, 0x00, 0x3F },    { 0x3F, 0x2A, 0x15 },    { 0x3F, 0x2A, 0x3F },
+    { 0x15, 0x15, 0x00 },    { 0x15, 0x15, 0x2A },    { 0x15, 0x3F, 0x00 },    { 0x15, 0x3F, 0x2A },
+    { 0x3F, 0x15, 0x00 },    { 0x3F, 0x15, 0x2A },    { 0x3F, 0x3F, 0x00 },    { 0x3F, 0x3F, 0x2A },
+    { 0x15, 0x15, 0x15 },    { 0x15, 0x15, 0x3F },    { 0x15, 0x3F, 0x15 },    { 0x15, 0x3F, 0x3F },
+    { 0x3F, 0x15, 0x15 },    { 0x3F, 0x15, 0x3F },    { 0x3F, 0x3F, 0x15 },    { 0x3F, 0x3F, 0x3F }
+};
+
+static void
+da2_reset_ioctl(da2_t *da2)
+{
+    da2->ioctl[LS_RESET] = 0x00;     /* Bit 0: Reset sequencer */
+    da2_outw(LS_INDEX, 0x0302, da2); /* Index 02, Bit 1: VGA passthrough, Bit 0: Character Mode */
+    da2_outw(LS_INDEX, 0x0008, da2); /* Index 08, Bit 0: Enable MMIO */
+}
+
+static void
+da2_reset(void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+
+    /* Initialize drawing */
+    da2->bitblt.exec = DA2_BLT_CIDLE;
+    da2_reset_ioctl(da2);
+
+    da2->pos_regs[0]       = DA2_POSID_L;                    /* Adapter Identification Byte (Low byte) */
+    da2->pos_regs[1]       = DA2_POSID_H;                    /* Adapter Identification Byte (High byte) */
+    da2->pos_regs[2]       = 0x40;                           /* Bit 7-5: 010=Mono, 100=Color, Bit 0 : Card Enable (set by reference diskette) */
+    da2->ioctl[LS_CONFIG1] = OldLSI | Page_Two;              /* Configuration 1 : DA-II, 1024 KB */
+    da2->ioctl[LS_CONFIG1] |= ((da2->monitorid & 0x8) << 1); /* Configuration 1 : Monitor ID 3 */
+    da2->ioctl[LS_CONFIG2]         = (da2->monitorid & 0x7); /* Configuration 2: Monitor ID 0-2 */
+    da2->fctl[0]                   = 0x2b;                   /* 3E3h:0 */
+    da2->fctl[LF_MMIO_MODE]        = 0xb0;                   /* 3E3h:0bh */
+    da2->attrc[LV_CURSOR_COLOR]    = 0x0f;                   /* cursor color */
+    da2->crtc[LC_HORIZONTAL_TOTAL] = 63;                     /* Horizontal Total */
+    da2->crtc[LC_VERTICAL_TOTALJ]  = 255;                    /* Vertical Total (These two must be set before the timer starts.) */
+    da2->memaddr_latch                  = 0;
+    da2->attrc[LV_CURSOR_CONTROL]  = 0x13; /* cursor options */
+    da2->attr_palette_enable       = 0;    /* disable attribute generator */
+
+    /* Set default color palette (Windows 3.1 display driver won't reset palette) */
+    for (uint16_t i = 0; i < 256; i++) {
+        da2->vgapal[i].r = ps55_palette_color[i & 0x3F][0];
+        da2->vgapal[i].g = ps55_palette_color[i & 0x3F][1];
+        da2->vgapal[i].b = ps55_palette_color[i & 0x3F][2];
+        da2->pallook[i]  = makecol32((da2->vgapal[i].r & 0x3f) * 4, (da2->vgapal[i].g & 0x3f) * 4, (da2->vgapal[i].b & 0x3f) * 4);
+    }
+    da2_log("da2_reset done.\n");
+}
+
+static void *
+da2_init(UNUSED(const device_t *info))
+{
+    if (svga_get_pri() == NULL)
+        return NULL;
+    svga_t *mb_vga          = svga_get_pri();
+    mb_vga->cable_connected = 0;
+
+    da2_t *da2  = calloc(1, sizeof(da2_t));
+    da2->mb_vga = mb_vga;
+
+    da2->dispontime        = 1000ull << 32;
+    da2->dispofftime       = 1000ull << 32;
+    da2->vram              = calloc(1, DA2_SIZE_VRAM);
+    da2->cram              = calloc(1, DA2_SIZE_CRAM);
+    da2->vram_display_mask = DA2_MASK_CRAM;
+    da2->monitorid         = device_get_config_int("montype");       
+    da2->changedvram       = calloc(1,  (DA2_MASK_VRAMPLANE + 1) >> 9); /* XX000h */
+
+    da2->mmio.charset = device_get_config_int("charset");
+    da2->mmio.font    = malloc(DA2_FONTROM_SIZE);
+    switch (da2->mmio.charset) {
+        case DA2_DCONFIG_CHARSET_HANT:
+            da2_loadfont(DA2_FONTROM_PATH_HANT, da2);
+            break;
+        case DA2_DCONFIG_CHARSET_JPAN:
+            da2_loadfont(DA2_FONTROM_PATH_JPAN, da2);
+            /* Add magic code for OS/2 J1.3. This disables BitBlt's text drawing function. */
+            da2->mmio.font[0x1AFFE] = 0x80;
+            da2->mmio.font[0x1AFFF] = 0x01;
+            break;
+    }
+
+    mca_add(da2_mca_read, da2_mca_write, da2_mca_feedb, da2_mca_reset, da2);
+    da2->da2const = (uint64_t) ((cpuclock / DA2_PIXELCLOCK) * (double) (1ull << 32));
+    memset(da2->bitblt.payload, 0x00, DA2_BLT_MEMSIZE);
+    memset(da2->bitblt.reg, 0xfe, DA2_BLT_REGSIZE * sizeof(uint32_t)); /* clear memory */
+#ifdef ENABLE_DA2_DEBUGBLT
+    da2->bitblt.debug_reg    = malloc(DA2_DEBUG_BLTLOG_MAX * DA2_DEBUG_BLTLOG_SIZE);
+    da2->bitblt.debug_reg_ip = 0;
+#endif
+#ifdef ENABLE_DA2_DEBUGVRAM
+    da2->mmdbg_fp            = fopen("da2_mmiowdat.txt", "w");
+    da2->mmrdbg_fp           = fopen("da2_mmiordat.txt", "w");
+#endif
+    da2->bitblt.payload_addr = 0;
+
+    timer_add(&da2->timer_vidupd, da2_updatevidselector_tick, da2, 0);/* Init timer before executing reset */
+    da2_reset(da2);
+
+    mem_mapping_add(&da2->mmio.mapping, 0xA0000, 0x20000, da2_mmio_read, da2_mmio_readw, NULL, da2_mmio_write, da2_mmio_writew, NULL, NULL, MEM_MAPPING_EXTERNAL, da2);
+    // da2_log("DA2mmio new mapping: %X, base: %x, size: %x\n", &da2->mmio.mapping, da2->mmio.mapping.base, da2->mmio.mapping.size);
+
+    mem_mapping_disable(&da2->mmio.mapping);
+
+    mem_mapping_add(&da2->cmapping, 0xE0000, 0x1000, da2_code_readb, da2_code_readw, NULL, da2_code_writeb, da2_code_writew, NULL, NULL, MEM_MAPPING_EXTERNAL, da2);
+
+    mem_mapping_disable(&da2->cmapping);
+
+    timer_add(&da2->timer, da2_poll, da2, 0);
+    da2->bitblt.timerspeed = 5ull * TIMER_USEC; /* Bitblt execution speed */
+    timer_add(&da2->bitblt.timer, da2_bitblt_dopayload, da2, 0);
+
+    return da2;
+}
+static int
+da2_available(void)
+{
+    return (rom_present(DA2_FONTROM_PATH_HANT) || rom_present(DA2_FONTROM_PATH_JPAN));
+}
+
+static void
+da2_close(void *priv)
+{
+    da2_t *da2 = (da2_t *) priv;
+
+    /* dump mem for debug */
+#ifdef ENABLE_DA2_LOG
+    FILE *fp;
+    fp = fopen("da2_cram.dmp", "wb");
+    if (fp != NULL) {
+        fwrite(da2->cram, DA2_SIZE_CRAM, 1, fp);
+        fclose(fp);
+    }
+    fp = fopen("da2_vram.dmp", "wb");
+    if (fp != NULL) {
+        fwrite(da2->vram, DA2_SIZE_VRAM, 1, fp);
+        fclose(fp);
+    }
+    fp = fopen("da2_gram.dmp", "wb");
+    if (fp != NULL) {
+        fwrite(da2->mmio.ram, DA2_SIZE_GAIJIRAM, 1, fp);
+        fclose(fp);
+    }
+    fp = fopen("da2_attrpal.dmp", "wb");
+    if (fp != NULL) {
+        fwrite(da2->attrc, 32, 1, fp);
+        fclose(fp);
+    }
+    fp = fopen("da2_dacrgb.dmp", "wb");
+    if (fp != NULL) {
+        fwrite(da2->vgapal, 3 * 256, 1, fp);
+        fclose(fp);
+    }
+    fp = fopen("da2_daregs.txt", "w");
+    if (fp != NULL) {
+        for (uint8_t i = 0; i < 0x10; i++)
+            fprintf(fp, "3e1(ioctl) %02X: %4X\n", i, da2->ioctl[i]);
+        for (uint8_t i = 0; i < 0x20; i++)
+            fprintf(fp, "3e3(fctl)  %02X: %4X\n", i, da2->fctl[i]);
+        for (uint8_t i = 0; i < 0x20; i++)
+            fprintf(fp, "3e5(crtc)  %02X: %4X\n", i, da2->crtc[i]);
+        for (uint8_t i = 0; i < 0x40; i++)
+            fprintf(fp, "3e8(attr)  %02X: %4X\n", i, da2->attrc[i]);
+        for (uint8_t i = 0; i < 0x10; i++)
+            fprintf(fp, "3eb(gcr)   %02X: %4X\n", i, da2->gdcreg[i]);
+        for (uint8_t i = 0; i < 0x10; i++)
+            fprintf(fp, "3ee(?)     %02X: %4X\n", i, da2->reg3ee[i]);
+        for (uint8_t i = 0; i < 0x20; i++) {
+            fprintf(fp, "vp         %02X: %4X %4X %4X %4X\n", i, 
+                da2->crtc_vpreg[0 + i], da2->crtc_vpreg[0x20 + i], da2->crtc_vpreg[0x40 + i], da2->crtc_vpreg[0x60 + i]);
+        }
+        fclose(fp);
+    }
+    fp = fopen("ram_low.dmp", "wb");
+    if (fp != NULL) {
+        fwrite(&ram[0x0], 0x100000, 1, fp);
+        fclose(fp);
+    }
+    pclog("closed %04X:%04X DS %04X\n", cs >> 4, cpu_state.pc, DS);
+#endif
+#ifdef ENABLE_DA2_DEBUGBLT
+    fp = fopen("da2_bltdump.csv", "w");
+    if (fp != NULL && da2->bitblt.debug_reg_ip > 0) {
+        /* print header */
+        for (int y = 0; y < DA2_DEBUG_BLTLOG_SIZE; y++) {
+            if (da2->bitblt.debug_reg[(da2->bitblt.debug_reg_ip - 1) * DA2_DEBUG_BLTLOG_SIZE + y] != DA2_DEBUG_BLT_NEVERUSED)
+                fprintf(fp, "\"%02X\"\t", y);
+        }
+        fprintf(fp, "\n");
+        /* print data */
+        for (int x = 0; x < da2->bitblt.debug_reg_ip; x++) {
+            for (int y = 0; y < DA2_DEBUG_BLTLOG_SIZE; y++) {
+                if (da2->bitblt.debug_reg[x * DA2_DEBUG_BLTLOG_SIZE + y] == DA2_DEBUG_BLT_NEVERUSED)
+                    ;
+                else if (da2->bitblt.debug_reg[x * DA2_DEBUG_BLTLOG_SIZE + y] == DA2_DEBUG_BLT_USEDRESET)
+                    fprintf(fp, "\"\"\t");
+                else {
+                    fprintf(fp, "\"%X\"\t", da2->bitblt.debug_reg[x * DA2_DEBUG_BLTLOG_SIZE + y]);
+                    if (y == 0x12) {
+                        int chr = da2->bitblt.debug_reg[x * DA2_DEBUG_BLTLOG_SIZE + 0x12];
+                        if ((chr >= 0x20) && (chr < 0x7f))
+                            fprintf(fp, "\"%c\"\t", chr);
+                        else
+                            fprintf(fp, "\"\"\t");
+                    }
+                }
+            }
+            fprintf(fp, "\n");
+        }
+        fclose(fp);
+    }
+    free(da2->bitblt.debug_reg);
+#endif
+#ifdef ENABLE_DA2_DEBUGVRAM
+    if (da2->mmdbg_fp != NULL)
+        fclose(da2->mmdbg_fp);
+    if (da2->mmrdbg_fp != NULL)
+        fclose(da2->mmrdbg_fp);
+#endif
+    free(da2->cram);
+    free(da2->vram);
+    free(da2->changedvram);
+    free(da2->mmio.font);
+    free(da2);
+}
+
+static void
+da2_speed_changed(void *priv)
+{
+    da2_t *da2    = (da2_t *) priv;
+    da2->da2const = (uint64_t) ((cpuclock / DA2_PIXELCLOCK) * (double) (1ull << 32));
+    da2_recalctimings(da2);
+}
+
+static void
+da2_force_redraw(void *priv)
+{
+    da2_t *da2      = (da2_t *) priv;
+    da2->fullchange = changeframecount;
+}
+
+static const device_config_t da2_configuration[] = {
+    // clang-format off
+    {
+        .name        = "charset",
+        .description = "Character set",
+        .type        = CONFIG_SELECTION,
+        .default_int = DA2_DCONFIG_CHARSET_JPAN,
+        .selection   = {
+            {
+                .description = "932 (Japanese)",
+                .value = DA2_DCONFIG_CHARSET_JPAN
+            },
+            {
+                .description = "938 (Traditional Chinese)",
+                .value = DA2_DCONFIG_CHARSET_HANT
+            },
+            { .description = "" }
+        }
+    },
+    {
+        .name        = "montype",
+        .description = "Monitor type",
+        .type        = CONFIG_SELECTION,
+        .default_int = DA2_DCONFIG_MONTYPE_COLOR,
+        .selection   = {
+            {
+                .description = "Color",
+                .value = DA2_DCONFIG_MONTYPE_COLOR
+            },
+            {
+                .description = "IBM 8515",
+                .value = DA2_DCONFIG_MONTYPE_8515
+            },
+            {
+                .description = "Grayscale",
+                .value = DA2_DCONFIG_MONTYPE_MONO
+            },
+            { .description = "" }
+        }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t ps55da2_device = {
+    .name          = "IBM Display Adapter II (MCA)",
+    .internal_name = "ps55da2",
+    .flags         = DEVICE_MCA,
+    .local         = 0,
+    .init          = da2_init,
+    .close         = da2_close,
+    .reset         = da2_reset,
+    .available     = da2_available,
+    .speed_changed = da2_speed_changed,
+    .force_redraw  = da2_force_redraw,
+    .config        = da2_configuration
+};
+
+void
+da2_device_add(void)
+{
+    if (!da2_standalone_enabled)
+        return;
+
+    if (machine_has_bus(machine, MACHINE_BUS_MCA))
+        device_add(&ps55da2_device);
+    else
+        return;
+}
diff --git a/src/video/vid_rtg310x.c b/src/video/vid_rtg310x.c
index e82763d15..813d30bf3 100644
--- a/src/video/vid_rtg310x.c
+++ b/src/video/vid_rtg310x.c
@@ -180,7 +180,7 @@ rtg_out(uint16_t addr, uint8_t val, void *priv)
                 if (svga->crtcreg < 0xe || svga->crtcreg > 0x10) {
                     if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
                     } else {
                         svga->fullchange = changeframecount;
                         svga_recalctimings(svga);
@@ -211,7 +211,7 @@ rtg_recalctimings(svga_t *svga)
 {
     const rtg_t  *dev  = (rtg_t *) svga->priv;
 
-    svga->ma_latch |= ((svga->crtc[0x19] & 0x10) << 16) | ((svga->crtc[0x19] & 0x40) << 17);
+    svga->memaddr_latch |= ((svga->crtc[0x19] & 0x10) << 16) | ((svga->crtc[0x19] & 0x40) << 17);
 
     svga->interlace = (svga->crtc[0x19] & 1);
 
@@ -387,58 +387,43 @@ rtg3106_available(void)
 static const device_config_t rtg3105_config[] = {
   // clang-format off
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 512,
-        .selection = {
-            {
-                .description = "256 KB",
-                .value = 256
-            },
-            {
-                .description = "512 KB",
-                .value = 512
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 512,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "256 KB", .value = 256 },
+            { .description = "512 KB", .value = 512 },
+            { .description = ""                     }
+        },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
 static const device_config_t rtg3106_config[] = {
   // clang-format off
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 1024,
-        .selection = {
-            {
-                .description = "256 KB",
-                .value = 256
-            },
-            {
-                .description = "512 KB",
-                .value = 512
-            },
-            {
-                .description = "1 MB",
-                .value = 1024
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1024,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "256 KB", .value =  256 },
+            { .description = "512 KB", .value =  512 },
+            { .description = "1 MB",   .value = 1024 },
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
@@ -450,7 +435,7 @@ const device_t realtek_rtg3105_device = {
     .init          = rtg_init,
     .close         = rtg_close,
     .reset         = NULL,
-    { .available = rtg3105_available },
+    .available     = rtg3105_available,
     .speed_changed = rtg_speed_changed,
     .force_redraw  = rtg_force_redraw,
     .config        = rtg3105_config
@@ -464,7 +449,7 @@ const device_t realtek_rtg3106_device = {
     .init          = rtg_init,
     .close         = rtg_close,
     .reset         = NULL,
-    { .available = rtg3106_available },
+    .available     = rtg3106_available,
     .speed_changed = rtg_speed_changed,
     .force_redraw  = rtg_force_redraw,
     .config        = rtg3106_config
diff --git a/src/video/vid_s3.c b/src/video/vid_s3.c
index d8691ad77..870221742 100644
--- a/src/video/vid_s3.c
+++ b/src/video/vid_s3.c
@@ -24,6 +24,7 @@
 #include <math.h>
 #include <wchar.h>
 #include <stdatomic.h>
+#include <stdbool.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/device.h>
@@ -32,11 +33,14 @@
 #include <86box/mem.h>
 #include <86box/pci.h>
 #include <86box/rom.h>
+#include <86box/nmc93cxx.h>
+#include <86box/nvr.h>
 #include <86box/plat.h>
 #include <86box/thread.h>
 #include <86box/video.h>
 #include <86box/i2c.h>
 #include <86box/vid_ddc.h>
+#include <86box/vid_xga.h>
 #include <86box/vid_svga.h>
 #include <86box/vid_svga_render.h>
 #include "cpu.h"
@@ -45,6 +49,9 @@
 #define ROM_DIAMOND_STEALTH_VRAM       "roms/video/s3/Diamond Stealth VRAM BIOS v2.31 U14.BIN"
 #define ROM_AMI_86C924                 "roms/video/s3/S3924AMI.BIN"
 #define ROM_METHEUS_86C928             "roms/video/s3/928.VBI"
+#define ROM_ELSAWIN1KVL_86C928         "roms/video/s3/ELSA_Winner_XHR_1000VL.BIN"
+#define ROM_ELSAWIN1KPCI_86C928        "roms/video/s3/ELSA_Winner_10000_PCI_BIOS_3.04.02.BIN"
+#define ROM_ELSAWIN2K_86C928           "roms/video/s3/elsa-winner-2000-vga-bios-v1-02-03-66b7554c706d6962736994.bin"
 #define ROM_SPEA_MERCURY_LITE_PCI      "roms/video/s3/SPEAVGA.VBI"
 #define ROM_SPEA_MIRAGE_86C801         "roms/video/s3/V7MIRAGE.VBI"
 #define ROM_SPEA_MIRAGE_86C805         "roms/video/s3/86c805pspeavlbus.BIN"
@@ -54,6 +61,7 @@
 #define ROM_MIROCRYSTAL20SV_964_PCI    "roms/video/s3/mirocrystal.VBI"
 #define ROM_MIROCRYSTAL20SD_864_VLB    "roms/video/s3/Miro20SD.BIN"
 #define ROM_PHOENIX_86C80X             "roms/video/s3/805.VBI"
+#define ROM_WINNER1000_805             "roms/video/s3/v01_05_00-C.BIN"
 #define ROM_PARADISE_BAHAMAS64         "roms/video/s3/bahamas64.bin"
 #define ROM_PHOENIX_VISION864          "roms/video/s3/86c864p.bin"
 #define ROM_DIAMOND_STEALTH64_964      "roms/video/s3/964_107h.rom"
@@ -63,6 +71,7 @@
 #define ROM_PHOENIX_TRIO64             "roms/video/s3/86c764x1.bin"
 #define ROM_DIAMOND_STEALTH64_764      "roms/video/s3/stealt64.bin"
 #define ROM_TRIO64V2_DX_VBE20          "roms/video/s3/86c775_2.bin"
+#define ROM_STB_POWERGRAPH_64_VIDEO    "roms/video/s3/VBIOS.BIN"
 #define ROM_PHOENIX_TRIO64VPLUS        "roms/video/s3/64V1506.ROM"
 #define ROM_CARDEX_TRIO64VPLUS         "roms/video/s3/S3T64VP.VBI"
 #define ROM_DIAMOND_STEALTH_SE         "roms/video/s3/DiamondStealthSE.VBI"
@@ -74,6 +83,7 @@
 #define ROM_SPEA_MERCURY_P64V          "roms/video/s3/S3_968PCI_TVP3026_SPEAMecuryP64V_ver1.01.BIN"
 #define ROM_NUMBER9_9FX_771            "roms/video/s3/no9motionfx771.BIN"
 #define ROM_PHOENIX_VISION968          "roms/video/s3/1-DSV3968P.BIN"
+#define ROM_DIAMOND_STEALTH64_968      "roms/video/s3/vv_303.rom"
 
 enum {
     S3_NUMBER9_9FX,
@@ -91,9 +101,13 @@ enum {
     S3_PHOENIX_86C805,
     S3_ORCHID_86C911,
     S3_METHEUS_86C928,
+    S3_ELSAWIN1K_86C928,
+    S3_ELSAWIN1KPCI_86C928,
+    S3_ELSAWIN2K_86C928,
     S3_AMI_86C924,
     S3_TRIO64V2_DX,
     S3_TRIO64V2_DX_ONBOARD,
+    S3_STB_POWERGRAPH_64_VIDEO,
     S3_PHOENIX_TRIO64VPLUS,
     S3_PHOENIX_TRIO64VPLUS_ONBOARD,
     S3_CARDEX_TRIO64VPLUS,
@@ -113,7 +127,9 @@ enum {
     S3_NUMBER9_9FX_531,
     S3_NUMBER9_9FX_771,
     S3_SPEA_MERCURY_LITE_PCI,
-    S3_86C805_ONBOARD
+    S3_86C805_ONBOARD,
+    S3_DIAMOND_STEALTH64_968,
+    S3_WINNER1000_805
 };
 
 enum {
@@ -141,7 +157,6 @@ static video_timings_t timing_s3_stealth64_vlb = { .type = VIDEO_BUS, .write_b =
 static video_timings_t timing_s3_stealth64_pci = { .type = VIDEO_PCI, .write_b = 2, .write_w = 2, .write_l = 4, .read_b = 26, .read_w = 26, .read_l = 42 };
 static video_timings_t timing_s3_vision864_vlb = { .type = VIDEO_BUS, .write_b = 4, .write_w = 4, .write_l = 5, .read_b = 20, .read_w = 20, .read_l = 35 };
 static video_timings_t timing_s3_vision864_pci = { .type = VIDEO_PCI, .write_b = 4, .write_w = 4, .write_l = 5, .read_b = 20, .read_w = 20, .read_l = 35 };
-static video_timings_t timing_s3_vision868_vlb = { .type = VIDEO_BUS, .write_b = 4, .write_w = 4, .write_l = 5, .read_b = 20, .read_w = 20, .read_l = 35 };
 static video_timings_t timing_s3_vision868_pci = { .type = VIDEO_PCI, .write_b = 4, .write_w = 4, .write_l = 5, .read_b = 20, .read_w = 20, .read_l = 35 };
 static video_timings_t timing_s3_vision964_vlb = { .type = VIDEO_BUS, .write_b = 2, .write_w = 2, .write_l = 4, .read_b = 20, .read_w = 20, .read_l = 35 };
 static video_timings_t timing_s3_vision964_pci = { .type = VIDEO_PCI, .write_b = 2, .write_w = 2, .write_l = 4, .read_b = 20, .read_w = 20, .read_l = 35 };
@@ -182,17 +197,32 @@ enum {
     FIFO_OUT_DWORD   = (0x06 << 24)
 };
 
-typedef struct
-{
+typedef enum {
+    BUILT_IN = 0,
+    SC1148X,
+    SC1502X,
+    ATT49X,
+    ATT498,
+    BT48X,
+    IBM_RGB,
+    S3_SDAC,
+    TVP3026
+} s3_ramdac_type;
+
+typedef struct {
     uint32_t addr_type;
     uint32_t val;
 } fifo_entry_t;
 
 typedef struct s3_t {
+    char nvr_path[128];
     mem_mapping_t linear_mapping;
     mem_mapping_t mmio_mapping;
     mem_mapping_t new_mmio_mapping;
 
+    int elsa_eeprom;
+    s3_ramdac_type ramdac_type;
+
     uint8_t has_bios;
     rom_t   bios_rom;
 
@@ -231,6 +261,8 @@ typedef struct s3_t {
         uint8_t  advfunc_cntl;
         uint16_t cur_y, cur_y2;
         uint16_t cur_x, cur_x2;
+        uint16_t cur_x_overflow;
+        uint16_t destx_overflow;
         uint16_t x2, ropmix;
         uint16_t pat_x, pat_y;
         int16_t  desty_axstp, desty_axstp2;
@@ -242,6 +274,8 @@ typedef struct s3_t {
         uint32_t pat_bg_color, pat_fg_color;
         uint32_t bkgd_color;
         uint32_t frgd_color;
+        uint16_t bkgd_color_back;
+        uint16_t frgd_color_back;
         uint32_t wrt_mask;
         uint32_t rd_mask;
         uint32_t color_cmp;
@@ -250,6 +284,8 @@ typedef struct s3_t {
         uint16_t multifunc_cntl;
         uint16_t multifunc[16];
         uint8_t  pix_trans[4];
+        uint8_t  pix_trans_val[2048][2048];
+        int      pix_trans_inc;
         int      ssv_state;
 
         int16_t  cx, cy;
@@ -269,20 +305,21 @@ typedef struct s3_t {
         int      dat_count;
         int      b2e8_pix, temp_cnt;
         int      ssv_len;
+        int      ssv_len_back;
         uint8_t  ssv_dir;
         uint8_t  ssv_draw;
         uint8_t  dat_buf_16bit;
         uint8_t  frgd_color_actual[2];
         uint8_t  bkgd_color_actual[2];
         uint8_t  wrt_mask_actual[2];
-        uint8_t  rd_mask_actual[2];
-        uint8_t *pix_trans_ptr;
-        int      pix_trans_ptr_cnt;
-        int      pix_trans_x_count;
-        int      pix_trans_x_count2;
         int      color_16bit_check;
-        int      color_16bit_check_rectfill;
-        uint16_t minus, srcminus;
+        int      color_16bit_check_pixtrans;
+        int16_t  minus;
+        int16_t  minus_src_24bpp;
+        int      rd_mask_16bit_check;
+        int      start;
+        int      mix_dat_upper;
+        int      overflow;
 
         /*For non-threaded FIFO*/
         int setup_fifo_slot;
@@ -362,7 +399,7 @@ typedef struct s3_t {
     event_t  *wake_fifo_thread;
     event_t  *fifo_not_full_event;
 
-    int      blitter_busy;
+    atomic_int blitter_busy;
     uint64_t blitter_time;
     uint64_t status_time;
 
@@ -376,14 +413,22 @@ typedef struct s3_t {
     int        color_16bit;
     atomic_int busy, force_busy;
 
+    bool color_key_enabled;
+
     uint8_t thread_run, serialport;
+    uint8_t eeprom_inst;
+    uint16_t eeprom_data[128];
     void   *i2c, *ddc;
 
+    nmc93cxx_eeprom_t *eeprom;
+
     int vram;
 
     void (*accel_start)(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, void *priv);
 } s3_t;
 
+static s3_t             *reset_state = NULL;
+
 #define INT_VSY         (1 << 0)
 #define INT_GE_BSY      (1 << 1)
 #define INT_FIFO_OVR    (1 << 2)
@@ -407,6 +452,7 @@ static uint32_t s3_accel_read_l(uint32_t addr, void *priv);
 static void    s3_out(uint16_t addr, uint8_t val, void *priv);
 static uint8_t s3_in(uint16_t addr, void *priv);
 
+static void     s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val);
 static void     s3_accel_out(uint16_t port, uint8_t val, void *priv);
 static void     s3_accel_out_w(uint16_t port, uint16_t val, void *priv);
 static void     s3_accel_out_l(uint16_t port, uint32_t val, void *priv);
@@ -503,15 +549,14 @@ s3_update_irqs(s3_t *s3)
     if (!s3->pci)
         return;
 
-    if (s3->subsys_cntl & s3->subsys_stat & INT_MASK) {
+    if (s3->subsys_cntl & s3->subsys_stat & INT_MASK)
         pci_set_irq(s3->pci_slot, PCI_INTA, &s3->irq_state);
-    } else {
+    else
         pci_clear_irq(s3->pci_slot, PCI_INTA, &s3->irq_state);
-    }
 }
 
 void        s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, void *priv);
-void        s3_short_stroke_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, s3_t *s3, uint8_t ssv);
+void        s3_short_stroke_start(s3_t *s3, uint8_t ssv);
 static void s3_visionx68_video_engine_op(uint32_t cpu_dat, s3_t *s3);
 
 #define WRITE8(addr, var, val)                        \
@@ -531,21 +576,20 @@ static void s3_visionx68_video_engine_op(uint32_t cpu_dat, s3_t *s3);
     }
 
 #define READ_PIXTRANS_BYTE_IO(n) \
-    s3->accel.pix_trans[n] = svga->vram[dword_remap(svga, (s3->accel.dest + s3->accel.cx + n - s3->accel.minus)) & s3->vram_mask];
+    s3->accel.pix_trans[n] = svga->vram[dword_remap(svga, (s3->accel.dest + s3->accel.cx - s3->accel.minus + n)) & s3->vram_mask];
 
 #define READ_PIXTRANS_BYTE_MM \
     temp = svga->vram[dword_remap(svga, (s3->accel.dest + s3->accel.cx)) & s3->vram_mask];
 
-#define READ_PIXTRANS_WORD                                                                                 \
-    if ((s3->bpp == 0) && !s3->color_16bit) {                                                                \
-        temp = svga->vram[dword_remap(svga, (s3->accel.dest + s3->accel.cx)) & s3->vram_mask];             \
-        temp |= (svga->vram[dword_remap(svga, (s3->accel.dest + s3->accel.cx + 1)) & s3->vram_mask] << 8); \
-    } else {                                                                                               \
-        temp = vram_w[dword_remap_w(svga, (s3->accel.dest + s3->accel.cx - s3->accel.minus)) & (s3->vram_mask >> 1)];        \
-    }
+#define READ_PIXTRANS_WORD                                                                                            \
+    if ((s3->bpp == 0) && !s3->color_16bit) {                                                                         \
+        temp = svga->vram[dword_remap(svga, (s3->accel.dest + s3->accel.cx)) & s3->vram_mask];                        \
+        temp |= (svga->vram[dword_remap(svga, (s3->accel.dest + s3->accel.cx + 1)) & s3->vram_mask] << 8);            \
+    } else                                                                                                            \
+        temp = vram_w[dword_remap_w(svga, (s3->accel.dest + s3->accel.cx - s3->accel.minus)) & (s3->vram_mask >> 1)];
 
 #define READ_PIXTRANS_LONG                                                                                       \
-    if ((s3->bpp == 0) && !s3->color_16bit) {                                                                      \
+    if ((s3->bpp == 0) && !s3->color_16bit) {                                                                    \
         temp = svga->vram[dword_remap(svga, (s3->accel.dest + s3->accel.cx)) & s3->vram_mask];                   \
         temp |= (svga->vram[dword_remap(svga, (s3->accel.dest + s3->accel.cx + 1)) & s3->vram_mask] << 8);       \
         temp |= (svga->vram[dword_remap(svga, (s3->accel.dest + s3->accel.cx + 2)) & s3->vram_mask] << 16);      \
@@ -607,111 +651,95 @@ s3_accel_out_pixtrans_w(s3_t *s3, uint16_t val)
                s3->accel.frgd_mix, s3->accel.bkgd_mix, s3->accel.cur_x, val);
         switch (s3->accel.cmd & 0x600) {
             case 0x000:
-                if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 2)) {
+                if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 0x02)) {
                     if (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40)) {
                         if (s3->accel.cmd & 0x1000)
                             val = (val >> 8) | (val << 8);
+
                         s3->accel_start(8, 1, val | (val << 16), 0, s3);
+                    } else {
+                        if ((s3->bpp == 0) && s3->color_16bit) {
+                            if (s3->accel.rd_mask_16bit_check) {
+                                if (s3->accel.cur_x & 0x400)
+                                    val = (val >> 8) | (val << 8);
+                            } else {
+                                if (s3->accel.cur_x & 0x400)
+                                    s3->accel.color_16bit_check_pixtrans = 1;
+                                else
+                                    s3->accel.color_16bit_check_pixtrans = 0;
+                            }
+                            s3->accel_start(2, 1, 0xffffffff, val | (val << 16), s3);
+                        } else
+                            s3->accel_start(1, 1, 0xffffffff, val | (val << 16), s3);
+                    }
+                } else {
+                    if ((s3->bpp == 0) && s3->color_16bit) {
+                        if (s3->accel.rd_mask_16bit_check) {
+                            if (s3->accel.cur_x & 0x400)
+                                val = (val >> 8) | (val << 8);
+                        } else {
+                            if (s3->accel.cur_x & 0x400)
+                                s3->accel.color_16bit_check_pixtrans = 1;
+                            else
+                                s3->accel.color_16bit_check_pixtrans = 0;
+                        }
+                        s3->accel_start(2, 1, 0xffffffff, val | (val << 16), s3);
                     } else
                         s3->accel_start(1, 1, 0xffffffff, val | (val << 16), s3);
-                } else {
-                    if (s3->accel.color_16bit_check_rectfill) {
-                        if (s3->accel.color_16bit_check) {
-                            if (s3->accel.pix_trans_x_count < s3->accel.pix_trans_ptr_cnt) {
-                                s3_log("Word: CPU data CMD=%04x, byte write=%02x, "
-                                       "cnt=%d, check=%d.\n", s3->accel.cmd, val & 0xff,
-                                       s3->accel.pix_trans_x_count, s3->accel.color_16bit_check);
-                                s3->accel.pix_trans_ptr[s3->accel.pix_trans_x_count] = val & 0xff;
-                                s3->accel.pix_trans_ptr[s3->accel.pix_trans_x_count + 1] = val >> 8;
-                                s3->accel.pix_trans_x_count += 2;
-                            }
-                        }
-                        break;
-                    }
-                    s3->accel_start(1, 1, 0xffffffff, val | (val << 16), s3);
                 }
                 break;
             case 0x200:
-                if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 2)) {
+                if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 0x02)) {
                     if (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40)) {
                         if (s3->accel.cmd & 0x1000)
                             val = (val >> 8) | (val << 8);
-                        s3->accel_start(16, 1, val | (val << 16), 0, s3);
-                    } else
-                        s3->accel_start(2, 1, 0xffffffff, val | (val << 16), s3);
-                } else {
-                    if (s3->accel.color_16bit_check_rectfill) {
-                        if (s3->accel.color_16bit_check) {
-                            if (s3->accel.pix_trans_x_count < s3->accel.pix_trans_ptr_cnt) {
-                                s3_log("Word: CPU data CMD=%04x, word write=%04x, cnt=%d, check=%d, "
-                                       "totalptrcnt=%d.\n", s3->accel.cmd, val,
-                                       s3->accel.pix_trans_x_count, s3->accel.color_16bit_check,
-                                       s3->accel.pix_trans_ptr_cnt);
-                                s3->accel.pix_trans_ptr[s3->accel.pix_trans_x_count] = val & 0xff;
-                                s3->accel.pix_trans_ptr[s3->accel.pix_trans_x_count + 1] = val >> 8;
-                                s3->accel.pix_trans_x_count += 2;
-                                s3->accel.pix_trans_x_count2 = s3->accel.pix_trans_x_count;
-                            }
-                        } else {
-                            if (s3->accel.pix_trans_x_count < s3->accel.pix_trans_ptr_cnt) {
-                                s3_log("Word: CPU data CMD=%04x, word write=%04x, cnt=%d, check=%d, "
-                                       "totalptrcnt=%d.\n", s3->accel.cmd, val,
-                                       s3->accel.pix_trans_x_count, s3->accel.color_16bit_check,
-                                       s3->accel.pix_trans_ptr_cnt);
-                                s3->accel.pix_trans_ptr[s3->accel.pix_trans_x_count2] = val & 0xff;
-                                s3->accel.pix_trans_ptr[s3->accel.pix_trans_x_count2 + 1] = val >> 8;
-                                s3->accel.pix_trans_x_count += 2;
-                            }
-                            if (s3->accel.pix_trans_x_count2 == s3->accel.pix_trans_ptr_cnt) {
-                                for (int i = 0; i < s3->accel.pix_trans_ptr_cnt; i += 2) {
-                                    s3_log("Transferring write count=%d, bytes=%08x.\n", i,
-                                           s3->accel.pix_trans_ptr[i] |
-                                           (s3->accel.pix_trans_ptr[i + 1] << 8) |
-                                           (s3->accel.pix_trans_ptr[i + 2] << 16) |
-                                           (s3->accel.pix_trans_ptr[i + 3] << 24));
-                                    s3->accel_start(2, 1, 0xffffffff, s3->accel.pix_trans_ptr[i] |
-                                                    (s3->accel.pix_trans_ptr[i + 1] << 8), s3);
-                                }
 
-                                s3->accel.pix_trans_x_count2 = 0;
-                                s3->accel.color_16bit_check_rectfill = 0;
-                                if (s3->accel.pix_trans_ptr != NULL) {
-                                    free(s3->accel.pix_trans_ptr);
-                                    s3->accel.pix_trans_ptr = NULL;
-                                }
+                        s3->accel_start(16, 1, val | (val << 16), 0, s3);
+                    } else {
+                        if (s3->accel.rd_mask_16bit_check) {
+                            if ((s3->accel.cmd == 0x53f1) || (s3->accel.cmd == 0x53b1)) {
+                                if (s3->accel.cur_x & 0x400)
+                                    val = (val >> 8) | (val << 8);
+
+                                s3->accel_start(2, 1, 0xffffffff, val | (val << 16), s3);
+
+                                val = (val >> 8) | (val << 8);
                             }
                         }
-                        break;
+                        s3->accel_start(2, 1, 0xffffffff, val | (val << 16), s3);
+                    }
+                } else {
+                    if (s3->accel.rd_mask_16bit_check) {
+                        if ((s3->accel.cmd == 0x53f1) || (s3->accel.cmd == 0x53b1)) {
+                            if (s3->accel.cur_x & 0x400)
+                                val = (val >> 8) | (val << 8);
+
+                            s3->accel_start(2, 1, 0xffffffff, val | (val << 16), s3);
+
+                            val = (val >> 8) | (val << 8);
+                        }
                     }
                     s3->accel_start(2, 1, 0xffffffff, val | (val << 16), s3);
                 }
                 break;
             case 0x400:
-                if (svga->crtc[0x53] & 0x08) {
-                    if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 2)) {
-                        if (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40)) {
-                            if (s3->accel.cmd & 0x1000)
-                                val = (val >> 8) | (val << 8);
+                if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 0x02)) {
+                    if (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40)) {
+                        if (s3->accel.cmd & 0x1000)
+                            val = (val >> 8) | (val << 8);
+
+                        if (svga->crtc[0x53] & 0x08)
                             s3->accel_start(32, 1, val | (val << 16), 0, s3);
-                        } else
-                            s3->accel_start(4, 1, 0xffffffff, val | (val << 16), s3);
-                    } else
-                        s3->accel_start(4, 1, 0xffffffff, val | (val << 16), s3);
-                } else {
-                    if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 2)) {
-                        if (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40)) {
-                            if (s3->accel.cmd & 0x1000)
-                                val = (val >> 8) | (val << 8);
+                        else
                             s3->accel_start(16, 1, val | (val << 16), 0, s3);
-                        } else
-                            s3->accel_start(4, 1, 0xffffffff, val | (val << 16), s3);
                     } else
                         s3->accel_start(4, 1, 0xffffffff, val | (val << 16), s3);
-                }
+                } else
+                    s3->accel_start(4, 1, 0xffffffff, val | (val << 16), s3);
                 break;
             case 0x600:
                 if (s3->chip == S3_TRIO32 || s3->chip == S3_VISION968 || s3->chip == S3_VISION868 || s3->chip >= S3_TRIO64V) {
-                    if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 2)) {
+                    if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 0x02)) {
                         if (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40)) {
                             if (s3->accel.cmd & 0x1000)
                                 val = (val >> 8) | (val << 8);
@@ -800,7 +828,7 @@ s3_accel_out_pixtrans_l(s3_t *s3, uint32_t val)
 static void
 s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val)
 {
-    const svga_t *svga = &s3->svga;
+    svga_t *svga = &s3->svga;
 
     switch (port) {
         case 0x8148:
@@ -812,6 +840,7 @@ s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val)
         case 0x82e9:
             s3->accel.cur_y        = (s3->accel.cur_y & 0xff) | ((val & 0x0f) << 8);
             s3->accel.poly_cy      = s3->accel.cur_y;
+            s3_log("[%04X:%08X] OUT PORTB=%04x, valy=%d.\n", CS, cpu_state.pc, port - 1, s3->accel.cur_y);
             break;
         case 0x814a:
         case 0x82ea:
@@ -827,14 +856,17 @@ s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val)
         case 0x8548:
         case 0x86e8:
             s3->accel.cur_x        = (s3->accel.cur_x & 0xf00) | val;
+            s3->accel.cur_x_overflow = (s3->accel.cur_x_overflow & 0xff00) | val;
             s3->accel.poly_cx      = s3->accel.cur_x << 20;
             s3->accel.poly_x       = s3->accel.poly_cx >> 20;
             break;
         case 0x8549:
         case 0x86e9:
             s3->accel.cur_x        = (s3->accel.cur_x & 0xff) | ((val & 0x0f) << 8);
+            s3->accel.cur_x_overflow = (s3->accel.cur_x_overflow & 0xff) | (val << 8);
             s3->accel.poly_cx = s3->accel.poly_x = s3->accel.cur_x << 20;
             s3->accel.poly_x                     = s3->accel.poly_cx >> 20;
+            s3_log("[%04X:%08X] OUT PORTB=%04x, valx=%d, valxover=%d.\n", CS, cpu_state.pc, port - 1, s3->accel.cur_x, s3->accel.cur_x_overflow);
             break;
         case 0x854a:
         case 0x86ea:
@@ -877,11 +909,13 @@ s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val)
         case 0x8d48:
         case 0x8ee8:
             s3->accel.destx_distp     = (s3->accel.destx_distp & 0x3f00) | val;
+            s3->accel.destx_overflow  = (s3->accel.destx_overflow & 0xff00) | val;
             s3->accel.point_1_updated = 1;
             break;
         case 0x8d49:
         case 0x8ee9:
             s3->accel.destx_distp = (s3->accel.destx_distp & 0xff) | ((val & 0x3f) << 8);
+            s3->accel.destx_overflow  = (s3->accel.destx_overflow & 0xff) | (val << 8);
             if (val & 0x20)
                 s3->accel.destx_distp |= ~0x3fff;
             s3->accel.point_1_updated = 1;
@@ -925,6 +959,7 @@ s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val)
         case 0x9459:
         case 0x96e9:
             s3->accel.maj_axis_pcnt = (s3->accel.maj_axis_pcnt & 0xff) | ((val & 0x0f) << 8);
+            s3_log("[%04X:%08X] OUT PORTB=%04x, valmajx=%d.\n", CS, cpu_state.pc, port - 1, s3->accel.maj_axis_pcnt);
             break;
         case 0x954a:
         case 0x96ea:
@@ -945,6 +980,11 @@ s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val)
         case 0x9ae9:
             s3->accel.cmd       = (s3->accel.cmd & 0xff) | (val << 8);
             s3->accel.ssv_state = 0;
+            if (s3->bpp == 3) {
+                if (!(s3->accel.multifunc[0xe] & 0x200))
+                    s3->accel.multifunc[0xe] &= ~0x10;
+            }
+            s3_log("[%04X:%08X] OUT PORTB=%04x, val=%04x.\n", CS, cpu_state.pc, port - 1, s3->accel.cmd);
             s3->accel_start(-1, 0, 0xffffffff, 0, s3);
             break;
 
@@ -970,30 +1010,62 @@ s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val)
             s3->accel.cy = s3->accel.cur_y & 0xfff;
 
             if (s3->accel.cmd & 0x1000) {
-                s3_short_stroke_start(-1, 0, 0xffffffff, 0, s3, s3->accel.short_stroke & 0xff);
-                s3_short_stroke_start(-1, 0, 0xffffffff, 0, s3, s3->accel.short_stroke >> 8);
+                s3_short_stroke_start(s3, s3->accel.short_stroke & 0xff);
+                s3_short_stroke_start(s3, s3->accel.short_stroke >> 8);
             } else {
-                s3_short_stroke_start(-1, 0, 0xffffffff, 0, s3, s3->accel.short_stroke >> 8);
-                s3_short_stroke_start(-1, 0, 0xffffffff, 0, s3, s3->accel.short_stroke & 0xff);
+                s3_short_stroke_start(s3, s3->accel.short_stroke >> 8);
+                s3_short_stroke_start(s3, s3->accel.short_stroke & 0xff);
             }
             break;
 
         case 0xa148:
         case 0xa2e8:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.bkgd_color = (s3->accel.bkgd_color & 0xff00ffff) | (val << 16);
-            else
-                s3->accel.bkgd_color = (s3->accel.bkgd_color & 0xffffff00) | val;
+            s3_log("[%04X:%08X] OUT PORTB=%04x (Background Color), val=%02x.\n", CS, cpu_state.pc, port, val);
+            if (s3->bpp == 3) {
+                if ((s3->chip >= S3_86C928) && (s3->chip < S3_VISION964)) {
+                    if (s3->accel.multifunc[0xe] & 0x10)
+                        s3->accel.bkgd_color = (s3->accel.bkgd_color & ~0x00ff0000) | (val << 16);
+                    else
+                        s3->accel.bkgd_color = (s3->accel.bkgd_color & ~0x000000ff) | val;
+                } else if (s3->chip >= S3_VISION964) {
+                    if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                        s3->accel.bkgd_color = (s3->accel.bkgd_color & ~0x00ff0000) | (val << 16);
+                    else
+                        s3->accel.bkgd_color = (s3->accel.bkgd_color & ~0x000000ff) | val;
+                }
+            } else
+                s3->accel.bkgd_color = (s3->accel.bkgd_color & ~0x000000ff) | val;
             break;
         case 0xa149:
         case 0xa2e9:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.bkgd_color = (s3->accel.bkgd_color & 0x00ffffff) | (val << 24);
-            else
-                s3->accel.bkgd_color = (s3->accel.bkgd_color & 0xffff00ff) | (val << 8);
-            if (!(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.multifunc[0xe] ^= 0x10;
+            s3_log("[%04X:%08X] OUT PORTB=%04x (Background Color), val=%02x.\n", CS, cpu_state.pc, port, val);
+            if (s3->bpp == 3) {
+                if ((s3->chip >= S3_86C928) && (s3->chip < S3_VISION964)) {
+                    if (s3->accel.multifunc[0xe] & 0x10)
+                        s3->accel.bkgd_color = (s3->accel.bkgd_color & ~0xff000000) | (val << 24);
+                    else
+                        s3->accel.bkgd_color = (s3->accel.bkgd_color & ~0x0000ff00) | (val << 8);
 
+                    s3->accel.multifunc[0xe] ^= 0x10;
+                } else if (s3->chip >= S3_VISION964) {
+                    if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                        s3->accel.bkgd_color = (s3->accel.bkgd_color & ~0xff000000) | (val << 24);
+                    else
+                        s3->accel.bkgd_color = (s3->accel.bkgd_color & ~0x0000ff00) | (val << 8);
+
+                    if (!(s3->accel.multifunc[0xe] & 0x200))
+                        s3->accel.multifunc[0xe] ^= 0x10;
+                }
+            } else {
+                s3->accel.bkgd_color = (s3->accel.bkgd_color & ~0x0000ff00) | (val << 8);
+
+                if ((s3->chip >= S3_86C928) && (s3->chip < S3_VISION964))
+                    s3->accel.multifunc[0xe] ^= 0x10;
+                else if (s3->chip >= S3_VISION964) {
+                    if (!(s3->accel.multifunc[0xe] & 0x200))
+                        s3->accel.multifunc[0xe] ^= 0x10;
+                }
+            }
             if (s3->accel.color_16bit_check)
                 s3->accel.bkgd_color_actual[1] = s3->accel.bkgd_color & 0xff;
             else
@@ -1001,37 +1073,80 @@ s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val)
             break;
         case 0xa14a:
         case 0xa2ea:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.bkgd_color = (s3->accel.bkgd_color & 0xffffff00) | val;
-            else
-                s3->accel.bkgd_color = (s3->accel.bkgd_color & 0xff00ffff) | (val << 16);
+            if (s3->chip >= S3_VISION964) {
+                if (s3->accel.multifunc[0xe] & 0x200)
+                    s3->accel.bkgd_color = (s3->accel.bkgd_color & ~0x00ff0000) | (val << 16);
+                else if (s3->bpp == 3) {
+                    if (s3->accel.multifunc[0xe] & 0x10)
+                        s3->accel.bkgd_color = (s3->accel.bkgd_color & ~0x00ff0000) | (val << 16);
+                    else
+                        s3->accel.bkgd_color = (s3->accel.bkgd_color & ~0x000000ff) | val;
+                }
+            }
             break;
         case 0xa14b:
         case 0xa2eb:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.bkgd_color = (s3->accel.bkgd_color & 0xffff00ff) | (val << 8);
-            else
-                s3->accel.bkgd_color = (s3->accel.bkgd_color & 0x00ffffff) | (val << 24);
-            if (!(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.multifunc[0xe] ^= 0x10;
+            if (s3->chip >= S3_VISION964) {
+                if (s3->accel.multifunc[0xe] & 0x200)
+                    s3->accel.bkgd_color = (s3->accel.bkgd_color & ~0xff000000) | (val << 24);
+                else if (s3->bpp == 3) {
+                    if (s3->accel.multifunc[0xe] & 0x10)
+                        s3->accel.bkgd_color = (s3->accel.bkgd_color & ~0xff000000) | (val << 24);
+                    else
+                        s3->accel.bkgd_color = (s3->accel.bkgd_color & ~0x0000ff00) | (val << 8);
+
+                    s3->accel.multifunc[0xe] ^= 0x10;
+                }
+            }
             break;
 
         case 0xa548:
         case 0xa6e8:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.frgd_color = (s3->accel.frgd_color & 0xff00ffff) | (val << 16);
-            else
-                s3->accel.frgd_color = (s3->accel.frgd_color & 0xffffff00) | val;
+            s3_log("[%04X:%08X] OUT PORTB=%04x (Foreground Color), val=%02x.\n", CS, cpu_state.pc, port, val);
+            if (s3->bpp == 3) {
+                if ((s3->chip >= S3_86C928) && (s3->chip < S3_VISION964)) {
+                    if (s3->accel.multifunc[0xe] & 0x10)
+                        s3->accel.frgd_color = (s3->accel.frgd_color & ~0x00ff0000) | (val << 16);
+                    else
+                        s3->accel.frgd_color = (s3->accel.frgd_color & ~0x000000ff) | val;
+                } else if (s3->chip >= S3_VISION964) {
+                    if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                        s3->accel.frgd_color = (s3->accel.frgd_color & ~0x00ff0000) | (val << 16);
+                    else
+                        s3->accel.frgd_color = (s3->accel.frgd_color & ~0x000000ff) | val;
+                }
+            } else
+                s3->accel.frgd_color = (s3->accel.frgd_color & ~0x000000ff) | val;
             break;
         case 0xa549:
         case 0xa6e9:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.frgd_color = (s3->accel.frgd_color & 0x00ffffff) | (val << 24);
-            else
-                s3->accel.frgd_color = (s3->accel.frgd_color & 0xffff00ff) | (val << 8);
-            if (!(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.multifunc[0xe] ^= 0x10;
+            if (s3->bpp == 3) {
+                if ((s3->chip >= S3_86C928) && (s3->chip < S3_VISION964)) {
+                    if (s3->accel.multifunc[0xe] & 0x10)
+                        s3->accel.frgd_color = (s3->accel.frgd_color & ~0xff000000) | (val << 24);
+                    else
+                        s3->accel.frgd_color = (s3->accel.frgd_color & ~0x0000ff00) | (val << 8);
 
+                    s3->accel.multifunc[0xe] ^= 0x10;
+                } else if (s3->chip >= S3_VISION964) {
+                    if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                        s3->accel.frgd_color = (s3->accel.frgd_color & ~0xff000000) | (val << 24);
+                    else
+                        s3->accel.frgd_color = (s3->accel.frgd_color & ~0x0000ff00) | (val << 8);
+
+                    if (!(s3->accel.multifunc[0xe] & 0x200))
+                        s3->accel.multifunc[0xe] ^= 0x10;
+                }
+            } else {
+                s3->accel.frgd_color = (s3->accel.frgd_color & ~0x0000ff00) | (val << 8);
+
+                if ((s3->chip >= S3_86C928) && (s3->chip < S3_VISION964))
+                    s3->accel.multifunc[0xe] ^= 0x10;
+                else if (s3->chip >= S3_VISION964) {
+                    if (!(s3->accel.multifunc[0xe] & 0x200))
+                        s3->accel.multifunc[0xe] ^= 0x10;
+                }
+            }
             if (s3->accel.color_16bit_check)
                 s3->accel.frgd_color_actual[1] = s3->accel.frgd_color & 0xff;
             else
@@ -1039,37 +1154,81 @@ s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val)
             break;
         case 0xa54a:
         case 0xa6ea:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.frgd_color = (s3->accel.frgd_color & 0xffffff00) | val;
-            else
-                s3->accel.frgd_color = (s3->accel.frgd_color & 0xff00ffff) | (val << 16);
+            if (s3->chip >= S3_VISION964) {
+                if (s3->accel.multifunc[0xe] & 0x200)
+                    s3->accel.frgd_color = (s3->accel.frgd_color & ~0x00ff0000) | (val << 16);
+                else if (s3->bpp == 3) {
+                    if ((s3->accel.multifunc[0xe] & 0x10))
+                        s3->accel.frgd_color = (s3->accel.frgd_color & ~0x00ff0000) | (val << 16);
+                    else
+                        s3->accel.frgd_color = (s3->accel.frgd_color & ~0x000000ff) | val;
+                }
+            }
             break;
         case 0xa54b:
         case 0xa6eb:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.frgd_color = (s3->accel.frgd_color & 0xffff00ff) | (val << 8);
-            else
-                s3->accel.frgd_color = (s3->accel.frgd_color & 0x00ffffff) | (val << 24);
-            if (!(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.multifunc[0xe] ^= 0x10;
+            if (s3->chip >= S3_VISION964) {
+                if (s3->accel.multifunc[0xe] & 0x200)
+                    s3->accel.frgd_color = (s3->accel.frgd_color & ~0xff000000) | (val << 24);
+                else if (s3->bpp == 3) {
+                    if (s3->accel.multifunc[0xe] & 0x10)
+                        s3->accel.frgd_color = (s3->accel.frgd_color & ~0xff000000) | (val << 24);
+                    else
+                        s3->accel.frgd_color = (s3->accel.frgd_color & ~0x0000ff00) | (val << 8);
+
+                    s3->accel.multifunc[0xe] ^= 0x10;
+                }
+            }
             break;
 
         case 0xa948:
         case 0xaae8:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.wrt_mask = (s3->accel.wrt_mask & 0xff00ffff) | (val << 16);
-            else
-                s3->accel.wrt_mask = (s3->accel.wrt_mask & 0xffffff00) | val;
+            s3_log("[%04X:%08X] OUT PORTB=%04x (Write Mask), val=%02x.\n", CS, cpu_state.pc, port, val);
+            if (s3->bpp == 3) {
+                if ((s3->chip >= S3_86C928) && (s3->chip < S3_VISION964)) {
+                    if (s3->accel.multifunc[0xe] & 0x10)
+                        s3->accel.wrt_mask = (s3->accel.wrt_mask & ~0x00ff0000) | (val << 16);
+                    else
+                        s3->accel.wrt_mask = (s3->accel.wrt_mask & ~0x000000ff) | val;
+                } else if (s3->chip >= S3_VISION964) {
+                    if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                        s3->accel.wrt_mask = (s3->accel.wrt_mask & ~0x00ff0000) | (val << 16);
+                    else
+                        s3->accel.wrt_mask = (s3->accel.wrt_mask & ~0x000000ff) | val;
+                }
+            } else
+                s3->accel.wrt_mask = (s3->accel.wrt_mask & ~0x000000ff) | val;
             break;
         case 0xa949:
         case 0xaae9:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.wrt_mask = (s3->accel.wrt_mask & 0x00ffffff) | (val << 24);
-            else
-                s3->accel.wrt_mask = (s3->accel.wrt_mask & 0xffff00ff) | (val << 8);
-            if (!(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.multifunc[0xe] ^= 0x10;
+            s3_log("[%04X:%08X] OUT PORTB=%04x (Write Mask), val=%02x.\n", CS, cpu_state.pc, port, val);
+            if (s3->bpp == 3) {
+                if ((s3->chip >= S3_86C928) && (s3->chip < S3_VISION964)) {
+                    if (s3->accel.multifunc[0xe] & 0x10)
+                        s3->accel.wrt_mask = (s3->accel.wrt_mask & ~0xff000000) | (val << 24);
+                    else
+                        s3->accel.wrt_mask = (s3->accel.wrt_mask & ~0x0000ff00) | (val << 8);
 
+                    s3->accel.multifunc[0xe] ^= 0x10;
+                } else if (s3->chip >= S3_VISION964) {
+                    if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                        s3->accel.wrt_mask = (s3->accel.wrt_mask & ~0xff000000) | (val << 24);
+                    else
+                        s3->accel.wrt_mask = (s3->accel.wrt_mask & ~0x0000ff00) | (val << 8);
+
+                    if (!(s3->accel.multifunc[0xe] & 0x200))
+                        s3->accel.multifunc[0xe] ^= 0x10;
+                }
+            } else {
+                s3->accel.wrt_mask = (s3->accel.wrt_mask & ~0x0000ff00) | (val << 8);
+
+                if ((s3->chip >= S3_86C928) && (s3->chip < S3_VISION964))
+                    s3->accel.multifunc[0xe] ^= 0x10;
+                else if (s3->chip >= S3_VISION964) {
+                    if (!(s3->accel.multifunc[0xe] & 0x200))
+                        s3->accel.multifunc[0xe] ^= 0x10;
+                }
+            }
             if (s3->accel.color_16bit_check)
                 s3->accel.wrt_mask_actual[1] = s3->accel.wrt_mask & 0xff;
             else
@@ -1077,85 +1236,282 @@ s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val)
             break;
         case 0xa94a:
         case 0xaaea:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.wrt_mask = (s3->accel.wrt_mask & 0xffffff00) | val;
-            else
-                s3->accel.wrt_mask = (s3->accel.wrt_mask & 0xff00ffff) | (val << 16);
+            if (s3->chip >= S3_VISION964) {
+                if (s3->accel.multifunc[0xe] & 0x200)
+                    s3->accel.wrt_mask = (s3->accel.wrt_mask & ~0x00ff0000) | (val << 16);
+                else if (s3->bpp == 3) {
+                    if (s3->accel.multifunc[0xe] & 0x10)
+                        s3->accel.wrt_mask = (s3->accel.wrt_mask & ~0x00ff0000) | (val << 16);
+                    else
+                        s3->accel.wrt_mask = (s3->accel.wrt_mask & ~0x000000ff) | val;
+                }
+            }
             break;
         case 0xa94b:
         case 0xaaeb:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.wrt_mask = (s3->accel.wrt_mask & 0xffff00ff) | (val << 8);
-            else
-                s3->accel.wrt_mask = (s3->accel.wrt_mask & 0x00ffffff) | (val << 24);
-            if (!(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.multifunc[0xe] ^= 0x10;
+            if (s3->chip >= S3_VISION964) {
+                if (s3->accel.multifunc[0xe] & 0x200)
+                    s3->accel.wrt_mask = (s3->accel.wrt_mask & ~0xff000000) | (val << 24);
+                else if (s3->bpp == 3) {
+                    if (s3->accel.multifunc[0xe] & 0x10)
+                        s3->accel.wrt_mask = (s3->accel.wrt_mask & ~0xff000000) | (val << 24);
+                    else
+                        s3->accel.wrt_mask = (s3->accel.wrt_mask & ~0x0000ff00) | (val << 8);
+
+                    s3->accel.multifunc[0xe] ^= 0x10;
+                }
+            }
             break;
 
         case 0xad48:
         case 0xaee8:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.rd_mask = (s3->accel.rd_mask & 0xff00ffff) | (val << 16);
-            else
-                s3->accel.rd_mask = (s3->accel.rd_mask & 0xffffff00) | val;
+            if (s3->bpp == 3) {
+                if ((s3->chip >= S3_86C928) && (s3->chip < S3_VISION964)) {
+                    if (s3->accel.multifunc[0xe] & 0x10)
+                        s3->accel.rd_mask = (s3->accel.rd_mask & ~0x00ff0000) | (val << 16);
+                    else
+                        s3->accel.rd_mask = (s3->accel.rd_mask & ~0x000000ff) | val;
+                } else if (s3->chip >= S3_VISION964) {
+                    if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                        s3->accel.rd_mask = (s3->accel.rd_mask & ~0x00ff0000) | (val << 16);
+                    else
+                        s3->accel.rd_mask = (s3->accel.rd_mask & ~0x000000ff) | val;
+                }
+            } else
+                s3->accel.rd_mask = (s3->accel.rd_mask & ~0x000000ff) | val;
             break;
         case 0xad49:
         case 0xaee9:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.rd_mask = (s3->accel.rd_mask & 0x00ffffff) | (val << 24);
-            else
-                s3->accel.rd_mask = (s3->accel.rd_mask & 0xffff00ff) | (val << 8);
-            if (!(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.multifunc[0xe] ^= 0x10;
+            if (s3->bpp == 3) {
+                if ((s3->chip >= S3_86C928) && (s3->chip < S3_VISION964)) {
+                    if (s3->accel.multifunc[0xe] & 0x10)
+                        s3->accel.rd_mask = (s3->accel.rd_mask & ~0xff000000) | (val << 24);
+                    else
+                        s3->accel.rd_mask = (s3->accel.rd_mask & ~0x0000ff00) | (val << 8);
+
+                    s3->accel.multifunc[0xe] ^= 0x10;
+                } else if (s3->chip >= S3_VISION964) {
+                    if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                        s3->accel.rd_mask = (s3->accel.rd_mask & ~0xff000000) | (val << 24);
+                    else
+                        s3->accel.rd_mask = (s3->accel.rd_mask & ~0x0000ff00) | (val << 8);
+
+                    if (!(s3->accel.multifunc[0xe] & 0x200))
+                        s3->accel.multifunc[0xe] ^= 0x10;
+                }
+            } else {
+                s3->accel.rd_mask = (s3->accel.rd_mask & ~0x0000ff00) | (val << 8);
+
+                if ((s3->chip >= S3_86C928) && (s3->chip < S3_VISION964))
+                    s3->accel.multifunc[0xe] ^= 0x10;
+                else if (s3->chip >= S3_VISION964) {
+                    if (!(s3->accel.multifunc[0xe] & 0x200))
+                        s3->accel.multifunc[0xe] ^= 0x10;
+                }
+            }
             break;
         case 0xad4a:
         case 0xaeea:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.rd_mask = (s3->accel.rd_mask & 0xffffff00) | val;
-            else
-                s3->accel.rd_mask = (s3->accel.rd_mask & 0xff00ffff) | (val << 16);
+            if (s3->chip >= S3_VISION964) {
+                if (s3->accel.multifunc[0xe] & 0x200)
+                    s3->accel.rd_mask = (s3->accel.rd_mask & ~0x00ff0000) | (val << 16);
+                else if (s3->bpp == 3) {
+                    if (s3->accel.multifunc[0xe] & 0x10)
+                        s3->accel.rd_mask = (s3->accel.rd_mask & ~0x00ff0000) | (val << 16);
+                    else
+                        s3->accel.rd_mask = (s3->accel.rd_mask & ~0x000000ff) | val;
+                }
+            }
             break;
         case 0xad4b:
         case 0xaeeb:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.rd_mask = (s3->accel.rd_mask & 0xffff00ff) | (val << 8);
-            else
-                s3->accel.rd_mask = (s3->accel.rd_mask & 0x00ffffff) | (val << 24);
-            if (!(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.multifunc[0xe] ^= 0x10;
+            if (s3->chip >= S3_VISION964) {
+                if (s3->accel.multifunc[0xe] & 0x200)
+                    s3->accel.rd_mask = (s3->accel.rd_mask & ~0xff000000) | (val << 24);
+                else if (s3->bpp == 3) {
+                    if (s3->accel.multifunc[0xe] & 0x10)
+                        s3->accel.rd_mask = (s3->accel.rd_mask & ~0xff000000) | (val << 24);
+                    else
+                        s3->accel.rd_mask = (s3->accel.rd_mask & ~0x0000ff00) | (val << 8);
+
+                    s3->accel.multifunc[0xe] ^= 0x10;
+                }
+            }
             break;
 
         case 0xb148:
         case 0xb2e8:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.color_cmp = (s3->accel.color_cmp & 0xff00ffff) | (val << 16);
-            else
-                s3->accel.color_cmp = (s3->accel.color_cmp & 0xffffff00) | val;
+            s3_log("[%04X:%08X] OUT PORTB=%04x, val=%02x, CMD=%04x, C(%d,%d).\n", CS, cpu_state.pc, port, val, s3->accel.cmd, s3->accel.cur_x, s3->accel.cur_y);
+            if ((s3->accel.multifunc[0xe] & 0x100) || (s3->chip >= S3_VISION964)) {
+                s3->accel.b2e8_pix = 0;
+                if (s3->bpp == 3) {
+                    if ((s3->chip >= S3_86C928) && (s3->chip < S3_VISION964)) {
+                        if (s3->accel.multifunc[0xe] & 0x10)
+                            s3->accel.color_cmp = (s3->accel.color_cmp & ~0x00ff0000) | (val << 16);
+                        else
+                            s3->accel.color_cmp = (s3->accel.color_cmp & ~0x000000ff) | val;
+                    } else if (s3->chip >= S3_VISION964) {
+                        if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                            s3->accel.color_cmp = (s3->accel.color_cmp & ~0x00ff0000) | (val << 16);
+                        else
+                            s3->accel.color_cmp = (s3->accel.color_cmp & ~0x000000ff) | val;
+                    }
+                } else
+                    s3->accel.color_cmp = (s3->accel.color_cmp & ~0x000000ff) | val;
+            } else {
+                s3->accel.b2e8_pix = 1;
+                if (s3_cpu_dest(s3))
+                    break;
+                s3->accel.pix_trans[0] = val;
+                if (s3->accel.cmd & 0x100) {
+                    switch (s3->accel.cmd & 0x600) {
+                        case 0x000:
+                            if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 2)) {
+                                if (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40))
+                                    s3->accel_start(8, 1, s3->accel.pix_trans[0], 0, s3);
+                                else
+                                    s3->accel_start(1, 1, 0xffffffff, s3->accel.pix_trans[0], s3);
+                            } else
+                                s3->accel_start(1, 1, 0xffffffff, s3->accel.pix_trans[0], s3);
+                            break;
+
+                        default:
+                            break;
+                    }
+                }
+            }
             break;
         case 0xb149:
         case 0xb2e9:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.color_cmp = (s3->accel.color_cmp & 0x00ffffff) | (val << 24);
-            else
-                s3->accel.color_cmp = (s3->accel.color_cmp & 0xffff00ff) | (val << 8);
-            if (!(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.multifunc[0xe] ^= 0x10;
+            s3_log("[%04X:%08X] OUT PORTB=%04x, val=%02x, CMD=%04x, C(%d,%d).\n", CS, cpu_state.pc, port, val, s3->accel.cmd, s3->accel.cur_x, s3->accel.cur_y);
+            if ((s3->accel.multifunc[0xe] & 0x100) || (s3->chip >= S3_VISION964)) {
+                s3->accel.b2e8_pix = 0;
+                if (s3->bpp == 3) {
+                    if ((s3->chip >= S3_86C928) && (s3->chip < S3_VISION964)) {
+                        if (s3->accel.multifunc[0xe] & 0x10)
+                            s3->accel.color_cmp = (s3->accel.color_cmp & ~0xff000000) | (val << 24);
+                        else
+                            s3->accel.color_cmp = (s3->accel.color_cmp & ~0x0000ff00) | (val << 8);
+
+                        s3->accel.multifunc[0xe] ^= 0x10;
+                    } else if (s3->chip >= S3_VISION964) {
+                        if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                            s3->accel.color_cmp = (s3->accel.color_cmp & ~0xff000000) | (val << 24);
+                        else
+                            s3->accel.color_cmp = (s3->accel.color_cmp & ~0x0000ff00) | (val << 8);
+
+                        if (!(s3->accel.multifunc[0xe] & 0x200))
+                            s3->accel.multifunc[0xe] ^= 0x10;
+                    }
+                } else {
+                    s3->accel.color_cmp = (s3->accel.color_cmp & ~0x0000ff00) | (val << 8);
+
+                    if ((s3->chip >= S3_86C928) && (s3->chip < S3_VISION964))
+                        s3->accel.multifunc[0xe] ^= 0x10;
+                    else if (s3->chip >= S3_VISION964) {
+                        if (!(s3->accel.multifunc[0xe] & 0x200))
+                            s3->accel.multifunc[0xe] ^= 0x10;
+                    }
+                }
+            } else {
+                s3->accel.b2e8_pix = 1;
+                if (s3_cpu_dest(s3))
+                    break;
+                s3->accel.pix_trans[1] = val;
+                if (s3->accel.cmd & 0x100) {
+                    switch (s3->accel.cmd & 0x600) {
+                        case 0x000:
+                            if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 2)) {
+                                if (((s3->accel.frgd_mix & 0x60) != 0x40) ||
+                                    ((s3->accel.bkgd_mix & 0x60) != 0x40))
+                                    s3->accel_start(8, 1, s3->accel.pix_trans[0] |
+                                                    (s3->accel.pix_trans[1] << 8), 0, s3);
+                                else
+                                    s3->accel_start(1, 1, 0xffffffff, s3->accel.pix_trans[0] |
+                                                    (s3->accel.pix_trans[1] << 8), s3);
+                            } else
+                                s3->accel_start(1, 1, 0xffffffff, s3->accel.pix_trans[0] |
+                                                (s3->accel.pix_trans[1] << 8), s3);
+                            break;
+                        case 0x200:
+                            if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 2)) {
+                                if (((s3->accel.frgd_mix & 0x60) != 0x40) ||
+                                    ((s3->accel.bkgd_mix & 0x60) != 0x40)) {
+                                    if (s3->accel.cmd & 0x1000)
+                                        s3->accel_start(16, 1, s3->accel.pix_trans[1] |
+                                                        (s3->accel.pix_trans[0] << 8), 0, s3);
+                                    else
+                                        s3->accel_start(16, 1, s3->accel.pix_trans[0] |
+                                                        (s3->accel.pix_trans[1] << 8), 0, s3);
+                                } else {
+                                    if (s3->accel.cmd & 0x1000)
+                                        s3->accel_start(2, 1, 0xffffffff, s3->accel.pix_trans[1] |
+                                                        (s3->accel.pix_trans[0] << 8), s3);
+                                    else
+                                        s3->accel_start(2, 1, 0xffffffff, s3->accel.pix_trans[0] |
+                                                        (s3->accel.pix_trans[1] << 8), s3);
+                                }
+                            } else {
+                                if (s3->accel.cmd & 0x1000)
+                                    s3->accel_start(2, 1, 0xffffffff, s3->accel.pix_trans[1] |
+                                                    (s3->accel.pix_trans[0] << 8), s3);
+                                else
+                                    s3->accel_start(2, 1, 0xffffffff, s3->accel.pix_trans[0] |
+                                                    (s3->accel.pix_trans[1] << 8), s3);
+                            }
+                            break;
+                        case 0x400:
+                            if (svga->crtc[0x53] & 0x08) {
+                                if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 2)) {
+                                    if (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40))
+                                        s3->accel_start(32, 1, s3->accel.pix_trans[0] | (s3->accel.pix_trans[1] << 8), 0, s3);
+                                    else
+                                        s3->accel_start(4, 1, 0xffffffff, s3->accel.pix_trans[0] | (s3->accel.pix_trans[1] << 8), s3);
+                                } else
+                                    s3->accel_start(4, 1, 0xffffffff, s3->accel.pix_trans[0] | (s3->accel.pix_trans[1] << 8), s3);
+                            }
+                            break;
+                        case 0x600:
+                            if (s3->chip == S3_TRIO32 || s3->chip == S3_VISION968 || s3->chip == S3_VISION868 || s3->chip >= S3_TRIO64V) {
+                                if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 2)) {
+                                    if (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40)) {
+                                        s3->accel_start(8, 1, s3->accel.pix_trans[1], 0, s3);
+                                        s3->accel_start(8, 1, s3->accel.pix_trans[0], 0, s3);
+                                    }
+                                }
+                            }
+                            break;
+
+                        default:
+                            break;
+                    }
+
+                }
+            }
             break;
         case 0xb14a:
         case 0xb2ea:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.color_cmp = (s3->accel.color_cmp & 0xffffff00) | val;
-            else
-                s3->accel.color_cmp = (s3->accel.color_cmp & 0xff00ffff) | (val << 16);
+            if (s3->accel.multifunc[0xe] & 0x200)
+                s3->accel.color_cmp = (s3->accel.color_cmp & ~0x00ff0000) | (val << 16);
+            else if (s3->bpp == 3) {
+                if (s3->accel.multifunc[0xe] & 0x10)
+                    s3->accel.color_cmp = (s3->accel.color_cmp & ~0x00ff0000) | (val << 16);
+                else
+                    s3->accel.color_cmp = (s3->accel.color_cmp & ~0x000000ff) | val;
+            }
             break;
         case 0xb14b:
         case 0xb2eb:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.color_cmp = (s3->accel.color_cmp & 0xffff00ff) | (val << 8);
-            else
-                s3->accel.color_cmp = (s3->accel.color_cmp & 0x00ffffff) | (val << 24);
-            if (!(s3->accel.multifunc[0xe] & 0x200))
+            if (s3->accel.multifunc[0xe] & 0x200)
+                s3->accel.color_cmp = (s3->accel.color_cmp & ~0xff000000) | (val << 24);
+            else if (s3->bpp == 3) {
+                if (s3->accel.multifunc[0xe] & 0x10)
+                    s3->accel.color_cmp = (s3->accel.color_cmp & ~0xff000000) | (val << 24);
+                else
+                    s3->accel.color_cmp = (s3->accel.color_cmp & ~0x0000ff00) | (val << 8);
+
                 s3->accel.multifunc[0xe] ^= 0x10;
+            }
             break;
 
         case 0xb548:
@@ -1176,47 +1532,70 @@ s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val)
         case 0xbee9:
             s3->accel.multifunc_cntl                            = (s3->accel.multifunc_cntl & 0xff) | (val << 8);
             s3->accel.multifunc[s3->accel.multifunc_cntl >> 12] = s3->accel.multifunc_cntl & 0xfff;
+            if ((s3->accel.multifunc_cntl >> 12) == 5)
+                s3_log("S3 multifunc_cntl = %d, val = %03x.\n", s3->accel.multifunc_cntl >> 12, s3->accel.multifunc_cntl & 0xfff);
             break;
 
         case 0xd148:
         case 0xd2e8:
+            s3_log("[%04X:%08X] OUT PORTB=%04x, val=%02x, CMD=%04x, C(%d,%d).\n", CS, cpu_state.pc, port, val, s3->accel.cmd, s3->accel.cur_x, s3->accel.cur_y);
             s3->accel.ropmix = (s3->accel.ropmix & 0xff00) | val;
             break;
         case 0xd149:
         case 0xd2e9:
+            s3_log("[%04X:%08X] OUT PORTB=%04x, val=%02x, CMD=%04x, C(%d,%d).\n", CS, cpu_state.pc, port, val, s3->accel.cmd, s3->accel.cur_x, s3->accel.cur_y);
             s3->accel.ropmix = (s3->accel.ropmix & 0x00ff) | (val << 8);
             break;
         case 0xe548:
         case 0xe6e8:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.pat_bg_color = (s3->accel.pat_bg_color & 0xff00ffff) | (val << 16);
-            else
-                s3->accel.pat_bg_color = (s3->accel.pat_bg_color & 0xffffff00) | val;
+            s3_log("[%04X:%08X] OUT PORTB=%04x, val=%02x, CMD=%04x, C(%d,%d).\n", CS, cpu_state.pc, port, val, s3->accel.cmd, s3->accel.cur_x, s3->accel.cur_y);
+            if (s3->bpp == 3) {
+                if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                    s3->accel.pat_bg_color = (s3->accel.pat_bg_color & ~0x00ff0000) | (val << 16);
+                else
+                    s3->accel.pat_bg_color = (s3->accel.pat_bg_color & ~0x000000ff) | val;
+            } else
+                s3->accel.pat_bg_color = (s3->accel.pat_bg_color & ~0x000000ff) | val;
             break;
         case 0xe549:
         case 0xe6e9:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.pat_bg_color = (s3->accel.pat_bg_color & 0x00ffffff) | (val << 24);
-            else
-                s3->accel.pat_bg_color = (s3->accel.pat_bg_color & 0xffff00ff) | (val << 8);
+            s3_log("[%04X:%08X] OUT PORTB=%04x, val=%02x, CMD=%04x, C(%d,%d).\n", CS, cpu_state.pc, port, val, s3->accel.cmd, s3->accel.cur_x, s3->accel.cur_y);
+            if (s3->bpp == 3) {
+                if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                    s3->accel.pat_bg_color = (s3->accel.pat_bg_color & ~0xff000000) | (val << 24);
+                else
+                    s3->accel.pat_bg_color = (s3->accel.pat_bg_color & ~0x0000ff00) | (val << 8);
+            } else
+                s3->accel.pat_bg_color = (s3->accel.pat_bg_color & ~0x0000ff00) | (val << 8);
+
             if (!(s3->accel.multifunc[0xe] & 0x200))
                 s3->accel.multifunc[0xe] ^= 0x10;
             break;
         case 0xe54a:
         case 0xe6ea:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.pat_bg_color = (s3->accel.pat_bg_color & 0xffffff00) | val;
-            else
-                s3->accel.pat_bg_color = (s3->accel.pat_bg_color & 0xff00ffff) | (val << 16);
+            s3_log("[%04X:%08X] OUT PORTB=%04x, val=%02x, CMD=%04x, C(%d,%d).\n", CS, cpu_state.pc, port, val, s3->accel.cmd, s3->accel.cur_x, s3->accel.cur_y);
+            if (s3->accel.multifunc[0xe] & 0x200)
+                s3->accel.pat_bg_color = (s3->accel.pat_bg_color & ~0x00ff0000) | (val << 16);
+            else if (s3->bpp == 3) {
+                if (s3->accel.multifunc[0xe] & 0x10)
+                    s3->accel.pat_bg_color = (s3->accel.pat_bg_color & ~0x00ff0000) | (val << 16);
+                else
+                    s3->accel.pat_bg_color = (s3->accel.pat_bg_color & ~0x000000ff) | val;
+            }
             break;
         case 0xe54b:
         case 0xe6eb:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.pat_bg_color = (s3->accel.pat_bg_color & 0xffff00ff) | (val << 8);
-            else
-                s3->accel.pat_bg_color = (s3->accel.pat_bg_color & 0x00ffffff) | (val << 24);
-            if (!(s3->accel.multifunc[0xe] & 0x200))
+            s3_log("[%04X:%08X] OUT PORTB=%04x, val=%02x, CMD=%04x, C(%d,%d).\n", CS, cpu_state.pc, port, val, s3->accel.cmd, s3->accel.cur_x, s3->accel.cur_y);
+            if (s3->accel.multifunc[0xe] & 0x200)
+                s3->accel.pat_bg_color = (s3->accel.pat_bg_color & ~0xff000000) | (val << 24);
+            else if (s3->bpp == 3) {
+                if (s3->accel.multifunc[0xe] & 0x10)
+                    s3->accel.pat_bg_color = (s3->accel.pat_bg_color & ~0xff000000) | (val << 24);
+                else
+                    s3->accel.pat_bg_color = (s3->accel.pat_bg_color & ~0x0000ff00) | (val << 8);
+
                 s3->accel.multifunc[0xe] ^= 0x10;
+            }
             break;
         case 0xe948:
         case 0xeae8:
@@ -1224,7 +1603,7 @@ s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val)
             break;
         case 0xe949:
         case 0xeae9:
-            s3->accel.pat_y = (s3->accel.pat_y & 0xff) | ((val & 0x1f) << 8);
+            s3->accel.pat_y = (s3->accel.pat_y & 0xff) | ((val & 0x0f) << 8);
             break;
         case 0xe94a:
         case 0xeaea:
@@ -1232,43 +1611,64 @@ s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val)
             break;
         case 0xe94b:
         case 0xeaeb:
-            s3->accel.pat_x = (s3->accel.pat_x & 0xff) | ((val & 0x1f) << 8);
+            s3->accel.pat_x = (s3->accel.pat_x & 0xff) | ((val & 0x0f) << 8);
             break;
         case 0xed48:
         case 0xeee8:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.pat_fg_color = (s3->accel.pat_fg_color & 0xff00ffff) | (val << 16);
-            else
-                s3->accel.pat_fg_color = (s3->accel.pat_fg_color & 0xffffff00) | val;
+            s3_log("[%04X:%08X] OUT PORTB=%04x, val=%02x, CMD=%04x, C(%d,%d).\n", CS, cpu_state.pc, port, val, s3->accel.cmd, s3->accel.cur_x, s3->accel.cur_y);
+            if (s3->bpp == 3) {
+                if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                    s3->accel.pat_fg_color = (s3->accel.pat_fg_color & ~0x00ff0000) | (val << 16);
+                else
+                    s3->accel.pat_fg_color = (s3->accel.pat_fg_color & ~0x000000ff) | val;
+            } else
+                s3->accel.pat_fg_color = (s3->accel.pat_fg_color & ~0x000000ff) | val;
             break;
         case 0xed49:
         case 0xeee9:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.pat_fg_color = (s3->accel.pat_fg_color & 0x00ffffff) | (val << 24);
-            else
-                s3->accel.pat_fg_color = (s3->accel.pat_fg_color & 0xffff00ff) | (val << 8);
+            s3_log("[%04X:%08X] OUT PORTB=%04x, val=%02x, CMD=%04x, C(%d,%d).\n", CS, cpu_state.pc, port, val, s3->accel.cmd, s3->accel.cur_x, s3->accel.cur_y);
+            if (s3->bpp == 3) {
+                if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                    s3->accel.pat_fg_color = (s3->accel.pat_fg_color & ~0xff000000) | (val << 24);
+                else
+                    s3->accel.pat_fg_color = (s3->accel.pat_fg_color & ~0x0000ff00) | (val << 8);
+            } else
+                s3->accel.pat_fg_color = (s3->accel.pat_fg_color & ~0x0000ff00) | (val << 8);
+
             if (!(s3->accel.multifunc[0xe] & 0x200))
                 s3->accel.multifunc[0xe] ^= 0x10;
             break;
         case 0xed4a:
         case 0xeeea:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.pat_fg_color = (s3->accel.pat_fg_color & 0xffffff00) | val;
-            else
-                s3->accel.pat_fg_color = (s3->accel.pat_fg_color & 0xff00ffff) | (val << 16);
+            s3_log("[%04X:%08X] OUT PORTB=%04x, val=%02x, CMD=%04x, C(%d,%d).\n", CS, cpu_state.pc, port, val, s3->accel.cmd, s3->accel.cur_x, s3->accel.cur_y);
+            if (s3->accel.multifunc[0xe] & 0x200)
+                s3->accel.pat_fg_color = (s3->accel.pat_fg_color & ~0x00ff0000) | (val << 16);
+            else if (s3->bpp == 3) {
+                if (s3->accel.multifunc[0xe] & 0x10)
+                    s3->accel.pat_fg_color = (s3->accel.pat_fg_color & ~0x00ff0000) | (val << 16);
+                else
+                    s3->accel.pat_fg_color = (s3->accel.pat_fg_color & ~0x000000ff) | val;
+            }
             break;
         case 0xed4b:
         case 0xeeeb:
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                s3->accel.pat_fg_color = (s3->accel.pat_fg_color & 0xffff00ff) | (val << 8);
-            else
-                s3->accel.pat_fg_color = (s3->accel.pat_fg_color & 0x00ffffff) | (val << 24);
-            if (!(s3->accel.multifunc[0xe] & 0x200))
+            s3_log("[%04X:%08X] OUT PORTB=%04x, val=%02x, CMD=%04x, C(%d,%d).\n", CS, cpu_state.pc, port, val, s3->accel.cmd, s3->accel.cur_x, s3->accel.cur_y);
+            if (s3->accel.multifunc[0xe] & 0x200)
+                s3->accel.pat_fg_color = (s3->accel.pat_fg_color & ~0xff000000) | (val << 24);
+            else if (s3->bpp == 3) {
+                if (s3->accel.multifunc[0xe] & 0x10)
+                    s3->accel.pat_fg_color = (s3->accel.pat_fg_color & ~0xff000000) | (val << 24);
+                else
+                    s3->accel.pat_fg_color = (s3->accel.pat_fg_color & ~0x0000ff00) | (val << 8);
+
                 s3->accel.multifunc[0xe] ^= 0x10;
+            }
             break;
 
         case 0xe148:
         case 0xe2e8:
+            s3_log("[%04X:%08X] OUT PORTB=%04x, val=%02x, CMD=%04x, C(%d,%d), WRTMASK=%04x.\n", CS, cpu_state.pc, port, val, s3->accel.cmd, s3->accel.cur_x, s3->accel.cur_y, s3->accel.wrt_mask);
+            s3_log(".\n");
             s3->accel.b2e8_pix = 0;
             if (s3_cpu_dest(s3))
                 break;
@@ -1282,46 +1682,40 @@ s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val)
                             else
                                 s3->accel_start(1, 1, 0xffffffff, s3->accel.pix_trans[0], s3);
                         } else {
-                            if (s3->accel.color_16bit_check_rectfill) {
-                                if (s3->accel.color_16bit_check) {
-                                    if (s3->accel.pix_trans_x_count < s3->accel.pix_trans_ptr_cnt) {
-                                        s3_log("Byte: CPU data CMD=%04x, byte write=%02x, cnt=%d, "
-                                               "check=%d.\n", s3->accel.cmd, val,
-                                               s3->accel.pix_trans_x_count, s3->accel.color_16bit_check);
-                                        s3->accel.pix_trans_ptr[s3->accel.pix_trans_x_count] = val;
-                                        s3->accel.pix_trans_x_count++;
-                                        s3->accel.pix_trans_x_count2 = s3->accel.pix_trans_x_count;
+                            if ((s3->bpp == 0) && s3->color_16bit) {
+                                if (s3->accel.rd_mask_16bit_check) {
+                                    s3->accel.pix_trans[1] = svga->vram[dword_remap(svga, (s3->accel.dest + s3->accel.cx - s3->accel.minus)) & s3->vram_mask];
+                                    if (s3->accel.cmd & 0x1000) {
+                                        if (s3->accel.cur_x & 0x400) {
+                                            s3_log("Last Pixel Written=%02x (1024) reverse.\n", s3->accel.pix_trans[1]);
+                                            s3->accel_start(2, 1, 0xffffffff, s3->accel.pix_trans[0] | (s3->accel.pix_trans[1] << 8), s3);
+                                        } else {
+                                            s3_log("Last Pixel Written=%02x (0) reverse, cx=%d.\n", s3->accel.pix_trans[1], s3->accel.cx, s3->accel.cur_x);
+                                            s3->accel_start(2, 1, 0xffffffff, s3->accel.pix_trans[1] | (s3->accel.pix_trans[0] << 8), s3);
+                                        }
+                                    } else {
+                                        if (s3->accel.cur_x & 0x400) {
+                                            s3_log("Last Pixel Written=%02x (1024) normal, cx=%d, curx=%d.\n", s3->accel.pix_trans[1], s3->accel.cx, s3->accel.cur_x);
+                                            s3->accel_start(2, 1, 0xffffffff, s3->accel.pix_trans[1] | (s3->accel.pix_trans[0] << 8), s3);
+                                        } else {
+                                            s3_log("Last Pixel Written=%02x (0) normal, cx=%d, curx=%d.\n", s3->accel.pix_trans[1], s3->accel.cx, s3->accel.cur_x);
+                                            s3->accel_start(2, 1, 0xffffffff, s3->accel.pix_trans[0] | (s3->accel.pix_trans[1] << 8), s3);
+                                        }
                                     }
                                 } else {
-                                    if (s3->accel.pix_trans_x_count2 < s3->accel.pix_trans_ptr_cnt) {
-                                        s3_log("Byte: CPU data CMD=%04x, byte write=%02x, cnt=%d, "
-                                               "check=%d.\n", s3->accel.cmd, val,
-                                               s3->accel.pix_trans_x_count2, s3->accel.color_16bit_check);
-                                        s3->accel.pix_trans_ptr[s3->accel.pix_trans_x_count2] = val;
-                                        s3->accel.pix_trans_x_count2++;
-                                    }
-                                    s3_log("WriteCNT=%d, TotalCNT=%d.\n", s3->accel.pix_trans_x_count2,
-                                           s3->accel.pix_trans_ptr_cnt);
-                                    if (s3->accel.pix_trans_x_count2 == s3->accel.pix_trans_ptr_cnt) {
-                                        for (int i = 0; i < s3->accel.pix_trans_ptr_cnt; i += 2) {
-                                            s3_log("Transferring write count=%d, bytes=%04x.\n", i,
-                                                   s3->accel.pix_trans_ptr[i] |
-                                                   (s3->accel.pix_trans_ptr[i + 1] << 8));
-                                            s3->accel_start(1, 1, 0xffffffff, s3->accel.pix_trans_ptr[i] |
-                                                            (s3->accel.pix_trans_ptr[i + 1] << 8), s3);
-                                        }
+                                    s3->accel.pix_trans_val[s3->accel.cy][s3->accel.cx] = val;
 
-                                        s3->accel.pix_trans_x_count2 = 0;
-                                        s3->accel.color_16bit_check_rectfill = 0;
-                                        if (s3->accel.pix_trans_ptr != NULL) {
-                                            free(s3->accel.pix_trans_ptr);
-                                            s3->accel.pix_trans_ptr = NULL;
-                                        }
+                                    if (s3->accel.cur_x & 0x400) {
+                                        s3->accel.color_16bit_check_pixtrans = 0;
+                                        s3_log("%04X:%08X: Last Pixel Written=%04x (1024) normal, cx=%d, cy=%d.\n", CS, cpu_state.pc, s3->accel.pix_trans_val[s3->accel.cy][s3->accel.cx - s3->accel.minus] | (s3->accel.pix_trans_val[s3->accel.cy][s3->accel.cx] << 8), s3->accel.cx, s3->accel.cy);
+                                        s3->accel_start(2, 1, 0xffffffff, s3->accel.pix_trans_val[s3->accel.cy][s3->accel.cx - s3->accel.minus] | (s3->accel.pix_trans_val[s3->accel.cy][s3->accel.cx] << 8), s3);
+                                    } else {
+                                        s3->accel.color_16bit_check_pixtrans = 1;
+                                        s3->accel_start(2, 1, 0xffffffff, s3->accel.pix_trans[0], s3);
                                     }
                                 }
-                                break;
-                            }
-                            s3->accel_start(1, 1, 0xffffffff, s3->accel.pix_trans[0], s3);
+                            } else
+                                s3->accel_start(1, 1, 0xffffffff, s3->accel.pix_trans[0], s3);
                         }
                         break;
 
@@ -1332,14 +1726,13 @@ s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val)
             break;
         case 0xe149:
         case 0xe2e9:
+            s3_log("[%04X:%08X] OUT PORTB=%04x, val=%02x, CMD=%04x, C(%d,%d), WRTMASK=%04x.\n", CS, cpu_state.pc, port, val, s3->accel.cmd, s3->accel.cur_x, s3->accel.cur_y, s3->accel.wrt_mask);
+            s3_log(".\n");
             s3->accel.b2e8_pix = 0;
             if (s3_cpu_dest(s3))
                 break;
             s3->accel.pix_trans[1] = val;
             if (s3->accel.cmd & 0x100) {
-                s3_log("S3 PIXTRANS_B write (E2E9): cmd=%03x, pixelcntl=%02x, frgdmix=%02x, "
-                       "bkgdmix=%02x, curx=%d, val=%04x.\n", s3->accel.cmd, s3->accel.multifunc[0x0a],
-                       s3->accel.frgd_mix, s3->accel.bkgd_mix, s3->accel.cur_x, val);
                 switch (s3->accel.cmd & 0x600) {
                     case 0x000:
                         if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 2)) {
@@ -1487,13 +1880,27 @@ s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val)
 static void
 s3_accel_out_fifo_w(s3_t *s3, uint16_t port, uint16_t val)
 {
-    if (port != 0x9ee8 && port != 0x9d48) {
-        if (port == 0xb2e8 || port == 0xb148) {
-            s3->accel.b2e8_pix = 1;
+    if ((port != 0x9ee8) && (port != 0x9d48)) {
+        s3_log("[%04X:%08X] OUT PORTW=%04x, val=%04x, CMD=%04x, C(%d,%d), WRTMASK=%04x.\n", CS, cpu_state.pc, port, val, s3->accel.cmd, s3->accel.cur_x, s3->accel.cur_y, s3->accel.wrt_mask);
+        s3_log(".\n");
+        if ((port == 0xb2e8) || (port == 0xb148)) {
+            if ((s3->accel.multifunc[0xe] & 0x100) || (s3->chip >= S3_86C928)) {
+                s3->accel.b2e8_pix = 0;
+                s3_accel_out_fifo(s3, port, val);
+                s3_accel_out_fifo(s3, port + 1, val >> 8);
+            } else {
+                s3->accel.b2e8_pix = 1;
+                s3_accel_out_pixtrans_w(s3, val);
+            }
         } else {
             s3->accel.b2e8_pix = 0;
+            if ((port == 0xe2e8) || (port == 0xe2ea) || (port == 0xe148) || (port == 0xe14a))
+                s3_accel_out_pixtrans_w(s3, val);
+            else {
+                s3_accel_out_fifo(s3, port, val);
+                s3_accel_out_fifo(s3, port + 1, val >> 8);
+            }
         }
-        s3_accel_out_pixtrans_w(s3, val);
     } else {
         s3->accel.short_stroke = val;
         s3->accel.ssv_state    = 1;
@@ -1502,11 +1909,11 @@ s3_accel_out_fifo_w(s3_t *s3, uint16_t port, uint16_t val)
         s3->accel.cy = s3->accel.cur_y & 0xfff;
 
         if (s3->accel.cmd & 0x1000) {
-            s3_short_stroke_start(-1, 0, 0xffffffff, 0, s3, s3->accel.short_stroke & 0xff);
-            s3_short_stroke_start(-1, 0, 0xffffffff, 0, s3, s3->accel.short_stroke >> 8);
+            s3_short_stroke_start(s3, s3->accel.short_stroke & 0xff);
+            s3_short_stroke_start(s3, s3->accel.short_stroke >> 8);
         } else {
-            s3_short_stroke_start(-1, 0, 0xffffffff, 0, s3, s3->accel.short_stroke >> 8);
-            s3_short_stroke_start(-1, 0, 0xffffffff, 0, s3, s3->accel.short_stroke & 0xff);
+            s3_short_stroke_start(s3, s3->accel.short_stroke >> 8);
+            s3_short_stroke_start(s3, s3->accel.short_stroke & 0xff);
         }
     }
 }
@@ -1514,12 +1921,29 @@ s3_accel_out_fifo_w(s3_t *s3, uint16_t port, uint16_t val)
 static void
 s3_accel_out_fifo_l(s3_t *s3, uint16_t port, uint32_t val)
 {
-    if (port == 0xb2e8 || port == 0xb148)
-        s3->accel.b2e8_pix = 1;
-    else
+    if ((port == 0xb2e8) || (port == 0xb148)) {
+        s3_log("[%04X:%08X] OUT PORTL=%04x, val=%08x, CMD=%04x, C(%d,%d).\n", CS, cpu_state.pc, port, val, s3->accel.cmd, s3->accel.cur_x, s3->accel.cur_y);
+        if ((s3->accel.multifunc[0xe] & 0x100) || (s3->chip >= S3_86C928)) {
+            s3->accel.b2e8_pix = 0;
+            s3_accel_out_fifo(s3, port, val);
+            s3_accel_out_fifo(s3, port + 1, val >> 8);
+            s3_accel_out_fifo(s3, port + 2, val >> 16);
+            s3_accel_out_fifo(s3, port + 3, val >> 24);
+        } else {
+            s3->accel.b2e8_pix = 1;
+            s3_accel_out_pixtrans_l(s3, val);
+        }
+    } else {
         s3->accel.b2e8_pix = 0;
-
-    s3_accel_out_pixtrans_l(s3, val);
+        if ((port == 0xe2e8) || (port == 0xe148))
+            s3_accel_out_pixtrans_l(s3, val);
+        else {
+            s3_accel_out_fifo(s3, port, val);
+            s3_accel_out_fifo(s3, port + 1, val >> 8);
+            s3_accel_out_fifo(s3, port + 2, val >> 16);
+            s3_accel_out_fifo(s3, port + 3, val >> 24);
+        }
+    }
 }
 
 static void
@@ -1582,29 +2006,39 @@ s3_accel_write_fifo(s3_t *s3, uint32_t addr, uint8_t val)
                 break;
 
             case 0x8120:
+                addr = 0xa2e8;
+                break;
             case 0x8122: /*BKGD_COLOR*/
-                WRITE8(addr, s3->accel.bkgd_color, val);
-                return;
+                addr = 0xa2ea;
+                break;
 
             case 0x8124:
+                addr = 0xa6e8;
+                break;
             case 0x8126: /*FRGD_COLOR*/
-                WRITE8(addr, s3->accel.frgd_color, val);
-                return;
+                addr = 0xa6ea;
+                break;
 
             case 0x8128:
+                addr = 0xaae8;
+                break;
             case 0x812a: /*WRT_MASK*/
-                WRITE8(addr, s3->accel.wrt_mask, val);
-                return;
+                addr = 0xaaea;
+                break;
 
             case 0x812c:
+                addr = 0xaee8;
+                break;
             case 0x812e: /*RD_MASK*/
-                WRITE8(addr, s3->accel.rd_mask, val);
-                return;
+                addr = 0xaeea;
+                break;
 
             case 0x8130:
+                addr = 0xb2e8;
+                break;
             case 0x8132: /*COLOR_CMP*/
-                WRITE8(addr, s3->accel.color_cmp, val);
-                return;
+                addr = 0xb2ea;
+                break;
 
             case 0x8134:
                 addr = 0xb6e8;
@@ -1661,9 +2095,11 @@ s3_accel_write_fifo(s3_t *s3, uint32_t addr, uint8_t val)
                 break;
 
             case 0x8164:
+                addr = 0xe6e8;
+                break;
             case 0x8166:
-                WRITE8(addr, s3->accel.pat_bg_color, val);
-                return;
+                addr = 0xe6ea;
+                break;
 
             case 0x8168:
                 addr = 0xeae8;
@@ -1673,9 +2109,11 @@ s3_accel_write_fifo(s3_t *s3, uint32_t addr, uint8_t val)
                 break;
 
             case 0x816c:
+                addr = 0xeee8;
+                break;
             case 0x816e:
-                WRITE8(addr, s3->accel.pat_fg_color, val);
-                return;
+                addr = 0xeeea;
+                break;
 
             default:
                 break;
@@ -1695,77 +2133,7 @@ s3_accel_write_fifo(s3_t *s3, uint32_t addr, uint8_t val)
                     s3->accel_start(1, 1, 0xffffffff, val | (val << 8) | (val << 16) | (val << 24), s3);
             }
         } else {
-            switch (addr & 0x1ffff) {
-                case 0x83b0:
-                case 0x83b1:
-                case 0x83b2:
-                case 0x83b3:
-                case 0x83b4:
-                case 0x83b5:
-                case 0x83b6:
-                case 0x83b7:
-                case 0x83b8:
-                case 0x83b9:
-                case 0x83ba:
-                case 0x83bb:
-                case 0x83bc:
-                case 0x83bd:
-                case 0x83be:
-                case 0x83bf:
-                case 0x83c0:
-                case 0x83c1:
-                case 0x83c2:
-                case 0x83c3:
-                case 0x83c4:
-                case 0x83c5:
-                case 0x83c6:
-                case 0x83c7:
-                case 0x83c8:
-                case 0x83c9:
-                case 0x83ca:
-                case 0x83cb:
-                case 0x83cc:
-                case 0x83cd:
-                case 0x83ce:
-                case 0x83cf:
-                case 0x83d0:
-                case 0x83d1:
-                case 0x83d2:
-                case 0x83d3:
-                case 0x83d4:
-                case 0x83d5:
-                case 0x83d6:
-                case 0x83d7:
-                case 0x83d8:
-                case 0x83d9:
-                case 0x83da:
-                case 0x83db:
-                case 0x83dc:
-                case 0x83dd:
-                case 0x83de:
-                case 0x83df:
-                    s3_out(addr & 0x3ff, val, s3);
-                    break;
-                case 0x8504:
-                    s3->subsys_stat &= ~val;
-                    s3_update_irqs(s3);
-                    break;
-                case 0x8505:
-                    s3->subsys_cntl = val;
-                    s3_update_irqs(s3);
-                    break;
-                case 0x850c:
-                    s3->accel.advfunc_cntl = val;
-                    s3_updatemapping(s3);
-                    break;
-                case 0xff20:
-                    s3->serialport = val;
-                    i2c_gpio_set(s3->i2c, !!(val & SERIAL_PORT_SCW), !!(val & SERIAL_PORT_SDW));
-                    break;
-                default:
-                    s3_accel_out_fifo(s3, addr & 0xffff, val);
-                    break;
-            }
+            s3_accel_out_fifo(s3, addr & 0xffff, val);
         }
     } else {
         if (addr & 0x8000) {
@@ -1804,45 +2172,21 @@ mmio_byte_write:
 static void
 s3_accel_write_fifo_w(s3_t *s3, uint32_t addr, uint16_t val)
 {
-    const svga_t *svga = &s3->svga;
-
-    if (svga->crtc[0x53] & 0x08) {
-        if ((addr & 0x1fffe) < 0x8000) {
-            s3_accel_out_pixtrans_w(s3, val);
-        } else {
-            switch (addr & 0x1fffe) {
-                default:
-                case 0x83d4:
-                    s3_accel_write_fifo(s3, addr, val);
-                    s3_accel_write_fifo(s3, addr + 1, val >> 8);
-                    break;
-                case 0xff20:
-                    s3_accel_write_fifo(s3, addr, val);
-                    break;
-                case 0x811c:
-                    s3_accel_out_fifo_w(s3, 0x9ee8, val);
-                    break;
-            }
-        }
-    } else {
-        if (addr & 0x8000) {
-            if (addr == 0x811c)
-                s3_accel_out_fifo_w(s3, 0x9ee8, val);
+    if ((addr & 0x1fffe) < 0x8000) {
+        s3_accel_out_pixtrans_w(s3, val);
+    } else if ((addr & 0x1fffe) == 0x811c) {
+        s3_accel_out_fifo_w(s3, 0x9ee8, val);
+    } else if (((addr & 0x1fffe) >= 0x8000) && (addr & 0x1fffe) < 0x10000) {
+        if (((addr & 0x1fffe) == 0xe2e8) || ((addr & 0x1fffe) == 0xe2ea)) {
+            if ((s3->chip == S3_86C801) || (s3->chip == S3_86C805) || (s3->chip == S3_86C928) || (s3->chip == S3_86C928PCI))
+                s3_accel_out_pixtrans_w(s3, val);
             else {
-                if ((addr == 0xe2e8) || (addr == 0xe2ea)) {
-                    if ((s3->chip == S3_86C801) || (s3->chip == S3_86C805) || (s3->chip == S3_86C928) || (s3->chip == S3_86C928PCI))
-                        s3_accel_out_pixtrans_w(s3, val);
-                    else {
-                        s3_accel_write_fifo(s3, addr, val);
-                        s3_accel_write_fifo(s3, addr + 1, val >> 8);
-                    }
-                } else {
-                    s3_accel_write_fifo(s3, addr, val);
-                    s3_accel_write_fifo(s3, addr + 1, val >> 8);
-                }
+                s3_accel_write_fifo(s3, addr, val);
+                s3_accel_write_fifo(s3, addr + 1, val >> 8);
             }
         } else {
-            s3_accel_out_pixtrans_w(s3, val);
+            s3_accel_write_fifo(s3, addr, val);
+            s3_accel_write_fifo(s3, addr + 1, val >> 8);
         }
     }
 }
@@ -1850,221 +2194,78 @@ s3_accel_write_fifo_w(s3_t *s3, uint32_t addr, uint16_t val)
 static void
 s3_accel_write_fifo_l(s3_t *s3, uint32_t addr, uint32_t val)
 {
-    svga_t *svga = &s3->svga;
+    if ((addr & 0x1fffc) >= 0x10000 && (addr & 0x1fffc) < 0x18000) {
+        s3_visionx68_video_engine_op(val, s3);
+    } else if ((addr & 0x1fffc) < 0x8000) {
+        s3_accel_out_pixtrans_l(s3, val);
+    } else if ((addr & 0x1fffc) >= 0x18000) {
+        switch (addr & 0x1fffc) {
+            case 0x18080:
+                s3->videoengine.nop = 1;
+                break;
 
-    if (svga->crtc[0x53] & 0x08) {
-        if ((addr & 0x1fffc) < 0x8000 || ((addr & 0x1fffc) >= 0x10000 && (addr & 0x1fffc) < 0x18000)) {
-            if ((addr & 0x1fffc) >= 0x10000 && (addr & 0x1fffc) < 0x18000) {
-                s3_visionx68_video_engine_op(val, s3);
-            } else if ((addr & 0x1fffc) < 0x8000) {
-                s3_accel_out_pixtrans_l(s3, val);
-            }
-        } else {
-            switch (addr & 0x1fffc) {
-                case 0x8180:
-                    s3->streams.pri_ctrl = val;
-                    svga_recalctimings(svga);
-                    svga->fullchange = svga->monitor->mon_changeframecount;
-                    break;
-                case 0x8184:
-                    s3->streams.chroma_ctrl = val;
-                    break;
-                case 0x8190:
-                    s3->streams.sec_ctrl              = val;
-                    s3->streams.dda_horiz_accumulator = val & 0xfff;
-                    if (val & (1 << 11))
-                        s3->streams.dda_horiz_accumulator |= 0xfffff800;
-                    s3->streams.sdif = (val >> 24) & 7;
-                    break;
-                case 0x8194:
-                    s3->streams.chroma_upper_bound = val;
-                    break;
-                case 0x8198:
-                    s3->streams.sec_filter     = val;
-                    s3->streams.k1_horiz_scale = val & 0x7ff;
-                    if (val & (1 << 10))
-                        s3->streams.k1_horiz_scale |= 0xfffff800;
-                    s3->streams.k2_horiz_scale = (val >> 16) & 0x7ff;
-                    if ((val >> 16) & (1 << 10))
-                        s3->streams.k2_horiz_scale |= 0xfffff800;
-                    break;
-                case 0x81a0:
-                    s3->streams.blend_ctrl = val;
-                    break;
-                case 0x81c0:
-                    s3->streams.pri_fb0 = val & 0x3fffff;
-                    svga_recalctimings(svga);
-                    svga->fullchange = svga->monitor->mon_changeframecount;
-                    break;
-                case 0x81c4:
-                    s3->streams.pri_fb1 = val & 0x3fffff;
-                    svga_recalctimings(svga);
-                    svga->fullchange = svga->monitor->mon_changeframecount;
-                    break;
-                case 0x81c8:
-                    s3->streams.pri_stride = val & 0xfff;
-                    svga_recalctimings(svga);
-                    svga->fullchange = svga->monitor->mon_changeframecount;
-                    break;
-                case 0x81cc:
-                    s3->streams.buffer_ctrl = val;
-                    svga_recalctimings(svga);
-                    svga->fullchange = svga->monitor->mon_changeframecount;
-                    break;
-                case 0x81d0:
-                    s3->streams.sec_fb0 = val;
-                    svga_recalctimings(svga);
-                    svga->fullchange = svga->monitor->mon_changeframecount;
-                    break;
-                case 0x81d4:
-                    s3->streams.sec_fb1 = val;
-                    svga_recalctimings(svga);
-                    svga->fullchange = svga->monitor->mon_changeframecount;
-                    break;
-                case 0x81d8:
-                    s3->streams.sec_stride = val;
-                    svga_recalctimings(svga);
-                    svga->fullchange = svga->monitor->mon_changeframecount;
-                    break;
-                case 0x81dc:
-                    s3->streams.overlay_ctrl = val;
-                    break;
-                case 0x81e0:
-                    s3->streams.k1_vert_scale = val & 0x7ff;
-                    if (val & (1 << 10))
-                        s3->streams.k1_vert_scale |= 0xfffff800;
-                    break;
-                case 0x81e4:
-                    s3->streams.k2_vert_scale = val & 0x7ff;
-                    if (val & (1 << 10))
-                        s3->streams.k2_vert_scale |= 0xfffff800;
-                    break;
-                case 0x81e8:
-                    s3->streams.dda_vert_accumulator = val & 0xfff;
-                    if (val & (1 << 11))
-                        s3->streams.dda_vert_accumulator |= 0xfffff800;
-                    break;
-                case 0x81ec:
-                    s3->streams.fifo_ctrl = val;
-                    break;
-                case 0x81f0:
-                    s3->streams.pri_start = val;
-                    s3->streams.pri_x     = (val >> 16) & 0x7ff;
-                    s3->streams.pri_y     = val & 0x7ff;
-                    svga_recalctimings(svga);
-                    svga->fullchange = svga->monitor->mon_changeframecount;
-                    break;
-                case 0x81f4:
-                    s3->streams.pri_size = val;
-                    s3->streams.pri_w    = (val >> 16) & 0x7ff;
-                    s3->streams.pri_h    = val & 0x7ff;
-                    svga_recalctimings(svga);
-                    svga->fullchange = svga->monitor->mon_changeframecount;
-                    break;
-                case 0x81f8:
-                    s3->streams.sec_start = val;
-                    s3->streams.sec_x     = (val >> 16) & 0x7ff;
-                    s3->streams.sec_y     = val & 0x7ff;
-                    svga_recalctimings(svga);
-                    svga->fullchange = svga->monitor->mon_changeframecount;
-                    break;
-                case 0x81fc:
-                    s3->streams.sec_size = val;
-                    s3->streams.sec_w    = (val >> 16) & 0x7ff;
-                    s3->streams.sec_h    = val & 0x7ff;
-                    svga_recalctimings(svga);
-                    svga->fullchange = svga->monitor->mon_changeframecount;
-                    break;
+            case 0x18088:
+                s3->videoengine.cntl                 = val;
+                s3->videoengine.dda_init_accumulator = val & 0xfff;
+                s3->videoengine.odf                  = (val >> 16) & 7;
+                s3->videoengine.yuv                  = !!(val & (1 << 19));
+                s3->videoengine.idf                  = (val >> 20) & 7;
+                s3->videoengine.dither               = !!(val & (1 << 29));
+                s3->videoengine.dm_index             = (val >> 23) & 7;
+                break;
 
-                case 0x8504:
-                    s3->subsys_stat &= ~(val & 0xff);
-                    s3->subsys_cntl = (val >> 8);
-                    s3_update_irqs(s3);
-                    break;
+            case 0x1808c:
+                s3->videoengine.stretch_filt_const = val;
+                s3->videoengine.k2                 = val & 0x7ff;
+                s3->videoengine.k1                 = (val >> 16) & 0x7ff;
+                s3->videoengine.host_data          = !!(val & (1 << 30));
+                s3->videoengine.scale_down         = !!(val & (1 << 31));
+                break;
 
-                case 0x850c:
-                    s3->accel.advfunc_cntl = val & 0xff;
-                    s3_updatemapping(s3);
-                    break;
+            case 0x18090:
+                s3->videoengine.src_dst_step = val;
+                s3->videoengine.dst_step     = val & 0x1fff;
+                s3->videoengine.src_step     = (val >> 16) & 0x1fff;
+                break;
 
-                case 0xff20:
-                    s3_accel_write_fifo(s3, addr, val);
-                    break;
+            case 0x18094:
+                s3->videoengine.crop  = val;
+                s3->videoengine.len   = val & 0xfff;
+                s3->videoengine.start = (val >> 16) & 0xfff;
+                s3->videoengine.input = 1;
+                break;
 
-                case 0x18080:
-                    s3->videoengine.nop = 1;
-                    break;
+            case 0x18098:
+                s3->videoengine.src_base = val & 0xffffff;
+                break;
 
-                case 0x18088:
-                    s3->videoengine.cntl                 = val;
-                    s3->videoengine.dda_init_accumulator = val & 0xfff;
-                    s3->videoengine.odf                  = (val >> 16) & 7;
-                    s3->videoengine.yuv                  = !!(val & (1 << 19));
-                    s3->videoengine.idf                  = (val >> 20) & 7;
-                    s3->videoengine.dither               = !!(val & (1 << 29));
-                    s3->videoengine.dm_index             = (val >> 23) & 7;
-                    break;
+            case 0x1809c:
+                s3->videoengine.dest_base = val & 0xffffff;
+                break;
 
-                case 0x1808c:
-                    s3->videoengine.stretch_filt_const = val;
-                    s3->videoengine.k2                 = val & 0x7ff;
-                    s3->videoengine.k1                 = (val >> 16) & 0x7ff;
-                    s3->videoengine.host_data          = !!(val & (1 << 30));
-                    s3->videoengine.scale_down         = !!(val & (1 << 31));
-                    break;
-
-                case 0x18090:
-                    s3->videoengine.src_dst_step = val;
-                    s3->videoengine.dst_step     = val & 0x1fff;
-                    s3->videoengine.src_step     = (val >> 16) & 0x1fff;
-                    break;
-
-                case 0x18094:
-                    s3->videoengine.crop  = val;
-                    s3->videoengine.len   = val & 0xfff;
-                    s3->videoengine.start = (val >> 16) & 0xfff;
-                    s3->videoengine.input = 1;
-                    break;
-
-                case 0x18098:
-                    s3->videoengine.src_base = val & 0xffffff;
-                    break;
-
-                case 0x1809c:
-                    s3->videoengine.dest_base = val & 0xffffff;
-                    break;
-
-                default:
-                    s3_accel_write_fifo(s3, addr, val);
-                    s3_accel_write_fifo(s3, addr + 1, val >> 8);
-                    s3_accel_write_fifo(s3, addr + 2, val >> 16);
-                    s3_accel_write_fifo(s3, addr + 3, val >> 24);
-                    break;
-            }
+            default:
+                break;
         }
-    } else {
-        if (addr & 0x8000) {
-            if (addr == 0xe2e8) {
-                if ((s3->chip == S3_86C928) || (s3->chip == S3_86C928PCI))
-                    s3_accel_out_pixtrans_l(s3, val);
-                else {
-                    s3_accel_write_fifo(s3, addr, val);
-                    s3_accel_write_fifo(s3, addr + 1, val >> 8);
-                    s3_accel_write_fifo(s3, addr + 2, val >> 16);
-                    s3_accel_write_fifo(s3, addr + 3, val >> 24);
-                }
-            } else {
+    } else if (((addr & 0x1fffc) >= 0x8000) && ((addr & 0x1fffc) < 0x10000)) {
+        if ((addr & 0x1fffc) == 0xe2e8) {
+            if ((s3->chip == S3_86C928) || (s3->chip == S3_86C928PCI))
+                s3_accel_out_pixtrans_l(s3, val);
+            else {
                 s3_accel_write_fifo(s3, addr, val);
                 s3_accel_write_fifo(s3, addr + 1, val >> 8);
                 s3_accel_write_fifo(s3, addr + 2, val >> 16);
                 s3_accel_write_fifo(s3, addr + 3, val >> 24);
             }
         } else {
-            s3_accel_out_pixtrans_l(s3, val);
+            s3_accel_write_fifo(s3, addr, val);
+            s3_accel_write_fifo(s3, addr + 1, val >> 8);
+            s3_accel_write_fifo(s3, addr + 2, val >> 16);
+            s3_accel_write_fifo(s3, addr + 3, val >> 24);
         }
     }
 }
 
+
 static void
 s3_vblank_start(svga_t *svga)
 {
@@ -2077,8 +2278,8 @@ s3_vblank_start(svga_t *svga)
 static uint32_t
 s3_hwcursor_convert_addr(svga_t *svga)
 {
-    if ((svga->bpp == 8) && ((svga->gdcreg[5] & 0x60) >= 0x20) && (svga->crtc[0x45] & 0x10)) {
-        if ((svga->gdcreg[5] & 0x60) >= 0x40)
+    if ((svga->bpp >= 8) && (((svga->gdcreg[5] & 0x60) == 0x20) || (svga->crtc[0x3a] & 0x10)) && (svga->crtc[0x45] & 0x10)) {
+        if (svga->crtc[0x3a] & 0x10)
             return ((svga->hwcursor_latch.addr & 0xfffff1ff) | ((svga->hwcursor_latch.addr & 0x200) << 2)) | 0x600;
         else if ((svga->gdcreg[5] & 0x60) == 0x20)
             return ((svga->hwcursor_latch.addr & 0xfffff0ff) | ((svga->hwcursor_latch.addr & 0x300) << 2)) | 0x300;
@@ -2094,7 +2295,7 @@ s3_hwcursor_draw(svga_t *svga, int displine)
     const s3_t *s3 = (s3_t *) svga->priv;
     int         shift = 1;
     int         width = 16;
-    uint16_t    dat[2];
+    uint16_t    dat[4] = { 0, 0, 0, 0 };
     int         xx;
     int         offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff;
     uint32_t    fg;
@@ -2106,30 +2307,53 @@ s3_hwcursor_draw(svga_t *svga, int displine)
         case 15:
             fg = video_15to32[s3->hwc_fg_col & 0xffff];
             bg = video_15to32[s3->hwc_bg_col & 0xffff];
-            if (s3->chip >= S3_86C928 && s3->chip <= S3_86C805) {
-                if (s3->card_type != S3_MIROCRYSTAL10SD_805 && s3->card_type != S3_MIROCRYSTAL8S_805) {
-                    if (!(svga->crtc[0x45] & 0x04)) {
-                        shift = 2;
-                        width = 8;
+            if ((s3->chip >= S3_86C928) && (s3->chip <= S3_86C805)) {
+                if (!s3->color_16bit) {
+                    if ((s3->card_type != S3_MIROCRYSTAL10SD_805) && (s3->card_type != S3_MIROCRYSTAL8S_805)) {
+                        if (!(svga->crtc[0x45] & 0x04)) {
+                            shift = 2;
+                            width = 8;
+                        }
                     }
+                } else {
+                    shift = 2;
+                    width = 8;
+                    fg = svga->pallook[svga->crtc[0xe]];
+                    bg = svga->pallook[svga->crtc[0xf]];
                 }
+            } else if (s3->chip <= S3_86C924) {
+                shift = 2;
+                width = 8;
+                fg = svga->pallook[svga->crtc[0xe]];
+                bg = svga->pallook[svga->crtc[0xf]];
             }
             break;
 
         case 16:
             fg = video_16to32[s3->hwc_fg_col & 0xffff];
             bg = video_16to32[s3->hwc_bg_col & 0xffff];
-            if (s3->chip >= S3_86C928 && s3->chip <= S3_86C805) {
-                if ((s3->card_type != S3_MIROCRYSTAL10SD_805) && (s3->card_type != S3_MIROCRYSTAL8S_805)) {
-                    if (!(svga->crtc[0x45] & 0x04)) {
-                        shift = 2;
-                        width = 8;
-                    }
-                } else if (s3->card_type == S3_MIROCRYSTAL10SD_805) {
-                    if (!(svga->crtc[0x45] & 0x04)) {
-                        offset <<= 1;
+            if ((s3->chip >= S3_86C928) && (s3->chip <= S3_86C805)) {
+                if (!s3->color_16bit) {
+                    if ((s3->card_type != S3_MIROCRYSTAL10SD_805) && (s3->card_type != S3_MIROCRYSTAL8S_805)) {
+                        if (!(svga->crtc[0x45] & 0x04)) {
+                            shift = 2;
+                            width = 8;
+                        }
+                    } else if (s3->card_type == S3_MIROCRYSTAL10SD_805) {
+                        if (!(svga->crtc[0x45] & 0x04))
+                            offset <<= 1;
                     }
+                } else {
+                    shift = 2;
+                    width = 8;
+                    fg = svga->pallook[svga->crtc[0xe]];
+                    bg = svga->pallook[svga->crtc[0xf]];
                 }
+            } else if (s3->chip <= S3_86C924) {
+                shift = 2;
+                width = 8;
+                fg = svga->pallook[svga->crtc[0xe]];
+                bg = svga->pallook[svga->crtc[0xf]];
             }
             break;
 
@@ -2166,40 +2390,62 @@ s3_hwcursor_draw(svga_t *svga, int displine)
 
     for (uint8_t x = 0; x < 64; x += 16) {
         remapped_addr = dword_remap(svga, real_addr);
+        if (((svga->bpp == 15) || (svga->bpp == 16)) && s3->color_16bit) {
+            dat[0] = svga->vram[remapped_addr & s3->vram_mask];
+            dat[1] = svga->vram[(remapped_addr + 1) & s3->vram_mask];
+            dat[2] = svga->vram[(remapped_addr + 2) & s3->vram_mask];
+            dat[3] = svga->vram[(remapped_addr + 3) & s3->vram_mask];
 
-        dat[0] = (svga->vram[remapped_addr & s3->vram_mask] << 8) | svga->vram[(remapped_addr + 1) & s3->vram_mask];
-        dat[1] = (svga->vram[(remapped_addr + 2) & s3->vram_mask] << 8) | svga->vram[(remapped_addr + 3) & s3->vram_mask];
-
-        if (svga->crtc[0x55] & 0x10) {
-            /*X11*/
-            for (xx = 0; xx < 16; xx++) {
-                if (offset >= 0) {
-                    if (dat[0] & 0x8000)
-                        buffer32->line[displine][offset + svga->x_add] = (dat[1] & 0x8000) ? fg : bg;
-                }
-
-                offset++;
-                dat[0] <<= shift;
-                dat[1] <<= shift;
-            }
-        } else {
             /*Windows*/
-            for (xx = 0; xx < width; xx++) {
+            for (xx = 0; xx < 8; xx++) {
                 if (offset >= 0) {
-                    if (!(dat[0] & 0x8000))
-                        buffer32->line[displine][offset + svga->x_add] = (dat[1] & 0x8000) ? fg : bg;
-                    else if (dat[1] & 0x8000)
+                    if (!(dat[(xx & 4) ? 2 : 0] & 0x80))
+                        buffer32->line[displine][offset + svga->x_add] = (dat[(xx & 4) ? 3 : 1] & 0x80) ? fg : bg;
+                    else if (dat[(xx & 4) ? 3 : 1] & 0x80)
                         buffer32->line[displine][offset + svga->x_add] ^= 0xffffff;
                 }
 
                 offset++;
-                dat[0] <<= shift;
-                dat[1] <<= shift;
+                s3_log("Up: Data0=%04x, Data1=%04x, Data2=%04x, Data3=%04x, xx=%d addr=%06x.\n", dat[0], dat[1], dat[2], dat[3], xx, remapped_addr);
+                dat[(xx & 4) ? 2 : 0] <<= 2;
+                dat[(xx & 4) ? 3 : 1] <<= 2;
+            }
+        } else {
+            dat[0] = (svga->vram[remapped_addr & s3->vram_mask] << 8) | svga->vram[(remapped_addr + 1) & s3->vram_mask];
+            dat[1] = (svga->vram[(remapped_addr + 2) & s3->vram_mask] << 8) | svga->vram[(remapped_addr + 3) & s3->vram_mask];
+
+            if (svga->crtc[0x55] & 0x10) {
+                /*X11*/
+                for (xx = 0; xx < 16; xx++) {
+                    if (offset >= 0) {
+                        if (dat[0] & 0x8000)
+                            buffer32->line[displine][offset + svga->x_add] = (dat[1] & 0x8000) ? fg : bg;
+                    }
+
+                    offset++;
+                    dat[0] <<= shift;
+                    dat[1] <<= shift;
+                }
+            } else {
+                /*Windows*/
+                for (xx = 0; xx < width; xx++) {
+                    if (offset >= 0) {
+                        if (!(dat[0] & 0x8000))
+                            buffer32->line[displine][offset + svga->x_add] = (dat[1] & 0x8000) ? fg : bg;
+                        else if (dat[1] & 0x8000)
+                            buffer32->line[displine][offset + svga->x_add] ^= 0xffffff;
+                    }
+
+                    offset++;
+                    dat[0] <<= shift;
+                    dat[1] <<= shift;
+                }
             }
         }
         svga->hwcursor_latch.addr += 4;
         real_addr = s3_hwcursor_convert_addr(svga);
     }
+
     if (svga->interlace && !svga->hwcursor_oddeven)
         svga->hwcursor_latch.addr += 16;
 }
@@ -2422,12 +2668,90 @@ s3_hwcursor_draw(svga_t *svga, int displine)
         }                           \
     } while (0)
 
+
+static bool
+s3_trio64v_colorkey(s3_t* s3, uint32_t x, uint32_t y)
+{
+    svga_t* svga = &s3->svga;
+    uint8_t comp_r = 0, comp_g = 0, comp_b = 0;
+    uint8_t r = 0, g = 0, b = 0;
+    uint8_t bytes_per_pel = 1;
+    uint8_t shift = ((s3->streams.chroma_ctrl >> 24) & 7) ^ 7;
+    bool is15bpp = false;
+
+    uint32_t base_addr = svga->memaddr_latch;
+    uint32_t stride = s3->streams.pri_stride;
+
+    if (!s3->color_key_enabled)
+        return true;
+
+    if (y > 2048)
+        return true;
+    if (!(s3->streams.chroma_ctrl & (1 << 28))) {
+        return true;
+    }
+
+    comp_r = (s3->streams.chroma_ctrl >> 16) & 0xFF;
+    comp_g = (s3->streams.chroma_ctrl >> 8) & 0xFF;
+    comp_b = (s3->streams.chroma_ctrl) & 0xFF;
+
+    if (svga->render == svga_render_32bpp_highres) bytes_per_pel = 4;
+    if (svga->render == svga_render_24bpp_highres) bytes_per_pel = 3;
+    if (svga->render == svga_render_16bpp_highres) bytes_per_pel = 2;
+    if (svga->render == svga_render_15bpp_highres) { bytes_per_pel = 2; is15bpp = true; }
+
+    switch (bytes_per_pel) {
+        case 1: {
+            uint8_t index = svga->vram[(base_addr + (stride * y) + x * bytes_per_pel) & svga->vram_mask];
+            r = svga->vgapal[index].r << 2;
+            g = svga->vgapal[index].g << 2;
+            b = svga->vgapal[index].b << 2;
+            break;
+        }
+        case 2: {
+            uint16_t col = *(uint16_t*)&svga->vram[(base_addr + (stride * y) + x * bytes_per_pel) & svga->vram_mask];
+            if (is15bpp) {
+                r = ((col >> 10) & 0x1f) << 3;
+                g = ((col >> 5) & 0x1f) << 3;
+                b = (col & 0x1f) << 3;
+            } else {
+                r = ((col >> 11) & 0x1f) << 3;
+                g = ((col >> 5) & 0x3f) << 2;
+                b = (col & 0x1f) << 3;
+            }
+            break;
+        }
+        case 3: {
+            uint8_t *col = &svga->vram[(base_addr + (stride * y) + x * bytes_per_pel) & svga->vram_mask];
+            r = col[0];
+            g = col[1];
+            b = col[2];
+            break;
+        }
+        case 4: {
+            uint32_t col = *(uint32_t*)&svga->vram[(base_addr + (stride * y) + x * bytes_per_pel) & svga->vram_mask];
+            r = (col >> 16) & 0xFF;
+            g = (col >> 8) & 0xFF;
+            b = col & 0xFF;
+            break;
+        }
+    }
+
+    r >>= shift;
+    g >>= shift;
+    b >>= shift;
+    comp_r >>= shift;
+    comp_g >>= shift;
+    comp_b >>= shift;
+
+    return !!(r == comp_r && g == comp_g && b == comp_b);
+}
+
 static void
 s3_trio64v_overlay_draw(svga_t *svga, int displine)
 {
-    const s3_t *s3     = (s3_t *) svga->priv;
+    s3_t       *s3     = (s3_t *) svga->priv;
     int         offset = (s3->streams.sec_x - s3->streams.pri_x) + 1;
-    int         h_acc  = s3->streams.dda_horiz_accumulator;
     int         r[8];
     int         g[8];
     int         b[8];
@@ -2437,7 +2761,7 @@ s3_trio64v_overlay_draw(svga_t *svga, int displine)
     uint32_t   *p;
     uint8_t    *src = &svga->vram[svga->overlay_latch.addr];
 
-    p = &(buffer32->line[displine][offset + svga->x_add]);
+    p = &((uint32_t *)buffer32->line[displine])[offset + svga->x_add];
 
     if ((offset + s3->streams.sec_w) > s3->streams.pri_w)
         x_size = (s3->streams.pri_w - s3->streams.sec_x) + 1;
@@ -2447,15 +2771,19 @@ s3_trio64v_overlay_draw(svga_t *svga, int displine)
     OVERLAY_SAMPLE();
 
     for (int x = 0; x < x_size; x++) {
-        *p++ = r[x_read] | (g[x_read] << 8) | (b[x_read] << 16);
+        if (s3_trio64v_colorkey(s3, offset + x, displine - svga->y_add))
+            *p++ = r[x_read] | (g[x_read] << 8) | (b[x_read] << 16);
+        else
+            p++;
 
-        h_acc += s3->streams.k1_horiz_scale;
-        if (h_acc >= 0) {
+        svga->overlay_latch.h_acc += s3->streams.k1_horiz_scale;
+        if (svga->overlay_latch.h_acc >= 0) {
             if ((x_read ^ (x_read + 1)) & ~3)
                 OVERLAY_SAMPLE();
+
             x_read = (x_read + 1) & 7;
 
-            h_acc += (s3->streams.k2_horiz_scale - s3->streams.k1_horiz_scale);
+            svga->overlay_latch.h_acc += (s3->streams.k2_horiz_scale - s3->streams.k1_horiz_scale);
         }
     }
 
@@ -2668,25 +2996,31 @@ s3_out(uint16_t addr, uint8_t val, void *priv)
 
     switch (addr) {
         case 0x3c2:
-            if ((s3->chip == S3_VISION964) || (s3->chip == S3_VISION968) || (s3->chip == S3_86C928)) {
-                if ((s3->card_type != S3_SPEA_MERCURY_P64V) && (s3->card_type != S3_MIROVIDEO40SV_ERGO_968)) {
+                if (svga->getclock == icd2061_getclock) {
                     if (((val >> 2) & 3) != 3)
                         icd2061_write(svga->clock_gen, (val >> 2) & 3);
                 }
-            }
-            break;
+                break;
 
         case 0x3c5:
-            if (svga->seqaddr >= 0x10 && svga->seqaddr < 0x20) {
-                svga->seqregs[svga->seqaddr] = val;
-                switch (svga->seqaddr) {
-                    case 0x12:
-                    case 0x13:
-                        svga_recalctimings(svga);
-                        return;
+            if (s3->chip == S3_TRIO64V2) {
+                if (svga->seqaddr >= 0x10) {
+                    svga->seqregs[svga->seqaddr] = val;
+                    svga_recalctimings(svga);
+                    return;
+                }
+            } else {
+                if (svga->seqaddr >= 0x10 && svga->seqaddr < 0x20) {
+                    svga->seqregs[svga->seqaddr] = val;
+                    switch (svga->seqaddr) {
+                        case 0x12:
+                        case 0x13:
+                            svga_recalctimings(svga);
+                            return;
 
-                    default:
-                        break;
+                        default:
+                            break;
+                    }
                 }
             }
             if (svga->seqaddr == 4) /*Chain-4 - update banking*/
@@ -2695,19 +3029,21 @@ s3_out(uint16_t addr, uint8_t val, void *priv)
                     svga->write_bank = svga->read_bank = s3->bank << 16;
                 else
                     svga->write_bank = svga->read_bank = s3->bank << 14;
+
+                svga_recalctimings(svga);
             } else if (svga->seqaddr == 9) {
-                svga->seqregs[svga->seqaddr] = val & 0x80;
+                svga->seqregs[9] = val & 0x80;
                 s3_io_set(s3);
                 return;
             } else if (svga->seqaddr == 0xa) {
-                svga->seqregs[svga->seqaddr] = val & 0x80;
+                svga->seqregs[0xa] = val & 0x80;
                 return;
             } else if (s3->chip >= S3_VISION964) {
-                if (svga->seqaddr == 0x08) {
-                    svga->seqregs[svga->seqaddr] = val & 0x0f;
+                if (svga->seqaddr == 8) {
+                    svga->seqregs[8] = val & 0x0f;
                     return;
-                } else if ((svga->seqaddr == 0x0d) && (svga->seqregs[0x08] == 0x06)) {
-                    svga->seqregs[svga->seqaddr] = val;
+                } else if ((svga->seqaddr == 0xd) && (svga->seqregs[8] == 0x06)) {
+                    svga->seqregs[0xd] = val;
                     svga->dpms                   = ((s3->chip >= S3_VISION964) && (svga->seqregs[0x0d] & 0x50)) || (svga->crtc[0x56] & ((s3->chip >= S3_TRIO32) ? 0x06 : 0x20));
                     svga_recalctimings(svga);
                     return;
@@ -2719,28 +3055,45 @@ s3_out(uint16_t addr, uint8_t val, void *priv)
         case 0x3C7:
         case 0x3C8:
         case 0x3C9:
-            rs2 = (svga->crtc[0x55] & 0x01) || !!(svga->crtc[0x43] & 2);
-            if (s3->chip >= S3_TRIO32)
-                svga_out(addr, val, svga);
-            else if ((s3->chip == S3_VISION964 && s3->card_type != S3_ELSAWIN2KPROX_964) || (s3->chip == S3_86C928)) {
-                rs3 = !!(svga->crtc[0x55] & 0x02);
-                bt48x_ramdac_out(addr, rs2, rs3, val, svga->ramdac, svga);
-            } else if ((s3->chip == S3_VISION964 && s3->card_type == S3_ELSAWIN2KPROX_964) || (s3->chip == S3_VISION968 && (s3->card_type == S3_ELSAWIN2KPROX || s3->card_type == S3_PHOENIX_VISION968 || s3->card_type == S3_NUMBER9_9FX_771)))
-                ibm_rgb528_ramdac_out(addr, rs2, val, svga->ramdac, svga);
-            else if (s3->chip == S3_VISION968 && (s3->card_type == S3_SPEA_MERCURY_P64V || s3->card_type == S3_MIROVIDEO40SV_ERGO_968)) {
-                rs3 = !!(svga->crtc[0x55] & 0x02);
-                tvp3026_ramdac_out(addr, rs2, rs3, val, svga->ramdac, svga);
-            } else if (((s3->chip == S3_86C801) || (s3->chip == S3_86C805) || (s3->chip == S3_86C924)) &&
-                ((s3->card_type != S3_MIROCRYSTAL10SD_805) && (s3->card_type != S3_MIROCRYSTAL8S_805)))
-                att49x_ramdac_out(addr, rs2, val, svga->ramdac, svga);
-            else if (s3->chip == S3_86C911) {
-                sc1148x_ramdac_out(addr, rs2, val, svga->ramdac, svga);
-            } else if (s3->card_type == S3_NUMBER9_9FX_531)
-                att498_ramdac_out(addr, rs2, val, svga->ramdac, svga);
-            else if ((s3->chip == S3_86C928PCI) && (s3->card_type == S3_SPEA_MERCURY_LITE_PCI))
-                sc1502x_ramdac_out(addr, val, svga->ramdac, svga);
+        case 0x3CA: /*0x3c6 alias*/
+        case 0x3CB: /*0x3c7 alias*/
+            if ((svga->crtc[0x55] & 0x03) == 0x00)
+                rs2 = !!(svga->crtc[0x43] & 2);
             else
-                sdac_ramdac_out(addr, rs2, val, svga->ramdac, svga);
+                rs2 = (svga->crtc[0x55] & 0x01);
+            // rs2 = (svga->crtc[0x55] & 0x01) || !!(svga->crtc[0x43] & 2);
+            switch (s3->ramdac_type) {
+                case BUILT_IN:
+                default:
+                    svga_out(addr, val, svga);
+                    break;
+                case SC1148X:
+                    sc1148x_ramdac_out(addr, rs2, val, svga->ramdac, svga);
+                    break;
+                case SC1502X:
+                    sc1502x_ramdac_out(addr, val, svga->ramdac, svga);
+                    break;
+                case ATT49X:
+                    att49x_ramdac_out(addr, rs2, val, svga->ramdac, svga);
+                    break;
+                case ATT498:
+                    att498_ramdac_out(addr, rs2, val, svga->ramdac, svga);
+                    break;
+                case BT48X:
+                    rs3 = !!(svga->crtc[0x55] & 0x02);
+                    bt48x_ramdac_out(addr, rs2, rs3, val, svga->ramdac, svga);
+                    break;
+                case IBM_RGB:
+                    ibm_rgb528_ramdac_out(addr, rs2, val, svga->ramdac, svga);
+                    break;
+                case S3_SDAC:
+                    sdac_ramdac_out(addr, rs2, val, svga->ramdac, svga);
+                    break;
+                case TVP3026:
+                    rs3 = !!(svga->crtc[0x55] & 0x02);
+                    tvp3026_ramdac_out(addr, rs2, rs3, val, svga->ramdac, svga);
+                    break;
+            }
             return;
 
         case 0x3D4:
@@ -2757,8 +3110,6 @@ s3_out(uint16_t addr, uint8_t val, void *priv)
                 return;
             if ((svga->crtcreg == 0x36) && (svga->crtc[0x39] != 0xa5))
                 return;
-            if ((s3->chip == S3_TRIO64V2) && (svga->crtcreg >= 0x80))
-                return;
             if ((s3->chip <= S3_86C924) && (svga->crtcreg >= 0x50))
                 return;
 
@@ -2772,11 +3123,12 @@ s3_out(uint16_t addr, uint8_t val, void *priv)
                     break;
 
                 case 0x40:
-                    s3->enable_8514 = (val & 0x01);
+                    s3->enable_8514 = val & 0x01;
                     break;
 
                 case 0x50:
                     s3->bpp = (svga->crtc[0x50] >> 4) & 3;
+                    s3_log("S3 BPP=%d.\n", s3->bpp);
                     if (s3->bpp == 3) {
                         if (!(s3->accel.multifunc[0xe] & 0x200)) /*On True Color mode change, reset bit 4 of Misc Index register*/
                             s3->accel.multifunc[0xe] &= ~0x10;
@@ -2784,9 +3136,9 @@ s3_out(uint16_t addr, uint8_t val, void *priv)
                     break;
 
                 case 0x5c:
-                    if ((val & 0xa0) == 0x80)
-                        i2c_gpio_set(s3->i2c, !!(val & 0x40), !!(val & 0x10));
-                    if (s3->card_type == S3_PHOENIX_VISION868 || s3->card_type == S3_PHOENIX_VISION968) {
+                    if (s3->elsa_eeprom)
+                        nmc93cxx_eeprom_write(s3->eeprom, !!(val & 0x80), !!(val & 0x40), !!(val & 0x10));
+                    if ((s3->card_type == S3_PHOENIX_VISION868) || (s3->card_type == S3_PHOENIX_VISION968)) {
                         if ((val & 0x20) && (!(svga->crtc[0x55] & 0x01) && !(svga->crtc[0x43] & 2)))
                             svga->dac_addr |= 0x20;
                     } else if (s3->card_type == S3_MIROVIDEO40SV_ERGO_968) {
@@ -2806,6 +3158,8 @@ s3_out(uint16_t addr, uint8_t val, void *priv)
                         svga->write_bank = svga->read_bank = s3->bank << 16;
                     else
                         svga->write_bank = svga->read_bank = s3->bank << 14;
+
+                    s3_log("CRTC35 Chain4=%x, Bank=%02x.\n", svga->chain4, s3->bank);
                     break;
 
                 case 0x51:
@@ -2833,9 +3187,10 @@ s3_out(uint16_t addr, uint8_t val, void *priv)
                     break;
 
                 case 0x45:
-                    if (s3->chip == S3_VISION964 || s3->chip == S3_VISION968)
+                    if ((s3->chip == S3_VISION964) || (s3->chip == S3_VISION968))
                         break;
                     svga->hwcursor.ena = val & 1;
+                    s3_log("Write CRTC45=%02x.\n", val);
                     break;
                 case 0x46:
                 case 0x47:
@@ -2845,7 +3200,7 @@ s3_out(uint16_t addr, uint8_t val, void *priv)
                 case 0x4d:
                 case 0x4e:
                 case 0x4f:
-                    if (s3->chip == S3_VISION964 || s3->chip == S3_VISION968)
+                    if ((s3->chip == S3_VISION964) || (s3->chip == S3_VISION968))
                         break;
                     svga->hwcursor.x = ((svga->crtc[0x46] << 8) | svga->crtc[0x47]) & 0x7ff;
                     if (svga->bpp == 32)
@@ -2854,14 +3209,14 @@ s3_out(uint16_t addr, uint8_t val, void *priv)
                     svga->hwcursor.xoff = svga->crtc[0x4e] & 0x3f;
                     svga->hwcursor.yoff = svga->crtc[0x4f] & 0x3f;
                     svga->hwcursor.addr = ((((svga->crtc[0x4c] << 8) | svga->crtc[0x4d]) & 0xfff) * 1024) + (svga->hwcursor.yoff * 16);
-                    if ((s3->chip >= S3_TRIO32) && svga->bpp == 32)
+                    if ((s3->chip >= S3_TRIO32) && (svga->bpp == 32))
                         svga->hwcursor.x <<= 1;
-                    else if ((s3->chip >= S3_86C928 && s3->chip <= S3_86C805) && (svga->bpp == 15 || svga->bpp == 16)) {
-                        if ((s3->card_type == S3_MIROCRYSTAL10SD_805) && !(svga->crtc[0x45] & 0x04) && svga->bpp == 16)
+                    else if ((s3->chip >= S3_86C928 && s3->chip <= S3_86C805) && ((svga->bpp == 15) || (svga->bpp == 16))) {
+                        if ((s3->card_type == S3_MIROCRYSTAL10SD_805) && !(svga->crtc[0x45] & 0x04) && (svga->bpp == 16))
                             svga->hwcursor.x >>= 2;
                         else
                             svga->hwcursor.x >>= 1;
-                    } else if ((s3->chip >= S3_86C928 && s3->chip <= S3_86C805) && (svga->bpp == 24))
+                    } else if ((s3->chip >= S3_86C928) && (s3->chip <= S3_86C805) && (svga->bpp == 24))
                         svga->hwcursor.x /= 3;
                     else if ((s3->chip <= S3_86C805) && s3->color_16bit)
                         svga->hwcursor.x >>= 1;
@@ -2906,45 +3261,40 @@ s3_out(uint16_t addr, uint8_t val, void *priv)
                 case 0x58:
                 case 0x59:
                 case 0x5a:
+                    s3_log("[%04X:%08X]: Write CRTC%02x=%02x.\n", CS, cpu_state.pc, svga->crtcreg, svga->crtc[svga->crtcreg]);
                     s3_updatemapping(s3);
                     break;
 
                 case 0x55:
+                    s3_log("[%04X:%08X]: Write CRTC%02x=%02x.\n", CS, cpu_state.pc, svga->crtcreg, svga->crtc[svga->crtcreg]);
                     if (s3->chip == S3_86C928) {
-                        if (val & 0x28) {
-                            svga->hwcursor_draw     = NULL;
-                            svga->dac_hwcursor_draw = bt48x_hwcursor_draw;
-                        } else {
-                            svga->hwcursor_draw     = s3_hwcursor_draw;
-                            svga->dac_hwcursor_draw = NULL;
+                        if (s3->ramdac_type == BT48X) {
+                            if (val & 0x28) {
+                                svga->hwcursor_draw     = NULL;
+                                svga->dac_hwcursor_draw = bt48x_hwcursor_draw;
+                            } else {
+                                svga->hwcursor_draw     = s3_hwcursor_draw;
+                                svga->dac_hwcursor_draw = NULL;
+                            }
                         }
                     }
                     break;
 
                 case 0x42:
-                    if ((s3->chip == S3_VISION964) || (s3->chip == S3_VISION968) || (s3->chip == S3_86C928)) {
+                    if (((svga->miscout >> 2) & 3) == 3)
+                        s3_log("[%04X:%08X]: Write CRTC%02x=%02x.\n", CS, cpu_state.pc, svga->crtcreg, svga->crtc[svga->crtcreg]);
+
+                    if (svga->getclock == icd2061_getclock) {
                         if (((svga->miscout >> 2) & 3) == 3)
-                            icd2061_write(svga->clock_gen, svga->crtc[0x42] & 0x0f);
+                            icd2061_write(svga->clock_gen, val & 0x0f);
                     }
                     break;
 
                 case 0x43:
                     if (s3->chip < S3_VISION964) {
-                        if (s3->chip <= S3_86C805) {
-                            s3->color_16bit = !!(val & 8);
-                            if (s3->color_16bit) {
-                                s3->width = 1024;
-                            } else {
-                                if (s3->chip <= S3_86C924)
-                                    s3->width = 1024;
-                                else {
-                                    if (s3->accel.advfunc_cntl & 4)
-                                        s3->width = 1024;
-                                    else
-                                        s3->width = 640;
-                                }
-                            }
-                        }
+                        if (s3->chip <= S3_86C805)
+                            svga_recalctimings(svga);
+
                         s3_io_remove_alt(s3);
                         s3->translate = !!(val & 0x10);
                         s3_io_set_alt(s3);
@@ -2985,9 +3335,9 @@ s3_out(uint16_t addr, uint8_t val, void *priv)
                 if (svga->crtcreg < 0xe || svga->crtcreg > 0x10) {
                     if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
                         if ((((svga->crtc[0x67] & 0xc) != 0xc) && (s3->chip >= S3_TRIO64V)) || (s3->chip < S3_TRIO64V))
-                            svga->ma_latch |= (s3->ma_ext << 16);
+                            svga->memaddr_latch |= (s3->ma_ext << 16);
                     } else {
                         svga->fullchange = svga->monitor->mon_changeframecount;
                         svga_recalctimings(svga);
@@ -3021,20 +3371,30 @@ s3_in(uint16_t addr, void *priv)
             break;
 
         case 0x3c2:
+            if (s3->elsa_eeprom) {
+                temp = nmc93cxx_eeprom_read(s3->eeprom) ? 0x10 : 0x00;
+                return (svga_in(addr, svga) & 0xef) | temp;
+            }
             if (s3->chip <= S3_86C924)
                 return svga_in(addr, svga) | 0x10;
             break;
 
         case 0x3c5:
-            if (svga->seqaddr >= 0x10 && svga->seqaddr < 0x20) {
+            if ((svga->seqaddr >= 0x10 && svga->seqaddr < 0x20) && (s3->chip < S3_TRIO64V2)) {
                 temp = svga->seqregs[svga->seqaddr];
                 /* This is needed for the Intel Advanced/ATX's built-in S3 Trio64V+ BIOS to not
                    get stuck in an infinite loop. */
-                if (((s3->card_type == S3_PHOENIX_TRIO64VPLUS_ONBOARD) ||
+                if (((s3->card_type == S3_STB_POWERGRAPH_64_VIDEO) ||
+                    (s3->card_type == S3_PHOENIX_TRIO64VPLUS_ONBOARD) ||
                     (s3->card_type == S3_CARDEX_TRIO64VPLUS)) && (svga->seqaddr == 0x17))
                     svga->seqregs[svga->seqaddr] ^= 0x01;
                 return temp;
-            }
+            } if ((svga->seqaddr >= 0x10) && (s3->chip >= S3_TRIO64V2)) {
+                return svga->seqregs[svga->seqaddr];
+            } else if ((svga->seqaddr >= 5) && (svga->seqaddr < 8))
+                return 0xff;
+            else
+                return svga->seqregs[svga->seqaddr];
             break;
 
         case 0x3c6:
@@ -3042,31 +3402,43 @@ s3_in(uint16_t addr, void *priv)
         case 0x3c8:
         case 0x3c9:
             rs2 = (svga->crtc[0x55] & 0x01) || !!(svga->crtc[0x43] & 2);
-            if (s3->chip >= S3_TRIO32)
-                return svga_in(addr, svga);
-            else if ((s3->chip == S3_VISION964 && s3->card_type != S3_ELSAWIN2KPROX_964) || (s3->chip == S3_86C928)) {
-                if (s3->chip == S3_86C928)
-                    rs3 = !!(svga->crtc[0x55] & 0x28) || !!(svga->crtc[0x45] & 0x20) || !!(svga->crtc[0x55] & 0x02); /*Quite insane but Win95's S3 driver wants it set at all costs for 8bpp+ mode*/
-                else
+            switch (s3->ramdac_type) {
+                case BUILT_IN:
+                default:
+                    temp = svga_in(addr, svga);
+                    break;
+                case SC1148X:
+                    temp = sc1148x_ramdac_in(addr, rs2, svga->ramdac, svga);
+                    break;
+                case SC1502X:
+                    temp = sc1502x_ramdac_in(addr, svga->ramdac, svga);
+                    break;
+                case ATT49X:
+                    temp = att49x_ramdac_in(addr, rs2, svga->ramdac, svga);
+                    break;
+                case ATT498:
+                    temp = att498_ramdac_in(addr, rs2, svga->ramdac, svga);
+                    break;
+                case BT48X:
+                    if (s3->chip == S3_86C928)
+                        rs3 = !!(svga->crtc[0x55] & 0x28) || !!(svga->crtc[0x45] & 0x20) || !!(svga->crtc[0x55] & 0x02); /*Quite insane but Win95's S3 driver wants it set at all costs for 8bpp+ mode*/
+                    else
+                        rs3 = !!(svga->crtc[0x55] & 0x02);
+
+                    temp = bt48x_ramdac_in(addr, rs2, rs3, svga->ramdac, svga);
+                    break;
+                case IBM_RGB:
+                    temp = ibm_rgb528_ramdac_in(addr, rs2, svga->ramdac, svga);
+                    break;
+                case S3_SDAC:
+                    temp = sdac_ramdac_in(addr, rs2, svga->ramdac, svga);
+                    break;
+                case TVP3026:
                     rs3 = !!(svga->crtc[0x55] & 0x02);
-                temp = bt48x_ramdac_in(addr, rs2, rs3, svga->ramdac, svga);
-                return temp;
-            } else if ((s3->chip == S3_VISION964 && s3->card_type == S3_ELSAWIN2KPROX_964) || (s3->chip == S3_VISION968 && (s3->card_type == S3_ELSAWIN2KPROX || s3->card_type == S3_PHOENIX_VISION968 || s3->card_type == S3_NUMBER9_9FX_771)))
-                return ibm_rgb528_ramdac_in(addr, rs2, svga->ramdac, svga);
-            else if (s3->chip == S3_VISION968 && (s3->card_type == S3_SPEA_MERCURY_P64V || s3->card_type == S3_MIROVIDEO40SV_ERGO_968)) {
-                rs3 = !!(svga->crtc[0x55] & 0x02);
-                return tvp3026_ramdac_in(addr, rs2, rs3, svga->ramdac, svga);
-            } else if (((s3->chip == S3_86C801) || (s3->chip == S3_86C805) || (s3->chip == S3_86C924)) &&
-                ((s3->card_type != S3_MIROCRYSTAL10SD_805) && (s3->card_type != S3_MIROCRYSTAL8S_805)))
-                return att49x_ramdac_in(addr, rs2, svga->ramdac, svga);
-            else if (s3->chip == S3_86C911)
-                return sc1148x_ramdac_in(addr, rs2, svga->ramdac, svga);
-            else if (s3->card_type == S3_NUMBER9_9FX_531)
-                return att498_ramdac_in(addr, rs2, svga->ramdac, svga);
-            else if ((s3->chip == S3_86C928PCI) && (s3->card_type == S3_SPEA_MERCURY_LITE_PCI))
-                return sc1502x_ramdac_in(addr, svga->ramdac, svga);
-            else
-                return sdac_ramdac_in(addr, rs2, svga->ramdac, svga);
+                    temp = tvp3026_ramdac_in(addr, rs2, rs3, svga->ramdac, svga);
+                    break;
+            }
+            return temp;
 
         case 0x3d4:
             return svga->crtcreg;
@@ -3097,15 +3469,14 @@ s3_in(uint16_t addr, void *priv)
                 case 0x51:
                     return (svga->crtc[0x51] & 0xf0) | ((s3->bank >> 2) & 0xc) | ((s3->ma_ext >> 2) & 3);
                 case 0x5c: /* General Output Port Register */
-                    temp = svga->crtc[svga->crtcreg] & 0xa0;
+                    temp = svga->crtc[0x5c] & 0xf0;
                     if (((svga->miscout >> 2) & 3) == 3)
                         temp |= svga->crtc[0x42] & 0x0f;
                     else
                         temp |= ((svga->miscout >> 2) & 3);
-                    if ((temp & 0xa0) == 0xa0) {
-                        if ((svga->crtc[0x5c] & 0x40) && i2c_gpio_get_scl(s3->i2c))
-                            temp |= 0x40;
-                        if ((svga->crtc[0x5c] & 0x10) && i2c_gpio_get_sda(s3->i2c))
+                    if (s3->elsa_eeprom) {
+                        temp &= 0xaf;
+                        if ((svga->crtc[0x5c] & 0x10) && nmc93cxx_eeprom_read(s3->eeprom))
                             temp |= 0x10;
                     }
                     return temp;
@@ -3116,20 +3487,21 @@ s3_in(uint16_t addr, void *priv)
                 /* Phoenix S3 video BIOS'es seem to expect CRTC registers 6B and 6C
                    to be mirrors of 59 and 5A. */
                 case 0x6b:
+                    s3_log("[%04X:%08X]: Read CRTC6b=%02x.\n", CS, cpu_state.pc, svga->crtc[0x6b]);
                     if (s3->chip != S3_TRIO64V2) {
-                        if (svga->crtc[0x53] & 0x08) {
+                        if (svga->crtc[0x53] & 0x08)
                             return (s3->chip == S3_TRIO64V) ? (svga->crtc[0x59] & 0xfc) : (svga->crtc[0x59] & 0xfe);
-                        } else {
+                        else
                             return svga->crtc[0x59];
-                        }
                     } else
                         return svga->crtc[0x6b];
                     break;
                 case 0x6c:
+                    s3_log("[%04X:%08X]: Read CRTC6c=%02x.\n", CS, cpu_state.pc, svga->crtc[0x6c]);
                     if (s3->chip != S3_TRIO64V2) {
-                        if (svga->crtc[0x53] & 0x08) {
+                        if (svga->crtc[0x53] & 0x08)
                             return 0x00;
-                        } else
+                        else
                             return (svga->crtc[0x5a] & 0x80);
                     } else
                         return svga->crtc[0x6c];
@@ -3146,6 +3518,140 @@ s3_in(uint16_t addr, void *priv)
     return svga_in(addr, svga);
 }
 
+uint32_t
+s3_decode_addr(svga_t *svga, uint32_t addr, int write)
+{
+    int memory_map_mode = (svga->gdcreg[6] >> 2) & 3;
+
+    s3_log("CRTC31 bit 3=%x, map=%x, write=%x, wrtbank=%x, chain4=%x, vrammask=%08x.\n", svga->crtc[0x31] & 0x08, memory_map_mode, write, svga->write_bank, svga->chain4, svga->vram_display_mask);
+
+    if (svga->crtc[0x31] & 0x08)
+        memory_map_mode = 1;
+
+    addr &= 0x1ffff;
+
+    switch (memory_map_mode) {
+        case 0:
+            break;
+        case 1:
+            if (addr >= 0x10000)
+                return 0xffffffff;
+            break;
+        case 2:
+            addr -= 0x10000;
+            if (addr >= 0x8000)
+                return 0xffffffff;
+            break;
+        default:
+        case 3:
+            addr -= 0x18000;
+            if (addr >= 0x8000)
+                return 0xffffffff;
+            break;
+    }
+
+    if (memory_map_mode <= 1) {
+        if (write)
+            addr += svga->write_bank;
+        else
+            addr += svga->read_bank;
+    }
+
+    return addr;
+}
+
+static void
+s3_write(uint32_t addr, uint8_t val, void *priv)
+{
+    s3_t *s3 = (s3_t *) priv;
+    svga_t *svga = &s3->svga;
+
+    xga_write_test(addr, val, svga);
+    addr = s3_decode_addr(svga, addr, 1);
+    if (addr == 0xffffffff)
+        return;
+
+    svga_write_linear(addr, val, svga);
+}
+
+static void
+s3_writew(uint32_t addr, uint16_t val, void *priv)
+{
+    s3_t *s3 = (s3_t *) priv;
+    svga_t *svga = &s3->svga;
+
+    xga_write_test(addr, val, svga);
+    xga_write_test(addr + 1, val >> 8, svga);
+    addr = s3_decode_addr(svga, addr, 1);
+    if (addr == 0xffffffff)
+        return;
+
+    svga_writew_linear(addr, val, svga);
+}
+
+static void
+s3_writel(uint32_t addr, uint32_t val, void *priv)
+{
+    s3_t *s3 = (s3_t *) priv;
+    svga_t *svga = &s3->svga;
+
+    xga_write_test(addr, val, svga);
+    xga_write_test(addr + 1, val >> 8, svga);
+    xga_write_test(addr + 2, val >> 16, svga);
+    xga_write_test(addr + 3, val >> 24, svga);
+    addr = s3_decode_addr(svga, addr, 1);
+    if (addr == 0xffffffff)
+        return;
+
+    svga_writel_linear(addr, val, svga);
+}
+
+static uint8_t
+s3_read(uint32_t addr, void *priv)
+{
+    s3_t *s3 = (s3_t *) priv;
+    svga_t *svga = &s3->svga;
+
+    (void) xga_read_test(addr, svga);
+    addr = s3_decode_addr(svga, addr, 0);
+    if (addr == 0xffffffff)
+        return 0xff;
+
+    return svga_read_linear(addr, svga);
+}
+
+static uint16_t
+s3_readw(uint32_t addr, void *priv)
+{
+    s3_t *s3 = (s3_t *) priv;
+    svga_t *svga = &s3->svga;
+
+    (void) xga_read_test(addr, svga);
+    (void) xga_read_test(addr + 1, svga);
+    addr = s3_decode_addr(svga, addr, 0);
+    if (addr == 0xffffffff)
+        return 0xffff;
+
+    return svga_readw_linear(addr, svga);
+}
+
+static uint32_t
+s3_readl(uint32_t addr, void *priv)
+{
+    s3_t *s3 = (s3_t *) priv;
+    svga_t *svga = &s3->svga;
+
+    (void) xga_read_test(addr, svga);
+    (void) xga_read_test(addr + 1, svga);
+    (void) xga_read_test(addr + 2, svga);
+    (void) xga_read_test(addr + 3, svga);
+    addr = s3_decode_addr(svga, addr, 0);
+    if (addr == 0xffffffff)
+        return 0xffffffff;
+
+    return svga_readl_linear(addr, svga);
+}
+
 static void
 s3_recalctimings(svga_t *svga)
 {
@@ -3165,15 +3671,16 @@ s3_recalctimings(svga_t *svga)
     }
 
     svga->hdisp = svga->hdisp_old;
+    svga->memaddr_latch |= (s3->ma_ext << 16);
 
-    svga->ma_latch |= (s3->ma_ext << 16);
+    svga->lowres = (!!(svga->attrregs[0x10] & 0x40) && !(svga->crtc[0x3a] & 0x10));
 
     if (s3->chip >= S3_86C928) {
         if (svga->crtc[0x5d] & 0x01)
             svga->htotal |= 0x100;
         if (svga->crtc[0x5d] & 0x02) {
             svga->hdisp_time |= 0x100;
-            svga->hdisp |= 0x100 * svga->dots_per_clock;
+            svga->hdisp |= (0x100 * svga->dots_per_clock);
         }
         if (svga->crtc[0x5e] & 0x01)
             svga->vtotal |= 0x400;
@@ -3181,90 +3688,115 @@ s3_recalctimings(svga_t *svga)
             svga->dispend |= 0x400;
         if (svga->crtc[0x5e] & 0x04)
             svga->vblankstart |= 0x400;
-        else
-            svga->vblankstart = svga->dispend;
+        else if ((svga->crtc[0x3a] & 0x10) && !svga->lowres)
+            svga->vblankstart = svga->dispend; /*Applies only to Enhanced modes*/
         if (svga->crtc[0x5e] & 0x10)
             svga->vsyncstart |= 0x400;
+        svga->split       = svga->crtc[0x18];
+        if (svga->crtc[7] & 0x10)
+            svga->split |= 0x100;
+        if (svga->crtc[9] & 0x40)
+            svga->split |= 0x200;
         if (svga->crtc[0x5e] & 0x40)
             svga->split |= 0x400;
+        svga->split++;
         if (s3->accel.advfunc_cntl & 0x01)
             svga->split = 0x7fff;
+        s3_log("SPLIT=%d, crtc5e bit 6=%02x, advfunccntl bit 0=%x.\n", svga->split, svga->crtc[0x5e] & 0x40, s3->accel.advfunc_cntl & 0x01);
         if (svga->crtc[0x51] & 0x30)
             svga->rowoffset |= (svga->crtc[0x51] & 0x30) << 4;
         else if (svga->crtc[0x43] & 0x04)
             svga->rowoffset |= 0x100;
     } else if (svga->crtc[0x43] & 0x04)
         svga->rowoffset |= 0x100;
+
     if (!svga->rowoffset)
         svga->rowoffset = 0x100;
 
-    if ((s3->chip == S3_VISION964) || (s3->chip == S3_86C928)) {
-        if (s3->card_type == S3_ELSAWIN2KPROX_964)
-            ibm_rgb528_recalctimings(svga->ramdac, svga);
-        else {
-            bt48x_recalctimings(svga->ramdac, svga);
-            svga->interlace |= (!!(svga->crtc[0x42] & 0x20));
-        }
-    } else if (s3->chip == S3_VISION968) {
-        if ((s3->card_type == S3_SPEA_MERCURY_P64V) || (s3->card_type == S3_MIROVIDEO40SV_ERGO_968))
-            tvp3026_recalctimings(svga->ramdac, svga);
-        else
-            ibm_rgb528_recalctimings(svga->ramdac, svga);
-    } else
-        svga->interlace = !!(svga->crtc[0x42] & 0x20);
-
     if ((((svga->miscout >> 2) & 3) == 3) && (s3->chip < S3_TRIO32))
         clk_sel = svga->crtc[0x42] & 0x0f;
 
     svga->clock = (cpuclock * (double) (1ULL << 32)) / svga->getclock(clk_sel, svga->clock_gen);
 
-    switch (svga->crtc[0x67] >> 4) {
-        case 3:
-        case 5:
-        case 7:
-            svga->clock /= 2;
+    switch (s3->ramdac_type) {
+        case BT48X:
+            bt48x_recalctimings(svga->ramdac, svga);
+            svga->interlace |= (!!(svga->crtc[0x42] & 0x20));
+            break;
+        case IBM_RGB:
+            ibm_rgb528_recalctimings(svga->ramdac, svga);
+            break;
+        case TVP3026:
+            tvp3026_recalctimings(svga->ramdac, svga);
             break;
-
         default:
+            svga->interlace = !!(svga->crtc[0x42] & 0x20);
             break;
     }
 
-    svga->lowres = (!!(svga->attrregs[0x10] & 0x40) && !(svga->crtc[0x3a] & 0x10));
+    if (s3->chip >= S3_TRIO32) {
+        switch (svga->crtc[0x67] >> 4) {
+            case 3:
+            case 5:
+            case 7:
+                svga->clock /= 2;
+                break;
 
-    if (s3->chip != S3_86C801)
-        mask |= 0x01;
-    switch (svga->crtc[0x50] & mask) {
-        case 0x00:
-            if (s3->color_16bit)
+            default:
+                break;
+        }
+    }
+
+    if (s3->chip <= S3_86C805) {
+        s3->color_16bit = !!(svga->crtc[0x43] & 0x08);
+        s3_log("Color 16bit=%x, bpp=%d, 256color=%x.\n", s3->color_16bit, svga->bpp, (svga->attrregs[0x10] & 0x40));
+        if ((svga->bpp == 24) || (svga->bpp == 8))
+            s3->color_16bit = 0;
+
+        if (s3->color_16bit)
+            s3->width = 1024;
+        else {
+            if (s3->chip <= S3_86C924)
                 s3->width = 1024;
-            else
-                s3->width = (svga->crtc[0x31] & 2) ? 2048 : 1024;
-            break;
-        case 0x01:
-            s3->width = 1152;
-            break;
-        case 0x40:
-            s3->width = 640;
-            break;
-        case 0x80:
-            s3->width = ((s3->chip > S3_86C805) && (s3->accel.advfunc_cntl & 4)) ? 1600 : 800;
-            break;
-        case 0x81:
-            s3->width = 1600;
-            break;
-        case 0xc0:
-            s3->width = 1280;
-            break;
+        }
+    }
 
-        default:
-            break;
+    if (s3->chip >= S3_86C928) {
+        if (s3->chip != S3_86C801)
+            mask |= 0x01;
+
+        switch (svga->crtc[0x50] & mask) {
+            case 0x00:
+                s3->width = (svga->crtc[0x31] & 0x02) ? 2048 : 1024;
+                if (s3->color_16bit)
+                    s3->width = 1024;
+                break;
+            case 0x01:
+                s3->width = 1152;
+                break;
+            case 0x40:
+                s3->width = 640;
+                break;
+            case 0x80:
+                s3->width = ((s3->chip > S3_86C805) && (s3->accel.advfunc_cntl & 0x04)) ? 1600 : 800;
+                break;
+            case 0x81:
+                s3->width = 1600;
+                break;
+            case 0xc0:
+                s3->width = 1280;
+                break;
+
+            default:
+                break;
+        }
     }
 
     if (svga->crtc[0x33] & 0x20) {
         /* The S3 version of the Cirrus' special blanking mode, with identical behavior. */
-        svga->hblankstart = (((svga->crtc[0x5d] & 0x02) >> 1) << 8) + svga->crtc[1] +
-                            ((svga->crtc[3] >> 5) & 3) + 1;
-        svga->hblank_end_val = ((svga->crtc[3] >> 5) & 3);
+        svga->hblankstart = (((svga->crtc[0x5d] & 0x02) >> 1) << 8) + svga->crtc[1]/* +
+                            ((svga->crtc[3] >> 5) & 3) + 1*/;
+        svga->hblank_end_val = svga->htotal - 1 /* + ((svga->crtc[3] >> 5) & 3)*/;
 
         svga->monitor->mon_overscan_y = 0;
         svga->monitor->mon_overscan_x = 0;
@@ -3275,7 +3807,7 @@ s3_recalctimings(svga_t *svga)
         if (s3->chip >= S3_VISION964)
             svga->hblank_end_mask  = 0x7f;
     } else if (s3->chip >= S3_86C801) {
-        svga->hblankstart    = (((svga->crtc[0x5d] & 0x04) >> 2) << 8) + svga->crtc[2] + 1;
+        svga->hblankstart    = (((svga->crtc[0x5d] & 0x04) >> 2) << 8) + svga->crtc[2];
 
         if (s3->chip >= S3_VISION964) {
             /* NOTE: The S3 Trio64V+ datasheet says this is bit 7, but then where is bit 6?
@@ -3288,40 +3820,11 @@ s3_recalctimings(svga_t *svga)
         }
     }
 
-#ifdef OLD_CODE_REFERENCE
-    if (s3->card_type == S3_MIROCRYSTAL10SD_805 || s3->card_type == S3_MIROCRYSTAL20SD_864 || s3->card_type == S3_MIROCRYSTAL20SV_964 || s3->card_type == S3_SPEA_MIRAGE_86C801 || s3->card_type == S3_SPEA_MIRAGE_86C805 || s3->card_type == S3_MIROCRYSTAL8S_805 || s3->card_type == S3_NUMBER9_9FX_531 || s3->card_type == S3_SPEA_MERCURY_LITE_PCI) {
-        if (!(svga->crtc[0x5e] & 0x04))
-            svga->vblankstart = svga->dispend;
-        if (svga->bpp != 32) {
-            if (svga->crtc[0x31] & 2)
-                s3->width = 2048;
-            else {
-                if (s3->card_type == S3_MIROCRYSTAL10SD_805) {
-                    if (svga->hdisp == 1280 && s3->width == 1024) {
-                        s3->width = 1280;
-                    }
-                }
-            }
-        } else {
-            if (s3->card_type == S3_NUMBER9_9FX_531) {
-                if ((svga->hdisp == 1600) && (s3->width == 1600))
-                    s3->width = 800;
-            }
-        }
-    } else if (s3->chip == S3_86C928) {
-        if (svga->bpp == 15) {
-            if (s3->width == 800)
-                s3->width = 1024;
-        }
-    }
-#endif
-
     if ((svga->crtc[0x3a] & 0x10) && !svga->lowres) {
-        svga->vram_display_mask = s3->vram_mask;
         s3_log("BPP=%d, pitch=%d, width=%02x, double?=%x, 16bit?=%d, highres?=%d, "
-               "attr=%02x.\n", svga->bpp, s3->width, svga->crtc[0x50],
+               "attr=%02x, hdisp=%d.\n", svga->bpp, s3->width, svga->crtc[0x50],
                svga->crtc[0x31] & 0x02, s3->color_16bit, s3->accel.advfunc_cntl & 4,
-               svga->attrregs[0x10] & 0x40);
+               svga->attrregs[0x10] & 0x40, svga->hdisp);
         switch (svga->bpp) {
             case 8:
                 svga->render = svga_render_8bpp_highres;
@@ -3329,10 +3832,21 @@ s3_recalctimings(svga_t *svga)
                     case S3_86C928:
                         switch (s3->card_type) {
                             case S3_METHEUS_86C928:
+                                s3_log("928 8bpp: ClockSel=%02x, width=%d, hdisp=%d, dotsperclock=%d.\n", clk_sel, s3->width, svga->hdisp, svga->dots_per_clock);
                                 switch (s3->width) {
-                                    case 1280:
-                                        svga->hdisp <<= 1;
-                                        svga->dots_per_clock <<= 1;
+                                    case 1280: /*Account for the 1280x1024 resolution*/
+                                        switch (svga->hdisp) {
+                                            case 320:
+                                                svga->hdisp <<= 2;
+                                                svga->dots_per_clock <<= 2;
+                                                break;
+                                            case 640:
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                                break;
+                                            default:
+                                                break;
+                                        }
                                         break;
                                     case 2048: /*Account for the 1280x1024 resolution*/
                                         switch (svga->hdisp) {
@@ -3352,13 +3866,127 @@ s3_recalctimings(svga_t *svga)
                                         break;
                                 }
                                 break;
-
+                            case S3_ELSAWIN1K_86C928:
+                            case S3_ELSAWIN2K_86C928:
+                                switch (s3->width) {
+                                    case 1024:
+                                        switch (svga->hdisp) {
+                                            case 256:
+                                                svga->hdisp <<= 2;
+                                                svga->dots_per_clock <<= 2;
+                                                break;
+                                            case 512:
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                                break;
+                                            default:
+                                                break;
+                                        }
+                                        break;
+                                    case 1280: /*Account for the 1280x1024 resolution*/
+                                        switch (svga->hdisp) {
+                                            case 320:
+                                                svga->hdisp <<= 2;
+                                                svga->dots_per_clock <<= 2;
+                                                break;
+                                            case 640:
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                                break;
+                                            default:
+                                                break;
+                                        }
+                                        break;
+                                    case 2048: /*Account for the 1280x1024 resolution and the ELSA EEPROM resolutions*/
+                                        switch (svga->hdisp) {
+                                            case 320:
+                                            case 384:
+                                                svga->hdisp <<= 2;
+                                                svga->dots_per_clock <<= 2;
+                                            break;
+                                            case 576:
+                                            case 640:
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                                break;
+                                            default:
+                                                if (s3->ramdac_type == BT48X) {
+                                                    if (!svga->interlace) {
+                                                        if (svga->dispend >= 1024) {
+                                                            svga->hdisp <<= 1;
+                                                            svga->dots_per_clock <<= 1;
+                                                        }
+                                                    } else {
+                                                        if (svga->dispend >= 512) {
+                                                            svga->hdisp <<= 1;
+                                                            svga->dots_per_clock <<= 1;
+                                                        }
+                                                    }
+                                                }
+                                                break;
+                                        }
+                                        break;
+                                    default:
+                                        break;
+                                }
+                                break;
                             default:
                                 break;
                         }
                         break;
                     case S3_86C928PCI:
                         switch (s3->card_type) {
+                            case S3_ELSAWIN1KPCI_86C928:
+                                switch (s3->width) {
+                                    case 1024:
+                                        switch (svga->hdisp) {
+                                            case 256:
+                                                svga->hdisp <<= 2;
+                                                svga->dots_per_clock <<= 2;
+                                                break;
+                                            case 512:
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                                break;
+                                            default:
+                                                break;
+                                        }
+                                        break;
+                                    case 1280: /*Account for the 1280x1024 resolution*/
+                                        switch (svga->hdisp) {
+                                            case 320:
+                                                svga->hdisp <<= 2;
+                                                svga->dots_per_clock <<= 2;
+                                                break;
+                                            case 640:
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                                break;
+                                            default:
+                                                break;
+                                        }
+                                        break;
+                                    case 2048: /*Account for the 1280x1024 resolution and the ELSA EEPROM resolutions*/
+                                        switch (svga->hdisp) {
+                                            case 320:
+                                            case 384:
+                                                svga->hdisp <<= 2;
+                                                svga->dots_per_clock <<= 2;
+                                            break;
+                                            case 576:
+                                            case 640:
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                                break;
+                                            default:
+                                                break;
+                                        }
+                                        break;
+                                    default:
+                                        break;
+                                }
+                                break;
+
                             case S3_SPEA_MERCURY_LITE_PCI:
                                 switch (s3->width) {
                                     case 640:
@@ -3382,6 +4010,7 @@ s3_recalctimings(svga_t *svga)
                                     case 1600:
                                         svga->hdisp <<= 1;
                                         svga->dots_per_clock <<= 1;
+                                        break;
                                     default:
                                         break;
                                 }
@@ -3393,19 +4022,41 @@ s3_recalctimings(svga_t *svga)
                         break;
                     case S3_VISION968:
                         switch (s3->card_type) {
-                            case S3_PHOENIX_VISION968:
+                            case S3_MIROVIDEO40SV_ERGO_968:
+                                if (svga->hdisp == 832)
+                                    svga->hdisp -= 32;
+                                break;
+                            case S3_DIAMOND_STEALTH64_968:
                             case S3_NUMBER9_9FX_771:
+                            case S3_PHOENIX_VISION968:
+                            case S3_SPEA_MERCURY_P64V:
                                 svga->hdisp <<= 1;
                                 svga->dots_per_clock <<= 1;
+                                svga->clock *= 2.0;
                                 if (svga->hdisp == 832)
                                     svga->hdisp -= 32;
                                 break;
                             case S3_ELSAWIN2KPROX:
+                                s3_log("S3 width 8bpp=%d, hdisp=%d.\n", s3->width, svga->hdisp);
                                 switch (s3->width) {
                                     case 1280:
                                     case 1600:
                                         svga->hdisp <<= 1;
                                         svga->dots_per_clock <<= 1;
+                                        break;
+                                    case 2048:
+                                        if (!svga->interlace) {
+                                            if (svga->dispend >= 1024) {
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                            }
+                                        } else {
+                                            if (svga->dispend >= 512) {
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                            }
+                                        }
+                                        break;
                                     default:
                                         break;
                                 }
@@ -3419,29 +4070,6 @@ s3_recalctimings(svga_t *svga)
                     default:
                         break;
                 }
-#ifdef OLD_CODE_REFERENCE
-                if (s3->chip != S3_VISION868) {
-                    if (s3->chip == S3_86C928) {
-                        if (s3->width == 2048 || s3->width == 1280 || s3->width == 1600) {
-                            if ((s3->width != 1600) && (svga->dispend == 1024) && (svga->hdisp != 1280))
-                                svga->hdisp <<= 2;
-                            else
-                                svga->hdisp <<= 1;
-                        }
-                    } else if ((s3->chip != S3_86C801) && (s3->chip != S3_86C805) && (s3->chip != S3_TRIO32) && (s3->chip != S3_TRIO64) && (s3->chip != S3_VISION964) && (s3->chip != S3_VISION968)) {
-                        if (s3->width == 1280 || s3->width == 1600)
-                            svga->hdisp <<= 1;
-                    } else if ((s3->card_type == S3_ELSAWIN2KPROX_964) || (s3->card_type == S3_ELSAWIN2KPROX)) {
-                        if (s3->width == 1280 || s3->width == 1600)
-                            svga->hdisp <<= 1;
-                    } else if (s3->card_type == S3_SPEA_MERCURY_P64V) {
-                        if (s3->width == 1280 || s3->width == 1600)
-                            svga->hdisp <<= 1;
-                        }
-                    } else if (s3->card_type == S3_NUMBER9_9FX_771)
-                        svga->hdisp <<= 1;
-                }
-#endif
                 break;
             case 15:
                 svga->render = svga_render_15bpp_highres;
@@ -3467,6 +4095,7 @@ s3_recalctimings(svga_t *svga)
                         switch (s3->card_type) {
                             case S3_MIROCRYSTAL8S_805:
                             case S3_MIROCRYSTAL10SD_805:
+                            case S3_WINNER1000_805:
                             case S3_PHOENIX_86C805:
                             case S3_86C805_ONBOARD:
                                 svga->hdisp >>= 1;
@@ -3483,6 +4112,7 @@ s3_recalctimings(svga_t *svga)
                                             /*SPEA specific drivers + its VBE RAM BIOS...*/
                                             svga->hdisp <<= 1;
                                             svga->dots_per_clock <<= 1;
+                                            svga->clock /= 2.0;
                                         }
                                         break;
                                     default:
@@ -3498,8 +4128,10 @@ s3_recalctimings(svga_t *svga)
                         switch (s3->card_type) {
                             case S3_METHEUS_86C928:
                                 if (!s3->color_16bit) {
+                                    s3_log("928 15bpp: ClockSel=%02x, width=%d, hdisp=%d, dotsperclock=%d.\n", clk_sel, s3->width, svga->hdisp, svga->dots_per_clock);
                                     svga->hdisp <<= 1;
                                     svga->dots_per_clock <<= 1;
+                                    svga->clock *= 2.0;
                                 }
                                 switch (svga->hdisp) { /*This might be a driver issue*/
                                     case 800:
@@ -3512,6 +4144,28 @@ s3_recalctimings(svga_t *svga)
                                         break;
                                 }
                                 break;
+                            case S3_ELSAWIN1K_86C928:
+                            case S3_ELSAWIN2K_86C928:
+                                switch (s3->width) {
+                                    case 2048:
+                                        if (s3->ramdac_type == SC1502X) {
+                                            svga->hdisp >>= 1;
+                                            svga->dots_per_clock >>= 1;
+                                        } else {
+                                            svga->hdisp <<= 1;
+                                            svga->dots_per_clock <<= 1;
+                                        }
+                                        break;
+                                    default:
+                                        if (s3->ramdac_type == BT48X)
+                                            svga->clock /= 2.0;
+                                        else if (s3->ramdac_type == SC1502X) {
+                                            svga->hdisp >>= 1;
+                                            svga->dots_per_clock >>= 1;
+                                        }
+                                        break;
+                                }
+                                break;
 
                             default:
                                 break;
@@ -3519,6 +4173,10 @@ s3_recalctimings(svga_t *svga)
                         break;
                     case S3_86C928PCI:
                         switch (s3->card_type) {
+                            case S3_ELSAWIN1KPCI_86C928:
+                                svga->hdisp >>= 1;
+                                svga->dots_per_clock >>= 1;
+                                break;
                             case S3_SPEA_MERCURY_LITE_PCI:
                                 switch (s3->width) {
                                     case 640:
@@ -3547,6 +4205,19 @@ s3_recalctimings(svga_t *svga)
                                         svga->hdisp <<= 1;
                                         svga->dots_per_clock <<= 1;
                                         break;
+                                    case 2048:
+                                        if (!svga->interlace) {
+                                            if (svga->dispend >= 1024) {
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                            }
+                                        } else {
+                                            if (svga->dispend >= 512) {
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                            }
+                                        }
+                                        break;
                                     default:
                                         break;
                                 }
@@ -3562,6 +4233,7 @@ s3_recalctimings(svga_t *svga)
                             case S3_NUMBER9_9FX_531:
                                 svga->hdisp >>= 1;
                                 svga->dots_per_clock >>= 1;
+                                svga->clock /= 2.0;
                                 break;
 
                             default:
@@ -3570,10 +4242,17 @@ s3_recalctimings(svga_t *svga)
                         break;
                     case S3_VISION968:
                         switch (s3->card_type) {
+                            case S3_MIROVIDEO40SV_ERGO_968:
+                                if (svga->hdisp == 832)
+                                    svga->hdisp -= 32;
+                                break;
+                            case S3_DIAMOND_STEALTH64_968:
                             case S3_NUMBER9_9FX_771:
                             case S3_PHOENIX_VISION968:
+                            case S3_SPEA_MERCURY_P64V:
                                 svga->hdisp <<= 1;
                                 svga->dots_per_clock <<= 1;
+                                svga->clock *= 2.0;
                                 /* TODO: Is this still needed? */
                                 if (svga->hdisp == 832)
                                     svga->hdisp -= 32;
@@ -3586,6 +4265,19 @@ s3_recalctimings(svga_t *svga)
                                         svga->hdisp <<= 1;
                                         svga->dots_per_clock <<= 1;
                                         break;
+                                    case 2048:
+                                        if (!svga->interlace) {
+                                            if (svga->dispend >= 1024) {
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                            }
+                                        } else {
+                                            if (svga->dispend >= 512) {
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                            }
+                                        }
+                                        break;
                                     default:
                                         break;
                                 }
@@ -3604,29 +4296,6 @@ s3_recalctimings(svga_t *svga)
                     default:
                         break;
                 }
-#ifdef OLD_CODE_REFERENCE
-                if ((s3->chip != S3_VISION964) && (s3->card_type != S3_SPEA_MIRAGE_86C801) && (s3->card_type != S3_SPEA_MIRAGE_86C805)) {
-                    if (s3->chip == S3_86C928)
-                        svga->hdisp <<= 1;
-                    else if (s3->chip != S3_VISION968)
-                        svga->hdisp >>= 1;
-                }
-                if ((s3->chip != S3_VISION868) && (s3->chip != S3_TRIO32) && (s3->chip != S3_TRIO64) && (s3->chip != S3_VISION964)) {
-                    if (s3->width == 1280 || s3->width == 1600)
-                        svga->hdisp <<= 1;
-                    else if (s3->card_type == S3_NUMBER9_9FX_771)
-                        svga->hdisp <<= 1;
-                }
-                if (s3->card_type == S3_MIROVIDEO40SV_ERGO_968 || s3->card_type == S3_PHOENIX_VISION968 || s3->card_type == S3_SPEA_MERCURY_P64V) {
-                    if (svga->hdisp == (1408 * 2))
-                        svga->hdisp >>= 1;
-                    else
-                        svga->hdisp = s3->width;
-                }
-
-                if (s3->card_type == S3_SPEA_MIRAGE_86C801 || s3->card_type == S3_SPEA_MIRAGE_86C805 || s3->card_type == S3_SPEA_MERCURY_LITE_PCI)
-                    svga->hdisp = s3->width;
-#endif
                 break;
             case 16:
                 svga->render = svga_render_16bpp_highres;
@@ -3652,6 +4321,7 @@ s3_recalctimings(svga_t *svga)
                         switch (s3->card_type) {
                             case S3_MIROCRYSTAL8S_805:
                             case S3_MIROCRYSTAL10SD_805:
+                            case S3_WINNER1000_805:
                             case S3_PHOENIX_86C805:
                             case S3_86C805_ONBOARD:
                                 svga->hdisp >>= 1;
@@ -3681,8 +4351,10 @@ s3_recalctimings(svga_t *svga)
                     case S3_86C928:
                         switch (s3->card_type) {
                             case S3_METHEUS_86C928:
+                                s3_log("928 16bpp: ClockSel=%02x, width=%d, hdisp=%d, dotsperclock=%d.\n", clk_sel, s3->width, svga->hdisp, svga->dots_per_clock);
                                 svga->hdisp <<= 1;
                                 svga->dots_per_clock <<= 1;
+                                svga->clock *= 2.0;
                                 switch (svga->hdisp) { /*This might be a driver issue*/
                                     case 800:
                                         s3->width = 1024;
@@ -3694,6 +4366,28 @@ s3_recalctimings(svga_t *svga)
                                         break;
                                 }
                                 break;
+                            case S3_ELSAWIN1K_86C928:
+                            case S3_ELSAWIN2K_86C928:
+                                switch (s3->width) {
+                                    case 2048:
+                                        if (s3->ramdac_type == SC1502X) {
+                                            svga->hdisp >>= 1;
+                                            svga->dots_per_clock >>= 1;
+                                        } else {
+                                            svga->hdisp <<= 1;
+                                            svga->dots_per_clock <<= 1;
+                                        }
+                                        break;
+                                    default:
+                                        if (s3->ramdac_type == BT48X)
+                                            svga->clock /= 2.0;
+                                        else if (s3->ramdac_type == SC1502X) {
+                                            svga->hdisp >>= 1;
+                                            svga->dots_per_clock >>= 1;
+                                        }
+                                        break;
+                                }
+                                break;
 
                             default:
                                 break;
@@ -3701,6 +4395,10 @@ s3_recalctimings(svga_t *svga)
                         break;
                     case S3_86C928PCI:
                         switch (s3->card_type) {
+                            case S3_ELSAWIN1KPCI_86C928:
+                                svga->hdisp >>= 1;
+                                svga->dots_per_clock >>= 1;
+                                break;
                             case S3_SPEA_MERCURY_LITE_PCI:
                                 switch (s3->width) {
                                     case 640:
@@ -3741,6 +4439,19 @@ s3_recalctimings(svga_t *svga)
                                         svga->hdisp <<= 1;
                                         svga->dots_per_clock <<= 1;
                                         break;
+                                    case 2048:
+                                        if (!svga->interlace) {
+                                            if (svga->dispend >= 1024) {
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                            }
+                                        } else {
+                                            if (svga->dispend >= 512) {
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                            }
+                                        }
+                                        break;
                                     default:
                                         break;
                                 }
@@ -3752,10 +4463,17 @@ s3_recalctimings(svga_t *svga)
                         break;
                     case S3_VISION968:
                         switch (s3->card_type) {
+                            case S3_MIROVIDEO40SV_ERGO_968:
+                                if (svga->hdisp == 832)
+                                    svga->hdisp -= 32;
+                                break;
+                            case S3_DIAMOND_STEALTH64_968:
                             case S3_NUMBER9_9FX_771:
                             case S3_PHOENIX_VISION968:
+                            case S3_SPEA_MERCURY_P64V:
                                 svga->hdisp <<= 1;
                                 svga->dots_per_clock <<= 1;
+                                svga->clock *= 2.0;
                                 /* TODO: Is this still needed? */
                                 if (svga->hdisp == 832)
                                     svga->hdisp -= 32;
@@ -3768,6 +4486,19 @@ s3_recalctimings(svga_t *svga)
                                         svga->hdisp <<= 1;
                                         svga->dots_per_clock <<= 1;
                                         break;
+                                    case 2048:
+                                        if (!svga->interlace) {
+                                            if (svga->dispend >= 1024) {
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                            }
+                                        } else {
+                                            if (svga->dispend >= 512) {
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                            }
+                                        }
+                                        break;
                                     default:
                                         break;
                                 }
@@ -3786,35 +4517,6 @@ s3_recalctimings(svga_t *svga)
                     default:
                         break;
                 }
-
-#ifdef OLD_CODE_REFERENCE
-                if ((s3->card_type == S3_ELSAWIN2KPROX_964) || (s3->card_type == S3_ELSAWIN2KPROX)) {
-                    if (s3->width == 1280 || s3->width == 1600)
-                        svga->hdisp <<= 1;
-                }
-                if ((s3->chip != S3_VISION964) && (s3->card_type != S3_SPEA_MIRAGE_86C801) && (s3->card_type != S3_SPEA_MIRAGE_86C805)) {
-                    if (s3->chip == S3_86C928)
-                        svga->hdisp <<= 1;
-                    else if (s3->chip != S3_VISION968)
-                        svga->hdisp >>= 1;
-                } else if ((s3->card_type == S3_SPEA_MIRAGE_86C801) || (s3->card_type == S3_SPEA_MIRAGE_86C805))
-                    svga->hdisp >>= 1;
-                if ((s3->chip != S3_VISION868) && (s3->chip != S3_TRIO32) && (s3->chip != S3_TRIO64) && (s3->chip != S3_VISION964)) {
-                    if (s3->width == 1280 || s3->width == 1600)
-                        svga->hdisp <<= 1;
-                    else if (s3->card_type == S3_NUMBER9_9FX_771)
-                        svga->hdisp <<= 1;
-                }
-                if (s3->card_type == S3_MIROVIDEO40SV_ERGO_968 || s3->card_type == S3_PHOENIX_VISION968 || s3->card_type == S3_SPEA_MERCURY_P64V) {
-                    if (svga->hdisp == (1408 << 1))
-                        svga->hdisp >>= 1;
-                    else
-                        svga->hdisp = s3->width;
-                }
-
-                if (s3->card_type == S3_SPEA_MIRAGE_86C801 || s3->card_type == S3_SPEA_MIRAGE_86C805 || s3->card_type == S3_SPEA_MERCURY_LITE_PCI)
-                    svga->hdisp = s3->width;
-#endif
                 break;
             case 24:
                 svga->render = svga_render_24bpp_highres;
@@ -3847,6 +4549,7 @@ s3_recalctimings(svga_t *svga)
                         switch (s3->card_type) {
                             case S3_MIROCRYSTAL8S_805:
                             case S3_MIROCRYSTAL10SD_805:
+                            case S3_WINNER1000_805:
                             case S3_PHOENIX_86C805:
                             case S3_SPEA_MIRAGE_86C805:
                             case S3_86C805_ONBOARD:
@@ -3870,6 +4573,18 @@ s3_recalctimings(svga_t *svga)
                     case S3_VISION864:
                         svga->hdisp = (svga->hdisp << 1) / 3;
                         svga->dots_per_clock = (svga->dots_per_clock << 1) / 3;
+                        svga->clock /= (2.0 / 3.0);
+                        break;
+
+                    case S3_VISION968:
+                        switch (s3->card_type) {
+                            case S3_MIROVIDEO40SV_ERGO_968:
+                                svga->hdisp = (svga->hdisp / 3) << 2;
+                                svga->dots_per_clock = (svga->hdisp / 3) << 2;
+                                break;
+                            default:
+                                break;
+                        }
                         break;
 
                     case S3_TRIO64:
@@ -3881,44 +4596,43 @@ s3_recalctimings(svga_t *svga)
                     default:
                         break;
                 }
-#ifdef OLD_CODE_REFERENCE
-                if (s3->chip != S3_VISION968) {
-                    if (s3->chip != S3_86C928 && s3->chip != S3_86C801 && s3->chip != S3_86C805)
-                        svga->hdisp /= 3;
-                    else
-                        svga->hdisp = (svga->hdisp * 2) / 3;
-
-                    if (s3->card_type == S3_SPEA_MERCURY_LITE_PCI) {
-                        if (s3->width == 2048) {
-                            switch (svga->dispend) {
-                                case 480:
-                                    svga->hdisp = 640;
-                                    break;
-
-                                default:
-                                    break;
-                            }
-                        }
-                    } else if (s3->chip == S3_86C924) {
-                        if (svga->dispend == 480)
-                            svga->hdisp = 640;
-                    }
-                } else {
-                    if ((s3->card_type == S3_MIROVIDEO40SV_ERGO_968) ||
-                        (s3->card_type == S3_PHOENIX_VISION968) || (s3->card_type == S3_SPEA_MERCURY_P64V))
-                        svga->hdisp = s3->width;
-                }
-#endif
                 break;
             case 32:
                 svga->render = svga_render_32bpp_highres;
                 switch (s3->chip) {
+                    case S3_86C928:
+                        switch (s3->card_type) {
+                            case S3_ELSAWIN1K_86C928:
+                                svga->hdisp >>= 2;
+                                svga->dots_per_clock >>= 2;
+                                svga->clock *= 2.0;
+                                break;
+                            default:
+                                break;
+                        }
+                        break;
+                    case S3_86C928PCI:
+                        switch (s3->card_type) {
+                            case S3_ELSAWIN1KPCI_86C928:
+                                svga->hdisp >>= 2;
+                                svga->dots_per_clock >>= 2;
+                                svga->clock *= 2.0;
+                                break;
+                            default:
+                                break;
+                        }
+                        break;
+                    case S3_VISION864:
+                        svga->hdisp >>= 2;
+                        svga->dots_per_clock >>= 2;
+                        break;
                     case S3_VISION868:
                         switch (s3->card_type) {
                             case S3_PHOENIX_VISION868:
                             case S3_NUMBER9_9FX_531:
                                 svga->hdisp >>= 1;
                                 svga->dots_per_clock >>= 1;
+                                svga->clock /= 2.0;
                                 break;
                             default:
                                 break;
@@ -3932,6 +4646,7 @@ s3_recalctimings(svga_t *svga)
                                     case 1024:
                                         svga->hdisp >>= 1;
                                         svga->dots_per_clock >>= 1;
+                                        svga->clock /= 2.0;
                                         break;
                                     default:
                                         break;
@@ -3944,6 +4659,19 @@ s3_recalctimings(svga_t *svga)
                                         svga->hdisp <<= 1;
                                         svga->dots_per_clock <<= 1;
                                         break;
+                                    case 2048:
+                                        if (!svga->interlace) {
+                                            if (svga->dispend >= 1024) {
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                            }
+                                        } else {
+                                            if (svga->dispend >= 512) {
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                            }
+                                        }
+                                        break;
                                     default:
                                         break;
                                 }
@@ -3954,10 +4682,17 @@ s3_recalctimings(svga_t *svga)
                         break;
                     case S3_VISION968:
                         switch (s3->card_type) {
+                            case S3_MIROVIDEO40SV_ERGO_968:
+                                if (svga->hdisp == 832)
+                                    svga->hdisp -= 32;
+                                break;
+                            case S3_DIAMOND_STEALTH64_968:
                             case S3_NUMBER9_9FX_771:
                             case S3_PHOENIX_VISION968:
+                            case S3_SPEA_MERCURY_P64V:
                                 svga->hdisp <<= 1;
                                 svga->dots_per_clock <<= 1;
+                                svga->clock *= 2.0;
                                 /* TODO: Is this still needed? */
                                 if (svga->hdisp == 832)
                                     svga->hdisp -= 32;
@@ -3970,6 +4705,19 @@ s3_recalctimings(svga_t *svga)
                                         svga->hdisp <<= 1;
                                         svga->dots_per_clock <<= 1;
                                         break;
+                                    case 2048:
+                                        if (!svga->interlace) {
+                                            if (svga->dispend >= 1024) {
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                            }
+                                        } else {
+                                            if (svga->dispend >= 512) {
+                                                svga->hdisp <<= 1;
+                                                svga->dots_per_clock <<= 1;
+                                            }
+                                        }
+                                        break;
                                     default:
                                         break;
                                 }
@@ -3982,68 +4730,41 @@ s3_recalctimings(svga_t *svga)
                     default:
                         break;
                 }
-#ifdef OLD_CODE_REFERENCE
-                if ((s3->chip < S3_TRIO32) && (s3->chip != S3_VISION964) && (s3->chip != S3_VISION968) && (s3->chip != S3_86C928)) {
-                    if (s3->chip == S3_VISION868)
-                        svga->hdisp >>= 1;
-                    else
-                        svga->hdisp >>= 2;
-                }
-                if (s3->width == 1280 || s3->width == 1600 || (s3->card_type == S3_SPEA_MERCURY_P64V || s3->card_type == S3_NUMBER9_9FX_771))
-                    svga->hdisp <<= 1;
-                if (s3->card_type == S3_NUMBER9_9FX_771) {
-                    if (svga->hdisp == 832)
-                        svga->hdisp -= 32;
-                }
-                if (s3->card_type == S3_MIROVIDEO40SV_ERGO_968 || s3->card_type == S3_MIROCRYSTAL20SV_964 || s3->card_type == S3_MIROCRYSTAL20SD_864 || s3->card_type == S3_PHOENIX_VISION968 || s3->card_type == S3_SPEA_MERCURY_P64V) {
-                    svga->hdisp = s3->width;
-                    if (s3->card_type == S3_MIROCRYSTAL20SD_864 || s3->card_type == S3_MIROCRYSTAL20SV_964) {
-                        if (s3->width == 800 || s3->width == 1024 || s3->width == 1600) {
-                            switch (svga->dispend) {
-                                case 400:
-                                case 480:
-                                    svga->hdisp = 640;
-                                    break;
-
-                                case 576:
-                                    if (s3->width == 1600)
-                                        s3->width = 800;
-                                    svga->hdisp = 768;
-                                    break;
-
-                                case 600:
-                                    if (s3->width == 1600)
-                                        s3->width = 800;
-                                    svga->hdisp = 800;
-                                    break;
-
-                                default:
-                                    break;
-                            }
-                        }
-                    }
-                }
-#endif
                 break;
 
             default:
                 break;
         }
+        svga->vram_display_mask = s3->vram_mask;
     } else {
-        svga->vram_display_mask = (svga->crtc[0x32] & 0x40) ? 0x3ffff : s3->vram_mask;
-        if (!svga->scrblank && (svga->crtc[0x17] & 0x80) && svga->attr_palette_enable) {
-            if ((svga->gdcreg[6] & 1) || (svga->attrregs[0x10] & 1)) {
-                if (svga->crtc[0x31] & 0x08) {
-                    svga->vram_display_mask = s3->vram_mask;
-                    if (svga->bpp == 8) {
-                        /*Enhanced 4bpp mode, just like the 8bpp mode per the spec. */
-                        svga->render = svga_render_8bpp_highres;
-                        svga->rowoffset <<= 1;
-                    }
-                }
+        if (svga->crtc[0x31] & 0x08) {
+            if (!(svga->crtc[0x5e] & 0x04))
+                svga->vblankstart = svga->dispend; /*Applies only to Enhanced modes*/
+
+            /*Enhanced 4bpp mode, just like the 8bpp mode per the spec. */
+            svga->render = svga_render_8bpp_highres;
+            svga->rowoffset <<= 1;
+            svga->vram_display_mask = s3->vram_mask;
+        } else {
+            svga->vram_display_mask = (svga->crtc[0x32] & 0x40) ? 0x3ffff : s3->vram_mask;
+            s3_log("CRTC31 bit 0=%x, CRTC32 bit 6=%02x.\n", (svga->crtc[0x31] & 0x01), svga->crtc[0x32] & 0x40);
+            if (!(svga->crtc[0x31] & 0x01)) { /*Bank Enable bit*/
+                svga->write_bank = 0;
+                svga->read_bank = 0;
             }
         }
     }
+
+    if ((((s3->card_type == S3_ELSAWIN1K_86C928) || (s3->card_type == S3_ELSAWIN1KPCI_86C928)) && (svga->bpp == 32)) ||
+        (s3->chip == S3_TRIO32) || (s3->chip == S3_TRIO64) || (s3->chip == S3_VISION864) || (s3->chip == S3_VISION868) || (s3->chip == S3_VISION968))
+        svga->hoverride = 1;
+    else
+        svga->hoverride = 0;
+
+    if (svga->render == svga_render_2bpp_lowres)
+        svga->render = svga_render_2bpp_s3_lowres;
+    else if (svga->render == svga_render_2bpp_highres)
+        svga->render = svga_render_2bpp_s3_highres;
 }
 
 static void
@@ -4068,7 +4789,7 @@ s3_trio64v_recalctimings(svga_t *svga)
         svga->htotal |= 0x100;
     if (svga->crtc[0x5d] & 0x02) {
         svga->hdisp_time |= 0x100;
-        svga->hdisp |= 0x100 * svga->dots_per_clock;
+        svga->hdisp |= (0x100 * svga->dots_per_clock);
     }
     if (svga->crtc[0x5e] & 0x01)
         svga->vtotal |= 0x400;
@@ -4078,8 +4799,15 @@ s3_trio64v_recalctimings(svga_t *svga)
         svga->vblankstart |= 0x400;
     if (svga->crtc[0x5e] & 0x10)
         svga->vsyncstart |= 0x400;
+    svga->split = svga->crtc[0x18];
+    if (svga->crtc[7] & 0x10)
+        svga->split |= 0x100;
+    if (svga->crtc[9] & 0x40)
+        svga->split |= 0x200;
     if (svga->crtc[0x5e] & 0x40)
         svga->split |= 0x400;
+    svga->split++;
+
     svga->interlace = svga->crtc[0x42] & 0x20;
 
     svga->clock = (cpuclock * (double) (1ULL << 32)) / svga->getclock(clk_sel, svga->clock_gen);
@@ -4108,11 +4836,11 @@ s3_trio64v_recalctimings(svga_t *svga)
             break;
     }
 
-    if ((svga->crtc[0x33] & 0x20) ||((svga->crtc[0x67] & 0xc) == 0xc)) {
+    if ((svga->crtc[0x33] & 0x20) || ((svga->crtc[0x67] & 0xc) == 0xc)) {
         /* The S3 version of the Cirrus' special blanking mode, with identical behavior. */
-        svga->hblankstart = (((svga->crtc[0x5d] & 0x02) >> 1) << 8) + svga->crtc[1] +
-                            ((svga->crtc[3] >> 5) & 3) + 1;
-        svga->hblank_end_val = ((svga->crtc[3] >> 5) & 3);
+        svga->hblankstart = (((svga->crtc[0x5d] & 0x02) >> 1) << 8) + svga->crtc[1]/* +
+                            ((svga->crtc[3] >> 5) & 3)*/;
+        svga->hblank_end_val = svga->htotal - 1 /* + ((svga->crtc[3] >> 5) & 3)*/;
 
         svga->monitor->mon_overscan_y = 0;
         svga->monitor->mon_overscan_x = 0;
@@ -4120,7 +4848,7 @@ s3_trio64v_recalctimings(svga_t *svga)
         /* Also make sure vertical blanking starts on display end. */
         svga->vblankstart = svga->dispend;
     } else {
-        svga->hblankstart    = (((svga->crtc[0x5d] & 0x04) >> 2) << 8) + svga->crtc[2] + 1;
+        svga->hblankstart    = (((svga->crtc[0x5d] & 0x04) >> 2) << 8) + svga->crtc[2];
 
         /* NOTE: The S3 Trio64V+ datasheet says this is bit 7, but then where is bit 6?
                  The datasheets for the pre-Trio64V+ cards say +64, which implies bit 6,
@@ -4133,7 +4861,7 @@ s3_trio64v_recalctimings(svga_t *svga)
 
     if ((svga->crtc[0x67] & 0xc) != 0xc) /*VGA mode*/
     {
-        svga->ma_latch |= (s3->ma_ext << 16);
+        svga->memaddr_latch |= (s3->ma_ext << 16);
         if (svga->crtc[0x51] & 0x30)
             svga->rowoffset |= (svga->crtc[0x51] & 0x30) << 4;
         else if (svga->crtc[0x43] & 0x04)
@@ -4144,7 +4872,6 @@ s3_trio64v_recalctimings(svga_t *svga)
         svga->lowres = (!!(svga->attrregs[0x10] & 0x40) && !(svga->crtc[0x3a] & 0x10));
 
         if ((svga->crtc[0x3a] & 0x10) && !svga->lowres) {
-            svga->vram_display_mask = s3->vram_mask;
             switch (svga->bpp) {
                 case 8:
                     svga->render = svga_render_8bpp_highres;
@@ -4153,11 +4880,13 @@ s3_trio64v_recalctimings(svga_t *svga)
                     svga->render = svga_render_15bpp_highres;
                     svga->hdisp >>= 1;
                     svga->dots_per_clock >>= 1;
+                    svga->clock /= 2.0;
                     break;
                 case 16:
                     svga->render = svga_render_16bpp_highres;
                     svga->hdisp >>= 1;
                     svga->dots_per_clock >>= 1;
+                    svga->clock /= 2.0;
                     break;
                 case 24:
                     svga->render = svga_render_24bpp_highres;
@@ -4171,15 +4900,20 @@ s3_trio64v_recalctimings(svga_t *svga)
                 default:
                     break;
             }
-        } else
+            svga->vram_display_mask = s3->vram_mask;
+        } else {
             svga->vram_display_mask = (svga->crtc[0x32] & 0x40) ? 0x3ffff : s3->vram_mask;
-
+            if (!(svga->crtc[0x31] & 0x01)) { /*Bank Enable bit*/
+                svga->write_bank = 0;
+                svga->read_bank = 0;
+            }
+        }
     } else /*Streams mode*/
     {
         if (s3->streams.buffer_ctrl & 1)
-            svga->ma_latch = s3->streams.pri_fb1 >> 2;
+            svga->memaddr_latch = s3->streams.pri_fb1 >> 2;
         else
-            svga->ma_latch = s3->streams.pri_fb0 >> 2;
+            svga->memaddr_latch = s3->streams.pri_fb0 >> 2;
 
         svga->hdisp = s3->streams.pri_w + 1;
         if (s3->streams.pri_h < svga->dispend)
@@ -4195,25 +4929,25 @@ s3_trio64v_recalctimings(svga_t *svga)
             svga->overlay.addr = s3->streams.sec_fb0;
 
         svga->overlay.ena   = (svga->overlay.x >= 0);
+        svga->overlay.h_acc = s3->streams.dda_horiz_accumulator;
         svga->overlay.v_acc = s3->streams.dda_vert_accumulator;
         svga->rowoffset     = s3->streams.pri_stride >> 3;
 
-        svga->vram_display_mask = s3->vram_mask;
+        if (svga->overlay.ena) {
+            svga->overlay.ena = (((s3->streams.blend_ctrl >> 24) & 7) == 0b000) ||
+                                (((s3->streams.blend_ctrl >> 24) & 7) == 0b101);
+        }
         switch ((s3->streams.pri_ctrl >> 24) & 0x7) {
             case 0: /*RGB-8 (CLUT)*/
                 svga->render = svga_render_8bpp_highres;
                 break;
             case 3: /*KRGB-16 (1.5.5.5)*/
-                svga->htotal >>= 1;
-                svga->hblankstart >>= 1;
-                svga->hblank_end_val >>= 1;
                 svga->render = svga_render_15bpp_highres;
+                svga->clock /= 2.0;
                 break;
             case 5: /*RGB-16 (5.6.5)*/
-                svga->htotal >>= 1;
-                svga->hblankstart >>= 1;
-                svga->hblank_end_val >>= 1;
                 svga->render = svga_render_16bpp_highres;
+                svga->clock /= 2.0;
                 break;
             case 6: /*RGB-24 (8.8.8)*/
                 svga->render = svga_render_24bpp_highres;
@@ -4225,13 +4959,22 @@ s3_trio64v_recalctimings(svga_t *svga)
             default:
                 break;
         }
+        svga->vram_display_mask = s3->vram_mask;
     }
+
+    svga->hoverride = 1;
+
+    if (svga->render == svga_render_2bpp_lowres)
+        svga->render = svga_render_2bpp_s3_lowres;
+    else if (svga->render == svga_render_2bpp_highres)
+        svga->render = svga_render_2bpp_s3_highres;
 }
 
 static void
 s3_updatemapping(s3_t *s3)
 {
     svga_t *svga = &s3->svga;
+    xga_t  *xga  = (xga_t *) svga->xga;
 
     if (s3->pci && !(s3->pci_regs[PCI_REG_COMMAND] & PCI_COMMAND_MEM)) {
         mem_mapping_disable(&svga->mapping);
@@ -4244,9 +4987,14 @@ s3_updatemapping(s3_t *s3)
     /*Banked framebuffer*/
     if (svga->crtc[0x31] & 0x08) /*Enhanced mode mappings*/
     {
+        s3_log("Enhanced Mode Mapping.\n");
         /* Enhanced mode forces 64kb at 0xa0000*/
         mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
         svga->banked_mask = 0xffff;
+        if (xga_active && (svga->xga != NULL)) {
+            xga->on = 0;
+            mem_mapping_set_handler(&svga->mapping, svga->read, svga->readw, svga->readl, svga->write, svga->writew, svga->writel);
+        }
     } else
         switch (svga->gdcreg[6] & 0xc) { /*VGA mapping*/
             case 0x0: /*128k at A0000*/
@@ -4256,6 +5004,10 @@ s3_updatemapping(s3_t *s3)
             case 0x4: /*64k at A0000*/
                 mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
                 svga->banked_mask = 0xffff;
+                if (xga_active && (svga->xga != NULL)) {
+                    xga->on = 0;
+                    mem_mapping_set_handler(&svga->mapping, svga->read, svga->readw, svga->readl, svga->write, svga->writew, svga->writel);
+                }
                 break;
             case 0x8: /*32k at B0000*/
                 mem_mapping_set_addr(&svga->mapping, 0xb0000, 0x08000);
@@ -4276,10 +5028,9 @@ s3_updatemapping(s3_t *s3)
         if (s3->chip >= S3_86C928 && s3->chip <= S3_86C805) {
             if (s3->vlb)
                 s3->linear_base &= 0x03ffffff;
-            else
+            else if (!s3->pci)
                 s3->linear_base &= 0x00ffffff;
         }
-
         if ((svga->crtc[0x58] & 0x10) || (s3->accel.advfunc_cntl & 0x10)) {
             /*Linear framebuffer*/
             mem_mapping_disable(&svga->mapping);
@@ -4313,10 +5064,10 @@ s3_updatemapping(s3_t *s3)
                     break;
             }
             s3->linear_base &= ~(s3->linear_size - 1);
-            if (s3->linear_base == 0xa0000) {
+            if ((s3->linear_base == 0xa0000) || (s3->linear_size == 0x10000)) {
                 mem_mapping_disable(&s3->linear_mapping);
                 if (!(svga->crtc[0x53] & 0x10)) {
-                    mem_mapping_set_addr(&svga->mapping, s3->linear_base, 0x10000);
+                    mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
                     svga->banked_mask = 0xffff;
                 }
             } else {
@@ -4325,7 +5076,11 @@ s3_updatemapping(s3_t *s3)
                 else if ((s3->chip == S3_VISION968) || (s3->chip == S3_VISION868))
                     s3->linear_base &= 0xfe000000;
 
-                mem_mapping_set_addr(&s3->linear_mapping, s3->linear_base, s3->linear_size);
+                s3_log("LinearBase update=%x, size=%x.\n", s3->linear_base, s3->linear_size);
+                if (s3->linear_base)
+                    mem_mapping_set_addr(&s3->linear_mapping, s3->linear_base, s3->linear_size);
+                else
+                    mem_mapping_disable(&s3->linear_mapping);
             }
             svga->fb_only = 1;
         } else {
@@ -4334,6 +5089,7 @@ s3_updatemapping(s3_t *s3)
         }
 
         /* Memory mapped I/O. */
+        s3_log("CRTC53=%02x, SEQREG9=%02x.\n", svga->crtc[0x53] & 0x18, svga->seqregs[9] & 0x80);
         if ((svga->crtc[0x53] & 0x10) || (s3->accel.advfunc_cntl & 0x20)) {
             mem_mapping_disable(&svga->mapping);
             if (s3->chip >= S3_TRIO64V) {
@@ -4341,16 +5097,19 @@ s3_updatemapping(s3_t *s3)
                     mem_mapping_set_addr(&s3->mmio_mapping, 0xb8000, 0x8000);
                 else
                     mem_mapping_set_addr(&s3->mmio_mapping, 0xa0000, 0x10000);
-            }
-            mem_mapping_enable(&s3->mmio_mapping);
+            } else
+                mem_mapping_enable(&s3->mmio_mapping);
         } else {
             mem_mapping_disable(&s3->mmio_mapping);
         }
 
         /* New MMIO. */
-        if (svga->crtc[0x53] & 0x08)
-            mem_mapping_set_addr(&s3->new_mmio_mapping, s3->linear_base + 0x1000000, 0x20000);
-        else
+        if (svga->crtc[0x53] & 0x08) {
+            if (s3->linear_base)
+                mem_mapping_set_addr(&s3->new_mmio_mapping, s3->linear_base + 0x1000000, 0x20000);
+            else
+                mem_mapping_disable(&s3->new_mmio_mapping);
+        } else
             mem_mapping_disable(&s3->new_mmio_mapping);
     }
 }
@@ -4369,6 +5128,7 @@ s3_trio64_getclock(int clock, void *priv)
         return 25175000.0;
     if (clock == 1)
         return 28322000.0;
+
     m  = svga->seqregs[0x13] + 2;
     n1 = (svga->seqregs[0x12] & 0x1f) + 2;
     n2 = ((svga->seqregs[0x12] >> 5) & 0x07);
@@ -4395,11 +5155,12 @@ s3_accel_out(uint16_t port, uint8_t val, void *priv)
             case 0x4148:
             case 0x42e8:
                 s3->subsys_stat &= ~val;
+                s3->accel.subsys_cntl = (s3->accel.subsys_cntl & 0xff00) | val;
                 s3_update_irqs(s3);
                 break;
             case 0x4149:
             case 0x42e9:
-                s3->subsys_cntl = val;
+                s3->accel.subsys_cntl = (s3->accel.subsys_cntl & 0xff) | (val << 8);
                 s3_update_irqs(s3);
                 break;
             case 0x4548:
@@ -4460,7 +5221,7 @@ s3_accel_in(uint16_t port, void *priv)
     s3_t   *s3   = (s3_t *) priv;
     svga_t *svga = &s3->svga;
     int     temp;
-    uint8_t temp2;
+    uint8_t temp2 = 0x00;
 
     if (!s3->enable_8514)
         return 0xff;
@@ -4471,7 +5232,7 @@ s3_accel_in(uint16_t port, void *priv)
             return s3->subsys_stat;
         case 0x4149:
         case 0x42e9:
-            return s3->subsys_cntl;
+            return s3->accel.subsys_cntl >> 8;
 
         case 0x8148:
         case 0x82e8:
@@ -4543,6 +5304,8 @@ s3_accel_in(uint16_t port, void *priv)
         case 0x9548:
         case 0x96e8:
             if (s3->chip >= S3_86C928) {
+                if (s3_enable_fifo(s3))
+                    s3_wait_fifo_idle(s3);
                 return s3->accel.maj_axis_pcnt & 0xff;
             }
             break;
@@ -4565,6 +5328,7 @@ s3_accel_in(uint16_t port, void *priv)
                 if (FIFO_FULL)
                     temp = 0xff;
             }
+            s3_log("Read port=%04x, val=%02x.\n", port, temp);
             return temp;
         case 0x8119:
         case 0x9949:
@@ -4621,6 +5385,7 @@ s3_accel_in(uint16_t port, void *priv)
                     s3->data_available = 0;
                 }
             }
+            s3_log("Read port=%04x, val=%02x.\n", port, temp);
             return temp;
 
         case 0x9d48:
@@ -4645,9 +5410,20 @@ s3_accel_in(uint16_t port, void *priv)
             if (s3->chip >= S3_86C928) {
                 if (s3_enable_fifo(s3))
                     s3_wait_fifo_idle(s3);
-                if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                    temp2 = s3->accel.bkgd_color >> 16;
-                else
+
+                if (s3->bpp == 3) {
+                    if (s3->chip < S3_VISION964) {
+                        if (s3->accel.multifunc[0xe] & 0x10)
+                            temp2 = s3->accel.bkgd_color >> 16;
+                        else
+                            temp2 = s3->accel.bkgd_color & 0xff;
+                    } else {
+                        if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                            temp2 = s3->accel.bkgd_color >> 16;
+                        else
+                            temp2 = s3->accel.bkgd_color & 0xff;
+                    }
+                } else
                     temp2 = s3->accel.bkgd_color & 0xff;
 
                 return temp2;
@@ -4658,13 +5434,34 @@ s3_accel_in(uint16_t port, void *priv)
             if (s3->chip >= S3_86C928) {
                 if (s3_enable_fifo(s3))
                     s3_wait_fifo_idle(s3);
-                if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                    temp2 = s3->accel.bkgd_color >> 24;
-                else
+
+                if (s3->bpp == 3) {
+                    if (s3->chip < S3_VISION964) {
+                        if (s3->accel.multifunc[0xe] & 0x10)
+                            temp2 = s3->accel.bkgd_color >> 24;
+                        else
+                            temp2 = s3->accel.bkgd_color >> 8;
+
+                        s3->accel.multifunc[0xe] ^= 0x10;
+                    } else {
+                        if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                            temp2 = s3->accel.bkgd_color >> 24;
+                        else
+                            temp2 = s3->accel.bkgd_color >> 8;
+
+                        if (!(s3->accel.multifunc[0xe] & 0x200))
+                            s3->accel.multifunc[0xe] ^= 0x10;
+                    }
+                } else {
                     temp2 = s3->accel.bkgd_color >> 8;
 
-                if (!(s3->accel.multifunc[0xe] & 0x200))
-                    s3->accel.multifunc[0xe] ^= 0x10;
+                    if (s3->chip < S3_VISION964)
+                        s3->accel.multifunc[0xe] ^= 0x10;
+                    else {
+                        if (!(s3->accel.multifunc[0xe] & 0x200))
+                            s3->accel.multifunc[0xe] ^= 0x10;
+                    }
+                }
                 return temp2;
             }
             break;
@@ -4672,32 +5469,51 @@ s3_accel_in(uint16_t port, void *priv)
         case 0xa2ea:
             if (s3_enable_fifo(s3))
                 s3_wait_fifo_idle(s3);
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                temp2 = s3->accel.bkgd_color & 0xff;
-            else
-                temp2 = s3->accel.bkgd_color >> 16;
 
+            if (s3->accel.multifunc[0xe] & 0x200)
+                temp2 = s3->accel.bkgd_color >> 16;
+            else if (s3->bpp == 3) {
+                if (s3->accel.multifunc[0xe] & 0x10)
+                    temp2 = s3->accel.bkgd_color & 0xff;
+                else
+                    temp2 = s3->accel.bkgd_color >> 16;
+            }
             return temp2;
         case 0xa14b:
         case 0xa2eb:
             if (s3_enable_fifo(s3))
                 s3_wait_fifo_idle(s3);
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                temp2 = s3->accel.bkgd_color >> 8;
-            else
-                temp2 = s3->accel.bkgd_color >> 24;
 
-            if (!(s3->accel.multifunc[0xe] & 0x200))
+            if (s3->accel.multifunc[0xe] & 0x200)
+                temp2 = s3->accel.bkgd_color >> 24;
+            else if (s3->bpp == 3) {
+                if (s3->accel.multifunc[0xe] & 0x10)
+                    temp2 = s3->accel.bkgd_color >> 8;
+                else
+                    temp2 = s3->accel.bkgd_color >> 24;
+
                 s3->accel.multifunc[0xe] ^= 0x10;
+            }
             return temp2;
         case 0xa548:
         case 0xa6e8:
             if (s3->chip >= S3_86C928) {
                 if (s3_enable_fifo(s3))
                     s3_wait_fifo_idle(s3);
-                if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                    temp2 = s3->accel.frgd_color >> 16;
-                else
+
+                if (s3->bpp == 3) {
+                    if (s3->chip < S3_VISION964) {
+                        if (s3->accel.multifunc[0xe] & 0x10)
+                            temp2 = s3->accel.frgd_color >> 16;
+                        else
+                            temp2 = s3->accel.frgd_color & 0xff;
+                    } else {
+                        if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                            temp2 = s3->accel.frgd_color >> 16;
+                        else
+                            temp2 = s3->accel.frgd_color & 0xff;
+                    }
+                } else
                     temp2 = s3->accel.frgd_color & 0xff;
 
                 return temp2;
@@ -4708,13 +5524,34 @@ s3_accel_in(uint16_t port, void *priv)
             if (s3->chip >= S3_86C928) {
                 if (s3_enable_fifo(s3))
                     s3_wait_fifo_idle(s3);
-                if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                    temp2 = s3->accel.frgd_color >> 24;
-                else
+
+                if (s3->bpp == 3) {
+                    if (s3->chip < S3_VISION964) {
+                        if (s3->accel.multifunc[0xe] & 0x10)
+                            temp2 = s3->accel.frgd_color >> 24;
+                        else
+                            temp2 = s3->accel.frgd_color >> 8;
+
+                        s3->accel.multifunc[0xe] ^= 0x10;
+                    } else {
+                        if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                            temp2 = s3->accel.frgd_color >> 24;
+                        else
+                            temp2 = s3->accel.frgd_color >> 8;
+
+                        if (!(s3->accel.multifunc[0xe] & 0x200))
+                            s3->accel.multifunc[0xe] ^= 0x10;
+                    }
+                } else {
                     temp2 = s3->accel.frgd_color >> 8;
 
-                if (!(s3->accel.multifunc[0xe] & 0x200))
-                    s3->accel.multifunc[0xe] ^= 0x10;
+                    if (s3->chip < S3_VISION964)
+                        s3->accel.multifunc[0xe] ^= 0x10;
+                    else {
+                        if (!(s3->accel.multifunc[0xe] & 0x200))
+                            s3->accel.multifunc[0xe] ^= 0x10;
+                    }
+                }
                 return temp2;
             }
             break;
@@ -4722,23 +5559,31 @@ s3_accel_in(uint16_t port, void *priv)
         case 0xa6ea:
             if (s3_enable_fifo(s3))
                 s3_wait_fifo_idle(s3);
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                temp2 = s3->accel.frgd_color & 0xff;
-            else
-                temp2 = s3->accel.frgd_color >> 16;
 
+            if (s3->accel.multifunc[0xe] & 0x200)
+                temp2 = s3->accel.frgd_color >> 16;
+            else if (s3->bpp == 3) {
+                if (s3->accel.multifunc[0xe] & 0x10)
+                    temp2 = s3->accel.frgd_color & 0xff;
+                else
+                    temp2 = s3->accel.frgd_color >> 16;
+            }
             return temp2;
         case 0xa54b:
         case 0xa6eb:
             if (s3_enable_fifo(s3))
                 s3_wait_fifo_idle(s3);
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                temp2 = s3->accel.frgd_color >> 8;
-            else
-                temp2 = s3->accel.frgd_color >> 24;
 
-            if (!(s3->accel.multifunc[0xe] & 0x200))
+            if (s3->accel.multifunc[0xe] & 0x200)
+                temp2 = s3->accel.frgd_color >> 24;
+            else if (s3->bpp == 3) {
+                if (s3->accel.multifunc[0xe] & 0x10)
+                    temp2 = s3->accel.frgd_color >> 8;
+                else
+                    temp2 = s3->accel.frgd_color >> 24;
+
                 s3->accel.multifunc[0xe] ^= 0x10;
+            }
             return temp2;
 
         case 0xa948:
@@ -4746,9 +5591,20 @@ s3_accel_in(uint16_t port, void *priv)
             if (s3->chip >= S3_86C928) {
                 if (s3_enable_fifo(s3))
                     s3_wait_fifo_idle(s3);
-                if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                    temp2 = s3->accel.wrt_mask >> 16;
-                else
+
+                if (s3->bpp == 3) {
+                    if (s3->chip < S3_VISION964) {
+                        if (s3->accel.multifunc[0xe] & 0x10)
+                            temp2 = s3->accel.wrt_mask >> 16;
+                        else
+                            temp2 = s3->accel.wrt_mask & 0xff;
+                    } else {
+                        if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                            temp2 = s3->accel.wrt_mask >> 16;
+                        else
+                            temp2 = s3->accel.wrt_mask & 0xff;
+                    }
+                } else
                     temp2 = s3->accel.wrt_mask & 0xff;
 
                 return temp2;
@@ -4759,13 +5615,34 @@ s3_accel_in(uint16_t port, void *priv)
             if (s3->chip >= S3_86C928) {
                 if (s3_enable_fifo(s3))
                     s3_wait_fifo_idle(s3);
-                if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                    temp2 = s3->accel.wrt_mask >> 24;
-                else
+
+                if (s3->bpp == 3) {
+                    if (s3->chip < S3_VISION964) {
+                        if (s3->accel.multifunc[0xe] & 0x10)
+                            temp2 = s3->accel.wrt_mask >> 24;
+                        else
+                            temp2 = s3->accel.wrt_mask >> 8;
+
+                        s3->accel.multifunc[0xe] ^= 0x10;
+                    } else {
+                        if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                            temp2 = s3->accel.wrt_mask >> 24;
+                        else
+                            temp2 = s3->accel.wrt_mask >> 8;
+
+                        if (!(s3->accel.multifunc[0xe] & 0x200))
+                            s3->accel.multifunc[0xe] ^= 0x10;
+                    }
+                } else {
                     temp2 = s3->accel.wrt_mask >> 8;
 
-                if (!(s3->accel.multifunc[0xe] & 0x200))
-                    s3->accel.multifunc[0xe] ^= 0x10;
+                    if (s3->chip < S3_VISION964)
+                        s3->accel.multifunc[0xe] ^= 0x10;
+                    else {
+                        if (!(s3->accel.multifunc[0xe] & 0x200))
+                            s3->accel.multifunc[0xe] ^= 0x10;
+                    }
+                }
                 return temp2;
             }
             break;
@@ -4773,23 +5650,31 @@ s3_accel_in(uint16_t port, void *priv)
         case 0xaaea:
             if (s3_enable_fifo(s3))
                 s3_wait_fifo_idle(s3);
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                temp2 = s3->accel.wrt_mask & 0xff;
-            else
-                temp2 = s3->accel.wrt_mask >> 16;
 
+            if (s3->accel.multifunc[0xe] & 0x200)
+                temp2 = s3->accel.wrt_mask >> 16;
+            else if (s3->bpp == 3) {
+                if (s3->accel.multifunc[0xe] & 0x10)
+                    temp2 = s3->accel.wrt_mask & 0xff;
+                else
+                    temp2 = s3->accel.wrt_mask >> 16;
+            }
             return temp2;
         case 0xa94b:
         case 0xaaeb:
             if (s3_enable_fifo(s3))
                 s3_wait_fifo_idle(s3);
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                temp2 = s3->accel.wrt_mask >> 8;
-            else
-                temp2 = s3->accel.wrt_mask >> 24;
 
-            if (!(s3->accel.multifunc[0xe] & 0x200))
+            if (s3->accel.multifunc[0xe] & 0x200)
+                temp2 = s3->accel.wrt_mask >> 24;
+            else if (s3->bpp == 3) {
+                if (s3->accel.multifunc[0xe] & 0x10)
+                    temp2 = s3->accel.wrt_mask >> 8;
+                else
+                    temp2 = s3->accel.wrt_mask >> 24;
+
                 s3->accel.multifunc[0xe] ^= 0x10;
+            }
             return temp2;
 
         case 0xad48:
@@ -4797,9 +5682,20 @@ s3_accel_in(uint16_t port, void *priv)
             if (s3->chip >= S3_86C928) {
                 if (s3_enable_fifo(s3))
                     s3_wait_fifo_idle(s3);
-                if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                    temp2 = s3->accel.rd_mask >> 16;
-                else
+
+                if (s3->bpp == 3) {
+                    if (s3->chip < S3_VISION964) {
+                        if (s3->accel.multifunc[0xe] & 0x10)
+                            temp2 = s3->accel.rd_mask >> 16;
+                        else
+                            temp2 = s3->accel.rd_mask & 0xff;
+                    } else {
+                        if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                            temp2 = s3->accel.rd_mask >> 16;
+                        else
+                            temp2 = s3->accel.rd_mask & 0xff;
+                    }
+                } else
                     temp2 = s3->accel.rd_mask & 0xff;
 
                 return temp2;
@@ -4810,13 +5706,35 @@ s3_accel_in(uint16_t port, void *priv)
             if (s3->chip >= S3_86C928) {
                 if (s3_enable_fifo(s3))
                     s3_wait_fifo_idle(s3);
-                if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                    temp2 = s3->accel.rd_mask >> 24;
-                else
+
+                if (s3->bpp == 3) {
+                    if (s3->chip < S3_VISION964) {
+                        if (s3->accel.multifunc[0xe] & 0x10)
+                            temp2 = s3->accel.rd_mask >> 24;
+                        else
+                            temp2 = s3->accel.rd_mask >> 8;
+
+                        s3->accel.multifunc[0xe] ^= 0x10;
+                    } else {
+                        if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                            temp2 = s3->accel.rd_mask >> 24;
+                        else
+                            temp2 = s3->accel.rd_mask >> 8;
+
+                        if (!(s3->accel.multifunc[0xe] & 0x200))
+                            s3->accel.multifunc[0xe] ^= 0x10;
+                    }
+                } else {
                     temp2 = s3->accel.rd_mask >> 8;
 
-                if (!(s3->accel.multifunc[0xe] & 0x200))
-                    s3->accel.multifunc[0xe] ^= 0x10;
+                    if (s3->chip < S3_VISION964)
+                        s3->accel.multifunc[0xe] ^= 0x10;
+                    else {
+                        if (!(s3->accel.multifunc[0xe] & 0x200))
+                            s3->accel.multifunc[0xe] ^= 0x10;
+                    }
+                }
+
                 return temp2;
             }
             break;
@@ -4824,23 +5742,31 @@ s3_accel_in(uint16_t port, void *priv)
         case 0xaeea:
             if (s3_enable_fifo(s3))
                 s3_wait_fifo_idle(s3);
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                temp2 = s3->accel.rd_mask & 0xff;
-            else
-                temp2 = s3->accel.rd_mask >> 16;
 
+            if (s3->accel.multifunc[0xe] & 0x200)
+                temp2 = s3->accel.rd_mask >> 16;
+            else if (s3->bpp == 3) {
+                if (s3->accel.multifunc[0xe] & 0x10)
+                    temp2 = s3->accel.rd_mask & 0xff;
+                else
+                    temp2 = s3->accel.rd_mask >> 16;
+            }
             return temp2;
         case 0xad4b:
         case 0xaeeb:
             if (s3_enable_fifo(s3))
                 s3_wait_fifo_idle(s3);
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                temp2 = s3->accel.rd_mask >> 8;
-            else
-                temp2 = s3->accel.rd_mask >> 24;
 
-            if (!(s3->accel.multifunc[0xe] & 0x200))
+            if (s3->accel.multifunc[0xe] & 0x200)
+                temp2 = s3->accel.rd_mask >> 24;
+            else if (s3->bpp == 3) {
+                if (s3->accel.multifunc[0xe] & 0x10)
+                    temp2 = s3->accel.rd_mask >> 8;
+                else
+                    temp2 = s3->accel.rd_mask >> 24;
+
                 s3->accel.multifunc[0xe] ^= 0x10;
+            }
             return temp2;
 
         case 0xb148:
@@ -4917,33 +5843,58 @@ s3_accel_in(uint16_t port, void *priv)
             if (s3->chip >= S3_86C928) {
                 if (s3_enable_fifo(s3))
                     s3_wait_fifo_idle(s3);
-                temp = s3->accel.multifunc[0xf] & 0xf;
-                switch (temp) {
-                    case 0x0:
-                        return s3->accel.multifunc[0x0] & 0xff;
-                    case 0x1:
-                        return s3->accel.multifunc[0x1] & 0xff;
-                    case 0x2:
-                        return s3->accel.multifunc[0x2] & 0xff;
-                    case 0x3:
-                        return s3->accel.multifunc[0x3] & 0xff;
-                    case 0x4:
-                        return s3->accel.multifunc[0x4] & 0xff;
-                    case 0x5:
-                        return s3->accel.multifunc[0xa] & 0xff;
-                    case 0x6:
-                        return s3->accel.multifunc[0xe] & 0xff;
-                    case 0x7:
-                        return s3->accel.cmd & 0xff;
-                    case 0x8:
-                        return s3->accel.subsys_cntl & 0xff;
-                    case 0x9:
-                        return s3->accel.setup_md & 0xff;
-                    case 0xa:
-                        return s3->accel.multifunc[0xd] & 0xff;
+                if (s3->chip >= S3_VISION964) {
+                    temp = s3->accel.multifunc[0xf] & 0xf;
+                    switch (temp) {
+                        case 0x0:
+                            return s3->accel.multifunc[0x0] & 0xff;
+                        case 0x1:
+                            return s3->accel.multifunc[0x1] & 0xff;
+                        case 0x2:
+                            return s3->accel.multifunc[0x2] & 0xff;
+                        case 0x3:
+                            return s3->accel.multifunc[0x3] & 0xff;
+                        case 0x4:
+                            return s3->accel.multifunc[0x4] & 0xff;
+                        case 0x5:
+                            return s3->accel.multifunc[0xa] & 0xff;
+                        case 0x6:
+                            return s3->accel.multifunc[0xe] & 0xff;
+                        case 0x7:
+                            return s3->accel.cmd & 0xff;
+                        case 0x8:
+                            return s3->accel.subsys_cntl & 0xff;
+                        case 0x9:
+                            return s3->accel.setup_md & 0xff;
+                        case 0xa:
+                            return s3->accel.multifunc[0xd] & 0xff;
 
-                    default:
-                        break;
+                        default:
+                            break;
+                    }
+                } else {
+                    temp = s3->accel.multifunc[0xf] & 7;
+                    switch (temp) {
+                        case 0x0:
+                            return s3->accel.multifunc[0x0] & 0xff;
+                        case 0x1:
+                            return s3->accel.multifunc[0x1] & 0xff;
+                        case 0x2:
+                            return s3->accel.multifunc[0x2] & 0xff;
+                        case 0x3:
+                            return s3->accel.multifunc[0x3] & 0xff;
+                        case 0x4:
+                            return s3->accel.multifunc[0x4] & 0xff;
+                        case 0x5:
+                            return s3->accel.multifunc[0xa] & 0xff;
+                        case 0x6:
+                            return s3->accel.multifunc[0xe] & 0xff;
+                        case 0x7:
+                            return s3->accel.cmd & 0xff;
+
+                        default:
+                            break;
+                    }
                 }
                 return 0xff;
             }
@@ -4953,34 +5904,60 @@ s3_accel_in(uint16_t port, void *priv)
             if (s3->chip >= S3_86C928) {
                 if (s3_enable_fifo(s3))
                     s3_wait_fifo_idle(s3);
-                temp = s3->accel.multifunc[0xf] & 0xf;
-                s3->accel.multifunc[0xf]++;
-                switch (temp) {
-                    case 0x0:
-                        return s3->accel.multifunc[0x0] >> 8;
-                    case 0x1:
-                        return s3->accel.multifunc[0x1] >> 8;
-                    case 0x2:
-                        return s3->accel.multifunc[0x2] >> 8;
-                    case 0x3:
-                        return s3->accel.multifunc[0x3] >> 8;
-                    case 0x4:
-                        return s3->accel.multifunc[0x4] >> 8;
-                    case 0x5:
-                        return s3->accel.multifunc[0xa] >> 8;
-                    case 0x6:
-                        return s3->accel.multifunc[0xe] >> 8;
-                    case 0x7:
-                        return s3->accel.cmd >> 8;
-                    case 0x8:
-                        return (s3->accel.subsys_cntl >> 8) & ~0xe000;
-                    case 0x9:
-                        return (s3->accel.setup_md >> 8) & ~0xf000;
-                    case 0xa:
-                        return s3->accel.multifunc[0xd] >> 8;
+                if (s3->chip >= S3_VISION964) {
+                    temp = s3->accel.multifunc[0xf] & 0xf;
+                    s3->accel.multifunc[0xf] = (s3->accel.multifunc[0xf] + 1) & 0xf;
+                    switch (temp) {
+                        case 0x0:
+                            return s3->accel.multifunc[0x0] >> 8;
+                        case 0x1:
+                            return s3->accel.multifunc[0x1] >> 8;
+                        case 0x2:
+                            return s3->accel.multifunc[0x2] >> 8;
+                        case 0x3:
+                            return s3->accel.multifunc[0x3] >> 8;
+                        case 0x4:
+                            return s3->accel.multifunc[0x4] >> 8;
+                        case 0x5:
+                            return s3->accel.multifunc[0xa] >> 8;
+                        case 0x6:
+                            return s3->accel.multifunc[0xe] >> 8;
+                        case 0x7:
+                            return s3->accel.cmd >> 8;
+                        case 0x8:
+                            return (s3->accel.subsys_cntl >> 8) & ~0xe000;
+                        case 0x9:
+                            return (s3->accel.setup_md >> 8) & ~0xf000;
+                        case 0xa:
+                            return s3->accel.multifunc[0xd] >> 8;
 
-                    default:
-                        break;
+                        default:
+                            break;
+                    }
+                } else {
+                    temp = s3->accel.multifunc[0xf] & 7;
+                    s3->accel.multifunc[0xf] = (s3->accel.multifunc[0xf] + 1) & 7;
+                    switch (temp) {
+                        case 0x0:
+                            return s3->accel.multifunc[0x0] >> 8;
+                        case 0x1:
+                            return s3->accel.multifunc[0x1] >> 8;
+                        case 0x2:
+                            return s3->accel.multifunc[0x2] >> 8;
+                        case 0x3:
+                            return s3->accel.multifunc[0x3] >> 8;
+                        case 0x4:
+                            return s3->accel.multifunc[0x4] >> 8;
+                        case 0x5:
+                            return s3->accel.multifunc[0xa] >> 8;
+                        case 0x6:
+                            return s3->accel.multifunc[0xe] >> 8;
+                        case 0x7:
+                            return s3->accel.cmd >> 8;
+
+                        default:
+                            break;
+                    }
                 }
                 return 0xff;
             }
@@ -4990,21 +5967,27 @@ s3_accel_in(uint16_t port, void *priv)
         case 0xd2e8:
             if (s3_enable_fifo(s3))
                 s3_wait_fifo_idle(s3);
+
             return s3->accel.ropmix & 0xff;
 
         case 0xd149:
         case 0xd2e9:
             if (s3_enable_fifo(s3))
                 s3_wait_fifo_idle(s3);
+
             return s3->accel.ropmix >> 8;
 
         case 0xe548:
         case 0xe6e8:
             if (s3_enable_fifo(s3))
                 s3_wait_fifo_idle(s3);
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                temp2 = s3->accel.pat_bg_color >> 16;
-            else
+
+            if (s3->bpp == 3) {
+                if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                    temp2 = s3->accel.pat_bg_color >> 16;
+                else
+                    temp2 = s3->accel.pat_bg_color & 0xff;
+            } else
                 temp2 = s3->accel.pat_bg_color & 0xff;
 
             return temp2;
@@ -5013,37 +5996,53 @@ s3_accel_in(uint16_t port, void *priv)
         case 0xe6e9:
             if (s3_enable_fifo(s3))
                 s3_wait_fifo_idle(s3);
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                temp2 = s3->accel.pat_bg_color >> 24;
-            else
+
+            if (s3->bpp == 3) {
+                if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                    temp2 = s3->accel.pat_bg_color >> 24;
+                else
+                    temp2 = s3->accel.pat_bg_color >> 8;
+
+                if (!(s3->accel.multifunc[0xe] & 0x200))
+                    s3->accel.multifunc[0xe] ^= 0x10;
+            } else
                 temp2 = s3->accel.pat_bg_color >> 8;
 
             if (!(s3->accel.multifunc[0xe] & 0x200))
                 s3->accel.multifunc[0xe] ^= 0x10;
+
             return temp2;
 
         case 0xe54a:
         case 0xe6ea:
             if (s3_enable_fifo(s3))
                 s3_wait_fifo_idle(s3);
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                temp2 = s3->accel.pat_bg_color & 0xff;
-            else
-                temp2 = s3->accel.pat_bg_color >> 16;
 
+            if (s3->accel.multifunc[0xe] & 0x200)
+                temp2 = s3->accel.pat_bg_color >> 16;
+            else if (s3->bpp == 3) {
+                if (s3->accel.multifunc[0xe] & 0x10)
+                    temp2 = s3->accel.pat_bg_color & 0xff;
+                else
+                    temp2 = s3->accel.pat_bg_color >> 16;
+            }
             return temp2;
 
         case 0xe54b:
         case 0xe6eb:
             if (s3_enable_fifo(s3))
                 s3_wait_fifo_idle(s3);
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                temp2 = s3->accel.pat_bg_color >> 8;
-            else
-                temp2 = s3->accel.pat_bg_color >> 24;
 
-            if (!(s3->accel.multifunc[0xe] & 0x200))
+            if (s3->accel.multifunc[0xe] & 0x200)
+                temp2 = s3->accel.pat_bg_color >> 24;
+            else if (s3->bpp == 3) {
+                if (s3->accel.multifunc[0xe] & 0x10)
+                    temp2 = s3->accel.pat_bg_color >> 8;
+                else
+                    temp2 = s3->accel.pat_bg_color >> 24;
+
                 s3->accel.multifunc[0xe] ^= 0x10;
+            }
             return temp2;
 
         case 0xe948:
@@ -5074,9 +6073,13 @@ s3_accel_in(uint16_t port, void *priv)
         case 0xeee8:
             if (s3_enable_fifo(s3))
                 s3_wait_fifo_idle(s3);
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                temp2 = s3->accel.pat_fg_color >> 16;
-            else
+
+            if (s3->bpp == 3) {
+                if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                    temp2 = s3->accel.pat_fg_color >> 16;
+                else
+                    temp2 = s3->accel.pat_fg_color & 0xff;
+            } else
                 temp2 = s3->accel.pat_fg_color & 0xff;
 
             return temp2;
@@ -5085,48 +6088,64 @@ s3_accel_in(uint16_t port, void *priv)
         case 0xeee9:
             if (s3_enable_fifo(s3))
                 s3_wait_fifo_idle(s3);
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                temp2 = s3->accel.pat_fg_color >> 24;
-            else
+
+            if (s3->bpp == 3) {
+                if ((s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
+                    temp2 = s3->accel.pat_fg_color >> 24;
+                else
+                    temp2 = s3->accel.pat_fg_color >> 8;
+
+                if (!(s3->accel.multifunc[0xe] & 0x200))
+                    s3->accel.multifunc[0xe] ^= 0x10;
+            } else
                 temp2 = s3->accel.pat_fg_color >> 8;
 
             if (!(s3->accel.multifunc[0xe] & 0x200))
                 s3->accel.multifunc[0xe] ^= 0x10;
+
             return temp2;
 
         case 0xed4a:
         case 0xeeea:
             if (s3_enable_fifo(s3))
                 s3_wait_fifo_idle(s3);
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                temp2 = s3->accel.pat_fg_color & 0xff;
-            else
-                temp2 = s3->accel.pat_fg_color >> 16;
 
+            if (s3->accel.multifunc[0xe] & 0x200)
+                temp2 = s3->accel.pat_fg_color >> 16;
+            else if (s3->bpp == 3) {
+                if (s3->accel.multifunc[0xe] & 0x10)
+                    temp2 = s3->accel.pat_fg_color & 0xff;
+                else
+                    temp2 = s3->accel.pat_fg_color >> 16;
+            }
             return temp2;
 
         case 0xed4b:
         case 0xeeeb:
             if (s3_enable_fifo(s3))
                 s3_wait_fifo_idle(s3);
-            if ((s3->bpp == 3) && (s3->accel.multifunc[0xe] & 0x10) && !(s3->accel.multifunc[0xe] & 0x200))
-                temp2 = s3->accel.pat_fg_color >> 8;
-            else
-                temp2 = s3->accel.pat_fg_color >> 24;
 
-            if (!(s3->accel.multifunc[0xe] & 0x200))
+            if (s3->accel.multifunc[0xe] & 0x200)
+                temp2 = s3->accel.pat_fg_color >> 24;
+            else if (s3->bpp == 3) {
+                if (s3->accel.multifunc[0xe] & 0x10)
+                    temp2 = s3->accel.pat_fg_color >> 8;
+                else
+                    temp2 = s3->accel.pat_fg_color >> 24;
+
                 s3->accel.multifunc[0xe] ^= 0x10;
+            }
             return temp2;
 
         case 0xe148:
         case 0xe2e8:
             if (!s3_cpu_dest(s3))
                 break;
-            READ_PIXTRANS_BYTE_IO(0)
+            READ_PIXTRANS_BYTE_IO(0);
             if (s3->accel.cmd & 0x100) {
                 switch (s3->accel.cmd & 0x600) {
                     case 0x000:
-                        if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 2)) {
+                        if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 0x02)) {
                             if (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40))
                                 s3->accel_start(8, 1, s3->accel.pix_trans[0], 0, s3);
                             else
@@ -5135,7 +6154,7 @@ s3_accel_in(uint16_t port, void *priv)
                             s3->accel_start(1, 1, 0xffffffff, s3->accel.pix_trans[0], s3);
                         break;
                     case 0x200:
-                        if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 2)) {
+                        if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 0x02)) {
                             if (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40))
                                 s3->accel_start(16, 1, s3->accel.pix_trans[0], 0, s3);
                             else
@@ -5158,7 +6177,7 @@ s3_accel_in(uint16_t port, void *priv)
             if (s3->accel.cmd & 0x100) {
                 switch (s3->accel.cmd & 0x600) {
                     case 0x000:
-                        if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 2)) {
+                        if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 0x02)) {
                             if (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40))
                                 s3->accel_start(8, 1, s3->accel.pix_trans[0] | (s3->accel.pix_trans[1] << 8), 0, s3);
                             else
@@ -5167,7 +6186,7 @@ s3_accel_in(uint16_t port, void *priv)
                             s3->accel_start(1, 1, 0xffffffff, s3->accel.pix_trans[0] | (s3->accel.pix_trans[1] << 8), s3);
                         break;
                     case 0x200:
-                        if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 2)) {
+                        if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 0x02)) {
                             if (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40)) {
                                 if (s3->accel.cmd & 0x1000)
                                     s3->accel_start(16, 1, s3->accel.pix_trans[1] | (s3->accel.pix_trans[0] << 8), 0, s3);
@@ -5204,7 +6223,7 @@ s3_accel_in(uint16_t port, void *priv)
         case 0xe2eb:
             if (!s3_cpu_dest(s3))
                 break;
-            READ_PIXTRANS_BYTE_IO(3)
+            READ_PIXTRANS_BYTE_IO(3);
             if (s3->accel.cmd & 0x100) {
                 switch (s3->accel.cmd & 0x600) {
                     case 0x000:
@@ -5218,12 +6237,23 @@ s3_accel_in(uint16_t port, void *priv)
                         break;
                     case 0x200:
                         if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 2)) {
-                            if (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40))
-                                s3->accel_start(16, 1, s3->accel.pix_trans[0] | (s3->accel.pix_trans[1] << 8) | (s3->accel.pix_trans[2] << 16) | (s3->accel.pix_trans[3] << 24), 0, s3);
+                            if (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40)) {
+                                if (s3->accel.cmd & 0x1000)
+                                    s3->accel_start(16, 1, s3->accel.pix_trans[3] | (s3->accel.pix_trans[2] << 8) | (s3->accel.pix_trans[1] << 16) | (s3->accel.pix_trans[0] << 24), 0, s3);
+                                else
+                                    s3->accel_start(16, 1, s3->accel.pix_trans[0] | (s3->accel.pix_trans[1] << 8) | (s3->accel.pix_trans[2] << 16) | (s3->accel.pix_trans[3] << 24), 0, s3);
+                            } else {
+                                if (s3->accel.cmd & 0x1000)
+                                    s3->accel_start(2, 1, 0xffffffff, s3->accel.pix_trans[3] | (s3->accel.pix_trans[2] << 8) | (s3->accel.pix_trans[1] << 16) | (s3->accel.pix_trans[0] << 24), s3);
+                                else
+                                    s3->accel_start(2, 1, 0xffffffff, s3->accel.pix_trans[0] | (s3->accel.pix_trans[1] << 8) | (s3->accel.pix_trans[2] << 16) | (s3->accel.pix_trans[3] << 24), s3);
+                            }
+                        } else {
+                            if (s3->accel.cmd & 0x1000)
+                                s3->accel_start(2, 1, 0xffffffff, s3->accel.pix_trans[3] | (s3->accel.pix_trans[2] << 8) | (s3->accel.pix_trans[1] << 16) | (s3->accel.pix_trans[0] << 24), s3);
                             else
                                 s3->accel_start(2, 1, 0xffffffff, s3->accel.pix_trans[0] | (s3->accel.pix_trans[1] << 8) | (s3->accel.pix_trans[2] << 16) | (s3->accel.pix_trans[3] << 24), s3);
-                        } else
-                            s3->accel_start(2, 1, 0xffffffff, s3->accel.pix_trans[0] | (s3->accel.pix_trans[1] << 8) | (s3->accel.pix_trans[2] << 16) | (s3->accel.pix_trans[3] << 24), s3);
+                        }
                         break;
 
                     default:
@@ -5254,6 +6284,8 @@ s3_accel_in_w(uint16_t port, void *priv)
     s3_t           *s3     = (s3_t *) priv;
     svga_t         *svga   = &s3->svga;
     uint16_t        temp   = 0x0000;
+    uint16_t        temp1  = 0x0000;
+    uint16_t        temp2  = 0x0000;
     const uint16_t *vram_w = (uint16_t *) svga->vram;
 
     if (!s3->enable_8514)
@@ -5265,26 +6297,59 @@ s3_accel_in_w(uint16_t port, void *priv)
 
             switch (s3->accel.cmd & 0x600) {
                 case 0x000:
-                    if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 2)) {
+                    if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 0x02)) {
                         if (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40)) {
                             if (s3->accel.cmd & 0x1000)
                                 temp = (temp >> 8) | (temp << 8);
+
                             s3->accel_start(8, 1, temp | (temp << 16), 0, s3);
+                        } else {
+                            if ((s3->bpp == 0) && s3->color_16bit) {
+                                if (s3->accel.rd_mask_16bit_check) {
+                                    if (s3->accel.cur_x & 0x400)
+                                        temp = (temp >> 8) | (temp << 8);
+                                }
+                                s3->accel_start(2, 1, 0xffffffff, temp | (temp << 16), s3);
+                            } else
+                                s3->accel_start(1, 1, 0xffffffff, temp | (temp << 16), s3);
+                        }
+                    } else {
+                        if ((s3->bpp == 0) && s3->color_16bit) {
+                            if (s3->accel.rd_mask_16bit_check) {
+                                if (s3->accel.cur_x & 0x400)
+                                    temp = (temp >> 8) | (temp << 8);
+                            }
+                            s3->accel_start(2, 1, 0xffffffff, temp | (temp << 16), s3);
                         } else
                             s3->accel_start(1, 1, 0xffffffff, temp | (temp << 16), s3);
-                    } else
-                        s3->accel_start(1, 1, 0xffffffff, temp | (temp << 16), s3);
+                    }
                     break;
                 case 0x200:
-                    if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 2)) {
+                    if (((s3->accel.multifunc[0xa] & 0xc0) == 0x80) || (s3->accel.cmd & 0x02)) {
                         if (((s3->accel.frgd_mix & 0x60) != 0x40) || ((s3->accel.bkgd_mix & 0x60) != 0x40)) {
                             if (s3->accel.cmd & 0x1000)
                                 temp = (temp >> 8) | (temp << 8);
+
                             s3->accel_start(16, 1, temp | (temp << 16), 0, s3);
                         } else
                             s3->accel_start(2, 1, 0xffffffff, temp | (temp << 16), s3);
                     } else {
-                        s3->accel_start(2, 1, 0xffffffff, temp | (temp << 16), s3);
+                        if (s3->accel.rd_mask_16bit_check) {
+                            if (s3->accel.cmd == 0x53b0) {
+                                temp1 = vram_w[dword_remap_w(svga, s3->accel.dest + s3->accel.cx - s3->accel.minus) & (s3->vram_mask >> 1)];
+                                temp2 = vram_w[dword_remap_w(svga, s3->accel.dest + s3->accel.cx - s3->accel.minus + 1) & (s3->vram_mask >> 1)];
+                                if (s3->accel.cur_x & 0x400) {
+                                    temp = temp1 >> 8;
+                                    temp |= (temp2 >> 8) << 8;
+                                } else {
+                                    temp = temp1 & 0xff;
+                                    temp |= ((temp2 & 0xff) << 8);
+                                }
+                                s3->accel_start(4, 1, 0xffffffff, temp | (temp << 16), s3);
+                            } else
+                                s3->accel_start(2, 1, 0xffffffff, temp | (temp << 16), s3);
+                        } else
+                            s3->accel_start(2, 1, 0xffffffff, temp | (temp << 16), s3);
                     }
                     break;
 
@@ -5295,6 +6360,7 @@ s3_accel_in_w(uint16_t port, void *priv)
     } else {
         if (s3_enable_fifo(s3))
             s3_wait_fifo_idle(s3);
+
         temp = s3->accel.short_stroke;
     }
 
@@ -5362,15 +6428,40 @@ s3_accel_write(uint32_t addr, uint8_t val, void *priv)
 {
     s3_t         *s3   = (s3_t *) priv;
     const svga_t *svga = &s3->svga;
+    uint32_t addr_mask = (svga->crtc[0x53] & 0x08) ? 0x1ffff : 0xffff;
 
     if (!s3->enable_8514)
         return;
 
     if (s3_enable_fifo(s3)) {
-        if (svga->crtc[0x53] & 0x08)
-            s3_queue(s3, addr & 0x1ffff, val, FIFO_WRITE_BYTE);
-        else
-            s3_queue(s3, addr & 0xffff, val, FIFO_WRITE_BYTE);
+        if ((addr & addr_mask) < 0x8000) {
+            s3_queue(s3, addr & addr_mask, val, FIFO_WRITE_BYTE);
+        } else {
+            switch (addr & addr_mask) {
+                case 0x83b0 ... 0x83df:
+                    s3_out(addr & 0x3ff, val, s3);
+                    break;
+                case 0x8504:
+                    s3->subsys_stat &= ~val;
+                    s3_update_irqs(s3);
+                    break;
+                case 0x8505:
+                    s3->subsys_cntl = val;
+                    s3_update_irqs(s3);
+                    break;
+                case 0x850c:
+                    s3->accel.advfunc_cntl = val;
+                    s3_updatemapping(s3);
+                    break;
+                case 0xff20:
+                    s3->serialport = val;
+                    i2c_gpio_set(s3->i2c, !!(val & SERIAL_PORT_SCW), !!(val & SERIAL_PORT_SDW));
+                    break;
+                default:
+                    s3_queue(s3, addr & addr_mask, val, FIFO_WRITE_BYTE);
+                    break;
+            }
+        }
     } else
         s3_accel_write_fifo(s3, addr & 0xffff, val);
 }
@@ -5380,15 +6471,30 @@ s3_accel_write_w(uint32_t addr, uint16_t val, void *priv)
 {
     s3_t         *s3   = (s3_t *) priv;
     const svga_t *svga = &s3->svga;
+    uint32_t addr_mask = (svga->crtc[0x53] & 0x08) ? 0x1ffff : 0xffff;
 
     if (!s3->enable_8514)
         return;
 
     if (s3_enable_fifo(s3)) {
-        if (svga->crtc[0x53] & 0x08)
-            s3_queue(s3, addr & 0x1ffff, val, FIFO_WRITE_WORD);
-        else
-            s3_queue(s3, addr & 0xffff, val, FIFO_WRITE_WORD);
+        if ((addr & (addr_mask - 1)) < 0x8000) {
+            s3_queue(s3, addr & addr_mask, val, FIFO_WRITE_WORD);
+        } else {
+            switch (addr & (addr_mask - 1)) {
+                case 0x83c8:
+                case 0x83ca:
+                case 0x83d4:
+                    s3_accel_write(addr, val, s3);
+                    s3_accel_write(addr + 1, val >> 8, s3);
+                    break;
+                case 0xff20:
+                    s3_accel_write_fifo(s3, addr, val);
+                    break;
+                default:
+                    s3_queue(s3, addr & addr_mask, val, FIFO_WRITE_WORD);
+                    break;
+            }
+        }
     } else
         s3_accel_write_fifo_w(s3, addr & 0xffff, val);
 }
@@ -5397,16 +6503,162 @@ static void
 s3_accel_write_l(uint32_t addr, uint32_t val, void *priv)
 {
     s3_t         *s3   = (s3_t *) priv;
-    const svga_t *svga = &s3->svga;
+    svga_t       *svga = &s3->svga;
+    uint32_t addr_mask = (svga->crtc[0x53] & 0x08) ? 0x1ffff : 0xffff;
 
     if (!s3->enable_8514)
         return;
 
     if (s3_enable_fifo(s3)) {
-        if (svga->crtc[0x53] & 0x08)
-            s3_queue(s3, addr & 0x1ffff, val, FIFO_WRITE_DWORD);
-        else
-            s3_queue(s3, addr & 0xffff, val, FIFO_WRITE_DWORD);
+        if ((addr & (addr_mask - 3)) < 0x8000) {
+            s3_queue(s3, addr & addr_mask, val, FIFO_WRITE_DWORD);
+        } else {
+            switch (addr & (addr_mask - 3)) {
+                case 0x8180:
+                    s3->streams.pri_ctrl = val;
+                    svga_recalctimings(svga);
+                    svga->fullchange = svga->monitor->mon_changeframecount;;
+                    break;
+                case 0x8184:
+                    s3->streams.chroma_ctrl = val;
+                    break;
+                case 0x8190:
+                    s3->streams.sec_ctrl = val;
+                    s3->streams.dda_horiz_accumulator = val & 0xfff;
+                    if (val & 0x1000)
+                        s3->streams.dda_horiz_accumulator |= ~0xfff;
+
+                    s3->streams.sdif = (val >> 24) & 7;
+                    break;
+                case 0x8194:
+                    s3->streams.chroma_upper_bound = val;
+                    break;
+                case 0x8198:
+                    s3->streams.sec_filter = val;
+                    s3->streams.k1_horiz_scale = val & 0x7ff;
+                    if (val & 0x800)
+                        s3->streams.k1_horiz_scale |= ~0x7ff;
+
+                    s3->streams.k2_horiz_scale = (val >> 16) & 0x7ff;
+                    if ((val >> 16) & 0x800)
+                        s3->streams.k2_horiz_scale |= ~0x7ff;
+
+                    svga_recalctimings(svga);
+                    svga->fullchange = svga->monitor->mon_changeframecount;;
+                    break;
+                case 0x81a0:
+                    s3->streams.blend_ctrl = val;
+                    svga_recalctimings(svga);
+                    svga->fullchange = svga->monitor->mon_changeframecount;;
+                    break;
+                case 0x81c0:
+                    s3->streams.pri_fb0 = val & 0x3fffff;
+                    svga_recalctimings(svga);
+                    svga->fullchange = svga->monitor->mon_changeframecount;;
+                    break;
+                case 0x81c4:
+                    s3->streams.pri_fb1 = val & 0x3fffff;
+                    svga_recalctimings(svga);
+                    svga->fullchange = svga->monitor->mon_changeframecount;;
+                    break;
+                case 0x81c8:
+                    s3->streams.pri_stride = val & 0xfff;
+                    svga_recalctimings(svga);
+                    svga->fullchange = svga->monitor->mon_changeframecount;;
+                    break;
+                case 0x81cc:
+                    s3->streams.buffer_ctrl = val;
+                    svga_recalctimings(svga);
+                    svga->fullchange = svga->monitor->mon_changeframecount;;
+                    break;
+                case 0x81d0:
+                    s3->streams.sec_fb0 = val;
+                    svga_recalctimings(svga);
+                    svga->fullchange = svga->monitor->mon_changeframecount;;
+                    break;
+                case 0x81d4:
+                    s3->streams.sec_fb1 = val;
+                    svga_recalctimings(svga);
+                    svga->fullchange = svga->monitor->mon_changeframecount;;
+                    break;
+                case 0x81d8:
+                    s3->streams.sec_stride = val;
+                    svga_recalctimings(svga);
+                    svga->fullchange = svga->monitor->mon_changeframecount;;
+                    break;
+                case 0x81dc:
+                    s3->streams.overlay_ctrl = val;
+                    break;
+                case 0x81e0:
+                    s3->streams.k1_vert_scale = val & 0x7ff;
+                    if (val & 0x800)
+                        s3->streams.k1_vert_scale |= ~0x7ff;
+                    break;
+                case 0x81e4:
+                    s3->streams.k2_vert_scale = val & 0x7ff;
+                    if (val & 0x800)
+                        s3->streams.k2_vert_scale |= ~0x7ff;
+                    break;
+                case 0x81e8:
+                    s3->streams.dda_vert_accumulator = val & 0xfff;
+                    if (val & 0x1000)
+                        s3->streams.dda_vert_accumulator |= ~0xfff;
+
+                    svga_recalctimings(svga);
+                    svga->fullchange = svga->monitor->mon_changeframecount;;
+                    break;
+                case 0x81ec:
+                    s3->streams.fifo_ctrl = val;
+                    break;
+                case 0x81f0:
+                    s3->streams.pri_start = val;
+                    s3->streams.pri_x = (val >> 16) & 0x7ff;
+                    s3->streams.pri_y = val & 0x7ff;
+                    svga_recalctimings(svga);
+                    svga->fullchange = svga->monitor->mon_changeframecount;;
+                    break;
+                case 0x81f4:
+                    s3->streams.pri_size = val;
+                    s3->streams.pri_w = (val >> 16) & 0x7ff;
+                    s3->streams.pri_h = val & 0x7ff;
+                    svga_recalctimings(svga);
+                    svga->fullchange = svga->monitor->mon_changeframecount;;
+                    break;
+                case 0x81f8:
+                    s3->streams.sec_start = val;
+                    s3->streams.sec_x = (val >> 16) & 0x7ff;
+                    s3->streams.sec_y = val & 0x7ff;
+                    svga_recalctimings(svga);
+                    svga->fullchange = svga->monitor->mon_changeframecount;;
+                    break;
+                case 0x81fc:
+                    s3->streams.sec_size = val;
+                    s3->streams.sec_w = (val >> 16) & 0x7ff;
+                    s3->streams.sec_h = val & 0x7ff;
+                    svga_recalctimings(svga);
+                    svga->fullchange = svga->monitor->mon_changeframecount;;
+                    break;
+
+                case 0x8504:
+                    s3->subsys_stat &= ~(val & 0xff);
+                    s3->subsys_cntl = (val >> 8);
+                    s3_update_irqs(s3);
+                    break;
+
+                case 0x850c:
+                    s3->accel.advfunc_cntl = val & 0xff;
+                    s3_updatemapping(s3);
+                    break;
+
+                case 0xff20:
+                    s3_accel_write_fifo(s3, addr, val);
+                    break;
+
+                default:
+                    s3_queue(s3, addr & addr_mask, val, FIFO_WRITE_DWORD);
+                    break;
+            }
+        }
     } else
         s3_accel_write_fifo_l(s3, addr & 0xffff, val);
 }
@@ -5425,54 +6677,7 @@ s3_accel_read(uint32_t addr, void *priv)
         if ((addr >= 0x08000) && (addr <= 0x0803f))
             return s3_pci_read(0, addr & 0xff, s3);
         switch (addr & 0x1ffff) {
-            case 0x83b0:
-            case 0x83b1:
-            case 0x83b2:
-            case 0x83b3:
-            case 0x83b4:
-            case 0x83b5:
-            case 0x83b6:
-            case 0x83b7:
-            case 0x83b8:
-            case 0x83b9:
-            case 0x83ba:
-            case 0x83bb:
-            case 0x83bc:
-            case 0x83bd:
-            case 0x83be:
-            case 0x83bf:
-            case 0x83c0:
-            case 0x83c1:
-            case 0x83c2:
-            case 0x83c3:
-            case 0x83c4:
-            case 0x83c5:
-            case 0x83c6:
-            case 0x83c7:
-            case 0x83c8:
-            case 0x83c9:
-            case 0x83ca:
-            case 0x83cb:
-            case 0x83cc:
-            case 0x83cd:
-            case 0x83ce:
-            case 0x83cf:
-            case 0x83d0:
-            case 0x83d1:
-            case 0x83d2:
-            case 0x83d3:
-            case 0x83d4:
-            case 0x83d5:
-            case 0x83d6:
-            case 0x83d7:
-            case 0x83d8:
-            case 0x83d9:
-            case 0x83da:
-            case 0x83db:
-            case 0x83dc:
-            case 0x83dd:
-            case 0x83de:
-            case 0x83df:
+            case 0x83b0 ... 0x83df:
                 return s3_in(addr & 0x3ff, s3);
             case 0x8504:
                 return s3->subsys_stat;
@@ -5805,15 +7010,11 @@ polygon_setup(s3_t *s3)
 }
 
 #define READ(addr, dat)                                                 \
-    if ((s3->bpp == 0) && !s3->color_16bit)                               \
+    if (((s3->bpp == 0) && !s3->color_16bit) || (s3->bpp == 2))         \
         dat = svga->vram[dword_remap(svga, addr) & s3->vram_mask];      \
-    else if ((s3->bpp == 1) || (s3->color_16bit && (svga->bpp < 24))) \
+    else if ((s3->bpp == 1) || s3->color_16bit)                         \
         dat = vram_w[dword_remap_w(svga, addr) & (s3->vram_mask >> 1)]; \
-    else if (s3->bpp == 2)  \
-        dat = svga->vram[dword_remap(svga, addr) & s3->vram_mask];      \
-    else if (s3->color_16bit && (svga->bpp == 24)) {                     \
-        dat = vram_w[dword_remap_w(svga, addr) & (s3->vram_mask >> 1)]; \
-    } else                                                                \
+    else                                                                \
         dat = vram_l[dword_remap_l(svga, addr) & (s3->vram_mask >> 2)];
 
 #define MIX_READ                                                                                  \
@@ -5870,11 +7071,10 @@ polygon_setup(s3_t *s3)
         }                                                                                         \
     }
 
-#define MIX                                                                                \
-    {                                                                                      \
-        old_dest_dat = dest_dat;                                                           \
-        MIX_READ                                                                           \
-        dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask);                     \
+#define MIX                                                            \
+    {                                                                  \
+        MIX_READ                                                       \
+        dest_dat = (dest_dat & wrt_mask) | (old_dest_dat & ~wrt_mask); \
     }
 
 #define ROPMIX_READ(D, P, S)                       \
@@ -6656,23 +7856,18 @@ polygon_setup(s3_t *s3)
         old_dest_dat = dest_dat;                                                 \
         ROPMIX_READ(dest_dat, pat_dat, src_dat);                                 \
         out = (out & s3->accel.wrt_mask) | (old_dest_dat & ~s3->accel.wrt_mask); \
+        out &= 0xFFFFFF;                                                         \
     }
 
 #define WRITE(addr, dat)                                                                                                   \
-    if ((s3->bpp == 0) && !s3->color_16bit) {                                                                                \
-        svga->vram[dword_remap(svga, addr) & s3->vram_mask]                = dat;                                          \
+    if (((s3->bpp == 0) && !s3->color_16bit) || (s3->bpp == 2)) {                                                          \
+        svga->vram[dword_remap(svga, addr) & s3->vram_mask] = dat;                                                         \
         svga->changedvram[(dword_remap(svga, addr) & s3->vram_mask) >> 12] = svga->monitor->mon_changeframecount;          \
-    } else if ((s3->bpp == 1) || (s3->color_16bit && (svga->bpp < 24))) {                                                   \
+    } else if ((s3->bpp == 1) || s3->color_16bit) {                                                                        \
         vram_w[dword_remap_w(svga, addr) & (s3->vram_mask >> 1)]                    = dat;                                 \
         svga->changedvram[(dword_remap_w(svga, addr) & (s3->vram_mask >> 1)) >> 11] = svga->monitor->mon_changeframecount; \
-    } else if (s3->bpp == 2) {                                                  \
-        svga->vram[dword_remap(svga, addr) & s3->vram_mask]                = dat;                                          \
-        svga->changedvram[(dword_remap(svga, addr) & s3->vram_mask) >> 12] = svga->monitor->mon_changeframecount;          \
-    } else if (s3->color_16bit && (svga->bpp == 24)) { \
-        vram_w[dword_remap_w(svga, addr) & (s3->vram_mask >> 1)]           = dat;                                 \
-        svga->changedvram[(dword_remap_w(svga, addr) & (s3->vram_mask >> 1)) >> 11] = svga->monitor->mon_changeframecount; \
     } else {                                                                                                               \
-        vram_l[dword_remap_l(svga, addr) & (s3->vram_mask >> 2)]                    = dat;                                 \
+        vram_l[dword_remap_l(svga, addr) & (s3->vram_mask >> 2)] = dat;                                                    \
         svga->changedvram[(dword_remap_l(svga, addr) & (s3->vram_mask >> 2)) >> 10] = svga->monitor->mon_changeframecount; \
     }
 
@@ -7058,759 +8253,16 @@ s3_visionx68_video_engine_op(uint32_t cpu_dat, s3_t *s3)
 }
 
 void
-s3_911_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, void *priv)
+s3_short_stroke_start(s3_t *s3, uint8_t ssv)
 {
-    s3_t *s3 = (s3_t *)priv;
-    svga_t *svga = &s3->svga;
-    uint32_t  src_dat = 0;
-    uint32_t  dest_dat;
-    uint32_t  old_dest_dat;
-    int       frgd_mix;
-    int       bkgd_mix;
-    int       clip_t       = s3->accel.multifunc[1] & 0xfff;
-    int       clip_l       = s3->accel.multifunc[2] & 0xfff;
-    int       clip_b       = s3->accel.multifunc[3] & 0xfff;
-    int       clip_r       = s3->accel.multifunc[4] & 0xfff;
-    int       vram_mask    = (s3->accel.multifunc[0xa] & 0xc0) == 0xc0;
-    uint32_t  mix_mask     = (s3->accel.cmd & 0x200) ? 0x8000 : 0x80;
-    uint16_t *vram_w       = (uint16_t *) svga->vram;
-    uint32_t *vram_l       = (uint32_t *) svga->vram;
-    uint32_t  rd_mask      = s3->accel.rd_mask;
-    uint32_t  wrt_mask     = s3->accel.wrt_mask;
-    uint32_t  frgd_color   = s3->accel.frgd_color;
-    uint32_t  bkgd_color   = s3->accel.bkgd_color;
-    int       cmd          = s3->accel.cmd >> 13;
+    s3->accel.ssv_len  = ssv & 0x0f;
+    s3->accel.ssv_dir  = ssv & 0xe0;
+    s3->accel.ssv_draw = !!(ssv & 0x10);
 
-    if ((s3->accel.cmd & 0x100) && (s3_cpu_src(s3) || (s3_cpu_dest(s3))) && (!cpu_input || (s3_enable_fifo(s3) == 0)))
-        s3->force_busy = 1;
+    if (s3_cpu_src(s3))
+        return; /*Wait for data from CPU*/
 
-    if (cpu_input && (((s3->accel.multifunc[0xa] & 0xc0) != 0x80) || (!(s3->accel.cmd & 2)))) {
-        if (s3->color_16bit) {
-            if (count > 1)
-                count >>= 1;
-        }
-    }
-
-    if (s3->color_16bit)
-        rd_mask &= 0xffff;
-    else
-        rd_mask &= 0xff;
-
-    /*Bit 4 of the Command register is the draw yes bit, which enables writing to memory/reading from memory when enabled.
-      When this bit is disabled, no writing to memory/reading from memory is allowed. (This bit is almost meaningless on
-      the NOP command)*/
-
-    switch (cmd) {
-        case 0: /*NOP (Short Stroke Vectors)*/
-            if (s3->accel.ssv_state == 0)
-                break;
-
-            frgd_mix = (s3->accel.frgd_mix >> 5) & 3;
-            bkgd_mix = (s3->accel.bkgd_mix >> 5) & 3;
-
-            if (s3->accel.cmd & 8) { /*Radial*/
-                while (count-- && s3->accel.ssv_len >= 0) {
-                    if ((s3->accel.cx & 0xfff) >= clip_l && (s3->accel.cx & 0xfff) <= clip_r && (s3->accel.cy & 0xfff) >= clip_t && (s3->accel.cy & 0xfff) <= clip_b) {
-                        switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
-                            case 0:
-                                src_dat = bkgd_color;
-                                break;
-                            case 1:
-                                src_dat = frgd_color;
-                                break;
-                            case 2:
-                                src_dat = cpu_dat;
-                                break;
-                            case 3:
-                                src_dat = 0;
-                                break;
-
-                            default:
-                                break;
-                        }
-
-                        READ((s3->accel.cy * s3->width) + s3->accel.cx, dest_dat);
-
-                        MIX
-
-                        if (s3->accel.ssv_draw) {
-                            WRITE((s3->accel.cy * s3->width) + s3->accel.cx, dest_dat);
-                        }
-                    }
-
-                    mix_dat <<= 1;
-                    mix_dat |= 1;
-                    if (s3->bpp == 0)
-                        cpu_dat >>= 8;
-                    else
-                        cpu_dat >>= 16;
-
-                    if (!s3->accel.ssv_len)
-                        break;
-
-                    switch (s3->accel.ssv_dir & 0xe0) {
-                        case 0x00:
-                            s3->accel.cx++;
-                            break;
-                        case 0x20:
-                            s3->accel.cx++;
-                            s3->accel.cy--;
-                            break;
-                        case 0x40:
-                            s3->accel.cy--;
-                            break;
-                        case 0x60:
-                            s3->accel.cx--;
-                            s3->accel.cy--;
-                            break;
-                        case 0x80:
-                            s3->accel.cx--;
-                            break;
-                        case 0xa0:
-                            s3->accel.cx--;
-                            s3->accel.cy++;
-                            break;
-                        case 0xc0:
-                            s3->accel.cy++;
-                            break;
-                        case 0xe0:
-                            s3->accel.cx++;
-                            s3->accel.cy++;
-                            break;
-
-                        default:
-                            break;
-                    }
-
-                    s3->accel.ssv_len--;
-                    s3->accel.cx &= 0xfff;
-                    s3->accel.cy &= 0xfff;
-                }
-
-                s3->accel.cur_x = s3->accel.cx;
-                s3->accel.cur_y = s3->accel.cy;
-            }
-            break;
-
-        case 1: /*Draw line*/
-            if (!cpu_input) {
-                s3->accel.cx = s3->accel.cur_x & 0xfff;
-                s3->accel.cy = s3->accel.cur_y & 0xfff;
-                s3->accel.sy = s3->accel.maj_axis_pcnt & 0x7ff;
-
-                if (s3->color_16bit && (svga->bpp < 24)) {
-                    if (s3->accel.wrt_mask != 0xffff) {
-                        if (s3->accel.cur_x & 0x400) {
-                            s3->accel.color_16bit_check = 0;
-                            s3->accel.minus = 0x400;
-                        } else {
-                            s3->accel.color_16bit_check = 1;
-                            s3->accel.minus = 0;
-                        }
-                    } else {
-                        if (s3->accel.cur_x & 0x400)
-                            s3->accel.color_16bit_check = 1;
-                        else
-                            s3->accel.color_16bit_check = 0;
-
-                        s3->accel.minus = 0;
-                    }
-                } else {
-                    s3->accel.color_16bit_check = 0;
-                    s3->accel.minus = 0;
-                }
-
-                if (s3_cpu_src(s3))
-                    return; /*Wait for data from CPU*/
-            }
-
-            frgd_mix = (s3->accel.frgd_mix >> 5) & 3;
-            bkgd_mix = (s3->accel.bkgd_mix >> 5) & 3;
-
-            if (s3->accel.cmd & 8) { /*Radial*/
-                if (s3->color_16bit && (svga->bpp < 24)) {
-                    if (s3->accel.color_16bit_check)
-                        return;
-                    if (s3->accel.wrt_mask != 0xffff)
-                        wrt_mask = (s3->accel.wrt_mask_actual[0] | (s3->accel.wrt_mask_actual[1] << 8));
-                }
-
-                while (count-- && s3->accel.sy >= 0) {
-                    if ((s3->accel.cx & 0xfff) >= clip_l && (s3->accel.cx & 0xfff) <= clip_r && (s3->accel.cy & 0xfff) >= clip_t && (s3->accel.cy & 0xfff) <= clip_b) {
-                        switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
-                            case 0:
-                                src_dat = bkgd_color;
-                                if (s3->color_16bit && (svga->bpp < 24))
-                                    src_dat = s3->accel.bkgd_color_actual[0] | (s3->accel.bkgd_color_actual[1] << 8);
-                                break;
-                            case 1:
-                                src_dat = frgd_color;
-                                if (s3->color_16bit && (svga->bpp < 24))
-                                    src_dat = s3->accel.frgd_color_actual[0] | (s3->accel.frgd_color_actual[1] << 8);
-                                break;
-                            case 2:
-                                src_dat = cpu_dat;
-                                break;
-                            case 3:
-                                src_dat = 0;
-                                break;
-
-                            default:
-                                break;
-                        }
-
-                        READ((s3->accel.cy * s3->width) + s3->accel.cx - s3->accel.minus, dest_dat);
-
-                        MIX
-
-                        WRITE((s3->accel.cy * s3->width) + s3->accel.cx - s3->accel.minus, dest_dat);
-                    }
-
-                    mix_dat <<= 1;
-                    mix_dat |= 1;
-                    if ((s3->bpp == 0) && !s3->color_16bit)
-                        cpu_dat >>= 8;
-                    else
-                        cpu_dat >>= 16;
-
-                    if (!s3->accel.sy)
-                        break;
-
-                    switch (s3->accel.cmd & 0xe0) {
-                        case 0x00:
-                            s3->accel.cx++;
-                            break;
-                        case 0x20:
-                            s3->accel.cx++;
-                            s3->accel.cy--;
-                            break;
-                        case 0x40:
-                            s3->accel.cy--;
-                            break;
-                        case 0x60:
-                            s3->accel.cx--;
-                            s3->accel.cy--;
-                            break;
-                        case 0x80:
-                            s3->accel.cx--;
-                            break;
-                        case 0xa0:
-                            s3->accel.cx--;
-                            s3->accel.cy++;
-                            break;
-                        case 0xc0:
-                            s3->accel.cy++;
-                            break;
-                        case 0xe0:
-                            s3->accel.cx++;
-                            s3->accel.cy++;
-                            break;
-
-                        default:
-                            break;
-                    }
-                    s3->accel.sy--;
-                    s3->accel.cx &= 0xfff;
-                    s3->accel.cy &= 0xfff;
-                }
-                s3->accel.cur_x = s3->accel.cx;
-                s3->accel.cur_y = s3->accel.cy;
-            } else { /*Bresenham*/
-                if (s3->accel.b2e8_pix && s3_cpu_src(s3) && (count == 16)) { /*Stupid undocumented 0xB2E8 on 911/924*/
-                    count              = s3->accel.maj_axis_pcnt + 1;
-                    s3->accel.temp_cnt = 16;
-                }
-
-                if (s3->color_16bit && (svga->bpp < 24)) {
-                    if (!s3->accel.b2e8_pix) {
-                        if (!s3->accel.color_16bit_check)
-                            wrt_mask = (s3->accel.wrt_mask_actual[0] | (s3->accel.wrt_mask_actual[1] << 8));
-                        else
-                            return;
-                    }
-                }
-
-                s3_log("CMD=%04x, curx=%d, lwrtmask=%04x, actual wrtmask=%04x, frgdmix=%d, "
-                       "bkgdmix=%d, input=%d, cnt=%d.\n", s3->accel.cmd, s3->accel.cur_x,
-                       wrt_mask, s3->accel.wrt_mask, frgd_mix, bkgd_mix, cpu_input, count);
-                while (count-- && s3->accel.sy >= 0) {
-                    if (s3->accel.b2e8_pix && s3_cpu_src(s3) && !s3->accel.temp_cnt) {
-                        mix_dat >>= 16;
-                        s3->accel.temp_cnt = 16;
-                    }
-
-                    if ((s3->accel.cx & 0xfff) >= clip_l && (s3->accel.cx & 0xfff) <= clip_r &&
-                        (s3->accel.cy & 0xfff) >= clip_t && (s3->accel.cy & 0xfff) <= clip_b) {
-                        switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
-                            case 0:
-                                src_dat = bkgd_color;
-                                if (s3->color_16bit && (svga->bpp < 24) && !s3->accel.b2e8_pix) {
-                                    if (!s3->accel.color_16bit_check)
-                                        src_dat = s3->accel.bkgd_color_actual[0] |
-                                                  (s3->accel.bkgd_color_actual[1] << 8);
-                                }
-                                break;
-                            case 1:
-                                src_dat = frgd_color;
-                                if (s3->color_16bit && (svga->bpp < 24) && !s3->accel.b2e8_pix) {
-                                    if (!s3->accel.color_16bit_check)
-                                        src_dat = s3->accel.frgd_color_actual[0] |
-                                                  (s3->accel.frgd_color_actual[1] << 8);
-                                }
-                                break;
-                            case 2:
-                                src_dat = cpu_dat;
-                                break;
-                            case 3:
-                                src_dat = 0;
-                                break;
-
-                            default:
-                                break;
-                        }
-
-                        READ((s3->accel.cy * s3->width) + s3->accel.cx - s3->accel.minus, dest_dat);
-
-                        MIX
-
-                        if (s3->accel.cmd & 0x10) {
-                            WRITE((s3->accel.cy * s3->width) + s3->accel.cx - s3->accel.minus, dest_dat);
-                        }
-                    }
-
-                    if (s3->accel.b2e8_pix && s3_cpu_src(s3)) {
-                        if (s3->accel.temp_cnt > 0) {
-                            s3->accel.temp_cnt--;
-                            mix_dat <<= 1;
-                            mix_dat |= 1;
-                        }
-                    } else {
-                        mix_dat <<= 1;
-                        mix_dat |= 1;
-                    }
-
-                    if (s3->color_16bit)
-                        cpu_dat >>= 16;
-                    else
-                        cpu_dat >>= 8;
-
-                    if (!s3->accel.sy)
-                        break;
-
-                    if (s3->accel.cmd & 0x40) {
-                        if (s3->accel.cmd & 0x80)
-                            s3->accel.cy++;
-                        else
-                            s3->accel.cy--;
-
-                        if (s3->accel.err_term >= 0) {
-                            s3->accel.err_term += s3->accel.destx_distp;
-                            if (s3->accel.cmd & 0x20)
-                                s3->accel.cx++;
-                            else
-                                s3->accel.cx--;
-                        } else
-                            s3->accel.err_term += s3->accel.desty_axstp;
-                    } else {
-                        if (s3->accel.cmd & 0x20)
-                            s3->accel.cx++;
-                        else
-                            s3->accel.cx--;
-
-                        if (s3->accel.err_term >= 0) {
-                            s3->accel.err_term += s3->accel.destx_distp;
-                            if (s3->accel.cmd & 0x80)
-                                s3->accel.cy++;
-                            else
-                                s3->accel.cy--;
-                        } else
-                            s3->accel.err_term += s3->accel.desty_axstp;
-                    }
-
-                    s3->accel.sy--;
-                    s3->accel.cx &= 0xfff;
-                    s3->accel.cy &= 0xfff;
-                }
-                s3->accel.cur_x = s3->accel.cx;
-                s3->accel.cur_y = s3->accel.cy;
-            }
-            break;
-
-        case 2:             /*Rectangle fill*/
-            if (!cpu_input) { /*!cpu_input is trigger to start operation*/
-                s3->accel.sx = s3->accel.maj_axis_pcnt & 0xfff;
-                s3->accel.sy = s3->accel.multifunc[0] & 0xfff;
-                s3->accel.cx = s3->accel.cur_x & 0xfff;
-                s3->accel.cy = s3->accel.cur_y & 0xfff;
-                s3->accel.pix_trans_x_count = 0;
-
-                s3->accel.dest = s3->accel.cy * s3->width;
-
-                if (s3->color_16bit && (svga->bpp < 24)) {
-                    if (s3->accel.cur_x & 0x400) {
-                        s3->accel.color_16bit_check = 0;
-                        s3->accel.minus = 0x400;
-                    } else {
-                        s3->accel.color_16bit_check = 1;
-                        s3->accel.minus = 0;
-                    }
-
-                    if (s3->accel.color_16bit_check) {
-                        if (((s3->accel.multifunc[0xa] & 0xc0) == 0x00) && !(s3->accel.cmd & 2))
-                            s3->accel.color_16bit_check_rectfill = !!s3_cpu_src(s3);
-                        else
-                            s3->accel.color_16bit_check_rectfill = 0;
-                    }
-
-                    if (s3->accel.color_16bit_check_rectfill) {
-                        if (s3->accel.color_16bit_check) {
-                            s3->accel.pix_trans_ptr = (uint8_t *) calloc(1, (s3->accel.sx + 1) << 1);
-                            s3->accel.pix_trans_ptr_cnt = (s3->accel.sx + 1) << 1;
-                        }
-                    } else
-                        s3->accel.pix_trans_x_count = 0;
-                } else {
-                    s3->accel.pix_trans_x_count = 0;
-                    s3->accel.color_16bit_check = 0;
-                    s3->accel.color_16bit_check_rectfill = 0;
-                    s3->accel.minus = 0;
-                }
-
-                if (s3_cpu_src(s3)) {
-                    s3->data_available = 0;
-                    return; /*Wait for data from CPU*/
-                } else if (s3_cpu_dest(s3)) {
-                    s3->data_available = 1;
-                    return;
-                }
-            }
-
-            frgd_mix = (s3->accel.frgd_mix >> 5) & 3;
-            bkgd_mix = (s3->accel.bkgd_mix >> 5) & 3;
-
-            if (s3->accel.b2e8_pix && s3_cpu_src(s3) && count == 16) { /*Stupid undocumented 0xB2E8 on 911/924*/
-                count              = s3->accel.maj_axis_pcnt + 1;
-                s3->accel.temp_cnt = 16;
-            }
-
-            if (s3->color_16bit && (svga->bpp < 24)) {
-                if (!s3->accel.b2e8_pix) {
-                    if (!s3->accel.color_16bit_check) {
-                        wrt_mask = (s3->accel.wrt_mask_actual[0] | (s3->accel.wrt_mask_actual[1] << 8));
-                    } else if (s3->accel.color_16bit_check && (s3->accel.cmd == 0x40f3))
-                        return;
-                }
-            }
-
-            while (count-- && s3->accel.sy >= 0) {
-                if (s3->accel.b2e8_pix && s3_cpu_src(s3) && !s3->accel.temp_cnt) {
-                    mix_dat >>= 16;
-                    s3->accel.temp_cnt = 16;
-                }
-
-                if ((s3->accel.cx & 0xfff) >= clip_l && (s3->accel.cx & 0xfff) <= clip_r && (s3->accel.cy & 0xfff) >= clip_t && (s3->accel.cy & 0xfff) <= clip_b) {
-                    if (s3_cpu_dest(s3) && ((s3->accel.multifunc[0xa] & 0xc0) == 0x00)) {
-                        mix_dat = mix_mask; /* Mix data = forced to foreground register. */
-                    } else if (s3_cpu_dest(s3) && vram_mask) {
-                        /* Mix data = current video memory value. */
-                        READ(s3->accel.dest + s3->accel.cx - s3->accel.minus, mix_dat);
-                        mix_dat = ((mix_dat & rd_mask) == rd_mask);
-                        mix_dat = mix_dat ? mix_mask : 0;
-                    }
-
-                    if (s3_cpu_dest(s3)) {
-                        READ(s3->accel.dest + s3->accel.cx - s3->accel.minus, src_dat);
-                        if (vram_mask)
-                            src_dat = ((src_dat & rd_mask) == rd_mask);
-                    } else {
-                        switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
-                            case 0:
-                                src_dat = bkgd_color;
-                                if (s3->color_16bit && (svga->bpp < 24) && !s3->accel.b2e8_pix && (s3->accel.cmd != 0x41b3)) {
-                                    if (!s3->accel.color_16bit_check)
-                                        src_dat = s3->accel.bkgd_color_actual[0] | (s3->accel.bkgd_color_actual[1] << 8);
-                                }
-                                break;
-                            case 1:
-                                src_dat = frgd_color;
-                                if (s3->color_16bit && (svga->bpp < 24) && !s3->accel.b2e8_pix && (s3->accel.cmd != 0x41b3)) {
-                                    if (!s3->accel.color_16bit_check)
-                                        src_dat = s3->accel.frgd_color_actual[0] | (s3->accel.frgd_color_actual[1] << 8);
-                                }
-                                break;
-                            case 2:
-                                src_dat = cpu_dat;
-                                break;
-                            case 3:
-                                src_dat = 0;
-                                break;
-
-                            default:
-                                break;
-                        }
-                    }
-
-                    READ(s3->accel.dest + s3->accel.cx - s3->accel.minus, dest_dat);
-
-                    MIX
-
-                    if (s3->accel.cmd & 0x10) {
-                        WRITE(s3->accel.dest + s3->accel.cx - s3->accel.minus, dest_dat);
-                    }
-                }
-
-                if (s3->accel.b2e8_pix && s3_cpu_src(s3)) {
-                    if (s3->accel.temp_cnt > 0) {
-                        s3->accel.temp_cnt--;
-                        mix_dat <<= 1;
-                        mix_dat |= 1;
-                    }
-                } else {
-                    mix_dat <<= 1;
-                    mix_dat |= 1;
-                }
-
-                if (s3->color_16bit)
-                    cpu_dat >>= 16;
-                else
-                    cpu_dat >>= 8;
-
-                if (s3->accel.cmd & 0x20)
-                    s3->accel.cx++;
-                else
-                    s3->accel.cx--;
-
-                s3->accel.cx &= 0xfff;
-                s3->accel.sx--;
-                if (s3->accel.sx < 0) {
-                    if (s3->accel.cmd & 0x20)
-                        s3->accel.cx -= (s3->accel.maj_axis_pcnt & 0xfff) + 1;
-                    else
-                        s3->accel.cx += (s3->accel.maj_axis_pcnt & 0xfff) + 1;
-
-                    s3->accel.sx = s3->accel.maj_axis_pcnt & 0xfff;
-                    if (s3->accel.cmd & 0x80)
-                        s3->accel.cy++;
-                    else
-                        s3->accel.cy--;
-
-                    s3->accel.cy &= 0xfff;
-                    s3->accel.dest = s3->accel.cy * s3->width;
-                    s3->accel.sy--;
-
-                    if (cpu_input) {
-                        if (s3->accel.b2e8_pix) {
-                            s3->accel.cur_x = s3->accel.cx;
-                            s3->accel.cur_y = s3->accel.cy;
-                        }
-                        return;
-                    }
-                    if (s3->accel.sy < 0) {
-                        s3->accel.cur_x = s3->accel.cx;
-                        s3->accel.cur_y = s3->accel.cy;
-                        return;
-                    }
-                }
-            }
-            break;
-
-        case 6:             /*BitBlt*/
-            if (!cpu_input) { /*!cpu_input is trigger to start operation*/
-                s3->accel.sx = s3->accel.maj_axis_pcnt & 0xfff;
-                s3->accel.sy = s3->accel.multifunc[0] & 0xfff;
-
-                s3->accel.dx = s3->accel.destx_distp & 0xfff;
-                s3->accel.dy = s3->accel.desty_axstp & 0xfff;
-
-                s3->accel.cx = s3->accel.cur_x & 0xfff;
-                s3->accel.cy = s3->accel.cur_y & 0xfff;
-
-                s3->accel.src  = s3->accel.cy * s3->width;
-                s3->accel.dest = s3->accel.dy * s3->width;
-
-                if (s3->color_16bit && (svga->bpp < 24)) {
-                    if (s3->accel.destx_distp & 0x400) {
-                        s3->accel.color_16bit_check = 0;
-                        s3->accel.minus = 0x400;
-                    } else {
-                        s3->accel.color_16bit_check = 1;
-                        s3->accel.minus = 0;
-                    }
-                    s3->accel.srcminus = 0x400;
-                } else {
-                    s3->accel.color_16bit_check = 0;
-                    s3->accel.minus = 0;
-                    s3->accel.srcminus = 0;
-                }
-            }
-
-            if ((s3->accel.cmd & 0x100) && !cpu_input) {
-                return; /*Wait for data from CPU*/
-            }
-
-            frgd_mix = (s3->accel.frgd_mix >> 5) & 3;
-            bkgd_mix = (s3->accel.bkgd_mix >> 5) & 3;
-
-            if (s3->color_16bit && (svga->bpp < 24)) {
-                if (!s3->accel.color_16bit_check)
-                    wrt_mask = (s3->accel.wrt_mask_actual[0] | (s3->accel.wrt_mask_actual[1] << 8));
-                else
-                    return;
-            }
-
-            if (!cpu_input && (frgd_mix == 3) && !vram_mask && ((s3->accel.cmd & 0xa0) == 0xa0) && ((s3->accel.frgd_mix & 0xf) == 7) && ((s3->accel.bkgd_mix & 0xf) == 7)) {
-                while (1) {
-                    if ((s3->accel.dx & 0xfff) >= clip_l && (s3->accel.dx & 0xfff) <= clip_r && (s3->accel.dy & 0xfff) >= clip_t && (s3->accel.dy & 0xfff) <= clip_b) {
-                        READ(s3->accel.src + s3->accel.cx - s3->accel.srcminus, src_dat);
-                        READ(s3->accel.dest + s3->accel.dx - s3->accel.minus, dest_dat);
-
-                        dest_dat = (src_dat & wrt_mask) | (dest_dat & ~wrt_mask);
-
-                        WRITE(s3->accel.dest + s3->accel.dx - s3->accel.minus, dest_dat);
-                    }
-
-                    s3->accel.cx++;
-                    s3->accel.dx++;
-                    s3->accel.sx--;
-                    s3->accel.dx &= 0xfff;
-                    if (s3->accel.sx < 0) {
-                        s3->accel.cx -= (s3->accel.maj_axis_pcnt & 0xfff) + 1;
-                        s3->accel.dx -= (s3->accel.maj_axis_pcnt & 0xfff) + 1;
-                        s3->accel.sx = s3->accel.maj_axis_pcnt & 0xfff;
-
-                        s3->accel.cy++;
-                        s3->accel.dy++;
-
-                        s3->accel.dy &= 0xfff;
-                        s3->accel.src  = s3->accel.cy * s3->width;
-                        s3->accel.dest = s3->accel.dy * s3->width;
-
-                        s3->accel.sy--;
-
-                        if (s3->accel.sy < 0) { /*It's evident that this is a clear undocumented difference compared to later chips, per what NT 3.5+ does to DX/DY.*/
-                            s3->accel.destx_distp = s3->accel.dx;
-                            s3->accel.desty_axstp = s3->accel.dy;
-                            return;
-                        }
-                    }
-                }
-            } else {
-                while (count-- && s3->accel.sy >= 0) {
-                    if ((s3->accel.dx & 0xfff) >= clip_l && (s3->accel.dx & 0xfff) <= clip_r && ((s3->accel.dy & 0xfff) >= clip_t && (s3->accel.dy & 0xfff) <= clip_b)) {
-                        if (vram_mask && (s3->accel.cmd & 0x10)) {
-                            READ(s3->accel.src + s3->accel.cx - s3->accel.srcminus, mix_dat);
-                            mix_dat = ((mix_dat & rd_mask) == rd_mask);
-                            mix_dat = mix_dat ? mix_mask : 0;
-                        }
-                        switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
-                            case 0:
-                                src_dat = bkgd_color;
-                                if (s3->color_16bit && (svga->bpp < 24)) {
-                                    if (!s3->accel.color_16bit_check)
-                                        src_dat = s3->accel.bkgd_color_actual[0] | (s3->accel.bkgd_color_actual[1] << 8);
-                                }
-                                break;
-                            case 1:
-                                src_dat = frgd_color;
-                                if (s3->color_16bit && (svga->bpp < 24)) {
-                                    if (!s3->accel.color_16bit_check)
-                                        src_dat = s3->accel.frgd_color_actual[0] | (s3->accel.frgd_color_actual[1] << 8);
-                                }
-                                break;
-                            case 2:
-                                src_dat = cpu_dat;
-                                break;
-                            case 3:
-                                READ(s3->accel.src + s3->accel.cx - s3->accel.srcminus, src_dat);
-                                if (vram_mask && (s3->accel.cmd & 0x10))
-                                    src_dat = ((src_dat & rd_mask) == rd_mask);
-                                break;
-
-                            default:
-                                break;
-                        }
-
-                        READ(s3->accel.dest + s3->accel.dx - s3->accel.minus, dest_dat);
-
-                        MIX
-
-                        if ((!(s3->accel.cmd & 0x10) && vram_mask) || (s3->accel.cmd & 0x10)) {
-                            WRITE(s3->accel.dest + s3->accel.dx - s3->accel.minus, dest_dat);
-                        }
-                    }
-
-                    mix_dat <<= 1;
-                    mix_dat |= 1;
-
-                    if (s3->color_16bit)
-                        cpu_dat >>= 16;
-                    else
-                        cpu_dat >>= 8;
-
-                    if (s3->accel.cmd & 0x20) {
-                        s3->accel.cx++;
-                        s3->accel.dx++;
-                    } else {
-                        s3->accel.cx--;
-                        s3->accel.dx--;
-                    }
-                    s3->accel.dx &= 0xfff;
-                    s3->accel.sx--;
-                    if (s3->accel.sx < 0) {
-                        if (s3->accel.cmd & 0x20) {
-                            s3->accel.cx -= ((s3->accel.maj_axis_pcnt & 0xfff) + 1);
-                            s3->accel.dx -= ((s3->accel.maj_axis_pcnt & 0xfff) + 1);
-                        } else {
-                            s3->accel.cx += ((s3->accel.maj_axis_pcnt & 0xfff) + 1);
-                            s3->accel.dx += ((s3->accel.maj_axis_pcnt & 0xfff) + 1);
-                        }
-                        s3->accel.sx = s3->accel.maj_axis_pcnt & 0xfff;
-
-                        if (s3->accel.cmd & 0x80) {
-                            s3->accel.cy++;
-                            s3->accel.dy++;
-                        } else {
-                            s3->accel.cy--;
-                            s3->accel.dy--;
-                        }
-                        s3->accel.dy  &= 0xfff;
-                        s3->accel.src  = s3->accel.cy * s3->width;
-                        s3->accel.dest = s3->accel.dy * s3->width;
-
-                        s3->accel.sy--;
-
-                        if (cpu_input)
-                            return;
-
-                        if (s3->accel.sy < 0) { /*It's evident that this is a clear undocumented difference compared to later chips, per what NT 3.5+ does to DX/DY.*/
-                            s3->accel.destx_distp = s3->accel.dx;
-                            s3->accel.desty_axstp = s3->accel.dy;
-                            return;
-                        }
-                    }
-                }
-            }
-            break;
-
-        default:
-            break;
-    }
-}
-
-void
-s3_short_stroke_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, s3_t *s3, uint8_t ssv)
-{
-    if (!cpu_input) {
-        s3->accel.ssv_len  = ssv & 0x0f;
-        s3->accel.ssv_dir  = ssv & 0xe0;
-        s3->accel.ssv_draw = ssv & 0x10;
-
-        if (s3_cpu_src(s3)) {
-            return; /*Wait for data from CPU*/
-        }
-    }
-
-    s3->accel_start(count, cpu_input, mix_dat, cpu_dat, s3);
+    s3->accel_start(-1, 0, -1, 0, s3);
 }
 
 void
@@ -7835,29 +8287,29 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
     uint32_t *vram_l       = (uint32_t *) svga->vram;
     uint32_t  compare      = s3->accel.color_cmp;
     uint8_t   rop          = s3->accel.ropmix & 0xff;
-    int       compare_mode = (s3->accel.multifunc[0xe] >> 7) & 3;
     uint32_t  rd_mask      = s3->accel.rd_mask;
     uint32_t  wrt_mask     = s3->accel.wrt_mask;
     uint32_t  frgd_color   = s3->accel.frgd_color;
     uint32_t  bkgd_color   = s3->accel.bkgd_color;
     int       cmd          = s3->accel.cmd >> 13;
+    int       update       = 1;
     uint32_t  srcbase;
     uint32_t  dstbase;
 
-    s3->accel.srcminus = 0;
-    s3->accel.minus = 0;
+    frgd_mix = (s3->accel.frgd_mix >> 5) & 3;
+    bkgd_mix = (s3->accel.bkgd_mix >> 5) & 3;
 
-    if ((s3->chip >= S3_TRIO64 || s3->chip == S3_VISION968 || s3->chip == S3_VISION868) && (s3->accel.cmd & (1 << 11)))
-        cmd |= 8;
+    if (((s3->chip >= S3_TRIO64) || (s3->chip == S3_VISION968) || (s3->chip == S3_VISION868)) && (s3->accel.cmd & (1 << 11)))
+        cmd |= 0x08;
 
     // SRC-BASE/DST-BASE
-    if ((s3->accel.multifunc[0xd] >> 4) & 7)
-        srcbase = 0x100000 * ((s3->accel.multifunc[0xd] >> 4) & 3);
+    if (((s3->accel.multifunc[0xd] >> 4) & 7) && (s3->chip >= S3_VISION964))
+        srcbase = 0x100000 * ((s3->accel.multifunc[0xd] >> 4) & 7);
     else
         srcbase = 0x100000 * ((s3->accel.multifunc[0xe] >> 2) & 3);
 
-    if ((s3->accel.multifunc[0xd] >> 0) & 7)
-        dstbase = 0x100000 * ((s3->accel.multifunc[0xd] >> 0) & 3);
+    if (((s3->accel.multifunc[0xd] >> 0) & 7) && (s3->chip >= S3_VISION964))
+        dstbase = 0x100000 * ((s3->accel.multifunc[0xd] >> 0) & 7);
     else
         dstbase = 0x100000 * ((s3->accel.multifunc[0xe] >> 0) & 3);
 
@@ -7875,7 +8327,7 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
     if (!cpu_input)
         s3->accel.dat_count = 0;
 
-    if (cpu_input && (((s3->accel.multifunc[0xa] & 0xc0) != 0x80) || (!(s3->accel.cmd & 2)))) {
+    if (cpu_input && (((s3->accel.multifunc[0xa] & 0xc0) != 0x80) || (!(s3->accel.cmd & 0x02)))) {
         if ((s3->bpp == 3) && (count == 2)) {
             if (s3->accel.dat_count) {
                 cpu_dat             = ((cpu_dat & 0xffff) << 16) | s3->accel.dat_buf;
@@ -7897,9 +8349,9 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
     else if ((s3->bpp == 1) || s3->color_16bit)
         rd_mask &= 0xffff;
 
-    if (s3->bpp == 0)
+    if ((s3->bpp == 0) && !s3->color_16bit)
         compare &= 0xff;
-    else if (s3->bpp == 1)
+    else if ((s3->bpp == 1) || s3->color_16bit)
         compare &= 0xffff;
 
     switch (s3->accel.cmd & 0x600) {
@@ -7923,16 +8375,14 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
     /*Bit 4 of the Command register is the draw yes bit, which enables writing to memory/reading from memory when enabled.
       When this bit is disabled, no writing to memory/reading from memory is allowed. (This bit is almost meaningless on
       the NOP command)*/
+    s3_log("CMD=%d, full=%04x, s3bpp=%x, clr=%d, clb=%d, sourcedisplay=%02x, mmio=%02x, srcbase=%08x, dstbase=%08x, cpu=%04x, mix=%04x, count=%d, rd_mask=%04x, wrt_mask=%04x, width=%d, s=%d,%d, c=%d,%d, d=%d,%d, 16bitcolor=%x, frgdcolor=%04x, bkgdcolor=%04x, frgdsel=%d, bkgdsel=%d, frgdmix=%02x, curx=%d, cury=%d, cll=%d, b2e8pix=%x.\n", cmd, s3->accel.cmd, s3->bpp, clip_r, clip_b, s3->accel.multifunc[0x0a] & 0xc4, svga->crtc[0x53] & 0x18, srcbase, dstbase, cpu_dat & 0xffff, mix_dat & 0xffff, count, rd_mask, wrt_mask, s3->width, s3->accel.sx, s3->accel.sy, s3->accel.cx, s3->accel.cy, s3->accel.dx, s3->accel.dy, s3->color_16bit, frgd_color, bkgd_color, frgd_mix, bkgd_mix, s3->accel.frgd_mix & 0x0f, s3->accel.cur_x, s3->accel.cur_y, clip_l, s3->accel.b2e8_pix);
+
     switch (cmd) {
         case 0: /*NOP (Short Stroke Vectors)*/
             if (s3->accel.ssv_state == 0)
                 break;
 
-            frgd_mix = (s3->accel.frgd_mix >> 5) & 3;
-            bkgd_mix = (s3->accel.bkgd_mix >> 5) & 3;
-
-            if (s3->accel.cmd & 8) /*Radial*/
-            {
+            if (s3->accel.cmd & 0x08) { /*Radial*/
                 while (count-- && s3->accel.ssv_len >= 0) {
                     if ((s3->accel.cx & 0xfff) >= clip_l && (s3->accel.cx & 0xfff) <= clip_r && (s3->accel.cy & 0xfff) >= clip_t && (s3->accel.cy & 0xfff) <= clip_b) {
                         switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
@@ -7953,9 +8403,25 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                                 break;
                         }
 
-                        if ((compare_mode == 2 && src_dat != compare) || (compare_mode == 3 && src_dat == compare) || compare_mode < 2) {
+                        if (s3->accel.multifunc[0xe] & 0x100) {
+                            if (s3->accel.multifunc[0xe] & 0x80) {
+                                if (src_dat != compare)
+                                    update = 0;
+                                else
+                                    update = 1;
+                            } else {
+                                if (src_dat == compare)
+                                    update = 0;
+                                else
+                                    update = 1;
+                            }
+                        } else
+                            update = 1;
+
+                        if (update) {
                             READ((s3->accel.cy * s3->width) + s3->accel.cx, dest_dat);
 
+                            old_dest_dat = dest_dat;
                             MIX
 
                             if (s3->accel.ssv_draw) {
@@ -7966,13 +8432,16 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
 
                     mix_dat <<= 1;
                     mix_dat |= 1;
-                    if (s3->bpp == 0 && !s3->color_16bit)
+                    if ((s3->bpp == 0) && !s3->color_16bit)
                         cpu_dat >>= 8;
                     else
                         cpu_dat >>= 16;
 
-                    if (!s3->accel.ssv_len)
+                    if (!s3->accel.ssv_len) {
+                        s3->accel.cur_x = s3->accel.cx & 0xfff;
+                        s3->accel.cur_y = s3->accel.cy & 0xfff;
                         break;
+                    }
 
                     switch (s3->accel.ssv_dir & 0xe0) {
                         case 0x00:
@@ -8012,25 +8481,57 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                     s3->accel.cx &= 0xfff;
                     s3->accel.cy &= 0xfff;
                 }
-
-                s3->accel.cur_x = s3->accel.cx;
-                s3->accel.cur_y = s3->accel.cy;
             }
             break;
 
         case 1: /*Draw line*/
             if (!cpu_input) {
+                s3->accel.rd_mask_16bit_check = 0;
+                s3->accel.minus = 0;
+                s3->accel.color_16bit_check_pixtrans = 0;
                 s3->accel.cx = s3->accel.cur_x & 0xfff;
                 s3->accel.cy = s3->accel.cur_y & 0xfff;
+
                 s3->accel.sy = s3->accel.maj_axis_pcnt;
+                if ((s3->bpp == 0) && s3->color_16bit) {
+                    s3->accel.rd_mask_16bit_check = ((rd_mask & 0xff00) != 0xff00) && rd_mask;
+                    if (s3->accel.rd_mask_16bit_check) {
+                        if ((s3->accel.cur_x_overflow & 0xc00) == 0xc00)
+                            s3->accel.start = 1;
+                        else {
+                            if (s3->accel.start) {
+                                s3->accel.start = 0;
+                                s3->accel.minus = 0x400;
+                            } else {
+                                s3->accel.start = 0;
+                                if (s3->accel.cur_x_overflow & 0x400)
+                                    s3->accel.minus = 0x400;
+                            }
+                        }
+                    }
+                }
 
                 if (s3_cpu_src(s3))
                     return; /*Wait for data from CPU*/
             }
-            frgd_mix = (s3->accel.frgd_mix >> 5) & 3;
-            bkgd_mix = (s3->accel.bkgd_mix >> 5) & 3;
 
-            if (s3->accel.cmd & 8) { /*Radial*/
+            if (s3->accel.cmd & 0x08) { /*Radial*/
+                if ((s3->bpp == 0) && s3->color_16bit) {
+                    if (s3->accel.rd_mask_16bit_check) {
+                        if (s3->accel.minus) {
+                            wrt_mask = (s3->accel.wrt_mask_actual[1] << 8);
+                            frgd_color = (s3->accel.frgd_color_actual[1] << 8);
+                            bkgd_color = (s3->accel.bkgd_color_actual[1] << 8);
+                        } else {
+                            wrt_mask = s3->accel.wrt_mask_actual[0];
+                            frgd_color = s3->accel.frgd_color_actual[0];
+                            bkgd_color = s3->accel.bkgd_color_actual[0];
+                        }
+                        rd_mask &= 0x00ff;
+                    } else if (!s3->accel.rd_mask_16bit_check && (s3->accel.cur_x & 0x400))
+                        break;
+                }
+
                 while (count-- && s3->accel.sy >= 0) {
                     if ((s3->accel.cx & 0xfff) >= clip_l && (s3->accel.cx & 0xfff) <= clip_r && (s3->accel.cy & 0xfff) >= clip_t && (s3->accel.cy & 0xfff) <= clip_b) {
                         switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
@@ -8051,12 +8552,28 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                                 break;
                         }
 
-                        if ((compare_mode == 2 && src_dat != compare) || (compare_mode == 3 && src_dat == compare) || compare_mode < 2) {
-                            READ((s3->accel.cy * s3->width) + s3->accel.cx, dest_dat);
+                        if (s3->accel.multifunc[0xe] & 0x100) {
+                            if (s3->accel.multifunc[0xe] & 0x80) {
+                                if (src_dat != compare)
+                                    update = 0;
+                                else
+                                    update = 1;
+                            } else {
+                                if (src_dat == compare)
+                                    update = 0;
+                                else
+                                    update = 1;
+                            }
+                        } else
+                            update = 1;
 
+                        if (update) {
+                            READ((s3->accel.cy * s3->width) + s3->accel.cx - s3->accel.minus, dest_dat);
+
+                            old_dest_dat = dest_dat;
                             MIX
 
-                            WRITE((s3->accel.cy * s3->width) + s3->accel.cx, dest_dat);
+                            WRITE((s3->accel.cy * s3->width) + s3->accel.cx - s3->accel.minus, dest_dat);
                         }
                     }
 
@@ -8067,8 +8584,15 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                     else
                         cpu_dat >>= 16;
 
-                    if (!s3->accel.sy)
+                    if (!s3->accel.sy) {
+                        if (s3->accel.rd_mask_16bit_check)  {
+                            if (s3->accel.minus)
+                                s3->accel.color_16bit_check = 0;
+                            else
+                                s3->accel.color_16bit_check = 1;
+                        }
                         break;
+                    }
 
                     switch (s3->accel.cmd & 0xe0) {
                         case 0x00:
@@ -8107,20 +8631,57 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                     s3->accel.cx &= 0xfff;
                     s3->accel.cy &= 0xfff;
                 }
-                s3->accel.cur_x = s3->accel.cx;
-                s3->accel.cur_y = s3->accel.cy;
+                s3->accel.cur_x = s3->accel.cx & 0xfff;
+                s3->accel.cur_y = s3->accel.cy & 0xfff;
             } else { /*Bresenham*/
-                if (s3->accel.b2e8_pix && s3_cpu_src(s3) && (count == 16)) { /*Stupid undocumented 0xB2E8 on 911/924*/
+                if (s3->accel.b2e8_pix && s3_cpu_src(s3) && (count == 16)) { /*Pattern on pixtrans (911/924)*/
                     count              = s3->accel.maj_axis_pcnt + 1;
                     s3->accel.temp_cnt = 16;
+                    if ((s3->bpp == 0) && s3->color_16bit) {
+                        if (s3->accel.rd_mask_16bit_check) {
+                            if (s3->accel.minus) {
+                                wrt_mask = (s3->accel.wrt_mask_actual[1] << 8);
+                                frgd_color = (s3->accel.frgd_color_actual[1] << 8);
+                                bkgd_color = (s3->accel.bkgd_color_actual[1] << 8);
+                            } else {
+                                wrt_mask = s3->accel.wrt_mask_actual[0];
+                                frgd_color = s3->accel.frgd_color_actual[0];
+                                bkgd_color = s3->accel.bkgd_color_actual[0];
+                            }
+                            rd_mask &= 0x00ff;
+                        } else if (!s3->accel.rd_mask_16bit_check && (s3->accel.cur_x & 0x400))
+                            break;
+                    }
+                } else {
+                    if ((s3->bpp == 0) && s3->color_16bit) {
+                        if (s3->accel.rd_mask_16bit_check) {
+                            if (s3->accel.minus) {
+                                wrt_mask = (s3->accel.wrt_mask_actual[1] << 8);
+                                frgd_color = (s3->accel.frgd_color_actual[1] << 8);
+                                bkgd_color = (s3->accel.bkgd_color_actual[1] << 8);
+                            } else {
+                                wrt_mask = s3->accel.wrt_mask_actual[0];
+                                frgd_color = s3->accel.frgd_color_actual[0];
+                                bkgd_color = s3->accel.bkgd_color_actual[0];
+                            }
+                            rd_mask &= 0x00ff;
+                        } else if (!s3->accel.rd_mask_16bit_check && (s3->accel.cur_x & 0x400))
+                            break;
+                    }
                 }
 
-                while (count-- && s3->accel.sy >= 0) {
+                if (!s3->accel.b2e8_pix)
+                    s3_log("CMDFULL=%04x, FRGDMIX=%x, FRGDCOLR=%04x, RDMASK=%04x, MINUS=%d, WRTMASK=%04X, MIX=%04x, CX=%d, CY=%d, SX=%d, SY=%d, PIXCNTL=%02x, 16BITCOLOR=%x, RDCHECK=%x, CLIPL=%d, CLIPR=%d, CLIPT=%d, CLIPB=%d.\n", s3->accel.cmd, frgd_mix, s3->accel.frgd_color, rd_mask, s3->accel.minus, wrt_mask, mix_dat & 0xffff, s3->accel.cx, s3->accel.cy, s3->accel.sx, s3->accel.sy, s3->accel.multifunc[0x0a] & 0xc4, s3->accel.color_16bit_check, s3->accel.rd_mask_16bit_check, clip_l, clip_r, clip_t, clip_b);
+
+                while (count-- && (s3->accel.sy >= 0)) {
                     if (s3->accel.b2e8_pix && s3_cpu_src(s3) && !s3->accel.temp_cnt) {
                         mix_dat >>= 16;
                         s3->accel.temp_cnt = 16;
                     }
 
+                    if (s3->accel.minus)
+                        s3_log("Total pixel cx=%d, cy=%d.\n", s3->accel.cx - s3->accel.minus, s3->accel.cy);
+
                     if ((s3->accel.cx & 0xfff) >= clip_l && (s3->accel.cx & 0xfff) <= clip_r && (s3->accel.cy & 0xfff) >= clip_t && (s3->accel.cy & 0xfff) <= clip_b) {
                         switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                             case 0:
@@ -8140,12 +8701,28 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                                 break;
                         }
 
-                        if ((compare_mode == 2 && src_dat != compare) || (compare_mode == 3 && src_dat == compare) || compare_mode < 2) {
-                            READ((s3->accel.cy * s3->width) + s3->accel.cx, dest_dat);
+                        if (s3->accel.multifunc[0xe] & 0x100) {
+                            if (s3->accel.multifunc[0xe] & 0x80) {
+                                if (src_dat != compare)
+                                    update = 0;
+                                else
+                                    update = 1;
+                            } else {
+                                if (src_dat == compare)
+                                    update = 0;
+                                else
+                                    update = 1;
+                            }
+                        } else
+                            update = 1;
 
+                        if (update) {
+                            READ((s3->accel.cy * s3->width) + s3->accel.cx - s3->accel.minus, dest_dat);
+
+                            old_dest_dat = dest_dat;
                             MIX
 
-                            WRITE((s3->accel.cy * s3->width) + s3->accel.cx, dest_dat);
+                            WRITE((s3->accel.cy * s3->width) + s3->accel.cx - s3->accel.minus, dest_dat);
                         }
                     }
 
@@ -8160,13 +8737,20 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                         mix_dat |= 1;
                     }
 
-                    if (s3->bpp == 0 && !s3->color_16bit)
+                    if ((s3->bpp == 0) && !s3->color_16bit)
                         cpu_dat >>= 8;
                     else
                         cpu_dat >>= 16;
 
-                    if (!s3->accel.sy)
+                    if (!s3->accel.sy) {
+                        if (s3->accel.rd_mask_16bit_check)  {
+                            if (s3->accel.minus)
+                                s3->accel.color_16bit_check = 0;
+                            else
+                                s3->accel.color_16bit_check = 1;
+                        }
                         break;
+                    }
 
                     if (s3->accel.cmd & 0x40) {
                         if (s3->accel.cmd & 0x80)
@@ -8174,7 +8758,7 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                         else
                             s3->accel.cy--;
 
-                        if (s3->accel.err_term >= 0) {
+                        if (s3->accel.err_term >= s3->accel.maj_axis_pcnt) {
                             s3->accel.err_term += s3->accel.destx_distp;
                             if (s3->accel.cmd & 0x20)
                                 s3->accel.cx++;
@@ -8188,7 +8772,7 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                         else
                             s3->accel.cx--;
 
-                        if (s3->accel.err_term >= 0) {
+                        if (s3->accel.err_term >= s3->accel.maj_axis_pcnt) {
                             s3->accel.err_term += s3->accel.destx_distp;
                             if (s3->accel.cmd & 0x80)
                                 s3->accel.cy++;
@@ -8202,14 +8786,17 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                     s3->accel.cx &= 0xfff;
                     s3->accel.cy &= 0xfff;
                 }
-                s3->accel.cur_x = s3->accel.cx;
-                s3->accel.cur_y = s3->accel.cy;
+                s3->accel.cur_x = s3->accel.cx & 0xfff;
+                s3->accel.cur_y = s3->accel.cy & 0xfff;
             }
             break;
 
-        case 2:             /*Rectangle fill*/
+        case 2: /*Rectangle fill*/
             if (!cpu_input) /*!cpu_input is trigger to start operation*/
             {
+                s3->accel.minus = 0;
+                s3->accel.mix_dat_upper = 0;
+                s3->accel.color_16bit_check_pixtrans = 0;
                 s3->accel.sx = s3->accel.maj_axis_pcnt & 0xfff;
                 s3->accel.sy = s3->accel.multifunc[0] & 0xfff;
                 s3->accel.cx = s3->accel.cur_x & 0xfff;
@@ -8217,6 +8804,59 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
 
                 s3->accel.dest = dstbase + s3->accel.cy * s3->width;
 
+                if ((s3->bpp == 0) && s3->color_16bit) {
+                    s3->accel.rd_mask_16bit_check = ((rd_mask & 0xff00) != 0xff00) && rd_mask;
+                    if (s3->accel.rd_mask_16bit_check) {
+                        if (s3->accel.cmd == 0x41b3) {
+                            if (frgd_mix == 0) {
+                                if (!(s3->accel.cur_x & 0x400))
+                                    s3->accel.color_16bit_check = 0;
+                            } else {
+                                if ((s3->accel.cur_x_overflow & 0xc00) == 0xc00)
+                                    s3->accel.start = 1;
+                                else {
+                                    if (s3->accel.start) {
+                                        s3->accel.start = 0;
+                                        s3->accel.minus = 0x400;
+                                    } else {
+                                        s3->accel.start = 0;
+                                        if (s3->accel.cur_x_overflow & 0x400)
+                                            s3->accel.minus = 0x400;
+                                    }
+                                }
+                            }
+                        } else {
+                            if ((s3->accel.cur_x_overflow & 0xc00) == 0xc00)
+                                s3->accel.start = 1;
+                            else {
+                                if (s3->accel.start) {
+                                    s3->accel.start = 0;
+                                    s3->accel.minus = 0x400;
+                                } else {
+                                    s3->accel.start = 0;
+                                    if (s3->accel.cur_x_overflow & 0x400)
+                                        s3->accel.minus = 0x400;
+                                }
+                            }
+                        }
+                    } else {
+                        if (s3->accel.cmd & 0x100) {
+                            if (mix_mask == 0x80) {
+                                if (s3->accel.cur_x & 0x400)
+                                    s3->accel.minus = 0x400;
+                                else
+                                    s3->accel.minus = 0;
+                            }
+                        }
+                    }
+                } else
+                    s3->accel.rd_mask_16bit_check = 0;
+
+                if (s3->accel.cur_x & 0x400)
+                    s3_log("Rectangle Fill + 1024 FULLCMD=%04x: frgdcolor=%04x, s=%d,%d, c=%d,%d, frmix=%x, bkmix=%x, pixcntl=%02x, m2=%d, m4=%d.\n", s3->accel.cmd, s3->accel.frgd_color_actual[1] << 8, s3->accel.sx, s3->accel.sy, s3->accel.cx, s3->accel.cy, frgd_mix, bkgd_mix, s3->accel.multifunc[0xa] & 0xc0, s3->accel.multifunc[2], s3->accel.multifunc[4]);
+                else
+                    s3_log("Rectangle Fill + 0 FULLCMD=%04x: frgdcolor=%04x, s=%d,%d, c=%d,%d, frmix=%x, bkmix=%x, pixcntl=%02x, m2=%d, m4=%d.\n", s3->accel.cmd, s3->accel.frgd_color_actual[0], s3->accel.sx, s3->accel.sy, s3->accel.cx, s3->accel.cy, frgd_mix, bkgd_mix, s3->accel.multifunc[0xa] & 0xc0, s3->accel.multifunc[2], s3->accel.multifunc[4]);
+
                 if (s3_cpu_src(s3)) {
                     s3->data_available = 0;
                     return; /*Wait for data from CPU*/
@@ -8226,21 +8866,91 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                 }
             }
 
-            frgd_mix = (s3->accel.frgd_mix >> 5) & 3;
-            bkgd_mix = (s3->accel.bkgd_mix >> 5) & 3;
-
-            if (s3->accel.b2e8_pix && s3_cpu_src(s3) && count == 16) { /*Stupid undocumented 0xB2E8 on 911/924*/
+            if (s3->accel.b2e8_pix && s3_cpu_src(s3) && (count == 16)) { /*Pattern on pixtrans (911/924)*/
                 count              = s3->accel.maj_axis_pcnt + 1;
                 s3->accel.temp_cnt = 16;
+                if (s3->accel.rd_mask_16bit_check) {
+                    if (s3->accel.minus) {
+                        wrt_mask = (s3->accel.wrt_mask_actual[1] << 8);
+                        frgd_color = (s3->accel.frgd_color_actual[1] << 8);
+                        bkgd_color = (s3->accel.bkgd_color_actual[1] << 8);
+                    } else {
+                        wrt_mask = s3->accel.wrt_mask_actual[0];
+                        frgd_color = s3->accel.frgd_color_actual[0];
+                        bkgd_color = s3->accel.bkgd_color_actual[0];
+                    }
+                    rd_mask &= 0x00ff;
+                } else if (!s3->accel.rd_mask_16bit_check && (s3->accel.cur_x & 0x400))
+                    break;
+            } else {
+                if ((s3->bpp == 0) && s3->color_16bit) {
+                    if (s3->accel.cmd == 0x41b3) {
+                        if (frgd_mix != 0) {
+                            if (s3->accel.rd_mask_16bit_check) {
+                                if (s3->accel.minus) {
+                                    wrt_mask = (s3->accel.wrt_mask_actual[1] << 8);
+                                    frgd_color = (s3->accel.frgd_color_actual[1] << 8);
+                                    bkgd_color = (s3->accel.bkgd_color_actual[1] << 8);
+                                } else {
+                                    wrt_mask = s3->accel.wrt_mask_actual[0];
+                                    frgd_color = s3->accel.frgd_color_actual[0];
+                                    bkgd_color = s3->accel.bkgd_color_actual[0];
+                                }
+                                rd_mask &= 0x00ff;
+                            } else if (!s3->accel.rd_mask_16bit_check && (s3->accel.cur_x & 0x400))
+                                break;
+                        } else {
+                            if (s3->accel.rd_mask_16bit_check) {
+                                if (s3->accel.minus) {
+                                    wrt_mask = (s3->accel.wrt_mask_actual[1] << 8);
+                                    frgd_color = (s3->accel.frgd_color_actual[1] << 8);
+                                    bkgd_color = (s3->accel.bkgd_color_actual[1] << 8);
+                                } else {
+                                    wrt_mask = s3->accel.wrt_mask_actual[0];
+                                    frgd_color = s3->accel.frgd_color_actual[0];
+                                    bkgd_color = s3->accel.bkgd_color_actual[0];
+                                    s3->accel.mix_dat_upper = !!(mix_dat & 0xff00);
+                                }
+                                rd_mask &= 0x00ff;
+                            }
+                        }
+                    } else {
+                        if (s3->accel.rd_mask_16bit_check) {
+                            if (s3->accel.minus) {
+                                wrt_mask = (s3->accel.wrt_mask_actual[1] << 8);
+                                frgd_color = (s3->accel.frgd_color_actual[1] << 8);
+                                bkgd_color = (s3->accel.bkgd_color_actual[1] << 8);
+                            } else {
+                                wrt_mask = s3->accel.wrt_mask_actual[0];
+                                frgd_color = s3->accel.frgd_color_actual[0];
+                                bkgd_color = s3->accel.bkgd_color_actual[0];
+                            }
+                            rd_mask &= 0x00ff;
+                        } else {
+                            if ((s3_cpu_src(s3)) && !(s3->accel.cmd & 0x200)) {
+                                s3_log("FIXME: S3 911/924 15/16bpp documentation needed.\n");
+                            } else {
+                                if (!cpu_input && (s3->accel.cur_x & 0x400)) {
+                                    s3_log("No Input.\n");
+                                    break;
+                                } else if (cpu_input && (s3->accel.cmd == 0x53b3) && (s3->accel.cur_x & 0x400))
+                                    break;
+                            }
+                        }
+                    }
+                }
             }
 
-            while (count-- && s3->accel.sy >= 0) {
-                if (s3->accel.b2e8_pix && s3_cpu_src(s3) && s3->accel.temp_cnt == 0) {
+            s3_log("CMDFULL=%04x, FRGDSEL=%x, BKGDSEL=%x, FRGDMIX=%02x, BKGDMIX=%02x, MASKCHECK=%x, RDMASK=%04x, MINUS=%d, WRTMASK=%04X, MIX=%04x, CX=%d, CY=%d, DX=%d, DY=%d, SX=%d, SY=%d, PIXCNTL=%02x, 16BITCOLOR=%x, RDCHECK=%x, CLIPL=%d, CLIPR=%d, OVERFLOW=%d, pitch=%d.\n", s3->accel.cmd, frgd_mix, bkgd_mix, s3->accel.frgd_mix & 0x0f, s3->accel.bkgd_mix & 0x0f, s3->accel.rd_mask_16bit_check, rd_mask, s3->accel.minus, wrt_mask, mix_dat & 0xffff, s3->accel.cx, s3->accel.cy, s3->accel.dx, s3->accel.dy, s3->accel.sx, s3->accel.sy, s3->accel.multifunc[0x0a] & 0xc4, s3->accel.color_16bit_check, s3->accel.rd_mask_16bit_check, clip_l, clip_r, (s3->accel.destx_overflow & 0xc00) == 0xc00, s3->width);
+
+            while (count-- && (s3->accel.sy >= 0)) {
+                if (s3->accel.b2e8_pix && s3_cpu_src(s3) && !s3->accel.temp_cnt) {
                     mix_dat >>= 16;
                     s3->accel.temp_cnt = 16;
                 }
 
-                if ((s3->accel.cx & 0xfff) >= clip_l && (s3->accel.cx & 0xfff) <= clip_r && (s3->accel.cy & 0xfff) >= clip_t && (s3->accel.cy & 0xfff) <= clip_b) {
+                if ((((s3->accel.cx >= clip_l) && (s3->accel.cx <= clip_r) && (s3->accel.cy >= clip_t) && (s3->accel.cy <= clip_b)) && !(s3->accel.multifunc[0xe] & 0x20)) ||
+                    (((s3->accel.cx < clip_l) && (s3->accel.cx > clip_r) && (s3->accel.cy < clip_t) && (s3->accel.cy > clip_b)) && (s3->accel.multifunc[0xe] & 0x20)) ) {
                     if (s3_cpu_dest(s3) && ((s3->accel.multifunc[0xa] & 0xc0) == 0x00)) {
                         mix_dat = mix_mask; /* Mix data = forced to foreground register. */
                     } else if (s3_cpu_dest(s3) && vram_mask) {
@@ -8251,7 +8961,7 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                     }
 
                     if (s3_cpu_dest(s3)) {
-                        READ(s3->accel.dest + s3->accel.cx, src_dat);
+                        READ(s3->accel.dest + s3->accel.cx - s3->accel.minus, src_dat);
                         if (vram_mask)
                             src_dat = ((src_dat & rd_mask) == rd_mask);
                     } else {
@@ -8274,13 +8984,38 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                         }
                     }
 
-                    if ((compare_mode == 2 && src_dat != compare) || (compare_mode == 3 && src_dat == compare) || compare_mode < 2) {
-                        READ(s3->accel.dest + s3->accel.cx, dest_dat);
+                    if (s3->accel.multifunc[0xe] & 0x100) {
+                        if (s3->accel.multifunc[0xe] & 0x80) {
+                            if (src_dat != compare)
+                                update = 0;
+                            else
+                                update = 1;
+                        } else {
+                            if (src_dat == compare)
+                                update = 0;
+                            else
+                                update = 1;
+                        }
+                    } else
+                        update = 1;
 
-                        MIX
+                    if (update) {
+                        READ(s3->accel.dest + s3->accel.cx - s3->accel.minus, dest_dat);
+
+                        if (s3_cpu_dest(s3)) {
+                            if (vram_mask) {
+                                old_dest_dat = dest_dat;
+                                MIX
+                            }
+                        } else {
+                            old_dest_dat = dest_dat;
+                            MIX
+                        }
 
                         if (s3->accel.cmd & 0x10) {
-                            WRITE(s3->accel.dest + s3->accel.cx, dest_dat);
+                            if (!s3->accel.color_16bit_check_pixtrans) {
+                                WRITE(s3->accel.dest + s3->accel.cx - s3->accel.minus, dest_dat);
+                            }
                         }
                     }
                 }
@@ -8296,7 +9031,7 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                     mix_dat |= 1;
                 }
 
-                if (s3->bpp == 0 && !s3->color_16bit)
+                if ((s3->bpp == 0) && !s3->color_16bit)
                     cpu_dat >>= 8;
                 else
                     cpu_dat >>= 16;
@@ -8309,12 +9044,13 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                 s3->accel.cx &= 0xfff;
                 s3->accel.sx--;
                 if (s3->accel.sx < 0) {
-                    if (s3->accel.cmd & 0x20)
-                        s3->accel.cx -= (s3->accel.maj_axis_pcnt & 0xfff) + 1;
-                    else
-                        s3->accel.cx += (s3->accel.maj_axis_pcnt & 0xfff) + 1;
-
                     s3->accel.sx = s3->accel.maj_axis_pcnt & 0xfff;
+
+                    if (s3->accel.cmd & 0x20)
+                        s3->accel.cx -= (s3->accel.sx + 1);
+                    else
+                        s3->accel.cx += (s3->accel.sx + 1);
+
                     if (s3->accel.cmd & 0x80)
                         s3->accel.cy++;
                     else
@@ -8322,9 +9058,23 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
 
                     s3->accel.cy &= 0xfff;
                     s3->accel.dest = dstbase + s3->accel.cy * s3->width;
+
                     s3->accel.sy--;
 
                     if (cpu_input) {
+                        if (s3->accel.sy < 0) {
+                            if ((s3->bpp == 0) && s3->color_16bit)  {
+                                if (s3->accel.rd_mask_16bit_check) {
+                                    if (s3->accel.minus)
+                                        s3->accel.color_16bit_check = 0;
+                                    else
+                                        s3->accel.color_16bit_check = 1;
+
+                                    if ((s3->accel.cmd == 0x41b3) && (frgd_mix == 0))
+                                        s3->accel.color_16bit_check = 0;
+                                }
+                            }
+                        }
                         if (s3->accel.b2e8_pix) {
                             s3->accel.cur_x = s3->accel.cx;
                             s3->accel.cur_y = s3->accel.cy;
@@ -8332,6 +9082,14 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                         return;
                     }
                     if (s3->accel.sy < 0) {
+                        if ((s3->bpp == 0) && s3->color_16bit)  {
+                            if (s3->accel.rd_mask_16bit_check) {
+                                if (s3->accel.minus)
+                                    s3->accel.color_16bit_check = 0;
+                                else
+                                    s3->accel.color_16bit_check = 1;
+                            }
+                        }
                         s3->accel.cur_x = s3->accel.cx;
                         s3->accel.cur_y = s3->accel.cy;
                         return;
@@ -8356,8 +9114,6 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                 end_y1 = s3->accel.desty_axstp;
                 end_y2 = s3->accel.desty_axstp2;
 
-                frgd_mix = (s3->accel.frgd_mix >> 5) & 3;
-
                 while ((s3->accel.poly_cy < end_y1) && (s3->accel.poly_cy2 < end_y2)) {
                     int y       = s3->accel.poly_cy;
                     int x_count = ABS((s3->accel.poly_cx2 >> 20) - s3->accel.poly_x) + 1;
@@ -8384,9 +9140,25 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                                     break;
                             }
 
-                            if ((compare_mode == 2 && src_dat != compare) || (compare_mode == 3 && src_dat == compare) || compare_mode < 2) {
+                            if (s3->accel.multifunc[0xe] & 0x100) {
+                                if (s3->accel.multifunc[0xe] & 0x80) {
+                                    if (src_dat != compare)
+                                        update = 0;
+                                    else
+                                        update = 1;
+                                } else {
+                                    if (src_dat == compare)
+                                        update = 0;
+                                    else
+                                        update = 1;
+                                }
+                            } else
+                                update = 1;
+
+                            if (update) {
                                 READ(s3->accel.dest + s3->accel.poly_x, dest_dat);
 
+                                old_dest_dat = dest_dat;
                                 MIX
 
                                 if (s3->accel.cmd & 0x10) {
@@ -8419,12 +9191,14 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                 s3->accel.cur_x  = s3->accel.poly_cx & 0xfff;
                 s3->accel.cur_y  = s3->accel.poly_cy & 0xfff;
                 s3->accel.cur_x2 = s3->accel.poly_cx2 & 0xfff;
-                s3->accel.cur_y2 = s3->accel.poly_cy & 0xfff;
+                s3->accel.cur_y2 = s3->accel.poly_cy2 & 0xfff;
             }
             break;
 
-        case 6:             /*BitBlt*/
+        case 6: /*BitBlt*/
             if (!cpu_input) { /*!cpu_input is trigger to start operation*/
+                s3->accel.minus = 0;
+                s3->accel.minus_src_24bpp = 0;
                 s3->accel.sx = s3->accel.maj_axis_pcnt & 0xfff;
                 s3->accel.sy = s3->accel.multifunc[0] & 0xfff;
 
@@ -8434,32 +9208,73 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                 s3->accel.cx = s3->accel.cur_x & 0xfff;
                 s3->accel.cy = s3->accel.cur_y & 0xfff;
 
+                if ((s3->bpp == 0) && s3->color_16bit) {
+                    s3->accel.rd_mask_16bit_check = ((rd_mask & 0xff00) != 0xff00) && rd_mask;
+                    if (s3->accel.rd_mask_16bit_check) {
+                        if (!(clip_r & 0x400))
+                            s3->accel.start = 1;
+                        else {
+                            if (s3->accel.start) {
+                                s3->accel.start = 0;
+                                s3->accel.minus = 0x400;
+                            } else {
+                                s3->accel.start = 0;
+                                if (s3->accel.destx_distp & 0x400)
+                                    s3->accel.minus = 0x400;
+                            }
+                        }
+                    }
+                }
+
+                if (s3->accel.destx_distp & 0x400) {
+                    s3_log("BitBLT + 1024 FULLCMD=%04x: frgdcolor=%04x, s=%d,%d, d=%d,%d, frmix=%x, bkmix=%x, pixcntl=%02x.\n", s3->accel.cmd, frgd_color, s3->accel.sx, s3->accel.sy, s3->accel.dx, s3->accel.dy, frgd_mix, bkgd_mix, s3->accel.multifunc[0xa] & 0xc0);
+                } else {
+                    s3_log("BitBLT + 0 FULLCMD=%04x: frgdcolor=%04x, s=%d,%d, d=%d,%d, frmix=%x, bkmix=%x, pixcntl=%02x.\n", s3->accel.cmd, frgd_color, s3->accel.sx, s3->accel.sy, s3->accel.dx, s3->accel.dy, frgd_mix, bkgd_mix, s3->accel.multifunc[0xa] & 0xc0);
+                }
                 s3->accel.src  = srcbase + s3->accel.cy * s3->width;
                 s3->accel.dest = dstbase + s3->accel.dy * s3->width;
+                s3_log("BitBLT: D(%d,%d).\n", s3->accel.dx, s3->accel.dy);
             }
 
-            if ((s3->accel.cmd & 0x100) && !cpu_input) {
+            if ((s3->accel.cmd & 0x100) && !cpu_input)
                 return; /*Wait for data from CPU*/
+
+            if ((s3->bpp == 0) && s3->color_16bit) {
+                if (s3->accel.rd_mask_16bit_check) {
+                    if (s3->accel.minus) {
+                        wrt_mask = (s3->accel.wrt_mask_actual[1] << 8);
+                        frgd_color = (s3->accel.frgd_color_actual[1] << 8);
+                        bkgd_color = (s3->accel.bkgd_color_actual[1] << 8);
+                    } else {
+                        wrt_mask = s3->accel.wrt_mask_actual[0];
+                        frgd_color = s3->accel.frgd_color_actual[0];
+                        bkgd_color = s3->accel.bkgd_color_actual[0];
+                    }
+                    rd_mask &= 0x00ff;
+                } else if (!s3->accel.rd_mask_16bit_check && (s3->accel.destx_distp & 0x400))
+                    break;
             }
 
-            frgd_mix = (s3->accel.frgd_mix >> 5) & 3;
-            bkgd_mix = (s3->accel.bkgd_mix >> 5) & 3;
+            s3_log("CMDFULL=%04x, FRGDSEL=%x, BKGDSEL=%x, FRGDMIX=%02x, BKGDMIX=%02x, MASKCHECK=%x, RDMASK=%04x, MINUS=%d, WRTMASK=%04X, MIX=%04x, CX=%d, CY=%d, DX=%d, DY=%d, SX=%d, SY=%d, PIXCNTL=%02x, 16BITCOLOR=%x, RDCHECK=%x, CLIPL=%d, CLIPR=%d, OVERFLOW=%d, pitch=%d.\n", s3->accel.cmd, frgd_mix, bkgd_mix, s3->accel.frgd_mix & 0x0f, s3->accel.bkgd_mix & 0x0f, s3->accel.rd_mask_16bit_check, rd_mask, s3->accel.minus, wrt_mask, mix_dat & 0xffff, s3->accel.cx, s3->accel.cy, s3->accel.dx, s3->accel.dy, s3->accel.sx, s3->accel.sy, s3->accel.multifunc[0x0a] & 0xc4, s3->accel.color_16bit_check, s3->accel.rd_mask_16bit_check, clip_l, clip_r, (s3->accel.destx_overflow & 0xc00) == 0xc00, s3->width);
 
-            if (!cpu_input && frgd_mix == 3 && !vram_mask && !compare_mode && (s3->accel.cmd & 0xa0) == 0xa0 && (s3->accel.frgd_mix & 0xf) == 7 && (s3->accel.bkgd_mix & 0xf) == 7) {
+            if (!cpu_input && (frgd_mix == 3) && !vram_mask && !(s3->accel.multifunc[0xe] & 0x100) && ((s3->accel.cmd & 0xa0) == 0xa0) && ((s3->accel.frgd_mix & 0xf) == 7) && ((s3->accel.bkgd_mix & 0xf) == 7)) {
+                s3_log("Special BitBLT.\n");
                 while (1) {
-                    if ((s3->accel.dx & 0xfff) >= clip_l && (s3->accel.dx & 0xfff) <= clip_r && (s3->accel.dy & 0xfff) >= clip_t && (s3->accel.dy & 0xfff) <= clip_b) {
-                        READ(s3->accel.src + s3->accel.cx, src_dat);
-                        READ(s3->accel.dest + s3->accel.dx, dest_dat);
-
+                    if ((s3->accel.dx >= clip_l) && (s3->accel.dx <= clip_r) && (s3->accel.dy >= clip_t) && (s3->accel.dy <= clip_b)) {
+                        READ(s3->accel.src + s3->accel.cx - s3->accel.minus, src_dat);
+                        READ(s3->accel.dest + s3->accel.dx - s3->accel.minus, dest_dat);
                         dest_dat = (src_dat & wrt_mask) | (dest_dat & ~wrt_mask);
 
-                        WRITE(s3->accel.dest + s3->accel.dx, dest_dat);
+                        if (s3->accel.cmd & 0x10) {
+                            WRITE(s3->accel.dest + s3->accel.dx - s3->accel.minus, dest_dat);
+                        }
                     }
 
                     s3->accel.cx++;
                     s3->accel.dx++;
                     s3->accel.sx--;
                     s3->accel.dx &= 0xfff;
+
                     if (s3->accel.sx < 0) {
                         s3->accel.cx -= (s3->accel.maj_axis_pcnt & 0xfff) + 1;
                         s3->accel.dx -= (s3->accel.maj_axis_pcnt & 0xfff) + 1;
@@ -8468,13 +9283,18 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                         s3->accel.cy++;
                         s3->accel.dy++;
 
-                        s3->accel.dy &= 0xfff;
-                        s3->accel.src  = srcbase + s3->accel.cy * s3->width;
-                        s3->accel.dest = dstbase + s3->accel.dy * s3->width;
+                        s3->accel.src  = srcbase + (s3->accel.cy * s3->width);
+                        s3->accel.dest = dstbase + (s3->accel.dy * s3->width);
 
                         s3->accel.sy--;
 
                         if (s3->accel.sy < 0) {
+                            if (s3->accel.rd_mask_16bit_check)  {
+                                if (s3->accel.minus)
+                                    s3->accel.color_16bit_check = 0;
+                                else
+                                    s3->accel.color_16bit_check = 1;
+                            }
                             s3->accel.destx_distp = s3->accel.dx;
                             s3->accel.desty_axstp = s3->accel.dy;
                             return;
@@ -8482,8 +9302,9 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                     }
                 }
             } else {
-                while (count-- && s3->accel.sy >= 0) {
-                    if ((s3->accel.dx & 0xfff) >= clip_l && (s3->accel.dx & 0xfff) <= clip_r && ((s3->accel.dy & 0xfff) >= clip_t && (s3->accel.dy & 0xfff) <= clip_b)) {
+                s3_log("Normal blit, srcbase=%08x, dstbase=%08x, full=%04x, wrt_mask=%08x, extmultifunc0e=%03x, frgdmixval=%02x.\n", srcbase, dstbase, s3->accel.cmd, wrt_mask, s3->accel.multifunc[0x0e] & 0x180, s3->accel.frgd_mix);
+                while (count-- && (s3->accel.sy >= 0)) {
+                    if ((s3->accel.dx >= clip_l) && (s3->accel.dx <= clip_r) && (s3->accel.dy >= clip_t) && (s3->accel.dy <= clip_b)) {
                         if (vram_mask && (s3->accel.cmd & 0x10)) {
                             READ(s3->accel.src + s3->accel.cx, mix_dat);
                             mix_dat = ((mix_dat & rd_mask) == rd_mask);
@@ -8500,7 +9321,7 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                                 src_dat = cpu_dat;
                                 break;
                             case 3:
-                                READ(s3->accel.src + s3->accel.cx, src_dat);
+                                READ(s3->accel.src + s3->accel.cx - s3->accel.minus, src_dat);
                                 if (vram_mask && (s3->accel.cmd & 0x10))
                                     src_dat = ((src_dat & rd_mask) == rd_mask);
                                 break;
@@ -8509,13 +9330,29 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                                 break;
                         }
 
-                        if ((compare_mode == 2 && src_dat != compare) || (compare_mode == 3 && src_dat == compare) || compare_mode < 2) {
-                            READ(s3->accel.dest + s3->accel.dx, dest_dat);
+                        if (s3->accel.multifunc[0xe] & 0x100) {
+                            if (s3->accel.multifunc[0xe] & 0x80) {
+                                if (src_dat != compare)
+                                    update = 0;
+                                else
+                                    update = 1;
+                            } else {
+                                if (src_dat == compare)
+                                    update = 0;
+                                else
+                                    update = 1;
+                            }
+                        } else
+                            update = 1;
 
+                        if (update) {
+                            READ(s3->accel.dest + s3->accel.dx - s3->accel.minus, dest_dat);
+
+                            old_dest_dat = dest_dat;
                             MIX
 
                             if ((!(s3->accel.cmd & 0x10) && vram_mask) || (s3->accel.cmd & 0x10)) {
-                                WRITE(s3->accel.dest + s3->accel.dx, dest_dat);
+                                WRITE(s3->accel.dest + s3->accel.dx - s3->accel.minus, dest_dat);
                             }
                         }
                     }
@@ -8523,7 +9360,7 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                     mix_dat <<= 1;
                     mix_dat |= 1;
 
-                    if (s3->bpp == 0 && !s3->color_16bit)
+                    if ((s3->bpp == 0) && !s3->color_16bit)
                         cpu_dat >>= 8;
                     else
                         cpu_dat >>= 16;
@@ -8535,7 +9372,11 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                         s3->accel.cx--;
                         s3->accel.dx--;
                     }
-                    s3->accel.dx &= 0xfff;
+                    if (s3->accel.rd_mask_16bit_check)
+                        s3->accel.dx &= 0x7ff;
+                    else
+                        s3->accel.dx &= 0xfff;
+
                     s3->accel.sx--;
                     if (s3->accel.sx < 0) {
                         if (s3->accel.cmd & 0x20) {
@@ -8554,16 +9395,34 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                             s3->accel.cy--;
                             s3->accel.dy--;
                         }
-                        s3->accel.dy &= 0xfff;
+
                         s3->accel.src  = srcbase + s3->accel.cy * s3->width;
                         s3->accel.dest = dstbase + s3->accel.dy * s3->width;
 
                         s3->accel.sy--;
 
-                        if (cpu_input)
+                        if (cpu_input) {
+                            if (s3->accel.sy < 0) {
+                                if (s3->accel.rd_mask_16bit_check)  {
+                                    if (s3->accel.minus)
+                                        s3->accel.color_16bit_check = 0;
+                                    else
+                                        s3->accel.color_16bit_check = 1;
+                                }
+                            }
                             return;
+                        }
 
                         if (s3->accel.sy < 0) {
+                            if (s3->accel.rd_mask_16bit_check)  {
+                                if (s3->accel.minus)
+                                    s3->accel.color_16bit_check = 0;
+                                else
+                                    s3->accel.color_16bit_check = 1;
+
+                                if (s3->accel.mix_dat_upper && !vram_mask && (frgd_mix == 3))
+                                    s3->accel.color_16bit_check = 0;
+                            }
                             s3->accel.destx_distp = s3->accel.dx;
                             s3->accel.desty_axstp = s3->accel.dy;
                             return;
@@ -8573,7 +9432,7 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
             }
             break;
 
-        case 7:             /*Pattern fill - BitBlt but with source limited to 8x8*/
+        case 7: /*Pattern fill - BitBlt but with source limited to 8x8*/
             if (!cpu_input) /*!cpu_input is trigger to start operation*/
             {
                 s3->accel.sx = s3->accel.maj_axis_pcnt & 0xfff;
@@ -8595,15 +9454,11 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                 s3->accel.src = srcbase + s3->accel.pattern + (s3->accel.cy * s3->width);
             }
 
-            if ((s3->accel.cmd & 0x100) && !cpu_input) {
+            if ((s3->accel.cmd & 0x100) && !cpu_input)
                 return; /*Wait for data from CPU*/
-            }
 
-            frgd_mix = (s3->accel.frgd_mix >> 5) & 3;
-            bkgd_mix = (s3->accel.bkgd_mix >> 5) & 3;
-
-            while (count-- && s3->accel.sy >= 0) {
-                if ((s3->accel.dx & 0xfff) >= clip_l && (s3->accel.dx & 0xfff) <= clip_r && (s3->accel.dy & 0xfff) >= clip_t && (s3->accel.dy & 0xfff) <= clip_b) {
+            while (count-- && (s3->accel.sy >= 0)) {
+                if ((s3->accel.dx >= clip_l) && (s3->accel.dx <= clip_r) && (s3->accel.dy >= clip_t) && (s3->accel.dy <= clip_b)) {
                     if (vram_mask) {
                         READ(s3->accel.src + s3->accel.cx, mix_dat);
                         mix_dat = ((mix_dat & rd_mask) == rd_mask);
@@ -8611,10 +9466,10 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                     }
                     switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                         case 0:
-                            src_dat = s3->accel.bkgd_color;
+                            src_dat = bkgd_color;
                             break;
                         case 1:
-                            src_dat = s3->accel.frgd_color;
+                            src_dat = frgd_color;
                             break;
                         case 2:
                             src_dat = cpu_dat;
@@ -8629,9 +9484,25 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                             break;
                     }
 
-                    if ((compare_mode == 2 && src_dat != compare) || (compare_mode == 3 && src_dat == compare) || compare_mode < 2) {
+                    if (s3->accel.multifunc[0xe] & 0x100) {
+                        if (s3->accel.multifunc[0xe] & 0x80) {
+                            if (src_dat != compare)
+                                update = 0;
+                            else
+                                update = 1;
+                        } else {
+                            if (src_dat == compare)
+                                update = 0;
+                            else
+                                update = 1;
+                        }
+                    } else
+                        update = 1;
+
+                    if (update) {
                         READ(s3->accel.dest + s3->accel.dx, dest_dat);
 
+                        old_dest_dat = dest_dat;
                         MIX
 
                         if (s3->accel.cmd & 0x10) {
@@ -8642,7 +9513,7 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
 
                 mix_dat <<= 1;
                 mix_dat |= 1;
-                if (s3->bpp == 0 && !s3->color_16bit)
+                if ((s3->bpp == 0) && !s3->color_16bit)
                     cpu_dat >>= 8;
                 else
                     cpu_dat >>= 16;
@@ -8674,15 +9545,14 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                         s3->accel.dy--;
                     }
 
-                    s3->accel.dy &= 0xfff;
                     s3->accel.src  = srcbase + s3->accel.pattern + (s3->accel.cy * s3->width);
                     s3->accel.dest = dstbase + s3->accel.dy * s3->width;
 
                     s3->accel.sy--;
 
-                    if (cpu_input) {
+                    if (cpu_input)
                         return;
-                    }
+
                     if (s3->accel.sy < 0) {
                         s3->accel.destx_distp = s3->accel.dx;
                         s3->accel.desty_axstp = s3->accel.dy;
@@ -8720,9 +9590,25 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                         if ((s3->accel.cx & 0xfff) >= clip_l && (s3->accel.cx & 0xfff) <= clip_r && (s3->accel.cy & 0xfff) >= clip_t && (s3->accel.cy & 0xfff) <= clip_b) {
                             src_dat = s3->accel.frgd_color;
 
-                            if (((compare_mode == 2 && src_dat != compare) || (compare_mode == 3 && src_dat == compare) || compare_mode < 2) && (s3->accel.cmd & 0x10)) {
+                            if (s3->accel.multifunc[0xe] & 0x100) {
+                                if (s3->accel.multifunc[0xe] & 0x80) {
+                                    if (src_dat != compare)
+                                        update = 0;
+                                    else
+                                        update = 1;
+                                } else {
+                                    if (src_dat == compare)
+                                        update = 0;
+                                    else
+                                        update = 1;
+                                }
+                            } else
+                                update = 1;
+
+                            if (update) {
                                 READ((s3->accel.cy * s3->width) + s3->accel.cx, dest_dat);
 
+                                old_dest_dat = dest_dat;
                                 MIX
 
                                 if (s3->accel.cmd & 0x10) {
@@ -8754,9 +9640,25 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                         if ((s3->accel.cx & 0xfff) >= clip_l && (s3->accel.cx & 0xfff) <= clip_r && (s3->accel.cy & 0xfff) >= clip_t && (s3->accel.cy & 0xfff) <= clip_b) {
                             src_dat = s3->accel.frgd_color;
 
-                            if ((compare_mode == 2 && src_dat != compare) || (compare_mode == 3 && src_dat == compare) || compare_mode < 2) {
+                            if (s3->accel.multifunc[0xe] & 0x100) {
+                                if (s3->accel.multifunc[0xe] & 0x80) {
+                                    if (src_dat != compare)
+                                        update = 0;
+                                    else
+                                        update = 1;
+                                } else {
+                                    if (src_dat == compare)
+                                        update = 0;
+                                    else
+                                        update = 1;
+                                }
+                            } else
+                                update = 1;
+
+                            if (update) {
                                 READ((s3->accel.cy * s3->width) + s3->accel.cx, dest_dat);
 
+                                old_dest_dat = dest_dat;
                                 MIX
 
                                 if (s3->accel.cmd & 0x10) {
@@ -8804,9 +9706,6 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                 end_y1 = s3->accel.desty_axstp;
                 end_y2 = s3->accel.desty_axstp2;
 
-                frgd_mix = (s3->accel.frgd_mix >> 5) & 3;
-                bkgd_mix = (s3->accel.bkgd_mix >> 5) & 3;
-
                 while ((s3->accel.poly_cy < end_y1) && (s3->accel.poly_cy2 < end_y2)) {
                     int y       = s3->accel.poly_cy;
                     int x_count = ABS((s3->accel.poly_cx2 >> 20) - s3->accel.poly_x) + 1;
@@ -8843,9 +9742,25 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                                     break;
                             }
 
-                            if ((compare_mode == 2 && src_dat != compare) || (compare_mode == 3 && src_dat == compare) || compare_mode < 2) {
+                            if (s3->accel.multifunc[0xe] & 0x100) {
+                                if (s3->accel.multifunc[0xe] & 0x80) {
+                                    if (src_dat != compare)
+                                        update = 0;
+                                    else
+                                        update = 1;
+                                } else {
+                                    if (src_dat == compare)
+                                        update = 0;
+                                    else
+                                        update = 1;
+                                }
+                            } else
+                                update = 1;
+
+                            if (update) {
                                 READ(s3->accel.dest + s3->accel.poly_x, dest_dat);
 
+                                old_dest_dat = dest_dat;
                                 MIX
 
                                 if (s3->accel.cmd & 0x10) {
@@ -8886,6 +9801,8 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
             break;
 
         case 14: /*ROPBlt (Vision868/968 only)*/
+            ;
+            uint32_t mono_pattern[64] = { 0 };
             if (s3->chip != S3_VISION968 && s3->chip != S3_VISION868)
                 break;
 
@@ -8895,11 +9812,7 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                 s3->accel.sy = s3->accel.multifunc[0] & 0xfff;
 
                 s3->accel.dx = s3->accel.destx_distp & 0xfff;
-                if (s3->accel.destx_distp & 0x1000)
-                    s3->accel.dx |= ~0xfff;
                 s3->accel.dy = s3->accel.desty_axstp & 0xfff;
-                if (s3->accel.desty_axstp & 0x1000)
-                    s3->accel.dy |= ~0xfff;
 
                 s3->accel.cx = s3->accel.cur_x & 0xfff;
                 s3->accel.cy = s3->accel.cur_y & 0xfff;
@@ -8910,16 +9823,35 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                 s3->accel.dest    = dstbase + (s3->accel.dy * s3->width);
                 s3->accel.src     = srcbase + (s3->accel.cy * s3->width);
                 s3->accel.pattern = (s3->accel.py * s3->width);
+                s3_log("ROPBLT=%04x, PIXCntl=%04x, Misc1=%04x, PATBKGDCOL=%08x, PATFRGDCOL=%08x, COLBKGDCOL=%08x, COLFRGDCOL=%08x, PX=%d, PY=%d, DX=%d, DY=%d, CX=%d, CY=%d, FRGDSEL=%x, BKGDSEL=%x, RDMASK=%08x, WRTMASK=%08x, ROPMIX=%03x, pitch=%d.\n", s3->accel.cmd, s3->accel.multifunc[0xa], s3->accel.multifunc[0xe], s3->accel.pat_bg_color, s3->accel.pat_fg_color, s3->accel.bkgd_color, s3->accel.frgd_color, s3->accel.px, s3->accel.py, s3->accel.dx, s3->accel.dy, s3->accel.cx, s3->accel.cy, frgd_mix, bkgd_mix, s3->accel.rd_mask, s3->accel.wrt_mask, s3->accel.ropmix, s3->width);
             }
 
             if ((s3->accel.cmd & 0x100) && !cpu_input)
                 return; /*Wait for data from CPU*/
 
-            frgd_mix = (s3->accel.frgd_mix >> 5) & 3;
-            bkgd_mix = (s3->accel.bkgd_mix >> 5) & 3;
+            if (s3->accel.ropmix & 0x100) {
+                int x;
+                int y;
+                switch (s3->accel.cmd & 0x600) {
+                    case 0x000:
+                    case 0x600:
+                        mix_dat &= 0xff;
+                        break;
+                    case 0x200:
+                        mix_dat &= 0xffff;
+                        break;
+                    default:
+                        break;
+                }
 
+                for (y = 0; y < 8; y++) {
+                    for (x = 0; x < 8; x++) {
+                        mono_pattern[y * 8 + (7 - x)] = (mix_dat & (1 << (x + y * 8))) & 0x80000000;
+                    }
+                }
+            }
             while (count-- && s3->accel.sy >= 0) {
-                if ((s3->accel.dx & 0xfff) >= clip_l && (s3->accel.dx & 0xfff) <= clip_r && (s3->accel.dy & 0xfff) >= clip_t && (s3->accel.dy & 0xfff) <= clip_b) {
+                if ((s3->accel.dx >= clip_l) && (s3->accel.dx <= clip_r) && (s3->accel.dy >= clip_t) && (s3->accel.dy <= clip_b)) {
                     switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                         case 0:
                             src_dat = s3->accel.bkgd_color;
@@ -8938,24 +9870,18 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                             break;
                     }
 
-                    if (s3->accel.ropmix & 0x100) {
-                        switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
+                    if (s3->accel.ropmix & 0x100) { /*Mono pattern used*/
+                        switch (mono_pattern[(s3->accel.py & 7) * 8 + (s3->accel.px & 7)] ? (frgd_mix & 1) : (bkgd_mix & 1)) {
                             case 0:
                                 pat_dat = s3->accel.pat_bg_color;
                                 break;
                             case 1:
                                 pat_dat = s3->accel.pat_fg_color;
                                 break;
-                            case 2:
-                                pat_dat = cpu_dat;
-                                break;
-                            case 3:
-                                READ(s3->accel.pattern + s3->accel.px, pat_dat);
-                                break;
-
                             default:
                                 break;
                         }
+                        s3_log("MonoMIX=%08x, PX=%d, PY=%d.\n", mix_dat, s3->accel.px & 7, s3->accel.py & 7);
                     } else {
                         switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
                             case 0:
@@ -8976,11 +9902,27 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                         }
                     }
 
-                    if ((compare_mode == 2 && src_dat != compare) || (compare_mode == 3 && src_dat == compare) || compare_mode < 2) {
+                    if (s3->accel.multifunc[0xe] & 0x100) {
+                        if (s3->accel.multifunc[0xe] & 0x80) {
+                            if (src_dat != compare)
+                                update = 0;
+                            else
+                                update = 1;
+                        } else {
+                            if (src_dat == compare)
+                                update = 0;
+                            else
+                                update = 1;
+                        }
+                    } else
+                        update = 1;
+
+                    if (update) {
                         READ(s3->accel.dest + s3->accel.dx, dest_dat);
 
                         ROPMIX
 
+                        s3_log("Destination=%08x, Source=%08x, Pattern=%08x, OUT=%08x, mix=%08x, count=%d.\n", dest_dat, src_dat, pat_dat, out, mix_dat, count);
                         if (s3->accel.cmd & 0x10) {
                             WRITE(s3->accel.dest + s3->accel.dx, out);
                         }
@@ -8989,6 +9931,7 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
 
                 mix_dat <<= 1;
                 mix_dat |= 1;
+
                 if (s3->bpp == 0)
                     cpu_dat >>= 8;
                 else
@@ -9034,6 +9977,8 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
                     if (cpu_input /* && (s3->accel.multifunc[0xa] & 0xc0) == 0x80*/)
                         return;
                     if (s3->accel.sy < 0) {
+                        s3->accel.destx_distp = s3->accel.dx;
+                        s3->accel.desty_axstp = s3->accel.dy;
                         return;
                     }
                 }
@@ -9067,18 +10012,19 @@ s3_pci_read(UNUSED(int func), int addr, void *priv)
                 return s3->pci_regs[PCI_REG_COMMAND] | 0x80; /*Respond to IO and memory accesses*/
             else
                 return s3->pci_regs[PCI_REG_COMMAND]; /*Respond to IO and memory accesses*/
-			break;
+            break;
 
         case 0x07:
             return (s3->chip == S3_TRIO64V2) ? (s3->pci_regs[0x07] & 0x36) : (1 << 1); /*Medium DEVSEL timing*/
 
-        case 0x08: switch (s3->chip) { /*Revision ID*/
-            case S3_TRIO64V:
-                return 0x40;
-            case S3_TRIO64V2:
-                return 0x16; /*Confirmed on an onboard 64V2/DX*/
-            default:
-                return 0x00;
+        case 0x08:
+            switch (s3->chip) { /*Revision ID*/
+                case S3_TRIO64V:
+                    return 0x40;
+                case S3_TRIO64V2:
+                    return 0x16; /*Confirmed on an onboard 64V2/DX*/
+                default:
+                    return 0x00;
             }
             break;
         case 0x09:
@@ -9089,33 +10035,24 @@ s3_pci_read(UNUSED(int func), int addr, void *priv)
                 return 0x00; /*Supports VGA interface*/
             else
                 return 0x01;
+            break;
         case 0x0b:
             if (s3->chip >= S3_TRIO32 || s3->chip == S3_VISION968 || s3->chip == S3_VISION868)
                 return 0x03;
             else
                 return 0x00;
+            break;
 
         case 0x0d:
             return (s3->chip == S3_TRIO64V2) ? (s3->pci_regs[0x0d] & 0xf8) : 0x00;
 
-        case 0x10:
-            return 0x00; /*Linear frame buffer address*/
-        case 0x11:
-            return 0x00;
         case 0x12:
-            if (svga->crtc[0x53] & 0x08)
-                return 0x00;
-            else
-                return (svga->crtc[0x5a] & 0x80);
-            break;
+            return ((s3->chip == S3_VISION868) || (s3->chip == S3_VISION968) || (s3->chip >= S3_TRIO64V)) ? 0x00 :
+                       (svga->crtc[0x5a] & 0x80);
 
         case 0x13:
-            if (svga->crtc[0x53] & 0x08) {
-                return (s3->chip >= S3_TRIO64V) ? (svga->crtc[0x59] & 0xfc) : (svga->crtc[0x59] & 0xfe);
-            } else {
-                return svga->crtc[0x59];
-            }
-            break;
+            return ((s3->chip == S3_VISION868) || (s3->chip == S3_VISION968) || (s3->chip >= S3_TRIO64V)) ?
+                       (svga->crtc[0x59] & 0xfc) : svga->crtc[0x59];
 
         case 0x30:
             return s3->has_bios ? (s3->pci_regs[0x30] & 0x01) : 0x00; /*BIOS ROM address*/
@@ -9165,17 +10102,22 @@ s3_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
             break;
 
         case PCI_REG_COMMAND:
-            if (val & PCI_COMMAND_IO)
+            if (val & PCI_COMMAND_IO) {
                 s3_io_set(s3);
-            else
+            } else
                 s3_io_remove(s3);
-            s3->pci_regs[PCI_REG_COMMAND] = (val & 0x23);
+
+            if (s3->chip >= S3_TRIO64V)
+                s3->pci_regs[PCI_REG_COMMAND] = (val & 0x27);
+            else
+                s3->pci_regs[PCI_REG_COMMAND] = (val & 0x23);
+
             s3_updatemapping(s3);
-            break;
+            return;
 
         case 0x07:
             if (s3->chip == S3_TRIO64V2) {
-                s3->pci_regs[0x07] = val & 0x3e;
+                s3->pci_regs[0x07] &= ~(val & 0x30);
                 return;
             }
             break;
@@ -9188,18 +10130,14 @@ s3_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
             break;
 
         case 0x12:
-            if (!(svga->crtc[0x53] & 0x08)) {
-                svga->crtc[0x5a] = (svga->crtc[0x5a] & 0x7f) | (val & 0x80);
+            if (s3->chip < S3_TRIO64V) {
+                svga->crtc[0x5a] = val & 0x80;
                 s3_updatemapping(s3);
             }
             break;
 
         case 0x13:
-            if (svga->crtc[0x53] & 0x08) {
-                svga->crtc[0x59] = (s3->chip >= S3_TRIO64V) ? (val & 0xfc) : (val & 0xfe);
-            } else {
-                svga->crtc[0x59] = val;
-            }
+            svga->crtc[0x59] = (s3->chip >= S3_TRIO64V) ? (val & 0xfc) : val;
             s3_updatemapping(s3);
             break;
 
@@ -9294,155 +10232,69 @@ static int vram_sizes[] = {
 };
 
 static void
-s3_reset(void *priv)
+s3_disable_handlers(s3_t *s3)
 {
-    s3_t   *s3   = (s3_t *) priv;
-    svga_t *svga = &s3->svga;
-
-    memset(svga->crtc, 0x00, sizeof(svga->crtc));
-    svga->crtc[0]     = 63;
-    svga->crtc[6]     = 255;
-    svga->dispontime  = 1000ULL << 32;
-    svga->dispofftime = 1000ULL << 32;
-    svga->bpp         = 8;
-
     if (s3->pci)
-        svga->crtc[0x36] = 2 | (3 << 2) | (1 << 4);
-    else if (s3->vlb)
-        svga->crtc[0x36] = 1 | (3 << 2) | (1 << 4);
-    else
-        svga->crtc[0x36] = 3 | (1 << 4);
-
-    if (s3->chip >= S3_86C928)
-        svga->crtc[0x36] |= (vram_sizes[s3->vram] << 5);
-    else
-        svga->crtc[0x36] |= ((s3->vram == 1) ? 0x00 : 0x20) | 0x80;
-
-    svga->crtc[0x37] = 1 | (7 << 5);
-
-    if (s3->chip >= S3_86C928)
-        svga->crtc[0x37] |= 0x04;
-
-    s3_io_set(s3);
-
-    memset(s3->pci_regs, 0x00, 256);
-
-    s3->pci_regs[PCI_REG_COMMAND] = 7;
-
-    s3->pci_regs[0x30] = 0x00;
-    s3->pci_regs[0x32] = 0x0c;
-    s3->pci_regs[0x33] = 0x00;
-
-    if (s3->chip <= S3_86C924)
-        s3->accel_start = s3_911_accel_start;
-    else
-        s3->accel_start = s3_accel_start;
-
-    switch (s3->card_type) {
-        case S3_MIROCRYSTAL8S_805:
-        case S3_MIROCRYSTAL10SD_805:
-            svga->crtc[0x5a] = 0x0a;
-            svga->getclock   = sdac_getclock;
-            break;
-
-        case S3_SPEA_MIRAGE_86C801:
-        case S3_SPEA_MIRAGE_86C805:
-            svga->crtc[0x5a] = 0x0a;
-            break;
-
-        case S3_PHOENIX_86C801:
-        case S3_PHOENIX_86C805:
-            svga->crtc[0x5a] = 0x0a;
-            break;
-
-        case S3_METHEUS_86C928:
-        case S3_SPEA_MERCURY_LITE_PCI:
-            svga->crtc[0x5a] = 0x0a;
-            break;
-
-        case S3_PARADISE_BAHAMAS64:
-        case S3_PHOENIX_VISION864:
-        case S3_MIROCRYSTAL20SD_864:
-            svga->crtc[0x5a] = 0x0a;
-            break;
-
-        case S3_DIAMOND_STEALTH64_964:
-        case S3_ELSAWIN2KPROX_964:
-        case S3_MIROCRYSTAL20SV_964:
-            svga->crtc[0x5a] = 0x0a;
-            break;
-
-        case S3_ELSAWIN2KPROX:
-        case S3_SPEA_MERCURY_P64V:
-        case S3_MIROVIDEO40SV_ERGO_968:
-        case S3_NUMBER9_9FX_771:
-        case S3_PHOENIX_VISION968:
-            if (s3->pci) {
-                svga->crtc[0x53] = 0x18;
-                svga->crtc[0x58] = 0x10;
-                svga->crtc[0x59] = 0x70;
-                svga->crtc[0x5a] = 0x00;
-                svga->crtc[0x6c] = 1;
-            } else {
-                svga->crtc[0x53] = 0x00;
-                svga->crtc[0x59] = 0x00;
-                svga->crtc[0x5a] = 0x0a;
-            }
-            break;
-
-        case S3_NUMBER9_9FX_531:
-        case S3_PHOENIX_VISION868:
-            if (s3->pci) {
-                svga->crtc[0x53] = 0x18;
-                svga->crtc[0x58] = 0x10;
-                svga->crtc[0x59] = 0x70;
-                svga->crtc[0x5a] = 0x00;
-                svga->crtc[0x6c] = 1;
-            } else {
-                svga->crtc[0x53] = 0x00;
-                svga->crtc[0x59] = 0x00;
-                svga->crtc[0x5a] = 0x0a;
-            }
-            break;
-
-        case S3_PHOENIX_TRIO64:
-        case S3_PHOENIX_TRIO64_ONBOARD:
-        case S3_CARDEX_TRIO64VPLUS:
-        case S3_PHOENIX_TRIO64VPLUS:
-        case S3_PHOENIX_TRIO64VPLUS_ONBOARD:
-        case S3_DIAMOND_STEALTH64_764:
-        case S3_SPEA_MIRAGE_P64:
-        case S3_NUMBER9_9FX:
-            if (s3->chip == S3_TRIO64V)
-                svga->crtc[0x53] = 0x08;
-            break;
-
-        case S3_TRIO64V2_DX:
-            svga->crtc[0x53]   = 0x08;
-            svga->crtc[0x59]   = 0x70;
-            svga->crtc[0x5a]   = 0x00;
-            svga->crtc[0x6c]   = 1;
-            s3->pci_regs[0x05] = 0;
-            s3->pci_regs[0x06] = 0;
-            s3->pci_regs[0x07] = 2;
-            s3->pci_regs[0x3d] = 1;
-            s3->pci_regs[0x3e] = 4;
-            s3->pci_regs[0x3f] = 0xff;
-            break;
-
-        default:
-            break;
-    }
-
-    if (s3->has_bios) {
-        if (s3->pci)
-            mem_mapping_disable(&s3->bios_rom.mapping);
-    }
-
-    s3_updatemapping(s3);
+        s3_io_remove(s3);
 
+    mem_mapping_disable(&s3->linear_mapping);
     mem_mapping_disable(&s3->mmio_mapping);
     mem_mapping_disable(&s3->new_mmio_mapping);
+    mem_mapping_disable(&s3->svga.mapping);
+    if (s3->pci)
+        mem_mapping_disable(&s3->bios_rom.mapping);
+
+    /* Save all the mappings and the timers because they are part of linked lists. */
+    reset_state->linear_mapping   = s3->linear_mapping;
+    reset_state->mmio_mapping     = s3->mmio_mapping;
+    reset_state->new_mmio_mapping = s3->new_mmio_mapping;
+    reset_state->svga.mapping     = s3->svga.mapping;
+    reset_state->bios_rom.mapping = s3->bios_rom.mapping;
+
+    reset_state->svga.timer       = s3->svga.timer;
+
+    memset(s3->svga.vram, 0x00, s3->svga.vram_max + 8);
+    memset(s3->svga.changedvram, 0x00, (s3->svga.vram_max >> 12) + 1);
+}
+
+static void
+s3_reset(void *priv)
+{
+    s3_t *s3 = (s3_t *) priv;
+
+    if (reset_state != NULL) {
+        s3->accel.multifunc[0xe] &= ~(0x200 | 0x10);
+        s3_disable_handlers(s3);
+        s3->force_busy = 0;
+        s3->blitter_busy = 0;
+        s3->fifo_read_idx = 0;
+        s3->fifo_write_idx = 0;
+        if (s3->pci)
+            reset_state->pci_slot = s3->pci_slot;
+
+        *s3 = *reset_state;
+    }
+}
+
+static uint16_t
+s3_calc_crc16(int ndata, uint16_t *data)
+{
+    int i;
+    int j;
+    int s;
+    uint16_t crc16;
+    uint16_t d;
+
+    crc16 = 0;
+    for (i = 1; i < ndata; i++) {
+        d = data[i];
+        for (j = 0; j < 16; j++) {
+            s = (crc16 >> 1) + (crc16 >> 14) + (crc16 >> 15) + d + 1;
+            crc16 = (crc16 << 1) | (s & 1);
+            d >>= 1;
+        }
+    }
+    return crc16;
 }
 
 static void *
@@ -9451,10 +10303,15 @@ s3_init(const device_t *info)
     const char *bios_fn;
     int         chip;
     int         stepping;
-    s3_t       *s3   = malloc(sizeof(s3_t));
-    svga_t     *svga = &s3->svga;
+    s3_t       *s3    = calloc(1, sizeof(s3_t));
+    reset_state       = calloc(1, sizeof(s3_t));
+    svga_t     *svga  = &s3->svga;
     int         vram;
     uint32_t    vram_size;
+    nmc93cxx_eeprom_params_t params;
+    char        eeprom_filename[1024] = { 0 };
+    char        filename[1024] = { 0 };
+    uint16_t    checksum;
 
     switch (info->local) {
         case S3_ORCHID_86C911:
@@ -9477,6 +10334,11 @@ s3_init(const device_t *info)
             chip    = S3_86C801;
             video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_86c801);
             break;
+        case S3_WINNER1000_805:
+            bios_fn = ROM_WINNER1000_805;
+            chip    = S3_86C801;
+            video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_86c801);
+            break;
         case S3_86C805_ONBOARD:
             bios_fn = NULL;
             chip    = S3_86C805;
@@ -9515,6 +10377,21 @@ s3_init(const device_t *info)
             else
                 video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_86c801);
             break;
+        case S3_ELSAWIN1K_86C928:
+            bios_fn = ROM_ELSAWIN1KVL_86C928;
+            chip    = S3_86C928;
+            video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_86c805);
+            break;
+        case S3_ELSAWIN1KPCI_86C928:
+            bios_fn = ROM_ELSAWIN1KPCI_86C928;
+            chip    = S3_86C928PCI;
+            video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_86c928pci);
+            break;
+        case S3_ELSAWIN2K_86C928:
+            bios_fn = ROM_ELSAWIN2K_86C928;
+            chip    = S3_86C928;
+            video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_86c801);
+            break;
         case S3_SPEA_MERCURY_LITE_PCI:
             bios_fn = ROM_SPEA_MERCURY_LITE_PCI;
             chip    = S3_86C928PCI;
@@ -9549,10 +10426,7 @@ s3_init(const device_t *info)
         case S3_PHOENIX_VISION868:
             bios_fn = ROM_PHOENIX_VISION868;
             chip    = S3_VISION868;
-            if (info->flags & DEVICE_PCI)
-                video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_vision868_pci);
-            else
-                video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_vision868_vlb);
+            video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_vision868_pci);
             break;
         case S3_DIAMOND_STEALTH64_964:
             bios_fn = ROM_DIAMOND_STEALTH64_964;
@@ -9572,6 +10446,14 @@ s3_init(const device_t *info)
                 video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_vision964_vlb);
             }
             break;
+        case S3_DIAMOND_STEALTH64_968:
+            bios_fn = ROM_DIAMOND_STEALTH64_968;
+            chip    = S3_VISION968;
+            if (info->flags & DEVICE_PCI)
+                video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_vision968_pci);
+            else
+                video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_vision968_vlb);
+            break;
         case S3_MIROVIDEO40SV_ERGO_968:
             bios_fn = ROM_MIROVIDEO40SV_ERGO_968_PCI;
             chip    = S3_VISION968;
@@ -9585,10 +10467,7 @@ s3_init(const device_t *info)
         case S3_PHOENIX_VISION968:
             bios_fn = ROM_PHOENIX_VISION968;
             chip    = S3_VISION968;
-            if (info->flags & DEVICE_PCI)
-                video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_vision968_pci);
-            else
-                video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_vision968_vlb);
+            video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_vision968_pci);
             break;
         case S3_ELSAWIN2KPROX_964:
             bios_fn = ROM_ELSAWIN2KPROX_964;
@@ -9650,6 +10529,14 @@ s3_init(const device_t *info)
             else
                 video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_trio64_vlb);
             break;
+        case S3_STB_POWERGRAPH_64_VIDEO:
+            bios_fn = ROM_STB_POWERGRAPH_64_VIDEO;
+            chip    = S3_TRIO64V;
+            if (info->flags & DEVICE_PCI)
+                video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_trio64_pci);
+            else
+                video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_trio64_vlb);
+            break;
         case S3_PHOENIX_TRIO64VPLUS:
             bios_fn = ROM_PHOENIX_TRIO64VPLUS;
             chip    = S3_TRIO64V;
@@ -9702,14 +10589,13 @@ s3_init(const device_t *info)
             return NULL;
     }
 
-    memset(s3, 0, sizeof(s3_t));
-
     vram = device_get_config_int("memory");
 
     if (vram)
         vram_size = vram << 20;
     else
         vram_size = 512 << 10;
+
     s3->vram_mask = vram_size - 1;
     s3->vram      = vram;
 
@@ -9723,6 +10609,7 @@ s3_init(const device_t *info)
     s3->pci = !!(info->flags & DEVICE_PCI);
     s3->vlb = !!(info->flags & DEVICE_VLB);
 
+
     mem_mapping_add(&s3->linear_mapping, 0, 0,
                     svga_read_linear, svga_readw_linear, svga_readl_linear,
                     svga_write_linear, svga_writew_linear, svga_writel_linear,
@@ -9745,7 +10632,7 @@ s3_init(const device_t *info)
     mem_mapping_disable(&s3->mmio_mapping);
     mem_mapping_disable(&s3->new_mmio_mapping);
 
-    if (chip == S3_VISION964 || chip == S3_VISION968)
+    if ((chip == S3_VISION964) || (chip == S3_VISION968))
         svga_init(info, &s3->svga, s3, vram_size,
                   s3_recalctimings,
                   s3_in, s3_out,
@@ -9758,6 +10645,7 @@ s3_init(const device_t *info)
                       s3_in, s3_out,
                       s3_hwcursor_draw,
                       s3_trio64v_overlay_draw);
+            s3->color_key_enabled = !!device_get_config_int("colorkey");
         } else {
             svga_init(info, svga, s3, vram_size,
                       s3_recalctimings,
@@ -9766,6 +10654,14 @@ s3_init(const device_t *info)
                       NULL);
         }
     }
+    svga->read = s3_read;
+    svga->readw = s3_readw;
+    svga->readl = s3_readl;
+    svga->write = s3_write;
+    svga->writew = s3_writew;
+    svga->writel = s3_writel;
+    mem_mapping_set_handler(&svga->mapping, s3_read, s3_readw, s3_readl, s3_write, s3_writew, s3_writel);
+    mem_mapping_set_p(&svga->mapping, s3);
 
     svga->hwcursor.cur_ysize = 64;
 
@@ -9784,15 +10680,13 @@ s3_init(const device_t *info)
         case S3_VISION968:
             switch (info->local) {
                 case S3_ELSAWIN2KPROX:
+                case S3_DIAMOND_STEALTH64_968:
                 case S3_PHOENIX_VISION968:
                 case S3_NUMBER9_9FX_771:
                     svga->dac_hwcursor_draw = ibm_rgb528_hwcursor_draw;
                     break;
-                case S3_SPEA_MERCURY_P64V:
-                case S3_MIROVIDEO40SV_ERGO_968:
-                    svga->dac_hwcursor_draw = tvp3026_hwcursor_draw;
-                    break;
                 default:
+                    svga->dac_hwcursor_draw = tvp3026_hwcursor_draw;
                     break;
             }
             break;
@@ -9866,10 +10760,10 @@ s3_init(const device_t *info)
 
     svga->force_old_addr = 1;
 
-    if (s3->chip <= S3_86C924)
-        s3->accel_start = s3_911_accel_start;
-    else
-        s3->accel_start = s3_accel_start;
+    s3->accel_start = s3_accel_start;
+
+    s3->elsa_eeprom = 0;
+    s3->ramdac_type = BUILT_IN;
 
     switch (s3->card_type) {
         case S3_ORCHID_86C911:
@@ -9880,11 +10774,18 @@ s3_init(const device_t *info)
             s3->id_ext        = stepping;
             s3->id_ext_pci    = 0;
             s3->packed_mmio   = 0;
-            s3->width         = 1024;
 
             svga->ramdac    = device_add(&sc11483_ramdac_device);
-            svga->clock_gen = device_add(&av9194_device);
-            svga->getclock  = av9194_getclock;
+            s3->ramdac_type = SC1148X;
+            if (s3->card_type == S3_ORCHID_86C911) {
+                svga->clock_gen = device_add(&av9194_device);
+                svga->getclock  = av9194_getclock;
+            } else {
+                /* DCS2824-0 = Diamond ICD2061A-compatible. */
+                svga->clock_gen   = device_add(&icd2061_device);
+                svga->getclock    = icd2061_getclock;
+                icd2061_set_ref_clock(svga->ramdac, svga, 14318184.0f);
+            }
             break;
 
         case S3_AMI_86C924:
@@ -9894,9 +10795,9 @@ s3_init(const device_t *info)
             s3->id_ext        = stepping;
             s3->id_ext_pci    = 0;
             s3->packed_mmio   = 0;
-            s3->width         = 1024;
 
-            svga->ramdac    = device_add(&att490_ramdac_device);
+            svga->ramdac    = device_add(&sc11483_ramdac_device);
+            s3->ramdac_type = SC1148X;
             svga->clock_gen = device_add(&ics2494an_305_device);
             svga->getclock  = ics2494_getclock;
             break;
@@ -9912,23 +10813,28 @@ s3_init(const device_t *info)
             svga->crtc[0x5a]  = 0x0a;
 
             svga->ramdac    = device_add(&gendac_ramdac_device);
+            s3->ramdac_type = S3_SDAC;
             svga->clock_gen = svga->ramdac;
             svga->getclock  = sdac_getclock;
             break;
 
         case S3_SPEA_MIRAGE_86C801:
         case S3_SPEA_MIRAGE_86C805:
+        case S3_WINNER1000_805:
             svga->decode_mask = (2 << 20) - 1;
-            stepping          = 0xa0; /*86C801/86C805*/
+            stepping          = 0xa2; /*86C801/86C805*/
             s3->id            = stepping;
             s3->id_ext        = stepping;
             s3->id_ext_pci    = 0;
             s3->packed_mmio   = 0;
             svga->crtc[0x5a]  = 0x0a;
 
-            svga->ramdac    = device_add(&att490_ramdac_device);
+            svga->ramdac    = device_add(&att491_ramdac_device);
+            s3->ramdac_type = ATT49X;
             svga->clock_gen = device_add(&av9194_device);
             svga->getclock  = av9194_getclock;
+            if (info->local == S3_WINNER1000_805)
+                s3->elsa_eeprom = 1;
             break;
 
         case S3_86C805_ONBOARD:
@@ -9941,6 +10847,7 @@ s3_init(const device_t *info)
             svga->crtc[0x5a]  = 0x0a;
 
             svga->ramdac    = device_add(&att490_ramdac_device);
+            s3->ramdac_type = ATT49X;
             svga->clock_gen = device_add(&av9194_device);
             svga->getclock  = av9194_getclock;
             break;
@@ -9956,10 +10863,43 @@ s3_init(const device_t *info)
             svga->crtc[0x5a]  = 0x0a;
 
             svga->ramdac    = device_add(&att492_ramdac_device);
+            s3->ramdac_type = ATT49X;
             svga->clock_gen = device_add(&av9194_device);
             svga->getclock  = av9194_getclock;
             break;
 
+        case S3_ELSAWIN1K_86C928:
+            svga->decode_mask = (4 << 20) - 1;
+            stepping          = 0x91; /*86C928D*/
+            s3->id            = stepping;
+            s3->id_ext        = stepping;
+            s3->id_ext_pci    = 0;
+            s3->packed_mmio   = 0;
+            svga->crtc[0x5a]  = 0x0a;
+            svga->ramdac      = device_add(&sc1502x_ramdac_device);
+            s3->ramdac_type   = SC1502X;
+            svga->clock_gen   = device_add(&icd2061_device);
+            svga->getclock    = icd2061_getclock;
+            s3->elsa_eeprom   = 1;
+            icd2061_set_ref_clock(svga->ramdac, svga, 28322000.0f);
+            break;
+
+        case S3_ELSAWIN2K_86C928:
+            svga->decode_mask = (4 << 20) - 1;
+            stepping          = 0x91; /*86C928D*/
+            s3->id            = stepping;
+            s3->id_ext        = stepping;
+            s3->id_ext_pci    = 0;
+            s3->packed_mmio   = 0;
+            svga->crtc[0x5a]  = 0x0a;
+            svga->ramdac      = device_add(&bt485_ramdac_device);
+            s3->ramdac_type   = BT48X;
+            svga->clock_gen   = device_add(&ics9161_device);
+            svga->getclock    = ics9161_getclock;
+            s3->elsa_eeprom   = 1;
+            icd2061_set_ref_clock(svga->ramdac, svga, 28322000.0f);
+            break;
+
         case S3_METHEUS_86C928:
             svga->decode_mask = (4 << 20) - 1;
             stepping          = 0x91; /*86C928D*/
@@ -9969,8 +10909,25 @@ s3_init(const device_t *info)
             s3->packed_mmio   = 0;
             svga->crtc[0x5a]  = 0x0a;
             svga->ramdac      = device_add(&bt485_ramdac_device);
+            s3->ramdac_type   = BT48X;
+            svga->clock_gen   = device_add(&ics2494an_305_device);
+            svga->getclock    = ics2494_getclock;
+            break;
+
+        case S3_ELSAWIN1KPCI_86C928:
+            svga->decode_mask = (4 << 20) - 1;
+            stepping          = 0xb0; /*86C928PCI*/
+            s3->id            = stepping;
+            s3->id_ext        = stepping;
+            s3->id_ext_pci    = stepping;
+            s3->packed_mmio   = 0;
+            svga->crtc[0x5a]  = 0x0a;
+            svga->ramdac      = device_add(&sc1502x_ramdac_device);
+            s3->ramdac_type   = SC1502X;
             svga->clock_gen   = device_add(&icd2061_device);
             svga->getclock    = icd2061_getclock;
+            s3->elsa_eeprom   = 1;
+            icd2061_set_ref_clock(svga->ramdac, svga, 28322000.0f);
             break;
 
         case S3_SPEA_MERCURY_LITE_PCI:
@@ -9982,6 +10939,7 @@ s3_init(const device_t *info)
             s3->packed_mmio   = 0;
             svga->crtc[0x5a]  = 0x0a;
             svga->ramdac      = device_add(&sc1502x_ramdac_device);
+            s3->ramdac_type   = SC1502X;
             svga->clock_gen   = device_add(&av9194_device);
             svga->getclock    = av9194_getclock;
             break;
@@ -9994,11 +10952,13 @@ s3_init(const device_t *info)
                 stepping = 0xc0; /*Vision864*/
             else
                 stepping = 0xc1; /*Vision864P*/
+
             s3->id     = stepping;
             s3->id_ext = s3->id_ext_pci = stepping;
             s3->packed_mmio             = 0;
             svga->crtc[0x5a]            = 0x0a;
             svga->ramdac                = device_add(&sdac_ramdac_device);
+            s3->ramdac_type             = S3_SDAC;
             svga->clock_gen             = svga->ramdac;
             svga->getclock              = sdac_getclock;
             break;
@@ -10016,17 +10976,23 @@ s3_init(const device_t *info)
             switch (info->local) {
                 case S3_ELSAWIN2KPROX_964:
                     svga->ramdac = device_add(&ibm_rgb528_ramdac_device);
-                    svga->clock_gen = device_add(&icd2061_device);
-                    svga->getclock  = icd2061_getclock;
+                    s3->ramdac_type = IBM_RGB;
+                    svga->clock_gen = svga->ramdac;
+                    svga->getclock  = ibm_rgb528_getclock;
+                    s3->elsa_eeprom = 1;
+                    ibm_rgb528_ramdac_set_ref_clock(svga->ramdac, svga, 28322000.0f);
                     break;
                 default:
                     svga->ramdac = device_add(&bt485_ramdac_device);
+                    s3->ramdac_type = BT48X;
                     svga->clock_gen = device_add(&icd2061_device);
                     svga->getclock  = icd2061_getclock;
+                    icd2061_set_ref_clock(svga->ramdac, svga, 14318184.0f);
                     break;
             }
             break;
 
+        case S3_DIAMOND_STEALTH64_968:
         case S3_ELSAWIN2KPROX:
         case S3_SPEA_MERCURY_P64V:
         case S3_MIROVIDEO40SV_ERGO_968:
@@ -10034,8 +11000,9 @@ s3_init(const device_t *info)
         case S3_PHOENIX_VISION968:
             svga->decode_mask = (8 << 20) - 1;
             s3->id            = 0xe1; /*Vision968*/
-            s3->id_ext = s3->id_ext_pci = 0xf0;
-            s3->packed_mmio             = 1;
+            s3->id_ext        = 0xf0;
+            s3->id_ext_pci    = s3->id_ext;
+            s3->packed_mmio   = 1;
             if (s3->pci) {
                 svga->crtc[0x53] = 0x18;
                 svga->crtc[0x58] = 0x10;
@@ -10049,15 +11016,25 @@ s3_init(const device_t *info)
             }
 
             switch (info->local) {
+                case S3_DIAMOND_STEALTH64_968:
                 case S3_ELSAWIN2KPROX:
                 case S3_PHOENIX_VISION968:
                 case S3_NUMBER9_9FX_771:
                     svga->ramdac    = device_add(&ibm_rgb528_ramdac_device);
-                    svga->clock_gen = device_add(&icd2061_device);
-                    svga->getclock  = icd2061_getclock;
+                    s3->ramdac_type = IBM_RGB;
+                    svga->clock_gen = svga->ramdac;
+                    svga->getclock  = ibm_rgb528_getclock;
+                    if (info->local == S3_ELSAWIN2KPROX) {
+                        s3->elsa_eeprom = 1;
+                        ibm_rgb528_ramdac_set_ref_clock(svga->ramdac, svga, 28322000.0f);
+                    } else if (info->local != S3_DIAMOND_STEALTH64_968)
+                        ibm_rgb528_ramdac_set_ref_clock(svga->ramdac, svga, 16000000.0f);
+                    else
+                        ibm_rgb528_ramdac_set_ref_clock(svga->ramdac, svga, 14318184.0f);
                     break;
                 default:
                     svga->ramdac    = device_add(&tvp3026_ramdac_device);
+                    s3->ramdac_type = TVP3026;
                     svga->clock_gen = svga->ramdac;
                     svga->getclock  = tvp3026_getclock;
                     svga->conv_16to32 = tvp3026_conv_16to32;
@@ -10086,10 +11063,13 @@ s3_init(const device_t *info)
 
             if (info->local == S3_NUMBER9_9FX_531) {
                 svga->ramdac    = device_add(&att498_ramdac_device);
+                s3->ramdac_type = ATT498;
                 svga->clock_gen = device_add(&icd2061_device);
                 svga->getclock  = icd2061_getclock;
+                icd2061_set_ref_clock(svga->ramdac, svga, 14318184.0f);
             } else {
                 svga->ramdac    = device_add(&sdac_ramdac_device);
+                s3->ramdac_type = S3_SDAC;
                 svga->clock_gen = svga->ramdac;
                 svga->getclock  = sdac_getclock;
             }
@@ -10110,15 +11090,12 @@ s3_init(const device_t *info)
 
         case S3_PHOENIX_TRIO64:
         case S3_PHOENIX_TRIO64_ONBOARD:
+        case S3_STB_POWERGRAPH_64_VIDEO:
         case S3_PHOENIX_TRIO64VPLUS:
         case S3_PHOENIX_TRIO64VPLUS_ONBOARD:
         case S3_CARDEX_TRIO64VPLUS:
         case S3_DIAMOND_STEALTH64_764:
         case S3_SPEA_MIRAGE_P64:
-            if (device_get_config_int("memory") == 1)
-                svga->vram_max = 1 << 20; /* Phoenix BIOS does not expect VRAM to be mirrored. */
-                                          /* Fall over. */
-            fallthrough;
         case S3_NUMBER9_9FX:
             svga->decode_mask = (4 << 20) - 1;
             s3->id            = 0xe1; /*Trio64*/
@@ -10167,11 +11144,81 @@ s3_init(const device_t *info)
     s3->i2c = i2c_gpio_init("ddc_s3");
     s3->ddc = ddc_init(i2c_gpio_get_bus(s3->i2c));
 
+    if (s3->elsa_eeprom) {
+        s3->eeprom_inst = device_get_instance();
+
+        s3->eeprom_data[0x01] = 0x3353;
+
+        switch (s3->card_type) {
+            case S3_WINNER1000_805:
+                s3->eeprom_data[0x02] = 0x091a;
+                s3->eeprom_data[0x07] = 0x83d6;
+                s3->eeprom_data[0x08] = 0x83d6;
+                snprintf(eeprom_filename, sizeof(eeprom_filename), "eeprom_s3_winner_1k_805_%d.nvr", s3->eeprom_inst);
+                break;
+            case S3_ELSAWIN1K_86C928:
+                s3->eeprom_data[0x02] = 0x0912;
+                s3->eeprom_data[0x07] = 0xa604;
+                s3->eeprom_data[0x08] = 0xa604;
+                snprintf(eeprom_filename, sizeof(eeprom_filename), "eeprom_s3_winner_1k_928_vlb_%d.nvr", s3->eeprom_inst);
+                break;
+            case S3_ELSAWIN1KPCI_86C928:
+                s3->eeprom_data[0x02] = 0x0914;
+                s3->eeprom_data[0x07] = 0xa604;
+                s3->eeprom_data[0x08] = 0xa604;
+                snprintf(eeprom_filename, sizeof(eeprom_filename), "eeprom_s3_winner_1k_928_pci_%d.nvr", s3->eeprom_inst);
+                break;
+            case S3_ELSAWIN2K_86C928:
+                s3->eeprom_data[0x02] = 0x0920;
+                s3->eeprom_data[0x07] = 0xa604;
+                s3->eeprom_data[0x08] = 0xa604;
+                snprintf(eeprom_filename, sizeof(eeprom_filename), "eeprom_s3_winner_2k_928_isa_%d.nvr", s3->eeprom_inst);
+                break;
+            case S3_ELSAWIN2KPROX:
+                s3->eeprom_data[0x02] = 0x094a;
+                s3->eeprom_data[0x07] = 0xf424;
+                s3->eeprom_data[0x08] = 0xf424;
+                snprintf(eeprom_filename, sizeof(eeprom_filename), "eeprom_s3_winner_2k_pro_x8_968_%d.nvr", s3->eeprom_inst);
+                break;
+            case S3_ELSAWIN2KPROX_964:
+                s3->eeprom_data[0x02] = 0x094a;
+                s3->eeprom_data[0x07] = 0xf424;
+                s3->eeprom_data[0x08] = 0xf424;
+                snprintf(eeprom_filename, sizeof(eeprom_filename), "eeprom_s3_winner_2k_pro_x8_964_%d.nvr", s3->eeprom_inst);
+                break;
+            default:
+                break;
+        }
+
+        s3->eeprom_data[0x05] = 0x0040;
+        s3->eeprom_data[0x0b] = 0x0c80;
+        s3->eeprom_data[0x0c] = 0x0a00;
+        s3->eeprom_data[0x0d] = 0x0001;
+
+        checksum = s3_calc_crc16(64, s3->eeprom_data);
+
+        s3->eeprom_data[0x00] = checksum;
+        params.nwords          = 64;
+        params.default_content = s3->eeprom_data;
+        params.filename        = filename;
+        snprintf(filename, sizeof(filename), "nmc93cxx_eeprom_%s_%d.nvr", info->internal_name, s3->eeprom_inst);
+        s3->eeprom = device_add_inst_params(&nmc93cxx_device, s3->eeprom_inst, &params);
+        if (s3->eeprom == NULL) {
+            free(s3);
+            return NULL;
+        }
+    }
+
+    s3->accel.multifunc[0xd] = 0xd000;
+    s3->accel.multifunc[0xe] = 0xe000;
+
     s3->wake_fifo_thread    = thread_create_event();
     s3->fifo_not_full_event = thread_create_event();
     s3->fifo_thread_run     = 1;
     s3->fifo_thread         = thread_create(fifo_thread, s3);
 
+    *reset_state = *s3;
+
     return s3;
 }
 
@@ -10211,6 +11258,12 @@ s3_phoenix_86c80x_available(void)
     return rom_present(ROM_PHOENIX_86C80X);
 }
 
+static int
+s3_winner1000_805_available(void)
+{
+    return rom_present(ROM_WINNER1000_805);
+}
+
 static int
 s3_mirocrystal_8s_805_available(void)
 {
@@ -10223,6 +11276,24 @@ s3_mirocrystal_10sd_805_available(void)
     return rom_present(ROM_MIROCRYSTAL10SD_805);
 }
 
+static int
+s3_elsa_winner1000_86c928_vlb_available(void)
+{
+    return rom_present(ROM_ELSAWIN1KVL_86C928);
+}
+
+static int
+s3_elsa_winner1000_86c928_pci_available(void)
+{
+    return rom_present(ROM_ELSAWIN1KPCI_86C928);
+}
+
+static int
+s3_elsa_winner2000_86c928_available(void)
+{
+    return rom_present(ROM_ELSAWIN2K_86C928);
+}
+
 static int
 s3_metheus_86c928_available(void)
 {
@@ -10277,6 +11348,12 @@ s3_diamond_stealth64_964_available(void)
     return rom_present(ROM_DIAMOND_STEALTH64_964);
 }
 
+static int
+s3_diamond_stealth64_968_available(void)
+{
+    return rom_present(ROM_DIAMOND_STEALTH64_968);
+}
+
 static int
 s3_mirovideo_40sv_ergo_968_pci_available(void)
 {
@@ -10349,6 +11426,12 @@ s3_phoenix_trio64_available(void)
     return rom_present(ROM_PHOENIX_TRIO64);
 }
 
+static int
+s3_stb_powergraph_64_video_available(void)
+{
+    return rom_present(ROM_STB_POWERGRAPH_64_VIDEO);
+}
+
 static int
 s3_phoenix_trio64vplus_available(void)
 {
@@ -10389,6 +11472,9 @@ s3_close(void *priv)
     ddc_close(s3->ddc);
     i2c_gpio_close(s3->i2c);
 
+    free(reset_state);
+    reset_state = NULL;
+
     free(s3);
 }
 
@@ -10408,95 +11494,198 @@ s3_force_redraw(void *priv)
     s3->svga.fullchange = s3->svga.monitor->mon_changeframecount;
 }
 
+// clang-format off
 static const device_config_t s3_orchid_86c911_config[] = {
-    { .name        = "memory",
-     .description = "Memory size",
-     .type        = CONFIG_SELECTION,
-     .default_int = 1,
-     .selection   = {
-          { .description = "512 KB",
-              .value       = 0 },
-          { .description = "1 MB",
-              .value       = 1 },
-          { .description = "" } } },
-    { .type = CONFIG_END }
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "512 KB", .value = 0 },
+            { .description = "1 MB",   .value = 1 },
+            { .description = ""                   }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t s3_9fx_config[] = {
-    { .name        = "memory",
-     .description = "Memory size",
-     .type        = CONFIG_SELECTION,
-     .default_int = 2,
-     .selection   = {
-          { .description = "1 MB",
-              .value       = 1 },
-          { .description = "2 MB",
-              .value       = 2 },
-          /*Trio64 also supports 4 MB, however the Number Nine BIOS does not*/
-          {
-                .description = "" } } },
-    { .type = CONFIG_END }
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+             { .description = "1 MB", .value = 1 },
+             { .description = "2 MB", .value = 2 },
+             /* Trio64 also supports 4 MB, however the Number Nine BIOS does not */
+             { .description = ""                 }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t s3_phoenix_trio32_config[] = {
-    { .name        = "memory",
-     .description = "Memory size",
-     .type        = CONFIG_SELECTION,
-     .default_int = 2,
-     .selection   = {
-          { .description = "512 KB",
-              .value       = 0 },
-          { .description = "1 MB",
-              .value       = 1 },
-          { .description = "2 MB",
-              .value       = 2 },
-          { .description = "" } } },
-    { .type = CONFIG_END }
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "512 KB", .value = 0 },
+            { .description = "1 MB",   .value = 1 },
+            { .description = "2 MB",   .value = 2 },
+            { .description = ""                   }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t s3_phoenix_trio32_v_config[] = {
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "512 KB", .value = 0 },
+            { .description = "1 MB",   .value = 1 },
+            { .description = "2 MB",   .value = 2 },
+            { .description = ""                   }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "colorkey",
+        .description    = "Video chroma-keying",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t s3_trio64v_config[] = {
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 4,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "1 MB", .value = 1 },
+            { .description = "2 MB", .value = 2 },
+            { .description = "4 MB", .value = 4 },
+            { .description = ""                 }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "colorkey",
+        .description    = "Video chroma-keying",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t s3_standard_config[] = {
-    { .name        = "memory",
-     .description = "Memory size",
-     .type        = CONFIG_SELECTION,
-     .default_int = 4,
-     .selection   = {
-          { .description = "1 MB",
-              .value       = 1 },
-          { .description = "2 MB",
-              .value       = 2 },
-          { .description = "4 MB",
-              .value       = 4 },
-          { .description = "" } } },
-    { .type = CONFIG_END }
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 4,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "1 MB", .value = 1 },
+            { .description = "2 MB", .value = 2 },
+            { .description = "4 MB", .value = 4 },
+            { .description = ""                 }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t s3_968_config[] = {
-    { .name        = "memory",
-     .description = "Memory size",
-     .type        = CONFIG_SELECTION,
-     .default_int = 4,
-     .selection   = {
-          { .description = "1 MB",
-              .value       = 1 },
-          { .description = "2 MB",
-              .value       = 2 },
-          { .description = "4 MB",
-              .value       = 4 },
-          { .description = "8 MB",
-              .value       = 8 },
-          { .description = "" } } },
-    { .type = CONFIG_END }
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 4,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "1 MB", .value = 1 },
+            { .description = "2 MB", .value = 2 },
+            { .description = "4 MB", .value = 4 },
+            { .description = "8 MB", .value = 8 },
+            { .description = ""                 }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
+static const device_config_t s3_standard_config2[] = {
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 4,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "2 MB", .value = 2 },
+            { .description = "4 MB", .value = 4 },
+            { .description = ""                 }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+// clang-format on
+
 const device_t s3_orchid_86c911_isa_device = {
     .name          = "S3 86c911 ISA (Orchid Fahrenheit 1280)",
     .internal_name = "orchid_s3_911",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = S3_ORCHID_86C911,
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_orchid_86c911_available },
+    .available     = s3_orchid_86c911_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_orchid_86c911_config
@@ -10505,12 +11694,12 @@ const device_t s3_orchid_86c911_isa_device = {
 const device_t s3_diamond_stealth_vram_isa_device = {
     .name          = "S3 86c911 ISA (Diamond Stealth VRAM)",
     .internal_name = "stealthvram_isa",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = S3_DIAMOND_STEALTH_VRAM,
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_diamond_stealth_vram_available },
+    .available     = s3_diamond_stealth_vram_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_orchid_86c911_config
@@ -10519,12 +11708,12 @@ const device_t s3_diamond_stealth_vram_isa_device = {
 const device_t s3_ami_86c924_isa_device = {
     .name          = "S3 86c924 ISA (AMI)",
     .internal_name = "ami_s3_924",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = S3_AMI_86C924,
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_ami_86c924_available },
+    .available     = s3_ami_86c924_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_orchid_86c911_config
@@ -10533,12 +11722,26 @@ const device_t s3_ami_86c924_isa_device = {
 const device_t s3_spea_mirage_86c801_isa_device = {
     .name          = "S3 86c801 ISA (SPEA Mirage ISA)",
     .internal_name = "px_s3_v7_801_isa",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = S3_SPEA_MIRAGE_86C801,
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_spea_mirage_86c801_available },
+    .available     = s3_spea_mirage_86c801_available,
+    .speed_changed = s3_speed_changed,
+    .force_redraw  = s3_force_redraw,
+    .config        = s3_9fx_config
+};
+
+const device_t s3_winner1000_805_isa_device = {
+    .name          = "S3 86c805 ISA (ELSA Winner 1000 805i)",
+    .internal_name = "winner1000_805_isa",
+    .flags         = DEVICE_ISA16,
+    .local         = S3_WINNER1000_805,
+    .init          = s3_init,
+    .close         = s3_close,
+    .reset         = s3_reset,
+    .available = s3_winner1000_805_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_9fx_config
@@ -10552,7 +11755,7 @@ const device_t s3_86c805_onboard_vlb_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_9fx_config
@@ -10566,7 +11769,7 @@ const device_t s3_spea_mirage_86c805_vlb_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_spea_mirage_86c805_available },
+    .available     = s3_spea_mirage_86c805_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_9fx_config
@@ -10580,7 +11783,7 @@ const device_t s3_mirocrystal_8s_805_vlb_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_mirocrystal_8s_805_available },
+    .available     = s3_mirocrystal_8s_805_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_9fx_config
@@ -10594,7 +11797,7 @@ const device_t s3_mirocrystal_10sd_805_vlb_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_mirocrystal_10sd_805_available },
+    .available     = s3_mirocrystal_10sd_805_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_9fx_config
@@ -10603,12 +11806,12 @@ const device_t s3_mirocrystal_10sd_805_vlb_device = {
 const device_t s3_phoenix_86c801_isa_device = {
     .name          = "S3 86c801 ISA (Phoenix)",
     .internal_name = "px_86c801_isa",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = S3_PHOENIX_86C801,
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_phoenix_86c80x_available },
+    .available     = s3_phoenix_86c80x_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_9fx_config
@@ -10622,21 +11825,49 @@ const device_t s3_phoenix_86c805_vlb_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_phoenix_86c80x_available },
+    .available     = s3_phoenix_86c80x_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_9fx_config
 };
 
+const device_t s3_elsa_winner1000_86c928_vlb_device = {
+    .name          = "S3 86c928 VLB (ELSA Winner 1000 928)",
+    .internal_name = "elsawin1k928_vlb",
+    .flags         = DEVICE_VLB,
+    .local         = S3_ELSAWIN1K_86C928,
+    .init          = s3_init,
+    .close         = s3_close,
+    .reset         = s3_reset,
+    .available     = s3_elsa_winner1000_86c928_vlb_available,
+    .speed_changed = s3_speed_changed,
+    .force_redraw  = s3_force_redraw,
+    .config        = s3_standard_config
+};
+
+const device_t s3_elsa_winner2000_86c928_isa_device = {
+    .name          = "S3 86c928 ISA (ELSA Winner 2000 928)",
+    .internal_name = "elsawin2k928_isa",
+    .flags         = DEVICE_ISA16,
+    .local         = S3_ELSAWIN2K_86C928,
+    .init          = s3_init,
+    .close         = s3_close,
+    .reset         = s3_reset,
+    .available     = s3_elsa_winner2000_86c928_available,
+    .speed_changed = s3_speed_changed,
+    .force_redraw  = s3_force_redraw,
+    .config        = s3_standard_config
+};
+
 const device_t s3_metheus_86c928_isa_device = {
     .name          = "S3 86c928 ISA (Metheus Premier 928)",
     .internal_name = "metheus928_isa",
-    .flags         = DEVICE_AT | DEVICE_ISA,
+    .flags         = DEVICE_ISA16,
     .local         = S3_METHEUS_86C928,
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_metheus_86c928_available },
+    .available     = s3_metheus_86c928_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_standard_config
@@ -10650,12 +11881,27 @@ const device_t s3_metheus_86c928_vlb_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_metheus_86c928_available },
+    .available     = s3_metheus_86c928_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_standard_config
 };
 
+const device_t s3_elsa_winner1000_86c928_pci_device = {
+    .name          = "S3 86c928 PCI (ELSA Winner 1000 928)",
+    .internal_name = "elsawin1k928_pci",
+    .flags         = DEVICE_PCI,
+    .local         = S3_ELSAWIN1KPCI_86C928,
+    .init          = s3_init,
+    .close         = s3_close,
+    .reset         = s3_reset,
+    .available     = s3_elsa_winner1000_86c928_pci_available,
+    .speed_changed = s3_speed_changed,
+    .force_redraw  = s3_force_redraw,
+    .config        = s3_standard_config
+};
+
+
 const device_t s3_spea_mercury_lite_86c928_pci_device = {
     .name          = "S3 86c928 PCI (SPEA Mercury Lite)",
     .internal_name = "spea_mercurylite_pci",
@@ -10664,7 +11910,7 @@ const device_t s3_spea_mercury_lite_86c928_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_spea_mercury_lite_pci_available },
+    .available     = s3_spea_mercury_lite_pci_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_orchid_86c911_config
@@ -10678,7 +11924,7 @@ const device_t s3_mirocrystal_20sd_864_vlb_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_mirocrystal_20sd_864_vlb_available },
+    .available     = s3_mirocrystal_20sd_864_vlb_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_9fx_config
@@ -10692,7 +11938,7 @@ const device_t s3_bahamas64_vlb_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_bahamas64_available },
+    .available     = s3_bahamas64_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_9fx_config
@@ -10706,7 +11952,7 @@ const device_t s3_bahamas64_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_bahamas64_available },
+    .available     = s3_bahamas64_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_9fx_config
@@ -10720,7 +11966,7 @@ const device_t s3_mirocrystal_20sv_964_vlb_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_mirocrystal_20sv_964_vlb_available },
+    .available     = s3_mirocrystal_20sv_964_vlb_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_9fx_config
@@ -10734,7 +11980,7 @@ const device_t s3_mirocrystal_20sv_964_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_mirocrystal_20sv_964_pci_available },
+    .available     = s3_mirocrystal_20sv_964_pci_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_9fx_config
@@ -10748,7 +11994,7 @@ const device_t s3_diamond_stealth64_964_vlb_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_diamond_stealth64_964_available },
+    .available     = s3_diamond_stealth64_964_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_standard_config
@@ -10762,12 +12008,40 @@ const device_t s3_diamond_stealth64_964_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_diamond_stealth64_964_available },
+    .available     = s3_diamond_stealth64_964_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_standard_config
 };
 
+const device_t s3_diamond_stealth64_968_vlb_device = {
+    .name          = "S3 Vision968 VLB (Diamond Stealth64 Video VRAM)",
+    .internal_name = "stealth64vv_vlb",
+    .flags         = DEVICE_VLB,
+    .local         = S3_DIAMOND_STEALTH64_968,
+    .init          = s3_init,
+    .close         = s3_close,
+    .reset         = s3_reset,
+    .available     = s3_diamond_stealth64_968_available,
+    .speed_changed = s3_speed_changed,
+    .force_redraw  = s3_force_redraw,
+    .config        = s3_standard_config2
+};
+
+const device_t s3_diamond_stealth64_968_pci_device = {
+    .name          = "S3 Vision968 PCI (Diamond Stealth64 Video VRAM)",
+    .internal_name = "stealth64vv_pci",
+    .flags         = DEVICE_PCI,
+    .local         = S3_DIAMOND_STEALTH64_968,
+    .init          = s3_init,
+    .close         = s3_close,
+    .reset         = s3_reset,
+    .available     = s3_diamond_stealth64_968_available,
+    .speed_changed = s3_speed_changed,
+    .force_redraw  = s3_force_redraw,
+    .config        = s3_standard_config2
+};
+
 const device_t s3_9fx_771_pci_device = {
     .name          = "S3 Vision968 PCI (Number 9 9FX 771)",
     .internal_name = "n9_9fx_771_pci",
@@ -10776,7 +12050,7 @@ const device_t s3_9fx_771_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_9fx_771_available },
+    .available     = s3_9fx_771_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_968_config
@@ -10790,21 +12064,7 @@ const device_t s3_phoenix_vision968_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_phoenix_vision968_available },
-    .speed_changed = s3_speed_changed,
-    .force_redraw  = s3_force_redraw,
-    .config        = s3_standard_config
-};
-
-const device_t s3_phoenix_vision968_vlb_device = {
-    .name          = "S3 Vision968 VLB (Phoenix)",
-    .internal_name = "px_vision968_vlb",
-    .flags         = DEVICE_VLB,
-    .local         = S3_PHOENIX_VISION968,
-    .init          = s3_init,
-    .close         = s3_close,
-    .reset         = s3_reset,
-    { .available = s3_phoenix_vision968_available },
+    .available     = s3_phoenix_vision968_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_standard_config
@@ -10818,7 +12078,7 @@ const device_t s3_mirovideo_40sv_ergo_968_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_mirovideo_40sv_ergo_968_pci_available },
+    .available     = s3_mirovideo_40sv_ergo_968_pci_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_standard_config
@@ -10832,7 +12092,7 @@ const device_t s3_spea_mercury_p64v_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_spea_mercury_p64v_pci_available },
+    .available     = s3_spea_mercury_p64v_pci_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_standard_config
@@ -10846,7 +12106,7 @@ const device_t s3_9fx_vlb_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_9fx_available },
+    .available     = s3_9fx_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_9fx_config
@@ -10860,7 +12120,7 @@ const device_t s3_9fx_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_9fx_available },
+    .available     = s3_9fx_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_9fx_config
@@ -10874,7 +12134,7 @@ const device_t s3_phoenix_trio32_onboard_vlb_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_phoenix_trio32_config
@@ -10888,7 +12148,7 @@ const device_t s3_phoenix_trio32_vlb_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_phoenix_trio32_available },
+    .available     = s3_phoenix_trio32_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_phoenix_trio32_config
@@ -10902,7 +12162,7 @@ const device_t s3_phoenix_trio32_onboard_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_phoenix_trio32_config
@@ -10916,7 +12176,7 @@ const device_t s3_phoenix_trio32_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_phoenix_trio32_available },
+    .available     = s3_phoenix_trio32_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_phoenix_trio32_config
@@ -10930,7 +12190,7 @@ const device_t s3_diamond_stealth_se_vlb_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_diamond_stealth_se_available },
+    .available     = s3_diamond_stealth_se_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_phoenix_trio32_config
@@ -10944,7 +12204,7 @@ const device_t s3_diamond_stealth_se_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_diamond_stealth_se_available },
+    .available     = s3_diamond_stealth_se_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_phoenix_trio32_config
@@ -10958,7 +12218,7 @@ const device_t s3_phoenix_trio64_vlb_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_phoenix_trio64_available },
+    .available     = s3_phoenix_trio64_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_standard_config
@@ -10972,7 +12232,7 @@ const device_t s3_phoenix_trio64_onboard_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_standard_config
@@ -10986,12 +12246,26 @@ const device_t s3_phoenix_trio64_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_phoenix_trio64_available },
+    .available     = s3_phoenix_trio64_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_standard_config
 };
 
+const device_t s3_stb_powergraph_64_video_vlb_device = {
+    .name          = "S3 Trio64V+ (STB PowerGraph 64 Video) VLB",
+    .internal_name = "stb_trio64vplus_vlb",
+    .flags         = DEVICE_VLB,
+    .local         = S3_STB_POWERGRAPH_64_VIDEO,
+    .init          = s3_init,
+    .close         = s3_close,
+    .reset         = s3_reset,
+    .available     = s3_stb_powergraph_64_video_available,
+    .speed_changed = s3_speed_changed,
+    .force_redraw  = s3_force_redraw,
+    .config        = s3_phoenix_trio32_v_config
+};
+
 const device_t s3_phoenix_trio64vplus_onboard_pci_device = {
     .name          = "S3 Trio64V+ PCI On-Board (Phoenix)",
     .internal_name = "px_trio64vplus_onboard_pci",
@@ -11000,10 +12274,10 @@ const device_t s3_phoenix_trio64vplus_onboard_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
-    .config        = s3_standard_config
+    .config        = s3_trio64v_config
 };
 
 const device_t s3_phoenix_trio64vplus_pci_device = {
@@ -11014,10 +12288,10 @@ const device_t s3_phoenix_trio64vplus_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_phoenix_trio64vplus_available },
+    .available     = s3_phoenix_trio64vplus_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
-    .config        = s3_standard_config
+    .config        = s3_trio64v_config
 };
 
 const device_t s3_cardex_trio64vplus_pci_device = {
@@ -11028,10 +12302,10 @@ const device_t s3_cardex_trio64vplus_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_cardex_trio64vplus_available },
+    .available     = s3_cardex_trio64vplus_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
-    .config        = s3_standard_config
+    .config        = s3_trio64v_config
 };
 
 const device_t s3_phoenix_vision864_vlb_device = {
@@ -11042,7 +12316,7 @@ const device_t s3_phoenix_vision864_vlb_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_phoenix_vision864_available },
+    .available     = s3_phoenix_vision864_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_standard_config
@@ -11056,7 +12330,7 @@ const device_t s3_phoenix_vision864_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_phoenix_vision864_available },
+    .available     = s3_phoenix_vision864_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_standard_config
@@ -11070,26 +12344,12 @@ const device_t s3_9fx_531_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_9fx_531_available },
+    .available     = s3_9fx_531_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_9fx_config
 };
 
-const device_t s3_phoenix_vision868_vlb_device = {
-    .name          = "S3 Vision868 VLB (Phoenix)",
-    .internal_name = "px_vision868_vlb",
-    .flags         = DEVICE_VLB,
-    .local         = S3_PHOENIX_VISION868,
-    .init          = s3_init,
-    .close         = s3_close,
-    .reset         = s3_reset,
-    { .available = s3_phoenix_vision868_available },
-    .speed_changed = s3_speed_changed,
-    .force_redraw  = s3_force_redraw,
-    .config        = s3_standard_config
-};
-
 const device_t s3_phoenix_vision868_pci_device = {
     .name          = "S3 Vision868 PCI (Phoenix)",
     .internal_name = "px_vision868_pci",
@@ -11098,7 +12358,7 @@ const device_t s3_phoenix_vision868_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_phoenix_vision868_available },
+    .available     = s3_phoenix_vision868_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_standard_config
@@ -11112,7 +12372,7 @@ const device_t s3_diamond_stealth64_vlb_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_diamond_stealth64_764_available },
+    .available     = s3_diamond_stealth64_764_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_9fx_config
@@ -11126,7 +12386,7 @@ const device_t s3_diamond_stealth64_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_diamond_stealth64_764_available },
+    .available     = s3_diamond_stealth64_764_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_9fx_config
@@ -11140,7 +12400,7 @@ const device_t s3_spea_mirage_p64_vlb_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_spea_mirage_p64_vlb_available },
+    .available     = s3_spea_mirage_p64_vlb_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_9fx_config
@@ -11154,7 +12414,7 @@ const device_t s3_elsa_winner2000_pro_x_964_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_elsa_winner2000_pro_x_964_available },
+    .available     = s3_elsa_winner2000_pro_x_964_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_968_config
@@ -11168,7 +12428,7 @@ const device_t s3_elsa_winner2000_pro_x_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_elsa_winner2000_pro_x_available },
+    .available     = s3_elsa_winner2000_pro_x_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
     .config        = s3_968_config
@@ -11182,10 +12442,10 @@ const device_t s3_trio64v2_dx_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = s3_reset,
-    { .available = s3_trio64v2_dx_available },
+    .available     = s3_trio64v2_dx_available,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
-    .config        = s3_standard_config
+    .config        = s3_trio64v_config
 };
 
 const device_t s3_trio64v2_dx_onboard_pci_device = {
@@ -11196,8 +12456,8 @@ const device_t s3_trio64v2_dx_onboard_pci_device = {
     .init          = s3_init,
     .close         = s3_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = s3_speed_changed,
     .force_redraw  = s3_force_redraw,
-    .config        = s3_standard_config
+    .config        = s3_trio64v_config
 };
diff --git a/src/video/vid_s3_virge.c b/src/video/vid_s3_virge.c
index 3184a1ccd..3bd6d694d 100644
--- a/src/video/vid_s3_virge.c
+++ b/src/video/vid_s3_virge.c
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include <stdbool.h>
 #include <stdatomic.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
@@ -37,48 +38,63 @@
 #include <86box/video.h>
 #include <86box/i2c.h>
 #include <86box/vid_ddc.h>
+#include <86box/vid_xga.h>
 #include <86box/vid_svga.h>
 #include <86box/vid_svga_render.h>
 
+#ifdef MIN
+    #undef MIN
+#endif
+#ifdef MAX
+    #undef MAX
+#endif
+#ifdef CLAMP
+    #undef CLAMP
+#endif
+
+static uint64_t virge_time = 0;
+
 static int dither[4][4] = {
-    {0,  4, 1, 5},
-    { 6, 2, 7, 3},
-    { 1, 5, 0, 4},
-    { 7, 3, 6, 2},
+    { 0, 4, 1, 5 },
+    { 6, 2, 7, 3 },
+    { 1, 5, 0, 4 },
+    { 7, 3, 6, 2 }
 };
 
-#define RB_SIZE                       256
-#define RB_MASK                       (RB_SIZE - 1)
-
-#define RB_ENTRIES                    (virge->s3d_write_idx - virge->s3d_read_idx)
-#define RB_FULL                       (RB_ENTRIES == RB_SIZE)
-#define RB_EMPTY                      (!RB_ENTRIES)
-
-#define FIFO_SIZE                     65536
-#define FIFO_MASK                     (FIFO_SIZE - 1)
-#define FIFO_ENTRY_SIZE               (1 << 31)
-
-#define FIFO_ENTRIES                  (virge->fifo_write_idx - virge->fifo_read_idx)
-#define FIFO_FULL                     ((virge->fifo_write_idx - virge->fifo_read_idx) >= (FIFO_SIZE - 4))
-#define FIFO_EMPTY                    (virge->fifo_read_idx == virge->fifo_write_idx)
-
-#define FIFO_TYPE                     0xff000000
-#define FIFO_ADDR                     0x00ffffff
-
 #define ROM_VIRGE_325                 "roms/video/s3virge/86c325.bin"
 #define ROM_DIAMOND_STEALTH3D_2000    "roms/video/s3virge/s3virge.bin"
+#define ROM_MIROCRYSTAL_3D            "roms/video/s3virge/miro Crystal 3D 1.02.bin"
 #define ROM_DIAMOND_STEALTH3D_3000    "roms/video/s3virge/diamondstealth3000.vbi"
 #define ROM_STB_VELOCITY_3D           "roms/video/s3virge/stb_velocity3d_110.BIN"
 #define ROM_VIRGE_DX                  "roms/video/s3virge/86c375_1.bin"
 #define ROM_DIAMOND_STEALTH3D_2000PRO "roms/video/s3virge/virgedxdiamond.vbi"
 #define ROM_VIRGE_GX                  "roms/video/s3virge/86c375_4.bin"
 #define ROM_VIRGE_GX2                 "roms/video/s3virge/flagpoint.VBI"
-#define ROM_DIAMOND_STEALTH3D_4000    "roms/video/s3virge/86c357.bin"
+#define ROM_DIAMOND_STEALTH3D_4000    "roms/video/s3virge/DS3D4K v1.03 Brightness bug fix.bin"
 #define ROM_TRIO3D2X                  "roms/video/s3virge/TRIO3D2X_8mbsdr.VBI"
 
+#define RB_SIZE 256
+#define RB_MASK (RB_SIZE - 1)
+
+#define RB_ENTRIES (virge->s3d_write_idx - virge->s3d_read_idx)
+#define RB_FULL (RB_ENTRIES == RB_SIZE)
+#define RB_EMPTY (!RB_ENTRIES)
+
+#define FIFO_SIZE 65536
+#define FIFO_MASK (FIFO_SIZE - 1)
+#define FIFO_ENTRY_SIZE (1 << 31)
+
+#define FIFO_ENTRIES (virge->fifo_write_idx - virge->fifo_read_idx)
+#define FIFO_FULL ((virge->fifo_write_idx - virge->fifo_read_idx) >= FIFO_SIZE)
+#define FIFO_EMPTY (virge->fifo_read_idx == virge->fifo_write_idx)
+
+#define FIFO_TYPE 0xff000000
+#define FIFO_ADDR 0x00ffffff
+
 enum {
     S3_VIRGE_325,
     S3_DIAMOND_STEALTH3D_2000,
+    S3_MIROCRYSTAL_3D,
     S3_DIAMOND_STEALTH3D_3000,
     S3_STB_VELOCITY_3D,
     S3_VIRGE_DX,
@@ -104,15 +120,17 @@ enum {
     FIFO_WRITE_DWORD = (0x03 << 24)
 };
 
-typedef struct
-{
+typedef struct {
     uint32_t addr_type;
     uint32_t val;
 } fifo_entry_t;
 
 typedef struct s3d_t {
     uint32_t cmd_set;
-    int      clip_l, clip_r, clip_t, clip_b;
+    int      clip_l;
+    int      clip_r;
+    int      clip_t;
+    int      clip_b;
 
     uint32_t dest_base;
     uint32_t dest_str;
@@ -122,23 +140,39 @@ typedef struct s3d_t {
 
     uint32_t tex_base;
     uint32_t tex_bdr_clr;
-    uint32_t tbv, tbu;
-    int32_t  TdVdX, TdUdX;
-    int32_t  TdVdY, TdUdY;
-    uint32_t tus, tvs;
+    uint32_t tbv;
+    uint32_t tbu;
+    int32_t  TdVdX;
+    int32_t  TdUdX;
+    int32_t  TdVdY;
+    int32_t  TdUdY;
+    uint32_t tus;
+    uint32_t tvs;
 
-    int32_t  TdZdX, TdZdY;
+    int32_t  TdZdX;
+    int32_t  TdZdY;
     uint32_t tzs;
 
-    int32_t  TdWdX, TdWdY;
+    int32_t  TdWdX;
+    int32_t  TdWdY;
     uint32_t tws;
 
-    int32_t  TdDdX, TdDdY;
+    int32_t  TdDdX;
+    int32_t  TdDdY;
     uint32_t tds;
 
-    int16_t  TdGdX, TdBdX, TdRdX, TdAdX;
-    int16_t  TdGdY, TdBdY, TdRdY, TdAdY;
-    uint32_t tgs, tbs, trs, tas;
+    int16_t  TdGdX;
+    int16_t  TdBdX;
+    int16_t  TdRdX;
+    int16_t  TdAdX;
+    int16_t  TdGdY;
+    int16_t  TdBdY;
+    int16_t  TdRdY;
+    int16_t  TdAdY;
+    uint32_t tgs;
+    uint32_t tbs;
+    uint32_t trs;
+    uint32_t tas;
 
     uint32_t TdXdY12;
     uint32_t txend12;
@@ -147,9 +181,13 @@ typedef struct s3d_t {
     uint32_t TdXdY02;
     uint32_t txs;
     uint32_t tys;
-    int      ty01, ty12, tlr;
+    int      ty01;
+    int      ty12;
+    int      tlr;
 
-    uint8_t fog_r, fog_g, fog_b;
+    uint8_t fog_r;
+    uint8_t fog_g;
+    uint8_t fog_b;
 } s3d_t;
 
 typedef struct virge_t {
@@ -163,42 +201,46 @@ typedef struct virge_t {
 
     uint8_t bank;
     uint8_t ma_ext;
-    uint8_t reg6b, lfb_bios;
 
-    uint8_t virge_id, virge_id_high, virge_id_low, virge_rev;
+    uint8_t virge_id;
+    uint8_t virge_id_high;
+    uint8_t virge_id_low;
+    uint8_t virge_rev;
 
-    uint8_t int_line;
-
-    uint32_t linear_base, linear_size;
+    uint32_t linear_base;
+    uint32_t linear_size;
 
     uint8_t pci_regs[256];
-
     uint8_t pci_slot;
-    uint8_t irq_state;
 
-    int pci;
+    uint8_t type;
     int chip;
-    int is_agp;
 
-    int      bilinear_enabled;
-    int      dithering_enabled;
-    uint32_t memory_size;
-    uint32_t vram_mask;
+    int bilinear_enabled;
+    int dithering_enabled;
+    int memory_size;
+
+    int pixel_count;
+    int tri_count;
 
     thread_t *render_thread;
     event_t  *wake_render_thread;
     event_t  *wake_main_thread;
     event_t  *not_full_event;
 
-    uint32_t hwc_fg_col, hwc_bg_col;
+    uint32_t hwc_fg_col;
+    uint32_t hwc_bg_col;
     int      hwc_col_stack_pos;
 
-    struct
-    {
+    struct {
         uint32_t src_base;
         uint32_t dest_base;
-        int      clip_l, clip_r, clip_t, clip_b;
-        int      dest_str, src_str;
+        int      clip_l;
+        int      clip_r;
+        int      clip_t;
+        int      clip_b;
+        int      dest_str;
+        int      src_str;
         uint32_t mono_pat_0;
         uint32_t mono_pat_1;
         uint32_t pat_bg_clr;
@@ -206,19 +248,27 @@ typedef struct virge_t {
         uint32_t src_bg_clr;
         uint32_t src_fg_clr;
         uint32_t cmd_set;
-        int      r_width, r_height;
-        int      rsrc_x, rsrc_y;
-        int      rdest_x, rdest_y;
+        int      r_width;
+        int      r_height;
+        int      rsrc_x;
+        int      rsrc_y;
+        int      rdest_x;
+        int      rdest_y;
 
-        int      lxend0, lxend1;
+        int      lxend0;
+        int      lxend1;
         int32_t  ldx;
-        uint32_t lxstart, lystart;
+        uint32_t lxstart;
+        uint32_t lystart;
         int      lycnt;
         int      line_dir;
 
-        int     src_x, src_y;
-        int     dest_x, dest_y;
-        int     w, h;
+        int     src_x;
+        int     src_y;
+        int     dest_x;
+        int     dest_y;
+        int     w;
+        int     h;
         uint8_t rop;
 
         int      data_left_count;
@@ -235,17 +285,18 @@ typedef struct virge_t {
         uint32_t plxstart;
         uint32_t pystart;
         uint32_t pycnt;
-        uint32_t dest_l, dest_r;
+        uint32_t dest_l;
+        uint32_t dest_r;
     } s3d;
 
     s3d_t s3d_tri;
 
     s3d_t      s3d_buffer[RB_SIZE];
-    atomic_int s3d_read_idx, s3d_write_idx;
+    atomic_int s3d_read_idx;
+    atomic_int s3d_write_idx;
     atomic_int s3d_busy;
 
-    struct
-    {
+    struct {
         uint32_t pri_ctrl;
         uint32_t chroma_ctrl;
         uint32_t sec_ctrl;
@@ -272,37 +323,84 @@ typedef struct virge_t {
 
         int sdif;
 
-        int pri_x, pri_y, pri_w, pri_h;
-        int sec_x, sec_y, sec_w, sec_h;
+        int pri_x;
+        int pri_y;
+        int pri_w;
+        int pri_h;
+        int sec_x;
+        int sec_y;
+        int sec_w;
+        int sec_h;
     } streams;
 
-    uint8_t      cmd_dma;
-    uint32_t     cmd_dma_base;
-    uint32_t     dma_ptr;
-    uint64_t     blitter_time;
-    int          fifo_slots_num;
+    fifo_entry_t fifo[FIFO_SIZE];
+    atomic_int   fifo_read_idx, fifo_write_idx;
+    atomic_int   fifo_thread_run, render_thread_run;
 
-    pc_timer_t tri_timer;
+    thread_t *fifo_thread;
+    event_t  *wake_fifo_thread;
+    event_t  *fifo_not_full_event;
 
-    int virge_busy, local;
+    atomic_int  virge_busy;
+    atomic_uint irq_pending;
 
-    uint8_t subsys_stat, subsys_cntl, advfunc_cntl;
+    uint8_t subsys_stat;
+    uint8_t subsys_cntl;
 
-    uint8_t render_thread_run;
+    int local;
 
     uint8_t serialport;
 
+    uint8_t irq_state;
+    uint8_t advfunc_cntl;
+
     void *i2c, *ddc;
 
-    int waiting;
+    int onboard;
+    int fifo_slots_num;
+
+    uint32_t vram_mask;
+
+    uint8_t reg6b;
+    uint8_t lfb_bios;
+    uint8_t int_line;
+    uint8_t cmd_dma;
+
+    uint32_t cmd_dma_base;
+    uint32_t cmd_dma_buf_size;
+    uint32_t cmd_dma_buf_size_mask;
+    uint32_t cmd_base_addr;
+    uint32_t cmd_dma_write_ptr_reg;
+    uint32_t cmd_dma_write_ptr_update;
+    uint32_t cmd_dma_read_ptr_reg;
+    uint32_t dma_val;
+    uint32_t dma_dbl_words;
+    uint32_t dma_mmio_addr;
+    uint32_t dma_data_type;
+
+    bool color_key_enabled;
+
+    int pci;
+    int is_agp;
+
+    pc_timer_t irq_timer;
 } virge_t;
 
+static __inline void
+wake_fifo_thread(virge_t *virge)
+{
+    /* Wake up FIFO thread if moving from idle */
+    thread_set_event(virge->wake_fifo_thread);
+}
+
+static virge_t *reset_state = NULL;
+
 static video_timings_t timing_diamond_stealth3d_2000_pci = { .type = VIDEO_PCI, .write_b = 2, .write_w = 2, .write_l = 3, .read_b = 28, .read_w = 28, .read_l = 45 };
 static video_timings_t timing_diamond_stealth3d_3000_pci = { .type = VIDEO_PCI, .write_b = 2, .write_w = 2, .write_l = 4, .read_b = 26, .read_w = 26, .read_l = 42 };
 static video_timings_t timing_virge_dx_pci               = { .type = VIDEO_PCI, .write_b = 2, .write_w = 2, .write_l = 3, .read_b = 28, .read_w = 28, .read_l = 45 };
 static video_timings_t timing_virge_agp                  = { .type = VIDEO_AGP, .write_b = 2, .write_w = 2, .write_l = 3, .read_b = 28, .read_w = 28, .read_l = 45 };
 
-static void s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri);
+static void queue_triangle(virge_t *virge);
 
 static void s3_virge_recalctimings(svga_t *svga);
 static void s3_virge_updatemapping(virge_t *virge);
@@ -310,12 +408,14 @@ static void s3_virge_updatemapping(virge_t *virge);
 static void s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat);
 
 static uint8_t  s3_virge_mmio_read(uint32_t addr, void *priv);
-static uint16_t s3_virge_mmio_read_w(uint32_t addr, void *rivp);
+static uint16_t s3_virge_mmio_read_w(uint32_t addr, void *priv);
 static uint32_t s3_virge_mmio_read_l(uint32_t addr, void *priv);
 static void     s3_virge_mmio_write(uint32_t addr, uint8_t val, void *priv);
 static void     s3_virge_mmio_write_w(uint32_t addr, uint16_t val, void *priv);
 static void     s3_virge_mmio_write_l(uint32_t addr, uint32_t val, void *priv);
 
+static void s3_virge_queue(virge_t *virge, uint32_t addr, uint32_t val, uint32_t type);
+
 enum {
     CMD_SET_AE = 1,
     CMD_SET_HC = (1 << 1),
@@ -362,6 +462,8 @@ enum {
 #define INT_S3D_DONE    (1 << 1)
 #define INT_FIFO_OVF    (1 << 2)
 #define INT_FIFO_EMP    (1 << 3)
+#define INT_HOST_DONE   (1 << 4)
+#define INT_CMD_DONE    (1 << 5)
 #define INT_3DF_EMP     (1 << 6)
 #define INT_MASK        0xff
 
@@ -370,82 +472,26 @@ enum {
 #define SERIAL_PORT_SCR (1 << 2)
 #define SERIAL_PORT_SDR (1 << 3)
 
-#ifdef ENABLE_S3_VIRGE_LOG
-int s3_virge_do_log = ENABLE_S3_VIRGE_LOG;
-
-static void
-s3_virge_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (s3_virge_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define s3_virge_log(fmt, ...)
-#endif
-
-static void
-s3_virge_tri_timer(void *priv)
-{
-    virge_t *virge = (virge_t *) priv;
-
-    thread_set_event(virge->wake_render_thread); /*Wake up FIFO thread if moving from idle*/
-}
-
-static void
-queue_triangle(virge_t *virge)
-{
-    if (RB_FULL) {
-        thread_reset_event(virge->not_full_event);
-        thread_reset_event(virge->wake_main_thread);
-        if (RB_FULL) {
-            thread_wait_event(virge->not_full_event, -1); /*Wait for room in ringbuffer*/
-            thread_wait_event(virge->wake_main_thread, -1);
-        }
-    }
-    virge->s3d_buffer[virge->s3d_write_idx & RB_MASK] = virge->s3d_tri;
-    virge->s3d_write_idx++;
-
-    if (!virge->s3d_busy) {
-        if (!(timer_is_enabled(&virge->tri_timer)))
-            timer_set_delay_u64(&virge->tri_timer, 100 * TIMER_USEC);
-    }
-}
-
 static void
 s3_virge_update_irqs(virge_t *virge)
 {
-    if ((virge->svga.crtc[0x32] & 0x10) && (virge->subsys_stat & (virge->subsys_cntl & INT_MASK)))
+    if ((virge->svga.crtc[0x32] & 0x10) && (virge->subsys_stat & virge->subsys_cntl & INT_MASK))
         pci_set_irq(virge->pci_slot, PCI_INTA, &virge->irq_state);
     else
         pci_clear_irq(virge->pci_slot, PCI_INTA, &virge->irq_state);
 }
 
 static void
-render_thread(void *param)
+s3_virge_update_irq_timer(void *priv)
 {
-    virge_t *virge = (virge_t *) param;
+    virge_t *virge = (virge_t *) priv;
 
-    while (virge->render_thread_run) {
-        thread_wait_event(virge->wake_render_thread, -1);
-        thread_reset_event(virge->wake_render_thread);
-        virge->s3d_busy = 1;
-        while (!RB_EMPTY) {
-            s3_virge_triangle(virge, &virge->s3d_buffer[virge->s3d_read_idx & RB_MASK]);
-            virge->s3d_read_idx++;
-            if (RB_ENTRIES == RB_MASK) {
-                thread_set_event(virge->not_full_event);
-                thread_set_event(virge->wake_main_thread);
-            }
-        }
-        virge->s3d_busy = 0;
-        virge->subsys_stat |= INT_S3D_DONE;
+    if (virge->irq_pending) {
+        virge->irq_pending--;
         s3_virge_update_irqs(virge);
     }
+
+    timer_on_auto(&virge->irq_timer, 100.);
 }
 
 static void
@@ -462,12 +508,11 @@ s3_virge_out(uint16_t addr, uint8_t val, void *priv)
     switch (addr) {
         case 0x3c5:
             if (svga->seqaddr >= 0x10) {
-                svga->seqregs[svga->seqaddr & 0x1f] = val;
+                svga->seqregs[svga->seqaddr] = val;
                 svga_recalctimings(svga);
                 return;
             }
-            if (svga->seqaddr == 4) /*Chain-4 - update banking*/
-            {
+            if (svga->seqaddr == 4) { /*Chain-4 - update banking*/
                 if (val & 8)
                     svga->write_bank = svga->read_bank = virge->bank << 16;
                 else
@@ -491,20 +536,18 @@ s3_virge_out(uint16_t addr, uint8_t val, void *priv)
                 return;
             if ((svga->crtcreg == 7) && (svga->crtc[0x11] & 0x80))
                 val = (svga->crtc[7] & ~0x10) | (val & 0x10);
-            if ((svga->crtcreg >= 0x20) && (svga->crtcreg < 0x40) && (svga->crtcreg != 0x36) && (svga->crtcreg != 0x38) && (svga->crtcreg != 0x39) && ((svga->crtc[0x38] & 0xcc) != 0x48))
+            if ((svga->crtcreg >= 0x20) && (svga->crtcreg < 0x40) &&
+                (svga->crtcreg != 0x36) && (svga->crtcreg != 0x38) &&
+                (svga->crtcreg != 0x39) && ((svga->crtc[0x38] & 0xcc) != 0x48))
                 return;
             if ((svga->crtcreg >= 0x40) && ((svga->crtc[0x39] & 0xe0) != 0xa0))
                 return;
             if ((svga->crtcreg == 0x36) && (svga->crtc[0x39] != 0xa5))
                 return;
-            if (svga->crtcreg >= 0x80)
-                return;
+
             old                       = svga->crtc[svga->crtcreg];
             svga->crtc[svga->crtcreg] = val;
 
-            if (svga->crtcreg > 0x18)
-                s3_virge_log("OUTB VGA reg = %02x, val = %02x\n", svga->crtcreg, val);
-
             switch (svga->crtcreg) {
                 case 0x31:
                     virge->ma_ext = (virge->ma_ext & 0x1c) | ((val & 0x30) >> 4);
@@ -561,7 +604,8 @@ s3_virge_out(uint16_t addr, uint8_t val, void *priv)
                     svga->hwcursor.xoff = svga->crtc[0x4e] & 0x3f;
                     svga->hwcursor.yoff = svga->crtc[0x4f] & 0x3f;
                     cursoraddr          = (virge->memory_size == 8) ? 0x1fff : 0x0fff;
-                    svga->hwcursor.addr = ((((svga->crtc[0x4c] << 8) | svga->crtc[0x4d]) & cursoraddr) * 1024) + (svga->hwcursor.yoff * 16);
+                    svga->hwcursor.addr = ((((svga->crtc[0x4c] << 8) |
+                                          svga->crtc[0x4d]) & cursoraddr) * 1024) + (svga->hwcursor.yoff * 16);
                     break;
 
                 case 0x4a:
@@ -649,9 +693,10 @@ s3_virge_out(uint16_t addr, uint8_t val, void *priv)
                 if (svga->crtcreg < 0xe || svga->crtcreg > 0x10) {
                     if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) +
+                                           ((svga->crtc[8] & 0x60) >> 5);
                         if ((svga->crtc[0x67] & 0xc) != 0xc)
-                            svga->ma_latch |= (virge->ma_ext << 16);
+                            svga->memaddr_latch |= (virge->ma_ext << 16);
                     } else {
                         svga->fullchange = changeframecount;
                         svga_recalctimings(svga);
@@ -686,17 +731,17 @@ s3_virge_in(uint16_t addr, void *priv)
 
         case 0x3c5:
             if (svga->seqaddr >= 8)
-                ret = svga->seqregs[svga->seqaddr & 0x1f];
+                ret = svga->seqregs[svga->seqaddr];
             else if (svga->seqaddr <= 4)
                 ret = svga_in(addr, svga);
             else
                 ret = 0xff;
             break;
 
-        case 0x3D4:
+        case 0x3d4:
             ret = svga->crtcreg;
             break;
-        case 0x3D5:
+        case 0x3d5:
             switch (svga->crtcreg) {
                 case 0x2d:
                     ret = virge->virge_id_high;
@@ -768,13 +813,18 @@ s3_virge_in(uint16_t addr, void *priv)
             ret = svga_in(addr, svga);
             break;
     }
+
     return ret;
 }
 
 static void
 s3_virge_recalctimings(svga_t *svga)
 {
-    const virge_t *virge = (virge_t *) svga->priv;
+    int      n;
+    int      r;
+    int      m;
+    double   freq;
+    virge_t *virge = (virge_t *) svga->priv;
 
     svga->hdisp = svga->hdisp_old;
 
@@ -790,97 +840,101 @@ s3_virge_recalctimings(svga_t *svga)
     }
 
     if (svga->crtc[0x5d] & 0x01)
-        svga->htotal += 0x100;
+        svga->htotal |= 0x100;
     if (svga->crtc[0x5d] & 0x02) {
-        svga->hdisp_time += 0x100;
-        svga->hdisp += 0x100 * svga->dots_per_clock;
+        svga->hdisp_time |= 0x100;
+        svga->hdisp |= (0x100 * svga->dots_per_clock);
     }
     if (svga->crtc[0x5e] & 0x01)
-        svga->vtotal += 0x400;
+        svga->vtotal |= 0x400;
     if (svga->crtc[0x5e] & 0x02)
-        svga->dispend += 0x400;
+        svga->dispend |= 0x400;
     if (svga->crtc[0x5e] & 0x04)
-        svga->vblankstart += 0x400;
+        svga->vblankstart |= 0x400;
     if (svga->crtc[0x5e] & 0x10)
-        svga->vsyncstart += 0x400;
+    svga->vsyncstart |= 0x400;
+    svga->split       = svga->crtc[0x18];
+    if (svga->crtc[7] & 0x10)
+        svga->split |= 0x100;
+    if (svga->crtc[9] & 0x40)
+        svga->split |= 0x200;
     if (svga->crtc[0x5e] & 0x40)
-        svga->split += 0x400;
+        svga->split |= 0x400;
+    svga->split++;
     svga->interlace = svga->crtc[0x42] & 0x20;
 
     if (((svga->miscout >> 2) & 3) == 3) {
-        int n = svga->seqregs[0x12] & 0x1f;
-        int r = (svga->seqregs[0x12] >> 5);
-
-        if (virge->chip == S3_VIRGEVX || virge->chip == S3_VIRGEDX)
-            r &= 7;
-        else if (virge->chip >= S3_VIRGEGX2)
-            r &= 10;
+        n = svga->seqregs[0x12] & 0x1f;
+        if (virge->chip >= S3_VIRGEGX2) {
+            r = (svga->seqregs[0x12] >> 6) & 0x03;
+            r |= ((svga->seqregs[0x29] & 0x01) << 2);
+        } else if ((virge->chip == S3_VIRGEVX) || (virge->chip == S3_VIRGEDX))
+            r = (svga->seqregs[0x12] >> 5) & 0x07;
         else
-            r &= 3;
+            r = (svga->seqregs[0x12] >> 5) & 0x03;
 
-        int    m    = svga->seqregs[0x13] & 0x7f;
-        double freq = (((double) m + 2) / (((double) n + 2) * (double) (1 << r))) * 14318184.0;
+        m    = svga->seqregs[0x13] & 0x7f;
+        freq = (((double) m + 2) / (((double) n + 2) * (double) (1 << r))) * 14318184.0;
 
         svga->clock = (cpuclock * (float) (1ULL << 32)) / freq;
     }
 
     if ((svga->crtc[0x33] & 0x20) || ((svga->crtc[0x67] & 0xc) == 0xc)) {
         /* The S3 version of the Cirrus' special blanking mode, with identical behavior. */
-        svga->hblankstart = (((svga->crtc[0x5d] & 0x02) >> 1) << 8) + svga->crtc[1] +
-                            ((svga->crtc[3] >> 5) & 3) + 1;
-        svga->hblank_end_val = ((svga->crtc[3] >> 5) & 3);
+        svga->hblankstart = (((svga->crtc[0x5d] & 0x02) >> 1) << 8) + svga->crtc[1]/* +
+                            ((svga->crtc[3] >> 5) & 3) + 1*/;
+        svga->hblank_end_val = svga->htotal - 1 /* + ((svga->crtc[3] >> 5) & 3)*/;
 
         svga->monitor->mon_overscan_y = 0;
         svga->monitor->mon_overscan_x = 0;
 
         /* Also make sure vertical blanking starts on display end. */
         svga->vblankstart = svga->dispend;
+        video_force_resize_set_monitor(1, svga->monitor_index);
     } else {
-        svga->hblankstart    = (((svga->crtc[0x5d] & 0x04) >> 2) << 8) + svga->crtc[2] + 1;
+        svga->hblankstart = (((svga->crtc[0x5d] & 0x04) >> 2) << 8) + svga->crtc[2];
 
         svga->hblank_end_val  = (svga->crtc[3] & 0x1f) | (((svga->crtc[5] & 0x80) >> 7) << 5) |
                                 (((svga->crtc[0x5d] & 0x08) >> 3) << 6);
         svga->hblank_end_mask = 0x7f;
+        video_force_resize_set_monitor(1, svga->monitor_index);
     }
 
-    if ((svga->crtc[0x67] & 0xc) != 0xc) /*VGA mode*/
-    {
-        svga->ma_latch |= (virge->ma_ext << 16);
+    if ((svga->crtc[0x67] & 0xc) != 0xc) { /*VGA mode*/
+        svga->memaddr_latch |= (virge->ma_ext << 16);
         if (svga->crtc[0x51] & 0x30)
-            svga->rowoffset += (svga->crtc[0x51] & 0x30) << 4;
+            svga->rowoffset |= (svga->crtc[0x51] & 0x30) << 4;
         else if (svga->crtc[0x43] & 0x04)
-            svga->rowoffset += 0x100;
+            svga->rowoffset |= 0x100;
         if (!svga->rowoffset)
             svga->rowoffset = 256;
 
         svga->lowres = !((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10));
-        if ((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10)) {
+        if ((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10))
             switch (svga->bpp) {
                 case 8:
                     svga->render = svga_render_8bpp_highres;
                     break;
                 case 15:
                     svga->render = svga_render_15bpp_highres;
-                    if (virge->chip != S3_VIRGEVX && virge->chip < S3_VIRGEGX2) {
-                        svga->htotal >>= 1;
+                    if ((virge->chip != S3_VIRGEVX) && (virge->chip < S3_VIRGEGX2)) {
                         svga->hdisp >>= 1;
-                        svga->hblankstart >>= 1;
-                        svga->hblank_end_val >>= 1;
+                        svga->dots_per_clock >>= 1;
+                        svga->clock /= 2.0;
                     }
                     break;
                 case 16:
                     svga->render = svga_render_16bpp_highres;
-                    if (virge->chip != S3_VIRGEVX && virge->chip < S3_VIRGEGX2) {
-                        svga->htotal >>= 1;
+                    if ((virge->chip != S3_VIRGEVX) && (virge->chip < S3_VIRGEGX2)) {
                         svga->hdisp >>= 1;
-                        svga->hblankstart >>= 1;
-                        svga->hblank_end_val >>= 1;
+                        svga->dots_per_clock >>= 1;
+                        svga->clock /= 2.0;
                     }
                     break;
                 case 24:
                     svga->render = svga_render_24bpp_highres;
-                    if (virge->chip != S3_VIRGEVX && virge->chip < S3_VIRGEGX2)
-                        svga->rowoffset = (svga->rowoffset * 3) / 4; /*Hack*/
+                    if ((virge->chip != S3_VIRGEVX) && (virge->chip < S3_VIRGEGX2))
+                        svga->rowoffset = (svga->rowoffset * 3) >> 2; /*Hack*/
                     break;
                 case 32:
                     svga->render = svga_render_32bpp_highres;
@@ -889,22 +943,34 @@ s3_virge_recalctimings(svga_t *svga)
                 default:
                     break;
             }
-        }
+
         svga->vram_display_mask = (!(svga->crtc[0x31] & 0x08) && (svga->crtc[0x32] & 0x40)) ? 0x3ffff : virge->vram_mask;
-        s3_virge_log("VGA mode\n");
-    } else /*Streams mode*/
-    {
-        if (virge->streams.buffer_ctrl & 1)
-            svga->ma_latch = virge->streams.pri_fb1 >> 2;
-        else
-            svga->ma_latch = virge->streams.pri_fb0 >> 2;
+    } else { /*Streams mode*/
+        if (virge->chip < S3_VIRGEGX2) {
+            if (virge->streams.buffer_ctrl & 1)
+                svga->memaddr_latch = virge->streams.pri_fb1 >> 2;
+            else
+                svga->memaddr_latch = virge->streams.pri_fb0 >> 2;
 
-        svga->hdisp = virge->streams.pri_w + 1;
-        if (virge->streams.pri_h < svga->dispend)
-            svga->dispend = virge->streams.pri_h;
+            svga->hdisp = virge->streams.pri_w + 1;
+            if (virge->streams.pri_h < svga->dispend)
+                svga->dispend = virge->streams.pri_h;
+
+            svga->overlay.x = virge->streams.sec_x - virge->streams.pri_x;
+            svga->overlay.y = virge->streams.sec_y - virge->streams.pri_y;
+        } else {
+            svga->memaddr_latch |= (virge->ma_ext << 16);
+            if (svga->crtc[0x51] & 0x30)
+                svga->rowoffset |= (svga->crtc[0x51] & 0x30) << 4;
+            else if (svga->crtc[0x43] & 0x04)
+                svga->rowoffset |= 0x100;
+            if (!svga->rowoffset)
+                svga->rowoffset = 256;
+
+            svga->overlay.x = virge->streams.sec_x;
+            svga->overlay.y = virge->streams.sec_y;
+        }
 
-        svga->overlay.x         = virge->streams.sec_x - virge->streams.pri_x;
-        svga->overlay.y         = virge->streams.sec_y - virge->streams.pri_y;
         svga->overlay.cur_ysize = virge->streams.sec_h;
 
         if (virge->streams.buffer_ctrl & 2)
@@ -913,43 +979,80 @@ s3_virge_recalctimings(svga_t *svga)
             svga->overlay.addr = virge->streams.sec_fb0;
 
         svga->overlay.ena   = (svga->overlay.x >= 0);
+        svga->overlay.h_acc = virge->streams.dda_horiz_accumulator;
         svga->overlay.v_acc = virge->streams.dda_vert_accumulator;
-        svga->rowoffset     = virge->streams.pri_stride >> 3;
 
-        switch ((virge->streams.pri_ctrl >> 24) & 0x7) {
-            case 0: /*RGB-8 (CLUT)*/
-                svga->render = svga_render_8bpp_highres;
-                break;
-            case 3: /*KRGB-16 (1.5.5.5)*/
-                svga->htotal >>= 1;
-                svga->hblankstart >>= 1;
-                svga->hblank_end_val >>= 1;
-                svga->render = svga_render_15bpp_highres;
-                break;
-            case 5: /*RGB-16 (5.6.5)*/
-                svga->htotal >>= 1;
-                svga->hblankstart >>= 1;
-                svga->hblank_end_val >>= 1;
-                svga->render = svga_render_16bpp_highres;
-                break;
-            case 6: /*RGB-24 (8.8.8)*/
-                svga->render = svga_render_24bpp_highres;
-                break;
-            case 7: /*XRGB-32 (X.8.8.8)*/
-                svga->render = svga_render_32bpp_highres;
-                break;
+        if (virge->chip < S3_VIRGEGX2)
+            svga->rowoffset = virge->streams.pri_stride >> 3;
 
-            default:
-                break;
+        if (virge->chip <= S3_VIRGEDX && svga->overlay.ena) {
+            svga->overlay.ena = (((virge->streams.blend_ctrl >> 24) & 7) == 0b000) || (((virge->streams.blend_ctrl >> 24) & 7) == 0b101);
+        } else if (virge->chip >= S3_VIRGEGX2 && svga->overlay.ena) {
+            /* 0x20 = Secondary Stream enabled */
+            /* 0x2000 = Primary Stream enabled */
+            svga->overlay.ena = !!(virge->streams.blend_ctrl & 0x20);
+        }
+
+        if (virge->chip >= S3_VIRGEGX2) {
+            switch (svga->bpp) {
+                case 8:
+                    svga->render = svga_render_8bpp_highres;
+                    break;
+                case 15:
+                    svga->render = svga_render_15bpp_highres;
+                    break;
+                case 16:
+                    svga->render = svga_render_16bpp_highres;
+                    break;
+                case 24:
+                    svga->render = svga_render_24bpp_highres;
+                    break;
+                case 32:
+                    svga->render = svga_render_32bpp_highres;
+                    break;
+
+                default:
+                    break;
+            }
+        } else {
+            switch ((virge->streams.pri_ctrl >> 24) & 0x7) {
+                case 0: /*RGB-8 (CLUT)*/
+                    svga->render = svga_render_8bpp_highres;
+                    break;
+                case 3: /*KRGB-16 (1.5.5.5)*/
+                    svga->render = svga_render_15bpp_highres;
+                    if (virge->chip != S3_VIRGEVX)
+                        svga->clock /= 2.0;
+                    break;
+                case 5: /*RGB-16 (5.6.5)*/
+                    svga->render = svga_render_16bpp_highres;
+                    if (virge->chip != S3_VIRGEVX)
+                        svga->clock /= 2.0;
+                    break;
+                case 6: /*RGB-24 (8.8.8)*/
+                    svga->render = svga_render_24bpp_highres;
+                    break;
+                case 7: /*XRGB-32 (X.8.8.8)*/
+                    svga->render = svga_render_32bpp_highres;
+                    break;
+            }
         }
         svga->vram_display_mask = virge->vram_mask;
     }
+
+    svga->hoverride = 1;
+
+    if (svga->render == svga_render_2bpp_lowres)
+        svga->render = svga_render_2bpp_s3_lowres;
+    else if (svga->render == svga_render_2bpp_highres)
+        svga->render = svga_render_2bpp_s3_highres;
 }
 
 static void
 s3_virge_updatemapping(virge_t *virge)
 {
     svga_t *svga = &virge->svga;
+    xga_t *xga   = (xga_t *) svga->xga;
 
     if (!(virge->pci_regs[PCI_REG_COMMAND] & PCI_COMMAND_MEM)) {
         mem_mapping_disable(&svga->mapping);
@@ -959,9 +1062,7 @@ s3_virge_updatemapping(virge_t *virge)
         return;
     }
 
-    s3_virge_log("Update mapping - bank %02X ", svga->gdcreg[6] & 0xc);
-    /*Banked framebuffer*/
-    switch (svga->gdcreg[6] & 0xc) { /*VGA mapping*/
+    switch (svga->gdcreg[6] & 0xc) { /*Banked framebuffer*/
         case 0x0:                    /*128k at A0000*/
             mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x20000);
             svga->banked_mask = 0xffff;
@@ -969,6 +1070,10 @@ s3_virge_updatemapping(virge_t *virge)
         case 0x4: /*64k at A0000*/
             mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
             svga->banked_mask = 0xffff;
+            if (xga_active && (svga->xga != NULL)) {
+                xga->on = 0;
+                mem_mapping_set_handler(&svga->mapping, svga->read, svga->readw, svga->readl, svga->write, svga->writew, svga->writel);
+            }
             break;
         case 0x8: /*32k at B0000*/
             mem_mapping_set_addr(&svga->mapping, 0xb0000, 0x08000);
@@ -978,14 +1083,10 @@ s3_virge_updatemapping(virge_t *virge)
             mem_mapping_set_addr(&svga->mapping, 0xb8000, 0x08000);
             svga->banked_mask = 0x7fff;
             break;
-
-        default:
-            break;
     }
 
     virge->linear_base = (svga->crtc[0x5a] << 16) | (svga->crtc[0x59] << 24);
 
-    s3_virge_log("Linear framebuffer %02X, linear base = %08x, display mask = %08x\n", svga->crtc[0x58] & 0x17, virge->linear_base, svga->vram_display_mask);
     if ((svga->crtc[0x58] & 0x10) || (virge->advfunc_cntl & 0x10)) { /*Linear framebuffer*/
         switch (svga->crtc[0x58] & 7) {
             case 0: /*64k*/
@@ -998,7 +1099,7 @@ s3_virge_updatemapping(virge_t *virge)
                 virge->linear_size = 0x200000;
                 break;
             case 3: /*4mb on other than ViRGE/VX, 8mb on ViRGE/VX*/
-                if (virge->chip == S3_VIRGEVX || virge->chip == S3_TRIO3D2X)
+                if ((virge->chip == S3_VIRGEVX) || (virge->chip == S3_TRIO3D2X))
                     virge->linear_size = 0x800000;
                 else
                     virge->linear_size = 0x400000;
@@ -1006,21 +1107,16 @@ s3_virge_updatemapping(virge_t *virge)
             case 7:
                 virge->linear_size = 0x800000;
                 break;
-
-            default:
-                break;
         }
         virge->linear_base &= ~(virge->linear_size - 1);
-        s3_virge_log("Linear framebuffer at %08X size %08X, mask = %08x, CRTC58 sel = %02x\n", virge->linear_base, virge->linear_size, virge->vram_mask, svga->crtc[0x58] & 7);
         if (virge->linear_base == 0xa0000) {
             mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
             mem_mapping_disable(&virge->linear_mapping);
         } else {
-            if (virge->chip == S3_VIRGEVX || virge->chip == S3_TRIO3D2X) {
+            if ((virge->chip == S3_VIRGEVX) || (virge->chip == S3_TRIO3D2X))
                 virge->linear_base &= 0xfe000000;
-            } else {
+            else
                 virge->linear_base &= 0xfc000000;
-            }
 
             mem_mapping_set_addr(&virge->linear_mapping, virge->linear_base, virge->linear_size);
         }
@@ -1030,11 +1126,7 @@ s3_virge_updatemapping(virge_t *virge)
         svga->fb_only = 0;
     }
 
-    s3_virge_log("Memory mapped IO %02X\n", svga->crtc[0x53] & 0x38);
-
-    /* Memory mapped I/O. */
-    /* Old MMIO. */
-    if ((svga->crtc[0x53] & 0x10) || (virge->advfunc_cntl & 0x20)) {
+    if ((svga->crtc[0x53] & 0x10) || (virge->advfunc_cntl & 0x20)) { /*Old MMIO*/
         if (svga->crtc[0x53] & 0x20)
             mem_mapping_set_addr(&virge->mmio_mapping, 0xb8000, 0x8000);
         else
@@ -1042,8 +1134,7 @@ s3_virge_updatemapping(virge_t *virge)
     } else
         mem_mapping_disable(&virge->mmio_mapping);
 
-    /* New MMIO. */
-    if (svga->crtc[0x53] & 0x08)
+    if (svga->crtc[0x53] & 0x08) /*New MMIO*/
         mem_mapping_set_addr(&virge->new_mmio_mapping, virge->linear_base + 0x1000000, 0x10000);
     else
         mem_mapping_disable(&virge->new_mmio_mapping);
@@ -1054,488 +1145,18 @@ s3_virge_vblank_start(svga_t *svga)
 {
     virge_t *virge = (virge_t *) svga->priv;
 
+    if (virge->irq_pending)
+        virge->irq_pending--;
     virge->subsys_stat |= INT_VSY;
     s3_virge_update_irqs(virge);
 }
 
 static void
-s3_virge_mmio_fifo_write(uint32_t addr, uint8_t val, virge_t *virge)
+s3_virge_wait_fifo_idle(virge_t *virge)
 {
-    if ((addr & 0xffff) < 0x8000)
-        s3_virge_bitblt(virge, 8, val);
-    else {
-        switch (addr & 0xffff) {
-            case 0x859c:
-                virge->cmd_dma = val;
-                break;
-
-            default:
-                break;
-        }
-    }
-}
-
-static void
-s3_virge_mmio_fifo_write_w(uint32_t addr, uint16_t val, virge_t *virge)
-{
-    if ((addr & 0xfffe) < 0x8000) {
-        if (virge->s3d.cmd_set & CMD_SET_MS)
-            s3_virge_bitblt(virge, 16, ((val >> 8) | (val << 8)) << 16);
-        else
-            s3_virge_bitblt(virge, 16, val);
-    } else {
-        if ((addr & 0xfffe) == 0x859c)
-            virge->cmd_dma = val;
-    }
-}
-
-static void
-s3_virge_mmio_fifo_write_l(uint32_t addr, uint32_t val, virge_t *virge)
-{
-    if ((addr & 0xfffc) < 0x8000) {
-        if (virge->s3d.cmd_set & CMD_SET_MS)
-            s3_virge_bitblt(virge, 32, ((val & 0xff000000) >> 24) | ((val & 0x00ff0000) >> 8) | ((val & 0x0000ff00) << 8) | ((val & 0x000000ff) << 24));
-        else
-            s3_virge_bitblt(virge, 32, val);
-    } else {
-        switch (addr & 0xfffc) {
-            case 0x8590:
-                virge->cmd_dma_base = val;
-                break;
-
-            case 0x8594:
-                virge->dma_ptr = val;
-                break;
-
-            case 0x8598:
-                break;
-
-            case 0x859c:
-                virge->cmd_dma = val;
-                break;
-
-            case 0xa000:
-            case 0xa004:
-            case 0xa008:
-            case 0xa00c:
-            case 0xa010:
-            case 0xa014:
-            case 0xa018:
-            case 0xa01c:
-            case 0xa020:
-            case 0xa024:
-            case 0xa028:
-            case 0xa02c:
-            case 0xa030:
-            case 0xa034:
-            case 0xa038:
-            case 0xa03c:
-            case 0xa040:
-            case 0xa044:
-            case 0xa048:
-            case 0xa04c:
-            case 0xa050:
-            case 0xa054:
-            case 0xa058:
-            case 0xa05c:
-            case 0xa060:
-            case 0xa064:
-            case 0xa068:
-            case 0xa06c:
-            case 0xa070:
-            case 0xa074:
-            case 0xa078:
-            case 0xa07c:
-            case 0xa080:
-            case 0xa084:
-            case 0xa088:
-            case 0xa08c:
-            case 0xa090:
-            case 0xa094:
-            case 0xa098:
-            case 0xa09c:
-            case 0xa0a0:
-            case 0xa0a4:
-            case 0xa0a8:
-            case 0xa0ac:
-            case 0xa0b0:
-            case 0xa0b4:
-            case 0xa0b8:
-            case 0xa0bc:
-            case 0xa0c0:
-            case 0xa0c4:
-            case 0xa0c8:
-            case 0xa0cc:
-            case 0xa0d0:
-            case 0xa0d4:
-            case 0xa0d8:
-            case 0xa0dc:
-            case 0xa0e0:
-            case 0xa0e4:
-            case 0xa0e8:
-            case 0xa0ec:
-            case 0xa0f0:
-            case 0xa0f4:
-            case 0xa0f8:
-            case 0xa0fc:
-            case 0xa100:
-            case 0xa104:
-            case 0xa108:
-            case 0xa10c:
-            case 0xa110:
-            case 0xa114:
-            case 0xa118:
-            case 0xa11c:
-            case 0xa120:
-            case 0xa124:
-            case 0xa128:
-            case 0xa12c:
-            case 0xa130:
-            case 0xa134:
-            case 0xa138:
-            case 0xa13c:
-            case 0xa140:
-            case 0xa144:
-            case 0xa148:
-            case 0xa14c:
-            case 0xa150:
-            case 0xa154:
-            case 0xa158:
-            case 0xa15c:
-            case 0xa160:
-            case 0xa164:
-            case 0xa168:
-            case 0xa16c:
-            case 0xa170:
-            case 0xa174:
-            case 0xa178:
-            case 0xa17c:
-            case 0xa180:
-            case 0xa184:
-            case 0xa188:
-            case 0xa18c:
-            case 0xa190:
-            case 0xa194:
-            case 0xa198:
-            case 0xa19c:
-            case 0xa1a0:
-            case 0xa1a4:
-            case 0xa1a8:
-            case 0xa1ac:
-            case 0xa1b0:
-            case 0xa1b4:
-            case 0xa1b8:
-            case 0xa1bc:
-            case 0xa1c0:
-            case 0xa1c4:
-            case 0xa1c8:
-            case 0xa1cc:
-            case 0xa1d0:
-            case 0xa1d4:
-            case 0xa1d8:
-            case 0xa1dc:
-            case 0xa1e0:
-            case 0xa1e4:
-            case 0xa1e8:
-            case 0xa1ec:
-            case 0xa1f0:
-            case 0xa1f4:
-            case 0xa1f8:
-            case 0xa1fc:
-                {
-                    int x = addr & 4;
-                    int y = (addr >> 3) & 7;
-                    int color;
-                    int byte;
-                    virge->s3d.pattern_8[y * 8 + x]     = val & 0xff;
-                    virge->s3d.pattern_8[y * 8 + x + 1] = val >> 8;
-                    virge->s3d.pattern_8[y * 8 + x + 2] = val >> 16;
-                    virge->s3d.pattern_8[y * 8 + x + 3] = val >> 24;
-
-                    x                                    = (addr >> 1) & 6;
-                    y                                    = (addr >> 4) & 7;
-                    virge->s3d.pattern_16[y * 8 + x]     = val & 0xffff;
-                    virge->s3d.pattern_16[y * 8 + x + 1] = val >> 16;
-
-                    addr &= 0x00ff;
-                    for (uint8_t xx = 0; xx < 4; xx++) {
-                        x     = ((addr + xx) / 3) % 8;
-                        y     = ((addr + xx) / 24) % 8;
-                        color = ((addr + xx) % 3) << 3;
-                        byte  = (xx << 3);
-                        virge->s3d.pattern_24[y * 8 + x] &= ~(0xff << color);
-                        virge->s3d.pattern_24[y * 8 + x] |= ((val >> byte) & 0xff) << color;
-                    }
-
-                    x                                = (addr >> 2) & 7;
-                    y                                = (addr >> 5) & 7;
-                    virge->s3d.pattern_32[y * 8 + x] = val & 0xffffff;
-                }
-                break;
-
-            case 0xa4d4:
-            case 0xa8d4:
-                virge->s3d.src_base = (virge->memory_size == 8) ? (val & 0x7ffff8) : (val & 0x3ffff8);
-                s3_virge_log("PortWrite = %04x, SRC Base = %08x, memsize = %i\n", addr & 0xfffc, val, virge->memory_size);
-                break;
-            case 0xa4d8:
-            case 0xa8d8:
-                virge->s3d.dest_base = (virge->memory_size == 8) ? (val & 0x7ffff8) : (val & 0x3ffff8);
-                s3_virge_log("PortWrite = %04x, DST Base = %08x, memsize = %i\n", addr & 0xfffc, val, virge->memory_size);
-                break;
-            case 0xa4dc:
-            case 0xa8dc:
-                virge->s3d.clip_l = (val >> 16) & 0x7ff;
-                virge->s3d.clip_r = val & 0x7ff;
-                break;
-            case 0xa4e0:
-            case 0xa8e0:
-                virge->s3d.clip_t = (val >> 16) & 0x7ff;
-                virge->s3d.clip_b = val & 0x7ff;
-                break;
-            case 0xa4e4:
-            case 0xa8e4:
-                virge->s3d.dest_str = (val >> 16) & 0xff8;
-                virge->s3d.src_str  = val & 0xff8;
-                break;
-            case 0xa4e8:
-            case 0xace8:
-                virge->s3d.mono_pat_0 = val;
-                break;
-            case 0xa4ec:
-            case 0xacec:
-                virge->s3d.mono_pat_1 = val;
-                break;
-            case 0xa4f0:
-            case 0xacf0:
-                virge->s3d.pat_bg_clr = val;
-                break;
-            case 0xa4f4:
-            case 0xa8f4:
-            case 0xacf4:
-                virge->s3d.pat_fg_clr = val;
-                break;
-            case 0xa4f8:
-                virge->s3d.src_bg_clr = val;
-                break;
-            case 0xa4fc:
-                virge->s3d.src_fg_clr = val;
-                break;
-            case 0xa500:
-            case 0xa900:
-                virge->s3d.cmd_set = val;
-                if (!(val & CMD_SET_AE)) {
-                    s3_virge_bitblt(virge, -1, 0);
-                }
-                break;
-            case 0xa504:
-                virge->s3d.r_width  = (val >> 16) & 0x7ff;
-                virge->s3d.r_height = val & 0x7ff;
-                break;
-            case 0xa508:
-                virge->s3d.rsrc_x = (val >> 16) & 0x7ff;
-                virge->s3d.rsrc_y = val & 0x7ff;
-                break;
-            case 0xa50c:
-                virge->s3d.rdest_x = (val >> 16) & 0x7ff;
-                virge->s3d.rdest_y = val & 0x7ff;
-                if (virge->s3d.cmd_set & CMD_SET_AE) {
-                    s3_virge_bitblt(virge, -1, 0);
-                }
-                break;
-            case 0xa96c:
-                virge->s3d.lxend0 = (val >> 16) & 0x7ff;
-                virge->s3d.lxend1 = val & 0x7ff;
-                break;
-            case 0xa970:
-                virge->s3d.ldx = (int32_t) val;
-                break;
-            case 0xa974:
-                virge->s3d.lxstart = val;
-                break;
-            case 0xa978:
-                virge->s3d.lystart = val & 0x7ff;
-                break;
-            case 0xa97c:
-                virge->s3d.lycnt    = val & 0x7ff;
-                virge->s3d.line_dir = val >> 31;
-                if (virge->s3d.cmd_set & CMD_SET_AE)
-                    s3_virge_bitblt(virge, -1, 0);
-                break;
-
-            case 0xad00:
-                virge->s3d.cmd_set = val;
-                if (!(val & CMD_SET_AE))
-                    s3_virge_bitblt(virge, -1, 0);
-                break;
-            case 0xad68:
-                virge->s3d.prdx = val;
-                break;
-            case 0xad6c:
-                virge->s3d.prxstart = val;
-                break;
-            case 0xad70:
-                virge->s3d.pldx = val;
-                break;
-            case 0xad74:
-                virge->s3d.plxstart = val;
-                break;
-            case 0xad78:
-                virge->s3d.pystart = val & 0x7ff;
-                break;
-            case 0xad7c:
-                virge->s3d.pycnt = val & 0x300007ff;
-                if (virge->s3d.cmd_set & CMD_SET_AE)
-                    s3_virge_bitblt(virge, -1, 0);
-                break;
-
-            case 0xb0f4:
-            case 0xb4f4:
-                virge->s3d_tri.fog_b = val & 0xff;
-                virge->s3d_tri.fog_g = (val >> 8) & 0xff;
-                virge->s3d_tri.fog_r = (val >> 16) & 0xff;
-                break;
-            case 0xb4d4:
-                virge->s3d_tri.z_base = (virge->memory_size == 8) ? (val & 0x7ffff8) : (val & 0x3ffff8);
-                break;
-            case 0xb4d8:
-                virge->s3d_tri.dest_base = (virge->memory_size == 8) ? (val & 0x7ffff8) : (val & 0x3ffff8);
-                break;
-            case 0xb4dc:
-                virge->s3d_tri.clip_l = (val >> 16) & 0x7ff;
-                virge->s3d_tri.clip_r = val & 0x7ff;
-                break;
-            case 0xb4e0:
-                virge->s3d_tri.clip_t = (val >> 16) & 0x7ff;
-                virge->s3d_tri.clip_b = val & 0x7ff;
-                break;
-            case 0xb4e4:
-                virge->s3d_tri.dest_str = (val >> 16) & 0xff8;
-                virge->s3d.src_str      = val & 0xff8;
-                break;
-            case 0xb4e8:
-                virge->s3d_tri.z_str = val & 0xff8;
-                break;
-            case 0xb4ec:
-                virge->s3d_tri.tex_base = (virge->memory_size == 8) ? (val & 0x7ffff8) : (val & 0x3ffff8);
-                break;
-            case 0xb4f0:
-                virge->s3d_tri.tex_bdr_clr = val & 0xffffff;
-                break;
-            case 0xb500:
-                virge->s3d_tri.cmd_set = val;
-                if (!(val & CMD_SET_AE))
-                    queue_triangle(virge);
-                break;
-            case 0xb504:
-                virge->s3d_tri.tbv = val & 0xfffff;
-                break;
-            case 0xb508:
-                virge->s3d_tri.tbu = val & 0xfffff;
-                break;
-            case 0xb50c:
-                virge->s3d_tri.TdWdX = val;
-                break;
-            case 0xb510:
-                virge->s3d_tri.TdWdY = val;
-                break;
-            case 0xb514:
-                virge->s3d_tri.tws = val;
-                break;
-            case 0xb518:
-                virge->s3d_tri.TdDdX = val;
-                break;
-            case 0xb51c:
-                virge->s3d_tri.TdVdX = val;
-                break;
-            case 0xb520:
-                virge->s3d_tri.TdUdX = val;
-                break;
-            case 0xb524:
-                virge->s3d_tri.TdDdY = val;
-                break;
-            case 0xb528:
-                virge->s3d_tri.TdVdY = val;
-                break;
-            case 0xb52c:
-                virge->s3d_tri.TdUdY = val;
-                break;
-            case 0xb530:
-                virge->s3d_tri.tds = val;
-                break;
-            case 0xb534:
-                virge->s3d_tri.tvs = val;
-                break;
-            case 0xb538:
-                virge->s3d_tri.tus = val;
-                break;
-            case 0xb53c:
-                virge->s3d_tri.TdGdX = val >> 16;
-                virge->s3d_tri.TdBdX = val & 0xffff;
-                break;
-            case 0xb540:
-                virge->s3d_tri.TdAdX = val >> 16;
-                virge->s3d_tri.TdRdX = val & 0xffff;
-                break;
-            case 0xb544:
-                virge->s3d_tri.TdGdY = val >> 16;
-                virge->s3d_tri.TdBdY = val & 0xffff;
-                break;
-            case 0xb548:
-                virge->s3d_tri.TdAdY = val >> 16;
-                virge->s3d_tri.TdRdY = val & 0xffff;
-                break;
-            case 0xb54c:
-                virge->s3d_tri.tgs = (val >> 16) & 0xffff;
-                virge->s3d_tri.tbs = val & 0xffff;
-                break;
-            case 0xb550:
-                virge->s3d_tri.tas = (val >> 16) & 0xffff;
-                virge->s3d_tri.trs = val & 0xffff;
-                break;
-
-            case 0xb554:
-                virge->s3d_tri.TdZdX = val;
-                break;
-            case 0xb558:
-                virge->s3d_tri.TdZdY = val;
-                break;
-            case 0xb55c:
-                virge->s3d_tri.tzs = val;
-                break;
-            case 0xb560:
-                virge->s3d_tri.TdXdY12 = val;
-                break;
-            case 0xb564:
-                virge->s3d_tri.txend12 = val;
-                break;
-            case 0xb568:
-                virge->s3d_tri.TdXdY01 = val;
-                break;
-            case 0xb56c:
-                virge->s3d_tri.txend01 = val;
-                break;
-            case 0xb570:
-                virge->s3d_tri.TdXdY02 = val;
-                break;
-            case 0xb574:
-                virge->s3d_tri.txs = val;
-                break;
-            case 0xb578:
-                virge->s3d_tri.tys = val;
-                break;
-            case 0xb57c:
-                virge->s3d_tri.ty01 = (val >> 16) & 0x7ff;
-                virge->s3d_tri.ty12 = val & 0x7ff;
-                virge->s3d_tri.tlr  = val >> 31;
-                if (virge->s3d_tri.cmd_set & CMD_SET_AE) {
-                    queue_triangle(virge);
-                }
-                break;
-
-            default:
-                break;
-        }
+    while (!FIFO_EMPTY) {
+        wake_fifo_thread(virge);
+        thread_wait_event(virge->fifo_not_full_event, 1);
     }
 }
 
@@ -1543,20 +1164,24 @@ static uint8_t
 s3_virge_mmio_read(uint32_t addr, void *priv)
 {
     virge_t *virge = (virge_t *) priv;
-    uint8_t  ret   = 0xff;
-
-    s3_virge_log("[%04X:%08X]: MMIO ReadB addr = %04x\n", CS, cpu_state.pc, addr & 0xffff);
+    uint8_t  ret;
 
     switch (addr & 0xffff) {
         case 0x8504:
-            virge->subsys_stat |= (INT_3DF_EMP | INT_FIFO_EMP);
+            if (!virge->virge_busy)
+                wake_fifo_thread(virge);
+
             ret = virge->subsys_stat;
-            s3_virge_update_irqs(virge);
             return ret;
         case 0x8505:
-            ret = 0xd0;
-            if (!virge->s3d_busy)
-                ret |= 0x20;
+            ret = 0xc0;
+            if (virge->s3d_busy || virge->virge_busy || !FIFO_EMPTY)
+                ret |= 0x10;
+            else
+                ret |= 0x30;
+
+            if (!virge->virge_busy)
+                wake_fifo_thread(virge);
             return ret;
 
         case 0x850c:
@@ -1568,55 +1193,8 @@ s3_virge_mmio_read(uint32_t addr, void *priv)
             ret = virge->fifo_slots_num >> 2;
             return ret;
 
-        case 0x83b0:
-        case 0x83b1:
-        case 0x83b2:
-        case 0x83b3:
-        case 0x83b4:
-        case 0x83b5:
-        case 0x83b6:
-        case 0x83b7:
-        case 0x83b8:
-        case 0x83b9:
-        case 0x83ba:
-        case 0x83bb:
-        case 0x83bc:
-        case 0x83bd:
-        case 0x83be:
-        case 0x83bf:
-        case 0x83c0:
-        case 0x83c1:
-        case 0x83c2:
-        case 0x83c3:
-        case 0x83c4:
-        case 0x83c5:
-        case 0x83c6:
-        case 0x83c7:
-        case 0x83c8:
-        case 0x83c9:
-        case 0x83ca:
-        case 0x83cb:
-        case 0x83cc:
-        case 0x83cd:
-        case 0x83ce:
-        case 0x83cf:
-        case 0x83d0:
-        case 0x83d1:
-        case 0x83d2:
-        case 0x83d3:
-        case 0x83d4:
-        case 0x83d5:
-        case 0x83d6:
-        case 0x83d7:
-        case 0x83d8:
-        case 0x83d9:
-        case 0x83da:
-        case 0x83db:
-        case 0x83dc:
-        case 0x83dd:
-        case 0x83de:
-        case 0x83df:
-            return s3_virge_in(addr & 0x3ff, virge);
+        case 0x83b0 ... 0x83df:
+            return s3_virge_in(addr & 0x3ff, priv);
 
         case 0x859c:
             return virge->cmd_dma;
@@ -1629,28 +1207,27 @@ s3_virge_mmio_read(uint32_t addr, void *priv)
             if ((virge->serialport & SERIAL_PORT_SDW) && i2c_gpio_get_sda(virge->i2c))
                 ret |= SERIAL_PORT_SDR;
             return ret;
-
-        default:
-            break;
     }
     return 0xff;
 }
+
 static uint16_t
 s3_virge_mmio_read_w(uint32_t addr, void *priv)
 {
     virge_t *virge = (virge_t *) priv;
-    uint16_t ret   = 0xffff;
-
-    s3_virge_log("[%04X:%08X]: MMIO ReadW addr = %04x\n", CS, cpu_state.pc, addr & 0xfffe);
+    uint16_t ret;
 
     switch (addr & 0xfffe) {
         case 0x8504:
-            ret = 0xd000;
-            if (!virge->s3d_busy)
-                ret |= 0x2000;
-            virge->subsys_stat |= (INT_3DF_EMP | INT_FIFO_EMP);
+            ret = 0xc000;
+            if (virge->s3d_busy || virge->virge_busy || !FIFO_EMPTY)
+                ret |= 0x1000;
+            else
+                ret |= 0x3000;
+
             ret |= virge->subsys_stat;
-            s3_virge_update_irqs(virge);
+            if (!virge->virge_busy)
+                wake_fifo_thread(virge);
             return ret;
 
         case 0x850c:
@@ -1662,9 +1239,8 @@ s3_virge_mmio_read_w(uint32_t addr, void *priv)
             return virge->cmd_dma;
 
         default:
-            return s3_virge_mmio_read(addr, virge) | (s3_virge_mmio_read(addr + 1, virge) << 8);
+            return s3_virge_mmio_read(addr, priv) | (s3_virge_mmio_read(addr + 1, priv) << 8);
     }
-
     return 0xffff;
 }
 
@@ -1674,8 +1250,6 @@ s3_virge_mmio_read_l(uint32_t addr, void *priv)
     virge_t *virge = (virge_t *) priv;
     uint32_t ret   = 0xffffffff;
 
-    s3_virge_log("[%04X:%08X]: MMIO ReadL addr = %04x\n", CS, cpu_state.pc, addr & 0xfffc);
-
     switch (addr & 0xfffc) {
         case 0x8180:
             ret = virge->streams.pri_ctrl;
@@ -1745,12 +1319,15 @@ s3_virge_mmio_read_l(uint32_t addr, void *priv)
             break;
 
         case 0x8504:
-            ret = 0x0000d000;
-            if (!virge->s3d_busy)
-                ret |= 0x00002000;
-            virge->subsys_stat |= (INT_3DF_EMP | INT_FIFO_EMP);
+            ret = 0x0000c000;
+            if (virge->s3d_busy || virge->virge_busy || !FIFO_EMPTY)
+                ret |= 0x00001000;
+            else
+                ret |= 0x00003000;
+
             ret |= virge->subsys_stat;
-            s3_virge_update_irqs(virge);
+            if (!virge->virge_busy)
+                wake_fifo_thread(virge);
             break;
 
         case 0x850c:
@@ -1762,136 +1339,569 @@ s3_virge_mmio_read_l(uint32_t addr, void *priv)
             ret = virge->cmd_dma_base;
             break;
         case 0x8594:
+            ret = virge->cmd_dma_write_ptr_reg;
             break;
         case 0x8598:
-            ret = virge->dma_ptr;
+            ret = virge->cmd_dma_read_ptr_reg;
+            if (ret > virge->cmd_dma_write_ptr_reg)
+                ret = virge->cmd_dma_write_ptr_reg;
             break;
         case 0x859c:
-            ret = virge->cmd_dma;
+            ret = 0; /*To prevent DMA overflows.*/
             break;
 
         case 0xa4d4:
+        case 0xa8d4:
+        case 0xacd4:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.src_base;
             break;
         case 0xa4d8:
+        case 0xa8d8:
+        case 0xacd8:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.dest_base;
             break;
         case 0xa4dc:
+        case 0xa8dc:
+        case 0xacdc:
+            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.clip_l << 16) | virge->s3d.clip_r;
             break;
         case 0xa4e0:
+        case 0xa8e0:
+        case 0xace0:
+            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.clip_t << 16) | virge->s3d.clip_b;
             break;
         case 0xa4e4:
+        case 0xa8e4:
+        case 0xace4:
+            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.dest_str << 16) | virge->s3d.src_str;
             break;
         case 0xa4e8:
         case 0xace8:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.mono_pat_0;
             break;
         case 0xa4ec:
         case 0xacec:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.mono_pat_1;
             break;
         case 0xa4f0:
+        case 0xacf0:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.pat_bg_clr;
             break;
         case 0xa4f4:
+        case 0xa8f4:
+        case 0xacf4:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.pat_fg_clr;
             break;
         case 0xa4f8:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.src_bg_clr;
             break;
         case 0xa4fc:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.src_fg_clr;
             break;
         case 0xa500:
+        case 0xa900:
+        case 0xad00:
+            s3_virge_wait_fifo_idle(virge);
             ret = virge->s3d.cmd_set;
             break;
         case 0xa504:
+            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.r_width << 16) | virge->s3d.r_height;
             break;
         case 0xa508:
+            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.rsrc_x << 16) | virge->s3d.rsrc_y;
             break;
         case 0xa50c:
+            s3_virge_wait_fifo_idle(virge);
             ret = (virge->s3d.rdest_x << 16) | virge->s3d.rdest_y;
             break;
+        case 0xa96c:
+            s3_virge_wait_fifo_idle(virge);
+            ret = (virge->s3d.lxend0 << 16) | virge->s3d.lxend1;
+            break;
+        case 0xa970:
+            s3_virge_wait_fifo_idle(virge);
+            ret = virge->s3d.ldx;
+            break;
+        case 0xa974:
+            s3_virge_wait_fifo_idle(virge);
+            ret = virge->s3d.lxstart;
+            break;
+        case 0xa978:
+            s3_virge_wait_fifo_idle(virge);
+            ret = virge->s3d.lystart;
+            break;
+        case 0xa97c:
+            s3_virge_wait_fifo_idle(virge);
+            ret = (virge->s3d.line_dir << 31) | virge->s3d.lycnt;
+            break;
+        case 0xad68:
+            s3_virge_wait_fifo_idle(virge);
+            ret = virge->s3d.prdx;
+            break;
+        case 0xad6c:
+            s3_virge_wait_fifo_idle(virge);
+            ret = virge->s3d.prxstart;
+            break;
+        case 0xad70:
+            s3_virge_wait_fifo_idle(virge);
+            ret = virge->s3d.pldx;
+            break;
+        case 0xad74:
+            s3_virge_wait_fifo_idle(virge);
+            ret = virge->s3d.plxstart;
+            break;
+        case 0xad78:
+            s3_virge_wait_fifo_idle(virge);
+            ret = virge->s3d.pystart;
+            break;
+        case 0xad7c:
+            s3_virge_wait_fifo_idle(virge);
+            ret = virge->s3d.pycnt;
+            break;
 
         default:
-            ret = s3_virge_mmio_read(addr, virge) | (s3_virge_mmio_read(addr + 1, virge) << 8) | (s3_virge_mmio_read(addr + 2, virge) << 16) | (s3_virge_mmio_read(addr + 3, virge) << 24);
+            ret = s3_virge_mmio_read_w(addr, priv) | (s3_virge_mmio_read_w(addr + 2, priv) << 16);
             break;
     }
 
-    s3_virge_log("MMIO ReadL addr = %04x, val = %08x\n", addr & 0xfffc, ret);
+    // pclog("MMIO ReadL=%04x, ret=%08x.\n", addr & 0xfffc, ret);
     return ret;
 }
 
+static void
+s3_virge_mmio_write_fifo_l(virge_t *virge, uint32_t addr, uint32_t val)
+{
+    switch (addr) {
+        case 0xa000 ... 0xa1fc:
+            {
+                int      x = addr & 4;
+                int      y = (addr >> 3) & 7;
+                int      color;
+                int      byte;
+                uint32_t newaddr                    = addr;
+                virge->s3d.pattern_8[y * 8 + x]     = val & 0xff;
+                virge->s3d.pattern_8[y * 8 + x + 1] = val >> 8;
+                virge->s3d.pattern_8[y * 8 + x + 2] = val >> 16;
+                virge->s3d.pattern_8[y * 8 + x + 3] = val >> 24;
+
+                x                                    = (addr >> 1) & 6;
+                y                                    = (addr >> 4) & 7;
+                virge->s3d.pattern_16[y * 8 + x]     = val & 0xffff;
+                virge->s3d.pattern_16[y * 8 + x + 1] = val >> 16;
+
+                newaddr &= 0x00ff;
+                for (uint8_t xx = 0; xx < 4; xx++) {
+                    x     = ((newaddr + xx) / 3) % 8;
+                    y     = ((newaddr + xx) / 24) % 8;
+                    color = ((newaddr + xx) % 3) << 3;
+                    byte  = (xx << 3);
+                    virge->s3d.pattern_24[y * 8 + x] &= ~(0xff << color);
+                    virge->s3d.pattern_24[y * 8 + x] |= ((val >> byte) & 0xff) << color;
+                }
+
+                x                                = (addr >> 2) & 7;
+                y                                = (addr >> 5) & 7;
+                virge->s3d.pattern_32[y * 8 + x] = val & 0xffffff;
+            }
+            break;
+
+        case 0xa4d4:
+        case 0xa8d4:
+        case 0xacd4:
+            virge->s3d.src_base = val & ((virge->memory_size == 8) ? (val & 0x7ffff8) : (val & 0x3ffff8));
+            break;
+        case 0xa4d8:
+        case 0xa8d8:
+        case 0xacd8:
+            virge->s3d.dest_base = val & ((virge->memory_size == 8) ? (val & 0x7ffff8) : (val & 0x3ffff8));
+            break;
+        case 0xa4dc:
+        case 0xa8dc:
+        case 0xacdc:
+            virge->s3d.clip_l = (val >> 16) & 0x7ff;
+            virge->s3d.clip_r = val & 0x7ff;
+            break;
+        case 0xa4e0:
+        case 0xa8e0:
+        case 0xace0:
+            virge->s3d.clip_t = (val >> 16) & 0x7ff;
+            virge->s3d.clip_b = val & 0x7ff;
+            break;
+        case 0xa4e4:
+        case 0xa8e4:
+        case 0xace4:
+            virge->s3d.dest_str = (val >> 16) & 0xff8;
+            virge->s3d.src_str  = val & 0xff8;
+            break;
+        case 0xa4e8:
+        case 0xace8:
+            virge->s3d.mono_pat_0 = val;
+            break;
+        case 0xa4ec:
+        case 0xacec:
+            virge->s3d.mono_pat_1 = val;
+            break;
+        case 0xa4f0:
+        case 0xacf0:
+            virge->s3d.pat_bg_clr = val;
+            break;
+        case 0xa4f4:
+        case 0xa8f4:
+        case 0xacf4:
+            virge->s3d.pat_fg_clr = val;
+            break;
+        case 0xa4f8:
+            virge->s3d.src_bg_clr = val;
+            break;
+        case 0xa4fc:
+            virge->s3d.src_fg_clr = val;
+            break;
+        case 0xa500:
+        case 0xa900:
+        case 0xad00:
+            virge->s3d.cmd_set = val;
+            if (!(val & CMD_SET_AE))
+                s3_virge_bitblt(virge, -1, 0);
+            break;
+        case 0xa504:
+            virge->s3d.r_width  = (val >> 16) & 0x7ff;
+            virge->s3d.r_height = val & 0x7ff;
+            break;
+        case 0xa508:
+            virge->s3d.rsrc_x = (val >> 16) & 0x7ff;
+            virge->s3d.rsrc_y = val & 0x7ff;
+            break;
+        case 0xa50c:
+            virge->s3d.rdest_x = (val >> 16) & 0x7ff;
+            virge->s3d.rdest_y = val & 0x7ff;
+            if (virge->s3d.cmd_set & CMD_SET_AE)
+                s3_virge_bitblt(virge, -1, 0);
+            break;
+        case 0xa96c:
+            virge->s3d.lxend0 = (val >> 16) & 0x7ff;
+            virge->s3d.lxend1 = val & 0x7ff;
+            break;
+        case 0xa970:
+            virge->s3d.ldx = (int32_t) val;
+            break;
+        case 0xa974:
+            virge->s3d.lxstart = val;
+            break;
+        case 0xa978:
+            virge->s3d.lystart = val & 0x7ff;
+            break;
+        case 0xa97c:
+            virge->s3d.lycnt    = val & 0x7ff;
+            virge->s3d.line_dir = val >> 31;
+            if (virge->s3d.cmd_set & CMD_SET_AE)
+                s3_virge_bitblt(virge, -1, 0);
+            break;
+
+        case 0xad68:
+            virge->s3d.prdx = val;
+            break;
+        case 0xad6c:
+            virge->s3d.prxstart = val;
+            break;
+        case 0xad70:
+            virge->s3d.pldx = val;
+            break;
+        case 0xad74:
+            virge->s3d.plxstart = val;
+            break;
+        case 0xad78:
+            virge->s3d.pystart = val & 0x7ff;
+            break;
+        case 0xad7c:
+            virge->s3d.pycnt = val & 0x300007ff;
+            if (virge->s3d.cmd_set & CMD_SET_AE)
+                s3_virge_bitblt(virge, -1, 0);
+            break;
+
+        case 0xb0d4:
+        case 0xb4d4:
+            virge->s3d_tri.z_base = val & ((virge->memory_size == 8) ? (val & 0x7ffff8) : (val & 0x3ffff8));
+            break;
+        case 0xb0d8:
+        case 0xb4d8:
+            virge->s3d_tri.dest_base = val & ((virge->memory_size == 8) ? (val & 0x7ffff8) : (val & 0x3ffff8));
+            break;
+        case 0xb0dc:
+        case 0xb4dc:
+            virge->s3d_tri.clip_l = (val >> 16) & 0x7ff;
+            virge->s3d_tri.clip_r = val & 0x7ff;
+            break;
+        case 0xb0e0:
+        case 0xb4e0:
+            virge->s3d_tri.clip_t = (val >> 16) & 0x7ff;
+            virge->s3d_tri.clip_b = val & 0x7ff;
+            break;
+        case 0xb0e4:
+        case 0xb4e4:
+            virge->s3d_tri.dest_str = (val >> 16) & 0xff8;
+            virge->s3d.src_str      = val & 0xff8;
+            break;
+        case 0xb0e8:
+        case 0xb4e8:
+            virge->s3d_tri.z_str = val & 0xff8;
+            break;
+        case 0xb4ec:
+            virge->s3d_tri.tex_base = val & ((virge->memory_size == 8) ? (val & 0x7ffff8) : (val & 0x3ffff8));
+            break;
+        case 0xb4f0:
+            virge->s3d_tri.tex_bdr_clr = val & 0xffffff;
+            break;
+        case 0xb0f4:
+        case 0xb4f4:
+            virge->s3d_tri.fog_b = val & 0xff;
+            virge->s3d_tri.fog_g = (val >> 8) & 0xff;
+            virge->s3d_tri.fog_r = (val >> 16) & 0xff;
+            break;
+        case 0xb100:
+        case 0xb500:
+            virge->s3d_tri.cmd_set = val;
+            if (!(val & CMD_SET_AE))
+                queue_triangle(virge);
+            break;
+        case 0xb504:
+            virge->s3d_tri.tbv = val & 0xfffff;
+            break;
+        case 0xb508:
+            virge->s3d_tri.tbu = val & 0xfffff;
+            break;
+        case 0xb50c:
+            virge->s3d_tri.TdWdX = val;
+            break;
+        case 0xb510:
+            virge->s3d_tri.TdWdY = val;
+            break;
+        case 0xb514:
+            virge->s3d_tri.tws = val;
+            break;
+        case 0xb518:
+            virge->s3d_tri.TdDdX = val;
+            break;
+        case 0xb51c:
+            virge->s3d_tri.TdVdX = val;
+            break;
+        case 0xb520:
+            virge->s3d_tri.TdUdX = val;
+            break;
+        case 0xb524:
+            virge->s3d_tri.TdDdY = val;
+            break;
+        case 0xb528:
+            virge->s3d_tri.TdVdY = val;
+            break;
+        case 0xb52c:
+            virge->s3d_tri.TdUdY = val;
+            break;
+        case 0xb530:
+            virge->s3d_tri.tds = val;
+            break;
+        case 0xb534:
+            virge->s3d_tri.tvs = val;
+            break;
+        case 0xb538:
+            virge->s3d_tri.tus = val;
+            break;
+        case 0xb53c:
+            virge->s3d_tri.TdGdX = val >> 16;
+            virge->s3d_tri.TdBdX = val & 0xffff;
+            break;
+        case 0xb540:
+            virge->s3d_tri.TdAdX = val >> 16;
+            virge->s3d_tri.TdRdX = val & 0xffff;
+            break;
+        case 0xb544:
+            virge->s3d_tri.TdGdY = val >> 16;
+            virge->s3d_tri.TdBdY = val & 0xffff;
+            break;
+        case 0xb548:
+            virge->s3d_tri.TdAdY = val >> 16;
+            virge->s3d_tri.TdRdY = val & 0xffff;
+            break;
+        case 0xb54c:
+            virge->s3d_tri.tgs = (val >> 16) & 0xffff;
+            virge->s3d_tri.tbs = val & 0xffff;
+            break;
+        case 0xb550:
+            virge->s3d_tri.tas = (val >> 16) & 0xffff;
+            virge->s3d_tri.trs = val & 0xffff;
+            break;
+
+        case 0xb554:
+            virge->s3d_tri.TdZdX = val;
+            break;
+        case 0xb558:
+            virge->s3d_tri.TdZdY = val;
+            break;
+        case 0xb55c:
+            virge->s3d_tri.tzs = val;
+            break;
+        case 0xb560:
+            virge->s3d_tri.TdXdY12 = val;
+            break;
+        case 0xb564:
+            virge->s3d_tri.txend12 = val;
+            break;
+        case 0xb568:
+            virge->s3d_tri.TdXdY01 = val;
+            break;
+        case 0xb56c:
+            virge->s3d_tri.txend01 = val;
+            break;
+        case 0xb570:
+            virge->s3d_tri.TdXdY02 = val;
+            break;
+        case 0xb574:
+            virge->s3d_tri.txs = val;
+            break;
+        case 0xb578:
+            virge->s3d_tri.tys = val;
+            break;
+        case 0xb57c:
+            virge->s3d_tri.ty01 = (val >> 16) & 0x7ff;
+            virge->s3d_tri.ty12 = val & 0x7ff;
+            virge->s3d_tri.tlr  = val >> 31;
+            if (virge->s3d_tri.cmd_set & CMD_SET_AE)
+                queue_triangle(virge);
+            break;
+    }
+}
+
+static void
+fifo_thread(void *param)
+{
+    virge_t *virge = (virge_t *) param;
+
+    while (virge->fifo_thread_run) {
+        thread_set_event(virge->fifo_not_full_event);
+        thread_wait_event(virge->wake_fifo_thread, -1);
+        thread_reset_event(virge->wake_fifo_thread);
+        virge->virge_busy = 1;
+        while (!FIFO_EMPTY) {
+            uint64_t      start_time = plat_timer_read();
+            uint64_t      end_time;
+            fifo_entry_t *fifo = &virge->fifo[virge->fifo_read_idx & FIFO_MASK];
+            uint32_t      val  = fifo->val;
+
+            switch (fifo->addr_type & FIFO_TYPE) {
+                case FIFO_WRITE_BYTE:
+                    if (((fifo->addr_type & FIFO_ADDR) & 0xffff) < 0x8000)
+                        s3_virge_bitblt(virge, 8, val);
+                    break;
+                case FIFO_WRITE_WORD:
+                    if (((fifo->addr_type & FIFO_ADDR) & 0xfffe) < 0x8000) {
+                        if (virge->s3d.cmd_set & CMD_SET_MS)
+                            s3_virge_bitblt(virge, 16, ((val >> 8) | (val << 8)) << 16);
+                        else
+                            s3_virge_bitblt(virge, 16, val);
+                    }
+                    break;
+                case FIFO_WRITE_DWORD:
+                    if (((fifo->addr_type & FIFO_ADDR) & 0xfffc) < 0x8000) {
+                        if (virge->s3d.cmd_set & CMD_SET_MS)
+                            s3_virge_bitblt(virge, 32,
+                                            ((val & 0xff000000) >> 24) | ((val & 0x00ff0000) >> 8) |
+                                            ((val & 0x0000ff00) << 8) | ((val & 0x000000ff) << 24));
+                        else
+                            s3_virge_bitblt(virge, 32, val);
+                    } else
+                        s3_virge_mmio_write_fifo_l(virge, (fifo->addr_type & FIFO_ADDR) & 0xfffc, val);
+                    break;
+            }
+
+            virge->fifo_read_idx++;
+            fifo->addr_type = FIFO_INVALID;
+
+            if (FIFO_ENTRIES > 0xe000)
+                thread_set_event(virge->fifo_not_full_event);
+
+            end_time = plat_timer_read();
+            virge_time += end_time - start_time;
+        }
+        virge->virge_busy = 0;
+        virge->subsys_stat |= (INT_FIFO_EMP | INT_3DF_EMP);
+        if (virge->cmd_dma)
+            virge->subsys_stat |= (INT_HOST_DONE | INT_CMD_DONE);
+
+        virge->irq_pending++;
+    }
+}
+
+static void
+s3_virge_queue(virge_t *virge, uint32_t addr, uint32_t val, uint32_t type)
+{
+    fifo_entry_t *fifo  = &virge->fifo[virge->fifo_write_idx & FIFO_MASK];
+    int           limit = 0;
+
+    if (type == FIFO_WRITE_DWORD) {
+        switch (addr & 0xfffc) {
+            case 0xa500:
+                if (val & CMD_SET_AE)
+                    limit = 1;
+                break;
+            default:
+                break;
+        }
+    }
+
+    if (limit) {
+        if (FIFO_ENTRIES >= 16) {
+            thread_reset_event(virge->fifo_not_full_event);
+            if (FIFO_ENTRIES >= 16)
+                thread_wait_event(virge->fifo_not_full_event, -1); /*Wait for room in ringbuffer*/
+        }
+    } else {
+        if (FIFO_FULL) {
+            thread_reset_event(virge->fifo_not_full_event);
+            if (FIFO_FULL)
+                thread_wait_event(virge->fifo_not_full_event, -1); /*Wait for room in ringbuffer*/
+        }
+    }
+
+    fifo->val       = val;
+    fifo->addr_type = (addr & FIFO_ADDR) | type;
+
+    virge->fifo_write_idx++;
+
+    if (FIFO_ENTRIES > 0xe000)
+        wake_fifo_thread(virge);
+    if (FIFO_ENTRIES > 0xe000 || FIFO_ENTRIES < 8)
+        wake_fifo_thread(virge);
+}
+
 static void
 s3_virge_mmio_write(uint32_t addr, uint8_t val, void *priv)
 {
     virge_t *virge = (virge_t *) priv;
-    s3_virge_log("MMIO WriteB addr = %04x, val = %02x\n", addr & 0xffff, val);
-    if (((addr & 0xffff) >= 0x8590) || ((addr & 0xffff) < 0x8000)) {
-        if ((addr & 0xffff) == 0xff20) {
-            virge->serialport = val;
-            i2c_gpio_set(virge->i2c, !!(val & SERIAL_PORT_SCW), !!(val & SERIAL_PORT_SDW));
-        } else
-            s3_virge_mmio_fifo_write(addr, val, virge);
-    } else {
+
+    if ((addr & 0xffff) < 0x8000)
+        s3_virge_queue(virge, addr, val, FIFO_WRITE_BYTE);
+    else {
         switch (addr & 0xffff) {
-            case 0x83b0:
-            case 0x83b1:
-            case 0x83b2:
-            case 0x83b3:
-            case 0x83b4:
-            case 0x83b5:
-            case 0x83b6:
-            case 0x83b7:
-            case 0x83b8:
-            case 0x83b9:
-            case 0x83ba:
-            case 0x83bb:
-            case 0x83bc:
-            case 0x83bd:
-            case 0x83be:
-            case 0x83bf:
-            case 0x83c0:
-            case 0x83c1:
-            case 0x83c2:
-            case 0x83c3:
-            case 0x83c4:
-            case 0x83c5:
-            case 0x83c6:
-            case 0x83c7:
-            case 0x83c8:
-            case 0x83c9:
-            case 0x83ca:
-            case 0x83cb:
-            case 0x83cc:
-            case 0x83cd:
-            case 0x83ce:
-            case 0x83cf:
-            case 0x83d0:
-            case 0x83d1:
-            case 0x83d2:
-            case 0x83d3:
-            case 0x83d4:
-            case 0x83d5:
-            case 0x83d6:
-            case 0x83d7:
-            case 0x83d8:
-            case 0x83d9:
-            case 0x83da:
-            case 0x83db:
-            case 0x83dc:
-            case 0x83dd:
-            case 0x83de:
-            case 0x83df:
-                s3_virge_out(addr & 0x3ff, val, virge);
+            default:
+            case 0x83b0 ... 0x83df:
+                s3_virge_out(addr & 0x3ff, val, priv);
                 break;
 
-            default:
+            case 0xff20:
+                virge->serialport = val;
+                i2c_gpio_set(virge->i2c, !!(val & SERIAL_PORT_SCW), !!(val & SERIAL_PORT_SDW));
                 break;
         }
     }
@@ -1901,16 +1911,20 @@ static void
 s3_virge_mmio_write_w(uint32_t addr, uint16_t val, void *priv)
 {
     virge_t *virge = (virge_t *) priv;
-    s3_virge_log("[%04X:%08X]: MMIO WriteW addr = %04x, val = %04x\n", CS, cpu_state.pc, addr & 0xfffe, val);
-    if (((addr & 0xfffe) >= 0x8590) || ((addr & 0xfffe) < 0x8000))
-        if ((addr & 0xfffe) == 0xff20)
-            s3_virge_mmio_write(addr, val, virge);
-        else
-            s3_virge_mmio_fifo_write_w(addr, val, virge);
+
+    if ((addr & 0xfffe) < 0x8000)
+        s3_virge_queue(virge, addr, val, FIFO_WRITE_WORD);
     else {
-        if ((addr & 0xfffe) == 0x83d4) {
-            s3_virge_mmio_write(addr, val, virge);
-            s3_virge_mmio_write(addr + 1, val >> 8, virge);
+        switch (addr & 0xfffe) {
+            default:
+            case 0x83d4:
+                s3_virge_mmio_write(addr, val, priv);
+                s3_virge_mmio_write(addr + 1, val >> 8, priv);
+                break;
+
+            case 0xff20:
+                s3_virge_mmio_write(addr, val, priv);
+                break;
         }
     }
 }
@@ -1921,13 +1935,10 @@ s3_virge_mmio_write_l(uint32_t addr, uint32_t val, void *priv)
     virge_t *virge = (virge_t *) priv;
     svga_t  *svga  = &virge->svga;
 
-    s3_virge_log("[%04X:%08X]: MMIO WriteL addr = %04x, val = %04x\n", CS, cpu_state.pc, addr & 0xfffc, val);
-    if (((addr & 0xfffc) >= 0x8590) || ((addr & 0xfffc) < 0x8000))
-        if ((addr & 0xfffc) == 0xff20)
-            s3_virge_mmio_write(addr, val, virge);
-        else {
-            s3_virge_mmio_fifo_write_l(addr, val, virge);
-        }
+    if ((addr & 0xfffc) < 0x8000)
+        s3_virge_queue(virge, addr, val, FIFO_WRITE_DWORD);
+    else if ((addr & 0xe000) == 0xa000)
+        s3_virge_queue(virge, addr, val, FIFO_WRITE_DWORD);
     else {
         switch (addr & 0xfffc) {
             case 0x8180:
@@ -1941,8 +1952,9 @@ s3_virge_mmio_write_l(uint32_t addr, uint32_t val, void *priv)
             case 0x8190:
                 virge->streams.sec_ctrl              = val;
                 virge->streams.dda_horiz_accumulator = val & 0xfff;
-                if (val & (1 << 11))
-                    virge->streams.dda_horiz_accumulator |= 0xfffff800;
+                if (val & 0x1000)
+                    virge->streams.dda_horiz_accumulator |= ~0xfff;
+
                 virge->streams.sdif = (val >> 24) & 7;
                 break;
             case 0x8194:
@@ -1951,22 +1963,30 @@ s3_virge_mmio_write_l(uint32_t addr, uint32_t val, void *priv)
             case 0x8198:
                 virge->streams.sec_filter     = val;
                 virge->streams.k1_horiz_scale = val & 0x7ff;
-                if (val & (1 << 10))
-                    virge->streams.k1_horiz_scale |= 0xfffff800;
+                if (val & 0x800)
+                    virge->streams.k1_horiz_scale |= ~0x7ff;
+
                 virge->streams.k2_horiz_scale = (val >> 16) & 0x7ff;
-                if ((val >> 16) & (1 << 10))
-                    virge->streams.k2_horiz_scale |= 0xfffff800;
+                if ((val >> 16) & 0x800)
+                    virge->streams.k2_horiz_scale |= ~0x7ff;
+
+                svga_recalctimings(svga);
+                svga->fullchange = changeframecount;
                 break;
             case 0x81a0:
                 virge->streams.blend_ctrl = val;
+                svga_recalctimings(svga);
+                svga->fullchange = changeframecount;
                 break;
             case 0x81c0:
-                virge->streams.pri_fb0 = val & 0x7fffff;
+                virge->streams.pri_fb0 = val & ((virge->memory_size == 8) ?
+                                                (val & 0x7fffff) : (val & 0x3fffff));
                 svga_recalctimings(svga);
                 svga->fullchange = changeframecount;
                 break;
             case 0x81c4:
-                virge->streams.pri_fb1 = val & 0x7fffff;
+                virge->streams.pri_fb1 = ((virge->memory_size == 8) ?
+                                          (val & 0x7fffff) : (val & 0x3fffff));
                 svga_recalctimings(svga);
                 svga->fullchange = changeframecount;
                 break;
@@ -2000,18 +2020,21 @@ s3_virge_mmio_write_l(uint32_t addr, uint32_t val, void *priv)
                 break;
             case 0x81e0:
                 virge->streams.k1_vert_scale = val & 0x7ff;
-                if (val & (1 << 10))
-                    virge->streams.k1_vert_scale |= 0xfffff800;
+                if (val & 0x800)
+                    virge->streams.k1_vert_scale |= ~0x7ff;
                 break;
             case 0x81e4:
                 virge->streams.k2_vert_scale = val & 0x7ff;
-                if (val & (1 << 10))
-                    virge->streams.k2_vert_scale |= 0xfffff800;
+                if (val & 0x800)
+                    virge->streams.k2_vert_scale |= ~0x7ff;
                 break;
             case 0x81e8:
                 virge->streams.dda_vert_accumulator = val & 0xfff;
-                if (val & (1 << 11))
-                    virge->streams.dda_vert_accumulator |= 0xfffff800;
+                if (val & 0x1000)
+                    virge->streams.dda_vert_accumulator |= ~0xfff;
+
+                svga_recalctimings(svga);
+                svga->fullchange = changeframecount;
                 break;
             case 0x81ec:
                 virge->streams.fifo_ctrl = val;
@@ -2056,14 +2079,61 @@ s3_virge_mmio_write_l(uint32_t addr, uint32_t val, void *priv)
                 s3_virge_updatemapping(virge);
                 break;
 
-            default:
+            case 0x8590:
+                virge->cmd_dma_base          = val;
+                virge->cmd_dma_buf_size      = (val & 2) ? 0x10000 : 0x1000;
+                virge->cmd_dma_buf_size_mask = virge->cmd_dma_buf_size - 1;
+                virge->cmd_base_addr         = (val & 2) ? (val & 0xffff0000) : (val & 0xfffff000);
+                break;
+
+            case 0x8594:
+                virge->cmd_dma_write_ptr_update = val & (1 << 16);
+                if (virge->cmd_dma_write_ptr_update) {
+                    virge->cmd_dma_write_ptr_reg = (virge->cmd_dma_buf_size == 0x10000) ? (val & 0xffff) : (val & 0xfff);
+                    virge->dma_dbl_words         = 0;
+                    virge->dma_data_type         = 0;
+                    virge->dma_val               = 0;
+                    if (virge->cmd_dma) {
+                        while (virge->cmd_dma_read_ptr_reg != virge->cmd_dma_write_ptr_reg) {
+                            virge->cmd_dma_write_ptr_update = 0;
+                            dma_bm_read(virge->cmd_base_addr + virge->cmd_dma_read_ptr_reg, (uint8_t *) &virge->dma_val, 4, 4);
+                            if (!virge->dma_dbl_words) {
+                                virge->dma_dbl_words = (virge->dma_val & 0xffff);
+                                virge->dma_data_type = !!(virge->dma_val & (1 << 31));
+                                if (virge->dma_data_type)
+                                    virge->dma_mmio_addr = 0;
+                                else
+                                    virge->dma_mmio_addr = ((virge->dma_val >> 16) << 2) & 0xfffc;
+                            } else {
+                                s3_virge_mmio_write_l(virge->dma_mmio_addr, virge->dma_val, virge);
+                                virge->dma_dbl_words--;
+                                virge->dma_mmio_addr = (virge->dma_mmio_addr + 4) & 0xfffc;
+                            }
+                            virge->cmd_dma_read_ptr_reg = (virge->cmd_dma_read_ptr_reg + 4) & (virge->cmd_dma_buf_size_mask - 3);
+                        }
+                    }
+                }
+                break;
+
+            case 0x8598:
+                virge->cmd_dma_read_ptr_reg = (virge->cmd_dma_buf_size == 0x10000) ? (val & 0xffff) : (val & 0xfff);
+                break;
+
+            case 0x859c:
+                virge->cmd_dma               = val & 1;
+                virge->cmd_dma_write_ptr_reg = 0;
+                virge->cmd_dma_read_ptr_reg  = 0;
+                break;
+
+            case 0xff20:
+                s3_virge_mmio_write(addr, val, priv);
                 break;
         }
     }
 }
 
 #define READ(addr, val)                                                          \
-    {                                                                            \
+    do {                                                                         \
         switch (bpp) {                                                           \
             case 0: /*8 bpp*/                                                    \
                 val = vram[addr & virge->vram_mask];                             \
@@ -2075,74 +2145,896 @@ s3_virge_mmio_write_l(uint32_t addr, uint32_t val, void *priv)
                 val = (*(uint32_t *) &vram[addr & virge->vram_mask]) & 0xffffff; \
                 break;                                                           \
         }                                                                        \
+    } while (0)
+
+#define Z_READ(addr) *(uint16_t *) &vram[addr & virge->vram_mask]
+
+#define Z_WRITE(addr, val)                     \
+    if (!(s3d_tri->cmd_set & CMD_SET_ZB_MODE)) \
+    *(uint16_t *) &vram[addr & virge->vram_mask] = val
+
+#define CLIP(x, y)                                             \
+    do {                                                       \
+        if ((virge->s3d.cmd_set & CMD_SET_HC) &&               \
+            (x < virge->s3d.clip_l || x > virge->s3d.clip_r || \
+             y < virge->s3d.clip_t || y > virge->s3d.clip_b))  \
+             update = 0;                                       \
+    } while (0)
+
+#define CLIP_3D(x, y)                                                  \
+    do {                                                               \
+        if ((s3d_tri->cmd_set & CMD_SET_HC) && (x < s3d_tri->clip_l || \
+            x > s3d_tri->clip_r || y < s3d_tri->clip_t ||              \
+            y > s3d_tri->clip_b))                                      \
+            update = 0;                                                \
+        } while (0)
+
+#define Z_CLIP(Zzb, Zs)                             \
+    do {                                            \
+        if (!(s3d_tri->cmd_set & CMD_SET_ZB_MODE))  \
+            switch ((s3d_tri->cmd_set >> 20) & 7) { \
+                case 0:                             \
+                    update = 0;                     \
+                    break;                          \
+                case 1:                             \
+                    if (Zs <= Zzb)                  \
+                        update = 0;                 \
+                    else                            \
+                        Zzb = Zs;                   \
+                    break;                          \
+                case 2:                             \
+                    if (Zs != Zzb)                  \
+                        update = 0;                 \
+                    else                            \
+                        Zzb = Zs;                   \
+                    break;                          \
+                case 3:                             \
+                    if (Zs < Zzb)                   \
+                        update = 0;                 \
+                    else                            \
+                        Zzb = Zs;                   \
+                    break;                          \
+                case 4:                             \
+                    if (Zs >= Zzb)                  \
+                        update = 0;                 \
+                    else                            \
+                        Zzb = Zs;                   \
+                    break;                          \
+                case 5:                             \
+                    if (Zs == Zzb)                  \
+                        update = 0;                 \
+                    else                            \
+                        Zzb = Zs;                   \
+                    break;                          \
+                case 6:                             \
+                    if (Zs > Zzb)                   \
+                        update = 0;                 \
+                    else                            \
+                        Zzb = Zs;                   \
+                    break;                          \
+                case 7:                             \
+                    update = 1;                     \
+                    Zzb    = Zs;                    \
+                    break;                          \
+            }                                       \
+    } while (0)
+
+#define ROPMIX(R, D, P, S, out)                    \
+    {                                              \
+        switch (R) {                               \
+            case 0x00:                             \
+                out = 0;                           \
+                break;                             \
+            case 0x01:                             \
+                out = ~(D | (P | S));              \
+                break;                             \
+            case 0x02:                             \
+                out = D & ~(P | S);                \
+                break;                             \
+            case 0x03:                             \
+                out = ~(P | S);                    \
+                break;                             \
+            case 0x04:                             \
+                out = S & ~(D | P);                \
+                break;                             \
+            case 0x05:                             \
+                out = ~(D | P);                    \
+                break;                             \
+            case 0x06:                             \
+                out = ~(P | ~(D ^ S));             \
+                break;                             \
+            case 0x07:                             \
+                out = ~(P | (D & S));              \
+                break;                             \
+            case 0x08:                             \
+                out = S & (D & ~P);                \
+                break;                             \
+            case 0x09:                             \
+                out = ~(P | (D ^ S));              \
+                break;                             \
+            case 0x0a:                             \
+                out = D & ~P;                      \
+                break;                             \
+            case 0x0b:                             \
+                out = ~(P | (S & ~D));             \
+                break;                             \
+            case 0x0c:                             \
+                out = S & ~P;                      \
+                break;                             \
+            case 0x0d:                             \
+                out = ~(P | (D & ~S));             \
+                break;                             \
+            case 0x0e:                             \
+                out = ~(P | ~(D | S));             \
+                break;                             \
+            case 0x0f:                             \
+                out = ~P;                          \
+                break;                             \
+            case 0x10:                             \
+                out = P & ~(D | S);                \
+                break;                             \
+            case 0x11:                             \
+                out = ~(D | S);                    \
+                break;                             \
+            case 0x12:                             \
+                out = ~(S | ~(D ^ P));             \
+                break;                             \
+            case 0x13:                             \
+                out = ~(S | (D & P));              \
+                break;                             \
+            case 0x14:                             \
+                out = ~(D | ~(P ^ S));             \
+                break;                             \
+            case 0x15:                             \
+                out = ~(D | (P & S));              \
+                break;                             \
+            case 0x16:                             \
+                out = P ^ (S ^ (D & ~(P & S)));    \
+                break;                             \
+            case 0x17:                             \
+                out = ~(S ^ ((S ^ P) & (D ^ S)));  \
+                break;                             \
+            case 0x18:                             \
+                out = (S ^ P) & (P ^ D);           \
+                break;                             \
+            case 0x19:                             \
+                out = ~(S ^ (D & ~(P & S)));       \
+                break;                             \
+            case 0x1a:                             \
+                out = P ^ (D | (S & P));           \
+                break;                             \
+            case 0x1b:                             \
+                out = ~(S ^ (D & (P ^ S)));        \
+                break;                             \
+            case 0x1c:                             \
+                out = P ^ (S | (D & P));           \
+                break;                             \
+            case 0x1d:                             \
+                out = ~(D ^ (S & (P ^ D)));        \
+                break;                             \
+            case 0x1e:                             \
+                out = P ^ (D | S);                 \
+                break;                             \
+            case 0x1f:                             \
+                out = ~(P & (D | S));              \
+                break;                             \
+            case 0x20:                             \
+                out = D & (P & ~S);                \
+                break;                             \
+            case 0x21:                             \
+                out = ~(S | (D ^ P));              \
+                break;                             \
+            case 0x22:                             \
+                out = D & ~S;                      \
+                break;                             \
+            case 0x23:                             \
+                out = ~(S | (P & ~D));             \
+                break;                             \
+            case 0x24:                             \
+                out = (S ^ P) & (D ^ S);           \
+                break;                             \
+            case 0x25:                             \
+                out = ~(P ^ (D & ~(S & P)));       \
+                break;                             \
+            case 0x26:                             \
+                out = S ^ (D | (P & S));           \
+                break;                             \
+            case 0x27:                             \
+                out = S ^ (D | ~(P ^ S));          \
+                break;                             \
+            case 0x28:                             \
+                out = D & (P ^ S);                 \
+                break;                             \
+            case 0x29:                             \
+                out = ~(P ^ (S ^ (D | (P & S))));  \
+                break;                             \
+            case 0x2a:                             \
+                out = D & ~(P & S);                \
+                break;                             \
+            case 0x2b:                             \
+                out = ~(S ^ ((S ^ P) & (P ^ D)));  \
+                break;                             \
+            case 0x2c:                             \
+                out = S ^ (P & (D | S));           \
+                break;                             \
+            case 0x2d:                             \
+                out = P ^ (S | ~D);                \
+                break;                             \
+            case 0x2e:                             \
+                out = P ^ (S | (D ^ P));           \
+                break;                             \
+            case 0x2f:                             \
+                out = ~(P & (S | ~D));             \
+                break;                             \
+            case 0x30:                             \
+                out = P & ~S;                      \
+                break;                             \
+            case 0x31:                             \
+                out = ~(S | (D & ~P));             \
+                break;                             \
+            case 0x32:                             \
+                out = S ^ (D | (P | S));           \
+                break;                             \
+            case 0x33:                             \
+                out = ~S;                          \
+                break;                             \
+            case 0x34:                             \
+                out = S ^ (P | (D & S));           \
+                break;                             \
+            case 0x35:                             \
+                out = S ^ (P | ~(D ^ S));          \
+                break;                             \
+            case 0x36:                             \
+                out = S ^ (D | P);                 \
+                break;                             \
+            case 0x37:                             \
+                out = ~(S & (D | P));              \
+                break;                             \
+            case 0x38:                             \
+                out = P ^ (S & (D | P));           \
+                break;                             \
+            case 0x39:                             \
+                out = S ^ (P | ~D);                \
+                break;                             \
+            case 0x3a:                             \
+                out = S ^ (P | (D ^ S));           \
+                break;                             \
+            case 0x3b:                             \
+                out = ~(S & (P | ~D));             \
+                break;                             \
+            case 0x3c:                             \
+                out = P ^ S;                       \
+                break;                             \
+            case 0x3d:                             \
+                out = S ^ (P | ~(D | S));          \
+                break;                             \
+            case 0x3e:                             \
+                out = S ^ (P | (D & ~S));          \
+                break;                             \
+            case 0x3f:                             \
+                out = ~(P & S);                    \
+                break;                             \
+            case 0x40:                             \
+                out = P & (S & ~D);                \
+                break;                             \
+            case 0x41:                             \
+                out = ~(D | (P ^ S));              \
+                break;                             \
+            case 0x42:                             \
+                out = (S ^ D) & (P ^ D);           \
+                break;                             \
+            case 0x43:                             \
+                out = ~(S ^ (P & ~(D & S)));       \
+                break;                             \
+            case 0x44:                             \
+                out = S & ~D;                      \
+                break;                             \
+            case 0x45:                             \
+                out = ~(D | (P & ~S));             \
+                break;                             \
+            case 0x46:                             \
+                out = D ^ (S | (P & D));           \
+                break;                             \
+            case 0x47:                             \
+                out = ~(P ^ (S & (D ^ P)));        \
+                break;                             \
+            case 0x48:                             \
+                out = S & (D ^ P);                 \
+                break;                             \
+            case 0x49:                             \
+                out = ~(P ^ (D ^ (S | (P & D))));  \
+                break;                             \
+            case 0x4a:                             \
+                out = D ^ (P & (S | D));           \
+                break;                             \
+            case 0x4b:                             \
+                out = P ^ (D | ~S);                \
+                break;                             \
+            case 0x4c:                             \
+                out = S & ~(D & P);                \
+                break;                             \
+            case 0x4d:                             \
+                out = ~(S ^ ((S ^ P) | (D ^ S)));  \
+                break;                             \
+            case 0x4e:                             \
+                out = P ^ (D | (S ^ P));           \
+                break;                             \
+            case 0x4f:                             \
+                out = ~(P & (D | ~S));             \
+                break;                             \
+            case 0x50:                             \
+                out = P & ~D;                      \
+                break;                             \
+            case 0x51:                             \
+                out = ~(D | (S & ~P));             \
+                break;                             \
+            case 0x52:                             \
+                out = D ^ (P | (S & D));           \
+                break;                             \
+            case 0x53:                             \
+                out = ~(S ^ (P & (D ^ S)));        \
+                break;                             \
+            case 0x54:                             \
+                out = ~(D | ~(P | S));             \
+                break;                             \
+            case 0x55:                             \
+                out = ~D;                          \
+                break;                             \
+            case 0x56:                             \
+                out = D ^ (P | S);                 \
+                break;                             \
+            case 0x57:                             \
+                out = ~(D & (P | S));              \
+                break;                             \
+            case 0x58:                             \
+                out = P ^ (D & (S | P));           \
+                break;                             \
+            case 0x59:                             \
+                out = D ^ (P | ~S);                \
+                break;                             \
+            case 0x5a:                             \
+                out = D ^ P;                       \
+                break;                             \
+            case 0x5b:                             \
+                out = D ^ (P | ~(S | D));          \
+                break;                             \
+            case 0x5c:                             \
+                out = D ^ (P | (S ^ D));           \
+                break;                             \
+            case 0x5d:                             \
+                out = ~(D & (P | ~S));             \
+                break;                             \
+            case 0x5e:                             \
+                out = D ^ (P | (S & ~D));          \
+                break;                             \
+            case 0x5f:                             \
+                out = ~(D & P);                    \
+                break;                             \
+            case 0x60:                             \
+                out = P & (D ^ S);                 \
+                break;                             \
+            case 0x61:                             \
+                out = ~(D ^ (S ^ (P | (D & S))));  \
+                break;                             \
+            case 0x62:                             \
+                out = D ^ (S & (P | D));           \
+                break;                             \
+            case 0x63:                             \
+                out = S ^ (D | ~P);                \
+                break;                             \
+            case 0x64:                             \
+                out = S ^ (D & (P | S));           \
+                break;                             \
+            case 0x65:                             \
+                out = D ^ (S | ~P);                \
+                break;                             \
+            case 0x66:                             \
+                out = D ^ S;                       \
+                break;                             \
+            case 0x67:                             \
+                out = S ^ (D | ~(P | S));          \
+                break;                             \
+            case 0x68:                             \
+                out = ~(D ^ (S ^ (P | ~(D | S)))); \
+                break;                             \
+            case 0x69:                             \
+                out = ~(P ^ (D ^ S));              \
+                break;                             \
+            case 0x6a:                             \
+                out = D ^ (P & S);                 \
+                break;                             \
+            case 0x6b:                             \
+                out = ~(P ^ (S ^ (D & (P | S))));  \
+                break;                             \
+            case 0x6c:                             \
+                out = S ^ (D & P);                 \
+                break;                             \
+            case 0x6d:                             \
+                out = ~(P ^ (D ^ (S & (P | D))));  \
+                break;                             \
+            case 0x6e:                             \
+                out = S ^ (D & (P | ~S));          \
+                break;                             \
+            case 0x6f:                             \
+                out = ~(P & ~(D ^ S));             \
+                break;                             \
+            case 0x70:                             \
+                out = P & ~(D & S);                \
+                break;                             \
+            case 0x71:                             \
+                out = ~(S ^ ((S ^ D) & (P ^ D)));  \
+                break;                             \
+            case 0x72:                             \
+                out = S ^ (D | (P ^ S));           \
+                break;                             \
+            case 0x73:                             \
+                out = ~(S & (D | ~P));             \
+                break;                             \
+            case 0x74:                             \
+                out = D ^ (S | (P ^ D));           \
+                break;                             \
+            case 0x75:                             \
+                out = ~(D & (S | ~P));             \
+                break;                             \
+            case 0x76:                             \
+                out = S ^ (D | (P & ~S));          \
+                break;                             \
+            case 0x77:                             \
+                out = ~(D & S);                    \
+                break;                             \
+            case 0x78:                             \
+                out = P ^ (D & S);                 \
+                break;                             \
+            case 0x79:                             \
+                out = ~(D ^ (S ^ (P & (D | S))));  \
+                break;                             \
+            case 0x7a:                             \
+                out = D ^ (P & (S | ~D));          \
+                break;                             \
+            case 0x7b:                             \
+                out = ~(S & ~(D ^ P));             \
+                break;                             \
+            case 0x7c:                             \
+                out = S ^ (P & (D | ~S));          \
+                break;                             \
+            case 0x7d:                             \
+                out = ~(D & ~(P ^ S));             \
+                break;                             \
+            case 0x7e:                             \
+                out = (S ^ P) | (D ^ S);           \
+                break;                             \
+            case 0x7f:                             \
+                out = ~(D & (P & S));              \
+                break;                             \
+            case 0x80:                             \
+                out = D & (P & S);                 \
+                break;                             \
+            case 0x81:                             \
+                out = ~((S ^ P) | (D ^ S));        \
+                break;                             \
+            case 0x82:                             \
+                out = D & ~(P ^ S);                \
+                break;                             \
+            case 0x83:                             \
+                out = ~(S ^ (P & (D | ~S)));       \
+                break;                             \
+            case 0x84:                             \
+                out = S & ~(D ^ P);                \
+                break;                             \
+            case 0x85:                             \
+                out = ~(P ^ (D & (S | ~P)));       \
+                break;                             \
+            case 0x86:                             \
+                out = D ^ (S ^ (P & (D | S)));     \
+                break;                             \
+            case 0x87:                             \
+                out = ~(P ^ (D & S));              \
+                break;                             \
+            case 0x88:                             \
+                out = D & S;                       \
+                break;                             \
+            case 0x89:                             \
+                out = ~(S ^ (D | (P & ~S)));       \
+                break;                             \
+            case 0x8a:                             \
+                out = D & (S | ~P);                \
+                break;                             \
+            case 0x8b:                             \
+                out = ~(D ^ (S | (P ^ D)));        \
+                break;                             \
+            case 0x8c:                             \
+                out = S & (D | ~P);                \
+                break;                             \
+            case 0x8d:                             \
+                out = ~(S ^ (D | (P ^ S)));        \
+                break;                             \
+            case 0x8e:                             \
+                out = S ^ ((S ^ D) & (P ^ D));     \
+                break;                             \
+            case 0x8f:                             \
+                out = ~(P & ~(D & S));             \
+                break;                             \
+            case 0x90:                             \
+                out = P & ~(D ^ S);                \
+                break;                             \
+            case 0x91:                             \
+                out = ~(S ^ (D & (P | ~S)));       \
+                break;                             \
+            case 0x92:                             \
+                out = D ^ (P ^ (S & (D | P)));     \
+                break;                             \
+            case 0x93:                             \
+                out = ~(S ^ (P & D));              \
+                break;                             \
+            case 0x94:                             \
+                out = P ^ (S ^ (D & (P | S)));     \
+                break;                             \
+            case 0x95:                             \
+                out = ~(D ^ (P & S));              \
+                break;                             \
+            case 0x96:                             \
+                out = D ^ (P ^ S);                 \
+                break;                             \
+            case 0x97:                             \
+                out = P ^ (S ^ (D | ~(P | S)));    \
+                break;                             \
+            case 0x98:                             \
+                out = ~(S ^ (D | ~(P | S)));       \
+                break;                             \
+            case 0x99:                             \
+                out = ~(D ^ S);                    \
+                break;                             \
+            case 0x9a:                             \
+                out = D ^ (P & ~S);                \
+                break;                             \
+            case 0x9b:                             \
+                out = ~(S ^ (D & (P | S)));        \
+                break;                             \
+            case 0x9c:                             \
+                out = S ^ (P & ~D);                \
+                break;                             \
+            case 0x9d:                             \
+                out = ~(D ^ (S & (P | D)));        \
+                break;                             \
+            case 0x9e:                             \
+                out = D ^ (S ^ (P | (D & S)));     \
+                break;                             \
+            case 0x9f:                             \
+                out = ~(P & (D ^ S));              \
+                break;                             \
+            case 0xa0:                             \
+                out = D & P;                       \
+                break;                             \
+            case 0xa1:                             \
+                out = ~(P ^ (D | (S & ~P)));       \
+                break;                             \
+            case 0xa2:                             \
+                out = D & (P | ~S);                \
+                break;                             \
+            case 0xa3:                             \
+                out = ~(D ^ (P | (S ^ D)));        \
+                break;                             \
+            case 0xa4:                             \
+                out = ~(P ^ (D | ~(S | P)));       \
+                break;                             \
+            case 0xa5:                             \
+                out = ~(P ^ D);                    \
+                break;                             \
+            case 0xa6:                             \
+                out = D ^ (S & ~P);                \
+                break;                             \
+            case 0xa7:                             \
+                out = ~(P ^ (D & (S | P)));        \
+                break;                             \
+            case 0xa8:                             \
+                out = D & (P | S);                 \
+                break;                             \
+            case 0xa9:                             \
+                out = ~(D ^ (P | S));              \
+                break;                             \
+            case 0xaa:                             \
+                out = D;                           \
+                break;                             \
+            case 0xab:                             \
+                out = D | ~(P | S);                \
+                break;                             \
+            case 0xac:                             \
+                out = S ^ (P & (D ^ S));           \
+                break;                             \
+            case 0xad:                             \
+                out = ~(D ^ (P | (S & D)));        \
+                break;                             \
+            case 0xae:                             \
+                out = D | (S & ~P);                \
+                break;                             \
+            case 0xaf:                             \
+                out = D | ~P;                      \
+                break;                             \
+            case 0xb0:                             \
+                out = P & (D | ~S);                \
+                break;                             \
+            case 0xb1:                             \
+                out = ~(P ^ (D | (S ^ P)));        \
+                break;                             \
+            case 0xb2:                             \
+                out = S ^ ((S ^ P) | (D ^ S));     \
+                break;                             \
+            case 0xb3:                             \
+                out = ~(S & ~(D & P));             \
+                break;                             \
+            case 0xb4:                             \
+                out = P ^ (S & ~D);                \
+                break;                             \
+            case 0xb5:                             \
+                out = ~(D ^ (P & (S | D)));        \
+                break;                             \
+            case 0xb6:                             \
+                out = D ^ (P ^ (S | (D & P)));     \
+                break;                             \
+            case 0xb7:                             \
+                out = ~(S & (D ^ P));              \
+                break;                             \
+            case 0xb8:                             \
+                out = P ^ (S & (D ^ P));           \
+                break;                             \
+            case 0xb9:                             \
+                out = ~(D ^ (S | (P & D)));        \
+                break;                             \
+            case 0xba:                             \
+                out = D | (P & ~S);                \
+                break;                             \
+            case 0xbb:                             \
+                out = D | ~S;                      \
+                break;                             \
+            case 0xbc:                             \
+                out = S ^ (P & ~(D & S));          \
+                break;                             \
+            case 0xbd:                             \
+                out = ~((S ^ D) & (P ^ D));        \
+                break;                             \
+            case 0xbe:                             \
+                out = D | (P ^ S);                 \
+                break;                             \
+            case 0xbf:                             \
+                out = D | ~(P & S);                \
+                break;                             \
+            case 0xc0:                             \
+                out = P & S;                       \
+                break;                             \
+            case 0xc1:                             \
+                out = ~(S ^ (P | (D & ~S)));       \
+                break;                             \
+            case 0xc2:                             \
+                out = ~(S ^ (P | ~(D | S)));       \
+                break;                             \
+            case 0xc3:                             \
+                out = ~(P ^ S);                    \
+                break;                             \
+            case 0xc4:                             \
+                out = S & (P | ~D);                \
+                break;                             \
+            case 0xc5:                             \
+                out = ~(S ^ (P | (D ^ S)));        \
+                break;                             \
+            case 0xc6:                             \
+                out = S ^ (D & ~P);                \
+                break;                             \
+            case 0xc7:                             \
+                out = ~(P ^ (S & (D | P)));        \
+                break;                             \
+            case 0xc8:                             \
+                out = S & (D | P);                 \
+                break;                             \
+            case 0xc9:                             \
+                out = ~(S ^ (P | D));              \
+                break;                             \
+            case 0xca:                             \
+                out = D ^ (P & (S ^ D));           \
+                break;                             \
+            case 0xcb:                             \
+                out = ~(S ^ (P | (D & S)));        \
+                break;                             \
+            case 0xcc:                             \
+                out = S;                           \
+                break;                             \
+            case 0xcd:                             \
+                out = S | ~(D | P);                \
+                break;                             \
+            case 0xce:                             \
+                out = S | (D & ~P);                \
+                break;                             \
+            case 0xcf:                             \
+                out = S | ~P;                      \
+                break;                             \
+            case 0xd0:                             \
+                out = P & (S | ~D);                \
+                break;                             \
+            case 0xd1:                             \
+                out = ~(P ^ (S | (D ^ P)));        \
+                break;                             \
+            case 0xd2:                             \
+                out = P ^ (D & ~S);                \
+                break;                             \
+            case 0xd3:                             \
+                out = ~(S ^ (P & (D | S)));        \
+                break;                             \
+            case 0xd4:                             \
+                out = S ^ ((S ^ P) & (P ^ D));     \
+                break;                             \
+            case 0xd5:                             \
+                out = ~(D & ~(P & S));             \
+                break;                             \
+            case 0xd6:                             \
+                out = P ^ (S ^ (D | (P & S)));     \
+                break;                             \
+            case 0xd7:                             \
+                out = ~(D & (P ^ S));              \
+                break;                             \
+            case 0xd8:                             \
+                out = P ^ (D & (S ^ P));           \
+                break;                             \
+            case 0xd9:                             \
+                out = ~(S ^ (D | (P & S)));        \
+                break;                             \
+            case 0xda:                             \
+                out = D ^ (P & ~(S & D));          \
+                break;                             \
+            case 0xdb:                             \
+                out = ~((S ^ P) & (D ^ S));        \
+                break;                             \
+            case 0xdc:                             \
+                out = S | (P & ~D);                \
+                break;                             \
+            case 0xdd:                             \
+                out = S | ~D;                      \
+                break;                             \
+            case 0xde:                             \
+                out = S | (D ^ P);                 \
+                break;                             \
+            case 0xdf:                             \
+                out = S | ~(D & P);                \
+                break;                             \
+            case 0xe0:                             \
+                out = P & (D | S);                 \
+                break;                             \
+            case 0xe1:                             \
+                out = ~(P ^ (D | S));              \
+                break;                             \
+            case 0xe2:                             \
+                out = D ^ (S & (P ^ D));           \
+                break;                             \
+            case 0xe3:                             \
+                out = ~(P ^ (S | (D & P)));        \
+                break;                             \
+            case 0xe4:                             \
+                out = S ^ (D & (P ^ S));           \
+                break;                             \
+            case 0xe5:                             \
+                out = ~(P ^ (D | (S & P)));        \
+                break;                             \
+            case 0xe6:                             \
+                out = S ^ (D & ~(P & S));          \
+                break;                             \
+            case 0xe7:                             \
+                out = ~((S ^ P) & (P ^ D));        \
+                break;                             \
+            case 0xe8:                             \
+                out = S ^ ((S ^ P) & (D ^ S));     \
+                break;                             \
+            case 0xe9:                             \
+                out = ~(D ^ (S ^ (P & ~(D & S)))); \
+                break;                             \
+            case 0xea:                             \
+                out = D | (P & S);                 \
+                break;                             \
+            case 0xeb:                             \
+                out = D | ~(P ^ S);                \
+                break;                             \
+            case 0xec:                             \
+                out = S | (D & P);                 \
+                break;                             \
+            case 0xed:                             \
+                out = S | ~(D ^ P);                \
+                break;                             \
+            case 0xee:                             \
+                out = D | S;                       \
+                break;                             \
+            case 0xef:                             \
+                out = S | (D | ~P);                \
+                break;                             \
+            case 0xf0:                             \
+                out = P;                           \
+                break;                             \
+            case 0xf1:                             \
+                out = P | ~(D | S);                \
+                break;                             \
+            case 0xf2:                             \
+                out = P | (D & ~S);                \
+                break;                             \
+            case 0xf3:                             \
+                out = P | ~S;                      \
+                break;                             \
+            case 0xf4:                             \
+                out = P | (S & ~D);                \
+                break;                             \
+            case 0xf5:                             \
+                out = P | ~D;                      \
+                break;                             \
+            case 0xf6:                             \
+                out = P | (D ^ S);                 \
+                break;                             \
+            case 0xf7:                             \
+                out = P | ~(D & S);                \
+                break;                             \
+            case 0xf8:                             \
+                out = P | (D & S);                 \
+                break;                             \
+            case 0xf9:                             \
+                out = P | ~(D ^ S);                \
+                break;                             \
+            case 0xfa:                             \
+                out = D | P;                       \
+                break;                             \
+            case 0xfb:                             \
+                out = D | (P | ~S);                \
+                break;                             \
+            case 0xfc:                             \
+                out = P | S;                       \
+                break;                             \
+            case 0xfd:                             \
+                out = P | (S | ~D);                \
+                break;                             \
+            case 0xfe:                             \
+                out = D | (P | S);                 \
+                break;                             \
+            case 0xff:                             \
+                out = ~0;                          \
+                break;                             \
+        }                                          \
     }
 
-#define CLIP(x, y)                                                                                                                                   \
-    {                                                                                                                                                \
-        if ((virge->s3d.cmd_set & CMD_SET_HC) && (x < virge->s3d.clip_l || x > virge->s3d.clip_r || y < virge->s3d.clip_t || y > virge->s3d.clip_b)) \
-            update = 0;                                                                                                                              \
-    }
+#define MIX()                                                      \
+    do {                                                           \
+        ROPMIX(virge->s3d.rop & 0xFF, dest, pattern, source, out); \
+        out &= 0xFFFFFF;                                           \
+    } while (0)
 
-#define CLIP_3D(x, y)                                                                                                                      \
-    {                                                                                                                                      \
-        if ((s3d_tri->cmd_set & CMD_SET_HC) && (x < s3d_tri->clip_l || x > s3d_tri->clip_r || y < s3d_tri->clip_t || y > s3d_tri->clip_b)) \
-            update = 0;                                                                                                                    \
-    }
-
-#define MIX()                                  \
-    {                                          \
-        int c;                                 \
-        for (c = 0; c < 24; c++) {             \
-            int d = (dest & (1 << c)) ? 1 : 0; \
-            if (source & (1 << c))             \
-                d |= 2;                        \
-            if (pattern & (1 << c))            \
-                d |= 4;                        \
-            if (virge->s3d.rop & (1 << d))     \
-                out |= (1 << c);               \
-        }                                      \
-    }
-
-#define WRITE(addr, val)                                                                                                             \
-    {                                                                                                                                \
-        switch (bpp) {                                                                                                               \
-            case 0: /*8 bpp*/                                                                                                        \
-                vram[addr & virge->vram_mask]                      = val;                                                            \
-                svga->changedvram[(addr & virge->vram_mask) >> 12] = changeframecount;                                               \
-                break;                                                                                                               \
-            case 1: /*16 bpp*/                                                                                                       \
-                *(uint16_t *) &vram[addr & virge->vram_mask]       = val;                                                            \
-                svga->changedvram[(addr & virge->vram_mask) >> 12] = changeframecount;                                               \
-                break;                                                                                                               \
-            case 2: /*24 bpp*/                                                                                                       \
-                *(uint32_t *) &vram[addr & virge->vram_mask]       = (val & 0xffffff) | (vram[(addr + 3) & virge->vram_mask] << 24); \
-                svga->changedvram[(addr & virge->vram_mask) >> 12] = changeframecount;                                               \
-                break;                                                                                                               \
-        }                                                                                                                            \
-    }
+#define WRITE(addr, val)                                                         \
+    do {                                                                         \
+        switch (bpp) {                                                           \
+            case 0: /*8 bpp*/                                                    \
+                vram[addr & virge->vram_mask] = val;                             \
+                virge->svga.changedvram[(addr & virge->vram_mask) >> 12] =       \
+                    changeframecount;                                            \
+                break;                                                           \
+            case 1: /*16 bpp*/                                                   \
+                 *(uint16_t *)&vram[addr & virge->vram_mask] = val;              \
+                virge->svga.changedvram[(addr & virge->vram_mask) >> 12] =       \
+                    changeframecount;                                            \
+                break;                                                           \
+            case 2: /*24 bpp*/                                                   \
+                *(uint32_t *)&vram[addr & virge->vram_mask] = (val & 0xffffff) | \
+                    (vram[(addr + 3) & virge->vram_mask] << 24);                 \
+                virge->svga.changedvram[(addr & virge->vram_mask) >> 12] =       \
+                    changeframecount;                                            \
+                break;                                                           \
+        }                                                                        \
+    } while (0)
 
 static void
 s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
 {
-    svga_t         *svga = &virge->svga;
-    uint8_t        *vram = virge->svga.vram;
-    uint32_t        mono_pattern[64];
-    int             count_mask;
-    int             x_inc = (virge->s3d.cmd_set & CMD_SET_XP) ? 1 : -1;
-    int             y_inc = (virge->s3d.cmd_set & CMD_SET_YP) ? 1 : -1;
-    int             bpp;
-    int             x_mul;
-    int             cpu_dat_shift;
-    const uint32_t *pattern_data;
-    uint32_t        src_fg_clr;
-    uint32_t        src_bg_clr;
-    uint32_t        src_addr;
-    uint32_t        dest_addr;
-    uint32_t        source = 0;
-    uint32_t        dest = 0;
-    uint32_t        pattern;
-    uint32_t        out = 0;
-    int             update;
+    uint8_t  *vram = virge->svga.vram;
+    uint32_t  mono_pattern[64];
+    int       count_mask;
+    int       x_inc = (virge->s3d.cmd_set & CMD_SET_XP) ? 1 : -1;
+    int       y_inc = (virge->s3d.cmd_set & CMD_SET_YP) ? 1 : -1;
+    int       bpp;
+    int       x_mul;
+    int       cpu_dat_shift;
+    uint32_t *pattern_data;
+    uint32_t  src_fg_clr;
+    uint32_t  src_bg_clr;
 
     switch (virge->s3d.cmd_set & CMD_SET_FORMAT_MASK) {
         case CMD_SET_FORMAT_8:
@@ -2187,8 +3079,10 @@ s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
             break;
     }
     if (virge->s3d.cmd_set & CMD_SET_MP) {
-        for (uint8_t y = 0; y < 4; y++) {
-            for (uint8_t x = 0; x < 8; x++) {
+        int x;
+        int y;
+        for (y = 0; y < 4; y++) {
+            for (x = 0; x < 8; x++) {
                 if (virge->s3d.mono_pat_0 & (1 << (x + y * 8)))
                     mono_pattern[y * 8 + (7 - x)] = virge->s3d.pat_fg_clr;
                 else
@@ -2201,6 +3095,9 @@ s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
         }
     }
     switch (virge->s3d.cmd_set & CMD_SET_COMMAND_MASK) {
+        case CMD_SET_COMMAND_NOP:
+            break;
+
         case CMD_SET_COMMAND_BITBLT:
             if (count == -1) {
                 virge->s3d.src_x           = virge->s3d.rsrc_x;
@@ -2212,27 +3109,21 @@ s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
                 virge->s3d.rop             = (virge->s3d.cmd_set >> 17) & 0xff;
                 virge->s3d.data_left_count = 0;
 
-                s3_virge_log("BitBlt start src_x=%i,src_y=%i,dest_x=%i,dest_y=%i,w=%i,h=%i,rop=%02X,src_base=%x,dest_base=%x\n",
-                             virge->s3d.src_x,
-                             virge->s3d.src_y,
-                             virge->s3d.dest_x,
-                             virge->s3d.dest_y,
-                             virge->s3d.w,
-                             virge->s3d.h,
-                             virge->s3d.rop,
-                             virge->s3d.src_base,
-                             virge->s3d.dest_base);
-
                 if (virge->s3d.cmd_set & CMD_SET_IDS)
                     return;
             }
             if (!virge->s3d.h)
                 return;
             while (count) {
-                src_addr  = virge->s3d.src_base + (virge->s3d.src_x * x_mul) + (virge->s3d.src_y * virge->s3d.src_str);
-                dest_addr = virge->s3d.dest_base + (virge->s3d.dest_x * x_mul) + (virge->s3d.dest_y * virge->s3d.dest_str);
-                out       = 0;
-                update    = 1;
+                uint32_t src_addr  = virge->s3d.src_base + (virge->s3d.src_x * x_mul) +
+                                     (virge->s3d.src_y * virge->s3d.src_str);
+                uint32_t dest_addr = virge->s3d.dest_base + (virge->s3d.dest_x * x_mul) +
+                                     (virge->s3d.dest_y * virge->s3d.dest_str);
+                uint32_t source    = 0;
+                uint32_t dest      = 0;
+                uint32_t pattern;
+                uint32_t out    = 0;
+                int      update = 1;
 
                 switch (virge->s3d.cmd_set & (CMD_SET_MS | CMD_SET_IDS)) {
                     case 0:
@@ -2274,9 +3165,6 @@ s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
                         cpu_dat <<= 1;
                         count--;
                         break;
-
-                    default:
-                        break;
                 }
 
                 CLIP(virge->s3d.dest_x, virge->s3d.dest_y);
@@ -2313,13 +3201,9 @@ s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
                             cpu_dat <<= (count - (count & count_mask));
                             count &= count_mask;
                             break;
-
-                        default:
-                            break;
                     }
-                    if (!virge->s3d.h) {
+                    if (!virge->s3d.h)
                         return;
-                    }
                 } else
                     virge->s3d.w--;
             }
@@ -2335,20 +3219,15 @@ s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
                 virge->s3d.w      = virge->s3d.r_width;
                 virge->s3d.h      = virge->s3d.r_height;
                 virge->s3d.rop    = (virge->s3d.cmd_set >> 17) & 0xff;
-
-                s3_virge_log("RctFll start %i,%i %i,%i %02X %08x\n", virge->s3d.dest_x,
-                             virge->s3d.dest_y,
-                             virge->s3d.w,
-                             virge->s3d.h,
-                             virge->s3d.rop, virge->s3d.dest_base);
             }
 
             while (count && virge->s3d.h) {
-                source    = virge->s3d.pat_fg_clr;
-                dest_addr = virge->s3d.dest_base + (virge->s3d.dest_x * x_mul) + (virge->s3d.dest_y * virge->s3d.dest_str);
-                pattern   = virge->s3d.pat_fg_clr;
-                out       = 0;
-                update    = 1;
+                uint32_t dest_addr = virge->s3d.dest_base + (virge->s3d.dest_x * x_mul) + (virge->s3d.dest_y * virge->s3d.dest_str);
+                uint32_t source    = 0;
+                uint32_t dest      = 0;
+                uint32_t pattern   = virge->s3d.pat_fg_clr;
+                uint32_t out       = 0;
+                int      update    = 1;
 
                 CLIP(virge->s3d.dest_x, virge->s3d.dest_y);
 
@@ -2372,9 +3251,8 @@ s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
                     virge->s3d.src_y += y_inc;
                     virge->s3d.dest_y += y_inc;
                     virge->s3d.h--;
-                    if (!virge->s3d.h) {
+                    if (!virge->s3d.h)
                         return;
-                    }
                 } else
                     virge->s3d.w--;
                 count--;
@@ -2395,7 +3273,8 @@ s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
 
                 x = virge->s3d.dest_x >> 20;
 
-                if (virge->s3d.h == virge->s3d.lycnt && ((virge->s3d.line_dir && x > virge->s3d.lxend0) || (!virge->s3d.line_dir && x < virge->s3d.lxend0)))
+                if (virge->s3d.h == virge->s3d.lycnt && ((virge->s3d.line_dir && x > virge->s3d.lxend0) ||
+                    (!virge->s3d.line_dir && x < virge->s3d.lxend0)))
                     x = virge->s3d.lxend0;
 
                 if (virge->s3d.h == 1)
@@ -2407,17 +3286,22 @@ s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
                     goto skip_line;
 
                 do {
-                    uint32_t dest_addr = virge->s3d.dest_base + (x * x_mul) + (virge->s3d.dest_y * virge->s3d.dest_str);
-                    uint32_t source = 0;
-                    uint32_t dest = 0;
+                    uint32_t dest_addr = virge->s3d.dest_base + (x * x_mul) +
+                             (virge->s3d.dest_y * virge->s3d.dest_str);
+                    uint32_t source    = 0;
+                    uint32_t dest      = 0;
                     uint32_t pattern;
                     uint32_t out    = 0;
                     int      update = 1;
 
-                    if ((virge->s3d.h == virge->s3d.lycnt || !first_pixel) && ((virge->s3d.line_dir && x < virge->s3d.lxend0) || (!virge->s3d.line_dir && x > virge->s3d.lxend0)))
+                    if ((virge->s3d.h == virge->s3d.lycnt || !first_pixel) &&
+                        ((virge->s3d.line_dir && x < virge->s3d.lxend0) ||
+                        (!virge->s3d.line_dir && x > virge->s3d.lxend0)))
                         update = 0;
 
-                    if ((virge->s3d.h == 1 || !first_pixel) && ((virge->s3d.line_dir && x > virge->s3d.lxend1) || (!virge->s3d.line_dir && x < virge->s3d.lxend1)))
+                    if ((virge->s3d.h == 1 || !first_pixel) &&
+                        ((virge->s3d.line_dir && x > virge->s3d.lxend1) ||
+                        (!virge->s3d.line_dir && x < virge->s3d.lxend1)))
                         update = 0;
 
                     CLIP(x, virge->s3d.dest_y);
@@ -2460,8 +3344,8 @@ skip_line:
                 int xdir = (x < xend) ? 1 : -1;
                 do {
                     uint32_t dest_addr = virge->s3d.dest_base + (x * x_mul) + (y * virge->s3d.dest_str);
-                    uint32_t source = 0;
-                    uint32_t dest = 0;
+                    uint32_t source    = 0;
+                    uint32_t dest      = 0;
                     uint32_t pattern;
                     uint32_t out    = 0;
                     int      update = 1;
@@ -2471,6 +3355,7 @@ skip_line:
                     if (update) {
                         READ(dest_addr, dest);
                         pattern = pattern_data[(y & 7) * 8 + (x & 7)];
+
                         MIX();
 
                         WRITE(dest_addr, out);
@@ -2486,48 +3371,68 @@ skip_line:
             }
             break;
 
-        case CMD_SET_COMMAND_NOP:
-            break;
-
         default:
-            break;
+            fatal("s3_virge_bitblt : blit command %i %08x\n",
+                  (virge->s3d.cmd_set >> 27) & 0xf, virge->s3d.cmd_set);
     }
 }
 
-#define RGB15_TO_24(val, r, g, b)                      \
-    b = ((val & 0x001f) << 3) | ((val & 0x001f) >> 2); \
-    g = ((val & 0x03e0) >> 2) | ((val & 0x03e0) >> 7); \
-    r = ((val & 0x7c00) >> 7) | ((val & 0x7c00) >> 12);
+#define RGB15_TO_24(val, r, g, b)                           \
+        b = ((val & 0x001f) << 3) | ((val & 0x001f) >> 2);  \
+        g = ((val & 0x03e0) >> 2) | ((val & 0x03e0) >> 7);  \
+        r = ((val & 0x7c00) >> 7) | ((val & 0x7c00) >> 12);
 
-#define RGB24_TO_24(val, r, g, b) \
-    b = val & 0xff;               \
-    g = (val & 0xff00) >> 8;      \
-    r = (val & 0xff0000) >> 16
+#define RGB24_TO_24(val, r, g, b)  \
+        b = val & 0xff;            \
+        g = (val & 0xff00) >> 8;   \
+        r = (val & 0xff0000) >> 16
 
-#define RGB15(r, g, b, dest)                                                                   \
-    if (virge->dithering_enabled) {                                                            \
-        int add = dither[_y & 3][_x & 3];                                                      \
-        int _r  = (r > 248) ? 248 : r + add;                                                   \
-        int _g  = (g > 248) ? 248 : g + add;                                                   \
-        int _b  = (b > 248) ? 248 : b + add;                                                   \
-        dest    = ((_b >> 3) & 0x1f) | (((_g >> 3) & 0x1f) << 5) | (((_r >> 3) & 0x1f) << 10); \
-    } else                                                                                     \
-        dest = ((b >> 3) & 0x1f) | (((g >> 3) & 0x1f) << 5) | (((r >> 3) & 0x1f) << 10)
+#define RGB15(r, g, b, dest)                        \
+        if (virge->dithering_enabled) {             \
+                int add = dither[_y & 3][_x & 3];   \
+                int _r = (r > 248) ? 248 : r + add; \
+                int _g = (g > 248) ? 248 : g + add; \
+                int _b = (b > 248) ? 248 : b + add; \
+                dest = ((_b >> 3) & 0x1f) |         \
+                       (((_g >> 3) & 0x1f) << 5) |  \
+                       (((_r >> 3) & 0x1f) << 10);  \
+        } else                                      \
+                dest = ((b >> 3) & 0x1f) |          \
+                       (((g >> 3) & 0x1f) << 5) |   \
+                       (((r >> 3) & 0x1f) << 10)
 
 #define RGB24(r, g, b) ((b) | ((g) << 8) | ((r) << 16))
 
 typedef struct rgba_t {
-    int r, g, b, a;
+    int r;
+    int g;
+    int b;
+    int a;
 } rgba_t;
 
 typedef struct s3d_state_t {
-    int32_t r, g, b, a, u, v, d, w;
+    int32_t r;
+    int32_t g;
+    int32_t b;
+    int32_t a;
+    int32_t u;
+    int32_t v;
+    int32_t d;
+    int32_t w;
 
-    int32_t base_r, base_g, base_b, base_a, base_u, base_v, base_d, base_w;
+    int32_t base_r;
+    int32_t base_g;
+    int32_t base_b;
+    int32_t base_a;
+    int32_t base_u;
+    int32_t base_v;
+    int32_t base_d;
+    int32_t base_w;
 
     uint32_t base_z;
 
-    uint32_t tbu, tbv;
+    uint32_t tbu;
+    uint32_t tbv;
 
     uint32_t cmd_set;
     int      max_d;
@@ -2536,8 +3441,10 @@ typedef struct s3d_state_t {
 
     uint32_t tex_bdr_clr;
 
-    int32_t x1, x2;
-    int     y;
+    int32_t x1;
+    int32_t x2;
+
+    int y;
 
     rgba_t dest_rgba;
 } s3d_state_t;
@@ -2546,7 +3453,8 @@ typedef struct s3d_texture_state_t {
     int level;
     int texture_shift;
 
-    int32_t u, v;
+    int32_t u;
+    int32_t v;
 } s3d_texture_state_t;
 
 static void (*tex_read)(s3d_state_t *state, s3d_texture_state_t *texture_state, rgba_t *out);
@@ -2562,8 +3470,9 @@ static int _y;
 static void
 tex_ARGB1555(s3d_state_t *state, s3d_texture_state_t *texture_state, rgba_t *out)
 {
-    int      offset = ((texture_state->u & 0x7fc0000) >> texture_state->texture_shift) + (((texture_state->v & 0x7fc0000) >> texture_state->texture_shift) << texture_state->level);
-    uint16_t val    = state->texture[texture_state->level][offset];
+    int offset = ((texture_state->u & 0x7fc0000) >> texture_state->texture_shift) +
+                 (((texture_state->v & 0x7fc0000) >> texture_state->texture_shift) << texture_state->level);
+    uint16_t val = state->texture[texture_state->level][offset];
 
     out->r = ((val & 0x7c00) >> 7) | ((val & 0x7000) >> 12);
     out->g = ((val & 0x03e0) >> 2) | ((val & 0x0380) >> 7);
@@ -2574,8 +3483,9 @@ tex_ARGB1555(s3d_state_t *state, s3d_texture_state_t *texture_state, rgba_t *out
 static void
 tex_ARGB1555_nowrap(s3d_state_t *state, s3d_texture_state_t *texture_state, rgba_t *out)
 {
-    int      offset = ((texture_state->u & 0x7fc0000) >> texture_state->texture_shift) + (((texture_state->v & 0x7fc0000) >> texture_state->texture_shift) << texture_state->level);
-    uint16_t val    = state->texture[texture_state->level][offset];
+    int offset = ((texture_state->u & 0x7fc0000) >> texture_state->texture_shift) +
+                 (((texture_state->v & 0x7fc0000) >> texture_state->texture_shift) << texture_state->level);
+    uint16_t val = state->texture[texture_state->level][offset];
 
     if (((texture_state->u | texture_state->v) & 0xf8000000) == 0xf8000000)
         val = state->tex_bdr_clr;
@@ -2589,8 +3499,9 @@ tex_ARGB1555_nowrap(s3d_state_t *state, s3d_texture_state_t *texture_state, rgba
 static void
 tex_ARGB4444(s3d_state_t *state, s3d_texture_state_t *texture_state, rgba_t *out)
 {
-    int      offset = ((texture_state->u & 0x7fc0000) >> texture_state->texture_shift) + (((texture_state->v & 0x7fc0000) >> texture_state->texture_shift) << texture_state->level);
-    uint16_t val    = state->texture[texture_state->level][offset];
+    int offset = ((texture_state->u & 0x7fc0000) >> texture_state->texture_shift) +
+                 (((texture_state->v & 0x7fc0000) >> texture_state->texture_shift) << texture_state->level);
+    uint16_t val = state->texture[texture_state->level][offset];
 
     out->r = ((val & 0x0f00) >> 4) | ((val & 0x0f00) >> 8);
     out->g = (val & 0x00f0) | ((val & 0x00f0) >> 4);
@@ -2601,8 +3512,9 @@ tex_ARGB4444(s3d_state_t *state, s3d_texture_state_t *texture_state, rgba_t *out
 static void
 tex_ARGB4444_nowrap(s3d_state_t *state, s3d_texture_state_t *texture_state, rgba_t *out)
 {
-    int      offset = ((texture_state->u & 0x7fc0000) >> texture_state->texture_shift) + (((texture_state->v & 0x7fc0000) >> texture_state->texture_shift) << texture_state->level);
-    uint16_t val    = state->texture[texture_state->level][offset];
+    int offset = ((texture_state->u & 0x7fc0000) >> texture_state->texture_shift) +
+                 (((texture_state->v & 0x7fc0000) >> texture_state->texture_shift) << texture_state->level);
+    uint16_t val = state->texture[texture_state->level][offset];
 
     if (((texture_state->u | texture_state->v) & 0xf8000000) == 0xf8000000)
         val = state->tex_bdr_clr;
@@ -2616,19 +3528,22 @@ tex_ARGB4444_nowrap(s3d_state_t *state, s3d_texture_state_t *texture_state, rgba
 static void
 tex_ARGB8888(s3d_state_t *state, s3d_texture_state_t *texture_state, rgba_t *out)
 {
-    int      offset = ((texture_state->u & 0x7fc0000) >> texture_state->texture_shift) + (((texture_state->v & 0x7fc0000) >> texture_state->texture_shift) << texture_state->level);
-    uint32_t val    = ((uint32_t *) state->texture[texture_state->level])[offset];
+    int offset = ((texture_state->u & 0x7fc0000) >> texture_state->texture_shift) +
+                  (((texture_state->v & 0x7fc0000) >> texture_state->texture_shift) << texture_state->level);
+    uint32_t val = ((uint32_t *)state->texture[texture_state->level])[offset];
 
     out->r = (val >> 16) & 0xff;
     out->g = (val >> 8) & 0xff;
     out->b = val & 0xff;
     out->a = (val >> 24) & 0xff;
 }
+
 static void
 tex_ARGB8888_nowrap(s3d_state_t *state, s3d_texture_state_t *texture_state, rgba_t *out)
 {
-    int      offset = ((texture_state->u & 0x7fc0000) >> texture_state->texture_shift) + (((texture_state->v & 0x7fc0000) >> texture_state->texture_shift) << texture_state->level);
-    uint32_t val    = ((uint32_t *) state->texture[texture_state->level])[offset];
+    int offset = ((texture_state->u & 0x7fc0000) >> texture_state->texture_shift) +
+                 (((texture_state->v & 0x7fc0000) >> texture_state->texture_shift) << texture_state->level);
+    uint32_t val = ((uint32_t *)state->texture[texture_state->level])[offset];
 
     if (((texture_state->u | texture_state->v) & 0xf8000000) == 0xf8000000)
         val = state->tex_bdr_clr;
@@ -2689,10 +3604,14 @@ tex_sample_normal_filter(s3d_state_t *state)
     d[2] = (256 - du) * dv;
     d[3] = du * dv;
 
-    state->dest_rgba.r = (tex_samples[0].r * d[0] + tex_samples[1].r * d[1] + tex_samples[2].r * d[2] + tex_samples[3].r * d[3]) >> 16;
-    state->dest_rgba.g = (tex_samples[0].g * d[0] + tex_samples[1].g * d[1] + tex_samples[2].g * d[2] + tex_samples[3].g * d[3]) >> 16;
-    state->dest_rgba.b = (tex_samples[0].b * d[0] + tex_samples[1].b * d[1] + tex_samples[2].b * d[2] + tex_samples[3].b * d[3]) >> 16;
-    state->dest_rgba.a = (tex_samples[0].a * d[0] + tex_samples[1].a * d[1] + tex_samples[2].a * d[2] + tex_samples[3].a * d[3]) >> 16;
+    state->dest_rgba.r = (tex_samples[0].r * d[0] + tex_samples[1].r * d[1] +
+                          tex_samples[2].r * d[2] + tex_samples[3].r * d[3]) >> 16;
+    state->dest_rgba.g = (tex_samples[0].g * d[0] + tex_samples[1].g * d[1] +
+                          tex_samples[2].g * d[2] + tex_samples[3].g * d[3]) >> 16;
+    state->dest_rgba.b = (tex_samples[0].b * d[0] + tex_samples[1].b * d[1] +
+                          tex_samples[2].b * d[2] + tex_samples[3].b * d[3]) >> 16;
+    state->dest_rgba.a = (tex_samples[0].a * d[0] + tex_samples[1].a * d[1] +
+                          tex_samples[2].a * d[2] + tex_samples[3].a * d[3]) >> 16;
 }
 
 static void
@@ -2749,10 +3668,14 @@ tex_sample_mipmap_filter(s3d_state_t *state)
     d[2] = (256 - du) * dv;
     d[3] = du * dv;
 
-    state->dest_rgba.r = (tex_samples[0].r * d[0] + tex_samples[1].r * d[1] + tex_samples[2].r * d[2] + tex_samples[3].r * d[3]) >> 16;
-    state->dest_rgba.g = (tex_samples[0].g * d[0] + tex_samples[1].g * d[1] + tex_samples[2].g * d[2] + tex_samples[3].g * d[3]) >> 16;
-    state->dest_rgba.b = (tex_samples[0].b * d[0] + tex_samples[1].b * d[1] + tex_samples[2].b * d[2] + tex_samples[3].b * d[3]) >> 16;
-    state->dest_rgba.a = (tex_samples[0].a * d[0] + tex_samples[1].a * d[1] + tex_samples[2].a * d[2] + tex_samples[3].a * d[3]) >> 16;
+    state->dest_rgba.r = (tex_samples[0].r * d[0] + tex_samples[1].r * d[1] +
+                          tex_samples[2].r * d[2] + tex_samples[3].r * d[3]) >> 16;
+    state->dest_rgba.g = (tex_samples[0].g * d[0] + tex_samples[1].g * d[1] +
+                          tex_samples[2].g * d[2] + tex_samples[3].g * d[3]) >> 16;
+    state->dest_rgba.b = (tex_samples[0].b * d[0] + tex_samples[1].b * d[1] +
+                          tex_samples[2].b * d[2] + tex_samples[3].b * d[3]) >> 16;
+    state->dest_rgba.a = (tex_samples[0].a * d[0] + tex_samples[1].a * d[1] +
+                          tex_samples[2].a * d[2] + tex_samples[3].a * d[3]) >> 16;
 }
 
 static void
@@ -2818,10 +3741,14 @@ tex_sample_persp_normal_filter(s3d_state_t *state)
     d[2] = (256 - du) * dv;
     d[3] = du * dv;
 
-    state->dest_rgba.r = (tex_samples[0].r * d[0] + tex_samples[1].r * d[1] + tex_samples[2].r * d[2] + tex_samples[3].r * d[3]) >> 16;
-    state->dest_rgba.g = (tex_samples[0].g * d[0] + tex_samples[1].g * d[1] + tex_samples[2].g * d[2] + tex_samples[3].g * d[3]) >> 16;
-    state->dest_rgba.b = (tex_samples[0].b * d[0] + tex_samples[1].b * d[1] + tex_samples[2].b * d[2] + tex_samples[3].b * d[3]) >> 16;
-    state->dest_rgba.a = (tex_samples[0].a * d[0] + tex_samples[1].a * d[1] + tex_samples[2].a * d[2] + tex_samples[3].a * d[3]) >> 16;
+    state->dest_rgba.r = (tex_samples[0].r * d[0] + tex_samples[1].r * d[1] +
+                          tex_samples[2].r * d[2] + tex_samples[3].r * d[3]) >> 16;
+    state->dest_rgba.g = (tex_samples[0].g * d[0] + tex_samples[1].g * d[1] +
+                          tex_samples[2].g * d[2] + tex_samples[3].g * d[3]) >> 16;
+    state->dest_rgba.b = (tex_samples[0].b * d[0] + tex_samples[1].b * d[1] +
+                          tex_samples[2].b * d[2] + tex_samples[3].b * d[3]) >> 16;
+    state->dest_rgba.a = (tex_samples[0].a * d[0] + tex_samples[1].a * d[1] +
+                          tex_samples[2].a * d[2] + tex_samples[3].a * d[3]) >> 16;
 }
 
 static void
@@ -2887,10 +3814,14 @@ tex_sample_persp_normal_filter_375(s3d_state_t *state)
     d[2] = (256 - du) * dv;
     d[3] = du * dv;
 
-    state->dest_rgba.r = (tex_samples[0].r * d[0] + tex_samples[1].r * d[1] + tex_samples[2].r * d[2] + tex_samples[3].r * d[3]) >> 16;
-    state->dest_rgba.g = (tex_samples[0].g * d[0] + tex_samples[1].g * d[1] + tex_samples[2].g * d[2] + tex_samples[3].g * d[3]) >> 16;
-    state->dest_rgba.b = (tex_samples[0].b * d[0] + tex_samples[1].b * d[1] + tex_samples[2].b * d[2] + tex_samples[3].b * d[3]) >> 16;
-    state->dest_rgba.a = (tex_samples[0].a * d[0] + tex_samples[1].a * d[1] + tex_samples[2].a * d[2] + tex_samples[3].a * d[3]) >> 16;
+    state->dest_rgba.r = (tex_samples[0].r * d[0] + tex_samples[1].r * d[1] +
+                          tex_samples[2].r * d[2] + tex_samples[3].r * d[3]) >> 16;
+    state->dest_rgba.g = (tex_samples[0].g * d[0] + tex_samples[1].g * d[1] +
+                          tex_samples[2].g * d[2] + tex_samples[3].g * d[3]) >> 16;
+    state->dest_rgba.b = (tex_samples[0].b * d[0] + tex_samples[1].b * d[1] +
+                          tex_samples[2].b * d[2] + tex_samples[3].b * d[3]) >> 16;
+    state->dest_rgba.a = (tex_samples[0].a * d[0] + tex_samples[1].a * d[1] +
+                          tex_samples[2].a * d[2] + tex_samples[3].a * d[3]) >> 16;
 }
 
 static void
@@ -2960,10 +3891,14 @@ tex_sample_persp_mipmap_filter(s3d_state_t *state)
     d[2] = (256 - du) * dv;
     d[3] = du * dv;
 
-    state->dest_rgba.r = (tex_samples[0].r * d[0] + tex_samples[1].r * d[1] + tex_samples[2].r * d[2] + tex_samples[3].r * d[3]) >> 16;
-    state->dest_rgba.g = (tex_samples[0].g * d[0] + tex_samples[1].g * d[1] + tex_samples[2].g * d[2] + tex_samples[3].g * d[3]) >> 16;
-    state->dest_rgba.b = (tex_samples[0].b * d[0] + tex_samples[1].b * d[1] + tex_samples[2].b * d[2] + tex_samples[3].b * d[3]) >> 16;
-    state->dest_rgba.a = (tex_samples[0].a * d[0] + tex_samples[1].a * d[1] + tex_samples[2].a * d[2] + tex_samples[3].a * d[3]) >> 16;
+    state->dest_rgba.r = (tex_samples[0].r * d[0] + tex_samples[1].r * d[1] +
+                          tex_samples[2].r * d[2] + tex_samples[3].r * d[3]) >> 16;
+    state->dest_rgba.g = (tex_samples[0].g * d[0] + tex_samples[1].g * d[1] +
+                          tex_samples[2].g * d[2] + tex_samples[3].g * d[3]) >> 16;
+    state->dest_rgba.b = (tex_samples[0].b * d[0] + tex_samples[1].b * d[1] +
+                          tex_samples[2].b * d[2] + tex_samples[3].b * d[3]) >> 16;
+    state->dest_rgba.a = (tex_samples[0].a * d[0] + tex_samples[1].a * d[1] +
+                          tex_samples[2].a * d[2] + tex_samples[3].a * d[3]) >> 16;
 }
 
 static void
@@ -3033,10 +3968,14 @@ tex_sample_persp_mipmap_filter_375(s3d_state_t *state)
     d[2] = (256 - du) * dv;
     d[3] = du * dv;
 
-    state->dest_rgba.r = (tex_samples[0].r * d[0] + tex_samples[1].r * d[1] + tex_samples[2].r * d[2] + tex_samples[3].r * d[3]) >> 16;
-    state->dest_rgba.g = (tex_samples[0].g * d[0] + tex_samples[1].g * d[1] + tex_samples[2].g * d[2] + tex_samples[3].g * d[3]) >> 16;
-    state->dest_rgba.b = (tex_samples[0].b * d[0] + tex_samples[1].b * d[1] + tex_samples[2].b * d[2] + tex_samples[3].b * d[3]) >> 16;
-    state->dest_rgba.a = (tex_samples[0].a * d[0] + tex_samples[1].a * d[1] + tex_samples[2].a * d[2] + tex_samples[3].a * d[3]) >> 16;
+    state->dest_rgba.r = (tex_samples[0].r * d[0] + tex_samples[1].r * d[1] +
+                          tex_samples[2].r * d[2] + tex_samples[3].r * d[3]) >> 16;
+    state->dest_rgba.g = (tex_samples[0].g * d[0] + tex_samples[1].g * d[1] +
+                          tex_samples[2].g * d[2] + tex_samples[3].g * d[3]) >> 16;
+    state->dest_rgba.b = (tex_samples[0].b * d[0] + tex_samples[1].b * d[1] +
+                          tex_samples[2].b * d[2] + tex_samples[3].b * d[3]) >> 16;
+    state->dest_rgba.a = (tex_samples[0].a * d[0] + tex_samples[1].a * d[1] +
+                          tex_samples[2].a * d[2] + tex_samples[3].a * d[3]) >> 16;
 }
 
 #define CLAMP(x)                      \
@@ -3142,37 +4081,16 @@ dest_pixel_lit_texture_modulate(s3d_state_t *state)
 static void
 tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int32_t dx1, int32_t dx2)
 {
-    svga_t  *svga = &virge->svga;
-    uint8_t *vram = svga->vram;
+    uint8_t *vram    = virge->svga.vram;
+    int      x_dir   = s3d_tri->tlr ? 1 : -1;
+    int      use_z   = !(s3d_tri->cmd_set & CMD_SET_ZB_MODE);
+    int      y_count = yc;
+    int      bpp     = (s3d_tri->cmd_set >> 2) & 7;
+    uint32_t dest_offset;
+    uint32_t z_offset;
 
-    int x_dir = s3d_tri->tlr ? 1 : -1;
-
-    int use_z = !(s3d_tri->cmd_set & CMD_SET_ZB_MODE);
-
-    int y_count = yc;
-
-    int bpp = (s3d_tri->cmd_set >> 2) & 7;
-
-    uint32_t dest_offset = 0;
-    uint32_t z_offset = 0;
-
-    uint32_t src_col;
-    int      src_r = 0;
-    int      src_g = 0;
-    int      src_b = 0;
-
-    int      x;
-    int      xe;
-    uint32_t z;
-
-    uint32_t dest_addr;
-    uint32_t z_addr;
-    int      dx;
-    int      x_offset;
-    int      xz_offset;
-
-    int      update;
-    uint16_t src_z = 0;
+    dest_offset = s3d_tri->dest_base + (state->y * s3d_tri->dest_str);
+    z_offset    = s3d_tri->z_base + (state->y * s3d_tri->z_str);
 
     if (s3d_tri->cmd_set & CMD_SET_HC) {
         if (state->y < s3d_tri->clip_t)
@@ -3195,7 +4113,7 @@ tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int32_t dx1, int
             state->x1 += (dx1 * diff_y);
             state->x2 += (dx2 * diff_y);
             state->y -= diff_y;
-            dest_offset -= s3d_tri->dest_str * diff_y;
+            dest_offset -= s3d_tri->dest_str;
             z_offset -= s3d_tri->z_str;
             y_count -= diff_y;
         }
@@ -3203,24 +4121,26 @@ tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int32_t dx1, int
             y_count = (state->y - s3d_tri->clip_t) + 1;
     }
 
-    dest_offset = s3d_tri->dest_base + (state->y * s3d_tri->dest_str);
-    z_offset    = s3d_tri->z_base + (state->y * s3d_tri->z_str);
+    for (; y_count > 0; y_count--) {
+        int      x  = (state->x1 + ((1 << 20) - 1)) >> 20;
+        int      xe = (state->x2 + ((1 << 20) - 1)) >> 20;
+        uint32_t z  = (state->base_z > 0) ? (state->base_z << 1) : 0;
 
-    while (y_count > 0) {
-        x  = (state->x1 + ((1 << 20) - 1)) >> 20;
-        xe = (state->x2 + ((1 << 20) - 1)) >> 20;
-        z  = (state->base_z > 0) ? (state->base_z << 1) : 0;
         if (x_dir < 0) {
             x--;
             xe--;
         }
 
-        if (((x != xe) && ((x_dir > 0) && (x < xe))) || ((x_dir < 0) && (x > xe))) {
-            dx        = (x_dir > 0) ? ((31 - ((state->x1 - 1) >> 15)) & 0x1f) : (((state->x1 - 1) >> 15) & 0x1f);
-            x_offset  = x_dir * (bpp + 1);
-            xz_offset = x_dir << 1;
+        if (x != xe && ((x_dir > 0 && x < xe) || (x_dir < 0 && x > xe))) {
+            uint32_t dest_addr;
+            uint32_t z_addr;
+            int      dx        = (x_dir > 0) ? ((31 - ((state->x1 - 1) >> 15)) & 0x1f) : (((state->x1 - 1) >> 15) & 0x1f);
+            int      x_offset  = x_dir * (bpp + 1);
+            int      xz_offset = x_dir << 1;
+
             if (x_dir > 0)
                 dx += 1;
+
             state->r = state->base_r + ((s3d_tri->TdRdX * dx) >> 5);
             state->g = state->base_g + ((s3d_tri->TdGdX * dx) >> 5);
             state->b = state->base_b + ((s3d_tri->TdBdX * dx) >> 5);
@@ -3279,7 +4199,7 @@ tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int32_t dx1, int
                 }
             }
 
-            svga->changedvram[(dest_offset & virge->vram_mask) >> 12] = changeframecount;
+            virge->svga.changedvram[(dest_offset & virge->vram_mask) >> 12] = changeframecount;
 
             dest_addr = dest_offset + (x * (bpp + 1));
             z_addr    = z_offset + (x << 1);
@@ -3287,60 +4207,16 @@ tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int32_t dx1, int
             x &= 0xfff;
             xe &= 0xfff;
 
-            while (x != xe) {
-                update = 1;
-                _x     = x;
-                _y     = state->y;
+            for (; x != xe; x = (x + x_dir) & 0xfff) {
+                int      update = 1;
+                uint16_t src_z  = 0;
+
+                _x = x;
+                _y = state->y;
 
                 if (use_z) {
-                    src_z = *(uint16_t *) &vram[z_addr & virge->vram_mask];
-                    switch ((s3d_tri->cmd_set >> 20) & 7) {
-                        case 0:
-                            update = 0;
-                            break;
-                        case 1:
-                            if ((z >> 16) > src_z) {
-                                src_z = (z >> 16);
-                            } else
-                                update = 0;
-                            break;
-                        case 2:
-                            if ((z >> 16) == src_z) {
-                                src_z = (z >> 16);
-                            } else
-                                update = 0;
-                            break;
-                        case 3:
-                            if ((z >> 16) >= src_z) {
-                                src_z = (z >> 16);
-                            } else
-                                update = 0;
-                            break;
-                        case 4:
-                            if ((z >> 16) < src_z) {
-                                src_z = (z >> 16);
-                            } else
-                                update = 0;
-                            break;
-                        case 5:
-                            if ((z >> 16) != src_z) {
-                                src_z = (z >> 16);
-                            } else
-                                update = 0;
-                            break;
-                        case 6:
-                            if ((z >> 16) <= src_z) {
-                                src_z = (z >> 16);
-                            } else
-                                update = 0;
-                            break;
-                        case 7:
-                            src_z = (z >> 16);
-                            break;
-
-                        default:
-                            break;
-                    }
+                    src_z = Z_READ(z_addr);
+                    Z_CLIP(src_z, z >> 16);
                 }
 
                 if (update) {
@@ -3356,9 +4232,14 @@ tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int32_t dx1, int
                     }
 
                     if (s3d_tri->cmd_set & CMD_SET_ABC_ENABLE) {
+                        uint32_t src_col;
+                        int      src_r = 0;
+                        uint32_t src_g = 0;
+                        uint32_t src_b = 0;
+
                         switch (bpp) {
                             case 0: /*8 bpp*/
-                                /*TODO: Not implemented yet*/
+                                /*Not implemented yet*/
                                 break;
                             case 1: /*16 bpp*/
                                 src_col = *(uint16_t *) &vram[dest_addr & virge->vram_mask];
@@ -3368,9 +4249,6 @@ tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int32_t dx1, int
                                 src_col = (*(uint32_t *) &vram[dest_addr & virge->vram_mask]) & 0xffffff;
                                 RGB24_TO_24(src_col, src_r, src_g, src_b);
                                 break;
-
-                            default:
-                                break;
                         }
 
                         state->dest_rgba.r = ((state->dest_rgba.r * state->dest_rgba.a) + (src_r * (255 - state->dest_rgba.a))) / 255;
@@ -3380,29 +4258,22 @@ tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int32_t dx1, int
 
                     switch (bpp) {
                         case 0: /*8 bpp*/
-                            /*TODO: Not implemented yet*/
+                            /*Not implemented yet*/
                             break;
                         case 1: /*16 bpp*/
                             RGB15(state->dest_rgba.r, state->dest_rgba.g, state->dest_rgba.b, dest_col);
-                            *(uint16_t *) &vram[dest_addr & virge->vram_mask]       = dest_col;
-                            svga->changedvram[(dest_addr & virge->vram_mask) >> 12] = changeframecount;
+                            *(uint16_t *) &vram[dest_addr] = dest_col;
                             break;
                         case 2: /*24 bpp*/
-                            dest_col                                                = RGB24(state->dest_rgba.r, state->dest_rgba.g, state->dest_rgba.b);
-                            *(uint8_t *) &vram[dest_addr & virge->vram_mask]        = dest_col & 0xff;
-                            *(uint8_t *) &vram[(dest_addr + 1) & virge->vram_mask]  = (dest_col >> 8) & 0xff;
-                            *(uint8_t *) &vram[(dest_addr + 2) & virge->vram_mask]  = (dest_col >> 16) & 0xff;
-                            svga->changedvram[(dest_addr & virge->vram_mask) >> 12] = changeframecount;
-                            break;
-
-                        default:
+                            dest_col                          = RGB24(state->dest_rgba.r, state->dest_rgba.g, state->dest_rgba.b);
+                            *(uint8_t *) &vram[dest_addr]     = dest_col & 0xff;
+                            *(uint8_t *) &vram[dest_addr + 1] = (dest_col >> 8) & 0xff;
+                            *(uint8_t *) &vram[dest_addr + 2] = (dest_col >> 16) & 0xff;
                             break;
                     }
-                }
 
-                if (use_z && (s3d_tri->cmd_set & CMD_SET_ZUP)) {
-                    *(uint16_t *) &vram[z_addr & virge->vram_mask]       = src_z;
-                    svga->changedvram[(z_addr & virge->vram_mask) >> 12] = changeframecount;
+                    if (use_z && (s3d_tri->cmd_set & CMD_SET_ZUP))
+                        Z_WRITE(z_addr, src_z);
                 }
 
                 z += s3d_tri->TdZdX;
@@ -3416,13 +4287,10 @@ tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int32_t dx1, int
                 state->w += s3d_tri->TdWdX;
                 dest_addr += x_offset;
                 z_addr += xz_offset;
-
-                x = (x + x_dir) & 0xfff;
+                virge->pixel_count++;
             }
         }
 
-        y_count--;
-
 tri_skip_line:
         state->x1 += dx1;
         state->x2 += dx2;
@@ -3441,16 +4309,7 @@ tri_skip_line:
     }
 }
 
-static int tex_size[8] = {
-    4 * 2,
-    2 * 2,
-    2 * 2,
-    1 * 2,
-    2 / 1,
-    2 / 1,
-    1 * 2,
-    1 * 2
-};
+static int tex_size[8] = { 4 * 2, 2 * 2, 2 * 2, 1 * 2, 2 / 1, 2 / 1, 1 * 2, 1 * 2 };
 
 static void
 s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri)
@@ -3458,6 +4317,7 @@ s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri)
     s3d_state_t state;
 
     uint32_t tex_base;
+    int      c;
 
     uint64_t start_time = plat_timer_read();
     uint64_t end_time;
@@ -3482,7 +4342,7 @@ s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri)
     state.base_w = s3d_tri->tws;
 
     tex_base = s3d_tri->tex_base;
-    for (int c = 9; c >= 0; c--) {
+    for (c = 9; c >= 0; c--) {
         state.texture[c] = (uint16_t *) &virge->svga.vram[tex_base];
         if (c <= state.max_d)
             tex_base += ((1 << (c * 2)) * tex_size[(s3d_tri->cmd_set >> 5) & 7]) / 2;
@@ -3505,7 +4365,6 @@ s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri)
                     dest_pixel = dest_pixel_lit_texture_decal;
                     break;
                 default:
-                    s3_virge_log("bad triangle type %x\n", (s3d_tri->cmd_set >> 27) & 0xf);
                     return;
             }
             break;
@@ -3514,7 +4373,6 @@ s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri)
             dest_pixel = dest_pixel_unlit_texture_triangle;
             break;
         default:
-            s3_virge_log("bad triangle type %x\n", (s3d_tri->cmd_set >> 27) & 0xf);
             return;
     }
 
@@ -3537,34 +4395,35 @@ s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri)
             break;
         case (0 | 8):
         case (1 | 8):
-            if (virge->chip == S3_VIRGEDX || virge->chip >= S3_VIRGEGX2)
+            if ((virge->chip == S3_VIRGEDX) || (virge->chip >= S3_VIRGEGX2))
                 tex_sample = tex_sample_persp_mipmap_375;
             else
                 tex_sample = tex_sample_persp_mipmap;
             break;
         case (2 | 8):
         case (3 | 8):
-            if (virge->chip == S3_VIRGEDX || virge->chip >= S3_VIRGEGX2)
-                tex_sample = virge->bilinear_enabled ? tex_sample_persp_mipmap_filter_375 : tex_sample_persp_mipmap_375;
+            if ((virge->chip == S3_VIRGEDX) || (virge->chip >= S3_VIRGEGX2))
+                tex_sample = virge->bilinear_enabled ? tex_sample_persp_mipmap_filter_375 :
+                                                       tex_sample_persp_mipmap_375;
             else
-                tex_sample = virge->bilinear_enabled ? tex_sample_persp_mipmap_filter : tex_sample_persp_mipmap;
+                tex_sample = virge->bilinear_enabled ? tex_sample_persp_mipmap_filter :
+                                                       tex_sample_persp_mipmap;
             break;
         case (4 | 8):
         case (5 | 8):
-            if (virge->chip == S3_VIRGEDX || virge->chip >= S3_VIRGEGX2)
+            if ((virge->chip == S3_VIRGEDX) || (virge->chip >= S3_VIRGEGX2))
                 tex_sample = tex_sample_persp_normal_375;
             else
                 tex_sample = tex_sample_persp_normal;
             break;
         case (6 | 8):
         case (7 | 8):
-            if (virge->chip == S3_VIRGEDX || virge->chip >= S3_VIRGEGX2)
-                tex_sample = virge->bilinear_enabled ? tex_sample_persp_normal_filter_375 : tex_sample_persp_normal_375;
+            if ((virge->chip == S3_VIRGEDX) || (virge->chip >= S3_VIRGEGX2))
+                tex_sample = virge->bilinear_enabled ? tex_sample_persp_normal_filter_375 :
+                                                       tex_sample_persp_normal_375;
             else
-                tex_sample = virge->bilinear_enabled ? tex_sample_persp_normal_filter : tex_sample_persp_normal;
-            break;
-
-        default:
+                tex_sample = virge->bilinear_enabled ? tex_sample_persp_normal_filter :
+                                                       tex_sample_persp_normal;
             break;
     }
 
@@ -3579,7 +4438,6 @@ s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri)
             tex_read = (s3d_tri->cmd_set & CMD_SET_TWE) ? tex_ARGB1555 : tex_ARGB1555_nowrap;
             break;
         default:
-            s3_virge_log("bad texture type %i\n", (s3d_tri->cmd_set >> 5) & 7);
             tex_read = (s3d_tri->cmd_set & CMD_SET_TWE) ? tex_ARGB1555 : tex_ARGB1555_nowrap;
             break;
     }
@@ -3591,21 +4449,60 @@ s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri)
     state.x2 = s3d_tri->txend12;
     tri(virge, s3d_tri, &state, s3d_tri->ty12, s3d_tri->TdXdY02, s3d_tri->TdXdY12);
 
+    virge->tri_count++;
+
     end_time = plat_timer_read();
 
-    virge->blitter_time += end_time - start_time;
+    virge_time += end_time - start_time;
+}
+
+static void
+render_thread(void *param)
+{
+    virge_t *virge = (virge_t *) param;
+
+    while (virge->render_thread_run) {
+        thread_wait_event(virge->wake_render_thread, -1);
+        thread_reset_event(virge->wake_render_thread);
+        virge->s3d_busy = 1;
+        while (!RB_EMPTY) {
+            s3_virge_triangle(virge, &virge->s3d_buffer[virge->s3d_read_idx & RB_MASK]);
+            virge->s3d_read_idx++;
+
+            if (RB_ENTRIES == RB_MASK)
+                thread_set_event(virge->not_full_event);
+        }
+        virge->s3d_busy = 0;
+        virge->subsys_stat |= INT_S3D_DONE;
+        virge->irq_pending++;
+    }
+}
+
+static void
+queue_triangle(virge_t *virge)
+{
+    if (RB_FULL) {
+        thread_reset_event(virge->not_full_event);
+        if (RB_FULL)
+            thread_wait_event(virge->not_full_event, -1); /*Wait for room in ringbuffer*/
+    }
+    virge->s3d_buffer[virge->s3d_write_idx & RB_MASK] = virge->s3d_tri;
+    virge->s3d_write_idx++;
+    if (!virge->s3d_busy)
+        thread_set_event(virge->wake_render_thread); /*Wake up render thread if moving from idle*/
 }
 
 static void
 s3_virge_hwcursor_draw(svga_t *svga, int displine)
 {
-    const virge_t *virge = (virge_t *) svga->priv;
-    uint16_t       dat[2];
-    int            xx;
-    int            offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff;
-    uint32_t       fg;
-    uint32_t       bg;
-    uint32_t       vram_mask = virge->vram_mask;
+    virge_t *virge = (virge_t *) svga->priv;
+    int      x;
+    uint16_t dat[2] = { 0, 0 };
+    int      xx;
+    int      offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff;
+    uint32_t fg;
+    uint32_t bg;
+    uint32_t vram_mask = virge->vram_mask;
 
     if (svga->interlace && svga->hwcursor_oddeven)
         svga->hwcursor_latch.addr += 16;
@@ -3642,13 +4539,16 @@ s3_virge_hwcursor_draw(svga_t *svga, int displine)
             break;
     }
 
-    for (uint8_t x = 0; x < 64; x += 16) {
-        dat[0] = (svga->vram[svga->hwcursor_latch.addr & vram_mask] << 8) | svga->vram[(svga->hwcursor_latch.addr + 1) & vram_mask];
-        dat[1] = (svga->vram[(svga->hwcursor_latch.addr + 2) & vram_mask] << 8) | svga->vram[(svga->hwcursor_latch.addr + 3) & vram_mask];
+    for (x = 0; x < 64; x += 16) {
+        dat[0] = (svga->vram[svga->hwcursor_latch.addr & vram_mask] << 8) |
+                 svga->vram[(svga->hwcursor_latch.addr + 1) & vram_mask];
+        dat[1] = (svga->vram[(svga->hwcursor_latch.addr + 2) & vram_mask] << 8) |
+                 svga->vram[(svga->hwcursor_latch.addr + 3) & vram_mask];
+
         if (svga->crtc[0x55] & 0x10) {
             /*X11*/
             for (xx = 0; xx < 16; xx++) {
-                if (offset >= 0) {
+                if (offset >= svga->hwcursor_latch.x) {
                     if (virge->chip == S3_VIRGEGX2)
                         dat[0] ^= 0x8000;
 
@@ -3657,13 +4557,14 @@ s3_virge_hwcursor_draw(svga_t *svga, int displine)
                 }
 
                 offset++;
+
                 dat[0] <<= 1;
                 dat[1] <<= 1;
             }
         } else {
             /*Windows*/
             for (xx = 0; xx < 16; xx++) {
-                if (offset >= 0) {
+                if (offset >= svga->hwcursor_latch.x) {
                     if (!(dat[0] & 0x8000))
                         buffer32->line[displine][offset + svga->x_add] = (dat[1] & 0x8000) ? fg : bg;
                     else if (dat[1] & 0x8000)
@@ -3671,24 +4572,28 @@ s3_virge_hwcursor_draw(svga_t *svga, int displine)
                 }
 
                 offset++;
+
                 dat[0] <<= 1;
                 dat[1] <<= 1;
             }
         }
+
         svga->hwcursor_latch.addr += 4;
     }
+
     if (svga->interlace && !svga->hwcursor_oddeven)
         svga->hwcursor_latch.addr += 16;
 }
 
 #define DECODE_YCbCr()                      \
     do {                                    \
-        int c;                              \
-                                            \
-        for (c = 0; c < 2; c++) {           \
+        for (uint8_t c = 0; c < 2; c++) {   \
             uint8_t y1, y2;                 \
-            int8_t  Cr, Cb;                 \
-            int     dR, dG, dB;             \
+            int8_t  Cr;                     \
+            int8_t  Cb;                     \
+            int     dR;                     \
+            int     dG;                     \
+            int     dB;                     \
                                             \
             y1 = src[0];                    \
             Cr = src[1] - 0x80;             \
@@ -3723,7 +4628,9 @@ s3_virge_hwcursor_draw(svga_t *svga, int displine)
     do {                                 \
         uint8_t y1, y2, y3, y4;          \
         int8_t  U, V;                    \
-        int     dR, dG, dB;              \
+        int     dR;                      \
+        int     dG;                      \
+        int     dB;                      \
                                          \
         U  = src[0] - 0x80;              \
         y1 = (298 * (src[1] - 16)) >> 8; \
@@ -3770,12 +4677,14 @@ s3_virge_hwcursor_draw(svga_t *svga, int displine)
 
 #define DECODE_YUV422()                      \
     do {                                     \
-        int c;                               \
-                                             \
-        for (c = 0; c < 2; c++) {            \
-            uint8_t y1, y2;                  \
-            int8_t  U, V;                    \
-            int     dR, dG, dB;              \
+        for (uint8_t c = 0; c < 2; c++) {    \
+            uint8_t y1;                      \
+            uint8_t y2;                      \
+            int8_t  U;                       \
+            int8_t  V;                       \
+            int     dR;                      \
+            int     dG;                      \
+            int     dB;                      \
                                              \
             U  = src[0] - 0x80;              \
             y1 = (298 * (src[1] - 16)) >> 8; \
@@ -3805,64 +4714,68 @@ s3_virge_hwcursor_draw(svga_t *svga, int displine)
         }                                    \
     } while (0)
 
-#define DECODE_RGB555()                                                      \
-    do {                                                                     \
-        int c;                                                               \
-                                                                             \
-        for (c = 0; c < 4; c++) {                                            \
-            uint16_t dat;                                                    \
-                                                                             \
-            dat = *(uint16_t *) src;                                         \
-            src += 2;                                                        \
-                                                                             \
-            r[x_write + c] = ((dat & 0x001f) << 3) | ((dat & 0x001f) >> 2);  \
-            g[x_write + c] = ((dat & 0x03e0) >> 2) | ((dat & 0x03e0) >> 7);  \
-            b[x_write + c] = ((dat & 0x7c00) >> 7) | ((dat & 0x7c00) >> 12); \
-        }                                                                    \
-        x_write = (x_write + 4) & 7;                                         \
+#define DECODE_RGB555()                   \
+    do {                                  \
+        for (uint8_t c = 0; c < 4; c++) { \
+            uint16_t dat;                 \
+                                          \
+            dat = *(uint16_t *)src;       \
+            src += 2;                     \
+                                          \
+            r[x_write + c] =              \
+                ((dat & 0x001f) << 3) |   \
+                ((dat & 0x001f) >> 2);    \
+            g[x_write + c] =              \
+                ((dat & 0x03e0) >> 2) |   \
+                ((dat & 0x03e0) >> 7);    \
+            b[x_write + c] =              \
+                ((dat & 0x7c00) >> 7) |   \
+                ((dat & 0x7c00) >> 12);   \
+        }                                 \
+        x_write = (x_write + 4) & 7;      \
     } while (0)
 
-#define DECODE_RGB565()                                                      \
-    do {                                                                     \
-        int c;                                                               \
-                                                                             \
-        for (c = 0; c < 4; c++) {                                            \
-            uint16_t dat;                                                    \
-                                                                             \
-            dat = *(uint16_t *) src;                                         \
-            src += 2;                                                        \
-                                                                             \
-            r[x_write + c] = ((dat & 0x001f) << 3) | ((dat & 0x001f) >> 2);  \
-            g[x_write + c] = ((dat & 0x07e0) >> 3) | ((dat & 0x07e0) >> 9);  \
-            b[x_write + c] = ((dat & 0xf800) >> 8) | ((dat & 0xf800) >> 13); \
-        }                                                                    \
-        x_write = (x_write + 4) & 7;                                         \
+#define DECODE_RGB565()                   \
+    do {                                  \
+        for (uint8_t c = 0; c < 4; c++) { \
+            uint16_t dat;                 \
+                                          \
+            dat = *(uint16_t *)src;       \
+            src += 2;                     \
+                                          \
+            r[x_write + c] =              \
+                ((dat & 0x001f) << 3) |   \
+                ((dat & 0x001f) >> 2);    \
+            g[x_write + c] =              \
+                ((dat & 0x07e0) >> 3) |   \
+                ((dat & 0x07e0) >> 9);    \
+            b[x_write + c] =              \
+                ((dat & 0xf800) >> 8) |   \
+                ((dat & 0xf800) >> 13);   \
+        }                                 \
+        x_write = (x_write + 4) & 7;      \
     } while (0)
 
-#define DECODE_RGB888()              \
-    do {                             \
-        int c;                       \
-                                     \
-        for (c = 0; c < 4; c++) {    \
-            r[x_write + c] = src[0]; \
-            g[x_write + c] = src[1]; \
-            b[x_write + c] = src[2]; \
-            src += 3;                \
-        }                            \
-        x_write = (x_write + 4) & 7; \
+#define DECODE_RGB888()                   \
+    do {                                  \
+        for (uint8_t c = 0; c < 4; c++) { \
+            r[x_write + c] = src[0];      \
+            g[x_write + c] = src[1];      \
+            b[x_write + c] = src[2];      \
+            src += 3;                     \
+        }                                 \
+        x_write = (x_write + 4) & 7;      \
     } while (0)
 
-#define DECODE_XRGB8888()            \
-    do {                             \
-        int c;                       \
-                                     \
-        for (c = 0; c < 4; c++) {    \
-            r[x_write + c] = src[0]; \
-            g[x_write + c] = src[1]; \
-            b[x_write + c] = src[2]; \
-            src += 4;                \
-        }                            \
-        x_write = (x_write + 4) & 7; \
+#define DECODE_XRGB8888()                 \
+    do {                                  \
+        for (uint8_t c = 0; c < 4; c++) { \
+            r[x_write + c] = src[0];      \
+            g[x_write + c] = src[1];      \
+            b[x_write + c] = src[2];      \
+            src += 4;                     \
+        }                                 \
+        x_write = (x_write + 4) & 7;      \
     } while (0)
 
 #define OVERLAY_SAMPLE()               \
@@ -3893,40 +4806,178 @@ s3_virge_hwcursor_draw(svga_t *svga, int displine)
         }                              \
     } while (0)
 
+
+static bool
+s3_virge_colorkey(virge_t* virge, uint32_t x, uint32_t y)
+{
+    svga_t* svga = &virge->svga;
+    uint8_t comp_r = 0, comp_g = 0, comp_b = 0;
+    uint8_t comp_r_h = 0, comp_g_h = 0, comp_b_h = 0;
+    uint8_t r = 0, g = 0, b = 0;
+    uint8_t bytes_per_pel = 1;
+    uint8_t shift = ((virge->streams.chroma_ctrl >> 24) & 7) ^ 7;
+    bool is15bpp = false;
+
+    uint32_t base_addr = svga->memaddr_latch;
+    uint32_t stride = (virge->chip < S3_VIRGEGX2) ? virge->streams.pri_stride : (svga->rowoffset << 3);
+
+    bool color_key = false;
+    bool alpha_key = false;
+
+    if (!virge->color_key_enabled)
+        return true;
+
+    if (y > 2048)
+        return true;
+
+    if (virge->chip >= S3_VIRGEGX2 && ((virge->streams.chroma_ctrl >> 29) & 3) == 0)
+        return true;
+    else if (!(virge->streams.chroma_ctrl & (1 << 28)))
+        return true;
+    
+    comp_r = (virge->streams.chroma_ctrl >> 16) & 0xFF;
+    comp_g = (virge->streams.chroma_ctrl >> 8) & 0xFF;
+    comp_b = (virge->streams.chroma_ctrl) & 0xFF;
+
+    comp_r_h = (virge->streams.chroma_upper_bound >> 16) & 0xFF;
+    comp_g_h = (virge->streams.chroma_upper_bound >> 8) & 0xFF;
+    comp_b_h = (virge->streams.chroma_upper_bound) & 0xFF;
+
+    if (svga->render == svga_render_32bpp_highres) bytes_per_pel = 4;
+    if (svga->render == svga_render_24bpp_highres) bytes_per_pel = 3;
+    if (svga->render == svga_render_16bpp_highres) bytes_per_pel = 2;
+    if (svga->render == svga_render_15bpp_highres) { bytes_per_pel = 2; is15bpp = true; }
+
+    if (virge->chip >= S3_VIRGEDX && bytes_per_pel == 1) {
+        // TODO: Is this right for GX2 and later? Windows 2000 sources indicate that this is the format for alpha keying, but it's never used.
+
+        /* Note for DX/GX:
+            If Bit 28 of Color/Chroma Key Control is 1:
+                Bit 29 = 0: Select color keying
+                Bit 29 = 1: Select alpha keying (lowest 8 bits of register used for compare)
+        */
+        uint8_t index = virge->streams.chroma_ctrl & 0xFF;
+        alpha_key = (virge->chip < S3_VIRGEGX2) ? (virge->streams.chroma_ctrl & (1 << 29)) : ((virge->streams.chroma_ctrl >> 29) & 3) == 1;
+        
+        if (alpha_key) {
+            comp_r = comp_g = comp_b = index;
+            comp_r_h = comp_g_h = comp_b_h = index;
+        }
+    }
+
+    if (alpha_key) {
+        uint8_t index = svga->vram[(base_addr + (stride * y) + x * bytes_per_pel) & svga->vram_mask];
+        return !!((index >> shift) == (comp_r >> shift));
+    } else {
+        switch (bytes_per_pel) {
+            case 1: {
+                uint8_t index = svga->vram[(base_addr + (stride * y) + x * bytes_per_pel) & svga->vram_mask];
+                r = svga->vgapal[index].r << 2;
+                g = svga->vgapal[index].g << 2;
+                b = svga->vgapal[index].b << 2;
+                break;
+            }
+            case 2: {
+                uint16_t col = *(uint16_t*)&svga->vram[(base_addr + (stride * y) + x * bytes_per_pel) & svga->vram_mask];
+                if (is15bpp) {
+                    r = ((col >> 10) & 0x1f) << 3;
+                    g = ((col >> 5) & 0x1f) << 3;
+                    b = (col & 0x1f) << 3;
+                } else {
+                    r = ((col >> 11) & 0x1f) << 3;
+                    g = ((col >> 5) & 0x3f) << 2;
+                    b = (col & 0x1f) << 3;
+                }
+                break;
+            }
+            case 3: {
+                uint8_t *col = &svga->vram[(base_addr + (stride * y) + x * bytes_per_pel) & svga->vram_mask];
+                r = col[0];
+                g = col[1];
+                b = col[2];
+                break;
+            }
+            case 4: {
+                uint32_t col = *(uint32_t*)&svga->vram[(base_addr + (stride * y) + x * bytes_per_pel) & svga->vram_mask];
+                r = (col >> 16) & 0xFF;
+                g = (col >> 8) & 0xFF;
+                b = col & 0xFF;
+                break;
+            }
+        }
+
+        r >>= shift;
+        g >>= shift;
+        b >>= shift;
+        comp_r >>= shift;
+        comp_g >>= shift;
+        comp_b >>= shift;
+        comp_r_h >>= shift;
+        comp_g_h >>= shift;
+        comp_b_h >>= shift;
+
+        if (virge->chip < S3_VIRGEGX2) {
+            color_key = true;
+        } else {
+            color_key = ((virge->streams.chroma_ctrl >> 29) & 3) == 2;
+        }
+
+        if (color_key) {
+            return !!(r == comp_r && g == comp_g && b == comp_b);
+        } else {
+            return !!(r >= comp_r && r <= comp_r_h && g >= comp_g && g <= comp_g_h && b >= comp_b && b <= comp_b_h);
+        }
+    }
+
+    return true;
+}
+
 static void
 s3_virge_overlay_draw(svga_t *svga, int displine)
 {
-    const virge_t *virge  = (virge_t *) svga->priv;
-    int            offset = (virge->streams.sec_x - virge->streams.pri_x) + 1;
-    int            h_acc  = virge->streams.dda_horiz_accumulator;
-    int            r[8];
-    int            g[8];
-    int            b[8];
-    int            x_size;
-    int            x_read = 4;
-    int            x_write = 4;
-    uint32_t      *p;
-    uint8_t       *src = &svga->vram[svga->overlay_latch.addr];
+    virge_t  *virge = (virge_t *) svga->priv;
+    int       offset;
+    int       r[8];
+    int       g[8];
+    int       b[8];
+    int       x_size;
+    int       x_read  = 4;
+    int       x_write = 4;
+    int       x;
+    uint32_t *p;
+    uint8_t  *src = &svga->vram[svga->overlay_latch.addr];
 
-    p = &(buffer32->line[displine][offset + svga->x_add]);
-
-    if ((offset + virge->streams.sec_w) > virge->streams.pri_w)
-        x_size = (virge->streams.pri_w - virge->streams.sec_x) + 1;
+    if (virge->chip < S3_VIRGEGX2)
+        offset = (virge->streams.sec_x - virge->streams.pri_x) + 1;
     else
+        offset = virge->streams.sec_x + 1;
+
+    p = &((uint32_t *) buffer32->line[displine])[offset + svga->x_add];
+
+    if (virge->chip < S3_VIRGEGX2) {
+        if ((offset + virge->streams.sec_w) > virge->streams.pri_w)
+            x_size = (virge->streams.pri_w - virge->streams.sec_x) + 1;
+        else
+            x_size = virge->streams.sec_w + 1;
+    } else
         x_size = virge->streams.sec_w + 1;
 
     OVERLAY_SAMPLE();
 
-    for (int x = 0; x < x_size; x++) {
-        *p++ = r[x_read] | (g[x_read] << 8) | (b[x_read] << 16);
+    for (x = 0; x < x_size; x++) {
+        if (s3_virge_colorkey(virge, offset + x, displine - svga->y_add))
+            *p++ = r[x_read] | (g[x_read] << 8) | (b[x_read] << 16);
+        else
+            p++;
 
-        h_acc += virge->streams.k1_horiz_scale;
-        if (h_acc >= 0) {
+        svga->overlay_latch.h_acc += virge->streams.k1_horiz_scale;
+        if (svga->overlay_latch.h_acc >= 0) {
             if ((x_read ^ (x_read + 1)) & ~3)
                 OVERLAY_SAMPLE();
+
             x_read = (x_read + 1) & 7;
 
-            h_acc += (virge->streams.k2_horiz_scale - virge->streams.k1_horiz_scale);
+            svga->overlay_latch.h_acc += (virge->streams.k2_horiz_scale - virge->streams.k1_horiz_scale);
         }
     }
 
@@ -4012,16 +5063,16 @@ s3_virge_pci_read(UNUSED(int func), int addr, void *priv)
             break;
 
         case 0x30:
-            ret = virge->pci_regs[0x30] & 0x01;
+            ret = (!virge->onboard) ? (virge->pci_regs[0x30] & 0x01) : 0x00;
             break; /*BIOS ROM address*/
         case 0x31:
             ret = 0x00;
             break;
         case 0x32:
-            ret = virge->pci_regs[0x32];
+            ret = (!virge->onboard) ? virge->pci_regs[0x32] : 0x00;
             break;
         case 0x33:
-            ret = virge->pci_regs[0x33];
+            ret = (!virge->onboard) ? virge->pci_regs[0x33] : 0x00;
             break;
 
         case 0x34:
@@ -4131,7 +5182,7 @@ s3_virge_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
             s3_virge_updatemapping(virge);
             return;
         case 0x07:
-            virge->pci_regs[0x07] = val & 0x3e;
+            virge->pci_regs[0x07] &= ~(val & 0x30);
             return;
         case 0x0d:
             virge->pci_regs[0x0d] = val & 0xf8;
@@ -4145,6 +5196,8 @@ s3_virge_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
         case 0x30:
         case 0x32:
         case 0x33:
+            if (virge->onboard)
+                return;
             virge->pci_regs[addr] = val;
             if (virge->pci_regs[0x30] & 0x01) {
                 uint32_t biosaddr = (virge->pci_regs[0x32] << 16) | (virge->pci_regs[0x33] << 24);
@@ -4187,157 +5240,108 @@ s3_virge_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
     }
 }
 
+static void
+s3_virge_disable_handlers(virge_t *dev)
+{
+    io_removehandler(0x03c0, 0x0020, s3_virge_in, NULL, NULL,
+                     s3_virge_out, NULL, NULL, dev);
+
+    mem_mapping_disable(&dev->linear_mapping);
+    mem_mapping_disable(&dev->mmio_mapping);
+    mem_mapping_disable(&dev->new_mmio_mapping);
+    mem_mapping_disable(&dev->svga.mapping);
+    mem_mapping_disable(&dev->bios_rom.mapping);
+
+    /* Save all the mappings and the timers because they are part of linked lists. */
+    reset_state->linear_mapping   = dev->linear_mapping;
+    reset_state->mmio_mapping     = dev->mmio_mapping;
+    reset_state->new_mmio_mapping = dev->new_mmio_mapping;
+    reset_state->svga.mapping     = dev->svga.mapping;
+    reset_state->bios_rom.mapping = dev->bios_rom.mapping;
+
+    reset_state->svga.timer     = dev->svga.timer;
+    reset_state->svga.timer_8514 = dev->svga.timer_8514;
+    reset_state->svga.timer_xga = dev->svga.timer_xga;
+    reset_state->irq_timer      = dev->irq_timer;
+}
+
 static void
 s3_virge_reset(void *priv)
 {
-    virge_t *virge = (virge_t *) priv;
-    svga_t  *svga  = &virge->svga;
+    virge_t *dev = (virge_t *) priv;
 
-    memset(svga->crtc, 0x00, sizeof(svga->crtc));
-    svga->crtc[0]     = 63;
-    svga->crtc[6]     = 255;
-    svga->dispontime  = 1000ULL << 32;
-    svga->dispofftime = 1000ULL << 32;
-    svga->bpp         = 8;
+    if (reset_state != NULL) {
+        s3_virge_disable_handlers(dev);
+        dev->virge_busy       = 0;
+        dev->fifo_write_idx   = 0;
+        dev->fifo_read_idx    = 0;
+        dev->s3d_busy         = 0;
+        dev->s3d_write_idx    = 0;
+        dev->s3d_read_idx     = 0;
+        reset_state->pci_slot = dev->pci_slot;
 
-    io_removehandler(0x03c0, 0x0020, s3_virge_in, NULL, NULL, s3_virge_out, NULL, NULL, virge);
-    io_sethandler(0x03c0, 0x0020, s3_virge_in, NULL, NULL, s3_virge_out, NULL, NULL, virge);
-
-    memset(virge->pci_regs, 0x00, 256);
-
-    virge->pci_regs[PCI_REG_COMMAND] = 3;
-    virge->pci_regs[0x05]            = 0;
-    virge->pci_regs[0x06]            = 0;
-    virge->pci_regs[0x07]            = 2;
-    virge->pci_regs[0x32]            = 0x0c;
-    virge->pci_regs[0x3d]            = 1;
-    virge->pci_regs[0x3e]            = 4;
-    virge->pci_regs[0x3f]            = 0xff;
-
-    switch (virge->local) {
-        case S3_VIRGE_325:
-        case S3_DIAMOND_STEALTH3D_2000:
-            virge->fifo_slots_num = 8;
-            virge->svga.crtc[0x59] = 0x70;
-            break;
-        case S3_DIAMOND_STEALTH3D_3000:
-        case S3_STB_VELOCITY_3D:
-            virge->fifo_slots_num = 8;
-            virge->svga.crtc[0x59] = 0x70;
-            break;
-        case S3_VIRGE_GX2:
-        case S3_DIAMOND_STEALTH3D_4000:
-            virge->fifo_slots_num = 16;
-            virge->svga.crtc[0x6c] = 1;
-            virge->svga.crtc[0x59] = 0x70;
-            break;
-
-        case S3_TRIO_3D2X:
-            virge->fifo_slots_num = 16;
-            virge->svga.crtc[0x6c] = 1;
-            virge->svga.crtc[0x59] = 0x70;
-            break;
-
-        default:
-            virge->fifo_slots_num = 8;
-            virge->svga.crtc[0x6c] = 1;
-            virge->svga.crtc[0x59] = 0x70;
-            break;
+        *dev = *reset_state;
     }
-
-    if (virge->chip == S3_VIRGEGX2)
-        virge->svga.crtc[0x36] = 2 | (2 << 2) | (1 << 4) | (1 << 5);
-    else {
-        switch (virge->memory_size) {
-            case 2:
-                if (virge->chip == S3_VIRGEVX) {
-                    virge->svga.crtc[0x36] = (0 << 5);
-                } else
-                    virge->svga.crtc[0x36] = 2 | (0 << 2) | (1 << 4) | (4 << 5);
-                break;
-            case 8:
-                if (virge->chip == S3_TRIO3D2X)
-                    virge->svga.crtc[0x36] = 2 | (2 << 2) | (1 << 4) | (0 << 5);
-                else
-                    virge->svga.crtc[0x36] = (3 << 5);
-                break;
-            case 4:
-                if (virge->chip == S3_VIRGEVX)
-                    virge->svga.crtc[0x36] = (1 << 5);
-                else if (virge->chip == S3_TRIO3D2X)
-                    virge->svga.crtc[0x36] = 2 | (2 << 2) | (1 << 4) | (2 << 5);
-                else
-                    virge->svga.crtc[0x36] = 2 | (0 << 2) | (1 << 4) | (0 << 5);
-                break;
-
-            default:
-                break;
-        }
-        if (virge->local == S3_VIRGE_GX)
-            virge->svga.crtc[0x36] |= (1 << 2);
-    }
-
-    virge->svga.crtc[0x37] = 1 | (7 << 5);
-    virge->svga.crtc[0x53] = 8;
-
-    mem_mapping_disable(&virge->bios_rom.mapping);
-
-    s3_virge_updatemapping(virge);
-
-    mem_mapping_disable(&virge->mmio_mapping);
-    mem_mapping_disable(&virge->new_mmio_mapping);
 }
 
 static void *
 s3_virge_init(const device_t *info)
 {
-    const char *bios_fn;
-    virge_t    *virge = malloc(sizeof(virge_t));
+    const char *bios_fn = NULL;
+    virge_t    *virge   = (virge_t *) calloc(1, sizeof(virge_t));
+    reset_state         = calloc(1, sizeof(virge_t));
 
-    memset(virge, 0, sizeof(virge_t));
+    virge->type = (info->local & 0xff);
 
     virge->bilinear_enabled  = device_get_config_int("bilinear");
     virge->dithering_enabled = device_get_config_int("dithering");
-    if (info->local >= S3_VIRGE_GX2)
+    if (virge->type >= S3_VIRGE_GX2)
         virge->memory_size = 4;
     else
         virge->memory_size = device_get_config_int("memory");
 
-    switch (info->local) {
-        case S3_VIRGE_325:
-            bios_fn = ROM_VIRGE_325;
-            break;
-        case S3_DIAMOND_STEALTH3D_2000:
-            bios_fn = ROM_DIAMOND_STEALTH3D_2000;
-            break;
-        case S3_DIAMOND_STEALTH3D_3000:
-            bios_fn = ROM_DIAMOND_STEALTH3D_3000;
-            break;
-        case S3_STB_VELOCITY_3D:
-            bios_fn = ROM_STB_VELOCITY_3D;
-            break;
-        case S3_VIRGE_DX:
-            bios_fn = ROM_VIRGE_DX;
-            break;
-        case S3_DIAMOND_STEALTH3D_2000PRO:
-            bios_fn = ROM_DIAMOND_STEALTH3D_2000PRO;
-            break;
-        case S3_VIRGE_GX:
-            bios_fn = ROM_VIRGE_GX;
-            break;
-        case S3_VIRGE_GX2:
-            bios_fn = ROM_VIRGE_GX2;
-            break;
-        case S3_DIAMOND_STEALTH3D_4000:
-            bios_fn = ROM_DIAMOND_STEALTH3D_4000;
-            break;
-        case S3_TRIO_3D2X:
-            bios_fn = ROM_TRIO3D2X;
-            break;
-        default:
-            free(virge);
-            return NULL;
-    }
+    virge->color_key_enabled = !!device_get_config_int("colorkey");
+    virge->onboard = !!(info->local & 0x100);
+
+    if (!virge->onboard)
+        switch (virge->type) {
+            case S3_VIRGE_325:
+                bios_fn = ROM_VIRGE_325;
+                break;
+            case S3_DIAMOND_STEALTH3D_2000:
+                bios_fn = ROM_DIAMOND_STEALTH3D_2000;
+                break;
+            case S3_MIROCRYSTAL_3D:
+                bios_fn = ROM_MIROCRYSTAL_3D;
+                break;
+            case S3_DIAMOND_STEALTH3D_3000:
+                bios_fn = ROM_DIAMOND_STEALTH3D_3000;
+                break;
+            case S3_STB_VELOCITY_3D:
+                bios_fn = ROM_STB_VELOCITY_3D;
+                break;
+            case S3_VIRGE_DX:
+                bios_fn = ROM_VIRGE_DX;
+                break;
+            case S3_DIAMOND_STEALTH3D_2000PRO:
+                bios_fn = ROM_DIAMOND_STEALTH3D_2000PRO;
+                break;
+            case S3_VIRGE_GX:
+                bios_fn = ROM_VIRGE_GX;
+                break;
+            case S3_VIRGE_GX2:
+                bios_fn = ROM_VIRGE_GX2;
+                break;
+            case S3_DIAMOND_STEALTH3D_4000:
+                bios_fn = ROM_DIAMOND_STEALTH3D_4000;
+                break;
+            case S3_TRIO_3D2X:
+                bios_fn = ROM_TRIO3D2X;
+                break;
+            default:
+                free(virge);
+                return NULL;
+        }
 
     svga_init(info, &virge->svga, virge, virge->memory_size << 20,
               s3_virge_recalctimings,
@@ -4347,15 +5351,16 @@ s3_virge_init(const device_t *info)
     virge->svga.hwcursor.cur_ysize = 64;
 
     if (bios_fn != NULL) {
-        if (info->local == S3_VIRGE_GX2)
+        if (virge->type == S3_VIRGE_GX2)
             rom_init(&virge->bios_rom, bios_fn, 0xc0000, 0x10000, 0xffff, 0, MEM_MAPPING_EXTERNAL);
         else
             rom_init(&virge->bios_rom, bios_fn, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
+
+        mem_mapping_disable(&virge->bios_rom.mapping);
     }
 
-    mem_mapping_disable(&virge->bios_rom.mapping);
-
-    mem_mapping_add(&virge->linear_mapping, 0, 0, svga_read_linear,
+    mem_mapping_add(&virge->linear_mapping, 0, 0,
+                    svga_read_linear,
                     svga_readw_linear,
                     svga_readl_linear,
                     svga_write_linear,
@@ -4364,7 +5369,8 @@ s3_virge_init(const device_t *info)
                     NULL,
                     MEM_MAPPING_EXTERNAL,
                     &virge->svga);
-    mem_mapping_add(&virge->mmio_mapping, 0, 0, s3_virge_mmio_read,
+    mem_mapping_add(&virge->mmio_mapping, 0, 0,
+                    s3_virge_mmio_read,
                     s3_virge_mmio_read_w,
                     s3_virge_mmio_read_l,
                     s3_virge_mmio_write,
@@ -4373,7 +5379,8 @@ s3_virge_init(const device_t *info)
                     NULL,
                     MEM_MAPPING_EXTERNAL,
                     virge);
-    mem_mapping_add(&virge->new_mmio_mapping, 0, 0, s3_virge_mmio_read,
+    mem_mapping_add(&virge->new_mmio_mapping, 0, 0,
+                    s3_virge_mmio_read,
                     s3_virge_mmio_read_w,
                     s3_virge_mmio_read_l,
                     s3_virge_mmio_write,
@@ -4385,7 +5392,7 @@ s3_virge_init(const device_t *info)
 
     io_sethandler(0x03c0, 0x0020, s3_virge_in, NULL, NULL, s3_virge_out, NULL, NULL, virge);
 
-    virge->pci_regs[PCI_REG_COMMAND] = 3;
+    virge->pci_regs[PCI_REG_COMMAND] = 7;
     virge->pci_regs[0x05]            = 0;
     virge->pci_regs[0x06]            = 0;
     virge->pci_regs[0x07]            = 2;
@@ -4398,10 +5405,11 @@ s3_virge_init(const device_t *info)
     virge->virge_id  = 0xe1;
     virge->is_agp    = !!(info->flags & DEVICE_AGP);
 
-    switch (info->local) {
+    switch (virge->type) {
         case S3_VIRGE_325:
         case S3_DIAMOND_STEALTH3D_2000:
-            virge->fifo_slots_num = 8;
+        case S3_MIROCRYSTAL_3D:
+            virge->fifo_slots_num   = 8;
             virge->svga.decode_mask = (4 << 20) - 1;
             virge->virge_id_high    = 0x56;
             virge->virge_id_low     = 0x31;
@@ -4411,7 +5419,7 @@ s3_virge_init(const device_t *info)
             break;
         case S3_DIAMOND_STEALTH3D_3000:
         case S3_STB_VELOCITY_3D:
-            virge->fifo_slots_num = 8;
+            virge->fifo_slots_num   = 8;
             virge->svga.decode_mask = (8 << 20) - 1;
             virge->virge_id_high    = 0x88;
             virge->virge_id_low     = 0x3d;
@@ -4421,7 +5429,7 @@ s3_virge_init(const device_t *info)
             break;
         case S3_VIRGE_GX2:
         case S3_DIAMOND_STEALTH3D_4000:
-            virge->fifo_slots_num = 16;
+            virge->fifo_slots_num    = 16;
             virge->svga.decode_mask  = (4 << 20) - 1;
             virge->virge_id_high     = 0x8a;
             virge->virge_id_low      = 0x10;
@@ -4433,7 +5441,7 @@ s3_virge_init(const device_t *info)
             break;
 
         case S3_TRIO_3D2X:
-            virge->fifo_slots_num = 16;
+            virge->fifo_slots_num    = 16;
             virge->svga.decode_mask  = (8 << 20) - 1;
             virge->virge_id_high     = 0x8a;
             virge->virge_id_low      = 0x13;
@@ -4450,7 +5458,7 @@ s3_virge_init(const device_t *info)
             fallthrough;
 
         default:
-            virge->fifo_slots_num = 8;
+            virge->fifo_slots_num    = 8;
             virge->svga.decode_mask  = (4 << 20) - 1;
             virge->virge_id_high     = 0x8a;
             virge->virge_id_low      = 0x01;
@@ -4502,7 +5510,7 @@ s3_virge_init(const device_t *info)
             default:
                 break;
         }
-        if (info->local == S3_VIRGE_GX)
+        if (virge->type == S3_VIRGE_GX)
             virge->svga.crtc[0x36] |= (1 << 2);
     }
 
@@ -4519,16 +5527,23 @@ s3_virge_init(const device_t *info)
 
     virge->svga.force_old_addr = 1;
 
+    virge->render_thread_run  = 1;
     virge->wake_render_thread = thread_create_event();
     virge->wake_main_thread   = thread_create_event();
     virge->not_full_event     = thread_create_event();
-    virge->render_thread_run  = 1;
     virge->render_thread      = thread_create(render_thread, virge);
 
-    timer_add(&virge->tri_timer, s3_virge_tri_timer, virge, 0);
+    virge->fifo_thread_run     = 1;
+    virge->wake_fifo_thread    = thread_create_event();
+    virge->fifo_not_full_event = thread_create_event();
+    virge->fifo_thread         = thread_create(fifo_thread, virge);
+
+    timer_add(&virge->irq_timer, s3_virge_update_irq_timer, virge, 1);
 
     virge->local = info->local;
 
+    *reset_state = *virge;
+
     return virge;
 }
 
@@ -4544,11 +5559,20 @@ s3_virge_close(void *priv)
     thread_destroy_event(virge->wake_main_thread);
     thread_destroy_event(virge->wake_render_thread);
 
+    virge->fifo_thread_run = 0;
+    thread_set_event(virge->wake_fifo_thread);
+    thread_wait(virge->fifo_thread);
+    thread_destroy_event(virge->fifo_not_full_event);
+    thread_destroy_event(virge->wake_fifo_thread);
+
     svga_close(&virge->svga);
 
     ddc_close(virge->ddc);
     i2c_gpio_close(virge->i2c);
 
+    free(reset_state);
+    reset_state = NULL;
+
     free(virge);
 }
 
@@ -4564,6 +5588,12 @@ s3_virge_325_available(void)
     return rom_present(ROM_VIRGE_325);
 }
 
+static int
+s3_mirocrystal_3d_available(void)
+{
+    return rom_present(ROM_MIROCRYSTAL_3D);
+}
+
 static int
 s3_virge_988_diamond_available(void)
 {
@@ -4629,144 +5659,213 @@ s3_virge_force_redraw(void *priv)
 }
 
 static const device_config_t s3_virge_config[] = {
-  // clang-format off
+    // clang-format off
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 4,
-        .selection = {
-            {
-                .description = "2 MB",
-                .value = 2
-            },
-            {
-                .description = "4 MB",
-                .value = 4
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_int    = 4,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "2 MB", .value = 2 },
+            { .description = "4 MB", .value = 4 },
+            { .description = ""                 }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "bilinear",
-        .description = "Bilinear filtering",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "bilinear",
+        .description    = "Bilinear filtering",
+        .type           = CONFIG_BINARY,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dithering",
-        .description = "Dithering",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "colorkey",
+        .description    = "Video chroma-keying",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .type = CONFIG_END
-    }
-  // clang-format on
+        .name           = "dithering",
+        .description    = "Dithering",
+        .type           = CONFIG_BINARY,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
 };
 
 static const device_config_t s3_virge_stb_config[] = {
-  // clang-format off
+    // clang-format off
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 4,
-        .selection = {
-            {
-                .description = "2 MB",
-                .value = 2
-            },
-            {
-                .description = "4 MB",
-                .value = 4
-            },
-            {
-                .description = "8 MB",
-                .value = 8
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_int    = 4,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "2 MB", .value = 2 },
+            { .description = "4 MB", .value = 4 },
+            { .description = "8 MB", .value = 8 },
+            { .description = ""                 }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "bilinear",
-        .description = "Bilinear filtering",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "bilinear",
+        .description    = "Bilinear filtering",
+        .type           = CONFIG_BINARY,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dithering",
-        .description = "Dithering",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "colorkey",
+        .description    = "Video chroma-keying",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .type = CONFIG_END
-    }
-  // clang-format on
+        .name           = "dithering",
+        .description    = "Dithering",
+        .type           = CONFIG_BINARY,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
 };
 
 static const device_config_t s3_virge_357_config[] = {
-  // clang-format off
+    // clang-format off
     {
-        .name = "bilinear",
-        .description = "Bilinear filtering",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 4,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "2 MB", .value = 2 },
+            { .description = "4 MB", .value = 4 },
+            { .description = ""                 }
+        },
+        .bios           = { { 0 } }
+    },
+
+   {
+        .name           = "bilinear",
+        .description    = "Bilinear filtering",
+        .type           = CONFIG_BINARY,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dithering",
-        .description = "Dithering",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "colorkey",
+        .description    = "Video chroma-keying",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .type = CONFIG_END
-    }
-  // clang-format on
+        .name           = "dithering",
+        .description    = "Dithering",
+        .type           = CONFIG_BINARY,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
 };
 
 static const device_config_t s3_trio3d2x_config[] = {
-  // clang-format off
+    // clang-format off
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 4,
-        .selection = {
-            {
-                .description = "4 MB",
-                .value = 4
-            },
-            {
-                .description = "8 MB",
-                .value = 8
-            },
-            {
-                .description = ""
-            }
-        }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 4,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "4 MB", .value = 4 },
+            { .description = "8 MB", .value = 8 },
+            { .description = ""                 }
+        },
+        .bios           = { { 0 } }
     },
     {
-        .name = "bilinear",
-        .description = "Bilinear filtering",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "bilinear",
+        .description    = "Bilinear filtering",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dithering",
-        .description = "Dithering",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "colorkey",
+        .description    = "Video chroma-keying",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .type = CONFIG_END
-    }
-  // clang-format on
+        .name           = "dithering",
+        .description    = "Dithering",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
 };
 
 const device_t s3_virge_325_pci_device = {
@@ -4777,7 +5876,21 @@ const device_t s3_virge_325_pci_device = {
     .init          = s3_virge_init,
     .close         = s3_virge_close,
     .reset         = s3_virge_reset,
-    { .available = s3_virge_325_available },
+    .available     = s3_virge_325_available,
+    .speed_changed = s3_virge_speed_changed,
+    .force_redraw  = s3_virge_force_redraw,
+    .config        = s3_virge_config
+};
+
+const device_t s3_virge_325_onboard_pci_device = {
+    .name          = "S3 ViRGE (325) On-Board PCI",
+    .internal_name = "virge325_onboard_pci",
+    .flags         = DEVICE_PCI,
+    .local         = S3_VIRGE_325 | 0x100,
+    .init          = s3_virge_init,
+    .close         = s3_virge_close,
+    .reset         = s3_virge_reset,
+    .available     = NULL,
     .speed_changed = s3_virge_speed_changed,
     .force_redraw  = s3_virge_force_redraw,
     .config        = s3_virge_config
@@ -4791,7 +5904,21 @@ const device_t s3_diamond_stealth_2000_pci_device = {
     .init          = s3_virge_init,
     .close         = s3_virge_close,
     .reset         = s3_virge_reset,
-    { .available = s3_virge_325_diamond_available },
+    .available     = s3_virge_325_diamond_available,
+    .speed_changed = s3_virge_speed_changed,
+    .force_redraw  = s3_virge_force_redraw,
+    .config        = s3_virge_config
+};
+
+const device_t s3_mirocrystal_3d_pci_device = {
+    .name          = "S3 ViRGE (miroCRYSTAL 3D) PCI",
+    .internal_name = "mirocrystal_3d_pci",
+    .flags         = DEVICE_PCI,
+    .local         = S3_MIROCRYSTAL_3D,
+    .init          = s3_virge_init,
+    .close         = s3_virge_close,
+    .reset         = s3_virge_reset,
+    .available     = s3_mirocrystal_3d_available,
     .speed_changed = s3_virge_speed_changed,
     .force_redraw  = s3_virge_force_redraw,
     .config        = s3_virge_config
@@ -4805,7 +5932,7 @@ const device_t s3_diamond_stealth_3000_pci_device = {
     .init          = s3_virge_init,
     .close         = s3_virge_close,
     .reset         = s3_virge_reset,
-    { .available = s3_virge_988_diamond_available },
+    .available     = s3_virge_988_diamond_available,
     .speed_changed = s3_virge_speed_changed,
     .force_redraw  = s3_virge_force_redraw,
     .config        = s3_virge_stb_config
@@ -4819,7 +5946,7 @@ const device_t s3_stb_velocity_3d_pci_device = {
     .init          = s3_virge_init,
     .close         = s3_virge_close,
     .reset         = s3_virge_reset,
-    { .available = s3_virge_988_stb_available },
+    .available     = s3_virge_988_stb_available,
     .speed_changed = s3_virge_speed_changed,
     .force_redraw  = s3_virge_force_redraw,
     .config        = s3_virge_stb_config
@@ -4833,7 +5960,21 @@ const device_t s3_virge_375_pci_device = {
     .init          = s3_virge_init,
     .close         = s3_virge_close,
     .reset         = s3_virge_reset,
-    { .available = s3_virge_375_available },
+    .available     = s3_virge_375_available,
+    .speed_changed = s3_virge_speed_changed,
+    .force_redraw  = s3_virge_force_redraw,
+    .config        = s3_virge_config
+};
+
+const device_t s3_virge_375_onboard_pci_device = {
+    .name          = "S3 ViRGE/DX (375) On-Board PCI",
+    .internal_name = "virge375_onboard_pci",
+    .flags         = DEVICE_PCI,
+    .local         = S3_VIRGE_DX | 0x100,
+    .init          = s3_virge_init,
+    .close         = s3_virge_close,
+    .reset         = s3_virge_reset,
+    .available     = NULL,
     .speed_changed = s3_virge_speed_changed,
     .force_redraw  = s3_virge_force_redraw,
     .config        = s3_virge_config
@@ -4847,7 +5988,7 @@ const device_t s3_diamond_stealth_2000pro_pci_device = {
     .init          = s3_virge_init,
     .close         = s3_virge_close,
     .reset         = s3_virge_reset,
-    { .available = s3_virge_375_diamond_available },
+    .available     = s3_virge_375_diamond_available,
     .speed_changed = s3_virge_speed_changed,
     .force_redraw  = s3_virge_force_redraw,
     .config        = s3_virge_config
@@ -4861,7 +6002,7 @@ const device_t s3_virge_385_pci_device = {
     .init          = s3_virge_init,
     .close         = s3_virge_close,
     .reset         = s3_virge_reset,
-    { .available = s3_virge_385_available },
+    .available     = s3_virge_385_available,
     .speed_changed = s3_virge_speed_changed,
     .force_redraw  = s3_virge_force_redraw,
     .config        = s3_virge_config
@@ -4875,7 +6016,7 @@ const device_t s3_virge_357_pci_device = {
     .init          = s3_virge_init,
     .close         = s3_virge_close,
     .reset         = s3_virge_reset,
-    { .available = s3_virge_357_available },
+    .available     = s3_virge_357_available,
     .speed_changed = s3_virge_speed_changed,
     .force_redraw  = s3_virge_force_redraw,
     .config        = s3_virge_357_config
@@ -4889,21 +6030,7 @@ const device_t s3_virge_357_agp_device = {
     .init          = s3_virge_init,
     .close         = s3_virge_close,
     .reset         = s3_virge_reset,
-    { .available = s3_virge_357_available },
-    .speed_changed = s3_virge_speed_changed,
-    .force_redraw  = s3_virge_force_redraw,
-    .config        = s3_virge_357_config
-};
-
-const device_t s3_diamond_stealth_4000_pci_device = {
-    .name          = "S3 ViRGE/GX2 (Diamond Stealth 3D 4000) PCI",
-    .internal_name = "stealth3d_4000_pci",
-    .flags         = DEVICE_PCI,
-    .local         = S3_DIAMOND_STEALTH3D_4000,
-    .init          = s3_virge_init,
-    .close         = s3_virge_close,
-    .reset         = s3_virge_reset,
-    { .available = s3_virge_357_diamond_available },
+    .available     = s3_virge_357_available,
     .speed_changed = s3_virge_speed_changed,
     .force_redraw  = s3_virge_force_redraw,
     .config        = s3_virge_357_config
@@ -4917,7 +6044,7 @@ const device_t s3_diamond_stealth_4000_agp_device = {
     .init          = s3_virge_init,
     .close         = s3_virge_close,
     .reset         = s3_virge_reset,
-    { .available = s3_virge_357_diamond_available },
+    .available     = s3_virge_357_diamond_available,
     .speed_changed = s3_virge_speed_changed,
     .force_redraw  = s3_virge_force_redraw,
     .config        = s3_virge_357_config
@@ -4931,7 +6058,7 @@ const device_t s3_trio3d2x_pci_device = {
     .init          = s3_virge_init,
     .close         = s3_virge_close,
     .reset         = s3_virge_reset,
-    { .available = s3_trio3d2x_available },
+    .available     = s3_trio3d2x_available,
     .speed_changed = s3_virge_speed_changed,
     .force_redraw  = s3_virge_force_redraw,
     .config        = s3_trio3d2x_config
@@ -4945,7 +6072,7 @@ const device_t s3_trio3d2x_agp_device = {
     .init          = s3_virge_init,
     .close         = s3_virge_close,
     .reset         = s3_virge_reset,
-    { .available = s3_trio3d2x_available },
+    .available     = s3_trio3d2x_available,
     .speed_changed = s3_virge_speed_changed,
     .force_redraw  = s3_virge_force_redraw,
     .config        = s3_trio3d2x_config
diff --git a/src/video/vid_sc1502x_ramdac.c b/src/video/vid_sc1502x_ramdac.c
deleted file mode 100644
index 7315c65ad..000000000
--- a/src/video/vid_sc1502x_ramdac.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Emulation of a Sierra SC1502X RAMDAC.
- *
- *          Used by the TLIVESA1 driver for ET4000.
- *
- *
- *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
- *
- *          Copyright 2008-2018 Sarah Walker.
- *          Copyright 2016-2018 Miran Grca.
- */
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/device.h>
-#include <86box/mem.h>
-#include <86box/timer.h>
-#include <86box/video.h>
-#include <86box/vid_svga.h>
-#include <86box/plat_unused.h>
-
-typedef struct sc1502x_ramdac_t {
-    int     state;
-    uint8_t ctrl;
-    uint8_t idx;
-    uint8_t regs[256];
-    uint32_t pixel_mask;
-    uint8_t enable_ext;
-} sc1502x_ramdac_t;
-
-static void
-sc1502x_ramdac_bpp(uint8_t val, sc1502x_ramdac_t *ramdac, svga_t *svga)
-{
-    int oldbpp = 0;
-    if (val == 0xff)
-        return;
-    ramdac->ctrl = val;
-    oldbpp       = svga->bpp;
-    switch ((val & 1) | ((val & 0xc0) >> 5)) {
-        case 0:
-            svga->bpp = 8;
-            break;
-        case 2:
-        case 3:
-            switch (val & 0x20) {
-                case 0x00:
-                    svga->bpp = 32;
-                    break;
-                case 0x20:
-                    svga->bpp = 24;
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-        case 4:
-        case 5:
-            svga->bpp = 15;
-            break;
-        case 6:
-            svga->bpp = 16;
-            break;
-        case 7:
-            if (val & 4) {
-                switch (val & 0x20) {
-                    case 0x00:
-                        svga->bpp = 32;
-                        break;
-                    case 0x20:
-                        svga->bpp = 24;
-                        break;
-
-                    default:
-                        break;
-                }
-            } else
-                svga->bpp = 16;
-            break;
-
-        default:
-            break;
-    }
-    if (oldbpp != svga->bpp)
-        svga_recalctimings(svga);
-}
-
-void
-sc1502x_ramdac_out(uint16_t addr, uint8_t val, void *priv, svga_t *svga)
-{
-    sc1502x_ramdac_t *ramdac = (sc1502x_ramdac_t *) priv;
-
-    switch (addr) {
-        case 0x3C6:
-            if (ramdac->state == 0)
-                ramdac->enable_ext = (val == 0x10);
-
-            if (ramdac->state == 4) {
-                ramdac->state = 0;
-                sc1502x_ramdac_bpp(val, ramdac, svga);
-                return;
-            }
-            ramdac->state = 0;
-            break;
-        case 0x3C7:
-            if (ramdac->enable_ext) {
-                ramdac->idx = val;
-                return;
-            }
-            ramdac->state = 0;
-            break;
-        case 0x3C8:
-            if (ramdac->enable_ext) {
-                switch (ramdac->idx) {
-                    case 8:
-                        ramdac->regs[ramdac->idx] = val;
-                        svga_set_ramdac_type(svga, (ramdac->regs[ramdac->idx] & 1) ? RAMDAC_8BIT : RAMDAC_6BIT);
-                        break;
-                    case 0x0d:
-                        ramdac->pixel_mask = val & svga->dac_mask;
-                        break;
-                    case 0x0e:
-                        ramdac->pixel_mask |= ((val & svga->dac_mask) << 8);
-                        break;
-                    case 0x0f:
-                        ramdac->pixel_mask |= ((val & svga->dac_mask) << 16);
-                        break;
-                    default:
-                        ramdac->regs[ramdac->idx] = val;
-                        break;
-                }
-                return;
-            }
-            ramdac->state = 0;
-            break;
-        case 0x3C9:
-            if (ramdac->enable_ext)
-                return;
-            ramdac->state = 0;
-            break;
-
-        default:
-            break;
-    }
-    svga_out(addr, val, svga);
-}
-
-uint8_t
-sc1502x_ramdac_in(uint16_t addr, void *priv, svga_t *svga)
-{
-    sc1502x_ramdac_t *ramdac = (sc1502x_ramdac_t *) priv;
-    uint8_t           temp   = svga_in(addr, svga);
-
-    switch (addr) {
-        case 0x3C6:
-            if (ramdac->state == 4) {
-                ramdac->state = 0;
-                temp          = ramdac->ctrl;
-                break;
-            }
-            ramdac->state++;
-            break;
-        case 0x3C7:
-            ramdac->state = 0;
-            break;
-        case 0x3C8:
-            if (ramdac->enable_ext) {
-                switch (ramdac->idx) {
-                    case 9:
-                        temp = 0x53;
-                        break;
-                    case 0x0a:
-                        temp = 0x3a;
-                        break;
-                    case 0x0b:
-                        temp = 0xb1;
-                        break;
-                    case 0x0c:
-                        temp = 0x41;
-                        break;
-                    case 0x0d:
-                        temp = ramdac->pixel_mask & 0xff;
-                        break;
-                    case 0x0e:
-                        temp = ramdac->pixel_mask >> 8;
-                        break;
-                    case 0x0f:
-                        temp = ramdac->pixel_mask >> 16;
-                        break;
-                    default:
-                        temp = ramdac->regs[ramdac->idx];
-                        break;
-                }
-            } else
-                ramdac->state = 0;
-            break;
-        case 0x3C9:
-            if (ramdac->enable_ext)
-                temp = ramdac->idx;
-            else
-                ramdac->state = 0;
-            break;
-
-        default:
-            break;
-    }
-
-    return temp;
-}
-
-static void *
-sc1502x_ramdac_init(UNUSED(const device_t *info))
-{
-    sc1502x_ramdac_t *ramdac = (sc1502x_ramdac_t *) malloc(sizeof(sc1502x_ramdac_t));
-    memset(ramdac, 0, sizeof(sc1502x_ramdac_t));
-
-    ramdac->ctrl = 0;
-    ramdac->pixel_mask = 0xffffff;
-
-    return ramdac;
-}
-
-static void
-sc1502x_ramdac_close(void *priv)
-{
-    sc1502x_ramdac_t *ramdac = (sc1502x_ramdac_t *) priv;
-
-    if (ramdac)
-        free(ramdac);
-}
-
-const device_t sc1502x_ramdac_device = {
-    .name          = "Sierra SC1502x RAMDAC",
-    .internal_name = "sc1502x_ramdac",
-    .flags         = 0,
-    .local         = 0,
-    .init          = sc1502x_ramdac_init,
-    .close         = sc1502x_ramdac_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
diff --git a/src/video/vid_sigma.c b/src/video/vid_sigma.c
index 56f8b99aa..9f71773ad 100644
--- a/src/video/vid_sigma.c
+++ b/src/video/vid_sigma.c
@@ -151,14 +151,14 @@ typedef struct sigma_t {
 
     uint8_t sigmamode; /* Mode control register [0x2D8] */
 
-    uint16_t ma, maback;
+    uint16_t memaddr, memaddr_backup;
 
     int crtcreg; /* CRTC: Real selected register */
 
     int linepos, displine;
-    int sc, vc;
+    int scanline, vc;
     int cgadispon;
-    int con, coff, cursoron, cgablink;
+    int cursorvisible, cursoron, cgablink;
     int vsynctime, vadj;
     int oddeven;
 
@@ -234,6 +234,8 @@ sigma_out(uint16_t addr, uint8_t val, void *priv)
 
             case 0x2D8:
                 sigma->sigmamode = val;
+                sigma->fullchange = changeframecount;
+                sigma_recalctimings(sigma);
                 return;
             case 0x2D9:
                 sigma->sigma_ctl = val;
@@ -392,6 +394,7 @@ sigma_recalctimings(sigma_t *sigma)
     double disptime;
     double _dispontime;
     double _dispofftime;
+    double crtcconst = (cpuclock / 22440000.0 * (double) (1ULL << 32)) * 8.0;
 
     if (sigma->sigmamode & MODE_80COLS) {
         disptime    = (sigma->crtc[0] + 1) << 1;
@@ -402,8 +405,8 @@ sigma_recalctimings(sigma_t *sigma)
     }
 
     _dispofftime = disptime - _dispontime;
-    _dispontime *= CGACONST;
-    _dispofftime *= CGACONST;
+    _dispontime *= crtcconst;
+    _dispofftime *= crtcconst;
     sigma->dispontime  = (uint64_t) (_dispontime);
     sigma->dispofftime = (uint64_t) (_dispofftime);
 }
@@ -414,23 +417,23 @@ sigma_text80(sigma_t *sigma)
 {
     uint8_t        chr;
     uint8_t        attr;
-    uint16_t       ca = (sigma->crtc[15] | (sigma->crtc[14] << 8));
-    uint16_t       ma = ((sigma->ma & 0x3FFF) << 1);
+    uint16_t       cursoraddr = (sigma->crtc[15] | (sigma->crtc[14] << 8));
+    uint16_t       memaddr = ((sigma->memaddr & 0x3FFF) << 1);
     int            drawcursor;
     uint32_t       cols[4];
-    const uint8_t *vram = sigma->vram + (ma << 1);
+    const uint8_t *vram = sigma->vram + (memaddr << 1);
 
-    ca = ca << 1;
+    cursoraddr = cursoraddr << 1;
     if (sigma->sigma_ctl & CTL_CURSOR)
-        ++ca;
-    ca &= 0x3fff;
+        ++cursoraddr;
+    cursoraddr &= 0x3fff;
 
     /* The Sigma 400 seems to use screen widths stated in words
        (40 for 80-column, 20 for 40-column) */
     for (uint32_t x = 0; x < (sigma->crtc[1] << 1); x++) {
         chr        = vram[x << 1];
         attr       = vram[(x << 1) + 1];
-        drawcursor = ((ma == ca) && sigma->con && sigma->cursoron);
+        drawcursor = ((memaddr == cursoraddr) && sigma->cursorvisible && sigma->cursoron);
 
         if (!(sigma->sigmamode & MODE_NOBLINK)) {
             cols[1] = (attr & 15) | 16;
@@ -445,22 +448,22 @@ sigma_text80(sigma_t *sigma)
         if (drawcursor) {
             for (uint8_t c = 0; c < 8; c++) {
                 if (sigma->sigmamode & MODE_FONT16)
-                    buffer32->line[sigma->displine][(x << 3) + c + 8] = cols[(fontdatm[chr][sigma->sc & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 0xf;
+                    buffer32->line[sigma->displine][(x << 3) + c + 8] = cols[(fontdatm[chr][sigma->scanline & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 0xf;
                 else
-                    buffer32->line[sigma->displine][(x << 3) + c + 8] = cols[(fontdat[chr][sigma->sc & 7] & (1 << (c ^ 7))) ? 1 : 0] ^ 0xf;
+                    buffer32->line[sigma->displine][(x << 3) + c + 8] = cols[(fontdat[chr][sigma->scanline & 7] & (1 << (c ^ 7))) ? 1 : 0] ^ 0xf;
             }
         } else {
             for (uint8_t c = 0; c < 8; c++) {
                 if (sigma->sigmamode & MODE_FONT16)
-                    buffer32->line[sigma->displine][(x << 3) + c + 8] = cols[(fontdatm[chr][sigma->sc & 15] & (1 << (c ^ 7))) ? 1 : 0];
+                    buffer32->line[sigma->displine][(x << 3) + c + 8] = cols[(fontdatm[chr][sigma->scanline & 15] & (1 << (c ^ 7))) ? 1 : 0];
                 else
-                    buffer32->line[sigma->displine][(x << 3) + c + 8] = cols[(fontdat[chr][sigma->sc & 7] & (1 << (c ^ 7))) ? 1 : 0];
+                    buffer32->line[sigma->displine][(x << 3) + c + 8] = cols[(fontdat[chr][sigma->scanline & 7] & (1 << (c ^ 7))) ? 1 : 0];
             }
         }
-        ++ma;
+        ++memaddr;
     }
 
-    sigma->ma += sigma->crtc[1];
+    sigma->memaddr += sigma->crtc[1];
 }
 
 /* Render a line in 40-column text mode */
@@ -469,23 +472,23 @@ sigma_text40(sigma_t *sigma)
 {
     uint8_t        chr;
     uint8_t        attr;
-    uint16_t       ca = (sigma->crtc[15] | (sigma->crtc[14] << 8));
-    uint16_t       ma = ((sigma->ma & 0x3FFF) << 1);
+    uint16_t       cursoraddr = (sigma->crtc[15] | (sigma->crtc[14] << 8));
+    uint16_t       memaddr = ((sigma->memaddr & 0x3FFF) << 1);
     int            drawcursor;
     uint32_t       cols[4];
-    const uint8_t *vram = sigma->vram + ((ma << 1) & 0x3FFF);
+    const uint8_t *vram = sigma->vram + ((memaddr << 1) & 0x3FFF);
 
-    ca = ca << 1;
+    cursoraddr = cursoraddr << 1;
     if (sigma->sigma_ctl & CTL_CURSOR)
-        ++ca;
-    ca &= 0x3fff;
+        ++cursoraddr;
+    cursoraddr &= 0x3fff;
 
     /* The Sigma 400 seems to use screen widths stated in words
        (40 for 80-column, 20 for 40-column) */
     for (uint32_t x = 0; x < (sigma->crtc[1] << 1); x++) {
         chr        = vram[x << 1];
         attr       = vram[(x << 1) + 1];
-        drawcursor = ((ma == ca) && sigma->con && sigma->cursoron);
+        drawcursor = ((memaddr == cursoraddr) && sigma->cursorvisible && sigma->cursoron);
 
         if (!(sigma->sigmamode & MODE_NOBLINK)) {
             cols[1] = (attr & 15) | 16;
@@ -499,24 +502,24 @@ sigma_text40(sigma_t *sigma)
 
         if (drawcursor) {
             for (uint8_t c = 0; c < 8; c++) {
-                buffer32->line[sigma->displine][(x << 4) + 2 * c + 8] = buffer32->line[sigma->displine][(x << 4) + 2 * c + 9] = cols[(fontdatm[chr][sigma->sc & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 0xf;
+                buffer32->line[sigma->displine][(x << 4) + 2 * c + 8] = buffer32->line[sigma->displine][(x << 4) + 2 * c + 9] = cols[(fontdatm[chr][sigma->scanline & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 0xf;
             }
         } else {
             for (uint8_t c = 0; c < 8; c++) {
-                buffer32->line[sigma->displine][(x << 4) + 2 * c + 8] = buffer32->line[sigma->displine][(x << 4) + 2 * c + 9] = cols[(fontdatm[chr][sigma->sc & 15] & (1 << (c ^ 7))) ? 1 : 0];
+                buffer32->line[sigma->displine][(x << 4) + 2 * c + 8] = buffer32->line[sigma->displine][(x << 4) + 2 * c + 9] = cols[(fontdatm[chr][sigma->scanline & 15] & (1 << (c ^ 7))) ? 1 : 0];
             }
         }
-        ma++;
+        memaddr++;
     }
 
-    sigma->ma += sigma->crtc[1];
+    sigma->memaddr += sigma->crtc[1];
 }
 
 /* Draw a line in the 640x400 graphics mode */
 static void
 sigma_gfx400(sigma_t *sigma)
 {
-    const uint8_t *vram = &sigma->vram[((sigma->ma << 1) & 0x1FFF) + (sigma->sc & 3) * 0x2000];
+    const uint8_t *vram = &sigma->vram[((sigma->memaddr << 1) & 0x1FFF) + (sigma->scanline & 3) * 0x2000];
     uint8_t        plane[4];
     uint8_t        col;
 
@@ -532,7 +535,7 @@ sigma_gfx400(sigma_t *sigma)
             buffer32->line[sigma->displine][(x << 3) + c + 8] = col;
         }
         if (x & 1)
-            ++sigma->ma;
+            ++sigma->memaddr;
     }
 }
 
@@ -544,7 +547,7 @@ sigma_gfx400(sigma_t *sigma)
 static void
 sigma_gfx200(sigma_t *sigma)
 {
-    const uint8_t *vram = &sigma->vram[((sigma->ma << 1) & 0x1FFF) + (sigma->sc & 2) * 0x1000];
+    const uint8_t *vram = &sigma->vram[((sigma->memaddr << 1) & 0x1FFF) + (sigma->scanline & 2) * 0x1000];
     uint8_t        plane[4];
     uint8_t        col;
 
@@ -561,7 +564,7 @@ sigma_gfx200(sigma_t *sigma)
         }
 
         if (x & 1)
-            ++sigma->ma;
+            ++sigma->memaddr;
     }
 }
 
@@ -569,7 +572,7 @@ sigma_gfx200(sigma_t *sigma)
 static void
 sigma_gfx4col(sigma_t *sigma)
 {
-    const uint8_t *vram = &sigma->vram[((sigma->ma << 1) & 0x1FFF) + (sigma->sc & 2) * 0x1000];
+    const uint8_t *vram = &sigma->vram[((sigma->memaddr << 1) & 0x1FFF) + (sigma->scanline & 2) * 0x1000];
     uint8_t        plane[4];
     uint8_t        mask;
     uint8_t        col;
@@ -592,7 +595,7 @@ sigma_gfx4col(sigma_t *sigma)
         }
 
         if (x & 1)
-            ++sigma->ma;
+            ++sigma->memaddr;
     }
 }
 
@@ -604,15 +607,15 @@ sigma_poll(void *priv)
     int      c;
     int      oldvc;
     uint32_t cols[4];
-    int      oldsc;
+    int      scanline_old;
 
     if (!sigma->linepos) {
         timer_advance_u64(&sigma->timer, sigma->dispofftime);
         sigma->sigmastat |= STATUS_RETR_H;
         sigma->linepos = 1;
-        oldsc          = sigma->sc;
+        scanline_old          = sigma->scanline;
         if ((sigma->crtc[8] & 3) == 3)
-            sigma->sc = ((sigma->sc << 1) + sigma->oddeven) & 7;
+            sigma->scanline = ((sigma->scanline << 1) + sigma->oddeven) & 7;
         if (sigma->cgadispon) {
             if (sigma->displine < sigma->firstline) {
                 sigma->firstline = sigma->displine;
@@ -660,8 +663,8 @@ sigma_poll(void *priv)
 
         video_process_8(x, sigma->displine);
 
-        sigma->sc = oldsc;
-        if (sigma->vc == sigma->crtc[7] && !sigma->sc)
+        sigma->scanline = scanline_old;
+        if (sigma->vc == sigma->crtc[7] && !sigma->scanline)
             sigma->sigmastat |= STATUS_RETR_V;
         sigma->displine++;
         if (sigma->displine >= 560)
@@ -674,25 +677,24 @@ sigma_poll(void *priv)
             if (!sigma->vsynctime)
                 sigma->sigmastat &= ~STATUS_RETR_V;
         }
-        if (sigma->sc == (sigma->crtc[11] & 31) || ((sigma->crtc[8] & 3) == 3 && sigma->sc == ((sigma->crtc[11] & 31) >> 1))) {
-            sigma->con  = 0;
-            sigma->coff = 1;
+        if (sigma->scanline == (sigma->crtc[11] & 31) || ((sigma->crtc[8] & 3) == 3 && sigma->scanline == ((sigma->crtc[11] & 31) >> 1))) {
+            sigma->cursorvisible  = 0;
         }
-        if ((sigma->crtc[8] & 3) == 3 && sigma->sc == (sigma->crtc[9] >> 1))
-            sigma->maback = sigma->ma;
+        if ((sigma->crtc[8] & 3) == 3 && sigma->scanline == (sigma->crtc[9] >> 1))
+            sigma->memaddr_backup = sigma->memaddr;
         if (sigma->vadj) {
-            sigma->sc++;
-            sigma->sc &= 31;
-            sigma->ma = sigma->maback;
+            sigma->scanline++;
+            sigma->scanline &= 31;
+            sigma->memaddr = sigma->memaddr_backup;
             sigma->vadj--;
             if (!sigma->vadj) {
                 sigma->cgadispon = 1;
-                sigma->ma = sigma->maback = (sigma->crtc[13] | (sigma->crtc[12] << 8)) & 0x3fff;
-                sigma->sc                 = 0;
+                sigma->memaddr = sigma->memaddr_backup = (sigma->crtc[13] | (sigma->crtc[12] << 8)) & 0x3fff;
+                sigma->scanline                 = 0;
             }
-        } else if (sigma->sc == sigma->crtc[9]) {
-            sigma->maback = sigma->ma;
-            sigma->sc     = 0;
+        } else if (sigma->scanline == sigma->crtc[9]) {
+            sigma->memaddr_backup = sigma->memaddr;
+            sigma->scanline     = 0;
             oldvc         = sigma->vc;
             sigma->vc++;
             sigma->vc &= 127;
@@ -706,7 +708,7 @@ sigma_poll(void *priv)
                 if (!sigma->vadj)
                     sigma->cgadispon = 1;
                 if (!sigma->vadj)
-                    sigma->ma = sigma->maback = (sigma->crtc[13] | (sigma->crtc[12] << 8)) & 0x3fff;
+                    sigma->memaddr = sigma->memaddr_backup = (sigma->crtc[13] | (sigma->crtc[12] << 8)) & 0x3fff;
                 if ((sigma->crtc[10] & 0x60) == 0x20)
                     sigma->cursoron = 0;
                 else
@@ -769,14 +771,14 @@ sigma_poll(void *priv)
                 sigma->oddeven ^= 1;
             }
         } else {
-            sigma->sc++;
-            sigma->sc &= 31;
-            sigma->ma = sigma->maback;
+            sigma->scanline++;
+            sigma->scanline &= 31;
+            sigma->memaddr = sigma->memaddr_backup;
         }
         if (sigma->cgadispon)
             sigma->sigmastat &= ~STATUS_RETR_H;
-        if (sigma->sc == (sigma->crtc[10] & 31) || ((sigma->crtc[8] & 3) == 3 && sigma->sc == ((sigma->crtc[10] & 31) >> 1)))
-            sigma->con = 1;
+        if (sigma->scanline == (sigma->crtc[10] & 31) || ((sigma->crtc[8] & 3) == 3 && sigma->scanline == ((sigma->crtc[10] & 31) >> 1)))
+            sigma->cursorvisible = 1;
     }
 }
 
@@ -860,100 +862,59 @@ sigma_speed_changed(void *priv)
 device_config_t sigma_config[] = {
   // clang-format off
     {
-        .name = "rgb_type",
-        .description = "RGB type",
-        .type = CONFIG_SELECTION,
-        .default_int = 0,
-        .selection = {
-            {
-                .description = "Color",
-                .value = 0
-            },
-            {
-                .description = "Green Monochrome",
-                .value = 1
-            },
-            {
-                .description = "Amber Monochrome",
-                .value = 2
-            },
-            {
-                .description = "Gray Monochrome",
-                .value = 3
-            },
-            {
-                .description = "Color (no brown)",
-                .value = 4
-            },
-            {
-                .description = ""
-            }
-        }
-    },
-    {
-        .name = "enable_nmi",
-        .description = "Enable NMI for CGA emulation",
-        .type = CONFIG_BINARY,
-        .default_int = 1
-    },
-    {
-        .name = "bios_addr",
-        .description = "BIOS Address",
-        .type = CONFIG_HEX20,
-        .default_int = 0xc0000,
-        .selection = {
-            {
-                .description = "C000H",
-                .value = 0xc0000
-            },
-            {
-                .description = "C800H",
-                .value = 0xc8000
-            },
-            {
-                .description = "CC00H",
-                .value = 0xcc000
-            },
-            {
-                .description = "D000H",
-                .value = 0xd0000
-            },
-            {
-                .description = "D400H",
-                .value = 0xd4000
-            },
-            {
-                .description = "D800H",
-                .value = 0xd8000
-            },
-            {
-                .description = "DC00H",
-                .value = 0xdc000
-            },
-            {
-                .description = "E000H",
-                .value = 0xe0000
-            },
-            {
-                .description = "E400H",
-                .value = 0xe4000
-            },
-            {
-                .description = "E800H",
-                .value = 0xe8000
-            },
-            {
-                .description = "EC00H",
-                .value = 0xec000
-            },
-            {
-                .description = ""
-            }
+        .name           = "rgb_type",
+        .description    = "RGB type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Color",            .value = 0 },
+            { .description = "Green Monochrome", .value = 1 },
+            { .description = "Amber Monochrome", .value = 2 },
+            { .description = "Gray Monochrome",  .value = 3 },
+            { .description = "Color (no brown)", .value = 4 },
+            { .description = ""                             }
         },
+        .bios           = { { 0 } }
     },
     {
-        .type = CONFIG_END
-    }
+        .name           = "enable_nmi",
+        .description    = "Enable NMI for CGA emulation",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bios_addr",
+        .description    = "BIOS address",
+        .type           = CONFIG_HEX20,
+        .default_string = NULL,
+        .default_int    = 0xc0000,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "C000H", .value = 0xc0000 },
+            { .description = "C800H", .value = 0xc8000 },
+            { .description = "CC00H", .value = 0xcc000 },
+            { .description = "D000H", .value = 0xd0000 },
+            { .description = "D400H", .value = 0xd4000 },
+            { .description = "D800H", .value = 0xd8000 },
+            { .description = "DC00H", .value = 0xdc000 },
+            { .description = "E000H", .value = 0xe0000 },
+            { .description = "E400H", .value = 0xe4000 },
+            { .description = "E800H", .value = 0xe8000 },
+            { .description = "EC00H", .value = 0xec000 },
+            { .description = ""                        }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
@@ -965,7 +926,7 @@ const device_t sigma_device = {
     .init          = sigma_init,
     .close         = sigma_close,
     .reset         = NULL,
-    { .available = sigma_available },
+    .available     = sigma_available,
     .speed_changed = sigma_speed_changed,
     .force_redraw  = NULL,
     .config        = sigma_config
diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c
index d982a1ada..302a26f23 100644
--- a/src/video/vid_svga.c
+++ b/src/video/vid_svga.c
@@ -46,6 +46,7 @@
 #include <86box/vid_xga_device.h>
 
 void svga_doblit(int wx, int wy, svga_t *svga);
+void svga_poll(void *priv);
 
 svga_t *svga_8514;
 
@@ -57,7 +58,6 @@ uint8_t svga_rotate[8][256];
 /*Primary SVGA device. As multiple video cards are not yet supported this is the
   only SVGA device.*/
 static svga_t *svga_pri;
-int            vga_on;
 
 #ifdef ENABLE_SVGA_LOG
 int svga_do_log = ENABLE_SVGA_LOG;
@@ -83,13 +83,78 @@ svga_get_pri(void)
     return svga_pri;
 }
 
+void
+svga_set_poll(svga_t *svga)
+{
+    svga_log("SVGA Timer activated, enabled?=%x.\n", timer_is_enabled(&svga->timer));
+    timer_set_callback(&svga->timer, svga_poll);
+    if (!timer_is_enabled(&svga->timer))
+        timer_enable(&svga->timer);
+}
+
 void
 svga_set_override(svga_t *svga, int val)
 {
+    ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+    xga_t     *xga = (xga_t *) svga->xga;
+    uint8_t    ret_poll = 0;
+
     if (svga->override && !val)
         svga->fullchange = svga->monitor->mon_changeframecount;
+
     svga->override = val;
 
+    svga_log("Override=%x.\n", val);
+    if (ibm8514_active && (svga->dev8514 != NULL))
+        ret_poll |= 1;
+
+    if (xga_active && (svga->xga != NULL))
+        ret_poll |= 2;
+
+    if (svga->override)
+        svga_set_poll(svga);
+    else {
+        switch (ret_poll) {
+            case 0:
+            default:
+                svga_set_poll(svga);
+                break;
+
+            case 1:
+                if (ibm8514_active && (svga->dev8514 != NULL)) {
+                    if (dev->on)
+                        ibm8514_set_poll(svga);
+                    else
+                        svga_set_poll(svga);
+                } else
+                    svga_set_poll(svga);
+                break;
+
+            case 2:
+                if (xga_active && (svga->xga != NULL)) {
+                    if (xga->on)
+                        xga_set_poll(svga);
+                    else
+                        svga_set_poll(svga);
+                } else
+                    svga_set_poll(svga);
+                break;
+
+            case 3:
+                if (ibm8514_active && (svga->dev8514 != NULL) && xga_active && (svga->xga != NULL))  {
+                    if (dev->on)
+                        ibm8514_set_poll(svga);
+                    else if (xga->on)
+                        xga_set_poll(svga);
+                    else
+                        svga_set_poll(svga);
+                } else
+                    svga_set_poll(svga);
+                break;
+        }
+    }
+
+#ifdef OVERRIDE_OVERSCAN
     if (!val) {
         /* Override turned off, restore overscan X and Y per the CRTC. */
         svga->monitor->mon_overscan_y = (svga->rowcount + 1) << 1;
@@ -104,6 +169,7 @@ svga_set_override(svga_t *svga, int val)
     } else
         svga->monitor->mon_overscan_x = svga->monitor->mon_overscan_y = 16;
     /* Override turned off, fix overcan X and Y to 16. */
+#endif
 }
 
 void
@@ -116,8 +182,10 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
     uint8_t    index;
     uint8_t    pal4to16[16] = { 0, 7, 0x38, 0x3f, 0, 3, 4, 0x3f, 0, 2, 4, 0x3e, 0, 3, 5, 0x3f };
 
-    if (!dev && (addr >= 0x2ea) && (addr <= 0x2ed))
-        return;
+    if ((addr >= 0x2ea) && (addr <= 0x2ed)) {
+        if (!dev)
+            return;
+    }
 
     switch (addr) {
         case 0x2ea:
@@ -143,13 +211,13 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
                 case 2:
                     index                 = dev->dac_addr & 0xff;
                     dev->dac_b = val;
-                    svga->vgapal[index].r = dev->dac_r;
-                    svga->vgapal[index].g = dev->dac_g;
-                    svga->vgapal[index].b = dev->dac_b;
+                    dev->_8514pal[index].r = dev->dac_r;
+                    dev->_8514pal[index].g = dev->dac_g;
+                    dev->_8514pal[index].b = dev->dac_b;
                     if (svga->ramdac_type == RAMDAC_8BIT)
-                        dev->pallook[index] = makecol32(svga->vgapal[index].r, svga->vgapal[index].g, svga->vgapal[index].b);
+                        dev->pallook[index] = makecol32(dev->_8514pal[index].r, dev->_8514pal[index].g, dev->_8514pal[index].b);
                     else
-                        dev->pallook[index] = makecol32(video_6to8[svga->vgapal[index].r & 0x3f], video_6to8[svga->vgapal[index].g & 0x3f], video_6to8[svga->vgapal[index].b & 0x3f]);
+                        dev->pallook[index] = makecol32(video_6to8[dev->_8514pal[index].r & 0x3f], video_6to8[dev->_8514pal[index].g & 0x3f], video_6to8[dev->_8514pal[index].b & 0x3f]);
                     dev->dac_pos  = 0;
                     dev->dac_addr = (dev->dac_addr + 1) & 0xff;
                     break;
@@ -166,6 +234,7 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
                 if ((val & 0x20) != svga->attr_palette_enable) {
                     svga->fullchange          = 3;
                     svga->attr_palette_enable = val & 0x20;
+                    svga_log("Write Port %03x palette enable=%02x.\n", addr, svga->attr_palette_enable);
                     svga_recalctimings(svga);
                 }
             } else {
@@ -190,12 +259,16 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
                 /* Recalculate timings on change of attribute register 0x11
                    (overscan border color) too. */
                 if (svga->attraddr == 0x10) {
-                    if (o != val)
+                    if (o != val) {
+                        svga_log("ATTR10.\n");
                         svga_recalctimings(svga);
+                    }
                 } else if (svga->attraddr == 0x11) {
                     svga->overscan_color = svga->pallook[svga->attrregs[0x11]];
-                    if (o != val)
+                    if (o != val) {
+                        svga_log("ATTR11.\n");
                         svga_recalctimings(svga);
+                    }
                 } else if (svga->attraddr == 0x12) {
                     if ((val & 0xf) != svga->plane_mask)
                         svga->fullchange = svga->monitor->mon_changeframecount;
@@ -207,21 +280,20 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
         case 0x3c2:
             svga->miscout  = val;
             svga->vidclock = val & 4;
-            io_removehandler(0x03a0, 0x0020, svga->video_in, NULL, NULL, svga->video_out, NULL, NULL, svga->priv);
-            if (!(val & 1))
-                io_sethandler(0x03a0, 0x0020, svga->video_in, NULL, NULL, svga->video_out, NULL, NULL, svga->priv);
+            if (svga->priv_parent == NULL) {
+                io_removehandler(0x03a0, 0x0020, svga->video_in, NULL, NULL, svga->video_out, NULL, NULL, svga->priv);
+                if (!(val & 1))
+                    io_sethandler(0x03a0, 0x0020, svga->video_in, NULL, NULL, svga->video_out, NULL, NULL, svga->priv);
+            }
             svga_recalctimings(svga);
             break;
         case 0x3c3:
             if (xga_active && xga)
                 xga->on = (val & 0x01) ? 0 : 1;
-            if (ibm8514_active && dev) {
-                dev->on[0] = (val & 0x01) ? 0 : 1;
-                dev->on[1] = dev->on[0];
-            }
+            if (ibm8514_active && dev)
+                dev->on = (val & 0x01) ? 0 : 1;
 
-            svga_log("3C3: VGA ON = %d.\n", val & 0x01);
-            vga_on = val & 0x01;
+            svga_log("Write Port 3C3=%x.\n", val & 0x01);
             svga_recalctimings(svga);
             break;
         case 0x3c4:
@@ -232,13 +304,16 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
                 return;
             o                                  = svga->seqregs[svga->seqaddr & 0xf];
             svga->seqregs[svga->seqaddr & 0xf] = val;
-            if (o != val && (svga->seqaddr & 0xf) == 1)
+            if (o != val && (svga->seqaddr & 0xf) == 1) {
+                svga_log("SEQADDR1 write1.\n");
                 svga_recalctimings(svga);
+            }
             switch (svga->seqaddr & 0xf) {
                 case 1:
                     if (svga->scrblank && !(val & 0x20))
                         svga->fullchange = 3;
                     svga->scrblank = (svga->scrblank & ~0x20) | (val & 0x20);
+                    svga_log("SEQADDR1 write2.\n");
                     svga_recalctimings(svga);
                     break;
                 case 2:
@@ -255,7 +330,9 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
                 case 4:
                     svga->chain2_write = !(val & 4);
                     svga->chain4       = (svga->chain4 & ~8) | (val & 8);
-                    svga->fast         = (svga->gdcreg[8] == 0xff && !(svga->gdcreg[3] & 0x18) && !svga->gdcreg[1]) && ((svga->chain4 && (svga->packed_chain4 || svga->force_old_addr)) || svga->fb_only) && !(svga->adv_flags & FLAG_ADDR_BY8);
+                    svga->fast         = (svga->gdcreg[8] == 0xff && !(svga->gdcreg[3] & 0x18) && !svga->gdcreg[1]) &&
+                                        ((svga->chain4 && (svga->packed_chain4 || svga->force_old_addr)) || svga->fb_only) &&
+                                        !(svga->adv_flags & FLAG_ADDR_BY8);
                     break;
 
                 default:
@@ -269,7 +346,7 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
         case 0x3c8:
             svga->dac_pos    = 0;
             svga->dac_status = addr & 0x03;
-            svga->dac_addr   = (val + (addr & 0x01)) & 255;
+            svga->dac_addr   = (val + (addr & 0x01)) & 0xff;
             break;
         case 0x3c9:
             if (svga->adv_flags & FLAG_RAMDAC_SHIFT)
@@ -285,7 +362,7 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
                     svga->dac_pos++;
                     break;
                 case 2:
-                    index                 = svga->dac_addr & 255;
+                    index                 = svga->dac_addr & 0xff;
                     svga->dac_b           = val;
                     svga->vgapal[index].r = svga->dac_r;
                     svga->vgapal[index].g = svga->dac_g;
@@ -295,7 +372,7 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
                     else
                         svga->pallook[index] = makecol32(video_6to8[svga->vgapal[index].r & 0x3f], video_6to8[svga->vgapal[index].g & 0x3f], video_6to8[svga->vgapal[index].b & 0x3f]);
                     svga->dac_pos  = 0;
-                    svga->dac_addr = (svga->dac_addr + 1) & 255;
+                    svga->dac_addr = (svga->dac_addr + 1) & 0xff;
                     break;
 
                 default:
@@ -329,6 +406,10 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
                             case 0x4: /*64k at A0000*/
                                 mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
                                 svga->banked_mask = 0xffff;
+                                if (xga_active && (svga->xga != NULL)) {
+                                    xga->on = 0;
+                                    mem_mapping_set_handler(&svga->mapping, svga->read, svga->readw, svga->readl, svga->write, svga->writew, svga->writel);
+                                }
                                 break;
                             case 0x8: /*32k at B0000*/
                                 mem_mapping_set_addr(&svga->mapping, 0xb0000, 0x08000);
@@ -352,9 +433,13 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
                     break;
             }
             svga->gdcreg[svga->gdcaddr & 15] = val;
-            svga->fast                       = (svga->gdcreg[8] == 0xff && !(svga->gdcreg[3] & 0x18) && !svga->gdcreg[1]) && ((svga->chain4 && (svga->packed_chain4 || svga->force_old_addr)) || svga->fb_only);
-            if (((svga->gdcaddr & 15) == 5 && (val ^ o) & 0x70) || ((svga->gdcaddr & 15) == 6 && (val ^ o) & 1))
+            svga->fast                       = (svga->gdcreg[8] == 0xff && !(svga->gdcreg[3] & 0x18) && !svga->gdcreg[1]) &&
+                                               ((svga->chain4 && (svga->packed_chain4 || svga->force_old_addr)) || svga->fb_only) &&
+                                                !(svga->adv_flags & FLAG_ADDR_BY8);;
+            if (((svga->gdcaddr & 15) == 5 && (val ^ o) & 0x70) || ((svga->gdcaddr & 15) == 6 && (val ^ o) & 1)) {
+                svga_log("GDCADDR%02x recalc.\n", svga->gdcaddr & 0x0f);
                 svga_recalctimings(svga);
+            }
             break;
         case 0x3da:
             svga->fcr = val;
@@ -370,11 +455,14 @@ svga_in(uint16_t addr, void *priv)
 {
     svga_t    *svga = (svga_t *) priv;
     ibm8514_t *dev = (ibm8514_t *) svga->dev8514;
+    xga_t     *xga = (xga_t *) svga->xga;
     uint8_t    index;
     uint8_t    ret = 0xff;
 
-    if (!dev && (addr >= 0x2ea) && (addr <= 0x2ed))
-        return ret;
+    if ((addr >= 0x2ea) && (addr <= 0x2ed)) {
+        if (!dev)
+            return ret;
+    }
 
     switch (addr) {
         case 0x2ea:
@@ -392,24 +480,24 @@ svga_in(uint16_t addr, void *priv)
                 case 0:
                     dev->dac_pos++;
                     if (svga->ramdac_type == RAMDAC_8BIT)
-                        ret = svga->vgapal[index].r;
+                        ret = dev->_8514pal[index].r;
                     else
-                        ret = svga->vgapal[index].r & 0x3f;
+                        ret = dev->_8514pal[index].r & 0x3f;
                     break;
                 case 1:
                     dev->dac_pos++;
                     if (svga->ramdac_type == RAMDAC_8BIT)
-                        ret = svga->vgapal[index].g;
+                        ret = dev->_8514pal[index].g;
                     else
-                        ret = svga->vgapal[index].g & 0x3f;
+                        ret = dev->_8514pal[index].g & 0x3f;
                     break;
                 case 2:
                     dev->dac_pos  = 0;
                     dev->dac_addr = (dev->dac_addr + 1) & 0xff;
                     if (svga->ramdac_type == RAMDAC_8BIT)
-                        ret = svga->vgapal[index].b;
+                        ret = dev->_8514pal[index].b;
                     else
-                        ret = svga->vgapal[index].b & 0x3f;
+                        ret = dev->_8514pal[index].b & 0x3f;
                     break;
 
                 default:
@@ -424,13 +512,37 @@ svga_in(uint16_t addr, void *priv)
             ret = svga->attrregs[svga->attraddr];
             break;
         case 0x3c2:
-            if ((svga->vgapal[0].r + svga->vgapal[0].g + svga->vgapal[0].b) >= 0x4e)
-                ret = 0;
-            else
-                ret = 0x10;
+            if (svga->cable_connected) {
+                if ((svga->vgapal[0].r + svga->vgapal[0].g + svga->vgapal[0].b) >= 0x4e)
+                    ret = 0;
+                else
+                    ret = 0x10;
+            /* Monitor is not connected to the planar VGA if the PS/55 Display Adapter is installed. */
+            } else {
+                /*
+                   The IBM PS/55 Display Adapter has own Monitor Type Detection bit in the different I/O port (I/O 3E0h, 3E1h).
+                   When the monitor cable is connected to the Display Adapter, the port 3C2h returns the value as 'no cable connection'.
+                   The POST of PS/55 has an extra code. If the monitor is not detected on the planar VGA,
+                   it reads the POS data in NVRAM set by the reference diskette, and writes the BIOS Data Area (Mem 487h, 489h).
+                   MONCHK.EXE in the reference diskette uses both I/O ports to determine the monitor type, updates the NVRAM and BDA.
+                */
+                if (svga->vgapal[0].r >= 10 || svga->vgapal[0].g >= 10 || svga->vgapal[0].b >= 10)
+                    ret = 0;
+                else
+                    ret = 0x10;
+            }
             break;
         case 0x3c3:
-            ret = vga_on;
+            ret = 0x01;
+            if (xga_active && xga) {
+                if (xga->on)
+                    ret = 0x00;
+            }
+            if (ibm8514_active && dev) {
+                if (dev->on)
+                    ret = 0x00;
+            }
+            svga_log("VGA read: (0x%04x) ret=%02x.\n", addr, ret);
             break;
         case 0x3c4:
             ret = svga->seqaddr;
@@ -448,7 +560,7 @@ svga_in(uint16_t addr, void *priv)
             ret = svga->dac_addr;
             break;
         case 0x3c9:
-            index = (svga->dac_addr - 1) & 255;
+            index = (svga->dac_addr - 1) & 0xff;
             switch (svga->dac_pos) {
                 case 0:
                     svga->dac_pos++;
@@ -466,7 +578,7 @@ svga_in(uint16_t addr, void *priv)
                     break;
                 case 2:
                     svga->dac_pos  = 0;
-                    svga->dac_addr = (svga->dac_addr + 1) & 255;
+                    svga->dac_addr = (svga->dac_addr + 1) & 0xff;
                     if (svga->ramdac_type == RAMDAC_8BIT)
                         ret = svga->vgapal[index].b;
                     else
@@ -526,6 +638,11 @@ svga_in(uint16_t addr, void *priv)
             break;
     }
 
+    if ((addr >= 0x3c6) && (addr <= 0x3c9))
+        svga_log("VGA IN addr=%03x, temp=%02x.\n", addr, ret);
+    else if ((addr >= 0x2ea) && (addr <= 0x2ed))
+        svga_log("8514/A IN addr=%03x, temp=%02x.\n", addr, ret);
+
     return ret;
 }
 
@@ -541,19 +658,20 @@ svga_set_ramdac_type(svga_t *svga, int type)
         for (int c = 0; c < 256; c++) {
             if (ibm8514_active && dev) {
                 if (svga->ramdac_type == RAMDAC_8BIT)
-                    dev->pallook[c] = makecol32(svga->vgapal[c].r, svga->vgapal[c].g, svga->vgapal[c].b);
+                    dev->pallook[c] = makecol32(dev->_8514pal[c].r, dev->_8514pal[c].g, dev->_8514pal[c].b);
                 else
-                    dev->pallook[c] = makecol32((svga->vgapal[c].r & 0x3f) * 4,
-                                                 (svga->vgapal[c].g & 0x3f) * 4,
-                                                 (svga->vgapal[c].b & 0x3f) * 4);
+                    dev->pallook[c] = makecol32((dev->_8514pal[c].r & 0x3f) * 4,
+                                                 (dev->_8514pal[c].g & 0x3f) * 4,
+                                                 (dev->_8514pal[c].b & 0x3f) * 4);
             }
             if (xga_active && xga) {
                 if (svga->ramdac_type == RAMDAC_8BIT)
-                    xga->pallook[c] = makecol32(svga->vgapal[c].r, svga->vgapal[c].g, svga->vgapal[c].b);
-                else
-                    xga->pallook[c] = makecol32((svga->vgapal[c].r & 0x3f) * 4,
-                                                 (svga->vgapal[c].g & 0x3f) * 4,
-                                                 (svga->vgapal[c].b & 0x3f) * 4);
+                    xga->pallook[c] = makecol32(xga->xgapal[c].r, xga->xgapal[c].g, xga->xgapal[c].b);
+                else {
+                    xga->pallook[c] = makecol32((xga->xgapal[c].r & 0x3f) * 4,
+                                                 (xga->xgapal[c].g & 0x3f) * 4,
+                                                 (xga->xgapal[c].b & 0x3f) * 4);
+                }
             }
             if (svga->ramdac_type == RAMDAC_8BIT)
                 svga->pallook[c] = makecol32(svga->vgapal[c].r, svga->vgapal[c].g, svga->vgapal[c].b);
@@ -569,22 +687,36 @@ void
 svga_recalctimings(svga_t *svga)
 {
     ibm8514_t       *dev = (ibm8514_t *) svga->dev8514;
+    xga_t           *xga = (xga_t *) svga->xga;
+    uint8_t          set_timer = 0;
     double           crtcconst;
     double           _dispontime;
     double           _dispofftime;
     double           disptime;
-    double           crtcconst8514;
-    double           _dispontime8514;
-    double           _dispofftime8514;
-    double           disptime8514;
+    double           crtcconst8514 = 0.0;
+    double           _dispontime8514 = 0.0;
+    double           _dispofftime8514 = 0.0;
+    double           disptime8514 = 0.0;
+    double           crtcconst_xga = 0.0;
+    double           _dispontime_xga = 0.0;
+    double           _dispofftime_xga = 0.0;
+    double           disptime_xga = 0.0;
 #ifdef ENABLE_SVGA_LOG
     int              vsyncend;
-    int              vblankend;
-    int              hdispstart;
     int              hdispend;
+    int              hdispstart;
     int              hsyncstart;
     int              hsyncend;
 #endif
+    int              old_monitor_overscan_x = svga->monitor->mon_overscan_x;
+    int              old_monitor_overscan_y = svga->monitor->mon_overscan_y;
+
+    if (svga->adv_flags & FLAG_PRECISETIME) {
+#ifdef USE_DYNAREC
+        if (cpu_use_dynarec)
+            update_tsc();
+#endif
+    }
 
     svga->vtotal      = svga->crtc[6];
     svga->dispend     = svga->crtc[0x12];
@@ -623,7 +755,8 @@ svga_recalctimings(svga_t *svga)
     svga->vblankstart++;
 
     svga->hdisp = svga->crtc[1];
-    svga->hdisp++;
+    if (svga->crtc[1] & 1)
+        svga->hdisp++;
 
     svga->htotal = svga->crtc[0];
     /* +5 has been verified by Sergi to be correct - +6 must have been an off by one error. */
@@ -637,7 +770,7 @@ svga_recalctimings(svga_t *svga)
 
     svga->interlace = 0;
 
-    svga->ma_latch = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+    svga->memaddr_latch = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
     svga->ca_adj   = 0;
 
     svga->rowcount = svga->crtc[9] & 0x1f;
@@ -659,31 +792,34 @@ svga_recalctimings(svga_t *svga)
         }
 
         if (!(svga->gdcreg[6] & 1) && !(svga->attrregs[0x10] & 1)) { /*Text mode*/
-            if (svga->seqregs[1] & 8) {                              /*40 column*/
+            if (svga->seqregs[1] & 8)                               /*40 column*/
                 svga->render = svga_render_text_40;
-            } else {
+            else
                 svga->render = svga_render_text_80;
-            }
+
             svga->hdisp_old = svga->hdisp;
         } else {
             svga->hdisp_old = svga->hdisp;
 
             if ((svga->bpp <= 8) || ((svga->gdcreg[5] & 0x60) <= 0x20)) {
                 if ((svga->gdcreg[5] & 0x60) == 0x00) {
-                    if (svga->seqregs[1] & 8) /*Low res (320)*/
+                    if (svga->seqregs[1] & 8) { /*Low res (320)*/
                         svga->render = svga_render_4bpp_lowres;
-                    else
+                        svga_log("4 bpp low res.\n");
+                    } else
                         svga->render = svga_render_4bpp_highres;
                 } else if ((svga->gdcreg[5] & 0x60) == 0x20) {
-                    if (svga->seqregs[1] & 8) /*Low res (320)*/
+                    if (svga->seqregs[1] & 8) { /*Low res (320)*/
                         svga->render = svga_render_2bpp_lowres;
-                    else
+                        svga_log("2 bpp low res.\n");
+                    } else
                         svga->render = svga_render_2bpp_highres;
                 } else {
                     svga->map8 = svga->pallook;
-                    if (svga->lowres) /*Low res (320)*/
+                    if (svga->lowres) { /*Low res (320)*/
                         svga->render = svga_render_8bpp_lowres;
-                    else
+                        svga_log("8 bpp low res.\n");
+                    } else
                         svga->render = svga_render_8bpp_highres;
                 }
             } else {
@@ -750,7 +886,7 @@ svga_recalctimings(svga_t *svga)
     } else
         svga->monitor->mon_overscan_x = 16;
 
-    svga->hblankstart    = svga->crtc[2] + 1;
+    svga->hblankstart    = svga->crtc[2];
     svga->hblank_end_val = (svga->crtc[3] & 0x1f) | ((svga->crtc[5] & 0x80) ? 0x20 : 0x00);
     svga->hblank_end_mask = 0x0000003f;
 
@@ -773,18 +909,30 @@ svga_recalctimings(svga_t *svga)
     } else
         svga->dots_per_clock = 1;
 
+    svga->multiplier = 1.0;
+
     if (svga->recalctimings_ex)
         svga->recalctimings_ex(svga);
 
     if (ibm8514_active && (svga->dev8514 != NULL)) {
-        if ((dev->local & 0xff) == 0x00)
+        if (IBM_8514A || ATI_8514A_ULTRA)
             ibm8514_recalctimings(svga);
     }
 
     if (xga_active && (svga->xga != NULL))
         xga_recalctimings(svga);
 
-    if (!svga->hoverride) {
+    svga->vblankend = (svga->vblankstart & 0xffffff80) | (svga->crtc[0x16] & 0x7f);
+    if (svga->vblankend <= svga->vblankstart)
+        svga->vblankend += 0x00000080;
+
+    if (svga->hoverride || svga->override) {
+        if (svga->hdisp >= 2048)
+            svga->monitor->mon_overscan_x = 0;
+
+        svga->y_add = (svga->monitor->mon_overscan_y >> 1);
+        svga->left_overscan = svga->x_add = (svga->monitor->mon_overscan_x >> 1);
+    } else {
         uint32_t dot = svga->hblankstart;
         uint32_t adj_dot = svga->hblankstart;
         /* Verified with both the Voodoo 3 and the S3 cards: compare 7 bits if bit 7 is set,
@@ -792,16 +940,22 @@ svga_recalctimings(svga_t *svga)
         uint32_t eff_mask = (svga->hblank_end_val & ~0x0000003f) ? svga->hblank_end_mask : 0x0000003f;
         svga->hblank_sub = 0;
 
-        svga_log("Blank: %04i-%04i, Total: %04i, Mask: %02X\n", svga->hblankstart, svga->hblank_end_val,
-                 svga->htotal, eff_mask);
+        svga_log("HDISP=%d, CRTC1+1=%d, Blank: %04i-%04i, Total: %04i, "
+                 "Mask: %02X, ADJ_DOT=%04i.\n", svga->hdisp, svga->crtc[1] + 1,
+                 svga->hblankstart, svga->hblank_end_val,
+                 svga->htotal, eff_mask, adj_dot);
 
-        while (1) {
+        while (adj_dot < (svga->htotal << 1)) {
             if (dot == svga->htotal)
                 dot = 0;
 
             if (adj_dot >= svga->htotal)
                 svga->hblank_sub++;
 
+            svga_log("Loop: adjdot=%d, htotal=%d, dotmask=%02x, "
+                     "hblankendvalmask=%02x, blankendval=%02x.\n", adj_dot,
+                     svga->htotal, dot & eff_mask, svga->hblank_end_val & eff_mask,
+                     svga->hblank_end_val);
             if ((dot & eff_mask) == (svga->hblank_end_val & eff_mask))
                 break;
 
@@ -809,59 +963,107 @@ svga_recalctimings(svga_t *svga)
             adj_dot++;
         }
 
+        uint32_t hd = svga->hdisp;
         svga->hdisp -= (svga->hblank_sub * svga->dots_per_clock);
 
-        if (ibm8514_active && (svga->dev8514 != NULL)) {
-            if (dev->on[0] || dev->on[1]) {
-		        uint32_t dot8514 = dev->h_blankstart;
-		        uint32_t adj_dot8514 = dev->h_blankstart;
-		        uint32_t eff_mask8514 = 0x0000003f;
-		        dev->hblank_sub = 0;
+        svga->left_overscan = svga->x_add = (svga->htotal - adj_dot - 1) * svga->dots_per_clock;
+        svga->monitor->mon_overscan_x = svga->x_add + (svga->hblankstart * svga->dots_per_clock) - hd + svga->dots_per_clock;
+        /* Compensate for the HDISP code above. */
+        if (svga->crtc[1] & 1)
+            svga->monitor->mon_overscan_x++;
 
-		        while (1) {
-		            if (dot8514 == dev->h_total)
-		                dot = 0;
+        if ((svga->hdisp >= 2048) || (svga->left_overscan < 0)) {
+            svga->left_overscan = svga->x_add = 0;
+            svga->monitor->mon_overscan_x = 0;
+        }
 
-		            if (adj_dot8514 >= dev->h_total)
-		                dev->hblank_sub++;
+        /* - 1 because + 1 but also - 2 to compensate for the + 2 added to vtotal above. */
+        svga->y_add = svga->vtotal - svga->vblankend - 1;
+        svga->monitor->mon_overscan_y = svga->y_add + abs(svga->vblankstart - svga->dispend);
 
-		            if ((dot8514 & eff_mask8514) == (dev->h_blank_end_val & eff_mask8514))
-		                break;
-
-		            dot8514++;
-		            adj_dot8514++;
-		        }
-
-		        dev->h_disp -= dev->hblank_sub;
-            }
+        if ((svga->dispend >= 2048) || (svga->y_add < 0)) {
+            svga->y_add = 0;
+            svga->monitor->mon_overscan_y = 0;
         }
     }
 
-    if (svga->hdisp >= 2048)
-        svga->monitor->mon_overscan_x = 0;
+#if TBD
+    if (ibm8514_active && (svga->dev8514 != NULL)) {
+        if (dev->on) {
+            uint32_t _8514_dot = dev->h_sync_start;
+            uint32_t _8514_adj_dot = dev->h_sync_start;
+            uint32_t _8514_eff_mask = (dev->h_blank_end_val & ~0x0000001f) ? dev->h_blank_end_mask : 0x0000001f;
+            dev->h_blank_sub = 0;
 
-    svga->y_add = (svga->monitor->mon_overscan_y >> 1);
-    svga->x_add = (svga->monitor->mon_overscan_x >> 1);
+            mach_log("8514/A: HDISP=%d, HDISPED=%d, Blank: %04i-%04i, Total: %04i, "
+                     "Mask: %02X, ADJ_DOT=%04i.\n", dev->hdisp, (dev->hdisped + 1) << 3,
+                     dev->h_sync_start, dev->h_blank_end_val,
+                     dev->h_total, _8514_eff_mask, _8514_adj_dot);
 
-    if (svga->vblankstart < svga->dispend)
+            while (_8514_adj_dot < (dev->h_total << 1)) {
+                if (_8514_dot == dev->h_total)
+                    _8514_dot = 0;
+
+                if (_8514_adj_dot >= dev->h_total)
+                    dev->h_blank_sub++;
+
+                mach_log("8514/A: Loop: adjdot=%d, htotal=%d, dotmask=%02x, "
+                         "hblankendvalmask=%02x, blankendval=%02x.\n", adj_dot,
+                         dev->h_total, _8514_dot & _8514_eff_mask, dev->h_blank_end_val & _8514_eff_mask,
+                         dev->h_blank_end_val);
+                if ((_8514_dot & _8514_eff_mask) == (dev->h_blank_end_val & _8514_eff_mask))
+                    break;
+
+                _8514_dot++;
+                _8514_adj_dot++;
+            }
+
+            uint32_t _8514_hd = dev->hdisp;
+            dev->hdisp -= dev->h_blank_sub;
+
+            svga->left_overscan = svga->x_add = (dev->h_total - _8514_adj_dot - 1) << 3;
+            svga->monitor->mon_overscan_x = svga->x_add + (dev->h_sync_start << 3) - _8514_hd + 8;
+            svga->monitor->mon_overscan_x++;
+
+            if ((dev->hdisp >= 2048) || (svga->left_overscan < 0)) {
+                svga->left_overscan = svga->x_add = 0;
+                svga->monitor->mon_overscan_x = 0;
+            }
+
+            /* - 1 because + 1 but also - 2 to compensate for the + 2 added to vtotal above. */
+            svga->y_add = svga->vtotal - svga->vblankend - 1;
+            svga->monitor->mon_overscan_y = svga->y_add + abs(svga->vblankstart - svga->dispend);
+
+            if ((dev->dispend >= 2048) || (svga->y_add < 0)) {
+                svga->y_add = 0;
+                svga->monitor->mon_overscan_y = 0;
+            }
+        }
+    }
+#endif
+
+    if (svga->vblankstart < svga->dispend) {
+        svga_log("DISPEND > VBLANKSTART.\n");
         svga->dispend = svga->vblankstart;
+    }
 
     crtcconst = svga->clock * svga->char_width;
     if (ibm8514_active && (svga->dev8514 != NULL)) {
-        if (dev->on[0] || dev->on[1])
-            crtcconst8514 = svga->clock8514;
+        if (dev->on)
+            crtcconst8514 = svga->clock_8514 * 8;
+    }
+    if (xga_active && (svga->xga != NULL)) {
+        if (xga->on)
+            crtcconst_xga = svga->clock_xga * 8;
     }
 
 #ifdef ENABLE_SVGA_LOG
     vsyncend = (svga->vsyncstart & 0xfffffff0) | (svga->crtc[0x11] & 0x0f);
     if (vsyncend <= svga->vsyncstart)
         vsyncend += 0x00000010;
-    vblankend = (svga->vblankstart & 0xffffff80) | (svga->crtc[0x16] & 0x7f);
-    if (vblankend <= svga->vblankstart)
-        vblankend += 0x00000080;
 
-    hdispstart = ((svga->crtc[3] >> 5) & 3);
     hdispend   = svga->crtc[1] + 1;
+    hdispstart = ((svga->crtc[3] >> 5) & 3);
     hsyncstart = svga->crtc[4] + ((svga->crtc[5] >> 5) & 3) + 1;
     hsyncend   = (hsyncstart & 0xffffffe0) | (svga->crtc[5] & 0x1f);
     if (hsyncend <= hsyncstart)
@@ -885,17 +1087,24 @@ svga_recalctimings(svga_t *svga)
              "\n"
              "\n",
              svga->vtotal, svga->dispend, svga->vsyncstart, vsyncend,
-             svga->vblankstart, vblankend,
+             svga->vblankstart, svga->vblankend,
              svga->htotal, hdispstart, hdispend, hsyncstart, hsyncend,
              svga->hblankstart, svga->hblankend);
 
-    disptime    = svga->htotal;
+    disptime    = svga->htotal * svga->multiplier;
     _dispontime = svga->hdisp_time;
 
     if (ibm8514_active && (svga->dev8514 != NULL)) {
-        if (dev->on[0] || dev->on[1]) {
-            disptime8514 = dev->htotal;
-            _dispontime8514 = dev->hdisped;
+        if (dev->on) {
+            disptime8514 = dev->h_total;
+            _dispontime8514 = dev->h_disp_time;
+        }
+    }
+
+    if (xga_active && (svga->xga != NULL)) {
+        if (xga->on) {
+            disptime_xga = xga->h_total;
+            _dispontime_xga = xga->h_disp_time;
         }
     }
 
@@ -915,25 +1124,85 @@ svga_recalctimings(svga_t *svga)
     if (svga->dispofftime < TIMER_USEC)
         svga->dispofftime = TIMER_USEC;
 
-    if (ibm8514_active && (svga->dev8514 != NULL)) {
-        if (dev->on[0] || dev->on[1]) {
-            _dispofftime8514 = disptime8514 - _dispontime8514;
-            _dispontime8514 *= crtcconst8514;
-            _dispofftime8514 *= crtcconst8514;
+    if (ibm8514_active && (svga->dev8514 != NULL))
+        set_timer |= 1;
 
-            dev->dispontime  = (uint64_t) (_dispontime8514);
-            dev->dispofftime = (uint64_t) (_dispofftime8514);
-            if (dev->dispontime < TIMER_USEC)
-                dev->dispontime = TIMER_USEC;
-            if (dev->dispofftime < TIMER_USEC)
-                dev->dispofftime = TIMER_USEC;
+    if (xga_active && (svga->xga != NULL))
+        set_timer |= 2;
 
-            timer_disable(&svga->timer);
-            timer_enable(&svga->timer8514);
-        } else {
-            timer_disable(&svga->timer8514);
-            timer_enable(&svga->timer);
-        }
+    switch (set_timer) {
+        default:
+        case 0: /*VGA only*/
+            svga_set_poll(svga);
+            break;
+
+        case 1: /*Plus 8514/A*/
+            if (dev->on) {
+                _dispofftime8514 = disptime8514 - _dispontime8514;
+                svga_log("DISPTIME8514=%lf, off=%lf, DISPONTIME8514=%lf, CRTCCONST8514=%lf.\n", disptime8514, _dispofftime8514, _dispontime8514, crtcconst8514);
+                _dispontime8514 *= crtcconst8514;
+                _dispofftime8514 *= crtcconst8514;
+
+                dev->dispontime  = (uint64_t) (_dispontime8514);
+                dev->dispofftime = (uint64_t) (_dispofftime8514);
+                if (dev->dispontime < TIMER_USEC)
+                    dev->dispontime = TIMER_USEC;
+                if (dev->dispofftime < TIMER_USEC)
+                    dev->dispofftime = TIMER_USEC;
+
+                ibm8514_set_poll(svga);
+            } else
+                svga_set_poll(svga);
+            break;
+
+        case 2: /*Plus XGA*/
+            if (xga->on) {
+                _dispofftime_xga = disptime_xga - _dispontime_xga;
+                _dispontime_xga *= crtcconst_xga;
+                _dispofftime_xga *= crtcconst_xga;
+
+                xga->dispontime  = (uint64_t) (_dispontime_xga);
+                xga->dispofftime = (uint64_t) (_dispofftime_xga);
+                if (xga->dispontime < TIMER_USEC)
+                    xga->dispontime = TIMER_USEC;
+                if (xga->dispofftime < TIMER_USEC)
+                    xga->dispofftime = TIMER_USEC;
+
+                xga_set_poll(svga);
+            } else
+                svga_set_poll(svga);
+            break;
+
+        case 3: /*Plus 8514/A and XGA*/
+            if (dev->on) {
+                _dispofftime8514 = disptime8514 - _dispontime8514;
+                _dispontime8514 *= crtcconst8514;
+                _dispofftime8514 *= crtcconst8514;
+
+                dev->dispontime  = (uint64_t) (_dispontime8514);
+                dev->dispofftime = (uint64_t) (_dispofftime8514);
+                if (dev->dispontime < TIMER_USEC)
+                    dev->dispontime = TIMER_USEC;
+                if (dev->dispofftime < TIMER_USEC)
+                    dev->dispofftime = TIMER_USEC;
+
+                ibm8514_set_poll(svga);
+            } else if (xga->on) {
+                _dispofftime_xga = disptime_xga - _dispontime_xga;
+                _dispontime_xga *= crtcconst_xga;
+                _dispofftime_xga *= crtcconst_xga;
+
+                xga->dispontime  = (uint64_t) (_dispontime_xga);
+                xga->dispofftime = (uint64_t) (_dispofftime_xga);
+                if (xga->dispontime < TIMER_USEC)
+                    xga->dispontime = TIMER_USEC;
+                if (xga->dispofftime < TIMER_USEC)
+                    xga->dispofftime = TIMER_USEC;
+
+                xga_set_poll(svga);
+            } else
+                svga_set_poll(svga);
+            break;
     }
 
     if (!svga->force_old_addr)
@@ -942,13 +1211,76 @@ svga_recalctimings(svga_t *svga)
     /* Inform the user interface of any DPMS mode changes. */
     if (svga->dpms) {
         if (!svga->dpms_ui) {
+            /* Make sure to black out the entire screen to avoid lingering image. */
+            int y_add   = enable_overscan ? svga->monitor->mon_overscan_y : 0;
+            int x_add   = enable_overscan ? svga->monitor->mon_overscan_x : 0;
+            int y_start = enable_overscan ? 0 : (svga->monitor->mon_overscan_y >> 1);
+            int x_start = enable_overscan ? 0 : (svga->monitor->mon_overscan_x >> 1);
+            video_wait_for_buffer_monitor(svga->monitor_index);
+            memset(svga->monitor->target_buffer->dat, 0, (size_t) svga->monitor->target_buffer->w * svga->monitor->target_buffer->h * 4);
+            video_blit_memtoscreen_monitor(x_start, y_start, svga->monitor->mon_xsize + x_add, svga->monitor->mon_ysize + y_add, svga->monitor_index);
+            video_wait_for_buffer_monitor(svga->monitor_index);
             svga->dpms_ui = 1;
-            ui_sb_set_text_w(plat_get_string(IDS_2143));
+            ui_sb_set_text_w(plat_get_string(STRING_MONITOR_SLEEP));
         }
     } else if (svga->dpms_ui) {
         svga->dpms_ui = 0;
         ui_sb_set_text_w(NULL);
     }
+
+    if (enable_overscan && (svga->monitor->mon_overscan_x != old_monitor_overscan_x || svga->monitor->mon_overscan_y != old_monitor_overscan_y))
+        video_force_resize_set_monitor(1, svga->monitor_index);
+
+    svga->force_shifter_bypass = 0;
+    if ((svga->hdisp == 320) && (svga->dispend >= 400) && !svga->override && (svga->render != svga_render_8bpp_clone_highres)) {
+        svga->hdisp <<= 1;
+        if (svga->render == svga_render_16bpp_highres)
+            svga->render = svga_render_16bpp_lowres;
+        else if (svga->render == svga_render_15bpp_highres)
+            svga->render = svga_render_15bpp_lowres;
+        else if (svga->render == svga_render_15bpp_mix_highres)
+            svga->render = svga_render_15bpp_mix_lowres;
+        else if (svga->render == svga_render_24bpp_highres)
+            svga->render = svga_render_24bpp_lowres;
+        else if (svga->render == svga_render_32bpp_highres)
+            svga->render = svga_render_32bpp_lowres;
+        else if (svga->render == svga_render_8bpp_highres) {
+            svga->render = svga_render_8bpp_lowres;
+            svga->force_shifter_bypass = 1;
+        }
+        else
+            svga->hdisp >>= 1;
+    }
+
+    svga->monitor->mon_interlace = 0;
+    if (!svga->override) {
+        switch (set_timer) {
+            default:
+            case 0: /*VGA only*/
+                svga->monitor->mon_interlace = !!svga->interlace;
+                break;
+            case 1: /*Plus 8514/A*/
+                if (dev->on)
+                    svga->monitor->mon_interlace = !!dev->interlace;
+                else
+                    svga->monitor->mon_interlace = !!svga->interlace;
+                break;
+            case 2: /*Plus XGA*/
+                if (xga->on)
+                    svga->monitor->mon_interlace = !!xga->interlace;
+                else
+                    svga->monitor->mon_interlace = !!svga->interlace;
+                break;
+            case 3: /*Plus 8514/A and XGA*/
+                if (dev->on)
+                    svga->monitor->mon_interlace = !!dev->interlace;
+                else if (xga->on)
+                    svga->monitor->mon_interlace = !!xga->interlace;
+                else
+                    svga->monitor->mon_interlace = !!svga->interlace;
+                break;
+        }
+    }
 }
 
 static void
@@ -961,12 +1293,8 @@ svga_do_render(svga_t *svga)
     }
 
     if (!svga->override) {
+        svga->render_line_offset = svga->start_retrace_latch - svga->crtc[0x4];
         svga->render(svga);
-
-        svga->x_add = (svga->monitor->mon_overscan_x >> 1);
-        svga_render_overscan_left(svga);
-        svga_render_overscan_right(svga);
-        svga->x_add = (svga->monitor->mon_overscan_x >> 1) - svga->scrollcache;
     }
 
     if (svga->overlay_on) {
@@ -979,7 +1307,7 @@ svga_do_render(svga_t *svga)
 
     if (svga->dac_hwcursor_on) {
         if (!svga->override && svga->dac_hwcursor_draw)
-            svga->dac_hwcursor_draw(svga, svga->displine + svga->y_add);
+            svga->dac_hwcursor_draw(svga, (svga->displine + svga->y_add + ((svga->dac_hwcursor_latch.y >= 0) ? 0 : svga->dac_hwcursor_latch.y)) & 2047);
         svga->dac_hwcursor_on--;
         if (svga->dac_hwcursor_on && svga->interlace)
             svga->dac_hwcursor_on--;
@@ -987,19 +1315,25 @@ svga_do_render(svga_t *svga)
 
     if (svga->hwcursor_on) {
         if (!svga->override && svga->hwcursor_draw)
-            svga->hwcursor_draw(svga, svga->displine + svga->y_add);
+            svga->hwcursor_draw(svga, (svga->displine + svga->y_add + ((svga->hwcursor_latch.y >= 0) ? 0 : svga->hwcursor_latch.y)) & 2047);
+
         svga->hwcursor_on--;
         if (svga->hwcursor_on && svga->interlace)
             svga->hwcursor_on--;
     }
+
+    if (!svga->override) {
+        svga->x_add = svga->left_overscan;
+        svga_render_overscan_left(svga);
+        svga_render_overscan_right(svga);
+        svga->x_add = svga->left_overscan - svga->scrollcache;
+    }
 }
 
 void
 svga_poll(void *priv)
 {
     svga_t    *svga = (svga_t *) priv;
-    ibm8514_t *dev  = (ibm8514_t *) svga->dev8514;
-    xga_t     *xga  = (xga_t *) svga->xga;
     uint32_t   x;
     uint32_t   blink_delay;
     int        wx;
@@ -1007,32 +1341,24 @@ svga_poll(void *priv)
     int        ret;
     int        old_ma;
 
-    if (!svga->override) {
-        if (xga_active && xga && xga->on) {
-            if ((xga->disp_cntl_2 & 7) >= 2) {
-                xga_poll(xga, svga);
-                return;
-            }
-        }
-    }
-
+    svga_log("SVGA Poll.\n");
     if (!svga->linepos) {
-        if (svga->displine == svga->hwcursor_latch.y && svga->hwcursor_latch.ena) {
+        if (svga->displine == ((svga->hwcursor_latch.y < 0) ? 0 : svga->hwcursor_latch.y) && svga->hwcursor_latch.ena) {
             svga->hwcursor_on      = svga->hwcursor_latch.cur_ysize - svga->hwcursor_latch.yoff;
             svga->hwcursor_oddeven = 0;
         }
 
-        if (svga->displine == (svga->hwcursor_latch.y + 1) && svga->hwcursor_latch.ena && svga->interlace) {
+        if (svga->displine == (((svga->hwcursor_latch.y < 0) ? 0 : svga->hwcursor_latch.y) + 1) && svga->hwcursor_latch.ena && svga->interlace) {
             svga->hwcursor_on      = svga->hwcursor_latch.cur_ysize - (svga->hwcursor_latch.yoff + 1);
             svga->hwcursor_oddeven = 1;
         }
 
-        if (svga->displine == svga->dac_hwcursor_latch.y && svga->dac_hwcursor_latch.ena) {
+        if (svga->displine == ((svga->dac_hwcursor_latch.y < 0) ? 0 : svga->dac_hwcursor_latch.y) && svga->dac_hwcursor_latch.ena) {
             svga->dac_hwcursor_on      = svga->dac_hwcursor_latch.cur_ysize - svga->dac_hwcursor_latch.yoff;
             svga->dac_hwcursor_oddeven = 0;
         }
 
-        if (svga->displine == (svga->dac_hwcursor_latch.y + 1) && svga->dac_hwcursor_latch.ena && svga->interlace) {
+        if (svga->displine == (((svga->dac_hwcursor_latch.y < 0) ? 0 : svga->dac_hwcursor_latch.y) + 1) && svga->dac_hwcursor_latch.ena && svga->interlace) {
             svga->dac_hwcursor_on      = svga->dac_hwcursor_latch.cur_ysize - (svga->dac_hwcursor_latch.yoff + 1);
             svga->dac_hwcursor_oddeven = 1;
         }
@@ -1054,18 +1380,17 @@ svga_poll(void *priv)
         if (svga->dispon) {
             svga->hdisp_on = 1;
 
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr &= svga->vram_display_mask;
             if (svga->firstline == 2000) {
                 svga->firstline = svga->displine;
                 video_wait_for_buffer_monitor(svga->monitor_index);
             }
 
-            if (svga->hwcursor_on || svga->dac_hwcursor_on || svga->overlay_on) {
-                svga->changedvram[svga->ma >> 12] = svga->changedvram[(svga->ma >> 12) + 1] = svga->interlace ? 3 : 2;
-            }
+            if (svga->hwcursor_on || svga->dac_hwcursor_on || svga->overlay_on)
+                svga->changedvram[svga->memaddr >> 12] = svga->changedvram[(svga->memaddr >> 12) + 1] = svga->interlace ? 3 : 2;
 
             if (svga->vertical_linedbl) {
-                old_ma = svga->ma;
+                old_ma = svga->memaddr;
 
                 svga->displine <<= 1;
                 svga->y_add <<= 1;
@@ -1074,7 +1399,7 @@ svga_poll(void *priv)
 
                 svga->displine++;
 
-                svga->ma = old_ma;
+                svga->memaddr = old_ma;
 
                 svga_do_render(svga);
 
@@ -1103,29 +1428,29 @@ svga_poll(void *priv)
         svga->hdisp_on = 0;
 
         svga->linepos = 0;
-        if ((svga->sc == (svga->crtc[11] & 31)) || (svga->sc == svga->rowcount))
-            svga->con = 0;
+        if ((svga->scanline == (svga->crtc[11] & 31)) || (svga->scanline == svga->rowcount))
+            svga->cursorvisible = 0;
         if (svga->dispon) {
             /* TODO: Verify real hardware behaviour for out-of-range fine vertical scroll
-               - S3 Trio64V2/DX: sc == rowcount, wrapping 5-bit counter. */
+               - S3 Trio64V2/DX: scanline == rowcount, wrapping 5-bit counter. */
             if (svga->linedbl && !svga->linecountff) {
                 svga->linecountff = 1;
-                svga->ma          = svga->maback;
-            } else if (svga->sc == svga->rowcount) {
+                svga->memaddr          = svga->memaddr_backup;
+            } else if (svga->scanline == svga->rowcount) {
                 svga->linecountff = 0;
-                svga->sc          = 0;
+                svga->scanline          = 0;
 
-                svga->maback += (svga->rowoffset << 3);
+                svga->memaddr_backup += (svga->adv_flags & FLAG_NO_SHIFT3) ? svga->rowoffset : (svga->rowoffset << 3);
                 if (svga->interlace)
-                    svga->maback += (svga->rowoffset << 3);
+                    svga->memaddr_backup += (svga->adv_flags & FLAG_NO_SHIFT3) ? svga->rowoffset : (svga->rowoffset << 3);
 
-                svga->maback &= svga->vram_display_mask;
-                svga->ma = svga->maback;
+                svga->memaddr_backup &= svga->vram_display_mask;
+                svga->memaddr = svga->memaddr_backup;
             } else {
                 svga->linecountff = 0;
-                svga->sc++;
-                svga->sc &= 0x1f;
-                svga->ma = svga->maback;
+                svga->scanline++;
+                svga->scanline &= 0x1f;
+                svga->memaddr = svga->memaddr_backup;
             }
         }
 
@@ -1145,16 +1470,17 @@ svga_poll(void *priv)
 
             if (ret) {
                 if (svga->interlace && svga->oddeven)
-                    svga->ma = svga->maback = (svga->rowoffset << 1) + ((svga->crtc[3] & 0x60) >> 5) + svga->hblank_sub;
+                    svga->memaddr = svga->memaddr_backup = (svga->rowoffset << 1) + svga->hblank_sub;
                 else
-                    svga->ma = svga->maback = ((svga->crtc[3] & 0x60) >> 5) + svga->hblank_sub;
-                svga->ma     = (svga->ma << 2);
-                svga->maback = (svga->maback << 2);
+                    svga->memaddr = svga->memaddr_backup = svga->hblank_sub;
 
-                svga->sc = 0;
+                svga->memaddr     = (svga->memaddr << 2);
+                svga->memaddr_backup = (svga->memaddr_backup << 2);
+
+                svga->scanline = 0;
                 if (svga->attrregs[0x10] & 0x20) {
-                    svga->scrollcache = 0;
-                    svga->x_add       = (svga->monitor->mon_overscan_x >> 1);
+                    svga->scrollcache   = 0;
+                    svga->x_add         = svga->left_overscan;
                 }
             }
         }
@@ -1180,6 +1506,7 @@ svga_poll(void *priv)
                 if (svga->changedvram[x])
                     svga->changedvram[x]--;
             }
+
             if (svga->fullchange)
                 svga->fullchange--;
         }
@@ -1198,9 +1525,11 @@ svga_poll(void *priv)
             if (!svga->override) {
                 if (svga->vertical_linedbl) {
                     wy = (svga->lastline - svga->firstline) << 1;
+                    svga->vdisp = wy + 1;
                     svga_doblit(wx, wy, svga);
                 } else {
                     wy = svga->lastline - svga->firstline;
+                    svga->vdisp = wy + 1;
                     svga_doblit(wx, wy, svga);
                 }
             }
@@ -1217,25 +1546,28 @@ svga_poll(void *priv)
             svga->vslines                       = 0;
 
             if (svga->interlace && svga->oddeven)
-                svga->ma = svga->maback = svga->ma_latch + (svga->rowoffset << 1) +
-                           ((svga->crtc[3] & 0x60) >> 5) + svga->hblank_sub;
+                svga->memaddr = svga->memaddr_backup = svga->memaddr_latch + (svga->rowoffset << 1) + svga->hblank_sub;
             else
-                svga->ma = svga->maback = svga->ma_latch + ((svga->crtc[3] & 0x60) >> 5) + svga->hblank_sub;
+                svga->memaddr = svga->memaddr_backup = svga->memaddr_latch + svga->hblank_sub;
 
-            svga->ca     = ((svga->crtc[0xe] << 8) | svga->crtc[0xf]) + ((svga->crtc[0xb] & 0x60) >> 5) + svga->ca_adj;
-            svga->ma     = (svga->ma << 2);
-            svga->maback = (svga->maback << 2);
-            svga->ca     = (svga->ca << 2);
+            svga->cursoraddr     = ((svga->crtc[0xe] << 8) | svga->crtc[0xf]) + ((svga->crtc[0xb] & 0x60) >> 5) + svga->ca_adj;
+            if (!(svga->adv_flags & FLAG_NO_SHIFT3)) {
+                svga->memaddr     = (svga->memaddr << 2);
+                svga->memaddr_backup = (svga->memaddr_backup << 2);
+            }
+            svga->cursoraddr     = (svga->cursoraddr << 2);
 
             if (svga->vsync_callback)
                 svga->vsync_callback(svga);
+
+            svga->start_retrace_latch = svga->crtc[0x4];
         }
 #if 0
         if (svga->vc == lines_num) {
 #endif
         if (svga->vc == svga->vtotal) {
             svga->vc       = 0;
-            svga->sc       = (svga->crtc[0x8] & 0x1f);
+            svga->scanline       = (svga->crtc[0x8] & 0x1f);
             svga->dispon   = 1;
             svga->displine = (svga->interlace && svga->oddeven) ? 1 : 0;
 
@@ -1248,7 +1580,8 @@ svga_poll(void *priv)
                     if (svga->scrollcache > 8)
                         svga->scrollcache = 0;
                 }
-            } else if ((svga->render == svga_render_2bpp_lowres) || (svga->render == svga_render_2bpp_highres) || (svga->render == svga_render_4bpp_lowres) || (svga->render == svga_render_4bpp_highres))
+            } else if ((svga->render == svga_render_2bpp_lowres) || (svga->render == svga_render_2bpp_highres) ||
+                       (svga->render == svga_render_4bpp_lowres) || (svga->render == svga_render_4bpp_highres))
                 svga->scrollcache &= 0x07;
             else
                 svga->scrollcache = (svga->scrollcache & 0x06) >> 1;
@@ -1256,7 +1589,7 @@ svga_poll(void *priv)
             if ((svga->seqregs[1] & 8) || (svga->render == svga_render_8bpp_lowres))
                 svga->scrollcache <<= 1;
 
-            svga->x_add = (svga->monitor->mon_overscan_x >> 1) - svga->scrollcache;
+            svga->x_add = svga->left_overscan - svga->scrollcache;
 
             svga->linecountff = 0;
 
@@ -1269,13 +1602,13 @@ svga_poll(void *priv)
             svga->overlay_on    = 0;
             svga->overlay_latch = svga->overlay;
         }
-        if (svga->sc == (svga->crtc[10] & 31))
-            svga->con = 1;
+        if (svga->scanline == (svga->crtc[10] & 31))
+            svga->cursorvisible = 1;
     }
 }
 
 uint32_t
-svga_conv_16to32(struct svga_t *svga, uint16_t color, uint8_t bpp)
+svga_conv_16to32(UNUSED(struct svga_t *svga), uint16_t color, uint8_t bpp)
 {
     return (bpp == 15) ? video_15to32[color] : video_16to32[color];
 }
@@ -1306,48 +1639,74 @@ svga_init(const device_t *info, svga_t *svga, void *priv, int memsize,
     svga->attrregs[0x11] = 0;
     svga->overscan_color = 0x000000;
 
+    svga->left_overscan           = 8;
     svga->monitor->mon_overscan_x = 16;
     svga->monitor->mon_overscan_y = 32;
     svga->x_add                   = 8;
     svga->y_add                   = 16;
+    svga->force_shifter_bypass    = 1;
 
     svga->crtc[0]           = 63;
     svga->crtc[6]           = 255;
     svga->dispontime        = 1000ULL << 32;
     svga->dispofftime       = 1000ULL << 32;
     svga->bpp               = 8;
-    svga->vram              = calloc(memsize, 1);
+    svga->vram              = calloc(memsize + 8, 1);
     svga->vram_max          = memsize;
     svga->vram_display_mask = svga->vram_mask = memsize - 1;
     svga->decode_mask                         = 0x7fffff;
-    svga->changedvram                         = calloc(memsize >> 12, 1);
+    svga->changedvram                         = calloc((memsize >> 12) + 1, 1);
     svga->recalctimings_ex                    = recalctimings_ex;
     svga->video_in                            = video_in;
     svga->video_out                           = video_out;
     svga->hwcursor_draw                       = hwcursor_draw;
     svga->overlay_draw                        = overlay_draw;
     svga->conv_16to32                         = svga_conv_16to32;
+    svga->render                              = svga_render_blank;
 
     svga->hwcursor.cur_xsize = svga->hwcursor.cur_ysize = 32;
 
     svga->dac_hwcursor.cur_xsize = svga->dac_hwcursor.cur_ysize = 32;
 
     svga->translate_address         = NULL;
+
+    svga->cable_connected = 1;
     svga->ksc5601_english_font_type = 0;
 
-    vga_on = 1;
-
-    if ((info->flags & DEVICE_PCI) || (info->flags & DEVICE_VLB) || (info->flags & DEVICE_MCA)) {
+    /* TODO: Move DEVICE_MCA to 16-bit once the device flags have been appropriately corrected. */
+    if ((info->flags & DEVICE_MCA) || (info->flags & DEVICE_MCA32) ||
+        (info->flags & DEVICE_EISA) || (info->flags & DEVICE_AT32) ||
+        (info->flags & DEVICE_OLB) || (info->flags & DEVICE_VLB) ||
+        (info->flags & DEVICE_PCI) || (info->flags & DEVICE_AGP)) {
+        svga->read = svga_read;
+        svga->readw = svga_readw;
+        svga->readl = svga_readl;
+        svga->write = svga_write;
+        svga->writew = svga_writew;
+        svga->writel = svga_writel;
         mem_mapping_add(&svga->mapping, 0xa0000, 0x20000,
                         svga_read, svga_readw, svga_readl,
                         svga_write, svga_writew, svga_writel,
                         NULL, MEM_MAPPING_EXTERNAL, svga);
-    } else if ((info->flags & DEVICE_ISA) && (info->flags & DEVICE_AT)) {
+    /* The chances of ever seeing a C-BUS (S)VGA card are approximately zero, but you never know. */
+    } else if ((info->flags & DEVICE_CBUS) || (info->flags & DEVICE_ISA16)) {
+        svga->read = svga_read;
+        svga->readw = svga_readw;
+        svga->readl = NULL;
+        svga->write = svga_write;
+        svga->writew = svga_writew;
+        svga->writel = NULL;
         mem_mapping_add(&svga->mapping, 0xa0000, 0x20000,
                         svga_read, svga_readw, NULL,
                         svga_write, svga_writew, NULL,
                         NULL, MEM_MAPPING_EXTERNAL, svga);
     } else {
+        svga->read = svga_read;
+        svga->readw = NULL;
+        svga->readl = NULL;
+        svga->write = svga_write;
+        svga->writew = NULL;
+        svga->writel = NULL;
         mem_mapping_add(&svga->mapping, 0xa0000, 0x20000,
                         svga_read, NULL, NULL,
                         svga_write, NULL, NULL,
@@ -1377,7 +1736,7 @@ svga_close(svga_t *svga)
     svga_pri = NULL;
 }
 
-static uint32_t
+uint32_t
 svga_decode_addr(svga_t *svga, uint32_t addr, int write)
 {
     int memory_map_mode = (svga->gdcreg[6] >> 2) & 3;
@@ -1405,15 +1764,10 @@ svga_decode_addr(svga_t *svga, uint32_t addr, int write)
     }
 
     if (memory_map_mode <= 1) {
-        if (svga->adv_flags & FLAG_EXTRA_BANKS) {
-            if ((svga->gdcreg[5] & 0x40) || svga->packed_chain4)
-                addr = (addr & 0x17fff) + svga->extra_banks[(addr >> 15) & 1];
-        } else {
-            if (write)
-                addr += svga->write_bank;
-            else
-                addr += svga->read_bank;
-        }
+        if (write)
+            addr += svga->write_bank;
+        else
+            addr += svga->read_bank;
     }
 
     return addr;
@@ -1423,7 +1777,6 @@ static __inline void
 svga_write_common(uint32_t addr, uint8_t val, uint8_t linear, void *priv)
 {
     svga_t *svga       = (svga_t *) priv;
-    xga_t  *xga        = (xga_t *) svga->xga;
     int     writemask2 = svga->writemask;
     int     reset_wm   = 0;
     latch_t vall;
@@ -1437,44 +1790,12 @@ svga_write_common(uint32_t addr, uint8_t val, uint8_t linear, void *priv)
     cycles -= svga->monitor->mon_video_timing_write_b;
 
     if (!linear) {
-        if (xga_active && xga) {
-            if (((xga->op_mode & 7) >= 4) && (xga->aperture_cntl >= 1)) {
-                if (val == 0xa5) { /*Memory size test of XGA*/
-                    xga->test    = val;
-                    if (addr == 0xa0001)
-                        xga->a5_test = 1;
-                    else if (addr == 0xafffe)
-                        xga->a5_test = 2;
-
-                    xga->on = 0;
-                    vga_on = 1;
-                    xga->disp_cntl_2 = 0;
-                    svga_log("XGA test1 addr = %05x.\n", addr);
-                    return;
-                } else if (val == 0x5a) {
-                    xga->test = val;
-                    xga->on = 0;
-                    vga_on = 1;
-                    xga->disp_cntl_2 = 0;
-                    svga_log("XGA test2 addr = %05x.\n", addr);
-                    return;
-                } else if ((addr == 0xa0000) || (addr == 0xa0010)) {
-                    addr += xga->write_bank;
-                    xga->vram[addr & xga->vram_mask] = val;
-                    svga_log("XGA Linear endian reverse write, val = %02x, addr = %05x, banked mask = %04x.\n", val, addr, svga->banked_mask);
-                    if (!xga->a5_test)
-                        xga->linear_endian_reverse = 1;
-                    return;
-                }
-            } else {
-                xga->on = 0;
-                vga_on = 1;
-            }
-        }
+        xga_write_test(addr, val, svga);
         addr = svga_decode_addr(svga, addr, 1);
-
-        if (addr == 0xffffffff)
+        if (addr == 0xffffffff) {
+            svga_log("WriteCommon Over.\n");
             return;
+        }
     }
 
     if (!(svga->gdcreg[6] & 1))
@@ -1493,9 +1814,7 @@ svga_write_common(uint32_t addr, uint8_t val, uint8_t linear, void *priv)
             addr &= ~3;
         addr = ((addr & 0xfffc) << 2) | ((addr & 0x30000) >> 14) | (addr & ~0x3ffff);
     } else if (svga->chain2_write) {
-        writemask2 &= ~0xa;
-        if (addr & 1)
-            writemask2 <<= 1;
+        writemask2 &= 0x5 << (addr & 1);
         addr &= ~1;
         addr <<= 2;
     } else
@@ -1506,8 +1825,10 @@ svga_write_common(uint32_t addr, uint8_t val, uint8_t linear, void *priv)
     if (svga->translate_address)
         addr = svga->translate_address(addr, priv);
 
-    if (addr >= svga->vram_max)
+    if (addr >= svga->vram_max) {
+        svga_log("WriteBankedOver=%08x, val=%02x.\n", addr & svga->vram_mask, val);
         return;
+    }
 
     addr &= svga->vram_mask;
 
@@ -1645,12 +1966,11 @@ static __inline uint8_t
 svga_read_common(uint32_t addr, uint8_t linear, void *priv)
 {
     svga_t  *svga       = (svga_t *) priv;
-    xga_t   *xga        = (xga_t *) svga->xga;
     uint32_t latch_addr = 0;
     int      readplane  = svga->readplane;
     uint8_t  count;
     uint8_t  temp;
-    uint8_t  ret;
+    uint8_t  ret = 0x00;
 
     if (svga->adv_flags & FLAG_ADDR_BY8)
         readplane = svga->gdcreg[4] & 7;
@@ -1658,41 +1978,8 @@ svga_read_common(uint32_t addr, uint8_t linear, void *priv)
     cycles -= svga->monitor->mon_video_timing_read_b;
 
     if (!linear) {
-        if (xga_active && xga) {
-            if (((xga->op_mode & 7) >= 4) && (xga->aperture_cntl >= 1)) {
-                if (xga->test == 0xa5) { /*Memory size test of XGA*/
-                    if (addr == 0xa0001) {
-                        ret = xga->test;
-                        xga->on = 1;
-                        vga_on = 0;
-                    } else if ((addr == 0xa0000) && (xga->a5_test == 1)) { /*This is required by XGAKIT to pass the memory test*/
-                        svga_log("A5 test bank = %x.\n", addr);
-                        addr += xga->read_bank;
-                        ret = xga->vram[addr & xga->vram_mask];
-                    } else {
-                        ret = xga->test;
-                        xga->on = 1;
-                        vga_on = 0;
-                    }
-                    svga_log("A5 read: XGA ON = %d, addr = %05x, ret = %02x, test1 = %x.\n", xga->on, addr, ret, xga->a5_test);
-                    return ret;
-                } else if (xga->test == 0x5a) {
-                    ret = xga->test;
-                    xga->on = 1;
-                    vga_on = 0;
-                    svga_log("5A read: XGA ON = %d.\n", xga->on);
-                    return ret;
-                } else if ((addr == 0xa0000) || (addr == 0xa0010)) {
-                    addr += xga->read_bank;
-                    return xga->vram[addr & xga->vram_mask];
-                }
-            } else {
-                xga->on = 0;
-                vga_on = 1;
-            }
-        }
+        (void) xga_read_test(addr, svga);
         addr = svga_decode_addr(svga, addr, 0);
-
         if (addr == 0xffffffff)
             return 0xff;
     }
@@ -1811,9 +2098,15 @@ svga_doblit(int wx, int wy, svga_t *svga)
 
     y_add   = enable_overscan ? svga->monitor->mon_overscan_y : 0;
     x_add   = enable_overscan ? svga->monitor->mon_overscan_x : 0;
+#ifdef USE_OLD_CALCULATION
     y_start = enable_overscan ? 0 : (svga->monitor->mon_overscan_y >> 1);
     x_start = enable_overscan ? 0 : (svga->monitor->mon_overscan_x >> 1);
     bottom  = (svga->monitor->mon_overscan_y >> 1);
+#else
+    y_start = enable_overscan ? 0 : svga->y_add;
+    x_start = enable_overscan ? 0 : svga->left_overscan;
+    bottom  = svga->monitor->mon_overscan_y - svga->y_add;
+#endif
 
     if (svga->vertical_linedbl) {
         y_add <<= 1;
@@ -1865,14 +2158,14 @@ svga_doblit(int wx, int wy, svga_t *svga)
             p = &svga->monitor->target_buffer->line[i & 0x7ff][0];
 
             for (j = 0; j < (svga->monitor->mon_xsize + x_add); j++)
-                p[j] = svga->overscan_color;
+                p[j] = svga->dpms ? 0 : svga->overscan_color;
         }
 
         for (i = 0; i < bottom; i++) {
             p = &svga->monitor->target_buffer->line[(svga->monitor->mon_ysize + svga->y_add + i) & 0x7ff][0];
 
             for (j = 0; j < (svga->monitor->mon_xsize + x_add); j++)
-                p[j] = svga->overscan_color;
+                p[j] = svga->dpms ? 0 : svga->overscan_color;
         }
     }
 
@@ -1914,6 +2207,8 @@ svga_writew_common(uint32_t addr, uint16_t val, uint8_t linear, void *priv)
     cycles -= svga->monitor->mon_video_timing_write_w;
 
     if (!linear) {
+        xga_write_test(addr, val & 0xff, svga);
+        xga_write_test(addr + 1, val >> 8, svga);
         addr = svga_decode_addr(svga, addr, 1);
 
         if (addr == 0xffffffff)
@@ -1970,6 +2265,10 @@ svga_writel_common(uint32_t addr, uint32_t val, uint8_t linear, void *priv)
     cycles -= svga->monitor->mon_video_timing_write_l;
 
     if (!linear) {
+        xga_write_test(addr, val & 0xff, svga);
+        xga_write_test(addr + 1, (val >> 8) & 0xff, svga);
+        xga_write_test(addr + 2, (val >> 16) & 0xff, svga);
+        xga_write_test(addr + 3, (val >> 24) & 0xff, svga);
         addr = svga_decode_addr(svga, addr, 1);
 
         if (addr == 0xffffffff)
@@ -2002,6 +2301,7 @@ svga_writel_common(uint32_t addr, uint32_t val, uint8_t linear, void *priv)
     }
     if (addr >= svga->vram_max)
         return;
+
     addr &= svga->vram_mask;
 
     svga->changedvram[addr >> 12]   = svga->monitor->mon_changeframecount;
@@ -2046,8 +2346,9 @@ svga_readw_common(uint32_t addr, uint8_t linear, void *priv)
     cycles -= svga->monitor->mon_video_timing_read_w;
 
     if (!linear) {
+        (void) xga_read_test(addr, svga);
+        (void) xga_read_test(addr + 1, svga);
         addr = svga_decode_addr(svga, addr, 0);
-
         if (addr == 0xffffffff)
             return 0xffff;
     }
@@ -2093,8 +2394,11 @@ svga_readl_common(uint32_t addr, uint8_t linear, void *priv)
     cycles -= svga->monitor->mon_video_timing_read_l;
 
     if (!linear) {
+        (void) xga_read_test(addr, svga);
+        (void) xga_read_test(addr + 1, svga);
+        (void) xga_read_test(addr + 2, svga);
+        (void) xga_read_test(addr + 3, svga);
         addr = svga_decode_addr(svga, addr, 0);
-
         if (addr == 0xffffffff)
             return 0xffffffff;
     }
diff --git a/src/video/vid_svga_render.c b/src/video/vid_svga_render.c
index 9b395ea6c..f43db41c4 100644
--- a/src/video/vid_svga_render.c
+++ b/src/video/vid_svga_render.c
@@ -58,7 +58,7 @@ svga_render_null(svga_t *svga)
 void
 svga_render_blank(svga_t *svga)
 {
-    if ((svga->displine + svga->y_add) < 0)
+    if ((svga->displine + svga->y_add) < 0 || (svga->displine + svga->y_add) >= 2048)
         return;
 
     if (svga->firstline_draw == 2000)
@@ -85,19 +85,15 @@ svga_render_blank(svga_t *svga)
             break;
     }
 
-#if 0
-    pclog("svga->displine = %i, svga->y_add = %i, svga->x_add = %i\n", svga->displine, svga->y_add, svga->x_add);
-#endif
     uint32_t *line_ptr   = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
-#if 0
-    pclog("svga->hdisp = %i, svga->scrollcache = %i, char_width = %i, sizeof(uint32_t) = %i\n", svga->hdisp, svga->scrollcache, char_width, sizeof(uint32_t));
-#endif
-    uint32_t  line_width = (uint32_t) (svga->hdisp + svga->scrollcache) * char_width * sizeof(uint32_t);
+    int32_t   line_width = (uint32_t) (svga->hdisp + svga->scrollcache) * char_width * sizeof(uint32_t);
 
-#if 0
-    pclog("line_width = %i\n", line_width);
-#endif
-    if ((svga->hdisp + svga->scrollcache) > 0)
+    if (svga->x_add < 0) {
+        line_ptr = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][0];
+        line_width -= svga->x_add;
+    }
+
+    if (((svga->hdisp + svga->scrollcache) > 0) && (line_width >= 0))
         memset(line_ptr, 0, line_width);
 }
 
@@ -111,7 +107,8 @@ svga_render_overscan_left(svga_t *svga)
         return;
 
     uint32_t *line_ptr = svga->monitor->target_buffer->line[svga->displine + svga->y_add];
-    for (int i = 0; i < svga->x_add; i++)
+
+    if (svga->x_add >= 0)  for (int i = 0; i < svga->x_add; i++)
         *line_ptr++ = svga->overscan_color;
 }
 
@@ -127,7 +124,7 @@ svga_render_overscan_right(svga_t *svga)
         return;
 
     uint32_t *line_ptr = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add + svga->hdisp];
-    right              = (overscan_x >> 1);
+    right              = overscan_x  - svga->left_overscan;
     for (int i = 0; i < right; i++)
         *line_ptr++ = svga->overscan_color;
 }
@@ -147,6 +144,11 @@ svga_render_text_40(svga_t *svga)
     int       bg;
     uint32_t  addr = 0;
 
+    if (svga->render_override) {
+        svga->render_override(svga->priv_parent);
+        return;
+    }
+
     if ((svga->displine + svga->y_add) < 0)
         return;
 
@@ -160,13 +162,13 @@ svga_render_text_40(svga_t *svga)
 
         for (int x = 0; x < (svga->hdisp + svga->scrollcache); x += xinc) {
             if (!svga->force_old_addr)
-                addr = svga->remap_func(svga, svga->ma) & svga->vram_display_mask;
+                addr = svga->remap_func(svga, svga->memaddr) & svga->vram_display_mask;
 
-            drawcursor = ((svga->ma == svga->ca) && svga->con && svga->cursoron);
+            drawcursor = ((svga->memaddr == svga->cursoraddr) && svga->cursorvisible && svga->cursoron);
 
             if (svga->force_old_addr) {
-                chr  = svga->vram[(svga->ma << 1) & svga->vram_display_mask];
-                attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
+                chr  = svga->vram[(svga->memaddr << 1) & svga->vram_display_mask];
+                attr = svga->vram[((svga->memaddr << 1) + 1) & svga->vram_display_mask];
             } else {
                 chr  = svga->vram[addr];
                 attr = svga->vram[addr + 1];
@@ -178,20 +180,20 @@ svga_render_text_40(svga_t *svga)
                 charaddr = svga->charseta + (chr * 128);
 
             if (drawcursor) {
-                bg = svga->pallook[svga->egapal[attr & 15]];
-                fg = svga->pallook[svga->egapal[attr >> 4]];
+                bg = svga->pallook[svga->egapal[attr & 15] & svga->dac_mask];
+                fg = svga->pallook[svga->egapal[attr >> 4] & svga->dac_mask];
             } else {
-                fg = svga->pallook[svga->egapal[attr & 15]];
-                bg = svga->pallook[svga->egapal[attr >> 4]];
+                fg = svga->pallook[svga->egapal[attr & 15] & svga->dac_mask];
+                bg = svga->pallook[svga->egapal[attr >> 4] & svga->dac_mask];
 
                 if (attr & 0x80 && svga->attrregs[0x10] & 8) {
-                    bg = svga->pallook[svga->egapal[(attr >> 4) & 7]];
+                    bg = svga->pallook[svga->egapal[(attr >> 4) & 7] & svga->dac_mask];
                     if (svga->blink & 16)
                         fg = bg;
                 }
             }
 
-            dat = svga->vram[charaddr + (svga->sc << 2)];
+            dat = svga->vram[charaddr + (svga->scanline << 2)];
             if (svga->seqregs[1] & 1) {
                 for (xx = 0; xx < 16; xx += 2)
                     p[xx] = p[xx + 1] = (dat & (0x80 >> (xx >> 1))) ? fg : bg;
@@ -203,10 +205,10 @@ svga_render_text_40(svga_t *svga)
                 else
                     p[16] = p[17] = (dat & 1) ? fg : bg;
             }
-            svga->ma += 4;
+            svga->memaddr += 4;
             p += xinc;
         }
-        svga->ma &= svga->vram_display_mask;
+        svga->memaddr &= svga->vram_display_mask;
     }
 }
 
@@ -225,6 +227,11 @@ svga_render_text_80(svga_t *svga)
     int       bg;
     uint32_t  addr = 0;
 
+    if (svga->render_override) {
+        svga->render_override(svga->priv_parent);
+        return;
+    }
+
     if ((svga->displine + svga->y_add) < 0)
         return;
 
@@ -238,13 +245,13 @@ svga_render_text_80(svga_t *svga)
 
         for (int x = 0; x < (svga->hdisp + svga->scrollcache); x += xinc) {
             if (!svga->force_old_addr)
-                addr = svga->remap_func(svga, svga->ma) & svga->vram_display_mask;
+                addr = svga->remap_func(svga, svga->memaddr) & svga->vram_display_mask;
 
-            drawcursor = ((svga->ma == svga->ca) && svga->con && svga->cursoron);
+            drawcursor = ((svga->memaddr == svga->cursoraddr) && svga->cursorvisible && svga->cursoron);
 
             if (svga->force_old_addr) {
-                chr  = svga->vram[(svga->ma << 1) & svga->vram_display_mask];
-                attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
+                chr  = svga->vram[(svga->memaddr << 1) & svga->vram_display_mask];
+                attr = svga->vram[((svga->memaddr << 1) + 1) & svga->vram_display_mask];
             } else {
                 chr  = svga->vram[addr];
                 attr = svga->vram[addr + 1];
@@ -256,19 +263,19 @@ svga_render_text_80(svga_t *svga)
                 charaddr = svga->charseta + (chr * 128);
 
             if (drawcursor) {
-                bg = svga->pallook[svga->egapal[attr & 15]];
-                fg = svga->pallook[svga->egapal[attr >> 4]];
+                bg = svga->pallook[svga->egapal[attr & 15] & svga->dac_mask];
+                fg = svga->pallook[svga->egapal[attr >> 4] & svga->dac_mask];
             } else {
-                fg = svga->pallook[svga->egapal[attr & 15]];
-                bg = svga->pallook[svga->egapal[attr >> 4]];
+                fg = svga->pallook[svga->egapal[attr & 15] & svga->dac_mask];
+                bg = svga->pallook[svga->egapal[attr >> 4] & svga->dac_mask];
                 if (attr & 0x80 && svga->attrregs[0x10] & 8) {
-                    bg = svga->pallook[svga->egapal[(attr >> 4) & 7]];
+                    bg = svga->pallook[svga->egapal[(attr >> 4) & 7] & svga->dac_mask];
                     if (svga->blink & 16)
                         fg = bg;
                 }
             }
 
-            dat = svga->vram[charaddr + (svga->sc << 2)];
+            dat = svga->vram[charaddr + (svga->scanline << 2)];
             if (svga->seqregs[1] & 1) {
                 for (xx = 0; xx < 8; xx++)
                     p[xx] = (dat & (0x80 >> xx)) ? fg : bg;
@@ -280,10 +287,10 @@ svga_render_text_80(svga_t *svga)
                 else
                     p[8] = (dat & 1) ? fg : bg;
             }
-            svga->ma += 4;
+            svga->memaddr += 4;
             p += xinc;
         }
-        svga->ma &= svga->vram_display_mask;
+        svga->memaddr &= svga->vram_display_mask;
     }
 }
 
@@ -316,20 +323,20 @@ svga_render_text_80_ksc5601(svga_t *svga)
         xinc = (svga->seqregs[1] & 1) ? 8 : 9;
 
         for (int x = 0; x < (svga->hdisp + svga->scrollcache); x += xinc) {
-            uint32_t addr = svga->remap_func(svga, svga->ma) & svga->vram_display_mask;
-            drawcursor    = ((svga->ma == svga->ca) && svga->con && svga->cursoron);
+            uint32_t addr = svga->remap_func(svga, svga->memaddr) & svga->vram_display_mask;
+            drawcursor    = ((svga->memaddr == svga->cursoraddr) && svga->cursorvisible && svga->cursoron);
             chr           = svga->vram[addr];
             nextchr       = svga->vram[addr + 8];
             attr          = svga->vram[addr + 1];
 
             if (drawcursor) {
-                bg = svga->pallook[svga->egapal[attr & 15]];
-                fg = svga->pallook[svga->egapal[attr >> 4]];
+                bg = svga->pallook[svga->egapal[attr & 15] & svga->dac_mask];
+                fg = svga->pallook[svga->egapal[attr >> 4] & svga->dac_mask];
             } else {
-                fg = svga->pallook[svga->egapal[attr & 15]];
-                bg = svga->pallook[svga->egapal[attr >> 4]];
+                fg = svga->pallook[svga->egapal[attr & 15] & svga->dac_mask];
+                bg = svga->pallook[svga->egapal[attr >> 4] & svga->dac_mask];
                 if (attr & 0x80 && svga->attrregs[0x10] & 8) {
-                    bg = svga->pallook[svga->egapal[(attr >> 4) & 7]];
+                    bg = svga->pallook[svga->egapal[(attr >> 4) & 7] & svga->dac_mask];
                     if (svga->blink & 16)
                         fg = bg;
                 }
@@ -337,7 +344,7 @@ svga_render_text_80_ksc5601(svga_t *svga)
 
             if ((x + xinc) < svga->hdisp && (chr & (nextchr | svga->ksc5601_sbyte_mask) & 0x80)) {
                 if ((chr == svga->ksc5601_udc_area_msb[0] || chr == svga->ksc5601_udc_area_msb[1]) && (nextchr > 0xa0 && nextchr < 0xff))
-                    dat = fontdatksc5601_user[(chr == svga->ksc5601_udc_area_msb[1] ? 96 : 0) + (nextchr & 0x7F) - 0x20].chr[svga->sc];
+                    dat = fontdatksc5601_user[(chr == svga->ksc5601_udc_area_msb[1] ? 96 : 0) + (nextchr & 0x7F) - 0x20].chr[svga->scanline];
                 else if (nextchr & 0x80) {
                     if (svga->ksc5601_swap_mode == 1 && (nextchr > 0xa0 && nextchr < 0xff)) {
                         if (chr >= 0x80 && chr < 0x99)
@@ -345,7 +352,7 @@ svga_render_text_80_ksc5601(svga_t *svga)
                         else if (chr >= 0xB0 && chr < 0xC9)
                             chr -= 0x30;
                     }
-                    dat = fontdatksc5601[((chr & 0x7F) << 7) | (nextchr & 0x7F)].chr[svga->sc];
+                    dat = fontdatksc5601[((chr & 0x7F) << 7) | (nextchr & 0x7F)].chr[svga->scanline];
                 } else
                     dat = 0xff;
             } else {
@@ -355,9 +362,9 @@ svga_render_text_80_ksc5601(svga_t *svga)
                     charaddr = svga->charseta + (chr * 128);
 
                 if ((svga->ksc5601_english_font_type >> 8) == 1)
-                    dat = fontdatksc5601[((svga->ksc5601_english_font_type & 0x7F) << 7) | (chr >> 1)].chr[((chr & 1) << 4) | svga->sc];
+                    dat = fontdatksc5601[((svga->ksc5601_english_font_type & 0x7F) << 7) | (chr >> 1)].chr[((chr & 1) << 4) | svga->scanline];
                 else
-                    dat = svga->vram[charaddr + (svga->sc << 2)];
+                    dat = svga->vram[charaddr + (svga->scanline << 2)];
             }
 
             if (svga->seqregs[1] & 1) {
@@ -371,29 +378,29 @@ svga_render_text_80_ksc5601(svga_t *svga)
                 else
                     p[8] = (dat & 1) ? fg : bg;
             }
-            svga->ma += 4;
+            svga->memaddr += 4;
             p += xinc;
 
             if ((x + xinc) < svga->hdisp && (chr & (nextchr | svga->ksc5601_sbyte_mask) & 0x80)) {
-                attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
+                attr = svga->vram[((svga->memaddr << 1) + 1) & svga->vram_display_mask];
 
                 if (drawcursor) {
-                    bg = svga->pallook[svga->egapal[attr & 15]];
-                    fg = svga->pallook[svga->egapal[attr >> 4]];
+                    bg = svga->pallook[svga->egapal[attr & 15] & svga->dac_mask];
+                    fg = svga->pallook[svga->egapal[attr >> 4] & svga->dac_mask];
                 } else {
-                    fg = svga->pallook[svga->egapal[attr & 15]];
-                    bg = svga->pallook[svga->egapal[attr >> 4]];
+                    fg = svga->pallook[svga->egapal[attr & 15] & svga->dac_mask];
+                    bg = svga->pallook[svga->egapal[attr >> 4] & svga->dac_mask];
                     if (attr & 0x80 && svga->attrregs[0x10] & 8) {
-                        bg = svga->pallook[svga->egapal[(attr >> 4) & 7]];
+                        bg = svga->pallook[svga->egapal[(attr >> 4) & 7] & svga->dac_mask];
                         if (svga->blink & 16)
                             fg = bg;
                     }
                 }
 
                 if ((chr == svga->ksc5601_udc_area_msb[0] || chr == svga->ksc5601_udc_area_msb[1]) && (nextchr > 0xa0 && nextchr < 0xff))
-                    dat = fontdatksc5601_user[(chr == svga->ksc5601_udc_area_msb[1] ? 96 : 0) + (nextchr & 0x7F) - 0x20].chr[svga->sc + 16];
+                    dat = fontdatksc5601_user[(chr == svga->ksc5601_udc_area_msb[1] ? 96 : 0) + (nextchr & 0x7F) - 0x20].chr[svga->scanline + 16];
                 else if (nextchr & 0x80)
-                    dat = fontdatksc5601[((chr & 0x7f) << 7) | (nextchr & 0x7F)].chr[svga->sc + 16];
+                    dat = fontdatksc5601[((chr & 0x7f) << 7) | (nextchr & 0x7F)].chr[svga->scanline + 16];
                 else
                     dat = 0xff;
 
@@ -409,12 +416,208 @@ svga_render_text_80_ksc5601(svga_t *svga)
                         p[8] = (dat & 1) ? fg : bg;
                 }
 
-                svga->ma += 4;
+                svga->memaddr += 4;
                 p += xinc;
                 x += xinc;
             }
         }
-        svga->ma &= svga->vram_display_mask;
+        svga->memaddr &= svga->vram_display_mask;
+    }
+}
+
+void
+svga_render_2bpp_s3_lowres(svga_t *svga)
+{
+    int       changed_offset;
+    int       x;
+    uint8_t   dat[2];
+    uint32_t  addr;
+    uint32_t *p;
+    uint32_t  changed_addr;
+
+    if ((svga->displine + svga->y_add) < 0)
+        return;
+
+    if (svga->force_old_addr) {
+        changed_offset = ((svga->memaddr << 1) + (svga->scanline & ~svga->crtc[0x17] & 3) * 0x8000) >> 12;
+
+        if (svga->changedvram[changed_offset] || svga->changedvram[changed_offset + 1] || svga->fullchange) {
+            p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
+
+            if (svga->firstline_draw == 2000)
+                svga->firstline_draw = svga->displine;
+            svga->lastline_draw = svga->displine;
+
+            for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 16) {
+                addr = svga->memaddr;
+
+                if (!(svga->crtc[0x17] & 0x40)) {
+                    addr = (addr << 1) & svga->vram_mask;
+                    addr &= ~7;
+
+                    if ((svga->crtc[0x17] & 0x20) && (svga->memaddr & 0x20000))
+                        addr |= 4;
+
+                    if (!(svga->crtc[0x17] & 0x20) && (svga->memaddr & 0x8000))
+                        addr |= 4;
+                }
+
+                if (!(svga->crtc[0x17] & 0x01))
+                    addr = (addr & ~0x8000) | ((svga->scanline & 1) ? 0x8000 : 0);
+
+                if (!(svga->crtc[0x17] & 0x02))
+                    addr = (addr & ~0x10000) | ((svga->scanline & 2) ? 0x10000 : 0);
+
+                dat[0] = svga->vram[addr];
+                dat[1] = svga->vram[addr | 0x1];
+                if (svga->seqregs[1] & 4)
+                    svga->memaddr += 2;
+                else
+                    svga->memaddr += 4;
+                svga->memaddr &= svga->vram_mask;
+                p[0] = p[1] = svga->pallook[svga->egapal[(dat[0] >> 6) & 3] & svga->dac_mask];
+                p[2] = p[3] = svga->pallook[svga->egapal[(dat[0] >> 4) & 3] & svga->dac_mask];
+                p[4] = p[5] = svga->pallook[svga->egapal[(dat[0] >> 2) & 3] & svga->dac_mask];
+                p[6] = p[7] = svga->pallook[svga->egapal[dat[0] & 3] & svga->dac_mask];
+                p[8] = p[9] = svga->pallook[svga->egapal[(dat[1] >> 6) & 3] & svga->dac_mask];
+                p[10] = p[11] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3] & svga->dac_mask];
+                p[12] = p[13] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3] & svga->dac_mask];
+                p[14] = p[15] = svga->pallook[svga->egapal[dat[1] & 3] & svga->dac_mask];
+                p += 16;
+            }
+        }
+    } else {
+        changed_addr = svga->remap_func(svga, svga->memaddr);
+
+        if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
+            p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
+
+            if (svga->firstline_draw == 2000)
+                svga->firstline_draw = svga->displine;
+            svga->lastline_draw = svga->displine;
+
+            for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 16) {
+                addr = svga->remap_func(svga, svga->memaddr);
+
+                dat[0] = svga->vram[addr];
+                dat[1] = svga->vram[addr | 0x1];
+                if (svga->seqregs[1] & 4)
+                    svga->memaddr += 2;
+                else
+                    svga->memaddr += 4;
+
+                svga->memaddr &= svga->vram_mask;
+
+                p[0] = p[1] = svga->pallook[svga->egapal[(dat[0] >> 6) & 3] & svga->dac_mask];
+                p[2] = p[3] = svga->pallook[svga->egapal[(dat[0] >> 4) & 3] & svga->dac_mask];
+                p[4] = p[5] = svga->pallook[svga->egapal[(dat[0] >> 2) & 3] & svga->dac_mask];
+                p[6] = p[7] = svga->pallook[svga->egapal[dat[0] & 3] & svga->dac_mask];
+                p[8] = p[9] = svga->pallook[svga->egapal[(dat[1] >> 6) & 3] & svga->dac_mask];
+                p[10] = p[11] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3] & svga->dac_mask];
+                p[12] = p[13] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3] & svga->dac_mask];
+                p[14] = p[15] = svga->pallook[svga->egapal[dat[1] & 3] & svga->dac_mask];
+
+                p += 16;
+            }
+        }
+    }
+}
+
+void
+svga_render_2bpp_s3_highres(svga_t *svga)
+{
+    int       changed_offset;
+    int       x;
+    uint8_t   dat[2];
+    uint32_t  addr;
+    uint32_t *p;
+    uint32_t  changed_addr;
+
+    if ((svga->displine + svga->y_add) < 0)
+        return;
+
+    if (svga->force_old_addr) {
+        changed_offset = ((svga->memaddr << 1) + (svga->scanline & ~svga->crtc[0x17] & 3) * 0x8000) >> 12;
+
+        if (svga->changedvram[changed_offset] || svga->changedvram[changed_offset + 1] || svga->fullchange) {
+            p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
+
+            if (svga->firstline_draw == 2000)
+                svga->firstline_draw = svga->displine;
+            svga->lastline_draw = svga->displine;
+
+            for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
+                addr = svga->memaddr;
+
+                if (!(svga->crtc[0x17] & 0x40)) {
+                    addr = (addr << 1) & svga->vram_mask;
+                    addr &= ~7;
+
+                    if ((svga->crtc[0x17] & 0x20) && (svga->memaddr & 0x20000))
+                        addr |= 4;
+
+                    if (!(svga->crtc[0x17] & 0x20) && (svga->memaddr & 0x8000))
+                        addr |= 4;
+                }
+
+                if (!(svga->crtc[0x17] & 0x01))
+                    addr = (addr & ~0x8000) | ((svga->scanline & 1) ? 0x8000 : 0);
+
+                if (!(svga->crtc[0x17] & 0x02))
+                    addr = (addr & ~0x10000) | ((svga->scanline & 2) ? 0x10000 : 0);
+
+                dat[0] = svga->vram[addr];
+                dat[1] = svga->vram[addr | 0x1];
+                if (svga->seqregs[1] & 4)
+                    svga->memaddr += 2;
+                else
+                    svga->memaddr += 4;
+                svga->memaddr &= svga->vram_mask;
+                p[0] = svga->pallook[svga->egapal[(dat[0] >> 6) & 3] & svga->dac_mask];
+                p[1] = svga->pallook[svga->egapal[(dat[0] >> 4) & 3] & svga->dac_mask];
+                p[2] = svga->pallook[svga->egapal[(dat[0] >> 2) & 3] & svga->dac_mask];
+                p[3] = svga->pallook[svga->egapal[dat[0] & 3] & svga->dac_mask];
+                p[4] = svga->pallook[svga->egapal[(dat[1] >> 6) & 3] & svga->dac_mask];
+                p[5] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3] & svga->dac_mask];
+                p[6] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3] & svga->dac_mask];
+                p[7] = svga->pallook[svga->egapal[dat[1] & 3] & svga->dac_mask];
+                p += 8;
+            }
+        }
+    } else {
+        changed_addr = svga->remap_func(svga, svga->memaddr);
+
+        if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
+            p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
+
+            if (svga->firstline_draw == 2000)
+                svga->firstline_draw = svga->displine;
+            svga->lastline_draw = svga->displine;
+
+            for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
+                addr = svga->remap_func(svga, svga->memaddr);
+
+                dat[0] = svga->vram[addr];
+                dat[1] = svga->vram[addr | 0x1];
+                if (svga->seqregs[1] & 4)
+                    svga->memaddr += 2;
+                else
+                    svga->memaddr += 4;
+
+                svga->memaddr &= svga->vram_mask;
+
+                p[0] = svga->pallook[svga->egapal[(dat[0] >> 6) & 3] & svga->dac_mask];
+                p[1] = svga->pallook[svga->egapal[(dat[0] >> 4) & 3] & svga->dac_mask];
+                p[2] = svga->pallook[svga->egapal[(dat[0] >> 2) & 3] & svga->dac_mask];
+                p[3] = svga->pallook[svga->egapal[dat[0] & 3] & svga->dac_mask];
+                p[4] = svga->pallook[svga->egapal[(dat[1] >> 6) & 3] & svga->dac_mask];
+                p[5] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3] & svga->dac_mask];
+                p[6] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3] & svga->dac_mask];
+                p[7] = svga->pallook[svga->egapal[dat[1] & 3] & svga->dac_mask];
+
+                p += 8;
+            }
+        }
     }
 }
 
@@ -431,7 +634,7 @@ svga_render_2bpp_headland_highres(svga_t *svga)
     if ((svga->displine + svga->y_add) < 0)
         return;
 
-    changed_addr = svga->remap_func(svga, svga->ma);
+    changed_addr = svga->remap_func(svga, svga->memaddr);
 
     if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
         p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
@@ -441,7 +644,7 @@ svga_render_2bpp_headland_highres(svga_t *svga)
         svga->lastline_draw = svga->displine;
 
         for (int x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-            addr    = svga->remap_func(svga, svga->ma);
+            addr    = svga->remap_func(svga, svga->memaddr);
             oddeven = 0;
 
             if (svga->seqregs[1] & 4) {
@@ -452,21 +655,21 @@ svga_render_2bpp_headland_highres(svga_t *svga)
             } else {
                 *(uint32_t *) (&edat[0]) = *(uint32_t *) (&svga->vram[addr]);
             }
-            svga->ma += 4;
-            svga->ma &= svga->vram_mask;
+            svga->memaddr += 4;
+            svga->memaddr &= svga->vram_mask;
 
             dat  = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
-            p[0] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-            p[1] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+            p[0] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask] & svga->dac_mask];
+            p[1] = svga->pallook[svga->egapal[dat & svga->plane_mask] & svga->dac_mask];
             dat  = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
-            p[2] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-            p[3] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+            p[2] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask] & svga->dac_mask];
+            p[3] = svga->pallook[svga->egapal[dat & svga->plane_mask] & svga->dac_mask];
             dat  = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
-            p[4] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-            p[5] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+            p[4] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask] & svga->dac_mask];
+            p[5] = svga->pallook[svga->egapal[dat & svga->plane_mask] & svga->dac_mask];
             dat  = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
-            p[6] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-            p[7] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+            p[6] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask] & svga->dac_mask];
+            p[7] = svga->pallook[svga->egapal[dat & svga->plane_mask] & svga->dac_mask];
 
             p += 8;
         }
@@ -497,7 +700,7 @@ svga_render_indexed_gfx(svga_t *svga, bool highres, bool combine8bits)
        - HT-216 (+ other Video7 chipsets?) has 0x3C4.0xC8 bit 4 which, when set to 1, loads
          bytes directly, bypassing the shifters.
      */
-    const bool highres8bpp = combine8bits && highres;
+    const bool highres8bpp = (combine8bits && highres) || svga->force_shifter_bypass;
 
     const bool     dwordload  = ((svga->seqregs[0x01] & 0x10) != 0);
     const bool     wordload   = ((svga->seqregs[0x01] & 0x04) != 0) && !dwordload;
@@ -539,14 +742,21 @@ svga_render_indexed_gfx(svga_t *svga, bool highres, bool combine8bits)
         return;
 
     if (svga->force_old_addr)
-        changed_offset = (svga->ma + (svga->sc & ~svga->crtc[0x17] & 3) * 0x8000) >> 12;
+        changed_offset = (svga->memaddr + (svga->scanline & ~svga->crtc[0x17] & 3) * 0x8000) >> 12;
     else
-        changed_offset = svga->remap_func(svga, svga->ma) >> 12;
+        changed_offset = svga->remap_func(svga, svga->memaddr) >> 12;
 
     if (!(svga->changedvram[changed_offset] || svga->changedvram[changed_offset + 1] || svga->fullchange))
         return;
     p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
 
+    if (svga->render_line_offset) {
+        if (svga->render_line_offset > 0) {
+            memset(p, svga->overscan_color, (size_t) charwidth * svga->render_line_offset * sizeof(uint32_t));
+            p += charwidth * svga->render_line_offset;
+        }
+    }
+
     if (svga->firstline_draw == 2000)
         svga->firstline_draw = svga->displine;
     svga->lastline_draw = svga->displine;
@@ -558,19 +768,19 @@ svga_render_indexed_gfx(svga_t *svga, bool highres, bool combine8bits)
         if (load_counter == 0) {
             /* Find our address */
             if (svga->force_old_addr) {
-                addr = ((svga->ma & ~0x3) << incbypow2);
+                addr = ((svga->memaddr & ~0x3) << incbypow2);
 
                 if (incbypow2 == 2) {
-                    if (svga->ma & (4 << 15))
+                    if (svga->memaddr & (4 << 15))
                         addr |= 0x8;
-                    if (svga->ma & (4 << 14))
+                    if (svga->memaddr & (4 << 14))
                         addr |= 0x4;
                 } else if (incbypow2 == 1) {
                     if ((svga->crtc[0x17] & 0x20)) {
-                        if (svga->ma & (4 << 15))
+                        if (svga->memaddr & (4 << 15))
                             addr |= 0x4;
                     } else {
-                        if (svga->ma & (4 << 13))
+                        if (svga->memaddr & (4 << 13))
                             addr |= 0x4;
                     }
                 } else {
@@ -578,13 +788,13 @@ svga_render_indexed_gfx(svga_t *svga, bool highres, bool combine8bits)
                 }
 
                 if (!(svga->crtc[0x17] & 0x01))
-                    addr = (addr & ~0x8000) | ((svga->sc & 1) ? 0x8000 : 0);
+                    addr = (addr & ~0x8000) | ((svga->scanline & 1) ? 0x8000 : 0);
                 if (!(svga->crtc[0x17] & 0x02))
-                    addr = (addr & ~0x10000) | ((svga->sc & 2) ? 0x10000 : 0);
+                    addr = (addr & ~0x10000) | ((svga->scanline & 2) ? 0x10000 : 0);
             } else if (svga->remap_required)
-                addr = svga->remap_func(svga, svga->ma);
+                addr = svga->remap_func(svga, svga->memaddr);
             else
-                addr = svga->ma;
+                addr = svga->memaddr;
 
             addr &= svga->vram_display_mask;
 
@@ -622,9 +832,9 @@ svga_render_indexed_gfx(svga_t *svga, bool highres, bool combine8bits)
         incr_counter += 1;
         if (incr_counter >= incevery) {
             incr_counter = 0;
-            svga->ma += 4;
+            svga->memaddr += 4;
             /* DISCREPANCY TODO FIXME 2/4bpp used vram_mask, 8bpp used vram_display_mask --GM */
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr &= svga->vram_display_mask;
         }
 
         uint32_t current_shift = shift_values;
@@ -672,8 +882,8 @@ svga_render_indexed_gfx(svga_t *svga, bool highres, bool combine8bits)
                 }
             } else if (combine8bits) {
                 if (svga->packed_4bpp) {
-                    uint32_t  p0      = svga->map8[c0];
-                    uint32_t  p1      = svga->map8[c1];
+                    uint32_t  p0      = svga->map8[c0 & svga->dac_mask];
+                    uint32_t  p1      = svga->map8[c1 & svga->dac_mask];
                     const int outoffs = i << dwshift;
                     for (int subx = 0; subx < dotwidth; subx++)
                         p[outoffs + subx] = p0;
@@ -681,14 +891,14 @@ svga_render_indexed_gfx(svga_t *svga, bool highres, bool combine8bits)
                         p[outoffs + subx + dotwidth] = p1;
                 } else {
                     uint32_t  ccombined = (c0 << 4) | c1;
-                    uint32_t  p0        = svga->map8[ccombined];
+                    uint32_t  p0        = svga->map8[ccombined & svga->dac_mask];
                     const int outoffs   = (i >> 1) << dwshift;
                     for (int subx = 0; subx < dotwidth; subx++)
                         p[outoffs + subx] = p0;
                 }
             } else {
-                uint32_t  p0      = svga->pallook[svga->egapal[c0]];
-                uint32_t  p1      = svga->pallook[svga->egapal[c1]];
+                uint32_t  p0      = svga->pallook[svga->egapal[c0] & svga->dac_mask];
+                uint32_t  p1      = svga->pallook[svga->egapal[c1] & svga->dac_mask];
                 const int outoffs = i << dwshift;
                 for (int subx = 0; subx < dotwidth; subx++)
                     p[outoffs + subx] = p0;
@@ -703,6 +913,12 @@ svga_render_indexed_gfx(svga_t *svga, bool highres, bool combine8bits)
         else
             p += charwidth;
     }
+
+    if (svga->render_line_offset < 0) {
+        uint32_t *orig_line = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
+        memmove(orig_line, orig_line + (charwidth * -svga->render_line_offset), (svga->hdisp) * 4);
+        memset((orig_line + svga->hdisp) - (charwidth * -svga->render_line_offset), svga->overscan_color, (size_t) charwidth * -svga->render_line_offset * 4);
+    }
 }
 
 /*
@@ -716,6 +932,126 @@ void svga_render_4bpp_highres(svga_t *svga) { svga_render_indexed_gfx(svga, true
 void svga_render_8bpp_lowres(svga_t *svga) { svga_render_indexed_gfx(svga, false, true); }
 void svga_render_8bpp_highres(svga_t *svga) { svga_render_indexed_gfx(svga, true, true); }
 
+void
+svga_render_4bpp_tseng_highres(svga_t *svga)
+{
+    int       changed_offset;
+    int       x;
+    int       oddeven;
+    uint32_t  addr;
+    uint32_t *p;
+    uint8_t   edat[4];
+    uint8_t   dat;
+    uint32_t  changed_addr;
+
+    if ((svga->displine + svga->y_add) < 0)
+        return;
+
+    if (svga->force_old_addr) {
+        changed_offset = (svga->memaddr + (svga->scanline & ~svga->crtc[0x17] & 3) * 0x8000) >> 12;
+
+        if (svga->changedvram[changed_offset] || svga->changedvram[changed_offset + 1] || svga->fullchange) {
+            p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
+
+            if (svga->firstline_draw == 2000)
+                svga->firstline_draw = svga->displine;
+            svga->lastline_draw = svga->displine;
+
+            for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
+                addr    = svga->memaddr;
+                oddeven = 0;
+
+                if (!(svga->crtc[0x17] & 0x40)) {
+                    addr = (addr << 1) & svga->vram_mask;
+
+                    if (svga->seqregs[1] & 4)
+                        oddeven = (addr & 4) ? 1 : 0;
+
+                    addr &= ~7;
+
+                    if ((svga->crtc[0x17] & 0x20) && (svga->memaddr & 0x20000))
+                        addr |= 4;
+                    if (!(svga->crtc[0x17] & 0x20) && (svga->memaddr & 0x8000))
+                        addr |= 4;
+                }
+
+                if (!(svga->crtc[0x17] & 0x01))
+                    addr = (addr & ~0x8000) | ((svga->scanline & 1) ? 0x8000 : 0);
+                if (!(svga->crtc[0x17] & 0x02))
+                    addr = (addr & ~0x10000) | ((svga->scanline & 2) ? 0x10000 : 0);
+
+                if (svga->seqregs[1] & 4) {
+                    edat[0] = svga->vram[addr | oddeven];
+                    edat[2] = svga->vram[addr | oddeven | 0x2];
+                    edat[1] = edat[3] = 0;
+                    svga->memaddr += 2;
+                } else {
+                    *(uint32_t *) (&edat[0]) = *(uint32_t *) (&svga->vram[addr]);
+                    svga->memaddr += 4;
+                }
+                svga->memaddr &= svga->vram_mask;
+
+                dat  = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
+                p[0] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+                p[1] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+                dat  = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
+                p[2] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+                p[3] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+                dat  = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
+                p[4] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+                p[5] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+                dat  = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
+                p[6] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+                p[7] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+
+                p += 8;
+            }
+        }
+    } else {
+        changed_addr = svga->remap_func(svga, svga->memaddr);
+
+        if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
+            p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
+
+            if (svga->firstline_draw == 2000)
+                svga->firstline_draw = svga->displine;
+            svga->lastline_draw = svga->displine;
+
+            for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
+                addr    = svga->remap_func(svga, svga->memaddr);
+                oddeven = 0;
+
+                if (svga->seqregs[1] & 4) {
+                    oddeven = (addr & 4) ? 1 : 0;
+                    edat[0] = svga->vram[addr | oddeven];
+                    edat[2] = svga->vram[addr | oddeven | 0x2];
+                    edat[1] = edat[3] = 0;
+                    svga->memaddr += 2;
+                } else {
+                    *(uint32_t *) (&edat[0]) = *(uint32_t *) (&svga->vram[addr]);
+                    svga->memaddr += 4;
+                }
+                svga->memaddr &= svga->vram_mask;
+
+                dat  = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
+                p[0] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+                p[1] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+                dat  = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
+                p[2] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+                p[3] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+                dat  = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
+                p[4] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+                p[5] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+                dat  = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
+                p[6] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+                p[7] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+
+                p += 8;
+            }
+        }
+    }
+}
+
 void
 svga_render_8bpp_clone_highres(svga_t *svga)
 {
@@ -729,7 +1065,7 @@ svga_render_8bpp_clone_highres(svga_t *svga)
         return;
 
     if (svga->force_old_addr) {
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+        if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
 
             if (svga->firstline_draw == 2000)
@@ -737,25 +1073,25 @@ svga_render_8bpp_clone_highres(svga_t *svga)
             svga->lastline_draw = svga->displine;
 
             for (x = 0; x <= (svga->hdisp /* + svga->scrollcache*/); x += 8) {
-                dat  = *(uint32_t *) (&svga->vram[svga->ma & svga->vram_display_mask]);
-                p[0] = svga->map8[dat & 0xff];
-                p[1] = svga->map8[(dat >> 8) & 0xff];
-                p[2] = svga->map8[(dat >> 16) & 0xff];
-                p[3] = svga->map8[(dat >> 24) & 0xff];
+                dat  = *(uint32_t *) (&svga->vram[svga->memaddr & svga->vram_display_mask]);
+                p[0] = svga->map8[dat & svga->dac_mask & 0xff];
+                p[1] = svga->map8[(dat >> 8) & svga->dac_mask & 0xff];
+                p[2] = svga->map8[(dat >> 16) & svga->dac_mask & 0xff];
+                p[3] = svga->map8[(dat >> 24) & svga->dac_mask & 0xff];
 
-                dat  = *(uint32_t *) (&svga->vram[(svga->ma + 4) & svga->vram_display_mask]);
-                p[4] = svga->map8[dat & 0xff];
-                p[5] = svga->map8[(dat >> 8) & 0xff];
-                p[6] = svga->map8[(dat >> 16) & 0xff];
-                p[7] = svga->map8[(dat >> 24) & 0xff];
+                dat  = *(uint32_t *) (&svga->vram[(svga->memaddr + 4) & svga->vram_display_mask]);
+                p[4] = svga->map8[dat & svga->dac_mask & 0xff];
+                p[5] = svga->map8[(dat >> 8) & svga->dac_mask & 0xff];
+                p[6] = svga->map8[(dat >> 16) & svga->dac_mask & 0xff];
+                p[7] = svga->map8[(dat >> 24) & svga->dac_mask & 0xff];
 
-                svga->ma += 8;
+                svga->memaddr += 8;
                 p += 8;
             }
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr &= svga->vram_display_mask;
         }
     } else {
-        changed_addr = svga->remap_func(svga, svga->ma);
+        changed_addr = svga->remap_func(svga, svga->memaddr);
 
         if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
@@ -766,35 +1102,35 @@ svga_render_8bpp_clone_highres(svga_t *svga)
 
             if (!svga->remap_required) {
                 for (x = 0; x <= (svga->hdisp /* + svga->scrollcache*/); x += 8) {
-                    dat  = *(uint32_t *) (&svga->vram[svga->ma & svga->vram_display_mask]);
-                    p[0] = svga->map8[dat & 0xff];
-                    p[1] = svga->map8[(dat >> 8) & 0xff];
-                    p[2] = svga->map8[(dat >> 16) & 0xff];
-                    p[3] = svga->map8[(dat >> 24) & 0xff];
+                    dat  = *(uint32_t *) (&svga->vram[svga->memaddr & svga->vram_display_mask]);
+                    p[0] = svga->map8[dat & svga->dac_mask & 0xff];
+                    p[1] = svga->map8[(dat >> 8) & svga->dac_mask & 0xff];
+                    p[2] = svga->map8[(dat >> 16) & svga->dac_mask & 0xff];
+                    p[3] = svga->map8[(dat >> 24) & svga->dac_mask & 0xff];
 
-                    dat  = *(uint32_t *) (&svga->vram[(svga->ma + 4) & svga->vram_display_mask]);
-                    p[4] = svga->map8[dat & 0xff];
-                    p[5] = svga->map8[(dat >> 8) & 0xff];
-                    p[6] = svga->map8[(dat >> 16) & 0xff];
-                    p[7] = svga->map8[(dat >> 24) & 0xff];
+                    dat  = *(uint32_t *) (&svga->vram[(svga->memaddr + 4) & svga->vram_display_mask]);
+                    p[4] = svga->map8[dat & svga->dac_mask & 0xff];
+                    p[5] = svga->map8[(dat >> 8) & svga->dac_mask & 0xff];
+                    p[6] = svga->map8[(dat >> 16) & svga->dac_mask & 0xff];
+                    p[7] = svga->map8[(dat >> 24) & svga->dac_mask & 0xff];
 
-                    svga->ma += 8;
+                    svga->memaddr += 8;
                     p += 8;
                 }
             } else {
                 for (x = 0; x <= (svga->hdisp /* + svga->scrollcache*/); x += 4) {
-                    addr = svga->remap_func(svga, svga->ma);
+                    addr = svga->remap_func(svga, svga->memaddr);
                     dat  = *(uint32_t *) (&svga->vram[addr & svga->vram_display_mask]);
-                    p[0] = svga->map8[dat & 0xff];
-                    p[1] = svga->map8[(dat >> 8) & 0xff];
-                    p[2] = svga->map8[(dat >> 16) & 0xff];
-                    p[3] = svga->map8[(dat >> 24) & 0xff];
+                    p[0] = svga->map8[dat & svga->dac_mask & 0xff];
+                    p[1] = svga->map8[(dat >> 8) & svga->dac_mask & 0xff];
+                    p[2] = svga->map8[(dat >> 16) & svga->dac_mask & 0xff];
+                    p[3] = svga->map8[(dat >> 24) & svga->dac_mask & 0xff];
 
-                    svga->ma += 4;
+                    svga->memaddr += 4;
                     p += 4;
                 }
             }
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr &= svga->vram_display_mask;
         }
     }
 }
@@ -814,7 +1150,7 @@ svga_render_8bpp_lowres(svga_t *svga)
         return;
 
     if (svga->force_old_addr) {
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+        if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
 
             if (svga->firstline_draw == 2000)
@@ -822,20 +1158,20 @@ svga_render_8bpp_lowres(svga_t *svga)
             svga->lastline_draw = svga->displine;
 
             for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-                dat = *(uint32_t *) (&svga->vram[svga->ma & svga->vram_display_mask]);
+                dat = *(uint32_t *) (&svga->vram[svga->memaddr & svga->vram_display_mask]);
 
                 p[0] = p[1] = svga->map8[dat & 0xff];
                 p[2] = p[3] = svga->map8[(dat >> 8) & 0xff];
                 p[4] = p[5] = svga->map8[(dat >> 16) & 0xff];
                 p[6] = p[7] = svga->map8[(dat >> 24) & 0xff];
 
-                svga->ma += 4;
+                svga->memaddr += 4;
                 p += 8;
             }
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr &= svga->vram_display_mask;
         }
     } else {
-        changed_addr = svga->remap_func(svga, svga->ma);
+        changed_addr = svga->remap_func(svga, svga->memaddr);
 
         if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
@@ -846,29 +1182,29 @@ svga_render_8bpp_lowres(svga_t *svga)
 
             if (!svga->remap_required) {
                 for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-                    dat  = *(uint32_t *) (&svga->vram[svga->ma & svga->vram_display_mask]);
-                    p[0] = p[1] = svga->map8[dat & 0xff];
-                    p[2] = p[3] = svga->map8[(dat >> 8) & 0xff];
-                    p[4] = p[5] = svga->map8[(dat >> 16) & 0xff];
-                    p[6] = p[7] = svga->map8[(dat >> 24) & 0xff];
+                    dat  = *(uint32_t *) (&svga->vram[svga->memaddr & svga->vram_display_mask]);
+                    p[0] = p[1] = svga->map8[dat & svga->dac_mask & 0xff];
+                    p[2] = p[3] = svga->map8[(dat >> 8) & svga->dac_mask & 0xff];
+                    p[4] = p[5] = svga->map8[(dat >> 16) & svga->dac_mask & 0xff];
+                    p[6] = p[7] = svga->map8[(dat >> 24) & svga->dac_mask & 0xff];
 
-                    svga->ma += 4;
+                    svga->memaddr += 4;
                     p += 8;
                 }
             } else {
                 for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-                    addr = svga->remap_func(svga, svga->ma);
+                    addr = svga->remap_func(svga, svga->memaddr);
                     dat  = *(uint32_t *) (&svga->vram[addr & svga->vram_display_mask]);
-                    p[0] = p[1] = svga->map8[dat & 0xff];
-                    p[2] = p[3] = svga->map8[(dat >> 8) & 0xff];
-                    p[4] = p[5] = svga->map8[(dat >> 16) & 0xff];
-                    p[6] = p[7] = svga->map8[(dat >> 24) & 0xff];
+                    p[0] = p[1] = svga->map8[dat & svga->dac_mask & 0xff];
+                    p[2] = p[3] = svga->map8[(dat >> 8) & svga->dac_mask & 0xff];
+                    p[4] = p[5] = svga->map8[(dat >> 16) & svga->dac_mask & 0xff];
+                    p[6] = p[7] = svga->map8[(dat >> 24) & svga->dac_mask & 0xff];
 
-                    svga->ma += 4;
+                    svga->memaddr += 4;
                     p += 8;
                 }
             }
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr &= svga->vram_display_mask;
         }
     }
 }
@@ -886,7 +1222,7 @@ svga_render_8bpp_highres(svga_t *svga)
         return;
 
     if (svga->force_old_addr) {
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+        if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
 
             if (svga->firstline_draw == 2000)
@@ -894,25 +1230,25 @@ svga_render_8bpp_highres(svga_t *svga)
             svga->lastline_draw = svga->displine;
 
             for (x = 0; x <= (svga->hdisp /* + svga->scrollcache*/); x += 8) {
-                dat  = *(uint32_t *) (&svga->vram[svga->ma & svga->vram_display_mask]);
-                p[0] = svga->map8[dat & 0xff];
-                p[1] = svga->map8[(dat >> 8) & 0xff];
-                p[2] = svga->map8[(dat >> 16) & 0xff];
-                p[3] = svga->map8[(dat >> 24) & 0xff];
+                dat  = *(uint32_t *) (&svga->vram[svga->memaddr & svga->vram_display_mask]);
+                p[0] = svga->map8[dat & svga->dac_mask & 0xff];
+                p[1] = svga->map8[(dat >> 8) & svga->dac_mask & 0xff];
+                p[2] = svga->map8[(dat >> 16) & svga->dac_mask & 0xff];
+                p[3] = svga->map8[(dat >> 24) & svga->dac_mask & 0xff];
 
-                dat  = *(uint32_t *) (&svga->vram[(svga->ma + 4) & svga->vram_display_mask]);
-                p[4] = svga->map8[dat & 0xff];
-                p[5] = svga->map8[(dat >> 8) & 0xff];
-                p[6] = svga->map8[(dat >> 16) & 0xff];
-                p[7] = svga->map8[(dat >> 24) & 0xff];
+                dat  = *(uint32_t *) (&svga->vram[(svga->memaddr + 4) & svga->vram_display_mask]);
+                p[4] = svga->map8[dat & svga->dac_mask & 0xff];
+                p[5] = svga->map8[(dat >> 8) & svga->dac_mask & 0xff];
+                p[6] = svga->map8[(dat >> 16) & svga->dac_mask & 0xff];
+                p[7] = svga->map8[(dat >> 24) & svga->dac_mask & 0xff];
 
-                svga->ma += 8;
+                svga->memaddr += 8;
                 p += 8;
             }
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr &= svga->vram_display_mask;
         }
     } else {
-        changed_addr = svga->remap_func(svga, svga->ma);
+        changed_addr = svga->remap_func(svga, svga->memaddr);
 
         if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
@@ -923,35 +1259,35 @@ svga_render_8bpp_highres(svga_t *svga)
 
             if (!svga->remap_required) {
                 for (x = 0; x <= (svga->hdisp /* + svga->scrollcache*/); x += 8) {
-                    dat  = *(uint32_t *) (&svga->vram[svga->ma & svga->vram_display_mask]);
-                    p[0] = svga->map8[dat & 0xff];
-                    p[1] = svga->map8[(dat >> 8) & 0xff];
-                    p[2] = svga->map8[(dat >> 16) & 0xff];
-                    p[3] = svga->map8[(dat >> 24) & 0xff];
+                    dat  = *(uint32_t *) (&svga->vram[svga->memaddr & svga->vram_display_mask]);
+                    p[0] = svga->map8[dat & svga->dac_mask & 0xff];
+                    p[1] = svga->map8[(dat >> 8) & svga->dac_mask & 0xff];
+                    p[2] = svga->map8[(dat >> 16) & svga->dac_mask & 0xff];
+                    p[3] = svga->map8[(dat >> 24) & svga->dac_mask & 0xff];
 
-                    dat  = *(uint32_t *) (&svga->vram[(svga->ma + 4) & svga->vram_display_mask]);
-                    p[4] = svga->map8[dat & 0xff];
-                    p[5] = svga->map8[(dat >> 8) & 0xff];
-                    p[6] = svga->map8[(dat >> 16) & 0xff];
-                    p[7] = svga->map8[(dat >> 24) & 0xff];
+                    dat  = *(uint32_t *) (&svga->vram[(svga->memaddr + 4) & svga->vram_display_mask]);
+                    p[4] = svga->map8[dat & svga->dac_mask & 0xff];
+                    p[5] = svga->map8[(dat >> 8) & svga->dac_mask & 0xff];
+                    p[6] = svga->map8[(dat >> 16) & svga->dac_mask & 0xff];
+                    p[7] = svga->map8[(dat >> 24) & svga->dac_mask & 0xff];
 
-                    svga->ma += 8;
+                    svga->memaddr += 8;
                     p += 8;
                 }
             } else {
                 for (x = 0; x <= (svga->hdisp /* + svga->scrollcache*/); x += 4) {
-                    addr = svga->remap_func(svga, svga->ma);
+                    addr = svga->remap_func(svga, svga->memaddr);
                     dat  = *(uint32_t *) (&svga->vram[addr & svga->vram_display_mask]);
-                    p[0] = svga->map8[dat & 0xff];
-                    p[1] = svga->map8[(dat >> 8) & 0xff];
-                    p[2] = svga->map8[(dat >> 16) & 0xff];
-                    p[3] = svga->map8[(dat >> 24) & 0xff];
+                    p[0] = svga->map8[dat & svga->dac_mask & 0xff];
+                    p[1] = svga->map8[(dat >> 8) & svga->dac_mask & 0xff];
+                    p[2] = svga->map8[(dat >> 16) & svga->dac_mask & 0xff];
+                    p[3] = svga->map8[(dat >> 24) & svga->dac_mask & 0xff];
 
-                    svga->ma += 4;
+                    svga->memaddr += 4;
                     p += 4;
                 }
             }
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr &= svga->vram_display_mask;
         }
     }
 }
@@ -966,35 +1302,47 @@ svga_render_8bpp_tseng_lowres(svga_t *svga)
     if ((svga->displine + svga->y_add) < 0)
         return;
 
-    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+    if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->fullchange || svga->render_line_offset) {
         p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
 
         if (svga->firstline_draw == 2000)
             svga->firstline_draw = svga->displine;
         svga->lastline_draw = svga->displine;
 
-        for (int x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-            dat = *(uint32_t *) (&svga->vram[svga->ma & svga->vram_display_mask]);
-            if (svga->attrregs[0x10] & 0x80)
-                dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-            p[0] = p[1] = svga->map8[dat & 0xff];
-            dat >>= 8;
-            if (svga->attrregs[0x10] & 0x80)
-                dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-            p[2] = p[3] = svga->map8[dat & 0xff];
-            dat >>= 8;
-            if (svga->attrregs[0x10] & 0x80)
-                dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-            p[4] = p[5] = svga->map8[dat & 0xff];
-            dat >>= 8;
-            if (svga->attrregs[0x10] & 0x80)
-                dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-            p[6] = p[7] = svga->map8[dat & 0xff];
+        if (svga->render_line_offset) {
+            if (svga->render_line_offset > 0) {
+                memset(p, svga->overscan_color, 8 * svga->render_line_offset * sizeof(uint32_t));
+                p += 8 * svga->render_line_offset;
+            }
+        }
 
-            svga->ma += 4;
+        for (int x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
+            dat = *(uint32_t *) (&svga->vram[svga->memaddr & svga->vram_display_mask]);
+            if (svga->attrregs[0x10] & 0x80)
+                dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
+            p[0] = p[1] = svga->map8[dat & svga->dac_mask & 0xff];
+            dat >>= 8;
+            if (svga->attrregs[0x10] & 0x80)
+                dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
+            p[2] = p[3] = svga->map8[dat & svga->dac_mask & 0xff];
+            dat >>= 8;
+            if (svga->attrregs[0x10] & 0x80)
+                dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
+            p[4] = p[5] = svga->map8[dat & svga->dac_mask & 0xff];
+            dat >>= 8;
+            if (svga->attrregs[0x10] & 0x80)
+                dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
+            p[6] = p[7] = svga->map8[dat & svga->dac_mask & 0xff];
+
+            svga->memaddr += 4;
             p += 8;
         }
-        svga->ma &= svga->vram_display_mask;
+        if (svga->render_line_offset < 0) {
+            uint32_t *orig_line = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
+            memmove(orig_line, orig_line + (8 * -svga->render_line_offset), (svga->hdisp) * 4);
+            memset((orig_line + svga->hdisp) - (8 * -svga->render_line_offset), svga->overscan_color, 8 * -svga->render_line_offset * 4);
+        }
+        svga->memaddr &= svga->vram_display_mask;
     }
 }
 
@@ -1007,52 +1355,66 @@ svga_render_8bpp_tseng_highres(svga_t *svga)
     if ((svga->displine + svga->y_add) < 0)
         return;
 
-    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+    if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->fullchange || svga->render_line_offset) {
         p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
 
         if (svga->firstline_draw == 2000)
             svga->firstline_draw = svga->displine;
         svga->lastline_draw = svga->displine;
 
+        if (svga->render_line_offset) {
+            if (svga->render_line_offset > 0) {
+                memset(p, svga->overscan_color, 8 * svga->render_line_offset * sizeof(uint32_t));
+                p += 8 * svga->render_line_offset;
+            }
+        }
+
         for (int x = 0; x <= (svga->hdisp /* + svga->scrollcache*/); x += 8) {
-            dat = *(uint32_t *) (&svga->vram[svga->ma & svga->vram_display_mask]);
+            dat = *(uint32_t *) (&svga->vram[svga->memaddr & svga->vram_display_mask]);
             if (svga->attrregs[0x10] & 0x80)
                 dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-            p[0] = svga->map8[dat & 0xff];
+            p[0] = svga->map8[dat & svga->dac_mask & 0xff];
             dat >>= 8;
             if (svga->attrregs[0x10] & 0x80)
                 dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-            p[1] = svga->map8[dat & 0xff];
+            p[1] = svga->map8[dat & svga->dac_mask & 0xff];
             dat >>= 8;
             if (svga->attrregs[0x10] & 0x80)
                 dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-            p[2] = svga->map8[dat & 0xff];
+            p[2] = svga->map8[dat & svga->dac_mask & 0xff];
             dat >>= 8;
             if (svga->attrregs[0x10] & 0x80)
                 dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-            p[3] = svga->map8[dat & 0xff];
+            p[3] = svga->map8[dat & svga->dac_mask & 0xff];
 
-            dat = *(uint32_t *) (&svga->vram[(svga->ma + 4) & svga->vram_display_mask]);
+            dat = *(uint32_t *) (&svga->vram[(svga->memaddr + 4) & svga->vram_display_mask]);
             if (svga->attrregs[0x10] & 0x80)
                 dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-            p[4] = svga->map8[dat & 0xff];
+            p[4] = svga->map8[dat & svga->dac_mask & 0xff];
             dat >>= 8;
             if (svga->attrregs[0x10] & 0x80)
                 dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-            p[5] = svga->map8[dat & 0xff];
+            p[5] = svga->map8[dat & svga->dac_mask & 0xff];
             dat >>= 8;
             if (svga->attrregs[0x10] & 0x80)
                 dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-            p[6] = svga->map8[dat & 0xff];
+            p[6] = svga->map8[dat & svga->dac_mask & 0xff];
             dat >>= 8;
             if (svga->attrregs[0x10] & 0x80)
                 dat = (dat & ~0xf0) | ((svga->attrregs[0x14] & 0x0f) << 4);
-            p[7] = svga->map8[dat & 0xff];
+            p[7] = svga->map8[dat & svga->dac_mask & 0xff];
 
-            svga->ma += 8;
+            svga->memaddr += 8;
             p += 8;
         }
-        svga->ma &= svga->vram_display_mask;
+
+        if (svga->render_line_offset < 0) {
+            uint32_t *orig_line = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
+            memmove(orig_line, orig_line + (8 * -svga->render_line_offset), (svga->hdisp) * 4);
+            memset((orig_line + svga->hdisp) - (8 * -svga->render_line_offset), svga->overscan_color, 8 * -svga->render_line_offset * 4);
+        }
+
+        svga->memaddr &= svga->vram_display_mask;
     }
 }
 
@@ -1069,7 +1431,7 @@ svga_render_15bpp_lowres(svga_t *svga)
         return;
 
     if (svga->force_old_addr) {
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+        if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
 
             if (svga->firstline_draw == 2000)
@@ -1077,21 +1439,21 @@ svga_render_15bpp_lowres(svga_t *svga)
             svga->lastline_draw = svga->displine;
 
             for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-                dat = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+                dat = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1)) & svga->vram_display_mask]);
 
                 p[x << 1] = p[(x << 1) + 1] = svga->conv_16to32(svga, dat & 0xffff, 15);
                 p[(x << 1) + 2] = p[(x << 1) + 3] = svga->conv_16to32(svga, dat >> 16, 15);
 
-                dat = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+                dat = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 4) & svga->vram_display_mask]);
 
                 p[(x << 1) + 4] = p[(x << 1) + 5] = svga->conv_16to32(svga, dat & 0xffff, 15);
                 p[(x << 1) + 6] = p[(x << 1) + 7] = svga->conv_16to32(svga, dat >> 16, 15);
             }
-            svga->ma += x << 1;
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr += x << 1;
+            svga->memaddr &= svga->vram_display_mask;
         }
     } else {
-        changed_addr = svga->remap_func(svga, svga->ma);
+        changed_addr = svga->remap_func(svga, svga->memaddr);
 
         if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
@@ -1102,28 +1464,28 @@ svga_render_15bpp_lowres(svga_t *svga)
 
             if (!svga->remap_required) {
                 for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-                    dat = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+                    dat = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1)) & svga->vram_display_mask]);
 
                     *p++ = svga->conv_16to32(svga, dat & 0xffff, 15);
                     *p++ = svga->conv_16to32(svga, dat >> 16, 15);
 
-                    dat = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+                    dat = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 4) & svga->vram_display_mask]);
 
                     *p++ = svga->conv_16to32(svga, dat & 0xffff, 15);
                     *p++ = svga->conv_16to32(svga, dat >> 16, 15);
                 }
-                svga->ma += x << 1;
+                svga->memaddr += x << 1;
             } else {
                 for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 2) {
-                    addr = svga->remap_func(svga, svga->ma);
+                    addr = svga->remap_func(svga, svga->memaddr);
                     dat  = *(uint32_t *) (&svga->vram[addr & svga->vram_display_mask]);
 
                     *p++ = svga->conv_16to32(svga, dat & 0xffff, 15);
                     *p++ = svga->conv_16to32(svga, dat >> 16, 15);
-                    svga->ma += 4;
+                    svga->memaddr += 4;
                 }
             }
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr &= svga->vram_display_mask;
         }
     }
 }
@@ -1141,7 +1503,7 @@ svga_render_15bpp_highres(svga_t *svga)
         return;
 
     if (svga->force_old_addr) {
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+        if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
 
             if (svga->firstline_draw == 2000)
@@ -1149,27 +1511,27 @@ svga_render_15bpp_highres(svga_t *svga)
             svga->lastline_draw = svga->displine;
 
             for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-                dat      = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+                dat      = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1)) & svga->vram_display_mask]);
                 p[x]     = svga->conv_16to32(svga, dat & 0xffff, 15);
                 p[x + 1] = svga->conv_16to32(svga, dat >> 16, 15);
 
-                dat      = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+                dat      = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 4) & svga->vram_display_mask]);
                 p[x + 2] = svga->conv_16to32(svga, dat & 0xffff, 15);
                 p[x + 3] = svga->conv_16to32(svga, dat >> 16, 15);
 
-                dat      = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
+                dat      = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 8) & svga->vram_display_mask]);
                 p[x + 4] = svga->conv_16to32(svga, dat & 0xffff, 15);
                 p[x + 5] = svga->conv_16to32(svga, dat >> 16, 15);
 
-                dat      = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
+                dat      = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 12) & svga->vram_display_mask]);
                 p[x + 6] = svga->conv_16to32(svga, dat & 0xffff, 15);
                 p[x + 7] = svga->conv_16to32(svga, dat >> 16, 15);
             }
-            svga->ma += x << 1;
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr += x << 1;
+            svga->memaddr &= svga->vram_display_mask;
         }
     } else {
-        changed_addr = svga->remap_func(svga, svga->ma);
+        changed_addr = svga->remap_func(svga, svga->memaddr);
 
         if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
@@ -1180,34 +1542,34 @@ svga_render_15bpp_highres(svga_t *svga)
 
             if (!svga->remap_required) {
                 for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-                    dat  = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+                    dat  = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1)) & svga->vram_display_mask]);
                     *p++ = svga->conv_16to32(svga, dat & 0xffff, 15);
                     *p++ = svga->conv_16to32(svga, dat >> 16, 15);
 
-                    dat  = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+                    dat  = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 4) & svga->vram_display_mask]);
                     *p++ = svga->conv_16to32(svga, dat & 0xffff, 15);
                     *p++ = svga->conv_16to32(svga, dat >> 16, 15);
 
-                    dat  = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
+                    dat  = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 8) & svga->vram_display_mask]);
                     *p++ = svga->conv_16to32(svga, dat & 0xffff, 15);
                     *p++ = svga->conv_16to32(svga, dat >> 16, 15);
 
-                    dat  = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
+                    dat  = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 12) & svga->vram_display_mask]);
                     *p++ = svga->conv_16to32(svga, dat & 0xffff, 15);
                     *p++ = svga->conv_16to32(svga, dat >> 16, 15);
                 }
-                svga->ma += x << 1;
+                svga->memaddr += x << 1;
             } else {
                 for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 2) {
-                    addr = svga->remap_func(svga, svga->ma);
+                    addr = svga->remap_func(svga, svga->memaddr);
                     dat  = *(uint32_t *) (&svga->vram[addr & svga->vram_display_mask]);
 
                     *p++ = svga->conv_16to32(svga, dat & 0xffff, 15);
                     *p++ = svga->conv_16to32(svga, dat >> 16, 15);
-                    svga->ma += 4;
+                    svga->memaddr += 4;
                 }
             }
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr &= svga->vram_display_mask;
         }
     }
 }
@@ -1222,7 +1584,7 @@ svga_render_15bpp_mix_lowres(svga_t *svga)
     if ((svga->displine + svga->y_add) < 0)
         return;
 
-    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+    if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->fullchange) {
         p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
 
         if (svga->firstline_draw == 2000)
@@ -1230,20 +1592,20 @@ svga_render_15bpp_mix_lowres(svga_t *svga)
         svga->lastline_draw = svga->displine;
 
         for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-            dat       = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+            dat       = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1)) & svga->vram_display_mask]);
             p[x << 1] = p[(x << 1) + 1] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : svga->conv_16to32(svga, dat & 0xffff, 15);
 
             dat >>= 16;
             p[(x << 1) + 2] = p[(x << 1) + 3] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : svga->conv_16to32(svga, dat & 0xffff, 15);
 
-            dat             = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+            dat             = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 4) & svga->vram_display_mask]);
             p[(x << 1) + 4] = p[(x << 1) + 5] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : svga->conv_16to32(svga, dat & 0xffff, 15);
 
             dat >>= 16;
             p[(x << 1) + 6] = p[(x << 1) + 7] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : svga->conv_16to32(svga, dat & 0xffff, 15);
         }
-        svga->ma += x << 1;
-        svga->ma &= svga->vram_display_mask;
+        svga->memaddr += x << 1;
+        svga->memaddr &= svga->vram_display_mask;
     }
 }
 
@@ -1257,7 +1619,7 @@ svga_render_15bpp_mix_highres(svga_t *svga)
     if ((svga->displine + svga->y_add) < 0)
         return;
 
-    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+    if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->fullchange) {
         p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
 
         if (svga->firstline_draw == 2000)
@@ -1265,28 +1627,28 @@ svga_render_15bpp_mix_highres(svga_t *svga)
         svga->lastline_draw = svga->displine;
 
         for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-            dat  = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+            dat  = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1)) & svga->vram_display_mask]);
             p[x] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : svga->conv_16to32(svga, dat & 0xffff, 15);
             dat >>= 16;
             p[x + 1] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : svga->conv_16to32(svga, dat & 0xffff, 15);
 
-            dat      = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+            dat      = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 4) & svga->vram_display_mask]);
             p[x + 2] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : svga->conv_16to32(svga, dat & 0xffff, 15);
             dat >>= 16;
             p[x + 3] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : svga->conv_16to32(svga, dat & 0xffff, 15);
 
-            dat      = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
+            dat      = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 8) & svga->vram_display_mask]);
             p[x + 4] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : svga->conv_16to32(svga, dat & 0xffff, 15);
             dat >>= 16;
             p[x + 5] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : svga->conv_16to32(svga, dat & 0xffff, 15);
 
-            dat      = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
+            dat      = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 12) & svga->vram_display_mask]);
             p[x + 6] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : svga->conv_16to32(svga, dat & 0xffff, 15);
             dat >>= 16;
             p[x + 7] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : svga->conv_16to32(svga, dat & 0xffff, 15);
         }
-        svga->ma += x << 1;
-        svga->ma &= svga->vram_display_mask;
+        svga->memaddr += x << 1;
+        svga->memaddr &= svga->vram_display_mask;
     }
 }
 
@@ -1303,7 +1665,7 @@ svga_render_16bpp_lowres(svga_t *svga)
         return;
 
     if (svga->force_old_addr) {
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+        if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
 
             if (svga->firstline_draw == 2000)
@@ -1311,19 +1673,19 @@ svga_render_16bpp_lowres(svga_t *svga)
             svga->lastline_draw = svga->displine;
 
             for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-                dat       = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+                dat       = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1)) & svga->vram_display_mask]);
                 p[x << 1] = p[(x << 1) + 1] = svga->conv_16to32(svga, dat & 0xffff, 16);
                 p[(x << 1) + 2] = p[(x << 1) + 3] = svga->conv_16to32(svga, dat >> 16, 16);
 
-                dat             = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+                dat             = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 4) & svga->vram_display_mask]);
                 p[(x << 1) + 4] = p[(x << 1) + 5] = svga->conv_16to32(svga, dat & 0xffff, 16);
                 p[(x << 1) + 6] = p[(x << 1) + 7] = svga->conv_16to32(svga, dat >> 16, 16);
             }
-            svga->ma += x << 1;
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr += x << 1;
+            svga->memaddr &= svga->vram_display_mask;
         }
     } else {
-        changed_addr = svga->remap_func(svga, svga->ma);
+        changed_addr = svga->remap_func(svga, svga->memaddr);
 
         if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
@@ -1334,28 +1696,28 @@ svga_render_16bpp_lowres(svga_t *svga)
 
             if (!svga->remap_required) {
                 for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-                    dat = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+                    dat = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1)) & svga->vram_display_mask]);
 
                     *p++ = svga->conv_16to32(svga, dat & 0xffff, 16);
                     *p++ = svga->conv_16to32(svga, dat >> 16, 16);
 
-                    dat = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+                    dat = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 4) & svga->vram_display_mask]);
 
                     *p++ = svga->conv_16to32(svga, dat & 0xffff, 16);
                     *p++ = svga->conv_16to32(svga, dat >> 16, 16);
                 }
-                svga->ma += x << 1;
+                svga->memaddr += x << 1;
             } else {
                 for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 2) {
-                    addr = svga->remap_func(svga, svga->ma);
+                    addr = svga->remap_func(svga, svga->memaddr);
                     dat  = *(uint32_t *) (&svga->vram[addr & svga->vram_display_mask]);
 
                     *p++ = svga->conv_16to32(svga, dat & 0xffff, 16);
                     *p++ = svga->conv_16to32(svga, dat >> 16, 16);
                 }
-                svga->ma += 4;
+                svga->memaddr += 4;
             }
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr &= svga->vram_display_mask;
         }
     }
 }
@@ -1373,7 +1735,7 @@ svga_render_16bpp_highres(svga_t *svga)
         return;
 
     if (svga->force_old_addr) {
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+        if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
 
             if (svga->firstline_draw == 2000)
@@ -1381,27 +1743,27 @@ svga_render_16bpp_highres(svga_t *svga)
             svga->lastline_draw = svga->displine;
 
             for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-                uint32_t dat = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+                uint32_t dat = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1)) & svga->vram_display_mask]);
                 p[x]         = svga->conv_16to32(svga, dat & 0xffff, 16);
                 p[x + 1]     = svga->conv_16to32(svga, dat >> 16, 16);
 
-                dat      = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+                dat      = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 4) & svga->vram_display_mask]);
                 p[x + 2] = svga->conv_16to32(svga, dat & 0xffff, 16);
                 p[x + 3] = svga->conv_16to32(svga, dat >> 16, 16);
 
-                dat      = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
+                dat      = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 8) & svga->vram_display_mask]);
                 p[x + 4] = svga->conv_16to32(svga, dat & 0xffff, 16);
                 p[x + 5] = svga->conv_16to32(svga, dat >> 16, 16);
 
-                dat      = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
+                dat      = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 12) & svga->vram_display_mask]);
                 p[x + 6] = svga->conv_16to32(svga, dat & 0xffff, 16);
                 p[x + 7] = svga->conv_16to32(svga, dat >> 16, 16);
             }
-            svga->ma += x << 1;
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr += x << 1;
+            svga->memaddr &= svga->vram_display_mask;
         }
     } else {
-        changed_addr = svga->remap_func(svga, svga->ma);
+        changed_addr = svga->remap_func(svga, svga->memaddr);
 
         if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
@@ -1412,35 +1774,35 @@ svga_render_16bpp_highres(svga_t *svga)
 
             if (!svga->remap_required) {
                 for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-                    dat  = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+                    dat  = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1)) & svga->vram_display_mask]);
                     *p++ = svga->conv_16to32(svga, dat & 0xffff, 16);
                     *p++ = svga->conv_16to32(svga, dat >> 16, 16);
 
-                    dat  = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+                    dat  = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 4) & svga->vram_display_mask]);
                     *p++ = svga->conv_16to32(svga, dat & 0xffff, 16);
                     *p++ = svga->conv_16to32(svga, dat >> 16, 16);
 
-                    dat  = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
+                    dat  = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 8) & svga->vram_display_mask]);
                     *p++ = svga->conv_16to32(svga, dat & 0xffff, 16);
                     *p++ = svga->conv_16to32(svga, dat >> 16, 16);
 
-                    dat  = *(uint32_t *) (&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
+                    dat  = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 1) + 12) & svga->vram_display_mask]);
                     *p++ = svga->conv_16to32(svga, dat & 0xffff, 16);
                     *p++ = svga->conv_16to32(svga, dat >> 16, 16);
                 }
-                svga->ma += x << 1;
+                svga->memaddr += x << 1;
             } else {
                 for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 2) {
-                    addr = svga->remap_func(svga, svga->ma);
+                    addr = svga->remap_func(svga, svga->memaddr);
                     dat  = *(uint32_t *) (&svga->vram[addr & svga->vram_display_mask]);
 
                     *p++ = svga->conv_16to32(svga, dat & 0xffff, 16);
                     *p++ = svga->conv_16to32(svga, dat >> 16, 16);
 
-                    svga->ma += 4;
+                    svga->memaddr += 4;
                 }
             }
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr &= svga->vram_display_mask;
         }
     }
 }
@@ -1464,20 +1826,20 @@ svga_render_24bpp_lowres(svga_t *svga)
         if ((svga->displine + svga->y_add) < 0)
             return;
 
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+        if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->fullchange) {
             if (svga->firstline_draw == 2000)
                 svga->firstline_draw = svga->displine;
             svga->lastline_draw = svga->displine;
 
             for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-                fg = svga->vram[svga->ma] | (svga->vram[svga->ma + 1] << 8) | (svga->vram[svga->ma + 2] << 16);
-                svga->ma += 3;
-                svga->ma &= svga->vram_display_mask;
+                fg = svga->vram[svga->memaddr] | (svga->vram[svga->memaddr + 1] << 8) | (svga->vram[svga->memaddr + 2] << 16);
+                svga->memaddr += 3;
+                svga->memaddr &= svga->vram_display_mask;
                 svga->monitor->target_buffer->line[svga->displine + svga->y_add][(x << 1) + svga->x_add] = svga->monitor->target_buffer->line[svga->displine + svga->y_add][(x << 1) + 1 + svga->x_add] = lookup_lut(fg);
             }
         }
     } else {
-        changed_addr = svga->remap_func(svga, svga->ma);
+        changed_addr = svga->remap_func(svga, svga->memaddr);
 
         if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
@@ -1488,24 +1850,24 @@ svga_render_24bpp_lowres(svga_t *svga)
 
             if (!svga->remap_required) {
                 for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-                    dat0 = *(uint32_t *) (&svga->vram[svga->ma & svga->vram_display_mask]);
-                    dat1 = *(uint32_t *) (&svga->vram[(svga->ma + 4) & svga->vram_display_mask]);
-                    dat2 = *(uint32_t *) (&svga->vram[(svga->ma + 8) & svga->vram_display_mask]);
+                    dat0 = *(uint32_t *) (&svga->vram[svga->memaddr & svga->vram_display_mask]);
+                    dat1 = *(uint32_t *) (&svga->vram[(svga->memaddr + 4) & svga->vram_display_mask]);
+                    dat2 = *(uint32_t *) (&svga->vram[(svga->memaddr + 8) & svga->vram_display_mask]);
 
                     p[0] = p[1] = lookup_lut(dat0 & 0xffffff);
                     p[2] = p[3] = lookup_lut((dat0 >> 24) | ((dat1 & 0xffff) << 8));
                     p[4] = p[5] = lookup_lut((dat1 >> 16) | ((dat2 & 0xff) << 16));
                     p[6] = p[7] = lookup_lut(dat2 >> 8);
 
-                    svga->ma += 12;
+                    svga->memaddr += 12;
                 }
             } else {
                 for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-                    addr = svga->remap_func(svga, svga->ma);
+                    addr = svga->remap_func(svga, svga->memaddr);
                     dat0 = *(uint32_t *) (&svga->vram[addr & svga->vram_display_mask]);
-                    addr = svga->remap_func(svga, svga->ma + 4);
+                    addr = svga->remap_func(svga, svga->memaddr + 4);
                     dat1 = *(uint32_t *) (&svga->vram[addr & svga->vram_display_mask]);
-                    addr = svga->remap_func(svga, svga->ma + 8);
+                    addr = svga->remap_func(svga, svga->memaddr + 8);
                     dat2 = *(uint32_t *) (&svga->vram[addr & svga->vram_display_mask]);
 
                     p[0] = p[1] = lookup_lut(dat0 & 0xffffff);
@@ -1513,10 +1875,10 @@ svga_render_24bpp_lowres(svga_t *svga)
                     p[4] = p[5] = lookup_lut((dat1 >> 16) | ((dat2 & 0xff) << 16));
                     p[6] = p[7] = lookup_lut(dat2 >> 8);
 
-                    svga->ma += 12;
+                    svga->memaddr += 12;
                 }
             }
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr &= svga->vram_display_mask;
         }
     }
 }
@@ -1537,7 +1899,7 @@ svga_render_24bpp_highres(svga_t *svga)
         return;
 
     if (svga->force_old_addr) {
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+        if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
 
             if (svga->firstline_draw == 2000)
@@ -1545,24 +1907,24 @@ svga_render_24bpp_highres(svga_t *svga)
             svga->lastline_draw = svga->displine;
 
             for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-                dat  = *(uint32_t *) (&svga->vram[svga->ma & svga->vram_display_mask]);
+                dat  = *(uint32_t *) (&svga->vram[svga->memaddr & svga->vram_display_mask]);
                 p[x] = lookup_lut(dat & 0xffffff);
 
-                dat      = *(uint32_t *) (&svga->vram[(svga->ma + 3) & svga->vram_display_mask]);
+                dat      = *(uint32_t *) (&svga->vram[(svga->memaddr + 3) & svga->vram_display_mask]);
                 p[x + 1] = lookup_lut(dat & 0xffffff);
 
-                dat      = *(uint32_t *) (&svga->vram[(svga->ma + 6) & svga->vram_display_mask]);
+                dat      = *(uint32_t *) (&svga->vram[(svga->memaddr + 6) & svga->vram_display_mask]);
                 p[x + 2] = lookup_lut(dat & 0xffffff);
 
-                dat      = *(uint32_t *) (&svga->vram[(svga->ma + 9) & svga->vram_display_mask]);
+                dat      = *(uint32_t *) (&svga->vram[(svga->memaddr + 9) & svga->vram_display_mask]);
                 p[x + 3] = lookup_lut(dat & 0xffffff);
 
-                svga->ma += 12;
+                svga->memaddr += 12;
             }
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr &= svga->vram_display_mask;
         }
     } else {
-        changed_addr = svga->remap_func(svga, svga->ma);
+        changed_addr = svga->remap_func(svga, svga->memaddr);
 
         if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
@@ -1573,24 +1935,24 @@ svga_render_24bpp_highres(svga_t *svga)
 
             if (!svga->remap_required) {
                 for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-                    dat0 = *(uint32_t *) (&svga->vram[svga->ma & svga->vram_display_mask]);
-                    dat1 = *(uint32_t *) (&svga->vram[(svga->ma + 4) & svga->vram_display_mask]);
-                    dat2 = *(uint32_t *) (&svga->vram[(svga->ma + 8) & svga->vram_display_mask]);
+                    dat0 = *(uint32_t *) (&svga->vram[svga->memaddr & svga->vram_display_mask]);
+                    dat1 = *(uint32_t *) (&svga->vram[(svga->memaddr + 4) & svga->vram_display_mask]);
+                    dat2 = *(uint32_t *) (&svga->vram[(svga->memaddr + 8) & svga->vram_display_mask]);
 
                     *p++ = lookup_lut(dat0 & 0xffffff);
                     *p++ = lookup_lut((dat0 >> 24) | ((dat1 & 0xffff) << 8));
                     *p++ = lookup_lut((dat1 >> 16) | ((dat2 & 0xff) << 16));
                     *p++ = lookup_lut(dat2 >> 8);
 
-                    svga->ma += 12;
+                    svga->memaddr += 12;
                 }
             } else {
                 for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-                    addr = svga->remap_func(svga, svga->ma);
+                    addr = svga->remap_func(svga, svga->memaddr);
                     dat0 = *(uint32_t *) (&svga->vram[addr & svga->vram_display_mask]);
-                    addr = svga->remap_func(svga, svga->ma + 4);
+                    addr = svga->remap_func(svga, svga->memaddr + 4);
                     dat1 = *(uint32_t *) (&svga->vram[addr & svga->vram_display_mask]);
-                    addr = svga->remap_func(svga, svga->ma + 8);
+                    addr = svga->remap_func(svga, svga->memaddr + 8);
                     dat2 = *(uint32_t *) (&svga->vram[addr & svga->vram_display_mask]);
 
                     *p++ = lookup_lut(dat0 & 0xffffff);
@@ -1598,10 +1960,10 @@ svga_render_24bpp_highres(svga_t *svga)
                     *p++ = lookup_lut((dat1 >> 16) | ((dat2 & 0xff) << 16));
                     *p++ = lookup_lut(dat2 >> 8);
 
-                    svga->ma += 12;
+                    svga->memaddr += 12;
                 }
             }
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr &= svga->vram_display_mask;
         }
     }
 }
@@ -1619,20 +1981,20 @@ svga_render_32bpp_lowres(svga_t *svga)
         return;
 
     if (svga->force_old_addr) {
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+        if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->fullchange) {
             if (svga->firstline_draw == 2000)
                 svga->firstline_draw = svga->displine;
             svga->lastline_draw = svga->displine;
 
             for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-                dat = svga->vram[svga->ma] | (svga->vram[svga->ma + 1] << 8) | (svga->vram[svga->ma + 2] << 16);
-                svga->ma += 4;
-                svga->ma &= svga->vram_display_mask;
+                dat = svga->vram[svga->memaddr] | (svga->vram[svga->memaddr + 1] << 8) | (svga->vram[svga->memaddr + 2] << 16);
+                svga->memaddr += 4;
+                svga->memaddr &= svga->vram_display_mask;
                 svga->monitor->target_buffer->line[svga->displine + svga->y_add][(x << 1) + svga->x_add] = svga->monitor->target_buffer->line[svga->displine + svga->y_add][(x << 1) + 1 + svga->x_add] = lookup_lut(dat);
             }
         }
     } else {
-        changed_addr = svga->remap_func(svga, svga->ma);
+        changed_addr = svga->remap_func(svga, svga->memaddr);
 
         if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
@@ -1643,20 +2005,20 @@ svga_render_32bpp_lowres(svga_t *svga)
 
             if (!svga->remap_required) {
                 for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-                    dat  = *(uint32_t *) (&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
+                    dat  = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 2)) & svga->vram_display_mask]);
                     *p++ = lookup_lut(dat & 0xffffff);
                     *p++ = lookup_lut(dat & 0xffffff);
                 }
-                svga->ma += (x * 4);
+                svga->memaddr += (x * 4);
             } else {
                 for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-                    addr = svga->remap_func(svga, svga->ma);
+                    addr = svga->remap_func(svga, svga->memaddr);
                     dat  = *(uint32_t *) (&svga->vram[addr & svga->vram_display_mask]);
                     *p++ = lookup_lut(dat & 0xffffff);
                     *p++ = lookup_lut(dat & 0xffffff);
-                    svga->ma += 4;
+                    svga->memaddr += 4;
                 }
-                svga->ma &= svga->vram_display_mask;
+                svga->memaddr &= svga->vram_display_mask;
             }
         }
     }
@@ -1675,7 +2037,7 @@ svga_render_32bpp_highres(svga_t *svga)
         return;
 
     if (svga->force_old_addr) {
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->changedvram[(svga->ma >> 12) + 2] || svga->fullchange) {
+        if (svga->changedvram[svga->memaddr >> 12] || svga->changedvram[(svga->memaddr >> 12) + 1] || svga->changedvram[(svga->memaddr >> 12) + 2] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
 
             if (svga->firstline_draw == 2000)
@@ -1683,14 +2045,14 @@ svga_render_32bpp_highres(svga_t *svga)
             svga->lastline_draw = svga->displine;
 
             for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-                dat  = *(uint32_t *) (&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
+                dat  = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 2)) & svga->vram_display_mask]);
                 p[x] = lookup_lut(dat & 0xffffff);
             }
-            svga->ma += 4;
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr += 4;
+            svga->memaddr &= svga->vram_display_mask;
         }
     } else {
-        changed_addr = svga->remap_func(svga, svga->ma);
+        changed_addr = svga->remap_func(svga, svga->memaddr);
 
         if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
             p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
@@ -1701,20 +2063,20 @@ svga_render_32bpp_highres(svga_t *svga)
 
             if (!svga->remap_required) {
                 for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-                    dat  = *(uint32_t *) (&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
+                    dat  = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 2)) & svga->vram_display_mask]);
                     *p++ = lookup_lut(dat & 0xffffff);
                 }
-                svga->ma += (x * 4);
+                svga->memaddr += (x * 4);
             } else {
                 for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-                    addr = svga->remap_func(svga, svga->ma);
+                    addr = svga->remap_func(svga, svga->memaddr);
                     dat  = *(uint32_t *) (&svga->vram[addr & svga->vram_display_mask]);
                     *p++ = lookup_lut(dat & 0xffffff);
 
-                    svga->ma += 4;
+                    svga->memaddr += 4;
                 }
             }
-            svga->ma &= svga->vram_display_mask;
+            svga->memaddr &= svga->vram_display_mask;
         }
     }
 }
@@ -1731,7 +2093,7 @@ svga_render_ABGR8888_highres(svga_t *svga)
     if ((svga->displine + svga->y_add) < 0)
         return;
 
-    changed_addr = svga->remap_func(svga, svga->ma);
+    changed_addr = svga->remap_func(svga, svga->memaddr);
 
     if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
         p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
@@ -1742,20 +2104,20 @@ svga_render_ABGR8888_highres(svga_t *svga)
 
         if (!svga->remap_required) {
             for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-                dat  = *(uint32_t *) (&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
+                dat  = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 2)) & svga->vram_display_mask]);
                 *p++ = lookup_lut(((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16));
             }
-            svga->ma += x * 4;
+            svga->memaddr += x * 4;
         } else {
             for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-                addr = svga->remap_func(svga, svga->ma);
+                addr = svga->remap_func(svga, svga->memaddr);
                 dat  = *(uint32_t *) (&svga->vram[addr & svga->vram_display_mask]);
                 *p++ = lookup_lut(((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16));
 
-                svga->ma += 4;
+                svga->memaddr += 4;
             }
         }
-        svga->ma &= svga->vram_display_mask;
+        svga->memaddr &= svga->vram_display_mask;
     }
 }
 
@@ -1771,7 +2133,7 @@ svga_render_RGBA8888_highres(svga_t *svga)
     if ((svga->displine + svga->y_add) < 0)
         return;
 
-    changed_addr = svga->remap_func(svga, svga->ma);
+    changed_addr = svga->remap_func(svga, svga->memaddr);
 
     if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
         p = &svga->monitor->target_buffer->line[svga->displine + svga->y_add][svga->x_add];
@@ -1782,19 +2144,19 @@ svga_render_RGBA8888_highres(svga_t *svga)
 
         if (!svga->remap_required) {
             for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-                dat  = *(uint32_t *) (&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
+                dat  = *(uint32_t *) (&svga->vram[(svga->memaddr + (x << 2)) & svga->vram_display_mask]);
                 *p++ = lookup_lut(dat >> 8);
             }
-            svga->ma += (x * 4);
+            svga->memaddr += (x * 4);
         } else {
             for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-                addr = svga->remap_func(svga, svga->ma);
+                addr = svga->remap_func(svga, svga->memaddr);
                 dat  = *(uint32_t *) (&svga->vram[addr & svga->vram_display_mask]);
                 *p++ = lookup_lut(dat >> 8);
 
-                svga->ma += 4;
+                svga->memaddr += 4;
             }
         }
-        svga->ma &= svga->vram_display_mask;
+        svga->memaddr &= svga->vram_display_mask;
     }
 }
diff --git a/src/video/vid_table.c b/src/video/vid_table.c
index d40f00e13..20a8f311d 100644
--- a/src/video/vid_table.c
+++ b/src/video/vid_table.c
@@ -28,6 +28,7 @@
 #include <86box/machine.h>
 #include <86box/mem.h>
 #include <86box/device.h>
+#include <86box/lpt.h>
 #include <86box/plat.h>
 #include <86box/video.h>
 #include <86box/vid_svga.h>
@@ -47,230 +48,223 @@ static video_timings_t timing_default = { .type = VIDEO_ISA, .write_b = 8, .writ
 
 static int was_reset = 0;
 
-static const device_t vid_none_device = {
-    .name          = "None",
-    .internal_name = "none",
-    .flags         = 0,
-    .local         = 0,
-    .init          = NULL,
-    .close         = NULL,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-static const device_t vid_internal_device = {
-    .name          = "Internal",
-    .internal_name = "internal",
-    .flags         = 0,
-    .local         = 0,
-    .init          = NULL,
-    .close         = NULL,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
 static const VIDEO_CARD
 video_cards[] = {
   // clang-format off
-    { &vid_none_device                                 },
-    { &vid_internal_device                             },
-    { &atiega800p_device                               },
-    { &mach8_vga_isa_device,      VIDEO_FLAG_TYPE_8514 },
-    { &mach32_isa_device,         VIDEO_FLAG_TYPE_8514 },
-    { &mach64gx_isa_device                             },
-    { &ati28800k_device                                },
-    { &ati18800_vga88_device                           },
-    { &ati28800_device                                 },
-    { &compaq_ati28800_device                          },
-#if defined(DEV_BRANCH) && defined(USE_XL24)
-    { &ati28800_wonderxl24_device                      },
-#endif
-    { &ati18800_device                                 },
-#if defined(DEV_BRANCH) && defined(USE_VGAWONDER)
-    { &ati18800_wonder_device                          },
-#endif
-    { &cga_device                                      },
-    { &sega_device                                     },
-    { &gd5401_isa_device                               },
-    { &gd5402_isa_device                               },
-    { &gd5420_isa_device                               },
-    { &gd5422_isa_device                               },
-    { &gd5426_isa_device                               },
-    { &gd5426_diamond_speedstar_pro_a1_isa_device      },
-    { &gd5428_boca_isa_device                          },
-    { &gd5428_isa_device                               },
-    { &gd5429_isa_device                               },
-    { &gd5434_isa_device                               },
-    { &gd5434_diamond_speedstar_64_a3_isa_device       },
-    { &compaq_cga_device                               },
-    { &compaq_cga_2_device                             },
-    { &cpqega_device                                   },
-    { &ega_device                                      },
-    { &g2_gc205_device                                 },
-    { &hercules_device,            VIDEO_FLAG_TYPE_MDA },
-    { &herculesplus_device,        VIDEO_FLAG_TYPE_MDA },
-    { &incolor_device                                  },
-    { &inmos_isa_device,           VIDEO_FLAG_TYPE_XGA },
-    { &im1024_device                                   },
-    { &iskra_ega_device                                },
-    { &et4000_kasan_isa_device                         },
-    { &mda_device,                 VIDEO_FLAG_TYPE_MDA },
-    { &genius_device                                   },
-    { &nga_device                                      },
-    { &ogc_device                                      },
-    { &oti037c_device                                  },
-    { &oti067_device                                   },
-    { &oti077_device                                   },
-    { &paradise_pvga1a_device                          },
-    { &paradise_wd90c11_device                         },
-    { &paradise_wd90c30_device                         },
-    { &colorplus_device                                },
-    { &pgc_device                                      },
-    { &cga_pravetz_device                              },
-    { &radius_svga_multiview_isa_device                },
-    { &realtek_rtg3105_device                          },
-    { &realtek_rtg3106_device                          },
-    { &s3_diamond_stealth_vram_isa_device              },
-    { &s3_orchid_86c911_isa_device                     },
-    { &s3_ami_86c924_isa_device                        },
-    { &s3_metheus_86c928_isa_device                    },
-    { &s3_phoenix_86c801_isa_device                    },
-    { &s3_spea_mirage_86c801_isa_device                },
-    { &sigma_device                                    },
-    { &tvga8900b_device                                },
-    { &tvga8900d_device                                },
-    { &tvga9000b_device                                },
-    { &nec_sv9000_device                               },
-    { &et4000k_isa_device                              },
-    { &et2000_device                                   },
-    { &et3000_isa_device                               },
-    { &et4000_tc6058af_isa_device                      },
-    { &et4000_isa_device                               },
-    { &et4000w32_device                                },
-    { &et4000w32i_isa_device                           },
-    { &vga_device                                      },
-    { &v7_vga_1024i_device                             },
-    { &wy700_device                                    },
-    { &mach32_mca_device,         VIDEO_FLAG_TYPE_8514 },
-    { &gd5426_mca_device                               },
-    { &gd5428_mca_device                               },
-    { &et4000_mca_device                               },
-    { &radius_svga_multiview_mca_device                },
-    { &mach32_pci_device,         VIDEO_FLAG_TYPE_8514 },
-    { &mach64gx_pci_device                             },
-    { &mach64vt2_device                                },
-    { &et4000w32p_videomagic_revb_pci_device           },
-    { &et4000w32p_revc_pci_device                      },
-    { &et4000w32p_cardex_pci_device                    },
-    { &et4000w32p_noncardex_pci_device                 },
-    { &et4000w32p_pci_device                           },
-    { &gd5430_pci_device,                              },
-    { &gd5434_pci_device                               },
-    { &gd5436_pci_device,      VIDEO_FLAG_TYPE_SPECIAL },
-    { &gd5440_pci_device                               },
-    { &gd5446_pci_device,      VIDEO_FLAG_TYPE_SPECIAL },
-    { &gd5446_stb_pci_device,  VIDEO_FLAG_TYPE_SPECIAL },
-    { &gd5480_pci_device                               },
-    { &s3_spea_mercury_lite_86c928_pci_device          },
-    { &s3_diamond_stealth64_964_pci_device             },
-    { &s3_elsa_winner2000_pro_x_964_pci_device         },
-    { &s3_mirocrystal_20sv_964_pci_device              },
-    { &s3_bahamas64_pci_device                         },
-    { &s3_phoenix_vision864_pci_device                 },
-    { &s3_diamond_stealth_se_pci_device                },
-    { &s3_phoenix_trio32_pci_device                    },
-    { &s3_diamond_stealth64_pci_device                 },
-    { &s3_9fx_pci_device                               },
-    { &s3_phoenix_trio64_pci_device                    },
-    { &s3_elsa_winner2000_pro_x_pci_device             },
-    { &s3_mirovideo_40sv_ergo_968_pci_device           },
-    { &s3_9fx_771_pci_device                           },
-    { &s3_phoenix_vision968_pci_device                 },
-    { &s3_spea_mercury_p64v_pci_device                 },
-    { &s3_9fx_531_pci_device                           },
-    { &s3_phoenix_vision868_pci_device                 },
-    { &s3_cardex_trio64vplus_pci_device                },
-    { &s3_phoenix_trio64vplus_pci_device               },
-    { &s3_trio64v2_dx_pci_device                       },
-    { &s3_virge_325_pci_device                         },
-    { &s3_diamond_stealth_2000_pci_device              },
-    { &s3_diamond_stealth_3000_pci_device              },
-    { &s3_stb_velocity_3d_pci_device                   },
-    { &s3_virge_375_pci_device                         },
-    { &s3_diamond_stealth_2000pro_pci_device           },
-    { &s3_virge_385_pci_device                         },
-    { &s3_virge_357_pci_device                         },
-    { &s3_diamond_stealth_4000_pci_device              },
-    { &s3_trio3d2x_pci_device                          },
-    { &millennium_device                               },
-    { &millennium_ii_device                            },
-    { &mystique_device                                 },
-    { &mystique_220_device                             },
-    { &tgui9440_pci_device                             },
-    { &tgui9660_pci_device                             },
-    { &tgui9680_pci_device                             },
-    { &voodoo_banshee_device                           },
-    { &creative_voodoo_banshee_device                  },
-    { &voodoo_3_1000_device                            },
-    { &voodoo_3_2000_device                            },
-    { &voodoo_3_3000_device                            },
-    { &mach32_vlb_device,         VIDEO_FLAG_TYPE_8514 },
-    { &mach64gx_vlb_device                             },
-    { &et4000w32i_vlb_device                           },
-    { &et4000w32p_videomagic_revb_vlb_device           },
-    { &et4000w32p_revc_vlb_device                      },
-    { &et4000w32p_cardex_vlb_device                    },
-    { &et4000w32p_vlb_device                           },
-    { &et4000w32p_noncardex_vlb_device                 },
-    { &gd5424_vlb_device                               },
-    { &gd5426_vlb_device                               },
-    { &gd5428_vlb_device                               },
-    { &gd5428_diamond_speedstar_pro_b1_vlb_device      },
-    { &gd5429_vlb_device                               },
-    { &gd5430_diamond_speedstar_pro_se_a8_vlb_device   },
-    { &gd5430_vlb_device                               },
-    { &gd5434_vlb_device                               },
-    { &s3_metheus_86c928_vlb_device                    },
-    { &s3_mirocrystal_8s_805_vlb_device                },
-    { &s3_mirocrystal_10sd_805_vlb_device              },
-    { &s3_phoenix_86c805_vlb_device                    },
-    { &s3_spea_mirage_86c805_vlb_device                },
-    { &s3_diamond_stealth64_964_vlb_device             },
-    { &s3_mirocrystal_20sv_964_vlb_device              },
-    { &s3_mirocrystal_20sd_864_vlb_device              },
-    { &s3_bahamas64_vlb_device                         },
-    { &s3_phoenix_vision864_vlb_device                 },
-    { &s3_diamond_stealth_se_vlb_device                },
-    { &s3_phoenix_trio32_vlb_device                    },
-    { &s3_diamond_stealth64_vlb_device                 },
-    { &s3_9fx_vlb_device                               },
-    { &s3_phoenix_trio64_vlb_device                    },
-    { &s3_spea_mirage_p64_vlb_device                   },
-    { &s3_phoenix_vision968_vlb_device                 },
-    { &s3_phoenix_vision868_vlb_device                 },
-    { &ht216_32_standalone_device                      },
-    { &tgui9400cxi_device                              },
-    { &tgui9440_vlb_device                             },
-    { &s3_virge_357_agp_device                         },
-    { &s3_diamond_stealth_4000_agp_device              },
-    { &s3_trio3d2x_agp_device                          },
-    { &productiva_g100_device, VIDEO_FLAG_TYPE_SPECIAL },
-    { &velocity_100_agp_device                         },
-    { &velocity_200_agp_device                         },
-    { &voodoo_3_1000_agp_device                        },
-    { &voodoo_3_2000_agp_device                        },
-    { &voodoo_3_3000_agp_device                        },
-    { &voodoo_3_3500_agp_ntsc_device                   },
-    { &voodoo_3_3500_agp_pal_device                    },
-    { &compaq_voodoo_3_3500_agp_device                 },
-    { &voodoo_3_3500_se_agp_device                     },
-    { &voodoo_3_3500_si_agp_device                     },
-    { NULL                                             }
+    { .device = &device_none,                                   .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &device_internal,                               .flags = VIDEO_FLAG_TYPE_NONE },
+    /* ISA */
+    { .device = &ati18800_wonder_device,                        .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &ati18800_vga88_device,                         .flags = VIDEO_FLAG_TYPE_NONE },
+#ifdef USE_XL24
+    { .device = &ati28800_wonderxl24_device,                    .flags = VIDEO_FLAG_TYPE_NONE },
+#endif /* USE_XL24 */
+    { .device = &ati28800_device,                               .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &compaq_ati28800_device,                        .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &ati28800_wonder1024d_xl_plus_device,           .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &atiega800p_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &mach8_vga_isa_device,                          .flags = VIDEO_FLAG_TYPE_8514 },
+    { .device = &mach32_isa_device,                             .flags = VIDEO_FLAG_TYPE_8514 },
+    { .device = &ati28800k_device,                              .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &ati18800_device,                               .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &sega_device,                                   .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5401_isa_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5402_isa_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &colorplus_device,                              .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &compaq_cga_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &compaq_cga_2_device,                           .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &cpqega_device,                                 .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &g2_gc205_device,                               .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &hercules_device,                               .flags = VIDEO_FLAG_TYPE_MDA  },
+    { .device = &herculesplus_device,                           .flags = VIDEO_FLAG_TYPE_MDA  },
+    { .device = &incolor_device,                                .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &cga_device,                                    .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &ega_device,                                    .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &mda_device,                                    .flags = VIDEO_FLAG_TYPE_MDA  },
+    { .device = &pgc_device,                                    .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &vga_device,                                    .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &im1024_device,                                 .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &iskra_ega_device,                              .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &jega_device,                                   .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000_kasan_isa_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &genius_device,                                 .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &nga_device,                                    .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &nec_sv9000_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &ogc_device,                                    .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &oti037c_device,                                .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &oti067_device,                                 .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &oti077_device,                                 .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &paradise_pvga1a_device,                        .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &paradise_wd90c11_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &paradise_wd90c30_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &cga_pravetz_device,                            .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &quadcolor_device,                              .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &realtek_rtg3105_device,                        .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &realtek_rtg3106_device,                        .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &sigma_device,                                  .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &tvga8900b_device,                              .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &tvga8900d_device,                              .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &tvga8900dr_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &tvga9000b_device,                              .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000k_isa_device,                            .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et2000_device,                                 .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et3000_isa_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000_tc6058af_isa_device,                    .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000_isa_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &v7_vga_1024i_device,                           .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &wy700_device,                                  .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &v6355d_device,                                 .flags = VIDEO_FLAG_TYPE_NONE },
+    /* ISA16 */
+    { .device = &mach64gx_isa_device,                           .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5420_isa_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5422_isa_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5426_isa_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5426_diamond_speedstar_pro_a1_isa_device,    .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5428_boca_isa_device,                        .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5428_isa_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5429_isa_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5434_isa_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5434_diamond_speedstar_64_a3_isa_device,     .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &inmos_isa_device,                              .flags = VIDEO_FLAG_TYPE_XGA  },
+    { .device = &jvga_device,                                   .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &radius_svga_multiview_isa_device,              .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_diamond_stealth_vram_isa_device,            .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_orchid_86c911_isa_device,                   .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_ami_86c924_isa_device,                      .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_elsa_winner2000_86c928_isa_device,          .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_metheus_86c928_isa_device,                  .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_phoenix_86c801_isa_device,                  .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_spea_mirage_86c801_isa_device,              .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_winner1000_805_isa_device,                  .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000w32_device,                              .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000w32i_isa_device,                         .flags = VIDEO_FLAG_TYPE_NONE },
+    /* MCA */
+    { .device = &mach32_mca_device,                             .flags = VIDEO_FLAG_TYPE_8514 },
+    { .device = &gd5426_mca_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5428_mca_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000_mca_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &radius_svga_multiview_mca_device,              .flags = VIDEO_FLAG_TYPE_NONE },
+    /* VLB */
+    { .device = &mach32_vlb_device,                             .flags = VIDEO_FLAG_TYPE_8514 },
+    { .device = &mach64gx_vlb_device,                           .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000w32i_vlb_device,                         .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000w32p_videomagic_revb_vlb_device,         .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000w32p_revc_vlb_device,                    .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000w32p_cardex_vlb_device,                  .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000w32p_vlb_device,                         .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000w32p_noncardex_vlb_device,               .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5424_vlb_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5426_vlb_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5428_vlb_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5428_diamond_speedstar_pro_b1_vlb_device,    .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5429_vlb_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5430_diamond_speedstar_pro_se_a8_vlb_device, .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5430_vlb_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5434_vlb_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_elsa_winner1000_86c928_vlb_device,          .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_metheus_86c928_vlb_device,                  .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_mirocrystal_8s_805_vlb_device,              .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_mirocrystal_10sd_805_vlb_device,            .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_phoenix_86c805_vlb_device,                  .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_spea_mirage_86c805_vlb_device,              .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_diamond_stealth64_964_vlb_device,           .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_mirocrystal_20sv_964_vlb_device,            .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_mirocrystal_20sd_864_vlb_device,            .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_bahamas64_vlb_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_phoenix_vision864_vlb_device,               .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_diamond_stealth_se_vlb_device,              .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_phoenix_trio32_vlb_device,                  .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_diamond_stealth64_vlb_device,               .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_9fx_vlb_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_phoenix_trio64_vlb_device,                  .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_spea_mirage_p64_vlb_device,                 .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_diamond_stealth64_968_vlb_device,           .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_stb_powergraph_64_video_vlb_device,         .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &ht216_32_standalone_device,                    .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &tgui9400cxi_device,                            .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &tgui9440_vlb_device,                           .flags = VIDEO_FLAG_TYPE_NONE },
+    /* PCI */
+    { .device = &mach32_pci_device,                             .flags = VIDEO_FLAG_TYPE_8514 },
+    { .device = &mach64gx_pci_device,                           .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &mach64vt2_device,                              .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &bochs_svga_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &chips_69000_device,                            .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5430_pci_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5434_pci_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5436_pci_device,                             .flags = VIDEO_FLAG_TYPE_SECONDARY },
+    { .device = &gd5440_pci_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &gd5446_pci_device,                             .flags = VIDEO_FLAG_TYPE_SECONDARY },
+    { .device = &gd5446_stb_pci_device,                         .flags = VIDEO_FLAG_TYPE_SECONDARY },
+    { .device = &gd5480_pci_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000w32p_videomagic_revb_pci_device,         .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000w32p_revc_pci_device,                    .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000w32p_cardex_pci_device,                  .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000w32p_noncardex_pci_device,               .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000w32p_pci_device,                         .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_elsa_winner1000_86c928_pci_device,          .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_spea_mercury_lite_86c928_pci_device,        .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_diamond_stealth64_964_pci_device,           .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_elsa_winner2000_pro_x_964_pci_device,       .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_mirocrystal_20sv_964_pci_device,            .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_bahamas64_pci_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_phoenix_vision864_pci_device,               .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_diamond_stealth_se_pci_device,              .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_phoenix_trio32_pci_device,                  .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_diamond_stealth64_pci_device,               .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_9fx_pci_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_phoenix_trio64_pci_device,                  .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_diamond_stealth64_968_pci_device,           .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_elsa_winner2000_pro_x_pci_device,           .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_mirovideo_40sv_ergo_968_pci_device,         .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_9fx_771_pci_device,                         .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_phoenix_vision968_pci_device,               .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_spea_mercury_p64v_pci_device,               .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_9fx_531_pci_device,                         .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_phoenix_vision868_pci_device,               .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_cardex_trio64vplus_pci_device,              .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_phoenix_trio64vplus_pci_device,             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_trio64v2_dx_pci_device,                     .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_virge_325_pci_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_diamond_stealth_2000_pci_device,            .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_mirocrystal_3d_pci_device,                  .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_diamond_stealth_3000_pci_device,            .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_stb_velocity_3d_pci_device,                 .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_virge_375_pci_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_diamond_stealth_2000pro_pci_device,         .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_virge_385_pci_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_virge_357_pci_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_trio3d2x_pci_device,                        .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &millennium_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &millennium_ii_device,                          .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &mystique_device,                               .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &mystique_220_device,                           .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &tgui9440_pci_device,                           .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &tgui9660_pci_device,                           .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &tgui9680_pci_device,                           .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &voodoo_banshee_device,                         .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &creative_voodoo_banshee_device,                .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &quantum3d_raven_device,                        .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &voodoo_3_1000_device,                          .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &voodoo_3_2000_device,                          .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &voodoo_3_3000_device,                          .flags = VIDEO_FLAG_TYPE_NONE },
+    /* AGP */
+    { .device = &s3_virge_357_agp_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_diamond_stealth_4000_agp_device,            .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_trio3d2x_agp_device,                        .flags = VIDEO_FLAG_TYPE_NONE },
+#ifdef USE_G100
+    { .device = &productiva_g100_device,                        .flags = VIDEO_FLAG_TYPE_SPECIAL },
+#endif /*USE_G100 */
+    { .device = &velocity_100_agp_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &velocity_200_agp_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &voodoo_3_1000_agp_device,                      .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &voodoo_3_2000_agp_device,                      .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &voodoo_3_3000_agp_device,                      .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &voodoo_3_3500_agp_ntsc_device,                 .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &voodoo_3_3500_agp_pal_device,                  .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &compaq_voodoo_3_3500_agp_device,               .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &voodoo_3_3500_se_agp_device,                   .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &voodoo_3_3500_si_agp_device,                   .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = NULL,                                           .flags = VIDEO_FLAG_TYPE_NONE }
   // clang-format on
 };
 
@@ -292,6 +286,22 @@ vid_table_log(const char *fmt, ...)
 #    define vid_table_log(fmt, ...)
 #endif
 
+static pc_timer_t framerate_timer;
+
+void
+video_update_framerates(void* priv)
+{
+    (void)priv;
+    int i = 0;
+
+    for (i = 0; i < GFXCARD_MAX; i++) {
+        monitors[i].mon_actualrenderedframes = monitors[i].mon_renderedframes;
+        monitors[i].mon_renderedframes = 0;
+    }
+
+    timer_on_auto(&framerate_timer, 1000 * 1000);
+}
+
 void
 video_reset_close(void)
 {
@@ -324,6 +334,9 @@ video_prepare(void)
         /* Do an inform on the default values, so that that there's some sane values initialized
            even if the device init function does not do an inform of its own. */
         video_inform_monitor(VIDEO_FLAG_TYPE_SPECIAL, &timing_default, i);
+
+        monitors[i].mon_interlace = 0;
+        monitors[i].mon_composite = 0;
     }
 }
 
@@ -345,14 +358,16 @@ video_reset(int card)
                   card, machine_has_flags(machine, MACHINE_VIDEO) ? 1 : 0);
 
     monitor_index_global = 0;
-    loadfont("roms/video/mda/mda.rom", 0);
+    loadfont(FONT_IBM_MDA_437_PATH, 0);
 
-    if ((card != VID_NONE) && !machine_has_flags(machine, MACHINE_VIDEO_ONLY) &&
-        (gfxcard[1] > VID_INTERNAL) && device_is_valid(video_card_getdevice(gfxcard[1]), machine)) {
-        video_monitor_init(1);
-        monitor_index_global = 1;
-        device_add(video_cards[gfxcard[1]].device);
-        monitor_index_global = 0;
+    for (uint8_t i = 1; i < GFXCARD_MAX; i ++) {
+        if ((card != VID_NONE) && !machine_has_flags(machine, MACHINE_VIDEO_ONLY) &&
+            (gfxcard[i] > VID_INTERNAL) && device_is_valid(video_card_getdevice(gfxcard[i]), machine)) {
+            video_monitor_init(i);
+            monitor_index_global = 1;
+            device_add(video_cards[gfxcard[i]].device);
+            monitor_index_global = 0;
+        }
     }
 
     /* Do not initialize internal cards here. */
@@ -365,6 +380,7 @@ video_reset(int card)
         device_add(video_cards[card].device);
     }
 
+    timer_add(&framerate_timer, video_update_framerates, NULL, 1);
     was_reset = 1;
 }
 
@@ -388,6 +404,8 @@ video_post_reset(void)
     if (xga_standalone_enabled)
         xga_device_add();
 
+    if (da2_standalone_enabled)
+        da2_device_add();
     /* Reset the graphics card (or do nothing if it was already done
        by the machine's init function). */
     video_reset(gfxcard[0]);
diff --git a/src/video/vid_tandy.c b/src/video/vid_tandy.c
new file mode 100644
index 000000000..f11b687ef
--- /dev/null
+++ b/src/video/vid_tandy.c
@@ -0,0 +1,932 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Tandy 1000 video emulation
+ *
+ *
+ *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *          Connor Hyde / starfrost, <mario64crashed@gmail.com>
+ *
+ *          Copyright 2008-2019 Sarah Walker.
+ *          Copyright 2016-2019 Miran Grca.
+ *          Copyright 2025 starfrost
+ */
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <math.h>
+#define HAVE_STDARG_H
+#include <86box/86box.h>
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/nmi.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/device.h>
+#include <86box/nvr.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/gameport.h>
+#include <86box/keyboard.h>
+#include <86box/sound.h>
+#include <86box/snd_sn76489.h>
+#include <86box/video.h>
+#include <86box/vid_cga.h>
+#include <86box/vid_cga_comp.h>
+#include <86box/m_tandy.h>
+#include <86box/machine.h>
+#include <86box/plat_unused.h>
+
+static uint8_t crtcmask[32] = {
+    0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x7f, 0x7f,
+    0xf3, 0x1f, 0x7f, 0x1f, 0x3f, 0xff, 0x3f, 0xff,
+    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+static uint8_t crtcmask_sl[32] = {
+    0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xff, 0xff,
+    0xf3, 0x1f, 0x7f, 0x1f, 0x3f, 0xff, 0x3f, 0xff,
+    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+enum {
+    TANDY_RGB = 0,
+    TANDY_COMPOSITE
+};
+
+#define DOUBLE_NONE               0
+#define DOUBLE_SIMPLE             1
+#define DOUBLE_INTERPOLATE_SRGB   2
+#define DOUBLE_INTERPOLATE_LINEAR 3
+
+static video_timings_t timing_dram = { VIDEO_BUS, 0, 0, 0, 0, 0, 0 }; /*No additional waitstates*/
+
+static void
+recalc_mapping(tandy_t *dev)
+{
+    t1kvid_t *vid = dev->vid;
+
+    mem_mapping_disable(&vid->mapping);
+    io_removehandler(0x03d0, 16,
+                     tandy_vid_in, NULL, NULL, tandy_vid_out, NULL, NULL, dev);
+
+    if (vid->planar_ctrl & 4) {
+        mem_mapping_enable(&vid->mapping);
+        if (vid->array[5] & 1)
+            mem_mapping_set_addr(&vid->mapping, 0xa0000, 0x10000);
+        else
+            mem_mapping_set_addr(&vid->mapping, 0xb8000, 0x8000);
+        io_sethandler(0x03d0, 16, tandy_vid_in, NULL, NULL, tandy_vid_out, NULL, NULL, dev);
+    }
+}
+
+static void
+recalc_timings(tandy_t *dev)
+{
+    t1kvid_t *vid = dev->vid;
+
+    double _dispontime;
+    double _dispofftime;
+    double disptime;
+
+    if (vid->mode & 1) {
+        disptime    = vid->crtc[0] + 1;
+        _dispontime = vid->crtc[1];
+    } else {
+        disptime    = (vid->crtc[0] + 1) << 1;
+        _dispontime = vid->crtc[1] << 1;
+    }
+
+    _dispofftime = disptime - _dispontime;
+    _dispontime *= CGACONST;
+    _dispofftime *= CGACONST;
+    vid->dispontime  = (uint64_t) (_dispontime);
+    vid->dispofftime = (uint64_t) (_dispofftime);
+}
+
+static void
+recalc_address(tandy_t *dev)
+{
+    t1kvid_t *vid = dev->vid;
+
+    if ((vid->memctrl & 0xc0) == 0xc0) {
+        vid->vram       = &ram[((vid->memctrl & 0x06) << 14) + dev->base];
+        vid->b8000      = &ram[((vid->memctrl & 0x30) << 11) + dev->base];
+        vid->b8000_mask = 0x7fff;
+    } else {
+        vid->vram       = &ram[((vid->memctrl & 0x07) << 14) + dev->base];
+        vid->b8000      = &ram[((vid->memctrl & 0x38) << 11) + dev->base];
+        vid->b8000_mask = 0x3fff;
+    }
+}
+
+void
+tandy_recalc_address_sl(tandy_t *dev)
+{
+    t1kvid_t *vid = dev->vid;
+
+    vid->b8000_limit = 0x8000;
+
+    if (vid->array[5] & 1) {
+        vid->vram  = &ram[((vid->memctrl & 0x04) << 14) + dev->base];
+        vid->b8000 = &ram[((vid->memctrl & 0x20) << 11) + dev->base];
+    } else if ((vid->memctrl & 0xc0) == 0xc0) {
+        vid->vram  = &ram[((vid->memctrl & 0x06) << 14) + dev->base];
+        vid->b8000 = &ram[((vid->memctrl & 0x30) << 11) + dev->base];
+    } else {
+        vid->vram  = &ram[((vid->memctrl & 0x07) << 14) + dev->base];
+        vid->b8000 = &ram[((vid->memctrl & 0x38) << 11) + dev->base];
+        if ((vid->memctrl & 0x38) == 0x38)
+            vid->b8000_limit = 0x4000;
+    }
+}
+
+static void
+vid_update_latch(t1kvid_t *vid)
+{
+    uint32_t lp_latch = vid->displine * vid->crtc[1];
+
+    vid->crtc[0x10] = (lp_latch >> 8) & 0x3f;
+    vid->crtc[0x11] = lp_latch & 0xff;
+}
+
+void
+tandy_vid_out(uint16_t addr, uint8_t val, void *priv)
+{
+    tandy_t  *dev = (tandy_t *) priv;
+    t1kvid_t *vid = dev->vid;
+    uint8_t   old;
+
+    if ((addr >= 0x3d0) && (addr <= 0x3d7))
+        addr = (addr & 0xff9) | 0x004;
+
+    switch (addr) {
+        case 0x03d4:
+            vid->crtcreg = val & 0x1f;
+            break;
+
+        case 0x03d5:
+            old = vid->crtc[vid->crtcreg];
+            if (dev->is_sl2)
+                vid->crtc[vid->crtcreg] = val & crtcmask_sl[vid->crtcreg];
+            else
+                vid->crtc[vid->crtcreg] = val & crtcmask[vid->crtcreg];
+            if (old != val) {
+                if (vid->crtcreg < 0xe || vid->crtcreg > 0x10) {
+                    vid->fullchange = changeframecount;
+                    recalc_timings(dev);
+                }
+            }
+            break;
+
+        case 0x03d8:
+            old = vid->mode;
+            vid->mode = val;
+            if ((old ^ val) & 0x01)
+                recalc_timings(dev);
+            if (!dev->is_sl2)
+                update_cga16_color(vid->mode);
+            break;
+
+        case 0x03d9:
+            vid->col = val;
+            break;
+
+        case 0x03da:
+            vid->array_index = val & 0x1f;
+            break;
+
+        case 0x3db:
+            if (!dev->is_sl2 && (vid->lp_strobe == 1))
+                vid->lp_strobe = 0;
+            break;
+
+        case 0x3dc:
+            if (!dev->is_sl2 && (vid->lp_strobe == 0)) {
+                vid->lp_strobe = 1;
+                vid_update_latch(vid);
+            }
+            break;
+
+        case 0x03de:
+            if (vid->array_index & 16)
+                val &= 0xf;
+            vid->array[vid->array_index & 0x1f] = val;
+            if (dev->is_sl2) {
+                if ((vid->array_index & 0x1f) == 5) {
+                    recalc_mapping(dev);
+                    tandy_recalc_address_sl(dev);
+                }
+            }
+            break;
+
+        case 0x03df:
+            vid->memctrl = val;
+            if (dev->is_sl2)
+                tandy_recalc_address_sl(dev);
+            else
+                recalc_address(dev);
+            break;
+
+        case 0x0065:
+            if (val == 8)
+                return; /*Hack*/
+            vid->planar_ctrl = val;
+            recalc_mapping(dev);
+            break;
+
+        default:
+            break;
+    }
+}
+
+uint8_t
+tandy_vid_in(uint16_t addr, void *priv)
+{
+    const tandy_t  *dev = (tandy_t *) priv;
+    t1kvid_t       *vid = dev->vid;
+    uint8_t         ret = 0xff;
+
+    if ((addr >= 0x3d0) && (addr <= 0x3d7))
+        addr = (addr & 0xff9) | 0x004;
+
+    switch (addr) {
+        case 0x03d4:
+            ret = vid->crtcreg;
+            break;
+
+        case 0x03d5:
+            ret = vid->crtc[vid->crtcreg];
+            break;
+
+        case 0x03da:
+            ret = vid->status;
+            break;
+
+        case 0x3db:
+            if (!dev->is_sl2 && (vid->lp_strobe == 1))
+                vid->lp_strobe = 0;
+            break;
+
+        case 0x3dc:
+            if (!dev->is_sl2 && (vid->lp_strobe == 0)) {
+                vid->lp_strobe = 1;
+                vid_update_latch(vid);
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    return ret;
+}
+
+static void
+vid_write(uint32_t addr, uint8_t val, void *priv)
+{
+    tandy_t  *dev = (tandy_t *) priv;
+    t1kvid_t *vid = dev->vid;
+
+    if (vid->memctrl == -1)
+        return;
+
+    if (dev->is_sl2) {
+        if (vid->array[5] & 1)
+            vid->b8000[addr & 0xffff] = val;
+        else {
+            if ((addr & 0x7fff) < vid->b8000_limit)
+                vid->b8000[addr & 0x7fff] = val;
+        }
+    } else {
+        vid->b8000[addr & vid->b8000_mask] = val;
+    }
+}
+
+static uint8_t
+vid_read(uint32_t addr, void *priv)
+{
+    const tandy_t  *dev = (tandy_t *) priv;
+    const t1kvid_t *vid = dev->vid;
+
+    if (vid->memctrl == -1)
+        return 0xff;
+
+    if (dev->is_sl2) {
+        if (vid->array[5] & 1)
+            return (vid->b8000[addr & 0xffff]);
+        if ((addr & 0x7fff) < vid->b8000_limit)
+            return (vid->b8000[addr & 0x7fff]);
+        else
+            return 0xff;
+    } else {
+        return (vid->b8000[addr & vid->b8000_mask]);
+    }
+}
+
+static void
+vid_render(tandy_t *dev, int line)
+{
+    t1kvid_t *vid         = dev->vid;
+    uint16_t  cursoraddr  = (vid->crtc[15] | (vid->crtc[14] << 8)) & 0x3fff;
+    int       drawcursor;
+    int       x;
+    int       c;
+    uint8_t   chr;
+    uint8_t   attr;
+    uint16_t  dat;
+    int       col;
+    int       cols[4];
+
+    cols[0]       = (vid->array[2] & 0xf) + 16;
+
+    for (c = 0; c < 8; c++) {
+        if (vid->array[3] & 4) {
+            buffer32->line[line][c] = cols[0];
+            if (vid->mode & 1)
+                buffer32->line[line][c + (vid->crtc[1] << 3) + 8] = cols[0];
+            else
+                buffer32->line[line][c + (vid->crtc[1] << 4) + 8] = cols[0];
+        } else if ((vid->mode & 0x12) == 0x12) {
+            buffer32->line[line][c] = 0;
+            if (vid->mode & 1)
+                buffer32->line[line][c + (vid->crtc[1] << 3) + 8] = 0;
+            else
+                buffer32->line[line][c + (vid->crtc[1] << 4) + 8] = 0;
+        } else {
+            buffer32->line[line][c] = buffer32->line[(line) + 1][c] = (vid->col & 15) + 16;
+            if (vid->mode & 1)
+                buffer32->line[line][c + (vid->crtc[1] << 3) + 8] = (vid->col & 15) + 16;
+            else
+                buffer32->line[line][c + (vid->crtc[1] << 4) + 8] = (vid->col & 15) + 16;
+        }
+    }
+
+    if (dev->is_sl2 && (vid->array[5] & 1)) { /*640x200x16*/
+        for (x = 0; x < vid->crtc[1] * 2; x++) {
+            dat = (vid->vram[(vid->memaddr << 1) & 0xffff] << 8) | vid->vram[((vid->memaddr << 1) + 1) & 0xffff];
+            vid->memaddr++;
+            buffer32->line[line][(x << 2) + 8] = vid->array[((dat >> 12) & 0xf) + 16] + 16;
+            buffer32->line[line][(x << 2) + 9] = vid->array[((dat >> 8) & 0xf) + 16] + 16;
+            buffer32->line[line][(x << 2) + 10] =  vid->array[((dat >> 4) & 0xf) + 16] + 16;
+            buffer32->line[line][(x << 2) + 11] = vid->array[(dat & 0xf) + 16] + 16;
+        }
+    } else if ((vid->array[3] & 0x10) && (vid->mode & 1)) { /*320x200x16*/
+        for (x = 0; x < vid->crtc[1]; x++) {
+            dat = (vid->vram[((vid->memaddr << 1) & 0x1fff) + ((vid->scanline & 3) * 0x2000)] << 8) |
+                  vid->vram[((vid->memaddr << 1) & 0x1fff) + ((vid->scanline & 3) * 0x2000) + 1];
+            vid->memaddr++;
+            buffer32->line[line][(x << 3) + 8] = buffer32->line[line][(x << 3) + 9] =
+                vid->array[((dat >> 12) & vid->array[1] & 0x0f) + 16] + 16;
+            buffer32->line[line][(x << 3) + 10] = buffer32->line[line][(x << 3) + 11] =
+                vid->array[((dat >> 8) & vid->array[1] & 0x0f) + 16] + 16;
+            buffer32->line[line][(x << 3) + 12] = buffer32->line[line][(x << 3) + 13] =
+                vid->array[((dat >> 4) & vid->array[1] & 0x0f) + 16] + 16;
+            buffer32->line[line][(x << 3) + 14] = buffer32->line[line][(x << 3) + 15] =
+                vid->array[(dat & vid->array[1] & 0x0f) + 16] + 16;
+        }
+    } else if (vid->array[3] & 0x10) { /*160x200x16*/
+        for (x = 0; x < vid->crtc[1]; x++) {
+            if (dev->is_sl2)
+                dat = (vid->vram[((vid->memaddr << 1) & 0x1fff) + ((vid->scanline & 1) * 0x2000)] << 8) |
+                      vid->vram[((vid->memaddr << 1) & 0x1fff) + ((vid->scanline & 1) * 0x2000) + 1];
+            else
+                dat = (vid->vram[((vid->memaddr << 1) & 0x1fff) + ((vid->scanline & 3) * 0x2000)] << 8) |
+                      vid->vram[((vid->memaddr << 1) & 0x1fff) + ((vid->scanline & 3) * 0x2000) + 1];
+            vid->memaddr++;
+            buffer32->line[line][(x << 4) + 8] = buffer32->line[line][(x << 4) + 9] =
+            buffer32->line[line][(x << 4) + 10] = buffer32->line[line][(x << 4) + 11] =
+                vid->array[((dat >> 12) & vid->array[1] & 0x0f) + 16] + 16;
+            buffer32->line[line][(x << 4) + 12] = buffer32->line[line][(x << 4) + 13] =
+            buffer32->line[line][(x << 4) + 14] = buffer32->line[line][(x << 4) + 15] =
+                vid->array[((dat >> 8) & vid->array[1] & 0x0f) + 16] + 16;
+            buffer32->line[line][(x << 4) + 16] = buffer32->line[line][(x << 4) + 17] =
+            buffer32->line[line][(x << 4) + 18] = buffer32->line[line][(x << 4) + 19] =
+                vid->array[((dat >> 4) & vid->array[1] & 0x0f) + 16] + 16;
+            buffer32->line[line][(x << 4) + 20] = buffer32->line[line][(x << 4) + 21] =
+            buffer32->line[line][(x << 4) + 22] = buffer32->line[line][(x << 4) + 23] =
+                vid->array[(dat & vid->array[1] & 0x0f) + 16] + 16;
+        }
+    } else if (vid->array[3] & 0x08) { /*640x200x4 - this implementation is a complete guess!*/
+        for (x = 0; x < vid->crtc[1]; x++) {
+            dat = (vid->vram[((vid->memaddr << 1) & 0x1fff) + ((vid->scanline & 3) * 0x2000)] << 8) |
+                  vid->vram[((vid->memaddr << 1) & 0x1fff) + ((vid->scanline & 3) * 0x2000) + 1];
+            vid->memaddr++;
+            for (c = 0; c < 8; c++) {
+                chr = (dat >> 6) & 2;
+                chr |= ((dat >> 15) & 1);
+                buffer32->line[line][(x << 3) + 8 + c] =
+                    vid->array[(chr & vid->array[1]) + 16] + 16;
+                dat <<= 1;
+            }
+        }
+    } else if (vid->mode & 1) {
+        for (x = 0; x < vid->crtc[1]; x++) {
+            chr        = vid->vram[(vid->memaddr << 1) & 0x3fff];
+            attr       = vid->vram[((vid->memaddr << 1) + 1) & 0x3fff];
+            drawcursor = ((vid->memaddr == cursoraddr) && vid->cursorvisible && vid->cursoron);
+            if (vid->mode & 0x20) {
+                cols[1] = vid->array[((attr & 15) & vid->array[1]) + 16] + 16;
+                cols[0] = vid->array[(((attr >> 4) & 7) & vid->array[1]) + 16] + 16;
+                if ((vid->blink & 16) && (attr & 0x80) && !drawcursor)
+                    cols[1] = cols[0];
+            } else {
+                cols[1] = vid->array[((attr & 15) & vid->array[1]) + 16] + 16;
+                cols[0] = vid->array[((attr >> 4) & vid->array[1]) + 16] + 16;
+            }
+            if (vid->scanline & 8)  for (c = 0; c < 8; c++)
+                buffer32->line[line][(x << 3) + c + 8] =
+                    ((chr >= 0xb3) && (chr <= 0xdf)) ? cols[(fontdat[chr][7] & (1 << (c ^ 7))) ? 1 : 0] : cols[0];
+            else  for (c = 0; c < 8; c++) {
+                if (vid->scanline == 8)
+                    buffer32->line[line][(x << 3) + c + 8] = cols[(fontdat[chr][7] & (1 << (c ^ 7))) ? 1 : 0];
+                else
+                    buffer32->line[line][(x << 3) + c + 8] = cols[(fontdat[chr][vid->scanline & 7] & (1 << (c ^ 7))) ? 1 : 0];
+            }
+            if (drawcursor)  for (c = 0; c < 8; c++)
+                buffer32->line[line][(x << 3) + c + 8] ^= 15;
+            vid->memaddr++;
+        }
+    } else if (!(vid->mode & 2)) {
+        for (x = 0; x < vid->crtc[1]; x++) {
+            chr        = vid->vram[(vid->memaddr << 1) & 0x3fff];
+            attr       = vid->vram[((vid->memaddr << 1) + 1) & 0x3fff];
+            drawcursor = ((vid->memaddr == cursoraddr) && vid->cursorvisible && vid->cursoron);
+            if (vid->mode & 0x20) {
+                cols[1] = vid->array[((attr & 15) & vid->array[1]) + 16] + 16;
+                cols[0] = vid->array[(((attr >> 4) & 7) & vid->array[1]) + 16] + 16;
+                if ((vid->blink & 16) && (attr & 0x80) && !drawcursor)
+                    cols[1] = cols[0];
+            } else {
+                cols[1] = vid->array[((attr & 15) & vid->array[1]) + 16] + 16;
+                cols[0] = vid->array[((attr >> 4) & vid->array[1]) + 16] + 16;
+            }
+            vid->memaddr++;
+            if (vid->scanline & 8)  for (c = 0; c < 8; c++)
+                buffer32->line[line][(x << 4) + (c << 1) + 8] =
+                buffer32->line[line][(x << 4) + (c << 1) + 1 + 8] =
+                    ((chr >= 0xb3) && (chr <= 0xdf)) ? cols[(fontdat[chr][7] & (1 << (c ^ 7))) ? 1 : 0] : cols[0];
+            else  for (c = 0; c < 8; c++) {
+                if (vid->scanline == 8)
+                    buffer32->line[line][(x << 4) + (c << 1) + 8] =
+                    buffer32->line[line][(x << 4) + (c << 1) + 1 + 8] =
+                        cols[(fontdat[chr][7] & (1 << (c ^ 7))) ? 1 : 0];
+                else
+                    buffer32->line[line][(x << 4) + (c << 1) + 8] =
+                    buffer32->line[line][(x << 4) + (c << 1) + 1 + 8] =
+                        cols[(fontdat[chr][vid->scanline & 7] & (1 << (c ^ 7))) ? 1 : 0];
+            }
+            if (drawcursor)  for (c = 0; c < 16; c++)
+                buffer32->line[line][(x << 4) + c + 8] ^= 15;
+        }
+    } else if (!(vid->mode & 16)) {
+        cols[0] = (vid->col & 15);
+        col     = (vid->col & 16) ? 8 : 0;
+        if (vid->mode & 4) {
+            cols[1] = col | 3;
+            cols[2] = col | 4;
+            cols[3] = col | 7;
+        } else if (vid->col & 32) {
+            cols[1] = col | 3;
+            cols[2] = col | 5;
+            cols[3] = col | 7;
+        } else {
+            cols[1] = col | 2;
+            cols[2] = col | 4;
+            cols[3] = col | 6;
+        }
+        cols[0] = vid->array[(cols[0] & vid->array[1]) + 16] + 16;
+        cols[1] = vid->array[(cols[1] & vid->array[1]) + 16] + 16;
+        cols[2] = vid->array[(cols[2] & vid->array[1]) + 16] + 16;
+        cols[3] = vid->array[(cols[3] & vid->array[1]) + 16] + 16;
+        for (x = 0; x < vid->crtc[1]; x++) {
+            dat = (vid->vram[((vid->memaddr << 1) & 0x1fff) + ((vid->scanline & 1) * 0x2000)] << 8) |
+                  vid->vram[((vid->memaddr << 1) & 0x1fff) + ((vid->scanline & 1) * 0x2000) + 1];
+            vid->memaddr++;
+            for (c = 0; c < 8; c++) {
+                buffer32->line[line][(x << 4) + (c << 1) + 8] =
+                buffer32->line[line][(x << 4) + (c << 1) + 1 + 8] = cols[dat >> 14];
+                dat <<= 2;
+            }
+        }
+    } else {
+        cols[0] = 0;
+        cols[1] = vid->array[(vid->col & vid->array[1]) + 16] + 16;
+        for (x = 0; x < vid->crtc[1]; x++) {
+            dat = (vid->vram[((vid->memaddr << 1) & 0x1fff) + ((vid->scanline & 1) * 0x2000)] << 8) |
+                  vid->vram[((vid->memaddr << 1) & 0x1fff) + ((vid->scanline & 1) * 0x2000) + 1];
+            vid->memaddr++;
+            for (c = 0; c < 16; c++) {
+                buffer32->line[line][(x << 4) + c + 8] = buffer32->line[(line) + 1][(x << 4) + c + 8] = cols[dat >> 15];
+                dat <<= 1;
+            }
+        }
+    }
+}
+
+static void
+vid_render_blank(tandy_t *dev, int line)
+{
+    t1kvid_t *vid         = dev->vid;
+
+    if (vid->array[3] & 4) {
+        if (vid->mode & 1)
+            hline(buffer32, 0, line, (vid->crtc[1] << 3) + 16, (vid->array[2] & 0xf) + 16);
+        else
+            hline(buffer32, 0, line, (vid->crtc[1] << 4) + 16, (vid->array[2] & 0xf) + 16);
+    } else {
+        int cols = ((vid->mode & 0x12) == 0x12) ? 0 : (vid->col & 0xf) + 16;
+
+        if (vid->mode & 1)
+            hline(buffer32, 0, line, (vid->crtc[1] << 3) + 16, cols);
+        else
+            hline(buffer32, 0, line, (vid->crtc[1] << 4) + 16, cols);
+    }
+}
+
+static void
+vid_render_process(tandy_t *dev, int line)
+{
+    t1kvid_t *vid         = dev->vid;
+    int       x;
+
+    if (vid->mode & 1)
+        x = (vid->crtc[1] << 3) + 16;
+    else
+        x = (vid->crtc[1] << 4) + 16;
+
+    if (!dev->is_sl2 && vid->composite)
+        Composite_Process(vid->mode, 0, x >> 2, buffer32->line[line]);
+    else
+        video_process_8(x, line);
+}
+
+static void
+vid_poll(void *priv)
+{
+    tandy_t  *dev = (tandy_t *) priv;
+    t1kvid_t *vid = dev->vid;
+    int       x;
+    int       xs_temp;
+    int       ys_temp;
+    int       oldvc;
+    int       scanline_old;
+    int       old_ma;
+
+    if (!vid->linepos) {
+        timer_advance_u64(&vid->timer, vid->dispofftime);
+        vid->status |= 1;
+        vid->linepos = 1;
+        scanline_old        = vid->scanline;
+        if ((vid->crtc[8] & 3) == 3)
+            vid->scanline = (vid->scanline << 1) & 7;
+        if (vid->dispon) {
+            if (vid->displine < vid->firstline) {
+                vid->firstline = vid->displine;
+                video_wait_for_buffer();
+            }
+            vid->lastline = vid->displine;
+            switch (vid->double_type) {
+                default:
+                    vid_render(dev, vid->displine << 1);
+                    vid_render_blank(dev, (vid->displine << 1) + 1);
+                    break;
+                case DOUBLE_NONE:
+                    vid_render(dev, vid->displine);
+                    break;
+                case DOUBLE_SIMPLE:
+                    old_ma = vid->memaddr;
+                    vid_render(dev, vid->displine << 1);
+                    vid->memaddr = old_ma;
+                    vid_render(dev, (vid->displine << 1) + 1);
+                    break;
+            }
+        } else  switch (vid->double_type) {
+            default:
+                vid_render_blank(dev, vid->displine << 1);
+                break;
+            case DOUBLE_NONE:
+                vid_render_blank(dev, vid->displine);
+                break;
+            case DOUBLE_SIMPLE:
+                vid_render_blank(dev, vid->displine << 1);
+                vid_render_blank(dev, (vid->displine << 1) + 1);
+                break;
+        }
+
+        switch (vid->double_type) {
+            default:
+                vid_render_process(dev, vid->displine << 1);
+                vid_render_process(dev, (vid->displine << 1) + 1);
+                break;
+            case DOUBLE_NONE:
+                vid_render_process(dev, vid->displine);
+                break;
+        }
+
+        vid->scanline = scanline_old;
+        if (vid->vc == vid->crtc[7] && !vid->scanline)
+            vid->status |= 8;
+        vid->displine++;
+        if (vid->displine >= 360)
+            vid->displine = 0;
+    } else {
+        timer_advance_u64(&vid->timer, vid->dispontime);
+        if (vid->dispon)
+            vid->status &= ~1;
+        vid->linepos = 0;
+        if (vid->vsynctime) {
+            vid->vsynctime--;
+            if (!vid->vsynctime)
+                vid->status &= ~8;
+        }
+        if (vid->scanline == (vid->crtc[11] & 31) || ((vid->crtc[8] & 3) == 3 && vid->scanline == ((vid->crtc[11] & 31) >> 1))) {
+            vid->cursorvisible  = 0;
+        }
+        if (vid->vadj) {
+            vid->scanline++;
+            vid->scanline &= 31;
+            vid->memaddr = vid->memaddr_backup;
+            vid->vadj--;
+            if (!vid->vadj) {
+                vid->dispon = 1;
+                if (dev->is_sl2 && (vid->array[5] & 1))
+                    vid->memaddr = vid->memaddr_backup = vid->crtc[13] | (vid->crtc[12] << 8);
+                else
+                    vid->memaddr = vid->memaddr_backup = (vid->crtc[13] | (vid->crtc[12] << 8)) & 0x3fff;
+                vid->scanline = 0;
+            }
+        } else if (vid->scanline == vid->crtc[9] || ((vid->crtc[8] & 3) == 3 && vid->scanline == (vid->crtc[9] >> 1))) {
+            vid->memaddr_backup = vid->memaddr;
+            vid->scanline     = 0;
+            oldvc       = vid->vc;
+            vid->vc++;
+            if (dev->is_sl2)
+                vid->vc &= 255;
+            else
+                vid->vc &= 127;
+            if (vid->vc == vid->crtc[6])
+                vid->dispon = 0;
+            if (oldvc == vid->crtc[4]) {
+                vid->vc   = 0;
+                vid->vadj = vid->crtc[5];
+                if (!vid->vadj)
+                    vid->dispon = 1;
+                if (!vid->vadj) {
+                    if (dev->is_sl2 && (vid->array[5] & 1))
+                        vid->memaddr = vid->memaddr_backup = vid->crtc[13] | (vid->crtc[12] << 8);
+                    else
+                        vid->memaddr = vid->memaddr_backup = (vid->crtc[13] | (vid->crtc[12] << 8)) & 0x3fff;
+                }
+                if ((vid->crtc[10] & 0x60) == 0x20)
+                    vid->cursoron = 0;
+                else
+                    vid->cursoron = vid->blink & 16;
+            }
+            if (vid->vc == vid->crtc[7]) {
+                vid->dispon    = 0;
+                vid->displine  = 0;
+                vid->vsynctime = 16;
+                picint(1 << 5);
+                if (vid->crtc[7]) {
+                    if (vid->mode & 1)
+                        x = (vid->crtc[1] << 3) + 16;
+                    else
+                        x = (vid->crtc[1] << 4) + 16;
+                    vid->lastline++;
+
+                    xs_temp = x;
+                    ys_temp = (vid->lastline - vid->firstline) << 1;
+
+                    if ((xs_temp > 0) && (ys_temp > 0)) {
+                        if (xs_temp < 64)
+                            xs_temp = 656;
+                        if (ys_temp < 32)
+                            ys_temp = 400;
+                        if (!enable_overscan)
+                            xs_temp -= 16;
+
+                        if ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get()) {
+                            xsize = xs_temp;
+                            ysize = ys_temp;
+                            set_screen_size(xsize, ysize + (enable_overscan ? 16 : 0));
+
+                            if (video_force_resize_get())
+                                video_force_resize_set(0);
+                        }
+
+                        cga_do_blit(xsize, vid->firstline, vid->lastline, vid->double_type);
+                    }
+
+                    frames++;
+
+                    video_res_x = xsize;
+                    video_res_y = ysize;
+                    if ((vid->array[3] & 0x10) && (vid->mode & 1)) { /*320x200x16*/
+                        video_res_x /= 2;
+                        video_bpp = 4;
+                    } else if (vid->array[3] & 0x10) { /*160x200x16*/
+                        video_res_x /= 4;
+                        video_bpp = 4;
+                    } else if (vid->array[3] & 0x08) { /*640x200x4 - this implementation is a complete guess!*/
+                        video_bpp = 2;
+                    } else if (vid->mode & 1) {
+                        video_res_x /= 8;
+                        video_res_y /= vid->crtc[9] + 1;
+                        video_bpp = 0;
+                    } else if (!(vid->mode & 2)) {
+                        video_res_x /= 16;
+                        video_res_y /= vid->crtc[9] + 1;
+                        video_bpp = 0;
+                    } else if (!(vid->mode & 16)) {
+                        video_res_x /= 2;
+                        video_bpp = 2;
+                    } else {
+                        video_bpp = 1;
+                    }
+                }
+                vid->firstline = 1000;
+                vid->lastline  = 0;
+                vid->blink++;
+            }
+        } else {
+            vid->scanline++;
+            vid->scanline &= 31;
+            vid->memaddr = vid->memaddr_backup;
+        }
+        if (vid->scanline == (vid->crtc[10] & 31) || ((vid->crtc[8] & 3) == 3 && vid->scanline == ((vid->crtc[10] & 31) >> 1)))
+            vid->cursorvisible = 1;
+    }
+}
+
+void
+tandy_vid_speed_changed(void *priv)
+{
+    tandy_t *dev = (tandy_t *) priv;
+
+    recalc_timings(dev);
+}
+
+void
+tandy_vid_close(void *priv)
+{
+    tandy_t *dev = (tandy_t *) priv;
+
+    free(dev->vid);
+    dev->vid = NULL;
+}
+
+void
+tandy_vid_init(tandy_t *dev)
+{
+    int       display_type;
+    t1kvid_t *vid;
+
+    vid = calloc(1, sizeof(t1kvid_t));
+    vid->memctrl = -1;
+
+    video_inform(VIDEO_FLAG_TYPE_CGA, &timing_dram);
+
+    display_type   = device_get_config_int("display_type");
+    vid->composite = (display_type != TANDY_RGB);
+
+    cga_comp_init(1);
+
+    if (dev->is_sl2) {
+        vid->b8000_limit = 0x8000;
+        vid->planar_ctrl = 4;
+        overscan_x = overscan_y = 16;
+
+        io_sethandler(0x0065, 1, tandy_vid_in, NULL, NULL, tandy_vid_out, NULL, NULL, dev);
+    } else
+        vid->b8000_mask = 0x3fff;
+
+    timer_add(&vid->timer, vid_poll, dev, 1);
+    mem_mapping_add(&vid->mapping, 0xb8000, 0x08000,
+                    vid_read, NULL, NULL, vid_write, NULL, NULL, NULL, 0, dev);
+    io_sethandler(0x03d0, 16,
+                  tandy_vid_in, NULL, NULL, tandy_vid_out, NULL, NULL, dev);
+
+    dev->vid     = vid;
+
+    vid->double_type = device_get_config_int("double_type");
+    cga_interpolate_init();
+
+    monitors[monitor_index_global].mon_composite = !!vid->composite;
+}
+
+const device_config_t vid_config[] = {
+  // clang-format off
+    {
+        .name = "display_type",
+        .description = "Display type",
+        .type = CONFIG_SELECTION,
+        .default_string = "",
+        .default_int = TANDY_RGB,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "RGB",       .value = TANDY_RGB       },
+            { .description = "Composite", .value = TANDY_COMPOSITE },
+            { .description = ""                                    }
+        }
+    },
+    {
+        .name           = "double_type",
+        .description    = "Line doubling type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = DOUBLE_NONE,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",                 .value = DOUBLE_NONE               },
+            { .description = "Simple doubling",      .value = DOUBLE_SIMPLE             },
+            { .description = "sRGB interpolation",   .value = DOUBLE_INTERPOLATE_SRGB   },
+            { .description = "Linear interpolation", .value = DOUBLE_INTERPOLATE_LINEAR },
+            { .description = ""                                                         }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
+const device_config_t sl_vid_config[] = {
+  // clang-format off
+    {
+        .name           = "double_type",
+        .description    = "Line doubling type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = DOUBLE_NONE,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "None",                 .value = DOUBLE_NONE               },
+            { .description = "Simple doubling",      .value = DOUBLE_SIMPLE             },
+            { .description = "sRGB interpolation",   .value = DOUBLE_INTERPOLATE_SRGB   },
+            { .description = "Linear interpolation", .value = DOUBLE_INTERPOLATE_LINEAR },
+            { .description = ""                                                         }
+        },
+        .bios           = { { 0 } }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+  // clang-format on
+};
+
+const device_t tandy_1000_video_device = {
+    .name          = "Tandy 1000",
+    .internal_name = "tandy1000_video",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = tandy_vid_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = tandy_vid_speed_changed,
+    .force_redraw  = NULL,
+    .config        = vid_config
+};
+
+const device_t tandy_1000hx_video_device = {
+    .name          = "Tandy 1000 HX",
+    .internal_name = "tandy1000_hx_video",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = tandy_vid_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = tandy_vid_speed_changed,
+    .force_redraw  = NULL,
+    .config        = vid_config
+};
+
+const device_t tandy_1000sl_video_device = {
+    .name          = "Tandy 1000SL2",
+    .internal_name = "tandy1000_sl_video",
+    .flags         = 0,
+    .local         = 1,
+    .init          = NULL,
+    .close         = tandy_vid_close,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = tandy_vid_speed_changed,
+    .force_redraw  = NULL,
+    .config        = sl_vid_config
+};
diff --git a/src/video/vid_tgui9440.c b/src/video/vid_tgui9440.c
index 86159ed0a..6a0e1ca5e 100644
--- a/src/video/vid_tgui9440.c
+++ b/src/video/vid_tgui9440.c
@@ -72,6 +72,7 @@
 #include <86box/video.h>
 #include <86box/i2c.h>
 #include <86box/vid_ddc.h>
+#include <86box/vid_xga.h>
 #include <86box/vid_svga.h>
 #include <86box/vid_svga_render.h>
 
@@ -112,8 +113,7 @@ typedef struct tgui_t {
     uint8_t int_line;
     uint8_t pci_regs[256];
 
-    struct
-    {
+    struct {
         int16_t  src_x, src_y;
         int16_t  src_x_clip, src_y_clip;
         int16_t  dst_x, dst_y;
@@ -126,6 +126,7 @@ typedef struct tgui_t {
         uint8_t  rop;
         uint32_t flags;
         uint8_t  pattern[0x80];
+        uint8_t  pattern_32bpp[0x100];
         int      command;
         int      offset;
         uint16_t ger22;
@@ -143,14 +144,14 @@ typedef struct tgui_t {
         uint32_t pattern_8[8 * 8];
         uint32_t pattern_16[8 * 8];
         uint32_t pattern_32[8 * 8];
+        int pattern_32_idx;
     } accel;
 
-    uint8_t ext_gdc_regs[16]; /*TGUI9400CXi only*/
-    uint8_t copy_latch[16];
+    uint8_t copy_latch[16]; /*TGUI9400CXi only*/
 
     uint8_t tgui_3d8, tgui_3d9;
     int     oldmode;
-    uint8_t oldctrl1, newctrl1;
+    uint8_t oldctrl1;
     uint8_t oldctrl2, newctrl2;
     uint8_t oldgr0e, newgr0e;
 
@@ -160,6 +161,7 @@ typedef struct tgui_t {
 
     int     ramdac_state;
     uint8_t ramdac_ctrl;
+    uint8_t alt_clock;
 
     int clock_m, clock_n, clock_k;
 
@@ -210,11 +212,8 @@ static void    tgui_ext_writel(uint32_t addr, uint32_t val, void *priv);
 
 /*Remap address for chain-4/doubleword style layout*/
 static __inline uint32_t
-dword_remap(svga_t *svga, uint32_t in_addr)
+dword_remap(UNUSED(svga_t *svga), uint32_t in_addr)
 {
-    if (svga->packed_chain4)
-        return in_addr;
-
     return ((in_addr << 2) & 0x3fff0) | ((in_addr >> 14) & 0xc) | (in_addr & ~0x3fffc);
 }
 
@@ -297,7 +296,7 @@ tgui_out(uint16_t addr, uint8_t val, void *priv)
 {
     tgui_t *tgui = (tgui_t *) priv;
     svga_t *svga = &tgui->svga;
-    uint8_t old;
+    uint8_t old, o;
 
     if (((addr & 0xFFF0) == 0x3D0 || (addr & 0xFFF0) == 0x3B0) && !(svga->miscout & 1))
         addr ^= 0x60;
@@ -331,6 +330,15 @@ tgui_out(uint16_t addr, uint8_t val, void *priv)
                         svga->read_bank = svga->write_bank;
                     return;
 
+                case 0x5a:
+                case 0x5b:
+                case 0x5c:
+                case 0x5d:
+                case 0x5e:
+                case 0x5f:
+                    svga->seqregs[svga->seqaddr] = val;
+                    return;
+
                 default:
                     break;
             }
@@ -344,20 +352,9 @@ tgui_out(uint16_t addr, uint8_t val, void *priv)
             if (tgui->ramdac_state == 4) {
                 tgui->ramdac_state = 0;
                 tgui->ramdac_ctrl  = val;
-                switch ((tgui->ramdac_ctrl >> 4) & 0x0f) {
-                    case 1:
-                        svga->bpp = 15;
-                        break;
-                    case 3:
-                        svga->bpp = 16;
-                        break;
-                    case 0x0d:
-                        svga->bpp = (tgui->type >= TGUI_9660) ? 32 : 24;
-                        break;
-                    default:
-                        svga->bpp = 8;
-                        break;
-                }
+#if 0
+                pclog("TGUI ramdac ctrl=%02x.\n", (tgui->ramdac_ctrl >> 4) & 0x0f);
+#endif
                 svga_recalctimings(svga);
                 return;
             }
@@ -374,30 +371,35 @@ tgui_out(uint16_t addr, uint8_t val, void *priv)
             break;
 
         case 0x3CF:
-            if (svga->gdcaddr == 0x23) {
-                svga->dpms = !!(val & 0x03);
-                svga_recalctimings(svga);
-            }
-            if (tgui->type == TGUI_9400CXI && svga->gdcaddr >= 16 && svga->gdcaddr < 32) {
-                old                                    = tgui->ext_gdc_regs[svga->gdcaddr & 15];
-                tgui->ext_gdc_regs[svga->gdcaddr & 15] = val;
-                if (svga->gdcaddr == 16)
-                    tgui_recalcmapping(tgui);
-                return;
-            }
+            o = svga->gdcreg[svga->gdcaddr];
             switch (svga->gdcaddr) {
-                case 0x6:
+                case 2:
+                    svga->colourcompare = val;
+                    break;
+                case 4:
+                    svga->readplane = val & 3;
+                    break;
+                case 5:
+                    svga->writemode   = val & 3;
+                    svga->readmode    = val & 8;
+                    svga->chain2_read = val & 0x10;
+                    break;
+                case 6:
                     if (svga->gdcreg[6] != val) {
                         svga->gdcreg[6] = val;
                         tgui_recalcmapping(tgui);
                     }
-                    return;
+                    break;
+                case 7:
+                    svga->colournocare = val;
+                    break;
 
                 case 0x0e:
                     svga->gdcreg[0xe] = val ^ 2;
                     if ((svga->gdcreg[0xf] & 1) == 1)
                         svga->read_bank = (svga->gdcreg[0xe]) * 65536;
                     break;
+
                 case 0x0f:
                     if (val & 1)
                         svga->read_bank = (svga->gdcreg[0xe]) * 65536;
@@ -414,6 +416,12 @@ tgui_out(uint16_t addr, uint8_t val, void *priv)
                         svga->write_bank = (svga->seqregs[0xe]) * 65536;
                     break;
 
+                case 0x23:
+                    svga->dpms = !!(val & 0x03);
+                    svga_recalctimings(svga);
+                    break;
+
+                case 0x2f:
                 case 0x5a:
                 case 0x5b:
                 case 0x5c:
@@ -426,11 +434,36 @@ tgui_out(uint16_t addr, uint8_t val, void *priv)
                 default:
                     break;
             }
-            break;
+            svga->gdcreg[svga->gdcaddr] = val;
+
+            if (tgui->type == TGUI_9400CXI) {
+                if ((svga->gdcaddr >= 0x10) && (svga->gdcaddr <= 0x1f)) {
+                    tgui_recalcmapping(tgui);
+                    return;
+                }
+            }
+            svga->fast = (svga->gdcreg[8] == 0xff && !(svga->gdcreg[3] & 0x18) && !svga->gdcreg[1]) && ((svga->chain4 && (svga->packed_chain4 || svga->force_old_addr)) || svga->fb_only);
+            if (((svga->gdcaddr == 5) && ((val ^ o) & 0x70)) || ((svga->gdcaddr == 6) && ((val ^ o) & 1)))
+                svga_recalctimings(svga);
+            return;
         case 0x3D4:
             svga->crtcreg = val;
             return;
         case 0x3D5:
+            if (!(svga->seqregs[0x0e] & 0x80) && !tgui->oldmode) {
+                switch (svga->crtcreg) {
+                    case 0x21:
+                    case 0x29:
+                    case 0x2a:
+                    case 0x38:
+                    case 0x39:
+                    case 0x3b:
+                    case 0x3c:
+                        return;
+                    default:
+                        break;
+                }
+            }
             if ((svga->crtcreg < 7) && (svga->crtc[0x11] & 0x80))
                 return;
             if ((svga->crtcreg == 7) && (svga->crtc[0x11] & 0x80))
@@ -482,8 +515,12 @@ tgui_out(uint16_t addr, uint8_t val, void *priv)
                         svga->hwcursor.y = (svga->crtc[0x42] | (svga->crtc[0x43] << 8)) & 0x7ff;
 
                         if ((tgui->accel.ger22 & 0xff) == 8) {
-                            if (svga->bpp != 24)
+                            if (svga->bpp != 24) {
                                 svga->hwcursor.x <<= 1;
+                                svga_recalctimings(svga);
+                                if ((svga->vdisp == 1022) && svga->interlace)
+                                    svga->hwcursor.x >>= 1;
+                            }
                         }
 
                         svga->hwcursor.xoff = svga->crtc[0x46] & 0x3f;
@@ -507,7 +544,7 @@ tgui_out(uint16_t addr, uint8_t val, void *priv)
                 if (svga->crtcreg < 0xe || svga->crtcreg > 0x10) {
                     if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
                     } else {
                         svga->fullchange = svga->monitor->mon_changeframecount;
                         svga_recalctimings(svga);
@@ -531,6 +568,10 @@ tgui_out(uint16_t addr, uint8_t val, void *priv)
                 svga->read_bank = (val & 0x3f) * 65536;
             return;
 
+        case 0x3DB:
+            tgui->alt_clock = val & 0xe3;
+            return;
+
         case 0x43c8:
             tgui->clock_n = val & 0x7f;
             tgui->clock_m = (tgui->clock_m & ~1) | (val >> 7);
@@ -591,6 +632,8 @@ tgui_in(uint16_t addr, void *priv)
                     return tgui->oldctrl1 | 0x88;
                 return svga->seqregs[0x0e];
             }
+            if ((svga->seqaddr >= 0x5a) && (svga->seqaddr <= 0x5f))
+                return svga->seqregs[svga->seqaddr];
             break;
 
         case 0x3C6:
@@ -610,10 +653,10 @@ tgui_in(uint16_t addr, void *priv)
             break;
 
         case 0x3CF:
-            if (tgui->type == TGUI_9400CXI && svga->gdcaddr >= 16 && svga->gdcaddr < 32)
-                return tgui->ext_gdc_regs[svga->gdcaddr & 15];
             if (svga->gdcaddr >= 0x5a && svga->gdcaddr <= 0x5f)
                 return svga->gdcreg[svga->gdcaddr];
+            if (svga->gdcaddr == 0x2f)
+                return svga->gdcreg[svga->gdcaddr];
             break;
         case 0x3D4:
             return svga->crtcreg;
@@ -636,6 +679,8 @@ tgui_in(uint16_t addr, void *priv)
             return tgui->tgui_3d8;
         case 0x3d9:
             return tgui->tgui_3d9;
+        case 0x3db:
+            return tgui->alt_clock;
 
         default:
             break;
@@ -650,28 +695,51 @@ tgui_recalctimings(svga_t *svga)
     uint8_t       ger22lower = (tgui->accel.ger22 & 0xff);
     uint8_t       ger22upper = (tgui->accel.ger22 >> 8);
 
-    if (!svga->rowoffset)
-        svga->rowoffset = 0x100;
-
-    if (svga->crtc[0x29] & 0x10)
-        svga->rowoffset |= 0x100;
+    if (tgui->type >= TGUI_9440) {
+        if ((svga->crtc[0x38] & 0x19) == 0x09)
+            svga->bpp = 32;
+        else {
+            switch ((tgui->ramdac_ctrl >> 4) & 0x0f) {
+                case 0x01:
+                    svga->bpp = 15;
+                    break;
+                case 0x03:
+                    svga->bpp = 16;
+                    break;
+                case 0x0d:
+                    svga->bpp = 24;
+                    break;
+                default:
+                    svga->bpp = 8;
+                    break;
+            }
+        }
+    }
 
     if ((tgui->type >= TGUI_9440) && (svga->bpp >= 24))
-        svga->hdisp = (svga->crtc[1] + 1) * 8;
+        svga->hdisp = (svga->crtc[1] + 1) << 3;
+
+    if (((svga->crtc[0x29] & 0x30) && (svga->bpp >= 15)) || !svga->rowoffset)
+        svga->rowoffset |= 0x100;
+
+#if 0
+    pclog("BPP=%d, DataWidth=%02x, CRTC29 bit 4-5=%02x, pixbusmode=%02x, rowoffset=%02x, doublerowoffset=%x.\n", svga->bpp, svga->crtc[0x2a] & 0x40, svga->crtc[0x29] & 0x30, svga->crtc[0x38], svga->rowoffset, svga->gdcreg[0x2f] & 4);
+#endif
 
     if ((svga->crtc[0x1e] & 0xA0) == 0xA0)
-        svga->ma_latch |= 0x10000;
-    if ((svga->crtc[0x27] & 0x01) == 0x01)
-        svga->ma_latch |= 0x20000;
-    if ((svga->crtc[0x27] & 0x02) == 0x02)
-        svga->ma_latch |= 0x40000;
-    if ((svga->crtc[0x27] & 0x04) == 0x04)
-        svga->ma_latch |= 0x80000;
+        svga->memaddr_latch |= 0x10000;
+    if (svga->crtc[0x27] & 0x01)
+        svga->memaddr_latch |= 0x20000;
+    if (svga->crtc[0x27] & 0x02)
+        svga->memaddr_latch |= 0x40000;
+    if (svga->crtc[0x27] & 0x04)
+        svga->memaddr_latch |= 0x80000;
 
     if (svga->crtc[0x27] & 0x08)
         svga->split |= 0x400;
     if (svga->crtc[0x27] & 0x10)
         svga->dispend |= 0x400;
+
     if (svga->crtc[0x27] & 0x20)
         svga->vsyncstart |= 0x400;
     if (svga->crtc[0x27] & 0x40)
@@ -684,15 +752,18 @@ tgui_recalctimings(svga_t *svga)
         svga->lowres = 0;
     }
 
-    if ((tgui->oldctrl2 & 0x10) || (svga->crtc[0x2a] & 0x40))
-        svga->ma_latch <<= 1;
-
-    svga->lowres = !(svga->crtc[0x2a] & 0x40);
-
     svga->interlace = !!(svga->crtc[0x1e] & 4);
     if (svga->interlace && (tgui->type < TGUI_9440))
         svga->rowoffset >>= 1;
 
+    if (svga->vdisp == 1020)
+        svga->vdisp += 2;
+
+    if (tgui->oldctrl2 & 0x10)
+        svga->memaddr_latch <<= 1;
+
+    svga->lowres = !(svga->crtc[0x2a] & 0x40);
+
     if (tgui->type >= TGUI_9440) {
         if (svga->miscout & 8)
             svga->clock = (cpuclock * (double) (1ULL << 32)) / (((tgui->clock_n + 8) * 14318180.0) / ((tgui->clock_m + 2) * (1 << tgui->clock_k)));
@@ -749,6 +820,7 @@ tgui_recalctimings(svga_t *svga)
             default:
                 break;
         }
+
         if (svga->gdcreg[0xf] & 0x08) {
             svga->htotal <<= 1;
             svga->hdisp <<= 1;
@@ -760,7 +832,24 @@ tgui_recalctimings(svga_t *svga)
         switch (svga->bpp) {
             case 8:
                 svga->render = svga_render_8bpp_highres;
+                if (svga->vdisp == 1022) {
+                    if (svga->interlace)
+                        svga->dispend++;
+                    else
+                        svga->dispend += 2;
+                }
                 if (tgui->type >= TGUI_9660) {
+                    switch (svga->vdisp) {
+                        case 1024:
+                        case 1200:
+                            svga->htotal <<= 1;
+                            svga->hdisp <<= 1;
+                            svga->hdisp_time <<= 1;
+                            break;
+                        default:
+                            break;
+                    }
+#if OLD_CODE
                     if (svga->dispend == ((1024 >> 1) - 2))
                         svga->dispend += 2;
                     if (svga->dispend == (1024 >> 1))
@@ -773,6 +862,7 @@ tgui_recalctimings(svga_t *svga)
                         else if (!svga->interlace && (svga->dispend == 768))
                             svga->hdisp <<= 1;
                     }
+#endif
 
                     if (ger22upper & 0x80) {
                         svga->htotal <<= 1;
@@ -782,7 +872,7 @@ tgui_recalctimings(svga_t *svga)
                     switch (svga->hdisp) {
                         case 640:
                             if (!ger22lower)
-                                svga->rowoffset = 80;
+                                svga->rowoffset = 0x50;
                             break;
 
                         default:
@@ -806,11 +896,10 @@ tgui_recalctimings(svga_t *svga)
                     svga->hdisp = (svga->hdisp << 1) / 3;
                 break;
             case 32:
+                if (svga->rowoffset == 0x100)
+                    svga->rowoffset <<= 1;
+
                 svga->render = svga_render_32bpp_highres;
-                if (tgui->type >= TGUI_9660) {
-                    if (!ger22upper)
-                        svga->rowoffset <<= 1;
-                }
                 break;
 
             default:
@@ -823,16 +912,17 @@ static void
 tgui_recalcmapping(tgui_t *tgui)
 {
     svga_t *svga = &tgui->svga;
+    xga_t  *xga  = (xga_t *) svga->xga;
 
     if (tgui->type == TGUI_9400CXI) {
-        if (tgui->ext_gdc_regs[0] & EXT_CTRL_LATCH_COPY) {
+        if (svga->gdcreg[0x10] & EXT_CTRL_LATCH_COPY) {
             mem_mapping_set_handler(&tgui->linear_mapping,
                                     tgui_ext_linear_read, NULL, NULL,
                                     tgui_ext_linear_write, tgui_ext_linear_writew, tgui_ext_linear_writel);
             mem_mapping_set_handler(&svga->mapping,
                                     tgui_ext_read, NULL, NULL,
                                     tgui_ext_write, tgui_ext_writew, tgui_ext_writel);
-        } else if (tgui->ext_gdc_regs[0] & EXT_CTRL_MONO_EXPANSION) {
+        } else if (svga->gdcreg[0x10] & EXT_CTRL_MONO_EXPANSION) {
             mem_mapping_set_handler(&tgui->linear_mapping,
                                     svga_read_linear, svga_readw_linear, svga_readl_linear,
                                     tgui_ext_linear_write, tgui_ext_linear_writew, tgui_ext_linear_writel);
@@ -876,6 +966,10 @@ tgui_recalcmapping(tgui_t *tgui)
                 case 0x4: /*64k at A0000*/
                     mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
                     svga->banked_mask = 0xffff;
+                    if (xga_active && (svga->xga != NULL)) {
+                        xga->on = 0;
+                        mem_mapping_set_handler(&svga->mapping, svga->read, svga->readw, svga->readl, svga->write, svga->writew, svga->writel);
+                    }
                     break;
                 case 0x8: /*32k at B0000*/
                     mem_mapping_set_addr(&svga->mapping, 0xb0000, 0x08000);
@@ -900,6 +994,10 @@ tgui_recalcmapping(tgui_t *tgui)
             case 0x4: /*64k at A0000*/
                 mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
                 svga->banked_mask = 0xffff;
+                if (xga_active && (svga->xga != NULL)) {
+                    xga->on = 0;
+                    mem_mapping_set_handler(&svga->mapping, svga->read, svga->readw, svga->readl, svga->write, svga->writew, svga->writel);
+                }
                 break;
             case 0x8: /*32k at B0000*/
                 mem_mapping_set_addr(&svga->mapping, 0xb0000, 0x08000);
@@ -928,7 +1026,7 @@ tgui_recalcmapping(tgui_t *tgui)
     }
 
     if (tgui->type >= TGUI_9440) {
-        if ((tgui->mmio_base != 0x00000000) && (svga->crtc[0x39] & 1))
+        if ((tgui->mmio_base != 0x00000000) && (svga->crtc[0x39] & 0x01))
             mem_mapping_set_addr(&tgui->mmio_mapping, tgui->mmio_base, 0x10000);
         else
             mem_mapping_disable(&tgui->mmio_mapping);
@@ -939,7 +1037,7 @@ static void
 tgui_hwcursor_draw(svga_t *svga, int displine)
 {
     uint32_t dat[2];
-    int      offset = svga->hwcursor_latch.x + svga->hwcursor_latch.xoff;
+    int      offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff;
     int      pitch  = (svga->hwcursor_latch.cur_xsize == 64) ? 16 : 8;
 
     if (svga->interlace && svga->hwcursor_oddeven)
@@ -1121,26 +1219,24 @@ tgui_ext_linear_read(uint32_t addr, void *priv)
     svga_t *svga = (svga_t *) priv;
     tgui_t *tgui = (tgui_t *) svga->priv;
 
-    cycles -= video_timing_read_b;
+    cycles -= svga->monitor->mon_video_timing_read_b;
 
     addr &= svga->decode_mask;
     if (addr >= svga->vram_max)
         return 0xff;
 
     addr &= svga->vram_mask;
-    addr &= (tgui->ext_gdc_regs[0] & EXT_CTRL_LATCH_COPY) ? ~0x0f : ~0x07;
-    addr = dword_remap(svga, addr);
+    addr &= ~0x0f;
+    addr  = dword_remap(svga, addr);
 
-    if (tgui->ext_gdc_regs[0] & EXT_CTRL_LATCH_COPY) {
-        for (int c = 0; c < 16; c++) {
-            tgui->copy_latch[c] = svga->vram[addr];
-            addr += (c & 3) ? 1 : 13;
-            addr &= svga->vram_mask;
-        }
-        return svga->vram[addr];
+    for (int i = 0; i < 16; i++) {
+        tgui->copy_latch[i] = svga->vram[addr];
+        addr += ((i & 3) == 3) ? 0x0d : 0x01;
     }
 
-    return svga_read_linear(addr, svga);
+    addr &= svga->vram_mask;
+
+    return svga->vram[addr];
 }
 
 static uint8_t
@@ -1158,65 +1254,77 @@ tgui_ext_linear_write(uint32_t addr, uint8_t val, void *priv)
 {
     svga_t       *svga = (svga_t *) priv;
     const tgui_t *tgui = (tgui_t *) svga->priv;
-    int           c;
-    int           bpp = (tgui->ext_gdc_regs[0] & EXT_CTRL_16BIT);
-    uint8_t       fg[2] = { tgui->ext_gdc_regs[4], tgui->ext_gdc_regs[5] };
-    uint8_t       bg[2] = { tgui->ext_gdc_regs[1], tgui->ext_gdc_regs[2] };
-    uint8_t       mask  = tgui->ext_gdc_regs[7];
+    int           bpp = (svga->gdcreg[0x10] & EXT_CTRL_16BIT);
+    uint8_t       fg[2] = { svga->gdcreg[0x14], svga->gdcreg[0x15] };
+    uint8_t       bg[2] = { svga->gdcreg[0x11], svga->gdcreg[0x12] };
 
-    cycles -= video_timing_write_b;
+    cycles -= svga->monitor->mon_video_timing_write_b;
 
     addr &= svga->decode_mask;
     if (addr >= svga->vram_max)
         return;
-    addr &= svga->vram_mask;
-    addr &= (tgui->ext_gdc_regs[0] & EXT_CTRL_LATCH_COPY) ? ~0x0f : ~0x07;
 
-    addr                          = dword_remap(svga, addr);
+    addr &= svga->vram_mask;
+    addr &= (svga->gdcreg[0x10] & EXT_CTRL_LATCH_COPY) ? ~0x0f : ~0x07;
+    addr = dword_remap(svga, addr);
+
     svga->changedvram[addr >> 12] = svga->monitor->mon_changeframecount;
 
-    if (tgui->ext_gdc_regs[0] & EXT_CTRL_LATCH_COPY) {
-        for (c = 0; c < 16; c++) {
-            svga->vram[addr] = tgui->copy_latch[c];
-            addr += ((c & 3) == 3) ? 13 : 1;
+    if (svga->gdcreg[0x10] & EXT_CTRL_LATCH_COPY) {
+        for (int i = 0; i < 8; i++) {
+            if (val & (0x80 >> i))
+                svga->vram[addr] = tgui->copy_latch[i];
+
+            addr += ((i & 3) == 3) ? 0x0d : 0x01;
             addr &= svga->vram_mask;
         }
-    } else if (tgui->ext_gdc_regs[0] & (EXT_CTRL_MONO_EXPANSION | EXT_CTRL_MONO_TRANSPARENT)) {
-        if (tgui->ext_gdc_regs[0] & EXT_CTRL_MONO_TRANSPARENT) {
+    } else {
+        if (svga->gdcreg[0x10] & EXT_CTRL_MONO_TRANSPARENT) {
             if (bpp) {
-                for (c = 7; c >= 0; c--) {
-                    if ((val & mask) & (1 << c))
-                        svga->vram[addr] = fg[(c & 1) ^ 1];
-                    addr += (c & 3) ? 1 : 13;
+                for (int i = 0; i < 8; i++) {
+                    if (val & (0x80 >> i))
+                        svga->vram[addr] = fg[i & 1];
+
+                    addr += ((i & 3) == 3) ? 0x0d : 0x01;
                     addr &= svga->vram_mask;
                 }
             } else {
-                for (c = 7; c >= 0; c--) {
-                    if ((val & mask) & (1 << c))
-                        svga->vram[addr] = tgui->ext_gdc_regs[4];
-                    addr += (c == 4) ? 13 : 1;
+                for (int i = 0; i < 8; i++) {
+                    if (val & (0x80 >> i))
+                        svga->vram[addr] = fg[0];
+
+                    addr += ((i & 3) == 3) ? 0x0d : 0x01;
                     addr &= svga->vram_mask;
                 }
             }
         } else {
             if (bpp) {
-                for (c = 7; c >= 0; c--) {
-                    if (mask & (1 << c))
-                        svga->vram[addr] = (val & (1 << c)) ? fg[(c & 1) ^ 1] : bg[(c & 1) ^ 1];
-                    addr += (c & 3) ? 1 : 13;
+                for (int i = 0; i < 8; i++) {
+                    if (val & (0x80 >> i)) {
+                        if (svga->gdcreg[0x17] & (0x80 >> i))
+                            svga->vram[addr] = fg[i & 1];
+                    } else {
+                        if (svga->gdcreg[0x17] & (0x80 >> i))
+                            svga->vram[addr] = bg[i & 1];
+                    }
+                    addr += ((i & 3) == 3) ? 0x0d : 0x01;
                     addr &= svga->vram_mask;
                 }
             } else {
-                for (c = 7; c >= 0; c--) {
-                    if (mask & (1 << c))
-                        svga->vram[addr] = (val & (1 << c)) ? tgui->ext_gdc_regs[4] : tgui->ext_gdc_regs[1];
-                    addr += (c == 4) ? 13 : 1;
+                for (int i = 0; i < 8; i++) {
+                    if (val & (0x80 >> i)) {
+                        if (svga->gdcreg[0x17] & (0x80 >> i))
+                            svga->vram[addr] = fg[0];
+                    } else {
+                        if (svga->gdcreg[0x17] & (0x80 >> i))
+                            svga->vram[addr] = bg[0];
+                    }
+                    addr += ((i & 3) == 3) ? 0x0d : 0x01;
                     addr &= svga->vram_mask;
                 }
             }
         }
-    } else
-        svga_write_linear(addr, val, svga);
+    }
 }
 
 static void
@@ -1224,94 +1332,85 @@ tgui_ext_linear_writew(uint32_t addr, uint16_t val, void *priv)
 {
     svga_t       *svga = (svga_t *) priv;
     const tgui_t *tgui = (tgui_t *) svga->priv;
-    int           c;
-    int           bpp = (tgui->ext_gdc_regs[0] & EXT_CTRL_16BIT);
-    uint8_t       fg[2] = { tgui->ext_gdc_regs[4], tgui->ext_gdc_regs[5] };
-    uint8_t       bg[2] = { tgui->ext_gdc_regs[1], tgui->ext_gdc_regs[2] };
-    uint16_t      mask  = (tgui->ext_gdc_regs[7] << 8) | tgui->ext_gdc_regs[8];
+    int           bpp = (svga->gdcreg[0x10] & EXT_CTRL_16BIT);
+    uint8_t       fg[2] = { svga->gdcreg[0x14], svga->gdcreg[0x15] };
+    uint8_t       bg[2] = { svga->gdcreg[0x11], svga->gdcreg[0x12] };
+    uint16_t      mask  = svga->gdcreg[0x18] | (svga->gdcreg[0x17] << 8);
 
-    cycles -= video_timing_write_w;
+    cycles -= svga->monitor->mon_video_timing_write_w;
 
     addr &= svga->decode_mask;
     if (addr >= svga->vram_max)
         return;
+
     addr &= svga->vram_mask;
-    addr &= (tgui->ext_gdc_regs[0] & EXT_CTRL_LATCH_COPY) ? ~0x0f : ~0x07;
+    addr &= ~0x0f;
+    addr = dword_remap(svga, addr);
 
-    addr                          = dword_remap(svga, addr);
     svga->changedvram[addr >> 12] = svga->monitor->mon_changeframecount;
-
     val = (val >> 8) | (val << 8);
 
-    if (tgui->ext_gdc_regs[0] & EXT_CTRL_LATCH_COPY) {
-        for (c = 0; c < 16; c++) {
-            svga->vram[addr] = tgui->copy_latch[c];
-            addr += (c & 3) ? 1 : 13;
+    if (svga->gdcreg[0x10] & EXT_CTRL_LATCH_COPY) {
+        for (int i = 0; i < 16; i++) {
+            if (val & (0x8000 >> i))
+                svga->vram[addr] = tgui->copy_latch[i];
+
+            addr += ((i & 3) == 3) ? 0x0d : 0x01;
             addr &= svga->vram_mask;
         }
-    } else if (tgui->ext_gdc_regs[0] & (EXT_CTRL_MONO_EXPANSION | EXT_CTRL_MONO_TRANSPARENT)) {
-        if (tgui->ext_gdc_regs[0] & EXT_CTRL_MONO_TRANSPARENT) {
+    } else {
+        if (svga->gdcreg[0x10] & EXT_CTRL_MONO_TRANSPARENT) {
             if (bpp) {
-                for (c = 15; c >= 0; c--) {
-                    if ((val & mask) & (1 << c))
-                        svga->vram[addr] = fg[(c & 1) ^ 1];
-                    addr += (c & 3) ? 1 : 13;
+                for (int i = 0; i < 16; i++) {
+                    if (val & (0x8000 >> i))
+                        svga->vram[addr] = fg[i & 1];
+
+                    addr += ((i & 3) == 3) ? 0x0d : 0x01;
                     addr &= svga->vram_mask;
                 }
             } else {
-                for (c = 15; c >= 0; c--) {
-                    if ((val & mask) & (1 << c))
-                        svga->vram[addr] = tgui->ext_gdc_regs[4];
+                for (int i = 0; i < 16; i++) {
+                    if (val & (0x8000 >> i))
+                        svga->vram[addr] = fg[0];
 
-                    addr += (c & 3) ? 1 : 13;
+                    addr += ((i & 3) == 3) ? 0x0d : 0x01;
                     addr &= svga->vram_mask;
                 }
             }
         } else {
             if (bpp) {
-                for (c = 15; c >= 0; c--) {
-                    if (mask & (1 << c))
-                       svga->vram[addr] = (val & (1 << c)) ? fg[(c & 1) ^ 1] : bg[(c & 1) ^ 1];
-                    addr += (c & 3) ? 1 : 13;
+                for (int i = 0; i < 16; i++) {
+                    if (val & (0x8000 >> i)) {
+                        if (mask & (0x8000 >> i))
+                            svga->vram[addr] = fg[i & 1];
+                    } else {
+                        if (mask & (0x8000 >> i))
+                            svga->vram[addr] = bg[i & 1];
+                    }
+                    addr += ((i & 3) == 3) ? 0x0d : 0x01;
                     addr &= svga->vram_mask;
                 }
             } else {
-                for (c = 15; c >= 0; c--) {
-                    if (mask & (1 << c))
-                        svga->vram[addr] = (val & (1 << c)) ? tgui->ext_gdc_regs[4] : tgui->ext_gdc_regs[1];
-
-                    addr += (c & 3) ? 1 : 13;
+                for (int i = 0; i < 16; i++) {
+                    if (val & (0x8000 >> i)) {
+                        if (mask & (0x8000 >> i))
+                            svga->vram[addr] = fg[0];
+                    } else {
+                        if (mask & (0x8000 >> i))
+                            svga->vram[addr] = bg[0];
+                    }
+                    addr += ((i & 3) == 3) ? 0x0d : 0x01;
                     addr &= svga->vram_mask;
                 }
             }
         }
-    } else
-        svga_writew_linear(addr, val, svga);
+    }
 }
 
 static void
 tgui_ext_linear_writel(uint32_t addr, uint32_t val, void *priv)
 {
-    svga_t       *svga = (svga_t *) priv;
-    const tgui_t *tgui = (tgui_t *) svga->priv;
-
-    cycles -= video_timing_write_l;
-
-    addr &= svga->decode_mask;
-    if (addr >= svga->vram_max)
-        return;
-    addr &= svga->vram_mask;
-    addr &= (tgui->ext_gdc_regs[0] & EXT_CTRL_LATCH_COPY) ? ~0x0f : ~0x07;
-
-    addr                          = dword_remap(svga, addr);
-    svga->changedvram[addr >> 12] = svga->monitor->mon_changeframecount;
-
-    if (tgui->ext_gdc_regs[0] & (EXT_CTRL_MONO_EXPANSION | EXT_CTRL_MONO_TRANSPARENT | EXT_CTRL_LATCH_COPY)) {
-        tgui_ext_linear_writew(addr, val & 0xffff, priv);
-        tgui_ext_linear_writew(addr + 2, val >> 16, priv);
-    } else {
-        svga_writel_linear(addr, val, svga);
-    }
+    tgui_ext_linear_writew(addr, val, priv);
 }
 
 static void
@@ -1370,29 +1469,795 @@ enum {
     else                                               \
         dat = vram_l[(addr) & (tgui->vram_mask >> 2)];
 
-#define MIX()                                 \
-    do {                                      \
-        out = 0;                              \
-        for (c = 0; c < 32; c++) {            \
-            d = (dst_dat & (1 << c)) ? 1 : 0; \
-            if (src_dat & (1 << c))           \
-                d |= 2;                       \
-            if (pat_dat & (1 << c))           \
-                d |= 4;                       \
-            if (tgui->accel.rop & (1 << d))   \
-                out |= (1 << c);              \
-        }                                     \
+#define ROPMIX(R, D, P, S, out)                    \
+    {                                              \
+        switch (R) {                               \
+            case 0x00:                             \
+                out = 0;                           \
+                break;                             \
+            case 0x01:                             \
+                out = ~(D | (P | S));              \
+                break;                             \
+            case 0x02:                             \
+                out = D & ~(P | S);                \
+                break;                             \
+            case 0x03:                             \
+                out = ~(P | S);                    \
+                break;                             \
+            case 0x04:                             \
+                out = S & ~(D | P);                \
+                break;                             \
+            case 0x05:                             \
+                out = ~(D | P);                    \
+                break;                             \
+            case 0x06:                             \
+                out = ~(P | ~(D ^ S));             \
+                break;                             \
+            case 0x07:                             \
+                out = ~(P | (D & S));              \
+                break;                             \
+            case 0x08:                             \
+                out = S & (D & ~P);                \
+                break;                             \
+            case 0x09:                             \
+                out = ~(P | (D ^ S));              \
+                break;                             \
+            case 0x0a:                             \
+                out = D & ~P;                      \
+                break;                             \
+            case 0x0b:                             \
+                out = ~(P | (S & ~D));             \
+                break;                             \
+            case 0x0c:                             \
+                out = S & ~P;                      \
+                break;                             \
+            case 0x0d:                             \
+                out = ~(P | (D & ~S));             \
+                break;                             \
+            case 0x0e:                             \
+                out = ~(P | ~(D | S));             \
+                break;                             \
+            case 0x0f:                             \
+                out = ~P;                          \
+                break;                             \
+            case 0x10:                             \
+                out = P & ~(D | S);                \
+                break;                             \
+            case 0x11:                             \
+                out = ~(D | S);                    \
+                break;                             \
+            case 0x12:                             \
+                out = ~(S | ~(D ^ P));             \
+                break;                             \
+            case 0x13:                             \
+                out = ~(S | (D & P));              \
+                break;                             \
+            case 0x14:                             \
+                out = ~(D | ~(P ^ S));             \
+                break;                             \
+            case 0x15:                             \
+                out = ~(D | (P & S));              \
+                break;                             \
+            case 0x16:                             \
+                out = P ^ (S ^ (D & ~(P & S)));    \
+                break;                             \
+            case 0x17:                             \
+                out = ~(S ^ ((S ^ P) & (D ^ S)));  \
+                break;                             \
+            case 0x18:                             \
+                out = (S ^ P) & (P ^ D);           \
+                break;                             \
+            case 0x19:                             \
+                out = ~(S ^ (D & ~(P & S)));       \
+                break;                             \
+            case 0x1a:                             \
+                out = P ^ (D | (S & P));           \
+                break;                             \
+            case 0x1b:                             \
+                out = ~(S ^ (D & (P ^ S)));        \
+                break;                             \
+            case 0x1c:                             \
+                out = P ^ (S | (D & P));           \
+                break;                             \
+            case 0x1d:                             \
+                out = ~(D ^ (S & (P ^ D)));        \
+                break;                             \
+            case 0x1e:                             \
+                out = P ^ (D | S);                 \
+                break;                             \
+            case 0x1f:                             \
+                out = ~(P & (D | S));              \
+                break;                             \
+            case 0x20:                             \
+                out = D & (P & ~S);                \
+                break;                             \
+            case 0x21:                             \
+                out = ~(S | (D ^ P));              \
+                break;                             \
+            case 0x22:                             \
+                out = D & ~S;                      \
+                break;                             \
+            case 0x23:                             \
+                out = ~(S | (P & ~D));             \
+                break;                             \
+            case 0x24:                             \
+                out = (S ^ P) & (D ^ S);           \
+                break;                             \
+            case 0x25:                             \
+                out = ~(P ^ (D & ~(S & P)));       \
+                break;                             \
+            case 0x26:                             \
+                out = S ^ (D | (P & S));           \
+                break;                             \
+            case 0x27:                             \
+                out = S ^ (D | ~(P ^ S));          \
+                break;                             \
+            case 0x28:                             \
+                out = D & (P ^ S);                 \
+                break;                             \
+            case 0x29:                             \
+                out = ~(P ^ (S ^ (D | (P & S))));  \
+                break;                             \
+            case 0x2a:                             \
+                out = D & ~(P & S);                \
+                break;                             \
+            case 0x2b:                             \
+                out = ~(S ^ ((S ^ P) & (P ^ D)));  \
+                break;                             \
+            case 0x2c:                             \
+                out = S ^ (P & (D | S));           \
+                break;                             \
+            case 0x2d:                             \
+                out = P ^ (S | ~D);                \
+                break;                             \
+            case 0x2e:                             \
+                out = P ^ (S | (D ^ P));           \
+                break;                             \
+            case 0x2f:                             \
+                out = ~(P & (S | ~D));             \
+                break;                             \
+            case 0x30:                             \
+                out = P & ~S;                      \
+                break;                             \
+            case 0x31:                             \
+                out = ~(S | (D & ~P));             \
+                break;                             \
+            case 0x32:                             \
+                out = S ^ (D | (P | S));           \
+                break;                             \
+            case 0x33:                             \
+                out = ~S;                          \
+                break;                             \
+            case 0x34:                             \
+                out = S ^ (P | (D & S));           \
+                break;                             \
+            case 0x35:                             \
+                out = S ^ (P | ~(D ^ S));          \
+                break;                             \
+            case 0x36:                             \
+                out = S ^ (D | P);                 \
+                break;                             \
+            case 0x37:                             \
+                out = ~(S & (D | P));              \
+                break;                             \
+            case 0x38:                             \
+                out = P ^ (S & (D | P));           \
+                break;                             \
+            case 0x39:                             \
+                out = S ^ (P | ~D);                \
+                break;                             \
+            case 0x3a:                             \
+                out = S ^ (P | (D ^ S));           \
+                break;                             \
+            case 0x3b:                             \
+                out = ~(S & (P | ~D));             \
+                break;                             \
+            case 0x3c:                             \
+                out = P ^ S;                       \
+                break;                             \
+            case 0x3d:                             \
+                out = S ^ (P | ~(D | S));          \
+                break;                             \
+            case 0x3e:                             \
+                out = S ^ (P | (D & ~S));          \
+                break;                             \
+            case 0x3f:                             \
+                out = ~(P & S);                    \
+                break;                             \
+            case 0x40:                             \
+                out = P & (S & ~D);                \
+                break;                             \
+            case 0x41:                             \
+                out = ~(D | (P ^ S));              \
+                break;                             \
+            case 0x42:                             \
+                out = (S ^ D) & (P ^ D);           \
+                break;                             \
+            case 0x43:                             \
+                out = ~(S ^ (P & ~(D & S)));       \
+                break;                             \
+            case 0x44:                             \
+                out = S & ~D;                      \
+                break;                             \
+            case 0x45:                             \
+                out = ~(D | (P & ~S));             \
+                break;                             \
+            case 0x46:                             \
+                out = D ^ (S | (P & D));           \
+                break;                             \
+            case 0x47:                             \
+                out = ~(P ^ (S & (D ^ P)));        \
+                break;                             \
+            case 0x48:                             \
+                out = S & (D ^ P);                 \
+                break;                             \
+            case 0x49:                             \
+                out = ~(P ^ (D ^ (S | (P & D))));  \
+                break;                             \
+            case 0x4a:                             \
+                out = D ^ (P & (S | D));           \
+                break;                             \
+            case 0x4b:                             \
+                out = P ^ (D | ~S);                \
+                break;                             \
+            case 0x4c:                             \
+                out = S & ~(D & P);                \
+                break;                             \
+            case 0x4d:                             \
+                out = ~(S ^ ((S ^ P) | (D ^ S)));  \
+                break;                             \
+            case 0x4e:                             \
+                out = P ^ (D | (S ^ P));           \
+                break;                             \
+            case 0x4f:                             \
+                out = ~(P & (D | ~S));             \
+                break;                             \
+            case 0x50:                             \
+                out = P & ~D;                      \
+                break;                             \
+            case 0x51:                             \
+                out = ~(D | (S & ~P));             \
+                break;                             \
+            case 0x52:                             \
+                out = D ^ (P | (S & D));           \
+                break;                             \
+            case 0x53:                             \
+                out = ~(S ^ (P & (D ^ S)));        \
+                break;                             \
+            case 0x54:                             \
+                out = ~(D | ~(P | S));             \
+                break;                             \
+            case 0x55:                             \
+                out = ~D;                          \
+                break;                             \
+            case 0x56:                             \
+                out = D ^ (P | S);                 \
+                break;                             \
+            case 0x57:                             \
+                out = ~(D & (P | S));              \
+                break;                             \
+            case 0x58:                             \
+                out = P ^ (D & (S | P));           \
+                break;                             \
+            case 0x59:                             \
+                out = D ^ (P | ~S);                \
+                break;                             \
+            case 0x5a:                             \
+                out = D ^ P;                       \
+                break;                             \
+            case 0x5b:                             \
+                out = D ^ (P | ~(S | D));          \
+                break;                             \
+            case 0x5c:                             \
+                out = D ^ (P | (S ^ D));           \
+                break;                             \
+            case 0x5d:                             \
+                out = ~(D & (P | ~S));             \
+                break;                             \
+            case 0x5e:                             \
+                out = D ^ (P | (S & ~D));          \
+                break;                             \
+            case 0x5f:                             \
+                out = ~(D & P);                    \
+                break;                             \
+            case 0x60:                             \
+                out = P & (D ^ S);                 \
+                break;                             \
+            case 0x61:                             \
+                out = ~(D ^ (S ^ (P | (D & S))));  \
+                break;                             \
+            case 0x62:                             \
+                out = D ^ (S & (P | D));           \
+                break;                             \
+            case 0x63:                             \
+                out = S ^ (D | ~P);                \
+                break;                             \
+            case 0x64:                             \
+                out = S ^ (D & (P | S));           \
+                break;                             \
+            case 0x65:                             \
+                out = D ^ (S | ~P);                \
+                break;                             \
+            case 0x66:                             \
+                out = D ^ S;                       \
+                break;                             \
+            case 0x67:                             \
+                out = S ^ (D | ~(P | S));          \
+                break;                             \
+            case 0x68:                             \
+                out = ~(D ^ (S ^ (P | ~(D | S)))); \
+                break;                             \
+            case 0x69:                             \
+                out = ~(P ^ (D ^ S));              \
+                break;                             \
+            case 0x6a:                             \
+                out = D ^ (P & S);                 \
+                break;                             \
+            case 0x6b:                             \
+                out = ~(P ^ (S ^ (D & (P | S))));  \
+                break;                             \
+            case 0x6c:                             \
+                out = S ^ (D & P);                 \
+                break;                             \
+            case 0x6d:                             \
+                out = ~(P ^ (D ^ (S & (P | D))));  \
+                break;                             \
+            case 0x6e:                             \
+                out = S ^ (D & (P | ~S));          \
+                break;                             \
+            case 0x6f:                             \
+                out = ~(P & ~(D ^ S));             \
+                break;                             \
+            case 0x70:                             \
+                out = P & ~(D & S);                \
+                break;                             \
+            case 0x71:                             \
+                out = ~(S ^ ((S ^ D) & (P ^ D)));  \
+                break;                             \
+            case 0x72:                             \
+                out = S ^ (D | (P ^ S));           \
+                break;                             \
+            case 0x73:                             \
+                out = ~(S & (D | ~P));             \
+                break;                             \
+            case 0x74:                             \
+                out = D ^ (S | (P ^ D));           \
+                break;                             \
+            case 0x75:                             \
+                out = ~(D & (S | ~P));             \
+                break;                             \
+            case 0x76:                             \
+                out = S ^ (D | (P & ~S));          \
+                break;                             \
+            case 0x77:                             \
+                out = ~(D & S);                    \
+                break;                             \
+            case 0x78:                             \
+                out = P ^ (D & S);                 \
+                break;                             \
+            case 0x79:                             \
+                out = ~(D ^ (S ^ (P & (D | S))));  \
+                break;                             \
+            case 0x7a:                             \
+                out = D ^ (P & (S | ~D));          \
+                break;                             \
+            case 0x7b:                             \
+                out = ~(S & ~(D ^ P));             \
+                break;                             \
+            case 0x7c:                             \
+                out = S ^ (P & (D | ~S));          \
+                break;                             \
+            case 0x7d:                             \
+                out = ~(D & ~(P ^ S));             \
+                break;                             \
+            case 0x7e:                             \
+                out = (S ^ P) | (D ^ S);           \
+                break;                             \
+            case 0x7f:                             \
+                out = ~(D & (P & S));              \
+                break;                             \
+            case 0x80:                             \
+                out = D & (P & S);                 \
+                break;                             \
+            case 0x81:                             \
+                out = ~((S ^ P) | (D ^ S));        \
+                break;                             \
+            case 0x82:                             \
+                out = D & ~(P ^ S);                \
+                break;                             \
+            case 0x83:                             \
+                out = ~(S ^ (P & (D | ~S)));       \
+                break;                             \
+            case 0x84:                             \
+                out = S & ~(D ^ P);                \
+                break;                             \
+            case 0x85:                             \
+                out = ~(P ^ (D & (S | ~P)));       \
+                break;                             \
+            case 0x86:                             \
+                out = D ^ (S ^ (P & (D | S)));     \
+                break;                             \
+            case 0x87:                             \
+                out = ~(P ^ (D & S));              \
+                break;                             \
+            case 0x88:                             \
+                out = D & S;                       \
+                break;                             \
+            case 0x89:                             \
+                out = ~(S ^ (D | (P & ~S)));       \
+                break;                             \
+            case 0x8a:                             \
+                out = D & (S | ~P);                \
+                break;                             \
+            case 0x8b:                             \
+                out = ~(D ^ (S | (P ^ D)));        \
+                break;                             \
+            case 0x8c:                             \
+                out = S & (D | ~P);                \
+                break;                             \
+            case 0x8d:                             \
+                out = ~(S ^ (D | (P ^ S)));        \
+                break;                             \
+            case 0x8e:                             \
+                out = S ^ ((S ^ D) & (P ^ D));     \
+                break;                             \
+            case 0x8f:                             \
+                out = ~(P & ~(D & S));             \
+                break;                             \
+            case 0x90:                             \
+                out = P & ~(D ^ S);                \
+                break;                             \
+            case 0x91:                             \
+                out = ~(S ^ (D & (P | ~S)));       \
+                break;                             \
+            case 0x92:                             \
+                out = D ^ (P ^ (S & (D | P)));     \
+                break;                             \
+            case 0x93:                             \
+                out = ~(S ^ (P & D));              \
+                break;                             \
+            case 0x94:                             \
+                out = P ^ (S ^ (D & (P | S)));     \
+                break;                             \
+            case 0x95:                             \
+                out = ~(D ^ (P & S));              \
+                break;                             \
+            case 0x96:                             \
+                out = D ^ (P ^ S);                 \
+                break;                             \
+            case 0x97:                             \
+                out = P ^ (S ^ (D | ~(P | S)));    \
+                break;                             \
+            case 0x98:                             \
+                out = ~(S ^ (D | ~(P | S)));       \
+                break;                             \
+            case 0x99:                             \
+                out = ~(D ^ S);                    \
+                break;                             \
+            case 0x9a:                             \
+                out = D ^ (P & ~S);                \
+                break;                             \
+            case 0x9b:                             \
+                out = ~(S ^ (D & (P | S)));        \
+                break;                             \
+            case 0x9c:                             \
+                out = S ^ (P & ~D);                \
+                break;                             \
+            case 0x9d:                             \
+                out = ~(D ^ (S & (P | D)));        \
+                break;                             \
+            case 0x9e:                             \
+                out = D ^ (S ^ (P | (D & S)));     \
+                break;                             \
+            case 0x9f:                             \
+                out = ~(P & (D ^ S));              \
+                break;                             \
+            case 0xa0:                             \
+                out = D & P;                       \
+                break;                             \
+            case 0xa1:                             \
+                out = ~(P ^ (D | (S & ~P)));       \
+                break;                             \
+            case 0xa2:                             \
+                out = D & (P | ~S);                \
+                break;                             \
+            case 0xa3:                             \
+                out = ~(D ^ (P | (S ^ D)));        \
+                break;                             \
+            case 0xa4:                             \
+                out = ~(P ^ (D | ~(S | P)));       \
+                break;                             \
+            case 0xa5:                             \
+                out = ~(P ^ D);                    \
+                break;                             \
+            case 0xa6:                             \
+                out = D ^ (S & ~P);                \
+                break;                             \
+            case 0xa7:                             \
+                out = ~(P ^ (D & (S | P)));        \
+                break;                             \
+            case 0xa8:                             \
+                out = D & (P | S);                 \
+                break;                             \
+            case 0xa9:                             \
+                out = ~(D ^ (P | S));              \
+                break;                             \
+            case 0xaa:                             \
+                out = D;                           \
+                break;                             \
+            case 0xab:                             \
+                out = D | ~(P | S);                \
+                break;                             \
+            case 0xac:                             \
+                out = S ^ (P & (D ^ S));           \
+                break;                             \
+            case 0xad:                             \
+                out = ~(D ^ (P | (S & D)));        \
+                break;                             \
+            case 0xae:                             \
+                out = D | (S & ~P);                \
+                break;                             \
+            case 0xaf:                             \
+                out = D | ~P;                      \
+                break;                             \
+            case 0xb0:                             \
+                out = P & (D | ~S);                \
+                break;                             \
+            case 0xb1:                             \
+                out = ~(P ^ (D | (S ^ P)));        \
+                break;                             \
+            case 0xb2:                             \
+                out = S ^ ((S ^ P) | (D ^ S));     \
+                break;                             \
+            case 0xb3:                             \
+                out = ~(S & ~(D & P));             \
+                break;                             \
+            case 0xb4:                             \
+                out = P ^ (S & ~D);                \
+                break;                             \
+            case 0xb5:                             \
+                out = ~(D ^ (P & (S | D)));        \
+                break;                             \
+            case 0xb6:                             \
+                out = D ^ (P ^ (S | (D & P)));     \
+                break;                             \
+            case 0xb7:                             \
+                out = ~(S & (D ^ P));              \
+                break;                             \
+            case 0xb8:                             \
+                out = P ^ (S & (D ^ P));           \
+                break;                             \
+            case 0xb9:                             \
+                out = ~(D ^ (S | (P & D)));        \
+                break;                             \
+            case 0xba:                             \
+                out = D | (P & ~S);                \
+                break;                             \
+            case 0xbb:                             \
+                out = D | ~S;                      \
+                break;                             \
+            case 0xbc:                             \
+                out = S ^ (P & ~(D & S));          \
+                break;                             \
+            case 0xbd:                             \
+                out = ~((S ^ D) & (P ^ D));        \
+                break;                             \
+            case 0xbe:                             \
+                out = D | (P ^ S);                 \
+                break;                             \
+            case 0xbf:                             \
+                out = D | ~(P & S);                \
+                break;                             \
+            case 0xc0:                             \
+                out = P & S;                       \
+                break;                             \
+            case 0xc1:                             \
+                out = ~(S ^ (P | (D & ~S)));       \
+                break;                             \
+            case 0xc2:                             \
+                out = ~(S ^ (P | ~(D | S)));       \
+                break;                             \
+            case 0xc3:                             \
+                out = ~(P ^ S);                    \
+                break;                             \
+            case 0xc4:                             \
+                out = S & (P | ~D);                \
+                break;                             \
+            case 0xc5:                             \
+                out = ~(S ^ (P | (D ^ S)));        \
+                break;                             \
+            case 0xc6:                             \
+                out = S ^ (D & ~P);                \
+                break;                             \
+            case 0xc7:                             \
+                out = ~(P ^ (S & (D | P)));        \
+                break;                             \
+            case 0xc8:                             \
+                out = S & (D | P);                 \
+                break;                             \
+            case 0xc9:                             \
+                out = ~(S ^ (P | D));              \
+                break;                             \
+            case 0xca:                             \
+                out = D ^ (P & (S ^ D));           \
+                break;                             \
+            case 0xcb:                             \
+                out = ~(S ^ (P | (D & S)));        \
+                break;                             \
+            case 0xcc:                             \
+                out = S;                           \
+                break;                             \
+            case 0xcd:                             \
+                out = S | ~(D | P);                \
+                break;                             \
+            case 0xce:                             \
+                out = S | (D & ~P);                \
+                break;                             \
+            case 0xcf:                             \
+                out = S | ~P;                      \
+                break;                             \
+            case 0xd0:                             \
+                out = P & (S | ~D);                \
+                break;                             \
+            case 0xd1:                             \
+                out = ~(P ^ (S | (D ^ P)));        \
+                break;                             \
+            case 0xd2:                             \
+                out = P ^ (D & ~S);                \
+                break;                             \
+            case 0xd3:                             \
+                out = ~(S ^ (P & (D | S)));        \
+                break;                             \
+            case 0xd4:                             \
+                out = S ^ ((S ^ P) & (P ^ D));     \
+                break;                             \
+            case 0xd5:                             \
+                out = ~(D & ~(P & S));             \
+                break;                             \
+            case 0xd6:                             \
+                out = P ^ (S ^ (D | (P & S)));     \
+                break;                             \
+            case 0xd7:                             \
+                out = ~(D & (P ^ S));              \
+                break;                             \
+            case 0xd8:                             \
+                out = P ^ (D & (S ^ P));           \
+                break;                             \
+            case 0xd9:                             \
+                out = ~(S ^ (D | (P & S)));        \
+                break;                             \
+            case 0xda:                             \
+                out = D ^ (P & ~(S & D));          \
+                break;                             \
+            case 0xdb:                             \
+                out = ~((S ^ P) & (D ^ S));        \
+                break;                             \
+            case 0xdc:                             \
+                out = S | (P & ~D);                \
+                break;                             \
+            case 0xdd:                             \
+                out = S | ~D;                      \
+                break;                             \
+            case 0xde:                             \
+                out = S | (D ^ P);                 \
+                break;                             \
+            case 0xdf:                             \
+                out = S | ~(D & P);                \
+                break;                             \
+            case 0xe0:                             \
+                out = P & (D | S);                 \
+                break;                             \
+            case 0xe1:                             \
+                out = ~(P ^ (D | S));              \
+                break;                             \
+            case 0xe2:                             \
+                out = D ^ (S & (P ^ D));           \
+                break;                             \
+            case 0xe3:                             \
+                out = ~(P ^ (S | (D & P)));        \
+                break;                             \
+            case 0xe4:                             \
+                out = S ^ (D & (P ^ S));           \
+                break;                             \
+            case 0xe5:                             \
+                out = ~(P ^ (D | (S & P)));        \
+                break;                             \
+            case 0xe6:                             \
+                out = S ^ (D & ~(P & S));          \
+                break;                             \
+            case 0xe7:                             \
+                out = ~((S ^ P) & (P ^ D));        \
+                break;                             \
+            case 0xe8:                             \
+                out = S ^ ((S ^ P) & (D ^ S));     \
+                break;                             \
+            case 0xe9:                             \
+                out = ~(D ^ (S ^ (P & ~(D & S)))); \
+                break;                             \
+            case 0xea:                             \
+                out = D | (P & S);                 \
+                break;                             \
+            case 0xeb:                             \
+                out = D | ~(P ^ S);                \
+                break;                             \
+            case 0xec:                             \
+                out = S | (D & P);                 \
+                break;                             \
+            case 0xed:                             \
+                out = S | ~(D ^ P);                \
+                break;                             \
+            case 0xee:                             \
+                out = D | S;                       \
+                break;                             \
+            case 0xef:                             \
+                out = S | (D | ~P);                \
+                break;                             \
+            case 0xf0:                             \
+                out = P;                           \
+                break;                             \
+            case 0xf1:                             \
+                out = P | ~(D | S);                \
+                break;                             \
+            case 0xf2:                             \
+                out = P | (D & ~S);                \
+                break;                             \
+            case 0xf3:                             \
+                out = P | ~S;                      \
+                break;                             \
+            case 0xf4:                             \
+                out = P | (S & ~D);                \
+                break;                             \
+            case 0xf5:                             \
+                out = P | ~D;                      \
+                break;                             \
+            case 0xf6:                             \
+                out = P | (D ^ S);                 \
+                break;                             \
+            case 0xf7:                             \
+                out = P | ~(D & S);                \
+                break;                             \
+            case 0xf8:                             \
+                out = P | (D & S);                 \
+                break;                             \
+            case 0xf9:                             \
+                out = P | ~(D ^ S);                \
+                break;                             \
+            case 0xfa:                             \
+                out = D | P;                       \
+                break;                             \
+            case 0xfb:                             \
+                out = D | (P | ~S);                \
+                break;                             \
+            case 0xfc:                             \
+                out = P | S;                       \
+                break;                             \
+            case 0xfd:                             \
+                out = P | (S | ~D);                \
+                break;                             \
+            case 0xfe:                             \
+                out = D | (P | S);                 \
+                break;                             \
+            case 0xff:                             \
+                out = ~0;                          \
+                break;                             \
+        }                                          \
+    }
+
+#define MIX()                                                    \
+    do {                                                         \
+        out = 0;                                                 \
+        ROPMIX(tgui->accel.rop, dst_dat, pat_dat, src_dat, out); \
     } while (0)
 
-#define WRITE(addr, dat)                                                               \
-    if (tgui->accel.bpp == 0) {                                                        \
-        svga->vram[(addr) &tgui->vram_mask]                   = dat;                   \
+#define WRITE(addr, dat)                                                                                  \
+    if (tgui->accel.bpp == 0) {                                                                           \
+        svga->vram[(addr) &tgui->vram_mask]                   = dat;                                      \
         svga->changedvram[((addr) & (tgui->vram_mask)) >> 12] = svga->monitor->mon_changeframecount;      \
-    } else if (tgui->accel.bpp == 1) {                                                 \
-        vram_w[(addr) & (tgui->vram_mask >> 1)]                    = dat;              \
+    } else if (tgui->accel.bpp == 1) {                                                                    \
+        vram_w[(addr) & (tgui->vram_mask >> 1)]                    = dat;                                 \
         svga->changedvram[((addr) & (tgui->vram_mask >> 1)) >> 11] = svga->monitor->mon_changeframecount; \
-    } else {                                                                           \
-        vram_l[(addr) & (tgui->vram_mask >> 2)]                    = dat;              \
+    } else {                                                                                              \
+        vram_l[(addr) & (tgui->vram_mask >> 2)]                    = dat;                                 \
         svga->changedvram[((addr) & (tgui->vram_mask >> 2)) >> 10] = svga->monitor->mon_changeframecount; \
     }
 
@@ -1403,8 +2268,6 @@ tgui_accel_command(int count, uint32_t cpu_dat, tgui_t *tgui)
     const uint32_t *pattern_data;
     int             x;
     int             y;
-    int             c;
-    int             d;
     uint32_t        out;
     uint32_t        src_dat   = 0;
     uint32_t        dst_dat;
@@ -1429,6 +2292,8 @@ tgui_accel_command(int count, uint32_t cpu_dat, tgui_t *tgui)
     if (count == -1)
         tgui->accel.x = tgui->accel.y = 0;
 
+    tgui->accel.pattern_32_idx = 0;
+
     if (tgui->accel.flags & TGUI_SOLIDFILL) {
         for (y = 0; y < 8; y++) {
             for (x = 0; x < 8; x++) {
@@ -1447,22 +2312,21 @@ tgui_accel_command(int count, uint32_t cpu_dat, tgui_t *tgui)
         if (tgui->accel.bpp == 0) {
             for (y = 0; y < 8; y++) {
                 for (x = 0; x < 8; x++) {
-                    tgui->accel.pattern_8[(y * 8) + (7 - x)] = tgui->accel.pattern[x + y * 8];
+                    tgui->accel.pattern_8[(y * 8) + x] = tgui->accel.pattern[x + y * 8];
                 }
             }
             pattern_data = tgui->accel.pattern_8;
         } else if (tgui->accel.bpp == 1) {
             for (y = 0; y < 8; y++) {
                 for (x = 0; x < 8; x++) {
-                    tgui->accel.pattern_16[(y * 8) + (7 - x)] = tgui->accel.pattern[x * 2 + y * 16] | (tgui->accel.pattern[x * 2 + y * 16 + 1] << 8);
+                    tgui->accel.pattern_16[(y * 8) + x] = tgui->accel.pattern[x * 2 + y * 16] | (tgui->accel.pattern[x * 2 + y * 16 + 1] << 8);
                 }
             }
             pattern_data = tgui->accel.pattern_16;
         } else {
-            for (y = 0; y < 4; y++) {
+            for (y = 0; y < 8; y++) {
                 for (x = 0; x < 8; x++) {
-                    tgui->accel.pattern_32[(y * 8) + (7 - x)]       = tgui->accel.pattern[x * 4 + y * 32] | (tgui->accel.pattern[x * 4 + y * 32 + 1] << 8) | (tgui->accel.pattern[x * 4 + y * 32 + 2] << 16) | (tgui->accel.pattern[x * 4 + y * 32 + 3] << 24);
-                    tgui->accel.pattern_32[((y + 4) * 8) + (7 - x)] = tgui->accel.pattern[x * 4 + y * 32] | (tgui->accel.pattern[x * 4 + y * 32 + 1] << 8) | (tgui->accel.pattern[x * 4 + y * 32 + 2] << 16) | (tgui->accel.pattern[x * 4 + y * 32 + 3] << 24);
+                    tgui->accel.pattern_32[(y * 8) + x] = tgui->accel.pattern_32bpp[x * 4 + y * 32] | (tgui->accel.pattern_32bpp[x * 4 + y * 32 + 1] << 8) | (tgui->accel.pattern_32bpp[x * 4 + y * 32 + 2] << 16) | (tgui->accel.pattern_32bpp[x * 4 + y * 32 + 3] << 24);
                 }
             }
             pattern_data = tgui->accel.pattern_32;
@@ -1484,6 +2348,8 @@ tgui_accel_command(int count, uint32_t cpu_dat, tgui_t *tgui)
         case 32:
             tgui->accel.pitch <<= 1;
             break;
+        default:
+            break;
     }
 #if 0
     pclog("TGUI accel command = %x, ger22 = %04x, hdisp = %d, dispend = %d, vtotal = %d, rowoffset = %d, svgabpp = %d, interlace = %d, accelbpp = %d, pitch = %d.\n", tgui->accel.command, tgui->accel.ger22, svga->hdisp, svga->dispend, svga->vtotal, svga->rowoffset, svga->bpp, svga->interlace, tgui->accel.bpp, tgui->accel.pitch);
@@ -1543,6 +2409,7 @@ tgui_accel_command(int count, uint32_t cpu_dat, tgui_t *tgui)
                                 count -= 3;
                             }
 
+
                             READ(tgui->accel.dst, dst_dat);
 
                             pat_dat = pattern_data[((tgui->accel.pat_y & 7) * 8) + (tgui->accel.pat_x & 7)];
@@ -2029,7 +2896,9 @@ tgui_accel_out(uint16_t addr, uint8_t val, void *priv)
 
         case 0x2123:
             tgui->accel.ger22 = (tgui->accel.ger22 & 0xff) | (val << 8);
-            //pclog("Pitch IO23: val = %02x, rowoffset = %x.\n", tgui->accel.ger22, svga->crtc[0x13]);
+#if 0
+            pclog("Pitch IO23: val = %02x, rowoffset = %x.\n", tgui->accel.ger22, svga->crtc[0x13]);
+#endif
             switch (svga->bpp) {
                 case 8:
                 case 24:
@@ -2337,6 +3206,8 @@ tgui_accel_out(uint16_t addr, uint8_t val, void *priv)
         case 0x21fe:
         case 0x21ff:
             tgui->accel.pattern[addr & 0x7f] = val;
+            tgui->accel.pattern_32bpp[tgui->accel.pattern_32_idx] = val;
+            tgui->accel.pattern_32_idx = (tgui->accel.pattern_32_idx + 1) & 0xff;
             break;
 
         default:
@@ -3155,7 +4026,7 @@ tgui_init(const device_t *info)
             break;
         case TGUI_9660:
         case TGUI_9680:
-            bios_fn = ROM_TGUI_96xx;
+            bios_fn = (info->local & ONBOARD) ? NULL : ROM_TGUI_96xx;
             break;
         default:
             free(tgui);
@@ -3213,7 +4084,6 @@ tgui_init(const device_t *info)
 
     if (tgui->type >= TGUI_9440) {
         svga->packed_chain4 = 1;
-
         tgui->i2c = i2c_gpio_init("ddc_tgui");
         tgui->ddc = ddc_init(i2c_gpio_get_bus(tgui->i2c));
     }
@@ -3279,56 +4149,41 @@ tgui_force_redraw(void *priv)
 // clang-format off
 static const device_config_t tgui9440_config[] = {
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "1 MB",
-                .value = 1
-            },
-            {
-                .description = "2 MB",
-                .value = 2
-            },
-            {
-                .description = ""
-            }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "1 MB", .value = 1 },
+            { .description = "2 MB", .value = 2 },
+            { .description = ""                 }
         },
-        .default_int = 2
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t tgui96xx_config[] = {
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "1 MB",
-                .value = 1
-            },
-            {
-                .description = "2 MB",
-                .value = 2
-            },
-            {
-                .description = "4 MB",
-                .value = 4
-            },
-            {
-                .description = ""
-            }
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 4,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "1 MB", .value = 1 },
+            { .description = "2 MB", .value = 2 },
+            { .description = "4 MB", .value = 4 },
+            { .description = ""                 }
         },
-        .default_int = 4
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 // clang-format on
 
@@ -3340,7 +4195,7 @@ const device_t tgui9400cxi_device = {
     .init          = tgui_init,
     .close         = tgui_close,
     .reset         = NULL,
-    { .available = tgui9400cxi_available },
+    .available     = tgui9400cxi_available,
     .speed_changed = tgui_speed_changed,
     .force_redraw  = tgui_force_redraw,
     .config        = tgui9440_config
@@ -3354,7 +4209,7 @@ const device_t tgui9440_vlb_device = {
     .init          = tgui_init,
     .close         = tgui_close,
     .reset         = NULL,
-    { .available = tgui9440_vlb_available },
+    .available     = tgui9440_vlb_available,
     .speed_changed = tgui_speed_changed,
     .force_redraw  = tgui_force_redraw,
     .config        = tgui9440_config
@@ -3368,7 +4223,7 @@ const device_t tgui9440_pci_device = {
     .init          = tgui_init,
     .close         = tgui_close,
     .reset         = NULL,
-    { .available = tgui9440_pci_available },
+    .available     = tgui9440_pci_available,
     .speed_changed = tgui_speed_changed,
     .force_redraw  = tgui_force_redraw,
     .config        = tgui9440_config
@@ -3382,7 +4237,7 @@ const device_t tgui9440_onboard_pci_device = {
     .init          = tgui_init,
     .close         = tgui_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = tgui_speed_changed,
     .force_redraw  = tgui_force_redraw,
     .config        = tgui9440_config
@@ -3396,7 +4251,21 @@ const device_t tgui9660_pci_device = {
     .init          = tgui_init,
     .close         = tgui_close,
     .reset         = NULL,
-    { .available = tgui96xx_available },
+    .available     = tgui96xx_available,
+    .speed_changed = tgui_speed_changed,
+    .force_redraw  = tgui_force_redraw,
+    .config        = tgui96xx_config
+};
+
+const device_t tgui9660_onboard_pci_device = {
+    .name          = "Trident TGUI 9660XGi On-Board PCI",
+    .internal_name = "tgui9660_onboard_pci",
+    .flags         = DEVICE_PCI,
+    .local         = TGUI_9660 | ONBOARD,
+    .init          = tgui_init,
+    .close         = tgui_close,
+    .reset         = NULL,
+    .available     = NULL,
     .speed_changed = tgui_speed_changed,
     .force_redraw  = tgui_force_redraw,
     .config        = tgui96xx_config
@@ -3410,7 +4279,7 @@ const device_t tgui9680_pci_device = {
     .init          = tgui_init,
     .close         = tgui_close,
     .reset         = NULL,
-    { .available = tgui96xx_available },
+    .available     = tgui96xx_available,
     .speed_changed = tgui_speed_changed,
     .force_redraw  = tgui_force_redraw,
     .config        = tgui96xx_config
diff --git a/src/video/vid_ti_cf62011.c b/src/video/vid_ti_cf62011.c
index f23cb7396..fcc046cb4 100644
--- a/src/video/vid_ti_cf62011.c
+++ b/src/video/vid_ti_cf62011.c
@@ -266,7 +266,7 @@ const device_t ibm_ps1_2121_device = {
     .init          = vid_init,
     .close         = vid_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = vid_speed_changed,
     .force_redraw  = vid_force_redraw,
     .config        = NULL
diff --git a/src/video/vid_tvga.c b/src/video/vid_tvga.c
index 591851016..51ab132ca 100644
--- a/src/video/vid_tvga.c
+++ b/src/video/vid_tvga.c
@@ -37,6 +37,7 @@
 
 #define ROM_TVGA_8900B            "roms/video/tvga/tvga8900b.vbi"
 #define ROM_TVGA_8900CLD          "roms/video/tvga/trident.bin"
+#define ROM_TVGA_8900DR           "roms/video/tvga/8900DR.VBI"
 #define ROM_TVGA_9000B            "roms/video/tvga/tvga9000b.bin"
 #define ROM_TVGA_9000B_NEC_SV9000 "roms/video/tvga/SV9000.VBI"
 
@@ -59,6 +60,7 @@ typedef struct tvga_t {
 } tvga_t;
 
 video_timings_t timing_tvga8900 = { .type = VIDEO_ISA, .write_b = 3, .write_w = 3, .write_l = 6, .read_b = 8, .read_w = 8, .read_l = 12 };
+video_timings_t timing_tvga8900dr = { .type = VIDEO_ISA, .write_b = 3, .write_w = 3, .write_l = 6, .read_b = 5, .read_w = 5, .read_l = 10 };
 video_timings_t timing_tvga9000 = { .type = VIDEO_ISA, .write_b = 7, .write_w = 7, .write_l = 12, .read_b = 7, .read_w = 7, .read_l = 12 };
 
 static uint8_t crtc_mask[0x40] = {
@@ -166,7 +168,7 @@ tvga_out(uint16_t addr, uint8_t val, void *priv)
                 if (svga->crtcreg < 0xe || svga->crtcreg > 0x10) {
                     if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
                     } else {
                         svga->fullchange = changeframecount;
                         svga_recalctimings(svga);
@@ -291,15 +293,15 @@ tvga_recalctimings(svga_t *svga)
         svga->hdisp = (svga->crtc[1] + 1) * 8;
 
     if ((svga->crtc[0x1e] & 0xA0) == 0xA0)
-        svga->ma_latch |= 0x10000;
+        svga->memaddr_latch |= 0x10000;
     if ((svga->crtc[0x27] & 0x01) == 0x01)
-        svga->ma_latch |= 0x20000;
+        svga->memaddr_latch |= 0x20000;
     if ((svga->crtc[0x27] & 0x02) == 0x02)
-        svga->ma_latch |= 0x40000;
+        svga->memaddr_latch |= 0x40000;
 
     if (tvga->oldctrl2 & 0x10) {
         svga->rowoffset <<= 1;
-        svga->ma_latch <<= 1;
+        svga->memaddr_latch <<= 1;
     }
 
     if (svga->gdcreg[0xf] & 0x08) {
@@ -417,7 +419,10 @@ tvga_init(const device_t *info)
         video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_tvga9000);
         tvga->vram_size = 512 << 10;
     } else {
-        video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_tvga8900);
+        if (info->local & 0x0100)
+            video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_tvga8900dr);
+        else
+            video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_tvga8900);
         tvga->vram_size = device_get_config_int("memory") << 10;
     }
 
@@ -428,7 +433,10 @@ tvga_init(const device_t *info)
             bios_fn = ROM_TVGA_8900B;
             break;
         case TVGA8900CLD_ID:
-            bios_fn = ROM_TVGA_8900CLD;
+            if (info->local & 0x0100)
+                bios_fn = ROM_TVGA_8900DR;
+            else
+                bios_fn = ROM_TVGA_8900CLD;
             break;
         case TVGA9000B_ID:
             bios_fn = (info->local & 0x100) ? ROM_TVGA_9000B_NEC_SV9000 : ROM_TVGA_9000B;
@@ -466,6 +474,12 @@ tvga8900d_available(void)
     return rom_present(ROM_TVGA_8900CLD);
 }
 
+static int
+tvga8900dr_available(void)
+{
+    return rom_present(ROM_TVGA_8900DR);
+}
+
 static int
 tvga9000b_available(void)
 {
@@ -507,87 +521,92 @@ tvga_force_redraw(void *priv)
 static const device_config_t tvga_config[] = {
     // clang-format off
     {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .default_int = 1024,
-        .selection = {
-            {
-                .description = "256 kB",
-                .value = 256
-            },
-            {
-                .description = "512 kB",
-                .value = 512
-            },
-            {
-                .description = "1 MB",
-                .value = 1024
-            },
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 1024,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "256 KB", .value =  256 },
+            { .description = "512 KB", .value =  512 },
+            { .description = "1 MB",   .value = 1024 },
             /*Chip supports 2mb, but drivers are buggy*/
-            {
-                .description = ""
-            }
-        }
+            { .description = ""                      }
+        },
+        .bios           = { { 0 } }
     },
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 // clang-format off
 };
 
 const device_t tvga8900b_device = {
-    .name = "Trident TVGA 8900B",
+    .name          = "Trident TVGA 8900B",
     .internal_name = "tvga8900b",
-    .flags = DEVICE_ISA,
-    .local = TVGA8900B_ID,
-    .init = tvga_init,
-    .close = tvga_close,
-    .reset = NULL,
-    { .available = tvga8900b_available },
+    .flags         = DEVICE_ISA,
+    .local         = TVGA8900B_ID,
+    .init          = tvga_init,
+    .close         = tvga_close,
+    .reset         = NULL,
+    .available     = tvga8900b_available,
     .speed_changed = tvga_speed_changed,
-    .force_redraw = tvga_force_redraw,
-    .config = tvga_config
+    .force_redraw  = tvga_force_redraw,
+    .config        = tvga_config
 };
 
 const device_t tvga8900d_device = {
-    .name = "Trident TVGA 8900D",
+    .name          = "Trident TVGA 8900D",
     .internal_name = "tvga8900d",
-    .flags = DEVICE_ISA,
-    .local = TVGA8900CLD_ID,
-    .init = tvga_init,
-    .close = tvga_close,
-    .reset = NULL,
-    { .available = tvga8900d_available },
+    .flags         = DEVICE_ISA,
+    .local         = TVGA8900CLD_ID,
+    .init          = tvga_init,
+    .close         = tvga_close,
+    .reset         = NULL,
+    .available     = tvga8900d_available,
     .speed_changed = tvga_speed_changed,
-    .force_redraw = tvga_force_redraw,
-    .config = tvga_config
+    .force_redraw  = tvga_force_redraw,
+    .config        = tvga_config
+};
+
+const device_t tvga8900dr_device = {
+    .name          = "Trident TVGA 8900D-R",
+    .internal_name = "tvga8900dr",
+    .flags         = DEVICE_ISA,
+    .local         = TVGA8900CLD_ID | 0x0100,
+    .init          = tvga_init,
+    .close         = tvga_close,
+    .reset         = NULL,
+    .available     = tvga8900dr_available,
+    .speed_changed = tvga_speed_changed,
+    .force_redraw  = tvga_force_redraw,
+    .config        = tvga_config
 };
 
 const device_t tvga9000b_device = {
-    .name = "Trident TVGA 9000B",
+    .name          = "Trident TVGA 9000B",
     .internal_name = "tvga9000b",
-    .flags = DEVICE_ISA,
-    .local = TVGA9000B_ID,
-    .init = tvga_init,
-    .close = tvga_close,
-    .reset = NULL,
-    { .available = tvga9000b_available },
+    .flags         = DEVICE_ISA,
+    .local         = TVGA9000B_ID,
+    .init          = tvga_init,
+    .close         = tvga_close,
+    .reset         = NULL,
+    .available     = tvga9000b_available,
     .speed_changed = tvga_speed_changed,
-    .force_redraw = tvga_force_redraw,
-    .config = NULL
+    .force_redraw  = tvga_force_redraw,
+    .config        = NULL
 };
 
 const device_t nec_sv9000_device = {
-    .name = "NEC SV9000 (Trident TVGA 9000B)",
+    .name          = "NEC SV9000 (Trident TVGA 9000B)",
     .internal_name = "nec_sv9000",
-    .flags = DEVICE_ISA,
-    .local = TVGA9000B_ID | 0x100,
-    .init = tvga_init,
-    .close = tvga_close,
-    .reset = NULL,
-    { .available = tvga9000b_nec_sv9000_available },
+    .flags         = DEVICE_ISA,
+    .local         = TVGA9000B_ID | 0x100,
+    .init          = tvga_init,
+    .close         = tvga_close,
+    .reset         = NULL,
+    .available     = tvga9000b_nec_sv9000_available,
     .speed_changed = tvga_speed_changed,
-    .force_redraw = tvga_force_redraw,
-    .config = NULL
+    .force_redraw  = tvga_force_redraw,
+    .config        = NULL
 };
diff --git a/src/video/vid_vga.c b/src/video/vid_vga.c
index 8b2e761a3..4cde5ba01 100644
--- a/src/video/vid_vga.c
+++ b/src/video/vid_vga.c
@@ -31,6 +31,8 @@
 #include <86box/vid_svga.h>
 #include <86box/vid_vga.h>
 
+video_timings_t        timing_vga = { .type = VIDEO_ISA, .write_b = 8, .write_w = 16, .write_l = 32, .read_b = 8, .read_w = 16, .read_l = 32 };
+
 static video_timings_t timing_ps1_svga_isa = { .type = VIDEO_ISA, .write_b = 6, .write_w = 8, .write_l = 16, .read_b = 6, .read_w = 8, .read_l = 16 };
 static video_timings_t timing_ps1_svga_mca = { .type = VIDEO_MCA, .write_b = 6, .write_w = 8, .write_l = 16, .read_b = 6, .read_w = 8, .read_l = 16 };
 
@@ -61,7 +63,7 @@ vga_out(uint16_t addr, uint8_t val, void *priv)
                 if (svga->crtcreg < 0xe || svga->crtcreg > 0x10) {
                     if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
                     } else {
                         svga->fullchange = changeframecount;
                         svga_recalctimings(svga);
@@ -103,27 +105,65 @@ vga_in(uint16_t addr, void *priv)
     return temp;
 }
 
-static void *
-vga_init(const device_t *info)
+void vga_disable(void* p)
 {
-    vga_t *vga = malloc(sizeof(vga_t));
-    memset(vga, 0, sizeof(vga_t));
+    vga_t* vga = (vga_t*)p;
+    svga_t* svga = &vga->svga;
 
-    rom_init(&vga->bios_rom, "roms/video/vga/ibm_vga.bin", 0xc0000, 0x8000, 0x7fff, 0x2000, MEM_MAPPING_EXTERNAL);
+    io_removehandler(0x03a0, 0x0040, vga_in, NULL, NULL, vga_out, NULL, NULL, vga);
+    mem_mapping_disable(&svga->mapping);
+    svga->vga_enabled = 0;
+}
 
-    video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_vga);
+void vga_enable(void* p)
+{
+    vga_t* vga = (vga_t*)p;
+    svga_t* svga = &vga->svga;
 
+    io_sethandler(0x03c0, 0x0020, vga_in, NULL, NULL, vga_out, NULL, NULL, vga);
+    if (!(svga->miscout & 1))
+        io_sethandler(0x03a0, 0x0020, vga_in, NULL, NULL, vga_out, NULL, NULL, vga);
+
+    mem_mapping_enable(&svga->mapping);
+    svga->vga_enabled = 1;
+}
+
+int vga_isenabled(void* p)
+{
+    vga_t* vga = (vga_t*)p;
+    svga_t* svga = &vga->svga;
+
+    return svga->vga_enabled;
+}
+
+void
+vga_init(const device_t *info, vga_t *vga, int enabled)
+{
     svga_init(info, &vga->svga, vga, 1 << 18, /*256kb*/
               NULL,
               vga_in, vga_out,
               NULL,
               NULL);
 
-    io_sethandler(0x03c0, 0x0020, vga_in, NULL, NULL, vga_out, NULL, NULL, vga);
-
     vga->svga.bpp     = 8;
     vga->svga.miscout = 1;
 
+    vga->svga.vga_enabled = enabled;
+}
+
+static void *
+vga_standalone_init(const device_t *info)
+{
+    vga_t *vga = calloc(1, sizeof(vga_t));
+
+    rom_init(&vga->bios_rom, "roms/video/vga/ibm_vga.bin", 0xc0000, 0x8000, 0x7fff, 0x2000, MEM_MAPPING_EXTERNAL);
+
+    video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_vga);
+
+    vga_init(info, vga, 0);
+
+    io_sethandler(0x03c0, 0x0020, vga_in, NULL, NULL, vga_out, NULL, NULL, vga);
+ 
     return vga;
 }
 
@@ -131,25 +171,17 @@ vga_init(const device_t *info)
 void *
 ps1vga_init(const device_t *info)
 {
-    vga_t *vga = malloc(sizeof(vga_t));
-    memset(vga, 0, sizeof(vga_t));
+    vga_t *vga = calloc(1, sizeof(vga_t));
 
     if (info->flags & DEVICE_MCA)
         video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_ps1_svga_mca);
     else
         video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_ps1_svga_isa);
 
-    svga_init(info, &vga->svga, vga, 1 << 18, /*256kb*/
-              NULL,
-              vga_in, vga_out,
-              NULL,
-              NULL);
+    vga_init(info, vga, 1);
 
     io_sethandler(0x03c0, 0x0020, vga_in, NULL, NULL, vga_out, NULL, NULL, vga);
 
-    vga->svga.bpp     = 8;
-    vga->svga.miscout = 1;
-
     return vga;
 }
 
@@ -190,10 +222,10 @@ const device_t vga_device = {
     .internal_name = "vga",
     .flags         = DEVICE_ISA,
     .local         = 0,
-    .init          = vga_init,
+    .init          = vga_standalone_init,
     .close         = vga_close,
     .reset         = NULL,
-    { .available = vga_available },
+    .available     = vga_available,
     .speed_changed = vga_speed_changed,
     .force_redraw  = vga_force_redraw,
     .config        = NULL
@@ -207,7 +239,7 @@ const device_t ps1vga_device = {
     .init          = ps1vga_init,
     .close         = vga_close,
     .reset         = NULL,
-    { .available = vga_available },
+    .available     = NULL,
     .speed_changed = vga_speed_changed,
     .force_redraw  = vga_force_redraw,
     .config        = NULL
@@ -221,7 +253,7 @@ const device_t ps1vga_mca_device = {
     .init          = ps1vga_init,
     .close         = vga_close,
     .reset         = NULL,
-    { .available = vga_available },
+    .available     = NULL,
     .speed_changed = vga_speed_changed,
     .force_redraw  = vga_force_redraw,
     .config        = NULL
diff --git a/src/video/vid_voodoo.c b/src/video/vid_voodoo.c
index 734179fa9..57ddbf64d 100644
--- a/src/video/vid_voodoo.c
+++ b/src/video/vid_voodoo.c
@@ -222,12 +222,12 @@ voodoo_readl(uint32_t addr, void *priv)
                 {
                     int fifo_entries = FIFO_ENTRIES;
                     int swap_count   = voodoo->swap_count;
-                    int written      = voodoo->cmd_written + voodoo->cmd_written_fifo;
+                    int written      = voodoo->cmd_written + voodoo->cmd_written_fifo + voodoo->cmd_written_fifo_2;
                     int busy         = (written - voodoo->cmd_read) || (voodoo->cmdfifo_depth_rd != voodoo->cmdfifo_depth_wr);
 
                     if (SLI_ENABLED && voodoo->type != VOODOO_2) {
                         voodoo_t *voodoo_other  = (voodoo == voodoo->set->voodoos[0]) ? voodoo->set->voodoos[1] : voodoo->set->voodoos[0];
-                        int       other_written = voodoo_other->cmd_written + voodoo_other->cmd_written_fifo;
+                        int       other_written = voodoo_other->cmd_written + voodoo_other->cmd_written_fifo + voodoo->cmd_written_fifo_2;
 
                         if (voodoo_other->swap_count > swap_count)
                             swap_count = voodoo_other->swap_count;
@@ -505,6 +505,9 @@ voodoo_writel(uint32_t addr, uint32_t val, void *priv)
                 voodoo->videoDimensions = val;
                 voodoo->h_disp          = (val & 0xfff) + 1;
                 voodoo->v_disp          = (val >> 16) & 0xfff;
+                if ((voodoo->v_disp == 386) || (voodoo->v_disp == 402) ||
+                    (voodoo->v_disp == 482) || (voodoo->v_disp == 602))
+                    voodoo->v_disp     -= 2;
                 break;
             case SST_fbiInit0:
                 if (voodoo->initEnable & 0x01) {
@@ -527,6 +530,7 @@ voodoo_writel(uint32_t addr, uint32_t val, void *priv)
                         voodoo_recalc(voodoo);
                         voodoo->front_offset = voodoo->params.front_offset;
                     }
+                    svga_recalctimings(voodoo->svga);
                 }
                 break;
             case SST_fbiInit1:
@@ -1305,124 +1309,124 @@ voodoo_close(void *priv)
 static const device_config_t voodoo_config[] = {
   // clang-format off
     {
-        .name = "type",
-        .description = "Voodoo type",
-        .type = CONFIG_SELECTION,
+        .name           = "type",
+        .description    = "Voodoo type",
+        .type           = CONFIG_SELECTION,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
         .selection = {
-            {
-                .description = "3Dfx Voodoo Graphics",
-                .value = VOODOO_1
-            },
-            {
-                .description = "Obsidian SB50 + Amethyst (2 TMUs)",
-                .value = VOODOO_SB50
-            },
-            {
-                .description = "3Dfx Voodoo 2",
-                .value = VOODOO_2
-            },
-            {
-                .description = ""
-            }
+            { .description = "3Dfx Voodoo Graphics",              .value = VOODOO_1    },
+            { .description = "Obsidian SB50 + Amethyst (2 TMUs)", .value = VOODOO_SB50 },
+            { .description = "3Dfx Voodoo 2",                     .value = VOODOO_2    },
+            { .description = ""                                                        }
         },
-        .default_int = 0
+        .bios           = { { 0 } }
     },
     {
-        .name = "framebuffer_memory",
-        .description = "Framebuffer memory size",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "2 MB",
-                .value = 2
-            },
-            {
-                .description = "4 MB",
-                .value = 4
-            },
-            {
-                .description = ""
-            }
+        .name           = "framebuffer_memory",
+        .description    = "Framebuffer memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "2 MB", .value = 2 },
+            { .description = "4 MB", .value = 4 },
+            { .description = ""                 }
         },
-        .default_int = 2
+        .bios           = { { 0 } }
     },
     {
-        .name = "texture_memory",
-        .description = "Texture memory size",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "2 MB",
-                .value = 2
-            },
-            {
-                .description = "4 MB",
-                .value = 4
-            },
-            {
-                .description = ""
-            }
+        .name           = "texture_memory",
+        .description    = "Texture memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "2 MB", .value = 2 },
+            { .description = "4 MB", .value = 4 },
+            { .description = ""                 }
         },
-        .default_int = 2
+        .bios           = { { 0 } }
     },
     {
-        .name = "bilinear",
-        .description = "Bilinear filtering",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "bilinear",
+        .description    = "Bilinear filtering",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dithersub",
-        .description = "Dither subtraction",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "dithersub",
+        .description    = "Dither subtraction",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "dacfilter",
-        .description = "Screen Filter",
-        .type = CONFIG_BINARY,
-        .default_int = 0
+        .name           = "dacfilter",
+        .description    = "Screen Filter",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
     {
-        .name = "render_threads",
-        .description = "Render threads",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "1",
-                .value = 1
-            },
-            {
-                .description = "2",
-                .value = 2
-            },
-            {
-                .description = "4",
-                .value = 4
-            },
-            {
-                .description = ""
-            }
+        .name           = "render_threads",
+        .description    = "Render threads",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "1", .value = 1 },
+            { .description = "2", .value = 2 },
+            { .description = "4", .value = 4 },
+            { .description = ""              }
         },
-        .default_int = 2
+        .bios           = { { 0 } }
     },
     {
-        .name = "sli",
-        .description = "SLI",
-        .type = CONFIG_BINARY,
-        .default_int = 0
+        .name           = "sli",
+        .description    = "SLI",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
 #ifndef NO_CODEGEN
     {
-        .name = "recompiler",
-        .description = "Recompiler",
-        .type = CONFIG_BINARY,
-        .default_int = 1
+        .name           = "recompiler",
+        .description    = "Dynamic Recompiler",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
     },
 #endif
-    {
-        .type = CONFIG_END
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
@@ -1434,7 +1438,7 @@ const device_t voodoo_device = {
     .init          = voodoo_init,
     .close         = voodoo_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = voodoo_speed_changed,
     .force_redraw  = voodoo_force_blit,
     .config        = voodoo_config
diff --git a/src/video/vid_voodoo_banshee.c b/src/video/vid_voodoo_banshee.c
index 9fec8c073..7bd94a34a 100644
--- a/src/video/vid_voodoo_banshee.c
+++ b/src/video/vid_voodoo_banshee.c
@@ -18,6 +18,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdint.h>
+#include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -30,6 +31,7 @@
 #include <86box/device.h>
 #include <86box/io.h>
 #include <86box/mem.h>
+#include <86box/dma.h>
 #include <86box/pci.h>
 #include <86box/rom.h>
 #include <86box/timer.h>
@@ -39,16 +41,20 @@
 #include <86box/video.h>
 #include <86box/i2c.h>
 #include <86box/vid_ddc.h>
+#include <86box/vid_xga.h>
 #include <86box/vid_svga.h>
 #include <86box/vid_svga_render.h>
 #include <86box/vid_voodoo_common.h>
 #include <86box/vid_voodoo_display.h>
+#include <86box/vid_voodoo_fb.h>
 #include <86box/vid_voodoo_fifo.h>
 #include <86box/vid_voodoo_regs.h>
 #include <86box/vid_voodoo_render.h>
+#include <86box/vid_voodoo_texture.h>
 
 #define ROM_BANSHEE                 "roms/video/voodoo/Pci_sg.rom"
 #define ROM_CREATIVE_BANSHEE        "roms/video/voodoo/BlasterPCI.rom"
+#define ROM_QUANTUM3D_RAVEN         "roms/video/voodoo/RVPD0224.rom"
 #define ROM_VOODOO3_1000            "roms/video/voodoo/1k11sg.rom"
 #define ROM_VOODOO3_2000            "roms/video/voodoo/2k11sd.rom"
 #define ROM_VOODOO3_3000            "roms/video/voodoo/3k12sd.rom"
@@ -75,6 +81,7 @@ static uint8_t vb_filter_bx_g[256][256];
 
 enum {
     TYPE_BANSHEE = 0,
+    TYPE_QUANTUM3D_RAVEN,
     TYPE_V3_1000,
     TYPE_V3_2000,
     TYPE_V3_3000,
@@ -116,6 +123,8 @@ typedef struct banshee_t {
     uint32_t vidProcCfg;
     uint32_t vidScreenSize;
     uint32_t vidSerialParallelPort;
+    uint32_t vidChromaKeyMin;
+    uint32_t vidChromaKeyMax;
 
     uint32_t agpReqSize;
     uint32_t agpHostAddressHigh;
@@ -148,6 +157,8 @@ typedef struct banshee_t {
     uint8_t pci_slot;
     uint8_t irq_state;
 
+    bool chroma_key_enabled;
+
     void *i2c, *i2c_ddc, *ddc;
 } banshee_t;
 
@@ -181,6 +192,8 @@ enum {
     Video_hwCurC0                      = 0x68,
     Video_hwCurC1                      = 0x6c,
     Video_vidSerialParallelPort        = 0x78,
+    Video_vidChromaKeyMin              = 0x8c,
+    Video_vidChromaKeyMax              = 0x90,
     Video_vidScreenSize                = 0x98,
     Video_vidOverlayStartCoords        = 0x9c,
     Video_vidOverlayEndScreenCoords    = 0xa0,
@@ -204,11 +217,23 @@ enum {
     cmdFifoDepth0 = 0x44,
     cmdHoleCnt0   = 0x48,
 
+    cmdBaseAddr1  = 0x50,
+    cmdBaseSize1  = 0x50 + 0x4,
+    cmdBump1      = 0x50 + 0x8,
+    cmdRdPtrL1    = 0x50 + 0xc,
+    cmdRdPtrH1    = 0x50 + 0x10,
+    cmdAMin1      = 0x50 + 0x14,
+    cmdAMax1      = 0x50 + 0x1c,
+    cmdStatus1    = 0x50 + 0x20,
+    cmdFifoDepth1 = 0x50 + 0x24,
+    cmdHoleCnt1   = 0x50 + 0x28,
+
     Agp_agpReqSize         = 0x00,
     Agp_agpHostAddressLow  = 0x04,
     Agp_agpHostAddressHigh = 0x08,
     Agp_agpGraphicsAddress = 0x0C,
     Agp_agpGraphicsStride  = 0x10,
+    Agp_agpMoveCMD         = 0x14,
 };
 
 #define VGAINIT0_RAMDAC_8BIT                (1 << 2)
@@ -368,7 +393,7 @@ banshee_out(uint16_t addr, uint8_t val, void *priv)
                 if (svga->crtcreg < 0xe || svga->crtcreg > 0x11 || (svga->crtcreg == 0x11 && old != val)) {
                     if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
                     } else {
                         svga->fullchange = changeframecount;
                         svga_recalctimings(svga);
@@ -428,9 +453,12 @@ static void
 banshee_updatemapping(banshee_t *banshee)
 {
     svga_t *svga = &banshee->svga;
+    xga_t  *xga  = (xga_t *) svga->xga;
 
     if (!(banshee->pci_regs[PCI_REG_COMMAND] & PCI_COMMAND_MEM)) {
-        //                banshee_log("Update mapping - PCI disabled\n");
+#if 0
+        banshee_log("Update mapping - PCI disabled\n");
+#endif
         mem_mapping_disable(&svga->mapping);
         mem_mapping_disable(&banshee->linear_mapping);
         mem_mapping_disable(&banshee->reg_mapping_low);
@@ -447,6 +475,10 @@ banshee_updatemapping(banshee_t *banshee)
         case 0x4: /*64k at A0000*/
             mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
             svga->banked_mask = 0xffff;
+            if (xga_active && (svga->xga != NULL)) {
+                xga->on = 0;
+                mem_mapping_set_handler(&svga->mapping, svga->read, svga->readw, svga->readl, svga->write, svga->writew, svga->writel);
+            }
             break;
         case 0x8: /*32k at B0000*/
             mem_mapping_set_addr(&svga->mapping, 0xb0000, 0x08000);
@@ -469,7 +501,7 @@ banshee_updatemapping(banshee_t *banshee)
 }
 
 uint32_t
-banshee_conv_16to32(svga_t* svga, uint16_t color, uint8_t bpp)
+banshee_conv_16to32(svga_t* svga, uint16_t color, UNUSED(uint8_t bpp))
 {
     banshee_t *banshee = (banshee_t *) svga->priv;
     uint32_t ret = 0x00000000;
@@ -510,7 +542,10 @@ banshee_render_16bpp_tiled(svga_t *svga)
     else
         addr = banshee->desktop_addr + (banshee->desktop_y & 31) * 128 + ((banshee->desktop_y >> 5) * banshee->desktop_stride_tiled);
 
-    for (int x = 0; x <= svga->hdisp; x += 64) {
+    if (addr >= svga->vram_max)
+        return;
+
+    for (int x = 0; x < svga->hdisp; x += 64) {
         if (svga->hwcursor_on || svga->overlay_on)
             svga->changedvram[addr >> 12] = 2;
         if (svga->changedvram[addr >> 12] || svga->fullchange) {
@@ -557,14 +592,14 @@ banshee_recalctimings(svga_t *svga)
         /* Video processing mode - assume timings akin to Cirrus' special blanking mode,
            that is, no overscan and relying on display end to blank. */
         if (banshee->vgaInit0 & 0x40) {
-            svga->hblankstart     = svga->crtc[1] + ((svga->crtc[3] >> 5) & 3) +
-                                   (((svga->crtc[0x1a] & 0x04) >> 2) << 8) + 1;
+            svga->hblankstart     = svga->crtc[1]/* + ((svga->crtc[3] >> 5) & 3)*/ +
+                                   (((svga->crtc[0x1a] & 0x04) >> 2) << 8);
             svga->hblank_end_mask = 0x0000007f;
         } else {
-            svga->hblankstart     = svga->crtc[1] + ((svga->crtc[3] >> 5) & 3) + 1;
+            svga->hblankstart     = svga->crtc[1]/* + ((svga->crtc[3] >> 5) & 3)*/;
             svga->hblank_end_mask = 0x0000003f;
         }
-        svga->hblank_end_val = ((svga->crtc[3] >> 5) & 3);
+        svga->hblank_end_val = svga->htotal - 1 /* + ((svga->crtc[3] >> 5) & 3)*/;
 
         /* In this mode, the dots per clock are always 8 or 16, never 9 or 18. */
         if (!svga->scrblank && svga->attr_palette_enable)
@@ -579,12 +614,12 @@ banshee_recalctimings(svga_t *svga)
         svga->linedbl     = 0;
      } else {
         if (banshee->vgaInit0 & 0x40) {
-            svga->hblankstart     = (((svga->crtc[0x1a] & 0x10) >> 4) << 8) + svga->crtc[2] + 1;
+            svga->hblankstart     = (((svga->crtc[0x1a] & 0x10) >> 4) << 8) + svga->crtc[2];
             svga->hblank_end_val  = (svga->crtc[3] & 0x1f) | (((svga->crtc[5] & 0x80) >> 7) << 5) |
                                     (((svga->crtc[0x1a] & 0x20) >> 5) << 6);
             svga->hblank_end_mask = 0x0000007f;
         } else {
-            svga->hblankstart     =  svga->crtc[2] + 1;
+            svga->hblankstart     =  svga->crtc[2];
             svga->hblank_end_val  =  (svga->crtc[3] & 0x1f) | (((svga->crtc[5] & 0x80) >> 7) << 5);
             svga->hblank_end_mask =  0x0000003f;
         }
@@ -641,7 +676,7 @@ banshee_recalctimings(svga_t *svga)
             svga->rowoffset = ((banshee->vidDesktopOverlayStride & 0x3fff) * 128) >> 3;
         else
             svga->rowoffset = (banshee->vidDesktopOverlayStride & 0x3fff) >> 3;
-        svga->ma_latch                = banshee->vidDesktopStartAddr >> 2;
+        svga->memaddr_latch                = banshee->vidDesktopStartAddr >> 2;
         banshee->desktop_stride_tiled = (banshee->vidDesktopOverlayStride & 0x3fff) * 128 * 32;
 #if 0
         banshee_log("Extended shift out %i rowoffset=%i %02x\n", VIDPROCCFG_DESKTOP_PIX_FORMAT, svga->rowoffset, svga->crtc[1]);
@@ -652,9 +687,6 @@ banshee_recalctimings(svga_t *svga)
 
         if (banshee->vidProcCfg & VIDPROCCFG_2X_MODE) {
             svga->hdisp *= 2;
-            // svga->htotal *= 2;
-            // svga->hblankstart *= 2;
-            // svga->hblank_end_val *= 2;
             svga->dots_per_clock *= 2;
         }
 
@@ -844,6 +876,9 @@ banshee_ext_outl(uint16_t addr, uint32_t val, void *priv)
             svga->write_bank    = (val & 0x3ff) << 15;
             svga->read_bank     = ((val >> 10) & 0x3ff) << 15;
             svga->packed_chain4 = !!(val & 0x00100000);
+            svga->fast          = (svga->gdcreg[8] == 0xff && !(svga->gdcreg[3] & 0x18) && !svga->gdcreg[1]) &&
+                                  ((svga->chain4 && (svga->packed_chain4 || svga->force_old_addr)) || svga->fb_only) &&
+                                  !(svga->adv_flags & FLAG_ADDR_BY8);;
             break;
 
         case PLL_pllCtrl0:
@@ -927,6 +962,14 @@ banshee_ext_outl(uint16_t addr, uint32_t val, void *priv)
             i2c_gpio_set(banshee->i2c, !!(val & VIDSERIAL_I2C_SCK_W), !!(val & VIDSERIAL_I2C_SDA_W));
             break;
 
+        case Video_vidChromaKeyMin:
+            banshee->vidChromaKeyMin = val;
+            break;
+
+        case Video_vidChromaKeyMax:
+            banshee->vidChromaKeyMax = val;
+            break;
+
         case Video_vidScreenSize:
             banshee->vidScreenSize = val;
             voodoo->h_disp         = (val & 0xfff) + 1;
@@ -1071,7 +1114,9 @@ banshee_ext_in(uint16_t addr, void *priv)
             break;
     }
 
-    //        banshee_log("banshee_ext_in: addr=%04x val=%02x\n", addr, ret);
+#if 0
+    banshee_log("banshee_ext_in: addr=%04x val=%02x\n", addr, ret);
+#endif
 
     return ret;
 }
@@ -1084,7 +1129,7 @@ banshee_status(banshee_t *banshee)
     int           fifo_entries = FIFO_ENTRIES;
     int           swap_count   = voodoo->swap_count;
     int           written      = voodoo->cmd_written + voodoo->cmd_written_fifo;
-    int           busy         = (written - voodoo->cmd_read) || (voodoo->cmdfifo_depth_rd != voodoo->cmdfifo_depth_wr) || voodoo->render_voodoo_busy[0] || voodoo->render_voodoo_busy[1] || voodoo->render_voodoo_busy[2] || voodoo->render_voodoo_busy[3] || voodoo->voodoo_busy;
+    int           busy         = (written - voodoo->cmd_read) || (voodoo->cmdfifo_depth_rd != voodoo->cmdfifo_depth_wr) || (voodoo->cmdfifo_depth_rd_2 != voodoo->cmdfifo_depth_wr_2) || voodoo->render_voodoo_busy[0] || voodoo->render_voodoo_busy[1] || voodoo->render_voodoo_busy[2] || voodoo->render_voodoo_busy[3] || voodoo->voodoo_busy;
     uint32_t      ret          = 0;
 
     if (fifo_entries < 0x20)
@@ -1106,6 +1151,9 @@ banshee_status(banshee_t *banshee)
     if (voodoo->cmdfifo_depth_rd != voodoo->cmdfifo_depth_wr)
         ret |= (1 << 11);
 
+    if (voodoo->cmdfifo_depth_rd_2 != voodoo->cmdfifo_depth_wr_2)
+        ret |= (1 << 12);
+
     if (!voodoo->voodoo_busy)
         voodoo_wake_fifo_thread(voodoo);
 
@@ -1229,6 +1277,12 @@ banshee_ext_inl(uint16_t addr, void *priv)
 #endif
             break;
 
+        case Video_vidChromaKeyMin:
+            ret = banshee->vidChromaKeyMin;
+            break;
+        case Video_vidChromaKeyMax:
+            ret = banshee->vidChromaKeyMax;
+            break;
         case Video_vidScreenSize:
             ret = banshee->vidScreenSize;
             break;
@@ -1259,7 +1313,9 @@ banshee_ext_inl(uint16_t addr, void *priv)
             break;
 
         default:
-            //                fatal("bad banshee_ext_inl: addr=%04x\n", addr);
+#if 0
+            fatal("bad banshee_ext_inl: addr=%04x\n", addr);
+#endif
             break;
     }
 
@@ -1320,17 +1376,23 @@ banshee_cmd_read(banshee_t *banshee, uint32_t addr)
 
         case cmdBaseAddr0:
             ret = voodoo->cmdfifo_base >> 12;
-            //                banshee_log("Read cmdfifo_base %08x\n", ret);
+#if 0
+            banshee_log("Read cmdfifo_base %08x\n", ret);
+#endif
             break;
 
         case cmdRdPtrL0:
             ret = voodoo->cmdfifo_rp;
-            //                banshee_log("Read cmdfifo_rp %08x\n", ret);
+#if 0
+            banshee_log("Read cmdfifo_rp %08x\n", ret);
+#endif
             break;
 
         case cmdFifoDepth0:
             ret = voodoo->cmdfifo_depth_wr - voodoo->cmdfifo_depth_rd;
-            //                banshee_log("Read cmdfifo_depth %08x\n", ret);
+#if 0
+            banshee_log("Read cmdfifo_depth %08x\n", ret);
+#endif
             break;
 
         case cmdStatus0:
@@ -1339,6 +1401,43 @@ banshee_cmd_read(banshee_t *banshee, uint32_t addr)
 
         case cmdBaseSize0:
             ret = voodoo->cmdfifo_size;
+            if (voodoo->cmdfifo_enabled)
+                ret |= 0x100;
+            if (voodoo->cmdfifo_in_agp)
+                ret |= 0x200;
+            break;
+
+        case cmdBaseAddr1:
+            ret = voodoo->cmdfifo_base_2 >> 12;
+#if 0
+            banshee_log("Read cmdfifo_base %08x\n", ret);
+#endif
+            break;
+
+        case cmdRdPtrL1:
+            ret = voodoo->cmdfifo_rp_2;
+#if 0
+            banshee_log("Read cmdfifo_rp %08x\n", ret);
+#endif
+            break;
+
+        case cmdFifoDepth1:
+            ret = voodoo->cmdfifo_depth_wr_2 - voodoo->cmdfifo_depth_rd_2;
+#if 0
+            banshee_log("Read cmdfifo_depth %08x\n", ret);
+#endif
+            break;
+
+        case cmdStatus1:
+            ret = voodoo->cmd_status_2;
+            break;
+
+        case cmdBaseSize1:
+            ret = voodoo->cmdfifo_size_2;
+            if (voodoo->cmdfifo_enabled_2)
+                ret |= 0x100;
+            if (voodoo->cmdfifo_in_agp_2)
+                ret |= 0x200;
             break;
 
         case 0x108:
@@ -1558,10 +1657,11 @@ banshee_reg_writew(uint32_t addr, uint16_t val, void *priv)
     }
 }
 
-static void
-banshee_cmd_write(banshee_t *banshee, uint32_t addr, uint32_t val)
+void
+banshee_cmd_write(void *priv, uint32_t addr, uint32_t val)
 {
-    voodoo_t *voodoo = banshee->voodoo;
+    banshee_t *banshee = (banshee_t *) priv;
+    voodoo_t *voodoo   = banshee->voodoo;
 #if 0
     banshee_log("banshee_cmd_write: addr=%03x val=%08x\n", addr & 0x1fc, val);
 #endif
@@ -1586,6 +1686,62 @@ banshee_cmd_write(banshee_t *banshee, uint32_t addr, uint32_t val)
             banshee->agpReqSize = val;
             break;
 
+        case Agp_agpMoveCMD: {
+            uint32_t src_addr = banshee->agpHostAddressLow;
+            uint32_t src_width = banshee->agpHostAddressHigh & 0x3fff;
+            uint32_t src_stride = (banshee->agpHostAddressHigh >> 14) & 0x3fff;
+            uint32_t src_end = src_addr + (banshee->agpReqSize & 0xfffff); /* don't know whether or not stride is accounted for! */
+            uint32_t dest_addr = banshee->agpGraphicsAddress & 0x3ffffff;
+            uint32_t dest_stride = banshee->agpGraphicsStride & 0x7fff;
+#if 0
+            banshee_log("AGP: %d bytes W%d from %08x S%d to %d:%08x S%d\n", src_end - src_addr, src_width, src_addr, src_stride, (val >> 3) & 3, dest_addr, dest_stride);
+#endif
+            switch ((val >> 3) & 3) {
+                case 0: /*Linear framebuffer (Banshee)*/
+                case 1: /*Planar YUV*/
+                    if (voodoo->texture_present[0][(dest_addr & voodoo->texture_mask) >> TEX_DIRTY_SHIFT]) {
+#if 0
+                        banshee_log("texture_present at %08x %i\n", dest_addr, (dest_addr & voodoo->texture_mask) >> TEX_DIRTY_SHIFT);
+#endif
+                        flush_texture_cache(voodoo, dest_addr & voodoo->texture_mask, 0);
+                    }
+                    if (voodoo->texture_present[1][(dest_addr & voodoo->texture_mask) >> TEX_DIRTY_SHIFT]) {
+#if 0
+                        banshee_log("texture_present at %08x %i\n", dest_addr, (dest_addr & voodoo->texture_mask) >> TEX_DIRTY_SHIFT);
+#endif
+                        flush_texture_cache(voodoo, dest_addr & voodoo->texture_mask, 1);
+                    }
+                    while ((src_addr < src_end) && (dest_addr <= voodoo->fb_mask)) {
+                        dma_bm_read(src_addr, &voodoo->fb_mem[dest_addr], MIN(src_width, voodoo->fb_mask - dest_addr), 4);
+                        src_addr += src_stride;
+                        dest_addr += dest_stride;
+                    }
+                    break;
+                case 2: /*Framebuffer*/
+                    src_width &= ~3;
+                    while (src_addr < src_end) {
+                        for (uint32_t i = 0; i < src_width; i += 4)
+                            voodoo_fb_writel(dest_addr + i, mem_readl_phys(src_addr + i), voodoo);
+                        src_addr += src_stride;
+                        dest_addr += dest_stride;
+                    }
+                    break;
+                case 3: /*Texture*/
+                    src_width &= ~3;
+                    while (src_addr < src_end) {
+                        for (uint32_t i = 0; i < src_width; i += 4)
+                            voodoo_tex_writel(dest_addr + i, mem_readl_phys(src_addr + i), voodoo);
+                        src_addr += src_stride;
+                        dest_addr += dest_stride;
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+            break;
+        }
+
         case cmdBaseAddr0:
             voodoo->cmdfifo_base = (val & 0xfff) << 12;
             voodoo->cmdfifo_end  = voodoo->cmdfifo_base + (((voodoo->cmdfifo_size & 0xff) + 1) << 12);
@@ -1600,6 +1756,7 @@ banshee_cmd_write(banshee_t *banshee, uint32_t addr, uint32_t val)
             voodoo->cmdfifo_enabled = val & 0x100;
             if (!voodoo->cmdfifo_enabled)
                 voodoo->cmdfifo_in_sub = 0; /*Not sure exactly when this should be reset*/
+            voodoo->cmdfifo_in_agp = val & 0x200;
 #if 0
             banshee_log("cmdfifo_base=%08x  cmdfifo_end=%08x\n", voodoo->cmdfifo_base, voodoo->cmdfifo_end);
 #endif
@@ -1625,6 +1782,46 @@ banshee_cmd_write(banshee_t *banshee, uint32_t addr, uint32_t val)
             voodoo->cmdfifo_depth_wr = val & 0xffff;
             break;
 
+        case cmdBaseAddr1:
+            voodoo->cmdfifo_base_2 = (val & 0xfff) << 12;
+            voodoo->cmdfifo_end_2  = voodoo->cmdfifo_base_2 + (((voodoo->cmdfifo_size_2 & 0xff) + 1) << 12);
+#if 0
+            banshee_log("cmdfifo_base=%08x  cmdfifo_end=%08x %08x\n", voodoo->cmdfifo_base, voodoo->cmdfifo_end, val);
+#endif
+            break;
+
+        case cmdBaseSize1:
+            voodoo->cmdfifo_size_2    = val;
+            voodoo->cmdfifo_end_2     = voodoo->cmdfifo_base_2 + (((voodoo->cmdfifo_size_2 & 0xff) + 1) << 12);
+            voodoo->cmdfifo_enabled_2 = val & 0x100;
+            if (!voodoo->cmdfifo_enabled_2)
+                voodoo->cmdfifo_in_sub_2 = 0; /*Not sure exactly when this should be reset*/
+            voodoo->cmdfifo_in_agp_2 = val & 0x200;
+#if 0
+            banshee_log("cmdfifo_base=%08x  cmdfifo_end=%08x\n", voodoo->cmdfifo_base, voodoo->cmdfifo_end);
+#endif
+            break;
+
+#if 0
+            voodoo->cmdfifo_end = ((val >> 16) & 0x3ff) << 12;
+            banshee_log("CMDFIFO base=%08x end=%08x\n", voodoo->cmdfifo_base, voodoo->cmdfifo_end);
+            break;
+#endif
+
+        case cmdRdPtrL1:
+            voodoo->cmdfifo_rp_2 = val;
+            break;
+        case cmdAMin1:
+            voodoo->cmdfifo_amin_2 = val;
+            break;
+        case cmdAMax1:
+            voodoo->cmdfifo_amax_2 = val;
+            break;
+        case cmdFifoDepth1:
+            voodoo->cmdfifo_depth_rd_2 = 0;
+            voodoo->cmdfifo_depth_wr_2 = val & 0xffff;
+            break;
+
         default:
             banshee_log("Unknown banshee_cmd_write: addr=%08x val=%08x reg=0x%03x\n", addr, val, addr & 0x1fc);
             break;
@@ -2064,6 +2261,60 @@ banshee_write_linear_l(uint32_t addr, uint32_t val, void *priv)
             voodoo->cmdfifo_holecount = ((voodoo->cmdfifo_amax - voodoo->cmdfifo_amin) >> 2) - 1;
 #if 0
             banshee_log("CMDFIFO out of order: amin=%08x amax=%08x holecount=%i\n", voodoo->cmdfifo_amin, voodoo->cmdfifo_amax, voodoo->cmdfifo_holecount);
+#endif
+        }
+    }
+
+    if (voodoo->cmdfifo_enabled_2 && addr >= voodoo->cmdfifo_base_2 && addr < voodoo->cmdfifo_end_2) {
+#if 0
+        banshee_log("CMDFIFO write %08x %08x  old amin=%08x amax=%08x hlcnt=%i depth_wr=%i rp=%08x\n", addr, val, voodoo->cmdfifo_amin, voodoo->cmdfifo_amax, voodoo->cmdfifo_holecount, voodoo->cmdfifo_depth_wr, voodoo->cmdfifo_rp);
+#endif
+        if (addr == voodoo->cmdfifo_base_2 && !voodoo->cmdfifo_holecount_2) {
+#if 0
+            if (voodoo->cmdfifo_holecount)
+                fatal("CMDFIFO reset pointers while outstanding holes\n");
+#endif
+            /*Reset pointers*/
+            voodoo->cmdfifo_amin_2 = voodoo->cmdfifo_base_2;
+            voodoo->cmdfifo_amax_2 = voodoo->cmdfifo_base_2;
+            voodoo->cmdfifo_depth_wr_2++;
+            voodoo_wake_fifo_thread(voodoo);
+        } else if (voodoo->cmdfifo_holecount_2) {
+#if 0
+            if ((addr <= voodoo->cmdfifo_amin && voodoo->cmdfifo_amin != -4) || addr >= voodoo->cmdfifo_amax)
+                fatal("CMDFIFO holecount write outside of amin/amax - amin=%08x amax=%08x holecount=%i\n", voodoo->cmdfifo_amin, voodoo->cmdfifo_amax, voodoo->cmdfifo_holecount);
+            banshee_log("holecount %i\n", voodoo->cmdfifo_holecount);
+#endif
+            voodoo->cmdfifo_holecount_2--;
+            if (!voodoo->cmdfifo_holecount_2) {
+                /*Filled in holes, resume normal operation*/
+                voodoo->cmdfifo_depth_wr_2 += ((voodoo->cmdfifo_amax_2 - voodoo->cmdfifo_amin_2) >> 2);
+                voodoo->cmdfifo_amin_2 = voodoo->cmdfifo_amax_2;
+                voodoo_wake_fifo_thread(voodoo);
+#if 0
+                banshee_log("hole filled! amin=%08x amax=%08x added %i words\n", voodoo->cmdfifo_amin, voodoo->cmdfifo_amax, words_to_add);
+#endif
+            }
+        } else if (addr == voodoo->cmdfifo_amax_2 + 4) {
+            /*In-order write*/
+            voodoo->cmdfifo_amin_2 = addr;
+            voodoo->cmdfifo_amax_2 = addr;
+            voodoo->cmdfifo_depth_wr_2++;
+            voodoo_wake_fifo_thread(voodoo);
+        } else {
+            /*Out-of-order write*/
+            if (addr < voodoo->cmdfifo_amin_2) {
+                /*Reset back to start. Note that write is still out of order!*/
+                voodoo->cmdfifo_amin_2 = voodoo->cmdfifo_base_2 - 4;
+            }
+#if 0
+            else if (addr < voodoo->cmdfifo_amax)
+                fatal("Out-of-order write really out of order\n");
+#endif
+            voodoo->cmdfifo_amax_2      = addr;
+            voodoo->cmdfifo_holecount_2 = ((voodoo->cmdfifo_amax_2 - voodoo->cmdfifo_amin_2) >> 2) - 1;
+#if 0
+            banshee_log("CMDFIFO out of order: amin=%08x amax=%08x holecount=%i\n", voodoo->cmdfifo_amin, voodoo->cmdfifo_amax, voodoo->cmdfifo_holecount);
 #endif
         }
     }
@@ -2109,10 +2360,12 @@ banshee_hwcursor_draw(svga_t *svga, int displine)
         for (x = 0; x < 64; x += 8) {
             if (x_off > -8) {
                 for (xx = 0; xx < 8; xx++) {
-                    if (!(plane0[x >> 3] & (1 << 7)))
-                        (svga->monitor->target_buffer->line[displine])[x_off + xx + svga->x_add] = (plane1[x >> 3] & (1 << 7)) ? col1 : col0;
-                    else if (plane1[x >> 3] & (1 << 7))
-                        (svga->monitor->target_buffer->line[displine])[x_off + xx + svga->x_add] ^= 0xffffff;
+                    if (((x_off + xx + svga->x_add) >= 0) && ((x_off + xx + svga->x_add) <= 2047)) {
+                        if (!(plane0[x >> 3] & (1 << 7)))
+                            (svga->monitor->target_buffer->line[displine])[x_off + xx + svga->x_add] = (plane1[x >> 3] & (1 << 7)) ? col1 : col0;
+                        else if (plane1[x >> 3] & (1 << 7))
+                            (svga->monitor->target_buffer->line[displine])[x_off + xx + svga->x_add] ^= 0xffffff;
+                    }
 
                     plane0[x >> 3] <<= 1;
                     plane1[x >> 3] <<= 1;
@@ -2411,12 +2664,97 @@ voodoo_generate_vb_filters(voodoo_t *voodoo, int fcr, int fcg)
     }
 }
 
+/* 1 = render overlay, 0 = render desktop */
+static bool
+banshee_chroma_key(banshee_t* banshee, uint32_t x, uint32_t y)
+{
+    uint32_t src_addr_desktop = banshee->desktop_addr + y * (banshee->vidDesktopOverlayStride & 0x3fff);
+    bool res = true;
+    uint8_t chromaKeyMaxIndex = banshee->vidChromaKeyMax & 0xff;
+    uint8_t chromaKeyMinIndex = banshee->vidChromaKeyMin & 0xff;
+    uint32_t desktop_pixel = 0;
+    uint8_t desktop_r = 0;
+    uint8_t desktop_g = 0;
+    uint8_t desktop_b = 0;
+    uint32_t prev_desktop_y = banshee->desktop_y - 1;
+
+    if (!banshee->chroma_key_enabled)
+        return true;
+
+    if (y > 2048)
+        return true;
+
+    if (!(banshee->vidProcCfg & (1 << 5))) {
+        return true;
+    }
+
+    switch (VIDPROCCFG_DESKTOP_PIX_FORMAT) {
+        case PIX_FORMAT_8:
+        {
+            desktop_pixel = banshee->svga.vram[src_addr_desktop + x];
+            res = (desktop_pixel & 0xFF) >= chromaKeyMinIndex && (desktop_pixel & 0xFF) <= chromaKeyMaxIndex;
+            break;
+        }
+        case PIX_FORMAT_RGB565:
+        {
+            if (banshee->vidProcCfg & VIDPROCCFG_DESKTOP_TILE) {
+                uint32_t addr = 0;
+                if (prev_desktop_y & 0x80000000)
+                    return false;
+                if (banshee->vidProcCfg & VIDPROCCFG_HALF_MODE)
+                    addr = banshee->desktop_addr + ((prev_desktop_y >> 1) & 31) * 128 + ((prev_desktop_y >> 6) * banshee->desktop_stride_tiled);
+                else
+                    addr = banshee->desktop_addr + (prev_desktop_y & 31) * 128 + ((prev_desktop_y >> 5) * banshee->desktop_stride_tiled);
+
+                addr += 128 * 32 * (x >> 6);
+                addr += (x & 63) * 2;
+                desktop_pixel = *(uint16_t*)&banshee->svga.vram[addr & banshee->svga.vram_mask];
+            } else {
+                desktop_pixel = *(uint16_t*)&banshee->svga.vram[(src_addr_desktop + x * 2) & banshee->svga.vram_mask];
+            }
+
+            desktop_r = (desktop_pixel & 0x1f);
+            desktop_g = (desktop_pixel & 0x7e0) >> 5;
+            desktop_b = (desktop_pixel & 0xf800) >> 11;
+
+            res = (desktop_r >= ((banshee->vidChromaKeyMin >> 11) & 0x1F) && desktop_r <= ((banshee->vidChromaKeyMax >> 11) & 0x1F)) &&
+                (desktop_g >= ((banshee->vidChromaKeyMin >> 5) & 0x3F) && desktop_g <= ((banshee->vidChromaKeyMax >> 5) & 0x3F)) &&
+                (desktop_b >= ((banshee->vidChromaKeyMin) & 0x1F) && desktop_b <= ((banshee->vidChromaKeyMax) & 0x1F));
+            break;
+        }
+        case PIX_FORMAT_RGB24:
+        {
+            desktop_r = banshee->svga.vram[(src_addr_desktop + x * 3) & banshee->svga.vram_mask];
+            desktop_g = banshee->svga.vram[(src_addr_desktop + x * 3 + 1) & banshee->svga.vram_mask];
+            desktop_b = banshee->svga.vram[(src_addr_desktop + x * 3 + 2) & banshee->svga.vram_mask];
+            res = (desktop_r >= ((banshee->vidChromaKeyMin >> 16) & 0xFF) && desktop_r <= ((banshee->vidChromaKeyMax >> 16) & 0xFF)) &&
+                (desktop_g >= ((banshee->vidChromaKeyMin >> 8) & 0xFF) && desktop_g <= ((banshee->vidChromaKeyMax >> 8) & 0xFF)) &&
+                (desktop_b >= ((banshee->vidChromaKeyMin) & 0xFF) && desktop_b <= ((banshee->vidChromaKeyMax) & 0xFF));
+            break;
+        }
+        case PIX_FORMAT_RGB32:
+        {
+            desktop_r = banshee->svga.vram[(src_addr_desktop + x * 4) & banshee->svga.vram_mask];
+            desktop_g = banshee->svga.vram[(src_addr_desktop + x * 4 + 1) & banshee->svga.vram_mask];
+            desktop_b = banshee->svga.vram[(src_addr_desktop + x * 4 + 2) & banshee->svga.vram_mask];
+            res = (desktop_r >= ((banshee->vidChromaKeyMin >> 16) & 0xFF) && desktop_r <= ((banshee->vidChromaKeyMax >> 16) & 0xFF)) &&
+                (desktop_g >= ((banshee->vidChromaKeyMin >> 8) & 0xFF) && desktop_g <= ((banshee->vidChromaKeyMax >> 8) & 0xFF)) &&
+                (desktop_b >= ((banshee->vidChromaKeyMin) & 0xFF) && desktop_b <= ((banshee->vidChromaKeyMax) & 0xFF));
+            break;
+        }
+    }
+
+    res ^= !!(banshee->vidProcCfg & (1 << 6));
+    return res;
+}
+
 static void
 banshee_overlay_draw(svga_t *svga, int displine)
 {
     banshee_t      *banshee = (banshee_t *) svga->priv;
     voodoo_t       *voodoo  = banshee->voodoo;
     uint32_t       *p;
+    bool            chroma_test_passed = true;
     int             x;
     int             y         = voodoo->overlay.src_y >> 20;
     uint32_t        src_addr  = svga->overlay_latch.addr + ((banshee->vidProcCfg & VIDPROCCFG_OVERLAY_TILE) ? ((y & 31) * 128 + (y >> 5) * svga->overlay_latch.pitch) : y * svga->overlay_latch.pitch);
@@ -2432,6 +2770,8 @@ banshee_overlay_draw(svga_t *svga, int displine)
         return;
     }
 
+    chroma_test_passed = banshee_chroma_key(banshee, svga->overlay_latch.x, displine - svga->y_add);
+
     if ((voodoo->overlay.src_y >> 20) < 2048)
         voodoo->dirty_line[voodoo->overlay.src_y >> 20] = 0;
 #if 0
@@ -2448,7 +2788,8 @@ banshee_overlay_draw(svga_t *svga, int displine)
 
     if (skip_filtering) {
         /*No scaling or filtering required, just write straight to output buffer*/
-        OVERLAY_SAMPLE(p);
+        if (chroma_test_passed)
+            OVERLAY_SAMPLE(p);
     } else {
         OVERLAY_SAMPLE(banshee->overlay_buffer[0]);
 
@@ -2465,25 +2806,31 @@ banshee_overlay_draw(svga_t *svga, int displine)
                             ((0x10000 - x_coeff) * y_coeff) >> 16,
                             (x_coeff * y_coeff) >> 16
                         };
-                        uint32_t samp0 = banshee->overlay_buffer[0][src_x >> 20];
-                        uint32_t samp1 = banshee->overlay_buffer[0][(src_x >> 20) + 1];
-                        uint32_t samp2 = banshee->overlay_buffer[1][src_x >> 20];
-                        uint32_t samp3 = banshee->overlay_buffer[1][(src_x >> 20) + 1];
-                        int      r     = (((samp0 >> 16) & 0xff) * coeffs[0] + ((samp1 >> 16) & 0xff) * coeffs[1] + ((samp2 >> 16) & 0xff) * coeffs[2] + ((samp3 >> 16) & 0xff) * coeffs[3]) >> 16;
-                        int      g     = (((samp0 >> 8) & 0xff) * coeffs[0] + ((samp1 >> 8) & 0xff) * coeffs[1] + ((samp2 >> 8) & 0xff) * coeffs[2] + ((samp3 >> 8) & 0xff) * coeffs[3]) >> 16;
-                        int      b     = ((samp0 & 0xff) * coeffs[0] + (samp1 & 0xff) * coeffs[1] + (samp2 & 0xff) * coeffs[2] + (samp3 & 0xff) * coeffs[3]) >> 16;
-                        p[x]           = (r << 16) | (g << 8) | b;
+                        uint32_t samp0     = banshee->overlay_buffer[0][src_x >> 20];
+                        uint32_t samp1     = banshee->overlay_buffer[0][(src_x >> 20) + 1];
+                        uint32_t samp2     = banshee->overlay_buffer[1][src_x >> 20];
+                        uint32_t samp3     = banshee->overlay_buffer[1][(src_x >> 20) + 1];
+                        int      r         = (((samp0 >> 16) & 0xff) * coeffs[0] + ((samp1 >> 16) & 0xff) * coeffs[1] + ((samp2 >> 16) & 0xff) * coeffs[2] + ((samp3 >> 16) & 0xff) * coeffs[3]) >> 16;
+                        int      g         = (((samp0 >> 8) & 0xff) * coeffs[0] + ((samp1 >> 8) & 0xff) * coeffs[1] + ((samp2 >> 8) & 0xff) * coeffs[2] + ((samp3 >> 8) & 0xff) * coeffs[3]) >> 16;
+                        int      b         = ((samp0 & 0xff) * coeffs[0] + (samp1 & 0xff) * coeffs[1] + (samp2 & 0xff) * coeffs[2] + (samp3 & 0xff) * coeffs[3]) >> 16;
+                        chroma_test_passed = banshee_chroma_key(banshee, svga->overlay_latch.x + x, displine - svga->y_add);
+
+                        if (chroma_test_passed)
+                            p[x] = (r << 16) | (g << 8) | b;
 
                         src_x += voodoo->overlay.vidOverlayDudx;
                     }
                 } else {
                     for (x = 0; x < svga->overlay_latch.cur_xsize; x++) {
-                        uint32_t samp0 = banshee->overlay_buffer[0][src_x >> 20];
-                        uint32_t samp1 = banshee->overlay_buffer[1][src_x >> 20];
-                        int      r     = (((samp0 >> 16) & 0xff) * (0x10000 - y_coeff) + ((samp1 >> 16) & 0xff) * y_coeff) >> 16;
-                        int      g     = (((samp0 >> 8) & 0xff) * (0x10000 - y_coeff) + ((samp1 >> 8) & 0xff) * y_coeff) >> 16;
-                        int      b     = ((samp0 & 0xff) * (0x10000 - y_coeff) + (samp1 & 0xff) * y_coeff) >> 16;
-                        p[x]           = (r << 16) | (g << 8) | b;
+                        uint32_t samp0     = banshee->overlay_buffer[0][src_x >> 20];
+                        uint32_t samp1     = banshee->overlay_buffer[1][src_x >> 20];
+                        int      r         = (((samp0 >> 16) & 0xff) * (0x10000 - y_coeff) + ((samp1 >> 16) & 0xff) * y_coeff) >> 16;
+                        int      g         = (((samp0 >> 8) & 0xff) * (0x10000 - y_coeff) + ((samp1 >> 8) & 0xff) * y_coeff) >> 16;
+                        int      b         = ((samp0 & 0xff) * (0x10000 - y_coeff) + (samp1 & 0xff) * y_coeff) >> 16;
+                        chroma_test_passed = banshee_chroma_key(banshee, svga->overlay_latch.x + x, displine - svga->y_add);
+
+                        if (chroma_test_passed)
+                            p[x] = (r << 16) | (g << 8) | b;
                     }
                 }
                 break;
@@ -2538,21 +2885,30 @@ banshee_overlay_draw(svga_t *svga, int displine)
                         fil3[x * 3 + 2] = vb_filter_v1_rb[fil[x * 3 + 2]][fil[(x - 1) * 3 + 2]];
                     }
                     for (x = 0; x < svga->overlay_latch.cur_xsize; x++) {
-                        fil[x * 3]     = vb_filter_v1_rb[fil[x * 3]][fil3[(x + 1) * 3]];
-                        fil[x * 3 + 1] = vb_filter_v1_g[fil[x * 3 + 1]][fil3[(x + 1) * 3 + 1]];
-                        fil[x * 3 + 2] = vb_filter_v1_rb[fil[x * 3 + 2]][fil3[(x + 1) * 3 + 2]];
-                        p[x]            = (fil[x * 3 + 2] << 16) | (fil[x * 3 + 1] << 8) | fil[x * 3];
+                        fil[x * 3]         = vb_filter_v1_rb[fil[x * 3]][fil3[(x + 1) * 3]];
+                        fil[x * 3 + 1]     = vb_filter_v1_g[fil[x * 3 + 1]][fil3[(x + 1) * 3 + 1]];
+                        fil[x * 3 + 2]     = vb_filter_v1_rb[fil[x * 3 + 2]][fil3[(x + 1) * 3 + 2]];
+                        chroma_test_passed = banshee_chroma_key(banshee, svga->overlay_latch.x + x, displine - svga->y_add);
+
+                        if (chroma_test_passed)
+                            p[x] = (fil[x * 3 + 2] << 16) | (fil[x * 3 + 1] << 8) | fil[x * 3];
                     }
                 } else /* filter disabled by emulator option */
                 {
                     if (banshee->vidProcCfg & VIDPROCCFG_H_SCALE_ENABLE) {
                         for (x = 0; x < svga->overlay_latch.cur_xsize; x++) {
-                            p[x] = banshee->overlay_buffer[0][src_x >> 20];
+                            chroma_test_passed = banshee_chroma_key(banshee, svga->overlay_latch.x + x, displine - svga->y_add);
+                            if (chroma_test_passed)
+                                p[x] = banshee->overlay_buffer[0][src_x >> 20];
+
                             src_x += voodoo->overlay.vidOverlayDudx;
                         }
                     } else {
-                        for (x = 0; x < svga->overlay_latch.cur_xsize; x++)
-                            p[x] = banshee->overlay_buffer[0][x];
+                        for (x = 0; x < svga->overlay_latch.cur_xsize; x++) {
+                            chroma_test_passed = banshee_chroma_key(banshee, svga->overlay_latch.x + x, displine - svga->y_add);
+                            if (chroma_test_passed)
+                                p[x] = banshee->overlay_buffer[0][x];
+                        }
                     }
                 }
                 break;
@@ -2607,25 +2963,35 @@ banshee_overlay_draw(svga_t *svga, int displine)
                     if (banshee->vidProcCfg & VIDPROCCFG_H_SCALE_ENABLE) /* 2x2 on a scaled low res */
                     {
                         for (x = 0; x < svga->overlay_latch.cur_xsize; x++) {
-                            p[x] = (fil[(src_x >> 20) * 3 + 2] << 16) | (fil[(src_x >> 20) * 3 + 1] << 8) | fil[(src_x >> 20) * 3];
+                            chroma_test_passed = banshee_chroma_key(banshee, svga->overlay_latch.x + x, displine - svga->y_add);
+                            if (chroma_test_passed)
+                                p[x] = (fil[(src_x >> 20) * 3 + 2] << 16) | (fil[(src_x >> 20) * 3 + 1] << 8) | fil[(src_x >> 20) * 3];
+
                             src_x += voodoo->overlay.vidOverlayDudx;
                         }
                     } else {
                         for (x = 0; x < svga->overlay_latch.cur_xsize; x++) {
-                            p[x] = (fil[x * 3 + 2] << 16) | (fil[x * 3 + 1] << 8) | fil[x * 3];
+                            chroma_test_passed = banshee_chroma_key(banshee, svga->overlay_latch.x + x, displine - svga->y_add);
+                            if (chroma_test_passed)
+                                p[x] = (fil[x * 3 + 2] << 16) | (fil[x * 3 + 1] << 8) | fil[x * 3];
                         }
                     }
                 } else /* filter disabled by emulator option */
                 {
                     if (banshee->vidProcCfg & VIDPROCCFG_H_SCALE_ENABLE) {
                         for (x = 0; x < svga->overlay_latch.cur_xsize; x++) {
-                            p[x] = banshee->overlay_buffer[0][src_x >> 20];
+                            chroma_test_passed = banshee_chroma_key(banshee, svga->overlay_latch.x + x, displine - svga->y_add);
+                            if (chroma_test_passed)
+                                p[x] = banshee->overlay_buffer[0][src_x >> 20];
 
                             src_x += voodoo->overlay.vidOverlayDudx;
                         }
                     } else {
-                        for (x = 0; x < svga->overlay_latch.cur_xsize; x++)
-                            p[x] = banshee->overlay_buffer[0][x];
+                        for (x = 0; x < svga->overlay_latch.cur_xsize; x++) {
+                            chroma_test_passed = banshee_chroma_key(banshee, svga->overlay_latch.x + x, displine - svga->y_add);
+                            if (chroma_test_passed)
+                                p[x] = banshee->overlay_buffer[0][x];
+                        }
                     }
                 }
                 break;
@@ -2634,13 +3000,18 @@ banshee_overlay_draw(svga_t *svga, int displine)
             default:
                 if (banshee->vidProcCfg & VIDPROCCFG_H_SCALE_ENABLE) {
                     for (x = 0; x < svga->overlay_latch.cur_xsize; x++) {
-                        p[x] = banshee->overlay_buffer[0][src_x >> 20];
+                        chroma_test_passed = banshee_chroma_key(banshee, svga->overlay_latch.x + x, displine - svga->y_add);
+                        if (chroma_test_passed)
+                            p[x] = banshee->overlay_buffer[0][src_x >> 20];
 
                         src_x += voodoo->overlay.vidOverlayDudx;
                     }
                 } else {
-                    for (x = 0; x < svga->overlay_latch.cur_xsize; x++)
-                        p[x] = banshee->overlay_buffer[0][x];
+                    for (x = 0; x < svga->overlay_latch.cur_xsize; x++) {
+                        chroma_test_passed = banshee_chroma_key(banshee, svga->overlay_latch.x + x, displine - svga->y_add);
+                        if (chroma_test_passed)
+                            p[x] = banshee->overlay_buffer[0][x];
+                    }
                 }
                 break;
         }
@@ -2701,7 +3072,9 @@ banshee_pci_read(int func, int addr, void *priv)
 
     if (func)
         return 0xff;
-    //        banshee_log("Banshee PCI read %08X  ", addr);
+#if 0
+    banshee_log("Banshee PCI read %08X  ", addr);
+#endif
     switch (addr) {
         case 0x00:
             ret = 0x1a;
@@ -3026,137 +3399,6 @@ banshee_pci_write(int func, int addr, uint8_t val, void *priv)
     }
 }
 
-// clang-format off
-static const device_config_t banshee_sgram_config[] = {
-    {
-        .name = "memory",
-        .description = "Memory size",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "8 MB",
-                .value = 8
-            },
-            {
-                .description = "16 MB",
-                .value = 16
-            },
-            {
-                .description = ""
-            }
-        },
-        .default_int = 16
-    },
-    {
-        .name = "bilinear",
-        .description = "Bilinear filtering",
-        .type = CONFIG_BINARY,
-        .default_int = 1
-    },
-    {
-        .name = "dithersub",
-        .description = "Dither subtraction",
-        .type = CONFIG_BINARY,
-        .default_int = 1
-    },
-    {
-        .name = "dacfilter",
-        .description = "Screen Filter",
-        .type = CONFIG_BINARY,
-        .default_int = 0
-    },
-    {
-        .name = "render_threads",
-        .description = "Render threads",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "1",
-                .value = 1
-            },
-            {
-                .description = "2",
-                .value = 2
-            },
-            {
-                .description = "4",
-                .value = 4
-            },
-            {
-                .description = ""
-            }
-        },
-        .default_int = 2
-    },
-#ifndef NO_CODEGEN
-    {
-        .name = "recompiler",
-        .description = "Recompiler",
-        .type = CONFIG_BINARY,
-        .default_int = 1
-    },
-#endif
-    {
-        .type = CONFIG_END
-    }
-};
-
-static const device_config_t banshee_sdram_config[] = {
-    {
-        .name = "bilinear",
-        .description = "Bilinear filtering",
-        .type = CONFIG_BINARY,
-        .default_int = 1
-    },
-    {
-        .name = "dithersub",
-        .description = "Dither subtraction",
-        .type = CONFIG_BINARY,
-        .default_int = 1
-    },
-    {
-        .name = "dacfilter",
-        .description = "Screen Filter",
-        .type = CONFIG_BINARY,
-        .default_int = 0
-    },
-    {
-        .name = "render_threads",
-        .description = "Render threads",
-        .type = CONFIG_SELECTION,
-        .selection = {
-            {
-                .description = "1",
-                .value = 1
-            },
-            {
-                .description = "2",
-                .value = 2
-            },
-            {
-                .description = "4",
-                .value = 4
-            },
-            {
-                .description = ""
-            }
-        },
-        .default_int = 2
-    },
-#ifndef NO_CODEGEN
-    {
-        .name = "recompiler",
-        .description = "Recompiler",
-        .type = CONFIG_BINARY,
-        .default_int = 1
-    },
-#endif
-    {
-        .type = CONFIG_END
-    }
-};
-// clang-format on
-
 static void *
 banshee_init_common(const device_t *info, char *fn, int has_sgram, int type, int voodoo_type, int agp)
 {
@@ -3168,6 +3410,8 @@ banshee_init_common(const device_t *info, char *fn, int has_sgram, int type, int
     banshee->agp      = agp;
     banshee->has_bios = !!fn;
 
+    banshee->chroma_key_enabled = device_get_config_int("chromakey");
+
     if (banshee->has_bios) {
         rom_init(&banshee->bios_rom, fn, 0xc0000, 0x10000, 0xffff, 0, MEM_MAPPING_EXTERNAL);
         mem_mapping_disable(&banshee->bios_rom.mapping);
@@ -3179,7 +3423,9 @@ banshee_init_common(const device_t *info, char *fn, int has_sgram, int type, int
 #endif
         mem_size = device_get_config_int("memory"); /* MS-6168 / Bora Pro can do both 8 and 16 MB. */
     else if (has_sgram) {
-        if (banshee->type == TYPE_VELOCITY100)
+        if ((banshee->type == TYPE_V3_1000) || (banshee->type == TYPE_VELOCITY200))
+            mem_size = 16; /* Our Voodoo 3 1000 and Velocity 200 bios'es are hardcoded to 16 MB. */
+        else if (banshee->type == TYPE_VELOCITY100)
             mem_size = 8; /* Velocity 100 only supports 8 MB */
         else
             mem_size = device_get_config_int("memory");
@@ -3254,6 +3500,7 @@ banshee_init_common(const device_t *info, char *fn, int has_sgram, int type, int
     banshee->voodoo->tex_mem_w[1] = (uint16_t *) banshee->svga.vram;
     banshee->voodoo->texture_mask = banshee->svga.vram_mask;
     banshee->voodoo->cmd_status   = (1 << 28);
+    banshee->voodoo->cmd_status_2 = (1 << 28);
     voodoo_generate_filter_v1(banshee->voodoo);
 
     banshee->vidSerialParallelPort = VIDSERIAL_DDC_DCK_W | VIDSERIAL_DDC_DDA_W;
@@ -3279,6 +3526,16 @@ banshee_init_common(const device_t *info, char *fn, int has_sgram, int type, int
             }
             break;
 
+        case TYPE_QUANTUM3D_RAVEN:
+            /* This case basically exists only to set the subsystem ID correctly for SF: Rush, a vendor-locked game. */
+            /*  We set the type back to TYPE_BANSHEE so the card behaves as a regular Banshee (no 3D glasses emulation). */
+            banshee->pci_regs[0x2c] = 0x9c;
+            banshee->pci_regs[0x2d] = 0x13;
+            banshee->pci_regs[0x2e] = banshee->agp ? 0x16 : 0x17;
+            banshee->pci_regs[0x2f] = 0x00;
+            banshee->type = TYPE_BANSHEE;
+            break;
+
         case TYPE_V3_1000:
             banshee->pci_regs[0x2c] = 0x1a;
             banshee->pci_regs[0x2d] = 0x12;
@@ -3356,6 +3613,12 @@ creative_banshee_init(const device_t *info)
     return banshee_init_common(info, ROM_CREATIVE_BANSHEE, 0, TYPE_BANSHEE, VOODOO_BANSHEE, 0);
 }
 
+static void *
+quantum3d_raven_init(const device_t *info)
+{
+    return banshee_init_common(info, ROM_QUANTUM3D_RAVEN, 0, TYPE_QUANTUM3D_RAVEN, VOODOO_BANSHEE, 0);
+}
+
 static void *
 v3_1000_init(const device_t *info)
 {
@@ -3452,6 +3715,12 @@ creative_banshee_available(void)
     return rom_present(ROM_CREATIVE_BANSHEE);
 }
 
+static int
+quantum3d_raven_available(void)
+{
+    return rom_present(ROM_QUANTUM3D_RAVEN);
+}
+
 static int
 v3_1000_available(void)
 {
@@ -3545,6 +3814,254 @@ banshee_force_redraw(void *priv)
     banshee->svga.fullchange = changeframecount;
 }
 
+// clang-format off
+static const device_config_t banshee_sgram_config[] = {
+    {
+        .name           = "memory",
+        .description    = "Memory size",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 16,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description =  "8 MB", .value =  8 },
+            { .description = "16 MB", .value = 16 },
+            { .description = ""                   }
+        },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "bilinear",
+        .description    = "Bilinear filtering",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "chromakey",
+        .description    = "Video chroma-keying",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "dithersub",
+        .description    = "Dither subtraction",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "dacfilter",
+        .description    = "Screen Filter",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "render_threads",
+        .description    = "Render threads",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "1", .value = 1 },
+            { .description = "2", .value = 2 },
+            { .description = "4", .value = 4 },
+            { .description = ""              }
+        },
+        .bios           = { { 0 } }
+    },
+#ifndef NO_CODEGEN
+    {
+        .name           = "recompiler",
+        .description    = "Dynamic Recompiler",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+#endif
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t banshee_sgram_16mbonly_config[] = {
+    {
+        .name           = "bilinear",
+        .description    = "Bilinear filtering",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "chromakey",
+        .description    = "Video chroma-keying",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "dithersub",
+        .description    = "Dither subtraction",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "dacfilter",
+        .description    = "Screen Filter",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "render_threads",
+        .description    = "Render threads",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "1", .value = 1 },
+            { .description = "2", .value = 2 },
+            { .description = "4", .value = 4 },
+            { .description = ""              }
+        },
+        .bios           = { { 0 } }
+    },
+#ifndef NO_CODEGEN
+    {
+        .name           = "recompiler",
+        .description    = "Dynamic Recompiler",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+#endif
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+
+static const device_config_t banshee_sdram_config[] = {
+    {
+        .name           = "bilinear",
+        .description    = "Bilinear filtering",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "chromakey",
+        .description    = "Video chroma-keying",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "dithersub",
+        .description    = "Dither subtraction",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "dacfilter",
+        .description    = "Screen Filter",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "render_threads",
+        .description    = "Render threads",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 2,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "1", .value = 1 },
+            { .description = "2", .value = 2 },
+            { .description = "4", .value = 4 },
+            { .description = ""              }
+        },
+        .bios           = { { 0 } }
+    },
+#ifndef NO_CODEGEN
+    {
+        .name           = "recompiler",
+        .description    = "Dynamic Recompiler",
+        .type           = CONFIG_BINARY,
+        .default_string = NULL,
+        .default_int    = 1,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = { { 0 } }
+    },
+#endif
+    { .name = "", .description = "", .type = CONFIG_END }
+};
+// clang-format on
+
 const device_t voodoo_banshee_device = {
     .name          = "3Dfx Voodoo Banshee",
     .internal_name = "voodoo_banshee_pci",
@@ -3553,7 +4070,7 @@ const device_t voodoo_banshee_device = {
     .init          = banshee_init,
     .close         = banshee_close,
     .reset         = NULL,
-    { .available = banshee_available },
+    .available     = banshee_available,
     .speed_changed = banshee_speed_changed,
     .force_redraw  = banshee_force_redraw,
     .config        = banshee_sgram_config
@@ -3567,7 +4084,21 @@ const device_t creative_voodoo_banshee_device = {
     .init          = creative_banshee_init,
     .close         = banshee_close,
     .reset         = NULL,
-    { .available = creative_banshee_available },
+    .available     = creative_banshee_available,
+    .speed_changed = banshee_speed_changed,
+    .force_redraw  = banshee_force_redraw,
+    .config        = banshee_sdram_config
+};
+
+const device_t quantum3d_raven_device = {
+    .name          = "Quantum3D Raven",
+    .internal_name = "q3d_raven_pci",
+    .flags         = DEVICE_PCI,
+    .local         = 0,
+    .init          = quantum3d_raven_init,
+    .close         = banshee_close,
+    .reset         = NULL,
+    .available     = quantum3d_raven_available,
     .speed_changed = banshee_speed_changed,
     .force_redraw  = banshee_force_redraw,
     .config        = banshee_sdram_config
@@ -3581,7 +4112,7 @@ const device_t voodoo_3_1000_device = {
     .init          = v3_1000_init,
     .close         = banshee_close,
     .reset         = NULL,
-    { .available = v3_1000_available },
+    .available     = v3_1000_available,
     .speed_changed = banshee_speed_changed,
     .force_redraw  = banshee_force_redraw,
     .config        = banshee_sgram_config
@@ -3595,10 +4126,10 @@ const device_t voodoo_3_1000_agp_device = {
     .init          = v3_1000_agp_init,
     .close         = banshee_close,
     .reset         = NULL,
-    { .available = v3_1000_agp_available },
+    .available     = v3_1000_agp_available,
     .speed_changed = banshee_speed_changed,
     .force_redraw  = banshee_force_redraw,
-    .config        = banshee_sgram_config
+    .config        = banshee_sgram_16mbonly_config
 };
 
 const device_t voodoo_3_2000_device = {
@@ -3609,7 +4140,7 @@ const device_t voodoo_3_2000_device = {
     .init          = v3_2000_init,
     .close         = banshee_close,
     .reset         = NULL,
-    { .available = v3_2000_available },
+    .available     = v3_2000_available,
     .speed_changed = banshee_speed_changed,
     .force_redraw  = banshee_force_redraw,
     .config        = banshee_sdram_config
@@ -3623,7 +4154,7 @@ const device_t voodoo_3_2000_agp_device = {
     .init          = v3_2000_agp_init,
     .close         = banshee_close,
     .reset         = NULL,
-    { .available = v3_2000_agp_available },
+    .available     = v3_2000_agp_available,
     .speed_changed = banshee_speed_changed,
     .force_redraw  = banshee_force_redraw,
     .config        = banshee_sdram_config
@@ -3637,7 +4168,7 @@ const device_t voodoo_3_2000_agp_onboard_8m_device = {
     .init          = v3_2000_agp_onboard_init,
     .close         = banshee_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = banshee_speed_changed,
     .force_redraw  = banshee_force_redraw,
     .config        = banshee_sgram_config
@@ -3651,7 +4182,7 @@ const device_t voodoo_3_3000_device = {
     .init          = v3_3000_init,
     .close         = banshee_close,
     .reset         = NULL,
-    { .available = v3_3000_available },
+    .available     = v3_3000_available,
     .speed_changed = banshee_speed_changed,
     .force_redraw  = banshee_force_redraw,
     .config        = banshee_sdram_config
@@ -3665,7 +4196,7 @@ const device_t voodoo_3_3000_agp_device = {
     .init          = v3_3000_agp_init,
     .close         = banshee_close,
     .reset         = NULL,
-    { .available = v3_3000_agp_available },
+    .available     = v3_3000_agp_available,
     .speed_changed = banshee_speed_changed,
     .force_redraw  = banshee_force_redraw,
     .config        = banshee_sdram_config
@@ -3679,7 +4210,7 @@ const device_t voodoo_3_3500_agp_ntsc_device = {
     .init          = v3_3500_agp_ntsc_init,
     .close         = banshee_close,
     .reset         = NULL,
-    { .available = v3_3500_agp_ntsc_available },
+    .available     = v3_3500_agp_ntsc_available,
     .speed_changed = banshee_speed_changed,
     .force_redraw  = banshee_force_redraw,
     .config        = banshee_sdram_config
@@ -3693,7 +4224,7 @@ const device_t voodoo_3_3500_agp_pal_device = {
     .init          = v3_3500_agp_pal_init,
     .close         = banshee_close,
     .reset         = NULL,
-    { .available = v3_3500_agp_pal_available },
+    .available     = v3_3500_agp_pal_available,
     .speed_changed = banshee_speed_changed,
     .force_redraw  = banshee_force_redraw,
     .config        = banshee_sdram_config
@@ -3707,7 +4238,7 @@ const device_t compaq_voodoo_3_3500_agp_device = {
     .init          = compaq_v3_3500_agp_init,
     .close         = banshee_close,
     .reset         = NULL,
-    { .available = compaq_v3_3500_agp_available },
+    .available     = compaq_v3_3500_agp_available,
     .speed_changed = banshee_speed_changed,
     .force_redraw  = banshee_force_redraw,
     .config        = banshee_sdram_config
@@ -3721,7 +4252,7 @@ const device_t voodoo_3_3500_se_agp_device = {
     .init          = v3_3500_se_agp_init,
     .close         = banshee_close,
     .reset         = NULL,
-    { .available = v3_3500_se_agp_available },
+    .available     = v3_3500_se_agp_available,
     .speed_changed = banshee_speed_changed,
     .force_redraw  = banshee_force_redraw,
     .config        = banshee_sdram_config
@@ -3735,7 +4266,7 @@ const device_t voodoo_3_3500_si_agp_device = {
     .init          = v3_3500_si_agp_init,
     .close         = banshee_close,
     .reset         = NULL,
-    { .available = v3_3500_si_agp_available },
+    .available     = v3_3500_si_agp_available,
     .speed_changed = banshee_speed_changed,
     .force_redraw  = banshee_force_redraw,
     .config        = banshee_sdram_config
@@ -3749,7 +4280,7 @@ const device_t velocity_100_agp_device = {
     .init          = velocity_100_agp_init,
     .close         = banshee_close,
     .reset         = NULL,
-    { .available = velocity_100_available },
+    .available     = velocity_100_available,
     .speed_changed = banshee_speed_changed,
     .force_redraw  = banshee_force_redraw,
     .config        = banshee_sdram_config
@@ -3763,8 +4294,8 @@ const device_t velocity_200_agp_device = {
     .init          = velocity_200_agp_init,
     .close         = banshee_close,
     .reset         = NULL,
-    { .available = velocity_200_available },
+    .available     = velocity_200_available,
     .speed_changed = banshee_speed_changed,
     .force_redraw  = banshee_force_redraw,
-    .config        = banshee_sgram_config
+    .config        = banshee_sgram_16mbonly_config
 };
diff --git a/src/video/vid_voodoo_banshee_blitter.c b/src/video/vid_voodoo_banshee_blitter.c
index 33ee602b5..ad92d580f 100644
--- a/src/video/vid_voodoo_banshee_blitter.c
+++ b/src/video/vid_voodoo_banshee_blitter.c
@@ -1,7 +1,5 @@
 /*Current issues :
-  - missing screen->screen scaled blits with format conversion
   - missing YUV blits (YUV -> 32-bit, 24-bit, or 16-bit RGB now done)
-  - missing linestyle
   - missing wait for vsync
   - missing reversible lines
 
@@ -216,6 +214,9 @@ PLOT(voodoo_t *voodoo, int x, int y, int pat_x, int pat_y, uint8_t pattern_mask,
                 uint32_t dest    = voodoo->vram[addr];
                 uint32_t pattern = (voodoo->banshee_blt.command & COMMAND_PATTERN_MONO) ? ((pattern_mask & (1 << (7 - (pat_x & 7)))) ? voodoo->banshee_blt.colorFore : voodoo->banshee_blt.colorBack) : voodoo->banshee_blt.colorPattern8[(pat_x & 7) + (pat_y & 7) * 8];
 
+                if (addr > voodoo->fb_mask)
+                    break;
+
                 voodoo->vram[addr]              = MIX(voodoo, dest, src, pattern, src_colorkey, COLORKEY_8);
                 voodoo->changedvram[addr >> 12] = changeframecount;
                 break;
@@ -226,6 +227,9 @@ PLOT(voodoo_t *voodoo, int x, int y, int pat_x, int pat_y, uint8_t pattern_mask,
                 uint32_t dest    = *(uint16_t *) &voodoo->vram[addr];
                 uint32_t pattern = (voodoo->banshee_blt.command & COMMAND_PATTERN_MONO) ? ((pattern_mask & (1 << (7 - (pat_x & 7)))) ? voodoo->banshee_blt.colorFore : voodoo->banshee_blt.colorBack) : voodoo->banshee_blt.colorPattern16[(pat_x & 7) + (pat_y & 7) * 8];
 
+                if (addr > voodoo->fb_mask)
+                    break;
+
                 *(uint16_t *) &voodoo->vram[addr] = MIX(voodoo, dest, src, pattern, src_colorkey, COLORKEY_16);
                 voodoo->changedvram[addr >> 12]   = changeframecount;
                 break;
@@ -236,6 +240,9 @@ PLOT(voodoo_t *voodoo, int x, int y, int pat_x, int pat_y, uint8_t pattern_mask,
                 uint32_t dest    = *(uint32_t *) &voodoo->vram[addr];
                 uint32_t pattern = (voodoo->banshee_blt.command & COMMAND_PATTERN_MONO) ? ((pattern_mask & (1 << (7 - (pat_x & 7)))) ? voodoo->banshee_blt.colorFore : voodoo->banshee_blt.colorBack) : voodoo->banshee_blt.colorPattern24[(pat_x & 7) + (pat_y & 7) * 8];
 
+                if (addr > voodoo->fb_mask)
+                    break;
+
                 *(uint32_t *) &voodoo->vram[addr] = (MIX(voodoo, dest, src, pattern, src_colorkey, COLORKEY_32) & 0xffffff) | (dest & 0xff000000);
                 voodoo->changedvram[addr >> 12]   = changeframecount;
                 break;
@@ -246,6 +253,9 @@ PLOT(voodoo_t *voodoo, int x, int y, int pat_x, int pat_y, uint8_t pattern_mask,
                 uint32_t dest    = *(uint32_t *) &voodoo->vram[addr];
                 uint32_t pattern = (voodoo->banshee_blt.command & COMMAND_PATTERN_MONO) ? ((pattern_mask & (1 << (7 - (pat_x & 7)))) ? voodoo->banshee_blt.colorFore : voodoo->banshee_blt.colorBack) : voodoo->banshee_blt.colorPattern[(pat_x & 7) + (pat_y & 7) * 8];
 
+                if (addr > voodoo->fb_mask)
+                    break;
+
                 *(uint32_t *) &voodoo->vram[addr] = MIX(voodoo, dest, src, pattern, src_colorkey, COLORKEY_32);
                 voodoo->changedvram[addr >> 12]   = changeframecount;
                 break;
@@ -265,6 +275,9 @@ PLOT_LINE(voodoo_t *voodoo, int x, int y, UNUSED(uint8_t rop), uint32_t pattern,
                 uint32_t addr = get_addr(voodoo, x, y, 0, 0); //(voodoo->banshee_blt.dstBaseAddr + x + y*voodoo->banshee_blt.dst_stride) & voodoo->fb_mask;
                 uint32_t dest = voodoo->vram[addr];
 
+                if (addr > voodoo->fb_mask)
+                    break;
+
                 voodoo->vram[addr]              = MIX(voodoo, dest, voodoo->banshee_blt.colorFore, pattern, src_colorkey, COLORKEY_8);
                 voodoo->changedvram[addr >> 12] = changeframecount;
                 break;
@@ -274,6 +287,9 @@ PLOT_LINE(voodoo_t *voodoo, int x, int y, UNUSED(uint8_t rop), uint32_t pattern,
                 uint32_t addr = get_addr(voodoo, x * 2, y, 0, 0); //(voodoo->banshee_blt.dstBaseAddr + x*2 + y*voodoo->banshee_blt.dst_stride)  & voodoo->fb_mask;
                 uint32_t dest = *(uint16_t *) &voodoo->vram[addr];
 
+                if (addr > voodoo->fb_mask)
+                    break;
+
                 *(uint16_t *) &voodoo->vram[addr] = MIX(voodoo, dest, voodoo->banshee_blt.colorFore, pattern, src_colorkey, COLORKEY_16);
                 voodoo->changedvram[addr >> 12]   = changeframecount;
                 break;
@@ -283,6 +299,9 @@ PLOT_LINE(voodoo_t *voodoo, int x, int y, UNUSED(uint8_t rop), uint32_t pattern,
                 uint32_t addr = get_addr(voodoo, x * 3, y, 0, 0); //(voodoo->banshee_blt.dstBaseAddr + x*3 + y*voodoo->banshee_blt.dst_stride)  & voodoo->fb_mask;
                 uint32_t dest = *(uint32_t *) &voodoo->vram[addr];
 
+                if (addr > voodoo->fb_mask)
+                    break;
+
                 *(uint32_t *) &voodoo->vram[addr] = (MIX(voodoo, dest, voodoo->banshee_blt.colorFore, pattern, src_colorkey, COLORKEY_32) & 0xffffff) | (dest & 0xff000000);
                 voodoo->changedvram[addr >> 12]   = changeframecount;
                 break;
@@ -292,6 +311,9 @@ PLOT_LINE(voodoo_t *voodoo, int x, int y, UNUSED(uint8_t rop), uint32_t pattern,
                 uint32_t addr = get_addr(voodoo, x * 4, y, 0, 0); //(voodoo->banshee_blt.dstBaseAddr + x*4 + y*voodoo->banshee_blt.dst_stride) & voodoo->fb_mask;
                 uint32_t dest = *(uint32_t *) &voodoo->vram[addr];
 
+                if (addr > voodoo->fb_mask)
+                    break;
+
                 *(uint32_t *) &voodoo->vram[addr] = MIX(voodoo, dest, voodoo->banshee_blt.colorFore, pattern, src_colorkey, COLORKEY_32);
                 voodoo->changedvram[addr >> 12]   = changeframecount;
                 break;
@@ -322,6 +344,7 @@ update_src_stride(voodoo_t *voodoo)
             break;
         case SRC_FORMAT_COL_32_BPP:
         case SRC_FORMAT_COL_YUYV:
+        case SRC_FORMAT_COL_UYVY:
             bpp = 32;
             break;
 
@@ -573,6 +596,9 @@ do_screen_to_screen_line(voodoo_t *voodoo, uint8_t *src_p, int use_x_dir, int sr
                                 uint32_t dest     = voodoo->vram[dst_addr];
                                 uint32_t pattern  = (voodoo->banshee_blt.command & COMMAND_PATTERN_MONO) ? ((pattern_mask & (1 << (7 - (pat_x & 7)))) ? voodoo->banshee_blt.colorFore : voodoo->banshee_blt.colorBack) : voodoo->banshee_blt.colorPattern8[(pat_x & 7) + (pat_y & 7) * 8];
 
+                                if (dst_addr > voodoo->fb_mask)
+                                     break;
+
                                 voodoo->vram[dst_addr]              = MIX(voodoo, dest, src, pattern, COLORKEY_8, COLORKEY_8);
                                 voodoo->changedvram[dst_addr >> 12] = changeframecount;
                                 break;
@@ -584,6 +610,9 @@ do_screen_to_screen_line(voodoo_t *voodoo, uint8_t *src_p, int use_x_dir, int sr
                                 uint32_t dest     = *(uint16_t *) &voodoo->vram[dst_addr];
                                 uint32_t pattern  = (voodoo->banshee_blt.command & COMMAND_PATTERN_MONO) ? ((pattern_mask & (1 << (7 - (pat_x & 7)))) ? voodoo->banshee_blt.colorFore : voodoo->banshee_blt.colorBack) : voodoo->banshee_blt.colorPattern16[(pat_x & 7) + (pat_y & 7) * 8];
 
+                                if (dst_addr > voodoo->fb_mask)
+                                     break;
+
                                 *(uint16_t *) &voodoo->vram[dst_addr] = MIX(voodoo, dest, src, pattern, COLORKEY_16, COLORKEY_16);
                                 voodoo->changedvram[dst_addr >> 12]   = changeframecount;
                                 break;
@@ -595,6 +624,9 @@ do_screen_to_screen_line(voodoo_t *voodoo, uint8_t *src_p, int use_x_dir, int sr
                                 uint32_t dest     = *(uint32_t *) &voodoo->vram[dst_addr];
                                 uint32_t pattern  = (voodoo->banshee_blt.command & COMMAND_PATTERN_MONO) ? ((pattern_mask & (1 << (7 - (pat_x & 7)))) ? voodoo->banshee_blt.colorFore : voodoo->banshee_blt.colorBack) : voodoo->banshee_blt.colorPattern24[(pat_x & 7) + (pat_y & 7) * 8];
 
+                                if (dst_addr > voodoo->fb_mask)
+                                     break;
+
                                 *(uint32_t *) &voodoo->vram[dst_addr] = (MIX(voodoo, dest, src, pattern, COLORKEY_32, COLORKEY_32) & 0xffffff) | (dest & 0xff000000);
                                 voodoo->changedvram[dst_addr >> 12]   = changeframecount;
                                 break;
@@ -606,6 +638,9 @@ do_screen_to_screen_line(voodoo_t *voodoo, uint8_t *src_p, int use_x_dir, int sr
                                 uint32_t dest     = *(uint32_t *) &voodoo->vram[dst_addr];
                                 uint32_t pattern  = (voodoo->banshee_blt.command & COMMAND_PATTERN_MONO) ? ((pattern_mask & (1 << (7 - (pat_x & 7)))) ? voodoo->banshee_blt.colorFore : voodoo->banshee_blt.colorBack) : voodoo->banshee_blt.colorPattern[(pat_x & 7) + (pat_y & 7) * 8];
 
+                                if (dst_addr > voodoo->fb_mask)
+                                     break;
+
                                 *(uint32_t *) &voodoo->vram[dst_addr] = MIX(voodoo, dest, src, pattern, COLORKEY_32, COLORKEY_32);
                                 voodoo->changedvram[dst_addr >> 12]   = changeframecount;
                                 break;
@@ -695,6 +730,13 @@ do_screen_to_screen_line(voodoo_t *voodoo, uint8_t *src_p, int use_x_dir, int sr
                                 src_data_yuv = *(uint32_t *) &src_p[src_x_real];
                                 break;
                             }
+                        case SRC_FORMAT_COL_UYVY:
+                            {
+                                src_data_yuv = *(uint32_t *) &src_p[src_x_real];
+                                src_data_yuv = ((src_data_yuv & 0xFF00) >> 8) | ((src_data_yuv & 0xFF) << 8) |
+                                                ((src_data_yuv & 0xFF000000) >> 8) | ((src_data_yuv & 0xFF0000) << 8);
+                                break;
+                            }
 
                         default:
                             fatal("banshee_do_screen_to_screen_blt: unknown srcFormat %08x\n", voodoo->banshee_blt.srcFormat);
@@ -708,7 +750,8 @@ do_screen_to_screen_line(voodoo_t *voodoo, uint8_t *src_p, int use_x_dir, int sr
                         src_data = (b >> 3) | ((g >> 2) << 5) | ((r >> 3) << 11);
                     }
 
-                    if ((voodoo->banshee_blt.srcFormat & SRC_FORMAT_COL_MASK) == SRC_FORMAT_COL_YUYV) {
+                    if ((voodoo->banshee_blt.srcFormat & SRC_FORMAT_COL_MASK) == SRC_FORMAT_COL_YUYV
+                    || (voodoo->banshee_blt.srcFormat & SRC_FORMAT_COL_MASK) == SRC_FORMAT_COL_UYVY) {
                         if (((voodoo->banshee_blt.dstFormat & DST_FORMAT_COL_MASK) == DST_FORMAT_COL_24_BPP) ||
                             ((voodoo->banshee_blt.dstFormat & DST_FORMAT_COL_MASK) == DST_FORMAT_COL_32_BPP)) {
                             uint32_t rgbcol[2] = { 0, 0 };
@@ -872,7 +915,19 @@ do_screen_to_screen_stretch_line(voodoo_t *voodoo, uint8_t *src_p, int src_x, in
     const uint8_t  *pattern_mono      = (uint8_t *) voodoo->banshee_blt.colorPattern;
     int             use_pattern_trans = (voodoo->banshee_blt.command & (COMMAND_PATTERN_MONO | COMMAND_TRANS_MONO)) == (COMMAND_PATTERN_MONO | COMMAND_TRANS_MONO);
     const uint32_t *colorPattern      = voodoo->banshee_blt.colorPattern;
+    int             src_colorkey;
 
+    switch (voodoo->banshee_blt.srcFormat & SRC_FORMAT_COL_MASK) {
+        case SRC_FORMAT_COL_8_BPP:
+            src_colorkey = COLORKEY_8;
+            break;
+        case SRC_FORMAT_COL_16_BPP:
+            src_colorkey = COLORKEY_16;
+            break;
+        default:
+            src_colorkey = COLORKEY_32;
+            break;
+    }
 #if 0
     int error_y = voodoo->banshee_blt.dstSizeY / 2;
 
@@ -880,92 +935,218 @@ do_screen_to_screen_stretch_line(voodoo_t *voodoo, uint8_t *src_p, int src_x, in
     bansheeblt_log("  srcXY=%i,%i srcsizeXY=%i,%i\n", voodoo->banshee_blt.srcX, voodoo->banshee_blt.srcY, voodoo->banshee_blt.srcSizeX, voodoo->banshee_blt.srcSizeY);
     bansheeblt_log("  dstXY=%i,%i dstsizeXY=%i,%i\n", voodoo->banshee_blt.dstX, voodoo->banshee_blt.dstY, voodoo->banshee_blt.dstSizeX, voodoo->banshee_blt.dstSizeY);*/
 #endif
-    if (dst_y >= clip->y_min && dst_y < clip->y_max) {
-#if 0
-        int src_x = voodoo->banshee_blt.srcX;
-#endif
-        int     dst_x        = voodoo->banshee_blt.dstX;
-        int     pat_x        = voodoo->banshee_blt.patoff_x + voodoo->banshee_blt.dstX;
-        uint8_t pattern_mask = pattern_mono[pat_y & 7];
-        int     error_x      = voodoo->banshee_blt.dstSizeX / 2;
+    if ((voodoo->banshee_blt.srcFormat & SRC_FORMAT_COL_MASK) == (voodoo->banshee_blt.dstFormat & DST_FORMAT_COL_MASK)) {
+        if (dst_y >= clip->y_min && dst_y < clip->y_max) {
+            int     dst_x        = voodoo->banshee_blt.dstX;
+            int     pat_x        = voodoo->banshee_blt.patoff_x + voodoo->banshee_blt.dstX;
+            uint8_t pattern_mask = pattern_mono[pat_y & 7];
+            int     error_x      = voodoo->banshee_blt.dstSizeX / 2;
 
-#if 0
-        bansheeblt_log(" Plot dest line %03i : src line %03i\n", dst_y, src_y);
-#endif
-        for (voodoo->banshee_blt.cur_x = 0; voodoo->banshee_blt.cur_x < voodoo->banshee_blt.dstSizeX; voodoo->banshee_blt.cur_x++) {
-            int pattern_trans = use_pattern_trans ? (pattern_mask & (1 << (7 - (pat_x & 7)))) : 1;
+            for (voodoo->banshee_blt.cur_x = 0; voodoo->banshee_blt.cur_x < voodoo->banshee_blt.dstSizeX; voodoo->banshee_blt.cur_x++) {
+                int pattern_trans = use_pattern_trans ? (pattern_mask & (1 << (7 - (pat_x & 7)))) : 1;
 
-            if (dst_x >= clip->x_min && dst_x < clip->x_max && pattern_trans) {
-                switch (voodoo->banshee_blt.dstFormat & DST_FORMAT_COL_MASK) {
-                    case DST_FORMAT_COL_8_BPP:
-                        {
-                            uint32_t dst_addr = get_addr(voodoo, dst_x, dst_y, 0, 0); //(voodoo->banshee_blt.dstBaseAddr + dst_x + dst_y*voodoo->banshee_blt.dst_stride) & voodoo->fb_mask;
-                            uint32_t src      = src_p[src_x];
-                            uint32_t dest     = voodoo->vram[dst_addr];
-                            uint32_t pattern  = (voodoo->banshee_blt.command & COMMAND_PATTERN_MONO) ? ((pattern_mask & (1 << (7 - (pat_x & 7)))) ? voodoo->banshee_blt.colorFore : voodoo->banshee_blt.colorBack) : colorPattern[(pat_x & 7) + (pat_y & 7) * 8];
+                if (dst_x >= clip->x_min && dst_x < clip->x_max && pattern_trans) {
+                    switch (voodoo->banshee_blt.dstFormat & DST_FORMAT_COL_MASK) {
+                        case DST_FORMAT_COL_8_BPP:
+                            {
+                                uint32_t dst_addr = get_addr(voodoo, dst_x, dst_y, 0, 0); //(voodoo->banshee_blt.dstBaseAddr + dst_x + dst_y*voodoo->banshee_blt.dst_stride) & voodoo->fb_mask;
+                                uint32_t src      = src_p[src_x];
+                                uint32_t dest     = voodoo->vram[dst_addr];
+                                uint32_t pattern  = (voodoo->banshee_blt.command & COMMAND_PATTERN_MONO) ? ((pattern_mask & (1 << (7 - (pat_x & 7)))) ? voodoo->banshee_blt.colorFore : voodoo->banshee_blt.colorBack) : colorPattern[(pat_x & 7) + (pat_y & 7) * 8];
 
-                            voodoo->vram[dst_addr] = MIX(voodoo, dest, src, pattern, COLORKEY_8, COLORKEY_8);
-#if 0
-                            bansheeblt_log("%i,%i : sdp=%02x,%02x,%02x res=%02x\n", voodoo->banshee_blt.cur_x, voodoo->banshee_blt.cur_y, src, dest, pattern, voodoo->vram[dst_addr]);
-#endif
-                            voodoo->changedvram[dst_addr >> 12] = changeframecount;
+                                if (dst_addr > voodoo->fb_mask)
+                                    break;
+
+                                voodoo->vram[dst_addr]              = MIX(voodoo, dest, src, pattern, COLORKEY_8, COLORKEY_8);
+                                voodoo->changedvram[dst_addr >> 12] = changeframecount;
+                                break;
+                            }
+                        case DST_FORMAT_COL_16_BPP:
+                            {
+                                uint32_t dst_addr = get_addr(voodoo, dst_x * 2, dst_y, 0, 0); //(voodoo->banshee_blt.dstBaseAddr + dst_x*2 + dst_y*voodoo->banshee_blt.dst_stride) & voodoo->fb_mask;
+                                uint32_t src      = *(uint16_t *) &src_p[src_x * 2];
+                                uint32_t dest     = *(uint16_t *) &voodoo->vram[dst_addr];
+                                uint32_t pattern  = (voodoo->banshee_blt.command & COMMAND_PATTERN_MONO) ? ((pattern_mask & (1 << (7 - (pat_x & 7)))) ? voodoo->banshee_blt.colorFore : voodoo->banshee_blt.colorBack) : colorPattern[(pat_x & 7) + (pat_y & 7) * 8];
+
+                                if (dst_addr > voodoo->fb_mask)
+                                    break;
+
+                                *(uint16_t *) &voodoo->vram[dst_addr] = MIX(voodoo, dest, src, pattern, COLORKEY_16, COLORKEY_16);
+                                voodoo->changedvram[dst_addr >> 12]   = changeframecount;
+                                break;
+                            }
+                        case DST_FORMAT_COL_24_BPP:
+                            {
+                                uint32_t dst_addr = get_addr(voodoo, dst_x * 3, dst_y, 0, 0); //(voodoo->banshee_blt.dstBaseAddr + dst_x*3 + dst_y*voodoo->banshee_blt.dst_stride) & voodoo->fb_mask;
+                                uint32_t src      = *(uint32_t *) &src_p[src_x * 3];
+                                uint32_t dest     = *(uint32_t *) &voodoo->vram[dst_addr];
+                                uint32_t pattern  = (voodoo->banshee_blt.command & COMMAND_PATTERN_MONO) ? ((pattern_mask & (1 << (7 - (pat_x & 7)))) ? voodoo->banshee_blt.colorFore : voodoo->banshee_blt.colorBack) : colorPattern[(pat_x & 7) + (pat_y & 7) * 8];
+
+                                if (dst_addr > voodoo->fb_mask)
+                                    break;
+
+                                *(uint32_t *) &voodoo->vram[dst_addr] = (MIX(voodoo, dest, src, pattern, COLORKEY_32, COLORKEY_32) & 0xffffff) | (*(uint32_t *) &voodoo->vram[dst_addr] & 0xff000000);
+                                voodoo->changedvram[dst_addr >> 12]   = changeframecount;
+                                break;
+                            }
+                        case DST_FORMAT_COL_32_BPP:
+                            {
+                                uint32_t dst_addr = get_addr(voodoo, dst_x * 4, dst_y, 0, 0); //(voodoo->banshee_blt.dstBaseAddr + dst_x*4 + dst_y*voodoo->banshee_blt.dst_stride) & voodoo->fb_mask;
+                                uint32_t src      = *(uint32_t *) &src_p[src_x * 4];
+                                uint32_t dest     = *(uint32_t *) &voodoo->vram[dst_addr];
+                                uint32_t pattern  = (voodoo->banshee_blt.command & COMMAND_PATTERN_MONO) ? ((pattern_mask & (1 << (7 - (pat_x & 7)))) ? voodoo->banshee_blt.colorFore : voodoo->banshee_blt.colorBack) : colorPattern[(pat_x & 7) + (pat_y & 7) * 8];
+
+                                if (dst_addr > voodoo->fb_mask)
+                                    break;
+
+                                *(uint32_t *) &voodoo->vram[dst_addr] = MIX(voodoo, dest, src, pattern, COLORKEY_32, COLORKEY_32);
+                                voodoo->changedvram[dst_addr >> 12]   = changeframecount;
+                                break;
+                            }
+
+                        default:
                             break;
-                        }
-                    case DST_FORMAT_COL_16_BPP:
-                        {
-                            uint32_t dst_addr = get_addr(voodoo, dst_x * 2, dst_y, 0, 0); //(voodoo->banshee_blt.dstBaseAddr + dst_x*2 + dst_y*voodoo->banshee_blt.dst_stride) & voodoo->fb_mask;
-                            uint32_t src      = *(uint16_t *) &src_p[src_x * 2];
-                            uint32_t dest     = *(uint16_t *) &voodoo->vram[dst_addr];
-                            uint32_t pattern  = (voodoo->banshee_blt.command & COMMAND_PATTERN_MONO) ? ((pattern_mask & (1 << (7 - (pat_x & 7)))) ? voodoo->banshee_blt.colorFore : voodoo->banshee_blt.colorBack) : colorPattern[(pat_x & 7) + (pat_y & 7) * 8];
-
-                            *(uint16_t *) &voodoo->vram[dst_addr] = MIX(voodoo, dest, src, pattern, COLORKEY_16, COLORKEY_16);
-#if 0
-                            bansheeblt_log("%i,%i : sdp=%02x,%02x,%02x res=%02x\n", voodoo->banshee_blt.cur_x, voodoo->banshee_blt.cur_y, src, dest, pattern, *(uint16_t *)&voodoo->vram[dst_addr]);
-#endif
-                            voodoo->changedvram[dst_addr >> 12] = changeframecount;
-                            break;
-                        }
-                    case DST_FORMAT_COL_24_BPP:
-                        {
-                            uint32_t dst_addr = get_addr(voodoo, dst_x * 3, dst_y, 0, 0); //(voodoo->banshee_blt.dstBaseAddr + dst_x*3 + dst_y*voodoo->banshee_blt.dst_stride) & voodoo->fb_mask;
-                            uint32_t src      = *(uint32_t *) &src_p[src_x * 3];
-                            uint32_t dest     = *(uint32_t *) &voodoo->vram[dst_addr];
-                            uint32_t pattern  = (voodoo->banshee_blt.command & COMMAND_PATTERN_MONO) ? ((pattern_mask & (1 << (7 - (pat_x & 7)))) ? voodoo->banshee_blt.colorFore : voodoo->banshee_blt.colorBack) : colorPattern[(pat_x & 7) + (pat_y & 7) * 8];
-
-                            *(uint32_t *) &voodoo->vram[dst_addr] = (MIX(voodoo, dest, src, pattern, COLORKEY_32, COLORKEY_32) & 0xffffff) | (*(uint32_t *) &voodoo->vram[dst_addr] & 0xff000000);
-#if 0
-                            bansheeblt_log("%i,%i : sdp=%02x,%02x,%02x res=%02x\n", voodoo->banshee_blt.cur_x, voodoo->banshee_blt.cur_y, src, dest, pattern, voodoo->vram[dst_addr]);
-#endif
-                            voodoo->changedvram[dst_addr >> 12] = changeframecount;
-                            break;
-                        }
-                    case DST_FORMAT_COL_32_BPP:
-                        {
-                            uint32_t dst_addr = get_addr(voodoo, dst_x * 4, dst_y, 0, 0); //(voodoo->banshee_blt.dstBaseAddr + dst_x*4 + dst_y*voodoo->banshee_blt.dst_stride) & voodoo->fb_mask;
-                            uint32_t src      = *(uint32_t *) &src_p[src_x * 4];
-                            uint32_t dest     = *(uint32_t *) &voodoo->vram[dst_addr];
-                            uint32_t pattern  = (voodoo->banshee_blt.command & COMMAND_PATTERN_MONO) ? ((pattern_mask & (1 << (7 - (pat_x & 7)))) ? voodoo->banshee_blt.colorFore : voodoo->banshee_blt.colorBack) : colorPattern[(pat_x & 7) + (pat_y & 7) * 8];
-
-                            *(uint32_t *) &voodoo->vram[dst_addr] = MIX(voodoo, dest, src, pattern, COLORKEY_32, COLORKEY_32);
-#if 0
-                            bansheeblt_log("%i,%i : sdp=%02x,%02x,%02x res=%02x\n", voodoo->banshee_blt.cur_x, voodoo->banshee_blt.cur_y, src, dest, pattern, voodoo->vram[dst_addr]);
-#endif
-                            voodoo->changedvram[dst_addr >> 12] = changeframecount;
-                            break;
-                        }
-
-                    default:
-                        break;
+                    }
                 }
-            }
 
-            error_x -= voodoo->banshee_blt.srcSizeX;
-            while (error_x < 0) {
-                error_x += voodoo->banshee_blt.dstSizeX;
-                src_x++;
+                error_x -= voodoo->banshee_blt.srcSizeX;
+                while (error_x < 0) {
+                    error_x += voodoo->banshee_blt.dstSizeX;
+                    src_x++;
+                }
+                dst_x++;
+                pat_x++;
+            }
+        }
+    } else {
+        /* Color conversion required. */
+        if (dst_y >= clip->y_min && dst_y < clip->y_max) {
+            int     dst_x        = voodoo->banshee_blt.dstX;
+            int     pat_x        = voodoo->banshee_blt.patoff_x + voodoo->banshee_blt.dstX;
+            uint8_t pattern_mask = pattern_mono[pat_y & 7];
+            int     error_x      = voodoo->banshee_blt.dstSizeX / 2;
+
+            for (voodoo->banshee_blt.cur_x = 0; voodoo->banshee_blt.cur_x < voodoo->banshee_blt.dstSizeX; voodoo->banshee_blt.cur_x++) {
+                int pattern_trans = use_pattern_trans ? (pattern_mask & (1 << (7 - (pat_x & 7)))) : 1;
+                int src_x_real    = (src_x * voodoo->banshee_blt.src_bpp) >> 3;
+
+                if (dst_x >= clip->x_min && dst_x < clip->x_max && pattern_trans) {
+                    uint32_t src_data     = 0;
+                    uint32_t src_data_yuv = 0; /* Used in YUYV-to-RGB convesions. */
+                    int      transparent  = 0;
+
+                    switch (voodoo->banshee_blt.srcFormat & SRC_FORMAT_COL_MASK) {
+                        case SRC_FORMAT_COL_1_BPP:
+                            {
+                                uint8_t src_byte = src_p[src_x_real];
+                                src_data         = (src_byte & (0x80 >> (src_x & 7))) ? voodoo->banshee_blt.colorFore : voodoo->banshee_blt.colorBack;
+                                if (voodoo->banshee_blt.command & COMMAND_TRANS_MONO)
+                                    transparent = !(src_byte & (0x80 >> (src_x & 7)));
+#if 0
+                                bansheeblt_log(" 1bpp src_byte=%02x src_x=%i src_data=%x transparent=%i\n", src_byte, src_x, src_data, transparent);
+#endif
+                                break;
+                            }
+                        case SRC_FORMAT_COL_8_BPP:
+                            {
+                                src_data = src_p[src_x_real];
+                                break;
+                            }
+                        case SRC_FORMAT_COL_16_BPP:
+                            {
+                                uint16_t src_16 = *(uint16_t *) &src_p[src_x_real];
+                                int      r      = (src_16 >> 11);
+                                int      g      = (src_16 >> 5) & 0x3f;
+                                int      b      = src_16 & 0x1f;
+
+                                r        = (r << 3) | (r >> 2);
+                                g        = (g << 2) | (g >> 4);
+                                b        = (b << 3) | (b >> 2);
+                                src_data = (r << 16) | (g << 8) | b;
+                                break;
+                            }
+                        case SRC_FORMAT_COL_24_BPP:
+                            {
+                                src_data = *(uint32_t *) &src_p[src_x_real];
+                                break;
+                            }
+                        case SRC_FORMAT_COL_32_BPP:
+                            {
+                                src_data = *(uint32_t *) &src_p[src_x_real];
+                                break;
+                            }
+                        case SRC_FORMAT_COL_YUYV:
+                            {
+                                src_data_yuv = *(uint32_t *) &src_p[src_x_real];
+                                break;
+                            }
+                        case SRC_FORMAT_COL_UYVY:
+                            {
+                                src_data_yuv = *(uint32_t *) &src_p[src_x_real];
+                                src_data_yuv = ((src_data_yuv & 0xFF00) >> 8) | ((src_data_yuv & 0xFF) << 8) |
+                                                ((src_data_yuv & 0xFF000000) >> 8) | ((src_data_yuv & 0xFF0000) << 8);
+                                break;
+                            }
+
+                        default:
+                            fatal("banshee_do_screen_to_screen_stretch_blt: unknown srcFormat %08x\n", voodoo->banshee_blt.srcFormat);
+                    }
+
+                    if ((voodoo->banshee_blt.dstFormat & DST_FORMAT_COL_MASK) == DST_FORMAT_COL_16_BPP && (voodoo->banshee_blt.srcFormat & SRC_FORMAT_COL_MASK) != SRC_FORMAT_COL_1_BPP) {
+                        int r = src_data >> 16;
+                        int g = (src_data >> 8) & 0xff;
+                        int b = src_data & 0xff;
+
+                        src_data = (b >> 3) | ((g >> 2) << 5) | ((r >> 3) << 11);
+                    }
+
+                    if ((voodoo->banshee_blt.srcFormat & SRC_FORMAT_COL_MASK) == SRC_FORMAT_COL_YUYV
+                    || (voodoo->banshee_blt.srcFormat & SRC_FORMAT_COL_MASK) == SRC_FORMAT_COL_UYVY) {
+                        if (((voodoo->banshee_blt.dstFormat & DST_FORMAT_COL_MASK) == DST_FORMAT_COL_24_BPP) ||
+                            ((voodoo->banshee_blt.dstFormat & DST_FORMAT_COL_MASK) == DST_FORMAT_COL_32_BPP)) {
+                            uint32_t rgbcol[2] = { 0, 0 };
+                            DECODE_YUYV422(rgbcol, (uint8_t *) &src_data_yuv);
+
+                            bansheeblt_log("YUV -> 24 bpp or 32 bpp\n");
+
+                            if (!transparent) {
+                                PLOT(voodoo, dst_x, dst_y, pat_x, pat_y, pattern_mask, 0xFF, rgbcol[0], src_colorkey);
+                            }
+                            dst_x++;
+                            
+                            if (!transparent) {
+                                PLOT(voodoo, dst_x, dst_y, pat_x, pat_y, pattern_mask, 0xFF, rgbcol[1], src_colorkey);
+                            }
+                        } else if ((voodoo->banshee_blt.dstFormat & DST_FORMAT_COL_MASK) == DST_FORMAT_COL_16_BPP) {
+                            uint32_t rgbcol = 0;
+                            DECODE_YUYV422_16BPP((uint16_t *) &rgbcol, (uint8_t *) &src_data_yuv);
+
+                            bansheeblt_log("YUV -> 16 bpp\n");
+
+                            if (!transparent) {
+                                PLOT(voodoo, dst_x, dst_y, pat_x, pat_y, pattern_mask, 0xFF, rgbcol & 0xffff, src_colorkey);
+                            }
+                            dst_x++;
+
+                            if (!transparent) {
+                                PLOT(voodoo, dst_x, dst_y, pat_x, pat_y, pattern_mask, 0xFF, rgbcol >> 16, src_colorkey);
+                            }
+                        } else
+                            fatal("banshee_do_screen_to_screen_stretch_blt: unknown dstFormat %08x\n", voodoo->banshee_blt.dstFormat);
+                    } else {
+                        if (!transparent)
+                            PLOT(voodoo, dst_x, dst_y, pat_x, pat_y, pattern_mask, 0xFF, src_data, src_colorkey);
+                    }
+                }
+
+                error_x -= voodoo->banshee_blt.srcSizeX;
+                while (error_x < 0) {
+                    error_x += voodoo->banshee_blt.dstSizeX;
+                    src_x++;
+                }
+                dst_x++;
+                pat_x++;
             }
-            dst_x++;
-            pat_x++;
         }
     }
 
@@ -1440,6 +1621,7 @@ voodoo_2d_reg_writel(voodoo_t *voodoo, uint32_t addr, uint32_t val)
                     break;
                 case SRC_FORMAT_COL_32_BPP:
                 case SRC_FORMAT_COL_YUYV:
+                case SRC_FORMAT_COL_UYVY:
                     voodoo->banshee_blt.src_bpp = 32;
                     break;
                 case SRC_FORMAT_COL_16_BPP:
diff --git a/src/video/vid_voodoo_display.c b/src/video/vid_voodoo_display.c
index e6cf13674..d04376941 100644
--- a/src/video/vid_voodoo_display.c
+++ b/src/video/vid_voodoo_display.c
@@ -511,6 +511,8 @@ voodoo_callback(void *priv)
 {
     voodoo_t        *voodoo  = (voodoo_t *) priv;
     const monitor_t *monitor = &monitors[voodoo->monitor_index];
+    int              v_y_add = (monitor->mon_overscan_y >> 1);
+    int              v_x_add = (monitor->mon_overscan_x >> 1);
 
     if (voodoo->fbiInit0 & FBIINIT0_VGA_PASS) {
         if (voodoo->line < voodoo->v_disp) {
@@ -534,7 +536,7 @@ voodoo_callback(void *priv)
             }
 
             if (draw_voodoo->dirty_line[draw_line]) {
-                uint32_t *p   = &monitor->target_buffer->line[voodoo->line + 8][8];
+                uint32_t *p   = &monitor->target_buffer->line[voodoo->line + v_y_add][v_x_add];
                 uint16_t *src = (uint16_t *) &draw_voodoo->fb_mem[draw_voodoo->front_offset + draw_line * draw_voodoo->row_width];
                 int       x;
 
@@ -548,8 +550,8 @@ voodoo_callback(void *priv)
                     voodoo->dirty_line_high = voodoo->line;
 
                 /* Draw left overscan. */
-                for (x = 0; x < 8; x++)
-                    monitor->target_buffer->line[voodoo->line + 8][x] = 0x00000000;
+                for (x = 0; x < v_x_add; x++)
+                    monitor->target_buffer->line[voodoo->line + v_y_add][x] = 0x00000000;
 
                 if (voodoo->scrfilter && voodoo->scrfilterEnabled) {
                     uint8_t fil[4096 * 3]; /* interleaved 24-bit RGB */
@@ -570,8 +572,9 @@ voodoo_callback(void *priv)
                 }
 
                 /* Draw right overscan. */
-                for (x = 0; x < 8; x++)
-                    monitor->target_buffer->line[voodoo->line + 8][voodoo->h_disp + x + 8] = 0x00000000;
+                for (x = 0; x < v_x_add; x++)
+                    monitor->target_buffer->line[voodoo->line + v_y_add][voodoo->h_disp + x + v_x_add] =
+                    0x00000000;
             }
         }
     }
diff --git a/src/video/vid_voodoo_fb.c b/src/video/vid_voodoo_fb.c
index 94394e115..ddf68360f 100644
--- a/src/video/vid_voodoo_fb.c
+++ b/src/video/vid_voodoo_fb.c
@@ -252,6 +252,9 @@ voodoo_fb_writew(uint32_t addr, uint16_t val, void *priv)
         {
             rgba8_t  write_data = colour_data;
             uint16_t new_depth  = depth_data;
+            int      colbfog_r  = 0;
+            int      colbfog_g  = 0;
+            int      colbfog_b  = 0;
 
             if (params->fbzMode & FBZ_DEPTH_ENABLE) {
                 uint16_t old_depth = *(uint16_t *) (&voodoo->fb_mem[write_addr_aux & voodoo->fb_mask]);
@@ -262,6 +265,10 @@ voodoo_fb_writew(uint32_t addr, uint16_t val, void *priv)
             if ((params->fbzMode & FBZ_CHROMAKEY) && write_data.r == params->chromaKey_r && write_data.g == params->chromaKey_g && write_data.b == params->chromaKey_b)
                 goto skip_pixel;
 
+            colbfog_r = write_data.r;
+            colbfog_g = write_data.g;
+            colbfog_b = write_data.b;
+
             if (params->fogMode & FOG_ENABLE) {
                 int32_t z       = new_depth << 12;
                 int64_t w_depth = (int64_t) (int32_t) new_depth;
@@ -364,6 +371,35 @@ voodoo_fb_writel(uint32_t addr, uint32_t val, void *priv)
             addr >>= 1;
             break;
 
+        case LFB_FORMAT_XRGB8888:
+            colour_data[0].b = val & 0xff;
+            colour_data[0].g = (val >> 8) & 0xff;
+            colour_data[0].r = (val >> 16) & 0xff;
+            alpha_data[0]    = 0xff;
+            write_mask       = LFB_WRITE_COLOUR;
+            addr >>= 1;
+            break;
+
+        case LFB_FORMAT_DEPTH_RGB565:
+            colour_data[0] = rgb565[val & 0xffff];
+            depth_data[0]  = val >> 16;
+            write_mask     = LFB_WRITE_BOTH;
+            count          = 1;
+            break;
+        case LFB_FORMAT_DEPTH_RGB555:
+            colour_data[0] = argb1555[val & 0xffff];
+            depth_data[0]  = val >> 16;
+            write_mask     = LFB_WRITE_BOTH;
+            count          = 1;
+            break;
+        case LFB_FORMAT_DEPTH_ARGB1555:
+            colour_data[0] = argb1555[val & 0xffff];
+            alpha_data[0]  = colour_data[0].a;
+            depth_data[0]  = val >> 16;
+            write_mask     = LFB_WRITE_BOTH;
+            count          = 1;
+            break;
+
         case LFB_FORMAT_DEPTH:
             depth_data[0] = val;
             depth_data[1] = val >> 16;
@@ -409,6 +445,9 @@ voodoo_fb_writel(uint32_t addr, uint32_t val, void *priv)
         for (int c = 0; c < count; c++) {
             rgba8_t  write_data = colour_data[c];
             uint16_t new_depth  = depth_data[c];
+            int      colbfog_r  = 0;
+            int      colbfog_g  = 0;
+            int      colbfog_b  = 0;
 
             if (params->fbzMode & FBZ_DEPTH_ENABLE) {
                 uint16_t old_depth = *(uint16_t *) (&voodoo->fb_mem[write_addr_aux & voodoo->fb_mask]);
@@ -419,6 +458,10 @@ voodoo_fb_writel(uint32_t addr, uint32_t val, void *priv)
             if ((params->fbzMode & FBZ_CHROMAKEY) && write_data.r == params->chromaKey_r && write_data.g == params->chromaKey_g && write_data.b == params->chromaKey_b)
                 goto skip_pixel;
 
+            colbfog_r = write_data.r;
+            colbfog_g = write_data.g;
+            colbfog_b = write_data.b;
+
             if (params->fogMode & FOG_ENABLE) {
                 int32_t z       = new_depth << 12;
                 int64_t w_depth = new_depth;
@@ -460,9 +503,15 @@ skip_pixel:
     } else {
         for (int c = 0; c < count; c++) {
             if (write_mask & LFB_WRITE_COLOUR)
-                *(uint16_t *) (&voodoo->fb_mem[write_addr & voodoo->fb_mask]) = do_dither(&voodoo->params, colour_data[c], (x >> 1) + c, y);
+                *(uint16_t *) (&voodoo->fb_mem[write_addr & voodoo->fb_mask]) =
+                              do_dither(&voodoo->params, colour_data[c], (x >> 1) + c, y);
             if (write_mask & LFB_WRITE_DEPTH)
                 *(uint16_t *) (&voodoo->fb_mem[write_addr_aux & voodoo->fb_mask]) = depth_data[c];
+            if (write_mask & LFB_WRITE_BOTH) {
+                *(uint16_t *) (&voodoo->fb_mem[write_addr & voodoo->fb_mask]) =
+                              do_dither(&voodoo->params, colour_data[c], (x >> 1) + c, y);
+                *(uint16_t *) (&voodoo->fb_mem[write_addr_aux & voodoo->fb_mask]) = depth_data[c];
+            }
 
             write_addr += 2;
             write_addr_aux += 2;
diff --git a/src/video/vid_voodoo_fifo.c b/src/video/vid_voodoo_fifo.c
index f8495edec..83be0f7bb 100644
--- a/src/video/vid_voodoo_fifo.c
+++ b/src/video/vid_voodoo_fifo.c
@@ -35,6 +35,7 @@
 #include <86box/video.h>
 #include <86box/vid_svga.h>
 #include <86box/vid_voodoo_common.h>
+#include <86box/vid_voodoo_banshee.h>
 #include <86box/vid_voodoo_banshee_blitter.h>
 #include <86box/vid_voodoo_fb.h>
 #include <86box/vid_voodoo_fifo.h>
@@ -166,7 +167,10 @@ cmdfifo_get(voodoo_t *voodoo)
         }
     }
 
-    val = *(uint32_t *) &voodoo->fb_mem[voodoo->cmdfifo_rp & voodoo->fb_mask];
+    if (voodoo->cmdfifo_in_agp)
+        val = mem_readl_phys(voodoo->cmdfifo_rp);
+    else
+        val = *(uint32_t *) &voodoo->fb_mem[voodoo->cmdfifo_rp & voodoo->fb_mask];
 
     if (!voodoo->cmdfifo_in_sub)
         voodoo->cmdfifo_depth_rd++;
@@ -188,6 +192,43 @@ cmdfifo_get_f(voodoo_t *voodoo)
     return tempif.f;
 }
 
+static uint32_t
+cmdfifo_get_2(voodoo_t *voodoo)
+{
+    uint32_t val;
+
+    if (!voodoo->cmdfifo_in_sub_2) {
+        while (voodoo->fifo_thread_run && (voodoo->cmdfifo_depth_rd_2 == voodoo->cmdfifo_depth_wr_2)) {
+            thread_wait_event(voodoo->wake_fifo_thread, -1);
+            thread_reset_event(voodoo->wake_fifo_thread);
+        }
+    }
+
+    if (voodoo->cmdfifo_in_agp_2)
+        val = mem_readl_phys(voodoo->cmdfifo_rp_2);
+    else
+        val = *(uint32_t *) &voodoo->fb_mem[voodoo->cmdfifo_rp_2 & voodoo->fb_mask];
+
+    if (!voodoo->cmdfifo_in_sub_2)
+        voodoo->cmdfifo_depth_rd_2++;
+    voodoo->cmdfifo_rp_2 += 4;
+
+    //        voodoo_fifo_log("  CMDFIFO get %08x\n", val);
+    return val;
+}
+
+static inline float
+cmdfifo_get_f_2(voodoo_t *voodoo)
+{
+    union {
+        uint32_t i;
+        float    f;
+    } tempif;
+
+    tempif.i = cmdfifo_get_2(voodoo);
+    return tempif.f;
+}
+
 enum {
     CMDFIFO3_PC_MASK_RGB   = (1 << 10),
     CMDFIFO3_PC_MASK_ALPHA = (1 << 11),
@@ -283,6 +324,7 @@ voodoo_fifo_thread(void *param)
         }
 
         voodoo->cmd_status |= (1 << 24);
+        voodoo->cmd_status_2 |= (1 << 24);
 
         while (voodoo->cmdfifo_enabled && (voodoo->cmdfifo_depth_rd != voodoo->cmdfifo_depth_wr || voodoo->cmdfifo_in_sub)) {
             uint64_t start_time = plat_timer_read();
@@ -327,9 +369,21 @@ voodoo_fifo_thread(void *param)
                             break;
 
                         case 3: /*JMP local frame buffer*/
-                            voodoo->cmdfifo_rp = (header >> 4) & 0xfffffc;
+                            voodoo->cmdfifo_rp     = (header >> 4) & 0xfffffc;
+                            voodoo->cmdfifo_in_agp = 0;
 #if 0
-                            voodoo_fifo_log("JMP to %08x %04x\n", voodoo->cmdfifo_rp, header);
+                            voodoo_fifo_log("JMP LFB to %08x %04x\n", voodoo->cmdfifo_rp, header);
+#endif
+                            break;
+
+                        case 4: /*JMP AGP*/
+                            if (UNLIKELY(voodoo->type < VOODOO_BANSHEE))
+                                fatal("CMDFIFO0: Not Banshee %08x\n", header);
+
+                            voodoo->cmdfifo_rp     = ((header >> 4) & 0x1fffffc) | (cmdfifo_get(voodoo) << 25);
+                            voodoo->cmdfifo_in_agp = 1;
+#if 0
+                            voodoo_fifo_log("JMP AGP to %08x %04x\n", voodoo->cmdfifo_rp, header);
 #endif
                             break;
 
@@ -538,6 +592,23 @@ voodoo_fifo_thread(void *param)
                     }
                     break;
 
+                case 6:
+                    if (UNLIKELY(voodoo->type < VOODOO_BANSHEE)) {
+                        fatal("CMDFIFO6: Not Banshee %08x %08x\n", header, voodoo->cmdfifo_rp);
+                    } else {
+                        uint32_t val = cmdfifo_get(voodoo);
+                        banshee_cmd_write(voodoo->priv, 0x00, val >> 5);            /* agpReqSize */
+                        banshee_cmd_write(voodoo->priv, 0x04, cmdfifo_get(voodoo)); /* agpHostAddressLow */
+                        banshee_cmd_write(voodoo->priv, 0x08, cmdfifo_get(voodoo)); /* agpHostAddressHigh */
+                        banshee_cmd_write(voodoo->priv, 0x0c, cmdfifo_get(voodoo)); /* agpGraphicsAddress */
+                        banshee_cmd_write(voodoo->priv, 0x10, cmdfifo_get(voodoo)); /* agpGraphicsStride */
+                        banshee_cmd_write(voodoo->priv, 0x14, (val & 0x18) | 0x00); /* agpMoveCMD - start transfer */
+#if 0
+                        voodoo_fifo_log("CMDFIFO6 addr=%08x num=%i\n", addr, banshee->agpReqSize);
+#endif
+                    }
+                    break;
+
                 default:
                     fatal("Bad CMDFIFO packet %08x %08x\n", header, voodoo->cmdfifo_rp);
             }
@@ -545,6 +616,298 @@ voodoo_fifo_thread(void *param)
             end_time = plat_timer_read();
             voodoo->time += end_time - start_time;
         }
+
+        while (voodoo->cmdfifo_enabled_2 && (voodoo->cmdfifo_depth_rd_2 != voodoo->cmdfifo_depth_wr_2 || voodoo->cmdfifo_in_sub_2)) {
+            uint64_t start_time = plat_timer_read();
+            uint64_t end_time;
+            uint32_t header = cmdfifo_get_2(voodoo);
+            uint32_t addr;
+            uint32_t mask;
+            int      smode;
+            int      num;
+            int      num_verticies;
+            int      v_num;
+
+#if 0
+            voodoo_fifo_log(" CMDFIFO header %08x at %08x\n", header, voodoo->cmdfifo_rp);
+#endif
+
+            voodoo->cmd_status_2 &= ~7;
+            voodoo->cmd_status_2 |= (header & 7);
+            voodoo->cmd_status_2 |= (1 << 11);
+            switch (header & 7) {
+                case 0:
+#if 0
+                    voodoo_fifo_log("CMDFIFO0\n");
+#endif
+                    voodoo->cmd_status_2 = (voodoo->cmd_status_2 & 0xffff8fff) | (((header >> 3) & 7) << 12);
+                    switch ((header >> 3) & 7) {
+                        case 0: /*NOP*/
+                            break;
+
+                        case 1: /*JSR*/
+#if 0
+                            voodoo_fifo_log("JSR %08x\n", (header >> 4) & 0xfffffc);
+#endif
+                            voodoo->cmdfifo_ret_addr_2 = voodoo->cmdfifo_rp_2;
+                            voodoo->cmdfifo_rp_2       = (header >> 4) & 0xfffffc;
+                            voodoo->cmdfifo_in_sub_2   = 1;
+                            break;
+
+                        case 2: /*RET*/
+                            voodoo->cmdfifo_rp_2     = voodoo->cmdfifo_ret_addr_2;
+                            voodoo->cmdfifo_in_sub_2 = 0;
+                            break;
+
+                        case 3: /*JMP local frame buffer*/
+                            voodoo->cmdfifo_rp_2     = (header >> 4) & 0xfffffc;
+                            voodoo->cmdfifo_in_agp_2 = 0;
+#if 0
+                            voodoo_fifo_log("JMP LFB to %08x %04x\n", voodoo->cmdfifo_rp_2, header);
+#endif
+                            break;
+
+                        case 4: /*JMP AGP*/
+                            if (UNLIKELY(voodoo->type < VOODOO_BANSHEE))
+                                fatal("CMDFIFO0: Not Banshee %08x\n", header);
+
+                            voodoo->cmdfifo_rp_2     = ((header >> 4) & 0x1fffffc) | (cmdfifo_get_2(voodoo) << 25);
+                            voodoo->cmdfifo_in_agp_2 = 1;
+#if 0
+                            voodoo_fifo_log("JMP AGP to %08x %04x\n", voodoo->cmdfifo_rp_2, header);
+#endif
+                            break;
+
+                        default:
+                            fatal("Bad CMDFIFO0 %08x\n", header);
+                    }
+                    voodoo->cmd_status_2 = (voodoo->cmd_status_2 & ~(1 << 27)) | (voodoo->cmdfifo_in_sub_2 << 27);
+                    break;
+
+                case 1:
+                    num  = header >> 16;
+                    addr = (header & 0x7ff8) >> 1;
+#if 0
+                    voodoo_fifo_log("CMDFIFO1 addr=%08x\n",addr);
+#endif
+                    while (num--) {
+                        uint32_t val = cmdfifo_get_2(voodoo);
+                        if ((addr & (1 << 13)) && voodoo->type >= VOODOO_BANSHEE) {
+#if 0
+                            if (voodoo->type != VOODOO_BANSHEE)
+                                fatal("CMDFIFO1: Not Banshee\n");
+#endif
+
+#if 0
+                            voodoo_fifo_log("CMDFIFO1: write %08x %08x\n", addr, val);
+#endif
+                            voodoo_2d_reg_writel(voodoo, addr, val);
+                        } else {
+                            if ((addr & 0x3ff) == SST_triangleCMD || (addr & 0x3ff) == SST_ftriangleCMD || (addr & 0x3ff) == SST_fastfillCMD || (addr & 0x3ff) == SST_nopCMD)
+                                voodoo->cmd_written_fifo_2++;
+
+                            if (voodoo->type >= VOODOO_BANSHEE && (addr & 0x3ff) == SST_swapbufferCMD)
+                                voodoo->cmd_written_fifo_2++;
+                            voodoo_reg_writel(addr, val, voodoo);
+                        }
+
+                        if (header & (1 << 15))
+                            addr += 4;
+                    }
+                    break;
+
+                case 2:
+                    if (voodoo->type < VOODOO_2)
+                        fatal("CMDFIFO2: Not Voodoo 2\n");
+                    mask = (header >> 3);
+                    addr = 8;
+                    while (mask) {
+                        if (mask & 1) {
+                            uint32_t val = cmdfifo_get_2(voodoo);
+
+                            voodoo_2d_reg_writel(voodoo, addr, val);
+                        }
+
+                        addr += 4;
+                        mask >>= 1;
+                    }
+                    break;
+
+                case 3:
+                    num   = (header >> 29) & 7;
+                    mask  = header; //(header >> 10) & 0xff;
+                    smode = (header >> 22) & 0xf;
+                    voodoo_reg_writel(SST_sSetupMode, ((header >> 10) & 0xff) | (smode << 16), voodoo);
+                    num_verticies = (header >> 6) & 0xf;
+                    v_num         = 0;
+                    if (((header >> 3) & 7) == 2)
+                        v_num = 1;
+#if 0
+                    voodoo_fifo_log("CMDFIFO3: num=%i verts=%i mask=%02x\n", num, num_verticies, (header >> 10) & 0xff);
+                    voodoo_fifo_log("CMDFIFO3 %02x %i\n", (header >> 10), (header >> 3) & 7);
+#endif
+
+                    while (num_verticies--) {
+                        voodoo->verts[3].sVx = cmdfifo_get_f_2(voodoo);
+                        voodoo->verts[3].sVy = cmdfifo_get_f_2(voodoo);
+                        if (mask & CMDFIFO3_PC_MASK_RGB) {
+                            if (header & CMDFIFO3_PC) {
+                                uint32_t val            = cmdfifo_get_2(voodoo);
+                                voodoo->verts[3].sBlue  = (float) (val & 0xff);
+                                voodoo->verts[3].sGreen = (float) ((val >> 8) & 0xff);
+                                voodoo->verts[3].sRed   = (float) ((val >> 16) & 0xff);
+                                voodoo->verts[3].sAlpha = (float) ((val >> 24) & 0xff);
+                            } else {
+                                voodoo->verts[3].sRed   = cmdfifo_get_f_2(voodoo);
+                                voodoo->verts[3].sGreen = cmdfifo_get_f_2(voodoo);
+                                voodoo->verts[3].sBlue  = cmdfifo_get_f_2(voodoo);
+                            }
+                        }
+                        if ((mask & CMDFIFO3_PC_MASK_ALPHA) && !(header & CMDFIFO3_PC))
+                            voodoo->verts[3].sAlpha = cmdfifo_get_f_2(voodoo);
+                        if (mask & CMDFIFO3_PC_MASK_Z)
+                            voodoo->verts[3].sVz = cmdfifo_get_f_2(voodoo);
+                        if (mask & CMDFIFO3_PC_MASK_Wb)
+                            voodoo->verts[3].sWb = cmdfifo_get_f_2(voodoo);
+                        if (mask & CMDFIFO3_PC_MASK_W0)
+                            voodoo->verts[3].sW0 = cmdfifo_get_f_2(voodoo);
+                        if (mask & CMDFIFO3_PC_MASK_S0_T0) {
+                            voodoo->verts[3].sS0 = cmdfifo_get_f_2(voodoo);
+                            voodoo->verts[3].sT0 = cmdfifo_get_f_2(voodoo);
+                        }
+                        if (mask & CMDFIFO3_PC_MASK_W1)
+                            voodoo->verts[3].sW1 = cmdfifo_get_f_2(voodoo);
+                        if (mask & CMDFIFO3_PC_MASK_S1_T1) {
+                            voodoo->verts[3].sS1 = cmdfifo_get_f_2(voodoo);
+                            voodoo->verts[3].sT1 = cmdfifo_get_f_2(voodoo);
+                        }
+                        if (v_num)
+                            voodoo_reg_writel(SST_sDrawTriCMD, 0, voodoo);
+                        else
+                            voodoo_reg_writel(SST_sBeginTriCMD, 0, voodoo);
+                        v_num++;
+                        if (v_num == 3 && ((header >> 3) & 7) == 0)
+                            v_num = 0;
+                    }
+                    while (num--)
+                        cmdfifo_get_2(voodoo);
+                    break;
+
+                case 4:
+                    num  = (header >> 29) & 7;
+                    mask = (header >> 15) & 0x3fff;
+                    addr = (header & 0x7ff8) >> 1;
+#if 0
+                    voodoo_fifo_log("CMDFIFO4 addr=%08x\n",addr);
+#endif
+                    while (mask) {
+                        if (mask & 1) {
+                            uint32_t val = cmdfifo_get_2(voodoo);
+
+                            if ((addr & (1 << 13)) && voodoo->type >= VOODOO_BANSHEE) {
+                                if (voodoo->type < VOODOO_BANSHEE)
+                                    fatal("CMDFIFO1: Not Banshee\n");
+#if 0
+                                voodoo_fifo_log("CMDFIFO1: write %08x %08x\n", addr, val);
+#endif
+
+                                voodoo_2d_reg_writel(voodoo, addr, val);
+                            } else {
+                                if ((addr & 0x3ff) == SST_triangleCMD || (addr & 0x3ff) == SST_ftriangleCMD || (addr & 0x3ff) == SST_fastfillCMD || (addr & 0x3ff) == SST_nopCMD)
+                                    voodoo->cmd_written_fifo_2++;
+
+                                if (voodoo->type >= VOODOO_BANSHEE && (addr & 0x3ff) == SST_swapbufferCMD)
+                                    voodoo->cmd_written_fifo_2++;
+                                voodoo_reg_writel(addr, val, voodoo);
+                            }
+                        }
+
+                        addr += 4;
+                        mask >>= 1;
+                    }
+                    while (num--)
+                        cmdfifo_get_2(voodoo);
+                    break;
+
+                case 5:
+#if 0
+                    if (header & 0x3fc00000)
+                        fatal("CMDFIFO packet 5 has byte disables set %08x\n", header);
+#endif
+                    num  = (header >> 3) & 0x7ffff;
+                    addr = cmdfifo_get_2(voodoo) & 0xffffff;
+                    if (!num)
+                        num = 1;
+#if 0
+                    voodoo_fifo_log("CMDFIFO5 addr=%08x num=%i\n", addr, num);
+#endif
+                    switch (header >> 30) {
+                        case 0: /*Linear framebuffer (Banshee)*/
+                        case 1: /*Planar YUV*/
+                            if (voodoo->texture_present[0][(addr & voodoo->texture_mask) >> TEX_DIRTY_SHIFT]) {
+#if 0
+                                voodoo_fifo_log("texture_present at %08x %i\n", addr, (addr & voodoo->texture_mask) >> TEX_DIRTY_SHIFT);
+#endif
+                                flush_texture_cache(voodoo, addr & voodoo->texture_mask, 0);
+                            }
+                            if (voodoo->texture_present[1][(addr & voodoo->texture_mask) >> TEX_DIRTY_SHIFT]) {
+#if 0
+                                voodoo_fifo_log("texture_present at %08x %i\n", addr, (addr & voodoo->texture_mask) >> TEX_DIRTY_SHIFT);
+#endif
+                                flush_texture_cache(voodoo, addr & voodoo->texture_mask, 1);
+                            }
+                            while (num--) {
+                                uint32_t val = cmdfifo_get_2(voodoo);
+                                if (addr <= voodoo->fb_mask)
+                                    *(uint32_t *) &voodoo->fb_mem[addr] = val;
+                                addr += 4;
+                            }
+                            break;
+                        case 2: /*Framebuffer*/
+                            while (num--) {
+                                uint32_t val = cmdfifo_get_2(voodoo);
+                                voodoo_fb_writel(addr, val, voodoo);
+                                addr += 4;
+                            }
+                            break;
+                        case 3: /*Texture*/
+                            while (num--) {
+                                uint32_t val = cmdfifo_get_2(voodoo);
+                                voodoo_tex_writel(addr, val, voodoo);
+                                addr += 4;
+                            }
+                            break;
+
+                        default:
+                            fatal("CMDFIFO packet 5 bad space %08x %08x\n", header, voodoo->cmdfifo_rp);
+                    }
+                    break;
+
+                case 6:
+                    if (UNLIKELY(voodoo->type < VOODOO_BANSHEE)) {
+                        fatal("CMDFIFO6: Not Banshee %08x %08x\n", header, voodoo->cmdfifo_rp);
+                    } else {
+                        uint32_t val = cmdfifo_get_2(voodoo);
+                        banshee_cmd_write(voodoo->priv, 0x00, val >> 5);              /* agpReqSize */
+                        banshee_cmd_write(voodoo->priv, 0x04, cmdfifo_get_2(voodoo)); /* agpHostAddressLow */
+                        banshee_cmd_write(voodoo->priv, 0x08, cmdfifo_get_2(voodoo)); /* agpHostAddressHigh */
+                        banshee_cmd_write(voodoo->priv, 0x0c, cmdfifo_get_2(voodoo)); /* agpGraphicsAddress */
+                        banshee_cmd_write(voodoo->priv, 0x10, cmdfifo_get_2(voodoo)); /* agpGraphicsStride */
+                        banshee_cmd_write(voodoo->priv, 0x14, (val & 0x18) | 0x20);   /* agpMoveCMD - start transfer */
+#if 0
+                        voodoo_fifo_log("CMDFIFO6 addr=%08x num=%i\n", addr, banshee->agpReqSize);
+#endif
+                    }
+                    break;
+
+                default:
+                    fatal("Bad CMDFIFO packet %08x %08x\n", header, voodoo->cmdfifo_rp);
+            }
+
+            end_time = plat_timer_read();
+            voodoo->time += end_time - start_time;
+        }
+
         voodoo->voodoo_busy = 0;
     }
 }
diff --git a/src/video/vid_voodoo_reg.c b/src/video/vid_voodoo_reg.c
index ce3ee6064..82dfde354 100644
--- a/src/video/vid_voodoo_reg.c
+++ b/src/video/vid_voodoo_reg.c
@@ -965,10 +965,12 @@ voodoo_reg_writel(uint32_t addr, uint32_t val, void *priv)
             if (chip & CHIP_TREX0) {
                 voodoo->params.textureMode[0] = val;
                 voodoo->params.tformat[0]     = (val >> 8) & 0xf;
+                voodoo_recalc_tex(voodoo, 0);
             }
             if (chip & CHIP_TREX1) {
                 voodoo->params.textureMode[1] = val;
                 voodoo->params.tformat[1]     = (val >> 8) & 0xf;
+                voodoo_recalc_tex(voodoo, 1);
             }
             break;
         case SST_tLOD:
diff --git a/src/video/vid_voodoo_render.c b/src/video/vid_voodoo_render.c
index 42426744a..cc52fc61a 100644
--- a/src/video/vid_voodoo_render.c
+++ b/src/video/vid_voodoo_render.c
@@ -43,8 +43,7 @@
 typedef struct voodoo_state_t {
     int      xstart, xend, xdir;
     uint32_t base_r, base_g, base_b, base_a, base_z;
-    struct
-    {
+    struct {
         int64_t base_s, base_t, base_w;
         int     lod;
     } tmu[2];
@@ -967,6 +966,9 @@ voodoo_half_triangle(voodoo_t *voodoo, voodoo_params_t *params, voodoo_state_t *
                     int      src_g = 0;
                     int      src_b = 0;
                     int      src_a = 0;
+                    int      colbfog_r = 0;
+                    int      colbfog_g = 0;
+                    int      colbfog_b = 0;
                     int      msel_r;
                     int      msel_g;
                     int      msel_b;
@@ -1263,6 +1265,10 @@ voodoo_half_triangle(voodoo_t *voodoo, voodoo_params_t *params, voodoo_state_t *
                     if (cca_invert_output)
                         src_a ^= 0xff;
 
+                    colbfog_r = src_r;
+                    colbfog_g = src_g;
+                    colbfog_b = src_b;
+
                     if (params->fogMode & FOG_ENABLE)
                         APPLY_FOG(src_r, src_g, src_b, state->z, state->ia, state->w);
 
@@ -1394,7 +1400,7 @@ next_line:
 void
 voodoo_triangle(voodoo_t *voodoo, voodoo_params_t *params, int odd_even)
 {
-    voodoo_state_t state;
+    voodoo_state_t state = { 0 };
     int            vertexAy_adjusted;
     int            vertexCy_adjusted;
     int            dx;
@@ -1406,6 +1412,8 @@ voodoo_triangle(voodoo_t *voodoo, voodoo_params_t *params, int odd_even)
     int      LOD;
     int      lodbias;
 
+    state.dx1 = state.dx2 = 0;
+
     voodoo->tri_count++;
 
     dx = 8 - (params->vertexAx & 0xf);
@@ -1415,11 +1423,14 @@ voodoo_triangle(voodoo_t *voodoo, voodoo_params_t *params, int odd_even)
     if ((params->vertexAy & 0xf) > 8)
         dy += 16;
 
-    /*        voodoo_render_log("voodoo_triangle %i %i %i : vA %f, %f  vB %f, %f  vC %f, %f f %i,%i %08x %08x %08x,%08x tex=%i,%i fogMode=%08x\n", odd_even, voodoo->params_read_idx[odd_even], voodoo->params_read_idx[odd_even] & PARAM_MASK, (float)params->vertexAx / 16.0, (float)params->vertexAy / 16.0,
-                                                                         (float)params->vertexBx / 16.0, (float)params->vertexBy / 16.0,
-                                                                         (float)params->vertexCx / 16.0, (float)params->vertexCy / 16.0,
-                                                                         (params->fbzColorPath & FBZCP_TEXTURE_ENABLED) ? params->tformat[0] : 0,
-                                                                         (params->fbzColorPath & FBZCP_TEXTURE_ENABLED) ? params->tformat[1] : 0, params->fbzColorPath, params->alphaMode, params->textureMode[0],params->textureMode[1], params->tex_entry[0],params->tex_entry[1], params->fogMode);*/
+#if 0
+voodoo_render_log("voodoo_triangle %i %i %i : vA %f, %f  vB %f, %f  vC %f, %f f %i,%i %08x %08x %08x,%08x tex=%i,%i fogMode=%08x\n",
+                  odd_even, voodoo->params_read_idx[odd_even], voodoo->params_read_idx[odd_even] & PARAM_MASK, (float)params->vertexAx / 16.0, (float)params->vertexAy / 16.0,
+                  (float)params->vertexBx / 16.0, (float)params->vertexBy / 16.0,
+                  (float)params->vertexCx / 16.0, (float)params->vertexCy / 16.0,
+                  (params->fbzColorPath & FBZCP_TEXTURE_ENABLED) ? params->tformat[0] : 0,
+                  (params->fbzColorPath & FBZCP_TEXTURE_ENABLED) ? params->tformat[1] : 0, params->fbzColorPath, params->alphaMode, params->textureMode[0],params->textureMode[1], params->tex_entry[0],params->tex_entry[1], params->fogMode);
+#endif
 
     state.base_r        = params->startR;
     state.base_g        = params->startG;
diff --git a/src/video/vid_voodoo_setup.c b/src/video/vid_voodoo_setup.c
index e1d13ba35..11f4ff861 100644
--- a/src/video/vid_voodoo_setup.c
+++ b/src/video/vid_voodoo_setup.c
@@ -191,8 +191,8 @@ voodoo_triangle_setup(voodoo_t *voodoo)
         voodoo->params.dWdX          = (int64_t) (((verts[va].sWb - verts[vb].sWb) * dyBC - (verts[vb].sWb - verts[vc].sWb) * dyAB) * 4294967296.0f);
         voodoo->params.dWdY          = (int64_t) (((verts[vb].sWb - verts[vc].sWb) * dxAB - (verts[va].sWb - verts[vb].sWb) * dxBC) * 4294967296.0f);
         voodoo->params.tmu[0].startW = voodoo->params.tmu[1].startW = voodoo->params.startW;
-        voodoo->params.tmu[0].dWdX = voodoo->params.tmu[1].dWdX = voodoo->params.dWdX;
-        voodoo->params.tmu[0].dWdY = voodoo->params.tmu[1].dWdY = voodoo->params.dWdY;
+        voodoo->params.tmu[0].dWdX   = voodoo->params.tmu[1].dWdX = voodoo->params.dWdX;
+        voodoo->params.tmu[0].dWdY   = voodoo->params.tmu[1].dWdY = voodoo->params.dWdY;
     }
     if (voodoo->sSetupMode & SETUPMODE_W0) {
         voodoo->params.tmu[0].startW = (int64_t) (verts[va].sW0 * 4294967296.0f);
diff --git a/src/video/vid_voodoo_texture.c b/src/video/vid_voodoo_texture.c
index 3939db3cd..f6894ec0f 100644
--- a/src/video/vid_voodoo_texture.c
+++ b/src/video/vid_voodoo_texture.c
@@ -61,10 +61,10 @@ voodoo_texture_log(const char *fmt, ...)
 void
 voodoo_recalc_tex12(voodoo_t *voodoo, int tmu)
 {
-    int      aspect = (voodoo->params.tLOD[tmu] >> 21) & 3;
-    int      width = 256;
-    int      height = 256;
-    int      shift = 8;
+    int      aspect  = (voodoo->params.tLOD[tmu] >> 21) & 3;
+    int      width   = 256;
+    int      height  = 256;
+    int      shift   = 8;
     uint32_t base    = voodoo->params.texBaseAddr[tmu];
     uint32_t offset  = 0;
     int      tex_lod = 0;
diff --git a/src/video/vid_wy700.c b/src/video/vid_wy700.c
index 600fa21a8..c00541113 100644
--- a/src/video/vid_wy700.c
+++ b/src/video/vid_wy700.c
@@ -212,9 +212,9 @@ typedef struct wy700_t {
 } wy700_t;
 
 /* Mapping of attributes to colours, in CGA emulation... */
-static int cgacols[256][2][2];
+static int cga_attr_to_color_table[256][2][2];
 /* ... and MDA emulation. */
-static int mdacols[256][2][2];
+static int mda_attr_to_color_table[256][2][2];
 
 void    wy700_recalctimings(wy700_t *wy700);
 void    wy700_write(uint32_t addr, uint8_t val, void *priv);
@@ -535,9 +535,9 @@ wy700_textline(wy700_t *wy700)
     int            cursorline;
     int            mda = 0;
     uint16_t       addr;
-    uint8_t        sc;
-    uint16_t       ma = (wy700->cga_crtc[13] | (wy700->cga_crtc[12] << 8)) & 0x3fff;
-    uint16_t       ca = (wy700->cga_crtc[15] | (wy700->cga_crtc[14] << 8)) & 0x3fff;
+    uint8_t        scanline;
+    uint16_t       memaddr = (wy700->cga_crtc[13] | (wy700->cga_crtc[12] << 8)) & 0x3fff;
+    uint16_t       cursoraddr = (wy700->cga_crtc[15] | (wy700->cga_crtc[14] << 8)) & 0x3fff;
 
     /* The fake CRTC character height register selects whether MDA or CGA
      * attributes are used */
@@ -548,41 +548,41 @@ wy700_textline(wy700_t *wy700)
     if (wy700->font) {
         fontbase += 256 * 32;
     }
-    addr = ((ma & ~1) + (wy700->displine >> 5) * w) * 2;
-    sc   = (wy700->displine >> 1) & 15;
+    addr = ((memaddr & ~1) + (wy700->displine >> 5) * w) * 2;
+    scanline   = (wy700->displine >> 1) & 15;
 
-    ma += ((wy700->displine >> 5) * w);
+    memaddr += ((wy700->displine >> 5) * w);
 
     if ((wy700->real_crtc[10] & 0x60) == 0x20) {
         cursorline = 0;
     } else {
-        cursorline = ((wy700->real_crtc[10] & 0x1F) <= sc) && ((wy700->real_crtc[11] & 0x1F) >= sc);
+        cursorline = ((wy700->real_crtc[10] & 0x1F) <= scanline) && ((wy700->real_crtc[11] & 0x1F) >= scanline);
     }
 
     for (int x = 0; x < w; x++) {
         chr        = wy700->vram[(addr + 2 * x) & 0x3FFF];
         attr       = wy700->vram[(addr + 2 * x + 1) & 0x3FFF];
-        drawcursor = ((ma == ca) && cursorline && wy700->enabled && (wy700->cga_ctrl & 8) && (wy700->blink & 16));
+        drawcursor = ((memaddr == cursoraddr) && cursorline && wy700->enabled && (wy700->cga_ctrl & 8) && (wy700->blink & 16));
         blink      = ((wy700->blink & 16) && (wy700->cga_ctrl & 0x20) && (attr & 0x80) && !drawcursor);
 
         if (wy700->cga_ctrl & 0x20)
             attr &= 0x7F;
         /* MDA underline */
-        if (sc == 14 && mda && ((attr & 7) == 1)) {
+        if (scanline == 14 && mda && ((attr & 7) == 1)) {
             for (c = 0; c < cw; c++)
-                buffer32->line[wy700->displine][(x * cw) + c] = mdacols[attr][blink][1];
+                buffer32->line[wy700->displine][(x * cw) + c] = mda_attr_to_color_table[attr][blink][1];
         } else /* Draw 16 pixels of character */
         {
-            bitmap[0] = fontbase[chr * 32 + 2 * sc];
-            bitmap[1] = fontbase[chr * 32 + 2 * sc + 1];
+            bitmap[0] = fontbase[chr * 32 + 2 * scanline];
+            bitmap[1] = fontbase[chr * 32 + 2 * scanline + 1];
             for (c = 0; c < 16; c++) {
                 int col;
                 if (c < 8)
-                    col = (mda ? mdacols : cgacols)[attr][blink][(bitmap[0] & (1 << (c ^ 7))) ? 1 : 0];
+                    col = (mda ? mda_attr_to_color_table : cga_attr_to_color_table)[attr][blink][(bitmap[0] & (1 << (c ^ 7))) ? 1 : 0];
                 else
-                    col = (mda ? mdacols : cgacols)[attr][blink][(bitmap[1] & (1 << ((c & 7) ^ 7))) ? 1 : 0];
+                    col = (mda ? mda_attr_to_color_table : cga_attr_to_color_table)[attr][blink][(bitmap[1] & (1 << ((c & 7) ^ 7))) ? 1 : 0];
                 if (!(wy700->enabled) || !(wy700->cga_ctrl & 8))
-                    col = mdacols[0][0][0];
+                    col = mda_attr_to_color_table[0][0][0];
                 if (w == 40) {
                     buffer32->line[wy700->displine][(x * cw) + 2 * c]     = col;
                     buffer32->line[wy700->displine][(x * cw) + 2 * c + 1] = col;
@@ -592,9 +592,9 @@ wy700_textline(wy700_t *wy700)
 
             if (drawcursor) {
                 for (c = 0; c < cw; c++)
-                    buffer32->line[wy700->displine][(x * cw) + c] ^= (mda ? mdacols : cgacols)[attr][0][1];
+                    buffer32->line[wy700->displine][(x * cw) + c] ^= (mda ? mda_attr_to_color_table : cga_attr_to_color_table)[attr][0][1];
             }
-            ++ma;
+            ++memaddr;
         }
     }
 }
@@ -608,8 +608,8 @@ wy700_cgaline(wy700_t *wy700)
     uint8_t  ink = 0;
     uint16_t addr;
 
-    uint16_t ma = (wy700->cga_crtc[13] | (wy700->cga_crtc[12] << 8)) & 0x3fff;
-    addr        = ((wy700->displine >> 2) & 1) * 0x2000 + (wy700->displine >> 3) * 80 + ((ma & ~1) << 1);
+    uint16_t memaddr = (wy700->cga_crtc[13] | (wy700->cga_crtc[12] << 8)) & 0x3fff;
+    addr        = ((wy700->displine >> 2) & 1) * 0x2000 + (wy700->displine >> 3) * 80 + ((memaddr & ~1) << 1);
 
     /* The fixed mode setting here programs the real CRTC with a screen
      * width to 20, so draw in 20 fixed chunks of 4 bytes each */
@@ -902,74 +902,74 @@ wy700_init(UNUSED(const device_t *info))
     /* Set up the emulated attributes.
      * CGA is done in four groups: 00-0F, 10-7F, 80-8F, 90-FF */
     for (c = 0; c < 0x10; c++) {
-        cgacols[c][0][0] = cgacols[c][1][0] = cgacols[c][1][1] = 16;
+        cga_attr_to_color_table[c][0][0] = cga_attr_to_color_table[c][1][0] = cga_attr_to_color_table[c][1][1] = 16;
         if (c & 8)
-            cgacols[c][0][1] = 15 + 16;
+            cga_attr_to_color_table[c][0][1] = 15 + 16;
         else
-            cgacols[c][0][1] = 7 + 16;
+            cga_attr_to_color_table[c][0][1] = 7 + 16;
     }
     for (c = 0x10; c < 0x80; c++) {
-        cgacols[c][0][0] = cgacols[c][1][0] = cgacols[c][1][1] = 16 + 7;
+        cga_attr_to_color_table[c][0][0] = cga_attr_to_color_table[c][1][0] = cga_attr_to_color_table[c][1][1] = 16 + 7;
         if (c & 8)
-            cgacols[c][0][1] = 15 + 16;
+            cga_attr_to_color_table[c][0][1] = 15 + 16;
         else
-            cgacols[c][0][1] = 0 + 16;
+            cga_attr_to_color_table[c][0][1] = 0 + 16;
 
         if ((c & 0x0F) == 8)
-            cgacols[c][0][1] = 8 + 16;
+            cga_attr_to_color_table[c][0][1] = 8 + 16;
     }
     /* With special cases for 00, 11, 22, ... 77 */
-    cgacols[0x00][0][1] = cgacols[0x00][1][1] = 16;
+    cga_attr_to_color_table[0x00][0][1] = cga_attr_to_color_table[0x00][1][1] = 16;
     for (c = 0x11; c <= 0x77; c += 0x11) {
-        cgacols[c][0][1] = cgacols[c][1][1] = 16 + 7;
+        cga_attr_to_color_table[c][0][1] = cga_attr_to_color_table[c][1][1] = 16 + 7;
     }
     for (c = 0x80; c < 0x90; c++) {
-        cgacols[c][0][0] = 16 + 8;
+        cga_attr_to_color_table[c][0][0] = 16 + 8;
         if (c & 8)
-            cgacols[c][0][1] = 15 + 16;
+            cga_attr_to_color_table[c][0][1] = 15 + 16;
         else
-            cgacols[c][0][1] = 7 + 16;
-        cgacols[c][1][0] = cgacols[c][1][1] = cgacols[c - 0x80][0][0];
+            cga_attr_to_color_table[c][0][1] = 7 + 16;
+        cga_attr_to_color_table[c][1][0] = cga_attr_to_color_table[c][1][1] = cga_attr_to_color_table[c - 0x80][0][0];
     }
     for (c = 0x90; c < 0x100; c++) {
-        cgacols[c][0][0] = 16 + 15;
+        cga_attr_to_color_table[c][0][0] = 16 + 15;
         if (c & 8)
-            cgacols[c][0][1] = 8 + 16;
+            cga_attr_to_color_table[c][0][1] = 8 + 16;
         else
-            cgacols[c][0][1] = 7 + 16;
+            cga_attr_to_color_table[c][0][1] = 7 + 16;
         if ((c & 0x0F) == 0)
-            cgacols[c][0][1] = 16;
-        cgacols[c][1][0] = cgacols[c][1][1] = cgacols[c - 0x80][0][0];
+            cga_attr_to_color_table[c][0][1] = 16;
+        cga_attr_to_color_table[c][1][0] = cga_attr_to_color_table[c][1][1] = cga_attr_to_color_table[c - 0x80][0][0];
     }
     /* Also special cases for 99, AA, ..., FF */
     for (c = 0x99; c <= 0xFF; c += 0x11) {
-        cgacols[c][0][1] = 16 + 15;
+        cga_attr_to_color_table[c][0][1] = 16 + 15;
     }
     /* Special cases for 08, 80 and 88 */
-    cgacols[0x08][0][1] = 16 + 8;
-    cgacols[0x80][0][1] = 16;
-    cgacols[0x88][0][1] = 16 + 8;
+    cga_attr_to_color_table[0x08][0][1] = 16 + 8;
+    cga_attr_to_color_table[0x80][0][1] = 16;
+    cga_attr_to_color_table[0x88][0][1] = 16 + 8;
 
     /* MDA attributes */
     for (c = 0; c < 256; c++) {
-        mdacols[c][0][0] = mdacols[c][1][0] = mdacols[c][1][1] = 16;
+        mda_attr_to_color_table[c][0][0] = mda_attr_to_color_table[c][1][0] = mda_attr_to_color_table[c][1][1] = 16;
         if (c & 8)
-            mdacols[c][0][1] = 15 + 16;
+            mda_attr_to_color_table[c][0][1] = 15 + 16;
         else
-            mdacols[c][0][1] = 7 + 16;
+            mda_attr_to_color_table[c][0][1] = 7 + 16;
     }
-    mdacols[0x70][0][1] = 16;
-    mdacols[0x70][0][0] = mdacols[0x70][1][0] = mdacols[0x70][1][1] = 16 + 15;
-    mdacols[0xF0][0][1]                                             = 16;
-    mdacols[0xF0][0][0] = mdacols[0xF0][1][0] = mdacols[0xF0][1][1] = 16 + 15;
-    mdacols[0x78][0][1]                                             = 16 + 7;
-    mdacols[0x78][0][0] = mdacols[0x78][1][0] = mdacols[0x78][1][1] = 16 + 15;
-    mdacols[0xF8][0][1]                                             = 16 + 7;
-    mdacols[0xF8][0][0] = mdacols[0xF8][1][0] = mdacols[0xF8][1][1] = 16 + 15;
-    mdacols[0x00][0][1] = mdacols[0x00][1][1] = 16;
-    mdacols[0x08][0][1] = mdacols[0x08][1][1] = 16;
-    mdacols[0x80][0][1] = mdacols[0x80][1][1] = 16;
-    mdacols[0x88][0][1] = mdacols[0x88][1][1] = 16;
+    mda_attr_to_color_table[0x70][0][1] = 16;
+    mda_attr_to_color_table[0x70][0][0] = mda_attr_to_color_table[0x70][1][0] = mda_attr_to_color_table[0x70][1][1] = 16 + 15;
+    mda_attr_to_color_table[0xF0][0][1]                                             = 16;
+    mda_attr_to_color_table[0xF0][0][0] = mda_attr_to_color_table[0xF0][1][0] = mda_attr_to_color_table[0xF0][1][1] = 16 + 15;
+    mda_attr_to_color_table[0x78][0][1]                                             = 16 + 7;
+    mda_attr_to_color_table[0x78][0][0] = mda_attr_to_color_table[0x78][1][0] = mda_attr_to_color_table[0x78][1][1] = 16 + 15;
+    mda_attr_to_color_table[0xF8][0][1]                                             = 16 + 7;
+    mda_attr_to_color_table[0xF8][0][0] = mda_attr_to_color_table[0xF8][1][0] = mda_attr_to_color_table[0xF8][1][1] = 16 + 15;
+    mda_attr_to_color_table[0x00][0][1] = mda_attr_to_color_table[0x00][1][1] = 16;
+    mda_attr_to_color_table[0x08][0][1] = mda_attr_to_color_table[0x08][1][1] = 16;
+    mda_attr_to_color_table[0x80][0][1] = mda_attr_to_color_table[0x80][1][1] = 16;
+    mda_attr_to_color_table[0x88][0][1] = mda_attr_to_color_table[0x88][1][1] = 16;
 
     /* Start off in 80x25 text mode */
     wy700->cga_stat   = 0xF4;
@@ -1004,7 +1004,7 @@ const device_t wy700_device = {
     .init          = wy700_init,
     .close         = wy700_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = wy700_speed_changed,
     .force_redraw  = NULL,
     .config        = NULL
diff --git a/src/video/vid_xga.c b/src/video/vid_xga.c
index fad5e4124..a91a893df 100644
--- a/src/video/vid_xga.c
+++ b/src/video/vid_xga.c
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include <86box/bswap.h>
+//#include <86box/bswap.h>
 #include <86box/86box.h>
 #include <86box/io.h>
 #include <86box/machine.h>
@@ -35,13 +35,14 @@
 #include <86box/vid_svga_render.h>
 #include <86box/vid_xga_device.h>
 #include "cpu.h"
+#include <86box/plat.h>
 #include <86box/plat_unused.h>
 
 #define XGA_BIOS_PATH       "roms/video/xga/XGA_37F9576_Ver200.BIN"
 #define XGA2_BIOS_PATH      "roms/video/xga/xga2_v300.bin"
 #define INMOS_XGA_BIOS_PATH "roms/video/xga/InMOS XGA - Fairchild NM27C256Q-150.BIN"
 
-static video_timings_t timing_xga_isa = { .type = VIDEO_ISA, .write_b = 3, .write_w = 3, .write_l = 6, .read_b = 5, .read_w = 5, .read_l = 10 };
+static video_timings_t timing_xga_isa = { .type = VIDEO_ISA, .write_b = 3, .write_w = 3, .write_l =  6, .read_b = 5, .read_w = 5, .read_l = 10 };
 static video_timings_t timing_xga_mca = { .type = VIDEO_MCA, .write_b = 4, .write_w = 5, .write_l = 10, .read_b = 5, .read_w = 5, .read_l = 10 };
 
 static void    xga_ext_outb(uint16_t addr, uint8_t val, void *priv);
@@ -54,6 +55,13 @@ static void xga_render_4bpp(svga_t *svga);
 static void xga_render_8bpp(svga_t *svga);
 static void xga_render_16bpp(svga_t *svga);
 
+static void xga_write(uint32_t addr, uint8_t val, void *priv);
+static void xga_writew(uint32_t addr, uint16_t val, void *priv);
+static void xga_writel(uint32_t addr, uint32_t val, void *priv);
+static uint8_t xga_read(uint32_t addr, void *priv);
+static uint16_t xga_readw(uint32_t addr, void *priv);
+static uint32_t xga_readl(uint32_t addr, void *priv);
+
 int xga_active = 0;
 
 #ifdef ENABLE_XGA_LOG
@@ -100,7 +108,7 @@ svga_xga_out(uint16_t addr, uint8_t val, void *priv)
                 if (svga->crtcreg < 0xe || svga->crtcreg > 0x10) {
                     if ((svga->crtcreg == 0xc) || (svga->crtcreg == 0xd)) {
                         svga->fullchange = 3;
-                        svga->ma_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
+                        svga->memaddr_latch   = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
                     } else {
                         svga->fullchange = changeframecount;
                         svga_recalctimings(svga);
@@ -151,37 +159,157 @@ xga_updatemapping(svga_t *svga)
             xga->aperture_cntl, xga->access_mode, svga->gdcreg[6] & 0x0c,
             xga->linear_endian_reverse, xga->a5_test, xga->on);
 
-    if (((xga->op_mode & 7) >= 4) || ((xga->op_mode & 7) == 0)) {
-        if ((xga->aperture_cntl == 1) || (xga->aperture_cntl == 2)) {
-            if (xga->aperture_cntl == 1)
-                mem_mapping_set_addr(&xga->video_mapping, 0xa0000, 0x10000);
-            else
-                mem_mapping_set_addr(&xga->video_mapping, 0xb0000, 0x10000);
+    switch (xga->op_mode & 7) {
+        case 0:
+            xga_log("XGA: VGA mode address decode disabled.\n");
+            mem_mapping_disable(&xga->linear_mapping);
+            xga->test_stage = 0;
+            xga->mapping_base = svga->mapping.base;
+            break;
+        case 1:
+            xga_log("XGA: VGA mode address decode enabled.\n");
+            mem_mapping_disable(&xga->linear_mapping);
+            xga->test_stage = 0;
+            mem_mapping_set_handler(&svga->mapping, svga->read, svga->readw, svga->readl, svga->write, svga->writew, svga->writel);
+            switch (svga->gdcreg[6] & 0xc) {
+                case 0x0: /*128k at A0000*/
+                    mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x20000);
+                    svga->banked_mask = 0xffff;
+                    break;
+                case 0x4: /*64k at A0000*/
+                    mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
+                    svga->banked_mask = 0xffff;
+                    break;
+                case 0x8: /*32k at B0000*/
+                    mem_mapping_set_addr(&svga->mapping, 0xb0000, 0x08000);
+                    svga->banked_mask = 0x7fff;
+                    break;
+                case 0xC: /*32k at B8000*/
+                    mem_mapping_set_addr(&svga->mapping, 0xb8000, 0x08000);
+                    svga->banked_mask = 0x7fff;
+                    break;
 
-            mem_mapping_enable(&xga->video_mapping);
-            xga->banked_mask = 0xffff;
-            if (!xga->linear_endian_reverse)
-                mem_mapping_disable(&xga->linear_mapping);
-        } else if (xga->aperture_cntl == 0) {
-            mem_mapping_set_addr(&xga->video_mapping, 0xa0000, 0x10000);
-            mem_mapping_enable(&xga->video_mapping);
-            xga->banked_mask = 0xffff;
-            if (xga->base_addr_1mb)
-                mem_mapping_set_addr(&xga->linear_mapping, xga->base_addr_1mb, 0x100000);
-            else
-                mem_mapping_set_addr(&xga->linear_mapping, xga->linear_base, 0x400000);
-
-            if (xga->a5_test && (xga->access_mode & 8) && !xga->linear_endian_reverse) {
-                xga->on = 0;
-                vga_on  = 1;
-                xga_log("A5 test valid.\n");
+                default:
+                    break;
             }
-        }
+            xga->mapping_base = svga->mapping.base;
+            break;
+        case 2:
+            xga_log("XGA: 132-Column mode address decode disabled.\n");
+            mem_mapping_disable(&xga->linear_mapping);
+            xga->test_stage = 0;
+            xga->mapping_base = svga->mapping.base;
+            break;
+        case 3:
+            xga_log("XGA: 132-Column mode address decode enabled.\n");
+            mem_mapping_disable(&xga->linear_mapping);
+            xga->test_stage = 0;
+            mem_mapping_set_handler(&svga->mapping, svga->read, svga->readw, svga->readl, svga->write, svga->writew, svga->writel);
+            switch (svga->gdcreg[6] & 0xc) {
+                case 0x0: /*128k at A0000*/
+                    mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x20000);
+                    svga->banked_mask = 0xffff;
+                    break;
+                case 0x4: /*64k at A0000*/
+                    mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
+                    svga->banked_mask = 0xffff;
+                    break;
+                case 0x8: /*32k at B0000*/
+                    mem_mapping_set_addr(&svga->mapping, 0xb0000, 0x08000);
+                    svga->banked_mask = 0x7fff;
+                    break;
+                case 0xC: /*32k at B8000*/
+                    mem_mapping_set_addr(&svga->mapping, 0xb8000, 0x08000);
+                    svga->banked_mask = 0x7fff;
+                    break;
 
-        xga_log("XGA opmode (extended) = %d, disp mode = %d, aperture = %d, on = %d, linear endian reverse = %d.\n", xga->op_mode & 7,
-                xga->disp_cntl_2 & 7, xga->aperture_cntl, xga->on, xga->linear_endian_reverse);
+                default:
+                    break;
+            }
+            xga->mapping_base = svga->mapping.base;
+            break;
+        default:
+            xga_log("XGA: Extended Graphics mode, ap=%d, mapbits=%x.\n", xga->aperture_cntl, svga->gdcreg[6] & 0xc);
+            switch (xga->aperture_cntl) {
+                case 0:
+                    xga_log("XGA: No 64KB aperture: 1MB=%x, 4MB=%x, SVGA Mapping Base=%x, mapbits=%x.\n", xga->base_addr_1mb, xga->linear_base, svga->mapping.base, svga->gdcreg[6] & 0xc);
+                    if (xga->base_addr_1mb) {
+                        mem_mapping_set_addr(&xga->linear_mapping, xga->base_addr_1mb, 0x100000);
+                        mem_mapping_enable(&xga->linear_mapping);
+                    } else if (xga->linear_base) {
+                        mem_mapping_set_addr(&xga->linear_mapping, xga->linear_base, 0x400000);
+                        mem_mapping_enable(&xga->linear_mapping);
+                    } else
+                        mem_mapping_disable(&xga->linear_mapping);
+
+                    xga->test_stage = 0;
+                    mem_mapping_set_handler(&svga->mapping, svga->read, svga->readw, svga->readl, svga->write, svga->writew, svga->writel);
+                    switch (svga->gdcreg[6] & 0xc) {
+                        case 0x0: /*128k at A0000*/
+                            mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x20000);
+                            svga->banked_mask = 0xffff;
+                            break;
+                        case 0x4: /*64k at A0000*/
+                            mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
+                            svga->banked_mask = 0xffff;
+                            break;
+                        case 0x8: /*32k at B0000*/
+                            mem_mapping_set_addr(&svga->mapping, 0xb0000, 0x08000);
+                            svga->banked_mask = 0x7fff;
+                            break;
+                        case 0xC: /*32k at B8000*/
+                            mem_mapping_set_addr(&svga->mapping, 0xb8000, 0x08000);
+                            svga->banked_mask = 0x7fff;
+                            break;
+
+                        default:
+                            break;
+                    }
+                    xga->mapping_base = svga->mapping.base;
+                    break;
+                case 1:
+                    mem_mapping_disable(&xga->linear_mapping);
+                    xga_log("XGA: 64KB aperture at A0000, on=%d.\n", xga->on);
+                    xga->test_stage = 0;
+                    xga->mapping_base = 0xa0000;
+                    mem_mapping_set_handler(&svga->mapping, xga_read, xga_readw, xga_readl, xga_write, xga_writew, xga_writel);
+                    mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
+                    xga->banked_mask = 0xffff;
+                    break;
+                case 2:
+                    mem_mapping_disable(&xga->linear_mapping);
+                    xga_log("XGA: 64KB aperture at B0000.\n");
+                    xga->test_stage = 0;
+                    xga->mapping_base = 0xb0000;
+                    mem_mapping_set_handler(&svga->mapping, xga_read, xga_readw, xga_readl, xga_write, xga_writew, xga_writel);
+                    mem_mapping_set_addr(&svga->mapping, 0xb0000, 0x10000);
+                    xga->banked_mask = 0xffff;
+                    break;
+                default:
+                    break;
+            }
+            break;
     }
-    xga_log("VGA on = %d, map = %02x.\n", vga_on, svga->gdcreg[6] & 0x0c);
+}
+
+static void
+xga_render_blank(svga_t *svga)
+{
+    xga_t *xga = (xga_t *) svga->xga;
+
+    if ((xga->displine + svga->y_add) < 0)
+        return;
+
+    if (xga->firstline_draw == 2000)
+        xga->firstline_draw = xga->displine;
+
+    xga->lastline_draw = xga->displine;
+
+    uint32_t *line_ptr   = &svga->monitor->target_buffer->line[xga->displine + svga->y_add][svga->x_add];
+    uint32_t  line_width = (uint32_t)(xga->h_disp) * sizeof(uint32_t);
+
+    if (xga->h_disp > 0)
+        memset(line_ptr, 0, line_width);
 }
 
 void
@@ -189,7 +317,9 @@ xga_recalctimings(svga_t *svga)
 {
     xga_t *xga = (xga_t *) svga->xga;
 
+    xga_log("DispCntl2=%d, lowres=%x.\n", xga->disp_cntl_2 & 7, svga->lowres);
     if (xga->on) {
+        xga->h_total      = xga->htotal + 1;
         xga->v_total      = xga->vtotal + 1;
         xga->dispend      = xga->vdispend + 1;
         xga->v_syncstart  = xga->vsyncstart + 1;
@@ -197,8 +327,9 @@ xga_recalctimings(svga_t *svga)
         xga->v_blankstart = xga->vblankstart + 1;
 
         xga->h_disp = (xga->hdisp + 1) << 3;
+        xga->h_disp_time = xga->h_disp >> 3;
 
-        xga->rowoffset = xga->hdisp + 1;
+        xga->rowoffset = xga->pix_map_width;
 
         xga->interlace = !!(xga->disp_cntl_1 & 0x08);
         xga->rowcount  = (xga->disp_cntl_2 & 0xc0) >> 6;
@@ -211,33 +342,46 @@ xga_recalctimings(svga_t *svga)
             xga->v_blankstart >>= 1;
         }
 
-        xga->ma_latch = xga->disp_start_addr;
+        xga->memaddr_latch = xga->disp_start_addr;
 
-        if ((xga->disp_cntl_2 & 7) == 2)
-            xga->rowoffset >>= 1;
-        else if ((xga->disp_cntl_2 & 7) == 4)
-            xga->rowoffset <<= 1;
-
-        xga_log("XGA ClkSel1 = %d, ClkSel2 = %02x.\n", (xga->clk_sel_1 >> 2) & 3, xga->clk_sel_2 & 0x80);
+        xga_log("XGA ClkSel1 = %d, ClkSel2 = %02x, dispcntl2=%02x.\n", (xga->clk_sel_1 >> 2) & 3, xga->clk_sel_2 & 0x80, xga->disp_cntl_2 & 0xc0);
         switch ((xga->clk_sel_1 >> 2) & 3) {
             case 0:
                 xga_log("HDISP VGA0 = %d, XGA = %d.\n", svga->hdisp, xga->h_disp);
                 if (xga->clk_sel_2 & 0x80)
-                    svga->clock = (cpuclock * (double) (1ULL << 32)) / 41539000.0;
+                    svga->clock_xga = (cpuclock * (double) (1ULL << 32)) / 41539000.0;
                 else
-                    svga->clock = (cpuclock * (double) (1ULL << 32)) / 25175000.0;
+                    svga->clock_xga = (cpuclock * (double) (1ULL << 32)) / 25175000.0;
                 break;
             case 1:
                 xga_log("HDISP VGA1 = %d, XGA = %d.\n", svga->hdisp, xga->h_disp);
-                svga->clock = (cpuclock * (double) (1ULL << 32)) / 28322000.0;
+                svga->clock_xga = (cpuclock * (double) (1ULL << 32)) / 28322000.0;
                 break;
             case 3:
-                svga->clock = (cpuclock * (double) (1ULL << 32)) / 44900000.0;
+                svga->clock_xga = (cpuclock * (double) (1ULL << 32)) / 44900000.0;
                 break;
 
             default:
                 break;
         }
+
+        svga->render_xga = xga_render_blank;
+        switch (xga->disp_cntl_2 & 7) {
+            case 2:
+                svga->render_xga = xga_render_4bpp;
+                break;
+            case 3:
+                svga->render_xga = xga_render_8bpp;
+                break;
+            case 4:
+                svga->render_xga = xga_render_16bpp;
+                break;
+
+            default:
+                break;
+        }
+
+        xga_log("XGA: H_TOTAL=%d, rowoffset=%x, rowcount=%x, memaddr_latch=%06x, bpp type=%d.\n", xga->h_total, xga->rowoffset, xga->rowcount, xga->memaddr_latch, xga->disp_cntl_2 & 7);
     }
 }
 
@@ -358,12 +502,15 @@ xga_ext_out_reg(xga_t *xga, svga_t *svga, uint8_t idx, uint8_t val)
 
         case 0x40:
             xga->disp_start_addr = (xga->disp_start_addr & 0x7ff00) | val;
+            xga_log("DISPSTARTADDR0=%x.\n", xga->disp_start_addr);
             break;
         case 0x41:
             xga->disp_start_addr = (xga->disp_start_addr & 0x700ff) | (val << 8);
+            xga_log("DISPSTARTADDR8=%x.\n", xga->disp_start_addr);
             break;
         case 0x42:
             xga->disp_start_addr = (xga->disp_start_addr & 0x0ffff) | ((val & 0x07) << 16);
+            xga_log("DISPSTARTADDR16=%x.\n", xga->disp_start_addr);
             svga_recalctimings(svga);
             break;
 
@@ -372,19 +519,19 @@ xga_ext_out_reg(xga_t *xga, svga_t *svga, uint8_t idx, uint8_t val)
             break;
         case 0x44:
             xga->pix_map_width = (xga->pix_map_width & 0xff) | ((val & 0x07) << 8);
+            svga_recalctimings(svga);
             break;
 
         case 0x50:
-            xga_log("Reg50 write = %02x.\n", val);
+            xga_log("Reg50 write=%02x.\n", val);
             xga->disp_cntl_1 = val;
             svga_recalctimings(svga);
             break;
 
         case 0x51:
-            xga_log("Reg51 write = %02x.\n", val);
+            xga_log("Reg51 write=%02x.\n", val & 0x07);
             xga->disp_cntl_2 = val;
-            xga->on          = ((val & 7) >= 2);
-            vga_on           = !xga->on;
+            xga->on          = ((val & 0x07) >= 0x02);
             svga_recalctimings(svga);
             break;
 
@@ -404,73 +551,64 @@ xga_ext_out_reg(xga_t *xga, svga_t *svga, uint8_t idx, uint8_t val)
 
         case 0x60:
             xga->sprite_pal_addr_idx = (xga->sprite_pal_addr_idx & 0x3f00) | val;
-            svga->dac_pos            = 0;
-            svga->dac_addr           = val & 0xff;
+            xga->dac_pos             = 0;
+            xga->dac_addr            = val & 0xff;
             break;
         case 0x61:
             xga->sprite_pal_addr_idx = (xga->sprite_pal_addr_idx & 0xff) | ((val & 0x3f) << 8);
             xga->sprite_pos          = xga->sprite_pal_addr_idx & 0x1ff;
-            if ((xga->sprite_pos >= 0) && (xga->sprite_pos <= 16)) {
-                if ((xga->op_mode & 7) >= 5)
-                    xga->cursor_data_on = 1;
-                else if ((xga->sprite_pos >= 1) || (((xga->disp_cntl_2 & 7) == 2) || (xga->disp_cntl_2 & 7) == 4))
-                    xga->cursor_data_on = 1;
-                else if (!xga->aperture_cntl) {
-                    if (xga->linear_endian_reverse && !(xga->access_mode & 8))
-                        xga->cursor_data_on = 0;
-                }
-            }
-
-            if ((xga->sprite_pos > 16) && (xga->sprite_pos <= 0x1ff)) {
-                if (xga->aperture_cntl) {
-                    if (xga->sprite_pos & 0x0f)
-                        xga->cursor_data_on = 1;
-                    else
-                        xga->cursor_data_on = 0;
-                } else
-                    xga->cursor_data_on = 0;
-            } else if (!xga->sprite_pos && xga->cursor_data_on && !xga->aperture_cntl && xga->linear_endian_reverse)
-                xga->cursor_data_on = 0;
-
 
             xga_log("Sprite POS = %d, data on = %d, idx = %d, apcntl = %d\n", xga->sprite_pos,
                     xga->cursor_data_on, xga->sprite_pal_addr_idx, xga->aperture_cntl);
             break;
 
-        case 0x62:
-            xga->sprite_pal_addr_idx_prefetch = (xga->sprite_pal_addr_idx_prefetch & 0x3f00) | val;
-            svga->dac_pos                     = 0;
-            svga->dac_addr                    = val & 0xff;
-            break;
-        case 0x63:
-            xga->sprite_pal_addr_idx_prefetch = (xga->sprite_pal_addr_idx_prefetch & 0xff) | ((val & 0x3f) << 8);
-            xga->sprite_pos_prefetch          = xga->sprite_pal_addr_idx_prefetch & 0x1ff;
-            break;
-
         case 0x64:
-            svga->dac_mask = val;
+            xga->dac_mask = val;
+            xga_log("DAC mask=%02x.\n", val);
             break;
 
         case 0x65:
             svga->fullchange = svga->monitor->mon_changeframecount;
-            switch (svga->dac_pos) {
+            switch (xga->dac_pos) {
                 case 0:
-                    svga->dac_r = val;
-                    svga->dac_pos++;
+                    xga->dac_r = val;
+                    xga->dac_pos++;
                     break;
                 case 1:
-                    svga->dac_g = val;
-                    svga->dac_pos++;
+                    if (xga->pal_seq & 0x04)
+                        xga->pal_b = val;
+                    else
+                        xga->dac_g = val;
+
+                    xga->dac_pos++;
                     break;
                 case 2:
-                    xga->pal_b            = val;
-                    index                 = svga->dac_addr & 0xff;
-                    svga->vgapal[index].r = svga->dac_r;
-                    svga->vgapal[index].g = svga->dac_g;
-                    svga->vgapal[index].b = xga->pal_b;
-                    xga->pallook[index]  = makecol32(svga->vgapal[index].r, svga->vgapal[index].g, svga->vgapal[index].b);
-                    svga->dac_pos         = 0;
-                    svga->dac_addr        = (svga->dac_addr + 1) & 0xff;
+                    if (xga->pal_seq & 0x04) {
+                        xga->dac_g = val;
+                        xga->dac_pos++;
+                    } else {
+                        xga->pal_b            = val;
+                        index                 = xga->dac_addr & 0xff;
+                        xga->xgapal[index].r = xga->dac_r;
+                        xga->xgapal[index].g = xga->dac_g;
+                        xga->xgapal[index].b = xga->pal_b;
+                        xga->pallook[index]  = makecol32(xga->xgapal[index].r, xga->xgapal[index].g, xga->xgapal[index].b);
+                        xga_log("XGA Pallook=%06x, idx=%d.\n", xga->pallook[index], index);
+                        xga->dac_pos         = 0;
+                        xga->dac_addr        = (xga->dac_addr + 1) & 0xff;
+                    }
+                    break;
+                case 3:
+                    if (xga->pal_seq & 0x04) {
+                        index                 = xga->dac_addr & 0xff;
+                        xga->xgapal[index].r = xga->dac_r;
+                        xga->xgapal[index].b = xga->pal_b;
+                        xga->xgapal[index].g = xga->dac_g;
+                        xga->pallook[index]  = makecol32(xga->xgapal[index].r, xga->xgapal[index].g, xga->xgapal[index].b);
+                        xga_log("XGA Pallook=%06x, idx=%d.\n", xga->pallook[index], index);
+                        xga->dac_pos         = 0;
+                        xga->dac_addr        = (xga->dac_addr + 1) & 0xff;
+                    }
                     break;
 
                 default:
@@ -479,19 +617,10 @@ xga_ext_out_reg(xga_t *xga, svga_t *svga, uint8_t idx, uint8_t val)
             break;
 
         case 0x66:
+            xga_log("Palette Sequence=%02x.\n", val);
             xga->pal_seq = val;
             break;
 
-        case 0x67:
-            svga->dac_r = val;
-            break;
-        case 0x68:
-            xga->pal_b = val;
-            break;
-        case 0x69:
-            svga->dac_g = val;
-            break;
-
         case 0x6a:
             xga->sprite_data[xga->sprite_pos] = val;
             xga->sprite_pos                   = (xga->sprite_pos + 1) & 0x3ff;
@@ -515,26 +644,37 @@ xga_ext_outb(uint16_t addr, uint8_t val, void *priv)
     xga_t  *xga  = (xga_t *) svga->xga;
 
     xga_log("[%04X:%08X]: EXT OUTB = %02x, val = %02x\n", CS, cpu_state.pc, addr, val);
-
     switch (addr & 0x0f) {
         case 0:
+            xga_log("[%04X:%08X]: EXT OUTB = %02x, val = %02x\n", CS, cpu_state.pc, addr, val);
             xga->op_mode = val;
             break;
         case 1:
-            xga->aperture_cntl = val;
+            xga_log("[%04X:%08X]: EXT OUTB = %02x, val = %02x\n", CS, cpu_state.pc, addr, val);
+            xga->aperture_cntl = val & 3;
             xga_updatemapping(svga);
             break;
         case 4:
-            if ((xga->disp_cntl_2 & 7) == 4)
-                xga->aperture_cntl = 0;
+            xga_log("[%04X:%08X]: EXT OUTB = %02x, val = %02x\n", CS, cpu_state.pc, addr, val);
+            xga->int_ena = val;
+            break;
+        case 5:
+            xga_log("[%04X:%08X]: EXT OUTB = %02x, val = %02x\n", CS, cpu_state.pc, addr, val);
+            xga->int_stat = val;
+            break;
+        case 6:
+            xga_log("[%04X:%08X]: EXT OUTB = %02x, val = %02x\n", CS, cpu_state.pc, addr, val);
+            break;
+        case 7:
+            xga_log("[%04X:%08X]: EXT OUTB = %02x, val = %02x\n", CS, cpu_state.pc, addr, val);
             break;
         case 8:
             xga->ap_idx = val;
             xga_log("Aperture CNTL = %d, val = %02x, up to bit6 = %02x\n", xga->aperture_cntl,
                     val, val & 0x3f);
-            if ((xga->op_mode & 7) < 4) {
+            if ((xga->op_mode & 7) < 4)
                 xga->write_bank = xga->read_bank = 0;
-            } else {
+            else {
                 if (xga->base_addr_1mb) {
                     if (xga->aperture_cntl) {
                         xga->write_bank = (xga->ap_idx & 0x3f) << 16;
@@ -561,10 +701,12 @@ xga_ext_outb(uint16_t addr, uint8_t val, void *priv)
         case 0x0e:
         case 0x0f:
             xga->regs[xga->regs_idx] = val;
+            xga_log("EXT OUT Reg=%02x, val=%02x.\n", xga->regs_idx, val);
             xga_ext_out_reg(xga, svga, xga->regs_idx, xga->regs[xga->regs_idx]);
             break;
 
         default:
+            xga_log("[%04X:%08X]: EXT OUTB = %02x, val = %02x\n", CS, cpu_state.pc, addr, val);
             break;
     }
 }
@@ -584,6 +726,12 @@ xga_ext_inb(uint16_t addr, void *priv)
         case 1:
             ret = xga->aperture_cntl;
             break;
+        case 4:
+            ret = xga->int_ena;
+            break;
+        case 5:
+            ret = xga->int_stat;
+            break;
         case 8:
             ret = xga->ap_idx;
             break;
@@ -599,6 +747,9 @@ xga_ext_inb(uint16_t addr, void *priv)
         case 0x0e:
         case 0x0f:
             switch (xga->regs_idx) {
+                case 0:
+                    ret = (xga->bus & DEVICE_MCA) ? 0x02 : 0x01;
+                    break;
                 case 4:
                     if (xga->bus & DEVICE_MCA)
                         ret = 0x01; /*32-bit MCA*/
@@ -731,32 +882,39 @@ xga_ext_inb(uint16_t addr, void *priv)
                     ret = xga->sprite_pal_addr_idx >> 8;
                     break;
 
-                case 0x62:
-                    ret = xga->sprite_pal_addr_idx_prefetch & 0xff;
-                    break;
-                case 0x63:
-                    ret = xga->sprite_pal_addr_idx_prefetch >> 8;
-                    break;
-
                 case 0x64:
-                    ret = svga->dac_mask;
+                    ret = xga->dac_mask;
                     break;
 
                 case 0x65:
-                    index = svga->dac_addr & 0xff;
-                    switch (svga->dac_pos) {
+                    index = xga->dac_addr & 0xff;
+                    switch (xga->dac_pos) {
                         case 0:
-                            svga->dac_pos++;
-                            ret = svga->vgapal[index].r;
+                            xga->dac_pos++;
+                            ret = xga->xgapal[index].r;
                             break;
                         case 1:
-                            svga->dac_pos++;
-                            ret = svga->vgapal[index].g;
+                            xga->dac_pos++;
+                            if (xga->pal_seq & 0x04)
+                                ret = xga->xgapal[index].b;
+                            else
+                                ret = xga->xgapal[index].g;
                             break;
                         case 2:
-                            svga->dac_pos  = 0;
-                            svga->dac_addr = (svga->dac_addr + 1) & 0xff;
-                            ret            = svga->vgapal[index].b;
+                            if (xga->pal_seq & 0x04) {
+                                xga->dac_pos++;
+                                ret = xga->xgapal[index].g;
+                            } else {
+                                xga->dac_pos  = 0;
+                                xga->dac_addr = (xga->dac_addr + 1) & 0xff;
+                                ret = xga->xgapal[index].b;
+                            }
+                            break;
+                        case 3:
+                            if (xga->pal_seq & 0x04) {
+                                xga->dac_pos  = 0;
+                                xga->dac_addr = (xga->dac_addr + 1) & 0xff;
+                            }
                             break;
 
                         default:
@@ -768,21 +926,10 @@ xga_ext_inb(uint16_t addr, void *priv)
                     ret = xga->pal_seq;
                     break;
 
-                case 0x67:
-                    ret = svga->dac_r;
-                    break;
-                case 0x68:
-                    ret = xga->pal_b;
-                    break;
-                case 0x69:
-                    ret = svga->dac_g;
-                    break;
-
                 case 0x6a:
-                    xga_log("Sprite POS Read = %d, addr idx = %04x\n", xga->sprite_pos,
-                            xga->sprite_pal_addr_idx_prefetch);
-                    ret                      = xga->sprite_data[xga->sprite_pos_prefetch];
-                    xga->sprite_pos_prefetch = (xga->sprite_pos_prefetch + 1) & 0x3ff;
+                    xga_log("Sprite POS Read=%d.\n", xga->sprite_pos);
+                    ret                      = xga->sprite_data[xga->sprite_pos];
+                    xga->sprite_pos = (xga->sprite_pos + 1) & 0x3ff;
                     break;
 
                 case 0x70:
@@ -801,11 +948,14 @@ xga_ext_inb(uint16_t addr, void *priv)
 
                 default:
                     ret = xga->regs[xga->regs_idx];
+                    if ((xga->regs_idx == 0x0c) || (xga->regs_idx == 0x0d))
+                        xga_log("EXT IN Reg=%02x, val=%02x.\n", xga->regs_idx, ret);
                     break;
             }
             break;
 
         default:
+            xga_log("[%04X:%08X]: EXT INB = %02x, ret = %02x.\n\n", CS, cpu_state.pc, addr, ret);
             break;
     }
 
@@ -814,29 +964,6 @@ xga_ext_inb(uint16_t addr, void *priv)
     return ret;
 }
 
-#define READ(addr, dat) \
-    dat = xga->vram[(addr) & (xga->vram_mask)];
-
-#define WRITE(addr, dat)                                         \
-    xga->vram[((addr)) & (xga->vram_mask)]                = dat; \
-    xga->changedvram[(((addr)) & (xga->vram_mask)) >> 12] = svga->monitor->mon_changeframecount;
-
-#define READW(addr, dat) \
-    dat = *(uint16_t *) &xga->vram[(addr) & (xga->vram_mask)];
-
-#define READW_INV(addr, dat)                        \
-    dat = xga->vram[(addr + 1) & (xga->vram_mask)]; \
-    dat |= (xga->vram[(addr) & (xga->vram_mask)] << 8);
-
-#define WRITEW(addr, dat)                                        \
-    *(uint16_t *) &xga->vram[((addr)) & (xga->vram_mask)] = dat; \
-    xga->changedvram[(((addr)) & (xga->vram_mask)) >> 12] = svga->monitor->mon_changeframecount;
-
-#define WRITEW_INV(addr, dat)                                           \
-    xga->vram[((addr + 1)) & (xga->vram_mask)]            = dat & 0xff; \
-    xga->vram[((addr)) & (xga->vram_mask)]                = dat >> 8;   \
-    xga->changedvram[(((addr)) & (xga->vram_mask)) >> 12] = svga->monitor->mon_changeframecount;
-
 #define ROP(mix, d, s)                                                                 \
     {                                                                                  \
         switch ((mix) ? (xga->accel.frgd_mix & 0x1f) : (xga->accel.bkgd_mix & 0x1f)) { \
@@ -895,7 +1022,7 @@ xga_ext_inb(uint16_t addr, void *priv)
                 d = MIN(s, d);                                                         \
                 break;                                                                 \
             case 0x12:                                                                 \
-                d = MIN(~0, s + d);                                                  \
+                d = MIN(~0, s + d);                                                    \
                 break;                                                                 \
             case 0x13:                                                                 \
                 d = MAX(0, d - s);                                                     \
@@ -910,221 +1037,255 @@ xga_ext_inb(uint16_t addr, void *priv)
     }
 
 static uint32_t
-xga_accel_read_pattern_map_pixel(svga_t *svga, int x, int y, int map, uint32_t base, int width)
+xga_transform_addr(uint32_t addr, uint8_t mode)
 {
-    const xga_t *xga  = (xga_t *) svga->xga;
-    uint32_t     addr = base;
-    int          bits;
-    uint8_t      byte;
-    uint8_t      px;
-    int          skip = 0;
+    uint32_t ret  = addr;
 
-    if (xga->base_addr_1mb) {
-        if (addr < xga->base_addr_1mb || (addr > (xga->base_addr_1mb + 0xfffff)))
-            skip = 1;
-    } else {
-        if (addr < xga->linear_base || (addr > (xga->linear_base + 0xfffff)))
-            skip = 1;
+    if ((mode & 0x0f) == 0x0c)
+        ret ^= 1;
+
+    return ret;
+}
+
+static uint16_t
+xga_transform_val(uint16_t val, uint8_t mode, int bits)
+{
+    uint16_t ret  = 0x0000;
+
+    switch (mode & 0x0f) {
+        default:
+            ret = val;
+            break;
+        case 0x08:    /* 1 bpp */
+            for (int i = 0; i < bits; i++)
+                ret |= ((val >> i) & 0x01) << (i ^ 7);
+            break;
+        case 0x09:    /* 2 bpp */
+            for (int i = 0; i < bits; i += 2)
+                ret |= ((val >> i) & 0x03) << (i ^ 6);
+            break;
+        case 0x0a:    /* 4 bpp */
+            for (int i = 0; i < bits; i += 4)
+                ret |= ((val >> i) & 0x0f) << (i ^ 4);
+            break;
+        case 0x0c:    /* 16 bpp */
+            if (bits == 16)  for (int i = 0; i < (bits >> 3); i++)
+                ret |= ((val >> (i << 3)) & 0xff) << ((i << 3) ^ 8);
+            else
+                ret = val;
+            break;
     }
 
-    addr += (y * (width >> 3));
-    addr += (x >> 3);
-    if (!skip) {
-        READ(addr, byte);
+    return ret & ((1 << bits) - 1);
+}
+
+static uint8_t
+xga_map_readb(svga_t *svga, uint32_t addr, int map)
+{
+    xga_t    *xga  = (xga_t *) svga->xga;
+    uint8_t   ret;
+
+    if ((addr >= xga->linear_base) && (addr <= (xga->linear_base + 0xfffff)))
+        ret = xga->vram[addr & xga->vram_mask];
+    else
+        ret = xga_transform_val(mem_readb_phys(xga_transform_addr(addr, xga->accel.px_map_format[map])),
+                                xga->accel.px_map_format[map], 8);
+    return ret;
+}
+
+static uint16_t
+xga_map_readw(svga_t *svga, uint32_t addr, int map)
+{
+    xga_t    *xga  = (xga_t *) svga->xga;
+    uint16_t  ret;
+
+    if ((addr >= xga->linear_base) && (addr <= (xga->linear_base + 0xfffff)))
+        ret = *(uint16_t *) &xga->vram[addr & xga->vram_mask];
+    else
+        ret = xga_transform_val(mem_readw_phys(addr), xga->accel.px_map_format[map], 16);
+
+    return ret;
+}
+
+static void
+xga_map_writeb(svga_t *svga, uint32_t addr, int map, uint8_t val)
+{
+    xga_t    *xga  = (xga_t *) svga->xga;
+
+    if ((addr >= xga->linear_base) && (addr <= (xga->linear_base + 0xfffff))) {
+        xga->vram[addr & xga->vram_mask]                = val;
+        xga->changedvram[(addr & xga->vram_mask) >> 12] = svga->monitor->mon_changeframecount;
     } else
-        byte = mem_readb_phys(addr);
+        mem_writeb_phys(xga_transform_addr(addr, xga->accel.px_map_format[map]),
+                        xga_transform_val(val, xga->accel.px_map_format[map], 8));
+}
 
-    if (xga->linear_endian_reverse)
-        bits = 7 - (x & 7);
-    else {
-        if (xga->accel.px_map_format[xga->accel.dst_map] & 8) {
-            if ((xga->accel.px_map_format[xga->accel.src_map] & 8) && (xga->accel.px_map_format[map] & 8))
-                bits = (x & 7);
-            else
-                bits = 7 - (x & 7);
-        } else {
-            if ((xga->accel.px_map_format[map] & 8) && !(xga->access_mode & 8))
-                bits = (x & 7);
-            else
-                bits = 7 - (x & 7);
-        }
-    }
-    px = (byte >> bits) & 1;
-    return px;
+static void
+xga_map_writew(svga_t *svga, uint32_t addr, int map, uint16_t val)
+{
+    xga_t    *xga  = (xga_t *) svga->xga;
+
+    if ((addr >= xga->linear_base) && (addr <= (xga->linear_base + 0xfffff))) {
+       *(uint16_t *) &xga->vram[addr & xga->vram_mask] = val;
+        xga->changedvram[(addr & xga->vram_mask) >> 12] = svga->monitor->mon_changeframecount;
+    } else
+        mem_writew_phys(addr, xga_transform_val(val, xga->accel.px_map_format[map], 16));
+}
+
+static int
+xga_calc_pos(int x, int y, int width)
+{
+    int ret = (y * (width + 1)) + (x % (width + 1));
+
+    return ret;
 }
 
 static uint32_t
-xga_accel_read_map_pixel(svga_t *svga, int x, int y, int map, uint32_t base, int width, UNUSED(int usesrc))
+xga_add_to_addr(xga_t *xga, uint32_t addr, int pos, int map)
 {
-    xga_t   *xga  = (xga_t *) svga->xga;
-    uint32_t addr = base;
-    int      bits;
-    uint32_t byte;
-    uint8_t  px;
-    int      skip = 0;
+    int      pos_div[8] = { 8, 4, 2, 1, 1, 1, 1, 1 };
+    int      pos_mul[8] = { 1, 1, 1, 1, 2, 1, 1, 1 };
+    int      div_val    = pos_div[xga->accel.px_map_format[map] & 0x07];
+    int      mul_val    = pos_mul[xga->accel.px_map_format[map] & 0x07];
+    uint32_t ret        = addr + ((pos / div_val) * mul_val);
 
-    if (xga->base_addr_1mb) {
-        if (addr < xga->base_addr_1mb || (addr > (xga->base_addr_1mb + 0xfffff)))
-            skip = 1;
-    } else {
-        if (addr < xga->linear_base || (addr > (xga->linear_base + 0xfffff)))
-            skip = 1;
+    return ret;
+}
+
+#define READ_MAP(base, pos, map)           xga_map_readb(svga, xga_add_to_addr(xga, base, pos, map), map)
+#define READ_MAPW(base, pos, map)          xga_map_readw(svga, xga_add_to_addr(xga, base, pos, map), map)
+#define WRITE_MAP(base, pos, map, val)     xga_map_writeb(svga, xga_add_to_addr(xga, base, pos, map), map, val)
+#define WRITE_MAPW(base, pos, map, val)    xga_map_writew(svga, xga_add_to_addr(xga, base, pos, map), map, val)
+
+#define DO_READ_MAP(map)                   READ_MAP(base, pos, map)
+
+#define PIXEL_MASK(bits)                   (0x07 / bits)
+#define ALL_SET(bits)                      ((1 << bits) - 1)
+
+#define MASK(map, bits)                    ((pos & PIXEL_MASK(bits)) * bits)
+#define MASKED_READ(map, bits)             (DO_READ_MAP(map) >> MASK(map, bits)) & ALL_SET(bits)
+
+static uint32_t
+xga_accel_read_pattern_map_pixel(svga_t *svga, int x, int y)
+{
+    xga_t    *xga  = (xga_t *) svga->xga;
+    int       map  = 0;
+    uint32_t  ret  = 0x000000ff;
+
+    switch ((xga->accel.command >> 12) & 0x0f) {
+        default:
+        case 8:
+            map = 0;
+            break;
+        case 1 ... 3:
+            map = (xga->accel.command >> 12) & 0x0f;
+            break;
+        case 9:
+            map = (xga->accel.command >> 20) & 0x0f;
+            if (map > 0x03)
+                map = 0;
+            break;
     }
 
-    switch (xga->accel.px_map_format[map] & 7) {
-        case 0: /*1-bit*/
-            addr += (y * (width >> 3));
-            addr += (x >> 3);
-            if (!skip) {
-                READ(addr, byte);
-            } else
-                byte = mem_readb_phys(addr);
+    if (map != 0) {
+        int       width = xga->accel.px_map_width[map];
+        int       pos   = xga_calc_pos(x, y, width);
+        uint32_t  base  = xga->accel.px_map_base[map];
 
-            if (xga->linear_endian_reverse)
-                bits = 7 - (x & 7);
-            else {
-                if ((xga->accel.px_map_format[map] & 8) && !(xga->access_mode & 8))
-                    bits = (x & 7);
-                else
-                    bits = 7 - (x & 7);
-            }
-            px = (byte >> bits) & 1;
-            return px;
-        case 2: /*4-bit*/
-            addr += (y * (width >> 1));
-            addr += (x >> 1);
-            if (!skip) {
-                READ(addr, byte);
-            } else
-                byte = mem_readb_phys(addr);
+        ret = MASKED_READ(map, 1);
+    }
 
-            return byte;
-        case 3: /*8-bit*/
-            addr += (y * width);
-            addr += x;
-            if (!skip) {
-                READ(addr, byte);
-            } else
-                byte = mem_readb_phys(addr);
+    return ret;
+}
 
-            return byte;
-        case 4: /*16-bit*/
-            addr += (y * (width << 1));
-            addr += (x << 1);
-            if (xga->linear_endian_reverse) {
-                byte = mem_readw_phys(addr);
-                if ((xga->access_mode & 7) == 4)
-                    byte = ((byte & 0xff00) >> 8) | ((byte & 0x00ff) << 8);
-                else if (xga->access_mode & 8)
-                    byte = ((byte & 0xff00) >> 8) | ((byte & 0x00ff) << 8);
-            } else {
-                if (!skip) {
-                    READW(addr, byte);
-                } else
-                    byte = mem_readb_phys(addr) | (mem_readb_phys(addr + 1) << 8);
-            }
-            return byte;
+static uint32_t
+xga_accel_read_map_pixel(svga_t *svga, int x, int y, int map)
+{
+    xga_t   *xga   = (xga_t *) svga->xga;
+    int      width = xga->accel.px_map_width[map];
+    int      pos   = xga_calc_pos(x, y, width);
+    uint32_t base  = xga->accel.px_map_base[map];
+    uint32_t ret   = 0x00000000;
+
+    switch (xga->accel.px_map_format[map] & 0x07) {
+        case 0:    /* 1 bpp */
+            ret = MASKED_READ(map, 1);
+            break;
+
+        case 1:    /* 2 bpp */
+            ret = MASKED_READ(map, 2);
+            break;
+
+        case 2:    /* 4 bpp */
+            ret = MASKED_READ(map, 4);
+            break;
+
+        case 3:    /* 8 bpp */
+            ret = READ_MAP(base, pos, map);
+            break;
+
+        case 4:    /* 16 bpp */
+            ret = READ_MAPW(base, pos, map);
+            break;
 
         default:
             break;
     }
-    return 0;
+
+    return ret;
 }
 
 static void
-xga_accel_write_map_pixel(svga_t *svga, int x, int y, int map, uint32_t base, uint32_t pixel, int width)
+xga_accel_write_map_pixel(svga_t *svga, int x, int y, int map, uint32_t pixel)
 {
     xga_t   *xga  = (xga_t *) svga->xga;
-    uint32_t addr = base;
     uint8_t  byte;
     uint8_t  mask;
-    int      skip = 0;
+    int      bit;
+    int      width = xga->accel.px_map_width[map];
+    int      pos   = xga_calc_pos(x, y, width);
+    uint32_t base  = xga->accel.px_map_base[map];
 
-    if (xga->base_addr_1mb) {
-        if (addr < xga->base_addr_1mb || (addr > (xga->base_addr_1mb + 0xfffff)))
-            skip = 1;
-    } else {
-        if (addr < xga->linear_base || (addr > (xga->linear_base + 0xfffff)))
-            skip = 1;
-    }
+    switch (xga->accel.px_map_format[map] & 0x07) {
+        case 0: /* 1 bpp */
+            byte = READ_MAP(base, pos, map);
+            bit = pos & 7;
 
-    switch (xga->accel.px_map_format[map] & 7) {
-        case 0: /*1-bit*/
-            addr += (y * (width >> 3));
-            addr += (x >> 3);
-            if (!skip) {
-                READ(addr, byte);
-            } else
-                byte = mem_readb_phys(addr);
+            pixel <<= bit;
+            mask = 1 << bit;
 
-            if (xga->linear_endian_reverse) {
-                mask = 1 << (7 - (x & 7));
-            } else {
-                if ((xga->accel.px_map_format[map] & 8) && !(xga->access_mode & 8)) {
-                    mask = 1 << (x & 7);
-                } else {
-                    mask = 1 << (7 - (x & 7));
-                }
-            }
-            byte = (byte & ~mask) | ((pixel ? 0xff : 0) & mask);
-            if (pixel & 1) {
-                if (!skip) {
-                    xga->vram[addr & (xga->vram_mask)] |= mask;
-                    xga->changedvram[(addr & (xga->vram_mask)) >> 12] = svga->monitor->mon_changeframecount;
-                }
-            } else {
-                if (!skip) {
-                    xga->vram[addr & (xga->vram_mask)] &= ~mask;
-                    xga->changedvram[(addr & (xga->vram_mask)) >> 12] = svga->monitor->mon_changeframecount;
-                }
-            }
-            mem_writeb_phys(addr, byte);
-            break;
-        case 2: /*4-bit*/
-            addr += (y * (width >> 1));
-            addr += (x >> 1);
-            if (!skip) {
-                READ(addr, byte);
-            } else {
-                byte = mem_readb_phys(addr);
-            }
-
-            if (xga->linear_endian_reverse)
-                mask = 0x0f << ((1 - (x & 1)) << 2);
-            else {
-                if ((xga->accel.px_map_format[map] & 8) && !(xga->access_mode & 8))
-                    mask = 0x0f << ((x & 1) << 2);
-                else
-                    mask = 0x0f << ((1 - (x & 1)) << 2);
-            }
             byte = (byte & ~mask) | (pixel & mask);
-            if (!skip) {
-                WRITE(addr, byte);
-            }
-            mem_writeb_phys(addr, byte);
+            WRITE_MAP(base, pos, map, byte);
             break;
-        case 3: /*8-bit*/
-            addr += (y * width);
-            addr += x;
-            if (!skip) {
-                WRITE(addr, pixel & 0xff);
-            }
-            mem_writeb_phys(addr, pixel & 0xff);
+
+        case 1: /* 2 bpp */
+            byte = READ_MAP(base, pos, map);
+            mask = ((pos & 3) << 1);
+
+            pixel <<= mask;
+            mask = 0x03 << mask;
+
+            byte = (byte & ~mask) | (pixel & mask);
+            WRITE_MAP(base, pos, map, byte);
             break;
-        case 4: /*16-bit*/
-            addr += (y * width << 1);
-            addr += (x << 1);
-            if (xga->linear_endian_reverse) {
-                if ((xga->access_mode & 7) == 4)
-                    pixel = ((pixel & 0xff00) >> 8) | ((pixel & 0x00ff) << 8);
-                else if (xga->access_mode & 8)
-                    pixel = ((pixel & 0xff00) >> 8) | ((pixel & 0x00ff) << 8);
-            } else {
-                if (!skip) {
-                    WRITEW(addr, pixel);
-                }
-            }
-            mem_writew_phys(addr, pixel);
+
+        case 2: /* 4 bpp */
+            byte = READ_MAP(base, pos, map);
+            mask = ((pos & 1) << 2);
+
+            pixel <<= mask;
+            mask = 0x0f << mask;
+
+            byte = (byte & ~mask) | (pixel & mask);
+            WRITE_MAP(base, pos, map, byte);
+            break;
+
+        case 3: /* 8bpp */
+            WRITE_MAP(base, pos, map, pixel);
+            break;
+
+        case 4: /* 16bpp */
+            WRITE_MAPW(base, pos, map, pixel);
             break;
 
         default:
@@ -1141,8 +1302,6 @@ xga_short_stroke(svga_t *svga, uint8_t ssv)
     uint32_t old_dest_dat;
     uint32_t color_cmp  = xga->accel.color_cmp;
     uint32_t plane_mask = xga->accel.plane_mask;
-    uint32_t dstbase    = xga->accel.px_map_base[xga->accel.dst_map];
-    uint32_t srcbase    = xga->accel.px_map_base[xga->accel.src_map];
     int      y          = ssv & 0x0f;
     int      x          = 0;
     int16_t  dx;
@@ -1150,11 +1309,11 @@ xga_short_stroke(svga_t *svga, uint8_t ssv)
     int      dirx = 0;
     int      diry = 0;
 
-    dx = xga->accel.dst_map_x & 0x1fff;
+    dx = xga->accel.dst_map_x;
     if (xga->accel.dst_map_x >= 0x1800)
         dx |= ~0x17ff;
 
-    dy = xga->accel.dst_map_y & 0x1fff;
+    dy = xga->accel.dst_map_y;
     if (xga->accel.dst_map_y >= 0x1800)
         dy |= ~0x17ff;
 
@@ -1200,8 +1359,11 @@ xga_short_stroke(svga_t *svga, uint8_t ssv)
         while (y >= 0) {
             if (xga->accel.command & 0xc0) {
                 if ((dx >= xga->accel.mask_map_origin_x_off) && (dx <= ((xga->accel.px_map_width[0] & 0xfff) + xga->accel.mask_map_origin_x_off)) && (dy >= xga->accel.mask_map_origin_y_off) && (dy <= ((xga->accel.px_map_height[0] & 0xfff) + xga->accel.mask_map_origin_y_off))) {
-                    src_dat  = (((xga->accel.command >> 28) & 3) == 2) ? xga_accel_read_map_pixel(svga, xga->accel.src_map_x & 0xfff, xga->accel.src_map_y & 0xfff, xga->accel.src_map, srcbase, xga->accel.px_map_width[xga->accel.src_map] + 1, 1) : xga->accel.frgd_color;
-                    dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, xga->accel.px_map_width[xga->accel.dst_map] + 1, 0);
+                    src_dat  = (((xga->accel.command >> 28) & 3) == 2) ?
+                        xga_accel_read_map_pixel(svga, xga->accel.src_map_x & 0xfff,
+                                                 xga->accel.src_map_y & 0xfff, xga->accel.src_map) :
+                        xga->accel.frgd_color;
+                    dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map);
 
                     if ((xga->accel.cc_cond == 4) || ((xga->accel.cc_cond == 1) && (dest_dat > color_cmp)) || ((xga->accel.cc_cond == 2) && (dest_dat == color_cmp)) || ((xga->accel.cc_cond == 3) && (dest_dat < color_cmp)) || ((xga->accel.cc_cond == 5) && (dest_dat >= color_cmp)) || ((xga->accel.cc_cond == 6) && (dest_dat != color_cmp)) || ((xga->accel.cc_cond == 7) && (dest_dat <= color_cmp))) {
                         old_dest_dat = dest_dat;
@@ -1209,19 +1371,22 @@ xga_short_stroke(svga_t *svga, uint8_t ssv)
                         dest_dat = (dest_dat & plane_mask) | (old_dest_dat & ~plane_mask);
                         if ((xga->accel.command & 0x30) == 0) {
                             if (ssv & 0x10)
-                                xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, xga->accel.px_map_width[xga->accel.dst_map] + 1);
+                                xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
                         } else if (((xga->accel.command & 0x30) == 0x10) && x) {
                             if (ssv & 0x10)
-                                xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, xga->accel.px_map_width[xga->accel.dst_map] + 1);
+                                xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
                         } else if (((xga->accel.command & 0x30) == 0x20) && y) {
                             if (ssv & 0x10)
-                                xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, xga->accel.px_map_width[xga->accel.dst_map] + 1);
+                                xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
                         }
                     }
                 }
             } else {
-                src_dat  = (((xga->accel.command >> 28) & 3) == 2) ? xga_accel_read_map_pixel(svga, xga->accel.src_map_x & 0xfff, xga->accel.src_map_y & 0xfff, xga->accel.src_map, srcbase, xga->accel.px_map_width[xga->accel.src_map] + 1, 1) : xga->accel.frgd_color;
-                dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, xga->accel.px_map_width[xga->accel.dst_map] + 1, 0);
+                src_dat  = (((xga->accel.command >> 28) & 3) == 2) ?
+                    xga_accel_read_map_pixel(svga, xga->accel.src_map_x & 0xfff,
+                                             xga->accel.src_map_y & 0xfff, xga->accel.src_map) :
+                    xga->accel.frgd_color;
+                dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map);
 
                 if ((xga->accel.cc_cond == 4) || ((xga->accel.cc_cond == 1) && (dest_dat > color_cmp)) || ((xga->accel.cc_cond == 2) && (dest_dat == color_cmp)) || ((xga->accel.cc_cond == 3) && (dest_dat < color_cmp)) || ((xga->accel.cc_cond == 5) && (dest_dat >= color_cmp)) || ((xga->accel.cc_cond == 6) && (dest_dat != color_cmp)) || ((xga->accel.cc_cond == 7) && (dest_dat <= color_cmp))) {
                     old_dest_dat = dest_dat;
@@ -1229,13 +1394,13 @@ xga_short_stroke(svga_t *svga, uint8_t ssv)
                     dest_dat = (dest_dat & plane_mask) | (old_dest_dat & ~plane_mask);
                     if ((xga->accel.command & 0x30) == 0) {
                         if (ssv & 0x10)
-                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, xga->accel.px_map_width[xga->accel.dst_map] + 1);
+                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
                     } else if (((xga->accel.command & 0x30) == 0x10) && x) {
                         if (ssv & 0x10)
-                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, xga->accel.px_map_width[xga->accel.dst_map] + 1);
+                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
                     } else if (((xga->accel.command & 0x30) == 0x20) && y) {
                         if (ssv & 0x10)
-                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, xga->accel.px_map_width[xga->accel.dst_map] + 1);
+                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
                     }
                 }
             }
@@ -1264,76 +1429,101 @@ xga_line_draw_write(svga_t *svga)
     uint32_t old_dest_dat = 0x00000000;
     uint32_t color_cmp  = xga->accel.color_cmp;
     uint32_t plane_mask = xga->accel.plane_mask;
-    uint32_t dstbase    = xga->accel.px_map_base[xga->accel.dst_map];
-    uint32_t srcbase    = xga->accel.px_map_base[xga->accel.src_map];
     int      y = xga->accel.blt_width;
     int      x = 0;
+    int      draw_pixel = 0;
     int16_t  dx;
     int16_t  dy;
     int16_t  cx;
     int16_t  cy;
-    int      err = xga->accel.bres_err_term;
-    int      draw_pixel = 0;
 
     cx = xga->accel.src_map_x & 0xfff;
     cy = xga->accel.src_map_y & 0xfff;
 
-    dx = xga->accel.dst_map_x & 0x1fff;
+    dx = xga->accel.dst_map_x;
     if (xga->accel.dst_map_x >= 0x1800)
         dx |= ~0x17ff;
 
-    dy = xga->accel.dst_map_y & 0x1fff;
+    dy = xga->accel.dst_map_y;
     if (xga->accel.dst_map_y >= 0x1800)
         dy |= ~0x17ff;
 
     if ((xga->accel.command & 0x30) == 0x30)
-        xga_log("Line Draw Write: BLTWIDTH=%d, BLTHEIGHT=%d, FRGDCOLOR=%04x, XDIR=%i, YDIR=%i, steep=%s, ERR=%04x.\n", xga->accel.blt_width, xga->accel.blt_height, xga->accel.frgd_color & 0xffff, xdir, ydir, (xga->accel.octant & 0x01) ? "0" : "1", err);
-
+        xga_log("Line Draw Write Fill: DX=%d, DY=%d, BLTWIDTH=%d, BLTHEIGHT=%d, FRGDCOLOR=%04x, negative XDIR=%i, negative YDIR=%i, YMAJOR=%d, ERR=%d, BRESK2=%d, BRESK1=%d, mask=%02x, frgdmix=%02x, bkgdmix=%02x.\n", dx, dy, xga->accel.blt_width, xga->accel.blt_height, xga->accel.frgd_color & 0xffff, (xga->accel.octant & 0x04), (xga->accel.octant & 0x02), (xga->accel.octant & 0x01), xga->accel.bres_err_term, xga->accel.bres_k2, xga->accel.bres_k1, xga->accel.command & 0xc0, xga->accel.frgd_mix & 0x1f, xga->accel.bkgd_mix & 0x1f);
 
     if (xga->accel.pat_src == 8) {
         if ((xga->accel.command & 0x30) == 0x30) {
             while (y >= 0) {
                 draw_pixel = 0;
 
-                if (xga->accel.octant & 0x01) {
-                    if (xga->accel.octant & 0x02) { /*Bottom-to-Top*/
+                if (xga->accel.octant & 0x01) { /*Y Major*/
+                    if (xga->accel.octant & 0x02) { /*Bottom to Top*/
                         if (x)
                             draw_pixel = 1;
-                    } else { /*Top-to-Bottom*/
+                    } else { /*Top to Bottom*/
                         if (y)
                             draw_pixel = 1;
                     }
-                } else if (!(xga->accel.octant & 0x04) && (err < (xga->accel.bres_k2 + xga->accel.bres_k1))) /*X+*/
-                    draw_pixel = 1;
-                else if ((xga->accel.octant & 0x04) && (err >= 0)) /*X-*/
-                    draw_pixel = 1;
-
-                if (xga->accel.command & 0xc0) {
-                    if ((dx >= xga->accel.mask_map_origin_x_off) && (dx <= ((xga->accel.px_map_width[0] & 0xfff) + xga->accel.mask_map_origin_x_off)) && (dy >= xga->accel.mask_map_origin_y_off) && (dy <= ((xga->accel.px_map_height[0] & 0xfff) + xga->accel.mask_map_origin_y_off))) {
-                        if (draw_pixel) {
-                            src_dat  = (((xga->accel.command >> 28) & 3) == 2) ? xga_accel_read_map_pixel(svga, cx, cy, xga->accel.src_map, srcbase, xga->accel.px_map_width[xga->accel.src_map] + 1, 1) : xga->accel.frgd_color;
-                            dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, xga->accel.px_map_width[xga->accel.dst_map] + 1, 0);
-
-                            if ((xga->accel.cc_cond == 4) || ((xga->accel.cc_cond == 1) && (dest_dat > color_cmp)) || ((xga->accel.cc_cond == 2) && (dest_dat == color_cmp)) || ((xga->accel.cc_cond == 3) && (dest_dat < color_cmp)) || ((xga->accel.cc_cond == 5) && (dest_dat >= color_cmp)) || ((xga->accel.cc_cond == 6) && (dest_dat != color_cmp)) || ((xga->accel.cc_cond == 7) && (dest_dat <= color_cmp))) {
-                                ROP(1, dest_dat, src_dat);
-                                xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, xga->accel.px_map_width[xga->accel.dst_map] + 1);
+                } else { /*X Major*/
+                    if (xga->accel.octant & 0x04) { /*Right to Left*/
+                         if (xga->accel.bres_err_term >= 0) {
+                            if (xga->accel.octant & 0x02) { /*Bottom to Top*/
+                                if (x)
+                                    draw_pixel = 1;
+                            } else { /*Top to Bottom*/
+                                if (y)
+                                    draw_pixel = 1;
                             }
                         }
-                    }
-                } else {
-                    if (draw_pixel) {
-                        src_dat  = (((xga->accel.command >> 28) & 3) == 2) ? xga_accel_read_map_pixel(svga, cx, cy, xga->accel.src_map, srcbase, xga->accel.px_map_width[xga->accel.src_map] + 1, 1) : xga->accel.frgd_color;
-                        dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, xga->accel.px_map_width[xga->accel.dst_map] + 1, 0);
-
-                        if ((xga->accel.cc_cond == 4) || ((xga->accel.cc_cond == 1) && (dest_dat > color_cmp)) || ((xga->accel.cc_cond == 2) && (dest_dat == color_cmp)) || ((xga->accel.cc_cond == 3) && (dest_dat < color_cmp)) || ((xga->accel.cc_cond == 5) && (dest_dat >= color_cmp)) || ((xga->accel.cc_cond == 6) && (dest_dat != color_cmp)) || ((xga->accel.cc_cond == 7) && (dest_dat <= color_cmp))) {
-                            ROP(1, dest_dat, src_dat);
-                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, xga->accel.px_map_width[xga->accel.dst_map] + 1);
+                    } else { /*Left to Right*/
+                         if (xga->accel.bres_err_term < (xga->accel.bres_k1 + xga->accel.bres_k2)) {
+                            if (xga->accel.octant & 0x02) { /*Bottom to Top*/
+                                if (x)
+                                    draw_pixel = 1;
+                            } else { /*Top to Bottom*/
+                                if (y)
+                                    draw_pixel = 1;
+                            }
                         }
                     }
                 }
 
-                if (x == xga->accel.blt_width)
+                xga_log("Draw Boundary: DX=%d, DY=%d, wrt_pix=%d, ymajor=%d, bottomtotop=%x, len=%d, err=%d, frgdmix=%02x.\n", dx, dy, draw_pixel, xga->accel.octant & 0x01, xga->accel.octant & 0x02, y, xga->accel.bres_err_term, xga->accel.frgd_mix & 0x1f);
+                if (xga->accel.command & 0xc0) {
+                    if ((dx >= xga->accel.mask_map_origin_x_off) && (dx <= ((xga->accel.px_map_width[0] & 0xfff) + xga->accel.mask_map_origin_x_off)) && (dy >= xga->accel.mask_map_origin_y_off) && (dy <= ((xga->accel.px_map_height[0] & 0xfff) + xga->accel.mask_map_origin_y_off)) && draw_pixel) {
+                        src_dat  = (((xga->accel.command >> 28) & 3) == 2) ?
+                            xga_accel_read_map_pixel(svga, cx, cy, xga->accel.src_map) :
+                            xga->accel.frgd_color;
+                        dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map);
+
+                        if ((xga->accel.cc_cond == 4) || ((xga->accel.cc_cond == 1) && (dest_dat > color_cmp)) || ((xga->accel.cc_cond == 2) && (dest_dat == color_cmp)) || ((xga->accel.cc_cond == 3) && (dest_dat < color_cmp)) || ((xga->accel.cc_cond == 5) && (dest_dat >= color_cmp)) || ((xga->accel.cc_cond == 6) && (dest_dat != color_cmp)) || ((xga->accel.cc_cond == 7) && (dest_dat <= color_cmp))) {
+                            old_dest_dat = dest_dat;
+                            ROP(1, dest_dat, src_dat);
+                            dest_dat = (dest_dat & plane_mask) | (old_dest_dat & ~plane_mask);
+                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
+                        }
+                    }
+                } else {
+                    if (draw_pixel) {
+                        src_dat  = (((xga->accel.command >> 28) & 3) == 2) ?
+                            xga_accel_read_map_pixel(svga, cx, cy, xga->accel.src_map) :
+                                xga->accel.frgd_color;
+                        dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map);
+
+                        if ((xga->accel.cc_cond == 4) || ((xga->accel.cc_cond == 1) && (dest_dat > color_cmp)) || ((xga->accel.cc_cond == 2) && (dest_dat == color_cmp)) || ((xga->accel.cc_cond == 3) && (dest_dat < color_cmp)) || ((xga->accel.cc_cond == 5) && (dest_dat >= color_cmp)) || ((xga->accel.cc_cond == 6) && (dest_dat != color_cmp)) || ((xga->accel.cc_cond == 7) && (dest_dat <= color_cmp))) {
+                            old_dest_dat = dest_dat;
+                            ROP(1, dest_dat, src_dat);
+                            dest_dat = (dest_dat & plane_mask) | (old_dest_dat & ~plane_mask);
+                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
+                        }
+                    }
+                }
+
+                if (x == xga->accel.blt_width) {
+                    xga->accel.dst_map_x = dx;
+                    xga->accel.dst_map_y = dy;
                     break;
+                }
 
                 if (xga->accel.octant & 0x01) {
                     if (xga->accel.octant & 0x02)
@@ -1341,28 +1531,28 @@ xga_line_draw_write(svga_t *svga)
                     else
                         dy++;
 
-                    if (err >= 0) {
-                        err += xga->accel.bres_k2;
+                    if (xga->accel.bres_err_term >= 0) {
+                        xga->accel.bres_err_term += xga->accel.bres_k2;
                         if (xga->accel.octant & 0x04)
                             dx--;
                         else
                             dx++;
                     } else
-                        err += xga->accel.bres_k1;
+                        xga->accel.bres_err_term += xga->accel.bres_k1;
                 } else {
                     if (xga->accel.octant & 0x04)
                         dx--;
                     else
                         dx++;
 
-                    if (err >= 0) {
-                        err += xga->accel.bres_k2;
+                    if (xga->accel.bres_err_term >= 0) {
+                        xga->accel.bres_err_term += xga->accel.bres_k2;
                         if (xga->accel.octant & 0x02)
                             dy--;
                         else
                             dy++;
                     } else
-                        err += xga->accel.bres_k1;
+                        xga->accel.bres_err_term += xga->accel.bres_k1;
                 }
                 x++;
                 y--;
@@ -1371,40 +1561,49 @@ xga_line_draw_write(svga_t *svga)
             while (y >= 0) {
                 if (xga->accel.command & 0xc0) {
                     if ((dx >= xga->accel.mask_map_origin_x_off) && (dx <= ((xga->accel.px_map_width[0] & 0xfff) + xga->accel.mask_map_origin_x_off)) && (dy >= xga->accel.mask_map_origin_y_off) && (dy <= ((xga->accel.px_map_height[0] & 0xfff) + xga->accel.mask_map_origin_y_off))) {
-                        src_dat  = (((xga->accel.command >> 28) & 3) == 2) ? xga_accel_read_map_pixel(svga, xga->accel.src_map_x & 0xfff, xga->accel.src_map_y & 0xfff, xga->accel.src_map, srcbase, xga->accel.px_map_width[xga->accel.src_map] + 1, 1) : xga->accel.frgd_color;
-                        dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, xga->accel.px_map_width[xga->accel.dst_map] + 1, 0);
+                        src_dat  = (((xga->accel.command >> 28) & 3) == 2) ?
+                            xga_accel_read_map_pixel(svga, xga->accel.src_map_x & 0xfff,
+                                                     xga->accel.src_map_y & 0xfff, xga->accel.src_map) :
+                            xga->accel.frgd_color;
+                        dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map);
 
                         if ((xga->accel.cc_cond == 4) || ((xga->accel.cc_cond == 1) && (dest_dat > color_cmp)) || ((xga->accel.cc_cond == 2) && (dest_dat == color_cmp)) || ((xga->accel.cc_cond == 3) && (dest_dat < color_cmp)) || ((xga->accel.cc_cond == 5) && (dest_dat >= color_cmp)) || ((xga->accel.cc_cond == 6) && (dest_dat != color_cmp)) || ((xga->accel.cc_cond == 7) && (dest_dat <= color_cmp))) {
                             old_dest_dat = dest_dat;
                             ROP(1, dest_dat, src_dat);
                             dest_dat = (dest_dat & plane_mask) | (old_dest_dat & ~plane_mask);
                             if ((xga->accel.command & 0x30) == 0)
-                                xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, xga->accel.px_map_width[xga->accel.dst_map] + 1);
+                                xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
                             else if (((xga->accel.command & 0x30) == 0x10) && x)
-                                xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, xga->accel.px_map_width[xga->accel.dst_map] + 1);
+                                xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
                             else if (((xga->accel.command & 0x30) == 0x20) && y)
-                                xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, xga->accel.px_map_width[xga->accel.dst_map] + 1);
+                                xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
                         }
                     }
                 } else {
-                    src_dat  = (((xga->accel.command >> 28) & 3) == 2) ? xga_accel_read_map_pixel(svga, xga->accel.src_map_x & 0xfff, xga->accel.src_map_y & 0xfff, xga->accel.src_map, srcbase, xga->accel.px_map_width[xga->accel.src_map] + 1, 1) : xga->accel.frgd_color;
-                    dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, xga->accel.px_map_width[xga->accel.dst_map] + 1, 0);
+                    src_dat  = (((xga->accel.command >> 28) & 3) == 2) ?
+                        xga_accel_read_map_pixel(svga, xga->accel.src_map_x & 0xfff,
+                                                 xga->accel.src_map_y & 0xfff, xga->accel.src_map) :
+                        xga->accel.frgd_color;
+                    dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map);
 
                     if ((xga->accel.cc_cond == 4) || ((xga->accel.cc_cond == 1) && (dest_dat > color_cmp)) || ((xga->accel.cc_cond == 2) && (dest_dat == color_cmp)) || ((xga->accel.cc_cond == 3) && (dest_dat < color_cmp)) || ((xga->accel.cc_cond == 5) && (dest_dat >= color_cmp)) || ((xga->accel.cc_cond == 6) && (dest_dat != color_cmp)) || ((xga->accel.cc_cond == 7) && (dest_dat <= color_cmp))) {
                         old_dest_dat = dest_dat;
                         ROP(1, dest_dat, src_dat);
                         dest_dat = (dest_dat & plane_mask) | (old_dest_dat & ~plane_mask);
                         if ((xga->accel.command & 0x30) == 0)
-                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, xga->accel.px_map_width[xga->accel.dst_map] + 1);
+                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
                         else if (((xga->accel.command & 0x30) == 0x10) && x)
-                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, xga->accel.px_map_width[xga->accel.dst_map] + 1);
+                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
                         else if (((xga->accel.command & 0x30) == 0x20) && y)
-                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, xga->accel.px_map_width[xga->accel.dst_map] + 1);
+                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
                     }
                 }
 
-                if (!y)
+                if (!y) {
+                    xga->accel.dst_map_x = dx;
+                    xga->accel.dst_map_y = dy;
                     break;
+                }
 
                 if (xga->accel.octant & 0x01) {
                     if (xga->accel.octant & 0x02)
@@ -1412,28 +1611,28 @@ xga_line_draw_write(svga_t *svga)
                     else
                         dy++;
 
-                    if (err >= 0) {
-                        err += xga->accel.bres_k2;
+                    if (xga->accel.bres_err_term >= 0) {
+                        xga->accel.bres_err_term += xga->accel.bres_k2;
                         if (xga->accel.octant & 0x04)
                             dx--;
                         else
                             dx++;
                     } else
-                        err += xga->accel.bres_k1;
+                        xga->accel.bres_err_term += xga->accel.bres_k1;
                 } else {
                     if (xga->accel.octant & 0x04)
                         dx--;
                     else
                         dx++;
 
-                    if (err >= 0) {
-                        err += xga->accel.bres_k2;
+                    if (xga->accel.bres_err_term >= 0) {
+                        xga->accel.bres_err_term += xga->accel.bres_k2;
                         if (xga->accel.octant & 0x02)
                             dy--;
                         else
                             dy++;
                     } else
-                        err += xga->accel.bres_k1;
+                        xga->accel.bres_err_term += xga->accel.bres_k1;
                 }
                 y--;
                 x++;
@@ -1451,13 +1650,10 @@ xga_bitblt(svga_t *svga)
     uint32_t old_dest_dat;
     uint32_t color_cmp  = xga->accel.color_cmp;
     uint32_t plane_mask = xga->accel.plane_mask;
-    uint32_t patbase    = xga->accel.px_map_base[xga->accel.pat_src];
-    uint32_t dstbase    = xga->accel.px_map_base[xga->accel.dst_map];
-    uint32_t srcbase    = xga->accel.px_map_base[xga->accel.src_map];
-    uint32_t patwidth   = xga->accel.px_map_width[xga->accel.pat_src];
+    uint32_t patwidth;
     uint32_t dstwidth   = xga->accel.px_map_width[xga->accel.dst_map];
     uint32_t srcwidth   = xga->accel.px_map_width[xga->accel.src_map];
-    uint32_t patheight  = xga->accel.px_map_height[xga->accel.pat_src];
+    uint32_t patheight;
     uint32_t srcheight  = xga->accel.px_map_height[xga->accel.src_map];
     uint32_t dstheight  = xga->accel.px_map_height[xga->accel.dst_map];
     uint32_t frgdcol = xga->accel.frgd_color;
@@ -1475,26 +1671,29 @@ xga_bitblt(svga_t *svga)
     xga->accel.sy = xga->accel.src_map_y & 0xfff;
     xga->accel.px = xga->accel.pat_map_x & 0xfff;
     xga->accel.py = xga->accel.pat_map_y & 0xfff;
-    dx = xga->accel.dst_map_x & 0x1fff;
-    dy = xga->accel.dst_map_y & 0x1fff;
+    dx = xga->accel.dst_map_x;
+    dy = xga->accel.dst_map_y;
     if (xga->accel.dst_map_x >= 0x1800)
         dx |= ~0x17ff;
     if (xga->accel.dst_map_y >= 0x1800)
         dy |= ~0x17ff;
-    xga_log("D(%d,%d), SWH(%d,%d), BLT(%d,%d), dstwidth=%d.\n", dx, dy, xga->accel.x, xga->accel.y, srcwidth, srcheight, dstwidth);
+
+    xga_log("D(%d,%d), SWH(%d,%d), BLT(%d,%d), dstwidth=%d, frgdcol=%04x, bkgdcol=%04x.\n", dx, dy, xga->accel.x, xga->accel.y, srcwidth, srcheight, dstwidth, frgdcol, bkgdcol);
 
     xga->accel.pattern = 0;
     xga->accel.filling = 0;
+    xga->accel.y_len = 0;
 
-    xga_log("XGA bitblt linear endian reverse=%d, access_mode=%x, octanty=%d, src command = %08x, "
+    xga_log("XGA bitblt access_mode=%x, octanty=%d, src command=%08x, "
             "pxsrcmap=%x, pxpatmap=%x, pxdstmap=%x, srcmap=%d, patmap=%d, dstmap=%d, "
-            "usesrcvramfr=%d, usevrambk=%d.\n",
-            xga->linear_endian_reverse, xga->access_mode & 0x0f, ydir, xga->accel.command,
+            "usesrcvramfr=%d, usevrambk=%d, planemask=%04x, frgdcol=%04x, bkgdcol=%04x, bgmix=%02x, fgmix=%02x.\n",
+            xga->access_mode & 0x0f, ydir, xga->accel.command,
             xga->accel.px_map_format[xga->accel.src_map] & 0x0f,
-            xga->accel.px_map_format[xga->accel.pat_src] & 0x0f,
+            xga->accel.px_map_format[xga->accel.pat_src & 0x03] & 0x0f,
             xga->accel.px_map_format[xga->accel.dst_map] & 0x0f,
             xga->accel.src_map, xga->accel.pat_src,
-            xga->accel.dst_map, ((xga->accel.command >> 28) & 3), ((xga->accel.command >> 30) & 3));
+            xga->accel.dst_map, ((xga->accel.command >> 28) & 3), ((xga->accel.command >> 30) & 3),
+            xga->accel.plane_mask, frgdcol, bkgdcol, xga->accel.bkgd_mix & 0x1f, xga->accel.frgd_mix & 0x1f);
 
     if (xga->accel.pat_src == 8) {
         if (srcheight == 7)
@@ -1502,44 +1701,45 @@ xga_bitblt(svga_t *svga)
         else {
             if ((dstwidth == (xga->h_disp - 1)) && (srcwidth == 1)) {
                 if ((xga->accel.dst_map == 1) && (xga->accel.src_map == 2)) {
-                    if ((xga->accel.px_map_format[xga->accel.dst_map] >= 0x0b) && (xga->accel.px_map_format[xga->accel.src_map] >= 0x0b))
+                    if ((xga->accel.px_map_format[xga->accel.dst_map] >= 0x0a) && (xga->accel.px_map_format[xga->accel.src_map] >= 0x0a))
                         xga->accel.pattern = 1;
+                    else if (!(xga->accel.px_map_format[xga->accel.dst_map] & 0x08) && !(xga->accel.px_map_format[xga->accel.src_map] & 0x08)) {
+                        if ((xga->accel.px_map_format[xga->accel.dst_map] >= 0x02) && (xga->accel.px_map_format[xga->accel.src_map] >= 0x02))
+                            xga->accel.pattern = 1;
+                    }
                 }
             }
         }
 
-        xga_log("PAT8: PatFormat=%x, SrcFormat=%x, DstFormat=%x.\n", xga->accel.px_map_format[xga->accel.pat_src] & 8, (xga->accel.px_map_format[xga->accel.src_map]), (xga->accel.px_map_format[xga->accel.dst_map]));
-        xga_log("Pattern Map = 8: CMD = %08x: SRCBase = %08x, DSTBase = %08x, from/to vram dir = %d, "
-                "cmd dir = %06x\n", xga->accel.command, srcbase, dstbase, xga->from_to_vram,
-                xga->accel.dir_cmd);
-        xga_log("CMD = %08x: Y = %d, X = %d, patsrc = %02x, srcmap = %d, dstmap = %d, py = %d, "
-                "sy = %d, dy = %d, width0 = %d, width1 = %d, width2 = %d, width3 = %d\n",
-                xga->accel.command, xga->accel.y, xga->accel.x, xga->accel.pat_src, xga->accel.src_map,
-                xga->accel.dst_map, xga->accel.py, xga->accel.sy, dy,
-                xga->accel.px_map_width[0], xga->accel.px_map_width[1],
-                xga->accel.px_map_width[2], xga->accel.px_map_width[3]);
+        xga_log("CMD=%08x, EnablePat=%d, SRC%d, DST%d: SrcFormat=%x, DstFormat=%x, SrcWidth=%d, SrcHeight=%d, DstWidth=%d, DstHeight=%d, sx=%d, sy=%d.\n", xga->accel.command,
+              xga->accel.pattern, xga->accel.src_map, xga->accel.dst_map, (xga->accel.px_map_format[xga->accel.src_map] & 0x0f), (xga->accel.px_map_format[xga->accel.dst_map] & 0x0f),
+              srcwidth, srcheight, dstwidth, dstheight, xga->accel.sx, xga->accel.sy);
 
         while (xga->accel.y >= 0) {
             if (xga->accel.command & 0xc0) {
                 if ((dx >= xga->accel.mask_map_origin_x_off) && (dx <= ((xga->accel.px_map_width[0] & 0xfff) + xga->accel.mask_map_origin_x_off)) && (dy >= xga->accel.mask_map_origin_y_off) && (dy <= ((xga->accel.px_map_height[0] & 0xfff) + xga->accel.mask_map_origin_y_off))) {
-                    src_dat  = (((xga->accel.command >> 28) & 3) == 2) ? xga_accel_read_map_pixel(svga, xga->accel.sx, xga->accel.sy, xga->accel.src_map, srcbase, srcwidth + 1, 1) : frgdcol;
-                    dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dstwidth + 1, 0);
+                    src_dat  = (((xga->accel.command >> 28) & 3) == 2) ?
+                        xga_accel_read_map_pixel(svga, xga->accel.sx, xga->accel.sy, xga->accel.src_map) :
+                            frgdcol;
+                    dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map);
                     if ((xga->accel.cc_cond == 4) || ((xga->accel.cc_cond == 1) && (dest_dat > color_cmp)) || ((xga->accel.cc_cond == 2) && (dest_dat == color_cmp)) || ((xga->accel.cc_cond == 3) && (dest_dat < color_cmp)) || ((xga->accel.cc_cond == 5) && (dest_dat >= color_cmp)) || ((xga->accel.cc_cond == 6) && (dest_dat != color_cmp)) || ((xga->accel.cc_cond == 7) && (dest_dat <= color_cmp))) {
                         old_dest_dat = dest_dat;
                         ROP(1, dest_dat, src_dat);
                         dest_dat = (dest_dat & plane_mask) | (old_dest_dat & ~plane_mask);
-                        xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, dstwidth + 1);
+                        xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
                     }
                 }
             } else {
                 if ((dx >= 0) && (dx <= dstwidth) && (dy >= 0) && (dy <= dstheight)) {
-                    src_dat  = (((xga->accel.command >> 28) & 3) == 2) ? xga_accel_read_map_pixel(svga, xga->accel.sx, xga->accel.sy, xga->accel.src_map, srcbase, srcwidth + 1, 1) : frgdcol;
-                    dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dstwidth + 1, 0);
+                    src_dat  = (((xga->accel.command >> 28) & 3) == 2) ?
+                        xga_accel_read_map_pixel(svga, xga->accel.sx, xga->accel.sy, xga->accel.src_map) :
+                            frgdcol;
+                    dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map);
                     if ((xga->accel.cc_cond == 4) || ((xga->accel.cc_cond == 1) && (dest_dat > color_cmp)) || ((xga->accel.cc_cond == 2) && (dest_dat == color_cmp)) || ((xga->accel.cc_cond == 3) && (dest_dat < color_cmp)) || ((xga->accel.cc_cond == 5) && (dest_dat >= color_cmp)) || ((xga->accel.cc_cond == 6) && (dest_dat != color_cmp)) || ((xga->accel.cc_cond == 7) && (dest_dat <= color_cmp))) {
                         old_dest_dat = dest_dat;
                         ROP(1, dest_dat, src_dat);
                         dest_dat = (dest_dat & plane_mask) | (old_dest_dat & ~plane_mask);
-                        xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, dstwidth + 1);
+                        xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
                     }
                 }
             }
@@ -1550,16 +1750,18 @@ xga_bitblt(svga_t *svga)
                 xga->accel.sx += xdir;
 
             dx += xdir;
+
             xga->accel.x--;
             if (xga->accel.x < 0) {
                 xga->accel.x = xga->accel.blt_width & 0xfff;
 
-                dx = xga->accel.dst_map_x & 0x1fff;
+                dx = xga->accel.dst_map_x;
                 if (xga->accel.dst_map_x >= 0x1800)
                     dx |= ~0x17ff;
                 xga->accel.sx = xga->accel.src_map_x & 0xfff;
 
                 dy += ydir;
+                xga->accel.y_len++;
 
                 if (xga->accel.pattern)
                     xga->accel.sy = ((xga->accel.sy + ydir) & srcheight) | (xga->accel.sy & ~srcheight);
@@ -1576,156 +1778,175 @@ xga_bitblt(svga_t *svga)
             }
         }
     } else if (xga->accel.pat_src >= 1) {
-        if (patheight == 7)
-            xga->accel.pattern = 1;
-        else {
+        patwidth = xga->accel.px_map_width[xga->accel.pat_src];
+        patheight = xga->accel.px_map_height[xga->accel.pat_src];
+
+        if (patheight == 7) {
+            if (xga->accel.src_map != 1)
+                xga->accel.pattern = 1;
+            else if ((xga->accel.src_map == 1) && (patwidth == 7))
+                xga->accel.pattern = 1;
+        } else {
             if (dstwidth == (xga->h_disp - 1)) {
                 if (srcwidth == (xga->h_disp - 1)) {
                     if ((xga->accel.src_map == 1) && (xga->accel.dst_map == 1) && (xga->accel.pat_src == 2)) {
-                        if ((xga->accel.px_map_format[xga->accel.dst_map] >= 0x0b) && (xga->accel.px <= 7) && (xga->accel.py <= 3))
+                        if ((xga->accel.px_map_format[xga->accel.dst_map] >= 0x0a) && (xga->accel.px <= 7) && (xga->accel.py <= 3))
                             xga->accel.pattern = 1;
                     }
                 } else {
                     if (!xga->accel.src_map && (xga->accel.dst_map == 1) && (xga->accel.pat_src == 2)) {
-                        if ((xga->accel.px_map_format[xga->accel.dst_map] >= 0x0b) && (xga->accel.px <= 7) && (xga->accel.py <= 3)) {
-                            if ((patwidth >= 7) && ((xga->accel.command & 0xc0) == 0x40))
+                        if ((xga->accel.px_map_format[xga->accel.dst_map] >= 0x0a) && (xga->accel.px <= 7) && (xga->accel.py <= 3)) {
+                            if (patheight > 1)
                                 xga->accel.pattern = 0;
                             else
                                 xga->accel.pattern = 1;
+                        } else if (!(xga->accel.px_map_format[xga->accel.dst_map] & 0x08)) {
+                            if ((xga->accel.px_map_format[xga->accel.dst_map] >= 0x02) && (xga->accel.px <= 7) && (xga->accel.py <= 3)) {
+                                if (patheight > 1)
+                                    xga->accel.pattern = 0;
+                                else
+                                    xga->accel.pattern = 1;
+                            }
                         }
                     }
                 }
             }
         }
 
-        xga_log("PAT%d: PatFormat=%x, SrcFormat=%x, DstFormat=%x.\n", xga->accel.pat_src, xga->accel.px_map_format[xga->accel.pat_src] & 8, (xga->accel.px_map_format[xga->accel.src_map]), (xga->accel.px_map_format[xga->accel.dst_map]));
-        xga_log("XGA bitblt linear endian reverse=%d, octanty=%d, src command = %08x, pxsrcmap=%x, "
-                "pxdstmap=%x, srcmap=%d, patmap=%d, dstmap=%d, dstwidth=%d, dstheight=%d, srcwidth=%d, "
-                "srcheight=%d, dstbase=%08x, srcbase=%08x.\n", xga->linear_endian_reverse, ydir,
-                xga->accel.command, xga->accel.px_map_format[xga->accel.src_map] & 0x0f,
-                xga->accel.px_map_format[xga->accel.dst_map] & 0x0f, xga->accel.src_map,
-                xga->accel.pat_src, xga->accel.dst_map, dstwidth, dstheight, srcwidth, srcheight,
-                dstbase, srcbase);
-        xga_log("Pattern Map = %d: CMD = %08x: PATBase = %08x, SRCBase = %08x, DSTBase = %08x\n",
-                xga->accel.pat_src, xga->accel.command, patbase, srcbase, dstbase);
-        xga_log("CMD = %08x: Y = %d, X = %d, patsrc = %02x, srcmap = %d, dstmap = %d, py = %d, "
-                "sy = %d, dy = %d, width0 = %d, width1 = %d, width2 = %d, width3 = %d, bkgdcol = %02x\n",
-                xga->accel.command, xga->accel.y, xga->accel.x, xga->accel.pat_src,
-                xga->accel.src_map, xga->accel.dst_map, xga->accel.py, xga->accel.sy, xga->accel.dy,
-                xga->accel.px_map_width[0], xga->accel.px_map_width[1],
-                xga->accel.px_map_width[2], xga->accel.px_map_width[3], bkgdcol);
+        xga_log("CMD=%08x, EnablePat=%d, PAT%d, SRC%d, DST%d: PatFormat=%x, SrcFormat=%x, DstFormat=%x, PatWidth=%d, PatHeight=%d, SrcWidth=%d, SrcHeight=%d, DstWidth=%d, DstHeight=%d, px=%d, py=%d.\n", xga->accel.command,
+              xga->accel.pattern, xga->accel.pat_src, xga->accel.src_map, xga->accel.dst_map, xga->accel.px_map_format[xga->accel.pat_src], (xga->accel.px_map_format[xga->accel.src_map] & 0x0f), (xga->accel.px_map_format[xga->accel.dst_map] & 0x0f),
+              patwidth, patheight, srcwidth, srcheight, dstwidth, dstheight, xga->accel.px, xga->accel.py);
 
-        if ((((xga->accel.command >> 24) & 0x0f) == 0x0a) && ((xga->accel.bkgd_mix & 0x1f) == 5)) {
-            while (xga->accel.y >= 0) {
-                mix = xga_accel_read_pattern_map_pixel(svga, xga->accel.px, xga->accel.py, xga->accel.pat_src, patbase, patwidth + 1);
-                if (mix)
-                    xga->accel.filling = !xga->accel.filling;
+        if (((xga->accel.command >> 24) & 0x0f) == 0x0a) {
+            if ((xga->accel.bkgd_mix & 0x1f) == 0x05) {
+                while (xga->accel.y >= 0) {
+                    mix = xga_accel_read_pattern_map_pixel(svga, xga->accel.px, xga->accel.py);
+                    if (mix)
+                        xga->accel.filling ^= 1;
 
-                if (xga->accel.command & 0xc0) {
-                    if ((dx >= xga->accel.mask_map_origin_x_off) && (dx <= ((xga->accel.px_map_width[0] & 0xfff) + xga->accel.mask_map_origin_x_off)) && (dy >= xga->accel.mask_map_origin_y_off) && (dy <= ((xga->accel.px_map_height[0] & 0xfff) + xga->accel.mask_map_origin_y_off))) {
-                        src_dat  = (((xga->accel.command >> 28) & 3) == 2) ? xga_accel_read_map_pixel(svga, xga->accel.sx, xga->accel.sy, xga->accel.src_map, srcbase, srcwidth + 1, 1) : frgdcol;
-                        if (xga->accel.filling) {
-                            dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, 1024, 0);
+                    xga_log("Area Fill Command: dx=%d, dy=%d, mix=%x, filling=%x.\n", dx, dy, mix, xga->accel.filling);
+
+                    if (xga->accel.command & 0xc0) {
+                        if ((dx >= xga->accel.mask_map_origin_x_off) && (dx <= ((xga->accel.px_map_width[0] & 0xfff) + xga->accel.mask_map_origin_x_off)) && (dy >= xga->accel.mask_map_origin_y_off) && (dy <= ((xga->accel.px_map_height[0] & 0xfff) + xga->accel.mask_map_origin_y_off)) && xga->accel.filling) {
+                            src_dat  = (((xga->accel.command >> 28) & 3) == 2) ?
+                                xga_accel_read_map_pixel(svga, xga->accel.sx, xga->accel.sy, xga->accel.src_map) :
+                                frgdcol;
+                            dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map);
                             if ((xga->accel.cc_cond == 4) || ((xga->accel.cc_cond == 1) && (dest_dat > color_cmp)) || ((xga->accel.cc_cond == 2) && (dest_dat == color_cmp)) || ((xga->accel.cc_cond == 3) && (dest_dat < color_cmp)) || ((xga->accel.cc_cond == 5) && (dest_dat >= color_cmp)) || ((xga->accel.cc_cond == 6) && (dest_dat != color_cmp)) || ((xga->accel.cc_cond == 7) && (dest_dat <= color_cmp))) {
                                 old_dest_dat = dest_dat;
                                 ROP(1, dest_dat, src_dat);
                                 dest_dat = (dest_dat & plane_mask) | (old_dest_dat & ~plane_mask);
-                                xga_log("1SRCDat=%02x, DSTDat=%02x, Old=%02x, MIX=%d.\n", src_dat, dest_dat, old_dest_dat, area_state);
-                                xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, dstwidth + 1);
+                                xga_log("XGA Area Fill1: Dest=%02x, Src=%02x, OldD=%02x.\n", dest_dat, src_dat, old_dest_dat);
+                                xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
                             }
                         }
-                    }
-                } else {
-                    if ((dx >= 0) && (dx <= dstwidth) && (dy >= 0) && (dy <= dstheight)) {
-                        src_dat  = (((xga->accel.command >> 28) & 3) == 2) ? xga_accel_read_map_pixel(svga, xga->accel.sx, xga->accel.sy, xga->accel.src_map, srcbase, srcwidth + 1, 1) : frgdcol;
-                        if (xga->accel.filling) {
-                            dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dstwidth + 1, 0);
+                    } else {
+                        if ((dx >= 0) && (dx <= dstwidth) && (dy >= 0) && (dy <= dstheight) && xga->accel.filling) {
+                            src_dat = (((xga->accel.command >> 28) & 3) == 2) ?
+                                xga_accel_read_map_pixel(svga, xga->accel.sx, xga->accel.sy, xga->accel.src_map) :
+                                frgdcol;
+                            dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map);
                             if ((xga->accel.cc_cond == 4) || ((xga->accel.cc_cond == 1) && (dest_dat > color_cmp)) || ((xga->accel.cc_cond == 2) && (dest_dat == color_cmp)) || ((xga->accel.cc_cond == 3) && (dest_dat < color_cmp)) || ((xga->accel.cc_cond == 5) && (dest_dat >= color_cmp)) || ((xga->accel.cc_cond == 6) && (dest_dat != color_cmp)) || ((xga->accel.cc_cond == 7) && (dest_dat <= color_cmp))) {
                                 old_dest_dat = dest_dat;
                                 ROP(1, dest_dat, src_dat);
                                 dest_dat = (dest_dat & plane_mask) | (old_dest_dat & ~plane_mask);
-                                xga_log("2Fill: NumXY(%d,%d): DXY(%d,%d): SRCDat=%02x, DSTDat=%02x, Old=%02x, frgdcol=%02x, bkgdcol=%02x, MIX=%d, frgdmix=%02x, bkgdmix=%02x, dstmapfmt=%02x, srcmapfmt=%02x, srcmapnum=%d.\n", x, y, dx, dy, src_dat, dest_dat, old_dest_dat, frgdcol, bkgdcol, area_state, xga->accel.frgd_mix & 0x1f, xga->accel.bkgd_mix & 0x1f, xga->accel.px_map_format[xga->accel.dst_map] & 0x0f, xga->accel.px_map_format[xga->accel.src_map] & 0x0f, xga->accel.src_map);
-                                xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, dstwidth + 1);
+                                xga_log("XGA Area Fill2: Dest=%02x, Src=%02x, OldD=%02x.\n", dest_dat, src_dat, old_dest_dat);
+                                xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
                             }
                         }
                     }
-                }
 
-                xga->accel.sx = ((xga->accel.sx + xdir) & srcwidth) | (xga->accel.sx & ~srcwidth);
-                xga->accel.px++;
+                    xga->accel.sx = ((xga->accel.sx + xdir) & srcwidth) | (xga->accel.sx & ~srcwidth);
+                    xga->accel.px++;
 
-                dx++;
-                xga->accel.x--;
-                if (xga->accel.x < 0) {
-                    xga->accel.y--;
-                    xga->accel.x = xga->accel.blt_width & 0xfff;
+                    dx++;
+                    xga->accel.x--;
+                    if (xga->accel.x < 0) {
+                        xga->accel.y--;
+                        xga->accel.x = xga->accel.blt_width & 0xfff;
 
-                    dx = xga->accel.dst_map_x & 0x1fff;
-                    if (xga->accel.dst_map_x >= 0x1800)
-                        dx |= ~0x17ff;
+                        dx = xga->accel.dst_map_x;
+                        if (xga->accel.dst_map_x >= 0x1800)
+                            dx |= ~0x17ff;
 
-                    xga->accel.sx = xga->accel.src_map_x & 0xfff;
-                    xga->accel.px = xga->accel.pat_map_x & 0xfff;
+                        xga->accel.sx = xga->accel.src_map_x & 0xfff;
+                        xga->accel.px = xga->accel.pat_map_x & 0xfff;
 
-                    xga->accel.sy = ((xga->accel.sy + ydir) & srcheight) | (xga->accel.sy & ~srcheight);
-                    xga->accel.py++;
+                        xga->accel.sy = ((xga->accel.sy + ydir) & srcheight) | (xga->accel.sy & ~srcheight);
+                        xga->accel.py++;
 
-                    dy++;
-                    xga->accel.filling = 0;
+                        dy++;
+                        xga->accel.filling = 0;
 
-                    if (xga->accel.y < 0)
-                        return;
+                        if (xga->accel.y < 0) {
+                            xga->accel.dst_map_x = dx;
+                            xga->accel.dst_map_y = dy;
+                            return;
+                        }
+                    }
                 }
             }
         } else {
             while (xga->accel.y >= 0) {
-                mix = xga_accel_read_pattern_map_pixel(svga, xga->accel.px, xga->accel.py, xga->accel.pat_src, patbase, patwidth + 1);
+                mix = xga_accel_read_pattern_map_pixel(svga, xga->accel.px, xga->accel.py);
 
                 if (xga->accel.command & 0xc0) {
                     if ((dx >= xga->accel.mask_map_origin_x_off) && (dx <= ((xga->accel.px_map_width[0] & 0xfff) + xga->accel.mask_map_origin_x_off)) && (dy >= xga->accel.mask_map_origin_y_off) && (dy <= ((xga->accel.px_map_height[0] & 0xfff) + xga->accel.mask_map_origin_y_off))) {
                         if (mix)
-                            src_dat = (((xga->accel.command >> 28) & 3) == 2) ? xga_accel_read_map_pixel(svga, xga->accel.sx, xga->accel.sy, xga->accel.src_map, srcbase, srcwidth + 1, 1) : frgdcol;
+                            src_dat = (((xga->accel.command >> 28) & 3) == 2) ?
+                                xga_accel_read_map_pixel(svga, xga->accel.sx, xga->accel.sy, xga->accel.src_map) :
+                                frgdcol;
                         else
-                            src_dat = (((xga->accel.command >> 30) & 3) == 2) ? xga_accel_read_map_pixel(svga, xga->accel.sx, xga->accel.sy, xga->accel.src_map, srcbase, srcwidth + 1, 1) : bkgdcol;
+                            src_dat = (((xga->accel.command >> 30) & 3) == 2) ?
+                                 xga_accel_read_map_pixel(svga, xga->accel.sx, xga->accel.sy, xga->accel.src_map) :
+                                 bkgdcol;
 
-                        dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dstwidth + 1, 0);
+                        dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map);
                         if ((xga->accel.cc_cond == 4) || ((xga->accel.cc_cond == 1) && (dest_dat > color_cmp)) || ((xga->accel.cc_cond == 2) && (dest_dat == color_cmp)) || ((xga->accel.cc_cond == 3) && (dest_dat < color_cmp)) || ((xga->accel.cc_cond == 5) && (dest_dat >= color_cmp)) || ((xga->accel.cc_cond == 6) && (dest_dat != color_cmp)) || ((xga->accel.cc_cond == 7) && (dest_dat <= color_cmp))) {
                             old_dest_dat = dest_dat;
                             ROP(mix, dest_dat, src_dat);
                             dest_dat = (dest_dat & plane_mask) | (old_dest_dat & ~plane_mask);
-                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, dstwidth + 1);
+                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
                         }
                     }
                 } else {
                     if ((dx >= 0) && (dx <= dstwidth) && (dy >= 0) && (dy <= dstheight)) {
                         if (mix)
-                            src_dat = (((xga->accel.command >> 28) & 3) == 2) ? xga_accel_read_map_pixel(svga, xga->accel.sx, xga->accel.sy, xga->accel.src_map, srcbase, srcwidth + 1, 1) : frgdcol;
+                            src_dat = (((xga->accel.command >> 28) & 3) == 2) ?
+                                xga_accel_read_map_pixel(svga, xga->accel.sx, xga->accel.sy, xga->accel.src_map) :
+                                frgdcol;
                         else
-                            src_dat = (((xga->accel.command >> 30) & 3) == 2) ? xga_accel_read_map_pixel(svga, xga->accel.sx, xga->accel.sy, xga->accel.src_map, srcbase, srcwidth + 1, 1) : bkgdcol;
+                            src_dat = (((xga->accel.command >> 30) & 3) == 2) ?
+                                xga_accel_read_map_pixel(svga, xga->accel.sx, xga->accel.sy, xga->accel.src_map) :
+                                bkgdcol;
 
-                        dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dstwidth + 1, 0);
+                        dest_dat = xga_accel_read_map_pixel(svga, dx, dy, xga->accel.dst_map);
                         if ((xga->accel.cc_cond == 4) || ((xga->accel.cc_cond == 1) && (dest_dat > color_cmp)) || ((xga->accel.cc_cond == 2) && (dest_dat == color_cmp)) || ((xga->accel.cc_cond == 3) && (dest_dat < color_cmp)) || ((xga->accel.cc_cond == 5) && (dest_dat >= color_cmp)) || ((xga->accel.cc_cond == 6) && (dest_dat != color_cmp)) || ((xga->accel.cc_cond == 7) && (dest_dat <= color_cmp))) {
                             old_dest_dat = dest_dat;
                             ROP(mix, dest_dat, src_dat);
                             dest_dat = (dest_dat & plane_mask) | (old_dest_dat & ~plane_mask);
-                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dstbase, dest_dat, dstwidth + 1);
+                            xga_accel_write_map_pixel(svga, dx, dy, xga->accel.dst_map, dest_dat);
                         }
                     }
                 }
 
                 xga->accel.sx += xdir;
+
                 if (xga->accel.pattern)
                     xga->accel.px = ((xga->accel.px + xdir) & patwidth) | (xga->accel.px & ~patwidth);
                 else
                     xga->accel.px += xdir;
 
+                xga_log("MIX=%d, DX=%d, DY=%d, LX=%d, LY=%d, PX=%d, PY=%d, SX=%d, SY=%d.\n", mix, dx, dy, xga->accel.x, xga->accel.y, xga->accel.px, xga->accel.py, xga->accel.sx, xga->accel.sy);
+
                 dx += xdir;
+
                 xga->accel.x--;
                 if (xga->accel.x < 0) {
                     xga->accel.y--;
                     xga->accel.x = xga->accel.blt_width & 0xfff;
 
-                    dx = xga->accel.dst_map_x & 0x1fff;
+                    dx = xga->accel.dst_map_x;
                     if (xga->accel.dst_map_x >= 0x1800)
                         dx |= ~0x17ff;
 
@@ -1733,6 +1954,7 @@ xga_bitblt(svga_t *svga)
                     xga->accel.px = xga->accel.pat_map_x & 0xfff;
 
                     xga->accel.sy += ydir;
+
                     if (xga->accel.pattern)
                         xga->accel.py = ((xga->accel.py + ydir) & patheight) | (xga->accel.py & ~patheight);
                     else
@@ -1754,12 +1976,28 @@ xga_bitblt(svga_t *svga)
 static void
 xga_mem_write(uint32_t addr, uint32_t val, xga_t *xga, svga_t *svga, int len)
 {
-    addr &= 0x1fff;
+    uint32_t min_addr;
+    uint32_t max_addr;
+    int mmio_addr_enable = 0;
 
-    if (addr >= 0x1800) {
+    if (xga_standalone_enabled) {
+        addr &= 0x1fff;
+        min_addr = (0x1c00 + (xga->instance << 7));
+        max_addr = (0x1c00 + (xga->instance << 7)) + 0x7f;
+    } else {
+        addr &= 0x7fff;
+        min_addr = (0x7c00 + (xga->instance << 7));
+        max_addr = (0x7c00 + (xga->instance << 7)) + 0x7f;
+    }
+
+    if ((addr >= min_addr) && (addr <= max_addr))
+        mmio_addr_enable = 1;
+
+    if (mmio_addr_enable) {
         switch (addr & 0x7f) {
             case 0x11:
                 xga->accel.control = val;
+                xga_log("Control=%02x.\n", val);
                 break;
 
             case 0x12:
@@ -1767,6 +2005,7 @@ xga_mem_write(uint32_t addr, uint32_t val, xga_t *xga, svga_t *svga, int len)
                 break;
 
             case 0x14:
+                xga_log("MMIO14, len=%d, val=%08x, pxmapidx=%d.\n", len, val, xga->accel.px_map_idx);
                 if (len == 4)
                     xga->accel.px_map_base[xga->accel.px_map_idx] = val;
                 else if (len == 2)
@@ -1779,6 +2018,7 @@ xga_mem_write(uint32_t addr, uint32_t val, xga_t *xga, svga_t *svga, int len)
                     xga->accel.px_map_base[xga->accel.px_map_idx] = (xga->accel.px_map_base[xga->accel.px_map_idx] & 0xffff00ff) | (val << 8);
                 break;
             case 0x16:
+                xga_log("MMIO16, len=%d, val=%08x, pxmapidx=%d.\n", len, val, xga->accel.px_map_idx);
                 if (len == 2)
                     xga->accel.px_map_base[xga->accel.px_map_idx] = (xga->accel.px_map_base[xga->accel.px_map_idx] & 0x0000ffff) | (val << 16);
                 else
@@ -1795,10 +2035,12 @@ xga_mem_write(uint32_t addr, uint32_t val, xga_t *xga, svga_t *svga, int len)
                     xga->accel.px_map_height[xga->accel.px_map_idx] = (val >> 16) & 0xffff;
                 } else if (len == 2) {
                     xga->accel.px_map_width[xga->accel.px_map_idx] = val & 0xffff;
+                    xga_log("MMIO18, len=2, val=%04x, pxmapidx=%d.\n", val & 0xffff, xga->accel.px_map_idx);
                 } else
                     xga->accel.px_map_width[xga->accel.px_map_idx] = (xga->accel.px_map_width[xga->accel.px_map_idx] & 0xff00) | val;
                 break;
             case 0x19:
+                xga_log("MMIO19, len=%d, val=%08x.\n", len, val);
                 if (len == 1)
                     xga->accel.px_map_width[xga->accel.px_map_idx] = (xga->accel.px_map_width[xga->accel.px_map_idx] & 0xff) | (val << 8);
                 break;
@@ -1816,6 +2058,10 @@ xga_mem_write(uint32_t addr, uint32_t val, xga_t *xga, svga_t *svga, int len)
 
             case 0x1c:
                 xga->accel.px_map_format[xga->accel.px_map_idx] = val;
+                if (val & 0x08)
+                    xga_log("Big Endian Pixel Format=%d, AccessMode=%x.\n", xga->accel.px_map_idx, xga->access_mode & 0x08);
+                else
+                    xga_log("Little Endian Pixel Format=%d, AccessMode=%x.\n", xga->accel.px_map_idx, xga->access_mode & 0x08);
                 break;
 
             case 0x20:
@@ -1968,6 +2214,7 @@ xga_mem_write(uint32_t addr, uint32_t val, xga_t *xga, svga_t *svga, int len)
                 break;
 
             case 0x54:
+                xga_log("MMIO54, len=%d, val=%08x.\n", len, val);
                 if (len == 4)
                     xga->accel.carry_chain = val;
                 else if (len == 2)
@@ -1980,6 +2227,7 @@ xga_mem_write(uint32_t addr, uint32_t val, xga_t *xga, svga_t *svga, int len)
                     xga->accel.carry_chain = (xga->accel.carry_chain & 0xffff00ff) | (val << 8);
                 break;
             case 0x56:
+                xga_log("MMIO56, len=%d, val=%04x.\n", len, val);
                 if (len == 2)
                     xga->accel.carry_chain = (xga->accel.carry_chain & 0x0000ffff) | (val << 16);
                 else
@@ -2171,15 +2419,14 @@ exec_command:
                     xga->accel.pat_src   = ((xga->accel.command >> 12) & 0x0f);
                     xga->accel.dst_map   = ((xga->accel.command >> 16) & 0x0f);
                     xga->accel.src_map   = ((xga->accel.command >> 20) & 0x0f);
+                    xga_log("PATMAP=%x, DSTMAP=%x, SRCMAP=%x.\n", xga->accel.px_map_format[xga->accel.pat_src], xga->accel.px_map_format[xga->accel.dst_map], xga->accel.px_map_format[xga->accel.src_map]);
 
-#ifdef ENABLE_XGA_LOG
-                    if (xga->accel.pat_src)
-                        xga_log("[%04X:%08X]: Accel Command = %02x, full = %08x, patwidth = %d, "
+                    xga_log("[%04X:%08X]: Accel Command = %02x, full = %08x, patwidth = %d, "
                                 "dstwidth = %d, srcwidth = %d, patheight = %d, dstheight = %d, "
                                 "srcheight = %d, px = %d, py = %d, dx = %d, dy = %d, sx = %d, "
                                 "sy = %d, patsrc = %d, dstmap = %d, srcmap = %d, dstbase = %08x, "
                                 "srcbase = %08x, patbase = %08x, dstformat = %x, srcformat = %x, "
-                                "planemask = %08x\n\n",
+                                "planemask = %08x.\n",
                                 CS, cpu_state.pc, ((xga->accel.command >> 24) & 0x0f),
                                 xga->accel.command, xga->accel.px_map_width[xga->accel.pat_src],
                                 xga->accel.px_map_width[xga->accel.dst_map],
@@ -2197,7 +2444,6 @@ exec_command:
                                 xga->accel.px_map_format[xga->accel.dst_map] & 0x0f,
                                 xga->accel.px_map_format[xga->accel.src_map] & 0x0f,
                                 xga->accel.plane_mask);
-#endif
 
                     switch ((xga->accel.command >> 24) & 0x0f) {
                         case 2: /*Short Stroke Vectors Read */
@@ -2214,14 +2460,14 @@ exec_command:
                             xga_line_draw_write(svga);
                             break;
                         case 8: /*BitBLT*/
-                            xga_log("BitBLT.\n");
+                            xga_log("Normal BitBLT.\n");
                             xga_bitblt(svga);
                             break;
                         case 9: /*Inverting BitBLT*/
                             xga_log("Inverting BitBLT\n");
                             break;
                         case 0x0a: /*Area Fill*/
-                            xga_log("Area Fill BitBLT.\n");
+                            xga_log("Area Fill.\n");
                             xga_bitblt(svga);
                             break;
 
@@ -2265,7 +2511,7 @@ xga_memio_writeb(uint32_t addr, uint8_t val, void *priv)
 
     xga_mem_write(addr, val, xga, svga, 1);
 
-    xga_log("Write MEMIOB = %04x, val = %02x\n", addr & 0x7f, val);
+    xga_log("[%04X:%08X]: Write MEMIOB = %04x, val = %02x\n", CS, cpu_state.pc, addr, val);
 }
 
 static void
@@ -2276,7 +2522,7 @@ xga_memio_writew(uint32_t addr, uint16_t val, void *priv)
 
     xga_mem_write(addr, val, xga, svga, 2);
 
-    xga_log("Write MEMIOW = %04x, val = %04x\n", addr & 0x7f, val);
+    xga_log("[%04X:%08X]: Write MEMIOW = %04x, val = %04x\n", CS, cpu_state.pc, addr, val);
 }
 
 static void
@@ -2287,21 +2533,40 @@ xga_memio_writel(uint32_t addr, uint32_t val, void *priv)
 
     xga_mem_write(addr, val, xga, svga, 4);
 
-    xga_log("Write MEMIOL = %04x, val = %08x\n", addr & 0x7f, val);
+    xga_log("[%04X:%08X]: Write MEMIOL = %04x, val = %08x\n", CS, cpu_state.pc, addr, val);
 }
 
 static uint8_t
 xga_mem_read(uint32_t addr, xga_t *xga, UNUSED(svga_t *svga))
 {
+    uint32_t min_addr;
+    uint32_t max_addr;
     uint8_t temp = 0;
+    int mmio_addr_enable = 0;
 
-    addr &= 0x1fff;
-    if (addr < 0x1800) {
-        if (xga_standalone_enabled)
+    if (xga_standalone_enabled) {
+        addr &= 0x1fff;
+        min_addr = (0x1c00 + (xga->instance << 7));
+        max_addr = (0x1c00 + (xga->instance << 7)) + 0x7f;
+        if (addr < 0x1c00)
             temp = xga->bios_rom.rom[addr];
-        else
-            temp = xga->vga_bios_rom.rom[addr];
+        else if ((addr >= 0x1c00) && (addr <= 0x1c7f) && xga->instance)
+            temp = 0xff;
+        else if ((addr >= min_addr) && (addr <= max_addr))
+            mmio_addr_enable = 1;
     } else {
+        addr &= 0x7fff;
+        min_addr = (0x7c00 + (xga->instance << 7));
+        max_addr = (0x7c00 + (xga->instance << 7)) + 0x7f;
+        if (addr < 0x7c00)
+            temp = xga->bios_rom.rom[addr];
+        else if ((addr >= 0x7c00) && (addr <= 0x7c7f) && xga->instance)
+            temp = 0xff;
+        else if ((addr >= min_addr) && (addr <= max_addr))
+            mmio_addr_enable = 1;
+    }
+
+    if (mmio_addr_enable) {
         switch (addr & 0x7f) {
             case 0x11:
                 temp = xga->accel.control;
@@ -2369,8 +2634,8 @@ xga_mem_read(uint32_t addr, xga_t *xga, UNUSED(svga_t *svga))
             default:
                 break;
         }
+        xga_log("MMIO Addr=%02x, ret=%02x.\n", addr & 0x7f, temp);
     }
-
     return temp;
 }
 
@@ -2423,42 +2688,45 @@ xga_memio_readl(uint32_t addr, void *priv)
 static void
 xga_hwcursor_draw(svga_t *svga, int displine)
 {
-    xga_t    *xga    = (xga_t *) svga->xga;
-    uint8_t   dat    = 0;
-    int       offset = xga->hwcursor_latch.x - xga->hwcursor_latch.xoff;
-    int       x_pos;
-    int       y_pos;
-    int       comb = 0;
-    uint32_t *p;
-    int       idx = xga->cursor_data_on ? 32 : 0;
+    xga_t          *xga    = (xga_t *) svga->xga;
+    int             comb;
+    uint8_t         dat    = 0;
+    int             offset = xga->hwcursor_latch.x - xga->hwcursor_latch.xoff;
+    int             idx    = 0;
+    int             x_pos;
+    int             y_pos;
+    uint32_t       *p;
+    const uint8_t  *cd;
+
+    if (xga->hwcursor_latch.xoff & 0x20)
+        idx = 32;
+
+    cd = (uint8_t *) xga->sprite_data;
 
     if (xga->interlace && xga->hwcursor_oddeven)
         xga->hwcursor_latch.addr += 16;
 
-    y_pos = displine;
-    x_pos = offset + svga->x_add;
-    p     = buffer32->line[y_pos];
-
     for (int x = 0; x < xga->hwcursor_latch.cur_xsize; x++) {
+        dat = cd[xga->hwcursor_latch.addr & 0x3ff];
+
+        comb = (dat >> ((x & 0x03) << 1)) & 0x03;
+
+        y_pos = displine;
+        x_pos = offset + svga->x_add;
+        p     = buffer32->line[y_pos];
+
         if (x >= idx) {
-            if (!(x & 0x03))
-                dat = xga->sprite_data[xga->hwcursor_latch.addr & 0x3ff];
-
-            comb = (dat >> ((x & 0x03) << 1)) & 0x03;
-
-            x_pos = offset + svga->x_add + x;
-
             switch (comb) {
                 case 0x00:
-                    /* Cursor Color 1 */
+					/* Cursor Color 1 */
                     p[x_pos] = xga->hwc_color0;
                     break;
                 case 0x01:
-                    /* Cursor Color 2 */
+					/* Cursor Color 2 */
                     p[x_pos] = xga->hwc_color1;
                     break;
                 case 0x03:
-                    /* Complement */
+					/* Complement */
                     p[x_pos] ^= 0xffffff;
                     break;
 
@@ -2466,6 +2734,8 @@ xga_hwcursor_draw(svga_t *svga, int displine)
                     break;
             }
         }
+        offset++;
+        xga_log("P=%08x, xpos=%d, comb=%x, ypos=%d, offset=%d, latchx=%d, latchxoff=%d.\n", p[x_pos], x_pos, comb, y_pos, offset, xga->hwcursor_latch.x, xga->hwcursor_latch.xoff);
 
         if ((x & 0x03) == 0x03)
             xga->hwcursor_latch.addr++;
@@ -2484,7 +2754,7 @@ xga_render_overscan_left(xga_t *xga, svga_t *svga)
     if (svga->scrblank || (xga->h_disp == 0))
         return;
 
-    uint32_t *line_ptr = svga->monitor->target_buffer->line[xga->displine + svga->y_add];
+    uint32_t *line_ptr = buffer32->line[xga->displine + svga->y_add];
     for (int i = 0; i < svga->x_add; i++)
         *line_ptr++ = svga->overscan_color;
 }
@@ -2500,7 +2770,7 @@ xga_render_overscan_right(xga_t *xga, svga_t *svga)
     if (svga->scrblank || (xga->h_disp == 0))
         return;
 
-    uint32_t *line_ptr = &svga->monitor->target_buffer->line[xga->displine + svga->y_add][svga->x_add + xga->h_disp];
+    uint32_t *line_ptr = &buffer32->line[xga->displine + svga->y_add][svga->x_add + xga->h_disp];
     right              = (overscan_x >> 1);
     for (int i = 0; i < right; i++)
         *line_ptr++ = svga->overscan_color;
@@ -2516,38 +2786,38 @@ xga_render_4bpp(svga_t *svga)
     if ((xga->displine + svga->y_add) < 0)
         return;
 
-    if (xga->changedvram[xga->ma >> 12] || xga->changedvram[(xga->ma >> 12) + 1] || svga->fullchange) {
-        p = &svga->monitor->target_buffer->line[xga->displine + svga->y_add][svga->x_add];
+    if (xga->changedvram[xga->memaddr >> 12] || xga->changedvram[(xga->memaddr >> 12) + 1] || svga->fullchange) {
+        p = &buffer32->line[xga->displine + svga->y_add][svga->x_add];
 
         if (xga->firstline_draw == 2000)
             xga->firstline_draw = xga->displine;
         xga->lastline_draw = xga->displine;
 
         for (int x = 0; x <= xga->h_disp; x += 16) {
-            dat  = *(uint32_t *) (&xga->vram[xga->ma & xga->vram_mask]);
-            p[0] = xga->pallook[dat & 0x0f];
-            p[1] = xga->pallook[(dat >> 4) & 0x0f];
-            p[2] = xga->pallook[(dat >> 8) & 0x0f];
-            p[3] = xga->pallook[(dat >> 12) & 0x0f];
-            p[4] = xga->pallook[(dat >> 16) & 0x0f];
-            p[5] = xga->pallook[(dat >> 20) & 0x0f];
-            p[6] = xga->pallook[(dat >> 24) & 0x0f];
-            p[7] = xga->pallook[(dat >> 28) & 0x0f];
+            dat  = *(uint32_t *) (&xga->vram[xga->memaddr & xga->vram_mask]);
+            p[1] = xga->pallook[dat & 0x0f];
+            p[0] = xga->pallook[(dat >> 4) & 0x0f];
+            p[3] = xga->pallook[(dat >> 8) & 0x0f];
+            p[2] = xga->pallook[(dat >> 12) & 0x0f];
+            p[5] = xga->pallook[(dat >> 16) & 0x0f];
+            p[4] = xga->pallook[(dat >> 20) & 0x0f];
+            p[7] = xga->pallook[(dat >> 24) & 0x0f];
+            p[6] = xga->pallook[(dat >> 28) & 0x0f];
 
-            dat  = *(uint32_t *) (&xga->vram[(xga->ma + 4) & xga->vram_mask]);
-            p[8] = xga->pallook[dat & 0x0f];
-            p[9] = xga->pallook[(dat >> 4) & 0x0f];
-            p[10] = xga->pallook[(dat >> 8) & 0x0f];
-            p[11] = xga->pallook[(dat >> 12) & 0x0f];
-            p[12] = xga->pallook[(dat >> 16) & 0x0f];
-            p[13] = xga->pallook[(dat >> 20) & 0x0f];
-            p[14] = xga->pallook[(dat >> 24) & 0x0f];
-            p[15] = xga->pallook[(dat >> 28) & 0x0f];
+            dat  = *(uint32_t *) (&xga->vram[(xga->memaddr + 4) & xga->vram_mask]);
+            p[9] = xga->pallook[dat & 0x0f];
+            p[8] = xga->pallook[(dat >> 4) & 0x0f];
+            p[11] = xga->pallook[(dat >> 8) & 0x0f];
+            p[10] = xga->pallook[(dat >> 12) & 0x0f];
+            p[13] = xga->pallook[(dat >> 16) & 0x0f];
+            p[12] = xga->pallook[(dat >> 20) & 0x0f];
+            p[15] = xga->pallook[(dat >> 24) & 0x0f];
+            p[14] = xga->pallook[(dat >> 28) & 0x0f];
 
-            xga->ma += 8;
+            xga->memaddr += 8;
             p += 16;
         }
-        xga->ma &= xga->vram_mask;
+        xga->memaddr &= xga->vram_mask;
     }
 }
 
@@ -2561,30 +2831,30 @@ xga_render_8bpp(svga_t *svga)
     if ((xga->displine + svga->y_add) < 0)
         return;
 
-    if (xga->changedvram[xga->ma >> 12] || xga->changedvram[(xga->ma >> 12) + 1] || svga->fullchange) {
-        p = &svga->monitor->target_buffer->line[xga->displine + svga->y_add][svga->x_add];
+    if (xga->changedvram[xga->memaddr >> 12] || xga->changedvram[(xga->memaddr >> 12) + 1] || svga->fullchange) {
+        p = &buffer32->line[xga->displine + svga->y_add][svga->x_add];
 
         if (xga->firstline_draw == 2000)
             xga->firstline_draw = xga->displine;
         xga->lastline_draw = xga->displine;
 
         for (int x = 0; x <= xga->h_disp; x += 8) {
-            dat  = *(uint32_t *) (&xga->vram[xga->ma & xga->vram_mask]);
+            dat  = *(uint32_t *) (&xga->vram[xga->memaddr & xga->vram_mask]);
             p[0] = xga->pallook[dat & 0xff];
             p[1] = xga->pallook[(dat >> 8) & 0xff];
             p[2] = xga->pallook[(dat >> 16) & 0xff];
             p[3] = xga->pallook[(dat >> 24) & 0xff];
 
-            dat  = *(uint32_t *) (&xga->vram[(xga->ma + 4) & xga->vram_mask]);
+            dat  = *(uint32_t *) (&xga->vram[(xga->memaddr + 4) & xga->vram_mask]);
             p[4] = xga->pallook[dat & 0xff];
             p[5] = xga->pallook[(dat >> 8) & 0xff];
             p[6] = xga->pallook[(dat >> 16) & 0xff];
             p[7] = xga->pallook[(dat >> 24) & 0xff];
 
-            xga->ma += 8;
+            xga->memaddr += 8;
             p += 8;
         }
-        xga->ma &= xga->vram_mask;
+        xga->memaddr &= xga->vram_mask;
     }
 }
 
@@ -2599,93 +2869,228 @@ xga_render_16bpp(svga_t *svga)
     if ((xga->displine + svga->y_add) < 0)
         return;
 
-    if (xga->changedvram[xga->ma >> 12] || xga->changedvram[(xga->ma >> 12) + 1] || svga->fullchange) {
-        p = &svga->monitor->target_buffer->line[xga->displine + svga->y_add][svga->x_add];
+    if (xga->changedvram[xga->memaddr >> 12] || xga->changedvram[(xga->memaddr >> 12) + 1] || svga->fullchange) {
+        p = &buffer32->line[xga->displine + svga->y_add][svga->x_add];
 
         if (xga->firstline_draw == 2000)
             xga->firstline_draw = xga->displine;
         xga->lastline_draw = xga->displine;
 
         for (x = 0; x <= xga->h_disp; x += 8) {
-            dat      = *(uint32_t *) (&xga->vram[(xga->ma + (x << 1)) & xga->vram_mask]);
+            dat      = *(uint32_t *) (&xga->vram[(xga->memaddr + (x << 1)) & xga->vram_mask]);
             p[x]     = video_16to32[dat & 0xffff];
             p[x + 1] = video_16to32[dat >> 16];
 
-            dat      = *(uint32_t *) (&xga->vram[(xga->ma + (x << 1) + 4) & xga->vram_mask]);
+            dat      = *(uint32_t *) (&xga->vram[(xga->memaddr + (x << 1) + 4) & xga->vram_mask]);
             p[x + 2] = video_16to32[dat & 0xffff];
             p[x + 3] = video_16to32[dat >> 16];
 
-            dat      = *(uint32_t *) (&xga->vram[(xga->ma + (x << 1) + 8) & xga->vram_mask]);
+            dat      = *(uint32_t *) (&xga->vram[(xga->memaddr + (x << 1) + 8) & xga->vram_mask]);
             p[x + 4] = video_16to32[dat & 0xffff];
             p[x + 5] = video_16to32[dat >> 16];
 
-            dat      = *(uint32_t *) (&xga->vram[(xga->ma + (x << 1) + 12) & xga->vram_mask]);
+            dat      = *(uint32_t *) (&xga->vram[(xga->memaddr + (x << 1) + 12) & xga->vram_mask]);
             p[x + 6] = video_16to32[dat & 0xffff];
             p[x + 7] = video_16to32[dat >> 16];
         }
-        xga->ma += x << 1;
-        xga->ma &= xga->vram_mask;
+        xga->memaddr += x << 1;
+        xga->memaddr &= xga->vram_mask;
     }
 }
 
+void
+xga_write_test(uint32_t addr, uint8_t val, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    xga_t  *xga = (xga_t *) svga->xga;
+
+    if (xga_active && xga) {
+        if ((xga->op_mode & 7) == 4) {
+            if (xga->aperture_cntl && !xga->test_stage) {
+                if (val == 0xa5) { /*Memory size test of XGA*/
+                    xga->test    = val;
+                    if (addr == (xga->mapping_base + 0x0001))
+                        xga->a5_test = 1;
+                    else if (addr == (xga->mapping_base + xga->banked_mask - 0x0001))
+                        xga->a5_test = 2;
+
+                    xga->test_stage = 1;
+                    xga->on = 0;
+                    xga_log("XGA test1 addr=%05x, test=%02x.\n", addr, xga->a5_test);
+                } else if (val == 0x5a) {
+                    xga->test = val;
+                    xga->test_stage = 1;
+                    xga->on = 0;
+                    xga_log("XGA test2 addr = %05x.\n", addr);
+                } else if ((addr == xga->mapping_base) || (addr == (xga->mapping_base + 0x0010))) {
+                    addr += xga->write_bank;
+                    xga->vram[addr & xga->vram_mask] = val;
+                    xga_log("XGA Linear endian reverse write, val = %02x, addr = %05x, banked mask = %04x, a5test=%d.\n", val, addr, svga->banked_mask, xga->a5_test);
+                }
+            } else {
+                xga->test_stage = 0;
+                xga->on = 0;
+                xga_log("Write: AP=%x, teststage=%x, on=%d.\n", xga->aperture_cntl, xga->test_stage, xga->on);
+            }
+        } else {
+            xga->test_stage = 0;
+            xga->on = 0;
+            xga_log("OFF XGA write.\n");
+        }
+    }
+}
+
+static void
+xga_write_banked(uint32_t addr, uint8_t val, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    xga_t  *xga  = (xga_t *) svga->xga;
+
+    xga->changedvram[(xga_transform_addr(addr, xga->access_mode) & xga->vram_mask) >> 12] =
+        svga->monitor->mon_changeframecount;
+    xga->vram[xga_transform_addr(addr, xga->access_mode) & xga->vram_mask]                =
+        xga_transform_val(val, xga->access_mode, 8);
+}
+
+static void
+xga_writew_banked(uint32_t addr, uint16_t val, void *priv)
+{
+    svga_t *svga = (svga_t *) priv;
+    xga_t  *xga  = (xga_t *) svga->xga;
+
+    xga->changedvram[(addr & xga->vram_mask) >> 12]   = svga->monitor->mon_changeframecount;
+    *(uint16_t *) &(xga->vram[addr & xga->vram_mask]) = xga_transform_val(val, xga->access_mode, 16);
+}
+
 static void
 xga_write(uint32_t addr, uint8_t val, void *priv)
 {
     svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = (xga_t *) svga->xga;
 
-    if (!xga->on) {
-        svga_write(addr, val, svga);
-        return;
-    }
-
     addr &= xga->banked_mask;
     addr += xga->write_bank;
 
+    xga_log("WriteBankedB addr=%08x, val=%02x, ison=%d, mapbits=%x.\n", addr, val, xga->on, svga->gdcreg[6] & 0x0c);
     if (addr >= xga->vram_size)
         return;
 
     cycles -= svga->monitor->mon_video_timing_write_b;
 
-    if (xga->access_mode & 8) {
-        if ((xga->access_mode & 7) == 4)
-            addr ^= 1;
-    }
-
-    xga->changedvram[(addr & xga->vram_mask) >> 12] = svga->monitor->mon_changeframecount;
-    xga->vram[addr & xga->vram_mask]                = val;
+    xga_write_banked(addr, val, svga);
 }
 
 static void
 xga_writew(uint32_t addr, uint16_t val, void *priv)
 {
-    svga_t      *svga = (svga_t *) priv;
+    svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = (xga_t *) svga->xga;
 
-    if (!xga->on) {
-        svga_writew(addr, val, svga);
-        return;
-    }
+    addr &= xga->banked_mask;
+    addr += xga->write_bank;
 
-    xga_write(addr, val & 0xff, svga);
-    xga_write(addr + 1, val >> 8, svga);
+    xga_log("WriteBankedW addr=%08x, val=%04x, ison=%d.\n", addr, val, xga->on);
+    if (addr >= xga->vram_size)
+        return;
+
+    cycles -= svga->monitor->mon_video_timing_write_w;
+
+    xga_writew_banked(addr, val, svga);
 }
 
 static void
 xga_writel(uint32_t addr, uint32_t val, void *priv)
 {
-    svga_t      *svga = (svga_t *) priv;
+    svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = (xga_t *) svga->xga;
 
-    if (!xga->on) {
-        svga_writel(addr, val, svga);
-        return;
-    }
+    addr &= xga->banked_mask;
+    addr += xga->write_bank;
 
-    xga_write(addr, val & 0xff, svga);
-    xga_write(addr + 1, (val >> 8) & 0xff, svga);
-    xga_write(addr + 2, (val >> 16) & 0xff, svga);
-    xga_write(addr + 3, (val >> 24) & 0xff, svga);
+    xga_log("WriteBankedL addr=%08x, val=%08x.\n", addr, val);
+    if (addr >= xga->vram_size)
+        return;
+
+    cycles -= svga->monitor->mon_video_timing_write_l;
+
+    xga_writew_banked(addr, val & 0xffff, svga);
+    xga_writew_banked(addr + 2, val >> 16, svga);
+}
+
+uint8_t
+xga_read_test(uint32_t addr, void *priv)
+{
+    svga_t  *svga = (svga_t *) priv;
+    xga_t   *xga = (xga_t *) svga->xga;
+    uint8_t ret = 0x00;
+
+    if (xga_active && xga) {
+        xga_log("Read: OPMODE=%x, APCNTL=%x, base=%05x, test=%x.\n", xga->op_mode & 7, xga->aperture_cntl, svga->mapping.base, xga->test);
+        if ((xga->op_mode & 7) == 4) {
+            if (xga->aperture_cntl && (xga->test_stage == 1)) {
+                if (xga->test == 0xa5) { /*Memory size test of XGA*/
+                    if (addr == (xga->mapping_base + 0x0001)) {
+                        xga_log("A5 test bank = %x, svgabase=%05x.\n", addr, svga->mapping.base);
+                        ret = xga->test;
+                    } else if ((addr == xga->mapping_base) && (xga->a5_test == 1)) { /*This is required by XGAKIT to pass the memory test*/
+                        xga_log("A5 test bank = %x.\n", addr);
+                        addr += xga->read_bank;
+                        ret = xga->vram[addr & xga->vram_mask];
+                    } else
+                        ret = xga->test;
+
+                    xga->test_stage = 0;
+                    xga->on = 1;
+                    xga_log("A5 read: XGA ON = %d, addr = %05x, ret = %02x, test1 = %x.\n", xga->on, addr, ret, xga->a5_test);
+                    return ret;
+                } else if (xga->test == 0x5a) {
+                    xga->test_stage = 0;
+                    ret = xga->test;
+                    xga->on = 1;
+                    xga_log("5A read: XGA ON = %d.\n", xga->on);
+                    return ret;
+                } else if ((addr == xga->mapping_base) || (addr == (xga->mapping_base + 0x0010))) {
+                    addr += xga->read_bank;
+                    return xga->vram[addr & xga->vram_mask];
+                }
+            } else {
+                xga->test_stage = 0;
+                xga->on = 0;
+                xga_log("Read: AP=%x, teststage=%x, on=%d.\n", xga->aperture_cntl, xga->test_stage, xga->on);
+            }
+        } else {
+            xga->test_stage = 0;
+            xga->on = 0;
+            xga_log("OFF XGA read.\n");
+        }
+    }
+    return ret;
+}
+
+static uint8_t
+xga_read_banked(uint32_t addr, void *priv)
+{
+    svga_t      *svga = (svga_t *) priv;
+    xga_t *xga  = (xga_t *) svga->xga;
+    uint8_t      ret  = 0xff;
+
+    ret = xga_transform_val(xga->vram[xga_transform_addr(addr, xga->access_mode) & xga->vram_mask],
+                            xga->access_mode, 8);
+
+    return ret;
+}
+
+static uint16_t
+xga_readw_banked(uint32_t addr, void *priv)
+{
+    svga_t      *svga = (svga_t *) priv;
+    xga_t *xga  = (xga_t *) svga->xga;
+    uint16_t      ret  = 0xffff;
+
+    ret = xga_transform_val(*(uint16_t *) &(xga->vram[addr & xga->vram_mask]),
+                            xga->access_mode, 16);
+
+    return ret;
 }
 
 static uint8_t
@@ -2693,28 +3098,20 @@ xga_read(uint32_t addr, void *priv)
 {
     svga_t      *svga = (svga_t *) priv;
     xga_t *xga  = (xga_t *) svga->xga;
-    uint8_t      ret  = 0xff;
-
-    if (!xga->on) {
-        ret = svga_read(addr, svga);
-        return ret;
-    }
+    uint8_t     ret  = 0xff;
 
     addr &= xga->banked_mask;
     addr += xga->read_bank;
 
-    if (addr >= xga->vram_size)
+    if (addr >= xga->vram_size) {
+        xga_log("Over Read ADDR=%x.\n", addr);
         return ret;
+    }
 
     cycles -= svga->monitor->mon_video_timing_read_b;
 
-    if (xga->access_mode & 8) {
-        if ((xga->access_mode & 7) == 4)
-            addr ^= 1;
-    }
-
-    ret = xga->vram[addr & xga->vram_mask];
-
+    ret = xga_read_banked(addr, svga);
+    xga_log("ReadBankedB addr=%08x, ret=%02x, ison=%d.\n", addr, ret, xga->on);
     return ret;
 }
 
@@ -2722,17 +3119,21 @@ static uint16_t
 xga_readw(uint32_t addr, void *priv)
 {
     svga_t      *svga = (svga_t *) priv;
-    xga_t       *xga  = (xga_t *) svga->xga;
+    xga_t *xga  = (xga_t *) svga->xga;
     uint16_t     ret  = 0xffff;
 
-    if (!xga->on) {
-        ret = svga_readw(addr, svga);
+    addr &= xga->banked_mask;
+    addr += xga->read_bank;
+
+    if (addr >= xga->vram_size) {
+        xga_log("Over Read ADDR=%x.\n", addr);
         return ret;
     }
 
-    ret = xga_read(addr, svga);
-    ret |= (xga_read(addr + 1, svga) << 8);
+    cycles -= svga->monitor->mon_video_timing_read_w;
 
+    ret = xga_readw_banked(addr, svga);
+    xga_log("ReadBankedW addr=%08x, ret=%04x, ison=%d.\n", addr, ret, xga->on);
     return ret;
 }
 
@@ -2740,19 +3141,21 @@ static uint32_t
 xga_readl(uint32_t addr, void *priv)
 {
     svga_t      *svga = (svga_t *) priv;
-    xga_t       *xga  = (xga_t *) svga->xga;
+    xga_t *xga  = (xga_t *) svga->xga;
     uint32_t     ret  = 0xffffffff;
 
-    if (!xga->on) {
-        ret = svga_readl(addr, svga);
+    addr &= xga->banked_mask;
+    addr += xga->read_bank;
+
+    if (addr >= xga->vram_size) {
+        xga_log("Over Read ADDR=%x.\n", addr);
         return ret;
     }
 
-    ret = xga_read(addr, svga);
-    ret |= (xga_read(addr + 1, svga) << 8);
-    ret |= (xga_read(addr + 2, svga) << 16);
-    ret |= (xga_read(addr + 3, svga) << 24);
+    cycles -= svga->monitor->mon_video_timing_read_l;
 
+    ret = xga_readw_banked(addr, svga);
+    ret |= (xga_readw_banked(addr + 2, svga) << 16);
     return ret;
 }
 
@@ -2762,45 +3165,50 @@ xga_write_linear(uint32_t addr, uint8_t val, void *priv)
     svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = (xga_t *) svga->xga;
 
+    xga_log("WriteLL XGA=%d, addr=%08x, val=%02x.\n", xga->on, addr, val);
     if (!xga->on) {
         svga_write_linear(addr, val, svga);
         return;
     }
 
-    addr &= svga->decode_mask;
+    addr &= xga->vram_mask;
 
-    if (addr >= xga->vram_size)
+    if (addr >= xga->vram_size) {
+        xga_log("Write Linear Over!.\n");
         return;
+    }
 
     cycles -= svga->monitor->mon_video_timing_write_b;
 
-    if (xga->linear_endian_reverse) {
-        if ((xga->access_mode & 7) == 4) {
-            if ((xga->accel.px_map_format[xga->accel.dst_map] & 7) == 4)
-                addr ^= 1;
-        } else if (xga->access_mode & 8) {
-            if ((xga->accel.px_map_format[xga->accel.dst_map] & 7) == 4)
-                addr ^= 1;
-        }
-    }
-
-    xga->changedvram[(addr & xga->vram_mask) >> 12] = svga->monitor->mon_changeframecount;
-    xga->vram[addr & xga->vram_mask]                = val;
+    xga->changedvram[(xga_transform_addr(addr, xga->access_mode) & xga->vram_mask) >> 12] =
+        svga->monitor->mon_changeframecount;
+    xga->vram[xga_transform_addr(addr, xga->access_mode) & xga->vram_mask]                =
+        xga_transform_val(val, xga->access_mode, 8);
 }
 
 static void
 xga_writew_linear(uint32_t addr, uint16_t val, void *priv)
 {
-    svga_t      *svga = (svga_t *) priv;
-    const xga_t *xga  = (xga_t *) svga->xga;
+    svga_t *svga = (svga_t *) priv;
+    xga_t  *xga  = (xga_t *) svga->xga;
 
+    xga_log("WriteLL XGA=%d, addr=%08x, val=%02x.\n", xga->on, addr, val);
     if (!xga->on) {
         svga_writew_linear(addr, val, svga);
         return;
     }
 
-    xga_write_linear(addr, val, priv);
-    xga_write_linear(addr + 1, val >> 8, priv);
+    addr &= xga->vram_mask;
+
+    if (addr >= xga->vram_size) {
+        xga_log("Write Linear Over!.\n");
+        return;
+    }
+
+    cycles -= svga->monitor->mon_video_timing_write_b;
+
+    xga->changedvram[(addr & xga->vram_mask) >> 12]   = svga->monitor->mon_changeframecount;
+    *(uint16_t *) &(xga->vram[addr & xga->vram_mask]) = xga_transform_val(val, xga->access_mode, 16);
 }
 
 static void
@@ -2814,10 +3222,8 @@ xga_writel_linear(uint32_t addr, uint32_t val, void *priv)
         return;
     }
 
-    xga_write_linear(addr, val, priv);
-    xga_write_linear(addr + 1, val >> 8, priv);
-    xga_write_linear(addr + 2, val >> 16, priv);
-    xga_write_linear(addr + 3, val >> 24, priv);
+    xga_writew_linear(addr, val, priv);
+    xga_writew_linear(addr + 2, val >> 16, priv);
 }
 
 static uint8_t
@@ -2827,27 +3233,19 @@ xga_read_linear(uint32_t addr, void *priv)
     const xga_t *xga  = (xga_t *) svga->xga;
     uint8_t      ret  = 0xff;
 
-    if (!xga->on)
-        return svga_read_linear(addr, svga);
+    if (xga->on) {
+        addr &= xga->vram_mask;
 
-    addr &= svga->decode_mask;
+        if (addr < xga->vram_size) {
+            cycles -= svga->monitor->mon_video_timing_read_b;
 
-    if (addr >= xga->vram_size)
-        return ret;
-
-    cycles -= svga->monitor->mon_video_timing_read_b;
-
-    if (xga->linear_endian_reverse) {
-        if ((xga->access_mode & 7) == 4) {
-            if ((xga->accel.px_map_format[xga->accel.dst_map] & 7) == 4)
-                addr ^= 1;
-        } else if (xga->access_mode & 8) {
-            if ((xga->accel.px_map_format[xga->accel.dst_map] & 7) == 4)
-                addr ^= 1;
+            ret = xga_transform_val(xga->vram[xga_transform_addr(addr, xga->access_mode) & xga->vram_mask],
+                                    xga->access_mode, 8);
         }
-    }
+    } else
+        ret = svga_read_linear(addr, svga);
 
-    return xga->vram[addr & xga->vram_mask];
+    return ret;
 }
 
 static uint16_t
@@ -2855,13 +3253,19 @@ xga_readw_linear(uint32_t addr, void *priv)
 {
     svga_t      *svga = (svga_t *) priv;
     const xga_t *xga  = (xga_t *) svga->xga;
-    uint16_t     ret;
+    uint16_t     ret  = 0xffff;
 
-    if (!xga->on)
-        return svga_readw_linear(addr, svga);
+    if (xga->on) {
+        addr &= xga->vram_mask;
 
-    ret = xga_read_linear(addr, svga);
-    ret |= (xga_read_linear(addr + 1, svga) << 8);
+        if (addr < xga->vram_size) {
+            cycles -= svga->monitor->mon_video_timing_read_b;
+
+            ret = xga_transform_val(*(uint16_t *) &(xga->vram[addr & xga->vram_mask]),
+                                    xga->access_mode, 16);
+        }
+    } else
+        ret = svga_readw_linear(addr, svga);
 
     return ret;
 }
@@ -2876,195 +3280,188 @@ xga_readl_linear(uint32_t addr, void *priv)
     if (!xga->on)
         return svga_readl_linear(addr, svga);
 
-    ret = xga_read_linear(addr, svga);
-    ret |= (xga_read_linear(addr + 1, svga) << 8);
-    ret |= (xga_read_linear(addr + 2, svga) << 16);
-    ret |= (xga_read_linear(addr + 3, svga) << 24);
+    ret = xga_readw_linear(addr, svga);
+    ret |= (xga_readw_linear(addr + 2, svga) << 16);
 
     return ret;
 }
 
-static void
-xga_do_render(svga_t *svga)
+void
+xga_set_poll(svga_t *svga)
 {
-    xga_t *xga = (xga_t *) svga->xga;
-
-    xga_log("DISPCNTL = %d, vga = %d.\n", xga->disp_cntl_2 & 7, vga_on);
-    switch (xga->disp_cntl_2 & 7) {
-        case 2:
-            xga_render_4bpp(svga);
-            break;
-        case 3:
-            xga_render_8bpp(svga);
-            break;
-        case 4:
-            xga_render_16bpp(svga);
-            break;
-        default:
-            break;
-    }
-
-    svga->x_add = (overscan_x >> 1);
-    xga_render_overscan_left(xga, svga);
-    xga_render_overscan_right(xga, svga);
-    svga->x_add = (overscan_x >> 1);
-
-    if (xga->hwcursor_on) {
-        xga_hwcursor_draw(svga, xga->displine + svga->y_add);
-        xga->hwcursor_on--;
-        if (xga->hwcursor_on && xga->interlace)
-            xga->hwcursor_on--;
-    }
+    timer_set_callback(&svga->timer, xga_poll);
 }
 
 void
-xga_poll(void *priv, svga_t *svga)
+xga_poll(void *priv)
 {
-    xga_t *xga = (xga_t *) priv;
+    svga_t *svga = (svga_t *) priv;
+    xga_t *xga   = (xga_t *) svga->xga;
     uint32_t x;
     int      wx;
     int      wy;
 
-    if (!xga->linepos) {
-        if (xga->displine == xga->hwcursor_latch.y && xga->hwcursor_latch.ena) {
-            xga->hwcursor_on      = xga->hwcursor_latch.cur_ysize - (xga->cursor_data_on ? 32 : 0);
-            xga->hwcursor_oddeven = 0;
-        }
-
-        if (xga->displine == (xga->hwcursor_latch.y + 1) && xga->hwcursor_latch.ena && xga->interlace) {
-            xga->hwcursor_on      = xga->hwcursor_latch.cur_ysize - (xga->cursor_data_on ? 33 : 1);
-            xga->hwcursor_oddeven = 1;
-        }
-
-        timer_advance_u64(&svga->timer, svga->dispofftime);
-        xga->linepos = 1;
-
-        if (xga->dispon) {
-            xga->h_disp_on = 1;
-
-            xga->ma &= xga->vram_mask;
-
-            if (xga->firstline == 2000) {
-                xga->firstline = xga->displine;
-                video_wait_for_buffer_monitor(svga->monitor_index);
+    xga_log("XGA Poll=%d.\n", xga->on);
+    if (xga->on) {
+        if (!xga->linepos) {
+            if (xga->displine == xga->hwcursor_latch.y && xga->hwcursor_latch.ena) {
+                xga->hwcursor_on      = xga->hwcursor_latch.cur_ysize - ((xga->hwcursor_latch.yoff & 0x20) ? 32 : 0);
+                xga->hwcursor_oddeven = 0;
             }
 
-            if (xga->hwcursor_on)
-                xga->changedvram[xga->ma >> 12] = xga->changedvram[(xga->ma >> 12) + 1] = xga->interlace ? 3 : 2;
+            if (xga->displine == (xga->hwcursor_latch.y + 1) && xga->hwcursor_latch.ena && xga->interlace) {
+                xga->hwcursor_on      = xga->hwcursor_latch.cur_ysize - ((xga->hwcursor_latch.yoff & 0x20) ? 33 : 1);
+                xga->hwcursor_oddeven = 1;
+            }
 
-            xga_do_render(svga);
+            timer_advance_u64(&svga->timer, xga->dispofftime);
+            svga->cgastat |= 1;
+            xga->linepos = 1;
 
-            if (xga->lastline < xga->displine)
-                xga->lastline = xga->displine;
-        }
+            if (xga->dispon) {
+                xga->h_disp_on = 1;
+
+                xga->memaddr &= xga->vram_mask;
+
+                if (xga->firstline == 2000) {
+                    xga->firstline = xga->displine;
+                    video_wait_for_buffer_monitor(svga->monitor_index);
+                }
+
+                if (xga->hwcursor_on)
+                    xga->changedvram[xga->memaddr >> 12] = xga->changedvram[(xga->memaddr >> 12) + 1] = xga->interlace ? 3 : 2;
+
+                svga->render_xga(svga);
+
+                svga->x_add = svga->left_overscan;
+                xga_render_overscan_left(xga, svga);
+                xga_render_overscan_right(xga, svga);
+                svga->x_add = svga->left_overscan;
+
+                if (xga->hwcursor_on) {
+                    xga_hwcursor_draw(svga, xga->displine + svga->y_add);
+                    xga->hwcursor_on--;
+                    if (xga->hwcursor_on && xga->interlace)
+                        xga->hwcursor_on--;
+                }
+
+                if (xga->lastline < xga->displine)
+                    xga->lastline = xga->displine;
+            }
 
-        xga->displine++;
-        if (xga->interlace)
             xga->displine++;
-        if (xga->displine > 1500)
-            xga->displine = 0;
-    } else {
-        timer_advance_u64(&svga->timer, svga->dispontime);
-        xga->h_disp_on = 0;
+            if (xga->interlace)
+                xga->displine++;
+            if ((svga->cgastat & 8) && ((xga->displine & 0x0f) == (svga->crtc[0x11] & 0x0f)) && svga->vslines)
+                svga->cgastat &= ~8;
+            if (xga->displine > 1500)
+                xga->displine = 0;
+        } else {
+            timer_advance_u64(&svga->timer, xga->dispontime);
+            if (xga->dispon)
+                svga->cgastat &= ~1;
 
-        xga->linepos = 0;
-        if (xga->dispon) {
-            if (xga->sc == xga->rowcount) {
-                xga->sc = 0;
+            xga->h_disp_on = 0;
 
-                xga->maback += (xga->rowoffset << 3);
-                if (xga->interlace)
-                    xga->maback += (xga->rowoffset << 3);
+            xga->linepos = 0;
+            if (xga->dispon) {
+                if (xga->scanline == xga->rowcount) {
+                    xga->scanline = 0;
 
-                xga->maback &= xga->vram_mask;
-                xga->ma = xga->maback;
-            } else {
-                xga->sc++;
-                xga->sc &= 0x1f;
-                xga->ma = xga->maback;
+                    xga_log("MA=%08x, MALATCH=%x.\n", xga->memaddr, xga->memaddr_latch);
+                    xga->memaddr_backup += (xga->rowoffset << 3);
+                    if (xga->interlace)
+                        xga->memaddr_backup += (xga->rowoffset << 3);
+
+                    xga->memaddr_backup &= xga->vram_mask;
+                    xga->memaddr = xga->memaddr_backup;
+                } else {
+                    xga->scanline++;
+                    xga->scanline &= 0x1f;
+                    xga->memaddr = xga->memaddr_backup;
+                }
+            }
+
+            xga->vc++;
+            xga->vc &= 0x7ff;
+
+            if (xga->vc == xga->split) {
+                if (xga->interlace && xga->oddeven)
+                    xga->memaddr = xga->memaddr_backup = (xga->rowoffset << 1);
+                else
+                    xga->memaddr = xga->memaddr_backup = 0;
+
+                xga->memaddr     = (xga->memaddr << 2);
+                xga->memaddr_backup = (xga->memaddr_backup << 2);
+
+                xga->scanline = 0;
+            }
+            if (xga->vc == xga->dispend) {
+                xga->dispon = 0;
+
+                for (x = 0; x < ((xga->vram_mask + 1) >> 12); x++) {
+                    if (xga->changedvram[x])
+                        xga->changedvram[x]--;
+                }
+                if (svga->fullchange)
+                    svga->fullchange--;
+            }
+            if (xga->vc == xga->v_syncstart) {
+                xga->dispon = 0;
+                svga->cgastat |= 8;
+                x           = xga->h_disp;
+
+                if (xga->interlace && !xga->oddeven)
+                    xga->lastline++;
+                if (xga->interlace && xga->oddeven)
+                    xga->firstline--;
+
+                wx = x;
+
+                wy = xga->lastline - xga->firstline;
+                svga_doblit(wx, wy, svga);
+
+                xga->firstline = 2000;
+                xga->lastline  = 0;
+
+                xga->firstline_draw = 2000;
+                xga->lastline_draw  = 0;
+
+                xga->oddeven ^= 1;
+
+                svga->monitor->mon_changeframecount = xga->interlace ? 3 : 2;
+
+                if (xga->interlace && xga->oddeven)
+                    xga->memaddr = xga->memaddr_backup = xga->memaddr_latch + (xga->rowoffset << 1);
+                else
+                    xga->memaddr = xga->memaddr_backup = xga->memaddr_latch;
+
+                xga->memaddr     = (xga->memaddr << 2);
+                xga->memaddr_backup = (xga->memaddr_backup << 2);
+            }
+            if (xga->vc == xga->v_total) {
+                xga->vc       = 0;
+                xga->scanline = 0;
+                xga->dispon   = 1;
+                xga->displine = (xga->interlace && xga->oddeven) ? 1 : 0;
+
+                svga->x_add = svga->left_overscan;
+
+                xga->hwcursor_on    = 0;
+                xga->hwcursor_latch = xga->hwcursor;
             }
         }
-
-        xga->vc++;
-        xga->vc &= 0x7ff;
-
-        if (xga->vc == xga->split) {
-            if (xga->interlace && xga->oddeven)
-                xga->ma = xga->maback = (xga->rowoffset << 1);
-            else
-                xga->ma = xga->maback = 0;
-
-            xga->ma     = (xga->ma << 2);
-            xga->maback = (xga->maback << 2);
-
-            xga->sc = 0;
-        }
-        if (xga->vc == xga->dispend) {
-            xga->dispon = 0;
-
-            for (x = 0; x < ((xga->vram_mask + 1) >> 12); x++) {
-                if (xga->changedvram[x])
-                    xga->changedvram[x]--;
-            }
-            if (svga->fullchange)
-                svga->fullchange--;
-        }
-        if (xga->vc == xga->v_syncstart) {
-            xga->dispon = 0;
-            x           = xga->h_disp;
-
-            if (xga->interlace && !xga->oddeven)
-                xga->lastline++;
-            if (xga->interlace && xga->oddeven)
-                xga->firstline--;
-
-            wx = x;
-
-            wy = xga->lastline - xga->firstline;
-            svga_doblit(wx, wy, svga);
-
-            xga->firstline = 2000;
-            xga->lastline  = 0;
-
-            xga->firstline_draw = 2000;
-            xga->lastline_draw  = 0;
-
-            xga->oddeven ^= 1;
-
-            svga->monitor->mon_changeframecount = xga->interlace ? 3 : 2;
-
-            if (xga->interlace && xga->oddeven)
-                xga->ma = xga->maback = xga->ma_latch + (xga->rowoffset << 1);
-            else
-                xga->ma = xga->maback = xga->ma_latch;
-
-            xga->ma     = (xga->ma << 2);
-            xga->maback = (xga->maback << 2);
-        }
-        if (xga->vc == xga->v_total) {
-            xga->vc       = 0;
-            xga->sc       = 0;
-            xga->dispon   = 1;
-            xga->displine = (xga->interlace && xga->oddeven) ? 1 : 0;
-
-            svga->x_add = (overscan_x >> 1);
-
-            xga->hwcursor_on    = 0;
-            xga->hwcursor_latch = xga->hwcursor;
-        }
-    }
+    } else
+        svga_recalctimings(svga);
 }
 
 static uint8_t
 xga_mca_read(int port, void *priv)
 {
-    const svga_t *svga = (svga_t *) priv;
-    const xga_t  *xga  = (xga_t *) svga->xga;
+    svga_t *svga = (svga_t *) priv;
+    xga_t  *xga  = (xga_t *) svga->xga;
     uint8_t       ret  = xga->pos_regs[port & 7];
 
-    if (((port & 7) == 3) && !(ret & 1)) /*Always enable the mapping.*/
-        ret |= 1;
-
     xga_log("[%04X:%08X]: POS Read Port = %x, val = %02x\n", CS, cpu_state.pc,
             port & 7, xga->pos_regs[port & 7]);
 
@@ -3082,30 +3479,28 @@ xga_mca_write(int port, uint8_t val, void *priv)
         return;
 
     io_removehandler(0x2100 + (xga->instance << 4), 0x0010, xga_ext_inb, NULL, NULL, xga_ext_outb, NULL, NULL, svga);
-    mem_mapping_disable(&xga->bios_rom.mapping);
     mem_mapping_disable(&xga->memio_mapping);
     xga->on                    = 0;
-    vga_on                     = 1;
-    xga->linear_endian_reverse = 0;
     xga->a5_test               = 0;
+    xga->test_stage            = 0;
 
     /* Save the MCA register value. */
     xga->pos_regs[port & 7] = val;
-    if (!(xga->pos_regs[4] & 1) && (mem_size >= 16384)) /*MCA 4MB addressing on systems with more than 16MB of memory*/
-        xga->pos_regs[4] |= 1;
 
     if (xga->pos_regs[2] & 1) {
         xga->instance      = (xga->pos_regs[2] & 0x0e) >> 1;
         xga->base_addr_1mb = (xga->pos_regs[5] & 0x0f) << 20;
         xga->linear_base   = ((xga->pos_regs[4] & 0xfe) * 0x1000000) + (xga->instance << 22);
         xga->rom_addr      = 0xc0000 + (((xga->pos_regs[2] & 0xf0) >> 4) * 0x2000);
+        if (!xga->base_addr_1mb)
+            xga->pos_regs[4] |= 1; /*If 1MB VRAM aperture is disabled on MCA, enable the 4MB VRAM aperture instead.*/
 
         io_sethandler(0x2100 + (xga->instance << 4), 0x0010, xga_ext_inb, NULL, NULL, xga_ext_outb, NULL, NULL, svga);
 
-        if (xga->pos_regs[3] & 1)
-            mem_mapping_set_addr(&xga->bios_rom.mapping, xga->rom_addr, 0x2000);
-        else
-            mem_mapping_set_addr(&xga->memio_mapping, xga->rom_addr + 0x1c00 + (xga->instance * 0x80), 0x80);
+        if (xga->rom_addr) {
+            mem_mapping_set_addr(&xga->memio_mapping, xga->rom_addr, 0x2000);
+            xga_log("ROM address=%05x.\n", xga->rom_addr);
+        }
     }
 
     xga_log("[%04X:%08X]: POS Write Port = %x, val = %02x, linear base = %08x, instance = %d, "
@@ -3119,6 +3514,7 @@ xga_mca_feedb(void *priv)
     const svga_t *svga = (svga_t *) priv;
     const xga_t  *xga  = (xga_t *) svga->xga;
 
+    xga_log("FeedB.\n");
     return xga->pos_regs[2] & 1;
 }
 
@@ -3126,15 +3522,10 @@ static void
 xga_mca_reset(void *priv)
 {
     svga_t *svga = (svga_t *) priv;
-    xga_t  *xga  = (xga_t *) svga->xga;
 
-    mem_mapping_disable(&xga->bios_rom.mapping);
-    mem_mapping_disable(&xga->memio_mapping);
-    xga->on = 0;
-    vga_on  = 1;
+    xga_log("MCA Reset.\n");
+    mem_mapping_set_handler(&svga->mapping, svga->read, svga->readw, svga->readl, svga->write, svga->writew, svga->writel);
     xga_mca_write(0x102, 0, svga);
-    xga->linear_endian_reverse = 0;
-    xga->a5_test               = 0;
 }
 
 static void
@@ -3143,12 +3534,14 @@ xga_reset(void *priv)
     svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = (xga_t *) svga->xga;
 
-    mem_mapping_disable(&xga->bios_rom.mapping);
+    xga_log("Normal Reset.\n");
     mem_mapping_disable(&xga->memio_mapping);
+
     xga->on                    = 0;
-    vga_on                     = 1;
-    xga->linear_endian_reverse = 0;
     xga->a5_test               = 0;
+    xga->test_stage            = 0;
+    mem_mapping_set_handler(&svga->mapping, svga->read, svga->readw, svga->readl, svga->write, svga->writew, svga->writel);
+    svga_set_poll(svga);
 }
 
 static uint8_t
@@ -3156,33 +3549,31 @@ xga_pos_in(uint16_t addr, void *priv)
 {
     svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = (xga_t *) svga->xga;
-    uint8_t ret  = 0xff;
+    uint8_t ret  = 0x00;
 
     if (!xga_standalone_enabled) {
         switch (addr) {
             case 0x0100:
             case 0x0101:
-                if (xga->instance_isa == xga->instance_num)
+                if (xga->instance == xga->instance_num)
                     ret = xga->pos_regs[addr & 7];
                 else
                     ret = 0xff;
+
+                xga_log("%03xRead=%02x.\n", addr, ret);
                 break;
             case 0x0102:
+                ret = xga->pos_regs[2] | 0x30;
+                break;
             case 0x0105:
-                ret = xga->pos_regs[addr & 7];
-                break;
-            case 0x0106:
-                ret = xga->pos_idx >> 8;
-                break;
-            case 0x0107:
-                ret = xga->pos_idx & 0xff;
+                ret = xga->pos_regs[5];
+                xga_log("POS IDX Read 010%x ret = %02x.\n", addr & 7, ret);
                 break;
             case 0x0103:
-                if (!(xga->pos_idx & 3))
+                if ((xga->pos_idx & 3) == 0) {
                     ret = xga->pos_regs[3];
-                else
-                    ret = 0;
-
+                    ret |= (xga->dma_channel << 3);
+                }
                 xga_log("POS IDX for 0103 = %d, ret = %02x.\n", xga->pos_idx & 3, ret);
                 break;
             case 0x0104:
@@ -3196,31 +3587,25 @@ xga_pos_in(uint16_t addr, void *priv)
                     case 2:
                         ret = xga->pos_regs[1];
                         break;
-                    case 3:
-                        ret = 0;
-                        break;
 
                     default:
                         break;
                 }
-
                 xga_log("POS IDX for 0104 = %d, ret = %02x.\n", xga->pos_idx & 3, ret);
                 break;
-            case 0x0108:
-            case 0x0109:
-            case 0x010a:
-            case 0x010b:
-            case 0x010c:
-            case 0x010d:
-            case 0x010e:
-            case 0x010f:
-                xga->instance_num = addr & 7;
-                if (xga->instance_isa == xga->instance_num)
-                    ret = xga->instance_isa;
-                else
-                    ret = 0;
+            case 0x0106:
+                ret = xga->pos_idx >> 8;
+                break;
+            case 0x0107:
+                ret = xga->pos_idx & 0xff;
+                break;
+            case 0x0108 ... 0x010f:
+                xga->instance_num = addr & 0x07;
+                if (xga->instance == xga->instance_num)
+                    ret = xga->instance;
 
                 ret |= xga->isa_pos_enable;
+                xga_log("%03xRead=%02x.\n", addr, ret);
                 break;
 
             default:
@@ -3228,12 +3613,15 @@ xga_pos_in(uint16_t addr, void *priv)
         }
     } else {
         switch (addr) {
+            case 0x0096:
+                ret = xga->vga_post;
+                break;
             case 0x0100:
             case 0x0101:
                 ret = xga->pos_regs[addr & 7];
                 break;
             case 0x0103:
-                ret = xga->pos_regs[3] | 7;
+                ret = xga->pos_regs[3] | 0x06;
                 ret |= (xga->dma_channel << 3);
                 break;
             case 0x0102:
@@ -3243,27 +3631,12 @@ xga_pos_in(uint16_t addr, void *priv)
             case 0x0107:
                 ret = (xga_mca_read(addr, svga));
                 break;
-            case 0x0108:
-            case 0x0109:
-            case 0x010a:
-            case 0x010b:
-            case 0x010c:
-            case 0x010d:
-            case 0x010e:
-            case 0x010f:
-                xga->instance_num = addr & 7;
-                if (xga->instance_isa == xga->instance_num)
-                    ret = xga->instance_isa;
-                else
-                    ret = 0;
-
-                ret |= xga->isa_pos_enable;
-                break;
 
             default:
                 break;
         }
     }
+    xga_log("[%04X:%08X]: XGA POS IN addr=%04x, ret=%02x.\n", CS, cpu_state.pc, addr, ret);
     return ret;
 }
 
@@ -3273,8 +3646,44 @@ xga_pos_out(uint16_t addr, uint8_t val, void *priv)
     svga_t *svga = (svga_t *) priv;
     xga_t  *xga  = (xga_t *) svga->xga;
 
+    xga_log("[%04X:%08X]: XGA POS OUT addr=%04x, val=%02x.\n", CS, cpu_state.pc, addr, val);
     if (!xga_standalone_enabled) {
         switch (addr) {
+            case 0x0096:
+                xga->instance_num = val & 0x07;
+                xga->isa_pos_enable = val & 0x08;
+                xga_log("096Write=%02x.\n", val);
+                break;
+            case 0x0102:
+                xga_log("[%04X:%08X]: 102Write=%02x.\n", CS, cpu_state.pc, val);
+                xga->pos_regs[2] = val | 0x02; /*Instance 0 is not recommended on AT bus/ISA bus systems, so force it to use instance 1.*/
+                io_removehandler(0x2100 + (xga->instance << 4), 0x0010, xga_ext_inb, NULL, NULL, xga_ext_outb, NULL, NULL, svga);
+                mem_mapping_disable(&xga->memio_mapping);
+                if (xga->pos_regs[2] & 0x01) {
+                    xga->rom_addr    = 0xc0000 + (((xga->pos_regs[2] & 0xc0) >> 6) * 0x8000);
+                    xga->instance    = (xga->pos_regs[2] & 0x0e) >> 1;
+                    xga->linear_base = ((xga->pos_regs[4] & 0xfe) * 0x1000000) + (xga->instance << 22);
+                    xga->base_addr_1mb = (xga->pos_regs[5] & 0x0f) << 20;
+                    io_sethandler(0x2100 + (xga->instance << 4), 0x0010, xga_ext_inb, NULL, NULL, xga_ext_outb, NULL, NULL, svga);
+                    xga_log("XGA ISA ROM address=%05x, instance=%d.\n", xga->rom_addr, xga->instance);
+                    mem_mapping_set_addr(&xga->memio_mapping, xga->rom_addr, 0x8000);
+                }
+                break;
+            case 0x0103:
+                if ((xga->pos_idx & 3) == 0)
+                    xga->pos_regs[3] = val;
+
+                xga_log("[%04X:%08X]: 103Write=%02x.\n", CS, cpu_state.pc, val);
+                break;
+            case 0x0104:
+                xga_log("104Write=%02x.\n", val);
+                if ((xga->pos_idx & 3) == 0)
+                    xga->pos_regs[4] = val;
+                break;
+            case 0x0105:
+                xga_log("105Write=%02x.\n", val);
+                xga->pos_regs[5] = val;
+                break;
             case 0x0106:
                 xga->pos_idx = (xga->pos_idx & 0x00ff) | (val << 8);
                 break;
@@ -3282,15 +3691,9 @@ xga_pos_out(uint16_t addr, uint8_t val, void *priv)
                 xga->pos_idx = (xga->pos_idx & 0xff00) | val;
                 xga_log("POS IDX Write = %04x.\n", xga->pos_idx);
                 break;
-            case 0x0108:
-            case 0x0109:
-            case 0x010a:
-            case 0x010b:
-            case 0x010c:
-            case 0x010d:
-            case 0x010e:
-            case 0x010f:
-                xga->instance_num   = addr & 7;
+            case 0x0108 ... 0x010f:
+                xga_log("%03xWrite=%02x.\n", addr, val);
+                xga->instance_num = addr & 0x07;
                 xga->isa_pos_enable = val & 0x08;
                 break;
 
@@ -3298,17 +3701,10 @@ xga_pos_out(uint16_t addr, uint8_t val, void *priv)
                 break;
         }
     } else {
+        xga_log("XGA Standalone ISA Write Port=%04x, Val=%02x.\n", addr, val);
         switch (addr) {
-            case 0x0108:
-            case 0x0109:
-            case 0x010a:
-            case 0x010b:
-            case 0x010c:
-            case 0x010d:
-            case 0x010e:
-            case 0x010f:
-                xga->instance_num   = addr & 7;
-                xga->isa_pos_enable = val & 0x08;
+            case 0x0096:
+                xga->vga_post = val;
                 break;
 
             default:
@@ -3325,72 +3721,47 @@ xga_init(const device_t *info)
 
     svga_t  *svga     = svga_get_pri();
     xga_t   *xga      = (xga_t *) calloc(1, sizeof(xga_t));
-    FILE    *fp;
-    uint8_t *rom      = NULL;
 
     svga->xga         = xga;
 
-    xga->ext_mem_addr = device_get_config_hex16("ext_mem_addr");
-    xga->instance_isa = device_get_config_int("instance");
     xga->type         = device_get_config_int("type");
     xga->dma_channel  = device_get_config_int("dma");
     xga->bus          = info->flags;
 
-    xga->vram_size             = (1024 << 10);
+    xga->vram_size             = 1024 << 10;
     xga->vram_mask             = xga->vram_size - 1;
     xga->vram                  = calloc(xga->vram_size, 1);
-    xga->changedvram           = calloc(xga->vram_size >> 12, 1);
+    xga->changedvram           = calloc((xga->vram_size >> 12) + 1, 1);
     xga->on                    = 0;
     xga->hwcursor.cur_xsize    = 64;
     xga->hwcursor.cur_ysize    = 64;
-    xga->bios_rom.sz           = 0x2000;
-    xga->linear_endian_reverse = 0;
     xga->a5_test               = 0;
+    xga->test_stage            = 0;
 
-    fp = rom_fopen(xga->type ? XGA2_BIOS_PATH : XGA_BIOS_PATH, "rb");
-    (void) fseek(fp, 0L, SEEK_END);
-    (void) fseek(fp, 0L, SEEK_SET);
-
-    rom = malloc(xga->bios_rom.sz);
-    memset(rom, 0xff, xga->bios_rom.sz);
-    (void) !fread(rom, xga->bios_rom.sz, 1, fp);
-    (void) fclose(fp);
-
-    xga->bios_rom.rom  = rom;
-    xga->bios_rom.mask = xga->bios_rom.sz - 1;
-    if (fp != NULL) {
-        free(rom);
-    }
-
-    xga->base_addr_1mb = 0;
     if (info->flags & DEVICE_MCA) {
         video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_xga_mca);
+        xga->base_addr_1mb = 0;
         xga->linear_base = 0;
         xga->instance    = 0;
         xga->rom_addr    = 0;
         rom_init(&xga->bios_rom, xga->type ? XGA2_BIOS_PATH : XGA_BIOS_PATH, 0xc0000, 0x2000, 0x1fff, 0, MEM_MAPPING_EXTERNAL);
+        mem_mapping_disable(&xga->bios_rom.mapping);
+        mem_mapping_add(&xga->memio_mapping, 0, 0, xga_memio_readb, xga_memio_readw, xga_memio_readl,
+                        xga_memio_writeb, xga_memio_writew, xga_memio_writel,
+                        xga->bios_rom.rom, MEM_MAPPING_EXTERNAL, svga);
     } else {
-        if (!xga_standalone_enabled)
-            rom_init(&xga->vga_bios_rom, INMOS_XGA_BIOS_PATH, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
-        else
-            video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_xga_isa);
-
-        xga->pos_regs[2] = 1 | (xga->instance_isa << 1) | xga->ext_mem_addr;
-        xga->instance    = (xga->pos_regs[2] & 0x0e) >> 1;
-        xga->pos_regs[4] = 1 | 2;
-        xga->linear_base = ((xga->pos_regs[4] & 0xfe) * 0x1000000) + (xga->instance << 22);
-        xga->rom_addr    = 0xc0000 + (((xga->pos_regs[2] & 0xf0) >> 4) * 0x2000);
+        xga->pos_regs[4] = 0x02;
+        if (!xga_standalone_enabled) {
+            rom_init(&xga->bios_rom, INMOS_XGA_BIOS_PATH, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); /*VGA BIOS only*/
+            mem_mapping_add(&xga->memio_mapping, 0, 0, xga_memio_readb, xga_memio_readw, xga_memio_readl,
+                            xga_memio_writeb, xga_memio_writew, xga_memio_writel,
+                            xga->bios_rom.rom, MEM_MAPPING_EXTERNAL, svga);
+        }
     }
 
-    mem_mapping_add(&xga->video_mapping, 0, 0, xga_read, xga_readw, xga_readl,
-                    xga_write, xga_writew, xga_writel,
-                    NULL, MEM_MAPPING_EXTERNAL, svga);
     mem_mapping_add(&xga->linear_mapping, 0, 0, xga_read_linear, xga_readw_linear, xga_readl_linear,
                     xga_write_linear, xga_writew_linear, xga_writel_linear,
                     NULL, MEM_MAPPING_EXTERNAL, svga);
-    mem_mapping_add(&xga->memio_mapping, 0, 0, xga_memio_readb, xga_memio_readw, xga_memio_readl,
-                    xga_memio_writeb, xga_memio_writew, xga_memio_writel,
-                    !xga_standalone_enabled ? xga->vga_bios_rom.rom : xga->bios_rom.rom, MEM_MAPPING_EXTERNAL, svga);
 
     mem_mapping_disable(&xga->linear_mapping);
     mem_mapping_disable(&xga->memio_mapping);
@@ -3401,13 +3772,8 @@ xga_init(const device_t *info)
     if (xga->bus & DEVICE_MCA) {
         mca_add(xga_mca_read, xga_mca_write, xga_mca_feedb, xga_mca_reset, svga);
     } else {
-        io_sethandler(0x0100, 0x0008, xga_pos_in, NULL, NULL, NULL, NULL, NULL, svga);
-        if (!xga_standalone_enabled)
-            io_sethandler(0x0106, 0x0002, NULL, NULL, NULL, xga_pos_out, NULL, NULL, svga);
-
-        io_sethandler(0x2100 + (xga->instance << 4), 0x0010, xga_ext_inb, NULL, NULL, xga_ext_outb, NULL, NULL, svga);
-        io_sethandler(0x0108, 0x0008, xga_pos_in, NULL, NULL, xga_pos_out, NULL, NULL, svga);
-        mem_mapping_set_addr(&xga->memio_mapping, xga->rom_addr + 0x1c00 + (xga->instance * 0x80), 0x80);
+        io_sethandler(0x0096, 0x0001, xga_pos_in, NULL, NULL, xga_pos_out, NULL, NULL, svga);
+        io_sethandler(0x0100, 0x0010, xga_pos_in, NULL, NULL, xga_pos_out, NULL, NULL, svga);
     }
     return svga;
 }
@@ -3479,109 +3845,56 @@ xga_force_redraw(void *priv)
 static const device_config_t xga_mca_configuration[] = {
   // clang-format off
     {
-        .name = "type",
-        .description = "XGA type",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "XGA-1",
-                .value = 0
-            },
-            {
-                .description = "XGA-2",
-                .value = 1
-            },
-            { .description = "" }
-        }
+        .name           = "type",
+        .description    = "XGA type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "XGA-1", .value = 0 },
+            { .description = "XGA-2", .value = 1 },
+            { .description = ""                  }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
 };
 
-static const device_config_t xga_isa_configuration[] = {
+static const device_config_t xga_inmos_isa_configuration[] = {
   // clang-format off
     {
-        .name = "type",
-        .description = "XGA type",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            {
-                .description = "XGA-1",
-                .value = 0
-            },
-            {
-                .description = "XGA-2",
-                .value = 1
-            },
-            { .description = "" }
-        }
-    },
-    {
-        .name = "instance",
-        .description = "Instance",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 6,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "0 (2100h-210Fh)", .value = 0 },
-            { .description = "1 (2110h-211Fh)", .value = 1 },
-            { .description = "2 (2120h-212Fh)", .value = 2 },
-            { .description = "3 (2130h-213Fh)", .value = 3 },
-            { .description = "4 (2140h-214Fh)", .value = 4 },
-            { .description = "5 (2150h-215Fh)", .value = 5 },
-            { .description = "6 (2160h-216Fh)", .value = 6 },
-            { .description = "7 (2170h-217Fh)", .value = 7 },
-            { .description = ""                      }
-        },
-    },
-    {
-        .name = "ext_mem_addr",
-        .description = "MMIO address",
-        .type = CONFIG_HEX16,
-        .default_string = "",
-        .default_int = 0x00f0,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "C800h", .value = 0x0040 },
-            { .description = "CA00h", .value = 0x0050 },
-            { .description = "CC00h", .value = 0x0060 },
-            { .description = "CE00h", .value = 0x0070 },
-            { .description = "D000h", .value = 0x0080 },
-            { .description = "D200h", .value = 0x0090 },
-            { .description = "D400h", .value = 0x00a0 },
-            { .description = "D600h", .value = 0x00b0 },
-            { .description = "D800h", .value = 0x00c0 },
-            { .description = "DA00h", .value = 0x00d0 },
-            { .description = "DC00h", .value = 0x00e0 },
-            { .description = "DE00h", .value = 0x00f0 },
-            { .description = ""                      }
-        },
-    },
-    {
-        .name = "dma",
-        .description = "DMA channel",
-        .type = CONFIG_SELECTION,
-        .default_string = "",
-        .default_int = 7,
-        .file_filter = "",
-        .spinner = { 0 },
-        .selection = {
-            { .description = "Disabled", .value = 0 },
-            { .description = "DMA 6", .value = 6 },
-            { .description = "DMA 7", .value = 7 },
+        .name           = "type",
+        .description    = "XGA type",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "XGA-1", .value = 0 },
+            { .description = "XGA-2", .value = 1 },
             { .description = ""                  }
         },
+        .bios           = { { 0 } }
+    },
+    {
+        .name           = "dma",
+        .description    = "DMA",
+        .type           = CONFIG_SELECTION,
+        .default_string = NULL,
+        .default_int    = 7,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = {
+            { .description = "Disabled", .value = 0 },
+            { .description = "DMA 6",    .value = 6 },
+            { .description = "DMA 7",    .value = 7 },
+            { .description = ""                     }
+        },
+        .bios           = { { 0 } }
     },
     { .name = "", .description = "", .type = CONFIG_END }
   // clang-format on
@@ -3595,38 +3908,24 @@ const device_t xga_device = {
     .init          = xga_init,
     .close         = xga_close,
     .reset         = xga_reset,
-    { .available = xga_available },
+    .available     = xga_available,
     .speed_changed = xga_speed_changed,
     .force_redraw  = xga_force_redraw,
     .config        = xga_mca_configuration
 };
 
-const device_t xga_isa_device = {
-    .name          = "XGA (ISA)",
-    .internal_name = "xga_isa",
-    .flags         = DEVICE_ISA | DEVICE_AT,
-    .local         = 0,
-    .init          = xga_init,
-    .close         = xga_close,
-    .reset         = xga_reset,
-    { .available = xga_available },
-    .speed_changed = xga_speed_changed,
-    .force_redraw  = xga_force_redraw,
-    .config        = xga_isa_configuration
-};
-
 const device_t inmos_isa_device = {
     .name          = "INMOS XGA (ISA)",
     .internal_name = "inmos_xga_isa",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
     .local         = 0,
     .init          = svga_xga_init,
     .close         = xga_close,
     .reset         = xga_reset,
-    { .available = inmos_xga_available },
+    .available     = inmos_xga_available,
     .speed_changed = xga_speed_changed,
     .force_redraw  = xga_force_redraw,
-    .config        = xga_isa_configuration
+    .config        = xga_inmos_isa_configuration
 };
 
 void
@@ -3637,6 +3936,4 @@ xga_device_add(void)
 
     if (machine_has_bus(machine, MACHINE_BUS_MCA))
         device_add(&xga_device);
-    else
-        device_add(&xga_isa_device);
 }
diff --git a/src/video/video.c b/src/video/video.c
index 710449746..e2f2801d3 100644
--- a/src/video/video.c
+++ b/src/video/video.c
@@ -104,7 +104,7 @@ monitor_settings_t monitor_settings[MONITORS_NUM];
 atomic_bool        doresize_monitors[MONITORS_NUM];
 
 #ifdef _WIN32
-void *__cdecl (*video_copy)(void *_Dst, const void *_Src, size_t _Size) = memcpy;
+void * (*__cdecl video_copy)(void *_Dst, const void *_Src, size_t _Size) = memcpy;
 #else
 void *(*video_copy)(void *__restrict, const void *__restrict, size_t);
 #endif
@@ -476,6 +476,7 @@ video_blit_memtoscreen_monitor(int x, int y, int w, int h, int monitor_index)
     monitors[monitor_index].mon_blit_data_ptr->y             = y;
     monitors[monitor_index].mon_blit_data_ptr->w             = w;
     monitors[monitor_index].mon_blit_data_ptr->h             = h;
+    monitors[monitor_index].mon_renderedframes++;
 
     thread_set_event(monitors[monitor_index].mon_blit_data_ptr->wake_blit_thread);
     MTR_END("video", "video_blit_memtoscreen");
@@ -831,9 +832,9 @@ destroy_bitmap(bitmap_t *b)
 bitmap_t *
 create_bitmap(int x, int y)
 {
-    bitmap_t *b = malloc(sizeof(bitmap_t) + (y * sizeof(uint32_t *)));
+    bitmap_t *b = calloc(sizeof(bitmap_t), (y * sizeof(uint32_t *)));
 
-    b->dat = malloc((size_t) x * y * 4);
+    b->dat = calloc((size_t) x * y, 4);
     for (int c = 0; c < y; c++)
         b->line[c] = &(b->dat[c * x]);
     b->w = x;
@@ -1006,76 +1007,73 @@ video_force_resize_set_monitor(uint8_t res, int monitor_index)
 }
 
 void
-loadfont_common(FILE *f, int format)
+loadfont_common(FILE *fp, int format)
 {
-    int c;
-    int d;
-
     switch (format) {
         case 0: /* MDA */
-            for (c = 0; c < 256; c++)
-                for (d = 0; d < 8; d++)
-                    fontdatm[c][d] = fgetc(f) & 0xff;
-            for (c = 0; c < 256; c++)
-                for (d = 0; d < 8; d++)
-                    fontdatm[c][d + 8] = fgetc(f) & 0xff;
-            (void) fseek(f, 4096 + 2048, SEEK_SET);
-            for (c = 0; c < 256; c++)
-                for (d = 0; d < 8; d++)
-                    fontdat[c][d] = fgetc(f) & 0xff;
+            for (uint16_t c = 0; c < 256; c++) /* 8x14 MDA in 8x8 cell (lines 0-7) */
+                for (uint8_t d = 0; d < 8; d++)
+                    fontdatm[c][d] = fgetc(fp) & 0xff;
+            for (uint16_t c = 0; c < 256; c++) /* 8x14 MDA in 8x8 cell (lines 8-13 + padding lines) */
+                for (uint8_t d = 0; d < 8; d++)
+                    fontdatm[c][d + 8] = fgetc(fp) & 0xff;
+            (void) fseek(fp, 4096 + 2048, SEEK_SET);
+            for (uint16_t c = 0; c < 256; c++) /* 8x8 CGA (thick, primary) */
+                for (uint8_t d = 0; d < 8; d++)
+                    fontdat[c][d] = fgetc(fp) & 0xff;
             break;
 
         case 1: /* PC200 */
-            for (d = 0; d < 4; d++) {
+            for (uint8_t d = 0; d < 4; d++) {
                 /* There are 4 fonts in the ROM */
-                for (c = 0; c < 256; c++) /* 8x14 MDA in 8x16 cell */
-                    (void) !fread(&fontdatm[256 * d + c][0], 1, 16, f);
-                for (c = 0; c < 256; c++) { /* 8x8 CGA in 8x16 cell */
-                    (void) !fread(&fontdat[256 * d + c][0], 1, 8, f);
-                    fseek(f, 8, SEEK_CUR);
+                for (uint16_t c = 0; c < 256; c++) /* 8x14 MDA in 8x16 cell */
+                    (void) !fread(&fontdatm[256 * d + c][0], 1, 16, fp);
+                for (uint16_t c = 0; c < 256; c++) { /* 8x8 CGA in 8x16 cell */
+                    (void) !fread(&fontdat[256 * d + c][0], 1, 8, fp);
+                    fseek(fp, 8, SEEK_CUR);
                 }
             }
             break;
 
         default:
         case 2: /* CGA */
-            for (c = 0; c < 256; c++)
-                for (d = 0; d < 8; d++)
-                    fontdat[c][d] = fgetc(f) & 0xff;
+            for (uint16_t c = 0; c < 256; c++)
+                for (uint8_t d = 0; d < 8; d++)
+                    fontdat[c][d] = fgetc(fp) & 0xff;
             break;
 
         case 3: /* Wyse 700 */
-            for (c = 0; c < 512; c++)
-                for (d = 0; d < 32; d++)
-                    fontdatw[c][d] = fgetc(f) & 0xff;
+            for (uint16_t c = 0; c < 512; c++)
+                for (uint8_t d = 0; d < 32; d++)
+                    fontdatw[c][d] = fgetc(fp) & 0xff;
             break;
 
         case 4: /* MDSI Genius */
-            for (c = 0; c < 256; c++)
-                for (d = 0; d < 16; d++)
-                    fontdat8x12[c][d] = fgetc(f) & 0xff;
+            for (uint16_t c = 0; c < 256; c++)
+                for (uint8_t d = 0; d < 16; d++)
+                    fontdat8x12[c][d] = fgetc(fp) & 0xff;
             break;
 
-        case 5:                               /* Toshiba 3100e */
-            for (d = 0; d < 2048; d += 512) { /* Four languages... */
-                for (c = d; c < d + 256; c++) {
-                    (void) !fread(&fontdatm[c][8], 1, 8, f);
+        case 5: /* Toshiba 3100e */
+            for (uint16_t d = 0; d < 2048; d += 512) { /* Four languages... */
+                for (uint16_t c = d; c < d + 256; c++) {
+                    (void) !fread(&fontdatm[c][8], 1, 8, fp);
                 }
-                for (c = d + 256; c < d + 512; c++) {
-                    (void) !fread(&fontdatm[c][8], 1, 8, f);
+                for (uint32_t c = d + 256; c < d + 512; c++) {
+                    (void) !fread(&fontdatm[c][8], 1, 8, fp);
                 }
-                for (c = d; c < d + 256; c++) {
-                    (void) !fread(&fontdatm[c][0], 1, 8, f);
+                for (uint32_t c = d; c < d + 256; c++) {
+                    (void) !fread(&fontdatm[c][0], 1, 8, fp);
                 }
-                for (c = d + 256; c < d + 512; c++) {
-                    (void) !fread(&fontdatm[c][0], 1, 8, f);
+                for (uint32_t c = d + 256; c < d + 512; c++) {
+                    (void) !fread(&fontdatm[c][0], 1, 8, fp);
                 }
-                fseek(f, 4096, SEEK_CUR); /* Skip blank section */
-                for (c = d; c < d + 256; c++) {
-                    (void) !fread(&fontdat[c][0], 1, 8, f);
+                fseek(fp, 4096, SEEK_CUR); /* Skip blank section */
+                for (uint32_t c = d; c < d + 256; c++) {
+                    (void) !fread(&fontdat[c][0], 1, 8, fp);
                 }
-                for (c = d + 256; c < d + 512; c++) {
-                    (void) !fread(&fontdat[c][0], 1, 8, f);
+                for (uint32_t c = d + 256; c < d + 512; c++) {
+                    (void) !fread(&fontdat[c][0], 1, 8, fp);
                 }
             }
             break;
@@ -1087,65 +1085,64 @@ loadfont_common(FILE *f, int format)
             if (!fontdatksc5601_user)
                 fontdatksc5601_user = malloc(192 * sizeof(dbcs_font_t));
 
-            for (c = 0; c < 16384; c++) {
-                for (d = 0; d < 32; d++)
-                    fontdatksc5601[c].chr[d] = fgetc(f) & 0xff;
+            for (uint32_t c = 0; c < 16384; c++) {
+                for (uint8_t d = 0; d < 32; d++)
+                    fontdatksc5601[c].chr[d] = fgetc(fp) & 0xff;
             }
             break;
 
         case 7: /* Sigma Color 400 */
             /* The first 4k of the character ROM holds an 8x8 font */
-            for (c = 0; c < 256; c++) {
-                (void) !fread(&fontdat[c][0], 1, 8, f);
-                fseek(f, 8, SEEK_CUR);
+            for (uint16_t c = 0; c < 256; c++) {
+                (void) !fread(&fontdat[c][0], 1, 8, fp);
+                fseek(fp, 8, SEEK_CUR);
             }
             /* The second 4k holds an 8x16 font */
-            for (c = 0; c < 256; c++) {
-                if (fread(&fontdatm[c][0], 1, 16, f) != 16)
+            for (uint16_t c = 0; c < 256; c++) {
+                if (fread(&fontdatm[c][0], 1, 16, fp) != 16)
                     fatal("loadfont(): Error reading 8x16 font in Sigma Color 400 mode, c = %i\n", c);
             }
             break;
 
-        case 8:                        /* Amstrad PC1512, Toshiba T1000/T1200 */
-            for (c = 0; c < 2048; c++) /* Allow up to 2048 chars */
-                for (d = 0; d < 8; d++)
-                    fontdat[c][d] = fgetc(f) & 0xff;
+        case 8: /* Amstrad PC1512, Toshiba T1000/T1200 */
+            for (uint16_t c = 0; c < 2048; c++) /* Allow up to 2048 chars */
+                for (uint8_t d = 0; d < 8; d++)
+                    fontdat[c][d] = fgetc(fp) & 0xff;
             break;
 
         case 9: /* Image Manager 1024 native font */
-            for (c = 0; c < 256; c++)
-                (void) !fread(&fontdat12x18[c][0], 1, 36, f);
+            for (uint16_t c = 0; c < 256; c++)
+                (void) !fread(&fontdat12x18[c][0], 1, 36, fp);
             break;
 
-        case 10:                       /* Pravetz */
-            for (c = 0; c < 1024; c++) /* Allow up to 1024 chars */
-                for (d = 0; d < 8; d++)
-                    fontdat[c][d] = fgetc(f) & 0xff;
+        case 10: /* Pravetz */
+            for (uint16_t c = 0; c < 1024; c++) /* Allow up to 1024 chars */
+                for (uint8_t d = 0; d < 8; d++)
+                    fontdat[c][d] = fgetc(fp) & 0xff;
             break;
 
-
         case 11: /* PC200 */
-            for (d = 0; d < 4; d++) {
+            for (uint8_t d = 0; d < 4; d++) {
                 /* There are 4 fonts in the ROM */
-                for (c = 0; c < 256; c++) /* 8x14 MDA in 8x16 cell */
-                    (void) !fread(&fontdatm2[256 * d + c][0], 1, 16, f);
-                for (c = 0; c < 256; c++) { /* 8x8 CGA in 8x16 cell */
-                    (void) !fread(&fontdat2[256 * d + c][0], 1, 8, f);
-                    fseek(f, 8, SEEK_CUR);
+                for (uint16_t c = 0; c < 256; c++) /* 8x14 MDA in 8x16 cell */
+                    (void) !fread(&fontdatm2[256 * d + c][0], 1, 16, fp);
+                for (uint16_t c = 0; c < 256; c++) { /* 8x8 CGA in 8x16 cell */
+                    (void) !fread(&fontdat2[256 * d + c][0], 1, 8, fp);
+                    fseek(fp, 8, SEEK_CUR);
                 }
             }
             break;
     }
 
-    (void) fclose(f);
+    (void) fclose(fp);
 }
 
 void
-loadfont_ex(char *s, int format, int offset)
+loadfont_ex(char *fn, int format, int offset)
 {
     FILE *fp;
 
-    fp = rom_fopen(s, "rb");
+    fp = rom_fopen(fn, "rb");
     if (fp == NULL)
         return;
 
@@ -1154,9 +1151,9 @@ loadfont_ex(char *s, int format, int offset)
 }
 
 void
-loadfont(char *s, int format)
+loadfont(char *fn, int format)
 {
-    loadfont_ex(s, format, 0);
+    loadfont_ex(fn, format, 0);
 }
 
 uint32_t
diff --git a/src/vnc.c b/src/vnc.c
index 7b4b1f7b0..cd9911b02 100644
--- a/src/vnc.c
+++ b/src/vnc.c
@@ -125,7 +125,6 @@ vnc_clientgone(UNUSED(rfbClientPtr cl))
 #if 0
         plat_mouse_capture(0);
 #endif
-        mouse_set_poll_ex(NULL);
 
         plat_pause(1);
     }
@@ -152,7 +151,6 @@ vnc_newclient(rfbClientPtr cl)
 #if 0
         plat_mouse_capture(1);
 #endif
-        mouse_set_poll_ex(vnc_mouse_poll);
 
         plat_pause(0);
     }
diff --git a/src/win/86Box.rc b/src/win/86Box.rc
deleted file mode 100644
index 2932b7d62..000000000
--- a/src/win/86Box.rc
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Application resource script for Windows.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          Fred N. van Kempen, <decwiz@yahoo.com>
- *          David Hrdlička, <hrdlickadavid@outlook.com>
- *
- *          Copyright 2016-2019 Miran Grca.
- *          Copyright 2018-2019 David Hrdlička.
- *          Copyright 2021 Laci bá'
- */
-#define IN_RESOURCE_H
-#include <86box/resource.h>
-#include <86box/language.h>
-#include <86box/version.h>
-#undef IN_RESOURCE_H
-
-#define APSTUDIO_READONLY_SYMBOLS
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include <windows.h>
-#undef APSTUDIO_HIDDEN_SYMBOLS
-#undef APSTUDIO_READONLY_SYMBOLS
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Accelerator
-//
-
-MainAccel ACCELERATORS MOVEABLE PURE 
-BEGIN
-#ifdef MTR_ENABLED
-    "T",     IDM_ACTION_TRACE,       CONTROL, VIRTKEY
-#endif
-    // VK_PRIOR,IDM_VID_FULLSCREEN,     VIRTKEY, CONTROL , ALT
-    VK_F11,  IDM_ACTION_SCREENSHOT,  VIRTKEY, CONTROL
-    VK_F12,  IDM_ACTION_RESET_CAD,   VIRTKEY, CONTROL
-    VK_PAUSE,IDM_ACTION_PAUSE,       VIRTKEY
-END
-
-
-#ifndef NO_INCLUDE_MANIFEST
-/////////////////////////////////////////////////////////////////////////////
-//
-// 24
-//
-
-1                       24      MOVEABLE PURE   "86Box.manifest"
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-#ifdef CMAKE
-#define ICON_PATH
-#else
-#define ICON_PATH "win/"
-#endif
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-// defining the icons depending on the build status
-#ifdef RELEASE_BUILD
-/* Icon by OBattler and laciba96 (green for release builds)*/
- 10                     ICON    DISCARDABLE     ICON_PATH "icons/86Box-green.ico"
-#elif BETA_BUILD
-/* Icon by OBattler and laciba96 (yellow for beta builds done by Jenkins)*/
- 10                     ICON    DISCARDABLE     ICON_PATH "icons/86Box-yellow.ico"
-#elif ALPHA_BUILD
-/* Icon by OBattler and laciba96 (red for alpha builds done by Jenkins)*/
- 10                     ICON    DISCARDABLE     ICON_PATH "icons/86Box-red.ico"
-#else
-/* Icon by OBattler and laciba96 (gray for builds of branches and from the git master)*/
- 10                     ICON    DISCARDABLE     ICON_PATH "icons/86Box-gray.ico"
-#endif
- 16                     ICON    DISCARDABLE     ICON_PATH "icons/floppy_525.ico"
- 17                     ICON    DISCARDABLE     ICON_PATH "icons/floppy_525_active.ico"
- 24                     ICON    DISCARDABLE     ICON_PATH "icons/floppy_35.ico"
- 25                     ICON    DISCARDABLE     ICON_PATH "icons/floppy_35_active.ico"
- 32                     ICON    DISCARDABLE     ICON_PATH "icons/cdrom.ico"
- 33                     ICON    DISCARDABLE     ICON_PATH "icons/cdrom_active.ico"
- 48                     ICON    DISCARDABLE     ICON_PATH "icons/zip.ico"
- 49                     ICON    DISCARDABLE     ICON_PATH "icons/zip_active.ico"
- 56                     ICON    DISCARDABLE     ICON_PATH "icons/mo.ico"
- 57                     ICON    DISCARDABLE     ICON_PATH "icons/mo_active.ico"
- 64                     ICON    DISCARDABLE     ICON_PATH "icons/cassette.ico"
- 65                     ICON    DISCARDABLE     ICON_PATH "icons/cassette_active.ico"
- 80                     ICON    DISCARDABLE     ICON_PATH "icons/hard_disk.ico"
- 81                     ICON    DISCARDABLE     ICON_PATH "icons/hard_disk_active.ico"
- 96                     ICON    DISCARDABLE     ICON_PATH "icons/network.ico"
- 97                     ICON    DISCARDABLE     ICON_PATH "icons/network_active.ico"
-104                     ICON    DISCARDABLE     ICON_PATH "icons/cartridge.ico"
-144                     ICON    DISCARDABLE     ICON_PATH "icons/floppy_525_empty.ico"
-145                     ICON    DISCARDABLE     ICON_PATH "icons/floppy_525_empty_active.ico"
-152                     ICON    DISCARDABLE     ICON_PATH "icons/floppy_35_empty.ico"
-153                     ICON    DISCARDABLE     ICON_PATH "icons/floppy_35_empty_active.ico"
-160                     ICON    DISCARDABLE     ICON_PATH "icons/cdrom_empty.ico"
-161                     ICON    DISCARDABLE     ICON_PATH "icons/cdrom_empty_active.ico"
-176                     ICON    DISCARDABLE     ICON_PATH "icons/zip_empty.ico"
-177                     ICON    DISCARDABLE     ICON_PATH "icons/zip_empty_active.ico"
-184                     ICON    DISCARDABLE     ICON_PATH "icons/mo_empty.ico"
-185                     ICON    DISCARDABLE     ICON_PATH "icons/mo_empty_active.ico"
-192                     ICON    DISCARDABLE     ICON_PATH "icons/cassette_empty.ico"
-193                     ICON    DISCARDABLE     ICON_PATH "icons/cassette_empty_active.ico"
-200                     ICON    DISCARDABLE     ICON_PATH "icons/run.ico"
-201                     ICON    DISCARDABLE     ICON_PATH "icons/pause.ico"
-202                     ICON    DISCARDABLE     ICON_PATH "icons/send_cad.ico"
-203                     ICON    DISCARDABLE     ICON_PATH "icons/send_cae.ico"
-204                     ICON    DISCARDABLE     ICON_PATH "icons/hard_reset.ico"
-205                     ICON    DISCARDABLE     ICON_PATH "icons/acpi_shutdown.ico"
-206                     ICON    DISCARDABLE     ICON_PATH "icons/settings.ico"
-232                     ICON    DISCARDABLE     ICON_PATH "icons/cartridge_empty.ico"
-240                     ICON    DISCARDABLE     ICON_PATH "icons/machine.ico"
-241                     ICON    DISCARDABLE     ICON_PATH "icons/display.ico"
-242                     ICON    DISCARDABLE     ICON_PATH "icons/input_devices.ico"
-243                     ICON    DISCARDABLE     ICON_PATH "icons/sound.ico"
-244                     ICON    DISCARDABLE     ICON_PATH "icons/ports.ico"
-245                     ICON    DISCARDABLE     ICON_PATH "icons/other_peripherals.ico"
-246                     ICON    DISCARDABLE     ICON_PATH "icons/floppy_and_cdrom_drives.ico"
-247                     ICON    DISCARDABLE     ICON_PATH "icons/other_removable_devices.ico"
-248                     ICON    DISCARDABLE     ICON_PATH "icons/floppy_disabled.ico"
-249                     ICON    DISCARDABLE     ICON_PATH "icons/cdrom_disabled.ico"
-250                     ICON    DISCARDABLE     ICON_PATH "icons/zip_disabled.ico"
-251                     ICON    DISCARDABLE     ICON_PATH "icons/mo_disabled.ico"
-252                     ICON    DISCARDABLE     ICON_PATH "icons/storage_controllers.ico"
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
-    "#include ""windows.h""\r\n"
-    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
-    "#include ""resources.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    DLG_SND_GAIN, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 167
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 129
-    END
-
-    DLG_NEW_FLOPPY, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 219
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 79
-    END
-
-    DLG_CFG_MAIN, DIALOG
-    BEGIN
-        RIGHTMARGIN, 365
-    END
-
-    ABOUTDLG, DIALOG
-    BEGIN
-        RIGHTMARGIN, 208
-    END
-
-    DLG_CFG_MACHINE, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 300
-        TOPMARGIN, 7
-#ifdef USE_DYNAREC
-        BOTTOMMARGIN, 87
-#else
-        BOTTOMMARGIN, 72
-#endif
-    END
-
-    DLG_CFG_VIDEO, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 300
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 38
-    END
-
-    DLG_CFG_INPUT, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 300
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 58
-    END
-
-    DLG_CFG_SOUND, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 300
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 109
-    END
-
-    DLG_CFG_NETWORK, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 300
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 56
-    END
-
-    DLG_CFG_PORTS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 300
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 48
-    END
-
-    DLG_CFG_PERIPHERALS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 300
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 85
-    END
-
-    DLG_CFG_HARD_DISKS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 300
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 137
-    END
-
-    DLG_CFG_FLOPPY_DRIVES, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 300
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 96
-    END
-
-    DLG_CFG_OTHER_REMOVABLE_DEVICES, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 300
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 214
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION EMU_VERSION_MAJ,EMU_VERSION_MIN,EMU_VERSION_PATCH,EMU_BUILD_NUM
- PRODUCTVERSION EMU_VERSION_MAJ,EMU_VERSION_MIN,EMU_VERSION_PATCH,EMU_BUILD_NUM
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", EMU_NAME "\0"
-            VALUE "FileDescription", EMU_NAME "\0"
-            VALUE "FileVersion", EMU_VERSION "\0"
-            VALUE "InternalName", EMU_NAME "\0"
-            VALUE "LegalCopyright", "Copyright \xa9 2007-" COPYRIGHT_YEAR " " EMU_NAME " contributors\0"
-            VALUE "OriginalFilename", EMU_NAME ".exe\0"
-            VALUE "ProductName", EMU_NAME "\0"
-            VALUE "ProductVersion", EMU_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-#endif 
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
-
-#include "languages/zh-CN.rc"
-#include "languages/cs-CZ.rc"
-#include "languages/de-DE.rc"
-#include "languages/en-US.rc"
-#include "languages/en-GB.rc"
-#include "languages/fr-FR.rc"
-#include "languages/hr-HR.rc"
-#include "languages/fi-FI.rc"
-#include "languages/hu-HU.rc"
-#include "languages/it-IT.rc"
-#include "languages/ja-JP.rc"
-#include "languages/ko-KR.rc"
-#include "languages/pl-PL.rc"
-#include "languages/pt-BR.rc"
-#include "languages/pt-PT.rc"
-#include "languages/ru-RU.rc"
-#include "languages/sl-SI.rc"
-#include "languages/es-ES.rc"
-#include "languages/tr-TR.rc"
-#include "languages/uk-UA.rc"
-#include "languages/zh-TW.rc"
diff --git a/src/win/CMakeLists.txt b/src/win/CMakeLists.txt
deleted file mode 100644
index 604ba9bb0..000000000
--- a/src/win/CMakeLists.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# 86Box    A hypervisor and IBM PC system emulator that specializes in
-#          running old operating systems and software designed for IBM
-#          PC systems and compatibles from 1981 through fairly recent
-#          system designs based on the PCI bus.
-#
-#          This file is part of the 86Box distribution.
-#
-#          CMake build script.
-#
-# Authors: David Hrdlička, <hrdlickadavid@outlook.com>
-#
-#          Copyright 2020,2021 David Hrdlička.
-#          Copyright 2021-2022 Jasmine Iwanek.
-#
-
-enable_language(RC)
-
-add_library(plat OBJECT win.c win_dynld.c win_cdrom.c win_keyboard.c
-    win_mouse.c win_serial_passthrough.c)
-
-add_library(ui OBJECT win_ui.c win_icon.c win_stbar.c win_sdl.c win_dialog.c win_about.c
-    win_settings.c win_devconf.c win_snd_gain.c win_specify_dim.c win_new_floppy.c
-    win_jsconf.c win_media_menu.c win_preferences.c glad.c win_opengl.c
-    win_opengl_glslp.c win_toolbar.c 86Box.rc)
-
-if(NOT CPPTHREADS)
-    target_sources(plat PRIVATE win_thread.c)
-endif()
-
-if(RTMIDI)
-    target_compile_definitions(ui PRIVATE USE_RTMIDI)
-endif()
-
-# CMake 3.22 messed this up for clang/clang++
-# See https://gitlab.kitware.com/cmake/cmake/-/issues/23066
-if(MSVC OR (NOT MINGW AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.22))
-    # MSVC linker adds its own manifest to the executable, which fails if
-    # we include ours in 86Box.rc. We therefore need to pass the manifest
-    # directly as as a source file, so the linker can use that instead.
-    set_property(SOURCE 86Box.rc PROPERTY COMPILE_DEFINITIONS NO_INCLUDE_MANIFEST)
-    target_sources(86Box PRIVATE 86Box.manifest)
-endif()
-
-if(NOT MINGW)
-    # Append null to resource strings (fixes file dialogs)
-    set_property(SOURCE 86Box.rc PROPERTY COMPILE_FLAGS -n)
-
-    # `opendir` is only included in MinGW, so include an implementation
-    # for other builds.
-    target_sources(plat PRIVATE win_opendir.c)
-endif()
-
-if(DINPUT)
-    target_sources(plat PRIVATE win_joystick.cpp)
-    target_link_libraries(86Box dinput8)
-else()
-    target_sources(plat PRIVATE win_joystick_rawinput.c)
-endif()
-
-target_link_libraries(86Box advapi32 comctl32 comdlg32 gdi32 shell32 iphlpapi
-    dxguid imm32 hid setupapi uxtheme version winmm psapi ws2_32)
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
deleted file mode 100644
index 0cf34d6c6..000000000
--- a/src/win/Makefile.mingw
+++ /dev/null
@@ -1,978 +0,0 @@
-#
-#
-# 86Box    A hypervisor and IBM PC system emulator that specializes in
-#          running old operating systems and software designed for IBM
-#          PC systems and compatibles from 1981 through fairly recent
-#          system designs based on the PCI bus.
-#
-#          This file is part of the 86Box distribution.
-#
-#          Makefile for Win32 (MinGW32) environment.
-#
-# Authors: Miran Grca, <mgrca8@gmail.com>
-#          Fred N. van Kempen, <decwiz@yahoo.com>
-#
-
-# Various compile-time options.
-ifndef STUFF
- STUFF :=
-endif
-
-# Add feature selections here.
-ifndef EXTRAS
- EXTRAS :=
-endif
-
-ifndef DEV_BUILD
- DEV_BUILD := n
-endif
-
-ifeq ($(DEV_BUILD), y)
- ifndef DEBUG
-  DEBUG := y
- endif
- ifndef GDBSTUB
-  GDBSTUB := n
- endif
- ifndef DEV_BRANCH
-  DEV_BRANCH := y
- endif
- ifndef AMD_K5
-  AMD_K5 := y
- endif
- ifndef AN430TX
-  AN430TX := y
- endif
- ifndef CYRIX_6X86
-  CYRIX_6X86 := y
- endif
- ifndef DESKPRO386
-  DESKPRO386 := y
- endif
- ifndef GUSMAX
-  GUSMAX := y
- endif
- ifndef ISAMEM_RAMPAGE
-  ISAMEM_RAMPAGE := y
- endif
- ifndef ISAMEM_IAB
-  ISAMEM_IAB := y
- endif
- ifndef ISAMEM_BRAT
-  ISAMEM_BRAT := y
- endif
- ifndef LASERXT
-  LASERXT := y
- endif
- ifndef OLIVETTI
-  OLIVETTI := y
- endif
- ifndef OPEN_AT
-  OPEN_AT := y
- endif
- ifndef PAS16
-  PAS16 := y
- endif
- ifndef PCI_DUMMY
-  PCI_DUMMY := y
- endif
- ifndef SIO_DETECT
-  SIO_DETECT := y
- endif
- ifndef VGAWONDER
-  VGAWONDER := y
- endif
- ifndef XL24
-  XL24 := y
- endif
- ifndef NEW_KBC
-  NEW_KBC := n
- endif
-else
- ifndef DEBUG
-  DEBUG := n
- endif
- ifndef GDBSTUB
-  GDBSTUB := n
- endif
- ifndef DEV_BRANCH
-  DEV_BRANCH := n
- endif
- ifndef AMD_K5
-  AMD_K5 := n
- endif
- ifndef AN430TX
-  AN430TX := n
- endif
- ifndef CYRIX_6X86
-  CYRIX_6X86 := n
- endif
- ifndef DESKPRO386
-  DESKPRO386 := n
- endif
- ifndef GUSMAX
-  GUSMAX := n
- endif
- ifndef ISAMEM_RAMPAGE
-  ISAMEM_RAMPAGE := n
- endif
- ifndef ISAMEM_IAB
-  ISAMEM_IAB := n
- endif
- ifndef ISAMEM_BRAT
-  ISAMEM_BRAT := n
- endif
- ifndef LASERXT
-  LASERXT := n
- endif
- ifndef OLIVETTI
-  OLIVETTI := n
- endif
- ifndef OPEN_AT
-  OPEN_AT := n
- endif
- ifndef PAS16
-  PAS16 := n
- endif
- ifndef PCI_DUMMY
-  PCI_DUMMY := n
- endif
- ifndef SIO_DETECT
-  SIO_DETECT := n
- endif
- ifndef VGAWONDER
-  VGAWONDER := n
- endif
- ifndef XL24
-  XL24 := n
- endif
- ifndef NEW_KBC
-  NEW_KBC := n
- endif
-endif
-
-# Defaults for several build options (possibly defined in a chained file.)
-ifndef AUTODEP
- AUTODEP := n
-endif
-ifndef OPTIM
- OPTIM := n
-endif
-ifndef RELEASE
- RELEASE := n
-endif
-ifndef X64
- X64 := n
-endif
-ifndef ARM
- ARM := n
-endif
-ifndef ARM64
- ARM64 := n
-endif
-ifndef DINPUT
- DINPUT := n
-endif
-ifndef FAUDIO
- FAUDIO := n
-endif
-ifndef OPENAL
- OPENAL := y
-endif
-ifndef FLUIDSYNTH
- FLUIDSYNTH := y
-endif
-ifndef MUNT
- MUNT := y
-endif
-ifndef VNC
- VNC := n
-endif
-ifndef NEW_DYNAREC
- NEW_DYNAREC := n
-endif
-ifndef DYNAREC
- DYNAREC := y
-endif
-ifndef CPPTHREADS
- CPPTHREADS := y
-endif
-ifndef RTMIDI
- RTMIDI := y
-endif
-ifndef MINITRACE
- MINITRACE := n
-endif
-ifndef AVX
- AVX := n
-endif
-ifeq ($(DYNAREC), y)
- ifeq ($(ARM), y)
-  ifeq ($(NEW_DYNAREC), n)
-   DYNAREC := n
-  endif
- endif
- ifeq ($(ARM64), y)
-  ifeq ($(NEW_DYNAREC), n)
-   DYNAREC := n
-  endif
- endif
-endif
-
-
-# Path to the dynamic recompiler code.
-ifeq ($(NEW_DYNAREC), y)
- CODEGEN := codegen_new
-else
- CODEGEN := codegen
-endif
-
-
-# Name of the executable.
-PROG := 86Box
-
-
-#########################################################################
-#              Nothing should need changing from here on..              #
-#########################################################################
-VPATH := $(EXPATH) . $(CODEGEN) minitrace cpu cpu/softfloat \
-         cpu/808x cdrom chipset device disk disk/minivhd floppy \
-         game machine mem printer \
-         sio sound \
-         sound/munt sound/munt/c_interface sound/munt/sha1 \
-         sound/munt/srchelper sound/munt/srchelper/srctools/src \
-         sound/resid-fp sound/ymfm \
-         scsi video network win
-
-WINDRES := windres
-STRIP   := strip
-ifeq ($(X64), y)
- TOOL_PREFIX := x86_64-w64-mingw32-
-else
- ifeq ($(ARM64), y)
-  TOOL_PREFIX := aarch64-w64-mingw32-
-  WINDRES := ${TOOL_PREFIX}windres
-  STRIP   := ${TOOL_PREFIX}strip
- endif
- ifeq ($(ARM), y)
-  TOOL_PREFIX := armv7-w64-mingw32-
-  WINDRES := ${TOOL_PREFIX}windres
-  STRIP   := ${TOOL_PREFIX}strip
- endif
- TOOL_PREFIX := i686-w64-mingw32-
-endif
-
-ifeq ($(CLANG), y)
- CPP := clang++
- CC  := clang
-else
- CPP := ${TOOL_PREFIX}g++
- CC  := ${TOOL_PREFIX}gcc
-endif
-
-DEPS     = -MMD -MF $*.d -c $<
-DEPFILE := win/.depends
-
-# Set up the correct toolchain flags.
-OPTS := $(EXTRAS) $(STUFF)
-OPTS += -Iinclude -Iinclude_make \
-        -iquote $(CODEGEN) -iquote cpu
-ifdef EXFLAGS
- OPTS += $(EXFLAGS)
-endif
-ifdef EXINC
- OPTS += -I$(EXINC)
-endif
-ifeq ($(OPTIM), y)
- DFLAGS := -march=native
-else
- ifeq ($(X64), y)
-  DFLAGS :=
- else
-  DFLAGS := -march=i686
- endif
-endif
-ifeq ($(DEBUG), y)
- DFLAGS += -ggdb -DDEBUG
- AOPTIM :=
- ifndef COPTIM
-  COPTIM := -Og
- endif
- ifndef CXXOPTIM
-  ifeq ($(CLANG), y)
-   CXXOPTIM := -Os
-  else
-   CXXOPTIM := -Og
-  endif
- endif
-else
- DFLAGS += -g0
- ifeq ($(OPTIM), y)
-  AOPTIM := -mtune=native
-  ifndef COPTIM
-   CXXOPTIM := -O3 -ffp-contract=fast -flto
-  endif
-  ifndef CXXOPTIM
-   ifeq ($(CLANG), y)
-    CXXOPTIM := -Os -ffp-contract=fast -flto
-   else
-    CXXOPTIM := -O3 -ffp-contract=fast -flto
-   endif
-  endif
- else
-  ifndef COPTIM
-   COPTIM := -O3
-  endif
-  ifndef CXXOPTIM
-   ifeq ($(CLANG), y)
-    CXXOPTIM := -Os
-   else
-    CXXOPTIM := -O3
-   endif
-  endif
- endif
-endif
-ifeq ($(AVX), y)
- AFLAGS := -msse2 -msse3 -mssse3 -msse4 -msse4a -mavx -mavx2 -mfpmath=sse
-else
- AFLAGS := -msse2 -mfpmath=sse
-endif
-ifeq ($(ARM), y)
- DFLAGS := -march=armv7-a
- AOPTIM :=
- AFLAGS := -mfloat-abi=hard
-endif
-ifeq ($(ARM64), y)
- DFLAGS := -march=armv8-a
- AOPTIM :=
- AFLAGS := -mfloat-abi=hard
-endif
-RFLAGS := --input-format=rc -O coff -Iinclude -Iinclude_make
-ifeq ($(RELEASE), y)
- OPTS   += -DRELEASE_BUILD
- RFLAGS += -DRELEASE_BUILD
-endif
-
-
-# Optional modules.
-ifeq ($(DYNAREC), y)
- OPTS   += -DUSE_DYNAREC
- RFLAGS += -DUSE_DYNAREC
-
- ifeq ($(NEW_DYNAREC), y)
-  OPTS   += -DUSE_NEW_DYNAREC
-  RFLAGS += -DUSE_NEW_DYNAREC
-
-  ifeq ($(X64), y)
-   PLATCG := codegen_backend_x86-64.o codegen_backend_x86-64_ops.o codegen_backend_x86-64_ops_sse.o \
-             codegen_backend_x86-64_uops.o
-  else ifeq ($(ARM64), y)
-   PLATCG := codegen_backend_arm64.o codegen_backend_arm64_ops.o codegen_backend_arm64_uops.o \
-             codegen_backend_arm64_imm.o
-  else ifeq ($(ARM), y)
-   PLATCG := codegen_backend_arm.o codegen_backend_arm_ops.o codegen_backend_arm_uops.o
-  else
-   PLATCG := codegen_backend_x86.o codegen_backend_x86_ops.o codegen_backend_x86_ops_fpu.o \
-             codegen_backend_x86_ops_sse.o codegen_backend_x86_uops.o
-  endif
-
-  DYNARECOBJ := codegen.o codegen_accumulate.o codegen_allocator.o codegen_block.o codegen_ir.o codegen_ops.o \
-                codegen_ops_3dnow.o codegen_ops_branch.o codegen_ops_arith.o codegen_ops_fpu_arith.o \
-                codegen_ops_fpu_constant.o codegen_ops_fpu_loadstore.o codegen_ops_fpu_misc.o codegen_ops_helpers.o \
-                codegen_ops_jump.o codegen_ops_logic.o codegen_ops_misc.o codegen_ops_mmx_arith.o codegen_ops_mmx_cmp.o \
-                codegen_ops_mmx_loadstore.o codegen_ops_mmx_logic.o codegen_ops_mmx_pack.o codegen_ops_mmx_shift.o \
-                codegen_ops_mov.o codegen_ops_shift.o codegen_ops_stack.o codegen_reg.o $(PLATCG)
- else
-  ifeq ($(X64), y)
-   PLATCG := codegen_x86-64.o codegen_accumulate_x86-64.o
-  else
-   PLATCG := codegen_x86.o codegen_accumulate_x86.o
-  endif
-
-  DYNARECOBJ := codegen.o \
-                codegen_ops.o $(PLATCG)
- endif
-
-  CGTOBJ := codegen_timing_486.o \
-            codegen_timing_686.o codegen_timing_common.o codegen_timing_k6.o codegen_timing_pentium.o \
-            codegen_timing_p6.o codegen_timing_winchip.o codegen_timing_winchip2.o
-else
- ifeq ($(NEW_DYNAREC), y)
-  OPTS   += -DUSE_NEW_DYNAREC
-  RFLAGS += -DUSE_NEW_DYNAREC
- endif
-endif
-
-ifeq ($(FLUIDSYNTH), y)
- OPTS      += -DUSE_FLUIDSYNTH
- FSYNTHOBJ := midi_fluidsynth.o
-endif
-
-ifeq ($(MUNT), y)
- OPTS    += -DUSE_MUNT
- MUNTOBJ := midi_mt32.o \
-            Analog.o BReverbModel.o Display.o File.o FileStream.o LA32Ramp.o \
-            LA32FloatWaveGenerator.o LA32WaveGenerator.o \
-            MidiStreamParser.o Part.o Partial.o PartialManager.o \
-            Poly.o ROMInfo.o SampleRateConverter.o \
-            FIRResampler.o IIR2xResampler.o LinearResampler.o ResamplerModel.o \
-            SincResampler.o InternalResampler.o \
-            Synth.o Tables.o TVA.o TVF.o TVP.o sha1.o c_interface.o
-endif
-
-ifeq ($(CPPTHREADS), y)
- THREADOBJ := thread.o
-else
- THREADOBJ := win_thread.o
-endif
-
-ifeq ($(VNC), y)
- OPTS   += -DUSE_VNC
- RFLAGS += -DUSE_VNC
- ifneq ($(VNC_PATH), )
-  OPTS   += -I$(VNC_PATH)\INCLUDE
-  VNCLIB := -L$(VNC_PATH)\LIB
- endif
- VNCLIB +=  -lvncserver.dll
- VNCOBJ := vnc.o vnc_keymap.o
-endif
-
-ifeq ($(MINITRACE), y)
- OPTS         += -DMTR_ENABLED
- RFLAGS       += -DMTR_ENABLED
- MINITRACEOBJ := minitrace.o
-endif
-
-ifeq ($(FAUDIO), y)
- OPTS += -DUSE_FAUDIO
-endif
-
-# Options for the DEV branch.
-ifeq ($(DEV_BRANCH), y)
- OPTS     += -DDEV_BRANCH
- RFLAGS   += -DDEV_BRANCH
- DEVBROBJ :=
-
- ifeq ($(AMD_K5), y)
-  OPTS += -DUSE_AMD_K5
- endif
-
- ifeq ($(AN430TX), y)
-  OPTS += -DUSE_AN430TX
- endif
-
- ifeq ($(CYRIX_6X86), y)
-  OPTS += -DUSE_CYRIX_6X86
- endif
-
- ifeq ($(DESKPRO386), y)
-  OPTS += -DUSE_DESKPRO386
- endif
-
- ifeq ($(GUSMAX), y)
-  OPTS += -DUSE_GUSMAX
- endif
-
- ifeq ($(ISAMEM_RAMPAGE), y)
-  OPTS += -DUSE_ISAMEM_RAMPAGE
- endif
-
- ifeq ($(ISAMEM_IAB), y)
-  OPTS += -DUSE_ISAMEM_IAB
- endif
-
- ifeq ($(ISAMEM_BRAT), y)
-  OPTS += -DUSE_ISAMEM_BRAT
- endif
-
- ifeq ($(LASERXT), y)
-  OPTS     += -DUSE_LASERXT
-  DEVBROBJ += m_xt_laserxt.o
- endif
-
- ifeq ($(OPEN_AT), y)
-  OPTS += -DUSE_OPEN_AT
- endif
-
- ifeq ($(PAS16), y)
-  OPTS     += -DUSE_PAS16
-  DEVBROBJ += snd_pas16.o
- endif
-
- ifeq ($(PCI_DUMMY), y)
-  OPTS     += -DUSE_PCI_DUMMY
-  DEVBROBJ += pci_dummy.o
- endif
-
- ifeq ($(SIO_DETECT), y)
-  OPTS     += -DUSE_SIO_DETECT
-  DEVBROBJ += sio_detect.o
- endif
-
- ifeq ($(VGAWONDER), y)
-  OPTS += -DUSE_VGAWONDER
- endif
-
- ifeq ($(XL24), y)
-  OPTS += -DUSE_XL24
- endif
-
- ifeq ($(OLIVETTI), y)
-  OPTS     += -DUSE_OLIVETTI
-  DEVBROBJ += olivetti_eva.o
- endif
-
- ifeq ($(GDBSTUB), y)
-  OPTS     += -DUSE_GDBSTUB
-  DEVBROBJ += gdbstub.o
- endif
-endif
-
-ifeq ($(RTMIDI), y)
- OPTS += -DUSE_RTMIDI
-endif
-
-
-# Final versions of the toolchain flags.
-CFLAGS := $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) \
-          $(AFLAGS) -fomit-frame-pointer -mstackrealign -Wall \
-          -fno-strict-aliasing
-
-# Add freetyp2 references through pkgconfig
-CFLAGS := $(CFLAGS)  `pkg-config --cflags freetype2`
-
-CXXFLAGS := $(OPTS) $(DFLAGS) $(CXXOPTIM) $(AOPTIM) \
-            $(AFLAGS) -fomit-frame-pointer -mstackrealign -Wall \
-            -fno-strict-aliasing
-
-CFLAGS += -Werror=implicit-int -Werror=implicit-function-declaration \
-          -Werror=int-conversion -Werror=strict-prototypes -Werror=old-style-definition
-
-
-#########################################################################
-#             Create the (final) list of objects to build.              #
-#########################################################################
-MAINOBJ := 86box.o config.o log.o random.o timer.o io.o acpi.o apm.o dma.o ddma.o \
-           nmi.o pic.o pit.o pit_fast.o port_6x.o port_92.o ppi.o pci.o mca.o fifo.o \
-           fifo8.o usb.o device.o nvr.o nvr_at.o nvr_ps2.o machine_status.o ini.o \
-           $(VNCOBJ)
-
-MEMOBJ := catalyst_flash.o i2c_eeprom.o intel_flash.o mem.o mmu_2386.o rom.o row.o \
-          smram.o spd.o sst_flash.o
-
-CPUOBJ := $(DYNARECOBJ) \
-          $(CGTOBJ) \
-          cpu.o cpu_table.o fpu.o x86.o \
-          8080.o 808x.o 386.o 386_common.o 386_dynarec.o 386_dynarec_ops.o \
-          x86_ops_mmx.o x86seg_common.o x86seg_2386.o x86seg.o x87.o x87_timings.o \
-	  f2xm1.o fpatan.o fprem.o fsincos.o fyl2x.o softfloat_poly.o softfloat.o softfloat16.o \
-	  softfloat-muladd.o softfloat-round-pack.o softfloat-specialize.o softfloatx80.o
-
-CHIPSETOBJ := 82c100.o acc2168.o \
-              compaq_386.o \
-              contaq_82c59x.o \
-              cs4031.o cs8230.o \
-              ali1429.o ali1435.o ali1489.o ali1531.o ali1541.o ali1543.o ali1621.o ali6117.o \
-              gc100.o headland.o \
-              ims8848.o intel_82335.o intel_420ex.o intel_4x0.o intel_i450kx.o intel_sio.o intel_piix.o \
-              ioapic.o \
-              neat.o \
-              opti283.o opti291.o opti391.o opti495.o opti602.o opti822.o opti895.o opti5x7.o \
-              scamp.o scat.o \
-              stpc.o \
-              wd76c10.o vl82c480.o \
-              umc_8886.o umc_hb4.o \
-              via_vt82c49x.o via_vt82c505.o via_apollo.o via_pipc.o \
-              sis_85c310.o sis_85c4xx.o sis_85c496.o sis_85c50x.o sis_5511.o sis_5571.o
-
-MCHOBJ := machine.o machine_table.o \
-          m_xt.o m_xt_compaq.o \
-          m_xt_philips.o \
-          m_xt_t1000.o m_xt_t1000_vid.o \
-          m_xt_xi8088.o m_xt_zenith.o \
-          m_pcjr.o \
-          m_amstrad.o m_europc.o \
-          m_elt.o \
-          m_xt_olivetti.o m_tandy.o m_v86p.o \
-          m_at.o m_at_commodore.o \
-          m_at_t3100e.o m_at_t3100e_vid.o \
-          m_ps1.o m_ps1_hdc.o \
-          m_ps2_isa.o m_ps2_mca.o \
-          m_at_compaq.o \
-          m_at_286_386sx.o m_at_386dx_486.o \
-          m_at_socket4.o m_at_socket5.o m_at_socket7_3v.o m_at_socket7.o m_at_sockets7.o \
-          m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o \
-          m_at_misc.o
-
-KBCOBJ := kbc_at.o kbc_at_dev.o \
-          keyboard_at.o
-
-DEVOBJ := bugger.o cartridge.o cassette.o hasp.o hwm.o hwm_lm75.o hwm_lm78.o hwm_gl518sm.o hwm_vt82c686.o \
-          ibm_5161.o isamem.o isartc.o lpt.o pci_bridge.o postcard.o serial.o \
-          clock_ics9xxx.o isapnp.o \
-          i2c.o i2c_gpio.o smbus_ali7101.o smbus_piix4.o \
-          keyboard.o \
-          keyboard_xt.o $(KBCOBJ) \
-          mouse.o \
-          mouse_bus.o \
-          mouse_serial.o mouse_ps2.o \
-          mouse_wacom_tablet.o \
-          nec_mate_unk.o phoenix_486_jumper.o \
-          serial_passthrough.o \
-          unittester.o
-
-SIOOBJ := sio_acc3221.o sio_ali5123.o \
-          sio_f82c710.o sio_82091aa.o sio_fdc37c6xx.o \
-          sio_fdc37c67x.o sio_fdc37c669.o sio_fdc37c93x.o sio_fdc37m60x.o \
-          sio_it86x1f.o \
-          sio_pc87306.o sio_pc87307.o sio_pc87309.o sio_pc87310.o sio_pc87311.o sio_pc87332.o \
-          sio_prime3b.o sio_prime3c.o \
-          sio_w83787f.o \
-          sio_w83877f.o sio_w83977f.o \
-          sio_um8669f.o \
-          sio_vt82c686.o
-
-FDDOBJ := fdd.o fdc.o fdc_magitronic.o fdc_monster.o fdc_pii15xb.o \
-          fdi2raw.o \
-          fdd_common.o fdd_86f.o \
-          fdd_fdi.o fdd_imd.o fdd_img.o fdd_json.o \
-          fdd_mfm.o fdd_td0.o
-
-GAMEOBJ := gameport.o \
-           joystick_standard.o joystick_ch_flightstick_pro.o \
-           joystick_sw_pad.o joystick_tm_fcs.o
-
-HDDOBJ := hdd.o \
-          hdd_image.o hdd_table.o \
-          hdc.o \
-          hdc_st506_xt.o hdc_st506_at.o \
-          hdc_xta.o \
-          hdc_esdi_at.o hdc_esdi_mca.o \
-          hdc_xtide.o hdc_ide.o \
-          hdc_ide_ali5213.o \
-          hdc_ide_opti611.o \
-          hdc_ide_cmd640.o hdc_ide_cmd646.o \
-          hdc_ide_sff8038i.o
-
-MINIVHDOBJ  := cwalk.o xml2_encoding.o convert.o \
-               create.o minivhd_io.o manage.o struct_rw.o minivhd_util.o
-
-CDROMOBJ := cdrom.o \
-            cdrom_image_backend.o cdrom_image_viso.o cdrom_image.o cdrom_mitsumi.o
-
-ZIPOBJ := zip.o
-
-MOOBJ := mo.o
-
-SCSIOBJ := scsi.o scsi_device.o \
-           scsi_cdrom.o scsi_disk.o \
-           scsi_x54x.o \
-           scsi_aha154x.o scsi_buslogic.o \
-           scsi_ncr5380.o scsi_ncr53c8xx.o \
-           scsi_pcscsi.o scsi_spock.o
-
-NETOBJ := network.o \
-          net_pcap.o \
-          net_slirp.o \
-          net_dp8390.o net_3c501.o \
-          net_3c503.o net_ne2000.o \
-          net_pcnet.o net_wd8003.o \
-          net_plip.o net_event.o \
-          net_null.o \
-          net_eeprom_nmc93cxx.o \
-          net_tulip.o \
-          net_rtl8139.o \
-          net_l80225.o
-
-PRINTOBJ := png.o prt_cpmap.o \
-            prt_escp.o prt_text.o prt_ps.o
-
-SNDOBJ := sound.o \
-          snd_opl.o snd_opl_nuked.o snd_opl_ymfm.o \
-          ymfm_adpcm.o ymfm_misc.o ymfm_opl.o ymfm_opm.o \
-          ymfm_opn.o ymfm_opq.o ymfm_opz.o ymfm_pcm.o ymfm_ssg.o \
-          snd_resid.o \
-          convolve.o convolve-sse.o envelope.o extfilt.o \
-          filter.o pot.o sid.o voice.o wave6581__ST.o \
-          wave6581_P_T.o wave6581_PS_.o wave6581_PST.o \
-          wave8580__ST.o wave8580_P_T.o wave8580_PS_.o \
-          wave8580_PST.o wave.o \
-          midi.o \
-          midi_opl4.o \
-          midi_opl4_yrw801.o \
-          snd_speaker.o \
-          snd_pssj.o \
-          snd_ps1.o \
-          snd_lpt_dac.o snd_lpt_dss.o \
-          snd_adlib.o snd_adlibgold.o snd_ad1848.o snd_audiopci.o \
-          snd_ac97_codec.o snd_ac97_via.o \
-          snd_azt2316a.o snd_cs423x.o \
-          snd_optimc.o snd_cmi8x38.o \
-          snd_cms.o \
-          snd_gus.o \
-          snd_sb.o snd_sb_dsp.o \
-          snd_emu8k.o snd_mpu401.o \
-          snd_sn76489.o snd_ssi2001.o \
-          snd_wss.o \
-          snd_ym7128.o
-
-VIDOBJ := agpgart.o video.o \
-          vid_table.o \
-          vid_cga.o vid_cga_comp.o \
-          vid_compaq_cga.o \
-          vid_mda.o \
-          vid_hercules.o vid_herculesplus.o vid_incolor.o \
-          vid_colorplus.o \
-          vid_genius.o \
-          vid_pgc.o vid_im1024.o \
-          vid_sigma.o \
-          vid_wy700.o \
-          vid_ega.o vid_ega_render.o \
-          vid_svga.o vid_svga_render.o \
-          vid_8514a.o \
-          vid_ddc.o \
-          vid_vga.o \
-          vid_ati_eeprom.o \
-          vid_ati18800.o vid_ati28800.o \
-	  vid_ati_mach8.o \
-          vid_ati68875_ramdac.o \
-          vid_ati_mach64.o vid_ati68860_ramdac.o \
-          vid_bt48x_ramdac.o \
-          vid_av9194.o vid_icd2061.o vid_ics2494.o vid_ics2595.o \
-          vid_cl54xx.o \
-          vid_et3000.o \
-          vid_et4000.o vid_sc1148x_ramdac.o \
-          vid_sc1502x_ramdac.o \
-          vid_et4000w32.o vid_stg_ramdac.o \
-          vid_ht216.o \
-          vid_oak_oti.o \
-          vid_paradise.o \
-          vid_rtg310x.o \
-          vid_ti_cf62011.o \
-          vid_f82c425.o \
-          vid_tvga.o \
-          vid_tgui9440.o vid_tkd8001_ramdac.o \
-          vid_att20c49x_ramdac.o \
-          vid_att2xc498_ramdac.o \
-          vid_s3.o vid_s3_virge.o \
-          vid_ibm_rgb528_ramdac.o vid_sdac_ramdac.o \
-          vid_ogc.o \
-          vid_mga.o \
-          vid_nga.o \
-          vid_tvp3026_ramdac.o \
-          vid_xga.o
-
-VOODOOOBJ := vid_voodoo.o vid_voodoo_banshee.o \
-             vid_voodoo_banshee_blitter.o \
-             vid_voodoo_blitter.o \
-             vid_voodoo_display.o vid_voodoo_fb.o \
-             vid_voodoo_fifo.o vid_voodoo_reg.o \
-             vid_voodoo_render.o vid_voodoo_setup.o \
-             vid_voodoo_texture.o
-
-PLATOBJ := win.o \
-           win_dynld.o \
-           win_cdrom.o win_keyboard.o \
-           win_mouse.o win_serial_passthrough.o
-
-UIOBJ := win_ui.o win_icon.o win_stbar.o discord.o \
-         win_sdl.o win_opengl.o win_opengl_glslp.o glad.o \
-         win_dialog.o win_about.o \
-         win_settings.o win_devconf.o win_snd_gain.o win_specify_dim.o win_preferences.o \
-         win_new_floppy.o win_jsconf.o \
-         win_media_menu.o win_toolbar.o
-
-ifeq ($(DINPUT), y)
- PLATOBJ += win_joystick.o
-else
- PLATOBJ += win_joystick_rawinput.o
-endif
-
-ifeq ($(OPENAL), y)
- SNDOBJ += openal.o
-else
- SNDOBJ += xaudio2.o
-endif
-
-ifeq ($(RTMIDI), y)
- SNDOBJ += midi_rtmidi.o
-endif
-
-OBJ := $(MAINOBJ) $(CPUOBJ) $(CHIPSETOBJ) $(MCHOBJ) $(DEVOBJ) $(MEMOBJ) \
-       $(FDDOBJ) $(GAMEOBJ) $(CDROMOBJ) $(ZIPOBJ) $(MOOBJ) $(HDDOBJ) $(MINIVHDOBJ) \
-       $(NETOBJ) $(PRINTOBJ) $(SCSIOBJ) $(SIOOBJ) $(SNDOBJ) $(VIDOBJ) $(VOODOOOBJ) \
-       $(PLATOBJ) $(UIOBJ) $(FSYNTHOBJ) $(MUNTOBJ) $(DEVBROBJ) $(MINITRACEOBJ) $(THREADOBJ)
-ifdef EXOBJ
- OBJ += $(EXOBJ)
-endif
-
-ifeq ($(LOG), y)
- MWIN := -lcomdlg32
-else
- MWIN := -mwindows
-endif
-
-LIBS := -lfreetype -lfluidsynth -lslirp -lbz2 -lharfbuzz -lgraphite2 -lbrotlidec \
-        -lbrotlicommon -lusp10 -lrpcrt4 -lgomp -lsndfile -lflac -lmp3lame -lmpg123 \
-        -lopus -lvorbis -lvorbisenc -logg -ldsound -lshlwapi -lksuser -lreadline \
-        -ltermcap -lportaudio -lgmodule-2.0 -lglib-2.0 -lintl -liconv
-
-ifeq ($(OPENAL), y)
- LIBS += $(MWIN) -lopenal -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 \
-         -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion \
-         -luuid -lws2_32
-else
- ifeq ($(FAUDIO), y)
-  LIBS += $(MWIN) -lfaudio -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 \
-          -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion \
-          -luuid -lws2_32
- else
-  LIBS += $(MWIN) -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 \
-          -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid \
-          -lws2_32
- endif
-endif
-
-ifeq ($(RTMIDI), y)
- ifeq ($(CLANG), y)
-  LIBS +=  -lrtmidi.dll -lwinmm
- else
-  LIBS +=  -lrtmidi -lwinmm
- endif
-endif
-
-ifeq ($(VNC), y)
- LIBS += $(VNCLIB) -lws2_32
-endif
-ifeq ($(CLANG), y)
- LIBS += -lpng -lz -lwsock32 -liphlpapi -lpsapi -lhid -lsetupapi -luxtheme -static -lstdc++.dll
-else
- LIBS += -lpng -lz -lwsock32 -liphlpapi -lpsapi -lhid -lsetupapi -luxtheme -static -lstdc++
-endif
-ifneq ($(X64), y)
- ifneq ($(ARM64), y)
-  LIBS += -Wl,--large-address-aware
- endif
-endif
-ifeq ($(ARM64), y)
- LIBS += -lgcc
-endif
-ifeq ($(DINPUT), y)
- LIBS += -ldinput8
-endif
-
-LIBS += -static
-
-# Build module rules.
-ifeq ($(AUTODEP), y)
-%.o: %.c
-	@echo $<
-	@$(CC) $(CFLAGS) $(DEPS) -c $<
-
-%.o: %.cc
-	@echo $<
-	@$(CPP) $(CXXFLAGS) $(DEPS) -c $<
-
-%.o: %.cpp
-	@echo $<
-	@$(CPP) $(CXXFLAGS) $(DEPS) -c $<
-else
-%.o: %.c
-	@echo $<
-	@$(CC) $(CFLAGS) -c $<
-
-%.o: %.cc
-	@echo $<
-	@$(CPP) $(CXXFLAGS) -c $<
-
-%.o: %.cpp
-	@echo $<
-	@$(CPP) $(CXXFLAGS) -c $<
-
-%.d: %.c $(wildcard $*.d)
-	@echo $<
-	@$(CC) $(CFLAGS) $(DEPS) -E $< >/dev/null
-
-%.d: %.cc $(wildcard $*.d)
-	@echo $<
-	@$(CPP) $(CXXFLAGS) $(DEPS) -E $< >/dev/null
-
-%.d: %.cpp $(wildcard $*.d)
-	@echo $<
-	@$(CPP) $(CXXFLAGS) $(DEPS) -E $< >/dev/null
-endif
-
-# Suppress false positive warnings in vid_voodoo_codegen_x86[-64].h
-# that cause ~3000 lines to be output into the logs each time.
-ifneq ($(CLANG), y)
- $(VOODOOOBJ): CFLAGS += -Wstringop-overflow=0
-endif
-
-all: $(PROG).exe
-
-
-86Box.res: 86Box.rc
-	@echo Processing $<
-	@$(WINDRES) -v $(RFLAGS) $(EXTRAS) -i $< -o 86Box.res
-
-$(PROG).exe: $(OBJ) 86Box.res
-	@echo Linking $(PROG).exe ..
-	@$(CC) $(LDFLAGS) -o $(PROG).exe $(OBJ) 86Box.res $(LIBS) -pipe
-ifneq ($(DEBUG), y)
-	@$(STRIP) $(PROG).exe
-endif
-
-pcap_if.res: pcap_if.rc
-	@echo Processing $<
-	@$(WINDRES) $(RFLAGS) -i $< -o pcap_if.res
-
-pcap_if.exe: pcap_if.o win_dynld.o pcap_if.res
-	@echo Linking pcap_if.exe ..
-	@$(CC) $(LDFLAGS) -o pcap_if.exe pcap_if.o win_dynld.o pcap_if.res
-ifneq ($(DEBUG), y)
-	@$(STRIP) pcap_if.exe
-endif
-
-hello.exe: hello.o
-	$(CXX) $(LDFLAGS) -o hello.exe hello.o $(LIBS)
-ifneq ($(DEBUG), y)
-	@$(STRIP) hello.exe
-endif
-
-
-clean:
-	@echo Cleaning objects..
-	@-rm -f *.o 2>/dev/null
-	@-rm -f *.res 2>/dev/null
-
-clobber: clean
-	@echo Cleaning executables..
-	@-rm -f *.d 2>/dev/null
-	@-rm -f *.exe 2>/dev/null
-#	@-rm -f $(DEPFILE) 2>/dev/null
-
-ifneq ($(AUTODEP), y)
-depclean:
-	@-rm -f $(DEPFILE) 2>/dev/null
-	@echo Creating dependencies..
-	@echo # Run "make depends" to re-create this file. >$(DEPFILE)
-
-depends: DEPOBJ=$(OBJ:%.o=%.d)
-depends: depclean $(OBJ:%.o=%.d)
-	@-cat $(DEPOBJ) >>$(DEPFILE)
-	@-rm -f $(DEPOBJ)
-
-$(DEPFILE):
-endif
-
-
-# Module dependencies.
-ifeq ($(AUTODEP), y)
-#-include $(OBJ:%.o=%.d)  (better, but sloooowwwww)
--include *.d
-else
-include $(wildcard $(DEPFILE))
-endif
-
-
-# End of Makefile.mingw.
diff --git a/src/win/glad.c b/src/win/glad.c
deleted file mode 100644
index 7c282ebee..000000000
--- a/src/win/glad.c
+++ /dev/null
@@ -1,1047 +0,0 @@
-/*
-
-    OpenGL loader generated by glad 0.1.36 on Sat Jan  7 18:24:33 2023.
-
-    Language/Generator: C/C++
-    Specification: gl
-    APIs: gl=3.0
-    Profile: core
-    Extensions:
-        GL_ARB_buffer_storage,
-        GL_ARB_debug_output,
-        GL_ARB_sync
-    Loader: True
-    Local files: False
-    Omit khrplatform: False
-    Reproducible: False
-
-    Commandline:
-        --profile="core" --api="gl=3.0" --generator="c" --spec="gl" --extensions="GL_ARB_buffer_storage,GL_ARB_debug_output,GL_ARB_sync"
-    Online:
-        https://glad.dav1d.de/#profile=core&language=c&specification=gl&loader=on&api=gl%3D3.0&extensions=GL_ARB_buffer_storage&extensions=GL_ARB_debug_output&extensions=GL_ARB_sync
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glad/glad.h>
-
-static void *get_proc(const char *namez);
-
-#if defined(_WIN32) || defined(__CYGWIN__)
-#    ifndef _WINDOWS_
-#        undef APIENTRY
-#    endif
-#    include <windows.h>
-static HMODULE libGL;
-
-typedef void *(APIENTRYP PFNWGLGETPROCADDRESSPROC_PRIVATE)(const char *);
-static PFNWGLGETPROCADDRESSPROC_PRIVATE gladGetProcAddressPtr;
-
-#    ifdef _MSC_VER
-#        ifdef __has_include
-#            if __has_include(<winapifamily.h>)
-#                define HAVE_WINAPIFAMILY 1
-#            endif
-#        elif _MSC_VER >= 1700 && !_USING_V110_SDK71_
-#            define HAVE_WINAPIFAMILY 1
-#        endif
-#    endif
-
-#    ifdef HAVE_WINAPIFAMILY
-#        include <winapifamily.h>
-#        if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
-#            define IS_UWP 1
-#        endif
-#    endif
-
-static int
-open_gl(void)
-{
-#    ifndef IS_UWP
-    libGL = LoadLibraryW(L"opengl32.dll");
-    if (libGL != NULL) {
-        void (*tmp)(void);
-        tmp                   = (void (*)(void)) GetProcAddress(libGL, "wglGetProcAddress");
-        gladGetProcAddressPtr = (PFNWGLGETPROCADDRESSPROC_PRIVATE) tmp;
-        return gladGetProcAddressPtr != NULL;
-    }
-#    endif
-
-    return 0;
-}
-
-static void
-close_gl(void)
-{
-    if (libGL != NULL) {
-        FreeLibrary((HMODULE) libGL);
-        libGL = NULL;
-    }
-}
-#else
-#    include <dlfcn.h>
-static void *libGL;
-
-#    if !defined(__APPLE__) && !defined(__HAIKU__)
-typedef void *(APIENTRYP PFNGLXGETPROCADDRESSPROC_PRIVATE)(const char *);
-static PFNGLXGETPROCADDRESSPROC_PRIVATE gladGetProcAddressPtr;
-#    endif
-
-static int
-open_gl(void)
-{
-#    ifdef __APPLE__
-    static const char *NAMES[] = {
-        "../Frameworks/OpenGL.framework/OpenGL",
-        "/Library/Frameworks/OpenGL.framework/OpenGL",
-        "/System/Library/Frameworks/OpenGL.framework/OpenGL",
-        "/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL"
-    };
-#    else
-    static const char *NAMES[] = { "libGL.so.1", "libGL.so" };
-#    endif
-
-    unsigned int index = 0;
-    for (index = 0; index < (sizeof(NAMES) / sizeof(NAMES[0])); index++) {
-        libGL = dlopen(NAMES[index], RTLD_NOW | RTLD_GLOBAL);
-
-        if (libGL != NULL) {
-#    if defined(__APPLE__) || defined(__HAIKU__)
-            return 1;
-#    else
-            gladGetProcAddressPtr = (PFNGLXGETPROCADDRESSPROC_PRIVATE) dlsym(libGL,
-                                                                             "glXGetProcAddressARB");
-            return gladGetProcAddressPtr != NULL;
-#    endif
-        }
-    }
-
-    return 0;
-}
-
-static void
-close_gl(void)
-{
-    if (libGL != NULL) {
-        dlclose(libGL);
-        libGL = NULL;
-    }
-}
-#endif
-
-static void *
-get_proc(const char *namez)
-{
-    void *result = NULL;
-    if (libGL == NULL)
-        return NULL;
-
-#if !defined(__APPLE__) && !defined(__HAIKU__)
-    if (gladGetProcAddressPtr != NULL) {
-        result = gladGetProcAddressPtr(namez);
-    }
-#endif
-    if (result == NULL) {
-#if defined(_WIN32) || defined(__CYGWIN__)
-        result = (void *) GetProcAddress((HMODULE) libGL, namez);
-#else
-        result = dlsym(libGL, namez);
-#endif
-    }
-
-    return result;
-}
-
-int
-gladLoadGL(void)
-{
-    int status = 0;
-
-    if (open_gl()) {
-        status = gladLoadGLLoader(&get_proc);
-        close_gl();
-    }
-
-    return status;
-}
-
-struct gladGLversionStruct GLVersion = { 0, 0 };
-
-#if defined(GL_ES_VERSION_3_0) || defined(GL_VERSION_3_0)
-#    define _GLAD_IS_SOME_NEW_VERSION 1
-#endif
-
-static int max_loaded_major;
-static int max_loaded_minor;
-
-static const char *exts       = NULL;
-static int         num_exts_i = 0;
-static char      **exts_i     = NULL;
-
-static int
-get_exts(void)
-{
-#ifdef _GLAD_IS_SOME_NEW_VERSION
-    if (max_loaded_major < 3) {
-#endif
-        exts = (const char *) glGetString(GL_EXTENSIONS);
-#ifdef _GLAD_IS_SOME_NEW_VERSION
-    } else {
-        unsigned int index;
-
-        num_exts_i = 0;
-        glGetIntegerv(GL_NUM_EXTENSIONS, &num_exts_i);
-        if (num_exts_i > 0) {
-            exts_i = (char **) malloc((size_t) num_exts_i * (sizeof *exts_i));
-        }
-
-        if (exts_i == NULL) {
-            return 0;
-        }
-
-        for (index = 0; index < (unsigned) num_exts_i; index++) {
-            const char *gl_str_tmp = (const char *) glGetStringi(GL_EXTENSIONS, index);
-            size_t      len        = strlen(gl_str_tmp);
-
-            char *local_str = (char *) malloc((len + 1) * sizeof(char));
-            if (local_str != NULL) {
-                memcpy(local_str, gl_str_tmp, (len + 1) * sizeof(char));
-            }
-            exts_i[index] = local_str;
-        }
-    }
-#endif
-    return 1;
-}
-
-static void
-free_exts(void)
-{
-    if (exts_i != NULL) {
-        int index;
-        for (index = 0; index < num_exts_i; index++) {
-            free((char *) exts_i[index]);
-        }
-        free((void *) exts_i);
-        exts_i = NULL;
-    }
-}
-
-static int
-has_ext(const char *ext)
-{
-#ifdef _GLAD_IS_SOME_NEW_VERSION
-    if (max_loaded_major < 3) {
-#endif
-        const char *extensions;
-        const char *loc;
-        const char *terminator;
-        extensions = exts;
-        if (extensions == NULL || ext == NULL) {
-            return 0;
-        }
-
-        while (1) {
-            loc = strstr(extensions, ext);
-            if (loc == NULL) {
-                return 0;
-            }
-
-            terminator = loc + strlen(ext);
-            if ((loc == extensions || *(loc - 1) == ' ') && (*terminator == ' ' || *terminator == '\0')) {
-                return 1;
-            }
-            extensions = terminator;
-        }
-#ifdef _GLAD_IS_SOME_NEW_VERSION
-    } else {
-        int index;
-        if (exts_i == NULL)
-            return 0;
-        for (index = 0; index < num_exts_i; index++) {
-            const char *e = exts_i[index];
-
-            if (exts_i[index] != NULL && strcmp(e, ext) == 0) {
-                return 1;
-            }
-        }
-    }
-#endif
-
-    return 0;
-}
-int                                          GLAD_GL_VERSION_1_0                        = 0;
-int                                          GLAD_GL_VERSION_1_1                        = 0;
-int                                          GLAD_GL_VERSION_1_2                        = 0;
-int                                          GLAD_GL_VERSION_1_3                        = 0;
-int                                          GLAD_GL_VERSION_1_4                        = 0;
-int                                          GLAD_GL_VERSION_1_5                        = 0;
-int                                          GLAD_GL_VERSION_2_0                        = 0;
-int                                          GLAD_GL_VERSION_2_1                        = 0;
-int                                          GLAD_GL_VERSION_3_0                        = 0;
-PFNGLACTIVETEXTUREPROC                       glad_glActiveTexture                       = NULL;
-PFNGLATTACHSHADERPROC                        glad_glAttachShader                        = NULL;
-PFNGLBEGINCONDITIONALRENDERPROC              glad_glBeginConditionalRender              = NULL;
-PFNGLBEGINQUERYPROC                          glad_glBeginQuery                          = NULL;
-PFNGLBEGINTRANSFORMFEEDBACKPROC              glad_glBeginTransformFeedback              = NULL;
-PFNGLBINDATTRIBLOCATIONPROC                  glad_glBindAttribLocation                  = NULL;
-PFNGLBINDBUFFERPROC                          glad_glBindBuffer                          = NULL;
-PFNGLBINDBUFFERBASEPROC                      glad_glBindBufferBase                      = NULL;
-PFNGLBINDBUFFERRANGEPROC                     glad_glBindBufferRange                     = NULL;
-PFNGLBINDFRAGDATALOCATIONPROC                glad_glBindFragDataLocation                = NULL;
-PFNGLBINDFRAMEBUFFERPROC                     glad_glBindFramebuffer                     = NULL;
-PFNGLBINDRENDERBUFFERPROC                    glad_glBindRenderbuffer                    = NULL;
-PFNGLBINDTEXTUREPROC                         glad_glBindTexture                         = NULL;
-PFNGLBINDVERTEXARRAYPROC                     glad_glBindVertexArray                     = NULL;
-PFNGLBLENDCOLORPROC                          glad_glBlendColor                          = NULL;
-PFNGLBLENDEQUATIONPROC                       glad_glBlendEquation                       = NULL;
-PFNGLBLENDEQUATIONSEPARATEPROC               glad_glBlendEquationSeparate               = NULL;
-PFNGLBLENDFUNCPROC                           glad_glBlendFunc                           = NULL;
-PFNGLBLENDFUNCSEPARATEPROC                   glad_glBlendFuncSeparate                   = NULL;
-PFNGLBLITFRAMEBUFFERPROC                     glad_glBlitFramebuffer                     = NULL;
-PFNGLBUFFERDATAPROC                          glad_glBufferData                          = NULL;
-PFNGLBUFFERSUBDATAPROC                       glad_glBufferSubData                       = NULL;
-PFNGLCHECKFRAMEBUFFERSTATUSPROC              glad_glCheckFramebufferStatus              = NULL;
-PFNGLCLAMPCOLORPROC                          glad_glClampColor                          = NULL;
-PFNGLCLEARPROC                               glad_glClear                               = NULL;
-PFNGLCLEARBUFFERFIPROC                       glad_glClearBufferfi                       = NULL;
-PFNGLCLEARBUFFERFVPROC                       glad_glClearBufferfv                       = NULL;
-PFNGLCLEARBUFFERIVPROC                       glad_glClearBufferiv                       = NULL;
-PFNGLCLEARBUFFERUIVPROC                      glad_glClearBufferuiv                      = NULL;
-PFNGLCLEARCOLORPROC                          glad_glClearColor                          = NULL;
-PFNGLCLEARDEPTHPROC                          glad_glClearDepth                          = NULL;
-PFNGLCLEARSTENCILPROC                        glad_glClearStencil                        = NULL;
-PFNGLCOLORMASKPROC                           glad_glColorMask                           = NULL;
-PFNGLCOLORMASKIPROC                          glad_glColorMaski                          = NULL;
-PFNGLCOMPILESHADERPROC                       glad_glCompileShader                       = NULL;
-PFNGLCOMPRESSEDTEXIMAGE1DPROC                glad_glCompressedTexImage1D                = NULL;
-PFNGLCOMPRESSEDTEXIMAGE2DPROC                glad_glCompressedTexImage2D                = NULL;
-PFNGLCOMPRESSEDTEXIMAGE3DPROC                glad_glCompressedTexImage3D                = NULL;
-PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC             glad_glCompressedTexSubImage1D             = NULL;
-PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC             glad_glCompressedTexSubImage2D             = NULL;
-PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC             glad_glCompressedTexSubImage3D             = NULL;
-PFNGLCOPYTEXIMAGE1DPROC                      glad_glCopyTexImage1D                      = NULL;
-PFNGLCOPYTEXIMAGE2DPROC                      glad_glCopyTexImage2D                      = NULL;
-PFNGLCOPYTEXSUBIMAGE1DPROC                   glad_glCopyTexSubImage1D                   = NULL;
-PFNGLCOPYTEXSUBIMAGE2DPROC                   glad_glCopyTexSubImage2D                   = NULL;
-PFNGLCOPYTEXSUBIMAGE3DPROC                   glad_glCopyTexSubImage3D                   = NULL;
-PFNGLCREATEPROGRAMPROC                       glad_glCreateProgram                       = NULL;
-PFNGLCREATESHADERPROC                        glad_glCreateShader                        = NULL;
-PFNGLCULLFACEPROC                            glad_glCullFace                            = NULL;
-PFNGLDELETEBUFFERSPROC                       glad_glDeleteBuffers                       = NULL;
-PFNGLDELETEFRAMEBUFFERSPROC                  glad_glDeleteFramebuffers                  = NULL;
-PFNGLDELETEPROGRAMPROC                       glad_glDeleteProgram                       = NULL;
-PFNGLDELETEQUERIESPROC                       glad_glDeleteQueries                       = NULL;
-PFNGLDELETERENDERBUFFERSPROC                 glad_glDeleteRenderbuffers                 = NULL;
-PFNGLDELETESHADERPROC                        glad_glDeleteShader                        = NULL;
-PFNGLDELETETEXTURESPROC                      glad_glDeleteTextures                      = NULL;
-PFNGLDELETEVERTEXARRAYSPROC                  glad_glDeleteVertexArrays                  = NULL;
-PFNGLDEPTHFUNCPROC                           glad_glDepthFunc                           = NULL;
-PFNGLDEPTHMASKPROC                           glad_glDepthMask                           = NULL;
-PFNGLDEPTHRANGEPROC                          glad_glDepthRange                          = NULL;
-PFNGLDETACHSHADERPROC                        glad_glDetachShader                        = NULL;
-PFNGLDISABLEPROC                             glad_glDisable                             = NULL;
-PFNGLDISABLEVERTEXATTRIBARRAYPROC            glad_glDisableVertexAttribArray            = NULL;
-PFNGLDISABLEIPROC                            glad_glDisablei                            = NULL;
-PFNGLDRAWARRAYSPROC                          glad_glDrawArrays                          = NULL;
-PFNGLDRAWBUFFERPROC                          glad_glDrawBuffer                          = NULL;
-PFNGLDRAWBUFFERSPROC                         glad_glDrawBuffers                         = NULL;
-PFNGLDRAWELEMENTSPROC                        glad_glDrawElements                        = NULL;
-PFNGLDRAWRANGEELEMENTSPROC                   glad_glDrawRangeElements                   = NULL;
-PFNGLENABLEPROC                              glad_glEnable                              = NULL;
-PFNGLENABLEVERTEXATTRIBARRAYPROC             glad_glEnableVertexAttribArray             = NULL;
-PFNGLENABLEIPROC                             glad_glEnablei                             = NULL;
-PFNGLENDCONDITIONALRENDERPROC                glad_glEndConditionalRender                = NULL;
-PFNGLENDQUERYPROC                            glad_glEndQuery                            = NULL;
-PFNGLENDTRANSFORMFEEDBACKPROC                glad_glEndTransformFeedback                = NULL;
-PFNGLFINISHPROC                              glad_glFinish                              = NULL;
-PFNGLFLUSHPROC                               glad_glFlush                               = NULL;
-PFNGLFLUSHMAPPEDBUFFERRANGEPROC              glad_glFlushMappedBufferRange              = NULL;
-PFNGLFRAMEBUFFERRENDERBUFFERPROC             glad_glFramebufferRenderbuffer             = NULL;
-PFNGLFRAMEBUFFERTEXTURE1DPROC                glad_glFramebufferTexture1D                = NULL;
-PFNGLFRAMEBUFFERTEXTURE2DPROC                glad_glFramebufferTexture2D                = NULL;
-PFNGLFRAMEBUFFERTEXTURE3DPROC                glad_glFramebufferTexture3D                = NULL;
-PFNGLFRAMEBUFFERTEXTURELAYERPROC             glad_glFramebufferTextureLayer             = NULL;
-PFNGLFRONTFACEPROC                           glad_glFrontFace                           = NULL;
-PFNGLGENBUFFERSPROC                          glad_glGenBuffers                          = NULL;
-PFNGLGENFRAMEBUFFERSPROC                     glad_glGenFramebuffers                     = NULL;
-PFNGLGENQUERIESPROC                          glad_glGenQueries                          = NULL;
-PFNGLGENRENDERBUFFERSPROC                    glad_glGenRenderbuffers                    = NULL;
-PFNGLGENTEXTURESPROC                         glad_glGenTextures                         = NULL;
-PFNGLGENVERTEXARRAYSPROC                     glad_glGenVertexArrays                     = NULL;
-PFNGLGENERATEMIPMAPPROC                      glad_glGenerateMipmap                      = NULL;
-PFNGLGETACTIVEATTRIBPROC                     glad_glGetActiveAttrib                     = NULL;
-PFNGLGETACTIVEUNIFORMPROC                    glad_glGetActiveUniform                    = NULL;
-PFNGLGETATTACHEDSHADERSPROC                  glad_glGetAttachedShaders                  = NULL;
-PFNGLGETATTRIBLOCATIONPROC                   glad_glGetAttribLocation                   = NULL;
-PFNGLGETBOOLEANI_VPROC                       glad_glGetBooleani_v                       = NULL;
-PFNGLGETBOOLEANVPROC                         glad_glGetBooleanv                         = NULL;
-PFNGLGETBUFFERPARAMETERIVPROC                glad_glGetBufferParameteriv                = NULL;
-PFNGLGETBUFFERPOINTERVPROC                   glad_glGetBufferPointerv                   = NULL;
-PFNGLGETBUFFERSUBDATAPROC                    glad_glGetBufferSubData                    = NULL;
-PFNGLGETCOMPRESSEDTEXIMAGEPROC               glad_glGetCompressedTexImage               = NULL;
-PFNGLGETDOUBLEVPROC                          glad_glGetDoublev                          = NULL;
-PFNGLGETERRORPROC                            glad_glGetError                            = NULL;
-PFNGLGETFLOATVPROC                           glad_glGetFloatv                           = NULL;
-PFNGLGETFRAGDATALOCATIONPROC                 glad_glGetFragDataLocation                 = NULL;
-PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC glad_glGetFramebufferAttachmentParameteriv = NULL;
-PFNGLGETINTEGERI_VPROC                       glad_glGetIntegeri_v                       = NULL;
-PFNGLGETINTEGERVPROC                         glad_glGetIntegerv                         = NULL;
-PFNGLGETPROGRAMINFOLOGPROC                   glad_glGetProgramInfoLog                   = NULL;
-PFNGLGETPROGRAMIVPROC                        glad_glGetProgramiv                        = NULL;
-PFNGLGETQUERYOBJECTIVPROC                    glad_glGetQueryObjectiv                    = NULL;
-PFNGLGETQUERYOBJECTUIVPROC                   glad_glGetQueryObjectuiv                   = NULL;
-PFNGLGETQUERYIVPROC                          glad_glGetQueryiv                          = NULL;
-PFNGLGETRENDERBUFFERPARAMETERIVPROC          glad_glGetRenderbufferParameteriv          = NULL;
-PFNGLGETSHADERINFOLOGPROC                    glad_glGetShaderInfoLog                    = NULL;
-PFNGLGETSHADERSOURCEPROC                     glad_glGetShaderSource                     = NULL;
-PFNGLGETSHADERIVPROC                         glad_glGetShaderiv                         = NULL;
-PFNGLGETSTRINGPROC                           glad_glGetString                           = NULL;
-PFNGLGETSTRINGIPROC                          glad_glGetStringi                          = NULL;
-PFNGLGETTEXIMAGEPROC                         glad_glGetTexImage                         = NULL;
-PFNGLGETTEXLEVELPARAMETERFVPROC              glad_glGetTexLevelParameterfv              = NULL;
-PFNGLGETTEXLEVELPARAMETERIVPROC              glad_glGetTexLevelParameteriv              = NULL;
-PFNGLGETTEXPARAMETERIIVPROC                  glad_glGetTexParameterIiv                  = NULL;
-PFNGLGETTEXPARAMETERIUIVPROC                 glad_glGetTexParameterIuiv                 = NULL;
-PFNGLGETTEXPARAMETERFVPROC                   glad_glGetTexParameterfv                   = NULL;
-PFNGLGETTEXPARAMETERIVPROC                   glad_glGetTexParameteriv                   = NULL;
-PFNGLGETTRANSFORMFEEDBACKVARYINGPROC         glad_glGetTransformFeedbackVarying         = NULL;
-PFNGLGETUNIFORMLOCATIONPROC                  glad_glGetUniformLocation                  = NULL;
-PFNGLGETUNIFORMFVPROC                        glad_glGetUniformfv                        = NULL;
-PFNGLGETUNIFORMIVPROC                        glad_glGetUniformiv                        = NULL;
-PFNGLGETUNIFORMUIVPROC                       glad_glGetUniformuiv                       = NULL;
-PFNGLGETVERTEXATTRIBIIVPROC                  glad_glGetVertexAttribIiv                  = NULL;
-PFNGLGETVERTEXATTRIBIUIVPROC                 glad_glGetVertexAttribIuiv                 = NULL;
-PFNGLGETVERTEXATTRIBPOINTERVPROC             glad_glGetVertexAttribPointerv             = NULL;
-PFNGLGETVERTEXATTRIBDVPROC                   glad_glGetVertexAttribdv                   = NULL;
-PFNGLGETVERTEXATTRIBFVPROC                   glad_glGetVertexAttribfv                   = NULL;
-PFNGLGETVERTEXATTRIBIVPROC                   glad_glGetVertexAttribiv                   = NULL;
-PFNGLHINTPROC                                glad_glHint                                = NULL;
-PFNGLISBUFFERPROC                            glad_glIsBuffer                            = NULL;
-PFNGLISENABLEDPROC                           glad_glIsEnabled                           = NULL;
-PFNGLISENABLEDIPROC                          glad_glIsEnabledi                          = NULL;
-PFNGLISFRAMEBUFFERPROC                       glad_glIsFramebuffer                       = NULL;
-PFNGLISPROGRAMPROC                           glad_glIsProgram                           = NULL;
-PFNGLISQUERYPROC                             glad_glIsQuery                             = NULL;
-PFNGLISRENDERBUFFERPROC                      glad_glIsRenderbuffer                      = NULL;
-PFNGLISSHADERPROC                            glad_glIsShader                            = NULL;
-PFNGLISTEXTUREPROC                           glad_glIsTexture                           = NULL;
-PFNGLISVERTEXARRAYPROC                       glad_glIsVertexArray                       = NULL;
-PFNGLLINEWIDTHPROC                           glad_glLineWidth                           = NULL;
-PFNGLLINKPROGRAMPROC                         glad_glLinkProgram                         = NULL;
-PFNGLLOGICOPPROC                             glad_glLogicOp                             = NULL;
-PFNGLMAPBUFFERPROC                           glad_glMapBuffer                           = NULL;
-PFNGLMAPBUFFERRANGEPROC                      glad_glMapBufferRange                      = NULL;
-PFNGLMULTIDRAWARRAYSPROC                     glad_glMultiDrawArrays                     = NULL;
-PFNGLMULTIDRAWELEMENTSPROC                   glad_glMultiDrawElements                   = NULL;
-PFNGLPIXELSTOREFPROC                         glad_glPixelStoref                         = NULL;
-PFNGLPIXELSTOREIPROC                         glad_glPixelStorei                         = NULL;
-PFNGLPOINTPARAMETERFPROC                     glad_glPointParameterf                     = NULL;
-PFNGLPOINTPARAMETERFVPROC                    glad_glPointParameterfv                    = NULL;
-PFNGLPOINTPARAMETERIPROC                     glad_glPointParameteri                     = NULL;
-PFNGLPOINTPARAMETERIVPROC                    glad_glPointParameteriv                    = NULL;
-PFNGLPOINTSIZEPROC                           glad_glPointSize                           = NULL;
-PFNGLPOLYGONMODEPROC                         glad_glPolygonMode                         = NULL;
-PFNGLPOLYGONOFFSETPROC                       glad_glPolygonOffset                       = NULL;
-PFNGLREADBUFFERPROC                          glad_glReadBuffer                          = NULL;
-PFNGLREADPIXELSPROC                          glad_glReadPixels                          = NULL;
-PFNGLRENDERBUFFERSTORAGEPROC                 glad_glRenderbufferStorage                 = NULL;
-PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC      glad_glRenderbufferStorageMultisample      = NULL;
-PFNGLSAMPLECOVERAGEPROC                      glad_glSampleCoverage                      = NULL;
-PFNGLSCISSORPROC                             glad_glScissor                             = NULL;
-PFNGLSHADERSOURCEPROC                        glad_glShaderSource                        = NULL;
-PFNGLSTENCILFUNCPROC                         glad_glStencilFunc                         = NULL;
-PFNGLSTENCILFUNCSEPARATEPROC                 glad_glStencilFuncSeparate                 = NULL;
-PFNGLSTENCILMASKPROC                         glad_glStencilMask                         = NULL;
-PFNGLSTENCILMASKSEPARATEPROC                 glad_glStencilMaskSeparate                 = NULL;
-PFNGLSTENCILOPPROC                           glad_glStencilOp                           = NULL;
-PFNGLSTENCILOPSEPARATEPROC                   glad_glStencilOpSeparate                   = NULL;
-PFNGLTEXIMAGE1DPROC                          glad_glTexImage1D                          = NULL;
-PFNGLTEXIMAGE2DPROC                          glad_glTexImage2D                          = NULL;
-PFNGLTEXIMAGE3DPROC                          glad_glTexImage3D                          = NULL;
-PFNGLTEXPARAMETERIIVPROC                     glad_glTexParameterIiv                     = NULL;
-PFNGLTEXPARAMETERIUIVPROC                    glad_glTexParameterIuiv                    = NULL;
-PFNGLTEXPARAMETERFPROC                       glad_glTexParameterf                       = NULL;
-PFNGLTEXPARAMETERFVPROC                      glad_glTexParameterfv                      = NULL;
-PFNGLTEXPARAMETERIPROC                       glad_glTexParameteri                       = NULL;
-PFNGLTEXPARAMETERIVPROC                      glad_glTexParameteriv                      = NULL;
-PFNGLTEXSUBIMAGE1DPROC                       glad_glTexSubImage1D                       = NULL;
-PFNGLTEXSUBIMAGE2DPROC                       glad_glTexSubImage2D                       = NULL;
-PFNGLTEXSUBIMAGE3DPROC                       glad_glTexSubImage3D                       = NULL;
-PFNGLTRANSFORMFEEDBACKVARYINGSPROC           glad_glTransformFeedbackVaryings           = NULL;
-PFNGLUNIFORM1FPROC                           glad_glUniform1f                           = NULL;
-PFNGLUNIFORM1FVPROC                          glad_glUniform1fv                          = NULL;
-PFNGLUNIFORM1IPROC                           glad_glUniform1i                           = NULL;
-PFNGLUNIFORM1IVPROC                          glad_glUniform1iv                          = NULL;
-PFNGLUNIFORM1UIPROC                          glad_glUniform1ui                          = NULL;
-PFNGLUNIFORM1UIVPROC                         glad_glUniform1uiv                         = NULL;
-PFNGLUNIFORM2FPROC                           glad_glUniform2f                           = NULL;
-PFNGLUNIFORM2FVPROC                          glad_glUniform2fv                          = NULL;
-PFNGLUNIFORM2IPROC                           glad_glUniform2i                           = NULL;
-PFNGLUNIFORM2IVPROC                          glad_glUniform2iv                          = NULL;
-PFNGLUNIFORM2UIPROC                          glad_glUniform2ui                          = NULL;
-PFNGLUNIFORM2UIVPROC                         glad_glUniform2uiv                         = NULL;
-PFNGLUNIFORM3FPROC                           glad_glUniform3f                           = NULL;
-PFNGLUNIFORM3FVPROC                          glad_glUniform3fv                          = NULL;
-PFNGLUNIFORM3IPROC                           glad_glUniform3i                           = NULL;
-PFNGLUNIFORM3IVPROC                          glad_glUniform3iv                          = NULL;
-PFNGLUNIFORM3UIPROC                          glad_glUniform3ui                          = NULL;
-PFNGLUNIFORM3UIVPROC                         glad_glUniform3uiv                         = NULL;
-PFNGLUNIFORM4FPROC                           glad_glUniform4f                           = NULL;
-PFNGLUNIFORM4FVPROC                          glad_glUniform4fv                          = NULL;
-PFNGLUNIFORM4IPROC                           glad_glUniform4i                           = NULL;
-PFNGLUNIFORM4IVPROC                          glad_glUniform4iv                          = NULL;
-PFNGLUNIFORM4UIPROC                          glad_glUniform4ui                          = NULL;
-PFNGLUNIFORM4UIVPROC                         glad_glUniform4uiv                         = NULL;
-PFNGLUNIFORMMATRIX2FVPROC                    glad_glUniformMatrix2fv                    = NULL;
-PFNGLUNIFORMMATRIX2X3FVPROC                  glad_glUniformMatrix2x3fv                  = NULL;
-PFNGLUNIFORMMATRIX2X4FVPROC                  glad_glUniformMatrix2x4fv                  = NULL;
-PFNGLUNIFORMMATRIX3FVPROC                    glad_glUniformMatrix3fv                    = NULL;
-PFNGLUNIFORMMATRIX3X2FVPROC                  glad_glUniformMatrix3x2fv                  = NULL;
-PFNGLUNIFORMMATRIX3X4FVPROC                  glad_glUniformMatrix3x4fv                  = NULL;
-PFNGLUNIFORMMATRIX4FVPROC                    glad_glUniformMatrix4fv                    = NULL;
-PFNGLUNIFORMMATRIX4X2FVPROC                  glad_glUniformMatrix4x2fv                  = NULL;
-PFNGLUNIFORMMATRIX4X3FVPROC                  glad_glUniformMatrix4x3fv                  = NULL;
-PFNGLUNMAPBUFFERPROC                         glad_glUnmapBuffer                         = NULL;
-PFNGLUSEPROGRAMPROC                          glad_glUseProgram                          = NULL;
-PFNGLVALIDATEPROGRAMPROC                     glad_glValidateProgram                     = NULL;
-PFNGLVERTEXATTRIB1DPROC                      glad_glVertexAttrib1d                      = NULL;
-PFNGLVERTEXATTRIB1DVPROC                     glad_glVertexAttrib1dv                     = NULL;
-PFNGLVERTEXATTRIB1FPROC                      glad_glVertexAttrib1f                      = NULL;
-PFNGLVERTEXATTRIB1FVPROC                     glad_glVertexAttrib1fv                     = NULL;
-PFNGLVERTEXATTRIB1SPROC                      glad_glVertexAttrib1s                      = NULL;
-PFNGLVERTEXATTRIB1SVPROC                     glad_glVertexAttrib1sv                     = NULL;
-PFNGLVERTEXATTRIB2DPROC                      glad_glVertexAttrib2d                      = NULL;
-PFNGLVERTEXATTRIB2DVPROC                     glad_glVertexAttrib2dv                     = NULL;
-PFNGLVERTEXATTRIB2FPROC                      glad_glVertexAttrib2f                      = NULL;
-PFNGLVERTEXATTRIB2FVPROC                     glad_glVertexAttrib2fv                     = NULL;
-PFNGLVERTEXATTRIB2SPROC                      glad_glVertexAttrib2s                      = NULL;
-PFNGLVERTEXATTRIB2SVPROC                     glad_glVertexAttrib2sv                     = NULL;
-PFNGLVERTEXATTRIB3DPROC                      glad_glVertexAttrib3d                      = NULL;
-PFNGLVERTEXATTRIB3DVPROC                     glad_glVertexAttrib3dv                     = NULL;
-PFNGLVERTEXATTRIB3FPROC                      glad_glVertexAttrib3f                      = NULL;
-PFNGLVERTEXATTRIB3FVPROC                     glad_glVertexAttrib3fv                     = NULL;
-PFNGLVERTEXATTRIB3SPROC                      glad_glVertexAttrib3s                      = NULL;
-PFNGLVERTEXATTRIB3SVPROC                     glad_glVertexAttrib3sv                     = NULL;
-PFNGLVERTEXATTRIB4NBVPROC                    glad_glVertexAttrib4Nbv                    = NULL;
-PFNGLVERTEXATTRIB4NIVPROC                    glad_glVertexAttrib4Niv                    = NULL;
-PFNGLVERTEXATTRIB4NSVPROC                    glad_glVertexAttrib4Nsv                    = NULL;
-PFNGLVERTEXATTRIB4NUBPROC                    glad_glVertexAttrib4Nub                    = NULL;
-PFNGLVERTEXATTRIB4NUBVPROC                   glad_glVertexAttrib4Nubv                   = NULL;
-PFNGLVERTEXATTRIB4NUIVPROC                   glad_glVertexAttrib4Nuiv                   = NULL;
-PFNGLVERTEXATTRIB4NUSVPROC                   glad_glVertexAttrib4Nusv                   = NULL;
-PFNGLVERTEXATTRIB4BVPROC                     glad_glVertexAttrib4bv                     = NULL;
-PFNGLVERTEXATTRIB4DPROC                      glad_glVertexAttrib4d                      = NULL;
-PFNGLVERTEXATTRIB4DVPROC                     glad_glVertexAttrib4dv                     = NULL;
-PFNGLVERTEXATTRIB4FPROC                      glad_glVertexAttrib4f                      = NULL;
-PFNGLVERTEXATTRIB4FVPROC                     glad_glVertexAttrib4fv                     = NULL;
-PFNGLVERTEXATTRIB4IVPROC                     glad_glVertexAttrib4iv                     = NULL;
-PFNGLVERTEXATTRIB4SPROC                      glad_glVertexAttrib4s                      = NULL;
-PFNGLVERTEXATTRIB4SVPROC                     glad_glVertexAttrib4sv                     = NULL;
-PFNGLVERTEXATTRIB4UBVPROC                    glad_glVertexAttrib4ubv                    = NULL;
-PFNGLVERTEXATTRIB4UIVPROC                    glad_glVertexAttrib4uiv                    = NULL;
-PFNGLVERTEXATTRIB4USVPROC                    glad_glVertexAttrib4usv                    = NULL;
-PFNGLVERTEXATTRIBI1IPROC                     glad_glVertexAttribI1i                     = NULL;
-PFNGLVERTEXATTRIBI1IVPROC                    glad_glVertexAttribI1iv                    = NULL;
-PFNGLVERTEXATTRIBI1UIPROC                    glad_glVertexAttribI1ui                    = NULL;
-PFNGLVERTEXATTRIBI1UIVPROC                   glad_glVertexAttribI1uiv                   = NULL;
-PFNGLVERTEXATTRIBI2IPROC                     glad_glVertexAttribI2i                     = NULL;
-PFNGLVERTEXATTRIBI2IVPROC                    glad_glVertexAttribI2iv                    = NULL;
-PFNGLVERTEXATTRIBI2UIPROC                    glad_glVertexAttribI2ui                    = NULL;
-PFNGLVERTEXATTRIBI2UIVPROC                   glad_glVertexAttribI2uiv                   = NULL;
-PFNGLVERTEXATTRIBI3IPROC                     glad_glVertexAttribI3i                     = NULL;
-PFNGLVERTEXATTRIBI3IVPROC                    glad_glVertexAttribI3iv                    = NULL;
-PFNGLVERTEXATTRIBI3UIPROC                    glad_glVertexAttribI3ui                    = NULL;
-PFNGLVERTEXATTRIBI3UIVPROC                   glad_glVertexAttribI3uiv                   = NULL;
-PFNGLVERTEXATTRIBI4BVPROC                    glad_glVertexAttribI4bv                    = NULL;
-PFNGLVERTEXATTRIBI4IPROC                     glad_glVertexAttribI4i                     = NULL;
-PFNGLVERTEXATTRIBI4IVPROC                    glad_glVertexAttribI4iv                    = NULL;
-PFNGLVERTEXATTRIBI4SVPROC                    glad_glVertexAttribI4sv                    = NULL;
-PFNGLVERTEXATTRIBI4UBVPROC                   glad_glVertexAttribI4ubv                   = NULL;
-PFNGLVERTEXATTRIBI4UIPROC                    glad_glVertexAttribI4ui                    = NULL;
-PFNGLVERTEXATTRIBI4UIVPROC                   glad_glVertexAttribI4uiv                   = NULL;
-PFNGLVERTEXATTRIBI4USVPROC                   glad_glVertexAttribI4usv                   = NULL;
-PFNGLVERTEXATTRIBIPOINTERPROC                glad_glVertexAttribIPointer                = NULL;
-PFNGLVERTEXATTRIBPOINTERPROC                 glad_glVertexAttribPointer                 = NULL;
-PFNGLVIEWPORTPROC                            glad_glViewport                            = NULL;
-int                                          GLAD_GL_ARB_buffer_storage                 = 0;
-int                                          GLAD_GL_ARB_debug_output                   = 0;
-int                                          GLAD_GL_ARB_sync                           = 0;
-PFNGLBUFFERSTORAGEPROC                       glad_glBufferStorage                       = NULL;
-PFNGLDEBUGMESSAGECONTROLARBPROC              glad_glDebugMessageControlARB              = NULL;
-PFNGLDEBUGMESSAGEINSERTARBPROC               glad_glDebugMessageInsertARB               = NULL;
-PFNGLDEBUGMESSAGECALLBACKARBPROC             glad_glDebugMessageCallbackARB             = NULL;
-PFNGLGETDEBUGMESSAGELOGARBPROC               glad_glGetDebugMessageLogARB               = NULL;
-PFNGLFENCESYNCPROC                           glad_glFenceSync                           = NULL;
-PFNGLISSYNCPROC                              glad_glIsSync                              = NULL;
-PFNGLDELETESYNCPROC                          glad_glDeleteSync                          = NULL;
-PFNGLCLIENTWAITSYNCPROC                      glad_glClientWaitSync                      = NULL;
-PFNGLWAITSYNCPROC                            glad_glWaitSync                            = NULL;
-PFNGLGETINTEGER64VPROC                       glad_glGetInteger64v                       = NULL;
-PFNGLGETSYNCIVPROC                           glad_glGetSynciv                           = NULL;
-static void
-load_GL_VERSION_1_0(GLADloadproc load)
-{
-    if (!GLAD_GL_VERSION_1_0)
-        return;
-    glad_glCullFace               = (PFNGLCULLFACEPROC) load("glCullFace");
-    glad_glFrontFace              = (PFNGLFRONTFACEPROC) load("glFrontFace");
-    glad_glHint                   = (PFNGLHINTPROC) load("glHint");
-    glad_glLineWidth              = (PFNGLLINEWIDTHPROC) load("glLineWidth");
-    glad_glPointSize              = (PFNGLPOINTSIZEPROC) load("glPointSize");
-    glad_glPolygonMode            = (PFNGLPOLYGONMODEPROC) load("glPolygonMode");
-    glad_glScissor                = (PFNGLSCISSORPROC) load("glScissor");
-    glad_glTexParameterf          = (PFNGLTEXPARAMETERFPROC) load("glTexParameterf");
-    glad_glTexParameterfv         = (PFNGLTEXPARAMETERFVPROC) load("glTexParameterfv");
-    glad_glTexParameteri          = (PFNGLTEXPARAMETERIPROC) load("glTexParameteri");
-    glad_glTexParameteriv         = (PFNGLTEXPARAMETERIVPROC) load("glTexParameteriv");
-    glad_glTexImage1D             = (PFNGLTEXIMAGE1DPROC) load("glTexImage1D");
-    glad_glTexImage2D             = (PFNGLTEXIMAGE2DPROC) load("glTexImage2D");
-    glad_glDrawBuffer             = (PFNGLDRAWBUFFERPROC) load("glDrawBuffer");
-    glad_glClear                  = (PFNGLCLEARPROC) load("glClear");
-    glad_glClearColor             = (PFNGLCLEARCOLORPROC) load("glClearColor");
-    glad_glClearStencil           = (PFNGLCLEARSTENCILPROC) load("glClearStencil");
-    glad_glClearDepth             = (PFNGLCLEARDEPTHPROC) load("glClearDepth");
-    glad_glStencilMask            = (PFNGLSTENCILMASKPROC) load("glStencilMask");
-    glad_glColorMask              = (PFNGLCOLORMASKPROC) load("glColorMask");
-    glad_glDepthMask              = (PFNGLDEPTHMASKPROC) load("glDepthMask");
-    glad_glDisable                = (PFNGLDISABLEPROC) load("glDisable");
-    glad_glEnable                 = (PFNGLENABLEPROC) load("glEnable");
-    glad_glFinish                 = (PFNGLFINISHPROC) load("glFinish");
-    glad_glFlush                  = (PFNGLFLUSHPROC) load("glFlush");
-    glad_glBlendFunc              = (PFNGLBLENDFUNCPROC) load("glBlendFunc");
-    glad_glLogicOp                = (PFNGLLOGICOPPROC) load("glLogicOp");
-    glad_glStencilFunc            = (PFNGLSTENCILFUNCPROC) load("glStencilFunc");
-    glad_glStencilOp              = (PFNGLSTENCILOPPROC) load("glStencilOp");
-    glad_glDepthFunc              = (PFNGLDEPTHFUNCPROC) load("glDepthFunc");
-    glad_glPixelStoref            = (PFNGLPIXELSTOREFPROC) load("glPixelStoref");
-    glad_glPixelStorei            = (PFNGLPIXELSTOREIPROC) load("glPixelStorei");
-    glad_glReadBuffer             = (PFNGLREADBUFFERPROC) load("glReadBuffer");
-    glad_glReadPixels             = (PFNGLREADPIXELSPROC) load("glReadPixels");
-    glad_glGetBooleanv            = (PFNGLGETBOOLEANVPROC) load("glGetBooleanv");
-    glad_glGetDoublev             = (PFNGLGETDOUBLEVPROC) load("glGetDoublev");
-    glad_glGetError               = (PFNGLGETERRORPROC) load("glGetError");
-    glad_glGetFloatv              = (PFNGLGETFLOATVPROC) load("glGetFloatv");
-    glad_glGetIntegerv            = (PFNGLGETINTEGERVPROC) load("glGetIntegerv");
-    glad_glGetString              = (PFNGLGETSTRINGPROC) load("glGetString");
-    glad_glGetTexImage            = (PFNGLGETTEXIMAGEPROC) load("glGetTexImage");
-    glad_glGetTexParameterfv      = (PFNGLGETTEXPARAMETERFVPROC) load("glGetTexParameterfv");
-    glad_glGetTexParameteriv      = (PFNGLGETTEXPARAMETERIVPROC) load("glGetTexParameteriv");
-    glad_glGetTexLevelParameterfv = (PFNGLGETTEXLEVELPARAMETERFVPROC) load("glGetTexLevelParameterfv");
-    glad_glGetTexLevelParameteriv = (PFNGLGETTEXLEVELPARAMETERIVPROC) load("glGetTexLevelParameteriv");
-    glad_glIsEnabled              = (PFNGLISENABLEDPROC) load("glIsEnabled");
-    glad_glDepthRange             = (PFNGLDEPTHRANGEPROC) load("glDepthRange");
-    glad_glViewport               = (PFNGLVIEWPORTPROC) load("glViewport");
-}
-static void
-load_GL_VERSION_1_1(GLADloadproc load)
-{
-    if (!GLAD_GL_VERSION_1_1)
-        return;
-    glad_glDrawArrays        = (PFNGLDRAWARRAYSPROC) load("glDrawArrays");
-    glad_glDrawElements      = (PFNGLDRAWELEMENTSPROC) load("glDrawElements");
-    glad_glPolygonOffset     = (PFNGLPOLYGONOFFSETPROC) load("glPolygonOffset");
-    glad_glCopyTexImage1D    = (PFNGLCOPYTEXIMAGE1DPROC) load("glCopyTexImage1D");
-    glad_glCopyTexImage2D    = (PFNGLCOPYTEXIMAGE2DPROC) load("glCopyTexImage2D");
-    glad_glCopyTexSubImage1D = (PFNGLCOPYTEXSUBIMAGE1DPROC) load("glCopyTexSubImage1D");
-    glad_glCopyTexSubImage2D = (PFNGLCOPYTEXSUBIMAGE2DPROC) load("glCopyTexSubImage2D");
-    glad_glTexSubImage1D     = (PFNGLTEXSUBIMAGE1DPROC) load("glTexSubImage1D");
-    glad_glTexSubImage2D     = (PFNGLTEXSUBIMAGE2DPROC) load("glTexSubImage2D");
-    glad_glBindTexture       = (PFNGLBINDTEXTUREPROC) load("glBindTexture");
-    glad_glDeleteTextures    = (PFNGLDELETETEXTURESPROC) load("glDeleteTextures");
-    glad_glGenTextures       = (PFNGLGENTEXTURESPROC) load("glGenTextures");
-    glad_glIsTexture         = (PFNGLISTEXTUREPROC) load("glIsTexture");
-}
-static void
-load_GL_VERSION_1_2(GLADloadproc load)
-{
-    if (!GLAD_GL_VERSION_1_2)
-        return;
-    glad_glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC) load("glDrawRangeElements");
-    glad_glTexImage3D        = (PFNGLTEXIMAGE3DPROC) load("glTexImage3D");
-    glad_glTexSubImage3D     = (PFNGLTEXSUBIMAGE3DPROC) load("glTexSubImage3D");
-    glad_glCopyTexSubImage3D = (PFNGLCOPYTEXSUBIMAGE3DPROC) load("glCopyTexSubImage3D");
-}
-static void
-load_GL_VERSION_1_3(GLADloadproc load)
-{
-    if (!GLAD_GL_VERSION_1_3)
-        return;
-    glad_glActiveTexture           = (PFNGLACTIVETEXTUREPROC) load("glActiveTexture");
-    glad_glSampleCoverage          = (PFNGLSAMPLECOVERAGEPROC) load("glSampleCoverage");
-    glad_glCompressedTexImage3D    = (PFNGLCOMPRESSEDTEXIMAGE3DPROC) load("glCompressedTexImage3D");
-    glad_glCompressedTexImage2D    = (PFNGLCOMPRESSEDTEXIMAGE2DPROC) load("glCompressedTexImage2D");
-    glad_glCompressedTexImage1D    = (PFNGLCOMPRESSEDTEXIMAGE1DPROC) load("glCompressedTexImage1D");
-    glad_glCompressedTexSubImage3D = (PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) load("glCompressedTexSubImage3D");
-    glad_glCompressedTexSubImage2D = (PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) load("glCompressedTexSubImage2D");
-    glad_glCompressedTexSubImage1D = (PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) load("glCompressedTexSubImage1D");
-    glad_glGetCompressedTexImage   = (PFNGLGETCOMPRESSEDTEXIMAGEPROC) load("glGetCompressedTexImage");
-}
-static void
-load_GL_VERSION_1_4(GLADloadproc load)
-{
-    if (!GLAD_GL_VERSION_1_4)
-        return;
-    glad_glBlendFuncSeparate = (PFNGLBLENDFUNCSEPARATEPROC) load("glBlendFuncSeparate");
-    glad_glMultiDrawArrays   = (PFNGLMULTIDRAWARRAYSPROC) load("glMultiDrawArrays");
-    glad_glMultiDrawElements = (PFNGLMULTIDRAWELEMENTSPROC) load("glMultiDrawElements");
-    glad_glPointParameterf   = (PFNGLPOINTPARAMETERFPROC) load("glPointParameterf");
-    glad_glPointParameterfv  = (PFNGLPOINTPARAMETERFVPROC) load("glPointParameterfv");
-    glad_glPointParameteri   = (PFNGLPOINTPARAMETERIPROC) load("glPointParameteri");
-    glad_glPointParameteriv  = (PFNGLPOINTPARAMETERIVPROC) load("glPointParameteriv");
-    glad_glBlendColor        = (PFNGLBLENDCOLORPROC) load("glBlendColor");
-    glad_glBlendEquation     = (PFNGLBLENDEQUATIONPROC) load("glBlendEquation");
-}
-static void
-load_GL_VERSION_1_5(GLADloadproc load)
-{
-    if (!GLAD_GL_VERSION_1_5)
-        return;
-    glad_glGenQueries           = (PFNGLGENQUERIESPROC) load("glGenQueries");
-    glad_glDeleteQueries        = (PFNGLDELETEQUERIESPROC) load("glDeleteQueries");
-    glad_glIsQuery              = (PFNGLISQUERYPROC) load("glIsQuery");
-    glad_glBeginQuery           = (PFNGLBEGINQUERYPROC) load("glBeginQuery");
-    glad_glEndQuery             = (PFNGLENDQUERYPROC) load("glEndQuery");
-    glad_glGetQueryiv           = (PFNGLGETQUERYIVPROC) load("glGetQueryiv");
-    glad_glGetQueryObjectiv     = (PFNGLGETQUERYOBJECTIVPROC) load("glGetQueryObjectiv");
-    glad_glGetQueryObjectuiv    = (PFNGLGETQUERYOBJECTUIVPROC) load("glGetQueryObjectuiv");
-    glad_glBindBuffer           = (PFNGLBINDBUFFERPROC) load("glBindBuffer");
-    glad_glDeleteBuffers        = (PFNGLDELETEBUFFERSPROC) load("glDeleteBuffers");
-    glad_glGenBuffers           = (PFNGLGENBUFFERSPROC) load("glGenBuffers");
-    glad_glIsBuffer             = (PFNGLISBUFFERPROC) load("glIsBuffer");
-    glad_glBufferData           = (PFNGLBUFFERDATAPROC) load("glBufferData");
-    glad_glBufferSubData        = (PFNGLBUFFERSUBDATAPROC) load("glBufferSubData");
-    glad_glGetBufferSubData     = (PFNGLGETBUFFERSUBDATAPROC) load("glGetBufferSubData");
-    glad_glMapBuffer            = (PFNGLMAPBUFFERPROC) load("glMapBuffer");
-    glad_glUnmapBuffer          = (PFNGLUNMAPBUFFERPROC) load("glUnmapBuffer");
-    glad_glGetBufferParameteriv = (PFNGLGETBUFFERPARAMETERIVPROC) load("glGetBufferParameteriv");
-    glad_glGetBufferPointerv    = (PFNGLGETBUFFERPOINTERVPROC) load("glGetBufferPointerv");
-}
-static void
-load_GL_VERSION_2_0(GLADloadproc load)
-{
-    if (!GLAD_GL_VERSION_2_0)
-        return;
-    glad_glBlendEquationSeparate    = (PFNGLBLENDEQUATIONSEPARATEPROC) load("glBlendEquationSeparate");
-    glad_glDrawBuffers              = (PFNGLDRAWBUFFERSPROC) load("glDrawBuffers");
-    glad_glStencilOpSeparate        = (PFNGLSTENCILOPSEPARATEPROC) load("glStencilOpSeparate");
-    glad_glStencilFuncSeparate      = (PFNGLSTENCILFUNCSEPARATEPROC) load("glStencilFuncSeparate");
-    glad_glStencilMaskSeparate      = (PFNGLSTENCILMASKSEPARATEPROC) load("glStencilMaskSeparate");
-    glad_glAttachShader             = (PFNGLATTACHSHADERPROC) load("glAttachShader");
-    glad_glBindAttribLocation       = (PFNGLBINDATTRIBLOCATIONPROC) load("glBindAttribLocation");
-    glad_glCompileShader            = (PFNGLCOMPILESHADERPROC) load("glCompileShader");
-    glad_glCreateProgram            = (PFNGLCREATEPROGRAMPROC) load("glCreateProgram");
-    glad_glCreateShader             = (PFNGLCREATESHADERPROC) load("glCreateShader");
-    glad_glDeleteProgram            = (PFNGLDELETEPROGRAMPROC) load("glDeleteProgram");
-    glad_glDeleteShader             = (PFNGLDELETESHADERPROC) load("glDeleteShader");
-    glad_glDetachShader             = (PFNGLDETACHSHADERPROC) load("glDetachShader");
-    glad_glDisableVertexAttribArray = (PFNGLDISABLEVERTEXATTRIBARRAYPROC) load("glDisableVertexAttribArray");
-    glad_glEnableVertexAttribArray  = (PFNGLENABLEVERTEXATTRIBARRAYPROC) load("glEnableVertexAttribArray");
-    glad_glGetActiveAttrib          = (PFNGLGETACTIVEATTRIBPROC) load("glGetActiveAttrib");
-    glad_glGetActiveUniform         = (PFNGLGETACTIVEUNIFORMPROC) load("glGetActiveUniform");
-    glad_glGetAttachedShaders       = (PFNGLGETATTACHEDSHADERSPROC) load("glGetAttachedShaders");
-    glad_glGetAttribLocation        = (PFNGLGETATTRIBLOCATIONPROC) load("glGetAttribLocation");
-    glad_glGetProgramiv             = (PFNGLGETPROGRAMIVPROC) load("glGetProgramiv");
-    glad_glGetProgramInfoLog        = (PFNGLGETPROGRAMINFOLOGPROC) load("glGetProgramInfoLog");
-    glad_glGetShaderiv              = (PFNGLGETSHADERIVPROC) load("glGetShaderiv");
-    glad_glGetShaderInfoLog         = (PFNGLGETSHADERINFOLOGPROC) load("glGetShaderInfoLog");
-    glad_glGetShaderSource          = (PFNGLGETSHADERSOURCEPROC) load("glGetShaderSource");
-    glad_glGetUniformLocation       = (PFNGLGETUNIFORMLOCATIONPROC) load("glGetUniformLocation");
-    glad_glGetUniformfv             = (PFNGLGETUNIFORMFVPROC) load("glGetUniformfv");
-    glad_glGetUniformiv             = (PFNGLGETUNIFORMIVPROC) load("glGetUniformiv");
-    glad_glGetVertexAttribdv        = (PFNGLGETVERTEXATTRIBDVPROC) load("glGetVertexAttribdv");
-    glad_glGetVertexAttribfv        = (PFNGLGETVERTEXATTRIBFVPROC) load("glGetVertexAttribfv");
-    glad_glGetVertexAttribiv        = (PFNGLGETVERTEXATTRIBIVPROC) load("glGetVertexAttribiv");
-    glad_glGetVertexAttribPointerv  = (PFNGLGETVERTEXATTRIBPOINTERVPROC) load("glGetVertexAttribPointerv");
-    glad_glIsProgram                = (PFNGLISPROGRAMPROC) load("glIsProgram");
-    glad_glIsShader                 = (PFNGLISSHADERPROC) load("glIsShader");
-    glad_glLinkProgram              = (PFNGLLINKPROGRAMPROC) load("glLinkProgram");
-    glad_glShaderSource             = (PFNGLSHADERSOURCEPROC) load("glShaderSource");
-    glad_glUseProgram               = (PFNGLUSEPROGRAMPROC) load("glUseProgram");
-    glad_glUniform1f                = (PFNGLUNIFORM1FPROC) load("glUniform1f");
-    glad_glUniform2f                = (PFNGLUNIFORM2FPROC) load("glUniform2f");
-    glad_glUniform3f                = (PFNGLUNIFORM3FPROC) load("glUniform3f");
-    glad_glUniform4f                = (PFNGLUNIFORM4FPROC) load("glUniform4f");
-    glad_glUniform1i                = (PFNGLUNIFORM1IPROC) load("glUniform1i");
-    glad_glUniform2i                = (PFNGLUNIFORM2IPROC) load("glUniform2i");
-    glad_glUniform3i                = (PFNGLUNIFORM3IPROC) load("glUniform3i");
-    glad_glUniform4i                = (PFNGLUNIFORM4IPROC) load("glUniform4i");
-    glad_glUniform1fv               = (PFNGLUNIFORM1FVPROC) load("glUniform1fv");
-    glad_glUniform2fv               = (PFNGLUNIFORM2FVPROC) load("glUniform2fv");
-    glad_glUniform3fv               = (PFNGLUNIFORM3FVPROC) load("glUniform3fv");
-    glad_glUniform4fv               = (PFNGLUNIFORM4FVPROC) load("glUniform4fv");
-    glad_glUniform1iv               = (PFNGLUNIFORM1IVPROC) load("glUniform1iv");
-    glad_glUniform2iv               = (PFNGLUNIFORM2IVPROC) load("glUniform2iv");
-    glad_glUniform3iv               = (PFNGLUNIFORM3IVPROC) load("glUniform3iv");
-    glad_glUniform4iv               = (PFNGLUNIFORM4IVPROC) load("glUniform4iv");
-    glad_glUniformMatrix2fv         = (PFNGLUNIFORMMATRIX2FVPROC) load("glUniformMatrix2fv");
-    glad_glUniformMatrix3fv         = (PFNGLUNIFORMMATRIX3FVPROC) load("glUniformMatrix3fv");
-    glad_glUniformMatrix4fv         = (PFNGLUNIFORMMATRIX4FVPROC) load("glUniformMatrix4fv");
-    glad_glValidateProgram          = (PFNGLVALIDATEPROGRAMPROC) load("glValidateProgram");
-    glad_glVertexAttrib1d           = (PFNGLVERTEXATTRIB1DPROC) load("glVertexAttrib1d");
-    glad_glVertexAttrib1dv          = (PFNGLVERTEXATTRIB1DVPROC) load("glVertexAttrib1dv");
-    glad_glVertexAttrib1f           = (PFNGLVERTEXATTRIB1FPROC) load("glVertexAttrib1f");
-    glad_glVertexAttrib1fv          = (PFNGLVERTEXATTRIB1FVPROC) load("glVertexAttrib1fv");
-    glad_glVertexAttrib1s           = (PFNGLVERTEXATTRIB1SPROC) load("glVertexAttrib1s");
-    glad_glVertexAttrib1sv          = (PFNGLVERTEXATTRIB1SVPROC) load("glVertexAttrib1sv");
-    glad_glVertexAttrib2d           = (PFNGLVERTEXATTRIB2DPROC) load("glVertexAttrib2d");
-    glad_glVertexAttrib2dv          = (PFNGLVERTEXATTRIB2DVPROC) load("glVertexAttrib2dv");
-    glad_glVertexAttrib2f           = (PFNGLVERTEXATTRIB2FPROC) load("glVertexAttrib2f");
-    glad_glVertexAttrib2fv          = (PFNGLVERTEXATTRIB2FVPROC) load("glVertexAttrib2fv");
-    glad_glVertexAttrib2s           = (PFNGLVERTEXATTRIB2SPROC) load("glVertexAttrib2s");
-    glad_glVertexAttrib2sv          = (PFNGLVERTEXATTRIB2SVPROC) load("glVertexAttrib2sv");
-    glad_glVertexAttrib3d           = (PFNGLVERTEXATTRIB3DPROC) load("glVertexAttrib3d");
-    glad_glVertexAttrib3dv          = (PFNGLVERTEXATTRIB3DVPROC) load("glVertexAttrib3dv");
-    glad_glVertexAttrib3f           = (PFNGLVERTEXATTRIB3FPROC) load("glVertexAttrib3f");
-    glad_glVertexAttrib3fv          = (PFNGLVERTEXATTRIB3FVPROC) load("glVertexAttrib3fv");
-    glad_glVertexAttrib3s           = (PFNGLVERTEXATTRIB3SPROC) load("glVertexAttrib3s");
-    glad_glVertexAttrib3sv          = (PFNGLVERTEXATTRIB3SVPROC) load("glVertexAttrib3sv");
-    glad_glVertexAttrib4Nbv         = (PFNGLVERTEXATTRIB4NBVPROC) load("glVertexAttrib4Nbv");
-    glad_glVertexAttrib4Niv         = (PFNGLVERTEXATTRIB4NIVPROC) load("glVertexAttrib4Niv");
-    glad_glVertexAttrib4Nsv         = (PFNGLVERTEXATTRIB4NSVPROC) load("glVertexAttrib4Nsv");
-    glad_glVertexAttrib4Nub         = (PFNGLVERTEXATTRIB4NUBPROC) load("glVertexAttrib4Nub");
-    glad_glVertexAttrib4Nubv        = (PFNGLVERTEXATTRIB4NUBVPROC) load("glVertexAttrib4Nubv");
-    glad_glVertexAttrib4Nuiv        = (PFNGLVERTEXATTRIB4NUIVPROC) load("glVertexAttrib4Nuiv");
-    glad_glVertexAttrib4Nusv        = (PFNGLVERTEXATTRIB4NUSVPROC) load("glVertexAttrib4Nusv");
-    glad_glVertexAttrib4bv          = (PFNGLVERTEXATTRIB4BVPROC) load("glVertexAttrib4bv");
-    glad_glVertexAttrib4d           = (PFNGLVERTEXATTRIB4DPROC) load("glVertexAttrib4d");
-    glad_glVertexAttrib4dv          = (PFNGLVERTEXATTRIB4DVPROC) load("glVertexAttrib4dv");
-    glad_glVertexAttrib4f           = (PFNGLVERTEXATTRIB4FPROC) load("glVertexAttrib4f");
-    glad_glVertexAttrib4fv          = (PFNGLVERTEXATTRIB4FVPROC) load("glVertexAttrib4fv");
-    glad_glVertexAttrib4iv          = (PFNGLVERTEXATTRIB4IVPROC) load("glVertexAttrib4iv");
-    glad_glVertexAttrib4s           = (PFNGLVERTEXATTRIB4SPROC) load("glVertexAttrib4s");
-    glad_glVertexAttrib4sv          = (PFNGLVERTEXATTRIB4SVPROC) load("glVertexAttrib4sv");
-    glad_glVertexAttrib4ubv         = (PFNGLVERTEXATTRIB4UBVPROC) load("glVertexAttrib4ubv");
-    glad_glVertexAttrib4uiv         = (PFNGLVERTEXATTRIB4UIVPROC) load("glVertexAttrib4uiv");
-    glad_glVertexAttrib4usv         = (PFNGLVERTEXATTRIB4USVPROC) load("glVertexAttrib4usv");
-    glad_glVertexAttribPointer      = (PFNGLVERTEXATTRIBPOINTERPROC) load("glVertexAttribPointer");
-}
-static void
-load_GL_VERSION_2_1(GLADloadproc load)
-{
-    if (!GLAD_GL_VERSION_2_1)
-        return;
-    glad_glUniformMatrix2x3fv = (PFNGLUNIFORMMATRIX2X3FVPROC) load("glUniformMatrix2x3fv");
-    glad_glUniformMatrix3x2fv = (PFNGLUNIFORMMATRIX3X2FVPROC) load("glUniformMatrix3x2fv");
-    glad_glUniformMatrix2x4fv = (PFNGLUNIFORMMATRIX2X4FVPROC) load("glUniformMatrix2x4fv");
-    glad_glUniformMatrix4x2fv = (PFNGLUNIFORMMATRIX4X2FVPROC) load("glUniformMatrix4x2fv");
-    glad_glUniformMatrix3x4fv = (PFNGLUNIFORMMATRIX3X4FVPROC) load("glUniformMatrix3x4fv");
-    glad_glUniformMatrix4x3fv = (PFNGLUNIFORMMATRIX4X3FVPROC) load("glUniformMatrix4x3fv");
-}
-static void
-load_GL_VERSION_3_0(GLADloadproc load)
-{
-    if (!GLAD_GL_VERSION_3_0)
-        return;
-    glad_glColorMaski                          = (PFNGLCOLORMASKIPROC) load("glColorMaski");
-    glad_glGetBooleani_v                       = (PFNGLGETBOOLEANI_VPROC) load("glGetBooleani_v");
-    glad_glGetIntegeri_v                       = (PFNGLGETINTEGERI_VPROC) load("glGetIntegeri_v");
-    glad_glEnablei                             = (PFNGLENABLEIPROC) load("glEnablei");
-    glad_glDisablei                            = (PFNGLDISABLEIPROC) load("glDisablei");
-    glad_glIsEnabledi                          = (PFNGLISENABLEDIPROC) load("glIsEnabledi");
-    glad_glBeginTransformFeedback              = (PFNGLBEGINTRANSFORMFEEDBACKPROC) load("glBeginTransformFeedback");
-    glad_glEndTransformFeedback                = (PFNGLENDTRANSFORMFEEDBACKPROC) load("glEndTransformFeedback");
-    glad_glBindBufferRange                     = (PFNGLBINDBUFFERRANGEPROC) load("glBindBufferRange");
-    glad_glBindBufferBase                      = (PFNGLBINDBUFFERBASEPROC) load("glBindBufferBase");
-    glad_glTransformFeedbackVaryings           = (PFNGLTRANSFORMFEEDBACKVARYINGSPROC) load("glTransformFeedbackVaryings");
-    glad_glGetTransformFeedbackVarying         = (PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) load("glGetTransformFeedbackVarying");
-    glad_glClampColor                          = (PFNGLCLAMPCOLORPROC) load("glClampColor");
-    glad_glBeginConditionalRender              = (PFNGLBEGINCONDITIONALRENDERPROC) load("glBeginConditionalRender");
-    glad_glEndConditionalRender                = (PFNGLENDCONDITIONALRENDERPROC) load("glEndConditionalRender");
-    glad_glVertexAttribIPointer                = (PFNGLVERTEXATTRIBIPOINTERPROC) load("glVertexAttribIPointer");
-    glad_glGetVertexAttribIiv                  = (PFNGLGETVERTEXATTRIBIIVPROC) load("glGetVertexAttribIiv");
-    glad_glGetVertexAttribIuiv                 = (PFNGLGETVERTEXATTRIBIUIVPROC) load("glGetVertexAttribIuiv");
-    glad_glVertexAttribI1i                     = (PFNGLVERTEXATTRIBI1IPROC) load("glVertexAttribI1i");
-    glad_glVertexAttribI2i                     = (PFNGLVERTEXATTRIBI2IPROC) load("glVertexAttribI2i");
-    glad_glVertexAttribI3i                     = (PFNGLVERTEXATTRIBI3IPROC) load("glVertexAttribI3i");
-    glad_glVertexAttribI4i                     = (PFNGLVERTEXATTRIBI4IPROC) load("glVertexAttribI4i");
-    glad_glVertexAttribI1ui                    = (PFNGLVERTEXATTRIBI1UIPROC) load("glVertexAttribI1ui");
-    glad_glVertexAttribI2ui                    = (PFNGLVERTEXATTRIBI2UIPROC) load("glVertexAttribI2ui");
-    glad_glVertexAttribI3ui                    = (PFNGLVERTEXATTRIBI3UIPROC) load("glVertexAttribI3ui");
-    glad_glVertexAttribI4ui                    = (PFNGLVERTEXATTRIBI4UIPROC) load("glVertexAttribI4ui");
-    glad_glVertexAttribI1iv                    = (PFNGLVERTEXATTRIBI1IVPROC) load("glVertexAttribI1iv");
-    glad_glVertexAttribI2iv                    = (PFNGLVERTEXATTRIBI2IVPROC) load("glVertexAttribI2iv");
-    glad_glVertexAttribI3iv                    = (PFNGLVERTEXATTRIBI3IVPROC) load("glVertexAttribI3iv");
-    glad_glVertexAttribI4iv                    = (PFNGLVERTEXATTRIBI4IVPROC) load("glVertexAttribI4iv");
-    glad_glVertexAttribI1uiv                   = (PFNGLVERTEXATTRIBI1UIVPROC) load("glVertexAttribI1uiv");
-    glad_glVertexAttribI2uiv                   = (PFNGLVERTEXATTRIBI2UIVPROC) load("glVertexAttribI2uiv");
-    glad_glVertexAttribI3uiv                   = (PFNGLVERTEXATTRIBI3UIVPROC) load("glVertexAttribI3uiv");
-    glad_glVertexAttribI4uiv                   = (PFNGLVERTEXATTRIBI4UIVPROC) load("glVertexAttribI4uiv");
-    glad_glVertexAttribI4bv                    = (PFNGLVERTEXATTRIBI4BVPROC) load("glVertexAttribI4bv");
-    glad_glVertexAttribI4sv                    = (PFNGLVERTEXATTRIBI4SVPROC) load("glVertexAttribI4sv");
-    glad_glVertexAttribI4ubv                   = (PFNGLVERTEXATTRIBI4UBVPROC) load("glVertexAttribI4ubv");
-    glad_glVertexAttribI4usv                   = (PFNGLVERTEXATTRIBI4USVPROC) load("glVertexAttribI4usv");
-    glad_glGetUniformuiv                       = (PFNGLGETUNIFORMUIVPROC) load("glGetUniformuiv");
-    glad_glBindFragDataLocation                = (PFNGLBINDFRAGDATALOCATIONPROC) load("glBindFragDataLocation");
-    glad_glGetFragDataLocation                 = (PFNGLGETFRAGDATALOCATIONPROC) load("glGetFragDataLocation");
-    glad_glUniform1ui                          = (PFNGLUNIFORM1UIPROC) load("glUniform1ui");
-    glad_glUniform2ui                          = (PFNGLUNIFORM2UIPROC) load("glUniform2ui");
-    glad_glUniform3ui                          = (PFNGLUNIFORM3UIPROC) load("glUniform3ui");
-    glad_glUniform4ui                          = (PFNGLUNIFORM4UIPROC) load("glUniform4ui");
-    glad_glUniform1uiv                         = (PFNGLUNIFORM1UIVPROC) load("glUniform1uiv");
-    glad_glUniform2uiv                         = (PFNGLUNIFORM2UIVPROC) load("glUniform2uiv");
-    glad_glUniform3uiv                         = (PFNGLUNIFORM3UIVPROC) load("glUniform3uiv");
-    glad_glUniform4uiv                         = (PFNGLUNIFORM4UIVPROC) load("glUniform4uiv");
-    glad_glTexParameterIiv                     = (PFNGLTEXPARAMETERIIVPROC) load("glTexParameterIiv");
-    glad_glTexParameterIuiv                    = (PFNGLTEXPARAMETERIUIVPROC) load("glTexParameterIuiv");
-    glad_glGetTexParameterIiv                  = (PFNGLGETTEXPARAMETERIIVPROC) load("glGetTexParameterIiv");
-    glad_glGetTexParameterIuiv                 = (PFNGLGETTEXPARAMETERIUIVPROC) load("glGetTexParameterIuiv");
-    glad_glClearBufferiv                       = (PFNGLCLEARBUFFERIVPROC) load("glClearBufferiv");
-    glad_glClearBufferuiv                      = (PFNGLCLEARBUFFERUIVPROC) load("glClearBufferuiv");
-    glad_glClearBufferfv                       = (PFNGLCLEARBUFFERFVPROC) load("glClearBufferfv");
-    glad_glClearBufferfi                       = (PFNGLCLEARBUFFERFIPROC) load("glClearBufferfi");
-    glad_glGetStringi                          = (PFNGLGETSTRINGIPROC) load("glGetStringi");
-    glad_glIsRenderbuffer                      = (PFNGLISRENDERBUFFERPROC) load("glIsRenderbuffer");
-    glad_glBindRenderbuffer                    = (PFNGLBINDRENDERBUFFERPROC) load("glBindRenderbuffer");
-    glad_glDeleteRenderbuffers                 = (PFNGLDELETERENDERBUFFERSPROC) load("glDeleteRenderbuffers");
-    glad_glGenRenderbuffers                    = (PFNGLGENRENDERBUFFERSPROC) load("glGenRenderbuffers");
-    glad_glRenderbufferStorage                 = (PFNGLRENDERBUFFERSTORAGEPROC) load("glRenderbufferStorage");
-    glad_glGetRenderbufferParameteriv          = (PFNGLGETRENDERBUFFERPARAMETERIVPROC) load("glGetRenderbufferParameteriv");
-    glad_glIsFramebuffer                       = (PFNGLISFRAMEBUFFERPROC) load("glIsFramebuffer");
-    glad_glBindFramebuffer                     = (PFNGLBINDFRAMEBUFFERPROC) load("glBindFramebuffer");
-    glad_glDeleteFramebuffers                  = (PFNGLDELETEFRAMEBUFFERSPROC) load("glDeleteFramebuffers");
-    glad_glGenFramebuffers                     = (PFNGLGENFRAMEBUFFERSPROC) load("glGenFramebuffers");
-    glad_glCheckFramebufferStatus              = (PFNGLCHECKFRAMEBUFFERSTATUSPROC) load("glCheckFramebufferStatus");
-    glad_glFramebufferTexture1D                = (PFNGLFRAMEBUFFERTEXTURE1DPROC) load("glFramebufferTexture1D");
-    glad_glFramebufferTexture2D                = (PFNGLFRAMEBUFFERTEXTURE2DPROC) load("glFramebufferTexture2D");
-    glad_glFramebufferTexture3D                = (PFNGLFRAMEBUFFERTEXTURE3DPROC) load("glFramebufferTexture3D");
-    glad_glFramebufferRenderbuffer             = (PFNGLFRAMEBUFFERRENDERBUFFERPROC) load("glFramebufferRenderbuffer");
-    glad_glGetFramebufferAttachmentParameteriv = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) load("glGetFramebufferAttachmentParameteriv");
-    glad_glGenerateMipmap                      = (PFNGLGENERATEMIPMAPPROC) load("glGenerateMipmap");
-    glad_glBlitFramebuffer                     = (PFNGLBLITFRAMEBUFFERPROC) load("glBlitFramebuffer");
-    glad_glRenderbufferStorageMultisample      = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) load("glRenderbufferStorageMultisample");
-    glad_glFramebufferTextureLayer             = (PFNGLFRAMEBUFFERTEXTURELAYERPROC) load("glFramebufferTextureLayer");
-    glad_glMapBufferRange                      = (PFNGLMAPBUFFERRANGEPROC) load("glMapBufferRange");
-    glad_glFlushMappedBufferRange              = (PFNGLFLUSHMAPPEDBUFFERRANGEPROC) load("glFlushMappedBufferRange");
-    glad_glBindVertexArray                     = (PFNGLBINDVERTEXARRAYPROC) load("glBindVertexArray");
-    glad_glDeleteVertexArrays                  = (PFNGLDELETEVERTEXARRAYSPROC) load("glDeleteVertexArrays");
-    glad_glGenVertexArrays                     = (PFNGLGENVERTEXARRAYSPROC) load("glGenVertexArrays");
-    glad_glIsVertexArray                       = (PFNGLISVERTEXARRAYPROC) load("glIsVertexArray");
-}
-static void
-load_GL_ARB_buffer_storage(GLADloadproc load)
-{
-    if (!GLAD_GL_ARB_buffer_storage)
-        return;
-    glad_glBufferStorage = (PFNGLBUFFERSTORAGEPROC) load("glBufferStorage");
-}
-static void
-load_GL_ARB_debug_output(GLADloadproc load)
-{
-    if (!GLAD_GL_ARB_debug_output)
-        return;
-    glad_glDebugMessageControlARB  = (PFNGLDEBUGMESSAGECONTROLARBPROC) load("glDebugMessageControlARB");
-    glad_glDebugMessageInsertARB   = (PFNGLDEBUGMESSAGEINSERTARBPROC) load("glDebugMessageInsertARB");
-    glad_glDebugMessageCallbackARB = (PFNGLDEBUGMESSAGECALLBACKARBPROC) load("glDebugMessageCallbackARB");
-    glad_glGetDebugMessageLogARB   = (PFNGLGETDEBUGMESSAGELOGARBPROC) load("glGetDebugMessageLogARB");
-}
-static void
-load_GL_ARB_sync(GLADloadproc load)
-{
-    if (!GLAD_GL_ARB_sync)
-        return;
-    glad_glFenceSync      = (PFNGLFENCESYNCPROC) load("glFenceSync");
-    glad_glIsSync         = (PFNGLISSYNCPROC) load("glIsSync");
-    glad_glDeleteSync     = (PFNGLDELETESYNCPROC) load("glDeleteSync");
-    glad_glClientWaitSync = (PFNGLCLIENTWAITSYNCPROC) load("glClientWaitSync");
-    glad_glWaitSync       = (PFNGLWAITSYNCPROC) load("glWaitSync");
-    glad_glGetInteger64v  = (PFNGLGETINTEGER64VPROC) load("glGetInteger64v");
-    glad_glGetSynciv      = (PFNGLGETSYNCIVPROC) load("glGetSynciv");
-}
-static int
-find_extensionsGL(void)
-{
-    if (!get_exts())
-        return 0;
-    GLAD_GL_ARB_buffer_storage = has_ext("GL_ARB_buffer_storage");
-    GLAD_GL_ARB_debug_output   = has_ext("GL_ARB_debug_output");
-    GLAD_GL_ARB_sync           = has_ext("GL_ARB_sync");
-    free_exts();
-    return 1;
-}
-
-static void
-find_coreGL(void)
-{
-
-    /* Thank you @elmindreda
-     * https://github.com/elmindreda/greg/blob/master/templates/greg.c.in#L176
-     * https://github.com/glfw/glfw/blob/master/src/context.c#L36
-     */
-    int i, major, minor;
-
-    const char *version;
-    const char *prefixes[] = {
-        "OpenGL ES-CM ",
-        "OpenGL ES-CL ",
-        "OpenGL ES ",
-        NULL
-    };
-
-    version = (const char *) glGetString(GL_VERSION);
-    if (!version)
-        return;
-
-    for (i = 0; prefixes[i]; i++) {
-        const size_t length = strlen(prefixes[i]);
-        if (strncmp(version, prefixes[i], length) == 0) {
-            version += length;
-            break;
-        }
-    }
-
-/* PR #18 */
-#ifdef _MSC_VER
-    sscanf_s(version, "%d.%d", &major, &minor);
-#else
-    sscanf(version, "%d.%d", &major, &minor);
-#endif
-
-    GLVersion.major     = major;
-    GLVersion.minor     = minor;
-    max_loaded_major    = major;
-    max_loaded_minor    = minor;
-    GLAD_GL_VERSION_1_0 = (major == 1 && minor >= 0) || major > 1;
-    GLAD_GL_VERSION_1_1 = (major == 1 && minor >= 1) || major > 1;
-    GLAD_GL_VERSION_1_2 = (major == 1 && minor >= 2) || major > 1;
-    GLAD_GL_VERSION_1_3 = (major == 1 && minor >= 3) || major > 1;
-    GLAD_GL_VERSION_1_4 = (major == 1 && minor >= 4) || major > 1;
-    GLAD_GL_VERSION_1_5 = (major == 1 && minor >= 5) || major > 1;
-    GLAD_GL_VERSION_2_0 = (major == 2 && minor >= 0) || major > 2;
-    GLAD_GL_VERSION_2_1 = (major == 2 && minor >= 1) || major > 2;
-    GLAD_GL_VERSION_3_0 = (major == 3 && minor >= 0) || major > 3;
-    if (GLVersion.major > 3 || (GLVersion.major >= 3 && GLVersion.minor >= 0)) {
-        max_loaded_major = 3;
-        max_loaded_minor = 0;
-    }
-}
-
-int
-gladLoadGLLoader(GLADloadproc load)
-{
-    GLVersion.major = 0;
-    GLVersion.minor = 0;
-    glGetString     = (PFNGLGETSTRINGPROC) load("glGetString");
-    if (glGetString == NULL)
-        return 0;
-    if (glGetString(GL_VERSION) == NULL)
-        return 0;
-    find_coreGL();
-    load_GL_VERSION_1_0(load);
-    load_GL_VERSION_1_1(load);
-    load_GL_VERSION_1_2(load);
-    load_GL_VERSION_1_3(load);
-    load_GL_VERSION_1_4(load);
-    load_GL_VERSION_1_5(load);
-    load_GL_VERSION_2_0(load);
-    load_GL_VERSION_2_1(load);
-    load_GL_VERSION_3_0(load);
-
-    if (!find_extensionsGL())
-        return 0;
-    load_GL_ARB_buffer_storage(load);
-    load_GL_ARB_debug_output(load);
-    load_GL_ARB_sync(load);
-    return GLVersion.major != 0 || GLVersion.minor != 0;
-}
diff --git a/src/win/icons/cartridge_empty.ico b/src/win/icons/cartridge_empty.ico
deleted file mode 100644
index 9ff90846e..000000000
Binary files a/src/win/icons/cartridge_empty.ico and /dev/null differ
diff --git a/src/win/icons/cassette_active.ico b/src/win/icons/cassette_active.ico
deleted file mode 100644
index 32fca20b4..000000000
Binary files a/src/win/icons/cassette_active.ico and /dev/null differ
diff --git a/src/win/icons/cassette_empty.ico b/src/win/icons/cassette_empty.ico
deleted file mode 100644
index 16c6e8457..000000000
Binary files a/src/win/icons/cassette_empty.ico and /dev/null differ
diff --git a/src/win/icons/cassette_empty_active.ico b/src/win/icons/cassette_empty_active.ico
deleted file mode 100644
index e1bf61f61..000000000
Binary files a/src/win/icons/cassette_empty_active.ico and /dev/null differ
diff --git a/src/win/icons/cdrom_active.ico b/src/win/icons/cdrom_active.ico
deleted file mode 100644
index 6f2ef197c..000000000
Binary files a/src/win/icons/cdrom_active.ico and /dev/null differ
diff --git a/src/win/icons/cdrom_empty.ico b/src/win/icons/cdrom_empty.ico
deleted file mode 100644
index 45580999c..000000000
Binary files a/src/win/icons/cdrom_empty.ico and /dev/null differ
diff --git a/src/win/icons/cdrom_empty_active.ico b/src/win/icons/cdrom_empty_active.ico
deleted file mode 100644
index a48371bd7..000000000
Binary files a/src/win/icons/cdrom_empty_active.ico and /dev/null differ
diff --git a/src/win/icons/floppy_35_active.ico b/src/win/icons/floppy_35_active.ico
deleted file mode 100644
index 9600a3af0..000000000
Binary files a/src/win/icons/floppy_35_active.ico and /dev/null differ
diff --git a/src/win/icons/floppy_35_empty.ico b/src/win/icons/floppy_35_empty.ico
deleted file mode 100644
index ac47b4c55..000000000
Binary files a/src/win/icons/floppy_35_empty.ico and /dev/null differ
diff --git a/src/win/icons/floppy_35_empty_active.ico b/src/win/icons/floppy_35_empty_active.ico
deleted file mode 100644
index 4f0c928d6..000000000
Binary files a/src/win/icons/floppy_35_empty_active.ico and /dev/null differ
diff --git a/src/win/icons/floppy_525_active.ico b/src/win/icons/floppy_525_active.ico
deleted file mode 100644
index e19baa8a2..000000000
Binary files a/src/win/icons/floppy_525_active.ico and /dev/null differ
diff --git a/src/win/icons/floppy_525_empty.ico b/src/win/icons/floppy_525_empty.ico
deleted file mode 100644
index 8fa6c6b87..000000000
Binary files a/src/win/icons/floppy_525_empty.ico and /dev/null differ
diff --git a/src/win/icons/floppy_525_empty_active.ico b/src/win/icons/floppy_525_empty_active.ico
deleted file mode 100644
index 703d2a64f..000000000
Binary files a/src/win/icons/floppy_525_empty_active.ico and /dev/null differ
diff --git a/src/win/icons/hard_disk_active.ico b/src/win/icons/hard_disk_active.ico
deleted file mode 100644
index 9946a7f2e..000000000
Binary files a/src/win/icons/hard_disk_active.ico and /dev/null differ
diff --git a/src/win/icons/mo_active.ico b/src/win/icons/mo_active.ico
deleted file mode 100644
index 06b788b4d..000000000
Binary files a/src/win/icons/mo_active.ico and /dev/null differ
diff --git a/src/win/icons/mo_empty.ico b/src/win/icons/mo_empty.ico
deleted file mode 100644
index 30481522a..000000000
Binary files a/src/win/icons/mo_empty.ico and /dev/null differ
diff --git a/src/win/icons/mo_empty_active.ico b/src/win/icons/mo_empty_active.ico
deleted file mode 100644
index 29c82845b..000000000
Binary files a/src/win/icons/mo_empty_active.ico and /dev/null differ
diff --git a/src/win/icons/network_active.ico b/src/win/icons/network_active.ico
deleted file mode 100644
index 25caaadfa..000000000
Binary files a/src/win/icons/network_active.ico and /dev/null differ
diff --git a/src/win/icons/network_empty.ico b/src/win/icons/network_empty.ico
deleted file mode 100644
index 4a1a10284..000000000
Binary files a/src/win/icons/network_empty.ico and /dev/null differ
diff --git a/src/win/icons/zip_active.ico b/src/win/icons/zip_active.ico
deleted file mode 100644
index 40b3a5930..000000000
Binary files a/src/win/icons/zip_active.ico and /dev/null differ
diff --git a/src/win/icons/zip_empty.ico b/src/win/icons/zip_empty.ico
deleted file mode 100644
index 4123c7cc2..000000000
Binary files a/src/win/icons/zip_empty.ico and /dev/null differ
diff --git a/src/win/icons/zip_empty_active.ico b/src/win/icons/zip_empty_active.ico
deleted file mode 100644
index d57860b10..000000000
Binary files a/src/win/icons/zip_empty_active.ico and /dev/null differ
diff --git a/src/win/languages/cs-CZ.rc b/src/win/languages/cs-CZ.rc
deleted file mode 100644
index 353ea55b6..000000000
--- a/src/win/languages/cs-CZ.rc
+++ /dev/null
@@ -1,637 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Czech (Czech Republic) resources
-
-#ifdef _WIN32
-LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Akce"
-    BEGIN
-        MENUITEM "&Klávesnice vyžaduje záběr", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "&Pravý Ctrl je levý Alt", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "&Resetovat", IDM_ACTION_HRESET
-        MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-        MENUITEM "Ctrl+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "P&ozastavit", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "&Ukončit", IDM_ACTION_EXIT
-    END
-    POPUP "&Zobrazení"
-    BEGIN
-        MENUITEM "&Schovat stavový řádek", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "Schovat panel &nástrojů", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
-        MENUITEM "&Měnitelná velikost okna", IDM_VID_RESIZE
-        MENUITEM "&Pamatovat velikost a pozici", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "&Renderer"
-        BEGIN
-            MENUITEM "&SDL (Software)", IDM_VID_SDL_SW
-            MENUITEM "SDL (&Hardware)", IDM_VID_SDL_HW
-            MENUITEM "SDL (&OpenGL)", IDM_VID_SDL_OPENGL
-            MENUITEM "Open&GL (3.0 Core)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "&VNC", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "&Zadat velikost...", IDM_VID_SPECIFY_DIM
-        MENUITEM "&Dodržovat poměr stran 4:3", IDM_VID_FORCE43
-        POPUP "&Násobek zvětšení okna"
-        BEGIN
-            MENUITEM "&0.5x", IDM_VID_SCALE_1X
-            MENUITEM "&1x", IDM_VID_SCALE_2X
-            MENUITEM "1.&5x", IDM_VID_SCALE_3X
-            MENUITEM "&2x", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "Metoda &filtrování"
-        BEGIN
-            MENUITEM "&Nejbližší", IDM_VID_FILTER_NEAREST
-            MENUITEM "&Lineární", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "Š&kálování HiDPI", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "&Celá obrazovka\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "Režím roztá&hnutí při celé obrazovce"
-        BEGIN
-            MENUITEM "&Roztáhnout", IDM_VID_FS_FULL
-            MENUITEM "&4:3", IDM_VID_FS_43
-            MENUITEM "&Zachovat poměr stran", IDM_VID_FS_KEEPRATIO
-            MENUITEM "&Celočíselné škálování", IDM_VID_FS_INT
-        END
-        POPUP "Nastavení pro E&GA a (S)VGA"
-        BEGIN
-            MENUITEM "&Převrátit barvy", IDM_VID_INVERT
-            POPUP "&Typ VGA monitoru"
-            BEGIN
-                MENUITEM "RGB &barevný", IDM_VID_GRAY_RGB
-                MENUITEM "&Odstíny šedi", IDM_VID_GRAY_MONO
-                MENUITEM "&Jantarová obrazovka", IDM_VID_GRAY_AMBER
-                MENUITEM "&Zelená obrazovka", IDM_VID_GRAY_GREEN
-                MENUITEM "&Bílá obrazovka", IDM_VID_GRAY_WHITE
-            END
-            POPUP "Převod na &odstíny šedi"
-            BEGIN
-                MENUITEM "BT&601 (NTSC/PAL)", IDM_VID_GRAYCT_601
-                MENUITEM "BT&709 (HDTV)", IDM_VID_GRAYCT_709
-                MENUITEM "&Průměr", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Přesah obrazu CGA/PCjr/Tandy/E&GA/(S)VGA", IDM_VID_OVERSCAN
-        MENUITEM "&Upravit kontrast černobílé obrazovky", IDM_VID_CGACON
-    END
-    MENUITEM "&Média", IDM_MEDIA
-    POPUP "&Nástroje"
-    BEGIN
-        MENUITEM "&Nastavení...", IDM_CONFIG
-        MENUITEM "&Aktualizovat ikony stavového řádku", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "Pořídit &screenshot\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "&Předvolby...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "Povolit integraci s &Discordem", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "&Zesílení zvuku", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "Začít trace\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "Zastavit trace\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "Ná&pověda"
-    BEGIN
-        MENUITEM "&Dokumentace", IDM_DOCS
-        MENUITEM "&O programu 86Box", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nový obraz...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Existující obraz...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "Existující obraz (&ochrana proti zápisu)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Nahrávat", IDM_CASSETTE_RECORD
-        MENUITEM "&Přehrát", IDM_CASSETTE_PLAY
-        MENUITEM "Přetočit na &začátek", IDM_CASSETTE_REWIND
-        MENUITEM "Přetočit na &konec", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "&Vyjmout", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Obraz...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "&Vyjmout", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nový obraz...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Existující obraz...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "Existující obraz (&ochrana proti zápisu)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&xportovat do 86F...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "&Vyjmout", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Ztišit", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "&Vyjmout", IDM_CDROM_EMPTY
-        MENUITEM "&Načíst znova předchozí obraz", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "&Obraz...", IDM_CDROM_IMAGE
-        MENUITEM "&Složka...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nový obraz...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Existující obraz...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "Existující obraz (&ochrana proti zápisu)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Vyjmout", IDM_ZIP_EJECT
-        MENUITEM "&Načíst znova předchozí obraz", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nový obraz...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Existující obraz...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "Existující obraz (&ochrana proti zápisu)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Vyjmout", IDM_MO_EJECT
-        MENUITEM "&Načíst znova předchozí obraz", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Cílová snímková frekvence"
-    BEGIN
-        MENUITEM "&Synchronizovat s obrazem", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "&25 fps", IDM_VID_GL_FPS_25
-        MENUITEM "&30 fps", IDM_VID_GL_FPS_30
-        MENUITEM "&50 fps", IDM_VID_GL_FPS_50
-        MENUITEM "&60 fps", IDM_VID_GL_FPS_60
-        MENUITEM "&75 fps", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "&VSync", IDM_VID_GL_VSYNC
-    MENUITEM "&Zvolit shader...", IDM_VID_GL_SHADER
-    MENUITEM "&Odebrat shader", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "Předvolby"
-#define STR_SND_GAIN      "Zesílení zvuku"
-#define STR_NEW_FLOPPY    "Nový obraz"
-#define STR_CONFIG        "Nastavení"
-#define STR_SPECIFY_DIM   "Zadat rozměry hlavního okna"
-
-#define STR_OK            "OK"
-#define STR_CANCEL        "Storno"
-#define STR_GLOBAL        "Uložit toto nastavení jako &globální výchozí stav"
-#define STR_DEFAULT       "&Výchozí"
-#define STR_LANGUAGE      "Jazyk:"
-#define STR_ICONSET       "Sada ikon:"
-
-#define STR_GAIN          "Zesílení"
-
-#define STR_FILE_NAME     "Název souboru:"
-#define STR_DISK_SIZE     "Velikost disku:"
-#define STR_RPM_MODE      "Režím ot./m:"
-#define STR_PROGRESS      "Průběh:"
-
-#define STR_WIDTH         "Šířka:"
-#define STR_HEIGHT        "Výška:"
-#define STR_LOCK_TO_SIZE  "Uzamknout na tyto rozměry"
-
-#define STR_MACHINE_TYPE  "Typ počítače:"
-#define STR_MACHINE       "Počítač:"
-#define STR_CONFIGURE     "Nastavit"
-#define STR_CPU_TYPE      "Procesor:"
-#define STR_CPU_SPEED     "Rychlost:"
-#define STR_FPU           "Koprocesor:"
-#define STR_WAIT_STATES   "Čekací stavy:"
-#define STR_MB            "MB"
-#define STR_MEMORY        "Pamět:"
-#define STR_TIME_SYNC     "Synchronizace času"
-#define STR_DISABLED      "Vypnuta"
-#define STR_ENABLED_LOCAL "Zapnuta (místní čas)"
-#define STR_ENABLED_UTC   "Zapnuta (UTC)"
-#define STR_DYNAREC       "Dynamický překladač"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "Grafika:"
-#define STR_VIDEO_2       "Grafika 2:"
-#define STR_VOODOO        "Použít grafický akcelerátor Voodoo"
-#define STR_IBM8514       "Grafika IBM 8514/A"
-#define STR_XGA           "Grafika XGA"
-
-#define STR_MOUSE         "Myš:"
-#define STR_JOYSTICK      "Joystick:"
-#define STR_JOY1          "Joystick 1..."
-#define STR_JOY2          "Joystick 2..."
-#define STR_JOY3          "Joystick 3..."
-#define STR_JOY4          "Joystick 4..."
-
-#define STR_SOUND1        "Zvuková karta 1:"
-#define STR_SOUND2        "Zvuková karta 2:"
-#define STR_SOUND3        "Zvuková karta 3:"
-#define STR_SOUND4        "Zvuková karta 4:"
-#define STR_MIDI_OUT      "MIDI výstup:"
-#define STR_MIDI_IN       "MIDI vstup:"
-#define STR_MPU401        "Samostatný MPU-401"
-#define STR_FLOAT         "Použít zvuk FLOAT32"
-#define STR_FM_DRIVER     "FM synth driver"
-#define STR_FM_DRV_NUKED  "Nuked (přesnější)"
-#define STR_FM_DRV_YMFM   "YMFM (rychlejší)"
-
-#define STR_NET_TYPE      "Druh sítě:"
-#define STR_PCAP          "PCap zařízení:"
-#define STR_NET           "Síťový adaptér:"
-#define STR_NET1          "Network card 1:"
-#define STR_NET2          "Network card 2:"
-#define STR_NET3          "Network card 3:"
-#define STR_NET4          "Network card 4:"
-
-#define STR_COM1          "Zařízení na COM1:"
-#define STR_COM2          "Zařízení na COM2:"
-#define STR_COM3          "Zařízení na COM3:"
-#define STR_COM4          "Zařízení na COM4:"
-#define STR_LPT1          "Zařízení na LPT1:"
-#define STR_LPT2          "Zařízení na LPT2:"
-#define STR_LPT3          "Zařízení na LPT3:"
-#define STR_LPT4          "Zařízení na LPT4:"
-#define STR_SERIAL1       "Povolit port COM1"
-#define STR_SERIAL2       "Povolit port COM2"
-#define STR_SERIAL3       "Povolit port COM3"
-#define STR_SERIAL4       "Povolit port COM4"
-#define STR_PARALLEL1     "Povolit port LPT1"
-#define STR_PARALLEL2     "Povolit port LPT2"
-#define STR_PARALLEL3     "Povolit port LPT3"
-#define STR_PARALLEL4     "Povolit port LPT4"
-#define STR_SERIAL_PASS1  "Serial port passthrough 1"
-#define STR_SERIAL_PASS2  "Serial port passthrough 2"
-#define STR_SERIAL_PASS3  "Serial port passthrough 3"
-#define STR_SERIAL_PASS4  "Serial port passthrough 4"
-
-#define STR_HDC           "Řadič disku:"
-#define STR_FDC           "Disketový řadič:"
-#define STR_IDE_TER       "Třetí řadič IDE"
-#define STR_IDE_QUA       "Čtvrtý řadič IDE"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "Řadič 1:"
-#define STR_SCSI_2        "Řadič 2:"
-#define STR_SCSI_3        "Řadič 3:"
-#define STR_SCSI_4        "Řadič 4:"
-#define STR_CASSETTE      "Kazeta"
-
-#define STR_HDD           "Pevné disky:"
-#define STR_NEW           "&Nový..."
-#define STR_EXISTING      "&Existující..."
-#define STR_REMOVE        "&Odebrat"
-#define STR_BUS           "Sběrnice:"
-#define STR_CHANNEL       "Kanál:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Speed:"
-
-#define STR_SPECIFY       "&Zadat..."
-#define STR_SECTORS       "Sektory:"
-#define STR_HEADS         "Hlavy:"
-#define STR_CYLS          "Cylindry:"
-#define STR_SIZE_MB       "Velikost (MB):"
-#define STR_TYPE          "Typ:"
-#define STR_IMG_FORMAT    "Formát obrazu:"
-#define STR_BLOCK_SIZE    "Velikost bloků:"
-
-#define STR_FLOPPY_DRIVES "Disketové mechaniky:"
-#define STR_TURBO         "Turbo časování"
-#define STR_CHECKBPB      "Kontrola BPB"
-#define STR_CDROM_DRIVES  "Mechaniky CD-ROM:"
-#define STR_CD_SPEED      "Rychlost:"
-
-#define STR_MO_DRIVES     "Magnetooptické mechaniky:"
-#define STR_ZIP_DRIVES    "Mechaniky ZIP:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "ISA hodiny:"
-#define STR_ISAMEM        "ISA rozšíření paměti"
-#define STR_ISAMEM_1      "Karta 1:"
-#define STR_ISAMEM_2      "Karta 2:"
-#define STR_ISAMEM_3      "Karta 3:"
-#define STR_ISAMEM_4      "Karta 4:"
-#define STR_BUGGER        "Zařízení ISABugger"
-#define STR_POSTCARD      "Karta pro kódy POST"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Segoe UI"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "Chyba"
-    IDS_2050    "Kritická chyba"
-    IDS_2051    " - PAUSED"
-    IDS_2052    "Stiskněte Ctrl+Alt+PgDn pro návrat z režimu celé obrazovky."
-    IDS_2053    "Rychlost"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "Obrazy ZIP disků (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "86Box nenalezl žádné použitelné image pamětí ROM.\n\n<a href=""https://github.com/86Box/roms/releases/latest"">Stáhněte</a> sadu obrazů ROM a extrahujte ji do složky ""roms""."
-    IDS_2057    "(prázdné)"
-    IDS_2058    "Obrazy ZIP disků (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0All files (*.*)\0*.*\0"
-    IDS_2059    "Turbo"
-    IDS_2060    "Zap."
-    IDS_2061    "Vyp."
-    IDS_2062    "Všechny obrazy disků (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Základní sektorové obrazy (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Obrazy povrchu (*.86F)\0*.86F\0"
-    IDS_2063    "Počítač ""%hs"" není dostupný, jelikož chybí obraz jeho paměti ROM ve složce ""roms/machines"". Konfigurace se přepne na jiný dostupný počítač."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "Video adaptér ""%hs"" není dostupný, jelikož chybí obraz jeho paměti ROM ve složce ""roms/video"". Konfigurace se přepne na jiný dostupný adaptér."
-    IDS_2065    "Počítač"
-    IDS_2066    "Obraz"
-    IDS_2067    "Vstupní zařízení"
-    IDS_2068    "Zvuk"
-    IDS_2069    "Síť"
-    IDS_2070    "COM a LPT porty"
-    IDS_2071    "Řadiče úložiště"
-    IDS_2072    "Pevné disky"
-    IDS_2073    "Disketové a CD-ROM mechaniky"
-    IDS_2074    "Další vyměnitelná zařízení"
-    IDS_2075    "Jiné příslušenství"
-    IDS_2076    "Obrazy povrchu (*.86F)\0*.86F\0"
-    IDS_2077    "Klikněte pro zabraní myši"
-    IDS_2078    "Stiskněte F8+F12 pro uvolnění myši"
-    IDS_2079    "Stiskněte F8+F12 nebo prostřední tlačítko pro uvolnění myši"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "Sběrnice"
-    IDS_2082    "Soubor"
-    IDS_2083    "C"
-    IDS_2084    "H"
-    IDS_2085    "S"
-    IDS_2086    "MB"
-    IDS_2087    "Speed"
-    IDS_2088    "Kontrola BPB"
-    IDS_2089    "KB"
-    IDS_2090    "Nastala chyba při inicializaci video rendereru."
-    IDS_2091    "Výchozí"
-    IDS_2092    "%i čekací stav(y)"
-    IDS_2093    "Typ"
-    IDS_2094    "Nastala chyba při inicializaci knihovny PCap"
-    IDS_2095    "Nebyla nalezena žádná PCap zařízení"
-    IDS_2096    "Neplatné PCap zařízení"
-    IDS_2097    "Standardní 2tlačítkový joystick"
-    IDS_2098    "Standardní 4tlačítkový joystick"
-    IDS_2099    "Standardní 6tlačítkový joystick"
-    IDS_2100    "Standardní 8tlačítkový joystick"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Thrustmaster Flight Control System"
-    IDS_2104    "Žadné"
-    IDS_2105    "Nebylo možné nahrát klávesnicové zkratky."
-    IDS_2106    "Nebylo možné zaregistrovat raw input."
-    IDS_2107    "%u"
-    IDS_2108    "%u MB (CHS: %i, %i, %i)"
-    IDS_2109    "Disketová mechanika %i (%s): %ls"
-    IDS_2110    "Všechny obrazy (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Rozšířené sektorové obrazy (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Základní sektorové obrazy (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Obrazy magnetického toku (*.FDI)\0*.FDI\0Obrazy povrchu (*.86F;*.MFM)\0*.86F;*.MFM\0Všechny soubory (*.*)\0*.*\0"
-    IDS_2112    "Nastala chyba při inicializaci knihovny SDL, je potřeba SDL2.dll"
-    IDS_2113    "Opravdu chcete resetovat emulovaný počítač?"
-    IDS_2114    "Opravdu chcete ukončit 86Box?"
-    IDS_2115    "Nastala chyba při inicializaci knihovny Ghostscript"
-    IDS_2116    "MO %i (%ls): %ls"
-    IDS_2117    "Obrazy MO (*.IM?;*.MDI)\0*.IM?;*.MDI\0Všechny soubory (*.*)\0*.*\0"
-    IDS_2118    "Vítejte v programu 86Box!"
-    IDS_2119    "Vestavěný řadič"
-    IDS_2120    "Ukončit"
-    IDS_2121    "Nebyly nalezeny žádné obrazy ROM"
-    IDS_2122    "Chcete uložit nastavení?"
-    IDS_2123    "Pokračováním se resetuje emulovaný počítač."
-    IDS_2124    "Uložit"
-    IDS_2125    "O programu 86Box"
-    IDS_2126    "86Box v" EMU_VERSION
-
-    IDS_2127    "Emulátor starých počítačů\n\nAutoři: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nZveřejněno pod licencí GNU General Public License verze 2 nebo novější. Viz soubor LICENSE pro více informací."
-    IDS_2128    "OK"
-    IDS_2129    "Hardware není dostupný"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "Ujistěte se, že je nainstalován " LIB_NAME_PCAP " a používáte síťové připojení s ním kompatibilní."
-    IDS_2131    "Neplatná konfigurace"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " je potřeba pro automatický převod PostScript dokumentů do PDF.\n\nJakékoliv dokumenty vytisknuté přes obecnou PostScriptovou tiskárnu budou uloženy jako PostScript (.ps) soubory."
-    IDS_2135    "Vstup do režimu celé obrazovky"
-    IDS_2136    "Nezobrazovat dále tuto zprávu"
-    IDS_2137    "Neukončovat"
-    IDS_2138    "Resetovat"
-    IDS_2139    "Neresetovat"
-    IDS_2140    "Obraz magnetooptického disku (*.IM?;*.MDI)\0*.IM?;*.MDI\0Všechny soubory (*.*)\0*.*\0"
-    IDS_2141    "Obraz CD-ROM disku (*.ISO;*.CUE)\0*.ISO;*.CUE\0Všechny soubory (*.*)\0*.*\0"
-    IDS_2142    "Konfigurace zařízení %hs"
-    IDS_2143    "Monitor je v režimu spánku"
-    IDS_2144    "Shadery OpenGL (*.GLSL)\0*.GLSL\0All files (*.*)\0*.*\0"
-    IDS_2145    "Možnosti OpenGL"
-    IDS_2146    "Pokoušíte se spustit nepodporovanou konfiguraci"
-    IDS_2147    "Pro tuto konfiguraci bylo vypnuto filtrování procesorů podle zvoleného počítače.\n\nToto umožňuje zvolit procesor, který by jinak se zvoleným počítačem nebyl kompatibilní. Můžou však nastat potíže s BIOSem nebo jiným softwarem.\n\nPovolení tohoto nastavení není oficiálně podporováno a jakákoliv hlášení o chybách mohou být uzavřeny jako neplatné."
-    IDS_2148    "Pokračovat"
-    IDS_2149    "Kazeta: %s"
-    IDS_2150    "Kazetové nahrávky (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0Všechny soubory (*.*)\0*.*\0"
-    IDS_2151    "Cartridge %i: %ls"
-    IDS_2152    "Obrazy cartridge (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0Všechny soubory (*.*)\0*.*\0"
-    IDS_2153    "Error initializing renderer"
-    IDS_2154    "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-    IDS_2155    "Obnovit"
-    IDS_2156    "Pozastavit"
-    IDS_2157    "Stisknout Ctrl+Alt+Delete"
-    IDS_2158    "Stisknout Ctrl+Alt+Esc"
-    IDS_2159    "Resetovat"
-    IDS_2160    "Vypnout skrze rozhraní ACPI"
-    IDS_2161    "Nastavení"
-    IDS_2162    "Type"
-    IDS_2163    "No Dynarec"
-    IDS_2164    "Old Dynarec"
-    IDS_2165    "New Dynarec"
-    IDS_2166    "Video card #2 ""%hs"" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
-    IDS_2167    "Failed to initialize network driver"
-    IDS_2168    "The network configuration will be switched to the null driver"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "Pevný disk (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "CD-ROM mechaniky pro rozhraní MFM/RLL nebo ESDI nikdy neexistovaly"
-    IDS_4100    "Vlastní..."
-    IDS_4101    "Vlastní (velký)..."
-    IDS_4102    "Přidat nový pevný disk"
-    IDS_4103    "Přidat existující pevný disk"
-    IDS_4104    "Obraz disku formátu HDI nemůžou být větší než 4 GB."
-    IDS_4105    "Obraz disku nemůžou být větší než 127 GB."
-    IDS_4106    "Obrazy pevného disku (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0Všechny soubory (*.*)\0*.*\0"
-    IDS_4107    "Nebylo možné přečíst soubor"
-    IDS_4108    "Nebylo možné zapisovat do souboru"
-    IDS_4109    "Obraz disku ve formátu HDI nebo HDX s velikostí sektoru jinou než 512 bajtů nejsou podporovány."
-    IDS_4110    "USB zatím není podporováno."
-    IDS_4111    "Soubor obrazu disku již existuje"
-    IDS_4112    "Zadejte platný název souboru."
-    IDS_4113    "Obraz disku byl vytvořen"
-    IDS_4114    "Ujistěte se, že soubor existuje a lze jej přečíst."
-    IDS_4115    "Ujistěte se, že se do složky, kde se má soubor uložit, dá zapisovat."
-    IDS_4116    "Obraz disku je příliš velký"
-    IDS_4117    "Nezapomeňte nově vytvořený disk rozdělit a naformátovat."
-    IDS_4118    "Zvolený soubor bude přepsán. Opravdu jej chcete použít?"
-    IDS_4119    "Nepodporovaný obraz disku"
-    IDS_4120    "Přepsat"
-    IDS_4121    "Nepřepisovat"
-    IDS_4122    "Surový obraz (.img)"
-    IDS_4123    "HDI obraz (.hdi)"
-    IDS_4124    "HDX obraz (.hdx)"
-    IDS_4125    "VHD s pevnou velikostí (.vhd)"
-    IDS_4126    "VHD s dynamickou velikostí (.vhd)"
-    IDS_4127    "Rozdílový VHD (.vhd)"
-    IDS_4128    "Velké bloky (2 MB)"
-    IDS_4129    "Malé bloky (512 KB)"
-    IDS_4130    "Soubory VHD (*.VHD)\0*.VHD\0Všechny soubory (*.*)\0*.*\0"
-    IDS_4131    "Vyberte nadřazený virtuální disk"
-    IDS_4132    "To může znamenat, že se obsahy nadřazeného disku změnily po vytvoření rozdílového disku.\n\nTato chyba také může nastat, pokud byl obraz disku kopírován nebo přesunut, nebo kvůli chybě v programu, který jej vytvořil.\n\nChcete časová razítka opravit?"
-    IDS_4133    "Časová razítka nadřazeného a podřazeného disku nesouhlasí"
-    IDS_4134    "Nebylo možné opravit časové razítko VHD."
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "Vypnuto"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "Vypnuto"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 kB"
-    IDS_5889    "180 kB"
-    IDS_5890    "320 kB"
-    IDS_5891    "360 kB"
-    IDS_5892    "640 kB"
-    IDS_5893    "720 kB"
-    IDS_5894    "1.2 MB"
-    IDS_5895    "1.25 MB"
-    IDS_5896    "1.44 MB"
-    IDS_5897    "DMF (cluster 1024)"
-    IDS_5898    "DMF (cluster 2048)"
-    IDS_5899    "2.88 MB"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5"" 128 MB (ISO 10090)"
-    IDS_5903    "3.5"" 230 MB (ISO 13963)"
-    IDS_5904    "3.5"" 540 MB (ISO 15498)"
-    IDS_5905    "3.5"" 640 MB (ISO 15498)"
-    IDS_5906    "3.5"" 1.3 GB (GigaMO)"
-    IDS_5907    "3.5"" 2.3 GB (GigaMO 2)"
-    IDS_5908    "5.25"" 600 MB"
-    IDS_5909    "5.25"" 650 MB"
-    IDS_5910    "5.25"" 1 GB"
-    IDS_5911    "5.25"" 1.3 GB"
-
-    IDS_6144    "Dokonalé otáčky za minutu"
-    IDS_6145    "1% pod dokonalými ot./m"
-    IDS_6146    "1.5% pod dokonalými ot./m"
-    IDS_6147    "2% pod dokonalými ot./m"
-
-    IDS_7168    "(Výchozí nastavení systému)"
-END
-#define IDS_LANG_ENUS IDS_7168
-
-// Czech (Czech Republic) resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/de-DE.rc b/src/win/languages/de-DE.rc
deleted file mode 100644
index 0fe48b0ef..000000000
--- a/src/win/languages/de-DE.rc
+++ /dev/null
@@ -1,637 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// German (de-DE) resources
-
-#ifdef _WIN32
-LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Aktionen"
-    BEGIN
-        MENUITEM "&Tastatur benötigt das Einfangen des Mauszeigers", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "&Die rechte Strg-Taste ist die Linke Alt-Taste", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "&Hard-Reset...", IDM_ACTION_HRESET
-        MENUITEM "&Strg+Alt+Entf\tStrg+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-    MENUITEM "Strg+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "&Pause", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "Be&enden...", IDM_ACTION_EXIT
-    END
-    POPUP "&Ansicht"
-    BEGIN
-        MENUITEM "&Statusleiste ausblenden", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "&Werkzeugleiste ausblenden", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
-        MENUITEM "&Größenverstellbares Fenster", IDM_VID_RESIZE
-        MENUITEM "&Größe && Position merken",  IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "Re&nderer"
-        BEGIN
-            MENUITEM "&SDL (Software)", IDM_VID_SDL_SW
-            MENUITEM "SDL (&Hardware)", IDM_VID_SDL_HW
-            MENUITEM "SDL (&OpenGL)", IDM_VID_SDL_OPENGL
-            MENUITEM "Open&GL (3.0-Kern)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "&VNC", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Fenstergröße einstellen...", IDM_VID_SPECIFY_DIM
-        MENUITEM "&4:3-Seitenverhältnis erzwingen", IDM_VID_FORCE43
-        POPUP "&Fensterskalierungsfaktor"
-        BEGIN
-            MENUITEM "&0,5x", IDM_VID_SCALE_1X
-            MENUITEM "&1x", IDM_VID_SCALE_2X
-            MENUITEM "1,&5x", IDM_VID_SCALE_3X
-            MENUITEM "&2x", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "Filteringmethode"
-        BEGIN
-            MENUITEM "&Nearest", IDM_VID_FILTER_NEAREST
-            MENUITEM "&Linear", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "Hi&DPI-Skalierung", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "&Vollbild\tStrg+Alt+Bild auf", IDM_VID_FULLSCREEN
-        POPUP "&Stretching-Modus im Vollbildmodus"
-        BEGIN
-            MENUITEM "&Vollbild-Stretching", IDM_VID_FS_FULL
-            MENUITEM "&4:3-Seitenverhältnis erzwingen", IDM_VID_FS_43
-            MENUITEM "&Quadratische Pixel (Seitenverhältnis beibehalten)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "&Integer-Skalierung", IDM_VID_FS_INT
-        END
-        POPUP "E&GA/(S)VGA-Einstellungen"
-        BEGIN
-            MENUITEM "&Invertierte VGA-Anzeige", IDM_VID_INVERT
-            POPUP "&VGA-Bildschirmtyp"
-            BEGIN
-                MENUITEM "&RGB-Farbe", IDM_VID_GRAY_RGB
-                MENUITEM "&RGB-Graustufen", IDM_VID_GRAY_MONO
-                MENUITEM "&Bernstein-Monitor", IDM_VID_GRAY_AMBER
-                MENUITEM "&Grüner Monitor", IDM_VID_GRAY_GREEN
-                MENUITEM "&Weißer Monitor", IDM_VID_GRAY_WHITE
-            END
-            POPUP "Methode zur &Graustufenkonversion"
-            BEGIN
-                MENUITEM "BT&601 (NTSC/PAL)", IDM_VID_GRAYCT_601
-                MENUITEM "BT&709 (HDTV)", IDM_VID_GRAYCT_709
-                MENUITEM "&Durchschnittsmethode", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Overscan für CGA/PCjr/Tandy/E&GA/(S)VGA-Displays", IDM_VID_OVERSCAN
-        MENUITEM "Kontrast für &monochrome Displays ändern", IDM_VID_CGACON
-    END
-    MENUITEM "&Medien", IDM_MEDIA
-    POPUP "&Werkzeuge"
-    BEGIN
-        MENUITEM "&Optionen...", IDM_CONFIG
-        MENUITEM "&Statusleistenicons aktualisieren", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "S&creenshot aufnehmen\tStrg+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "&Einstellungen...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "&Discord-Integration aktivieren", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "&Klangverstärkung...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "Tracing starten\tStrg+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "Tracing beenden\tStrg+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "&Hilfe"
-    BEGIN
-        MENUITEM "&Dokumentation...", IDM_DOCS
-        MENUITEM "&Über 86Box...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Neues Image...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Bestehendes Image...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "Bestehendes Image (&schreibgeschützt)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Aufnehmen", IDM_CASSETTE_RECORD
-        MENUITEM "&Abspielen", IDM_CASSETTE_PLAY
-        MENUITEM "&An den Anfang zurückspulen", IDM_CASSETTE_REWIND
-        MENUITEM "&An das Ende vorspulen", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "A&uswerfen", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Cartridgeimage...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "A&uswerfen", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Neues Image...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Bestehendes Image...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "Bestehendes Image (&schreibgeschützt)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&In das 86F-Format e&xportieren...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "&Auswerfen", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Stummschalten", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "L&eer", IDM_CDROM_EMPTY
-        MENUITEM "&Voriges Image neu laden", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "&Image...", IDM_CDROM_IMAGE
-        MENUITEM "&Verzeichnis...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Neues Image...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Bestehendes Image...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "Bestehendes Image (&schreibgeschützt)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "A&uswerfen", IDM_ZIP_EJECT
-        MENUITEM "&Voriges Image neu laden", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Neues Image...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Bestehendes Image...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "Bestehendes Image (&schreibgeschützt)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Auswerfen", IDM_MO_EJECT
-        MENUITEM "&Bestehendes Image erneut laden", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "Ziel&framerate"
-    BEGIN
-        MENUITEM "&Mit Videoausgabe synchronisieren", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "&25 fps", IDM_VID_GL_FPS_25
-        MENUITEM "&30 fps", IDM_VID_GL_FPS_30
-        MENUITEM "&50 fps", IDM_VID_GL_FPS_50
-        MENUITEM "&60 fps", IDM_VID_GL_FPS_60
-        MENUITEM "&75 fps", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "&VSync", IDM_VID_GL_VSYNC
-    MENUITEM "&Shader auswählen...", IDM_VID_GL_SHADER
-    MENUITEM "&Shader entfernen", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "Einstellungen"
-#define STR_SND_GAIN      "Klangverstärkung"
-#define STR_NEW_FLOPPY    "Neues Image"
-#define STR_CONFIG        "Optionen"
-#define STR_SPECIFY_DIM   "Fenstergröße einstellen"
-
-#define STR_OK            "OK"
-#define STR_CANCEL        "Abbrechen"
-#define STR_GLOBAL        "Einstellungen als &globalen Standard speichern"
-#define STR_DEFAULT       "&Standard"
-#define STR_LANGUAGE      "Sprache:"
-#define STR_ICONSET       "Icon-Satz:"
-
-#define STR_GAIN          "Verstärkung"
-
-#define STR_FILE_NAME     "Dateiname:"
-#define STR_DISK_SIZE     "Plattengröße:"
-#define STR_RPM_MODE      "Drehzahlmodus:"
-#define STR_PROGRESS      "Fortschritt:"
-
-#define STR_WIDTH         "Breite:"
-#define STR_HEIGHT        "Höhe:"
-#define STR_LOCK_TO_SIZE  "Feste Größe"
-
-#define STR_MACHINE_TYPE  "Systemtyp:"
-#define STR_MACHINE       "System:"
-#define STR_CONFIGURE     "Einstellen"
-#define STR_CPU_TYPE      "CPU-Typ:"
-#define STR_CPU_SPEED     "Takt:"
-#define STR_FPU           "FPU-Einheit:"
-#define STR_WAIT_STATES   "Wartezustände:"
-#define STR_MB            "MB"
-#define STR_MEMORY        "Hauptspeicher:"
-#define STR_TIME_SYNC     "Zeitsynchronisierung"
-#define STR_DISABLED      "Deaktiviert"
-#define STR_ENABLED_LOCAL "Aktiviert (Lokale Uhrzeit)"
-#define STR_ENABLED_UTC   "Aktiviert (UTC)"
-#define STR_DYNAREC       "Dynamischer Recompiler"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "Videokarte:"
-#define STR_VIDEO_2       "Videokarte 2:"
-#define STR_VOODOO        "Voodoo-Grafik"
-#define STR_IBM8514       "IBM 8514/A-Grafik"
-#define STR_XGA           "XGA-Grafik"
-
-#define STR_MOUSE         "Maus:"
-#define STR_JOYSTICK      "Joystick:"
-#define STR_JOY1          "Joystick 1..."
-#define STR_JOY2          "Joystick 2..."
-#define STR_JOY3          "Joystick 3..."
-#define STR_JOY4          "Joystick 4..."
-
-#define STR_SOUND1        "Soundkarte 1:"
-#define STR_SOUND2        "Soundkarte 2:"
-#define STR_SOUND3        "Soundkarte 3:"
-#define STR_SOUND4        "Soundkarte 4:"
-#define STR_MIDI_OUT      "MIDI Out-Gerät:"
-#define STR_MIDI_IN       "MIDI In-Gerät:"
-#define STR_MPU401        "Standalone-MPU-401-Gerät"
-#define STR_FLOAT         "FLOAT32-Wiedergabe benutzen"
-#define STR_FM_DRIVER     "FM-Synth-Treiber"
-#define STR_FM_DRV_NUKED  "Nuked (genauer)"
-#define STR_FM_DRV_YMFM   "YMFM (schneller)"
-
-#define STR_NET_TYPE      "Netzwerktyp:"
-#define STR_PCAP          "PCap-Gerät:"
-#define STR_NET           "Netzwerkadapter:"
-#define STR_NET1          "Network card 1:"
-#define STR_NET2          "Network card 2:"
-#define STR_NET3          "Network card 3:"
-#define STR_NET4          "Network card 4:"
-
-#define STR_COM1          "COM1-Gerät:"
-#define STR_COM2          "COM2-Gerät:"
-#define STR_COM3          "COM3-Gerät:"
-#define STR_COM4          "COM4-Gerät:"
-#define STR_LPT1          "LPT1-Gerät:"
-#define STR_LPT2          "LPT2-Gerät:"
-#define STR_LPT3          "LPT3-Gerät:"
-#define STR_LPT4          "LPT4-Gerät:"
-#define STR_SERIAL1       "Serielle Schnittstelle 1"
-#define STR_SERIAL2       "Serielle Schnittstelle 2"
-#define STR_SERIAL3       "Serielle Schnittstelle 3"
-#define STR_SERIAL4       "Serielle Schnittstelle 4"
-#define STR_PARALLEL1     "Parallelport 1"
-#define STR_PARALLEL2     "Parallelport 2"
-#define STR_PARALLEL3     "Parallelport 3"
-#define STR_PARALLEL4     "Parallelport 4"
-#define STR_SERIAL_PASS1  "Serial port passthrough 1"
-#define STR_SERIAL_PASS2  "Serial port passthrough 2"
-#define STR_SERIAL_PASS3  "Serial port passthrough 3"
-#define STR_SERIAL_PASS4  "Serial port passthrough 4"
-
-#define STR_HDC           "HDD-Controller:"
-#define STR_FDC           "FD-Controller:"
-#define STR_IDE_TER       "Tertiärer IDE-Controller"
-#define STR_IDE_QUA       "Quartärer IDE-Controller"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "Controller 1:"
-#define STR_SCSI_2        "Controller 2:"
-#define STR_SCSI_3        "Controller 3:"
-#define STR_SCSI_4        "Controller 4:"
-#define STR_CASSETTE      "Kassette"
-
-#define STR_HDD           "Festplatten:"
-#define STR_NEW           "&Neu..."
-#define STR_EXISTING      "&Vorhanden..."
-#define STR_REMOVE        "&Entfernen"
-#define STR_BUS           "Bus:"
-#define STR_CHANNEL       "Kanal:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Speed:"
-
-#define STR_SPECIFY       "&Festlegen..."
-#define STR_SECTORS       "Sektoren:"
-#define STR_HEADS         "Köpfe:"
-#define STR_CYLS          "Zylinder:"
-#define STR_SIZE_MB       "Größe (MB):"
-#define STR_TYPE          "Typ:"
-#define STR_IMG_FORMAT    "Imageformat:"
-#define STR_BLOCK_SIZE    "Blockgröße:"
-
-#define STR_FLOPPY_DRIVES "Diskettenlaufwerke:"
-#define STR_TURBO         "Turbo-Timings"
-#define STR_CHECKBPB      "BPB überprüfen"
-#define STR_CDROM_DRIVES  "CD-ROM-Laufwerke:"
-#define STR_CD_SPEED      "Geschwindigkeit:"
-
-#define STR_MO_DRIVES     "MO-Laufwerke:"
-#define STR_ZIP_DRIVES    "ZIP-Laufwerke:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "ISA-Echtzeituhr:"
-#define STR_ISAMEM        "ISA-Speichererweiterung:"
-#define STR_ISAMEM_1      "Steckkarte 1:"
-#define STR_ISAMEM_2      "Steckkarte 2:"
-#define STR_ISAMEM_3      "Steckkarte 3:"
-#define STR_ISAMEM_4      "Steckkarte 4:"
-#define STR_BUGGER        "ISABugger-Gerät"
-#define STR_POSTCARD      "POST-Code-Karte"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Segoe UI"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "Fehler"
-    IDS_2050    "Fataler Fehler"
-    IDS_2051    " - PAUSED"
-    IDS_2052    "Bitte Strg+Alt+Bild ab zur Rückkehr in den Fenstermodus drücken."
-    IDS_2053    "Geschwindigkeit"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "ZIP-Images (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "86Box konnte keine nutzbaren ROM-Dateien finden.\n\nBitte besuchen Sie <a href=""https://github.com/86Box/roms/releases/latest"">download</a>, laden ein ROM-Set herunter und extrahieren dies in das ""roms""-Verzeichnis."
-    IDS_2057    "(leer)"
-    IDS_2058    "ZIP-Images (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0Alle Dateien (*.*)\0*.*\0"
-    IDS_2059    "Turbo"
-    IDS_2060    "An"
-    IDS_2061    "Aus"
-    IDS_2062    "Alle Images (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Basissektorimages (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Oberflächenimages (*.86F)\0*.86F\0"
-    IDS_2063    "Das System ""%hs"" ist aufgrund von fehlenden ROMs im Verzeichnis roms/machines nicht verfügbar. Es wird auf ein verfügbares System gewechselt."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "Die Videokarte ""%hs"" ist aufgrund von fehlenden ROMs im Verzeichnis roms/video nicht verfügbar. Es wird auf eine verfügbare Videokarte gewechselt."
-    IDS_2065    "System"
-    IDS_2066    "Anzeige"
-    IDS_2067    "Eingabegeräte"
-    IDS_2068    "Multimedia"
-    IDS_2069    "Netzwerk"
-    IDS_2070    "Anschlüsse (COM & LPT)"
-    IDS_2071    "Speichercontroller"
-    IDS_2072    "Festplatten"
-    IDS_2073    "Disketten- & CD-ROM-Laufwerke"
-    IDS_2074    "Andere Wechsellaufwerke"
-    IDS_2075    "Andere Peripheriegeräte"
-    IDS_2076    "Oberflächenimages (*.86F)\0*.86F\0"
-    IDS_2077    "Zum Einfangen des Mauszeigers bitte klicken"
-    IDS_2078    "Bitte F8+F12 zur Mausfreigabe drücken"
-    IDS_2079    "Bitte F8+F12 oder die mittlere Maustaste zur Mausfreigabe drücken"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "Bus"
-    IDS_2082    "Datei"
-    IDS_2083    "C"
-    IDS_2084    "H"
-    IDS_2085    "S"
-    IDS_2086    "MB"
-    IDS_2087    "Speed"
-    IDS_2088    "BPB prüfen"
-    IDS_2089    "KB"
-    IDS_2090    "Der Videorenderer konnte nicht initialisiert werden."
-    IDS_2091    "Standard"
-    IDS_2092    "%i Wartezustände"
-    IDS_2093    "Typ"
-    IDS_2094    "PCap konnte nicht eingerichtet werden"
-    IDS_2095    "Keine PCap-Geräte gefunden"
-    IDS_2096    "Ungültiges PCap-Gerät"
-    IDS_2097    "Standard 2-Tasten-Joystick(s)"
-    IDS_2098    "Standard 4-Tasten-Joystick"
-    IDS_2099    "Standard 6-Tasten-Joystick"
-    IDS_2100    "Standard 8-Tasten-Joystick"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Thrustmaster Flight Control System"
-    IDS_2104    "Ohne"
-    IDS_2105    "Tastaturbeschleuniger konnten nicht geladen werden."
-    IDS_2106    "Roheingaben konnten nicht registriert werden."
-    IDS_2107    "%u"
-    IDS_2108    "%u MB (CHS: %i, %i, %i)"
-    IDS_2109    "Diskette %i (%s): %ls"
-    IDS_2110    "Alle Images (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Fortgeschrittene Sektorimages (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Basissektorimages (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Fluximages (*.FDI)\0*.FDI\0Oberflächenimages (*.86F;*.MFM)\0*.86F;*.MFM\0Alle Dateien (*.*)\0*.*\0"
-    IDS_2112    "SDL konnte nicht initialisiert werden, die Datei SDL2.dll wird benötigt"
-    IDS_2113    "Sind Sie sich sicher, dass Sie einen Hard-Reset für das emulierte System durchführen wollen?"
-    IDS_2114    "Sind Sie sich sicher, dass Sie 86Box beenden wollen?"
-    IDS_2115    "Ghostscript konnte nicht initialisiert werden"
-    IDS_2116    "MO %i (%ls): %ls"
-    IDS_2117    "MO-Images (*.IM?;*.MDI)\0*.IM?;*.MDI\0Alle Dateien (*.*)\0*.*\0"
-    IDS_2118    "Willkommen bei 86Box!"
-    IDS_2119    "Interner Controller"
-    IDS_2120    "Beenden"
-    IDS_2121    "Keine ROMs gefunden"
-    IDS_2122    "Möchten Sie die Einstellungen speichern?"
-    IDS_2123    "Dies wird zu einem Hard-Reset des emulierten Systems führen."
-    IDS_2124    "Speichern"
-    IDS_2125    "Über 86Box"
-    IDS_2126    "86Box Version " EMU_VERSION
-
-    IDS_2127    "Ein Emulator für alte Computer\n\nAutoren: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne sowie andere.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho sowie andere.\n\nÜbersetzt von: dob205\n\nVeröffentlicht unter der GNU General Public License in der Version 2 oder neuer. Siehe LICENSE für mehr Informationen."
-    IDS_2128    "OK"
-    IDS_2129    "Hardware nicht verfügbar"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "Bitte stellen Sie sicher, dass " LIB_NAME_PCAP " installiert ist und sie eine " LIB_NAME_PCAP "-kompatible Netzwerkverbindung nutzen."
-    IDS_2131    "Ungültige Konfiguration"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " wird zur automatischen Konversion von PostScript-Dateien in das PDF-Format benötigt.\n\nSämtliche an den generischen PostScript-Drucker gesendete Dateien werden als PostScript (.ps)-Dateien gesichert."
-    IDS_2135    "Vollbildmodus wird aktiviert"
-    IDS_2136    "Diese Nachricht nicht mehr anzeigen"
-    IDS_2137    "Nicht beenden"
-    IDS_2138    "Zurücksetzen"
-    IDS_2139    "Nicht zurücksetzen"
-    IDS_2140    "MO-Images (*.IM?;*.MDI)\0*.IM?;*.MDI\0Alle Dateien (*.*)\0*.*\0"
-    IDS_2141    "CD-ROM-Images (*.ISO;*.CUE)\0*.ISO;*.CUE\0Alle Dateien (*.*)\0*.*\0"
-    IDS_2142    "%hs-Gerätekonfiguration"
-    IDS_2143    "Monitor im Standbymodus"
-    IDS_2144    "OpenGL-Shader (*.GLSL)\0*.GLSL\0Alle Dateien (*.*)\0*.*\0"
-    IDS_2145    "OpenGL-Optionen"
-    IDS_2146    "Sie laden gerade eine nicht unterstützte Konfiguration"
-    IDS_2147    "Das Filtern der CPU-Typen basierend auf dem ausgewählten System ist für dieses System deaktiviert.\n\nDies ermöglicht es, dass man eine sonst nicht mit dem ausgewählten System inkompatible CPU auswählen kann. Allerdings kann dies zu Inkompatiblilitäten mit dem BIOS des Systems oder anderen Programmen kommen.\n\nDas Aktivieren dieser Einstellung wird nicht unterstützt und sämtliche Bugreports können als ""invalid"" geschlossen werden."
-    IDS_2148    "Fortfahren"
-    IDS_2149    "Kassette: %s"
-    IDS_2150    "Kassettenimages (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0Alle Dateien (*.*)\0*.*\0"
-    IDS_2151    "Cartridge %i: %ls"
-    IDS_2152    "Cartridgeimages (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0Alle Dateien (*.*)\0*.*\0"
-    IDS_2153    "Fehler bei der Rendererinitialisierung"
-    IDS_2154    "Der OpenGL (3.0-Kern)-Renderer konnte nicht initialisiert werden. Bitte benutzen Sie einen anderen Renderer."
-    IDS_2155    "Fortsetzen"
-    IDS_2156    "Pausieren"
-    IDS_2157    "Strg+Alt+Entf drücken"
-    IDS_2158    "Strg+Alt+Esc drücken"
-    IDS_2159    "Hard-Reset"
-    IDS_2160    "ACPI-basiertes Herunterfahren"
-    IDS_2161    "Optionen"
-    IDS_2162    "Type"
-    IDS_2163    "No Dynarec"
-    IDS_2164    "Old Dynarec"
-    IDS_2165    "New Dynarec"
-    IDS_2166    "Video card #2 ""%hs"" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
-    IDS_2167    "Failed to initialize network driver"
-    IDS_2168    "The network configuration will be switched to the null driver"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "Festplatte (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "MFM/RLL- oder ESDI CD-ROM-Laufwerke hat es niemals gegeben"
-    IDS_4100    "Angepasst..."
-    IDS_4101    "Angepasst (Groß)..."
-    IDS_4102    "Neue Festplatte hinzufügen"
-    IDS_4103    "Bestehende Festplatte hinzufügen"
-    IDS_4104    "HDI-Diskimages können nicht größer als 4 GB groß sein."
-    IDS_4105    "Festplattenimages können nicht größer als 127 GB groß sein."
-    IDS_4106    "Festplattenimages (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0Alle Dateien (*.*)\0*.*\0"
-    IDS_4107    "Die Datei konnte nicht gelesen werden"
-    IDS_4108    "Die Datei konnte nicht beschrieben werden"
-    IDS_4109    "HDI- oder HDX-Images mit einer Sektorgröße größer als 512 kB werden nicht unterstützt."
-    IDS_4110    "USB wird noch nicht unterstützt"
-    IDS_4111    "Die Festplattenimagedatei existiert bereits"
-    IDS_4112    "Bitte geben Sie einen gültigen Dateinamen ein."
-    IDS_4113    "Disk-Image wurde erstellt"
-    IDS_4114    "Bitte stellen Sie sicher, dass die Datei existiert und lesbar ist."
-    IDS_4115    "Bitte stellen Sie sicher, dass die Datei in ein Verzeichnis mit Schreibberechtigungen gespeichert wird."
-    IDS_4116    "Festplattenimage ist zu groß"
-    IDS_4117    "Bitte denken Sie an das Partitionieren und Formatieren des neu erstellten Laufwerks."
-    IDS_4118    "Die ausgewählte Datei wird überschrieben. Möchten Sie diese Datei nutzen?"
-    IDS_4119    "Nicht unterstütztes Festplattenimage"
-    IDS_4120    "Überschreiben"
-    IDS_4121    "Nicht überschreiben"
-    IDS_4122    "Rohdatenimages (.img)"
-    IDS_4123    "HDI-Images (.hdi)"
-    IDS_4124    "HDX-Images (.hdx)"
-    IDS_4125    "VHD mit fester Größe (.vhd)"
-    IDS_4126    "VHD mit dynamischer Größe (.vhd)"
-    IDS_4127    "Differenzierende VHD (.vhd)"
-    IDS_4128    "Große Blöcke (2 MB)"
-    IDS_4129    "Kleine Blöcke (512 KB)"
-    IDS_4130    "VHD-Dateien (*.VHD)\0*.VHD\0Alle Dateien (*.*)\0*.*\0"
-    IDS_4131    "Eltern-VHD-Datei bitte auswählen"
-    IDS_4132    "Dies bedeutet, dass das Elternimage nach der Erstellung des differenzierenden Images erzeugt wurde.\n\nDies kann auch passieren, falls die Image-Dateien verschoben oder kopiert wurden. Ebenso kann auch dies durch einen Bug im Programm, welches das Image erstellt hat, passieren.\n\nMöchten Sie die Zeitstempel korrigieren?"
-    IDS_4133    "Die Zeitstempel der Eltern- und der Kindesplatte stimmen nicht überein"
-    IDS_4134    "Der Zeitstempel der VHD konnte nicht korrigiert werden."
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "Deaktiviert"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "Deaktiviert"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 kB"
-    IDS_5889    "180 kB"
-    IDS_5890    "320 kB"
-    IDS_5891    "360 kB"
-    IDS_5892    "640 kB"
-    IDS_5893    "720 kB"
-    IDS_5894    "1,2 MB"
-    IDS_5895    "1,25 MB"
-    IDS_5896    "1,44 MB"
-    IDS_5897    "DMF (1024 Cluster)"
-    IDS_5898    "DMF (2048 Cluster)"
-    IDS_5899    "2,88 MB"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3,5-Zoll 128 MB (ISO 10090)"
-    IDS_5903    "3,5-Zoll 230 MB (ISO 13963)"
-    IDS_5904    "3,5-Zoll 540 MB (ISO 15498)"
-    IDS_5905    "3,5-Zoll 640 MB (ISO 15498)"
-    IDS_5906    "3,5-Zoll 1,3 GB (GigaMO)"
-    IDS_5907    "3,5-Zoll 2,3 GB (GigaMO 2)"
-    IDS_5908    "5,25-Zoll 600 MB"
-    IDS_5909    "5,25-Zoll 650 MB"
-    IDS_5910    "5,25-Zoll 1 GB"
-    IDS_5911    "5,25-Zoll 1,3 GB"
-
-    IDS_6144    "Perfekte Drehzahl"
-    IDS_6145    "1% unterhalb der perfekten Drehzahl"
-    IDS_6146    "1,5% unterhalb der perfekten Drehzahl"
-    IDS_6147    "2% unterhalb der perfekten Drehzahl"
-
-    IDS_7168    "(Systemstandard)"
-END
-#define IDS_LANG_ENUS IDS_7168
-
-// German (de-DE) resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc
deleted file mode 100644
index 1daf46b4c..000000000
--- a/src/win/languages/dialogs.rc
+++ /dev/null
@@ -1,1143 +0,0 @@
-#define CFG_CHECKBOX_PRI_WIDTH      94
-#define CFG_CHECKBOX_HEIGHT         10
-#define CFG_BTN_WIDTH               46
-#define CFG_BTN_HEIGHT              14
-#define CFG_PANE_LTEXT_PRI_WIDTH    85
-#define CFG_PANE_LTEXT_PRI_WIDTH_2  170
-#define CFG_PANE_LTEXT_PRI_WIDTH_3  255
-#define CFG_PANE_LTEXT_HEIGHT       10
-#define CFG_COMBO_BTN_WIDTH         212
-#define CFG_COMBO_NOBTN_WIDTH       CFG_COMBO_BTN_WIDTH + CFG_BTN_WIDTH + 8
-#define CFG_COMBO_BOX_LEFT          CFG_PANE_LTEXT_PRI_WIDTH + 10
-#define CFG_COMBO_BTN_LEFT          CFG_COMBO_BOX_LEFT + CFG_COMBO_BTN_WIDTH + 8
-#define CFG_COMBO_HEIGHT            120
-#define CFG_LIST_WIDTH              123
-#define CFG_LIST_HEIGHT             212
-#define CFG_PANE_TOP                0
-#define CFG_PANE_LEFT               CFG_LIST_WIDTH + 8
-#define CFG_PANE_WIDTH              CFG_COMBO_BOX_LEFT + CFG_COMBO_NOBTN_WIDTH
-#define CFG_PANE_HEIGHT             221
-#define CFG_HMARGIN                 7
-#define CFG_VMARGIN                 9
-#define CFG_SYSLISTVIEW32_WIDTH     CFG_PANE_WIDTH - 7
-
-DLG_PREFERENCES DIALOG DISCARDABLE  0, 0, 240, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION STR_PREFERENCES
-FONT FONT_SIZE, FONT_NAME
-BEGIN
-    DEFPUSHBUTTON   STR_OK, IDOK,
-                    123, 97, 50, CFG_BTN_HEIGHT
-
-    PUSHBUTTON      STR_CANCEL, IDCANCEL,
-                    179, 97, 50, CFG_BTN_HEIGHT
-
-    LTEXT           STR_LANGUAGE,
-                    2000, 13, 8, 100, 8
-    COMBOBOX        IDC_COMBO_LANG,
-                    13, 18, 213, 22,
-                    CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    PUSHBUTTON      STR_DEFAULT, IDC_BUTTON_DEFAULT,
-                    162, 32, 60, CFG_BTN_HEIGHT
-
-    LTEXT           STR_ICONSET,
-                    2001, 13, 40, 100, 8
-    COMBOBOX        IDC_COMBO_ICON,
-                    13, 50, 213, 22,
-                    CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    PUSHBUTTON      STR_DEFAULT, IDC_BUTTON_DEFICON,
-                    162, 64, 60, CFG_BTN_HEIGHT
-
-    AUTOCHECKBOX    STR_GLOBAL, IDC_CHECKBOX_GLOBAL,
-                    13, 82, 217, 8,
-                    WS_DISABLED 
-END
-
-DLG_SND_GAIN DIALOG DISCARDABLE  0, 0, 113, 136
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION STR_SND_GAIN
-FONT FONT_SIZE, FONT_NAME
-BEGIN
-    DEFPUSHBUTTON   STR_OK, IDOK,
-                    57, 7, 50, CFG_BTN_HEIGHT
-
-    PUSHBUTTON      STR_CANCEL, IDCANCEL,
-                    57, 24, 50, CFG_BTN_HEIGHT
-
-    CONTROL         STR_GAIN, IDC_SLIDER_GAIN,
-                    "msctls_trackbar32",
-                    TBS_VERT | TBS_BOTH | TBS_AUTOTICKS | WS_TABSTOP,
-                    15, 20, 20, 109
-    CTEXT           STR_GAIN,IDT_GAIN,
-                    10, 7, 32, 9,
-                    SS_CENTERIMAGE
-END
-
-DLG_NEW_FLOPPY DIALOG DISCARDABLE  0, 0, 226, 86
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION STR_NEW_FLOPPY
-FONT FONT_SIZE, FONT_NAME
-BEGIN
-    DEFPUSHBUTTON   STR_OK, IDOK,
-                    104, 65, 50, CFG_BTN_HEIGHT
-
-    PUSHBUTTON      STR_CANCEL, IDCANCEL,
-                    162, 65, 50, CFG_BTN_HEIGHT
-
-    LTEXT           STR_FILE_NAME, IDT_FLP_FILE_NAME,
-                    7, 6, 44, 12,
-                    SS_CENTERIMAGE
-    EDITTEXT        IDC_EDIT_FILE_NAME,
-                    53, 5, 150, 14,
-                    ES_AUTOHSCROLL | ES_READONLY
-
-    LTEXT           STR_DISK_SIZE, IDT_FLP_DISK_SIZE,
-                    7, 25, 44, 12,
-                    SS_CENTERIMAGE
-    COMBOBOX        IDC_COMBO_DISK_SIZE,
-                    53, 25, 166, 14,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "...", IDC_CFILE,
-                    206, 5, 13, CFG_BTN_HEIGHT
-
-    LTEXT           STR_RPM_MODE, IDT_FLP_RPM_MODE,
-                    7, 45, 44, 12,
-                    SS_CENTERIMAGE
-    COMBOBOX        IDC_COMBO_RPM_MODE,
-                    53, 45, 166, 14,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_PROGRESS, IDT_FLP_PROGRESS,
-                    7, 45, 44, 12,
-                    SS_CENTERIMAGE
-    CONTROL         "IMGCreateProgress", IDC_PBAR_IMG_CREATE,
-                    "msctls_progress32",
-                    PBS_SMOOTH | WS_BORDER,
-                    53, 45, 166, 14
-END
-
-DLG_SPECIFY_DIM DIALOG DISCARDABLE  0, 0, 175, 66
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION STR_SPECIFY_DIM
-FONT FONT_SIZE, FONT_NAME
-BEGIN
-    LTEXT           STR_WIDTH, IDT_WIDTH,
-                    7, 9, 24, 12
-    EDITTEXT        IDC_EDIT_WIDTH,
-                    33, 7, 45, 12,
-                    ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "",IDC_WIDTHSPIN,
-                    "msctls_updown32",
-                    UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS,
-                    76, 6, 12, 12
-
-    LTEXT           STR_HEIGHT, IDT_HEIGHT,
-                    97, 9, 24, 12
-    EDITTEXT        IDC_EDIT_HEIGHT,
-                    123, 7, 45, 12,
-                    ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "",IDC_HEIGHTSPIN,
-                    "msctls_updown32",
-                    UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS,
-                    166, 6, 12, 12
-
-    CONTROL         STR_LOCK_TO_SIZE,IDC_CHECK_LOCK_SIZE,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    7, 26, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-
-    DEFPUSHBUTTON   STR_OK,IDOK,
-                    30, 45, 50, CFG_BTN_HEIGHT
-
-    PUSHBUTTON      STR_CANCEL, IDCANCEL,
-                    99, 45, 50, CFG_BTN_HEIGHT
-END
-
-DLG_CONFIG DIALOG DISCARDABLE  0, 0, CFG_LIST_WIDTH + CFG_PANE_WIDTH + 18, 256
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION STR_CONFIG
-FONT FONT_SIZE, FONT_NAME
-BEGIN
-    DEFPUSHBUTTON   STR_OK, IDOK,
-                    CFG_LIST_WIDTH + CFG_PANE_WIDTH - 108, 235, 50, CFG_BTN_HEIGHT
-
-    PUSHBUTTON      STR_CANCEL, IDCANCEL,
-                    CFG_LIST_WIDTH + CFG_PANE_WIDTH - 48 , 235, 50, CFG_BTN_HEIGHT
-
-    CONTROL         "List2", IDC_SETTINGSCATLIST,
-                    "SysListView32",
-                    LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SHOWSELALWAYS | LVS_SINGLESEL | 
-                    WS_BORDER | WS_TABSTOP,
-                    CFG_HMARGIN, CFG_VMARGIN, CFG_LIST_WIDTH, CFG_LIST_HEIGHT
-
-    CONTROL         "",-1,
-                    "Static", SS_BLACKFRAME | SS_SUNKEN,
-                    1, 226, CFG_LIST_WIDTH + CFG_PANE_WIDTH + 16, 1
-END
-
-DLG_CFG_MACHINE DIALOG DISCARDABLE  CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT
-STYLE DS_CONTROL | WS_CHILD
-FONT FONT_SIZE, FONT_NAME
-BEGIN
-    LTEXT           STR_MACHINE_TYPE,IDT_MACHINE_TYPE,
-                    CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_MACHINE_TYPE,
-                    CFG_COMBO_BOX_LEFT, 7, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_MACHINE, IDT_MACHINE,
-                    CFG_HMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_MACHINE,
-                    CFG_COMBO_BOX_LEFT, 26, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_MACHINE,
-                    CFG_COMBO_BTN_LEFT, 25, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    LTEXT           STR_CPU_TYPE, IDT_CPU_TYPE,
-                    CFG_HMARGIN, 47, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_CPU_TYPE,
-                    CFG_COMBO_BOX_LEFT, 45, 110, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_CPU_SPEED, IDT_CPU_SPEED,
-                    216, 47, 34, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_CPU_SPEED,
-                    252, 45, 109, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_FPU,IDT_FPU,
-                    CFG_HMARGIN, 66, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_FPU,
-                    CFG_COMBO_BOX_LEFT, 64, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_WAIT_STATES, IDT_WAIT_STATES,
-                    CFG_HMARGIN, 85, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_WS,
-                    CFG_COMBO_BOX_LEFT, 83, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_MEMORY, IDT_MEMORY,
-                    CFG_HMARGIN, 104, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    EDITTEXT        IDC_MEMTEXT,
-                    CFG_COMBO_BOX_LEFT, 102, 45, 12,
-                    ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "", IDC_MEMSPIN,
-                    "msctls_updown32",
-                    UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS,
-                    138, 101, 12, 12
-    LTEXT           STR_MB, IDT_MB,
-                    148, 104, 12, CFG_PANE_LTEXT_HEIGHT
-
-#ifdef USE_DYNAREC
-    CONTROL         STR_DYNAREC, IDC_CHECK_DYNAREC,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 120, 120, CFG_CHECKBOX_HEIGHT
-#endif
-
-    CONTROL         STR_SOFTFLOAT, IDC_CHECK_SOFTFLOAT,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 135, 120, CFG_CHECKBOX_HEIGHT
-
-
-    GROUPBOX        STR_TIME_SYNC, IDC_TIME_SYNC,
-                    CFG_HMARGIN, 150, 110, 56
-
-    CONTROL         STR_DISABLED, IDC_RADIO_TS_DISABLED,
-                    "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,
-                    14, 162, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-
-    CONTROL         STR_ENABLED_LOCAL, IDC_RADIO_TS_LOCAL,
-                    "Button", BS_AUTORADIOBUTTON | WS_TABSTOP,
-                    14, 176, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-
-    CONTROL         STR_ENABLED_UTC, IDC_RADIO_TS_UTC,
-                    "Button", BS_AUTORADIOBUTTON | WS_TABSTOP,
-                    14, 190, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-END
-
-DLG_CFG_VIDEO DIALOG DISCARDABLE  CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT
-STYLE DS_CONTROL | WS_CHILD
-FONT FONT_SIZE, FONT_NAME
-BEGIN
-    LTEXT           STR_VIDEO, IDT_VIDEO,
-                    CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_VIDEO,
-                    CFG_COMBO_BOX_LEFT, 7, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_VID,
-                    CFG_COMBO_BTN_LEFT, 6, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    LTEXT           STR_VIDEO_2, IDT_VIDEO_2,
-                    CFG_HMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_VIDEO_2,
-                    CFG_COMBO_BOX_LEFT, 26, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_VID_2,
-                    CFG_COMBO_BTN_LEFT, 25, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    CONTROL         STR_VOODOO, IDC_CHECK_VOODOO,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 47, 199, CFG_CHECKBOX_HEIGHT
-    PUSHBUTTON      STR_CONFIGURE, IDC_BUTTON_VOODOO,
-                    CFG_COMBO_BTN_LEFT, 45, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    CONTROL         STR_IBM8514, IDC_CHECK_IBM8514,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 66, 199, CFG_CHECKBOX_HEIGHT
-
-    CONTROL         STR_XGA, IDC_CHECK_XGA,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 85, 199, CFG_CHECKBOX_HEIGHT
-    PUSHBUTTON      STR_CONFIGURE, IDC_BUTTON_XGA,
-                    CFG_COMBO_BTN_LEFT, 84, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-END
-
-DLG_CFG_INPUT DIALOG DISCARDABLE  CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT
-STYLE DS_CONTROL | WS_CHILD
-FONT FONT_SIZE, FONT_NAME
-BEGIN
-    LTEXT           STR_MOUSE, IDT_MOUSE,
-                    CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_MOUSE,
-                    CFG_COMBO_BOX_LEFT, 7, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_MOUSE,
-                    CFG_COMBO_BTN_LEFT, 6, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    LTEXT           STR_JOYSTICK, IDT_JOYSTICK,
-                    CFG_HMARGIN, 27, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_JOYSTICK,
-                    CFG_COMBO_BOX_LEFT, 25, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    PUSHBUTTON      STR_JOY1, IDC_JOY1,
-                    CFG_HMARGIN, 44, 84, CFG_BTN_HEIGHT
-
-    PUSHBUTTON      STR_JOY2, IDC_JOY2,
-                    96, 44, 84, CFG_BTN_HEIGHT
-
-    PUSHBUTTON      STR_JOY3, IDC_JOY3,
-                    187, 44, 84, CFG_BTN_HEIGHT
-
-    PUSHBUTTON      STR_JOY4, IDC_JOY4,
-                    277, 44, 84, CFG_BTN_HEIGHT
-END
-
-DLG_CFG_SOUND DIALOG DISCARDABLE  CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT
-STYLE DS_CONTROL | WS_CHILD
-FONT FONT_SIZE, FONT_NAME
-BEGIN
-    LTEXT           STR_SOUND1, IDT_SOUND1,
-                    CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_SOUND1,
-                    CFG_COMBO_BOX_LEFT, 7, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_SND1,
-                    CFG_COMBO_BTN_LEFT, 6, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    LTEXT           STR_SOUND2, IDT_SOUND2,
-                    CFG_HMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_SOUND2,
-                    CFG_COMBO_BOX_LEFT, 26, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_SND2,
-                    CFG_COMBO_BTN_LEFT, 25, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    LTEXT           STR_SOUND3, IDT_SOUND3,
-                    CFG_HMARGIN, 48, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_SOUND3,
-                    CFG_COMBO_BOX_LEFT, 46, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_SND3,
-                    CFG_COMBO_BTN_LEFT, 45, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    LTEXT           STR_SOUND4, IDT_SOUND4,
-                    CFG_HMARGIN, 68, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_SOUND4,
-                    CFG_COMBO_BOX_LEFT, 66, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_SND4,
-                    CFG_COMBO_BTN_LEFT, 65, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    LTEXT           STR_MIDI_OUT, IDT_MIDI_OUT,
-                    CFG_HMARGIN, 88, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_MIDI_OUT,
-                    CFG_COMBO_BOX_LEFT, 86, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE,
-                    IDC_CONFIGURE_MIDI_OUT,
-                    CFG_COMBO_BTN_LEFT, 85, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    LTEXT           STR_MIDI_IN, IDT_MIDI_IN,
-                    CFG_HMARGIN, 108, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_MIDI_IN,
-                    CFG_COMBO_BOX_LEFT, 105, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_MIDI_IN,
-                    CFG_COMBO_BTN_LEFT, 105, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    CONTROL         STR_MPU401,IDC_CHECK_MPU401,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 126, 199, CFG_CHECKBOX_HEIGHT
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_MPU401,
-                    CFG_COMBO_BTN_LEFT, 125, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    CONTROL         STR_FLOAT, IDC_CHECK_FLOAT,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 138, 194, CFG_CHECKBOX_HEIGHT
-
-    GROUPBOX        STR_FM_DRIVER, IDC_FM_DRIVER,
-                    CFG_HMARGIN, 154, 110, 42
-
-    CONTROL         STR_FM_DRV_NUKED, IDC_RADIO_FM_DRV_NUKED,
-                    "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,
-                    14, 166, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-
-    CONTROL         STR_FM_DRV_YMFM, IDC_RADIO_FM_DRV_YMFM,
-                    "Button", BS_AUTORADIOBUTTON | WS_TABSTOP,
-                    14, 180, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-END
-
-DLG_CFG_NETWORK DIALOG DISCARDABLE  CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT
-STYLE DS_CONTROL | WS_CHILD
-FONT FONT_SIZE, FONT_NAME
-BEGIN
-    LTEXT           STR_NET_TYPE, IDT_NET_TYPE,
-                    CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    LTEXT           STR_PCAP, IDT_PCAP,
-                    CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH - 10, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    LTEXT           STR_NET, IDT_NET,
-                    CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH_2 + 20, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-
-    COMBOBOX        IDC_COMBO_NET1_TYPE,
-                    CFG_HMARGIN, 28, 48, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    COMBOBOX        IDC_COMBO_PCAP1,
-                    CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH - 10, 28, 110, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    COMBOBOX        IDC_COMBO_NET1,
-                    CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH_2 + 20, 28, 110, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_NET1,
-                    CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH_3 + 50, 27, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    COMBOBOX        IDC_COMBO_NET2_TYPE,
-                    CFG_HMARGIN, 49, 48, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    COMBOBOX        IDC_COMBO_PCAP2,
-                    CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH - 10, 49, 110, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    COMBOBOX        IDC_COMBO_NET2,
-                    CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH_2 + 20, 49, 110, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_NET2,
-                    CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH_3 + 50, 48, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    COMBOBOX        IDC_COMBO_NET3_TYPE,
-                    CFG_HMARGIN, 70, 48, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    COMBOBOX        IDC_COMBO_PCAP3,
-                    CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH - 10, 70, 110, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    COMBOBOX        IDC_COMBO_NET3,
-                    CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH_2 + 20, 70, 110, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_NET3,
-                    CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH_3 + 50, 69, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    COMBOBOX        IDC_COMBO_NET4_TYPE,
-                    CFG_HMARGIN, 91, 48, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    COMBOBOX        IDC_COMBO_PCAP4,
-                    CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH - 10, 91, 110, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    COMBOBOX        IDC_COMBO_NET4,
-                    CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH_2 + 20, 91, 110, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_NET4,
-                    CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH_3 + 50, 90, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-END
-
-DLG_CFG_PORTS DIALOG DISCARDABLE  CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT
-STYLE DS_CONTROL | WS_CHILD
-FONT FONT_SIZE, FONT_NAME
-BEGIN
-/*
-    LTEXT           STR_COM1, IDT_COM1,
-                    CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_COM1,
-                    CFG_COMBO_BOX_LEFT, 7, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_COM2, IDT_COM2,
-                    CFG_HMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_COM2,
-                    CFG_COMBO_BOX_LEFT, 26, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_COM3, IDT_COM3,
-                    CFG_HMARGIN, 47, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_COM3,
-                    CFG_COMBO_BOX_LEFT, 45, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_COM4, IDT_COM4,
-                    CFG_HMARGIN, 66, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_COM4,
-                    CFG_COMBO_BOX_LEFT, 45, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-*/
-
-    LTEXT           STR_LPT1, IDT_LPT1,
-                    CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_LPT1,
-                    CFG_COMBO_BOX_LEFT, 7, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_LPT2, IDT_LPT2,
-                    CFG_HMARGIN, 24, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_LPT2,
-                    CFG_COMBO_BOX_LEFT, 22, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_LPT3, IDT_LPT3,
-                    CFG_HMARGIN, 39, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_LPT3,
-                    CFG_COMBO_BOX_LEFT, 37, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_LPT4, IDT_LPT4,
-                    CFG_HMARGIN, 54, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_LPT4,
-                    CFG_COMBO_BOX_LEFT, 52, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    CONTROL         STR_SERIAL1, IDC_CHECK_SERIAL1,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 71, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-
-    CONTROL         STR_SERIAL2, IDC_CHECK_SERIAL2,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 86, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-
-    CONTROL         STR_SERIAL3, IDC_CHECK_SERIAL3,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 101, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-
-    CONTROL         STR_SERIAL4, IDC_CHECK_SERIAL4,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 116, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-
-    CONTROL         STR_PARALLEL1, IDC_CHECK_PARALLEL1,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    167, 71, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-
-    CONTROL         STR_PARALLEL2, IDC_CHECK_PARALLEL2,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    167, 86, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-
-    CONTROL         STR_PARALLEL3, IDC_CHECK_PARALLEL3,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    167, 101, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-
-    CONTROL         STR_PARALLEL4, IDC_CHECK_PARALLEL4,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    167, 116, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-
-    CONTROL         STR_SERIAL_PASS1, IDC_CHECK_SERIAL_PASS1,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 134, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_SERIAL_PASS1,
-                    CFG_COMBO_BTN_LEFT, 131, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    CONTROL         STR_SERIAL_PASS2, IDC_CHECK_SERIAL_PASS2,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 150, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_SERIAL_PASS2,
-                    CFG_COMBO_BTN_LEFT, 147, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    CONTROL         STR_SERIAL_PASS3, IDC_CHECK_SERIAL_PASS3,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 165, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_SERIAL_PASS3,
-                    CFG_COMBO_BTN_LEFT, 162, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    CONTROL         STR_SERIAL_PASS4, IDC_CHECK_SERIAL_PASS4,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 180, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_SERIAL_PASS4,
-                    CFG_COMBO_BTN_LEFT, 177, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-END
-
-DLG_CFG_STORAGE DIALOG DISCARDABLE  CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT
-STYLE DS_CONTROL | WS_CHILD
-FONT FONT_SIZE, FONT_NAME
-BEGIN
-    LTEXT           STR_HDC, IDT_HDC,
-                    CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_HDC,
-                    CFG_COMBO_BOX_LEFT, 7, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_HDC,
-                    CFG_COMBO_BTN_LEFT, 6, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    LTEXT           STR_FDC, IDT_FDC,
-                    CFG_HMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_FDC,
-                    CFG_COMBO_BOX_LEFT, 26, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_FDC,
-                    CFG_COMBO_BTN_LEFT, 25, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    CONTROL         STR_IDE_TER,IDC_CHECK_IDE_TER,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 47, 239, 10
-    PUSHBUTTON      STR_CONFIGURE, IDC_BUTTON_IDE_TER,
-                    CFG_COMBO_BTN_LEFT, 45, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    CONTROL         STR_IDE_QUA, IDC_CHECK_IDE_QUA,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 66, 239, 10
-    PUSHBUTTON      STR_CONFIGURE, IDC_BUTTON_IDE_QUA,
-                    CFG_COMBO_BTN_LEFT, 64, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    GROUPBOX        STR_SCSI, IDC_GROUP_SCSI,
-                    CFG_HMARGIN, 85, CFG_SYSLISTVIEW32_WIDTH, 93
-
-    LTEXT           STR_SCSI_1, IDT_SCSI_1,
-                    16, 102, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_SCSI_1,
-                    CFG_COMBO_BOX_LEFT, 100, CFG_COMBO_BTN_WIDTH - 10, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_SCSI_1,
-                    CFG_COMBO_BTN_LEFT - 10, 99, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    LTEXT           STR_SCSI_2, IDT_SCSI_2,
-                    16, 121, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_SCSI_2,
-                    CFG_COMBO_BOX_LEFT, 119, CFG_COMBO_BTN_WIDTH - 10, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_SCSI_2,
-                    CFG_COMBO_BTN_LEFT - 10, 118, CFG_BTN_WIDTH,CFG_BTN_HEIGHT
-
-    LTEXT           STR_SCSI_3,IDT_SCSI_3,
-                    16, 140, 64, 10
-    COMBOBOX        IDC_COMBO_SCSI_3,
-                    CFG_COMBO_BOX_LEFT, 138, CFG_COMBO_BTN_WIDTH - 10, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_SCSI_3,
-                    CFG_COMBO_BTN_LEFT - 10, 137, CFG_BTN_WIDTH,CFG_BTN_HEIGHT
-
-    LTEXT           STR_SCSI_4, IDT_SCSI_4,
-                    16, 159, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_SCSI_4,
-                    CFG_COMBO_BOX_LEFT, 157, CFG_COMBO_BTN_WIDTH - 10, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_SCSI_4,
-                    CFG_COMBO_BTN_LEFT - 10, 156, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    CONTROL         STR_CASSETTE,IDC_CHECK_CASSETTE,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 185, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-END
-
-DLG_CFG_HARD_DISKS DIALOG DISCARDABLE  CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT
-STYLE DS_CONTROL | WS_CHILD
-FONT FONT_SIZE, FONT_NAME
-BEGIN
-    LTEXT           STR_HDD, IDT_HDD,
-                    CFG_HMARGIN, CFG_VMARGIN, 258, CFG_PANE_LTEXT_HEIGHT
-    CONTROL         "List1", IDC_LIST_HARD_DISKS,
-                    "SysListView32",
-                    LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | 
-                    WS_BORDER | WS_TABSTOP,
-                    CFG_HMARGIN, 18, CFG_SYSLISTVIEW32_WIDTH, 162
-
-    LTEXT           STR_BUS,IDT_BUS,
-                    CFG_HMARGIN, 188, 24, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_HD_BUS,
-                    33, 186, 40, 12,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_CHANNEL, IDT_CHANNEL,
-                    91, 188, 38, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_HD_CHANNEL,
-                    131, 186, 40, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_COMBO_HD_CHANNEL_IDE,
-                    131, 186, 40, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_ID, IDT_ID,
-                    91, 188, 38, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_HD_ID,
-                    131, 186, 70, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_SPEED, IDT_SPEED,
-                    201, 188, 38, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_HD_SPEED,
-                    241, 186, 70, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    PUSHBUTTON      STR_NEW, IDC_BUTTON_HDD_ADD_NEW,
-                    CFG_HMARGIN, 207, 112, CFG_BTN_HEIGHT
-
-    PUSHBUTTON      STR_EXISTING, IDC_BUTTON_HDD_ADD,
-                    128, 207, 112, CFG_BTN_HEIGHT
-
-    PUSHBUTTON      STR_REMOVE, IDC_BUTTON_HDD_REMOVE,
-                    249, 207, 112, CFG_BTN_HEIGHT
-
-END
-
-DLG_CFG_HARD_DISKS_ADD DIALOG DISCARDABLE  0, 0, 239, 151
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Add Hard Disk"
-FONT FONT_SIZE, FONT_NAME
-BEGIN
-    LTEXT           STR_FILE_NAME, IDT_FILE_NAME,
-                    7, 7, 204, 12
-    EDITTEXT        IDC_EDIT_HD_FILE_NAME,
-                    7, 18, 173, 12
-    PUSHBUTTON      STR_SPECIFY, IDC_CFILE,
-                    187, 18, 44, CFG_BTN_HEIGHT
-
-    LTEXT           STR_CYLS, IDT_CYLS,
-                    7, 37, 42, 12
-    EDITTEXT        IDC_EDIT_HD_CYL,
-                    50, 36, 28, 12
-
-    LTEXT           STR_HEADS, IDT_HEADS,
-                    86, 37, 29, 12
-    EDITTEXT        IDC_EDIT_HD_HPC,
-                    122, 36, 28, 12
-
-    LTEXT           STR_SECTORS, IDT_SECTORS,
-                    164, 37, 33, 12
-    EDITTEXT        IDC_EDIT_HD_SPT,
-                    197, 36, 28, 12
-
-    LTEXT           STR_SIZE_MB, IDT_SIZE_MB,
-                    7, 56, 48, 12
-    EDITTEXT        IDC_EDIT_HD_SIZE,
-                    50, 54, 28, 12
-
-    LTEXT           STR_TYPE, IDT_TYPE,
-                    86, 56, 24, 12
-    COMBOBOX        IDC_COMBO_HD_TYPE,
-                    133, 54, 98, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_BUS,IDT_BUS,
-                    7, 75, 24, 12
-    COMBOBOX        IDC_COMBO_HD_BUS,
-                    43, 73, 58, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_CHANNEL, IDT_CHANNEL,
-                    109, 75, 34, 12
-    COMBOBOX        IDC_COMBO_HD_CHANNEL,
-                    144, 73, 87, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_COMBO_HD_CHANNEL_IDE,
-                    144, 73, 87, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_ID, IDT_ID,
-                    109, 75, 34, 12
-    COMBOBOX        IDC_COMBO_HD_ID,
-                    144, 73, 87, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_IMG_FORMAT, IDT_IMG_FORMAT,
-                    7, 94, 70, 12
-    COMBOBOX        IDC_COMBO_HD_IMG_FORMAT,
-                    78, 92, 153, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_BLOCK_SIZE, IDT_BLOCK_SIZE,
-                    7, 113, 50, 12
-    COMBOBOX        IDC_COMBO_HD_BLOCK_SIZE,
-                    58, 111, 153, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_PROGRESS, IDT_PROGRESS,
-                    7, 7, 204, 12
-    CONTROL         "IMGCreateProgress", IDC_PBAR_IMG_CREATE,
-                    "msctls_progress32",
-                    PBS_SMOOTH | WS_BORDER,
-                    7, 16, 204, 12
-
-    DEFPUSHBUTTON   STR_OK, IDOK,
-                    75, 129, 50, CFG_BTN_HEIGHT
-    PUSHBUTTON      STR_CANCEL, IDCANCEL,
-                    132, 129, 50, CFG_BTN_HEIGHT
-END
-
-DLG_CFG_FLOPPY_AND_CDROM_DRIVES DIALOG DISCARDABLE  CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT
-STYLE DS_CONTROL | WS_CHILD
-FONT FONT_SIZE, FONT_NAME
-BEGIN
-    LTEXT           STR_FLOPPY_DRIVES, IDT_FLOPPY_DRIVES,
-                    CFG_HMARGIN, CFG_VMARGIN, 258, CFG_PANE_LTEXT_HEIGHT
-    CONTROL         "List1", IDC_LIST_FLOPPY_DRIVES,
-                    "SysListView32",
-                    LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | 
-                    WS_BORDER | WS_TABSTOP,
-                    CFG_HMARGIN, 18, CFG_SYSLISTVIEW32_WIDTH, 60
-
-    LTEXT           STR_TYPE, IDT_FDD_TYPE,
-                    CFG_HMARGIN, 87, 24, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_FD_TYPE,
-                    33, 85, 140, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    CONTROL         STR_TURBO, IDC_CHECKTURBO,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    186, 86, 84, CFG_CHECKBOX_HEIGHT
-
-    CONTROL         STR_CHECKBPB, IDC_CHECKBPB,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    272, 86, 84, CFG_CHECKBOX_HEIGHT
-
-    LTEXT           STR_CDROM_DRIVES, IDT_CD_DRIVES,
-                    CFG_HMARGIN, 107, 258, CFG_PANE_LTEXT_HEIGHT
-    CONTROL         "List1", IDC_LIST_CDROM_DRIVES,
-                    "SysListView32",
-                    LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | 
-                    WS_BORDER | WS_TABSTOP,
-                    CFG_HMARGIN, 117, CFG_SYSLISTVIEW32_WIDTH, 60
-
-    LTEXT           STR_BUS, IDT_CD_BUS,
-                    CFG_HMARGIN, 187, 24, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_CD_BUS,
-                    33, 185, 140, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_CHANNEL, IDT_CD_CHANNEL,
-                    181, 187, 38, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_CD_CHANNEL_IDE,
-                    221, 185, 140, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_ID, IDT_CD_ID,
-                    181, 187, 38, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_CD_ID,
-                    221, 185, 140, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_CD_SPEED, IDT_CD_SPEED,
-                    CFG_HMARGIN, 207, 34, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_CD_SPEED,
-                    33, 205, 140, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_TYPE, IDT_CD_TYPE,
-                    181, 207, 34, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_CD_TYPE,
-                    221, 205, 140, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-END
-
-DLG_CFG_OTHER_REMOVABLE_DEVICES DIALOG DISCARDABLE  CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT
-STYLE DS_CONTROL | WS_CHILD
-FONT FONT_SIZE, FONT_NAME
-BEGIN
-
-    LTEXT           STR_MO_DRIVES, IDT_MO_DRIVES,
-                    CFG_HMARGIN, CFG_VMARGIN, 258, CFG_PANE_LTEXT_HEIGHT
-    CONTROL         "List1", IDC_LIST_MO_DRIVES,
-                    "SysListView32",
-                    LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | 
-                    WS_BORDER | WS_TABSTOP,
-                    CFG_HMARGIN, 17, CFG_SYSLISTVIEW32_WIDTH, 60
-
-    LTEXT           STR_BUS, IDT_MO_BUS,
-                    CFG_HMARGIN, 87, 24, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_MO_BUS,
-                    33, 85, 140, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_ID, IDT_MO_ID,
-                    181, 87, 38, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_MO_ID,
-                    221, 85, 140, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_CHANNEL, IDT_MO_CHANNEL,
-                    181, 87, 38, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_MO_CHANNEL_IDE,
-                    221, 85, 140, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_TYPE, IDT_MO_TYPE,
-                    CFG_HMARGIN, 107, 24, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_MO_TYPE,
-                    33, 105, 328, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_ZIP_DRIVES, IDT_ZIP_DRIVES,
-                    CFG_HMARGIN, 127, 258, CFG_PANE_LTEXT_HEIGHT
-    CONTROL         "List1", IDC_LIST_ZIP_DRIVES,
-                    "SysListView32",
-                    LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | 
-                    WS_BORDER | WS_TABSTOP,
-                    CFG_HMARGIN, 137, CFG_SYSLISTVIEW32_WIDTH, 60
-
-    LTEXT           STR_BUS, IDT_ZIP_BUS,
-                    CFG_HMARGIN, 207, 24, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_ZIP_BUS,
-                    33, 205, 140, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_CHANNEL, IDT_ZIP_CHANNEL,
-                    181, 207, 38, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_ZIP_CHANNEL_IDE,
-                    221, 205, 105, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT           STR_ID, IDT_ZIP_ID,
-                    181, 207, 38, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_ZIP_ID,
-                    221, 205, 105, 12,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
-    CONTROL         STR_250, IDC_CHECK250,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    329, 206, 44, CFG_CHECKBOX_HEIGHT
-END
-
-DLG_CFG_PERIPHERALS DIALOG DISCARDABLE  CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT
-STYLE DS_CONTROL | WS_CHILD
-FONT FONT_SIZE, FONT_NAME
-BEGIN
-    LTEXT           STR_ISARTC, IDT_ISARTC,
-                    CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_ISARTC,
-                    CFG_COMBO_BOX_LEFT, 7,CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_ISARTC,
-                    CFG_COMBO_BTN_LEFT, 6, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    GROUPBOX        STR_ISAMEM, IDC_GROUP_ISAMEM,
-                    CFG_HMARGIN, 28, CFG_SYSLISTVIEW32_WIDTH, 93
-
-    LTEXT           STR_ISAMEM_1, IDT_ISAMEM_1,
-                    16, 45, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_ISAMEM_1,
-                    CFG_COMBO_BOX_LEFT, 43, CFG_COMBO_BTN_WIDTH - 10, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_ISAMEM_1,
-                    CFG_COMBO_BTN_LEFT - 10, 42, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    LTEXT           STR_ISAMEM_2,IDT_ISAMEM_2,
-                    16, 64, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_ISAMEM_2,
-                    CFG_COMBO_BOX_LEFT, 62, CFG_COMBO_BTN_WIDTH - 10, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_ISAMEM_2,
-                    CFG_COMBO_BTN_LEFT - 10, 61, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    LTEXT           STR_ISAMEM_3, IDT_ISAMEM_3,
-                    16, 83, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_ISAMEM_3,
-                    CFG_COMBO_BOX_LEFT, 81, CFG_COMBO_BTN_WIDTH - 10, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_ISAMEM_3,
-                    CFG_COMBO_BTN_LEFT - 10, 80, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    LTEXT           STR_ISAMEM_4, IDT_ISAMEM_4,
-                    16, 102, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_ISAMEM_4,
-                    CFG_COMBO_BOX_LEFT, 100, CFG_COMBO_BTN_WIDTH - 10, CFG_COMBO_HEIGHT,
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_ISAMEM_4,
-                    CFG_COMBO_BTN_LEFT - 10, 99, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    CONTROL         STR_BUGGER, IDC_CHECK_BUGGER,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 128, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-
-    CONTROL         STR_POSTCARD,IDC_CHECK_POSTCARD,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 146, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-END
-
-#undef CFG_CHECKBOX_PRI_WIDTH
-#undef CFG_CHECKBOX_HEIGHT
-#undef CFG_BTN_WIDTH
-#undef CFG_BTN_HEIGHT
-#undef CFG_PANE_LTEXT_PRI_WIDTH
-#undef CFG_PANE_LTEXT_HEIGHT
-#undef CFG_COMBO_BTN_WIDTH
-#undef CFG_COMBO_NOBTN_WIDTH
-#undef CFG_COMBO_BOX_LEFT
-#undef CFG_COMBO_BTN_LEFT
-#undef CFG_COMBO_HEIGHT
-#undef CFG_LIST_WIDTH
-#undef CFG_LIST_HEIGHT
-#undef CFG_PANE_TOP
-#undef CFG_PANE_LEFT
-#undef CFG_PANE_WIDTH
-#undef CFG_PANE_HEIGHT
-#undef CFG_HMARGIN
-#undef CFG_VMARGIN
-#undef CFG_SYSLISTVIEW32_WIDTH
-
-
-#undef STR_PREFERENCES
-#undef STR_SND_GAIN
-#undef STR_NEW_FLOPPY
-#undef STR_CONFIG
-#undef STR_SPECIFY_DIM
-
-#undef STR_OK
-#undef STR_CANCEL
-#undef STR_GLOBAL
-#undef STR_DEFAULT
-#undef STR_LANGUAGE
-#undef STR_ICONSET
-
-#undef STR_GAIN
-
-#undef STR_FILE_NAME
-#undef STR_DISK_SIZE
-#undef STR_RPM_MODE
-#undef STR_PROGRESS
-
-#undef STR_WIDTH
-#undef STR_HEIGHT
-#undef STR_LOCK_TO_SIZE
-
-#undef STR_MACHINE_TYPE
-#undef STR_MACHINE
-#undef STR_CONFIGURE
-#undef STR_CPU_TYPE
-#undef STR_CPU_SPEED
-#undef STR_FPU
-#undef STR_WAIT_STATES
-#undef STR_MB
-#undef STR_MEMORY
-#undef STR_TIME_SYNC
-#undef STR_DISABLED
-#undef STR_ENABLED_LOCAL
-#undef STR_ENABLED_UTC
-#undef STR_DYNAREC
-#undef STR_SOFTFLOAT
-
-#undef STR_VIDEO
-#undef STR_VIDEO_2
-#undef STR_VOODOO
-#undef STR_IBM8514
-#undef STR_XGA
-
-#undef STR_MOUSE
-#undef STR_JOYSTICK
-#undef STR_JOY1
-#undef STR_JOY2
-#undef STR_JOY3
-#undef STR_JOY4
-
-#undef STR_SOUND1
-#undef STR_SOUND2
-#undef STR_SOUND3
-#undef STR_SOUND4
-#undef STR_MIDI_OUT
-#undef STR_MIDI_IN
-#undef STR_MPU401
-#undef STR_FLOAT
-#undef STR_FM_DRIVER
-#undef STR_FM_DRV_NUKED
-#undef STR_FM_DRV_YMFM
-
-#undef STR_NET_TYPE
-#undef STR_PCAP
-#undef STR_NET
-#undef STR_NET1
-#undef STR_NET2
-#undef STR_NET3
-#undef STR_NET4
-
-#undef STR_COM1
-#undef STR_COM2
-#undef STR_COM3
-#undef STR_COM4
-#undef STR_LPT1
-#undef STR_LPT2
-#undef STR_LPT3
-#undef STR_LPT4
-#undef STR_SERIAL1
-#undef STR_SERIAL2
-#undef STR_SERIAL3
-#undef STR_SERIAL4
-#undef STR_PARALLEL1
-#undef STR_PARALLEL2
-#undef STR_PARALLEL3
-#undef STR_PARALLEL4
-#undef STR_SERIAL_PASS1
-#undef STR_SERIAL_PASS2
-#undef STR_SERIAL_PASS3
-#undef STR_SERIAL_PASS4
-
-#undef STR_HDC
-#undef STR_FDC
-#undef STR_IDE_TER
-#undef STR_IDE_QUA
-#undef STR_SCSI
-#undef STR_SCSI_1
-#undef STR_SCSI_2
-#undef STR_SCSI_3
-#undef STR_SCSI_4
-#undef STR_CASSETTE
-
-#undef STR_HDD
-#undef STR_NEW
-#undef STR_EXISTING
-#undef STR_REMOVE
-#undef STR_BUS
-#undef STR_CHANNEL
-#undef STR_ID
-#undef STR_SPEED
-
-#undef STR_SPECIFY
-#undef STR_SECTORS
-#undef STR_HEADS
-#undef STR_CYLS
-#undef STR_SIZE_MB
-#undef STR_TYPE
-#undef STR_IMG_FORMAT
-#undef STR_BLOCK_SIZE
-
-#undef STR_FLOPPY_DRIVES
-#undef STR_TURBO
-#undef STR_CHECKBPB
-#undef STR_CDROM_DRIVES
-#undef STR_CD_SPEED
-#undef STR_EARLY
-
-#undef STR_MO_DRIVES
-#undef STR_ZIP_DRIVES
-#undef STR_250
-
-#undef STR_ISARTC
-#undef STR_ISAMEM
-#undef STR_ISAMEM_1
-#undef STR_ISAMEM_2
-#undef STR_ISAMEM_3
-#undef STR_ISAMEM_4
-#undef STR_BUGGER
-#undef STR_POSTCARD
-
-#undef FONT_SIZE
-#undef FONT_NAME
diff --git a/src/win/languages/en-GB.rc b/src/win/languages/en-GB.rc
deleted file mode 100644
index bc0df4d05..000000000
--- a/src/win/languages/en-GB.rc
+++ /dev/null
@@ -1,637 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// English (U.K.) resources
-
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Action"
-    BEGIN
-        MENUITEM "&Keyboard requires capture", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "&Right CTRL is left ALT", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "&Hard Reset...", IDM_ACTION_HRESET
-        MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-        MENUITEM "Ctrl+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "&Pause", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "E&xit...", IDM_ACTION_EXIT
-    END
-    POPUP "&View"
-    BEGIN
-        MENUITEM "&Hide status bar", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
-        MENUITEM "&Resizeable window", IDM_VID_RESIZE
-        MENUITEM "R&emember size && position", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "Re&nderer"
-        BEGIN
-            MENUITEM "&SDL (Software)", IDM_VID_SDL_SW
-            MENUITEM "SDL (&Hardware)", IDM_VID_SDL_HW
-            MENUITEM "SDL (&OpenGL)", IDM_VID_SDL_OPENGL
-            MENUITEM "Open&GL (3.0 Core)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "&VNC", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Specify dimensions...", IDM_VID_SPECIFY_DIM
-        MENUITEM "F&orce 4:3 display ratio", IDM_VID_FORCE43
-        POPUP "&Window scale factor"
-        BEGIN
-            MENUITEM "&0.5x", IDM_VID_SCALE_1X
-            MENUITEM "&1x", IDM_VID_SCALE_2X
-            MENUITEM "1.&5x", IDM_VID_SCALE_3X
-            MENUITEM "&2x", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "Filter method"
-        BEGIN
-            MENUITEM "&Nearest", IDM_VID_FILTER_NEAREST
-            MENUITEM "&Linear", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "Hi&DPI scaling", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "&Fullscreen\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "Fullscreen &stretch mode"
-        BEGIN
-            MENUITEM "&Full screen stretch", IDM_VID_FS_FULL
-            MENUITEM "&4:3", IDM_VID_FS_43
-            MENUITEM "&Square pixels (Keep ratio)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "&Integer scale", IDM_VID_FS_INT
-        END
-        POPUP "E&GA/(S)VGA settings"
-        BEGIN
-            MENUITEM "&Inverted VGA monitor", IDM_VID_INVERT
-            POPUP "VGA screen &type"
-            BEGIN
-                MENUITEM "RGB &Colour", IDM_VID_GRAY_RGB
-                MENUITEM "&RGB Greyscale", IDM_VID_GRAY_MONO
-                MENUITEM "&Amber monitor", IDM_VID_GRAY_AMBER
-                MENUITEM "&Green monitor", IDM_VID_GRAY_GREEN
-                MENUITEM "&White monitor", IDM_VID_GRAY_WHITE
-            END
-            POPUP "Grayscale &conversion type"
-            BEGIN
-                MENUITEM "BT&601 (NTSC/PAL)", IDM_VID_GRAYCT_601
-                MENUITEM "BT&709 (HDTV)", IDM_VID_GRAYCT_709
-                MENUITEM "&Average", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "CGA/PCjr/Tandy/E&GA/(S)VGA overscan", IDM_VID_OVERSCAN
-        MENUITEM "Change contrast for &monochrome display", IDM_VID_CGACON
-    END
-    MENUITEM "&Media", IDM_MEDIA
-    POPUP "&Tools"
-    BEGIN
-        MENUITEM "&Settings...", IDM_CONFIG
-        MENUITEM "&Update status bar icons", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "Take s&creenshot\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "&Preferences...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "Enable &Discord integration", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "Sound &gain...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "Begin trace\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "End trace\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "&Help"
-    BEGIN
-        MENUITEM "&Documentation...", IDM_DOCS
-        MENUITEM "&About 86Box...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&New image...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Existing image...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "Existing image (&Write-protected)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Record", IDM_CASSETTE_RECORD
-        MENUITEM "&Play", IDM_CASSETTE_PLAY
-        MENUITEM "&Rewind to the beginning", IDM_CASSETTE_REWIND
-        MENUITEM "&Fast forward to the end", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "E&ject", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Image...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "E&ject", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&New image...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Existing image...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "Existing image (&Write-protected)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&xport to 86F...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "E&ject", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Mute", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "E&mpty", IDM_CDROM_EMPTY
-        MENUITEM "&Reload previous image", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "&Image...", IDM_CDROM_IMAGE
-        MENUITEM "&Folder...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&New image...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Existing image...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "Existing image (&Write-protected)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&ject", IDM_ZIP_EJECT
-        MENUITEM "&Reload previous image", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&New image...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Existing image...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "Existing image (&Write-protected)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&ject", IDM_MO_EJECT
-        MENUITEM "&Reload previous image", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "Target &framerate"
-    BEGIN
-        MENUITEM "&Sync with video", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "&25 fps", IDM_VID_GL_FPS_25
-        MENUITEM "&30 fps", IDM_VID_GL_FPS_30
-        MENUITEM "&50 fps", IDM_VID_GL_FPS_50
-        MENUITEM "&60 fps", IDM_VID_GL_FPS_60
-        MENUITEM "&75 fps", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "&VSync", IDM_VID_GL_VSYNC
-    MENUITEM "&Select shader...", IDM_VID_GL_SHADER
-    MENUITEM "&Remove shader", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "Preferences"
-#define STR_SND_GAIN      "Sound Gain"
-#define STR_NEW_FLOPPY    "New Image"
-#define STR_CONFIG        "Settings"
-#define STR_SPECIFY_DIM   "Specify Main Window Dimensions"
-
-#define STR_OK            "OK"
-#define STR_CANCEL        "Cancel"
-#define STR_GLOBAL        "Save these settings as &global defaults"
-#define STR_DEFAULT       "&Default"
-#define STR_LANGUAGE      "Language:"
-#define STR_ICONSET       "Icon set:"
-
-#define STR_GAIN          "Gain"
-
-#define STR_FILE_NAME     "File name:"
-#define STR_DISK_SIZE     "Disk size:"
-#define STR_RPM_MODE      "RPM mode:"
-#define STR_PROGRESS      "Progress:"
-
-#define STR_WIDTH         "Width:"
-#define STR_HEIGHT        "Height:"
-#define STR_LOCK_TO_SIZE  "Lock to this size"
-
-#define STR_MACHINE_TYPE  "Machine type:"
-#define STR_MACHINE       "Machine:"
-#define STR_CONFIGURE     "Configure"
-#define STR_CPU_TYPE      "CPU type:"
-#define STR_CPU_SPEED     "Speed:"
-#define STR_FPU           "FPU:"
-#define STR_WAIT_STATES   "Wait states:"
-#define STR_MB            "MB"
-#define STR_MEMORY        "Memory:"
-#define STR_TIME_SYNC     "Time synchronization"
-#define STR_DISABLED      "Disabled"
-#define STR_ENABLED_LOCAL "Enabled (local time)"
-#define STR_ENABLED_UTC   "Enabled (UTC)"
-#define STR_DYNAREC       "Dynamic Recompiler"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "Video:"
-#define STR_VIDEO_2       "Video 2:"
-#define STR_VOODOO        "Voodoo Graphics"
-#define STR_IBM8514       "IBM 8514/A Graphics"
-#define STR_XGA           "XGA Graphics"
-
-#define STR_MOUSE         "Mouse:"
-#define STR_JOYSTICK      "Joystick:"
-#define STR_JOY1          "Joystick 1..."
-#define STR_JOY2          "Joystick 2..."
-#define STR_JOY3          "Joystick 3..."
-#define STR_JOY4          "Joystick 4..."
-
-#define STR_SOUND1        "Sound card #1:"
-#define STR_SOUND2        "Sound card #2:"
-#define STR_SOUND3        "Sound card #3:"
-#define STR_SOUND4        "Sound card #4:"
-#define STR_MIDI_OUT      "MIDI Out Device:"
-#define STR_MIDI_IN       "MIDI In Device:"
-#define STR_MPU401        "Standalone MPU-401"
-#define STR_FLOAT         "Use FLOAT32 sound"
-#define STR_FM_DRIVER     "FM synth driver"
-#define STR_FM_DRV_NUKED  "Nuked (more accurate)"
-#define STR_FM_DRV_YMFM   "YMFM (faster)"
-
-#define STR_NET_TYPE      "Network type:"
-#define STR_PCAP          "PCap device:"
-#define STR_NET           "Network adapter:"
-#define STR_NET1          "Network card 1:"
-#define STR_NET2          "Network card 2:"
-#define STR_NET3          "Network card 3:"
-#define STR_NET4          "Network card 4:"
-
-#define STR_COM1          "COM1 Device:"
-#define STR_COM2          "COM2 Device:"
-#define STR_COM3          "COM3 Device:"
-#define STR_COM4          "COM4 Device:"
-#define STR_LPT1          "LPT1 Device:"
-#define STR_LPT2          "LPT2 Device:"
-#define STR_LPT3          "LPT3 Device:"
-#define STR_LPT4          "LPT4 Device:"
-#define STR_SERIAL1       "Serial port 1"
-#define STR_SERIAL2       "Serial port 2"
-#define STR_SERIAL3       "Serial port 3"
-#define STR_SERIAL4       "Serial port 4"
-#define STR_PARALLEL1     "Parallel port 1"
-#define STR_PARALLEL2     "Parallel port 2"
-#define STR_PARALLEL3     "Parallel port 3"
-#define STR_PARALLEL4     "Parallel port 4"
-#define STR_SERIAL_PASS1  "Serial port passthrough 1"
-#define STR_SERIAL_PASS2  "Serial port passthrough 2"
-#define STR_SERIAL_PASS3  "Serial port passthrough 3"
-#define STR_SERIAL_PASS4  "Serial port passthrough 4"
-
-#define STR_HDC           "HD Controller:"
-#define STR_FDC           "FD Controller:"
-#define STR_IDE_TER       "Tertiary IDE Controller"
-#define STR_IDE_QUA       "Quaternary IDE Controller"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "Controller 1:"
-#define STR_SCSI_2        "Controller 2:"
-#define STR_SCSI_3        "Controller 3:"
-#define STR_SCSI_4        "Controller 4:"
-#define STR_CASSETTE      "Cassette"
-
-#define STR_HDD           "Hard disks:"
-#define STR_NEW           "&New..."
-#define STR_EXISTING      "&Existing..."
-#define STR_REMOVE        "&Remove"
-#define STR_BUS           "Bus:"
-#define STR_CHANNEL       "Channel:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Speed:"
-
-#define STR_SPECIFY       "&Specify..."
-#define STR_SECTORS       "Sectors:"
-#define STR_HEADS         "Heads:"
-#define STR_CYLS          "Cylinders:"
-#define STR_SIZE_MB       "Size (MB):"
-#define STR_TYPE          "Type:"
-#define STR_IMG_FORMAT    "Image Format:"
-#define STR_BLOCK_SIZE    "Block Size:"
-
-#define STR_FLOPPY_DRIVES "Floppy drives:"
-#define STR_TURBO         "Turbo timings"
-#define STR_CHECKBPB      "Check BPB"
-#define STR_CDROM_DRIVES  "CD-ROM drives:"
-#define STR_CD_SPEED      "Speed:"
-
-#define STR_MO_DRIVES     "MO drives:"
-#define STR_ZIP_DRIVES    "ZIP drives:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "ISA RTC:"
-#define STR_ISAMEM        "ISA Memory Expansion"
-#define STR_ISAMEM_1      "Card 1:"
-#define STR_ISAMEM_2      "Card 2:"
-#define STR_ISAMEM_3      "Card 3:"
-#define STR_ISAMEM_4      "Card 4:"
-#define STR_BUGGER        "ISABugger device"
-#define STR_POSTCARD      "POST card"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Segoe UI"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "Error"
-    IDS_2050    "Fatal error"
-    IDS_2051    " - PAUSED"
-    IDS_2052    "Press Ctrl+Alt+PgDn to return to windowed mode."
-    IDS_2053    "Speed"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "ZIP images (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "86Box could not find any usable ROM images.\n\nPlease <a href=""https://github.com/86Box/roms/releases/latest"">download</a> a ROM set and extract it into the ""roms"" directory."
-    IDS_2057    "(empty)"
-    IDS_2058    "ZIP images (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0All files (*.*)\0*.*\0"
-    IDS_2059    "Turbo"
-    IDS_2060    "On"
-    IDS_2061    "Off"
-    IDS_2062    "All images (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Basic sector images (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Surface images (*.86F)\0*.86F\0"
-    IDS_2063    "Machine ""%hs"" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "Video card ""%hs"" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
-    IDS_2065    "Machine"
-    IDS_2066    "Display"
-    IDS_2067    "Input devices"
-    IDS_2068    "Sound"
-    IDS_2069    "Network"
-    IDS_2070    "Ports (COM & LPT)"
-    IDS_2071    "Storage controllers"
-    IDS_2072    "Hard disks"
-    IDS_2073    "Floppy & CD-ROM drives"
-    IDS_2074    "Other removable devices"
-    IDS_2075    "Other peripherals"
-    IDS_2076    "Surface images (*.86F)\0*.86F\0"
-    IDS_2077    "Click to capture mouse"
-    IDS_2078    "Press F8+F12 to release mouse"
-    IDS_2079    "Press F8+F12 or middle button to release mouse"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "Bus"
-    IDS_2082    "File"
-    IDS_2083    "C"
-    IDS_2084    "H"
-    IDS_2085    "S"
-    IDS_2086    "MB"
-    IDS_2087    "Speed"
-    IDS_2088    "Check BPB"
-    IDS_2089    "KB"
-    IDS_2090    "Could not initialize the video renderer."
-    IDS_2091    "Default"
-    IDS_2092    "%i Wait state(s)"
-    IDS_2093    "Type"
-    IDS_2094    "Failed to set up PCap"
-    IDS_2095    "No PCap devices found"
-    IDS_2096    "Invalid PCap device"
-    IDS_2097    "Standard 2-button joystick(s)"
-    IDS_2098    "Standard 4-button joystick"
-    IDS_2099    "Standard 6-button joystick"
-    IDS_2100    "Standard 8-button joystick"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Thrustmaster Flight Control System"
-    IDS_2104    "None"
-    IDS_2105    "Unable to load keyboard accelerators."
-    IDS_2106    "Unable to register raw input."
-    IDS_2107    "%u"
-    IDS_2108    "%u MB (CHS: %i, %i, %i)"
-    IDS_2109    "Floppy %i (%s): %ls"
-    IDS_2110    "All images (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Advanced sector images (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Basic sector images (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Flux images (*.FDI)\0*.FDI\0Surface images (*.86F;*.MFM)\0*.86F;*.MFM\0All files (*.*)\0*.*\0"
-    IDS_2112    "Unable to initialize SDL, SDL2.dll is required"
-    IDS_2113    "Are you sure you want to hard reset the emulated machine?"
-    IDS_2114    "Are you sure you want to exit 86Box?"
-    IDS_2115    "Unable to initialize Ghostscript"
-    IDS_2116    "MO %i (%ls): %ls"
-    IDS_2117    "MO images (*.IM?;*.MDI)\0*.IM?;*.MDI\0All files (*.*)\0*.*\0"
-    IDS_2118    "Welcome to 86Box!"
-    IDS_2119    "Internal controller"
-    IDS_2120    "Exit"
-    IDS_2121    "No ROMs found"
-    IDS_2122    "Do you want to save the settings?"
-    IDS_2123    "This will hard reset the emulated machine."
-    IDS_2124    "Save"
-    IDS_2125    "About 86Box"
-    IDS_2126    "86Box v" EMU_VERSION
-
-    IDS_2127    "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-    IDS_2128    "OK"
-    IDS_2129    "Hardware not available"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "Make sure " LIB_NAME_PCAP " is installed and that you are on a " LIB_NAME_PCAP "-compatible network connection."
-    IDS_2131    "Invalid configuration"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-    IDS_2135    "Entering fullscreen mode"
-    IDS_2136    "Don't show this message again"
-    IDS_2137    "Don't exit"
-    IDS_2138    "Reset"
-    IDS_2139    "Don't reset"
-    IDS_2140    "MO images (*.IM?;*.MDI)\0*.IM?;*.MDI\0All files (*.*)\0*.*\0"
-    IDS_2141    "CD-ROM images (*.ISO;*.CUE)\0*.ISO;*.CUE\0All files (*.*)\0*.*\0"
-    IDS_2142    "%hs Device Configuration"
-    IDS_2143    "Monitor in sleep mode"
-    IDS_2144    "OpenGL Shaders (*.GLSL)\0*.GLSL\0All files (*.*)\0*.*\0"
-    IDS_2145    "OpenGL options"
-    IDS_2146    "You are loading an unsupported configuration"
-    IDS_2147    "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
-    IDS_2148    "Continue"
-    IDS_2149    "Cassette: %s"
-    IDS_2150    "Cassette images (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0All files (*.*)\0*.*\0"
-    IDS_2151    "Cartridge %i: %ls"
-    IDS_2152    "Cartridge images (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0All files (*.*)\0*.*\0"
-    IDS_2153    "Error initializing renderer"
-    IDS_2154    "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-    IDS_2155    "Resume execution"
-    IDS_2156    "Pause execution"
-    IDS_2157    "Press Ctrl+Alt+Del"
-    IDS_2158    "Press Ctrl+Alt+Esc"
-    IDS_2159    "Hard reset"
-    IDS_2160    "ACPI shutdown"
-    IDS_2161    "Settings"
-    IDS_2162    "Type"
-    IDS_2163    "No Dynarec"
-    IDS_2164    "Old Dynarec"
-    IDS_2165    "New Dynarec"
-    IDS_2166    "Video card #2 ""%hs"" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
-    IDS_2167    "Failed to initialize network driver"
-    IDS_2168    "The network configuration will be switched to the null driver"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "Hard disk (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "MFM/RLL or ESDI CD-ROM drives never existed"
-    IDS_4100    "Custom..."
-    IDS_4101    "Custom (large)..."
-    IDS_4102    "Add New Hard Disk"
-    IDS_4103    "Add Existing Hard Disk"
-    IDS_4104    "HDI disk images cannot be larger than 4 GB."
-    IDS_4105    "Disk images cannot be larger than 127 GB."
-    IDS_4106    "Hard disk images (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0All files (*.*)\0*.*\0"
-    IDS_4107    "Unable to read file"
-    IDS_4108    "Unable to write file"
-    IDS_4109    "HDI or HDX images with a sector size other than 512 are not supported."
-    IDS_4110    "USB is not yet supported"
-    IDS_4111    "Disk image file already exists"
-    IDS_4112    "Please specify a valid file name."
-    IDS_4113    "Disk image created"
-    IDS_4114    "Make sure the file exists and is readable."
-    IDS_4115    "Make sure the file is being saved to a writable directory."
-    IDS_4116    "Disk image too large"
-    IDS_4117    "Remember to partition and format the newly-created drive."
-    IDS_4118    "The selected file will be overwritten. Are you sure you want to use it?"
-    IDS_4119    "Unsupported disk image"
-    IDS_4120    "Overwrite"
-    IDS_4121    "Don't overwrite"
-    IDS_4122    "Raw image (.img)"
-    IDS_4123    "HDI image (.hdi)"
-    IDS_4124    "HDX image (.hdx)"
-    IDS_4125    "Fixed-size VHD (.vhd)"
-    IDS_4126    "Dynamic-size VHD (.vhd)"
-    IDS_4127    "Differencing VHD (.vhd)"
-    IDS_4128    "Large blocks (2 MB)"
-    IDS_4129    "Small blocks (512 KB)"
-    IDS_4130    "VHD files (*.VHD)\0*.VHD\0All files (*.*)\0*.*\0"
-    IDS_4131    "Select the parent VHD"
-    IDS_4132    "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
-    IDS_4133    "Parent and child disk timestamps do not match"
-    IDS_4134    "Could not fix VHD timestamp."
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "Disabled"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "Disabled"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 kB"
-    IDS_5889    "180 kB"
-    IDS_5890    "320 kB"
-    IDS_5891    "360 kB"
-    IDS_5892    "640 kB"
-    IDS_5893    "720 kB"
-    IDS_5894    "1.2 MB"
-    IDS_5895    "1.25 MB"
-    IDS_5896    "1.44 MB"
-    IDS_5897    "DMF (cluster 1024)"
-    IDS_5898    "DMF (cluster 2048)"
-    IDS_5899    "2.88 MB"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5"" 128 MB (ISO 10090)"
-    IDS_5903    "3.5"" 230 MB (ISO 13963)"
-    IDS_5904    "3.5"" 540 MB (ISO 15498)"
-    IDS_5905    "3.5"" 640 MB (ISO 15498)"
-    IDS_5906    "3.5"" 1.3 GB (GigaMO)"
-    IDS_5907    "3.5"" 2.3 GB (GigaMO 2)"
-    IDS_5908    "5.25"" 600 MB"
-    IDS_5909    "5.25"" 650 MB"
-    IDS_5910    "5.25"" 1 GB"
-    IDS_5911    "5.25"" 1.3 GB"
-
-    IDS_6144    "Perfect RPM"
-    IDS_6145    "1% below perfect RPM"
-    IDS_6146    "1.5% below perfect RPM"
-    IDS_6147    "2% below perfect RPM"
-
-    IDS_7168    "(System Default)"
-END
-#define IDS_LANG_ENUS IDS_7168
-
-// English (U.K.) resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/en-US.rc b/src/win/languages/en-US.rc
deleted file mode 100644
index 05ef61790..000000000
--- a/src/win/languages/en-US.rc
+++ /dev/null
@@ -1,637 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Action"
-    BEGIN
-        MENUITEM "&Keyboard requires capture", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "&Right CTRL is left ALT", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "&Hard Reset...", IDM_ACTION_HRESET
-        MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-        MENUITEM "Ctrl+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "&Pause", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "E&xit...", IDM_ACTION_EXIT
-    END
-    POPUP "&View"
-    BEGIN
-        MENUITEM "&Hide status bar", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
-        MENUITEM "&Resizeable window", IDM_VID_RESIZE
-        MENUITEM "R&emember size && position", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "Re&nderer"
-        BEGIN
-            MENUITEM "&SDL (Software)", IDM_VID_SDL_SW
-            MENUITEM "SDL (&Hardware)", IDM_VID_SDL_HW
-            MENUITEM "SDL (&OpenGL)", IDM_VID_SDL_OPENGL
-            MENUITEM "Open&GL (3.0 Core)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "&VNC", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Specify dimensions...", IDM_VID_SPECIFY_DIM
-        MENUITEM "F&orce 4:3 display ratio", IDM_VID_FORCE43
-        POPUP "&Window scale factor"
-        BEGIN
-            MENUITEM "&0.5x", IDM_VID_SCALE_1X
-            MENUITEM "&1x", IDM_VID_SCALE_2X
-            MENUITEM "1.&5x", IDM_VID_SCALE_3X
-            MENUITEM "&2x", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "Filter method"
-        BEGIN
-            MENUITEM "&Nearest", IDM_VID_FILTER_NEAREST
-            MENUITEM "&Linear", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "Hi&DPI scaling", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "&Fullscreen\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "Fullscreen &stretch mode"
-        BEGIN
-            MENUITEM "&Full screen stretch", IDM_VID_FS_FULL
-            MENUITEM "&4:3", IDM_VID_FS_43
-            MENUITEM "&Square pixels (Keep ratio)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "&Integer scale", IDM_VID_FS_INT
-        END
-        POPUP "E&GA/(S)VGA settings"
-        BEGIN
-            MENUITEM "&Inverted VGA monitor", IDM_VID_INVERT
-            POPUP "VGA screen &type"
-            BEGIN
-                MENUITEM "RGB &Color", IDM_VID_GRAY_RGB
-                MENUITEM "&RGB Grayscale", IDM_VID_GRAY_MONO
-                MENUITEM "&Amber monitor", IDM_VID_GRAY_AMBER
-                MENUITEM "&Green monitor", IDM_VID_GRAY_GREEN
-                MENUITEM "&White monitor", IDM_VID_GRAY_WHITE
-            END
-            POPUP "Grayscale &conversion type"
-            BEGIN
-                MENUITEM "BT&601 (NTSC/PAL)", IDM_VID_GRAYCT_601
-                MENUITEM "BT&709 (HDTV)", IDM_VID_GRAYCT_709
-                MENUITEM "&Average", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "CGA/PCjr/Tandy/E&GA/(S)VGA overscan", IDM_VID_OVERSCAN
-        MENUITEM "Change contrast for &monochrome display", IDM_VID_CGACON
-    END
-    MENUITEM "&Media", IDM_MEDIA
-    POPUP "&Tools"
-    BEGIN
-        MENUITEM "&Settings...", IDM_CONFIG
-        MENUITEM "&Update status bar icons", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "Take s&creenshot\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "&Preferences...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "Enable &Discord integration", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "Sound &gain...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "Begin trace\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "End trace\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "&Help"
-    BEGIN
-        MENUITEM "&Documentation...", IDM_DOCS
-        MENUITEM "&About 86Box...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&New image...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Existing image...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "Existing image (&Write-protected)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Record", IDM_CASSETTE_RECORD
-        MENUITEM "&Play", IDM_CASSETTE_PLAY
-        MENUITEM "&Rewind to the beginning", IDM_CASSETTE_REWIND
-        MENUITEM "&Fast forward to the end", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "E&ject", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Image...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "E&ject", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&New image...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Existing image...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "Existing image (&Write-protected)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&xport to 86F...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "E&ject", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Mute", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "E&mpty", IDM_CDROM_EMPTY
-        MENUITEM "&Reload previous image", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "&Image...", IDM_CDROM_IMAGE
-        MENUITEM "&Folder...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&New image...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Existing image...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "Existing image (&Write-protected)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&ject", IDM_ZIP_EJECT
-        MENUITEM "&Reload previous image", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&New image...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Existing image...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "Existing image (&Write-protected)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&ject", IDM_MO_EJECT
-        MENUITEM "&Reload previous image", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "Target &framerate"
-    BEGIN
-        MENUITEM "&Sync with video", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "&25 fps", IDM_VID_GL_FPS_25
-        MENUITEM "&30 fps", IDM_VID_GL_FPS_30
-        MENUITEM "&50 fps", IDM_VID_GL_FPS_50
-        MENUITEM "&60 fps", IDM_VID_GL_FPS_60
-        MENUITEM "&75 fps", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "&VSync", IDM_VID_GL_VSYNC
-    MENUITEM "&Select shader...", IDM_VID_GL_SHADER
-    MENUITEM "&Remove shader", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "Preferences"
-#define STR_SND_GAIN      "Sound Gain"
-#define STR_NEW_FLOPPY    "New Image"
-#define STR_CONFIG        "Settings"
-#define STR_SPECIFY_DIM   "Specify Main Window Dimensions"
-
-#define STR_OK            "OK"
-#define STR_CANCEL        "Cancel"
-#define STR_GLOBAL        "Save these settings as &global defaults"
-#define STR_DEFAULT       "&Default"
-#define STR_LANGUAGE      "Language:"
-#define STR_ICONSET       "Icon set:"
-
-#define STR_GAIN          "Gain"
-
-#define STR_FILE_NAME     "File name:"
-#define STR_DISK_SIZE     "Disk size:"
-#define STR_RPM_MODE      "RPM mode:"
-#define STR_PROGRESS      "Progress:"
-
-#define STR_WIDTH         "Width:"
-#define STR_HEIGHT        "Height:"
-#define STR_LOCK_TO_SIZE  "Lock to this size"
-
-#define STR_MACHINE_TYPE  "Machine type:"
-#define STR_MACHINE       "Machine:"
-#define STR_CONFIGURE     "Configure"
-#define STR_CPU_TYPE      "CPU type:"
-#define STR_CPU_SPEED     "Speed:"
-#define STR_FPU           "FPU:"
-#define STR_WAIT_STATES   "Wait states:"
-#define STR_MB            "MB"
-#define STR_MEMORY        "Memory:"
-#define STR_TIME_SYNC     "Time synchronization"
-#define STR_DISABLED      "Disabled"
-#define STR_ENABLED_LOCAL "Enabled (local time)"
-#define STR_ENABLED_UTC   "Enabled (UTC)"
-#define STR_DYNAREC       "Dynamic Recompiler"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "Video:"
-#define STR_VIDEO_2       "Video 2:"
-#define STR_VOODOO        "Voodoo Graphics"
-#define STR_IBM8514       "IBM 8514/A Graphics"
-#define STR_XGA           "XGA Graphics"
-
-#define STR_MOUSE         "Mouse:"
-#define STR_JOYSTICK      "Joystick:"
-#define STR_JOY1          "Joystick 1..."
-#define STR_JOY2          "Joystick 2..."
-#define STR_JOY3          "Joystick 3..."
-#define STR_JOY4          "Joystick 4..."
-
-#define STR_SOUND1        "Sound card #1:"
-#define STR_SOUND2        "Sound card #2:"
-#define STR_SOUND3        "Sound card #3:"
-#define STR_SOUND4        "Sound card #4:"
-#define STR_MIDI_OUT      "MIDI Out Device:"
-#define STR_MIDI_IN       "MIDI In Device:"
-#define STR_MPU401        "Standalone MPU-401"
-#define STR_FLOAT         "Use FLOAT32 sound"
-#define STR_FM_DRIVER     "FM synth driver"
-#define STR_FM_DRV_NUKED  "Nuked (more accurate)"
-#define STR_FM_DRV_YMFM   "YMFM (faster)"
-
-#define STR_NET_TYPE      "Network type:"
-#define STR_PCAP          "PCap device:"
-#define STR_NET           "Network adapter:"
-#define STR_NET1          "Network card 1:"
-#define STR_NET2          "Network card 2:"
-#define STR_NET3          "Network card 3:"
-#define STR_NET4          "Network card 4:"
-
-#define STR_COM1          "COM1 Device:"
-#define STR_COM2          "COM2 Device:"
-#define STR_COM3          "COM3 Device:"
-#define STR_COM4          "COM4 Device:"
-#define STR_LPT1          "LPT1 Device:"
-#define STR_LPT2          "LPT2 Device:"
-#define STR_LPT3          "LPT3 Device:"
-#define STR_LPT4          "LPT4 Device:"
-#define STR_SERIAL1       "Serial port 1"
-#define STR_SERIAL2       "Serial port 2"
-#define STR_SERIAL3       "Serial port 3"
-#define STR_SERIAL4       "Serial port 4"
-#define STR_PARALLEL1     "Parallel port 1"
-#define STR_PARALLEL2     "Parallel port 2"
-#define STR_PARALLEL3     "Parallel port 3"
-#define STR_PARALLEL4     "Parallel port 4"
-#define STR_SERIAL_PASS1  "Serial port passthrough 1"
-#define STR_SERIAL_PASS2  "Serial port passthrough 2"
-#define STR_SERIAL_PASS3  "Serial port passthrough 3"
-#define STR_SERIAL_PASS4  "Serial port passthrough 4"
-
-#define STR_HDC           "HD Controller:"
-#define STR_FDC           "FD Controller:"
-#define STR_IDE_TER       "Tertiary IDE Controller"
-#define STR_IDE_QUA       "Quaternary IDE Controller"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "Controller 1:"
-#define STR_SCSI_2        "Controller 2:"
-#define STR_SCSI_3        "Controller 3:"
-#define STR_SCSI_4        "Controller 4:"
-#define STR_CASSETTE      "Cassette"
-
-#define STR_HDD           "Hard disks:"
-#define STR_NEW           "&New..."
-#define STR_EXISTING      "&Existing..."
-#define STR_REMOVE        "&Remove"
-#define STR_BUS           "Bus:"
-#define STR_CHANNEL       "Channel:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Speed:"
-
-#define STR_SPECIFY       "&Specify..."
-#define STR_SECTORS       "Sectors:"
-#define STR_HEADS         "Heads:"
-#define STR_CYLS          "Cylinders:"
-#define STR_SIZE_MB       "Size (MB):"
-#define STR_TYPE          "Type:"
-#define STR_IMG_FORMAT    "Image Format:"
-#define STR_BLOCK_SIZE    "Block Size:"
-
-#define STR_FLOPPY_DRIVES "Floppy drives:"
-#define STR_TURBO         "Turbo timings"
-#define STR_CHECKBPB      "Check BPB"
-#define STR_CDROM_DRIVES  "CD-ROM drives:"
-#define STR_CD_SPEED      "Speed:"
-
-#define STR_MO_DRIVES     "MO drives:"
-#define STR_ZIP_DRIVES    "ZIP drives:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "ISA RTC:"
-#define STR_ISAMEM        "ISA Memory Expansion"
-#define STR_ISAMEM_1      "Card 1:"
-#define STR_ISAMEM_2      "Card 2:"
-#define STR_ISAMEM_3      "Card 3:"
-#define STR_ISAMEM_4      "Card 4:"
-#define STR_BUGGER        "ISABugger device"
-#define STR_POSTCARD      "POST card"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Segoe UI"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "Error"
-    IDS_2050    "Fatal error"
-    IDS_2051    " - PAUSED"
-    IDS_2052    "Press Ctrl+Alt+PgDn to return to windowed mode."
-    IDS_2053    "Speed"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "ZIP images (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "86Box could not find any usable ROM images.\n\nPlease <a href=""https://github.com/86Box/roms/releases/latest"">download</a> a ROM set and extract it into the ""roms"" directory."
-    IDS_2057    "(empty)"
-    IDS_2058    "ZIP images (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0All files (*.*)\0*.*\0"
-    IDS_2059    "Turbo"
-    IDS_2060    "On"
-    IDS_2061    "Off"
-    IDS_2062    "All images (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Basic sector images (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Surface images (*.86F)\0*.86F\0"
-    IDS_2063    "Machine ""%hs"" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "Video card ""%hs"" is not available due to missing ROMs in the roms/video directory. Switching to an available video card."
-    IDS_2065    "Machine"
-    IDS_2066    "Display"
-    IDS_2067    "Input devices"
-    IDS_2068    "Sound"
-    IDS_2069    "Network"
-    IDS_2070    "Ports (COM & LPT)"
-    IDS_2071    "Storage controllers"
-    IDS_2072    "Hard disks"
-    IDS_2073    "Floppy & CD-ROM drives"
-    IDS_2074    "Other removable devices"
-    IDS_2075    "Other peripherals"
-    IDS_2076    "Surface images (*.86F)\0*.86F\0"
-    IDS_2077    "Click to capture mouse"
-    IDS_2078    "Press F8+F12 to release mouse"
-    IDS_2079    "Press F8+F12 or middle button to release mouse"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "Bus"
-    IDS_2082    "File"
-    IDS_2083    "C"
-    IDS_2084    "H"
-    IDS_2085    "S"
-    IDS_2086    "MB"
-    IDS_2087    "Speed"
-    IDS_2088    "Check BPB"
-    IDS_2089    "KB"
-    IDS_2090    "Could not initialize the video renderer."
-    IDS_2091    "Default"
-    IDS_2092    "%i Wait state(s)"
-    IDS_2093    "Type"
-    IDS_2094    "Failed to set up PCap"
-    IDS_2095    "No PCap devices found"
-    IDS_2096    "Invalid PCap device"
-    IDS_2097    "Standard 2-button joystick(s)"
-    IDS_2098    "Standard 4-button joystick"
-    IDS_2099    "Standard 6-button joystick"
-    IDS_2100    "Standard 8-button joystick"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Thrustmaster Flight Control System"
-    IDS_2104    "None"
-    IDS_2105    "Unable to load keyboard accelerators."
-    IDS_2106    "Unable to register raw input."
-    IDS_2107    "%u"
-    IDS_2108    "%u MB (CHS: %i, %i, %i)"
-    IDS_2109    "Floppy %i (%s): %ls"
-    IDS_2110    "All images (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Advanced sector images (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Basic sector images (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Flux images (*.FDI)\0*.FDI\0Surface images (*.86F;*.MFM)\0*.86F;*.MFM\0All files (*.*)\0*.*\0"
-    IDS_2112    "Unable to initialize SDL, SDL2.dll is required"
-    IDS_2113    "Are you sure you want to hard reset the emulated machine?"
-    IDS_2114    "Are you sure you want to exit 86Box?"
-    IDS_2115    "Unable to initialize Ghostscript"
-    IDS_2116    "MO %i (%ls): %ls"
-    IDS_2117    "MO images (*.IM?;*.MDI)\0*.IM?;*.MDI\0All files (*.*)\0*.*\0"
-    IDS_2118    "Welcome to 86Box!"
-    IDS_2119    "Internal controller"
-    IDS_2120    "Exit"
-    IDS_2121    "No ROMs found"
-    IDS_2122    "Do you want to save the settings?"
-    IDS_2123    "This will hard reset the emulated machine."
-    IDS_2124    "Save"
-    IDS_2125    "About 86Box"
-    IDS_2126    "86Box v" EMU_VERSION
-
-    IDS_2127    "An emulator of old computers\n\nAuthors: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information."
-    IDS_2128    "OK"
-    IDS_2129    "Hardware not available"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "Make sure " LIB_NAME_PCAP " is installed and that you are on a " LIB_NAME_PCAP "-compatible network connection."
-    IDS_2131    "Invalid configuration"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-    IDS_2135    "Entering fullscreen mode"
-    IDS_2136    "Don't show this message again"
-    IDS_2137    "Don't exit"
-    IDS_2138    "Reset"
-    IDS_2139    "Don't reset"
-    IDS_2140    "MO images (*.IM?;*.MDI)\0*.IM?;*.MDI\0All files (*.*)\0*.*\0"
-    IDS_2141    "CD-ROM images (*.ISO;*.CUE)\0*.ISO;*.CUE\0All files (*.*)\0*.*\0"
-    IDS_2142    "%hs Device Configuration"
-    IDS_2143    "Monitor in sleep mode"
-    IDS_2144    "OpenGL Shaders (*.GLSL)\0*.GLSL\0All files (*.*)\0*.*\0"
-    IDS_2145    "OpenGL options"
-    IDS_2146    "You are loading an unsupported configuration"
-    IDS_2147    "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
-    IDS_2148    "Continue"
-    IDS_2149    "Cassette: %s"
-    IDS_2150    "Cassette images (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0All files (*.*)\0*.*\0"
-    IDS_2151    "Cartridge %i: %ls"
-    IDS_2152    "Cartridge images (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0All files (*.*)\0*.*\0"
-    IDS_2153    "Error initializing renderer"
-    IDS_2154    "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-    IDS_2155    "Resume execution"
-    IDS_2156    "Pause execution"
-    IDS_2157    "Press Ctrl+Alt+Del"
-    IDS_2158    "Press Ctrl+Alt+Esc"
-    IDS_2159    "Hard reset"
-    IDS_2160    "ACPI shutdown"
-    IDS_2161    "Settings"
-    IDS_2162    "Type"
-    IDS_2163    "No Dynarec"
-    IDS_2164    "Old Dynarec"
-    IDS_2165    "New Dynarec"
-    IDS_2166    "Video card #2 ""%hs"" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
-    IDS_2167    "Failed to initialize network driver"
-    IDS_2168    "The network configuration will be switched to the null driver"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "Hard disk (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "MFM/RLL or ESDI CD-ROM drives never existed"
-    IDS_4100    "Custom..."
-    IDS_4101    "Custom (large)..."
-    IDS_4102    "Add New Hard Disk"
-    IDS_4103    "Add Existing Hard Disk"
-    IDS_4104    "HDI disk images cannot be larger than 4 GB."
-    IDS_4105    "Disk images cannot be larger than 127 GB."
-    IDS_4106    "Hard disk images (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0All files (*.*)\0*.*\0"
-    IDS_4107    "Unable to read file"
-    IDS_4108    "Unable to write file"
-    IDS_4109    "HDI or HDX images with a sector size other than 512 are not supported."
-    IDS_4110    "USB is not yet supported"
-    IDS_4111    "Disk image file already exists"
-    IDS_4112    "Please specify a valid file name."
-    IDS_4113    "Disk image created"
-    IDS_4114    "Make sure the file exists and is readable."
-    IDS_4115    "Make sure the file is being saved to a writable directory."
-    IDS_4116    "Disk image too large"
-    IDS_4117    "Remember to partition and format the newly-created drive."
-    IDS_4118    "The selected file will be overwritten. Are you sure you want to use it?"
-    IDS_4119    "Unsupported disk image"
-    IDS_4120    "Overwrite"
-    IDS_4121    "Don't overwrite"
-    IDS_4122    "Raw image (.img)"
-    IDS_4123    "HDI image (.hdi)"
-    IDS_4124    "HDX image (.hdx)"
-    IDS_4125    "Fixed-size VHD (.vhd)"
-    IDS_4126    "Dynamic-size VHD (.vhd)"
-    IDS_4127    "Differencing VHD (.vhd)"
-    IDS_4128    "Large blocks (2 MB)"
-    IDS_4129    "Small blocks (512 KB)"
-    IDS_4130    "VHD files (*.VHD)\0*.VHD\0All files (*.*)\0*.*\0"
-    IDS_4131    "Select the parent VHD"
-    IDS_4132    "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
-    IDS_4133    "Parent and child disk timestamps do not match"
-    IDS_4134    "Could not fix VHD timestamp."
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "Disabled"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "Disabled"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 kB"
-    IDS_5889    "180 kB"
-    IDS_5890    "320 kB"
-    IDS_5891    "360 kB"
-    IDS_5892    "640 kB"
-    IDS_5893    "720 kB"
-    IDS_5894    "1.2 MB"
-    IDS_5895    "1.25 MB"
-    IDS_5896    "1.44 MB"
-    IDS_5897    "DMF (cluster 1024)"
-    IDS_5898    "DMF (cluster 2048)"
-    IDS_5899    "2.88 MB"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5"" 128 MB (ISO 10090)"
-    IDS_5903    "3.5"" 230 MB (ISO 13963)"
-    IDS_5904    "3.5"" 540 MB (ISO 15498)"
-    IDS_5905    "3.5"" 640 MB (ISO 15498)"
-    IDS_5906    "3.5"" 1.3 GB (GigaMO)"
-    IDS_5907    "3.5"" 2.3 GB (GigaMO 2)"
-    IDS_5908    "5.25"" 600 MB"
-    IDS_5909    "5.25"" 650 MB"
-    IDS_5910    "5.25"" 1 GB"
-    IDS_5911    "5.25"" 1.3 GB"
-
-    IDS_6144    "Perfect RPM"
-    IDS_6145    "1% below perfect RPM"
-    IDS_6146    "1.5% below perfect RPM"
-    IDS_6147    "2% below perfect RPM"
-
-    IDS_7168    "(System Default)"
-END
-#define IDS_LANG_ENUS IDS_7168
-
-// English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/es-ES.rc b/src/win/languages/es-ES.rc
deleted file mode 100644
index e9fef50d4..000000000
--- a/src/win/languages/es-ES.rc
+++ /dev/null
@@ -1,637 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Spanish (Spain) resources
-
-#ifdef _WIN32
-LANGUAGE LANG_SPANISH, SUBLANG_SPANISH
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Acción"
-    BEGIN
-        MENUITEM "&Teclado requiere captura", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "CTRL &derecho es ALT izquierdo", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "&Hard Reset...", IDM_ACTION_HRESET
-        MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-    MENUITEM "Ctrl+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "&Pausa", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "&Salir...", IDM_ACTION_EXIT
-    END
-    POPUP "&Vista"
-    BEGIN
-        MENUITEM "&Ocultar barra de estado", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
-        MENUITEM "&Ventana redimensionable", IDM_VID_RESIZE
-        MENUITEM "&Recordar tamaño y posición", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "Re&nderizador"
-        BEGIN
-            MENUITEM "&SDL (Software)", IDM_VID_SDL_SW
-            MENUITEM "SDL (&Hardware)", IDM_VID_SDL_HW
-            MENUITEM "SDL (&OpenGL)", IDM_VID_SDL_OPENGL
-            MENUITEM "Open&GL (3.0 Core)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "&VNC", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "E&specificar dimensiones...", IDM_VID_SPECIFY_DIM
-        MENUITEM "F&orzar ratio 4:3", IDM_VID_FORCE43
-        POPUP "&Factor de escalado de ventana"
-        BEGIN
-            MENUITEM "&0.5x", IDM_VID_SCALE_1X
-            MENUITEM "&1x", IDM_VID_SCALE_2X
-            MENUITEM "1.&5x", IDM_VID_SCALE_3X
-            MENUITEM "&2x", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "&Método de filtrado"
-        BEGIN
-            MENUITEM "&Más cercano", IDM_VID_FILTER_NEAREST
-            MENUITEM "&Lineal", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "&Escalado alta densidad", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "&Pantalla completa\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "Escalado pantalla completa"
-        BEGIN
-            MENUITEM "&Estirar", IDM_VID_FS_FULL
-            MENUITEM "&4:3", IDM_VID_FS_43
-            MENUITEM "&Píxeles cuadrados (Mant. aspecto)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "&Escalado valor entero", IDM_VID_FS_INT
-        END
-        POPUP "&Ajustes EGA/(S)VGA"
-        BEGIN
-            MENUITEM "&Monitor VGA invertido", IDM_VID_INVERT
-            POPUP "&Tipo de pantalla VGA"
-            BEGIN
-                MENUITEM "RGB &Color", IDM_VID_GRAY_RGB
-                MENUITEM "RGB &Grises", IDM_VID_GRAY_MONO
-                MENUITEM "Monitor &Ámbar", IDM_VID_GRAY_AMBER
-                MENUITEM "Monitor &Verde", IDM_VID_GRAY_GREEN
-                MENUITEM "Monitor &Blanco", IDM_VID_GRAY_WHITE
-            END
-            POPUP "&Conversión a grises"
-            BEGIN
-                MENUITEM "BT&601 (NTSC/PAL)", IDM_VID_GRAYCT_601
-                MENUITEM "BT&709 (HDTV)", IDM_VID_GRAYCT_709
-                MENUITEM "&Media", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "&Overscan CGA/PCjr/Tandy/EGA/(S)VGA", IDM_VID_OVERSCAN
-        MENUITEM "Cambiar contraste para pantalla &monocroma", IDM_VID_CGACON
-    END
-    MENUITEM "&Medios", IDM_MEDIA
-    POPUP "&Herramientas"
-    BEGIN
-        MENUITEM "&Ajustes...", IDM_CONFIG
-        MENUITEM "&Actualizar iconos en barra de estado", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "Tomar c&aptura\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "&Preferencias...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "Habilitar integración con &Discord", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "&Ganancia de sonido...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "Comenzar traza\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "Terminar traza\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "&Ayuda"
-    BEGIN
-        MENUITEM "&Documentación...", IDM_DOCS
-        MENUITEM "&Acerca de 86Box...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nueva imagen...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "Imagen &Existente...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "Imagen Existente (&Sólo-lectura)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Grabar", IDM_CASSETTE_RECORD
-        MENUITEM "&Reproducir", IDM_CASSETTE_PLAY
-        MENUITEM "&Rebobinar al inicio", IDM_CASSETTE_REWIND
-        MENUITEM "&Avance rápido al final", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "E&xtraer", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Imagen...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "E&xtraer", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nueva imagen...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "Imagen &existente...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "Imagen existente (&sólo-lectura)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&xportar a 86F...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "E&xtraer", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Silenciar", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "E&xtraer disco", IDM_CDROM_EMPTY
-        MENUITEM "&Recargar imagen previa", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "&Imagen...", IDM_CDROM_IMAGE
-        MENUITEM "&Carpeta...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nueva imagen...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "Imagen &existente...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "Imagen existente (&sólo-lectura)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&xtraer", IDM_ZIP_EJECT
-        MENUITEM "&Recargar imagen previa", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nueva imagen...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "Imagen &existente...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "Imagen existente (&sólo-lectura)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&xtraer", IDM_MO_EJECT
-        MENUITEM "&Recargar imagen previa", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Tasa de refresco objetivo"
-    BEGIN
-        MENUITEM "&Sincronizar con vídeo", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "&25 fps", IDM_VID_GL_FPS_25
-        MENUITEM "&30 fps", IDM_VID_GL_FPS_30
-        MENUITEM "&50 fps", IDM_VID_GL_FPS_50
-        MENUITEM "&60 fps", IDM_VID_GL_FPS_60
-        MENUITEM "&75 fps", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "&VSync", IDM_VID_GL_VSYNC
-    MENUITEM "&Seleccionar shader...", IDM_VID_GL_SHADER
-    MENUITEM "&Eliminar shader", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "Preferencias"
-#define STR_SND_GAIN      "Ganancia de Sonido"
-#define STR_NEW_FLOPPY    "Nueva Imagen"
-#define STR_CONFIG        "Ajustes"
-#define STR_SPECIFY_DIM   "Especificar Dimensiones de la Ventana Principal"
-
-#define STR_OK            "Aceptar"
-#define STR_CANCEL        "Cancelar"
-#define STR_GLOBAL        "Salvar estos ajustes como por &defecto globalmente"
-#define STR_DEFAULT       "&Por defecto"
-#define STR_LANGUAGE      "Idioma:"
-#define STR_ICONSET       "Juego de iconos:"
-
-#define STR_GAIN          "Ganancia"
-
-#define STR_FILE_NAME     "Nombre de archivo:"
-#define STR_DISK_SIZE     "Tamaño de disco:"
-#define STR_RPM_MODE      "Modo RPM:"
-#define STR_PROGRESS      "Progreso:"
-
-#define STR_WIDTH         "Ancho:"
-#define STR_HEIGHT        "Alto:"
-#define STR_LOCK_TO_SIZE  "Bloquear a este tamaño"
-
-#define STR_MACHINE_TYPE  "Tipo de máquina:"
-#define STR_MACHINE       "Máquina:"
-#define STR_CONFIGURE     "Configurar"
-#define STR_CPU_TYPE      "Tipo de CPU:"
-#define STR_CPU_SPEED     "Velocidad:"
-#define STR_FPU           "FPU:"
-#define STR_WAIT_STATES   "Estados en espera:"
-#define STR_MB            "MB"
-#define STR_MEMORY        "Memoria:"
-#define STR_TIME_SYNC     "Sincronización horaria"
-#define STR_DISABLED      "Deshabilitado"
-#define STR_ENABLED_LOCAL "Habilitado (hora local)"
-#define STR_ENABLED_UTC   "Habilitado (UTC)"
-#define STR_DYNAREC       "Recompilador Dinámico"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "Vídeo:"
-#define STR_VIDEO_2       "Vídeo 2:"
-#define STR_VOODOO        "Voodoo Graphics"
-#define STR_IBM8514       "IBM 8514/A Graphics"
-#define STR_XGA           "XGA Graphics"
-
-#define STR_MOUSE         "Ratón:"
-#define STR_JOYSTICK      "Mando:"
-#define STR_JOY1          "Mando 1..."
-#define STR_JOY2          "Mando 2..."
-#define STR_JOY3          "Mando 3..."
-#define STR_JOY4          "Mando 4..."
-
-#define STR_SOUND1        "Tarjeta de sonido 1:"
-#define STR_SOUND2        "Tarjeta de sonido 2:"
-#define STR_SOUND3        "Tarjeta de sonido 3:"
-#define STR_SOUND4        "Tarjeta de sonido 4:"
-#define STR_MIDI_OUT      "Dispositivo MIDI de salida:"
-#define STR_MIDI_IN       "Dispositivo MIDI de entrada:"
-#define STR_MPU401        "MPU-401 independiente"
-#define STR_FLOAT         "Usar sonido FLOAT32"
-#define STR_FM_DRIVER     "Controlador de sintet. FM"
-#define STR_FM_DRV_NUKED  "Nuked (más preciso)"
-#define STR_FM_DRV_YMFM   "YMFM (más rápido)"
-
-#define STR_NET_TYPE      "Tipo de red:"
-#define STR_PCAP          "Dispositivo PCap:"
-#define STR_NET           "Adaptador de red:"
-#define STR_NET1          "Network card 1:"
-#define STR_NET2          "Network card 2:"
-#define STR_NET3          "Network card 3:"
-#define STR_NET4          "Network card 4:"
-
-#define STR_COM1          "Dispositivo COM1:"
-#define STR_COM2          "Dispositivo COM2:"
-#define STR_COM3          "Dispositivo COM3:"
-#define STR_COM4          "Dispositivo COM4:"
-#define STR_LPT1          "Dispositivo LPT1:"
-#define STR_LPT2          "Dispositivo LPT2:"
-#define STR_LPT3          "Dispositivo LPT3:"
-#define STR_LPT4          "Dispositivo LPT4:"
-#define STR_SERIAL1       "Puerto serie 1"
-#define STR_SERIAL2       "Puerto serie 2"
-#define STR_SERIAL3       "Puerto serie 3"
-#define STR_SERIAL4       "Puerto serie 4"
-#define STR_PARALLEL1     "Puerto paralelo 1"
-#define STR_PARALLEL2     "Puerto paralelo 2"
-#define STR_PARALLEL3     "Puerto paralelo 3"
-#define STR_PARALLEL4     "Puerto paralelo 4"
-#define STR_SERIAL_PASS1  "Serial port passthrough 1"
-#define STR_SERIAL_PASS2  "Serial port passthrough 2"
-#define STR_SERIAL_PASS3  "Serial port passthrough 3"
-#define STR_SERIAL_PASS4  "Serial port passthrough 4"
-
-#define STR_HDC           "Controladora HD:"
-#define STR_FDC           "Controladora FD:"
-#define STR_IDE_TER       "Tercera controladora IDE"
-#define STR_IDE_QUA       "Cuarta controladora IDE"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "Controladora 1:"
-#define STR_SCSI_2        "Controladora 2:"
-#define STR_SCSI_3        "Controladora 3:"
-#define STR_SCSI_4        "Controladora 4:"
-#define STR_CASSETTE      "Cassette"
-
-#define STR_HDD           "Discos duros:"
-#define STR_NEW           "&Nuevo..."
-#define STR_EXISTING      "&Existente..."
-#define STR_REMOVE        "E&liminar"
-#define STR_BUS           "Bus:"
-#define STR_CHANNEL       "Canal:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Speed:"
-
-#define STR_SPECIFY       "E&specificar..."
-#define STR_SECTORS       "Sectores:"
-#define STR_HEADS         "Cabezas:"
-#define STR_CYLS          "Cilindros:"
-#define STR_SIZE_MB       "Tamaño (MB):"
-#define STR_TYPE          "Tipo:"
-#define STR_IMG_FORMAT    "Formato de imagen:"
-#define STR_BLOCK_SIZE    "Tamaño de bloque:"
-
-#define STR_FLOPPY_DRIVES "Unidades de disquete:"
-#define STR_TURBO         "Temporizaciones Turbo"
-#define STR_CHECKBPB      "Chequear BPB"
-#define STR_CDROM_DRIVES  "Unidades de CD-ROM:"
-#define STR_CD_SPEED      "Velocidad:"
-
-#define STR_MO_DRIVES     "Unidades MO:"
-#define STR_ZIP_DRIVES    "Unidades ZIP:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "ISA RTC:"
-#define STR_ISAMEM        "Expansión de Memoria ISA"
-#define STR_ISAMEM_1      "Tarjeta 1:"
-#define STR_ISAMEM_2      "Tarjeta 2:"
-#define STR_ISAMEM_3      "Tarjeta 3:"
-#define STR_ISAMEM_4      "Tarjeta 4:"
-#define STR_BUGGER        "Dispositivo ISABugger"
-#define STR_POSTCARD      "Tarjeta POST"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Segoe UI"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "Error"
-    IDS_2050    "Error fatal"
-    IDS_2051    " - PAUSED"
-    IDS_2052    "Pulsa Ctrl+Alt+PgDn para volver a modo ventana."
-    IDS_2053    "Velocidad"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "Imagenes ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "86Box no pudo encontrar ninguna imagen ROM usable.\n\nPor favor <a href=""https://github.com/86Box/roms/releases/latest"">descarga</a> un grupo de imágenes y extráelas en el directorio ""roms""."
-    IDS_2057    "(vacío)"
-    IDS_2058    "Imagenes ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0All files (*.*)\0*.*\0"
-    IDS_2059    "Turbo"
-    IDS_2060    "On"
-    IDS_2061    "Off"
-    IDS_2062    "Todas las imagenes (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Basic sector images (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Surface images (*.86F)\0*.86F\0"
-    IDS_2063    "La máquina ""%hs"" no está disponible debido a ROMs faltantes en el directorio roms/machines. Cambiando a una máquina disponible."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "La tarjeta de vídeo ""%hs"" no está disponible debido a ROMs faltantes en el directorio roms/machines. Cambiando a una tarjeta de vídeo disponible."
-    IDS_2065    "Máquina"
-    IDS_2066    "Vídeo"
-    IDS_2067    "Dispositivos de Entrada"
-    IDS_2068    "Sonido"
-    IDS_2069    "Red"
-    IDS_2070    "Puertos (COM y LPT)"
-    IDS_2071    "Controladoras de Almacenamiento"
-    IDS_2072    "Discos Duros"
-    IDS_2073    "Disquetes y unidades de CD-ROM"
-    IDS_2074    "Otros dispositivos extraíbles"
-    IDS_2075    "Otros periféricos"
-    IDS_2076    "Imágenes de superficie (*.86F)\0*.86F\0"
-    IDS_2077    "Haz click para capturar el ratón"
-    IDS_2078    "Pulsa F8+F12 para liberar el ratón"
-    IDS_2079    "Pulsa F8+F12 o el botón central para liberar el ratón"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "Bus"
-    IDS_2082    "Archivo"
-    IDS_2083    "C"
-    IDS_2084    "H"
-    IDS_2085    "S"
-    IDS_2086    "MB"
-    IDS_2087    "Speed"
-    IDS_2088    "Chequear BPB"
-    IDS_2089    "KB"
-    IDS_2090    "Incapaz de inicializar el renderizador de vídeo."
-    IDS_2091    "Por defecto"
-    IDS_2092    "%i estado(s) de Espera"
-    IDS_2093    "Tipo"
-    IDS_2094    "Incapaz de configurar PCap"
-    IDS_2095    "No se encontraron dispositivos PCap"
-    IDS_2096    "Dispositivo PCap inválido"
-    IDS_2097    "Mando(s) de 2 botones estándar"
-    IDS_2098    "Mando de 4 botones estándar"
-    IDS_2099    "Mando de 6 botones estándar"
-    IDS_2100    "Mando de 8 botones estándar"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Thrustmaster Flight Control System"
-    IDS_2104    "Ninguno"
-    IDS_2105    "Incapaz de cargar aceleradores de teclado."
-    IDS_2106    "Incapaz de registrar entrada directa."
-    IDS_2107    "%u"
-    IDS_2108    "%u MB (CHS: %i, %i, %i)"
-    IDS_2109    "Disquete %i (%s): %ls"
-    IDS_2110    "Todas las Imágenes (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Advanced sector images (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Basic sector images (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Flux images (*.FDI)\0*.FDI\0Surface images (*.86F;*.MFM)\0*.86F;*.MFM\0All files (*.*)\0*.*\0"
-    IDS_2112    "Incapaz de inicializar SDL, se requiere SDL2.dll"
-    IDS_2113    "¿Seguro que quieres resetear la máquina emulada?"
-    IDS_2114    "¿Seguro que quieres cerrar 86Box?"
-    IDS_2115    "Incapaz de inicializar Ghostscript"
-    IDS_2116    "MO %i (%ls): %ls"
-    IDS_2117    "Imágenes de MO (*.IM?;*.MDI)\0*.IM?;*.MDI\0All files (*.*)\0*.*\0"
-    IDS_2118    "¡Bienvenido a 86Box!"
-    IDS_2119    "Controladora interna"
-    IDS_2120    "Salir"
-    IDS_2121    "No se encontraron ROMs"
-    IDS_2122    "¿Quieres guardar los ajustes?"
-    IDS_2123    "Se hará hard reset de la máquina emulada."
-    IDS_2124    "Guardar"
-    IDS_2125    "Acerca de 86Box"
-    IDS_2126    "86Box v" EMU_VERSION
-
-    IDS_2127    "Un emulador de ordenadores antigüos\n\nAutores: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, y otros.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, y otros.\n\nLiberado bajo la GNU General Public License versión 2 o posterior. Ver LICENSE para más información."
-    IDS_2128    "Aceptar"
-    IDS_2129    "Hardware no disponible"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "Asegúrate de que " LIB_NAME_PCAP " está instalado y de que estás en una conexión de red compatible con " LIB_NAME_PCAP "."
-    IDS_2131    "Configuración inválida"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " es necesaria para la conversión automática de archivos PostScript a PDF.\n\nCualquier documento enviado a la impresora genérica postScript se guardará como archivo PostScript (.ps)."
-    IDS_2135    "Entrando en modo pantalla completa"
-    IDS_2136    "No mostrar más este mensaje"
-    IDS_2137    "No salir"
-    IDS_2138    "Resetear"
-    IDS_2139    "No resetear"
-    IDS_2140    "Imágenes de MO (*.IM?;*.MDI)\0*.IM?;*.MDI\0All files (*.*)\0*.*\0"
-    IDS_2141    "Imágenes de CD-ROM (*.ISO;*.CUE)\0*.ISO;*.CUE\0All files (*.*)\0*.*\0"
-    IDS_2142    "%hs Configuración de Dispositivo"
-    IDS_2143    "Monitor en modo ahorro"
-    IDS_2144    "Shaders OpenGL (*.GLSL)\0*.GLSL\0All files (*.*)\0*.*\0"
-    IDS_2145    "Opciones OpenGL"
-    IDS_2146    "Estás cargando una configuración no soportada"
-    IDS_2147    "El Filtrado de tipo de CPU basado en máquina seleccionada está deshabilitado para la esta máquina.\n\nEsto hace posible seleccionar una CPU que sea incompatible con esta máquina. Por ello, pueden aparecer incompatibilidader con la BIOS de la máquina u otro software.\n\nActivar este ajuste no está oficialmente soportado y cualquier reporte de fallo puede ser cerrado como inválido."
-    IDS_2148    "Continuar"
-    IDS_2149    "Cassette: %s"
-    IDS_2150    "Imágenes de Cassette (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0All files (*.*)\0*.*\0"
-    IDS_2151    "Cartucho %i: %ls"
-    IDS_2152    "Imágenes de Cartucho (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0All files (*.*)\0*.*\0"
-    IDS_2153    "Error initializing renderer"
-    IDS_2154    "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-    IDS_2155    "Resume execution"
-    IDS_2156    "Pause execution"
-    IDS_2157    "Press Ctrl+Alt+Del"
-    IDS_2158    "Press Ctrl+Alt+Esc"
-    IDS_2159    "Hard reset"
-    IDS_2160    "ACPI shutdown"
-    IDS_2161    "Settings"
-    IDS_2162    "Type"
-    IDS_2163    "No Dynarec"
-    IDS_2164    "Old Dynarec"
-    IDS_2165    "New Dynarec"
-    IDS_2166    "Video card #2 ""%hs"" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
-    IDS_2167    "Failed to initialize network driver"
-    IDS_2168    "The network configuration will be switched to the null driver"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "Disco duro (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "Nunca hubo unidades de CD-ROM MFM/RLL o ESDI"
-    IDS_4100    "A medida..."
-    IDS_4101    "A medida (grande)..."
-    IDS_4102    "Añadir Nuevo Disco Duro"
-    IDS_4103    "Añadir Disco Duro Existente"
-    IDS_4104    "Las imágenes de disco HDI no pueden superar los 4 GB."
-    IDS_4105    "Las imágenes de disco no pueden superar los 127 GB."
-    IDS_4106    "Imágenes de Disco Duro (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0All files (*.*)\0*.*\0"
-    IDS_4107    "No se pudo leer el archivo"
-    IDS_4108    "No se pudo escribir el archivo"
-    IDS_4109    "No se soportan las imágenes HDI o HDX con un tamaño de sector diferente a 512."
-    IDS_4110    "No se soporta aún el USB"
-    IDS_4111    "La imagen de disco ya existe"
-    IDS_4112    "Por favor especifique un nombre de archivo válido."
-    IDS_4113    "Imagen de disco creada"
-    IDS_4114    "Asegúrese de que el archivo existe y es leíble."
-    IDS_4115    "Asegúrese de que el archivo en un directorio con permiso de escritura."
-    IDS_4116    "Imagen de disco demasiado grande"
-    IDS_4117    "Recuerde particionar y formatear la nueva unidad."
-    IDS_4118    "El archivo selecionado será sobreescrito. ¿Está seguro de querer usarlo?"
-    IDS_4119    "Imagen de disco no soportada"
-    IDS_4120    "Sobreescribir"
-    IDS_4121    "No sobreescribir"
-    IDS_4122    "Imagen plana (.img)"
-    IDS_4123    "Imagen HDI (.hdi)"
-    IDS_4124    "Imagen HDX (.hdx)"
-    IDS_4125    "VHD de tamaño fijo (.vhd)"
-    IDS_4126    "VHD de tamaño dinámico (.vhd)"
-    IDS_4127    "VHD diferencial (.vhd)"
-    IDS_4128    "Bloques grandes (2 MB)"
-    IDS_4129    "Bloques pequeños (512 KB)"
-    IDS_4130    "Archivos VHD (*.VHD)\0*.VHD\0All files (*.*)\0*.*\0"
-    IDS_4131    "Seleccione el VHD padre"
-    IDS_4132    "Esto puede deberse a que la imagen padre se modificó después de que la imagen diferencial se crease.\n\nTambién puede ocurrir si las imágenes fueron movidas o copiadas, o por un fallo en el programa que creó este disco.\n\n¿Quiere corregir los registros de tiempo?"
-    IDS_4133    "Las marcas de tiempo del padre e hijo no coinciden"
-    IDS_4134    "No se pudo corregir la marca de tiempo del VHD."
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "Deshabilitado"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "Deshabilitado"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 kB"
-    IDS_5889    "180 kB"
-    IDS_5890    "320 kB"
-    IDS_5891    "360 kB"
-    IDS_5892    "640 kB"
-    IDS_5893    "720 kB"
-    IDS_5894    "1.2 MB"
-    IDS_5895    "1.25 MB"
-    IDS_5896    "1.44 MB"
-    IDS_5897    "DMF (cluster 1024)"
-    IDS_5898    "DMF (cluster 2048)"
-    IDS_5899    "2.88 MB"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5"" 128 MB (ISO 10090)"
-    IDS_5903    "3.5"" 230 MB (ISO 13963)"
-    IDS_5904    "3.5"" 540 MB (ISO 15498)"
-    IDS_5905    "3.5"" 640 MB (ISO 15498)"
-    IDS_5906    "3.5"" 1.3 GB (GigaMO)"
-    IDS_5907    "3.5"" 2.3 GB (GigaMO 2)"
-    IDS_5908    "5.25"" 600 MB"
-    IDS_5909    "5.25"" 650 MB"
-    IDS_5910    "5.25"" 1 GB"
-    IDS_5911    "5.25"" 1.3 GB"
-
-    IDS_6144    "RPM perfectas"
-    IDS_6145    "1% por debajo de RPM perfectas"
-    IDS_6146    "1.5% por debajo de RPM perfectas"
-    IDS_6147    "2% por debajo de RPM perfectas"
-
-    IDS_7168    "(Por defecto del sistema)"
-END
-#define IDS_LANG_ESES IDS_7168
-
-// Spanish (Spain) resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/fi-FI.rc b/src/win/languages/fi-FI.rc
deleted file mode 100644
index 1b958cc82..000000000
--- a/src/win/languages/fi-FI.rc
+++ /dev/null
@@ -1,637 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Finnish resources
-
-#ifdef _WIN32
-LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Toiminto"
-    BEGIN
-        MENUITEM "&Vaadi näppäimistön kaappaus", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "&Oikea CTRL on vasen ALT", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "&Uudelleenkäynnistys (kylmä)...", IDM_ACTION_HRESET
-        MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-    MENUITEM "Ctrl+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "&Tauko", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "&Poistu...", IDM_ACTION_EXIT
-    END
-    POPUP "&Näytä"
-    BEGIN
-        MENUITEM "&Piilota tilapalkki", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "Piilota &työkalupalkki", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
-        MENUITEM "&Salli koon muuttaminen", IDM_VID_RESIZE
-        MENUITEM "&Muista koko ja sijainti", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "&Renderöijä"
-        BEGIN
-            MENUITEM "&SDL (ohjelmistopohjainen)", IDM_VID_SDL_SW
-            MENUITEM "SDL (&laitteistokiihdytetty)", IDM_VID_SDL_HW
-            MENUITEM "SDL (&OpenGL)", IDM_VID_SDL_OPENGL
-            MENUITEM "Open&GL (3.0 Core)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "&VNC", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "&Määritä koko...", IDM_VID_SPECIFY_DIM
-        MENUITEM "Pakota 4:3-näyttösuhde", IDM_VID_FORCE43
-        POPUP "&Ikkunan kokokerroin"
-        BEGIN
-            MENUITEM "&0.5x", IDM_VID_SCALE_1X
-            MENUITEM "&1x", IDM_VID_SCALE_2X
-            MENUITEM "1.&5x", IDM_VID_SCALE_3X
-            MENUITEM "&2x", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "&Suodatusmetodi"
-        BEGIN
-            MENUITEM "&Lähin naapuri", IDM_VID_FILTER_NEAREST
-            MENUITEM "Li&neaarinen interpolaatio", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "&Suuri DPI-skaalaus", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "&Koko näytön tila\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "Koko näytön &skaalaustila"
-        BEGIN
-            MENUITEM "&Venytä koko näyttöön", IDM_VID_FS_FULL
-            MENUITEM "&4:3", IDM_VID_FS_43
-            MENUITEM "&Tasasivuiset kuvapisteet (säilytä kuvasuhde)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "&Kokonaislukuskaalaus", IDM_VID_FS_INT
-        END
-        POPUP "&EGA/(S)VGA-asetukset"
-        BEGIN
-            MENUITEM "&VGA-näyttö käänteisillä väreillä", IDM_VID_INVERT
-            POPUP "VGA-näytön &tyyppi"
-            BEGIN
-                MENUITEM "RGB, &värit", IDM_VID_GRAY_RGB
-                MENUITEM "&RGB, harmaasävy", IDM_VID_GRAY_MONO
-                MENUITEM "&Meripihkanvärinen", IDM_VID_GRAY_AMBER
-                MENUITEM "V&ihreä", IDM_VID_GRAY_GREEN
-                MENUITEM "V&alkoinen", IDM_VID_GRAY_WHITE
-            END
-            POPUP "&Harmaasävymuunnoksen tyyppi"
-            BEGIN
-                MENUITEM "BT&601 (NTSC/PAL)", IDM_VID_GRAYCT_601
-                MENUITEM "BT&709 (HDTV)", IDM_VID_GRAYCT_709
-                MENUITEM "&Keskiarvo", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "CGA/PCjr/Tandy/E&GA/(S)VGA &yliskannaus", IDM_VID_OVERSCAN
-        MENUITEM "&Muuta harmaavärinäytön kontrastia", IDM_VID_CGACON
-    END
-    MENUITEM "&Media", IDM_MEDIA
-    POPUP "Työ&kalut"
-    BEGIN
-        MENUITEM "&Kokoonpano...", IDM_CONFIG
-        MENUITEM "&Päivitä tilapalkin kuvakkeita", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "Ota &kuvakaappaus\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "&Sovellusasetukset...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "Käytä &Discord-integraatiota", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "&Äänitasot...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "Aloita jäljitys\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "Lopeta jäljitys\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "&Ohje"
-    BEGIN
-        MENUITEM "&Ohjekirja...", IDM_DOCS
-        MENUITEM "&Tietoja 86Boxista...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Uusi kasettikuva...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Olemassaoleva kasettikuva...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "Olemassaoleva kasettikuva (&kirjoitussuojattu)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Nauhoita", IDM_CASSETTE_RECORD
-        MENUITEM "&Toista", IDM_CASSETTE_PLAY
-        MENUITEM "Kelaa &alkuun", IDM_CASSETTE_REWIND
-        MENUITEM "Kelaa &loppuun", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "&Poista kasettipesästä", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&ROM-moduulikuva...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "&Irrota", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Uusi levykekuva...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Olemassaoleva levykekuva...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "Olemassaoleva levykekuva (&kirjoitussuojattu)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Vie 86F-tiedostoon...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "&Poista asemasta", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Mykistä", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "&Tyhjä", IDM_CDROM_EMPTY
-        MENUITEM "&Lataa edellinen levykuva uudelleen", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "L&evykuva...", IDM_CDROM_IMAGE
-        MENUITEM "&Kansio...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Uusi levykuva...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Olemassaoleva levykuva...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "Olemassaoleva levykuva (&kirjoitussuojattu)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Poista asemasta", IDM_ZIP_EJECT
-        MENUITEM "&Lataa edellinen levykuva uudelleen", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Uusi levykuva...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Olemassaoleva levykuva...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "Olemassaoleva levykuva (&kirjoitussuojattu)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Poista asemasta", IDM_MO_EJECT
-        MENUITEM "&Lataa edellinen levykuva uudelleen", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Kuvataajuustavoite"
-    BEGIN
-        MENUITEM "&Synkronisoi videoon", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "&25 ruutua/s", IDM_VID_GL_FPS_25
-        MENUITEM "&30 ruutua/s", IDM_VID_GL_FPS_30
-        MENUITEM "&50 ruutua/s", IDM_VID_GL_FPS_50
-        MENUITEM "&60 ruutua/s", IDM_VID_GL_FPS_60
-        MENUITEM "&75 ruutua/s", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "&VSync", IDM_VID_GL_VSYNC
-    MENUITEM "Valitse varjostin&ohjelma...", IDM_VID_GL_SHADER
-    MENUITEM "&Poista varjostinohjelma", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "Sovellusasetukset"
-#define STR_SND_GAIN      "Äänen taso"
-#define STR_NEW_FLOPPY    "Uusi levykuva"
-#define STR_CONFIG        "Kokoonpano"
-#define STR_SPECIFY_DIM   "Määritä pääikkunan koko"
-
-#define STR_OK            "OK"
-#define STR_CANCEL        "Peruuta"
-#define STR_GLOBAL        "Tallenna nämä asetukset &globaaleiksi oletuksiksi"
-#define STR_DEFAULT       "&Oletus"
-#define STR_LANGUAGE      "Kieli:"
-#define STR_ICONSET       "Kuvakkeet:"
-
-#define STR_GAIN          "Taso"
-
-#define STR_FILE_NAME     "Tiedostonimi:"
-#define STR_DISK_SIZE     "Levyn koko:"
-#define STR_RPM_MODE      "Kierroslukutila:"
-#define STR_PROGRESS      "Edistyminen:"
-
-#define STR_WIDTH         "Leveys:"
-#define STR_HEIGHT        "Korkeus:"
-#define STR_LOCK_TO_SIZE  "Lukitse tähän kokoon"
-
-#define STR_MACHINE_TYPE  "Tietokoneen tyyppi:"
-#define STR_MACHINE       "Tietokone:"
-#define STR_CONFIGURE     "Määritys"
-#define STR_CPU_TYPE      "Suorittimen tyyppi:"
-#define STR_CPU_SPEED     "Nopeus:"
-#define STR_FPU           "Apusuoritin:"
-#define STR_WAIT_STATES   "Odotustilat:"
-#define STR_MB            "Mt"
-#define STR_MEMORY        "Muisti:"
-#define STR_TIME_SYNC     "Kellon synkronointi"
-#define STR_DISABLED      "Ei käytössä"
-#define STR_ENABLED_LOCAL "Käytössä (paikallinen)"
-#define STR_ENABLED_UTC   "Käytössä (UTC)"
-#define STR_DYNAREC       "Dynaaminen uudelleenkääntäjä"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "Näytönohjain:"
-#define STR_VIDEO_2       "Näytönohjain 2:"
-#define STR_VOODOO        "Voodoo-grafiikkasuoritin"
-#define STR_IBM8514       "IBM 8514/A-grafiikkasuoritin"
-#define STR_XGA           "XGA-grafiikkasuoritin"
-
-#define STR_MOUSE         "Hiiri:"
-#define STR_JOYSTICK      "Peliohjain:"
-#define STR_JOY1          "Peliohjain 1..."
-#define STR_JOY2          "Peliohjain 2..."
-#define STR_JOY3          "Peliohjain 3..."
-#define STR_JOY4          "Peliohjain 4..."
-
-#define STR_SOUND1        "Äänikortti 1:"
-#define STR_SOUND2        "Äänikortti 2:"
-#define STR_SOUND3        "Äänikortti 3:"
-#define STR_SOUND4        "Äänikortti 4:"
-#define STR_MIDI_OUT      "MIDI-ulostulo:"
-#define STR_MIDI_IN       "MIDI-sisääntulo:"
-#define STR_MPU401        "Erillinen MPU-401"
-#define STR_FLOAT         "Käytä FLOAT32-ääntä"
-#define STR_FM_DRIVER     "FM-syntetisaattoriohjain"
-#define STR_FM_DRV_NUKED  "Nuked (tarkempi)"
-#define STR_FM_DRV_YMFM   "YMFM (nopeampi)"
-
-#define STR_NET_TYPE      "Verkon tyyppi:"
-#define STR_PCAP          "PCap-laite:"
-#define STR_NET           "Verkkokortti:"
-#define STR_NET1          "Network card 1:"
-#define STR_NET2          "Network card 2:"
-#define STR_NET3          "Network card 3:"
-#define STR_NET4          "Network card 4:"
-
-#define STR_COM1          "COM1-laite:"
-#define STR_COM2          "COM2-laite:"
-#define STR_COM3          "COM3-laite:"
-#define STR_COM4          "COM4-laite:"
-#define STR_LPT1          "LPT1-laite:"
-#define STR_LPT2          "LPT2-laite:"
-#define STR_LPT3          "LPT3-laite:"
-#define STR_LPT4          "LPT4-laite:"
-#define STR_SERIAL1       "Sarjaportti 1"
-#define STR_SERIAL2       "Sarjaportti 2"
-#define STR_SERIAL3       "Sarjaportti 3"
-#define STR_SERIAL4       "Sarjaportti 4"
-#define STR_PARALLEL1     "Rinnakkaisportti 1"
-#define STR_PARALLEL2     "Rinnakkaisportti 2"
-#define STR_PARALLEL3     "Rinnakkaisportti 3"
-#define STR_PARALLEL4     "Rinnakkaisportti 4"
-#define STR_SERIAL_PASS1  "Serial port passthrough 1"
-#define STR_SERIAL_PASS2  "Serial port passthrough 2"
-#define STR_SERIAL_PASS3  "Serial port passthrough 3"
-#define STR_SERIAL_PASS4  "Serial port passthrough 4"
-
-#define STR_HDC           "Kiintolevyohjain:"
-#define STR_FDC           "Levykeohjain:"
-#define STR_IDE_TER       "Kolmas IDE-ohjain"
-#define STR_IDE_QUA       "Neljäs IDE-ohjain"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "Ohjain 1:"
-#define STR_SCSI_2        "Ohjain 2:"
-#define STR_SCSI_3        "Ohjain 3:"
-#define STR_SCSI_4        "Ohjain 4:"
-#define STR_CASSETTE      "Kasettiasema"
-
-#define STR_HDD           "Kiintolevyt:"
-#define STR_NEW           "&Uusi..."
-#define STR_EXISTING      "&Olemassaoleva..."
-#define STR_REMOVE        "&Poista"
-#define STR_BUS           "Väylä:"
-#define STR_CHANNEL       "Kanava:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Speed:"
-
-#define STR_SPECIFY       "&Määritä..."
-#define STR_SECTORS       "Sektorit:"
-#define STR_HEADS         "Lukupäät:"
-#define STR_CYLS          "Sylinterit:"
-#define STR_SIZE_MB       "Koko (Mt):"
-#define STR_TYPE          "Tyyppi:"
-#define STR_IMG_FORMAT    "Tiedostomuoto:"
-#define STR_BLOCK_SIZE    "Lohkon koko:"
-
-#define STR_FLOPPY_DRIVES "Levykeasemat:"
-#define STR_TURBO         "Turbo-ajoitukset"
-#define STR_CHECKBPB      "Tarkista BPB"
-#define STR_CDROM_DRIVES  "CD-ROM-asemat:"
-#define STR_CD_SPEED      "Nopeus:"
-
-#define STR_MO_DRIVES     "Magneettisoptiset asemat (MO):"
-#define STR_ZIP_DRIVES    "ZIP-asemat:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "ISA-RTC (kello):"
-#define STR_ISAMEM        "ISA-muistilaajennus"
-#define STR_ISAMEM_1      "Kortti 1:"
-#define STR_ISAMEM_2      "Kortti 2:"
-#define STR_ISAMEM_3      "Kortti 3:"
-#define STR_ISAMEM_4      "Kortti 4:"
-#define STR_BUGGER        "ISABugger-laite"
-#define STR_POSTCARD      "POST-kortti"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Segoe UI"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "Virhe"
-    IDS_2050    "Vakava virhe"
-    IDS_2051    " - TAUKO"
-    IDS_2052    "Paina Ctrl+Alt+PgDn palataksesi ikkunoituun tilaan."
-    IDS_2053    "Nopeus"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "ZIP-levykuvat (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "86Box ei löytänyt käyttökelpoisia ROM-tiedostoja.\n\nVoit <a href=""https://github.com/86Box/roms/releases/latest"">ladata</a> ROM-paketin ja purkaa sen ""roms""-hakemistoon."
-    IDS_2057    "(tyhjä)"
-    IDS_2058    "ZIP-levykuvat (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0Kaikki tiedostot (*.*)\0*.*\0"
-    IDS_2059    "Turbo"
-    IDS_2060    "Päällä"
-    IDS_2061    "Pois"
-    IDS_2062    "Kaikki levykuvat (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Perussektorilevykuvat (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Pintalevykuvat (*.86F)\0*.86F\0"
-    IDS_2063    "Konetta ""%hs"" ei voi käyttää puuttuvien ROM-tiedostojen vuoksi. Vaihdetaan käyttökelpoiseen koneeseen."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "Näytönohjainta ""%hs"" ei voi käyttää puuttuvien ROM-tiedostojen vuoksi. Vaihdetaan käyttökelpoiseen näytönohjaimeen."
-    IDS_2065    "Tietokone"
-    IDS_2066    "Näyttö"
-    IDS_2067    "Syöttölaitteet"
-    IDS_2068    "Ääni"
-    IDS_2069    "Verkko"
-    IDS_2070    "Portit (COM & LPT)"
-    IDS_2071    "Tallennusohjaimet"
-    IDS_2072    "Kiintolevyt"
-    IDS_2073    "Levyke ja CD-ROM"
-    IDS_2074    "Muut tallennuslaitteet"
-    IDS_2075    "Muut oheislaitteet"
-    IDS_2076    "Pintalevykuvat (*.86F)\0*.86F\0"
-    IDS_2077    "Kaappaa hiiri klikkaamalla"
-    IDS_2078    "Paina F8+F12 vapauttaaksesi hiiren"
-    IDS_2079    "Paina F8+F12 tai keskipainiketta vapauttaaksesi hiiren"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "Väylä"
-    IDS_2082    "Tiedosto"
-    IDS_2083    "C"
-    IDS_2084    "H"
-    IDS_2085    "S"
-    IDS_2086    "Mt"
-    IDS_2087    "Speed"
-    IDS_2088    "Tarkista BPB"
-    IDS_2089    "kt"
-    IDS_2090    "Videorenderöijän alustus epäonnistui"
-    IDS_2091    "Oletus"
-    IDS_2092    "%i odotustilaa"
-    IDS_2093    "Tyyppi"
-    IDS_2094    "PCap-asennus epäonnistui"
-    IDS_2095    "PCap-laitteita ei löytynyt"
-    IDS_2096    "Virheellinen PCap-laite"
-    IDS_2097    "Standardi 2-painikkeinen peliohjain/-ohjaimet"
-    IDS_2098    "Standardi 4-painikkeinen peliohjain"
-    IDS_2099    "Standardi 6-painikkeinen peliohjain"
-    IDS_2100    "Standardi 8-painikkeinen peliohjain"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Thrustmaster Flight Control System"
-    IDS_2104    "Ei mikään"
-    IDS_2105    "Näppäinkiihdyttimien lataus epäonnistui"
-    IDS_2106    "Raakasyötteen rekisteröinti epäonnistui"
-    IDS_2107    "%u"
-    IDS_2108    "%u Mt (CHS: %i, %i, %i)"
-    IDS_2109    "Levyke %i (%s): %ls"
-    IDS_2110    "Kaikki levykuvat (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Kehittyneet sektorilevykuvat (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Perussektorilevykuvat (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Flux-levykuvat (*.FDI)\0*.FDI\0Pintalevykuvat (*.86F;*.MFM)\0*.86F;*.MFM\0Kaikki tiedostot (*.*)\0*.*\0"
-    IDS_2112    "SDL:n alustus epäonnistui. Tarvitaan SDL2.dll"
-    IDS_2113    "Haluatko varmasti käynnistää emuloidun tietokoneen uudelleen?"
-    IDS_2114    "Haluatko varmasti sulkea 86Boxin?"
-    IDS_2115    "Ghostscriptin alustus epäonnistui"
-    IDS_2116    "MO %i (%ls): %ls"
-    IDS_2117    "MO-levykuvat (*.IM?;*.MDI)\0*.IM?;*.MDI\0Kaikki tiedostot (*.*)\0*.*\0"
-    IDS_2118    "Tervetuloa 86Boxiin!"
-    IDS_2119    "Sisäinen ohjain"
-    IDS_2120    "Poistu"
-    IDS_2121    "ROM-tiedostoja ei löytynyt"
-    IDS_2122    "Tallennetaanko asetukset?"
-    IDS_2123    "Tämä käynnistää emuloidun tietokoneen uudelleen."
-    IDS_2124    "Tallenna"
-    IDS_2125    "Tietoja 86Box:sta"
-    IDS_2126    "86Box v" EMU_VERSION
-
-    IDS_2127    "Vanhojen tietokoneiden emulaattori\n\nTekijät: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne ja muut.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho ja muut.\n\nJulkaistu GNU General Public License 2. version tai myöhemmän alaisena. Tarkempia tietoja LICENSE-tiedostossa."
-    IDS_2128    "OK"
-    IDS_2129    "Laitteisto ei ole saatavilla"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "Varmista, että " LIB_NAME_PCAP " on asennettu ja että verkkoyhteytesi on " LIB_NAME_PCAP "-yhteensopiva."
-    IDS_2131    "Virheelliset määritykset"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " vaaditaan PostScript-tiedostojen automaattiseen muuntamiseen PDF-tiedostoiksi.\n\nKaikki geneeriselle PostScript-tulostimelle lähetetyt asiakirjat tallennetaan PostScript (.ps) -tiedostoina."
-    IDS_2135    "Siirrytään koko näytön tilaan"
-    IDS_2136    "Älä näytä tätä viestiä uudelleen"
-    IDS_2137    "Älä poistu"
-    IDS_2138    "Käynnistä uudelleen"
-    IDS_2139    "Älä käynnistä uudelleen"
-    IDS_2140    "MO-levykuvat (*.IM?;*.MDI)\0*.IM?;*.MDI\0Kaikki tiedostot (*.*)\0*.*\0"
-    IDS_2141    "CD-ROM-levykuvat (*.ISO;*.CUE)\0*.ISO;*.CUE\0Kaikki tiedostot (*.*)\0*.*\0"
-    IDS_2142    "%hs - Laitteen määritykset"
-    IDS_2143    "Näyttö lepotilassa"
-    IDS_2144    "OpenGL-varjostinohjelmat (*.GLSL)\0*.GLSL\0Kaikki tiedostot (*.*)\0*.*\0"
-    IDS_2145    "OpenGL-asetukset"
-    IDS_2146    "Olet lataamassa ei-tuettuja määrittelyjä"
-    IDS_2147    "Valittuun tietokoneeseen perustuva suoritintyypin suodatus ei ole käytössä tällä emuloidulla koneella.\n\nTämä mahdollistaa muutoin yhteensopimattoman suorittimen valinnan kyseisen tietokoneen kanssa. Voit kuitenkin kohdata ongelmia tietokoneen BIOS:in tai muun ohjelmiston kanssa.\n\nTämän asetuksen käyttö ei ole virallisesti tuettua ja kaikki tehdyt virheraportit voidaan sulkea epäpätevinä."
-    IDS_2148    "Jatka"
-    IDS_2149    "Kasetti: %s"
-    IDS_2150    "Kasettitiedostot (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0Kaikki tiedostot (*.*)\0*.*\0"
-    IDS_2151    "ROM-moduuli %i: %ls"
-    IDS_2152    "ROM-moduulikuvat (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0Kaikki tiedostot (*.*)\0*.*\0"
-    IDS_2153    "Virhe renderöijän alustuksessa"
-    IDS_2154    "OpenGL (3.0 Core) -renderöijän alustus epäonnistui. Käytä toista renderöijää."
-    IDS_2155    "Jatka suoritusta"
-    IDS_2156    "Pysäytä suoritus"
-    IDS_2157    "Paina Ctrl+Alt+Del"
-    IDS_2158    "Paina Ctrl+Alt+Esc"
-    IDS_2159    "Kylmä uudelleenkäynnistys"
-    IDS_2160    "ACPI-sammutus"
-    IDS_2161    "Asetukset"
-    IDS_2162    "Type"
-    IDS_2163    "No Dynarec"
-    IDS_2164    "Old Dynarec"
-    IDS_2165    "New Dynarec"
-    IDS_2166    "Video card #2 ""%hs"" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
-    IDS_2167    "Failed to initialize network driver"
-    IDS_2168    "The network configuration will be switched to the null driver"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "Kiintolevy (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "MFM/RLL- tai ESDI-CD-ROM-asemia ei ole koskaan ollut olemassa"
-    IDS_4100    "Mukautettu..."
-    IDS_4101    "Mukautettu (suuri)..."
-    IDS_4102    "Lisää uusi kiintolevy"
-    IDS_4103    "Lisää olemassaoleva kiintolevy"
-    IDS_4104    "HDI-levykuvan suurin mahdollinen koko on 4 Gt."
-    IDS_4105    "Levykuvien suurin mahdollinen koko on 127 Gt."
-    IDS_4106    "Kiintolevykuvat (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0Kaikki tiedostot (*.*)\0*.*\0"
-    IDS_4107    "Tiedostoa ei voi lukea"
-    IDS_4108    "Tiedostoon ei voi kirjoittaa"
-    IDS_4109    "HDI- ja HDX-levykuvien ainoa tuettu sektorikoko on 512"
-    IDS_4110    "USB-tukea ei vielä ole"
-    IDS_4111    "Levykuva on jo olemassa"
-    IDS_4112    "Anna kelvollinen tiedostonimi."
-    IDS_4113    "Levykuva luotu"
-    IDS_4114    "Varmista, että tiedosto on olemassa ja lukukelpoinen"
-    IDS_4115    "Varmista, että tiedoston tallennuskansioon on kirjoitusoikeus"
-    IDS_4116    "Liian suuri levykuva"
-    IDS_4117    "Muista osioida ja alustaa juuri luomasi asema."
-    IDS_4118    "Valittu tiedosto korvataan. Oletko varma, että haluat käyttää sitä?"
-    IDS_4119    "Levykuvaa ei tueta"
-    IDS_4120    "Korvaa"
-    IDS_4121    "Älä korvaa"
-    IDS_4122    "Raaka levykuva (.img)"
-    IDS_4123    "HDI-levykuva (.hdi)"
-    IDS_4124    "HDX-levykuva (.hdx)"
-    IDS_4125    "Kiinteä VHD (.vhd)"
-    IDS_4126    "Dynaaminen VHD (.vhd)"
-    IDS_4127    "Differentiaalinen VHD (.vhd)"
-    IDS_4128    "Suuret lohkot (2 Mt)"
-    IDS_4129    "Pienet lohkot (512 kt)"
-    IDS_4130    "VHD-tiedostot (*.VHD)\0*.VHD\0Kaikki tiedostot (*.*)\0*.*\0"
-    IDS_4131    "Valitse ylätason VHD"
-    IDS_4132    "Tämä saattaa tarkoittaa, että ylätason levykuvaa on muokattu differentiaalisen levykuvan luonnin jälkeen.\n\nNäin voi käydä myös, jos levykuvatiedostoja on siirretty tai kopioitu. Lisäksi syynä voi olla levyn luoneessa sovelluksessa oleva ohjelmistovirhe.\n\nKorjataanko aikaleimat?"
-    IDS_4133    "Ylä- ja alatason levyjen aikaleimat eivät täsmää"
-    IDS_4134    "VHD aikaleimaa ei pystytty korjaamaan."
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "Ei käytössä"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "Ei käytössä"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 kt"
-    IDS_5889    "180 kt"
-    IDS_5890    "320 kt"
-    IDS_5891    "360 kt"
-    IDS_5892    "640 kt"
-    IDS_5893    "720 kt"
-    IDS_5894    "1.2 Mt"
-    IDS_5895    "1.25 Mt"
-    IDS_5896    "1.44 Mt"
-    IDS_5897    "DMF (lohko 1024)"
-    IDS_5898    "DMF (lohko 2048)"
-    IDS_5899    "2.88 Mt"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5"" 128 Mt (ISO 10090)"
-    IDS_5903    "3.5"" 230 Mt (ISO 13963)"
-    IDS_5904    "3.5"" 540 Mt (ISO 15498)"
-    IDS_5905    "3.5"" 640 Mt (ISO 15498)"
-    IDS_5906    "3.5"" 1.3 Gt (GigaMO)"
-    IDS_5907    "3.5"" 2.3 Gt (GigaMO 2)"
-    IDS_5908    "5.25"" 600 Mt"
-    IDS_5909    "5.25"" 650 Mt"
-    IDS_5910    "5.25"" 1 Gt"
-    IDS_5911    "5.25"" 1.3 Gt"
-
-    IDS_6144    "Täydellinen RPM"
-    IDS_6145    "1% alle täydellisen RPM:n"
-    IDS_6146    "1.5% alle täydellisen RPM:n"
-    IDS_6147    "2% alle täydellisen RPM:n"
-
-    IDS_7168    "(Järjestelmän oletus)"
-END
-#define IDS_LANG_ENUS IDS_7168
-
-// English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/fr-FR.rc b/src/win/languages/fr-FR.rc
deleted file mode 100644
index 8c77979ef..000000000
--- a/src/win/languages/fr-FR.rc
+++ /dev/null
@@ -1,637 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// French (fr-FR) resources
-
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Action"
-    BEGIN
-        MENUITEM "&Capturer le clavier", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "CTRL &Droite devient ALT Gauche", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "&Hard Reset...", IDM_ACTION_HRESET
-        MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-    MENUITEM "Ctrl+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "&Pause", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "&Quitter...", IDM_ACTION_EXIT
-    END
-    POPUP "&Vue"
-    BEGIN
-        MENUITEM "&Masquer la barre de status", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
-        MENUITEM "Fenètre &Retaillable", IDM_VID_RESIZE
-        MENUITEM "S&auvegarder taille && position", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "Moteur de &rendu vidéo"
-        BEGIN
-            MENUITEM "&SDL (Logiciel)", IDM_VID_SDL_SW
-            MENUITEM "SDL (&Materiel)", IDM_VID_SDL_HW
-            MENUITEM "SDL (&OpenGL)", IDM_VID_SDL_OPENGL
-            MENUITEM "Open&GL (3.0 Core)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "&VNC", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Specifier dimensions...", IDM_VID_SPECIFY_DIM
-        MENUITEM "F&orcer 4:3", IDM_VID_FORCE43
-        POPUP "&Echelle facteur"
-        BEGIN
-            MENUITEM "&0.5x", IDM_VID_SCALE_1X
-            MENUITEM "&1x", IDM_VID_SCALE_2X
-            MENUITEM "1.&5x", IDM_VID_SCALE_3X
-            MENUITEM "&2x", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "Methode Filtre"
-        BEGIN
-            MENUITEM "&Plus proche", IDM_VID_FILTER_NEAREST
-            MENUITEM "&Lineaire", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "Mise à l'échelle Hi&DPI", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "&Plein Ecran\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "Mode &Elargi plein écran"
-        BEGIN
-            MENUITEM "&Plein écran étiré", IDM_VID_FS_FULL
-            MENUITEM "&4:3", IDM_VID_FS_43
-            MENUITEM "pixels &Carrés(Keep ratio)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "Echelle &Entière", IDM_VID_FS_INT
-        END
-        POPUP "Réglages E&GA/(S)VGA"
-        BEGIN
-            MENUITEM "Moniteur VGA &Inversé", IDM_VID_INVERT
-            POPUP "&Type Ecran VGA"
-            BEGIN
-                MENUITEM "RGB &Couleur", IDM_VID_GRAY_RGB
-                MENUITEM "&RGB Ton de Gris", IDM_VID_GRAY_MONO
-                MENUITEM "Moniteur &Ambre", IDM_VID_GRAY_AMBER
-                MENUITEM "Moniteur &Vert", IDM_VID_GRAY_GREEN
-                MENUITEM "Moniteur &Blanc", IDM_VID_GRAY_WHITE
-            END
-            POPUP "Grayscale &conversion type"
-            BEGIN
-                MENUITEM "BT&601 (NTSC/PAL)", IDM_VID_GRAYCT_601
-                MENUITEM "BT&709 (HDTV)", IDM_VID_GRAYCT_709
-                MENUITEM "&Moyenne", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "CGA/PCjr/Tandy/E&GA/(S)VGA overscan", IDM_VID_OVERSCAN
-        MENUITEM "Modifier contraste affichage  &monochrome", IDM_VID_CGACON
-    END
-    MENUITEM "&Media", IDM_MEDIA
-    POPUP "Ou&tils"
-    BEGIN
-        MENUITEM "&Réglages...", IDM_CONFIG
-        MENUITEM "Mettre à jour la barre de stat&us", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "Copie &Ecran\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "&Préférences...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "Activer intégration &Discord", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "&Gain Son...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "Démarrer traces\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "Finir traces\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "&Aide"
-    BEGIN
-        MENUITEM "&Documentation...", IDM_DOCS
-        MENUITEM "&A Propos de 86Box...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nouvelle image...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "Image &Existante...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "Image Existante(&Lecture seule)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "En&registrer", IDM_CASSETTE_RECORD
-        MENUITEM "&Jouer", IDM_CASSETTE_PLAY
-        MENUITEM "&Revenir au debut", IDM_CASSETTE_REWIND
-        MENUITEM "Aller à la &Fin", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "E&jecter", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Image...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "E&jecter", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nouvelle image...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "Image &Existante...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "Image Existante(&Lecture seule)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&xport vers 86F...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "E&jecter", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Couper", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "E&jecter", IDM_CDROM_EMPTY
-        MENUITEM "&Recharger image précedente", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "&Image...", IDM_CDROM_IMAGE
-        MENUITEM "&Dossier...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nouvelle image...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "Image &Existante...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "Image Existante (&Lecture Seule)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&jecter", IDM_ZIP_EJECT
-        MENUITEM "&Recharger image précédente", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nouvelle image...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "Image &Existante...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "Image Existante (&Lecture Seule)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&jecter", IDM_MO_EJECT
-        MENUITEM "&Recharger image précédente", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Taux de rafraîchissement cible"
-    BEGIN
-        MENUITEM "&Synchronisation avec la vidéo", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "&25 images par seconde", IDM_VID_GL_FPS_25
-        MENUITEM "&30 images par seconde", IDM_VID_GL_FPS_30
-        MENUITEM "&50 images par seconde", IDM_VID_GL_FPS_50
-        MENUITEM "&60 images par seconde", IDM_VID_GL_FPS_60
-        MENUITEM "&75 images par seconde", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "Synchronisation &verticale", IDM_VID_GL_VSYNC
-    MENUITEM "Sé&lectionnez le shader...", IDM_VID_GL_SHADER
-    MENUITEM "S&upprimer le shader", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "Préférences"
-#define STR_SND_GAIN      "Gain son"
-#define STR_NEW_FLOPPY    "Nouvelle image"
-#define STR_CONFIG        "Réglages"
-#define STR_SPECIFY_DIM   "Spécifier le détournement de la fenêtre principale"
-
-#define STR_OK            "OK"
-#define STR_CANCEL        "Annuler"
-#define STR_GLOBAL        "Sauvegarder ces paramètres comme valeurs par défaut &globales"
-#define STR_DEFAULT       "&Défaut"
-#define STR_LANGUAGE      "Langue:"
-#define STR_ICONSET       "Ensemble d'icônes:"
-
-#define STR_GAIN          "Gain"
-
-#define STR_FILE_NAME     "Nom fichier:"
-#define STR_DISK_SIZE     "Taille disque:"
-#define STR_RPM_MODE      "Mode RPM:"
-#define STR_PROGRESS      "Progrès:"
-
-#define STR_WIDTH         "Largeur:"
-#define STR_HEIGHT        "Hauteur:"
-#define STR_LOCK_TO_SIZE  "Verrouiller à cette taille"
-
-#define STR_MACHINE_TYPE  "Type de machine:"
-#define STR_MACHINE       "Machine:"
-#define STR_CONFIGURE     "Configurer"
-#define STR_CPU_TYPE      "Type du processeur:"
-#define STR_CPU_SPEED     "Vitesse:"
-#define STR_FPU           "FPU:"
-#define STR_WAIT_STATES   "États d'attente:"
-#define STR_MB            "Mo"
-#define STR_MEMORY        "Mémoire:"
-#define STR_TIME_SYNC     "Synchronisation du temps"
-#define STR_DISABLED      "Désactivé"
-#define STR_ENABLED_LOCAL "Activé (heure locale)"
-#define STR_ENABLED_UTC   "Activé (UTC)"
-#define STR_DYNAREC       "Recompilateur dynamique"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "Vidéo:"
-#define STR_VIDEO_2       "Vidéo 2:"
-#define STR_VOODOO        "Graphique Voodoo"
-#define STR_IBM8514       "Graphique IBM 8514/A"
-#define STR_XGA           "Graphique XGA"
-
-#define STR_MOUSE         "Souris:"
-#define STR_JOYSTICK      "Manette de commande:"
-#define STR_JOY1          "Manette 1..."
-#define STR_JOY2          "Manette 2..."
-#define STR_JOY3          "Manette 3..."
-#define STR_JOY4          "Manette 4..."
-
-#define STR_SOUND1        "Carte son 1:"
-#define STR_SOUND2        "Carte son 2:"
-#define STR_SOUND3        "Carte son 3:"
-#define STR_SOUND4        "Carte son 4:"
-#define STR_MIDI_OUT      "Sortie MIDI:"
-#define STR_MIDI_IN       "Entrée MIDI:"
-#define STR_MPU401        "MPU-401 autonome"
-#define STR_FLOAT         "Utiliser le son FLOAT32"
-#define STR_FM_DRIVER     "Pilote de synthétiseur FM"
-#define STR_FM_DRV_NUKED  "Nuked (plus précis)"
-#define STR_FM_DRV_YMFM   "YMFM (plus rapide)"
-
-#define STR_NET_TYPE      "Type de réseau:"
-#define STR_PCAP          "Dispositif PCap:"
-#define STR_NET           "Adaptateur de réseau:"
-#define STR_NET1          "Network card 1:"
-#define STR_NET2          "Network card 2:"
-#define STR_NET3          "Network card 3:"
-#define STR_NET4          "Network card 4:"
-
-#define STR_COM1          "Dispositif COM1:"
-#define STR_COM2          "Dispositif COM2:"
-#define STR_COM3          "Dispositif COM3:"
-#define STR_COM4          "Dispositif COM4:"
-#define STR_LPT1          "Dispositif LPT1:"
-#define STR_LPT2          "Dispositif LPT2:"
-#define STR_LPT3          "Dispositif LPT3:"
-#define STR_LPT4          "Dispositif LPT4:"
-#define STR_SERIAL1       "Port série 1"
-#define STR_SERIAL2       "Port série 2"
-#define STR_SERIAL3       "Port série 3"
-#define STR_SERIAL4       "Port série 4"
-#define STR_PARALLEL1     "Port parallèle 1"
-#define STR_PARALLEL2     "Port parallèle 2"
-#define STR_PARALLEL3     "Port parallèle 3"
-#define STR_PARALLEL4     "Port parallèle 4"
-#define STR_SERIAL_PASS1  "Serial port passthrough 1"
-#define STR_SERIAL_PASS2  "Serial port passthrough 2"
-#define STR_SERIAL_PASS3  "Serial port passthrough 3"
-#define STR_SERIAL_PASS4  "Serial port passthrough 4"
-
-#define STR_HDC           "Contrôleur HD:"
-#define STR_FDC           "Contrôleur FD:"
-#define STR_IDE_TER       "Contrôleur IDE tertiaire"
-#define STR_IDE_QUA       "Contrôleur IDE quaternair"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "Contrôleur 1:"
-#define STR_SCSI_2        "Contrôleur 2:"
-#define STR_SCSI_3        "Contrôleur 3:"
-#define STR_SCSI_4        "Contrôleur 4:"
-#define STR_CASSETTE      "Cassette"
-
-#define STR_HDD           "Disques durs:"
-#define STR_NEW           "&Nouveau..."
-#define STR_EXISTING      "&Existant..."
-#define STR_REMOVE        "&Supprimer"
-#define STR_BUS           "Bus:"
-#define STR_CHANNEL       "Canal:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Speed:"
-
-#define STR_SPECIFY       "&Spécifier..."
-#define STR_SECTORS       "Secteurs:"
-#define STR_HEADS         "Têtes:"
-#define STR_CYLS          "Cylindres:"
-#define STR_SIZE_MB       "Taille (Mo):"
-#define STR_TYPE          "Type:"
-#define STR_IMG_FORMAT    "Format Image:"
-#define STR_BLOCK_SIZE    "Taille du bloc:"
-
-#define STR_FLOPPY_DRIVES "Lecteurs de disquettes:"
-#define STR_TURBO         "Turbo"
-#define STR_CHECKBPB      "Vérifier BPB"
-#define STR_CDROM_DRIVES  "Lecterus CD-ROM:"
-#define STR_CD_SPEED      "Vitesse:"
-
-#define STR_MO_DRIVES     "Lecteurs magnéto-optiques:"
-#define STR_ZIP_DRIVES    "Lecteurs ZIP:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "Horloge temps réel ISA:"
-#define STR_ISAMEM        "Expansion de la mémoire ISA"
-#define STR_ISAMEM_1      "Carte 1:"
-#define STR_ISAMEM_2      "Carte 2:"
-#define STR_ISAMEM_3      "Carte 3:"
-#define STR_ISAMEM_4      "Carte 4:"
-#define STR_BUGGER        "Dispositif ISABugger"
-#define STR_POSTCARD      "Carte POST"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Segoe UI"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "Erreur"
-    IDS_2050    "Erreur fatale"
-    IDS_2051    " - PAUSED"
-    IDS_2052    "Appuyez sur Ctrl+Alt+PgDn pour revenir au mode fenêtré."
-    IDS_2053    "Vitesse"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "Images ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "86Box n'a pas pu trouver d'images ROM utilisables.\n\nS'il vous plait, <a href=""https://github.com/86Box/roms/releases/latest"">téléchargez</a> un ensemble ROM et extrayez-le dans le répertoire ""roms""."
-    IDS_2057    "(vide)"
-    IDS_2058    "Images ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0Tous les fichiers (*.*)\0*.*\0"
-    IDS_2059    "Turbo"
-    IDS_2060    "Activé"
-    IDS_2061    "Désactivé"
-    IDS_2062    "Tous les images (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Images basiques du secteur (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Images de la surface (*.86F)\0*.86F\0"
-    IDS_2063    "La machine ""%hs"" n'est pas disponible en raison de l'absence de ROMs dans le répertoire roms/machines. Basculer vers une machine disponible."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "La carte vidéo ""%hs"" n'est pas disponible en raison de l'absence de ROMs dans le répertoire roms/video. Basculer vers une carte vidéo disponible."
-    IDS_2065    "Machine"
-    IDS_2066    "Affichage"
-    IDS_2067    "Dispositifs d'entrée"
-    IDS_2068    "Son"
-    IDS_2069    "Réseau"
-    IDS_2070    "Ports (COM et LPT)"
-    IDS_2071    "Contrôleurs de stockage"
-    IDS_2072    "Disques durs"
-    IDS_2073    "Lecteurs de disquette et CD-ROM"
-    IDS_2074    "Autres dispositifs amovibles"
-    IDS_2075    "Autres périfériques"
-    IDS_2076    "Images de surface (*.86F)\0*.86F\0"
-    IDS_2077    "Cliquer pour capturer la souris"
-    IDS_2078    "Appuyer sur F8+F12 pour libérer la souris"
-    IDS_2079    "Appuyer sur F8+F12 ou le bouton central pour libérer la souris"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "Bus"
-    IDS_2082    "File"
-    IDS_2083    "C"
-    IDS_2084    "T"
-    IDS_2085    "S"
-    IDS_2086    "Mo"
-    IDS_2087    "Speed"
-    IDS_2088    "Vérifier BPB"
-    IDS_2089    "Ko"
-    IDS_2090    "Impossible d'initialiser le moteur de rendu vidéo."
-    IDS_2091    "Défaut"
-    IDS_2092    "%i état(s) d'attente"
-    IDS_2093    "Type"
-    IDS_2094    "Impossible d'initialiser PCap"
-    IDS_2095    "Aucun dispositif PCap trouvé"
-    IDS_2096    "Dispositif PCap non valide"
-    IDS_2097    "Manette(s) standard avec 2 boutons"
-    IDS_2098    "Manette standard avec 4 boutons"
-    IDS_2099    "Manette standard avec 6 boutons"
-    IDS_2100    "Manette standard avec 6 boutons"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Système de contrôle de vol Thrustmaster"
-    IDS_2104    "Aucun"
-    IDS_2105    "Impossible de charger les accélérateurs de clavier."
-    IDS_2106    "Impossible de charger l'entrée raw."
-    IDS_2107    "%u"
-    IDS_2108    "%u Mo (CTS: %i, %i, %i)"
-    IDS_2109    "Disquette %i (%s): %ls"
-    IDS_2110    "Toutes les images (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Images du secteur avancés (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Images du secteur basiques (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Images du flux (*.FDI)\0*.FDI\0Images de surface (*.86F;*.MFM)\0*.86F;*.MFM\0Tous les fichiers (*.*)\0*.*\0"
-    IDS_2112    "Impossible d'initialiser SDL, SDL2.dll est nécessaire"
-    IDS_2113    "Etes-vous sûr de vouloir réinitialiser la machine émulée ?"
-    IDS_2114    "Etes-vous sûr de vouloir quitter 86Box?"
-    IDS_2115    "Impossible d'initialiser Ghostscript"
-    IDS_2116    "Magnéto-optique %i (%ls): %ls"
-    IDS_2117    "Images magnéto-optiques (*.IM?;*.MDI)\0*.IM?;*.MDI\0Tous les fichiers (*.*)\0*.*\0"
-    IDS_2118    "Bienvenue dans 86Box !"
-    IDS_2119    "Côntrolleur interne"
-    IDS_2120    "Sortir"
-    IDS_2121    "Pas de ROMs trouvées"
-    IDS_2122    "Voulez-vous sauvegarder les paramètres ?"
-    IDS_2123    "Cela entraînera la réinitialisation complète de la machine émulée."
-    IDS_2124    "Sauvegarder"
-    IDS_2125    "À propos de 86Box"
-    IDS_2126    "86Box v" EMU_VERSION
-
-    IDS_2127    "Un émulateur de vieux ordinateurs\n\nAuteurs: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nLibéré sous la licence GNU General Public License version 2 ou ultérieure. Pour plus d'informations, voir le fichier LICENSE."
-    IDS_2128    "OK"
-    IDS_2129    "Matériel non disponible"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "Assurez-vous que " LIB_NAME_PCAP " est installé et que vou utilisez une connexion réseau compatible avec " LIB_NAME_PCAP "."
-    IDS_2131    "Configuration non valide"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " est nécessair pour la conversion automatique des fichiers PostScript dans PDF.\n\nTous les documents envoyés à l'imprimante générique PostScript seront sauvés comme des fichiers PostScript (.ps)."
-    IDS_2135    "Entrer en mode plein écran"
-    IDS_2136    "Ne pas montrer ce message à nouveau"
-    IDS_2137    "Ne pas sortir"
-    IDS_2138    "Réinitialiser"
-    IDS_2139    "Ne pas réinitialiser"
-    IDS_2140    "Images magnéto-optiques (*.IM?;*.MDI)\0*.IM?;*.MDI\0Tous les fichiers (*.*)\0*.*\0"
-    IDS_2141    "Images CD-ROM (*.ISO;*.CUE)\0*.ISO;*.CUE\0Tous les fichiers (*.*)\0*.*\0"
-    IDS_2142    "Configuration du dispositif %hs"
-    IDS_2143    "Moniteur en mode veille"
-    IDS_2144    "Shaders OpenGL (*.GLSL)\0*.GLSL\0Tous les fichiers (*.*)\0*.*\0"
-    IDS_2145    "Options OpenGL"
-    IDS_2146    "Vous chargez une configuration non prise en charge"
-    IDS_2147    "La filtrage du type du processeur sur la base de la machine sélectionné est désactivé pur cette machine émulée.\n\nCela permet de sélectionner une processeur que est sinon incompatible avec la machine sélectionné. Cependant, il pourrait y avoir des incompatibilités avec le BIOS de la machine ou autres logiciels.\n\nL'activatione de cette configuration non est officiellement prise en charge et tout rapport de bogue peut être fermé comme étant invalide."
-    IDS_2148    "Continuer"
-    IDS_2149    "Cassette: %s"
-    IDS_2150    "Images cassette (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0Tous les fichiers (*.*)\0*.*\0"
-    IDS_2151    "Cartouche %i: %ls"
-    IDS_2152    "Images cartouche (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0Tous les fichiers (*.*)\0*.*\0"
-    IDS_2153    "Error initializing renderer"
-    IDS_2154    "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-    IDS_2155    "Resume execution"
-    IDS_2156    "Pause execution"
-    IDS_2157    "Press Ctrl+Alt+Del"
-    IDS_2158    "Press Ctrl+Alt+Esc"
-    IDS_2159    "Hard reset"
-    IDS_2160    "ACPI shutdown"
-    IDS_2161    "Settings"
-    IDS_2162    "Type"
-    IDS_2163    "No Dynarec"
-    IDS_2164    "Old Dynarec"
-    IDS_2165    "New Dynarec"
-    IDS_2166    "Video card #2 ""%hs"" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
-    IDS_2167    "Failed to initialize network driver"
-    IDS_2168    "The network configuration will be switched to the null driver"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "Disque dur (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "Les lecteurs de CD-ROM MFM/RLL ou ESDI n'ont jamais existé"
-    IDS_4100    "Personnalisé..."
-    IDS_4101    "Personnalisé (grand)..."
-    IDS_4102    "Ajouter un nouveau disque dur"
-    IDS_4103    "Ajouter un disque dur existant"
-    IDS_4104    "Les images de disque HDI ne peuvent pas avoir une taille supériure à Go."
-    IDS_4105    "Les images de disque ne peuvent pas avoir un taille supérieure à 127 Go."
-    IDS_4106    "Images de dique dur (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0Tous les fichiers (*.*)\0*.*\0"
-    IDS_4107    "Impossible de lire le fichier"
-    IDS_4108    "Impossible d'écrire le fichier"
-    IDS_4109    "Les images HDI ou HDX avec une taille de secteur différente de 512 non sont pas prises en charge."
-    IDS_4110    "USB n'est pas encore pris en charge."
-    IDS_4111    "Le fichier de l'image disque existe déjà."
-    IDS_4112    "Veuillez spécifier un nom de fichier valide."
-    IDS_4113    "Image de disque créée"
-    IDS_4114    "Assurez-vous que le fichier existe et est lisible."
-    IDS_4115    "Assurez-vous que le fichier en cours d'enregistrement se trouve dans un répertoire accessible en écriture."
-    IDS_4116    "Image disque trop grande"
-    IDS_4117    "N'oubliez pas de partitionner et de formater le nouveau disque créé."
-    IDS_4118    "Le fichier sélectionné sera écrasé. Etes-vous sûr de vouloir l'utiliser?"
-    IDS_4119    "Image disque non prise en charge"
-    IDS_4120    "Écraser"
-    IDS_4121    "Ne pas écraser"
-    IDS_4122    "Image brute (.img)"
-    IDS_4123    "Image HDI (.hdi)"
-    IDS_4124    "Image HDX (.hdx)"
-    IDS_4125    "VHD à taille fixe (.vhd)"
-    IDS_4126    "VHD à taille dynamique (.vhd)"
-    IDS_4127    "VHD à différenciation (.vhd)"
-    IDS_4128    "Blocs grands (2 Mo)"
-    IDS_4129    "Blocs petits (512 Ko)"
-    IDS_4130    "Fichiers VHD (*.VHD)\0*.VHD\0Tous les fichiers (*.*)\0*.*\0"
-    IDS_4131    "Sélectionnez le VHD parent"
-    IDS_4132    "Il est possible que l'image parente a été modifié après la création de l'image à différenciation.\n\nIl est même possible que les fichiers de l'mage ont été déplacés ou copiés ou il existe un bogue dans le programme que a créé ce disque.\n\nVoulez-vous réparer l'horodatage?"
-    IDS_4133    "Les horodatages des disques parent et enfant ne correspondent pas"
-    IDS_4134    "Impossible de réparer l'horodatage du VHD."
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "Désactivé"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "Désactivé"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 Ko"
-    IDS_5889    "180 Ko"
-    IDS_5890    "320 Ko"
-    IDS_5891    "360 Ko"
-    IDS_5892    "640 Ko"
-    IDS_5893    "720 Ko"
-    IDS_5894    "1.2 Mo"
-    IDS_5895    "1.25 Mo"
-    IDS_5896    "1.44 Mo"
-    IDS_5897    "DMF (cluster 1024)"
-    IDS_5898    "DMF (cluster 2048)"
-    IDS_5899    "2.88 Mo"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5"" 128 Mo (ISO 10090)"
-    IDS_5903    "3.5"" 230 Mo (ISO 13963)"
-    IDS_5904    "3.5"" 540 Mo (ISO 15498)"
-    IDS_5905    "3.5"" 640 Mo (ISO 15498)"
-    IDS_5906    "3.5"" 1.3 Go (GigaMO)"
-    IDS_5907    "3.5"" 2.3 Go (GigaMO 2)"
-    IDS_5908    "5.25"" 600 Mo"
-    IDS_5909    "5.25"" 650 Mo"
-    IDS_5910    "5.25"" 1 Go"
-    IDS_5911    "5.25"" 1.3 Go"
-
-    IDS_6144    "RPM précis"
-    IDS_6145    "Précision RPM de moins 1%"
-    IDS_6146    "Précision RPM de moins 1.5%"
-    IDS_6147    "Précision RPM de moins 2%"
-
-    IDS_7168    "(Défaut du système)"
-END
-#define IDS_LANG_ENUS IDS_7168
-
-// French (F.R.) resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/hr-HR.rc b/src/win/languages/hr-HR.rc
deleted file mode 100644
index 2e6caea43..000000000
--- a/src/win/languages/hr-HR.rc
+++ /dev/null
@@ -1,637 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Croatian (hr-HR) resources
-
-#ifdef _WIN32
-LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Radnje"
-    BEGIN
-        MENUITEM "&Tipkovnica zahtijeva hvatanje miša", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "&Desni CTRL je lijevi ALT", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "&Ponovno pokretanje...", IDM_ACTION_HRESET
-        MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-    MENUITEM "Ctrl+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "&Pauza", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "Iz&laz...", IDM_ACTION_EXIT
-    END
-    POPUP "&Pogled"
-    BEGIN
-        MENUITEM "&Sakrij statusni redak", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "&Sakrij alatni redak", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
-        MENUITEM "&Prozor s promjenjivim veličinama", IDM_VID_RESIZE
-        MENUITEM "&Zapamtite veličinu i položaj", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "&Renderer"
-        BEGIN
-            MENUITEM "&SDL (Softver)", IDM_VID_SDL_SW
-            MENUITEM "SDL (&Hardver)", IDM_VID_SDL_HW
-            MENUITEM "SDL (&OpenGL)", IDM_VID_SDL_OPENGL
-            MENUITEM "Open&GL (3.0 jezgra)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "&VNC", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Odrediti veličinu...", IDM_VID_SPECIFY_DIM
-        MENUITEM "&4:3 omjer prikaza", IDM_VID_FORCE43
-        POPUP "&Faktor skaliranja prozora"
-        BEGIN
-            MENUITEM "&0,5x", IDM_VID_SCALE_1X
-            MENUITEM "&1x", IDM_VID_SCALE_2X
-            MENUITEM "1,&5x", IDM_VID_SCALE_3X
-            MENUITEM "&2x", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "Metoda filtriranja"
-        BEGIN
-            MENUITEM "&Najbliža", IDM_VID_FILTER_NEAREST
-            MENUITEM "&Linearna", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "&HiDPI skaliranje", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "&Cijelozaslonski način\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "&Način cijelozaslonskog rastezanja"
-        BEGIN
-            MENUITEM "&Razvuci na cijeli zaslona", IDM_VID_FS_FULL
-            MENUITEM "&4:3", IDM_VID_FS_43
-            MENUITEM "&Kvadratni pikseli (zadrži omjer)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "&Cijelobrojno skaliranje", IDM_VID_FS_INT
-        END
-        POPUP "E&GA/(S)VGA postavke"
-        BEGIN
-            MENUITEM "&Obrni boje zaslona VGA", IDM_VID_INVERT
-            POPUP "&Tip zaslona VGA"
-            BEGIN
-                MENUITEM "RGB u &boji", IDM_VID_GRAY_RGB
-                MENUITEM "&RGB u nijansama sive boje", IDM_VID_GRAY_MONO
-                MENUITEM "&Jantarni zaslon", IDM_VID_GRAY_AMBER
-                MENUITEM "&Zeleni zaslon", IDM_VID_GRAY_GREEN
-                MENUITEM "&Bijeli zaslon", IDM_VID_GRAY_WHITE
-            END
-            POPUP "&Vrsta konverzije nijansa sive boje"
-            BEGIN
-                MENUITEM "BT&601 (NTSC/PAL)", IDM_VID_GRAYCT_601
-                MENUITEM "BT&709 (HDTV)", IDM_VID_GRAYCT_709
-                MENUITEM "&Prosjek", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "&Višak slike CGA/PCjr/Tandy/EGA/(S)VGA", IDM_VID_OVERSCAN
-        MENUITEM "&Promjeni kontrast za crno-bijeli zaslon", IDM_VID_CGACON
-    END
-    MENUITEM "&Mediji", IDM_MEDIA
-    POPUP "&Alati"
-    BEGIN
-        MENUITEM "&Opcije...", IDM_CONFIG
-        MENUITEM "&Ažuriraj ikone statusnog redka", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "Napravi &snimku zaslona\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "&Postavke...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "Omogući integraciju sa programom &Discord", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "&Pojačanje zvuka...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "Z&apočni praćenje\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "&Svrši praćenje\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "&Pomoć"
-    BEGIN
-        MENUITEM "&Dokumentacija...", IDM_DOCS
-        MENUITEM "&O programu 86Box...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nova slika...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Postojeća slika...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "Postojeća slika (&zaštićena od pisanja)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Snimi", IDM_CASSETTE_RECORD
-        MENUITEM "&Pokreni", IDM_CASSETTE_PLAY
-        MENUITEM "P&remotaj na početak", IDM_CASSETTE_REWIND
-        MENUITEM "&Preskoči do kraja", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "&Izbaci", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Slika...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "&Izbaci", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nova slika...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Postojeća slika...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "Postojeća slika (&zaštićena od pisanja)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Izvozi u 86F...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "&Izbaci", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Isključi zvuk", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "&Prazno", IDM_CDROM_EMPTY
-        MENUITEM "&Ponovo učitaj prethodnu sliku", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "&Slika...", IDM_CDROM_IMAGE
-        MENUITEM "&Mapa...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nova slika...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Postojeća slika...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "Postojeća slika (&zaštićena od pisanja)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Izbaci", IDM_ZIP_EJECT
-        MENUITEM "&Ponovo učitaj prethodnu sliku", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nova slika...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Postojeća slika...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "Postojeća slika (&zaštićena od pisanja)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Izbaci", IDM_MO_EJECT
-        MENUITEM "&Ponovo učitaj prethodnu sliku", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Ciljni broj okvira u sekundi"
-    BEGIN
-        MENUITEM "&Sinkroniziraj s videom", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "&25 fps", IDM_VID_GL_FPS_25
-        MENUITEM "&30 fps", IDM_VID_GL_FPS_30
-        MENUITEM "&50 fps", IDM_VID_GL_FPS_50
-        MENUITEM "&60 fps", IDM_VID_GL_FPS_60
-        MENUITEM "&75 fps", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "&VSync", IDM_VID_GL_VSYNC
-    MENUITEM "&Odaberi shader...", IDM_VID_GL_SHADER
-    MENUITEM "&Ukloni shader", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "Postavke"
-#define STR_SND_GAIN      "Pojačavanje zvuka"
-#define STR_NEW_FLOPPY    "Nova slika"
-#define STR_CONFIG        "Opcije"
-#define STR_SPECIFY_DIM   "Odredite glavne dimenzije prozora"
-
-#define STR_OK            "U redu"
-#define STR_CANCEL        "Otkaži"
-#define STR_GLOBAL        "Spremite ove postavke kao &globalne zadane postavke"
-#define STR_DEFAULT       "Zadano"
-#define STR_LANGUAGE      "Jezik:"
-#define STR_ICONSET       "Paket ikona:"
-
-#define STR_GAIN          "Pojačavanje"
-
-#define STR_FILE_NAME     "Ime datoteke:"
-#define STR_DISK_SIZE     "Veličina diska:"
-#define STR_RPM_MODE      "Način broja okretaja:"
-#define STR_PROGRESS      "Napredak:"
-
-#define STR_WIDTH         "Širina:"
-#define STR_HEIGHT        "Visina:"
-#define STR_LOCK_TO_SIZE  "Zaključajte na ovu veličinu"
-
-#define STR_MACHINE_TYPE  "Tip sistema:"
-#define STR_MACHINE       "Sistem:"
-#define STR_CONFIGURE     "Namjesti"
-#define STR_CPU_TYPE      "Tip procesora:"
-#define STR_CPU_SPEED     "Brzina:"
-#define STR_FPU           "FPU uređaj:"
-#define STR_WAIT_STATES   "Stanja čekanja:"
-#define STR_MB            "MB"
-#define STR_MEMORY        "Memorija:"
-#define STR_TIME_SYNC     "Sinkronizacija vremena"
-#define STR_DISABLED      "Isključeno"
-#define STR_ENABLED_LOCAL "Uključeno (lokalno vrijeme)"
-#define STR_ENABLED_UTC   "Uključeno (UTC)"
-#define STR_DYNAREC       "Dinamički rekompilator"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "Video:"
-#define STR_VIDEO_2       "Video 2:"
-#define STR_VOODOO        "Voodoo grafika"
-#define STR_IBM8514       "IBM 8514/A grafika"
-#define STR_XGA           "XGA grafika"
-
-#define STR_MOUSE         "Miš:"
-#define STR_JOYSTICK      "Palica za igru:"
-#define STR_JOY1          "Palica za igru 1..."
-#define STR_JOY2          "Palica za igru 2..."
-#define STR_JOY3          "Palica za igru 3..."
-#define STR_JOY4          "Palica za igru 4..."
-
-#define STR_SOUND1        "Zvučna kartica 1:"
-#define STR_SOUND2        "Zvučna kartica 2:"
-#define STR_SOUND3        "Zvučna kartica 3:"
-#define STR_SOUND4        "Zvučna kartica 4:"
-#define STR_MIDI_OUT      "Izlazni uređaj MIDI:"
-#define STR_MIDI_IN       "Ulazni uređaj MIDI:"
-#define STR_MPU401        "Samostalni MPU-401"
-#define STR_FLOAT         "Koristi FLOAT32 za zvuk"
-#define STR_FM_DRIVER     "Drajver za FM sintisajzer"
-#define STR_FM_DRV_NUKED  "Nuked (precizniji)"
-#define STR_FM_DRV_YMFM   "YMFM (brži)"
-
-#define STR_NET_TYPE      "Tip mreže:"
-#define STR_PCAP          "Uređaj PCap:"
-#define STR_NET           "Mrežna kartica:"
-#define STR_NET1          "Network card 1:"
-#define STR_NET2          "Network card 2:"
-#define STR_NET3          "Network card 3:"
-#define STR_NET4          "Network card 4:"
-
-#define STR_COM1          "Uređaj COM1:"
-#define STR_COM2          "Uređaj COM2:"
-#define STR_COM3          "Uređaj COM3:"
-#define STR_COM4          "Uređaj COM4:"
-#define STR_LPT1          "Uređaj LPT1:"
-#define STR_LPT2          "Uređaj LPT2:"
-#define STR_LPT3          "Uređaj LPT3:"
-#define STR_LPT4          "Uređaj LPT4:"
-#define STR_SERIAL1       "Serijska vrata 1"
-#define STR_SERIAL2       "Serijska vrata 2"
-#define STR_SERIAL3       "Serijska vrata 3"
-#define STR_SERIAL4       "Serijska vrata 4"
-#define STR_PARALLEL1     "Paralelna vrata 1"
-#define STR_PARALLEL2     "Paralelna vrata 2"
-#define STR_PARALLEL3     "Paralelna vrata 3"
-#define STR_PARALLEL4     "Paralelna vrata 4"
-#define STR_SERIAL_PASS1  "Serial port passthrough 1"
-#define STR_SERIAL_PASS2  "Serial port passthrough 2"
-#define STR_SERIAL_PASS3  "Serial port passthrough 3"
-#define STR_SERIAL_PASS4  "Serial port passthrough 4"
-
-#define STR_HDC           "Kontroler tvrdog diska:"
-#define STR_FDC           "Kontroler diskete:"
-#define STR_IDE_TER       "Tercijarni IDE kontroler"
-#define STR_IDE_QUA       "Kvaternarni IDE kontroler"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "Kontroler 1:"
-#define STR_SCSI_2        "Kontroler 2:"
-#define STR_SCSI_3        "Kontroler 3:"
-#define STR_SCSI_4        "Kontroler 4:"
-#define STR_CASSETTE      "Audio kaseta"
-
-#define STR_HDD           "Tvrdi diskovi:"
-#define STR_NEW           "&Novi..."
-#define STR_EXISTING      "&Postojeći..."
-#define STR_REMOVE        "&Ukloni"
-#define STR_BUS           "Sabirnica:"
-#define STR_CHANNEL       "Kanal:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Speed:"
-
-#define STR_SPECIFY       "&Odredi..."
-#define STR_SECTORS       "Sektori:"
-#define STR_HEADS         "Glave:"
-#define STR_CYLS          "Cilindri:"
-#define STR_SIZE_MB       "Veličina (MB):"
-#define STR_TYPE          "Tip:"
-#define STR_IMG_FORMAT    "Format slike:"
-#define STR_BLOCK_SIZE    "Veličina slike:"
-
-#define STR_FLOPPY_DRIVES "Disketni pogoni:"
-#define STR_TURBO         "Turbo vrijemena"
-#define STR_CHECKBPB      "Provjeraj BPB"
-#define STR_CDROM_DRIVES  "CD-ROM pogoni:"
-#define STR_CD_SPEED      "Brzina:"
-
-#define STR_MO_DRIVES     "MO pogoni:"
-#define STR_ZIP_DRIVES    "ZIP pogoni:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "Sat stvarnog vremena (RTC):"
-#define STR_ISAMEM        "Proširenje memorije ISA"
-#define STR_ISAMEM_1      "Kartica 1:"
-#define STR_ISAMEM_2      "Kartica 2:"
-#define STR_ISAMEM_3      "Kartica 3:"
-#define STR_ISAMEM_4      "Kartica 4:"
-#define STR_BUGGER        "Uređaj ISABugger"
-#define STR_POSTCARD      "Kartica POST"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Segoe UI"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "Greška"
-    IDS_2050    "Fatalna greška"
-    IDS_2051    " - PAUSED"
-    IDS_2052    "Pritisnite Ctrl+Alt+PgDn za povratak u prozorski način rada."
-    IDS_2053    "Brzina"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "ZIP slike (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "86Box nije mogao pronaći upotrebljive ROM datoteke.\n\nMolimte posjetite <a href=""https://github.com/86Box/roms/releases/latest""></a> sknite paket s ROM datotekama i ekstrahirajte paket u ""roms"" mapu."
-    IDS_2057    "(prazno)"
-    IDS_2058    "ZIP slike (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0Sve datoteke (*.*)\0*.*\0"
-    IDS_2059    "Turbo"
-    IDS_2060    "Uključeno"
-    IDS_2061    "Isključeno"
-    IDS_2062    "Sve slike (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0BOsnovne sektorske slike (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Površinske slike (*.86F)\0*.86F\0"
-    IDS_2063    "Sistem ""%hs"" nije dostupan jer ne postoje potrebni ROM-ovi u mapu roms/machines. Prebacivanje na dostupno računalo."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "Video kartica ""%hs"" nije dostupna jer ne postoje potrebni ROM-ovi u mapu roms/video. Prebacivanje na dostupnu video karticu."
-    IDS_2065    "Sistem"
-    IDS_2066    "Video"
-    IDS_2067    "Ulazni uređaji"
-    IDS_2068    "Zvuk"
-    IDS_2069    "Mreža"
-    IDS_2070    "Vrata (COM & LPT)"
-    IDS_2071    "Kontroleri za diskove"
-    IDS_2072    "Tvrdi diskovi"
-    IDS_2073    "Floppy & CD-ROM pogoni"
-    IDS_2074    "Ostali uklonjivi uređaji"
-    IDS_2075    "Ostali periferni uređaji"
-    IDS_2076    "Površinske slike (*.86F)\0*.86F\0"
-    IDS_2077    "Kliknite da uhvatite miš"
-    IDS_2078    "Pritisnite F8+F12 za otpustanje miša"
-    IDS_2079    "Pritisnite F8+F12 ili srednji gumb miša za otpuštanje miša"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "Bus"
-    IDS_2082    "Datoteka"
-    IDS_2083    "C"
-    IDS_2084    "H"
-    IDS_2085    "S"
-    IDS_2086    "MB"
-    IDS_2087    "Speed"
-    IDS_2088    "Provjeri BPB"
-    IDS_2089    "KB"
-    IDS_2090    "Nije moguće inicijalizirati renderer."
-    IDS_2091    "Standard"
-    IDS_2092    "%i stanje čekanja"
-    IDS_2093    "Tip"
-    IDS_2094    "Postavljanje PCap-a nije uspjelo"
-    IDS_2095    "Nema PCap uređaja"
-    IDS_2096    "Nevažeći PCap uređaj"
-    IDS_2097    "Standardna palica za igru s 2 tipke"
-    IDS_2098    "Standardna palica za igru s 4 tipke"
-    IDS_2099    "Standardna palica za igru s 6 tipke"
-    IDS_2100    "Standardna palica za igru s 8 tipke"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Thrustmaster Flight Control System"
-    IDS_2104    "Bez"
-    IDS_2105    "Nije moguće učitati ubrzivače tipkovnice."
-    IDS_2106    "Nije moguće registrirati neobrađeni unos."
-    IDS_2107    "%u"
-    IDS_2108    "%u MB (CHS: %i, %i, %i)"
-    IDS_2109    "Disketa %i (%s): %ls"
-    IDS_2110    "Sve slike (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Napredne sektorske slike (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Osnovne sektorske slike (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Flux slike (*.FDI)\0*.FDI\0Površinske slike (*.86F;*.MFM)\0*.86F;*.MFM\0Sve datoteke (*.*)\0*.*\0"
-    IDS_2112    "Nije moguće inicijalizirati SDL, SDL2.dll je potrebno"
-    IDS_2113    "Jeste li sigurni da želite hard resetirati emulirani sistem?"
-    IDS_2114    "Jeste li sigurni da želite zatvoriti 86Box?"
-    IDS_2115    "Nije moguće inicijalizirati GhostScript"
-    IDS_2116    "MO %i (%ls): %ls"
-    IDS_2117    "MO slike (*.IM?;*.MDI)\0*.IM?;*.MDI\0Svi datoteke (*.*)\0*.*\0"
-    IDS_2118    "Dobrodošli u 86Box!"
-    IDS_2119    "Uunutarnji kontroler"
-    IDS_2120    "Izlazi"
-    IDS_2121    "Nisu pronađene ROM datoteke"
-    IDS_2122    "Želite li spremiti postavke?"
-    IDS_2123    "Ovo će napraviti hard resetiranje emuliranog sistema."
-    IDS_2124    "Spremaj"
-    IDS_2125    "O programu 86Box"
-    IDS_2126    "86Box verzija " EMU_VERSION
-
-    IDS_2127    "Emulator starih računala\n\nAutori: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, i drugi.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, i drugi.\n\nPreveo: dob205\n\nObjavljeno pod licencom GNU General Public License, verzija 2 ili novije. Za više informacija pogledajte datoteku LICENCE."
-    IDS_2128    "U redu"
-    IDS_2129    "Hardver nije dostupan"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "Provjerite je li " LIB_NAME_PCAP " instaliran i jeste li na mreži, kompadibilnoj s " LIB_NAME_PCAP "."
-    IDS_2131    "Nevažeća konfiguracija"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " je potrebno za automatsku konverziju PostScript datoteke u PDF datoteke.\n\nSvi dokumenti poslani na generički PostScript pisač bit će spremljeni kao PostScript (.ps) datoteke."
-    IDS_2135    "Ulazim u cijelozaslonski način"
-    IDS_2136    "Ne pokazi više ovu poruku"
-    IDS_2137    "Ne izlazi"
-    IDS_2138    "Resetiraj"
-    IDS_2139    "Ne resetiraj"
-    IDS_2140    "MO slike (*.IM?;*.MDI)\0*.IM?;*.MDI\0Sve datoteke (*.*)\0*.*\0"
-    IDS_2141    "CD-ROM slike (*.ISO;*.CUE)\0*.ISO;*.CUE\0Sve datoteke (*.*)\0*.*\0"
-    IDS_2142    "Konfiguracija uređaja %hs "
-    IDS_2143    "Ekran u stanju mirovanja"
-    IDS_2144    "OpenGL shaderi (*.GLSL)\0*.GLSL\0Sve datoteke (*.*)\0*.*\0"
-    IDS_2145    "OpenGL opcije"
-    IDS_2146    "Učitavate nepodržanu konfiguraciju"
-    IDS_2147    "Filtriranje tipa CPU-a na temelju odabranog sistema onemogućeno je za ovaj emulirani sistem.\n\nOvo omogućuje odabir procesora koji inače nisu kompatibilne s odabranog sistem. Međutim, možete naići na na nekompatibilnosti s BIOS-om sustava ili drugim softverom.\n\nOmogućavanje ove postavke nije službeno podržano i sva prijava o greškama mogu biti zatvorena kao ""invalid""."
-    IDS_2148    "Nastavi"
-    IDS_2149    "Audio kaseta: %s"
-    IDS_2150    "Slike audio kasete (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0Sve datoteke (*.*)\0*.*\0"
-    IDS_2151    "Kaseta %i: %ls"
-    IDS_2152    "Slike kasete (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0Sve datoteke (*.*)\0*.*\0"
-    IDS_2153    "Nije moguće inicijalizirati renderer"
-    IDS_2154    "Nije moguće inicijalizirati OpenGL (3.0 jezgra) renderer. Molimte koristite drugi renderer."
-    IDS_2155    "Nastavi"
-    IDS_2156    "Pauziraj"
-    IDS_2157    "Stisni Ctrl+Alt+Del"
-    IDS_2158    "Stisni Ctrl+Alt+Esc"
-    IDS_2159    "Ponovno pokretanje"
-    IDS_2160    "ACPI bazirano gašenje"
-    IDS_2161    "Postavke"
-    IDS_2162    "Type"
-    IDS_2163    "No Dynarec"
-    IDS_2164    "Old Dynarec"
-    IDS_2165    "New Dynarec"
-    IDS_2166    "Video card #2 ""%hs"" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
-    IDS_2167    "Failed to initialize network driver"
-    IDS_2168    "The network configuration will be switched to the null driver"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "Tvrdi disk (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "MFM/RLL ili ESDI CD-ROM pogoni nisu nikada postojali"
-    IDS_4100    "Prilagođeno..."
-    IDS_4101    "Prilagođeno (veliko)..."
-    IDS_4102    "Dodajte novi tvrdi disk"
-    IDS_4103    "Dodajte postojeći tvrdi disk"
-    IDS_4104    "HDI disk image datoteke ne mogu biti veće od 4 GB."
-    IDS_4105    "Slike tvrdog diska ne mogu biti veće od 127 GB."
-    IDS_4106    "Slike za tvrde diskove (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0Sve datoteke (*.*)\0*.*\0"
-    IDS_4107    "Nije moguće pročitati datoteku"
-    IDS_4108    "Nije moguće napisati datoteku"
-    IDS_4109    "HDI ili HDX slike s veličinom sektora koja nije 512 kB nisu podržane."
-    IDS_4110    "USB nije još podržano"
-    IDS_4111    "Slika diska već postoji"
-    IDS_4112    "Molimte unesite važeći naziv datoteke."
-    IDS_4113    "Slika je stvorena"
-    IDS_4114    "Provjerite je li postoji datoteka i je li čitljiva."
-    IDS_4115    "Provjerite je li se datoteka sprema u mapu s dopuštenjima za pisanje."
-    IDS_4116    "Slika diska je prevelika"
-    IDS_4117    "Ne zaboravite stvoriti particije i formatirati ih na novom disku."
-    IDS_4118    "Odabrana datoteka bit će prebrisana. Jeste li sigurni da želite koristiti ovu daoteku?"
-    IDS_4119    "Nepodržana slika diska"
-    IDS_4120    "Prepiši"
-    IDS_4121    "Ne prepiši"
-    IDS_4122    "Slika neobrađenih podataka (.img)"
-    IDS_4123    "HDI slika (.hdi)"
-    IDS_4124    "HDX slika (.hdx)"
-    IDS_4125    "VHD fiksne veličine (.vhd)"
-    IDS_4126    "VHD dinamičke veličine (.vhd)"
-    IDS_4127    "Različiti VHD (.vhd)"
-    IDS_4128    "Veliki blokovi (2 MB)"
-    IDS_4129    "Mali blokovi (512 KB)"
-    IDS_4130    "VHD slike (*.VHD)\0*.VHD\0Sve datoteke (*.*)\0*.*\0"
-    IDS_4131    "Izaberi matičnu sliku VHD"
-    IDS_4132    "To bi moglo značiti da je matična slika promijenjena nakon što je stvorena različita slika.\n\nTo se također može dogoditi ako su slike premještene ili kopirane, ili greška u programu koji je stvorio ovaj disk.\n\nŽelite li popraviti vremenske oznake?"
-    IDS_4133    "Vremenske ozanke matične i poređenog diska ne odgovaraju."
-    IDS_4134    "Ne mogu popraviti vremensku oznaku slike VHD."
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "Deaktivirano"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "Deaktivirano"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 kB"
-    IDS_5889    "180 kB"
-    IDS_5890    "320 kB"
-    IDS_5891    "360 kB"
-    IDS_5892    "640 kB"
-    IDS_5893    "720 kB"
-    IDS_5894    "1,2 MB"
-    IDS_5895    "1,25 MB"
-    IDS_5896    "1,44 MB"
-    IDS_5897    "DMF (1024 clusteri)"
-    IDS_5898    "DMF (2048 clusteri)"
-    IDS_5899    "2,88 MB"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3,5"" 128 MB (ISO 10090)"
-    IDS_5903    "3,5"" 230 MB (ISO 13963)"
-    IDS_5904    "3,5"" 540 MB (ISO 15498)"
-    IDS_5905    "3,5"" 640 MB (ISO 15498)"
-    IDS_5906    "3,5"" 1.3 GB (GigaMO)"
-    IDS_5907    "3,5"" 2.3 GB (GigaMO 2)"
-    IDS_5908    "5,25"" 600 MB"
-    IDS_5909    "5,25"" 650 MB"
-    IDS_5910    "5,25"" 1 GB"
-    IDS_5911    "5,25"" 1.3 GB"
-
-    IDS_6144    "Savršeni broj okretaja u minuti"
-    IDS_6145    "1% ispod savršenog broja okretaja"
-    IDS_6146    "1,5% ispod savršenog broja okretaja"
-    IDS_6147    "2% ispod savršenog broja okretaja"
-
-    IDS_7168    "(Zadana postavka operativnog sustava)"
-END
-#define IDS_LANG_ENUS IDS_7168
-
-// Croatian (hr-HR) resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/hu-HU.rc b/src/win/languages/hu-HU.rc
deleted file mode 100644
index 34bf512c1..000000000
--- a/src/win/languages/hu-HU.rc
+++ /dev/null
@@ -1,641 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Hungarian resources
-//
-// Translated by Laci bá', 2021
-// 
-
-//#define TRANSLATORS_NAME "Laci bá'"
-
-#ifdef _WIN32
-LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Művelet"
-    BEGIN
-        MENUITEM "A &billentyűzet elfogást igényel", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "A &jobb oldali CTRL a bal ALT", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "Hardveres &újraindítás...", IDM_ACTION_HRESET
-        MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-    MENUITEM "Ctrl+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "&Szüneteltetés", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "&Kilépés...", IDM_ACTION_EXIT
-    END
-    POPUP "&Nézet"
-    BEGIN
-        MENUITEM "Állapotsor &elrejtése", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
-        MENUITEM "&Átméretezhető ablak", IDM_VID_RESIZE
-        MENUITEM "Méret és pozíció &megjegyzése", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "&Megjelenítő"
-        BEGIN
-            MENUITEM "&SDL (Szoftveres)", IDM_VID_SDL_SW
-            MENUITEM "SDL (&Hardveres)", IDM_VID_SDL_HW
-            MENUITEM "SDL (&OpenGL)", IDM_VID_SDL_OPENGL
-            MENUITEM "Open&GL (3.0 Core)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "&VNC", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Méretek kézi megadása...", IDM_VID_SPECIFY_DIM
-        MENUITEM "&Rögzített 4:3 képarány", IDM_VID_FORCE43
-        POPUP "&Ablak méretezési tényező"
-        BEGIN
-            MENUITEM "&0,5x", IDM_VID_SCALE_1X
-            MENUITEM "&1x", IDM_VID_SCALE_2X
-            MENUITEM "1,&5x", IDM_VID_SCALE_3X
-            MENUITEM "&2x", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "Szűrési mód"
-        BEGIN
-            MENUITEM "&Szomszédos", IDM_VID_FILTER_NEAREST
-            MENUITEM "&Lineáris", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "Hi&DPI méretezés", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "&Teljes képernyő\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "Teljes képernyős &méretezés"
-        BEGIN
-            MENUITEM "&Nyújtás a teljes képernyőre", IDM_VID_FS_FULL
-            MENUITEM "&4:3", IDM_VID_FS_43
-            MENUITEM "&Négyzetes képpontok (aránytartás)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "&Egész tényezős nagyítás", IDM_VID_FS_INT
-        END
-        POPUP "E&GA/(S)VGA beállítások"
-        BEGIN
-            MENUITEM "&Invertált VGA kijelző", IDM_VID_INVERT
-            POPUP "VGA képernyő &típusa"
-            BEGIN
-                MENUITEM "RGB &színes", IDM_VID_GRAY_RGB
-                MENUITEM "&RGB szürkeárnyalatos", IDM_VID_GRAY_MONO
-                MENUITEM "&Gyömbér kijelző", IDM_VID_GRAY_AMBER
-                MENUITEM "&Zöld kijelző", IDM_VID_GRAY_GREEN
-                MENUITEM "&Fehér kijelző", IDM_VID_GRAY_WHITE
-            END
-            POPUP "Szürkéskála &konzerziós eljárás"
-            BEGIN
-                MENUITEM "BT&601 (NTSC/PAL)", IDM_VID_GRAYCT_601
-                MENUITEM "BT&709 (HDTV)", IDM_VID_GRAYCT_709
-                MENUITEM "&Átlag szerint", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "CGA/PCjr/Tandy/E&GA/(S)VGA túlpásztázás", IDM_VID_OVERSCAN
-        MENUITEM "Kontraszt illesztése &monokróm kijelzőhöz", IDM_VID_CGACON
-    END
-    MENUITEM "&Média", IDM_MEDIA
-    POPUP "&Eszközök"
-    BEGIN
-        MENUITEM "&Konfigurálás...", IDM_CONFIG
-        MENUITEM "Állapotsori ikonok &frissítése", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Képernyőkép készítése\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "&Beállítások...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "&Discord integráció engedélyezése", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "&Hangerőszabályzó...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "Nyomkövetés megkezdése\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "Nyomkövetés befejezése\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "&Súgó"
-    BEGIN
-        MENUITEM "&Dokumentáció...", IDM_DOCS
-        MENUITEM "A 86Box &névjegye...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Új képfájl létrehozása...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "Meglévő képfájl &megnyitása...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "Meglévő képfájl megnyitása (&írásvédett)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Felvétel", IDM_CASSETTE_RECORD
-        MENUITEM "&Lejátszás", IDM_CASSETTE_PLAY
-        MENUITEM "&Visszatekerés az elejére", IDM_CASSETTE_REWIND
-        MENUITEM "&Előretekerés a végére", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "&Kiadás", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "Kép&fájl...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "&Kiadás", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Új képfájl létrehozása...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "Meglévő képfájl &megnyitása...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "Meglévő képfájl megnyitása (&írásvédett)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&xportálás 86F formátumba...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "&Kiadás", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Némítás", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "&Kiadás", IDM_CDROM_EMPTY
-        MENUITEM "Előző képfájl &újratöltése", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "&Meglévő képfájl &megnyitása...", IDM_CDROM_IMAGE
-        MENUITEM "&Mappa...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Új képfájl létrehozása...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Meglévő képfájl &megnyitása...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "Meglévő képfájl megnyitása (&írásvédett)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "Kiadás", IDM_ZIP_EJECT
-        MENUITEM "Előző képfájl &újratöltése", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Új képfájl létrehozása...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Meglévő képfájl &megnyitása...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "Meglévő képfájl megnyitása (&írásvédett)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "Kiadás", IDM_MO_EJECT
-        MENUITEM "Előző képfájl &újratöltése", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "Cél &képkockasebesség"
-    BEGIN
-        MENUITEM "&Szinkronizálás a videóval ", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "&25 fps", IDM_VID_GL_FPS_25
-        MENUITEM "&30 fps", IDM_VID_GL_FPS_30
-        MENUITEM "&50 fps", IDM_VID_GL_FPS_50
-        MENUITEM "&60 fps", IDM_VID_GL_FPS_60
-        MENUITEM "&75 fps", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "&VSync", IDM_VID_GL_VSYNC
-    MENUITEM "Shader &kiválasztása...", IDM_VID_GL_SHADER
-    MENUITEM "Shader &eltávolítása", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "Beállítások"
-#define STR_SND_GAIN      "Hangerőszabályzó"
-#define STR_NEW_FLOPPY    "Új képfájl létrehozása"
-#define STR_CONFIG        "Konfigurálás"
-#define STR_SPECIFY_DIM   "Főablak méreteinek megadása"
-
-#define STR_OK            "OK"
-#define STR_CANCEL        "Mégse"
-#define STR_GLOBAL        "Beállítások mentése &globális alapértékként"
-#define STR_DEFAULT       "&Alapértelmezett"
-#define STR_LANGUAGE      "Nyelv:"
-#define STR_ICONSET       "Ikonkészlet:"
-
-#define STR_GAIN          "Hangerő"
-
-#define STR_FILE_NAME     "Fájlnév:"
-#define STR_DISK_SIZE     "Méret:"
-#define STR_RPM_MODE      "RPM-mód:"
-#define STR_PROGRESS      "Folyamat:"
-
-#define STR_WIDTH         "Szélesség:"
-#define STR_HEIGHT        "Magasság:"
-#define STR_LOCK_TO_SIZE  "Rögzítés a megadott méretre"
-
-#define STR_MACHINE_TYPE  "Géptípus:"
-#define STR_MACHINE       "Számítógép:"
-#define STR_CONFIGURE     "Beállítások..."
-#define STR_CPU_TYPE      "Processzor:"
-#define STR_CPU_SPEED     "Seb.:"
-#define STR_FPU           "FPU-egység:"
-#define STR_WAIT_STATES   "Várak. ciklusok:"
-#define STR_MB            "MB"
-#define STR_MEMORY        "Memória:"
-#define STR_TIME_SYNC     "Idő szinkronizáció"
-#define STR_DISABLED      "Letiltva"
-#define STR_ENABLED_LOCAL "Engedélyezve (helyi idő)"
-#define STR_ENABLED_UTC   "Engedélyezve (UTC)"
-#define STR_DYNAREC       "Dinamikus újrafordítás"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "Videokártya:"
-#define STR_VIDEO_2       "Videokártya 2:"
-#define STR_VOODOO        "Voodoo-gyorsítókártya"
-#define STR_IBM8514       "IBM 8514/A-gyorsítókártya"
-#define STR_XGA           "XGA-gyorsítókártya"
-
-#define STR_MOUSE         "Egér:"
-#define STR_JOYSTICK      "Játékvezérlő:"
-#define STR_JOY1          "Játékvez. 1..."
-#define STR_JOY2          "Játékvez. 2..."
-#define STR_JOY3          "Játékvez. 3..."
-#define STR_JOY4          "Játékvez. 4..."
-
-#define STR_SOUND1        "Hangkártya 1:"
-#define STR_SOUND2        "Hangkártya 2:"
-#define STR_SOUND3        "Hangkártya 3:"
-#define STR_SOUND4        "Hangkártya 4:"
-#define STR_MIDI_OUT      "MIDI-kimenet:"
-#define STR_MIDI_IN       "MIDI-bemenet:"
-#define STR_MPU401        "Különálló MPU-401"
-#define STR_FLOAT         "FLOAT32 használata"
-#define STR_FM_DRIVER     "FM szintetizátor meghajtó"
-#define STR_FM_DRV_NUKED  "Nuked (pontosabb)"
-#define STR_FM_DRV_YMFM   "YMFM (gyorsabb)"
-
-#define STR_NET_TYPE      "Hálózati típusa:"
-#define STR_PCAP          "PCap eszköz:"
-#define STR_NET           "Hálózati kártya:"
-#define STR_NET1          "Network card 1:"
-#define STR_NET2          "Network card 2:"
-#define STR_NET3          "Network card 3:"
-#define STR_NET4          "Network card 4:"
-
-#define STR_COM1          "COM1 eszköz:"
-#define STR_COM2          "COM2 eszköz:"
-#define STR_COM3          "COM3 eszköz:"
-#define STR_COM4          "COM4 eszköz:"
-#define STR_LPT1          "LPT1 eszköz:"
-#define STR_LPT2          "LPT2 eszköz:"
-#define STR_LPT3          "LPT3 eszköz:"
-#define STR_LPT4          "LPT4 eszköz:"
-#define STR_SERIAL1       "Soros port 1"
-#define STR_SERIAL2       "Soros port 2"
-#define STR_SERIAL3       "Soros port 3"
-#define STR_SERIAL4       "Soros port 4"
-#define STR_PARALLEL1     "Párhuzamos port 1"
-#define STR_PARALLEL2     "Párhuzamos port 2"
-#define STR_PARALLEL3     "Párhuzamos port 3"
-#define STR_PARALLEL4     "Párhuzamos port 4"
-#define STR_SERIAL_PASS1  "Serial port passthrough 1"
-#define STR_SERIAL_PASS2  "Serial port passthrough 2"
-#define STR_SERIAL_PASS3  "Serial port passthrough 3"
-#define STR_SERIAL_PASS4  "Serial port passthrough 4"
-
-#define STR_HDC           "Merevl.-vezérlő:"
-#define STR_FDC           "Floppy-vezérlő:"
-#define STR_IDE_TER       "Harmadlagos IDE-vezérlő"
-#define STR_IDE_QUA       "Negyedleges IDE-vezérlő"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "Gazdaadapt. 1:"
-#define STR_SCSI_2        "Gazdaadapt. 2:"
-#define STR_SCSI_3        "Gazdaadapt. 3:"
-#define STR_SCSI_4        "Gazdaadapt. 4:"
-#define STR_CASSETTE      "Magnókazetta"
-
-#define STR_HDD           "Merevlemezek:"
-#define STR_NEW           "&Új..."
-#define STR_EXISTING      "&Megnyitás..."
-#define STR_REMOVE        "&Eltávolítás"
-#define STR_BUS           "Busz:"
-#define STR_CHANNEL       "Csatorna:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Speed:"
-
-#define STR_SPECIFY       "&Kiválasztás..."
-#define STR_SECTORS       "Szektor:"
-#define STR_HEADS         "Fej:"
-#define STR_CYLS          "Cilinder:"
-#define STR_SIZE_MB       "Méret (MB):"
-#define STR_TYPE          "Típus:"
-#define STR_IMG_FORMAT    "Formátum:"
-#define STR_BLOCK_SIZE    "Blokkméret:"
-
-#define STR_FLOPPY_DRIVES "Floppy-meghajtók:"
-#define STR_TURBO         "Turbó időzítés"
-#define STR_CHECKBPB      "BPB ellenőrzés"
-#define STR_CDROM_DRIVES  "CD-ROM meghajtók:"
-#define STR_CD_SPEED      "Seb.:"
-
-#define STR_MO_DRIVES     "MO-meghajtók:"
-#define STR_ZIP_DRIVES    "ZIP-meghajtók:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "ISA RTC (óra):"
-#define STR_ISAMEM        "ISA memóriabővítők"
-#define STR_ISAMEM_1      "Kártya 1:"
-#define STR_ISAMEM_2      "Kártya 2:"
-#define STR_ISAMEM_3      "Kártya 3:"
-#define STR_ISAMEM_4      "Kártya 4:"
-#define STR_BUGGER        "ISABugger eszköz"
-#define STR_POSTCARD      "POST kártya"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Segoe UI"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "Hiba"
-    IDS_2050    "Végzetes hiba"
-    IDS_2051    " - PAUSED"
-    IDS_2052    "Használja a Ctrl+Alt+PgDn gombokat az ablakhoz való visszatéréshez."
-    IDS_2053    "Sebesség"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "ZIP-lemezképek (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "A 86Box nem talált használható ROM-képeket\n\nKérem <a href=""https://github.com/86Box/roms/releases/latest"">töltse le</a> a ROM készletet és bontsa ki a ""roms"" könyvtárba."
-    IDS_2057    "(üres)"
-    IDS_2058    "ZIP-lemezképek (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0Minden fájl (*.*)\0*.*\0"
-    IDS_2059    "Turbó"
-    IDS_2060    "Bekapcsolva"
-    IDS_2061    "Kikapcsolva"
-    IDS_2062    "Minden képfájl (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Alapvető szektor képfájlok (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Felületi képfájlok (*.86F)\0*.86F\0"
-    IDS_2063    "A számítógép ""%hs"" nem elérhető a ""roms/machines"" mappából hiányzó ROM-képek miatt. Ehelyett egy másik gép kerül futtatásra."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "A videokártya ""%hs"" nem elérhető a ""roms/video"" mappából hiányzó ROM-képek miatt. Ehelyett egy másik kártya kerül futtatásra."
-    IDS_2065    "Számítógép"
-    IDS_2066    "Megjelenítő"
-    IDS_2067    "Beviteli eszközök"
-    IDS_2068    "Hang"
-    IDS_2069    "Hálózat"
-    IDS_2070    "Portok (COM és LPT)"
-    IDS_2071    "Tárolóvezérlők"
-    IDS_2072    "Merevlemezek"
-    IDS_2073    "Floppy és CD-ROM meghajtók"
-    IDS_2074    "Egyéb cserélhető tárolók"
-    IDS_2075    "Egyéb perifériák"
-    IDS_2076    "Felületi képfájlok (*.86F)\0*.86F\0"
-    IDS_2077    "Kattintson az egér elfogásához"
-    IDS_2078    "Nyomja meg az F8+F12-t az egér elengédéséhez"
-    IDS_2079    "Nyomja meg az F8+F12-t vagy a középső gombot az egér elengédéséhez"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "Busz"
-    IDS_2082    "Fájl"
-    IDS_2083    "C"
-    IDS_2084    "H"
-    IDS_2085    "S"
-    IDS_2086    "MB"
-    IDS_2087    "Speed"
-    IDS_2088    "BPB ellenőrzése"
-    IDS_2089    "KB"
-    IDS_2090    "Nem sikerült inicializálni a videó megjelenítőt."
-    IDS_2091    "Alapértelmezett"
-    IDS_2092    "%i várakozási ciklus(ok)"
-    IDS_2093    "Típus"
-    IDS_2094    "Nem sikerült a PCap beállítása"
-    IDS_2095    "Nem találhatóak PCap eszközök"
-    IDS_2096    "Érvénytelen PCap eszköz"
-    IDS_2097    "Szabványos 2-gombos játékvezérlő(k)"
-    IDS_2098    "Szabványos 4-gombos játékvezérlő"
-    IDS_2099    "Szabványos 6-gombos játékvezérlő"
-    IDS_2100    "Szabványos 8-gombos játékvezérlő"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Thrustmaster Flight Control System"
-    IDS_2104    "Nincs"
-    IDS_2105    "Nem lehet betölteni a billentyűzetgyorsítókat."
-    IDS_2106    "A közvetlen nyers bevitel regisztrálása nem sikerült."
-    IDS_2107    "%u"
-    IDS_2108    "%u MB (CHS: %i, %i, %i)"
-    IDS_2109    "Floppy %i (%s): %ls"
-    IDS_2110    "Minden képfájl (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Továbbfejlesztett szektor képek (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Alapvető szektor képek  (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Flux képekfájlok (*.FDI)\0*.FDI\0Felületi képfájlok (*.86F;*.MFM)\0*.86F;*.MFM\0Minden fájl (*.*)\0*.*\0"
-    IDS_2112    "Az SDL inicializálása nem lehetséges, az SDL2.dll fájl szükséges"
-    IDS_2113    "Biztosan szeretné újraindítani az emulált gépet?"
-    IDS_2114    "Biztos benne, hogy ki szeretne lépni a 86Box-ból?"
-    IDS_2115    "Nem sikerült inicializálni a Ghostscript-et"
-    IDS_2116    "MO %i (%ls): %ls"
-    IDS_2117    "MO-képfájlok (*.IM?;*.MDI)\0*.IM?;*.MDI\0Minden fájl (*.*)\0*.*\0"
-    IDS_2118    "Üdvözli önt az 86Box!"
-    IDS_2119    "Integrált vezérlő"
-    IDS_2120    "Kilépés"
-    IDS_2121    "Nem találhatóak meg a ROM-képek"
-    IDS_2122    "Szeretné menteni a beállításokat?"
-    IDS_2123    "Ezzel hardveresen újraindítja az emulált gépet."
-    IDS_2124    "Mentés"
-    IDS_2125    "A 86Box névjegye"
-    IDS_2126    "86Box v" EMU_VERSION
-    IDS_2127    "Régi számítógépek emulátora\n\nFejlesztők: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nFordította: Laci bá'\n\nMegjelent a GNU General Public License v2 vagy újabb alatt. További információért lásd a LICENSE fájlt."
-    IDS_2128    "OK"
-    IDS_2129    "Hardver nem elérhető"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "Győződjön meg hogy a(z) " LIB_NAME_PCAP " telepítve van és jelenleg a " LIB_NAME_PCAP "-kompatibilis kapcsolatot használja."
-    IDS_2131    "Érvénytelen konfiguráció"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " szükséges a PostScript fájlok PDF formátumba való automatikus konvertálásához.\n\nAz általános PostScript nyomtatóra küldött dokumentumok PostScript (.ps) fájlként kerülnek mentésre."
-    IDS_2135    "Teljes képernyős módra váltás"
-    IDS_2136    "Ne jelenítse meg újra ezt az üzenetet "
-    IDS_2137    "Ne lépjen ki"
-    IDS_2138    "Újraindítás"
-    IDS_2139    "Ne indítsa újra"
-    IDS_2140    "MO-képfájlok (*.IM?;*.MDI)\0*.IM?;*.MDI\0Minden fájl (*.*)\0*.*\0"
-    IDS_2141    "CD-ROM-képek (*.ISO;*.CUE)\0*.ISO;*.CUE\0Minden fájl (*.*)\0*.*\0"
-    IDS_2142    "%hs eszközkonfiguráció"
-    IDS_2143    "Képernyő alvó módban"
-    IDS_2144    "OpenGL Shaderek (*.GLSL)\0*.GLSL\0Minden fájl (*.*)\0*.*\0"
-    IDS_2145    "OpenGL beállítások"
-    IDS_2146    "Egy nem támogatott konfigurációt tölt be"
-    IDS_2147    "A kiválasztott gépen alapuló CPU-típusszűrés le van tiltva ezen az emulált gépen.\n\nEz lehetővé teszi olyan CPU kiválasztását, amely egyébként nem kompatibilis a kiválasztott géppel. Előfordulhat azonban, hogy nem kompatibilis a gép BIOS-ával vagy más szoftverekkel.\n\nA beállítás engedélyezése hivatalosan nem támogatott, és a benyújtott hibajelentéseket érvénytelenként lezárhatjuk."
-    IDS_2148    "Folytatás"
-    IDS_2149    "Magnókazetta: %s"
-    IDS_2150    "Magnókazetta-képek (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0Minden fájl (*.*)\0*.*\0"
-    IDS_2151    "ROM-kazetta %i: %ls"
-    IDS_2152    "ROM-kazetta képek (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0Minden fájl (*.*)\0*.*\0"
-    IDS_2153    "Hiba történt a renderelő inicializálásakor"
-    IDS_2154    "Az OpenGL (3.0 Core) megjelenítő-motort nem sikerült inicializálni. Kérem használjon másik renderelőt."
-    IDS_2155    "Resume execution"
-    IDS_2156    "Pause execution"
-    IDS_2157    "Press Ctrl+Alt+Del"
-    IDS_2158    "Press Ctrl+Alt+Esc"
-    IDS_2159    "Hard reset"
-    IDS_2160    "ACPI shutdown"
-    IDS_2161    "Settings"
-    IDS_2162    "Type"
-    IDS_2163    "No Dynarec"
-    IDS_2164    "Old Dynarec"
-    IDS_2165    "New Dynarec"
-    IDS_2166    "Video card #2 ""%hs"" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
-    IDS_2167    "Failed to initialize network driver"
-    IDS_2168    "The network configuration will be switched to the null driver"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "Merevlemez (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "MFM/RLL vagy ESDI CD-ROM meghajtók soha nem léteztek"
-    IDS_4100    "Egyéni..."
-    IDS_4101    "Egyéni (nagy)..."
-    IDS_4102    "Új merevlemez hozzáadása"
-    IDS_4103    "Meglévő merevlemez hozzáadása"
-    IDS_4104    "A HDI lemezképek nem lehetnek nagyobbak 4 GB-nál."
-    IDS_4105    "A lemezképek mérete nem haladhatja meg a 127 GB-ot."
-    IDS_4106    "Merevlemez-képfájlok (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0Minden fájl (*.*)\0*.*\0"
-    IDS_4107    "A fájl nem olvasható"
-    IDS_4108    "A fájl nem írható"
-    IDS_4109    "Az 512-től eltérő szektorméretű HDI vagy HDX képek nem támogatottak."
-    IDS_4110    "Az USB még nem támogatott"
-    IDS_4111    "A lemezképfájl már létezik"
-    IDS_4112    "Adjon meg egy érvényes fájlnevet."
-    IDS_4113    "A lemezképfájl létrehozásra került"
-    IDS_4114    "Győződjön meg arról, hogy a fájl létezik és olvasható."
-    IDS_4115    "Győződjön meg arról, hogy a fájlt egy írható könyvtárba menti."
-    IDS_4116    "A lemezképfájl túl nagy"
-    IDS_4117    "Ne felejtse el particionálni és formázni az újonnan létrehozott meghajtót."
-    IDS_4118    "A kiválasztott fájl felülírásra kerül. Biztos, hogy ezt kívánja használni?"
-    IDS_4119    "Nem támogatott lemezkép"
-    IDS_4120    "Felülírás"
-    IDS_4121    "Ne írja felül"
-    IDS_4122    "Nyers lemezkép (.img)"
-    IDS_4123    "HDI-lemezkép (.hdi)"
-    IDS_4124    "HDX-lemezkép (.hdx)"
-    IDS_4125    "Rögzített méretű VHD (.vhd)"
-    IDS_4126    "Dinamikusan bővülő VHD (.vhd)"
-    IDS_4127    "Különbség-VHD (.vhd)"
-    IDS_4128    "Nagy blokkméret (2 MB)"
-    IDS_4129    "Kis blokkméret (512 KB)"
-    IDS_4130    "VHD fájlok (*.VHD)\0*.VHD\0Minden fájl (*.*)\0*.*\0"
-    IDS_4131    "Válassza ki a szülő VHD-t"
-    IDS_4132    "Ez azt jelentheti, hogy a szülőkép módosult az eltérő kép létrehozása után.\n\nEz akkor is előfordulhat, ha a képfájlokat áthelyezték vagy másolták, vagy a lemezt létrehozó program hibája miatt.\n\nSzeretné kijavítani az időbélyegeket?"
-    IDS_4133    "A szülő- és a gyermeklemez időbélyegei nem egyeznek"
-    IDS_4134    "Nem sikerült kijavítani a VHD időbélyegét."
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "Letiltva"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "Letiltva"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 kB"
-    IDS_5889    "180 kB"
-    IDS_5890    "320 kB"
-    IDS_5891    "360 kB"
-    IDS_5892    "640 kB"
-    IDS_5893    "720 kB"
-    IDS_5894    "1.2 MB"
-    IDS_5895    "1.25 MB"
-    IDS_5896    "1.44 MB"
-    IDS_5897    "DMF (1024 klaszter)"
-    IDS_5898    "DMF (2048 klaszter)"
-    IDS_5899    "2.88 MB"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5"" 128 MB (ISO 10090)"
-    IDS_5903    "3.5"" 230 MB (ISO 13963)"
-    IDS_5904    "3.5"" 540 MB (ISO 15498)"
-    IDS_5905    "3.5"" 640 MB (ISO 15498)"
-    IDS_5906    "3.5"" 1.3 GB (GigaMO)"
-    IDS_5907    "3.5"" 2.3 GB (GigaMO 2)"
-    IDS_5908    "5.25"" 600 MB"
-    IDS_5909    "5.25"" 650 MB"
-    IDS_5910    "5.25"" 1 GB"
-    IDS_5911    "5.25"" 1.3 GB"
-
-    IDS_6144    "Tökéletes RPM"
-    IDS_6145    "1%-kal a tökéletes RPM alatt"
-    IDS_6146    "1.5%-kal a tökéletes RPM alatt"
-    IDS_6147    "2%-kal a tökéletes RPM alatt"
-
-    IDS_7168    "(A rendszer nyelve)"
-END
-#define IDS_LANG_ENUS IDS_7168
-
-// Hungarian resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/it-IT.rc b/src/win/languages/it-IT.rc
deleted file mode 100644
index 6f5b67201..000000000
--- a/src/win/languages/it-IT.rc
+++ /dev/null
@@ -1,638 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Italian (IT-it) resources
-
-#ifdef _WIN32
-LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
-#pragma code_page(65001)
-#endif //_WIN32
-
-// explorerdotexe
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Azione"
-    BEGIN
-        MENUITEM "&Tastiera richiede la cattura", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "&CTRL destro è ALT sinistro", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "&Riavvia...", IDM_ACTION_HRESET
-        MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-    MENUITEM "Ctrl+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "&Pausa", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "E&sci...", IDM_ACTION_EXIT
-    END
-    POPUP "&Visualizza"
-    BEGIN
-        MENUITEM "&Nascondi barra di stato", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
-        MENUITEM "&Finestra ridimensionabile", IDM_VID_RESIZE
-        MENUITEM "R&icorda dimensioni e posizione", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "Re&nderer"
-        BEGIN
-            MENUITEM "&SDL (Software)", IDM_VID_SDL_SW
-            MENUITEM "SDL (&Hardware)", IDM_VID_SDL_HW
-            MENUITEM "SDL (&OpenGL)", IDM_VID_SDL_OPENGL
-            MENUITEM "Open&GL (3.0 Core)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "&VNC", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Specifica dimensioni...", IDM_VID_SPECIFY_DIM
-        MENUITEM "F&orza display 4:3", IDM_VID_FORCE43
-        POPUP "&Fattore scalare della finestra"
-        BEGIN
-            MENUITEM "&0.5x", IDM_VID_SCALE_1X
-            MENUITEM "&1x", IDM_VID_SCALE_2X
-            MENUITEM "1.&5x", IDM_VID_SCALE_3X
-            MENUITEM "&2x", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "Metodo filtro"
-        BEGIN
-            MENUITEM "&Dal più vicino", IDM_VID_FILTER_NEAREST
-            MENUITEM "&Lineare", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "Scala Hi&DPI", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "&Schermo intero\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "Modalità adattamento &schermo intero"
-        BEGIN
-            MENUITEM "&Adatta a schermo intero", IDM_VID_FS_FULL
-            MENUITEM "&4:3", IDM_VID_FS_43
-            MENUITEM "&Pixel quadrati (mantiene l'aspetto)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "&Scala intera", IDM_VID_FS_INT
-        END
-        POPUP "Impostazioni E&GA/(S)VGA"
-        BEGIN
-            MENUITEM "&Invertire monitor VGA", IDM_VID_INVERT
-            POPUP "Schermi VGA &"
-            BEGIN
-                MENUITEM "RGB &Color", IDM_VID_GRAY_RGB
-                MENUITEM "&RGB Monocroma", IDM_VID_GRAY_MONO
-                MENUITEM "&Monitor ambra", IDM_VID_GRAY_AMBER
-                MENUITEM "&Monitor verde", IDM_VID_GRAY_GREEN
-                MENUITEM "&Monitor bianco", IDM_VID_GRAY_WHITE
-            END
-            POPUP "Conversione &scala grigia"
-            BEGIN
-                MENUITEM "BT&601 (NTSC/PAL)", IDM_VID_GRAYCT_601
-                MENUITEM "BT&709 (HDTV)", IDM_VID_GRAYCT_709
-                MENUITEM "&AMedia", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Sovrascansione CGA/PCjr/Tandy/E&GA/(S)VGA", IDM_VID_OVERSCAN
-        MENUITEM "Cambia il contrasto per &display monocromatici", IDM_VID_CGACON
-    END
-    MENUITEM "&Dispositivi", IDM_MEDIA
-    POPUP "&Strumenti"
-    BEGIN
-        MENUITEM "&Impostazioni...", IDM_CONFIG
-        MENUITEM "&Aggiorna icone della barra di stato", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "Cattura schermata\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "&Preferenze...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "Abilita &integrazione Discord", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "Guadagno &suono...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "Inizia traccia\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "Ferma traccia\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "&?"
-    BEGIN
-        MENUITEM "&Documentazione...", IDM_DOCS
-        MENUITEM "&Informazioni su 86Box...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nuova immagine...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Immagine esistente...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "Immagine esistente (&protezione contro scrittura)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Registra", IDM_CASSETTE_RECORD
-        MENUITEM "R&iproduci", IDM_CASSETTE_PLAY
-        MENUITEM "Ri&avvolgi all'inizio", IDM_CASSETTE_REWIND
-        MENUITEM "A&vanti veloce alla fine", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "&Espelli", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Immagine...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "&Espelli", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nuova immagine...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Immagine esistente...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "Immagine esistente (&protezione contro scrittura)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&sporta in 86F...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "&Espelli", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Muto", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "&Espelli", IDM_CDROM_EMPTY
-        MENUITEM "&Ricarica l'immagine precedente", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "&Immagine...", IDM_CDROM_IMAGE
-        MENUITEM "&Cartella...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nuova immagine...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Immagine esistente...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "Immagine esistente (&protezione contro scrittura)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Espelli", IDM_ZIP_EJECT
-        MENUITEM "&Ricarica l'immagine precedente", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nuova immagine...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Immagine esistente...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "Immagine esistente (&protezione contro scrittura)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Espelli", IDM_MO_EJECT
-        MENUITEM "&Ricarica l'immagine precedente", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "Imposta obiettivo &fotogrammi"
-    BEGIN
-        MENUITEM "&Sincronizza col video", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "&25 FPS", IDM_VID_GL_FPS_25
-        MENUITEM "&30 FPS", IDM_VID_GL_FPS_30
-        MENUITEM "&50 FPS", IDM_VID_GL_FPS_50
-        MENUITEM "&60 FPS", IDM_VID_GL_FPS_60
-        MENUITEM "&75 FPS", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "&VSync", IDM_VID_GL_VSYNC
-    MENUITEM "&Seleziona shader...", IDM_VID_GL_SHADER
-    MENUITEM "&Rimuovi shader", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "Preferenze"
-#define STR_SND_GAIN      "Guadagno del suono"
-#define STR_NEW_FLOPPY    "Nuova immagine"
-#define STR_CONFIG        "Impostazioni"
-#define STR_SPECIFY_DIM   "Specifica dimensioni della finestra principale"
-
-#define STR_OK            "OK"
-#define STR_CANCEL        "Annulla"
-#define STR_GLOBAL        "Salva queste impostazioni come &predefinite globali"
-#define STR_DEFAULT       "&Predefinito"
-#define STR_LANGUAGE      "Lingua:"
-#define STR_ICONSET       "Pacchetto di icone:"
-
-#define STR_GAIN          "Guadagno"
-
-#define STR_FILE_NAME     "Nome file:"
-#define STR_DISK_SIZE     "Dimensioni disco:"
-#define STR_RPM_MODE      "Modalità RPM:"
-#define STR_PROGRESS      "Progresso:"
-
-#define STR_WIDTH         "Larghezza:"
-#define STR_HEIGHT        "Altezza:"
-#define STR_LOCK_TO_SIZE  "Blocca in queste dimensioni"
-
-#define STR_MACHINE_TYPE  "Tipo di piastra madre:"
-#define STR_MACHINE       "Piastra madre:"
-#define STR_CONFIGURE     "Configura"
-#define STR_CPU_TYPE      "Tipo del CPU:"
-#define STR_CPU_SPEED     "Veloc.:"
-#define STR_FPU           "FPU:"
-#define STR_WAIT_STATES   "Stati di attesa:"
-#define STR_MB            "MB"
-#define STR_MEMORY        "Memoria:"
-#define STR_TIME_SYNC     "Sincronizzazione dell'ora"
-#define STR_DISABLED      "Disabilitata"
-#define STR_ENABLED_LOCAL "Abilitata (ora locale)"
-#define STR_ENABLED_UTC   "Abilitata (UTC)"
-#define STR_DYNAREC       "Ricompilatore dinamico"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "Video:"
-#define STR_VIDEO_2       "Video 2:"
-#define STR_VOODOO        "Grafica Voodoo"
-#define STR_IBM8514       "Grafica IBM 8514/A"
-#define STR_XGA           "Grafica XGA"
-
-#define STR_MOUSE         "Mouse:"
-#define STR_JOYSTICK      "Joystick:"
-#define STR_JOY1          "Joystick 1..."
-#define STR_JOY2          "Joystick 2..."
-#define STR_JOY3          "Joystick 3..."
-#define STR_JOY4          "Joystick 4..."
-
-#define STR_SOUND1        "Scheda audio 1:"
-#define STR_SOUND2        "Scheda audio 2:"
-#define STR_SOUND3        "Scheda audio 3:"
-#define STR_SOUND4        "Scheda audio 4:"
-#define STR_MIDI_OUT      "Uscita MIDI:"
-#define STR_MIDI_IN       "Entrata MIDI:"
-#define STR_MPU401        "MPU-401 autonomo"
-#define STR_FLOAT         "Usa suono FLOAT32"
-#define STR_FM_DRIVER     "Driver sint. FM"
-#define STR_FM_DRV_NUKED  "Nuked (più accurato)"
-#define STR_FM_DRV_YMFM   "YMFM (più veloce)"
-
-#define STR_NET_TYPE      "Tipo di rete:"
-#define STR_PCAP          "Dispositivo PCap:"
-#define STR_NET           "Scheda di rete:"
-#define STR_NET1          "Network card 1:"
-#define STR_NET2          "Network card 2:"
-#define STR_NET3          "Network card 3:"
-#define STR_NET4          "Network card 4:"
-
-#define STR_COM1          "Dispositivo COM1:"
-#define STR_COM2          "Dispositivo COM2:"
-#define STR_COM3          "Dispositivo COM3:"
-#define STR_COM4          "Dispositivo COM4:"
-#define STR_LPT1          "Dispositivo LPT1:"
-#define STR_LPT2          "Dispositivo LPT2:"
-#define STR_LPT3          "Dispositivo LPT3:"
-#define STR_LPT4          "Dispositivo LPT4:"
-#define STR_SERIAL1       "Porta seriale 1"
-#define STR_SERIAL2       "Porta seriale 2"
-#define STR_SERIAL3       "Porta seriale 3"
-#define STR_SERIAL4       "Porta seriale 4"
-#define STR_PARALLEL1     "Porta parallela 1"
-#define STR_PARALLEL2     "Porta parallela 2"
-#define STR_PARALLEL3     "Porta parallela 3"
-#define STR_PARALLEL4     "Porta parallela 4"
-#define STR_SERIAL_PASS1  "Serial port passthrough 1"
-#define STR_SERIAL_PASS2  "Serial port passthrough 2"
-#define STR_SERIAL_PASS3  "Serial port passthrough 3"
-#define STR_SERIAL_PASS4  "Serial port passthrough 4"
-
-#define STR_HDC           "Controller HD:"
-#define STR_FDC           "Controller FD:"
-#define STR_IDE_TER       "Controller IDE terziario"
-#define STR_IDE_QUA       "Controller IDE quaternario"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "Controller 1:"
-#define STR_SCSI_2        "Controller 2:"
-#define STR_SCSI_3        "Controller 3:"
-#define STR_SCSI_4        "Controller 4:"
-#define STR_CASSETTE      "Cassetta"
-
-#define STR_HDD           "Hard disk:"
-#define STR_NEW           "&Nuovo..."
-#define STR_EXISTING      "&Esistente..."
-#define STR_REMOVE        "&Rimouvi"
-#define STR_BUS           "Bus:"
-#define STR_CHANNEL       "Canale:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Speed:"
-
-#define STR_SPECIFY       "&Specifica..."
-#define STR_SECTORS       "Settori:"
-#define STR_HEADS         "Testine:"
-#define STR_CYLS          "Cilindri:"
-#define STR_SIZE_MB       "Dimensioni (MB):"
-#define STR_TYPE          "Tipo:"
-#define STR_IMG_FORMAT    "Formato immagine:"
-#define STR_BLOCK_SIZE    "Dimensioni blocco:"
-
-#define STR_FLOPPY_DRIVES "Unità floppy:"
-#define STR_TURBO         "Turbo"
-#define STR_CHECKBPB      "Verifica BPB"
-#define STR_CDROM_DRIVES  "Unità CD-ROM:"
-#define STR_CD_SPEED      "Veloc.:"
-
-#define STR_MO_DRIVES     "Unità magneto-ottiche:"
-#define STR_ZIP_DRIVES    "Unità ZIP:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "RTC ISA:"
-#define STR_ISAMEM        "Espansione memoria ISA"
-#define STR_ISAMEM_1      "Scheda 1:"
-#define STR_ISAMEM_2      "Scheda 2:"
-#define STR_ISAMEM_3      "Scheda 3:"
-#define STR_ISAMEM_4      "Scheda 4:"
-#define STR_BUGGER        "Dispositivo ISABugger"
-#define STR_POSTCARD      "Scheda POST"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Segoe UI"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "Errore"
-    IDS_2050    "Errore fatale"
-    IDS_2051    " - PAUSED"
-    IDS_2052    "Usa Ctrl+Alt+PgDn per tornare alla modalità finestra."
-    IDS_2053    "Velocità"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "Immagini ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "86Box non può trovare immagini ROM utilizzabili.\n\nPlease <a href=""https://github.com/86Box/roms/releases/latest"">download</a> a ROM set and extract it into the ""roms"" directory."
-    IDS_2057    "(empty)"
-    IDS_2058    "Immagini ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0Tutti i file (*.*)\0*.*\0"
-    IDS_2059    "Turbo"
-    IDS_2060    "Acceso"
-    IDS_2061    "Spento"
-    IDS_2062    "Tutte le immagini (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Immagini di settori base (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Immagini di superficie (*.86F)\0*.86F\0"
-    IDS_2063    "La macchina ""%hs"" non è disponibile a causa di immagini ROM mancanti nella directory roms/machines. Cambiando ad una macchina disponibile."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "La scheda video ""%hs"" non è disponibile a causa di immagini ROM mancanti nella directory roms/video. Cambiando ad una scheda video disponibile."
-    IDS_2065    "Piastra madre"
-    IDS_2066    "Schermo"
-    IDS_2067    "Dispositivi di entrata"
-    IDS_2068    "Audio"
-    IDS_2069    "Rete"
-    IDS_2070    "Porte (COM & LPT)"
-    IDS_2071    "Controller memoria"
-    IDS_2072    "Hard disk"
-    IDS_2073    "Unità CD-ROM e Floppy"
-    IDS_2074    "Altri dispositivi rimuovibili"
-    IDS_2075    "Altre periferiche"
-    IDS_2076    "Immagini di superficie (*.86F)\0*.86F\0"
-    IDS_2077    "Fare clic per catturare mouse"
-    IDS_2078    "Premi F8+F12 per rilasciare il mouse"
-    IDS_2079    "Premi F8+F12 o pulsante centrale per rilasciare il mouse"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "Bus"
-    IDS_2082    "File"
-    IDS_2083    "C"
-    IDS_2084    "H"
-    IDS_2085    "S"
-    IDS_2086    "MB"
-    IDS_2087    "Speed"
-    IDS_2088    "Verifica BPB"
-    IDS_2089    "KB"
-    IDS_2090    "Impossibile inizializzare il renderer video."
-    IDS_2091    "Predefinito"
-    IDS_2092    "%i stati d'attesa"
-    IDS_2093    "Tipo"
-    IDS_2094    "Impossibile impostare PCap"
-    IDS_2095    "Nessun dispositivo PCap trovato"
-    IDS_2096    "Dispositivo PCap invalido"
-    IDS_2097    "Joystick comune da 2 pulsanti"
-    IDS_2098    "Joystick comune da 4 pulsanti"
-    IDS_2099    "Joystick comune da 6 pulsanti"
-    IDS_2100    "Joystick comune da 8 pulsanti"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Thrustmaster Flight Control System"
-    IDS_2104    "Nessuno"
-    IDS_2105    "Impossibile caricare gli acceleratori da tastiera."
-    IDS_2106    "Impossibile registrare input raw."
-    IDS_2107    "%u"
-    IDS_2108    "%u MB (CHS: %i, %i, %i)"
-    IDS_2109    "Floppy %i (%s): %ls"
-    IDS_2110    "Tutte le immagini (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Immagini da settori avanzati (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Imagini da settori basilari (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Immagini flusso (*.FDI)\0*.FDI\0Immagini da superficie (*.86F;*.MFM)\0*.86F;*.MFM\0Tutti i file (*.*)\0*.*\0"
-    IDS_2112    "Impossibile inizializzare SDL, SDL2.dll è necessario"
-    IDS_2113    "Sei sicuro di voler riavviare la macchina emulata?"
-    IDS_2114    "Sei sicuro di voler uscire da 86Box?"
-    IDS_2115    "Impossibile inizializzare Ghostscript"
-    IDS_2116    "MO %i (%ls): %ls"
-    IDS_2117    "Immagini MO (*.IM?;*.MDI)\0*.IM?;*.MDI\0Tutti i file (*.*)\0*.*\0"
-    IDS_2118    "Benvenuti in 86Box!"
-    IDS_2119    "Controller interno"
-    IDS_2120    "Esci"
-    IDS_2121    "Nessune immagini ROM trovate"
-    IDS_2122    "Vuole salvare queste impostazioni?"
-    IDS_2123    "Questo riavvierà la macchina emulata."
-    IDS_2124    "Salva"
-    IDS_2125    "Informazioni su 86Box"
-    IDS_2126    "86Box v" EMU_VERSION
-
-    IDS_2127    "Un emulatore di computer vecchi\n\nAutori: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nTradotto da: explorerdotexe\n\nRilasciato sotto la Licenza Pubblica GNU versione 2 o dopo. Vedi LICENSE per maggior informazioni."
-    IDS_2128    "OK"
-    IDS_2129    "Hardware non disponibile"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "Controlla se " LIB_NAME_PCAP " è installato e che tu sia connesso ad una connessione " LIB_NAME_PCAP " compatibile."
-    IDS_2131    "Configurazione invalida"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " è richiesto per la conversione automatica di file PostScript a file PDF.\n\nQualsiasi documento mandato alla stampante generica PostScript sarà salvato come file PostScript. (.ps)"
-    IDS_2135    "Entrando nella modalità schermo intero"
-    IDS_2136    "Non mostrare più questo messaggio"
-    IDS_2137    "Non uscire"
-    IDS_2138    "Riavvia"
-    IDS_2139    "Non riavviare"
-    IDS_2140    "Immagini MO (*.IM?;*.MDI)\0*.IM?;*.MDI\0Tutti i file (*.*)\0*.*\0"
-    IDS_2141    "Immagini CD-ROM (*.ISO;*.CUE)\0*.ISO;*.CUE\0Tutti i file (*.*)\0*.*\0"
-    IDS_2142    "Configurazione del dispositivo %hs"
-    IDS_2143    "Monitor in modalità riposo"
-    IDS_2144    "Shader OpenGL (*.GLSL)\0*.GLSL\0Tutti i file (*.*)\0*.*\0"
-    IDS_2145    "Impostazioni OpenGL"
-    IDS_2146    "Stai caricando una configurazione non supportata"
-    IDS_2147    "Il filtraggio della tipologia di CPU è disabilitato per la macchina selezionata.\n\nQuesto lo rende possibile scegliere un CPU che è altrimenti incompatibile con la macchina selezionata. Tuttavia, portresti incorrere in incompatibilità con il BIOS della macchina o altri programmi. \n\nL'abilitare di questa impostazione non è ufficialmente supportato e tutte le segnalazioni di errori saranno considerate invalide."
-    IDS_2148    "Continua"
-    IDS_2149    "Cassetta: %s"
-    IDS_2150    "Immagini cassetta (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0Tutti i file (*.*)\0*.*\0"
-    IDS_2151    "Cartuccia %i: %ls"
-    IDS_2152    "Immagini cartuccia (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0Tutti i file (*.*)\0*.*\0"
-    IDS_2153    "Error initializing renderer"
-    IDS_2154    "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer."
-    IDS_2155    "Resume execution"
-    IDS_2156    "Pause execution"
-    IDS_2157    "Press Ctrl+Alt+Del"
-    IDS_2158    "Press Ctrl+Alt+Esc"
-    IDS_2159    "Hard reset"
-    IDS_2160    "ACPI shutdown"
-    IDS_2161    "Settings"
-    IDS_2162    "Type"
-    IDS_2163    "No Dynarec"
-    IDS_2164    "Old Dynarec"
-    IDS_2165    "New Dynarec"
-    IDS_2166    "Video card #2 ""%hs"" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
-    IDS_2167    "Failed to initialize network driver"
-    IDS_2168    "The network configuration will be switched to the null driver"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "Hard disk (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "Le unità CD-ROM MFM/RLL o ESDI non sono mai esistite."
-    IDS_4100    "Personalizzata..."
-    IDS_4101    "Personalizzata (grande)..."
-    IDS_4102    "Aggiungi un nuovo disco rigido"
-    IDS_4103    "Aggiungi un disco rigido esistente"
-    IDS_4104    "Le immagini HDI non possono essere più grandi di 4 GB."
-    IDS_4105    "Le immmagini disco non possono essere più grandi di 127 GB."
-    IDS_4106    "Immagini disco rigido (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0Tutti i file (*.*)\0*.*\0"
-    IDS_4107    "Impossibile leggere il file"
-    IDS_4108    "Impossibile scrivere al file"
-    IDS_4109    "Le immagini HDI o HDX con settori di dimensioni diverse da 512 non sono supportati."
-    IDS_4110    "USB non è ancora supportato"
-    IDS_4111    "Immagine disco già esiste"
-    IDS_4112    "Specifica un nome file valido."
-    IDS_4113    "Immagine disco creata"
-    IDS_4114    "Controlla che il file esiste e che sia leggibile."
-    IDS_4115    "Controlla che il file viene salvato ad un percorso con diritti di scrittura"
-    IDS_4116    "Immagine disco troppo grande"
-    IDS_4117    "Ricordati di partizionare e formattare il disco appena creato."
-    IDS_4118    "Il file selezionato sarà sovrascritto, sei sicuro di volerlo usare?"
-    IDS_4119    "Immagine disco non supportata"
-    IDS_4120    "Sovrascrivi"
-    IDS_4121    "Non sovrascrivere"
-    IDS_4122    "Immagine raw (.img)"
-    IDS_4123    "Immagine HDI (.hdi)"
-    IDS_4124    "Immagine HDX (.hdx)"
-    IDS_4125    "VHD di dimensioni fisse (.vhd)"
-    IDS_4126    "VHD di dimensioni dinamiche (.vhd)"
-    IDS_4127    "VHD differenziato (.vhd)"
-    IDS_4128    "Blocchi larghi (2 MB)"
-    IDS_4129    "Blocchi piccoli (512 KB)"
-    IDS_4130    "File VHD (*.VHD)\0*.VHD\0Tutti i file (*.*)\0*.*\0"
-    IDS_4131    "Seleziona il VHD padre."
-    IDS_4132    "Questo potrebbe significare che l'immagine padre sia stata modificata dopo la creazione dell'immagine  di differenziazione.\n\nPuò anche succedere se i file immagini sono stati spostati o copiati, o da un errore nel programma che ha creato questo disco.\n\nVuoi aggiustare le marcature di tempo?"
-    IDS_4133    "Le marcature di tempo padre e figlio non corrispondono"
-    IDS_4134    "Impossibile aggiustare marcature di tempo VHD."
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "Disabilitato"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "Disabilitato"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 kB"
-    IDS_5889    "180 kB"
-    IDS_5890    "320 kB"
-    IDS_5891    "360 kB"
-    IDS_5892    "640 kB"
-    IDS_5893    "720 kB"
-    IDS_5894    "1.2 MB"
-    IDS_5895    "1.25 MB"
-    IDS_5896    "1.44 MB"
-    IDS_5897    "DMF (cluster 1024)"
-    IDS_5898    "DMF (cluster 2048)"
-    IDS_5899    "2.88 MB"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5"" 128 MB (ISO 10090)"
-    IDS_5903    "3.5"" 230 MB (ISO 13963)"
-    IDS_5904    "3.5"" 540 MB (ISO 15498)"
-    IDS_5905    "3.5"" 640 MB (ISO 15498)"
-    IDS_5906    "3.5"" 1.3 GB (GigaMO)"
-    IDS_5907    "3.5"" 2.3 GB (GigaMO 2)"
-    IDS_5908    "5.25"" 600 MB"
-    IDS_5909    "5.25"" 650 MB"
-    IDS_5910    "5.25"" 1 GB"
-    IDS_5911    "5.25"" 1.3 GB"
-
-    IDS_6144    "RPM perfette"
-    IDS_6145    "RPM 1% sotto perfezione"
-    IDS_6146    "RPM 1.5% sotto perfezione"
-    IDS_6147    "RPM 2% sotto perfezione"
-
-    IDS_7168    "(Predefinito del sistema)"
-END
-#define IDS_LANG_ENUS IDS_7168
-
-// Italian (IT-it) resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/ja-JP.rc b/src/win/languages/ja-JP.rc
deleted file mode 100644
index a8e90d062..000000000
--- a/src/win/languages/ja-JP.rc
+++ /dev/null
@@ -1,637 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Japanese resources
-
-#ifdef _WIN32
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "操作(&A)"
-    BEGIN
-        MENUITEM "キーボードはキャプチャが必要(&K)", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "右CTRLを左ALTへ変換(&R)", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "ハード リセット(&H)...", IDM_ACTION_HRESET
-        MENUITEM "Ctrl+Alt+Del(&C)\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-    MENUITEM "Ctrl+Alt+Esc(&E)", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "一時停止(&P)", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "終了(&X)...", IDM_ACTION_EXIT
-    END
-    POPUP "表示(&V)"
-    BEGIN
-        MENUITEM "ステータスバーを隠す(&H)", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "ツールバーを隠す(&T)", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "プライマリ以外のモニターを表示(&S)", IDM_VID_MONITORS
-        MENUITEM "ウィンドウのサイズを変更可能(&R)", IDM_VID_RESIZE
-        MENUITEM "ウィンドウのサイズと位置を保存(&E)", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "レンダラー(&N)"
-        BEGIN
-            MENUITEM "SDL (ソフトウェア)(&S)", IDM_VID_SDL_SW
-            MENUITEM "SDL (ハードウェア)(&H)", IDM_VID_SDL_HW
-            MENUITEM "SDL (OpenGL)(&O)", IDM_VID_SDL_OPENGL
-            MENUITEM "OpenGL (3.0コア)(&G)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "VNC(&V)", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "ディメンションを指定...", IDM_VID_SPECIFY_DIM
-        MENUITEM "4:3の縦横比を強制表示(&O)", IDM_VID_FORCE43
-        POPUP "ウィンドウの表示倍率(&W)"
-        BEGIN
-            MENUITEM "0.5x(&0)", IDM_VID_SCALE_1X
-            MENUITEM "1x(&1)", IDM_VID_SCALE_2X
-            MENUITEM "1.5x(&5)", IDM_VID_SCALE_3X
-            MENUITEM "2x(&2)", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "フィルター方式"
-        BEGIN
-            MENUITEM "最近傍補間(&N)", IDM_VID_FILTER_NEAREST
-            MENUITEM "線形補間(&L)", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "HiDPIスケーリング(&D)", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "全画面表示(&F)\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "全画面の拡大表示モード(&S)"
-        BEGIN
-            MENUITEM "ストレッチ モード(&F)", IDM_VID_FS_FULL
-            MENUITEM "4:3(&4)", IDM_VID_FS_43
-            MENUITEM "正方形ピクセル(アスペクト比を維持)(&S)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "整数倍(&I)", IDM_VID_FS_INT
-        END
-        POPUP "E&GA/(S)VGAの設定"
-        BEGIN
-            MENUITEM "色反転(&I)", IDM_VID_INVERT
-            POPUP "画面タイプ(&T)"
-            BEGIN
-                MENUITEM "RGB(カラー)(&C)", IDM_VID_GRAY_RGB
-                MENUITEM "RGB(グレースケール)(&R)", IDM_VID_GRAY_MONO
-                MENUITEM "モニター(黄色)(&A)", IDM_VID_GRAY_AMBER
-                MENUITEM "モニター(緑色)(&G)", IDM_VID_GRAY_GREEN
-                MENUITEM "モニター(白色)(&W)", IDM_VID_GRAY_WHITE
-            END
-            POPUP "グレースケール変換タイプ(&C)"
-            BEGIN
-                MENUITEM "BT601 (NTSC/PAL)(&6)", IDM_VID_GRAYCT_601
-                MENUITEM "BT709 (HDTV)(&7)", IDM_VID_GRAYCT_709
-                MENUITEM "平均(&A)", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "CGA/PCjr/Tandy/EGA/(S)VGAオーバースキャン(&G)", IDM_VID_OVERSCAN
-        MENUITEM "単色モニター用コントラストを変更(&M)", IDM_VID_CGACON
-    END
-    MENUITEM "メディア(&M)", IDM_MEDIA
-    POPUP "ツール(&T)"
-    BEGIN
-        MENUITEM "設定(&S)...", IDM_CONFIG
-        MENUITEM "ステータスバーのアイコンを更新(&U)", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "スクリーンショットを撮る(&C)\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "環境設定(&P)...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "Discord連携機能(&D)", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "音量調整(&G)...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "トレース開始\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "トレース終了\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "ヘルプ(&H)"
-    BEGIN
-        MENUITEM "文書(&D)...", IDM_DOCS
-        MENUITEM "86Boxのバージョン情報(&A)...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "新規イメージ(&N)...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "既存のイメージを開く(&E)...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "既存のイメージを開く(書き込み禁止)(&W)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "記録(&R)", IDM_CASSETTE_RECORD
-        MENUITEM "再生(&P)", IDM_CASSETTE_PLAY
-        MENUITEM "先頭まで巻き戻す(&R)", IDM_CASSETTE_REWIND
-        MENUITEM "最後まで早送り(&F)", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "取り出す(&J)", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "イメージ(&I)...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "取り出す(&J)", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "新規イメージ(&N)...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "既存のイメージを開く(&E)...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "既存のイメージを開く(書き込み禁止)(&W)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "86Fイメージにエクスポート(&X)...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "取り出す(&J)", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "ミュート(&M)", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "空(&M)", IDM_CDROM_EMPTY
-        MENUITEM "前のイメージを再読み込み(&R)", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "イメージ(&I)...", IDM_CDROM_IMAGE
-        MENUITEM "フォルダ(&F)...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "新規イメージ(&N)...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "既存のイメージを開く(&E)...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "既存のイメージを開く(書き込み禁止)(&W)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "取り出す(&J)", IDM_ZIP_EJECT
-        MENUITEM "前のイメージを再読み込み(&R)", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "新規イメージ(&N)...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "既存のイメージを開く(&E)...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "既存のイメージを開く(書き込み禁止)(&W)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "取り出す(&J)", IDM_MO_EJECT
-        MENUITEM "前のイメージを再読み込み(&R)", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "目標フレームレート(&F)"
-    BEGIN
-        MENUITEM "ビデオと同期(&S)", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "25 fps(&2)", IDM_VID_GL_FPS_25
-        MENUITEM "30 fps(&3)", IDM_VID_GL_FPS_30
-        MENUITEM "50 fps(&5)", IDM_VID_GL_FPS_50
-        MENUITEM "60 fps(&6)", IDM_VID_GL_FPS_60
-        MENUITEM "75 fps(&7)", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "垂直同期(VSync)(&V)", IDM_VID_GL_VSYNC
-    MENUITEM "シェーダーを選択(&S)...", IDM_VID_GL_SHADER
-    MENUITEM "シェーダーを削除(&R)", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "環境設定"
-#define STR_SND_GAIN      "音量調整"
-#define STR_NEW_FLOPPY    "新規のイメージ"
-#define STR_CONFIG        "設定"
-#define STR_SPECIFY_DIM   "メイン ウィンドウのサイズ指定"
-
-#define STR_OK            "OK"
-#define STR_CANCEL        "キャンセル"
-#define STR_GLOBAL        "これらの設定をグローバル既定値として保存(&G)"
-#define STR_DEFAULT       "既定値(&D)"
-#define STR_LANGUAGE      "言語:"
-#define STR_ICONSET       "アイコン セット:"
-
-#define STR_GAIN          "音量"
-
-#define STR_FILE_NAME     "ファイル名:"
-#define STR_DISK_SIZE     "ディスク サイズ:"
-#define STR_RPM_MODE      "RPMモード:"
-#define STR_PROGRESS      "進行状況:"
-
-#define STR_WIDTH         "幅:"
-#define STR_HEIGHT        "高さ:"
-#define STR_LOCK_TO_SIZE  "サイズを固定"
-
-#define STR_MACHINE_TYPE  "マシン タイプ:"
-#define STR_MACHINE       "マシン:"
-#define STR_CONFIGURE     "設定"
-#define STR_CPU_TYPE      "CPUタイプ:"
-#define STR_CPU_SPEED     "速度:"
-#define STR_FPU           "FPU:"
-#define STR_WAIT_STATES   "ウェイト ステート:"
-#define STR_MB            "MB"
-#define STR_MEMORY        "メモリ:"
-#define STR_TIME_SYNC     "時刻同期機能"
-#define STR_DISABLED      "無効"
-#define STR_ENABLED_LOCAL "有効(現地時間)"
-#define STR_ENABLED_UTC   "有効(UTC)"
-#define STR_DYNAREC       "動的再コンパイル"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "ビデオカード:"
-#define STR_VIDEO_2       "ビデオカード2:"
-#define STR_VOODOO        "Voodooグラフィック"
-#define STR_IBM8514       "IBM 8514/Aグラフィック"
-#define STR_XGA           "XGAグラフィック"
-
-#define STR_MOUSE         "マウス:"
-#define STR_JOYSTICK      "ジョイスティック:"
-#define STR_JOY1          "ジョイスティック1..."
-#define STR_JOY2          "ジョイスティック2..."
-#define STR_JOY3          "ジョイスティック3..."
-#define STR_JOY4          "ジョイスティック4..."
-
-#define STR_SOUND1        "サウンド カード1:"
-#define STR_SOUND2        "サウンド カード2:"
-#define STR_SOUND3        "サウンド カード3:"
-#define STR_SOUND4        "サウンド カード4:"
-#define STR_MIDI_OUT      "MIDI出力デバイス:"
-#define STR_MIDI_IN       "MIDI入力デバイス:"
-#define STR_MPU401        "独立型MPU-401"
-#define STR_FLOAT         "FLOAT32サウンドを使用"
-#define STR_FM_DRIVER     "FMシンセドライバー"
-#define STR_FM_DRV_NUKED  "Nuked(高精度化)"
-#define STR_FM_DRV_YMFM   "YMFM(より速く)"
-
-#define STR_NET_TYPE      "ネットワークタイプ:"
-#define STR_PCAP          "PCapデバイス:"
-#define STR_NET           "ネットワークアダプター:"
-#define STR_NET1          "ネットワーク カード1:"
-#define STR_NET2          "ネットワーク カード2:"
-#define STR_NET3          "ネットワーク カード3:"
-#define STR_NET4          "ネットワーク カード4:"
-
-#define STR_COM1          "COM1デバイス:"
-#define STR_COM2          "COM2デバイス:"
-#define STR_COM3          "COM3デバイス:"
-#define STR_COM4          "COM4デバイス:"
-#define STR_LPT1          "LPT1デバイス:"
-#define STR_LPT2          "LPT2デバイス:"
-#define STR_LPT3          "LPT3デバイス:"
-#define STR_LPT4          "LPT4デバイス:"
-#define STR_SERIAL1       "シリアル ポート1"
-#define STR_SERIAL2       "シリアル ポート2"
-#define STR_SERIAL3       "シリアル ポート3"
-#define STR_SERIAL4       "シリアル ポート4"
-#define STR_PARALLEL1     "パラレル ポート1"
-#define STR_PARALLEL2     "パラレル ポート2"
-#define STR_PARALLEL3     "パラレル ポート3"
-#define STR_PARALLEL4     "パラレル ポート4"
-#define STR_SERIAL_PASS1  "シリアル ポート パススルー対応1"
-#define STR_SERIAL_PASS2  "シリアル ポート パススルー対応2"
-#define STR_SERIAL_PASS3  "シリアル ポート パススルー対応3"
-#define STR_SERIAL_PASS4  "シリアル ポート パススルー対応4"
-
-#define STR_HDC           "HDDコントローラー:"
-#define STR_FDC           "FDDコントローラー:"
-#define STR_IDE_TER       "第三IDEコントローラー"
-#define STR_IDE_QUA       "第四IDEコントローラー"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "コントローラー1:"
-#define STR_SCSI_2        "コントローラー2:"
-#define STR_SCSI_3        "コントローラー3:"
-#define STR_SCSI_4        "コントローラー4:"
-#define STR_CASSETTE      "カセット"
-
-#define STR_HDD           "ハード ディスク:"
-#define STR_NEW           "新規(&N)..."
-#define STR_EXISTING      "既定(&E)..."
-#define STR_REMOVE        "除去(&R)"
-#define STR_BUS           "バス:"
-#define STR_CHANNEL       "チャンネル:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "速度:"
-
-#define STR_SPECIFY       "参照(&S)..."
-#define STR_SECTORS       "セクター:"
-#define STR_HEADS         "ヘッド:"
-#define STR_CYLS          "シリンダー:"
-#define STR_SIZE_MB       "サイズ(MB):"
-#define STR_TYPE          "タイプ:"
-#define STR_IMG_FORMAT    "イメージ形式:"
-#define STR_BLOCK_SIZE    "ブロック サイズ:"
-
-#define STR_FLOPPY_DRIVES "フロッピー ドライブ:"
-#define STR_TURBO         "高速タイミング"
-#define STR_CHECKBPB      "BPBチェック"
-#define STR_CDROM_DRIVES  "CD-ROMドライブ:"
-#define STR_CD_SPEED      "速度:"
-
-#define STR_MO_DRIVES     "光磁気ドライブ:"
-#define STR_ZIP_DRIVES    "ZIPドライブ:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "ISA RTCカード:"
-#define STR_ISAMEM        "ISAメモリ拡張カード"
-#define STR_ISAMEM_1      "カード1:"
-#define STR_ISAMEM_2      "カード2:"
-#define STR_ISAMEM_3      "カード3:"
-#define STR_ISAMEM_4      "カード4:"
-#define STR_BUGGER        "ISABuggerデバイス"
-#define STR_POSTCARD      "POSTカード"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Meiryo UI"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "エラー"
-    IDS_2050    "致命的なエラー"
-    IDS_2051    " - 一時停止"
-    IDS_2052    "Ctrl+Alt+PgDnでウィンドウモードに戻ります。"
-    IDS_2053    "速度"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "ZIPイメージ (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "86Boxで使用可能なROMイメージが見つかりません。\n\nROMセットを<a href=""https://github.com/86Box/roms/releases/latest"">ダウンロード</a>して、「roms」ディレクトリに解凍してください。"
-    IDS_2057    "(空)"
-    IDS_2058    "ZIPイメージ (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0すべてのファイル (*.*)\0*.*\0"
-    IDS_2059    "高速"
-    IDS_2060    "オン"
-    IDS_2061    "オフ"
-    IDS_2062    "すべてのイメージ (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0ベーシック セクター イメージ (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0サーフェス イメージ (*.86F)\0*.86F\0"
-    IDS_2063    "roms/machines ディレクトリにROMがないため、マシン「%hs」は使用できません。使用可能なマシンに切り替えます。"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "roms/video ディレクトリにROMがないため、ビデオカード「%hs」は使用できません。使用可能なビデオカードに切り替えます。"
-    IDS_2065    "マシン"
-    IDS_2066    "ディスプレイ"
-    IDS_2067    "入力デバイス"
-    IDS_2068    "サウンド"
-    IDS_2069    "ネットワーク"
-    IDS_2070    "ポート (COM/LPT)"
-    IDS_2071    "ストレージ コントローラ"
-    IDS_2072    "ハード ディスク"
-    IDS_2073    "フロッピー／CD-ROMドライブ"
-    IDS_2074    "他のリムーバブル デバイス"
-    IDS_2075    "他の周辺デバイス"
-    IDS_2076    "サーフェス イメージ (*.86F)\0*.86F\0"
-    IDS_2077    "左クリックでマウスをキャプチャします"
-    IDS_2078    "F8+F12キーを押してマウスを解放します"
-    IDS_2079    "F8+F12キーまたは中クリックでマウスを解放します"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "バス"
-    IDS_2082    "ファイル"
-    IDS_2083    "C"
-    IDS_2084    "H"
-    IDS_2085    "S"
-    IDS_2086    "MB"
-    IDS_2087    "Speed"
-    IDS_2088    "BPBチェック"
-    IDS_2089    "KB"
-    IDS_2090    "ビデオレンダラーが初期化できません。"
-    IDS_2091    "既定値"
-    IDS_2092    "%iつのウェイト ステート"
-    IDS_2093    "タイプ"
-    IDS_2094    "PCapのセットアップに失敗しました"
-    IDS_2095    "PCapデバイスがありません"
-    IDS_2096    "不正なPCapデバイス"
-    IDS_2097    "標準ジョイスティック(2ボタン)"
-    IDS_2098    "標準ジョイスティック(4ボタン)"
-    IDS_2099    "標準ジョイスティック(6ボタン)"
-    IDS_2100    "標準ジョイスティック(8ボタン)"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinderパッド"
-    IDS_2103    "Thrustmaster飛行制御システム"
-    IDS_2104    "なし"
-    IDS_2105    "キーボード アクセラレータを読み込めません。"
-    IDS_2106    "生入力が登録できません。"
-    IDS_2107    "%u"
-    IDS_2108    "%u MB (CHS値: %i、%i、%i)"
-    IDS_2109    "フロッピー %i (%s): %ls"
-    IDS_2110    "すべてのイメージ (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0アドバンスド セクター イメージ (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0ベーシック セクター イメージ (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0フラックスイメージ (*.FDI)\0*.FDI\0サーフェス イメージ (*.86F;*.MFM)\0*.86F;*.MFM\0すべてのファイル (*.*)\0*.*\0"
-    IDS_2112    "SDLが初期化できません。SDL2.dllが必要です"
-    IDS_2113    "使用中のマシンをハードリ セットしますか？"
-    IDS_2114    "86Boxを終了しますか？"
-    IDS_2115    "Ghostscriptが初期化できません"
-    IDS_2116    "光磁気 %i (%ls): %ls"
-    IDS_2117    "光磁気イメージ (*.IM?;*.MDI)\0*.IM?;*.MDI\0すべてのファイル (*.*)\0*.*\0"
-    IDS_2118    "86Boxへようこそ！"
-    IDS_2119    "内蔵コントローラー"
-    IDS_2120    "終了"
-    IDS_2121    "ROMが見つかりません"
-    IDS_2122    "設定を保存しますか？"
-    IDS_2123    "使用中のマシンがハードリ セットされます。"
-    IDS_2124    "保存"
-    IDS_2125    "86Boxのバージョン情報"
-    IDS_2126    "86Box v" EMU_VERSION
-
-    IDS_2127    "古いパソコンのエミュレーター\n\n著者: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nGNU General Public License version 2以降でリリースされています。詳しくは LICENSE をご覧ください。"
-    IDS_2128    "OK"
-    IDS_2129    "ハードウェアが利用できません"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    LIB_NAME_PCAP "がインストールされてるか、" LIB_NAME_PCAP "に対応したネットワークに接続されてるか確認してください。"
-    IDS_2131    "無効な設定"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    "PostScriptファイルをPDFに自動変換するには" LIB_NAME_GS "が必要です。\n\n汎用PostScriptプリンターに送信された文書は、PostScript (.ps) ファイルとして保存されます。"
-    IDS_2135    "全画面モードを入力"
-    IDS_2136    "今後、このメッセージを表示しない"
-    IDS_2137    "終了しない"
-    IDS_2138    "リセット"
-    IDS_2139    "リセットしない"
-    IDS_2140    "光磁気イメージ (*.IM?;*.MDI)\0*.IM?;*.MDI\0すべてのファイル (*.*)\0*.*\0"
-    IDS_2141    "CD-ROMイメージ (*.ISO;*.CUE)\0*.ISO;*.CUE\0すべてのファイル (*.*)\0*.*\0"
-    IDS_2142    "%hs のデバイス設定"
-    IDS_2143    "モニターのスリープ モード"
-    IDS_2144    "OpenGLシェーダー (*.GLSL)\0*.GLSL\0すべてのファイル (*.*)\0*.*\0"
-    IDS_2145    "OpenGL設定"
-    IDS_2146    "読み込んでいる設定がサポートされません"
-    IDS_2147    "選択したマシンに基づくCPUタイプのフィルター機能は、使用中のマシンでは無効になっています。\n\nこれにより、選択したマシンと互換性のないCPUが選択できます。しかし、マシンのBIOSや他のソフトウェアと互換性がない場合があります。\n\nこの設定を有効にすることは公式にはサポートされておらず、バグレポートは無効として中止される可能性があります。"
-    IDS_2148    "続行"
-    IDS_2149    "カセット: %s"
-    IDS_2150    "カセット イメージ (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0すべてのファイル (*.*)\0*.*\0"
-    IDS_2151    "カートリッジ %i: %ls"
-    IDS_2152    "カートリッジ イメージ (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0すべてのファイル (*.*)\0*.*\0"
-    IDS_2153    "レンダラーの初期化エラー"
-    IDS_2154    "OpenGL (3.0コア) レンダラーが初期化できません。別のレンダラーを使用してください。"
-    IDS_2155    "実行を再開"
-    IDS_2156    "実行を一時停止"
-    IDS_2157    "Ctrl+Alt+DELを押す"
-    IDS_2158    "Ctrl+Alt+Escを押す"
-    IDS_2159    "ハードリセット"
-    IDS_2160    "ACPIシャットダウン"
-    IDS_2161    "設定"
-    IDS_2162    "タイプ"
-    IDS_2163    "動的再コンパイル禁止"
-    IDS_2164    "旧型の動的再コンパイル"
-    IDS_2165    "新型の動的再コンパイル"
-    IDS_2166    "「roms/video」ディレクトリにROMがないため、ビデオカード#2「%hs」は使用できません。2枚目のビデオカードを無効にします。"
-    IDS_2167    "ネットワーク ドライバの初期化に失敗しました。"
-    IDS_2168    "ネットワーク設定がヌル ドライバに切り替えられます"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "ハード ディスク (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "MFM/RLLやESDI CD-ROMドライブが存在しません"
-    IDS_4100    "カスタム..."
-    IDS_4101    "カスタム (大容量)..."
-    IDS_4102    "新規のディスクを追加"
-    IDS_4103    "既定のディスクを追加"
-    IDS_4104    "HDIディスク イメージは4GBを超えることはできません。"
-    IDS_4105    "ディスク イメージは127GBを超えることはできません。"
-    IDS_4106    "ハード ディスク イメージ (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0すべてのファイル (*.*)\0*.*\0"
-    IDS_4107    "ファイルの読み込みができません"
-    IDS_4108    "ファイルの書き込みができません"
-    IDS_4109    "512以外のセクタ サイズを持つHDIまたはHDXイメージは対応していません。"
-    IDS_4110    "USBはまだ非対応です"
-    IDS_4111    "ディスク イメージ ファイルが既に存在します"
-    IDS_4112    "有効なファイル名を指定してください。"
-    IDS_4113    "ディスク イメージが作成されました"
-    IDS_4114    "ファイルが存在し、読み取り可能であることを確認してください。"
-    IDS_4115    "ファイルが書き込み可能なディレクトリに保存されていることを確認してください。"
-    IDS_4116    "ディスク イメージのサイズが大きすぎます"
-    IDS_4117    "新規ドライブをパーティション分割し、フォーマットを必ずしといてください。"
-    IDS_4118    "選択したファイルは上書きされます。よろしいですか？"
-    IDS_4119    "非対応のディスク イメージ"
-    IDS_4120    "上書き"
-    IDS_4121    "上書きしない"
-    IDS_4122    "Rawイメージ (.img)"
-    IDS_4123    "HDIイメージ (.hdi)"
-    IDS_4124    "HDXイメージ (.hdx)"
-    IDS_4125    "VHD (容量固定) (.vhd)"
-    IDS_4126    "VHD (容量可変) (.vhd)"
-    IDS_4127    "VHD (差分) (.vhd)"
-    IDS_4128    "大型ブロック (2 MB)"
-    IDS_4129    "小型ブロック (512 KB)"
-    IDS_4130    "VHDファイル (*.VHD)\0*.VHD\0すべてのファイル (*.*)\0*.*\0"
-    IDS_4131    "親VHDの選択"
-    IDS_4132    "親イメージが差分イメージの作成の後に変更される可能性があります。\n\nイメージ ファイルが移動またはコピーされたか、イメージ ファイルを作成したプログラムにバグが発生した可能性があります。\n\nタイム スタンプを修正しますか？"
-    IDS_4133    "親ディスクと子ディスクのタイム スタンプが一致しません"
-    IDS_4134    "VHD のタイム スタンプを修正できません。"
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "使用しない"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "使用しない"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 kB"
-    IDS_5889    "180 kB"
-    IDS_5890    "320 kB"
-    IDS_5891    "360 kB"
-    IDS_5892    "640 kB"
-    IDS_5893    "720 kB"
-    IDS_5894    "1.2 MB"
-    IDS_5895    "1.25 MB"
-    IDS_5896    "1.44 MB"
-    IDS_5897    "DMF (クラスター1024)"
-    IDS_5898    "DMF (クラスター2048)"
-    IDS_5899    "2.88 MB"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5"" 128 MB (ISO 10090)"
-    IDS_5903    "3.5"" 230 MB (ISO 13963)"
-    IDS_5904    "3.5"" 540 MB (ISO 15498)"
-    IDS_5905    "3.5"" 640 MB (ISO 15498)"
-    IDS_5906    "3.5"" 1.3 GB (GigaMO)"
-    IDS_5907    "3.5"" 2.3 GB (GigaMO 2)"
-    IDS_5908    "5.25"" 600 MB"
-    IDS_5909    "5.25"" 650 MB"
-    IDS_5910    "5.25"" 1 GB"
-    IDS_5911    "5.25"" 1.3 GB"
-
-    IDS_6144    "既定RPM"
-    IDS_6145    "1%低いRPM"
-    IDS_6146    "1.5%低いRPM"
-    IDS_6147    "2%低いRPM"
-
-    IDS_7168    "(システム既定値)"
-END
-#define IDS_LANG_ENUS IDS_7168
-
-// Japanese resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/ko-KR.rc b/src/win/languages/ko-KR.rc
deleted file mode 100644
index 535ff1df4..000000000
--- a/src/win/languages/ko-KR.rc
+++ /dev/null
@@ -1,637 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Korean resources
-
-#ifdef _WIN32
-LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "동작(&A)"
-    BEGIN
-        MENUITEM "키보드는 캡쳐가 필요함(&K)", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "우측 CTRL로 좌측 ALT 입력(&R)", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "재시작(&H)...", IDM_ACTION_HRESET
-        MENUITEM "Ctrl+Alt+Del(&C)\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-    MENUITEM "Ctrl+Alt+Esc(&E)", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "일시정지(&P)", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "끝내기(&X)...", IDM_ACTION_EXIT
-    END
-    POPUP "표시(&V)"
-    BEGIN
-        MENUITEM "상태 바 숨기기(&H)", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "툴바 숨기기", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "기본 모니터가 아닌 모니터 표시", IDM_VID_MONITORS
-        MENUITEM "창 크기 조절 가능하게 하기(&R)", IDM_VID_RESIZE
-        MENUITEM "창 크기와 위치를 기억하기(&E)", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "렌더러(&N)"
-        BEGIN
-            MENUITEM "SDL (소프트웨어)(&S)", IDM_VID_SDL_SW
-            MENUITEM "SDL (하드웨어)(&H)", IDM_VID_SDL_HW
-            MENUITEM "SDL (OpenGL)(&O)", IDM_VID_SDL_OPENGL
-            MENUITEM "OpenGL (3.0 코어)(&G)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "VNC(&V)", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "창 크기 지정하기...", IDM_VID_SPECIFY_DIM
-        MENUITEM "화면 비율을 4:3으로 맞추기(&O)", IDM_VID_FORCE43
-        POPUP "창 표시 배율(&W)"
-        BEGIN
-            MENUITEM "0.5배(&0)", IDM_VID_SCALE_1X
-            MENUITEM "1배(&1)", IDM_VID_SCALE_2X
-            MENUITEM "1.5배(&5)", IDM_VID_SCALE_3X
-            MENUITEM "2배(&2)", IDM_VID_SCALE_4X
-            MENUITEM "&3배", IDM_VID_SCALE_5X
-            MENUITEM "&4배", IDM_VID_SCALE_6X
-            MENUITEM "&5배", IDM_VID_SCALE_7X
-            MENUITEM "&6배", IDM_VID_SCALE_8X
-            MENUITEM "&7배", IDM_VID_SCALE_9X
-            MENUITEM "&8배", IDM_VID_SCALE_10X
-        END
-        POPUP "필터 형식"
-        BEGIN
-            MENUITEM "최근방 이웃 보간법(&N)", IDM_VID_FILTER_NEAREST
-            MENUITEM "선형 보간법(&L)", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "HiDPI 스케일링(&D)", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "전체 화면(&F)\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "전체 화면 비율(&S)"
-        BEGIN
-            MENUITEM "전체 화면으로 확대(&F)", IDM_VID_FS_FULL
-            MENUITEM "4:3(&4)", IDM_VID_FS_43
-            MENUITEM "정사각형 픽셀 (비율 유지)(&S)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "정수배 확대(&I)", IDM_VID_FS_INT
-        END
-        POPUP "E&GA/(S)VGA 설정"
-        BEGIN
-            MENUITEM "색상 반전된 VGA 모니터(&I)", IDM_VID_INVERT
-            POPUP "VGA 화면 종류(&T)"
-            BEGIN
-                MENUITEM "RGB 천연색(&C)", IDM_VID_GRAY_RGB
-                MENUITEM "RGB 회색조(&R)", IDM_VID_GRAY_MONO
-                MENUITEM "주황색 모니터(&A)", IDM_VID_GRAY_AMBER
-                MENUITEM "녹색 모니터(&G)", IDM_VID_GRAY_GREEN
-                MENUITEM "흰색 모니터(&W)", IDM_VID_GRAY_WHITE
-            END
-            POPUP "회색조 표현방식(&C)"
-            BEGIN
-                MENUITEM "BT601 (NTSC/PAL)(&6)", IDM_VID_GRAYCT_601
-                MENUITEM "BT709 (HDTV)(&7)", IDM_VID_GRAYCT_709
-                MENUITEM "평균값(&A)", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "CGA/PCjr/Tandy/EGA/(S)VGA 오버스캔(&G)", IDM_VID_OVERSCAN
-        MENUITEM "흑백 표시를 위한 밝기 조정(&M)", IDM_VID_CGACON
-    END
-    MENUITEM "미디어(&M)", IDM_MEDIA
-    POPUP "도구(&T)"
-    BEGIN
-        MENUITEM "설정(&S)...", IDM_CONFIG
-        MENUITEM "상태 바 아이콘 갱신하기(&U)", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "스크린샷 찍기(&C)\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "환경설정(&P)...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "디스코드 연동 활성화하기(&D)", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "음량 증폭(&G)...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "추적 시작하기\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "추적 끝내기\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "도움말(&H)"
-    BEGIN
-        MENUITEM "문서(&D)...", IDM_DOCS
-        MENUITEM "86Box에 대해(&A)...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "새 이미지(&N)...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "이미지 불러오기(&E)...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "이미지 불러오기 (쓰기방지)(&W)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "녹음하기(&R)", IDM_CASSETTE_RECORD
-        MENUITEM "재생하기(&P)", IDM_CASSETTE_PLAY
-        MENUITEM "맨앞으로 되감기(&R)", IDM_CASSETTE_REWIND
-        MENUITEM "맨끝으로 빨리감기(&F)", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "꺼내기(&J)", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "이미지(&I)...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "꺼내기(&J)", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "새 이미지(&N)...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "이미지 불러오기(&E)...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "이미지 불러오기 (쓰기방지)(&W)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "86F로 보내기(&X)...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "꺼내기(&J)", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "음소거(&M)", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "비었음(&M)", IDM_CDROM_EMPTY
-        MENUITEM "이전 이미지 다시 불러오기(&R)", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "이미지(&I)...", IDM_CDROM_IMAGE
-        MENUITEM "폴더(&F)...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "새 이미지(&N)...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "이미지 불러오기(&E)...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "이미지 불러오기 (쓰기방지)(&W)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "꺼내기(&J)", IDM_ZIP_EJECT
-        MENUITEM "이전 이미지 다시 불러오기(&R)", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "새 이미지(&N)...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "이미지 불러오기(&E)...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "이미지 불러오기 (쓰기방지)(&W)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "꺼내기(&J)", IDM_MO_EJECT
-        MENUITEM "이전 이미지 다시 불러오기(&R)", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "목표 프레임 레이트(&F)"
-    BEGIN
-        MENUITEM "비디오와 동기(&S)", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "25 fps(&2)", IDM_VID_GL_FPS_25
-        MENUITEM "30 fps(&3)", IDM_VID_GL_FPS_30
-        MENUITEM "50 fps(&5)", IDM_VID_GL_FPS_50
-        MENUITEM "60 fps(&6)", IDM_VID_GL_FPS_60
-        MENUITEM "75 fps(&7)", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "수직 동기화(&V)", IDM_VID_GL_VSYNC
-    MENUITEM "쉐이더 불러오기(&S)...", IDM_VID_GL_SHADER
-    MENUITEM "쉐이더 끄기(&R)", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "환경설정"
-#define STR_SND_GAIN      "음량 증폭"
-#define STR_NEW_FLOPPY    "새 이미지"
-#define STR_CONFIG        "설정"
-#define STR_SPECIFY_DIM   "창 크기 지정"
-
-#define STR_OK            "확인"
-#define STR_CANCEL        "취소"
-#define STR_GLOBAL        "이 설정들을 전역 기본값으로 저장하기(&G)"
-#define STR_DEFAULT       "기본값(&D)"
-#define STR_LANGUAGE      "언어:"
-#define STR_ICONSET       "아이콘셋:"
-
-#define STR_GAIN          "증가값"
-
-#define STR_FILE_NAME     "파일명:"
-#define STR_DISK_SIZE     "디스크 용량:"
-#define STR_RPM_MODE      "RPM 모드:"
-#define STR_PROGRESS      "진행:"
-
-#define STR_WIDTH         "가로:"
-#define STR_HEIGHT        "세로:"
-#define STR_LOCK_TO_SIZE  "크기 고정"
-
-#define STR_MACHINE_TYPE  "머신 종류:"
-#define STR_MACHINE       "기종:"
-#define STR_CONFIGURE     "설정"
-#define STR_CPU_TYPE      "CPU 종류:"
-#define STR_CPU_SPEED     "속도:"
-#define STR_FPU           "FPU:"
-#define STR_WAIT_STATES   "대기 상태:"
-#define STR_MB            "MB"
-#define STR_MEMORY        "메모리:"
-#define STR_TIME_SYNC     "시간 동기화"
-#define STR_DISABLED      "사용하지 않음"
-#define STR_ENABLED_LOCAL "사용 (현지 시간)"
-#define STR_ENABLED_UTC   "사용 (UTC)"
-#define STR_DYNAREC       "동적 재컴파일"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "비디오 카드:"
-#define STR_VIDEO_2       "비디오 카드 2:"
-#define STR_VOODOO        "Voodoo 그래픽"
-#define STR_IBM8514       "IBM 8514/A 그래픽"
-#define STR_XGA           "XGA 그래픽"
-
-#define STR_MOUSE         "마우스:"
-#define STR_JOYSTICK      "조이스틱:"
-#define STR_JOY1          "조이스틱 1..."
-#define STR_JOY2          "조이스틱 2..."
-#define STR_JOY3          "조이스틱 3..."
-#define STR_JOY4          "조이스틱 4..."
-
-#define STR_SOUND1        "사운드 카드 1:"
-#define STR_SOUND2        "사운드 카드 2:"
-#define STR_SOUND3        "사운드 카드 3:"
-#define STR_SOUND4        "사운드 카드 4:"
-#define STR_MIDI_OUT      "MIDI 출력 장치:"
-#define STR_MIDI_IN       "MIDI 입력 장치:"
-#define STR_MPU401        "MPU-401 단독 사용"
-#define STR_FLOAT         "FLOAT32 사운드 사용"
-#define STR_FM_DRIVER     "FM 신디사이저 드라이버"
-#define STR_FM_DRV_NUKED  "Nuked (더 정확한)"
-#define STR_FM_DRV_YMFM   "YMFM (더 빠르게)"
-
-#define STR_NET_TYPE      "네트워크 종류:"
-#define STR_PCAP          "PCap 장치:"
-#define STR_NET           "네트워크 어댑터:"
-#define STR_NET1          "네트워크 카드 1:"
-#define STR_NET2          "네트워크 카드 2:"
-#define STR_NET3          "네트워크 카드 3:"
-#define STR_NET4          "네트워크 카드 4:"
-
-#define STR_COM1          "COM1 장치:"
-#define STR_COM2          "COM2 장치:"
-#define STR_COM3          "COM3 장치:"
-#define STR_COM4          "COM4 장치:"
-#define STR_LPT1          "LPT1 장치:"
-#define STR_LPT2          "LPT2 장치:"
-#define STR_LPT3          "LPT3 장치:"
-#define STR_LPT4          "LPT4 장치:"
-#define STR_SERIAL1       "직렬 포트 1"
-#define STR_SERIAL2       "직렬 포트 2"
-#define STR_SERIAL3       "직렬 포트 3"
-#define STR_SERIAL4       "직렬 포트 4"
-#define STR_PARALLEL1     "병렬 포트 1"
-#define STR_PARALLEL2     "병렬 포트 2"
-#define STR_PARALLEL3     "병렬 포트 3"
-#define STR_PARALLEL4     "병렬 포트 4"
-#define STR_SERIAL_PASS1  "직렬 포트 패스쓰루 1"
-#define STR_SERIAL_PASS2  "직렬 포트 패스쓰루 2"
-#define STR_SERIAL_PASS3  "직렬 포트 패스쓰루 3"
-#define STR_SERIAL_PASS4  "직렬 포트 패스쓰루 4"
-
-#define STR_HDC           "HD 컨트롤러:"
-#define STR_FDC           "FD 컨트롤러:"
-#define STR_IDE_TER       "제3의 IDE 컨트롤러"
-#define STR_IDE_QUA       "제4의 IDE 컨트롤러"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "컨트롤러 1:"
-#define STR_SCSI_2        "컨트롤러 2:"
-#define STR_SCSI_3        "컨트롤러 3:"
-#define STR_SCSI_4        "컨트롤러 4:"
-#define STR_CASSETTE      "카세트 테이프"
-
-#define STR_HDD           "하드 디스크:"
-#define STR_NEW           "새로 만들기(&N)..."
-#define STR_EXISTING      "불러오기(&E)..."
-#define STR_REMOVE        "목록에서 제거(&R)"
-#define STR_BUS           "버스:"
-#define STR_CHANNEL       "채널:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Speed:"
-
-#define STR_SPECIFY       "열기(&S)..."
-#define STR_SECTORS       "섹터:"
-#define STR_HEADS         "헤드:"
-#define STR_CYLS          "실린더:"
-#define STR_SIZE_MB       "용량(MB):"
-#define STR_TYPE          "형식:"
-#define STR_IMG_FORMAT    "이미지 포맷:"
-#define STR_BLOCK_SIZE    "블록 크기:"
-
-#define STR_FLOPPY_DRIVES "플로피 드라이브:"
-#define STR_TURBO         "고속 동작"
-#define STR_CHECKBPB      "BPB 확인"
-#define STR_CDROM_DRIVES  "CD-ROM 드라이브:"
-#define STR_CD_SPEED      "속도:"
-
-#define STR_MO_DRIVES     "광자기 드라이브:"
-#define STR_ZIP_DRIVES    "ZIP 드라이브:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "ISA RTC 카드:"
-#define STR_ISAMEM        "ISA 메모리 확장 카드"
-#define STR_ISAMEM_1      "카드 1:"
-#define STR_ISAMEM_2      "카드 2:"
-#define STR_ISAMEM_3      "카드 3:"
-#define STR_ISAMEM_4      "카드 4:"
-#define STR_BUGGER        "ISABugger 장치"
-#define STR_POSTCARD      "POST 카드"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Malgun Gothic"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "오류"
-    IDS_2050    "치명적인 오류"
-    IDS_2051    " - 일시중지"
-    IDS_2052    "Ctrl+Alt+PgDn 키를 누르면 창 모드로 전환합니다."
-    IDS_2053    "속도"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "ZIP 이미지 (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "86Box에서 사용 가능한 ROM 이미지를 찾을 수 없습니다.\n\nROM 세트를<a href=""https://github.com/86Box/roms/releases/latest"">다운로드</a> 후 ""roms"" 디렉토리에 압축을 풀어 주세요."
-    IDS_2057    "(비었음)"
-    IDS_2058    "ZIP 이미지 (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0모든 파일 (*.*)\0*.*\0"
-    IDS_2059    "터보"
-    IDS_2060    "켜짐"
-    IDS_2061    "꺼짐"
-    IDS_2062    "모든 이미지 (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0기본 섹터 이미지 (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0표면 이미지 (*.86F)\0*.86F\0"
-    IDS_2063    "roms/machines 디렉토리에 필요한 롬파일이 없어 기종 ""%hs""을(를) 사용할 수 없습니다. 사용 가능한 기종으로 변경합니다."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "roms/video 디렉토리에 필요한 롬파일이 없어 비디오 카드 ""%hs""을(를) 사용할 수 없습니다. 사용 가능한 기종으로 변경합니다."
-    IDS_2065    "기종"
-    IDS_2066    "디스플레이"
-    IDS_2067    "입력 장치"
-    IDS_2068    "사운드"
-    IDS_2069    "네트워크"
-    IDS_2070    "포트 (COM & LPT)"
-    IDS_2071    "장치 컨트롤러"
-    IDS_2072    "하드 디스크"
-    IDS_2073    "플로피 / CD-ROM"
-    IDS_2074    "기타 이동식 저장장치"
-    IDS_2075    "기타 주변기기"
-    IDS_2076    "표면 이미지 (*.86F)\0*.86F\0"
-    IDS_2077    "이 창을 클릭하면 마우스를 사용합니다"
-    IDS_2078    "F12+F8키를 누르면 마우스를 해제합니다"
-    IDS_2079    "F12+F8키 또는 가운데 버튼을 클릭하면 마우스를 해제합니다"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "버스"
-    IDS_2082    "파일"
-    IDS_2083    "C"
-    IDS_2084    "H"
-    IDS_2085    "S"
-    IDS_2086    "MB"
-    IDS_2087    "Speed"
-    IDS_2088    "BPB 확인"
-    IDS_2089    "KB"
-    IDS_2090    "비디오 렌더러를 초기화할 수 없습니다."
-    IDS_2091    "기본값"
-    IDS_2092    "%i 대기 상태"
-    IDS_2093    "형식"
-    IDS_2094    "PCap 설정에 실패했습니다"
-    IDS_2095    "PCap 장치가 없습니다"
-    IDS_2096    "PCap 장치가 올바르지 않습니다"
-    IDS_2097    "표준 2버튼 조이스틱"
-    IDS_2098    "표준 4버튼 조이스틱"
-    IDS_2099    "표준 6버튼 조이스틱"
-    IDS_2100    "표준 8버튼 조이스틱"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Thrustmaster Flight Control System"
-    IDS_2104    "없음"
-    IDS_2105    "키보드 가속기를 불러올 수 없습니다."
-    IDS_2106    "Raw 입력을 등록할 수 없습니다."
-    IDS_2107    "%u"
-    IDS_2108    "%u MB (CHS: %i, %i, %i)"
-    IDS_2109    "플로피 %i (%s): %ls"
-    IDS_2110    "모든 이미지 (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0어드밴스드 섹터 이미지 (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0기본 섹터 이미지 (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0플럭스 이미지 (*.FDI)\0*.FDI\0표면 이미지 (*.86F;*.MFM)\0*.86F;*.MFM\0모든 파일 (*.*)\0*.*\0"
-    IDS_2112    "SDL을 초기화할 수 없습니다. SDL2.dll이 필요합니다"
-    IDS_2113    "실행중인 머신을 재시작하시겠습니까?"
-    IDS_2114    "86Box를 끝내시겠습니까?"
-    IDS_2115    "Ghostscript를 초기화할 수 없습니다"
-    IDS_2116    "광자기 %i (%ls): %ls"
-    IDS_2117    "광자기 이미지 (*.IM?;*.MDI)\0*.IM?;*.MDI\0모든 파일 (*.*)\0*.*\0"
-    IDS_2118    "86Box에 어서오세요!"
-    IDS_2119    "내부 컨트롤러"
-    IDS_2120    "끝내기"
-    IDS_2121    "ROM을 불러올 수 없습니다"
-    IDS_2122    "설정을 저장하시겠습니까?"
-    IDS_2123    "사용중인 머신이 재부팅됩니다."
-    IDS_2124    "저장"
-    IDS_2125    "86Box에 대해"
-    IDS_2126    "86Box v" EMU_VERSION
-
-    IDS_2127    "고전 컴퓨터 에뮬레이터\n\n저자: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nGNU General Public 라이선스 (버전 2 이상)에 의해 배포되었습니다. 자세한 내용은 LICENSE 파일을 읽어 주세요."
-    IDS_2128    "확인"
-    IDS_2129    "하드웨어를 이용할 수 없습니다"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    LIB_NAME_PCAP "이 설치되었는지 " LIB_NAME_PCAP "에 대응하는 네트워크에 접속되어 있는지 확인해 주세요."
-    IDS_2131    "올바르지 않은 설정입니다"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS "은(는) PostScript 파일을 PDF로 자동변환하는 데에 필요합니다.\n\n표준 PostScript 프린터로 보내신 임의의 문서는 PostScript (.ps) 파일로 저장됩니다."
-    IDS_2135    "전체 화면으로 전환"
-    IDS_2136    "이 메시지 그만 보기"
-    IDS_2137    "끝내지 않기"
-    IDS_2138    "재시작"
-    IDS_2139    "재시작 안함"
-    IDS_2140    "광자기 이미지 (*.IM?;*.MDI)\0*.IM?;*.MDI\0모든 파일 (*.*)\0*.*\0"
-    IDS_2141    "CD-ROM 이미지 (*.ISO;*.CUE)\0*.ISO;*.CUE\0모든 파일 (*.*)\0*.*\0"
-    IDS_2142    "%hs 장치 설정"
-    IDS_2143    "모니터 절전 모드"
-    IDS_2144    "OpenGL 쉐이더 (*.GLSL)\0*.GLSL\0모든 파일 (*.*)\0*.*\0"
-    IDS_2145    "OpenGL 설정"
-    IDS_2146    "지원하지 않는 설정입니다"
-    IDS_2147    "이 에뮬레이트된 기종에 대해 선택한 기종을 기반으로 하는 CPU 종류 필터링이 사용되지 않도록 설정되었습니다.\n\n따라서 선택된 머신과 호환되지 않는 CPU를 선택하실 수 있습니다. 하지만 BIOS 또는 다른 소프트웨어와 호환되지 않을 수 있습니다.\n\n이 설정을 활성화하는 것은 공식적으로 지원되지 않으며, 제출된 버그 보고서는 유효하지 않음으로 닫힐 수 있습니다."
-    IDS_2148    "계속"
-    IDS_2149    "카세트: %s"
-    IDS_2150    "카세트 이미지 (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0모든 파일 (*.*)\0*.*\0"
-    IDS_2151    "카트리지 %i: %ls"
-    IDS_2152    "카트리지 이미지 (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0모든 파일 (*.*)\0*.*\0"
-    IDS_2153    "렌더러 초기화 오류"
-    IDS_2154    "OpenGL (3.0 Core) 렌더러를 초기화할 수 없습니다. 다른 렌더러를 사용하십시오."
-    IDS_2155    "실행 재개"
-    IDS_2156    "실행 일시 중지"
-    IDS_2157    "Ctrl+Alt+Del"
-    IDS_2158    "Ctrl+Alt+Esc"
-    IDS_2159    "재시작"
-    IDS_2160    "ACPI 종료"
-    IDS_2161    "설정"
-    IDS_2162    "Type"
-    IDS_2163    "No Dynarec"
-    IDS_2164    "Old Dynarec"
-    IDS_2165    "New Dynarec"
-    IDS_2166    "두번째 비디오카드 ""%hs""는 roms/video 디렉토리에서 ROM이 누락되어 사용할 수 없습니다. 두번째 비디오 카드를 비활성화 합니다."
-    IDS_2167    "Failed to initialize network driver"
-    IDS_2168    "The network configuration will be switched to the null driver"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "하드 디스크 (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "MFM/RLL 또는 ESDI CD-ROM 드라이브가 존재하지 않습니다"
-    IDS_4100    "사용자 설정..."
-    IDS_4101    "사용자 설정 (대용량)..."
-    IDS_4102    "새로 생성"
-    IDS_4103    "기존 이미지 사용"
-    IDS_4104    "HDI 디스크 이미지는 4GB 이상으로 지정할 수 없습니다"
-    IDS_4105    "디스크 이미지는 127GB 이상으로 지정할 수 없습니다"
-    IDS_4106    "하드 디스크 이미지 (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0모든 파일 (*.*)\0*.*\0"
-    IDS_4107    "파일을 읽을 수 없습니다"
-    IDS_4108    "파일을 저장할 수 없습니다"
-    IDS_4109    "512 바이트 이외의 섹터 크기를 가진 HDI 또는 HDX 형식의 이미지를 생성할 수 없습니다"
-    IDS_4110    "USB는 아직 지원하지 않습니다"
-    IDS_4111    "디스크 이미지 파일이 이미 존재합니다"
-    IDS_4112    "올바른 파일명을 지정해 주세요."
-    IDS_4113    "디스크 이미지가 생성되었습니다"
-    IDS_4114    "파일이 존재하며 읽을 수 있는지 확인합니다."
-    IDS_4115    "파일이 쓰기 가능한 디렉토리에 저장되고 있는지 확인합니다."
-    IDS_4116    "디스크 이미지가 너무 큽니다"
-    IDS_4117    "새로 생성한 드라이브의 파티션 설정과 포맷을 꼭 해주세요."
-    IDS_4118    "선택하신 파일을 덮어씌웁니다. 사용하시겠습니까?"
-    IDS_4119    "지원하지 않는 디스크 이미지입니다"
-    IDS_4120    "덮어쓰기"
-    IDS_4121    "덮어쓰지 않음"
-    IDS_4122    "Raw 이미지 (.img)"
-    IDS_4123    "HDI 이미지 (.hdi)"
-    IDS_4124    "HDX 이미지 (.hdx)"
-    IDS_4125    "고정 사이즈 VHD (.vhd)"
-    IDS_4126    "동적 사이즈 VHD (.vhd)"
-    IDS_4127    "디퍼런싱 VHD (.vhd)"
-    IDS_4128    "대형 블록 (2 MB)"
-    IDS_4129    "소형 블록 (512 KB)"
-    IDS_4130    "VHD 파일 (*.VHD)\0*.VHD\0모든 파일 (*.*)\0*.*\0"
-    IDS_4131    "부모 VHD 선택"
-    IDS_4132    "이는 디퍼런싱 이미지가 생성된 후 부모 이미지가 수정되었음을 의미할 수 있습니다.\n\n이미지 파일이 이동 또는 복사된 경우 또는 이 디스크를 만든 프로그램의 버그로 인해 발생할 수도 있습니다.\n\n타임스탬프를 수정하시겠습니까?"
-    IDS_4133    "부모 디스크와 자식 디스크의 타임스탬프가 일치하지 않습니다"
-    IDS_4134    "VHD 타임스탬프를 고칠 수 없습니다"
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "사용하지 않음"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "사용하지 않음"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 kB"
-    IDS_5889    "180 kB"
-    IDS_5890    "320 kB"
-    IDS_5891    "360 kB"
-    IDS_5892    "640 kB"
-    IDS_5893    "720 kB"
-    IDS_5894    "1.2 MB"
-    IDS_5895    "1.25 MB"
-    IDS_5896    "1.44 MB"
-    IDS_5897    "DMF (클러스터 1024)"
-    IDS_5898    "DMF (클러스터 2048)"
-    IDS_5899    "2.88 MB"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5"" 128 MB (ISO 10090)"
-    IDS_5903    "3.5"" 230 MB (ISO 13963)"
-    IDS_5904    "3.5"" 540 MB (ISO 15498)"
-    IDS_5905    "3.5"" 640 MB (ISO 15498)"
-    IDS_5906    "3.5"" 1.3 GB (GigaMO)"
-    IDS_5907    "3.5"" 2.3 GB (GigaMO 2)"
-    IDS_5908    "5.25"" 600 MB"
-    IDS_5909    "5.25"" 650 MB"
-    IDS_5910    "5.25"" 1 GB"
-    IDS_5911    "5.25"" 1.3 GB"
-
-    IDS_6144    "완벽한 회전수"
-    IDS_6145    "1% 낮은 회전수"
-    IDS_6146    "1.5% 낮은 회전수"
-    IDS_6147    "2% 낮은 회전수"
-
-    IDS_7168    "(시스템 기본값)"
-END
-#define IDS_LANG_ENUS IDS_7168
-
-// Korean resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/pl-PL.rc b/src/win/languages/pl-PL.rc
deleted file mode 100644
index bdd73f6cf..000000000
--- a/src/win/languages/pl-PL.rc
+++ /dev/null
@@ -1,637 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Polish (pl-PL) resources
-
-#ifdef _WIN32
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Akcje"
-    BEGIN
-        MENUITEM "&Klawaitura wymaga przechwytu myszy", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "&Prawy CTRL to lewy Alt", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "&Twardy reset...", IDM_ACTION_HRESET
-        MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-    MENUITEM "Ctrl+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "&Pauza", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "W&yjdź...", IDM_ACTION_EXIT
-    END
-    POPUP "&Widok"
-    BEGIN
-        MENUITEM "&Ukryj pasek statusu", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "Ukryj &pasek narzędzi", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
-        MENUITEM "&Okno o zmiennym rozmiarze", IDM_VID_RESIZE
-        MENUITEM "P&amiętaj rozmiar &i pozycję", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "Re&nderer"
-        BEGIN
-            MENUITEM "&SDL (Software)", IDM_VID_SDL_SW
-            MENUITEM "SDL (&Hardware)", IDM_VID_SDL_HW
-            MENUITEM "SDL (&OpenGL)", IDM_VID_SDL_OPENGL
-            MENUITEM "Open&GL (3.0 Core)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "&VNC", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Określ rozmiary...", IDM_VID_SPECIFY_DIM
-        MENUITEM "&Wymuś proporcje wyświetlania 4:3", IDM_VID_FORCE43
-        POPUP "&Czynnik skalowania okna"
-        BEGIN
-            MENUITEM "&0.5x", IDM_VID_SCALE_1X
-            MENUITEM "&1x", IDM_VID_SCALE_2X
-            MENUITEM "1.&5x", IDM_VID_SCALE_3X
-            MENUITEM "&2x", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "Metoda filtrowania"
-        BEGIN
-            MENUITEM "&Nearest", IDM_VID_FILTER_NEAREST
-            MENUITEM "&Linear", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "Skalowanie Hi&DPI", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "&Pełny ekran\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "Fullscreen &stretch mode"
-        BEGIN
-            MENUITEM "&Tryb rozciągania na pełnym ekranie", IDM_VID_FS_FULL
-            MENUITEM "&4:3", IDM_VID_FS_43
-            MENUITEM "&Kwadratowe piksele (Zachowaj proporcje)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "&Skalowanie całkowite", IDM_VID_FS_INT
-        END
-        POPUP "Ustawienia E&GA/(S)VGA"
-        BEGIN
-            MENUITEM "&Odwrócony monitor VGA", IDM_VID_INVERT
-            POPUP "Rodzaj ekranu &VGA"
-            BEGIN
-                MENUITEM "RGB - &Kolorowy", IDM_VID_GRAY_RGB
-                MENUITEM "&RGB - Skala szarości", IDM_VID_GRAY_MONO
-                MENUITEM "&Bursztynowy monitor", IDM_VID_GRAY_AMBER
-                MENUITEM "&Zielony monitor", IDM_VID_GRAY_GREEN
-                MENUITEM "&Biały monitor", IDM_VID_GRAY_WHITE
-            END
-            POPUP "Typ konwersji &w skali szarości"
-            BEGIN
-                MENUITEM "BT&601 (NTSC/PAL)", IDM_VID_GRAYCT_601
-                MENUITEM "BT&709 (HDTV)", IDM_VID_GRAYCT_709
-                MENUITEM "&Średni", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Overscan dla CGA/PCjr/Tandy/E&GA/(S)VGA", IDM_VID_OVERSCAN
-        MENUITEM "Zmień kontrast dla &monochromatycznego ekranu", IDM_VID_CGACON
-    END
-    MENUITEM "&Nośnik", IDM_MEDIA
-    POPUP "&Narzędzia"
-    BEGIN
-        MENUITEM "&Ustawienia...", IDM_CONFIG
-        MENUITEM "&Aktualizuj ikony na pasku statusu", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "Zrób &zrzut ekranu\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "&Preferencje...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "Włącz integrację z &Discord", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "Wzmocnienie &dźwięku...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "Rozpocznij śledzenie\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "Zakończ śledzenie\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "&Pomoc"
-    BEGIN
-        MENUITEM "&Dokumentacja...", IDM_DOCS
-        MENUITEM "&O 86Box...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nowy obraz...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Istniejący obraz...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "Istniejący obraz (&Chroniony przed zapisem)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Nagraj", IDM_CASSETTE_RECORD
-        MENUITEM "&Odtwórz", IDM_CASSETTE_PLAY
-        MENUITEM "&Przewiń do początku", IDM_CASSETTE_REWIND
-        MENUITEM "&Przewiń do końca", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "W&yjmij", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Obraz...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "W&yjmij", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nowy obraz...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Istniejący obraz...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "Istniejący obraz (&Chroniony przed zapisem)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&ksportuj do 86F...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "W&yjmij", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Ścisz", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "P&usty", IDM_CDROM_EMPTY
-        MENUITEM "&Przeładuj poprzedni obraz", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "&Obraz...", IDM_CDROM_IMAGE
-        MENUITEM "&Teczka...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nowy obraz...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Istniejący obraz...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "Istniejący obraz (&Chroniony przed zapisem)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "W&yjmij", IDM_ZIP_EJECT
-        MENUITEM "&Przeładuj poprzedni obraz", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nowy obraz...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Istniejący obraz...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "Istniejący obraz (&Chroniony przed zapisem)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "W&yjmij", IDM_MO_EJECT
-        MENUITEM "&Przeładuj poprzedni obraz", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "Docelowa &liczba klatek na sekundę"
-    BEGIN
-        MENUITEM "&Zsynchronizuj z wideo", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "&25 fps", IDM_VID_GL_FPS_25
-        MENUITEM "&30 fps", IDM_VID_GL_FPS_30
-        MENUITEM "&50 fps", IDM_VID_GL_FPS_50
-        MENUITEM "&60 fps", IDM_VID_GL_FPS_60
-        MENUITEM "&75 fps", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "&VSync", IDM_VID_GL_VSYNC
-    MENUITEM "&Wybierz shader...", IDM_VID_GL_SHADER
-    MENUITEM "&Usuń shader", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "Preferencje"
-#define STR_SND_GAIN      "Wzmocnienie dźwięku"
-#define STR_NEW_FLOPPY    "Nowy obraz"
-#define STR_CONFIG        "Ustawienia"
-#define STR_SPECIFY_DIM   "Określ rozmiary okna"
-
-#define STR_OK            "OK"
-#define STR_CANCEL        "Anuluj"
-#define STR_GLOBAL        "Zapisz ustawienia jako &globalne ustawienia domyślne"
-#define STR_DEFAULT       "&Domyślny"
-#define STR_LANGUAGE      "Język:"
-#define STR_ICONSET       "Zestaw ikon:"
-
-#define STR_GAIN          "Wzmacniacz"
-
-#define STR_FILE_NAME     "Nazwa pliku:"
-#define STR_DISK_SIZE     "Rozmiar dysku:"
-#define STR_RPM_MODE      "Tryb RPM:"
-#define STR_PROGRESS      "Postęp:"
-
-#define STR_WIDTH         "Szerokość:"
-#define STR_HEIGHT        "Wysokość:"
-#define STR_LOCK_TO_SIZE  "Stały rozmiar"
-
-#define STR_MACHINE_TYPE  "Rodzaj maszyny:"
-#define STR_MACHINE       "Maszyna:"
-#define STR_CONFIGURE     "Konfiguruj"
-#define STR_CPU_TYPE      "Rodzaj procesora:"
-#define STR_CPU_SPEED     "Szybkość:"
-#define STR_FPU           "Jednostka FPU:"
-#define STR_WAIT_STATES   "Stany oczekiwania:"
-#define STR_MB            "MB"
-#define STR_MEMORY        "Pamięć:"
-#define STR_TIME_SYNC     "Synchronizacja czasu"
-#define STR_DISABLED      "Wyłączona"
-#define STR_ENABLED_LOCAL "Włączona (czas lokalny)"
-#define STR_ENABLED_UTC   "Włączona (UTC)"
-#define STR_DYNAREC       "Dynamiczny rekompilator"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "Wideo:"
-#define STR_VIDEO_2       "Wideo 2:"
-#define STR_VOODOO        "Grafika Voodoo"
-#define STR_IBM8514       "Grafika IBM 8514/A"
-#define STR_XGA           "Grafika XGA"
-
-#define STR_MOUSE         "Mysz:"
-#define STR_JOYSTICK      "Joystick:"
-#define STR_JOY1          "Joystick 1..."
-#define STR_JOY2          "Joystick 2..."
-#define STR_JOY3          "Joystick 3..."
-#define STR_JOY4          "Joystick 4..."
-
-#define STR_SOUND1        "Karta dźwiękowa 1:"
-#define STR_SOUND2        "Karta dźwiękowa 2:"
-#define STR_SOUND3        "Karta dźwiękowa 3:"
-#define STR_SOUND4        "Karta dźwiękowa 4:"
-#define STR_MIDI_OUT      "Urządzenie wyjściowe MIDI:"
-#define STR_MIDI_IN       "Urządzenie wejściowe MIDI:"
-#define STR_MPU401        "Samodzielne urządzenie MPU-401"
-#define STR_FLOAT         "Użyj dźwięku FLOAT32"
-#define STR_FM_DRIVER     "Sterownik syntezy FM"
-#define STR_FM_DRV_NUKED  "Nuked (dokładniejszy)"
-#define STR_FM_DRV_YMFM   "YMFM (szybszy)"
-
-#define STR_NET_TYPE      "Rodzaj sieci:"
-#define STR_PCAP          "Urządzenie PCap:"
-#define STR_NET           "Karta sieciowa:"
-#define STR_NET1          "Network card 1:"
-#define STR_NET2          "Network card 2:"
-#define STR_NET3          "Network card 3:"
-#define STR_NET4          "Network card 4:"
-
-#define STR_COM1          "Urządzenie COM1:"
-#define STR_COM2          "Urządzenie COM2:"
-#define STR_COM3          "Urządzenie COM3:"
-#define STR_COM4          "Urządzenie COM4:"
-#define STR_LPT1          "Urządzenie LPT1:"
-#define STR_LPT2          "Urządzenie LPT2:"
-#define STR_LPT3          "Urządzenie LPT3:"
-#define STR_LPT4          "Urządzenie LPT4:"
-#define STR_SERIAL1       "Port szeregowy 1"
-#define STR_SERIAL2       "Port szeregowy 2"
-#define STR_SERIAL3       "Port szeregowy 3"
-#define STR_SERIAL4       "Port Szeregowy 4"
-#define STR_PARALLEL1     "Port równoległy 1"
-#define STR_PARALLEL2     "Port równoległy 2"
-#define STR_PARALLEL3     "Port równoległy 3"
-#define STR_PARALLEL4     "Port równoległy 4"
-#define STR_SERIAL_PASS1  "Serial port passthrough 1"
-#define STR_SERIAL_PASS2  "Serial port passthrough 2"
-#define STR_SERIAL_PASS3  "Serial port passthrough 3"
-#define STR_SERIAL_PASS4  "Serial port passthrough 4"
-
-#define STR_HDC           "Kontroler dysku twardego:"
-#define STR_FDC           "Kontroler dyskietek:"
-#define STR_IDE_TER       "Trzeciorzędowy kontroler IDE"
-#define STR_IDE_QUA       "Czwartorzędowy kontroler IDE"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "Kontroler 1:"
-#define STR_SCSI_2        "Kontroler 2:"
-#define STR_SCSI_3        "Kontroler 3:"
-#define STR_SCSI_4        "Kontroler 4:"
-#define STR_CASSETTE        "Kaseta"
-
-#define STR_HDD           "Dyski twarde:"
-#define STR_NEW           "&Nowy..."
-#define STR_EXISTING      "&Istniejący..."
-#define STR_REMOVE        "&Usuń"
-#define STR_BUS           "Magistrala:"
-#define STR_CHANNEL       "Kanał:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Speed:"
-
-#define STR_SPECIFY       "&Określ..."
-#define STR_SECTORS       "Sektory:"
-#define STR_HEADS         "Głowice:"
-#define STR_CYLS          "Cylindry:"
-#define STR_SIZE_MB       "Rozmiar (MB):"
-#define STR_TYPE          "Rodzaj:"
-#define STR_IMG_FORMAT    "Format obrazu:"
-#define STR_BLOCK_SIZE    "Rozmiar bloku:"
-
-#define STR_FLOPPY_DRIVES "Napędy dyskietek:"
-#define STR_TURBO         "Rozrządy Turbo"
-#define STR_CHECKBPB      "Sprawdzaj BPB"
-#define STR_CDROM_DRIVES  "Napędy CD-ROM:"
-#define STR_CD_SPEED      "Szybkość:"
-
-#define STR_MO_DRIVES     "Napędy MO:"
-#define STR_ZIP_DRIVES    "Napędy ZIP:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "ISA RTC:"
-#define STR_ISAMEM        "Rozszerzenie pamięci ISA"
-#define STR_ISAMEM_1      "Karta 1:"
-#define STR_ISAMEM_2      "Karta 2:"
-#define STR_ISAMEM_3      "Karta 3:"
-#define STR_ISAMEM_4      "Karta 4:"
-#define STR_BUGGER        "Urządzenie ISABugger"
-#define STR_POSTCARD      "Karta POST"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Segoe UI"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "Błąd"
-    IDS_2050    "Fatalny błąd"
-    IDS_2051    " - PAUSED"
-    IDS_2052    "Naciśnij klawisze Ctrl+Alt+PgDn aby wrócić to trybu okna."
-    IDS_2053    "Szybkość"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "Obrazy ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "86Box nie może znaleźć obrazów ROM nadających się do użytku.\n\nProszę pobrać zestaw obrazów ROM ze strony <a href=""https://github.com/86Box/roms/releases/latest"">download</a>, i rozpakować je do katalogu ""roms""."
-    IDS_2057    "(pusty)"
-    IDS_2058    "Obrazy ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0Wszystkie pliki (*.*)\0*.*\0"
-    IDS_2059    "Turbo"
-    IDS_2060    "Włącz"
-    IDS_2061    "Wyłącz"
-    IDS_2062    "Wszystkie obrazy (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Podstawowe obrazy sektorów(*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Obrazy powierzchniowe (*.86F)\0*.86F\0"
-    IDS_2063    "Maszyna ""%hs"" nie jest dostępna, ponieważ brakuje obrazów ROM w katalogu roms/machines. Przełączanie na dostępną maszynę."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "Karta wideo ""%hs"" nie jest dostępna, ponieważ brakuje obrazów ROM w katalogu roms/video. Przełączanie na dostępną kartę wideo."
-    IDS_2065    "Maszyna"
-    IDS_2066    "Ekran"
-    IDS_2067    "Urządzenia wejściowe"
-    IDS_2068    "Dźwięk"
-    IDS_2069    "Sieć"
-    IDS_2070    "Porty (COM & LPT)"
-    IDS_2071    "Kontrolery pamięci"
-    IDS_2072    "Dyski twarde"
-    IDS_2073    "Napędy dyskietek i CD-ROM"
-    IDS_2074    "Inne urządzenia wymienne"
-    IDS_2075    "Inne urządzenia peryferyjne"
-    IDS_2076    "Obrazy powierzchniowe (*.86F)\0*.86F\0"
-    IDS_2077    "Kliknij w celu przechwycenia myszy"
-    IDS_2078    "Naciśnij klawisze F8+F12 w celu uwolnienia myszy"
-    IDS_2079    "Naciśnij klawisze F8+F12 lub środkowy przycisk w celu uwolnienia myszy"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "Magistrala"
-    IDS_2082    "Plik"
-    IDS_2083    "C"
-    IDS_2084    "H"
-    IDS_2085    "S"
-    IDS_2086    "MB"
-    IDS_2087    "Speed"
-    IDS_2088    "Sprawdzaj BPB"
-    IDS_2089    "KB"
-    IDS_2090    "Nie można zainicjować renderera wideo."
-    IDS_2091    "Domyślny"
-    IDS_2092    "%i Stany oczekiwania"
-    IDS_2093    "Rodzaj"
-    IDS_2094    "Nie udało się ustawić PCap"
-    IDS_2095    "Nie znaleziono urządzeń PCap"
-    IDS_2096    "Nieprawidłowe urządzenie PCap"
-    IDS_2097    "Standardowe joysticki 2-przyciskowe"
-    IDS_2098    "Standardowy joystick 4-przyciskowy"
-    IDS_2099    "Standardowy joystick 6-przyciskowy"
-    IDS_2100    "Standardowy joystick 8-przyciskowy"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Thrustmaster Flight Control System"
-    IDS_2104    "Żaden"
-    IDS_2105    "Nie można załadować akceleratorów klawiaturowych."
-    IDS_2106    "Nie można zarejestrować surowych danych wejściowych."
-    IDS_2107    "%u"
-    IDS_2108    "%u MB (CHS: %i, %i, %i)"
-    IDS_2109    "Dyskietka %i (%s): %ls"
-    IDS_2110    "Wszystkie obrazy (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Zaawansowane obrazy sektorów (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Podstawowe obrazy sektorów (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Flux images (*.FDI)\0*.FDI\0Obrazy powierzchniowe (*.86F;*.MFM)\0*.86F;*.MFM\0All files (*.*)\0*.*\0"
-    IDS_2112    "Nie można zainicjować SDL, wymagany SDL2.dll"
-    IDS_2113    "Jesteś pewien że chcesz wykonać twardy reset emulowanej maszyny?"
-    IDS_2114    "Jesteś pewien że chcesz zakończyć 86Box?"
-    IDS_2115    "Nie można zainicjować Ghostscript"
-    IDS_2116    "MO %i (%ls): %ls"
-    IDS_2117    "Obrazy MO (*.IM?;*.MDI)\0*.IM?;*.MDI\0All files (*.*)\0*.*\0"
-    IDS_2118    "Witamy w 86Box!"
-    IDS_2119    "Kontroler wewnętrzny"
-    IDS_2120    "Zakończ"
-    IDS_2121    "Nie znaleziono obrazów ROM"
-    IDS_2122    "Czy chcesz zapisać ustawienia?"
-    IDS_2123    "To spowoduje twardy reset wirtualnej maszyny."
-    IDS_2124    "Zapisz"
-    IDS_2125    "O 86Box"
-    IDS_2126    "86Box v" EMU_VERSION
-
-    IDS_2127    "Emulator starych komputerów\n\nAutorzy: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, i inni.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, i inni.\n\nPrzetłumaczony przez: Fanta-Shokata\n\nWydany na licencji GNU General Public License w wersji 2 lub nowszej. Zobacz LICENSE aby uzyskać więcej informacji."
-    IDS_2128    "OK"
-    IDS_2129    "Sprzęt niedostępny"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "Sprawdź, czy " LIB_NAME_PCAP " jest zainstalowany i czy posiadasz połączenie sieciowe kompatybilne z " LIB_NAME_PCAP "."
-    IDS_2131    "Nieprawidłowa konfiguracja"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " jest wymagany do automatycznej konwersji plików PostScript do PDF.\n\nDokumenty wysłane do ogólnej drukarki PostScript zostaną zapisane jako pliki PostScript (.ps)."
-    IDS_2135    "Przechodzenie do trybu pełnoekranowego"
-    IDS_2136    "Nie pokazuj więcej tego komunikatu"
-    IDS_2137    "Nie kończ"
-    IDS_2138    "Przywróć"
-    IDS_2139    "Nie przywracaj"
-    IDS_2140    "Obrazy MO (*.IM?;*.MDI)\0*.IM?;*.MDI\0All files (*.*)\0*.*\0"
-    IDS_2141    "Obrazy CD-ROM (*.ISO;*.CUE)\0*.ISO;*.CUE\0All files (*.*)\0*.*\0"
-    IDS_2142    "Konfiguracja urządzenia %hs"
-    IDS_2143    "Monitor w trybie czuwania"
-    IDS_2144    "Shadery OpenGL (*.GLSL)\0*.GLSL\0Wszystkie pliki (*.*)\0*.*\0"
-    IDS_2145    "Opcje OpenGL"
-    IDS_2146    "Ładujesz nieobsługiwaną konfigurację"
-    IDS_2147    "Wybór rodzaju procesora oparty na wybranej maszynie jest wyłączony dla tej emulowanej maszyny.\n\nPozwala to na wybór procesora który jest niekompatybilny z wybraną maszyną. Jednak możesz napotkać niezgodności z BIOS-em maszyny lub innym oprogramowaniem.\n\nAktywacja tego ustawienia nie jest wspierana i każde zgłoszenie błędu może zostać zamknięte jako nieważne."
-    IDS_2148    "Kontynuuj"
-    IDS_2149    "Kaseta: %s"
-    IDS_2150    "Obrazy kaset (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0Wszystkie pliki (*.*)\0*.*\0"
-    IDS_2151    "Kartrydż %i: %ls"
-    IDS_2152    "Obrazy kartrydżu (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0Wszystkie pliki (*.*)\0*.*\0"
-    IDS_2153    "Błąd inicjalizacji renderera"
-    IDS_2154    "Nie można zainicjować renderera OpenGL (3.0 Core). Użyj innego."
-    IDS_2155    "Wznów wykonywanie"
-    IDS_2156    "Zatrzymaj wykonywanie"
-    IDS_2157    "Naciśnij Ctrl+Alt+Del"
-    IDS_2158    "Naciśnij Ctrl+Alt+Esc"
-    IDS_2159    "Twardy reset"
-    IDS_2160    "Wyłączenie ACPI"
-    IDS_2161    "Ustawienia"
-    IDS_2162    "Type"
-    IDS_2163    "No Dynarec"
-    IDS_2164    "Old Dynarec"
-    IDS_2165    "New Dynarec"
-    IDS_2166    "Video card #2 ""%hs"" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
-    IDS_2167    "Failed to initialize network driver"
-    IDS_2168    "The network configuration will be switched to the null driver"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "Dysk twardy (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "Napędy CD-ROM MFM/RLL lub ESDI nigdy nie istniały"
-    IDS_4100    "Niestandardowy..."
-    IDS_4101    "Niestandardowy (duży)..."
-    IDS_4102    "Dodaj nowy dysk twardy"
-    IDS_4103    "Dodaj istniejący dysk twardy"
-    IDS_4104    "Obrazy dysków HDI nie mogą być większe niż 4 GB."
-    IDS_4105    "Obrazy dysków nie mogą być większe niż 127 GB."
-    IDS_4106    "Obrazy dysku twardego (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0Wszystkie pliki (*.*)\0*.*\0"
-    IDS_4107    "Nie można odczytać pliku"
-    IDS_4108    "Nie można zapisać pliku"
-    IDS_4109    "Obrazy HDI lub HDX z rozmiarem sektora innym niż 512 nie są wspierane."
-    IDS_4110    "USB nie jest jeszcze wspierane"
-    IDS_4111    "Plik obrazu dysku już istnieje"
-    IDS_4112    "Określ prawidłową nazwę pliku."
-    IDS_4113    "Utworzono obraz dysku"
-    IDS_4114    "Sprawdź, czy plik istnieje i nadaje się do odczytu."
-    IDS_4115    "Sprawdź, czy plik jest zapiyswany w katalogu z możliwością zapisu."
-    IDS_4116    "Obraz dysku jest za duży"
-    IDS_4117    "Nie zapomnij o partycjonowaniu i sformatowaniu nowo utworzego dysku"
-    IDS_4118    "Wybrany plik zostanie nadpisany. Czy na pewno chcesz użyć tego pliku?"
-    IDS_4119    "Niewspierany obraz dysku"
-    IDS_4120    "Nadpisz"
-    IDS_4121    "Nie nadpisuj"
-    IDS_4122    "Obraz surowy (.img)"
-    IDS_4123    "Obraz HDI (.hdi)"
-    IDS_4124    "Obraz HDX (.hdx)"
-    IDS_4125    "VHD o stałym rozmiarze (.vhd)"
-    IDS_4126    "VHD o dynamicznym rozmiarze (.vhd)"
-    IDS_4127    "VHD różnicujący (.vhd)"
-    IDS_4128    "Duże bloki (2 MB)"
-    IDS_4129    "Małe bloki (512 KB)"
-    IDS_4130    "Pliki VHD (*.VHD)\0*.VHD\0Wszystkie pliki (*.*)\0*.*\0"
-    IDS_4131    "Wybierz nadrzędny plik VHD"
-    IDS_4132    "Może to oznaczać, że obraz nadrzędny został zmodyfikowany po utworzeniu obrazu różnicującego.\n\nMoże się to również zdarzyć, jeśli pliki obrazów zostały przeniesione lub skopiowane, lub wystąpił błąd w programie, który utworzył ten dysk\n\nCzy chcesz naprawić sygnatury czasowe?"
-    IDS_4133    "Sygnatury czasowe dysku nadrzędnego i podrzędnego nie zgadzają się"
-    IDS_4134    "Nie można naprawić sygnatury czasowej VHD."
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "Wyłączony"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "Wyłączony"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 kB"
-    IDS_5889    "180 kB"
-    IDS_5890    "320 kB"
-    IDS_5891    "360 kB"
-    IDS_5892    "640 kB"
-    IDS_5893    "720 kB"
-    IDS_5894    "1,2 MB"
-    IDS_5895    "1,25 MB"
-    IDS_5896    "1,44 MB"
-    IDS_5897    "DMF (klaster 1024)"
-    IDS_5898    "DMF (klaster 2048)"
-    IDS_5899    "2,88 MB"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5"" 128 MB (ISO 10090)"
-    IDS_5903    "3.5"" 230 MB (ISO 13963)"
-    IDS_5904    "3.5"" 540 MB (ISO 15498)"
-    IDS_5905    "3.5"" 640 MB (ISO 15498)"
-    IDS_5906    "3.5"" 1,3 GB (GigaMO)"
-    IDS_5907    "3.5"" 2,3 GB (GigaMO 2)"
-    IDS_5908    "5.25"" 600 MB"
-    IDS_5909    "5.25"" 650 MB"
-    IDS_5910    "5.25"" 1 GB"
-    IDS_5911    "5.25"" 1,3 GB"
-
-    IDS_6144    "Idealne obroty"
-    IDS_6145    "1% poniżej idealnych obrotów"
-    IDS_6146    "1.5% poniżej idealnych obrotów"
-    IDS_6147    "2% poniżej idealnych obrotów"
-
-    IDS_7168    "(Domyślne ustawienie systemowe)"
-END
-#define IDS_LANG_ENUS IDS_7168
-
-// Polish (pl-PL) resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/pt-BR.rc b/src/win/languages/pt-BR.rc
deleted file mode 100644
index 48cbba111..000000000
--- a/src/win/languages/pt-BR.rc
+++ /dev/null
@@ -1,640 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Portuguese (pt-BR) resources
-//
-// Translated by Altieres Lima da Silva, 2021
-// 
-
-#ifdef _WIN32
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Ação"
-    BEGIN
-        MENUITEM "&Teclado requer captura", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "CTRL &direito é o ALT esquerdo", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "&Reinicialização completa...", IDM_ACTION_HRESET
-        MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-        MENUITEM "Ctrl+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "&Pausar", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "&Sair...", IDM_ACTION_EXIT
-    END
-    POPUP "&Exibir"
-    BEGIN
-        MENUITEM "&Ocultar barra de status", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "Ocultar &barra de ferramenta", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Mostrar monitores não-primários", IDM_VID_MONITORS
-        MENUITEM "&Janela redimensionável", IDM_VID_RESIZE
-        MENUITEM "&Lembrar tamanho e posição", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "&Renderizador"
-        BEGIN
-            MENUITEM "&SDL (Software)", IDM_VID_SDL_SW
-            MENUITEM "SDL (&Hardware)", IDM_VID_SDL_HW
-            MENUITEM "SDL (&OpenGL)", IDM_VID_SDL_OPENGL
-            MENUITEM "Open&GL (Núcleo 3.0)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "&VNC", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Especificar as dimensões...", IDM_VID_SPECIFY_DIM
-        MENUITEM "F&orçar proporção de tela em 4:3", IDM_VID_FORCE43
-        POPUP "&Fator de redimensionamento da janela"
-        BEGIN
-            MENUITEM "&0,5x", IDM_VID_SCALE_1X
-            MENUITEM "&1x", IDM_VID_SCALE_2X
-            MENUITEM "1,&5x", IDM_VID_SCALE_3X
-            MENUITEM "&2x", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "Método de filtragem"
-        BEGIN
-            MENUITEM "&Mais próximo", IDM_VID_FILTER_NEAREST
-            MENUITEM "&Linear", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "Escala Hi&DPI", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "&Tela cheia\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "Modo de &redimensionamento da tela cheia"
-        BEGIN
-            MENUITEM "&Tela cheia esticada", IDM_VID_FS_FULL
-            MENUITEM "&4:3", IDM_VID_FS_43
-            MENUITEM "Pixel&s quadrados (manter proporção)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "&Redimensionamento com valores inteiros", IDM_VID_FS_INT
-        END
-        POPUP "Configurações E&GA/(S)VGA"
-        BEGIN
-            MENUITEM "Monitor VGA &invertido", IDM_VID_INVERT
-            POPUP "&Tipo de tela VGA"
-            BEGIN
-                MENUITEM "&Cores RGB", IDM_VID_GRAY_RGB
-                MENUITEM "Tons de cinza &RGB", IDM_VID_GRAY_MONO
-                MENUITEM "Monitor &âmbar", IDM_VID_GRAY_AMBER
-                MENUITEM "Monitor &verde", IDM_VID_GRAY_GREEN
-                MENUITEM "Monitor &branco", IDM_VID_GRAY_WHITE
-            END
-            POPUP "Tipo de &conversão de tons de cinza"
-            BEGIN
-                MENUITEM "BT&601 (NTSC/PAL)", IDM_VID_GRAYCT_601
-                MENUITEM "BT&709 (HDTV)", IDM_VID_GRAYCT_709
-                MENUITEM "&Média", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Overscan do CGA/PCjr/Tandy/E&GA/(S)VGA", IDM_VID_OVERSCAN
-        MENUITEM "Alterar contraste para exibição &monocromática", IDM_VID_CGACON
-    END
-    MENUITEM "&Mídia", IDM_MEDIA
-    POPUP "&Ferramentas"
-    BEGIN
-        MENUITEM "&Configurações...", IDM_CONFIG
-        MENUITEM "&Atualizar ícones da barra de status", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "Capturar &tela\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "&Preferências...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "Ativar integração com o &Discord", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "&Ganho de som...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "Inicio do rastreamento\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "Fim do rastreamento\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "&Ajuda"
-    BEGIN
-        MENUITEM "&Documentação...", IDM_DOCS
-        MENUITEM "&Sobre o 86Box...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nova imagem...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Imagem existente...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "Imagem existente (&protegida contra escrita)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Gravar", IDM_CASSETTE_RECORD
-        MENUITEM "&Reproduzir", IDM_CASSETTE_PLAY
-        MENUITEM "&Rebobinar até o começo", IDM_CASSETTE_REWIND
-        MENUITEM "&Avançar até o fim", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "E&jetar", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Imagem...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "E&jetar", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nova imagem...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Imagem existente...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "Imagem existente (&protegida contra escrita)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&xportar para 86F...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "E&jetar", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Sem som", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "&Vazio", IDM_CDROM_EMPTY
-        MENUITEM "&Recarregar imagem anterior", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "&Imagem...", IDM_CDROM_IMAGE
-        MENUITEM "&Pasta...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nova imagem...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Imagem existente...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "Imagem existente (&protegida contra escrita)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&jetar", IDM_ZIP_EJECT
-        MENUITEM "&Recarregar imagem anterior", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nova imagem...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Imagem existente...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "Imagem existente (&protegida contra escrita)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&jetar", IDM_MO_EJECT
-        MENUITEM "&Recarregar imagem anterior", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Taxa de quadro pretendida"
-    BEGIN
-        MENUITEM "&Sincronizar com vídeo", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "&25 qps", IDM_VID_GL_FPS_25
-        MENUITEM "&30 qps", IDM_VID_GL_FPS_30
-        MENUITEM "&50 qps", IDM_VID_GL_FPS_50
-        MENUITEM "&60 qps", IDM_VID_GL_FPS_60
-        MENUITEM "&75 qps", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "Sincronização &vertical", IDM_VID_GL_VSYNC
-    MENUITEM "&Selecionar shader...", IDM_VID_GL_SHADER
-    MENUITEM "&Remover shader", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "Preferências"
-#define STR_SND_GAIN      "Ganho de som"
-#define STR_NEW_FLOPPY    "Nova imagem de disquete"
-#define STR_CONFIG        "Configurações"
-#define STR_SPECIFY_DIM   "Especifique as dimensões da janela principal"
-
-#define STR_OK            "OK"
-#define STR_CANCEL        "Cancelar"
-#define STR_GLOBAL        "Usar estas configurações como &padrões globais"
-#define STR_DEFAULT       "&Padrão"
-#define STR_LANGUAGE      "Idioma:"
-#define STR_ICONSET       "Pacote de ícones:"
-
-#define STR_GAIN          "Ganho"
-
-#define STR_FILE_NAME     "Nome:"
-#define STR_DISK_SIZE     "Tamanho:"
-#define STR_RPM_MODE      "Modo RPM:"
-#define STR_PROGRESS      "Progresso:"
-
-#define STR_WIDTH         "Largura:"
-#define STR_HEIGHT        "Altura:"
-#define STR_LOCK_TO_SIZE  "Travar nesse tamanho"
-
-#define STR_MACHINE_TYPE  "Tipo de máquina:"
-#define STR_MACHINE       "Máquina:"
-#define STR_CONFIGURE     "Configurar"
-#define STR_CPU_TYPE      "Tipo de CPU:"
-#define STR_CPU_SPEED     "Veloc.:"
-#define STR_FPU           "FPU:"
-#define STR_WAIT_STATES   "Estados de espera:"
-#define STR_MB            "MB"
-#define STR_MEMORY        "Memória:"
-#define STR_TIME_SYNC     "Sincronização da hora"
-#define STR_DISABLED      "Desativar"
-#define STR_ENABLED_LOCAL "Ativar (hora local)"
-#define STR_ENABLED_UTC   "Ativar (UTC)"
-#define STR_DYNAREC       "Recompilador dinâmico"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "Vídeo:"
-#define STR_VIDEO_2       "Vídeo 2:"
-#define STR_VOODOO        "3DFX Voodoo"
-#define STR_IBM8514       "Gráficos IBM 8514/A"
-#define STR_XGA           "Gráficos XGA"
-
-#define STR_MOUSE         "Mouse:"
-#define STR_JOYSTICK      "Joystick:"
-#define STR_JOY1          "Joystick 1..."
-#define STR_JOY2          "Joystick 2..."
-#define STR_JOY3          "Joystick 3..."
-#define STR_JOY4          "Joystick 4..."
-
-#define STR_SOUND1        "Placa de som 1:"
-#define STR_SOUND2        "Placa de som 2:"
-#define STR_SOUND3        "Placa de som 3:"
-#define STR_SOUND4        "Placa de som 4:"
-#define STR_MIDI_OUT      "Disp. saída MIDI:"
-#define STR_MIDI_IN       "Disp. entrada MIDI:"
-#define STR_MPU401        "MPU-401 autônomo"
-#define STR_FLOAT         "Usar som FLOAT32"
-#define STR_FM_DRIVER     "Controlador de sint. FM"
-#define STR_FM_DRV_NUKED  "Nuked (mais preciso)"
-#define STR_FM_DRV_YMFM   "YMFM (mais rápido)"
-
-#define STR_NET_TYPE      "Tipo de rede:"
-#define STR_PCAP          "Dispositivo PCap:"
-#define STR_NET           "Adaptador de rede:"
-#define STR_NET1          "Placa de rede 1:"
-#define STR_NET2          "Placa de rede 2:"
-#define STR_NET3          "Placa de rede 3:"
-#define STR_NET4          "Placa de rede 4:"
-
-#define STR_COM1          "Dispositivo COM1:"
-#define STR_COM2          "Dispositivo COM2:"
-#define STR_COM3          "Dispositivo COM3:"
-#define STR_COM4          "Dispositivo COM4:"
-#define STR_LPT1          "Dispositivo LPT1:"
-#define STR_LPT2          "Dispositivo LPT2:"
-#define STR_LPT3          "Dispositivo LPT3:"
-#define STR_LPT4          "Dispositivo LPT4:"
-#define STR_SERIAL1       "Porta serial 1"
-#define STR_SERIAL2       "Porta serial 2"
-#define STR_SERIAL3       "Porta serial 3"
-#define STR_SERIAL4       "Porta serial 4"
-#define STR_PARALLEL1     "Porta paralela 1"
-#define STR_PARALLEL2     "Porta paralela 2"
-#define STR_PARALLEL3     "Porta paralela 3"
-#define STR_PARALLEL4     "Porta paralela 4"
-#define STR_SERIAL_PASS1  "Encaminhamento de porta serial 1"
-#define STR_SERIAL_PASS2  "Encaminhamento de porta serial 2"
-#define STR_SERIAL_PASS3  "Encaminhamento de porta serial 3"
-#define STR_SERIAL_PASS4  "Encaminhamento de porta serial 4"
-
-#define STR_HDC           "Controlador HD:"
-#define STR_FDC           "Controlador FD:"
-#define STR_IDE_TER       "Controlador IDE terciário"
-#define STR_IDE_QUA       "Controlador IDE quaternário"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "Controlador 1:"
-#define STR_SCSI_2        "Controlador 2:"
-#define STR_SCSI_3        "Controlador 3:"
-#define STR_SCSI_4        "Controlador 4:"
-#define STR_CASSETTE      "Cassete"
-
-#define STR_HDD           "Discos rígidos:"
-#define STR_NEW           "&Novo..."
-#define STR_EXISTING      "&Existente..."
-#define STR_REMOVE        "&Remover"
-#define STR_BUS           "Bar.:"
-#define STR_CHANNEL       "Canal:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Velocidade:"
-
-#define STR_SPECIFY       "&Especificar..."
-#define STR_SECTORS       "Setores:"
-#define STR_HEADS         "Cabeças:"
-#define STR_CYLS          "Cilindros:"
-#define STR_SIZE_MB       "Tamanho (MB):"
-#define STR_TYPE          "Tipo:"
-#define STR_IMG_FORMAT    "Formato:"
-#define STR_BLOCK_SIZE    "Blocos:"
-
-#define STR_FLOPPY_DRIVES "Unidades de disquete:"
-#define STR_TURBO         "Turbo"
-#define STR_CHECKBPB      "Verificar BPB"
-#define STR_CDROM_DRIVES  "Unidades de CD-ROM:"
-#define STR_CD_SPEED      "Veloc.:"
-
-#define STR_MO_DRIVES     "Unidades magneto-ópticas:"
-#define STR_ZIP_DRIVES    "Unidades ZIP:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "RTC ISA:"
-#define STR_ISAMEM        "Expansão de memória ISA"
-#define STR_ISAMEM_1      "Placa 1:"
-#define STR_ISAMEM_2      "Placa 2:"
-#define STR_ISAMEM_3      "Placa 3:"
-#define STR_ISAMEM_4      "Placa 4:"
-#define STR_BUGGER        "Dispositivo ISABugger"
-#define STR_POSTCARD      "Placa de diagnóstico"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Segoe UI"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "Erro"
-    IDS_2050    "Erro fatal"
-    IDS_2051    " - PAUSADO"
-    IDS_2052    "Use Ctrl+Alt+PgDn para retornar ao modo janela"
-    IDS_2053    "Velocidade"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "Imagens ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "O 86Box não conseguiu encontrar nenhuma imagem de ROM utilizável.\n\nPor favor, <a href=""https://github.com/86Box/roms/releases/latest"">baixe</a> um conjunto de ROM e extraia no diretório ""roms""."
-    IDS_2057    "(vazio)"
-    IDS_2058    "Imagens ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0Todos os arquivos (*.*)\0*.*\0"
-    IDS_2059    "Turbo"
-    IDS_2060    "Lig."
-    IDS_2061    "Desl."
-    IDS_2062    "Todas as imagens (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Imagens de setor básico (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Imagens de superfície (*.86F)\0*.86F\0"
-    IDS_2063    "A máquina ""%hs"" não está disponível devido à falta de ROMs no diretório roms/machines. Mudando para uma máquina disponível."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "A placa de vídeo ""%hs"" não está disponível devido à falta de ROMs no diretório roms/video. Mudando para uma placa de vídeo disponível."
-    IDS_2065    "Máquina"
-    IDS_2066    "Vídeo"
-    IDS_2067    "Dispositivos de entrada"
-    IDS_2068    "Som"
-    IDS_2069    "Rede"
-    IDS_2070    "Portas (COM & LPT)"
-    IDS_2071    "Controladores de armaz."
-    IDS_2072    "Discos rígidos"
-    IDS_2073    "Disquete & CD-ROM"
-    IDS_2074    "Dispos. removíveis"
-    IDS_2075    "Outros periféricos"
-    IDS_2076    "Imagens de superfície (*.86F)\0*.86F\0"
-    IDS_2077    "Clique para capturar o mouse"
-    IDS_2078    "Aperte F8+F12 para liberar o mouse"
-    IDS_2079    "Aperte F8+F12 ou botão do meio para liberar o mouse"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "Barramento"
-    IDS_2082    "Arquivo"
-    IDS_2083    "CI"
-    IDS_2084    "CA"
-    IDS_2085    "SE"
-    IDS_2086    "MB"
-    IDS_2087    "Velocidade"
-    IDS_2088    "Verificar BPB"
-    IDS_2089    "KB"
-    IDS_2090    "Não foi possível inicializar o renderizador de vídeo."
-    IDS_2091    "Padrão"
-    IDS_2092    "%i estado(s) de espera"
-    IDS_2093    "Tipo"
-    IDS_2094    "Não foi possível configurar o PCap"
-    IDS_2095    "Nenhum dispositivo PCap encontrado"
-    IDS_2096    "Dispositivo PCap inválido"
-    IDS_2097    "Joystick padrão de 2 botões"
-    IDS_2098    "Joystick padrão de 4 botões"
-    IDS_2099    "Joystick padrão de 6 botões"
-    IDS_2100    "Joystick padrão de 8 botões"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Sistema de Controle de Voo Thrustmaster"
-    IDS_2104    "Nada"
-    IDS_2105    "Não foi possível carregar os aceleradores do teclado."
-    IDS_2106    "Não foi possível registrar a entrada bruta."
-    IDS_2107    "%u"
-    IDS_2108    "%u MB (CHS: %i, %i, %i)"
-    IDS_2109    "Disquete %i (%s): %ls"
-    IDS_2110    "Todas as imagens (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Imagens de setor avançado (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Imagens de setor básico (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Imagens de fluxo (*.FDI)\0*.FDI\0Imagens de superfície (*.86F;*.MFM)\0*.86F;*.MFM\0Todos os arquivos (*.*)\0*.*\0"
-    IDS_2112    "Não é possível inicializar o SDL, é necessário o SDL2.dll"
-    IDS_2113    "Tem certeza de que deseja reiniciar completamente a máquina emulada?"
-    IDS_2114    "Tem certeza de que deseja sair do 86Box?"
-    IDS_2115    "Não é possível inicializar o Ghostscript"
-    IDS_2116    "Magneto-óptico %i (%ls): %ls"
-    IDS_2117    "Imagens magneto-ópticas (*.IM?;*.MDI)\0*.IM?;*.MDI\0Todos os arquivos (*.*)\0*.*\0"
-    IDS_2118    "Bem-vindo ao 86Box!"
-    IDS_2119    "Controlador interno"
-    IDS_2120    "Sair"
-    IDS_2121    "Nenhum ROM encontrada"
-    IDS_2122    "Você deseja salvar as configurações?"
-    IDS_2123    "Isto fará com que a máquina emulada seja reinicializada."
-    IDS_2124    "Salvar"
-    IDS_2125    "Sobre o 86Box"
-    IDS_2126    "86Box versão" EMU_VERSION
-
-    IDS_2127    "Um emulador de computadores antigos\n\nAutores: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, e outros.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, e outros.\n\nTraduzido por: Altieres Lima da Silva\n\nLançado sob a Licença Pública Geral GNU versão 2 ou posterior. Veja o arquivo LICENSE para mais informações."
-    IDS_2128    "OK"
-    IDS_2129    "Hardware não disponível"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "Certifique-se de que " LIB_NAME_PCAP " esteja instalado e que você tenha uma conexão de rede compatível com " LIB_NAME_PCAP "."
-    IDS_2131    "Configuração inválida"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " é necessário para a conversão automática de arquivos PostScript para PDF.\n\nQualquer documento enviado para a impressora genérica PostScript será salvo como arquivos PostScript (.ps)."
-    IDS_2135    "Entrando no modo de tela cheia"
-    IDS_2136    "Não exibir esta mensagem novamente"
-    IDS_2137    "Não sair"
-    IDS_2138    "Reiniciar"
-    IDS_2139    "Não reiniciar"
-    IDS_2140    "Imagens magneto-ópticas (*.IM?;*.MDI)\0*.IM?;*.MDI\0Todos os arquivos (*.*)\0*.*\0"
-    IDS_2141    "Imagens de CD-ROM (*.ISO;*.CUE)\0*.ISO;*.CUE\0Todos os arquivos (*.*)\0*.*\0"
-    IDS_2142    "Configuração do dispositivo %hs"
-    IDS_2143    "Monitor em modo de suspensão"
-    IDS_2144    "Shaders OpenGL (*.GLSL)\0*.GLSL\0Todos os arquivos (*.*)\0*.*\0"
-    IDS_2145    "Opções do OpenGL"
-    IDS_2146    "Você está carregando uma configuração não suportada"
-    IDS_2147    "A filtragem do tipo CPU baseada na máquina selecionada é desativada para esta máquina emulada.\n\nIsto torna possível escolher uma CPU que de outra forma seria incompatível com a máquina selecionada. Entretanto, você pode encontrar incompatibilidades com a BIOS da máquina ou outro software.\n\nA ativação desta configuração não é oficialmente suportada e qualquer relatório de erro arquivado pode ser fechado como inválido."
-    IDS_2148    "Continuar"
-    IDS_2149    "Cassete: %s"
-    IDS_2150    "Imagens de cassete (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0Todos os arquivos (*.*)\0*.*\0"
-    IDS_2151    "Cartucho %i: %ls"
-    IDS_2152    "Imagens de cartucho (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0Todos os arquivos (*.*)\0*.*\0"
-    IDS_2153    "Erro ao inicializar o renderizador"
-    IDS_2154    "O renderizador OpenGL (Núcleo 3.0) não pôde ser inicializado. Use outro renderizador."
-    IDS_2155    "Continuar a execução"
-    IDS_2156    "Pausar a execução"
-    IDS_2157    "Pressionar Ctrl+Alt+Del"
-    IDS_2158    "Pressionar Ctrl+Alt+Esc"
-    IDS_2159    "Reinicialização completa"
-    IDS_2160    "Desligamento por ACPI"
-    IDS_2161    "Configurações"
-    IDS_2162    "Tipo"
-    IDS_2163    "Sem recompilador dinâmico"
-    IDS_2164    "Recompilador dinâmico antigo"
-    IDS_2165    "Novo recompilador dinâmico"
-    IDS_2166    "A placa de vídeo #2 ""%hs"" não está disponível devido à ausência de ROMs no diretório roms/video. Desabilitando a segunda placa de vídeo."
-    IDS_2167    "Falha ao inicializar o driver de rede"
-    IDS_2168    "A configuração de rede será alterada para o driver nulo"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "Disco rígido (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "As unidades de CD-ROM MFM/RLL ou ESDI nunca existiram"
-    IDS_4100    "Personalizado..."
-    IDS_4101    "Personalizado (grande)..."
-    IDS_4102    "Adicionar novo disco rígido"
-    IDS_4103    "Adicionar disco rígido existente"
-    IDS_4104    "As imagens de disco HDI não podem ser maiores do que 4GB."
-    IDS_4105    "As imagens de disco não podem ser maiores do que 127GB."
-    IDS_4106    "Imagens de disco rígido (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0Todos os arquivos (*.*)\0*.*\0"
-    IDS_4107    "Não foi possível ler o arquivo"
-    IDS_4108    "Não foi possível escrever o arquivo"
-    IDS_4109    "Imagens HDI ou HDX com um tamanho de setor que não seja 512 não são suportadas."
-    IDS_4110    "O USB ainda não é suportado"
-    IDS_4111    "Esta imagem existe"
-    IDS_4112    "Digite um nome de arquivo válido."
-    IDS_4113    "A imagem foi criada com sucesso"
-    IDS_4114    "Certifique-se de que o arquivo existe e é legível."
-    IDS_4115    "Certifique-se de que o arquivo está sendo salvo em um diretório gravável."
-    IDS_4116    "A imagem do disco é muito grande"
-    IDS_4117    "Lembre-se de particionar e formatar a unidade recém-criada."
-    IDS_4118    "O arquivo selecionado será sobrescrito. Você tem certeza de que deseja usá-lo?"
-    IDS_4119    "Imagem de disco sem suporte"
-    IDS_4120    "Sobrescrever"
-    IDS_4121    "Não sobrescrever"
-    IDS_4122    "Imagem bruta (.img)"
-    IDS_4123    "Imagem HDI (.hdi)"
-    IDS_4124    "Imagem HDX (.hdx)"
-    IDS_4125    "VHD de tamanho fixo (.vhd)"
-    IDS_4126    "VHD de tamanho dinâmico (.vhd)"
-    IDS_4127    "VHD diferencial (.vhd)"
-    IDS_4128    "Blocos grandes (2 MB)"
-    IDS_4129    "Blocos pequenos (512 KB)"
-    IDS_4130    "Arquivos VHD (*.VHD)\0*.VHD\0Todos os arquivos (*.*)\0*.*\0"
-    IDS_4131    "Selecione o VHD pai"
-    IDS_4132    "Isto pode significar que a imagem de origem foi modificada após a criação da imagem diferencial.\n\nTambém pode acontecer caso os arquivos de imagem tenham sido movidos ou copiados, ou por um erro no programa que criou este disco.\n\nVocê quer consertar os marcadores de tempo?"
-    IDS_4133    "A data/hora dos arquivos de pais e filhos não correspondem"
-    IDS_4134    "Não foi possível consertar o carimbo de data/hora da VHD."
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "Desativado"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "Desativado"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 kB"
-    IDS_5889    "180 kB"
-    IDS_5890    "320 kB"
-    IDS_5891    "360 kB"
-    IDS_5892    "640 kB"
-    IDS_5893    "720 kB"
-    IDS_5894    "1.2 MB"
-    IDS_5895    "1.25 MB"
-    IDS_5896    "1.44 MB"
-    IDS_5897    "DMF (cluster 1024)"
-    IDS_5898    "DMF (cluster 2048)"
-    IDS_5899    "2.88 MB"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5"" 128 MB (ISO 10090)"
-    IDS_5903    "3.5"" 230 MB (ISO 13963)"
-    IDS_5904    "3.5"" 540 MB (ISO 15498)"
-    IDS_5905    "3.5"" 640 MB (ISO 15498)"
-    IDS_5906    "3.5"" 1.3 GB (GigaMO)"
-    IDS_5907    "3.5"" 2.3 GB (GigaMO 2)"
-    IDS_5908    "5.25"" 600 MB"
-    IDS_5909    "5.25"" 650 MB"
-    IDS_5910    "5.25"" 1 GB"
-    IDS_5911    "5.25"" 1.3 GB"
-
-    IDS_6144    "RPM perfeita"
-    IDS_6145    "1% abaixo das RPM perfeita"
-    IDS_6146    "1.5% abaixo das RPM perfeita"
-    IDS_6147    "2% abaixo das RPM perfeita"
-
-    IDS_7168    "(Padrão do sistema)"
-END
-#define IDS_LANG_ENUS IDS_7168
-
-// Portuguese (pt-BR) resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/pt-PT.rc b/src/win/languages/pt-PT.rc
deleted file mode 100644
index e4394b0cb..000000000
--- a/src/win/languages/pt-PT.rc
+++ /dev/null
@@ -1,637 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Portuguese (Portugal) resources
-
-#ifdef _WIN32
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Ação"
-    BEGIN
-        MENUITEM "&Teclado requere captura", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "&CTRL direito é ALT esquerdo",IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "&Reinicialização completa...",IDM_ACTION_HRESET
-        MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-    MENUITEM "Ctrl+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "&Pausa", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "&Sair...", IDM_ACTION_EXIT
-    END
-    POPUP "&Ver"
-    BEGIN
-        MENUITEM "&Ocultar barra de estado", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
-        MENUITEM "&Janela redimensionável", IDM_VID_RESIZE
-        MENUITEM "&Lembrar tamanho e posição", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "&Renderizador"
-        BEGIN
-            MENUITEM "&SDL (Software)", IDM_VID_SDL_SW
-            MENUITEM "SDL (&Hardware)", IDM_VID_SDL_HW
-            MENUITEM "SDL (&OpenGL)", IDM_VID_SDL_OPENGL
-            MENUITEM "Open&GL (Núcleo 3.0)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "&VNC", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "&Especificar dimensões...", IDM_VID_SPECIFY_DIM
-        MENUITEM "&Forçar rácio de visualização 4:3", IDM_VID_FORCE43
-        POPUP "F&actor de escala de janela"
-        BEGIN
-            MENUITEM "&0.5x", IDM_VID_SCALE_1X
-            MENUITEM "&1x", IDM_VID_SCALE_2X
-            MENUITEM "1.&5x", IDM_VID_SCALE_3X
-            MENUITEM "&2x", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "Método de filtragem"
-        BEGIN
-            MENUITEM "&Mais próximo", IDM_VID_FILTER_NEAREST
-            MENUITEM "&Linear", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "Escala Hi&DPI", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "E&crã cheio\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "Modo &de estiramento em ecrã cheio"
-        BEGIN
-            MENUITEM "&Estiramento em ecrã cheio", IDM_VID_FS_FULL
-            MENUITEM "&4:3", IDM_VID_FS_43
-            MENUITEM "Pixels &quadrados (Manter rácio)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "Escala &inteira", IDM_VID_FS_INT
-        END
-        POPUP "Definições E&GA/(S)VGA"
-        BEGIN
-            MENUITEM "Monitor VGA &invertido", IDM_VID_INVERT
-            POPUP "&Tipo de ecrã VGA"
-            BEGIN
-                MENUITEM "&Cores RGB", IDM_VID_GRAY_RGB
-                MENUITEM "&RGB em escala de cinzentos", IDM_VID_GRAY_MONO
-                MENUITEM "Monitor âmb&ar", IDM_VID_GRAY_AMBER
-                MENUITEM "Monitor &verde", IDM_VID_GRAY_GREEN
-                MENUITEM "Monitor &branco", IDM_VID_GRAY_WHITE
-            END
-            POPUP "Tipo de &conversão para escala de cinzentos"
-            BEGIN
-                MENUITEM "BT&601 (NTSC/PAL)", IDM_VID_GRAYCT_601
-                MENUITEM "BT&709 (HDTV)", IDM_VID_GRAYCT_709
-                MENUITEM "&Media", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Overscan de CGA/PCjr/Tandy/E&GA/(S)VGA", IDM_VID_OVERSCAN
-        MENUITEM "Mudar &contraste para ecrã monocromático", IDM_VID_CGACON
-    END
-    MENUITEM "&Media", IDM_MEDIA
-    POPUP "&Ferramentas"
-    BEGIN
-        MENUITEM "&Definições...", IDM_CONFIG
-        MENUITEM "&Atualizar ícones da barra de estado", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "Gravar imagem de ecrã\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "&Preferências...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "Ativar integração com &Discord", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "&Ganho de som...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "Iniciar o rastreio\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "Terminar o rastreio\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "&Ajuda"
-    BEGIN
-        MENUITEM "&Documentação...", IDM_DOCS
-        MENUITEM "&Acerca do 86Box...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nova imagem...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "Imagem &existente...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "Imagem existente (&Proteção contra escrita)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Gravar", IDM_CASSETTE_RECORD
-        MENUITEM "&Reproduzir", IDM_CASSETTE_PLAY
-        MENUITEM "Re&bobinar para o início", IDM_CASSETTE_REWIND
-        MENUITEM "&Avanço rápido para o fim", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "E&jetar", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Imagem...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "E&jetar", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nova imagem...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "Imagem &existente...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "Imagem existente (&Proteção contra escrita)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&xportar para 86F...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "E&jetar", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Mute", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "&CDROM vazio", IDM_CDROM_EMPTY
-        MENUITEM "&Recarregar imagem anterior", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "&Imagem...", IDM_CDROM_IMAGE
-        MENUITEM "&Pasta...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nova imagem...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "Imagem &existente...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "Imagem existente (&Proteção contra escrita)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&jetar", IDM_ZIP_EJECT
-        MENUITEM "&Recarregar imagem anterior", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nova imagem...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "Imagem &existente...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "Imagem existente (&Proteção contra escrita)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "E&jetar", IDM_MO_EJECT
-        MENUITEM "&Recarregar imagem anterior", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Taxa de quadros de destino"
-    BEGIN
-        MENUITEM "&Sincronizar com vídeo", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "&25 q/s", IDM_VID_GL_FPS_25
-        MENUITEM "&30 q/s", IDM_VID_GL_FPS_30
-        MENUITEM "&50 q/s", IDM_VID_GL_FPS_50
-        MENUITEM "&60 q/s", IDM_VID_GL_FPS_60
-        MENUITEM "&75 q/s", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "&VSync", IDM_VID_GL_VSYNC
-    MENUITEM "&Selecionar shader...", IDM_VID_GL_SHADER
-    MENUITEM "&Remover shader", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "Preferências"
-#define STR_SND_GAIN      "Ganho de som"
-#define STR_NEW_FLOPPY    "Nova imagem"
-#define STR_CONFIG        "Definições"
-#define STR_SPECIFY_DIM   "Especificar dimensões da janela principal"
-
-#define STR_OK            "OK"
-#define STR_CANCEL        "Cancelar"
-#define STR_GLOBAL        "Guardar estas definições como padrões &globais"
-#define STR_DEFAULT       "&Padrão"
-#define STR_LANGUAGE      "Idioma:"
-#define STR_ICONSET       "Pacote de ícones:"
-
-#define STR_GAIN          "Ganho"
-
-#define STR_FILE_NAME     "Nome:"
-#define STR_DISK_SIZE     "Tamanho:"
-#define STR_RPM_MODE      "Modo RPM:"
-#define STR_PROGRESS      "Progresso:"
-
-#define STR_WIDTH         "Largura:"
-#define STR_HEIGHT        "Altura:"
-#define STR_LOCK_TO_SIZE  "Fixar neste tamanho"
-
-#define STR_MACHINE_TYPE  "Tipo de máquina:"
-#define STR_MACHINE       "Máquina:"
-#define STR_CONFIGURE     "Configurar"
-#define STR_CPU_TYPE      "Tipo do CPU:"
-#define STR_CPU_SPEED     "Velocidade:"
-#define STR_FPU           "FPU:"
-#define STR_WAIT_STATES   "Estados de espera:"
-#define STR_MB            "MB"
-#define STR_MEMORY        "Memória:"
-#define STR_TIME_SYNC     "Sincronização da hora"
-#define STR_DISABLED      "Desativada"
-#define STR_ENABLED_LOCAL "Ativada (hora local)"
-#define STR_ENABLED_UTC   "Ativada (UTC)"
-#define STR_DYNAREC       "Recompilador dinâmico"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "Vídeo:"
-#define STR_VIDEO_2       "Vídeo 2:"
-#define STR_VOODOO        "Gráficos Voodoo"
-#define STR_IBM8514       "Gráficos IBM 8514/A"
-#define STR_XGA           "Gráficos XGA"
-
-#define STR_MOUSE         "Rato:"
-#define STR_JOYSTICK      "Joystick:"
-#define STR_JOY1          "Joystick 1..."
-#define STR_JOY2          "Joystick 2..."
-#define STR_JOY3          "Joystick 3..."
-#define STR_JOY4          "Joystick 4..."
-
-#define STR_SOUND1        "Placa de som 1:"
-#define STR_SOUND2        "Placa de som 2:"
-#define STR_SOUND3        "Placa de som 3:"
-#define STR_SOUND4        "Placa de som 4:"
-#define STR_MIDI_OUT      "Disp. saída MIDI:"
-#define STR_MIDI_IN       "Disp. entrada MIDI:"
-#define STR_MPU401        "MPU-401 autónomo"
-#define STR_FLOAT         "Utilizar som FLOAT32"
-#define STR_FM_DRIVER     "Controlador de sint. FM"
-#define STR_FM_DRV_NUKED  "Nuked (mais exacto)"
-#define STR_FM_DRV_YMFM   "YMFM (mais rápido)"
-
-#define STR_NET_TYPE      "Tipo de rede:"
-#define STR_PCAP          "Dispositivo PCap:"
-#define STR_NET           "Placa de rede:"
-#define STR_NET1          "Network card 1:"
-#define STR_NET2          "Network card 2:"
-#define STR_NET3          "Network card 3:"
-#define STR_NET4          "Network card 4:"
-
-#define STR_COM1          "Dispositivo COM1:"
-#define STR_COM2          "Dispositivo COM2:"
-#define STR_COM3          "Dispositivo COM3:"
-#define STR_COM4          "Dispositivo COM4:"
-#define STR_LPT1          "Dispositivo LPT1:"
-#define STR_LPT2          "Dispositivo LPT2:"
-#define STR_LPT3          "Dispositivo LPT3:"
-#define STR_LPT4          "Dispositivo LPT4:"
-#define STR_SERIAL1       "Porta de série 1"
-#define STR_SERIAL2       "Porta de série 2"
-#define STR_SERIAL3       "Porta de série 3"
-#define STR_SERIAL4       "Porta de série 4"
-#define STR_PARALLEL1     "Porta paralela 1"
-#define STR_PARALLEL2     "Porta paralela 2"
-#define STR_PARALLEL3     "Porta paralela 3"
-#define STR_PARALLEL4     "Porta paralela 4"
-#define STR_SERIAL_PASS1  "Serial port passthrough 1"
-#define STR_SERIAL_PASS2  "Serial port passthrough 2"
-#define STR_SERIAL_PASS3  "Serial port passthrough 3"
-#define STR_SERIAL_PASS4  "Serial port passthrough 4"
-
-#define STR_HDC           "Controlador HD:"
-#define STR_FDC           "Controlador FD:"
-#define STR_IDE_TER       "Controlador IDE terciário"
-#define STR_IDE_QUA       "Controlador IDE quaternário"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "Controlador 1:"
-#define STR_SCSI_2        "Controlador 2:"
-#define STR_SCSI_3        "Controlador 3:"
-#define STR_SCSI_4        "Controlador 4:"
-#define STR_CASSETTE      "Cassete"
-
-#define STR_HDD           "Discos rígidos:"
-#define STR_NEW           "&Novo..."
-#define STR_EXISTING      "&Existente..."
-#define STR_REMOVE        "&Remover"
-#define STR_BUS           "Barram.:"
-#define STR_CHANNEL       "Canal:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Speed:"
-
-#define STR_SPECIFY       "&Especificar..."
-#define STR_SECTORS       "Sectores:"
-#define STR_HEADS         "Cabeças:"
-#define STR_CYLS          "Cilindros:"
-#define STR_SIZE_MB       "Tamanho (MB):"
-#define STR_TYPE          "Tipo:"
-#define STR_IMG_FORMAT    "Formato de imagem:"
-#define STR_BLOCK_SIZE    "Tamanho de bloco:"
-
-#define STR_FLOPPY_DRIVES "Unidades de disquete:"
-#define STR_TURBO         "Velocidade turbo"
-#define STR_CHECKBPB      "Verificar BPB"
-#define STR_CDROM_DRIVES  "Unidades CD-ROM:"
-#define STR_CD_SPEED      "Velocidade:"
-
-#define STR_MO_DRIVES     "Unidades magneto-ópticas:"
-#define STR_ZIP_DRIVES    "Unidades ZIP:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "ISA RTC:"
-#define STR_ISAMEM        "Expansão de memória ISA"
-#define STR_ISAMEM_1      "Placa 1:"
-#define STR_ISAMEM_2      "Placa 2:"
-#define STR_ISAMEM_3      "Placa 3:"
-#define STR_ISAMEM_4      "Placa 4:"
-#define STR_BUGGER        "Dispositivo ISABugger"
-#define STR_POSTCARD      "Placa POST"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Segoe UI"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "Erro"
-    IDS_2050    "Erro fatal"
-    IDS_2051    " - PAUSED"
-    IDS_2052    "Pressione Ctrl+Alt+PgDn para voltar ao modo de janela."
-    IDS_2053    "Velocidade"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "Imagens ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "O 86Box não conseguiu encontrar nenhuma imagem ROM utilizável.\n\nPor favor, vá a href=""https://github.com/86Box/roms/releases/latest"">descarregue</a> um pacote ROM e instale-o na pasta ""roms""."
-    IDS_2057    "(empty)"
-    IDS_2058    "Imagens ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0Todos os ficheiros (*.*)\0*.*\0"
-    IDS_2059    "Turbo"
-    IDS_2060    "Ativado"
-    IDS_2061    "Desativado"
-    IDS_2062    "Todas as imagens (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Imagens básicas de sector (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Imagens de superfície (*.86F)\0*.86F\0"
-    IDS_2063    "A máquina ""%hs"" não está disponível devido à falta de ROMs na pasta roms/machines. A mudar para uma máquina disponível."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "A placa vídeo ""%hs"" não está disponível devido à falta de ROMs na pasta roms/video. A mudar para uma placa vídeo disponível."
-    IDS_2065    "Máquina"
-    IDS_2066    "Apresentação"
-    IDS_2067    "Dispositivos de entrada"
-    IDS_2068    "Som"
-    IDS_2069    "Rede"
-    IDS_2070    "Portas (COM e LPT)"
-    IDS_2071    "Dispositivos de armazenamento"
-    IDS_2072    "Discos rígidos"
-    IDS_2073    "Unidades de disquete e CD-ROM"
-    IDS_2074    "Outros dispostivos removíveis"
-    IDS_2075    "Outros dispositivos"
-    IDS_2076    "Imagens de superfície (*.86F)\0*.86F\0"
-    IDS_2077    "Clique para capturar o rato"
-    IDS_2078    "Pressione F8+F12 para soltar o rato"
-    IDS_2079    "Pressione F8+F12 ou tecla média para soltar o rato"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "Barramento"
-    IDS_2082    "Ficheiro"
-    IDS_2083    "C"
-    IDS_2084    "C"
-    IDS_2085    "S"
-    IDS_2086    "MB"
-    IDS_2087    "Speed"
-    IDS_2088    "Verificar BPB"
-    IDS_2089    "KB"
-    IDS_2090    "Não foi possível inicializar o renderizador vídeo."
-    IDS_2091    "Padrão"
-    IDS_2092    "%i estado(s) de espera"
-    IDS_2093    "Tipo"
-    IDS_2094    "Falha na configuração de PCap"
-    IDS_2095    "Não foi encontrado um dispositivo PCap"
-    IDS_2096    "Dispositivo PCap inválido"
-    IDS_2097    "Joystick(s) standard de 2 botões"
-    IDS_2098    "Joystick(s) standard de 4 botões"
-    IDS_2099    "Joystick(s) standard de 6 botões"
-    IDS_2100    "Joystick(s) standard de 8 botões"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Thrustmaster Flight Control System"
-    IDS_2104    "Nenhum"
-    IDS_2105    "Não foi possível inicializar os aceleradores de teclado."
-    IDS_2106    "Não foi possível registar a entrada bruta."
-    IDS_2107    "%u"
-    IDS_2108    "%u MB (CCS: %i, %i, %i)"
-    IDS_2109    "Disquete %i (%s): %ls"
-    IDS_2110    "Todas as imagens (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Imagens avançadas de sector (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Imagens básicas de sector (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Imagens de fluxo (*.FDI)\0*.FDI\0Imagens de superfície (*.86F;*.MFM)\0*.86F;*.MFM\0Todos os ficheiros (*.*)\0*.*\0"
-    IDS_2112    "Não foi possível inicializar o SDL. O ficheiro SDL2.dll é necessário!"
-    IDS_2113    "Tem a certeza de que quer um reinício completo da máquina emulada?"
-    IDS_2114    "Tem a certeza de que quer sair do 86Box?"
-    IDS_2115    "Não foi possível inicializar o Ghostscript"
-    IDS_2116    "Magneto-óptico %i (%ls): %ls"
-    IDS_2117    "Imagens magneto-ópticas (*.IM?;*.MDI)\0*.IM?;*.MDI\0Todas as imagens (*.*)\0*.*\0"
-    IDS_2118    "Bem-vindos ao 86Box!"
-    IDS_2119    "Controlador interno"
-    IDS_2120    "Sair"
-    IDS_2121    "Não foi encontrada nenhuma ROM"
-    IDS_2122    "Deseja guardar as definições?"
-    IDS_2123    "Isto irá causar um reinício completo da máquina emulada."
-    IDS_2124    "Guardar"
-    IDS_2125    "Acerca do 86Box"
-    IDS_2126    "86Box v" EMU_VERSION
-
-    IDS_2127    "Um emulador de computadores antigos\n\nAutores: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nUsado sob a licença GNU General Public License versão 2 ou posterior. Veja o ficheiro LICENSE para mais informações."
-    IDS_2128    "OK"
-    IDS_2129    "Hardware não disponível"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "Certifique-se de que a biblioteca " LIB_NAME_PCAP " está instalada e de que está a utilizar uma ligação de rede compatível com a biblioteca " LIB_NAME_PCAP "."
-    IDS_2131    "Configuração inválida"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " é requerido para a conversão automática de ficheiros PostScript para ficheiros PDF.\n\nQualquer documento enviado para a impressora PostScript genérica será gravado como um ficheiro PostScript (.ps)."
-    IDS_2135    "A entrar no modo de ecrã cheio"
-    IDS_2136    "Não mostrar mais esta mensagem"
-    IDS_2137    "Não sair"
-    IDS_2138    "Reiniciar"
-    IDS_2139    "Não reiniciar"
-    IDS_2140    "Imagens magneto-ópticas (*.IM?;*.MDI)\0*.IM?;*.MDI\0Todos os ficheiros (*.*)\0*.*\0"
-    IDS_2141    "Imagens CD-ROM (*.ISO;*.CUE)\0*.ISO;*.CUE\0Todos os ficheiros (*.*)\0*.*\0"
-    IDS_2142    "Configuração de dispositivo %hs"
-    IDS_2143    "Ecrã em modo de sono"
-    IDS_2144    "Shaders OpenGL (*.GLSL)\0*.GLSL\0Todos os ficheiros (*.*)\0*.*\0"
-    IDS_2145    "Opções de OpenGL"
-    IDS_2146    "Está a carregar uma configuração sem suporte!"
-    IDS_2147    "A filtragem do tipo de CPU baseada na máquina escolhida está desativada para esta máquina emulada.\n\nIsto torna possível escolher um CPU que, de outra forma, não seria compatível com a máquina escolhida. No entanto, pode não ser compatível com a BIOS da máquina ou outros programas.\n\nA activação desta definição não tem suporte oficial e qualquer relatório de erros pode ser fechado como inválido."
-    IDS_2148    "Continuar"
-    IDS_2149    "Cassete: %s"
-    IDS_2150    "Imagens de cassete (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0Todos os ficheiros (*.*)\0*.*\0"
-    IDS_2151    "Cartucho %i: %ls"
-    IDS_2152    "Imagens de cartucho (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0Todos os ficheiros (*.*)\0*.*\0"
-    IDS_2153    "Erro na inicialização do renderizador"
-    IDS_2154    "Não foi possível inicializar o renderizador OpenGL (3.0 Core). Utilize outro renderizador."
-    IDS_2155    "Retomar execução"
-    IDS_2156    "Pausar execução"
-    IDS_2157    "Ctrl+Alt+Del"
-    IDS_2158    "Ctrl+Alt+Esc"
-    IDS_2159    "Reinicialização completa"
-    IDS_2160    "Encerramento ACPI"
-    IDS_2161    "Definições"
-    IDS_2162    "Type"
-    IDS_2163    "No Dynarec"
-    IDS_2164    "Old Dynarec"
-    IDS_2165    "New Dynarec"
-    IDS_2166    "Video card #2 ""%hs"" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
-    IDS_2167    "Failed to initialize network driver"
-    IDS_2168    "The network configuration will be switched to the null driver"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "Disco rígido (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "Unidades CD-ROM com barramento MFM/RLL ou ESDI nunca existiram!"
-    IDS_4100    "Personalizado..."
-    IDS_4101    "Personalizado (grande)..."
-    IDS_4102    "Adicionar novo disco rígido"
-    IDS_4103    "Adicionar disco rígido existente"
-    IDS_4104    "As imagens de disco HDI não podem ter mais de 4 GB."
-    IDS_4105    "As imagens de disco não podem ter mais de 127 GB."
-    IDS_4106    "Imagens de disco rígido (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0Todos os ficheiros (*.*)\0*.*\0"
-    IDS_4107    "Não foi possível ler o ficheiro"
-    IDS_4108    "Não foi possível escrever o ficheiro"
-    IDS_4109    "Imagens HDI ou HDX com um tamanho de sector diferente de 512 não são suportadas."
-    IDS_4110    "O barramento USB ainda não tem suporte"
-    IDS_4111    "A imagem de disco já existe"
-    IDS_4112    "Por favor, especifique um nome de ficheiro válido."
-    IDS_4113    "Imagem de disco criada"
-    IDS_4114    "Certifique-se de que o ficheiro existe e é legível."
-    IDS_4115    "Certifique-se de que o ficheiro está a ser guardado numa pasta editável."
-    IDS_4116    "Imagem de disco muito grande"
-    IDS_4117    "Lembre-se de particionar e formatar o novo disco criado."
-    IDS_4118    "O ficheiro selecionado será sobrescrito. Tem a certeza de que quer utilizá-lo?"
-    IDS_4119    "Imagem de disco sem suporte"
-    IDS_4120    "Sobrescrever"
-    IDS_4121    "Não sobrescrever"
-    IDS_4122    "Imagem bruta (.img)"
-    IDS_4123    "Imagem HDI (.hdi)"
-    IDS_4124    "Imagem HDX (.hdx)"
-    IDS_4125    "VHD com tamanho fixo (.vhd)"
-    IDS_4126    "VHD com tamanho dinâmico (.vhd)"
-    IDS_4127    "VHD diferenciador (.vhd)"
-    IDS_4128    "Blocos grandes (2 MB)"
-    IDS_4129    "Blocos pequenos (512 KB)"
-    IDS_4130    "Ficheiros VHD (*.VHD)\0*.VHD\0Todos os ficheiros (*.*)\0*.*\0"
-    IDS_4131    "Seleccione o VHD pai"
-    IDS_4132    "Isto pode significar que a imagem pai foi modificada depois da criação da imagem diferenciadora.\n\nTambém pode acontecer se os ficheiros da imagem foram movidos ou copiados ou por causa de um erro no programa que criou este disco.\n\nQuer corrigir os carimbos de data/hora?"
-    IDS_4133    "Os carimbos de data/hora dos discos pai e filho não correspondem!"
-    IDS_4134    "Não foi possível corrigir o carimbo de data/hora do VHD."
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "Desativado"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "Desativado"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 kB"
-    IDS_5889    "180 kB"
-    IDS_5890    "320 kB"
-    IDS_5891    "360 kB"
-    IDS_5892    "640 kB"
-    IDS_5893    "720 kB"
-    IDS_5894    "1.2 MB"
-    IDS_5895    "1.25 MB"
-    IDS_5896    "1.44 MB"
-    IDS_5897    "DMF (cluster 1024)"
-    IDS_5898    "DMF (cluster 2048)"
-    IDS_5899    "2.88 MB"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5"" 128 MB (ISO 10090)"
-    IDS_5903    "3.5"" 230 MB (ISO 13963)"
-    IDS_5904    "3.5"" 540 MB (ISO 15498)"
-    IDS_5905    "3.5"" 640 MB (ISO 15498)"
-    IDS_5906    "3.5"" 1.3 GB (GigaMO)"
-    IDS_5907    "3.5"" 2.3 GB (GigaMO 2)"
-    IDS_5908    "5.25"" 600 MB"
-    IDS_5909    "5.25"" 650 MB"
-    IDS_5910    "5.25"" 1 GB"
-    IDS_5911    "5.25"" 1.3 GB"
-
-    IDS_6144    "RPM perfeito"
-    IDS_6145    "RPM 1% abaixo do RPM perfeito"
-    IDS_6146    "RPM 1.5% abaixo do RPM perfeito"
-    IDS_6147    "RPM 2% abaixo do RPM perfeito"
-
-    IDS_7168    "(Padrão do sistema)"
-END
-#define IDS_LANG_ENUS    IDS_7168
-
-// Portuguese (Portugal) resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/ru-RU.rc b/src/win/languages/ru-RU.rc
deleted file mode 100644
index 01562063a..000000000
--- a/src/win/languages/ru-RU.rc
+++ /dev/null
@@ -1,637 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Russian resources
-
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Действие"
-    BEGIN
-        MENUITEM "&Клавиатура требует захвата", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "&Правый CTRL - это левый ALT", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "&Холодная перезагрузка...", IDM_ACTION_HRESET
-        MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-    MENUITEM "Ctrl+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "&Пауза", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "&Выход...", IDM_ACTION_EXIT
-    END
-    POPUP "&Вид"
-    BEGIN
-        MENUITEM "&Скрыть строку состояния", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "С&крыть панель инструментов", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
-        MENUITEM "&Изменяемый размер окна", IDM_VID_RESIZE
-        MENUITEM "&Запомнить размер и положение", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "&Рендеринг"
-        BEGIN
-            MENUITEM "&SDL (Software)", IDM_VID_SDL_SW
-            MENUITEM "SDL (&Hardware)", IDM_VID_SDL_HW
-            MENUITEM "SDL (&OpenGL)", IDM_VID_SDL_OPENGL
-            MENUITEM "Open&GL (3.0)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "&VNC", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "&Указать размеры...", IDM_VID_SPECIFY_DIM
-        MENUITEM "У&становить соотношение сторон 4:3", IDM_VID_FORCE43
-        POPUP "&Масштаб окна"
-        BEGIN
-            MENUITEM "&0.5x", IDM_VID_SCALE_1X
-            MENUITEM "&1x", IDM_VID_SCALE_2X
-            MENUITEM "1.&5x", IDM_VID_SCALE_3X
-            MENUITEM "&2x", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "Метод фильтрации"
-        BEGIN
-            MENUITEM "&Ближайший", IDM_VID_FILTER_NEAREST
-            MENUITEM "&Линейный", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "Масштабирование Hi&DPI", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "&Полноэкранный режим\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "&Растягивание в полноэкранном режиме"
-        BEGIN
-            MENUITEM "&На весь экран", IDM_VID_FS_FULL
-            MENUITEM "&4:3", IDM_VID_FS_43
-            MENUITEM "&Квадратные пиксели (сохранить соотношение)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "&Целочисленное масштабирование", IDM_VID_FS_INT
-        END
-        POPUP "Настройки E&GA/(S)VGA"
-        BEGIN
-            MENUITEM "&Инвертировать цвета VGA", IDM_VID_INVERT
-            POPUP "&Тип экрана VGA"
-            BEGIN
-                MENUITEM "RGB &цветной", IDM_VID_GRAY_RGB
-                MENUITEM "&RGB монохромный", IDM_VID_GRAY_MONO
-                MENUITEM "&Янтарный оттенок", IDM_VID_GRAY_AMBER
-                MENUITEM "&Зелёный оттенок", IDM_VID_GRAY_GREEN
-                MENUITEM "&Белый оттенок", IDM_VID_GRAY_WHITE
-            END
-            POPUP "Тип монохромного &конвертирования"
-            BEGIN
-                MENUITEM "BT&601 (NTSC/PAL)", IDM_VID_GRAYCT_601
-                MENUITEM "BT&709 (HDTV)", IDM_VID_GRAYCT_709
-                MENUITEM "&Усреднённый", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Вылеты развёртки CGA/PCjr/Tandy/E&GA/(S)VGA", IDM_VID_OVERSCAN
-        MENUITEM "Изменить контрастность &монохромного дисплея", IDM_VID_CGACON
-    END
-    MENUITEM "&Носители", IDM_MEDIA
-    POPUP "&Инструменты"
-    BEGIN
-        MENUITEM "&Настройки машины...", IDM_CONFIG
-        MENUITEM "&Обновление значков строки состояния", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "Сделать с&криншот\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "&Параметры...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "Включить интеграцию &Discord", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "&Усиление звука...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "Начать трассировку\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "Завершить трассировку\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "&Помощь"
-    BEGIN
-        MENUITEM "&Документация...", IDM_DOCS
-        MENUITEM "&О программе 86Box...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Новый образ...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Выбрать образ...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "Выбрать образ (&Защита от записи)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Запись", IDM_CASSETTE_RECORD
-        MENUITEM "&Воспроизведение", IDM_CASSETTE_PLAY
-        MENUITEM "&Перемотка на начало", IDM_CASSETTE_REWIND
-        MENUITEM "&Перемотка в конец", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "И&звлечь", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Образ...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "И&звлечь", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Новый образ...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Выбрать образ...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "Выбрать образ (&Защита от записи)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "Э&кспорт в 86F...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "И&звлечь", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "О&тключить звук", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "П&устой", IDM_CDROM_EMPTY
-        MENUITEM "&Снова загрузить предыдущий образ", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "&Образ...", IDM_CDROM_IMAGE
-        MENUITEM "&Папка...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Новый образ...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Выбрать образ...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "Выбрать образ (&Защита от записи)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "И&звлечь", IDM_ZIP_EJECT
-        MENUITEM "&Снова загрузить предыдущий образ", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Новый образ...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Выбрать образ...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "Выбрать образ (&Защита от записи)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "И&звлечь", IDM_MO_EJECT
-        MENUITEM "&Снова загрузить предыдущий образ", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "Целевая &частота кадров"
-    BEGIN
-        MENUITEM "&Синхронизация с видео", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "&25 кадров в секунду", IDM_VID_GL_FPS_25
-        MENUITEM "&30 кадров в секунду", IDM_VID_GL_FPS_30
-        MENUITEM "&50 кадров в секунду", IDM_VID_GL_FPS_50
-        MENUITEM "&60 кадров в секунду", IDM_VID_GL_FPS_60
-        MENUITEM "&75 кадров в секунду", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "&VSync", IDM_VID_GL_VSYNC
-    MENUITEM "&Выбрать шейдер...", IDM_VID_GL_SHADER
-    MENUITEM "&Удалить шейдер", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "Параметры"
-#define STR_SND_GAIN      "Усиление звука"
-#define STR_NEW_FLOPPY    "Новый образ"
-#define STR_CONFIG        "Настройки"
-#define STR_SPECIFY_DIM   "Указать размеры главного окна"
-
-#define STR_OK            "OK"
-#define STR_CANCEL        "Отмена"
-#define STR_GLOBAL        "Сохранить эти параметры как &глобальные по умолчанию"
-#define STR_DEFAULT       "&По умолчанию"
-#define STR_LANGUAGE      "Язык:"
-#define STR_ICONSET       "Набор иконок:"
-
-#define STR_GAIN          "Усиление"
-
-#define STR_FILE_NAME     "Имя файла:"
-#define STR_DISK_SIZE     "Размер диска:"
-#define STR_RPM_MODE      "RPM режим:"
-#define STR_PROGRESS      "Прогресс:"
-
-#define STR_WIDTH         "Ширина:"
-#define STR_HEIGHT        "Высота:"
-#define STR_LOCK_TO_SIZE  "Зафиксировать размер"
-
-#define STR_MACHINE_TYPE  "Тип машины:"
-#define STR_MACHINE       "Системная плата:"
-#define STR_CONFIGURE     "Настройка"
-#define STR_CPU_TYPE      "Тип ЦП:"
-#define STR_CPU_SPEED     "Скорость:"
-#define STR_FPU           "FPU:"
-#define STR_WAIT_STATES   "Циклы ожидания:"
-#define STR_MB            "МБ"
-#define STR_MEMORY        "Память:"
-#define STR_TIME_SYNC     "Синхронизация времени"
-#define STR_DISABLED      "Отключить"
-#define STR_ENABLED_LOCAL "Включить (местное)"
-#define STR_ENABLED_UTC   "Включить (UTC)"
-#define STR_DYNAREC       "Динамический рекомпилятор"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "Видеокарта:"
-#define STR_VIDEO_2       "Видеокарта 2:"
-#define STR_VOODOO        "Ускоритель Voodoo"
-#define STR_IBM8514       "Ускоритель IBM 8514/A"
-#define STR_XGA           "Ускоритель XGA"
-
-#define STR_MOUSE         "Мышь:"
-#define STR_JOYSTICK      "Джойстик:"
-#define STR_JOY1          "Джойстик 1..."
-#define STR_JOY2          "Джойстик 2..."
-#define STR_JOY3          "Джойстик 3..."
-#define STR_JOY4          "Джойстик 4..."
-
-#define STR_SOUND1        "Звуковая карта 1:"
-#define STR_SOUND2        "Звуковая карта 2:"
-#define STR_SOUND3        "Звуковая карта 3:"
-#define STR_SOUND4        "Звуковая карта 4:"
-#define STR_MIDI_OUT      "MIDI Out устр-во:"
-#define STR_MIDI_IN       "MIDI In устр-во:"
-#define STR_MPU401        "Отдельный MPU-401"
-#define STR_FLOAT         "FLOAT32 звук"
-#define STR_FM_DRIVER     "Драйвер FM-синтезатора"
-#define STR_FM_DRV_NUKED  "Nuked (более точный)"
-#define STR_FM_DRV_YMFM   "YMFM (быстрей)"
-
-#define STR_NET_TYPE      "Тип сети:"
-#define STR_PCAP          "Устройство PCap:"
-#define STR_NET           "Сетевая карта:"
-#define STR_NET1          "Network card 1:"
-#define STR_NET2          "Network card 2:"
-#define STR_NET3          "Network card 3:"
-#define STR_NET4          "Network card 4:"
-
-#define STR_COM1          "Устройство COM1:"
-#define STR_COM2          "Устройство COM2:"
-#define STR_COM3          "Устройство COM3:"
-#define STR_COM4          "Устройство COM4:"
-#define STR_LPT1          "Устройство LPT1:"
-#define STR_LPT2          "Устройство LPT2:"
-#define STR_LPT3          "Устройство LPT3:"
-#define STR_LPT4          "Устройство LPT4:"
-#define STR_SERIAL1       "Последов. порт COM1"
-#define STR_SERIAL2       "Последов. порт COM2"
-#define STR_SERIAL3       "Последов. порт COM3"
-#define STR_SERIAL4       "Последов. порт COM4"
-#define STR_PARALLEL1     "Параллельный порт LPT1"
-#define STR_PARALLEL2     "Параллельный порт LPT2"
-#define STR_PARALLEL3     "Параллельный порт LPT3"
-#define STR_PARALLEL4     "Параллельный порт LPT4"
-#define STR_SERIAL_PASS1  "Serial port passthrough 1"
-#define STR_SERIAL_PASS2  "Serial port passthrough 2"
-#define STR_SERIAL_PASS3  "Serial port passthrough 3"
-#define STR_SERIAL_PASS4  "Serial port passthrough 4"
-
-#define STR_HDC           "Контроллер HD:"
-#define STR_FDC           "Контроллер FD:"
-#define STR_IDE_TER       "Третичный IDE контроллер"
-#define STR_IDE_QUA       "Четвертичный IDE контроллер"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "Контроллер 1:"
-#define STR_SCSI_2        "Контроллер 2:"
-#define STR_SCSI_3        "Контроллер 3:"
-#define STR_SCSI_4        "Контроллер 4:"
-#define STR_CASSETTE      "Кассета"
-
-#define STR_HDD           "Жёсткие диски:"
-#define STR_NEW           "&Создать..."
-#define STR_EXISTING      "&Выбрать..."
-#define STR_REMOVE        "&Убрать"
-#define STR_BUS           "Шина:"
-#define STR_CHANNEL       "Канал:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Speed:"
-
-#define STR_SPECIFY       "&Указать..."
-#define STR_SECTORS       "Сектора:"
-#define STR_HEADS         "Головки:"
-#define STR_CYLS          "Цилиндры:"
-#define STR_SIZE_MB       "Размер (МБ):"
-#define STR_TYPE          "Тип:"
-#define STR_IMG_FORMAT    "Тип образа:"
-#define STR_BLOCK_SIZE    "Размер блока:"
-
-#define STR_FLOPPY_DRIVES "Гибкие диски:"
-#define STR_TURBO         "Турбо тайминги"
-#define STR_CHECKBPB      "Проверять BPB"
-#define STR_CDROM_DRIVES  "Дисководы CD-ROM:"
-#define STR_CD_SPEED      "Скорость:"
-
-#define STR_MO_DRIVES     "Магнитооптические дисководы:"
-#define STR_ZIP_DRIVES    "ZIP дисководы:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "ISA RTC:"
-#define STR_ISAMEM        "Карта расширения памяти (ISA)"
-#define STR_ISAMEM_1      "Карта 1:"
-#define STR_ISAMEM_2      "Карта 2:"
-#define STR_ISAMEM_3      "Карта 3:"
-#define STR_ISAMEM_4      "Карта 4:"
-#define STR_BUGGER        "Устройство ISABugger"
-#define STR_POSTCARD      "Карта POST"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Segoe UI"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "Ошибка"
-    IDS_2050    "Неустранимая ошибка"
-    IDS_2051    " - ПАУЗА"
-    IDS_2052    "Нажмите Ctrl+Alt+PgDn для возврата в оконный режим."
-    IDS_2053    "Скорость"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "Образы ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "86Box не смог найти ни одного подходящего для использования файла с ПЗУ.\n\nПожалуйста <a href=""https://github.com/86Box/roms/releases/latest"">скачайте</a> набор ПЗУ и извлеките его в каталог ""roms""."
-    IDS_2057    "(пусто)"
-    IDS_2058    "Образы ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0Все файлы (*.*)\0*.*\0"
-    IDS_2059    "Турбо"
-    IDS_2060    "Вкл"
-    IDS_2061    "Выкл"
-    IDS_2062    "Все образы (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Простые посекторные образы (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Surface образы (*.86F)\0*.86F\0"
-    IDS_2063    "Системная плата ""%hs"" недоступна из-за отсутствия файла её ПЗУ в каталоге roms/machines. Переключение на доступную системную плату."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "Видеокарта ""%hs"" недоступна из-за отсутствия файла её ПЗУ в каталоге roms/video. Переключение на доступную видеокарту."
-    IDS_2065    "Компьютер"
-    IDS_2066    "Дисплей"
-    IDS_2067    "Устройства ввода"
-    IDS_2068    "Звук"
-    IDS_2069    "Сеть"
-    IDS_2070    "Порты (COM и LPT)"
-    IDS_2071    "Контроллеры дисков"
-    IDS_2072    "Жёсткие диски"
-    IDS_2073    "Гибкие диски и CD-ROM"
-    IDS_2074    "Другие съёмные устр-ва"
-    IDS_2075    "Другая периферия"
-    IDS_2076    "Образы Surface (*.86F)\0*.86F\0"
-    IDS_2077    "Щёлкните мышью для захвата курсора"
-    IDS_2078    "Нажмите F8+F12 чтобы освободить курсор"
-    IDS_2079    "Нажмите F8+F12 или среднюю кнопку мыши чтобы освободить курсор"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "Шина"
-    IDS_2082    "Файл"
-    IDS_2083    "C"
-    IDS_2084    "H"
-    IDS_2085    "S"
-    IDS_2086    "МБ"
-    IDS_2087    "Speed"
-    IDS_2088    "Проверять BPB"
-    IDS_2089    "КБ"
-    IDS_2090    "Не удалось инициализировать рендерер видео."
-    IDS_2091    "По умолчанию"
-    IDS_2092    "%i WS"
-    IDS_2093    "Тип"
-    IDS_2094    "Не удалось настроить PCap"
-    IDS_2095    "Устройства PCap не найдены"
-    IDS_2096    "Неверное устройство PCap"
-    IDS_2097    "Стандартный 2-кнопочный джойстик"
-    IDS_2098    "Стандартный 4-кнопочный джойстик"
-    IDS_2099    "Стандартный 6-кнопочный джойстик"
-    IDS_2100    "Стандартный 8-кнопочный джойстик"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Система управления полетом Thrustmaster"
-    IDS_2104    "Нет"
-    IDS_2105    "Невозможно загрузить ускорители клавиатуры."
-    IDS_2106    "Невозможно зарегистрировать необработанный (RAW) ввод."
-    IDS_2107    "%u"
-    IDS_2108    "%u МБ (CHS: %i, %i, %i)"
-    IDS_2109    "Дисковод %i (%s): %ls"
-    IDS_2110    "Все образы (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Расширенные образы секторов (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Основные образы секторов (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Образы Flux (*.FDI)\0*.FDI\0Образы Surface (*.86F;*.MFM)\0*.86F;*.MFM\0Все файлы (*.*)\0*.*\0"
-    IDS_2112    "Невозможно инициализировать SDL, требуется SDL2.dll"
-    IDS_2113    "Вы уверены, что хотите выполнить холодную перезагрузку эмулируемой машины?"
-    IDS_2114    "Вы уверены, что хотите выйти из 86Box?"
-    IDS_2115    "Невозможно инициализировать Ghostscript"
-    IDS_2116    "Магнитооптический %i (%ls): %ls"
-    IDS_2117    "Образы магнитооптических дисков (*.IM?;*.MDI)\0*.IM?;*.MDI\0Все файлы (*.*)\0*.*\0"
-    IDS_2118    "Добро пожаловать в 86Box!"
-    IDS_2119    "Встроенный контроллер"
-    IDS_2120    "Выход"
-    IDS_2121    "ПЗУ не найдены"
-    IDS_2122    "Хотите ли вы сохранить настройки?"
-    IDS_2123    "Это приведет к холодной перезагрузке эмулируемой машины."
-    IDS_2124    "Сохранить"
-    IDS_2125    "О 86Box"
-    IDS_2126    "86Box v." EMU_VERSION
-
-    IDS_2127    "Эмулятор старых компьютеров\n\nАвторы: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nВыпускается под лицензией GNU General Public License версии 2 или более поздней. Дополнительную информацию см. в файле LICENSE."
-    IDS_2128    "OK"
-    IDS_2129    "Оборудование недоступно"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "Убедитесь, что " LIB_NAME_PCAP " установлен и ваше сетевое соединение, совместимо с " LIB_NAME_PCAP "."
-    IDS_2131    "Недопустимая конфигурация"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " требуется для автоматического преобразования файлов PostScript в PDF.\n\nВсе документы, отправленные на общий принтер PostScript, будут сохранены в виде файлов PostScript (.ps)."
-    IDS_2135    "Вход в полноэкранный режим"
-    IDS_2136    "Больше не показывать это сообщение"
-    IDS_2137    "Не выходить"
-    IDS_2138    "Перезагрузить"
-    IDS_2139    "Не перезагружать"
-    IDS_2140    "Образы магнитооптических дисков (*.IM?;*.MDI)\0*.IM?;*.MDI\0Все файлы (*.*)\0*.*\0"
-    IDS_2141    "Образы CD-ROM (*.ISO;*.CUE)\0*.ISO;*.CUE\0Все файлы (*.*)\0*.*\0"
-    IDS_2142    "Конфигурация устройства %hs"
-    IDS_2143    "Монитор в спящем режиме"
-    IDS_2144    "Шейдеры OpenGL (*.GLSL)\0*.GLSL\0Все файлы (*.*)\0*.*\0"
-    IDS_2145    "Параметры OpenGL"
-    IDS_2146    "Вы загружаете неподдерживаемую конфигурацию"
-    IDS_2147    "Выбор типов ЦП для этой системной платы на данной эмулируемой машине отключен.\n\nЭто позволяет выбрать процессор, который в противном случае несовместим с выбранной материнской платой. Однако, вы можете столкнуться с несовместимостью с BIOS материнской платы или другим ПО.\n\nВключение этого параметра официально не поддерживается, и все поданные отчеты об ошибках могут быть закрыты как недействительные."
-    IDS_2148    "Продолжить"
-    IDS_2149    "Кассета: %s"
-    IDS_2150    "Образы кассет (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0Все файлы (*.*)\0*.*\0"
-    IDS_2151    "Картридж %i: %ls"
-    IDS_2152    "Образы картриджей (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0Все файлы (*.*)\0*.*\0"
-    IDS_2153    "Ошибка инициализации рендерера"
-    IDS_2154    "Невозможно инициализировать рендерер OpenGL (3.0). Пожалуйста, используйте другой рендерер."
-    IDS_2155    "Возобновить выполнение"
-    IDS_2156    "Приостановить выполнение"
-    IDS_2157    "Нажать Ctrl+Alt+Del"
-    IDS_2158    "Нажать Ctrl+Alt+Esc"
-    IDS_2159    "Холодная перезагрузка"
-    IDS_2160    "Сигнал завершения ACPI"
-    IDS_2161    "Настройки машины"
-    IDS_2162    "Type"
-    IDS_2163    "No Dynarec"
-    IDS_2164    "Old Dynarec"
-    IDS_2165    "New Dynarec"
-    IDS_2166    "Video card #2 ""%hs"" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
-    IDS_2167    "Failed to initialize network driver"
-    IDS_2168    "The network configuration will be switched to the null driver"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "Жёсткий диск (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "MFM/RLL или ESDI дисководов CD-ROM никогда не существовало"
-    IDS_4100    "Задать вручную..."
-    IDS_4101    "Задать вручную (large)..."
-    IDS_4102    "Создать новый жёсткий диск"
-    IDS_4103    "Выбрать существующий жёсткий диск"
-    IDS_4104    "Размер образов дисков HDI не может превышать 4 ГБ."
-    IDS_4105    "Размер образов дисков не может превышать 127 ГБ."
-    IDS_4106    "Образы жёстких дисков (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0Все файлы (*.*)\0*.*\0"
-    IDS_4107    "Невозможно прочитать файл"
-    IDS_4108    "Невозможно записать файл"
-    IDS_4109    "Образы HDI или HDX с размером сектора, отличным от 512, не поддерживаются."
-    IDS_4110    "USB пока не поддерживается"
-    IDS_4111    "Файл образа диска уже существует"
-    IDS_4112    "Пожалуйста, укажите правильное имя файла."
-    IDS_4113    "Образ диска создан"
-    IDS_4114    "Убедитесь, что файл существует и доступен для чтения."
-    IDS_4115    "Убедитесь, что файл сохраняется в директории доступной для записи."
-    IDS_4116    "Слишком большой образ диска"
-    IDS_4117    "Не забудьте разметить и отформатировать вновь созданный диск."
-    IDS_4118    "Выбранный файл будет перезаписан. Вы уверены, что хотите использовать его?"
-    IDS_4119    "Неподдерживаемый образ диска"
-    IDS_4120    "Перезаписать"
-    IDS_4121    "Не перезаписывать"
-    IDS_4122    "RAW образ (.img)"
-    IDS_4123    "Образ HDI (.hdi)"
-    IDS_4124    "Образ HDX (.hdx)"
-    IDS_4125    "VHD фиксированного размера (.vhd)"
-    IDS_4126    "VHD динамического размера (.vhd)"
-    IDS_4127    "Дифференцированный образ VHD (.vhd)"
-    IDS_4128    "Большие блоки (2 МБ)"
-    IDS_4129    "Маленькие блоки (512 КБ)"
-    IDS_4130    "Файлы VHD (*.VHD)\0*.VHD\0Все файлы (*.*)\0*.*\0"
-    IDS_4131    "Выберите родительский VHD"
-    IDS_4132    "Это может означать, что родительский образ был изменён после того, как был создан дифференцированный образ.\n\nЭто также может произойти, если файлы образа были перемещены или скопированы, или из-за ошибки в программе, создавшей этот диск.\n\nВы хотите исправить временные метки?"
-    IDS_4133    "Временные метки родительского и дочернего дисков не совпадают"
-    IDS_4134    "Не удалось исправить временную метку VHD."
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "Отключён"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "Отключён"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 кБ"
-    IDS_5889    "180 кБ"
-    IDS_5890    "320 кБ"
-    IDS_5891    "360 кБ"
-    IDS_5892    "640 кБ"
-    IDS_5893    "720 кБ"
-    IDS_5894    "1.2 МБ"
-    IDS_5895    "1.25 МБ"
-    IDS_5896    "1.44 МБ"
-    IDS_5897    "DMF (кластер 1024)"
-    IDS_5898    "DMF (кластер 2048)"
-    IDS_5899    "2.88 МБ"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5"" 128 МБ (ISO 10090)"
-    IDS_5903    "3.5"" 230 МБ (ISO 13963)"
-    IDS_5904    "3.5"" 540 МБ (ISO 15498)"
-    IDS_5905    "3.5"" 640 МБ (ISO 15498)"
-    IDS_5906    "3.5"" 1.3 ГБ (GigaMO)"
-    IDS_5907    "3.5"" 2.3 ГБ (GigaMO 2)"
-    IDS_5908    "5.25"" 600 МБ"
-    IDS_5909    "5.25"" 650 МБ"
-    IDS_5910    "5.25"" 1 ГБ"
-    IDS_5911    "5.25"" 1.3 ГБ"
-
-    IDS_6144    "Точный RPM"
-    IDS_6145    "На 1% медленнее точного RPM"
-    IDS_6146    "На 1.5% медленнее точного RPM"
-    IDS_6147    "На 2% медленнее точного RPM"
-
-    IDS_7168    "(Системный)"
-END
-#define IDS_LANG_ENUS IDS_7168
-
-// Russian resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/sl-SI.rc b/src/win/languages/sl-SI.rc
deleted file mode 100644
index 80da82276..000000000
--- a/src/win/languages/sl-SI.rc
+++ /dev/null
@@ -1,637 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Slovenian resources
-
-#ifdef _WIN32
-LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Dejanja"
-    BEGIN
-        MENUITEM "&Tipkovnica potrebuje zajem", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "&Desni CTRL je levi ALT", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "&Ponovni zagon...", IDM_ACTION_HRESET
-        MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-    MENUITEM "Ctrl+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "&Premor", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "Iz&hod...", IDM_ACTION_EXIT
-    END
-    POPUP "&Pogled"
-    BEGIN
-        MENUITEM "&Skrij statusno vrstico", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
-        MENUITEM "S&premenljiva velikost okna", IDM_VID_RESIZE
-        MENUITEM "&Zapomni si velikost in položaj", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "&Upodabljanje"
-        BEGIN
-            MENUITEM "&SDL (programsko)", IDM_VID_SDL_SW
-            MENUITEM "SDL (s&trojno)", IDM_VID_SDL_HW
-            MENUITEM "SDL (&OpenGL)", IDM_VID_SDL_OPENGL
-            MENUITEM "Open&GL (Jedro 3.0)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "&VNC", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "&Določi velikost...", IDM_VID_SPECIFY_DIM
-        MENUITEM "&Vsili 4:3 razmerje zaslona", IDM_VID_FORCE43
-        POPUP "&Faktor velikosti okna"
-        BEGIN
-            MENUITEM "&0.5x", IDM_VID_SCALE_1X
-            MENUITEM "&1x", IDM_VID_SCALE_2X
-            MENUITEM "1.&5x", IDM_VID_SCALE_3X
-            MENUITEM "&2x", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "&Metoda filtriranja"
-        BEGIN
-            MENUITEM "&Najbližja", IDM_VID_FILTER_NEAREST
-            MENUITEM "&Linearna", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "&Raztezanje za visok DPI", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "&Celozaslonski način\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "&Način celozaslonskega raztezanja"
-        BEGIN
-            MENUITEM "&Raztegni na celoten zaslon", IDM_VID_FS_FULL
-            MENUITEM "&4:3", IDM_VID_FS_43
-            MENUITEM "&Kvadratni piksli (ohrani razmerje)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "&Celoštevilsko raztezanje", IDM_VID_FS_INT
-        END
-        POPUP "Nastavitve E&GA/(S)VGA"
-        BEGIN
-            MENUITEM "&Obrni barve zaslona VGA", IDM_VID_INVERT
-            POPUP "&Vrsta zaslona VGA"
-            BEGIN
-                MENUITEM "&Barvni RGB", IDM_VID_GRAY_RGB
-                MENUITEM "&Sivinski RGB", IDM_VID_GRAY_MONO
-                MENUITEM "&Rumeni zaslon", IDM_VID_GRAY_AMBER
-                MENUITEM "&Zeleni zaslon", IDM_VID_GRAY_GREEN
-                MENUITEM "B&eli zaslon", IDM_VID_GRAY_WHITE
-            END
-            POPUP "V&rsta pretvorbe sivin"
-            BEGIN
-                MENUITEM "BT&601 (NTSC/PAL)", IDM_VID_GRAYCT_601
-                MENUITEM "BT&709 (HDTV)", IDM_VID_GRAYCT_709
-                MENUITEM "&Povprečje", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "&Presežek slike CGA/PCjr/Tandy/EGA/(S)VGA", IDM_VID_OVERSCAN
-        MENUITEM "&Spremeni contrast za črno-beli zaslon", IDM_VID_CGACON
-    END
-    MENUITEM "&Mediji", IDM_MEDIA
-    POPUP "&Orodja"
-    BEGIN
-        MENUITEM "&Nastavitve...", IDM_CONFIG
-        MENUITEM "&Posodabljaj ikone statusne vrstice", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Zajemi posnetek zaslona\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "&Možnosti...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "Omogoči integracijo s programom &Discord", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "&Ojačanje zvoka...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "Z&ačni sledenje\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "&Končaj sledenje\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "&Pomoč"
-    BEGIN
-        MENUITEM "&Dokumentacija...", IDM_DOCS
-        MENUITEM "&O programu 86Box...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nova slika...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Obstoječa slika...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "Obstoječa slika (&samo za branje)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "Snemaj", IDM_CASSETTE_RECORD
-        MENUITEM "Predvajaj", IDM_CASSETTE_PLAY
-        MENUITEM "Previj na začetek", IDM_CASSETTE_REWIND
-        MENUITEM "Preskoči na konec", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "Izvrzi", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "Slika...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "Izvrzi", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nova slika...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Obstoječa slika...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "Obstoječa slika (&samo za branje)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Izvozi v 86F...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "I&zvrzi", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Utišaj", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "&Prazen", IDM_CDROM_EMPTY
-        MENUITEM "&Naloži zadnjo sliko", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "&Slika...", IDM_CDROM_IMAGE
-        MENUITEM "&Mapa...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nova slika...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Obstoječa slika...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "Obstoječa slika (&samo za branje)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "I&zvrzi", IDM_ZIP_EJECT
-        MENUITEM "&Naloži zadnjo sliko", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Nova slika...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Obstoječa slika...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "Obstoječa slika (&samo za branje)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "I&zvrzi", IDM_MO_EJECT
-        MENUITEM "&Naloži zadnjo sliko", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Ciljno št. sličic na sekundo"
-    BEGIN
-        MENUITEM "&Sinhroniziraj z videom", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "&25 fps", IDM_VID_GL_FPS_25
-        MENUITEM "&30 fps", IDM_VID_GL_FPS_30
-        MENUITEM "&50 fps", IDM_VID_GL_FPS_50
-        MENUITEM "&60 fps", IDM_VID_GL_FPS_60
-        MENUITEM "&75 fps", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "&VSync", IDM_VID_GL_VSYNC
-    MENUITEM "&Izberi senčilnik...", IDM_VID_GL_SHADER
-    MENUITEM "&Odstrani senčilnik", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "Možnosti"
-#define STR_SND_GAIN      "Ojačanje zvoka"
-#define STR_NEW_FLOPPY    "Nova slika"
-#define STR_CONFIG        "Nastavitve"
-#define STR_SPECIFY_DIM   "Določi velikost glavnega okna"
-
-#define STR_OK            "V redu"
-#define STR_CANCEL        "Prekliči"
-#define STR_GLOBAL        "Shrani te nastavitve kot globalne privzete"
-#define STR_DEFAULT       "Privzeto"
-#define STR_LANGUAGE      "Jezik:"
-#define STR_ICONSET       "Komplet ikon:"
-
-#define STR_GAIN          "Ojačanje"
-
-#define STR_FILE_NAME     "Ime datoteke:"
-#define STR_DISK_SIZE     "Velikost diska:"
-#define STR_RPM_MODE      "Način števila obratov:"
-#define STR_PROGRESS      "Napredek:"
-
-#define STR_WIDTH         "Širina:"
-#define STR_HEIGHT        "Višina:"
-#define STR_LOCK_TO_SIZE  "Zakleni na to velikost"
-
-#define STR_MACHINE_TYPE  "Vrsta sistema:"
-#define STR_MACHINE       "Sistem:"
-#define STR_CONFIGURE     "Nastavi"
-#define STR_CPU_TYPE      "Vrsta procesorja:"
-#define STR_CPU_SPEED     "Hitrost:"
-#define STR_FPU           "Procesor plavajoče vejice:"
-#define STR_WAIT_STATES   "Čakalna stanja:"
-#define STR_MB            "MB"
-#define STR_MEMORY        "Spomin:"
-#define STR_TIME_SYNC     "Sinhronizacija časa"
-#define STR_DISABLED      "Onemogočeno"
-#define STR_ENABLED_LOCAL "Omogočeno (lokalni čas)"
-#define STR_ENABLED_UTC   "Omogočeno (UTC)"
-#define STR_DYNAREC       "Dinamični prevajalnik"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "Video:"
-#define STR_VIDEO_2       "Video 2:"
-#define STR_VOODOO        "Voodoo grafika"
-#define STR_IBM8514       "IBM 8514/A grafika"
-#define STR_XGA           "XGA grafika"
-
-#define STR_MOUSE         "Miška:"
-#define STR_JOYSTICK      "Igralna palica:"
-#define STR_JOY1          "Igralna palica 1..."
-#define STR_JOY2          "Igralna palica 2..."
-#define STR_JOY3          "Igralna palica 3..."
-#define STR_JOY4          "Igralna palica 4..."
-
-#define STR_SOUND1        "Zvočna kartica 1:"
-#define STR_SOUND2        "Zvočna kartica 2:"
-#define STR_SOUND3        "Zvočna kartica 3:"
-#define STR_SOUND4        "Zvočna kartica 4:"
-#define STR_MIDI_OUT      "Izhodna naprava MIDI:"
-#define STR_MIDI_IN       "Vhodna naprava MIDI:"
-#define STR_MPU401        "Samostojen MPU-401"
-#define STR_FLOAT         "Uporabi FLOAT32 za zvok"
-#define STR_FM_DRIVER     "Gonilnik sintetizacije FM"
-#define STR_FM_DRV_NUKED  "Nuked (točnejši)"
-#define STR_FM_DRV_YMFM   "YMFM (hitrejši)"
-
-#define STR_NET_TYPE      "Vrsta omrežja:"
-#define STR_PCAP          "Naprava PCap:"
-#define STR_NET           "Omrežna kartica:"
-#define STR_NET1          "Network card 1:"
-#define STR_NET2          "Network card 2:"
-#define STR_NET3          "Network card 3:"
-#define STR_NET4          "Network card 4:"
-
-#define STR_COM1          "Naprava COM1:"
-#define STR_COM2          "Naprava COM2:"
-#define STR_COM3          "Naprava COM3:"
-#define STR_COM4          "Naprava COM4:"
-#define STR_LPT1          "Naprava LPT1:"
-#define STR_LPT2          "Naprava LPT2:"
-#define STR_LPT3          "Naprava LPT3:"
-#define STR_LPT4          "Naprava LPT4:"
-#define STR_SERIAL1       "Serijska vrata 1"
-#define STR_SERIAL2       "Serijska vrata 2"
-#define STR_SERIAL3       "Serijska vrata 3"
-#define STR_SERIAL4       "Serijska vrata 4"
-#define STR_PARALLEL1     "Paralelna vrata 1"
-#define STR_PARALLEL2     "Paralelna vrata 2"
-#define STR_PARALLEL3     "Paralelna vrata 3"
-#define STR_PARALLEL4     "Paralelna vrata 4"
-#define STR_SERIAL_PASS1  "Serial port passthrough 1"
-#define STR_SERIAL_PASS2  "Serial port passthrough 2"
-#define STR_SERIAL_PASS3  "Serial port passthrough 3"
-#define STR_SERIAL_PASS4  "Serial port passthrough 4"
-
-#define STR_HDC           "Krmilnik trdega diska:"
-#define STR_FDC           "Krmilnik disketnika:"
-#define STR_IDE_TER       "Terciarni krmilnik IDE"
-#define STR_IDE_QUA       "Kvartarni krmilnik IDE"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "Krmilnik 1:"
-#define STR_SCSI_2        "Krmilnik 2:"
-#define STR_SCSI_3        "Krmilnik 3:"
-#define STR_SCSI_4        "Krmilnik 4:"
-#define STR_CASSETTE      "Kasetnik"
-
-#define STR_HDD           "Trdi diski:"
-#define STR_NEW           "Nov..."
-#define STR_EXISTING      "Obstoječ..."
-#define STR_REMOVE        "Odstrani"
-#define STR_BUS           "Vodilo:"
-#define STR_CHANNEL       "Kanal:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Speed:"
-
-#define STR_SPECIFY       "Določi..."
-#define STR_SECTORS       "Sektorji:"
-#define STR_HEADS         "Glave:"
-#define STR_CYLS          "Cilindri:"
-#define STR_SIZE_MB       "Velikost (MB):"
-#define STR_TYPE          "Vrsta:"
-#define STR_IMG_FORMAT    "Format slike:"
-#define STR_BLOCK_SIZE    "Velikost bloka:"
-
-#define STR_FLOPPY_DRIVES "Disketni pogoni:"
-#define STR_TURBO         "Turbo časovniki"
-#define STR_CHECKBPB      "Preverjaj BPB"
-#define STR_CDROM_DRIVES  "Pogoni CD-ROM:"
-#define STR_CD_SPEED      "Hitrost:"
-
-#define STR_MO_DRIVES     "Magnetno-optični pogoni:"
-#define STR_ZIP_DRIVES    "Pogoni ZIP:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "Ura v realnem času ISA:"
-#define STR_ISAMEM        "Razširitev spomina ISA"
-#define STR_ISAMEM_1      "Kartica 1:"
-#define STR_ISAMEM_2      "Kartica 2:"
-#define STR_ISAMEM_3      "Kartica 3:"
-#define STR_ISAMEM_4      "Kartica 4:"
-#define STR_BUGGER        "Naprava ISABugger"
-#define STR_POSTCARD      "Kartica POST"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Segoe UI"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "Napaka"
-    IDS_2050    "Kritična napaka"
-    IDS_2051    " - PAUSED"
-    IDS_2052    "Pritisnite Ctrl+Alt+PgDn za povratek iz celozaslonskega načina."
-    IDS_2053    "Hitrost"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "ZIP slike (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "86Box ni našel nobenih uporabnih ROM slik.\n\nProsim <a href=""https://github.com/86Box/roms/releases/latest"">prenesite</a> set ROM-ov in ga razširite v mapo ""roms""."
-    IDS_2057    "(prazno)"
-    IDS_2058    "ZIP slike (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0Vse datoteke (*.*)\0*.*\0"
-    IDS_2059    "Turbo"
-    IDS_2060    "Vključeno"
-    IDS_2061    "Izključeno"
-    IDS_2062    "Vse slike (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Osnovne sektorske slike (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Površinske slike (*.86F)\0*.86F\0"
-    IDS_2063    "Sistem ""%hs"" ni na voljo zaradi manjkajočih ROM-ov v mapi roms/machines. Preklapljam na drug sistem, ki je na voljo."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "Grafična kartica ""%hs"" ni na voljo zaradi manjkajočih ROM-ov v mapi roms/video. Preklapljam na drugo grafično kartico, ki je na voljo.."
-    IDS_2065    "Sistem"
-    IDS_2066    "Zaslon"
-    IDS_2067    "Vhodne naprave"
-    IDS_2068    "Zvok"
-    IDS_2069    "Omrežje"
-    IDS_2070    "Vrata (COM & LPT)"
-    IDS_2071    "Krmilniki shrambe"
-    IDS_2072    "Trdi diski"
-    IDS_2073    "Disketni in CD-ROM pogoni"
-    IDS_2074    "Druge odstranljive naprave"
-    IDS_2075    "Druga periferija"
-    IDS_2076    "Površinske slike (*.86F)\0*.86F\0"
-    IDS_2077    "Kliknite za zajem miške"
-    IDS_2078    "Pritisnite F8+F12 za izpust miške"
-    IDS_2079    "Pritisnite F8+F12 ali srednji gumb za izpust miške"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "Vodilo"
-    IDS_2082    "Datoteka"
-    IDS_2083    "C"
-    IDS_2084    "H"
-    IDS_2085    "S"
-    IDS_2086    "MB"
-    IDS_2087    "Speed"
-    IDS_2088    "Preveri BPB"
-    IDS_2089    "KB"
-    IDS_2090    "Ne morem inicializirati pogona upodabljanja."
-    IDS_2091    "Privzeto"
-    IDS_2092    "%i stanj čakanja"
-    IDS_2093    "Vrsta"
-    IDS_2094    "Nastavitev PCap ni uspela"
-    IDS_2095    "Nobena naprava PCap ni bila najdena"
-    IDS_2096    "Neveljavna naprava PCap"
-    IDS_2097    "Standardna krmilna palica z 2 gumboma"
-    IDS_2098    "Standardna krmilna palica s 4 gumbi"
-    IDS_2099    "Standardna krmilna palica s 6 gumbi"
-    IDS_2100    "Standardna krmilna palica z 8 gumbi"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Thrustmaster Flight Control System"
-    IDS_2104    "Brez"
-    IDS_2105    "Ne morem naložiti pospeševalnikov tipkovnice."
-    IDS_2106    "Ne morem registrirati neobdelanega vnosa."
-    IDS_2107    "%u"
-    IDS_2108    "%u MB (CHS: %i, %i, %i)"
-    IDS_2109    "Disketa %i (%s): %ls"
-    IDS_2110    "Vse slike (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Napredne sektorske slike (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Osnovne sektorske slike (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Tokovne slike (*.FDI)\0*.FDI\0Površinske slike (*.86F;*.MFM)\0*.86F;*.MFM\0Vse datoteke (*.*)\0*.*\0"
-    IDS_2112    "Ne morem inicializirati SDL, potrebna je knjižica SDL2.dll"
-    IDS_2113    "Ste prepričani, da želite ponovno zagnati emulirani sistem?"
-    IDS_2114    "Ste prepričani, da želite zapreti 86Box?"
-    IDS_2115    "Ne morem inicializirati Ghostscript"
-    IDS_2116    "MO %i (%ls): %ls"
-    IDS_2117    "Slike MO (*.IM?;*.MDI)\0*.IM?;*.MDI\0Vse datoteke (*.*)\0*.*\0"
-    IDS_2118    "Dobrodošli v 86Box!"
-    IDS_2119    "Notranji krmilnik"
-    IDS_2120    "Izhod"
-    IDS_2121    "Nobeni ROM-i niso bili najdeni"
-    IDS_2122    "Želite shraniti nastavitve?"
-    IDS_2123    "To bo ponovno zagnalo emuliran sistem."
-    IDS_2124    "Shrani"
-    IDS_2125    "O programu 86Box"
-    IDS_2126    "86Box v" EMU_VERSION
-
-    IDS_2127    "Emulator starih računalnikov\n\nAvtorji: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne in drugi.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho in drugi.\n\nIzdano pod licenco GNU General Public License različica 2 ali novejša. Glej datoteko LICENSE za več informacij."
-    IDS_2128    "V redu"
-    IDS_2129    "Strojna oprema ni na voljo"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "Prepičajte se, da je nameščen " LIB_NAME_PCAP " in da ste na omrežni povezavi, združljivi z " LIB_NAME_PCAP
-    IDS_2131    "Neveljavna konfiguracija"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " je potreben za samodejno pretvorbo PostScript datotek v PDF.\n\nVsi dokumenti, poslani generičnemu PostScript tiskalniku bodo shranjeni kot PostScript (.ps) datoteke."
-    IDS_2135    "Preklapljam v celozaslonski način"
-    IDS_2136    "Ne pokaži več tega sporočila"
-    IDS_2137    "Prekliči izhod"
-    IDS_2138    "Resetiraj"
-    IDS_2139    "Ne resetiraj"
-    IDS_2140    "Slike MO (*.IM?;*.MDI)\0*.IM?;*.MDI\0Vse datoteke (*.*)\0*.*\0"
-    IDS_2141    "Slike CD-ROM (*.ISO;*.CUE)\0*.ISO;*.CUE\0Vse datoteke (*.*)\0*.*\0"
-    IDS_2142    "Konfiguracija naprave %hs"
-    IDS_2143    "Zaslon v načinu spanja"
-    IDS_2144    "Senčilniki OpenGL (*.GLSL)\0*.GLSL\0Vse datoteke (*.*)\0*.*\0"
-    IDS_2145    "Možnosti OpenGL"
-    IDS_2146    "Nalagate nepodprto konfiguracijo"
-    IDS_2147    "Filtriranje vrste procesorja glede na izbran sistem je onemogočeno za ta emuliran sistem.\n\nTako lahko izberete procesor, ki je sicer nezdružljiv z izbranim sistemom. Vendar lahko naletite na nezdružljivosti z BIOS-om sistema ali drugo programsko opremo\n\nOmogočanje te nastavitve ni uradno podprto, vsa poročila o hroščih iz tega naslova pa bodo zaprta kot neveljavna."
-    IDS_2148    "Nadaljuj"
-    IDS_2149    "Kaseta: %s"
-    IDS_2150    "Slike kaset (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0Vse datoteke (*.*)\0*.*\0"
-    IDS_2151    "Spominski vložek %i: %ls"
-    IDS_2152    "Slike spominskega vložka (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0Vse datoteke (*.*)\0*.*\0"
-    IDS_2153    "Napaka pri zagonu sistema za upodabljanje"
-    IDS_2154    "Sistema za upodabljanje OpenGL (3.0 Core) ni bilo mogoče zagnati. Uporabite drug sistem za upodabljanje."
-    IDS_2155    "Nadaljuj izvajanje"
-    IDS_2156    "Prekini izvajanje"
-    IDS_2157    "Press Ctrl+Alt+Del"
-    IDS_2158    "Press Ctrl+Alt+Esc"
-    IDS_2159    "Ponovni zagon"
-    IDS_2160    "Zaustavitev ACPI"
-    IDS_2161    "Nastavitve"
-    IDS_2162    "Type"
-    IDS_2163    "No Dynarec"
-    IDS_2164    "Old Dynarec"
-    IDS_2165    "New Dynarec"
-    IDS_2166    "Video card #2 ""%hs"" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
-    IDS_2167    "Failed to initialize network driver"
-    IDS_2168    "The network configuration will be switched to the null driver"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "Trdi disk (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "MFM/RLL ali ESDI pogoni CD-ROM niso nikoli obstajali"
-    IDS_4100    "Po meri..."
-    IDS_4101    "Po meri (velik)..."
-    IDS_4102    "Dodaj nov trdi disk"
-    IDS_4103    "Dodaj obstoječ trdi disk"
-    IDS_4104    "Slike diska HDI ne morejo biti večje od 4 GB."
-    IDS_4105    "Slike diska ne morejo biti večje od 127 GB."
-    IDS_4106    "Slike trdega diska (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0Vse datoteke (*.*)\0*.*\0"
-    IDS_4107    "Ne morem prebrati datoteke"
-    IDS_4108    "Ne morem pisati v datoteko"
-    IDS_4109    "Slike HDI ali HDX, ki nimajo sektorjev velikosti 512 bajtov, niso podprte."
-    IDS_4110    "USB še ni podprt"
-    IDS_4111    "Datoteka s sliko diska že obstaja"
-    IDS_4112    "Prosim, navedite veljavno ime datoteke."
-    IDS_4113    "Slika diska ustvarjena"
-    IDS_4114    "Prepričajte se, da datoteka obstaja in je berljiva."
-    IDS_4115    "Prepričajte se, da datoteko shranjujete v zapisljivo mapo."
-    IDS_4116    "Slika diska je prevelika"
-    IDS_4117    "Ne pozabite na novem disku ustvariti particij in jih formatirati."
-    IDS_4118    "Izbrana datoteka bo prepisana. Ali jo res želite uporabiti?"
-    IDS_4119    "Nepodprta slika diska"
-    IDS_4120    "Prepiši"
-    IDS_4121    "Ne prepiši"
-    IDS_4122    "Surova slika (.img)"
-    IDS_4123    "Slika HDI (.hdi)"
-    IDS_4124    "Slika HDX (.hdx)"
-    IDS_4125    "VHD fiksne velikosti (.vhd)"
-    IDS_4126    "Dinamičen VHD (.vhd)"
-    IDS_4127    "Diferencialni VHD (.vhd)"
-    IDS_4128    "Veliki bloki (2 MB)"
-    IDS_4129    "Mali bloki (512 KB)"
-    IDS_4130    "Datoteke VHD (*.VHD)\0*.VHD\0Vse datoteke (*.*)\0*.*\0"
-    IDS_4131    "Izberite starševsko sliko VHD"
-    IDS_4132    "To lahko pomeni, da je bila starševska slika spremenjena potem, ko je že bila ustvarjena diferencialna slika.\n\nDo tega lahko pride tudi kadar so datoteke slik diska premaknjene ali kopirane, ali pa gre za hrošča v programu, ki je ustvaril ta disk.\n\nŽelite popraviti časovni žig?"
-    IDS_4133    "Časovna žiga starševske slike diska in slike diska otroka se ne ujemata"
-    IDS_4134    "Ne morem popraviti časovnega žiga slike VHD."
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "Onemogočeno"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "Onemogočeno"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 kB"
-    IDS_5889    "180 kB"
-    IDS_5890    "320 kB"
-    IDS_5891    "360 kB"
-    IDS_5892    "640 kB"
-    IDS_5893    "720 kB"
-    IDS_5894    "1.2 MB"
-    IDS_5895    "1.25 MB"
-    IDS_5896    "1.44 MB"
-    IDS_5897    "DMF (grozd 1024)"
-    IDS_5898    "DMF (grozd 2048)"
-    IDS_5899    "2.88 MB"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5"" 128 MB (ISO 10090)"
-    IDS_5903    "3.5"" 230 MB (ISO 13963)"
-    IDS_5904    "3.5"" 540 MB (ISO 15498)"
-    IDS_5905    "3.5"" 640 MB (ISO 15498)"
-    IDS_5906    "3.5"" 1.3 GB (GigaMO)"
-    IDS_5907    "3.5"" 2.3 GB (GigaMO 2)"
-    IDS_5908    "5.25"" 600 MB"
-    IDS_5909    "5.25"" 650 MB"
-    IDS_5910    "5.25"" 1 GB"
-    IDS_5911    "5.25"" 1.3 GB"
-
-    IDS_6144    "Popolni obrati na minuto"
-    IDS_6145    "1% pod popolnimi obrati"
-    IDS_6146    "1.5% pod popolnimi obrati"
-    IDS_6147    "2% pod popolnimi obrati"
-
-    IDS_7168    "(Sistemsko privzeto)"
-END
-#define IDS_LANG_ENUS IDS_7168
-
-// Slovenian resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/tr-TR.rc b/src/win/languages/tr-TR.rc
deleted file mode 100644
index d7285bdf7..000000000
--- a/src/win/languages/tr-TR.rc
+++ /dev/null
@@ -1,637 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Turkish (TR) resources
-
-#ifdef _WIN32
-LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Komutlar"
-    BEGIN
-        MENUITEM "&Klavye sadece fare yakalandığında çalışsın", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "&Sağ CTRL tuşunu sol ALT tuşu olarak ayarla", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "&Makineyi yeniden başlat...", IDM_ACTION_HRESET
-        MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-    MENUITEM "Ctrl+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "&Duraklat", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "Emülatörden &çık...", IDM_ACTION_EXIT
-    END
-    POPUP "&Görüntüleme"
-    BEGIN
-        MENUITEM "&Durum çubuğunu gizle", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
-        MENUITEM "&Yeniden boyutlandırılabilir pencere", IDM_VID_RESIZE
-        MENUITEM "&Pencere boyut ve pozisyonunu hatırla", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "&İşleyici"
-        BEGIN
-            MENUITEM "&SDL (Yazılım)", IDM_VID_SDL_SW
-            MENUITEM "SDL (&Donanım)", IDM_VID_SDL_HW
-            MENUITEM "SDL (&OpenGL)", IDM_VID_SDL_OPENGL
-            MENUITEM "Open&GL (3.0 Core)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "&VNC", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Pencere &boyutunu belirle...", IDM_VID_SPECIFY_DIM
-        MENUITEM "&4:3 görüntüleme oranına zorla", IDM_VID_FORCE43
-        POPUP "Pencere &ölçek çarpanı"
-        BEGIN
-            MENUITEM "&0.5x", IDM_VID_SCALE_1X
-            MENUITEM "&1x", IDM_VID_SCALE_2X
-            MENUITEM "1.&5x", IDM_VID_SCALE_3X
-            MENUITEM "&2x", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "&Filtre metodu"
-        BEGIN
-            MENUITEM "&Nearest (En yakın)", IDM_VID_FILTER_NEAREST
-            MENUITEM "&Linear (Doğrusal)", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "Hi&DPI ölçeklemesi", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "&Tam ekran\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "Tam ekran &germe modu"
-        BEGIN
-            MENUITEM "&Tam ekrana ger", IDM_VID_FS_FULL
-            MENUITEM "&4:3", IDM_VID_FS_43
-            MENUITEM "&Kare piksel (ölçeği koru)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "Tam &sayı ölçeklemesi", IDM_VID_FS_INT
-        END
-        POPUP "EGA/&(S)VGA ayarları"
-        BEGIN
-            MENUITEM "Ters &renk VGA monitör", IDM_VID_INVERT
-            POPUP "VGA ekran &tipi"
-            BEGIN
-                MENUITEM "RGB (&renkli)", IDM_VID_GRAY_RGB
-                MENUITEM "RGB (&gri tonlama)", IDM_VID_GRAY_MONO
-                MENUITEM "&Kehribar rengi monitör", IDM_VID_GRAY_AMBER
-                MENUITEM "&Yeşil renk monitör", IDM_VID_GRAY_GREEN
-                MENUITEM "&Beyaz renk monitör", IDM_VID_GRAY_WHITE
-            END
-            POPUP "&Gri tonlama dönüştürme tipi"
-            BEGIN
-                MENUITEM "BT&601 (NTSC/PAL)", IDM_VID_GRAYCT_601
-                MENUITEM "BT&709 (HDTV)", IDM_VID_GRAYCT_709
-                MENUITEM "&Ortalama", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "CGA/PCjr/Tandy/E&GA/(S)VGA aşırı taraması", IDM_VID_OVERSCAN
-        MENUITEM "Gri to&nlamalı görüntü için kontrastı değiştir", IDM_VID_CGACON
-    END
-    MENUITEM "&Medya", IDM_MEDIA
-    POPUP "&Araçlar"
-    BEGIN
-        MENUITEM "&Ayarlar...", IDM_CONFIG
-        MENUITEM "Durum &çubuğu ikonlarını güncelle", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Ekran görüntüsü al\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "&Tercihler...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "&Discord entegrasyonunu etkinleştir", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "&Ses yükseltici...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "Begin trace\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "End trace\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "&Yardım"
-    BEGIN
-        MENUITEM "&Dökümanlar...", IDM_DOCS
-        MENUITEM "&86Box Hakkında...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Yeni imaj oluştur...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&İmaj seç...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "İmaj &seç (Yazma-korumalı)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Kaydet", IDM_CASSETTE_RECORD
-        MENUITEM "&Oynat", IDM_CASSETTE_PLAY
-        MENUITEM "&Başlangıca geri sar", IDM_CASSETTE_REWIND
-        MENUITEM "Sona doğru &ileri sar", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "&Çıkar", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&İmaj...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "&Çıkar", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Yeni imaj oluştur...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&İmaj seç...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "İmaj &seç (Yazma-korumalı)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&86F dosyası olarak aktar...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "&Çıkar", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Sesi kapat", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "İmajı &çıkar", IDM_CDROM_EMPTY
-        MENUITEM "&Önceki imajı seç", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "&İmaj seç...", IDM_CDROM_IMAGE
-        MENUITEM "&Klasör...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Yeni imaj...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&İmaj seç...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "İmaj &seç (Yazma-korumalı)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Çıkar", IDM_ZIP_EJECT
-        MENUITEM "&Önceki imajı seç", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Yeni imaj...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&İmaj seç...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "İmaj &seç (Yazma-korumalı)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Çıkar", IDM_MO_EJECT
-        MENUITEM "&Önceki imajı seç", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "Hedef &kare oranı"
-    BEGIN
-        MENUITEM "Video ile &senkronize et", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "&25 fps", IDM_VID_GL_FPS_25
-        MENUITEM "&30 fps", IDM_VID_GL_FPS_30
-        MENUITEM "&50 fps", IDM_VID_GL_FPS_50
-        MENUITEM "&60 fps", IDM_VID_GL_FPS_60
-        MENUITEM "&75 fps", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "&VSync", IDM_VID_GL_VSYNC
-    MENUITEM "Gölgelendirici &seç...", IDM_VID_GL_SHADER
-    MENUITEM "&Gölgelendiriciyi kaldır", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "Tercihler"
-#define STR_SND_GAIN      "Ses Artırma"
-#define STR_NEW_FLOPPY    "Yeni İmaj"
-#define STR_CONFIG        "Ayarlar"
-#define STR_SPECIFY_DIM   "Ana Pencere Boyutunu Belirle"
-
-#define STR_OK            "Tamam"
-#define STR_CANCEL        "İptal et"
-#define STR_GLOBAL        "Bu ayarları &varsayılan olarak kaydet"
-#define STR_DEFAULT       "&Varsayılan"
-#define STR_LANGUAGE      "Dil:"
-#define STR_ICONSET       "Simge seti:"
-
-#define STR_GAIN          "Artırma"
-
-#define STR_FILE_NAME     "Dosya adı:"
-#define STR_DISK_SIZE     "Disk boyutu:"
-#define STR_RPM_MODE      "RPM modu:"
-#define STR_PROGRESS      "İşlem:"
-
-#define STR_WIDTH         "Genişlik:"
-#define STR_HEIGHT        "Yükseklik:"
-#define STR_LOCK_TO_SIZE  "Bu boyuta kilitle"
-
-#define STR_MACHINE_TYPE  "Makine türü:"
-#define STR_MACHINE       "Makine:"
-#define STR_CONFIGURE     "Ayarla"
-#define STR_CPU_TYPE      "CPU türü:"
-#define STR_CPU_SPEED     "Hız:"
-#define STR_FPU           "FPU:"
-#define STR_WAIT_STATES   "Bekleme süreleri:"
-#define STR_MB            "MB"
-#define STR_MEMORY        "Bellek:"
-#define STR_TIME_SYNC     "Zaman senkronizasyonu"
-#define STR_DISABLED      "Devre dışı"
-#define STR_ENABLED_LOCAL "Etkin (yerel zaman)"
-#define STR_ENABLED_UTC   "Etkin (UTC)"
-#define STR_DYNAREC       "Dinamik Derleyici"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "Ekran kartı:"
-#define STR_VIDEO_2       "Ekran kartı 2:"
-#define STR_VOODOO        "Voodoo Grafikleri"
-#define STR_IBM8514       "IBM 8514/A Grafikleri"
-#define STR_XGA           "XGA Grafikleri"
-
-#define STR_MOUSE         "Fare:"
-#define STR_JOYSTICK      "Oyun kolu:"
-#define STR_JOY1          "Oyun kolu 1..."
-#define STR_JOY2          "Oyun kolu 2..."
-#define STR_JOY3          "Oyun kolu 3..."
-#define STR_JOY4          "Oyun kolu 4..."
-
-#define STR_SOUND1        "Ses kartı 1:"
-#define STR_SOUND2        "Ses kartı 2:"
-#define STR_SOUND3        "Ses kartı 3:"
-#define STR_SOUND4        "Ses kartı 4:"
-#define STR_MIDI_OUT      "MIDI Çıkış Cihazı:"
-#define STR_MIDI_IN       "MIDI Giriş Cihazı:"
-#define STR_MPU401        "Bağımsız MPU-401"
-#define STR_FLOAT         "FLOAT32 ses kullan"
-#define STR_FM_DRIVER     "FM sentez sürücüsü"
-#define STR_FM_DRV_NUKED  "Nuked (daha doğru)"
-#define STR_FM_DRV_YMFM   "YMFM (daha hızlı)"
-
-#define STR_NET_TYPE      "Ağ tipi:"
-#define STR_PCAP          "PCap cihazı:"
-#define STR_NET           "Ağ cihazı:"
-#define STR_NET1          "Network card 1:"
-#define STR_NET2          "Network card 2:"
-#define STR_NET3          "Network card 3:"
-#define STR_NET4          "Network card 4:"
-
-#define STR_COM1          "COM1 Cihazı:"
-#define STR_COM2          "COM2 Cihazı:"
-#define STR_COM3          "COM3 Cihazı:"
-#define STR_COM4          "COM4 Cihazı:"
-#define STR_LPT1          "LPT1 Cihazı:"
-#define STR_LPT2          "LPT2 Cihazı:"
-#define STR_LPT3          "LPT3 Cihazı:"
-#define STR_LPT4          "LPT4 Cihazı:"
-#define STR_SERIAL1       "Seri port 1"
-#define STR_SERIAL2       "Seri port 2"
-#define STR_SERIAL3       "Seri port 3"
-#define STR_SERIAL4       "Seri port 4"
-#define STR_PARALLEL1     "Paralel port 1"
-#define STR_PARALLEL2     "Paralel port 2"
-#define STR_PARALLEL3     "Paralel port 3"
-#define STR_PARALLEL4     "Paralel port 4"
-#define STR_SERIAL_PASS1  "Serial port passthrough 1"
-#define STR_SERIAL_PASS2  "Serial port passthrough 2"
-#define STR_SERIAL_PASS3  "Serial port passthrough 3"
-#define STR_SERIAL_PASS4  "Serial port passthrough 4"
-
-#define STR_HDC           "HD Kontrolcüsü:"
-#define STR_FDC           "FD Kontrolcüsü:"
-#define STR_IDE_TER       "Üçlü IDE Kontrolcüsü"
-#define STR_IDE_QUA       "Dörtlü IDE Kontrolcüsü"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "Kontrolcü 1:"
-#define STR_SCSI_2        "Kontrolcü 2:"
-#define STR_SCSI_3        "Kontrolcü 3:"
-#define STR_SCSI_4        "Kontrolcü 4:"
-#define STR_CASSETTE      "Kaset"
-
-#define STR_HDD           "Hard diskler:"
-#define STR_NEW           "&Yeni..."
-#define STR_EXISTING      "&Var olan..."
-#define STR_REMOVE        "&Kaldır"
-#define STR_BUS           "Veri yolu:"
-#define STR_CHANNEL       "Kanal:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Speed:"
-
-#define STR_SPECIFY       "&Belirle..."
-#define STR_SECTORS       "Sektörler:"
-#define STR_HEADS         "Veri Kafaları:"
-#define STR_CYLS          "Silindirler:"
-#define STR_SIZE_MB       "Boyut (MB):"
-#define STR_TYPE          "Tip:"
-#define STR_IMG_FORMAT    "İmaj Düzeni:"
-#define STR_BLOCK_SIZE    "Blok Boyutu:"
-
-#define STR_FLOPPY_DRIVES "Disket sürücüleri:"
-#define STR_TURBO         "Turbo zamanlamaları"
-#define STR_CHECKBPB      "BPB'yi denetle"
-#define STR_CDROM_DRIVES  "CD-ROM sürücüleri:"
-#define STR_CD_SPEED      "Hız:"
-
-#define STR_MO_DRIVES     "MO sürücüleri:"
-#define STR_ZIP_DRIVES    "ZIP sürücüleri:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "ISA RTC:"
-#define STR_ISAMEM        "ISA Bellek Artırma"
-#define STR_ISAMEM_1      "Kart 1:"
-#define STR_ISAMEM_2      "Kart 2:"
-#define STR_ISAMEM_3      "Kart 3:"
-#define STR_ISAMEM_4      "Kart 4:"
-#define STR_BUGGER        "ISABugger cihazı"
-#define STR_POSTCARD      "POST kartı"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Segoe UI"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "Hata"
-    IDS_2050    "Kritik hata"
-    IDS_2051    " - PAUSED"
-    IDS_2052    "Pencere moduna geri dönmek için Ctrl+Alt+PgDn tuşlarına basın."
-    IDS_2053    "Hız"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "ZIP imajları (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "86Box hiç bir kullanılabilir ROM imajı bulamadı.\n\nLütfen <a href=""https://github.com/86Box/roms/releases/latest"">ROM setini indirin</a> ve onu ""Roms"" klasörüne çıkarın."
-    IDS_2057    "(empty)"
-    IDS_2058    "ZIP imajları (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0All files (*.*)\0*.*\0"
-    IDS_2059    "Turbo"
-    IDS_2060    "Açık"
-    IDS_2061    "Kapalı"
-    IDS_2062    "Tüm imajlar (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Basit sektör imajları (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Yüzey imajları (*.86F)\0*.86F\0"
-    IDS_2063    """%hs"" makinesi roms/machines klasöründe mevcut olmayan ROM imajı yüzünden mevcut değil. Mevcut olan bir makineye geçiş yapılıyor."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    """%hs"" ekran kartı roms/video klasöründe mevcut olmayan ROM imajı yüzünden mevcut değil. Mevcut olan bir ekran kartına geçiş yapılıyor."
-    IDS_2065    "Makine"
-    IDS_2066    "Görüntü"
-    IDS_2067    "Giriş aygıtları"
-    IDS_2068    "Ses"
-    IDS_2069    "Ağ"
-    IDS_2070    "Portlar (COM & LPT)"
-    IDS_2071    "Depolama kontrolcüleri"
-    IDS_2072    "Hard diskler"
-    IDS_2073    "Disket & CD-ROM sürücüleri"
-    IDS_2074    "Diğer kaldırılabilir cihazlar"
-    IDS_2075    "Diğer cihazlar"
-    IDS_2076    "Yüzey imajları (*.86F)\0*.86F\0"
-    IDS_2077    "Farenin yakalanması için tıklayın"
-    IDS_2078    "Farenin bırakılması için F8+F12 tuşlarına basın"
-    IDS_2079    "Farenin bırakılması için F8+F12 veya farenin orta tuşuna basın"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "Veri yolu"
-    IDS_2082    "Dosya"
-    IDS_2083    "C"
-    IDS_2084    "H"
-    IDS_2085    "S"
-    IDS_2086    "MB"
-    IDS_2087    "Speed"
-    IDS_2088    "BPB'yi kontrol et"
-    IDS_2089    "KB"
-    IDS_2090    "Video işleyici başlatılamadı."
-    IDS_2091    "Varsayılan"
-    IDS_2092    "%i Bekleme durumları"
-    IDS_2093    "Tür"
-    IDS_2094    "PCap ayarlanamadı"
-    IDS_2095    "Herhangi bir PCap cihazı bulunamadı"
-    IDS_2096    "Geçersiz PCap cihazı"
-    IDS_2097    "Standart 2-button oyun kolları"
-    IDS_2098    "Standart 4-button oyun kolu"
-    IDS_2099    "Standart 6-button oyun kolu"
-    IDS_2100    "Standart 8-button oyun kolu"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Thrustmaster Flight Kontrol Sistemi"
-    IDS_2104    "Hiçbiri"
-    IDS_2105    "Klavye ivdirgeçleri yüklenemedi."
-    IDS_2106    "Ham girdi kaydedilemedi."
-    IDS_2107    "%u"
-    IDS_2108    "%u MB (CHS: %i, %i, %i)"
-    IDS_2109    "Disket %i (%s): %ls"
-    IDS_2110    "Tüm imajlar (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Gelişmiş sektör imajları (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Basit sektör imajları (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Flux images (*.FDI)\0*.FDI\0Yüzey imajları (*.86F;*.MFM)\0*.86F;*.MFM\0All files (*.*)\0*.*\0"
-    IDS_2112    "SDL başlatılamadı, SDL2.dll gerekmektedir"
-    IDS_2113    "Emüle edilen makineyi yeniden başlatmak istediğinizden emin misiniz?"
-    IDS_2114    "86Box'tan çıkmak istediğinize emin misiniz?"
-    IDS_2115    "Ghostscript başlatılamadı"
-    IDS_2116    "MO %i (%ls): %ls"
-    IDS_2117    "MO imajları (*.IM?;*.MDI)\0*.IM?;*.MDI\0All files (*.*)\0*.*\0"
-    IDS_2118    "86Box'a hoşgeldiniz!"
-    IDS_2119    "Dahili kontrolcü"
-    IDS_2120    "Çıkış"
-    IDS_2121    "Hiçbir ROM imajı bulunamadı"
-    IDS_2122    "Ayarları kaydetmek istediğinizden emin misiniz?"
-    IDS_2123    "Bu makineyi yeniden başlatacak."
-    IDS_2124    "Kaydet"
-    IDS_2125    "86Box Hakkında"
-    IDS_2126    "86Box v" EMU_VERSION
-
-    IDS_2127    "Bir eski bilgisayar emülatörü\n\nYapanlar: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, ve diğerleri.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, ve diğerleri.\n\nGNU Genel Kamu Lisansı versiyon 2 veya sonrası altında yayınlanmıştır. Daha fazla bilgi için LICENSE'ı gözden geçirin."
-    IDS_2128    "Tamam"
-    IDS_2129    "Donanım mevcut değil"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "" LIB_NAME_PCAP " kurulu olduğundan ve " LIB_NAME_PCAP "-uyumlu bir internet ağında bulunduğunuzdan emin olun."
-    IDS_2131    "Geçersiz konfigürasyon"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " PostScript dosyalarının otomatik olarak PDF dosyalarına çevirilmesi için gereklidir.\n\nGenel PostScript yazıcısına gönderilen tüm dökümanlar PostScript (.ps) dosyaları olarak kaydedilecektir."
-    IDS_2135    "Tam ekran moduna geçiliyor"
-    IDS_2136    "Bu mesajı bir daha gösterme"
-    IDS_2137    "Çıkış yapma"
-    IDS_2138    "Yeniden başlat"
-    IDS_2139    "Yeniden başlatma"
-    IDS_2140    "MO imajları (*.IM?;*.MDI)\0*.IM?;*.MDI\0Tüm dosyalar (*.*)\0*.*\0"
-    IDS_2141    "CD-ROM imajları (*.ISO;*.CUE)\0*.ISO;*.CUE\0Tüm dosyalar (*.*)\0*.*\0"
-    IDS_2142    "%hs Cihaz Konfigürasyonu"
-    IDS_2143    "Monitör uyku modunda"
-    IDS_2144    "OpenGL Gölgelendiricileri (*.GLSL)\0*.GLSL\0Tüm dosyalar (*.*)\0*.*\0"
-    IDS_2145    "OpenGL ayarları"
-    IDS_2146    "Desteklenmeyen bir konfigürasyon yüklüyorsunuz"
-    IDS_2147    "Seçtiğiniz makineye uygun CPU (işlemci) türü filtrelemesi bu emülasyon için devre dışı bırakıldı.\n\nBu, normalde seçilen makine ile uyumlu olmayan bir CPU seçmenizi mümkün kılmaktadır. Ancak, bundan dolayı seçilen makinenin BIOS'u veya diğer yazılımlar ile uyumsuzluk sorunu yaşayabilirsiniz.\n\nBu filtrelemeyi devre dışı bırakmak emülatör tarafından resmi olarak desteklenmemektedir ve açtığınız bug (hata) raporları geçersiz olarak kapatılabilir."
-    IDS_2148    "Devam et"
-    IDS_2149    "Kaset: %s"
-    IDS_2150    "Kaset imajları (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0Tüm dosyalar (*.*)\0*.*\0"
-    IDS_2151    "Kartuş %i: %ls"
-    IDS_2152    "Kartuş imajları (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0Tüm dosyalar (*.*)\0*.*\0"
-    IDS_2153    "Oluşturucu başlatılırken hata oluştu"
-    IDS_2154    "OpenGL (3.0 Core) görüntüleyici başlatılamadı. Başka bir görüntüleyici kullanın."
-    IDS_2155    "Yürütmeye devam et"
-    IDS_2156    "Yürütmeyi duraklat"
-    IDS_2157    "Ctrl+Alt+Del"
-    IDS_2158    "Ctrl+Alt+Esc"
-    IDS_2159    "Makineyi yeniden başlat"
-    IDS_2160    "ACPI kapatma"
-    IDS_2161    "Ayarlar"
-    IDS_2162    "Type"
-    IDS_2163    "No Dynarec"
-    IDS_2164    "Old Dynarec"
-    IDS_2165    "New Dynarec"
-    IDS_2166    "Video card #2 ""%hs"" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
-    IDS_2167    "Failed to initialize network driver"
-    IDS_2168    "The network configuration will be switched to the null driver"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "Hard disk (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "MFM/RLL veya ESDI CD-ROM sürücüleri hiçbir zaman var olmamıştır"
-    IDS_4100    "Diğer..."
-    IDS_4101    "Diğer (büyük)..."
-    IDS_4102    "Yeni Hard Disk Dosyası Oluştur"
-    IDS_4103    "Var Olan Hard Disk Dosyası Ekle"
-    IDS_4104    "HDI disk imajları 4 GB'tan daha büyük olamaz."
-    IDS_4105    "Disk imajları 127 GB'tan daha büyük olamaz."
-    IDS_4106    "Hard disk imajları (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0Tüm dosyalar (*.*)\0*.*\0"
-    IDS_4107    "Dosya okunamıyor"
-    IDS_4108    "Dosyanın üzerine yazılamıyor"
-    IDS_4109    "512 dışında sektör boyutu olan HDI veya HDX imajları desteklenmemektedir."
-    IDS_4110    "USB şu anda desteklenmemektedir"
-    IDS_4111    "Disk imaj dosyası zaten var olmakta"
-    IDS_4112    "Lütfen geçerli bir dosya ismi belirleyin."
-    IDS_4113    "Disk imajı oluşturuldu"
-    IDS_4114    "Dosyanın var olduğuna ve okunabildiğine emin olun."
-    IDS_4115    "Dosyanın yazılabilir bir klasöre kaydedildiğinden emin olun."
-    IDS_4116    "Disk imajı çok büyük"
-    IDS_4117    "Yeni oluşturulan diski bölmeyi ve formatlamayı unutmayın."
-    IDS_4118    "Seçili dosyanın üzerine yazılacaktır. Bunu yapmak istediğinizden emin misiniz?"
-    IDS_4119    "Desteklenmeyen disk imajı"
-    IDS_4120    "Üzerine yaz"
-    IDS_4121    "Üzerine yazma"
-    IDS_4122    "Ham imaj (.img)"
-    IDS_4123    "HDI imajı (.hdi)"
-    IDS_4124    "HDX imajı (.hdx)"
-    IDS_4125    "Sabit-boyutlu VHD (.vhd)"
-    IDS_4126    "Dinamik-boyutlu VHD (.vhd)"
-    IDS_4127    "Differencing VHD (.vhd)"
-    IDS_4128    "Büyük bloklar (2 MB)"
-    IDS_4129    "Küçük bloklar (512 KB)"
-    IDS_4130    "VHD dosyaları (*.VHD)\0*.VHD\0Tüm dosyalar (*.*)\0*.*\0"
-    IDS_4131    "Ana VHD dosyasını seçin"
-    IDS_4132    "Bu, farkı alınan imaj oluşturulduktan sonra ana imaj dosyasının düzenlendiği anlamına geliyor olabilir.\n\nBu durum ayrıca imaj dosyaları kopyalandığında veya yerleri değiştirildiğinde veya imaj dosyalarını oluşturan programdaki bir hatadan dolayı olmuş olabilir.\n\nZaman damgalarını düzeltmek ister misiniz?"
-    IDS_4133    "Ana ve ek disk zaman damgaları uyuşmuyor"
-    IDS_4134    "VHD zaman damgası düzeltilemedi."
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "Devre dışı"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "Devre dışı"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 kB"
-    IDS_5889    "180 kB"
-    IDS_5890    "320 kB"
-    IDS_5891    "360 kB"
-    IDS_5892    "640 kB"
-    IDS_5893    "720 kB"
-    IDS_5894    "1.2 MB"
-    IDS_5895    "1.25 MB"
-    IDS_5896    "1.44 MB"
-    IDS_5897    "DMF (cluster 1024)"
-    IDS_5898    "DMF (cluster 2048)"
-    IDS_5899    "2.88 MB"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5"" 128 MB (ISO 10090)"
-    IDS_5903    "3.5"" 230 MB (ISO 13963)"
-    IDS_5904    "3.5"" 540 MB (ISO 15498)"
-    IDS_5905    "3.5"" 640 MB (ISO 15498)"
-    IDS_5906    "3.5"" 1.3 GB (GigaMO)"
-    IDS_5907    "3.5"" 2.3 GB (GigaMO 2)"
-    IDS_5908    "5.25"" 600 MB"
-    IDS_5909    "5.25"" 650 MB"
-    IDS_5910    "5.25"" 1 GB"
-    IDS_5911    "5.25"" 1.3 GB"
-
-    IDS_6144    "Mükemmel RPM"
-    IDS_6145    "mükemmel RPM değerinin 1% altı"
-    IDS_6146    "mükemmel RPM değerinin 1.5% altı"
-    IDS_6147    "mükemmel RPM değerinin 2% altı"
-
-    IDS_7168    "(Sistem Varsayılanı)"
-END
-#define IDS_LANG_TRTR IDS_7168
-
-// Turkish (TR) resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/uk-UA.rc b/src/win/languages/uk-UA.rc
deleted file mode 100644
index d9674260c..000000000
--- a/src/win/languages/uk-UA.rc
+++ /dev/null
@@ -1,637 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Ukrainian resources
-
-#ifdef _WIN32
-LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "&Дія"
-    BEGIN
-        MENUITEM "&Клавіатура потребує захвату", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "&Правий CTRL - це лівий ALT", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "&Холодне перезавантаження...", IDM_ACTION_HRESET
-        MENUITEM "&Ctrl+Alt+Del\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-    MENUITEM "Ctrl+Alt+&Esc", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "&Пауза", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "&Вихід...", IDM_ACTION_EXIT
-    END
-    POPUP "&Вигляд"
-    BEGIN
-        MENUITEM "&Приховати рядок стану", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "&Приховати панель інструментів", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Show non-primary monitors", IDM_VID_MONITORS
-        MENUITEM "&Змінний розмір вікна", IDM_VID_RESIZE
-        MENUITEM "&Запам'ятати розмір і становище", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "&Рендеринг"
-        BEGIN
-            MENUITEM "&SDL (Software)", IDM_VID_SDL_SW
-            MENUITEM "SDL (&Hardware)", IDM_VID_SDL_HW
-            MENUITEM "SDL (&OpenGL)", IDM_VID_SDL_OPENGL
-            MENUITEM "Open&GL (3.0)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "&VNC", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "&Вказати розміри...", IDM_VID_SPECIFY_DIM
-        MENUITEM "&Встановити відношення сторін 4:3", IDM_VID_FORCE43
-        POPUP "&Масштаб вікна"
-        BEGIN
-            MENUITEM "&0.5x", IDM_VID_SCALE_1X
-            MENUITEM "&1x", IDM_VID_SCALE_2X
-            MENUITEM "1.&5x", IDM_VID_SCALE_3X
-            MENUITEM "&2x", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "Метод фільтрації"
-        BEGIN
-            MENUITEM "&Найближчий", IDM_VID_FILTER_NEAREST
-            MENUITEM "&Лінійний", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "Масштабування Hi&DPI", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "&Повноекранний режим\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "&Розстягування у повноекранному режимі"
-        BEGIN
-            MENUITEM "&На весь екран", IDM_VID_FS_FULL
-            MENUITEM "&4:3", IDM_VID_FS_43
-            MENUITEM "&Квадратні пікселі (зберегти відношення)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "&Цілісночисленне масштабування", IDM_VID_FS_INT
-        END
-        POPUP "Налаштування E&GA/(S)VGA"
-        BEGIN
-            MENUITEM "&Інвертувати кольори VGA", IDM_VID_INVERT
-            POPUP "&Тип екрана VGA"
-            BEGIN
-                MENUITEM "RGB &кольоровий", IDM_VID_GRAY_RGB
-                MENUITEM "&RGB монохромний", IDM_VID_GRAY_MONO
-                MENUITEM "&Бурштиновий відтінок", IDM_VID_GRAY_AMBER
-                MENUITEM "&Зелений відтінок", IDM_VID_GRAY_GREEN
-                MENUITEM "&Білий відтінок", IDM_VID_GRAY_WHITE
-            END
-            POPUP "Тип монохромного &конвертування"
-            BEGIN
-                MENUITEM "BT&601 (NTSC/PAL)", IDM_VID_GRAYCT_601
-                MENUITEM "BT&709 (HDTV)", IDM_VID_GRAYCT_709
-                MENUITEM "&Усереднений", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Вильоти розгортки CGA/PCjr/Tandy/E&GA/(S)VGA", IDM_VID_OVERSCAN
-        MENUITEM "Змінити контрастність &монохромного дисплея", IDM_VID_CGACON
-    END
-    MENUITEM "&Носії", IDM_MEDIA
-    POPUP "&Інструменти"
-    BEGIN
-        MENUITEM "&Налаштування машини...", IDM_CONFIG
-        MENUITEM "&Обновлення значків рядка стану", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "Зробити &знімок\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "&Параметри...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "Увімкнути інтеграцію &Discord", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "&Посилення звуку...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "Почати трасування\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "Завершити трасування\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "&Допомога"
-    BEGIN
-        MENUITEM "&Документація...", IDM_DOCS
-        MENUITEM "&Про програму 86Box...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Новий образ...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Вибрати образ...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "Вибрати образ (&Захист від запису)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Запис", IDM_CASSETTE_RECORD
-        MENUITEM "&Відтворення", IDM_CASSETTE_PLAY
-        MENUITEM "&Перемотування на початок", IDM_CASSETTE_REWIND
-        MENUITEM "&Перемотування у кінець", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "&Вилучити", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Образ...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "&Вилучити", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Новий образ...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Вибрати образ...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "Вибрати образ (&Захист від запису)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Експорт в 86F...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "&Вилучити", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Відключити звук", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "&Пустий", IDM_CDROM_EMPTY
-        MENUITEM "&Знову завантажити попередній образ", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "&Образ...", IDM_CDROM_IMAGE
-        MENUITEM "&Тека...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Новий образ...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Вибрати образ...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "Вибрати образ (&Захист від запису)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Вилучити", IDM_ZIP_EJECT
-        MENUITEM "&Знову завантажити попередній образ", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Новий образ...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Вибрати образ...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "Вибрати образ (&Захист від запису)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "&Вилучити", IDM_MO_EJECT
-        MENUITEM "&Знову завантажити попередній образ", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "Цільова &частота кадрів"
-    BEGIN
-        MENUITEM "&Синхронізація з відео", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "&25 кадрів в секунду", IDM_VID_GL_FPS_25
-        MENUITEM "&30 кадрів в секунду", IDM_VID_GL_FPS_30
-        MENUITEM "&50 кадрів в секунду", IDM_VID_GL_FPS_50
-        MENUITEM "&60 кадрів в секунду", IDM_VID_GL_FPS_60
-        MENUITEM "&75 кадрів в секунду", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "&VSync", IDM_VID_GL_VSYNC
-    MENUITEM "&Вибрати шейдер...", IDM_VID_GL_SHADER
-    MENUITEM "&Видалити шейдер", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "Параметри"
-#define STR_SND_GAIN      "Посилення звуку"
-#define STR_NEW_FLOPPY    "Новий образ"
-#define STR_CONFIG        "Налаштування"
-#define STR_SPECIFY_DIM   "Вказати розміри головного вікна"
-
-#define STR_OK            "OK"
-#define STR_CANCEL        "Відміна"
-#define STR_GLOBAL        "Зберегти ці параметри як &глобальні за замовчуванням"
-#define STR_DEFAULT       "&За замовчуванням"
-#define STR_LANGUAGE      "Мова:"
-#define STR_ICONSET       "Набір іконок:"
-
-#define STR_GAIN          "Посилення"
-
-#define STR_FILE_NAME     "Ім'я файлу:"
-#define STR_DISK_SIZE     "Розмір диска:"
-#define STR_RPM_MODE      "RPM режим:"
-#define STR_PROGRESS      "Прогрес:"
-
-#define STR_WIDTH         "Ширина:"
-#define STR_HEIGHT        "Висота:"
-#define STR_LOCK_TO_SIZE  "Зафіксувати розмір"
-
-#define STR_MACHINE_TYPE  "Тип машини:"
-#define STR_MACHINE       "Системна плата:"
-#define STR_CONFIGURE     "Налаштування"
-#define STR_CPU_TYPE      "Тип ЦП:"
-#define STR_CPU_SPEED     "Швидкість:"
-#define STR_FPU           "FPU:"
-#define STR_WAIT_STATES   "Цикли очікування:"
-#define STR_MB            "МБ"
-#define STR_MEMORY        "Пам'ять:"
-#define STR_TIME_SYNC     "Синхронізація часу"
-#define STR_DISABLED      "Відключити"
-#define STR_ENABLED_LOCAL "Увімкнути (місцеве)"
-#define STR_ENABLED_UTC   "Увімкнути (UTC)"
-#define STR_DYNAREC       "Динамічний рекомпілятор"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "Відеокарта:"
-#define STR_VIDEO_2       "Відеокарта 2:"
-#define STR_VOODOO        "Прискорювач Voodoo"
-#define STR_IBM8514       "Прискорювач IBM 8514/A"
-#define STR_XGA           "Прискорювач XGA"
-
-#define STR_MOUSE         "Миша:"
-#define STR_JOYSTICK      "Джойстик:"
-#define STR_JOY1          "Джойстик 1..."
-#define STR_JOY2          "Джойстик 2..."
-#define STR_JOY3          "Джойстик 3..."
-#define STR_JOY4          "Джойстик 4..."
-
-#define STR_SOUND1        "Звукова карта 1:"
-#define STR_SOUND2        "Звукова карта 2:"
-#define STR_SOUND3        "Звукова карта 3:"
-#define STR_SOUND4        "Звукова карта 4:"
-#define STR_MIDI_OUT      "MIDI Out при-ій:"
-#define STR_MIDI_IN       "MIDI In при-ій:"
-#define STR_MPU401        "Окремий MPU-401"
-#define STR_FLOAT         "FLOAT32 звук"
-#define STR_FM_DRIVER     "Драйвер FM-синтезатора"
-#define STR_FM_DRV_NUKED  "Nuked (більш точний)"
-#define STR_FM_DRV_YMFM   "YMFM (швидший)"
-
-#define STR_NET_TYPE      "Тип мережі:"
-#define STR_PCAP          "Пристрій PCap:"
-#define STR_NET           "Мережевий адаптер:"
-#define STR_NET1          "Мережева карта 1:"
-#define STR_NET2          "Мережева карта 2:"
-#define STR_NET3          "Мережева карта 3:"
-#define STR_NET4          "Мережева карта 4:"
-
-#define STR_COM1          "Пристрій COM1:"
-#define STR_COM2          "Пристрій COM2:"
-#define STR_COM3          "Пристрій COM3:"
-#define STR_COM4          "Пристрій COM4:"
-#define STR_LPT1          "Пристрій LPT1:"
-#define STR_LPT2          "Пристрій LPT2:"
-#define STR_LPT3          "Пристрій LPT3:"
-#define STR_LPT4          "Пристрій LPT4:"
-#define STR_SERIAL1       "Послідов. порт COM1"
-#define STR_SERIAL2       "Послідов. порт COM2"
-#define STR_SERIAL3       "Послідов. порт COM3"
-#define STR_SERIAL4       "Послідов. порт COM4"
-#define STR_PARALLEL1     "Паралельний порт LPT1"
-#define STR_PARALLEL2     "Паралельний порт LPT2"
-#define STR_PARALLEL3     "Паралельний порт LPT3"
-#define STR_PARALLEL4     "Паралельний порт LPT4"
-#define STR_SERIAL_PASS1  "Serial port passthrough 1"
-#define STR_SERIAL_PASS2  "Serial port passthrough 2"
-#define STR_SERIAL_PASS3  "Serial port passthrough 3"
-#define STR_SERIAL_PASS4  "Serial port passthrough 4"
-
-#define STR_HDC           "Контролер HD:"
-#define STR_FDC           "Контролер FD:"
-#define STR_IDE_TER       "Третинний IDE контролер"
-#define STR_IDE_QUA       "Четвертинний IDE контролер"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "Контролер 1:"
-#define STR_SCSI_2        "Контролер 2:"
-#define STR_SCSI_3        "Контролер 3:"
-#define STR_SCSI_4        "Контролер 4:"
-#define STR_CASSETTE      "Касета"
-
-#define STR_HDD           "Жорсткі диски:"
-#define STR_NEW           "&Створити..."
-#define STR_EXISTING      "&Вибрати..."
-#define STR_REMOVE        "&Прибрати"
-#define STR_BUS           "Шина:"
-#define STR_CHANNEL       "Канал:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Speed:"
-
-#define STR_SPECIFY       "&Вказати..."
-#define STR_SECTORS       "Сектора:"
-#define STR_HEADS         "Головки:"
-#define STR_CYLS          "Циліндри:"
-#define STR_SIZE_MB       "Розмір (МБ):"
-#define STR_TYPE          "Тип:"
-#define STR_IMG_FORMAT    "Тип образу:"
-#define STR_BLOCK_SIZE    "Розмір блоку:"
-
-#define STR_FLOPPY_DRIVES "Гнучкі диски:"
-#define STR_TURBO         "Турбо таймінги"
-#define STR_CHECKBPB      "Перевіряти BPB"
-#define STR_CDROM_DRIVES  "Дисководи CD-ROM:"
-#define STR_CD_SPEED      "Швидкість:"
-
-#define STR_MO_DRIVES     "Магнітооптичні дисководи:"
-#define STR_ZIP_DRIVES    "ZIP дисководи:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "ISA RTC:"
-#define STR_ISAMEM        "Карта розширення пам'яті (ISA)"
-#define STR_ISAMEM_1      "Карта 1:"
-#define STR_ISAMEM_2      "Карта 2:"
-#define STR_ISAMEM_3      "Карта 3:"
-#define STR_ISAMEM_4      "Карта 4:"
-#define STR_BUGGER        "Пристрій ISABugger"
-#define STR_POSTCARD      "Карта POST"
-
-#define FONT_SIZE         9
-#define FONT_NAME         "Segoe UI"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "Помилка"
-    IDS_2050    "Непереробна помилка"
-    IDS_2051    " - PAUSED"
-    IDS_2052    "Натисніть Ctrl+Alt+PgDn для повернення у віконний режим."
-    IDS_2053    "Швидкість"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "Образи ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "86Box не зміг знайти жодного відповідного для використання файлу з ПЗУ.\n\nБудь ласка <a href=""https://github.com/86Box/roms/releases/latest"">завантажте</a> набір ПЗУ і витягніть його в каталог ""roms""."
-    IDS_2057    "(порожньо)"
-    IDS_2058    "Образи ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0Усі файли (*.*)\0*.*\0"
-    IDS_2059    "Турбо"
-    IDS_2060    "Увімк"
-    IDS_2061    "Вимк"
-    IDS_2062    "Усі образи (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Прості посекторні образи (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Образ поверхні (*.86F)\0*.86F\0"
-    IDS_2063    "Системна плата ""%hs"" недоступна через відсутність файлу її ПЗУ в каталозі roms/machines. Переключення на доступну системну плату."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "Відеокарта ""%hs"" недоступна через відсутність файлу її ПЗУ в каталозі roms/video. Переключення на доступну відеокарту."
-    IDS_2065    "Комп'ютер"
-    IDS_2066    "Дисплей"
-    IDS_2067    "Пристрій введення"
-    IDS_2068    "Звук"
-    IDS_2069    "Мережа"
-    IDS_2070    "Порти (COM и LPT)"
-    IDS_2071    "Контролери дисків"
-    IDS_2072    "Жорсткі диски"
-    IDS_2073    "Гнучкі диски і CD-ROM"
-    IDS_2074    "Інші знімні при-ої"
-    IDS_2075    "Інша периферія"
-    IDS_2076    "Образи Surface (*.86F)\0*.86F\0"
-    IDS_2077    "Клацніть мишею для захвату курсора"
-    IDS_2078    "Натисніть F8+F12, щоб звільнити курсор"
-    IDS_2079    "Натисніть F8+F12 або середню кнопку миші, щоб звільнити курсор"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "Шина"
-    IDS_2082    "Файл"
-    IDS_2083    "C"
-    IDS_2084    "H"
-    IDS_2085    "S"
-    IDS_2086    "МБ"
-    IDS_2087    "Speed"
-    IDS_2088    "Перевіряти BPB"
-    IDS_2089    "КБ"
-    IDS_2090    "Не вдалося ініціалізувати рендер відео."
-    IDS_2091    "За замовчуванням"
-    IDS_2092    "%i WS"
-    IDS_2093    "Тип"
-    IDS_2094    "Не вдалося налаштувати PCap"
-    IDS_2095    "Пристрої PCap не знайдені"
-    IDS_2096    "Невірний пристрій PCap"
-    IDS_2097    "Стандартний 2-кнопковий джойстик"
-    IDS_2098    "Стандартний 4-кнопковий джойстик"
-    IDS_2099    "Стандартний 6-кнопковий джойстик"
-    IDS_2100    "Стандартний 8-кнопковий джойстик"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Система управління польотом Thrustmaster"
-    IDS_2104    "Ні"
-    IDS_2105    "Неможливо завантажити прискорювачі клавіатури."
-    IDS_2106    "Неможливо зарреєструвати необроблене (RAW) введення."
-    IDS_2107    "%u"
-    IDS_2108    "%u МБ (CHS: %i, %i, %i)"
-    IDS_2109    "Дисковод %i (%s): %ls"
-    IDS_2110    "Усі образи (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Розширені образи секторів (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Основні образи секторів (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Образи Flux (*.FDI)\0*.FDI\0Образи Surface (*.86F;*.MFM)\0*.86F;*.MFM\0Усі файли (*.*)\0*.*\0"
-    IDS_2112    "Неможливо ініціалізувати SDL, потрібно SDL2.dll"
-    IDS_2113    "Ви впевнені, що хочете виконати холодне перезавантаження емульованої машини?"
-    IDS_2114    "Ви впевнені, що хочете вийти з 86Box?"
-    IDS_2115    "Неможливо ініціалізувати Ghostscript"
-    IDS_2116    "Магнітооптичний %i (%ls): %ls"
-    IDS_2117    "Образи магнітооптичних дисків (*.IM?;*.MDI)\0*.IM?;*.MDI\0Усі файлі (*.*)\0*.*\0"
-    IDS_2118    "Ласкаво просимо в 86Box!"
-    IDS_2119    "Вбудований контролер"
-    IDS_2120    "Вихід"
-    IDS_2121    "ПЗУ не знайдені"
-    IDS_2122    "Чи бажаєте ви зберегти налаштування?"
-    IDS_2123    "Це призведе до холодної перезагрузки емульованої машини."
-    IDS_2124    "Зберегти"
-    IDS_2125    "Про 86Box"
-    IDS_2126    "86Box v." EMU_VERSION
-
-    IDS_2127    "Емулятор старих комп'ютерів\n\nАвтори: Miran Grča (OBattler), RichardG867, Jasmine Iwanek, TC1995, coldbrewed, Teemu Korhonen (Manaatti), Joakim L. Gilje, Adrien Moulin (elyosh), Daniel Balsom (gloriouscow), Cacodemon345, Fred N. van Kempen (waltje), Tiseno100, reenigne, and others.\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\nВипускаєтся під ліцензією GNU General Public License версії 2 або більше пізніше. Додадкову інформацію см. у файлі LICENSE."
-    IDS_2128    "OK"
-    IDS_2129    "Обладнання недоступне"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "Переконайтесь, що " LIB_NAME_PCAP " встановлений і ваше мережеве з'єднання, сумісне з " LIB_NAME_PCAP "."
-    IDS_2131    "Неприпустима конфігурація"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " потрібно для автоматичного перетворення файлів PostScript в PDF.\n\nсі документи, відправлені на загальний принтер PostScript, будуть збережені у вигляді файлів PostScript (.ps)."
-    IDS_2135    "Вхід у повноекранний режим"
-    IDS_2136    "Більше не показувати це повідомлення"
-    IDS_2137    "Не виходити"
-    IDS_2138    "Перезавантажити"
-    IDS_2139    "Не перезавантажувати"
-    IDS_2140    "Образи магнітооптичних дисків (*.IM?;*.MDI)\0*.IM?;*.MDI\0Усі файли (*.*)\0*.*\0"
-    IDS_2141    "Образи CD-ROM (*.ISO;*.CUE)\0*.ISO;*.CUE\0Усі файли (*.*)\0*.*\0"
-    IDS_2142    "Конфігурація пристрою %hs"
-    IDS_2143    "Монітор у сплячому режимі"
-    IDS_2144    "Шейдери OpenGL (*.GLSL)\0*.GLSL\0Усі файли (*.*)\0*.*\0"
-    IDS_2145    "Параметри OpenGL"
-    IDS_2146    "Ви завантажуєте непідтримувану конфігурацію"
-    IDS_2147    "Вибір типів ЦП для цієї системної плати на даній емульованій машині відключено.\n\nЦе дозволяє вибрати процесор, який в іншому випадку не сумісний з вибраною материнською платою. Однак, ви можете зіткнутися з несумісністю з BIOS материнської плати або іншим ПО.\n\nВключення цього параметра офіційно не підтримується, і всі подані звіти про помилки можуть бути закриті як недійсні."
-    IDS_2148    "Продовжити"
-    IDS_2149    "Касета: %s"
-    IDS_2150    "Образи касет (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0Усі файли (*.*)\0*. *\0"
-    IDS_2151    "Картридж %i: %ls"
-    IDS_2152    "Образи картриджів (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0Усі файли (*.*)\0*.*\0"
-    IDS_2153    "Помилка ініціалізації рендерера"
-    IDS_2154    "Неможливо ініціалізувати рендерер OpenGL (3.0). Будь ласка, використовуйте інший рендерер."
-    IDS_2155    "Відновити виконання"
-    IDS_2156    "Призупинити виконання"
-    IDS_2157    "Натиснути Ctrl+Alt+Del"
-    IDS_2158    "Натиснути Ctrl+Alt+Esc"
-    IDS_2159    "Холодне перезавантаження"
-    IDS_2160    "Сигнал завершення ACPI"
-    IDS_2161    "Налаштування машини"
-    IDS_2162    "Type"
-    IDS_2163    "No Dynarec"
-    IDS_2164    "Old Dynarec"
-    IDS_2165    "New Dynarec"
-    IDS_2166    "Відеокарта #2 ""%hs"" недоступна через відсутність файлу її ПЗУ в каталозі roms/video. Відключення другої відеокарти."
-    IDS_2167    "Failed to initialize network driver"
-    IDS_2168    "The network configuration will be switched to the null driver"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "Жорсткий диск (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "MFM/RLL або ESDI дисководів CD-ROM ніколи не існувало"
-    IDS_4100    "Задати вручну..."
-    IDS_4101    "Задати вручну (large)..."
-    IDS_4102    "Створити новий жорсткий диск"
-    IDS_4103    "Вибрати існуючий жорсткий диск"
-    IDS_4104    "Розмір образів дисків HDI не може перевищувати 4 ГБ."
-    IDS_4105    "Розмір образів дисків не може перевищувати 127 ГБ."
-    IDS_4106    "Образи жорстких дисків (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0Усі файли (*.*)\0*.*\0 "
-    IDS_4107    "Неможливо прочитати файл"
-    IDS_4108    "Неможливо записати файл"
-    IDS_4109    "Образи HDI або HDX з розміром сектора, відмінним від 512, не підтримуються."
-    IDS_4110    "USB поки не підтримується"
-    IDS_4111    "Файл образу диска вже існує"
-    IDS_4112    "Вкажіть правильне ім'я файлу."
-    IDS_4113    "Образ диску створено"
-    IDS_4114    "Переконайтеся, що файл є доступним для читання."
-    IDS_4115    "Переконайтеся, що файл зберігається в каталог, який є доступним для запису."
-    IDS_4116    "Занадто великий образ диска"
-    IDS_4117    "Не забудьте розмітити та відформатувати новостворений диск."
-    IDS_4118    "Вибраний файл буде перезаписано. Ви впевнені, що хочете використовувати його?"
-    IDS_4119    "Образ диска, що не підтримується"
-    IDS_4120    "Перезаписати"
-    IDS_4121    "Не перезаписувати"
-    IDS_4122    "RAW образ (.img)"
-    IDS_4123    "Образ HDI (.hdi)"
-    IDS_4124    "Образ HDX (.hdx)"
-    IDS_4125    "VHD фіксованого розміру (.vhd)"
-    IDS_4126    "VHD динамічного розміру (.vhd)"
-    IDS_4127    "Диференційований образ VHD (.vhd)"
-    IDS_4128    "Великі блоки (2 МБ)"
-    IDS_4129    "Маленькі блоки (512 КБ)"
-    IDS_4130    "Файли VHD (*.VHD)\0*.VHD\0Усі файли (*.*)\0*.*\0"
-    IDS_4131    "Виберіть батьківський VHD"
-    IDS_4132    "Це може означати, що батьківський образ був змінений після того, як було створено диференційований образ.\n\nЦе також може статися, якщо файли зображення були переміщені або скопійовані, або через помилку в програмі, що створила цей диск.\n \nВи хочете виправити тимчасові позначки?"
-    IDS_4133    "Тимчасові мітки батьківського та дочірнього дисків не співпадають"
-    IDS_4134    "Не вдалося виправити тимчасову позначку VHD."
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "CD-ROM %i (%s): %s"
-
-    IDS_5376    "Відключено"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "Відключено"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 кБ"
-    IDS_5889    "180 кБ"
-    IDS_5890    "320 кБ"
-    IDS_5891    "360 кБ"
-    IDS_5892    "640 кБ"
-    IDS_5893    "720 кБ"
-    IDS_5894    "1.2 МБ"
-    IDS_5895    "1.25 МБ"
-    IDS_5896    "1.44 МБ"
-    IDS_5897    "DMF (кластер 1024)"
-    IDS_5898    "DMF (кластер 2048)"
-    IDS_5899    "2.88 МБ"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5"" 128 МБ (ISO 10090)"
-    IDS_5903    "3.5"" 230 МБ (ISO 13963)"
-    IDS_5904    "3.5"" 540 МБ (ISO 15498)"
-    IDS_5905    "3.5"" 640 МБ (ISO 15498)"
-    IDS_5906    "3.5"" 1.3 ГБ (GigaMO)"
-    IDS_5907    "3.5"" 2.3 ГБ (GigaMO 2)"
-    IDS_5908    "5.25"" 600 МБ"
-    IDS_5909    "5.25"" 650 МБ"
-    IDS_5910    "5.25"" 1 ГБ"
-    IDS_5911    "5.25"" 1.3 ГБ"
-
-    IDS_6144    "Точний RPM"
-    IDS_6145    "На 1% повільніше точного RPM"
-    IDS_6146    "На 1.5% повільніше точного RPM"
-    IDS_6147    "На 2% повільніше точного RPM"
-
-    IDS_7168    "(Системний)"
-END
-#define IDS_LANG_ENUS IDS_7168
-
-// Ukrainian resources
-////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/zh-CN.rc b/src/win/languages/zh-CN.rc
deleted file mode 100644
index 1be833eb3..000000000
--- a/src/win/languages/zh-CN.rc
+++ /dev/null
@@ -1,637 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Simplified Chinese resources
-
-#ifdef _WIN32
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "操作(&A)"
-    BEGIN
-        MENUITEM "键盘需要捕捉(&K)", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "将右 CTRL 键映射为左 ALT 键(&R)", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "硬重置(&H)...", IDM_ACTION_HRESET
-        MENUITEM "Ctrl+Alt+Del(&C)\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-        MENUITEM "Ctrl+Alt+Esc(&E)", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "暂停(&P)", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "退出(&X)...", IDM_ACTION_EXIT
-    END
-    POPUP "查看(&V)"
-    BEGIN
-        MENUITEM "隐藏状态栏(&H)", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "隐藏工具栏(&T)", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "显示次要显示器(&S)", IDM_VID_MONITORS
-        MENUITEM "窗口大小可调(&R)", IDM_VID_RESIZE
-        MENUITEM "记住窗口大小和位置(&E)", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "渲染器(&N)"
-        BEGIN
-            MENUITEM "SDL (软件)(&S)", IDM_VID_SDL_SW
-            MENUITEM "SDL (硬件)(&H)", IDM_VID_SDL_HW
-            MENUITEM "SDL (OpenGL)(&O)", IDM_VID_SDL_OPENGL
-            MENUITEM "OpenGL (3.0 核心)(&G)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "VNC(&V)", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "指定窗口大小...", IDM_VID_SPECIFY_DIM
-        MENUITEM "强制 4:3 显示比例(&O)", IDM_VID_FORCE43
-        POPUP "窗口缩放系数(&W)"
-        BEGIN
-            MENUITEM "0.5x(&0)", IDM_VID_SCALE_1X
-            MENUITEM "1x(&1)", IDM_VID_SCALE_2X
-            MENUITEM "1.5x(&5)", IDM_VID_SCALE_3X
-            MENUITEM "2x(&2)", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "过滤方式"
-        BEGIN
-            MENUITEM "邻近(&N)", IDM_VID_FILTER_NEAREST
-            MENUITEM "线性(&L)", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "HiDPI 缩放(&D)", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "全屏(&F)\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "全屏拉伸模式(&S)"
-        BEGIN
-            MENUITEM "全屏拉伸(&F)", IDM_VID_FS_FULL
-            MENUITEM "4:3(&4)", IDM_VID_FS_43
-            MENUITEM "保持比例(&S)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "整数比例(&I)", IDM_VID_FS_INT
-        END
-        POPUP "EGA/(S)VGA 设置(&G)"
-        BEGIN
-            MENUITEM "VGA 显示器反色显示(&I)", IDM_VID_INVERT
-            POPUP "VGA 屏幕类型(&T)"
-            BEGIN
-                MENUITEM "RGB 彩色(&C)", IDM_VID_GRAY_RGB
-                MENUITEM "RGB 灰度(&R)", IDM_VID_GRAY_MONO
-                MENUITEM "琥珀色单色显示器(&A)", IDM_VID_GRAY_AMBER
-                MENUITEM "绿色单色显示器(&G)", IDM_VID_GRAY_GREEN
-                MENUITEM "白色单色显示器(&W)", IDM_VID_GRAY_WHITE
-            END
-            POPUP "灰度转换类型(&C)"
-            BEGIN
-                MENUITEM "BT601 (NTSC/PAL)(&6)", IDM_VID_GRAYCT_601
-                MENUITEM "BT709 (HDTV)(&7)", IDM_VID_GRAYCT_709
-                MENUITEM "平均(&A)", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "CGA/PCjr/Tandy/EGA/(S)VGA 过扫描(&G)", IDM_VID_OVERSCAN
-        MENUITEM "更改单色显示对比度(&M)", IDM_VID_CGACON
-    END
-    MENUITEM "介质(&M)", IDM_MEDIA
-    POPUP "工具(&T)"
-    BEGIN
-        MENUITEM "设置(&S)...", IDM_CONFIG
-        MENUITEM "更新状态栏图标(&U)", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "截图(&C)\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "首选项(&P)...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "启用 Discord 集成(&D)", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "音量增益(&G)...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "开始追踪\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "结束追踪\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "帮助(&H)"
-    BEGIN
-        MENUITEM "文档(&D)...", IDM_DOCS
-        MENUITEM "关于 86Box(&A)...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "新建映像(&N)...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "打开已存在的映像(&E)...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "打开已存在的映像并写保护(&W)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "录制(&R)", IDM_CASSETTE_RECORD
-        MENUITEM "播放(&P)", IDM_CASSETTE_PLAY
-        MENUITEM "倒带至起点(&R)", IDM_CASSETTE_REWIND
-        MENUITEM "快进至终点(&F)", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "弹出(&J)", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "映像(&I)...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "弹出(&J)", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "新建映像(&N)...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "打开已存在的映像(&E)...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "打开已存在的映像并写保护(&W)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "导出为 86F 格式(&x)...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "弹出(&J)", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "静音(&M)", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "空置驱动器(&M)", IDM_CDROM_EMPTY
-        MENUITEM "载入上一个映像(&R)", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "映像(&I)...", IDM_CDROM_IMAGE
-        MENUITEM "文件夹(&F)...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "新建映像(&N)...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "打开已存在的映像(&E)...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "打开已存在的映像并写保护(&W)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "弹出(&J)", IDM_ZIP_EJECT
-        MENUITEM "载入上一个映像(&R)", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "新建映像(&N)...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "打开已存在的映像(&E)...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "打开已存在的映像并写保护(&W)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "弹出(&J)", IDM_MO_EJECT
-        MENUITEM "载入上一个映像(&R)", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "目标帧率(&F)"
-    BEGIN
-        MENUITEM "与视频同步(&S)", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "25 fps(&2)", IDM_VID_GL_FPS_25
-        MENUITEM "30 fps(&3)", IDM_VID_GL_FPS_30
-        MENUITEM "50 fps(&5)", IDM_VID_GL_FPS_50
-        MENUITEM "60 fps(&6)", IDM_VID_GL_FPS_60
-        MENUITEM "75 fps(&7)", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "垂直同步(&V)", IDM_VID_GL_VSYNC
-    MENUITEM "选择着色器(&S)...", IDM_VID_GL_SHADER
-    MENUITEM "移除着色器(&R)", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "首选项"
-#define STR_SND_GAIN      "音量增益"
-#define STR_NEW_FLOPPY    "新建映像"
-#define STR_CONFIG        "设置"
-#define STR_SPECIFY_DIM   "指定主窗口大小"
-
-#define STR_OK            "确定"
-#define STR_CANCEL        "取消"
-#define STR_GLOBAL        "将以上设置存储为全局默认值(&G)"
-#define STR_DEFAULT       "默认(&D)"
-#define STR_LANGUAGE      "语言:"
-#define STR_ICONSET       "图标集:"
-
-#define STR_GAIN          "增益"
-
-#define STR_FILE_NAME     "文件名:"
-#define STR_DISK_SIZE     "磁盘大小:"
-#define STR_RPM_MODE      "转速 (RPM) 模式:"
-#define STR_PROGRESS      "进度:"
-
-#define STR_WIDTH         "宽度:"
-#define STR_HEIGHT        "高度:"
-#define STR_LOCK_TO_SIZE  "锁定此大小"
-
-#define STR_MACHINE_TYPE  "机器类型:"
-#define STR_MACHINE       "机型:"
-#define STR_CONFIGURE     "配置"
-#define STR_CPU_TYPE      "CPU 类型:"
-#define STR_CPU_SPEED     "速度:"
-#define STR_FPU           "浮点处理器 (FPU):"
-#define STR_WAIT_STATES   "等待状态 (WS):"
-#define STR_MB            "MB"
-#define STR_MEMORY        "内存:"
-#define STR_TIME_SYNC     "时间同步"
-#define STR_DISABLED      "禁用"
-#define STR_ENABLED_LOCAL "启用 (本地时间)"
-#define STR_ENABLED_UTC   "启用 (协调世界时)"
-#define STR_DYNAREC       "动态重编译器"
-#define STR_SOFTFLOAT     "软浮点 FPU"
-
-#define STR_VIDEO         "显卡:"
-#define STR_VIDEO_2       "显卡 2:"
-#define STR_VOODOO        "Voodoo 显卡"
-#define STR_IBM8514       "IBM 8514/A 显卡"
-#define STR_XGA           "XGA 显卡"
-
-#define STR_MOUSE         "鼠标:"
-#define STR_JOYSTICK      "操纵杆:"
-#define STR_JOY1          "操纵杆 1..."
-#define STR_JOY2          "操纵杆 2..."
-#define STR_JOY3          "操纵杆 3..."
-#define STR_JOY4          "操纵杆 4..."
-
-#define STR_SOUND1        "声卡 1:"
-#define STR_SOUND2        "声卡 2:"
-#define STR_SOUND3        "声卡 3:"
-#define STR_SOUND4        "声卡 4:"
-#define STR_MIDI_OUT      "MIDI 输出设备:"
-#define STR_MIDI_IN       "MIDI 输入设备:"
-#define STR_MPU401        "独立 MPU-401"
-#define STR_FLOAT         "使用单精度浮点 (FLOAT32)"
-#define STR_FM_DRIVER     "调频合成器驱动器"
-#define STR_FM_DRV_NUKED  "Nuked (更准确)"
-#define STR_FM_DRV_YMFM   "YMFM (更快)"
-
-#define STR_NET_TYPE      "网络类型:"
-#define STR_PCAP          "PCap 设备:"
-#define STR_NET           "网络适配器:"
-#define STR_NET1          "网卡 1:"
-#define STR_NET2          "网卡 2:"
-#define STR_NET3          "网卡 3:"
-#define STR_NET4          "网卡 4:"
-
-#define STR_COM1          "COM1 设备:"
-#define STR_COM2          "COM2 设备:"
-#define STR_COM3          "COM3 设备:"
-#define STR_COM4          "COM4 设备:"
-#define STR_LPT1          "LPT1 设备:"
-#define STR_LPT2          "LPT2 设备:"
-#define STR_LPT3          "LPT3 设备:"
-#define STR_LPT4          "LPT4 设备:"
-#define STR_SERIAL1       "串口 1"
-#define STR_SERIAL2       "串口 2"
-#define STR_SERIAL3       "串口 3"
-#define STR_SERIAL4       "串口 4"
-#define STR_PARALLEL1     "并口 1"
-#define STR_PARALLEL2     "并口 2"
-#define STR_PARALLEL3     "并口 3"
-#define STR_PARALLEL4     "并口 4"
-#define STR_SERIAL_PASS1  "串口直通 1"
-#define STR_SERIAL_PASS2  "串口直通 2"
-#define STR_SERIAL_PASS3  "串口直通 3"
-#define STR_SERIAL_PASS4  "串口直通 4"
-
-#define STR_HDC           "硬盘控制器:"
-#define STR_FDC           "软盘控制器:"
-#define STR_IDE_TER       "第三 IDE 控制器"
-#define STR_IDE_QUA       "第四 IDE 控制器"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "控制器 1:"
-#define STR_SCSI_2        "控制器 2:"
-#define STR_SCSI_3        "控制器 3:"
-#define STR_SCSI_4        "控制器 4:"
-#define STR_CASSETTE      "磁带"
-
-#define STR_HDD           "硬盘:"
-#define STR_NEW           "新建(&N)..."
-#define STR_EXISTING      "已有映像(&E)..."
-#define STR_REMOVE        "移除(&R)"
-#define STR_BUS           "总线:"
-#define STR_CHANNEL       "通道:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "速度:"
-
-#define STR_SPECIFY       "指定(&S)..."
-#define STR_SECTORS       "扇区(S):"
-#define STR_HEADS         "磁头(H):"
-#define STR_CYLS          "柱面(C):"
-#define STR_SIZE_MB       "大小 (MB):"
-#define STR_TYPE          "类型:"
-#define STR_IMG_FORMAT    "映像格式:"
-#define STR_BLOCK_SIZE    "块大小:"
-
-#define STR_FLOPPY_DRIVES "软盘驱动器:"
-#define STR_TURBO         "加速时序"
-#define STR_CHECKBPB      "检查 BPB"
-#define STR_CDROM_DRIVES  "光盘驱动器:"
-#define STR_CD_SPEED      "速度:"
-
-#define STR_MO_DRIVES     "磁光盘驱动器:"
-#define STR_ZIP_DRIVES    "ZIP 驱动器:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "ISA 实时时钟:"
-#define STR_ISAMEM        "ISA 内存扩充"
-#define STR_ISAMEM_1      "扩展卡 1:"
-#define STR_ISAMEM_2      "扩展卡 2:"
-#define STR_ISAMEM_3      "扩展卡 3:"
-#define STR_ISAMEM_4      "扩展卡 4:"
-#define STR_BUGGER        "ISABugger 设备"
-#define STR_POSTCARD      "自检 (POST) 卡"
-
-#define FONT_SIZE        9
-#define FONT_NAME        "Microsoft YaHei"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "错误"
-    IDS_2050    "致命错误"
-    IDS_2051    " - 已暂停"
-    IDS_2052    "按下 Ctrl+Alt+PgDn 返回到窗口模式。"
-    IDS_2053    "速度"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "ZIP 映像 (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "86Box 找不到任何可用的 ROM 映像。\n\n请<a href=""https://github.com/86Box/roms/releases/latest"">下载</a>ROM 包并将其解压到 ""roms"" 文件夹中。"
-    IDS_2057    "(空)"
-    IDS_2058    "ZIP 映像 (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0所有文件 (*.*)\0*.*\0"
-    IDS_2059    "加速"
-    IDS_2060    "开"
-    IDS_2061    "关"
-    IDS_2062    "所有映像 (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0基本扇区映像 (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0表面映像 (*.86F)\0*.86F\0"
-    IDS_2063    "由于 roms/machines 文件夹中缺少合适的 ROM，机型 ""%hs"" 不可用。将切换到其他可用机型。"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "由于 roms/video 文件夹中缺少合适的 ROM，显卡 ""%hs"" 不可用。将切换到其他可用显卡。"
-    IDS_2065    "机型"
-    IDS_2066    "显示"
-    IDS_2067    "输入设备"
-    IDS_2068    "声音"
-    IDS_2069    "网络"
-    IDS_2070    "端口 (COM 和 LPT)"
-    IDS_2071    "存储控制器"
-    IDS_2072    "硬盘"
-    IDS_2073    "软盘/光盘驱动器"
-    IDS_2074    "其他可移动设备"
-    IDS_2075    "其他外围设备"
-    IDS_2076    "表面映像 (*.86F)\0*.86F\0"
-    IDS_2077    "单击窗口捕捉鼠标"
-    IDS_2078    "按下 F8+F12 释放鼠标"
-    IDS_2079    "按下 F8+F12 或鼠标中键释放鼠标"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "总线"
-    IDS_2082    "文件"
-    IDS_2083    "C"
-    IDS_2084    "H"
-    IDS_2085    "S"
-    IDS_2086    "MB"
-    IDS_2087    "速度"
-    IDS_2088    "检查 BPB"
-    IDS_2089    "KB"
-    IDS_2090    "无法初始化视频渲染器。"
-    IDS_2091    "默认"
-    IDS_2092    "%i 等待状态 (WS)"
-    IDS_2093    "类型"
-    IDS_2094    "设置 PCap 失败"
-    IDS_2095    "未找到 PCap 设备"
-    IDS_2096    "无效 PCap 设备"
-    IDS_2097    "标准 2 键操纵杆"
-    IDS_2098    "标准 4 键操纵杆"
-    IDS_2099    "标准 6 键操纵杆"
-    IDS_2100    "标准 8 键操纵杆"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Thrustmaster Flight Control System"
-    IDS_2104    "无"
-    IDS_2105    "无法加载键盘加速器。"
-    IDS_2106    "无法注册原始输入。"
-    IDS_2107    "%u"
-    IDS_2108    "%u MB (CHS: %i, %i, %i)"
-    IDS_2109    "软盘 %i (%s): %ls"
-    IDS_2110    "所有映像 (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0高级扇区映像 (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0基本扇区映像 (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Flux 映像 (*.FDI)\0*.FDI\0表面映像 (*.86F;*.MFM)\0*.86F;*.MFM\0所有文件 (*.*)\0*.*\0"
-    IDS_2112    "无法初始化 SDL，需要 SDL2.dll"
-    IDS_2113    "确定要硬重置模拟器吗？"
-    IDS_2114    "确定要退出 86Box 吗？"
-    IDS_2115    "无法初始化 Ghostscript"
-    IDS_2116    "磁光盘 %i (%ls): %ls"
-    IDS_2117    "磁光盘映像 (*.IM?;*.MDI)\0*.IM?;*.MDI\0所有文件 (*.*)\0*.*\0"
-    IDS_2118    "欢迎使用 86Box！"
-    IDS_2119    "内部控制器"
-    IDS_2120    "退出"
-    IDS_2121    "找不到 ROM"
-    IDS_2122    "要保存设置吗？"
-    IDS_2123    "此操作将硬重置模拟器。"
-    IDS_2124    "保存"
-    IDS_2125    "关于 86Box"
-    IDS_2126    "86Box v" EMU_VERSION
-
-    IDS_2127    "一个旧式计算机模拟器\n\n作者: Miran Grča (OBattler)、RichardG867、Jasmine Iwanek、TC1995、coldbrewed、Teemu Korhonen (Manaatti)、Joakim L. Gilje、Adrien Moulin (elyosh)、Daniel Balsom (gloriouscow)、Cacodemon345、Fred N. van Kempen (waltje)、Tiseno100、reenigne 等人。\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\n本软件依据 GNU 通用公共许可证第二版或更新版本发布。详情见 LICENSE 文件。"
-    IDS_2128    "确定"
-    IDS_2129    "硬件不可用"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "请确认 " LIB_NAME_PCAP " 已安装且使用兼容 " LIB_NAME_PCAP " 的网络连接。"
-    IDS_2131    "无效配置"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " 是将 PostScript 文件转换为 PDF 所需要的库。\n\n使用通用 PostScript 打印机打印的文档将被保存为 PostScript (.ps) 文件。"
-    IDS_2135    "正在进入全屏模式"
-    IDS_2136    "不再显示此消息"
-    IDS_2137    "不退出"
-    IDS_2138    "重置"
-    IDS_2139    "不重置"
-    IDS_2140    "磁光盘映像 (*.IM?;*.MDI)\0*.IM?;*.MDI\0所有文件 (*.*)\0*.*\0"
-    IDS_2141    "光盘映像 (*.ISO;*.CUE)\0*.ISO;*.CUE\0所有文件 (*.*)\0*.*\0"
-    IDS_2142    "%hs 设备配置"
-    IDS_2143    "显示器处在睡眠状态"
-    IDS_2144    "OpenGL 着色器 (*.GLSL)\0*.GLSL\0所有文件 (*.*)\0*.*\0"
-    IDS_2145    "OpenGL 选项"
-    IDS_2146    "正在载入一个不受支持的配置"
-    IDS_2147    "此模拟计算机禁用了基于选定计算机的 CPU 类型过滤。\n\n能够选中与所选机器本不兼容的 CPU，但是可能会遇到与机器 BIOS 或其他软件不兼容的问题。\n\n启用此设置不受官方支持，并且提交的任何错误报告可能会视为无效而关闭。"
-    IDS_2148    "继续"
-    IDS_2149    "磁带: %s"
-    IDS_2150    "磁带映像 (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0所有文件 (*.*)\0*.*\0"
-    IDS_2151    "卡带 %i: %ls"
-    IDS_2152    "卡带映像 (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0所有文件 (*.*)\0*.*\0"
-    IDS_2153    "初始化渲染器时出错"
-    IDS_2154    "无法初始化 OpenGL (3.0 核心) 渲染器。请使用其他渲染器。"
-    IDS_2155    "恢复执行"
-    IDS_2156    "暂停执行"
-    IDS_2157    "按下 Ctrl+Alt+Del"
-    IDS_2158    "按下 Ctrl+Alt+Esc"
-    IDS_2159    "硬重置"
-    IDS_2160    "ACPI 关机"
-    IDS_2161    "设置"
-    IDS_2162    "类型"
-    IDS_2163    "无动态重编译"
-    IDS_2164    "旧式动态重编译"
-    IDS_2165    "新式动态重编译"
-    IDS_2166    "由于 roms/video 文件夹中缺少合适的 ROM，显卡 #2 ""%hs"" 不可用。将禁用第二张显卡。"
-    IDS_2167    "初始化网络驱动程序失败"
-    IDS_2168    "网络配置将切换为空驱动程序"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "硬盘 (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "不存在 MFM/RLL 或 ESDI CD-ROM 驱动器"
-    IDS_4100    "自定义..."
-    IDS_4101    "自定义 (大容量)..."
-    IDS_4102    "添加新硬盘"
-    IDS_4103    "添加已存在的硬盘"
-    IDS_4104    "HDI 磁盘映像不能超过 4 GB。"
-    IDS_4105    "磁盘映像不能超过 127 GB。"
-    IDS_4106    "硬盘映像 (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0所有文件 (*.*)\0*.*\0"
-    IDS_4107    "无法读取文件"
-    IDS_4108    "无法写入文件"
-    IDS_4109    "不支持非 512 字节扇区大小的 HDI 或 HDX 映像。"
-    IDS_4110    "尚未支持 USB"
-    IDS_4111    "磁盘映像文件已存在"
-    IDS_4112    "请指定有效的文件名。"
-    IDS_4113    "已创建磁盘映像"
-    IDS_4114    "请确定此文件已存在并可读取。"
-    IDS_4115    "请确定此文件保存在可写目录中。"
-    IDS_4116    "磁盘映像太大"
-    IDS_4117    "请记得为新创建的映像分区并格式化。"
-    IDS_4118    "选定的文件将被覆盖。确定继续使用此文件吗？"
-    IDS_4119    "不支持的磁盘映像"
-    IDS_4120    "覆盖"
-    IDS_4121    "不覆盖"
-    IDS_4122    "原始映像 (.img)"
-    IDS_4123    "HDI 映像 (.hdi)"
-    IDS_4124    "HDX 映像 (.hdx)"
-    IDS_4125    "固定大小 VHD (.vhd)"
-    IDS_4126    "动态大小 VHD (.vhd)"
-    IDS_4127    "差分 VHD (.vhd)"
-    IDS_4128    "大块 (2 MB)"
-    IDS_4129    "小块 (512 KB)"
-    IDS_4130    "VHD 文件 (*.VHD)\0*.VHD\0所有文件 (*.*)\0*.*\0"
-    IDS_4131    "选择父 VHD 文件"
-    IDS_4132    "父映像可能在创建差异映像后被修改。\n\n如果映像文件被移动或复制，或创建此磁盘的程序中存在错误，也可能发生这种情况。\n\n是否需要修复时间戳？"
-    IDS_4133    "父盘与子盘的时间戳不匹配"
-    IDS_4134    "无法修复 VHD 时间戳。"
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "光盘 %i (%s): %s"
-
-    IDS_5376    "禁用"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "禁用"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 kB"
-    IDS_5889    "180 kB"
-    IDS_5890    "320 kB"
-    IDS_5891    "360 kB"
-    IDS_5892    "640 kB"
-    IDS_5893    "720 kB"
-    IDS_5894    "1.2 MB"
-    IDS_5895    "1.25 MB"
-    IDS_5896    "1.44 MB"
-    IDS_5897    "DMF (1024 簇)"
-    IDS_5898    "DMF (2048 簇)"
-    IDS_5899    "2.88 MB"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5 英寸 128 MB (ISO 10090)"
-    IDS_5903    "3.5 英寸 230 MB (ISO 13963)"
-    IDS_5904    "3.5 英寸 540 MB (ISO 15498)"
-    IDS_5905    "3.5 英寸 640 MB (ISO 15498)"
-    IDS_5906    "3.5 英寸 1.3 GB (GigaMO)"
-    IDS_5907    "3.5 英寸 2.3 GB (GigaMO 2)"
-    IDS_5908    "5.25 英寸 600 MB"
-    IDS_5909    "5.25 英寸 650 MB"
-    IDS_5910    "5.25 英寸 1 GB"
-    IDS_5911    "5.25 英寸 1.3 GB"
-
-    IDS_6144    "标准转速 (RPM)"
-    IDS_6145    "低于标准转速的 1%"
-    IDS_6146    "低于标准转速的 1.5%"
-    IDS_6147    "低于标准转速的 2%"
-
-    IDS_7168    "(系统默认)"
-END
-#define IDS_LANG_ENUS IDS_7168
-
-// Simplified Chinese resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/languages/zh-TW.rc b/src/win/languages/zh-TW.rc
deleted file mode 100644
index dcc01836b..000000000
--- a/src/win/languages/zh-TW.rc
+++ /dev/null
@@ -1,637 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Traditional Chinese resources
-
-#ifdef _WIN32
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
-#pragma code_page(65001)
-#endif //_WIN32
-
-#define AUTHORS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MainMenu MENU DISCARDABLE
-BEGIN
-    POPUP "動作(&A)"
-    BEGIN
-        MENUITEM "鍵盤需要捕捉(&K)", IDM_ACTION_KBD_REQ_CAPTURE
-        MENUITEM "將右 CTRL 鍵映射為左 ALT 鍵(&R)", IDM_ACTION_RCTRL_IS_LALT
-        MENUITEM SEPARATOR
-        MENUITEM "硬重設(&H)...", IDM_ACTION_HRESET
-        MENUITEM "Ctrl+Alt+Del(&C)\tCtrl+F12", IDM_ACTION_RESET_CAD
-        MENUITEM SEPARATOR
-        MENUITEM "Ctrl+Alt+Esc(&E)", IDM_ACTION_CTRL_ALT_ESC
-        MENUITEM SEPARATOR
-        MENUITEM "暫停(&P)", IDM_ACTION_PAUSE
-        MENUITEM SEPARATOR
-        MENUITEM "退出(&X)...", IDM_ACTION_EXIT
-    END
-    POPUP "檢視(&V)"
-    BEGIN
-        MENUITEM "隱藏狀態列(&H)", IDM_VID_HIDE_STATUS_BAR
-        MENUITEM "隱藏工具列(&T)", IDM_VID_HIDE_TOOLBAR
-        MENUITEM SEPARATOR
-        MENUITEM "Show non-primary monitors(&S)", IDM_VID_MONITORS
-        MENUITEM "視窗大小可調(&R)", IDM_VID_RESIZE
-        MENUITEM "記住視窗大小和位置(&E)", IDM_VID_REMEMBER
-        MENUITEM SEPARATOR
-        POPUP "渲染器(&N)"
-        BEGIN
-            MENUITEM "SDL (軟體)(&S)", IDM_VID_SDL_SW
-            MENUITEM "SDL (硬體)(&H)", IDM_VID_SDL_HW
-            MENUITEM "SDL (OpenGL)(&O)", IDM_VID_SDL_OPENGL
-            MENUITEM "OpenGL (3.0 核心)(&G)", IDM_VID_OPENGL_CORE
-#ifdef USE_VNC
-            MENUITEM "VNC(&V)", IDM_VID_VNC
-#endif
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "指定視窗大小...", IDM_VID_SPECIFY_DIM
-        MENUITEM "強制 4:3 顯示比例(&O)", IDM_VID_FORCE43
-        POPUP "視窗縮放係數(&W)"
-        BEGIN
-            MENUITEM "0.5x(&0)", IDM_VID_SCALE_1X
-            MENUITEM "1x(&1)", IDM_VID_SCALE_2X
-            MENUITEM "1.5x(&5)", IDM_VID_SCALE_3X
-            MENUITEM "2x(&2)", IDM_VID_SCALE_4X
-            MENUITEM "&3x", IDM_VID_SCALE_5X
-            MENUITEM "&4x", IDM_VID_SCALE_6X
-            MENUITEM "&5x", IDM_VID_SCALE_7X
-            MENUITEM "&6x", IDM_VID_SCALE_8X
-            MENUITEM "&7x", IDM_VID_SCALE_9X
-            MENUITEM "&8x", IDM_VID_SCALE_10X
-        END
-        POPUP "過濾方式"
-        BEGIN
-            MENUITEM "鄰近(&N)", IDM_VID_FILTER_NEAREST
-            MENUITEM "線性(&L)", IDM_VID_FILTER_LINEAR
-        END
-        MENUITEM "HiDPI 縮放(&D)", IDM_VID_HIDPI
-        MENUITEM SEPARATOR
-        MENUITEM "全螢幕(&F)\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN
-        POPUP "全螢幕拉伸模式(&S)"
-        BEGIN
-            MENUITEM "全螢幕拉伸(&F)", IDM_VID_FS_FULL
-            MENUITEM "4:3(&4)", IDM_VID_FS_43
-            MENUITEM "保持比例(&S)", IDM_VID_FS_KEEPRATIO
-            MENUITEM "整數比例(&I)", IDM_VID_FS_INT
-        END
-        POPUP "EGA/(S)VGA 設定(&G)"
-        BEGIN
-            MENUITEM "VGA 顯示器反色顯示(&I)", IDM_VID_INVERT
-            POPUP "VGA 螢幕類型(&T)"
-            BEGIN
-                MENUITEM "RGB 彩色(&C)", IDM_VID_GRAY_RGB
-                MENUITEM "RGB 灰度(&R)", IDM_VID_GRAY_MONO
-                MENUITEM "琥珀色單色顯示器(&A)", IDM_VID_GRAY_AMBER
-                MENUITEM "綠色單色顯示器(&G)", IDM_VID_GRAY_GREEN
-                MENUITEM "白色單色顯示器(&W)", IDM_VID_GRAY_WHITE
-            END
-            POPUP "灰度轉換類型(&C)"
-            BEGIN
-                MENUITEM "BT601 (NTSC/PAL)(&6)", IDM_VID_GRAYCT_601
-                MENUITEM "BT709 (HDTV)(&7)", IDM_VID_GRAYCT_709
-                MENUITEM "平均(&A)", IDM_VID_GRAYCT_AVE
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "CGA/PCjr/Tandy/EGA/(S)VGA 過掃描(&G)", IDM_VID_OVERSCAN
-        MENUITEM "變更單色顯示對比度(&M)", IDM_VID_CGACON
-    END
-    MENUITEM "介質(&M)", IDM_MEDIA
-    POPUP "工具(&T)"
-    BEGIN
-        MENUITEM "設定(&S)...", IDM_CONFIG
-        MENUITEM "更新狀態列圖示(&U)", IDM_UPDATE_ICONS
-        MENUITEM SEPARATOR
-        MENUITEM "擷圖(&C)\tCtrl+F11", IDM_ACTION_SCREENSHOT
-        MENUITEM SEPARATOR
-        MENUITEM "偏好設定(&P)...", IDM_PREFERENCES
-#ifdef DISCORD
-        MENUITEM "啟用 Discord 整合(&D)", IDM_DISCORD
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "音量增益(&G)...", IDM_SND_GAIN
-#ifdef MTR_ENABLED
-        MENUITEM SEPARATOR
-        MENUITEM "開始追踪\tCtrl+T", IDM_ACTION_BEGIN_TRACE
-        MENUITEM "結束追踪\tCtrl+T", IDM_ACTION_END_TRACE
-#endif
-    END
-    POPUP "說明(&H)"
-    BEGIN
-        MENUITEM "文件(&D)...", IDM_DOCS
-        MENUITEM "關於 86Box(&A)...", IDM_ABOUT
-    END
-END
-
-StatusBarMenu MENU DISCARDABLE
-BEGIN
-    MENUITEM SEPARATOR
-END
-
-CassetteSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "新增映像(&N)...", IDM_CASSETTE_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "開啟已存在的映像(&E)...", IDM_CASSETTE_IMAGE_EXISTING
-        MENUITEM "開啟已存在的映像並寫保護(&W)...", IDM_CASSETTE_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "錄製(&R)", IDM_CASSETTE_RECORD
-        MENUITEM "播放(&P)", IDM_CASSETTE_PLAY
-        MENUITEM "倒帶至起點(&R)", IDM_CASSETTE_REWIND
-        MENUITEM "快進至終點(&F)", IDM_CASSETTE_FAST_FORWARD
-        MENUITEM SEPARATOR
-        MENUITEM "退出(&J)", IDM_CASSETTE_EJECT
-    END
-END
-
-CartridgeSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "映像(&I)...", IDM_CARTRIDGE_IMAGE
-        MENUITEM SEPARATOR
-        MENUITEM "退出(&J)", IDM_CARTRIDGE_EJECT
-    END
-END
-
-FloppySubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "新增映像(&N)...", IDM_FLOPPY_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "開啟已存在的映像(&E)...", IDM_FLOPPY_IMAGE_EXISTING
-        MENUITEM "開啟已存在的映像並寫保護(&W)...", IDM_FLOPPY_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "匯出為 86F 格式(&x)...", IDM_FLOPPY_EXPORT_TO_86F
-        MENUITEM SEPARATOR
-        MENUITEM "退出(&J)", IDM_FLOPPY_EJECT
-    END
-END
-
-CdromSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "靜音(&M)", IDM_CDROM_MUTE
-        MENUITEM SEPARATOR
-        MENUITEM "空置光碟機(&M)", IDM_CDROM_EMPTY
-        MENUITEM "載入上一個映像(&R)", IDM_CDROM_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "映像(&I)...", IDM_CDROM_IMAGE
-        MENUITEM "資料夾(&F)...", IDM_CDROM_DIR
-    END
-END
-
-ZIPSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "新增映像(&N)...", IDM_ZIP_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "開啟已存在的映像(&E)...", IDM_ZIP_IMAGE_EXISTING
-        MENUITEM "開啟已存在的映像並寫保護(&W)...", IDM_ZIP_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "退出(&J)", IDM_ZIP_EJECT
-        MENUITEM "載入上一個映像(&R)", IDM_ZIP_RELOAD
-    END
-END
-
-MOSubmenu MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "新增映像(&N)...", IDM_MO_IMAGE_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "開啟已存在的映像(&E)...", IDM_MO_IMAGE_EXISTING
-        MENUITEM "開啟已存在的映像並寫保護(&W)...", IDM_MO_IMAGE_EXISTING_WP
-        MENUITEM SEPARATOR
-        MENUITEM "退出(&J)", IDM_MO_EJECT
-        MENUITEM "載入上一個映像(&R)", IDM_MO_RELOAD
-    END
-END
-
-VidGLSubMenu MENU DISCARDABLE
-BEGIN
-    POPUP "目標幀率(&F)"
-    BEGIN
-        MENUITEM "與視訊同步(&S)", IDM_VID_GL_FPS_BLITTER
-        MENUITEM "25 fps(&2)", IDM_VID_GL_FPS_25
-        MENUITEM "30 fps(&3)", IDM_VID_GL_FPS_30
-        MENUITEM "50 fps(&5)", IDM_VID_GL_FPS_50
-        MENUITEM "60 fps(&6)", IDM_VID_GL_FPS_60
-        MENUITEM "75 fps(&7)", IDM_VID_GL_FPS_75
-    END
-    MENUITEM "垂直同步(&V)", IDM_VID_GL_VSYNC
-    MENUITEM "選取著色器(&S)...", IDM_VID_GL_SHADER
-    MENUITEM "移除著色器(&R)", IDM_VID_GL_NOSHADER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-#define STR_PREFERENCES   "偏好設定"
-#define STR_SND_GAIN      "音量增益"
-#define STR_NEW_FLOPPY    "新增映像"
-#define STR_CONFIG        "設定"
-#define STR_SPECIFY_DIM   "指定主視窗大小"
-
-#define STR_OK            "確定"
-#define STR_CANCEL        "取消"
-#define STR_GLOBAL        "將以上設定存儲為全局預設值(&G)"
-#define STR_DEFAULT       "預設(&D)"
-#define STR_LANGUAGE      "語言:"
-#define STR_ICONSET       "圖示集:"
-
-#define STR_GAIN          "增益"
-
-#define STR_FILE_NAME     "檔案名:"
-#define STR_DISK_SIZE     "磁碟大小:"
-#define STR_RPM_MODE      "轉速 (RPM) 模式:"
-#define STR_PROGRESS      "進度:"
-
-#define STR_WIDTH         "寬度:"
-#define STR_HEIGHT        "高度:"
-#define STR_LOCK_TO_SIZE  "鎖定此大小"
-
-#define STR_MACHINE_TYPE  "機器類型:"
-#define STR_MACHINE       "機型:"
-#define STR_CONFIGURE     "設定"
-#define STR_CPU_TYPE      "CPU 類型:"
-#define STR_CPU_SPEED     "速度:"
-#define STR_FPU           "浮點處理器 (FPU):"
-#define STR_WAIT_STATES   "等待狀態 (WS):"
-#define STR_MB            "MB"
-#define STR_MEMORY        "記憶體:"
-#define STR_TIME_SYNC     "時間同步"
-#define STR_DISABLED      "停用"
-#define STR_ENABLED_LOCAL "啟用 (本地時間)"
-#define STR_ENABLED_UTC   "啟用 (UTC)"
-#define STR_DYNAREC       "動態重編譯器"
-#define STR_SOFTFLOAT     "Softfloat FPU"
-
-#define STR_VIDEO         "顯示卡:"
-#define STR_VIDEO_2       "顯示卡 2:"
-#define STR_VOODOO        "Voodoo Graphics"
-#define STR_IBM8514       "IBM 8514/A Graphics"
-#define STR_XGA           "XGA Graphics"
-
-#define STR_MOUSE         "滑鼠:"
-#define STR_JOYSTICK      "搖桿:"
-#define STR_JOY1          "搖桿 1..."
-#define STR_JOY2          "搖桿 2..."
-#define STR_JOY3          "搖桿 3..."
-#define STR_JOY4          "搖桿 4..."
-
-#define STR_SOUND1        "音效卡 1:"
-#define STR_SOUND2        "音效卡 2:"
-#define STR_SOUND3        "音效卡 3:"
-#define STR_SOUND4        "音效卡 4:"
-#define STR_MIDI_OUT      "MIDI 輸出裝置:"
-#define STR_MIDI_IN       "MIDI 輸入裝置:"
-#define STR_MPU401        "獨立 MPU-401"
-#define STR_FLOAT         "使用單精度浮點 (FLOAT32)"
-#define STR_FM_DRIVER     "調頻合成器驅動器"
-#define STR_FM_DRV_NUKED  "Nuked (更準確)"
-#define STR_FM_DRV_YMFM   "YMFM (更快)"
-
-#define STR_NET_TYPE      "網路類型:"
-#define STR_PCAP          "PCap 裝置:"
-#define STR_NET           "網路配接器:"
-#define STR_NET1          "網路卡 1:"
-#define STR_NET2          "網路卡 2:"
-#define STR_NET3          "網路卡 3:"
-#define STR_NET4          "網路卡 4:"
-
-#define STR_COM1          "COM1 裝置:"
-#define STR_COM2          "COM2 裝置:"
-#define STR_COM3          "COM3 裝置:"
-#define STR_COM4          "COM4 裝置:"
-#define STR_LPT1          "LPT1 裝置:"
-#define STR_LPT2          "LPT2 裝置:"
-#define STR_LPT3          "LPT3 裝置:"
-#define STR_LPT4          "LPT4 裝置:"
-#define STR_SERIAL1       "序列埠 1"
-#define STR_SERIAL2       "序列埠 2"
-#define STR_SERIAL3       "序列埠 3"
-#define STR_SERIAL4       "序列埠 4"
-#define STR_PARALLEL1     "並列埠 1"
-#define STR_PARALLEL2     "並列埠 2"
-#define STR_PARALLEL3     "並列埠 3"
-#define STR_PARALLEL4     "並列埠 4"
-#define STR_SERIAL_PASS1  "序列埠直通 1"
-#define STR_SERIAL_PASS2  "序列埠直通 2"
-#define STR_SERIAL_PASS3  "序列埠直通 3"
-#define STR_SERIAL_PASS4  "序列埠直通 4"
-
-#define STR_HDC           "硬碟控制器:"
-#define STR_FDC           "軟碟控制器:"
-#define STR_IDE_TER       "第三 IDE 控制器"
-#define STR_IDE_QUA       "第四 IDE 控制器"
-#define STR_SCSI          "SCSI"
-#define STR_SCSI_1        "控制器 1:"
-#define STR_SCSI_2        "控制器 2:"
-#define STR_SCSI_3        "控制器 3:"
-#define STR_SCSI_4        "控制器 4:"
-#define STR_CASSETTE      "磁帶"
-
-#define STR_HDD           "硬碟:"
-#define STR_NEW           "新增(&N)..."
-#define STR_EXISTING      "已有映像(&E)..."
-#define STR_REMOVE        "移除(&R)"
-#define STR_BUS           "匯流排:"
-#define STR_CHANNEL       "通道:"
-#define STR_ID            "ID:"
-#define STR_SPEED         "Speed:"
-
-#define STR_SPECIFY       "指定(&S)..."
-#define STR_SECTORS       "磁區(S):"
-#define STR_HEADS         "磁頭(H):"
-#define STR_CYLS          "磁柱(C):"
-#define STR_SIZE_MB       "大小 (MB):"
-#define STR_TYPE          "類型:"
-#define STR_IMG_FORMAT    "映像格式:"
-#define STR_BLOCK_SIZE    "區塊大小:"
-
-#define STR_FLOPPY_DRIVES "軟碟機:"
-#define STR_TURBO         "加速時序"
-#define STR_CHECKBPB      "檢查 BPB"
-#define STR_CDROM_DRIVES  "光碟機:"
-#define STR_CD_SPEED      "速度:"
-
-#define STR_MO_DRIVES     "磁光碟機:"
-#define STR_ZIP_DRIVES    "ZIP 磁碟機:"
-#define STR_250           "ZIP 250"
-
-#define STR_ISARTC        "ISA 實時時鐘:"
-#define STR_ISAMEM        "ISA 記憶體擴充"
-#define STR_ISAMEM_1      "擴充卡 1:"
-#define STR_ISAMEM_2      "擴充卡 2:"
-#define STR_ISAMEM_3      "擴充卡 3:"
-#define STR_ISAMEM_4      "擴充卡 4:"
-#define STR_BUGGER        "ISABugger 裝置"
-#define STR_POSTCARD      "自檢 (POST) 卡"
-
-#define FONT_SIZE        9
-#define FONT_NAME        "Microsoft JhengHei"
-
-#include "dialogs.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    2048        "86Box"
-    IDS_2049    "錯誤"
-    IDS_2050    "致命錯誤"
-    IDS_2051    " - 已暫停"
-    IDS_2052    "按下 Ctrl+Alt+PgDn 返回到視窗模式。"
-    IDS_2053    "速度"
-    IDS_2054    "ZIP %03i %i (%s): %ls"
-    IDS_2055    "ZIP 映像 (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
-    IDS_2056    "86Box 找不到任何可用的 ROM 映像。\n\n請<a href=""https://github.com/86Box/roms/releases/latest"">下載</a> ROM 套件並將其解壓到 ""roms"" 資料夾。"
-    IDS_2057    "(空)"
-    IDS_2058    "ZIP 映像 (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0所有檔案 (*.*)\0*.*\0"
-    IDS_2059    "加速"
-    IDS_2060    "開"
-    IDS_2061    "關"
-    IDS_2062    "所有映像 (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0基本磁區映像 (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0表面映像 (*.86F)\0*.86F\0"
-    IDS_2063    "由於 roms/machines 資料夾中缺少合適的 ROM，機型 ""%hs"" 不可用。將切換到其他可用機型。"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2064    "由於 roms/video 資料夾中缺少合適的 ROM，顯示卡 ""%hs"" 不可用。將切換到其他可用顯示卡。"
-    IDS_2065    "機型"
-    IDS_2066    "顯示"
-    IDS_2067    "輸入裝置"
-    IDS_2068    "聲音"
-    IDS_2069    "網路"
-    IDS_2070    "連接埠 (COM 和 LPT)"
-    IDS_2071    "存儲控制器"
-    IDS_2072    "硬碟"
-    IDS_2073    "軟碟/光碟機"
-    IDS_2074    "其他可移除裝置"
-    IDS_2075    "其他周邊裝置"
-    IDS_2076    "表面映像 (*.86F)\0*.86F\0"
-    IDS_2077    "點擊視窗捕捉滑鼠"
-    IDS_2078    "按下 F8+F12 釋放滑鼠"
-    IDS_2079    "按下 F8+F12 或滑鼠中鍵釋放滑鼠"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_2081    "匯流排"
-    IDS_2082    "檔案"
-    IDS_2083    "C"
-    IDS_2084    "H"
-    IDS_2085    "S"
-    IDS_2086    "MB"
-    IDS_2087    "Speed"
-    IDS_2088    "檢查 BPB"
-    IDS_2089    "KB"
-    IDS_2090    "無法初始化視訊渲染器。"
-    IDS_2091    "預設"
-    IDS_2092    "%i 等待狀態 (WS)"
-    IDS_2093    "類型"
-    IDS_2094    "設定 PCap 失敗"
-    IDS_2095    "未找到 PCap 裝置"
-    IDS_2096    "無效 PCap 裝置"
-    IDS_2097    "標準 2 鍵搖桿"
-    IDS_2098    "標準 4 鍵搖桿"
-    IDS_2099    "標準 6 鍵搖桿"
-    IDS_2100    "標準 8 鍵搖桿"
-    IDS_2101    "CH Flightstick Pro"
-    IDS_2102    "Microsoft SideWinder Pad"
-    IDS_2103    "Thrustmaster Flight Control System"
-    IDS_2104    "無"
-    IDS_2105    "無法載入鍵盤加速器。"
-    IDS_2106    "無法註冊原始輸入。"
-    IDS_2107    "%u"
-    IDS_2108    "%u MB (CHS: %i, %i, %i)"
-    IDS_2109    "軟碟 %i (%s): %ls"
-    IDS_2110    "所有映像 (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0進階磁區映像 (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0基本磁區映像 (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Flux 映像 (*.FDI)\0*.FDI\0表面映像 (*.86F;*.MFM)\0*.86F;*.MFM\0所有檔案 (*.*)\0*.*\0"
-    IDS_2112    "無法初始化 SDL，需要 SDL2.dll"
-    IDS_2113    "確定要硬重設模擬器嗎？"
-    IDS_2114    "確定要退出 86Box 嗎？"
-    IDS_2115    "無法初始化 Ghostscript"
-    IDS_2116    "磁光碟 %i (%ls): %ls"
-    IDS_2117    "磁光碟映像 (*.IM?;*.MDI)\0*.IM?;*.MDI\0所有檔案 (*.*)\0*.*\0"
-    IDS_2118    "歡迎使用 86Box！"
-    IDS_2119    "內部控制器"
-    IDS_2120    "退出"
-    IDS_2121    "找不到 ROM"
-    IDS_2122    "要儲存設定嗎？"
-    IDS_2123    "此操作將硬重設模擬器。"
-    IDS_2124    "儲存"
-    IDS_2125    "關於 86Box"
-    IDS_2126    "86Box v" EMU_VERSION
-
-    IDS_2127    "一個舊式電腦模擬器\n\n作者: Miran Grča (OBattler)、RichardG867、Jasmine Iwanek、TC1995、coldbrewed、Teemu Korhonen (Manaatti)、Joakim L. Gilje、Adrien Moulin (elyosh)、Daniel Balsom (gloriouscow)、Cacodemon345、Fred N. van Kempen (waltje)、Tiseno100、reenigne 等人。\n\nWith previous core contributions from Sarah Walker, leilei, JohnElliott, greatpsycho, and others.\n\n本軟體依據 GNU 通用公共授權第二版或更新版本發布。詳情見 LICENSE 檔案。"
-    IDS_2128    "確定"
-    IDS_2129    "硬體不可用"
-#ifdef _WIN32
-#define LIB_NAME_PCAP "WinPcap"
-#else
-#define LIB_NAME_PCAP "libpcap"
-#endif
-    IDS_2130    "請確認 " LIB_NAME_PCAP " 已安裝且使用相容 " LIB_NAME_PCAP " 的網路連線。"
-    IDS_2131    "無效設定"
-#ifdef _WIN32
-#define LIB_NAME_GS "gsdll32.dll"
-#else
-#define LIB_NAME_GS "libgs"
-#endif
-    IDS_2133    LIB_NAME_GS " 是將 PostScript 檔案轉換為 PDF 所需要的庫。\n\n使用通用 PostScript 印表機列印的文件將被儲存為 PostScript (.ps) 檔案。"
-    IDS_2135    "正在進入全螢幕模式"
-    IDS_2136    "不要再顯示此消息"
-    IDS_2137    "不退出"
-    IDS_2138    "重設"
-    IDS_2139    "不重設"
-    IDS_2140    "磁光碟映像 (*.IM?;*.MDI)\0*.IM?;*.MDI\0所有檔案 (*.*)\0*.*\0"
-    IDS_2141    "光碟映像 (*.ISO;*.CUE)\0*.ISO;*.CUE\0所有檔案 (*.*)\0*.*\0"
-    IDS_2142    "%hs 裝置設定"
-    IDS_2143    "顯示器處在睡眠狀態"
-    IDS_2144    "OpenGL 著色器 (*.GLSL)\0*.GLSL\0所有檔案 (*.*)\0*.*\0"
-    IDS_2145    "OpenGL 選項"
-    IDS_2146    "正在載入一個不受支援的設定"
-    IDS_2147    "此模擬電腦停用了基於選定電腦的 CPU 類型過濾。\n\n能夠選中與所選機器本不相容的 CPU，但是可能會遇到與機器 BIOS 或其他軟體不相容的問題。\n\n啟用此設定不受官方支援，並且提交的任何錯誤報告可能會視為無效而關閉。"
-    IDS_2148    "繼續"
-    IDS_2149    "磁帶: %s"
-    IDS_2150    "磁帶映像 (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0所有檔案 (*.*)\0*.*\0"
-    IDS_2151    "卡帶 %i: %ls"
-    IDS_2152    "卡帶映像 (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0所有檔案 (*.*)\0*.*\0"
-    IDS_2153    "初始化渲染器時出錯"
-    IDS_2154    "無法初始化 OpenGL (3.0 核心) 渲染器。請使用其他渲染器。"
-    IDS_2155    "恢復執行"
-    IDS_2156    "暫停執行"
-    IDS_2157    "按下 Ctrl+Alt+Del"
-    IDS_2158    "按下 Ctrl+Alt+Esc"
-    IDS_2159    "硬重設"
-    IDS_2160    "ACPI 關機"
-    IDS_2161    "設定"
-    IDS_2162    "Type"
-    IDS_2163    "No Dynarec"
-    IDS_2164    "Old Dynarec"
-    IDS_2165    "New Dynarec"
-    IDS_2166    "Video card #2 ""%hs"" is not available due to missing ROMs in the roms/video directory. Disabling the second video card."
-    IDS_2167    "Failed to initialize network driver"
-    IDS_2168    "The network configuration will be switched to the null driver"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_4096    "硬碟 (%s)"
-    IDS_4097    "%01i:%01i"
-    IDS_4098    "%01i"
-    IDS_4099    "不存在 MFM/RLL 或 ESDI CD-ROM 光碟機"
-    IDS_4100    "自訂..."
-    IDS_4101    "自訂 (大容量)..."
-    IDS_4102    "增加新硬碟"
-    IDS_4103    "增加已存在的硬碟"
-    IDS_4104    "HDI 磁碟映像不能超過 4 GB。"
-    IDS_4105    "磁碟映像不能超過 127 GB。"
-    IDS_4106    "硬碟映像 (*.HD?;*.IM?;*.VHD)\0*.HD?;*.IM?;*.VHD\0所有檔案 (*.*)\0*.*\0"
-    IDS_4107    "無法讀取檔案"
-    IDS_4108    "無法寫入檔案"
-    IDS_4109    "不支援非 512 位元組磁區大小的 HDI 或 HDX 映像。"
-    IDS_4110    "尚未支援 USB"
-    IDS_4111    "磁碟映像檔案已存在"
-    IDS_4112    "請指定有效的檔案名。"
-    IDS_4113    "已創建磁碟映像"
-    IDS_4114    "請確定此檔案已存在並可讀取。"
-    IDS_4115    "請確定此檔案儲存在可寫目錄中。"
-    IDS_4116    "磁碟映像太大"
-    IDS_4117    "請記得為新創建的映像分區並格式化。"
-    IDS_4118    "選定的檔案將被覆蓋。確定繼續使用此檔案嗎？"
-    IDS_4119    "不支援的磁碟映像"
-    IDS_4120    "覆蓋"
-    IDS_4121    "不覆蓋"
-    IDS_4122    "原始映像 (.img)"
-    IDS_4123    "HDI 映像 (.hdi)"
-    IDS_4124    "HDX 映像 (.hdx)"
-    IDS_4125    "固定大小 VHD (.vhd)"
-    IDS_4126    "動態大小 VHD (.vhd)"
-    IDS_4127    "差分 VHD (.vhd)"
-    IDS_4128    "大區塊 (2 MB)"
-    IDS_4129    "小區塊 (512 KB)"
-    IDS_4130    "VHD 檔案 (*.VHD)\0*.VHD\0所有檔案 (*.*)\0*.*\0"
-    IDS_4131    "選取父 VHD 檔案"
-    IDS_4132    "父映像可能在創建差異映像後被修改。\n\n如果映像檔案被移動或複製，或創建此磁碟的程式中存在錯誤，也可能發生這種情況。\n\n是否需要修復時間戳？"
-    IDS_4133    "父碟與子碟的時間戳不匹配"
-    IDS_4134    "無法修復 VHD 時間戳。"
-    IDS_4135    "%01i:%02i"
-
-    IDS_4352    "MFM/RLL"
-    IDS_4353    "XTA"
-    IDS_4354    "ESDI"
-    IDS_4355    "IDE"
-    IDS_4356    "ATAPI"
-    IDS_4357    "SCSI"
-
-    IDS_4608    "MFM/RLL (%01i:%01i)"
-    IDS_4609    "XTA (%01i:%01i)"
-    IDS_4610    "ESDI (%01i:%01i)"
-    IDS_4611    "IDE (%01i:%01i)"
-    IDS_4612    "ATAPI (%01i:%01i)"
-    IDS_4613    "SCSI (%01i:%02i)"
-
-    IDS_5120    "光碟 %i (%s): %s"
-
-    IDS_5376    "停用"
-    IDS_5381    "ATAPI"
-    IDS_5382    "SCSI"
-
-    IDS_5632    "停用"
-    IDS_5637    "ATAPI (%01i:%01i)"
-    IDS_5638    "SCSI (%01i:%02i)"
-
-    IDS_5888    "160 kB"
-    IDS_5889    "180 kB"
-    IDS_5890    "320 kB"
-    IDS_5891    "360 kB"
-    IDS_5892    "640 kB"
-    IDS_5893    "720 kB"
-    IDS_5894    "1.2 MB"
-    IDS_5895    "1.25 MB"
-    IDS_5896    "1.44 MB"
-    IDS_5897    "DMF (1024 簇)"
-    IDS_5898    "DMF (2048 簇)"
-    IDS_5899    "2.88 MB"
-    IDS_5900    "ZIP 100"
-    IDS_5901    "ZIP 250"
-    IDS_5902    "3.5 英吋 128 MB (ISO 10090)"
-    IDS_5903    "3.5 英吋 230 MB (ISO 13963)"
-    IDS_5904    "3.5 英吋 540 MB (ISO 15498)"
-    IDS_5905    "3.5 英吋 640 MB (ISO 15498)"
-    IDS_5906    "3.5 英吋 1.3 GB (GigaMO)"
-    IDS_5907    "3.5 英吋 2.3 GB (GigaMO 2)"
-    IDS_5908    "5.25 英吋 600 MB"
-    IDS_5909    "5.25 英吋 650 MB"
-    IDS_5910    "5.25 英吋 1 GB"
-    IDS_5911    "5.25 英吋 1.3 GB"
-
-    IDS_6144    "標準轉速 (RPM)"
-    IDS_6145    "低於標準轉速的 1%"
-    IDS_6146    "低於標準轉速的 1.5%"
-    IDS_6147    "低於標準轉速的 2%"
-
-    IDS_7168    "(系統預設)"
-END
-#define IDS_LANG_ENUS IDS_7168
-
-// Traditional Chinese resources
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/win/pcap_if.rc b/src/win/pcap_if.rc
deleted file mode 100644
index acc6d25c4..000000000
--- a/src/win/pcap_if.rc
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifdef _WIN32
-#include <windows.h>
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-
-/*
- * Icons by Devcore
- * - https://commons.wikimedia.org/wiki/File:Icon_PC_256x256.png
- */
-#ifdef RELEASE_BUILD
-100                     ICON    DISCARDABLE     "win/icons/86Box-RB.ico"
-#else
-100                     ICON    DISCARDABLE     "win/icons/86Box.ico"
-#endif
-
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,2,0
- PRODUCTVERSION 1,0,2,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "IRC #SoftHistory\0"
-            VALUE "FileDescription", "PCap_IF - test tool for WinPcap\0"
-            VALUE "FileVersion", "1.0.2\0"
-            VALUE "InternalName", "pcap_if\0"
-            VALUE "LegalCopyright", "Copyright 2017 Fred N. van Kempen\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "pcap_if.exe\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "WinPcap Test Tool\0"
-            VALUE "ProductVersion", "1.0.2\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/src/win/win.c b/src/win/win.c
deleted file mode 100644
index d77ab32fd..000000000
--- a/src/win/win.c
+++ /dev/null
@@ -1,1346 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Platform main support module for Windows.
- *
- *
- *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
- *          Fred N. van Kempen, <decwiz@yahoo.com>
- *
- *          Copyright 2008-2019 Sarah Walker.
- *          Copyright 2016-2019 Miran Grca.
- *          Copyright 2017-2019 Fred N. van Kempen.
- *          Copyright 2021 Laci bá'
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-#define UNICODE
-#define NTDDI_VERSION 0x06010000
-#include <windows.h>
-#include <commctrl.h>
-#include <shlobj.h>
-#include <shobjidl.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <direct.h>
-#include <wchar.h>
-#include <io.h>
-#include <stdatomic.h>
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include <86box/config.h>
-#include <86box/device.h>
-#include <86box/keyboard.h>
-#include <86box/mouse.h>
-#include <86box/timer.h>
-#include <86box/nvr.h>
-#include <86box/video.h>
-#include <86box/mem.h>
-#include <86box/rom.h>
-#include <86box/path.h>
-#define GLOBAL
-#include <86box/plat.h>
-#include <86box/plat_dynld.h>
-#include <86box/thread.h>
-#include <86box/ui.h>
-#ifdef USE_VNC
-#    include <86box/vnc.h>
-#endif
-#include <86box/win_sdl.h>
-#include <86box/win_opengl.h>
-#include <86box/win.h>
-#include <86box/version.h>
-#include <86box/gdbstub.h>
-#ifdef MTR_ENABLED
-#    include <minitrace/minitrace.h>
-#endif
-
-typedef struct rc_str_t {
-    WCHAR str[1024];
-} rc_str_t;
-
-/* Platform Public data, specific. */
-HINSTANCE    hinstance; /* application instance */
-HANDLE       ghMutex;
-uint32_t     lang_id;  /* current and system language ID */
-uint32_t     lang_sys; /* current and system language ID */
-DWORD        dwSubLangID;
-int          acp_utf8; /* Windows supports UTF-8 codepage */
-volatile int cpu_thread_run = 1;
-
-/* Local data. */
-static HANDLE        thMain;
-static rc_str_t     *lpRCstr2048    = NULL;
-static rc_str_t     *lpRCstr4096    = NULL;
-static rc_str_t     *lpRCstr4352    = NULL;
-static rc_str_t     *lpRCstr4608    = NULL;
-static rc_str_t     *lpRCstr5120    = NULL;
-static rc_str_t     *lpRCstr5376    = NULL;
-static rc_str_t     *lpRCstr5632    = NULL;
-static rc_str_t     *lpRCstr5888    = NULL;
-static rc_str_t     *lpRCstr6144    = NULL;
-static rc_str_t     *lpRCstr7168    = NULL;
-static int           vid_api_inited = 0;
-static char         *argbuf;
-static int           first_use = 1;
-static LARGE_INTEGER StartingTime;
-static LARGE_INTEGER Frequency;
-
-static const struct {
-    const char *name;
-    int         local;
-    int (*init)(void *);
-    void (*close)(void);
-    void (*resize)(int x, int y);
-    int (*pause)(void);
-    void (*enable)(int enable);
-    void (*set_fs)(int fs);
-    void (*reload)(void);
-} vid_apis[RENDERERS_NUM] = {
-    { "SDL_Software", 1, (int (*)(void *)) sdl_inits, sdl_close, NULL, sdl_pause, sdl_enable, sdl_set_fs, sdl_reload },
-    { "SDL_Hardware", 1, (int (*)(void *)) sdl_inith, sdl_close, NULL, sdl_pause, sdl_enable, sdl_set_fs, sdl_reload },
-    { "SDL_OpenGL", 1, (int (*)(void *)) sdl_initho, sdl_close, NULL, sdl_pause, sdl_enable, sdl_set_fs, sdl_reload },
-    { "OpenGL_Core", 1, (int (*)(void *)) opengl_init, opengl_close, opengl_resize, opengl_pause, NULL, opengl_set_fs, opengl_reload }
-#ifdef USE_VNC
-    ,
-    { "VNC", 0, vnc_init, vnc_close, vnc_resize, vnc_pause, NULL, NULL }
-#endif
-};
-
-extern int title_update;
-
-#ifdef ENABLE_WIN_LOG
-int win_do_log = ENABLE_WIN_LOG;
-
-static void
-win_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (win_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define win_log(fmt, ...)
-#endif
-
-void
-free_string(rc_str_t **str)
-{
-    if (*str != NULL) {
-        free(*str);
-        *str = NULL;
-    }
-}
-
-static void
-LoadCommonStrings(void)
-{
-    int i;
-
-    free_string(&lpRCstr7168);
-    free_string(&lpRCstr6144);
-    free_string(&lpRCstr5888);
-    free_string(&lpRCstr5632);
-    free_string(&lpRCstr5376);
-    free_string(&lpRCstr5120);
-    free_string(&lpRCstr4608);
-    free_string(&lpRCstr4352);
-    free_string(&lpRCstr4096);
-    free_string(&lpRCstr2048);
-
-    lpRCstr2048 = calloc(STR_NUM_2048, sizeof(rc_str_t));
-    lpRCstr4096 = calloc(STR_NUM_4096, sizeof(rc_str_t));
-    lpRCstr4352 = calloc(STR_NUM_4352, sizeof(rc_str_t));
-    lpRCstr4608 = calloc(STR_NUM_4608, sizeof(rc_str_t));
-    lpRCstr5120 = calloc(STR_NUM_5120, sizeof(rc_str_t));
-    lpRCstr5376 = calloc(STR_NUM_5376, sizeof(rc_str_t));
-    lpRCstr5632 = calloc(STR_NUM_5632, sizeof(rc_str_t));
-    lpRCstr5888 = calloc(STR_NUM_5888, sizeof(rc_str_t));
-    lpRCstr6144 = calloc(STR_NUM_6144, sizeof(rc_str_t));
-    lpRCstr7168 = calloc(STR_NUM_7168, sizeof(rc_str_t));
-
-    for (i = 0; i < STR_NUM_2048; i++)
-        LoadString(hinstance, 2048 + i, lpRCstr2048[i].str, 1024);
-
-    for (i = 0; i < STR_NUM_4096; i++)
-        LoadString(hinstance, 4096 + i, lpRCstr4096[i].str, 1024);
-
-    for (i = 0; i < STR_NUM_4352; i++)
-        LoadString(hinstance, 4352 + i, lpRCstr4352[i].str, 1024);
-
-    for (i = 0; i < STR_NUM_4608; i++)
-        LoadString(hinstance, 4608 + i, lpRCstr4608[i].str, 1024);
-
-    for (i = 0; i < STR_NUM_5120; i++)
-        LoadString(hinstance, 5120 + i, lpRCstr5120[i].str, 1024);
-
-    for (i = 0; i < STR_NUM_5376; i++) {
-        if ((i == 0) || (i > 3))
-            LoadString(hinstance, 5376 + i, lpRCstr5376[i].str, 1024);
-    }
-
-    for (i = 0; i < STR_NUM_5632; i++) {
-        if ((i == 0) || (i > 3))
-            LoadString(hinstance, 5632 + i, lpRCstr5632[i].str, 1024);
-    }
-
-    for (i = 0; i < STR_NUM_5888; i++)
-        LoadString(hinstance, 5888 + i, lpRCstr5888[i].str, 1024);
-
-    for (i = 0; i < STR_NUM_6144; i++)
-        LoadString(hinstance, 6144 + i, lpRCstr6144[i].str, 1024);
-
-    for (i = 0; i < STR_NUM_7168; i++)
-        LoadString(hinstance, 7168 + i, lpRCstr7168[i].str, 1024);
-}
-
-size_t
-mbstoc16s(uint16_t dst[], const char src[], int len)
-{
-    if (src == NULL)
-        return 0;
-    if (len < 0)
-        return 0;
-
-    size_t ret = MultiByteToWideChar(CP_UTF8, 0, src, -1, dst, dst == NULL ? 0 : len);
-
-    if (!ret) {
-        return -1;
-    }
-
-    return ret;
-}
-
-size_t
-c16stombs(char dst[], const uint16_t src[], int len)
-{
-    if (src == NULL)
-        return 0;
-    if (len < 0)
-        return 0;
-
-    size_t ret = WideCharToMultiByte(CP_UTF8, 0, src, -1, dst, dst == NULL ? 0 : len, NULL, NULL);
-
-    if (!ret) {
-        return -1;
-    }
-
-    return ret;
-}
-
-int
-has_language_changed(uint32_t id)
-{
-    return (lang_id != id);
-}
-
-/* Set (or re-set) the language for the application. */
-void
-set_language(uint32_t id)
-{
-    if (id == 0xFFFF) {
-        set_language(lang_sys);
-        lang_id = id;
-        return;
-    }
-
-    if (lang_id != id) {
-        /* Set our new language ID. */
-        lang_id = id;
-        SetThreadUILanguage(lang_id);
-
-        /* Load the strings table for this ID. */
-        LoadCommonStrings();
-
-        /* Reload main menu */
-        menuMain = LoadMenu(hinstance, L"MainMenu");
-        if (hwndMain != NULL)
-            SetMenu(hwndMain, menuMain);
-
-        /* Re-init all the menus */
-        ResetAllMenus();
-        media_menu_init();
-    }
-}
-
-wchar_t *
-plat_get_string(int i)
-{
-    LPTSTR str;
-
-    if ((i >= 2048) && (i <= 3071))
-        str = lpRCstr2048[i - 2048].str;
-    else if ((i >= 4096) && (i <= 4351))
-        str = lpRCstr4096[i - 4096].str;
-    else if ((i >= 4352) && (i <= 4607))
-        str = lpRCstr4352[i - 4352].str;
-    else if ((i >= 4608) && (i <= 5119))
-        str = lpRCstr4608[i - 4608].str;
-    else if ((i >= 5120) && (i <= 5375))
-        str = lpRCstr5120[i - 5120].str;
-    else if ((i >= 5376) && (i <= 5631))
-        str = lpRCstr5376[i - 5376].str;
-    else if ((i >= 5632) && (i <= 5887))
-        str = lpRCstr5632[i - 5632].str;
-    else if ((i >= 5888) && (i <= 6143))
-        str = lpRCstr5888[i - 5888].str;
-    else if ((i >= 6144) && (i <= 7167))
-        str = lpRCstr6144[i - 6144].str;
-    else
-        str = lpRCstr7168[i - 7168].str;
-
-    return str;
-}
-
-#ifdef MTR_ENABLED
-void
-init_trace(void)
-{
-    mtr_init("trace.json");
-    mtr_start();
-}
-
-void
-shutdown_trace(void)
-{
-    mtr_stop();
-    mtr_shutdown();
-}
-#endif
-
-/* Create a console if we don't already have one. */
-static void
-CreateConsole(int init)
-{
-    HANDLE h;
-    FILE  *fp;
-    fpos_t p;
-    int    i;
-
-    if (!init) {
-        if (force_debug)
-            FreeConsole();
-        return;
-    }
-
-    /* Are we logging to a file? */
-    p = 0;
-    (void) fgetpos(stdout, &p);
-    if (p != -1)
-        return;
-
-    /* Not logging to file, attach to console. */
-    if (!AttachConsole(ATTACH_PARENT_PROCESS)) {
-        /* Parent has no console, create one. */
-        if (!AllocConsole()) {
-            /* Cannot create console, just give up. */
-            return;
-        }
-    }
-    fp = NULL;
-    if ((h = GetStdHandle(STD_OUTPUT_HANDLE)) != NULL) {
-        /* We got the handle, now open a file descriptor. */
-        if ((i = _open_osfhandle((intptr_t) h, _O_TEXT)) != -1) {
-            /* We got a file descriptor, now allocate a new stream. */
-            if ((fp = _fdopen(i, "w")) != NULL) {
-                /* Got the stream, re-initialize stdout without it. */
-                (void) freopen("CONOUT$", "w", stdout);
-                setvbuf(stdout, NULL, _IONBF, 0);
-                fflush(stdout);
-            }
-        }
-    }
-
-    if (fp != NULL) {
-        fclose(fp);
-        fp = NULL;
-    }
-}
-
-static void
-CloseConsole(void)
-{
-    CreateConsole(0);
-}
-
-/* Process the commandline, and create standard argc/argv array. */
-static int
-ProcessCommandLine(char ***argv)
-{
-    char **args;
-    int    argc_max;
-    int    i;
-    int    q;
-    int    argc;
-
-    if (acp_utf8) {
-        i      = strlen(GetCommandLineA()) + 1;
-        argbuf = (char *) malloc(i);
-        strcpy(argbuf, GetCommandLineA());
-    } else {
-        i      = c16stombs(NULL, GetCommandLineW(), 0) + 1;
-        argbuf = (char *) malloc(i);
-        c16stombs(argbuf, GetCommandLineW(), i);
-    }
-
-    argc     = 0;
-    argc_max = 64;
-    args     = (char **) malloc(sizeof(char *) * argc_max);
-    if (args == NULL) {
-        free(argbuf);
-        return 0;
-    }
-
-    /* parse commandline into argc/argv format */
-    i = 0;
-    while (argbuf[i]) {
-        while (argbuf[i] == ' ')
-            i++;
-
-        if (argbuf[i]) {
-            if ((argbuf[i] == '\'') || (argbuf[i] == '"')) {
-                q = argbuf[i++];
-                if (!argbuf[i])
-                    break;
-            } else
-                q = 0;
-
-            args[argc++] = &argbuf[i];
-
-            if (argc >= argc_max) {
-                argc_max += 64;
-                args = realloc(args, sizeof(char *) * argc_max);
-                if (args == NULL) {
-                    free(argbuf);
-                    return 0;
-                }
-            }
-
-            while ((argbuf[i]) && (q ? (argbuf[i] != q) : (argbuf[i] != ' ')))
-                i++;
-
-            if (argbuf[i]) {
-                argbuf[i] = 0;
-                i++;
-            }
-        }
-    }
-
-    args[argc] = NULL;
-    *argv      = args;
-
-    return argc;
-}
-
-/* For the Windows platform, this is the start of the application. */
-int WINAPI
-WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpszArg, int nCmdShow)
-{
-    char **argv = NULL;
-    int    argc;
-    int    i;
-
-    /* Initialize the COM library for the main thread. */
-    CoInitializeEx(NULL, COINIT_MULTITHREADED);
-
-    /* Check if Windows supports UTF-8 */
-    if (GetACP() == CP_UTF8)
-        acp_utf8 = 1;
-    else
-        acp_utf8 = 0;
-
-    /* Set this to the default value (windowed mode). */
-    video_fullscreen = 0;
-
-    /* We need this later. */
-    hinstance = hInst;
-
-    /* Set the application version ID string. */
-    sprintf(emu_version, "%s v%s", EMU_NAME, EMU_VERSION_FULL);
-
-    /* First, set our (default) language. */
-    lang_sys = GetThreadUILanguage();
-    set_language(DEFAULT_LANGUAGE);
-
-    /* Process the command line for options. */
-    argc = ProcessCommandLine(&argv);
-
-    /* Pre-initialize the system, this loads the config file. */
-    if (!pc_init(argc, argv)) {
-        /* Detach from console. */
-        if (force_debug)
-            CreateConsole(0);
-
-        if (source_hwnd)
-            PostMessage((HWND) (uintptr_t) source_hwnd, WM_HAS_SHUTDOWN, (WPARAM) 0, (LPARAM) hwndMain);
-
-        free(argbuf);
-        free(argv);
-        return 1;
-    }
-
-    extern int gfxcard[2];
-    gfxcard[1] = 0;
-
-    /* Create console window. */
-    if (force_debug) {
-        CreateConsole(1);
-        atexit(CloseConsole);
-    }
-
-    /* Handle our GUI. */
-    i = ui_init(nCmdShow);
-
-    /* Uninitialize COM before exit. */
-    CoUninitialize();
-
-    free(argbuf);
-    free(argv);
-    return i;
-}
-
-void
-main_thread(void *param)
-{
-    uint32_t old_time;
-    uint32_t new_time;
-    int      drawits;
-    int      frames;
-
-    framecountx  = 0;
-    title_update = 1;
-    old_time     = GetTickCount();
-    drawits = frames = 0;
-    while (!is_quit && cpu_thread_run) {
-        /* See if it is time to run a frame of code. */
-        new_time = GetTickCount();
-#ifdef USE_GDBSTUB
-        if (gdbstub_next_asap && (drawits <= 0))
-            drawits = 10;
-        else
-#endif
-            drawits += (new_time - old_time);
-        old_time = new_time;
-        if (drawits > 0 && !dopause) {
-            /* Yes, so do one frame now. */
-            drawits -= 10;
-            if (drawits > 50)
-                drawits = 0;
-
-            /* Run a block of code. */
-            pc_run();
-
-            /* Every 200 frames we save the machine status. */
-            if (++frames >= 200 && nvr_dosave) {
-                nvr_save();
-                nvr_dosave = 0;
-                frames     = 0;
-            }
-        } else /* Just so we dont overload the host OS. */
-            Sleep(1);
-
-        /* If needed, handle a screen resize. */
-        if (atomic_load(&doresize_monitors[0]) && !video_fullscreen && !is_quit) {
-            if (vid_resize & 2)
-                plat_resize(fixed_size_x, fixed_size_y);
-            else
-                plat_resize(scrnsz_x, scrnsz_y);
-            atomic_store(&doresize_monitors[0], 0);
-        }
-    }
-
-    is_quit = 1;
-}
-
-/*
- * We do this here since there is platform-specific stuff
- * going on here, and we do it in a function separate from
- * main() so we can call it from the UI module as well.
- */
-void
-do_start(void)
-{
-    LARGE_INTEGER qpc;
-
-    /* We have not stopped yet. */
-    is_quit = 0;
-
-    /* Initialize the high-precision timer. */
-    timeBeginPeriod(1);
-    QueryPerformanceFrequency(&qpc);
-    timer_freq = qpc.QuadPart;
-    win_log("Main timer precision: %llu\n", timer_freq);
-
-    /* Start the emulator, really. */
-    thMain = thread_create(main_thread, NULL);
-    SetThreadPriority(thMain, THREAD_PRIORITY_HIGHEST);
-}
-
-/* Cleanly stop the emulator. */
-void
-do_stop(void)
-{
-    /* Claim the video blitter. */
-    startblit();
-
-    vid_apis[vid_api].close();
-
-    pc_close(thMain);
-
-    thMain = NULL;
-
-    if (source_hwnd)
-        PostMessage((HWND) (uintptr_t) source_hwnd, WM_HAS_SHUTDOWN, (WPARAM) 0, (LPARAM) hwndMain);
-}
-
-void
-plat_get_exe_name(char *s, int size)
-{
-    wchar_t *temp;
-
-    if (acp_utf8)
-        GetModuleFileNameA(hinstance, s, size);
-    else {
-        temp = malloc(size * sizeof(wchar_t));
-        GetModuleFileNameW(hinstance, temp, size);
-        c16stombs(s, temp, size);
-        free(temp);
-    }
-}
-
-void
-plat_tempfile(char *bufp, char *prefix, char *suffix)
-{
-    SYSTEMTIME SystemTime;
-
-    if (prefix != NULL)
-        sprintf(bufp, "%s-", prefix);
-    else
-        strcpy(bufp, "");
-
-    GetLocalTime(&SystemTime);
-    sprintf(&bufp[strlen(bufp)], "%d%02d%02d-%02d%02d%02d-%03d%s",
-            SystemTime.wYear, SystemTime.wMonth, SystemTime.wDay,
-            SystemTime.wHour, SystemTime.wMinute, SystemTime.wSecond,
-            SystemTime.wMilliseconds,
-            suffix);
-}
-
-int
-plat_getcwd(char *bufp, int max)
-{
-    wchar_t *temp;
-
-    if (acp_utf8)
-        (void) _getcwd(bufp, max);
-    else {
-        temp = malloc(max * sizeof(wchar_t));
-        (void) _wgetcwd(temp, max);
-        c16stombs(bufp, temp, max);
-        free(temp);
-    }
-
-    return 0;
-}
-
-int
-plat_chdir(char *path)
-{
-    wchar_t *temp;
-    int      len;
-    int      ret;
-
-    if (acp_utf8)
-        return (_chdir(path));
-    else {
-        len  = mbstoc16s(NULL, path, 0) + 1;
-        temp = malloc(len * sizeof(wchar_t));
-        mbstoc16s(temp, path, len);
-
-        ret = _wchdir(temp);
-
-        free(temp);
-        return ret;
-    }
-}
-
-FILE *
-plat_fopen(const char *path, const char *mode)
-{
-    wchar_t *pathw;
-    wchar_t *modew;
-    int      len;
-    FILE    *fp;
-
-    if (acp_utf8)
-        return fopen(path, mode);
-    else {
-        len   = mbstoc16s(NULL, path, 0) + 1;
-        pathw = malloc(sizeof(wchar_t) * len);
-        mbstoc16s(pathw, path, len);
-
-        len   = mbstoc16s(NULL, mode, 0) + 1;
-        modew = malloc(sizeof(wchar_t) * len);
-        mbstoc16s(modew, mode, len);
-
-        fp = _wfopen(pathw, modew);
-
-        free(pathw);
-        free(modew);
-
-        return fp;
-    }
-}
-
-/* Open a file, using Unicode pathname, with 64bit pointers. */
-FILE *
-plat_fopen64(const char *path, const char *mode)
-{
-    return plat_fopen(path, mode);
-}
-
-void
-plat_remove(char *path)
-{
-    wchar_t *temp;
-    int      len;
-
-    if (acp_utf8)
-        remove(path);
-    else {
-        len  = mbstoc16s(NULL, path, 0) + 1;
-        temp = malloc(len * sizeof(wchar_t));
-        mbstoc16s(temp, path, len);
-
-        _wremove(temp);
-
-        free(temp);
-    }
-}
-
-void
-path_normalize(UNUSED(char *path))
-{
-    /* No-op */
-}
-
-/* Make sure a path ends with a trailing (back)slash. */
-void
-path_slash(char *path)
-{
-    if ((path[strlen(path) - 1] != '\\') && (path[strlen(path) - 1] != '/'))
-        strcat(path, "\\");
-}
-
-/* Return a trailing (back)slash if necessary. */
-const char *
-path_get_slash(char *path)
-{
-    char *ret = "";
-
-    if ((path[strlen(path) - 1] != '\\') && (path[strlen(path) - 1] != '/'))
-        ret =  "\\";
-
-    return ret;
-}
-
-/* Check if the given path is absolute or not. */
-int
-path_abs(char *path)
-{
-    if ((path[1] == ':') || (path[0] == '\\') || (path[0] == '/'))
-        return 1;
-
-    return 0;
-}
-
-/* Return the last element of a pathname. */
-char *
-plat_get_basename(const char *path)
-{
-    int c = (int) strlen(path);
-
-    while (c > 0) {
-        if (path[c] == '/' || path[c] == '\\')
-            return ((char *) &path[c + 1]);
-        c--;
-    }
-
-    return ((char *) path);
-}
-
-/* Return the 'directory' element of a pathname. */
-void
-path_get_dirname(char *dest, const char *path)
-{
-    int         c = (int) strlen(path);
-    const char *ptr;
-
-    ptr = (char *) path;
-
-    while (c > 0) {
-        if (path[c] == '/' || path[c] == '\\') {
-            ptr = (char *) &path[c];
-            break;
-        }
-        c--;
-    }
-
-    /* Copy to destination. */
-    while (path < ptr)
-        *dest++ = *path++;
-    *dest = '\0';
-}
-
-char *
-path_get_filename(char *s)
-{
-    int c = strlen(s) - 1;
-
-    while (c > 0) {
-        if (s[c] == '/' || s[c] == '\\')
-            return (&s[c + 1]);
-        c--;
-    }
-
-    return s;
-}
-
-char *
-path_get_extension(char *s)
-{
-    int c = strlen(s) - 1;
-
-    if (c <= 0)
-        return s;
-
-    while (c && s[c] != '.')
-        c--;
-
-    if (!c)
-        return (&s[strlen(s)]);
-
-    return (&s[c + 1]);
-}
-
-void
-path_append_filename(char *dest, const char *s1, const char *s2)
-{
-    strcpy(dest, s1);
-    path_slash(dest);
-    strcat(dest, s2);
-}
-
-void
-plat_put_backslash(char *s)
-{
-    int c = strlen(s) - 1;
-
-    if (s[c] != '/' && s[c] != '\\')
-        s[c] = '/';
-}
-
-int
-plat_dir_check(char *path)
-{
-    DWORD    dwAttrib;
-    int      len;
-    wchar_t *temp;
-
-    if (acp_utf8)
-        dwAttrib = GetFileAttributesA(path);
-    else {
-        len  = mbstoc16s(NULL, path, 0) + 1;
-        temp = malloc(len * sizeof(wchar_t));
-        mbstoc16s(temp, path, len);
-
-        dwAttrib = GetFileAttributesW(temp);
-
-        free(temp);
-    }
-
-    return ((dwAttrib != INVALID_FILE_ATTRIBUTES && (dwAttrib & FILE_ATTRIBUTE_DIRECTORY)) ? 1 : 0);
-}
-
-int
-plat_dir_create(char *path)
-{
-    int      ret;
-    int      len;
-    wchar_t *temp;
-
-    if (acp_utf8)
-        return SHCreateDirectoryExA(NULL, path, NULL);
-    else {
-        len  = mbstoc16s(NULL, path, 0) + 1;
-        temp = malloc(len * sizeof(wchar_t));
-        mbstoc16s(temp, path, len);
-
-        ret = SHCreateDirectoryExW(NULL, temp, NULL);
-
-        free(temp);
-
-        return ret;
-    }
-}
-
-void *
-plat_mmap(size_t size, uint8_t executable)
-{
-    return VirtualAlloc(NULL, size, MEM_COMMIT, executable ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE);
-}
-
-void
-plat_get_global_config_dir(char *strptr)
-{
-    wchar_t appdata_dir[1024] = { L'\0' };
-
-    if (_wgetenv(L"LOCALAPPDATA") && _wgetenv(L"LOCALAPPDATA")[0] != L'\0') {
-        size_t len = 0;
-        wcsncpy(appdata_dir, _wgetenv(L"LOCALAPPDATA"), 1024);
-        len = wcslen(appdata_dir);
-        if (appdata_dir[len - 1] != L'\\') {
-            appdata_dir[len]     = L'\\';
-            appdata_dir[len + 1] = L'\0';
-        }
-        wcscat(appdata_dir, L"86box");
-        CreateDirectoryW(appdata_dir, NULL);
-        wcscat(appdata_dir, L"\\");
-        c16stombs(strptr, appdata_dir, 1024);
-    }
-}
-
-void
-plat_init_rom_paths(void)
-{
-    wchar_t appdata_dir[1024] = { L'\0' };
-
-    if (_wgetenv(L"LOCALAPPDATA") && _wgetenv(L"LOCALAPPDATA")[0] != L'\0') {
-        char   appdata_dir_a[1024] = { '\0' };
-        size_t len                 = 0;
-        wcsncpy(appdata_dir, _wgetenv(L"LOCALAPPDATA"), 1024);
-        len = wcslen(appdata_dir);
-        if (appdata_dir[len - 1] != L'\\') {
-            appdata_dir[len]     = L'\\';
-            appdata_dir[len + 1] = L'\0';
-        }
-        wcscat(appdata_dir, L"86box");
-        CreateDirectoryW(appdata_dir, NULL);
-        wcscat(appdata_dir, L"\\roms");
-        CreateDirectoryW(appdata_dir, NULL);
-        wcscat(appdata_dir, L"\\");
-        c16stombs(appdata_dir_a, appdata_dir, 1024);
-        rom_add_path(appdata_dir_a);
-    }
-}
-
-void
-plat_munmap(void *ptr, UNUSED(size_t size))
-{
-    VirtualFree(ptr, 0, MEM_RELEASE);
-}
-
-uint64_t
-plat_timer_read(void)
-{
-    LARGE_INTEGER li;
-
-    QueryPerformanceCounter(&li);
-
-    return (li.QuadPart);
-}
-
-static LARGE_INTEGER
-plat_get_ticks_common(void)
-{
-    LARGE_INTEGER EndingTime;
-    LARGE_INTEGER ElapsedMicroseconds;
-
-    if (first_use) {
-        QueryPerformanceFrequency(&Frequency);
-        QueryPerformanceCounter(&StartingTime);
-        first_use = 0;
-    }
-
-    QueryPerformanceCounter(&EndingTime);
-    ElapsedMicroseconds.QuadPart = EndingTime.QuadPart - StartingTime.QuadPart;
-
-    /* We now have the elapsed number of ticks, along with the
-       number of ticks-per-second. We use these values
-       to convert to the number of elapsed microseconds.
-       To guard against loss-of-precision, we convert
-       to microseconds *before* dividing by ticks-per-second. */
-    ElapsedMicroseconds.QuadPart *= 1000000;
-    ElapsedMicroseconds.QuadPart /= Frequency.QuadPart;
-
-    return ElapsedMicroseconds;
-}
-
-uint32_t
-plat_get_ticks(void)
-{
-    return (uint32_t) (plat_get_ticks_common().QuadPart / 1000);
-}
-
-uint32_t
-plat_get_micro_ticks(void)
-{
-    return (uint32_t) plat_get_ticks_common().QuadPart;
-}
-
-void
-plat_delay_ms(uint32_t count)
-{
-    Sleep(count);
-}
-
-/* Return the VIDAPI number for the given name. */
-int
-plat_vidapi(char *name)
-{
-    /* Default/System is SDL Hardware. */
-    if (!strcasecmp(name, "default") || !strcasecmp(name, "system"))
-        return 1;
-
-    /* If DirectDraw or plain SDL was specified, return SDL Software. */
-    if (!strcasecmp(name, "ddraw") || !strcasecmp(name, "sdl"))
-        return 1;
-
-    for (uint8_t i = 0; i < RENDERERS_NUM; i++) {
-        if (vid_apis[i].name && !strcasecmp(vid_apis[i].name, name))
-            return i;
-    }
-
-    /* Default value. */
-    return 1;
-}
-
-/* Return the VIDAPI name for the given number. */
-char *
-plat_vidapi_name(int api)
-{
-    char *name = "default";
-
-    switch (api) {
-        case 0:
-            name = "sdl_software";
-            break;
-        case 1:
-            break;
-        case 2:
-            name = "sdl_opengl";
-            break;
-        case 3:
-            name = "opengl_core";
-            break;
-#ifdef USE_VNC
-        case 4:
-            name = "vnc";
-            break;
-#endif
-        default:
-            fatal("Unknown renderer: %i\n", api);
-            break;
-    }
-
-    return name;
-}
-
-int
-plat_setvid(int api)
-{
-    int i;
-
-    win_log("Initializing VIDAPI: api=%d\n", api);
-    startblit();
-
-    /* Close the (old) API. */
-    vid_apis[vid_api].close();
-    vid_api = api;
-
-    if (vid_apis[vid_api].local)
-        ShowWindow(hwndRender, SW_SHOW);
-    else
-        ShowWindow(hwndRender, SW_HIDE);
-
-    /* Initialize the (new) API. */
-    i = vid_apis[vid_api].init((void *) hwndRender);
-    endblit();
-    if (!i)
-        return 0;
-
-    device_force_redraw();
-
-    vid_api_inited = 1;
-
-    return 1;
-}
-
-/* Tell the renderers about a new screen resolution. */
-void
-plat_vidsize(int x, int y)
-{
-    if (!vid_api_inited || !vid_apis[vid_api].resize)
-        return;
-
-    startblit();
-    vid_apis[vid_api].resize(x, y);
-    endblit();
-}
-
-void
-plat_vidapi_enable(int enable)
-{
-    int i = 1;
-
-    if (!vid_api_inited || !vid_apis[vid_api].enable)
-        return;
-
-    vid_apis[vid_api].enable(enable != 0);
-
-    if (!i)
-        return;
-
-    if (enable)
-        device_force_redraw();
-}
-
-int
-get_vidpause(void)
-{
-    return (vid_apis[vid_api].pause());
-}
-
-void
-plat_setfullscreen(int on)
-{
-    RECT rect;
-    int  temp_x;
-    int  temp_y;
-    int  dpi = win_get_dpi(hwndMain);
-
-    /* Are we changing from the same state to the same state? */
-    if ((!!(on & 1)) == (!!video_fullscreen))
-        return;
-
-    if (on && video_fullscreen_first) {
-        video_fullscreen |= 2;
-        if (ui_msgbox_header(MBX_INFO | MBX_DONTASK, (wchar_t *) IDS_2135, (wchar_t *) IDS_2052) == 10) {
-            video_fullscreen_first = 0;
-            config_save();
-        }
-        video_fullscreen &= 1;
-    }
-
-    /* OK, claim the video. */
-    if (!(on & 2))
-        win_mouse_close();
-
-    /* Close the current mode, and open the new one. */
-    video_fullscreen = (on & 1) | 2;
-    if (vid_apis[vid_api].set_fs)
-        vid_apis[vid_api].set_fs(on & 1);
-    if (!(on & 1)) {
-        plat_resize(scrnsz_x, scrnsz_y);
-        if (vid_resize) {
-            /* scale the screen base on DPI */
-            if (!(vid_resize & 2) && window_remember) {
-                MoveWindow(hwndMain, window_x, window_y, window_w, window_h, TRUE);
-                GetClientRect(hwndMain, &rect);
-
-                temp_x = rect.right - rect.left + 1;
-                temp_y = rect.bottom - rect.top + 1 - (hide_status_bar ? 0 : sbar_height) - (hide_tool_bar ? 0 : tbar_height);
-            } else {
-                if (dpi_scale) {
-                    temp_x = MulDiv((vid_resize & 2) ? fixed_size_x : unscaled_size_x, dpi, 96);
-                    temp_y = MulDiv((vid_resize & 2) ? fixed_size_y : unscaled_size_y, dpi, 96);
-                } else {
-                    temp_x = (vid_resize & 2) ? fixed_size_x : unscaled_size_x;
-                    temp_y = (vid_resize & 2) ? fixed_size_y : unscaled_size_y;
-                }
-
-                /* Main Window. */
-                if (vid_resize >= 2)
-                    MoveWindow(hwndMain, window_x, window_y, window_w, window_h, TRUE);
-
-                ResizeWindowByClientArea(hwndMain, temp_x, temp_y + (hide_status_bar ? 0 : sbar_height) + (hide_tool_bar ? 0 : tbar_height));
-            }
-
-            /* Toolbar. */
-            MoveWindow(hwndRebar, 0, 0, temp_x, tbar_height, TRUE);
-
-            /* Render window. */
-            MoveWindow(hwndRender, 0, hide_tool_bar ? 0 : tbar_height, temp_x, temp_y, TRUE);
-
-            /* Status bar. */
-            GetClientRect(hwndMain, &rect);
-            MoveWindow(hwndSBAR, 0, rect.bottom - sbar_height, temp_x, sbar_height, TRUE);
-
-            if (mouse_capture)
-                ClipCursor(&rect);
-
-            scrnsz_x = (vid_resize & 2) ? fixed_size_x : unscaled_size_x;
-            scrnsz_y = (vid_resize & 2) ? fixed_size_y : unscaled_size_y;
-        }
-    }
-    video_fullscreen &= 1;
-    video_force_resize_set(1);
-    if (!(on & 1))
-        atomic_store(&doresize_monitors[0], 1);
-
-    win_mouse_init();
-
-    if (!(on & 2)) {
-        /* Release video and make it redraw the screen. */
-        device_force_redraw();
-
-        /* Send a CTRL break code so CTRL does not get stuck. */
-        keyboard_input(0, 0x01D);
-    }
-
-    /* Finally, handle the host's mouse cursor. */
-    /* win_log("%s full screen, %s cursor\n", on ? "enter" : "leave", on ? "hide" : "show"); */
-    show_cursor(video_fullscreen ? 0 : -1);
-
-    if (!(on & 2)) {
-        /* This is needed for OpenGL. */
-        plat_vidapi_enable(0);
-        plat_vidapi_enable(1);
-    }
-}
-
-void
-plat_vid_reload_options(void)
-{
-    if (!vid_api_inited || !vid_apis[vid_api].reload)
-        return;
-
-    vid_apis[vid_api].reload();
-}
-
-void
-plat_vidapi_reload(void)
-{
-    vid_apis[vid_api].reload();
-}
-
-/* Sets up the program language before initialization. */
-uint32_t
-plat_language_code(char *langcode)
-{
-    if (!strcmp(langcode, "system"))
-        return 0xFFFF;
-
-    int      len  = mbstoc16s(NULL, langcode, 0) + 1;
-    wchar_t *temp = malloc(len * sizeof(wchar_t));
-    mbstoc16s(temp, langcode, len);
-
-    LCID lcid = LocaleNameToLCID(temp, 0);
-
-    free(temp);
-    return lcid;
-}
-
-/* Converts back the language code to LCID */
-void
-plat_language_code_r(uint32_t lcid, char *outbuf, int len)
-{
-    if (lcid == 0xFFFF) {
-        strcpy(outbuf, "system");
-        return;
-    }
-
-    wchar_t buffer[LOCALE_NAME_MAX_LENGTH + 1];
-    LCIDToLocaleName(lcid, buffer, LOCALE_NAME_MAX_LENGTH, 0);
-
-    c16stombs(outbuf, buffer, len);
-}
-
-void
-plat_get_cpu_string(char *outbuf, uint8_t len) {
-    char cpu_string[] = "Unknown";
-    strncpy(outbuf, cpu_string, len);
-}
-
-void
-plat_set_thread_name(void *thread, const char *name)
-{
-    /* SetThreadDescription was added in 14393. Revisit if we ever start requiring 10. */
-    static void *kernel32_handle = NULL;
-    static HRESULT(WINAPI *pSetThreadDescription)(HANDLE hThread, PCWSTR lpThreadDescription) = NULL;
-    static dllimp_t kernel32_imports[] = {
-      // clang-format off
-        { "SetThreadDescription", &pSetThreadDescription },
-        { NULL,                   NULL                   }
-      // clang-format on
-    };
-
-    if (!kernel32_handle) {
-        kernel32_handle = dynld_module("kernel32.dll", kernel32_imports);
-        if (!kernel32_handle) {
-            kernel32_handle = kernel32_imports; /* store dummy pointer to avoid trying again */
-            pSetThreadDescription = NULL;
-        }
-    }
-
-    if (pSetThreadDescription) {
-        size_t len = strlen(name) + 1;
-        wchar_t wname[len + 1];
-        mbstowcs(wname, name, len);
-        pSetThreadDescription(thread ? (HANDLE) thread : GetCurrentThread(), wname);
-    }
-}
-
-void
-take_screenshot(void)
-{
-    startblit();
-    monitors[0].mon_screenshots++;
-    endblit();
-    device_force_redraw();
-}
-
-/* LPARAM interface to plat_get_string(). */
-LPARAM
-win_get_string(int id)
-{
-    wchar_t *ret;
-
-    ret = plat_get_string(id);
-    return ((LPARAM) ret);
-}
-
-void /* plat_ */
-startblit(void)
-{
-    WaitForSingleObject(ghMutex, INFINITE);
-}
-
-void /* plat_ */
-endblit(void)
-{
-    ReleaseMutex(ghMutex);
-}
-
-double
-plat_get_dpi(void)
-{
-    UINT dpi = win_get_dpi(hwndRender);
-
-    return ((double) dpi) / 96.0;
-}
diff --git a/src/win/win_about.c b/src/win/win_about.c
deleted file mode 100644
index 7ba55f73e..000000000
--- a/src/win/win_about.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Handle the About dialog.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          Fred N. van Kempen, <decwiz@yahoo.com>
- *
- *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2017-2018 Fred N. van Kempen.
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-#define UNICODE
-#define BITMAP WINDOWS_BITMAP
-#include <windows.h>
-#include <windowsx.h>
-#undef BITMAP
-#include <commctrl.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/plat.h>
-#include <86box/win.h>
-#include <86box/version.h>
-
-void
-AboutDialogCreate(HWND hwnd)
-{
-    int               i;
-    TASKDIALOGCONFIG  tdconfig    = { 0 };
-    TASKDIALOG_BUTTON tdbuttons[] = {
-        {IDOK,      EMU_SITE_W               },
-        { IDCANCEL, MAKEINTRESOURCE(IDS_2128)}
-    };
-
-    wchar_t emu_version[256];
-    i = swprintf(emu_version, sizeof_w(emu_version), L"%ls v%ls", EMU_NAME_W, EMU_VERSION_FULL_W);
-#ifdef EMU_GIT_HASH
-    i += swprintf(&emu_version[i], sizeof_w(emu_version) - i, L" [%ls]", EMU_GIT_HASH_W);
-#endif
-
-#if defined(__arm__) || defined(__TARGET_ARCH_ARM)
-#    define ARCH_STR L"arm"
-#elif defined(__aarch64__) || defined(_M_ARM64)
-#    define ARCH_STR L"arm64"
-#elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
-#    define ARCH_STR L"i386"
-#elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
-#    define ARCH_STR L"x86_64"
-#else
-#    define ARCH_STR L"unknown"
-#endif
-    swprintf(&emu_version[i], sizeof_w(emu_version) - i, L" [%ls, %ls]", ARCH_STR, plat_get_string(IDS_DYNAREC));
-
-    tdconfig.cbSize             = sizeof(tdconfig);
-    tdconfig.hwndParent         = hwnd;
-    tdconfig.hInstance          = hinstance;
-    tdconfig.dwCommonButtons    = 0;
-    tdconfig.pszWindowTitle     = MAKEINTRESOURCE(IDS_2125);
-    tdconfig.pszMainIcon        = (PCWSTR) 10;
-    tdconfig.pszMainInstruction = emu_version;
-    tdconfig.pszContent         = MAKEINTRESOURCE(IDS_2127);
-    tdconfig.cButtons           = ARRAYSIZE(tdbuttons);
-    tdconfig.pButtons           = tdbuttons;
-    tdconfig.nDefaultButton     = IDCANCEL;
-    TaskDialogIndirect(&tdconfig, &i, NULL, NULL);
-
-    if (i == IDOK)
-        ShellExecute(hwnd, L"open", L"https://" EMU_SITE_W, NULL, NULL, SW_SHOW);
-}
diff --git a/src/win/win_cdrom.c b/src/win/win_cdrom.c
deleted file mode 100644
index 58bd85c65..000000000
--- a/src/win/win_cdrom.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Handle the platform-side of CDROM/ZIP/MO drives.
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          Fred N. van Kempen, <decwiz@yahoo.com>
- *          Jasmine Iwanek,
- *
- *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2017-2018 Fred N. van Kempen.
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-#define UNICODE
-#define BITMAP WINDOWS_BITMAP
-#include <windows.h>
-#include <windowsx.h>
-#undef BITMAP
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/config.h>
-#include <86box/timer.h>
-#include <86box/device.h>
-#include <86box/cassette.h>
-#include <86box/cartridge.h>
-#include <86box/fdd.h>
-#include <86box/hdd.h>
-#include <86box/scsi_device.h>
-#include <86box/cdrom.h>
-#include <86box/mo.h>
-#include <86box/zip.h>
-#include <86box/scsi_disk.h>
-#include <86box/plat.h>
-#include <86box/ui.h>
-#include <86box/win.h>
-
-void
-cassette_mount(char *fn, uint8_t wp)
-{
-    pc_cas_set_fname(cassette, NULL);
-    memset(cassette_fname, 0, sizeof(cassette_fname));
-    cassette_ui_writeprot = wp;
-    pc_cas_set_fname(cassette, fn);
-    if (fn != NULL)
-        memcpy(cassette_fname, fn, MIN(511, strlen(fn)));
-    ui_sb_update_icon_state(SB_CASSETTE, (fn == NULL) ? 1 : 0);
-    media_menu_update_cassette();
-    ui_sb_update_tip(SB_CASSETTE);
-    config_save();
-}
-
-void
-cassette_eject(void)
-{
-    pc_cas_set_fname(cassette, NULL);
-    memset(cassette_fname, 0x00, sizeof(cassette_fname));
-    ui_sb_update_icon_state(SB_CASSETTE, 1);
-    media_menu_update_cassette();
-    ui_sb_update_tip(SB_CASSETTE);
-    config_save();
-}
-
-void
-cartridge_mount(uint8_t id, char *fn, UNUSED(uint8_t wp))
-{
-    cart_close(id);
-    cart_load(id, fn);
-    ui_sb_update_icon_state(SB_CARTRIDGE | id, strlen(cart_fns[id]) ? 0 : 1);
-    media_menu_update_cartridge(id);
-    ui_sb_update_tip(SB_CARTRIDGE | id);
-    config_save();
-}
-
-void
-cartridge_eject(uint8_t id)
-{
-    cart_close(id);
-    ui_sb_update_icon_state(SB_CARTRIDGE | id, 1);
-    media_menu_update_cartridge(id);
-    ui_sb_update_tip(SB_CARTRIDGE | id);
-    config_save();
-}
-
-void
-floppy_mount(uint8_t id, char *fn, uint8_t wp)
-{
-    fdd_close(id);
-    ui_writeprot[id] = wp;
-    fdd_load(id, fn);
-    ui_sb_update_icon_state(SB_FLOPPY | id, strlen(floppyfns[id]) ? 0 : 1);
-    media_menu_update_floppy(id);
-    ui_sb_update_tip(SB_FLOPPY | id);
-    config_save();
-}
-
-void
-floppy_eject(uint8_t id)
-{
-    fdd_close(id);
-    ui_sb_update_icon_state(SB_FLOPPY | id, 1);
-    media_menu_update_floppy(id);
-    ui_sb_update_tip(SB_FLOPPY | id);
-    config_save();
-}
-
-void
-plat_cdrom_ui_update(uint8_t id, UNUSED(uint8_t reload))
-{
-    const cdrom_t *drv = &cdrom[id];
-
-    if (drv->host_drive == 0) {
-        ui_sb_update_icon_state(SB_CDROM | id, 1);
-    } else {
-        ui_sb_update_icon_state(SB_CDROM | id, 0);
-    }
-
-    media_menu_update_cdrom(id);
-    ui_sb_update_tip(SB_CDROM | id);
-}
-
-void
-cdrom_mount(uint8_t id, char *fn)
-{
-    cdrom[id].prev_host_drive = cdrom[id].host_drive;
-    strcpy(cdrom[id].prev_image_path, cdrom[id].image_path);
-    if (cdrom[id].ops && cdrom[id].ops->exit)
-        cdrom[id].ops->exit(&(cdrom[id]));
-    cdrom[id].ops = NULL;
-    memset(cdrom[id].image_path, 0, sizeof(cdrom[id].image_path));
-    if ((fn != NULL) && (strlen(fn) >= 1) && (fn[strlen(fn) - 1] == '/'))
-            fn[strlen(fn) - 1] = '\\';
-    cdrom_image_open(&(cdrom[id]), fn);
-    /* Signal media change to the emulated machine. */
-    if (cdrom[id].insert)
-        cdrom[id].insert(cdrom[id].priv);
-    cdrom[id].host_drive = (strlen(cdrom[id].image_path) == 0) ? 0 : 200;
-    if (cdrom[id].host_drive == 200) {
-        ui_sb_update_icon_state(SB_CDROM | id, 0);
-    } else {
-        ui_sb_update_icon_state(SB_CDROM | id, 1);
-    }
-    media_menu_update_cdrom(id);
-    ui_sb_update_tip(SB_CDROM | id);
-    config_save();
-}
-
-void
-mo_eject(uint8_t id)
-{
-    mo_t *dev = (mo_t *) mo_drives[id].priv;
-
-    mo_disk_close(dev);
-    if (mo_drives[id].bus_type) {
-        /* Signal disk change to the emulated machine. */
-        mo_insert(dev);
-    }
-
-    ui_sb_update_icon_state(SB_MO | id, 1);
-    media_menu_update_mo(id);
-    ui_sb_update_tip(SB_MO | id);
-    config_save();
-}
-
-void
-mo_mount(uint8_t id, char *fn, uint8_t wp)
-{
-    mo_t *dev = (mo_t *) mo_drives[id].priv;
-
-    mo_disk_close(dev);
-    mo_drives[id].read_only = wp;
-    mo_load(dev, fn);
-    mo_insert(dev);
-
-    ui_sb_update_icon_state(SB_MO | id, strlen(mo_drives[id].image_path) ? 0 : 1);
-    media_menu_update_mo(id);
-    ui_sb_update_tip(SB_MO | id);
-
-    config_save();
-}
-
-void
-mo_reload(uint8_t id)
-{
-    mo_t *dev = (mo_t *) mo_drives[id].priv;
-
-    mo_disk_reload(dev);
-    if (strlen(mo_drives[id].image_path) == 0) {
-        ui_sb_update_icon_state(SB_MO | id, 1);
-    } else {
-        ui_sb_update_icon_state(SB_MO | id, 0);
-    }
-
-    media_menu_update_mo(id);
-    ui_sb_update_tip(SB_MO | id);
-
-    config_save();
-}
-
-void
-zip_eject(uint8_t id)
-{
-    zip_t *dev = (zip_t *) zip_drives[id].priv;
-
-    zip_disk_close(dev);
-    if (zip_drives[id].bus_type) {
-        /* Signal disk change to the emulated machine. */
-        zip_insert(dev);
-    }
-
-    ui_sb_update_icon_state(SB_ZIP | id, 1);
-    media_menu_update_zip(id);
-    ui_sb_update_tip(SB_ZIP | id);
-    config_save();
-}
-
-void
-zip_mount(uint8_t id, char *fn, uint8_t wp)
-{
-    zip_t *dev = (zip_t *) zip_drives[id].priv;
-
-    zip_disk_close(dev);
-    zip_drives[id].read_only = wp;
-    zip_load(dev, fn);
-    zip_insert(dev);
-
-    ui_sb_update_icon_state(SB_ZIP | id, strlen(zip_drives[id].image_path) ? 0 : 1);
-    media_menu_update_zip(id);
-    ui_sb_update_tip(SB_ZIP | id);
-
-    config_save();
-}
-
-void
-zip_reload(uint8_t id)
-{
-    zip_t *dev = (zip_t *) zip_drives[id].priv;
-
-    zip_disk_reload(dev);
-    if (strlen(zip_drives[id].image_path) == 0) {
-        ui_sb_update_icon_state(SB_ZIP | id, 1);
-    } else {
-        ui_sb_update_icon_state(SB_ZIP | id, 0);
-    }
-
-    media_menu_update_zip(id);
-    ui_sb_update_tip(SB_ZIP | id);
-
-    config_save();
-}
diff --git a/src/win/win_devconf.c b/src/win/win_devconf.c
deleted file mode 100644
index 92ab6b614..000000000
--- a/src/win/win_devconf.c
+++ /dev/null
@@ -1,832 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Windows device configuration dialog implementation.
- *
- *
- *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
- *
- *          Copyright 2008-2018 Sarah Walker.
- *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/ini.h>
-#include <86box/config.h>
-#include <86box/device.h>
-#include <86box/plat.h>
-#include <86box/mem.h>
-#include <86box/rom.h>
-#include <86box/midi_rtmidi.h>
-#include <86box/ui.h>
-#include <86box/win.h>
-#include <windowsx.h>
-
-static device_context_t config_device;
-
-static uint8_t deviceconfig_changed = 0;
-static int     combo_to_struct[256];
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-deviceconfig_dlgproc(HWND hdlg, UINT message, WPARAM wParam, UNUSED(LPARAM lParam))
-{
-    HWND h;
-
-    int val_int;
-    int id;
-    int c;
-    int d;
-    int p;
-    int q;
-#ifdef USE_RTMIDI
-    int num;
-#endif
-    int                              changed;
-    int                              cid;
-    const device_config_t           *config;
-    const device_config_selection_t *selection;
-    const device_config_bios_t      *bios;
-    char                             s[512];
-    char                             file_filter[512];
-    const char                      *str;
-    const char                      *val_str;
-    wchar_t                          ws[512];
-    wchar_t                         *wstr;
-    LPTSTR                           lptsTemp;
-
-    config = config_device.dev->config;
-
-    switch (message) {
-        case WM_INITDIALOG:
-            id     = IDC_CONFIG_BASE;
-            config = config_device.dev->config;
-
-            lptsTemp = (LPTSTR) malloc(512);
-            memset(combo_to_struct, 0, 256 * sizeof(int));
-
-            while (config->type != -1) {
-                selection = config->selection;
-                bios      = config->bios;
-                h         = GetDlgItem(hdlg, id);
-
-                switch (config->type) {
-                    case CONFIG_BINARY:
-                        val_int = config_get_int((char *) config_device.name,
-                                                 (char *) config->name, config->default_int);
-
-                        SendMessage(h, BM_SETCHECK, val_int, 0);
-
-                        id++;
-                        break;
-                    case CONFIG_SELECTION:
-                        val_int = config_get_int((char *) config_device.name,
-                                                 (char *) config->name, config->default_int);
-
-                        c = 0;
-                        while (selection && selection->description && selection->description[0]) {
-                            mbstowcs(lptsTemp, selection->description,
-                                     strlen(selection->description) + 1);
-                            SendMessage(h, CB_ADDSTRING, 0, (LPARAM) (LPCSTR) lptsTemp);
-                            if (val_int == selection->value)
-                                SendMessage(h, CB_SETCURSEL, c, 0);
-                            selection++;
-                            c++;
-                        }
-
-                        id += 2;
-                        break;
-                    case CONFIG_BIOS:
-                        val_str = config_get_string((char *) config_device.name,
-                                                    (char *) config->name, (char *) config->default_string);
-
-                        c = 0;
-                        q = 0;
-                        while (bios && (bios->files_no > 0)) {
-                            mbstowcs(lptsTemp, bios->name, strlen(bios->name) + 1);
-                            p = 0;
-                            for (d = 0; d < bios->files_no; d++)
-                                p += !!rom_present(bios->files[d]);
-                            if (p == bios->files_no) {
-                                SendMessage(h, CB_ADDSTRING, 0, (LPARAM) (LPCSTR) lptsTemp);
-                                if (!strcmp(val_str, bios->internal_name))
-                                    SendMessage(h, CB_SETCURSEL, c, 0);
-                                combo_to_struct[c] = q;
-                                c++;
-                            }
-                            q++;
-                            bios++;
-                        }
-
-                        id += 2;
-                        break;
-#ifdef USE_RTMIDI
-                    case CONFIG_MIDI_OUT:
-                        val_int = config_get_int((char *) config_device.name,
-                                                 (char *) config->name, config->default_int);
-
-                        num = rtmidi_out_get_num_devs();
-                        for (c = 0; c < num; c++) {
-                            rtmidi_out_get_dev_name(c, s);
-                            mbstowcs(lptsTemp, s, strlen(s) + 1);
-                            SendMessage(h, CB_ADDSTRING, 0, (LPARAM) (LPCSTR) lptsTemp);
-                            if (val_int == c)
-                                SendMessage(h, CB_SETCURSEL, c, 0);
-                        }
-
-                        id += 2;
-                        break;
-                    case CONFIG_MIDI_IN:
-                        val_int = config_get_int((char *) config_device.name,
-                                                 (char *) config->name, config->default_int);
-
-                        num = rtmidi_in_get_num_devs();
-                        for (c = 0; c < num; c++) {
-                            rtmidi_in_get_dev_name(c, s);
-                            mbstowcs(lptsTemp, s, strlen(s) + 1);
-                            SendMessage(h, CB_ADDSTRING, 0, (LPARAM) (LPCSTR) lptsTemp);
-                            if (val_int == c)
-                                SendMessage(h, CB_SETCURSEL, c, 0);
-                        }
-
-                        id += 2;
-                        break;
-#endif
-                    case CONFIG_SPINNER:
-                        val_int = config_get_int((char *) config_device.name,
-                                                 (char *) config->name, config->default_int);
-
-                        _swprintf(ws, L"%i", val_int);
-                        SendMessage(h, WM_SETTEXT, 0, (LPARAM) ws);
-
-                        id += 2;
-                        break;
-                    case CONFIG_FNAME:
-                    case CONFIG_STRING:
-                        wstr = config_get_wstring((char *) config_device.name,
-                                                  (char *) config->name, 0);
-                        if (wstr)
-                            SendMessage(h, WM_SETTEXT, 0, (LPARAM) wstr);
-                        id += 3;
-                        break;
-                    case CONFIG_HEX16:
-                        val_int = config_get_hex16((char *) config_device.name,
-                                                   (char *) config->name, config->default_int);
-
-                        c = 0;
-                        while (selection && selection->description && selection->description[0]) {
-                            mbstowcs(lptsTemp, selection->description,
-                                     strlen(selection->description) + 1);
-                            SendMessage(h, CB_ADDSTRING, 0, (LPARAM) (LPCSTR) lptsTemp);
-                            if (val_int == selection->value)
-                                SendMessage(h, CB_SETCURSEL, c, 0);
-                            selection++;
-                            c++;
-                        }
-
-                        id += 2;
-                        break;
-                    case CONFIG_HEX20:
-                        val_int = config_get_hex20((char *) config_device.name,
-                                                   (char *) config->name, config->default_int);
-
-                        c = 0;
-                        while (selection && selection->description && selection->description[0]) {
-                            mbstowcs(lptsTemp, selection->description,
-                                     strlen(selection->description) + 1);
-                            SendMessage(h, CB_ADDSTRING, 0, (LPARAM) (LPCSTR) lptsTemp);
-                            if (val_int == selection->value)
-                                SendMessage(h, CB_SETCURSEL, c, 0);
-                            selection++;
-                            c++;
-                        }
-
-                        id += 2;
-                        break;
-                }
-                config++;
-            }
-            free(lptsTemp);
-            return TRUE;
-        case WM_COMMAND:
-            cid = LOWORD(wParam);
-            if (cid == IDOK) {
-                id      = IDC_CONFIG_BASE;
-                config  = config_device.dev->config;
-                changed = 0;
-                char s[512];
-
-                while (config->type != -1) {
-                    const device_config_selection_t *selection = config->selection;
-                    h                                          = GetDlgItem(hdlg, id);
-
-                    switch (config->type) {
-                        case CONFIG_BINARY:
-                            val_int = config_get_int((char *) config_device.name,
-                                                     (char *) config->name, config->default_int);
-
-                            if (val_int != SendMessage(h, BM_GETCHECK, 0, 0))
-                                changed = 1;
-
-                            id++;
-                            break;
-                        case CONFIG_SELECTION:
-                            val_int = config_get_int((char *) config_device.name,
-                                                     (char *) config->name, config->default_int);
-
-                            c = SendMessage(h, CB_GETCURSEL, 0, 0);
-
-                            for (; c > 0; c--)
-                                selection++;
-
-                            if (val_int != selection->value)
-                                changed = 1;
-
-                            id += 2;
-                            break;
-                        case CONFIG_BIOS:
-                            bios = config->bios;
-
-                            val_str = config_get_string((char *) config_device.name,
-                                                        (char *) config->name, (char *) config->default_string);
-
-                            c = combo_to_struct[SendMessage(h, CB_GETCURSEL, 0, 0)];
-
-                            for (; c > 0; c--)
-                                bios++;
-
-                            if (strcmp(val_str, bios->internal_name))
-                                changed = 1;
-
-                            id += 2;
-                            break;
-                        case CONFIG_MIDI_OUT:
-                            val_int = config_get_int((char *) config_device.name,
-                                                     (char *) config->name, config->default_int);
-
-                            c = SendMessage(h, CB_GETCURSEL, 0, 0);
-
-                            if (val_int != c)
-                                changed = 1;
-
-                            id += 2;
-                            break;
-                        case CONFIG_MIDI_IN:
-                            val_int = config_get_int((char *) config_device.name,
-                                                     (char *) config->name, config->default_int);
-
-                            c = SendMessage(h, CB_GETCURSEL, 0, 0);
-
-                            if (val_int != c)
-                                changed = 1;
-
-                            id += 2;
-                            break;
-                        case CONFIG_FNAME:
-                        case CONFIG_STRING:
-                            str = config_get_string((char *) config_device.name,
-                                                    (char *) config->name, (char *) "");
-                            SendMessage(h, WM_GETTEXT, 511, (LPARAM) s);
-                            if (strcmp(str, s))
-                                changed = 1;
-
-                            id += 3;
-                            break;
-                        case CONFIG_SPINNER:
-                            val_int = config_get_int((char *) config_device.name,
-                                                     (char *) config->name, config->default_int);
-                            if (val_int > config->spinner.max)
-                                val_int = config->spinner.max;
-                            else if (val_int < config->spinner.min)
-                                val_int = config->spinner.min;
-
-                            SendMessage(h, WM_GETTEXT, 79, (LPARAM) ws);
-                            wcstombs(s, ws, 512);
-                            sscanf(s, "%i", &c);
-
-                            if (val_int != c)
-                                changed = 1;
-
-                            id += 2;
-                            break;
-                        case CONFIG_HEX16:
-                            val_int = config_get_hex16((char *) config_device.name,
-                                                       (char *) config->name, config->default_int);
-
-                            c = SendMessage(h, CB_GETCURSEL, 0, 0);
-
-                            for (; c > 0; c--)
-                                selection++;
-
-                            if (val_int != selection->value)
-                                changed = 1;
-
-                            id += 2;
-                            break;
-                        case CONFIG_HEX20:
-                            val_int = config_get_hex20((char *) config_device.name,
-                                                       (char *) config->name, config->default_int);
-
-                            c = SendMessage(h, CB_GETCURSEL, 0, 0);
-
-                            for (; c > 0; c--)
-                                selection++;
-
-                            if (val_int != selection->value)
-                                changed = 1;
-
-                            id += 2;
-                            break;
-                    }
-                    config++;
-                }
-
-                if (!changed) {
-                    deviceconfig_changed = 0;
-                    EndDialog(hdlg, 0);
-                    return TRUE;
-                }
-
-                deviceconfig_changed = 1;
-
-                id     = IDC_CONFIG_BASE;
-                config = config_device.dev->config;
-
-                while (config->type != -1) {
-                    selection = config->selection;
-                    h         = GetDlgItem(hdlg, id);
-
-                    switch (config->type) {
-                        case CONFIG_BINARY:
-                            config_set_int((char *) config_device.name,
-                                           (char *) config->name, SendMessage(h, BM_GETCHECK, 0, 0));
-
-                            id++;
-                            break;
-                        case CONFIG_SELECTION:
-                            c = SendMessage(h, CB_GETCURSEL, 0, 0);
-                            for (; c > 0; c--)
-                                selection++;
-                            config_set_int((char *) config_device.name, (char *) config->name, selection->value);
-
-                            id += 2;
-                            break;
-                        case CONFIG_BIOS:
-                            bios = config->bios;
-                            c    = combo_to_struct[SendMessage(h, CB_GETCURSEL, 0, 0)];
-                            for (; c > 0; c--)
-                                bios++;
-                            config_set_string((char *) config_device.name, (char *) config->name, (char *) bios->internal_name);
-
-                            id += 2;
-                            break;
-                        case CONFIG_MIDI_OUT:
-                            c = SendMessage(h, CB_GETCURSEL, 0, 0);
-                            config_set_int((char *) config_device.name, (char *) config->name, c);
-
-                            id += 2;
-                            break;
-                        case CONFIG_MIDI_IN:
-                            c = SendMessage(h, CB_GETCURSEL, 0, 0);
-                            config_set_int((char *) config_device.name, (char *) config->name, c);
-
-                            id += 2;
-                            break;
-                        case CONFIG_FNAME:
-                        case CONFIG_STRING:
-                            SendMessage(h, WM_GETTEXT, 511, (LPARAM) ws);
-                            config_set_wstring((char *) config_device.name, (char *) config->name, ws);
-
-                            id += 3;
-                            break;
-                        case CONFIG_SPINNER:
-                            SendMessage(h, WM_GETTEXT, 79, (LPARAM) ws);
-                            wcstombs(s, ws, 512);
-                            sscanf(s, "%i", &c);
-                            if (c > config->spinner.max)
-                                c = config->spinner.max;
-                            else if (c < config->spinner.min)
-                                c = config->spinner.min;
-
-                            config_set_int((char *) config_device.name, (char *) config->name, c);
-
-                            id += 2;
-                            break;
-                        case CONFIG_HEX16:
-                            c = SendMessage(h, CB_GETCURSEL, 0, 0);
-                            for (; c > 0; c--)
-                                selection++;
-                            config_set_hex16((char *) config_device.name, (char *) config->name, selection->value);
-
-                            id += 2;
-                            break;
-                        case CONFIG_HEX20:
-                            c = SendMessage(h, CB_GETCURSEL, 0, 0);
-                            for (; c > 0; c--)
-                                selection++;
-                            config_set_hex20((char *) config_device.name, (char *) config->name, selection->value);
-
-                            id += 2;
-                            break;
-                    }
-                    config++;
-                }
-
-                EndDialog(hdlg, 0);
-                return TRUE;
-            } else if (cid == IDCANCEL) {
-                deviceconfig_changed = 0;
-                EndDialog(hdlg, 0);
-                return TRUE;
-            } else {
-                id = IDC_CONFIG_BASE;
-                while (config->type != -1) {
-                    switch (config->type) {
-                        case CONFIG_BINARY:
-                            id++;
-                            break;
-                        case CONFIG_SELECTION:
-                        case CONFIG_HEX16:
-                        case CONFIG_HEX20:
-                        case CONFIG_BIOS:
-                        case CONFIG_MIDI_OUT:
-                        case CONFIG_MIDI_IN:
-                        case CONFIG_SPINNER:
-                        case CONFIG_STRING:
-                            id += 2;
-                            break;
-                        case CONFIG_FNAME:
-                            if (cid == id + 1) {
-                                s[0] = 0;
-                                h    = GetDlgItem(hdlg, id);
-                                SendMessage(h, WM_GETTEXT, 511, (LPARAM) s);
-                                file_filter[0] = 0;
-
-                                strcat(file_filter, config->file_filter);
-                                strcat(file_filter, "|All files (*.*)|*.*|");
-                                mbstowcs(ws, file_filter, strlen(file_filter) + 1);
-                                d = strlen(file_filter);
-
-                                /* replace | with \0 */
-                                for (c = 0; c < d; ++c) {
-                                    if (ws[c] == L'|')
-                                        ws[c] = 0;
-                                }
-
-                                if (!file_dlg(hdlg, ws, s, NULL, 0))
-                                    SendMessage(h, WM_SETTEXT, 0, (LPARAM) wopenfilestring);
-                            }
-                            break;
-                    }
-                    config++;
-                }
-            }
-            break;
-    }
-    return FALSE;
-}
-
-uint8_t
-deviceconfig_inst_open(HWND hwnd, const device_t *device, int inst)
-{
-    const device_config_t *config = device->config;
-    uint16_t              *data_block;
-    uint16_t              *data;
-    DLGTEMPLATE           *dlg;
-    DLGITEMTEMPLATE       *item;
-
-    data_block = malloc(16384);
-    dlg        = (DLGTEMPLATE *) data_block;
-    int y      = 10;
-    int id     = IDC_CONFIG_BASE;
-
-    deviceconfig_changed = 0;
-
-    memset(data_block, 0, 16384);
-
-    dlg->style = DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU;
-    dlg->x     = 10;
-    dlg->y     = 10;
-    dlg->cx    = 220;
-    dlg->cy    = 70;
-
-    data = (uint16_t *) (dlg + 1);
-
-    *data++ = 0; /*no menu*/
-    *data++ = 0; /*predefined dialog box class*/
-
-    data += wsprintf(data, plat_get_string(IDS_2142), device->name) + 1;
-
-    *data++ = 9; /*Point*/
-    data += MultiByteToWideChar(CP_ACP, 0, "Segoe UI", -1, data, 120);
-
-    if (((uintptr_t) data) & 2)
-        data++;
-
-    while (config->type != -1) {
-        switch (config->type) {
-            case CONFIG_BINARY:
-                item     = (DLGITEMTEMPLATE *) data;
-                item->x  = 10;
-                item->y  = y;
-                item->id = id++;
-
-                item->cx = 100;
-                item->cy = 15;
-
-                item->style = WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX;
-
-                data    = (uint16_t *) (item + 1);
-                *data++ = 0xFFFF;
-                *data++ = 0x0080; /* button class */
-
-                data += MultiByteToWideChar(CP_ACP, 0, config->description, -1, data, 256);
-                *data++ = 0; /* no creation data */
-
-                y += 20;
-                break;
-
-            case CONFIG_SELECTION:
-            case CONFIG_MIDI_OUT:
-            case CONFIG_MIDI_IN:
-            case CONFIG_HEX16:
-            case CONFIG_HEX20:
-            case CONFIG_BIOS:
-                /*Combo box*/
-                item     = (DLGITEMTEMPLATE *) data;
-                item->x  = 70;
-                item->y  = y;
-                item->id = id++;
-
-                item->cx = 140;
-                item->cy = 150;
-
-                item->style = WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL;
-
-                data    = (uint16_t *) (item + 1);
-                *data++ = 0xFFFF;
-                *data++ = 0x0085; /* combo box class */
-
-                data += MultiByteToWideChar(CP_ACP, 0, config->description, -1, data, 256);
-                *data++ = 0; /* no creation data */
-
-                if (((uintptr_t) data) & 2)
-                    data++;
-
-                /*Static text*/
-                item     = (DLGITEMTEMPLATE *) data;
-                item->x  = 10;
-                item->y  = y + 2;
-                item->id = id++;
-
-                item->cx = 60;
-                item->cy = 20;
-
-                item->style = WS_CHILD | WS_VISIBLE;
-
-                data    = (uint16_t *) (item + 1);
-                *data++ = 0xFFFF;
-                *data++ = 0x0082; /* static class */
-
-                data += MultiByteToWideChar(CP_ACP, 0, config->description, -1, data, 256);
-                *data++ = 0; /* no creation data */
-
-                if (((uintptr_t) data) & 2)
-                    data++;
-
-                y += 20;
-                break;
-            case CONFIG_SPINNER:
-                /*Spinner*/
-                item     = (DLGITEMTEMPLATE *) data;
-                item->x  = 70;
-                item->y  = y;
-                item->id = id++;
-
-                item->cx = 140;
-                item->cy = 14;
-
-                item->style           = WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL | ES_NUMBER;
-                item->dwExtendedStyle = WS_EX_CLIENTEDGE;
-
-                data    = (uint16_t *) (item + 1);
-                *data++ = 0xFFFF;
-                *data++ = 0x0081; /* edit text class */
-
-                data += MultiByteToWideChar(CP_ACP, 0, "", -1, data, 256);
-                *data++ = 0; /* no creation data */
-
-                if (((uintptr_t) data) & 2)
-                    data++;
-
-                /* TODO: add up down class */
-                /*Static text*/
-                item     = (DLGITEMTEMPLATE *) data;
-                item->x  = 10;
-                item->y  = y + 2;
-                item->id = id++;
-
-                item->cx = 60;
-                item->cy = 20;
-
-                item->style = WS_CHILD | WS_VISIBLE;
-
-                data    = (uint16_t *) (item + 1);
-                *data++ = 0xFFFF;
-                *data++ = 0x0082; /* static class */
-
-                data += MultiByteToWideChar(CP_ACP, 0, config->description, -1, data, 256);
-                *data++ = 0; /* no creation data */
-
-                if (((uintptr_t) data) & 2)
-                    data++;
-
-                y += 20;
-                break;
-            case CONFIG_STRING:
-                /*Editable Text*/
-                item     = (DLGITEMTEMPLATE *) data;
-                item->x  = 70;
-                item->y  = y;
-                item->id = id++;
-
-                item->cx = 140;
-                item->cy = 14;
-
-                item->style           = WS_CHILD | WS_VISIBLE | ES_READONLY;
-                item->dwExtendedStyle = WS_EX_CLIENTEDGE;
-
-                data    = (uint16_t *) (item + 1);
-                *data++ = 0xFFFF;
-                *data++ = 0x0081; /* edit text class */
-
-                data += MultiByteToWideChar(CP_ACP, 0, "", -1, data, 256);
-                *data++ = 0; /* no creation data */
-
-                if (((uintptr_t) data) & 2)
-                    data++;
-
-                /*Static text*/
-                item     = (DLGITEMTEMPLATE *) data;
-                item->x  = 10;
-                item->y  = y + 2;
-                item->id = id++;
-
-                item->cx = 60;
-                item->cy = 20;
-
-                item->style = WS_CHILD | WS_VISIBLE;
-
-                data    = (uint16_t *) (item + 1);
-                *data++ = 0xFFFF;
-                *data++ = 0x0082; /* static class */
-
-                data += MultiByteToWideChar(CP_ACP, 0, config->description, -1, data, 256);
-                *data++ = 0; /* no creation data */
-
-                if (((uintptr_t) data) & 2)
-                    data++;
-
-                y += 20;
-                break;
-            case CONFIG_FNAME:
-                /*File*/
-                item     = (DLGITEMTEMPLATE *) data;
-                item->x  = 70;
-                item->y  = y;
-                item->id = id++;
-
-                item->cx = 100;
-                item->cy = 14;
-
-                item->style           = WS_CHILD | WS_VISIBLE | ES_READONLY;
-                item->dwExtendedStyle = WS_EX_CLIENTEDGE;
-
-                data    = (uint16_t *) (item + 1);
-                *data++ = 0xFFFF;
-                *data++ = 0x0081; /* edit text class */
-
-                data += MultiByteToWideChar(CP_ACP, 0, "", -1, data, 256);
-                *data++ = 0; /* no creation data */
-
-                if (((uintptr_t) data) & 2)
-                    data++;
-
-                /* Button */
-                item     = (DLGITEMTEMPLATE *) data;
-                item->x  = 175;
-                item->y  = y;
-                item->id = id++;
-
-                item->cx = 35;
-                item->cy = 14;
-
-                item->style = WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON;
-
-                data    = (uint16_t *) (item + 1);
-                *data++ = 0xFFFF;
-                *data++ = 0x0080; /* button class */
-
-                data += MultiByteToWideChar(CP_ACP, 0, "Browse", -1, data, 256);
-                *data++ = 0; /* no creation data */
-
-                if (((uintptr_t) data) & 2)
-                    data++;
-
-                /*Static text*/
-                item     = (DLGITEMTEMPLATE *) data;
-                item->x  = 10;
-                item->y  = y + 2;
-                item->id = id++;
-
-                item->cx = 60;
-                item->cy = 20;
-
-                item->style = WS_CHILD | WS_VISIBLE;
-
-                data    = (uint16_t *) (item + 1);
-                *data++ = 0xFFFF;
-                *data++ = 0x0082; /* static class */
-
-                data += MultiByteToWideChar(CP_ACP, 0, config->description, -1, data, 256);
-                *data++ = 0; /* no creation data */
-
-                if (((uintptr_t) data) & 2)
-                    data++;
-
-                y += 20;
-                break;
-        }
-
-        if (((uintptr_t) data) & 2)
-            data++;
-
-        config++;
-    }
-
-    dlg->cdit = (id - IDC_CONFIG_BASE) + 2;
-
-    item        = (DLGITEMTEMPLATE *) data;
-    item->x     = 100;
-    item->y     = y + 5;
-    item->cx    = 50;
-    item->cy    = 14;
-    item->id    = IDOK; /* OK button identifier */
-    item->style = WS_CHILD | WS_VISIBLE | BS_DEFPUSHBUTTON;
-
-    data    = (uint16_t *) (item + 1);
-    *data++ = 0xFFFF;
-    *data++ = 0x0080; /* button class */
-
-    data += MultiByteToWideChar(CP_ACP, 0, "OK", -1, data, 50);
-    *data++ = 0; /* no creation data */
-
-    if (((uintptr_t) data) & 2)
-        data++;
-
-    item        = (DLGITEMTEMPLATE *) data;
-    item->x     = 160;
-    item->y     = y + 5;
-    item->cx    = 50;
-    item->cy    = 14;
-    item->id    = IDCANCEL; /* OK button identifier */
-    item->style = WS_CHILD | WS_VISIBLE | BS_DEFPUSHBUTTON;
-
-    data    = (uint16_t *) (item + 1);
-    *data++ = 0xFFFF;
-    *data++ = 0x0080; /* button class */
-
-    data += MultiByteToWideChar(CP_ACP, 0, "Cancel", -1, data, 50);
-    *data++ = 0; /* no creation data */
-
-    dlg->cy = y + 25;
-
-    device_set_context(&config_device, device, inst);
-
-    DialogBoxIndirect(hinstance, dlg, hwnd, deviceconfig_dlgproc);
-
-    free(data_block);
-
-    return deviceconfig_changed;
-}
-
-uint8_t
-deviceconfig_open(HWND hwnd, const device_t *device)
-{
-    return deviceconfig_inst_open(hwnd, device, 0);
-}
diff --git a/src/win/win_dialog.c b/src/win/win_dialog.c
deleted file mode 100644
index 15b00bf3f..000000000
--- a/src/win/win_dialog.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Several dialogs for the application.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          Fred N. van Kempen, <decwiz@yahoo.com>
- *
- *          Copyright 2016-2019 Miran Grca.
- *          Copyright 2017-2019 Fred N. van Kempen.
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-#define UNICODE
-#include <windows.h>
-#include <windowsx.h>
-#include <shlobj.h>
-#include <commdlg.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <wchar.h>
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include <86box/device.h>
-#include <86box/plat.h>
-#include <86box/ui.h>
-#include <86box/win.h>
-
-#define STRING_OR_RESOURCE(s) ((!(s)) ? (NULL) : ((((uintptr_t) s) < ((uintptr_t) 65636)) ? (MAKEINTRESOURCE((uintptr_t) s)) : (s)))
-
-WCHAR   wopenfilestring[512];
-char    openfilestring[512];
-uint8_t filterindex = 0;
-
-int
-ui_msgbox(int flags, void *message)
-{
-    return ui_msgbox_ex(flags, NULL, message, NULL, NULL, NULL);
-}
-
-int
-ui_msgbox_header(int flags, void *header, void *message)
-{
-    return ui_msgbox_ex(flags, header, message, NULL, NULL, NULL);
-}
-
-int
-ui_msgbox_ex(int flags, void *header, void *message, void *btn1, void *btn2, void *btn3)
-{
-    WCHAR             temp[512];
-    TASKDIALOGCONFIG  tdconfig = { 0 };
-    TASKDIALOG_BUTTON tdbuttons[3];
-    TASKDIALOG_BUTTON tdb_yes    = { IDYES, STRING_OR_RESOURCE(btn1) };
-    TASKDIALOG_BUTTON tdb_no     = { IDNO, STRING_OR_RESOURCE(btn2) };
-    TASKDIALOG_BUTTON tdb_cancel = { IDCANCEL, STRING_OR_RESOURCE(btn3) };
-    TASKDIALOG_BUTTON tdb_exit   = { IDCLOSE, MAKEINTRESOURCE(IDS_2120) };
-    int ret = 0;
-    int checked = 0;
-
-    /* Configure the default OK button. */
-    tdconfig.cButtons = 0;
-    if (btn1)
-        tdbuttons[tdconfig.cButtons++] = tdb_yes;
-    else
-        tdconfig.dwCommonButtons = TDCBF_OK_BUTTON;
-
-    /* Configure the message type. */
-    switch (flags & 0x1f) {
-        case MBX_INFO: /* just an informational message */
-            tdconfig.pszMainIcon = TD_INFORMATION_ICON;
-            break;
-
-        case MBX_ERROR: /* error message */
-            if (flags & MBX_FATAL) {
-                tdconfig.pszMainIcon        = TD_ERROR_ICON;
-                tdconfig.pszMainInstruction = MAKEINTRESOURCE(IDS_2050); /* "Fatal error" */
-
-                /* replace default "OK" button with "Exit" button */
-                if (btn1)
-                    tdconfig.cButtons = 0;
-                else
-                    tdconfig.dwCommonButtons = 0;
-                tdbuttons[tdconfig.cButtons++] = tdb_exit;
-            } else {
-                tdconfig.pszMainIcon        = TD_WARNING_ICON;
-                tdconfig.pszMainInstruction = MAKEINTRESOURCE(IDS_2049); /* "Error" */
-            }
-            break;
-
-        case MBX_QUESTION: /* question */
-        case MBX_QUESTION_YN:
-        case MBX_QUESTION_OK:
-            if (!btn1) /* replace default "OK" button with "Yes" button */
-                tdconfig.dwCommonButtons = (flags & MBX_QUESTION_OK) ? TDCBF_OK_BUTTON : TDCBF_YES_BUTTON;
-
-            if (btn2) /* "No" button */
-                tdbuttons[tdconfig.cButtons++] = tdb_no;
-            else
-                tdconfig.dwCommonButtons |= (flags & MBX_QUESTION_OK) ? TDCBF_CANCEL_BUTTON : TDCBF_NO_BUTTON;
-
-            if (flags & MBX_QUESTION) {
-                if (btn3) /* "Cancel" button */
-                    tdbuttons[tdconfig.cButtons++] = tdb_cancel;
-                else
-                    tdconfig.dwCommonButtons |= TDCBF_CANCEL_BUTTON;
-            }
-
-            if (flags & MBX_WARNING)
-                tdconfig.pszMainIcon = TD_WARNING_ICON;
-            break;
-    }
-
-    /* If the message is an ANSI string, convert it. */
-    tdconfig.pszContent = (WCHAR *) STRING_OR_RESOURCE(message);
-    if (flags & MBX_ANSI) {
-        mbstoc16s(temp, (char *) message, strlen((char *) message) + 1);
-        tdconfig.pszContent = temp;
-    }
-
-    /* Configure the rest of the TaskDialog. */
-    tdconfig.cbSize     = sizeof(tdconfig);
-    tdconfig.hwndParent = hwndMain;
-    if (flags & MBX_LINKS)
-        tdconfig.dwFlags = TDF_USE_COMMAND_LINKS;
-    tdconfig.pszWindowTitle = MAKEINTRESOURCE(IDS_STRINGS);
-    if (header)
-        tdconfig.pszMainInstruction = STRING_OR_RESOURCE(header);
-    tdconfig.pButtons = tdbuttons;
-    if (flags & MBX_DONTASK)
-        tdconfig.pszVerificationText = MAKEINTRESOURCE(IDS_2136);
-
-    /* Run the TaskDialog. */
-    TaskDialogIndirect(&tdconfig, &ret, NULL, &checked);
-
-    /* Convert return values to generic ones. */
-    if (ret == IDNO)
-        ret = 1;
-    else if (ret == IDCANCEL)
-        ret = -1;
-    else
-        ret = 0;
-
-    /* 10 is added to the return value if "don't show again" is checked. */
-    if (checked)
-        ret += 10;
-
-    return ret;
-}
-
-int
-file_dlg_w(HWND hwnd, WCHAR *f, WCHAR *fn, WCHAR *title, int save)
-{
-    OPENFILENAME ofn;
-    BOOL         r;
-#if 0
-    DWORD err;
-#endif
-    int old_dopause;
-
-    /* Initialize OPENFILENAME */
-    ZeroMemory(&ofn, sizeof(ofn));
-    ofn.lStructSize = sizeof(ofn);
-    ofn.hwndOwner   = hwnd;
-    ofn.lpstrFile   = wopenfilestring;
-
-    /*
-     * Set lpstrFile[0] to '\0' so that GetOpenFileName does
-     * not use the contents of szFile to initialize itself.
-     */
-    memset(ofn.lpstrFile, 0x00, 512 * sizeof(WCHAR));
-    if (fn)
-        memcpy(ofn.lpstrFile, fn, (wcslen(fn) << 1) + 2);
-    ofn.nMaxFile        = sizeof_w(wopenfilestring);
-    ofn.lpstrFilter     = f;
-    ofn.nFilterIndex    = 1;
-    ofn.lpstrFileTitle  = NULL;
-    ofn.nMaxFileTitle   = 0;
-    ofn.lpstrInitialDir = NULL;
-    ofn.Flags           = OFN_PATHMUSTEXIST;
-    if (!save)
-        ofn.Flags |= OFN_FILEMUSTEXIST;
-    if (title)
-        ofn.lpstrTitle = title;
-
-    /* Display the Open dialog box. */
-    old_dopause = dopause;
-    plat_pause(1);
-    if (save)
-        r = GetSaveFileName(&ofn);
-    else
-        r = GetOpenFileName(&ofn);
-    plat_pause(old_dopause);
-
-    plat_chdir(usr_path);
-
-    if (r) {
-        c16stombs(openfilestring, wopenfilestring, sizeof(openfilestring));
-        filterindex = ofn.nFilterIndex;
-
-        return 0;
-    }
-
-    return 1;
-}
-
-int
-file_dlg(HWND hwnd, WCHAR *f, char *fn, char *title, int save)
-{
-    WCHAR ufn[512];
-    WCHAR title_buf[512];
-
-    if (fn)
-        mbstoc16s(ufn, fn, strlen(fn) + 1);
-    if (title)
-        mbstoc16s(title_buf, title, sizeof title_buf);
-
-    return (file_dlg_w(hwnd, f, fn ? ufn : NULL, title ? title_buf : NULL, save));
-}
-
-int
-file_dlg_mb(HWND hwnd, char *f, char *fn, char *title, int save)
-{
-    WCHAR uf[512];
-    WCHAR ufn[512];
-    WCHAR title_buf[512];
-
-    mbstoc16s(uf, f, strlen(f) + 1);
-    mbstoc16s(ufn, fn, strlen(fn) + 1);
-    if (title)
-        mbstoc16s(title_buf, title, sizeof title_buf);
-
-    return (file_dlg_w(hwnd, uf, ufn, title ? title_buf : NULL, save));
-}
-
-int
-file_dlg_w_st(HWND hwnd, int id, WCHAR *fn, char *title, int save)
-{
-    WCHAR title_buf[512];
-    if (title)
-        mbstoc16s(title_buf, title, sizeof title_buf);
-    return (file_dlg_w(hwnd, plat_get_string(id), fn, title ? title_buf : NULL, save));
-}
-
-int
-file_dlg_st(HWND hwnd, int id, char *fn, char *title, int save)
-{
-    return (file_dlg(hwnd, plat_get_string(id), fn, title, save));
-}
diff --git a/src/win/win_dynld.c b/src/win/win_dynld.c
deleted file mode 100644
index 24690f2ba..000000000
--- a/src/win/win_dynld.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Try to load a support DLL.
- *
- *
- *
- * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
- *
- *          Copyright 2017-2018 Fred N. van Kempen
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <windows.h>
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include <86box/plat_dynld.h>
-
-#ifdef ENABLE_DYNLD_LOG
-int dynld_do_log = ENABLE_DYNLD_LOG;
-
-static void
-dynld_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (dynld_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define dynld_log(fmt, ...)
-#endif
-
-void *
-dynld_module(const char *name, dllimp_t *table)
-{
-    HMODULE   h;
-    void     *func;
-
-    /* See if we can load the desired module. */
-    if ((h = LoadLibrary(name)) == NULL) {
-        dynld_log("DynLd(\"%s\"): library not found! (%08X)\n", name, GetLastError());
-        return (NULL);
-    }
-
-    /* Now load the desired function pointers. */
-    for (dllimp_t *imp = table; imp->name != NULL; imp++) {
-        func = GetProcAddress(h, imp->name);
-        if (func == NULL) {
-            dynld_log("DynLd(\"%s\"): function '%s' not found! (%08X)\n",
-                      name, imp->name, GetLastError());
-            FreeLibrary(h);
-            return (NULL);
-        }
-
-        /* To overcome typing issues.. */
-        *(char **) imp->func = (char *) func;
-    }
-
-    /* All good. */
-    dynld_log("loaded %s\n", name);
-    return ((void *) h);
-}
-
-void
-dynld_close(void *handle)
-{
-    if (handle != NULL)
-        FreeLibrary((HMODULE) handle);
-}
diff --git a/src/win/win_icon.c b/src/win/win_icon.c
deleted file mode 100644
index f3426b8b5..000000000
--- a/src/win/win_icon.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Implement the application's icon changing system.
- *
- *
- *
- * Authors: Laci bá'
- *
- *          Copyright 2021 Laci bá'.
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-
-#include <windows.h>
-#include <windowsx.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/config.h>
-#include <86box/path.h>
-#include <86box/plat.h>
-#include <86box/ui.h>
-#include <86box/win.h>
-
-HICON hIcon[256];         /* icon data loaded from resources */
-char  icon_set[256] = ""; /* name of the iconset to be used */
-
-void
-win_clear_icon_set(void)
-{
-    for (uint16_t i = 0; i < 256; i++)
-        if (hIcon[i] != 0) {
-            DestroyIcon(hIcon[i]);
-            hIcon[i] = 0;
-        }
-}
-
-void
-win_system_icon_set(void)
-{
-    int x = win_get_system_metrics(SM_CXSMICON, dpi);
-    int y = win_get_system_metrics(SM_CYSMICON, dpi);
-
-    for (uint16_t i = 0; i < 256; i++)
-        hIcon[i] = LoadImage(hinstance, MAKEINTRESOURCE(i), IMAGE_ICON, x, y, LR_DEFAULTCOLOR);
-}
-
-typedef struct
-{
-    int   id;
-    char *filename;
-} _ICON_DATA;
-
-const _ICON_DATA icon_files[] = {
-    {16,   "floppy_525.ico"             },
-    { 17,  "floppy_525_active.ico"      },
-    { 24,  "floppy_35.ico"              },
-    { 25,  "floppy_35_active.ico"       },
-    { 32,  "cdrom.ico"                  },
-    { 33,  "cdrom_active.ico"           },
-    { 48,  "zip.ico"                    },
-    { 49,  "zip_active.ico"             },
-    { 56,  "mo.ico"                     },
-    { 57,  "mo_active.ico"              },
-    { 64,  "cassette.ico"               },
-    { 65,  "cassette_active.ico"        },
-    { 80,  "hard_disk.ico"              },
-    { 81,  "hard_disk_active.ico"       },
-    { 96,  "network.ico"                },
-    { 97,  "network_active.ico"         },
-    { 104, "cartridge.ico"              },
-    { 144, "floppy_525_empty.ico"       },
-    { 145, "floppy_525_empty_active.ico"},
-    { 152, "floppy_35_empty.ico"        },
-    { 153, "floppy_35_empty_active.ico" },
-    { 160, "cdrom_empty.ico"            },
-    { 161, "cdrom_empty_active.ico"     },
-    { 176, "zip_empty.ico"              },
-    { 177, "zip_empty_active.ico"       },
-    { 184, "mo_empty.ico"               },
-    { 185, "mo_empty_active.ico"        },
-    { 192, "cassette_empty.ico"         },
-    { 193, "cassette_empty_active.ico"  },
-    { 200, "run.ico"                    },
-    { 201, "pause.ico"                  },
-    { 202, "send_cad.ico"               },
-    { 203, "send_cae.ico"               },
-    { 204, "hard_reset.ico"             },
-    { 205, "acpi_shutdown.ico"          },
-    { 206, "settings.ico"               },
-    { 232, "cartridge_empty.ico"        },
-    { 240, "machine.ico"                },
-    { 241, "display.ico"                },
-    { 242, "input_devices.ico"          },
-    { 243, "sound.ico"                  },
-    { 244, "ports.ico"                  },
-    { 245, "other_peripherals.ico"      },
-    { 246, "floppy_and_cdrom_drives.ico"},
-    { 247, "other_removable_devices.ico"},
-    { 248, "floppy_disabled.ico"        },
-    { 249, "cdrom_disabled.ico"         },
-    { 250, "zip_disabled.ico"           },
-    { 251, "mo_disabled.ico"            },
-    { 252, "storage_controllers.ico"    }
-};
-
-void
-win_get_icons_path(char *path_root)
-{
-    char roms_root[1024] = { 0 };
-    if (rom_path[0])
-        strcpy(roms_root, rom_path);
-    else
-        path_append_filename(roms_root, exe_path, "roms");
-
-    path_append_filename(path_root, roms_root, "icons");
-    path_slash(path_root);
-}
-
-void
-win_load_icon_set(void)
-{
-    win_clear_icon_set();
-    win_system_icon_set();
-
-    if (strlen(icon_set) == 0) {
-        ToolBarLoadIcons();
-        return;
-    }
-
-    char    path_root[2048] = { 0 };
-    char    temp[2048]      = { 0 };
-    wchar_t wtemp[2048]     = { 0 };
-
-    win_get_icons_path(path_root);
-    strcat(path_root, icon_set);
-    path_slash(path_root);
-
-    int count = sizeof(icon_files) / sizeof(_ICON_DATA);
-    int x     = win_get_system_metrics(SM_CXSMICON, dpi);
-    int y     = win_get_system_metrics(SM_CYSMICON, dpi);
-    for (int i = 0; i < count; i++) {
-        path_append_filename(temp, path_root, icon_files[i].filename);
-        mbstoc16s(wtemp, temp, strlen(temp) + 1);
-
-        HICON ictemp;
-        ictemp = LoadImageW(NULL, (LPWSTR) wtemp, IMAGE_ICON, x, y, LR_LOADFROMFILE | LR_DEFAULTCOLOR);
-        if (ictemp) {
-            if (hIcon[icon_files[i].id])
-                DestroyIcon(hIcon[icon_files[i].id]);
-            hIcon[icon_files[i].id] = ictemp;
-        }
-    }
-
-    uint32_t curr_lang = lang_id;
-    lang_id            = 0;
-    set_language(curr_lang);
-
-    ToolBarLoadIcons();
-}
diff --git a/src/win/win_joystick.cpp b/src/win/win_joystick.cpp
deleted file mode 100644
index df8a99a05..000000000
--- a/src/win/win_joystick.cpp
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Joystick interface to host device.
- *
- *
- *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
- *
- *          Copyright 2008-2019 Sarah Walker.
- *          Copyright 2016-2019 Miran Grca.
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-#define DIRECTINPUT_VERSION 0x0800
-#include <dinput.h>
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include <86box/device.h>
-#include <86box/plat.h>
-#include <86box/gameport.h>
-#include <86box/win.h>
-
-#define DIDEVTYPE_JOYSTICK 4
-
-plat_joystick_t plat_joystick_state[MAX_PLAT_JOYSTICKS];
-joystick_t      joystick_state[MAX_JOYSTICKS];
-int             joysticks_present = 0;
-
-static LPDIRECTINPUT8       lpdi;
-static LPDIRECTINPUTDEVICE8 lpdi_joystick[2] = { NULL, NULL };
-static GUID                 joystick_guids[MAX_JOYSTICKS];
-
-#ifdef ENABLE_JOYSTICK_LOG
-int joystick_do_log = ENABLE_JOYSTICK_LOG;
-
-static void
-joystick_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (joystick_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define joystick_log(fmt, ...)
-#endif
-
-static BOOL CALLBACK
-joystick_enum_callback(LPCDIDEVICEINSTANCE lpddi, UNUSED(LPVOID data))
-{
-    if (joysticks_present >= MAX_JOYSTICKS)
-        return DIENUM_STOP;
-
-    joystick_log("joystick_enum_callback : found joystick %i : %s\n", joysticks_present, lpddi->tszProductName);
-
-    joystick_guids[joysticks_present++] = lpddi->guidInstance;
-
-    if (joysticks_present >= MAX_JOYSTICKS)
-        return DIENUM_STOP;
-
-    return DIENUM_CONTINUE;
-}
-
-BOOL CALLBACK
-DIEnumDeviceObjectsCallback(
-    LPCDIDEVICEOBJECTINSTANCE lpddoi,
-    LPVOID                    pvRef)
-{
-    plat_joystick_t *state = (plat_joystick_t *) pvRef;
-
-    if (lpddoi->guidType == GUID_XAxis || lpddoi->guidType == GUID_YAxis || lpddoi->guidType == GUID_ZAxis || lpddoi->guidType == GUID_RxAxis || lpddoi->guidType == GUID_RyAxis || lpddoi->guidType == GUID_RzAxis) {
-        if (state->nr_axes < 8) {
-            memcpy(state->axis[state->nr_axes].name, lpddoi->tszName, strlen(lpddoi->tszName) + 1);
-            joystick_log("Axis %i : %s  %x %x\n", state->nr_axes, state->axis[state->nr_axes].name, lpddoi->dwOfs, lpddoi->dwType);
-            if (lpddoi->guidType == GUID_XAxis)
-                state->axis[state->nr_axes].id = 0;
-            else if (lpddoi->guidType == GUID_YAxis)
-                state->axis[state->nr_axes].id = 1;
-            else if (lpddoi->guidType == GUID_ZAxis)
-                state->axis[state->nr_axes].id = 2;
-            else if (lpddoi->guidType == GUID_RxAxis)
-                state->axis[state->nr_axes].id = 3;
-            else if (lpddoi->guidType == GUID_RyAxis)
-                state->axis[state->nr_axes].id = 4;
-            else if (lpddoi->guidType == GUID_RzAxis)
-                state->axis[state->nr_axes].id = 5;
-            state->nr_axes++;
-        }
-    } else if (lpddoi->guidType == GUID_Button) {
-        if (state->nr_buttons < 32) {
-            memcpy(state->button[state->nr_buttons].name, lpddoi->tszName, strlen(lpddoi->tszName) + 1);
-            joystick_log("Button %i : %s  %x %x\n", state->nr_buttons, state->button[state->nr_buttons].name, lpddoi->dwOfs, lpddoi->dwType);
-            state->nr_buttons++;
-        }
-    } else if (lpddoi->guidType == GUID_POV) {
-        if (state->nr_povs < 4) {
-            memcpy(state->pov[state->nr_povs].name, lpddoi->tszName, strlen(lpddoi->tszName) + 1);
-            joystick_log("POV %i : %s  %x %x\n", state->nr_povs, state->pov[state->nr_povs].name, lpddoi->dwOfs, lpddoi->dwType);
-            state->nr_povs++;
-        }
-    } else if (lpddoi->guidType == GUID_Slider) {
-        if (state->nr_sliders < 2) {
-            memcpy(state->slider[state->nr_sliders].name, lpddoi->tszName, strlen(lpddoi->tszName) + 1);
-            state->slider[state->nr_sliders].id = state->nr_sliders | SLIDER;
-            joystick_log("Slider %i : %s  %x %x\n", state->nr_sliders, state->slider[state->nr_sliders].name, lpddoi->dwOfs, lpddoi->dwType);
-            state->nr_sliders++;
-        }
-    }
-
-    return DIENUM_CONTINUE;
-}
-
-void
-joystick_init()
-{
-    int c;
-
-    atexit(joystick_close);
-
-    joysticks_present = 0;
-
-    if (FAILED(DirectInput8Create(hinstance, DIRECTINPUT_VERSION, IID_IDirectInput8A, (void **) &lpdi, NULL)))
-        fatal("joystick_init : DirectInputCreate failed\n");
-
-    if (FAILED(lpdi->EnumDevices(DIDEVTYPE_JOYSTICK, joystick_enum_callback, NULL, DIEDFL_ATTACHEDONLY)))
-        fatal("joystick_init : EnumDevices failed\n");
-
-    joystick_log("joystick_init: joysticks_present=%i\n", joysticks_present);
-
-    for (c = 0; c < joysticks_present; c++) {
-        LPDIRECTINPUTDEVICE8 lpdi_joystick_temp = NULL;
-        DIPROPRANGE          joy_axis_range;
-        DIDEVICEINSTANCE     device_instance;
-        DIDEVCAPS            devcaps;
-
-        if (FAILED(lpdi->CreateDevice(joystick_guids[c], &lpdi_joystick_temp, NULL)))
-            fatal("joystick_init : CreateDevice failed\n");
-        if (FAILED(lpdi_joystick_temp->QueryInterface(IID_IDirectInputDevice8, (void **) &lpdi_joystick[c])))
-            fatal("joystick_init : CreateDevice failed\n");
-        lpdi_joystick_temp->Release();
-
-        memset(&device_instance, 0, sizeof(device_instance));
-        device_instance.dwSize = sizeof(device_instance);
-        if (FAILED(lpdi_joystick[c]->GetDeviceInfo(&device_instance)))
-            fatal("joystick_init : GetDeviceInfo failed\n");
-        joystick_log("Joystick %i :\n", c);
-        joystick_log(" tszInstanceName = %s\n", device_instance.tszInstanceName);
-        joystick_log(" tszProductName = %s\n", device_instance.tszProductName);
-        memcpy(plat_joystick_state[c].name, device_instance.tszInstanceName, strlen(device_instance.tszInstanceName) + 1);
-
-        memset(&devcaps, 0, sizeof(devcaps));
-        devcaps.dwSize = sizeof(devcaps);
-        if (FAILED(lpdi_joystick[c]->GetCapabilities(&devcaps)))
-            fatal("joystick_init : GetCapabilities failed\n");
-        joystick_log(" Axes = %i\n", devcaps.dwAxes);
-        joystick_log(" Buttons = %i\n", devcaps.dwButtons);
-        joystick_log(" POVs = %i\n", devcaps.dwPOVs);
-
-        lpdi_joystick[c]->EnumObjects(DIEnumDeviceObjectsCallback, &plat_joystick_state[c], DIDFT_ALL);
-
-        if (FAILED(lpdi_joystick[c]->SetCooperativeLevel(hwndMain, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
-            fatal("joystick_init : SetCooperativeLevel failed\n");
-        if (FAILED(lpdi_joystick[c]->SetDataFormat(&c_dfDIJoystick)))
-            fatal("joystick_init : SetDataFormat failed\n");
-
-        joy_axis_range.lMin              = -32768;
-        joy_axis_range.lMax              = 32767;
-        joy_axis_range.diph.dwSize       = sizeof(DIPROPRANGE);
-        joy_axis_range.diph.dwHeaderSize = sizeof(DIPROPHEADER);
-        joy_axis_range.diph.dwHow        = DIPH_BYOFFSET;
-        joy_axis_range.diph.dwObj        = DIJOFS_X;
-        lpdi_joystick[c]->SetProperty(DIPROP_RANGE, &joy_axis_range.diph);
-        joy_axis_range.diph.dwObj = DIJOFS_Y;
-        lpdi_joystick[c]->SetProperty(DIPROP_RANGE, &joy_axis_range.diph);
-        joy_axis_range.diph.dwObj = DIJOFS_Z;
-        lpdi_joystick[c]->SetProperty(DIPROP_RANGE, &joy_axis_range.diph);
-        joy_axis_range.diph.dwObj = DIJOFS_RX;
-        lpdi_joystick[c]->SetProperty(DIPROP_RANGE, &joy_axis_range.diph);
-        joy_axis_range.diph.dwObj = DIJOFS_RY;
-        lpdi_joystick[c]->SetProperty(DIPROP_RANGE, &joy_axis_range.diph);
-        joy_axis_range.diph.dwObj = DIJOFS_RZ;
-        lpdi_joystick[c]->SetProperty(DIPROP_RANGE, &joy_axis_range.diph);
-        joy_axis_range.diph.dwObj = DIJOFS_SLIDER(0);
-        lpdi_joystick[c]->SetProperty(DIPROP_RANGE, &joy_axis_range.diph);
-        joy_axis_range.diph.dwObj = DIJOFS_SLIDER(1);
-        lpdi_joystick[c]->SetProperty(DIPROP_RANGE, &joy_axis_range.diph);
-
-        if (FAILED(lpdi_joystick[c]->Acquire()))
-            fatal("joystick_init : Acquire failed\n");
-    }
-}
-
-void
-joystick_close()
-{
-    if (lpdi_joystick[1]) {
-        lpdi_joystick[1]->Release();
-        lpdi_joystick[1] = NULL;
-    }
-    if (lpdi_joystick[0]) {
-        lpdi_joystick[0]->Release();
-        lpdi_joystick[0] = NULL;
-    }
-}
-
-static int
-joystick_get_axis(int joystick_nr, int mapping)
-{
-    if (mapping & POV_X) {
-        int pov = plat_joystick_state[joystick_nr].p[mapping & 3];
-
-        if (LOWORD(pov) == 0xFFFF)
-            return 0;
-        else
-            return sin((2 * M_PI * (double) pov) / 36000.0) * 32767;
-    } else if (mapping & POV_Y) {
-        int pov = plat_joystick_state[joystick_nr].p[mapping & 3];
-
-        if (LOWORD(pov) == 0xFFFF)
-            return 0;
-        else
-            return -cos((2 * M_PI * (double) pov) / 36000.0) * 32767;
-    } else if (mapping & SLIDER) {
-        return plat_joystick_state[joystick_nr].s[mapping & 3];
-    } else
-        return plat_joystick_state[joystick_nr].a[plat_joystick_state[joystick_nr].axis[mapping].id];
-}
-
-void
-joystick_process(void)
-{
-    int c;
-    int d;
-
-    if (!joystick_type)
-        return;
-
-    for (c = 0; c < joysticks_present; c++) {
-        DIJOYSTATE joystate;
-        int        b;
-
-        if (FAILED(lpdi_joystick[c]->Poll())) {
-            lpdi_joystick[c]->Acquire();
-            lpdi_joystick[c]->Poll();
-        }
-        if (FAILED(lpdi_joystick[c]->GetDeviceState(sizeof(DIJOYSTATE), (LPVOID) &joystate))) {
-            lpdi_joystick[c]->Acquire();
-            lpdi_joystick[c]->Poll();
-            lpdi_joystick[c]->GetDeviceState(sizeof(DIJOYSTATE), (LPVOID) &joystate);
-        }
-
-        plat_joystick_state[c].a[0] = joystate.lX;
-        plat_joystick_state[c].a[1] = joystate.lY;
-        plat_joystick_state[c].a[2] = joystate.lZ;
-        plat_joystick_state[c].a[3] = joystate.lRx;
-        plat_joystick_state[c].a[4] = joystate.lRy;
-        plat_joystick_state[c].a[5] = joystate.lRz;
-        plat_joystick_state[c].s[0] = joystate.rglSlider[0];
-        plat_joystick_state[c].s[1] = joystate.rglSlider[1];
-
-        for (b = 0; b < 16; b++)
-            plat_joystick_state[c].b[b] = joystate.rgbButtons[b] & 0x80;
-
-        for (b = 0; b < 4; b++)
-            plat_joystick_state[c].p[b] = joystate.rgdwPOV[b];
-        //                joystick_log("joystick %i - x=%i y=%i b[0]=%i b[1]=%i  %i\n", c, joystick_state[c].x, joystick_state[c].y, joystick_state[c].b[0], joystick_state[c].b[1], joysticks_present);
-    }
-
-    for (c = 0; c < joystick_get_max_joysticks(joystick_type); c++) {
-        if (joystick_state[c].plat_joystick_nr) {
-            int joystick_nr = joystick_state[c].plat_joystick_nr - 1;
-
-            for (d = 0; d < joystick_get_axis_count(joystick_type); d++)
-                joystick_state[c].axis[d] = joystick_get_axis(joystick_nr, joystick_state[c].axis_mapping[d]);
-            for (d = 0; d < joystick_get_button_count(joystick_type); d++)
-                joystick_state[c].button[d] = plat_joystick_state[joystick_nr].b[joystick_state[c].button_mapping[d]];
-
-            for (d = 0; d < joystick_get_pov_count(joystick_type); d++) {
-                int    x;
-                int    y;
-                double angle;
-                double magnitude;
-
-                x = joystick_get_axis(joystick_nr, joystick_state[c].pov_mapping[d][0]);
-                y = joystick_get_axis(joystick_nr, joystick_state[c].pov_mapping[d][1]);
-
-                angle     = (atan2((double) y, (double) x) * 360.0) / (2 * M_PI);
-                magnitude = sqrt((double) x * (double) x + (double) y * (double) y);
-
-                if (magnitude < 16384)
-                    joystick_state[c].pov[d] = -1;
-                else
-                    joystick_state[c].pov[d] = ((int) angle + 90 + 360) % 360;
-            }
-        } else {
-            for (d = 0; d < joystick_get_axis_count(joystick_type); d++)
-                joystick_state[c].axis[d] = 0;
-            for (d = 0; d < joystick_get_button_count(joystick_type); d++)
-                joystick_state[c].button[d] = 0;
-            for (d = 0; d < joystick_get_pov_count(joystick_type); d++)
-                joystick_state[c].pov[d] = -1;
-        }
-    }
-}
-
-void
-win_joystick_handle(UNUSED(PRAWINPUT raw))
-{
-    // Nothing to be done here, atleast currently
-}
diff --git a/src/win/win_joystick_rawinput.c b/src/win/win_joystick_rawinput.c
deleted file mode 100644
index c5c2a3d6e..000000000
--- a/src/win/win_joystick_rawinput.c
+++ /dev/null
@@ -1,490 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          RawInput joystick interface.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          GH Cao, <driver1998.ms@outlook.com>
- *          Jasmine Iwanek,
- *
- *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2020 GH Cao.
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-#include <windows.h>
-#include <windowsx.h>
-#include <hidclass.h>
-#include <hidusage.h>
-#include <hidsdi.h>
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include <86box/device.h>
-#include <86box/plat.h>
-#include <86box/gameport.h>
-#include <86box/win.h>
-
-#ifdef ENABLE_JOYSTICK_LOG
-int joystick_do_log = ENABLE_JOYSTICK_LOG;
-
-static void
-joystick_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (joystick_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define joystick_log(fmt, ...)
-#endif
-
-typedef struct {
-    HANDLE               hdevice;
-    PHIDP_PREPARSED_DATA data;
-
-    USAGE usage_button[256];
-
-    struct raw_axis_t {
-        USAGE  usage;
-        USHORT link;
-        USHORT bitsize;
-        LONG   max;
-        LONG   min;
-    } axis[8];
-
-    struct raw_pov_t {
-        USAGE  usage;
-        USHORT link;
-        LONG   max;
-        LONG   min;
-    } pov[4];
-} raw_joystick_t;
-
-plat_joystick_t plat_joystick_state[MAX_PLAT_JOYSTICKS];
-joystick_t      joystick_state[MAX_JOYSTICKS];
-int             joysticks_present = 0;
-
-raw_joystick_t raw_joystick_state[MAX_PLAT_JOYSTICKS];
-
-/* We only use the first 32 buttons reported, from Usage ID 1-128 */
-void
-joystick_add_button(raw_joystick_t *rawjoy, plat_joystick_t *joy, USAGE usage)
-{
-    if (joy->nr_buttons >= 32)
-        return;
-    if (usage < 1 || usage > 128)
-        return;
-
-    rawjoy->usage_button[usage] = joy->nr_buttons;
-    sprintf(joy->button[joy->nr_buttons].name, "Button %d", usage);
-    joy->nr_buttons++;
-}
-
-void
-joystick_add_axis(raw_joystick_t *rawjoy, plat_joystick_t *joy, PHIDP_VALUE_CAPS prop)
-{
-    if (joy->nr_axes >= 8)
-        return;
-
-    switch (prop->Range.UsageMin) {
-        case HID_USAGE_GENERIC_X:
-            sprintf(joy->axis[joy->nr_axes].name, "X");
-            break;
-        case HID_USAGE_GENERIC_Y:
-            sprintf(joy->axis[joy->nr_axes].name, "Y");
-            break;
-        case HID_USAGE_GENERIC_Z:
-            sprintf(joy->axis[joy->nr_axes].name, "Z");
-            break;
-        case HID_USAGE_GENERIC_RX:
-            sprintf(joy->axis[joy->nr_axes].name, "RX");
-            break;
-        case HID_USAGE_GENERIC_RY:
-            sprintf(joy->axis[joy->nr_axes].name, "RY");
-            break;
-        case HID_USAGE_GENERIC_RZ:
-            sprintf(joy->axis[joy->nr_axes].name, "RZ");
-            break;
-        default:
-            return;
-    }
-
-    joy->axis[joy->nr_axes].id         = joy->nr_axes;
-    rawjoy->axis[joy->nr_axes].usage   = prop->Range.UsageMin;
-    rawjoy->axis[joy->nr_axes].link    = prop->LinkCollection;
-    rawjoy->axis[joy->nr_axes].bitsize = prop->BitSize;
-
-    /* Assume unsigned when min >= 0 */
-    if (prop->LogicalMin < 0) {
-        rawjoy->axis[joy->nr_axes].max = prop->LogicalMax;
-    } else {
-        /*
-         * Some joysticks will send -1 in LogicalMax, like Xbox Controllers
-         * so we need to mask that to appropriate value (instead of 0xFFFFFFFF)
-         */
-        rawjoy->axis[joy->nr_axes].max = prop->LogicalMax & ((1ULL << prop->BitSize) - 1);
-    }
-    rawjoy->axis[joy->nr_axes].min = prop->LogicalMin;
-
-    joy->nr_axes++;
-}
-
-void
-joystick_add_pov(raw_joystick_t *rawjoy, plat_joystick_t *joy, PHIDP_VALUE_CAPS prop)
-{
-    if (joy->nr_povs >= 4)
-        return;
-
-    sprintf(joy->pov[joy->nr_povs].name, "POV %d", joy->nr_povs + 1);
-    rawjoy->pov[joy->nr_povs].usage = prop->Range.UsageMin;
-    rawjoy->pov[joy->nr_povs].link  = prop->LinkCollection;
-    rawjoy->pov[joy->nr_povs].min   = prop->LogicalMin;
-    rawjoy->pov[joy->nr_povs].max   = prop->LogicalMax;
-
-    joy->nr_povs++;
-}
-
-void
-joystick_get_capabilities(raw_joystick_t *rawjoy, plat_joystick_t *joy)
-{
-    UINT              size     = 0;
-    PHIDP_BUTTON_CAPS btn_caps = NULL;
-    PHIDP_VALUE_CAPS  val_caps = NULL;
-
-    /* Get preparsed data (HID data format) */
-    GetRawInputDeviceInfoW(rawjoy->hdevice, RIDI_PREPARSEDDATA, NULL, &size);
-    rawjoy->data = malloc(size);
-    if (GetRawInputDeviceInfoW(rawjoy->hdevice, RIDI_PREPARSEDDATA, rawjoy->data, &size) <= 0)
-        fatal("joystick_get_capabilities: Failed to get preparsed data.\n");
-
-    HIDP_CAPS caps;
-    HidP_GetCaps(rawjoy->data, &caps);
-
-    /* Buttons */
-    if (caps.NumberInputButtonCaps > 0) {
-        btn_caps = calloc(caps.NumberInputButtonCaps, sizeof(HIDP_BUTTON_CAPS));
-        if (HidP_GetButtonCaps(HidP_Input, btn_caps, &caps.NumberInputButtonCaps, rawjoy->data) != HIDP_STATUS_SUCCESS) {
-            joystick_log("joystick_get_capabilities: Failed to query input buttons.\n");
-            goto end;
-        }
-        /* We only detect generic stuff */
-        for (int c = 0; c < caps.NumberInputButtonCaps; c++) {
-            if (btn_caps[c].UsagePage != HID_USAGE_PAGE_BUTTON)
-                continue;
-
-            int button_count = btn_caps[c].Range.UsageMax - btn_caps[c].Range.UsageMin + 1;
-            for (int b = 0; b < button_count; b++) {
-                joystick_add_button(rawjoy, joy, b + btn_caps[c].Range.UsageMin);
-            }
-        }
-    }
-
-    /* Values (axes and povs) */
-    if (caps.NumberInputValueCaps > 0) {
-        val_caps = calloc(caps.NumberInputValueCaps, sizeof(HIDP_VALUE_CAPS));
-        if (HidP_GetValueCaps(HidP_Input, val_caps, &caps.NumberInputValueCaps, rawjoy->data) != HIDP_STATUS_SUCCESS) {
-            joystick_log("joystick_get_capabilities: Failed to query axes and povs.\n");
-            goto end;
-        }
-        /* We only detect generic stuff */
-        for (int c = 0; c < caps.NumberInputValueCaps; c++) {
-            if (val_caps[c].UsagePage != HID_USAGE_PAGE_GENERIC)
-                continue;
-
-            if (val_caps[c].Range.UsageMin == HID_USAGE_GENERIC_HATSWITCH)
-                joystick_add_pov(rawjoy, joy, &val_caps[c]);
-            else
-                joystick_add_axis(rawjoy, joy, &val_caps[c]);
-        }
-    }
-
-end:
-    free(btn_caps);
-    free(val_caps);
-}
-
-void
-joystick_get_device_name(raw_joystick_t *rawjoy, plat_joystick_t *joy, PRID_DEVICE_INFO info)
-{
-    UINT   size                  = 0;
-    WCHAR *device_name           = NULL;
-    WCHAR  device_desc_wide[200] = { 0 };
-
-    GetRawInputDeviceInfoW(rawjoy->hdevice, RIDI_DEVICENAME, device_name, &size);
-    device_name = calloc(size, sizeof(WCHAR));
-    if (GetRawInputDeviceInfoW(rawjoy->hdevice, RIDI_DEVICENAME, device_name, &size) <= 0)
-        fatal("joystick_get_capabilities: Failed to get device name.\n");
-
-    HANDLE hDevObj = CreateFileW(device_name, GENERIC_READ | GENERIC_WRITE,
-                                 FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
-    if (hDevObj) {
-        HidD_GetProductString(hDevObj, device_desc_wide, sizeof(WCHAR) * 200);
-        CloseHandle(hDevObj);
-    }
-    free(device_name);
-
-    int result = WideCharToMultiByte(CP_ACP, 0, device_desc_wide, 200, joy->name, 260, NULL, NULL);
-    if (result == 0 || strlen(joy->name) == 0)
-        sprintf(joy->name,
-                "RawInput %s, VID:%04lX PID:%04lX",
-                info->hid.usUsage == HID_USAGE_GENERIC_JOYSTICK ? "Joystick" : "Gamepad",
-                info->hid.dwVendorId,
-                info->hid.dwProductId);
-}
-
-void
-joystick_init(void)
-{
-    UINT size = 0;
-    atexit(joystick_close);
-
-    joysticks_present = 0;
-    memset(raw_joystick_state, 0, sizeof(raw_joystick_t) * MAX_PLAT_JOYSTICKS);
-
-    /* Get a list of raw input devices from Windows */
-    UINT raw_devices = 0;
-    GetRawInputDeviceList(NULL, &raw_devices, sizeof(RAWINPUTDEVICELIST));
-    PRAWINPUTDEVICELIST deviceList = calloc(raw_devices, sizeof(RAWINPUTDEVICELIST));
-    GetRawInputDeviceList(deviceList, &raw_devices, sizeof(RAWINPUTDEVICELIST));
-
-    for (int i = 0; i < raw_devices; i++) {
-        PRID_DEVICE_INFO info = NULL;
-
-        if (joysticks_present >= MAX_PLAT_JOYSTICKS)
-            break;
-        if (deviceList[i].dwType != RIM_TYPEHID)
-            continue;
-
-        /* Get device info: hardware IDs and usage IDs */
-        GetRawInputDeviceInfoA(deviceList[i].hDevice, RIDI_DEVICEINFO, NULL, &size);
-        info         = malloc(size);
-        info->cbSize = sizeof(RID_DEVICE_INFO);
-        if (GetRawInputDeviceInfoA(deviceList[i].hDevice, RIDI_DEVICEINFO, info, &size) <= 0)
-            goto end_loop;
-
-        /* If this is not a joystick/gamepad, skip */
-        if (info->hid.usUsagePage != HID_USAGE_PAGE_GENERIC)
-            goto end_loop;
-        if (info->hid.usUsage != HID_USAGE_GENERIC_JOYSTICK && info->hid.usUsage != HID_USAGE_GENERIC_GAMEPAD)
-            goto end_loop;
-
-        plat_joystick_t *joy    = &plat_joystick_state[joysticks_present];
-        raw_joystick_t  *rawjoy = &raw_joystick_state[joysticks_present];
-        rawjoy->hdevice         = deviceList[i].hDevice;
-
-        joystick_get_capabilities(rawjoy, joy);
-        joystick_get_device_name(rawjoy, joy, info);
-
-        joystick_log("joystick_init: %s - %d buttons, %d axes, %d POVs\n",
-                     joy->name, joy->nr_buttons, joy->nr_axes, joy->nr_povs);
-
-        joysticks_present++;
-
-end_loop:
-        free(info);
-    }
-
-    joystick_log("joystick_init: joysticks_present=%i\n", joysticks_present);
-
-    /* Initialize the RawInput (joystick and gamepad) module. */
-    RAWINPUTDEVICE ridev[2];
-    ridev[0].dwFlags     = 0;
-    ridev[0].hwndTarget  = NULL;
-    ridev[0].usUsagePage = HID_USAGE_PAGE_GENERIC;
-    ridev[0].usUsage     = HID_USAGE_GENERIC_JOYSTICK;
-
-    ridev[1].dwFlags     = 0;
-    ridev[1].hwndTarget  = NULL;
-    ridev[1].usUsagePage = HID_USAGE_PAGE_GENERIC;
-    ridev[1].usUsage     = HID_USAGE_GENERIC_GAMEPAD;
-
-    if (!RegisterRawInputDevices(ridev, 2, sizeof(RAWINPUTDEVICE)))
-        fatal("plat_joystick_init: RegisterRawInputDevices failed\n");
-}
-
-void
-joystick_close(void)
-{
-    RAWINPUTDEVICE ridev[2];
-    ridev[0].dwFlags     = RIDEV_REMOVE;
-    ridev[0].hwndTarget  = NULL;
-    ridev[0].usUsagePage = HID_USAGE_PAGE_GENERIC;
-    ridev[0].usUsage     = HID_USAGE_GENERIC_JOYSTICK;
-
-    ridev[1].dwFlags     = RIDEV_REMOVE;
-    ridev[1].hwndTarget  = NULL;
-    ridev[1].usUsagePage = HID_USAGE_PAGE_GENERIC;
-    ridev[1].usUsage     = HID_USAGE_GENERIC_GAMEPAD;
-
-    RegisterRawInputDevices(ridev, 2, sizeof(RAWINPUTDEVICE));
-}
-
-void
-win_joystick_handle(PRAWINPUT raw)
-{
-    HRESULT r;
-    int     j = -1; /* current joystick index, -1 when not found */
-
-    /* If the input is not from a known device, we ignore it */
-    for (int i = 0; i < joysticks_present; i++) {
-        if (raw_joystick_state[i].hdevice == raw->header.hDevice) {
-            j = i;
-            break;
-        }
-    }
-    if (j == -1)
-        return;
-
-    /* Read buttons */
-    USAGE usage_list[128] = { 0 };
-    ULONG usage_length    = plat_joystick_state[j].nr_buttons;
-    memset(plat_joystick_state[j].b, 0, 32 * sizeof(int));
-
-    r = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usage_list, &usage_length,
-                       raw_joystick_state[j].data, (PCHAR) raw->data.hid.bRawData, raw->data.hid.dwSizeHid);
-
-    if (r == HIDP_STATUS_SUCCESS) {
-        for (int i = 0; i < usage_length; i++) {
-            int button                       = raw_joystick_state[j].usage_button[usage_list[i]];
-            plat_joystick_state[j].b[button] = 128;
-        }
-    }
-
-    /* Read axes */
-    for (int a = 0; a < plat_joystick_state[j].nr_axes; a++) {
-        const struct raw_axis_t *axis   = &raw_joystick_state[j].axis[a];
-        ULONG                    uvalue = 0;
-        LONG                     value  = 0;
-        LONG                     center = (axis->max - axis->min + 1) / 2;
-
-        r = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, axis->link, axis->usage, &uvalue,
-                               raw_joystick_state[j].data, (PCHAR) raw->data.hid.bRawData, raw->data.hid.dwSizeHid);
-
-        if (r == HIDP_STATUS_SUCCESS) {
-            if (axis->min < 0) {
-                /* extend signed uvalue to LONG */
-                if (uvalue & (1 << (axis->bitsize - 1))) {
-                    ULONG mask = (1 << axis->bitsize) - 1;
-                    value      = -1U ^ mask;
-                    value |= uvalue;
-                } else {
-                    value = uvalue;
-                }
-            } else {
-                /* Assume unsigned when min >= 0, convert to a signed value */
-                value = (LONG) uvalue - center;
-            }
-            if (abs(value) == 1)
-                value = 0;
-            value = value * 32768 / center;
-        }
-
-        plat_joystick_state[j].a[a] = value;
-        // joystick_log("%s %-06d ", plat_joystick_state[j].axis[a].name, plat_joystick_state[j].a[a]);
-    }
-
-    /* read povs */
-    for (int p = 0; p < plat_joystick_state[j].nr_povs; p++) {
-        const struct raw_pov_t *pov    = &raw_joystick_state[j].pov[p];
-        ULONG                   uvalue = 0;
-        LONG                    value  = -1;
-
-        r = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, pov->link, pov->usage, &uvalue,
-                               raw_joystick_state[j].data, (PCHAR) raw->data.hid.bRawData, raw->data.hid.dwSizeHid);
-
-        if (r == HIDP_STATUS_SUCCESS && (uvalue >= pov->min && uvalue <= pov->max)) {
-            value = (uvalue - pov->min) * 36000;
-            value /= (pov->max - pov->min + 1);
-            value %= 36000;
-        }
-
-        plat_joystick_state[j].p[p] = value;
-
-#if 0
-        joystick_log("%s %-3d ", plat_joystick_state[j].pov[p].name, plat_joystick_state[j].p[p]);
-#endif
-    }
-#if 0
-    joystick_log("\n");
-#endif
-}
-
-static int
-joystick_get_axis(int joystick_nr, int mapping)
-{
-    if (mapping & POV_X) {
-        int pov = plat_joystick_state[joystick_nr].p[mapping & 3];
-        if (LOWORD(pov) == 0xFFFF)
-            return 0;
-        else
-            return sin((2 * M_PI * (double) pov) / 36000.0) * 32767;
-    } else if (mapping & POV_Y) {
-        int pov = plat_joystick_state[joystick_nr].p[mapping & 3];
-
-        if (LOWORD(pov) == 0xFFFF)
-            return 0;
-        else
-            return -cos((2 * M_PI * (double) pov) / 36000.0) * 32767;
-    } else
-        return plat_joystick_state[joystick_nr].a[plat_joystick_state[joystick_nr].axis[mapping].id];
-}
-
-void
-joystick_process(void)
-{
-    int d;
-
-    if (joystick_type == JS_TYPE_NONE)
-        return;
-
-    for (int c = 0; c < joystick_get_max_joysticks(joystick_type); c++) {
-        if (joystick_state[c].plat_joystick_nr) {
-            int joystick_nr = joystick_state[c].plat_joystick_nr - 1;
-
-            for (d = 0; d < joystick_get_axis_count(joystick_type); d++)
-                joystick_state[c].axis[d] = joystick_get_axis(joystick_nr, joystick_state[c].axis_mapping[d]);
-            for (d = 0; d < joystick_get_button_count(joystick_type); d++)
-                joystick_state[c].button[d] = plat_joystick_state[joystick_nr].b[joystick_state[c].button_mapping[d]];
-
-            for (d = 0; d < joystick_get_pov_count(joystick_type); d++) {
-                int    x;
-                int    y;
-                double angle;
-                double magnitude;
-
-                x = joystick_get_axis(joystick_nr, joystick_state[c].pov_mapping[d][0]);
-                y = joystick_get_axis(joystick_nr, joystick_state[c].pov_mapping[d][1]);
-
-                angle     = (atan2((double) y, (double) x) * 360.0) / (2 * M_PI);
-                magnitude = sqrt((double) x * (double) x + (double) y * (double) y);
-
-                if (magnitude < 16384)
-                    joystick_state[c].pov[d] = -1;
-                else
-                    joystick_state[c].pov[d] = ((int) angle + 90 + 360) % 360;
-            }
-        } else {
-            for (d = 0; d < joystick_get_axis_count(joystick_type); d++)
-                joystick_state[c].axis[d] = 0;
-            for (d = 0; d < joystick_get_button_count(joystick_type); d++)
-                joystick_state[c].button[d] = 0;
-            for (d = 0; d < joystick_get_pov_count(joystick_type); d++)
-                joystick_state[c].pov[d] = -1;
-        }
-    }
-}
diff --git a/src/win/win_joystick_xinput.c b/src/win/win_joystick_xinput.c
deleted file mode 100644
index f313522a9..000000000
--- a/src/win/win_joystick_xinput.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Xinput joystick interface.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          GH Cao, <driver1998.ms@outlook.com>
- *          Jasmine Iwanek,
- *
- *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2019 GH Cao.
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-#include <xinput.h>
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include <86box/device.h>
-#include <86box/plat.h>
-#include <86box/gameport.h>
-#include <86box/win.h>
-
-#define XINPUT_MAX_JOYSTICKS 4
-#define XINPUT_NAME          "Xinput compatiable controller"
-#define XINPUT_NAME_LX       "Left Stick X"
-#define XINPUT_NAME_LY       "Left Stick Y"
-#define XINPUT_NAME_RX       "Right Stick X"
-#define XINPUT_NAME_RY       "Right Stick Y"
-#define XINPUT_NAME_DPAD_X   "D-pad X"
-#define XINPUT_NAME_DPAD_Y   "D-pad Y"
-#define XINPUT_NAME_LB       "LB"
-#define XINPUT_NAME_RB       "RB"
-#define XINPUT_NAME_LT       "LT"
-#define XINPUT_NAME_RT       "RT"
-#define XINPUT_NAME_A        "A"
-#define XINPUT_NAME_B        "B"
-#define XINPUT_NAME_X        "X"
-#define XINPUT_NAME_Y        "Y"
-#define XINPUT_NAME_BACK     "Back/View"
-#define XINPUT_NAME_START    "Start/Menu"
-#define XINPUT_NAME_LS       "Left Stick"
-#define XINPUT_NAME_RS       "Right Stick"
-
-#ifdef ENABLE_JOYSTICK_LOG
-int joystick_do_log = ENABLE_JOYSTICK_LOG;
-
-static void
-joystick_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (joystick_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define joystick_log(fmt, ...)
-#endif
-
-plat_joystick_t plat_joystick_state[MAX_PLAT_JOYSTICKS];
-joystick_t      joystick_state[MAX_JOYSTICKS];
-int             joysticks_present = 0;
-
-XINPUT_STATE controllers[XINPUT_MAX_JOYSTICKS];
-
-void
-joystick_init()
-{
-    atexit(joystick_close);
-
-    joysticks_present = 0;
-
-    memset(controllers, 0, sizeof(XINPUT_STATE) * XINPUT_MAX_JOYSTICKS);
-
-    for (uint8_t c = 0; c < XINPUT_MAX_JOYSTICKS; c++) {
-        int value = XInputGetState(c, &controllers[c]);
-        if (value != ERROR_SUCCESS)
-            continue;
-        memcpy(plat_joystick_state[c].name, XINPUT_NAME, sizeof(XINPUT_NAME));
-
-        plat_joystick_state[c].nr_axes = 8;
-
-        /* analog stick */
-        memcpy(plat_joystick_state[c].axis[0].name, XINPUT_NAME_LX, sizeof(XINPUT_NAME_LX));
-        plat_joystick_state[c].axis[0].id = 0; /* X axis */
-        memcpy(plat_joystick_state[c].axis[1].name, XINPUT_NAME_LY, sizeof(XINPUT_NAME_LY));
-        plat_joystick_state[c].axis[1].id = 1; /* Y axis */
-        memcpy(plat_joystick_state[c].axis[2].name, XINPUT_NAME_RX, sizeof(XINPUT_NAME_RX));
-        plat_joystick_state[c].axis[2].id = 3; /* RX axis */
-        memcpy(plat_joystick_state[c].axis[3].name, XINPUT_NAME_RY, sizeof(XINPUT_NAME_RY));
-        plat_joystick_state[c].axis[3].id = 4; /* RY axis */
-
-        /* d-pad, assigned to Z and RZ */
-        memcpy(plat_joystick_state[c].axis[4].name, XINPUT_NAME_DPAD_X, sizeof(XINPUT_NAME_DPAD_X));
-        plat_joystick_state[c].axis[4].id = 2;
-        memcpy(plat_joystick_state[c].axis[5].name, XINPUT_NAME_DPAD_Y, sizeof(XINPUT_NAME_DPAD_Y));
-        plat_joystick_state[c].axis[5].id = 5;
-
-        /* Analog trigger */
-        memcpy(plat_joystick_state[c].axis[6].name, XINPUT_NAME_LT, sizeof(XINPUT_NAME_LT));
-        plat_joystick_state[c].axis[6].id = 6;
-        memcpy(plat_joystick_state[c].axis[7].name, XINPUT_NAME_RT, sizeof(XINPUT_NAME_RT));
-        plat_joystick_state[c].axis[7].id = 7;
-
-        plat_joystick_state[c].nr_buttons = 12;
-        memcpy(plat_joystick_state[c].button[0].name, XINPUT_NAME_A, sizeof(XINPUT_NAME_A));
-        memcpy(plat_joystick_state[c].button[1].name, XINPUT_NAME_B, sizeof(XINPUT_NAME_B));
-        memcpy(plat_joystick_state[c].button[2].name, XINPUT_NAME_X, sizeof(XINPUT_NAME_X));
-        memcpy(plat_joystick_state[c].button[3].name, XINPUT_NAME_Y, sizeof(XINPUT_NAME_Y));
-        memcpy(plat_joystick_state[c].button[4].name, XINPUT_NAME_LB, sizeof(XINPUT_NAME_LB));
-        memcpy(plat_joystick_state[c].button[5].name, XINPUT_NAME_RB, sizeof(XINPUT_NAME_RB));
-        memcpy(plat_joystick_state[c].button[6].name, XINPUT_NAME_LT, sizeof(XINPUT_NAME_LT));
-        memcpy(plat_joystick_state[c].button[7].name, XINPUT_NAME_RT, sizeof(XINPUT_NAME_RT));
-        memcpy(plat_joystick_state[c].button[8].name, XINPUT_NAME_BACK, sizeof(XINPUT_NAME_BACK));
-        memcpy(plat_joystick_state[c].button[9].name, XINPUT_NAME_START, sizeof(XINPUT_NAME_START));
-        memcpy(plat_joystick_state[c].button[10].name, XINPUT_NAME_LS, sizeof(XINPUT_NAME_LS));
-        memcpy(plat_joystick_state[c].button[11].name, XINPUT_NAME_RS, sizeof(XINPUT_NAME_RS));
-
-        plat_joystick_state[c].nr_povs = 0;
-
-        joysticks_present++;
-    }
-    joystick_log("joystick_init: joysticks_present=%i\n", joysticks_present);
-}
-
-void
-joystick_close()
-{
-    //
-}
-
-void
-joystick_poll(void)
-{
-    for (int c = 0; c < joysticks_present; c++) {
-        int value = XInputGetState(c, &controllers[c]);
-        if (value != ERROR_SUCCESS)
-            continue;
-
-        plat_joystick_state[c].a[0] = controllers[c].Gamepad.sThumbLX;
-        plat_joystick_state[c].a[1] = -controllers[c].Gamepad.sThumbLY;
-        plat_joystick_state[c].a[3] = controllers[c].Gamepad.sThumbRX;
-        plat_joystick_state[c].a[4] = -controllers[c].Gamepad.sThumbRY;
-        plat_joystick_state[c].a[6] = (double) controllers[c].Gamepad.bLeftTrigger / 255 * 32767;
-        plat_joystick_state[c].a[7] = (double) controllers[c].Gamepad.bRightTrigger / 255 * 32767;
-
-        plat_joystick_state[c].b[0]  = (controllers[c].Gamepad.wButtons & XINPUT_GAMEPAD_A) ? 128 : 0;
-        plat_joystick_state[c].b[1]  = (controllers[c].Gamepad.wButtons & XINPUT_GAMEPAD_B) ? 128 : 0;
-        plat_joystick_state[c].b[2]  = (controllers[c].Gamepad.wButtons & XINPUT_GAMEPAD_X) ? 128 : 0;
-        plat_joystick_state[c].b[3]  = (controllers[c].Gamepad.wButtons & XINPUT_GAMEPAD_Y) ? 128 : 0;
-        plat_joystick_state[c].b[4]  = (controllers[c].Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_SHOULDER) ? 128 : 0;
-        plat_joystick_state[c].b[5]  = (controllers[c].Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_SHOULDER) ? 128 : 0;
-        plat_joystick_state[c].b[6]  = (controllers[c].Gamepad.bLeftTrigger > 127) ? 128 : 0;
-        plat_joystick_state[c].b[7]  = (controllers[c].Gamepad.bRightTrigger > 127) ? 128 : 0;
-        plat_joystick_state[c].b[8]  = (controllers[c].Gamepad.wButtons & XINPUT_GAMEPAD_BACK) ? 128 : 0;
-        plat_joystick_state[c].b[9]  = (controllers[c].Gamepad.wButtons & XINPUT_GAMEPAD_START) ? 128 : 0;
-        plat_joystick_state[c].b[10] = (controllers[c].Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_THUMB) ? 128 : 0;
-        plat_joystick_state[c].b[11] = (controllers[c].Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_THUMB) ? 128 : 0;
-
-        int dpad_x = 0;
-        int dpad_y = 0;
-        if (controllers[c].Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_UP)
-            dpad_y -= 32767;
-        if (controllers[c].Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_DOWN)
-            dpad_y += 32767;
-        if (controllers[c].Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT)
-            dpad_x -= 32767;
-        if (controllers[c].Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT)
-            dpad_x += 32767;
-
-        plat_joystick_state[c].a[2] = dpad_x;
-        plat_joystick_state[c].a[5] = dpad_y;
-
-        for (int a = 0; a < 8; a++) {
-            if (plat_joystick_state[c].a[a] == -32768)
-                plat_joystick_state[c].a[a] = -32767;
-            if (plat_joystick_state[c].a[a] == 32768)
-                plat_joystick_state[c].a[a] = 32767;
-        }
-    }
-}
-
-static int
-joystick_get_axis(int joystick_nr, int mapping)
-{
-    if (mapping & POV_X) {
-        int pov = plat_joystick_state[joystick_nr].p[mapping & 3];
-
-        if (LOWORD(pov) == 0xFFFF)
-            return 0;
-        else
-            return sin((2 * M_PI * (double) pov) / 36000.0) * 32767;
-    } else if (mapping & POV_Y) {
-        int pov = plat_joystick_state[joystick_nr].p[mapping & 3];
-
-        if (LOWORD(pov) == 0xFFFF)
-            return 0;
-        else
-            return -cos((2 * M_PI * (double) pov) / 36000.0) * 32767;
-    } else
-        return plat_joystick_state[joystick_nr].a[plat_joystick_state[joystick_nr].axis[mapping].id];
-}
-
-void
-joystick_process(void)
-{
-    int d;
-
-    if (!joystick_type)
-        return;
-
-    joystick_poll();
-
-    for (int c = 0; c < joystick_get_max_joysticks(joystick_type); c++) {
-        if (joystick_state[c].plat_joystick_nr) {
-            int joystick_nr = joystick_state[c].plat_joystick_nr - 1;
-
-            for (d = 0; d < joystick_get_axis_count(joystick_type); d++)
-                joystick_state[c].axis[d] = joystick_get_axis(joystick_nr, joystick_state[c].axis_mapping[d]);
-            for (d = 0; d < joystick_get_button_count(joystick_type); d++)
-                joystick_state[c].button[d] = plat_joystick_state[joystick_nr].b[joystick_state[c].button_mapping[d]];
-
-            for (d = 0; d < joystick_get_pov_count(joystick_type); d++) {
-                int    x;
-                int    y;
-                double angle;
-                double magnitude;
-
-                x = joystick_get_axis(joystick_nr, joystick_state[c].pov_mapping[d][0]);
-                y = joystick_get_axis(joystick_nr, joystick_state[c].pov_mapping[d][1]);
-
-                angle     = (atan2((double) y, (double) x) * 360.0) / (2 * M_PI);
-                magnitude = sqrt((double) x * (double) x + (double) y * (double) y);
-
-                if (magnitude < 16384)
-                    joystick_state[c].pov[d] = -1;
-                else
-                    joystick_state[c].pov[d] = ((int) angle + 90 + 360) % 360;
-            }
-        } else {
-            for (d = 0; d < joystick_get_axis_count(joystick_type); d++)
-                joystick_state[c].axis[d] = 0;
-            for (d = 0; d < joystick_get_button_count(joystick_type); d++)
-                joystick_state[c].button[d] = 0;
-            for (d = 0; d < joystick_get_pov_count(joystick_type); d++)
-                joystick_state[c].pov[d] = -1;
-        }
-    }
-}
-
-void
-win_joystick_handle(UNUSED(PRAWINPUT raw))
-{
-    // Nothing to be done here, atleast currently
-}
diff --git a/src/win/win_jsconf.c b/src/win/win_jsconf.c
deleted file mode 100644
index 66ad60c73..000000000
--- a/src/win/win_jsconf.c
+++ /dev/null
@@ -1,538 +0,0 @@
-/* Copyright holders: Sarah Walker
-   see COPYING for more details
-*/
-#include <windows.h>
-#include <windowsx.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/config.h>
-#include <86box/device.h>
-#include <86box/gameport.h>
-#include <86box/plat.h>
-#include <86box/win.h>
-
-static int joystick_nr;
-static int joystick_config_type;
-#define AXIS_STRINGS_MAX 3
-static char *axis_strings[AXIS_STRINGS_MAX] = { "X Axis", "Y Axis", "Z Axis" };
-
-static uint8_t joystickconfig_changed = 0;
-
-static void
-rebuild_axis_button_selections(HWND hdlg)
-{
-    int  id = IDC_CONFIG_BASE + 2;
-    HWND h;
-    int  joystick;
-    int  c;
-    int  d;
-    char s[269];
-
-    h        = GetDlgItem(hdlg, IDC_CONFIG_BASE);
-    joystick = SendMessage(h, CB_GETCURSEL, 0, 0);
-
-    for (c = 0; c < joystick_get_axis_count(joystick_config_type); c++) {
-        int sel = c;
-
-        h = GetDlgItem(hdlg, id);
-        SendMessage(h, CB_RESETCONTENT, 0, 0);
-
-        if (joystick) {
-            for (d = 0; d < plat_joystick_state[joystick - 1].nr_axes; d++) {
-                SendMessage(h, CB_ADDSTRING, 0, (LPARAM) (LPCSTR) plat_joystick_state[joystick - 1].axis[d].name);
-                if (c < AXIS_STRINGS_MAX) {
-                    if (!stricmp(axis_strings[c], plat_joystick_state[joystick - 1].axis[d].name))
-                        sel = d;
-                }
-            }
-            for (d = 0; d < plat_joystick_state[joystick - 1].nr_povs; d++) {
-                sprintf(s, "%s (X axis)", plat_joystick_state[joystick - 1].pov[d].name);
-                SendMessage(h, CB_ADDSTRING, 0, (LPARAM) (LPCSTR) s);
-                sprintf(s, "%s (Y axis)", plat_joystick_state[joystick - 1].pov[d].name);
-                SendMessage(h, CB_ADDSTRING, 0, (LPARAM) (LPCSTR) s);
-            }
-            for (d = 0; d < plat_joystick_state[joystick - 1].nr_sliders; d++) {
-                SendMessage(h, CB_ADDSTRING, 0, (LPARAM) (LPCSTR) plat_joystick_state[joystick - 1].slider[d].name);
-            }
-            SendMessage(h, CB_SETCURSEL, sel, 0);
-            EnableWindow(h, TRUE);
-        } else
-            EnableWindow(h, FALSE);
-
-        id += 2;
-    }
-
-    for (c = 0; c < joystick_get_button_count(joystick_config_type); c++) {
-        h = GetDlgItem(hdlg, id);
-        SendMessage(h, CB_RESETCONTENT, 0, 0);
-
-        if (joystick) {
-            for (d = 0; d < plat_joystick_state[joystick - 1].nr_buttons; d++)
-                SendMessage(h, CB_ADDSTRING, 0, (LPARAM) (LPCSTR) plat_joystick_state[joystick - 1].button[d].name);
-            SendMessage(h, CB_SETCURSEL, c, 0);
-            EnableWindow(h, TRUE);
-        } else
-            EnableWindow(h, FALSE);
-
-        id += 2;
-    }
-
-    for (c = 0; c < joystick_get_pov_count(joystick_config_type) * 2; c++) {
-        int sel = c;
-
-        h = GetDlgItem(hdlg, id);
-        SendMessage(h, CB_RESETCONTENT, 0, 0);
-
-        if (joystick) {
-            for (d = 0; d < plat_joystick_state[joystick - 1].nr_povs; d++) {
-                sprintf(s, "%s (X axis)", plat_joystick_state[joystick - 1].pov[d].name);
-                SendMessage(h, CB_ADDSTRING, 0, (LPARAM) (LPCSTR) s);
-                sprintf(s, "%s (Y axis)", plat_joystick_state[joystick - 1].pov[d].name);
-                SendMessage(h, CB_ADDSTRING, 0, (LPARAM) (LPCSTR) s);
-            }
-            for (d = 0; d < plat_joystick_state[joystick - 1].nr_axes; d++) {
-                SendMessage(h, CB_ADDSTRING, 0, (LPARAM) (LPCSTR) plat_joystick_state[joystick - 1].axis[d].name);
-            }
-            SendMessage(h, CB_SETCURSEL, sel, 0);
-            EnableWindow(h, TRUE);
-        } else
-            EnableWindow(h, FALSE);
-
-        id += 2;
-    }
-}
-
-static int
-get_axis(HWND hdlg, int id)
-{
-    HWND h        = GetDlgItem(hdlg, id);
-    int  axis_sel = SendMessage(h, CB_GETCURSEL, 0, 0);
-    int  nr_axes  = plat_joystick_state[joystick_state[joystick_nr].plat_joystick_nr - 1].nr_axes;
-    int  nr_povs  = plat_joystick_state[joystick_state[joystick_nr].plat_joystick_nr - 1].nr_povs;
-
-    if (axis_sel < nr_axes)
-        return axis_sel;
-
-    axis_sel -= nr_axes;
-    if (axis_sel < nr_povs * 2) {
-        if (axis_sel & 1)
-            return POV_Y | (axis_sel >> 1);
-        else
-            return POV_X | (axis_sel >> 1);
-    }
-    axis_sel -= nr_povs;
-
-    return SLIDER | (axis_sel >> 1);
-}
-
-static int
-get_pov(HWND hdlg, int id)
-{
-    HWND h        = GetDlgItem(hdlg, id);
-    int  axis_sel = SendMessage(h, CB_GETCURSEL, 0, 0);
-    int  nr_povs  = plat_joystick_state[joystick_state[joystick_nr].plat_joystick_nr - 1].nr_povs * 2;
-
-    if (axis_sel < nr_povs) {
-        if (axis_sel & 1)
-            return POV_Y | (axis_sel >> 1);
-        else
-            return POV_X | (axis_sel >> 1);
-    }
-
-    return axis_sel - nr_povs;
-}
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-joystickconfig_dlgproc(HWND hdlg, UINT message, WPARAM wParam, UNUSED(LPARAM lParam))
-{
-    HWND h;
-    int  c;
-    int  id;
-    int  joystick;
-    int  nr_axes;
-    int  nr_povs;
-    int  mapping;
-
-    switch (message) {
-        case WM_INITDIALOG:
-            {
-                h        = GetDlgItem(hdlg, IDC_CONFIG_BASE);
-                id       = IDC_CONFIG_BASE + 2;
-                joystick = joystick_state[joystick_nr].plat_joystick_nr;
-
-                SendMessage(h, CB_ADDSTRING, 0, (LPARAM) (LPCSTR) "None");
-
-                for (c = 0; c < joysticks_present; c++)
-                    SendMessage(h, CB_ADDSTRING, 0, (LPARAM) (LPCSTR) plat_joystick_state[c].name);
-
-                SendMessage(h, CB_SETCURSEL, joystick, 0);
-
-                rebuild_axis_button_selections(hdlg);
-
-                if (joystick_state[joystick_nr].plat_joystick_nr) {
-                    nr_axes = plat_joystick_state[joystick - 1].nr_axes;
-                    nr_povs = plat_joystick_state[joystick - 1].nr_povs;
-
-                    for (c = 0; c < joystick_get_axis_count(joystick_config_type); c++) {
-                        int mapping = joystick_state[joystick_nr].axis_mapping[c];
-
-                        h = GetDlgItem(hdlg, id);
-                        if (mapping & POV_X)
-                            SendMessage(h, CB_SETCURSEL, nr_axes + (mapping & 3) * 2, 0);
-                        else if (mapping & POV_Y)
-                            SendMessage(h, CB_SETCURSEL, nr_axes + (mapping & 3) * 2 + 1, 0);
-                        else if (mapping & SLIDER)
-                            SendMessage(h, CB_SETCURSEL, nr_axes + nr_povs * 2 + (mapping & 3), 0);
-                        else
-                            SendMessage(h, CB_SETCURSEL, mapping, 0);
-                        id += 2;
-                    }
-                    for (c = 0; c < joystick_get_button_count(joystick_config_type); c++) {
-                        h = GetDlgItem(hdlg, id);
-                        SendMessage(h, CB_SETCURSEL, joystick_state[joystick_nr].button_mapping[c], 0);
-                        id += 2;
-                    }
-                    for (c = 0; c < joystick_get_pov_count(joystick_config_type); c++) {
-                        h       = GetDlgItem(hdlg, id);
-                        mapping = joystick_state[joystick_nr].pov_mapping[c][0];
-                        if (mapping & POV_X)
-                            SendMessage(h, CB_SETCURSEL, (mapping & 3) * 2, 0);
-                        else if (mapping & POV_Y)
-                            SendMessage(h, CB_SETCURSEL, (mapping & 3) * 2 + 1, 0);
-                        else
-                            SendMessage(h, CB_SETCURSEL, mapping + nr_povs * 2, 0);
-                        id += 2;
-                        h       = GetDlgItem(hdlg, id);
-                        mapping = joystick_state[joystick_nr].pov_mapping[c][1];
-                        if (mapping & POV_X)
-                            SendMessage(h, CB_SETCURSEL, (mapping & 3) * 2, 0);
-                        else if (mapping & POV_Y)
-                            SendMessage(h, CB_SETCURSEL, (mapping & 3) * 2 + 1, 0);
-                        else
-                            SendMessage(h, CB_SETCURSEL, mapping + nr_povs * 2, 0);
-                        id += 2;
-                    }
-                }
-            }
-            return TRUE;
-
-        case WM_COMMAND:
-            switch (LOWORD(wParam)) {
-                case IDC_CONFIG_BASE:
-                    if (HIWORD(wParam) == CBN_SELCHANGE)
-                        rebuild_axis_button_selections(hdlg);
-                    break;
-
-                case IDOK:
-                    {
-                        id = IDC_CONFIG_BASE + 2;
-
-                        h                                            = GetDlgItem(hdlg, IDC_CONFIG_BASE);
-                        joystick_state[joystick_nr].plat_joystick_nr = SendMessage(h, CB_GETCURSEL, 0, 0);
-
-                        if (joystick_state[joystick_nr].plat_joystick_nr) {
-                            for (c = 0; c < joystick_get_axis_count(joystick_config_type); c++) {
-                                joystick_state[joystick_nr].axis_mapping[c] = get_axis(hdlg, id);
-                                id += 2;
-                            }
-                            for (c = 0; c < joystick_get_button_count(joystick_config_type); c++) {
-                                h                                             = GetDlgItem(hdlg, id);
-                                joystick_state[joystick_nr].button_mapping[c] = SendMessage(h, CB_GETCURSEL, 0, 0);
-                                id += 2;
-                            }
-                            for (c = 0; c < joystick_get_pov_count(joystick_config_type); c++) {
-                                h                                             = GetDlgItem(hdlg, id);
-                                joystick_state[joystick_nr].pov_mapping[c][0] = get_pov(hdlg, id);
-                                id += 2;
-                                h                                             = GetDlgItem(hdlg, id);
-                                joystick_state[joystick_nr].pov_mapping[c][1] = get_pov(hdlg, id);
-                                id += 2;
-                            }
-                        }
-                    }
-                    joystickconfig_changed = 1;
-                    EndDialog(hdlg, 0);
-                    return TRUE;
-                case IDCANCEL:
-                    joystickconfig_changed = 0;
-                    EndDialog(hdlg, 0);
-                    return TRUE;
-            }
-            break;
-    }
-    return FALSE;
-}
-
-uint8_t
-joystickconfig_open(HWND hwnd, int joy_nr, int type)
-{
-    uint16_t        *data_block = malloc(16384);
-    uint16_t        *data;
-    DLGTEMPLATE     *dlg = (DLGTEMPLATE *) data_block;
-    DLGITEMTEMPLATE *item;
-    int              y  = 10;
-    int              id = IDC_CONFIG_BASE;
-    int              c;
-    char             s[269];
-
-    joystickconfig_changed = 0;
-
-    joystick_nr          = joy_nr;
-    joystick_config_type = type;
-
-    memset(data_block, 0, 4096);
-
-    dlg->style = DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU;
-    dlg->x     = 10;
-    dlg->y     = 10;
-    dlg->cx    = 220;
-    dlg->cy    = 70;
-
-    data = (uint16_t *) (dlg + 1);
-
-    *data++ = 0; /*no menu*/
-    *data++ = 0; /*predefined dialog box class*/
-    data += MultiByteToWideChar(CP_ACP, 0, "Joystick Configuration", -1, data, 50);
-
-    *data++ = 9; /*Point*/
-    data += MultiByteToWideChar(CP_ACP, 0, "Segoe UI", -1, data, 50);
-
-    if (((uintptr_t) data) & 2)
-        data++;
-
-    /*Combo box*/
-    item     = (DLGITEMTEMPLATE *) data;
-    item->x  = 70;
-    item->y  = y;
-    item->id = id++;
-
-    item->cx = 140;
-    item->cy = 150;
-
-    item->style = WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL;
-
-    data    = (uint16_t *) (item + 1);
-    *data++ = 0xFFFF;
-    *data++ = 0x0085; /* combo box class */
-
-    data += MultiByteToWideChar(CP_ACP, 0, "Device", -1, data, 256);
-    *data++ = 0; /* no creation data */
-
-    if (((uintptr_t) data) & 2)
-        data++;
-
-    /*Static text*/
-    item     = (DLGITEMTEMPLATE *) data;
-    item->x  = 10;
-    item->y  = y + 2;
-    item->id = id++;
-
-    item->cx = 60;
-    item->cy = 15;
-
-    item->style = WS_CHILD | WS_VISIBLE;
-
-    data    = (uint16_t *) (item + 1);
-    *data++ = 0xFFFF;
-    *data++ = 0x0082; /* static class */
-
-    data += MultiByteToWideChar(CP_ACP, 0, "Device", -1, data, 256);
-    *data++ = 0; /* no creation data */
-
-    if (((uintptr_t) data) & 2)
-        data++;
-
-    y += 20;
-
-    for (c = 0; c < joystick_get_axis_count(type); c++) {
-        /*Combo box*/
-        item     = (DLGITEMTEMPLATE *) data;
-        item->x  = 70;
-        item->y  = y;
-        item->id = id++;
-
-        item->cx = 140;
-        item->cy = 150;
-
-        item->style = WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL;
-
-        data    = (uint16_t *) (item + 1);
-        *data++ = 0xFFFF;
-        *data++ = 0x0085; /* combo box class */
-
-        data += MultiByteToWideChar(CP_ACP, 0, joystick_get_axis_name(type, c), -1, data, 256);
-        *data++ = 0; /* no creation data */
-
-        if (((uintptr_t) data) & 2)
-            data++;
-
-        /*Static text*/
-        item     = (DLGITEMTEMPLATE *) data;
-        item->x  = 10;
-        item->y  = y + 2;
-        item->id = id++;
-
-        item->cx = 60;
-        item->cy = 15;
-
-        item->style = WS_CHILD | WS_VISIBLE;
-
-        data    = (uint16_t *) (item + 1);
-        *data++ = 0xFFFF;
-        *data++ = 0x0082; /* static class */
-
-        data += MultiByteToWideChar(CP_ACP, 0, joystick_get_axis_name(type, c), -1, data, 256);
-        *data++ = 0; /* no creation data */
-
-        if (((uintptr_t) data) & 2)
-            data++;
-
-        y += 20;
-    }
-
-    for (c = 0; c < joystick_get_button_count(type); c++) {
-        /*Combo box*/
-        item     = (DLGITEMTEMPLATE *) data;
-        item->x  = 70;
-        item->y  = y;
-        item->id = id++;
-
-        item->cx = 140;
-        item->cy = 150;
-
-        item->style = WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL;
-
-        data    = (uint16_t *) (item + 1);
-        *data++ = 0xFFFF;
-        *data++ = 0x0085; /* combo box class */
-
-        data += MultiByteToWideChar(CP_ACP, 0, joystick_get_button_name(type, c), -1, data, 256);
-        *data++ = 0; /* no creation data */
-
-        if (((uintptr_t) data) & 2)
-            data++;
-
-        /*Static text*/
-        item     = (DLGITEMTEMPLATE *) data;
-        item->x  = 10;
-        item->y  = y + 2;
-        item->id = id++;
-
-        item->cx = 60;
-        item->cy = 15;
-
-        item->style = WS_CHILD | WS_VISIBLE;
-
-        data    = (uint16_t *) (item + 1);
-        *data++ = 0xFFFF;
-        *data++ = 0x0082; /* static class */
-
-        data += MultiByteToWideChar(CP_ACP, 0, joystick_get_button_name(type, c), -1, data, 256);
-        *data++ = 0; /* no creation data */
-
-        if (((uintptr_t) data) & 2)
-            data++;
-
-        y += 20;
-    }
-
-    for (c = 0; c < joystick_get_pov_count(type) * 2; c++) {
-        /*Combo box*/
-        item     = (DLGITEMTEMPLATE *) data;
-        item->x  = 70;
-        item->y  = y;
-        item->id = id++;
-
-        item->cx = 140;
-        item->cy = 150;
-
-        item->style = WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL;
-
-        data    = (uint16_t *) (item + 1);
-        *data++ = 0xFFFF;
-        *data++ = 0x0085; /* combo box class */
-
-        if (c & 1)
-            sprintf(s, "%s (Y axis)", joystick_get_pov_name(type, c / 2));
-        else
-            sprintf(s, "%s (X axis)", joystick_get_pov_name(type, c / 2));
-        data += MultiByteToWideChar(CP_ACP, 0, s, -1, data, 256);
-        *data++ = 0; /* no creation data */
-
-        if (((uintptr_t) data) & 2)
-            data++;
-
-        /*Static text*/
-        item     = (DLGITEMTEMPLATE *) data;
-        item->x  = 10;
-        item->y  = y + 2;
-        item->id = id++;
-
-        item->cx = 60;
-        item->cy = 15;
-
-        item->style = WS_CHILD | WS_VISIBLE;
-
-        data    = (uint16_t *) (item + 1);
-        *data++ = 0xFFFF;
-        *data++ = 0x0082; /* static class */
-
-        data += MultiByteToWideChar(CP_ACP, 0, s, -1, data, 256);
-        *data++ = 0; /* no creation data */
-
-        if (((uintptr_t) data) & 2)
-            data++;
-
-        y += 20;
-    }
-
-    dlg->cdit = (id - IDC_CONFIG_BASE) + 2;
-
-    item        = (DLGITEMTEMPLATE *) data;
-    item->x     = 100;
-    item->y     = y + 5;
-    item->cx    = 50;
-    item->cy    = 14;
-    item->id    = IDOK; /* OK button identifier */
-    item->style = WS_CHILD | WS_VISIBLE | BS_DEFPUSHBUTTON;
-
-    data    = (uint16_t *) (item + 1);
-    *data++ = 0xFFFF;
-    *data++ = 0x0080; /* button class */
-
-    data += MultiByteToWideChar(CP_ACP, 0, "OK", -1, data, 50);
-    *data++ = 0; /* no creation data */
-
-    if (((uintptr_t) data) & 2)
-        data++;
-
-    item        = (DLGITEMTEMPLATE *) data;
-    item->x     = 160;
-    item->y     = y + 5;
-    item->cx    = 50;
-    item->cy    = 14;
-    item->id    = IDCANCEL; /* Cancel button identifier */
-    item->style = WS_CHILD | WS_VISIBLE;
-
-    data    = (uint16_t *) (item + 1);
-    *data++ = 0xFFFF;
-    *data++ = 0x0080; /* button class */
-
-    data += MultiByteToWideChar(CP_ACP, 0, "Cancel", -1, data, 50);
-    *data++ = 0; /* no creation data */
-
-    dlg->cy = y + 25;
-
-    DialogBoxIndirect(hinstance, dlg, hwnd, joystickconfig_dlgproc);
-
-    free(data_block);
-
-    return joystickconfig_changed;
-}
diff --git a/src/win/win_keyboard.c b/src/win/win_keyboard.c
deleted file mode 100644
index 54be91e6c..000000000
--- a/src/win/win_keyboard.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Windows raw keyboard input handler.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *
- *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-#define UNICODE
-#define _WIN32_WINNT 0x0501
-#define BITMAP       WINDOWS_BITMAP
-#include <windows.h>
-#include <windowsx.h>
-#undef BITMAP
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <86box/86box.h>
-#include <86box/device.h>
-#include <86box/keyboard.h>
-#include <86box/plat.h>
-#include <86box/win.h>
-
-static uint16_t scancode_map[768];
-
-/* This is so we can disambiguate scan codes that would otherwise conflict and get
-   passed on incorrectly. */
-static UINT16
-convert_scan_code(UINT16 scan_code)
-{
-    if ((scan_code & 0xff00) == 0xe000)
-        scan_code = (scan_code & 0xff) | 0x0100;
-
-    if (scan_code == 0xE11D)
-        scan_code = 0x0100;
-    /* E0 00 is sent by some USB keyboards for their special keys, as it is an
-       invalid scan code (it has no untranslated set 2 equivalent), we mark it
-       appropriately so it does not get passed through. */
-    else if ((scan_code > 0x01FF) || (scan_code == 0x0100))
-        scan_code = 0xFFFF;
-
-    return scan_code;
-}
-
-void
-keyboard_getkeymap(void)
-{
-    const WCHAR  *keyName   = L"SYSTEM\\CurrentControlSet\\Control\\Keyboard Layout";
-    const WCHAR  *valueName = L"Scancode Map";
-    unsigned char buf[32768];
-    DWORD         bufSize;
-    HKEY          hKey;
-    int           j;
-    const UINT32 *bufEx2;
-    int           scMapCount;
-    const UINT16 *bufEx;
-    int           scancode_unmapped;
-    int           scancode_mapped;
-
-    /* First, prepare the default scan code map list which is 1:1.
-     * Remappings will be inserted directly into it.
-     * 512 bytes so this takes less memory, bit 9 set means E0
-     * prefix.
-     */
-    for (j = 0; j < 512; j++)
-        scancode_map[j] = j;
-
-    /* Get the scan code remappings from:
-    HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Keyboard Layout */
-    bufSize = 32768;
-    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, keyName, 0, 1, &hKey) == ERROR_SUCCESS) {
-        if (RegQueryValueEx(hKey, valueName, NULL, NULL, buf, &bufSize) == ERROR_SUCCESS) {
-            bufEx2     = (UINT32 *) buf;
-            scMapCount = bufEx2[2];
-            if ((bufSize != 0) && (scMapCount != 0)) {
-                bufEx = (UINT16 *) (buf + 12);
-                for (j = 0; j < scMapCount * 2; j += 2) {
-                    /* Each scan code is 32-bit: 16 bits of remapped scan code,
-                       and 16 bits of original scan code. */
-                    scancode_unmapped = bufEx[j + 1];
-                    scancode_mapped   = bufEx[j];
-
-                    scancode_unmapped = convert_scan_code(scancode_unmapped);
-                    scancode_mapped   = convert_scan_code(scancode_mapped);
-
-                    /* Ignore source scan codes with prefixes other than E1
-                       that are not E1 1D. */
-                    if (scancode_unmapped != 0xFFFF)
-                        scancode_map[scancode_unmapped] = scancode_mapped;
-                }
-            }
-        }
-        RegCloseKey(hKey);
-    }
-}
-
-void
-keyboard_handle(PRAWINPUT raw)
-{
-    USHORT     scancode;
-    static int recv_lalt = 0;
-    static int recv_ralt = 0;
-    static int recv_tab = 0;
-
-    RAWKEYBOARD rawKB = raw->data.keyboard;
-    scancode          = rawKB.MakeCode;
-
-    if (kbd_req_capture && !mouse_capture && !video_fullscreen)
-        return;
-
-    /* If it's not a scan code that starts with 0xE1 */
-    if (!(rawKB.Flags & RI_KEY_E1)) {
-        if (rawKB.Flags & RI_KEY_E0)
-            scancode |= 0x100;
-
-        /* Translate the scan code to 9-bit */
-        scancode = convert_scan_code(scancode);
-
-        /* Remap it according to the list from the Registry */
-        if (scancode != scancode_map[scancode])
-            pclog("Scan code remap: %03X -> %03X\n", scancode, scancode);
-        scancode = scancode_map[scancode];
-
-        /* If it's not 0xFFFF, send it to the emulated
-           keyboard.
-           We use scan code 0xFFFF to mean a mapping that
-           has a prefix other than E0 and that is not E1 1D,
-           which is, for our purposes, invalid. */
-        if ((scancode == 0x00f) && !(rawKB.Flags & RI_KEY_BREAK) && (recv_lalt || recv_ralt) && (!kbd_req_capture || mouse_capture)) {
-            /* We received a TAB while ALT was pressed, while the mouse
-               is not captured, suppress the TAB and send an ALT key up. */
-            if (recv_lalt) {
-                keyboard_input(0, 0x038);
-                /* Extra key press and release so the guest is not stuck in the
-                   menu bar. */
-                keyboard_input(1, 0x038);
-                keyboard_input(0, 0x038);
-                recv_lalt = 0;
-            }
-            if (recv_ralt) {
-                keyboard_input(0, 0x138);
-                /* Extra key press and release so the guest is not stuck in the
-                   menu bar. */
-                keyboard_input(1, 0x138);
-                keyboard_input(0, 0x138);
-                recv_ralt = 0;
-            }
-        } else if (((scancode == 0x038) || (scancode == 0x138)) && !(rawKB.Flags & RI_KEY_BREAK) && recv_tab && (!kbd_req_capture || mouse_capture)) {
-            /* We received an ALT while TAB was pressed, while the mouse
-               is not captured, suppress the ALT and send a TAB key up. */
-            keyboard_input(0, 0x00f);
-            recv_tab = 0;
-        } else {
-            switch (scancode) {
-                case 0x00f:
-                    recv_tab = !(rawKB.Flags & RI_KEY_BREAK);
-                    break;
-                case 0x038:
-                    recv_lalt = !(rawKB.Flags & RI_KEY_BREAK);
-                    break;
-                case 0x138:
-                    recv_ralt = !(rawKB.Flags & RI_KEY_BREAK);
-                    break;
-            }
-
-            /* Translate right CTRL to left ALT if the user has so
-               chosen. */
-            if ((scancode == 0x11d) && rctrl_is_lalt)
-                scancode = 0x038;
-
-            /* Normal scan code pass through, pass it through as is if
-               it's not an invalid scan code. */
-            if (scancode != 0xFFFF)
-                keyboard_input(!(rawKB.Flags & RI_KEY_BREAK), scancode);
-        }
-    } else {
-        if (rawKB.MakeCode == 0x1D) {
-            scancode = scancode_map[0x100]; /* Translate E1 1D to 0x100 (which would
-                                               otherwise be E0 00 but that is invalid
-                                               anyway).
-                                               Also, take a potential mapping into
-                                               account. */
-        } else
-            scancode = 0xFFFF;
-        if (scancode != 0xFFFF)
-            keyboard_input(!(rawKB.Flags & RI_KEY_BREAK), scancode);
-    }
-}
diff --git a/src/win/win_media_menu.c b/src/win/win_media_menu.c
deleted file mode 100644
index 549a495b9..000000000
--- a/src/win/win_media_menu.c
+++ /dev/null
@@ -1,766 +0,0 @@
-#define UNICODE
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <windows.h>
-#include <shlobj.h>
-#include <86box/86box.h>
-#include <86box/cdrom.h>
-#include <86box/config.h>
-#include <86box/device.h>
-#include <86box/timer.h>
-#include <86box/cassette.h>
-#include <86box/cartridge.h>
-#include <86box/fdd.h>
-#include <86box/fdd_86f.h>
-#include <86box/hdc.h>
-#include <86box/language.h>
-#include <86box/machine.h>
-#include <86box/scsi_device.h>
-#include <86box/mo.h>
-#include <86box/plat.h>
-#include <86box/scsi.h>
-#include <86box/sound.h>
-#include <86box/ui.h>
-#include <86box/zip.h>
-#include <86box/win.h>
-
-#define MACHINE_HAS_IDE  (machine_has_flags(machine, MACHINE_IDE_QUAD))
-#define MACHINE_HAS_SCSI (machine_has_flags(machine, MACHINE_SCSI))
-
-#define CASSETTE_FIRST   0
-#define CARTRIDGE_FIRST  CASSETTE_FIRST + 1
-#define FDD_FIRST        CARTRIDGE_FIRST + 2
-#define CDROM_FIRST      FDD_FIRST + FDD_NUM
-#define ZIP_FIRST        CDROM_FIRST + CDROM_NUM
-#define MO_FIRST         ZIP_FIRST + ZIP_NUM
-
-static HMENU media_menu;
-static HMENU stbar_menu;
-static HMENU menus[1 + 2 + FDD_NUM + CDROM_NUM + ZIP_NUM + MO_NUM];
-
-static char index_map[255];
-
-static void
-media_menu_set_ids(HMENU hMenu, int id)
-{
-    int c = GetMenuItemCount(hMenu);
-
-    MENUITEMINFO mii = { 0 };
-    mii.fMask        = MIIM_ID;
-    mii.cbSize       = sizeof(mii);
-
-    for (int i = 0; i < c; i++) {
-        GetMenuItemInfo(hMenu, i, TRUE, &mii);
-        mii.wID |= id;
-        SetMenuItemInfo(hMenu, i, TRUE, &mii);
-    }
-}
-
-/* Loads the submenu from resource by name */
-static HMENU
-media_menu_load_resource(wchar_t *lpName)
-{
-    HMENU loaded = LoadMenu(NULL, lpName);
-
-    /* The actual submenu is in a dummy popup menu item */
-    HMENU actual = GetSubMenu(loaded, 0);
-
-    /* Now that we have our submenu, we can destroy the parent menu */
-    RemoveMenu(loaded, (UINT_PTR) actual, MF_BYCOMMAND);
-    DestroyMenu(loaded);
-
-    return actual;
-}
-
-static void
-media_menu_set_name_cassette(void)
-{
-    wchar_t      name[512];
-    wchar_t      fn[512];
-    MENUITEMINFO mii = { 0 };
-
-    if (strlen(cassette_fname) == 0)
-        _swprintf(name, plat_get_string(IDS_2149), plat_get_string(IDS_2057));
-    else {
-        mbstoc16s(fn, cassette_fname, sizeof_w(fn));
-        _swprintf(name, plat_get_string(IDS_2149), fn);
-    }
-
-    mii.cbSize     = sizeof(mii);
-    mii.fMask      = MIIM_STRING;
-    mii.dwTypeData = name;
-
-    SetMenuItemInfo(media_menu, (UINT_PTR) menus[CASSETTE_FIRST], FALSE, &mii);
-}
-
-static void
-media_menu_set_name_cartridge(int drive)
-{
-    wchar_t      name[512];
-    wchar_t      fn[512];
-    MENUITEMINFO mii = { 0 };
-
-    if (strlen(cart_fns[drive]) == 0) {
-        _swprintf(name, plat_get_string(IDS_2151),
-                  drive + 1, plat_get_string(IDS_2057));
-    } else {
-        mbstoc16s(fn, cart_fns[drive], sizeof_w(fn));
-        _swprintf(name, plat_get_string(IDS_2151),
-                  drive + 1, fn);
-    }
-
-    mii.cbSize     = sizeof(mii);
-    mii.fMask      = MIIM_STRING;
-    mii.dwTypeData = name;
-
-    SetMenuItemInfo(media_menu, (UINT_PTR) menus[CARTRIDGE_FIRST + drive], FALSE, &mii);
-}
-
-static void
-media_menu_set_name_floppy(int drive)
-{
-    wchar_t      name[512];
-    wchar_t      temp[512];
-    wchar_t      fn[512];
-    MENUITEMINFO mii = { 0 };
-
-    mbstoc16s(temp, fdd_getname(fdd_get_type(drive)),
-              strlen(fdd_getname(fdd_get_type(drive))) + 1);
-    if (strlen(floppyfns[drive]) == 0) {
-        _swprintf(name, plat_get_string(IDS_2109),
-                  drive + 1, temp, plat_get_string(IDS_2057));
-    } else {
-        mbstoc16s(fn, floppyfns[drive], sizeof_w(fn));
-        _swprintf(name, plat_get_string(IDS_2109),
-                  drive + 1, temp, fn);
-    }
-
-    mii.cbSize     = sizeof(mii);
-    mii.fMask      = MIIM_STRING;
-    mii.dwTypeData = name;
-
-    SetMenuItemInfo(media_menu, (UINT_PTR) menus[FDD_FIRST + drive], FALSE, &mii);
-}
-
-static void
-media_menu_set_name_cdrom(int drive)
-{
-    wchar_t      name[512];
-    wchar_t     *temp;
-    wchar_t      fn[512];
-    MENUITEMINFO mii = { 0 };
-
-    int bus = cdrom[drive].bus_type;
-    int id  = IDS_5377 + (bus - 1);
-
-    temp = plat_get_string(id);
-
-    if (cdrom[drive].host_drive == 200) {
-        if (strlen(cdrom[drive].image_path) == 0) {
-            _swprintf(name, plat_get_string(IDS_5120),
-                      drive + 1, temp, plat_get_string(IDS_2057));
-        } else {
-            mbstoc16s(fn, cdrom[drive].image_path, sizeof_w(fn));
-            _swprintf(name, plat_get_string(IDS_5120),
-                      drive + 1, temp, fn);
-        }
-    } else
-        _swprintf(name, plat_get_string(IDS_5120), drive + 1, temp, plat_get_string(IDS_2057));
-
-    mii.cbSize     = sizeof(mii);
-    mii.fMask      = MIIM_STRING;
-    mii.dwTypeData = name;
-
-    SetMenuItemInfo(media_menu, (UINT_PTR) menus[CDROM_FIRST + drive], FALSE, &mii);
-}
-
-static void
-media_menu_set_name_zip(int drive)
-{
-    wchar_t      name[512];
-    wchar_t     *temp;
-    wchar_t      fn[512];
-    MENUITEMINFO mii = { 0 };
-
-    int bus = zip_drives[drive].bus_type;
-    int id  = IDS_5377 + (bus - 1);
-
-    temp = plat_get_string(id);
-
-    int type = zip_drives[drive].is_250 ? 250 : 100;
-
-    if (strlen(zip_drives[drive].image_path) == 0) {
-        _swprintf(name, plat_get_string(IDS_2054),
-                  type, drive + 1, temp, plat_get_string(IDS_2057));
-    } else {
-        mbstoc16s(fn, zip_drives[drive].image_path, sizeof_w(fn));
-        _swprintf(name, plat_get_string(IDS_2054),
-                  type, drive + 1, temp, fn);
-    }
-
-    mii.cbSize     = sizeof(mii);
-    mii.fMask      = MIIM_STRING;
-    mii.dwTypeData = name;
-
-    SetMenuItemInfo(media_menu, (UINT_PTR) menus[ZIP_FIRST + drive], FALSE, &mii);
-}
-
-static void
-media_menu_set_name_mo(int drive)
-{
-    wchar_t      name[512];
-    wchar_t     *temp;
-    wchar_t      fn[512];
-    MENUITEMINFO mii = { 0 };
-
-    int bus = mo_drives[drive].bus_type;
-    int id  = IDS_5377 + (bus - 1);
-
-    temp = plat_get_string(id);
-
-    if (strlen(mo_drives[drive].image_path) == 0) {
-        _swprintf(name, plat_get_string(IDS_2116),
-                  drive + 1, temp, plat_get_string(IDS_2057));
-    } else {
-        mbstoc16s(fn, mo_drives[drive].image_path, sizeof_w(fn));
-        _swprintf(name, plat_get_string(IDS_2116),
-                  drive + 1, temp, fn);
-    }
-
-    mii.cbSize     = sizeof(mii);
-    mii.fMask      = MIIM_STRING;
-    mii.dwTypeData = name;
-
-    SetMenuItemInfo(media_menu, (UINT_PTR) menus[MO_FIRST + drive], FALSE, &mii);
-}
-
-void
-media_menu_update_cassette(void)
-{
-    int i = CASSETTE_FIRST;
-
-    if (strlen(cassette_fname) == 0) {
-        EnableMenuItem(menus[i], IDM_CASSETTE_EJECT, MF_BYCOMMAND | MF_GRAYED);
-        EnableMenuItem(menus[i], IDM_CASSETTE_RECORD, MF_BYCOMMAND | MF_GRAYED);
-        EnableMenuItem(menus[i], IDM_CASSETTE_PLAY, MF_BYCOMMAND | MF_GRAYED);
-        CheckMenuItem(menus[i], IDM_CASSETTE_RECORD, MF_BYCOMMAND | MF_UNCHECKED);
-        CheckMenuItem(menus[i], IDM_CASSETTE_PLAY, MF_BYCOMMAND | MF_UNCHECKED);
-        EnableMenuItem(menus[i], IDM_CASSETTE_REWIND, MF_BYCOMMAND | MF_GRAYED);
-        EnableMenuItem(menus[i], IDM_CASSETTE_FAST_FORWARD, MF_BYCOMMAND | MF_GRAYED);
-    } else {
-        EnableMenuItem(menus[i], IDM_CASSETTE_EJECT, MF_BYCOMMAND | MF_ENABLED);
-        EnableMenuItem(menus[i], IDM_CASSETTE_RECORD, MF_BYCOMMAND | MF_ENABLED);
-        EnableMenuItem(menus[i], IDM_CASSETTE_PLAY, MF_BYCOMMAND | MF_ENABLED);
-        if (strcmp(cassette_mode, "save") == 0) {
-            CheckMenuItem(menus[i], IDM_CASSETTE_RECORD, MF_BYCOMMAND | MF_CHECKED);
-            CheckMenuItem(menus[i], IDM_CASSETTE_PLAY, MF_BYCOMMAND | MF_UNCHECKED);
-        } else {
-            CheckMenuItem(menus[i], IDM_CASSETTE_RECORD, MF_BYCOMMAND | MF_UNCHECKED);
-            CheckMenuItem(menus[i], IDM_CASSETTE_PLAY, MF_BYCOMMAND | MF_CHECKED);
-        }
-        EnableMenuItem(menus[i], IDM_CASSETTE_REWIND, MF_BYCOMMAND | MF_ENABLED);
-        EnableMenuItem(menus[i], IDM_CASSETTE_FAST_FORWARD, MF_BYCOMMAND | MF_ENABLED);
-    }
-
-    media_menu_set_name_cassette();
-}
-
-void
-media_menu_update_cartridge(int id)
-{
-    int i = CARTRIDGE_FIRST + id;
-
-    if (strlen(cart_fns[id]) == 0)
-        EnableMenuItem(menus[i], IDM_CARTRIDGE_EJECT | id, MF_BYCOMMAND | MF_GRAYED);
-    else
-        EnableMenuItem(menus[i], IDM_CARTRIDGE_EJECT | id, MF_BYCOMMAND | MF_ENABLED);
-
-    media_menu_set_name_cartridge(id);
-}
-
-void
-media_menu_update_floppy(int id)
-{
-    int i = FDD_FIRST + id;
-
-    if (strlen(floppyfns[id]) == 0) {
-        EnableMenuItem(menus[i], IDM_FLOPPY_EJECT | id, MF_BYCOMMAND | MF_GRAYED);
-        EnableMenuItem(menus[i], IDM_FLOPPY_EXPORT_TO_86F | id, MF_BYCOMMAND | MF_GRAYED);
-    } else {
-        EnableMenuItem(menus[i], IDM_FLOPPY_EJECT | id, MF_BYCOMMAND | MF_ENABLED);
-        EnableMenuItem(menus[i], IDM_FLOPPY_EXPORT_TO_86F | id, MF_BYCOMMAND | MF_ENABLED);
-    }
-
-    media_menu_set_name_floppy(id);
-}
-
-void
-media_menu_update_cdrom(int id)
-{
-    int i = CDROM_FIRST + id;
-
-    if (!cdrom[id].sound_on)
-        CheckMenuItem(menus[i], IDM_CDROM_MUTE | id, MF_BYCOMMAND | MF_CHECKED);
-    else
-        CheckMenuItem(menus[i], IDM_CDROM_MUTE | id, MF_BYCOMMAND | MF_UNCHECKED);
-
-    if (cdrom[id].host_drive == 200) {
-        CheckMenuItem(menus[i], IDM_CDROM_IMAGE | id, MF_BYCOMMAND | (cdrom[id].is_dir ? MF_UNCHECKED : MF_CHECKED));
-        CheckMenuItem(menus[i], IDM_CDROM_DIR | id, MF_BYCOMMAND | (cdrom[id].is_dir ? MF_CHECKED : MF_UNCHECKED));
-        CheckMenuItem(menus[i], IDM_CDROM_EMPTY | id, MF_BYCOMMAND | MF_UNCHECKED);
-    } else {
-        cdrom[id].host_drive = 0;
-        CheckMenuItem(menus[i], IDM_CDROM_IMAGE | id, MF_BYCOMMAND | MF_UNCHECKED);
-        CheckMenuItem(menus[i], IDM_CDROM_DIR | id, MF_BYCOMMAND | MF_UNCHECKED);
-        CheckMenuItem(menus[i], IDM_CDROM_EMPTY | id, MF_BYCOMMAND | MF_CHECKED);
-    }
-
-    if (cdrom[id].prev_host_drive == 0)
-        EnableMenuItem(menus[i], IDM_CDROM_RELOAD | id, MF_BYCOMMAND | MF_GRAYED);
-    else
-        EnableMenuItem(menus[i], IDM_CDROM_RELOAD | id, MF_BYCOMMAND | MF_ENABLED);
-
-    media_menu_set_name_cdrom(id);
-}
-
-void
-media_menu_update_zip(int id)
-{
-    int i = ZIP_FIRST + id;
-
-    if (strlen(zip_drives[id].image_path) == 0)
-        EnableMenuItem(menus[i], IDM_ZIP_EJECT | id, MF_BYCOMMAND | MF_GRAYED);
-    else
-        EnableMenuItem(menus[i], IDM_ZIP_EJECT | id, MF_BYCOMMAND | MF_ENABLED);
-
-    if (strlen(zip_drives[id].prev_image_path) == 0)
-        EnableMenuItem(menus[i], IDM_ZIP_RELOAD | id, MF_BYCOMMAND | MF_GRAYED);
-    else
-        EnableMenuItem(menus[i], IDM_ZIP_RELOAD | id, MF_BYCOMMAND | MF_ENABLED);
-
-    media_menu_set_name_zip(id);
-}
-
-void
-media_menu_update_mo(int id)
-{
-    int i = MO_FIRST + id;
-
-    if (strlen(mo_drives[id].image_path) == 0)
-        EnableMenuItem(menus[i], IDM_MO_EJECT | id, MF_BYCOMMAND | MF_GRAYED);
-    else
-        EnableMenuItem(menus[i], IDM_MO_EJECT | id, MF_BYCOMMAND | MF_ENABLED);
-
-    if (strlen(mo_drives[id].prev_image_path) == 0)
-        EnableMenuItem(menus[i], IDM_MO_RELOAD | id, MF_BYCOMMAND | MF_GRAYED);
-    else
-        EnableMenuItem(menus[i], IDM_MO_RELOAD | id, MF_BYCOMMAND | MF_ENABLED);
-
-    media_menu_set_name_mo(id);
-}
-
-static void
-media_menu_load_submenus(void)
-{
-    memset(index_map, -1, sizeof(index_map));
-
-    int curr = 0;
-
-    menus[curr] = media_menu_load_resource(CASSETTE_SUBMENU_NAME);
-    media_menu_set_ids(menus[curr++], 0);
-
-    for (int i = 0; i < 2; i++) {
-        menus[curr] = media_menu_load_resource(CARTRIDGE_SUBMENU_NAME);
-        media_menu_set_ids(menus[curr++], i);
-    }
-
-    for (int i = 0; i < FDD_NUM; i++) {
-        menus[curr] = media_menu_load_resource(FLOPPY_SUBMENU_NAME);
-        media_menu_set_ids(menus[curr++], i);
-    }
-
-    for (int i = 0; i < CDROM_NUM; i++) {
-        menus[curr] = media_menu_load_resource(CDROM_SUBMENU_NAME);
-        media_menu_set_ids(menus[curr++], i);
-    }
-
-    for (int i = 0; i < ZIP_NUM; i++) {
-        menus[curr] = media_menu_load_resource(ZIP_SUBMENU_NAME);
-        media_menu_set_ids(menus[curr++], i);
-    }
-
-    for (int i = 0; i < MO_NUM; i++) {
-        menus[curr] = media_menu_load_resource(MO_SUBMENU_NAME);
-        media_menu_set_ids(menus[curr++], i);
-    }
-}
-
-static inline int
-is_valid_cartridge(void)
-{
-    return (machine_has_cartridge(machine));
-}
-
-static inline int
-is_valid_fdd(int i)
-{
-    return fdd_get_type(i) != 0;
-}
-
-static inline int
-is_valid_cdrom(int i)
-{
-    if ((cdrom[i].bus_type == CDROM_BUS_ATAPI) && !MACHINE_HAS_IDE && memcmp(hdc_get_internal_name(hdc_current), "xtide", 5) && memcmp(hdc_get_internal_name(hdc_current), "ide", 3))
-        return 0;
-    if ((cdrom[i].bus_type == CDROM_BUS_SCSI) && !MACHINE_HAS_SCSI && (scsi_card_current[0] == 0) && (scsi_card_current[1] == 0) && (scsi_card_current[2] == 0) && (scsi_card_current[3] == 0))
-        return 0;
-    return cdrom[i].bus_type != 0;
-}
-
-static inline int
-is_valid_zip(int i)
-{
-    if ((zip_drives[i].bus_type == ZIP_BUS_ATAPI) && !MACHINE_HAS_IDE && memcmp(hdc_get_internal_name(hdc_current), "xtide", 5) && memcmp(hdc_get_internal_name(hdc_current), "ide", 3))
-        return 0;
-    if ((zip_drives[i].bus_type == ZIP_BUS_SCSI) && !MACHINE_HAS_SCSI && (scsi_card_current[0] == 0) && (scsi_card_current[1] == 0) && (scsi_card_current[2] == 0) && (scsi_card_current[3] == 0))
-        return 0;
-    return zip_drives[i].bus_type != 0;
-}
-
-static inline int
-is_valid_mo(int i)
-{
-    if ((mo_drives[i].bus_type == MO_BUS_ATAPI) && !MACHINE_HAS_IDE && memcmp(hdc_get_internal_name(hdc_current), "xtide", 5) && memcmp(hdc_get_internal_name(hdc_current), "ide", 3))
-        return 0;
-    if ((mo_drives[i].bus_type == MO_BUS_SCSI) && !MACHINE_HAS_SCSI && (scsi_card_current[0] == 0) && (scsi_card_current[1] == 0) && (scsi_card_current[2] == 0) && (scsi_card_current[3] == 0))
-        return 0;
-    return mo_drives[i].bus_type != 0;
-}
-
-void
-media_menu_reset(void)
-{
-    /* Remove existing entries. */
-    int c = GetMenuItemCount(media_menu);
-
-    for (int i = 0; i < c; i++)
-        RemoveMenu(media_menu, 0, MF_BYPOSITION);
-
-    /* Add new ones. */
-    int curr = 0;
-
-    if (cassette_enable) {
-        AppendMenu(media_menu, MF_POPUP | MF_STRING, (UINT_PTR) menus[curr], L"Test");
-        media_menu_update_cassette();
-    }
-    curr++;
-
-    for (int i = 0; i < 2; i++) {
-        if (is_valid_cartridge()) {
-            AppendMenu(media_menu, MF_POPUP | MF_STRING, (UINT_PTR) menus[curr], L"Test");
-            media_menu_update_cartridge(i);
-        }
-        curr++;
-    }
-
-    for (int i = 0; i < FDD_NUM; i++) {
-        if (is_valid_fdd(i)) {
-            AppendMenu(media_menu, MF_POPUP | MF_STRING, (UINT_PTR) menus[curr], L"Test");
-            media_menu_update_floppy(i);
-        }
-        curr++;
-    }
-
-    for (int i = 0; i < CDROM_NUM; i++) {
-        if (is_valid_cdrom(i)) {
-            AppendMenu(media_menu, MF_POPUP | MF_STRING, (UINT_PTR) menus[curr], L"Test");
-            media_menu_update_cdrom(i);
-        }
-        curr++;
-    }
-
-    for (int i = 0; i < ZIP_NUM; i++) {
-        if (is_valid_zip(i)) {
-            AppendMenu(media_menu, MF_POPUP | MF_STRING, (UINT_PTR) menus[curr], L"Test");
-            media_menu_update_zip(i);
-        }
-        curr++;
-    }
-
-    for (int i = 0; i < MO_NUM; i++) {
-        if (is_valid_mo(i)) {
-            AppendMenu(media_menu, MF_POPUP | MF_STRING, (UINT_PTR) menus[curr], L"Test");
-            media_menu_update_mo(i);
-        }
-        curr++;
-    }
-}
-
-/* Initializes the Media menu in the main menu bar. */
-static void
-media_menu_main_init(void)
-{
-    HMENU  hMenu;
-    LPWSTR lpMenuName;
-
-    hMenu      = GetMenu(hwndMain);
-    media_menu = CreatePopupMenu();
-
-    /* Get the menu name */
-    int len    = GetMenuString(hMenu, IDM_MEDIA, NULL, 0, MF_BYCOMMAND);
-    lpMenuName = malloc((len + 1) * sizeof(WCHAR));
-    GetMenuString(hMenu, IDM_MEDIA, lpMenuName, len + 1, MF_BYCOMMAND);
-
-    /* Replace the placeholder menu item */
-    ModifyMenu(hMenu, IDM_MEDIA, MF_BYCOMMAND | MF_STRING | MF_POPUP, (UINT_PTR) media_menu, lpMenuName);
-
-    /* Clean up */
-    DrawMenuBar(hwndMain);
-    free(lpMenuName);
-}
-
-void
-media_menu_init(void)
-{
-    /* Initialize the main menu bar menu */
-    media_menu_main_init();
-
-    /* Initialize the dummy status bar menu. */
-    stbar_menu = CreateMenu();
-    AppendMenu(stbar_menu, MF_POPUP, (UINT_PTR) media_menu, NULL);
-
-    /* Load the submenus for each drive type. */
-    media_menu_load_submenus();
-
-    /* Populate the Media and status bar menus. */
-    media_menu_reset();
-}
-
-int
-media_menu_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    int id  = 0;
-    int ret = 0;
-    int wp  = 0;
-
-#ifdef __clang__
-    BROWSEINFO bi;
-#endif
-
-    id = LOWORD(wParam) & 0x00ff;
-
-    switch (LOWORD(wParam) & 0xff00) {
-        case IDM_CASSETTE_IMAGE_NEW:
-            ret = file_dlg_st(hwnd, IDS_2150, "", NULL, 1);
-            if (!ret) {
-                if (strlen(openfilestring) == 0)
-                    cassette_mount(NULL, wp);
-                else
-                    cassette_mount(openfilestring, wp);
-            }
-            break;
-
-        case IDM_CASSETTE_RECORD:
-            pc_cas_set_mode(cassette, 1);
-            CheckMenuItem(menus[CASSETTE_FIRST], IDM_CASSETTE_RECORD, MF_BYCOMMAND | MF_CHECKED);
-            CheckMenuItem(menus[CASSETTE_FIRST], IDM_CASSETTE_PLAY, MF_BYCOMMAND | MF_UNCHECKED);
-            break;
-        case IDM_CASSETTE_PLAY:
-            pc_cas_set_mode(cassette, 0);
-            CheckMenuItem(menus[CASSETTE_FIRST], IDM_CASSETTE_RECORD, MF_BYCOMMAND | MF_UNCHECKED);
-            CheckMenuItem(menus[CASSETTE_FIRST], IDM_CASSETTE_PLAY, MF_BYCOMMAND | MF_CHECKED);
-            break;
-        case IDM_CASSETTE_REWIND:
-            pc_cas_rewind(cassette);
-            break;
-        case IDM_CASSETTE_FAST_FORWARD:
-            pc_cas_append(cassette);
-            break;
-
-        case IDM_CASSETTE_IMAGE_EXISTING_WP:
-            wp = 1;
-            /* FALLTHROUGH */
-        case IDM_CASSETTE_IMAGE_EXISTING:
-            ret = file_dlg_st(hwnd, IDS_2150, cassette_fname, NULL, 0);
-            if (!ret) {
-                if (strlen(openfilestring) == 0)
-                    cassette_mount(NULL, wp);
-                else
-                    cassette_mount(openfilestring, wp);
-            }
-            break;
-
-        case IDM_CASSETTE_EJECT:
-            cassette_eject();
-            break;
-
-        case IDM_CARTRIDGE_IMAGE:
-            ret = file_dlg_st(hwnd, IDS_2152, cart_fns[id], NULL, 0);
-            if (!ret)
-                cartridge_mount(id, openfilestring, wp);
-            break;
-
-        case IDM_CARTRIDGE_EJECT:
-            cartridge_eject(id);
-            break;
-
-        case IDM_FLOPPY_IMAGE_NEW:
-            NewFloppyDialogCreate(hwnd, id, 0);
-            break;
-
-        case IDM_FLOPPY_IMAGE_EXISTING_WP:
-            wp = 1;
-            /* FALLTHROUGH */
-        case IDM_FLOPPY_IMAGE_EXISTING:
-            ret = file_dlg_st(hwnd, IDS_2110, floppyfns[id], NULL, 0);
-            if (!ret)
-                floppy_mount(id, openfilestring, wp);
-            break;
-
-        case IDM_FLOPPY_EJECT:
-            floppy_eject(id);
-            break;
-
-        case IDM_FLOPPY_EXPORT_TO_86F:
-            ret = file_dlg_st(hwnd, IDS_2076, floppyfns[id], NULL, 1);
-            if (!ret) {
-                plat_pause(1);
-                ret = d86f_export(id, openfilestring);
-                if (!ret)
-                    ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_4108, (wchar_t *) IDS_4115);
-                plat_pause(0);
-            }
-            break;
-
-        case IDM_CDROM_MUTE:
-            cdrom[id].sound_on ^= 1;
-            config_save();
-            media_menu_update_cdrom(id);
-            sound_cd_thread_reset();
-            break;
-
-        case IDM_CDROM_EMPTY:
-            cdrom_eject(id);
-            break;
-
-        case IDM_CDROM_RELOAD:
-            cdrom_reload(id);
-            break;
-
-        case IDM_CDROM_IMAGE:
-            if (!file_dlg_st(hwnd, IDS_2141, cdrom[id].is_dir ? NULL : cdrom[id].image_path, NULL, 0)) {
-                cdrom_mount(id, openfilestring);
-            }
-            break;
-
-        case IDM_CDROM_DIR:
-#ifndef __clang__
-            BROWSEINFO bi = {
-                .hwndOwner = hwnd,
-                .ulFlags   = BIF_EDITBOX
-            };
-#else
-            bi.hwndOwner = hwnd;
-            bi.ulFlags   = BIF_EDITBOX;
-#endif
-            OleInitialize(NULL);
-            int old_dopause = dopause;
-            plat_pause(1);
-            LPITEMIDLIST pidl = SHBrowseForFolder(&bi);
-            plat_pause(old_dopause);
-            plat_chdir(usr_path);
-            if (pidl) {
-                wchar_t wbuf[MAX_PATH + 1];
-                if (SHGetPathFromIDList(pidl, wbuf)) {
-                    char buf[MAX_PATH + 1];
-                    c16stombs(buf, wbuf, sizeof(buf) - 1);
-                    cdrom_mount(id, buf);
-                }
-            }
-            break;
-
-        case IDM_ZIP_IMAGE_NEW:
-            NewFloppyDialogCreate(hwnd, id | 0x80, 0); /* NewZIPDialogCreate */
-            break;
-
-        case IDM_ZIP_IMAGE_EXISTING_WP:
-            wp = 1;
-            /* FALLTHROUGH */
-        case IDM_ZIP_IMAGE_EXISTING:
-            ret = file_dlg_st(hwnd, IDS_2058, zip_drives[id].image_path, NULL, 0);
-            if (!ret)
-                zip_mount(id, openfilestring, wp);
-            break;
-
-        case IDM_ZIP_EJECT:
-            zip_eject(id);
-            break;
-
-        case IDM_ZIP_RELOAD:
-            zip_reload(id);
-            break;
-
-        case IDM_MO_IMAGE_NEW:
-            NewFloppyDialogCreate(hwnd, id | 0x100, 0); /* NewZIPDialogCreate */
-            break;
-
-        case IDM_MO_IMAGE_EXISTING_WP:
-            wp = 1;
-            /* FALLTHROUGH */
-        case IDM_MO_IMAGE_EXISTING:
-            ret = file_dlg_st(hwnd, IDS_2117, mo_drives[id].image_path, NULL, 0);
-            if (!ret)
-                mo_mount(id, openfilestring, wp);
-            break;
-
-        case IDM_MO_EJECT:
-            mo_eject(id);
-            break;
-
-        case IDM_MO_RELOAD:
-            mo_reload(id);
-            break;
-
-        default:
-            return 0;
-    }
-
-    return 1;
-}
-
-HMENU
-media_menu_get_cassette(void)
-{
-    return menus[CASSETTE_FIRST];
-}
-
-HMENU
-media_menu_get_cartridge(int id)
-{
-    return menus[CARTRIDGE_FIRST + id];
-}
-
-HMENU
-media_menu_get_floppy(int id)
-{
-    return menus[FDD_FIRST + id];
-}
-
-HMENU
-media_menu_get_cdrom(int id)
-{
-    return menus[CDROM_FIRST + id];
-}
-
-HMENU
-media_menu_get_zip(int id)
-{
-    return menus[ZIP_FIRST + id];
-}
-
-HMENU
-media_menu_get_mo(int id)
-{
-    return menus[MO_FIRST + id];
-}
diff --git a/src/win/win_mouse.c b/src/win/win_mouse.c
deleted file mode 100644
index f2b185eaa..000000000
--- a/src/win/win_mouse.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          RawInput mouse interface.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          GH Cao, <driver1998.ms@outlook.com>
- *          Jasmine Iwanek,
- *
- *          Copyright 2016-2017 Miran Grca.
- *          Copyright 2019 GH Cao.
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-#include <windows.h>
-#include <windowsx.h>
-#include <stdatomic.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <86box/86box.h>
-#include <86box/mouse.h>
-#include <86box/pic.h>
-#include <86box/plat.h>
-#include <86box/win.h>
-
-int    mouse_capture;
-
-void
-win_mouse_init(void)
-{
-    atexit(win_mouse_close);
-
-    mouse_capture = 0;
-
-    /* Initialize the RawInput (mouse) module. */
-    RAWINPUTDEVICE ridev;
-    ridev.dwFlags     = 0;
-    ridev.hwndTarget  = NULL;
-    ridev.usUsagePage = 0x01;
-    ridev.usUsage     = 0x02;
-    if (!RegisterRawInputDevices(&ridev, 1, sizeof(ridev)))
-        fatal("plat_mouse_init: RegisterRawInputDevices failed\n");
-}
-
-void
-win_mouse_handle(PRAWINPUT raw)
-{
-    RAWMOUSE   state = raw->data.mouse;
-    static int x;
-    static int delta_x;
-    static int y;
-    static int delta_y;
-    static int b;
-    static int delta_z;
-
-    b = mouse_get_buttons_ex();
-
-    /* read mouse buttons and wheel */
-    if (state.usButtonFlags & RI_MOUSE_LEFT_BUTTON_DOWN)
-        b |= 1;
-    else if (state.usButtonFlags & RI_MOUSE_LEFT_BUTTON_UP)
-        b &= ~1;
-
-    if (state.usButtonFlags & RI_MOUSE_MIDDLE_BUTTON_DOWN)
-        b |= 4;
-    else if (state.usButtonFlags & RI_MOUSE_MIDDLE_BUTTON_UP)
-        b &= ~4;
-
-    if (state.usButtonFlags & RI_MOUSE_RIGHT_BUTTON_DOWN)
-        b |= 2;
-    else if (state.usButtonFlags & RI_MOUSE_RIGHT_BUTTON_UP)
-        b &= ~2;
-
-    if (state.usButtonFlags & RI_MOUSE_BUTTON_4_DOWN)
-        b |= 8;
-    else if (state.usButtonFlags & RI_MOUSE_BUTTON_4_UP)
-        b &= ~8;
-
-    if (state.usButtonFlags & RI_MOUSE_BUTTON_5_DOWN)
-        b |= 16;
-    else if (state.usButtonFlags & RI_MOUSE_BUTTON_5_UP)
-        b &= ~16;
-
-    mouse_set_buttons_ex(b);
-
-    if (state.usButtonFlags & RI_MOUSE_WHEEL) {
-        delta_z = (SHORT) state.usButtonData / 120;
-        mouse_set_z(delta_z);
-    } else
-        delta_z = 0;
-
-    if (state.usFlags & MOUSE_MOVE_ABSOLUTE) {
-        /* absolute mouse, i.e. RDP or VNC
-         * seems to work fine for RDP on Windows 10
-         * Not sure about other environments.
-         */
-        delta_x = (state.lLastX - x) / 25;
-        delta_y = (state.lLastY - y) / 25;
-        x = state.lLastX;
-        y = state.lLastY;
-    } else {
-        /* relative mouse, i.e. regular mouse */
-        delta_x = state.lLastX;
-        delta_y = state.lLastY;
-    }
-
-    mouse_scale(delta_x, delta_y);
-}
-
-void
-win_mouse_close(void)
-{
-    RAWINPUTDEVICE ridev;
-    ridev.dwFlags     = RIDEV_REMOVE;
-    ridev.hwndTarget  = NULL;
-    ridev.usUsagePage = 0x01;
-    ridev.usUsage     = 0x02;
-    RegisterRawInputDevices(&ridev, 1, sizeof(ridev));
-}
diff --git a/src/win/win_new_floppy.c b/src/win/win_new_floppy.c
deleted file mode 100644
index d0a245a45..000000000
--- a/src/win/win_new_floppy.c
+++ /dev/null
@@ -1,842 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Handle the New Floppy Image dialog.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *
- *          Copyright 2016-2019 Miran Grca.
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-#define UNICODE
-#define BITMAP WINDOWS_BITMAP
-#include <windows.h>
-#include <windowsx.h>
-#undef BITMAP
-#include <commctrl.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/disksizes.h>
-#include <86box/plat.h>
-#include <86box/random.h>
-#include <86box/ui.h>
-#include <86box/scsi_device.h>
-#include <86box/mo.h>
-#include <86box/zip.h>
-#include <86box/win.h>
-
-static unsigned char *empty;
-
-static int
-create_86f(char *file_name, disk_size_t disk_size, uint8_t rpm_mode)
-{
-    FILE *fp;
-
-    uint32_t magic          = 0x46423638;
-    uint16_t version        = 0x020C;
-    uint16_t dflags         = 0;
-    uint16_t tflags         = 0;
-    uint32_t index_hole_pos = 0;
-    uint32_t tarray[512];
-    uint32_t array_size;
-    uint32_t track_base;
-    uint32_t track_size;
-    int      i;
-    uint32_t shift = 0;
-
-    dflags = 0;                             /* Has surface data? - Assume no for now. */
-    dflags |= (disk_size.hole << 1);        /* Hole */
-    dflags |= ((disk_size.sides - 1) << 3); /* Sides. */
-    dflags |= (0 << 4);                     /* Write protect? - Assume no for now. */
-    dflags |= (rpm_mode << 5);              /* RPM mode. */
-    dflags |= (0 << 7);                     /* Has extra bit cells? - Assume no for now. */
-
-    tflags = disk_size.data_rate;        /* Data rate. */
-    tflags |= (disk_size.encoding << 3); /* Encoding. */
-    tflags |= (disk_size.rpm << 5);      /* RPM. */
-
-    switch (disk_size.hole) {
-        default:
-        case 0:
-        case 1:
-            switch (rpm_mode) {
-                case 1:
-                    array_size = 25250;
-                    break;
-                case 2:
-                    array_size = 25374;
-                    break;
-                case 3:
-                    array_size = 25750;
-                    break;
-                default:
-                    array_size = 25000;
-                    break;
-            }
-            break;
-        case 2:
-            switch (rpm_mode) {
-                case 1:
-                    array_size = 50500;
-                    break;
-                case 2:
-                    array_size = 50750;
-                    break;
-                case 3:
-                    array_size = 51000;
-                    break;
-                default:
-                    array_size = 50000;
-                    break;
-            }
-            break;
-    }
-
-    empty = (unsigned char *) malloc(array_size);
-
-    memset(tarray, 0, 2048);
-    memset(empty, 0, array_size);
-
-    fp = plat_fopen(file_name, "wb");
-    if (!fp)
-        return 0;
-
-    fwrite(&magic, 4, 1, fp);
-    fwrite(&version, 2, 1, fp);
-    fwrite(&dflags, 2, 1, fp);
-
-    track_size = array_size + 6;
-
-    track_base = 8 + ((disk_size.sides == 2) ? 2048 : 1024);
-
-    if (disk_size.tracks <= 43)
-        shift = 1;
-
-    for (i = 0; i < (disk_size.tracks * disk_size.sides) << shift; i++)
-        tarray[i] = track_base + (i * track_size);
-
-    fwrite(tarray, 1, (disk_size.sides == 2) ? 2048 : 1024, fp);
-
-    for (i = 0; i < (disk_size.tracks * disk_size.sides) << shift; i++) {
-        fwrite(&tflags, 2, 1, fp);
-        fwrite(&index_hole_pos, 4, 1, fp);
-        fwrite(empty, 1, array_size, fp);
-    }
-
-    free(empty);
-
-    fclose(fp);
-
-    return 1;
-}
-
-static int is_zip;
-static int is_mo;
-
-static int
-create_sector_image(char *file_name, disk_size_t disk_size, uint8_t is_fdi)
-{
-    FILE    *fp;
-    uint32_t total_size     = 0;
-    uint32_t total_sectors  = 0;
-    uint32_t sector_bytes   = 0;
-    uint32_t root_dir_bytes = 0;
-    uint32_t fat_size       = 0;
-    uint32_t fat1_offs      = 0;
-    uint32_t fat2_offs      = 0;
-    uint32_t zero_bytes     = 0;
-    uint16_t base           = 0x1000;
-
-    fp = plat_fopen(file_name, "wb");
-    if (!fp)
-        return 0;
-
-    sector_bytes  = (128 << disk_size.sector_len);
-    total_sectors = disk_size.sides * disk_size.tracks * disk_size.sectors;
-    if (total_sectors > ZIP_SECTORS)
-        total_sectors = ZIP_250_SECTORS;
-    total_size     = total_sectors * sector_bytes;
-    root_dir_bytes = (disk_size.root_dir_entries << 5);
-    fat_size       = (disk_size.spfat * sector_bytes);
-    fat1_offs      = sector_bytes;
-    fat2_offs      = fat1_offs + fat_size;
-    zero_bytes     = fat2_offs + fat_size + root_dir_bytes;
-
-    if (!is_zip && !is_mo && is_fdi) {
-        empty = (unsigned char *) malloc(base);
-        memset(empty, 0, base);
-
-        *(uint32_t *) &(empty[0x08]) = (uint32_t) base;
-        *(uint32_t *) &(empty[0x0C]) = total_size;
-        *(uint16_t *) &(empty[0x10]) = (uint16_t) sector_bytes;
-        *(uint8_t *) &(empty[0x14])  = (uint8_t) disk_size.sectors;
-        *(uint8_t *) &(empty[0x18])  = (uint8_t) disk_size.sides;
-        *(uint8_t *) &(empty[0x1C])  = (uint8_t) disk_size.tracks;
-
-        fwrite(empty, 1, base, fp);
-        free(empty);
-    }
-
-    empty = (unsigned char *) malloc(total_size);
-    memset(empty, 0x00, zero_bytes);
-
-    if (!is_zip && !is_mo) {
-        memset(empty + zero_bytes, 0xF6, total_size - zero_bytes);
-
-        empty[0x00] = 0xEB; /* Jump to make MS-DOS happy. */
-        empty[0x01] = 0x58;
-        empty[0x02] = 0x90;
-
-        empty[0x03] = 0x38; /* '86BOX5.0' OEM ID. */
-        empty[0x04] = 0x36;
-        empty[0x05] = 0x42;
-        empty[0x06] = 0x4F;
-        empty[0x07] = 0x58;
-        empty[0x08] = 0x35;
-        empty[0x09] = 0x2E;
-        empty[0x0A] = 0x30;
-
-        *(uint16_t *) &(empty[0x0B]) = (uint16_t) sector_bytes;
-        *(uint8_t *) &(empty[0x0D])  = (uint8_t) disk_size.spc;
-        *(uint16_t *) &(empty[0x0E]) = (uint16_t) 1;
-        *(uint8_t *) &(empty[0x10])  = (uint8_t) disk_size.num_fats;
-        *(uint16_t *) &(empty[0x11]) = (uint16_t) disk_size.root_dir_entries;
-        *(uint16_t *) &(empty[0x13]) = (uint16_t) total_sectors;
-        *(uint8_t *) &(empty[0x15])  = (uint8_t) disk_size.media_desc;
-        *(uint16_t *) &(empty[0x16]) = (uint16_t) disk_size.spfat;
-        *(uint8_t *) &(empty[0x18])  = (uint8_t) disk_size.sectors;
-        *(uint8_t *) &(empty[0x1A])  = (uint8_t) disk_size.sides;
-
-        empty[0x26] = 0x29; /* ')' followed by randomly-generated volume serial number. */
-        empty[0x27] = random_generate();
-        empty[0x28] = random_generate();
-        empty[0x29] = random_generate();
-        empty[0x2A] = random_generate();
-
-        memset(&(empty[0x2B]), 0x20, 11);
-
-        empty[0x36] = 'F';
-        empty[0x37] = 'A';
-        empty[0x38] = 'T';
-        empty[0x39] = '1';
-        empty[0x3A] = '2';
-        memset(&(empty[0x3B]), 0x20, 0x0003);
-
-        empty[0x1FE] = 0x55;
-        empty[0x1FF] = 0xAA;
-
-        empty[fat1_offs + 0x00] = empty[fat2_offs + 0x00] = empty[0x15];
-        empty[fat1_offs + 0x01] = empty[fat2_offs + 0x01] = 0xFF;
-        empty[fat1_offs + 0x02] = empty[fat2_offs + 0x02] = 0xFF;
-    }
-
-    fwrite(empty, 1, total_size, fp);
-    free(empty);
-
-    fclose(fp);
-
-    return 1;
-}
-
-static int
-create_zip_sector_image(char *file_name, disk_size_t disk_size, uint8_t is_zdi, HWND hwnd)
-{
-    HWND     h;
-    FILE    *fp;
-    uint32_t total_size     = 0;
-    uint32_t total_sectors  = 0;
-    uint32_t sector_bytes   = 0;
-    uint32_t root_dir_bytes = 0;
-    uint32_t fat_size       = 0;
-    uint32_t fat1_offs      = 0;
-    uint32_t fat2_offs      = 0;
-    uint32_t zero_bytes     = 0;
-    uint16_t base           = 0x1000;
-    uint32_t pbar_max       = 0;
-    MSG      msg;
-
-    fp = plat_fopen(file_name, "wb");
-    if (!fp)
-        return 0;
-
-    sector_bytes  = (128 << disk_size.sector_len);
-    total_sectors = disk_size.sides * disk_size.tracks * disk_size.sectors;
-    if (total_sectors > ZIP_SECTORS)
-        total_sectors = ZIP_250_SECTORS;
-    total_size     = total_sectors * sector_bytes;
-    root_dir_bytes = (disk_size.root_dir_entries << 5);
-    fat_size       = (disk_size.spfat * sector_bytes);
-    fat1_offs      = sector_bytes;
-    fat2_offs      = fat1_offs + fat_size;
-    zero_bytes     = fat2_offs + fat_size + root_dir_bytes;
-
-    pbar_max = total_size;
-    if (is_zdi)
-        pbar_max += base;
-    pbar_max >>= 11;
-    pbar_max--;
-
-    h = GetDlgItem(hwnd, IDC_COMBO_RPM_MODE);
-    EnableWindow(h, FALSE);
-    ShowWindow(h, SW_HIDE);
-    h = GetDlgItem(hwnd, IDT_FLP_RPM_MODE);
-    EnableWindow(h, FALSE);
-    ShowWindow(h, SW_HIDE);
-    h = GetDlgItem(hwnd, IDC_PBAR_IMG_CREATE);
-    SendMessage(h, PBM_SETRANGE32, (WPARAM) 0, (LPARAM) pbar_max);
-    SendMessage(h, PBM_SETPOS, (WPARAM) 0, (LPARAM) 0);
-    EnableWindow(h, TRUE);
-    ShowWindow(h, SW_SHOW);
-    h = GetDlgItem(hwnd, IDT_FLP_PROGRESS);
-    EnableWindow(h, TRUE);
-    ShowWindow(h, SW_SHOW);
-
-    h = GetDlgItem(hwnd, IDC_PBAR_IMG_CREATE);
-    pbar_max++;
-
-    if (is_zdi) {
-        empty = (unsigned char *) malloc(base);
-        memset(empty, 0, base);
-
-        *(uint32_t *) &(empty[0x08]) = (uint32_t) base;
-        *(uint32_t *) &(empty[0x0C]) = total_size;
-        *(uint16_t *) &(empty[0x10]) = (uint16_t) sector_bytes;
-        *(uint8_t *) &(empty[0x14])  = (uint8_t) disk_size.sectors;
-        *(uint8_t *) &(empty[0x18])  = (uint8_t) disk_size.sides;
-        *(uint8_t *) &(empty[0x1C])  = (uint8_t) disk_size.tracks;
-
-        fwrite(empty, 1, 2048, fp);
-        SendMessage(h, PBM_SETPOS, (WPARAM) 1, (LPARAM) 0);
-
-        while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD)) {
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
-        }
-
-        fwrite(&empty[0x0800], 1, 2048, fp);
-        free(empty);
-
-        SendMessage(h, PBM_SETPOS, (WPARAM) 2, (LPARAM) 0);
-
-        while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD)) {
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
-        }
-
-        pbar_max -= 2;
-    }
-
-    empty = (unsigned char *) malloc(total_size);
-    memset(empty, 0x00, zero_bytes);
-
-    if (total_sectors == ZIP_SECTORS) {
-        /* ZIP 100 */
-        /* MBR */
-        *(uint64_t *) &(empty[0x0000]) = 0x2054524150492EEBLL;
-        *(uint64_t *) &(empty[0x0008]) = 0x3930302065646F63LL;
-        *(uint64_t *) &(empty[0x0010]) = 0x67656D6F49202D20LL;
-        *(uint64_t *) &(empty[0x0018]) = 0x726F70726F432061LL;
-        *(uint64_t *) &(empty[0x0020]) = 0x202D206E6F697461LL;
-        *(uint64_t *) &(empty[0x0028]) = 0x30392F33322F3131LL;
-
-        *(uint64_t *) &(empty[0x01AE]) = 0x0116010100E90644LL;
-        *(uint64_t *) &(empty[0x01B6]) = 0xED08BBE5014E0135LL;
-        *(uint64_t *) &(empty[0x01BE]) = 0xFFFFFE06FFFFFE80LL;
-        *(uint64_t *) &(empty[0x01C6]) = 0x0002FFE000000020LL;
-
-        *(uint16_t *) &(empty[0x01FE]) = 0xAA55;
-
-        /* 31 sectors filled with 0x48 */
-        memset(&(empty[0x0200]), 0x48, 0x3E00);
-
-        /* Boot sector */
-        *(uint64_t *) &(empty[0x4000]) = 0x584F4236389058EBLL;
-        *(uint64_t *) &(empty[0x4008]) = 0x0008040200302E35LL;
-        *(uint64_t *) &(empty[0x4010]) = 0x00C0F80000020002LL;
-        *(uint64_t *) &(empty[0x4018]) = 0x0000002000FF003FLL;
-        *(uint32_t *) &(empty[0x4020]) = 0x0002FFE0;
-        *(uint16_t *) &(empty[0x4024]) = 0x0080;
-
-        empty[0x4026] = 0x29; /* ')' followed by randomly-generated volume serial number. */
-        empty[0x4027] = random_generate();
-        empty[0x4028] = random_generate();
-        empty[0x4029] = random_generate();
-        empty[0x402A] = random_generate();
-
-        memset(&(empty[0x402B]), 0x00, 0x000B);
-        memset(&(empty[0x4036]), 0x20, 0x0008);
-
-        empty[0x4036] = 'F';
-        empty[0x4037] = 'A';
-        empty[0x4038] = 'T';
-        empty[0x4039] = '1';
-        empty[0x403A] = '6';
-        memset(&(empty[0x403B]), 0x20, 0x0003);
-
-        empty[0x41FE] = 0x55;
-        empty[0x41FF] = 0xAA;
-
-        empty[0x5000] = empty[0x1D000] = empty[0x4015];
-        empty[0x5001] = empty[0x1D001] = 0xFF;
-        empty[0x5002] = empty[0x1D002] = 0xFF;
-        empty[0x5003] = empty[0x1D003] = 0xFF;
-
-        /* Root directory = 0x35000
-           Data = 0x39000 */
-    } else {
-        /* ZIP 250 */
-        /* MBR */
-        *(uint64_t *) &(empty[0x0000]) = 0x2054524150492EEBLL;
-        *(uint64_t *) &(empty[0x0008]) = 0x3930302065646F63LL;
-        *(uint64_t *) &(empty[0x0010]) = 0x67656D6F49202D20LL;
-        *(uint64_t *) &(empty[0x0018]) = 0x726F70726F432061LL;
-        *(uint64_t *) &(empty[0x0020]) = 0x202D206E6F697461LL;
-        *(uint64_t *) &(empty[0x0028]) = 0x30392F33322F3131LL;
-
-        *(uint64_t *) &(empty[0x01AE]) = 0x0116010100E900E9LL;
-        *(uint64_t *) &(empty[0x01B6]) = 0x2E32A7AC014E0135LL;
-
-        *(uint64_t *) &(empty[0x01EE]) = 0xEE203F0600010180LL;
-        *(uint64_t *) &(empty[0x01F6]) = 0x000777E000000020LL;
-        *(uint16_t *) &(empty[0x01FE]) = 0xAA55;
-
-        /* 31 sectors filled with 0x48 */
-        memset(&(empty[0x0200]), 0x48, 0x3E00);
-
-        /* The second sector begins with some strange data
-           in my reference image. */
-        *(uint64_t *) &(empty[0x0200]) = 0x3831393230334409LL;
-        *(uint64_t *) &(empty[0x0208]) = 0x6A57766964483130LL;
-        *(uint64_t *) &(empty[0x0210]) = 0x3C3A34676063653FLL;
-        *(uint64_t *) &(empty[0x0218]) = 0x586A56A8502C4161LL;
-        *(uint64_t *) &(empty[0x0220]) = 0x6F2D702535673D6CLL;
-        *(uint64_t *) &(empty[0x0228]) = 0x255421B8602D3456LL;
-        *(uint64_t *) &(empty[0x0230]) = 0x577B22447B52603ELL;
-        *(uint64_t *) &(empty[0x0238]) = 0x46412CC871396170LL;
-        *(uint64_t *) &(empty[0x0240]) = 0x704F55237C5E2626LL;
-        *(uint64_t *) &(empty[0x0248]) = 0x6C7932C87D5C3C20LL;
-        *(uint64_t *) &(empty[0x0250]) = 0x2C50503E47543D6ELL;
-        *(uint64_t *) &(empty[0x0258]) = 0x46394E807721536ALL;
-        *(uint64_t *) &(empty[0x0260]) = 0x505823223F245325LL;
-        *(uint64_t *) &(empty[0x0268]) = 0x365C79B0393B5B6ELL;
-
-        /* Boot sector */
-        *(uint64_t *) &(empty[0x4000]) = 0x584F4236389058EBLL;
-        *(uint64_t *) &(empty[0x4008]) = 0x0001080200302E35LL;
-        *(uint64_t *) &(empty[0x4010]) = 0x00EFF80000020002LL;
-        *(uint64_t *) &(empty[0x4018]) = 0x0000002000400020LL;
-        *(uint32_t *) &(empty[0x4020]) = 0x000777E0;
-        *(uint16_t *) &(empty[0x4024]) = 0x0080;
-
-        empty[0x4026] = 0x29; /* ')' followed by randomly-generated volume serial number. */
-        empty[0x4027] = random_generate();
-        empty[0x4028] = random_generate();
-        empty[0x4029] = random_generate();
-        empty[0x402A] = random_generate();
-
-        memset(&(empty[0x402B]), 0x00, 0x000B);
-        memset(&(empty[0x4036]), 0x20, 0x0008);
-
-        empty[0x4036] = 'F';
-        empty[0x4037] = 'A';
-        empty[0x4038] = 'T';
-        empty[0x4039] = '1';
-        empty[0x403A] = '6';
-        memset(&(empty[0x403B]), 0x20, 0x0003);
-
-        empty[0x41FE] = 0x55;
-        empty[0x41FF] = 0xAA;
-
-        empty[0x4200] = empty[0x22000] = empty[0x4015];
-        empty[0x4201] = empty[0x22001] = 0xFF;
-        empty[0x4202] = empty[0x22002] = 0xFF;
-        empty[0x4203] = empty[0x22003] = 0xFF;
-
-        /* Root directory = 0x3FE00
-           Data = 0x38200 */
-    }
-
-    for (uint32_t i = 0; i < pbar_max; i++) {
-        fwrite(&empty[i << 11], 1, 2048, fp);
-        SendMessage(h, PBM_SETPOS, (WPARAM) i + 2, (LPARAM) 0);
-
-        while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD)) {
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
-        }
-    }
-
-    free(empty);
-
-    fclose(fp);
-
-    return 1;
-}
-
-static int
-create_mo_sector_image(char *file_name, int8_t disk_size, uint8_t is_mdi, HWND hwnd)
-{
-    HWND             h;
-    FILE            *fp;
-    const mo_type_t *dp = &mo_types[disk_size];
-    uint8_t         *empty;
-    uint8_t         *empty2 = NULL;
-    uint32_t         total_size    = 0;
-    uint32_t         total_size2;
-    uint32_t         total_sectors = 0;
-    uint32_t         sector_bytes  = 0;
-    uint16_t         base          = 0x1000;
-    uint32_t         pbar_max      = 0;
-    uint32_t         blocks_num;
-    uint32_t         j;
-    MSG              msg;
-
-    fp = plat_fopen(file_name, "wb");
-    if (!fp)
-        return 0;
-
-    sector_bytes  = dp->bytes_per_sector;
-    total_sectors = dp->sectors;
-    total_size    = total_sectors * sector_bytes;
-
-    total_size2 = (total_size >> 20) << 20;
-    total_size2 = total_size - total_size2;
-
-    pbar_max = total_size;
-    pbar_max >>= 20;
-    blocks_num = pbar_max;
-    if (is_mdi)
-        pbar_max++;
-    if (total_size2 == 0)
-        pbar_max++;
-
-    j = is_mdi ? 1 : 0;
-
-    h = GetDlgItem(hwnd, IDC_COMBO_RPM_MODE);
-    EnableWindow(h, FALSE);
-    ShowWindow(h, SW_HIDE);
-    h = GetDlgItem(hwnd, IDT_FLP_RPM_MODE);
-    EnableWindow(h, FALSE);
-    ShowWindow(h, SW_HIDE);
-    h = GetDlgItem(hwnd, IDC_PBAR_IMG_CREATE);
-    SendMessage(h, PBM_SETRANGE32, (WPARAM) 0, (LPARAM) pbar_max - 1);
-    SendMessage(h, PBM_SETPOS, (WPARAM) 0, (LPARAM) 0);
-    EnableWindow(h, TRUE);
-    ShowWindow(h, SW_SHOW);
-    h = GetDlgItem(hwnd, IDT_FLP_PROGRESS);
-    EnableWindow(h, TRUE);
-    ShowWindow(h, SW_SHOW);
-
-    h = GetDlgItem(hwnd, IDC_PBAR_IMG_CREATE);
-
-    if (is_mdi) {
-        empty = (unsigned char *) malloc(base);
-        memset(empty, 0, base);
-
-        *(uint32_t *) &(empty[0x08]) = (uint32_t) base;
-        *(uint32_t *) &(empty[0x0C]) = total_size;
-        *(uint16_t *) &(empty[0x10]) = (uint16_t) sector_bytes;
-        *(uint8_t *) &(empty[0x14])  = (uint8_t) 25;
-        *(uint8_t *) &(empty[0x18])  = (uint8_t) 64;
-        *(uint8_t *) &(empty[0x1C])  = (uint8_t) (dp->sectors / 64) / 25;
-
-        fwrite(empty, 1, 2048, fp);
-        SendMessage(h, PBM_SETPOS, (WPARAM) 1, (LPARAM) 0);
-
-        while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD)) {
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
-        }
-
-        fwrite(&empty[0x0800], 1, 2048, fp);
-        free(empty);
-
-        SendMessage(h, PBM_SETPOS, (WPARAM) 1, (LPARAM) 0);
-
-        while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD)) {
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
-        }
-    }
-
-    empty = (unsigned char *) malloc(1048576);
-    memset(empty, 0x00, 1048576);
-
-    if (total_size2 > 0) {
-        empty2 = (unsigned char *) malloc(total_size2);
-        memset(empty, 0x00, total_size2);
-    }
-
-    for (uint32_t i = 0; i < blocks_num; i++) {
-        fwrite(empty, 1, 1048576, fp);
-
-        SendMessage(h, PBM_SETPOS, (WPARAM) i + j, (LPARAM) 0);
-
-        while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD)) {
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
-        }
-    }
-
-    if (total_size2 > 0) {
-        fwrite(empty2, 1, total_size2, fp);
-
-        SendMessage(h, PBM_SETPOS, (WPARAM) pbar_max - 1, (LPARAM) 0);
-
-        while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD)) {
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
-        }
-    }
-
-    if (empty2 != NULL)
-        free(empty2);
-    free(empty);
-
-    fclose(fp);
-
-    return 1;
-}
-
-static int fdd_id;
-static int sb_part;
-
-static int  file_type = 0; /* 0 = IMG, 1 = Japanese FDI, 2 = 86F */
-static char fd_file_name[1024];
-
-/* Show a MessageBox dialog.  This is nasty, I know.  --FvK */
-static int
-new_floppy_msgbox_header(HWND hwnd, int flags, void *header, void *message)
-{
-    HWND h;
-    int  i;
-
-    h        = hwndMain;
-    hwndMain = hwnd;
-
-    i = ui_msgbox_header(flags, header, message);
-
-    hwndMain = h;
-
-    return i;
-}
-
-static int
-new_floppy_msgbox_ex(HWND hwnd, int flags, void *header, void *message, void *btn1, void *btn2, void *btn3)
-{
-    HWND h;
-    int  i;
-
-    h        = hwndMain;
-    hwndMain = hwnd;
-
-    i = ui_msgbox_ex(flags, header, message, btn1, btn2, btn3);
-
-    hwndMain = h;
-
-    return i;
-}
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-NewFloppyDialogProcedure(HWND hdlg, UINT message, WPARAM wParam, UNUSED(LPARAM lParam))
-{
-    HWND           h;
-    int            i = 0;
-    int            wcs_len;
-    int            ext_offs;
-    const wchar_t *ext;
-    uint8_t        disk_size;
-    uint8_t        rpm_mode;
-    int            ret;
-    FILE          *fp;
-    int            zip_types;
-    int            mo_types;
-    int            floppy_types;
-    wchar_t       *twcs;
-
-    switch (message) {
-        case WM_INITDIALOG:
-            plat_pause(1);
-            memset(fd_file_name, 0, 1024);
-            h = GetDlgItem(hdlg, IDC_COMBO_DISK_SIZE);
-            if (is_zip) {
-                zip_types = zip_drives[fdd_id].is_250 ? 2 : 1;
-                for (i = 0; i < zip_types; i++)
-                    SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_5900 + i));
-            } else if (is_mo) {
-                mo_types = 10;
-                /* TODO: Proper string ID's. */
-                for (i = 0; i < mo_types; i++)
-                    SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_5902 + i));
-            } else {
-                floppy_types = 12;
-                for (i = 0; i < floppy_types; i++)
-                    SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_5888 + i));
-            }
-            SendMessage(h, CB_SETCURSEL, 0, 0);
-            EnableWindow(h, FALSE);
-            h = GetDlgItem(hdlg, IDC_COMBO_RPM_MODE);
-            for (i = 0; i < 4; i++)
-                SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_6144 + i));
-            SendMessage(h, CB_SETCURSEL, 0, 0);
-            EnableWindow(h, FALSE);
-            ShowWindow(h, SW_HIDE);
-            h = GetDlgItem(hdlg, IDT_FLP_RPM_MODE);
-            EnableWindow(h, FALSE);
-            ShowWindow(h, SW_HIDE);
-            h = GetDlgItem(hdlg, IDOK);
-            EnableWindow(h, FALSE);
-            h = GetDlgItem(hdlg, IDC_PBAR_IMG_CREATE);
-            EnableWindow(h, FALSE);
-            ShowWindow(h, SW_HIDE);
-            h = GetDlgItem(hdlg, IDT_FLP_PROGRESS);
-            EnableWindow(h, FALSE);
-            ShowWindow(h, SW_HIDE);
-            break;
-
-        case WM_COMMAND:
-            switch (LOWORD(wParam)) {
-                case IDOK:
-                    h         = GetDlgItem(hdlg, IDC_COMBO_DISK_SIZE);
-                    disk_size = SendMessage(h, CB_GETCURSEL, 0, 0);
-                    if (is_zip)
-                        disk_size += 12;
-                    if (!is_zip && !is_mo && (file_type == 2)) {
-                        h        = GetDlgItem(hdlg, IDC_COMBO_RPM_MODE);
-                        rpm_mode = SendMessage(h, CB_GETCURSEL, 0, 0);
-                        ret      = create_86f(fd_file_name, disk_sizes[disk_size], rpm_mode);
-                    } else {
-                        if (is_zip)
-                            ret = create_zip_sector_image(fd_file_name, disk_sizes[disk_size], file_type, hdlg);
-                        if (is_mo)
-                            ret = create_mo_sector_image(fd_file_name, disk_size, file_type, hdlg);
-                        else
-                            ret = create_sector_image(fd_file_name, disk_sizes[disk_size], file_type);
-                    }
-                    if (ret) {
-                        if (is_zip)
-                            zip_mount(fdd_id, fd_file_name, 0);
-                        else if (is_mo)
-                            mo_mount(fdd_id, fd_file_name, 0);
-                        else
-                            floppy_mount(fdd_id, fd_file_name, 0);
-                    } else {
-                        new_floppy_msgbox_header(hdlg, MBX_ERROR, (wchar_t *) IDS_4108, (wchar_t *) IDS_4115);
-                        return TRUE;
-                    }
-                    fallthrough;
-                case IDCANCEL:
-                    EndDialog(hdlg, 0);
-                    plat_pause(0);
-                    return TRUE;
-
-                case IDC_CFILE:
-                    if (!file_dlg_w(hdlg, plat_get_string(is_mo ? IDS_2140 : (is_zip ? IDS_2055 : IDS_2062)), L"", NULL, 1)) {
-                        if (!wcschr(wopenfilestring, L'.')) {
-                            if (wcslen(wopenfilestring) && (wcslen(wopenfilestring) <= 256)) {
-                                twcs    = &wopenfilestring[wcslen(wopenfilestring)];
-                                twcs[0] = L'.';
-                                if (!is_zip && !is_mo && (filterindex == 3)) {
-                                    twcs[1] = L'8';
-                                    twcs[2] = L'6';
-                                    twcs[3] = L'f';
-                                } else {
-                                    twcs[1] = L'i';
-                                    twcs[2] = L'm';
-                                    twcs[3] = L'g';
-                                }
-                            }
-                        }
-                        h = GetDlgItem(hdlg, IDC_EDIT_FILE_NAME);
-                        fp = _wfopen(wopenfilestring, L"rb");
-                        if (fp != NULL) {
-                            fclose(fp);
-                            if (new_floppy_msgbox_ex(hdlg, MBX_QUESTION, (wchar_t *) IDS_4111, (wchar_t *) IDS_4118, (wchar_t *) IDS_4120, (wchar_t *) IDS_4121, NULL) != 0) /* yes */
-                                return FALSE;
-                        }
-                        SendMessage(h, WM_SETTEXT, 0, (LPARAM) wopenfilestring);
-                        memset(fd_file_name, 0, sizeof(fd_file_name));
-                        c16stombs(fd_file_name, wopenfilestring, sizeof(fd_file_name));
-                        h = GetDlgItem(hdlg, IDC_COMBO_DISK_SIZE);
-                        if (!is_zip || zip_drives[fdd_id].is_250)
-                            EnableWindow(h, TRUE);
-                        wcs_len  = wcslen(wopenfilestring);
-                        ext_offs = wcs_len - 4;
-                        ext      = &(wopenfilestring[ext_offs]);
-                        if (is_zip) {
-                            if ((wcs_len >= 4) && !wcsicmp(ext, L".ZDI"))
-                                file_type = 1;
-                            else
-                                file_type = 0;
-                        } else if (is_mo) {
-                            if ((wcs_len >= 4) && !wcsicmp(ext, L".MDI"))
-                                file_type = 1;
-                            else
-                                file_type = 0;
-                        } else {
-                            if ((wcs_len >= 4) && !wcsicmp(ext, L".FDI"))
-                                file_type = 1;
-                            else if (((wcs_len >= 4) && !wcsicmp(ext, L".86F")) || (filterindex == 3))
-                                file_type = 2;
-                            else
-                                file_type = 0;
-                        }
-                        h = GetDlgItem(hdlg, IDT_FLP_RPM_MODE);
-                        if (file_type == 2) {
-                            EnableWindow(h, TRUE);
-                            ShowWindow(h, SW_SHOW);
-                        } else {
-                            EnableWindow(h, FALSE);
-                            ShowWindow(h, SW_HIDE);
-                        }
-                        h = GetDlgItem(hdlg, IDC_COMBO_RPM_MODE);
-                        if (file_type == 2) {
-                            EnableWindow(h, TRUE);
-                            ShowWindow(h, SW_SHOW);
-                        } else {
-                            EnableWindow(h, FALSE);
-                            ShowWindow(h, SW_HIDE);
-                        }
-                        h = GetDlgItem(hdlg, IDOK);
-                        EnableWindow(h, TRUE);
-                        return TRUE;
-                    } else
-                        return FALSE;
-
-                default:
-                    break;
-            }
-            break;
-    }
-
-    return FALSE;
-}
-
-void
-NewFloppyDialogCreate(HWND hwnd, int id, int part)
-{
-    fdd_id  = id & 0x7f;
-    sb_part = part;
-    is_zip  = !!(id & 0x80);
-    is_mo   = !!(id & 0x100);
-    if (is_zip && is_mo) {
-        fatal("Attempting to create a new image dialog that is for both ZIP and MO at the same time\n");
-        return;
-    }
-    DialogBox(hinstance, (LPCTSTR) DLG_NEW_FLOPPY, hwnd, NewFloppyDialogProcedure);
-}
diff --git a/src/win/win_opengl.c b/src/win/win_opengl.c
deleted file mode 100644
index 094b3d063..000000000
--- a/src/win/win_opengl.c
+++ /dev/null
@@ -1,1002 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Rendering module for OpenGL
- *
- * TODO:    More shader features
- *          - scaling
- *          - multipass
- *          - previous frames
- *          (UI) options
- *          More error handling
- *
- *
- *
- * Authors: Teemu Korhonen
- *
- *          Copyright 2021 Teemu Korhonen
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-#define UNICODE
-#include <windows.h>
-#include <process.h>
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_syswm.h>
-#include <glad/glad.h>
-
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
-#if !defined(_MSC_VER) || defined(__clang__)
-#    include <stdatomic.h>
-#else
-typedef LONG atomic_flag;
-#    define atomic_flag_clear(OBJ)        InterlockedExchange(OBJ, 0)
-#    define atomic_flag_test_and_set(OBJ) InterlockedExchange(OBJ, 1)
-#endif
-
-#include <86box/86box.h>
-#include <86box/plat.h>
-#include <86box/thread.h>
-#include <86box/video.h>
-#include <86box/win.h>
-#include <86box/language.h>
-#include <86box/win_opengl.h>
-#include <86box/win_opengl_glslp.h>
-
-static const int INIT_WIDTH   = 640;
-static const int INIT_HEIGHT  = 400;
-static const int BUFFERPIXELS = 4194304;  /* Same size as render_buffer, pow(2048 + 64, 2). */
-static const int BUFFERBYTES  = 16777216; /* Pixel is 4 bytes. */
-static const int BUFFERCOUNT  = 3;        /* How many buffers to use for pixel transfer (2-3 is commonly recommended). */
-static const int ROW_LENGTH   = 2048;     /* Source buffer row lenght (including padding) */
-
-/**
- * @brief A dedicated OpenGL thread.
- * OpenGL context's don't handle multiple threads well.
- */
-static thread_t *thread = NULL;
-
-/**
- * @brief A window usable with an OpenGL context
- */
-static SDL_Window *window = NULL;
-
-/**
- * @brief SDL window handle
- */
-static HWND window_hwnd = NULL;
-
-/**
- * @brief Parent window handle (hwndRender from win_ui)
- */
-static HWND parent = NULL;
-
-/**
- * @brief Events listened in OpenGL thread.
- */
-static union {
-    struct
-    {
-        HANDLE closing;
-        HANDLE resize;
-        HANDLE reload;
-        HANDLE blit_waiting;
-    };
-    HANDLE asArray[4];
-} sync_objects = { 0 };
-
-/**
- * @brief Blit event parameters.
- */
-typedef struct
-{
-    int                  w, h;
-    void                *buffer; /* Buffer for pixel transfer, allocated by gpu driver. */
-    volatile atomic_flag in_use; /* Is buffer currently in use. */
-    GLsync               sync;   /* Fence sync object used by opengl thread to track pixel transfer completion. */
-} blit_info_t;
-
-/**
- * @brief Array of blit_infos, one for each buffer.
- */
-static blit_info_t *blit_info = NULL;
-
-/**
- * @brief Buffer index of next write operation.
- */
-static int write_pos = 0;
-
-/**
- * @brief Resize event parameters.
- */
-static struct
-{
-    int      width, height, fullscreen, scaling_mode;
-    mutex_t *mutex;
-} resize_info = { 0 };
-
-/**
- * @brief Renderer options
- */
-static struct
-{
-    int      vsync;              /* Vertical sync; 0 = off, 1 = on */
-    int      frametime;          /* Frametime in microseconds, or -1 to sync with blitter */
-    char     shaderfile[512];    /* Shader file path. Match the length of openfilestring in win_dialog.c */
-    int      shaderfile_changed; /* Has shader file path changed. To prevent unnecessary shader recompilation. */
-    int      filter;             /* 0 = Nearest, 1 = Linear */
-    int      filter_changed;     /* Has filter changed. */
-    mutex_t *mutex;
-} options = { 0 };
-
-/**
- * @brief Identifiers to OpenGL objects and uniforms.
- */
-typedef struct
-{
-    GLuint vertexArrayID;
-    GLuint vertexBufferID;
-    GLuint textureID;
-    GLuint unpackBufferID;
-    GLuint shader_progID;
-
-    /* Uniforms */
-
-    GLint input_size;
-    GLint output_size;
-    GLint texture_size;
-    GLint frame_count;
-} gl_identifiers;
-
-/**
- * @brief Set or unset OpenGL context window as a child window.
- *
- * Modifies the window style and sets the parent window.
- * WS_EX_NOACTIVATE keeps the window from stealing input focus.
- */
-static void
-set_parent_binding(int enable)
-{
-    long style    = GetWindowLong(window_hwnd, GWL_STYLE);
-    long ex_style = GetWindowLong(window_hwnd, GWL_EXSTYLE);
-
-    if (enable) {
-        style |= WS_CHILD;
-        ex_style |= WS_EX_NOACTIVATE;
-    } else {
-        style &= ~WS_CHILD;
-        ex_style &= ~WS_EX_NOACTIVATE;
-    }
-
-    SetWindowLong(window_hwnd, GWL_STYLE, style);
-    SetWindowLong(window_hwnd, GWL_EXSTYLE, ex_style);
-
-    SetParent(window_hwnd, enable ? parent : NULL);
-}
-
-/**
- * @brief Windows message handler for our window.
- * @param message
- * @param wParam
- * @param lParam
- * @param fullscreen
- * @return Was message handled
- */
-static int
-handle_window_messages(UINT message, WPARAM wParam, LPARAM lParam, int fullscreen)
-{
-    switch (message) {
-        case WM_LBUTTONUP:
-        case WM_LBUTTONDOWN:
-        case WM_MBUTTONUP:
-        case WM_MBUTTONDOWN:
-        case WM_RBUTTONUP:
-        case WM_RBUTTONDOWN:
-            if (!fullscreen) {
-                /* Bring main window to front. */
-                SetForegroundWindow(GetAncestor(parent, GA_ROOT));
-
-                /* Mouse events that enter and exit capture. */
-                PostMessage(parent, message, wParam, lParam);
-            }
-            return 1;
-        case WM_KEYDOWN:
-        case WM_KEYUP:
-        case WM_SYSKEYDOWN:
-        case WM_SYSKEYUP:
-            if (fullscreen) {
-                PostMessage(parent, message, wParam, lParam);
-            }
-            return 1;
-        case WM_INPUT:
-            if (fullscreen) {
-                /* Raw input handler from win_ui.c : input_proc */
-
-                UINT      size = 0;
-                PRAWINPUT raw  = NULL;
-
-                /* Here we read the raw input data */
-                GetRawInputData((HRAWINPUT) lParam, RID_INPUT, NULL, &size, sizeof(RAWINPUTHEADER));
-                raw = (PRAWINPUT) malloc(size);
-                if (GetRawInputData((HRAWINPUT) lParam, RID_INPUT, raw, &size, sizeof(RAWINPUTHEADER)) == size) {
-                    switch (raw->header.dwType) {
-                        case RIM_TYPEKEYBOARD:
-                            keyboard_handle(raw);
-                            break;
-                        case RIM_TYPEMOUSE:
-                            win_mouse_handle(raw);
-                            break;
-                        case RIM_TYPEHID:
-                            win_joystick_handle(raw);
-                            break;
-                    }
-                }
-                free(raw);
-            }
-            return 1;
-        case WM_MOUSELEAVE:
-            if (fullscreen) {
-                /* Leave fullscreen if mouse leaves the renderer window. */
-                PostMessage(GetAncestor(parent, GA_ROOT), WM_LEAVEFULLSCREEN, 0, 0);
-            }
-            return 0;
-    }
-
-    return 0;
-}
-
-/**
- * @brief (Re-)apply shaders to OpenGL context.
- * @param gl Identifiers from initialize
- */
-static void
-apply_shaders(gl_identifiers *gl)
-{
-    GLuint old_shader_ID = 0;
-
-    if (gl->shader_progID != 0)
-        old_shader_ID = gl->shader_progID;
-
-    if (strlen(options.shaderfile) > 0)
-        gl->shader_progID = load_custom_shaders(options.shaderfile);
-    else
-        gl->shader_progID = 0;
-
-    if (gl->shader_progID == 0)
-        gl->shader_progID = load_default_shaders();
-
-    glUseProgram(gl->shader_progID);
-
-    /* Delete old shader if one exists (changing shader) */
-    if (old_shader_ID != 0)
-        glDeleteProgram(old_shader_ID);
-
-    GLint vertex_coord = glGetAttribLocation(gl->shader_progID, "VertexCoord");
-    if (vertex_coord != -1) {
-        glEnableVertexAttribArray(vertex_coord);
-        glVertexAttribPointer(vertex_coord, 2, GL_FLOAT, GL_FALSE, 8 * sizeof(GLfloat), 0);
-    }
-
-    GLint tex_coord = glGetAttribLocation(gl->shader_progID, "TexCoord");
-    if (tex_coord != -1) {
-        glEnableVertexAttribArray(tex_coord);
-        glVertexAttribPointer(tex_coord, 2, GL_FLOAT, GL_FALSE, 8 * sizeof(GLfloat), (void *) (2 * sizeof(GLfloat)));
-    }
-
-    GLint color = glGetAttribLocation(gl->shader_progID, "Color");
-    if (color != -1) {
-        glEnableVertexAttribArray(color);
-        glVertexAttribPointer(color, 4, GL_FLOAT, GL_FALSE, 8 * sizeof(GLfloat), (void *) (4 * sizeof(GLfloat)));
-    }
-
-    GLint mvp_matrix = glGetUniformLocation(gl->shader_progID, "MVPMatrix");
-    if (mvp_matrix != -1) {
-        static const GLfloat mvp[] = {
-            1.f, 0.f, 0.f, 0.f,
-            0.f, 1.f, 0.f, 0.f,
-            0.f, 0.f, 1.f, 0.f,
-            0.f, 0.f, 0.f, 1.f
-        };
-        glUniformMatrix4fv(mvp_matrix, 1, GL_FALSE, mvp);
-    }
-
-    GLint frame_direction = glGetUniformLocation(gl->shader_progID, "FrameDirection");
-    if (frame_direction != -1)
-        glUniform1i(frame_direction, 1); /* always forward */
-
-    gl->input_size   = glGetUniformLocation(gl->shader_progID, "InputSize");
-    gl->output_size  = glGetUniformLocation(gl->shader_progID, "OutputSize");
-    gl->texture_size = glGetUniformLocation(gl->shader_progID, "TextureSize");
-    gl->frame_count  = glGetUniformLocation(gl->shader_progID, "FrameCount");
-}
-
-/**
- * @brief Initialize OpenGL context
- * @return Identifiers
- */
-static int
-initialize_glcontext(gl_identifiers *gl)
-{
-    /* Vertex, texture 2d coordinates and color (white) making a quad as triangle strip */
-    static const GLfloat surface[] = {
-        -1.f, 1.f, 0.f, 0.f, 1.f, 1.f, 1.f, 1.f,
-        1.f, 1.f, 1.f, 0.f, 1.f, 1.f, 1.f, 1.f,
-        -1.f, -1.f, 0.f, 1.f, 1.f, 1.f, 1.f, 1.f,
-        1.f, -1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f
-    };
-
-    glGenVertexArrays(1, &gl->vertexArrayID);
-
-    glBindVertexArray(gl->vertexArrayID);
-
-    glGenBuffers(1, &gl->vertexBufferID);
-    glBindBuffer(GL_ARRAY_BUFFER, gl->vertexBufferID);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(surface), surface, GL_STATIC_DRAW);
-
-    glGenTextures(1, &gl->textureID);
-    glBindTexture(GL_TEXTURE_2D, gl->textureID);
-
-    static const GLfloat border_color[] = { 0.f, 0.f, 0.f, 1.f };
-    glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_color);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, options.filter ? GL_LINEAR : GL_NEAREST);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, options.filter ? GL_LINEAR : GL_NEAREST);
-
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, INIT_WIDTH, INIT_HEIGHT, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
-
-    glGenBuffers(1, &gl->unpackBufferID);
-    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, gl->unpackBufferID);
-
-    void *buf_ptr = NULL;
-
-    if (GLAD_GL_ARB_buffer_storage) {
-        /* Create persistent buffer for pixel transfer. */
-        glBufferStorage(GL_PIXEL_UNPACK_BUFFER, BUFFERBYTES * BUFFERCOUNT, NULL, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT);
-
-        buf_ptr = glMapBufferRange(GL_PIXEL_UNPACK_BUFFER, 0, BUFFERBYTES * BUFFERCOUNT, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT);
-    } else {
-        /* Fallback; create our own buffer. */
-        buf_ptr = malloc(BUFFERBYTES * BUFFERCOUNT);
-
-        glBufferData(GL_PIXEL_UNPACK_BUFFER, BUFFERBYTES * BUFFERCOUNT, NULL, GL_STREAM_DRAW);
-    }
-
-    if (buf_ptr == NULL)
-        return 0; /* Most likely out of memory. */
-
-    /* Split the buffer area for each blit_info and set them available for use. */
-    for (int i = 0; i < BUFFERCOUNT; i++) {
-        blit_info[i].buffer = (byte *) buf_ptr + BUFFERBYTES * i;
-        atomic_flag_clear(&blit_info[i].in_use);
-    }
-
-    glClearColor(0.f, 0.f, 0.f, 1.f);
-
-    apply_shaders(gl);
-
-    return 1;
-}
-
-/**
- * @brief Clean up OpenGL context
- * @param gl Identifiers from initialize
- */
-static void
-finalize_glcontext(gl_identifiers *gl)
-{
-    if (GLAD_GL_ARB_buffer_storage)
-        glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
-    else
-        free(blit_info[0].buffer);
-
-    glDeleteProgram(gl->shader_progID);
-    glDeleteBuffers(1, &gl->unpackBufferID);
-    glDeleteTextures(1, &gl->textureID);
-    glDeleteBuffers(1, &gl->vertexBufferID);
-    glDeleteVertexArrays(1, &gl->vertexArrayID);
-}
-
-/**
- * @brief Renders a frame and swaps the buffer
- * @param gl Identifiers from initialize
- */
-static void
-render_and_swap(gl_identifiers *gl)
-{
-    static int frame_counter = 0;
-
-    glClear(GL_COLOR_BUFFER_BIT);
-    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-
-    SDL_GL_SwapWindow(window);
-
-    if (gl->frame_count != -1)
-        glUniform1i(gl->frame_count, frame_counter = (frame_counter + 1) & 1023);
-}
-
-/**
- * @brief Handle failure in OpenGL thread.
- * Keeps the thread sleeping until closing.
- */
-static void
-opengl_fail(void)
-{
-    if (window != NULL) {
-        SDL_DestroyWindow(window);
-        window = NULL;
-    }
-
-    const wchar_t *message = plat_get_string(IDS_2153);
-    const wchar_t *header  = plat_get_string(IDS_2154);
-    MessageBox(parent, header, message, MB_OK);
-
-    WaitForSingleObject(sync_objects.closing, INFINITE);
-
-    _endthread();
-}
-
-static void __stdcall opengl_debugmsg_callback(UNUSED(GLenum source), UNUSED(GLenum type), UNUSED(GLuint id), UNUSED(GLenum severity), UNUSED(GLsizei length), const GLchar *message, UNUSED(const void *userParam))
-{
-    pclog("OpenGL: %s\n", message);
-}
-
-/**
- * @brief Main OpenGL thread proc.
- *
- * OpenGL context should be accessed only from this single thread.
- * Events are used to synchronize communication.
- */
-static void
-opengl_main(UNUSED(void *param))
-{
-    /* Initialize COM library for this thread before SDL does so. */
-    CoInitializeEx(NULL, COINIT_MULTITHREADED);
-
-    SDL_InitSubSystem(SDL_INIT_VIDEO);
-
-    SDL_SetHint(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, "1"); /* Is this actually doing anything...? */
-
-    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
-    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
-    SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
-
-    if (GLAD_GL_ARB_debug_output && log_path[0] != '\0')
-        SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG | SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG);
-    else
-        SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG);
-
-    window = SDL_CreateWindow("86Box OpenGL Renderer", 0, 0, resize_info.width, resize_info.height, SDL_WINDOW_OPENGL | SDL_WINDOW_BORDERLESS);
-
-    if (window == NULL) {
-        pclog("OpenGL: failed to create OpenGL window.\n");
-        opengl_fail();
-    }
-
-    /* Keep track of certain parameters, only changed in this thread to avoid race conditions */
-    int fullscreen    = resize_info.fullscreen;
-    int video_width   = INIT_WIDTH;
-    int video_height  = INIT_HEIGHT;
-    int output_width  = resize_info.width;
-    int output_height = resize_info.height;
-    int frametime     = options.frametime;
-
-    SDL_SysWMinfo wmi = { 0 };
-    SDL_VERSION(&wmi.version);
-    SDL_GetWindowWMInfo(window, &wmi);
-
-    if (wmi.subsystem != SDL_SYSWM_WINDOWS) {
-        pclog("OpenGL: subsystem is not SDL_SYSWM_WINDOWS.\n");
-        opengl_fail();
-    }
-
-    window_hwnd = wmi.info.win.window;
-
-    if (!fullscreen)
-        set_parent_binding(1);
-    else
-        SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP);
-
-    SDL_GLContext context = SDL_GL_CreateContext(window);
-
-    if (context == NULL) {
-        pclog("OpenGL: failed to create OpenGL context.\n");
-        opengl_fail();
-    }
-
-    SDL_GL_SetSwapInterval(options.vsync);
-
-    if (!gladLoadGLLoader(SDL_GL_GetProcAddress)) {
-        pclog("OpenGL: failed to set OpenGL loader.\n");
-        SDL_GL_DeleteContext(context);
-        opengl_fail();
-    }
-
-    if (GLAD_GL_ARB_debug_output && log_path[0] != '\0') {
-        glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB);
-        glDebugMessageControlARB(GL_DONT_CARE, GL_DEBUG_TYPE_PERFORMANCE_ARB, GL_DONT_CARE, 0, 0, GL_FALSE);
-        glDebugMessageCallbackARB(opengl_debugmsg_callback, NULL);
-    }
-
-    pclog("OpenGL vendor: %s\n", glGetString(GL_VENDOR));
-    pclog("OpenGL renderer: %s\n", glGetString(GL_RENDERER));
-    pclog("OpenGL version: %s\n", glGetString(GL_VERSION));
-    pclog("OpenGL shader language version: %s\n", glGetString(GL_SHADING_LANGUAGE_VERSION));
-
-    /* Check that the driver actually reports version 3.0 or later */
-    GLint major = -1;
-    glGetIntegerv(GL_MAJOR_VERSION, &major);
-    if (major < 3) {
-        pclog("OpenGL: Minimum OpenGL version 3.0 is required.\n");
-        SDL_GL_DeleteContext(context);
-        opengl_fail();
-    }
-
-    /* Check if errors have been generated at this point */
-    GLenum gl_error = glGetError();
-    if (gl_error != GL_NO_ERROR) {
-        /* Log up to 10 errors */
-        int i = 0;
-        do {
-            pclog("OpenGL: Error %u\n", gl_error);
-            i++;
-        } while ((gl_error = glGetError()) != GL_NO_ERROR && i < 10);
-
-        SDL_GL_DeleteContext(context);
-        opengl_fail();
-    }
-
-    gl_identifiers gl = { 0 };
-
-    if (!initialize_glcontext(&gl)) {
-        pclog("OpenGL: failed to initialize.\n");
-        finalize_glcontext(&gl);
-        SDL_GL_DeleteContext(context);
-        opengl_fail();
-    }
-
-    if (gl.frame_count != -1)
-        glUniform1i(gl.frame_count, 0);
-    if (gl.output_size != -1)
-        glUniform2f(gl.output_size, output_width, output_height);
-
-    uint32_t last_swap = plat_get_micro_ticks() - frametime;
-
-    int read_pos = 0; /* Buffer index of next read operation. */
-
-    /* Render loop */
-    int closing = 0;
-    while (!closing) {
-        /* Rendering is done right after handling an event. */
-        if (frametime < 0)
-            render_and_swap(&gl);
-
-        DWORD wait_result = WAIT_TIMEOUT;
-
-        do {
-            /* Rendering is timed by frame capping. */
-            if (frametime >= 0) {
-                uint32_t ticks = plat_get_micro_ticks();
-
-                uint32_t elapsed = ticks - last_swap;
-
-                if (elapsed + 1000 > frametime) {
-                    /* Spin the remaining time (< 1ms) to next frame */
-                    while (elapsed < frametime) {
-                        Sleep(0); /* Yield processor time */
-                        ticks   = plat_get_micro_ticks();
-                        elapsed = ticks - last_swap;
-                    }
-
-                    render_and_swap(&gl);
-                    last_swap = ticks;
-                }
-            }
-
-            if (GLAD_GL_ARB_sync) {
-                /* Check if commands that use buffers have been completed. */
-                for (int i = 0; i < BUFFERCOUNT; i++) {
-                    if (blit_info[i].sync != NULL && glClientWaitSync(blit_info[i].sync, GL_SYNC_FLUSH_COMMANDS_BIT, 0) != GL_TIMEOUT_EXPIRED) {
-                        glDeleteSync(blit_info[i].sync);
-                        blit_info[i].sync = NULL;
-                        atomic_flag_clear(&blit_info[i].in_use);
-                    }
-                }
-            }
-
-            /* Handle window messages */
-            MSG msg;
-            while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
-                if (msg.hwnd != window_hwnd || !handle_window_messages(msg.message, msg.wParam, msg.lParam, fullscreen)) {
-                    TranslateMessage(&msg);
-                    DispatchMessage(&msg);
-                }
-            }
-
-            /* Wait for synchronized events for 1ms before going back to window events */
-            wait_result = WaitForMultipleObjects(sizeof(sync_objects) / sizeof(HANDLE), sync_objects.asArray, FALSE, 1);
-
-        } while (wait_result == WAIT_TIMEOUT);
-
-        const HANDLE sync_event = sync_objects.asArray[wait_result - WAIT_OBJECT_0];
-
-        if (sync_event == sync_objects.closing) {
-            closing = 1;
-        } else if (sync_event == sync_objects.blit_waiting) {
-            blit_info_t *info = &blit_info[read_pos];
-
-            if (video_width != info->w || video_height != info->h) {
-                video_width  = info->w;
-                video_height = info->h;
-
-                /* Resize the texture */
-                glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, video_width, video_height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
-                glBindBuffer(GL_PIXEL_UNPACK_BUFFER, gl.unpackBufferID);
-
-                if (fullscreen)
-                    SetEvent(sync_objects.resize);
-            }
-
-            if (!GLAD_GL_ARB_buffer_storage) {
-                /* Fallback method, copy data to pixel buffer. */
-                glBufferSubData(GL_PIXEL_UNPACK_BUFFER, BUFFERBYTES * read_pos, info->h * ROW_LENGTH * sizeof(uint32_t), info->buffer);
-            }
-
-            /* Update texture from pixel buffer. */
-            glPixelStorei(GL_UNPACK_SKIP_PIXELS, BUFFERPIXELS * read_pos);
-            glPixelStorei(GL_UNPACK_ROW_LENGTH, ROW_LENGTH);
-            glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, info->w, info->h, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
-
-            if (GLAD_GL_ARB_sync) {
-                /* Add fence to track when above gl commands are complete. */
-                info->sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-            } else {
-                /* No sync objects; block until commands are complete. */
-                glFinish();
-                atomic_flag_clear(&info->in_use);
-            }
-
-            read_pos = (read_pos + 1) % BUFFERCOUNT;
-
-            /* Update uniforms */
-            if (gl.input_size != -1)
-                glUniform2f(gl.input_size, video_width, video_height);
-            if (gl.texture_size != -1)
-                glUniform2f(gl.texture_size, video_width, video_height);
-        } else if (sync_event == sync_objects.resize) {
-            thread_wait_mutex(resize_info.mutex);
-
-            if (fullscreen != resize_info.fullscreen) {
-                fullscreen = resize_info.fullscreen;
-
-                set_parent_binding(!fullscreen);
-
-                SDL_SetWindowFullscreen(window, fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
-
-                if (fullscreen) {
-                    SetForegroundWindow(window_hwnd);
-                    SetFocus(window_hwnd);
-
-                    /* Clip cursor to prevent it moving to another monitor. */
-                    RECT rect;
-                    GetWindowRect(window_hwnd, &rect);
-                    ClipCursor(&rect);
-                } else
-                    ClipCursor(NULL);
-            }
-
-            if (fullscreen) {
-                int         width;
-                int         height;
-                int         pad_x   = 0;
-                int         pad_y   = 0;
-                int         px_size = 1;
-                float       ratio   = 0;
-                const float ratio43 = 4.f / 3.f;
-
-                SDL_GetWindowSize(window, &width, &height);
-
-                if (video_width > 0 && video_height > 0) {
-                    switch (resize_info.scaling_mode) {
-                        case FULLSCR_SCALE_INT:
-                            px_size = max(min(width / video_width, height / video_height), 1);
-
-                            pad_x = width - (video_width * px_size);
-                            pad_y = height - (video_height * px_size);
-                            break;
-
-                        case FULLSCR_SCALE_KEEPRATIO:
-                            ratio = (float) video_width / (float) video_height;
-                        case FULLSCR_SCALE_43:
-                            if (ratio == 0)
-                                ratio = ratio43;
-                            if (ratio < ((float) width / (float) height))
-                                pad_x = width - (int) roundf((float) height * ratio);
-                            else
-                                pad_y = height - (int) roundf((float) width / ratio);
-                            break;
-
-                        case FULLSCR_SCALE_FULL:
-                        default:
-                            break;
-                    }
-                }
-
-                output_width  = width - pad_x;
-                output_height = height - pad_y;
-
-                glViewport(pad_x / 2, pad_y / 2, output_width, output_height);
-
-                if (gl.output_size != -1)
-                    glUniform2f(gl.output_size, output_width, output_height);
-            } else {
-                SDL_SetWindowSize(window, resize_info.width, resize_info.height);
-
-                /* SWP_NOZORDER is needed for child window and SDL doesn't enable it. */
-                SetWindowPos(window_hwnd, parent, 0, 0, resize_info.width, resize_info.height, SWP_NOZORDER | SWP_NOCOPYBITS | SWP_NOMOVE | SWP_NOACTIVATE);
-
-                output_width  = resize_info.width;
-                output_height = resize_info.height;
-
-                glViewport(0, 0, resize_info.width, resize_info.height);
-
-                if (gl.output_size != -1)
-                    glUniform2f(gl.output_size, resize_info.width, resize_info.height);
-            }
-
-            thread_release_mutex(resize_info.mutex);
-        } else if (sync_event == sync_objects.reload) {
-            thread_wait_mutex(options.mutex);
-
-            frametime = options.frametime;
-
-            SDL_GL_SetSwapInterval(options.vsync);
-
-            if (options.shaderfile_changed) {
-                /* Change shader program. */
-                apply_shaders(&gl);
-
-                /* Uniforms need to be updated after proram change. */
-                if (gl.input_size != -1)
-                    glUniform2f(gl.input_size, video_width, video_height);
-                if (gl.output_size != -1)
-                    glUniform2f(gl.output_size, output_width, output_height);
-                if (gl.texture_size != -1)
-                    glUniform2f(gl.texture_size, video_width, video_height);
-                if (gl.frame_count != -1)
-                    glUniform1i(gl.frame_count, 0);
-
-                options.shaderfile_changed = 0;
-            }
-
-            if (options.filter_changed) {
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, options.filter ? GL_LINEAR : GL_NEAREST);
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, options.filter ? GL_LINEAR : GL_NEAREST);
-
-                options.filter_changed = 0;
-            }
-
-            thread_release_mutex(options.mutex);
-        }
-
-        /* Keep cursor hidden in full screen and mouse capture */
-        int show_cursor = !(fullscreen || !!mouse_capture);
-        if (SDL_ShowCursor(-1) != show_cursor)
-            SDL_ShowCursor(show_cursor);
-    }
-
-    if (GLAD_GL_ARB_sync) {
-        for (int i = 0; i < BUFFERCOUNT; i++) {
-            if (blit_info[i].sync != NULL)
-                glDeleteSync(blit_info[i].sync);
-        }
-    }
-
-    finalize_glcontext(&gl);
-
-    SDL_GL_DeleteContext(context);
-
-    set_parent_binding(0);
-
-    SDL_DestroyWindow(window);
-
-    window = NULL;
-
-    CoUninitialize();
-}
-
-static void
-opengl_blit(int x, int y, int w, int h, int monitor_index)
-{
-    if ((x < 0) || (y < 0) || (w <= 0) || (h <= 0) || (w > 2048) || (h > 2048) || (buffer32 == NULL) || (thread == NULL) || atomic_flag_test_and_set(&blit_info[write_pos].in_use) || monitor_index >= 1) {
-        video_blit_complete_monitor(monitor_index);
-        return;
-    }
-
-    for (int row = 0; row < h; ++row)
-        video_copy(&(((uint8_t *) blit_info[write_pos].buffer)[row * ROW_LENGTH * sizeof(uint32_t)]), &(buffer32->line[y + row][x]), w * sizeof(uint32_t));
-
-    if (monitors[0].mon_screenshots)
-        video_screenshot(blit_info[write_pos].buffer, 0, 0, ROW_LENGTH);
-
-    video_blit_complete();
-
-    blit_info[write_pos].w = w;
-    blit_info[write_pos].h = h;
-
-    write_pos = (write_pos + 1) % BUFFERCOUNT;
-
-    ReleaseSemaphore(sync_objects.blit_waiting, 1, NULL);
-}
-
-static int
-framerate_to_frametime(int framerate)
-{
-    if (framerate < 0)
-        return -1;
-
-    return (int) ceilf(1.e6f / (float) framerate);
-}
-
-int
-opengl_init(HWND hwnd)
-{
-    if (thread != NULL)
-        return 0;
-
-    for (int i = 0; i < sizeof(sync_objects) / sizeof(HANDLE); i++)
-        sync_objects.asArray[i] = CreateEvent(NULL, FALSE, FALSE, NULL);
-
-    sync_objects.closing      = CreateEvent(NULL, FALSE, FALSE, NULL);
-    sync_objects.resize       = CreateEvent(NULL, FALSE, FALSE, NULL);
-    sync_objects.reload       = CreateEvent(NULL, FALSE, FALSE, NULL);
-    sync_objects.blit_waiting = CreateSemaphore(NULL, 0, BUFFERCOUNT * 2, NULL);
-
-    parent = hwnd;
-
-    RECT parent_size;
-
-    GetWindowRect(parent, &parent_size);
-
-    resize_info.width        = parent_size.right - parent_size.left;
-    resize_info.height       = parent_size.bottom - parent_size.top;
-    resize_info.fullscreen   = video_fullscreen & 1;
-    resize_info.scaling_mode = video_fullscreen_scale;
-    resize_info.mutex        = thread_create_mutex();
-
-    options.vsync     = video_vsync;
-    options.frametime = framerate_to_frametime(video_framerate);
-    strcpy_s(options.shaderfile, sizeof(options.shaderfile), video_shader);
-    options.shaderfile_changed = 0;
-    options.filter             = video_filter_method;
-    options.filter_changed     = 0;
-    options.mutex              = thread_create_mutex();
-
-    blit_info = (blit_info_t *) malloc(BUFFERCOUNT * sizeof(blit_info_t));
-    memset(blit_info, 0, BUFFERCOUNT * sizeof(blit_info_t));
-
-    /* Buffers are not yet allocated, set them as in use. */
-    for (int i = 0; i < BUFFERCOUNT; i++)
-        atomic_flag_test_and_set(&blit_info[i].in_use);
-
-    write_pos = 0;
-
-    thread = thread_create(opengl_main, NULL);
-
-    atexit(opengl_close);
-
-    video_setblit(opengl_blit);
-
-    return 1;
-}
-
-int
-opengl_pause(void)
-{
-    return 0;
-}
-
-void
-opengl_close(void)
-{
-    if (thread == NULL)
-        return;
-
-    SetEvent(sync_objects.closing);
-
-    thread_wait(thread);
-
-    thread_close_mutex(resize_info.mutex);
-    thread_close_mutex(options.mutex);
-
-    thread = NULL;
-
-    free(blit_info);
-
-    for (int i = 0; i < sizeof(sync_objects) / sizeof(HANDLE); i++) {
-        CloseHandle(sync_objects.asArray[i]);
-        sync_objects.asArray[i] = NULL;
-    }
-
-    parent = NULL;
-}
-
-void
-opengl_set_fs(int fs)
-{
-    if (thread == NULL)
-        return;
-
-    thread_wait_mutex(resize_info.mutex);
-
-    resize_info.fullscreen   = fs;
-    resize_info.scaling_mode = video_fullscreen_scale;
-
-    thread_release_mutex(resize_info.mutex);
-
-    SetEvent(sync_objects.resize);
-}
-
-void
-opengl_resize(int w, int h)
-{
-    if (thread == NULL)
-        return;
-
-    thread_wait_mutex(resize_info.mutex);
-
-    resize_info.width        = w;
-    resize_info.height       = h;
-    resize_info.scaling_mode = video_fullscreen_scale;
-
-    thread_release_mutex(resize_info.mutex);
-
-    SetEvent(sync_objects.resize);
-}
-
-void
-opengl_reload(void)
-{
-    if (thread == NULL)
-        return;
-
-    thread_wait_mutex(options.mutex);
-
-    options.vsync     = video_vsync;
-    options.frametime = framerate_to_frametime(video_framerate);
-
-    if (strcmp(video_shader, options.shaderfile) != 0) {
-        strcpy_s(options.shaderfile, sizeof(options.shaderfile), video_shader);
-        options.shaderfile_changed = 1;
-    }
-
-    if (video_filter_method != options.filter) {
-        options.filter         = video_filter_method;
-        options.filter_changed = 1;
-    }
-
-    thread_release_mutex(options.mutex);
-
-    SetEvent(sync_objects.reload);
-}
diff --git a/src/win/win_opengl_glslp.c b/src/win/win_opengl_glslp.c
deleted file mode 100644
index 9689f3ab2..000000000
--- a/src/win/win_opengl_glslp.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          File parser for .glslp and .glsl shader files
- *          in the format of libretro.
- *
- * TODO:    Read .glslp files for multipass shaders and settings.
- *
- *
- *
- * Authors: Teemu Korhonen
- *
- *          Copyright 2021 Teemu Korhonen
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-#include <glad/glad.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
-
-#include <86box/86box.h>
-#include <86box/plat.h>
-#include <86box/win_opengl_glslp.h>
-
-/**
- * @brief Default vertex shader.
- */
-static const GLchar *vertex_shader = "#version 130\n\
-in vec2 VertexCoord;\n\
-in vec2 TexCoord;\n\
-out vec2 tex;\n\
-void main(){\n\
-    gl_Position = vec4(VertexCoord, 0.0, 1.0);\n\
-    tex = TexCoord;\n\
-}\n";
-
-/**
- * @brief Default fragment shader.
- */
-static const GLchar *fragment_shader = "#version 130\n\
-in vec2 tex;\n\
-uniform sampler2D texsampler;\n\
-out vec4 color;\n\
-void main() {\n\
-    color = texture(texsampler, tex);\n\
-}\n";
-
-/**
- * @brief OpenGL shader program build targets
- */
-typedef enum {
-    OPENGL_BUILD_TARGET_VERTEX,
-    OPENGL_BUILD_TARGET_FRAGMENT,
-    OPENGL_BUILD_TARGET_LINK
-} opengl_build_target_t;
-
-/**
- * @brief Reads a whole file into a null terminated string.
- * @param Path Path to the file relative to executable path.
- * @return Pointer to the string or NULL on error. Remember to free() after use.
- */
-static char *
-read_file_to_string(const char *path)
-{
-    FILE *fp = plat_fopen(path, "rb");
-
-    if (fp != NULL) {
-        /* get file size */
-        fseek(fp, 0, SEEK_END);
-
-        size_t file_size = (size_t) ftell(fp);
-
-        fseek(fp, 0, SEEK_SET);
-
-        /* read to buffer and close */
-        char *content = (char *) malloc(sizeof(char) * (file_size + 1));
-
-        if (!content)
-            return NULL;
-
-        size_t length = fread(content, sizeof(char), file_size, fp);
-
-        fclose(fp);
-
-        content[length] = 0;
-
-        return content;
-    }
-    return NULL;
-}
-
-static int
-check_status(GLuint id, opengl_build_target_t build_target, const char *shader_path)
-{
-    GLint status = GL_FALSE;
-
-    if (build_target != OPENGL_BUILD_TARGET_LINK)
-        glGetShaderiv(id, GL_COMPILE_STATUS, &status);
-    else
-        glGetProgramiv(id, GL_LINK_STATUS, &status);
-
-    if (status == GL_FALSE) {
-        int info_log_length;
-
-        if (build_target != OPENGL_BUILD_TARGET_LINK)
-            glGetShaderiv(id, GL_INFO_LOG_LENGTH, &info_log_length);
-        else
-            glGetProgramiv(id, GL_INFO_LOG_LENGTH, &info_log_length);
-
-        GLchar *info_log_text = (GLchar *) malloc(sizeof(GLchar) * info_log_length);
-
-        if (build_target != OPENGL_BUILD_TARGET_LINK)
-            glGetShaderInfoLog(id, info_log_length, NULL, info_log_text);
-        else
-            glGetProgramInfoLog(id, info_log_length, NULL, info_log_text);
-
-        const char *reason = NULL;
-
-        switch (build_target) {
-            case OPENGL_BUILD_TARGET_VERTEX:
-                reason = "compiling vertex shader";
-                break;
-            case OPENGL_BUILD_TARGET_FRAGMENT:
-                reason = "compiling fragment shader";
-                break;
-            case OPENGL_BUILD_TARGET_LINK:
-                reason = "linking shader program";
-                break;
-        }
-
-        /* Shader compilation log can be lengthy, mark begin and end */
-        const char *line = "--------------------";
-
-        pclog("OpenGL: Error when %s in %s:\n%sBEGIN%s\n%s\n%s END %s\n", reason, shader_path, line, line, info_log_text, line, line);
-
-        free(info_log_text);
-
-        return 0;
-    }
-
-    return 1;
-}
-
-/**
- * @brief Compile custom shaders into a program.
- * @return Shader program identifier.
- */
-GLuint
-load_custom_shaders(const char *path)
-{
-    char *shader = read_file_to_string(path);
-
-    if (shader != NULL) {
-        int success = 1;
-
-        const char *vertex_sources[3]   = { "#version 130\n", "#define VERTEX\n", shader };
-        const char *fragment_sources[3] = { "#version 130\n", "#define FRAGMENT\n", shader };
-
-        /* Check if the shader program defines version directive */
-        char *version_start = strstr(shader, "#version");
-
-        /* If the shader program contains a version directive,
-                it must be captured and placed as the first statement. */
-        if (version_start != NULL) {
-            /* Version directive found, search the line end */
-            const char *version_end = strchr(version_start, '\n');
-
-            if (version_end != NULL) {
-                char version[30] = "";
-
-                size_t version_len = MIN(version_end - version_start + 1, 29);
-
-                strncat(version, version_start, version_len);
-
-                /* replace the default version directive */
-                vertex_sources[0]   = version;
-                fragment_sources[0] = version;
-            }
-
-            /* Comment out the original version directive
-                    as only one is allowed. */
-            memset(version_start, '/', 2);
-        }
-
-        GLuint vertex_id   = glCreateShader(GL_VERTEX_SHADER);
-        GLuint fragment_id = glCreateShader(GL_FRAGMENT_SHADER);
-
-        glShaderSource(vertex_id, 3, vertex_sources, NULL);
-        glCompileShader(vertex_id);
-        success *= check_status(vertex_id, OPENGL_BUILD_TARGET_VERTEX, path);
-
-        glShaderSource(fragment_id, 3, fragment_sources, NULL);
-        glCompileShader(fragment_id);
-        success *= check_status(fragment_id, OPENGL_BUILD_TARGET_FRAGMENT, path);
-
-        free(shader);
-
-        GLuint prog_id = 0;
-
-        if (success) {
-            prog_id = glCreateProgram();
-
-            glAttachShader(prog_id, vertex_id);
-            glAttachShader(prog_id, fragment_id);
-            glLinkProgram(prog_id);
-            check_status(prog_id, OPENGL_BUILD_TARGET_LINK, path);
-
-            glDetachShader(prog_id, vertex_id);
-            glDetachShader(prog_id, fragment_id);
-        }
-
-        glDeleteShader(vertex_id);
-        glDeleteShader(fragment_id);
-
-        return prog_id;
-    }
-    return 0;
-}
-
-/**
- * @brief Compile default shaders into a program.
- * @return Shader program identifier.
- */
-GLuint
-load_default_shaders(void)
-{
-    GLuint vertex_id   = glCreateShader(GL_VERTEX_SHADER);
-    GLuint fragment_id = glCreateShader(GL_FRAGMENT_SHADER);
-
-    glShaderSource(vertex_id, 1, &vertex_shader, NULL);
-    glCompileShader(vertex_id);
-
-    glShaderSource(fragment_id, 1, &fragment_shader, NULL);
-    glCompileShader(fragment_id);
-
-    GLuint prog_id = glCreateProgram();
-
-    glAttachShader(prog_id, vertex_id);
-    glAttachShader(prog_id, fragment_id);
-
-    glLinkProgram(prog_id);
-
-    glDetachShader(prog_id, vertex_id);
-    glDetachShader(prog_id, fragment_id);
-
-    glDeleteShader(vertex_id);
-    glDeleteShader(fragment_id);
-
-    return prog_id;
-}
diff --git a/src/win/win_preferences.c b/src/win/win_preferences.c
deleted file mode 100644
index ee93321a8..000000000
--- a/src/win/win_preferences.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Handle the dialog for changing the program's language and other global settings.
- *
- *
- *
- * Authors: Laci bá'
- *
- *          Copyright 2021 Laci bá'
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-#define UNICODE
-#define BITMAP WINDOWS_BITMAP
-#include <windows.h>
-#include <windowsx.h>
-#undef BITMAP
-#include <commctrl.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/config.h>
-#include <86box/plat.h>
-#include <86box/sound.h>
-#include <86box/win.h>
-#include <86box/ui.h>
-#include <86box/resource.h>
-
-/* Language */
-static LCID temp_language;
-
-static char temp_icon_set[256] = { 0 };
-
-int enum_helper;
-int c;
-
-HWND hwndPreferences;
-
-BOOL CALLBACK
-EnumResLangProc(UNUSED(HMODULE hModule), UNUSED(LPCTSTR lpszType), UNUSED(LPCTSTR lpszName), WORD wIDLanguage, LONG_PTR lParam)
-{
-    wchar_t temp[LOCALE_NAME_MAX_LENGTH + 1];
-    LCIDToLocaleName(wIDLanguage, temp, LOCALE_NAME_MAX_LENGTH, 0);
-    wchar_t dispname[MAX_PATH + 1];
-    GetLocaleInfoEx(temp, LOCALE_SENGLISHDISPLAYNAME, dispname, MAX_PATH);
-    SendMessage((HWND) lParam, CB_ADDSTRING, 0, (LPARAM) dispname);
-    SendMessage((HWND) lParam, CB_SETITEMDATA, c, (LPARAM) wIDLanguage);
-
-    if (wIDLanguage == lang_id)
-        enum_helper = c;
-    c++;
-
-    return 1;
-}
-
-/* Load available languages */
-static void
-preferences_fill_languages(HWND hdlg)
-{
-    temp_language   = GetThreadUILanguage();
-    HWND lang_combo = GetDlgItem(hdlg, IDC_COMBO_LANG);
-
-    SendMessage(lang_combo, CB_RESETCONTENT, 0, 0);
-    SendMessage(lang_combo, CB_ADDSTRING, 0, win_get_string(IDS_7168));
-    SendMessage(lang_combo, CB_SETITEMDATA, 0, 0xFFFF);
-
-    enum_helper = 0;
-    c           = 1;
-    // if no one is selected, then it was 0xFFFF or unsupported language, in either case go with index enum_helper=0
-    // also start enum index from c=1
-    EnumResourceLanguages(hinstance, RT_MENU, L"MainMenu", &EnumResLangProc, (LPARAM) lang_combo);
-
-    SendMessage(lang_combo, CB_SETCURSEL, enum_helper, 0);
-}
-
-/* Load available iconsets */
-static void
-preferences_fill_iconsets(HWND hdlg)
-{
-    HWND icon_combo = GetDlgItem(hdlg, IDC_COMBO_ICON);
-
-    /* Add the default one */
-    wchar_t buffer[512] = L"(";
-    wcscat(buffer, plat_get_string(IDS_DEFAULT));
-    wcscat(buffer, L")");
-
-    SendMessage(icon_combo, CB_RESETCONTENT, 0, 0);
-    SendMessage(icon_combo, CB_ADDSTRING, 0, (LPARAM) buffer);
-    SendMessage(icon_combo, CB_SETITEMDATA, 0, (LPARAM) strdup(""));
-
-    int combo_index = -1;
-
-    /* Find for extra ones */
-    HANDLE          hFind;
-    WIN32_FIND_DATA data;
-
-    char icon_path_root[512];
-    win_get_icons_path(icon_path_root);
-
-    wchar_t search[512];
-    mbstoc16s(search, icon_path_root, strlen(icon_path_root) + 1);
-    wcscat(search, L"*.*");
-
-    hFind = FindFirstFile((LPCWSTR) search, &data);
-
-    if (hFind != INVALID_HANDLE_VALUE) {
-        do {
-            if (wcscmp(data.cFileName, L".") && wcscmp(data.cFileName, L"..") && (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
-                wchar_t temp[512]     = { 0 };
-                wchar_t dispname[512] = { 0 };
-                mbstoc16s(temp, icon_path_root, strlen(icon_path_root) + 1);
-                wcscat(temp, data.cFileName);
-                wcscat(temp, L"\\iconinfo.txt");
-
-                wcscpy(dispname, data.cFileName);
-                FILE *fp = _wfopen(temp, L"r");
-                if (fp) {
-                    char line[512] = { 0 };
-                    if (fgets(line, 511, fp)) {
-                        mbstoc16s(dispname, line, strlen(line) + 1);
-                    }
-
-                    fclose(fp);
-                }
-
-                char filename[512];
-                c16stombs(filename, data.cFileName, 511);
-
-                int index = SendMessage(icon_combo, CB_ADDSTRING, 0, (LPARAM) dispname);
-                SendMessage(icon_combo, CB_SETITEMDATA, index, (LPARAM) (strdup(filename)));
-
-                if (!strcmp(filename, icon_set))
-                    combo_index = index;
-            }
-        } while (FindNextFile(hFind, &data));
-        FindClose(hFind);
-    }
-
-    if (combo_index == -1) {
-        combo_index = 0;
-        strcpy(temp_icon_set, "");
-    }
-
-    SendMessage(icon_combo, CB_SETCURSEL, combo_index, 0);
-}
-
-/* This returns 1 if any variable has changed, 0 if not. */
-static int
-preferences_settings_changed(void)
-{
-    int i = 0;
-
-    /* Language */
-    i = i || has_language_changed(temp_language);
-    i = i || strcmp(temp_icon_set, icon_set);
-
-    return i;
-}
-
-/* IndexOf by ItemData */
-static int
-preferences_indexof(HWND combo, LPARAM itemdata)
-{
-    for (int i = 0; i < SendMessage(combo, CB_GETCOUNT, 0, 0); i++)
-        if (SendMessage(combo, CB_GETITEMDATA, i, 0) == itemdata)
-            return i;
-
-    return -1;
-}
-
-/* This saves the settings back to the global variables. */
-static void
-preferences_settings_save(void)
-{
-    /* Language */
-    set_language(temp_language);
-
-    /* Iconset */
-    strcpy(icon_set, temp_icon_set);
-    win_load_icon_set();
-
-    /* Update title bar */
-    update_mouse_msg();
-
-    /* Update status bar */
-    config_changed = 1;
-    ui_sb_set_ready(-1);
-    ui_sb_update_panes();
-    ui_sb_update_text();
-
-    /* Save the language changes */
-    config_save();
-}
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-PreferencesDlgProcedure(HWND hdlg, UINT message, WPARAM wParam, UNUSED(LPARAM lParam))
-{
-    switch (message) {
-        case WM_INITDIALOG:
-            hwndPreferences = hdlg;
-            /* Language */
-            temp_language = lang_id;
-            strcpy(temp_icon_set, icon_set);
-            preferences_fill_languages(hdlg);
-            preferences_fill_iconsets(hdlg);
-            break;
-
-        case WM_COMMAND:
-            switch (LOWORD(wParam)) {
-                case IDOK:
-                    if (preferences_settings_changed())
-                        preferences_settings_save();
-                    EndDialog(hdlg, 0);
-                    return TRUE;
-
-                case IDCANCEL:
-                    EndDialog(hdlg, 0);
-                    return TRUE;
-
-                case IDC_COMBO_LANG:
-                    if (HIWORD(wParam) == CBN_SELCHANGE) {
-                        HWND combo    = GetDlgItem(hdlg, IDC_COMBO_LANG);
-                        int  index    = SendMessage(combo, CB_GETCURSEL, 0, 0);
-                        temp_language = SendMessage(combo, CB_GETITEMDATA, index, 0);
-                    }
-                    break;
-
-                case IDC_COMBO_ICON:
-                    if (HIWORD(wParam) == CBN_SELCHANGE) {
-                        HWND combo = GetDlgItem(hdlg, IDC_COMBO_ICON);
-                        int  index = SendMessage(combo, CB_GETCURSEL, 0, 0);
-                        strcpy(temp_icon_set, (char *) SendMessage(combo, CB_GETITEMDATA, index, 0));
-                    }
-                    break;
-
-                case IDC_BUTTON_DEFAULT:
-                    {
-                        HWND combo = GetDlgItem(hdlg, IDC_COMBO_LANG);
-                        int  index = preferences_indexof(combo, DEFAULT_LANGUAGE);
-                        SendMessage(combo, CB_SETCURSEL, index, 0);
-                        temp_language = DEFAULT_LANGUAGE;
-                        break;
-                    }
-
-                case IDC_BUTTON_DEFICON:
-                    {
-                        SendMessage(GetDlgItem(hdlg, IDC_COMBO_ICON), CB_SETCURSEL, 0, 0);
-                        strcpy(temp_icon_set, "");
-                        break;
-                    }
-                default:
-                    break;
-            }
-            break;
-
-        case WM_DESTROY:
-            {
-                LRESULT temp;
-                HWND    combo = GetDlgItem(hdlg, IDC_COMBO_ICON);
-                for (int i = 0; i < SendMessage(combo, CB_GETCOUNT, 0, 0); i++) {
-                    temp = SendMessage(combo, CB_GETITEMDATA, i, 0);
-                    if (temp) {
-                        free((void *) temp);
-                        SendMessage(combo, CB_SETITEMDATA, i, 0);
-                    }
-                }
-            }
-            break;
-    }
-
-    return FALSE;
-}
-
-void
-PreferencesDlgCreate(HWND hwnd)
-{
-    DialogBox(hinstance, (LPCTSTR) DLG_PREFERENCES, hwnd, PreferencesDlgProcedure);
-}
diff --git a/src/win/win_sdl.c b/src/win/win_sdl.c
deleted file mode 100644
index ea9c8455d..000000000
--- a/src/win/win_sdl.c
+++ /dev/null
@@ -1,626 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Rendering module for libSDL2
- *
- * NOTE:    Given all the problems reported with FULLSCREEN use of SDL,
- *          we will not use that, but, instead, use a new window which
- *          covers the entire desktop.
- *
- *
- *
- * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
- *          Michael Drüing, <michael@drueing.de>
- *
- *          Copyright 2018-2020 Fred N. van Kempen.
- *          Copyright 2018-2020 Michael Drüing.
- *
- *      Redistribution and  use  in source  and binary forms, with
- *      or  without modification, are permitted  provided that the
- *      following conditions are met:
- *
- *      1. Redistributions of  source  code must retain the entire
- *         above notice, this list of conditions and the following
- *         disclaimer.
- *
- *      2. Redistributions in binary form must reproduce the above
- *         copyright  notice,  this list  of  conditions  and  the
- *         following disclaimer in  the documentation and/or other
- *         materials provided with the distribution.
- *
- *      3. Neither the  name of the copyright holder nor the names
- *         of  its  contributors may be used to endorse or promote
- *         products  derived from  this  software without specific
- *         prior written permission.
- *
- * THIS SOFTWARE  IS  PROVIDED BY THE  COPYRIGHT  HOLDERS AND CONTRIBUTORS
- * "AS IS" AND  ANY EXPRESS  OR  IMPLIED  WARRANTIES,  INCLUDING, BUT  NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE  ARE  DISCLAIMED. IN  NO  EVENT  SHALL THE COPYRIGHT
- * HOLDER OR  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL  DAMAGES  (INCLUDING,  BUT  NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE  GOODS OR SERVICES;  LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED  AND ON  ANY
- * THEORY OF  LIABILITY, WHETHER IN  CONTRACT, STRICT  LIABILITY, OR  TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#define UNICODE
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_error.h>
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-/* This #undef is needed because a SDL include header redefines HAVE_STDARG_H. */
-#undef HAVE_STDARG_H
-#define HAVE_STDARG_H
-#include <86box/86box.h>
-#include <86box/device.h>
-#include <86box/plat.h>
-#include <86box/plat_dynld.h>
-#include <86box/video.h>
-#include <86box/ui.h>
-#include <86box/win.h>
-#include <86box/win_sdl.h>
-#include <86box/version.h>
-
-#define RENDERER_FULL_SCREEN 1
-#define RENDERER_HARDWARE    2
-#define RENDERER_OPENGL      4
-
-static SDL_Window   *sdl_win         = NULL;
-static SDL_Renderer *sdl_render      = NULL;
-static SDL_Texture  *sdl_tex         = NULL;
-static HWND          sdl_parent_hwnd = NULL;
-static int           sdl_w;
-static int           sdl_h;
-static int           sdl_fs;
-static int           sdl_flags = -1;
-static int           cur_w;
-static int           cur_h;
-static int           cur_wx      = 0;
-static int           cur_wy      = 0;
-static int           cur_ww      = 0;
-static int           cur_wh      = 0;
-static volatile int  sdl_enabled = 0;
-static SDL_mutex    *sdl_mutex   = NULL;
-
-typedef struct
-{
-    const void  *magic;
-    Uint32       id;
-    char        *title;
-    SDL_Surface *icon;
-    int          x, y;
-    int          w, h;
-    int          min_w, min_h;
-    int          max_w, max_h;
-    Uint32       flags;
-    Uint32       last_fullscreen_flags;
-
-    /* Stored position and size for windowed mode */
-    SDL_Rect windowed;
-
-    SDL_DisplayMode fullscreen_mode;
-
-    float   brightness;
-    Uint16 *gamma;
-    Uint16 *saved_gamma; /* (just offset into gamma) */
-
-    SDL_Surface *surface;
-    SDL_bool     surface_valid;
-
-    SDL_bool is_hiding;
-    SDL_bool is_destroying;
-
-    void *shaper;
-
-    SDL_HitTest hit_test;
-    void       *hit_test_data;
-
-    void *data;
-
-    void *driverdata;
-
-    SDL_Window *prev;
-    SDL_Window *next;
-} SDL_Window_Ex;
-
-#ifdef ENABLE_SDL_LOG
-int sdl_do_log = ENABLE_SDL_LOG;
-
-static void
-sdl_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (sdl_do_log) {
-        va_start(ap, fmt);
-        pclog_ex(fmt, ap);
-        va_end(ap);
-    }
-}
-#else
-#    define sdl_log(fmt, ...)
-#endif
-
-static void
-sdl_integer_scale(double *d, double *g)
-{
-    double ratio;
-
-    if (*d > *g) {
-        ratio = floor(*d / *g);
-        *d    = *g * ratio;
-    } else {
-        ratio = ceil(*d / *g);
-        *d    = *g / ratio;
-    }
-}
-
-static void
-sdl_stretch(int *w, int *h, int *x, int *y)
-{
-    double hw;
-    double gw;
-    double hh;
-    double gh;
-    double dx;
-    double dy;
-    double dw;
-    double dh;
-    double gsr;
-    double hsr;
-
-    hw  = (double) sdl_w;
-    hh  = (double) sdl_h;
-    gw  = (double) *w;
-    gh  = (double) *h;
-    hsr = hw / hh;
-
-    switch (video_fullscreen_scale) {
-        default:
-        case FULLSCR_SCALE_FULL:
-            *w = sdl_w;
-            *h = sdl_h;
-            *x = 0;
-            *y = 0;
-            break;
-        case FULLSCR_SCALE_43:
-        case FULLSCR_SCALE_KEEPRATIO:
-            if (video_fullscreen_scale == FULLSCR_SCALE_43)
-                gsr = 4.0 / 3.0;
-            else
-                gsr = gw / gh;
-            if (gsr <= hsr) {
-                dw = hh * gsr;
-                dh = hh;
-            } else {
-                dw = hw;
-                dh = hw / gsr;
-            }
-            dx = (hw - dw) / 2.0;
-            dy = (hh - dh) / 2.0;
-            *w = (int) dw;
-            *h = (int) dh;
-            *x = (int) dx;
-            *y = (int) dy;
-            break;
-        case FULLSCR_SCALE_INT:
-            gsr = gw / gh;
-            if (gsr <= hsr) {
-                dw = hh * gsr;
-                dh = hh;
-            } else {
-                dw = hw;
-                dh = hw / gsr;
-            }
-            sdl_integer_scale(&dw, &gw);
-            sdl_integer_scale(&dh, &gh);
-            dx = (hw - dw) / 2.0;
-            dy = (hh - dh) / 2.0;
-            *w = (int) dw;
-            *h = (int) dh;
-            *x = (int) dx;
-            *y = (int) dy;
-            break;
-    }
-}
-
-static void
-sdl_blit(int x, int y, int w, int h, int monitor_index)
-{
-    SDL_Rect r_src;
-    int      ret;
-
-    if (!sdl_enabled || (x < 0) || (y < 0) || (w <= 0) || (h <= 0) || (w > 2048) || (h > 2048) || (buffer32 == NULL) || (sdl_render == NULL) || (sdl_tex == NULL) || monitor_index >= 1) {
-        video_blit_complete_monitor(monitor_index);
-        return;
-    }
-
-    SDL_LockMutex(sdl_mutex);
-
-    r_src.x = x;
-    r_src.y = y;
-    r_src.w = w;
-    r_src.h = h;
-    SDL_UpdateTexture(sdl_tex, &r_src, &(buffer32->line[y][x]), 2048 * sizeof(uint32_t));
-
-    if (monitors[0].mon_screenshots)
-        video_screenshot(buffer32->dat, x, y, 2048);
-
-    video_blit_complete();
-
-    SDL_RenderClear(sdl_render);
-
-    r_src.x = x;
-    r_src.y = y;
-    r_src.w = w;
-    r_src.h = h;
-
-    ret = SDL_RenderCopy(sdl_render, sdl_tex, &r_src, 0);
-    if (ret)
-        sdl_log("SDL: unable to copy texture to renderer (%s)\n", SDL_GetError());
-
-    SDL_RenderPresent(sdl_render);
-    SDL_UnlockMutex(sdl_mutex);
-}
-
-static void
-sdl_blit_ex(int x, int y, int w, int h, UNUSED(int monitor_index))
-{
-    SDL_Rect r_src;
-    void    *pixeldata;
-    int      pitch;
-    int      ret;
-
-    if (!sdl_enabled || (x < 0) || (y < 0) || (w <= 0) || (h <= 0) || (w > 2048) || (h > 2048) || (buffer32 == NULL) || (sdl_render == NULL) || (sdl_tex == NULL)) {
-        video_blit_complete();
-        return;
-    }
-
-    SDL_LockMutex(sdl_mutex);
-
-    SDL_LockTexture(sdl_tex, 0, &pixeldata, &pitch);
-
-    for (int row = 0; row < h; ++row)
-        video_copy(&(((uint8_t *) pixeldata)[row * 2048 * sizeof(uint32_t)]), &(buffer32->line[y + row][x]), w * sizeof(uint32_t));
-
-    if (monitors[0].mon_screenshots)
-        video_screenshot((uint32_t *) pixeldata, 0, 0, 2048);
-
-    SDL_UnlockTexture(sdl_tex);
-
-    video_blit_complete();
-
-    SDL_RenderClear(sdl_render);
-
-    r_src.x = 0;
-    r_src.y = 0;
-    r_src.w = w;
-    r_src.h = h;
-
-    ret = SDL_RenderCopy(sdl_render, sdl_tex, &r_src, 0);
-    if (ret)
-        sdl_log("SDL: unable to copy texture to renderer (%s)\n", SDL_GetError());
-
-    SDL_RenderPresent(sdl_render);
-    SDL_UnlockMutex(sdl_mutex);
-}
-
-static void
-sdl_destroy_window(void)
-{
-    if (sdl_win != NULL) {
-        SDL_DestroyWindow(sdl_win);
-        sdl_win = NULL;
-    }
-}
-
-static void
-sdl_destroy_texture(void)
-{
-    if (sdl_tex != NULL) {
-        SDL_DestroyTexture(sdl_tex);
-        sdl_tex = NULL;
-    }
-
-    /* SDL_DestroyRenderer also automatically destroys all associated textures. */
-    if (sdl_render != NULL) {
-        SDL_DestroyRenderer(sdl_render);
-        sdl_render = NULL;
-    }
-}
-
-void
-sdl_close(void)
-{
-    if (sdl_mutex != NULL)
-        SDL_LockMutex(sdl_mutex);
-
-    /* Unregister our renderer! */
-    video_setblit(NULL);
-
-    if (sdl_enabled)
-        sdl_enabled = 0;
-
-    if (sdl_mutex != NULL) {
-        SDL_DestroyMutex(sdl_mutex);
-        sdl_mutex = NULL;
-    }
-
-    sdl_destroy_texture();
-    sdl_destroy_window();
-    ImmAssociateContext(hwndMain, NULL);
-    SetFocus(hwndMain);
-
-    if (sdl_parent_hwnd != NULL) {
-        DestroyWindow(sdl_parent_hwnd);
-        sdl_parent_hwnd = NULL;
-    }
-
-    /* Quit. */
-    SDL_Quit();
-    sdl_flags = -1;
-}
-
-static int old_capture = 0;
-
-static void
-sdl_select_best_hw_driver(void)
-{
-    SDL_RendererInfo renderInfo;
-
-    for (int i = 0; i < SDL_GetNumRenderDrivers(); ++i) {
-        SDL_GetRenderDriverInfo(i, &renderInfo);
-        if (renderInfo.flags & SDL_RENDERER_ACCELERATED) {
-            SDL_SetHint(SDL_HINT_RENDER_DRIVER, renderInfo.name);
-            return;
-        }
-    }
-}
-
-static void
-sdl_init_texture(void)
-{
-    if (sdl_flags & RENDERER_HARDWARE) {
-        sdl_render = SDL_CreateRenderer(sdl_win, -1, SDL_RENDERER_ACCELERATED);
-        SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, video_filter_method ? "1" : "0");
-    } else
-        sdl_render = SDL_CreateRenderer(sdl_win, -1, SDL_RENDERER_SOFTWARE);
-
-    sdl_tex = SDL_CreateTexture(sdl_render, SDL_PIXELFORMAT_ARGB8888,
-                                SDL_TEXTUREACCESS_STREAMING, 2048, 2048);
-}
-
-static void
-sdl_reinit_texture(void)
-{
-    if (sdl_flags == -1)
-        return;
-
-    sdl_destroy_texture();
-    sdl_init_texture();
-}
-
-void
-sdl_set_fs(int fs)
-{
-    int  w = 0;
-    int  h = 0;
-    int  x = 0;
-    int  y = 0;
-    RECT rect;
-
-    SDL_LockMutex(sdl_mutex);
-    sdl_enabled = 0;
-
-    if (fs) {
-        ShowWindow(sdl_parent_hwnd, TRUE);
-        SetParent(hwndRender, sdl_parent_hwnd);
-        ShowWindow(hwndRender, TRUE);
-        MoveWindow(sdl_parent_hwnd, 0, 0, sdl_w, sdl_h, TRUE);
-
-        /* Show the window, make it topmost, and give it focus. */
-        w = unscaled_size_x;
-        h = efscrnsz_y;
-        sdl_stretch(&w, &h, &x, &y);
-        MoveWindow(hwndRender, x, y, w, h, TRUE);
-        ImmAssociateContext(sdl_parent_hwnd, NULL);
-        SetFocus(sdl_parent_hwnd);
-
-        /* Redirect RawInput to this new window. */
-        old_capture = mouse_capture;
-        GetWindowRect(hwndRender, &rect);
-        ClipCursor(&rect);
-        mouse_capture = 1;
-    } else {
-        SetParent(hwndRender, hwndMain);
-        ShowWindow(sdl_parent_hwnd, FALSE);
-        ShowWindow(hwndRender, TRUE);
-        ImmAssociateContext(hwndMain, NULL);
-        SetFocus(hwndMain);
-        mouse_capture = old_capture;
-
-        if (mouse_capture) {
-            GetWindowRect(hwndRender, &rect);
-            ClipCursor(&rect);
-        } else
-            ClipCursor(&oldclip);
-    }
-
-    sdl_fs = fs;
-
-    if (fs)
-        sdl_flags |= RENDERER_FULL_SCREEN;
-    else
-        sdl_flags &= ~RENDERER_FULL_SCREEN;
-
-#if 0
-    sdl_reinit_texture();
-#endif
-    sdl_enabled = 1;
-    SDL_UnlockMutex(sdl_mutex);
-}
-
-static int
-sdl_init_common(int flags)
-{
-    wchar_t     temp[128];
-    SDL_version ver;
-
-    sdl_log("SDL: init (flags=%d)\n", flags);
-
-    /* Get and log the version of the DLL we are using. */
-    SDL_GetVersion(&ver);
-    sdl_log("SDL: version %d.%d.%d\n", ver.major, ver.minor, ver.patch);
-
-    /* Initialize the SDL system. */
-    if (SDL_Init(SDL_INIT_VIDEO) < 0) {
-        sdl_log("SDL: initialization failed (%s)\n", SDL_GetError());
-        return 0;
-    }
-
-    if (flags & RENDERER_HARDWARE) {
-        if (flags & RENDERER_OPENGL)
-            SDL_SetHint(SDL_HINT_RENDER_DRIVER, "OpenGL");
-        else
-            sdl_select_best_hw_driver();
-    }
-
-    /* Get the size of the (current) desktop. */
-    sdl_w = GetSystemMetrics(SM_CXSCREEN);
-    sdl_h = GetSystemMetrics(SM_CYSCREEN);
-
-    /* Create the desktop-covering window. */
-    _swprintf(temp, L"%s v%s", EMU_NAME_W, EMU_VERSION_FULL_W);
-    sdl_parent_hwnd = CreateWindow(SDL_CLASS_NAME, temp, WS_POPUP, 0, 0, sdl_w, sdl_h,
-                                   HWND_DESKTOP, NULL, hinstance, NULL);
-    ShowWindow(sdl_parent_hwnd, FALSE);
-
-    sdl_flags = flags;
-
-    if (sdl_win == NULL) {
-        sdl_log("SDL: unable to CreateWindowFrom (%s)\n", SDL_GetError());
-    }
-
-    sdl_win = SDL_CreateWindowFrom((void *) hwndRender);
-    sdl_init_texture();
-    sdl_set_fs(video_fullscreen & 1);
-
-    /* Make sure we get a clean exit. */
-    atexit(sdl_close);
-
-    /* Register our renderer! */
-    video_setblit((video_grayscale || invert_display) ? sdl_blit_ex : sdl_blit);
-
-    sdl_enabled = 1;
-    sdl_mutex   = SDL_CreateMutex();
-
-    return 1;
-}
-
-int
-sdl_inits(UNUSED(HWND h))
-{
-    return sdl_init_common(0);
-}
-
-int
-sdl_inith(UNUSED(HWND h))
-{
-    return sdl_init_common(RENDERER_HARDWARE);
-}
-
-int
-sdl_initho(UNUSED(HWND h))
-{
-    return sdl_init_common(RENDERER_HARDWARE | RENDERER_OPENGL);
-}
-
-int
-sdl_pause(void)
-{
-    return 0;
-}
-
-void
-sdl_resize(int x, int y)
-{
-    int ww = 0;
-    int wh = 0;
-    int wx = 0;
-    int wy = 0;
-
-    if (video_fullscreen & 2)
-        return;
-
-    if ((x == cur_w) && (y == cur_h))
-        return;
-
-    SDL_LockMutex(sdl_mutex);
-
-    ww = x;
-    wh = y;
-
-    if (sdl_fs) {
-        sdl_stretch(&ww, &wh, &wx, &wy);
-        MoveWindow(hwndRender, wx, wy, ww, wh, TRUE);
-    }
-
-    cur_w = x;
-    cur_h = y;
-
-    cur_wx = wx;
-    cur_wy = wy;
-    cur_ww = ww;
-    cur_wh = wh;
-
-    SDL_SetWindowSize(sdl_win, cur_ww, cur_wh);
-    SDL_SetWindowPosition(sdl_win, cur_wx, cur_wy);
-
-    sdl_reinit_texture();
-
-    SDL_UnlockMutex(sdl_mutex);
-}
-
-void
-sdl_enable(int enable)
-{
-    if (sdl_flags == -1)
-        return;
-
-    SDL_LockMutex(sdl_mutex);
-    sdl_enabled = !!enable;
-
-    if (enable == 1) {
-        SDL_SetWindowSize(sdl_win, cur_ww, cur_wh);
-        sdl_reinit_texture();
-    }
-
-    SDL_UnlockMutex(sdl_mutex);
-}
-
-void
-sdl_reload(void)
-{
-    if (sdl_flags & RENDERER_HARDWARE) {
-        SDL_LockMutex(sdl_mutex);
-
-        SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, video_filter_method ? "1" : "0");
-        sdl_reinit_texture();
-
-        SDL_UnlockMutex(sdl_mutex);
-    }
-
-    video_setblit((video_grayscale || invert_display) ? sdl_blit_ex : sdl_blit);
-}
diff --git a/src/win/win_settings.c b/src/win/win_settings.c
deleted file mode 100644
index 139c387a8..000000000
--- a/src/win/win_settings.c
+++ /dev/null
@@ -1,5708 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Windows 86Box Settings dialog handler.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          David Hrdlička, <hrdlickadavid@outlook.com>
- *          Jasmine Iwanek, <jriwanek@gmail.com>
- *
- *          Copyright 2016-2019 Miran Grca.
- *          Copyright 2018-2019 David Hrdlička.
- *          Copyright 2021 Laci bá'
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-#define UNICODE
-#define BITMAP WINDOWS_BITMAP
-#include <windows.h>
-#include <windowsx.h>
-#include <uxtheme.h>
-#undef BITMAP
-#ifdef ENABLE_SETTINGS_LOG
-#    include <assert.h>
-#endif
-#include <commctrl.h>
-#include <inttypes.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/config.h>
-#include "cpu.h"
-#include <86box/mem.h>
-#include <86box/rom.h>
-#include <86box/device.h>
-#include <86box/timer.h>
-#include <86box/cassette.h>
-#include <86box/nvr.h>
-#include <86box/machine.h>
-#include <86box/gameport.h>
-#include <86box/isamem.h>
-#include <86box/isartc.h>
-#include <86box/lpt.h>
-#include <86box/mouse.h>
-#include <86box/serial.h>
-#include <86box/scsi.h>
-#include <86box/scsi_device.h>
-#include <86box/cdrom.h>
-#include <86box/hdd.h>
-#include <86box/hdc.h>
-#include <86box/hdc_ide.h>
-#include <86box/zip.h>
-#include <86box/mo.h>
-#include <86box/fdd.h>
-#include <86box/fdc.h>
-#include <86box/fdc_ext.h>
-#include <86box/thread.h>
-#include <86box/network.h>
-#include <86box/sound.h>
-#include <86box/midi.h>
-#include <86box/snd_mpu401.h>
-#include <86box/snd_opl.h>
-#include <86box/video.h>
-#include <86box/vid_xga_device.h>
-#include <86box/plat.h>
-#include <86box/ui.h>
-#include <86box/win.h>
-#include <86box/serial_passthrough.h>
-#include "../disk/minivhd/minivhd.h"
-
-/* Icon, Bus, File, C, H, S, Size, Speed */
-#define C_COLUMNS_HARD_DISKS    7
-
-#define C_COLUMNS_FLOPPY_DRIVES 3
-#define C_COLUMNS_CDROM_DRIVES  3
-#define C_COLUMNS_MO_DRIVES     2
-#define C_COLUMNS_ZIP_DRIVES    2
-
-static int first_cat = 0;
-
-/* Machine category */
-static int           temp_machine_type;
-static int           temp_machine;
-static int           temp_cpu;
-static int           temp_wait_states;
-static int           temp_fpu;
-static int           temp_sync;
-static cpu_family_t *temp_cpu_f;
-static uint32_t      temp_mem_size;
-#ifdef USE_DYNAREC
-static int temp_dynarec;
-#endif
-static int temp_fpu_softfloat;
-
-/* Video category */
-static int temp_gfxcard[2];
-static int temp_ibm8514;
-static int temp_voodoo;
-static int temp_xga;
-
-/* Input devices category */
-static int temp_mouse;
-static int temp_joystick;
-
-/* Sound category */
-static int temp_sound_card[SOUND_CARD_MAX];
-static int temp_midi_output_device;
-static int temp_midi_input_device;
-static int temp_mpu401;
-static int temp_float;
-static int temp_fm_driver;
-
-/* Network category */
-static int      temp_net_type[NET_CARD_MAX];
-static uint16_t temp_net_card[NET_CARD_MAX];
-static char     temp_pcap_dev[NET_CARD_MAX][128];
-
-/* Ports category */
-static int     temp_lpt_devices[PARALLEL_MAX];
-static uint8_t temp_serial[SERIAL_MAX];
-static uint8_t temp_lpt[PARALLEL_MAX];
-static int     temp_serial_passthrough_enabled[SERIAL_MAX];
-
-/* Other peripherals category */
-static int temp_fdc_card;
-static int temp_hdc;
-static int temp_ide_ter;
-static int temp_ide_qua;
-static int temp_cassette;
-static int temp_scsi_card[SCSI_BUS_MAX];
-static int temp_bugger;
-static int temp_postcard;
-static int temp_isartc;
-static int temp_isamem[ISAMEM_MAX];
-
-static uint8_t temp_deviceconfig;
-
-/* Hard disks category */
-static hard_disk_t temp_hdd[HDD_NUM];
-
-/* Floppy drives category */
-static int temp_fdd_types[FDD_NUM];
-static int temp_fdd_turbo[FDD_NUM];
-static int temp_fdd_check_bpb[FDD_NUM];
-
-/* Other removable devices category */
-static cdrom_t     temp_cdrom[CDROM_NUM];
-static zip_drive_t temp_zip_drives[ZIP_NUM];
-static mo_drive_t  temp_mo_drives[MO_NUM];
-
-static HWND hwndParentDialog;
-static HWND hwndChildDialog;
-
-static uint32_t displayed_category = 0;
-
-extern int is486;
-static int listtomachinetype[256];
-static int listtomachine[256];
-static int listtocpufamily[256];
-static int listtocpu[256];
-static int settings_list_to_device[2][256];
-static int settings_list_to_fdc[20];
-static int settings_list_to_midi[20];
-static int settings_list_to_midi_in[20];
-static int settings_list_to_hdc[20];
-
-static int      max_spt = 63;
-static int      max_hpc = 255;
-static int      max_tracks = 266305;
-static uint64_t mfm_tracking;
-static uint64_t esdi_tracking;
-static uint64_t xta_tracking;
-static uint64_t ide_tracking;
-static uint64_t scsi_tracking[8];
-static uint64_t size;
-static int      hd_listview_items;
-static int      hdc_id_to_listview_index[HDD_NUM];
-static int      no_update = 0;
-static int      existing = 0;
-static int      chs_enabled = 0;
-static int      lv1_current_sel;
-static int      lv2_current_sel;
-static int      hard_disk_added = 0;
-static int      next_free_id = 0;
-static int      selection = 127;
-static int      spt;
-static int      hpc;
-static int      tracks;
-static int      ignore_change = 0;
-
-static hard_disk_t  new_hdd;
-static hard_disk_t *hdd_ptr;
-
-static wchar_t hd_file_name[512];
-static WCHAR   device_name[512];
-
-static int
-settings_get_check(HWND hdlg, int id)
-{
-    return SendMessage(GetDlgItem(hdlg, id), BM_GETCHECK, 0, 0);
-}
-
-static int
-settings_get_cur_sel(HWND hdlg, int id)
-{
-    return SendMessage(GetDlgItem(hdlg, id), CB_GETCURSEL, 0, 0);
-}
-
-static void
-settings_set_check(HWND hdlg, int id, int val)
-{
-    SendMessage(GetDlgItem(hdlg, id), BM_SETCHECK, val, 0);
-}
-
-static void
-settings_set_cur_sel(HWND hdlg, int id, int val)
-{
-    SendMessage(GetDlgItem(hdlg, id), CB_SETCURSEL, val, 0);
-}
-
-static void
-settings_reset_content(HWND hdlg, int id)
-{
-    SendMessage(GetDlgItem(hdlg, id), CB_RESETCONTENT, 0, 0);
-}
-
-static void
-settings_add_string(HWND hdlg, int id, LPARAM string)
-{
-    SendMessage(GetDlgItem(hdlg, id), CB_ADDSTRING, 0, string);
-}
-
-static void
-settings_enable_window(HWND hdlg, int id, int condition)
-{
-    EnableWindow(GetDlgItem(hdlg, id), condition ? TRUE : FALSE);
-}
-
-static void
-settings_show_window(HWND hdlg, int id, int condition)
-{
-    HWND h;
-
-    h = GetDlgItem(hdlg, id);
-    EnableWindow(h, condition ? TRUE : FALSE);
-    ShowWindow(h, condition ? SW_SHOW : SW_HIDE);
-}
-
-static void
-settings_listview_enable_styles(HWND hdlg, int id)
-{
-    HWND h;
-
-    h = GetDlgItem(hdlg, id);
-    SetWindowTheme(h, L"Explorer", NULL);
-    ListView_SetExtendedListViewStyle(h, LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER);
-}
-
-static void
-settings_listview_select(HWND hdlg, int id, int selection)
-{
-    HWND h;
-
-    h = GetDlgItem(hdlg, id);
-    ListView_SetItemState(h, selection, LVIS_FOCUSED | LVIS_SELECTED, 0x000F);
-}
-
-static void
-settings_process_messages(void)
-{
-    MSG msg;
-    while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD)) {
-        TranslateMessage(&msg);
-        DispatchMessage(&msg);
-    }
-}
-
-static BOOL
-image_list_init(HWND hdlg, int id, const uint8_t *icon_ids)
-{
-    HICON      hiconItem;
-    HIMAGELIST hSmall;
-    HWND       hwndList = GetDlgItem(hdlg, id);
-
-    int i = 0;
-
-    hSmall = ListView_GetImageList(hwndList, LVSIL_SMALL);
-    if (hSmall != 0)
-        ImageList_Destroy(hSmall);
-
-    hSmall = ImageList_Create(win_get_system_metrics(SM_CXSMICON, dpi),
-                              win_get_system_metrics(SM_CYSMICON, dpi),
-                              ILC_MASK | ILC_COLOR32, 1, 1);
-
-    while (1) {
-        if (icon_ids[i] == 0)
-            break;
-
-        hiconItem = hIcon[icon_ids[i]];
-        ImageList_AddIcon(hSmall, hiconItem);
-
-        i++;
-    }
-
-    ListView_SetImageList(hwndList, hSmall, LVSIL_SMALL);
-
-    return TRUE;
-}
-
-/* Show a MessageBox dialog.  This is nasty, I know.  --FvK */
-static int
-settings_msgbox_header(int flags, void *header, void *message)
-{
-    HWND h;
-    int  i;
-
-    h        = hwndMain;
-    hwndMain = hwndParentDialog;
-
-    i = ui_msgbox_header(flags, header, message);
-
-    hwndMain = h;
-
-    return i;
-}
-
-static int
-settings_msgbox_ex(int flags, void *header, void *message, void *btn1, void *btn2, void *btn3)
-{
-    HWND h;
-    int  i;
-
-    h        = hwndMain;
-    hwndMain = hwndParentDialog;
-
-    i = ui_msgbox_ex(flags, header, message, btn1, btn2, btn3);
-
-    hwndMain = h;
-
-    return i;
-}
-
-/* This does the initial read of global variables into the temporary ones. */
-static void
-win_settings_init(void)
-{
-    int i = 0;
-
-    /* Machine category */
-    temp_machine_type = machine_get_type(machine);
-    temp_machine      = machine;
-    temp_cpu_f        = cpu_f;
-    temp_wait_states  = cpu_waitstates;
-    temp_cpu          = cpu;
-    temp_mem_size     = mem_size;
-#ifdef USE_DYNAREC
-    temp_dynarec = cpu_use_dynarec;
-#endif
-    temp_fpu_softfloat = fpu_softfloat;
-    temp_fpu  = fpu_type;
-    temp_sync = time_sync;
-
-    /* Video category */
-    temp_gfxcard[0] = gfxcard[0];
-    temp_gfxcard[1] = gfxcard[1];
-    temp_voodoo     = voodoo_enabled;
-    temp_ibm8514    = ibm8514_standalone_enabled;
-    temp_xga        = xga_standalone_enabled;
-
-    /* Input devices category */
-    temp_mouse    = mouse_type;
-    temp_joystick = joystick_type;
-
-    /* Sound category */
-    for (i = 0; i < SOUND_CARD_MAX; i++)
-        temp_sound_card[i] = sound_card_current[i];
-    temp_midi_output_device = midi_output_device_current;
-    temp_midi_input_device  = midi_input_device_current;
-    temp_mpu401             = mpu401_standalone_enable;
-    temp_float              = sound_is_float;
-    temp_fm_driver          = fm_driver;
-
-    /* Network category */
-    for (i = 0; i < NET_CARD_MAX; i++) {
-        temp_net_type[i] = net_cards_conf[i].net_type;
-        memset(temp_pcap_dev[i], 0, sizeof(temp_pcap_dev[i]));
-#ifdef ENABLE_SETTINGS_LOG
-        assert(sizeof(temp_pcap_dev[i]) == sizeof(net_cards_conf[i].host_dev_name));
-#endif
-        memcpy(temp_pcap_dev[i], net_cards_conf[i].host_dev_name, sizeof(net_cards_conf[i].host_dev_name));
-        temp_net_card[i] = net_cards_conf[i].device_num;
-    }
-
-    /* Ports category */
-    for (i = 0; i < PARALLEL_MAX; i++) {
-        temp_lpt_devices[i] = lpt_ports[i].device;
-        temp_lpt[i]         = lpt_ports[i].enabled;
-    }
-    for (i = 0; i < SERIAL_MAX; i++) {
-        temp_serial[i]                     = com_ports[i].enabled;
-        temp_serial_passthrough_enabled[i] = serial_passthrough_enabled[i];
-    }
-
-    /* Storage devices category */
-    for (i = 0; i < SCSI_BUS_MAX; i++)
-        temp_scsi_card[i] = scsi_card_current[i];
-    temp_fdc_card = fdc_type;
-    temp_hdc      = hdc_current;
-    temp_ide_ter  = ide_ter_enabled;
-    temp_ide_qua  = ide_qua_enabled;
-    temp_cassette = cassette_enable;
-
-    mfm_tracking = xta_tracking = esdi_tracking = ide_tracking = 0;
-    for (i = 0; i < SCSI_LUN_MAX; i++)
-        scsi_tracking[i] = 0;
-
-    /* Hard disks category */
-    memcpy(temp_hdd, hdd, HDD_NUM * sizeof(hard_disk_t));
-    for (i = 0; i < HDD_NUM; i++) {
-        if (hdd[i].bus == HDD_BUS_MFM)
-            mfm_tracking |= (1 << (hdd[i].mfm_channel << 3));
-        else if (hdd[i].bus == HDD_BUS_XTA)
-            xta_tracking |= (1 << (hdd[i].xta_channel << 3));
-        else if (hdd[i].bus == HDD_BUS_ESDI)
-            esdi_tracking |= (1 << (hdd[i].esdi_channel << 3));
-        else if ((hdd[i].bus == HDD_BUS_IDE) || (hdd[i].bus == HDD_BUS_ATAPI))
-            ide_tracking |= (1 << (hdd[i].ide_channel << 3));
-        else if (hdd[i].bus == HDD_BUS_SCSI)
-            scsi_tracking[hdd[i].scsi_id >> 3] |= (1 << ((hdd[i].scsi_id & 0x07) << 3));
-    }
-
-    /* Floppy drives category */
-    for (i = 0; i < FDD_NUM; i++) {
-        temp_fdd_types[i]     = fdd_get_type(i);
-        temp_fdd_turbo[i]     = fdd_get_turbo(i);
-        temp_fdd_check_bpb[i] = fdd_get_check_bpb(i);
-    }
-
-    /* Other removable devices category */
-    memcpy(temp_cdrom, cdrom, CDROM_NUM * sizeof(cdrom_t));
-    for (i = 0; i < CDROM_NUM; i++) {
-        if (cdrom[i].bus_type == CDROM_BUS_ATAPI)
-            ide_tracking |= (2 << (cdrom[i].ide_channel << 3));
-        else if (cdrom[i].bus_type == CDROM_BUS_SCSI)
-            scsi_tracking[cdrom[i].scsi_device_id >> 3] |= (1 << ((cdrom[i].scsi_device_id & 0x07) << 3));
-    }
-    memcpy(temp_zip_drives, zip_drives, ZIP_NUM * sizeof(zip_drive_t));
-    for (i = 0; i < ZIP_NUM; i++) {
-        if (zip_drives[i].bus_type == ZIP_BUS_ATAPI)
-            ide_tracking |= (4 << (zip_drives[i].ide_channel << 3));
-        else if (zip_drives[i].bus_type == ZIP_BUS_SCSI)
-            scsi_tracking[zip_drives[i].scsi_device_id >> 3] |= (1 << ((zip_drives[i].scsi_device_id & 0x07) << 3));
-    }
-    memcpy(temp_mo_drives, mo_drives, MO_NUM * sizeof(mo_drive_t));
-    for (i = 0; i < MO_NUM; i++) {
-        if (mo_drives[i].bus_type == MO_BUS_ATAPI)
-            ide_tracking |= (1 << (mo_drives[i].ide_channel << 3));
-        else if (mo_drives[i].bus_type == MO_BUS_SCSI)
-            scsi_tracking[mo_drives[i].scsi_device_id >> 3] |= (1 << ((mo_drives[i].scsi_device_id & 0x07) << 3));
-    }
-
-    /* Other peripherals category */
-    temp_bugger   = bugger_enabled;
-    temp_postcard = postcard_enabled;
-    temp_isartc   = isartc_type;
-
-    /* ISA memory boards. */
-    for (i = 0; i < ISAMEM_MAX; i++)
-        temp_isamem[i] = isamem_type[i];
-
-    temp_deviceconfig = 0;
-}
-
-/* This returns 1 if any variable has changed, 0 if not. */
-static int
-win_settings_changed(void)
-{
-    int i = 0;
-
-    /* Machine category */
-    i = i || (machine != temp_machine);
-    i = i || (cpu_f != temp_cpu_f);
-    i = i || (cpu_waitstates != temp_wait_states);
-    i = i || (cpu != temp_cpu);
-    i = i || (mem_size != temp_mem_size);
-#ifdef USE_DYNAREC
-    i = i || (temp_dynarec != cpu_use_dynarec);
-#endif
-    i = i || (temp_fpu_softfloat != fpu_softfloat);
-    i = i || (temp_fpu != fpu_type);
-    i = i || (temp_sync != time_sync);
-
-    /* Video category */
-    i = i || (gfxcard[0] != temp_gfxcard[0]);
-    i = i || (gfxcard[1] != temp_gfxcard[1]);
-    i = i || (voodoo_enabled != temp_voodoo);
-    i = i || (ibm8514_standalone_enabled != temp_ibm8514);
-    i = i || (xga_standalone_enabled != temp_xga);
-
-    /* Input devices category */
-    i = i || (mouse_type != temp_mouse);
-    i = i || (joystick_type != temp_joystick);
-
-    /* Sound category */
-    for (uint8_t j = 0; j < SOUND_CARD_MAX; j++)
-        i = i || (sound_card_current[j] != temp_sound_card[j]);
-    i = i || (midi_output_device_current != temp_midi_output_device);
-    i = i || (midi_input_device_current != temp_midi_input_device);
-    i = i || (mpu401_standalone_enable != temp_mpu401);
-    i = i || (sound_is_float != temp_float);
-    i = i || (fm_driver != temp_fm_driver);
-
-    /* Network category */
-    for (uint8_t j = 0; j < NET_CARD_MAX; j++) {
-        i = i || (net_cards_conf[j].net_type != temp_net_type[j]);
-        i = i || strcmp(temp_pcap_dev[j], net_cards_conf[j].host_dev_name);
-        i = i || (net_cards_conf[j].device_num != temp_net_card[j]);
-    }
-
-    /* Ports category */
-    for (uint8_t j = 0; j < PARALLEL_MAX; j++) {
-        i = i || (temp_lpt_devices[j] != lpt_ports[j].device);
-        i = i || (temp_lpt[j] != lpt_ports[j].enabled);
-    }
-    for (uint8_t j = 0; j < SERIAL_MAX; j++) {
-        i = i || (temp_serial[j] != com_ports[j].enabled);
-        i = i || (temp_serial_passthrough_enabled[i] != serial_passthrough_enabled[i]);
-    }
-
-    /* Storage devices category */
-    for (uint8_t j = 0; j < SCSI_BUS_MAX; j++)
-        i = i || (temp_scsi_card[j] != scsi_card_current[j]);
-    i = i || (fdc_type != temp_fdc_card);
-    i = i || (hdc_current != temp_hdc);
-    i = i || (temp_ide_ter != ide_ter_enabled);
-    i = i || (temp_ide_qua != ide_qua_enabled);
-    i = i || (temp_cassette != cassette_enable);
-
-    /* Hard disks category */
-    i = i || memcmp(hdd, temp_hdd, HDD_NUM * sizeof(hard_disk_t));
-
-    /* Floppy drives category */
-    for (uint8_t j = 0; j < FDD_NUM; j++) {
-        i = i || (temp_fdd_types[j] != fdd_get_type(j));
-        i = i || (temp_fdd_turbo[j] != fdd_get_turbo(j));
-        i = i || (temp_fdd_check_bpb[j] != fdd_get_check_bpb(j));
-    }
-
-    /* Other removable devices category */
-    i = i || memcmp(cdrom, temp_cdrom, CDROM_NUM * sizeof(cdrom_t));
-    i = i || memcmp(zip_drives, temp_zip_drives, ZIP_NUM * sizeof(zip_drive_t));
-    i = i || memcmp(mo_drives, temp_mo_drives, MO_NUM * sizeof(mo_drive_t));
-
-    /* Other peripherals category */
-    i = i || (temp_bugger != bugger_enabled);
-    i = i || (temp_postcard != postcard_enabled);
-    i = i || (temp_isartc != isartc_type);
-
-    /* ISA memory boards. */
-    for (uint8_t j = 0; j < ISAMEM_MAX; j++)
-        i = i || (temp_isamem[j] != isamem_type[j]);
-
-    i = i || !!temp_deviceconfig;
-
-    return i;
-}
-
-/* This saves the settings back to the global variables. */
-static void
-win_settings_save(void)
-{
-    pc_reset_hard_close();
-
-    /* Machine category */
-    machine        = temp_machine;
-    cpu_f          = temp_cpu_f;
-    cpu_waitstates = temp_wait_states;
-    cpu            = temp_cpu;
-    mem_size       = temp_mem_size;
-#ifdef USE_DYNAREC
-    cpu_use_dynarec = temp_dynarec;
-#endif
-    fpu_softfloat  = temp_fpu_softfloat;
-    fpu_type  = temp_fpu;
-    time_sync = temp_sync;
-
-    /* Video category */
-    gfxcard[0]                 = temp_gfxcard[0];
-    gfxcard[1]                 = temp_gfxcard[1];
-    voodoo_enabled             = temp_voodoo;
-    ibm8514_standalone_enabled = temp_ibm8514;
-    xga_standalone_enabled     = temp_xga;
-
-    /* Input devices category */
-    mouse_type    = temp_mouse;
-    joystick_type = temp_joystick;
-
-    /* Sound category */
-    for (uint8_t i = 0; i < SOUND_CARD_MAX; i++)
-        sound_card_current[i] = temp_sound_card[i];
-    midi_output_device_current = temp_midi_output_device;
-    midi_input_device_current  = temp_midi_input_device;
-    mpu401_standalone_enable   = temp_mpu401;
-    sound_is_float             = temp_float;
-    fm_driver                  = temp_fm_driver;
-
-    /* Network category */
-    for (uint8_t i = 0; i < NET_CARD_MAX; i++) {
-        net_cards_conf[i].net_type = temp_net_type[i];
-        memset(net_cards_conf[i].host_dev_name, '\0', sizeof(net_cards_conf[i].host_dev_name));
-        strcpy(net_cards_conf[i].host_dev_name, temp_pcap_dev[i]);
-        net_cards_conf[i].device_num = temp_net_card[i];
-    }
-
-    /* Ports category */
-    for (uint8_t i = 0; i < PARALLEL_MAX; i++) {
-        lpt_ports[i].device  = temp_lpt_devices[i];
-        lpt_ports[i].enabled = temp_lpt[i];
-    }
-    for (uint8_t i = 0; i < SERIAL_MAX; i++) {
-        com_ports[i].enabled          = temp_serial[i];
-        serial_passthrough_enabled[i] = temp_serial_passthrough_enabled[i];
-    }
-
-    /* Storage devices category */
-    for (uint8_t i = 0; i < SCSI_BUS_MAX; i++)
-        scsi_card_current[i] = temp_scsi_card[i];
-    hdc_current     = temp_hdc;
-    fdc_type        = temp_fdc_card;
-    ide_ter_enabled = temp_ide_ter;
-    ide_qua_enabled = temp_ide_qua;
-    cassette_enable = temp_cassette;
-
-    /* Hard disks category */
-    memcpy(hdd, temp_hdd, HDD_NUM * sizeof(hard_disk_t));
-    for (uint8_t i = 0; i < HDD_NUM; i++)
-        hdd[i].priv = NULL;
-
-    /* Floppy drives category */
-    for (uint8_t i = 0; i < FDD_NUM; i++) {
-        fdd_set_type(i, temp_fdd_types[i]);
-        fdd_set_turbo(i, temp_fdd_turbo[i]);
-        fdd_set_check_bpb(i, temp_fdd_check_bpb[i]);
-    }
-
-    /* Removable devices category */
-    memcpy(cdrom, temp_cdrom, CDROM_NUM * sizeof(cdrom_t));
-    for (uint8_t i = 0; i < CDROM_NUM; i++) {
-        cdrom[i].is_dir      = 0;
-        cdrom[i].priv        = NULL;
-        cdrom[i].ops         = NULL;
-        cdrom[i].image       = NULL;
-        cdrom[i].insert      = NULL;
-        cdrom[i].close       = NULL;
-        cdrom[i].get_volume  = NULL;
-        cdrom[i].get_channel = NULL;
-    }
-    memcpy(zip_drives, temp_zip_drives, ZIP_NUM * sizeof(zip_drive_t));
-    for (uint8_t i = 0; i < ZIP_NUM; i++) {
-        zip_drives[i].fp   = NULL;
-        zip_drives[i].priv = NULL;
-    }
-    memcpy(mo_drives, temp_mo_drives, MO_NUM * sizeof(mo_drive_t));
-    for (uint8_t i = 0; i < MO_NUM; i++) {
-        mo_drives[i].fp   = NULL;
-        mo_drives[i].priv = NULL;
-    }
-
-    /* Other peripherals category */
-    bugger_enabled   = temp_bugger;
-    postcard_enabled = temp_postcard;
-    isartc_type      = temp_isartc;
-
-    /* ISA memory boards. */
-    for (uint8_t i = 0; i < ISAMEM_MAX; i++)
-        isamem_type[i] = temp_isamem[i];
-
-    /* Mark configuration as changed. */
-    config_changed = 2;
-
-    pc_reset_hard_init();
-}
-
-static void
-win_settings_machine_recalc_softfloat(HWND hdlg)
-{
-    if (temp_fpu == FPU_NONE) {
-        settings_set_check(hdlg, IDC_CHECK_SOFTFLOAT, FALSE);
-        settings_enable_window(hdlg, IDC_CHECK_SOFTFLOAT, FALSE);
-    } else {
-        settings_set_check(hdlg, IDC_CHECK_SOFTFLOAT, (machine_has_flags(temp_machine, MACHINE_SOFTFLOAT_ONLY) ? TRUE : temp_fpu_softfloat));
-        settings_enable_window(hdlg, IDC_CHECK_SOFTFLOAT, (machine_has_flags(temp_machine, MACHINE_SOFTFLOAT_ONLY) ? FALSE : TRUE));
-    }
-}
-
-static void
-win_settings_machine_recalc_fpu(HWND hdlg)
-{
-    int         c;
-    int         type;
-    LPTSTR      lptsTemp;
-    const char *stransi;
-
-    lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
-
-    settings_reset_content(hdlg, IDC_COMBO_FPU);
-    c = 0;
-    while (1) {
-        stransi = fpu_get_name_from_index(temp_cpu_f, temp_cpu, c);
-        type    = fpu_get_type_from_index(temp_cpu_f, temp_cpu, c);
-        if (!stransi)
-            break;
-
-        mbstowcs(lptsTemp, stransi, strlen(stransi) + 1);
-        settings_add_string(hdlg, IDC_COMBO_FPU, (LPARAM) (LPCSTR) lptsTemp);
-        if (!c || (type == temp_fpu))
-            settings_set_cur_sel(hdlg, IDC_COMBO_FPU, c);
-
-        c++;
-    }
-
-    settings_enable_window(hdlg, IDC_COMBO_FPU, c > 1);
-
-    temp_fpu = fpu_get_type_from_index(temp_cpu_f, temp_cpu, settings_get_cur_sel(hdlg, IDC_COMBO_FPU));
-
-    win_settings_machine_recalc_softfloat(hdlg);
-}
-
-static void
-win_settings_machine_recalc_cpu(HWND hdlg)
-{
-    int cpu_type;
-#ifdef USE_DYNAREC
-    int cpu_flags;
-#endif
-
-    cpu_type = temp_cpu_f->cpus[temp_cpu].cpu_type;
-    settings_enable_window(hdlg, IDC_COMBO_WS, (cpu_type >= CPU_286) && (cpu_type <= CPU_386DX));
-
-#ifdef USE_DYNAREC
-    cpu_flags = temp_cpu_f->cpus[temp_cpu].cpu_flags;
-    if (!(cpu_flags & CPU_SUPPORTS_DYNAREC) && (cpu_flags & CPU_REQUIRES_DYNAREC))
-        fatal("Attempting to select a CPU that requires the recompiler and does not support it at the same time\n");
-    if (!(cpu_flags & CPU_SUPPORTS_DYNAREC) || ((cpu_flags & CPU_REQUIRES_DYNAREC) && !cpu_override)) {
-        if (!(cpu_flags & CPU_SUPPORTS_DYNAREC))
-            temp_dynarec = 0;
-        if (cpu_flags & CPU_REQUIRES_DYNAREC)
-            temp_dynarec = 1;
-        settings_set_check(hdlg, IDC_CHECK_DYNAREC, temp_dynarec);
-        settings_enable_window(hdlg, IDC_CHECK_DYNAREC, FALSE);
-    } else {
-        settings_set_check(hdlg, IDC_CHECK_DYNAREC, temp_dynarec);
-        settings_enable_window(hdlg, IDC_CHECK_DYNAREC, TRUE);
-    }
-#endif
-
-    win_settings_machine_recalc_fpu(hdlg);
-}
-
-static void
-win_settings_machine_recalc_cpu_m(HWND hdlg)
-{
-    int          c;
-    int          i;
-    int          first_eligible = -1;
-    int          current_eligible = 0;
-    int          last_eligible = 0;
-    LPTSTR       lptsTemp;
-    const char  *stransi;
-
-    lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
-
-    settings_reset_content(hdlg, IDC_COMBO_CPU_SPEED);
-    c = i = 0;
-    while (temp_cpu_f->cpus[c].cpu_type != 0) {
-        if (cpu_is_eligible(temp_cpu_f, c, temp_machine)) {
-            stransi = (char *) temp_cpu_f->cpus[c].name;
-            mbstowcs(lptsTemp, stransi, strlen(stransi) + 1);
-            settings_add_string(hdlg, IDC_COMBO_CPU_SPEED, (LPARAM) (LPCSTR) lptsTemp);
-
-            if (first_eligible == -1)
-                first_eligible = i;
-            if (temp_cpu == c)
-                current_eligible = i;
-            last_eligible = i;
-
-            listtocpu[i++] = c;
-        }
-        c++;
-    }
-    if (i == 0)
-        fatal("No eligible CPUs for the selected family\n");
-    settings_enable_window(hdlg, IDC_COMBO_CPU_SPEED, i != 1);
-    if (current_eligible < first_eligible)
-        current_eligible = first_eligible;
-    else if (current_eligible > last_eligible)
-        current_eligible = last_eligible;
-    temp_cpu = listtocpu[current_eligible];
-    settings_set_cur_sel(hdlg, IDC_COMBO_CPU_SPEED, current_eligible);
-
-    win_settings_machine_recalc_cpu(hdlg);
-
-    free(lptsTemp);
-}
-
-static void
-win_settings_machine_recalc_machine(HWND hdlg)
-{
-    HWND            h;
-    int             c;
-    int             i;
-    int             current_eligible;
-    LPTSTR          lptsTemp;
-    char           *stransi;
-    UDACCEL         accel;
-    const device_t *d;
-
-    lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
-
-    d = (device_t *) machine_get_device(temp_machine);
-    settings_enable_window(hdlg, IDC_CONFIGURE_MACHINE, d && d->config);
-
-    settings_reset_content(hdlg, IDC_COMBO_CPU_TYPE);
-    c = i            = 0;
-    current_eligible = -1;
-    while (cpu_families[c].package != 0) {
-        if (cpu_family_is_eligible(&cpu_families[c], temp_machine)) {
-            stransi = malloc(strlen((char *) cpu_families[c].manufacturer) + strlen((char *) cpu_families[c].name) + 2);
-            sprintf(stransi, "%s %s", (char *) cpu_families[c].manufacturer, (char *) cpu_families[c].name);
-            mbstowcs(lptsTemp, stransi, strlen(stransi) + 1);
-            free(stransi);
-            settings_add_string(hdlg, IDC_COMBO_CPU_TYPE, (LPARAM) (LPCSTR) lptsTemp);
-            if (&cpu_families[c] == temp_cpu_f)
-                current_eligible = i;
-            listtocpufamily[i++] = c;
-        }
-        c++;
-    }
-    if (i == 0)
-        fatal("No eligible CPU families for the selected machine\n");
-    settings_enable_window(hdlg, IDC_COMBO_CPU_TYPE, TRUE);
-    if (current_eligible == -1) {
-        temp_cpu_f = (cpu_family_t *) &cpu_families[listtocpufamily[0]];
-        settings_set_cur_sel(hdlg, IDC_COMBO_CPU_TYPE, 0);
-    } else {
-        settings_set_cur_sel(hdlg, IDC_COMBO_CPU_TYPE, current_eligible);
-    }
-    settings_enable_window(hdlg, IDC_COMBO_CPU_TYPE, i != 1);
-
-    win_settings_machine_recalc_cpu_m(hdlg);
-
-    if (machine_get_ram_granularity(temp_machine) & 1023) {
-        /* KB granularity */
-        h = GetDlgItem(hdlg, IDC_MEMSPIN);
-        SendMessage(h, UDM_SETRANGE, 0, (machine_get_min_ram(temp_machine) << 16) | machine_get_max_ram(temp_machine));
-
-        accel.nSec = 0;
-        accel.nInc = machine_get_ram_granularity(temp_machine);
-        SendMessage(h, UDM_SETACCEL, 1, (LPARAM) &accel);
-
-        SendMessage(h, UDM_SETPOS, 0, temp_mem_size);
-
-        h = GetDlgItem(hdlg, IDC_TEXT_MB);
-        SendMessage(h, WM_SETTEXT, 0, win_get_string(IDS_KB));
-    } else {
-        /* MB granularity */
-        h = GetDlgItem(hdlg, IDC_MEMSPIN);
-        SendMessage(h, UDM_SETRANGE, 0, (machine_get_min_ram(temp_machine) << 6) | (machine_get_max_ram(temp_machine) >> 10));
-
-        accel.nSec = 0;
-        accel.nInc = machine_get_ram_granularity(temp_machine) >> 10;
-
-        SendMessage(h, UDM_SETACCEL, 1, (LPARAM) &accel);
-
-        SendMessage(h, UDM_SETPOS, 0, temp_mem_size >> 10);
-
-        h = GetDlgItem(hdlg, IDC_TEXT_MB);
-        SendMessage(h, WM_SETTEXT, 0, win_get_string(IDS_MB));
-    }
-
-    settings_enable_window(hdlg, IDC_MEMSPIN, machine_get_min_ram(temp_machine) != machine_get_max_ram(temp_machine));
-    settings_enable_window(hdlg, IDC_MEMTEXT, machine_get_min_ram(temp_machine) != machine_get_max_ram(temp_machine));
-
-    free(lptsTemp);
-}
-
-static char *
-machine_type_get_internal_name(int id)
-{
-    if (id < MACHINE_TYPE_MAX)
-        return "";
-    else
-        return NULL;
-}
-
-int
-machine_type_available(int id)
-{
-    int c = 0;
-
-    if ((id > 0) && (id < MACHINE_TYPE_MAX)) {
-        while (machine_get_internal_name_ex(c) != NULL) {
-            if (machine_available(c) && (machine_get_type(c) == id))
-                return 1;
-            c++;
-        }
-    }
-
-    return 0;
-}
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-win_settings_machine_proc(HWND hdlg, UINT message, WPARAM wParam, UNUSED(LPARAM lParam))
-{
-    HWND   h;
-    HWND   h2;
-    int    c;
-    int    d;
-    int    old_machine_type;
-    LPTSTR lptsTemp;
-    char  *stransi;
-
-    switch (message) {
-        case WM_INITDIALOG:
-            lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
-
-            c = d = 0;
-            settings_reset_content(hdlg, IDC_COMBO_MACHINE_TYPE);
-            memset(listtomachinetype, 0x00, sizeof(listtomachinetype));
-            while (machine_type_get_internal_name(c) != NULL) {
-                if (machine_type_available(c)) {
-                    stransi = (char *) machine_types[c].name;
-                    mbstowcs(lptsTemp, stransi, strlen(stransi) + 1);
-                    settings_add_string(hdlg, IDC_COMBO_MACHINE_TYPE, (LPARAM) lptsTemp);
-                    listtomachinetype[d] = c;
-                    if (c == temp_machine_type)
-                        settings_set_cur_sel(hdlg, IDC_COMBO_MACHINE_TYPE, d);
-                    d++;
-                }
-                c++;
-            }
-
-            c = d = 0;
-            settings_reset_content(hdlg, IDC_COMBO_MACHINE);
-            memset(listtomachine, 0x00, sizeof(listtomachine));
-            while (machine_get_internal_name_ex(c) != NULL) {
-                if (machine_available(c) && (machine_get_type(c) == temp_machine_type)) {
-                    stransi = (char *) machine_getname_ex(c);
-                    mbstowcs(lptsTemp, stransi, strlen(stransi) + 1);
-                    settings_add_string(hdlg, IDC_COMBO_MACHINE, (LPARAM) lptsTemp);
-                    listtomachine[d] = c;
-                    if (c == temp_machine)
-                        settings_set_cur_sel(hdlg, IDC_COMBO_MACHINE, d);
-                    d++;
-                }
-                c++;
-            }
-
-            settings_add_string(hdlg, IDC_COMBO_WS, win_get_string(IDS_DEFAULT));
-            for (c = 0; c < 8; c++) { /* TODO */
-                wsprintf(lptsTemp, plat_get_string(IDS_WS), c);
-                settings_add_string(hdlg, IDC_COMBO_WS, (LPARAM) lptsTemp);
-            }
-
-            settings_set_cur_sel(hdlg, IDC_COMBO_WS, temp_wait_states);
-
-#ifdef USE_DYNAREC
-            settings_set_check(hdlg, IDC_CHECK_DYNAREC, 0);
-#endif
-
-            settings_set_check(hdlg, IDC_CHECK_SOFTFLOAT, 0);
-
-            h  = GetDlgItem(hdlg, IDC_MEMSPIN);
-            h2 = GetDlgItem(hdlg, IDC_MEMTEXT);
-            SendMessage(h, UDM_SETBUDDY, (WPARAM) h2, 0);
-
-            if (temp_sync & TIME_SYNC_ENABLED) {
-                if (temp_sync & TIME_SYNC_UTC)
-                    settings_set_check(hdlg, IDC_RADIO_TS_UTC, BST_CHECKED);
-                else
-                    settings_set_check(hdlg, IDC_RADIO_TS_LOCAL, BST_CHECKED);
-            } else
-                settings_set_check(hdlg, IDC_RADIO_TS_DISABLED, BST_CHECKED);
-
-            win_settings_machine_recalc_machine(hdlg);
-
-            free(lptsTemp);
-
-            return TRUE;
-
-        case WM_COMMAND:
-            switch (LOWORD(wParam)) {
-                case IDC_COMBO_MACHINE_TYPE:
-                    if (HIWORD(wParam) == CBN_SELCHANGE) {
-                        old_machine_type  = temp_machine_type;
-                        temp_machine_type = listtomachinetype[settings_get_cur_sel(hdlg, IDC_COMBO_MACHINE_TYPE)];
-
-                        lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
-
-                        settings_reset_content(hdlg, IDC_COMBO_MACHINE);
-                        c = d = 0;
-                        memset(listtomachine, 0x00, sizeof(listtomachine));
-                        while (machine_get_internal_name_ex(c) != NULL) {
-                            if (machine_available(c) && (machine_get_type(c) == temp_machine_type)) {
-                                stransi = (char *) machine_getname_ex(c);
-                                mbstowcs(lptsTemp, stransi, strlen(stransi) + 1);
-                                settings_add_string(hdlg, IDC_COMBO_MACHINE, (LPARAM) lptsTemp);
-                                listtomachine[d] = c;
-                                if (c == temp_machine)
-                                    settings_set_cur_sel(hdlg, IDC_COMBO_MACHINE, d);
-                                d++;
-                            }
-                            c++;
-                        }
-                        if (old_machine_type != temp_machine_type) {
-                            settings_set_cur_sel(hdlg, IDC_COMBO_MACHINE, 0);
-                            temp_machine = listtomachine[0];
-
-                            win_settings_machine_recalc_machine(hdlg);
-                        }
-
-                        free(lptsTemp);
-                    }
-                    break;
-                case IDC_COMBO_MACHINE:
-                    if (HIWORD(wParam) == CBN_SELCHANGE) {
-                        temp_machine = listtomachine[settings_get_cur_sel(hdlg, IDC_COMBO_MACHINE)];
-                        win_settings_machine_recalc_machine(hdlg);
-                    }
-                    break;
-                case IDC_COMBO_CPU_TYPE:
-                    if (HIWORD(wParam) == CBN_SELCHANGE) {
-                        temp_cpu_f = (cpu_family_t *) &cpu_families[listtocpufamily[settings_get_cur_sel(hdlg, IDC_COMBO_CPU_TYPE)]];
-                        temp_cpu   = 0;
-                        win_settings_machine_recalc_cpu_m(hdlg);
-                    }
-                    break;
-                case IDC_COMBO_CPU_SPEED:
-                    if (HIWORD(wParam) == CBN_SELCHANGE) {
-                        temp_cpu = listtocpu[settings_get_cur_sel(hdlg, IDC_COMBO_CPU_SPEED)];
-                        win_settings_machine_recalc_cpu(hdlg);
-                    }
-                    break;
-                case IDC_COMBO_FPU:
-                    if (HIWORD(wParam) == CBN_SELCHANGE) {
-                        temp_fpu = fpu_get_type_from_index(temp_cpu_f, temp_cpu,
-                                                           settings_get_cur_sel(hdlg, IDC_COMBO_FPU));
-                    }
-                    win_settings_machine_recalc_softfloat(hdlg);
-                    break;
-                case IDC_CONFIGURE_MACHINE:
-                    temp_machine = listtomachine[settings_get_cur_sel(hdlg, IDC_COMBO_MACHINE)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) machine_get_device(temp_machine));
-                    break;
-            }
-
-            return FALSE;
-
-        case WM_SAVESETTINGS:
-            lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
-            stransi  = (char *) malloc(512);
-
-#ifdef USE_DYNAREC
-            temp_dynarec = settings_get_check(hdlg, IDC_CHECK_DYNAREC);
-#endif
-
-            temp_fpu_softfloat = settings_get_check(hdlg, IDC_CHECK_SOFTFLOAT);
-
-            if (settings_get_check(hdlg, IDC_RADIO_TS_DISABLED))
-                temp_sync = TIME_SYNC_DISABLED;
-
-            if (settings_get_check(hdlg, IDC_RADIO_TS_LOCAL))
-                temp_sync = TIME_SYNC_ENABLED;
-
-            if (settings_get_check(hdlg, IDC_RADIO_TS_UTC))
-                temp_sync = TIME_SYNC_ENABLED | TIME_SYNC_UTC;
-
-            temp_wait_states = settings_get_cur_sel(hdlg, IDC_COMBO_WS);
-
-            h = GetDlgItem(hdlg, IDC_MEMTEXT);
-            SendMessage(h, WM_GETTEXT, 255, (LPARAM) lptsTemp);
-            wcstombs(stransi, lptsTemp, 512);
-            sscanf(stransi, "%u", &temp_mem_size);
-            if (!(machine_get_ram_granularity(temp_machine) & 1023))
-                temp_mem_size = temp_mem_size << 10;
-            temp_mem_size &= ~(machine_get_ram_granularity(temp_machine) - 1);
-            if (temp_mem_size < machine_get_min_ram(temp_machine))
-                temp_mem_size = machine_get_min_ram(temp_machine);
-            else if (temp_mem_size > machine_get_max_ram(temp_machine))
-                temp_mem_size = machine_get_max_ram(temp_machine);
-            free(stransi);
-            free(lptsTemp);
-
-        default:
-            return FALSE;
-    }
-
-    return FALSE;
-}
-
-static void
-generate_device_name(const device_t *device, const char *internal_name, int bus)
-{
-    char         temp[512];
-    const WCHAR *wtemp;
-
-    memset(device_name, 0x00, 512 * sizeof(WCHAR));
-    memset(temp, 0x00, 512);
-
-    if (!strcmp(internal_name, "none")) {
-        /* Translate "None". */
-        wtemp = (WCHAR *) win_get_string(IDS_2104);
-        memcpy(device_name, wtemp, (wcslen(wtemp) + 1) * sizeof(WCHAR));
-        return;
-    } else if (!strcmp(internal_name, "internal"))
-        memcpy(temp, "Internal", 9);
-    else
-        device_get_name(device, bus, temp);
-
-    mbstowcs(device_name, temp, strlen(temp) + 1);
-}
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, UNUSED(LPARAM lParam))
-{
-    int c = 0;
-    int d = 0;
-    int e;
-
-    switch (message) {
-        case WM_INITDIALOG:
-            // Primary Video Card
-            settings_reset_content(hdlg, IDC_COMBO_VIDEO);
-
-            while (1) {
-                /* Skip "internal" if machine doesn't have it. */
-                if ((c == 1) && !machine_has_flags(temp_machine, MACHINE_VIDEO)) {
-                    c++;
-                    continue;
-                }
-
-                generate_device_name(video_card_getdevice(c), video_get_internal_name(c), 1);
-
-                if (!device_name[0])
-                    break;
-
-                if (video_card_available(c) && device_is_valid(video_card_getdevice(c), temp_machine)) {
-                    if (c == 0) // "None"
-                        settings_add_string(hdlg, IDC_COMBO_VIDEO, win_get_string(IDS_2104));
-                    else if (c == 1) // "Internal"
-                        settings_add_string(hdlg, IDC_COMBO_VIDEO, win_get_string(IDS_2119));
-                    else
-                        settings_add_string(hdlg, IDC_COMBO_VIDEO, (LPARAM) device_name);
-                    settings_list_to_device[0][d] = c;
-                    if ((c == 0) || (c == temp_gfxcard[0]))
-                        settings_set_cur_sel(hdlg, IDC_COMBO_VIDEO, d);
-                    d++;
-                }
-
-                c++;
-
-                settings_process_messages();
-            }
-
-            settings_enable_window(hdlg, IDC_COMBO_VIDEO, !machine_has_flags(temp_machine, MACHINE_VIDEO_ONLY));
-            e = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO)];
-            settings_enable_window(hdlg, IDC_CONFIGURE_VID, video_card_has_config(e));
-
-            // Secondary Video Card
-            c = d = 0;
-            settings_reset_content(hdlg, IDC_COMBO_VIDEO_2);
-
-            while (1) {
-                /* Skip "internal" if machine doesn't have it. */
-                if ((c == 1) && !machine_has_flags(temp_machine, MACHINE_VIDEO)) {
-                    c++;
-                    continue;
-                }
-
-                generate_device_name(video_card_getdevice(c), video_get_internal_name(c), 1);
-
-                if (!device_name[0])
-                    break;
-
-                if ((c > 1) && (video_card_get_flags(c) == video_card_get_flags(temp_gfxcard[0]))) {
-                    c++;
-                    continue;
-                }
-
-                if (video_card_available(c) && device_is_valid(video_card_getdevice(c), temp_machine)) {
-                    if (c == 0) // "None"
-                        settings_add_string(hdlg, IDC_COMBO_VIDEO_2, win_get_string(IDS_2104));
-                    else if (c == 1) // "Internal"
-                        settings_add_string(hdlg, IDC_COMBO_VIDEO_2, win_get_string(IDS_2119));
-                    else
-                        settings_add_string(hdlg, IDC_COMBO_VIDEO_2, (LPARAM) device_name);
-                    settings_list_to_device[1][d] = c;
-                    if ((c == 0) || (c == temp_gfxcard[1]))
-                        settings_set_cur_sel(hdlg, IDC_COMBO_VIDEO_2, d);
-                    d++;
-                }
-
-                c++;
-
-                settings_process_messages();
-            }
-
-            settings_enable_window(hdlg, IDC_COMBO_VIDEO_2, !machine_has_flags(temp_machine, MACHINE_VIDEO_ONLY));
-            e = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO_2)];
-            settings_enable_window(hdlg, IDC_CONFIGURE_VID_2, video_card_has_config(e));
-
-            settings_enable_window(hdlg, IDC_CHECK_VOODOO, machine_has_bus(temp_machine, MACHINE_BUS_PCI));
-            settings_set_check(hdlg, IDC_CHECK_VOODOO, temp_voodoo);
-            settings_enable_window(hdlg, IDC_BUTTON_VOODOO, machine_has_bus(temp_machine, MACHINE_BUS_PCI) && temp_voodoo);
-
-            settings_enable_window(hdlg, IDC_CHECK_IBM8514, machine_has_bus(temp_machine, MACHINE_BUS_ISA16) || machine_has_bus(temp_machine, MACHINE_BUS_MCA));
-            settings_set_check(hdlg, IDC_CHECK_IBM8514, temp_ibm8514);
-
-            settings_enable_window(hdlg, IDC_CHECK_XGA, machine_has_bus(temp_machine, MACHINE_BUS_ISA16) || machine_has_bus(temp_machine, MACHINE_BUS_MCA));
-            settings_set_check(hdlg, IDC_CHECK_XGA, temp_xga);
-            settings_enable_window(hdlg, IDC_BUTTON_XGA, (machine_has_bus(temp_machine, MACHINE_BUS_ISA16) || machine_has_bus(temp_machine, MACHINE_BUS_MCA)) && temp_xga);
-
-            return TRUE;
-
-        case WM_COMMAND:
-            switch (LOWORD(wParam)) {
-                case IDC_COMBO_VIDEO:
-                    temp_gfxcard[0] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO)];
-                    settings_enable_window(hdlg, IDC_CONFIGURE_VID, video_card_has_config(temp_gfxcard[0]));
-
-                    // Secondary Video Card
-                    c = d = 0;
-                    settings_reset_content(hdlg, IDC_COMBO_VIDEO_2);
-
-                    while (1) {
-                        /* Skip "internal" if machine doesn't have it. */
-                        if ((c == 1) && !machine_has_flags(temp_machine, MACHINE_VIDEO)) {
-                            c++;
-                            continue;
-                        }
-
-                        generate_device_name(video_card_getdevice(c), video_get_internal_name(c), 1);
-
-                        if (!device_name[0])
-                            break;
-
-                        if ((c > 1) && (video_card_get_flags(c) == video_card_get_flags(temp_gfxcard[0]))) {
-                            c++;
-                            continue;
-                        }
-
-                        if (video_card_available(c) && device_is_valid(video_card_getdevice(c), temp_machine)) {
-                            if (c == 0) // "None"
-                                settings_add_string(hdlg, IDC_COMBO_VIDEO_2, win_get_string(IDS_2104));
-                            else if (c == 1) // "Internal"
-                                settings_add_string(hdlg, IDC_COMBO_VIDEO_2, win_get_string(IDS_2119));
-                            else
-                                settings_add_string(hdlg, IDC_COMBO_VIDEO_2, (LPARAM) device_name);
-                            settings_list_to_device[1][d] = c;
-                            if ((c == 0) || (c == temp_gfxcard[1]))
-                                settings_set_cur_sel(hdlg, IDC_COMBO_VIDEO_2, d);
-                            d++;
-                        }
-
-                        c++;
-
-                        settings_process_messages();
-                    }
-
-                    settings_enable_window(hdlg, IDC_COMBO_VIDEO_2, !machine_has_flags(temp_machine, MACHINE_VIDEO_ONLY));
-                    e = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO_2)];
-                    settings_enable_window(hdlg, IDC_CONFIGURE_VID_2, video_card_has_config(e));
-                    break;
-
-                case IDC_COMBO_VIDEO_2:
-                    temp_gfxcard[1] = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO_2)];
-                    settings_enable_window(hdlg, IDC_CONFIGURE_VID_2, video_card_has_config(temp_gfxcard[1]));
-                    break;
-
-                case IDC_CHECK_VOODOO:
-                    temp_voodoo = settings_get_check(hdlg, IDC_CHECK_VOODOO);
-                    settings_enable_window(hdlg, IDC_BUTTON_VOODOO, temp_voodoo);
-                    break;
-
-                case IDC_CHECK_IBM8514:
-                    temp_ibm8514 = settings_get_check(hdlg, IDC_CHECK_IBM8514);
-                    break;
-
-                case IDC_CHECK_XGA:
-                    temp_xga = settings_get_check(hdlg, IDC_CHECK_XGA);
-                    settings_enable_window(hdlg, IDC_BUTTON_XGA, temp_xga);
-                    break;
-
-                case IDC_BUTTON_VOODOO:
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) &voodoo_device);
-                    break;
-
-                case IDC_BUTTON_XGA:
-                    if (machine_has_bus(temp_machine, MACHINE_BUS_MCA) > 0)
-                        temp_deviceconfig |= deviceconfig_open(hdlg, (void *) &xga_device);
-                    else
-                        temp_deviceconfig |= deviceconfig_open(hdlg, (void *) &xga_isa_device);
-                    break;
-
-                case IDC_CONFIGURE_VID:
-                    temp_gfxcard[0] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) video_card_getdevice(temp_gfxcard[0]));
-                    break;
-
-                case IDC_CONFIGURE_VID_2:
-                    temp_gfxcard[1] = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO_2)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) video_card_getdevice(temp_gfxcard[1]));
-                    break;
-            }
-            return FALSE;
-
-        case WM_SAVESETTINGS:
-            temp_gfxcard[0] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO)];
-            temp_gfxcard[1] = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO_2)];
-            temp_voodoo     = settings_get_check(hdlg, IDC_CHECK_VOODOO);
-            temp_ibm8514    = settings_get_check(hdlg, IDC_CHECK_IBM8514);
-            temp_xga        = settings_get_check(hdlg, IDC_CHECK_XGA);
-
-        default:
-            return FALSE;
-    }
-    return FALSE;
-}
-
-static int
-mouse_valid(int num, int m)
-{
-    const device_t *dev;
-
-    if ((num == MOUSE_TYPE_INTERNAL) && !machine_has_flags(m, MACHINE_MOUSE))
-        return 0;
-
-    dev = mouse_get_device(num);
-    return (device_is_valid(dev, m));
-}
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-win_settings_input_proc(HWND hdlg, UINT message, WPARAM wParam, UNUSED(LPARAM lParam))
-{
-    wchar_t     str[128];
-    const char *joy_name;
-    int         c;
-    int         d;
-
-    switch (message) {
-        case WM_INITDIALOG:
-            c = d = 0;
-            settings_reset_content(hdlg, IDC_COMBO_MOUSE);
-            for (c = 0; c < mouse_get_ndev(); c++) {
-                if (mouse_valid(c, temp_machine)) {
-                    generate_device_name(mouse_get_device(c), mouse_get_internal_name(c), 0);
-                    if (c == 0)
-                        settings_add_string(hdlg, IDC_COMBO_MOUSE, win_get_string(IDS_2104));
-                    else if (c == 1)
-                        settings_add_string(hdlg, IDC_COMBO_MOUSE, win_get_string(IDS_2119));
-                    else
-                        settings_add_string(hdlg, IDC_COMBO_MOUSE, (LPARAM) device_name);
-                    settings_list_to_device[0][d] = c;
-                    if ((c == 0) || (c == temp_mouse))
-                        settings_set_cur_sel(hdlg, IDC_COMBO_MOUSE, d);
-                    d++;
-                }
-            }
-
-            settings_enable_window(hdlg, IDC_CONFIGURE_MOUSE, mouse_has_config(temp_mouse));
-
-            c        = 0;
-            joy_name = joystick_get_name(c);
-            while (joy_name) {
-                mbstowcs(str, joy_name, strlen(joy_name) + 1);
-                settings_add_string(hdlg, IDC_COMBO_JOYSTICK, (LPARAM) str);
-
-                c++;
-                joy_name = joystick_get_name(c);
-            }
-            settings_enable_window(hdlg, IDC_COMBO_JOYSTICK, TRUE);
-            settings_set_cur_sel(hdlg, IDC_COMBO_JOYSTICK, temp_joystick);
-
-            for (c = 0; c < 4; c++)
-                settings_enable_window(hdlg, IDC_JOY1 + c, joystick_get_max_joysticks(temp_joystick) > c);
-
-            return TRUE;
-
-        case WM_COMMAND:
-            switch (LOWORD(wParam)) {
-                case IDC_COMBO_MOUSE:
-                    temp_mouse = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_MOUSE)];
-                    settings_enable_window(hdlg, IDC_CONFIGURE_MOUSE, mouse_has_config(temp_mouse));
-                    break;
-
-                case IDC_CONFIGURE_MOUSE:
-                    temp_mouse = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_MOUSE)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) mouse_get_device(temp_mouse));
-                    break;
-
-                case IDC_COMBO_JOYSTICK:
-                    temp_joystick = settings_get_cur_sel(hdlg, IDC_COMBO_JOYSTICK);
-
-                    for (c = 0; c < MAX_JOYSTICKS; c++)
-                        settings_enable_window(hdlg, IDC_JOY1 + c, joystick_get_max_joysticks(temp_joystick) > c);
-                    break;
-
-                case IDC_JOY1:
-                case IDC_JOY2:
-                case IDC_JOY3:
-                case IDC_JOY4:
-                    temp_joystick = settings_get_cur_sel(hdlg, IDC_COMBO_JOYSTICK);
-                    temp_deviceconfig |= joystickconfig_open(hdlg, LOWORD(wParam) - IDC_JOY1, temp_joystick);
-                    break;
-            }
-            return FALSE;
-
-        case WM_SAVESETTINGS:
-            temp_mouse    = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_MOUSE)];
-            temp_joystick = settings_get_cur_sel(hdlg, IDC_COMBO_JOYSTICK);
-
-        default:
-            return FALSE;
-    }
-    return FALSE;
-}
-
-static int
-mpu401_present(void)
-{
-    return temp_mpu401 ? 1 : 0;
-}
-
-int
-mpu401_standalone_allow(void)
-{
-    const char *mdout;
-    const char *mdin;
-
-    if (!machine_has_bus(temp_machine, MACHINE_BUS_ISA) && !machine_has_bus(temp_machine, MACHINE_BUS_MCA))
-        return 0;
-
-    mdout = midi_out_device_get_internal_name(temp_midi_output_device);
-    mdin  = midi_in_device_get_internal_name(temp_midi_input_device);
-
-    if (mdout != NULL) {
-        if (!strcmp(mdout, "none") && !strcmp(mdin, "none"))
-            return 0;
-    }
-
-    return 1;
-}
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, UNUSED(LPARAM lParam))
-{
-    uint16_t        c;
-    uint16_t        d;
-    LPTSTR          lptsTemp;
-    const device_t *sound_dev[SOUND_CARD_MAX];
-
-    switch (message) {
-        case WM_INITDIALOG:
-            lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
-
-            c = d = 0;
-            settings_reset_content(hdlg, IDC_COMBO_SOUND1);
-            while (1) {
-                /* Skip "internal" if machine doesn't have it. */
-                if ((c == 1) && !machine_has_flags(temp_machine, MACHINE_SOUND)) {
-                    c++;
-                    continue;
-                }
-
-                generate_device_name(sound_card_getdevice(c), sound_card_get_internal_name(c), 1);
-
-                if (!device_name[0])
-                    break;
-
-                if (sound_card_available(c)) {
-                    sound_dev[0] = sound_card_getdevice(c);
-
-                    if (device_is_valid(sound_dev[0], temp_machine)) {
-                        if (c == 0)
-                            settings_add_string(hdlg, IDC_COMBO_SOUND1, win_get_string(IDS_2104));
-                        else if (c == 1)
-                            settings_add_string(hdlg, IDC_COMBO_SOUND1, win_get_string(IDS_2119));
-                        else
-                            settings_add_string(hdlg, IDC_COMBO_SOUND1, (LPARAM) device_name);
-                        settings_list_to_device[0][d] = c;
-                        if ((c == 0) || (c == temp_sound_card[0]))
-                            settings_set_cur_sel(hdlg, IDC_COMBO_SOUND1, d);
-                        d++;
-                    }
-                }
-
-                c++;
-            }
-
-            settings_enable_window(hdlg, IDC_COMBO_SOUND1, d);
-            settings_enable_window(hdlg, IDC_CONFIGURE_SND1, sound_card_has_config(temp_sound_card[0]));
-
-            c = d = 0;
-            settings_reset_content(hdlg, IDC_COMBO_SOUND2);
-            while (1) {
-                /* Skip "internal" */
-                if (c == 1) {
-                    c++;
-                    continue;
-                }
-
-                generate_device_name(sound_card_getdevice(c), sound_card_get_internal_name(c), 1);
-
-                if (!device_name[0])
-                    break;
-
-                if (sound_card_available(c)) {
-                    sound_dev[1] = sound_card_getdevice(c);
-
-                    if (device_is_valid(sound_dev[1], temp_machine)) {
-                        if (c == 0)
-                            settings_add_string(hdlg, IDC_COMBO_SOUND2, win_get_string(IDS_2104));
-                        else if (c == 1)
-                            settings_add_string(hdlg, IDC_COMBO_SOUND2, win_get_string(IDS_2119));
-                        else
-                            settings_add_string(hdlg, IDC_COMBO_SOUND2, (LPARAM) device_name);
-                        settings_list_to_device[0][d] = c;
-                        if ((c == 0) || (c == temp_sound_card[1]))
-                            settings_set_cur_sel(hdlg, IDC_COMBO_SOUND2, d);
-                        d++;
-                    }
-                }
-
-                c++;
-            }
-
-            settings_enable_window(hdlg, IDC_COMBO_SOUND2, d);
-            settings_enable_window(hdlg, IDC_CONFIGURE_SND2, sound_card_has_config(temp_sound_card[1]));
-
-            c = d = 0;
-            settings_reset_content(hdlg, IDC_COMBO_SOUND3);
-            while (1) {
-                /* Skip "internal" */
-                if (c == 1) {
-                    c++;
-                    continue;
-                }
-
-                generate_device_name(sound_card_getdevice(c), sound_card_get_internal_name(c), 1);
-
-                if (!device_name[0])
-                    break;
-
-                if (sound_card_available(c)) {
-                    sound_dev[2] = sound_card_getdevice(c);
-
-                    if (device_is_valid(sound_dev[2], temp_machine)) {
-                        if (c == 0)
-                            settings_add_string(hdlg, IDC_COMBO_SOUND3, win_get_string(IDS_2104));
-                        else if (c == 1)
-                            settings_add_string(hdlg, IDC_COMBO_SOUND3, win_get_string(IDS_2119));
-                        else
-                            settings_add_string(hdlg, IDC_COMBO_SOUND3, (LPARAM) device_name);
-                        settings_list_to_device[0][d] = c;
-                        if ((c == 0) || (c == temp_sound_card[2]))
-                            settings_set_cur_sel(hdlg, IDC_COMBO_SOUND3, d);
-                        d++;
-                    }
-                }
-
-                c++;
-            }
-
-            settings_enable_window(hdlg, IDC_COMBO_SOUND3, d);
-            settings_enable_window(hdlg, IDC_CONFIGURE_SND3, sound_card_has_config(temp_sound_card[2]));
-
-            c = d = 0;
-            settings_reset_content(hdlg, IDC_COMBO_SOUND4);
-            while (1) {
-                /* Skip "internal" */
-                if (c == 1) {
-                    c++;
-                    continue;
-                }
-
-                generate_device_name(sound_card_getdevice(c), sound_card_get_internal_name(c), 1);
-
-                if (!device_name[0])
-                    break;
-
-                if (sound_card_available(c)) {
-                    sound_dev[3] = sound_card_getdevice(c);
-
-                    if (device_is_valid(sound_dev[3], temp_machine)) {
-                        if (c == 0)
-                            settings_add_string(hdlg, IDC_COMBO_SOUND4, win_get_string(IDS_2104));
-                        else if (c == 1)
-                            settings_add_string(hdlg, IDC_COMBO_SOUND4, win_get_string(IDS_2119));
-                        else
-                            settings_add_string(hdlg, IDC_COMBO_SOUND4, (LPARAM) device_name);
-                        settings_list_to_device[0][d] = c;
-                        if ((c == 0) || (c == temp_sound_card[3]))
-                            settings_set_cur_sel(hdlg, IDC_COMBO_SOUND4, d);
-                        d++;
-                    }
-                }
-
-                c++;
-            }
-
-            settings_enable_window(hdlg, IDC_COMBO_SOUND4, d);
-            settings_enable_window(hdlg, IDC_CONFIGURE_SND4, sound_card_has_config(temp_sound_card[3]));
-
-            c = d = 0;
-            settings_reset_content(hdlg, IDC_COMBO_MIDI_OUT);
-            while (1) {
-                generate_device_name(midi_out_device_getdevice(c), midi_out_device_get_internal_name(c), 0);
-
-                if (!device_name[0])
-                    break;
-
-                if (midi_out_device_available(c)) {
-                    if (c == 0)
-                        settings_add_string(hdlg, IDC_COMBO_MIDI_OUT, win_get_string(IDS_2104));
-                    else
-                        settings_add_string(hdlg, IDC_COMBO_MIDI_OUT, (LPARAM) device_name);
-                    settings_list_to_midi[d] = c;
-                    if ((c == 0) || (c == temp_midi_output_device))
-                        settings_set_cur_sel(hdlg, IDC_COMBO_MIDI_OUT, d);
-                    d++;
-                }
-
-                c++;
-            }
-
-            settings_enable_window(hdlg, IDC_CONFIGURE_MIDI_OUT, midi_out_device_has_config(temp_midi_output_device));
-
-            c = d = 0;
-            settings_reset_content(hdlg, IDC_COMBO_MIDI_IN);
-            while (1) {
-                generate_device_name(midi_in_device_getdevice(c), midi_in_device_get_internal_name(c), 0);
-
-                if (!device_name[0])
-                    break;
-
-                if (midi_in_device_available(c)) {
-                    if (c == 0)
-                        settings_add_string(hdlg, IDC_COMBO_MIDI_IN, win_get_string(IDS_2104));
-                    else
-                        settings_add_string(hdlg, IDC_COMBO_MIDI_IN, (LPARAM) device_name);
-                    settings_list_to_midi_in[d] = c;
-                    if ((c == 0) || (c == temp_midi_input_device))
-                        settings_set_cur_sel(hdlg, IDC_COMBO_MIDI_IN, d);
-                    d++;
-                }
-
-                c++;
-            }
-
-            settings_enable_window(hdlg, IDC_CONFIGURE_MIDI_IN, midi_in_device_has_config(temp_midi_input_device));
-            settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
-            settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
-            settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
-            settings_set_check(hdlg, IDC_CHECK_FLOAT, temp_float);
-
-            if (temp_fm_driver == FM_DRV_YMFM)
-                settings_set_check(hdlg, IDC_RADIO_FM_DRV_YMFM, BST_CHECKED);
-            else
-                settings_set_check(hdlg, IDC_RADIO_FM_DRV_NUKED, BST_CHECKED);
-
-            free(lptsTemp);
-
-            return TRUE;
-
-        case WM_COMMAND:
-            switch (LOWORD(wParam)) {
-                case IDC_COMBO_SOUND1:
-                    temp_sound_card[0] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND1)];
-                    settings_enable_window(hdlg, IDC_CONFIGURE_SND1, sound_card_has_config(temp_sound_card[0]));
-                    settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
-                    settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
-                    settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
-                    break;
-
-                case IDC_CONFIGURE_SND1:
-                    temp_sound_card[0] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND1)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) sound_card_getdevice(temp_sound_card[0]));
-                    break;
-
-                case IDC_COMBO_SOUND2:
-                    temp_sound_card[1] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND2)];
-                    settings_enable_window(hdlg, IDC_CONFIGURE_SND2, sound_card_has_config(temp_sound_card[1]));
-                    settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
-                    settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
-                    settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
-                    break;
-
-                case IDC_CONFIGURE_SND2:
-                    temp_sound_card[1] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND2)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) sound_card_getdevice(temp_sound_card[1]));
-                    break;
-
-                case IDC_COMBO_SOUND3:
-                    temp_sound_card[2] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND3)];
-                    settings_enable_window(hdlg, IDC_CONFIGURE_SND3, sound_card_has_config(temp_sound_card[2]));
-                    settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
-                    settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
-                    settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
-                    break;
-
-                case IDC_CONFIGURE_SND3:
-                    temp_sound_card[2] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND3)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) sound_card_getdevice(temp_sound_card[2]));
-                    break;
-
-                case IDC_COMBO_SOUND4:
-                    temp_sound_card[3] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND4)];
-                    settings_enable_window(hdlg, IDC_CONFIGURE_SND4, sound_card_has_config(temp_sound_card[3]));
-                    settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
-                    settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
-                    settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
-                    break;
-
-                case IDC_CONFIGURE_SND4:
-                    temp_sound_card[3] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND4)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) sound_card_getdevice(temp_sound_card[3]));
-                    break;
-
-                case IDC_COMBO_MIDI_OUT:
-                    temp_midi_output_device = settings_list_to_midi[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI_OUT)];
-                    settings_enable_window(hdlg, IDC_CONFIGURE_MIDI_OUT, midi_out_device_has_config(temp_midi_output_device));
-                    settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
-                    settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
-                    settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
-                    break;
-
-                case IDC_CONFIGURE_MIDI_OUT:
-                    temp_midi_output_device = settings_list_to_midi[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI_OUT)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) midi_out_device_getdevice(temp_midi_output_device));
-                    break;
-
-                case IDC_COMBO_MIDI_IN:
-                    temp_midi_input_device = settings_list_to_midi_in[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI_IN)];
-                    settings_enable_window(hdlg, IDC_CONFIGURE_MIDI_IN, midi_in_device_has_config(temp_midi_input_device));
-                    settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
-                    settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
-                    settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
-                    break;
-
-                case IDC_CONFIGURE_MIDI_IN:
-                    temp_midi_input_device = settings_list_to_midi_in[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI_IN)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) midi_in_device_getdevice(temp_midi_input_device));
-                    break;
-
-                case IDC_CHECK_MPU401:
-                    temp_mpu401 = settings_get_check(hdlg, IDC_CHECK_MPU401);
-
-                    settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_present());
-                    break;
-
-                case IDC_CONFIGURE_MPU401:
-                    temp_deviceconfig |= deviceconfig_open(hdlg, machine_has_bus(temp_machine, MACHINE_BUS_MCA) ? (void *) &mpu401_mca_device : (void *) &mpu401_device);
-                    break;
-            }
-            return FALSE;
-
-        case WM_SAVESETTINGS:
-            temp_sound_card[0]      = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND1)];
-            temp_sound_card[1]      = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND2)];
-            temp_sound_card[2]      = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND3)];
-            temp_sound_card[3]      = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND4)];
-            temp_midi_output_device = settings_list_to_midi[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI_OUT)];
-            temp_midi_input_device  = settings_list_to_midi_in[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI_IN)];
-            temp_mpu401             = settings_get_check(hdlg, IDC_CHECK_MPU401);
-            temp_float              = settings_get_check(hdlg, IDC_CHECK_FLOAT);
-            if (settings_get_check(hdlg, IDC_RADIO_FM_DRV_NUKED))
-                temp_fm_driver = FM_DRV_NUKED;
-            if (settings_get_check(hdlg, IDC_RADIO_FM_DRV_YMFM))
-                temp_fm_driver = FM_DRV_YMFM;
-        default:
-            return FALSE;
-    }
-    return FALSE;
-}
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-win_settings_ports_proc(HWND hdlg, UINT message, WPARAM wParam, UNUSED(LPARAM lParam))
-{
-    int         c;
-    int         i;
-    const char *s;
-    LPTSTR      lptsTemp;
-
-    switch (message) {
-        case WM_INITDIALOG:
-            lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
-
-            for (i = 0; i < PARALLEL_MAX; i++) {
-                c = 0;
-                while (1) {
-                    s = (char *) lpt_device_get_name(c);
-
-                    if (!s)
-                        break;
-
-                    if (c == 0)
-                        settings_add_string(hdlg, IDC_COMBO_LPT1 + i, win_get_string(IDS_2104));
-                    else {
-                        mbstowcs(lptsTemp, s, strlen(s) + 1);
-                        settings_add_string(hdlg, IDC_COMBO_LPT1 + i, (LPARAM) lptsTemp);
-                    }
-
-                    c++;
-                }
-                settings_set_cur_sel(hdlg, IDC_COMBO_LPT1 + i, temp_lpt_devices[i]);
-
-                settings_set_check(hdlg, IDC_CHECK_PARALLEL1 + i, temp_lpt[i]);
-                settings_enable_window(hdlg, IDC_COMBO_LPT1 + i, temp_lpt[i]);
-            }
-
-            for (i = 0; i < SERIAL_MAX; i++) {
-                settings_set_check(hdlg, IDC_CHECK_SERIAL1 + i, temp_serial[i]);
-                settings_set_check(hdlg, IDC_CHECK_SERIAL_PASS1 + i, temp_serial_passthrough_enabled[i]);
-            }
-
-            free(lptsTemp);
-
-            return TRUE;
-
-        case WM_COMMAND:
-            switch (LOWORD(wParam)) {
-                case IDC_CHECK_PARALLEL1:
-                case IDC_CHECK_PARALLEL2:
-                case IDC_CHECK_PARALLEL3:
-                case IDC_CHECK_PARALLEL4:
-                    i = LOWORD(wParam) - IDC_CHECK_PARALLEL1;
-                    settings_enable_window(hdlg, IDC_COMBO_LPT1 + i,
-                                           settings_get_check(hdlg, IDC_CHECK_PARALLEL1 + i) == BST_CHECKED);
-                    break;
-            }
-            break;
-
-        case WM_SAVESETTINGS:
-            for (i = 0; i < PARALLEL_MAX; i++) {
-                temp_lpt_devices[i] = settings_get_cur_sel(hdlg, IDC_COMBO_LPT1 + i);
-                temp_lpt[i]         = settings_get_check(hdlg, IDC_CHECK_PARALLEL1 + i);
-            }
-
-            for (i = 0; i < SERIAL_MAX; i++) {
-                temp_serial[i]                     = settings_get_check(hdlg, IDC_CHECK_SERIAL1 + i);
-                temp_serial_passthrough_enabled[i] = settings_get_check(hdlg, IDC_CHECK_SERIAL_PASS1 + i);
-            }
-
-        default:
-            return FALSE;
-    }
-    return FALSE;
-}
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-win_settings_storage_proc(HWND hdlg, UINT message, WPARAM wParam, UNUSED(LPARAM lParam))
-{
-    int             c;
-    int             d;
-    int             e;
-    int             is_at;
-    LPTSTR          lptsTemp;
-    char           *stransi;
-    const device_t *scsi_dev;
-    const device_t *fdc_dev;
-    const device_t *hdc_dev;
-
-    switch (message) {
-        case WM_INITDIALOG:
-            lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
-            stransi  = (char *) malloc(512);
-
-            /*HD controller config*/
-            c = d = 0;
-            settings_reset_content(hdlg, IDC_COMBO_HDC);
-            while (1) {
-                /* Skip "internal" if machine doesn't have it. */
-                if ((c == 1) && !machine_has_flags(temp_machine, MACHINE_HDC)) {
-                    c++;
-                    continue;
-                }
-
-                generate_device_name(hdc_get_device(c), hdc_get_internal_name(c), 1);
-
-                if (!device_name[0])
-                    break;
-
-                if (hdc_available(c)) {
-                    hdc_dev = hdc_get_device(c);
-
-                    if (device_is_valid(hdc_dev, temp_machine)) {
-                        if (c == 0)
-                            settings_add_string(hdlg, IDC_COMBO_HDC, win_get_string(IDS_2104));
-                        else if (c == 1)
-                            settings_add_string(hdlg, IDC_COMBO_HDC, win_get_string(IDS_2119));
-                        else
-                            settings_add_string(hdlg, IDC_COMBO_HDC, (LPARAM) device_name);
-                        settings_list_to_hdc[d] = c;
-                        if ((c == 0) || (c == temp_hdc))
-                            settings_set_cur_sel(hdlg, IDC_COMBO_HDC, d);
-                        d++;
-                    }
-                }
-
-                c++;
-            }
-
-            settings_enable_window(hdlg, IDC_COMBO_HDC, d);
-            settings_enable_window(hdlg, IDC_CONFIGURE_HDC, hdc_has_config(temp_hdc));
-
-            /*FD controller config*/
-            c = d = 0;
-            settings_reset_content(hdlg, IDC_COMBO_FDC);
-            while (1) {
-                generate_device_name(fdc_card_getdevice(c), fdc_card_get_internal_name(c), 1);
-
-                if (!device_name[0])
-                    break;
-
-                if (fdc_card_available(c)) {
-                    fdc_dev = fdc_card_getdevice(c);
-
-                    if (device_is_valid(fdc_dev, temp_machine)) {
-                        if (c == 0)
-                            settings_add_string(hdlg, IDC_COMBO_FDC, win_get_string(IDS_2119));
-                        else
-                            settings_add_string(hdlg, IDC_COMBO_FDC, (LPARAM) device_name);
-                        settings_list_to_fdc[d] = c;
-                        if ((c == 0) || (c == temp_fdc_card))
-                            settings_set_cur_sel(hdlg, IDC_COMBO_FDC, d);
-                        d++;
-                    }
-                }
-
-                c++;
-            }
-
-            settings_enable_window(hdlg, IDC_COMBO_FDC, d);
-            settings_enable_window(hdlg, IDC_CONFIGURE_FDC, fdc_card_has_config(temp_fdc_card));
-
-            /*SCSI config*/
-            c = d = 0;
-            for (e = 0; e < SCSI_BUS_MAX; e++)
-                settings_reset_content(hdlg, IDC_COMBO_SCSI_1 + e);
-            while (1) {
-                generate_device_name(scsi_card_getdevice(c), scsi_card_get_internal_name(c), 1);
-
-                if (!device_name[0])
-                    break;
-
-                if (scsi_card_available(c)) {
-                    scsi_dev = scsi_card_getdevice(c);
-
-                    if (device_is_valid(scsi_dev, temp_machine)) {
-                        for (e = 0; e < SCSI_BUS_MAX; e++) {
-                            if (c == 0)
-                                settings_add_string(hdlg, IDC_COMBO_SCSI_1 + e, win_get_string(IDS_2104));
-                            else
-                                settings_add_string(hdlg, IDC_COMBO_SCSI_1 + e, (LPARAM) device_name);
-
-                            if ((c == 0) || (c == temp_scsi_card[e]))
-                                settings_set_cur_sel(hdlg, IDC_COMBO_SCSI_1 + e, d);
-                        }
-
-                        settings_list_to_device[0][d] = c;
-                        d++;
-                    }
-                }
-
-                c++;
-            }
-
-            for (c = 0; c < SCSI_BUS_MAX; c++) {
-                settings_enable_window(hdlg, IDC_COMBO_SCSI_1 + c, d);
-                settings_enable_window(hdlg, IDC_CONFIGURE_SCSI_1 + c, scsi_card_has_config(temp_scsi_card[c]));
-            }
-            is_at = IS_AT(temp_machine);
-            settings_enable_window(hdlg, IDC_CHECK_IDE_TER, is_at);
-            settings_enable_window(hdlg, IDC_BUTTON_IDE_TER, is_at && temp_ide_ter);
-            settings_enable_window(hdlg, IDC_CHECK_IDE_QUA, is_at);
-            settings_enable_window(hdlg, IDC_BUTTON_IDE_QUA, is_at && temp_ide_qua);
-            settings_enable_window(hdlg, IDC_CHECK_CASSETTE, machine_has_bus(temp_machine, MACHINE_BUS_CASSETTE));
-            settings_set_check(hdlg, IDC_CHECK_IDE_TER, temp_ide_ter);
-            settings_set_check(hdlg, IDC_CHECK_IDE_QUA, temp_ide_qua);
-            settings_set_check(hdlg, IDC_CHECK_CASSETTE, (temp_cassette && machine_has_bus(temp_machine, MACHINE_BUS_CASSETTE)));
-
-            free(stransi);
-            free(lptsTemp);
-
-            return TRUE;
-
-        case WM_COMMAND:
-            switch (LOWORD(wParam)) {
-                case IDC_CONFIGURE_FDC:
-                    temp_fdc_card = settings_list_to_fdc[settings_get_cur_sel(hdlg, IDC_COMBO_FDC)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) fdc_card_getdevice(temp_fdc_card));
-                    break;
-
-                case IDC_COMBO_FDC:
-                    temp_fdc_card = settings_list_to_fdc[settings_get_cur_sel(hdlg, IDC_COMBO_FDC)];
-                    settings_enable_window(hdlg, IDC_CONFIGURE_FDC, fdc_card_has_config(temp_fdc_card));
-                    break;
-
-                case IDC_CONFIGURE_HDC:
-                    temp_hdc = settings_list_to_hdc[settings_get_cur_sel(hdlg, IDC_COMBO_HDC)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) hdc_get_device(temp_hdc));
-                    break;
-
-                case IDC_COMBO_HDC:
-                    temp_hdc = settings_list_to_hdc[settings_get_cur_sel(hdlg, IDC_COMBO_HDC)];
-                    settings_enable_window(hdlg, IDC_CONFIGURE_HDC, hdc_has_config(temp_hdc));
-                    break;
-
-                case IDC_CONFIGURE_SCSI_1 ... IDC_CONFIGURE_SCSI_4:
-                    c                 = LOWORD(wParam) - IDC_CONFIGURE_SCSI_1;
-                    temp_scsi_card[c] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SCSI_1 + c)];
-                    temp_deviceconfig |= deviceconfig_inst_open(hdlg, (void *) scsi_card_getdevice(temp_scsi_card[c]), c + 1);
-                    break;
-
-                case IDC_COMBO_SCSI_1 ... IDC_COMBO_SCSI_4:
-                    c                 = LOWORD(wParam) - IDC_COMBO_SCSI_1;
-                    temp_scsi_card[c] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SCSI_1 + c)];
-                    settings_enable_window(hdlg, IDC_CONFIGURE_SCSI_1 + c, scsi_card_has_config(temp_scsi_card[c]));
-                    break;
-
-                case IDC_CHECK_IDE_TER:
-                    temp_ide_ter = settings_get_check(hdlg, IDC_CHECK_IDE_TER);
-                    settings_enable_window(hdlg, IDC_BUTTON_IDE_TER, temp_ide_ter);
-                    break;
-
-                case IDC_BUTTON_IDE_TER:
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) &ide_ter_device);
-                    break;
-
-                case IDC_CHECK_IDE_QUA:
-                    temp_ide_qua = settings_get_check(hdlg, IDC_CHECK_IDE_QUA);
-                    settings_enable_window(hdlg, IDC_BUTTON_IDE_QUA, temp_ide_qua);
-                    break;
-
-                case IDC_BUTTON_IDE_QUA:
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) &ide_qua_device);
-                    break;
-            }
-            return FALSE;
-
-        case WM_SAVESETTINGS:
-            temp_hdc      = settings_list_to_hdc[settings_get_cur_sel(hdlg, IDC_COMBO_HDC)];
-            temp_fdc_card = settings_list_to_fdc[settings_get_cur_sel(hdlg, IDC_COMBO_FDC)];
-            for (c = 0; c < SCSI_BUS_MAX; c++)
-                temp_scsi_card[c] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SCSI_1 + c)];
-            temp_ide_ter  = settings_get_check(hdlg, IDC_CHECK_IDE_TER);
-            temp_ide_qua  = settings_get_check(hdlg, IDC_CHECK_IDE_QUA);
-            temp_cassette = settings_get_check(hdlg, IDC_CHECK_CASSETTE);
-
-        default:
-            return FALSE;
-    }
-    return FALSE;
-}
-
-static void
-network_recalc_combos(HWND hdlg)
-{
-    ignore_change = 1;
-
-    for (uint8_t i = 0; i < NET_CARD_MAX; i++) {
-        settings_enable_window(hdlg, IDC_COMBO_PCAP1 + i, temp_net_type[i] == NET_TYPE_PCAP);
-        settings_enable_window(hdlg, IDC_COMBO_NET1 + i,
-                               (temp_net_type[i] == NET_TYPE_SLIRP) || ((temp_net_type[i] == NET_TYPE_PCAP) && (network_dev_to_id(temp_pcap_dev[i]) > 0)));
-        settings_enable_window(hdlg, IDC_CONFIGURE_NET1 + i, network_card_has_config(temp_net_card[i]) && ((temp_net_type[i] == NET_TYPE_SLIRP) || ((temp_net_type[i] == NET_TYPE_PCAP) && (network_dev_to_id(temp_pcap_dev[i]) > 0))));
-    }
-
-    ignore_change = 0;
-}
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-win_settings_network_proc(HWND hdlg, UINT message, WPARAM wParam, UNUSED(LPARAM lParam))
-{
-    int    c;
-    int    d;
-    LPTSTR lptsTemp;
-
-    switch (message) {
-        case WM_INITDIALOG:
-            lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
-
-            for (uint8_t i = 0; i < NET_CARD_MAX; i++) {
-                settings_add_string(hdlg, IDC_COMBO_NET1_TYPE + i, (LPARAM) L"Null Driver");
-                settings_add_string(hdlg, IDC_COMBO_NET1_TYPE + i, (LPARAM) L"SLiRP");
-                settings_add_string(hdlg, IDC_COMBO_NET1_TYPE + i, (LPARAM) L"PCap");
-                settings_set_cur_sel(hdlg, IDC_COMBO_NET1_TYPE + i, temp_net_type[i]);
-                settings_enable_window(hdlg, IDC_COMBO_PCAP1 + i, temp_net_type[i] == NET_TYPE_PCAP);
-
-                for (c = 0; c < network_ndev; c++) {
-                    mbstowcs(lptsTemp, network_devs[c].description, strlen(network_devs[c].description) + 1);
-                    settings_add_string(hdlg, IDC_COMBO_PCAP1 + i, (LPARAM) lptsTemp);
-                }
-                settings_set_cur_sel(hdlg, IDC_COMBO_PCAP1 + i, network_dev_to_id(temp_pcap_dev[i]));
-
-                /* NIC config */
-                c = d = 0;
-                settings_reset_content(hdlg, IDC_COMBO_NET1 + i);
-                while (1) {
-                    generate_device_name(network_card_getdevice(c), network_card_get_internal_name(c), 1);
-
-                    if (device_name[0] == L'\0')
-                        break;
-
-                    if (network_card_available(c) && device_is_valid(network_card_getdevice(c), temp_machine)) {
-                        if (c == 0)
-                            settings_add_string(hdlg, IDC_COMBO_NET1 + i, win_get_string(IDS_2104));
-                        else
-                            settings_add_string(hdlg, IDC_COMBO_NET1 + i, (LPARAM) device_name);
-                        settings_list_to_device[0][d] = c;
-                        if ((c == 0) || (c == temp_net_card[i]))
-                            settings_set_cur_sel(hdlg, IDC_COMBO_NET1 + i, d);
-                        d++;
-                    }
-
-                    c++;
-                }
-
-                settings_enable_window(hdlg, IDC_COMBO_NET1 + i, d);
-                network_recalc_combos(hdlg);
-            }
-            free(lptsTemp);
-            return TRUE;
-
-        case WM_COMMAND:
-            switch (LOWORD(wParam)) {
-                case IDC_COMBO_NET1_TYPE:
-                    if (ignore_change)
-                        return FALSE;
-
-                    temp_net_type[0] = settings_get_cur_sel(hdlg, IDC_COMBO_NET1_TYPE);
-                    network_recalc_combos(hdlg);
-                    break;
-                case IDC_COMBO_NET2_TYPE:
-                    if (ignore_change)
-                        return FALSE;
-
-                    temp_net_type[1] = settings_get_cur_sel(hdlg, IDC_COMBO_NET2_TYPE);
-                    network_recalc_combos(hdlg);
-                    break;
-                case IDC_COMBO_NET3_TYPE:
-                    if (ignore_change)
-                        return FALSE;
-
-                    temp_net_type[2] = settings_get_cur_sel(hdlg, IDC_COMBO_NET3_TYPE);
-                    network_recalc_combos(hdlg);
-                    break;
-                case IDC_COMBO_NET4_TYPE:
-                    if (ignore_change)
-                        return FALSE;
-
-                    temp_net_type[3] = settings_get_cur_sel(hdlg, IDC_COMBO_NET4_TYPE);
-                    network_recalc_combos(hdlg);
-                    break;
-
-                case IDC_COMBO_PCAP1:
-                    if (ignore_change)
-                        return FALSE;
-
-                    memset(temp_pcap_dev[0], '\0', sizeof(temp_pcap_dev[0]));
-                    strcpy(temp_pcap_dev[0], network_devs[settings_get_cur_sel(hdlg, IDC_COMBO_PCAP1)].device);
-                    network_recalc_combos(hdlg);
-                    break;
-                case IDC_COMBO_PCAP2:
-                    if (ignore_change)
-                        return FALSE;
-
-                    memset(temp_pcap_dev[1], '\0', sizeof(temp_pcap_dev[1]));
-                    strcpy(temp_pcap_dev[1], network_devs[settings_get_cur_sel(hdlg, IDC_COMBO_PCAP2)].device);
-                    network_recalc_combos(hdlg);
-                    break;
-                case IDC_COMBO_PCAP3:
-                    if (ignore_change)
-                        return FALSE;
-
-                    memset(temp_pcap_dev[2], '\0', sizeof(temp_pcap_dev[2]));
-                    strcpy(temp_pcap_dev[2], network_devs[settings_get_cur_sel(hdlg, IDC_COMBO_PCAP3)].device);
-                    network_recalc_combos(hdlg);
-                    break;
-                case IDC_COMBO_PCAP4:
-                    if (ignore_change)
-                        return FALSE;
-
-                    memset(temp_pcap_dev[3], '\0', sizeof(temp_pcap_dev[3]));
-                    strcpy(temp_pcap_dev[3], network_devs[settings_get_cur_sel(hdlg, IDC_COMBO_PCAP4)].device);
-                    network_recalc_combos(hdlg);
-                    break;
-
-                case IDC_COMBO_NET1:
-                    if (ignore_change)
-                        return FALSE;
-
-                    temp_net_card[0] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_NET1)];
-                    network_recalc_combos(hdlg);
-                    break;
-                case IDC_COMBO_NET2:
-                    if (ignore_change)
-                        return FALSE;
-
-                    temp_net_card[1] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_NET2)];
-                    network_recalc_combos(hdlg);
-                    break;
-                case IDC_COMBO_NET3:
-                    if (ignore_change)
-                        return FALSE;
-
-                    temp_net_card[2] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_NET3)];
-                    network_recalc_combos(hdlg);
-                    break;
-                case IDC_COMBO_NET4:
-                    if (ignore_change)
-                        return FALSE;
-
-                    temp_net_card[3] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_NET4)];
-                    network_recalc_combos(hdlg);
-                    break;
-
-                case IDC_CONFIGURE_NET1:
-                    if (ignore_change)
-                        return FALSE;
-
-                    temp_net_card[0] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_NET1)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) network_card_getdevice(temp_net_card[0]));
-                    break;
-                case IDC_CONFIGURE_NET2:
-                    if (ignore_change)
-                        return FALSE;
-
-                    temp_net_card[1] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_NET2)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) network_card_getdevice(temp_net_card[1]));
-                    break;
-                case IDC_CONFIGURE_NET3:
-                    if (ignore_change)
-                        return FALSE;
-
-                    temp_net_card[2] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_NET3)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) network_card_getdevice(temp_net_card[2]));
-                    break;
-                case IDC_CONFIGURE_NET4:
-                    if (ignore_change)
-                        return FALSE;
-
-                    temp_net_card[3] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_NET4)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) network_card_getdevice(temp_net_card[3]));
-                    break;
-            }
-            return FALSE;
-
-        case WM_SAVESETTINGS:
-            for (uint8_t i = 0; i < NET_CARD_MAX; i++) {
-                temp_net_type[i] = settings_get_cur_sel(hdlg, IDC_COMBO_NET1_TYPE + i);
-                memset(temp_pcap_dev[i], '\0', sizeof(temp_pcap_dev[i]));
-                strcpy(temp_pcap_dev[i], network_devs[settings_get_cur_sel(hdlg, IDC_COMBO_PCAP1 + i)].device);
-                temp_net_card[i] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_NET1 + i)];
-            }
-        default:
-            return FALSE;
-    }
-
-    return FALSE;
-}
-
-static void
-normalize_hd_list(void)
-{
-    hard_disk_t ihdd[HDD_NUM];
-    int         j = 0;
-
-    memset(ihdd, 0x00, HDD_NUM * sizeof(hard_disk_t));
-
-    for (uint8_t i = 0; i < HDD_NUM; i++) {
-        if (temp_hdd[i].bus != HDD_BUS_DISABLED) {
-            memcpy(&(ihdd[j]), &(temp_hdd[i]), sizeof(hard_disk_t));
-            j++;
-        }
-    }
-
-    memcpy(temp_hdd, ihdd, HDD_NUM * sizeof(hard_disk_t));
-}
-
-static int
-get_selected_hard_disk(HWND hdlg)
-{
-    int  hard_disk = -1;
-    int  j = 0;
-    HWND h;
-
-    if (hd_listview_items == 0)
-        return 0;
-
-    for (int i = 0; i < hd_listview_items; i++) {
-        h = GetDlgItem(hdlg, IDC_LIST_HARD_DISKS);
-        j = ListView_GetItemState(h, i, LVIS_SELECTED);
-        if (j)
-            hard_disk = i;
-    }
-
-    return hard_disk;
-}
-
-static void
-add_locations(HWND hdlg)
-{
-    LPTSTR lptsTemp;
-    int    i = 0;
-
-    lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
-
-    for (i = 0; i < 6; i++)
-        settings_add_string(hdlg, IDC_COMBO_HD_BUS, win_get_string(IDS_4352 + i));
-
-    for (i = 0; i < 2; i++) {
-        wsprintf(lptsTemp, plat_get_string(IDS_4097), i >> 1, i & 1);
-        settings_add_string(hdlg, IDC_COMBO_HD_CHANNEL, (LPARAM) lptsTemp);
-    }
-
-    for (i = 0; i < (SCSI_BUS_MAX * SCSI_ID_MAX); i++) {
-        wsprintf(lptsTemp, plat_get_string(IDS_4135), i >> 4, i & 15);
-        settings_add_string(hdlg, IDC_COMBO_HD_ID, (LPARAM) lptsTemp);
-    }
-
-    for (i = 0; i < (IDE_BUS_MAX * IDE_CHAN_MAX); i++) {
-        wsprintf(lptsTemp, plat_get_string(IDS_4097), i >> 1, i & 1);
-        settings_add_string(hdlg, IDC_COMBO_HD_CHANNEL_IDE, (LPARAM) lptsTemp);
-    }
-
-    free(lptsTemp);
-}
-
-static uint8_t
-next_free_binary_channel(uint64_t *tracking)
-{
-    for (int64_t i = 0; i < 2; i++) {
-        if (!(*tracking & (0xffLL << (i << 3LL))))
-            return i;
-    }
-
-    return 2;
-}
-
-static uint8_t
-next_free_ide_channel(void)
-{
-    for (int64_t i = 0; i < (IDE_BUS_MAX * IDE_CHAN_MAX); i++) {
-        if (!(ide_tracking & (0xffLL << (i << 3LL))))
-            return i;
-    }
-
-    return 7;
-}
-
-static void
-next_free_scsi_id(uint8_t *id)
-{
-    for (int64_t i = 0; i < (SCSI_BUS_MAX * SCSI_ID_MAX); i++) {
-        if (!(scsi_tracking[i >> 3] & (0xffLL << ((i & 0x07) << 3LL)))) {
-            *id = i;
-            return;
-        }
-    }
-
-    *id = 6;
-}
-
-static void
-recalc_location_controls(HWND hdlg, int is_add_dlg, int assign_id)
-{
-    int bus = 0;
-
-    for (uint16_t i = IDT_CHANNEL; i <= IDT_ID; i++)
-        settings_show_window(hdlg, i, FALSE);
-    settings_show_window(hdlg, IDC_COMBO_HD_CHANNEL, FALSE);
-    settings_show_window(hdlg, IDC_COMBO_HD_ID, FALSE);
-    settings_show_window(hdlg, IDC_COMBO_HD_CHANNEL_IDE, FALSE);
-
-    if ((hd_listview_items > 0) || is_add_dlg) {
-        bus = settings_get_cur_sel(hdlg, IDC_COMBO_HD_BUS) + 1;
-
-        switch (bus) {
-            case HDD_BUS_MFM: /* MFM */
-                settings_show_window(hdlg, IDT_CHANNEL, TRUE);
-                settings_show_window(hdlg, IDC_COMBO_HD_CHANNEL, TRUE);
-
-                if (assign_id)
-                    temp_hdd[lv1_current_sel].mfm_channel = next_free_binary_channel(&mfm_tracking);
-                settings_set_cur_sel(hdlg, IDC_COMBO_HD_CHANNEL, is_add_dlg ? new_hdd.mfm_channel : temp_hdd[lv1_current_sel].mfm_channel);
-                break;
-            case HDD_BUS_XTA: /* XTA */
-                settings_show_window(hdlg, IDT_CHANNEL, TRUE);
-                settings_show_window(hdlg, IDC_COMBO_HD_CHANNEL, TRUE);
-
-                if (assign_id)
-                    temp_hdd[lv1_current_sel].xta_channel = next_free_binary_channel(&xta_tracking);
-                settings_set_cur_sel(hdlg, IDC_COMBO_HD_CHANNEL, is_add_dlg ? new_hdd.xta_channel : temp_hdd[lv1_current_sel].xta_channel);
-                break;
-            case HDD_BUS_ESDI: /* ESDI */
-                settings_show_window(hdlg, IDT_CHANNEL, TRUE);
-                settings_show_window(hdlg, IDC_COMBO_HD_CHANNEL, TRUE);
-
-                if (assign_id)
-                    temp_hdd[lv1_current_sel].esdi_channel = next_free_binary_channel(&esdi_tracking);
-                settings_set_cur_sel(hdlg, IDC_COMBO_HD_CHANNEL, is_add_dlg ? new_hdd.esdi_channel : temp_hdd[lv1_current_sel].esdi_channel);
-                break;
-            case HDD_BUS_IDE:   /* IDE */
-            case HDD_BUS_ATAPI: /* ATAPI */
-                settings_show_window(hdlg, IDT_CHANNEL, TRUE);
-                settings_show_window(hdlg, IDC_COMBO_HD_CHANNEL_IDE, TRUE);
-
-                if (assign_id)
-                    temp_hdd[lv1_current_sel].ide_channel = next_free_ide_channel();
-                settings_set_cur_sel(hdlg, IDC_COMBO_HD_CHANNEL_IDE, is_add_dlg ? new_hdd.ide_channel : temp_hdd[lv1_current_sel].ide_channel);
-                break;
-            case HDD_BUS_SCSI: /* SCSI */
-                settings_show_window(hdlg, IDT_ID, TRUE);
-                settings_show_window(hdlg, IDT_LUN, TRUE);
-                settings_show_window(hdlg, IDC_COMBO_HD_ID, TRUE);
-
-                if (assign_id)
-                    next_free_scsi_id((is_add_dlg ? &(new_hdd.scsi_id) : &(temp_hdd[lv1_current_sel].scsi_id)));
-                settings_set_cur_sel(hdlg, IDC_COMBO_HD_ID, is_add_dlg ? new_hdd.scsi_id : temp_hdd[lv1_current_sel].scsi_id);
-        }
-    }
-
-    settings_show_window(hdlg, IDT_BUS, (hd_listview_items != 0) || is_add_dlg);
-    settings_show_window(hdlg, IDC_COMBO_HD_BUS, (hd_listview_items != 0) || is_add_dlg);
-}
-
-static int
-bus_full(uint64_t *tracking, int count)
-{
-    int full = 0;
-
-    switch (count) {
-        default:
-        case 2:
-            full = (*tracking & 0xFF00LL);
-            full = full && (*tracking & 0x00FFLL);
-            break;
-        case 8:
-            full = (*tracking & 0xFF00000000000000LL);
-            full = full && (*tracking & 0x00FF000000000000LL);
-            full = full && (*tracking & 0x0000FF0000000000LL);
-            full = full && (*tracking & 0x000000FF00000000LL);
-            full = full && (*tracking & 0x00000000FF000000LL);
-            full = full && (*tracking & 0x0000000000FF0000LL);
-            full = full && (*tracking & 0x000000000000FF00LL);
-            full = full && (*tracking & 0x00000000000000FFLL);
-            break;
-    }
-
-    return full;
-}
-
-static void
-recalc_next_free_id(HWND hdlg)
-{
-    int i;
-    int enable_add = 0;
-    int c_mfm      = 0;
-    int c_esdi     = 0;
-    int c_xta      = 0;
-    int c_ide      = 0;
-    int c_atapi    = 0;
-    int c_scsi     = 0;
-
-    next_free_id = -1;
-
-    for (i = 0; i < HDD_NUM; i++) {
-        if (temp_hdd[i].bus == HDD_BUS_MFM)
-            c_mfm++;
-        else if (temp_hdd[i].bus == HDD_BUS_ESDI)
-            c_esdi++;
-        else if (temp_hdd[i].bus == HDD_BUS_XTA)
-            c_xta++;
-        else if (temp_hdd[i].bus == HDD_BUS_IDE)
-            c_ide++;
-        else if (temp_hdd[i].bus == HDD_BUS_ATAPI)
-            c_atapi++;
-        else if (temp_hdd[i].bus == HDD_BUS_SCSI)
-            c_scsi++;
-    }
-
-    for (i = 0; i < HDD_NUM; i++) {
-        if (temp_hdd[i].bus == HDD_BUS_DISABLED) {
-            next_free_id = i;
-            break;
-        }
-    }
-
-    enable_add = enable_add || (next_free_id >= 0);
-    enable_add = enable_add && ((c_mfm < MFM_NUM) || (c_esdi < ESDI_NUM) || (c_xta < XTA_NUM) || (c_ide < IDE_NUM) || (c_ide < ATAPI_NUM) || (c_scsi < SCSI_NUM));
-    enable_add = enable_add && (!bus_full(&mfm_tracking, 2) || !bus_full(&esdi_tracking, 2) || !bus_full(&xta_tracking, 2) || !bus_full(&ide_tracking, IDE_CHAN_MAX * IDE_BUS_MAX) ||
-                 !bus_full(&(scsi_tracking[0]), 8) || !bus_full(&(scsi_tracking[1]), 8) || !bus_full(&(scsi_tracking[2]), 8) || !bus_full(&(scsi_tracking[3]), 8) ||
-                 !bus_full(&(scsi_tracking[4]), 8) || !bus_full(&(scsi_tracking[5]), 8) || !bus_full(&(scsi_tracking[6]), 8) || !bus_full(&(scsi_tracking[7]), 8));
-
-    settings_enable_window(hdlg, IDC_BUTTON_HDD_ADD_NEW, enable_add);
-    settings_enable_window(hdlg, IDC_BUTTON_HDD_ADD, enable_add);
-    settings_enable_window(hdlg, IDC_BUTTON_HDD_REMOVE,
-                           (c_mfm != 0) || (c_esdi != 0) || (c_xta != 0) || (c_ide != 0) || (c_atapi != 0) || (c_scsi != 0));
-}
-
-static void
-win_settings_hard_disks_update_item(HWND hdlg, int i, int column)
-{
-    HWND   hwndList = GetDlgItem(hdlg, IDC_LIST_HARD_DISKS);
-    LVITEM lvI;
-    WCHAR  szText[256];
-
-    lvI.mask      = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
-    lvI.stateMask = lvI.iSubItem = lvI.state = 0;
-
-    lvI.iSubItem = column;
-    lvI.iItem    = i;
-
-    if (column == 0) { /* Bus */
-        switch (temp_hdd[i].bus) {
-            case HDD_BUS_MFM:
-                wsprintf(szText, plat_get_string(IDS_4608), temp_hdd[i].mfm_channel >> 1, temp_hdd[i].mfm_channel & 1);
-                break;
-            case HDD_BUS_XTA:
-                wsprintf(szText, plat_get_string(IDS_4609), temp_hdd[i].xta_channel >> 1, temp_hdd[i].xta_channel & 1);
-                break;
-            case HDD_BUS_ESDI:
-                wsprintf(szText, plat_get_string(IDS_4610), temp_hdd[i].esdi_channel >> 1, temp_hdd[i].esdi_channel & 1);
-                break;
-            case HDD_BUS_IDE:
-                wsprintf(szText, plat_get_string(IDS_4611), temp_hdd[i].ide_channel >> 1, temp_hdd[i].ide_channel & 1);
-                break;
-            case HDD_BUS_ATAPI:
-                wsprintf(szText, plat_get_string(IDS_4612), temp_hdd[i].ide_channel >> 1, temp_hdd[i].ide_channel & 1);
-                break;
-            case HDD_BUS_SCSI:
-                wsprintf(szText, plat_get_string(IDS_4613), temp_hdd[i].scsi_id >> 4, temp_hdd[i].scsi_id & 15);
-                break;
-        }
-        lvI.pszText = szText;
-        lvI.iImage  = 0;
-    } else if (column == 1) { /* File */
-        if (!strnicmp(temp_hdd[i].fn, usr_path, strlen(usr_path)))
-            mbstoc16s(szText, temp_hdd[i].fn + strlen(usr_path), sizeof_w(szText));
-        else
-            mbstoc16s(szText, temp_hdd[i].fn, sizeof_w(szText));
-        lvI.pszText = szText;
-        lvI.iImage  = 0;
-    } else if (column == 2) { /* Cylinders */
-        wsprintf(szText, plat_get_string(IDS_4098), temp_hdd[i].tracks);
-        lvI.pszText = szText;
-        lvI.iImage  = 0;
-    } else if (column == 3) { /* Heads */
-        wsprintf(szText, plat_get_string(IDS_4098), temp_hdd[i].hpc);
-        lvI.pszText = szText;
-        lvI.iImage  = 0;
-    } else if (column == 4) { /* Sectors */
-        wsprintf(szText, plat_get_string(IDS_4098), temp_hdd[i].spt);
-        lvI.pszText = szText;
-        lvI.iImage  = 0;
-    } else if (column == 5) { /* Size (MB) */
-        wsprintf(szText, plat_get_string(IDS_4098), (temp_hdd[i].tracks * temp_hdd[i].hpc * temp_hdd[i].spt) >> 11);
-        lvI.pszText = szText;
-        lvI.iImage  = 0;
-    } else if (column == 6) { /* Speed (RPM) */
-        mbstoc16s(szText, hdd_preset_getname(temp_hdd[i].speed_preset), sizeof_w(szText));
-        lvI.pszText = szText;
-        lvI.iImage  = 0;
-    }
-
-    if (ListView_SetItem(hwndList, &lvI) == -1)
-        return;
-}
-
-static BOOL
-win_settings_hard_disks_recalc_list(HWND hdlg)
-{
-    LVITEM lvI;
-    int    j = 0;
-    WCHAR  szText[256];
-    WCHAR  usr_path_w[1024];
-    HWND   hwndList = GetDlgItem(hdlg, IDC_LIST_HARD_DISKS);
-
-    mbstoc16s(usr_path_w, usr_path, sizeof_w(usr_path_w));
-
-    hd_listview_items = 0;
-    lv1_current_sel   = -1;
-
-    ListView_DeleteAllItems(hwndList);
-
-    lvI.mask      = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
-    lvI.stateMask = lvI.iSubItem = lvI.state = 0;
-
-    for (uint8_t i = 0; i < HDD_NUM; i++) {
-        if (temp_hdd[i].bus > 0) {
-            hdc_id_to_listview_index[i] = j;
-            lvI.iSubItem                = 0;
-
-            /* Bus */
-            switch (temp_hdd[i].bus) {
-                case HDD_BUS_MFM:
-                    wsprintf(szText, plat_get_string(IDS_4608), temp_hdd[i].mfm_channel >> 1, temp_hdd[i].mfm_channel & 1);
-                    break;
-                case HDD_BUS_XTA:
-                    wsprintf(szText, plat_get_string(IDS_4609), temp_hdd[i].xta_channel >> 1, temp_hdd[i].xta_channel & 1);
-                    break;
-                case HDD_BUS_ESDI:
-                    wsprintf(szText, plat_get_string(IDS_4610), temp_hdd[i].esdi_channel >> 1, temp_hdd[i].esdi_channel & 1);
-                    break;
-                case HDD_BUS_IDE:
-                    wsprintf(szText, plat_get_string(IDS_4611), temp_hdd[i].ide_channel >> 1, temp_hdd[i].ide_channel & 1);
-                    break;
-                case HDD_BUS_ATAPI:
-                    wsprintf(szText, plat_get_string(IDS_4612), temp_hdd[i].ide_channel >> 1, temp_hdd[i].ide_channel & 1);
-                    break;
-                case HDD_BUS_SCSI:
-                    wsprintf(szText, plat_get_string(IDS_4613), temp_hdd[i].scsi_id >> 4, temp_hdd[i].scsi_id & 15);
-                    break;
-            }
-            lvI.pszText = szText;
-            lvI.iItem   = j;
-            lvI.iImage  = 0;
-
-            if (ListView_InsertItem(hwndList, &lvI) == -1)
-                return FALSE;
-
-            /* File */
-            lvI.iSubItem = 1;
-            if (!strnicmp(temp_hdd[i].fn, usr_path, strlen(usr_path)))
-                mbstoc16s(szText, temp_hdd[i].fn + strlen(usr_path), sizeof_w(szText));
-            else
-                mbstoc16s(szText, temp_hdd[i].fn, sizeof_w(szText));
-            lvI.pszText = szText;
-
-            if (ListView_SetItem(hwndList, &lvI) == -1)
-                return FALSE;
-
-            /* Cylinders */
-            lvI.iSubItem = 2;
-            wsprintf(szText, plat_get_string(IDS_4098), temp_hdd[i].tracks);
-            lvI.pszText = szText;
-
-            if (ListView_SetItem(hwndList, &lvI) == -1)
-                return FALSE;
-
-            /* Heads */
-            lvI.iSubItem = 3;
-            wsprintf(szText, plat_get_string(IDS_4098), temp_hdd[i].hpc);
-            lvI.pszText = szText;
-
-            if (ListView_SetItem(hwndList, &lvI) == -1)
-                return FALSE;
-
-            /* Sectors */
-            lvI.iSubItem = 4;
-            wsprintf(szText, plat_get_string(IDS_4098), temp_hdd[i].spt);
-            lvI.pszText = szText;
-
-            if (ListView_SetItem(hwndList, &lvI) == -1)
-                return FALSE;
-
-            /* Size (MB) */
-            lvI.iSubItem = 5;
-            wsprintf(szText, plat_get_string(IDS_4098), (temp_hdd[i].tracks * temp_hdd[i].hpc * temp_hdd[i].spt) >> 11);
-            lvI.pszText = szText;
-
-            if (ListView_SetItem(hwndList, &lvI) == -1)
-                return FALSE;
-
-            /* Speed (RPM) */
-            lvI.iSubItem = 6;
-            mbstoc16s(szText, hdd_preset_getname(temp_hdd[i].speed_preset), sizeof_w(szText));
-            lvI.pszText = szText;
-
-            if (ListView_SetItem(hwndList, &lvI) == -1)
-                return FALSE;
-
-            j++;
-        } else
-            hdc_id_to_listview_index[i] = -1;
-    }
-
-    hd_listview_items = j;
-
-    return TRUE;
-}
-
-#define C_COLUMNS_HARD_DISKS_BUS   104
-#define C_COLUMNS_HARD_DISKS_FILE  254
-#define C_COLUMNS_HARD_DISKS_CYLS  50
-#define C_COLUMNS_HARD_DISKS_HEADS 26
-#define C_COLUMNS_HARD_DISKS_SECT  32
-#define C_COLUMNS_HARD_DISKS_SIZE  50
-#define C_COLUMNS_HARD_DISKS_SPEED 100
-
-static void
-win_settings_hard_disks_resize_columns(HWND hdlg)
-{
-    /* Bus, File, Cylinders, Heads, Sectors, Size */
-    int width[C_COLUMNS_HARD_DISKS] = {
-                                        C_COLUMNS_HARD_DISKS_BUS,
-                                        C_COLUMNS_HARD_DISKS_FILE,
-                                        C_COLUMNS_HARD_DISKS_CYLS,
-                                        C_COLUMNS_HARD_DISKS_HEADS,
-                                        C_COLUMNS_HARD_DISKS_SECT,
-                                        C_COLUMNS_HARD_DISKS_SIZE,
-                                        C_COLUMNS_HARD_DISKS_SPEED
-                                      };
-    int  total    = 0;
-    HWND hwndList = GetDlgItem(hdlg, IDC_LIST_HARD_DISKS);
-    RECT r;
-
-    GetWindowRect(hwndList, &r);
-    for (int iCol = 0; iCol < (C_COLUMNS_HARD_DISKS - 1); iCol++) {
-        width[iCol] = MulDiv(width[iCol], dpi, 96);
-        total += width[iCol];
-        ListView_SetColumnWidth(hwndList, iCol, MulDiv(width[iCol], dpi, 96));
-    }
-    width[C_COLUMNS_HARD_DISKS - 1] = (r.right - r.left) - 4 - total;
-    ListView_SetColumnWidth(hwndList, C_COLUMNS_HARD_DISKS - 1, width[C_COLUMNS_HARD_DISKS - 1]);
-}
-
-static BOOL
-win_settings_hard_disks_init_columns(HWND hdlg)
-{
-    LVCOLUMN lvc;
-    HWND     hwndList = GetDlgItem(hdlg, IDC_LIST_HARD_DISKS);
-
-    lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
-
-    for (int iCol = 0; iCol < C_COLUMNS_HARD_DISKS; iCol++) {
-        lvc.iSubItem = iCol;
-        lvc.pszText  = plat_get_string(IDS_BUS + iCol);
-
-        switch (iCol) {
-            case 0: /* Bus */
-                lvc.cx  = C_COLUMNS_HARD_DISKS_BUS;
-                lvc.fmt = LVCFMT_LEFT;
-                break;
-            case 1: /* File */
-                lvc.cx  = C_COLUMNS_HARD_DISKS_FILE;
-                lvc.fmt = LVCFMT_LEFT;
-                break;
-            case 2: /* Cylinders */
-                lvc.cx  = C_COLUMNS_HARD_DISKS_CYLS;
-                lvc.fmt = LVCFMT_RIGHT;
-                break;
-            case 3: /* Heads */
-                lvc.cx  = C_COLUMNS_HARD_DISKS_HEADS;
-                lvc.fmt = LVCFMT_RIGHT;
-                break;
-            case 4: /* Sectors */
-                lvc.cx  = C_COLUMNS_HARD_DISKS_SECT;
-                lvc.fmt = LVCFMT_RIGHT;
-                break;
-            case 5: /* Size (MB) */
-                lvc.cx  = C_COLUMNS_HARD_DISKS_SIZE;
-                lvc.fmt = LVCFMT_RIGHT;
-                break;
-            case 6: /* Speed (RPM) */
-                lvc.cx  = C_COLUMNS_HARD_DISKS_SPEED;
-                lvc.fmt = LVCFMT_RIGHT;
-                break;
-        }
-
-        if (ListView_InsertColumn(hwndList, iCol, &lvc) == -1)
-            return FALSE;
-    }
-
-    win_settings_hard_disks_resize_columns(hdlg);
-    return TRUE;
-}
-
-static void
-get_edit_box_contents(HWND hdlg, int id, uint32_t *val)
-{
-    HWND  h;
-    WCHAR szText[256];
-    char  stransi[256];
-
-    h = GetDlgItem(hdlg, id);
-    SendMessage(h, WM_GETTEXT, 255, (LPARAM) szText);
-    wcstombs(stransi, szText, 256);
-    sscanf(stransi, "%u", val);
-}
-
-static void
-set_edit_box_contents(HWND hdlg, int id, uint32_t val)
-{
-    HWND  h;
-    WCHAR szText[256];
-
-    h = GetDlgItem(hdlg, id);
-    wsprintf(szText, plat_get_string(IDS_2107), val);
-    SendMessage(h, WM_SETTEXT, wcslen(szText), (LPARAM) szText);
-}
-
-static void
-set_edit_box_text_contents(HWND hdlg, int id, WCHAR *text)
-{
-    HWND h = GetDlgItem(hdlg, id);
-    SendMessage(h, WM_SETTEXT, wcslen(text), (LPARAM) text);
-}
-
-static void
-get_edit_box_text_contents(HWND hdlg, int id, WCHAR *text_buffer, int buffer_size)
-{
-    HWND h = GetDlgItem(hdlg, id);
-    SendMessage(h, WM_GETTEXT, (WPARAM) buffer_size, (LPARAM) text_buffer);
-}
-
-static int
-hdconf_initialize_hdt_combo(HWND hdlg)
-{
-    uint64_t temp_size = 0;
-    uint32_t size_mb   = 0;
-    WCHAR    szText[256];
-
-    selection = 127;
-
-    for (uint8_t i = 0; i < 127; i++) {
-        temp_size = ((uint64_t) hdd_table[i][0]) * hdd_table[i][1] * hdd_table[i][2];
-        size_mb   = (uint32_t) (temp_size >> 11LL);
-        wsprintf(szText, plat_get_string(IDS_2108), size_mb, hdd_table[i][0], hdd_table[i][1], hdd_table[i][2]);
-        settings_add_string(hdlg, IDC_COMBO_HD_TYPE, (LPARAM) szText);
-        if ((tracks == (int) hdd_table[i][0]) && (hpc == (int) hdd_table[i][1]) && (spt == (int) hdd_table[i][2]))
-            selection = i;
-    }
-    settings_add_string(hdlg, IDC_COMBO_HD_TYPE, win_get_string(IDS_4100));
-    settings_add_string(hdlg, IDC_COMBO_HD_TYPE, win_get_string(IDS_4101));
-    settings_set_cur_sel(hdlg, IDC_COMBO_HD_TYPE, selection);
-    return selection;
-}
-
-static void
-recalc_selection(HWND hdlg)
-{
-    selection = 127;
-    for (uint8_t i = 0; i < 127; i++) {
-        if ((tracks == (int) hdd_table[i][0]) && (hpc == (int) hdd_table[i][1]) && (spt == (int) hdd_table[i][2]))
-            selection = i;
-    }
-    if ((selection == 127) && (hpc == 16) && (spt == 63))
-        selection = 128;
-    settings_set_cur_sel(hdlg, IDC_COMBO_HD_TYPE, selection);
-}
-
-HWND vhd_progress_hdlg;
-
-static void
-vhd_progress_callback(uint32_t current_sector, UNUSED(uint32_t total_sectors))
-{
-    MSG  msg;
-    HWND h = GetDlgItem(vhd_progress_hdlg, IDC_PBAR_IMG_CREATE);
-    SendMessage(h, PBM_SETPOS, current_sector, (LPARAM) 0);
-    while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD)) {
-        TranslateMessage(&msg);
-        DispatchMessage(&msg);
-    }
-}
-
-/* If the disk geometry requested in the 86Box GUI is not compatible with the internal VHD geometry,
- * we adjust it to the next-largest size that is compatible. On average, this will be a difference
- * of about 21 MB, and should only be necessary for VHDs larger than 31.5 GB, so should never be more
- * than a tenth of a percent change in size.
- */
-static void
-adjust_86box_geometry_for_vhd(MVHDGeom *_86box_geometry, MVHDGeom *vhd_geometry)
-{
-    if (_86box_geometry->cyl <= 65535) {
-        vhd_geometry->cyl   = _86box_geometry->cyl;
-        vhd_geometry->heads = _86box_geometry->heads;
-        vhd_geometry->spt   = _86box_geometry->spt;
-        return;
-    }
-
-    int desired_sectors = _86box_geometry->cyl * _86box_geometry->heads * _86box_geometry->spt;
-    if (desired_sectors > 267321600)
-        desired_sectors = 267321600;
-
-    int remainder = desired_sectors % 85680; /* 8560 is the LCM of 1008 (63*16) and 4080 (255*16) */
-    if (remainder > 0)
-        desired_sectors += (85680 - remainder);
-
-    _86box_geometry->cyl   = desired_sectors / (16 * 63);
-    _86box_geometry->heads = 16;
-    _86box_geometry->spt   = 63;
-
-    vhd_geometry->cyl   = desired_sectors / (16 * 255);
-    vhd_geometry->heads = 16;
-    vhd_geometry->spt   = 255;
-}
-
-static void
-adjust_vhd_geometry_for_86box(MVHDGeom *vhd_geometry)
-{
-    if (vhd_geometry->spt <= 63)
-        return;
-
-    int desired_sectors = vhd_geometry->cyl * vhd_geometry->heads * vhd_geometry->spt;
-    if (desired_sectors > 267321600)
-        desired_sectors = 267321600;
-
-    int remainder = desired_sectors % 85680; /* 8560 is the LCM of 1008 (63*16) and 4080 (255*16) */
-    if (remainder > 0)
-        desired_sectors -= remainder;
-
-    vhd_geometry->cyl   = desired_sectors / (16 * 63);
-    vhd_geometry->heads = 16;
-    vhd_geometry->spt   = 63;
-}
-
-static MVHDGeom
-create_drive_vhd_fixed(char *filename, int cyl, int heads, int spt)
-{
-    MVHDGeom _86box_geometry = { .cyl = cyl, .heads = heads, .spt = spt };
-    MVHDGeom vhd_geometry;
-    adjust_86box_geometry_for_vhd(&_86box_geometry, &vhd_geometry);
-
-    HWND h = GetDlgItem(vhd_progress_hdlg, IDC_PBAR_IMG_CREATE);
-    settings_show_window(vhd_progress_hdlg, IDT_FILE_NAME, FALSE);
-    settings_show_window(vhd_progress_hdlg, IDC_EDIT_HD_FILE_NAME, FALSE);
-    settings_show_window(vhd_progress_hdlg, IDC_CFILE, FALSE);
-    settings_show_window(vhd_progress_hdlg, IDC_PBAR_IMG_CREATE, TRUE);
-    settings_enable_window(vhd_progress_hdlg, IDT_PROGRESS, TRUE);
-    SendMessage(h, PBM_SETRANGE32, (WPARAM) 0, (LPARAM) vhd_geometry.cyl * vhd_geometry.heads * vhd_geometry.spt);
-    SendMessage(h, PBM_SETPOS, (WPARAM) 0, (LPARAM) 0);
-
-    int       vhd_error = 0;
-    MVHDMeta *vhd       = mvhd_create_fixed(filename, vhd_geometry, &vhd_error, vhd_progress_callback);
-    if (vhd == NULL) {
-        _86box_geometry.cyl   = 0;
-        _86box_geometry.heads = 0;
-        _86box_geometry.spt   = 0;
-    } else {
-        mvhd_close(vhd);
-    }
-
-    return _86box_geometry;
-}
-
-static MVHDGeom
-create_drive_vhd_dynamic(char *filename, int cyl, int heads, int spt, int blocksize)
-{
-    MVHDGeom _86box_geometry = { .cyl = cyl, .heads = heads, .spt = spt };
-    MVHDGeom vhd_geometry;
-    adjust_86box_geometry_for_vhd(&_86box_geometry, &vhd_geometry);
-    int                 vhd_error = 0;
-    MVHDCreationOptions options;
-    options.block_size_in_sectors = blocksize;
-    options.path                  = filename;
-    options.size_in_bytes         = 0;
-    options.geometry              = vhd_geometry;
-    options.type                  = MVHD_TYPE_DYNAMIC;
-
-    MVHDMeta *vhd = mvhd_create_ex(options, &vhd_error);
-    if (vhd == NULL) {
-        _86box_geometry.cyl   = 0;
-        _86box_geometry.heads = 0;
-        _86box_geometry.spt   = 0;
-    } else {
-        mvhd_close(vhd);
-    }
-
-    return _86box_geometry;
-}
-
-static MVHDGeom
-create_drive_vhd_diff(char *filename, char *parent_filename, int blocksize)
-{
-    int                 vhd_error = 0;
-    MVHDCreationOptions options;
-    options.block_size_in_sectors = blocksize;
-    options.path                  = filename;
-    options.parent_path           = parent_filename;
-    options.type                  = MVHD_TYPE_DIFF;
-
-    MVHDMeta *vhd = mvhd_create_ex(options, &vhd_error);
-    MVHDGeom  vhd_geometry;
-    if (vhd == NULL) {
-        vhd_geometry.cyl   = 0;
-        vhd_geometry.heads = 0;
-        vhd_geometry.spt   = 0;
-    } else {
-        vhd_geometry = mvhd_get_geometry(vhd);
-
-        if (vhd_geometry.spt > 63) {
-            vhd_geometry.cyl   = mvhd_calc_size_sectors(&vhd_geometry) / (16 * 63);
-            vhd_geometry.heads = 16;
-            vhd_geometry.spt   = 63;
-        }
-
-        mvhd_close(vhd);
-    }
-
-    return vhd_geometry;
-}
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, UNUSED(LPARAM lParam))
-{
-    HWND     h;
-    FILE    *fp;
-    uint32_t temp;
-    uint32_t i         = 0;
-    uint32_t sector_size = 512;
-    uint32_t zero      = 0;
-    uint32_t base      = 0x1000;
-    uint64_t signature = 0xD778A82044445459LL;
-    uint64_t r         = 0;
-    char    *big_buf;
-    char     hd_file_name_multibyte[1200];
-    int      b         = 0;
-    int      vhd_error = 0;
-    uint8_t  channel   = 0;
-    uint8_t  id        = 0;
-    wchar_t *twcs;
-    int      img_format;
-    int      block_size;
-    WCHAR    text_buf[256];
-    RECT     rect;
-    POINT    point;
-    int      dlg_height_adjust;
-
-    switch (message) {
-        case WM_INITDIALOG:
-            memset(hd_file_name, 0, sizeof(hd_file_name));
-
-            hdd_ptr = &(temp_hdd[next_free_id]);
-
-            SetWindowText(hdlg, plat_get_string((existing & 1) ? IDS_4103 : IDS_4102));
-
-            no_update = 1;
-            spt       = (existing & 1) ? 0 : 17;
-            set_edit_box_contents(hdlg, IDC_EDIT_HD_SPT, spt);
-            hpc = (existing & 1) ? 0 : 15;
-            set_edit_box_contents(hdlg, IDC_EDIT_HD_HPC, hpc);
-            tracks = (existing & 1) ? 0 : 1023;
-            set_edit_box_contents(hdlg, IDC_EDIT_HD_CYL, tracks);
-            size = (tracks * hpc * spt) << 9;
-            set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20LL));
-            hdconf_initialize_hdt_combo(hdlg);
-
-            settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4122));
-            settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4123));
-            settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4124));
-            settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4125));
-            settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4126));
-            settings_add_string(hdlg, IDC_COMBO_HD_IMG_FORMAT, win_get_string(IDS_4127));
-            settings_set_cur_sel(hdlg, IDC_COMBO_HD_IMG_FORMAT, 0);
-
-            settings_add_string(hdlg, IDC_COMBO_HD_BLOCK_SIZE, win_get_string(IDS_4128));
-            settings_add_string(hdlg, IDC_COMBO_HD_BLOCK_SIZE, win_get_string(IDS_4129));
-            settings_set_cur_sel(hdlg, IDC_COMBO_HD_BLOCK_SIZE, 0);
-
-            settings_show_window(hdlg, IDC_COMBO_HD_BLOCK_SIZE, FALSE);
-            settings_show_window(hdlg, IDT_BLOCK_SIZE, FALSE);
-
-            if (existing & 1) {
-                settings_enable_window(hdlg, IDC_EDIT_HD_SPT, FALSE);
-                settings_enable_window(hdlg, IDC_EDIT_HD_HPC, FALSE);
-                settings_enable_window(hdlg, IDC_EDIT_HD_CYL, FALSE);
-                settings_enable_window(hdlg, IDC_EDIT_HD_SIZE, FALSE);
-                settings_enable_window(hdlg, IDC_COMBO_HD_TYPE, FALSE);
-                settings_show_window(hdlg, IDC_COMBO_HD_IMG_FORMAT, FALSE);
-                settings_show_window(hdlg, IDT_IMG_FORMAT, FALSE);
-
-                /* adjust window size */
-                GetWindowRect(hdlg, &rect);
-                OffsetRect(&rect, -rect.left, -rect.top);
-                dlg_height_adjust = rect.bottom / 5;
-                SetWindowPos(hdlg, NULL, 0, 0, rect.right, rect.bottom - dlg_height_adjust, SWP_NOMOVE | SWP_NOREPOSITION | SWP_NOZORDER);
-                h = GetDlgItem(hdlg, IDOK);
-                GetWindowRect(h, &rect);
-                point.x = rect.left;
-                point.y = rect.top;
-                ScreenToClient(hdlg, &point);
-                SetWindowPos(h, NULL, point.x, point.y - dlg_height_adjust, 0, 0, SWP_NOSIZE | SWP_NOREPOSITION | SWP_NOZORDER);
-                h = GetDlgItem(hdlg, IDCANCEL);
-                GetWindowRect(h, &rect);
-                point.x = rect.left;
-                point.y = rect.top;
-                ScreenToClient(hdlg, &point);
-                SetWindowPos(h, NULL, point.x, point.y - dlg_height_adjust, 0, 0, SWP_NOSIZE | SWP_NOREPOSITION | SWP_NOZORDER);
-
-                chs_enabled = 0;
-            } else
-                chs_enabled = 1;
-
-            add_locations(hdlg);
-            hdd_ptr->bus = HDD_BUS_IDE;
-            max_spt      = 255;
-            max_hpc      = 255;
-            settings_set_cur_sel(hdlg, IDC_COMBO_HD_BUS, hdd_ptr->bus - 1);
-            max_tracks = 266305;
-            recalc_location_controls(hdlg, 1, 0);
-
-            channel = next_free_ide_channel();
-            next_free_scsi_id(&id);
-            settings_set_cur_sel(hdlg, IDC_COMBO_HD_CHANNEL, 0);
-            settings_set_cur_sel(hdlg, IDC_COMBO_HD_ID, id);
-            settings_set_cur_sel(hdlg, IDC_COMBO_HD_CHANNEL_IDE, channel);
-
-            new_hdd.mfm_channel  = next_free_binary_channel(&mfm_tracking);
-            new_hdd.esdi_channel = next_free_binary_channel(&esdi_tracking);
-            new_hdd.xta_channel  = next_free_binary_channel(&xta_tracking);
-            new_hdd.ide_channel  = channel;
-            new_hdd.scsi_id      = id;
-
-            settings_enable_window(hdlg, IDC_EDIT_HD_FILE_NAME, FALSE);
-            settings_show_window(hdlg, IDT_PROGRESS, FALSE);
-            settings_show_window(hdlg, IDC_PBAR_IMG_CREATE, FALSE);
-
-            no_update = 0;
-            return TRUE;
-
-        case WM_COMMAND:
-            switch (LOWORD(wParam)) {
-                case IDOK:
-                    hdd_ptr->bus = settings_get_cur_sel(hdlg, IDC_COMBO_HD_BUS) + 1;
-
-                    /* Make sure no file name is allowed with removable SCSI hard disks. */
-                    if (wcslen(hd_file_name) == 0) {
-                        hdd_ptr->bus = HDD_BUS_DISABLED;
-                        settings_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2131, (wchar_t *) IDS_4112);
-                        return TRUE;
-                    }
-
-                    get_edit_box_contents(hdlg, IDC_EDIT_HD_SPT, &(hdd_ptr->spt));
-                    get_edit_box_contents(hdlg, IDC_EDIT_HD_HPC, &(hdd_ptr->hpc));
-                    get_edit_box_contents(hdlg, IDC_EDIT_HD_CYL, &(hdd_ptr->tracks));
-                    spt    = hdd_ptr->spt;
-                    hpc    = hdd_ptr->hpc;
-                    tracks = hdd_ptr->tracks;
-
-                    switch (hdd_ptr->bus) {
-                        case HDD_BUS_MFM:
-                            hdd_ptr->mfm_channel = settings_get_cur_sel(hdlg, IDC_COMBO_HD_CHANNEL);
-                            break;
-                        case HDD_BUS_ESDI:
-                            hdd_ptr->esdi_channel = settings_get_cur_sel(hdlg, IDC_COMBO_HD_CHANNEL);
-                            break;
-                        case HDD_BUS_XTA:
-                            hdd_ptr->xta_channel = settings_get_cur_sel(hdlg, IDC_COMBO_HD_CHANNEL);
-                            break;
-                        case HDD_BUS_IDE:
-                        case HDD_BUS_ATAPI:
-                            hdd_ptr->ide_channel = settings_get_cur_sel(hdlg, IDC_COMBO_HD_CHANNEL_IDE);
-                            break;
-                        case HDD_BUS_SCSI:
-                            hdd_ptr->scsi_id = settings_get_cur_sel(hdlg, IDC_COMBO_HD_ID);
-                            break;
-                    }
-
-                    memset(hdd_ptr->fn, 0, sizeof(hdd_ptr->fn));
-                    c16stombs(hdd_ptr->fn, hd_file_name, sizeof(hdd_ptr->fn));
-                    strcpy(hd_file_name_multibyte, hdd_ptr->fn);
-
-                    sector_size = 512;
-
-                    if (!(existing & 1) && (wcslen(hd_file_name) > 0)) {
-                        if (size > 0x1FFFFFFE00LL) {
-                            settings_msgbox_header(MBX_ERROR, (wchar_t *) IDS_4116, (wchar_t *) IDS_4105);
-                            return TRUE;
-                        }
-
-                        img_format = settings_get_cur_sel(hdlg, IDC_COMBO_HD_IMG_FORMAT);
-                        if (img_format < IMG_FMT_VHD_FIXED) {
-                            fp = _wfopen(hd_file_name, L"wb");
-                        } else {
-                            fp = (FILE *) 0;
-                        }
-
-                        if (img_format == IMG_FMT_HDI) { /* HDI file */
-                            if (size >= 0x100000000LL) {
-                                fclose(fp);
-                                settings_msgbox_header(MBX_ERROR, (wchar_t *) IDS_4116, (wchar_t *) IDS_4104);
-                                return TRUE;
-                            }
-
-                            fwrite(&zero, 1, 4, fp);        /* 00000000: Zero/unknown */
-                            fwrite(&zero, 1, 4, fp);        /* 00000004: Zero/unknown */
-                            fwrite(&base, 1, 4, fp);        /* 00000008: Offset at which data starts */
-                            fwrite(&size, 1, 4, fp);        /* 0000000C: Full size of the data (32-bit) */
-                            fwrite(&sector_size, 1, 4, fp); /* 00000010: Sector size in bytes */
-                            fwrite(&spt, 1, 4, fp);         /* 00000014: Sectors per cylinder */
-                            fwrite(&hpc, 1, 4, fp);         /* 00000018: Heads per cylinder */
-                            fwrite(&tracks, 1, 4, fp);      /* 0000001C: Cylinders */
-
-                            for (i = 0; i < 0x3f8; i++)
-                                fwrite(&zero, 1, 4, fp);
-                        } else if (img_format == IMG_FMT_HDX) {       /* HDX file */
-                            fwrite(&signature, 1, 8, fp);              /* 00000000: Signature */
-                            fwrite(&size, 1, 8, fp);                   /* 00000008: Full size of the data (64-bit) */
-                            fwrite(&sector_size, 1, 4, fp);            /* 00000010: Sector size in bytes */
-                            fwrite(&spt, 1, 4, fp);                    /* 00000014: Sectors per cylinder */
-                            fwrite(&hpc, 1, 4, fp);                    /* 00000018: Heads per cylinder */
-                            fwrite(&tracks, 1, 4, fp);                 /* 0000001C: Cylinders */
-                            fwrite(&zero, 1, 4, fp);                   /* 00000020: [Translation] Sectors per cylinder */
-                            fwrite(&zero, 1, 4, fp);                   /* 00000004: [Translation] Heads per cylinder */
-                        } else if (img_format >= IMG_FMT_VHD_FIXED) { /* VHD file */
-                            MVHDGeom _86box_geometry;
-                            block_size = settings_get_cur_sel(hdlg, IDC_COMBO_HD_BLOCK_SIZE) == 0 ? MVHD_BLOCK_LARGE : MVHD_BLOCK_SMALL;
-                            switch (img_format) {
-                                case IMG_FMT_VHD_FIXED:
-                                    vhd_progress_hdlg = hdlg;
-                                    _86box_geometry   = create_drive_vhd_fixed(hd_file_name_multibyte, tracks, hpc, spt);
-                                    break;
-                                case IMG_FMT_VHD_DYNAMIC:
-                                    _86box_geometry = create_drive_vhd_dynamic(hd_file_name_multibyte, tracks, hpc, spt, block_size);
-                                    break;
-                                case IMG_FMT_VHD_DIFF:
-                                    if (file_dlg_w(hdlg, plat_get_string(IDS_4130), L"", plat_get_string(IDS_4131), 0)) {
-                                        return TRUE;
-                                    }
-                                    _86box_geometry = create_drive_vhd_diff(hd_file_name_multibyte, openfilestring, block_size);
-                                    break;
-                            }
-
-                            if (img_format != IMG_FMT_VHD_DIFF)
-                                settings_msgbox_header(MBX_INFO, (wchar_t *) IDS_4113, (wchar_t *) IDS_4117);
-
-                            hdd_ptr->tracks = _86box_geometry.cyl;
-                            hdd_ptr->hpc    = _86box_geometry.heads;
-                            hdd_ptr->spt    = _86box_geometry.spt;
-
-                            hard_disk_added = 1;
-                            EndDialog(hdlg, 0);
-                            return TRUE;
-                        }
-
-                        big_buf = (char *) malloc(1048576);
-                        memset(big_buf, 0, 1048576);
-
-                        r = size >> 20;
-                        size &= 0xfffff;
-
-                        if (size || r) {
-                            settings_show_window(hdlg, IDT_FILE_NAME, FALSE);
-                            settings_show_window(hdlg, IDC_EDIT_HD_FILE_NAME, FALSE);
-                            settings_show_window(hdlg, IDC_CFILE, FALSE);
-                            settings_show_window(hdlg, IDC_PBAR_IMG_CREATE, TRUE);
-                            settings_enable_window(hdlg, IDT_PROGRESS, TRUE);
-
-                            h = GetDlgItem(hdlg, IDC_PBAR_IMG_CREATE);
-                            SendMessage(h, PBM_SETRANGE32, (WPARAM) 0, (LPARAM) r);
-                            SendMessage(h, PBM_SETPOS, (WPARAM) 0, (LPARAM) 0);
-                        }
-
-                        h = GetDlgItem(hdlg, IDC_PBAR_IMG_CREATE);
-
-                        if (size) {
-                            if (fp) {
-                                fwrite(big_buf, 1, size, fp);
-                            }
-                            SendMessage(h, PBM_SETPOS, (WPARAM) 1, (LPARAM) 0);
-                        }
-
-                        if (r) {
-                            for (i = 0; i < r; i++) {
-                                if (fp) {
-                                    fwrite(big_buf, 1, 1048576, fp);
-                                }
-                                SendMessage(h, PBM_SETPOS, (i + 1), (LPARAM) 0);
-
-                                settings_process_messages();
-                            }
-                        }
-
-                        free(big_buf);
-
-                        if (fp) {
-                            fclose(fp);
-                        }
-                        settings_msgbox_header(MBX_INFO, (wchar_t *) IDS_4113, (wchar_t *) IDS_4117);
-                    }
-
-                    hard_disk_added = 1;
-                    EndDialog(hdlg, 0);
-                    return TRUE;
-
-                case IDCANCEL:
-                    hard_disk_added = 0;
-                    hdd_ptr->bus    = HDD_BUS_DISABLED;
-                    EndDialog(hdlg, 0);
-                    return TRUE;
-
-                case IDC_CFILE:
-                    if (!file_dlg_w(hdlg, plat_get_string(IDS_4106), L"", NULL, !(existing & 1))) {
-                        if (!wcschr(wopenfilestring, L'.')) {
-                            if (wcslen(wopenfilestring) && (wcslen(wopenfilestring) <= 256)) {
-                                twcs    = &wopenfilestring[wcslen(wopenfilestring)];
-                                twcs[0] = L'.';
-                                twcs[1] = L'i';
-                                twcs[2] = L'm';
-                                twcs[3] = L'g';
-                            }
-                        }
-
-                        if (!(existing & 1)) {
-                            fp = _wfopen(wopenfilestring, L"rb");
-                            if (fp != NULL) {
-                                fclose(fp);
-                                if (settings_msgbox_ex(MBX_QUESTION_YN, (wchar_t *) IDS_4111, (wchar_t *) IDS_4118, (wchar_t *) IDS_4120, (wchar_t *) IDS_4121, NULL) != 0) /* yes */
-                                    return FALSE;
-                            }
-                        }
-
-                        fp = _wfopen(wopenfilestring, (existing & 1) ? L"rb" : L"wb");
-                        if (fp == NULL) {
-hdd_add_file_open_error:
-                            fclose(fp);
-                            settings_msgbox_header(MBX_ERROR, (existing & 1) ? (wchar_t *) IDS_4114 : (wchar_t *) IDS_4115, (existing & 1) ? (wchar_t *) IDS_4107 : (wchar_t *) IDS_4108);
-                            return TRUE;
-                        }
-                        if (existing & 1) {
-                            if (image_is_hdi(openfilestring) || image_is_hdx(openfilestring, 1)) {
-                                fseeko64(fp, 0x10, SEEK_SET);
-                                fread(&sector_size, 1, 4, fp);
-                                if (sector_size != 512) {
-                                    settings_msgbox_header(MBX_ERROR, (wchar_t *) IDS_4119, (wchar_t *) IDS_4109);
-                                    fclose(fp);
-                                    return TRUE;
-                                }
-                                spt = hpc = tracks = 0;
-                                fread(&spt, 1, 4, fp);
-                                fread(&hpc, 1, 4, fp);
-                                fread(&tracks, 1, 4, fp);
-                            } else if (image_is_vhd(openfilestring, 1)) {
-                                fclose(fp);
-                                MVHDMeta *vhd = mvhd_open(openfilestring, 0, &vhd_error);
-                                if (vhd == NULL) {
-                                    settings_msgbox_header(MBX_ERROR, (existing & 1) ? (wchar_t *) IDS_4114 : (wchar_t *) IDS_4115, (existing & 1) ? (wchar_t *) IDS_4107 : (wchar_t *) IDS_4108);
-                                    return TRUE;
-                                } else if (vhd_error == MVHD_ERR_TIMESTAMP) {
-                                    if (settings_msgbox_ex(MBX_QUESTION_YN | MBX_WARNING, plat_get_string(IDS_4133), plat_get_string(IDS_4132), NULL, NULL, NULL) != 0) {
-                                        int ts_res = mvhd_diff_update_par_timestamp(vhd, &vhd_error);
-                                        if (ts_res != 0) {
-                                            settings_msgbox_header(MBX_ERROR, plat_get_string(IDS_2049), plat_get_string(IDS_4134));
-                                            mvhd_close(vhd);
-                                            return TRUE;
-                                        }
-                                    } else {
-                                        mvhd_close(vhd);
-                                        return TRUE;
-                                    }
-                                }
-
-                                MVHDGeom vhd_geom = mvhd_get_geometry(vhd);
-                                adjust_vhd_geometry_for_86box(&vhd_geom);
-                                tracks = vhd_geom.cyl;
-                                hpc    = vhd_geom.heads;
-                                spt    = vhd_geom.spt;
-                                size   = (uint64_t) tracks * hpc * spt * 512;
-                                mvhd_close(vhd);
-                            } else {
-                                fseeko64(fp, 0, SEEK_END);
-                                size = ftello64(fp);
-                                if (((size % 17) == 0) && (size <= 142606336)) {
-                                    spt = 17;
-                                    if (size <= 26738688)
-                                        hpc = 4;
-                                    else if (((size % 3072) == 0) && (size <= 53477376))
-                                        hpc = 6;
-                                    else {
-                                        for (i = 5; i < 16; i++) {
-                                            if (((size % (i << 9)) == 0) && (size <= ((i * 17) << 19)))
-                                                break;
-                                            if (i == 5)
-                                                i++;
-                                        }
-                                        hpc = i;
-                                    }
-                                } else {
-                                    spt = 63;
-                                    hpc = 16;
-                                }
-
-                                tracks = ((size >> 9) / hpc) / spt;
-                            }
-
-                            if ((spt > max_spt) || (hpc > max_hpc) || (tracks > max_tracks))
-                                goto hdd_add_file_open_error;
-                            no_update = 1;
-
-                            set_edit_box_contents(hdlg, IDC_EDIT_HD_SPT, spt);
-                            set_edit_box_contents(hdlg, IDC_EDIT_HD_HPC, hpc);
-                            set_edit_box_contents(hdlg, IDC_EDIT_HD_CYL, tracks);
-                            set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, size >> 20);
-                            recalc_selection(hdlg);
-
-                            settings_enable_window(hdlg, IDC_EDIT_HD_SPT, TRUE);
-                            settings_enable_window(hdlg, IDC_EDIT_HD_HPC, TRUE);
-                            settings_enable_window(hdlg, IDC_EDIT_HD_CYL, TRUE);
-                            settings_enable_window(hdlg, IDC_EDIT_HD_SIZE, TRUE);
-                            settings_enable_window(hdlg, IDC_COMBO_HD_TYPE, TRUE);
-
-                            chs_enabled = 1;
-
-                            no_update = 0;
-                        }
-
-                        fclose(fp);
-                    }
-
-                    h = GetDlgItem(hdlg, IDC_EDIT_HD_FILE_NAME);
-                    SendMessage(h, WM_SETTEXT, 0, (LPARAM) wopenfilestring);
-                    memset(hd_file_name, 0, sizeof(hd_file_name));
-                    wcscpy(hd_file_name, wopenfilestring);
-
-                    return TRUE;
-
-                case IDC_EDIT_HD_CYL:
-                    if (no_update)
-                        return FALSE;
-
-                    no_update = 1;
-                    get_edit_box_contents(hdlg, IDC_EDIT_HD_CYL, &temp);
-                    if (tracks != (int64_t) temp) {
-                        tracks = temp;
-                        size   = ((uint64_t) tracks * (uint64_t) hpc * (uint64_t) spt) << 9LL;
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20));
-                        recalc_selection(hdlg);
-                    }
-
-                    if (tracks > max_tracks) {
-                        tracks = max_tracks;
-                        size   = ((uint64_t) tracks * (uint64_t) hpc * (uint64_t) spt) << 9LL;
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_CYL, (uint32_t) tracks);
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20));
-                        recalc_selection(hdlg);
-                    }
-
-                    no_update = 0;
-                    break;
-
-                case IDC_EDIT_HD_HPC:
-                    if (no_update)
-                        return FALSE;
-
-                    no_update = 1;
-                    get_edit_box_contents(hdlg, IDC_EDIT_HD_HPC, &temp);
-                    if (hpc != (int64_t) temp) {
-                        hpc  = temp;
-                        size = ((uint64_t) tracks * (uint64_t) hpc * (uint64_t) spt) << 9LL;
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20));
-                        recalc_selection(hdlg);
-                    }
-
-                    if (hpc > max_hpc) {
-                        hpc  = max_hpc;
-                        size = ((uint64_t) tracks * (uint64_t) hpc * (uint64_t) spt) << 9LL;
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_HPC, (uint32_t) hpc);
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20));
-                        recalc_selection(hdlg);
-                    }
-
-                    no_update = 0;
-                    break;
-
-                case IDC_EDIT_HD_SPT:
-                    if (no_update)
-                        return FALSE;
-
-                    no_update = 1;
-                    get_edit_box_contents(hdlg, IDC_EDIT_HD_SPT, &temp);
-                    if (spt != (int64_t) temp) {
-                        spt  = temp;
-                        size = ((uint64_t) tracks * (uint64_t) hpc * (uint64_t) spt) << 9LL;
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20));
-                        recalc_selection(hdlg);
-                    }
-
-                    if (spt > max_spt) {
-                        spt  = max_spt;
-                        size = ((uint64_t) tracks * (uint64_t) hpc * (uint64_t) spt) << 9LL;
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SPT, spt);
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20));
-                        recalc_selection(hdlg);
-                    }
-
-                    no_update = 0;
-                    break;
-
-                case IDC_EDIT_HD_SIZE:
-                    if (no_update)
-                        return FALSE;
-
-                    no_update = 1;
-                    get_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, &temp);
-                    if (temp != (uint32_t) (size >> 20)) {
-                        size = ((uint64_t) temp) << 20LL;
-                        /* This is needed to ensure VHD standard compliance. */
-                        hdd_image_calc_chs((uint32_t *) &tracks, (uint32_t *) &hpc, (uint32_t *) &spt, temp);
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_CYL, (uint32_t) tracks);
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_HPC, (uint32_t) hpc);
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SPT, (uint32_t) spt);
-                        recalc_selection(hdlg);
-                    }
-
-                    if (tracks > max_tracks) {
-                        tracks = max_tracks;
-                        size   = ((uint64_t) tracks * (uint64_t) hpc * (uint64_t) spt) << 9LL;
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_CYL, (uint32_t) tracks);
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20));
-                        recalc_selection(hdlg);
-                    }
-
-                    if (hpc > max_hpc) {
-                        hpc  = max_hpc;
-                        size = ((uint64_t) tracks * (uint64_t) hpc * (uint64_t) spt) << 9LL;
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_HPC, (uint32_t) hpc);
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20));
-                        recalc_selection(hdlg);
-                    }
-
-                    if (spt > max_spt) {
-                        spt  = max_spt;
-                        size = ((uint64_t) tracks * (uint64_t) hpc * (uint64_t) spt) << 9LL;
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SPT, (uint32_t) spt);
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20));
-                        recalc_selection(hdlg);
-                    }
-
-                    no_update = 0;
-                    break;
-
-                case IDC_COMBO_HD_TYPE:
-                    if (no_update)
-                        return FALSE;
-
-                    no_update = 1;
-                    temp      = settings_get_cur_sel(hdlg, IDC_COMBO_HD_TYPE);
-                    if ((temp != selection) && (temp != 127) && (temp != 128)) {
-                        selection = temp;
-                        tracks    = hdd_table[selection][0];
-                        hpc       = hdd_table[selection][1];
-                        spt       = hdd_table[selection][2];
-                        size      = ((uint64_t) tracks * (uint64_t) hpc * (uint64_t) spt) << 9LL;
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_CYL, (uint32_t) tracks);
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_HPC, (uint32_t) hpc);
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SPT, (uint32_t) spt);
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20));
-                    } else if ((temp != selection) && (temp == 127))
-                        selection = temp;
-                    else if ((temp != selection) && (temp == 128)) {
-                        selection = temp;
-                        hpc       = 16;
-                        spt       = 63;
-                        size      = ((uint64_t) tracks * (uint64_t) hpc * (uint64_t) spt) << 9LL;
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_HPC, (uint32_t) hpc);
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SPT, (uint32_t) spt);
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20));
-                    }
-
-                    if (spt > max_spt) {
-                        spt  = max_spt;
-                        size = ((uint64_t) tracks * (uint64_t) hpc * (uint64_t) spt) << 9LL;
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SPT, (uint32_t) spt);
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20));
-                        recalc_selection(hdlg);
-                    }
-
-                    if (hpc > max_hpc) {
-                        hpc  = max_hpc;
-                        size = ((uint64_t) tracks * (uint64_t) hpc * (uint64_t) spt) << 9LL;
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_HPC, (uint32_t) hpc);
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20));
-                        recalc_selection(hdlg);
-                    }
-
-                    if (tracks > max_tracks) {
-                        tracks = max_tracks;
-                        size   = ((uint64_t) tracks * (uint64_t) hpc * (uint64_t) spt) << 9LL;
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_CYL, (uint32_t) tracks);
-                        set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20));
-                        recalc_selection(hdlg);
-                    }
-
-                    no_update = 0;
-                    break;
-
-                case IDC_COMBO_HD_BUS:
-                    if (no_update)
-                        return FALSE;
-
-                    no_update = 1;
-                    recalc_location_controls(hdlg, 1, 0);
-                    b = settings_get_cur_sel(hdlg, IDC_COMBO_HD_BUS) + 1;
-                    if (b != hdd_ptr->bus) {
-                        hdd_ptr->bus = b;
-
-                        switch (hdd_ptr->bus) {
-                            default:
-                            case HDD_BUS_DISABLED:
-                                max_spt = max_hpc = max_tracks = 0;
-                                break;
-                            case HDD_BUS_MFM:
-                                max_spt    = 26; /* 17 for MFM, 26 for RLL. */
-                                max_hpc    = 15;
-                                max_tracks = 2047;
-                                break;
-                            case HDD_BUS_XTA:
-                                max_spt    = 63;
-                                max_hpc    = 16;
-                                max_tracks = 1023;
-                                break;
-                            case HDD_BUS_ESDI:
-                                max_spt    = 99; /* ESDI drives usually had 32 to 43 sectors per track. */
-                                max_hpc    = 16;
-                                max_tracks = 266305;
-                                break;
-                            case HDD_BUS_IDE:
-                                max_spt    = 255;
-                                max_hpc    = 255;
-                                max_tracks = 266305;
-                                break;
-                            case HDD_BUS_ATAPI:
-                            case HDD_BUS_SCSI:
-                                max_spt    = 255;
-                                max_hpc    = 255;
-                                max_tracks = 266305;
-                                break;
-                        }
-
-                        if (!chs_enabled) {
-                            settings_enable_window(hdlg, IDC_EDIT_HD_SPT, FALSE);
-                            settings_enable_window(hdlg, IDC_EDIT_HD_HPC, FALSE);
-                            settings_enable_window(hdlg, IDC_EDIT_HD_CYL, FALSE);
-                            settings_enable_window(hdlg, IDC_EDIT_HD_SIZE, FALSE);
-                            settings_enable_window(hdlg, IDC_COMBO_HD_TYPE, FALSE);
-                        }
-
-                        if (spt > max_spt) {
-                            spt  = max_spt;
-                            size = ((uint64_t) tracks * (uint64_t) hpc * (uint64_t) spt) << 9LL;
-                            set_edit_box_contents(hdlg, IDC_EDIT_HD_SPT, (uint32_t) spt);
-                            set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20));
-                            recalc_selection(hdlg);
-                        }
-
-                        if (hpc > max_hpc) {
-                            hpc  = max_hpc;
-                            size = ((uint64_t) tracks * (uint64_t) hpc * (uint64_t) spt) << 9LL;
-                            set_edit_box_contents(hdlg, IDC_EDIT_HD_HPC, (uint32_t) hpc);
-                            set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20));
-                            recalc_selection(hdlg);
-                        }
-
-                        if (tracks > max_tracks) {
-                            tracks = max_tracks;
-                            size   = ((uint64_t) tracks * (uint64_t) hpc * (uint64_t) spt) << 9LL;
-                            set_edit_box_contents(hdlg, IDC_EDIT_HD_CYL, (uint32_t) tracks);
-                            set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) (size >> 20));
-                            recalc_selection(hdlg);
-                        }
-                    }
-
-                    no_update = 0;
-                    break;
-                case IDC_COMBO_HD_IMG_FORMAT:
-                    img_format = settings_get_cur_sel(hdlg, IDC_COMBO_HD_IMG_FORMAT);
-
-                    no_update = 1;
-                    if (img_format == IMG_FMT_VHD_DIFF) { /* They switched to a diff VHD; disable the geometry fields. */
-                        settings_enable_window(hdlg, IDC_EDIT_HD_SPT, FALSE);
-                        set_edit_box_text_contents(hdlg, IDC_EDIT_HD_SPT, L"(N/A)");
-                        settings_enable_window(hdlg, IDC_EDIT_HD_HPC, FALSE);
-                        set_edit_box_text_contents(hdlg, IDC_EDIT_HD_HPC, L"(N/A)");
-                        settings_enable_window(hdlg, IDC_EDIT_HD_CYL, FALSE);
-                        set_edit_box_text_contents(hdlg, IDC_EDIT_HD_CYL, L"(N/A)");
-                        settings_enable_window(hdlg, IDC_EDIT_HD_SIZE, FALSE);
-                        set_edit_box_text_contents(hdlg, IDC_EDIT_HD_SIZE, L"(N/A)");
-                        settings_enable_window(hdlg, IDC_COMBO_HD_TYPE, FALSE);
-                        settings_reset_content(hdlg, IDC_COMBO_HD_TYPE);
-                        settings_add_string(hdlg, IDC_COMBO_HD_TYPE, (LPARAM) L"(use parent)");
-                        settings_set_cur_sel(hdlg, IDC_COMBO_HD_TYPE, 0);
-                    } else {
-                        get_edit_box_text_contents(hdlg, IDC_EDIT_HD_SPT, text_buf, 256);
-                        if (!wcscmp(text_buf, L"(N/A)")) {
-                            settings_enable_window(hdlg, IDC_EDIT_HD_SPT, TRUE);
-                            set_edit_box_contents(hdlg, IDC_EDIT_HD_SPT, 17);
-                            spt = 17;
-                            settings_enable_window(hdlg, IDC_EDIT_HD_HPC, TRUE);
-                            set_edit_box_contents(hdlg, IDC_EDIT_HD_HPC, 15);
-                            hpc = 15;
-                            settings_enable_window(hdlg, IDC_EDIT_HD_CYL, TRUE);
-                            set_edit_box_contents(hdlg, IDC_EDIT_HD_CYL, 1023);
-                            tracks = 1023;
-                            settings_enable_window(hdlg, IDC_EDIT_HD_SIZE, TRUE);
-                            set_edit_box_contents(hdlg, IDC_EDIT_HD_SIZE, (uint32_t) ((uint64_t) 17 * 15 * 1023 * 512 >> 20));
-                            size = (uint64_t) 17 * 15 * 1023 * 512;
-
-                            settings_reset_content(hdlg, IDC_COMBO_HD_TYPE);
-                            hdconf_initialize_hdt_combo(hdlg);
-                            settings_enable_window(hdlg, IDC_COMBO_HD_TYPE, TRUE);
-                        }
-                    }
-                    no_update = 0;
-
-                    if (img_format == IMG_FMT_VHD_DYNAMIC || img_format == IMG_FMT_VHD_DIFF) { /* For dynamic and diff VHDs, show the block size dropdown. */
-                        settings_show_window(hdlg, IDC_COMBO_HD_BLOCK_SIZE, TRUE);
-                        settings_show_window(hdlg, IDT_BLOCK_SIZE, TRUE);
-                    } else { /* Hide it otherwise. */
-                        settings_show_window(hdlg, IDC_COMBO_HD_BLOCK_SIZE, FALSE);
-                        settings_show_window(hdlg, IDT_BLOCK_SIZE, FALSE);
-                    }
-                    break;
-            }
-
-            return FALSE;
-    }
-
-    return FALSE;
-}
-
-int
-hard_disk_was_added(void)
-{
-    return hard_disk_added;
-}
-
-void
-hard_disk_add_open(HWND hwnd, int is_existing)
-{
-    existing        = is_existing;
-    hard_disk_added = 0;
-    DialogBox(hinstance, (LPCWSTR) DLG_CFG_HARD_DISKS_ADD, hwnd, win_settings_hard_disks_add_proc);
-}
-
-static void
-hard_disk_track(uint8_t id)
-{
-    switch (temp_hdd[id].bus) {
-        case HDD_BUS_MFM:
-            mfm_tracking |= (1 << (temp_hdd[id].mfm_channel << 3));
-            break;
-        case HDD_BUS_ESDI:
-            esdi_tracking |= (1 << (temp_hdd[id].esdi_channel << 3));
-            break;
-        case HDD_BUS_XTA:
-            xta_tracking |= (1 << (temp_hdd[id].xta_channel << 3));
-            break;
-        case HDD_BUS_IDE:
-        case HDD_BUS_ATAPI:
-            ide_tracking |= (1 << (temp_hdd[id].ide_channel << 3));
-            break;
-        case HDD_BUS_SCSI:
-            scsi_tracking[temp_hdd[id].scsi_id >> 3] |= (1 << ((temp_hdd[id].scsi_id & 0x07) << 3));
-            break;
-    }
-}
-
-static void
-hard_disk_untrack(uint8_t id)
-{
-    switch (temp_hdd[id].bus) {
-        case HDD_BUS_MFM:
-            mfm_tracking &= ~(1 << (temp_hdd[id].mfm_channel << 3));
-            break;
-        case HDD_BUS_ESDI:
-            esdi_tracking &= ~(1 << (temp_hdd[id].esdi_channel << 3));
-            break;
-        case HDD_BUS_XTA:
-            xta_tracking &= ~(1 << (temp_hdd[id].xta_channel << 3));
-            break;
-        case HDD_BUS_IDE:
-        case HDD_BUS_ATAPI:
-            ide_tracking &= ~(1 << (temp_hdd[id].ide_channel << 3));
-            break;
-        case HDD_BUS_SCSI:
-            scsi_tracking[temp_hdd[id].scsi_id >> 3] &= ~(1 << ((temp_hdd[id].scsi_id & 0x07) << 3));
-            break;
-    }
-}
-
-static void
-hard_disk_track_all(void)
-{
-    for (uint8_t i = 0; i < HDD_NUM; i++)
-        hard_disk_track(i);
-}
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-win_settings_hard_disks_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    int           old_sel     = 0;
-    int           b           = 0;
-    int           assign      = 0;
-    const uint8_t hd_icons[2] = { 80, 0 };
-
-    switch (message) {
-        case WM_INITDIALOG:
-            ignore_change = 1;
-
-            normalize_hd_list(); /* Normalize the hard disks so that non-disabled hard disks start from index 0, and so they are contiguous.
-                                    This will cause an emulator reset prompt on the first opening of this category with a messy hard disk list
-                                    (which can only happen by manually editing the configuration file). */
-            win_settings_hard_disks_init_columns(hdlg);
-            image_list_init(hdlg, IDC_LIST_HARD_DISKS, (const uint8_t *) hd_icons);
-            win_settings_hard_disks_recalc_list(hdlg);
-            recalc_next_free_id(hdlg);
-            add_locations(hdlg);
-            if (hd_listview_items > 0) {
-                settings_listview_select(hdlg, IDC_LIST_HARD_DISKS, 0);
-                lv1_current_sel = 0;
-                settings_set_cur_sel(hdlg, IDC_COMBO_HD_BUS, temp_hdd[0].bus - 1);
-            } else
-                lv1_current_sel = -1;
-            recalc_location_controls(hdlg, 0, 0);
-
-            settings_listview_enable_styles(hdlg, IDC_LIST_HARD_DISKS);
-
-            ignore_change = 0;
-            return TRUE;
-
-        case WM_NOTIFY:
-            if ((hd_listview_items == 0) || ignore_change)
-                return FALSE;
-
-            if ((((LPNMHDR) lParam)->code == LVN_ITEMCHANGED) && (((LPNMHDR) lParam)->idFrom == IDC_LIST_HARD_DISKS)) {
-                old_sel         = lv1_current_sel;
-                lv1_current_sel = get_selected_hard_disk(hdlg);
-                if (lv1_current_sel == old_sel)
-                    return FALSE;
-                ignore_change = 1;
-                settings_set_cur_sel(hdlg, IDC_COMBO_HD_BUS, temp_hdd[lv1_current_sel].bus - 1);
-                recalc_location_controls(hdlg, 0, 0);
-                ignore_change = 0;
-            }
-            break;
-
-        case WM_COMMAND:
-            if (ignore_change && (LOWORD(wParam) != IDC_BUTTON_HDD_ADD) && (LOWORD(wParam) != IDC_BUTTON_HDD_ADD_NEW) && (LOWORD(wParam) != IDC_BUTTON_HDD_REMOVE))
-                return FALSE;
-            switch (LOWORD(wParam)) {
-                case IDC_COMBO_HD_BUS:
-                    ignore_change = 1;
-                    b             = settings_get_cur_sel(hdlg, IDC_COMBO_HD_BUS) + 1;
-                    if (b != temp_hdd[lv1_current_sel].bus) {
-                        hard_disk_untrack(lv1_current_sel);
-                        assign                        = (temp_hdd[lv1_current_sel].bus == b) ? 0 : 1;
-                        temp_hdd[lv1_current_sel].bus = b;
-                        recalc_location_controls(hdlg, 0, assign);
-                        hard_disk_track(lv1_current_sel);
-                        win_settings_hard_disks_update_item(hdlg, lv1_current_sel, 0);
-                    }
-                    ignore_change = 0;
-                    return FALSE;
-
-                case IDC_COMBO_HD_CHANNEL:
-                    ignore_change = 1;
-                    hard_disk_untrack(lv1_current_sel);
-                    temp_hdd[lv1_current_sel].channel = settings_get_cur_sel(hdlg, IDC_COMBO_HD_CHANNEL);
-                    hard_disk_track(lv1_current_sel);
-                    win_settings_hard_disks_update_item(hdlg, lv1_current_sel, 0);
-                    ignore_change = 0;
-                    return FALSE;
-
-                case IDC_COMBO_HD_CHANNEL_IDE:
-                    ignore_change = 1;
-                    hard_disk_untrack(lv1_current_sel);
-                    temp_hdd[lv1_current_sel].ide_channel = settings_get_cur_sel(hdlg, IDC_COMBO_HD_CHANNEL_IDE);
-                    hard_disk_track(lv1_current_sel);
-                    win_settings_hard_disks_update_item(hdlg, lv1_current_sel, 0);
-                    ignore_change = 0;
-                    return FALSE;
-
-                case IDC_COMBO_HD_ID:
-                    ignore_change = 1;
-                    hard_disk_untrack(lv1_current_sel);
-                    temp_hdd[lv1_current_sel].scsi_id = settings_get_cur_sel(hdlg, IDC_COMBO_HD_ID);
-                    hard_disk_track(lv1_current_sel);
-                    win_settings_hard_disks_update_item(hdlg, lv1_current_sel, 0);
-                    ignore_change = 0;
-                    return FALSE;
-
-                case IDC_BUTTON_HDD_ADD:
-                case IDC_BUTTON_HDD_ADD_NEW:
-                    hard_disk_add_open(hdlg, (LOWORD(wParam) == IDC_BUTTON_HDD_ADD));
-                    if (hard_disk_added) {
-                        ignore_change = 1;
-                        win_settings_hard_disks_recalc_list(hdlg);
-                        recalc_next_free_id(hdlg);
-                        hard_disk_track_all();
-                        ignore_change = 0;
-                    }
-                    return FALSE;
-
-                case IDC_BUTTON_HDD_REMOVE:
-                    temp_hdd[lv1_current_sel].fn[0] = '\0';
-                    hard_disk_untrack(lv1_current_sel);
-                    temp_hdd[lv1_current_sel].bus = HDD_BUS_DISABLED; /* Only set the bus to zero, the list normalize code below will take care of turning this entire entry to a complete zero. */
-                    normalize_hd_list();                              /* Normalize the hard disks so that non-disabled hard disks start from index 0, and so they are contiguous. */
-                    ignore_change = 1;
-                    win_settings_hard_disks_recalc_list(hdlg);
-                    recalc_next_free_id(hdlg);
-                    if (hd_listview_items > 0) {
-                        settings_listview_select(hdlg, IDC_LIST_HARD_DISKS, 0);
-                        lv1_current_sel = 0;
-                        settings_set_cur_sel(hdlg, IDC_COMBO_HD_BUS, temp_hdd[0].bus - 1);
-                    } else
-                        lv1_current_sel = -1;
-                    recalc_location_controls(hdlg, 0, 0);
-                    ignore_change = 0;
-                    return FALSE;
-            }
-
-        case WM_DPICHANGED_AFTERPARENT:
-            win_settings_hard_disks_resize_columns(hdlg);
-            image_list_init(hdlg, IDC_LIST_HARD_DISKS, (const uint8_t *) hd_icons);
-            break;
-        default:
-            return FALSE;
-    }
-
-    return FALSE;
-}
-
-static int
-combo_id_to_string_id(int combo_id)
-{
-    return IDS_5376 + combo_id;
-}
-
-static int
-combo_id_to_format_string_id(int combo_id)
-{
-    return IDS_5632 + combo_id;
-}
-
-static BOOL
-win_settings_floppy_drives_recalc_list(HWND hdlg)
-{
-    LVITEM      lvI;
-    char        s[256];
-    const char *t;
-    WCHAR       szText[256];
-    HWND        hwndList = GetDlgItem(hdlg, IDC_LIST_FLOPPY_DRIVES);
-
-    lvI.mask      = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
-    lvI.stateMask = lvI.state = 0;
-
-    for (uint8_t i = 0; i < FDD_NUM; i++) {
-        lvI.iSubItem = 0;
-        if (temp_fdd_types[i] > 0) {
-            t = fdd_getname(temp_fdd_types[i]);
-            strncpy(s, t, sizeof(s) - 1);
-            mbstowcs(szText, s, strlen(s) + 1);
-            lvI.pszText = szText;
-        } else
-            lvI.pszText = plat_get_string(IDS_5376);
-        lvI.iItem  = i;
-        lvI.iImage = temp_fdd_types[i];
-
-        if (ListView_InsertItem(hwndList, &lvI) == -1)
-            return FALSE;
-
-        lvI.iSubItem = 1;
-        lvI.pszText  = plat_get_string(temp_fdd_turbo[i] ? IDS_2060 : IDS_2061);
-        lvI.iItem    = i;
-        lvI.iImage   = 0;
-
-        if (ListView_SetItem(hwndList, &lvI) == -1)
-            return FALSE;
-
-        lvI.iSubItem = 2;
-        lvI.pszText  = plat_get_string(temp_fdd_check_bpb[i] ? IDS_2060 : IDS_2061);
-        lvI.iItem    = i;
-        lvI.iImage   = 0;
-
-        if (ListView_SetItem(hwndList, &lvI) == -1)
-            return FALSE;
-    }
-
-    return TRUE;
-}
-
-static BOOL
-win_settings_cdrom_drives_recalc_list(HWND hdlg)
-{
-    LVITEM lvI;
-    int    fsid = 0;
-    WCHAR  szText[256];
-    HWND   hwndList = GetDlgItem(hdlg, IDC_LIST_CDROM_DRIVES);
-
-    lvI.mask      = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
-    lvI.stateMask = lvI.iSubItem = lvI.state = 0;
-
-    for (uint8_t i = 0; i < CDROM_NUM; i++) {
-        fsid = combo_id_to_format_string_id(temp_cdrom[i].bus_type);
-
-        lvI.iSubItem = 0;
-        switch (temp_cdrom[i].bus_type) {
-            default:
-            case CDROM_BUS_DISABLED:
-                lvI.pszText = plat_get_string(fsid);
-                lvI.iImage  = 0;
-                break;
-            case CDROM_BUS_ATAPI:
-                wsprintf(szText, plat_get_string(fsid), temp_cdrom[i].ide_channel >> 1, temp_cdrom[i].ide_channel & 1);
-                lvI.pszText = szText;
-                lvI.iImage  = 1;
-                break;
-            case CDROM_BUS_SCSI:
-                wsprintf(szText, plat_get_string(fsid), temp_cdrom[i].scsi_device_id >> 4, temp_cdrom[i].scsi_device_id & 15);
-                lvI.pszText = szText;
-                lvI.iImage  = 1;
-                break;
-        }
-
-        lvI.iItem = i;
-
-        if (ListView_InsertItem(hwndList, &lvI) == -1)
-            return FALSE;
-
-        lvI.iSubItem = 1;
-        if (temp_cdrom[i].bus_type == CDROM_BUS_DISABLED)
-            lvI.pszText = plat_get_string(IDS_2104);
-        else {
-            wsprintf(szText, L"%ix", temp_cdrom[i].speed);
-            lvI.pszText = szText;
-        }
-        lvI.iItem  = i;
-        lvI.iImage = 0;
-
-        if (ListView_SetItem(hwndList, &lvI) == -1)
-            return FALSE;
-
-#if 0
-        lvI.iSubItem = 2;
-        lvI.pszText  = plat_get_string(temp_cdrom[i].early ? IDS_2060 : IDS_2061);
-        lvI.iItem    = i;
-        lvI.iImage   = 0;
-
-        if (ListView_SetItem(hwndList, &lvI) == -1)
-            return FALSE;
-#endif
-    }
-
-    return TRUE;
-}
-
-static BOOL
-win_settings_mo_drives_recalc_list(HWND hdlg)
-{
-    LVITEM lvI;
-    int    fsid = 0;
-    WCHAR  szText[256];
-    char   szType[30];
-    HWND   hwndList = GetDlgItem(hdlg, IDC_LIST_MO_DRIVES);
-
-    lvI.mask      = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
-    lvI.stateMask = lvI.iSubItem = lvI.state = 0;
-
-    for (uint8_t i = 0; i < MO_NUM; i++) {
-        fsid = combo_id_to_format_string_id(temp_mo_drives[i].bus_type);
-
-        lvI.iSubItem = 0;
-        switch (temp_mo_drives[i].bus_type) {
-            default:
-            case MO_BUS_DISABLED:
-                lvI.pszText = plat_get_string(fsid);
-                lvI.iImage  = 0;
-                break;
-            case MO_BUS_ATAPI:
-                wsprintf(szText, plat_get_string(fsid), temp_mo_drives[i].ide_channel >> 1, temp_mo_drives[i].ide_channel & 1);
-                lvI.pszText = szText;
-                lvI.iImage  = 1;
-                break;
-            case MO_BUS_SCSI:
-                wsprintf(szText, plat_get_string(fsid), temp_mo_drives[i].scsi_device_id >> 4, temp_mo_drives[i].scsi_device_id & 15);
-                lvI.pszText = szText;
-                lvI.iImage  = 1;
-                break;
-        }
-
-        lvI.iItem = i;
-
-        if (ListView_InsertItem(hwndList, &lvI) == -1)
-            return FALSE;
-
-        lvI.iSubItem = 1;
-        if (temp_mo_drives[i].bus_type == MO_BUS_DISABLED)
-            lvI.pszText = plat_get_string(IDS_2104);
-        else {
-            memset(szType, 0, 30);
-            memcpy(szType, mo_drive_types[temp_mo_drives[i].type].vendor, 8);
-            szType[strlen(szType)] = ' ';
-            memcpy(szType + strlen(szType), mo_drive_types[temp_mo_drives[i].type].model, 16);
-            szType[strlen(szType)] = ' ';
-            memcpy(szType + strlen(szType), mo_drive_types[temp_mo_drives[i].type].revision, 4);
-
-            mbstowcs(szText, szType, strlen(szType) + 1);
-            lvI.pszText = szText;
-        }
-        lvI.iItem  = i;
-        lvI.iImage = 0;
-
-        if (ListView_SetItem(hwndList, &lvI) == -1)
-            return FALSE;
-    }
-
-    return TRUE;
-}
-
-static BOOL
-win_settings_zip_drives_recalc_list(HWND hdlg)
-{
-    LVITEM lvI;
-    int    fsid = 0;
-    WCHAR  szText[256];
-    HWND   hwndList = GetDlgItem(hdlg, IDC_LIST_ZIP_DRIVES);
-
-    lvI.mask      = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
-    lvI.stateMask = lvI.iSubItem = lvI.state = 0;
-
-    for (uint8_t i = 0; i < ZIP_NUM; i++) {
-        fsid = combo_id_to_format_string_id(temp_zip_drives[i].bus_type);
-
-        lvI.iSubItem = 0;
-        switch (temp_zip_drives[i].bus_type) {
-            default:
-            case ZIP_BUS_DISABLED:
-                lvI.pszText = plat_get_string(fsid);
-                lvI.iImage  = 0;
-                break;
-            case ZIP_BUS_ATAPI:
-                wsprintf(szText, plat_get_string(fsid), temp_zip_drives[i].ide_channel >> 1, temp_zip_drives[i].ide_channel & 1);
-                lvI.pszText = szText;
-                lvI.iImage  = 1;
-                break;
-            case ZIP_BUS_SCSI:
-                wsprintf(szText, plat_get_string(fsid), temp_zip_drives[i].scsi_device_id >> 4, temp_zip_drives[i].scsi_device_id & 15);
-                lvI.pszText = szText;
-                lvI.iImage  = 1;
-                break;
-        }
-
-        lvI.iItem = i;
-
-        if (ListView_InsertItem(hwndList, &lvI) == -1)
-            return FALSE;
-
-        lvI.iSubItem = 1;
-        lvI.pszText  = plat_get_string(temp_zip_drives[i].is_250 ? IDS_5901 : IDS_5900);
-        lvI.iItem    = i;
-        lvI.iImage   = 0;
-
-        if (ListView_SetItem(hwndList, &lvI) == -1)
-            return FALSE;
-    }
-
-    return TRUE;
-}
-
-#define C_COLUMNS_FLOPPY_DRIVES_TYPE  292
-#define C_COLUMNS_FLOPPY_DRIVES_TURBO 58
-#define C_COLUMNS_FLOPPY_DRIVES_BPB   89
-
-static void
-win_settings_floppy_drives_resize_columns(HWND hdlg)
-{
-    int  width[C_COLUMNS_FLOPPY_DRIVES] = {
-                                            C_COLUMNS_FLOPPY_DRIVES_TYPE,
-                                            C_COLUMNS_FLOPPY_DRIVES_TURBO,
-                                            C_COLUMNS_FLOPPY_DRIVES_BPB
-                                          };
-    int  total    = 0;
-    HWND hwndList = GetDlgItem(hdlg, IDC_LIST_FLOPPY_DRIVES);
-    RECT r;
-
-    GetWindowRect(hwndList, &r);
-    for (uint8_t iCol = 0; iCol < C_COLUMNS_FLOPPY_DRIVES; iCol++) {
-        width[iCol] = MulDiv(width[iCol], dpi, 96);
-        total += width[iCol];
-        ListView_SetColumnWidth(hwndList, iCol, MulDiv(width[iCol], dpi, 96));
-    }
-    width[C_COLUMNS_FLOPPY_DRIVES - 1] = (r.right - r.left) - 4 - total;
-    ListView_SetColumnWidth(hwndList, 2, width[C_COLUMNS_FLOPPY_DRIVES - 1]);
-}
-
-static BOOL
-win_settings_floppy_drives_init_columns(HWND hdlg)
-{
-    LVCOLUMN lvc;
-    HWND     hwndList = GetDlgItem(hdlg, IDC_LIST_FLOPPY_DRIVES);
-
-    lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
-
-    /* Type */
-    lvc.iSubItem = 0;
-    lvc.pszText  = plat_get_string(IDS_TYPE);
-
-    lvc.cx  = C_COLUMNS_FLOPPY_DRIVES_TYPE;
-    lvc.fmt = LVCFMT_LEFT;
-
-    if (ListView_InsertColumn(hwndList, 0, &lvc) == -1)
-        return FALSE;
-
-    /* Turbo */
-    lvc.iSubItem = 1;
-    lvc.pszText  = plat_get_string(IDS_2059);
-
-    lvc.cx  = C_COLUMNS_FLOPPY_DRIVES_TURBO;
-    lvc.fmt = LVCFMT_LEFT;
-
-    if (ListView_InsertColumn(hwndList, 1, &lvc) == -1)
-        return FALSE;
-
-    /* Check BPB */
-    lvc.iSubItem = 2;
-    lvc.pszText  = plat_get_string(IDS_BPB);
-
-    lvc.cx  = C_COLUMNS_FLOPPY_DRIVES_BPB;
-    lvc.fmt = LVCFMT_LEFT;
-
-    if (ListView_InsertColumn(hwndList, 2, &lvc) == -1)
-        return FALSE;
-
-    win_settings_floppy_drives_resize_columns(hdlg);
-    return TRUE;
-}
-
-#define C_COLUMNS_CDROM_DRIVES_BUS     292
-#define C_COLUMNS_CDROM_DRIVES_SPEED   58
-#define C_COLUMNS_CDROM_DRIVES_EARLIER 89
-
-static void
-win_settings_cdrom_drives_resize_columns(HWND hdlg)
-{
-    int width[C_COLUMNS_CDROM_DRIVES] = {
-                                          C_COLUMNS_CDROM_DRIVES_BUS,
-                                          C_COLUMNS_CDROM_DRIVES_SPEED,
-                                          C_COLUMNS_CDROM_DRIVES_EARLIER
-                                        };
-    int  total    = 0;
-    HWND hwndList = GetDlgItem(hdlg, IDC_LIST_CDROM_DRIVES);
-    RECT r;
-
-    GetWindowRect(hwndList, &r);
-    for (uint8_t iCol = 0; iCol < C_COLUMNS_CDROM_DRIVES; iCol++) {
-        width[iCol] = MulDiv(width[iCol], dpi, 96);
-        total += width[iCol];
-        ListView_SetColumnWidth(hwndList, iCol, MulDiv(width[iCol], dpi, 96));
-    }
-    width[C_COLUMNS_CDROM_DRIVES - 1] = (r.right - r.left) - 4 - total;
-    ListView_SetColumnWidth(hwndList, 2, width[C_COLUMNS_CDROM_DRIVES - 1]);
-}
-
-static BOOL
-win_settings_cdrom_drives_init_columns(HWND hdlg)
-{
-    LVCOLUMN lvc;
-    HWND     hwndList = GetDlgItem(hdlg, IDC_LIST_CDROM_DRIVES);
-
-    lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
-
-    /* Bus */
-    lvc.iSubItem = 0;
-    lvc.pszText  = plat_get_string(IDS_BUS);
-
-    lvc.cx  = C_COLUMNS_CDROM_DRIVES_BUS;
-    lvc.fmt = LVCFMT_LEFT;
-
-    if (ListView_InsertColumn(hwndList, 0, &lvc) == -1)
-        return FALSE;
-
-    /* Speed */
-    lvc.iSubItem = 1;
-    lvc.pszText  = plat_get_string(IDS_2053);
-
-    lvc.cx  = C_COLUMNS_CDROM_DRIVES_SPEED;
-    lvc.fmt = LVCFMT_LEFT;
-
-    if (ListView_InsertColumn(hwndList, 1, &lvc) == -1)
-        return FALSE;
-
-    /* Type */
-    lvc.iSubItem = 2;
-    lvc.pszText  = plat_get_string(IDS_2162);
-
-    lvc.cx  = C_COLUMNS_CDROM_DRIVES_EARLIER;
-    lvc.fmt = LVCFMT_LEFT;
-
-    if (ListView_InsertColumn(hwndList, 2, &lvc) == -1)
-        return FALSE;
-
-    win_settings_cdrom_drives_resize_columns(hdlg);
-    return TRUE;
-}
-
-#define C_COLUMNS_MO_DRIVES_BUS  292
-#define C_COLUMNS_MO_DRIVES_TYPE 147
-
-static void
-win_settings_mo_drives_resize_columns(HWND hdlg)
-{
-    int  width[C_COLUMNS_MO_DRIVES] = {
-                                        C_COLUMNS_MO_DRIVES_BUS,
-                                        C_COLUMNS_MO_DRIVES_TYPE
-                                      };
-    HWND hwndList                   = GetDlgItem(hdlg, IDC_LIST_MO_DRIVES);
-    RECT r;
-
-    GetWindowRect(hwndList, &r);
-    width[0] = MulDiv(width[0], dpi, 96);
-    ListView_SetColumnWidth(hwndList, 0, MulDiv(width[0], dpi, 96));
-    width[C_COLUMNS_MO_DRIVES - 1] = (r.right - r.left) - 4 - width[0];
-    ListView_SetColumnWidth(hwndList, 1, width[C_COLUMNS_MO_DRIVES - 1]);
-}
-
-static BOOL
-win_settings_mo_drives_init_columns(HWND hdlg)
-{
-    LVCOLUMN lvc;
-    HWND     hwndList = GetDlgItem(hdlg, IDC_LIST_MO_DRIVES);
-
-    lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
-
-    /* Bus */
-    lvc.iSubItem = 0;
-    lvc.pszText  = plat_get_string(IDS_BUS);
-
-    lvc.cx  = C_COLUMNS_MO_DRIVES_BUS;
-    lvc.fmt = LVCFMT_LEFT;
-
-    if (ListView_InsertColumn(hwndList, 0, &lvc) == -1)
-        return FALSE;
-
-    /* Type */
-    lvc.iSubItem = 1;
-    lvc.pszText  = plat_get_string(IDS_TYPE);
-
-    lvc.cx  = C_COLUMNS_MO_DRIVES_TYPE;
-    lvc.fmt = LVCFMT_LEFT;
-
-    if (ListView_InsertColumn(hwndList, 1, &lvc) == -1)
-        return FALSE;
-
-    win_settings_mo_drives_resize_columns(hdlg);
-    return TRUE;
-}
-
-#define C_COLUMNS_ZIP_DRIVES_BUS  292
-#define C_COLUMNS_ZIP_DRIVES_TYPE 147
-
-static void
-win_settings_zip_drives_resize_columns(HWND hdlg)
-{
-    int  width[C_COLUMNS_ZIP_DRIVES] = {
-                                        C_COLUMNS_ZIP_DRIVES_BUS,
-                                        C_COLUMNS_ZIP_DRIVES_TYPE
-                                      };
-    HWND hwndList                   = GetDlgItem(hdlg, IDC_LIST_ZIP_DRIVES);
-    RECT r;
-
-    GetWindowRect(hwndList, &r);
-    width[0] = MulDiv(width[0], dpi, 96);
-    ListView_SetColumnWidth(hwndList, 0, MulDiv(width[0], dpi, 96));
-    width[C_COLUMNS_ZIP_DRIVES - 1] = (r.right - r.left) - 4 - width[0];
-    ListView_SetColumnWidth(hwndList, 1, width[C_COLUMNS_ZIP_DRIVES - 1]);
-}
-
-static BOOL
-win_settings_zip_drives_init_columns(HWND hdlg)
-{
-    LVCOLUMN lvc;
-    HWND     hwndList = GetDlgItem(hdlg, IDC_LIST_ZIP_DRIVES);
-
-    lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
-
-    /* Bus */
-    lvc.iSubItem = 0;
-    lvc.pszText  = plat_get_string(IDS_BUS);
-
-    lvc.cx  = C_COLUMNS_ZIP_DRIVES_BUS;
-    lvc.fmt = LVCFMT_LEFT;
-
-    if (ListView_InsertColumn(hwndList, 0, &lvc) == -1)
-        return FALSE;
-
-    /* Type */
-    lvc.iSubItem = 1;
-    lvc.pszText  = plat_get_string(IDS_TYPE);
-
-    lvc.cx  = C_COLUMNS_ZIP_DRIVES_TYPE;
-    lvc.fmt = LVCFMT_LEFT;
-
-    if (ListView_InsertColumn(hwndList, 1, &lvc) == -1)
-        return FALSE;
-
-    win_settings_zip_drives_resize_columns(hdlg);
-    return TRUE;
-}
-
-static int
-get_selected_drive(HWND hdlg, int id, int max)
-{
-    int  drive = -1;
-    int  j = 0;
-    HWND h;
-
-    for (int i = 0; i < max; i++) {
-        h = GetDlgItem(hdlg, id);
-        j = ListView_GetItemState(h, i, LVIS_SELECTED);
-        if (j)
-            drive = i;
-    }
-
-    return drive;
-}
-
-static void
-win_settings_floppy_drives_update_item(HWND hdlg, int i)
-{
-    LVITEM      lvI;
-    char        s[256];
-    const char *t;
-    WCHAR       szText[256];
-    HWND        hwndList = GetDlgItem(hdlg, IDC_LIST_FLOPPY_DRIVES);
-
-    lvI.mask      = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
-    lvI.stateMask = lvI.iSubItem = lvI.state = 0;
-
-    lvI.iSubItem = 0;
-    lvI.iItem    = i;
-
-    if (temp_fdd_types[i] > 0) {
-        t = fdd_getname(temp_fdd_types[i]);
-        strncpy(s, t, sizeof(s) - 1);
-        mbstowcs(szText, s, strlen(s) + 1);
-        lvI.pszText = szText;
-    } else
-        lvI.pszText = plat_get_string(IDS_5376);
-    lvI.iImage = temp_fdd_types[i];
-
-    if (ListView_SetItem(hwndList, &lvI) == -1)
-        return;
-
-    lvI.iSubItem = 1;
-    lvI.pszText  = plat_get_string(temp_fdd_turbo[i] ? IDS_2060 : IDS_2061);
-    lvI.iItem    = i;
-    lvI.iImage   = 0;
-
-    if (ListView_SetItem(hwndList, &lvI) == -1)
-        return;
-
-    lvI.iSubItem = 2;
-    lvI.pszText  = plat_get_string(temp_fdd_check_bpb[i] ? IDS_2060 : IDS_2061);
-    lvI.iItem    = i;
-    lvI.iImage   = 0;
-
-    if (ListView_SetItem(hwndList, &lvI) == -1)
-        return;
-}
-
-static void
-win_settings_cdrom_drives_update_item(HWND hdlg, int i)
-{
-    LVITEM lvI;
-    WCHAR  szText[256];
-    int    fsid;
-    HWND   hwndList = GetDlgItem(hdlg, IDC_LIST_CDROM_DRIVES);
-
-    lvI.mask      = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
-    lvI.stateMask = lvI.iSubItem = lvI.state = 0;
-
-    lvI.iSubItem = 0;
-    lvI.iItem    = i;
-
-    fsid = combo_id_to_format_string_id(temp_cdrom[i].bus_type);
-
-    switch (temp_cdrom[i].bus_type) {
-        default:
-        case CDROM_BUS_DISABLED:
-            lvI.pszText = plat_get_string(fsid);
-            lvI.iImage  = 0;
-            break;
-        case CDROM_BUS_ATAPI:
-            wsprintf(szText, plat_get_string(fsid), temp_cdrom[i].ide_channel >> 1, temp_cdrom[i].ide_channel & 1);
-            lvI.pszText = szText;
-            lvI.iImage  = 1;
-            break;
-        case CDROM_BUS_SCSI:
-            wsprintf(szText, plat_get_string(fsid), temp_cdrom[i].scsi_device_id >> 4, temp_cdrom[i].scsi_device_id & 15);
-            lvI.pszText = szText;
-            lvI.iImage  = 1;
-            break;
-    }
-
-    if (ListView_SetItem(hwndList, &lvI) == -1)
-        return;
-
-    lvI.iSubItem = 1;
-    if (temp_cdrom[i].bus_type == CDROM_BUS_DISABLED)
-        lvI.pszText = plat_get_string(IDS_2104);
-    else {
-        wsprintf(szText, L"%ix", temp_cdrom[i].speed);
-        lvI.pszText = szText;
-    }
-    lvI.iItem  = i;
-    lvI.iImage = 0;
-
-    if (ListView_SetItem(hwndList, &lvI) == -1)
-        return;
-
-#if 0
-    lvI.iSubItem = 2;
-    lvI.pszText  = plat_get_string(temp_cdrom[i].early ? IDS_2060 : IDS_2061);
-    lvI.iItem    = i;
-    lvI.iImage   = 0;
-
-    if (ListView_SetItem(hwndList, &lvI) == -1)
-        return;
-#endif
-}
-
-static void
-win_settings_mo_drives_update_item(HWND hdlg, int i)
-{
-    LVITEM lvI;
-    WCHAR  szText[256];
-    char   szType[30];
-    int    fsid;
-    HWND   hwndList = GetDlgItem(hdlg, IDC_LIST_MO_DRIVES);
-
-    lvI.mask      = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
-    lvI.stateMask = lvI.iSubItem = lvI.state = 0;
-
-    /* Bus */
-    lvI.iSubItem = 0;
-    lvI.iItem    = i;
-
-    fsid = combo_id_to_format_string_id(temp_mo_drives[i].bus_type);
-
-    switch (temp_mo_drives[i].bus_type) {
-        default:
-        case MO_BUS_DISABLED:
-            lvI.pszText = plat_get_string(fsid);
-            lvI.iImage  = 0;
-            break;
-        case MO_BUS_ATAPI:
-            wsprintf(szText, plat_get_string(fsid), temp_mo_drives[i].ide_channel >> 1, temp_mo_drives[i].ide_channel & 1);
-            lvI.pszText = szText;
-            lvI.iImage  = 1;
-            break;
-        case MO_BUS_SCSI:
-            wsprintf(szText, plat_get_string(fsid), temp_mo_drives[i].scsi_device_id >> 4, temp_mo_drives[i].scsi_device_id & 15);
-            lvI.pszText = szText;
-            lvI.iImage  = 1;
-            break;
-    }
-
-    if (ListView_SetItem(hwndList, &lvI) == -1)
-        return;
-
-    /* Type */
-    lvI.iSubItem = 1;
-    if (temp_mo_drives[i].bus_type == MO_BUS_DISABLED)
-        lvI.pszText = plat_get_string(IDS_2104);
-    else {
-        memset(szType, 0, 30);
-        memcpy(szType, mo_drive_types[temp_mo_drives[i].type].vendor, 8);
-        szType[strlen(szType)] = ' ';
-        memcpy(szType + strlen(szType), mo_drive_types[temp_mo_drives[i].type].model, 16);
-        szType[strlen(szType)] = ' ';
-        memcpy(szType + strlen(szType), mo_drive_types[temp_mo_drives[i].type].revision, 4);
-        mbstowcs(szText, szType, strlen(szType) + 1);
-        lvI.pszText = szText;
-    }
-    lvI.iItem  = i;
-    lvI.iImage = 0;
-
-    if (ListView_SetItem(hwndList, &lvI) == -1)
-        return;
-}
-
-static void
-win_settings_zip_drives_update_item(HWND hdlg, int i)
-{
-    LVITEM lvI;
-    WCHAR  szText[256];
-    int    fsid;
-    HWND   hwndList = GetDlgItem(hdlg, IDC_LIST_ZIP_DRIVES);
-
-    lvI.mask      = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
-    lvI.stateMask = lvI.iSubItem = lvI.state = 0;
-
-    lvI.iSubItem = 0;
-    lvI.iItem    = i;
-
-    fsid = combo_id_to_format_string_id(temp_zip_drives[i].bus_type);
-
-    switch (temp_zip_drives[i].bus_type) {
-        default:
-        case ZIP_BUS_DISABLED:
-            lvI.pszText = plat_get_string(fsid);
-            lvI.iImage  = 0;
-            break;
-        case ZIP_BUS_ATAPI:
-            wsprintf(szText, plat_get_string(fsid), temp_zip_drives[i].ide_channel >> 1, temp_zip_drives[i].ide_channel & 1);
-            lvI.pszText = szText;
-            lvI.iImage  = 1;
-            break;
-        case ZIP_BUS_SCSI:
-            wsprintf(szText, plat_get_string(fsid), temp_zip_drives[i].scsi_device_id >> 4, temp_zip_drives[i].scsi_device_id & 15);
-            lvI.pszText = szText;
-            lvI.iImage  = 1;
-            break;
-    }
-
-    if (ListView_SetItem(hwndList, &lvI) == -1)
-        return;
-
-    lvI.iSubItem = 1;
-    lvI.pszText  = plat_get_string(temp_zip_drives[i].is_250 ? IDS_5901 : IDS_5900);
-    lvI.iItem    = i;
-    lvI.iImage   = 0;
-
-    if (ListView_SetItem(hwndList, &lvI) == -1)
-        return;
-}
-
-static void
-cdrom_add_locations(HWND hdlg)
-{
-    LPTSTR lptsTemp;
-    int    i = 0;
-
-    lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
-
-    for (i = CDROM_BUS_DISABLED; i <= CDROM_BUS_SCSI; i++) {
-        if ((i == CDROM_BUS_DISABLED) || (i >= CDROM_BUS_ATAPI))
-            settings_add_string(hdlg, IDC_COMBO_CD_BUS, win_get_string(combo_id_to_string_id(i)));
-    }
-
-    for (i = 1; i <= 72; i++) {
-        wsprintf(lptsTemp, L"%ix", i);
-        settings_add_string(hdlg, IDC_COMBO_CD_SPEED, (LPARAM) lptsTemp);
-    }
-
-    for (i = 0; i < (SCSI_BUS_MAX * SCSI_ID_MAX); i++) {
-        wsprintf(lptsTemp, plat_get_string(IDS_4135), i >> 4, i & 15);
-        settings_add_string(hdlg, IDC_COMBO_CD_ID, (LPARAM) lptsTemp);
-    }
-
-    for (i = 0; i < (IDE_BUS_MAX * IDE_CHAN_MAX); i++) {
-        wsprintf(lptsTemp, plat_get_string(IDS_4097), i >> 1, i & 1);
-        settings_add_string(hdlg, IDC_COMBO_CD_CHANNEL_IDE, (LPARAM) lptsTemp);
-    }
-
-    free(lptsTemp);
-}
-
-static void
-cdrom_recalc_location_controls(HWND hdlg, int assign_id)
-{
-    int bus = temp_cdrom[lv2_current_sel].bus_type;
-
-    for (uint16_t i = IDT_CD_ID; i <= IDT_CD_CHANNEL; i++)
-        settings_show_window(hdlg, i, FALSE);
-    settings_show_window(hdlg, IDC_COMBO_CD_ID, FALSE);
-    settings_show_window(hdlg, IDC_COMBO_CD_CHANNEL_IDE, FALSE);
-    settings_show_window(hdlg, IDC_COMBO_CD_SPEED, bus != CDROM_BUS_DISABLED);
-    settings_show_window(hdlg, IDT_CD_SPEED, bus != CDROM_BUS_DISABLED);
-#if 0
-    settings_show_window(hdlg, IDC_COMBO_CD_TYPE, bus != CDROM_BUS_DISABLED);
-#endif
-    if (bus != CDROM_BUS_DISABLED) {
-        settings_set_cur_sel(hdlg, IDC_COMBO_CD_SPEED, temp_cdrom[lv2_current_sel].speed - 1);
-#if 0
-    settings_set_check(hdlg, IDC_COMBO_CD_TYPE, temp_cdrom[lv2_current_sel].early);
-#endif
-    }
-
-    switch (bus) {
-        case CDROM_BUS_ATAPI: /* ATAPI */
-            settings_show_window(hdlg, IDT_CD_CHANNEL, TRUE);
-            settings_show_window(hdlg, IDC_COMBO_CD_CHANNEL_IDE, TRUE);
-
-            if (assign_id)
-                temp_cdrom[lv2_current_sel].ide_channel = next_free_ide_channel();
-
-            settings_set_cur_sel(hdlg, IDC_COMBO_CD_CHANNEL_IDE, temp_cdrom[lv2_current_sel].ide_channel);
-            break;
-        case CDROM_BUS_SCSI: /* SCSI */
-            settings_show_window(hdlg, IDT_CD_ID, TRUE);
-            settings_show_window(hdlg, IDC_COMBO_CD_ID, TRUE);
-
-            if (assign_id)
-                next_free_scsi_id(&temp_cdrom[lv2_current_sel].scsi_device_id);
-
-            settings_set_cur_sel(hdlg, IDC_COMBO_CD_ID, temp_cdrom[lv2_current_sel].scsi_device_id);
-            break;
-    }
-}
-
-static void
-mo_add_locations(HWND hdlg)
-{
-    LPTSTR lptsTemp;
-    char  *temp;
-    int    i = 0;
-
-    lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
-    temp     = (char *) malloc(30 * sizeof(char));
-
-    for (i = MO_BUS_DISABLED; i <= MO_BUS_SCSI; i++) {
-        if ((i == MO_BUS_DISABLED) || (i >= MO_BUS_ATAPI))
-            settings_add_string(hdlg, IDC_COMBO_MO_BUS, win_get_string(combo_id_to_string_id(i)));
-    }
-
-    for (i = 0; i < (SCSI_BUS_MAX * SCSI_ID_MAX); i++) {
-        wsprintf(lptsTemp, plat_get_string(IDS_4135), i >> 4, i & 15);
-        settings_add_string(hdlg, IDC_COMBO_MO_ID, (LPARAM) lptsTemp);
-    }
-
-    for (i = 0; i < (IDE_BUS_MAX * IDE_CHAN_MAX); i++) {
-        wsprintf(lptsTemp, plat_get_string(IDS_4097), i >> 1, i & 1);
-        settings_add_string(hdlg, IDC_COMBO_MO_CHANNEL_IDE, (LPARAM) lptsTemp);
-    }
-
-    for (int i = 0; i < KNOWN_MO_DRIVE_TYPES; i++) {
-        memset(temp, 0, 30);
-        memcpy(temp, mo_drive_types[i].vendor, 8);
-        temp[strlen(temp)] = ' ';
-        memcpy(temp + strlen(temp), mo_drive_types[i].model, 16);
-        temp[strlen(temp)] = ' ';
-        memcpy(temp + strlen(temp), mo_drive_types[i].revision, 4);
-
-        mbstowcs(lptsTemp, temp, strlen(temp) + 1);
-        settings_add_string(hdlg, IDC_COMBO_MO_TYPE, (LPARAM) lptsTemp);
-    }
-
-    free(temp);
-    free(lptsTemp);
-}
-
-static void
-mo_recalc_location_controls(HWND hdlg, int assign_id)
-{
-    int bus = temp_mo_drives[lv1_current_sel].bus_type;
-
-    for (int i = IDT_MO_ID; i <= IDT_MO_CHANNEL; i++)
-        settings_show_window(hdlg, i, FALSE);
-    settings_show_window(hdlg, IDC_COMBO_MO_ID, FALSE);
-    settings_show_window(hdlg, IDC_COMBO_MO_CHANNEL_IDE, FALSE);
-    settings_show_window(hdlg, IDC_COMBO_MO_TYPE, bus != MO_BUS_DISABLED);
-    settings_show_window(hdlg, IDT_MO_TYPE, bus != MO_BUS_DISABLED);
-
-    if (bus != MO_BUS_DISABLED)
-        settings_set_cur_sel(hdlg, IDC_COMBO_MO_TYPE, temp_mo_drives[lv1_current_sel].type);
-
-    switch (bus) {
-        case MO_BUS_ATAPI: /* ATAPI */
-            settings_show_window(hdlg, IDT_MO_CHANNEL, TRUE);
-            settings_show_window(hdlg, IDC_COMBO_MO_CHANNEL_IDE, TRUE);
-
-            if (assign_id)
-                temp_mo_drives[lv1_current_sel].ide_channel = next_free_ide_channel();
-
-            settings_set_cur_sel(hdlg, IDC_COMBO_MO_CHANNEL_IDE, temp_mo_drives[lv1_current_sel].ide_channel);
-            break;
-        case MO_BUS_SCSI: /* SCSI */
-            settings_show_window(hdlg, IDT_MO_ID, TRUE);
-            settings_show_window(hdlg, IDC_COMBO_MO_ID, TRUE);
-
-            if (assign_id)
-                next_free_scsi_id(&temp_mo_drives[lv1_current_sel].scsi_device_id);
-
-            settings_set_cur_sel(hdlg, IDC_COMBO_MO_ID, temp_mo_drives[lv1_current_sel].scsi_device_id);
-            break;
-    }
-}
-
-static void
-zip_add_locations(HWND hdlg)
-{
-    LPTSTR lptsTemp;
-    int    i = 0;
-
-    lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
-
-    for (i = ZIP_BUS_DISABLED; i <= ZIP_BUS_SCSI; i++) {
-        if ((i == ZIP_BUS_DISABLED) || (i >= ZIP_BUS_ATAPI))
-            settings_add_string(hdlg, IDC_COMBO_ZIP_BUS, win_get_string(combo_id_to_string_id(i)));
-    }
-
-    for (i = 0; i < (SCSI_BUS_MAX * SCSI_LUN_MAX); i++) {
-        wsprintf(lptsTemp, plat_get_string(IDS_4135), i >> 4, i & 15);
-        settings_add_string(hdlg, IDC_COMBO_ZIP_ID, (LPARAM) lptsTemp);
-    }
-
-    for (i = 0; i < (IDE_BUS_MAX * IDE_CHAN_MAX); i++) {
-        wsprintf(lptsTemp, plat_get_string(IDS_4097), i >> 1, i & 1);
-        settings_add_string(hdlg, IDC_COMBO_ZIP_CHANNEL_IDE, (LPARAM) lptsTemp);
-    }
-
-    free(lptsTemp);
-}
-
-static void
-zip_recalc_location_controls(HWND hdlg, int assign_id)
-{
-    int bus = temp_zip_drives[lv2_current_sel].bus_type;
-
-    for (int i = IDT_ZIP_ID; i <= IDT_ZIP_LUN; i++)
-        settings_show_window(hdlg, i, FALSE);
-    settings_show_window(hdlg, IDC_COMBO_ZIP_ID, FALSE);
-    settings_show_window(hdlg, IDC_COMBO_ZIP_CHANNEL_IDE, FALSE);
-    settings_show_window(hdlg, IDC_CHECK250, bus != ZIP_BUS_DISABLED);
-
-    if (bus != ZIP_BUS_DISABLED)
-        settings_set_check(hdlg, IDC_CHECK250, temp_zip_drives[lv2_current_sel].is_250);
-
-    switch (bus) {
-        case ZIP_BUS_ATAPI: /* ATAPI */
-            settings_show_window(hdlg, IDT_ZIP_LUN, TRUE);
-            settings_show_window(hdlg, IDC_COMBO_ZIP_CHANNEL_IDE, TRUE);
-
-            if (assign_id)
-                temp_zip_drives[lv2_current_sel].ide_channel = next_free_ide_channel();
-
-            settings_set_cur_sel(hdlg, IDC_COMBO_ZIP_CHANNEL_IDE, temp_zip_drives[lv2_current_sel].ide_channel);
-            break;
-        case ZIP_BUS_SCSI: /* SCSI */
-            settings_show_window(hdlg, IDT_ZIP_ID, TRUE);
-            settings_show_window(hdlg, IDC_COMBO_ZIP_ID, TRUE);
-
-            if (assign_id)
-                next_free_scsi_id(&temp_zip_drives[lv2_current_sel].scsi_device_id);
-
-            settings_set_cur_sel(hdlg, IDC_COMBO_ZIP_ID, temp_zip_drives[lv2_current_sel].scsi_device_id);
-            break;
-    }
-}
-
-static void
-cdrom_track(uint8_t id)
-{
-    if (temp_cdrom[id].bus_type == CDROM_BUS_ATAPI)
-        ide_tracking |= (2 << (temp_cdrom[id].ide_channel << 3));
-    else if (temp_cdrom[id].bus_type == CDROM_BUS_SCSI)
-        scsi_tracking[temp_cdrom[id].scsi_device_id >> 3] |= (1 << (temp_cdrom[id].scsi_device_id & 0x07));
-}
-
-static void
-cdrom_untrack(uint8_t id)
-{
-    if (temp_cdrom[id].bus_type == CDROM_BUS_ATAPI)
-        ide_tracking &= ~(2 << (temp_cdrom[id].ide_channel << 3));
-    else if (temp_cdrom[id].bus_type == CDROM_BUS_SCSI)
-        scsi_tracking[temp_cdrom[id].scsi_device_id >> 3] &= ~(1 << (temp_cdrom[id].scsi_device_id & 0x07));
-}
-
-static void
-zip_track(uint8_t id)
-{
-    if (temp_zip_drives[id].bus_type == ZIP_BUS_ATAPI)
-        ide_tracking |= (1 << temp_zip_drives[id].ide_channel);
-    else if (temp_zip_drives[id].bus_type == ZIP_BUS_SCSI)
-        scsi_tracking[temp_zip_drives[id].scsi_device_id >> 3] |= (1 << (temp_zip_drives[id].scsi_device_id & 0x07));
-}
-
-static void
-zip_untrack(uint8_t id)
-{
-    if (temp_zip_drives[id].bus_type == ZIP_BUS_ATAPI)
-        ide_tracking &= ~(1 << temp_zip_drives[id].ide_channel);
-    else if (temp_zip_drives[id].bus_type == ZIP_BUS_SCSI)
-        scsi_tracking[temp_zip_drives[id].scsi_device_id >> 3] &= ~(1 << (temp_zip_drives[id].scsi_device_id & 0x07));
-}
-
-static void
-mo_track(uint8_t id)
-{
-    if (temp_mo_drives[id].bus_type == MO_BUS_ATAPI)
-        ide_tracking |= (1 << (temp_mo_drives[id].ide_channel << 3));
-    else if (temp_mo_drives[id].bus_type == MO_BUS_SCSI)
-        scsi_tracking[temp_mo_drives[id].scsi_device_id >> 3] |= (1 << (temp_mo_drives[id].scsi_device_id & 0x07));
-}
-
-static void
-mo_untrack(uint8_t id)
-{
-    if (temp_mo_drives[id].bus_type == MO_BUS_ATAPI)
-        ide_tracking &= ~(1 << (temp_mo_drives[id].ide_channel << 3));
-    else if (temp_mo_drives[id].bus_type == MO_BUS_SCSI)
-        scsi_tracking[temp_mo_drives[id].scsi_device_id >> 3] &= ~(1 << (temp_mo_drives[id].scsi_device_id & 0x07));
-}
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-win_settings_floppy_and_cdrom_drives_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    int           old_sel = 0;
-    int           b = 0;
-    int           assign = 0;
-    uint32_t      b2 = 0;
-    WCHAR         szText[256];
-    const uint8_t fd_icons[15] = { 248, 16, 16, 16, 16, 16, 16, 24, 24, 24, 24, 24, 24, 24, 0 };
-    const uint8_t cd_icons[3]  = { 249, 32, 0 };
-
-    switch (message) {
-        case WM_INITDIALOG:
-            ignore_change = 1;
-
-            lv1_current_sel = 0;
-            win_settings_floppy_drives_init_columns(hdlg);
-            image_list_init(hdlg, IDC_LIST_FLOPPY_DRIVES, (const uint8_t *) fd_icons);
-            win_settings_floppy_drives_recalc_list(hdlg);
-            settings_listview_select(hdlg, IDC_LIST_FLOPPY_DRIVES, 0);
-            for (uint8_t i = 0; i < 14; i++) {
-                if (i == 0)
-                    settings_add_string(hdlg, IDC_COMBO_FD_TYPE, win_get_string(IDS_5376));
-                else {
-                    mbstowcs(szText, fdd_getname(i), strlen(fdd_getname(i)) + 1);
-                    settings_add_string(hdlg, IDC_COMBO_FD_TYPE, (LPARAM) szText);
-                }
-            }
-            settings_set_cur_sel(hdlg, IDC_COMBO_FD_TYPE, temp_fdd_types[lv1_current_sel]);
-
-            settings_set_check(hdlg, IDC_CHECKTURBO, temp_fdd_turbo[lv1_current_sel]);
-            settings_set_check(hdlg, IDC_CHECKBPB, temp_fdd_check_bpb[lv1_current_sel]);
-
-            settings_listview_enable_styles(hdlg, IDC_LIST_FLOPPY_DRIVES);
-
-            lv2_current_sel = 0;
-            win_settings_cdrom_drives_init_columns(hdlg);
-            image_list_init(hdlg, IDC_LIST_CDROM_DRIVES, (const uint8_t *) cd_icons);
-            win_settings_cdrom_drives_recalc_list(hdlg);
-            settings_listview_select(hdlg, IDC_LIST_CDROM_DRIVES, 0);
-            cdrom_add_locations(hdlg);
-
-            switch (temp_cdrom[lv2_current_sel].bus_type) {
-                default:
-                case CDROM_BUS_DISABLED:
-                    b = 0;
-                    break;
-                case CDROM_BUS_ATAPI:
-                    b = 1;
-                    break;
-                case CDROM_BUS_SCSI:
-                    b = 2;
-                    break;
-            }
-            settings_set_cur_sel(hdlg, IDC_COMBO_CD_BUS, b);
-            cdrom_recalc_location_controls(hdlg, 0);
-
-            settings_listview_enable_styles(hdlg, IDC_LIST_CDROM_DRIVES);
-
-            ignore_change = 0;
-            return TRUE;
-
-        case WM_NOTIFY:
-            if (ignore_change)
-                return FALSE;
-
-            if ((((LPNMHDR) lParam)->code == LVN_ITEMCHANGED) && (((LPNMHDR) lParam)->idFrom == IDC_LIST_FLOPPY_DRIVES)) {
-                old_sel         = lv1_current_sel;
-                lv1_current_sel = get_selected_drive(hdlg, IDC_LIST_FLOPPY_DRIVES, FDD_NUM);
-                if (lv1_current_sel == old_sel)
-                    return FALSE;
-                ignore_change = 1;
-                settings_set_cur_sel(hdlg, IDC_COMBO_FD_TYPE, temp_fdd_types[lv1_current_sel]);
-                settings_set_check(hdlg, IDC_CHECKTURBO, temp_fdd_turbo[lv1_current_sel]);
-                settings_set_check(hdlg, IDC_CHECKBPB, temp_fdd_check_bpb[lv1_current_sel]);
-                ignore_change = 0;
-            } else if ((((LPNMHDR) lParam)->code == LVN_ITEMCHANGED) && (((LPNMHDR) lParam)->idFrom == IDC_LIST_CDROM_DRIVES)) {
-                old_sel         = lv2_current_sel;
-                lv2_current_sel = get_selected_drive(hdlg, IDC_LIST_CDROM_DRIVES, CDROM_NUM);
-                if (lv2_current_sel == old_sel)
-                    return FALSE;
-                ignore_change = 1;
-
-                switch (temp_cdrom[lv2_current_sel].bus_type) {
-                    default:
-                    case CDROM_BUS_DISABLED:
-                        b = 0;
-                        break;
-                    case CDROM_BUS_ATAPI:
-                        b = 1;
-                        break;
-                    case CDROM_BUS_SCSI:
-                        b = 2;
-                        break;
-                }
-                settings_set_cur_sel(hdlg, IDC_COMBO_CD_BUS, b);
-
-                cdrom_recalc_location_controls(hdlg, 0);
-                ignore_change = 0;
-            }
-            break;
-
-        case WM_COMMAND:
-            if (ignore_change)
-                return FALSE;
-
-            ignore_change = 1;
-            switch (LOWORD(wParam)) {
-                case IDC_COMBO_FD_TYPE:
-                    temp_fdd_types[lv1_current_sel] = settings_get_cur_sel(hdlg, IDC_COMBO_FD_TYPE);
-                    win_settings_floppy_drives_update_item(hdlg, lv1_current_sel);
-                    break;
-
-                case IDC_CHECKTURBO:
-                    temp_fdd_turbo[lv1_current_sel] = settings_get_check(hdlg, IDC_CHECKTURBO);
-                    win_settings_floppy_drives_update_item(hdlg, lv1_current_sel);
-                    break;
-
-                case IDC_CHECKBPB:
-                    temp_fdd_check_bpb[lv1_current_sel] = settings_get_check(hdlg, IDC_CHECKBPB);
-                    win_settings_floppy_drives_update_item(hdlg, lv1_current_sel);
-                    break;
-
-                case IDC_COMBO_CD_BUS:
-                    b = settings_get_cur_sel(hdlg, IDC_COMBO_CD_BUS);
-                    switch (b) {
-                        case 0:
-                            b2 = CDROM_BUS_DISABLED;
-                            break;
-                        case 1:
-                            b2 = CDROM_BUS_ATAPI;
-                            break;
-                        case 2:
-                            b2 = CDROM_BUS_SCSI;
-                            break;
-                    }
-                    if (b2 == temp_cdrom[lv2_current_sel].bus_type)
-                        break;
-                    cdrom_untrack(lv2_current_sel);
-                    assign = (temp_cdrom[lv2_current_sel].bus_type == b2) ? 0 : 1;
-                    if (temp_cdrom[lv2_current_sel].bus_type == CDROM_BUS_DISABLED)
-                        temp_cdrom[lv2_current_sel].speed = 8;
-                    temp_cdrom[lv2_current_sel].bus_type = b2;
-                    cdrom_recalc_location_controls(hdlg, assign);
-                    cdrom_track(lv2_current_sel);
-                    win_settings_cdrom_drives_update_item(hdlg, lv2_current_sel);
-                    break;
-
-                case IDC_COMBO_CD_ID:
-                    cdrom_untrack(lv2_current_sel);
-                    temp_cdrom[lv2_current_sel].scsi_device_id = settings_get_cur_sel(hdlg, IDC_COMBO_CD_ID);
-                    cdrom_track(lv2_current_sel);
-                    win_settings_cdrom_drives_update_item(hdlg, lv2_current_sel);
-                    break;
-
-                case IDC_COMBO_CD_CHANNEL_IDE:
-                    cdrom_untrack(lv2_current_sel);
-                    temp_cdrom[lv2_current_sel].ide_channel = settings_get_cur_sel(hdlg, IDC_COMBO_CD_CHANNEL_IDE);
-                    cdrom_track(lv2_current_sel);
-                    win_settings_cdrom_drives_update_item(hdlg, lv2_current_sel);
-                    break;
-
-                case IDC_COMBO_CD_SPEED:
-                    temp_cdrom[lv2_current_sel].speed = settings_get_cur_sel(hdlg, IDC_COMBO_CD_SPEED) + 1;
-                    win_settings_cdrom_drives_update_item(hdlg, lv2_current_sel);
-                    break;
-
-#if 0
-                case IDC_COMBO_CD_TYPE::
-                    temp_cdrom[lv2_current_sel].early = settings_get_check(hdlg, IDC_COMBO_CD_TYPE:);
-                    win_settings_cdrom_drives_update_item(hdlg, lv2_current_sel);
-                    break;
-#endif
-            }
-            ignore_change = 0;
-
-        case WM_DPICHANGED_AFTERPARENT:
-            win_settings_floppy_drives_resize_columns(hdlg);
-            image_list_init(hdlg, IDC_LIST_FLOPPY_DRIVES, (const uint8_t *) fd_icons);
-            win_settings_cdrom_drives_resize_columns(hdlg);
-            image_list_init(hdlg, IDC_LIST_CDROM_DRIVES, (const uint8_t *) cd_icons);
-            break;
-        default:
-            return FALSE;
-    }
-
-    return FALSE;
-}
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-win_settings_other_removable_devices_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    int           old_sel = 0;
-    int           b = 0;
-    int           assign = 0;
-    uint32_t      b2           = 0;
-    const uint8_t mo_icons[3]  = { 251, 56, 0 };
-    const uint8_t zip_icons[3] = { 250, 48, 0 };
-
-    switch (message) {
-        case WM_INITDIALOG:
-            ignore_change = 1;
-
-            lv1_current_sel = 0;
-            win_settings_mo_drives_init_columns(hdlg);
-            image_list_init(hdlg, IDC_LIST_MO_DRIVES, (const uint8_t *) mo_icons);
-            win_settings_mo_drives_recalc_list(hdlg);
-            settings_listview_select(hdlg, IDC_LIST_MO_DRIVES, 0);
-            mo_add_locations(hdlg);
-
-            switch (temp_mo_drives[lv1_current_sel].bus_type) {
-                default:
-                case MO_BUS_DISABLED:
-                    b = 0;
-                    break;
-                case MO_BUS_ATAPI:
-                    b = 1;
-                    break;
-                case MO_BUS_SCSI:
-                    b = 2;
-                    break;
-            }
-            settings_set_cur_sel(hdlg, IDC_COMBO_MO_BUS, b);
-            mo_recalc_location_controls(hdlg, 0);
-
-            settings_listview_enable_styles(hdlg, IDC_LIST_MO_DRIVES);
-
-            lv2_current_sel = 0;
-            win_settings_zip_drives_init_columns(hdlg);
-            image_list_init(hdlg, IDC_LIST_ZIP_DRIVES, (const uint8_t *) zip_icons);
-            win_settings_zip_drives_recalc_list(hdlg);
-            settings_listview_select(hdlg, IDC_LIST_ZIP_DRIVES, 0);
-            zip_add_locations(hdlg);
-
-            switch (temp_zip_drives[lv2_current_sel].bus_type) {
-                default:
-                case ZIP_BUS_DISABLED:
-                    b = 0;
-                    break;
-                case ZIP_BUS_ATAPI:
-                    b = 1;
-                    break;
-                case ZIP_BUS_SCSI:
-                    b = 2;
-                    break;
-            }
-            settings_set_cur_sel(hdlg, IDC_COMBO_ZIP_BUS, b);
-            zip_recalc_location_controls(hdlg, 0);
-
-            settings_listview_enable_styles(hdlg, IDC_LIST_ZIP_DRIVES);
-
-            ignore_change = 0;
-            return TRUE;
-
-        case WM_NOTIFY:
-            if (ignore_change)
-                return FALSE;
-
-            if ((((LPNMHDR) lParam)->code == LVN_ITEMCHANGED) && (((LPNMHDR) lParam)->idFrom == IDC_LIST_MO_DRIVES)) {
-                old_sel         = lv1_current_sel;
-                lv1_current_sel = get_selected_drive(hdlg, IDC_LIST_MO_DRIVES, MO_NUM);
-                if (lv1_current_sel == old_sel)
-                    return FALSE;
-                ignore_change = 1;
-
-                switch (temp_mo_drives[lv1_current_sel].bus_type) {
-                    default:
-                    case MO_BUS_DISABLED:
-                        b = 0;
-                        break;
-                    case MO_BUS_ATAPI:
-                        b = 1;
-                        break;
-                    case MO_BUS_SCSI:
-                        b = 2;
-                        break;
-                }
-                settings_set_cur_sel(hdlg, IDC_COMBO_MO_BUS, b);
-
-                mo_recalc_location_controls(hdlg, 0);
-                ignore_change = 0;
-            } else if ((((LPNMHDR) lParam)->code == LVN_ITEMCHANGED) && (((LPNMHDR) lParam)->idFrom == IDC_LIST_ZIP_DRIVES)) {
-                old_sel         = lv2_current_sel;
-                lv2_current_sel = get_selected_drive(hdlg, IDC_LIST_ZIP_DRIVES, ZIP_NUM);
-                if (lv2_current_sel == old_sel)
-                    return FALSE;
-                ignore_change = 1;
-
-                switch (temp_zip_drives[lv2_current_sel].bus_type) {
-                    default:
-                    case ZIP_BUS_DISABLED:
-                        b = 0;
-                        break;
-                    case ZIP_BUS_ATAPI:
-                        b = 1;
-                        break;
-                    case ZIP_BUS_SCSI:
-                        b = 2;
-                        break;
-                }
-                settings_set_cur_sel(hdlg, IDC_COMBO_ZIP_BUS, b);
-
-                zip_recalc_location_controls(hdlg, 0);
-                ignore_change = 0;
-            }
-            break;
-
-        case WM_COMMAND:
-            if (ignore_change)
-                return FALSE;
-
-            ignore_change = 1;
-            switch (LOWORD(wParam)) {
-                case IDC_COMBO_MO_BUS:
-                    b = settings_get_cur_sel(hdlg, IDC_COMBO_MO_BUS);
-                    switch (b) {
-                        case 0:
-                            b2 = MO_BUS_DISABLED;
-                            break;
-                        case 1:
-                            b2 = MO_BUS_ATAPI;
-                            break;
-                        case 2:
-                            b2 = MO_BUS_SCSI;
-                            break;
-                    }
-                    if (b2 == temp_mo_drives[lv1_current_sel].bus_type)
-                        break;
-                    mo_untrack(lv1_current_sel);
-                    assign = (temp_mo_drives[lv1_current_sel].bus_type == b2) ? 0 : 1;
-                    if (temp_mo_drives[lv1_current_sel].bus_type == MO_BUS_DISABLED)
-                        temp_mo_drives[lv1_current_sel].type = 0;
-                    temp_mo_drives[lv1_current_sel].bus_type = b2;
-                    mo_recalc_location_controls(hdlg, assign);
-                    mo_track(lv1_current_sel);
-                    win_settings_mo_drives_update_item(hdlg, lv1_current_sel);
-                    break;
-
-                case IDC_COMBO_MO_ID:
-                    mo_untrack(lv1_current_sel);
-                    temp_mo_drives[lv1_current_sel].scsi_device_id = settings_get_cur_sel(hdlg, IDC_COMBO_MO_ID);
-                    mo_track(lv1_current_sel);
-                    win_settings_mo_drives_update_item(hdlg, lv1_current_sel);
-                    break;
-
-                case IDC_COMBO_MO_CHANNEL_IDE:
-                    mo_untrack(lv1_current_sel);
-                    temp_mo_drives[lv1_current_sel].ide_channel = settings_get_cur_sel(hdlg, IDC_COMBO_MO_CHANNEL_IDE);
-                    mo_track(lv1_current_sel);
-                    win_settings_mo_drives_update_item(hdlg, lv1_current_sel);
-                    break;
-
-                case IDC_COMBO_MO_TYPE:
-                    temp_mo_drives[lv1_current_sel].type = settings_get_cur_sel(hdlg, IDC_COMBO_MO_TYPE);
-                    win_settings_mo_drives_update_item(hdlg, lv1_current_sel);
-                    break;
-
-                case IDC_COMBO_ZIP_BUS:
-                    b = settings_get_cur_sel(hdlg, IDC_COMBO_ZIP_BUS);
-                    switch (b) {
-                        case 0:
-                            b2 = ZIP_BUS_DISABLED;
-                            break;
-                        case 1:
-                            b2 = ZIP_BUS_ATAPI;
-                            break;
-                        case 2:
-                            b2 = ZIP_BUS_SCSI;
-                            break;
-                    }
-                    if (b2 == temp_zip_drives[lv2_current_sel].bus_type)
-                        break;
-                    zip_untrack(lv2_current_sel);
-                    assign                                    = (temp_zip_drives[lv2_current_sel].bus_type == b2) ? 0 : 1;
-                    temp_zip_drives[lv2_current_sel].bus_type = b2;
-                    zip_recalc_location_controls(hdlg, assign);
-                    zip_track(lv2_current_sel);
-                    win_settings_zip_drives_update_item(hdlg, lv2_current_sel);
-                    break;
-
-                case IDC_COMBO_ZIP_ID:
-                    zip_untrack(lv2_current_sel);
-                    temp_zip_drives[lv2_current_sel].scsi_device_id = settings_get_cur_sel(hdlg, IDC_COMBO_ZIP_ID);
-                    zip_track(lv2_current_sel);
-                    win_settings_zip_drives_update_item(hdlg, lv2_current_sel);
-                    break;
-
-                case IDC_COMBO_ZIP_CHANNEL_IDE:
-                    zip_untrack(lv2_current_sel);
-                    temp_zip_drives[lv2_current_sel].ide_channel = settings_get_cur_sel(hdlg, IDC_COMBO_ZIP_CHANNEL_IDE);
-                    zip_track(lv2_current_sel);
-                    win_settings_zip_drives_update_item(hdlg, lv2_current_sel);
-                    break;
-
-                case IDC_CHECK250:
-                    temp_zip_drives[lv2_current_sel].is_250 = settings_get_check(hdlg, IDC_CHECK250);
-                    win_settings_zip_drives_update_item(hdlg, lv2_current_sel);
-                    break;
-            }
-            ignore_change = 0;
-
-        case WM_DPICHANGED_AFTERPARENT:
-            win_settings_mo_drives_resize_columns(hdlg);
-            image_list_init(hdlg, IDC_LIST_MO_DRIVES, (const uint8_t *) mo_icons);
-            win_settings_zip_drives_resize_columns(hdlg);
-            image_list_init(hdlg, IDC_LIST_ZIP_DRIVES, (const uint8_t *) zip_icons);
-            break;
-        default:
-            return FALSE;
-    }
-
-    return FALSE;
-}
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-win_settings_peripherals_proc(HWND hdlg, UINT message, WPARAM wParam, UNUSED(LPARAM lParam))
-{
-    int             c;
-    int             d;
-    int             e;
-    LPTSTR          lptsTemp;
-    char           *stransi;
-    const device_t *dev;
-
-    switch (message) {
-        case WM_INITDIALOG:
-            lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
-            stransi  = (char *) malloc(512);
-
-            /* Populate the ISA RTC card dropdown. */
-            e = 0;
-            settings_reset_content(hdlg, IDC_COMBO_ISARTC);
-            for (d = 0;; d++) {
-                generate_device_name(isartc_get_device(d), isartc_get_internal_name(d), 0);
-
-                if (!device_name[0])
-                    break;
-                dev = isartc_get_device(d);
-                if (device_is_valid(dev, temp_machine)) {
-                    if (d == 0) {
-                        settings_add_string(hdlg, IDC_COMBO_ISARTC, win_get_string(IDS_2104));
-                        settings_set_cur_sel(hdlg, IDC_COMBO_ISARTC, 0);
-                    } else
-                        settings_add_string(hdlg, IDC_COMBO_ISARTC, (LPARAM) device_name);
-                    settings_list_to_device[1][e] = d;
-                    if (d == temp_isartc)
-                        settings_set_cur_sel(hdlg, IDC_COMBO_ISARTC, e);
-                    e++;
-                }
-            }
-            settings_enable_window(hdlg, IDC_COMBO_ISARTC, machine_has_bus(temp_machine, MACHINE_BUS_ISA));
-            settings_enable_window(hdlg, IDC_CONFIGURE_ISARTC, ((temp_isartc != 0) && machine_has_bus(temp_machine, MACHINE_BUS_ISA)));
-
-            /* Populate the ISA memory card dropdowns. */
-            for (c = 0; c < ISAMEM_MAX; c++) {
-                e = 0;
-                settings_reset_content(hdlg, IDC_COMBO_ISAMEM_1 + c);
-                for (d = 0;; d++) {
-                    generate_device_name(isamem_get_device(d), (char *) isamem_get_internal_name(d), 0);
-
-                    if (!device_name[0])
-                        break;
-
-                    dev = isamem_get_device(d);
-                    if (device_is_valid(dev, temp_machine)) {
-                        if (d == 0) {
-                            settings_add_string(hdlg, IDC_COMBO_ISAMEM_1 + c, win_get_string(IDS_2104));
-                            settings_set_cur_sel(hdlg, IDC_COMBO_ISAMEM_1 + c, 0);
-                        } else
-                            settings_add_string(hdlg, IDC_COMBO_ISAMEM_1 + c, (LPARAM) device_name);
-                        settings_list_to_device[0][e] = d;
-                        if (d == temp_isamem[c])
-                            settings_set_cur_sel(hdlg, IDC_COMBO_ISAMEM_1 + c, e);
-                        e++;
-                    }
-                }
-                settings_enable_window(hdlg, IDC_COMBO_ISAMEM_1 + c, machine_has_bus(temp_machine, MACHINE_BUS_ISA));
-                settings_enable_window(hdlg, IDC_CONFIGURE_ISAMEM_1 + c, ((temp_isamem[c] != 0) && machine_has_bus(temp_machine, MACHINE_BUS_ISA)));
-            }
-
-            settings_enable_window(hdlg, IDC_CHECK_BUGGER, machine_has_bus(temp_machine, MACHINE_BUS_ISA));
-            settings_set_check(hdlg, IDC_CHECK_BUGGER, (temp_bugger && machine_has_bus(temp_machine, MACHINE_BUS_ISA)));
-            settings_set_check(hdlg, IDC_CHECK_POSTCARD, temp_postcard);
-
-            free(stransi);
-            free(lptsTemp);
-
-            return TRUE;
-
-        case WM_COMMAND:
-            switch (LOWORD(wParam)) {
-                case IDC_CONFIGURE_ISARTC:
-                    temp_isartc = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_ISARTC)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) isartc_get_device(temp_isartc));
-                    break;
-
-                case IDC_COMBO_ISARTC:
-                    temp_isartc = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_ISARTC)];
-                    settings_enable_window(hdlg, IDC_CONFIGURE_ISARTC, temp_isartc != 0);
-                    break;
-
-                case IDC_COMBO_ISAMEM_1:
-                case IDC_COMBO_ISAMEM_2:
-                case IDC_COMBO_ISAMEM_3:
-                case IDC_COMBO_ISAMEM_4:
-                    c              = LOWORD(wParam) - IDC_COMBO_ISAMEM_1;
-                    temp_isamem[c] = settings_list_to_device[0][settings_get_cur_sel(hdlg, LOWORD(wParam))];
-                    settings_enable_window(hdlg, IDC_CONFIGURE_ISAMEM_1 + c, temp_isamem[c] != 0);
-                    break;
-
-                case IDC_CONFIGURE_ISAMEM_1:
-                case IDC_CONFIGURE_ISAMEM_2:
-                case IDC_CONFIGURE_ISAMEM_3:
-                case IDC_CONFIGURE_ISAMEM_4:
-                    c = LOWORD(wParam) - IDC_CONFIGURE_ISAMEM_1;
-                    temp_deviceconfig |= deviceconfig_inst_open(hdlg, (void *) isamem_get_device(temp_isamem[c]), c + 1);
-                    break;
-            }
-            return FALSE;
-
-        case WM_SAVESETTINGS:
-            temp_isartc = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_ISARTC)];
-            for (c = 0; c < ISAMEM_MAX; c++) {
-                temp_isamem[c] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_ISAMEM_1 + c)];
-            }
-            temp_bugger   = settings_get_check(hdlg, IDC_CHECK_BUGGER);
-            temp_postcard = settings_get_check(hdlg, IDC_CHECK_POSTCARD);
-
-        default:
-            return FALSE;
-    }
-    return FALSE;
-}
-
-void
-win_settings_show_child(HWND hwndParent, DWORD child_id)
-{
-    if (child_id == displayed_category)
-        return;
-    else
-        displayed_category = child_id;
-
-    SendMessage(hwndChildDialog, WM_SAVESETTINGS, 0, 0);
-
-    DestroyWindow(hwndChildDialog);
-
-    switch (child_id) {
-        case SETTINGS_PAGE_MACHINE:
-            hwndChildDialog = CreateDialog(hinstance, (LPCWSTR) DLG_CFG_MACHINE, hwndParent, win_settings_machine_proc);
-            break;
-        case SETTINGS_PAGE_VIDEO:
-            hwndChildDialog = CreateDialog(hinstance, (LPCWSTR) DLG_CFG_VIDEO, hwndParent, win_settings_video_proc);
-            break;
-        case SETTINGS_PAGE_INPUT:
-            hwndChildDialog = CreateDialog(hinstance, (LPCWSTR) DLG_CFG_INPUT, hwndParent, win_settings_input_proc);
-            break;
-        case SETTINGS_PAGE_SOUND:
-            hwndChildDialog = CreateDialog(hinstance, (LPCWSTR) DLG_CFG_SOUND, hwndParent, win_settings_sound_proc);
-            break;
-        case SETTINGS_PAGE_NETWORK:
-            hwndChildDialog = CreateDialog(hinstance, (LPCWSTR) DLG_CFG_NETWORK, hwndParent, win_settings_network_proc);
-            break;
-        case SETTINGS_PAGE_PORTS:
-            hwndChildDialog = CreateDialog(hinstance, (LPCWSTR) DLG_CFG_PORTS, hwndParent, win_settings_ports_proc);
-            break;
-        case SETTINGS_PAGE_STORAGE:
-            hwndChildDialog = CreateDialog(hinstance, (LPCWSTR) DLG_CFG_STORAGE, hwndParent, win_settings_storage_proc);
-            break;
-        case SETTINGS_PAGE_HARD_DISKS:
-            hwndChildDialog = CreateDialog(hinstance, (LPCWSTR) DLG_CFG_HARD_DISKS, hwndParent, win_settings_hard_disks_proc);
-            break;
-        case SETTINGS_PAGE_FLOPPY_AND_CDROM_DRIVES:
-            hwndChildDialog = CreateDialog(hinstance, (LPCWSTR) DLG_CFG_FLOPPY_AND_CDROM_DRIVES, hwndParent, win_settings_floppy_and_cdrom_drives_proc);
-            break;
-        case SETTINGS_PAGE_OTHER_REMOVABLE_DEVICES:
-            hwndChildDialog = CreateDialog(hinstance, (LPCWSTR) DLG_CFG_OTHER_REMOVABLE_DEVICES, hwndParent, win_settings_other_removable_devices_proc);
-            break;
-        case SETTINGS_PAGE_PERIPHERALS:
-            hwndChildDialog = CreateDialog(hinstance, (LPCWSTR) DLG_CFG_PERIPHERALS, hwndParent, win_settings_peripherals_proc);
-            break;
-        default:
-            fatal("Invalid child dialog ID\n");
-            return;
-    }
-
-    ShowWindow(hwndChildDialog, SW_SHOWNORMAL);
-}
-
-static BOOL
-win_settings_main_insert_categories(HWND hwndList)
-{
-    LVITEM lvI;
-
-    lvI.mask      = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
-    lvI.stateMask = lvI.iSubItem = lvI.state = 0;
-
-    for (uint8_t i = 0; i < 11; i++) {
-        lvI.pszText = plat_get_string(IDS_2065 + i);
-        lvI.iItem   = i;
-        lvI.iImage  = i;
-
-        if (ListView_InsertItem(hwndList, &lvI) == -1)
-            return FALSE;
-    }
-
-    return TRUE;
-}
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-win_settings_confirm(HWND hdlg)
-{
-    int i;
-
-    SendMessage(hwndChildDialog, WM_SAVESETTINGS, 0, 0);
-
-    if (win_settings_changed()) {
-        if (confirm_save && !settings_only)
-            i = settings_msgbox_ex(MBX_QUESTION_OK | MBX_WARNING | MBX_DONTASK, (wchar_t *) IDS_2122, (wchar_t *) IDS_2123, (wchar_t *) IDS_2124, NULL, NULL);
-        else
-            i = 0;
-
-        if (i == 10) {
-            confirm_save = 0;
-            i            = 0;
-        }
-
-        if (i == 0)
-            win_settings_save();
-        else
-            return FALSE;
-    }
-
-    DestroyWindow(hwndChildDialog);
-    EndDialog(hdlg, 0);
-    win_notify_dlg_closed();
-    return TRUE;
-}
-
-static void
-win_settings_categories_resize_columns(HWND hdlg)
-{
-    HWND hwndList = GetDlgItem(hdlg, IDC_SETTINGSCATLIST);
-    RECT r;
-
-    GetWindowRect(hwndList, &r);
-    ListView_SetColumnWidth(hwndList, 0, (r.right - r.left) + 1 - 5);
-}
-
-static BOOL
-win_settings_categories_init_columns(HWND hdlg)
-{
-    LVCOLUMN lvc;
-    int      iCol     = 0;
-    HWND     hwndList = GetDlgItem(hdlg, IDC_SETTINGSCATLIST);
-
-    lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
-
-    lvc.iSubItem = 0;
-    lvc.pszText  = plat_get_string(2048);
-
-    lvc.cx  = 171;
-    lvc.fmt = LVCFMT_LEFT;
-
-    if (ListView_InsertColumn(hwndList, iCol, &lvc) == -1)
-        return FALSE;
-
-    win_settings_categories_resize_columns(hdlg);
-    return TRUE;
-}
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-win_settings_main_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    HWND          h = NULL;
-    int           category;
-    int           j = 0;
-    const uint8_t cat_icons[12] = { 240, 241, 242, 243, 96, 244, 252, 80, 246, 247, 245, 0 };
-
-    hwndParentDialog = hdlg;
-
-    switch (message) {
-        case WM_INITDIALOG:
-            dpi = win_get_dpi(hdlg);
-            win_settings_init();
-            displayed_category = -1;
-            h                  = GetDlgItem(hdlg, IDC_SETTINGSCATLIST);
-            win_settings_categories_init_columns(hdlg);
-            image_list_init(hdlg, IDC_SETTINGSCATLIST, (const uint8_t *) cat_icons);
-            win_settings_main_insert_categories(h);
-            settings_listview_select(hdlg, IDC_SETTINGSCATLIST, first_cat);
-            settings_listview_enable_styles(hdlg, IDC_SETTINGSCATLIST);
-            return TRUE;
-        case WM_NOTIFY:
-            if ((((LPNMHDR) lParam)->code == LVN_ITEMCHANGED) && (((LPNMHDR) lParam)->idFrom == IDC_SETTINGSCATLIST)) {
-                category = -1;
-                for (uint8_t i = 0; i < 11; i++) {
-                    h = GetDlgItem(hdlg, IDC_SETTINGSCATLIST);
-                    j = ListView_GetItemState(h, i, LVIS_SELECTED);
-                    if (j)
-                        category = i;
-                }
-                if (category != -1)
-                    win_settings_show_child(hdlg, category);
-            }
-            break;
-        case WM_CLOSE:
-            DestroyWindow(hwndChildDialog);
-            EndDialog(hdlg, 0);
-            win_notify_dlg_closed();
-            return TRUE;
-        case WM_COMMAND:
-            switch (LOWORD(wParam)) {
-                case IDOK:
-                    return win_settings_confirm(hdlg);
-                case IDCANCEL:
-                    DestroyWindow(hwndChildDialog);
-                    EndDialog(hdlg, 0);
-                    win_notify_dlg_closed();
-                    return TRUE;
-            }
-            break;
-
-        case WM_DPICHANGED:
-            dpi = HIWORD(wParam);
-            win_settings_categories_resize_columns(hdlg);
-            image_list_init(hdlg, IDC_SETTINGSCATLIST, (const uint8_t *) cat_icons);
-            break;
-        default:
-            return FALSE;
-    }
-
-    return FALSE;
-}
-
-void
-win_settings_open_ex(HWND hwnd, int category)
-{
-    win_notify_dlg_open();
-
-    first_cat = category;
-    DialogBox(hinstance, (LPCWSTR) DLG_CONFIG, hwnd, win_settings_main_proc);
-}
-
-void
-win_settings_open(HWND hwnd)
-{
-    win_settings_open_ex(hwnd, SETTINGS_PAGE_MACHINE);
-}
diff --git a/src/win/win_snd_gain.c b/src/win/win_snd_gain.c
deleted file mode 100644
index 5297661bf..000000000
--- a/src/win/win_snd_gain.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Handle the sound gain dialog.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *
- *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-#define UNICODE
-#define BITMAP WINDOWS_BITMAP
-#include <windows.h>
-#include <windowsx.h>
-#undef BITMAP
-#include <commctrl.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/config.h>
-#include <86box/plat.h>
-#include <86box/sound.h>
-#include <86box/win.h>
-
-static uint8_t old_gain;
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-SoundGainDialogProcedure(HWND hdlg, UINT message, WPARAM wParam, UNUSED(LPARAM lParam))
-{
-    HWND h;
-
-    switch (message) {
-        case WM_INITDIALOG:
-            old_gain = sound_gain;
-            h        = GetDlgItem(hdlg, IDC_SLIDER_GAIN);
-            SendMessage(h, TBM_SETRANGE, (WPARAM) 1, MAKELONG(0, 9));
-            SendMessage(h, TBM_SETPOS, (WPARAM) 1, 9 - (sound_gain >> 1));
-            SendMessage(h, TBM_SETTICFREQ, (WPARAM) 1, 0);
-            SendMessage(h, TBM_SETLINESIZE, (WPARAM) 0, 1);
-            SendMessage(h, TBM_SETPAGESIZE, (WPARAM) 0, 2);
-            break;
-
-        case WM_VSCROLL:
-            h          = GetDlgItem(hdlg, IDC_SLIDER_GAIN);
-            sound_gain = (9 - SendMessage(h, TBM_GETPOS, (WPARAM) 0, 0)) << 1;
-            break;
-
-        case WM_COMMAND:
-            switch (LOWORD(wParam)) {
-                case IDOK:
-                    h          = GetDlgItem(hdlg, IDC_SLIDER_GAIN);
-                    sound_gain = (9 - SendMessage(h, TBM_GETPOS, (WPARAM) 0, 0)) << 1;
-                    config_save();
-                    EndDialog(hdlg, 0);
-                    return TRUE;
-
-                case IDCANCEL:
-                    sound_gain = old_gain;
-                    config_save();
-                    EndDialog(hdlg, 0);
-                    return TRUE;
-
-                default:
-                    break;
-            }
-            break;
-    }
-
-    return FALSE;
-}
-
-void
-SoundGainDialogCreate(HWND hwnd)
-{
-    DialogBox(hinstance, (LPCTSTR) DLG_SND_GAIN, hwnd, SoundGainDialogProcedure);
-}
diff --git a/src/win/win_specify_dim.c b/src/win/win_specify_dim.c
deleted file mode 100644
index 5bedb846d..000000000
--- a/src/win/win_specify_dim.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Handle the dialog for specifying the dimensions of the main window.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *
- *          Copyright 2016-2018 Miran Grca.
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-#define UNICODE
-#define BITMAP WINDOWS_BITMAP
-#include <windows.h>
-#include <windowsx.h>
-#undef BITMAP
-#include <commctrl.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/config.h>
-#include <86box/plat.h>
-#include <86box/video.h>
-#include <86box/sound.h>
-#include <86box/win.h>
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-SpecifyDimensionsDialogProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    HWND     h;
-    HWND     h2;
-    HMENU    hmenu;
-    UDACCEL  accel;
-    UDACCEL  accel2;
-    RECT     r;
-    uint32_t temp_x = 0;
-    uint32_t temp_y = 0;
-    int      dpi    = 96;
-    int      lock;
-    LPTSTR   lptsTemp;
-    char    *stransi;
-
-    switch (message) {
-        case WM_INITDIALOG:
-            GetWindowRect(hwndRender, &r);
-
-            h  = GetDlgItem(hdlg, IDC_WIDTHSPIN);
-            h2 = GetDlgItem(hdlg, IDC_EDIT_WIDTH);
-            SendMessage(h, UDM_SETBUDDY, (WPARAM) h2, 0);
-            SendMessage(h, UDM_SETRANGE, 0, (120 << 16) | 2048);
-            accel.nSec = 0;
-            accel.nInc = 8;
-            SendMessage(h, UDM_SETACCEL, 1, (LPARAM) &accel);
-            SendMessage(h, UDM_SETPOS, 0, r.right - r.left);
-
-            h  = GetDlgItem(hdlg, IDC_HEIGHTSPIN);
-            h2 = GetDlgItem(hdlg, IDC_EDIT_HEIGHT);
-            SendMessage(h, UDM_SETBUDDY, (WPARAM) h2, 0);
-            SendMessage(h, UDM_SETRANGE, 0, (120 << 16) | 2048);
-            accel2.nSec = 0;
-            accel2.nInc = 8;
-            SendMessage(h, UDM_SETACCEL, 1, (LPARAM) &accel2);
-            SendMessage(h, UDM_SETPOS, 0, r.bottom - r.top);
-
-            h = GetDlgItem(hdlg, IDC_CHECK_LOCK_SIZE);
-            SendMessage(h, BM_SETCHECK, !!(vid_resize & 2), 0);
-            break;
-
-        case WM_COMMAND:
-            switch (LOWORD(wParam)) {
-                case IDOK:
-                    lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
-                    stransi  = (char *) malloc(512);
-
-                    h = GetDlgItem(hdlg, IDC_EDIT_WIDTH);
-                    SendMessage(h, WM_GETTEXT, 255, (LPARAM) lptsTemp);
-                    wcstombs(stransi, lptsTemp, 512);
-                    sscanf(stransi, "%u", &temp_x);
-                    fixed_size_x = temp_x;
-
-                    h = GetDlgItem(hdlg, IDC_EDIT_HEIGHT);
-                    SendMessage(h, WM_GETTEXT, 255, (LPARAM) lptsTemp);
-                    wcstombs(stransi, lptsTemp, 512);
-                    sscanf(stransi, "%u", &temp_y);
-                    fixed_size_y = temp_y;
-
-                    h    = GetDlgItem(hdlg, IDC_CHECK_LOCK_SIZE);
-                    lock = SendMessage(h, BM_GETCHECK, 0, 0);
-
-                    if (lock) {
-                        vid_resize      = 2;
-                        window_remember = 0;
-                    } else {
-                        vid_resize      = 1;
-                        window_remember = 1;
-                    }
-                    hmenu = GetMenu(hwndMain);
-                    CheckMenuItem(hmenu, IDM_VID_REMEMBER, (window_remember == 1) ? MF_CHECKED : MF_UNCHECKED);
-                    CheckMenuItem(hmenu, IDM_VID_RESIZE, (vid_resize == 1) ? MF_CHECKED : MF_UNCHECKED);
-                    EnableMenuItem(hmenu, IDM_VID_RESIZE, (vid_resize & 2) ? MF_GRAYED : MF_ENABLED);
-
-                    if (vid_resize == 1)
-                        SetWindowLongPtr(hwndMain, GWL_STYLE, (WS_OVERLAPPEDWINDOW) | WS_VISIBLE);
-                    else
-                        SetWindowLongPtr(hwndMain, GWL_STYLE, (WS_OVERLAPPEDWINDOW & ~WS_SIZEBOX & ~WS_MAXIMIZEBOX) | WS_VISIBLE);
-
-                    /* scale the screen base on DPI */
-                    if (dpi_scale) {
-                        dpi    = win_get_dpi(hwndMain);
-                        temp_x = MulDiv(temp_x, dpi, 96);
-                        temp_y = MulDiv(temp_y, dpi, 96);
-                    }
-
-                    ResizeWindowByClientArea(hwndMain, temp_x, temp_y + sbar_height + tbar_height);
-
-                    if (vid_resize) {
-                        CheckMenuItem(hmenu, IDM_VID_SCALE_1X + scale, MF_UNCHECKED);
-                        CheckMenuItem(hmenu, IDM_VID_SCALE_2X, MF_CHECKED);
-                        scale = 1;
-                    }
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_1X, vid_resize ? MF_GRAYED : MF_ENABLED);
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_2X, vid_resize ? MF_GRAYED : MF_ENABLED);
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_3X, vid_resize ? MF_GRAYED : MF_ENABLED);
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_4X, vid_resize ? MF_GRAYED : MF_ENABLED);
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_5X, vid_resize ? MF_GRAYED : MF_ENABLED);
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_6X, vid_resize ? MF_GRAYED : MF_ENABLED);
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_7X, vid_resize ? MF_GRAYED : MF_ENABLED);
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_8X, vid_resize ? MF_GRAYED : MF_ENABLED);
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_9X, vid_resize ? MF_GRAYED : MF_ENABLED);
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_10X, vid_resize ? MF_GRAYED : MF_ENABLED);
-
-                    scrnsz_x = fixed_size_x;
-                    scrnsz_y = fixed_size_y;
-                    atomic_store(&doresize_monitors[0], 1);
-
-                    GetWindowRect(hwndMain, &r);
-
-                    if (mouse_capture)
-                        ClipCursor(&r);
-
-                    if (window_remember || (vid_resize & 2)) {
-                        window_x = r.left;
-                        window_y = r.top;
-                        if (!(vid_resize & 2)) {
-                            window_w = r.right - r.left;
-                            window_h = r.bottom - r.top;
-                        }
-                    }
-
-                    config_save();
-
-                    free(stransi);
-                    free(lptsTemp);
-
-                    EndDialog(hdlg, 0);
-                    return TRUE;
-
-                case IDCANCEL:
-                    EndDialog(hdlg, 0);
-                    return TRUE;
-
-                default:
-                    break;
-            }
-            break;
-    }
-
-    return FALSE;
-}
-
-void
-SpecifyDimensionsDialogCreate(HWND hwnd)
-{
-    DialogBox(hinstance, (LPCTSTR) DLG_SPECIFY_DIM, hwnd, SpecifyDimensionsDialogProcedure);
-}
diff --git a/src/win/win_stbar.c b/src/win/win_stbar.c
deleted file mode 100644
index 2cf8d84f4..000000000
--- a/src/win/win_stbar.c
+++ /dev/null
@@ -1,1058 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          Implement the application's Status Bar.
- *
- *
- *
- * Authors: Miran Grca, <mgrca8@gmail.com>
- *          Fred N. van Kempen, <decwiz@yahoo.com>
- *
- *          Copyright 2016-2019 Miran Grca.
- *          Copyright 2017-2019 Fred N. van Kempen.
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-#define UNICODE
-#define BITMAP WINDOWS_BITMAP
-#include <windows.h>
-#include <windowsx.h>
-#include <commctrl.h>
-#include <commdlg.h>
-#undef BITMAP
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/config.h>
-#include "cpu.h"
-#include <86box/device.h>
-#include <86box/machine.h>
-#include <86box/timer.h>
-#include <86box/cassette.h>
-#include <86box/cartridge.h>
-#include <86box/hdd.h>
-#include <86box/hdc.h>
-#include <86box/fdd.h>
-#include <86box/fdd_86f.h>
-#include <86box/scsi.h>
-#include <86box/scsi_device.h>
-#include <86box/cdrom.h>
-#include <86box/zip.h>
-#include <86box/mo.h>
-#include <86box/cdrom_image.h>
-#include <86box/scsi_disk.h>
-#include <86box/thread.h>
-#include <86box/network.h>
-#include <86box/video.h>
-#include <86box/sound.h>
-#include <86box/plat.h>
-#include <86box/ui.h>
-#include <86box/win.h>
-
-HWND hwndSBAR;
-int  update_icons   = 1;
-int  reset_occurred = 1;
-
-static LONG_PTR OriginalProcedure;
-static WCHAR  **sbTips;
-static int     *iStatusWidths;
-static int     *sb_part_meanings;
-static uint8_t *sb_part_icons;
-static int      sb_parts = 0;
-static int      sb_ready = 0;
-static uint8_t  sb_map[256];
-static int      icon_width      = 24;
-static wchar_t  sb_text[512]    = L"\0";
-static wchar_t  sb_bugtext[512] = L"\0";
-
-/* Also used by win_settings.c */
-intptr_t
-fdd_type_to_icon(int type)
-{
-    int ret = 248;
-
-    switch (type) {
-        case 0:
-            break;
-
-        case 1:
-        case 2:
-        case 3:
-        case 4:
-        case 5:
-        case 6:
-            ret = 16;
-            break;
-
-        case 7:
-        case 8:
-        case 9:
-        case 10:
-        case 11:
-        case 12:
-        case 13:
-            ret = 24;
-            break;
-
-        default:
-            break;
-    }
-
-    return ret;
-}
-
-/* FIXME: should be hdd_count() in hdd.c */
-static int
-hdd_count(int bus)
-{
-    int c = 0;
-
-    for (uint8_t i = 0; i < HDD_NUM; i++) {
-        if (hdd[i].bus == bus)
-            c++;
-    }
-
-    return c;
-}
-
-void
-ui_sb_timer_callback(int pane)
-{
-    if (!(reset_occurred & 1)) {
-        sb_part_icons[pane] &= ~1;
-
-        if (sb_part_icons && sb_part_icons[pane]) {
-            SendMessage(hwndSBAR, SB_SETICON, pane,
-                        (LPARAM) hIcon[sb_part_icons[pane]]);
-        }
-    } else
-        reset_occurred &= ~1;
-
-    reset_occurred &= ~2;
-}
-
-/* API */
-/* API: update one of the icons after activity. */
-void
-ui_sb_update_icon(int tag, int active)
-{
-    uint8_t found = 0xff;
-
-    if (!update_icons || !sb_ready)
-        return;
-
-    if ((tag & 0xf0) >= SB_TEXT)
-        return;
-
-    found = sb_map[tag];
-    if ((found != 0xff) && ((sb_part_icons[found] ^ active) & 1) && active) {
-        sb_part_icons[found] |= 1;
-
-        PostMessage(hwndSBAR, SB_SETICON, found,
-                    (LPARAM) hIcon[sb_part_icons[found]]);
-
-        reset_occurred = 2;
-        SetTimer(hwndMain, 0x8000 | found, 75, NULL);
-    }
-}
-
-/* API: This is for the drive state indicator. */
-void
-ui_sb_update_icon_state(int tag, int state)
-{
-    uint8_t found = 0xff;
-
-    if (!sb_ready || ((tag & 0xf0) >= SB_HDD))
-        return;
-
-    found = sb_map[tag];
-    if (found != 0xff) {
-        sb_part_icons[found] &= ~128;
-        sb_part_icons[found] |= (state ? 128 : 0);
-
-        SendMessage(hwndSBAR, SB_SETICON, found,
-                    (LPARAM) hIcon[sb_part_icons[found]]);
-    }
-}
-
-static void
-StatusBarCreateCassetteTip(int part)
-{
-    WCHAR tempTip[512];
-    WCHAR fn[512];
-
-    if (strlen(cassette_fname) == 0)
-        _swprintf(tempTip, plat_get_string(IDS_2149), plat_get_string(IDS_2057));
-    else {
-        mbstoc16s(fn, cassette_fname, sizeof_w(fn));
-        _swprintf(tempTip, plat_get_string(IDS_2149), fn);
-    }
-
-    if (sbTips[part] != NULL) {
-        free(sbTips[part]);
-        sbTips[part] = NULL;
-    }
-    sbTips[part] = (WCHAR *) malloc((wcslen(tempTip) << 1) + 2);
-    wcscpy(sbTips[part], tempTip);
-}
-
-static void
-StatusBarCreateCartridgeTip(int part)
-{
-    WCHAR tempTip[512];
-    WCHAR fn[512];
-    int   drive = sb_part_meanings[part] & 0xf;
-
-    if (strlen(cart_fns[drive]) == 0) {
-        _swprintf(tempTip, plat_get_string(IDS_2151),
-                  drive + 1, plat_get_string(IDS_2057));
-    } else {
-        mbstoc16s(fn, cart_fns[drive], sizeof_w(fn));
-        _swprintf(tempTip, plat_get_string(IDS_2151),
-                  drive + 1, fn);
-    }
-
-    if (sbTips[part] != NULL) {
-        free(sbTips[part]);
-        sbTips[part] = NULL;
-    }
-    sbTips[part] = (WCHAR *) malloc((wcslen(tempTip) << 1) + 2);
-    wcscpy(sbTips[part], tempTip);
-}
-
-static void
-StatusBarCreateFloppyTip(int part)
-{
-    WCHAR wtext[512];
-    WCHAR tempTip[512];
-    WCHAR fn[512];
-
-    int drive = sb_part_meanings[part] & 0xf;
-
-    mbstoc16s(wtext, fdd_getname(fdd_get_type(drive)),
-              strlen(fdd_getname(fdd_get_type(drive))) + 1);
-    if (strlen(floppyfns[drive]) == 0) {
-        _swprintf(tempTip, plat_get_string(IDS_2109),
-                  drive + 1, wtext, plat_get_string(IDS_2057));
-    } else {
-        mbstoc16s(fn, floppyfns[drive], sizeof_w(fn));
-        _swprintf(tempTip, plat_get_string(IDS_2109),
-                  drive + 1, wtext, fn);
-    }
-
-    if (sbTips[part] != NULL) {
-        free(sbTips[part]);
-        sbTips[part] = NULL;
-    }
-    sbTips[part] = (WCHAR *) malloc((wcslen(tempTip) << 1) + 2);
-    wcscpy(sbTips[part], tempTip);
-}
-
-static void
-StatusBarCreateCdromTip(int part)
-{
-    WCHAR  tempTip[512];
-    WCHAR *szText;
-    WCHAR  fn[512];
-    int    id;
-    int    drive = sb_part_meanings[part] & 0xf;
-    int    bus   = cdrom[drive].bus_type;
-
-    id     = IDS_5377 + (bus - 1);
-    szText = plat_get_string(id);
-
-    if (cdrom[drive].host_drive == 200) {
-        if (strlen(cdrom[drive].image_path) == 0) {
-            _swprintf(tempTip, plat_get_string(IDS_5120),
-                      drive + 1, szText, plat_get_string(IDS_2057));
-        } else {
-            mbstoc16s(fn, cdrom[drive].image_path, sizeof_w(fn));
-            _swprintf(tempTip, plat_get_string(IDS_5120),
-                      drive + 1, szText, fn);
-        }
-    } else
-        _swprintf(tempTip, plat_get_string(IDS_5120), drive + 1, szText, plat_get_string(IDS_2057));
-
-    if (sbTips[part] != NULL) {
-        free(sbTips[part]);
-        sbTips[part] = NULL;
-    }
-    sbTips[part] = (WCHAR *) malloc((wcslen(tempTip) << 1) + 4);
-    wcscpy(sbTips[part], tempTip);
-}
-
-static void
-StatusBarCreateZIPTip(int part)
-{
-    WCHAR  tempTip[512];
-    WCHAR *szText;
-    WCHAR  fn[512];
-    int    id;
-    int    drive = sb_part_meanings[part] & 0xf;
-    int    bus   = zip_drives[drive].bus_type;
-
-    id     = IDS_5377 + (bus - 1);
-    szText = plat_get_string(id);
-
-    int type = zip_drives[drive].is_250 ? 250 : 100;
-
-    if (strlen(zip_drives[drive].image_path) == 0) {
-        _swprintf(tempTip, plat_get_string(IDS_2054),
-                  type, drive + 1, szText, plat_get_string(IDS_2057));
-    } else {
-        mbstoc16s(fn, zip_drives[drive].image_path, sizeof_w(fn));
-        _swprintf(tempTip, plat_get_string(IDS_2054),
-                  type, drive + 1, szText, fn);
-    }
-
-    if (sbTips[part] != NULL) {
-        free(sbTips[part]);
-        sbTips[part] = NULL;
-    }
-    sbTips[part] = (WCHAR *) malloc((wcslen(tempTip) << 1) + 2);
-    wcscpy(sbTips[part], tempTip);
-}
-
-static void
-StatusBarCreateMOTip(int part)
-{
-    WCHAR  tempTip[512];
-    WCHAR *szText;
-    WCHAR  fn[512];
-    int    id;
-    int    drive = sb_part_meanings[part] & 0xf;
-    int    bus   = mo_drives[drive].bus_type;
-
-    id     = IDS_5377 + (bus - 1);
-    szText = plat_get_string(id);
-
-    if (strlen(mo_drives[drive].image_path) == 0) {
-        _swprintf(tempTip, plat_get_string(IDS_2116),
-                  drive + 1, szText, plat_get_string(IDS_2057));
-    } else {
-        mbstoc16s(fn, mo_drives[drive].image_path, sizeof_w(fn));
-        _swprintf(tempTip, plat_get_string(IDS_2116),
-                  drive + 1, szText, fn);
-    }
-
-    if (sbTips[part] != NULL) {
-        free(sbTips[part]);
-        sbTips[part] = NULL;
-    }
-    sbTips[part] = (WCHAR *) malloc((wcslen(tempTip) << 1) + 2);
-    wcscpy(sbTips[part], tempTip);
-}
-
-static void
-StatusBarCreateDiskTip(int part)
-{
-    WCHAR  tempTip[512];
-    WCHAR *szText;
-    int    id;
-    int    bus = sb_part_meanings[part] & 0xf;
-
-    id     = IDS_4352 + (bus - 1);
-    szText = plat_get_string(id);
-
-    _swprintf(tempTip, plat_get_string(IDS_4096), szText);
-    if (sbTips[part] != NULL)
-        free(sbTips[part]);
-    sbTips[part] = (WCHAR *) malloc((wcslen(tempTip) << 1) + 2);
-    wcscpy(sbTips[part], tempTip);
-}
-
-static void
-StatusBarCreateNetworkTip(int part)
-{
-    WCHAR tempTip[512];
-
-    _swprintf(tempTip, plat_get_string(IDS_2069));
-
-    if (sbTips[part] != NULL)
-        free(sbTips[part]);
-    sbTips[part] = (WCHAR *) malloc((wcslen(tempTip) << 1) + 2);
-    wcscpy(sbTips[part], tempTip);
-}
-
-static void
-StatusBarCreateSoundTip(int part)
-{
-    WCHAR tempTip[512];
-
-    _swprintf(tempTip, plat_get_string(IDS_2068));
-
-    if (sbTips[part] != NULL)
-        free(sbTips[part]);
-    sbTips[part] = (WCHAR *) malloc((wcslen(tempTip) << 1) + 2);
-    wcscpy(sbTips[part], tempTip);
-}
-
-/* API */
-void
-ui_sb_update_tip(int meaning)
-{
-    uint8_t part = 0xff;
-
-    if (!sb_ready || (sb_parts == 0) || (sb_part_meanings == NULL))
-        return;
-
-    part = sb_map[meaning];
-
-    if (part != 0xff) {
-        switch (meaning & 0xf0) {
-            case SB_CASSETTE:
-                StatusBarCreateCassetteTip(part);
-                break;
-
-            case SB_CARTRIDGE:
-                StatusBarCreateCartridgeTip(part);
-                break;
-
-            case SB_FLOPPY:
-                StatusBarCreateFloppyTip(part);
-                break;
-
-            case SB_CDROM:
-                StatusBarCreateCdromTip(part);
-                break;
-
-            case SB_ZIP:
-                StatusBarCreateZIPTip(part);
-                break;
-
-            case SB_MO:
-                StatusBarCreateMOTip(part);
-                break;
-
-            case SB_HDD:
-                StatusBarCreateDiskTip(part);
-                break;
-
-            case SB_NETWORK:
-                StatusBarCreateNetworkTip(part);
-                break;
-
-            case SB_SOUND:
-                StatusBarCreateSoundTip(part);
-                break;
-
-            default:
-                break;
-        }
-
-        SendMessage(hwndSBAR, SB_SETTIPTEXT, part, (LPARAM) sbTips[part]);
-    }
-}
-
-static void
-StatusBarDestroyTips(void)
-{
-    if (sb_parts == 0)
-        return;
-
-    if (!sbTips)
-        return;
-
-    for (int i = 0; i < sb_parts; i++) {
-        if (sbTips[i]) {
-            free(sbTips[i]);
-            sbTips[i] = NULL;
-        }
-    }
-
-    free(sbTips);
-    sbTips = NULL;
-}
-
-/* API: mark the status bar as not ready. */
-/* Values: -1 - not ready, but don't clear POST text
-            0 - not ready
-            1 - ready */
-void
-ui_sb_set_ready(int ready)
-{
-    if (ready == 0) {
-        ui_sb_bugui(NULL);
-        ui_sb_set_text(NULL);
-    }
-
-    if (ready == -1)
-        ready = 0;
-
-    sb_ready = ready;
-}
-
-/* API: update the status bar panes. */
-void
-ui_sb_update_panes(void)
-{
-    int         i;
-    int         id;
-    int         cart_int;
-    int         mfm_int;
-    int         xta_int;
-    int         esdi_int;
-    int         ide_int;
-    int         scsi_int;
-    int         edge = 0;
-    int         c_mfm;
-    int         c_esdi;
-    int         c_xta;
-    int         c_ide;
-    int         c_scsi;
-    int         do_net;
-    const char *hdc_name;
-
-    if (!config_changed)
-        return;
-
-    if (sb_ready) {
-        sb_ready = 0;
-    }
-
-    cart_int = machine_has_cartridge(machine) ? 1 : 0;
-    mfm_int  = machine_has_flags(machine, MACHINE_MFM) ? 1 : 0;
-    xta_int  = machine_has_flags(machine, MACHINE_XTA) ? 1 : 0;
-    esdi_int = machine_has_flags(machine, MACHINE_ESDI) ? 1 : 0;
-    ide_int  = machine_has_flags(machine, MACHINE_IDE_QUAD) ? 1 : 0;
-    scsi_int = machine_has_flags(machine, MACHINE_SCSI) ? 1 : 0;
-
-    c_mfm  = hdd_count(HDD_BUS_MFM);
-    c_esdi = hdd_count(HDD_BUS_ESDI);
-    c_xta  = hdd_count(HDD_BUS_XTA);
-    c_ide  = hdd_count(HDD_BUS_IDE);
-    c_scsi = hdd_count(HDD_BUS_SCSI);
-    do_net = network_available();
-
-    media_menu_reset();
-
-    if (sb_parts > 0) {
-        for (i = 0; i < sb_parts; i++)
-            SendMessage(hwndSBAR, SB_SETICON, i, (LPARAM) NULL);
-        SendMessage(hwndSBAR, SB_SETPARTS, (WPARAM) 0, (LPARAM) NULL);
-
-        if (iStatusWidths) {
-            free(iStatusWidths);
-            iStatusWidths = NULL;
-        }
-        if (sb_part_meanings) {
-            free(sb_part_meanings);
-            sb_part_meanings = NULL;
-        }
-        if (sb_part_icons) {
-            free(sb_part_icons);
-            sb_part_icons = NULL;
-        }
-        StatusBarDestroyTips();
-    }
-
-    memset(sb_map, 0xff, sizeof(sb_map));
-
-    sb_parts = 0;
-    if (cassette_enable)
-        sb_parts++;
-    if (cart_int)
-        sb_parts += 2;
-    for (i = 0; i < FDD_NUM; i++) {
-        if (fdd_get_type(i) != 0)
-            sb_parts++;
-    }
-    hdc_name = hdc_get_internal_name(hdc_current);
-    for (i = 0; i < CDROM_NUM; i++) {
-        /* Could be Internal or External IDE.. */
-        if ((cdrom[i].bus_type == CDROM_BUS_ATAPI) && !ide_int && memcmp(hdc_name, "xtide", 5) && memcmp(hdc_name, "ide", 3))
-            continue;
-
-        if ((cdrom[i].bus_type == CDROM_BUS_SCSI) && !scsi_int && (scsi_card_current[0] == 0) && (scsi_card_current[1] == 0) && (scsi_card_current[2] == 0) && (scsi_card_current[3] == 0))
-            continue;
-        if (cdrom[i].bus_type != 0)
-            sb_parts++;
-    }
-    for (i = 0; i < ZIP_NUM; i++) {
-        /* Could be Internal or External IDE.. */
-        if ((zip_drives[i].bus_type == ZIP_BUS_ATAPI) && !ide_int && memcmp(hdc_name, "xtide", 5) && memcmp(hdc_name, "ide", 3))
-            continue;
-
-        if ((zip_drives[i].bus_type == ZIP_BUS_SCSI) && !scsi_int && (scsi_card_current[0] == 0) && (scsi_card_current[1] == 0) && (scsi_card_current[2] == 0) && (scsi_card_current[3] == 0))
-            continue;
-        if (zip_drives[i].bus_type != 0)
-            sb_parts++;
-    }
-    for (i = 0; i < MO_NUM; i++) {
-        /* Could be Internal or External IDE.. */
-        if ((mo_drives[i].bus_type == MO_BUS_ATAPI) && !ide_int && memcmp(hdc_name, "xtide", 5) && memcmp(hdc_name, "ide", 3))
-            continue;
-
-        if ((mo_drives[i].bus_type == MO_BUS_SCSI) && !scsi_int && (scsi_card_current[0] == 0) && (scsi_card_current[1] == 0) && (scsi_card_current[2] == 0) && (scsi_card_current[3] == 0))
-            continue;
-        if (mo_drives[i].bus_type != 0)
-            sb_parts++;
-    }
-    if (c_mfm && (mfm_int || !memcmp(hdc_name, "st506", 5))) {
-        /* MFM drives, and MFM or Internal controller. */
-        sb_parts++;
-    }
-    if (c_esdi && (esdi_int || !memcmp(hdc_name, "esdi", 4))) {
-        /* ESDI drives, and ESDI or Internal controller. */
-        sb_parts++;
-    }
-    if (c_xta && (xta_int || !memcmp(hdc_name, "xta", 3)))
-        sb_parts++;
-    if (c_ide && (ide_int || !memcmp(hdc_name, "xtide", 5) || !memcmp(hdc_name, "ide", 3)))
-        sb_parts++;
-    if (c_scsi && (scsi_int || (scsi_card_current[0] != 0) || (scsi_card_current[1] != 0) || (scsi_card_current[2] != 0) || (scsi_card_current[3] != 0)))
-        sb_parts++;
-    if (do_net)
-        sb_parts++;
-    sb_parts += 2;
-
-    iStatusWidths = (int *) malloc(sb_parts * sizeof(int));
-    memset(iStatusWidths, 0, sb_parts * sizeof(int));
-    sb_part_meanings = (int *) malloc(sb_parts * sizeof(int));
-    memset(sb_part_meanings, 0, sb_parts * sizeof(int));
-    sb_part_icons = (uint8_t *) malloc(sb_parts * sizeof(uint8_t));
-    memset(sb_part_icons, 0, sb_parts * sizeof(uint8_t));
-    sbTips = (WCHAR **) malloc(sb_parts * sizeof(WCHAR *));
-    memset(sbTips, 0, sb_parts * sizeof(WCHAR *));
-
-    sb_parts = 0;
-    if (cassette_enable) {
-        edge += icon_width;
-        iStatusWidths[sb_parts]    = edge;
-        sb_part_meanings[sb_parts] = SB_CASSETTE;
-        sb_map[SB_CASSETTE]        = sb_parts;
-        sb_parts++;
-    }
-    for (i = 0; i < 2; i++) {
-        if (cart_int) {
-            edge += icon_width;
-            iStatusWidths[sb_parts]    = edge;
-            sb_part_meanings[sb_parts] = SB_CARTRIDGE | i;
-            sb_map[SB_CARTRIDGE | i]   = sb_parts;
-            sb_parts++;
-        }
-    }
-    for (i = 0; i < FDD_NUM; i++) {
-        if (fdd_get_type(i) != 0) {
-            edge += icon_width;
-            iStatusWidths[sb_parts]    = edge;
-            sb_part_meanings[sb_parts] = SB_FLOPPY | i;
-            sb_map[SB_FLOPPY | i]      = sb_parts;
-            sb_parts++;
-        }
-    }
-    for (i = 0; i < CDROM_NUM; i++) {
-        /* Could be Internal or External IDE.. */
-        if ((cdrom[i].bus_type == CDROM_BUS_ATAPI) && !ide_int && memcmp(hdc_name, "xtide", 5) && memcmp(hdc_name, "ide", 3))
-            continue;
-        if ((cdrom[i].bus_type == CDROM_BUS_SCSI) && !scsi_int && (scsi_card_current[0] == 0) && (scsi_card_current[1] == 0) && (scsi_card_current[2] == 0) && (scsi_card_current[3] == 0))
-            continue;
-        if (cdrom[i].bus_type != 0) {
-            edge += icon_width;
-            iStatusWidths[sb_parts]    = edge;
-            sb_part_meanings[sb_parts] = SB_CDROM | i;
-            sb_map[SB_CDROM | i]       = sb_parts;
-            sb_parts++;
-        }
-    }
-    for (i = 0; i < ZIP_NUM; i++) {
-        /* Could be Internal or External IDE.. */
-        if ((zip_drives[i].bus_type == ZIP_BUS_ATAPI) && !ide_int && memcmp(hdc_name, "xtide", 5) && memcmp(hdc_name, "ide", 3))
-            continue;
-        if ((zip_drives[i].bus_type == ZIP_BUS_SCSI) && !scsi_int && (scsi_card_current[0] == 0) && (scsi_card_current[1] == 0) && (scsi_card_current[2] == 0) && (scsi_card_current[3] == 0))
-            continue;
-        if (zip_drives[i].bus_type != 0) {
-            edge += icon_width;
-            iStatusWidths[sb_parts]    = edge;
-            sb_part_meanings[sb_parts] = SB_ZIP | i;
-            sb_map[SB_ZIP | i]         = sb_parts;
-            sb_parts++;
-        }
-    }
-    for (i = 0; i < MO_NUM; i++) {
-        /* Could be Internal or External IDE.. */
-        if ((mo_drives[i].bus_type == MO_BUS_ATAPI) && !ide_int && memcmp(hdc_name, "xtide", 5) && memcmp(hdc_name, "ide", 3))
-            continue;
-        if ((mo_drives[i].bus_type == MO_BUS_SCSI) && !scsi_int && (scsi_card_current[0] == 0) && (scsi_card_current[1] == 0) && (scsi_card_current[2] == 0) && (scsi_card_current[3] == 0))
-            continue;
-        if (mo_drives[i].bus_type != 0) {
-            edge += icon_width;
-            iStatusWidths[sb_parts]    = edge;
-            sb_part_meanings[sb_parts] = SB_MO | i;
-            sb_map[SB_MO | i]          = sb_parts;
-            sb_parts++;
-        }
-    }
-    if (c_mfm && (mfm_int || !memcmp(hdc_name, "st506", 5))) {
-        edge += icon_width;
-        iStatusWidths[sb_parts]      = edge;
-        sb_part_meanings[sb_parts]   = SB_HDD | HDD_BUS_MFM;
-        sb_map[SB_HDD | HDD_BUS_MFM] = sb_parts;
-        sb_parts++;
-    }
-    if (c_esdi && (esdi_int || !memcmp(hdc_name, "esdi", 4))) {
-        edge += icon_width;
-        iStatusWidths[sb_parts]       = edge;
-        sb_part_meanings[sb_parts]    = SB_HDD | HDD_BUS_ESDI;
-        sb_map[SB_HDD | HDD_BUS_ESDI] = sb_parts;
-        sb_parts++;
-    }
-    if (c_xta && (xta_int || !memcmp(hdc_name, "xta", 3))) {
-        edge += icon_width;
-        iStatusWidths[sb_parts]      = edge;
-        sb_part_meanings[sb_parts]   = SB_HDD | HDD_BUS_XTA;
-        sb_map[SB_HDD | HDD_BUS_XTA] = sb_parts;
-        sb_parts++;
-    }
-    if (c_ide && (ide_int || !memcmp(hdc_name, "xtide", 5) || !memcmp(hdc_name, "ide", 3))) {
-        edge += icon_width;
-        iStatusWidths[sb_parts]      = edge;
-        sb_part_meanings[sb_parts]   = SB_HDD | HDD_BUS_IDE;
-        sb_map[SB_HDD | HDD_BUS_IDE] = sb_parts;
-        sb_parts++;
-    }
-    if (c_scsi && (scsi_int || (scsi_card_current[0] != 0) || (scsi_card_current[1] != 0) || (scsi_card_current[2] != 0) || (scsi_card_current[3] != 0))) {
-        edge += icon_width;
-        iStatusWidths[sb_parts]       = edge;
-        sb_part_meanings[sb_parts]    = SB_HDD | HDD_BUS_SCSI;
-        sb_map[SB_HDD | HDD_BUS_SCSI] = sb_parts;
-        sb_parts++;
-    }
-    if (do_net) {
-        edge += icon_width;
-        iStatusWidths[sb_parts]    = edge;
-        sb_part_meanings[sb_parts] = SB_NETWORK;
-        sb_map[SB_NETWORK]         = sb_parts;
-        sb_parts++;
-    }
-
-    edge += icon_width;
-    iStatusWidths[sb_parts]    = edge;
-    sb_part_meanings[sb_parts] = SB_SOUND;
-    sb_map[SB_SOUND]           = sb_parts;
-    sb_parts++;
-
-    if (sb_parts)
-        iStatusWidths[sb_parts] = -1;
-    sb_part_meanings[sb_parts] = SB_TEXT;
-    sb_map[SB_TEXT]            = sb_parts;
-    sb_parts++;
-
-    SendMessage(hwndSBAR, SB_SETPARTS, (WPARAM) sb_parts, (LPARAM) iStatusWidths);
-
-    for (i = 0; i < sb_parts; i++) {
-        switch (sb_part_meanings[i] & 0xf0) {
-            case SB_CASSETTE: /* Cassette */
-                sb_part_icons[i] = (strlen(cassette_fname) == 0) ? 128 : 0;
-                sb_part_icons[i] |= 64;
-                StatusBarCreateCassetteTip(i);
-                break;
-
-            case SB_CARTRIDGE: /* Cartridge */
-                sb_part_icons[i] = (strlen(cart_fns[sb_part_meanings[i] & 0xf]) == 0) ? 128 : 0;
-                sb_part_icons[i] |= 104;
-                StatusBarCreateCartridgeTip(i);
-                break;
-
-            case SB_FLOPPY: /* Floppy */
-                sb_part_icons[i] = (strlen(floppyfns[sb_part_meanings[i] & 0xf]) == 0) ? 128 : 0;
-                sb_part_icons[i] |= fdd_type_to_icon(fdd_get_type(sb_part_meanings[i] & 0xf));
-                StatusBarCreateFloppyTip(i);
-                break;
-
-            case SB_CDROM: /* CD-ROM */
-                id = sb_part_meanings[i] & 0xf;
-                if (cdrom[id].host_drive == 200)
-                    sb_part_icons[i] = (strlen(cdrom[id].image_path) == 0) ? 128 : 0;
-                else
-                    sb_part_icons[i] = 128;
-                sb_part_icons[i] |= 32;
-                StatusBarCreateCdromTip(i);
-                break;
-
-            case SB_ZIP: /* Iomega ZIP */
-                sb_part_icons[i] = (strlen(zip_drives[sb_part_meanings[i] & 0xf].image_path) == 0) ? 128 : 0;
-                sb_part_icons[i] |= 48;
-                StatusBarCreateZIPTip(i);
-                break;
-
-            case SB_MO: /* Magneto-Optical disk */
-                sb_part_icons[i] = (strlen(mo_drives[sb_part_meanings[i] & 0xf].image_path) == 0) ? 128 : 0;
-                sb_part_icons[i] |= 56;
-                StatusBarCreateMOTip(i);
-                break;
-
-            case SB_HDD: /* Hard disk */
-                sb_part_icons[i] = 80;
-                StatusBarCreateDiskTip(i);
-                break;
-
-            case SB_NETWORK: /* Network */
-                sb_part_icons[i] = 96;
-                StatusBarCreateNetworkTip(i);
-                break;
-
-            case SB_SOUND: /* Sound */
-                sb_part_icons[i] = 243;
-                StatusBarCreateSoundTip(i);
-                break;
-
-            case SB_TEXT: /* Status text */
-                SendMessage(hwndSBAR, SB_SETTEXT, i | SBT_NOBORDERS, (LPARAM) L"");
-                sb_part_icons[i] = 255;
-                break;
-        }
-
-        if (sb_part_icons[i] != 255) {
-            SendMessage(hwndSBAR, SB_SETTEXT, i | SBT_NOBORDERS, (LPARAM) L"");
-            SendMessage(hwndSBAR, SB_SETICON, i, (LPARAM) hIcon[sb_part_icons[i]]);
-            SendMessage(hwndSBAR, SB_SETTIPTEXT, i, (LPARAM) sbTips[i]);
-        } else
-            SendMessage(hwndSBAR, SB_SETICON, i, (LPARAM) NULL);
-    }
-
-    sb_ready = 1;
-    if (reset_occurred & 2)
-        reset_occurred |= 1;
-}
-
-static VOID APIENTRY
-StatusBarPopupMenu(HWND hwnd, POINT pt, int id)
-{
-    HMENU menu;
-
-    if (id >= (sb_parts - 1))
-        return;
-
-    pt.x = id * icon_width; /* Justify to the left. */
-    pt.y = 0;               /* Justify to the top. */
-    ClientToScreen(hwnd, &pt);
-
-    switch (sb_part_meanings[id] & 0xF0) {
-        case SB_CASSETTE:
-            menu = media_menu_get_cassette();
-            break;
-        case SB_CARTRIDGE:
-            menu = media_menu_get_cartridge(sb_part_meanings[id] & 0x0F);
-            break;
-        case SB_FLOPPY:
-            menu = media_menu_get_floppy(sb_part_meanings[id] & 0x0F);
-            break;
-        case SB_CDROM:
-            menu = media_menu_get_cdrom(sb_part_meanings[id] & 0x0F);
-            break;
-        case SB_ZIP:
-            menu = media_menu_get_zip(sb_part_meanings[id] & 0x0F);
-            break;
-        case SB_MO:
-            menu = media_menu_get_mo(sb_part_meanings[id] & 0x0F);
-            break;
-        default:
-            return;
-    }
-
-    TrackPopupMenu(menu,
-                   TPM_LEFTALIGN | TPM_BOTTOMALIGN | TPM_LEFTBUTTON,
-                   pt.x, pt.y, 0, hwndSBAR, NULL);
-}
-
-/* API: Load status bar icons */
-void
-StatusBarLoadIcon(UNUSED(HINSTANCE hInst))
-{
-    win_load_icon_set();
-}
-
-/* Handle messages for the Status Bar window. */
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-StatusBarProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    RECT      rc;
-    POINT     pt;
-    int       item_id = 0;
-    int       i;
-    HINSTANCE hInst;
-
-    switch (message) {
-        case WM_COMMAND:
-            media_menu_proc(hwnd, message, wParam, lParam);
-            return 0;
-
-        case WM_LBUTTONDOWN:
-        case WM_RBUTTONDOWN:
-            GetClientRect(hwnd, &rc);
-            pt.x = GET_X_LPARAM(lParam);
-            pt.y = GET_Y_LPARAM(lParam);
-            if (PtInRect(&rc, pt))
-                StatusBarPopupMenu(hwnd, pt, (pt.x / icon_width));
-            break;
-
-        case WM_LBUTTONDBLCLK:
-            GetClientRect(hwnd, &rc);
-            pt.x    = GET_X_LPARAM(lParam);
-            pt.y    = GET_Y_LPARAM(lParam);
-            item_id = (pt.x / icon_width);
-            if (PtInRect(&rc, pt) && (item_id < sb_parts)) {
-                if (sb_part_meanings[item_id] == SB_SOUND)
-                    SoundGainDialogCreate(hwndMain);
-            }
-            break;
-
-        case WM_DPICHANGED_AFTERPARENT:
-            /* DPI changed, reload icons */
-            hInst      = (HINSTANCE) GetWindowLongPtr(hwnd, GWLP_HINSTANCE);
-            dpi        = win_get_dpi(hwnd);
-            icon_width = MulDiv(SB_ICON_WIDTH, dpi, 96);
-            StatusBarLoadIcon(hInst);
-
-            for (i = 0; i < sb_parts; i++) {
-                if (sb_part_icons[i] != 255) {
-                    SendMessage(hwndSBAR, SB_SETICON, i, (LPARAM) hIcon[sb_part_icons[i]]);
-                }
-
-                iStatusWidths[i] = (i + 1) * icon_width;
-            }
-            iStatusWidths[i - 1] = -1;
-            SendMessage(hwndSBAR, SB_SETPARTS, (WPARAM) sb_parts, (LPARAM) iStatusWidths);
-            break;
-
-        default:
-            return (CallWindowProc((WNDPROC) OriginalProcedure,
-                                   hwnd, message, wParam, lParam));
-    }
-
-    return 0;
-}
-
-/* API: Create and set up the Status Bar window. */
-void
-StatusBarCreate(HWND hwndParent, uintptr_t idStatus, HINSTANCE hInst)
-{
-    RECT rectDialog;
-    int  dw;
-    int  dh;
-
-    /* Get current DPI and calculate icon sizes */
-    dpi        = win_get_dpi(hwndParent);
-    icon_width = MulDiv(SB_ICON_WIDTH, dpi, 96);
-
-    /* Load our icons into the cache for faster access. */
-    StatusBarLoadIcon(hInst);
-
-    GetWindowRect(hwndParent, &rectDialog);
-    dw = rectDialog.right - rectDialog.left;
-    dh = rectDialog.bottom - rectDialog.top;
-
-    /* Load the Common Controls DLL if needed. */
-    InitCommonControls();
-
-    /* Create the window, and make sure it's using the STATUS class. */
-    hwndSBAR = CreateWindowEx(0,
-                              STATUSCLASSNAME,
-                              (LPCTSTR) NULL,
-                              SBARS_SIZEGRIP | WS_CHILD | WS_VISIBLE | SBT_TOOLTIPS,
-                              0, dh - 17, dw, 17,
-                              hwndParent,
-                              (HMENU) idStatus, hInst, NULL);
-
-    /* Replace the original procedure with ours. */
-    OriginalProcedure = GetWindowLongPtr(hwndSBAR, GWLP_WNDPROC);
-    SetWindowLongPtr(hwndSBAR, GWLP_WNDPROC, (LONG_PTR) &StatusBarProcedure);
-
-    SendMessage(hwndSBAR, SB_SETMINHEIGHT, (WPARAM) 17, (LPARAM) 0);
-
-    /* Align the window with the parent (main) window. */
-    GetWindowRect(hwndSBAR, &rectDialog);
-    SetWindowPos(hwndSBAR,
-                 HWND_TOPMOST,
-                 rectDialog.left, rectDialog.top,
-                 rectDialog.right - rectDialog.left,
-                 rectDialog.bottom - rectDialog.top,
-                 SWP_SHOWWINDOW);
-
-    /* Initialize the status bar. This is clumsy. */
-    sb_parts      = 1;
-    iStatusWidths = (int *) malloc(sb_parts * sizeof(int));
-    memset(iStatusWidths, 0, sb_parts * sizeof(int));
-    sb_part_meanings = (int *) malloc(sb_parts * sizeof(int));
-    memset(sb_part_meanings, 0, sb_parts * sizeof(int));
-    sb_part_icons = (uint8_t *) malloc(sb_parts * sizeof(uint8_t));
-    memset(sb_part_icons, 0, sb_parts * sizeof(uint8_t));
-    sbTips = (WCHAR **) malloc(sb_parts * sizeof(WCHAR *));
-    memset(sbTips, 0, sb_parts * sizeof(WCHAR *));
-    sb_parts                   = 0;
-    iStatusWidths[sb_parts]    = -1;
-    sb_part_meanings[sb_parts] = SB_TEXT;
-    sb_part_icons[sb_parts]    = 255;
-    sb_parts++;
-    SendMessage(hwndSBAR, SB_SETPARTS, (WPARAM) sb_parts, (LPARAM) iStatusWidths);
-    SendMessage(hwndSBAR, SB_SETTEXT, 0 | SBT_NOBORDERS,
-                (LPARAM) plat_get_string(IDS_2118));
-
-    sb_ready = 1;
-}
-
-void
-ui_sb_update_text(void)
-{
-    uint8_t part = 0xff;
-
-    if (!sb_ready || (sb_parts == 0) || (sb_part_meanings == NULL))
-        return;
-
-    part = sb_map[SB_TEXT];
-
-    if (part != 0xff)
-        SendMessage(hwndSBAR, SB_SETTEXT, part | SBT_NOBORDERS, (LPARAM) ((sb_text[0] != L'\0') ? sb_text : sb_bugtext));
-}
-
-/* API */
-void
-ui_sb_set_text_w(wchar_t *wstr)
-{
-    if (wstr)
-        wcscpy(sb_text, wstr);
-    else
-        memset(sb_text, 0x00, sizeof(sb_text));
-    ui_sb_update_text();
-}
-
-/* API */
-void
-ui_sb_set_text(char *str)
-{
-    if (str)
-        mbstowcs(sb_text, str, strlen(str) + 1);
-    else
-        memset(sb_text, 0x00, sizeof(sb_text));
-    ui_sb_update_text();
-}
-
-/* API */
-void
-ui_sb_bugui(char *str)
-{
-    if (str)
-        mbstowcs(sb_bugtext, str, strlen(str) + 1);
-    else
-        memset(sb_bugtext, 0x00, sizeof(sb_bugtext));
-    ui_sb_update_text();
-}
-
-/* API */
-void
-ui_sb_mt32lcd(UNUSED(char *str))
-{
-    //
-}
diff --git a/src/win/win_toolbar.c b/src/win/win_toolbar.c
deleted file mode 100644
index 5c8621eea..000000000
--- a/src/win/win_toolbar.c
+++ /dev/null
@@ -1,208 +0,0 @@
-#define UNICODE
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <windows.h>
-#include <commctrl.h>
-#include <86box/86box.h>
-#include <86box/plat.h>
-#include <86box/resource.h>
-#include <86box/ui.h>
-#include <86box/video.h>
-#include <86box/win.h>
-
-HWND              hwndRebar          = NULL;
-static HWND       hwndToolbar        = NULL;
-static HIMAGELIST hImageList         = NULL;
-static wchar_t    wTitle[512]        = { 0 };
-static WNDPROC    pOriginalProcedure = NULL;
-
-enum image_index {
-    RUN,
-    PAUSE,
-    CTRL_ALT_DEL,
-    CTRL_ALT_ESC,
-    HARD_RESET,
-    ACPI_SHUTDOWN,
-    SETTINGS
-};
-
-void
-ToolBarLoadIcons(void)
-{
-    if (!hwndToolbar)
-        return;
-
-    if (hImageList)
-        ImageList_Destroy(hImageList);
-
-    hImageList = ImageList_Create(win_get_system_metrics(SM_CXSMICON, dpi),
-                                  win_get_system_metrics(SM_CYSMICON, dpi),
-                                  ILC_MASK | ILC_COLOR32, 1, 1);
-
-    // The icons must be loaded in the same order as the `image_index`
-    // enumeration above.
-
-    ImageList_AddIcon(hImageList, hIcon[200]); // Run
-    ImageList_AddIcon(hImageList, hIcon[201]); // Pause
-    ImageList_AddIcon(hImageList, hIcon[202]); // Ctrl+Alt+Delete
-    ImageList_AddIcon(hImageList, hIcon[203]); // Ctrl+Alt+Esc
-    ImageList_AddIcon(hImageList, hIcon[204]); // Hard reset
-    ImageList_AddIcon(hImageList, hIcon[205]); // ACPI shutdown
-    ImageList_AddIcon(hImageList, hIcon[206]); // Settings
-
-    SendMessage(hwndToolbar, TB_SETIMAGELIST, 0, (LPARAM) hImageList);
-}
-
-int
-ToolBarProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    switch (message) {
-        case WM_NOTIFY:
-            switch (((LPNMHDR) lParam)->code) {
-                case TTN_GETDISPINFO:
-                    {
-                        LPTOOLTIPTEXT lpttt = (LPTOOLTIPTEXT) lParam;
-
-                        // Set the instance of the module that contains the resource.
-                        lpttt->hinst = hinstance;
-
-                        uintptr_t idButton = lpttt->hdr.idFrom;
-
-                        switch (idButton) {
-                            case IDM_ACTION_PAUSE:
-                                if (dopause)
-                                    lpttt->lpszText = MAKEINTRESOURCE(IDS_2155);
-                                else
-                                    lpttt->lpszText = MAKEINTRESOURCE(IDS_2156);
-                                break;
-
-                            case IDM_ACTION_RESET_CAD:
-                                lpttt->lpszText = MAKEINTRESOURCE(IDS_2157);
-                                break;
-
-                            case IDM_ACTION_CTRL_ALT_ESC:
-                                lpttt->lpszText = MAKEINTRESOURCE(IDS_2158);
-                                break;
-
-                            case IDM_ACTION_HRESET:
-                                lpttt->lpszText = MAKEINTRESOURCE(IDS_2159);
-                                break;
-
-                            case IDM_CONFIG:
-                                lpttt->lpszText = MAKEINTRESOURCE(IDS_2161);
-                                break;
-                        }
-
-                        return TRUE;
-                    }
-            }
-    }
-
-    return (CallWindowProc(pOriginalProcedure, hwnd, message, wParam, lParam));
-}
-
-void
-ToolBarUpdatePause(int pause)
-{
-    TBBUTTONINFO tbbi;
-
-    tbbi.cbSize = sizeof(tbbi);
-    tbbi.dwMask = TBIF_IMAGE;
-    tbbi.iImage = pause ? RUN : PAUSE;
-
-    SendMessage(hwndToolbar, TB_SETBUTTONINFO, IDM_ACTION_PAUSE, (LPARAM) &tbbi);
-}
-
-static TBBUTTON buttons[] = {
-    {PAUSE,          IDM_ACTION_PAUSE,        TBSTATE_ENABLED,       BTNS_BUTTON, { 0 }, 0, 0},
-    { HARD_RESET,    IDM_ACTION_HRESET,       TBSTATE_ENABLED,       BTNS_BUTTON, { 0 }, 0, 0},
-    { ACPI_SHUTDOWN, 0,                       TBSTATE_HIDDEN,        BTNS_BUTTON, { 0 }, 0, 0},
-    { 0,             0,                       TBSTATE_INDETERMINATE, BTNS_SEP,    { 0 }, 0, 0},
-    { CTRL_ALT_DEL,  IDM_ACTION_RESET_CAD,    TBSTATE_ENABLED,       BTNS_BUTTON, { 0 }, 0, 0},
-    { CTRL_ALT_ESC,  IDM_ACTION_CTRL_ALT_ESC, TBSTATE_ENABLED,       BTNS_BUTTON, { 0 }, 0, 0},
-    { 0,             0,                       TBSTATE_INDETERMINATE, BTNS_SEP,    { 0 }, 0, 0},
-    { SETTINGS,      IDM_CONFIG,              TBSTATE_ENABLED,       BTNS_BUTTON, { 0 }, 0, 0}
-};
-
-void
-ToolBarCreate(HWND hwndParent, HINSTANCE hInst)
-{
-    REBARINFO     rbi  = { 0 };
-    REBARBANDINFO rbbi = { 0 };
-    int           btnSize;
-
-    // Create the toolbar.
-    hwndToolbar = CreateWindowEx(WS_EX_PALETTEWINDOW, TOOLBARCLASSNAME, NULL,
-                                 WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | TBSTYLE_FLAT | CCS_TOP | BTNS_AUTOSIZE | CCS_NOPARENTALIGN | CCS_NORESIZE | CCS_NODIVIDER,
-                                 0, 0, 0, 0,
-                                 hwndParent, NULL, hInst, NULL);
-
-    ToolBarLoadIcons();
-
-    // Add buttons.
-    SendMessage(hwndToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
-    SendMessage(hwndToolbar, TB_ADDBUTTONS, sizeof(buttons) / sizeof(TBBUTTON), (LPARAM) &buttons);
-
-    // Autosize the toolbar and determine its size.
-    btnSize = LOWORD(SendMessage(hwndToolbar, TB_GETBUTTONSIZE, 0, 0));
-
-    // Replace the original procedure with ours.
-    pOriginalProcedure = (WNDPROC) GetWindowLongPtr(hwndToolbar, GWLP_WNDPROC);
-    SetWindowLongPtr(hwndToolbar, GWLP_WNDPROC, (LONG_PTR) &ToolBarProcedure);
-
-    // Make sure the Pause button is in the correct state.
-    ToolBarUpdatePause(dopause);
-
-    // Create the containing Rebar.
-    hwndRebar = CreateWindowEx(0, REBARCLASSNAME, NULL,
-                               WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | RBS_VARHEIGHT | CCS_NODIVIDER | CCS_NOPARENTALIGN,
-                               0, 0, scrnsz_x, 0,
-                               hwndParent, NULL, hInst, NULL);
-
-    // Create and send the REBARINFO structure.
-    rbi.cbSize = sizeof(rbi);
-    SendMessage(hwndRebar, RB_SETBARINFO, 0, (LPARAM) &rbi);
-
-    // Add the toolbar to the rebar.
-    rbbi.cbSize     = sizeof(rbbi);
-    rbbi.fMask      = RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_STYLE;
-    rbbi.hwndChild  = hwndToolbar;
-    rbbi.cxMinChild = 0;
-    rbbi.cyMinChild = btnSize;
-    rbbi.fStyle     = RBBS_NOGRIPPER;
-    SendMessage(hwndRebar, RB_INSERTBAND, -1, (LPARAM) &rbbi);
-
-    // Add a label for machine information.
-    rbbi.fMask  = RBBIM_TEXT | RBBIM_STYLE;
-    rbbi.lpText = TEXT("Test");
-    rbbi.fStyle = RBBS_NOGRIPPER;
-    SendMessage(hwndRebar, RB_INSERTBAND, -1, (LPARAM) &rbbi);
-
-    SendMessage(hwndRebar, RB_MAXIMIZEBAND, 0, 0);
-    ShowWindow(hwndRebar, TRUE);
-
-    return;
-}
-
-wchar_t *
-ui_window_title(wchar_t *s)
-{
-    REBARBANDINFO rbbi = { 0 };
-    if (!video_fullscreen) {
-        if (s != NULL) {
-            wcsncpy(wTitle, s, sizeof_w(wTitle) - 1);
-        } else
-            s = wTitle;
-
-        rbbi.cbSize = sizeof(rbbi);
-        rbbi.fMask  = RBBIM_TEXT;
-        rbbi.lpText = s;
-        SendMessage(hwndRebar, RB_SETBANDINFO, 1, (LPARAM) &rbbi);
-    } else {
-        if (s == NULL)
-            s = wTitle;
-    }
-
-    return s;
-}
diff --git a/src/win/win_ui.c b/src/win/win_ui.c
deleted file mode 100644
index 73119140c..000000000
--- a/src/win/win_ui.c
+++ /dev/null
@@ -1,1664 +0,0 @@
-/*
- * 86Box    A hypervisor and IBM PC system emulator that specializes in
- *          running old operating systems and software designed for IBM
- *          PC systems and compatibles from 1981 through fairly recent
- *          system designs based on the PCI bus.
- *
- *          This file is part of the 86Box distribution.
- *
- *          user Interface module for WinAPI on Windows.
- *
- *
- *
- * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
- *          Miran Grca, <mgrca8@gmail.com>
- *          Fred N. van Kempen, <decwiz@yahoo.com>
- *          Jasmine Iwanek, <jriwanek@gmail.com>
- *
- *          Copyright 2008-2020 Sarah Walker.
- *          Copyright 2016-2020 Miran Grca.
- *          Copyright 2017-2020 Fred N. van Kempen.
- *          Copyright 2019-2020 GH Cao.
- *          Copyright 2021-2023 Jasmine Iwanek.
- */
-#include <stdatomic.h>
-#define UNICODE
-#include <windows.h>
-#include <commctrl.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <wchar.h>
-#include <86box/plat.h>
-#include <86box/86box.h>
-#include <86box/config.h>
-#include "../cpu/cpu.h"
-#include <86box/device.h>
-#include <86box/keyboard.h>
-#include <86box/mouse.h>
-#include <86box/timer.h>
-#include <86box/nvr.h>
-#include <86box/video.h>
-#include <86box/vid_ega.h> // for update_overscan
-#include <86box/plat_dynld.h>
-#include <86box/ui.h>
-#include <86box/win.h>
-#include <86box/version.h>
-#ifdef DISCORD
-#    include <86box/discord.h>
-#endif
-
-#ifdef MTR_ENABLED
-#    include <minitrace/minitrace.h>
-#endif
-
-#define TIMER_1SEC 1 /* ID of the one-second timer */
-
-/* Platform Public data, specific. */
-HWND  hwndMain        = NULL; /* application main window */
-HWND  hwndRender      = NULL; /* machine render window */
-HWND  hwndRender2     = NULL; /* machine second screen render window */
-HMENU menuMain;             /* application main menu */
-RECT  oldclip;              /* mouse rect */
-int   sbar_height     = 23; /* statusbar height */
-int   tbar_height     = 23; /* toolbar height */
-int   minimized       = 0;
-int   infocus         = 1;
-int   button_down     = 0;
-int   rctrl_is_lalt   = 0;
-int   user_resize     = 0;
-int   fixed_size_x    = 0;
-int   fixed_size_y    = 0;
-int   kbd_req_capture = 0;
-int   hide_status_bar = 0;
-int   hide_tool_bar   = 0;
-int   dpi             = 96;
-
-int   status_icons_fullscreen = 0; /* unused. */
-
-extern char  openfilestring[512];
-extern WCHAR wopenfilestring[512];
-
-/* Local data. */
-static int manager_wm      = 0;
-static int save_window_pos = 0;
-static int pause_state     = 0;
-static int padded_frame    = 0;
-static int vis             = -1;
-
-/* Per Monitor DPI Aware v2 APIs, Windows 10 v1703+ */
-void *user32_handle = NULL;
-static UINT(WINAPI *pGetDpiForWindow)(HWND);
-static UINT(WINAPI *pGetSystemMetricsForDpi)(int i, UINT dpi);
-static DPI_AWARENESS_CONTEXT(WINAPI *pGetWindowDpiAwarenessContext)(HWND);
-static BOOL(WINAPI *pAreDpiAwarenessContextsEqual)(DPI_AWARENESS_CONTEXT A, DPI_AWARENESS_CONTEXT B);
-static dllimp_t user32_imports[] = {
-    {"GetDpiForWindow",               &pGetDpiForWindow             },
-    { "GetSystemMetricsForDpi",       &pGetSystemMetricsForDpi      },
-    { "GetWindowDpiAwarenessContext", &pGetWindowDpiAwarenessContext},
-    { "AreDpiAwarenessContextsEqual", &pAreDpiAwarenessContextsEqual},
-    { NULL,                           NULL                          }
-};
-
-/* Taskbar application ID API, Windows 7+ */
-void *shell32_handle = NULL;
-static HRESULT(WINAPI *pSetCurrentProcessExplicitAppUserModelID)(PCWSTR AppID);
-static dllimp_t shell32_imports[] = {
-    {"SetCurrentProcessExplicitAppUserModelID", &pSetCurrentProcessExplicitAppUserModelID},
-    { NULL,                                     NULL                                     }
-};
-
-int
-win_get_dpi(HWND hwnd)
-{
-    if (user32_handle != NULL) {
-        return pGetDpiForWindow(hwnd);
-    } else {
-        HDC  dc  = GetDC(hwnd);
-        UINT dpi = GetDeviceCaps(dc, LOGPIXELSX);
-        ReleaseDC(hwnd, dc);
-        return dpi;
-    }
-}
-
-int
-win_get_system_metrics(int index, int dpi)
-{
-    if (user32_handle != NULL) {
-        /* Only call GetSystemMetricsForDpi when we are using PMv2 */
-        DPI_AWARENESS_CONTEXT c = pGetWindowDpiAwarenessContext(hwndMain);
-        if (pAreDpiAwarenessContextsEqual(c, DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2))
-            return pGetSystemMetricsForDpi(index, dpi);
-    }
-
-    return GetSystemMetrics(index);
-}
-
-void
-ResizeWindowByClientArea(HWND hwnd, int width, int height)
-{
-    if ((vid_resize == 1) || padded_frame) {
-        int padding = win_get_system_metrics(SM_CXPADDEDBORDER, dpi);
-        width += (win_get_system_metrics(SM_CXFRAME, dpi) + padding) * 2;
-        height += (win_get_system_metrics(SM_CYFRAME, dpi) + padding) * 2;
-    } else {
-        width += win_get_system_metrics(SM_CXFIXEDFRAME, dpi) * 2;
-        height += win_get_system_metrics(SM_CYFIXEDFRAME, dpi) * 2;
-    }
-
-    height += win_get_system_metrics(SM_CYCAPTION, dpi);
-    height += win_get_system_metrics(SM_CYBORDER, dpi) + win_get_system_metrics(SM_CYMENUSIZE, dpi);
-
-    SetWindowPos(hwnd, NULL, 0, 0, width, height, SWP_NOMOVE);
-}
-
-/* Set host cursor visible or not. */
-void
-show_cursor(int val)
-{
-    if (val == vis)
-        return;
-
-    if (val == 0) {
-        while (1)
-            if (ShowCursor(FALSE) < 0)
-                break;
-    } else
-        ShowCursor(TRUE);
-
-    vis = val;
-}
-
-static void
-video_toggle_option(HMENU h, int *val, int id)
-{
-    startblit();
-    *val ^= 1;
-    CheckMenuItem(h, id, *val ? MF_CHECKED : MF_UNCHECKED);
-    endblit();
-    config_save();
-    device_force_redraw();
-}
-
-/* Recursively finds and deletes target submenu */
-static int
-delete_submenu(HMENU parent, HMENU target)
-{
-    for (int i = 0; i < GetMenuItemCount(parent); i++) {
-        MENUITEMINFO mii;
-        mii.cbSize = sizeof(mii);
-        mii.fMask  = MIIM_SUBMENU;
-
-        if (GetMenuItemInfo(parent, i, TRUE, &mii) != 0) {
-            if (mii.hSubMenu == target) {
-                DeleteMenu(parent, i, MF_BYPOSITION);
-                return 1;
-            } else if (mii.hSubMenu != NULL) {
-                if (delete_submenu(mii.hSubMenu, target))
-                    return 1;
-            }
-        }
-    }
-
-    return 0;
-}
-
-static int   menu_vidapi = -1;
-static HMENU cur_menu    = NULL;
-
-static void
-show_render_options_menu(void)
-{
-    if (vid_api == menu_vidapi)
-        return;
-
-    if (cur_menu != NULL) {
-        if (delete_submenu(menuMain, cur_menu))
-            cur_menu = NULL;
-    }
-
-    if (cur_menu == NULL) {
-        switch (IDM_VID_SDL_SW + vid_api) {
-            case IDM_VID_OPENGL_CORE:
-                cur_menu = LoadMenu(hinstance, VID_GL_SUBMENU);
-                InsertMenu(GetSubMenu(menuMain, 1), 6, MF_BYPOSITION | MF_STRING | MF_POPUP, (UINT_PTR) cur_menu, plat_get_string(IDS_2145));
-                CheckMenuItem(menuMain, IDM_VID_GL_FPS_BLITTER, video_framerate == -1 ? MF_CHECKED : MF_UNCHECKED);
-                CheckMenuItem(menuMain, IDM_VID_GL_FPS_25, video_framerate == 25 ? MF_CHECKED : MF_UNCHECKED);
-                CheckMenuItem(menuMain, IDM_VID_GL_FPS_30, video_framerate == 30 ? MF_CHECKED : MF_UNCHECKED);
-                CheckMenuItem(menuMain, IDM_VID_GL_FPS_50, video_framerate == 50 ? MF_CHECKED : MF_UNCHECKED);
-                CheckMenuItem(menuMain, IDM_VID_GL_FPS_60, video_framerate == 60 ? MF_CHECKED : MF_UNCHECKED);
-                CheckMenuItem(menuMain, IDM_VID_GL_FPS_75, video_framerate == 75 ? MF_CHECKED : MF_UNCHECKED);
-                CheckMenuItem(menuMain, IDM_VID_GL_VSYNC, video_vsync ? MF_CHECKED : MF_UNCHECKED);
-                EnableMenuItem(menuMain, IDM_VID_GL_NOSHADER, strlen(video_shader) > 0 ? MF_ENABLED : MF_DISABLED);
-                break;
-        }
-    }
-
-    menu_vidapi = vid_api;
-}
-
-static void
-video_set_filter_menu(HMENU menu)
-{
-    CheckMenuItem(menu, IDM_VID_FILTER_NEAREST, vid_api == 0 || video_filter_method == 0 ? MF_CHECKED : MF_UNCHECKED);
-    CheckMenuItem(menu, IDM_VID_FILTER_LINEAR, vid_api != 0 && video_filter_method == 1 ? MF_CHECKED : MF_UNCHECKED);
-    EnableMenuItem(menu, IDM_VID_FILTER_NEAREST, vid_api == 0 ? MF_GRAYED : MF_ENABLED);
-    EnableMenuItem(menu, IDM_VID_FILTER_LINEAR, vid_api == 0 ? MF_GRAYED : MF_ENABLED);
-}
-
-void
-ResetAllMenus(void)
-{
-    CheckMenuItem(menuMain, IDM_ACTION_RCTRL_IS_LALT, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_ACTION_KBD_REQ_CAPTURE, MF_UNCHECKED);
-
-    CheckMenuItem(menuMain, IDM_UPDATE_ICONS, MF_UNCHECKED);
-
-    CheckMenuItem(menuMain, IDM_VID_HIDE_STATUS_BAR, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_HIDE_TOOLBAR, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_FORCE43, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_OVERSCAN, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_INVERT, MF_UNCHECKED);
-
-    CheckMenuItem(menuMain, IDM_VID_MONITORS, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_RESIZE, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_SDL_SW, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_SDL_HW, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_SDL_OPENGL, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_OPENGL_CORE, MF_UNCHECKED);
-
-    menu_vidapi = -1;
-    cur_menu    = NULL;
-    show_render_options_menu();
-#ifdef USE_VNC
-    CheckMenuItem(menuMain, IDM_VID_VNC, MF_UNCHECKED);
-#endif
-    CheckMenuItem(menuMain, IDM_VID_FS_FULL, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_FS_43, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_FS_KEEPRATIO, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_FS_INT, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_SPECIFY_DIM, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_REMEMBER, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_SCALE_1X, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_SCALE_2X, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_SCALE_3X, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_SCALE_4X, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_SCALE_5X, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_SCALE_6X, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_SCALE_7X, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_SCALE_8X, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_SCALE_9X, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_SCALE_10X, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_HIDPI, MF_UNCHECKED);
-
-    CheckMenuItem(menuMain, IDM_VID_CGACON, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_GRAYCT_601, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_GRAYCT_709, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_GRAYCT_AVE, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_GRAY_RGB, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_GRAY_MONO, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_GRAY_AMBER, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_GRAY_GREEN, MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_GRAY_WHITE, MF_UNCHECKED);
-
-    CheckMenuItem(menuMain, IDM_ACTION_RCTRL_IS_LALT, rctrl_is_lalt ? MF_CHECKED : MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_ACTION_KBD_REQ_CAPTURE, kbd_req_capture ? MF_CHECKED : MF_UNCHECKED);
-
-    CheckMenuItem(menuMain, IDM_UPDATE_ICONS, update_icons ? MF_CHECKED : MF_UNCHECKED);
-
-    CheckMenuItem(menuMain, IDM_VID_HIDE_STATUS_BAR, hide_status_bar ? MF_CHECKED : MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_HIDE_TOOLBAR, hide_tool_bar ? MF_CHECKED : MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_FORCE43, force_43 ? MF_CHECKED : MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_OVERSCAN, enable_overscan ? MF_CHECKED : MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_INVERT, invert_display ? MF_CHECKED : MF_UNCHECKED);
-
-    if (show_second_monitors == 1)
-        CheckMenuItem(menuMain, IDM_VID_MONITORS, MF_CHECKED);
-
-    if (vid_resize == 1)
-        CheckMenuItem(menuMain, IDM_VID_RESIZE, MF_CHECKED);
-    CheckMenuItem(menuMain, IDM_VID_SDL_SW + vid_api, MF_CHECKED);
-    CheckMenuItem(menuMain, IDM_VID_FS_FULL + video_fullscreen_scale, MF_CHECKED);
-    CheckMenuItem(menuMain, IDM_VID_REMEMBER, window_remember ? MF_CHECKED : MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_SCALE_1X + scale, MF_CHECKED);
-    CheckMenuItem(menuMain, IDM_VID_HIDPI, dpi_scale ? MF_CHECKED : MF_UNCHECKED);
-
-    CheckMenuItem(menuMain, IDM_VID_CGACON, vid_cga_contrast ? MF_CHECKED : MF_UNCHECKED);
-    CheckMenuItem(menuMain, IDM_VID_GRAYCT_601 + video_graytype, MF_CHECKED);
-    CheckMenuItem(menuMain, IDM_VID_GRAY_RGB + video_grayscale, MF_CHECKED);
-
-    video_set_filter_menu(menuMain);
-
-#ifdef DISCORD
-    if (discord_loaded)
-        CheckMenuItem(menuMain, IDM_DISCORD, enable_discord ? MF_CHECKED : MF_UNCHECKED);
-    else
-        EnableMenuItem(menuMain, IDM_DISCORD, MF_DISABLED);
-#endif
-
-#ifdef MTR_ENABLED
-    EnableMenuItem(menuMain, IDM_ACTION_END_TRACE, MF_DISABLED);
-#endif
-
-    if (vid_resize) {
-        if (vid_resize >= 2) {
-            CheckMenuItem(menuMain, IDM_VID_RESIZE, MF_UNCHECKED);
-            EnableMenuItem(menuMain, IDM_VID_RESIZE, MF_GRAYED);
-        }
-
-        CheckMenuItem(menuMain, IDM_VID_SCALE_1X + scale, MF_UNCHECKED);
-        CheckMenuItem(menuMain, IDM_VID_SCALE_2X, MF_CHECKED);
-        EnableMenuItem(menuMain, IDM_VID_SCALE_1X, MF_GRAYED);
-        EnableMenuItem(menuMain, IDM_VID_SCALE_2X, MF_GRAYED);
-        EnableMenuItem(menuMain, IDM_VID_SCALE_3X, MF_GRAYED);
-        EnableMenuItem(menuMain, IDM_VID_SCALE_4X, MF_GRAYED);
-        EnableMenuItem(menuMain, IDM_VID_SCALE_5X, MF_GRAYED);
-        EnableMenuItem(menuMain, IDM_VID_SCALE_6X, MF_GRAYED);
-        EnableMenuItem(menuMain, IDM_VID_SCALE_7X, MF_GRAYED);
-        EnableMenuItem(menuMain, IDM_VID_SCALE_8X, MF_GRAYED);
-        EnableMenuItem(menuMain, IDM_VID_SCALE_9X, MF_GRAYED);
-        EnableMenuItem(menuMain, IDM_VID_SCALE_10X, MF_GRAYED);
-    }
-}
-
-void
-win_notify_dlg_open(void)
-{
-    manager_wm  = 1;
-    pause_state = dopause;
-    plat_pause(1);
-    if (source_hwnd)
-        PostMessage((HWND) (uintptr_t) source_hwnd, WM_SENDDLGSTATUS, (WPARAM) 1, (LPARAM) hwndMain);
-}
-
-void
-win_notify_dlg_closed(void)
-{
-    if (source_hwnd)
-        PostMessage((HWND) (uintptr_t) source_hwnd, WM_SENDDLGSTATUS, (WPARAM) 0, (LPARAM) hwndMain);
-    plat_pause(pause_state);
-    manager_wm = 0;
-}
-
-void
-plat_power_off(void)
-{
-    confirm_exit = 0;
-    nvr_save();
-    config_save();
-
-    /* Deduct a sufficiently large number of cycles that no instructions will
-       run before the main thread is terminated */
-    cycles -= 99999999;
-
-    KillTimer(hwndMain, TIMER_1SEC);
-    PostQuitMessage(0);
-
-    /* Cleanly terminate all of the emulator's components so as
-       to avoid things like threads getting stuck. */
-#if 0
-    do_stop();
-#endif
-    cpu_thread_run = 0;
-
-#if 0
-    exit(-1);
-#endif
-}
-
-#ifdef MTR_ENABLED
-static void
-handle_trace(HMENU hmenu, int trace)
-{
-    EnableMenuItem(hmenu, IDM_ACTION_BEGIN_TRACE, trace ? MF_GRAYED : MF_ENABLED);
-    EnableMenuItem(hmenu, IDM_ACTION_END_TRACE, trace ? MF_ENABLED : MF_GRAYED);
-    if (trace) {
-        init_trace();
-    } else {
-        shutdown_trace();
-    }
-}
-#endif
-
-/* Catch WM_INPUT messages for 'current focus' window. */
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-input_proc(UNUSED(HWND hwnd), UINT message, UNUSED(WPARAM wParam), LPARAM lParam)
-{
-    switch (message) {
-        case WM_INPUT:
-            if (infocus) {
-                UINT      size = 0;
-                PRAWINPUT raw  = NULL;
-
-                /* Here we read the raw input data */
-                GetRawInputData((HRAWINPUT) lParam, RID_INPUT, NULL, &size, sizeof(RAWINPUTHEADER));
-                raw = (PRAWINPUT) malloc(size);
-                if (GetRawInputData((HRAWINPUT) lParam, RID_INPUT, raw, &size, sizeof(RAWINPUTHEADER)) == size) {
-                    switch (raw->header.dwType) {
-                        case RIM_TYPEKEYBOARD:
-                            keyboard_handle(raw);
-                            break;
-                        case RIM_TYPEMOUSE:
-                            win_mouse_handle(raw);
-                            break;
-                        case RIM_TYPEHID:
-                            win_joystick_handle(raw);
-                            break;
-                    }
-                }
-                free(raw);
-            }
-            break;
-        case WM_SETFOCUS:
-            infocus = 1;
-            break;
-
-        case WM_KILLFOCUS:
-            infocus = 0;
-            plat_mouse_capture(0);
-            break;
-
-        case WM_LBUTTONDOWN:
-            button_down |= 1;
-            break;
-
-        case WM_LBUTTONUP:
-            if ((button_down & 1) && !video_fullscreen)
-                plat_mouse_capture(1);
-            button_down &= ~1;
-            break;
-
-        case WM_MBUTTONUP:
-            if (mouse_get_buttons() < 3)
-                plat_mouse_capture(0);
-            break;
-
-        default:
-            return 1;
-#if 0
-        return(CallWindowProc((WNDPROC)input_orig_proc,
-                              hwnd, message, wParam, lParam));
-#endif
-    }
-
-    return 0;
-}
-
-static LRESULT CALLBACK
-MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    HMENU hmenu;
-
-    int   i;
-    RECT  rect;
-    RECT *rect_p;
-
-    WINDOWPOS *pos;
-
-    int temp_x;
-    int temp_y;
-
-    if (input_proc(hwnd, message, wParam, lParam) == 0)
-        return 0;
-
-    switch (message) {
-        case WM_CREATE:
-            SetTimer(hwnd, TIMER_1SEC, 1000, NULL);
-            break;
-
-        case WM_COMMAND:
-            hmenu = GetMenu(hwnd);
-            switch (LOWORD(wParam)) {
-                case IDM_ACTION_SCREENSHOT:
-                    take_screenshot();
-                    break;
-
-#ifdef MTR_ENABLED
-                case IDM_ACTION_BEGIN_TRACE:
-                case IDM_ACTION_END_TRACE:
-                case IDM_ACTION_TRACE:
-                    tracing_on = !tracing_on;
-                    handle_trace(hmenu, tracing_on);
-                    break;
-#endif
-
-                case IDM_ACTION_HRESET:
-                    win_notify_dlg_open();
-                    if (confirm_reset)
-                        i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2113, NULL, (wchar_t *) IDS_2138, (wchar_t *) IDS_2139, NULL);
-                    else
-                        i = 0;
-                    if ((i % 10) == 0) {
-                        pc_reset_hard();
-                        if (i == 10) {
-                            confirm_reset = 0;
-                            nvr_save();
-                            config_save();
-                        }
-                    }
-                    win_notify_dlg_closed();
-                    break;
-
-                case IDM_ACTION_RESET_CAD:
-                    pc_send_cad();
-                    break;
-
-                case IDM_ACTION_EXIT:
-                    win_notify_dlg_open();
-                    if (confirm_exit && confirm_exit_cmdl)
-                        i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2114, NULL, (wchar_t *) IDS_2120, (wchar_t *) IDS_2137, NULL);
-                    else
-                        i = 0;
-                    if ((i % 10) == 0) {
-                        if (i == 10) {
-                            confirm_exit = 0;
-                            nvr_save();
-                            config_save();
-                        }
-                        KillTimer(hwnd, TIMER_1SEC);
-                        PostQuitMessage(0);
-                    }
-                    win_notify_dlg_closed();
-                    break;
-
-                case IDM_ACTION_CTRL_ALT_ESC:
-                    pc_send_cae();
-                    break;
-
-                case IDM_ACTION_RCTRL_IS_LALT:
-                    rctrl_is_lalt ^= 1;
-                    CheckMenuItem(hmenu, IDM_ACTION_RCTRL_IS_LALT, rctrl_is_lalt ? MF_CHECKED : MF_UNCHECKED);
-                    config_save();
-                    break;
-
-                case IDM_ACTION_KBD_REQ_CAPTURE:
-                    kbd_req_capture ^= 1;
-                    CheckMenuItem(hmenu, IDM_ACTION_KBD_REQ_CAPTURE, kbd_req_capture ? MF_CHECKED : MF_UNCHECKED);
-                    config_save();
-                    break;
-
-                case IDM_ACTION_PAUSE:
-                    plat_pause(dopause ^ 1);
-                    CheckMenuItem(menuMain, IDM_ACTION_PAUSE, dopause ? MF_CHECKED : MF_UNCHECKED);
-                    break;
-
-                case IDM_CONFIG:
-                    win_settings_open(hwnd);
-                    break;
-
-                case IDM_SND_GAIN:
-                    SoundGainDialogCreate(hwnd);
-                    break;
-
-                case IDM_ABOUT:
-                    AboutDialogCreate(hwnd);
-                    break;
-
-                case IDM_DOCS:
-                    ShellExecute(hwnd, L"open", EMU_DOCS_URL_W, NULL, NULL, SW_SHOW);
-                    break;
-
-                case IDM_UPDATE_ICONS:
-                    update_icons ^= 1;
-                    CheckMenuItem(hmenu, IDM_UPDATE_ICONS, update_icons ? MF_CHECKED : MF_UNCHECKED);
-                    config_save();
-                    break;
-
-                case IDM_VID_HIDE_STATUS_BAR:
-                    hide_status_bar ^= 1;
-                    CheckMenuItem(hmenu, IDM_VID_HIDE_STATUS_BAR, hide_status_bar ? MF_CHECKED : MF_UNCHECKED);
-                    ShowWindow(hwndSBAR, hide_status_bar ? SW_HIDE : SW_SHOW);
-                    GetWindowRect(hwnd, &rect);
-                    if (hide_status_bar)
-                        MoveWindow(hwnd, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top - sbar_height, TRUE);
-                    else
-                        MoveWindow(hwnd, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top + sbar_height, TRUE);
-                    config_save();
-                    break;
-
-                case IDM_VID_HIDE_TOOLBAR:
-                    hide_tool_bar ^= 1;
-                    CheckMenuItem(hmenu, IDM_VID_HIDE_TOOLBAR, hide_tool_bar ? MF_CHECKED : MF_UNCHECKED);
-                    ShowWindow(hwndRebar, hide_tool_bar ? SW_HIDE : SW_SHOW);
-                    GetWindowRect(hwnd, &rect);
-                    if (hide_tool_bar) {
-                        MoveWindow(hwnd, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top - tbar_height, TRUE);
-                        SetWindowPos(hwndRender, NULL, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
-                    } else {
-                        MoveWindow(hwnd, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top + tbar_height, TRUE);
-                        SetWindowPos(hwndRender, NULL, 0, tbar_height, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
-                    }
-                    config_save();
-                    break;
-
-                case IDM_VID_MONITORS:
-                    show_second_monitors ^= 1;
-                    CheckMenuItem(hmenu, IDM_VID_MONITORS, (show_second_monitors & 1) ? MF_CHECKED : MF_UNCHECKED);
-                    break;
-
-                case IDM_VID_RESIZE:
-                    vid_resize ^= 1;
-                    CheckMenuItem(hmenu, IDM_VID_RESIZE, (vid_resize & 1) ? MF_CHECKED : MF_UNCHECKED);
-
-                    if (vid_resize == 1)
-                        SetWindowLongPtr(hwnd, GWL_STYLE, (WS_OVERLAPPEDWINDOW) | WS_VISIBLE);
-                    else
-                        SetWindowLongPtr(hwnd, GWL_STYLE, (WS_OVERLAPPEDWINDOW & ~WS_SIZEBOX & ~WS_MAXIMIZEBOX) | WS_VISIBLE);
-
-                    /* scale the screen base on DPI */
-                    if (dpi_scale) {
-                        temp_x = MulDiv(unscaled_size_x, dpi, 96);
-                        temp_y = MulDiv(unscaled_size_y, dpi, 96);
-                    } else {
-                        temp_x = unscaled_size_x;
-                        temp_y = unscaled_size_y;
-                    }
-
-                    ResizeWindowByClientArea(hwnd, temp_x, temp_y + (hide_status_bar ? 0 : sbar_height) + (hide_tool_bar ? 0 : tbar_height));
-
-                    if (mouse_capture) {
-                        ClipCursor(&rect);
-                    }
-
-                    if (vid_resize) {
-                        CheckMenuItem(hmenu, IDM_VID_SCALE_1X + scale, MF_UNCHECKED);
-                        CheckMenuItem(hmenu, IDM_VID_SCALE_2X, MF_CHECKED);
-                        scale = 1;
-                    }
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_1X, vid_resize ? MF_GRAYED : MF_ENABLED);
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_2X, vid_resize ? MF_GRAYED : MF_ENABLED);
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_3X, vid_resize ? MF_GRAYED : MF_ENABLED);
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_4X, vid_resize ? MF_GRAYED : MF_ENABLED);
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_5X, vid_resize ? MF_GRAYED : MF_ENABLED);
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_6X, vid_resize ? MF_GRAYED : MF_ENABLED);
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_7X, vid_resize ? MF_GRAYED : MF_ENABLED);
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_8X, vid_resize ? MF_GRAYED : MF_ENABLED);
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_9X, vid_resize ? MF_GRAYED : MF_ENABLED);
-                    EnableMenuItem(hmenu, IDM_VID_SCALE_10X, vid_resize ? MF_GRAYED : MF_ENABLED);
-
-                    scrnsz_x = unscaled_size_x;
-                    scrnsz_y = unscaled_size_y;
-                    atomic_store(&doresize_monitors[0], 1);
-                    config_save();
-                    break;
-
-                case IDM_VID_REMEMBER:
-                    window_remember = !window_remember;
-                    CheckMenuItem(hmenu, IDM_VID_REMEMBER, window_remember ? MF_CHECKED : MF_UNCHECKED);
-                    GetWindowRect(hwnd, &rect);
-                    if (window_remember || (vid_resize & 2)) {
-                        window_x = rect.left;
-                        window_y = rect.top;
-                        if (!(vid_resize & 2)) {
-                            window_w = rect.right - rect.left;
-                            window_h = rect.bottom - rect.top;
-                        }
-                    }
-                    config_save();
-                    break;
-
-                case IDM_VID_SDL_SW:
-                case IDM_VID_SDL_HW:
-                case IDM_VID_SDL_OPENGL:
-                case IDM_VID_OPENGL_CORE:
-#ifdef USE_VNC
-                case IDM_VID_VNC:
-#endif
-                    CheckMenuItem(hmenu, IDM_VID_SDL_SW + vid_api, MF_UNCHECKED);
-                    plat_setvid(LOWORD(wParam) - IDM_VID_SDL_SW);
-                    CheckMenuItem(hmenu, IDM_VID_SDL_SW + vid_api, MF_CHECKED);
-                    video_set_filter_menu(hmenu);
-                    config_save();
-                    show_render_options_menu();
-                    break;
-
-                case IDM_VID_GL_FPS_BLITTER:
-                case IDM_VID_GL_FPS_25:
-                case IDM_VID_GL_FPS_30:
-                case IDM_VID_GL_FPS_50:
-                case IDM_VID_GL_FPS_60:
-                case IDM_VID_GL_FPS_75:
-                    {
-                        static const int fps[] = { -1, 25, 30, 50, 60, 75 };
-                        int              idx   = 0;
-                        for (; fps[idx] != video_framerate; idx++)
-                            ;
-                        CheckMenuItem(hmenu, IDM_VID_GL_FPS_BLITTER + idx, MF_UNCHECKED);
-                        video_framerate = fps[LOWORD(wParam) - IDM_VID_GL_FPS_BLITTER];
-                        CheckMenuItem(hmenu, LOWORD(wParam), MF_CHECKED);
-                        plat_vid_reload_options();
-                        config_save();
-                        break;
-                    }
-                case IDM_VID_GL_VSYNC:
-                    video_vsync = !video_vsync;
-                    CheckMenuItem(hmenu, IDM_VID_GL_VSYNC, video_vsync ? MF_CHECKED : MF_UNCHECKED);
-                    plat_vid_reload_options();
-                    config_save();
-                    break;
-                case IDM_VID_GL_SHADER:
-                    win_notify_dlg_open();
-                    if (file_dlg_st(hwnd, IDS_2144, video_shader, NULL, 0) == 0) {
-                        strcpy_s(video_shader, sizeof(video_shader), openfilestring);
-                        EnableMenuItem(menuMain, IDM_VID_GL_NOSHADER, strlen(video_shader) > 0 ? MF_ENABLED : MF_DISABLED);
-                    }
-                    win_notify_dlg_closed();
-                    plat_vid_reload_options();
-                    break;
-                case IDM_VID_GL_NOSHADER:
-                    video_shader[0] = '\0';
-                    EnableMenuItem(menuMain, IDM_VID_GL_NOSHADER, MF_DISABLED);
-                    plat_vid_reload_options();
-                    break;
-
-                case IDM_VID_FULLSCREEN:
-                    plat_setfullscreen(1);
-                    config_save();
-                    break;
-
-                case IDM_VID_FS_FULL:
-                case IDM_VID_FS_43:
-                case IDM_VID_FS_KEEPRATIO:
-                case IDM_VID_FS_INT:
-                    CheckMenuItem(hmenu, IDM_VID_FS_FULL + video_fullscreen_scale, MF_UNCHECKED);
-                    video_fullscreen_scale = LOWORD(wParam) - IDM_VID_FS_FULL;
-                    CheckMenuItem(hmenu, IDM_VID_FS_FULL + video_fullscreen_scale, MF_CHECKED);
-                    device_force_redraw();
-                    config_save();
-                    break;
-
-                case IDM_VID_SCALE_1X:
-                case IDM_VID_SCALE_2X:
-                case IDM_VID_SCALE_3X:
-                case IDM_VID_SCALE_4X:
-                case IDM_VID_SCALE_5X:
-                case IDM_VID_SCALE_6X:
-                case IDM_VID_SCALE_7X:
-                case IDM_VID_SCALE_8X:
-                case IDM_VID_SCALE_9X:
-                case IDM_VID_SCALE_10X:
-                    CheckMenuItem(hmenu, IDM_VID_SCALE_1X + scale, MF_UNCHECKED);
-                    scale = LOWORD(wParam) - IDM_VID_SCALE_1X;
-                    CheckMenuItem(hmenu, IDM_VID_SCALE_1X + scale, MF_CHECKED);
-                    reset_screen_size();
-                    device_force_redraw();
-                    video_force_resize_set(1);
-                    atomic_store(&doresize_monitors[0], 1);
-                    config_save();
-                    break;
-
-                case IDM_VID_FILTER_NEAREST:
-                case IDM_VID_FILTER_LINEAR:
-                    video_filter_method = LOWORD(wParam) - IDM_VID_FILTER_NEAREST;
-                    video_set_filter_menu(hmenu);
-                    plat_vid_reload_options();
-                    config_save();
-                    break;
-
-                case IDM_VID_HIDPI:
-                    dpi_scale = !dpi_scale;
-                    CheckMenuItem(hmenu, IDM_VID_HIDPI, dpi_scale ? MF_CHECKED : MF_UNCHECKED);
-                    atomic_store(&doresize_monitors[0], 1);
-                    config_save();
-                    break;
-
-                case IDM_PREFERENCES:
-                    PreferencesDlgCreate(hwnd);
-                    break;
-
-                case IDM_VID_SPECIFY_DIM:
-                    SpecifyDimensionsDialogCreate(hwnd);
-                    break;
-
-                case IDM_VID_FORCE43:
-                    video_toggle_option(hmenu, &force_43, IDM_VID_FORCE43);
-                    video_force_resize_set(1);
-                    break;
-
-                case IDM_VID_INVERT:
-                    video_toggle_option(hmenu, &invert_display, IDM_VID_INVERT);
-                    video_copy = (video_grayscale || invert_display) ? video_transform_copy : memcpy;
-                    plat_vidapi_reload();
-                    break;
-
-                case IDM_VID_OVERSCAN:
-                    update_overscan = 1;
-                    video_toggle_option(hmenu, &enable_overscan, IDM_VID_OVERSCAN);
-                    video_force_resize_set(1);
-                    break;
-
-                case IDM_VID_CGACON:
-                    vid_cga_contrast ^= 1;
-                    CheckMenuItem(hmenu, IDM_VID_CGACON, vid_cga_contrast ? MF_CHECKED : MF_UNCHECKED);
-                    cgapal_rebuild();
-                    config_save();
-                    break;
-
-                case IDM_VID_GRAYCT_601:
-                case IDM_VID_GRAYCT_709:
-                case IDM_VID_GRAYCT_AVE:
-                    CheckMenuItem(hmenu, IDM_VID_GRAYCT_601 + video_graytype, MF_UNCHECKED);
-                    video_graytype = LOWORD(wParam) - IDM_VID_GRAYCT_601;
-                    CheckMenuItem(hmenu, IDM_VID_GRAYCT_601 + video_graytype, MF_CHECKED);
-                    device_force_redraw();
-                    config_save();
-                    break;
-
-                case IDM_VID_GRAY_RGB:
-                case IDM_VID_GRAY_MONO:
-                case IDM_VID_GRAY_AMBER:
-                case IDM_VID_GRAY_GREEN:
-                case IDM_VID_GRAY_WHITE:
-                    CheckMenuItem(hmenu, IDM_VID_GRAY_RGB + video_grayscale, MF_UNCHECKED);
-                    video_grayscale = LOWORD(wParam) - IDM_VID_GRAY_RGB;
-                    video_copy      = (video_grayscale || invert_display) ? video_transform_copy : memcpy;
-                    plat_vidapi_reload();
-                    CheckMenuItem(hmenu, IDM_VID_GRAY_RGB + video_grayscale, MF_CHECKED);
-                    device_force_redraw();
-                    config_save();
-                    break;
-
-#ifdef DISCORD
-                case IDM_DISCORD:
-                    if (!discord_loaded)
-                        break;
-                    enable_discord ^= 1;
-                    CheckMenuItem(hmenu, IDM_DISCORD, enable_discord ? MF_CHECKED : MF_UNCHECKED);
-                    if (enable_discord) {
-                        discord_init();
-                        discord_update_activity(dopause);
-                    } else
-                        discord_close();
-                    break;
-#endif
-
-                default:
-                    media_menu_proc(hwnd, message, wParam, lParam);
-                    break;
-            }
-            return 0;
-
-        case WM_ENTERMENULOOP:
-            break;
-
-        case WM_DPICHANGED:
-            dpi = HIWORD(wParam);
-            GetWindowRect(hwndSBAR, &rect);
-            sbar_height = rect.bottom - rect.top;
-            GetWindowRect(hwndRebar, &rect);
-            tbar_height = rect.bottom - rect.top;
-            rect_p      = (RECT *) lParam;
-            if (vid_resize == 1)
-                MoveWindow(hwnd, rect_p->left, rect_p->top, rect_p->right - rect_p->left, rect_p->bottom - rect_p->top, TRUE);
-            else if (vid_resize >= 2) {
-                temp_x = fixed_size_x;
-                temp_y = fixed_size_y;
-                if (dpi_scale) {
-                    temp_x = MulDiv(temp_x, dpi, 96);
-                    temp_y = MulDiv(temp_y, dpi, 96);
-                }
-
-                /* Main Window. */
-                ResizeWindowByClientArea(hwndMain, temp_x, temp_y + (hide_status_bar ? 0 : sbar_height) + (hide_tool_bar ? 0 : tbar_height));
-            } else if (!user_resize)
-                atomic_store(&doresize_monitors[0], 1);
-            break;
-
-        case WM_WINDOWPOSCHANGED:
-            if (video_fullscreen & 1)
-                PostMessage(hwndMain, WM_LEAVEFULLSCREEN, 0, 0);
-
-            pos = (WINDOWPOS *) lParam;
-            GetClientRect(hwndMain, &rect);
-
-            if (IsIconic(hwndMain)) {
-                plat_vidapi_enable(0);
-                minimized = 1;
-                return 0;
-            } else if (minimized) {
-                minimized = 0;
-                video_force_resize_set(1);
-            }
-
-            if (!(pos->flags & SWP_NOSIZE) && (window_remember || (vid_resize & 2))) {
-                window_x = pos->x;
-                window_y = pos->y;
-                if (!(vid_resize & 2)) {
-                    window_w = pos->cx;
-                    window_h = pos->cy;
-                }
-                save_window_pos = 1;
-                config_save();
-            }
-
-            if (!(pos->flags & SWP_NOSIZE) || !user_resize) {
-                plat_vidapi_enable(0);
-
-                if (!hide_status_bar)
-                    MoveWindow(hwndSBAR, 0, rect.bottom - sbar_height, sbar_height, rect.right, TRUE);
-
-                if (!hide_tool_bar)
-                    MoveWindow(hwndRebar, 0, 0, rect.right, tbar_height, TRUE);
-
-                MoveWindow(hwndRender, 0, hide_tool_bar ? 0 : tbar_height, rect.right, rect.bottom - (hide_status_bar ? 0 : sbar_height) - (hide_tool_bar ? 0 : tbar_height), TRUE);
-
-                GetClientRect(hwndRender, &rect);
-                if (dpi_scale) {
-                    temp_x = MulDiv(rect.right, 96, dpi);
-                    temp_y = MulDiv(rect.bottom, 96, dpi);
-
-                    if (temp_x != scrnsz_x || temp_y != scrnsz_y) {
-                        scrnsz_x = temp_x;
-                        scrnsz_y = temp_y;
-                        atomic_store(&doresize_monitors[0], 1);
-                    }
-                } else {
-                    if (rect.right != scrnsz_x || rect.bottom != scrnsz_y) {
-                        scrnsz_x = rect.right;
-                        scrnsz_y = rect.bottom;
-                        atomic_store(&doresize_monitors[0], 1);
-                    }
-                }
-
-                plat_vidsize(rect.right, rect.bottom);
-
-                if (mouse_capture) {
-                    GetWindowRect(hwndRender, &rect);
-                    ClipCursor(&rect);
-                }
-
-                plat_vidapi_enable(2);
-            }
-
-            return 0;
-
-        case WM_TIMER:
-            if (wParam == TIMER_1SEC)
-                pc_onesec();
-            else if ((wParam >= 0x8000) && (wParam <= 0x80ff))
-                ui_sb_timer_callback(wParam & 0xff);
-            break;
-
-        case WM_LEAVEFULLSCREEN:
-            plat_setfullscreen(0);
-            config_save();
-            break;
-
-        case WM_KEYDOWN:
-        case WM_KEYUP:
-        case WM_SYSKEYDOWN:
-        case WM_SYSKEYUP:
-            return 0;
-
-        case WM_CLOSE:
-            win_notify_dlg_open();
-            if (confirm_exit && confirm_exit_cmdl)
-                i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2114, NULL, (wchar_t *) IDS_2120, (wchar_t *) IDS_2137, NULL);
-            else
-                i = 0;
-            if ((i % 10) == 0) {
-                if (i == 10) {
-                    confirm_exit = 0;
-                    nvr_save();
-                    config_save();
-                }
-                KillTimer(hwnd, TIMER_1SEC);
-                PostQuitMessage(0);
-            }
-            win_notify_dlg_closed();
-            break;
-
-        case WM_DESTROY:
-            win_clear_icon_set();
-            KillTimer(hwnd, TIMER_1SEC);
-            PostQuitMessage(0);
-            break;
-
-        case WM_SHOWSETTINGS:
-            if (manager_wm)
-                break;
-            manager_wm = 1;
-            win_settings_open(hwnd);
-            manager_wm = 0;
-            break;
-
-        case WM_PAUSE:
-            if (manager_wm)
-                break;
-            manager_wm = 1;
-            plat_pause(dopause ^ 1);
-            CheckMenuItem(menuMain, IDM_ACTION_PAUSE, dopause ? MF_CHECKED : MF_UNCHECKED);
-            manager_wm = 0;
-            break;
-
-        case WM_HARDRESET:
-            if (manager_wm)
-                break;
-            win_notify_dlg_open();
-            if (confirm_reset)
-                i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2113, NULL, (wchar_t *) IDS_2138, (wchar_t *) IDS_2139, NULL);
-            else
-                i = 0;
-            if ((i % 10) == 0) {
-                pc_reset_hard();
-                if (i == 10) {
-                    confirm_reset = 0;
-                    nvr_save();
-                    config_save();
-                }
-            }
-            win_notify_dlg_closed();
-            break;
-
-        case WM_SHUTDOWN:
-            if (manager_wm)
-                break;
-            if (LOWORD(wParam) == 1) {
-                confirm_exit = 0;
-                nvr_save();
-                config_save();
-                KillTimer(hwnd, TIMER_1SEC);
-                PostQuitMessage(0);
-            } else {
-                win_notify_dlg_open();
-                if (confirm_exit && confirm_exit_cmdl)
-                    i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2114, NULL, (wchar_t *) IDS_2120, (wchar_t *) IDS_2137, NULL);
-                else
-                    i = 0;
-                if ((i % 10) == 0) {
-                    if (i == 10) {
-                        confirm_exit = 0;
-                        nvr_save();
-                        config_save();
-                    }
-                    KillTimer(hwnd, TIMER_1SEC);
-                    PostQuitMessage(0);
-                }
-                win_notify_dlg_closed();
-            }
-            break;
-
-        case WM_CTRLALTDEL:
-            if (manager_wm)
-                break;
-            manager_wm = 1;
-            pc_send_cad();
-            manager_wm = 0;
-            break;
-
-        case WM_SYSCOMMAND:
-            /*
-             * Disable ALT key *ALWAYS*,
-             * I don't think there's any use for
-             * reaching the menu that way.
-             */
-            if (wParam == SC_KEYMENU && HIWORD(lParam) <= 0) {
-                return 0; /*disable ALT key for menu*/
-            }
-
-        default:
-            return (DefWindowProc(hwnd, message, wParam, lParam));
-
-        case WM_SETFOCUS:
-            infocus = 1;
-            break;
-
-        case WM_KILLFOCUS:
-            infocus = 0;
-            plat_mouse_capture(0);
-            break;
-
-        case WM_ACTIVATE:
-            if ((wParam != WA_INACTIVE) && !(video_fullscreen & 2)) {
-                video_force_resize_set(1);
-                plat_vidapi_enable(0);
-                plat_vidapi_enable(1);
-            }
-            break;
-
-        case WM_ACTIVATEAPP:
-            /* Leave full screen on switching application except
-               for OpenGL Core and VNC renderers. */
-            if (video_fullscreen & 1 && wParam == FALSE && vid_api < 3)
-                PostMessage(hwndMain, WM_LEAVEFULLSCREEN, 0, 0);
-            break;
-
-        case WM_ENTERSIZEMOVE:
-            user_resize = 1;
-            break;
-
-        case WM_EXITSIZEMOVE:
-            user_resize = 0;
-
-            /* If window is not resizable, then tell the main thread to
-               resize it, as sometimes, moves can mess up the window size. */
-            if (!vid_resize)
-                atomic_store(&doresize_monitors[0], 1);
-            break;
-    }
-
-    return 0;
-}
-
-static LRESULT CALLBACK
-SubWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    switch (message) {
-        case WM_LBUTTONDOWN:
-            button_down |= 2;
-            break;
-
-        case WM_LBUTTONUP:
-            if ((button_down & 2) && !video_fullscreen)
-                plat_mouse_capture(1);
-            button_down &= ~2;
-            break;
-
-        case WM_MBUTTONUP:
-            if (mouse_get_buttons() < 3)
-                plat_mouse_capture(0);
-            break;
-
-        default:
-            return (DefWindowProc(hwnd, message, wParam, lParam));
-    }
-
-    return 0;
-}
-
-static LRESULT CALLBACK
-SDLMainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    if (input_proc(hwnd, message, wParam, lParam) == 0)
-        return 0;
-
-    return (DefWindowProc(hwnd, message, wParam, lParam));
-}
-
-static LRESULT CALLBACK
-SDLSubWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    return (DefWindowProc(hwnd, message, wParam, lParam));
-}
-
-static HRESULT CALLBACK
-TaskDialogProcedure(HWND hwnd, UINT message, UNUSED(WPARAM wParam), LPARAM lParam, UNUSED(LONG_PTR lpRefData))
-{
-    switch (message) {
-        case TDN_HYPERLINK_CLICKED:
-            /* open linked URL */
-            ShellExecute(hwnd, L"open", (LPCWSTR) lParam, NULL, NULL, SW_SHOW);
-            break;
-    }
-
-    return S_OK;
-}
-
-int
-ui_init(int nCmdShow)
-{
-    WCHAR             title[200];
-    WNDCLASSEX        wincl;            /* buffer for main window's class */
-    RAWINPUTDEVICE    ridev;            /* RawInput device */
-    MSG               messages = { 0 }; /* received-messages buffer */
-    HWND              hwnd     = NULL;  /* handle for our window */
-    HACCEL            haccel;           /* handle to accelerator table */
-    RECT              rect;
-    int               bRet;
-    TASKDIALOGCONFIG  tdconfig    = { 0 };
-    TASKDIALOG_BUTTON tdbuttons[] = {
-        {IDCANCEL, MAKEINTRESOURCE(IDS_2120)}
-    };
-    uint32_t helper_lang;
-    static int fs_on_signal  = 0;
-    static int fs_off_signal = 0;
-
-    /* Load DPI related Windows 10 APIs */
-    user32_handle = dynld_module("user32.dll", user32_imports);
-
-    /* Set the application ID for the taskbar. */
-    shell32_handle = dynld_module("shell32.dll", shell32_imports);
-    if (shell32_handle)
-        pSetCurrentProcessExplicitAppUserModelID(L"86Box.86Box");
-
-    /* Set up TaskDialog configuration. */
-    tdconfig.cbSize             = sizeof(tdconfig);
-    tdconfig.dwFlags            = TDF_ENABLE_HYPERLINKS;
-    tdconfig.dwCommonButtons    = 0;
-    tdconfig.pszWindowTitle     = MAKEINTRESOURCE(IDS_STRINGS);
-    tdconfig.pszMainIcon        = TD_ERROR_ICON;
-    tdconfig.pszMainInstruction = MAKEINTRESOURCE(IDS_2050);
-    tdconfig.cButtons           = ARRAYSIZE(tdbuttons);
-    tdconfig.pButtons           = tdbuttons;
-    tdconfig.pfCallback         = TaskDialogProcedure;
-
-    /* Load the desired iconset */
-    win_load_icon_set();
-
-    /* Start settings-only mode if requested. */
-    if (settings_only) {
-        if (!pc_init_modules()) {
-            /* Dang, no ROMs found at all! */
-            tdconfig.pszMainInstruction = MAKEINTRESOURCE(IDS_2121);
-            tdconfig.pszContent         = MAKEINTRESOURCE(IDS_2056);
-            TaskDialogIndirect(&tdconfig, NULL, NULL, NULL);
-            return 6;
-        }
-
-        /* Load the desired language */
-        helper_lang = lang_id;
-        lang_id     = 0;
-        set_language(helper_lang);
-
-        win_settings_open(NULL);
-        return 0;
-    }
-
-#ifdef DISCORD
-    if (!discord_load()) {
-        enable_discord = 0;
-    } else if (enable_discord) {
-        /* Initialize the Discord API */
-        discord_init();
-
-        /* Update Discord status */
-        discord_update_activity(dopause);
-    }
-#endif
-
-    /* Create our main window's class and register it. */
-    wincl.hInstance     = hinstance;
-    wincl.lpszClassName = CLASS_NAME;
-    wincl.lpfnWndProc   = MainWindowProcedure;
-    wincl.style         = CS_DBLCLKS; /* Catch double-clicks */
-    wincl.cbSize        = sizeof(WNDCLASSEX);
-    wincl.hIcon         = NULL;
-    wincl.hIconSm       = NULL;
-    wincl.hCursor       = NULL;
-    wincl.lpszMenuName  = NULL;
-    wincl.cbClsExtra    = 0;
-    wincl.cbWndExtra    = 0;
-    wincl.hbrBackground = CreateSolidBrush(RGB(0, 0, 0));
-
-    /* Load proper icons */
-    wchar_t path[MAX_PATH + 1] = { 0 };
-    GetModuleFileNameW(hinstance, path, MAX_PATH);
-    ExtractIconExW(path, 0, &wincl.hIcon, &wincl.hIconSm, 1);
-
-    if (!RegisterClassEx(&wincl))
-        return 2;
-    wincl.lpszClassName = SUB_CLASS_NAME;
-    wincl.lpfnWndProc   = SubWindowProcedure;
-    if (!RegisterClassEx(&wincl))
-        return 2;
-    wincl.lpszClassName = SDL_CLASS_NAME;
-    wincl.lpfnWndProc   = SDLMainWindowProcedure;
-    if (!RegisterClassEx(&wincl))
-        return 2;
-    wincl.lpszClassName = SDL_SUB_CLASS_NAME;
-    wincl.lpfnWndProc   = SDLSubWindowProcedure;
-    if (!RegisterClassEx(&wincl))
-        return 2;
-
-    /* Now create our main window. */
-    swprintf_s(title, sizeof_w(title), L"%hs - %s %s", vm_name, EMU_NAME_W, EMU_VERSION_FULL_W);
-    hwnd = CreateWindowEx(
-        0,          /* no extended possibilites */
-        CLASS_NAME, /* class name */
-        title,      /* Title Text */
-        (WS_OVERLAPPEDWINDOW & ~WS_SIZEBOX) | DS_3DLOOK,
-        CW_USEDEFAULT,                                                                                                             /* Windows decides the position */
-        CW_USEDEFAULT,                                                                                                             /* where window ends up on the screen */
-        scrnsz_x + (GetSystemMetrics(SM_CXFIXEDFRAME) * 2),                                                                        /* width */
-        scrnsz_y + (GetSystemMetrics(SM_CYFIXEDFRAME) * 2) + GetSystemMetrics(SM_CYMENUSIZE) + GetSystemMetrics(SM_CYCAPTION) + 1, /* and height in pixels */
-        HWND_DESKTOP,                                                                                                              /* window is a child to desktop */
-        NULL,                                                                                                                      /* no menu (yet) */
-        hinstance,                                                                                                                 /* Program Instance handler */
-        NULL);                                                                                                                     /* no Window Creation data */
-    hwndMain = tdconfig.hwndParent = hwnd;
-
-    ui_window_title(title);
-
-    /* Get the current DPI */
-    dpi = win_get_dpi(hwndMain);
-
-    /* Check if we have a padded window frame */
-    padded_frame = (GetSystemMetrics(SM_CXPADDEDBORDER) != 0);
-
-    /* Create the status bar window. */
-    StatusBarCreate(hwndMain, IDC_STATUS, hinstance);
-
-    /* Get the actual height of the status bar */
-    GetWindowRect(hwndSBAR, &rect);
-    sbar_height = rect.bottom - rect.top;
-    if (hide_status_bar)
-        ShowWindow(hwndSBAR, SW_HIDE);
-
-    /* Create the toolbar window. */
-    ToolBarCreate(hwndMain, hinstance);
-
-    /* Get the actual height of the toolbar */
-    tbar_height = SendMessage(hwndRebar, RB_GETROWHEIGHT, 0, 0);
-    if (hide_tool_bar)
-        ShowWindow(hwndRebar, SW_HIDE);
-
-    /* Set up main window for resizing if configured. */
-    if (vid_resize == 1)
-        SetWindowLongPtr(hwnd, GWL_STYLE,
-                         (WS_OVERLAPPEDWINDOW));
-    else
-        SetWindowLongPtr(hwnd, GWL_STYLE,
-                         (WS_OVERLAPPEDWINDOW & ~WS_SIZEBOX & ~WS_THICKFRAME & ~WS_MAXIMIZEBOX));
-
-    /* Create the Machine Rendering window. */
-    hwndRender = CreateWindow(/*L"STATIC"*/ SUB_CLASS_NAME, NULL, WS_CHILD | SS_BITMAP,
-                              0, 0, 1, 1, hwnd, NULL, hinstance, NULL);
-
-    /* Initiate a resize in order to properly arrange all controls.
-       Move to the last-saved position if needed. */
-    if ((vid_resize < 2) && window_remember)
-        MoveWindow(hwnd, window_x, window_y, window_w, window_h, TRUE);
-    else {
-        if (vid_resize >= 2) {
-            MoveWindow(hwnd, window_x, window_y, window_w, window_h, TRUE);
-            scrnsz_x = fixed_size_x;
-            scrnsz_y = fixed_size_y;
-        }
-        ResizeWindowByClientArea(hwnd, scrnsz_x, scrnsz_y + (hide_status_bar ? 0 : sbar_height) + (hide_tool_bar ? 0 : tbar_height));
-    }
-
-    /* Load the desired language */
-    helper_lang = lang_id;
-    lang_id     = 0;
-    set_language(helper_lang);
-
-    /* Make the window visible on the screen. */
-    ShowWindow(hwnd, nCmdShow);
-
-    /* Warn the user about unsupported configs. */
-    if (cpu_override && ui_msgbox_ex(MBX_WARNING | MBX_QUESTION_OK, (void *) IDS_2146, (void *) IDS_2147, (void *) IDS_2148, (void *) IDS_2120, NULL)) {
-        DestroyWindow(hwnd);
-        return 0;
-    }
-
-    GetClipCursor(&oldclip);
-
-    /* Initialize the RawInput (keyboard) module. */
-    memset(&ridev, 0x00, sizeof(ridev));
-    ridev.usUsagePage = 0x01;
-    ridev.usUsage     = 0x06;
-    ridev.dwFlags     = RIDEV_NOHOTKEYS;
-    ridev.hwndTarget  = NULL; /* current focus window */
-    if (!RegisterRawInputDevices(&ridev, 1, sizeof(ridev))) {
-        tdconfig.pszContent = MAKEINTRESOURCE(IDS_2106);
-        TaskDialogIndirect(&tdconfig, NULL, NULL, NULL);
-        return 4;
-    }
-    keyboard_getkeymap();
-
-    /* Load the accelerator table */
-    haccel = LoadAccelerators(hinstance, ACCEL_NAME);
-    if (haccel == NULL) {
-        tdconfig.pszContent = MAKEINTRESOURCE(IDS_2105);
-        TaskDialogIndirect(&tdconfig, NULL, NULL, NULL);
-        return 3;
-    }
-
-    /* Initialize the mouse module. */
-    if (!start_in_fullscreen)
-        win_mouse_init();
-
-    /*
-     * Before we can create the Render window, we first have
-     * to prepare some other things that it depends on.
-     */
-    ghMutex = CreateMutex(NULL, FALSE, NULL);
-
-    /* All done, fire up the actual emulated machine. */
-    if (!pc_init_modules()) {
-        /* Dang, no ROMs found at all! */
-        tdconfig.pszMainInstruction = MAKEINTRESOURCE(IDS_2121);
-        tdconfig.pszContent         = MAKEINTRESOURCE(IDS_2056);
-        TaskDialogIndirect(&tdconfig, NULL, NULL, NULL);
-        return 6;
-    }
-
-    /* Initialize the configured Video API. */
-    if (!plat_setvid(vid_api)) {
-        tdconfig.pszContent = MAKEINTRESOURCE(IDS_2090);
-        TaskDialogIndirect(&tdconfig, NULL, NULL, NULL);
-        return 5;
-    }
-
-    /* Set up the current window size. */
-    if (vid_resize & 2)
-        plat_resize(fixed_size_x, fixed_size_y);
-    else
-        plat_resize(scrnsz_x, scrnsz_y);
-
-    /* Initialize the rendering window, or fullscreen. */
-    if (start_in_fullscreen)
-        plat_setfullscreen(3);
-
-    /* Fire up the machine. */
-    pc_reset_hard_init();
-
-    /* Set the PAUSE mode depending on the renderer. */
-    plat_pause(0);
-
-    /* If so requested via the command line, inform the
-     * application that started us of our HWND, using the
-     * the hWnd and unique ID the application has given
-     * us. */
-    if (source_hwnd)
-        PostMessage((HWND) (uintptr_t) source_hwnd, WM_SENDHWND, (WPARAM) unique_id, (LPARAM) hwndMain);
-
-    /*
-     * Everything has been configured, and all seems to work,
-     * so now it is time to start the main thread to do some
-     * real work, and we will hang in here, dealing with the
-     * UI until we're done.
-     */
-    do_start();
-
-    /* Run the message loop. It will run until GetMessage() returns 0 */
-    while (!is_quit) {
-        bRet = GetMessage(&messages, NULL, 0, 0);
-        if ((bRet == 0) || is_quit)
-            break;
-
-        if (bRet == -1) {
-            fatal("bRet is -1\n");
-        }
-
-        /* On WM_QUIT, tell the CPU thread to stop running. That will then tell us
-           to stop running as well. */
-        if (messages.message == WM_QUIT)
-            cpu_thread_run = 0;
-
-        if (!TranslateAccelerator(hwnd, haccel, &messages)) {
-            /* Don't process other keypresses. */
-            if (messages.message == WM_SYSKEYDOWN || messages.message == WM_SYSKEYUP || messages.message == WM_KEYDOWN || messages.message == WM_KEYUP)
-                continue;
-
-            TranslateMessage(&messages);
-            DispatchMessage(&messages);
-        }
-
-        if (mouse_capture && keyboard_ismsexit()) {
-            /* Release the in-app mouse. */
-            plat_mouse_capture(0);
-        }
-
-        if (!fs_off_signal && video_fullscreen && keyboard_isfsexit()) {
-            /* Signal "exit fullscreen mode". */
-            fs_off_signal = 1;
-        } else if (fs_off_signal && video_fullscreen && keyboard_isfsexit_up()) {
-            plat_setfullscreen(0);
-            fs_off_signal = 0;
-        }
-
-        if (!fs_on_signal && !video_fullscreen && keyboard_isfsenter()) {
-            /* Signal "enter fullscreen mode". */
-            fs_on_signal = 1;
-        } else if (fs_on_signal && !video_fullscreen && keyboard_isfsenter_up()) {
-            plat_setfullscreen(1);
-            fs_on_signal = 0;
-        }
-
-#ifdef DISCORD
-        /* Run Discord API callbacks */
-        if (enable_discord)
-            discord_run_callbacks();
-#endif
-    }
-
-    timeEndPeriod(1);
-
-    if (mouse_capture)
-        plat_mouse_capture(0);
-
-    /* Close down the emulator. */
-    do_stop();
-
-    UnregisterClass(SDL_SUB_CLASS_NAME, hinstance);
-    UnregisterClass(SDL_CLASS_NAME, hinstance);
-    UnregisterClass(SUB_CLASS_NAME, hinstance);
-    UnregisterClass(CLASS_NAME, hinstance);
-
-    win_mouse_close();
-
-#ifdef DISCORD
-    /* Shut down the Discord integration */
-    discord_close();
-#endif
-
-    if (user32_handle != NULL)
-        dynld_close(user32_handle);
-
-    return (messages.wParam);
-}
-
-/* We should have the language ID as a parameter. */
-void
-plat_pause(int p)
-{
-    static wchar_t oldtitle[512];
-    wchar_t        title[512];
-
-    /* If un-pausing, as the renderer if that's OK. */
-    if (p == 0)
-        p = get_vidpause();
-
-    /* If already so, done. */
-    if (dopause == p) {
-        /* Send the WM to a manager if needed. */
-        if (source_hwnd)
-            PostMessage((HWND) (uintptr_t) source_hwnd, WM_SENDSTATUS, (WPARAM) !!dopause, (LPARAM) hwndMain);
-
-        return;
-    }
-
-    if (p) {
-        if (mouse_capture)
-            plat_mouse_capture(0);
-
-        wcsncpy(oldtitle, ui_window_title(NULL), sizeof_w(oldtitle) - 1);
-        wcscpy(title, oldtitle);
-        wcscat(title, plat_get_string(IDS_2051));
-        ui_window_title(title);
-    } else
-        ui_window_title(oldtitle);
-
-    /* If un-pausing, synchronize the internal clock with the host's time. */
-    if ((p == 0) && (time_sync & TIME_SYNC_ENABLED))
-        nvr_time_sync();
-
-    dopause = p;
-
-    /* Update the actual menu. */
-    CheckMenuItem(menuMain, IDM_ACTION_PAUSE,
-                  dopause ? MF_CHECKED : MF_UNCHECKED);
-
-#ifdef DISCORD
-    /* Update Discord status */
-    if (enable_discord)
-        discord_update_activity(dopause);
-#endif
-
-    /* Update the toolbar */
-    ToolBarUpdatePause(p);
-
-    /* Send the WM to a manager if needed. */
-    if (source_hwnd)
-        PostMessage((HWND) (uintptr_t) source_hwnd, WM_SENDSTATUS, (WPARAM) !!dopause, (LPARAM) hwndMain);
-}
-
-/* Tell the UI about a new screen resolution. */
-void
-plat_resize(int x, int y)
-{
-    /* First, see if we should resize the UI window. */
-    if (!vid_resize) {
-        /* scale the screen base on DPI */
-        if (dpi_scale) {
-            x = MulDiv(x, dpi, 96);
-            y = MulDiv(y, dpi, 96);
-        }
-        ResizeWindowByClientArea(hwndMain, x, y + (hide_status_bar ? 0 : sbar_height) + (hide_tool_bar ? 0 : tbar_height));
-    }
-}
-
-void
-plat_resize_request(int w, int h, int monitor_index)
-{
-    atomic_store((&doresize_monitors[monitor_index]), 1);
-}
-
-void
-plat_mouse_capture(int on)
-{
-    RECT rect;
-
-    if (!kbd_req_capture && (mouse_type == MOUSE_TYPE_NONE) && !machine_has_mouse())
-        return;
-
-    if (on && !mouse_capture) {
-        /* Enable the in-app mouse. */
-        GetClipCursor(&oldclip);
-        GetWindowRect(hwndRender, &rect);
-        ClipCursor(&rect);
-        show_cursor(0);
-        mouse_capture = 1;
-    } else if (!on && mouse_capture) {
-        /* Disable the in-app mouse. */
-        ClipCursor(&oldclip);
-        show_cursor(-1);
-
-        mouse_capture = 0;
-    }
-}
-
-void
-ui_init_monitor(UNUSED(int monitor_index))
-{
-    // Nothing done here yet
-}
-
-void
-ui_deinit_monitor(UNUSED(int monitor_index))
-{
-    // Nothing done here yet
-}
-
-void
-ui_hard_reset_completed(void)
-{
-    // Nothing done here yet
-}
diff --git a/vcpkg.json b/vcpkg.json
index 5fdfc175b..a623508e7 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,6 +1,6 @@
 {
     "name": "86box",
-    "version-string": "4.1",
+    "version-string": "5.1",
     "homepage": "https://86box.net/",
     "documentation": "https://86box.readthedocs.io/",
     "license": "GPL-2.0-or-later",
diff --git a/wl_protocols/keyboard-shortcuts-inhibit-unstable-v1.xml b/wl_protocols/keyboard-shortcuts-inhibit-unstable-v1.xml
new file mode 100644
index 000000000..27748764d
--- /dev/null
+++ b/wl_protocols/keyboard-shortcuts-inhibit-unstable-v1.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<protocol name="keyboard_shortcuts_inhibit_unstable_v1">
+
+  <copyright>
+    Copyright © 2017 Red Hat Inc.
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice (including the next
+    paragraph) shall be included in all copies or substantial portions of the
+    Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+  </copyright>
+
+  <description summary="Protocol for inhibiting the compositor keyboard shortcuts">
+    This protocol specifies a way for a client to request the compositor
+    to ignore its own keyboard shortcuts for a given seat, so that all
+    key events from that seat get forwarded to a surface.
+
+    Warning! The protocol described in this file is experimental and
+    backward incompatible changes may be made. Backward compatible
+    changes may be added together with the corresponding interface
+    version bump.
+    Backward incompatible changes are done by bumping the version
+    number in the protocol and interface names and resetting the
+    interface version. Once the protocol is to be declared stable,
+    the 'z' prefix and the version number in the protocol and
+    interface names are removed and the interface version number is
+    reset.
+  </description>
+
+  <interface name="zwp_keyboard_shortcuts_inhibit_manager_v1" version="1">
+    <description summary="context object for keyboard grab_manager">
+      A global interface used for inhibiting the compositor keyboard shortcuts.
+    </description>
+
+    <request name="destroy" type="destructor">
+      <description summary="destroy the keyboard shortcuts inhibitor object">
+	Destroy the keyboard shortcuts inhibitor manager.
+      </description>
+    </request>
+
+    <request name="inhibit_shortcuts">
+      <description summary="create a new keyboard shortcuts inhibitor object">
+	Create a new keyboard shortcuts inhibitor object associated with
+	the given surface for the given seat.
+
+	If shortcuts are already inhibited for the specified seat and surface,
+	a protocol error "already_inhibited" is raised by the compositor.
+      </description>
+      <arg name="id" type="new_id" interface="zwp_keyboard_shortcuts_inhibitor_v1"/>
+      <arg name="surface" type="object" interface="wl_surface"
+	   summary="the surface that inhibits the keyboard shortcuts behavior"/>
+      <arg name="seat" type="object" interface="wl_seat"
+	   summary="the wl_seat for which keyboard shortcuts should be disabled"/>
+    </request>
+
+    <enum name="error">
+      <entry name="already_inhibited"
+	     value="0"
+	     summary="the shortcuts are already inhibited for this surface"/>
+    </enum>
+  </interface>
+
+  <interface name="zwp_keyboard_shortcuts_inhibitor_v1" version="1">
+    <description summary="context object for keyboard shortcuts inhibitor">
+      A keyboard shortcuts inhibitor instructs the compositor to ignore
+      its own keyboard shortcuts when the associated surface has keyboard
+      focus. As a result, when the surface has keyboard focus on the given
+      seat, it will receive all key events originating from the specified
+      seat, even those which would normally be caught by the compositor for
+      its own shortcuts.
+
+      The Wayland compositor is however under no obligation to disable
+      all of its shortcuts, and may keep some special key combo for its own
+      use, including but not limited to one allowing the user to forcibly
+      restore normal keyboard events routing in the case of an unwilling
+      client. The compositor may also use the same key combo to reactivate
+      an existing shortcut inhibitor that was previously deactivated on
+      user request.
+
+      When the compositor restores its own keyboard shortcuts, an
+      "inactive" event is emitted to notify the client that the keyboard
+      shortcuts inhibitor is not effectively active for the surface and
+      seat any more, and the client should not expect to receive all
+      keyboard events.
+
+      When the keyboard shortcuts inhibitor is inactive, the client has
+      no way to forcibly reactivate the keyboard shortcuts inhibitor.
+
+      The user can chose to re-enable a previously deactivated keyboard
+      shortcuts inhibitor using any mechanism the compositor may offer,
+      in which case the compositor will send an "active" event to notify
+      the client.
+
+      If the surface is destroyed, unmapped, or loses the seat's keyboard
+      focus, the keyboard shortcuts inhibitor becomes irrelevant and the
+      compositor will restore its own keyboard shortcuts but no "inactive"
+      event is emitted in this case.
+    </description>
+
+    <request name="destroy" type="destructor">
+      <description summary="destroy the keyboard shortcuts inhibitor object">
+	Remove the keyboard shortcuts inhibitor from the associated wl_surface.
+      </description>
+    </request>
+
+    <event name="active">
+      <description summary="shortcuts are inhibited">
+	This event indicates that the shortcut inhibitor is active.
+
+	The compositor sends this event every time compositor shortcuts
+	are inhibited on behalf of the surface. When active, the client
+	may receive input events normally reserved by the compositor
+	(see zwp_keyboard_shortcuts_inhibitor_v1).
+
+	This occurs typically when the initial request "inhibit_shortcuts"
+	first becomes active or when the user instructs the compositor to
+	re-enable and existing shortcuts inhibitor using any mechanism
+	offered by the compositor.
+      </description>
+    </event>
+
+    <event name="inactive">
+      <description summary="shortcuts are restored">
+	This event indicates that the shortcuts inhibitor is inactive,
+	normal shortcuts processing is restored by the compositor.
+       </description>
+    </event>
+  </interface>
+</protocol>